From 72f951e112562a5dcc0c06fd745e93e9d48a80b6 Mon Sep 17 00:00:00 2001
From: Alex Henrie <ahenrie@openjdk.org>
Date: Tue, 17 Nov 2015 23:10:30 -0700
Subject: [PATCH 001/228] 8145278: Fix memory leak in splitPathList

Reviewed-by: sspitsyn, dsamersoff, dcubed
---
 .../share/native/libinstrument/InvocationAdapter.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/jdk/src/java.instrument/share/native/libinstrument/InvocationAdapter.c b/jdk/src/java.instrument/share/native/libinstrument/InvocationAdapter.c
index 0c57f8b289d..a74b2b725ba 100644
--- a/jdk/src/java.instrument/share/native/libinstrument/InvocationAdapter.c
+++ b/jdk/src/java.instrument/share/native/libinstrument/InvocationAdapter.c
@@ -518,18 +518,22 @@ static void
 splitPathList(const char* str, int* pathCount, char*** paths) {
     int count = 0;
     char** segments = NULL;
+    char** new_segments;
     char* c = (char*) str;
     while (*c != '\0') {
         while (*c == ' ') c++;          /* skip leading spaces */
         if (*c == '\0') {
             break;
         }
-        if (segments == NULL) {
-            segments = (char**)malloc( sizeof(char**) );
-        } else {
-            segments = (char**)realloc( segments, (count+1)*sizeof(char**) );
+        new_segments = (char**)realloc(segments, (count+1)*sizeof(char*));
+        if (new_segments == NULL) {
+            jplis_assert(0);
+            free(segments);
+            count = 0;
+            segments = NULL;
+            break;
         }
-        jplis_assert(segments != (char**)NULL);
+        segments = new_segments;
         segments[count++] = c;
         c = strchr(c, ' ');
         if (c == NULL) {

From 34abb0688722c725998916cf5b61d7660c24e0c4 Mon Sep 17 00:00:00 2001
From: Gil Tene <gil@azul.com>
Date: Wed, 30 Mar 2016 17:04:09 +0200
Subject: [PATCH 002/228] 8147844: new method j.l.Thread.onSpinWait() and the
 corresponding x86 hotspot instrinsic

See JEP-285 for details

Co-authored-by: Ivan Krylov <ivan@azul.com>
Reviewed-by: psandoz, alanb, dholmes
---
 .../share/classes/java/lang/Thread.java       | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/jdk/src/java.base/share/classes/java/lang/Thread.java b/jdk/src/java.base/share/classes/java/lang/Thread.java
index eb47a05427d..972815e16c7 100644
--- a/jdk/src/java.base/share/classes/java/lang/Thread.java
+++ b/jdk/src/java.base/share/classes/java/lang/Thread.java
@@ -340,6 +340,45 @@ class Thread implements Runnable {
         sleep(millis);
     }
 
+    /**
+     * Indicates that the caller is momentarily unable to progress, until the
+     * occurrence of one or more actions on the part of other activities. By
+     * invoking this method within each iteration of a spin-wait loop construct,
+     * the calling thread indicates to the runtime that it is busy-waiting.
+     * The runtime may take action to improve the performance of invoking
+     * spin-wait loop constructions.
+     * <p>
+     * @apiNote
+     * As an example consider a method in a class that spins in a loop until
+     * some flag is set outside of that method. A call to the {@code onSpinWait}
+     * method should be placed inside the spin loop.
+     * <pre>{@code
+     *     class EventHandler {
+     *         volatile boolean eventNotificationNotReceived;
+     *         void waitForEventAndHandleIt() {
+     *             while ( eventNotificationNotReceived ) {
+     *                 java.lang.Thread.onSpinWait();
+     *             }
+     *             readAndProcessEvent();
+     *         }
+     *
+     *         void readAndProcessEvent() {
+     *             // Read event from some source and process it
+     *              . . .
+     *         }
+     *     }
+     * }</pre>
+     * <p>
+     * The code above would remain correct even if the {@code onSpinWait}
+     * method was not called at all. However on some architectures the Java
+     * Virtual Machine may issue the processor instructions to address such
+     * code patterns in a more beneficial way.
+     * <p>
+     * @since 9
+     */
+    @HotSpotIntrinsicCandidate
+    public static void onSpinWait() {}
+
     /**
      * Initializes a Thread with the current AccessControlContext.
      * @see #init(ThreadGroup,Runnable,String,long,AccessControlContext,boolean)

From fd6507d3538a451cdeb8b31ea2ea8633d66c466e Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefank@openjdk.org>
Date: Wed, 20 Apr 2016 09:57:01 +0200
Subject: [PATCH 003/228] 8072921: -Xincgc should be removed from output

Reviewed-by: alanb
---
 .../share/classes/sun/launcher/resources/launcher.properties     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties
index 52d621b414d..f678ba37057 100644
--- a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties
+++ b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties
@@ -99,7 +99,6 @@ java.launcher.X.usage=\
 \    -Xdiag            show additional diagnostic messages\n\
 \    -Xdiag:resolver   show resolver diagnostic messages\n\
 \    -Xnoclassgc       disable class garbage collection\n\
-\    -Xincgc           enable incremental garbage collection\n\
 \    -Xloggc:<file>    log GC status to a file with time stamps\n\
 \    -Xbatch           disable background compilation\n\
 \    -Xms<size>        set initial Java heap size\n\

From 3f6fc8998db487dbf80789d6ae78b07d3aed2933 Mon Sep 17 00:00:00 2001
From: Dmitry Samersoff <dsamersoff@openjdk.org>
Date: Wed, 20 Apr 2016 18:01:02 +0300
Subject: [PATCH 004/228] 8152847: JDI use of sun.boot.class.path needs to be
 updated for Jigsaw

Remove references to bootclasspath

Reviewed-by: alanb, sspitsyn
---
 .../share/classes/com/sun/tools/example/debug/tty/Commands.java | 1 -
 .../classes/com/sun/tools/example/debug/tty/TTYResources.java   | 1 -
 .../com/sun/tools/example/debug/tty/TTYResources_ja.java        | 1 -
 .../com/sun/tools/example/debug/tty/TTYResources_zh_CN.java     | 1 -
 .../share/classes/com/sun/tools/jdi/VirtualMachineImpl.java     | 2 +-
 5 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/Commands.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/Commands.java
index 61823822d0e..11a376e0f22 100644
--- a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/Commands.java
+++ b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/Commands.java
@@ -1534,7 +1534,6 @@ class Commands {
             PathSearchingVirtualMachine vm = (PathSearchingVirtualMachine)Env.vm();
             MessageOutput.println("base directory:", vm.baseDirectory());
             MessageOutput.println("classpath:", vm.classPath().toString());
-            MessageOutput.println("bootclasspath:", vm.bootClassPath().toString());
         } else {
             MessageOutput.println("The VM does not use paths");
         }
diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java
index c412743c4b6..39e703d88b8 100644
--- a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java
+++ b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java
@@ -74,7 +74,6 @@ public class TTYResources extends java.util.ListResourceBundle {
         {"Array element is not a method", "Array element is not a method"},
         {"Array index must be a integer type", "Array index must be a integer type"},
         {"base directory:", "base directory: {0}"},
-        {"bootclasspath:", "bootclasspath: {0}"},
         {"Breakpoint hit:", "Breakpoint hit: "},
         {"breakpoint", "breakpoint {0}"},
         {"Breakpoints set:", "Breakpoints set:"},
diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
index 1cb6d231d50..b3562226398 100644
--- a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
+++ b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
@@ -74,7 +74,6 @@ public class TTYResources_ja extends java.util.ListResourceBundle {
         {"Array element is not a method", "\u914D\u5217\u8981\u7D20\u306F\u30E1\u30BD\u30C3\u30C9\u3067\u306F\u3042\u308A\u307E\u305B\u3093"},
         {"Array index must be a integer type", "\u914D\u5217\u306E\u6DFB\u3048\u5B57\u306F\u6574\u6570\u578B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
         {"base directory:", "\u30D9\u30FC\u30B9\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA: {0}"},
-        {"bootclasspath:", "\u30D6\u30FC\u30C8\u30FB\u30AF\u30E9\u30B9\u30D1\u30B9: {0}"},
         {"Breakpoint hit:", "\u30D2\u30C3\u30C8\u3057\u305F\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8: "},
         {"breakpoint", "\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8{0}"},
         {"Breakpoints set:", "\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8:"},
diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
index 50790cb9d72..79dc9268da0 100644
--- a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
+++ b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
@@ -74,7 +74,6 @@ public class TTYResources_zh_CN extends java.util.ListResourceBundle {
         {"Array element is not a method", "\u6570\u7EC4\u5143\u7D20\u4E0D\u662F\u65B9\u6CD5"},
         {"Array index must be a integer type", "\u6570\u7EC4\u7D22\u5F15\u5FC5\u987B\u4E3A\u6574\u6570\u7C7B\u578B"},
         {"base directory:", "\u57FA\u76EE\u5F55: {0}"},
-        {"bootclasspath:", "\u5F15\u5BFC\u7C7B\u8DEF\u5F84: {0}"},
         {"Breakpoint hit:", "\u65AD\u70B9\u547D\u4E2D: "},
         {"breakpoint", "\u65AD\u70B9{0}"},
         {"Breakpoints set:", "\u65AD\u70B9\u96C6:"},
diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java
index 47e743483e3..28c3dfbfa3c 100644
--- a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java
+++ b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java
@@ -1439,7 +1439,7 @@ class VirtualMachineImpl extends MirrorImpl
    }
 
    public List<String> bootClassPath() {
-       return Arrays.asList(getClasspath().bootclasspaths);
+       return Collections.emptyList();
    }
 
    public String baseDirectory() {

From ebbecb1b63493e47e7ad3a4d49698564ae1ac99a Mon Sep 17 00:00:00 2001
From: Dmitry Samersoff <dsamersoff@openjdk.org>
Date: Thu, 21 Apr 2016 13:18:46 +0300
Subject: [PATCH 005/228] 8143921:
 nsk/jdi/ObjectReference/waitingThreads/waitingthreads003 fails with
 JVMTI_ERROR_INVALID_CLASS

Skip invalid classes

Reviewed-by: sspitsyn
---
 .../share/native/libjdwp/VirtualMachineImpl.c          | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c
index 2718ad1e3a4..8e1639c5e2e 100644
--- a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c
+++ b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c
@@ -126,7 +126,7 @@ classesForSignature(PacketInputStream *in, PacketOutputStream *out)
             int writtenCount = 0;
             int i;
 
-            for (i=0; i<classCount; i++) {
+            for (i = 0; i < classCount; i++) {
                 jclass clazz = theClasses[i];
                 jint status = classStatus(clazz);
                 char *candidate_signature = NULL;
@@ -141,7 +141,13 @@ classesForSignature(PacketInputStream *in, PacketOutputStream *out)
 
                 error = classSignature(clazz, &candidate_signature, NULL);
                 if (error != JVMTI_ERROR_NONE) {
-                    break;
+                  // Clazz become invalid since the time we get the class list
+                  // Skip this entry
+                  if (error == JVMTI_ERROR_INVALID_CLASS) {
+                    continue;
+                  }
+
+                  break;
                 }
 
                 if (strcmp(candidate_signature, signature) == 0) {

From 90ab13c3cc5f969fe1f45f30d3eb49c3f2b2b2c2 Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@openjdk.org>
Date: Mon, 25 Apr 2016 15:32:35 +0200
Subject: [PATCH 006/228] 8154529: some places in the invoke.c that use
 InvokeRequest* not protected with invokerLock

Reviewed-by: sspitsyn
---
 .../share/native/libjdwp/invoker.c            | 21 +++++++------------
 .../share/native/libjdwp/invoker.h            |  1 -
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/invoker.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/invoker.c
index cd1cd2f7dc0..3baf486c233 100644
--- a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/invoker.c
+++ b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/invoker.c
@@ -277,12 +277,14 @@ invoker_enableInvokeRequests(jthread thread)
 
     JDI_ASSERT(thread);
 
+    debugMonitorEnter(invokerLock);
     request = threadControl_getInvokeRequest(thread);
     if (request == NULL) {
         EXIT_ERROR(AGENT_ERROR_INVALID_THREAD, "getting thread invoke request");
     }
 
     request->available = JNI_TRUE;
+    debugMonitorExit(invokerLock);
 }
 
 jvmtiError
@@ -738,30 +740,21 @@ invoker_completeInvokeRequest(jthread thread)
     }
 }
 
-jboolean
-invoker_isPending(jthread thread)
-{
-    InvokeRequest *request;
-
-    JDI_ASSERT(thread);
-    request = threadControl_getInvokeRequest(thread);
-    if (request == NULL) {
-        EXIT_ERROR(AGENT_ERROR_INVALID_THREAD, "getting thread invoke request");
-    }
-    return request->pending;
-}
-
 jboolean
 invoker_isEnabled(jthread thread)
 {
     InvokeRequest *request;
+    jboolean isEnabled;
 
     JDI_ASSERT(thread);
+    debugMonitorEnter(invokerLock);
     request = threadControl_getInvokeRequest(thread);
     if (request == NULL) {
         EXIT_ERROR(AGENT_ERROR_INVALID_THREAD, "getting thread invoke request");
     }
-    return request->available;
+    isEnabled = request->available;
+    debugMonitorExit(invokerLock);
+    return isEnabled;
 }
 
 void
diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/invoker.h b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/invoker.h
index 29ecdb5d59c..e004ce6ef8e 100644
--- a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/invoker.h
+++ b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/invoker.h
@@ -67,7 +67,6 @@ jvmtiError invoker_requestInvoke(jbyte invokeType, jbyte options, jint id,
 jboolean invoker_doInvoke(jthread thread);
 
 void invoker_completeInvokeRequest(jthread thread);
-jboolean invoker_isPending(jthread thread);
 jboolean invoker_isEnabled(jthread thread);
 void invoker_detach(InvokeRequest *request);
 

From af802cb54114616dc74217ac91a65ecdb15d144f Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Mon, 25 Apr 2016 19:14:30 +0300
Subject: [PATCH 007/228] 7124381: DragSourceListener.dragDropEnd() never been
 called on completion of dnd operation

Reviewed-by: yan, ssadetsky
---
 .../dnd/Button2DragTest/Button2DragTest.html  | 45 ----------
 .../dnd/Button2DragTest/Button2DragTest.java  | 82 +++++++++----------
 2 files changed, 41 insertions(+), 86 deletions(-)
 delete mode 100644 jdk/test/java/awt/dnd/Button2DragTest/Button2DragTest.html

diff --git a/jdk/test/java/awt/dnd/Button2DragTest/Button2DragTest.html b/jdk/test/java/awt/dnd/Button2DragTest/Button2DragTest.html
deleted file mode 100644
index 91dcf4f413d..00000000000
--- a/jdk/test/java/awt/dnd/Button2DragTest/Button2DragTest.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- Copyright (c) 2006, 2013, 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.
--->
-
-<html>
-<!--
-  @test
-  @bug 4955110
-  @summary tests that a drag ends on button2 release
-  @author Alexander.Gerasimov area=dnd
-  @library    ../../regtesthelpers
-  @build      Util
-  @run applet/othervm Button2DragTest.html
-  -->
-<head>
-<title>  </title>
-</head>
-<body>
-
-<h1>Button2DragTest<br>Bug ID: 4955110</h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="Button2DragTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
diff --git a/jdk/test/java/awt/dnd/Button2DragTest/Button2DragTest.java b/jdk/test/java/awt/dnd/Button2DragTest/Button2DragTest.java
index 33bb5058706..c5045ed7fa7 100644
--- a/jdk/test/java/awt/dnd/Button2DragTest/Button2DragTest.java
+++ b/jdk/test/java/awt/dnd/Button2DragTest/Button2DragTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2016, 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
@@ -21,45 +21,52 @@
  * questions.
  */
 
-/*
-  test
-  @bug 4955110
-  @summary tests that a drag ends on button2 release
-  @author Alexander.Gerasimov area=dnd
-  @library    ../../regtesthelpers
-  @build      Util
-  @run applet/othervm Button2DragTest.html
-*/
+import java.awt.Frame;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.datatransfer.StringSelection;
+import java.awt.dnd.DnDConstants;
+import java.awt.dnd.DragGestureEvent;
+import java.awt.dnd.DragGestureListener;
+import java.awt.dnd.DragSource;
+import java.awt.dnd.DragSourceAdapter;
+import java.awt.dnd.DragSourceDropEvent;
+import java.awt.dnd.DragSourceListener;
+import java.awt.dnd.DropTarget;
+import java.awt.dnd.DropTargetAdapter;
+import java.awt.dnd.DropTargetDropEvent;
+import java.awt.event.InputEvent;
 
-
-/**
- * Button2DragTest.java
- *
- * summary: tests that DragSourceDragEvent.getDropAction() accords to its new spec
- *          (does not depend on the user drop action)
- *
- */
-
-import java.applet.Applet;
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.datatransfer.*;
-import java.awt.dnd.*;
 import test.java.awt.regtesthelpers.Util;
 
-
-public class Button2DragTest extends Applet {
+/**
+ * @test
+ * @bug 4955110
+ * @summary tests that DragSourceDragEvent.getDropAction() accords to its new
+ *          spec (does not depend on the user drop action)
+ * @library ../../regtesthelpers
+ * @build Util
+ * @run main/othervm Button2DragTest
+ * @author Alexander.Gerasimov area=dnd
+ */
+public final class Button2DragTest {
 
     private volatile boolean dropSuccess;
 
-    private Frame frame;
+    private static Frame frame;
 
+    public static void main(final String[] args) {
+        Button2DragTest test = new Button2DragTest();
+        try {
+            test.run();
+        } finally {
+            if (frame != null) {
+                frame.dispose();
+            }
+        }
+    }
 
-    public void init() {
-        // Set up the environment -- set the layout manager, add
-        // buttons, etc.
-        setLayout(new BorderLayout());
-
+    public void run() {
         frame = new Frame();
 
         final DragSourceListener dragSourceListener = new DragSourceAdapter() {
@@ -84,20 +91,13 @@ public class Button2DragTest extends Applet {
             }
         };
         new DropTarget(frame, dropTargetListener);
-    }
-
-
-    public void start() {
-        //Get things going.  Request focus, set size, et cetera
-        setSize(200,200);
-        setVisible(true);
-        validate();
 
         //What would normally go into main() will probably go here.
         //Use System.out.println for diagnostic messages that you want
         //to read after the test is done.
-
+        frame.setUndecorated(true);
         frame.setBounds(100, 100, 200, 200);
+        frame.setLocationRelativeTo(null);
         frame.setVisible(true);
 
         Robot robot = Util.createRobot();

From 5874c487963e3aaf423b2c43cd18b8f1a290347e Mon Sep 17 00:00:00 2001
From: Avik Niyogi <aniyogi@openjdk.org>
Date: Wed, 27 Apr 2016 12:08:37 +0400
Subject: [PATCH 008/228] 8152492: [macosx swing] double key event actions when
 using Mac menubar

Reviewed-by: serb, mhalder, alexsch
---
 .../native/libawt_lwawt/awt/CMenuItem.m       | 113 ++++++------------
 .../ActionListenerCalledTwiceTest.java        |  33 +++--
 2 files changed, 59 insertions(+), 87 deletions(-)

diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.m
index 28e4f386d78..e6b7e21bccb 100644
--- a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.m
+++ b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.m
@@ -25,7 +25,6 @@
 
 #import <JavaNativeFoundation/JavaNativeFoundation.h>
 #include <Carbon/Carbon.h>
-
 #import "CMenuItem.h"
 #import "CMenu.h"
 #import "AWTEvent.h"
@@ -64,42 +63,6 @@
 - (BOOL) worksWhenModal {
     return YES;
 }
-// This is a method written using Carbon framework methods to remove
-// All modifiers including "Shift" modifier.
-// Example 1: Shortcut set is "Command Shift m" returns "m"
-// Example 2: Shortcut set is "Command m" returns "m"
-// Example 3: Shortcut set is "Alt Shift ," returns ","
-
-CFStringRef createStringForKey(CGKeyCode keyCode)
-{
-    TISInputSourceRef currentKeyboard = TISCopyCurrentKeyboardInputSource();
-//  currentKeyboard now contains the current input source
-    CFDataRef layoutData =
-    TISGetInputSourceProperty(currentKeyboard,
-                              kTISPropertyUnicodeKeyLayoutData);
-//  the UNICODE keyLayout is fetched from currentKeyboard in layoutData
-    const UCKeyboardLayout *keyboardLayout =
-    (const UCKeyboardLayout *)CFDataGetBytePtr(layoutData);
-//  A read-only data pointer is fetched from layoutData
-    UInt32 keysDown = 0;
-    UniChar chars[4];
-    UniCharCount realLength;
-    
-    UCKeyTranslate(keyboardLayout,
-                   keyCode,
-                   kUCKeyActionDisplay,
-                   0,
-                   LMGetKbdType(),
-                   kUCKeyTranslateNoDeadKeysBit,
-                   &keysDown,
-                   sizeof(chars) / sizeof(chars[0]),
-                   &realLength,
-                   chars);
-    CFRelease(currentKeyboard);
-//  Converts keyCode, modifier and dead-key state into UNICODE characters
-    return CFStringCreateWithCharacters(kCFAllocatorDefault, chars, 1);
-}
-
 // Events
 - (void)handleAction:(NSMenuItem *)sender {
     AWT_ASSERT_APPKIT_THREAD;
@@ -116,35 +79,6 @@ CFStringRef createStringForKey(CGKeyCode keyCode)
     // from this "frameless" menu, because there are no active windows. This
     // means we have to handle it here.
     NSEvent *currEvent = [[NSApplication sharedApplication] currentEvent];
-    if ([currEvent type] == NSKeyDown) {
-        NSString *menuKey = [sender keyEquivalent];
-//      If shortcut is "Command Shift ," the menuKey gets the value ","
-//      But [currEvent charactersIgnoringModifiers]; returns "<" and not ","
-//      because the charactersIgnoreingModifiers does not ignore "Shift"
-//      So a shortcut like "Command Shift m" will return "M" where as the
-//      MenuKey will have the value "m". To remove this issue the below
-//      createStringForKey is used.
-        NSString *eventKey = createStringForKey([currEvent keyCode]);
-        
-//      Apple uses characters from private Unicode range for some of the
-//      keys, so we need to do the same translation here that we do
-//      for the regular key down events
-                if ([eventKey length] == 1) {
-                    unichar origChar = [eventKey characterAtIndex:0];
-                    unichar newChar =  NsCharToJavaChar(origChar, 0);
-                    if (newChar == java_awt_event_KeyEvent_CHAR_UNDEFINED) {
-                        newChar = origChar;
-                    }
-        
-                    eventKey = [NSString stringWithCharacters: &newChar length: 1];
-                }
-        
-        NSWindow *keyWindow = [NSApp keyWindow];
-        if ([menuKey isEqualToString:eventKey] && keyWindow != nil) {
-            return;
-        }
-    }
-    
     if (fIsCheckbox) {
         static JNF_CLASS_CACHE(jc_CCheckboxMenuItem, "sun/lwawt/macosx/CCheckboxMenuItem");
         static JNF_MEMBER_CACHE(jm_ckHandleAction, jc_CCheckboxMenuItem, "handleAction", "(Z)V");
@@ -154,16 +88,47 @@ CFStringRef createStringForKey(CGKeyCode keyCode)
         NSInteger state = [sender state];
         jboolean newState = (state == NSOnState ? JNI_FALSE : JNI_TRUE);
         JNFCallVoidMethod(env, fPeer, jm_ckHandleAction, newState);
-    } else {
-        static JNF_CLASS_CACHE(jc_CMenuItem, "sun/lwawt/macosx/CMenuItem");
-        static JNF_MEMBER_CACHE(jm_handleAction, jc_CMenuItem, "handleAction", "(JI)V"); // AWT_THREADING Safe (event)
-        
-        NSUInteger modifiers = [currEvent modifierFlags];
-        jint javaModifiers = NsKeyModifiersToJavaModifiers(modifiers, NO);
-        
-        JNFCallVoidMethod(env, fPeer, jm_handleAction, UTC(currEvent), javaModifiers); // AWT_THREADING Safe (event)
+    }
+    else {
+        if ([currEvent type] == NSKeyDown) {
+            
+            // Event available through sender variable hence NSApplication
+            // not needed for checking the keyboard input sans the modifier keys
+            // Also, the method used to fetch eventKey earlier would be locale dependent
+            // With earlier implementation, if MenuKey: e EventKey: ा ; if input method
+            // is not U.S. (Devanagari in this case)
+            // With current implementation, EventKey = MenuKey = e irrespective of
+            // input method
+            
+            NSString *eventKey = [sender keyEquivalent];
+            // Apple uses characters from private Unicode range for some of the
+            // keys, so we need to do the same translation here that we do
+            // for the regular key down events
+            if ([eventKey length] == 1) {
+                unichar origChar = [eventKey characterAtIndex:0];
+                unichar newChar =  NsCharToJavaChar(origChar, 0);
+                if (newChar == java_awt_event_KeyEvent_CHAR_UNDEFINED) {
+                    newChar = origChar;
+                }
+                eventKey = [NSString stringWithCharacters: &newChar length: 1];
+            }
+            NSWindow *keyWindow = [NSApp keyWindow];
+            if (keyWindow != nil) {
+                return;
+            }
+            else {
+                static JNF_CLASS_CACHE(jc_CMenuItem, "sun/lwawt/macosx/CMenuItem");
+                static JNF_MEMBER_CACHE(jm_handleAction, jc_CMenuItem, "handleAction", "(JI)V"); // AWT_THREADING Safe (event)
+                
+                NSUInteger modifiers = [currEvent modifierFlags];
+                jint javaModifiers = NsKeyModifiersToJavaModifiers(modifiers, NO);
+                
+                JNFCallVoidMethod(env, fPeer, jm_handleAction, UTC(currEvent), javaModifiers); // AWT_THREADING Safe (event)
+            }
+        }
     }
     JNF_COCOA_EXIT(env);
+    
 }
 
 - (void) setJavaLabel:(NSString *)theLabel shortcut:(NSString *)theKeyEquivalent modifierMask:(jint)modifiers {
diff --git a/jdk/test/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java b/jdk/test/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java
index 1a9f42120e2..589bb9b5744 100644
--- a/jdk/test/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java
+++ b/jdk/test/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java
@@ -21,23 +21,23 @@
  * questions.
  */
 
-/*
+ /*
  * @test
- * @bug 7160951
+ * @bug 7160951 8152492
  * @summary [macosx] ActionListener called twice for JMenuItem using ScreenMenuBar
  * @author vera.akulova@oracle.com
  * @library ../../../../lib/testlibrary
  * @build jdk.testlibrary.OSInfo
  * @run main ActionListenerCalledTwiceTest
  */
-
 import jdk.testlibrary.OSInfo;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 
 public class ActionListenerCalledTwiceTest {
-    static String menuItems[] = { "Item1", "Item2", "Item3", "Item4", "Item5", "Item6" };
+
+    static String menuItems[] = {"Item1", "Item2", "Item3", "Item4", "Item5", "Item6"};
     static KeyStroke keyStrokes[] = {
         KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.META_MASK),
         KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0),
@@ -46,8 +46,10 @@ public class ActionListenerCalledTwiceTest {
         KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_MASK),
         KeyStroke.getKeyStroke(KeyEvent.VK_EQUALS, InputEvent.META_MASK)
     };
-
+    static JMenu menu;
+    static JFrame frame;
     static volatile int listenerCallCounter = 0;
+
     public static void main(String[] args) throws Exception {
         if (OSInfo.getOSType() != OSInfo.OSType.MACOSX) {
             System.out.println("This test is for MacOS only. Automatically passed on other platforms.");
@@ -82,33 +84,38 @@ public class ActionListenerCalledTwiceTest {
             robot.waitForIdle();
 
             if (listenerCallCounter != 1) {
-                throw new Exception("Test failed: ActionListener for " + menuItems[i] +
-                    " called " + listenerCallCounter + " times instead of 1!");
+                throw new Exception("Test failed: ActionListener for " + menuItems[i]
+                        + " called " + listenerCallCounter + " times instead of 1!");
             }
 
             listenerCallCounter = 0;
         }
+        SwingUtilities.invokeAndWait(new Runnable() {
+            public void run() {
+                frame.dispose();
+            }
+        });
     }
 
     private static void createAndShowGUI() {
-        JMenu menu = new JMenu("Menu");
+        menu = new JMenu("Menu");
 
         for (int i = 0; i < menuItems.length; ++i) {
             JMenuItem newItem = new JMenuItem(menuItems[i]);
             newItem.setAccelerator(keyStrokes[i]);
             newItem.addActionListener(
-                new ActionListener(){
-                    public void actionPerformed(ActionEvent e) {
-                        listenerCallCounter++;
-                    }
+                    new ActionListener() {
+                public void actionPerformed(ActionEvent e) {
+                    listenerCallCounter++;
                 }
+            }
             );
             menu.add(newItem);
         }
 
         JMenuBar bar = new JMenuBar();
         bar.add(menu);
-        JFrame frame = new JFrame("Test");
+        frame = new JFrame("Test");
         frame.setJMenuBar(bar);
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         frame.pack();

From eb3750d326afb8d965fe737ac92c7562010b8aef Mon Sep 17 00:00:00 2001
From: Manajit Halder <mhalder@openjdk.org>
Date: Wed, 27 Apr 2016 13:09:58 +0300
Subject: [PATCH 009/228] 8151136: [macosx] According to the description, the
 case is failed

Reviewed-by: ssadetsky, aniyogi
---
 .../macosx/native/libawt_lwawt/awt/AWTEvent.m | 28 +++++++++++++++----
 .../AltGraphModifierTest.java                 | 13 +++++----
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m
index 9b8e370a938..e57074ee74c 100644
--- a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m
+++ b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
@@ -282,11 +282,19 @@ const nsKeyToJavaModifierTable[] =
         //kCGSFlagsMaskAppleLeftAlternateKey,
         //kCGSFlagsMaskAppleRightAlternateKey,
         58,
-        61,
+        0,
         java_awt_event_InputEvent_ALT_DOWN_MASK,
         java_awt_event_InputEvent_ALT_MASK,
         java_awt_event_KeyEvent_VK_ALT
     },
+    {
+        NSAlternateKeyMask,
+        0,
+        61,
+        java_awt_event_InputEvent_ALT_DOWN_MASK | java_awt_event_InputEvent_ALT_GRAPH_DOWN_MASK,
+        java_awt_event_InputEvent_ALT_MASK | java_awt_event_InputEvent_ALT_GRAPH_MASK,
+        java_awt_event_KeyEvent_VK_ALT
+    },
     {
         NSCommandKeyMask,
         //kCGSFlagsMaskAppleLeftCommandKey,
@@ -310,6 +318,8 @@ const nsKeyToJavaModifierTable[] =
     {0, 0, 0, 0, 0, 0}
 };
 
+static BOOL leftAltKeyPressed;
+
 /*
  * Almost all unicode characters just go from NS to Java with no translation.
  *  For the few exceptions, we handle it here with this small table.
@@ -523,13 +533,17 @@ NsKeyModifiersToJavaKeyInfo(NSUInteger nsFlags, unsigned short eventKeyCode,
             //    *javaKeyLocation = java_awt_event_KeyEvent_KEY_LOCATION_RIGHT;
             //}
             if (eventKeyCode == cur->leftKeyCode) {
+                leftAltKeyPressed = YES;
                 *javaKeyLocation = java_awt_event_KeyEvent_KEY_LOCATION_LEFT;
             } else if (eventKeyCode == cur->rightKeyCode) {
                 *javaKeyLocation = java_awt_event_KeyEvent_KEY_LOCATION_RIGHT;
+            } else if (cur->nsMask == NSAlternateKeyMask) {
+                leftAltKeyPressed = NO;
+                continue;
             }
             *javaKeyType = (cur->nsMask & nsFlags) ?
-                java_awt_event_KeyEvent_KEY_PRESSED :
-                java_awt_event_KeyEvent_KEY_RELEASED;
+            java_awt_event_KeyEvent_KEY_PRESSED :
+            java_awt_event_KeyEvent_KEY_RELEASED;
             break;
         }
     }
@@ -545,7 +559,11 @@ jint NsKeyModifiersToJavaModifiers(NSUInteger nsFlags, BOOL isExtMods)
 
     for (cur = nsKeyToJavaModifierTable; cur->nsMask != 0; ++cur) {
         if ((cur->nsMask & nsFlags) != 0) {
-            javaModifiers |= isExtMods? cur->javaExtMask : cur->javaMask;
+            javaModifiers |= isExtMods ? cur->javaExtMask : cur->javaMask;
+            if (cur->nsMask == NSAlternateKeyMask && leftAltKeyPressed == NO) {
+                continue;
+            }
+            break;
         }
     }
 
diff --git a/jdk/test/java/awt/event/MouseEvent/AltGraphModifierTest/AltGraphModifierTest.java b/jdk/test/java/awt/event/MouseEvent/AltGraphModifierTest/AltGraphModifierTest.java
index 92dcc214376..00c471ad7f4 100644
--- a/jdk/test/java/awt/event/MouseEvent/AltGraphModifierTest/AltGraphModifierTest.java
+++ b/jdk/test/java/awt/event/MouseEvent/AltGraphModifierTest/AltGraphModifierTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,7 @@ public class AltGraphModifierTest {
                     "3. If Alt-Gr key is not present, press Ctrl+Alt keys &",
                     "   perform mouse click on the TestWindow.",
                     "4. Test will exit by itself with appropriate result.",
-                    "",
+                    " ",
                     "Linux :-",
                     "1. Please check if Alt-Gr key is present on keyboard.",
                     "2. If present, press the Alt-Gr key and perform",
@@ -63,10 +63,11 @@ public class AltGraphModifierTest {
                     "6. Press Right Alt Key & perform mouse click on the",
                     "   TestWindow",
                     "7. Test will exit by itself with appropriate result.",
-                    "",
+                    " ",
                     "Mac :-",
-                    "   Mac fix is under progress, & will be fixed soon.",
-                    "   Please click Fail"
+                    "1. Press Right Option key on the keyboard and mouse click",
+                    "   on the TestWindow",
+                    "3. Test will exit by itself with appropriate result.",
                 };
 
         Sysout.createDialog();
@@ -77,7 +78,7 @@ public class AltGraphModifierTest {
     public static void initTestWindow() {
         mainFrame = new Frame();
         mainFrame.setTitle("TestWindow");
-        mainFrame.setSize(300, 200);
+        mainFrame.setBounds(700, 10, 300, 300);
         mainFrame.addMouseListener(new MouseAdapter() {
             @Override
             public void mousePressed(MouseEvent e) {

From 8f5fb772b45cce20bdb89917d931c22dc078c034 Mon Sep 17 00:00:00 2001
From: Serguei Spitsyn <sspitsyn@openjdk.org>
Date: Thu, 28 Apr 2016 00:38:21 -0700
Subject: [PATCH 010/228] 8153749: New capability
 can_generate_early_class_hook_events

Add new capability

Reviewed-by: alanb, dsamersoff
---
 jdk/src/java.base/share/native/include/jvmti.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jdk/src/java.base/share/native/include/jvmti.h b/jdk/src/java.base/share/native/include/jvmti.h
index 684fd2d7046..5f8835c0baa 100644
--- a/jdk/src/java.base/share/native/include/jvmti.h
+++ b/jdk/src/java.base/share/native/include/jvmti.h
@@ -704,7 +704,8 @@ typedef struct {
     unsigned int can_generate_resource_exhaustion_heap_events : 1;
     unsigned int can_generate_resource_exhaustion_threads_events : 1;
     unsigned int can_generate_early_vmstart : 1;
-    unsigned int : 6;
+    unsigned int can_generate_early_class_hook_events : 1;
+    unsigned int : 5;
     unsigned int : 16;
     unsigned int : 16;
     unsigned int : 16;

From 0a29c9196258f080fa24e7bac2febfbce479e072 Mon Sep 17 00:00:00 2001
From: Alexander Stepanov <avstepan@openjdk.org>
Date: Thu, 28 Apr 2016 19:35:09 +0300
Subject: [PATCH 011/228] 8155021: [TEST] create one more inheritance test for
 @BeanProperty

Reviewed-by: serb
---
 .../AnonymousClassBeanPropertyTest.java       |  218 ++-
 .../beans/Introspector/BeanPropertyTest.java  |   85 +-
 .../InheritanceBeanPropertyTest.java          | 1281 +++++++++++++++++
 3 files changed, 1552 insertions(+), 32 deletions(-)
 create mode 100644 jdk/test/java/beans/Introspector/InheritanceBeanPropertyTest.java

diff --git a/jdk/test/java/beans/Introspector/AnonymousClassBeanPropertyTest.java b/jdk/test/java/beans/Introspector/AnonymousClassBeanPropertyTest.java
index a8ec7d49188..b5fc3667b94 100644
--- a/jdk/test/java/beans/Introspector/AnonymousClassBeanPropertyTest.java
+++ b/jdk/test/java/beans/Introspector/AnonymousClassBeanPropertyTest.java
@@ -33,7 +33,7 @@ import java.util.Arrays;
 
 /**
  * @test
- * @bug 8132973 8132732 8155013
+ * @bug 8132973 8132732 8155013 8154958
  * @summary Some check for BeanProperty annotation
  * @author a.stepanov
  * @run main AnonymousClassBeanPropertyTest
@@ -62,6 +62,10 @@ public class AnonymousClassBeanPropertyTest {
 
     // ---------- test cases (interfaces) ----------
 
+    public interface IPublic {
+        double getX();
+    }
+
     private interface IGet {
         double getX();
     }
@@ -113,6 +117,10 @@ public class AnonymousClassBeanPropertyTest {
         void setX(double a[]);
     }
 
+    private interface IIs {
+        boolean isX();
+    }
+
 
     // ---------- checks ----------
 
@@ -124,7 +132,7 @@ public class AnonymousClassBeanPropertyTest {
         return ok;
     }
 
-    private static boolean checkInfo(Class<?> c, String what) {
+    private static boolean checkInfo(Class<?> c, String what, boolean checkVals) {
 
         BeanInfo i;
         try { i = Introspector.getBeanInfo(c, Object.class); }
@@ -154,6 +162,8 @@ public class AnonymousClassBeanPropertyTest {
         ok &= check("visualUpdate",
             (boolean) d.getValue("visualUpdate"), UPDATE);
 
+        if (!checkVals) { return ok; }
+
         Object vals[] = (Object[]) d.getValue("enumerationValues");
         if (vals == null) {
             System.out.println("null enumerationValues");
@@ -210,8 +220,10 @@ public class AnonymousClassBeanPropertyTest {
             (boolean) d.getValue("visualUpdate"), !UPDATE);
 
         Object vals[] = (Object[]) d.getValue("enumerationValues");
-        if (vals != null || vals.length > 0) {
-            System.out.println("non-empty enumerationValues");
+        if (vals != null && vals.length > 0) {
+            System.out.println("non-empty enumerationValues:");
+            for (Object v: vals) { System.out.print(v.toString()); }
+            System.out.println();
             return false;
         }
 
@@ -228,6 +240,31 @@ public class AnonymousClassBeanPropertyTest {
 
         //----------------------------------------------------------------------
 
+        // TODO: please uncomment/update after 8154958 fix
+        /*
+        IPublic testPublic = new IPublic() {
+            @BeanProperty(
+                description  = DESCRIPTION,
+                bound        = BOUND,
+                expert       = EXPERT,
+                hidden       = HIDDEN,
+                preferred    = PREFERRED,
+                required     = REQUIRED,
+                visualUpdate = UPDATE,
+                enumerationValues = {V_NAME})
+            @Override
+            public double getX() { return X; }
+
+            public void addPropertyChangeListener(PropertyChangeListener l)    {}
+            public void removePropertyChangeListener(PropertyChangeListener l) {}
+        };
+        ok = checkInfo(testPublic.getClass(), "IPublic", true);
+        System.out.println("OK = " + ok);
+        passed = passed && ok;
+        */
+
+        //----------------------------------------------------------------------
+
         IGet testGet = new IGet() {
             @BeanProperty(
                 description  = DESCRIPTION,
@@ -244,7 +281,7 @@ public class AnonymousClassBeanPropertyTest {
             public void addPropertyChangeListener(PropertyChangeListener l)    {}
             public void removePropertyChangeListener(PropertyChangeListener l) {}
         };
-        ok = checkInfo(testGet.getClass(), "IGet");
+        ok = checkInfo(testGet.getClass(), "IGet", true);
         System.out.println("OK = " + ok);
         passed = passed && ok;
 
@@ -269,7 +306,7 @@ public class AnonymousClassBeanPropertyTest {
             public void addPropertyChangeListener(PropertyChangeListener l)    {}
             public void removePropertyChangeListener(PropertyChangeListener l) {}
         };
-        ok = checkInfo(testSet.getClass(), "ISet");
+        ok = checkInfo(testSet.getClass(), "ISet", true);
         System.out.println("OK = " + ok);
         passed = passed && ok;
 
@@ -294,7 +331,7 @@ public class AnonymousClassBeanPropertyTest {
             public void addPropertyChangeListener(PropertyChangeListener l)    {}
             public void removePropertyChangeListener(PropertyChangeListener l) {}
         };
-        ok = checkInfo(testGetByIndex.getClass(), "IGetByIndex");
+        ok = checkInfo(testGetByIndex.getClass(), "IGetByIndex", true);
         System.out.println("OK = " + ok);
         passed = passed && ok;
 
@@ -319,7 +356,7 @@ public class AnonymousClassBeanPropertyTest {
             public void addPropertyChangeListener(PropertyChangeListener l)    {}
             public void removePropertyChangeListener(PropertyChangeListener l) {}
         };
-        ok = checkInfo(testSetByIndex.getClass(), "ISetByIndex");
+        ok = checkInfo(testSetByIndex.getClass(), "ISetByIndex", true);
         System.out.println("OK = " + ok);
         passed = passed && ok;
 
@@ -346,7 +383,7 @@ public class AnonymousClassBeanPropertyTest {
             public void addPropertyChangeListener(PropertyChangeListener l)    {}
             public void removePropertyChangeListener(PropertyChangeListener l) {}
         };
-        ok = checkInfo(testGetArray.getClass(), "IGetArray");
+        ok = checkInfo(testGetArray.getClass(), "IGetArray", true);
         System.out.println("OK = " + ok);
         passed = passed && ok;
         */
@@ -374,7 +411,7 @@ public class AnonymousClassBeanPropertyTest {
             public void addPropertyChangeListener(PropertyChangeListener l)    {}
             public void removePropertyChangeListener(PropertyChangeListener l) {}
         };
-        ok = checkInfo(testSetArray.getClass(), "ISetArray");
+        ok = checkInfo(testSetArray.getClass(), "ISetArray", true);
         System.out.println("OK = " + ok);
         passed = passed && ok;
         */
@@ -402,7 +439,7 @@ public class AnonymousClassBeanPropertyTest {
             public void addPropertyChangeListener(PropertyChangeListener l)    {}
             public void removePropertyChangeListener(PropertyChangeListener l) {}
         };
-        ok = checkInfo(testGetBoth_1.getClass(), "IGetBoth-1");
+        ok = checkInfo(testGetBoth_1.getClass(), "IGetBoth-1", true);
         System.out.println("OK = " + ok);
         passed = passed && ok;
 
@@ -429,7 +466,7 @@ public class AnonymousClassBeanPropertyTest {
             public void addPropertyChangeListener(PropertyChangeListener l)    {}
             public void removePropertyChangeListener(PropertyChangeListener l) {}
         };
-        ok = checkInfo(testGetBoth_2.getClass(), "IGetBoth-2");
+        ok = checkInfo(testGetBoth_2.getClass(), "IGetBoth-2", true);
         System.out.println("OK = " + ok);
         passed = passed && ok;
         */
@@ -465,11 +502,11 @@ public class AnonymousClassBeanPropertyTest {
             public void addPropertyChangeListener(PropertyChangeListener l)    {}
             public void removePropertyChangeListener(PropertyChangeListener l) {}
         };
-        ok = checkInfo(testGetBoth_3.getClass(), "IGetBoth-3");
+        ok = checkInfo(testGetBoth_3.getClass(), "IGetBoth-3", true);
         System.out.println("OK = " + ok);
         ok2 = checkAlternativeInfo(testGetBoth_3.getClass(), "IGetBoth-3");
         System.out.println("OK = " + ok2);
-        passed = passed && ok && ok2;
+        passed = passed && (ok || ok2);
         */
 
         //----------------------------------------------------------------------
@@ -495,7 +532,7 @@ public class AnonymousClassBeanPropertyTest {
             public void addPropertyChangeListener(PropertyChangeListener l)    {}
             public void removePropertyChangeListener(PropertyChangeListener l) {}
         };
-        ok = checkInfo(testSetBoth_1.getClass(), "ISetBoth-1");
+        ok = checkInfo(testSetBoth_1.getClass(), "ISetBoth-1", true);
         System.out.println("OK = " + ok);
         passed = passed && ok;
 
@@ -522,7 +559,7 @@ public class AnonymousClassBeanPropertyTest {
             public void addPropertyChangeListener(PropertyChangeListener l)    {}
             public void removePropertyChangeListener(PropertyChangeListener l) {}
         };
-        ok = checkInfo(testSetBoth_2.getClass(), "ISetBoth-2");
+        ok = checkInfo(testSetBoth_2.getClass(), "ISetBoth-2", true);
         System.out.println("OK = " + ok);
         passed = passed && ok;
         */
@@ -558,11 +595,11 @@ public class AnonymousClassBeanPropertyTest {
             public void addPropertyChangeListener(PropertyChangeListener l)    {}
             public void removePropertyChangeListener(PropertyChangeListener l) {}
         };
-        ok = checkInfo(testSetBoth_3.getClass(), "ISetBoth-3");
+        ok = checkInfo(testSetBoth_3.getClass(), "ISetBoth-3", true);
         System.out.println("OK = " + ok);
         ok2 = checkAlternativeInfo(testSetBoth_3.getClass(), "ISetBoth-3");
         System.out.println("OK = " + ok2);
-        passed = passed && ok && ok2;
+        passed = passed && (ok || ok2);
         */
 
         //----------------------------------------------------------------------
@@ -588,7 +625,7 @@ public class AnonymousClassBeanPropertyTest {
             public void addPropertyChangeListener(PropertyChangeListener l)    {}
             public void removePropertyChangeListener(PropertyChangeListener l) {}
         };
-        ok = checkInfo(testGetSet_1.getClass(), "IGetSet-1");
+        ok = checkInfo(testGetSet_1.getClass(), "IGetSet-1", true);
         System.out.println("OK = " + ok);
         passed = passed && ok;
 
@@ -614,7 +651,7 @@ public class AnonymousClassBeanPropertyTest {
             public void addPropertyChangeListener(PropertyChangeListener l)    {}
             public void removePropertyChangeListener(PropertyChangeListener l) {}
         };
-        ok = checkInfo(testGetSet_2.getClass(), "IGetSet-2");
+        ok = checkInfo(testGetSet_2.getClass(), "IGetSet-2", true);
         System.out.println("OK = " + ok);
         passed = passed && ok;
 
@@ -649,11 +686,11 @@ public class AnonymousClassBeanPropertyTest {
             public void addPropertyChangeListener(PropertyChangeListener l)    {}
             public void removePropertyChangeListener(PropertyChangeListener l) {}
         };
-        ok = checkInfo(testGetSet_3.getClass(), "IGetSet-3");
+        ok = checkInfo(testGetSet_3.getClass(), "IGetSet-3", true);
         System.out.println("OK = " + ok);
         ok2 = checkAlternativeInfo(testGetSet_3.getClass(), "IGetSet-3");
         System.out.println("OK = " + ok2);
-        passed = passed && ok && ok2;
+        passed = passed && (ok || ok2);
         */
 
         //----------------------------------------------------------------------
@@ -679,7 +716,7 @@ public class AnonymousClassBeanPropertyTest {
             public void addPropertyChangeListener(PropertyChangeListener l)    {}
             public void removePropertyChangeListener(PropertyChangeListener l) {}
         };
-        ok = checkInfo(testGetSetByIndex_1.getClass(), "IGetSetByIndex-1");
+        ok = checkInfo(testGetSetByIndex_1.getClass(), "IGetSetByIndex-1", true);
         System.out.println("OK = " + ok);
         passed = passed && ok;
 
@@ -705,7 +742,7 @@ public class AnonymousClassBeanPropertyTest {
             public void addPropertyChangeListener(PropertyChangeListener l)    {}
             public void removePropertyChangeListener(PropertyChangeListener l) {}
         };
-        ok = checkInfo(testGetSetByIndex_2.getClass(), "IGetSetByIndex-2");
+        ok = checkInfo(testGetSetByIndex_2.getClass(), "IGetSetByIndex-2", true);
         System.out.println("OK = " + ok);
         passed = passed && ok;
 
@@ -744,12 +781,12 @@ public class AnonymousClassBeanPropertyTest {
             public void addPropertyChangeListener(PropertyChangeListener l)    {}
             public void removePropertyChangeListener(PropertyChangeListener l) {}
         };
-        ok = checkInfo(testGetSetByIndex_3.getClass(), "IGetSetByIndex-3");
+        ok = checkInfo(testGetSetByIndex_3.getClass(), "IGetSetByIndex-3", true);
         System.out.println("OK = " + ok);
         ok2 = checkAlternativeInfo(
             testGetSetByIndex_3.getClass(), "IGetSetByIndex-3");
         System.out.println("OK = " + ok2);
-        passed = passed && ok && ok2;
+        passed = passed && (ok || ok2);
         */
 
         //----------------------------------------------------------------------
@@ -781,7 +818,7 @@ public class AnonymousClassBeanPropertyTest {
             public void addPropertyChangeListener(PropertyChangeListener l)    {}
             public void removePropertyChangeListener(PropertyChangeListener l) {}
         };
-        ok = checkInfo(testGetSetBoth_1.getClass(), "IGetSetBoth-1");
+        ok = checkInfo(testGetSetBoth_1.getClass(), "IGetSetBoth-1", true);
         System.out.println("OK = " + ok);
         passed = passed && ok;
         */
@@ -813,7 +850,7 @@ public class AnonymousClassBeanPropertyTest {
             public void addPropertyChangeListener(PropertyChangeListener l)    {}
             public void removePropertyChangeListener(PropertyChangeListener l) {}
         };
-        ok = checkInfo(testGetSetBoth_2.getClass(), "IGetSetBoth-2");
+        ok = checkInfo(testGetSetBoth_2.getClass(), "IGetSetBoth-2", true);
         System.out.println("OK = " + ok);
         passed = passed && ok;
         */
@@ -853,14 +890,135 @@ public class AnonymousClassBeanPropertyTest {
             public void addPropertyChangeListener(PropertyChangeListener l)    {}
             public void removePropertyChangeListener(PropertyChangeListener l) {}
         };
-        ok = checkInfo(testGetSetBoth_3.getClass(), "IGetSetBoth-3");
+        ok = checkInfo(testGetSetBoth_3.getClass(), "IGetSetBoth-3", true);
         System.out.println("OK = " + ok);
         ok2 = checkAlternativeInfo(
             testGetSetBoth_3.getClass(), "IGetSetBoth-3");
         System.out.println("OK = " + ok2);
-        passed = passed && ok && ok2;
+        passed = passed && (ok || ok2);
         */
 
+        //----------------------------------------------------------------------
+
+        IIs testIs_1 = new IIs() {
+
+            @BeanProperty(
+                description  = DESCRIPTION,
+                bound        = BOUND,
+                expert       = EXPERT,
+                hidden       = HIDDEN,
+                preferred    = PREFERRED,
+                required     = REQUIRED,
+                visualUpdate = UPDATE)
+            @Override
+            public boolean isX() { return false; }
+
+            public void addPropertyChangeListener(PropertyChangeListener l)    {}
+            public void removePropertyChangeListener(PropertyChangeListener l) {}
+        };
+        ok = checkInfo(testIs_1.getClass(), "IIs-1", false);
+        System.out.println("OK = " + ok);
+        passed = passed && ok;
+
+
+        IIs testIs_2 = new IIs() {
+
+            private boolean b;
+
+            @Override
+            public boolean isX() { return b; }
+
+            @BeanProperty(
+                description  = DESCRIPTION,
+                bound        = BOUND,
+                expert       = EXPERT,
+                hidden       = HIDDEN,
+                preferred    = PREFERRED,
+                required     = REQUIRED,
+                visualUpdate = UPDATE)
+            public void setX(boolean v) { b = v; }
+
+            public void addPropertyChangeListener(PropertyChangeListener l)    {}
+            public void removePropertyChangeListener(PropertyChangeListener l) {}
+        };
+        ok = checkInfo(testIs_2.getClass(), "IIs-2", false);
+        System.out.println("OK = " + ok);
+        passed = passed && ok;
+
+
+        IIs testIs_3 = new IIs() {
+
+            @BeanProperty(
+                description  = DESCRIPTION,
+                bound        = BOUND,
+                expert       = EXPERT,
+                hidden       = HIDDEN,
+                preferred    = PREFERRED,
+                required     = REQUIRED,
+                visualUpdate = UPDATE)
+            @Override
+            public boolean isX() { return false; }
+
+            @BeanProperty(
+                description  = DESCRIPTION_2,
+                bound        = !BOUND,
+                expert       = !EXPERT,
+                hidden       = !HIDDEN,
+                preferred    = !PREFERRED,
+                required     = !REQUIRED,
+                visualUpdate = !UPDATE)
+            public boolean getX() { return false; }
+
+            public void addPropertyChangeListener(PropertyChangeListener l)    {}
+            public void removePropertyChangeListener(PropertyChangeListener l) {}
+        };
+        ok = checkInfo(testIs_3.getClass(), "IIs-3", false);
+        System.out.println("OK = " + ok);
+        ok2 = checkAlternativeInfo(testIs_3.getClass(), "IIs-3");
+        System.out.println("OK = " + ok2);
+        passed = passed && (ok || ok2);
+
+        // TODO: please uncomment/update after 8132973 fix
+        /*
+        IIs testIs_4 = new IIs() {
+
+            private boolean b;
+
+            @BeanProperty(
+                description  = DESCRIPTION,
+                bound        = BOUND,
+                expert       = EXPERT,
+                hidden       = HIDDEN,
+                preferred    = PREFERRED,
+                required     = REQUIRED,
+                visualUpdate = UPDATE)
+            @Override
+            public boolean isX() { return b; }
+
+            @BeanProperty(
+                description  = DESCRIPTION_2,
+                bound        = !BOUND,
+                expert       = !EXPERT,
+                hidden       = !HIDDEN,
+                preferred    = !PREFERRED,
+                required     = !REQUIRED,
+                visualUpdate = !UPDATE)
+            public void setX(boolean v) { b = v; }
+
+            public void addPropertyChangeListener(PropertyChangeListener l)    {}
+            public void removePropertyChangeListener(PropertyChangeListener l) {}
+        };
+        ok = checkInfo(testIs_4.getClass(), "IIs-4", false);
+        System.out.println("OK = " + ok);
+        ok2 = checkAlternativeInfo(testIs_4.getClass(), "IIs-4");
+        System.out.println("OK = " + ok2);
+        passed = passed && (ok || ok2);
+        */
+
+
+        //----------------------------------------------------------------------
+
+
         if (!passed) { throw new RuntimeException("test failed"); }
         System.out.println("\ntest passed");
     }
diff --git a/jdk/test/java/beans/Introspector/BeanPropertyTest.java b/jdk/test/java/beans/Introspector/BeanPropertyTest.java
index 6f957074c6e..5e84aaaed4e 100644
--- a/jdk/test/java/beans/Introspector/BeanPropertyTest.java
+++ b/jdk/test/java/beans/Introspector/BeanPropertyTest.java
@@ -33,7 +33,7 @@ import java.util.Arrays;
 
 /**
  * @test
- * @bug 8132703 8132163 8132732 8132973 8154756 8132888
+ * @bug 8132703 8132163 8132732 8132973 8154756 8132888 8155103
  * @summary Some check for BeanProperty annotation
  * @author a.stepanov
  * @run main BeanPropertyTest
@@ -853,6 +853,64 @@ public class BeanPropertyTest {
         public void removePropertyChangeListener(PropertyChangeListener l) {}
     }
 
+    // JDK-8155103
+    public static enum E {
+
+        ONE,
+        TWO {
+            @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE,
+            enumerationValues = {V_NAME})
+            public void setX(int v) {}
+
+            public void addPropertyChangeListener(PropertyChangeListener l)    {}
+            public void removePropertyChangeListener(PropertyChangeListener l) {}
+        };
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE,
+            enumerationValues = {V_NAME})
+        public void setX(int v) {}
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+
+    }
+
+    private static enum EB {
+
+        TRUE(true), FALSE(false);
+
+        private boolean b;
+        private EB(boolean v) { b = v; }
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE)
+        public boolean isTrue() { return true; }
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+
+    }
+
 
     // ---------- checks ----------
 
@@ -953,7 +1011,7 @@ public class BeanPropertyTest {
     }
 
     private static boolean ignoreVals(Class<?> c) {
-        return (c.equals(Self.class) || c.equals(SelfArr.class));
+        return (c.equals(Self.class) || c.equals(SelfArr.class)) || c.equals(EB.class);
     }
 
 
@@ -1003,6 +1061,29 @@ public class BeanPropertyTest {
             passed = passed && ok;
         }
 
+        // enums
+
+        Class<?> enumCases[] = {
+
+            // TODO: uncomment/update after 8155103 fix
+            //E.class, E.TWO.getClass(), EB.class
+        };
+
+        int ne = 1;
+        for (Class<?> c: enumCases) {
+
+            System.out.println("\nEnum-" + ne + ":");
+            ne++;
+
+            BeanInfo i;
+            try { i = Introspector.getBeanInfo(c, Object.class); }
+            catch (IntrospectionException e) { throw new RuntimeException(e); }
+            boolean ok = checkInfo(i, !ignoreVals(c));
+            System.out.println(ok ? "OK" : "NOK");
+            passed = passed && ok;
+        }
+
+
         if (!passed) { throw new RuntimeException("test failed"); }
         System.out.println("\ntest passed");
     }
diff --git a/jdk/test/java/beans/Introspector/InheritanceBeanPropertyTest.java b/jdk/test/java/beans/Introspector/InheritanceBeanPropertyTest.java
new file mode 100644
index 00000000000..e42fa6228f3
--- /dev/null
+++ b/jdk/test/java/beans/Introspector/InheritanceBeanPropertyTest.java
@@ -0,0 +1,1281 @@
+/*
+ * Copyright (c) 2016, 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 java.beans.BeanInfo;
+import java.beans.BeanProperty;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyDescriptor;
+
+import java.util.Arrays;
+
+
+/**
+ * @test
+ * @bug 8132565 8155013
+ * @summary Some inheritance check for BeanProperty annotation
+ * @author a.stepanov
+ * @run main InheritanceBeanPropertyTest
+ */
+
+
+public class InheritanceBeanPropertyTest {
+
+    private final static String  DESCRIPTION = "TEST";
+    private final static boolean BOUND       = true;
+    private final static boolean EXPERT      = false;
+    private final static boolean HIDDEN      = true;
+    private final static boolean PREFERRED   = false;
+    private final static boolean REQUIRED    = true;
+    private final static boolean UPDATE      = false;
+
+    private final static double X = java.lang.Math.PI;
+
+    private final static String
+        V_NAME  = "java.lang.Math.PI",
+        V_SHORT = "PI",
+        V = Double.toString(X);
+
+    private final static String DESCRIPTION_2 = "XYZ";
+
+
+    // ---------- test cases ----------
+
+    public static class BaseGet {
+
+        private final static String TESTCASE = "base getter";
+
+        public double getX() { return X; }
+    }
+
+    public static class OverloadGet extends BaseGet {
+
+        private final static String TESTCASE = "overload getter";
+
+        private final double x[] = {X, X, X};
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE,
+            enumerationValues = {V_NAME})
+        public double getX(int i) { return x[i]; } // indexed
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    // ----------
+
+    public static class BaseSet {
+
+        private final static String TESTCASE = "base setter";
+
+        double u;
+        public void setX(double v) { u = v; }
+    }
+
+    public static class OverloadSet extends BaseSet {
+
+        private final static String TESTCASE = "overload setter";
+
+        private final double x[] = {X, X, X};
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE,
+            enumerationValues = {V_NAME})
+        public void setX(int i, double v) { x[i] = v; } // indexed
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    // ----------
+
+    public static class BaseIGet {
+
+        protected final double x[] = {X, X, X};
+        public double[] getX() { return x; }
+    }
+
+    public static class OverloadIGet extends BaseIGet {
+
+        private final static String TESTCASE = "overload indexed getter";
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE,
+            enumerationValues = {V_NAME})
+        public double getX(int i) { return x[i]; }
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    // ----------
+
+    public static class BaseISet {
+
+        protected double x[] = {X, X, X};
+        public void setX(double a[]) { x = Arrays.copyOf(a, a.length); }
+    }
+
+    public static class OverloadISet extends BaseISet {
+
+        private final static String TESTCASE = "overload indexed setter";
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE,
+            enumerationValues = {V_NAME})
+        public void setX(int i, double v) { x[i] = v; }
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    // ----------
+
+    public static class BoolGet {
+
+        @BeanProperty(
+            description  = DESCRIPTION_2,
+            bound        = !BOUND,
+            expert       = !EXPERT,
+            hidden       = !HIDDEN,
+            preferred    = !PREFERRED,
+            required     = !REQUIRED,
+            visualUpdate = !UPDATE)
+        public boolean getX() { return false; }
+    }
+
+    public static class BoolGetIs extends BoolGet {
+
+        private final static String TESTCASE = "base boolean getter + is";
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE)
+        public boolean isX() { return false; }
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+    // ----------
+
+    public static class BoolIs {
+
+        @BeanProperty(
+            description  = DESCRIPTION_2,
+            bound        = !BOUND,
+            expert       = !EXPERT,
+            hidden       = !HIDDEN,
+            preferred    = !PREFERRED,
+            required     = !REQUIRED,
+            visualUpdate = !UPDATE)
+        public boolean isX() { return false; }
+    }
+
+    public static class BoolIsGet extends BoolIs {
+
+        private final static String TESTCASE = "base is + boolean getter";
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE)
+        public boolean getX() { return false; }
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    // ----------
+
+    public static class AnnotatedGet {
+
+        private final static String TESTCASE = "annotated super getter";
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE,
+            enumerationValues = {V_NAME})
+        public double getX() { return 0.; }
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    public static class OverrideAnnotatedGet extends AnnotatedGet {
+
+        private final static String TESTCASE = "override annotated getter";
+
+        @Override
+        public double getX() { return X; }
+    }
+
+    // ----------
+
+    public static class AnnotatedIs {
+
+        private final static String TESTCASE = "annotated super is";
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE,
+            enumerationValues = {V_NAME})
+        public boolean isX() { return false; }
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    public static class OverrideAnnotatedIs extends AnnotatedIs {
+
+        private final static String TESTCASE = "override annotated is";
+
+        @Override
+        public boolean isX() { return false; }
+    }
+
+    // ----------
+
+    public static class AnnotatedSet {
+
+        private final static String TESTCASE = "annotated super set";
+
+        protected double x;
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE,
+            enumerationValues = {V_NAME})
+        public void setX(double v) { x = -v; }
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    public static class OverrideAnnotatedSet extends AnnotatedSet {
+
+        private final static String TESTCASE = "override annotated setter";
+
+        @Override
+        public void setX(double v) { x = v; }
+    }
+
+    // ----------
+
+    public static class AnnotatedGet2 {
+
+        protected double x;
+
+        @BeanProperty(
+            description  = DESCRIPTION_2,
+            bound        = !BOUND,
+            expert       = !EXPERT,
+            hidden       = !HIDDEN,
+            preferred    = !PREFERRED,
+            required     = !REQUIRED,
+            visualUpdate = !UPDATE)
+        public double getX() { return 0.; }
+    }
+
+    public static class OverrideAnnotatedGet2 extends AnnotatedGet2 {
+
+        private final static String TESTCASE = "override annotated getter - 2";
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE,
+            enumerationValues = {V_NAME})
+        @Override
+        public double getX() { return X; }
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    public static class AnnotatedGet2Ext extends AnnotatedGet2 {
+
+        private final static String TESTCASE = "extend annotated getter - 2";
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE,
+            enumerationValues = {V_NAME})
+        public void setX(double v) { x = v; }
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    // ----------
+
+    public static class AnnotatedIs2 {
+
+        protected boolean b = false;
+
+        @BeanProperty(
+            description  = DESCRIPTION_2,
+            bound        = !BOUND,
+            expert       = !EXPERT,
+            hidden       = !HIDDEN,
+            preferred    = !PREFERRED,
+            required     = !REQUIRED,
+            visualUpdate = !UPDATE)
+        public boolean isX() { return false; }
+    }
+
+    public static class OverrideAnnotatedIs2 extends AnnotatedIs2 {
+
+        private final static String TESTCASE = "override annotated is - 2";
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE)
+        @Override
+        public boolean isX() { return b; }
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    public static class AnnotatedIs2Ext extends AnnotatedIs2 {
+
+        private final static String TESTCASE = "extend annotated is - 2";
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE)
+        public void setX(boolean v) { b = v; }
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    // ----------
+
+    public static class AnnotatedSet2 {
+
+        protected double x;
+
+        @BeanProperty(
+            description  = DESCRIPTION_2,
+            bound        = !BOUND,
+            expert       = !EXPERT,
+            hidden       = !HIDDEN,
+            preferred    = !PREFERRED,
+            required     = !REQUIRED,
+            visualUpdate = !UPDATE)
+        public void setX(double v) { x = -v; }
+    }
+
+    public static class OverrideAnnotatedSet2 extends AnnotatedSet2 {
+
+        private final static String TESTCASE = "override annotated setter - 2";
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE,
+            enumerationValues = {V_NAME})
+        @Override
+        public void setX(double v) { x = v; }
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    public static class AnnotatedSet2Ext extends AnnotatedSet2 {
+
+        private final static String TESTCASE = "extend annotated setter - 2";
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE,
+            enumerationValues = {V_NAME})
+        public double getX() { return x; }
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    // ----------
+
+    public abstract static class AbstractGet {
+
+        @BeanProperty(
+            description  = DESCRIPTION_2,
+            bound        = !BOUND,
+            expert       = !EXPERT,
+            hidden       = !HIDDEN,
+            preferred    = !PREFERRED,
+            required     = !REQUIRED,
+            visualUpdate = !UPDATE)
+        public abstract double getX();
+    }
+
+    public static class OverrideAbstractGet extends AbstractGet {
+
+        private final static String TESTCASE =
+            "override abstract annotated getter";
+
+        @Override
+        public double getX() { return X; }
+    }
+
+    public static class OverrideAbstractGet2 extends AbstractGet {
+
+        private final static String TESTCASE =
+            "override abstract annotated getter - 2";
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE,
+            enumerationValues = {V_NAME})
+        @Override
+        public double getX() { return X; }
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    public abstract static class AbstractGetExt extends AbstractGet {
+
+        private final static String TESTCASE =
+            "extend abstract annotated getter";
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE,
+            enumerationValues = {V_NAME})
+        public abstract void setX(double v);
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    // ----------
+
+    public abstract static class AbstractIs {
+
+        @BeanProperty(
+            description  = DESCRIPTION_2,
+            bound        = !BOUND,
+            expert       = !EXPERT,
+            hidden       = !HIDDEN,
+            preferred    = !PREFERRED,
+            required     = !REQUIRED,
+            visualUpdate = !UPDATE)
+        public abstract boolean isX();
+    }
+
+    public static class OverrideAbstractIs extends AbstractIs {
+
+        private final static String TESTCASE =
+            "override abstract annotated is";
+
+        @Override
+        public boolean isX() { return true; }
+    }
+
+    public static class OverrideAbstractIs2 extends AbstractIs {
+
+        private final static String TESTCASE =
+            "override abstract annotated is - 2";
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE)
+        @Override
+        public boolean isX() { return true; }
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+
+    public abstract static class AbstractIsExt extends AbstractIs {
+
+        private final static String TESTCASE =
+            "extend abstract annotated is";
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE)
+        public abstract boolean getX();
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    // ----------
+
+    public abstract static class AbstractSet {
+
+        @BeanProperty(
+            description  = DESCRIPTION_2,
+            bound        = !BOUND,
+            expert       = !EXPERT,
+            hidden       = !HIDDEN,
+            preferred    = !PREFERRED,
+            required     = !REQUIRED,
+            visualUpdate = !UPDATE)
+        public abstract void setX(double v);
+    }
+
+    public static class OverrideAbstractSet extends AbstractSet {
+
+        private final static String TESTCASE =
+            "override abstract annotated setter";
+
+        private double x;
+
+        @Override
+        public void setX(double v) { x = v; }
+    }
+
+    public static class OverrideAbstractSet2 extends AbstractSet {
+
+        private final static String TESTCASE =
+            "override abstract annotated setter - 2";
+
+        private double x;
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE,
+            enumerationValues = {V_NAME})
+        @Override
+        public void setX(double v) { x = v; }
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    public abstract static class AbstractSetExt extends AbstractSet {
+
+        private final static String TESTCASE =
+            "extend abstract annotated setter";
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE,
+            enumerationValues = {V_NAME})
+        public abstract void setX(double v[]);
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    // ----------
+
+    public static abstract class AbstractGet2 {
+
+        private final static String TESTCASE = "abstract super getter";
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE,
+            enumerationValues = {V_NAME})
+        public abstract double getX();
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    public static abstract class AbstractGet2Ext extends AbstractGet2 {
+
+        @BeanProperty(
+            description  = DESCRIPTION_2,
+            bound        = !BOUND,
+            expert       = !EXPERT,
+            hidden       = !HIDDEN,
+            preferred    = !PREFERRED,
+            required     = !REQUIRED,
+            visualUpdate = !UPDATE)
+        public abstract void setX(double a[]);
+    }
+
+    // ----------
+
+    public static interface IGet {
+
+        @BeanProperty(
+            description  = DESCRIPTION_2,
+            bound        = !BOUND,
+            expert       = !EXPERT,
+            hidden       = !HIDDEN,
+            preferred    = !PREFERRED,
+            required     = !REQUIRED,
+            visualUpdate = !UPDATE)
+        double getX();
+    }
+
+    public static class IGetImpl implements IGet {
+
+        private final static String TESTCASE = "implement getter interface";
+
+        @Override
+        public double getX() { return X; }
+    }
+
+    public static class IGetImpl2 implements IGet {
+
+        private final static String TESTCASE = "implement getter interface - 2";
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE,
+            enumerationValues = {V_NAME})
+        @Override
+        public double getX() { return X; }
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    public abstract static class IGetImpl3 implements IGet {
+
+        private final static String TESTCASE = "implement getter interface - 3";
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE,
+            enumerationValues = {V_NAME})
+        public abstract void setX(double v);
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    // ----------
+
+    public static interface IIs {
+
+        @BeanProperty(
+            description  = DESCRIPTION_2,
+            bound        = !BOUND,
+            expert       = !EXPERT,
+            hidden       = !HIDDEN,
+            preferred    = !PREFERRED,
+            required     = !REQUIRED,
+            visualUpdate = !UPDATE)
+        public boolean isX();
+    }
+
+    public static class IIsImpl implements IIs {
+
+        private final static String TESTCASE = "implement is interface";
+
+        @Override
+        public boolean isX() { return true; }
+    }
+
+    public static class IIsImpl2 implements IIs {
+
+        private final static String TESTCASE = "implement is interface - 2";
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE)
+        @Override
+        public boolean isX() { return true; }
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    public abstract static class IIsImpl3 implements IIs {
+
+        private final static String TESTCASE = "implement is interface - 3";
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE)
+        public abstract void setX(boolean v);
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    // ----------
+
+    public static interface ISet {
+
+        @BeanProperty(
+            description  = DESCRIPTION_2,
+            bound        = !BOUND,
+            expert       = !EXPERT,
+            hidden       = !HIDDEN,
+            preferred    = !PREFERRED,
+            required     = !REQUIRED,
+            visualUpdate = !UPDATE)
+        public void setX(double v);
+    }
+
+    public static class ISetImpl implements ISet {
+
+        private final static String TESTCASE = "implement getter interface";
+
+        private double x;
+
+        @Override
+        public void setX(double v) { x = v; }
+    }
+
+    public static class ISetImpl2 implements ISet {
+
+        private final static String TESTCASE = "implement getter interface - 2";
+
+        private double x;
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE,
+            enumerationValues = {V_NAME})
+        @Override
+        public void setX(double v) { x = v; }
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    public abstract static class ISetImpl3 implements ISet {
+
+        private final static String TESTCASE = "implement getter interface - 3";
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE,
+            enumerationValues = {V_NAME})
+        public abstract double getX();
+
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    // ----------
+
+    public static interface ISet2 {
+
+        final static String TESTCASE = "super interface - setter";
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE,
+            enumerationValues = {V_NAME})
+        public void setX(double v);
+
+        public void addPropertyChangeListener(PropertyChangeListener l);
+        public void removePropertyChangeListener(PropertyChangeListener l);
+    }
+
+    public static class ISet2Impl implements ISet2 {
+
+        private double x;
+
+        @BeanProperty(
+            description  = DESCRIPTION_2,
+            bound        = !BOUND,
+            expert       = !EXPERT,
+            hidden       = !HIDDEN,
+            preferred    = !PREFERRED,
+            required     = !REQUIRED,
+            visualUpdate = !UPDATE)
+        @Override
+        public void setX(double v) { x = v; }
+
+        @Override
+        public void addPropertyChangeListener(PropertyChangeListener l) {}
+        @Override
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    // ----------
+
+    public static interface IGet2 {
+
+        final static String TESTCASE = "super interface - indexed getter";
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE,
+            enumerationValues = {V_NAME})
+        public double[] getX();
+
+        public void addPropertyChangeListener(PropertyChangeListener l);
+        public void removePropertyChangeListener(PropertyChangeListener l);
+    }
+
+    public static class IGet2Impl implements IGet2 {
+
+        @BeanProperty(
+            description  = DESCRIPTION_2,
+            bound        = !BOUND,
+            expert       = !EXPERT,
+            hidden       = !HIDDEN,
+            preferred    = !PREFERRED,
+            required     = !REQUIRED,
+            visualUpdate = !UPDATE)
+        @Override
+        public double[] getX() { return new double[]{X, X}; }
+
+        @Override
+        public void addPropertyChangeListener(PropertyChangeListener l) {}
+        @Override
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    // ----------
+
+    public static class ProtectedGet {
+
+        @BeanProperty(
+            description  = DESCRIPTION_2,
+            bound        = !BOUND,
+            expert       = !EXPERT,
+            hidden       = !HIDDEN,
+            preferred    = !PREFERRED,
+            required     = !REQUIRED,
+            visualUpdate = !UPDATE)
+        protected double getX() { return 0.; }
+    }
+
+    public static class OverrideProtectedGet extends ProtectedGet {
+
+        final static String TESTCASE = "override protected getter";
+
+        @BeanProperty(
+            description  = DESCRIPTION,
+            bound        = BOUND,
+            expert       = EXPERT,
+            hidden       = HIDDEN,
+            preferred    = PREFERRED,
+            required     = REQUIRED,
+            visualUpdate = UPDATE,
+            enumerationValues = {V_NAME})
+        @Override
+        public double getX() { return X; }
+
+        public void addPropertyChangeListener(PropertyChangeListener l) {}
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    // ----------
+
+    // static getter - see also JDK-8154938
+    public static class StaticGet {
+
+        @BeanProperty(
+            description  = DESCRIPTION_2,
+            bound        = !BOUND,
+            expert       = !EXPERT,
+            hidden       = !HIDDEN,
+            preferred    = !PREFERRED,
+            required     = !REQUIRED,
+            visualUpdate = !UPDATE)
+        public static double getProp() { return 0.; }
+    }
+
+    public static class HideStaticGet extends StaticGet {
+
+        final static String TESTCASE = "hide static getter";
+
+        public double getX() { return X; } // add to get the "default" info
+        public static double getProp() { return X; }
+    }
+
+    // TODO: if 8154938 is considered to be a real issue,
+    // create one more test case "HideStaticGet2 extends StaticGet" with an
+    // annotated getter and check the correctness of the corresponding bean info
+
+    // ---------- checks ----------
+
+    private static boolean check(String what, boolean v, boolean ref) {
+
+        boolean ok = (v == ref);
+        if (!ok) { System.out.println(
+            "invalid " + what + ": " + v + ", expected: " + ref); }
+        return ok;
+    }
+
+    private static boolean checkInfo(BeanInfo i, boolean ignoreValsCheck) {
+
+        System.out.println("checking info...");
+
+        PropertyDescriptor descriptors[] = i.getPropertyDescriptors();
+        int nd = descriptors.length;
+        if (nd != 1) {
+            System.out.println("invalid number of descriptors: " + nd);
+            return false;
+        }
+
+        PropertyDescriptor d = descriptors[0];
+
+        String descr = d.getShortDescription();
+        boolean ok = descr.equals(DESCRIPTION);
+        if (!ok) { System.out.println("invalid description: " + descr +
+                ", expected: " + DESCRIPTION); }
+
+        ok &= check("isBound",  d.isBound(),  BOUND);
+        ok &= check("isExpert", d.isExpert(), EXPERT);
+        ok &= check("isHidden", d.isHidden(), HIDDEN);
+        ok &= check("isPreferred", d.isPreferred(), PREFERRED);
+        ok &= check("required", (boolean) d.getValue("required"), REQUIRED);
+        ok &= check("visualUpdate",
+            (boolean) d.getValue("visualUpdate"), UPDATE);
+
+        if (ignoreValsCheck) { return ok; }
+
+        Object vals[] = (Object[]) d.getValue("enumerationValues");
+        if (vals == null) {
+            System.out.println("null enumerationValues");
+            return false;
+        }
+
+        boolean okVals = (
+            (vals.length == 3) &&
+             vals[0].toString().equals(V_SHORT) &&
+             vals[1].toString().equals(V)       &&
+             vals[2].toString().equals(V_NAME));
+
+        if (!okVals) { System.out.println("invalid enumerationValues"); }
+
+        return (ok && okVals);
+    }
+
+    private static boolean checkDefault(BeanInfo i) {
+
+        System.out.println("checking default info...");
+
+        PropertyDescriptor descriptors[] = i.getPropertyDescriptors();
+        int nd = descriptors.length;
+        if (nd != 1) {
+            System.out.println("invalid number of descriptors: " + nd);
+            return false;
+        }
+
+        PropertyDescriptor d = descriptors[0];
+
+        String descr = d.getShortDescription();
+        boolean ok = descr.equals("x");
+        if (!ok) { System.out.println("invalid description: " + descr +
+                ", expected: x"); }
+
+        ok &= check("isBound",  d.isBound(),  false);
+        ok &= check("isExpert", d.isExpert(), false);
+        ok &= check("isHidden", d.isHidden(), false);
+        ok &= check("isPreferred", d.isPreferred(), false);
+        ok &= check("required", (boolean) d.getValue("required"), false);
+        ok &= check("visualUpdate",
+            (boolean) d.getValue("visualUpdate"), false);
+
+        Object vals[] = (Object[]) d.getValue("enumerationValues");
+        if (vals != null && vals.length > 0) {
+            System.out.println("non-empty enumerationValues");
+            ok = false;
+        }
+
+        return ok;
+    }
+
+    // do not check enumerationValues for these classes
+    private static boolean ignoreVals(Class<?> c) {
+        return (
+            c.equals(BoolGetIs.class)            ||
+            c.equals(BoolIsGet.class)            ||
+            c.equals(AnnotatedIs.class)          ||
+            c.equals(OverrideAnnotatedIs2.class) ||
+            c.equals(AnnotatedIs2Ext.class)      ||
+            c.equals(OverrideAbstractIs.class)   ||
+            c.equals(OverrideAbstractIs2.class)  ||
+            c.equals(AbstractIsExt.class)        ||
+            c.equals(OverrideAbstractIs.class)   ||
+            c.equals(IIsImpl.class)              ||
+            c.equals(IIsImpl2.class)             ||
+            c.equals(IIsImpl3.class)
+        );
+    }
+
+    // default property descriptor data are expected for these classes
+    private static boolean isDefault(Class<?> c) {
+        return (
+            c.equals(OverrideAnnotatedGet.class) ||
+            c.equals(OverrideAnnotatedIs.class ) ||
+            c.equals(OverrideAnnotatedSet.class) ||
+            c.equals(OverrideAbstractGet.class)  ||
+            c.equals(OverrideAbstractIs.class)   ||
+            c.equals(OverrideAbstractSet.class)  ||
+            c.equals(IGetImpl.class)             ||
+            c.equals(IIsImpl.class)              ||
+            c.equals(ISetImpl.class)             ||
+            c.equals(BaseGet.class)              ||
+            c.equals(BaseSet.class)              ||
+            c.equals(HideStaticGet.class)
+        );
+    }
+
+
+    // ---------- run test ----------
+
+    public static void main(String[] args) throws Exception {
+
+        Class<?>
+            ic1 = ISet2Impl.class.getInterfaces()[0],
+            ic2 = IGet2Impl.class.getInterfaces()[0];
+
+        Class<?> cases[] = {
+
+            OverloadGet.class,
+            OverloadGet.class.getSuperclass(),
+            OverloadSet.class,
+            OverloadSet.class.getSuperclass(),
+            OverloadIGet.class,
+            OverloadISet.class,
+
+            // TODO: uncomment/update after 8132565 fix
+            //BoolGetIs.class,
+            //BoolIsGet.class,
+            //OverrideAnnotatedGet.class,
+            //OverrideAnnotatedIs.class,
+            //OverrideAnnotatedSet.class,
+            //OverrideAnnotatedGet2.class,
+            //AnnotatedGet2Ext.class,
+            //OverrideAnnotatedIs2.class
+            //AnnotatedIs2Ext.class,
+            //OverrideAnnotatedSet2.class,
+            //AnnotatedSet2Ext.class,
+
+            OverrideAnnotatedGet.class.getSuperclass(),
+            OverrideAnnotatedIs.class.getSuperclass(),
+            OverrideAnnotatedSet.class.getSuperclass(),
+
+            // TODO: uncomment/update after 8132565 fix
+            //OverrideAbstractGet.class,
+            //OverrideAbstractGet2.class,
+            //AbstractGetExt.class,
+            //OverrideAbstractIs.class,
+            //OverrideAbstractIs2.class,
+            //AbstractIsExt.class
+            //OverrideAbstractSet.class,
+            //OverrideAbstractSet2.class,
+            //AbstractSetExt.class,
+
+            AbstractGet2Ext.class.getSuperclass(),
+            IGetImpl.class,
+            IGetImpl2.class,
+            IGetImpl3.class,
+            IIsImpl.class,
+            IIsImpl2.class,
+            IIsImpl3.class,
+            ISetImpl.class,
+            ISetImpl2.class,
+            ISetImpl3.class,
+            ic1,
+            // ic2,  // TODO: uncomment/update after 8155013 fix
+            OverrideProtectedGet.class,
+            HideStaticGet.class
+        };
+
+        boolean passed = true;
+
+        for (Class<?> c: cases) {
+
+            java.lang.reflect.Field f = c.getDeclaredField("TESTCASE");
+            f.setAccessible(true);
+            String descr = f.get(c).toString();
+
+            System.out.println("\n" + c.getSimpleName() + " (" + descr + "):");
+            BeanInfo i;
+            try {
+                i = Introspector.getBeanInfo(c,
+                    (c.equals(ic1) || c.equals(ic2)) ? null : Object.class);
+            }
+            catch (IntrospectionException e) { throw new RuntimeException(e); }
+
+            boolean ok;
+
+            if (isDefault(c)) {
+                ok = checkDefault(i);
+            } else {
+                ok = checkInfo(i, ignoreVals(c));
+            }
+            System.out.println(ok ? "OK" : "NOK");
+            passed = passed && ok;
+        }
+
+        if (!passed) { throw new RuntimeException("test failed"); }
+        System.out.println("\ntest passed");
+    }
+}

From 8499a7a0b3f0c80504025ce37b58d1026b7a9b4d Mon Sep 17 00:00:00 2001
From: Alexander Scherbatiy <alexsch@openjdk.org>
Date: Thu, 28 Apr 2016 23:48:37 +0400
Subject: [PATCH 012/228] 8152677: [macosx] All files filter can't be selected
 in JFileChooser

Reviewed-by: serb
---
 .../com/apple/laf/AquaFileChooserUI.java      |  13 ++-
 .../8152677/SelectAllFilesFilterTest.java     | 108 ++++++++++++++++++
 2 files changed, 118 insertions(+), 3 deletions(-)
 create mode 100644 jdk/test/javax/swing/JFileChooser/8152677/SelectAllFilesFilterTest.java

diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java
index 91e1e4e8c39..eaade120e04 100644
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java
@@ -112,7 +112,7 @@ public class AquaFileChooserUI extends FileChooserUI {
     private AncestorListener ancestorListener = null;
     private DropTarget dragAndDropTarget = null;
 
-    private final AcceptAllFileFilter acceptAllFileFilter = new AcceptAllFileFilter();
+    private static final AcceptAllFileFilter acceptAllFileFilter = new AcceptAllFileFilter();
 
     private AquaFileSystemModel model;
 
@@ -997,7 +997,7 @@ public class AquaFileChooserUI extends FileChooserUI {
     // *****************************************
     // ***** default AcceptAll file filter *****
     // *****************************************
-    protected class AcceptAllFileFilter extends FileFilter {
+    private static class AcceptAllFileFilter extends FileFilter {
         public AcceptAllFileFilter() {
         }
 
@@ -1305,6 +1305,8 @@ public class AquaFileChooserUI extends FileChooserUI {
     protected class FilterComboBoxModel extends AbstractListModel<FileFilter> implements ComboBoxModel<FileFilter>,
             PropertyChangeListener {
         protected FileFilter[] filters;
+        Object oldFileFilter = getFileChooser().getFileFilter();
+
         protected FilterComboBoxModel() {
             super();
             filters = getFileChooser().getChoosableFileFilters();
@@ -1321,12 +1323,17 @@ public class AquaFileChooserUI extends FileChooserUI {
         }
 
         public void setSelectedItem(Object filter) {
-            if (filter != null && !containsFileFilter(filter)) {
+            if (filter != null && !isSelectedFileFilterInModel(filter)) {
+                oldFileFilter = filter;
                 getFileChooser().setFileFilter((FileFilter) filter);
                 fireContentsChanged(this, -1, -1);
             }
         }
 
+        private boolean isSelectedFileFilterInModel(Object filter) {
+            return Objects.equals(filter, oldFileFilter);
+        }
+
         public Object getSelectedItem() {
             // Ensure that the current filter is in the list.
             // NOTE: we shouldnt' have to do this, since JFileChooser adds
diff --git a/jdk/test/javax/swing/JFileChooser/8152677/SelectAllFilesFilterTest.java b/jdk/test/javax/swing/JFileChooser/8152677/SelectAllFilesFilterTest.java
new file mode 100644
index 00000000000..bc17b04a306
--- /dev/null
+++ b/jdk/test/javax/swing/JFileChooser/8152677/SelectAllFilesFilterTest.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2016, 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 java.awt.Component;
+import java.awt.Container;
+import java.awt.Robot;
+import javax.swing.JComboBox;
+import javax.swing.JFileChooser;
+import javax.swing.JLabel;
+import javax.swing.SwingUtilities;
+import javax.swing.filechooser.FileFilter;
+import javax.swing.filechooser.FileNameExtensionFilter;
+
+/*
+ * @test
+ * @bug 8152677
+ * @requires (os.family == "mac")
+ * @summary [macosx] All files filter can't be selected in JFileChooser
+ * @run main SelectAllFilesFilterTest
+ */
+
+public class SelectAllFilesFilterTest {
+
+    private static final String LABEL_TEXT = "File Format:";
+    private static volatile JFileChooser fileChooser;
+    private static JComboBox comboBox;
+
+    public static void main(String[] args) throws Exception {
+
+        SwingUtilities.invokeLater(SelectAllFilesFilterTest::createAndShowGUI);
+
+        while (fileChooser == null) {
+            Thread.sleep(100);
+        }
+
+        Robot robot = new Robot();
+        robot.waitForIdle();
+
+        SwingUtilities.invokeAndWait(() -> {
+            comboBox = findComboBox(fileChooser);
+            comboBox.setSelectedIndex(0);
+        });
+        robot.waitForIdle();
+
+        SwingUtilities.invokeAndWait(() -> {
+            int selectedIndex = comboBox.getSelectedIndex();
+            fileChooser.setVisible(false);
+
+            if (selectedIndex != 0) {
+                throw new RuntimeException("Select All file filter is not selected!");
+            }
+        });
+    }
+
+    private static void createAndShowGUI() {
+        fileChooser = new JFileChooser();
+        fileChooser.setAcceptAllFileFilterUsed(true);
+        fileChooser.setDialogType(JFileChooser.OPEN_DIALOG);
+
+        FileFilter txtFilter = new FileNameExtensionFilter("Text files", "txt");
+        fileChooser.addChoosableFileFilter(txtFilter);
+        fileChooser.setFileFilter(txtFilter);
+        fileChooser.showOpenDialog(null);
+    }
+
+    private static JComboBox findComboBox(Component comp) {
+
+        if (comp instanceof JLabel) {
+            JLabel label = (JLabel) comp;
+            if (LABEL_TEXT.equals(label.getText())) {
+                return (JComboBox) label.getLabelFor();
+            }
+        }
+
+        if (comp instanceof Container) {
+            Container cont = (Container) comp;
+            for (int i = 0; i < cont.getComponentCount(); i++) {
+
+                JComboBox result = findComboBox(cont.getComponent(i));
+                if (result != null) {
+                    return result;
+                }
+            }
+        }
+
+        return null;
+    }
+}

From c7f8bb25dda6a009f279ea160a6d255fb4140fcb Mon Sep 17 00:00:00 2001
From: Nils Eliasson <neliasso@openjdk.org>
Date: Fri, 29 Apr 2016 09:40:08 +0200
Subject: [PATCH 013/228] 8142464: PlatformLoggerTest.java throws
 java.lang.RuntimeException: Logger test.logger.bar does not exist

Test doesn't keep strong references to loggers

Reviewed-by: kvn
---
 jdk/test/sun/util/logging/PlatformLoggerTest.java | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/jdk/test/sun/util/logging/PlatformLoggerTest.java b/jdk/test/sun/util/logging/PlatformLoggerTest.java
index 0bf94d64a5a..913390161e4 100644
--- a/jdk/test/sun/util/logging/PlatformLoggerTest.java
+++ b/jdk/test/sun/util/logging/PlatformLoggerTest.java
@@ -31,7 +31,6 @@
  *
  * @modules java.base/sun.util.logging
  *          java.logging/sun.util.logging.internal
- * @compile -XDignore.symbol.file PlatformLoggerTest.java
  * @run main/othervm PlatformLoggerTest
  */
 
@@ -42,25 +41,31 @@ import sun.util.logging.PlatformLogger;
 import static sun.util.logging.PlatformLogger.Level.*;
 
 public class PlatformLoggerTest {
+
+    static Logger logger;
+    static PlatformLogger bar;
+    static PlatformLogger goo;
+    static PlatformLogger foo;
+
     public static void main(String[] args) throws Exception {
         final String FOO_PLATFORM_LOGGER = "test.platformlogger.foo";
         final String BAR_PLATFORM_LOGGER = "test.platformlogger.bar";
         final String GOO_PLATFORM_LOGGER = "test.platformlogger.goo";
         final String BAR_LOGGER = "test.logger.bar";
-        PlatformLogger goo = PlatformLogger.getLogger(GOO_PLATFORM_LOGGER);
+        goo = PlatformLogger.getLogger(GOO_PLATFORM_LOGGER);
         // test the PlatformLogger methods
         testLogMethods(goo);
 
         // Create a platform logger using the default
-        PlatformLogger foo = PlatformLogger.getLogger(FOO_PLATFORM_LOGGER);
+        foo = PlatformLogger.getLogger(FOO_PLATFORM_LOGGER);
         checkPlatformLogger(foo, FOO_PLATFORM_LOGGER);
 
         // create a java.util.logging.Logger
         // now java.util.logging.Logger should be created for each platform logger
-        Logger logger = Logger.getLogger(BAR_LOGGER);
+        logger = Logger.getLogger(BAR_LOGGER);
         logger.setLevel(Level.WARNING);
 
-        PlatformLogger bar = PlatformLogger.getLogger(BAR_PLATFORM_LOGGER);
+        bar = PlatformLogger.getLogger(BAR_PLATFORM_LOGGER);
         checkPlatformLogger(bar, BAR_PLATFORM_LOGGER);
 
         // test the PlatformLogger methods

From a94f4aafd20dafa1ac27e3e0e7a5a1f18e2c750b Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Fri, 29 Apr 2016 15:44:04 +0300
Subject: [PATCH 014/228] 8143346: Broken link in java.beans.XMLEncoder

Reviewed-by: prr
---
 jdk/src/demo/share/jvmti/index.html                |  2 +-
 .../libawt_lwawt/awt/JavaComponentAccessibility.m  |  4 ++--
 .../share/classes/java/awt/Toolkit.java            |  2 +-
 .../share/classes/java/beans/XMLDecoder.java       |  7 ++++---
 .../share/classes/java/beans/XMLEncoder.java       |  7 ++++---
 .../share/classes/javax/swing/JRootPane.java       |  2 +-
 .../classes/javax/swing/colorchooser/package.html  |  8 ++++----
 .../share/classes/javax/swing/event/package.html   |  8 ++++----
 .../classes/javax/swing/filechooser/package.html   |  8 ++++----
 .../share/classes/javax/swing/package.html         | 14 +++++++-------
 .../classes/javax/swing/plaf/basic/package.html    |  6 +++---
 .../classes/javax/swing/plaf/metal/package.html    |  6 +++---
 .../swing/plaf/multi/doc-files/multi_tsc.html      |  6 +++---
 .../classes/javax/swing/plaf/multi/package.html    |  6 +++---
 .../classes/javax/swing/plaf/nimbus/package.html   |  4 ++--
 .../share/classes/javax/swing/plaf/package.html    |  6 +++---
 .../plaf/synth/doc-files/synthFileFormat.html      |  2 +-
 .../share/classes/javax/swing/table/package.html   |  8 ++++----
 .../share/classes/javax/swing/text/Document.java   |  2 +-
 .../classes/javax/swing/text/html/package.html     |  6 +++---
 .../javax/swing/text/html/parser/package.html      |  6 +++---
 .../share/classes/javax/swing/text/package.html    |  8 ++++----
 .../classes/javax/swing/text/rtf/package.html      |  6 +++---
 .../share/classes/javax/swing/tree/package.html    |  8 ++++----
 .../share/classes/javax/swing/undo/package.html    |  8 ++++----
 25 files changed, 76 insertions(+), 74 deletions(-)

diff --git a/jdk/src/demo/share/jvmti/index.html b/jdk/src/demo/share/jvmti/index.html
index 25440a104d9..5791b8b046f 100644
--- a/jdk/src/demo/share/jvmti/index.html
+++ b/jdk/src/demo/share/jvmti/index.html
@@ -415,7 +415,7 @@ Additional information can also be found by doing a search on "jvmti" at
 Various technical articles are also available through this website.
 And don't forget the 
 Java Tutorials at 
-<A HREF="http://java.sun.com/docs/books/tutorial">http://java.sun.com/docs/books/tutorial</A>
+<A HREF="http://docs.oracle.com/javase/tutorial">http://docs.oracle.com/javase/tutorial</A>
 for getting a quick start on all the various interfaces.
 
 <h2>Comments and Feedback</h2>
diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaComponentAccessibility.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaComponentAccessibility.m
index 1b3ec43a9fe..e7b229f00e1 100644
--- a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaComponentAccessibility.m
+++ b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaComponentAccessibility.m
@@ -25,7 +25,7 @@
 
 // External Java Accessibility links:
 //
-// <http://java.sun.com/j2se/1.4.2/docs/guide/access/index.html>
+// <https://docs.oracle.com/javase/8/docs/technotes/guides/access/index.html>
 // <http://www-106.ibm.com/developerworks/library/j-access/?n-j-10172>
 // <http://archives.java.sun.com/archives/java-access.html> (Sun's mailing list for Java accessibility)
 
@@ -973,7 +973,7 @@ static NSObject *sAttributeNamesLOCK = nil;
 // Element's value (id)
 // note that the appKit meaning of "accessibilityValue" is different from the java
 // meaning of "accessibleValue", which is specific to numerical values
-// (http://java.sun.com/j2se/1.3/docs/api/javax/accessibility/AccessibleValue.html#setCurrentAccessibleValue(java.lang.Number))
+// (https://docs.oracle.com/javase/8/docs/api/javax/accessibility/AccessibleValue.html#setCurrentAccessibleValue-java.lang.Number-)
 - (id)accessibilityValueAttribute
 {
     static JNF_STATIC_MEMBER_CACHE(jm_getCurrentAccessibleValue, sjc_CAccessibility, "getCurrentAccessibleValue", "(Ljavax/accessibility/AccessibleValue;Ljava/awt/Component;)Ljava/lang/Number;");
diff --git a/jdk/src/java.desktop/share/classes/java/awt/Toolkit.java b/jdk/src/java.desktop/share/classes/java/awt/Toolkit.java
index 9e7646fd320..bed5149c08a 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/Toolkit.java
+++ b/jdk/src/java.desktop/share/classes/java/awt/Toolkit.java
@@ -89,7 +89,7 @@ import javax.accessibility.AccessibilityProvider;
  * <br>For more information, see
  * <a href="http://docs.oracle.com/javase/tutorial/uiswing/misc/focus.html#transferTiming">Timing
  * Focus Transfers</a>, a section in
- * <a href="http://java.sun.com/docs/books/tutorial/uiswing/">The Swing
+ * <a href="http://docs.oracle.com/javase/tutorial/uiswing/">The Swing
  * Tutorial</a>.
  *
  * <li>Making a top-level container visible.
diff --git a/jdk/src/java.desktop/share/classes/java/beans/XMLDecoder.java b/jdk/src/java.desktop/share/classes/java/beans/XMLDecoder.java
index d86ecfaf6bd..daae045316b 100644
--- a/jdk/src/java.desktop/share/classes/java/beans/XMLDecoder.java
+++ b/jdk/src/java.desktop/share/classes/java/beans/XMLDecoder.java
@@ -53,8 +53,8 @@ import org.xml.sax.helpers.DefaultHandler;
  *
  *<p>
  * For more information you might also want to check out
- * <a
- href="http://java.sun.com/products/jfc/tsc/articles/persistence3">Long Term Persistence of JavaBeans Components: XML Schema</a>,
+ * <a href="http://www.oracle.com/technetwork/java/persistence3-139471.html">
+ * Long Term Persistence of JavaBeans Components: XML Schema</a>,
  * an article in <em>The Swing Connection.</em>
  * @see XMLEncoder
  * @see java.io.ObjectInputStream
@@ -284,7 +284,8 @@ public class XMLDecoder implements AutoCloseable {
      * The {@code null} value may cause illegal parsing in such case.
      * The same problem may occur, if the {@code owner} class
      * does not contain expected method to call. See details <a
-     * href="http://java.sun.com/products/jfc/tsc/articles/persistence3/">here</a>.
+     * href="http://www.oracle.com/technetwork/java/persistence3-139471.html">
+     * here</a>.
      *
      * @param owner  the owner of the default handler
      *               that can be used as a value of &lt;java&gt; element
diff --git a/jdk/src/java.desktop/share/classes/java/beans/XMLEncoder.java b/jdk/src/java.desktop/share/classes/java/beans/XMLEncoder.java
index ac4ab411ce4..7deaea30622 100644
--- a/jdk/src/java.desktop/share/classes/java/beans/XMLEncoder.java
+++ b/jdk/src/java.desktop/share/classes/java/beans/XMLEncoder.java
@@ -193,8 +193,8 @@ import java.nio.charset.UnsupportedCharsetException;
  *
  *<p>
  * For more information you might also want to check out
- * <a
- href="http://java.sun.com/products/jfc/tsc/articles/persistence4">Using XMLEncoder</a>,
+ * <a href="http://www.oracle.com/technetwork/java/persistence4-140124.html">
+ * Using XMLEncoder</a>,
  * an article in <em>The Swing Connection.</em>
  * @see XMLDecoder
  * @see java.io.ObjectOutputStream
@@ -438,7 +438,8 @@ public class XMLEncoder extends Encoder implements AutoCloseable {
      * <P>
      * For more information about using resource bundles with the
      * XMLEncoder, see
-     * http://java.sun.com/products/jfc/tsc/articles/persistence4/#i18n
+     * <a href="http://www.oracle.com/technetwork/java/persistence4-140124.html#i18n">
+     * Creating Internationalized Applications</a>,
      *
      * @param oldExp The expression that will be written
      *               to the stream.
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JRootPane.java b/jdk/src/java.desktop/share/classes/javax/swing/JRootPane.java
index 4061f2e2471..80dfb2954b4 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/JRootPane.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JRootPane.java
@@ -194,7 +194,7 @@ import sun.security.action.GetBooleanAction;
  * @see JComponent
  * @see BoxLayout
  *
- * @see <a href="http://java.sun.com/products/jfc/tsc/articles/mixing/">
+ * @see <a href="http://www.oracle.com/technetwork/articles/java/mixing-components-433992.html">
  * Mixing Heavy and Light Components</a>
  *
  * @author David Kloba
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/package.html b/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/package.html
index cb8030258c3..43ff5ee8739 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/package.html
+++ b/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/package.html
@@ -37,10 +37,10 @@ component.
 Most of the Swing API is <em>not</em> thread safe.
 For details, see
 <a
-href="http://java.sun.com/docs/books/tutorial/uiswing/overview/threads.html"
-target="_top">Threads and Swing</a>,
+href="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html"
+target="_top">Concurrency in Swing</a>,
 a section in
-<em><a href="http://java.sun.com/docs/books/tutorial/"
+<em><a href="http://docs.oracle.com/javase/tutorial/"
 target="_top">The Java Tutorial</a></em>.
 
 
@@ -49,7 +49,7 @@ target="_top">The Java Tutorial</a></em>.
 This document forms the complete API specification.  For overviews, tutorials, 
 examples, guides, and tool documentation, please see:
 <ul>
-  <li><a href="http://java.sun.com/docs/books/tutorial/uiswing/components/colorchooser.html" target="_top">How to Use Color Choosers</a>, 
+  <li><a href="http://docs.oracle.com/javase/tutorial/uiswing/components/colorchooser.html" target="_top">How to Use Color Choosers</a>,
       a section in <em>The Java Tutorial</em>
 
   <li><a href="../../../../technotes/guides/intl/index.html"
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/package.html b/jdk/src/java.desktop/share/classes/javax/swing/event/package.html
index 054a0055c9e..070ae428a9b 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/event/package.html
+++ b/jdk/src/java.desktop/share/classes/javax/swing/event/package.html
@@ -39,17 +39,17 @@ java.awt.event package.
 Most of the Swing API is <em>not</em> thread safe.
 For details, see
 <a
-href="http://java.sun.com/docs/books/tutorial/uiswing/overview/threads.html"
-target="_top">Threads and Swing</a>,
+href="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html"
+target="_top">Concurrency in Swing</a>,
 a section in
-<em><a href="http://java.sun.com/docs/books/tutorial/"
+<em><a href="http://docs.oracle.com/javase/tutorial/"
 target="_top">The Java Tutorial</a></em>.
 
 <h2>Related Documentation</h2>
 
 For overviews, tutorials, examples, guides, and tool documentation, please see:
 <ul>
-  <li><a href="http://java.sun.com/docs/books/tutorial/uiswing/events/"
+  <li><a href="http://docs.oracle.com/javase/tutorial/uiswing/events/index.html"
       target="_top">Writing Event Listeners</a>,
       a section in <em>The Java Tutorial</em>
 </ul>
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/filechooser/package.html b/jdk/src/java.desktop/share/classes/javax/swing/filechooser/package.html
index d850fc5b19e..fa06236262c 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/filechooser/package.html
+++ b/jdk/src/java.desktop/share/classes/javax/swing/filechooser/package.html
@@ -37,10 +37,10 @@ Contains classes and interfaces used by the <code>JFileChooser</code> component.
 Most of the Swing API is <em>not</em> thread safe.
 For details, see
 <a
-href="http://java.sun.com/docs/books/tutorial/uiswing/overview/threads.html"
-target="_top">Threads and Swing</a>,
+href="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html"
+target="_top">Concurrency in Swing</a>,
 a section in
-<em><a href="http://java.sun.com/docs/books/tutorial/"
+<em><a href="http://docs.oracle.com/javase/tutorial/"
 target="_top">The Java Tutorial</a></em>.
 
 
@@ -49,7 +49,7 @@ target="_top">The Java Tutorial</a></em>.
 This document forms the complete API specification.  For overviews, tutorials,
 examples, guides, and tool documentation, please see:
 <ul>
-  <li><a href="http://java.sun.com/docs/books/tutorial/uiswing/components/filechooser.html" target="_top">How to Use File Choosers</a>,
+  <li><a href="http://docs.oracle.com/javase/tutorial/uiswing/components/filechooser.html" target="_top">How to Use File Choosers</a>,
       a section in <em>The Java Tutorial</em>
   <li><a href="../../../../technotes/guides/intl/index.html"
       target="_top">Internationalization Documentation</a>
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/package.html b/jdk/src/java.desktop/share/classes/javax/swing/package.html
index 8050000ae91..934bb9025da 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/package.html
+++ b/jdk/src/java.desktop/share/classes/javax/swing/package.html
@@ -38,7 +38,7 @@ questions.
 (all-Java language) components that,
 to the maximum degree possible, work the same on all platforms.
 For a programmer's guide to using these components, see
-<a href="http://java.sun.com/docs/books/tutorial/uiswing/index.html" 
+<a href="http://docs.oracle.com/javase/tutorial/uiswing/index.html"
 target="_top">Creating
 a GUI with JFC/Swing</a>, a trail in <em>The Java Tutorial</em>.
 For other resources, see 
@@ -123,9 +123,9 @@ input. Refer to {@link javax.swing.SwingWorker} for the preferred way to do such
 processing when working with Swing.
 <p>
 More information on this topic can be found in the
-<a href="http://download.oracle.com/javase/tutorial/uiswing/">Swing tutorial</a>,
+<a href="http://docs.oracle.com/javase/tutorial/uiswing/">Swing tutorial</a>,
 in particular the section on
-<a href="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency in Swing</a>.
+<a href="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency in Swing</a>.
 
 
 <H2>
@@ -134,13 +134,13 @@ in particular the section on
 <P>For overviews, tutorials, examples, guides, and other documentation, please see:
 
 <UL>
-   <LI><A HREF="http://java.sun.com/products/jfc/tsc/" 
+   <LI><A HREF="http://www.oracle.com/technetwork/java/javase/tech/articles-jsp-139072.html"
    target="_top">The Swing Connection</A>
-   <LI><A HREF="http://java.sun.com/docs/books/tutorial/" 
+   <LI><A HREF="http://docs.oracle.com/javase/tutorial/"
    target="_top">The Java Tutorial</A>
-   <LI><A HREF="http://java.sun.com/developer/onlineTraining/" 
+   <LI><A HREF="http://www.oracle.com/technetwork/java/javase/training/index.html"
    target="_top">Online Training</A> at the Java Developer Connection<font size=-2><sup>SM</sup></font>
-   <LI><A HREF="http://java.sun.com/products/jfc/" 
+   <LI><A HREF="http://www.oracle.com/technetwork/java/javase/tech/index-jsp-142216.html"
    target="_top">Java Foundation Classes (JFC)</A> home page
 </UL>
 
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/package.html b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/package.html
index d02593c7455..347fc7cf9c8 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/package.html
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/package.html
@@ -55,10 +55,10 @@ encouraged.
 Most of the Swing API is <em>not</em> thread safe.
 For details, see
 <a
-href="http://java.sun.com/docs/books/tutorial/uiswing/overview/threads.html"
-target="_top">Threads and Swing</a>,
+href="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html"
+target="_top">Concurrency in Swing</a>,
 a section in
-<em><a href="http://java.sun.com/docs/books/tutorial/"
+<em><a href="http://docs.oracle.com/javase/tutorial/"
 target="_top">The Java Tutorial</a></em>.
 
 @since 1.2
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/package.html b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/package.html
index 1c41e7f9577..db16ddda090 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/package.html
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/package.html
@@ -51,10 +51,10 @@ encouraged.
 Most of the Swing API is <em>not</em> thread safe.
 For details, see
 <a
-href="http://java.sun.com/docs/books/tutorial/uiswing/overview/threads.html"
-target="_top">Threads and Swing</a>,
+href="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html"
+target="_top">Concurrency in Swing</a>,
 a section in
-<em><a href="http://java.sun.com/docs/books/tutorial/"
+<em><a href="http://docs.oracle.com/javase/tutorial/"
 target="_top">The Java Tutorial</a></em>.
 
 @since 1.2
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html
index 512b1a581ea..343db5479e2 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html
@@ -18,7 +18,7 @@ Using the Multiplexing Look and Feel
 <i>
 This document is based on an article
 originally published in
-<a href="http://java.sun.com/products/jfc/tsc/" target="_top"><em>The Swing
+<a href="http://www.oracle.com/technetwork/java/javase/tech/articles-jsp-139072.html" target="_top"><em>The Swing
 Connection</em></a>.
 </i>
 </p>
@@ -65,12 +65,12 @@ This document has the following sections:
 Before reading further, you should be familiar 
 with the concept of pluggable look and feels.
 For basic information, see
-<a href="http://java.sun.com/docs/books/tutorial/uiswing/lookandfeel/plaf.html">How to Set the Look and Feel</a>,
+<a href="https://docs.oracle.com/javase/tutorial/uiswing/lookandfeel/plaf.html">How to Set the Look and Feel</a>,
 a section in 
 <em>The Java Tutorial</em>.
 For architectural details, you can read
 <a
-href="http://java.sun.com/products/jfc/tsc/articles/architecture/#pluggable">Pluggable look-and-feel architecture</a>, a section within
+href="http://www.oracle.com/technetwork/java/architecture-142923.html#pluggable">Pluggable look-and-feel architecture</a>, a section within
 a <em>Swing Connection</em> article.
 </p>
 
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/package.html b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/package.html
index 65d1aeafcfc..32b0d6b21af 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/package.html
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/multi/package.html
@@ -53,10 +53,10 @@ the Multiplexing Look and Feel.</a>
 Most of the Swing API is <em>not</em> thread safe.
 For details, see
 <a
-href="http://java.sun.com/docs/books/tutorial/uiswing/overview/threads.html"
-target="_top">Threads and Swing</a>,
+href="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html"
+target="_top">Concurrency in Swing</a>,
 a section in
-<em><a href="http://java.sun.com/docs/books/tutorial/"
+<em><a href="http://docs.oracle.com/javase/tutorial/"
 target="_top">The Java Tutorial</a></em>.
 
 @since 1.2
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/package.html b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/package.html
index 14cac304214..f91d73781fd 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/package.html
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/package.html
@@ -88,10 +88,10 @@ encouraged.
 <p><strong>Note:</strong>
 Most of the Swing API is <em>not</em> thread safe.
 For details, see
-<a href="http://java.sun.com/docs/books/tutorial/uiswing/concurrency/index.html"
+<a href="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html"
    target="_top">Concurrency in Swing</a>,
 a section in
-<em><a href="http://java.sun.com/docs/books/tutorial/"
+<em><a href="http://docs.oracle.com/javase/tutorial/"
        target="_top">The Java Tutorial</a></em>.
 
 @since 1.7
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/package.html b/jdk/src/java.desktop/share/classes/javax/swing/plaf/package.html
index c207c89b103..0fc8c538143 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/package.html
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/package.html
@@ -44,10 +44,10 @@ by the <code>javax.swing.plaf.basic</code> and
 Most of the Swing API is <em>not</em> thread safe.
 For details, see
 <a
-href="http://java.sun.com/docs/books/tutorial/uiswing/overview/threads.html"
-target="_top">Threads and Swing</a>,
+href="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html"
+target="_top">Concurrency in Swing</a>,
 a section in
-<em><a href="http://java.sun.com/docs/books/tutorial/"
+<em><a href="http://docs.oracle.com/javase/tutorial/"
 target="_top">The Java Tutorial</a></em>.
 
 @since 1.2
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html
index 202283049b5..0936b2951d3 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html
@@ -950,7 +950,7 @@ div.example {
       Beans persistance can be used to embed any Object. This is
       typically used for embedding your own Painters, but can be used
       for other arbritrary objects as well. Refer to <a
-							href="http://java.sun.com/products/jfc/tsc/articles/persistence3/">http://java.sun.com/products/jfc/tsc/articles/persistence3/</a> for details on beans persistance.
+							href="http://www.oracle.com/technetwork/java/persistence3-139471.html">http://www.oracle.com/technetwork/java/persistence3-139471.html</a> for details on beans persistance.
 
 
     <h3>Backing Style</h3>
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/table/package.html b/jdk/src/java.desktop/share/classes/javax/swing/table/package.html
index f3fd20c8bb1..cf944823e91 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/table/package.html
+++ b/jdk/src/java.desktop/share/classes/javax/swing/table/package.html
@@ -43,10 +43,10 @@ with the tables are viewed and managed.
 Most of the Swing API is <em>not</em> thread safe.
 For details, see
 <a
-href="http://java.sun.com/docs/books/tutorial/uiswing/overview/threads.html"
-target="_top">Threads and Swing</a>,
+href="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html"
+target="_top">Concurrency in Swing</a>,
 a section in
-<em><a href="http://java.sun.com/docs/books/tutorial/"
+<em><a href="http://docs.oracle.com/javase/tutorial/"
 target="_top">The Java Tutorial</a></em>.
 
 
@@ -54,7 +54,7 @@ target="_top">The Java Tutorial</a></em>.
 
 For overviews, tutorials, examples, guides, and tool documentation, please see:
 <ul>
-  <li><a href="http://java.sun.com/docs/books/tutorial/uiswing/components/table.html" target="_top">How to Use Tables</a>,
+  <li><a href="http://docs.oracle.com/javase/tutorial/uiswing/components/table.html" target="_top">How to Use Tables</a>,
       a section in <em>The Java Tutorial</em>
 </ul>
 
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/Document.java b/jdk/src/java.desktop/share/classes/javax/swing/text/Document.java
index 12c9a09bc5c..4cab9c4fe2d 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/Document.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/Document.java
@@ -166,7 +166,7 @@ import javax.swing.event.*;
  * </ul>
  *
  * <p>For more information on the <code>Document</code> class, see
- * <a href="http://java.sun.com/products/jfc/tsc">The Swing Connection</a>
+ * <a href="http://www.oracle.com/technetwork/java/javase/tech/articles-jsp-139072.html">The Swing Connection</a>
  * and most particularly the article,
  * <a href="http://java.sun.com/products/jfc/tsc/articles/text/element_interface">
  * The Element Interface</a>.
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/package.html b/jdk/src/java.desktop/share/classes/javax/swing/text/html/package.html
index e0ab0354d53..c9c41b8cc22 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/html/package.html
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/html/package.html
@@ -37,10 +37,10 @@ for creating HTML text editors.
 Most of the Swing API is <em>not</em> thread safe.
 For details, see
 <a
-href="http://java.sun.com/docs/books/tutorial/uiswing/overview/threads.html"
-target="_top">Threads and Swing</a>,
+href="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html"
+target="_top">Concurrency in Swing</a>,
 a section in
-<em><a href="http://java.sun.com/docs/books/tutorial/"
+<em><a href="http://docs.oracle.com/javase/tutorial/"
 target="_top">The Java Tutorial</a></em>.
 
 <h2>Package Specification</h2>
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/package.html b/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/package.html
index d503bc741e7..05c53989142 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/package.html
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/package.html
@@ -40,10 +40,10 @@ the <code>HTMLEditorKit.ParserCallback</code> interface.
 Most of the Swing API is <em>not</em> thread safe.
 For details, see
 <a
-href="http://java.sun.com/docs/books/tutorial/uiswing/overview/threads.html"
-target="_top">Threads and Swing</a>,
+href="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html"
+target="_top">Concurrency in Swing</a>,
 a section in
-<em><a href="http://java.sun.com/docs/books/tutorial/"
+<em><a href="http://docs.oracle.com/javase/tutorial/"
 target="_top">The Java Tutorial</a></em>.
 
 @see javax.swing.text.html.HTMLEditorKit.ParserCallback
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/package.html b/jdk/src/java.desktop/share/classes/javax/swing/text/package.html
index 4aa7804f544..1c38c251066 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/package.html
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/package.html
@@ -41,17 +41,17 @@ and key mapping.
 Most of the Swing API is <em>not</em> thread safe.
 For details, see
 <a
-href="http://java.sun.com/docs/books/tutorial/uiswing/overview/threads.html"
-target="_top">Threads and Swing</a>,
+href="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html"
+target="_top">Concurrency in Swing</a>,
 a section in
-<em><a href="http://java.sun.com/docs/books/tutorial/"
+<em><a href="http://docs.oracle.com/javase/tutorial/"
 target="_top">The Java Tutorial</a></em>.
 
 <h2>Related Documentation</h2>
 
 For overviews, tutorials, examples, guides, and tool documentation, please see:
 <ul>
-  <li><a href="http://java.sun.com/docs/books/tutorial/uiswing/components/text.html" target="_top">Using Text Components</a>,
+  <li><a href="http://docs.oracle.com/javase/tutorial/uiswing/components/text.html" target="_top">Using Text Components</a>,
       a section in <em>The Java Tutorial</em>
 </ul>
 
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/package.html b/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/package.html
index aa83e9fa502..9b62f229a93 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/package.html
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/rtf/package.html
@@ -38,10 +38,10 @@ text editors.
 Most of the Swing API is <em>not</em> thread safe.
 For details, see
 <a
-href="http://java.sun.com/docs/books/tutorial/uiswing/overview/threads.html"
-target="_top">Threads and Swing</a>,
+href="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html"
+target="_top">Concurrency in Swing</a>,
 a section in
-<em><a href="http://java.sun.com/docs/books/tutorial/"
+<em><a href="http://docs.oracle.com/javase/tutorial/"
 target="_top">The Java Tutorial</a></em>.
 
 @since 1.2
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/package.html b/jdk/src/java.desktop/share/classes/javax/swing/tree/package.html
index b6b58bbdabe..e820b3cb364 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/tree/package.html
+++ b/jdk/src/java.desktop/share/classes/javax/swing/tree/package.html
@@ -39,10 +39,10 @@ as how data associated with the tree nodes are viewed and managed.
 Most of the Swing API is <em>not</em> thread safe.
 For details, see
 <a
-href="http://java.sun.com/docs/books/tutorial/uiswing/overview/threads.html"
-target="_top">Threads and Swing</a>,
+href="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html"
+target="_top">Concurrency in Swing</a>,
 a section in
-<em><a href="http://java.sun.com/docs/books/tutorial/"
+<em><a href="http://docs.oracle.com/javase/tutorial/"
 target="_top">The Java Tutorial</a></em>.
 
 
@@ -50,7 +50,7 @@ target="_top">The Java Tutorial</a></em>.
 
 For overviews, tutorials, examples, guides, and tool documentation, please see:
 <ul>
-  <li><a href="http://java.sun.com/docs/books/tutorial/uiswing/components/tree.html" target="_top">How to Use Trees</a>,
+  <li><a href="http://docs.oracle.com/javase/tutorial/uiswing/components/tree.html" target="_top">How to Use Trees</a>,
       a section in <em>The Java Tutorial</em>
 </ul>
 
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/undo/package.html b/jdk/src/java.desktop/share/classes/javax/swing/undo/package.html
index f4ae62d7b16..bf6d809fafb 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/undo/package.html
+++ b/jdk/src/java.desktop/share/classes/javax/swing/undo/package.html
@@ -37,17 +37,17 @@ in applications such as text editors.
 Most of the Swing API is <em>not</em> thread safe.
 For details, see
 <a
-href="http://java.sun.com/docs/books/tutorial/uiswing/overview/threads.html"
-target="_top">Threads and Swing</a>,
+href="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html"
+target="_top">Concurrency in Swing</a>,
 a section in
-<em><a href="http://java.sun.com/docs/books/tutorial/"
+<em><a href="http://docs.oracle.com/javase/tutorial/"
 target="_top">The Java Tutorial</a></em>.
 
 <h2>Related Documentation</h2>
 
 For overviews, tutorials, examples, guides, and tool documentation, please see:
 <ul>
-  <li><a href="http://java.sun.com/docs/books/tutorial/uiswing/components/generaltext.html#undo" target="_top">Implementing Undo and Redo</a>,
+  <li><a href="http://docs.oracle.com/javase/tutorial/uiswing/components/generaltext.html#undo" target="_top">Implementing Undo and Redo</a>,
       a section in <em>The Java Tutorial</em>
 </ul>
 

From 4b793fa7ffa88cbba91575494aa0a573504e2f4a Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Fri, 29 Apr 2016 09:16:06 -0700
Subject: [PATCH 015/228] 8039444: Swing applications not being displayed
 properly

Reviewed-by: serb, vadim
---
 .../native/libawt/java2d/d3d/D3DBadHardware.h | 129 +-----------------
 1 file changed, 3 insertions(+), 126 deletions(-)

diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBadHardware.h b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBadHardware.h
index 91ee7b358a4..115626c857c 100644
--- a/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBadHardware.h
+++ b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBadHardware.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -51,131 +51,8 @@ typedef struct ADAPTER_INFO {
 
 static const ADAPTER_INFO badHardware[] = {
 
-    // Intel HD
-    // Clarkdale (Desktop) GMA HD Lines
-    { 0x8086, 0x0042, NO_VERSION, OS_ALL },
-    // Arrandale (Mobile) GMA HD Lines
-    { 0x8086, 0x0046, NO_VERSION, OS_ALL },
-
-    // Sandy Bridge HD Graphics 3000/2000
-    { 0x8086, 0x0102, NO_VERSION, OS_ALL },
-    { 0x8086, 0x0106, NO_VERSION, OS_ALL },
-    { 0x8086, 0x0112, NO_VERSION, OS_ALL },
-    { 0x8086, 0x0116, NO_VERSION, OS_ALL },
-    { 0x8086, 0x0122, NO_VERSION, OS_ALL },
-    { 0x8086, 0x0126, NO_VERSION, OS_ALL },
-    { 0x8086, 0x010A, NO_VERSION, OS_ALL },
-
-    // Ivy Bridge
-    { 0x8086, 0x0162, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 },
-    { 0x8086, 0x0162, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 },
-    { 0x8086, 0x0166, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 },
-    { 0x8086, 0x0166, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 },
-    { 0x8086, 0x016A, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 },
-    { 0x8086, 0x016A, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 },
-    { 0x8086, 0x0152, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 },
-    { 0x8086, 0x0152, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 },
-    { 0x8086, 0x0156, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 },
-    { 0x8086, 0x0156, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 },
-    { 0x8086, 0x015A, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 },
-    { 0x8086, 0x015A, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 },
-
-    // Haswell
-    { 0x8086, 0x0402, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 },
-    { 0x8086, 0x0402, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 },
-    { 0x8086, 0x0406, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 },
-    { 0x8086, 0x0406, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 },
-    { 0x8086, 0x0412, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 },
-    { 0x8086, 0x0412, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 },
-    { 0x8086, 0x0416, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 },
-    { 0x8086, 0x0416, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 },
-    { 0x8086, 0x041E, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 },
-    { 0x8086, 0x041E, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 },
-    { 0x8086, 0x040A, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 },
-    { 0x8086, 0x040A, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 },
-    { 0x8086, 0x041A, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 },
-    { 0x8086, 0x041A, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 },
-    { 0x8086, 0x0A06, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 },
-    { 0x8086, 0x0A06, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 },
-    { 0x8086, 0x0A16, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 },
-    { 0x8086, 0x0A16, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 },
-    { 0x8086, 0x0A26, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 },
-    { 0x8086, 0x0A26, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 },
-    { 0x8086, 0x0A2E, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 },
-    { 0x8086, 0x0A2E, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 },
-    { 0x8086, 0x0A1E, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 },
-    { 0x8086, 0x0A1E, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 },
-    { 0x8086, 0x0A0E, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 },
-    { 0x8086, 0x0A0E, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 },
-    { 0x8086, 0x0D26, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 },
-    { 0x8086, 0x0D26, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 },
-    { 0x8086, 0x0D22, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 },
-    { 0x8086, 0x0D22, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 },
-
-    // Reason: workaround for 6620073, 6612195
-    // Intel 740
-    { 0x8086, 0x7800, NO_VERSION, OS_ALL },
-    { 0x8086, 0x1240, NO_VERSION, OS_ALL },
-    { 0x8086, 0x7121, NO_VERSION, OS_ALL },
-    { 0x8086, 0x7123, NO_VERSION, OS_ALL },
-    { 0x8086, 0x7125, NO_VERSION, OS_ALL },
-    { 0x8086, 0x1132, NO_VERSION, OS_ALL },
-    // IEG
-    { 0x8086, 0x2562, NO_VERSION, OS_ALL },
-    { 0x8086, 0x3577, NO_VERSION, OS_ALL },
-    { 0x8086, 0x2572, NO_VERSION, OS_ALL },
-    { 0x8086, 0x3582, NO_VERSION, OS_ALL },
-    { 0x8086, 0x358E, NO_VERSION, OS_ALL },
-    // GMA
-    { 0x8086, 0x2582, NO_VERSION, OS_ALL },
-    { 0x8086, 0x2782, NO_VERSION, OS_ALL },
-    { 0x8086, 0x2592, NO_VERSION, OS_ALL },
-    { 0x8086, 0x2792, NO_VERSION, OS_ALL },
-    { 0x8086, 0x2772, NO_VERSION, OS_ALL },
-    { 0x8086, 0x2776, NO_VERSION, OS_ALL },
-    { 0x8086, 0x27A2, NO_VERSION, OS_ALL },
-    { 0x8086, 0x27A6, NO_VERSION, OS_ALL },
-    { 0x8086, 0x27AE, NO_VERSION, OS_ALL },
-    { 0x8086, 0x29D2, NO_VERSION, OS_ALL },
-    { 0x8086, 0x29D3, NO_VERSION, OS_ALL },
-    { 0x8086, 0x29B2, NO_VERSION, OS_ALL },
-    { 0x8086, 0x29B3, NO_VERSION, OS_ALL },
-    { 0x8086, 0x29C2, NO_VERSION, OS_ALL },
-    { 0x8086, 0x29C3, NO_VERSION, OS_ALL },
-    { 0x8086, 0xA001, NO_VERSION, OS_ALL },
-    { 0x8086, 0xA002, NO_VERSION, OS_ALL },
-    { 0x8086, 0xA011, NO_VERSION, OS_ALL },
-    { 0x8086, 0xA012, NO_VERSION, OS_ALL },
-    // GMA
-    { 0x8086, 0x2972, NO_VERSION, OS_ALL },
-    { 0x8086, 0x2973, NO_VERSION, OS_ALL },
-    { 0x8086, 0x2992, NO_VERSION, OS_ALL },
-    { 0x8086, 0x2993, NO_VERSION, OS_ALL },
-    { 0x8086, 0x29A2, NO_VERSION, OS_ALL },
-    { 0x8086, 0x29A3, NO_VERSION, OS_ALL },
-    { 0x8086, 0x2982, NO_VERSION, OS_ALL },
-    { 0x8086, 0x2983, NO_VERSION, OS_ALL },
-    { 0x8086, 0x2A02, NO_VERSION, OS_ALL },
-    { 0x8086, 0x2A03, NO_VERSION, OS_ALL },
-    { 0x8086, 0x2A12, NO_VERSION, OS_ALL },
-    { 0x8086, 0x2A13, NO_VERSION, OS_ALL },
-
-    // Eaglelake (Desktop) GMA 4500 Lines
-    { 0x8086, 0x2E42, NO_VERSION, OS_ALL },
-    { 0x8086, 0x2E43, NO_VERSION, OS_ALL },
-    { 0x8086, 0x2E92, NO_VERSION, OS_ALL },
-    { 0x8086, 0x2E93, NO_VERSION, OS_ALL },
-    { 0x8086, 0x2E12, NO_VERSION, OS_ALL },
-    { 0x8086, 0x2E13, NO_VERSION, OS_ALL },
-    // Eaglelake (Desktop) GMA X4500 Lines
-    { 0x8086, 0x2E32, NO_VERSION, OS_ALL },
-    { 0x8086, 0x2E33, NO_VERSION, OS_ALL },
-    { 0x8086, 0x2E22, NO_VERSION, OS_ALL },
-    // Eaglelake (Desktop) GMA X4500HD Lines
-    { 0x8086, 0x2E23, NO_VERSION, OS_ALL },
-    // Cantiga (Mobile) GMA 4500MHD Lines
-    { 0x8086, 0x2A42, NO_VERSION, OS_ALL },
-    { 0x8086, 0x2A43, NO_VERSION, OS_ALL },
+    // All Intel Chips.
+    { 0x8086, ALL_DEVICEIDS, NO_VERSION, OS_ALL },
 
     // ATI Mobility Radeon X1600, X1400, X1450, X1300, X1350
     // Reason: workaround for 6613066, 6687166

From bf6b990945a035ad0f5bc76987be75f2bbc6819b Mon Sep 17 00:00:00 2001
From: Alexander Scherbatiy <alexsch@openjdk.org>
Date: Fri, 29 Apr 2016 21:59:47 +0400
Subject: [PATCH 016/228] 8017112: JTabbedPane components have inconsistent
 accessibility tree

Reviewed-by: ptbrunet, serb
---
 .../share/classes/java/awt/Component.java     | 27 +++++---
 .../8017112/AccessibleIndexInParentTest.java  | 68 +++++++++++++++++++
 2 files changed, 84 insertions(+), 11 deletions(-)
 create mode 100644 jdk/test/javax/accessibility/8017112/AccessibleIndexInParentTest.java

diff --git a/jdk/src/java.desktop/share/classes/java/awt/Component.java b/jdk/src/java.desktop/share/classes/java/awt/Component.java
index b2b51e08559..c2a021fd595 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/Component.java
+++ b/jdk/src/java.desktop/share/classes/java/awt/Component.java
@@ -9739,19 +9739,24 @@ public abstract class Component implements ImageObserver, MenuContainer,
      */
     int getAccessibleIndexInParent() {
         synchronized (getTreeLock()) {
-            int index = -1;
-            Container parent = this.getParent();
-            if (parent != null && parent instanceof Accessible) {
-                Component ca[] = parent.getComponents();
-                for (int i = 0; i < ca.length; i++) {
-                    if (ca[i] instanceof Accessible) {
-                        index++;
-                    }
-                    if (this.equals(ca[i])) {
-                        return index;
-                    }
+
+            AccessibleContext accContext = getAccessibleContext();
+            if (accContext == null) {
+                return -1;
+            }
+
+            Accessible parent = accContext.getAccessibleParent();
+            if (parent == null) {
+                return -1;
+            }
+
+            accContext = parent.getAccessibleContext();
+            for (int i = 0; i < accContext.getAccessibleChildrenCount(); i++) {
+                if (this.equals(accContext.getAccessibleChild(i))) {
+                    return i;
                 }
             }
+
             return -1;
         }
     }
diff --git a/jdk/test/javax/accessibility/8017112/AccessibleIndexInParentTest.java b/jdk/test/javax/accessibility/8017112/AccessibleIndexInParentTest.java
new file mode 100644
index 00000000000..87f35b40da9
--- /dev/null
+++ b/jdk/test/javax/accessibility/8017112/AccessibleIndexInParentTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2016, 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 java.awt.Component;
+import javax.swing.JLabel;
+import javax.swing.JTabbedPane;
+import javax.swing.SwingUtilities;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+/*
+ * @test
+ * @bug 8017112
+ * @summary JTabbedPane components have inconsistent accessibility tree
+ * @run main AccessibleIndexInParentTest
+ */
+
+public class AccessibleIndexInParentTest {
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(AccessibleIndexInParentTest::test);
+    }
+
+    private static void test() {
+
+        int N = 5;
+        JTabbedPane tabbedPane = new JTabbedPane();
+
+        for (int i = 0; i < N; i++) {
+            tabbedPane.addTab("Title: " + i, new JLabel("Component: " + i));
+        }
+
+        for (int i = 0; i < tabbedPane.getTabCount(); i++) {
+            Component child = tabbedPane.getComponentAt(i);
+
+            AccessibleContext ac = child.getAccessibleContext();
+            if (ac == null) {
+                throw new RuntimeException("Accessible Context is null!");
+            }
+
+            int index = ac.getAccessibleIndexInParent();
+            Accessible parent = ac.getAccessibleParent();
+
+            if (parent.getAccessibleContext().getAccessibleChild(index) != child) {
+                throw new RuntimeException("Wrong getAccessibleIndexInParent!");
+            }
+        }
+    }
+}
\ No newline at end of file

From 6a55291a23f5116c16c27c7a7f152bcf8e45adb3 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Fri, 29 Apr 2016 11:14:56 -0700
Subject: [PATCH 017/228] 8151323: GeoTIFFTagSet#"ModelTiePointTag" name case
 does not match GeoTIFF specification

Change occurrences of "ModelTiePoint" to "ModelTiepoint."

Reviewed-by: prr
---
 .../classes/javax/imageio/plugins/tiff/GeoTIFFTagSet.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/GeoTIFFTagSet.java b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/GeoTIFFTagSet.java
index 28ee56abd3c..58adc761f29 100644
--- a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/GeoTIFFTagSet.java
+++ b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/GeoTIFFTagSet.java
@@ -87,9 +87,9 @@ public class GeoTIFFTagSet extends TIFFTagSet {
         }
     }
 
-    static class ModelTiePoint extends TIFFTag {
-        public ModelTiePoint() {
-            super("ModelTiePointTag",
+    static class ModelTiepoint extends TIFFTag {
+        public ModelTiepoint() {
+            super("ModelTiepointTag",
                   TAG_MODEL_TIE_POINT,
                   1 << TIFFTag.TIFF_DOUBLE);
         }
@@ -126,7 +126,7 @@ public class GeoTIFFTagSet extends TIFFTagSet {
 
         tags.add(new GeoTIFFTagSet.ModelPixelScale());
         tags.add(new GeoTIFFTagSet.ModelTransformation());
-        tags.add(new GeoTIFFTagSet.ModelTiePoint());
+        tags.add(new GeoTIFFTagSet.ModelTiepoint());
         tags.add(new GeoTIFFTagSet.GeoKeyDirectory());
         tags.add(new GeoTIFFTagSet.GeoDoubleParams());
         tags.add(new GeoTIFFTagSet.GeoAsciiParams());

From 528b2cc81a583705fd00075aa465256cd306be09 Mon Sep 17 00:00:00 2001
From: Harold Seigel <hseigel@openjdk.org>
Date: Fri, 29 Apr 2016 15:17:46 -0400
Subject: [PATCH 018/228] 8155727:
 java/util/concurrent/locks/Lock/TimedAcquireLeak.java timeouts

Fix regex pattern to handle possible (module@version) text

Reviewed-by: ctornqvi, martin
---
 .../java/util/concurrent/locks/Lock/TimedAcquireLeak.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jdk/test/java/util/concurrent/locks/Lock/TimedAcquireLeak.java b/jdk/test/java/util/concurrent/locks/Lock/TimedAcquireLeak.java
index 7d6da0b255e..630f3796b8c 100644
--- a/jdk/test/java/util/concurrent/locks/Lock/TimedAcquireLeak.java
+++ b/jdk/test/java/util/concurrent/locks/Lock/TimedAcquireLeak.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -167,7 +167,7 @@ public class TimedAcquireLeak {
                             final String childPid,
                             final String className) {
         final String regex =
-            "(?m)^ *[0-9]+: +([0-9]+) +[0-9]+ +\\Q"+className+"\\E$";
+            "(?m)^ *[0-9]+: +([0-9]+) +[0-9]+ +\\Q"+className+"\\E(?:$| )";
         final Callable<Integer> objectsInUse =
             new Callable<Integer>() { public Integer call() {
                 Integer i = Integer.parseInt(

From fed3d6ceac50ab9e33fcdf74ab4a8d6e26348200 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Fri, 29 Apr 2016 14:50:50 -0700
Subject: [PATCH 019/228] 8149810: TIFFField#getAsLong throws
 ClassCastException when data is type TIFFTag.TIFF_DOUBLE or TIFFTag.FLOAT

Expand the getAsLong() specification and handle the TIFF_DOUBLE and TIFF_FLOAT cases.

Reviewed-by: prr
---
 .../javax/imageio/plugins/tiff/TIFFField.java       | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java
index 336f81550b7..168e6b17328 100644
--- a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java
+++ b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java
@@ -1089,6 +1089,15 @@ public class TIFFField implements Cloneable {
      * {@code TIFF_SBYTE} data will be returned in the range
      * [-128, 127].
      *
+     * <p> Data in {@code TIFF_FLOAT} and {@code TIFF_DOUBLE} are
+     * simply cast to {@code long} and may suffer from truncation.
+     *
+     * <p> Data in {@code TIFF_SRATIONAL} or
+     * {@code TIFF_RATIONAL} format are evaluated by dividing the
+     * numerator into the denominator using double-precision
+     * arithmetic and then casting to {@code long}.  Loss of
+     * precision and truncation may occur.
+     *
      * <p> Data in {@code TIFF_ASCII} format will be parsed as by
      * the {@code Double.parseDouble} method, with the result
      * cast to {@code long}.
@@ -1112,6 +1121,10 @@ public class TIFFField implements Cloneable {
         case TIFFTag.TIFF_LONG:
         case TIFFTag.TIFF_IFD_POINTER:
             return ((long[])data)[index];
+        case TIFFTag.TIFF_FLOAT:
+            return (long)((float[])data)[index];
+        case TIFFTag.TIFF_DOUBLE:
+            return (long)((double[])data)[index];
         case TIFFTag.TIFF_SRATIONAL:
             int[] ivalue = getAsSRational(index);
             return (long)((double)ivalue[0]/ivalue[1]);

From 5dda2fc113cd2a7c2c252f2726d200213f18bd8d Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Fri, 29 Apr 2016 16:37:02 -0700
Subject: [PATCH 020/228] 8155772: gtk3_interface.c compilation error on Ubuntu
 12.10

Reviewed-by: serb, kcr
---
 .../java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c
index 6a188fb3598..060b082e53b 100644
--- a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c
+++ b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c
@@ -2547,14 +2547,14 @@ static jobject get_string_property(JNIEnv *env, GtkSettings* settings,
 
 static jobject get_integer_property(JNIEnv *env, GtkSettings* settings,
                                                              const gchar* key) {
-    gint intval = NULL;
+    gint intval = 0;
     (*fp_g_object_get)(settings, key, &intval, NULL);
     return create_Integer(env, intval);
 }
 
 static jobject get_boolean_property(JNIEnv *env, GtkSettings* settings,
                                                              const gchar* key) {
-    gint intval = NULL;
+    gint intval = 0;
     (*fp_g_object_get)(settings, key, &intval, NULL);
     return create_Boolean(env, intval);
 }

From 3dfed24a479db9972f0ba9324ca27a9586fe2a45 Mon Sep 17 00:00:00 2001
From: Max Ockner <mockner@openjdk.org>
Date: Fri, 29 Apr 2016 22:39:44 -0400
Subject: [PATCH 021/228] 8154110: Update class* and safepoint* logging
 subsystems

Refactored logging tags in class and safepoint subsystems.

Reviewed-by: coleenp, rehn, hseigel
---
 jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh    | 2 +-
 jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh   | 2 +-
 .../instrument/appendToClassLoaderSearch/ClassUnloadTest.sh     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh b/jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh
index 3872f813ffd..a00c14077d6 100644
--- a/jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh
+++ b/jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh
@@ -106,7 +106,7 @@ done
 # run test
 ${TESTJAVA}${FS}bin${FS}java \
         ${TESTVMOPTS} \
-        -verbose:class -Xlog:classload -cp . \
+        -verbose:class -Xlog:class+load -cp . \
         -Dtest.classes=${TESTCLASSES} \
         Starter cross
 # -XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass \
diff --git a/jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh b/jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh
index 198cd70827a..1289b4c861e 100644
--- a/jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh
+++ b/jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh
@@ -102,7 +102,7 @@ done
 # run test
 ${TESTJAVA}${FS}bin${FS}java \
         ${TESTVMOPTS} \
-        -verbose:class -Xlog:classload -cp . \
+        -verbose:class -Xlog:class+load -cp . \
         -Dtest.classes=${TESTCLASSES} \
         Starter one-way
 # -XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass \
diff --git a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh b/jdk/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh
index f5bb3b83179..b428a59bb28 100644
--- a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh
+++ b/jdk/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh
@@ -80,5 +80,5 @@ $JAR ${TESTTOOLVMOPTS} -cfm "${TESTCLASSES}"/ClassUnloadTest.jar "${MANIFEST}" \
 
 # Finally we run the test
 (cd "${TESTCLASSES}"; \
-  $JAVA ${TESTVMOPTS} -Xverify:none -Xlog:classunload \
+  $JAVA ${TESTVMOPTS} -Xverify:none -Xlog:class+unload \
     -javaagent:ClassUnloadTest.jar ClassUnloadTest "${OTHERDIR}" Bar.jar)

From 1f092412dccc3eeb353c0ef4ab360a5999f2e050 Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Mon, 2 May 2016 12:01:39 +0300
Subject: [PATCH 022/228] 8154493: AppletViewer should emit its deprecation
 warning to standard error

Reviewed-by: smarks
---
 jdk/src/java.desktop/share/classes/sun/applet/Main.java     | 3 ++-
 .../DeprecatedAppletViewer/DeprecatedAppletViewer.java      | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/jdk/src/java.desktop/share/classes/sun/applet/Main.java b/jdk/src/java.desktop/share/classes/sun/applet/Main.java
index 086b1113614..6c28c8f9d11 100644
--- a/jdk/src/java.desktop/share/classes/sun/applet/Main.java
+++ b/jdk/src/java.desktop/share/classes/sun/applet/Main.java
@@ -104,7 +104,8 @@ public class Main {
     private int run(String [] args) {
         // DECODE ARGS
         try {
-            System.out.println(lookup("deprecated"));
+            System.err.println(lookup("deprecated"));
+            System.err.flush();
             if (args.length == 0) {
                 usage();
                 return 0;
diff --git a/jdk/test/sun/applet/DeprecatedAppletViewer/DeprecatedAppletViewer.java b/jdk/test/sun/applet/DeprecatedAppletViewer/DeprecatedAppletViewer.java
index f3b43f83eee..3c491011794 100644
--- a/jdk/test/sun/applet/DeprecatedAppletViewer/DeprecatedAppletViewer.java
+++ b/jdk/test/sun/applet/DeprecatedAppletViewer/DeprecatedAppletViewer.java
@@ -35,14 +35,14 @@ public final class DeprecatedAppletViewer {
     private static final String TEXT = "AppletViewer is deprecated.";
 
     public static void main(final String[] args) {
-        final PrintStream old = System.out;
+        final PrintStream old = System.err;
         final ByteArrayOutputStream baos = new ByteArrayOutputStream(1000);
         final PrintStream ps = new PrintStream(baos);
         try {
-            System.setOut(ps);
+            System.setErr(ps);
             sun.applet.Main.main(new String[]{});
         } finally {
-            System.setOut(old);
+            System.setErr(old);
         }
 
         final String text = new String(baos.toByteArray());

From 36865021a112e983a33d495d4a1ab0d4490ae2b0 Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Mon, 2 May 2016 12:08:59 +0300
Subject: [PATCH 023/228] 8027324: The spec for Toolkit.setDynamicLayout() and
 Toolkit.isDynamicLayoutActive() needs to be clarified

Reviewed-by: alexsch, prr
---
 .../share/classes/java/awt/Toolkit.java       | 52 ++++++++++---------
 .../awt/Toolkit/DynamicLayout/bug7172833.java | 22 +++++++-
 2 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/jdk/src/java.desktop/share/classes/java/awt/Toolkit.java b/jdk/src/java.desktop/share/classes/java/awt/Toolkit.java
index bed5149c08a..b45dd39a717 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/Toolkit.java
+++ b/jdk/src/java.desktop/share/classes/java/awt/Toolkit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2016, 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
@@ -207,30 +207,34 @@ public abstract class Toolkit {
     }
 
     /**
-     * Returns whether dynamic layout of Containers on resize is
-     * currently active (both set in program
-     *( {@code isDynamicLayoutSet()} )
-     *, and supported
-     * by the underlying operating system and/or window manager).
-     * If dynamic layout is currently inactive then Containers
-     * re-layout their components when resizing is completed. As a result
-     * the {@code Component.validate()} method will be invoked only
-     * once per resize.
-     * If dynamic layout is currently active then Containers
-     * re-layout their components on every native resize event and
-     * the {@code validate()} method will be invoked each time.
-     * The OS/WM support can be queried using
-     * the getDesktopProperty("awt.dynamicLayoutSupported") method.
+     * Returns whether dynamic layout of Containers on resize is currently
+     * enabled on the underlying operating system and/or window manager). If the
+     * platform supports it, {@code setDynamicLayout(boolean)} may be used to
+     * programmatically enable or disable platform dynamic layout. Regardless of
+     * whether that toggling is supported, or whether {@code true} or {@code
+     * false} is specified as an argument, or has never been called at all, this
+     * method will return the active current platform behavior and which will be
+     * followed by the JDK in determining layout policy during resizing.
+     * <p>
+     * If dynamic layout is currently inactive then Containers re-layout their
+     * components when resizing is completed. As a result the
+     * {@code Component.validate()} method will be invoked only once per resize.
+     * If dynamic layout is currently active then Containers re-layout their
+     * components on every native resize event and the {@code validate()} method
+     * will be invoked each time. The OS/WM support can be queried using the
+     * getDesktopProperty("awt.dynamicLayoutSupported") method. This property
+     * will reflect the platform capability but is not sufficient to tell if it
+     * is presently enabled.
      *
-     * @return    true if dynamic layout of Containers on resize is
-     *            currently active, false otherwise.
-     * @exception HeadlessException if the GraphicsEnvironment.isHeadless()
-     *            method returns true
-     * @see       #setDynamicLayout(boolean dynamic)
-     * @see       #isDynamicLayoutSet()
-     * @see       #getDesktopProperty(String propertyName)
-     * @see       java.awt.GraphicsEnvironment#isHeadless
-     * @since     1.4
+     * @return true if dynamic layout of Containers on resize is currently
+     *         active, false otherwise.
+     * @throws HeadlessException if the GraphicsEnvironment.isHeadless() method
+     *         returns true
+     * @see #setDynamicLayout(boolean dynamic)
+     * @see #isDynamicLayoutSet()
+     * @see #getDesktopProperty(String propertyName)
+     * @see java.awt.GraphicsEnvironment#isHeadless
+     * @since 1.4
      */
     public boolean isDynamicLayoutActive()
         throws HeadlessException {
diff --git a/jdk/test/java/awt/Toolkit/DynamicLayout/bug7172833.java b/jdk/test/java/awt/Toolkit/DynamicLayout/bug7172833.java
index 7c61804892b..2c4f04147b8 100644
--- a/jdk/test/java/awt/Toolkit/DynamicLayout/bug7172833.java
+++ b/jdk/test/java/awt/Toolkit/DynamicLayout/bug7172833.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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,16 +45,34 @@ public final class bug7172833 {
 
     public static void main(final String[] args) throws Exception {
         final StubbedToolkit t = new StubbedToolkit();
-
+        final Boolean dynamicLayoutSupported
+                = (Boolean) t.getDesktopProperty("awt.dynamicLayoutSupported");
         t.setDynamicLayout(true);
         if(!t.isDynamicLayoutSet()){
             throw new RuntimeException("'true' expected but 'false' returned");
         }
+        if (dynamicLayoutSupported) {
+            if (!t.isDynamicLayoutActive()) {
+                throw new RuntimeException("is inactive but set+supported");
+            }
+        } else {
+            if (t.isDynamicLayoutActive()) {
+                throw new RuntimeException("is active but unsupported");
+            }
+        }
 
         t.setDynamicLayout(false);
         if(t.isDynamicLayoutSet()){
             throw new RuntimeException("'false' expected but 'true' returned");
         }
+        if (dynamicLayoutSupported) {
+            // Layout is supported and was set to false, cannot verifym because
+            // the native system is free to ignore our request.
+        } else {
+            if (t.isDynamicLayoutActive()) {
+                throw new RuntimeException("is active but unset+unsupported");
+            }
+        }
     }
 
     static final class StubbedToolkit extends Toolkit {

From 4ece44cbfaef95e46fc9357fd0823bcb4044bc41 Mon Sep 17 00:00:00 2001
From: Jamsheed Mohammed C M <jcm@openjdk.org>
Date: Tue, 10 May 2016 00:17:46 -0700
Subject: [PATCH 024/228] 8150016: small typo in ciReplay code

Changed atol to atoi

Reviewed-by: kvn
---
 hotspot/src/share/vm/ci/ciReplay.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hotspot/src/share/vm/ci/ciReplay.cpp b/hotspot/src/share/vm/ci/ciReplay.cpp
index 8e3e6fb1ae3..27b00023563 100644
--- a/hotspot/src/share/vm/ci/ciReplay.cpp
+++ b/hotspot/src/share/vm/ci/ciReplay.cpp
@@ -823,7 +823,7 @@ class CompileReplay : public StackObj {
         int value = atoi(string_value);
         java_mirror->short_field_put(fd.offset(), value);
       } else if (strcmp(field_signature, "Z") == 0) {
-        int value = atol(string_value);
+        int value = atoi(string_value);
         java_mirror->bool_field_put(fd.offset(), value);
       } else if (strcmp(field_signature, "J") == 0) {
         jlong value;

From 96c4dc32102ce810843e18243d52cd73d4a673c3 Mon Sep 17 00:00:00 2001
From: Jamsheed Mohammed C M <jcm@openjdk.org>
Date: Mon, 9 May 2016 23:49:22 -0700
Subject: [PATCH 025/228] 8144856: fix assert in
 CompiledStaticCall::set_to_interpreted

Trivial cleanup in assert code.

Reviewed-by: kvn, goetz, thartmann
---
 hotspot/src/cpu/aarch64/vm/compiledIC_aarch64.cpp | 6 ++++--
 hotspot/src/cpu/ppc/vm/compiledIC_ppc.cpp         | 9 +++++++--
 hotspot/src/cpu/sparc/vm/compiledIC_sparc.cpp     | 9 +++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/hotspot/src/cpu/aarch64/vm/compiledIC_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/compiledIC_aarch64.cpp
index bd4e55a5151..1999b0f95be 100644
--- a/hotspot/src/cpu/aarch64/vm/compiledIC_aarch64.cpp
+++ b/hotspot/src/cpu/aarch64/vm/compiledIC_aarch64.cpp
@@ -92,9 +92,11 @@ void CompiledStaticCall::set_to_interpreted(methodHandle callee, address entry)
 #ifndef PRODUCT
   NativeGeneralJump* jump = nativeGeneralJump_at(method_holder->next_instruction_address());
 
-  assert(method_holder->data() == 0 || method_holder->data() == (intptr_t)callee(),
+  // read the value once
+  volatile intptr_t data = method_holder->data();
+  assert(data == 0 || data == (intptr_t)callee(),
          "a) MT-unsafe modification of inline cache");
-  assert(method_holder->data() == 0 || jump->jump_destination() == entry,
+  assert(data == 0 || jump->jump_destination() == entry,
          "b) MT-unsafe modification of inline cache");
 #endif
   // Update stub.
diff --git a/hotspot/src/cpu/ppc/vm/compiledIC_ppc.cpp b/hotspot/src/cpu/ppc/vm/compiledIC_ppc.cpp
index e50399de682..6ff77e028fe 100644
--- a/hotspot/src/cpu/ppc/vm/compiledIC_ppc.cpp
+++ b/hotspot/src/cpu/ppc/vm/compiledIC_ppc.cpp
@@ -178,10 +178,15 @@ void CompiledStaticCall::set_to_interpreted(methodHandle callee, address entry)
   NativeMovConstReg* method_holder = nativeMovConstReg_at(stub + IC_pos_in_java_to_interp_stub);
   NativeJump*        jump          = nativeJump_at(method_holder->next_instruction_address());
 
-  assert(method_holder->data() == 0 || method_holder->data() == (intptr_t)callee(),
+#ifdef ASSERT
+  // read the value once
+  volatile intptr_t data = method_holder->data();
+  volatile address destination = jump->jump_destination();
+  assert(data == 0 || data == (intptr_t)callee(),
          "a) MT-unsafe modification of inline cache");
-  assert(jump->jump_destination() == (address)-1 || jump->jump_destination() == entry,
+  assert(destination == (address)-1 || destination == entry,
          "b) MT-unsafe modification of inline cache");
+#endif
 
   // Update stub.
   method_holder->set_data((intptr_t)callee());
diff --git a/hotspot/src/cpu/sparc/vm/compiledIC_sparc.cpp b/hotspot/src/cpu/sparc/vm/compiledIC_sparc.cpp
index c544e7ae994..3536718fafc 100644
--- a/hotspot/src/cpu/sparc/vm/compiledIC_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/compiledIC_sparc.cpp
@@ -101,10 +101,15 @@ void CompiledStaticCall::set_to_interpreted(methodHandle callee, address entry)
   NativeMovConstReg* method_holder = nativeMovConstReg_at(stub);
   NativeJump*        jump          = nativeJump_at(method_holder->next_instruction_address());
 
-  assert(method_holder->data() == 0 || method_holder->data() == (intptr_t)callee(),
+#ifdef ASSERT
+  // read the value once
+  intptr_t data = method_holder->data();
+  address destination = jump->jump_destination();
+  assert(data == 0 || data == (intptr_t)callee(),
          "a) MT-unsafe modification of inline cache");
-  assert(jump->jump_destination() == (address)-1 || jump->jump_destination() == entry,
+  assert(destination == (address)-1 || destination == entry,
          "b) MT-unsafe modification of inline cache");
+#endif
 
   // Update stub.
   method_holder->set_data((intptr_t)callee());

From 1e4b00b1dc91b1ac230771bce3b72c56ed1cea60 Mon Sep 17 00:00:00 2001
From: Goetz Lindenmaier <goetz@openjdk.org>
Date: Tue, 3 May 2016 12:23:06 +0200
Subject: [PATCH 026/228] 8140594: Various minor code improvements (compiler)

Various minor code improvements (compiler)

Reviewed-by: thartmann, kvn
---
 hotspot/src/os/linux/vm/os_linux.cpp          | 27 ++++++++++---------
 .../src/os_cpu/linux_x86/vm/os_linux_x86.cpp  |  2 +-
 hotspot/src/share/vm/adlc/formssel.cpp        | 13 ++++-----
 hotspot/src/share/vm/c1/c1_LinearScan.cpp     |  8 +++---
 hotspot/src/share/vm/ci/ciMethodBlocks.cpp    |  2 +-
 .../share/vm/classfile/classFileParser.cpp    | 11 +++++---
 .../src/share/vm/classfile/classLoader.cpp    |  7 ++---
 .../share/vm/classfile/systemDictionary.cpp   |  6 ++---
 .../src/share/vm/compiler/compileBroker.cpp   |  7 +++--
 hotspot/src/share/vm/compiler/compileLog.cpp  |  3 ++-
 .../src/share/vm/compiler/disassembler.cpp    |  6 ++---
 hotspot/src/share/vm/logging/logTagSet.cpp    | 10 +++++--
 hotspot/src/share/vm/oops/constantPool.cpp    |  3 ++-
 hotspot/src/share/vm/oops/generateOopMap.cpp  | 10 +++++--
 hotspot/src/share/vm/opto/block.cpp           |  2 +-
 hotspot/src/share/vm/opto/callnode.cpp        |  1 +
 hotspot/src/share/vm/opto/graphKit.cpp        |  2 +-
 hotspot/src/share/vm/opto/matcher.cpp         |  9 ++++---
 hotspot/src/share/vm/runtime/relocator.cpp    |  4 +--
 19 files changed, 77 insertions(+), 56 deletions(-)

diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp
index a9efaec274d..66b5718d73d 100644
--- a/hotspot/src/os/linux/vm/os_linux.cpp
+++ b/hotspot/src/os/linux/vm/os_linux.cpp
@@ -1913,9 +1913,10 @@ static bool _print_ascii_file(const char* filename, outputStream* st) {
     return false;
   }
 
-  char buf[32];
+  char buf[33];
   int bytes;
-  while ((bytes = ::read(fd, buf, sizeof(buf))) > 0) {
+  buf[32] = '\0';
+  while ((bytes = ::read(fd, buf, sizeof(buf)-1)) > 0) {
     st->print_raw(buf, bytes);
   }
 
@@ -6033,8 +6034,8 @@ int os::get_core_path(char* buffer, size_t bufferSize) {
 
     if (core_pattern[0] == '|') {
       written = jio_snprintf(buffer, bufferSize,
-                        "\"%s\" (or dumping to %s/core.%d)",
-                                     &core_pattern[1], p, current_process_id());
+                             "\"%s\" (or dumping to %s/core.%d)",
+                             &core_pattern[1], p, current_process_id());
     } else {
       written = jio_snprintf(buffer, bufferSize, "%s/%s", p, core_pattern);
     }
@@ -6067,20 +6068,20 @@ bool os::start_debugging(char *buf, int buflen) {
   char *p = &buf[len];
 
   jio_snprintf(p, buflen-len,
-             "\n\n"
-             "Do you want to debug the problem?\n\n"
-             "To debug, run 'gdb /proc/%d/exe %d'; then switch to thread " UINTX_FORMAT " (" INTPTR_FORMAT ")\n"
-             "Enter 'yes' to launch gdb automatically (PATH must include gdb)\n"
-             "Otherwise, press RETURN to abort...",
-             os::current_process_id(), os::current_process_id(),
-             os::current_thread_id(), os::current_thread_id());
+               "\n\n"
+               "Do you want to debug the problem?\n\n"
+               "To debug, run 'gdb /proc/%d/exe %d'; then switch to thread " UINTX_FORMAT " (" INTPTR_FORMAT ")\n"
+               "Enter 'yes' to launch gdb automatically (PATH must include gdb)\n"
+               "Otherwise, press RETURN to abort...",
+               os::current_process_id(), os::current_process_id(),
+               os::current_thread_id(), os::current_thread_id());
 
   bool yes = os::message_box("Unexpected Error", buf);
 
   if (yes) {
     // yes, user asked VM to launch debugger
-    jio_snprintf(buf, sizeof(buf), "gdb /proc/%d/exe %d",
-                     os::current_process_id(), os::current_process_id());
+    jio_snprintf(buf, sizeof(char)*buflen, "gdb /proc/%d/exe %d",
+                 os::current_process_id(), os::current_process_id());
 
     os::fork_and_exec(buf);
     yes = false;
diff --git a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
index 7d7aad54046..4b0b573ea25 100644
--- a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+++ b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
@@ -823,7 +823,7 @@ void os::print_context(outputStream *st, const void *context) {
 
   intptr_t *sp = (intptr_t *)os::Linux::ucontext_get_sp(uc);
   st->print_cr("Top of Stack: (sp=" PTR_FORMAT ")", p2i(sp));
-  print_hex_dump(st, (address)sp, (address)(sp + 8*sizeof(intptr_t)), sizeof(intptr_t));
+  print_hex_dump(st, (address)sp, (address)(sp + 8), sizeof(intptr_t));
   st->cr();
 
   // Note: it may be unsafe to inspect memory near pc. For example, pc may
diff --git a/hotspot/src/share/vm/adlc/formssel.cpp b/hotspot/src/share/vm/adlc/formssel.cpp
index a3faa48e426..aaef59a9441 100644
--- a/hotspot/src/share/vm/adlc/formssel.cpp
+++ b/hotspot/src/share/vm/adlc/formssel.cpp
@@ -1499,7 +1499,8 @@ void MachNodeForm::output(FILE *fp) {
 // twice, we need to check that the operands are pointer-eequivalent in
 // the DFA during the labeling process.
 Predicate *InstructForm::build_predicate() {
-  char buf[1024], *s=buf;
+  const int buflen = 1024;
+  char buf[buflen], *s=buf;
   Dict names(cmpstr,hashstr,Form::arena);       // Map Names to counts
 
   MatchNode *mnode =
@@ -1508,12 +1509,12 @@ Predicate *InstructForm::build_predicate() {
 
   uint first = 1;
   // Start with the predicate supplied in the .ad file.
-  if( _predicate ) {
-    if( first ) first=0;
-    strcpy(s,"("); s += strlen(s);
-    strcpy(s,_predicate->_pred);
+  if (_predicate) {
+    if (first) first = 0;
+    strcpy(s, "("); s += strlen(s);
+    strncpy(s, _predicate->_pred, buflen - strlen(s) - 1);
     s += strlen(s);
-    strcpy(s,")"); s += strlen(s);
+    strcpy(s, ")"); s += strlen(s);
   }
   for( DictI i(&names); i.test(); ++i ) {
     uintptr_t cnt = (uintptr_t)i._value;
diff --git a/hotspot/src/share/vm/c1/c1_LinearScan.cpp b/hotspot/src/share/vm/c1/c1_LinearScan.cpp
index 991daa0791b..dd45f5bf3b9 100644
--- a/hotspot/src/share/vm/c1/c1_LinearScan.cpp
+++ b/hotspot/src/share/vm/c1/c1_LinearScan.cpp
@@ -5521,7 +5521,8 @@ int LinearScanWalker::find_locked_double_reg(int reg_needed_until, int interval_
     }
   }
 
-  if (_block_pos[max_reg] <= interval_to || _block_pos[max_reg + 1] <= interval_to) {
+  if (max_reg != any_reg &&
+      (_block_pos[max_reg] <= interval_to || _block_pos[max_reg + 1] <= interval_to)) {
     *need_split = true;
   }
 
@@ -6497,8 +6498,9 @@ void LinearScanStatistic::print(const char* title) {
       if (_counters_sum[i] > 0 || _counters_max[i] >= 0) {
         tty->print("%25s: %8d", counter_name(i), _counters_sum[i]);
 
-        if (base_counter(i) != invalid_counter) {
-          tty->print("  (%5.1f%%) ", _counters_sum[i] * 100.0 / _counters_sum[base_counter(i)]);
+        LinearScanStatistic::Counter cntr = base_counter(i);
+        if (cntr != invalid_counter) {
+          tty->print("  (%5.1f%%) ", _counters_sum[i] * 100.0 / _counters_sum[cntr]);
         } else {
           tty->print("           ");
         }
diff --git a/hotspot/src/share/vm/ci/ciMethodBlocks.cpp b/hotspot/src/share/vm/ci/ciMethodBlocks.cpp
index 614e75dc3bf..3ce828ecb93 100644
--- a/hotspot/src/share/vm/ci/ciMethodBlocks.cpp
+++ b/hotspot/src/share/vm/ci/ciMethodBlocks.cpp
@@ -372,7 +372,7 @@ static const char *flagnames[] = {
 
 void ciBlock::dump() {
   tty->print(" [%d .. %d), {", _start_bci, _limit_bci);
-  for (int i = 0; i < 8; i++) {
+  for (int i = 0; i < 7; i++) {
     if ((_flags & (1 << i)) != 0) {
       tty->print(" %s", flagnames[i]);
     }
diff --git a/hotspot/src/share/vm/classfile/classFileParser.cpp b/hotspot/src/share/vm/classfile/classFileParser.cpp
index 81216bbd518..84d6673b860 100644
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp
@@ -1401,9 +1401,11 @@ class ClassFileParser::FieldAllocationCount : public ResourceObj {
 
   FieldAllocationType update(bool is_static, BasicType type) {
     FieldAllocationType atype = basic_type_to_atype(is_static, type);
-    // Make sure there is no overflow with injected fields.
-    assert(count[atype] < 0xFFFF, "More than 65535 fields");
-    count[atype]++;
+    if (atype != BAD_ALLOCATION_TYPE) {
+      // Make sure there is no overflow with injected fields.
+      assert(count[atype] < 0xFFFF, "More than 65535 fields");
+      count[atype]++;
+    }
     return atype;
   }
 };
@@ -3335,8 +3337,9 @@ void ClassFileParser::parse_classfile_attributes(const ClassFileStream* const cf
         }
       } else if (tag == vmSymbols::tag_bootstrap_methods() &&
                  _major_version >= Verifier::INVOKEDYNAMIC_MAJOR_VERSION) {
-        if (parsed_bootstrap_methods_attribute)
+        if (parsed_bootstrap_methods_attribute) {
           classfile_parse_error("Multiple BootstrapMethods attributes in class file %s", CHECK);
+        }
         parsed_bootstrap_methods_attribute = true;
         parse_classfile_bootstrap_methods_attribute(cfs, cp, attribute_length, CHECK);
       } else if (tag == vmSymbols::tag_runtime_visible_type_annotations()) {
diff --git a/hotspot/src/share/vm/classfile/classLoader.cpp b/hotspot/src/share/vm/classfile/classLoader.cpp
index 9fb99bc6bf0..cb5d8524e60 100644
--- a/hotspot/src/share/vm/classfile/classLoader.cpp
+++ b/hotspot/src/share/vm/classfile/classLoader.cpp
@@ -305,11 +305,9 @@ u1* ClassPathZipEntry::open_versioned_entry(const char* name, jint* filesize, TR
     }
 
     if (is_multi_ver) {
-      int n;
       char entry_name[JVM_MAXPATHLEN];
       if (version > 0) {
-        n = jio_snprintf(entry_name, sizeof(entry_name), "META-INF/versions/%d/%s", version, name);
-        entry_name[n] = '\0';
+        jio_snprintf(entry_name, sizeof(entry_name), "META-INF/versions/%d/%s", version, name);
         buffer = open_entry((const char*)entry_name, filesize, false, CHECK_NULL);
         if (buffer == NULL) {
           warning("Could not find %s in %s, try to find highest version instead", entry_name, _zip_name);
@@ -317,8 +315,7 @@ u1* ClassPathZipEntry::open_versioned_entry(const char* name, jint* filesize, TR
       }
       if (buffer == NULL) {
         for (int i = cur_ver; i >= base_version; i--) {
-          n = jio_snprintf(entry_name, sizeof(entry_name), "META-INF/versions/%d/%s", i, name);
-          entry_name[n] = '\0';
+          jio_snprintf(entry_name, sizeof(entry_name), "META-INF/versions/%d/%s", i, name);
           buffer = open_entry((const char*)entry_name, filesize, false, CHECK_NULL);
           if (buffer != NULL) {
             break;
diff --git a/hotspot/src/share/vm/classfile/systemDictionary.cpp b/hotspot/src/share/vm/classfile/systemDictionary.cpp
index ede6d4f1df9..7dcd740f8a5 100644
--- a/hotspot/src/share/vm/classfile/systemDictionary.cpp
+++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp
@@ -1160,10 +1160,10 @@ Klass* SystemDictionary::resolve_from_stream(Symbol* class_name,
     while ((index = strchr(name, '/')) != NULL) {
       *index = '.'; // replace '/' with '.' in package name
     }
-    const char* fmt = "Prohibited package name: %s";
-    size_t len = strlen(fmt) + strlen(name);
+    const char* msg_text = "Prohibited package name: ";
+    size_t len = strlen(msg_text) + strlen(name) + 1;
     char* message = NEW_RESOURCE_ARRAY(char, len);
-    jio_snprintf(message, len, fmt, name);
+    jio_snprintf(message, len, "%s%s", msg_text, name);
     Exceptions::_throw_msg(THREAD_AND_LOCATION,
       vmSymbols::java_lang_SecurityException(), message);
   }
diff --git a/hotspot/src/share/vm/compiler/compileBroker.cpp b/hotspot/src/share/vm/compiler/compileBroker.cpp
index 22934de31aa..d49c0802729 100644
--- a/hotspot/src/share/vm/compiler/compileBroker.cpp
+++ b/hotspot/src/share/vm/compiler/compileBroker.cpp
@@ -2392,10 +2392,9 @@ void CompileBroker::print_times(bool per_compiler, bool aggregate) {
 
 // Debugging output for failure
 void CompileBroker::print_last_compile() {
-  if ( _last_compile_level != CompLevel_none &&
-       compiler(_last_compile_level) != NULL &&
-       _last_method_compiled != NULL &&
-       _last_compile_type != no_compile) {
+  if (_last_compile_level != CompLevel_none &&
+      compiler(_last_compile_level) != NULL &&
+      _last_compile_type != no_compile) {
     if (_last_compile_type == osr_compile) {
       tty->print_cr("Last parse:  [osr]%d+++(%d) %s",
                     _osr_compilation_id, _last_compile_level, _last_method_compiled);
diff --git a/hotspot/src/share/vm/compiler/compileLog.cpp b/hotspot/src/share/vm/compiler/compileLog.cpp
index 6c0a87f9c91..638a2f2f96f 100644
--- a/hotspot/src/share/vm/compiler/compileLog.cpp
+++ b/hotspot/src/share/vm/compiler/compileLog.cpp
@@ -231,7 +231,8 @@ void CompileLog::finish_log_on_error(outputStream* file, char* buf, int buflen)
       // Copy any remaining data inside a quote:
       bool saw_slop = false;
       int end_cdata = 0;  // state machine [0..2] watching for too many "]]"
-      while ((nr = read(partial_fd, buf, buflen)) > 0) {
+      while ((nr = read(partial_fd, buf, buflen-1)) > 0) {
+        buf[buflen-1] = '\0';
         if (!saw_slop) {
           file->print_raw_cr("<fragment>");
           file->print_raw_cr("<![CDATA[");
diff --git a/hotspot/src/share/vm/compiler/disassembler.cpp b/hotspot/src/share/vm/compiler/disassembler.cpp
index 44fb2272c00..8d443b70a03 100644
--- a/hotspot/src/share/vm/compiler/disassembler.cpp
+++ b/hotspot/src/share/vm/compiler/disassembler.cpp
@@ -99,7 +99,7 @@ bool Disassembler::load_library() {
     const char* p = strrchr(buf, *os::file_separator());
     if (p != NULL) lib_offset = p - base + 1;
     p = strstr(p ? p : base, "jvm");
-    if (p != NULL)  jvm_offset = p - base;
+    if (p != NULL) jvm_offset = p - base;
   }
 #endif
   // Find the disassembler shared library.
@@ -113,13 +113,13 @@ bool Disassembler::load_library() {
     strcpy(&buf[jvm_offset], hsdis_library_name);
     strcat(&buf[jvm_offset], os::dll_file_extension());
     _library = os::dll_load(buf, ebuf, sizeof ebuf);
-    if (_library == NULL) {
+    if (_library == NULL && lib_offset >= 0) {
       // 2. <home>/jre/lib/<arch>/<vm>/hsdis-<arch>.so
       strcpy(&buf[lib_offset], hsdis_library_name);
       strcat(&buf[lib_offset], os::dll_file_extension());
       _library = os::dll_load(buf, ebuf, sizeof ebuf);
     }
-    if (_library == NULL) {
+    if (_library == NULL && lib_offset > 0) {
       // 3. <home>/jre/lib/<arch>/hsdis-<arch>.so
       buf[lib_offset - 1] = '\0';
       const char* p = strrchr(buf, *os::file_separator());
diff --git a/hotspot/src/share/vm/logging/logTagSet.cpp b/hotspot/src/share/vm/logging/logTagSet.cpp
index 96aae628857..6eb3cdb8158 100644
--- a/hotspot/src/share/vm/logging/logTagSet.cpp
+++ b/hotspot/src/share/vm/logging/logTagSet.cpp
@@ -104,12 +104,18 @@ void LogTagSet::vwrite(LogLevelType level, const char* fmt, va_list args) {
   va_copy(saved_args, args);
   size_t prefix_len = _write_prefix(buf, sizeof(buf));
   // Check that string fits in buffer; resize buffer if necessary
-  int ret = os::log_vsnprintf(buf + prefix_len, sizeof(buf) - prefix_len, fmt, args);
+  int ret;
+  if (prefix_len < vwrite_buffer_size) {
+    ret = os::log_vsnprintf(buf + prefix_len, sizeof(buf) - prefix_len, fmt, args);
+  } else {
+    // Buffer too small. Just call printf to find out the length for realloc below.
+    ret = os::log_vsnprintf(buf, sizeof(buf), fmt, args);
+  }
   assert(ret >= 0, "Log message buffer issue");
   if ((size_t)ret >= sizeof(buf)) {
     size_t newbuf_len = prefix_len + ret + 1;
     char* newbuf = NEW_C_HEAP_ARRAY(char, newbuf_len, mtLogging);
-    memcpy(newbuf, buf, prefix_len);
+    prefix_len = _write_prefix(newbuf, newbuf_len);
     ret = os::log_vsnprintf(newbuf + prefix_len, newbuf_len - prefix_len, fmt, saved_args);
     assert(ret >= 0, "Log message buffer issue");
     log(level, newbuf);
diff --git a/hotspot/src/share/vm/oops/constantPool.cpp b/hotspot/src/share/vm/oops/constantPool.cpp
index ec22e2181c7..a291dc5d3f8 100644
--- a/hotspot/src/share/vm/oops/constantPool.cpp
+++ b/hotspot/src/share/vm/oops/constantPool.cpp
@@ -80,7 +80,8 @@ static bool tag_array_is_zero_initialized(Array<u1>* tags) {
 
 ConstantPool::ConstantPool(Array<u1>* tags) :
   _tags(tags),
-  _length(tags->length()) {
+  _length(tags->length()),
+  _flags(0) {
 
     assert(_tags != NULL, "invariant");
     assert(tags->length() == _length, "invariant");
diff --git a/hotspot/src/share/vm/oops/generateOopMap.cpp b/hotspot/src/share/vm/oops/generateOopMap.cpp
index fe8cdbc64c6..6f44433af56 100644
--- a/hotspot/src/share/vm/oops/generateOopMap.cpp
+++ b/hotspot/src/share/vm/oops/generateOopMap.cpp
@@ -1678,8 +1678,14 @@ void GenerateOopMap::ppdupswap(int poplen, const char *out) {
   CellTypeState actual[5];
   assert(poplen < 5, "this must be less than length of actual vector");
 
-  // pop all arguments
-  for(int i = 0; i < poplen; i++) actual[i] = pop();
+  // Pop all arguments.
+  for (int i = 0; i < poplen; i++) {
+    actual[i] = pop();
+  }
+  // Field _state is uninitialized when calling push.
+  for (int i = poplen; i < 5; i++) {
+    actual[i] = CellTypeState::uninit;
+  }
 
   // put them back
   char push_ch = *out++;
diff --git a/hotspot/src/share/vm/opto/block.cpp b/hotspot/src/share/vm/opto/block.cpp
index bc3d772c3f8..ffa06e03358 100644
--- a/hotspot/src/share/vm/opto/block.cpp
+++ b/hotspot/src/share/vm/opto/block.cpp
@@ -1430,7 +1430,7 @@ void PhaseBlockLayout::find_edges() {
       if (n->num_preds() != 1) break;
 
       i++;
-      assert(n = _cfg.get_block(i), "expecting next block");
+      assert(n == _cfg.get_block(i), "expecting next block");
       tr->append(n);
       uf->map(n->_pre_order, tr->id());
       traces[n->_pre_order] = NULL;
diff --git a/hotspot/src/share/vm/opto/callnode.cpp b/hotspot/src/share/vm/opto/callnode.cpp
index 6a43b33cde4..66b2d086bbd 100644
--- a/hotspot/src/share/vm/opto/callnode.cpp
+++ b/hotspot/src/share/vm/opto/callnode.cpp
@@ -256,6 +256,7 @@ uint TailJumpNode::match_edge(uint idx) const {
 JVMState::JVMState(ciMethod* method, JVMState* caller) :
   _method(method) {
   assert(method != NULL, "must be valid call site");
+  _bci = InvocationEntryBci;
   _reexecute = Reexecute_Undefined;
   debug_only(_bci = -99);  // random garbage value
   debug_only(_map = (SafePointNode*)-1);
diff --git a/hotspot/src/share/vm/opto/graphKit.cpp b/hotspot/src/share/vm/opto/graphKit.cpp
index 9350074955a..3a7d21ac897 100644
--- a/hotspot/src/share/vm/opto/graphKit.cpp
+++ b/hotspot/src/share/vm/opto/graphKit.cpp
@@ -1079,7 +1079,7 @@ bool GraphKit::compute_stack_effects(int& inputs, int& depth) {
   case Bytecodes::_freturn:
   case Bytecodes::_dreturn:
   case Bytecodes::_areturn:
-    assert(rsize = -depth, "");
+    assert(rsize == -depth, "");
     inputs = rsize;
     break;
 
diff --git a/hotspot/src/share/vm/opto/matcher.cpp b/hotspot/src/share/vm/opto/matcher.cpp
index 44127f3bc23..ed06b1e7459 100644
--- a/hotspot/src/share/vm/opto/matcher.cpp
+++ b/hotspot/src/share/vm/opto/matcher.cpp
@@ -659,11 +659,14 @@ void Matcher::Fixup_Save_On_Entry( ) {
   uint reth_edge_cnt = TypeFunc::Parms+1;
   RegMask *reth_rms  = init_input_masks( reth_edge_cnt + soe_cnt, _return_addr_mask, c_frame_ptr_mask );
   // Rethrow takes exception oop only, but in the argument 0 slot.
-  reth_rms[TypeFunc::Parms] = mreg2regmask[find_receiver(false)];
+  OptoReg::Name reg = find_receiver(false);
+  if (reg >= 0) {
+    reth_rms[TypeFunc::Parms] = mreg2regmask[reg];
 #ifdef _LP64
-  // Need two slots for ptrs in 64-bit land
-  reth_rms[TypeFunc::Parms].Insert(OptoReg::add(OptoReg::Name(find_receiver(false)),1));
+    // Need two slots for ptrs in 64-bit land
+    reth_rms[TypeFunc::Parms].Insert(OptoReg::add(OptoReg::Name(reg), 1));
 #endif
+  }
 
   // Input RegMask array shared by all TailCalls
   uint tail_call_edge_cnt = TypeFunc::Parms+2;
diff --git a/hotspot/src/share/vm/runtime/relocator.cpp b/hotspot/src/share/vm/runtime/relocator.cpp
index e6ad4d1bfc7..df1911f1360 100644
--- a/hotspot/src/share/vm/runtime/relocator.cpp
+++ b/hotspot/src/share/vm/runtime/relocator.cpp
@@ -612,8 +612,8 @@ bool Relocator::relocate_code(int bci, int ilen, int delta) {
   // In case we have shrunken a tableswitch/lookupswitch statement, we store the last
   // bytes that get overwritten. We have to copy the bytes after the change_jumps method
   // has been called, since it is likely to update last offset in a tableswitch/lookupswitch
-  if (delta < 0) {
-    assert(delta>=-3, "we cannot overwrite more than 3 bytes");
+  assert(delta >= -3, "We cannot overwrite more than 3 bytes.");
+  if (delta < 0 && delta >= -3) {
     memcpy(_overwrite, addr_at(bci + ilen + delta), -delta);
   }
 

From 905d21fe7681109c9a5c959407be09aa4ae7fda6 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Mon, 16 May 2016 14:47:27 +0530
Subject: [PATCH 027/228] 8156914: jlink API minor cleanups

Reviewed-by: mchung
---
 .../share/classes/jdk/tools/jlink/Jlink.java  |  30 +-
 .../jlink/builder/DefaultImageBuilder.java    | 108 ++--
 .../jdk/tools/jlink/builder/ImageBuilder.java |   6 +-
 .../jlink/internal/ImageFileCreator.java      |  55 +-
 .../internal/ImagePluginConfiguration.java    |  43 +-
 .../jlink/internal/ImagePluginStack.java      | 187 ++++---
 .../tools/jlink/internal/ModuleEntryImpl.java | 164 ++++++
 .../tools/jlink/internal/ModulePoolImpl.java  | 421 ++++++++++++++
 .../jlink/internal/PluginContextImpl.java     |  37 --
 .../jdk/tools/jlink/internal/PoolImpl.java    | 167 ------
 .../jlink/internal/ResourcePrevisitor.java    |   4 +-
 .../jdk/tools/jlink/internal/TaskHelper.java  |   9 +-
 .../jdk/tools/jlink/internal/Utils.java       |  48 +-
 .../packager/AppRuntimeImageBuilder.java      |   2 +-
 .../plugins/DefaultCompressPlugin.java        |  21 +-
 .../internal/plugins/ExcludeFilesPlugin.java  |  16 +-
 .../jlink/internal/plugins/ExcludePlugin.java |  15 +-
 .../internal/plugins/ExcludeVMPlugin.java     |  31 +-
 .../internal/plugins/FileCopierPlugin.java    |  34 +-
 .../plugins/GenerateJLIClassesPlugin.java     |  23 +-
 .../plugins/IncludeLocalesPlugin.java         |  29 +-
 .../internal/plugins/OptimizationPlugin.java  |   7 +-
 .../plugins/OrderResourcesPlugin.java         |  29 +-
 .../internal/plugins/ReleaseInfoPlugin.java   | 103 ++--
 .../internal/plugins/StringSharingPlugin.java |  36 +-
 .../internal/plugins/StripDebugPlugin.java    |  22 +-
 .../plugins/StripNativeCommandsPlugin.java    |  16 +-
 .../plugins/SystemModuleDescriptorPlugin.java |  39 +-
 .../jlink/internal/plugins/ZipPlugin.java     |  25 +-
 .../jlink/internal/plugins/asm/AsmPlugin.java |  16 +-
 .../jlink/internal/plugins/asm/AsmPool.java   |  25 +-
 .../internal/plugins/asm/AsmPoolImpl.java     |  93 ++-
 .../jlink/internal/plugins/asm/AsmPools.java  |  72 +--
 .../tools/jlink/plugin/ExecutableImage.java   |  39 +-
 .../jdk/tools/jlink/plugin/LinkModule.java    |  87 +++
 .../jdk/tools/jlink/plugin/ModuleEntry.java   | 155 +++++
 .../jdk/tools/jlink/plugin/ModulePool.java    | 136 +++++
 .../jdk/tools/jlink/plugin/Plugin.java        |  40 +-
 .../jdk/tools/jlink/plugin/PluginContext.java |  37 --
 .../classes/jdk/tools/jlink/plugin/Pool.java  | 528 ------------------
 .../tools/jlink/plugin/TransformerPlugin.java |   2 +-
 .../jdk.jlink/share/classes/module-info.java  |   4 +-
 jdk/test/tools/jlink/DefaultProviderTest.java |  18 +-
 .../tools/jlink/ImageFileCreatorTest.java     |   5 +-
 jdk/test/tools/jlink/ImageFilePoolTest.java   |  59 +-
 jdk/test/tools/jlink/IntegrationTest.java     |  20 +-
 jdk/test/tools/jlink/JLinkOptimTest.java      |  30 +-
 jdk/test/tools/jlink/JLinkOptionsTest.java    |   4 +-
 .../tools/jlink/JLinkPostProcessingTest.java  |   6 +-
 jdk/test/tools/jlink/ResourcePoolTest.java    | 122 ++--
 jdk/test/tools/jlink/SecurityTest.java        |   1 +
 .../asmplugin/AddForgetResourcesTest.java     |  84 +--
 .../jlink/asmplugin/AsmPluginTestBase.java    |  36 +-
 jdk/test/tools/jlink/asmplugin/BasicTest.java |  16 +-
 .../jlink/asmplugin/IdentityPluginTest.java   |  25 +-
 .../tools/jlink/asmplugin/NegativeTest.java   |   8 +-
 .../jlink/asmplugin/PackageMappingTest.java   |  12 +-
 .../tools/jlink/asmplugin/SortingTest.java    |  42 +-
 .../tools/jlink/asmplugin/VisitorTest.java    |  22 +-
 .../customplugin/plugin/CustomPlugin.java     |  19 +-
 .../customplugin/plugin/HelloPlugin.java      |  16 +-
 .../jlink/plugins/CompressorPluginTest.java   |  82 +--
 .../jlink/plugins/ExcludeFilesPluginTest.java |  19 +-
 .../jlink/plugins/ExcludePluginTest.java      |  16 +-
 .../jlink/plugins/ExcludeVMPluginTest.java    |  37 +-
 .../jlink/plugins/FileCopierPluginTest.java   |  21 +-
 .../tools/jlink/plugins/LastSorterTest.java   |  53 +-
 .../plugins/OrderResourcesPluginTest.java     |  79 +--
 .../tools/jlink/plugins/PluginOrderTest.java  |  58 +-
 .../jlink/plugins/PluginsNegativeTest.java    |  22 +-
 .../tools/jlink/plugins/PrevisitorTest.java   |  49 +-
 .../plugins/StringSharingPluginTest.java      |  26 +-
 .../jlink/plugins/StripDebugPluginTest.java   |  20 +-
 73 files changed, 2077 insertions(+), 1911 deletions(-)
 create mode 100644 jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ModuleEntryImpl.java
 create mode 100644 jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ModulePoolImpl.java
 delete mode 100644 jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PluginContextImpl.java
 delete mode 100644 jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PoolImpl.java
 create mode 100644 jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/LinkModule.java
 create mode 100644 jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ModuleEntry.java
 create mode 100644 jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ModulePool.java
 delete mode 100644 jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/PluginContext.java
 delete mode 100644 jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/Pool.java

diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/Jlink.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/Jlink.java
index 92d7eb64fcf..e899d378963 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/Jlink.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/Jlink.java
@@ -34,11 +34,9 @@ import java.util.Objects;
 import java.util.Set;
 import jdk.tools.jlink.internal.JlinkTask;
 import jdk.tools.jlink.plugin.Plugin;
-import jdk.tools.jlink.plugin.PluginContext;
 import jdk.tools.jlink.plugin.PluginException;
 import jdk.tools.jlink.plugin.ExecutableImage;
 import jdk.tools.jlink.builder.ImageBuilder;
-import jdk.tools.jlink.internal.PluginContextImpl;
 import jdk.tools.jlink.internal.PluginRepository;
 
 /**
@@ -71,7 +69,6 @@ public final class Jlink {
         private final List<Plugin> plugins;
         private final ImageBuilder imageBuilder;
         private final String lastSorterPluginName;
-        private final PluginContext pluginContext;
 
         /**
          * Empty plugins configuration.
@@ -86,7 +83,7 @@ public final class Jlink {
          * @param plugins List of plugins.
          */
         public PluginsConfiguration(List<Plugin> plugins) {
-            this(plugins, null, null, null);
+            this(plugins, null, null);
         }
 
         /**
@@ -101,28 +98,10 @@ public final class Jlink {
          */
         public PluginsConfiguration(List<Plugin> plugins,
                 ImageBuilder imageBuilder, String lastSorterPluginName) {
-            this(plugins, imageBuilder, lastSorterPluginName, null);
-        }
-
-        /**
-         * Plugins configuration with a last sorter and an ImageBuilder. No
-         * sorting can occur after the last sorter plugin. The ImageBuilder is
-         * in charge to layout the image content on disk.
-         *
-         * @param plugins List of transformer plugins.
-         * @param imageBuilder Image builder.
-         * @param lastSorterPluginName Name of last sorter plugin, no sorting
-         * @param ctx the plugin context
-         * can occur after it.
-         */
-        public PluginsConfiguration(List<Plugin> plugins,
-                ImageBuilder imageBuilder, String lastSorterPluginName,
-                PluginContext ctx) {
             this.plugins = plugins == null ? Collections.emptyList()
                     : plugins;
             this.imageBuilder = imageBuilder;
             this.lastSorterPluginName = lastSorterPluginName;
-            this.pluginContext = ctx != null? ctx : new PluginContextImpl();
         }
 
         /**
@@ -146,13 +125,6 @@ public final class Jlink {
             return lastSorterPluginName;
         }
 
-        /**
-         * @return the pluginContext
-         */
-        public PluginContext getPluginContext() {
-            return pluginContext;
-        }
-
         @Override
         public String toString() {
             StringBuilder builder = new StringBuilder();
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java
index a3943145c06..2c0620a99db 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java
@@ -1,3 +1,4 @@
+
 /*
  * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -24,8 +25,6 @@
  */
 package jdk.tools.jlink.builder;
 
-import jdk.tools.jlink.plugin.ExecutableImage;
-import jdk.tools.jlink.plugin.PluginException;
 import java.io.BufferedOutputStream;
 import java.io.BufferedWriter;
 import java.io.ByteArrayInputStream;
@@ -47,8 +46,10 @@ import java.nio.file.StandardOpenOption;
 import java.nio.file.attribute.PosixFileAttributeView;
 import java.nio.file.attribute.PosixFilePermission;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Properties;
@@ -56,23 +57,40 @@ import java.util.Set;
 import jdk.tools.jlink.internal.BasicImageWriter;
 import jdk.tools.jlink.internal.plugins.FileCopierPlugin;
 import jdk.tools.jlink.internal.plugins.FileCopierPlugin.SymImageFile;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.Module;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
+import jdk.tools.jlink.plugin.ExecutableImage;
+import jdk.tools.jlink.plugin.ModulePool;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.PluginException;
 
 /**
  *
  * Default Image Builder. This builder creates the default runtime image layout.
  */
-public class DefaultImageBuilder implements ImageBuilder {
+public final class DefaultImageBuilder implements ImageBuilder {
 
     /**
      * The default java executable Image.
      */
-    static class DefaultExecutableImage extends ExecutableImage {
+    static final class DefaultExecutableImage implements ExecutableImage {
+
+        private final Path home;
+        private final List<String> args;
+        private final Set<String> modules;
 
         public DefaultExecutableImage(Path home, Set<String> modules) {
-            super(home, modules, createArgs(home));
+            this(home, modules, createArgs(home));
+        }
+
+        private DefaultExecutableImage(Path home, Set<String> modules,
+                List<String> args) {
+            Objects.requireNonNull(home);
+            Objects.requireNonNull(args);
+            if (!Files.exists(home)) {
+                throw new IllegalArgumentException("Invalid image home");
+            }
+            this.home = home;
+            this.modules = Collections.unmodifiableSet(modules);
+            this.args = Collections.unmodifiableList(args);
         }
 
         private static List<String> createArgs(Path home) {
@@ -83,6 +101,21 @@ public class DefaultImageBuilder implements ImageBuilder {
             return javaArgs;
         }
 
+        @Override
+        public Path getHome() {
+            return home;
+        }
+
+        @Override
+        public Set<String> getModules() {
+            return modules;
+        }
+
+        @Override
+        public List<String> getExecutionArgs() {
+            return args;
+        }
+
         @Override
         public void storeLaunchArgs(List<String> args) {
             try {
@@ -111,17 +144,19 @@ public class DefaultImageBuilder implements ImageBuilder {
         Files.createDirectories(mdir);
     }
 
-    private void storeFiles(Set<String> modules, Properties release) throws IOException {
+    private void storeFiles(Set<String> modules, Map<String, String> release) throws IOException {
         if (release != null) {
-            addModules(release, modules);
+            Properties props = new Properties();
+            props.putAll(release);
+            addModules(props, modules);
             File r = new File(root.toFile(), "release");
             try (FileOutputStream fo = new FileOutputStream(r)) {
-                release.store(fo, null);
+                props.store(fo, null);
             }
         }
     }
 
-    private void addModules(Properties release, Set<String> modules) throws IOException {
+    private void addModules(Properties props, Set<String> modules) throws IOException {
         StringBuilder builder = new StringBuilder();
         int i = 0;
         for (String m : modules) {
@@ -131,28 +166,32 @@ public class DefaultImageBuilder implements ImageBuilder {
             }
             i++;
         }
-        release.setProperty("MODULES", builder.toString());
+        props.setProperty("MODULES", builder.toString());
     }
 
     @Override
-    public void storeFiles(Pool files, Properties release) {
+    public void storeFiles(ModulePool files) {
         try {
-            for (ModuleData f : files.getContent()) {
-               if (!f.getType().equals(Pool.ModuleDataType.CLASS_OR_RESOURCE)) {
-                    accept(f);
+            files.entries().forEach(f -> {
+                if (!f.getType().equals(ModuleEntry.Type.CLASS_OR_RESOURCE)) {
+                    try {
+                        accept(f);
+                    } catch (IOException ioExp) {
+                        throw new UncheckedIOException(ioExp);
+                    }
                 }
-            }
-            for (Module m : files.getModules()) {
+            });
+            files.modules().forEach(m -> {
                 // Only add modules that contain packages
                 if (!m.getAllPackages().isEmpty()) {
                     // Skip the fake module used by FileCopierPlugin when copying files.
                     if (m.getName().equals(FileCopierPlugin.FAKE_MODULE)) {
-                       continue;
+                        return;
                     }
                     modules.add(m.getName());
                 }
-            }
-            storeFiles(modules, release);
+            });
+            storeFiles(modules, files.getReleaseProperties());
 
             if (Files.getFileStore(root).supportsFileAttributeView(PosixFileAttributeView.class)) {
                 // launchers in the bin directory need execute permission
@@ -168,8 +207,8 @@ public class DefaultImageBuilder implements ImageBuilder {
                 Path lib = root.resolve("lib");
                 if (Files.isDirectory(lib)) {
                     Files.find(lib, 2, (path, attrs) -> {
-                        return path.getFileName().toString().equals("jspawnhelper") ||
-                               path.getFileName().toString().equals("jexec");
+                        return path.getFileName().toString().equals("jspawnhelper")
+                                || path.getFileName().toString().equals("jexec");
                     }).forEach(this::setExecutable);
                 }
             }
@@ -180,27 +219,23 @@ public class DefaultImageBuilder implements ImageBuilder {
         }
     }
 
-    @Override
-    public void storeFiles(Pool files) {
-        storeFiles(files, new Properties());
-    }
-
     /**
      * Generates launcher scripts.
+     *
      * @param imageContent The image content.
      * @param modules The set of modules that the runtime image contains.
      * @throws IOException
      */
-    protected void prepareApplicationFiles(Pool imageContent, Set<String> modules) throws IOException {
+    protected void prepareApplicationFiles(ModulePool imageContent, Set<String> modules) throws IOException {
         // generate launch scripts for the modules with a main class
         for (String module : modules) {
             String path = "/" + module + "/module-info.class";
-            ModuleData res = imageContent.get(path);
-            if (res == null) {
+            Optional<ModuleEntry> res = imageContent.findEntry(path);
+            if (!res.isPresent()) {
                 throw new IOException("module-info.class not found for " + module + " module");
             }
             Optional<String> mainClass;
-            ByteArrayInputStream stream = new ByteArrayInputStream(res.getBytes());
+            ByteArrayInputStream stream = new ByteArrayInputStream(res.get().getBytes());
             mainClass = ModuleDescriptor.read(stream).mainClass();
             if (mainClass.isPresent()) {
                 Path cmd = root.resolve("bin").resolve(module);
@@ -263,9 +298,9 @@ public class DefaultImageBuilder implements ImageBuilder {
         }
     }
 
-    private void accept(ModuleData file) throws IOException {
+    private void accept(ModuleEntry file) throws IOException {
         String fullPath = file.getPath();
-        String module = "/" + file.getModule()+ "/";
+        String module = "/" + file.getModule() + "/";
         String filename = fullPath.substring(module.length());
         // Remove radical native|config|...
         filename = filename.substring(filename.indexOf('/') + 1);
@@ -404,8 +439,7 @@ public class DefaultImageBuilder implements ImageBuilder {
 
     public static ExecutableImage getExecutableImage(Path root) {
         if (Files.exists(root.resolve("bin").resolve(getJavaProcessName()))) {
-            return new DefaultImageBuilder.DefaultExecutableImage(root,
-                    retrieveModules(root));
+            return new DefaultExecutableImage(root, retrieveModules(root));
         }
         return null;
     }
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/ImageBuilder.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/ImageBuilder.java
index dc0bf71c535..10cea85d363 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/ImageBuilder.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/ImageBuilder.java
@@ -29,7 +29,7 @@ import java.util.Properties;
 
 import jdk.tools.jlink.plugin.ExecutableImage;
 import jdk.tools.jlink.plugin.PluginException;
-import jdk.tools.jlink.plugin.Pool;
+import jdk.tools.jlink.plugin.ModulePool;
 
 /**
  * Implement this interface to develop your own image layout. First the jimage
@@ -45,7 +45,7 @@ public interface ImageBuilder {
      * @param release the release properties
      * @throws PluginException
      */
-    public default void storeFiles(Pool content, Properties release) {
+    public default void storeFiles(ModulePool content, Properties release) {
         storeFiles(content);
     }
 
@@ -55,7 +55,7 @@ public interface ImageBuilder {
      * @param content Pool of module content.
      * @throws PluginException
      */
-    public default void storeFiles(Pool content) {
+    public default void storeFiles(ModulePool content) {
         throw new UnsupportedOperationException("storeFiles");
     }
 
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageFileCreator.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageFileCreator.java
index e0347e52a21..f765be2919b 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageFileCreator.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageFileCreator.java
@@ -44,12 +44,11 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import jdk.tools.jlink.internal.Archive.Entry;
 import jdk.tools.jlink.internal.Archive.Entry.EntryType;
-import jdk.tools.jlink.internal.PoolImpl.CompressedModuleData;
+import jdk.tools.jlink.internal.ModulePoolImpl.CompressedModuleData;
 import jdk.tools.jlink.plugin.ExecutableImage;
 import jdk.tools.jlink.plugin.PluginException;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
-import jdk.tools.jlink.plugin.Pool.ModuleDataType;
+import jdk.tools.jlink.plugin.ModulePool;
+import jdk.tools.jlink.plugin.ModuleEntry;
 
 /**
  * An image (native endian.)
@@ -145,7 +144,7 @@ public final class ImageFileCreator {
                                     }));
             ByteOrder order = ByteOrder.nativeOrder();
             BasicImageWriter writer = new BasicImageWriter(order);
-            PoolImpl pool = createPools(archives, entriesForModule, order, writer);
+            ModulePoolImpl pool = createPools(archives, entriesForModule, order, writer);
             try (OutputStream fos = Files.newOutputStream(jimageFile);
                     BufferedOutputStream bos = new BufferedOutputStream(fos);
                     DataOutputStream out = new DataOutputStream(bos)) {
@@ -163,9 +162,9 @@ public final class ImageFileCreator {
             ByteOrder byteOrder)
             throws IOException {
         BasicImageWriter writer = new BasicImageWriter(byteOrder);
-        PoolImpl allContent = createPools(archives,
+        ModulePoolImpl allContent = createPools(archives,
                 entriesForModule, byteOrder, writer);
-        PoolImpl result = generateJImage(allContent,
+        ModulePoolImpl result = generateJImage(allContent,
              writer, plugins, plugins.getJImageFileOutputStream());
 
         //Handle files.
@@ -176,12 +175,12 @@ public final class ImageFileCreator {
         }
     }
 
-    private static PoolImpl generateJImage(PoolImpl allContent,
+    private static ModulePoolImpl generateJImage(ModulePoolImpl allContent,
             BasicImageWriter writer,
             ImagePluginStack pluginSupport,
             DataOutputStream out
     ) throws IOException {
-        PoolImpl resultResources;
+        ModulePoolImpl resultResources;
         try {
             resultResources = pluginSupport.visitResources(allContent);
         } catch (PluginException pe) {
@@ -190,14 +189,14 @@ public final class ImageFileCreator {
             throw new IOException(ex);
         }
         Set<String> duplicates = new HashSet<>();
-        long offset = 0;
+        long[] offset = new long[1];
 
-        List<ModuleData> content = new ArrayList<>();
+        List<ModuleEntry> content = new ArrayList<>();
         List<String> paths = new ArrayList<>();
                  // the order of traversing the resources and the order of
         // the module content being written must be the same
-        for (ModuleData res : resultResources.getContent()) {
-            if (res.getType().equals(ModuleDataType.CLASS_OR_RESOURCE)) {
+        resultResources.entries().forEach(res -> {
+            if (res.getType().equals(ModuleEntry.Type.CLASS_OR_RESOURCE)) {
                 String path = res.getPath();
                 content.add(res);
                 long uncompressedSize = res.getLength();
@@ -216,24 +215,24 @@ public final class ImageFileCreator {
                     // TODO Need to hang bytes on resource and write
                     // from resource not zip.
                     // Skipping resource throws off writing from zip.
-                    offset += onFileSize;
-                    continue;
+                    offset[0] += onFileSize;
+                    return;
                 }
                 duplicates.add(path);
-                writer.addLocation(path, offset, compressedSize, uncompressedSize);
+                writer.addLocation(path, offset[0], compressedSize, uncompressedSize);
                 paths.add(path);
-                offset += onFileSize;
+                offset[0] += onFileSize;
             }
-        }
+        });
 
-        ImageResourcesTree tree = new ImageResourcesTree(offset, writer, paths);
+        ImageResourcesTree tree = new ImageResourcesTree(offset[0], writer, paths);
 
         // write header and indices
         byte[] bytes = writer.getBytes();
         out.write(bytes, 0, bytes.length);
 
         // write module content
-        for (ModuleData res : content) {
+        for (ModuleEntry res : content) {
             byte[] buf = res.getBytes();
             out.write(buf, 0, buf.length);
         }
@@ -245,26 +244,26 @@ public final class ImageFileCreator {
         return resultResources;
     }
 
-    private static Pool.ModuleDataType mapImageFileType(EntryType type) {
+    private static ModuleEntry.Type mapImageFileType(EntryType type) {
         switch(type) {
             case CONFIG: {
-                return Pool.ModuleDataType.CONFIG;
+                return ModuleEntry.Type.CONFIG;
             }
             case NATIVE_CMD: {
-                return Pool.ModuleDataType.NATIVE_CMD;
+                return ModuleEntry.Type.NATIVE_CMD;
             }
             case NATIVE_LIB: {
-                return Pool.ModuleDataType.NATIVE_LIB;
+                return ModuleEntry.Type.NATIVE_LIB;
             }
         }
         return null;
     }
 
-    private static PoolImpl createPools(Set<Archive> archives,
+    private static ModulePoolImpl createPools(Set<Archive> archives,
             Map<String, List<Entry>> entriesForModule,
             ByteOrder byteOrder,
             BasicImageWriter writer) throws IOException {
-        PoolImpl resources = new PoolImpl(byteOrder, new StringTable() {
+        ModulePoolImpl resources = new ModulePoolImpl(byteOrder, new StringTable() {
 
             @Override
             public int addString(String str) {
@@ -291,7 +290,7 @@ public final class ImageFileCreator {
                             path = "/" + mn + "/" + path;
                         }
                         try {
-                            resources.add(Pool.newResource(path, bytes));
+                            resources.add(ModuleEntry.create(path, bytes));
                         } catch (Exception ex) {
                             throw new IOException(ex);
                         }
@@ -300,7 +299,7 @@ public final class ImageFileCreator {
                     try {
                         // Entry.path() contains the kind of file native, conf, bin, ...
                         // Keep it to avoid naming conflict (eg: native/jvm.cfg and config/jvm.cfg
-                        resources.add(Pool.newImageFile(mn,
+                        resources.add(ModuleEntry.create(mn,
                                 "/" + mn + "/" + entry.path(), mapImageFileType(entry.type()),
                                 entry.stream(), entry.size()));
                     } catch (Exception ex) {
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImagePluginConfiguration.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImagePluginConfiguration.java
index 7bd631a8c72..08ff3cb7e64 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImagePluginConfiguration.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImagePluginConfiguration.java
@@ -28,22 +28,17 @@ import java.io.DataOutputStream;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Objects;
-import java.util.Properties;
 import jdk.tools.jlink.plugin.ExecutableImage;
 import jdk.tools.jlink.builder.ImageBuilder;
 import jdk.tools.jlink.Jlink;
 import jdk.tools.jlink.plugin.Plugin;
-import jdk.tools.jlink.plugin.PluginContext;
 import jdk.tools.jlink.plugin.PluginException;
-import jdk.tools.jlink.plugin.Plugin.CATEGORY;
-import jdk.tools.jlink.plugin.Pool;
+import jdk.tools.jlink.plugin.Plugin.Category;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.plugin.PostProcessorPlugin;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 
@@ -52,17 +47,18 @@ import jdk.tools.jlink.plugin.TransformerPlugin;
  */
 public final class ImagePluginConfiguration {
 
-    private static final List<Plugin.CATEGORY> CATEGORIES_ORDER = new ArrayList<>();
+    private static final List<Plugin.Category> CATEGORIES_ORDER = new ArrayList<>();
 
     static {
-        CATEGORIES_ORDER.add(Plugin.CATEGORY.FILTER);
-        CATEGORIES_ORDER.add(Plugin.CATEGORY.TRANSFORMER);
-        CATEGORIES_ORDER.add(Plugin.CATEGORY.MODULEINFO_TRANSFORMER);
-        CATEGORIES_ORDER.add(Plugin.CATEGORY.SORTER);
-        CATEGORIES_ORDER.add(Plugin.CATEGORY.COMPRESSOR);
-        CATEGORIES_ORDER.add(Plugin.CATEGORY.VERIFIER);
-        CATEGORIES_ORDER.add(Plugin.CATEGORY.PROCESSOR);
-        CATEGORIES_ORDER.add(Plugin.CATEGORY.PACKAGER);
+        CATEGORIES_ORDER.add(Plugin.Category.FILTER);
+        CATEGORIES_ORDER.add(Plugin.Category.TRANSFORMER);
+        CATEGORIES_ORDER.add(Plugin.Category.MODULEINFO_TRANSFORMER);
+        CATEGORIES_ORDER.add(Plugin.Category.SORTER);
+        CATEGORIES_ORDER.add(Plugin.Category.COMPRESSOR);
+        CATEGORIES_ORDER.add(Plugin.Category.METAINFO_ADDER);
+        CATEGORIES_ORDER.add(Plugin.Category.VERIFIER);
+        CATEGORIES_ORDER.add(Plugin.Category.PROCESSOR);
+        CATEGORIES_ORDER.add(Plugin.Category.PACKAGER);
     }
 
     private ImagePluginConfiguration() {
@@ -76,8 +72,8 @@ public final class ImagePluginConfiguration {
         if (pluginsConfiguration == null) {
             return new ImagePluginStack();
         }
-        Map<Plugin.CATEGORY, List<Plugin>> plugins = new LinkedHashMap<>();
-        for (Plugin.CATEGORY cat : CATEGORIES_ORDER) {
+        Map<Plugin.Category, List<Plugin>> plugins = new LinkedHashMap<>();
+        for (Plugin.Category cat : CATEGORIES_ORDER) {
             plugins.put(cat, new ArrayList<>());
         }
 
@@ -89,7 +85,7 @@ public final class ImagePluginConfiguration {
                         + " added more than once to stack ");
             }
             seen.add(plug.getName());
-            CATEGORY category = Utils.getCategory(plug);
+            Category category = Utils.getCategory(plug);
             if (category == null) {
                 throw new PluginException("Invalid category for "
                         + plug.getName());
@@ -100,10 +96,10 @@ public final class ImagePluginConfiguration {
 
         List<TransformerPlugin> transformerPlugins = new ArrayList<>();
         List<PostProcessorPlugin> postProcessingPlugins = new ArrayList<>();
-        for (Entry<Plugin.CATEGORY, List<Plugin>> entry : plugins.entrySet()) {
+        for (Entry<Plugin.Category, List<Plugin>> entry : plugins.entrySet()) {
             // Sort according to plugin constraints
             List<Plugin> orderedPlugins = PluginOrderingGraph.sort(entry.getValue());
-            CATEGORY category = entry.getKey();
+            Category category = entry.getKey();
             for (Plugin p : orderedPlugins) {
                 if (Utils.isPostProcessor(category)) {
                     @SuppressWarnings("unchecked")
@@ -143,14 +139,13 @@ public final class ImagePluginConfiguration {
                 }
 
                 @Override
-                public void storeFiles(Pool files) {
+                public void storeFiles(ModulePool files) {
                     throw new PluginException("No directory setup to store files");
                 }
             };
         }
 
-        PluginContext ctxt = pluginsConfiguration.getPluginContext();
         return new ImagePluginStack(builder, transformerPlugins,
-                lastSorter, postProcessingPlugins, ctxt);
+                lastSorter, postProcessingPlugins);
     }
 }
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImagePluginStack.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImagePluginStack.java
index 6a5db82ccdf..24b8aeb632d 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImagePluginStack.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImagePluginStack.java
@@ -37,20 +37,21 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Properties;
+import java.util.Optional;
 import java.util.Set;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import jdk.internal.jimage.decompressor.Decompressor;
 import jdk.tools.jlink.plugin.Plugin;
-import jdk.tools.jlink.plugin.PluginContext;
 import jdk.tools.jlink.plugin.ExecutableImage;
 import jdk.tools.jlink.builder.ImageBuilder;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 import jdk.tools.jlink.plugin.PluginException;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
+import jdk.tools.jlink.plugin.ModulePool;
+import jdk.tools.jlink.plugin.LinkModule;
+import jdk.tools.jlink.plugin.ModuleEntry;
 import jdk.tools.jlink.plugin.PostProcessorPlugin;
 
 /**
@@ -64,9 +65,9 @@ public final class ImagePluginStack {
         ExecutableImage retrieve(ImagePluginStack stack) throws IOException;
     }
 
-    public static final class OrderedResourcePool extends PoolImpl {
+    public static final class OrderedResourcePool extends ModulePoolImpl {
 
-        private final List<ModuleData> orderedList = new ArrayList<>();
+        private final List<ModuleEntry> orderedList = new ArrayList<>();
 
         public OrderedResourcePool(ByteOrder order, StringTable table) {
             super(order, table);
@@ -78,22 +79,22 @@ public final class ImagePluginStack {
          * @param resource The Resource to add.
          */
         @Override
-        public void add(ModuleData resource) {
+        public void add(ModuleEntry resource) {
             super.add(resource);
             orderedList.add(resource);
         }
 
-        List<ModuleData> getOrderedList() {
+        List<ModuleEntry> getOrderedList() {
             return Collections.unmodifiableList(orderedList);
         }
     }
 
-    private final static class CheckOrderResourcePool extends PoolImpl {
+    private final static class CheckOrderResourcePool extends ModulePoolImpl {
 
-        private final List<ModuleData> orderedList;
+        private final List<ModuleEntry> orderedList;
         private int currentIndex;
 
-        public CheckOrderResourcePool(ByteOrder order, List<ModuleData> orderedList, StringTable table) {
+        public CheckOrderResourcePool(ByteOrder order, List<ModuleEntry> orderedList, StringTable table) {
             super(order, table);
             this.orderedList = orderedList;
         }
@@ -104,8 +105,8 @@ public final class ImagePluginStack {
          * @param resource The Resource to add.
          */
         @Override
-        public void add(ModuleData resource) {
-            ModuleData ordered = orderedList.get(currentIndex);
+        public void add(ModuleEntry resource) {
+            ModuleEntry ordered = orderedList.get(currentIndex);
             if (!resource.equals(ordered)) {
                 throw new PluginException("Resource " + resource.getPath() + " not in the right order");
             }
@@ -166,26 +167,16 @@ public final class ImagePluginStack {
     private final List<ResourcePrevisitor> resourcePrevisitors = new ArrayList<>();
 
     private final ImageBuilder imageBuilder;
-    private final Properties release;
 
     public ImagePluginStack() {
         this(null, Collections.emptyList(), null,
-                Collections.emptyList(), null);
+                Collections.emptyList());
     }
 
     public ImagePluginStack(ImageBuilder imageBuilder,
             List<TransformerPlugin> contentPlugins,
             Plugin lastSorter,
             List<PostProcessorPlugin> postprocessingPlugins) {
-        this(imageBuilder, contentPlugins, lastSorter,
-            postprocessingPlugins, null);
-    }
-
-    public ImagePluginStack(ImageBuilder imageBuilder,
-            List<TransformerPlugin> contentPlugins,
-            Plugin lastSorter,
-            List<PostProcessorPlugin> postprocessingPlugins,
-            PluginContext ctxt) {
         Objects.requireNonNull(contentPlugins);
         this.lastSorter = lastSorter;
         for (TransformerPlugin p : contentPlugins) {
@@ -200,7 +191,6 @@ public final class ImagePluginStack {
             this.postProcessingPlugins.add(p);
         }
         this.imageBuilder = imageBuilder;
-        this.release = ctxt != null? ctxt.getReleaseProperties() : new Properties();
     }
 
     public void operate(ImageProvider provider) throws Exception {
@@ -231,12 +221,12 @@ public final class ImagePluginStack {
      * @return The result of the visit.
      * @throws IOException
      */
-    public PoolImpl visitResources(PoolImpl resources)
+    public ModulePoolImpl visitResources(ModulePoolImpl resources)
             throws Exception {
         Objects.requireNonNull(resources);
         resources.setReadOnly();
         if (resources.isEmpty()) {
-            return new PoolImpl(resources.getByteOrder(),
+            return new ModulePoolImpl(resources.getByteOrder(),
                     resources.getStringTable());
         }
         PreVisitStrings previsit = new PreVisitStrings();
@@ -250,11 +240,11 @@ public final class ImagePluginStack {
             resources.getStringTable().addString(s);
         }
 
-        PoolImpl current = resources;
-        List<Pool.ModuleData> frozenOrder = null;
+        ModulePoolImpl current = resources;
+        List<ModuleEntry> frozenOrder = null;
         for (TransformerPlugin p : contentPlugins) {
             current.setReadOnly();
-            PoolImpl output = null;
+            ModulePoolImpl output = null;
             if (p == lastSorter) {
                 if (frozenOrder != null) {
                     throw new Exception("Order of resources is already frozen. Plugin "
@@ -268,7 +258,7 @@ public final class ImagePluginStack {
                     output = new CheckOrderResourcePool(current.getByteOrder(),
                             frozenOrder, resources.getStringTable());
                 } else {
-                    output = new PoolImpl(current.getByteOrder(),
+                    output = new ModulePoolImpl(current.getByteOrder(),
                             resources.getStringTable());
                 }
             }
@@ -287,15 +277,15 @@ public final class ImagePluginStack {
     }
 
     /**
-     * This pool wrap the original pool and automatically uncompress moduledata
+     * This pool wrap the original pool and automatically uncompress ModuleEntry
      * if needed.
      */
-    private class LastPool extends Pool {
-        private class LastModule implements Module {
+    private class LastPool implements ModulePool {
+        private class LastModule implements LinkModule {
 
-            private final Module module;
+            final LinkModule module;
 
-            LastModule(Module module) {
+            LastModule(LinkModule module) {
                 this.module = module;
             }
 
@@ -305,9 +295,9 @@ public final class ImagePluginStack {
             }
 
             @Override
-            public ModuleData get(String path) {
-                ModuleData d = module.get(path);
-                return getUncompressed(d);
+            public Optional<ModuleEntry> findEntry(String path) {
+                Optional<ModuleEntry> d = module.findEntry(path);
+                return d.isPresent()? Optional.of(getUncompressed(d.get())) : Optional.empty();
             }
 
             @Override
@@ -316,7 +306,7 @@ public final class ImagePluginStack {
             }
 
             @Override
-            public void add(ModuleData data) {
+            public void add(ModuleEntry data) {
                 throw new PluginException("pool is readonly");
             }
 
@@ -331,19 +321,24 @@ public final class ImagePluginStack {
             }
 
             @Override
-            public Collection<ModuleData> getContent() {
-                List<ModuleData> lst = new ArrayList<>();
-                for(ModuleData md : module.getContent()) {
+            public Stream<ModuleEntry> entries() {
+                List<ModuleEntry> lst = new ArrayList<>();
+                module.entries().forEach(md -> {
                     lst.add(getUncompressed(md));
-                }
-                return lst;
+                });
+                return lst.stream();
+            }
+
+            @Override
+            public int getEntryCount() {
+                return module.getEntryCount();
             }
         }
-        private final PoolImpl pool;
+        private final ModulePoolImpl pool;
         Decompressor decompressor = new Decompressor();
-        Collection<ModuleData> content;
+        Collection<ModuleEntry> content;
 
-        LastPool(PoolImpl pool) {
+        LastPool(ModulePoolImpl pool) {
             this.pool = pool;
         }
 
@@ -353,23 +348,14 @@ public final class ImagePluginStack {
         }
 
         @Override
-        public void add(ModuleData resource) {
+        public void add(ModuleEntry resource) {
             throw new PluginException("pool is readonly");
         }
 
-        /**
-         * Retrieves the module of the provided name.
-         *
-         * @param name The module name
-         * @return the module or null if the module doesn't exist.
-         */
         @Override
-        public Module getModule(String name) {
-            Module module = pool.getModule(name);
-            if (module != null) {
-                module = new LastModule(module);
-            }
-            return module;
+        public Optional<LinkModule> findModule(String name) {
+            Optional<LinkModule> module = pool.findModule(name);
+            return module.isPresent()? Optional.of(new LastModule(module.get())) : Optional.empty();
         }
 
         /**
@@ -378,45 +364,55 @@ public final class ImagePluginStack {
          * @return The collection of modules.
          */
         @Override
-        public Collection<Module> getModules() {
-            List<Module> modules = new ArrayList<>();
-            for (Module m : pool.getModules()) {
+        public Stream<? extends LinkModule> modules() {
+            List<LinkModule> modules = new ArrayList<>();
+            pool.modules().forEach(m -> {
                 modules.add(new LastModule(m));
-            }
-            return modules;
+            });
+            return modules.stream();
+        }
+
+        @Override
+        public int getModuleCount() {
+            return pool.getModuleCount();
         }
 
         /**
          * Get all resources contained in this pool instance.
          *
-         * @return The collection of resources;
+         * @return The stream of resources;
          */
         @Override
-        public Collection<ModuleData> getContent() {
+        public Stream<? extends ModuleEntry> entries() {
             if (content == null) {
                 content = new ArrayList<>();
-                for (ModuleData md : pool.getContent()) {
+                pool.entries().forEach(md -> {
                     content.add(getUncompressed(md));
-                }
+                });
             }
-            return content;
+            return content.stream();
+        }
+
+        @Override
+        public int getEntryCount() {
+            return pool.getEntryCount();
         }
 
         /**
          * Get the resource for the passed path.
          *
          * @param path A resource path
-         * @return A Resource instance or null if the resource is not found
+         * @return A Resource instance if the resource is found
          */
         @Override
-        public ModuleData get(String path) {
+        public Optional<ModuleEntry> findEntry(String path) {
             Objects.requireNonNull(path);
-            Pool.ModuleData res = pool.get(path);
-            return getUncompressed(res);
+            Optional<ModuleEntry> res = pool.findEntry(path);
+            return res.isPresent()? Optional.of(getUncompressed(res.get())) : Optional.empty();
         }
 
         @Override
-        public boolean contains(ModuleData res) {
+        public boolean contains(ModuleEntry res) {
             return pool.contains(res);
         }
 
@@ -426,8 +422,8 @@ public final class ImagePluginStack {
         }
 
         @Override
-        public void visit(Visitor visitor, Pool output) {
-            pool.visit(visitor, output);
+        public void transformAndCopy(Function<ModuleEntry, ModuleEntry> visitor, ModulePool output) {
+            pool.transformAndCopy(visitor, output);
         }
 
         @Override
@@ -435,14 +431,19 @@ public final class ImagePluginStack {
             return pool.getByteOrder();
         }
 
-        private ModuleData getUncompressed(ModuleData res) {
+        @Override
+        public Map<String, String> getReleaseProperties() {
+            return Collections.unmodifiableMap(pool.getReleaseProperties());
+        }
+
+        private ModuleEntry getUncompressed(ModuleEntry res) {
             if (res != null) {
-                if (res instanceof PoolImpl.CompressedModuleData) {
+                if (res instanceof ModulePoolImpl.CompressedModuleData) {
                     try {
                         byte[] bytes = decompressor.decompressResource(getByteOrder(),
                                 (int offset) -> pool.getStringTable().getString(offset),
                                 res.getBytes());
-                        res = Pool.newResource(res.getPath(),
+                        res = ModuleEntry.create(res.getPath(),
                                 new ByteArrayInputStream(bytes),
                                 bytes.length);
                     } catch (IOException ex) {
@@ -462,20 +463,24 @@ public final class ImagePluginStack {
      * @param writer
      * @throws java.lang.Exception
      */
-    public void storeFiles(PoolImpl original, PoolImpl transformed,
+    public void storeFiles(ModulePoolImpl original, ModulePoolImpl transformed,
             BasicImageWriter writer)
             throws Exception {
         Objects.requireNonNull(original);
-        try {
-            // fill release information available from transformed "java.base" module!
-            ModuleDescriptor desc = transformed.getModule("java.base").getDescriptor();
-            desc.osName().ifPresent(s -> release.put("OS_NAME", s));
-            desc.osVersion().ifPresent(s -> release.put("OS_VERSION", s));
-            desc.osArch().ifPresent(s -> release.put("OS_ARCH", s));
-        } catch (Exception ignored) {
-        }
+        Objects.requireNonNull(transformed);
+        Optional<LinkModule> javaBase = transformed.findModule("java.base");
+        javaBase.ifPresent(mod -> {
+            try {
+                Map<String, String> release = transformed.getReleaseProperties();
+                // fill release information available from transformed "java.base" module!
+                ModuleDescriptor desc = mod.getDescriptor();
+                desc.osName().ifPresent(s -> release.put("OS_NAME", s));
+                desc.osVersion().ifPresent(s -> release.put("OS_VERSION", s));
+                desc.osArch().ifPresent(s -> release.put("OS_ARCH", s));
+            } catch (Exception ignored) {}
+        });
 
-        imageBuilder.storeFiles(new LastPool(transformed), release);
+        imageBuilder.storeFiles(new LastPool(transformed));
     }
 
     public ExecutableImage getExecutableImage() throws IOException {
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ModuleEntryImpl.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ModuleEntryImpl.java
new file mode 100644
index 00000000000..30c07a3b2d7
--- /dev/null
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ModuleEntryImpl.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2016, 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.tools.jlink.internal;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UncheckedIOException;
+import java.util.Objects;
+import jdk.tools.jlink.plugin.ModuleEntry;
+
+/**
+ * A LinkModuleEntry is the elementary unit of data inside an image. It is
+ * generally a file. e.g.: a java class file, a resource file, a shared library,
+ * ...
+ * <br>
+ * A LinkModuleEntry is identified by a path of the form:
+ * <ul>
+ * <li>For jimage content: /{module name}/{package1}/.../{packageN}/{file
+ * name}</li>
+ * <li>For other files (shared lib, launchers, config, ...):/{module name}/
+ * {@literal bin|conf|native}/{dir1}>/.../{dirN}/{file name}</li>
+ * </ul>
+ */
+public class ModuleEntryImpl implements ModuleEntry {
+
+    private final Type type;
+    private final String path;
+    private final String module;
+    private final long length;
+    private final InputStream stream;
+    private byte[] buffer;
+
+    /**
+     * Create a new LinkModuleEntry.
+     *
+     * @param module The module name.
+     * @param path The data path identifier.
+     * @param type The data type.
+     * @param stream The data content stream.
+     * @param length The stream length.
+     */
+    public ModuleEntryImpl(String module, String path, Type type, InputStream stream, long length) {
+        Objects.requireNonNull(module);
+        Objects.requireNonNull(path);
+        Objects.requireNonNull(type);
+        Objects.requireNonNull(stream);
+        this.path = path;
+        this.type = type;
+        this.module = module;
+        this.stream = stream;
+        this.length = length;
+    }
+
+    /**
+     * The LinkModuleEntry module name.
+     *
+     * @return The module name.
+     */
+    @Override
+    public final String getModule() {
+        return module;
+    }
+
+    /**
+     * The LinkModuleEntry path.
+     *
+     * @return The module path.
+     */
+    @Override
+    public final String getPath() {
+        return path;
+    }
+
+    /**
+     * The LinkModuleEntry's type.
+     *
+     * @return The data type.
+     */
+    @Override
+    public final Type getType() {
+        return type;
+    }
+
+    /**
+     * The LinkModuleEntry content as an array of byte.
+     *
+     * @return An Array of bytes.
+     */
+    @Override
+    public byte[] getBytes() {
+        if (buffer == null) {
+            try (InputStream is = stream) {
+                buffer = is.readAllBytes();
+            } catch (IOException ex) {
+                throw new UncheckedIOException(ex);
+            }
+        }
+        return buffer;
+    }
+
+    /**
+     * The LinkModuleEntry content length.
+     *
+     * @return The length.
+     */
+    @Override
+    public long getLength() {
+        return length;
+    }
+
+    /**
+     * The LinkModuleEntry stream.
+     *
+     * @return The module data stream.
+     */
+    @Override
+    public InputStream stream() {
+        return stream;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 89 * hash + Objects.hashCode(this.path);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (!(other instanceof ModuleEntryImpl)) {
+            return false;
+        }
+        ModuleEntryImpl f = (ModuleEntryImpl) other;
+        return f.path.equals(path);
+    }
+
+    @Override
+    public String toString() {
+        return getPath();
+    }
+}
\ No newline at end of file
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ModulePoolImpl.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ModulePoolImpl.java
new file mode 100644
index 00000000000..a572fa48637
--- /dev/null
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ModulePoolImpl.java
@@ -0,0 +1,421 @@
+/*
+ * Copyright (c) 2015, 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.tools.jlink.internal;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.lang.module.ModuleDescriptor;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Stream;
+import jdk.internal.jimage.decompressor.CompressedResourceHeader;
+import jdk.tools.jlink.plugin.ModulePool;
+import jdk.tools.jlink.plugin.LinkModule;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.PluginException;
+import jdk.tools.jlink.internal.plugins.FileCopierPlugin;
+
+/**
+ * Pool of module data.
+ */
+public class ModulePoolImpl implements ModulePool {
+
+    private class ModuleImpl implements LinkModule {
+
+        final Map<String, ModuleEntry> moduleContent = new LinkedHashMap<>();
+        private ModuleDescriptor descriptor;
+        final String name;
+
+        private ModuleImpl(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public String getName() {
+            return name;
+        }
+
+        @Override
+        public Optional<ModuleEntry> findEntry(String path) {
+            if (!path.startsWith("/")) {
+                path = "/" + path;
+            }
+            if (!path.startsWith("/" + name)) {
+                path = "/" + name + path;
+            }
+            return Optional.ofNullable(moduleContent.get(path));
+        }
+
+        @Override
+        public ModuleDescriptor getDescriptor() {
+            if (descriptor == null) {
+                String p = "/" + name + "/module-info.class";
+                Optional<ModuleEntry> content = findEntry(p);
+                if (!content.isPresent()) {
+                    throw new PluginException("No module-info for " + name
+                            + " module");
+                }
+                ByteBuffer bb = ByteBuffer.wrap(content.get().getBytes());
+                descriptor = ModuleDescriptor.read(bb);
+            }
+            return descriptor;
+        }
+
+        @Override
+        public void add(ModuleEntry data) {
+            if (isReadOnly()) {
+                throw new PluginException("LinkConfiguration is readonly");
+            }
+            Objects.requireNonNull(data);
+            if (!data.getModule().equals(name)) {
+                throw new PluginException("Can't add resource " + data.getPath()
+                        + " to module " + name);
+            }
+            ModulePoolImpl.this.add(data);
+        }
+
+        @Override
+        public Set<String> getAllPackages() {
+            Set<String> pkgs = new HashSet<>();
+            moduleContent.values().stream().filter(m -> m.getType().
+                    equals(ModuleEntry.Type.CLASS_OR_RESOURCE)).forEach(res -> {
+                // Module metadata only contains packages with .class files
+                if (ImageFileCreator.isClassPackage(res.getPath())) {
+                    String[] split = ImageFileCreator.splitPath(res.getPath());
+                    String pkg = split[1];
+                    if (pkg != null && !pkg.isEmpty()) {
+                        pkgs.add(pkg);
+                    }
+                }
+            });
+            return pkgs;
+        }
+
+        @Override
+        public String toString() {
+            return getName();
+        }
+
+        @Override
+        public Stream<? extends ModuleEntry> entries() {
+            return moduleContent.values().stream();
+        }
+
+        @Override
+        public int getEntryCount() {
+            return moduleContent.values().size();
+        }
+    }
+
+    private final Map<String, ModuleEntry> resources = new LinkedHashMap<>();
+    private final Map<String, ModuleImpl> modules = new LinkedHashMap<>();
+    private final ModuleImpl fileCopierModule = new ModuleImpl(FileCopierPlugin.FAKE_MODULE);
+    private Map<String, String> releaseProps = new HashMap<>();
+
+    private final ByteOrder order;
+
+    private boolean isReadOnly;
+    private final StringTable table;
+
+    public ModulePoolImpl() {
+        this(ByteOrder.nativeOrder());
+    }
+
+    public ModulePoolImpl(ByteOrder order) {
+        this(order, new StringTable() {
+
+            @Override
+            public int addString(String str) {
+                return -1;
+            }
+
+            @Override
+            public String getString(int id) {
+                return null;
+            }
+        });
+    }
+
+    public ModulePoolImpl(ByteOrder order, StringTable table) {
+        this.order = order;
+        this.table = table;
+    }
+
+    /**
+     * Add a ModuleEntry.
+     *
+     * @param data The ModuleEntry to add.
+     */
+    @Override
+    public void add(ModuleEntry data) {
+        if (isReadOnly()) {
+            throw new PluginException("LinkConfiguration is readonly");
+        }
+        Objects.requireNonNull(data);
+        if (resources.get(data.getPath()) != null) {
+            throw new PluginException("Resource " + data.getPath()
+                    + " already present");
+        }
+        String modulename = data.getModule();
+        ModuleImpl m = modules.get(modulename);
+        // ## TODO: FileCopierPlugin should not add content to a module
+        // FAKE_MODULE is not really a module to be added in the image
+        if (FileCopierPlugin.FAKE_MODULE.equals(modulename)) {
+            m = fileCopierModule;
+        }
+        if (m == null) {
+            m = new ModuleImpl(modulename);
+            modules.put(modulename, m);
+        }
+        resources.put(data.getPath(), data);
+        m.moduleContent.put(data.getPath(), data);
+    }
+
+    /**
+     * Retrieves the module for the provided name.
+     *
+     * @param name The module name
+     * @return the module of matching name, if found
+     */
+    @Override
+    public Optional<LinkModule> findModule(String name) {
+        Objects.requireNonNull(name);
+        return Optional.ofNullable(modules.get(name));
+    }
+
+    /**
+     * The stream of modules contained in this LinkConfiguration.
+     *
+     * @return The stream of modules.
+     */
+    @Override
+    public Stream<? extends LinkModule> modules() {
+        return modules.values().stream();
+    }
+
+    /**
+     * Return the number of LinkModule count in this LinkConfiguration.
+     *
+     * @return the module count.
+     */
+    @Override
+    public int getModuleCount() {
+        return modules.size();
+    }
+
+    /**
+     * Get all ModuleEntry contained in this LinkConfiguration instance.
+     *
+     * @return The stream of LinkModuleEntries.
+     */
+    @Override
+    public Stream<? extends ModuleEntry> entries() {
+        return resources.values().stream();
+    }
+
+    /**
+     * Return the number of ModuleEntry count in this LinkConfiguration.
+     *
+     * @return the entry count.
+     */
+    @Override
+    public int getEntryCount() {
+        return resources.values().size();
+    }
+
+    /**
+     * Get the ModuleEntry for the passed path.
+     *
+     * @param path A data path
+     * @return A ModuleEntry instance or null if the data is not found
+     */
+    @Override
+    public Optional<ModuleEntry> findEntry(String path) {
+        Objects.requireNonNull(path);
+        return Optional.ofNullable(resources.get(path));
+    }
+
+    /**
+     * Check if the LinkConfiguration contains the given ModuleEntry.
+     *
+     * @param data The module data to check existence for.
+     * @return The module data or null if not found.
+     */
+    @Override
+    public boolean contains(ModuleEntry data) {
+        Objects.requireNonNull(data);
+        return findEntry(data.getPath()).isPresent();
+    }
+
+    /**
+     * Check if the LinkConfiguration contains some content at all.
+     *
+     * @return True, no content, false otherwise.
+     */
+    @Override
+    public boolean isEmpty() {
+        return resources.isEmpty();
+    }
+
+    /**
+     * Visit each ModuleEntry in this LinkConfiguration to transform it and
+     * copy the transformed ModuleEntry to the output LinkConfiguration.
+     *
+     * @param transform The function called for each ModuleEntry found in
+     * the LinkConfiguration. The transform function should return a
+     * ModuleEntry instance which will be added to the output or it should
+     * return null if the passed ModuleEntry is to be ignored for the
+     * output.
+     *
+     * @param output The LinkConfiguration to be filled with Visitor returned
+     * ModuleEntry.
+     */
+    @Override
+    public void transformAndCopy(Function<ModuleEntry, ModuleEntry> transform,
+            ModulePool output) {
+        entries().forEach(resource -> {
+            ModuleEntry res = transform.apply(resource);
+            if (res != null) {
+                output.add(res);
+            }
+        });
+    }
+
+    /**
+     * The ByteOrder currently in use when generating the jimage file.
+     *
+     * @return The ByteOrder.
+     */
+    @Override
+    public ByteOrder getByteOrder() {
+        return order;
+    }
+
+    @Override
+    public Map<String, String> getReleaseProperties() {
+        return isReadOnly()? Collections.unmodifiableMap(releaseProps) : releaseProps;
+    }
+
+    public StringTable getStringTable() {
+        return table;
+    }
+
+    /**
+     * Make this Resources instance read-only. No resource can be added.
+     */
+    public void setReadOnly() {
+        isReadOnly = true;
+    }
+
+    /**
+     * Read only state.
+     *
+     * @return true if readonly false otherwise.
+     */
+    @Override
+    public boolean isReadOnly() {
+        return isReadOnly;
+    }
+
+    /**
+     * A resource that has been compressed.
+     */
+    public static final class CompressedModuleData extends ModuleEntryImpl {
+
+        final long uncompressed_size;
+
+        private CompressedModuleData(String module, String path,
+                InputStream stream, long size,
+                long uncompressed_size) {
+            super(module, path, ModuleEntry.Type.CLASS_OR_RESOURCE, stream, size);
+            this.uncompressed_size = uncompressed_size;
+        }
+
+        public long getUncompressedSize() {
+            return uncompressed_size;
+        }
+
+        @Override
+        public boolean equals(Object other) {
+            if (!(other instanceof CompressedModuleData)) {
+                return false;
+            }
+            CompressedModuleData f = (CompressedModuleData) other;
+            return f.getPath().equals(getPath());
+        }
+
+        @Override
+        public int hashCode() {
+            return super.hashCode();
+        }
+    }
+
+    public static CompressedModuleData newCompressedResource(ModuleEntry original,
+            ByteBuffer compressed,
+            String plugin, String pluginConfig, StringTable strings,
+            ByteOrder order) {
+        Objects.requireNonNull(original);
+        Objects.requireNonNull(compressed);
+        Objects.requireNonNull(plugin);
+
+        boolean isTerminal = !(original instanceof CompressedModuleData);
+        long uncompressed_size = original.getLength();
+        if (original instanceof CompressedModuleData) {
+            CompressedModuleData comp = (CompressedModuleData) original;
+            uncompressed_size = comp.getUncompressedSize();
+        }
+        int nameOffset = strings.addString(plugin);
+        int configOffset = -1;
+        if (pluginConfig != null) {
+            configOffset = strings.addString(plugin);
+        }
+        CompressedResourceHeader rh
+                = new CompressedResourceHeader(compressed.limit(), original.getLength(),
+                        nameOffset, configOffset, isTerminal);
+        // Merge header with content;
+        byte[] h = rh.getBytes(order);
+        ByteBuffer bb = ByteBuffer.allocate(compressed.limit() + h.length);
+        bb.order(order);
+        bb.put(h);
+        bb.put(compressed);
+        byte[] contentWithHeader = bb.array();
+
+        CompressedModuleData compressedResource
+                = new CompressedModuleData(original.getModule(), original.getPath(),
+                        new ByteArrayInputStream(contentWithHeader),
+                        contentWithHeader.length, uncompressed_size);
+        return compressedResource;
+    }
+
+}
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PluginContextImpl.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PluginContextImpl.java
deleted file mode 100644
index 7fe7dcea36e..00000000000
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PluginContextImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2016, 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.tools.jlink.internal;
-
-import java.util.Properties;
-
-import jdk.tools.jlink.plugin.PluginContext;
-
-public final class PluginContextImpl implements PluginContext {
-    private final Properties releaseProps = new Properties();
-
-    public Properties getReleaseProperties() {
-        return releaseProps;
-    }
-}
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PoolImpl.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PoolImpl.java
deleted file mode 100644
index 2b1dd827bae..00000000000
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PoolImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (c) 2015, 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.tools.jlink.internal;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.Objects;
-import jdk.internal.jimage.decompressor.CompressedResourceHeader;
-import jdk.tools.jlink.plugin.Pool;
-
-/**
- * Pool of module data.
- */
-public class PoolImpl extends Pool {
-
-    /**
-     * A resource that has been compressed.
-     */
-    public static final class CompressedModuleData extends ModuleData {
-
-        private final long uncompressed_size;
-
-        private CompressedModuleData(String module, String path,
-                InputStream stream, long size,
-                long uncompressed_size) {
-            super(module, path, ModuleDataType.CLASS_OR_RESOURCE, stream, size);
-            this.uncompressed_size = uncompressed_size;
-        }
-
-        public long getUncompressedSize() {
-            return uncompressed_size;
-        }
-
-        @Override
-        public boolean equals(Object other) {
-            if (!(other instanceof CompressedModuleData)) {
-                return false;
-            }
-            CompressedModuleData f = (CompressedModuleData) other;
-            return f.getPath().equals(getPath());
-        }
-
-        @Override
-        public int hashCode() {
-            return super.hashCode();
-        }
-    }
-
-    private boolean isReadOnly;
-    private final StringTable table;
-
-    public PoolImpl() {
-        this(ByteOrder.nativeOrder(), new StringTable() {
-
-            @Override
-            public int addString(String str) {
-                return -1;
-            }
-            @Override
-            public String getString(int id) {
-                return null;
-            }
-        });
-    }
-
-    public PoolImpl(ByteOrder order) {
-        this(order, new StringTable() {
-
-            @Override
-            public int addString(String str) {
-                return -1;
-            }
-            @Override
-            public String getString(int id) {
-                return null;
-            }
-        });
-    }
-
-    public PoolImpl(ByteOrder order, StringTable table) {
-        super(order);
-        this.table = table;
-    }
-
-    public StringTable getStringTable() {
-        return table;
-    }
-
-    /**
-     * Make this Resources instance read-only. No resource can be added.
-     */
-    public void setReadOnly() {
-        isReadOnly = true;
-    }
-
-    /**
-     * Read only state.
-     *
-     * @return true if readonly false otherwise.
-     */
-    @Override
-    public boolean isReadOnly() {
-        return isReadOnly;
-    }
-
-    public static CompressedModuleData newCompressedResource(ModuleData original,
-            ByteBuffer compressed,
-            String plugin, String pluginConfig, StringTable strings,
-            ByteOrder order) {
-        Objects.requireNonNull(original);
-        Objects.requireNonNull(compressed);
-        Objects.requireNonNull(plugin);
-
-        boolean isTerminal = !(original instanceof CompressedModuleData);
-        long uncompressed_size = original.getLength();
-        if (original instanceof CompressedModuleData) {
-            CompressedModuleData comp = (CompressedModuleData) original;
-            uncompressed_size = comp.getUncompressedSize();
-        }
-        int nameOffset = strings.addString(plugin);
-        int configOffset = -1;
-        if (pluginConfig != null) {
-            configOffset = strings.addString(plugin);
-        }
-        CompressedResourceHeader rh
-                = new CompressedResourceHeader(compressed.limit(), original.getLength(),
-                        nameOffset, configOffset, isTerminal);
-        // Merge header with content;
-        byte[] h = rh.getBytes(order);
-        ByteBuffer bb = ByteBuffer.allocate(compressed.limit() + h.length);
-        bb.order(order);
-        bb.put(h);
-        bb.put(compressed);
-        byte[] contentWithHeader = bb.array();
-
-        CompressedModuleData compressedResource
-                = new CompressedModuleData(original.getModule(), original.getPath(),
-                        new ByteArrayInputStream(contentWithHeader),
-                        contentWithHeader.length, uncompressed_size);
-        return compressedResource;
-    }
-
-}
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePrevisitor.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePrevisitor.java
index d9c5bab9a61..c8b8bc79ed6 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePrevisitor.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePrevisitor.java
@@ -24,7 +24,7 @@
  */
 package jdk.tools.jlink.internal;
 
-import jdk.tools.jlink.plugin.Pool;
+import jdk.tools.jlink.plugin.ModulePool;
 
 /**
  * Plugin wishing to pre-visit the resources must implement this interface.
@@ -44,5 +44,5 @@ public interface ResourcePrevisitor {
      * usage.
      * @throws PluginException
      */
-    public void previsit(Pool resources, StringTable strings);
+    public void previsit(ModulePool resources, StringTable strings);
 }
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java
index 31064ab79d6..b255312bbf4 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java
@@ -52,7 +52,7 @@ import jdk.internal.module.ConfigurableModuleFinder.Phase;
 import jdk.tools.jlink.Jlink;
 import jdk.tools.jlink.Jlink.PluginsConfiguration;
 import jdk.tools.jlink.plugin.Plugin;
-import jdk.tools.jlink.plugin.Plugin.CATEGORY;
+import jdk.tools.jlink.plugin.Plugin.Category;
 import jdk.tools.jlink.builder.DefaultImageBuilder;
 import jdk.tools.jlink.builder.ImageBuilder;
 import jdk.tools.jlink.plugin.PluginException;
@@ -346,7 +346,6 @@ public final class TaskHelper {
                 }
             }
 
-            PluginContextImpl pluginContext = new PluginContextImpl();
             List<Plugin> pluginsList = new ArrayList<>();
             for (Entry<Plugin, List<Map<String, String>>> entry : pluginToMaps.entrySet()) {
                 Plugin plugin = entry.getKey();
@@ -356,7 +355,7 @@ public final class TaskHelper {
                 // we call configure once for each occurrence. It is upto the plugin
                 // to 'merge' and/or 'override' arguments.
                 for (Map<String, String> map : argsMaps) {
-                    plugin.configure(Collections.unmodifiableMap(map), pluginContext);
+                    plugin.configure(Collections.unmodifiableMap(map));
                 }
 
                 if (!Utils.isDisabled(plugin)) {
@@ -371,7 +370,7 @@ public final class TaskHelper {
 
             }
             return new Jlink.PluginsConfiguration(pluginsList,
-                    builder, lastSorter, pluginContext);
+                    builder, lastSorter);
         }
     }
 
@@ -594,7 +593,7 @@ public final class TaskHelper {
                          + ": " + plugin.getClass().getName());
                     log.println(bundleHelper.getMessage("main.plugin.module")
                          + ": " + plugin.getClass().getModule().getName());
-                    CATEGORY category = Utils.getCategory(plugin);
+                    Category category = Utils.getCategory(plugin);
                     log.println(bundleHelper.getMessage("main.plugin.category")
                          + ": " + category.getName());
                     log.println(bundleHelper.getMessage("main.plugin.state")
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Utils.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Utils.java
index a8a9a45a5f4..0e29969a034 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Utils.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Utils.java
@@ -30,7 +30,6 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.function.Function;
 import jdk.tools.jlink.plugin.Plugin;
-import jdk.tools.jlink.plugin.Plugin.PluginType;
 
 public class Utils {
 
@@ -50,25 +49,26 @@ public class Utils {
         return arguments;
     };
 
-    public static boolean isPostProcessor(Plugin.CATEGORY category) {
-        return category.equals(Plugin.CATEGORY.VERIFIER)
-                || category.equals(Plugin.CATEGORY.PROCESSOR)
-                || category.equals(Plugin.CATEGORY.PACKAGER);
+    public static boolean isPostProcessor(Plugin.Category category) {
+        return category.equals(Plugin.Category.VERIFIER)
+                || category.equals(Plugin.Category.PROCESSOR)
+                || category.equals(Plugin.Category.PACKAGER);
     }
 
-    public static boolean isPreProcessor(Plugin.CATEGORY category) {
-        return category.equals(Plugin.CATEGORY.COMPRESSOR)
-                || category.equals(Plugin.CATEGORY.FILTER)
-                || category.equals(Plugin.CATEGORY.MODULEINFO_TRANSFORMER)
-                || category.equals(Plugin.CATEGORY.SORTER)
-                || category.equals(Plugin.CATEGORY.TRANSFORMER);
+    public static boolean isPreProcessor(Plugin.Category category) {
+        return category.equals(Plugin.Category.COMPRESSOR)
+                || category.equals(Plugin.Category.FILTER)
+                || category.equals(Plugin.Category.MODULEINFO_TRANSFORMER)
+                || category.equals(Plugin.Category.SORTER)
+                || category.equals(Plugin.Category.TRANSFORMER)
+                || category.equals(Plugin.Category.METAINFO_ADDER);
     }
 
     public static boolean isPostProcessor(Plugin prov) {
         if (prov.getType() != null) {
-            for (PluginType pt : prov.getType()) {
-                if (pt instanceof Plugin.CATEGORY) {
-                    return isPostProcessor((Plugin.CATEGORY) pt);
+            for (Plugin.Category pt : prov.getType()) {
+                if (pt instanceof Plugin.Category) {
+                    return isPostProcessor(pt);
                 }
             }
         }
@@ -77,20 +77,20 @@ public class Utils {
 
     public static boolean isPreProcessor(Plugin prov) {
         if (prov.getType() != null) {
-            for (PluginType pt : prov.getType()) {
-                if (pt instanceof Plugin.CATEGORY) {
-                    return isPreProcessor((Plugin.CATEGORY) pt);
+            for (Plugin.Category pt : prov.getType()) {
+                if (pt instanceof Plugin.Category) {
+                    return isPreProcessor(pt);
                 }
             }
         }
         return false;
     }
 
-    public static Plugin.CATEGORY getCategory(Plugin provider) {
+    public static Plugin.Category getCategory(Plugin provider) {
         if (provider.getType() != null) {
-            for (Plugin.PluginType t : provider.getType()) {
-                if (t instanceof Plugin.CATEGORY) {
-                    return (Plugin.CATEGORY) t;
+            for (Plugin.Category t : provider.getType()) {
+                if (t instanceof Plugin.Category) {
+                    return t;
                 }
             }
         }
@@ -140,15 +140,15 @@ public class Utils {
     }
 
     public static boolean isFunctional(Plugin prov) {
-        return prov.getState().contains(Plugin.STATE.FUNCTIONAL);
+        return prov.getState().contains(Plugin.State.FUNCTIONAL);
     }
 
     public static boolean isAutoEnabled(Plugin prov) {
-        return prov.getState().contains(Plugin.STATE.AUTO_ENABLED);
+        return prov.getState().contains(Plugin.State.AUTO_ENABLED);
     }
 
     public static boolean isDisabled(Plugin prov) {
-        return prov.getState().contains(Plugin.STATE.DISABLED);
+        return prov.getState().contains(Plugin.State.DISABLED);
     }
 
     // is this a builtin (jdk.jlink) plugin?
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/packager/AppRuntimeImageBuilder.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/packager/AppRuntimeImageBuilder.java
index e448acd0b1d..874b338c93f 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/packager/AppRuntimeImageBuilder.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/packager/AppRuntimeImageBuilder.java
@@ -30,7 +30,7 @@ import jdk.tools.jlink.Jlink;
 import jdk.tools.jlink.builder.ImageBuilder;
 import jdk.tools.jlink.plugin.Plugin;
 import jdk.tools.jlink.builder.*;
-import jdk.tools.jlink.plugin.Pool;
+import jdk.tools.jlink.plugin.ModulePool;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/DefaultCompressPlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/DefaultCompressPlugin.java
index aa068f1136e..43eb6f27dec 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/DefaultCompressPlugin.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/DefaultCompressPlugin.java
@@ -26,16 +26,13 @@ package jdk.tools.jlink.internal.plugins;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import jdk.tools.jlink.plugin.PluginException;
-import jdk.tools.jlink.internal.PoolImpl;
-import jdk.tools.jlink.plugin.Pool;
+import jdk.tools.jlink.internal.ModulePoolImpl;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 import jdk.tools.jlink.internal.ImagePluginStack;
 import jdk.tools.jlink.internal.ResourcePrevisitor;
@@ -62,10 +59,10 @@ public final class DefaultCompressPlugin implements TransformerPlugin, ResourceP
     }
 
     @Override
-    public void visit(Pool in, Pool out) {
+    public void visit(ModulePool in, ModulePool out) {
         if (ss != null && zip != null) {
-            Pool output = new ImagePluginStack.OrderedResourcePool(in.getByteOrder(),
-                    ((PoolImpl) in).getStringTable());
+            ModulePool output = new ImagePluginStack.OrderedResourcePool(in.getByteOrder(),
+                    ((ModulePoolImpl) in).getStringTable());
             ss.visit(in, output);
             zip.visit(output, out);
         } else if (ss != null) {
@@ -76,16 +73,16 @@ public final class DefaultCompressPlugin implements TransformerPlugin, ResourceP
     }
 
     @Override
-    public void previsit(Pool resources, StringTable strings) {
+    public void previsit(ModulePool resources, StringTable strings) {
         if (ss != null) {
             ss.previsit(resources, strings);
         }
     }
 
     @Override
-    public Set<PluginType> getType() {
-        Set<PluginType> set = new HashSet<>();
-        set.add(CATEGORY.COMPRESSOR);
+    public Set<Category> getType() {
+        Set<Category> set = new HashSet<>();
+        set.add(Category.COMPRESSOR);
         return Collections.unmodifiableSet(set);
     }
 
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeFilesPlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeFilesPlugin.java
index 0271670e4c1..628d8f6346e 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeFilesPlugin.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeFilesPlugin.java
@@ -32,8 +32,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.function.Predicate;
 import jdk.tools.jlink.plugin.TransformerPlugin;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleDataType;
+import jdk.tools.jlink.plugin.ModulePool;
+import jdk.tools.jlink.plugin.ModuleEntry;
 import jdk.tools.jlink.internal.Utils;
 
 /**
@@ -51,9 +51,9 @@ public final class ExcludeFilesPlugin implements TransformerPlugin {
     }
 
     @Override
-    public void visit(Pool in, Pool out) {
-        in.visit((file) -> {
-            if (!file.getType().equals(ModuleDataType.CLASS_OR_RESOURCE)) {
+    public void visit(ModulePool in, ModulePool out) {
+        in.transformAndCopy((file) -> {
+            if (!file.getType().equals(ModuleEntry.Type.CLASS_OR_RESOURCE)) {
                 file = predicate.test(file.getPath()) ? file : null;
             }
             return file;
@@ -61,9 +61,9 @@ public final class ExcludeFilesPlugin implements TransformerPlugin {
     }
 
     @Override
-    public Set<PluginType> getType() {
-        Set<PluginType> set = new HashSet<>();
-        set.add(CATEGORY.FILTER);
+    public Set<Category> getType() {
+        Set<Category> set = new HashSet<>();
+        set.add(Category.FILTER);
         return Collections.unmodifiableSet(set);
     }
 
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludePlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludePlugin.java
index 6d4737a4661..626087b76be 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludePlugin.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludePlugin.java
@@ -32,7 +32,8 @@ import java.util.Set;
 import java.util.function.Predicate;
 import jdk.tools.jlink.plugin.PluginException;
 import jdk.tools.jlink.plugin.TransformerPlugin;
-import jdk.tools.jlink.plugin.Pool;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.internal.Utils;
 
 /**
@@ -50,9 +51,9 @@ public final class ExcludePlugin implements TransformerPlugin {
     }
 
     @Override
-    public void visit(Pool in, Pool out) {
-        in.visit((resource) -> {
-            if (resource.getType().equals(Pool.ModuleDataType.CLASS_OR_RESOURCE)) {
+    public void visit(ModulePool in, ModulePool out) {
+        in.transformAndCopy((resource) -> {
+            if (resource.getType().equals(ModuleEntry.Type.CLASS_OR_RESOURCE)) {
                 resource = predicate.test(resource.getPath()) ? resource : null;
             }
             return resource;
@@ -75,9 +76,9 @@ public final class ExcludePlugin implements TransformerPlugin {
     }
 
     @Override
-    public Set<PluginType> getType() {
-        Set<PluginType> set = new HashSet<>();
-        set.add(CATEGORY.FILTER);
+    public Set<Category> getType() {
+        Set<Category> set = new HashSet<>();
+        set.add(Category.FILTER);
         return Collections.unmodifiableSet(set);
     }
 
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeVMPlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeVMPlugin.java
index 4d502904c37..753d63e5cfc 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeVMPlugin.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeVMPlugin.java
@@ -40,9 +40,10 @@ import java.util.TreeSet;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import jdk.tools.jlink.plugin.TransformerPlugin;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleDataType;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.internal.Utils;
+import jdk.tools.jlink.plugin.ModuleEntry;
 import jdk.tools.jlink.plugin.PluginException;
 
 /**
@@ -102,24 +103,24 @@ public final class ExcludeVMPlugin implements TransformerPlugin {
      * e.g.: /java.base/native/amd64/server/libjvm.so
      * /java.base/native/server/libjvm.dylib
      */
-    private List<Pool.ModuleData> getVMs(Pool in) {
+    private List<ModuleEntry> getVMs(ModulePool in) {
         String jvmlib = jvmlib();
-        List<Pool.ModuleData> ret = in.getModule("java.base").getContent().stream().filter((t) -> {
+        List<ModuleEntry> ret = in.findModule("java.base").get().entries().filter((t) -> {
             return t.getPath().endsWith("/" + jvmlib);
         }).collect(Collectors.toList());
         return ret;
     }
 
     @Override
-    public void visit(Pool in, Pool out) {
+    public void visit(ModulePool in, ModulePool out) {
         String jvmlib = jvmlib();
         TreeSet<Jvm> existing = new TreeSet<>(new JvmComparator());
         TreeSet<Jvm> removed = new TreeSet<>(new JvmComparator());
         if (!keepAll) {
             // First retrieve all available VM names and removed VM
-            List<Pool.ModuleData> jvms = getVMs(in);
+            List<ModuleEntry> jvms = getVMs(in);
             for (Jvm jvm : Jvm.values()) {
-                for (Pool.ModuleData md : jvms) {
+                for (ModuleEntry md : jvms) {
                     if (md.getPath().endsWith("/" + jvm.getName() + "/" + jvmlib)) {
                         existing.add(jvm);
                         if (isRemoved(md)) {
@@ -137,9 +138,9 @@ public final class ExcludeVMPlugin implements TransformerPlugin {
         }
 
         // Rewrite the jvm.cfg file.
-        in.visit((file) -> {
+        in.transformAndCopy((file) -> {
             if (!keepAll) {
-                if (file.getType().equals(ModuleDataType.NATIVE_LIB)) {
+                if (file.getType().equals(ModuleEntry.Type.NATIVE_LIB)) {
                     if (file.getPath().endsWith(JVM_CFG)) {
                         try {
                             file = handleJvmCfgFile(file, existing, removed);
@@ -155,14 +156,14 @@ public final class ExcludeVMPlugin implements TransformerPlugin {
 
     }
 
-    private boolean isRemoved(Pool.ModuleData file) {
+    private boolean isRemoved(ModuleEntry file) {
         return !predicate.test(file.getPath());
     }
 
     @Override
-    public Set<PluginType> getType() {
-        Set<PluginType> set = new HashSet<>();
-        set.add(CATEGORY.FILTER);
+    public Set<Category> getType() {
+        Set<Category> set = new HashSet<>();
+        set.add(Category.FILTER);
         return Collections.unmodifiableSet(set);
     }
 
@@ -217,7 +218,7 @@ public final class ExcludeVMPlugin implements TransformerPlugin {
         }
     }
 
-    private Pool.ModuleData handleJvmCfgFile(Pool.ModuleData orig,
+    private ModuleEntry handleJvmCfgFile(ModuleEntry orig,
             TreeSet<Jvm> existing,
             TreeSet<Jvm> removed) throws IOException {
         if (keepAll) {
@@ -253,7 +254,7 @@ public final class ExcludeVMPlugin implements TransformerPlugin {
 
         byte[] content = builder.toString().getBytes(StandardCharsets.UTF_8);
 
-        return Pool.newImageFile(orig.getModule(),
+        return ModuleEntry.create(orig.getModule(),
                 orig.getPath(),
                 orig.getType(),
                 new ByteArrayInputStream(content), content.length);
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/FileCopierPlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/FileCopierPlugin.java
index 7a51d6cbcdf..497d97e50a6 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/FileCopierPlugin.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/FileCopierPlugin.java
@@ -41,10 +41,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import jdk.tools.jlink.internal.ModuleEntryImpl;
 import jdk.tools.jlink.plugin.PluginException;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
-import jdk.tools.jlink.plugin.Pool.ModuleDataType;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 import jdk.tools.jlink.internal.Utils;
 
@@ -68,12 +68,12 @@ public class FileCopierPlugin implements TransformerPlugin {
     /**
      * Symbolic link to another path.
      */
-    public static abstract class SymImageFile extends Pool.ModuleData {
+    public static abstract class SymImageFile extends ModuleEntryImpl {
 
         private final String targetPath;
 
         public SymImageFile(String targetPath, String module, String path,
-                Pool.ModuleDataType type, InputStream stream, long size) {
+                ModuleEntry.Type type, InputStream stream, long size) {
             super(module, path, type, stream, size);
             this.targetPath = targetPath;
         }
@@ -86,7 +86,7 @@ public class FileCopierPlugin implements TransformerPlugin {
     private static final class SymImageFileImpl extends SymImageFile {
 
         public SymImageFileImpl(String targetPath, Path file, String module,
-                String path, ModuleDataType type) {
+                String path, ModuleEntry.Type type) {
             super(targetPath, module, path, type, newStream(file), length(file));
         }
     }
@@ -110,11 +110,11 @@ public class FileCopierPlugin implements TransformerPlugin {
     private static final class DirectoryCopy implements FileVisitor<Path> {
 
         private final Path source;
-        private final Pool pool;
+        private final ModulePool pool;
         private final String targetDir;
         private final List<SymImageFile> symlinks = new ArrayList<>();
 
-        DirectoryCopy(Path source, Pool pool, String targetDir) {
+        DirectoryCopy(Path source, ModulePool pool, String targetDir) {
             this.source = source;
             this.pool = pool;
             this.targetDir = targetDir;
@@ -148,7 +148,7 @@ public class FileCopierPlugin implements TransformerPlugin {
                 }
                 SymImageFileImpl impl = new SymImageFileImpl(symTarget.toString(),
                         file, path, Objects.requireNonNull(file.getFileName()).toString(),
-                        Pool.ModuleDataType.OTHER);
+                        ModuleEntry.Type.OTHER);
                 symlinks.add(impl);
             } else {
                 addFile(pool, file, path);
@@ -172,14 +172,14 @@ public class FileCopierPlugin implements TransformerPlugin {
         }
     }
 
-    private static void addFile(Pool pool, Path file, String path)
+    private static void addFile(ModulePool pool, Path file, String path)
             throws IOException {
         Objects.requireNonNull(pool);
         Objects.requireNonNull(file);
         Objects.requireNonNull(path);
-        ModuleData impl = Pool.newImageFile(FAKE_MODULE,
+        ModuleEntry impl = ModuleEntry.create(FAKE_MODULE,
                 "/" + FAKE_MODULE + "/other/" + path,
-                Pool.ModuleDataType.OTHER, newStream(file), length(file));
+                ModuleEntry.Type.OTHER, newStream(file), length(file));
         try {
             pool.add(impl);
         } catch (Exception ex) {
@@ -188,9 +188,9 @@ public class FileCopierPlugin implements TransformerPlugin {
     }
 
     @Override
-    public Set<PluginType> getType() {
-        Set<PluginType> set = new HashSet<>();
-        set.add(CATEGORY.TRANSFORMER);
+    public Set<Category> getType() {
+        Set<Category> set = new HashSet<>();
+        set.add(Category.TRANSFORMER);
         return Collections.unmodifiableSet(set);
     }
 
@@ -239,8 +239,8 @@ public class FileCopierPlugin implements TransformerPlugin {
     }
 
     @Override
-    public void visit(Pool in, Pool out) {
-        in.visit((file) -> {
+    public void visit(ModulePool in, ModulePool out) {
+        in.transformAndCopy((file) -> {
             return file;
         }, out);
 
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/GenerateJLIClassesPlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/GenerateJLIClassesPlugin.java
index d2b2995bdda..9e0805ec361 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/GenerateJLIClassesPlugin.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/GenerateJLIClassesPlugin.java
@@ -33,8 +33,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
+import jdk.tools.jlink.plugin.ModuleEntry;
 import jdk.tools.jlink.plugin.PluginException;
-import jdk.tools.jlink.plugin.Pool;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 
 /**
@@ -60,8 +61,8 @@ public final class GenerateJLIClassesPlugin implements TransformerPlugin {
     }
 
     @Override
-    public Set<PluginType> getType() {
-        return Collections.singleton(CATEGORY.TRANSFORMER);
+    public Set<Category> getType() {
+        return Collections.singleton(Category.TRANSFORMER);
     }
 
     @Override
@@ -75,8 +76,8 @@ public final class GenerateJLIClassesPlugin implements TransformerPlugin {
     }
 
     @Override
-    public Set<STATE> getState() {
-        return EnumSet.of(STATE.AUTO_ENABLED, STATE.FUNCTIONAL);
+    public Set<State> getState() {
+        return EnumSet.of(State.AUTO_ENABLED, State.FUNCTIONAL);
     }
 
     @Override
@@ -151,8 +152,8 @@ public final class GenerateJLIClassesPlugin implements TransformerPlugin {
     }
 
     @Override
-    public void visit(Pool in, Pool out) {
-        for (Pool.ModuleData data : in.getContent()) {
+    public void visit(ModulePool in, ModulePool out) {
+        in.entries().forEach(data -> {
             if (("/java.base/" + BMH + ".class").equals(data.getPath())) {
                 // Add BoundMethodHandle unchanged
                 out.add(data);
@@ -162,11 +163,11 @@ public final class GenerateJLIClassesPlugin implements TransformerPlugin {
                     out.add(data);
                 }
             }
-        }
+        });
     }
 
     @SuppressWarnings("unchecked")
-    private void generateConcreteClass(String types, Pool.ModuleData data, Pool out) {
+    private void generateConcreteClass(String types, ModuleEntry data, ModulePool out) {
         try {
             // Generate class
             Map.Entry<String, byte[]> result = (Map.Entry<String, byte[]>)
@@ -175,9 +176,9 @@ public final class GenerateJLIClassesPlugin implements TransformerPlugin {
             byte[] bytes = result.getValue();
 
             // Add class to pool
-            Pool.ModuleData ndata = new Pool.ModuleData(data.getModule(),
+            ModuleEntry ndata = ModuleEntry.create(data.getModule(),
                     "/java.base/" + className + ".class",
-                    Pool.ModuleDataType.CLASS_OR_RESOURCE,
+                    ModuleEntry.Type.CLASS_OR_RESOURCE,
                     new ByteArrayInputStream(bytes), bytes.length);
             if (!out.contains(ndata)) {
                 out.add(ndata);
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java
index b8b7aa46cc1..3083c19d2ba 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java
@@ -34,6 +34,7 @@ import java.util.IllformedLocaleException;
 import java.util.Locale;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
@@ -44,9 +45,10 @@ import jdk.internal.org.objectweb.asm.ClassReader;
 import jdk.tools.jlink.internal.ResourcePrevisitor;
 import jdk.tools.jlink.internal.StringTable;
 import jdk.tools.jlink.internal.Utils;
+import jdk.tools.jlink.plugin.LinkModule;
+import jdk.tools.jlink.plugin.ModuleEntry;
 import jdk.tools.jlink.plugin.PluginException;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleDataType;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 
 /**
@@ -112,19 +114,19 @@ public final class IncludeLocalesPlugin implements TransformerPlugin, ResourcePr
     }
 
     @Override
-    public void visit(Pool in, Pool out) {
-        in.visit((resource) -> {
+    public void visit(ModulePool in, ModulePool out) {
+        in.transformAndCopy((resource) -> {
             if (resource.getModule().equals(MODULENAME)) {
                 String path = resource.getPath();
                 resource = predicate.test(path) ? resource: null;
                 if (resource != null &&
-                    resource.getType().equals(ModuleDataType.CLASS_OR_RESOURCE)) {
+                    resource.getType().equals(ModuleEntry.Type.CLASS_OR_RESOURCE)) {
                     byte[] bytes = resource.getBytes();
                     ClassReader cr = new ClassReader(bytes);
                     if (Arrays.stream(cr.getInterfaces())
                         .anyMatch(i -> i.contains(METAINFONAME)) &&
                         stripUnsupportedLocales(bytes, cr)) {
-                        resource = new Pool.ModuleData(MODULENAME, path,
+                        resource = ModuleEntry.create(MODULENAME, path,
                             resource.getType(),
                             new ByteArrayInputStream(bytes), bytes.length);
                     }
@@ -135,9 +137,9 @@ public final class IncludeLocalesPlugin implements TransformerPlugin, ResourcePr
     }
 
     @Override
-    public Set<PluginType> getType() {
-        Set<PluginType> set = new HashSet<>();
-        set.add(CATEGORY.FILTER);
+    public Set<Category> getType() {
+        Set<Category> set = new HashSet<>();
+        set.add(Category.FILTER);
         return Collections.unmodifiableSet(set);
     }
 
@@ -172,12 +174,13 @@ public final class IncludeLocalesPlugin implements TransformerPlugin, ResourcePr
     }
 
     @Override
-    public void previsit(Pool resources, StringTable strings) {
+    public void previsit(ModulePool resources, StringTable strings) {
         final Pattern p = Pattern.compile(".*((Data_)|(Names_))(?<tag>.*)\\.class");
-        Pool.Module module = resources.getModule(MODULENAME);
+        Optional<LinkModule> optMod = resources.findModule(MODULENAME);
 
         // jdk.localedata module validation
-        if (module != null) {
+        if (optMod.isPresent()) {
+            LinkModule module = optMod.get();
             Set<String> packages = module.getAllPackages();
             if (!packages.containsAll(LOCALEDATA_PACKAGES)) {
                 throw new PluginException(PluginsResourceBundle.getMessage(NAME + ".missingpackages") +
@@ -186,7 +189,7 @@ public final class IncludeLocalesPlugin implements TransformerPlugin, ResourcePr
                         .collect(Collectors.joining(",\n\t")));
             }
 
-            available = Stream.concat(module.getContent().stream()
+            available = Stream.concat(module.entries()
                                         .map(md -> p.matcher(md.getPath()))
                                         .filter(m -> m.matches())
                                         .map(m -> m.group("tag").replaceAll("_", "-")),
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/OptimizationPlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/OptimizationPlugin.java
index 4f8e5eade53..9632cdf9b95 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/OptimizationPlugin.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/OptimizationPlugin.java
@@ -24,7 +24,6 @@
  */
 package jdk.tools.jlink.internal.plugins;
 
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -287,9 +286,9 @@ public final class OptimizationPlugin extends AsmPlugin {
     }
 
     @Override
-    public Set<PluginType> getType() {
-        Set<PluginType> set = new HashSet<>();
-        set.add(CATEGORY.TRANSFORMER);
+    public Set<Category> getType() {
+        Set<Category> set = new HashSet<>();
+        set.add(Category.TRANSFORMER);
         return Collections.unmodifiableSet(set);
     }
 }
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/OrderResourcesPlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/OrderResourcesPlugin.java
index 8fb124dd775..5060bf5c519 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/OrderResourcesPlugin.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/OrderResourcesPlugin.java
@@ -36,9 +36,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.function.ToIntFunction;
 import jdk.tools.jlink.plugin.PluginException;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
-import jdk.tools.jlink.plugin.Pool.ModuleDataType;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 import jdk.tools.jlink.internal.Utils;
 
@@ -62,15 +61,15 @@ public final class OrderResourcesPlugin implements TransformerPlugin {
     }
 
     static class SortWrapper {
-        private final ModuleData resource;
+        private final ModuleEntry resource;
         private final int ordinal;
 
-        SortWrapper(ModuleData resource, int ordinal) {
+        SortWrapper(ModuleEntry resource, int ordinal) {
             this.resource = resource;
             this.ordinal = ordinal;
         }
 
-        ModuleData getResource() {
+        ModuleEntry getResource() {
             return resource;
         }
 
@@ -95,7 +94,7 @@ public final class OrderResourcesPlugin implements TransformerPlugin {
         return path;
     }
 
-    private int getOrdinal(ModuleData resource) {
+    private int getOrdinal(ModuleEntry resource) {
         String path = resource.getPath();
 
         Integer value = orderedPaths.get(stripModule(path));
@@ -126,23 +125,23 @@ public final class OrderResourcesPlugin implements TransformerPlugin {
     }
 
     @Override
-    public void visit(Pool in, Pool out) {
-        in.getContent().stream()
+    public void visit(ModulePool in, ModulePool out) {
+        in.entries()
                 .filter(resource -> resource.getType()
-                        .equals(ModuleDataType.CLASS_OR_RESOURCE))
+                        .equals(ModuleEntry.Type.CLASS_OR_RESOURCE))
                 .map((resource) -> new SortWrapper(resource, getOrdinal(resource)))
                 .sorted(OrderResourcesPlugin::compare)
                 .forEach((wrapper) -> out.add(wrapper.getResource()));
-        in.getContent().stream()
+        in.entries()
                 .filter(other -> !other.getType()
-                        .equals(ModuleDataType.CLASS_OR_RESOURCE))
+                        .equals(ModuleEntry.Type.CLASS_OR_RESOURCE))
                 .forEach((other) -> out.add(other));
     }
 
     @Override
-    public Set<PluginType> getType() {
-        Set<PluginType> set = new HashSet<>();
-        set.add(CATEGORY.SORTER);
+    public Set<Category> getType() {
+        Set<Category> set = new HashSet<>();
+        set.add(Category.SORTER);
 
         return Collections.unmodifiableSet(set);
     }
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ReleaseInfoPlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ReleaseInfoPlugin.java
index bbc7428a41e..579aace7e0a 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ReleaseInfoPlugin.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ReleaseInfoPlugin.java
@@ -24,34 +24,33 @@
  */
 package jdk.tools.jlink.internal.plugins;
 
-import java.lang.module.ModuleDescriptor;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.EnumSet;
-import java.util.List;
+import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 import java.util.Properties;
-
+import java.util.Set;
+import java.util.function.Function;
 import jdk.tools.jlink.internal.Utils;
-import jdk.tools.jlink.plugin.ExecutableImage;
-import jdk.tools.jlink.plugin.PluginContext;
-import jdk.tools.jlink.plugin.PluginException;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.PostProcessorPlugin;
+import jdk.tools.jlink.plugin.ModulePool;
+import jdk.tools.jlink.plugin.Plugin.Category;
+import jdk.tools.jlink.plugin.Plugin.State;
+import jdk.tools.jlink.plugin.TransformerPlugin;
 
 /**
  * This plugin adds/deletes information for 'release' file.
  */
-public final class ReleaseInfoPlugin implements PostProcessorPlugin {
+public final class ReleaseInfoPlugin implements TransformerPlugin {
     // option name
     public static final String NAME = "release-info";
     public static final String KEYS = "keys";
+    private final Map<String, String> release = new HashMap<>();
 
     @Override
-    public Set<PluginType> getType() {
-        return Collections.singleton(CATEGORY.PROCESSOR);
+    public Set<Category> getType() {
+        return Collections.singleton(Category.METAINFO_ADDER);
     }
 
     @Override
@@ -65,8 +64,8 @@ public final class ReleaseInfoPlugin implements PostProcessorPlugin {
     }
 
     @Override
-    public Set<STATE> getState() {
-        return EnumSet.of(STATE.FUNCTIONAL);
+    public Set<State> getState() {
+        return EnumSet.of(State.FUNCTIONAL);
     }
 
     @Override
@@ -80,49 +79,49 @@ public final class ReleaseInfoPlugin implements PostProcessorPlugin {
     }
 
     @Override
-    public void configure(Map<String, String> config, PluginContext ctx) {
-        Properties release = ctx != null? ctx.getReleaseProperties() : null;
-        if (release != null) {
-            String operation = config.get(NAME);
-            switch (operation) {
-                case "add": {
-                    // leave it to open-ended! source, java_version, java_full_version
-                    // can be passed via this option like:
-                    //
-                    //     --release-info add:build_type=fastdebug,source=openjdk,java_version=9
-                    // and put whatever value that was passed in command line.
+    public void configure(Map<String, String> config) {
+        String operation = config.get(NAME);
+        switch (operation) {
+            case "add": {
+                // leave it to open-ended! source, java_version, java_full_version
+                // can be passed via this option like:
+                //
+                //     --release-info add:build_type=fastdebug,source=openjdk,java_version=9
+                // and put whatever value that was passed in command line.
 
-                    config.keySet().stream().
-                        filter(s -> !NAME.equals(s)).
-                        forEach(s -> release.put(s, config.get(s)));
-                }
-                break;
-
-                case "del": {
-                    // --release-info del:keys=openjdk,java_version
-                    String[] keys = Utils.listParser.apply(config.get(KEYS));
-                    for (String k : keys) {
-                        release.remove(k);
-                    }
-                }
-                break;
-
-                default: {
-                    // --release-info <file>
-                    try (FileInputStream fis = new FileInputStream(operation)) {
-                        release.load(fis);
-                    } catch (IOException exp) {
-                        throw new RuntimeException(exp);
-                    }
-                }
-                break;
+                config.keySet().stream().
+                    filter(s -> !NAME.equals(s)).
+                    forEach(s -> release.put(s, config.get(s)));
             }
+            break;
+
+            case "del": {
+                // --release-info del:keys=openjdk,java_version
+                String[] keys = Utils.listParser.apply(config.get(KEYS));
+                for (String k : keys) {
+                    release.remove(k);
+                }
+            }
+            break;
+
+            default: {
+                // --release-info <file>
+                Properties props = new Properties();
+                try (FileInputStream fis = new FileInputStream(operation)) {
+                    props.load(fis);
+                } catch (IOException exp) {
+                    throw new RuntimeException(exp);
+                }
+                props.forEach((k, v) -> release.put(k.toString(), v.toString()));
+            }
+            break;
         }
     }
 
     @Override
-    public List<String> process(ExecutableImage image) {
-        // Nothing to do! Release info copied already during configure!
-        return Collections.emptyList();
+    public void visit(ModulePool in, ModulePool out) {
+        in.transformAndCopy(Function.identity(), out);
+        out.getReleaseProperties().putAll(in.getReleaseProperties());
+        out.getReleaseProperties().putAll(release);
     }
 }
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StringSharingPlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StringSharingPlugin.java
index a4aa8f9d5ca..b3a1e7cf3cf 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StringSharingPlugin.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StringSharingPlugin.java
@@ -56,11 +56,11 @@ import java.util.stream.Collectors;
 import jdk.internal.jimage.decompressor.CompressIndexes;
 import jdk.internal.jimage.decompressor.SignatureParser;
 import jdk.internal.jimage.decompressor.StringSharingDecompressor;
-import jdk.tools.jlink.internal.PoolImpl;
+import jdk.tools.jlink.internal.ModulePoolImpl;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 import jdk.tools.jlink.plugin.PluginException;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.internal.ResourcePrevisitor;
 import jdk.tools.jlink.internal.StringTable;
 import jdk.tools.jlink.internal.Utils;
@@ -228,7 +228,7 @@ public class StringSharingPlugin implements TransformerPlugin, ResourcePrevisito
             }
         }
 
-        public byte[] transform(ModuleData resource, Pool out,
+        public byte[] transform(ModuleEntry resource, ModulePool out,
                 StringTable strings) throws IOException, Exception {
             byte[] content = resource.getBytes();
             ClassFile cf;
@@ -243,7 +243,7 @@ public class StringSharingPlugin implements TransformerPlugin, ResourcePrevisito
         }
 
         @SuppressWarnings("fallthrough")
-        private byte[] optimize(ModuleData resource, Pool resources,
+        private byte[] optimize(ModuleEntry resource, ModulePool resources,
                 StringTable strings,
                 Set<Integer> descriptorIndexes, byte[] content) throws Exception {
             DataInputStream stream = new DataInputStream(new ByteArrayInputStream(content));
@@ -348,27 +348,27 @@ public class StringSharingPlugin implements TransformerPlugin, ResourcePrevisito
     }
 
     @Override
-    public Set<PluginType> getType() {
-        Set<PluginType> set = new HashSet<>();
-        set.add(CATEGORY.COMPRESSOR);
+    public Set<Category> getType() {
+        Set<Category> set = new HashSet<>();
+        set.add(Category.COMPRESSOR);
         return Collections.unmodifiableSet(set);
     }
 
     @Override
-    public void visit(Pool in, Pool result) {
+    public void visit(ModulePool in, ModulePool result) {
         CompactCPHelper visit = new CompactCPHelper();
-        in.visit((resource) -> {
-            ModuleData res = resource;
+        in.transformAndCopy((resource) -> {
+            ModuleEntry res = resource;
             if (predicate.test(resource.getPath()) && resource.getPath().endsWith(".class")) {
                 byte[] compressed = null;
                 try {
-                    compressed = visit.transform(resource, result, ((PoolImpl) in).getStringTable());
+                    compressed = visit.transform(resource, result, ((ModulePoolImpl) in).getStringTable());
                 } catch (Exception ex) {
                     throw new PluginException(ex);
                 }
-                res = PoolImpl.newCompressedResource(resource,
+                res = ModulePoolImpl.newCompressedResource(resource,
                         ByteBuffer.wrap(compressed), getName(), null,
-                        ((PoolImpl) in).getStringTable(), in.getByteOrder());
+                        ((ModulePoolImpl) in).getStringTable(), in.getByteOrder());
             }
             return res;
         }, result);
@@ -405,10 +405,10 @@ public class StringSharingPlugin implements TransformerPlugin, ResourcePrevisito
     }
 
     @Override
-    public void previsit(Pool resources, StringTable strings) {
+    public void previsit(ModulePool resources, StringTable strings) {
         CompactCPHelper preVisit = new CompactCPHelper();
-        for (ModuleData resource : resources.getContent()) {
-            if (resource.getType().equals(Pool.ModuleDataType.CLASS_OR_RESOURCE)
+        resources.entries().forEach(resource -> {
+            if (resource.getType().equals(ModuleEntry.Type.CLASS_OR_RESOURCE)
                     && resource.getPath().endsWith(".class") && predicate.test(resource.getPath())) {
                 try {
                     preVisit.transform(resource, null, strings);
@@ -416,6 +416,6 @@ public class StringSharingPlugin implements TransformerPlugin, ResourcePrevisito
                     throw new PluginException(ex);
                 }
             }
-        }
+        });
     }
 }
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripDebugPlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripDebugPlugin.java
index ae927952226..4e7a036d838 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripDebugPlugin.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripDebugPlugin.java
@@ -29,14 +29,12 @@ import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 import java.util.function.Predicate;
 import jdk.internal.org.objectweb.asm.ClassReader;
 import jdk.internal.org.objectweb.asm.ClassWriter;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
-import jdk.tools.jlink.plugin.Pool.ModuleDataType;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 
 /**
@@ -61,9 +59,9 @@ public final class StripDebugPlugin implements TransformerPlugin {
     }
 
     @Override
-    public Set<PluginType> getType() {
-        Set<PluginType> set = new HashSet<>();
-        set.add(CATEGORY.TRANSFORMER);
+    public Set<Category> getType() {
+        Set<Category> set = new HashSet<>();
+        set.add(Category.TRANSFORMER);
         return Collections.unmodifiableSet(set);
     }
 
@@ -73,11 +71,11 @@ public final class StripDebugPlugin implements TransformerPlugin {
     }
 
     @Override
-    public void visit(Pool in, Pool out) {
+    public void visit(ModulePool in, ModulePool out) {
         //remove *.diz files as well as debug attributes.
-        in.visit((resource) -> {
-            ModuleData res = resource;
-            if (resource.getType().equals(ModuleDataType.CLASS_OR_RESOURCE)) {
+        in.transformAndCopy((resource) -> {
+            ModuleEntry res = resource;
+            if (resource.getType().equals(ModuleEntry.Type.CLASS_OR_RESOURCE)) {
                 String path = resource.getPath();
                 if (path.endsWith(".class")) {
                     if (path.endsWith("module-info.class")) {
@@ -87,7 +85,7 @@ public final class StripDebugPlugin implements TransformerPlugin {
                         ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_MAXS);
                         reader.accept(writer, ClassReader.SKIP_DEBUG);
                         byte[] content = writer.toByteArray();
-                        res = Pool.newResource(path, new ByteArrayInputStream(content), content.length);
+                        res = ModuleEntry.create(path, new ByteArrayInputStream(content), content.length);
                     }
                 }
             } else if (predicate.test(res.getPath())) {
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripNativeCommandsPlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripNativeCommandsPlugin.java
index dc64582be21..496a4e538d7 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripNativeCommandsPlugin.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripNativeCommandsPlugin.java
@@ -26,9 +26,9 @@ package jdk.tools.jlink.internal.plugins;
 
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
-import jdk.tools.jlink.plugin.Pool;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 
 /**
@@ -45,16 +45,16 @@ public final class StripNativeCommandsPlugin implements TransformerPlugin {
     }
 
     @Override
-    public Set<PluginType> getType() {
-        Set<PluginType> set = new HashSet<>();
-        set.add(CATEGORY.FILTER);
+    public Set<Category> getType() {
+        Set<Category> set = new HashSet<>();
+        set.add(Category.FILTER);
         return Collections.unmodifiableSet(set);
     }
 
     @Override
-    public void visit(Pool in, Pool out) {
-        in.visit((file) -> {
-            return file.getType() == Pool.ModuleDataType.NATIVE_CMD ? null : file;
+    public void visit(ModulePool in, ModulePool out) {
+        in.transformAndCopy((file) -> {
+            return file.getType() == ModuleEntry.Type.NATIVE_CMD ? null : file;
         }, out);
     }
 
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModuleDescriptorPlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModuleDescriptorPlugin.java
index f4cba7607ea..b60fecb5d16 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModuleDescriptorPlugin.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModuleDescriptorPlugin.java
@@ -36,6 +36,7 @@ import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -50,9 +51,10 @@ import jdk.internal.org.objectweb.asm.Opcodes;
 
 import static jdk.internal.org.objectweb.asm.Opcodes.*;
 import jdk.tools.jlink.plugin.PluginException;
-import jdk.tools.jlink.plugin.Pool;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 import jdk.tools.jlink.internal.plugins.SystemModuleDescriptorPlugin.Builder.*;
+import jdk.tools.jlink.plugin.ModuleEntry;
 
 /**
  * Jlink plugin to reconstitute module descriptors for installed modules.
@@ -81,8 +83,8 @@ public final class SystemModuleDescriptorPlugin implements TransformerPlugin {
     }
 
     @Override
-    public Set<PluginType> getType() {
-        return Collections.singleton(CATEGORY.TRANSFORMER);
+    public Set<Category> getType() {
+        return Collections.singleton(Category.TRANSFORMER);
     }
 
     @Override
@@ -96,9 +98,9 @@ public final class SystemModuleDescriptorPlugin implements TransformerPlugin {
     }
 
     @Override
-    public Set<STATE> getState() {
-        return enabled ? EnumSet.of(STATE.AUTO_ENABLED, STATE.FUNCTIONAL)
-                       : EnumSet.of(STATE.DISABLED);
+    public Set<State> getState() {
+        return enabled ? EnumSet.of(State.AUTO_ENABLED, State.FUNCTIONAL)
+                       : EnumSet.of(State.DISABLED);
     }
 
     @Override
@@ -110,7 +112,7 @@ public final class SystemModuleDescriptorPlugin implements TransformerPlugin {
 
 
     @Override
-    public void visit(Pool in, Pool out) {
+    public void visit(ModulePool in, ModulePool out) {
         if (!enabled) {
             throw new PluginException(NAME + " was set");
         }
@@ -119,13 +121,14 @@ public final class SystemModuleDescriptorPlugin implements TransformerPlugin {
 
         // generate the byte code to create ModuleDescriptors
         // skip parsing module-info.class and skip name check
-        for (Pool.Module module : in.getModules()) {
-            Pool.ModuleData data = module.get("module-info.class");
-            if (data == null) {
+        in.modules().forEach(module -> {
+            Optional<ModuleEntry> optData = module.findEntry("module-info.class");
+            if (! optData.isPresent()) {
                 // automatic module not supported yet
                 throw new PluginException("module-info.class not found for " +
                                           module.getName() + " module");
             }
+            ModuleEntry data = optData.get();
             assert module.getName().equals(data.getModule());
             try {
                 ByteArrayInputStream bain = new ByteArrayInputStream(data.getBytes());
@@ -141,7 +144,7 @@ public final class SystemModuleDescriptorPlugin implements TransformerPlugin {
                     ModuleInfoRewriter minfoWriter =
                         new ModuleInfoRewriter(bain, mbuilder.conceals());
                     // replace with the overridden version
-                    data = new Pool.ModuleData(data.getModule(),
+                    data = ModuleEntry.create(data.getModule(),
                                                data.getPath(),
                                                data.getType(),
                                                minfoWriter.stream(),
@@ -151,19 +154,17 @@ public final class SystemModuleDescriptorPlugin implements TransformerPlugin {
             } catch (IOException e) {
                 throw new PluginException(e);
             }
-
-        }
+        });
 
         // Generate the new class
         ClassWriter cwriter = builder.build();
-        for (Pool.ModuleData data : in.getContent()) {
+        in.entries().forEach(data -> {
             if (data.getPath().endsWith("module-info.class"))
-                continue;
-
+                return;
             if (builder.isOverriddenClass(data.getPath())) {
                 byte[] bytes = cwriter.toByteArray();
-                Pool.ModuleData ndata =
-                    new Pool.ModuleData(data.getModule(),
+                ModuleEntry ndata =
+                    ModuleEntry.create(data.getModule(),
                                         data.getPath(),
                                         data.getType(),
                                         new ByteArrayInputStream(bytes),
@@ -172,7 +173,7 @@ public final class SystemModuleDescriptorPlugin implements TransformerPlugin {
             } else {
                 out.add(data);
             }
-        }
+        });
     }
 
     /*
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ZipPlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ZipPlugin.java
index df66e300f5c..d3dd7bff210 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ZipPlugin.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ZipPlugin.java
@@ -34,10 +34,9 @@ import java.util.Set;
 import java.util.function.Predicate;
 import java.util.zip.Deflater;
 import jdk.tools.jlink.plugin.PluginException;
-import jdk.tools.jlink.internal.PoolImpl;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
-import jdk.tools.jlink.plugin.Pool.ModuleDataType;
+import jdk.tools.jlink.internal.ModulePoolImpl;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 import jdk.tools.jlink.internal.Utils;
 
@@ -68,9 +67,9 @@ public final class ZipPlugin implements TransformerPlugin {
     }
 
     @Override
-    public Set<PluginType> getType() {
-        Set<PluginType> set = new HashSet<>();
-        set.add(CATEGORY.COMPRESSOR);
+    public Set<Category> getType() {
+        Set<Category> set = new HashSet<>();
+        set.add(Category.COMPRESSOR);
         return Collections.unmodifiableSet(set);
     }
 
@@ -124,16 +123,16 @@ public final class ZipPlugin implements TransformerPlugin {
     }
 
     @Override
-    public void visit(Pool in, Pool out) {
-        in.visit((resource) -> {
-            ModuleData res = resource;
-            if (resource.getType().equals(ModuleDataType.CLASS_OR_RESOURCE)
+    public void visit(ModulePool in, ModulePool out) {
+        in.transformAndCopy((resource) -> {
+            ModuleEntry res = resource;
+            if (resource.getType().equals(ModuleEntry.Type.CLASS_OR_RESOURCE)
                     && predicate.test(resource.getPath())) {
                 byte[] compressed;
                 compressed = compress(resource.getBytes());
-                res = PoolImpl.newCompressedResource(resource,
+                res = ModulePoolImpl.newCompressedResource(resource,
                         ByteBuffer.wrap(compressed), getName(), null,
-                        ((PoolImpl) in).getStringTable(), in.getByteOrder());
+                        ((ModulePoolImpl) in).getStringTable(), in.getByteOrder());
             }
             return res;
         }, out);
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/asm/AsmPlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/asm/AsmPlugin.java
index 9902959d059..52712172d5e 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/asm/AsmPlugin.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/asm/AsmPlugin.java
@@ -26,9 +26,9 @@ package jdk.tools.jlink.internal.plugins.asm;
 
 import java.util.Objects;
 import jdk.tools.jlink.plugin.TransformerPlugin;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
-import jdk.tools.jlink.internal.PoolImpl;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
+import jdk.tools.jlink.internal.ModulePoolImpl;
 
 /**
  * Extend this class to develop your own plugin in order to transform jimage
@@ -41,17 +41,17 @@ public abstract class AsmPlugin implements TransformerPlugin {
     }
 
     @Override
-    public void visit(Pool allContent, Pool outResources) {
+    public void visit(ModulePool allContent, ModulePool outResources) {
         Objects.requireNonNull(allContent);
         Objects.requireNonNull(outResources);
-        PoolImpl resources = new PoolImpl(allContent.getByteOrder());
-        for(ModuleData md : allContent.getContent()) {
-            if(md.getType().equals(Pool.ModuleDataType.CLASS_OR_RESOURCE)) {
+        ModulePoolImpl resources = new ModulePoolImpl(allContent.getByteOrder());
+        allContent.entries().forEach(md -> {
+            if(md.getType().equals(ModuleEntry.Type.CLASS_OR_RESOURCE)) {
                 resources.add(md);
             } else {
                 outResources.add(md);
             }
-        }
+        });
         AsmPools pools = new AsmPools(resources);
         visit(pools);
         pools.fillOutputResources(outResources);
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/asm/AsmPool.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/asm/AsmPool.java
index 9184bb86257..aa5c1cb5ef5 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/asm/AsmPool.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/asm/AsmPool.java
@@ -24,13 +24,12 @@
  */
 package jdk.tools.jlink.internal.plugins.asm;
 
-import java.io.InputStream;
-import java.nio.ByteBuffer;
 import java.util.Collection;
 import java.util.List;
 import jdk.internal.org.objectweb.asm.ClassReader;
 import jdk.internal.org.objectweb.asm.ClassWriter;
-import jdk.tools.jlink.plugin.Pool;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 
 /**
  * A pool of ClassReader and other resource files.
@@ -138,14 +137,14 @@ public interface AsmPool {
          * @return The ClassReader or null if the class is not found.
          * @throws jdk.tools.jlink.plugin.PluginException
          */
-        public ClassReader getClassReader(Pool.ModuleData res);
+        public ClassReader getClassReader(ModuleEntry res);
 
         /**
          * Returns all the classes contained in the writable pool.
          *
          * @return The collection of classes.
          */
-        public Collection<Pool.ModuleData> getClasses();
+        public Collection<ModuleEntry> getClasses();
     }
 
     /**
@@ -185,14 +184,14 @@ public interface AsmPool {
          * @param res The java resource
          * @return The Resource or null if the resource is not found.
          */
-        public ResourceFile getResourceFile(Pool.ModuleData res);
+        public ResourceFile getResourceFile(ModuleEntry res);
 
         /**
          * Returns all the resources contained in the writable pool.
          *
          * @return The array of resources.
          */
-        public Collection<Pool.ModuleData> getResourceFiles();
+        public Collection<ModuleEntry> getResourceFiles();
     }
 
     /**
@@ -206,7 +205,7 @@ public interface AsmPool {
          * @return The resource paths ordered in the way to use for storage in the jimage.
          * @throws jdk.tools.jlink.plugin.PluginException
          */
-        public List<String> sort(Pool resources);
+        public List<String> sort(ModulePool resources);
     }
 
     /**
@@ -237,7 +236,7 @@ public interface AsmPool {
      *
      * @return The classes.
      */
-    public Collection<Pool.ModuleData> getClasses();
+    public Collection<ModuleEntry> getClasses();
 
     /**
      * Returns the resources contained in the pool. Resources are all the file
@@ -245,7 +244,7 @@ public interface AsmPool {
      *
      * @return The array of resource files.
      */
-    public Collection<Pool.ModuleData> getResourceFiles();
+    public Collection<ModuleEntry> getResourceFiles();
 
     /**
      * Retrieves a resource based on the binary name. This name doesn't contain
@@ -266,7 +265,7 @@ public interface AsmPool {
      * @param res The resource
      * @return The resource file or null if it doesn't exist.
      */
-    public ResourceFile getResourceFile(Pool.ModuleData res);
+    public ResourceFile getResourceFile(ModuleEntry res);
 
     /**
      * Retrieve a ClassReader from the pool.
@@ -284,7 +283,7 @@ public interface AsmPool {
      * @return A reader or null if the class is unknown
      * @throws jdk.tools.jlink.plugin.PluginException
      */
-    public ClassReader getClassReader(Pool.ModuleData res);
+    public ClassReader getClassReader(ModuleEntry res);
 
     /**
      * To visit the set of ClassReaders.
@@ -310,6 +309,6 @@ public interface AsmPool {
      * @param output The pool used to fill the jimage.
      * @throws jdk.tools.jlink.plugin.PluginException
      */
-    public void fillOutputResources(Pool output);
+    public void fillOutputResources(ModulePool output);
 
 }
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/asm/AsmPoolImpl.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/asm/AsmPoolImpl.java
index cb838d11efa..20c17c85b7b 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/asm/AsmPoolImpl.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/asm/AsmPoolImpl.java
@@ -41,15 +41,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.Set;
 import jdk.internal.org.objectweb.asm.ClassReader;
 import jdk.internal.org.objectweb.asm.ClassWriter;
 import jdk.tools.jlink.internal.ImageFileCreator;
-import jdk.tools.jlink.internal.PoolImpl;
+import jdk.tools.jlink.internal.ModulePoolImpl;
+import jdk.tools.jlink.plugin.ModuleEntry;
 import jdk.tools.jlink.plugin.PluginException;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
+import jdk.tools.jlink.plugin.ModulePool;
 
 /**
  * A pool of ClassReader and other resource files. This class allows to
@@ -94,7 +93,7 @@ final class AsmPoolImpl implements AsmModulePool {
             }
 
             byte[] content = writer.toByteArray();
-            ModuleData res = Pool.newResource(path,
+            ModuleEntry res = ModuleEntry.create(path,
                     new ByteArrayInputStream(content), content.length);
             transformedClasses.put(className, res);
         }
@@ -108,7 +107,7 @@ final class AsmPoolImpl implements AsmModulePool {
         public void forgetClass(String className) {
             Objects.requireNonNull(className);
             // do we have a resource?
-            ModuleData res = transformedClasses.get(className);
+            ModuleEntry res = transformedClasses.get(className);
             if (res == null) {
                 res = inputClasses.get(className);
                 if (res == null) {
@@ -130,7 +129,7 @@ final class AsmPoolImpl implements AsmModulePool {
         @Override
         public ClassReader getClassReader(String binaryName) {
             Objects.requireNonNull(binaryName);
-            ModuleData res = transformedClasses.get(binaryName);
+            ModuleEntry res = transformedClasses.get(binaryName);
             ClassReader reader = null;
             if (res != null) {
                 reader = getClassReader(res);
@@ -144,16 +143,16 @@ final class AsmPoolImpl implements AsmModulePool {
          * @return The array of transformed classes.
          */
         @Override
-        public Collection<ModuleData> getClasses() {
-            List<ModuleData> classes = new ArrayList<>();
-            for (Entry<String, ModuleData> entry : transformedClasses.entrySet()) {
+        public Collection<ModuleEntry> getClasses() {
+            List<ModuleEntry> classes = new ArrayList<>();
+            for (Entry<String, ModuleEntry> entry : transformedClasses.entrySet()) {
                 classes.add(entry.getValue());
             }
             return classes;
         }
 
         @Override
-        public ClassReader getClassReader(ModuleData res) {
+        public ClassReader getClassReader(ModuleEntry res) {
             return newClassReader(res.getBytes());
         }
     }
@@ -176,7 +175,7 @@ final class AsmPoolImpl implements AsmModulePool {
         public void addResourceFile(ResourceFile resFile) {
             Objects.requireNonNull(resFile);
             String path = toResourceNamePath(resFile.getPath());
-            ModuleData res = Pool.newResource(path, resFile.getContent());
+            ModuleEntry res = ModuleEntry.create(path, resFile.getContent());
             transformedResources.put(resFile.getPath(), res);
         }
 
@@ -191,7 +190,7 @@ final class AsmPoolImpl implements AsmModulePool {
             Objects.requireNonNull(resourceName);
             String path = toResourceNamePath(resourceName);
             // do we have a resource?
-            ModuleData res = transformedResources.get(resourceName);
+            ModuleEntry res = transformedResources.get(resourceName);
             if (res == null) {
                 res = inputResources.get(resourceName);
                 if (res == null) {
@@ -212,7 +211,7 @@ final class AsmPoolImpl implements AsmModulePool {
         @Override
         public ResourceFile getResourceFile(String name) {
             Objects.requireNonNull(name);
-            ModuleData res = transformedResources.get(name);
+            ModuleEntry res = transformedResources.get(name);
             ResourceFile resFile = null;
             if (res != null) {
                 resFile = getResourceFile(res);
@@ -226,24 +225,24 @@ final class AsmPoolImpl implements AsmModulePool {
          * @return The array of transformed classes.
          */
         @Override
-        public Collection<ModuleData> getResourceFiles() {
-            List<ModuleData> resources = new ArrayList<>();
-            for (Entry<String, ModuleData> entry : transformedResources.entrySet()) {
+        public Collection<ModuleEntry> getResourceFiles() {
+            List<ModuleEntry> resources = new ArrayList<>();
+            for (Entry<String, ModuleEntry> entry : transformedResources.entrySet()) {
                 resources.add(entry.getValue());
             }
             return resources;
         }
 
         @Override
-        public ResourceFile getResourceFile(ModuleData res) {
+        public ResourceFile getResourceFile(ModuleEntry res) {
             return new ResourceFile(toJavaBinaryResourceName(res.getPath()),
                     res.getBytes());
         }
     }
 
-    private final Pool jimageResources;
-    private final Map<String, ModuleData> inputClasses;
-    private final Map<String, ModuleData> inputResources;
+    private final ModulePool jimageResources;
+    private final Map<String, ModuleEntry> inputClasses;
+    private final Map<String, ModuleEntry> inputResources;
     private final Map<String, String> inputClassPackageMapping;
     private final Map<String, String> inputOtherPackageMapping;
 
@@ -254,9 +253,9 @@ final class AsmPoolImpl implements AsmModulePool {
 
     private Sorter sorter;
 
-    private final Map<String, ModuleData> transformedClasses
+    private final Map<String, ModuleEntry> transformedClasses
             =            new LinkedHashMap<>();
-    private final Map<String, ModuleData> transformedResources
+    private final Map<String, ModuleEntry> transformedResources
             =            new LinkedHashMap<>();
     private final List<String> forgetResources = new ArrayList<>();
     private final Map<String, String> newPackageMapping = new HashMap<>();
@@ -274,7 +273,7 @@ final class AsmPoolImpl implements AsmModulePool {
      * @param pools The resource pools.
      * @param descriptor The module descriptor.
      */
-    AsmPoolImpl(Pool inputResources, String moduleName,
+    AsmPoolImpl(ModulePool inputResources, String moduleName,
             AsmPools pools,
             ModuleDescriptor descriptor) {
         Objects.requireNonNull(inputResources);
@@ -285,11 +284,11 @@ final class AsmPoolImpl implements AsmModulePool {
         this.moduleName = moduleName;
         this.pools = pools;
         this.descriptor = descriptor;
-        Map<String, ModuleData> classes = new LinkedHashMap<>();
-        Map<String, ModuleData> resources = new LinkedHashMap<>();
+        Map<String, ModuleEntry> classes = new LinkedHashMap<>();
+        Map<String, ModuleEntry> resources = new LinkedHashMap<>();
         Map<String, String> packageClassToModule = new HashMap<>();
         Map<String, String> packageOtherToModule = new HashMap<>();
-        for (ModuleData res : inputResources.getContent()) {
+        inputResources.entries().forEach(res -> {
             if (res.getPath().endsWith(".class")) {
                 classes.put(toJavaBinaryClassName(res.getPath()), res);
             } else {
@@ -305,7 +304,7 @@ final class AsmPoolImpl implements AsmModulePool {
                     packageOtherToModule.put(split[1], res.getModule());
                 }
             }
-        }
+        });
         this.inputClasses = Collections.unmodifiableMap(classes);
         this.inputResources = Collections.unmodifiableMap(resources);
 
@@ -356,7 +355,7 @@ final class AsmPoolImpl implements AsmModulePool {
      * @return The array of classes.
      */
     @Override
-    public Collection<ModuleData> getClasses() {
+    public Collection<ModuleEntry> getClasses() {
         return inputClasses.values();
     }
 
@@ -367,7 +366,7 @@ final class AsmPoolImpl implements AsmModulePool {
      * @return The array of classes.
      */
     @Override
-    public Collection<ModuleData> getResourceFiles() {
+    public Collection<ModuleEntry> getResourceFiles() {
         return inputResources.values();
     }
 
@@ -385,7 +384,7 @@ final class AsmPoolImpl implements AsmModulePool {
     @Override
     public ResourceFile getResourceFile(String binaryName) {
         Objects.requireNonNull(binaryName);
-        ModuleData res = inputResources.get(binaryName);
+        ModuleEntry res = inputResources.get(binaryName);
         ResourceFile resFile = null;
         if (res != null) {
             resFile = getResourceFile(res);
@@ -402,7 +401,7 @@ final class AsmPoolImpl implements AsmModulePool {
     @Override
     public ClassReader getClassReader(String binaryName) {
         Objects.requireNonNull(binaryName);
-        ModuleData res = inputClasses.get(binaryName);
+        ModuleEntry res = inputClasses.get(binaryName);
         ClassReader reader = null;
         if (res != null) {
             reader = getClassReader(res);
@@ -411,13 +410,13 @@ final class AsmPoolImpl implements AsmModulePool {
     }
 
     @Override
-    public ResourceFile getResourceFile(ModuleData res) {
+    public ResourceFile getResourceFile(ModuleEntry res) {
         return new ResourceFile(toJavaBinaryResourceName(res.getPath()),
                 res.getBytes());
     }
 
     @Override
-    public ClassReader getClassReader(ModuleData res) {
+    public ClassReader getClassReader(ModuleEntry res) {
         return newClassReader(res.getBytes());
     }
 
@@ -505,7 +504,7 @@ final class AsmPoolImpl implements AsmModulePool {
     @Override
     public void visitClassReaders(ClassReaderVisitor visitor) {
         Objects.requireNonNull(visitor);
-        for (ModuleData res : getClasses()) {
+        for (ModuleEntry res : getClasses()) {
             ClassReader reader = newClassReader(res.getBytes());
             ClassWriter writer = visitor.visit(reader);
             if (writer != null) {
@@ -523,7 +522,7 @@ final class AsmPoolImpl implements AsmModulePool {
     @Override
     public void visitResourceFiles(ResourceFileVisitor visitor) {
         Objects.requireNonNull(visitor);
-        for (ModuleData resource : getResourceFiles()) {
+        for (ModuleEntry resource : getResourceFiles()) {
             ResourceFile resFile
                     = new ResourceFile(toJavaBinaryResourceName(resource.getPath()),
                             resource.getBytes());
@@ -540,18 +539,18 @@ final class AsmPoolImpl implements AsmModulePool {
      * been set, it is used to sort the returned resources.     *
      */
     @Override
-    public void fillOutputResources(Pool outputResources) {
+    public void fillOutputResources(ModulePool outputResources) {
         List<String> added = new ArrayList<>();
         // If the sorter is null, use the input order.
         // New resources are added at the end
         // First input classes that have not been removed
-        Pool output = new PoolImpl(outputResources.getByteOrder(),
-                ((PoolImpl)outputResources).getStringTable());
-        for (ModuleData inResource : jimageResources.getContent()) {
+        ModulePool output = new ModulePoolImpl(outputResources.getByteOrder(),
+                ((ModulePoolImpl)outputResources).getStringTable());
+        jimageResources.entries().forEach(inResource -> {
             if (!forgetResources.contains(inResource.getPath())) {
-                ModuleData resource = inResource;
+                ModuleEntry resource = inResource;
                 // Do we have a transformed class with the same name?
-                ModuleData res = transformedResources.
+                ModuleEntry res = transformedResources.
                         get(toJavaBinaryResourceName(inResource.getPath()));
                 if (res != null) {
                     resource = res;
@@ -565,10 +564,10 @@ final class AsmPoolImpl implements AsmModulePool {
                 output.add(resource);
                 added.add(resource.getPath());
             }
-        }
+        });
         // Then new resources
-        for (Map.Entry<String, ModuleData> entry : transformedResources.entrySet()) {
-            ModuleData resource = entry.getValue();
+        for (Map.Entry<String, ModuleEntry> entry : transformedResources.entrySet()) {
+            ModuleEntry resource = entry.getValue();
             if (!forgetResources.contains(resource.getPath())) {
                 if (!added.contains(resource.getPath())) {
                     output.add(resource);
@@ -576,8 +575,8 @@ final class AsmPoolImpl implements AsmModulePool {
             }
         }
         // And new classes
-        for (Map.Entry<String, ModuleData> entry : transformedClasses.entrySet()) {
-            ModuleData resource = entry.getValue();
+        for (Map.Entry<String, ModuleEntry> entry : transformedClasses.entrySet()) {
+            ModuleEntry resource = entry.getValue();
             if (!forgetResources.contains(resource.getPath())) {
                 if (!added.contains(resource.getPath())) {
                     output.add(resource);
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/asm/AsmPools.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/asm/AsmPools.java
index bbb2d5403f8..53742ee5ad7 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/asm/AsmPools.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/asm/AsmPools.java
@@ -41,11 +41,11 @@ import java.util.Objects;
 import java.util.Set;
 import jdk.internal.org.objectweb.asm.ClassReader;
 import jdk.internal.org.objectweb.asm.ClassWriter;
-import jdk.tools.jlink.internal.PoolImpl;
+import jdk.tools.jlink.internal.ModulePoolImpl;
 import jdk.tools.jlink.internal.plugins.asm.AsmPool.Sorter;
+import jdk.tools.jlink.plugin.ModuleEntry;
 import jdk.tools.jlink.plugin.PluginException;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
+import jdk.tools.jlink.plugin.ModulePool;
 
 /**
  * A container for pools of ClassReader and other resource files. A pool of all
@@ -97,10 +97,10 @@ public final class AsmPools {
             }
 
             @Override
-            public Collection<Pool.ModuleData> getClasses() {
-                List<Pool.ModuleData> all = new ArrayList<>();
+            public Collection<ModuleEntry> getClasses() {
+                List<ModuleEntry> all = new ArrayList<>();
                 visitAllPools((AsmModulePool pool) -> {
-                    for (Pool.ModuleData rf : pool.getTransformedClasses().getClasses()) {
+                    for (ModuleEntry rf : pool.getTransformedClasses().getClasses()) {
                         all.add(rf);
                     }
                 });
@@ -108,7 +108,7 @@ public final class AsmPools {
             }
 
             @Override
-            public ClassReader getClassReader(Pool.ModuleData res) {
+            public ClassReader getClassReader(ModuleEntry res) {
                 return visitPools((AsmModulePool pool) -> {
                     return pool.getTransformedClasses().getClassReader(res);
                 });
@@ -140,10 +140,10 @@ public final class AsmPools {
             }
 
             @Override
-            public Collection<Pool.ModuleData> getResourceFiles() {
-                List<Pool.ModuleData> all = new ArrayList<>();
+            public Collection<ModuleEntry> getResourceFiles() {
+                List<ModuleEntry> all = new ArrayList<>();
                 visitAllPools((AsmModulePool pool) -> {
-                    for (Pool.ModuleData rf : pool.getTransformedResourceFiles().getResourceFiles()) {
+                    for (ModuleEntry rf : pool.getTransformedResourceFiles().getResourceFiles()) {
                         all.add(rf);
                     }
                 });
@@ -151,7 +151,7 @@ public final class AsmPools {
             }
 
             @Override
-            public ResourceFile getResourceFile(Pool.ModuleData res) {
+            public ResourceFile getResourceFile(ModuleEntry res) {
                 return visitPools((AsmModulePool pool) -> {
                     return pool.getTransformedResourceFiles().getResourceFile(res);
                 });
@@ -175,10 +175,10 @@ public final class AsmPools {
         }
 
         @Override
-        public Collection<Pool.ModuleData> getClasses() {
-            List<Pool.ModuleData> all = new ArrayList<>();
+        public Collection<ModuleEntry> getClasses() {
+            List<ModuleEntry> all = new ArrayList<>();
             visitAllPools((AsmModulePool pool) -> {
-                for (Pool.ModuleData rf : pool.getClasses()) {
+                for (ModuleEntry rf : pool.getClasses()) {
                     all.add(rf);
                 }
             });
@@ -186,10 +186,10 @@ public final class AsmPools {
         }
 
         @Override
-        public Collection<Pool.ModuleData> getResourceFiles() {
-            List<Pool.ModuleData> all = new ArrayList<>();
+        public Collection<ModuleEntry> getResourceFiles() {
+            List<ModuleEntry> all = new ArrayList<>();
             visitAllPools((AsmModulePool pool) -> {
-                for (Pool.ModuleData rf : pool.getResourceFiles()) {
+                for (ModuleEntry rf : pool.getResourceFiles()) {
                     all.add(rf);
                 }
             });
@@ -211,14 +211,14 @@ public final class AsmPools {
         }
 
         @Override
-        public ResourceFile getResourceFile(Pool.ModuleData res) {
+        public ResourceFile getResourceFile(ModuleEntry res) {
             return visitPools((AsmModulePool pool) -> {
                 return pool.getResourceFile(res);
             });
         }
 
         @Override
-        public ClassReader getClassReader(Pool.ModuleData res) {
+        public ClassReader getClassReader(ModuleEntry res) {
             return visitPoolsEx((AsmModulePool pool) -> {
                 return pool.getClassReader(res);
             });
@@ -239,7 +239,7 @@ public final class AsmPools {
         }
 
         @Override
-        public void fillOutputResources(Pool outputResources) {
+        public void fillOutputResources(ModulePool outputResources) {
             AsmPools.this.fillOutputResources(outputResources);
         }
 
@@ -324,15 +324,15 @@ public final class AsmPools {
      *
      * @param inputResources The raw resources to build the pool from.
      */
-    public AsmPools(Pool inputResources) {
+    public AsmPools(ModulePool inputResources) {
         Objects.requireNonNull(inputResources);
-        Map<String, Pool> resPools = new LinkedHashMap<>();
+        Map<String, ModulePool> resPools = new LinkedHashMap<>();
         Map<String, ModuleDescriptor> descriptors = new HashMap<>();
-        for (Pool.ModuleData res : inputResources.getContent()) {
-            Pool p = resPools.get(res.getModule());
+        inputResources.entries().forEach(res -> {
+            ModulePool p = resPools.get(res.getModule());
             if (p == null) {
-                p = new PoolImpl(inputResources.getByteOrder(),
-                        ((PoolImpl)inputResources).getStringTable());
+                p = new ModulePoolImpl(inputResources.getByteOrder(),
+                        ((ModulePoolImpl)inputResources).getStringTable());
                 resPools.put(res.getModule(), p);
             }
             if (res.getPath().endsWith("module-info.class")) {
@@ -341,11 +341,11 @@ public final class AsmPools {
                 descriptors.put(res.getModule(), descriptor);
             }
             p.add(res);
-        }
+        });
         poolsArray = new AsmModulePool[resPools.size()];
         int i = 0;
 
-        for (Entry<String, Pool> entry : resPools.entrySet()) {
+        for (Entry<String, ModulePool> entry : resPools.entrySet()) {
             ModuleDescriptor descriptor = descriptors.get(entry.getKey());
             if (descriptor == null) {
                 throw new PluginException("module-info.class not found for " + entry.getKey() + " module");
@@ -405,7 +405,7 @@ public final class AsmPools {
      *
      * @param outputResources The pool used to fill the jimage.
      */
-    public void fillOutputResources(Pool outputResources) {
+    public void fillOutputResources(ModulePool outputResources) {
         // First sort modules
         List<String> modules = new ArrayList<>();
         for (String k : pools.keySet()) {
@@ -414,8 +414,8 @@ public final class AsmPools {
         if (moduleSorter != null) {
             modules = moduleSorter.sort(modules);
         }
-        Pool output = new PoolImpl(outputResources.getByteOrder(),
-                ((PoolImpl)outputResources).getStringTable());
+        ModulePool output = new ModulePoolImpl(outputResources.getByteOrder(),
+                ((ModulePoolImpl)outputResources).getStringTable());
         for (String mn : modules) {
             AsmPool pool = pools.get(mn);
             pool.fillOutputResources(output);
@@ -423,17 +423,17 @@ public final class AsmPools {
         sort(outputResources, output, global.sorter);
     }
 
-    static void sort(Pool outputResources,
-            Pool transientOutput, Sorter sorter) {
+    static void sort(ModulePool outputResources,
+            ModulePool transientOutput, Sorter sorter) {
         if (sorter != null) {
             List<String> order = sorter.sort(transientOutput);
             for (String s : order) {
-                outputResources.add(transientOutput.get(s));
+                outputResources.add(transientOutput.findEntry(s).get());
             }
         } else {
-            for (ModuleData res : transientOutput.getContent()) {
+            transientOutput.entries().forEach(res-> {
                 outputResources.add(res);
-            }
+            });
         }
     }
 
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ExecutableImage.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ExecutableImage.java
index d5e767cd553..499d23dd450 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ExecutableImage.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ExecutableImage.java
@@ -24,66 +24,41 @@
  */
 package jdk.tools.jlink.plugin;
 
-import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 
 /**
- * An executable runtime image. Instance of this class contains the information
- * needed to create image processes.
+ * An executable runtime image. Contains the information about the executable
+ * image created.
  */
-public abstract class ExecutableImage {
-
-    private final Path home;
-    private final List<String> args;
-    private final Set<String> modules;
-
-    protected ExecutableImage(Path home, Set<String> modules,
-            List<String> args) {
-        Objects.requireNonNull(home);
-        Objects.requireNonNull(args);
-        if (!Files.exists(home)) {
-            throw new IllegalArgumentException("Invalid image home");
-        }
-        this.home = home;
-        this.modules = Collections.unmodifiableSet(modules);
-        this.args = Collections.unmodifiableList(args);
-    }
+public interface ExecutableImage {
 
     /**
      * Image home directory,
      *
      * @return The home directory.
      */
-    public Path getHome() {
-        return home;
-    }
+    public Path getHome();
 
     /**
      * The names of the modules located in the image.
      *
      * @return The set of modules.
      */
-    public Set<String> getModules() {
-        return modules;
-    }
+    public Set<String> getModules();
 
     /**
      * The list of arguments required to execute the image.
      *
      * @return The list of arguments.
      */
-    public List<String> getExecutionArgs() {
-        return args;
-    }
+    public List<String> getExecutionArgs();
 
     /**
      * Store new arguments required to execute the image.
      *
      * @param args Additional arguments
      */
-    public abstract void storeLaunchArgs(List<String> args);
+    public void storeLaunchArgs(List<String> args);
 }
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/LinkModule.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/LinkModule.java
new file mode 100644
index 00000000000..f516d8d0494
--- /dev/null
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/LinkModule.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2016, 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.tools.jlink.plugin;
+
+import java.lang.module.ModuleDescriptor;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Stream;
+
+/**
+  * Link-time representation of a Java module.
+  */
+public interface LinkModule {
+
+    /**
+     * The module name.
+     *
+     * @return The name.
+     */
+    public String getName();
+
+    /**
+     * Retrieves a LinkModuleEntry from the given path (e.g:
+     * /mymodule/com.foo.bar/MyClass.class)
+     *
+     * @param path The piece of data path.
+     * @return A LinkModuleEntry of the given path, if found.
+     */
+    public Optional<ModuleEntry> findEntry(String path);
+
+    /**
+     * The module descriptor of this module.
+     *
+     * @return The module descriptor.
+     */
+    public ModuleDescriptor getDescriptor();
+
+    /**
+     * Add a LinkModuleEntry to this module.
+     *
+     * @param data The LinkModuleEntry to add.
+     */
+    public void add(ModuleEntry data);
+
+    /**
+     * Retrieves all the packages located in this module.
+     *
+     * @return The set of packages.
+     */
+    public Set<String> getAllPackages();
+
+    /**
+     * Retrieves the stream of LinkModuleEntry.
+     *
+     * @return The LinkModuleEntry stream.
+     */
+    public Stream<? extends ModuleEntry> entries();
+
+    /**
+     * Return the number of LinkModuleEntry count in this LinkModule.
+     *
+     * @return the entry count.
+     */
+    public int getEntryCount();
+}
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ModuleEntry.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ModuleEntry.java
new file mode 100644
index 00000000000..61f828fc914
--- /dev/null
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ModuleEntry.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2016, 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.tools.jlink.plugin;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.Objects;
+import jdk.tools.jlink.internal.ImageFileCreator;
+import jdk.tools.jlink.internal.ModuleEntryImpl;
+
+/**
+ * A LinkModuleEntry is the elementary unit of data inside an image. It is
+ * generally a file. e.g.: a java class file, a resource file, a shared library,
+ * ...
+ * <br>
+ * A LinkModuleEntry is identified by a path of the form:
+ * <ul>
+ * <li>For jimage content: /{module name}/{package1}/.../{packageN}/{file
+ * name}</li>
+ * <li>For other files (shared lib, launchers, config, ...):/{module name}/
+ * {@literal bin|conf|native}/{dir1}>/.../{dirN}/{file name}</li>
+ * </ul>
+ */
+public interface ModuleEntry {
+
+    /**
+     * Type of module data.
+     * <li>
+     * <ul>CLASS_OR_RESOURCE: A java class or resource file.</ul>
+     * <ul>CONFIG: A configuration file.</ul>
+     * <ul>NATIVE_CMD: A native process launcher.</ul>
+     * <ul>NATIVE_LIB: A native library.</ul>
+     * <ul>OTHER: Other kind of file.</ul>
+     * </li>
+     */
+    public enum Type {
+        CLASS_OR_RESOURCE,
+        CONFIG,
+        NATIVE_CMD,
+        NATIVE_LIB,
+        OTHER
+    }
+    /**
+     * The LinkModuleEntry module name.
+     *
+     * @return The module name.
+     */
+    public String getModule();
+
+    /**
+     * The LinkModuleEntry path.
+     *
+     * @return The module path.
+     */
+    public String getPath();
+
+    /**
+     * The LinkModuleEntry's type.
+     *
+     * @return The data type.
+     */
+    public Type getType();
+
+    /**
+     * The LinkModuleEntry content as an array of byte.
+     *
+     * @return An Array of bytes.
+     */
+    public byte[] getBytes();
+
+    /**
+     * The LinkModuleEntry content length.
+     *
+     * @return The length.
+     */
+    public long getLength();
+
+    /**
+     * The LinkModuleEntry stream.
+     *
+     * @return The module data stream.
+     */
+    public InputStream stream();
+
+
+    /**
+     * Create a LinkModuleEntry located inside a jimage file. Such
+     * LinkModuleEntry has a Type being equals to CLASS_OR_RESOURCE.
+     *
+     * @param path The complete resource path (contains the module radical).
+     * @param content The resource content.
+     * @param size The content size.
+     * @return A new LinkModuleEntry.
+     */
+    public static ModuleEntry create(String path, InputStream content, long size) {
+        Objects.requireNonNull(path);
+        Objects.requireNonNull(content);
+        String[] split = ImageFileCreator.splitPath(path);
+        String module = split[0];
+        return new ModuleEntryImpl(module, path, Type.CLASS_OR_RESOURCE, content, size);
+    }
+
+    /**
+     * Create a LinkModuleEntry for a file that will be located inside a jimage
+     * file.
+     *
+     * @param path The resource path.
+     * @param content The resource content.
+     * @return A new LinkModuleEntry.
+     */
+    public static ModuleEntry create(String path, byte[] content) {
+        return create(path, new ByteArrayInputStream(content),
+                content.length);
+    }
+
+    /**
+     * Create a LinkModuleEntry for a file that will be located outside a jimage
+     * file.
+     *
+     * @param module The module in which this files is located.
+     * @param path The file path locator (doesn't contain the module name).
+     * @param type The LinkModuleEntry type.
+     * @param content The file content.
+     * @param size The content size.
+     * @return A new LinkModuleEntry.
+     */
+    public static ModuleEntry create(String module, String path, ModuleEntry.Type type,
+            InputStream content, long size) {
+        Objects.requireNonNull(path);
+        Objects.requireNonNull(content);
+        return new ModuleEntryImpl(module, path, type, content, size);
+    }
+}
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ModulePool.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ModulePool.java
new file mode 100644
index 00000000000..4d0f230e1c6
--- /dev/null
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ModulePool.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2015, 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.tools.jlink.plugin;
+
+import java.nio.ByteOrder;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+/**
+ * Pool of module data.
+ */
+public interface ModulePool {
+/**
+     * Is this a read-only ModulePool?
+     *
+     * @return true if this is a read-only configuration.
+     */
+    public boolean isReadOnly();
+
+    /**
+     * Add a ModuleEntry.
+     *
+     * @param data The ModuleEntry to add.
+     */
+    public void add(ModuleEntry data);
+    /**
+     * Retrieves the module for the provided name.
+     *
+     * @param name The module name
+     * @return the module of matching name, if found
+     */
+    public Optional<LinkModule> findModule(String name);
+
+    /**
+     * The stream of modules contained in this ModulePool.
+     *
+     * @return The stream of modules.
+     */
+    public Stream<? extends LinkModule> modules();
+
+    /**
+     * Return the number of LinkModule count in this ModulePool.
+     *
+     * @return the module count.
+     */
+    public int getModuleCount();
+
+    /**
+     * Get all ModuleEntry contained in this ModulePool instance.
+     *
+     * @return The stream of LinkModuleEntries.
+     */
+    public Stream<? extends ModuleEntry> entries();
+
+    /**
+     * Return the number of ModuleEntry count in this ModulePool.
+     *
+     * @return the entry count.
+     */
+    public int getEntryCount();
+
+    /**
+     * Get the ModuleEntry for the passed path.
+     *
+     * @param path A data path
+     * @return A ModuleEntry instance or null if the data is not found
+     */
+   public Optional<ModuleEntry> findEntry(String path);
+
+    /**
+     * Check if the ModulePool contains the given ModuleEntry.
+     *
+     * @param data The module data to check existence for.
+     * @return The module data or null if not found.
+     */
+    public boolean contains(ModuleEntry data);
+
+    /**
+     * Check if the ModulePool contains some content at all.
+     *
+     * @return True, no content, false otherwise.
+     */
+    public boolean isEmpty();
+
+    /**
+     * Visit each ModuleEntry in this ModulePool to transform it and copy
+     * the transformed ModuleEntry to the output ModulePool.
+     *
+     * @param transform The function called for each ModuleEntry found in the
+     * ModulePool. The transform function should return a ModuleEntry
+     * instance which will be added to the output or it should return null if
+     * the passed ModuleEntry is to be ignored for the output.
+     *
+     * @param output The ModulePool to be filled with Visitor returned
+     * ModuleEntry.
+     */
+    public void transformAndCopy(Function<ModuleEntry, ModuleEntry> transform, ModulePool output);
+
+    /**
+     * The ByteOrder currently in use when generating the jimage file.
+     *
+     * @return The ByteOrder.
+     */
+    public ByteOrder getByteOrder();
+
+    /**
+     * Release properties such as OS, CPU name, version etc.
+     *
+     * @return the release properties
+     */
+    public Map<String, String> getReleaseProperties();
+}
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/Plugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/Plugin.java
index 56e51bc9bc5..30633b546d3 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/Plugin.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/Plugin.java
@@ -26,7 +26,6 @@ package jdk.tools.jlink.plugin;
 
 import java.util.Collections;
 import java.util.EnumSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import jdk.tools.jlink.internal.plugins.PluginsResourceBundle;
@@ -36,14 +35,6 @@ import jdk.tools.jlink.internal.plugins.PluginsResourceBundle;
  */
 public interface Plugin {
 
-    /**
-     * Type of plugin.
-     */
-    public interface PluginType {
-
-        public String getName();
-    }
-
     /**
      * Order of categories:
      * <ol>
@@ -53,28 +44,29 @@ public interface Plugin {
      * <li>MODULEINFO_TRANSFORMER: Transform only module-info.class</li>
      * <li>SORTER: Sort resources within the resource container.</li>
      * <li>COMPRESSOR: Compress resource within the resouce containers.</li>
+     * <li>METAINFO_ADDER: Added meta info (like release, copyright etc.)</li>
      * <li>VERIFIER: Does some image verification.</li>
      * <li>PROCESSOR: Does some post processing on image.</li>
      * <li>PACKAGER: Final processing</li>
      * </ol>
      */
-    public enum CATEGORY implements PluginType {
+    public enum Category {
         FILTER("FILTER"),
         TRANSFORMER("TRANSFORMER"),
         MODULEINFO_TRANSFORMER("MODULEINFO_TRANSFORMER"),
         SORTER("SORTER"),
         COMPRESSOR("COMPRESSOR"),
+        METAINFO_ADDER("METAINFO_ADDER"),
         VERIFIER("VERIFIER"),
         PROCESSOR("PROCESSOR"),
         PACKAGER("PACKAGER");
 
         private final String name;
 
-        CATEGORY(String name) {
+        Category(String name) {
             this.name = name;
         }
 
-        @Override
         public String getName() {
             return name;
         }
@@ -91,7 +83,7 @@ public interface Plugin {
      * {@link #getStateDescription() getStateDescription} method</li>
      * </ul>
      */
-    public enum STATE {
+    public enum State {
         DISABLED,
         AUTO_ENABLED,
         FUNCTIONAL
@@ -101,7 +93,7 @@ public interface Plugin {
      * The Plugin set of types.
      * @return The set of types.
      */
-    public default Set<PluginType> getType() {
+    public default Set<Category> getType() {
         return Collections.emptySet();
     }
 
@@ -109,8 +101,8 @@ public interface Plugin {
      * The Plugin set of states.
      * @return The set of states.
      */
-    public default Set<STATE> getState() {
-        return EnumSet.of(STATE.FUNCTIONAL);
+    public default Set<State> getState() {
+        return EnumSet.of(State.FUNCTIONAL);
     }
 
     /**
@@ -191,7 +183,7 @@ public interface Plugin {
      * @return A status description.
      */
     public default String getStateDescription() {
-        return getState().contains(STATE.FUNCTIONAL)
+        return getState().contains(State.FUNCTIONAL)
                 ? PluginsResourceBundle.getMessage("main.status.ok")
                 : PluginsResourceBundle.getMessage("main.status.not.ok");
     }
@@ -206,18 +198,4 @@ public interface Plugin {
      */
     public default void configure(Map<String, String> config) {
     }
-
-    /**
-     * Configure the plugin based on the passed configuration.
-     * This method is called prior to invoke the plugin.
-     *
-     * @param config The plugin configuration.
-     * @param ctx The plugin context
-     * @throws IllegalArgumentException if a mandatory argument is missing or
-     * if an argument has invalid value.
-     *
-     */
-    public default void configure(Map<String, String> config, PluginContext ctx) {
-        configure(config);
-    }
 }
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/PluginContext.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/PluginContext.java
deleted file mode 100644
index 9e5a4a7df61..00000000000
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/PluginContext.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2016, 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.tools.jlink.plugin;
-
-import java.util.Properties;
-
-/**
- * Interface to plugin (container) context.
- */
-public interface PluginContext {
-    /**
-     * Returns 'release' properties
-     */
-    public Properties getReleaseProperties();
-}
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/Pool.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/Pool.java
deleted file mode 100644
index 380ca41ac1a..00000000000
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/Pool.java
+++ /dev/null
@@ -1,528 +0,0 @@
-/*
- * Copyright (c) 2015, 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.tools.jlink.plugin;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UncheckedIOException;
-import java.lang.module.ModuleDescriptor;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import jdk.tools.jlink.internal.ImageFileCreator;
-import jdk.tools.jlink.internal.plugins.FileCopierPlugin;
-
-/**
- * Pool of module data.
- *
- */
-public abstract class Pool {
-
-    /**
-     * Interface to visit the content of a Pool.
-     */
-    public interface Visitor {
-
-        /**
-         * Called for each visited ModuleData.
-         *
-         * @param content A ModuleData
-         * @return A ModuleData instance or null if the passed ModuleData is to
-         * be removed from the image.
-         * @throws PluginException
-         */
-        public ModuleData visit(ModuleData content);
-    }
-
-    /**
-     * Type of module data.
-     * <li>
-     * <ul>CLASS_OR_RESOURCE: A java class or resource file.</ul>
-     * <ul>CONFIG: A configuration file.</ul>
-     * <ul>NATIVE_CMD: A native process launcher.</ul>
-     * <ul>NATIVE_LIB: A native library.</ul>
-     * <ul>OTHER: Other kind of file.</ul>
-     * </li>
-     */
-    public static enum ModuleDataType {
-
-        CLASS_OR_RESOURCE,
-        CONFIG,
-        NATIVE_CMD,
-        NATIVE_LIB,
-        OTHER;
-    }
-
-    /**
-     * A module in the pool.
-     */
-    public interface Module {
-
-        /**
-         * The module name.
-         *
-         * @return The name.
-         */
-        public String getName();
-
-        /**
-         * Retrieves a ModuleData from a path (e.g:
-         * /mymodule/com.foo.bar/MyClass.class)
-         *
-         * @param path The piece of data path.
-         * @return A ModuleData or null if the path doesn't identify a
-         * ModuleData.
-         */
-        public ModuleData get(String path);
-
-        /**
-         * The module descriptor of this module.
-         *
-         * @return The module descriptor.
-         */
-        public ModuleDescriptor getDescriptor();
-
-        /**
-         * Add a ModuleData to this module.
-         *
-         * @param data The ModuleData to add.
-         */
-        public void add(ModuleData data);
-
-        /**
-         * Retrieves all the packages located in this module.
-         *
-         * @return The set of packages.
-         */
-        public Set<String> getAllPackages();
-
-        /**
-         * Retrieves the collection of ModuleData.
-         *
-         * @return The ModuleData collection.
-         */
-        public Collection<ModuleData> getContent();
-
-    }
-
-    private class ModuleImpl implements Module {
-
-        private final Map<String, ModuleData> moduleContent = new LinkedHashMap<>();
-        private ModuleDescriptor descriptor;
-        private final String name;
-
-        private ModuleImpl(String name) {
-            this.name = name;
-        }
-
-        @Override
-        public String getName() {
-            return name;
-        }
-
-        @Override
-        public ModuleData get(String path) {
-            if (!path.startsWith("/")) {
-                path = "/" + path;
-            }
-            if (!path.startsWith("/" + name)) {
-                path = "/" + name + path;
-            }
-            return moduleContent.get(path);
-        }
-
-        @Override
-        public ModuleDescriptor getDescriptor() {
-            if (descriptor == null) {
-                String p = "/" + name + "/module-info.class";
-                ModuleData content = moduleContent.get(p);
-                if (content == null) {
-                    throw new PluginException("No module-info for " + name
-                            + " module");
-                }
-                ByteBuffer bb = ByteBuffer.wrap(content.getBytes());
-                descriptor = ModuleDescriptor.read(bb);
-            }
-            return descriptor;
-        }
-
-        @Override
-        public void add(ModuleData data) {
-            if (isReadOnly()) {
-                throw new PluginException("pool is readonly");
-            }
-            Objects.requireNonNull(data);
-            if (!data.getModule().equals(name)) {
-                throw new PluginException("Can't add resource " + data.getPath()
-                        + " to module " + name);
-            }
-            Pool.this.add(data);
-        }
-
-        @Override
-        public Set<String> getAllPackages() {
-            Set<String> pkgs = new HashSet<>();
-            moduleContent.values().stream().filter(m -> m.getType().
-                    equals(ModuleDataType.CLASS_OR_RESOURCE)).forEach((res) -> {
-                // Module metadata only contains packages with .class files
-                if (ImageFileCreator.isClassPackage(res.getPath())) {
-                    String[] split = ImageFileCreator.splitPath(res.getPath());
-                    String pkg = split[1];
-                    if (pkg != null && !pkg.isEmpty()) {
-                        pkgs.add(pkg);
-                    }
-                }
-            });
-            return pkgs;
-        }
-
-        @Override
-        public String toString() {
-            return getName();
-        }
-
-        @Override
-        public Collection<ModuleData> getContent() {
-            return Collections.unmodifiableCollection(moduleContent.values());
-        }
-    }
-
-    /**
-     * A ModuleData is the elementary unit of data inside an image. It is
-     * generally a file. e.g.: a java class file, a resource file, a shared
-     * library, ...
-     * <br>
-     * A ModuleData is identified by a path of the form:
-     * <ul>
-     * <li>For jimage content: /{module name}/{package1}/.../{packageN}/{file
-     * name}</li>
-     * <li>For other files (shared lib, launchers, config, ...):/{module name}/
-     * {@literal bin|conf|native}/{dir1}/.../{dirN}/{file name}</li>
-     * </ul>
-     */
-    public static class ModuleData {
-
-        private final ModuleDataType type;
-        private final String path;
-        private final String module;
-        private final long length;
-        private final InputStream stream;
-        private byte[] buffer;
-
-        /**
-         * Create a new ModuleData.
-         *
-         * @param module The module name.
-         * @param path The data path identifier.
-         * @param type The data type.
-         * @param stream The data content stream.
-         * @param length The stream length.
-         */
-        public ModuleData(String module, String path, ModuleDataType type,
-                InputStream stream, long length) {
-            Objects.requireNonNull(module);
-            Objects.requireNonNull(path);
-            Objects.requireNonNull(type);
-            Objects.requireNonNull(stream);
-            this.path = path;
-            this.type = type;
-            this.module = module;
-            this.stream = stream;
-            this.length = length;
-        }
-
-        /**
-         * The ModuleData module name.
-         *
-         * @return The module name.
-         */
-        public final String getModule() {
-            return module;
-        }
-
-        /**
-         * The ModuleData path.
-         *
-         * @return The module path.
-         */
-        public final String getPath() {
-            return path;
-        }
-
-        /**
-         * The ModuleData type.
-         *
-         * @return The data type.
-         */
-        public final ModuleDataType getType() {
-            return type;
-        }
-
-        /**
-         * The ModuleData content as an array of byte.
-         *
-         * @return An Array of bytes.
-         */
-        public byte[] getBytes() {
-            if (buffer == null) {
-                try {
-                    buffer = stream.readAllBytes();
-                } catch (IOException ex) {
-                    throw new UncheckedIOException(ex);
-                }
-            }
-            return buffer;
-        }
-
-        /**
-         * The ModuleData content length.
-         *
-         * @return The length.
-         */
-        public long getLength() {
-            return length;
-        }
-
-        /**
-         * The ModuleData stream.
-         *
-         * @return The module data stream.
-         */
-        public InputStream stream() {
-            return stream;
-        }
-
-        @Override
-        public int hashCode() {
-            int hash = 7;
-            hash = 89 * hash + Objects.hashCode(this.path);
-            return hash;
-        }
-
-        @Override
-        public boolean equals(Object other) {
-            if (!(other instanceof ModuleData)) {
-                return false;
-            }
-            ModuleData f = (ModuleData) other;
-            return f.path.equals(path);
-        }
-
-        @Override
-        public String toString() {
-            return getPath();
-        }
-    }
-
-    private final Map<String, ModuleData> resources = new LinkedHashMap<>();
-    private final Map<String, ModuleImpl> modules = new LinkedHashMap<>();
-    private final ModuleImpl fileCopierModule = new ModuleImpl(FileCopierPlugin.FAKE_MODULE);
-
-    private final ByteOrder order;
-
-    protected Pool() {
-        this(ByteOrder.nativeOrder());
-    }
-
-    protected Pool(ByteOrder order) {
-        Objects.requireNonNull(order);
-        this.order = order;
-    }
-
-    /**
-     * Read only state. No data can be added to a ReadOnly Pool.
-     *
-     * @return true if readonly false otherwise.
-     */
-    public abstract boolean isReadOnly();
-
-    /**
-     * Add a ModuleData.
-     *
-     * @param data The ModuleData to add.
-     */
-    public void add(ModuleData data) {
-        if (isReadOnly()) {
-            throw new PluginException("pool is readonly");
-        }
-        Objects.requireNonNull(data);
-        if (resources.get(data.getPath()) != null) {
-            throw new PluginException("Resource " + data.getPath()
-                    + " already present");
-        }
-        String modulename = data.getModule();
-        ModuleImpl m = modules.get(modulename);
-        // ## TODO: FileCopierPlugin should not add content to a module
-        // FAKE_MODULE is not really a module to be added in the image
-        if (FileCopierPlugin.FAKE_MODULE.equals(modulename)) {
-            m = fileCopierModule;
-        }
-        if (m == null) {
-            m = new ModuleImpl(modulename);
-            modules.put(modulename, m);
-        }
-        resources.put(data.getPath(), data);
-        m.moduleContent.put(data.getPath(), data);
-    }
-
-    /**
-     * Retrieves the module for the provided name.
-     *
-     * @param name The module name
-     * @return the module or null if the module doesn't exist.
-     */
-    public Module getModule(String name) {
-        Objects.requireNonNull(name);
-        return modules.get(name);
-    }
-
-    /**
-     * The collection of modules contained in this pool.
-     *
-     * @return The collection of modules.
-     */
-    public Collection<Module> getModules() {
-        return Collections.unmodifiableCollection(modules.values());
-    }
-
-    /**
-     * Get all ModuleData contained in this pool instance.
-     *
-     * @return The collection of resources;
-     */
-    public Collection<ModuleData> getContent() {
-        return Collections.unmodifiableCollection(resources.values());
-    }
-
-    /**
-     * Get the ModuleData for the passed path.
-     *
-     * @param path A data path
-     * @return A ModuleData instance or null if the data is not found
-     */
-    public ModuleData get(String path) {
-        Objects.requireNonNull(path);
-        return resources.get(path);
-    }
-
-    /**
-     * Check if the pool contains this data.
-     *
-     * @param data The module data to check existence for.
-     * @return The module data or null if not found.
-     */
-    public boolean contains(ModuleData data) {
-        Objects.requireNonNull(data);
-        return get(data.getPath()) != null;
-    }
-
-    /**
-     * Check if the Pool contains some content.
-     *
-     * @return True, no content, false otherwise.
-     */
-    public boolean isEmpty() {
-        return resources.isEmpty();
-    }
-
-    /**
-     * Visit the pool.
-     *
-     * @param visitor The Visitor called for each ModuleData found in the pool.
-     * @param output The pool to be filled with Visitor returned ModuleData.
-     */
-    public void visit(Visitor visitor, Pool output) {
-        for (ModuleData resource : getContent()) {
-            ModuleData res = visitor.visit(resource);
-            if (res != null) {
-                output.add(res);
-            }
-        }
-    }
-
-    /**
-     * The ByteOrder currently in use when generating the jimage file.
-     *
-     * @return The ByteOrder.
-     */
-    public ByteOrder getByteOrder() {
-        return order;
-    }
-
-    /**
-     * Create a ModuleData located inside a jimage file. Such ModuleData has a
-     * ModuleDataType being equals to CLASS_OR_RESOURCE.
-     *
-     * @param path The complete resource path (contains the module radical).
-     * @param content The resource content.
-     * @param size The content size.
-     * @return A new ModuleData.
-     */
-    public static ModuleData newResource(String path, InputStream content, long size) {
-        Objects.requireNonNull(path);
-        Objects.requireNonNull(content);
-        String[] split = ImageFileCreator.splitPath(path);
-        String module = split[0];
-        return new ModuleData(module, path, ModuleDataType.CLASS_OR_RESOURCE, content, size);
-    }
-
-    /**
-     * Create a ModuleData for a file that will be located inside a jimage file.
-     *
-     * @param path The resource path.
-     * @param content The resource content.
-     * @return A new ModuleData.
-     */
-    public static ModuleData newResource(String path, byte[] content) {
-        return newResource(path, new ByteArrayInputStream(content),
-                content.length);
-    }
-
-    /**
-     * Create a ModuleData for a file that will be located outside a jimage
-     * file.
-     *
-     * @param module The module in which this files is located.
-     * @param path The file path locator (doesn't contain the module name).
-     * @param type The ModuleData type.
-     * @param content The file content.
-     * @param size The content size.
-     * @return A new ModuleData.
-     */
-    public static ModuleData newImageFile(String module, String path, ModuleDataType type,
-            InputStream content, long size) {
-        Objects.requireNonNull(path);
-        Objects.requireNonNull(content);
-        return new ModuleData(module, path, type, content, size);
-    }
-
-}
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/TransformerPlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/TransformerPlugin.java
index 4af4897e636..15133221c43 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/TransformerPlugin.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/TransformerPlugin.java
@@ -40,5 +40,5 @@ public interface TransformerPlugin extends Plugin {
      *
      * @throws PluginException
      */
-    public void visit(Pool in, Pool out);
+    public void visit(ModulePool in, ModulePool out);
 }
diff --git a/jdk/src/jdk.jlink/share/classes/module-info.java b/jdk/src/jdk.jlink/share/classes/module-info.java
index 49e426fed12..c23116404ac 100644
--- a/jdk/src/jdk.jlink/share/classes/module-info.java
+++ b/jdk/src/jdk.jlink/share/classes/module-info.java
@@ -24,9 +24,7 @@
  */
 
 module jdk.jlink {
-    exports jdk.tools.jlink;
     exports jdk.tools.jlink.plugin;
-    exports jdk.tools.jlink.builder;
 
     requires jdk.internal.opt;
     requires jdk.jdeps;
@@ -46,5 +44,5 @@ module jdk.jlink {
     provides jdk.tools.jlink.plugin.TransformerPlugin with jdk.tools.jlink.internal.plugins.ExcludeVMPlugin;
     provides jdk.tools.jlink.plugin.TransformerPlugin with jdk.tools.jlink.internal.plugins.IncludeLocalesPlugin;
     provides jdk.tools.jlink.plugin.TransformerPlugin with jdk.tools.jlink.internal.plugins.GenerateJLIClassesPlugin;
-    provides jdk.tools.jlink.plugin.PostProcessorPlugin with jdk.tools.jlink.internal.plugins.ReleaseInfoPlugin;
+    provides jdk.tools.jlink.plugin.TransformerPlugin with jdk.tools.jlink.internal.plugins.ReleaseInfoPlugin;
 }
diff --git a/jdk/test/tools/jlink/DefaultProviderTest.java b/jdk/test/tools/jlink/DefaultProviderTest.java
index 22c68287d5c..c10e9d37060 100644
--- a/jdk/test/tools/jlink/DefaultProviderTest.java
+++ b/jdk/test/tools/jlink/DefaultProviderTest.java
@@ -33,7 +33,7 @@ import java.util.Set;
 import jdk.tools.jlink.internal.PluginRepository;
 import jdk.tools.jlink.plugin.Plugin;
 import jdk.tools.jlink.plugin.PluginException;
-import jdk.tools.jlink.plugin.Pool;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 import tests.Helper;
 
@@ -65,26 +65,26 @@ public class DefaultProviderTest {
         private boolean enabled = true;
 
         @Override
-        public Set<PluginType> getType() {
-            Set<PluginType> set = new HashSet<>();
-            set.add(CATEGORY.TRANSFORMER);
+        public Set<Category> getType() {
+            Set<Category> set = new HashSet<>();
+            set.add(Category.TRANSFORMER);
             return Collections.unmodifiableSet(set);
         }
 
         @Override
-        public Set<STATE> getState() {
-             return enabled ? EnumSet.of(STATE.AUTO_ENABLED, STATE.FUNCTIONAL)
-                : EnumSet.of(STATE.DISABLED);
+        public Set<State> getState() {
+             return enabled ? EnumSet.of(State.AUTO_ENABLED, State.FUNCTIONAL)
+                : EnumSet.of(State.DISABLED);
         }
 
         @Override
-        public void visit(Pool in, Pool out) {
+        public void visit(ModulePool in, ModulePool out) {
             if (!enabled) {
                 throw new PluginException(NAME + " was set");
             }
 
             DefaultProviderTest.isNewPluginsCalled = true;
-            in.visit((Pool.ModuleData content) -> {
+            in.transformAndCopy(content -> {
                 return content;
             }, out);
         }
diff --git a/jdk/test/tools/jlink/ImageFileCreatorTest.java b/jdk/test/tools/jlink/ImageFileCreatorTest.java
index 449d950d04d..8e093c69459 100644
--- a/jdk/test/tools/jlink/ImageFileCreatorTest.java
+++ b/jdk/test/tools/jlink/ImageFileCreatorTest.java
@@ -39,7 +39,7 @@ import jdk.tools.jlink.internal.ImageFileCreator;
 import jdk.tools.jlink.internal.ImagePluginStack;
 import jdk.tools.jlink.plugin.ExecutableImage;
 import jdk.tools.jlink.builder.ImageBuilder;
-import jdk.tools.jlink.plugin.Pool;
+import jdk.tools.jlink.plugin.ModulePool;
 
 
 /*
@@ -47,6 +47,7 @@ import jdk.tools.jlink.plugin.Pool;
  * @summary ImageFileCreator class test
  * @author Jean-Francois Denise
  * @modules jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.builder
  *          java.base/jdk.internal.jimage
  * @run main/othervm -verbose:gc -Xmx1g ImageFileCreatorTest
  */
@@ -214,7 +215,7 @@ public class ImageFileCreatorTest {
             }
 
             @Override
-            public void storeFiles(Pool content) {
+            public void storeFiles(ModulePool content) {
             }
         };
 
diff --git a/jdk/test/tools/jlink/ImageFilePoolTest.java b/jdk/test/tools/jlink/ImageFilePoolTest.java
index 7d35f9da8d6..1ea0fada3d7 100644
--- a/jdk/test/tools/jlink/ImageFilePoolTest.java
+++ b/jdk/test/tools/jlink/ImageFilePoolTest.java
@@ -31,11 +31,12 @@
  */
 
 import java.io.ByteArrayInputStream;
-import jdk.tools.jlink.internal.PoolImpl;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
-import jdk.tools.jlink.plugin.Pool.ModuleDataType;
-import jdk.tools.jlink.plugin.Pool.Visitor;
+import java.util.Optional;
+import java.util.function.Function;
+import jdk.tools.jlink.internal.ModuleEntryImpl;
+import jdk.tools.jlink.internal.ModulePoolImpl;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 
 public class ImageFilePoolTest {
     public static void main(String[] args) throws Exception {
@@ -50,45 +51,45 @@ public class ImageFilePoolTest {
     private static final String SUFFIX = "END";
 
     private void checkVisitor() throws Exception {
-        Pool input = new PoolImpl();
+        ModulePool input = new ModulePoolImpl();
         for (int i = 0; i < 1000; ++i) {
             String module = "module" + (i / 100);
             input.add(new InMemoryImageFile(module, "/" + module + "/java/class" + i,
-                    ModuleDataType.CONFIG, "class" + i));
+                    ModuleEntry.Type.CONFIG, "class" + i));
         }
-        if (input.getContent().size() != 1000) {
+        if (input.getEntryCount() != 1000) {
             throw new AssertionError();
         }
-        Pool output = new PoolImpl();
+        ModulePool output = new ModulePoolImpl();
         ResourceVisitor visitor = new ResourceVisitor();
-        input.visit(visitor, output);
+        input.transformAndCopy(visitor, output);
         if (visitor.getAmountBefore() == 0) {
             throw new AssertionError("Resources not found");
         }
-        if (visitor.getAmountBefore() != input.getContent().size()) {
+        if (visitor.getAmountBefore() != input.getEntryCount()) {
             throw new AssertionError("Number of visited resources. Expected: " +
-                    visitor.getAmountBefore() + ", got: " + input.getContent().size());
+                    visitor.getAmountBefore() + ", got: " + input.getEntryCount());
         }
-        if (visitor.getAmountAfter() != output.getContent().size()) {
+        if (visitor.getAmountAfter() != output.getEntryCount()) {
             throw new AssertionError("Number of added resources. Expected: " +
-                    visitor.getAmountAfter() + ", got: " + output.getContent().size());
+                    visitor.getAmountAfter() + ", got: " + output.getEntryCount());
         }
-        for (ModuleData outFile : output.getContent()) {
+        output.entries().forEach(outFile -> {
             String path = outFile.getPath().replaceAll(SUFFIX + "$", "");
-            ModuleData inFile = input.get(path);
-            if (inFile == null) {
+            Optional<ModuleEntry> inFile = input.findEntry(path);
+            if (!inFile.isPresent()) {
                 throw new AssertionError("Unknown resource: " + path);
             }
-        }
+        });
     }
 
-    private static class ResourceVisitor implements Visitor {
+    private static class ResourceVisitor implements Function<ModuleEntry, ModuleEntry> {
 
         private int amountBefore;
         private int amountAfter;
 
         @Override
-        public ModuleData visit(ModuleData file) {
+        public ModuleEntry apply(ModuleEntry file) {
             int index = ++amountBefore % 3;
             switch (index) {
                 case 0:
@@ -113,7 +114,7 @@ public class ImageFilePoolTest {
     }
 
     private void checkNegative() throws Exception {
-        PoolImpl input = new PoolImpl();
+        ModulePoolImpl input = new ModulePoolImpl();
         try {
             input.add(null);
             throw new AssertionError("NullPointerException is not thrown");
@@ -126,30 +127,30 @@ public class ImageFilePoolTest {
         } catch (NullPointerException e) {
             // expected
         }
-        if (input.get("unknown") != null) {
-            throw new AssertionError("ImageFilePool does not return null for unknown file");
+        if (input.findEntry("unknown").isPresent()) {
+            throw new AssertionError("ImageFileModulePool does not return null for unknown file");
         }
-        if (input.contains(new InMemoryImageFile("", "unknown", ModuleDataType.CONFIG, "unknown"))) {
+        if (input.contains(new InMemoryImageFile("", "unknown", ModuleEntry.Type.CONFIG, "unknown"))) {
             throw new AssertionError("'contain' returns true for unknown file");
         }
-        input.add(new InMemoryImageFile("", "/aaa/bbb", ModuleDataType.CONFIG, ""));
+        input.add(new InMemoryImageFile("", "/aaa/bbb", ModuleEntry.Type.CONFIG, ""));
         try {
-            input.add(new InMemoryImageFile("", "/aaa/bbb", ModuleDataType.CONFIG, ""));
+            input.add(new InMemoryImageFile("", "/aaa/bbb", ModuleEntry.Type.CONFIG, ""));
             throw new AssertionError("Exception expected");
         } catch (Exception e) {
             // expected
         }
         input.setReadOnly();
         try {
-            input.add(new InMemoryImageFile("", "/aaa/ccc", ModuleDataType.CONFIG, ""));
+            input.add(new InMemoryImageFile("", "/aaa/ccc", ModuleEntry.Type.CONFIG, ""));
             throw new AssertionError("Exception expected");
         } catch (Exception e) {
             // expected
         }
     }
 
-    private static class InMemoryImageFile extends ModuleData {
-        public InMemoryImageFile(String module, String path, ModuleDataType type, String content) {
+    private static class InMemoryImageFile extends ModuleEntryImpl {
+        public InMemoryImageFile(String module, String path, ModuleEntry.Type type, String content) {
             super(module, path, type, new ByteArrayInputStream(content.getBytes()), content.getBytes().length);
         }
     }
diff --git a/jdk/test/tools/jlink/IntegrationTest.java b/jdk/test/tools/jlink/IntegrationTest.java
index 951c16cff74..e5637b421a8 100644
--- a/jdk/test/tools/jlink/IntegrationTest.java
+++ b/jdk/test/tools/jlink/IntegrationTest.java
@@ -39,7 +39,7 @@ import jdk.tools.jlink.Jlink.JlinkConfiguration;
 import jdk.tools.jlink.Jlink.PluginsConfiguration;
 import jdk.tools.jlink.builder.DefaultImageBuilder;
 import jdk.tools.jlink.plugin.ExecutableImage;
-import jdk.tools.jlink.plugin.Pool;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.plugin.PostProcessorPlugin;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 import jdk.tools.jlink.internal.plugins.DefaultCompressPlugin;
@@ -56,6 +56,8 @@ import tests.JImageGenerator;
  * @library ../lib
  * @modules java.base/jdk.internal.jimage
  *          jdk.jdeps/com.sun.tools.classfile
+ *          jdk.jlink/jdk.tools.jlink
+ *          jdk.jlink/jdk.tools.jlink.builder
  *          jdk.jlink/jdk.tools.jlink.internal
  *          jdk.jlink/jdk.tools.jlink.internal.plugins
  *          jdk.jlink/jdk.tools.jmod
@@ -88,9 +90,9 @@ public class IntegrationTest {
         }
 
         @Override
-        public Set<PluginType> getType() {
-            Set<PluginType> set = new HashSet<>();
-            set.add(CATEGORY.PROCESSOR);
+        public Set<Category> getType() {
+            Set<Category> set = new HashSet<>();
+            set.add(Category.PROCESSOR);
             return Collections.unmodifiableSet(set);
         }
 
@@ -128,18 +130,18 @@ public class IntegrationTest {
         }
 
         @Override
-        public void visit(Pool in, Pool out) {
+        public void visit(ModulePool in, ModulePool out) {
             System.err.println(NAME + index);
             ordered.add(index);
-            in.visit((file) -> {
+            in.transformAndCopy((file) -> {
                 return file;
             }, out);
         }
 
         @Override
-        public Set<PluginType> getType() {
-            Set<PluginType> set = new HashSet<>();
-            set.add(CATEGORY.TRANSFORMER);
+        public Set<Category> getType() {
+            Set<Category> set = new HashSet<>();
+            set.add(Category.TRANSFORMER);
             return Collections.unmodifiableSet(set);
         }
 
diff --git a/jdk/test/tools/jlink/JLinkOptimTest.java b/jdk/test/tools/jlink/JLinkOptimTest.java
index 82c5431f034..acc089c89c0 100644
--- a/jdk/test/tools/jlink/JLinkOptimTest.java
+++ b/jdk/test/tools/jlink/JLinkOptimTest.java
@@ -23,15 +23,15 @@ import jdk.internal.org.objectweb.asm.tree.MethodInsnNode;
 import jdk.internal.org.objectweb.asm.tree.MethodNode;
 import jdk.internal.org.objectweb.asm.tree.TryCatchBlockNode;
 import jdk.tools.jlink.internal.PluginRepository;
-import jdk.tools.jlink.internal.PoolImpl;
+import jdk.tools.jlink.internal.ModulePoolImpl;
 import jdk.tools.jlink.internal.plugins.OptimizationPlugin;
 import jdk.tools.jlink.internal.plugins.asm.AsmModulePool;
 import jdk.tools.jlink.internal.plugins.asm.AsmPlugin;
 import jdk.tools.jlink.internal.plugins.asm.AsmPools;
 import jdk.tools.jlink.internal.plugins.optim.ControlFlow;
 import jdk.tools.jlink.internal.plugins.optim.ControlFlow.Block;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 
 import tests.Helper;
 import tests.JImageGenerator;
@@ -134,9 +134,9 @@ public class JLinkOptimTest {
         }
 
         @Override
-        public Set<PluginType> getType() {
-            Set<PluginType> set = new HashSet<>();
-            set.add(CATEGORY.TRANSFORMER);
+        public Set<Category> getType() {
+            Set<Category> set = new HashSet<>();
+            set.add(Category.TRANSFORMER);
             return Collections.unmodifiableSet(set);
         }
     }
@@ -150,13 +150,13 @@ public class JLinkOptimTest {
         FileSystem fs = FileSystems.getFileSystem(URI.create("jrt:/"));
         Path root = fs.getPath("/modules/java.base");
         // Access module-info.class to be reused as fake module-info.class
-        List<ModuleData> javabaseResources = new ArrayList<>();
+        List<ModuleEntry> javabaseResources = new ArrayList<>();
         try (Stream<Path> stream = Files.walk(root)) {
             for (Iterator<Path> iterator = stream.iterator(); iterator.hasNext();) {
                 Path p = iterator.next();
                 if (Files.isRegularFile(p)) {
                     try {
-                        javabaseResources.add(Pool.newResource(p.toString().
+                        javabaseResources.add(ModuleEntry.create(p.toString().
                                 substring("/modules".length()), Files.readAllBytes(p)));
                     } catch (Exception ex) {
                         throw new RuntimeException(ex);
@@ -166,18 +166,18 @@ public class JLinkOptimTest {
         }
 
         //forName folding
-        PoolImpl pool = new PoolImpl();
+        ModulePoolImpl pool = new ModulePoolImpl();
         byte[] content = Files.readAllBytes(classes.
                 resolve("optim").resolve("ForNameTestCase.class"));
         byte[] content2 = Files.readAllBytes(classes.
                 resolve("optim").resolve("AType.class"));
         byte[] mcontent = Files.readAllBytes(classes.resolve("module-info.class"));
 
-        pool.add(Pool.newResource("/optimplugin/optim/ForNameTestCase.class", content));
-        pool.add(Pool.newResource("/optimplugin/optim/AType.class", content2));
-        pool.add(Pool.newResource("/optimplugin/module-info.class", mcontent));
+        pool.add(ModuleEntry.create("/optimplugin/optim/ForNameTestCase.class", content));
+        pool.add(ModuleEntry.create("/optimplugin/optim/AType.class", content2));
+        pool.add(ModuleEntry.create("/optimplugin/module-info.class", mcontent));
 
-        for (ModuleData r : javabaseResources) {
+        for (ModuleEntry r : javabaseResources) {
             pool.add(r);
         }
 
@@ -186,10 +186,10 @@ public class JLinkOptimTest {
         optional.put(OptimizationPlugin.NAME, OptimizationPlugin.FORNAME_REMOVAL);
         optional.put(OptimizationPlugin.LOG, "forName.log");
         plugin.configure(optional);
-        Pool out = new PoolImpl();
+        ModulePool out = new ModulePoolImpl();
         plugin.visit(pool, out);
 
-        ModuleData result = out.getContent().iterator().next();
+        ModuleEntry result = out.entries().iterator().next();
 
         ClassReader optimReader = new ClassReader(result.getBytes());
         ClassNode optimClass = new ClassNode();
diff --git a/jdk/test/tools/jlink/JLinkOptionsTest.java b/jdk/test/tools/jlink/JLinkOptionsTest.java
index 8c8d241f5b7..565c58bffa9 100644
--- a/jdk/test/tools/jlink/JLinkOptionsTest.java
+++ b/jdk/test/tools/jlink/JLinkOptionsTest.java
@@ -24,7 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import jdk.tools.jlink.plugin.Pool;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.internal.PluginRepository;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 
@@ -62,7 +62,7 @@ public class JLinkOptionsTest {
         }
 
         @Override
-        public void visit(Pool in, Pool out) {
+        public void visit(ModulePool in, ModulePool out) {
 
         }
 
diff --git a/jdk/test/tools/jlink/JLinkPostProcessingTest.java b/jdk/test/tools/jlink/JLinkPostProcessingTest.java
index b32bf207ff2..abc2b58142e 100644
--- a/jdk/test/tools/jlink/JLinkPostProcessingTest.java
+++ b/jdk/test/tools/jlink/JLinkPostProcessingTest.java
@@ -75,9 +75,9 @@ public class JLinkPostProcessingTest {
         }
 
         @Override
-        public Set<PluginType> getType() {
-            Set<PluginType> set = new HashSet<>();
-            set.add(CATEGORY.PROCESSOR);
+        public Set<Category> getType() {
+            Set<Category> set = new HashSet<>();
+            set.add(Category.PROCESSOR);
             return Collections.unmodifiableSet(set);
         }
 
diff --git a/jdk/test/tools/jlink/ResourcePoolTest.java b/jdk/test/tools/jlink/ResourcePoolTest.java
index 77a82e5c1b2..523503c996a 100644
--- a/jdk/test/tools/jlink/ResourcePoolTest.java
+++ b/jdk/test/tools/jlink/ResourcePoolTest.java
@@ -37,14 +37,14 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
-
-import jdk.tools.jlink.internal.PoolImpl;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.Module;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
-import jdk.tools.jlink.plugin.Pool.ModuleDataType;
-import jdk.tools.jlink.plugin.Pool.Visitor;
+import java.util.function.Function;
+import jdk.tools.jlink.internal.ModulePoolImpl;
+import jdk.tools.jlink.plugin.ModulePool;
+import jdk.tools.jlink.plugin.LinkModule;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 
 public class ResourcePoolTest {
 
@@ -61,54 +61,53 @@ public class ResourcePoolTest {
     private static final String SUFFIX = "END";
 
     private void checkResourceVisitor() throws Exception {
-        Pool input = new PoolImpl();
+        ModulePool input = new ModulePoolImpl();
         for (int i = 0; i < 1000; ++i) {
             String module = "/module" + (i / 10);
             String resourcePath = module + "/java/package" + i;
             byte[] bytes = resourcePath.getBytes();
-            input.add(new ModuleData(module, resourcePath,
-                    ModuleDataType.CLASS_OR_RESOURCE,
+            input.add(ModuleEntry.create(module, resourcePath,
+                    ModuleEntry.Type.CLASS_OR_RESOURCE,
                     new ByteArrayInputStream(bytes), bytes.length));
         }
-        Pool output = new PoolImpl();
+        ModulePool output = new ModulePoolImpl();
         ResourceVisitor visitor = new ResourceVisitor();
-        input.visit(visitor, output);
+        input.transformAndCopy(visitor, output);
         if (visitor.getAmountBefore() == 0) {
             throw new AssertionError("Resources not found");
         }
-        if (visitor.getAmountBefore() != input.getContent().size()) {
+        if (visitor.getAmountBefore() != input.getEntryCount()) {
             throw new AssertionError("Number of visited resources. Expected: " +
-                    visitor.getAmountBefore() + ", got: " + input.getContent().size());
+                    visitor.getAmountBefore() + ", got: " + input.getEntryCount());
         }
-        if (visitor.getAmountAfter() != output.getContent().size()) {
+        if (visitor.getAmountAfter() != output.getEntryCount()) {
             throw new AssertionError("Number of added resources. Expected: " +
-                    visitor.getAmountAfter() + ", got: " + output.getContent().size());
+                    visitor.getAmountAfter() + ", got: " + output.getEntryCount());
         }
-        for (ModuleData outResource : output.getContent()) {
+        output.entries().forEach(outResource -> {
             String path = outResource.getPath().replaceAll(SUFFIX + "$", "");
-            ModuleData inResource = input.get(path);
-            if (inResource == null) {
+            if (!input.findEntry(path).isPresent()) {
                 throw new AssertionError("Unknown resource: " + path);
             }
-        }
+        });
     }
 
-    private static class ResourceVisitor implements Visitor {
+    private static class ResourceVisitor implements Function<ModuleEntry, ModuleEntry> {
 
         private int amountBefore;
         private int amountAfter;
 
         @Override
-        public ModuleData visit(ModuleData resource) {
+        public ModuleEntry apply(ModuleEntry resource) {
             int index = ++amountBefore % 3;
             switch (index) {
                 case 0:
                     ++amountAfter;
-                    return new ModuleData(resource.getModule(), resource.getPath() + SUFFIX,
+                    return ModuleEntry.create(resource.getModule(), resource.getPath() + SUFFIX,
                             resource.getType(), resource.stream(), resource.getLength());
                 case 1:
                     ++amountAfter;
-                    return new ModuleData(resource.getModule(), resource.getPath(),
+                    return ModuleEntry.create(resource.getModule(), resource.getPath(),
                             resource.getType(), resource.stream(), resource.getLength());
             }
             return null;
@@ -133,8 +132,8 @@ public class ResourcePoolTest {
         samples.add("javax/management/ObjectName");
         test(samples, (resources, module, path) -> {
             try {
-                resources.add(new ModuleData(module, path,
-                        ModuleDataType.CLASS_OR_RESOURCE,
+                resources.add(ModuleEntry.create(module, path,
+                        ModuleEntry.Type.CLASS_OR_RESOURCE,
                         new ByteArrayInputStream(new byte[0]), 0));
             } catch (Exception ex) {
                 throw new RuntimeException(ex);
@@ -142,12 +141,12 @@ public class ResourcePoolTest {
         });
         test(samples, (resources, module, path) -> {
             try {
-                resources.add(PoolImpl.
-                        newCompressedResource(new ModuleData(module, path,
-                                ModuleDataType.CLASS_OR_RESOURCE,
+                resources.add(ModulePoolImpl.
+                        newCompressedResource(ModuleEntry.create(module, path,
+                                ModuleEntry.Type.CLASS_OR_RESOURCE,
                                 new ByteArrayInputStream(new byte[0]), 0),
                                 ByteBuffer.allocate(99), "bitcruncher", null,
-                                ((PoolImpl)resources).getStringTable(), ByteOrder.nativeOrder()));
+                                ((ModulePoolImpl)resources).getStringTable(), ByteOrder.nativeOrder()));
             } catch (Exception ex) {
                 throw new RuntimeException(ex);
             }
@@ -158,7 +157,7 @@ public class ResourcePoolTest {
         if (samples.isEmpty()) {
             throw new AssertionError("No sample to test");
         }
-        Pool resources = new PoolImpl();
+        ModulePool resources = new ModulePoolImpl();
         Set<String> modules = new HashSet<>();
         for (int i = 0; i < samples.size(); i++) {
             String module = samples.get(i);
@@ -173,70 +172,69 @@ public class ResourcePoolTest {
             i++;
             String clazz = samples.get(i);
             String path = "/" + module + "/" + clazz + ".class";
-            ModuleData res = resources.get(path);
-            checkModule(resources, res);
-            if (res == null) {
+            Optional<ModuleEntry> res = resources.findEntry(path);
+            if (!res.isPresent()) {
                 throw new AssertionError("Resource not found " + path);
             }
-            ModuleData res2 = resources.get(clazz);
-            if (res2 != null) {
+            checkModule(resources, res.get());
+            if (resources.findEntry(clazz).isPresent()) {
                 throw new AssertionError("Resource found " + clazz);
             }
         }
-        if (resources.getContent().size() != samples.size() / 2) {
+        if (resources.getEntryCount() != samples.size() / 2) {
             throw new AssertionError("Invalid number of resources");
         }
     }
 
-    private void checkModule(Pool resources, ModuleData res) {
-        Module m = resources.getModule(res.getModule());
-        if (m == null) {
+    private void checkModule(ModulePool resources, ModuleEntry res) {
+        Optional<LinkModule> optMod = resources.findModule(res.getModule());
+        if (!optMod.isPresent()) {
             throw new AssertionError("No module " + res.getModule());
         }
+        LinkModule m = optMod.get();
         if (!m.getName().equals(res.getModule())) {
             throw new AssertionError("Not right module name " + res.getModule());
         }
-        if (m.get(res.getPath()) == null) {
+        if (!m.findEntry(res.getPath()).isPresent()) {
             throw new AssertionError("resource " + res.getPath()
                     + " not in module " + m.getName());
         }
     }
 
     private void checkResourcesAfterCompression() throws Exception {
-        PoolImpl resources1 = new PoolImpl();
-        ModuleData res1 = new ModuleData("module1", "/module1/toto1",
-                ModuleDataType.CLASS_OR_RESOURCE,
+        ModulePoolImpl resources1 = new ModulePoolImpl();
+        ModuleEntry res1 = ModuleEntry.create("module1", "/module1/toto1",
+                ModuleEntry.Type.CLASS_OR_RESOURCE,
                 new ByteArrayInputStream(new byte[0]), 0);
-        ModuleData res2 = new ModuleData("module2", "/module2/toto1",
-                ModuleDataType.CLASS_OR_RESOURCE,
+        ModuleEntry res2 = ModuleEntry.create("module2", "/module2/toto1",
+                ModuleEntry.Type.CLASS_OR_RESOURCE,
                 new ByteArrayInputStream(new byte[0]), 0);
         resources1.add(res1);
         resources1.add(res2);
 
         checkResources(resources1, res1, res2);
-        Pool resources2 = new PoolImpl();
-        ModuleData res3 = new ModuleData("module2", "/module2/toto1",
-                ModuleDataType.CLASS_OR_RESOURCE,
+        ModulePool resources2 = new ModulePoolImpl();
+        ModuleEntry res3 = ModuleEntry.create("module2", "/module2/toto1",
+                ModuleEntry.Type.CLASS_OR_RESOURCE,
                 new ByteArrayInputStream(new byte[7]), 7);
         resources2.add(res3);
-        resources2.add(PoolImpl.newCompressedResource(res1,
+        resources2.add(ModulePoolImpl.newCompressedResource(res1,
                 ByteBuffer.allocate(7), "zip", null, resources1.getStringTable(),
                 ByteOrder.nativeOrder()));
         checkResources(resources2, res1, res2);
     }
 
-    private void checkResources(Pool resources, ModuleData... expected) {
-        Collection<Module> ms = resources.getModules();
+    private void checkResources(ModulePool resources, ModuleEntry... expected) {
         List<String> modules = new ArrayList();
-        for(Module m : ms) {
+        resources.modules().forEach(m -> {
             modules.add(m.getName());
-        }
-        for (ModuleData res : expected) {
+        });
+        for (ModuleEntry res : expected) {
             if (!resources.contains(res)) {
                 throw new AssertionError("Resource not found: " + res);
             }
 
-            if (resources.get(res.getPath()) == null) {
+            if (!resources.findEntry(res.getPath()).isPresent()) {
                 throw new AssertionError("Resource not found: " + res);
             }
 
@@ -244,7 +242,7 @@ public class ResourcePoolTest {
                 throw new AssertionError("Module not found: " + res.getModule());
             }
 
-            if (!resources.getContent().contains(res)) {
+            if (!resources.contains(res)) {
                 throw new AssertionError("Resources not found: " + res);
             }
 
@@ -260,17 +258,17 @@ public class ResourcePoolTest {
             throw new AssertionError("ReadOnly resources");
         }
 
-        ((PoolImpl) resources).setReadOnly();
+        ((ModulePoolImpl) resources).setReadOnly();
         try {
-            resources.add(new ModuleData("module2",  "/module2/toto1",
-                    ModuleDataType.CLASS_OR_RESOURCE, new ByteArrayInputStream(new byte[0]), 0));
-            throw new AssertionError("Pool is read-only, but an exception is not thrown");
+            resources.add(ModuleEntry.create("module2",  "/module2/toto1",
+                    ModuleEntry.Type.CLASS_OR_RESOURCE, new ByteArrayInputStream(new byte[0]), 0));
+            throw new AssertionError("ModulePool is read-only, but an exception is not thrown");
         } catch (Exception ex) {
             // Expected
         }
     }
 
     interface ResourceAdder {
-        void add(Pool resources, String module, String path);
+        void add(ModulePool resources, String module, String path);
     }
 }
diff --git a/jdk/test/tools/jlink/SecurityTest.java b/jdk/test/tools/jlink/SecurityTest.java
index 9497d6f3f34..dbf593bccc0 100644
--- a/jdk/test/tools/jlink/SecurityTest.java
+++ b/jdk/test/tools/jlink/SecurityTest.java
@@ -25,6 +25,7 @@
  * @test
  * @summary Test JlinkPermission
  * @author Jean-Francois Denise
+ * @modules jdk.jlink/jdk.tools.jlink
  * @run main/othervm SecurityTest
  */
 
diff --git a/jdk/test/tools/jlink/asmplugin/AddForgetResourcesTest.java b/jdk/test/tools/jlink/asmplugin/AddForgetResourcesTest.java
index 6a414b57d63..4385534e07f 100644
--- a/jdk/test/tools/jlink/asmplugin/AddForgetResourcesTest.java
+++ b/jdk/test/tools/jlink/asmplugin/AddForgetResourcesTest.java
@@ -55,8 +55,8 @@ import jdk.tools.jlink.internal.plugins.asm.AsmPool.ResourceFile;
 import jdk.tools.jlink.internal.plugins.asm.AsmPool.WritableClassPool;
 import jdk.tools.jlink.internal.plugins.asm.AsmPool.WritableResourcePool;
 import jdk.tools.jlink.internal.plugins.asm.AsmPools;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 
 public class AddForgetResourcesTest extends AsmPluginTestBase {
 
@@ -82,7 +82,7 @@ public class AddForgetResourcesTest extends AsmPluginTestBase {
                 new ComboPlugin()
         };
         for (TestPlugin p : plugins) {
-            Pool out = p.visit(getPool());
+            ModulePool out = p.visit(getPool());
             p.test(getPool(), out);
         }
     }
@@ -124,7 +124,7 @@ public class AddForgetResourcesTest extends AsmPluginTestBase {
             AsmGlobalPool globalPool = pools.getGlobalPool();
             WritableClassPool transformedClasses = globalPool.getTransformedClasses();
             expected = globalPool.getClasses().size();
-            for (ModuleData res : globalPool.getClasses()) {
+            for (ModuleEntry res : globalPool.getClasses()) {
                 ClassReader reader = globalPool.getClassReader(res);
                 String className = reader.getClassName();
                 if (!className.endsWith("module-info")) {
@@ -137,14 +137,14 @@ public class AddForgetResourcesTest extends AsmPluginTestBase {
         }
 
         @Override
-        public void test(Pool inResources, Pool outResources) {
-            Collection<ModuleData> inClasses = extractClasses(inResources);
-            Collection<ModuleData> outClasses = extractClasses(outResources);
+        public void test(ModulePool inResources, ModulePool outResources) {
+            Collection<ModuleEntry> inClasses = extractClasses(inResources);
+            Collection<ModuleEntry> outClasses = extractClasses(outResources);
             if (expected != outClasses.size()) {
                 throw new AssertionError("Classes were not added. Expected: " + expected
                         + ", got: " + outClasses.size());
             }
-            for (ModuleData in : inClasses) {
+            for (ModuleEntry in : inClasses) {
                 String path = in.getPath();
                 if (!outClasses.contains(in)) {
                     throw new AssertionError("Class not found: " + path);
@@ -153,7 +153,7 @@ public class AddForgetResourcesTest extends AsmPluginTestBase {
                     continue;
                 }
                 String modifiedPath = path.replace(".class", SUFFIX + ".class");
-                if (!outClasses.contains(Pool.newResource(modifiedPath, new byte[0]))) {
+                if (!outClasses.contains(ModuleEntry.create(modifiedPath, new byte[0]))) {
                     throw new AssertionError("Class not found: " + modifiedPath);
                 }
             }
@@ -166,7 +166,7 @@ public class AddForgetResourcesTest extends AsmPluginTestBase {
         public void visit() {
             AsmPools pools = getPools();
             AsmGlobalPool globalPool = pools.getGlobalPool();
-            for (ModuleData res : globalPool.getResourceFiles()) {
+            for (ModuleEntry res : globalPool.getResourceFiles()) {
                 String path = res.getPath();
                 String moduleName = getModule(path);
                 AsmModulePool modulePool = pools.getModulePool(moduleName);
@@ -177,20 +177,20 @@ public class AddForgetResourcesTest extends AsmPluginTestBase {
         }
 
         @Override
-        public void test(Pool in, Pool out) throws Exception {
-            Collection<ModuleData> inResources = extractResources(in);
-            Collection<ModuleData> outResources = extractResources(out);
+        public void test(ModulePool in, ModulePool out) throws Exception {
+            Collection<ModuleEntry> inResources = extractResources(in);
+            Collection<ModuleEntry> outResources = extractResources(out);
             if (2 * inResources.size() != outResources.size()) {
                 throw new AssertionError("Classes were not added. Expected: " + (2 * inResources.size())
                         + ", got: " + outResources.size());
             }
-            for (ModuleData r : inResources) {
+            for (ModuleEntry r : inResources) {
                 String path = r.getPath();
                 if (!outResources.contains(r)) {
                     throw new AssertionError("Class not found: " + path);
                 }
                 String modifiedPath = path + SUFFIX;
-                if (!outResources.contains(Pool.newResource(modifiedPath, new byte[0]))) {
+                if (!outResources.contains(ModuleEntry.create(modifiedPath, new byte[0]))) {
                     throw new AssertionError("Class not found: " + modifiedPath);
                 }
             }
@@ -204,7 +204,7 @@ public class AddForgetResourcesTest extends AsmPluginTestBase {
             AsmPools pools = getPools();
             AsmGlobalPool globalPool = pools.getGlobalPool();
             WritableClassPool transformedClasses = globalPool.getTransformedClasses();
-            for (ModuleData res : globalPool.getClasses()) {
+            for (ModuleEntry res : globalPool.getClasses()) {
                 ClassReader reader = globalPool.getClassReader(res);
                 ClassWriter writer = new ClassWriter(reader, ClassWriter.COMPUTE_FRAMES);
                 reader.accept(new AddMethodClassVisitor(writer), ClassReader.EXPAND_FRAMES);
@@ -213,14 +213,14 @@ public class AddForgetResourcesTest extends AsmPluginTestBase {
         }
 
         @Override
-        public void test(Pool inResources, Pool outResources) throws Exception {
-            Collection<ModuleData> inClasses = extractClasses(inResources);
-            Collection<ModuleData> outClasses = extractClasses(outResources);
+        public void test(ModulePool inResources, ModulePool outResources) throws Exception {
+            Collection<ModuleEntry> inClasses = extractClasses(inResources);
+            Collection<ModuleEntry> outClasses = extractClasses(outResources);
             if (inClasses.size() != outClasses.size()) {
                 throw new AssertionError("Number of classes. Expected: " + (inClasses.size())
                         + ", got: " + outClasses.size());
             }
-            for (ModuleData out : outClasses) {
+            for (ModuleEntry out : outClasses) {
                 String path = out.getPath();
                 if (!inClasses.contains(out)) {
                     throw new AssertionError("Class not found: " + path);
@@ -248,7 +248,7 @@ public class AddForgetResourcesTest extends AsmPluginTestBase {
         public void visit() {
             AsmPools pools = getPools();
             AsmGlobalPool globalPool = pools.getGlobalPool();
-            for (ModuleData res : globalPool.getResourceFiles()) {
+            for (ModuleEntry res : globalPool.getResourceFiles()) {
                 String path = res.getPath();
                 AsmModulePool modulePool = pools.getModulePool(getModule(path));
                 modulePool.getTransformedResourceFiles().addResourceFile(new ResourceFile(removeModule(path),
@@ -257,14 +257,14 @@ public class AddForgetResourcesTest extends AsmPluginTestBase {
         }
 
         @Override
-        public void test(Pool in, Pool out) throws Exception {
-            Collection<ModuleData> inResources = extractResources(in);
-            Collection<ModuleData> outResources = extractResources(out);
+        public void test(ModulePool in, ModulePool out) throws Exception {
+            Collection<ModuleEntry> inResources = extractResources(in);
+            Collection<ModuleEntry> outResources = extractResources(out);
             if (inResources.size() != outResources.size()) {
                 throw new AssertionError("Number of resources. Expected: " + inResources.size()
                         + ", got: " + outResources.size());
             }
-            for (ModuleData r : outResources) {
+            for (ModuleEntry r : outResources) {
                 String path = r.getPath();
                 if (!inResources.contains(r)) {
                     throw new AssertionError("Resource not found: " + path);
@@ -287,7 +287,7 @@ public class AddForgetResourcesTest extends AsmPluginTestBase {
             AsmGlobalPool globalPool = pools.getGlobalPool();
             WritableClassPool transformedClasses = globalPool.getTransformedClasses();
             int i = 0;
-            for (ModuleData res : globalPool.getClasses()) {
+            for (ModuleEntry res : globalPool.getClasses()) {
                 String path = removeModule(res.getPath());
                 String className = path.replace(".class", "");
                 if ((i & 1) == 0 && !className.endsWith("module-info")) {
@@ -300,8 +300,8 @@ public class AddForgetResourcesTest extends AsmPluginTestBase {
         }
 
         @Override
-        public void test(Pool inResources, Pool outResources) throws Exception {
-            Collection<ModuleData> outClasses = extractClasses(outResources);
+        public void test(ModulePool inResources, ModulePool outResources) throws Exception {
+            Collection<ModuleEntry> outClasses = extractClasses(outResources);
             if (expected != outClasses.size()) {
                 throw new AssertionError("Number of classes. Expected: " + expected +
                         ", got: " + outClasses.size());
@@ -318,7 +318,7 @@ public class AddForgetResourcesTest extends AsmPluginTestBase {
             AsmPools pools = getPools();
             AsmGlobalPool globalPool = pools.getGlobalPool();
             int i = 0;
-            for (ModuleData res : globalPool.getResourceFiles()) {
+            for (ModuleEntry res : globalPool.getResourceFiles()) {
                 String path = res.getPath();
                 if (!path.contains("META-INF/services")) {
                     if ((i & 1) == 0) {
@@ -335,8 +335,8 @@ public class AddForgetResourcesTest extends AsmPluginTestBase {
         }
 
         @Override
-        public void test(Pool in, Pool out) throws Exception {
-            Collection<ModuleData> outResources = extractResources(out);
+        public void test(ModulePool in, ModulePool out) throws Exception {
+            Collection<ModuleEntry> outResources = extractResources(out);
             if (expectedAmount != outResources.size()) {
                 throw new AssertionError("Number of classes. Expected: " + expectedAmount
                         + ", got: " + outResources.size());
@@ -354,7 +354,7 @@ public class AddForgetResourcesTest extends AsmPluginTestBase {
             AsmGlobalPool globalPool = pools.getGlobalPool();
             WritableClassPool transformedClasses = globalPool.getTransformedClasses();
             int i = 0;
-            for (ModuleData res : globalPool.getClasses()) {
+            for (ModuleEntry res : globalPool.getClasses()) {
                 ClassReader reader = globalPool.getClassReader(res);
                 String className = reader.getClassName();
                 ClassWriter writer = new ClassWriter(reader, ClassWriter.COMPUTE_FRAMES);
@@ -374,8 +374,8 @@ public class AddForgetResourcesTest extends AsmPluginTestBase {
         }
 
         @Override
-        public void test(Pool inResources, Pool outResources) throws Exception {
-            Collection<ModuleData> outClasses = extractClasses(outResources);
+        public void test(ModulePool inResources, ModulePool outResources) throws Exception {
+            Collection<ModuleEntry> outClasses = extractClasses(outResources);
             if (expected != outClasses.size()) {
                 throw new AssertionError("Number of classes. Expected: " + expected
                         + ", got: " + outClasses.size());
@@ -392,7 +392,7 @@ public class AddForgetResourcesTest extends AsmPluginTestBase {
             AsmPools pools = getPools();
             AsmGlobalPool globalPool = pools.getGlobalPool();
             int i = 0;
-            for (ModuleData res : globalPool.getResourceFiles()) {
+            for (ModuleEntry res : globalPool.getResourceFiles()) {
                 String path = res.getPath();
                 String moduleName = getModule(path);
                 if (!path.contains("META-INF")) {
@@ -412,8 +412,8 @@ public class AddForgetResourcesTest extends AsmPluginTestBase {
         }
 
         @Override
-        public void test(Pool inResources, Pool out) throws Exception {
-            Collection<ModuleData> outResources = extractResources(out);
+        public void test(ModulePool inResources, ModulePool out) throws Exception {
+            Collection<ModuleEntry> outResources = extractResources(out);
             if (expectedAmount != outResources.size()) {
                 throw new AssertionError("Number of classes. Expected: " + expectedAmount
                         + ", got: " + outResources.size());
@@ -446,7 +446,7 @@ public class AddForgetResourcesTest extends AsmPluginTestBase {
         }
 
         @Override
-        public void test(Pool inResources, Pool outResources) throws Exception {
+        public void test(ModulePool inResources, ModulePool outResources) throws Exception {
             if (!isVisitCalled()) {
                 throw new AssertionError("Resources not visited");
             }
@@ -455,7 +455,7 @@ public class AddForgetResourcesTest extends AsmPluginTestBase {
                 throw new AssertionError("Number of transformed classes not equal to expected");
             }
             // Check that only renamed classes and resource files are in the result.
-            for (ModuleData r : outResources.getContent()) {
+            outResources.entries().forEach(r -> {
                 String resourceName = r.getPath();
                 if (resourceName.endsWith(".class") && !resourceName.endsWith("module-info.class")) {
                     if (!resourceName.endsWith(SUFFIX + ".class")) {
@@ -467,7 +467,7 @@ public class AddForgetResourcesTest extends AsmPluginTestBase {
                         throw new AssertionError("Resource file not renamed " + resourceName);
                     }
                 }
-            }
+            });
         }
 
         private void renameResources() throws IOException {
@@ -476,7 +476,7 @@ public class AddForgetResourcesTest extends AsmPluginTestBase {
             for (Map.Entry<String, List<String>> mod : MODULES.entrySet()) {
                 String moduleName = mod.getKey();
                 AsmModulePool modulePool = pools.getModulePool(moduleName);
-                for (ModuleData res : modulePool.getResourceFiles()) {
+                for (ModuleEntry res : modulePool.getResourceFiles()) {
                     ResourceFile resFile = modulePool.getResourceFile(res);
                     if (resFile.getPath().startsWith("META-INF/services/")) {
                         String newContent = new String(resFile.getContent()) + SUFFIX;
@@ -492,7 +492,7 @@ public class AddForgetResourcesTest extends AsmPluginTestBase {
             AsmPools pools = getPools();
             AsmGlobalPool globalPool = pools.getGlobalPool();
             WritableClassPool transformedClasses = globalPool.getTransformedClasses();
-            for (ModuleData res : globalPool.getClasses()) {
+            for (ModuleEntry res : globalPool.getClasses()) {
                 if (res.getPath().endsWith("module-info.class")) {
                     continue;
                 }
diff --git a/jdk/test/tools/jlink/asmplugin/AsmPluginTestBase.java b/jdk/test/tools/jlink/asmplugin/AsmPluginTestBase.java
index d5c035562fa..c51419e682c 100644
--- a/jdk/test/tools/jlink/asmplugin/AsmPluginTestBase.java
+++ b/jdk/test/tools/jlink/asmplugin/AsmPluginTestBase.java
@@ -38,23 +38,23 @@ import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import jdk.tools.jlink.internal.PoolImpl;
+import jdk.tools.jlink.internal.ModulePoolImpl;
 import jdk.tools.jlink.internal.StringTable;
 
 import jdk.tools.jlink.internal.plugins.asm.AsmPlugin;
 import jdk.tools.jlink.internal.plugins.asm.AsmPools;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 
 public abstract class AsmPluginTestBase {
 
     protected static final String TEST_MODULE = "jlink.test";
     protected static final Map<String, List<String>> MODULES;
 
-    private static final Predicate<ModuleData> isClass = r -> r.getPath().endsWith(".class");
+    private static final Predicate<ModuleEntry> isClass = r -> r.getPath().endsWith(".class");
     private final List<String> classes;
     private final List<String> resources;
-    private final Pool pool;
+    private final ModulePool pool;
 
     static {
         Map<String, List<String>> map = new HashMap<>();
@@ -75,7 +75,7 @@ public abstract class AsmPluginTestBase {
             List<String> classes = new ArrayList<>();
             List<String> resources = new ArrayList<>();
 
-            pool = new PoolImpl();
+            pool = new ModulePoolImpl();
 
             FileSystem fs = FileSystems.getFileSystem(URI.create("jrt:/"));
             Path root = fs.getPath("/modules");
@@ -100,7 +100,7 @@ public abstract class AsmPluginTestBase {
                                     MODULES.get(module).add(toResourceFile(p));
                                 }
                                 resources.add(toPath(p.toString()));
-                                ModuleData res = Pool.newResource(toPath(p.toString()), content);
+                                ModuleEntry res = ModuleEntry.create(toPath(p.toString()), content);
                                 pool.add(res);
                             } catch (Exception ex) {
                                 throw new RuntimeException(ex);
@@ -110,17 +110,17 @@ public abstract class AsmPluginTestBase {
                 }
             }
             // There is more than 10 classes in java.base...
-            if (classes.size() < 10 || pool.getContent().size() < 10) {
+            if (classes.size() < 10 || pool.getEntryCount() < 10) {
                 throw new AssertionError("Not expected resource or class number");
             }
 
             //Add a fake resource file
             String content = "java.lang.Object";
             String path = "META-INF/services/com.foo.BarProvider";
-            ModuleData resFile = Pool.newResource("/" + TEST_MODULE + "/" +
+            ModuleEntry resFile = ModuleEntry.create("/" + TEST_MODULE + "/" +
                     path, content.getBytes());
             pool.add(resFile);
-            ModuleData fakeInfoFile = Pool.newResource("/" + TEST_MODULE
+            ModuleEntry fakeInfoFile = ModuleEntry.create("/" + TEST_MODULE
                     + "/module-info.class", moduleInfos.get(0));
             pool.add(fakeInfoFile);
             MODULES.get(TEST_MODULE).add(path);
@@ -144,20 +144,20 @@ public abstract class AsmPluginTestBase {
         return resources;
     }
 
-    public Pool getPool() {
+    public ModulePool getPool() {
         return pool;
     }
 
     public abstract void test() throws Exception;
 
-    public Collection<ModuleData> extractClasses(Pool pool) {
-        return pool.getContent().stream()
+    public Collection<ModuleEntry> extractClasses(ModulePool pool) {
+        return pool.entries()
                 .filter(isClass)
                 .collect(Collectors.toSet());
     }
 
-    public Collection<ModuleData> extractResources(Pool pool) {
-        return pool.getContent().stream()
+    public Collection<ModuleEntry> extractResources(ModulePool pool) {
+        return pool.entries()
                 .filter(isClass.negate())
                 .collect(Collectors.toSet());
     }
@@ -209,9 +209,9 @@ public abstract class AsmPluginTestBase {
             return pools != null;
         }
 
-        public Pool visit(Pool inResources) throws IOException {
+        public ModulePool visit(ModulePool inResources) throws IOException {
             try {
-                Pool outResources = new PoolImpl(inResources.getByteOrder(), new StringTable() {
+                ModulePool outResources = new ModulePoolImpl(inResources.getByteOrder(), new StringTable() {
                     @Override
                     public int addString(String str) {
                         return -1;
@@ -239,7 +239,7 @@ public abstract class AsmPluginTestBase {
         }
 
         public abstract void visit();
-        public abstract void test(Pool inResources, Pool outResources) throws Exception;
+        public abstract void test(ModulePool inResources, ModulePool outResources) throws Exception;
 
         @Override
         public String getName() {
diff --git a/jdk/test/tools/jlink/asmplugin/BasicTest.java b/jdk/test/tools/jlink/asmplugin/BasicTest.java
index 0c42d4cfb99..afc5fd5f634 100644
--- a/jdk/test/tools/jlink/asmplugin/BasicTest.java
+++ b/jdk/test/tools/jlink/asmplugin/BasicTest.java
@@ -45,8 +45,8 @@ import java.util.logging.Logger;
 import jdk.internal.org.objectweb.asm.ClassReader;
 import jdk.tools.jlink.internal.plugins.asm.AsmModulePool;
 import jdk.tools.jlink.internal.plugins.asm.AsmPool;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 
 public class BasicTest extends AsmPluginTestBase {
 
@@ -61,7 +61,7 @@ public class BasicTest extends AsmPluginTestBase {
     @Override
     public void test() throws Exception {
         BasicPlugin basicPlugin = new BasicPlugin(getClasses());
-        Pool res = basicPlugin.visit(getPool());
+        ModulePool res = basicPlugin.visit(getPool());
         basicPlugin.test(getPool(), res);
     }
 
@@ -107,13 +107,13 @@ public class BasicTest extends AsmPluginTestBase {
         }
 
         @Override
-        public void test(Pool inResources, Pool outResources) throws Exception {
+        public void test(ModulePool inResources, ModulePool outResources) throws Exception {
             if (!isVisitCalled()) {
                 throw new AssertionError("Resources not visited");
             }
-            if (inResources.getContent().size() != outResources.getContent().size()) {
-                throw new AssertionError("Input size " + inResources.getContent().size() +
-                        " != to " + outResources.getContent().size());
+            if (inResources.getEntryCount() != outResources.getEntryCount()) {
+                throw new AssertionError("Input size " + inResources.getEntryCount() +
+                        " != to " + outResources.getEntryCount());
             }
         }
 
@@ -142,7 +142,7 @@ public class BasicTest extends AsmPluginTestBase {
 
         private void testPools() throws IOException {
             Set<String> remain = new HashSet<>(classes);
-            for (ModuleData res : getPools().getGlobalPool().getClasses()) {
+            for (ModuleEntry res : getPools().getGlobalPool().getClasses()) {
                 ClassReader reader = getPools().getGlobalPool().getClassReader(res);
                 String className = reader.getClassName();
                 // Wrong naming of module-info.class in ASM
diff --git a/jdk/test/tools/jlink/asmplugin/IdentityPluginTest.java b/jdk/test/tools/jlink/asmplugin/IdentityPluginTest.java
index ceb2e50f9b9..416d3581552 100644
--- a/jdk/test/tools/jlink/asmplugin/IdentityPluginTest.java
+++ b/jdk/test/tools/jlink/asmplugin/IdentityPluginTest.java
@@ -35,14 +35,15 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 
 import jdk.internal.org.objectweb.asm.ClassReader;
 import jdk.internal.org.objectweb.asm.ClassVisitor;
 import jdk.internal.org.objectweb.asm.ClassWriter;
 import jdk.internal.org.objectweb.asm.Opcodes;
 import jdk.tools.jlink.internal.plugins.asm.AsmPool.WritableClassPool;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 
 public class IdentityPluginTest extends AsmPluginTestBase {
 
@@ -56,7 +57,7 @@ public class IdentityPluginTest extends AsmPluginTestBase {
 
     public void test() throws Exception {
         IdentityPlugin asm = new IdentityPlugin();
-        Pool resourcePool = asm.visit(getPool());
+        ModulePool resourcePool = asm.visit(getPool());
         asm.test(getPool(), resourcePool);
     }
 
@@ -64,7 +65,7 @@ public class IdentityPluginTest extends AsmPluginTestBase {
 
         @Override
         public void visit() {
-            for (ModuleData res : getPools().getGlobalPool().getClasses()) {
+            for (ModuleEntry res : getPools().getGlobalPool().getClasses()) {
                 if (res.getPath().endsWith("module-info.class")) {
                     continue;
                 }
@@ -77,7 +78,7 @@ public class IdentityPluginTest extends AsmPluginTestBase {
         }
 
         @Override
-        public void test(Pool inResources, Pool outResources) throws IOException {
+        public void test(ModulePool inResources, ModulePool outResources) throws IOException {
             if (outResources.isEmpty()) {
                 throw new AssertionError("Empty result");
             }
@@ -93,13 +94,17 @@ public class IdentityPluginTest extends AsmPluginTestBase {
                     throw new AssertionError("Class not transformed " + className);
                 }
             }
-            for (ModuleData r : outResources.getContent()) {
+            outResources.entries().forEach(r -> {
                 if (r.getPath().endsWith(".class") && !r.getPath().endsWith("module-info.class")) {
-                    ClassReader reader = new ClassReader(new ByteArrayInputStream(r.getBytes()));
-                    ClassWriter w = new ClassWriter(reader, ClassWriter.COMPUTE_FRAMES);
-                    reader.accept(w, ClassReader.EXPAND_FRAMES);
+                    try {
+                        ClassReader reader = new ClassReader(new ByteArrayInputStream(r.getBytes()));
+                        ClassWriter w = new ClassWriter(reader, ClassWriter.COMPUTE_FRAMES);
+                        reader.accept(w, ClassReader.EXPAND_FRAMES);
+                    } catch (IOException exp) {
+                        throw new UncheckedIOException(exp);
+                    }
                 }
-            }
+            });
         }
 
         @Override
diff --git a/jdk/test/tools/jlink/asmplugin/NegativeTest.java b/jdk/test/tools/jlink/asmplugin/NegativeTest.java
index f95b7c62399..6263fcaaa4a 100644
--- a/jdk/test/tools/jlink/asmplugin/NegativeTest.java
+++ b/jdk/test/tools/jlink/asmplugin/NegativeTest.java
@@ -43,7 +43,7 @@ import jdk.internal.org.objectweb.asm.ClassVisitor;
 import jdk.internal.org.objectweb.asm.ClassWriter;
 import jdk.internal.org.objectweb.asm.Opcodes;
 import jdk.tools.jlink.plugin.Plugin;
-import jdk.tools.jlink.internal.PoolImpl;
+import jdk.tools.jlink.internal.ModulePoolImpl;
 import jdk.tools.jlink.internal.StringTable;
 import jdk.tools.jlink.internal.plugins.asm.AsmGlobalPool;
 import jdk.tools.jlink.internal.plugins.asm.AsmModulePool;
@@ -51,7 +51,7 @@ import jdk.tools.jlink.internal.plugins.asm.AsmPlugin;
 import jdk.tools.jlink.internal.plugins.asm.AsmPool.ResourceFile;
 import jdk.tools.jlink.internal.plugins.asm.AsmPools;
 import jdk.tools.jlink.plugin.PluginException;
-import jdk.tools.jlink.plugin.Pool;
+import jdk.tools.jlink.plugin.ModulePool;
 
 public class NegativeTest extends AsmPluginTestBase {
     public static void main(String[] args) throws Exception {
@@ -102,7 +102,7 @@ public class NegativeTest extends AsmPluginTestBase {
                 }
             }
         };
-        Pool resources = new PoolImpl(ByteOrder.BIG_ENDIAN, new StringTable() {
+        ModulePool resources = new ModulePoolImpl(ByteOrder.BIG_ENDIAN, new StringTable() {
             @Override
             public int addString(String str) {
                 return -1;
@@ -136,7 +136,7 @@ public class NegativeTest extends AsmPluginTestBase {
                 action(() -> pools.fillOutputResources(null), "Output resource is null", NullPointerException.class);
             }
         };
-        Pool resources = new PoolImpl(ByteOrder.BIG_ENDIAN, new StringTable() {
+        ModulePool resources = new ModulePoolImpl(ByteOrder.BIG_ENDIAN, new StringTable() {
             @Override
             public int addString(String str) {
                 return -1;
diff --git a/jdk/test/tools/jlink/asmplugin/PackageMappingTest.java b/jdk/test/tools/jlink/asmplugin/PackageMappingTest.java
index 9453ac5f917..bd0a8fdbf4d 100644
--- a/jdk/test/tools/jlink/asmplugin/PackageMappingTest.java
+++ b/jdk/test/tools/jlink/asmplugin/PackageMappingTest.java
@@ -48,8 +48,8 @@ import jdk.tools.jlink.internal.plugins.asm.AsmModulePool;
 import jdk.tools.jlink.internal.plugins.asm.AsmPool.ResourceFile;
 import jdk.tools.jlink.internal.plugins.asm.AsmPool.WritableResourcePool;
 import jdk.tools.jlink.plugin.PluginException;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 
 public class PackageMappingTest extends AsmPluginTestBase {
 
@@ -72,7 +72,7 @@ public class PackageMappingTest extends AsmPluginTestBase {
             new PackageMappingPlugin(newFiles, true)
         };
         for (TestPlugin p : plugins) {
-            Pool pool = p.visit(getPool());
+            ModulePool pool = p.visit(getPool());
             p.test(getPool(), pool);
         }
     }
@@ -105,12 +105,12 @@ public class PackageMappingTest extends AsmPluginTestBase {
         }
 
         @Override
-        public void test(Pool inResources, Pool outResources) {
+        public void test(ModulePool inResources, ModulePool outResources) {
             Set<String> in = getPools().getGlobalPool().getResourceFiles().stream()
-                    .map(ModuleData::getPath)
+                    .map(ModuleEntry::getPath)
                     .collect(Collectors.toSet());
             Set<String> out = extractResources(outResources).stream()
-                    .map(ModuleData::getPath)
+                    .map(ModuleEntry::getPath)
                     .collect(Collectors.toSet());
             in.addAll(PackageMappingTest.this.newFiles);
             if (!Objects.equals(in, out)) {
diff --git a/jdk/test/tools/jlink/asmplugin/SortingTest.java b/jdk/test/tools/jlink/asmplugin/SortingTest.java
index 0fc4c7a6854..26974b3b065 100644
--- a/jdk/test/tools/jlink/asmplugin/SortingTest.java
+++ b/jdk/test/tools/jlink/asmplugin/SortingTest.java
@@ -35,12 +35,13 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import jdk.tools.jlink.internal.plugins.asm.AsmModulePool;
 import jdk.tools.jlink.plugin.PluginException;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 
 public class SortingTest extends AsmPluginTestBase {
 
@@ -66,7 +67,7 @@ public class SortingTest extends AsmPluginTestBase {
         List<String> sorted = new ArrayList<>(getResources());
         sorted.sort(null);
         ClassSorterPlugin sorterPlugin = new ClassSorterPlugin(sorted);
-        Pool resourcePool = sorterPlugin.visit(getPool());
+        ModulePool resourcePool = sorterPlugin.visit(getPool());
         sorterPlugin.test(getPool(), resourcePool);
     }
 
@@ -78,7 +79,7 @@ public class SortingTest extends AsmPluginTestBase {
         List<String> sorted = new ArrayList<>(getResources());
         sorted.sort((s1, s2) -> -getModuleName(s1).compareTo(getModuleName(s2)));
         ModuleSorterPlugin sorterPlugin = new ModuleSorterPlugin();
-        Pool resourcePool = sorterPlugin.visit(getPool());
+        ModulePool resourcePool = sorterPlugin.visit(getPool());
         sorterPlugin.test(getPool(), resourcePool);
     }
 
@@ -88,8 +89,8 @@ public class SortingTest extends AsmPluginTestBase {
         public void visit() {
             for (AsmModulePool modulePool : getPools().getModulePools()) {
                 modulePool.setSorter(resources -> {
-                    List<String> sort = resources.getContent().stream()
-                            .map(ModuleData::getPath)
+                    List<String> sort = resources.entries()
+                            .map(ModuleEntry::getPath)
                             .collect(Collectors.toList());
                     sort.sort(null);
                     return sort;
@@ -102,21 +103,21 @@ public class SortingTest extends AsmPluginTestBase {
         }
 
         @Override
-        public void test(Pool inResources, Pool outResources) throws Exception {
+        public void test(ModulePool inResources, ModulePool outResources) throws Exception {
             if (!isVisitCalled()) {
                 throw new AssertionError("Resources not visited");
             }
-            List<String> sortedResourcePaths = outResources.getContent().stream()
-                    .map(ModuleData::getPath)
+            List<String> sortedResourcePaths = outResources.entries()
+                    .map(ModuleEntry::getPath)
                     .collect(Collectors.toList());
 
             List<String> defaultResourceOrder = new ArrayList<>();
-            for (ModuleData r : inResources.getContent()) {
-                if (!inResources.getContent().contains(r)) {
+            inResources.entries().forEach(r -> {
+                if (!inResources.contains(r)) {
                     throw new AssertionError("Resource " + r.getPath() + " not in result pool");
                 }
                 defaultResourceOrder.add(r.getPath());
-            }
+            });
             // Check that default sorting is not equal to sorted one
             if (defaultResourceOrder.equals(sortedResourcePaths)) {
                 throw new AssertionError("Sorting not applied, default ordering");
@@ -147,27 +148,28 @@ public class SortingTest extends AsmPluginTestBase {
         public void visit() {
             getPools().getGlobalPool().setSorter(
                     (resources) -> expectedClassesOrder.stream()
-                            .map(resources::get)
-                            .map(ModuleData::getPath)
+                            .map(resources::findEntry)
+                            .map(Optional::get)
+                            .map(ModuleEntry::getPath)
                             .collect(Collectors.toList()));
         }
 
         @Override
-        public void test(Pool inResources, Pool outResources) throws Exception {
+        public void test(ModulePool inResources, ModulePool outResources) throws Exception {
             if (!isVisitCalled()) {
                 throw new AssertionError("Resources not visited");
             }
-            List<String> sortedResourcePaths = outResources.getContent().stream()
-                    .map(ModuleData::getPath)
+            List<String> sortedResourcePaths = outResources.entries()
+                    .map(ModuleEntry::getPath)
                     .collect(Collectors.toList());
 
             List<String> defaultResourceOrder = new ArrayList<>();
-            for (ModuleData r : getPool().getContent()) {
-                if (!getPool().getContent().contains(r)) {
+            getPool().entries().forEach(r -> {
+                if (!getPool().contains(r)) {
                     throw new AssertionError("Resource " + r.getPath() + " not in result pool");
                 }
                 defaultResourceOrder.add(r.getPath());
-            }
+            });
             // Check that default sorting is not equal to sorted one
             if (defaultResourceOrder.equals(sortedResourcePaths)) {
                 throw new AssertionError("Sorting not applied, default ordering");
diff --git a/jdk/test/tools/jlink/asmplugin/VisitorTest.java b/jdk/test/tools/jlink/asmplugin/VisitorTest.java
index 1b278a8bd48..500d415bc50 100644
--- a/jdk/test/tools/jlink/asmplugin/VisitorTest.java
+++ b/jdk/test/tools/jlink/asmplugin/VisitorTest.java
@@ -46,8 +46,8 @@ import jdk.tools.jlink.internal.plugins.asm.AsmPool.ClassReaderVisitor;
 import jdk.tools.jlink.internal.plugins.asm.AsmPool.ResourceFile;
 import jdk.tools.jlink.internal.plugins.asm.AsmPool.ResourceFileVisitor;
 import jdk.tools.jlink.internal.plugins.asm.AsmPools;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 
 public class VisitorTest extends AsmPluginTestBase {
 
@@ -69,7 +69,7 @@ public class VisitorTest extends AsmPluginTestBase {
         };
         for (TestPlugin p : plugins) {
             System.err.println("Testing: " + p.getName());
-            Pool out = p.visit(getPool());
+            ModulePool out = p.visit(getPool());
             p.test(getPool(), out);
         }
     }
@@ -149,15 +149,15 @@ public class VisitorTest extends AsmPluginTestBase {
         }
 
         @Override
-        public void test(Pool in, Pool out) throws Exception {
-            Collection<ModuleData> inClasses = getPool.apply(getPools()).getClasses();
+        public void test(ModulePool in, ModulePool out) throws Exception {
+            Collection<ModuleEntry> inClasses = getPool.apply(getPools()).getClasses();
             if (inClasses.size() != classReaderVisitor.getAmount()) {
                 throw new AssertionError("Testing " + name + ". Number of visited classes. Expected: " +
                         inClasses.size() + ", got: " + classReaderVisitor.getAmount());
             }
-            Collection<ModuleData> outClasses = extractClasses(out);
+            Collection<ModuleEntry> outClasses = extractClasses(out);
             int changedClasses = 0;
-            for (ModuleData r : outClasses) {
+            for (ModuleEntry r : outClasses) {
                 if (r.getPath().endsWith("Changed.class")) {
                     ++changedClasses;
                 }
@@ -192,15 +192,15 @@ public class VisitorTest extends AsmPluginTestBase {
         }
 
         @Override
-        public void test(Pool in, Pool out) throws Exception {
-            Collection<ModuleData> inResources = getPool.apply(getPools()).getResourceFiles();
+        public void test(ModulePool in, ModulePool out) throws Exception {
+            Collection<ModuleEntry> inResources = getPool.apply(getPools()).getResourceFiles();
             if (inResources.size() != resourceFileVisitor.getAmount()) {
                 throw new AssertionError("Testing " + name + ". Number of visited resources. Expected: " +
                         inResources.size() + ", got: " + resourceFileVisitor.getAmount());
             }
-            Collection<ModuleData> outResources = extractResources(out);
+            Collection<ModuleEntry> outResources = extractResources(out);
             int changedClasses = 0;
-            for (ModuleData r : outResources) {
+            for (ModuleEntry r : outResources) {
                 if (r.getPath().endsWith("Changed")) {
                     ++changedClasses;
                 }
diff --git a/jdk/test/tools/jlink/customplugin/plugin/CustomPlugin.java b/jdk/test/tools/jlink/customplugin/plugin/CustomPlugin.java
index 38054ec2015..781039a517a 100644
--- a/jdk/test/tools/jlink/customplugin/plugin/CustomPlugin.java
+++ b/jdk/test/tools/jlink/customplugin/plugin/CustomPlugin.java
@@ -26,7 +26,9 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import jdk.tools.jlink.plugin.Pool;
+import java.util.function.Function;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 
 public class CustomPlugin implements TransformerPlugin {
@@ -37,13 +39,8 @@ public class CustomPlugin implements TransformerPlugin {
     }
 
     @Override
-    public void visit(Pool in, Pool out) {
-        in.visit(new Pool.Visitor() {
-            @Override
-            public Pool.ModuleData visit(Pool.ModuleData content) {
-                return content;
-            }
-        }, out);
+    public void visit(ModulePool in, ModulePool out) {
+        in.transformAndCopy(Function.identity(), out);
     }
 
     @Override
@@ -61,9 +58,9 @@ public class CustomPlugin implements TransformerPlugin {
     }
 
     @Override
-    public Set<PluginType> getType() {
-        Set<PluginType> set = new HashSet<>();
-        set.add(CATEGORY.PROCESSOR);
+    public Set<Category> getType() {
+        Set<Category> set = new HashSet<>();
+        set.add(Category.PROCESSOR);
         return Collections.unmodifiableSet(set);
     }
 }
diff --git a/jdk/test/tools/jlink/customplugin/plugin/HelloPlugin.java b/jdk/test/tools/jlink/customplugin/plugin/HelloPlugin.java
index d06f99050b1..aa150350d7f 100644
--- a/jdk/test/tools/jlink/customplugin/plugin/HelloPlugin.java
+++ b/jdk/test/tools/jlink/customplugin/plugin/HelloPlugin.java
@@ -29,8 +29,8 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 
 /**
@@ -49,23 +49,23 @@ public final class HelloPlugin implements TransformerPlugin {
     }
 
     @Override
-    public void visit(Pool inResources, Pool outResources) {
+    public void visit(ModulePool inResources, ModulePool outResources) {
         try {
             System.out.println("Hello!!!!!!!!!!");
             File f = new File(OUTPUT_FILE);
             f.createNewFile();
-            for (ModuleData res : inResources.getContent()) {
+            inResources.entries().forEach(res -> {
                 outResources.add(res);
-            }
+            });
         } catch (IOException ex) {
             throw new UncheckedIOException(ex);
         }
     }
 
     @Override
-    public Set<PluginType> getType() {
-        Set<PluginType> set = new HashSet<>();
-        set.add(CATEGORY.TRANSFORMER);
+    public Set<Category> getType() {
+        Set<Category> set = new HashSet<>();
+        set.add(Category.TRANSFORMER);
         return Collections.unmodifiableSet(set);
     }
 
diff --git a/jdk/test/tools/jlink/plugins/CompressorPluginTest.java b/jdk/test/tools/jlink/plugins/CompressorPluginTest.java
index cd01b93836b..d37bf1b73d2 100644
--- a/jdk/test/tools/jlink/plugins/CompressorPluginTest.java
+++ b/jdk/test/tools/jlink/plugins/CompressorPluginTest.java
@@ -53,14 +53,14 @@ import jdk.internal.jimage.decompressor.ResourceDecompressor;
 import jdk.internal.jimage.decompressor.ResourceDecompressorFactory;
 import jdk.internal.jimage.decompressor.StringSharingDecompressorFactory;
 import jdk.internal.jimage.decompressor.ZipDecompressorFactory;
-import jdk.tools.jlink.internal.PoolImpl;
+import jdk.tools.jlink.internal.ModulePoolImpl;
 import jdk.tools.jlink.internal.StringTable;
 import jdk.tools.jlink.internal.plugins.DefaultCompressPlugin;
 import jdk.tools.jlink.internal.plugins.StringSharingPlugin;
 import jdk.tools.jlink.internal.plugins.ZipPlugin;
 import jdk.tools.jlink.plugin.Plugin;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 
 public class CompressorPluginTest {
@@ -86,7 +86,7 @@ public class CompressorPluginTest {
                     new ZipDecompressorFactory()
                 });
 
-        Pool classes = gatherClasses(javabase);
+        ModulePool classes = gatherClasses(javabase);
         // compress = String sharing
         checkCompress(classes, new StringSharingPlugin(), null,
                 new ResourceDecompressorFactory[]{
@@ -173,8 +173,8 @@ public class CompressorPluginTest {
                 Collections.singletonList(".*IOException.class"));
     }
 
-    private Pool gatherResources(Path module) throws Exception {
-        Pool pool = new PoolImpl(ByteOrder.nativeOrder(), new StringTable() {
+    private ModulePool gatherResources(Path module) throws Exception {
+        ModulePool pool = new ModulePoolImpl(ByteOrder.nativeOrder(), new StringTable() {
 
             @Override
             public int addString(String str) {
@@ -191,15 +191,15 @@ public class CompressorPluginTest {
                 Path p = iterator.next();
                 if (Files.isRegularFile(p)) {
                     byte[] content = Files.readAllBytes(p);
-                    pool.add(Pool.newResource(p.toString(), content));
+                    pool.add(ModuleEntry.create(p.toString(), content));
                 }
             }
         }
         return pool;
     }
 
-    private Pool gatherClasses(Path module) throws Exception {
-        Pool pool = new PoolImpl(ByteOrder.nativeOrder(), new StringTable() {
+    private ModulePool gatherClasses(Path module) throws Exception {
+        ModulePool pool = new ModulePoolImpl(ByteOrder.nativeOrder(), new StringTable() {
 
             @Override
             public int addString(String str) {
@@ -216,27 +216,27 @@ public class CompressorPluginTest {
                 Path p = iterator.next();
                 if (Files.isRegularFile(p) && p.toString().endsWith(".class")) {
                     byte[] content = Files.readAllBytes(p);
-                    pool.add(Pool.newResource(p.toString(), content));
+                    pool.add(ModuleEntry.create(p.toString(), content));
                 }
             }
         }
         return pool;
     }
 
-    private void checkCompress(Pool resources, Plugin prov,
+    private void checkCompress(ModulePool resources, Plugin prov,
             Properties config,
             ResourceDecompressorFactory[] factories) throws Exception {
         checkCompress(resources, prov, config, factories, Collections.emptyList(), Collections.emptyList());
     }
 
-    private void checkCompress(Pool resources, Plugin prov,
+    private void checkCompress(ModulePool resources, Plugin prov,
             Properties config,
             ResourceDecompressorFactory[] factories,
             List<String> includes,
             List<String> excludes) throws Exception {
-        long original = 0;
-        long compressed = 0;
-        for (ModuleData resource : resources.getContent()) {
+        long[] original = new long[1];
+        long[] compressed = new long[1];
+        resources.entries().forEach(resource -> {
             List<Pattern> includesPatterns = includes.stream()
                     .map(Pattern::compile)
                     .collect(Collectors.toList());
@@ -252,7 +252,7 @@ public class CompressorPluginTest {
             }
             prov.configure(props);
             final Map<Integer, String> strings = new HashMap<>();
-            PoolImpl inputResources = new PoolImpl(ByteOrder.nativeOrder(), new StringTable() {
+            ModulePoolImpl inputResources = new ModulePoolImpl(ByteOrder.nativeOrder(), new StringTable() {
                 @Override
                 public int addString(String str) {
                     int id = strID;
@@ -267,32 +267,32 @@ public class CompressorPluginTest {
                 }
             });
             inputResources.add(resource);
-            Pool compressedResources = applyCompressor(prov, inputResources, resource, includesPatterns, excludesPatterns);
-            original += resource.getLength();
-            compressed += compressedResources.get(resource.getPath()).getLength();
+            ModulePool compressedResources = applyCompressor(prov, inputResources, resource, includesPatterns, excludesPatterns);
+            original[0] += resource.getLength();
+            compressed[0] += compressedResources.findEntry(resource.getPath()).get().getLength();
             applyDecompressors(factories, inputResources, compressedResources, strings, includesPatterns, excludesPatterns);
-        }
+        });
         String compressors = Stream.of(factories)
                 .map(Object::getClass)
                 .map(Class::getSimpleName)
                 .collect(Collectors.joining(", "));
-        String size = "Compressed size: " + compressed + ", original size: " + original;
+        String size = "Compressed size: " + compressed[0] + ", original size: " + original[0];
         System.out.println("Used " + compressors + ". " + size);
-        if (original <= compressed) {
+        if (original[0] <= compressed[0]) {
             throw new AssertionError("java.base not compressed.");
         }
     }
 
-    private Pool applyCompressor(Plugin plugin,
-            PoolImpl inputResources,
-            ModuleData res,
+    private ModulePool applyCompressor(Plugin plugin,
+            ModulePoolImpl inputResources,
+            ModuleEntry res,
             List<Pattern> includesPatterns,
-            List<Pattern> excludesPatterns) throws Exception {
+            List<Pattern> excludesPatterns) {
         TransformerPlugin compressor = (TransformerPlugin) plugin;
-        Pool compressedPool = new PoolImpl(ByteOrder.nativeOrder(), inputResources.getStringTable());
-        compressor.visit(inputResources, compressedPool);
+        ModulePool compressedModulePool = new ModulePoolImpl(ByteOrder.nativeOrder(), inputResources.getStringTable());
+        compressor.visit(inputResources, compressedModulePool);
         String path = res.getPath();
-        ModuleData compressed = compressedPool.get(path);
+        ModuleEntry compressed = compressedModulePool.findEntry(path).get();
         CompressedResourceHeader header
                 = CompressedResourceHeader.readFromResource(ByteOrder.nativeOrder(), compressed.getBytes());
         if (isIncluded(includesPatterns, excludesPatterns, path)) {
@@ -310,29 +310,33 @@ public class CompressorPluginTest {
         } else if (header != null) {
             throw new AssertionError("Path should not be compressed: " + path);
         }
-        return compressedPool;
+        return compressedModulePool;
     }
 
     private void applyDecompressors(ResourceDecompressorFactory[] decompressors,
-            Pool inputResources,
-            Pool compressedResources,
+            ModulePool inputResources,
+            ModulePool compressedResources,
             Map<Integer, String> strings,
             List<Pattern> includesPatterns,
-            List<Pattern> excludesPatterns) throws Exception {
-        for (ModuleData compressed : compressedResources.getContent()) {
+            List<Pattern> excludesPatterns) {
+        compressedResources.entries().forEach(compressed -> {
             CompressedResourceHeader header = CompressedResourceHeader.readFromResource(
                     ByteOrder.nativeOrder(), compressed.getBytes());
             String path = compressed.getPath();
-            ModuleData orig = inputResources.get(path);
+            ModuleEntry orig = inputResources.findEntry(path).get();
             if (!isIncluded(includesPatterns, excludesPatterns, path)) {
-                continue;
+                return;
             }
             byte[] decompressed = compressed.getBytes();
             for (ResourceDecompressorFactory factory : decompressors) {
-                ResourceDecompressor decompressor = factory.newDecompressor(new Properties());
-                decompressed = decompressor.decompress(
+                try {
+                    ResourceDecompressor decompressor = factory.newDecompressor(new Properties());
+                    decompressed = decompressor.decompress(
                         strings::get, decompressed,
                         CompressedResourceHeader.getSize(), header.getUncompressedSize());
+                } catch (Exception exp) {
+                    throw new RuntimeException(exp);
+                }
             }
 
             if (decompressed.length != orig.getLength()) {
@@ -345,7 +349,7 @@ public class CompressorPluginTest {
                     throw new AssertionError("Decompressed and original differ at index " + i);
                 }
             }
-        }
+        });
     }
 
     private boolean isIncluded(List<Pattern> includesPatterns, List<Pattern> excludesPatterns, String path) {
diff --git a/jdk/test/tools/jlink/plugins/ExcludeFilesPluginTest.java b/jdk/test/tools/jlink/plugins/ExcludeFilesPluginTest.java
index cde83aa2761..744d7a2ba25 100644
--- a/jdk/test/tools/jlink/plugins/ExcludeFilesPluginTest.java
+++ b/jdk/test/tools/jlink/plugins/ExcludeFilesPluginTest.java
@@ -35,12 +35,11 @@ import java.io.File;
 import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.Map;
-import jdk.tools.jlink.internal.PoolImpl;
+import jdk.tools.jlink.internal.ModulePoolImpl;
 
 import jdk.tools.jlink.internal.plugins.ExcludeFilesPlugin;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
-import jdk.tools.jlink.plugin.Pool.ModuleDataType;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 
 public class ExcludeFilesPluginTest {
@@ -73,20 +72,20 @@ public class ExcludeFilesPluginTest {
         prop.put(ExcludeFilesPlugin.NAME, s);
         ExcludeFilesPlugin fplug = new ExcludeFilesPlugin();
         fplug.configure(prop);
-        PoolImpl files = new PoolImpl();
-        PoolImpl fresult = new PoolImpl();
-        ModuleData f = Pool.newImageFile(module, "/" + module + "/" + sample,
-                ModuleDataType.CONFIG, new ByteArrayInputStream(new byte[0]), 0);
+        ModulePoolImpl files = new ModulePoolImpl();
+        ModulePoolImpl fresult = new ModulePoolImpl();
+        ModuleEntry f = ModuleEntry.create(module, "/" + module + "/" + sample,
+                ModuleEntry.Type.CONFIG, new ByteArrayInputStream(new byte[0]), 0);
         files.add(f);
 
         fplug.visit(files, fresult);
 
         if (exclude) {
-            if (fresult.getContent().contains(f)) {
+            if (fresult.contains(f)) {
                 throw new Exception(sample + " should be excluded by " + s);
             }
         } else {
-            if (!fresult.getContent().contains(f)) {
+            if (!fresult.contains(f)) {
                 throw new Exception(sample + " shouldn't be excluded by " + s);
             }
         }
diff --git a/jdk/test/tools/jlink/plugins/ExcludePluginTest.java b/jdk/test/tools/jlink/plugins/ExcludePluginTest.java
index 0f508073288..c39e738e079 100644
--- a/jdk/test/tools/jlink/plugins/ExcludePluginTest.java
+++ b/jdk/test/tools/jlink/plugins/ExcludePluginTest.java
@@ -34,11 +34,11 @@ import java.io.File;
 import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.Map;
-import jdk.tools.jlink.internal.PoolImpl;
+import jdk.tools.jlink.internal.ModulePoolImpl;
 
 import jdk.tools.jlink.internal.plugins.ExcludePlugin;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 
 public class ExcludePluginTest {
 
@@ -75,17 +75,17 @@ public class ExcludePluginTest {
         prop.put(ExcludePlugin.NAME, s);
         ExcludePlugin excludePlugin = new ExcludePlugin();
         excludePlugin.configure(prop);
-        Pool resources = new PoolImpl();
-        ModuleData resource = Pool.newResource(sample, new byte[0]);
+        ModulePool resources = new ModulePoolImpl();
+        ModuleEntry resource = ModuleEntry.create(sample, new byte[0]);
         resources.add(resource);
-        Pool result = new PoolImpl();
+        ModulePool result = new ModulePoolImpl();
         excludePlugin.visit(resources, result);
         if (exclude) {
-            if (result.getContent().contains(resource)) {
+            if (result.contains(resource)) {
                 throw new AssertionError(sample + " should be excluded by " + s);
             }
         } else {
-            if (!result.getContent().contains(resource)) {
+            if (!result.contains(resource)) {
                 throw new AssertionError(sample + " shouldn't be excluded by " + s);
             }
         }
diff --git a/jdk/test/tools/jlink/plugins/ExcludeVMPluginTest.java b/jdk/test/tools/jlink/plugins/ExcludeVMPluginTest.java
index 701368c3dd0..edc10702eb3 100644
--- a/jdk/test/tools/jlink/plugins/ExcludeVMPluginTest.java
+++ b/jdk/test/tools/jlink/plugins/ExcludeVMPluginTest.java
@@ -32,13 +32,12 @@
 import java.io.ByteArrayInputStream;
 import java.util.HashMap;
 import java.util.Map;
-import jdk.tools.jlink.internal.PoolImpl;
+import jdk.tools.jlink.internal.ModulePoolImpl;
 
 import jdk.tools.jlink.internal.plugins.ExcludeVMPlugin;
 import jdk.tools.jlink.plugin.Plugin;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
-import jdk.tools.jlink.plugin.Pool.ModuleDataType;
+import jdk.tools.jlink.plugin.ModulePool;
+import jdk.tools.jlink.plugin.ModuleEntry;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 
 public class ExcludeVMPluginTest {
@@ -165,14 +164,14 @@ public class ExcludeVMPluginTest {
     private void doCheckVM(String vm, String[] input, String jvmcfg, String[] expectedOutput, String expectdJvmCfg) throws Exception {
         // Create a pool with jvm.cfg and the input paths.
         byte[] jvmcfgContent = jvmcfg.getBytes();
-        Pool pool = new PoolImpl();
-        pool.add(Pool.newImageFile("java.base", "/java.base/native/jvm.cfg",
-                ModuleDataType.NATIVE_LIB, new ByteArrayInputStream(jvmcfgContent), jvmcfgContent.length));
+        ModulePool pool = new ModulePoolImpl();
+        pool.add(ModuleEntry.create("java.base", "/java.base/native/jvm.cfg",
+                ModuleEntry.Type.NATIVE_LIB, new ByteArrayInputStream(jvmcfgContent), jvmcfgContent.length));
         for (String in : input) {
-            pool.add(Pool.newImageFile("java.base", in,
-                    ModuleDataType.NATIVE_LIB, new ByteArrayInputStream(new byte[0]), 0));
+            pool.add(ModuleEntry.create("java.base", in,
+                    ModuleEntry.Type.NATIVE_LIB, new ByteArrayInputStream(new byte[0]), 0));
         }
-        Pool out = new PoolImpl();
+        ModulePool out = new ModulePoolImpl();
 
         TransformerPlugin p = new ExcludeVMPlugin();
         Map<String, String> config = new HashMap<>();
@@ -182,22 +181,22 @@ public class ExcludeVMPluginTest {
         p.configure(config);
         p.visit(pool, out);
 
-        String newContent = new String(out.get("/java.base/native/jvm.cfg").stream().readAllBytes());
+        String newContent = new String(out.findEntry("/java.base/native/jvm.cfg").get().stream().readAllBytes());
 
         if (!expectdJvmCfg.equals(newContent)) {
             throw new Exception("Got content " + newContent + " expected " + expectdJvmCfg);
         }
 
-        if (out.getContent().size() != (expectedOutput.length + 1)) {
-            for (ModuleData m : out.getContent()) {
+        if (out.getEntryCount() != (expectedOutput.length + 1)) {
+            out.entries().forEach(m -> {
                 System.err.println(m.getPath());
-            }
-            throw new Exception("Invalid output size " + out.getContent().size() + " expected " + (expectedOutput.length + 1));
+            });
+            throw new Exception("Invalid output size " + out.getEntryCount() + " expected " + (expectedOutput.length + 1));
         }
 
-        for (ModuleData md : out.getContent()) {
+        out.entries().forEach(md -> {
             if (md.getPath().equals("/java.base/native/jvm.cfg")) {
-                continue;
+                return;
             }
             boolean contained = false;
             for (String o : expectedOutput) {
@@ -207,9 +206,9 @@ public class ExcludeVMPluginTest {
                 }
             }
             if (!contained) {
-                throw new Exception(md.getPath() + " not expected");
+                throw new RuntimeException(md.getPath() + " not expected");
             }
-        }
+        });
 
     }
 
diff --git a/jdk/test/tools/jlink/plugins/FileCopierPluginTest.java b/jdk/test/tools/jlink/plugins/FileCopierPluginTest.java
index 5fecfec388b..a6fb749ba7f 100644
--- a/jdk/test/tools/jlink/plugins/FileCopierPluginTest.java
+++ b/jdk/test/tools/jlink/plugins/FileCopierPluginTest.java
@@ -26,6 +26,7 @@
  * @summary Test files copy plugin
  * @author Jean-Francois Denise
  * @modules jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.builder
  *          jdk.jlink/jdk.tools.jlink.internal.plugins
  * @run main FileCopierPluginTest
  */
@@ -36,13 +37,12 @@ import java.nio.file.Path;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import jdk.tools.jlink.internal.PoolImpl;
+import jdk.tools.jlink.internal.ModulePoolImpl;
 import jdk.tools.jlink.builder.DefaultImageBuilder;
 
 import jdk.tools.jlink.internal.plugins.FileCopierPlugin;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
-import jdk.tools.jlink.plugin.Pool.ModuleDataType;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 
 public class FileCopierPluginTest {
 
@@ -85,21 +85,20 @@ public class FileCopierPluginTest {
         Map<String, String> conf = new HashMap<>();
         conf.put(FileCopierPlugin.NAME, builder.toString());
         plug.configure(conf);
-        Pool pool = new PoolImpl();
-        plug.visit(new PoolImpl(), pool);
-        if (pool.getContent().size() != expected) {
+        ModulePool pool = new ModulePoolImpl();
+        plug.visit(new ModulePoolImpl(), pool);
+        if (pool.getEntryCount() != expected) {
             throw new AssertionError("Wrong number of added files");
         }
-        for (ModuleData f : pool.getContent()) {
-            if (!f.getType().equals(ModuleDataType.OTHER)) {
+        pool.entries().forEach(f -> {
+            if (!f.getType().equals(ModuleEntry.Type.OTHER)) {
                 throw new AssertionError("Invalid type " + f.getType()
                         + " for file " + f.getPath());
             }
             if (f.stream() == null) {
                 throw new AssertionError("Null stream for file " + f.getPath());
             }
-
-        }
+        });
         Path root = new File(".").toPath();
         DefaultImageBuilder imgbuilder = new DefaultImageBuilder(root);
         imgbuilder.storeFiles(pool);
diff --git a/jdk/test/tools/jlink/plugins/LastSorterTest.java b/jdk/test/tools/jlink/plugins/LastSorterTest.java
index 100ca1e4674..0dc27b44ec8 100644
--- a/jdk/test/tools/jlink/plugins/LastSorterTest.java
+++ b/jdk/test/tools/jlink/plugins/LastSorterTest.java
@@ -26,6 +26,7 @@
  * @summary Test last sorter property
  * @author Jean-Francois Denise
  * @modules jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink
  * @run main/othervm LastSorterTest
  */
 
@@ -40,12 +41,12 @@ import java.util.Set;
 import jdk.tools.jlink.internal.ImagePluginConfiguration;
 import jdk.tools.jlink.internal.PluginRepository;
 import jdk.tools.jlink.internal.ImagePluginStack;
-import jdk.tools.jlink.internal.PoolImpl;
+import jdk.tools.jlink.internal.ModulePoolImpl;
 import jdk.tools.jlink.Jlink;
 import jdk.tools.jlink.Jlink.PluginsConfiguration;
 import jdk.tools.jlink.plugin.Plugin;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 
 public class LastSorterTest {
@@ -80,7 +81,7 @@ public class LastSorterTest {
         ImagePluginStack stack = ImagePluginConfiguration.parseConfiguration(config);
 
         // check order
-        PoolImpl res = fillOutResourcePool();
+        ModulePoolImpl res = fillOutResourceModulePool();
 
         try {
             stack.visitResources(res);
@@ -91,18 +92,18 @@ public class LastSorterTest {
         }
     }
 
-    private PoolImpl fillOutResourcePool() throws Exception {
-        PoolImpl res = new PoolImpl();
-        res.add(Pool.newResource("/eee/bbb/res1.class", new byte[90]));
-        res.add(Pool.newResource("/aaaa/bbb/res2.class", new byte[90]));
-        res.add(Pool.newResource("/bbb/aa/res1.class", new byte[90]));
-        res.add(Pool.newResource("/aaaa/bbb/res3.class", new byte[90]));
-        res.add(Pool.newResource("/bbb/aa/res2.class", new byte[90]));
-        res.add(Pool.newResource("/fff/bbb/res1.class", new byte[90]));
-        res.add(Pool.newResource("/aaaa/bbb/res1.class", new byte[90]));
-        res.add(Pool.newResource("/bbb/aa/res3.class", new byte[90]));
-        res.add(Pool.newResource("/ccc/bbb/res1.class", new byte[90]));
-        res.add(Pool.newResource("/ddd/bbb/res1.class", new byte[90]));
+    private ModulePoolImpl fillOutResourceModulePool() throws Exception {
+        ModulePoolImpl res = new ModulePoolImpl();
+        res.add(ModuleEntry.create("/eee/bbb/res1.class", new byte[90]));
+        res.add(ModuleEntry.create("/aaaa/bbb/res2.class", new byte[90]));
+        res.add(ModuleEntry.create("/bbb/aa/res1.class", new byte[90]));
+        res.add(ModuleEntry.create("/aaaa/bbb/res3.class", new byte[90]));
+        res.add(ModuleEntry.create("/bbb/aa/res2.class", new byte[90]));
+        res.add(ModuleEntry.create("/fff/bbb/res1.class", new byte[90]));
+        res.add(ModuleEntry.create("/aaaa/bbb/res1.class", new byte[90]));
+        res.add(ModuleEntry.create("/bbb/aa/res3.class", new byte[90]));
+        res.add(ModuleEntry.create("/ccc/bbb/res1.class", new byte[90]));
+        res.add(ModuleEntry.create("/ddd/bbb/res1.class", new byte[90]));
         return res;
     }
 
@@ -124,7 +125,7 @@ public class LastSorterTest {
         ImagePluginStack stack = ImagePluginConfiguration.parseConfiguration(config);
 
         // check order
-        PoolImpl res = fillOutResourcePool();
+        ModulePoolImpl res = fillOutResourceModulePool();
 
         stack.visitResources(res);
     }
@@ -159,7 +160,7 @@ public class LastSorterTest {
         ImagePluginStack stack = ImagePluginConfiguration.parseConfiguration(config);
 
         // check order
-        PoolImpl res = fillOutResourcePool();
+        ModulePoolImpl res = fillOutResourceModulePool();
         try {
             stack.visitResources(res);
             throw new AssertionError("Order was changed after the last sorter, but no exception occurred");
@@ -178,17 +179,17 @@ public class LastSorterTest {
         }
 
         @Override
-        public void visit(Pool resources, Pool output) {
-            List<ModuleData> paths = new ArrayList<>();
-            for (ModuleData res : resources.getContent()) {
+        public void visit(ModulePool resources, ModulePool output) {
+            List<ModuleEntry> paths = new ArrayList<>();
+            resources.entries().forEach(res -> {
                 if (res.getPath().startsWith(starts)) {
                     paths.add(0, res);
                 } else {
                     paths.add(res);
                 }
-            }
+            });
 
-            for (ModuleData r : paths) {
+            for (ModuleEntry r : paths) {
                 output.add(r);
             }
         }
@@ -199,9 +200,9 @@ public class LastSorterTest {
         }
 
         @Override
-        public Set<PluginType> getType() {
-            Set<PluginType> set = new HashSet<>();
-            set.add(CATEGORY.TRANSFORMER);
+        public Set<Category> getType() {
+            Set<Category> set = new HashSet<>();
+            set.add(Category.TRANSFORMER);
             return Collections.unmodifiableSet(set);
         }
 
diff --git a/jdk/test/tools/jlink/plugins/OrderResourcesPluginTest.java b/jdk/test/tools/jlink/plugins/OrderResourcesPluginTest.java
index cbf418669c0..701736139c6 100644
--- a/jdk/test/tools/jlink/plugins/OrderResourcesPluginTest.java
+++ b/jdk/test/tools/jlink/plugins/OrderResourcesPluginTest.java
@@ -36,11 +36,12 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-import jdk.tools.jlink.internal.PoolImpl;
+import java.util.stream.Collectors;
 
+import jdk.tools.jlink.internal.ModulePoolImpl;
 import jdk.tools.jlink.internal.plugins.OrderResourcesPlugin;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 
 public class OrderResourcesPluginTest {
@@ -50,52 +51,52 @@ public class OrderResourcesPluginTest {
     }
 
     public void test() throws Exception {
-        ModuleData[] array = {
-                Pool.newResource("/module1/toto1.class", new byte[0]),
-                Pool.newResource("/module2/toto2.class", new byte[0]),
-                Pool.newResource("/module3/toto3.class", new byte[0]),
-                Pool.newResource("/module3/toto3/module-info.class", new byte[0]),
-                Pool.newResource("/zazou/toto.class", new byte[0]),
-                Pool.newResource("/module4/zazou.class", new byte[0]),
-                Pool.newResource("/module5/toto5.class", new byte[0]),
-                Pool.newResource("/module6/toto6/module-info.class", new byte[0])
+        ModuleEntry[] array = {
+                ModuleEntry.create("/module1/toto1.class", new byte[0]),
+                ModuleEntry.create("/module2/toto2.class", new byte[0]),
+                ModuleEntry.create("/module3/toto3.class", new byte[0]),
+                ModuleEntry.create("/module3/toto3/module-info.class", new byte[0]),
+                ModuleEntry.create("/zazou/toto.class", new byte[0]),
+                ModuleEntry.create("/module4/zazou.class", new byte[0]),
+                ModuleEntry.create("/module5/toto5.class", new byte[0]),
+                ModuleEntry.create("/module6/toto6/module-info.class", new byte[0])
         };
 
-        ModuleData[] sorted = {
-                Pool.newResource("/zazou/toto.class", new byte[0]),
-                Pool.newResource("/module3/toto3/module-info.class", new byte[0]),
-                Pool.newResource("/module6/toto6/module-info.class", new byte[0]),
-                Pool.newResource("/module1/toto1.class", new byte[0]),
-                Pool.newResource("/module2/toto2.class", new byte[0]),
-                Pool.newResource("/module3/toto3.class", new byte[0]),
-                Pool.newResource("/module4/zazou.class", new byte[0]),
-                Pool.newResource("/module5/toto5.class", new byte[0])
+        ModuleEntry[] sorted = {
+                ModuleEntry.create("/zazou/toto.class", new byte[0]),
+                ModuleEntry.create("/module3/toto3/module-info.class", new byte[0]),
+                ModuleEntry.create("/module6/toto6/module-info.class", new byte[0]),
+                ModuleEntry.create("/module1/toto1.class", new byte[0]),
+                ModuleEntry.create("/module2/toto2.class", new byte[0]),
+                ModuleEntry.create("/module3/toto3.class", new byte[0]),
+                ModuleEntry.create("/module4/zazou.class", new byte[0]),
+                ModuleEntry.create("/module5/toto5.class", new byte[0])
         };
 
-        ModuleData[] sorted2 = {
-            Pool.newResource("/module5/toto5.class", new byte[0]),
-            Pool.newResource("/module6/toto6/module-info.class", new byte[0]),
-            Pool.newResource("/module4/zazou.class", new byte[0]),
-            Pool.newResource("/module3/toto3.class", new byte[0]),
-            Pool.newResource("/module3/toto3/module-info.class", new byte[0]),
-            Pool.newResource("/module1/toto1.class", new byte[0]),
-            Pool.newResource("/module2/toto2.class", new byte[0]),
-            Pool.newResource("/zazou/toto.class", new byte[0])
+        ModuleEntry[] sorted2 = {
+            ModuleEntry.create("/module5/toto5.class", new byte[0]),
+            ModuleEntry.create("/module6/toto6/module-info.class", new byte[0]),
+            ModuleEntry.create("/module4/zazou.class", new byte[0]),
+            ModuleEntry.create("/module3/toto3.class", new byte[0]),
+            ModuleEntry.create("/module3/toto3/module-info.class", new byte[0]),
+            ModuleEntry.create("/module1/toto1.class", new byte[0]),
+            ModuleEntry.create("/module2/toto2.class", new byte[0]),
+            ModuleEntry.create("/zazou/toto.class", new byte[0])
         };
 
-        Pool resources = new PoolImpl();
-        for (ModuleData r : array) {
+        ModulePool resources = new ModulePoolImpl();
+        for (ModuleEntry r : array) {
             resources.add(r);
         }
 
         {
-            Pool out = new PoolImpl();
+            ModulePool out = new ModulePoolImpl();
             Map<String, String> config = new HashMap<>();
             config.put(OrderResourcesPlugin.NAME, "/zazou/*,*/module-info.class");
             TransformerPlugin p = new OrderResourcesPlugin();
             p.configure(config);
             p.visit(resources, out);
-            check(out.getContent(), sorted);
+            check(out.entries().collect(Collectors.toList()), sorted);
         }
 
         {
@@ -112,26 +113,26 @@ public class OrderResourcesPluginTest {
             }
             Files.write(order.toPath(), builder.toString().getBytes());
 
-            Pool out = new PoolImpl();
+            ModulePool out = new ModulePoolImpl();
             Map<String, String> config = new HashMap<>();
             config.put(OrderResourcesPlugin.NAME, "@" + order.getAbsolutePath());
             TransformerPlugin p = new OrderResourcesPlugin();
             p.configure(config);
             p.visit(resources, out);
-            check(out.getContent(), sorted2);
+            check(out.entries().collect(Collectors.toList()), sorted2);
 
         }
     }
 
-    private void check(Collection<ModuleData> outResources,
-            ModuleData[] sorted) {
+    private void check(Collection<ModuleEntry> outResources,
+            ModuleEntry[] sorted) {
         if (outResources.size() != sorted.length) {
             throw new AssertionError("Wrong number of resources:\n"
                     + "expected: " + Arrays.toString(sorted) + ",\n"
                     + "     got: " + outResources);
         }
         int i = 0;
-        for (ModuleData r : outResources) {
+        for (ModuleEntry r : outResources) {
             System.err.println("Resource: " + r);
             if (!sorted[i].getPath().equals(r.getPath())) {
                 throw new AssertionError("Resource not properly sorted, difference at: " + i + "\n"
diff --git a/jdk/test/tools/jlink/plugins/PluginOrderTest.java b/jdk/test/tools/jlink/plugins/PluginOrderTest.java
index 42655d408fe..4c9f2c2241d 100644
--- a/jdk/test/tools/jlink/plugins/PluginOrderTest.java
+++ b/jdk/test/tools/jlink/plugins/PluginOrderTest.java
@@ -44,8 +44,8 @@ import java.util.Set;
 
 import jdk.tools.jlink.internal.PluginOrderingGraph;
 import jdk.tools.jlink.plugin.Plugin;
-import jdk.tools.jlink.plugin.Plugin.CATEGORY;
-import jdk.tools.jlink.plugin.Pool;
+import jdk.tools.jlink.plugin.Plugin.Category;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 
 public class PluginOrderTest {
@@ -96,8 +96,8 @@ public class PluginOrderTest {
         set.add("plug2");
         List<Plugin> plugins = new ArrayList<>();
         plugins.add(new Plug("plug2", Collections.emptySet(), Collections.emptySet(),
-                CATEGORY.TRANSFORMER));
-        plugins.add(new Plug("plug1", set, Collections.emptySet(), CATEGORY.TRANSFORMER));
+                Category.TRANSFORMER));
+        plugins.add(new Plug("plug1", set, Collections.emptySet(), Category.TRANSFORMER));
         List<Plugin> ordered = PluginOrderingGraph.sort(plugins);
         if (ordered.get(0) != plugins.get(1) || ordered.get(1) != plugins.get(0)) {
             throw new Exception("Invalid sorting");
@@ -108,32 +108,32 @@ public class PluginOrderTest {
         Set<String> lst1 = new HashSet<>();
         lst1.add("plug2");
         lst1.add("plug3");
-        Plugin p1 = new Plug("plug1", lst1, Collections.emptySet(), CATEGORY.TRANSFORMER);
+        Plugin p1 = new Plug("plug1", lst1, Collections.emptySet(), Category.TRANSFORMER);
 
-        Plugin p2 = new Plug("plug2", Collections.emptySet(), Collections.emptySet(), CATEGORY.TRANSFORMER);
+        Plugin p2 = new Plug("plug2", Collections.emptySet(), Collections.emptySet(), Category.TRANSFORMER);
 
         Set<String> lst3 = new HashSet<>();
         lst3.add("plug4");
         lst3.add("plug6");
-        Plugin p3 = new Plug("plug3", lst3, Collections.emptySet(), CATEGORY.TRANSFORMER);
+        Plugin p3 = new Plug("plug3", lst3, Collections.emptySet(), Category.TRANSFORMER);
 
-        Plugin p4 = new Plug("plug4", Collections.emptySet(), Collections.emptySet(), CATEGORY.TRANSFORMER);
+        Plugin p4 = new Plug("plug4", Collections.emptySet(), Collections.emptySet(), Category.TRANSFORMER);
 
         Set<String> lst5 = new HashSet<>();
         lst5.add("plug3");
         lst5.add("plug1");
         lst5.add("plug2");
         lst5.add("plug6");
-        Plugin p5 = new Plug("plug5", lst5, Collections.emptySet(), CATEGORY.TRANSFORMER);
+        Plugin p5 = new Plug("plug5", lst5, Collections.emptySet(), Category.TRANSFORMER);
 
         Set<String> lst6 = new HashSet<>();
         lst6.add("plug4");
         lst6.add("plug2");
-        Plugin p6 = new Plug("plug6", lst6, Collections.emptySet(), CATEGORY.TRANSFORMER);
+        Plugin p6 = new Plug("plug6", lst6, Collections.emptySet(), Category.TRANSFORMER);
 
-        Plugin p7 = new Plug("plug7", Collections.emptySet(), Collections.emptySet(), CATEGORY.TRANSFORMER);
+        Plugin p7 = new Plug("plug7", Collections.emptySet(), Collections.emptySet(), Category.TRANSFORMER);
 
-        Plugin p8 = new Plug("plug8", Collections.emptySet(), Collections.emptySet(), CATEGORY.TRANSFORMER);
+        Plugin p8 = new Plug("plug8", Collections.emptySet(), Collections.emptySet(), Category.TRANSFORMER);
 
         List<Plugin> plugins = new ArrayList<>();
         plugins.add(p1);
@@ -153,11 +153,11 @@ public class PluginOrderTest {
         set2.add("plug1");
         List<Plugin> plugins = new ArrayList<>();
         plugins.add(new Plug("plug2", set2, Collections.emptySet(),
-                CATEGORY.TRANSFORMER));
+                Category.TRANSFORMER));
 
         Set<String> set1 = new HashSet<>();
         set1.add("plug2");
-        plugins.add(new Plug("plug1", set1, Collections.emptySet(), CATEGORY.TRANSFORMER));
+        plugins.add(new Plug("plug1", set1, Collections.emptySet(), Category.TRANSFORMER));
         PluginOrderingGraph.sort(plugins);
 
     }
@@ -166,31 +166,31 @@ public class PluginOrderTest {
         Set<String> lst1 = new HashSet<>();
         lst1.add("plug2");
         lst1.add("plug3");
-        Plugin p1 = new Plug("plug1", lst1, Collections.emptySet(), CATEGORY.TRANSFORMER);
+        Plugin p1 = new Plug("plug1", lst1, Collections.emptySet(), Category.TRANSFORMER);
 
-        Plugin p2 = new Plug("plug2", Collections.emptySet(), Collections.emptySet(), CATEGORY.TRANSFORMER);
+        Plugin p2 = new Plug("plug2", Collections.emptySet(), Collections.emptySet(), Category.TRANSFORMER);
 
         Set<String> lst3 = new HashSet<>();
         lst3.add("plug4");
         lst3.add("plug6");
-        Plugin p3 = new Plug("plug3", lst3, Collections.emptySet(), CATEGORY.TRANSFORMER);
+        Plugin p3 = new Plug("plug3", lst3, Collections.emptySet(), Category.TRANSFORMER);
 
-        Plugin p4 = new Plug("plug4", Collections.emptySet(), Collections.emptySet(), CATEGORY.TRANSFORMER);
+        Plugin p4 = new Plug("plug4", Collections.emptySet(), Collections.emptySet(), Category.TRANSFORMER);
 
         Set<String> lst5 = new HashSet<>();
         lst5.add("plug3");
         lst5.add("plug1");
         lst5.add("plug2");
-        Plugin p5 = new Plug("plug5", lst5, Collections.emptySet(), CATEGORY.TRANSFORMER);
+        Plugin p5 = new Plug("plug5", lst5, Collections.emptySet(), Category.TRANSFORMER);
 
         Set<String> lst6 = new HashSet<>();
         lst6.add("plug4");
         lst6.add("plug1");
-        Plugin p6 = new Plug("plug6", lst6, Collections.emptySet(), CATEGORY.TRANSFORMER);
+        Plugin p6 = new Plug("plug6", lst6, Collections.emptySet(), Category.TRANSFORMER);
 
-        Plugin p7 = new Plug("plug7", Collections.emptySet(), Collections.emptySet(), CATEGORY.TRANSFORMER);
+        Plugin p7 = new Plug("plug7", Collections.emptySet(), Collections.emptySet(), Category.TRANSFORMER);
 
-        Plugin p8 = new Plug("plug8", Collections.emptySet(), Collections.emptySet(), CATEGORY.TRANSFORMER);
+        Plugin p8 = new Plug("plug8", Collections.emptySet(), Collections.emptySet(), Category.TRANSFORMER);
 
         List<Plugin> plugins = new ArrayList<>();
         plugins.add(p1);
@@ -208,8 +208,8 @@ public class PluginOrderTest {
         Set<String> lst1 = new HashSet<>();
         lst1.add("plug2");
         lst1.add("plug3");
-        Plugin p = new Plug("plug1", lst1, Collections.emptySet(), CATEGORY.TRANSFORMER);
-        Plugin p2 = new Plug("plug2", Collections.emptySet(), Collections.emptySet(), CATEGORY.TRANSFORMER);
+        Plugin p = new Plug("plug1", lst1, Collections.emptySet(), Category.TRANSFORMER);
+        Plugin p2 = new Plug("plug2", Collections.emptySet(), Collections.emptySet(), Category.TRANSFORMER);
 
         Set<String> lst3 = new HashSet<>();
         lst3.add("plug2");
@@ -217,7 +217,7 @@ public class PluginOrderTest {
         Set<String> lst4 = new HashSet<>();
         lst4.add("plug1");
 
-        Plugin p3 = new Plug("plug3", lst4, lst3, CATEGORY.TRANSFORMER);
+        Plugin p3 = new Plug("plug3", lst4, lst3, Category.TRANSFORMER);
         List<Plugin> plugins = new ArrayList<>();
         plugins.add(p);
         plugins.add(p2);
@@ -229,10 +229,10 @@ public class PluginOrderTest {
 
         private final Set<String> isBefore;
         private final Set<String> isAfter;
-        private final CATEGORY category;
+        private final Category category;
         private final String name;
 
-        private Plug(String name, Set<String> isBefore, Set<String> isAfter, CATEGORY category) {
+        private Plug(String name, Set<String> isBefore, Set<String> isAfter, Category category) {
             this.name = name;
             this.isBefore = isBefore;
             this.isAfter = isAfter;
@@ -255,12 +255,12 @@ public class PluginOrderTest {
         }
 
         @Override
-        public void visit(Pool in, Pool out) {
+        public void visit(ModulePool in, ModulePool out) {
 
         }
 
         @Override
-        public Set<PluginType> getType() {
+        public Set<Category> getType() {
             return Collections.singleton(category);
         }
 
diff --git a/jdk/test/tools/jlink/plugins/PluginsNegativeTest.java b/jdk/test/tools/jlink/plugins/PluginsNegativeTest.java
index 525fb0b5ce2..5b8ed2d6c83 100644
--- a/jdk/test/tools/jlink/plugins/PluginsNegativeTest.java
+++ b/jdk/test/tools/jlink/plugins/PluginsNegativeTest.java
@@ -26,6 +26,7 @@
  * @summary Negative test for ImagePluginStack.
  * @author Andrei Eremeev
  * @modules jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink
  * @run main/othervm PluginsNegativeTest
  */
 import java.lang.reflect.Layer;
@@ -39,11 +40,12 @@ import java.util.Set;
 import jdk.tools.jlink.internal.ImagePluginConfiguration;
 import jdk.tools.jlink.internal.PluginRepository;
 import jdk.tools.jlink.internal.ImagePluginStack;
-import jdk.tools.jlink.internal.PoolImpl;
+import jdk.tools.jlink.internal.ModulePoolImpl;
 import jdk.tools.jlink.Jlink;
 import jdk.tools.jlink.Jlink.PluginsConfiguration;
 import jdk.tools.jlink.plugin.Plugin;
-import jdk.tools.jlink.plugin.Pool;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 
 public class PluginsNegativeTest {
@@ -96,8 +98,8 @@ public class PluginsNegativeTest {
         plugins.add(createPlugin("plugin"));
         ImagePluginStack stack = ImagePluginConfiguration.parseConfiguration(new PluginsConfiguration(plugins,
                 null, null));
-        PoolImpl inResources = new PoolImpl();
-        inResources.add(Pool.newResource("/aaa/bbb/A", new byte[10]));
+        ModulePoolImpl inResources = new ModulePoolImpl();
+        inResources.add(ModuleEntry.create("/aaa/bbb/A", new byte[10]));
         try {
             stack.visitResources(inResources);
             throw new AssertionError("Exception expected when output resource is empty");
@@ -110,8 +112,8 @@ public class PluginsNegativeTest {
         plugins.add(createPlugin("plugin"));
         ImagePluginStack stack = ImagePluginConfiguration.parseConfiguration(new PluginsConfiguration(plugins,
                 null, null));
-        PoolImpl inResources = new PoolImpl();
-        PoolImpl outResources = (PoolImpl) stack.visitResources(inResources);
+        ModulePoolImpl inResources = new ModulePoolImpl();
+        ModulePoolImpl outResources = (ModulePoolImpl) stack.visitResources(inResources);
         if (!outResources.isEmpty()) {
             throw new AssertionError("Output resource is not empty");
         }
@@ -126,7 +128,7 @@ public class PluginsNegativeTest {
         }
 
         @Override
-        public void visit(Pool inResources, Pool outResources) {
+        public void visit(ModulePool inResources, ModulePool outResources) {
             // do nothing
         }
 
@@ -136,9 +138,9 @@ public class PluginsNegativeTest {
         }
 
         @Override
-        public Set<PluginType> getType() {
-            Set<PluginType> set = new HashSet<>();
-            set.add(CATEGORY.TRANSFORMER);
+        public Set<Category> getType() {
+            Set<Category> set = new HashSet<>();
+            set.add(Category.TRANSFORMER);
             return Collections.unmodifiableSet(set);
         }
 
diff --git a/jdk/test/tools/jlink/plugins/PrevisitorTest.java b/jdk/test/tools/jlink/plugins/PrevisitorTest.java
index 16d79f0c068..1f721d66d5f 100644
--- a/jdk/test/tools/jlink/plugins/PrevisitorTest.java
+++ b/jdk/test/tools/jlink/plugins/PrevisitorTest.java
@@ -26,6 +26,7 @@
  * @summary Test previsitor
  * @author Andrei Eremeev
  * @modules jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink
  * @run main/othervm PrevisitorTest
  */
 import java.nio.ByteOrder;
@@ -36,19 +37,20 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 import jdk.tools.jlink.internal.ImagePluginConfiguration;
 import jdk.tools.jlink.internal.PluginRepository;
 import jdk.tools.jlink.internal.ImagePluginStack;
-import jdk.tools.jlink.internal.PoolImpl;
+import jdk.tools.jlink.internal.ModulePoolImpl;
 import jdk.tools.jlink.internal.ResourcePrevisitor;
 import jdk.tools.jlink.internal.StringTable;
 import jdk.tools.jlink.Jlink;
 import jdk.tools.jlink.plugin.Plugin;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 
 public class PrevisitorTest {
@@ -68,17 +70,17 @@ public class PrevisitorTest {
         plugins.add(createPlugin(CustomPlugin.NAME));
         ImagePluginStack stack = ImagePluginConfiguration.parseConfiguration(new Jlink.PluginsConfiguration(plugins,
                 null, null));
-        PoolImpl inResources = new PoolImpl(ByteOrder.nativeOrder(), new CustomStringTable());
-        inResources.add(Pool.newResource("/aaa/bbb/res1.class", new byte[90]));
-        inResources.add(Pool.newResource("/aaa/bbb/res2.class", new byte[90]));
-        inResources.add(Pool.newResource("/aaa/bbb/res3.class", new byte[90]));
-        inResources.add(Pool.newResource("/aaa/ddd/res1.class", new byte[90]));
-        inResources.add(Pool.newResource("/aaa/res1.class", new byte[90]));
-        Pool outResources = stack.visitResources(inResources);
-        Collection<String> input = inResources.getContent().stream()
+        ModulePoolImpl inResources = new ModulePoolImpl(ByteOrder.nativeOrder(), new CustomStringTable());
+        inResources.add(ModuleEntry.create("/aaa/bbb/res1.class", new byte[90]));
+        inResources.add(ModuleEntry.create("/aaa/bbb/res2.class", new byte[90]));
+        inResources.add(ModuleEntry.create("/aaa/bbb/res3.class", new byte[90]));
+        inResources.add(ModuleEntry.create("/aaa/ddd/res1.class", new byte[90]));
+        inResources.add(ModuleEntry.create("/aaa/res1.class", new byte[90]));
+        ModulePool outResources = stack.visitResources(inResources);
+        Collection<String> input = inResources.entries()
                 .map(Object::toString)
                 .collect(Collectors.toList());
-        Collection<String> output = outResources.getContent().stream()
+        Collection<String> output = outResources.entries()
                 .map(Object::toString)
                 .collect(Collectors.toList());
         if (!input.equals(output)) {
@@ -114,19 +116,20 @@ public class PrevisitorTest {
         private boolean isPrevisitCalled = false;
 
         @Override
-        public void visit(Pool inResources, Pool outResources) {
+        public void visit(ModulePool inResources, ModulePool outResources) {
             if (!isPrevisitCalled) {
                 throw new AssertionError("Previsit was not called");
             }
             CustomStringTable table = (CustomStringTable)
-                    ((PoolImpl) inResources).getStringTable();
+                    ((ModulePoolImpl) inResources).getStringTable();
             if (table.size() == 0) {
                 throw new AssertionError("Table is empty");
             }
             Map<String, Integer> count = new HashMap<>();
             for (int i = 0; i < table.size(); ++i) {
                 String s = table.getString(i);
-                if (inResources.get(s) != null) {
+                Optional<ModuleEntry> e = inResources.findEntry(s);
+                if (e.isPresent()) {
                     throw new AssertionError();
                 }
                 count.compute(s, (k, c) -> 1 + (c == null ? 0 : c));
@@ -136,9 +139,9 @@ public class PrevisitorTest {
                     throw new AssertionError("Expected one entry in the table, got: " + v + " for " + k);
                 }
             });
-            for (ModuleData r : inResources.getContent()) {
+            inResources.entries().forEach(r -> {
                 outResources.add(r);
-            }
+            });
         }
 
         @Override
@@ -147,21 +150,21 @@ public class PrevisitorTest {
         }
 
         @Override
-        public void previsit(Pool resources, StringTable strings) {
+        public void previsit(ModulePool resources, StringTable strings) {
             isPrevisitCalled = true;
-            for (ModuleData r : resources.getContent()) {
+            resources.entries().forEach(r -> {
                 String s = r.getPath();
                 int lastIndexOf = s.lastIndexOf('/');
                 if (lastIndexOf >= 0) {
                     strings.addString(s.substring(0, lastIndexOf));
                 }
-            }
+            });
         }
 
         @Override
-        public Set<PluginType> getType() {
-            Set<PluginType> set = new HashSet<>();
-            set.add(CATEGORY.TRANSFORMER);
+        public Set<Category> getType() {
+            Set<Category> set = new HashSet<>();
+            set.add(Category.TRANSFORMER);
             return Collections.unmodifiableSet(set);
         }
     }
diff --git a/jdk/test/tools/jlink/plugins/StringSharingPluginTest.java b/jdk/test/tools/jlink/plugins/StringSharingPluginTest.java
index 786da460990..c02a8e6db0c 100644
--- a/jdk/test/tools/jlink/plugins/StringSharingPluginTest.java
+++ b/jdk/test/tools/jlink/plugins/StringSharingPluginTest.java
@@ -38,6 +38,8 @@
  * @run main StringSharingPluginTest
  */
 
+import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.file.Files;
@@ -50,11 +52,11 @@ import java.util.function.Consumer;
 
 import jdk.internal.jimage.decompressor.CompressedResourceHeader;
 import jdk.internal.jimage.decompressor.StringSharingDecompressor;
-import jdk.tools.jlink.internal.PoolImpl;
+import jdk.tools.jlink.internal.ModulePoolImpl;
 import jdk.tools.jlink.internal.StringTable;
 import jdk.tools.jlink.internal.plugins.StringSharingPlugin;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 import tests.Helper;
 import tests.JImageValidator;
@@ -78,7 +80,7 @@ public class StringSharingPluginTest {
         Map<String, Integer> map = new HashMap<>();
         Map<Integer, String> reversedMap = new HashMap<>();
 
-        PoolImpl resources = new PoolImpl(ByteOrder.nativeOrder(), new StringTable() {
+        ModulePoolImpl resources = new ModulePoolImpl(ByteOrder.nativeOrder(), new StringTable() {
             @Override
             public int addString(String str) {
                 Integer id = map.get(str);
@@ -104,7 +106,7 @@ public class StringSharingPluginTest {
                     byte[] content = Files.readAllBytes(p);
                     String path = p.toString().replace('\\', '/');
                     path = path.substring("/modules".length());
-                    ModuleData res = Pool.newResource(path, content);
+                    ModuleEntry res = ModuleEntry.create(path, content);
                     resources.add(res);
                 } catch (Exception ex) {
                     throw new RuntimeException(ex);
@@ -115,19 +117,23 @@ public class StringSharingPluginTest {
             stream.forEach(c);
         }
         TransformerPlugin plugin = new StringSharingPlugin();
-        PoolImpl result = new PoolImpl(resources.getByteOrder(), resources.getStringTable());
+        ModulePoolImpl result = new ModulePoolImpl(resources.getByteOrder(), resources.getStringTable());
         plugin.visit(resources, result);
 
         if (result.isEmpty()) {
             throw new AssertionError("No result");
         }
 
-        for (ModuleData res : result.getContent()) {
+        result.entries().forEach(res -> {
             if (res.getPath().endsWith(".class")) {
-                byte[] uncompacted = StringSharingDecompressor.normalize(reversedMap::get, res.getBytes(),
+                try {
+                    byte[] uncompacted = StringSharingDecompressor.normalize(reversedMap::get, res.getBytes(),
                         CompressedResourceHeader.getSize());
-                JImageValidator.readClass(uncompacted);
+                    JImageValidator.readClass(uncompacted);
+                } catch (IOException exp) {
+                    throw new UncheckedIOException(exp);
+                }
             }
-        }
+        });
     }
 }
diff --git a/jdk/test/tools/jlink/plugins/StripDebugPluginTest.java b/jdk/test/tools/jlink/plugins/StripDebugPluginTest.java
index fd8acae896c..d3617db6f8a 100644
--- a/jdk/test/tools/jlink/plugins/StripDebugPluginTest.java
+++ b/jdk/test/tools/jlink/plugins/StripDebugPluginTest.java
@@ -54,10 +54,10 @@ import com.sun.tools.classfile.ConstantPoolException;
 import com.sun.tools.classfile.Method;
 import java.util.HashMap;
 import java.util.Map;
-import jdk.tools.jlink.internal.PoolImpl;
+import jdk.tools.jlink.internal.ModulePoolImpl;
 import jdk.tools.jlink.internal.plugins.StripDebugPlugin;
-import jdk.tools.jlink.plugin.Pool;
-import jdk.tools.jlink.plugin.Pool.ModuleData;
+import jdk.tools.jlink.plugin.ModuleEntry;
+import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.plugin.TransformerPlugin;
 import tests.Helper;
 
@@ -106,7 +106,7 @@ public class StripDebugPluginTest {
         path = path.replace('\\', '/');
         StripDebugPlugin debug = new StripDebugPlugin();
         debug.configure(new HashMap<>());
-        ModuleData result1 = stripDebug(debug, Pool.newResource(path,content), path, infoPath, moduleInfo);
+        ModuleEntry result1 = stripDebug(debug, ModuleEntry.create(path,content), path, infoPath, moduleInfo);
 
         if (!path.endsWith("module-info.class")) {
             if (result1.getLength() >= content.length) {
@@ -116,7 +116,7 @@ public class StripDebugPluginTest {
             checkDebugAttributes(result1.getBytes());
         }
 
-        ModuleData result2 = stripDebug(debug, result1, path, infoPath, moduleInfo);
+        ModuleEntry result2 = stripDebug(debug, result1, path, infoPath, moduleInfo);
         if (result1.getLength() != result2.getLength()) {
             throw new AssertionError("removing debug info twice reduces class size of "
                     + path);
@@ -124,18 +124,18 @@ public class StripDebugPluginTest {
         checkDebugAttributes(result1.getBytes());
     }
 
-    private ModuleData stripDebug(TransformerPlugin debug, ModuleData classResource,
+    private ModuleEntry stripDebug(TransformerPlugin debug, ModuleEntry classResource,
             String path, String infoPath, byte[] moduleInfo) throws Exception {
-        Pool resources = new PoolImpl();
+        ModulePool resources = new ModulePoolImpl();
         resources.add(classResource);
         if (!path.endsWith("module-info.class")) {
-            ModuleData res2 = Pool.newResource(infoPath, moduleInfo);
+            ModuleEntry res2 = ModuleEntry.create(infoPath, moduleInfo);
             resources.add(res2);
         }
-        Pool results = new PoolImpl();
+        ModulePool results = new ModulePoolImpl();
         debug.visit(resources, results);
         System.out.println(classResource.getPath());
-        return results.get(classResource.getPath());
+        return results.findEntry(classResource.getPath()).get();
     }
 
     private void checkDebugAttributes(byte[] strippedClassFile) throws IOException, ConstantPoolException {

From baf59c0bd8876069bc565c39ec0564ade6fed6a8 Mon Sep 17 00:00:00 2001
From: Pavel Rappo <prappo@openjdk.org>
Date: Mon, 16 May 2016 15:10:04 +0100
Subject: [PATCH 028/228] 8150785: (bf) Hoist slice and duplicate methods up to
 java.nio.Buffer

Reviewed-by: alanb, rriggs, chegar
---
 .../share/classes/java/nio/Buffer.java        | 48 ++++++++++++++++++-
 .../classes/java/nio/X-Buffer.java.template   |  5 +-
 .../java/nio/Buffer/Order-X.java.template     |  3 --
 jdk/test/java/nio/Buffer/Order.java           | 24 ++++++----
 jdk/test/java/nio/Buffer/OrderChar.java       |  3 --
 jdk/test/java/nio/Buffer/OrderDouble.java     |  3 --
 jdk/test/java/nio/Buffer/OrderFloat.java      |  3 --
 jdk/test/java/nio/Buffer/OrderInt.java        |  3 --
 jdk/test/java/nio/Buffer/OrderLong.java       |  3 --
 jdk/test/java/nio/Buffer/OrderShort.java      |  3 --
 10 files changed, 65 insertions(+), 33 deletions(-)

diff --git a/jdk/src/java.base/share/classes/java/nio/Buffer.java b/jdk/src/java.base/share/classes/java/nio/Buffer.java
index d534fb3ae73..1f6bef17960 100644
--- a/jdk/src/java.base/share/classes/java/nio/Buffer.java
+++ b/jdk/src/java.base/share/classes/java/nio/Buffer.java
@@ -111,7 +111,7 @@ import java.util.Spliterator;
  * to zero.
  *
  *
- * <h2> Clearing, flipping, and rewinding </h2>
+ * <h2> Additional operations </h2>
  *
  * <p> In addition to methods for accessing the position, limit, and capacity
  * values and for marking and resetting, this class also defines the following
@@ -131,6 +131,12 @@ import java.util.Spliterator;
  *   it already contains: It leaves the limit unchanged and sets the position
  *   to zero.  </p></li>
  *
+ *   <li><p> {@link #slice} creates a subsequence of a buffer: It leaves the
+ *   limit and the position unchanged. </p></li>
+ *
+ *   <li><p> {@link #duplicate} creates a shallow copy of a buffer: It leaves
+ *   the limit and the position unchanged. </p></li>
+ *
  * </ul>
  *
  *
@@ -567,6 +573,46 @@ public abstract class Buffer {
      */
     public abstract boolean isDirect();
 
+    /**
+     * Creates a new buffer whose content is a shared subsequence of
+     * this buffer's content.
+     *
+     * <p> The content of the new buffer will start at this buffer's current
+     * position.  Changes to this buffer's content will be visible in the new
+     * buffer, and vice versa; the two buffers' position, limit, and mark
+     * values will be independent.
+     *
+     * <p> The new buffer's position will be zero, its capacity and its limit
+     * will be the number of elements remaining in this buffer, its mark will be
+     * undefined. The new buffer will be direct if, and only if, this buffer is
+     * direct, and it will be read-only if, and only if, this buffer is
+     * read-only.  </p>
+     *
+     * @return  The new buffer
+     *
+     * @since 9
+     */
+    public abstract Buffer slice();
+
+    /**
+     * Creates a new buffer that shares this buffer's content.
+     *
+     * <p> The content of the new buffer will be that of this buffer.  Changes
+     * to this buffer's content will be visible in the new buffer, and vice
+     * versa; the two buffers' position, limit, and mark values will be
+     * independent.
+     *
+     * <p> The new buffer's capacity, limit, position and mark values will be
+     * identical to those of this buffer. The new buffer will be direct if, and
+     * only if, this buffer is direct, and it will be read-only if, and only if,
+     * this buffer is read-only.  </p>
+     *
+     * @return  The new buffer
+     *
+     * @since 9
+     */
+    public abstract Buffer duplicate();
+
 
     // -- Package-private methods for bounds checking, etc. --
 
diff --git a/jdk/src/java.base/share/classes/java/nio/X-Buffer.java.template b/jdk/src/java.base/share/classes/java/nio/X-Buffer.java.template
index 104f504b551..1292ca458c6 100644
--- a/jdk/src/java.base/share/classes/java/nio/X-Buffer.java.template
+++ b/jdk/src/java.base/share/classes/java/nio/X-Buffer.java.template
@@ -70,8 +70,7 @@ import java.util.stream.$Streamtype$Stream;
  *
 #end[byte]
  *
- *   <li><p> Methods for {@link #compact compacting}, {@link
- *   #duplicate duplicating}, and {@link #slice slicing}
+ *   <li><p> A method for {@link #compact compacting}
  *   $a$ $type$ buffer.  </p></li>
  *
  * </ul>
@@ -535,6 +534,7 @@ public abstract class $Type$Buffer
      * @see #alignedSlice(int)
 #end[byte]
      */
+    @Override
     public abstract $Type$Buffer slice();
 
     /**
@@ -557,6 +557,7 @@ public abstract class $Type$Buffer
      *
      * @return  The new $type$ buffer
      */
+    @Override
     public abstract $Type$Buffer duplicate();
 
     /**
diff --git a/jdk/test/java/nio/Buffer/Order-X.java.template b/jdk/test/java/nio/Buffer/Order-X.java.template
index a8753a5f8a9..97313a841f6 100644
--- a/jdk/test/java/nio/Buffer/Order-X.java.template
+++ b/jdk/test/java/nio/Buffer/Order-X.java.template
@@ -52,8 +52,5 @@ public class Order$Type$ extends Order {
         buf = $Type$Buffer.allocate(LENGTH);
         ck(buf.order(), nord);
         ck$Type$Buffer(buf, nord);
-
-        ck$Type$Buffer(ByteBuffer.allocate(LENGTH).as$Type$Buffer(), be);
-        ck$Type$Buffer(ByteBuffer.allocateDirect(LENGTH).as$Type$Buffer(), be);
     }
 }
diff --git a/jdk/test/java/nio/Buffer/Order.java b/jdk/test/java/nio/Buffer/Order.java
index 0232992525b..33ae418bb56 100644
--- a/jdk/test/java/nio/Buffer/Order.java
+++ b/jdk/test/java/nio/Buffer/Order.java
@@ -51,25 +51,31 @@ public class Order {
         ck(bb.asDoubleBuffer().order(), bb.order());
     }
 
+    private static void ckCopyViews(ByteBuffer bb) {
+        ck(bb.asReadOnlyBuffer().order(), be);
+        ck(bb.duplicate().order(), be);
+        ck(bb.slice().order(), be);
+    }
+
     private static void ckByteBuffer(ByteBuffer bb) {
         ckViews(bb);
+        ckCopyViews(bb);
         bb.order(be);
         ckViews(bb);
+        ckCopyViews(bb);
         bb.order(le);
         ckViews(bb);
-
-        if (bb.hasArray()) {
-            byte[] array = bb.array();
-            ck(ByteBuffer.wrap(array, LENGTH/2, LENGTH/2).order(), be);
-            ck(ByteBuffer.wrap(array).order(), be);
-            ck(bb.asReadOnlyBuffer().order(), be);
-            ck(bb.duplicate().order(), be);
-            ck(bb.slice().order(), be);
-        }
+        ckCopyViews(bb);
     }
 
     public static void main(String args[]) throws Exception {
 
+        ck(ByteBuffer.wrap(new byte[LENGTH], LENGTH/2, LENGTH/2).order(), be);
+        ck(ByteBuffer.wrap(new byte[LENGTH]).order(), be);
+        ck(ByteBuffer.wrap(new byte[LENGTH], LENGTH/2, LENGTH/2).order(be).order(), be);
+        ck(ByteBuffer.wrap(new byte[LENGTH]).order(be).order(), be);
+        ck(ByteBuffer.wrap(new byte[LENGTH], LENGTH/2, LENGTH/2).order(le).order(), le);
+        ck(ByteBuffer.wrap(new byte[LENGTH]).order(le).order(), le);
         ck(ByteBuffer.allocate(LENGTH).order(), be);
         ck(ByteBuffer.allocateDirect(LENGTH).order(), be);
         ck(ByteBuffer.allocate(LENGTH).order(be).order(), be);
diff --git a/jdk/test/java/nio/Buffer/OrderChar.java b/jdk/test/java/nio/Buffer/OrderChar.java
index ebf9faad79c..f72828bd0de 100644
--- a/jdk/test/java/nio/Buffer/OrderChar.java
+++ b/jdk/test/java/nio/Buffer/OrderChar.java
@@ -52,8 +52,5 @@ public class OrderChar extends Order {
         buf = CharBuffer.allocate(LENGTH);
         ck(buf.order(), nord);
         ckCharBuffer(buf, nord);
-
-        ckCharBuffer(ByteBuffer.allocate(LENGTH).asCharBuffer(), be);
-        ckCharBuffer(ByteBuffer.allocateDirect(LENGTH).asCharBuffer(), be);
     }
 }
diff --git a/jdk/test/java/nio/Buffer/OrderDouble.java b/jdk/test/java/nio/Buffer/OrderDouble.java
index deaa6a3eb27..4100695cab5 100644
--- a/jdk/test/java/nio/Buffer/OrderDouble.java
+++ b/jdk/test/java/nio/Buffer/OrderDouble.java
@@ -52,8 +52,5 @@ public class OrderDouble extends Order {
         buf = DoubleBuffer.allocate(LENGTH);
         ck(buf.order(), nord);
         ckDoubleBuffer(buf, nord);
-
-        ckDoubleBuffer(ByteBuffer.allocate(LENGTH).asDoubleBuffer(), be);
-        ckDoubleBuffer(ByteBuffer.allocateDirect(LENGTH).asDoubleBuffer(), be);
     }
 }
diff --git a/jdk/test/java/nio/Buffer/OrderFloat.java b/jdk/test/java/nio/Buffer/OrderFloat.java
index 6a65eaa8e4f..905d531d434 100644
--- a/jdk/test/java/nio/Buffer/OrderFloat.java
+++ b/jdk/test/java/nio/Buffer/OrderFloat.java
@@ -52,8 +52,5 @@ public class OrderFloat extends Order {
         buf = FloatBuffer.allocate(LENGTH);
         ck(buf.order(), nord);
         ckFloatBuffer(buf, nord);
-
-        ckFloatBuffer(ByteBuffer.allocate(LENGTH).asFloatBuffer(), be);
-        ckFloatBuffer(ByteBuffer.allocateDirect(LENGTH).asFloatBuffer(), be);
     }
 }
diff --git a/jdk/test/java/nio/Buffer/OrderInt.java b/jdk/test/java/nio/Buffer/OrderInt.java
index 5d3843ffec7..700fc07110a 100644
--- a/jdk/test/java/nio/Buffer/OrderInt.java
+++ b/jdk/test/java/nio/Buffer/OrderInt.java
@@ -52,8 +52,5 @@ public class OrderInt extends Order {
         buf = IntBuffer.allocate(LENGTH);
         ck(buf.order(), nord);
         ckIntBuffer(buf, nord);
-
-        ckIntBuffer(ByteBuffer.allocate(LENGTH).asIntBuffer(), be);
-        ckIntBuffer(ByteBuffer.allocateDirect(LENGTH).asIntBuffer(), be);
     }
 }
diff --git a/jdk/test/java/nio/Buffer/OrderLong.java b/jdk/test/java/nio/Buffer/OrderLong.java
index abda8b22932..9e507ffc18e 100644
--- a/jdk/test/java/nio/Buffer/OrderLong.java
+++ b/jdk/test/java/nio/Buffer/OrderLong.java
@@ -52,8 +52,5 @@ public class OrderLong extends Order {
         buf = LongBuffer.allocate(LENGTH);
         ck(buf.order(), nord);
         ckLongBuffer(buf, nord);
-
-        ckLongBuffer(ByteBuffer.allocate(LENGTH).asLongBuffer(), be);
-        ckLongBuffer(ByteBuffer.allocateDirect(LENGTH).asLongBuffer(), be);
     }
 }
diff --git a/jdk/test/java/nio/Buffer/OrderShort.java b/jdk/test/java/nio/Buffer/OrderShort.java
index d19b43a1b60..f385b62d6dd 100644
--- a/jdk/test/java/nio/Buffer/OrderShort.java
+++ b/jdk/test/java/nio/Buffer/OrderShort.java
@@ -52,8 +52,5 @@ public class OrderShort extends Order {
         buf = ShortBuffer.allocate(LENGTH);
         ck(buf.order(), nord);
         ckShortBuffer(buf, nord);
-
-        ckShortBuffer(ByteBuffer.allocate(LENGTH).asShortBuffer(), be);
-        ckShortBuffer(ByteBuffer.allocateDirect(LENGTH).asShortBuffer(), be);
     }
 }

From fc86d03190d3bf585459ec9057978272e6ab5900 Mon Sep 17 00:00:00 2001
From: Michael McMahon <michaelm@openjdk.org>
Date: Mon, 16 May 2016 16:04:14 +0100
Subject: [PATCH 029/228] 8156825:
 java/net/httpclient/BasicWebSocketAPITest.java failed with
 java.lang.AssertionError

Reviewed-by: rriggs
---
 .../classes/java/net/http/HttpClientImpl.java | 17 +++++++++++
 .../classes/java/net/http/HttpHeaders1.java   | 29 -------------------
 .../java/net/http/HttpResponseImpl.java       |  2 +-
 .../classes/java/net/http/RawChannel.java     | 15 +++++++++-
 .../java/net/http/WSOpeningHandshake.java     | 11 ++++++-
 5 files changed, 42 insertions(+), 32 deletions(-)
 delete mode 100644 jdk/src/java.httpclient/share/classes/java/net/http/HttpHeaders1.java

diff --git a/jdk/src/java.httpclient/share/classes/java/net/http/HttpClientImpl.java b/jdk/src/java.httpclient/share/classes/java/net/http/HttpClientImpl.java
index 446987d6b5d..226cee95c55 100644
--- a/jdk/src/java.httpclient/share/classes/java/net/http/HttpClientImpl.java
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/HttpClientImpl.java
@@ -35,6 +35,7 @@ import java.nio.channels.ClosedChannelException;
 import java.nio.channels.SelectableChannel;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
+import java.nio.channels.SocketChannel;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -155,6 +156,15 @@ class HttpClientImpl extends HttpClient implements BufferHandler {
         selmgr.register(exchange);
     }
 
+    /**
+     * Only used from RawChannel to disconnect the channel from
+     * the selector
+     */
+    void cancelRegistration(SocketChannel s) {
+        selmgr.cancel(s);
+    }
+
+
     Http2ClientImpl client2() {
         return client2;
     }
@@ -220,6 +230,13 @@ class HttpClientImpl extends HttpClient implements BufferHandler {
             selector.wakeup();
         }
 
+        synchronized void cancel(SocketChannel e) {
+            SelectionKey key = e.keyFor(selector);
+            if (key != null)
+                key.cancel();
+            selector.wakeup();
+        }
+
         void wakeupSelector() {
             selector.wakeup();
         }
diff --git a/jdk/src/java.httpclient/share/classes/java/net/http/HttpHeaders1.java b/jdk/src/java.httpclient/share/classes/java/net/http/HttpHeaders1.java
deleted file mode 100644
index c9ff689a931..00000000000
--- a/jdk/src/java.httpclient/share/classes/java/net/http/HttpHeaders1.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2015, 2016, 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
- */
-
-package java.net.http;
-
-public interface HttpHeaders1 extends HttpHeaders {
-    public void makeUnmodifiable();
-}
diff --git a/jdk/src/java.httpclient/share/classes/java/net/http/HttpResponseImpl.java b/jdk/src/java.httpclient/share/classes/java/net/http/HttpResponseImpl.java
index 10758d6db99..dcbfbdb8f1a 100644
--- a/jdk/src/java.httpclient/share/classes/java/net/http/HttpResponseImpl.java
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/HttpResponseImpl.java
@@ -176,7 +176,7 @@ class HttpResponseImpl extends HttpResponse {
      *
      * @return
      */
-    RawChannel rawChannel() {
+    RawChannel rawChannel() throws IOException {
         if (rawchan == null) {
             rawchan = new RawChannel(request.client(), connection);
         }
diff --git a/jdk/src/java.httpclient/share/classes/java/net/http/RawChannel.java b/jdk/src/java.httpclient/share/classes/java/net/http/RawChannel.java
index e4dc3b00b8d..5f6fb4df6c0 100644
--- a/jdk/src/java.httpclient/share/classes/java/net/http/RawChannel.java
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/RawChannel.java
@@ -29,6 +29,7 @@ import java.nio.channels.ByteChannel;
 import java.nio.channels.GatheringByteChannel;
 import java.nio.channels.SelectableChannel;
 import java.nio.channels.SelectionKey;
+import java.nio.channels.SocketChannel;
 
 //
 // Used to implement WebSocket. Each RawChannel corresponds to a TCP connection
@@ -56,9 +57,21 @@ final class RawChannel implements ByteChannel, GatheringByteChannel {
     interface NonBlockingEvent extends RawEvent {
     }
 
-    RawChannel(HttpClientImpl client, HttpConnection connection) {
+    RawChannel(HttpClientImpl client, HttpConnection connection)
+                                                throws IOException {
         this.client = client;
         this.connection = connection;
+        SocketChannel chan = connection.channel();
+        client.cancelRegistration(chan);
+        chan.configureBlocking(false);
+    }
+
+    SocketChannel socketChannel() {
+        return connection.channel();
+    }
+
+    ByteBuffer getRemaining() {
+        return connection.getRemaining();
     }
 
     private class RawAsyncEvent extends AsyncEvent {
diff --git a/jdk/src/java.httpclient/share/classes/java/net/http/WSOpeningHandshake.java b/jdk/src/java.httpclient/share/classes/java/net/http/WSOpeningHandshake.java
index 6a7ddaa882c..d3cc7da3520 100644
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSOpeningHandshake.java
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSOpeningHandshake.java
@@ -24,6 +24,8 @@
  */
 package java.net.http;
 
+import java.io.UncheckedIOException;
+import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
@@ -126,6 +128,8 @@ final class WSOpeningHandshake {
                         return CompletableFuture.completedFuture(result);
                     } catch (WebSocketHandshakeException e) {
                         return CompletableFuture.failedFuture(e);
+                    } catch (UncheckedIOException ee) {
+                        return CompletableFuture.failedFuture(ee.getCause());
                     }
                 });
     }
@@ -149,7 +153,12 @@ final class WSOpeningHandshake {
         checkAccept(response, h);
         checkExtensions(response, h);
         String subprotocol = checkAndReturnSubprotocol(response, h);
-        RawChannel channel = ((HttpResponseImpl) response).rawChannel();
+        RawChannel channel = null;
+        try {
+            channel = ((HttpResponseImpl) response).rawChannel();
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
         return new Result(subprotocol, channel);
     }
 

From 5cd35e69e24863a9b52c78c787f7df6a0485170c Mon Sep 17 00:00:00 2001
From: Rajan Halade <rhalade@openjdk.org>
Date: Mon, 16 May 2016 10:36:51 -0700
Subject: [PATCH 030/228] 8155049: New tests from 8144566 fail with "No
 expected Server Name Indication"

Reviewed-by: xuelei
---
 .../javax/net/ssl/ServerName/BestEffortOnLazyConnected.java   | 4 +---
 .../www/protocol/https/HttpsURLConnection/ImpactOnSNI.java    | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/jdk/test/javax/net/ssl/ServerName/BestEffortOnLazyConnected.java b/jdk/test/javax/net/ssl/ServerName/BestEffortOnLazyConnected.java
index ba3e5f10e50..bda0710f61e 100644
--- a/jdk/test/javax/net/ssl/ServerName/BestEffortOnLazyConnected.java
+++ b/jdk/test/javax/net/ssl/ServerName/BestEffortOnLazyConnected.java
@@ -34,9 +34,6 @@
  */
 
 import java.io.*;
-import java.nio.*;
-import java.nio.channels.*;
-import java.util.*;
 import java.net.*;
 import javax.net.ssl.*;
 
@@ -197,6 +194,7 @@ public class BestEffortOnLazyConnected {
                 hostname);
         // Ignore the test if the hostname does not sound like a domain name.
         if ((hostname == null) || hostname.isEmpty() ||
+                !hostname.contains(".") || hostname.endsWith(".") ||
                 hostname.startsWith("localhost") ||
                 Character.isDigit(hostname.charAt(hostname.length() - 1))) {
 
diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/ImpactOnSNI.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/ImpactOnSNI.java
index 4e0f0bdac59..d90d9478e2a 100644
--- a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/ImpactOnSNI.java
+++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/ImpactOnSNI.java
@@ -235,6 +235,7 @@ public class ImpactOnSNI {
                 hostname);
         // Ignore the test if the hostname does not sound like a domain name.
         if ((hostname == null) || hostname.isEmpty() ||
+                !hostname.contains(".") || hostname.endsWith(".") ||
                 hostname.startsWith("localhost") ||
                 Character.isDigit(hostname.charAt(hostname.length() - 1))) {
 

From 5c27ac09c7127a449ad8d9535a0fe420d94829f2 Mon Sep 17 00:00:00 2001
From: Sean Mullan <mullan@openjdk.org>
Date: Mon, 16 May 2016 13:53:46 -0400
Subject: [PATCH 031/228] 8150468: ClassCircularityError on error in security
 policy file

Reviewed-by: mchung, xuelei
---
 .../sun/security/provider/PolicyFile.java     | 36 ++++++++++---
 .../sun/security/provider/PolicyParser.java   | 38 +++++++++-----
 .../provider/PolicyFile/BadPolicyFile.java    | 51 +++++++++++++++++++
 .../provider/PolicyFile/BadPolicyFile.policy  |  4 ++
 4 files changed, 110 insertions(+), 19 deletions(-)
 create mode 100644 jdk/test/sun/security/provider/PolicyFile/BadPolicyFile.java
 create mode 100644 jdk/test/sun/security/provider/PolicyFile/BadPolicyFile.policy

diff --git a/jdk/src/java.base/share/classes/sun/security/provider/PolicyFile.java b/jdk/src/java.base/share/classes/sun/security/provider/PolicyFile.java
index 5861b6c7a85..861fa692471 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/PolicyFile.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/PolicyFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -259,14 +259,10 @@ public class PolicyFile extends java.security.Policy {
 
     private static final Debug debug = Debug.getInstance("policy");
 
-    private static final String NONE = "NONE";
-    private static final String P11KEYSTORE = "PKCS11";
-
     private static final String SELF = "${{self}}";
     private static final String X500PRINCIPAL =
                         "javax.security.auth.x500.X500Principal";
     private static final String POLICY = "java.security.policy";
-    private static final String SECURITY_MANAGER = "java.security.manager";
     private static final String POLICY_URL = "policy.url.";
     private static final String AUTH_POLICY = "java.security.auth.policy";
     private static final String AUTH_POLICY_URL = "auth.policy.url.";
@@ -287,6 +283,17 @@ public class PolicyFile extends java.security.Policy {
     private static final Class<?>[] PARAMS1 = { String.class };
     private static final Class<?>[] PARAMS2 = { String.class, String.class };
 
+    /**
+     * When a policy file has a syntax error, the exception code may generate
+     * another permission check and this can cause the policy file to be parsed
+     * repeatedly, leading to a StackOverflowError or ClassCircularityError.
+     * To avoid this, this set is populated with policy files that have been
+     * previously parsed and have syntax errors, so that they can be
+     * subsequently ignored.
+     */
+    private static AtomicReference<Set<URL>> badPolicyURLs =
+        new AtomicReference<>(new HashSet<>());
+
     /**
      * Initializes the Policy object and reads the default policy
      * configuration file(s) into the Policy object.
@@ -580,6 +587,16 @@ public class PolicyFile extends java.security.Policy {
      * @param policyFile the policy Reader object.
      */
     private boolean init(URL policy, PolicyInfo newInfo) {
+
+        // skip parsing policy file if it has been previously parsed and
+        // has syntax errors
+        if (badPolicyURLs.get().contains(policy)) {
+            if (debug != null) {
+                debug.println("skipping bad policy file: " + policy);
+            }
+            return false;
+        }
+
         boolean success = false;
         PolicyParser pp = new PolicyParser(expandProperties);
         InputStreamReader isr = null;
@@ -622,13 +639,18 @@ public class PolicyFile extends java.security.Policy {
                 addGrantEntry(ge, keyStore, newInfo);
             }
         } catch (PolicyParser.ParsingException pe) {
+            // record bad policy file to avoid later reparsing it
+            badPolicyURLs.updateAndGet(k -> {
+                k.add(policy);
+                return k;
+            });
             MessageFormat form = new MessageFormat(ResourcesMgr.getString
                 (POLICY + ".error.parsing.policy.message"));
             Object[] source = {policy, pe.getLocalizedMessage()};
             System.err.println(form.format(source));
-            if (debug != null)
+            if (debug != null) {
                 pe.printStackTrace();
-
+            }
         } catch (Exception e) {
             if (debug != null) {
                 debug.println("error parsing "+policy);
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/PolicyParser.java b/jdk/src/java.base/share/classes/sun/security/provider/PolicyParser.java
index ba8ed750254..f8aa620fc77 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/PolicyParser.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/PolicyParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -213,7 +213,9 @@ public class PolicyParser {
                             new MessageFormat(ResourcesMgr.getString(
                                 "duplicate.keystore.domain.name"));
                         Object[] source = {domainName};
-                        throw new ParsingException(form.format(source));
+                        String msg = "duplicate keystore domain name: " +
+                                     domainName;
+                        throw new ParsingException(msg, form, source);
                     }
                 }
             } else {
@@ -743,7 +745,8 @@ public class PolicyParser {
                     ResourcesMgr.getString
                             ("expected.expect.read.end.of.file."));
             Object[] source = {expect};
-            throw new ParsingException(form.format(source));
+            String msg = "expected [" + expect + "], read [end of file]";
+            throw new ParsingException(msg, form, source);
         case StreamTokenizer.TT_WORD:
             if (expect.equalsIgnoreCase(st.sval)) {
                 lookahead = st.nextToken();
@@ -1244,7 +1247,8 @@ public class PolicyParser {
                 MessageFormat form = new MessageFormat(ResourcesMgr.getString(
                     "duplicate.keystore.name"));
                 Object[] source = {keystoreName};
-                throw new ParsingException(form.format(source));
+                String msg = "duplicate keystore name: " + keystoreName;
+                throw new ParsingException(msg, form, source);
             }
         }
 
@@ -1316,6 +1320,8 @@ public class PolicyParser {
         private static final long serialVersionUID = -4330692689482574072L;
 
         private String i18nMessage;
+        private MessageFormat form;
+        private Object[] source;
 
         /**
          * Constructs a ParsingException with the specified
@@ -1330,26 +1336,34 @@ public class PolicyParser {
             i18nMessage = msg;
         }
 
+        public ParsingException(String msg, MessageFormat form,
+                                Object[] source) {
+            super(msg);
+            this.form = form;
+            this.source = source;
+        }
+
         public ParsingException(int line, String msg) {
             super("line " + line + ": " + msg);
-            MessageFormat form = new MessageFormat
-                (ResourcesMgr.getString("line.number.msg"));
-            Object[] source = {line, msg};
-            i18nMessage = form.format(source);
+            // don't call form.format unless getLocalizedMessage is called
+            // to avoid unnecessary permission checks
+            form = new MessageFormat(ResourcesMgr.getString("line.number.msg"));
+            source = new Object[] {line, msg};
         }
 
         public ParsingException(int line, String expect, String actual) {
             super("line " + line + ": expected [" + expect +
                 "], found [" + actual + "]");
-            MessageFormat form = new MessageFormat(ResourcesMgr.getString
+            // don't call form.format unless getLocalizedMessage is called
+            // to avoid unnecessary permission checks
+            form = new MessageFormat(ResourcesMgr.getString
                 ("line.number.expected.expect.found.actual."));
-            Object[] source = {line, expect, actual};
-            i18nMessage = form.format(source);
+            source = new Object[] {line, expect, actual};
         }
 
         @Override
         public String getLocalizedMessage() {
-            return i18nMessage;
+            return i18nMessage != null ? i18nMessage : form.format(source);
         }
     }
 
diff --git a/jdk/test/sun/security/provider/PolicyFile/BadPolicyFile.java b/jdk/test/sun/security/provider/PolicyFile/BadPolicyFile.java
new file mode 100644
index 00000000000..17a4c5d8d71
--- /dev/null
+++ b/jdk/test/sun/security/provider/PolicyFile/BadPolicyFile.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2016, 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 8150468
+ * @summary check that a badly formatted policy file is handled correctly
+ * @run main/othervm BadPolicyFile
+ */
+
+import java.io.File;
+import java.net.URI;
+import java.security.AccessControlException;
+import java.security.Policy;
+import java.security.URIParameter;
+
+public class BadPolicyFile {
+
+    public static void main(String[] args) throws Exception {
+        URI uri = new File(System.getProperty("test.src", "."),
+                           "BadPolicyFile.policy").toURI();
+        Policy.setPolicy(Policy.getInstance("JavaPolicy", new URIParameter(uri)));
+        System.setSecurityManager(new SecurityManager());
+        try {
+            String javahome = System.getProperty("java.home");
+            throw new Exception("Expected AccessControlException");
+        } catch (AccessControlException ace) {
+            System.out.println("Test PASSED");
+        }
+    }
+}
diff --git a/jdk/test/sun/security/provider/PolicyFile/BadPolicyFile.policy b/jdk/test/sun/security/provider/PolicyFile/BadPolicyFile.policy
new file mode 100644
index 00000000000..b5abfaf8f42
--- /dev/null
+++ b/jdk/test/sun/security/provider/PolicyFile/BadPolicyFile.policy
@@ -0,0 +1,4 @@
+grant {
+    // permission statement is missing trailing semi-colon
+    permission "java.util.PropertyPermission" "java.home", "read"
+};

From 6e8eab119e9bad68a1310a47bae29f2f79c33254 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Mon, 16 May 2016 22:07:07 +0100
Subject: [PATCH 032/228] 8156989: Trailing empty element in classpath ignored

Reviewed-by: mchung
---
 .../jdk/internal/loader/ClassLoaders.java     | 47 +++++++++++--------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/jdk/src/java.base/share/classes/jdk/internal/loader/ClassLoaders.java b/jdk/src/java.base/share/classes/jdk/internal/loader/ClassLoaders.java
index 7a946099fdf..bc2396f10c3 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/loader/ClassLoaders.java
+++ b/jdk/src/java.base/share/classes/jdk/internal/loader/ClassLoaders.java
@@ -68,13 +68,14 @@ public class ClassLoaders {
         if (s != null && s.length() > 0)
             bcp = toURLClassPath(s);
 
-        // we have a class path if -cp is specified or -m is not specified
+        // we have a class path if -cp is specified or -m is not specified.
+        // If neither is specified then default to -cp <working directory>.
         URLClassPath ucp = null;
         String mainMid = System.getProperty("jdk.module.main");
         String cp = System.getProperty("java.class.path");
-        if (mainMid == null && (cp == null || cp.length() == 0))
-            cp = ".";
-        if (cp != null && cp.length() > 0)
+        if (mainMid == null && cp == null)
+            cp = "";
+        if (cp != null)
             ucp = toURLClassPath(cp);
 
 
@@ -197,7 +198,7 @@ public class ClassLoaders {
          * @see java.lang.instrument.Instrumentation#appendToSystemClassLoaderSearch
          */
         void appendToClassPathForInstrumentation(String path) {
-            appendToUCP(path, ucp);
+            addClassPathToUCP(path, ucp);
         }
 
         /**
@@ -224,7 +225,7 @@ public class ClassLoaders {
      */
     private static URLClassPath toURLClassPath(String cp) {
         URLClassPath ucp = new URLClassPath(new URL[0]);
-        appendToUCP(cp, ucp);
+        addClassPathToUCP(cp, ucp);
         return ucp;
     }
 
@@ -232,20 +233,28 @@ public class ClassLoaders {
      * Converts the elements in the given class path to file URLs and adds
      * them to the given URLClassPath.
      */
-    private static void appendToUCP(String cp, URLClassPath ucp) {
-        String[] elements = cp.split(File.pathSeparator);
-        if (elements.length == 0) {
-            // contains path separator(s) only, default to current directory
-            // to be compatible with long standing behavior
-            elements = new String[] { "" };
+    private static void addClassPathToUCP(String cp, URLClassPath ucp) {
+        int off = 0;
+        int next;
+        while ((next = cp.indexOf(File.pathSeparator, off)) != -1) {
+            addURLToUCP(cp.substring(off, next), ucp);
+            off = next + 1;
         }
-        for (String s: elements) {
-            try {
-                URL url = Paths.get(s).toRealPath().toUri().toURL();
-                ucp.addURL(url);
-            } catch (InvalidPathException | IOException ignore) {
-                // malformed path string or class path element does not exist
-            }
+
+        // remaining
+        addURLToUCP(cp.substring(off), ucp);
+    }
+
+    /**
+     * Attempts to convert to the given string to a file URL and adds it
+     * to the given URLClassPath.
+     */
+    private static void addURLToUCP(String s, URLClassPath ucp) {
+        try {
+            URL url = Paths.get(s).toRealPath().toUri().toURL();
+            ucp.addURL(url);
+        } catch (InvalidPathException | IOException ignore) {
+            // malformed path string or class path element does not exist
         }
     }
 

From c594c87387f8a7151f4beaee8f623b6cad004191 Mon Sep 17 00:00:00 2001
From: Felix Yang <felix.yang@oracle.com>
Date: Tue, 17 May 2016 02:34:56 -0700
Subject: [PATCH 033/228] 8155088: Fix module dependencies in java/sql/* and
 javax/* tests

Reviewed-by: alanb
---
 jdk/test/java/sql/TEST.properties                     | 2 ++
 jdk/test/javax/net/ssl/HttpsURLConnection/Equals.java | 3 ++-
 jdk/test/javax/rmi/TEST.properties                    | 1 +
 jdk/test/javax/script/TEST.properties                 | 1 +
 jdk/test/javax/xml/jaxp/TEST.properties               | 1 +
 5 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 jdk/test/java/sql/TEST.properties
 create mode 100644 jdk/test/javax/rmi/TEST.properties
 create mode 100644 jdk/test/javax/script/TEST.properties
 create mode 100644 jdk/test/javax/xml/jaxp/TEST.properties

diff --git a/jdk/test/java/sql/TEST.properties b/jdk/test/java/sql/TEST.properties
new file mode 100644
index 00000000000..878b05fc591
--- /dev/null
+++ b/jdk/test/java/sql/TEST.properties
@@ -0,0 +1,2 @@
+modules = java.sql
+
diff --git a/jdk/test/javax/net/ssl/HttpsURLConnection/Equals.java b/jdk/test/javax/net/ssl/HttpsURLConnection/Equals.java
index 0a482f31b90..0e40e52ce9b 100644
--- a/jdk/test/javax/net/ssl/HttpsURLConnection/Equals.java
+++ b/jdk/test/javax/net/ssl/HttpsURLConnection/Equals.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,6 +24,7 @@
 /**
  * @test
  * @library /lib/testlibrary
+ * @modules jdk.httpserver
  * @build jdk.testlibrary.SimpleSSLContext
  * @run main Equals
  * @bug 8055299
diff --git a/jdk/test/javax/rmi/TEST.properties b/jdk/test/javax/rmi/TEST.properties
new file mode 100644
index 00000000000..d4bbfc905b9
--- /dev/null
+++ b/jdk/test/javax/rmi/TEST.properties
@@ -0,0 +1 @@
+modules = java.rmi
diff --git a/jdk/test/javax/script/TEST.properties b/jdk/test/javax/script/TEST.properties
new file mode 100644
index 00000000000..3bb100c3fad
--- /dev/null
+++ b/jdk/test/javax/script/TEST.properties
@@ -0,0 +1 @@
+modules = java.scripting
diff --git a/jdk/test/javax/xml/jaxp/TEST.properties b/jdk/test/javax/xml/jaxp/TEST.properties
new file mode 100644
index 00000000000..fbf9f77ec10
--- /dev/null
+++ b/jdk/test/javax/xml/jaxp/TEST.properties
@@ -0,0 +1 @@
+modules = java.xml

From 44afe20e99f0b43123fe465a02052b12024c07c5 Mon Sep 17 00:00:00 2001
From: Paul Sandoz <psandoz@openjdk.org>
Date: Tue, 17 May 2016 12:06:41 +0200
Subject: [PATCH 034/228] 8156485: MethodHandles.varHandleExactInvoker should
 perform exact checks

Reviewed-by: vlivanov
---
 .../classes/java/lang/invoke/Invokers.java    | 112 +-----
 .../classes/java/lang/invoke/VarHandle.java   |   4 +-
 .../invoke/VarHandles/VarHandleBaseTest.java  |  63 ++-
 .../VarHandleTestAccessBoolean.java           |  21 +
 .../VarHandles/VarHandleTestAccessByte.java   |  21 +
 .../VarHandles/VarHandleTestAccessChar.java   |  21 +
 .../VarHandles/VarHandleTestAccessDouble.java |  21 +
 .../VarHandles/VarHandleTestAccessFloat.java  |  21 +
 .../VarHandles/VarHandleTestAccessInt.java    |   1 +
 .../VarHandles/VarHandleTestAccessLong.java   |   1 +
 .../VarHandles/VarHandleTestAccessShort.java  |  21 +
 .../VarHandles/VarHandleTestAccessString.java |   1 +
 .../VarHandleTestByteArrayAsChar.java         |   5 +
 .../VarHandleTestByteArrayAsDouble.java       |   5 +-
 .../VarHandleTestByteArrayAsFloat.java        |   5 +-
 .../VarHandleTestByteArrayAsInt.java          |   5 +-
 .../VarHandleTestByteArrayAsLong.java         |   5 +-
 .../VarHandleTestByteArrayAsShort.java        |   5 +
 ...arHandleTestMethodHandleAccessBoolean.java |   1 +
 .../VarHandleTestMethodHandleAccessByte.java  |   1 +
 .../VarHandleTestMethodHandleAccessChar.java  |   1 +
 ...VarHandleTestMethodHandleAccessDouble.java |   1 +
 .../VarHandleTestMethodHandleAccessFloat.java |   1 +
 .../VarHandleTestMethodHandleAccessInt.java   |   1 +
 .../VarHandleTestMethodHandleAccessLong.java  |   1 +
 .../VarHandleTestMethodHandleAccessShort.java |   1 +
 ...VarHandleTestMethodHandleAccessString.java |   1 +
 .../VarHandleTestMethodTypeBoolean.java       | 100 ++---
 .../VarHandleTestMethodTypeByte.java          | 100 ++---
 .../VarHandleTestMethodTypeChar.java          | 100 ++---
 .../VarHandleTestMethodTypeDouble.java        | 100 ++---
 .../VarHandleTestMethodTypeFloat.java         | 100 ++---
 .../VarHandleTestMethodTypeInt.java           | 308 +++++++--------
 .../VarHandleTestMethodTypeLong.java          | 308 +++++++--------
 .../VarHandleTestMethodTypeShort.java         | 100 ++---
 .../VarHandleTestMethodTypeString.java        | 310 +++++++--------
 .../X-VarHandleTestAccess.java.template       |  21 +
 ...X-VarHandleTestByteArrayView.java.template |   5 +-
 ...HandleTestMethodHandleAccess.java.template |   1 +
 .../X-VarHandleTestMethodType.java.template   | 370 +++++++++---------
 40 files changed, 1190 insertions(+), 1080 deletions(-)

diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/Invokers.java b/jdk/src/java.base/share/classes/java/lang/invoke/Invokers.java
index 29cc430f877..1aca86298fe 100644
--- a/jdk/src/java.base/share/classes/java/lang/invoke/Invokers.java
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/Invokers.java
@@ -95,12 +95,12 @@ class Invokers {
 
     /*non-public*/ MethodHandle varHandleMethodInvoker(VarHandle.AccessMode ak) {
         // TODO cache invoker
-        return makeVarHandleMethodInvoker(ak);
+        return makeVarHandleMethodInvoker(ak, false);
     }
 
     /*non-public*/ MethodHandle varHandleMethodExactInvoker(VarHandle.AccessMode ak) {
         // TODO cache invoker
-        return makeVarHandleMethodExactInvoker(ak);
+        return makeVarHandleMethodInvoker(ak, true);
     }
 
     private MethodHandle cachedInvoker(int idx) {
@@ -127,26 +127,11 @@ class Invokers {
         return invoker;
     }
 
-    private MethodHandle makeVarHandleMethodInvoker(VarHandle.AccessMode ak) {
+    private MethodHandle makeVarHandleMethodInvoker(VarHandle.AccessMode ak, boolean isExact) {
         MethodType mtype = targetType;
         MethodType invokerType = mtype.insertParameterTypes(0, VarHandle.class);
 
-        LambdaForm lform = varHandleMethodGenericInvokerHandleForm(ak.methodName(), mtype);
-        VarHandle.AccessDescriptor ad = new VarHandle.AccessDescriptor(mtype, ak.at.ordinal(), ak.ordinal());
-        MethodHandle invoker = BoundMethodHandle.bindSingle(invokerType, lform, ad);
-
-        invoker = invoker.withInternalMemberName(MemberName.makeVarHandleMethodInvoke(ak.methodName(), mtype), false);
-        assert(checkVarHandleInvoker(invoker));
-
-        maybeCompileToBytecode(invoker);
-        return invoker;
-    }
-
-    private MethodHandle makeVarHandleMethodExactInvoker(VarHandle.AccessMode ak) {
-        MethodType mtype = targetType;
-        MethodType invokerType = mtype.insertParameterTypes(0, VarHandle.class);
-
-        LambdaForm lform = varHandleMethodExactInvokerHandleForm(ak.methodName(), mtype);
+        LambdaForm lform = varHandleMethodInvokerHandleForm(ak.methodName(), mtype, isExact);
         VarHandle.AccessDescriptor ad = new VarHandle.AccessDescriptor(mtype, ak.at.ordinal(), ak.ordinal());
         MethodHandle invoker = BoundMethodHandle.bindSingle(invokerType, lform, ad);
 
@@ -400,59 +385,7 @@ class Invokers {
         return lform;
     }
 
-    private static LambdaForm varHandleMethodExactInvokerHandleForm(String name, MethodType mtype) {
-        // TODO Cache form?
-
-        final int THIS_MH      = 0;
-        final int CALL_VH      = THIS_MH + 1;
-        final int ARG_BASE     = CALL_VH + 1;
-        final int ARG_LIMIT = ARG_BASE + mtype.parameterCount();
-        int nameCursor = ARG_LIMIT;
-        final int VAD_ARG      = nameCursor++;
-        final int CHECK_TYPE   = nameCursor++;
-        final int GET_MEMBER   = nameCursor++;
-        final int LINKER_CALL  = nameCursor++;
-
-        MethodType invokerFormType = mtype.insertParameterTypes(0, VarHandle.class)
-                .basicType()
-                .appendParameterTypes(MemberName.class);
-
-        MemberName linker = new MemberName(MethodHandle.class, "linkToStatic", invokerFormType, REF_invokeStatic);
-        try {
-            linker = MemberName.getFactory().resolveOrFail(REF_invokeStatic, linker, null, NoSuchMethodException.class);
-        } catch (ReflectiveOperationException ex) {
-            throw newInternalError(ex);
-        }
-
-        Name[] names = new Name[LINKER_CALL + 1];
-        names[THIS_MH] = argument(THIS_MH, BasicType.basicType(Object.class));
-        names[CALL_VH] = argument(CALL_VH, BasicType.basicType(Object.class));
-        for (int i = 0; i < mtype.parameterCount(); i++) {
-            names[ARG_BASE + i] = argument(ARG_BASE + i, BasicType.basicType(mtype.parameterType(i)));
-        }
-
-        BoundMethodHandle.SpeciesData speciesData = BoundMethodHandle.speciesData_L();
-        names[THIS_MH] = names[THIS_MH].withConstraint(speciesData);
-
-        NamedFunction getter = speciesData.getterFunction(0);
-        names[VAD_ARG] = new Name(getter, names[THIS_MH]);
-
-        Object[] outArgs = Arrays.copyOfRange(names, CALL_VH, ARG_LIMIT + 1, Object[].class);
-
-        names[CHECK_TYPE] = new Name(NF_checkVarHandleExactType, names[CALL_VH], names[VAD_ARG]);
-
-        names[GET_MEMBER] = new Name(NF_getVarHandleMemberName, names[CALL_VH], names[VAD_ARG]);
-        outArgs[outArgs.length - 1] = names[GET_MEMBER];
-
-        names[LINKER_CALL] = new Name(linker, outArgs);
-        LambdaForm lform = new LambdaForm(name + ":VarHandle_exactInvoker" + shortenSignature(basicTypeSignature(mtype)),
-                                          ARG_LIMIT, names);
-
-        lform.compileToBytecode();
-        return lform;
-    }
-
-    private static LambdaForm varHandleMethodGenericInvokerHandleForm(String name, MethodType mtype) {
+    private static LambdaForm varHandleMethodInvokerHandleForm(String name, MethodType mtype, boolean isExact) {
         // TODO Cache form?
 
         final int THIS_MH      = 0;
@@ -477,8 +410,11 @@ class Invokers {
         NamedFunction getter = speciesData.getterFunction(0);
         names[VAD_ARG] = new Name(getter, names[THIS_MH]);
 
-        names[CHECK_TYPE] = new Name(NF_checkVarHandleGenericType, names[CALL_VH], names[VAD_ARG]);
-
+        if (isExact) {
+            names[CHECK_TYPE] = new Name(NF_checkVarHandleExactType, names[CALL_VH], names[VAD_ARG]);
+        } else {
+            names[CHECK_TYPE] = new Name(NF_checkVarHandleGenericType, names[CALL_VH], names[VAD_ARG]);
+        }
         Object[] outArgs = new Object[ARG_LIMIT];
         outArgs[0] = names[CHECK_TYPE];
         for (int i = 1; i < ARG_LIMIT; i++) {
@@ -488,7 +424,8 @@ class Invokers {
         MethodType outCallType = mtype.insertParameterTypes(0, VarHandle.class)
                 .basicType();
         names[LINKER_CALL] = new Name(outCallType, outArgs);
-        LambdaForm lform = new LambdaForm(name + ":VarHandle_invoker" + shortenSignature(basicTypeSignature(mtype)),
+        String debugName = isExact ? ":VarHandle_exactInvoker" : ":VarHandle_invoker";
+        LambdaForm lform = new LambdaForm(name + debugName + shortenSignature(basicTypeSignature(mtype)),
                                           ARG_LIMIT, names);
 
         lform.prepare();
@@ -511,21 +448,13 @@ class Invokers {
 
     /*non-public*/ static
     @ForceInline
-    void checkVarHandleExactType(VarHandle handle, VarHandle.AccessDescriptor ad) {
-        MethodType erasedTarget = handle.vform.methodType_table[ad.type];
-        MethodType erasedSymbolic = ad.symbolicMethodTypeErased;
-        if (erasedTarget != erasedSymbolic)
-            throw newWrongMethodTypeException(erasedTarget, erasedSymbolic);
-    }
-
-    /*non-public*/ static
-    @ForceInline
-    MemberName getVarHandleMemberName(VarHandle handle, VarHandle.AccessDescriptor ad) {
-        MemberName mn = handle.vform.memberName_table[ad.mode];
-        if (mn == null) {
-            throw handle.unsupported();
+    MethodHandle checkVarHandleExactType(VarHandle handle, VarHandle.AccessDescriptor ad) {
+        MethodHandle mh = handle.getMethodHandle(ad.mode);
+        MethodType mt = mh.type();
+        if (mt != ad.symbolicMethodTypeInvoker) {
+            throw newWrongMethodTypeException(mt, ad.symbolicMethodTypeInvoker);
         }
-        return mn;
+        return mh;
     }
 
     /*non-public*/ static
@@ -649,8 +578,7 @@ class Invokers {
         NF_getCallSiteTarget,
         NF_checkCustomized,
         NF_checkVarHandleGenericType,
-        NF_checkVarHandleExactType,
-        NF_getVarHandleMemberName;
+        NF_checkVarHandleExactType;
     static {
         try {
             NamedFunction nfs[] = {
@@ -666,8 +594,6 @@ class Invokers {
                         .getDeclaredMethod("checkVarHandleGenericType", VarHandle.class, VarHandle.AccessDescriptor.class)),
                 NF_checkVarHandleExactType = new NamedFunction(Invokers.class
                         .getDeclaredMethod("checkVarHandleExactType", VarHandle.class, VarHandle.AccessDescriptor.class)),
-                NF_getVarHandleMemberName = new NamedFunction(Invokers.class
-                        .getDeclaredMethod("getVarHandleMemberName", VarHandle.class, VarHandle.AccessDescriptor.class))
             };
             // Each nf must be statically invocable or we get tied up in our bootstraps.
             assert(InvokerBytecodeGenerator.isStaticallyInvocable(nfs));
diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/VarHandle.java b/jdk/src/java.base/share/classes/java/lang/invoke/VarHandle.java
index 78a75bf05cc..ccbaf4b3b69 100644
--- a/jdk/src/java.base/share/classes/java/lang/invoke/VarHandle.java
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/VarHandle.java
@@ -1475,11 +1475,11 @@ public abstract class VarHandle {
         TypesAndInvokers tis = getTypesAndInvokers();
         MethodHandle mh = tis.methodHandle_table[mode];
         if (mh == null) {
-            mh = tis.methodHandle_table[mode] = getMethodHandleUncached(tis, mode);
+            mh = tis.methodHandle_table[mode] = getMethodHandleUncached(mode);
         }
         return mh;
     }
-    private final MethodHandle getMethodHandleUncached(TypesAndInvokers tis, int mode) {
+    private final MethodHandle getMethodHandleUncached(int mode) {
         MethodType mt = accessModeType(AccessMode.values()[mode]).
                 insertParameterTypes(0, VarHandle.class);
         MemberName mn = vform.getMemberName(mode);
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleBaseTest.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleBaseTest.java
index 59737dbeb7b..a40675b4073 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleBaseTest.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleBaseTest.java
@@ -211,7 +211,6 @@ abstract class VarHandleBaseTest {
     }
 
     static MethodHandle findVirtual(VarHandle vh, TestAccessMode tam, MethodType mt) {
-        mt = vh.accessModeType(tam.toAccessMode());
         MethodHandle mh;
         try {
             mh = MethodHandles.publicLookup().
@@ -221,36 +220,26 @@ abstract class VarHandleBaseTest {
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
-        return bind(vh, tam, mh, mt);
+        return bind(vh, mh, mt);
     }
 
-    static MethodHandle varHandleInvokerWithAccessModeType(VarHandle vh, TestAccessMode tam, MethodType mt) {
-        mt = vh.accessModeType(tam.toAccessMode());
+    static MethodHandle varHandleInvoker(VarHandle vh, TestAccessMode tam, MethodType mt) {
         MethodHandle mh = MethodHandles.varHandleInvoker(
                 tam.toAccessMode(),
                 mt);
 
-        return bind(vh, tam, mh, mt);
+        return bind(vh, mh, mt);
     }
 
-    static MethodHandle varHandleInvokerWithSymbolicTypeDescriptor(VarHandle vh, TestAccessMode tam, MethodType mt) {
-        MethodHandle mh = MethodHandles.varHandleInvoker(
-                tam.toAccessMode(),
-                mt);
-
-        return bind(vh, tam, mh, mt);
-    }
-
-    static MethodHandle varHandleExactInvokerWithAccessModeType(VarHandle vh, TestAccessMode tam, MethodType mt) {
-        mt = vh.accessModeType(tam.toAccessMode());
+    static MethodHandle varHandleExactInvoker(VarHandle vh, TestAccessMode tam, MethodType mt) {
         MethodHandle mh = MethodHandles.varHandleExactInvoker(
                 tam.toAccessMode(),
                 mt);
 
-        return bind(vh, tam, mh, mt);
+        return bind(vh, mh, mt);
     }
 
-    private static MethodHandle bind(VarHandle vh, TestAccessMode testAccessMode, MethodHandle mh, MethodType emt) {
+    private static MethodHandle bind(VarHandle vh, MethodHandle mh, MethodType emt) {
         assertEquals(mh.type(), emt.insertParameterTypes(0, VarHandle.class),
                      "MethodHandle type differs from access mode type");
 
@@ -268,33 +257,30 @@ abstract class VarHandleBaseTest {
     enum VarHandleToMethodHandle {
         VAR_HANDLE_TO_METHOD_HANDLE(
                 "VarHandle.toMethodHandle",
+                true,
                 VarHandleBaseTest::toMethodHandle),
         METHOD_HANDLES_LOOKUP_FIND_VIRTUAL(
                 "Lookup.findVirtual",
+                false,
                 VarHandleBaseTest::findVirtual),
-        METHOD_HANDLES_VAR_HANDLE_INVOKER_WITH_ACCESS_MODE_TYPE(
-                "MethodHandles.varHandleInvoker(accessModeType)",
-                VarHandleBaseTest::varHandleInvokerWithAccessModeType),
-        METHOD_HANDLES_VAR_HANDLE_INVOKER_WITH_SYMBOLIC_TYPE_DESCRIPTOR(
-                "MethodHandles.varHandleInvoker(symbolicTypeDescriptor)",
-                VarHandleBaseTest::varHandleInvokerWithSymbolicTypeDescriptor),
-        METHOD_HANDLES_VAR_HANDLE_EXACT_INVOKER_WITH_ACCESS_MODE_TYPE(
-                "MethodHandles.varHandleExactInvoker(accessModeType)",
-                VarHandleBaseTest::varHandleExactInvokerWithAccessModeType);
+        METHOD_HANDLES_VAR_HANDLE_INVOKER(
+                "MethodHandles.varHandleInvoker",
+                false,
+                VarHandleBaseTest::varHandleInvoker),
+        METHOD_HANDLES_VAR_HANDLE_EXACT_INVOKER(
+                "MethodHandles.varHandleExactInvoker",
+                true,
+                VarHandleBaseTest::varHandleExactInvoker);
 
         final String desc;
+        final boolean isExact;
         final TriFunction<VarHandle, TestAccessMode, MethodType, MethodHandle> f;
-        final boolean exact;
 
-        VarHandleToMethodHandle(String desc, TriFunction<VarHandle, TestAccessMode, MethodType, MethodHandle> f) {
-            this(desc, f, false);
-        }
-
-        VarHandleToMethodHandle(String desc, TriFunction<VarHandle, TestAccessMode, MethodType, MethodHandle> f,
-                                boolean exact) {
+        VarHandleToMethodHandle(String desc, boolean isExact,
+                                TriFunction<VarHandle, TestAccessMode, MethodType, MethodHandle> f) {
             this.desc = desc;
             this.f = f;
-            this.exact = exact;
+            this.isExact = isExact;
         }
 
         MethodHandle apply(VarHandle vh, TestAccessMode am, MethodType mt) {
@@ -363,6 +349,15 @@ abstract class VarHandleBaseTest {
             return amToHandle.computeIfAbsent(
                     amt, k -> f.apply(vh, am, mt));
         }
+
+        Class<? extends Throwable> getWMTEOOrOther(Class<? extends Throwable> c) {
+            return f.isExact ? WrongMethodTypeException.class : c;
+        }
+
+        void checkWMTEOrCCE(ThrowingRunnable r) {
+            checkWithThrowable(getWMTEOOrOther(ClassCastException.class), null, r);
+        }
+
     }
 
     interface AccessTestAction<T> {
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java
index 021091484e6..06d2a65b1dd 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java
@@ -27,6 +27,7 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestAccessBoolean
  * @run testng/othervm -Diters=20000                         VarHandleTestAccessBoolean
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestAccessBoolean
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestAccessBoolean
  */
 
 import org.testng.annotations.BeforeClass;
@@ -292,6 +293,10 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease(recv, true, false);
         });
 
+        checkUOE(() -> {
+            boolean r = (boolean) vh.getAndSet(recv, true);
+        });
+
         checkUOE(() -> {
             boolean o = (boolean) vh.getAndAdd(recv, true);
         });
@@ -378,6 +383,10 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease(true, false);
         });
 
+        checkUOE(() -> {
+            boolean r = (boolean) vh.getAndSet(true);
+        });
+
         checkUOE(() -> {
             boolean o = (boolean) vh.getAndAdd(true);
         });
@@ -454,6 +463,10 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease(recv, true, false);
         });
 
+        checkUOE(() -> {
+            boolean r = (boolean) vh.getAndSet(recv, true);
+        });
+
         checkUOE(() -> {
             boolean o = (boolean) vh.getAndAdd(recv, true);
         });
@@ -530,6 +543,10 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease(true, false);
         });
 
+        checkUOE(() -> {
+            boolean r = (boolean) vh.getAndSet(true);
+        });
+
         checkUOE(() -> {
             boolean o = (boolean) vh.getAndAdd(true);
         });
@@ -613,6 +630,10 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease(array, i, true, false);
         });
 
+        checkUOE(() -> {
+            boolean r = (boolean) vh.getAndSet(array, i, true);
+        });
+
         checkUOE(() -> {
             boolean o = (boolean) vh.getAndAdd(array, i, true);
         });
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java
index e550815156c..2ba0afbef2d 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java
@@ -27,6 +27,7 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestAccessByte
  * @run testng/othervm -Diters=20000                         VarHandleTestAccessByte
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestAccessByte
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestAccessByte
  */
 
 import org.testng.annotations.BeforeClass;
@@ -292,6 +293,10 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease(recv, (byte)1, (byte)2);
         });
 
+        checkUOE(() -> {
+            byte r = (byte) vh.getAndSet(recv, (byte)1);
+        });
+
         checkUOE(() -> {
             byte o = (byte) vh.getAndAdd(recv, (byte)1);
         });
@@ -378,6 +383,10 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease((byte)1, (byte)2);
         });
 
+        checkUOE(() -> {
+            byte r = (byte) vh.getAndSet((byte)1);
+        });
+
         checkUOE(() -> {
             byte o = (byte) vh.getAndAdd((byte)1);
         });
@@ -454,6 +463,10 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease(recv, (byte)1, (byte)2);
         });
 
+        checkUOE(() -> {
+            byte r = (byte) vh.getAndSet(recv, (byte)1);
+        });
+
         checkUOE(() -> {
             byte o = (byte) vh.getAndAdd(recv, (byte)1);
         });
@@ -530,6 +543,10 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease((byte)1, (byte)2);
         });
 
+        checkUOE(() -> {
+            byte r = (byte) vh.getAndSet((byte)1);
+        });
+
         checkUOE(() -> {
             byte o = (byte) vh.getAndAdd((byte)1);
         });
@@ -613,6 +630,10 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease(array, i, (byte)1, (byte)2);
         });
 
+        checkUOE(() -> {
+            byte r = (byte) vh.getAndSet(array, i, (byte)1);
+        });
+
         checkUOE(() -> {
             byte o = (byte) vh.getAndAdd(array, i, (byte)1);
         });
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java
index 5c13c6d6677..bcc42a3c335 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java
@@ -27,6 +27,7 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestAccessChar
  * @run testng/othervm -Diters=20000                         VarHandleTestAccessChar
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestAccessChar
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestAccessChar
  */
 
 import org.testng.annotations.BeforeClass;
@@ -292,6 +293,10 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease(recv, 'a', 'b');
         });
 
+        checkUOE(() -> {
+            char r = (char) vh.getAndSet(recv, 'a');
+        });
+
         checkUOE(() -> {
             char o = (char) vh.getAndAdd(recv, 'a');
         });
@@ -378,6 +383,10 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease('a', 'b');
         });
 
+        checkUOE(() -> {
+            char r = (char) vh.getAndSet('a');
+        });
+
         checkUOE(() -> {
             char o = (char) vh.getAndAdd('a');
         });
@@ -454,6 +463,10 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease(recv, 'a', 'b');
         });
 
+        checkUOE(() -> {
+            char r = (char) vh.getAndSet(recv, 'a');
+        });
+
         checkUOE(() -> {
             char o = (char) vh.getAndAdd(recv, 'a');
         });
@@ -530,6 +543,10 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease('a', 'b');
         });
 
+        checkUOE(() -> {
+            char r = (char) vh.getAndSet('a');
+        });
+
         checkUOE(() -> {
             char o = (char) vh.getAndAdd('a');
         });
@@ -613,6 +630,10 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease(array, i, 'a', 'b');
         });
 
+        checkUOE(() -> {
+            char r = (char) vh.getAndSet(array, i, 'a');
+        });
+
         checkUOE(() -> {
             char o = (char) vh.getAndAdd(array, i, 'a');
         });
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java
index 65125e3f62e..74f0765f709 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java
@@ -27,6 +27,7 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestAccessDouble
  * @run testng/othervm -Diters=20000                         VarHandleTestAccessDouble
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestAccessDouble
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestAccessDouble
  */
 
 import org.testng.annotations.BeforeClass;
@@ -292,6 +293,10 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease(recv, 1.0d, 2.0d);
         });
 
+        checkUOE(() -> {
+            double r = (double) vh.getAndSet(recv, 1.0d);
+        });
+
         checkUOE(() -> {
             double o = (double) vh.getAndAdd(recv, 1.0d);
         });
@@ -378,6 +383,10 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease(1.0d, 2.0d);
         });
 
+        checkUOE(() -> {
+            double r = (double) vh.getAndSet(1.0d);
+        });
+
         checkUOE(() -> {
             double o = (double) vh.getAndAdd(1.0d);
         });
@@ -454,6 +463,10 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease(recv, 1.0d, 2.0d);
         });
 
+        checkUOE(() -> {
+            double r = (double) vh.getAndSet(recv, 1.0d);
+        });
+
         checkUOE(() -> {
             double o = (double) vh.getAndAdd(recv, 1.0d);
         });
@@ -530,6 +543,10 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease(1.0d, 2.0d);
         });
 
+        checkUOE(() -> {
+            double r = (double) vh.getAndSet(1.0d);
+        });
+
         checkUOE(() -> {
             double o = (double) vh.getAndAdd(1.0d);
         });
@@ -613,6 +630,10 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease(array, i, 1.0d, 2.0d);
         });
 
+        checkUOE(() -> {
+            double r = (double) vh.getAndSet(array, i, 1.0d);
+        });
+
         checkUOE(() -> {
             double o = (double) vh.getAndAdd(array, i, 1.0d);
         });
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java
index 8e7491ad45a..241e0897414 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java
@@ -27,6 +27,7 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestAccessFloat
  * @run testng/othervm -Diters=20000                         VarHandleTestAccessFloat
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestAccessFloat
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestAccessFloat
  */
 
 import org.testng.annotations.BeforeClass;
@@ -292,6 +293,10 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease(recv, 1.0f, 2.0f);
         });
 
+        checkUOE(() -> {
+            float r = (float) vh.getAndSet(recv, 1.0f);
+        });
+
         checkUOE(() -> {
             float o = (float) vh.getAndAdd(recv, 1.0f);
         });
@@ -378,6 +383,10 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease(1.0f, 2.0f);
         });
 
+        checkUOE(() -> {
+            float r = (float) vh.getAndSet(1.0f);
+        });
+
         checkUOE(() -> {
             float o = (float) vh.getAndAdd(1.0f);
         });
@@ -454,6 +463,10 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease(recv, 1.0f, 2.0f);
         });
 
+        checkUOE(() -> {
+            float r = (float) vh.getAndSet(recv, 1.0f);
+        });
+
         checkUOE(() -> {
             float o = (float) vh.getAndAdd(recv, 1.0f);
         });
@@ -530,6 +543,10 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease(1.0f, 2.0f);
         });
 
+        checkUOE(() -> {
+            float r = (float) vh.getAndSet(1.0f);
+        });
+
         checkUOE(() -> {
             float o = (float) vh.getAndAdd(1.0f);
         });
@@ -613,6 +630,10 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease(array, i, 1.0f, 2.0f);
         });
 
+        checkUOE(() -> {
+            float r = (float) vh.getAndSet(array, i, 1.0f);
+        });
+
         checkUOE(() -> {
             float o = (float) vh.getAndAdd(array, i, 1.0f);
         });
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java
index bfcb5feec4c..9ce9ef7baca 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java
@@ -27,6 +27,7 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestAccessInt
  * @run testng/othervm -Diters=20000                         VarHandleTestAccessInt
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestAccessInt
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestAccessInt
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java
index 1f02bed9045..ff831d23fd1 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java
@@ -27,6 +27,7 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestAccessLong
  * @run testng/othervm -Diters=20000                         VarHandleTestAccessLong
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestAccessLong
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestAccessLong
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java
index 822252f7a7d..a64ed990cb9 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java
@@ -27,6 +27,7 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestAccessShort
  * @run testng/othervm -Diters=20000                         VarHandleTestAccessShort
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestAccessShort
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestAccessShort
  */
 
 import org.testng.annotations.BeforeClass;
@@ -292,6 +293,10 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease(recv, (short)1, (short)2);
         });
 
+        checkUOE(() -> {
+            short r = (short) vh.getAndSet(recv, (short)1);
+        });
+
         checkUOE(() -> {
             short o = (short) vh.getAndAdd(recv, (short)1);
         });
@@ -378,6 +383,10 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease((short)1, (short)2);
         });
 
+        checkUOE(() -> {
+            short r = (short) vh.getAndSet((short)1);
+        });
+
         checkUOE(() -> {
             short o = (short) vh.getAndAdd((short)1);
         });
@@ -454,6 +463,10 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease(recv, (short)1, (short)2);
         });
 
+        checkUOE(() -> {
+            short r = (short) vh.getAndSet(recv, (short)1);
+        });
+
         checkUOE(() -> {
             short o = (short) vh.getAndAdd(recv, (short)1);
         });
@@ -530,6 +543,10 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease((short)1, (short)2);
         });
 
+        checkUOE(() -> {
+            short r = (short) vh.getAndSet((short)1);
+        });
+
         checkUOE(() -> {
             short o = (short) vh.getAndAdd((short)1);
         });
@@ -613,6 +630,10 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSetRelease(array, i, (short)1, (short)2);
         });
 
+        checkUOE(() -> {
+            short r = (short) vh.getAndSet(array, i, (short)1);
+        });
+
         checkUOE(() -> {
             short o = (short) vh.getAndAdd(array, i, (short)1);
         });
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessString.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessString.java
index 9e4ec77768b..8b78b248e0f 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessString.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessString.java
@@ -27,6 +27,7 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestAccessString
  * @run testng/othervm -Diters=20000                         VarHandleTestAccessString
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestAccessString
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestAccessString
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java
index 8159e16ff62..806dd1ce4f8 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java
@@ -27,6 +27,7 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAsChar
  * @run testng/othervm -Diters=20000                         VarHandleTestByteArrayAsChar
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestByteArrayAsChar
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestByteArrayAsChar
  */
 
 import org.testng.annotations.DataProvider;
@@ -253,6 +254,10 @@ public class VarHandleTestByteArrayAsChar extends VarHandleBaseByteArrayTest {
             checkROBE(() -> {
                 vh.setOpaque(array, ci, VALUE_1);
             });
+            checkUOE(() -> {
+                boolean r = vh.compareAndSet(array, ci, VALUE_1, VALUE_2);
+            });
+
             checkUOE(() -> {
                 char r = (char) vh.compareAndExchangeVolatile(array, ci, VALUE_2, VALUE_1);
             });
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java
index a327b00fb77..95af9c2dd67 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java
@@ -27,6 +27,7 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAsDouble
  * @run testng/othervm -Diters=20000                         VarHandleTestByteArrayAsDouble
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestByteArrayAsDouble
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestByteArrayAsDouble
  */
 
 import org.testng.annotations.DataProvider;
@@ -254,9 +255,7 @@ public class VarHandleTestByteArrayAsDouble extends VarHandleBaseByteArrayTest {
             checkROBE(() -> {
                 double o = (double) vh.getAndSet(array, ci, VALUE_1);
             });
-            checkUOE(() -> {
-                boolean r = vh.compareAndSet(array, ci, VALUE_1, VALUE_2);
-            });
+
 
             checkUOE(() -> {
                 double o = (double) vh.getAndAdd(array, ci, VALUE_1);
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java
index 196c8101723..48f7977bfdd 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java
@@ -27,6 +27,7 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAsFloat
  * @run testng/othervm -Diters=20000                         VarHandleTestByteArrayAsFloat
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestByteArrayAsFloat
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestByteArrayAsFloat
  */
 
 import org.testng.annotations.DataProvider;
@@ -254,9 +255,7 @@ public class VarHandleTestByteArrayAsFloat extends VarHandleBaseByteArrayTest {
             checkROBE(() -> {
                 float o = (float) vh.getAndSet(array, ci, VALUE_1);
             });
-            checkUOE(() -> {
-                boolean r = vh.compareAndSet(array, ci, VALUE_1, VALUE_2);
-            });
+
 
             checkUOE(() -> {
                 float o = (float) vh.getAndAdd(array, ci, VALUE_1);
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java
index 400c20605c5..99690423f24 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java
@@ -27,6 +27,7 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAsInt
  * @run testng/othervm -Diters=20000                         VarHandleTestByteArrayAsInt
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestByteArrayAsInt
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestByteArrayAsInt
  */
 
 import org.testng.annotations.DataProvider;
@@ -247,9 +248,7 @@ public class VarHandleTestByteArrayAsInt extends VarHandleBaseByteArrayTest {
             checkROBE(() -> {
                 int o = (int) vh.getAndSet(array, ci, VALUE_1);
             });
-            checkUOE(() -> {
-                boolean r = vh.compareAndSet(array, ci, VALUE_1, VALUE_2);
-            });
+
 
             checkROBE(() -> {
                 int o = (int) vh.getAndAdd(array, ci, VALUE_1);
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java
index a0cabc8653a..de21efeee54 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java
@@ -27,6 +27,7 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAsLong
  * @run testng/othervm -Diters=20000                         VarHandleTestByteArrayAsLong
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestByteArrayAsLong
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestByteArrayAsLong
  */
 
 import org.testng.annotations.DataProvider;
@@ -247,9 +248,7 @@ public class VarHandleTestByteArrayAsLong extends VarHandleBaseByteArrayTest {
             checkROBE(() -> {
                 long o = (long) vh.getAndSet(array, ci, VALUE_1);
             });
-            checkUOE(() -> {
-                boolean r = vh.compareAndSet(array, ci, VALUE_1, VALUE_2);
-            });
+
 
             checkROBE(() -> {
                 long o = (long) vh.getAndAdd(array, ci, VALUE_1);
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java
index 2632b00bd23..b13bce1e1da 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java
@@ -27,6 +27,7 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAsShort
  * @run testng/othervm -Diters=20000                         VarHandleTestByteArrayAsShort
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestByteArrayAsShort
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestByteArrayAsShort
  */
 
 import org.testng.annotations.DataProvider;
@@ -253,6 +254,10 @@ public class VarHandleTestByteArrayAsShort extends VarHandleBaseByteArrayTest {
             checkROBE(() -> {
                 vh.setOpaque(array, ci, VALUE_1);
             });
+            checkUOE(() -> {
+                boolean r = vh.compareAndSet(array, ci, VALUE_1, VALUE_2);
+            });
+
             checkUOE(() -> {
                 short r = (short) vh.compareAndExchangeVolatile(array, ci, VALUE_2, VALUE_1);
             });
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessBoolean.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessBoolean.java
index 32761fe0e3f..f43fcc1b82c 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessBoolean.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessBoolean.java
@@ -24,6 +24,7 @@
 /*
  * @test
  * @run testng/othervm -Diters=20000 VarHandleTestMethodHandleAccessBoolean
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodHandleAccessBoolean
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessByte.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessByte.java
index 8c36eb861c5..3d5c27e8bfd 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessByte.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessByte.java
@@ -24,6 +24,7 @@
 /*
  * @test
  * @run testng/othervm -Diters=20000 VarHandleTestMethodHandleAccessByte
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodHandleAccessByte
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessChar.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessChar.java
index fb1f3877342..bde76a69c05 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessChar.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessChar.java
@@ -24,6 +24,7 @@
 /*
  * @test
  * @run testng/othervm -Diters=20000 VarHandleTestMethodHandleAccessChar
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodHandleAccessChar
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessDouble.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessDouble.java
index cd2c15d04d3..de683ce6997 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessDouble.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessDouble.java
@@ -24,6 +24,7 @@
 /*
  * @test
  * @run testng/othervm -Diters=20000 VarHandleTestMethodHandleAccessDouble
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodHandleAccessDouble
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessFloat.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessFloat.java
index 58d9e295298..99309e5081f 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessFloat.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessFloat.java
@@ -24,6 +24,7 @@
 /*
  * @test
  * @run testng/othervm -Diters=20000 VarHandleTestMethodHandleAccessFloat
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodHandleAccessFloat
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java
index 8ccf7983056..6b35f03ab7f 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java
@@ -24,6 +24,7 @@
 /*
  * @test
  * @run testng/othervm -Diters=20000 VarHandleTestMethodHandleAccessInt
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodHandleAccessInt
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java
index 65493ec2b49..840ccf272ae 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java
@@ -24,6 +24,7 @@
 /*
  * @test
  * @run testng/othervm -Diters=20000 VarHandleTestMethodHandleAccessLong
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodHandleAccessLong
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessShort.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessShort.java
index 6edc9b19b68..51b51e73747 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessShort.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessShort.java
@@ -24,6 +24,7 @@
 /*
  * @test
  * @run testng/othervm -Diters=20000 VarHandleTestMethodHandleAccessShort
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodHandleAccessShort
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java
index 5ae7c877854..096880f3557 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java
@@ -24,6 +24,7 @@
 /*
  * @test
  * @run testng/othervm -Diters=20000 VarHandleTestMethodHandleAccessString
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodHandleAccessString
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeBoolean.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeBoolean.java
index 75ba7ae3dc2..df680146374 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeBoolean.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeBoolean.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @bug 8156486
  * @run testng/othervm VarHandleTestMethodTypeBoolean
  * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodTypeBoolean
  */
@@ -81,27 +82,28 @@ public class VarHandleTestMethodTypeBoolean extends VarHandleBaseTest {
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
-        cases.add(new VarHandleAccessTestCase("Instance field wrong method type",
+        cases.add(new VarHandleAccessTestCase("Instance field",
                                               vhField, vh -> testInstanceFieldWrongMethodType(this, vh),
                                               false));
 
-        cases.add(new VarHandleAccessTestCase("Static field wrong method type",
+        cases.add(new VarHandleAccessTestCase("Static field",
                                               vhStaticField, VarHandleTestMethodTypeBoolean::testStaticFieldWrongMethodType,
                                               false));
 
-        cases.add(new VarHandleAccessTestCase("Array wrong method type",
+        cases.add(new VarHandleAccessTestCase("Array",
                                               vhArray, VarHandleTestMethodTypeBoolean::testArrayWrongMethodType,
                                               false));
+
         for (VarHandleToMethodHandle f : VarHandleToMethodHandle.values()) {
-            cases.add(new MethodHandleAccessTestCase("Instance field wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Instance field",
                                                      vhField, f, hs -> testInstanceFieldWrongMethodType(this, hs),
                                                      false));
 
-            cases.add(new MethodHandleAccessTestCase("Static field wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Static field",
                                                      vhStaticField, f, VarHandleTestMethodTypeBoolean::testStaticFieldWrongMethodType,
                                                      false));
 
-            cases.add(new MethodHandleAccessTestCase("Array wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Array",
                                                      vhArray, f, VarHandleTestMethodTypeBoolean::testArrayWrongMethodType,
                                                      false));
         }
@@ -329,63 +331,63 @@ public class VarHandleTestMethodTypeBoolean extends VarHandleBaseTest {
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                boolean x = (boolean) hs.get(am, methodType(boolean.class, Void.class)).
-                    invoke(null);
+                boolean x = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeBoolean.class)).
+                    invokeExact((VarHandleTestMethodTypeBoolean) null);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, int.class)).
-                    invoke(0);
+                    invokeExact(0);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
-                Void x = (Void) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeBoolean.class)).
-                    invoke(recv);
+                Void x = (Void) hs.get(am, methodType(Void.class, VarHandleTestMethodTypeBoolean.class)).
+                    invokeExact(recv);
             });
             checkWMTE(() -> { // primitive class
                 int x = (int) hs.get(am, methodType(int.class, VarHandleTestMethodTypeBoolean.class)).
-                    invoke(recv);
+                    invokeExact(recv);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 boolean x = (boolean) hs.get(am, methodType(boolean.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeBoolean.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                hs.get(am, methodType(void.class, Void.class, boolean.class)).
-                    invoke(null, true);
+                hs.get(am, methodType(void.class, VarHandleTestMethodTypeBoolean.class, boolean.class)).
+                    invokeExact((VarHandleTestMethodTypeBoolean) null, true);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 hs.get(am, methodType(void.class, Class.class, boolean.class)).
-                    invoke(Void.class, true);
+                    invokeExact(Void.class, true);
             });
             checkWMTE(() -> { // value reference class
                 hs.get(am, methodType(void.class, VarHandleTestMethodTypeBoolean.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 hs.get(am, methodType(void.class, int.class, boolean.class)).
-                    invoke(0, true);
+                    invokeExact(0, true);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, VarHandleTestMethodTypeBoolean.class, boolean.class, Class.class)).
-                    invoke(recv, true, Void.class);
+                    invokeExact(recv, true, Void.class);
             });
         }
 
@@ -513,32 +515,32 @@ public class VarHandleTestMethodTypeBoolean extends VarHandleBaseTest {
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void x = (Void) hs.get(am, methodType(Void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // primitive class
                 int x = (int) hs.get(am, methodType(int.class)).
-                    invoke();
+                    invokeExact();
             });
             // Incorrect arity
             checkWMTE(() -> { // >
                 boolean x = (boolean) hs.get(am, methodType(Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             checkWMTE(() -> { // value reference class
                 hs.get(am, methodType(void.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, boolean.class, Class.class)).
-                    invoke(true, Void.class);
+                    invokeExact(true, Void.class);
             });
         }
 
@@ -783,71 +785,71 @@ public class VarHandleTestMethodTypeBoolean extends VarHandleBaseTest {
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                boolean x = (boolean) hs.get(am, methodType(boolean.class, Void.class, int.class)).
-                    invoke(null, 0);
+                boolean x = (boolean) hs.get(am, methodType(boolean.class, boolean[].class, int.class)).
+                    invokeExact((boolean[]) null, 0);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, Class.class, int.class)).
-                    invoke(Void.class, 0);
+                    invokeExact(Void.class, 0);
             });
             checkWMTE(() -> { // array primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, int.class, int.class)).
-                    invoke(0, 0);
+                    invokeExact(0, 0);
             });
             checkWMTE(() -> { // index reference class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, boolean[].class, Class.class)).
-                    invoke(array, Void.class);
+                    invokeExact(array, Void.class);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void x = (Void) hs.get(am, methodType(Void.class, boolean[].class, int.class)).
-                    invoke(array, 0);
+                    invokeExact(array, 0);
             });
             checkWMTE(() -> { // primitive class
                 int x = (int) hs.get(am, methodType(int.class, boolean[].class, int.class)).
-                    invoke(array, 0);
+                    invokeExact(array, 0);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 boolean x = (boolean) hs.get(am, methodType(boolean.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, boolean[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                hs.get(am, methodType(void.class, Void.class, int.class, boolean.class)).
-                    invoke(null, 0, true);
+                hs.get(am, methodType(void.class, boolean[].class, int.class, boolean.class)).
+                    invokeExact((boolean[]) null, 0, true);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 hs.get(am, methodType(void.class, Class.class, int.class, boolean.class)).
-                    invoke(Void.class, 0, true);
+                    invokeExact(Void.class, 0, true);
             });
             checkWMTE(() -> { // value reference class
                 hs.get(am, methodType(void.class, boolean[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 hs.get(am, methodType(void.class, int.class, int.class, boolean.class)).
-                    invoke(0, 0, true);
+                    invokeExact(0, 0, true);
             });
             checkWMTE(() -> { // index reference class
                 hs.get(am, methodType(void.class, boolean[].class, Class.class, boolean.class)).
-                    invoke(array, Void.class, true);
+                    invokeExact(array, Void.class, true);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, boolean[].class, int.class, Class.class)).
-                    invoke(array, 0, true, Void.class);
+                    invokeExact(array, 0, true, Void.class);
             });
         }
 
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeByte.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeByte.java
index b212bfc9d7d..0bfddc7ad27 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeByte.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeByte.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @bug 8156486
  * @run testng/othervm VarHandleTestMethodTypeByte
  * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodTypeByte
  */
@@ -81,27 +82,28 @@ public class VarHandleTestMethodTypeByte extends VarHandleBaseTest {
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
-        cases.add(new VarHandleAccessTestCase("Instance field wrong method type",
+        cases.add(new VarHandleAccessTestCase("Instance field",
                                               vhField, vh -> testInstanceFieldWrongMethodType(this, vh),
                                               false));
 
-        cases.add(new VarHandleAccessTestCase("Static field wrong method type",
+        cases.add(new VarHandleAccessTestCase("Static field",
                                               vhStaticField, VarHandleTestMethodTypeByte::testStaticFieldWrongMethodType,
                                               false));
 
-        cases.add(new VarHandleAccessTestCase("Array wrong method type",
+        cases.add(new VarHandleAccessTestCase("Array",
                                               vhArray, VarHandleTestMethodTypeByte::testArrayWrongMethodType,
                                               false));
+
         for (VarHandleToMethodHandle f : VarHandleToMethodHandle.values()) {
-            cases.add(new MethodHandleAccessTestCase("Instance field wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Instance field",
                                                      vhField, f, hs -> testInstanceFieldWrongMethodType(this, hs),
                                                      false));
 
-            cases.add(new MethodHandleAccessTestCase("Static field wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Static field",
                                                      vhStaticField, f, VarHandleTestMethodTypeByte::testStaticFieldWrongMethodType,
                                                      false));
 
-            cases.add(new MethodHandleAccessTestCase("Array wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Array",
                                                      vhArray, f, VarHandleTestMethodTypeByte::testArrayWrongMethodType,
                                                      false));
         }
@@ -329,63 +331,63 @@ public class VarHandleTestMethodTypeByte extends VarHandleBaseTest {
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                byte x = (byte) hs.get(am, methodType(byte.class, Void.class)).
-                    invoke(null);
+                byte x = (byte) hs.get(am, methodType(byte.class, VarHandleTestMethodTypeByte.class)).
+                    invokeExact((VarHandleTestMethodTypeByte) null);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 byte x = (byte) hs.get(am, methodType(byte.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 byte x = (byte) hs.get(am, methodType(byte.class, int.class)).
-                    invoke(0);
+                    invokeExact(0);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
-                Void x = (Void) hs.get(am, methodType(byte.class, VarHandleTestMethodTypeByte.class)).
-                    invoke(recv);
+                Void x = (Void) hs.get(am, methodType(Void.class, VarHandleTestMethodTypeByte.class)).
+                    invokeExact(recv);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeByte.class)).
-                    invoke(recv);
+                    invokeExact(recv);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 byte x = (byte) hs.get(am, methodType(byte.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 byte x = (byte) hs.get(am, methodType(byte.class, VarHandleTestMethodTypeByte.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                hs.get(am, methodType(void.class, Void.class, byte.class)).
-                    invoke(null, (byte)1);
+                hs.get(am, methodType(void.class, VarHandleTestMethodTypeByte.class, byte.class)).
+                    invokeExact((VarHandleTestMethodTypeByte) null, (byte)1);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 hs.get(am, methodType(void.class, Class.class, byte.class)).
-                    invoke(Void.class, (byte)1);
+                    invokeExact(Void.class, (byte)1);
             });
             checkWMTE(() -> { // value reference class
                 hs.get(am, methodType(void.class, VarHandleTestMethodTypeByte.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 hs.get(am, methodType(void.class, int.class, byte.class)).
-                    invoke(0, (byte)1);
+                    invokeExact(0, (byte)1);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, VarHandleTestMethodTypeByte.class, byte.class, Class.class)).
-                    invoke(recv, (byte)1, Void.class);
+                    invokeExact(recv, (byte)1, Void.class);
             });
         }
 
@@ -513,32 +515,32 @@ public class VarHandleTestMethodTypeByte extends VarHandleBaseTest {
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void x = (Void) hs.get(am, methodType(Void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class)).
-                    invoke();
+                    invokeExact();
             });
             // Incorrect arity
             checkWMTE(() -> { // >
                 byte x = (byte) hs.get(am, methodType(Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             checkWMTE(() -> { // value reference class
                 hs.get(am, methodType(void.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, byte.class, Class.class)).
-                    invoke((byte)1, Void.class);
+                    invokeExact((byte)1, Void.class);
             });
         }
 
@@ -783,71 +785,71 @@ public class VarHandleTestMethodTypeByte extends VarHandleBaseTest {
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                byte x = (byte) hs.get(am, methodType(byte.class, Void.class, int.class)).
-                    invoke(null, 0);
+                byte x = (byte) hs.get(am, methodType(byte.class, byte[].class, int.class)).
+                    invokeExact((byte[]) null, 0);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 byte x = (byte) hs.get(am, methodType(byte.class, Class.class, int.class)).
-                    invoke(Void.class, 0);
+                    invokeExact(Void.class, 0);
             });
             checkWMTE(() -> { // array primitive class
                 byte x = (byte) hs.get(am, methodType(byte.class, int.class, int.class)).
-                    invoke(0, 0);
+                    invokeExact(0, 0);
             });
             checkWMTE(() -> { // index reference class
                 byte x = (byte) hs.get(am, methodType(byte.class, byte[].class, Class.class)).
-                    invoke(array, Void.class);
+                    invokeExact(array, Void.class);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void x = (Void) hs.get(am, methodType(Void.class, byte[].class, int.class)).
-                    invoke(array, 0);
+                    invokeExact(array, 0);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, byte[].class, int.class)).
-                    invoke(array, 0);
+                    invokeExact(array, 0);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 byte x = (byte) hs.get(am, methodType(byte.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 byte x = (byte) hs.get(am, methodType(byte.class, byte[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                hs.get(am, methodType(void.class, Void.class, int.class, byte.class)).
-                    invoke(null, 0, (byte)1);
+                hs.get(am, methodType(void.class, byte[].class, int.class, byte.class)).
+                    invokeExact((byte[]) null, 0, (byte)1);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 hs.get(am, methodType(void.class, Class.class, int.class, byte.class)).
-                    invoke(Void.class, 0, (byte)1);
+                    invokeExact(Void.class, 0, (byte)1);
             });
             checkWMTE(() -> { // value reference class
                 hs.get(am, methodType(void.class, byte[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 hs.get(am, methodType(void.class, int.class, int.class, byte.class)).
-                    invoke(0, 0, (byte)1);
+                    invokeExact(0, 0, (byte)1);
             });
             checkWMTE(() -> { // index reference class
                 hs.get(am, methodType(void.class, byte[].class, Class.class, byte.class)).
-                    invoke(array, Void.class, (byte)1);
+                    invokeExact(array, Void.class, (byte)1);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, byte[].class, int.class, Class.class)).
-                    invoke(array, 0, (byte)1, Void.class);
+                    invokeExact(array, 0, (byte)1, Void.class);
             });
         }
 
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeChar.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeChar.java
index 6ac8a0fed70..8d5166d8644 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeChar.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeChar.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @bug 8156486
  * @run testng/othervm VarHandleTestMethodTypeChar
  * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodTypeChar
  */
@@ -81,27 +82,28 @@ public class VarHandleTestMethodTypeChar extends VarHandleBaseTest {
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
-        cases.add(new VarHandleAccessTestCase("Instance field wrong method type",
+        cases.add(new VarHandleAccessTestCase("Instance field",
                                               vhField, vh -> testInstanceFieldWrongMethodType(this, vh),
                                               false));
 
-        cases.add(new VarHandleAccessTestCase("Static field wrong method type",
+        cases.add(new VarHandleAccessTestCase("Static field",
                                               vhStaticField, VarHandleTestMethodTypeChar::testStaticFieldWrongMethodType,
                                               false));
 
-        cases.add(new VarHandleAccessTestCase("Array wrong method type",
+        cases.add(new VarHandleAccessTestCase("Array",
                                               vhArray, VarHandleTestMethodTypeChar::testArrayWrongMethodType,
                                               false));
+
         for (VarHandleToMethodHandle f : VarHandleToMethodHandle.values()) {
-            cases.add(new MethodHandleAccessTestCase("Instance field wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Instance field",
                                                      vhField, f, hs -> testInstanceFieldWrongMethodType(this, hs),
                                                      false));
 
-            cases.add(new MethodHandleAccessTestCase("Static field wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Static field",
                                                      vhStaticField, f, VarHandleTestMethodTypeChar::testStaticFieldWrongMethodType,
                                                      false));
 
-            cases.add(new MethodHandleAccessTestCase("Array wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Array",
                                                      vhArray, f, VarHandleTestMethodTypeChar::testArrayWrongMethodType,
                                                      false));
         }
@@ -329,63 +331,63 @@ public class VarHandleTestMethodTypeChar extends VarHandleBaseTest {
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                char x = (char) hs.get(am, methodType(char.class, Void.class)).
-                    invoke(null);
+                char x = (char) hs.get(am, methodType(char.class, VarHandleTestMethodTypeChar.class)).
+                    invokeExact((VarHandleTestMethodTypeChar) null);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 char x = (char) hs.get(am, methodType(char.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 char x = (char) hs.get(am, methodType(char.class, int.class)).
-                    invoke(0);
+                    invokeExact(0);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
-                Void x = (Void) hs.get(am, methodType(char.class, VarHandleTestMethodTypeChar.class)).
-                    invoke(recv);
+                Void x = (Void) hs.get(am, methodType(Void.class, VarHandleTestMethodTypeChar.class)).
+                    invokeExact(recv);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeChar.class)).
-                    invoke(recv);
+                    invokeExact(recv);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 char x = (char) hs.get(am, methodType(char.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 char x = (char) hs.get(am, methodType(char.class, VarHandleTestMethodTypeChar.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                hs.get(am, methodType(void.class, Void.class, char.class)).
-                    invoke(null, 'a');
+                hs.get(am, methodType(void.class, VarHandleTestMethodTypeChar.class, char.class)).
+                    invokeExact((VarHandleTestMethodTypeChar) null, 'a');
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 hs.get(am, methodType(void.class, Class.class, char.class)).
-                    invoke(Void.class, 'a');
+                    invokeExact(Void.class, 'a');
             });
             checkWMTE(() -> { // value reference class
                 hs.get(am, methodType(void.class, VarHandleTestMethodTypeChar.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 hs.get(am, methodType(void.class, int.class, char.class)).
-                    invoke(0, 'a');
+                    invokeExact(0, 'a');
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, VarHandleTestMethodTypeChar.class, char.class, Class.class)).
-                    invoke(recv, 'a', Void.class);
+                    invokeExact(recv, 'a', Void.class);
             });
         }
 
@@ -513,32 +515,32 @@ public class VarHandleTestMethodTypeChar extends VarHandleBaseTest {
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void x = (Void) hs.get(am, methodType(Void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class)).
-                    invoke();
+                    invokeExact();
             });
             // Incorrect arity
             checkWMTE(() -> { // >
                 char x = (char) hs.get(am, methodType(Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             checkWMTE(() -> { // value reference class
                 hs.get(am, methodType(void.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, char.class, Class.class)).
-                    invoke('a', Void.class);
+                    invokeExact('a', Void.class);
             });
         }
 
@@ -783,71 +785,71 @@ public class VarHandleTestMethodTypeChar extends VarHandleBaseTest {
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                char x = (char) hs.get(am, methodType(char.class, Void.class, int.class)).
-                    invoke(null, 0);
+                char x = (char) hs.get(am, methodType(char.class, char[].class, int.class)).
+                    invokeExact((char[]) null, 0);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 char x = (char) hs.get(am, methodType(char.class, Class.class, int.class)).
-                    invoke(Void.class, 0);
+                    invokeExact(Void.class, 0);
             });
             checkWMTE(() -> { // array primitive class
                 char x = (char) hs.get(am, methodType(char.class, int.class, int.class)).
-                    invoke(0, 0);
+                    invokeExact(0, 0);
             });
             checkWMTE(() -> { // index reference class
                 char x = (char) hs.get(am, methodType(char.class, char[].class, Class.class)).
-                    invoke(array, Void.class);
+                    invokeExact(array, Void.class);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void x = (Void) hs.get(am, methodType(Void.class, char[].class, int.class)).
-                    invoke(array, 0);
+                    invokeExact(array, 0);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, char[].class, int.class)).
-                    invoke(array, 0);
+                    invokeExact(array, 0);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 char x = (char) hs.get(am, methodType(char.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 char x = (char) hs.get(am, methodType(char.class, char[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                hs.get(am, methodType(void.class, Void.class, int.class, char.class)).
-                    invoke(null, 0, 'a');
+                hs.get(am, methodType(void.class, char[].class, int.class, char.class)).
+                    invokeExact((char[]) null, 0, 'a');
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 hs.get(am, methodType(void.class, Class.class, int.class, char.class)).
-                    invoke(Void.class, 0, 'a');
+                    invokeExact(Void.class, 0, 'a');
             });
             checkWMTE(() -> { // value reference class
                 hs.get(am, methodType(void.class, char[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 hs.get(am, methodType(void.class, int.class, int.class, char.class)).
-                    invoke(0, 0, 'a');
+                    invokeExact(0, 0, 'a');
             });
             checkWMTE(() -> { // index reference class
                 hs.get(am, methodType(void.class, char[].class, Class.class, char.class)).
-                    invoke(array, Void.class, 'a');
+                    invokeExact(array, Void.class, 'a');
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, char[].class, int.class, Class.class)).
-                    invoke(array, 0, 'a', Void.class);
+                    invokeExact(array, 0, 'a', Void.class);
             });
         }
 
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeDouble.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeDouble.java
index e5fc073d191..f3531016262 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeDouble.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeDouble.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @bug 8156486
  * @run testng/othervm VarHandleTestMethodTypeDouble
  * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodTypeDouble
  */
@@ -81,27 +82,28 @@ public class VarHandleTestMethodTypeDouble extends VarHandleBaseTest {
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
-        cases.add(new VarHandleAccessTestCase("Instance field wrong method type",
+        cases.add(new VarHandleAccessTestCase("Instance field",
                                               vhField, vh -> testInstanceFieldWrongMethodType(this, vh),
                                               false));
 
-        cases.add(new VarHandleAccessTestCase("Static field wrong method type",
+        cases.add(new VarHandleAccessTestCase("Static field",
                                               vhStaticField, VarHandleTestMethodTypeDouble::testStaticFieldWrongMethodType,
                                               false));
 
-        cases.add(new VarHandleAccessTestCase("Array wrong method type",
+        cases.add(new VarHandleAccessTestCase("Array",
                                               vhArray, VarHandleTestMethodTypeDouble::testArrayWrongMethodType,
                                               false));
+
         for (VarHandleToMethodHandle f : VarHandleToMethodHandle.values()) {
-            cases.add(new MethodHandleAccessTestCase("Instance field wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Instance field",
                                                      vhField, f, hs -> testInstanceFieldWrongMethodType(this, hs),
                                                      false));
 
-            cases.add(new MethodHandleAccessTestCase("Static field wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Static field",
                                                      vhStaticField, f, VarHandleTestMethodTypeDouble::testStaticFieldWrongMethodType,
                                                      false));
 
-            cases.add(new MethodHandleAccessTestCase("Array wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Array",
                                                      vhArray, f, VarHandleTestMethodTypeDouble::testArrayWrongMethodType,
                                                      false));
         }
@@ -329,63 +331,63 @@ public class VarHandleTestMethodTypeDouble extends VarHandleBaseTest {
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                double x = (double) hs.get(am, methodType(double.class, Void.class)).
-                    invoke(null);
+                double x = (double) hs.get(am, methodType(double.class, VarHandleTestMethodTypeDouble.class)).
+                    invokeExact((VarHandleTestMethodTypeDouble) null);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 double x = (double) hs.get(am, methodType(double.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 double x = (double) hs.get(am, methodType(double.class, int.class)).
-                    invoke(0);
+                    invokeExact(0);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
-                Void x = (Void) hs.get(am, methodType(double.class, VarHandleTestMethodTypeDouble.class)).
-                    invoke(recv);
+                Void x = (Void) hs.get(am, methodType(Void.class, VarHandleTestMethodTypeDouble.class)).
+                    invokeExact(recv);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeDouble.class)).
-                    invoke(recv);
+                    invokeExact(recv);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 double x = (double) hs.get(am, methodType(double.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 double x = (double) hs.get(am, methodType(double.class, VarHandleTestMethodTypeDouble.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                hs.get(am, methodType(void.class, Void.class, double.class)).
-                    invoke(null, 1.0d);
+                hs.get(am, methodType(void.class, VarHandleTestMethodTypeDouble.class, double.class)).
+                    invokeExact((VarHandleTestMethodTypeDouble) null, 1.0d);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 hs.get(am, methodType(void.class, Class.class, double.class)).
-                    invoke(Void.class, 1.0d);
+                    invokeExact(Void.class, 1.0d);
             });
             checkWMTE(() -> { // value reference class
                 hs.get(am, methodType(void.class, VarHandleTestMethodTypeDouble.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 hs.get(am, methodType(void.class, int.class, double.class)).
-                    invoke(0, 1.0d);
+                    invokeExact(0, 1.0d);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, VarHandleTestMethodTypeDouble.class, double.class, Class.class)).
-                    invoke(recv, 1.0d, Void.class);
+                    invokeExact(recv, 1.0d, Void.class);
             });
         }
 
@@ -513,32 +515,32 @@ public class VarHandleTestMethodTypeDouble extends VarHandleBaseTest {
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void x = (Void) hs.get(am, methodType(Void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class)).
-                    invoke();
+                    invokeExact();
             });
             // Incorrect arity
             checkWMTE(() -> { // >
                 double x = (double) hs.get(am, methodType(Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             checkWMTE(() -> { // value reference class
                 hs.get(am, methodType(void.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, double.class, Class.class)).
-                    invoke(1.0d, Void.class);
+                    invokeExact(1.0d, Void.class);
             });
         }
 
@@ -783,71 +785,71 @@ public class VarHandleTestMethodTypeDouble extends VarHandleBaseTest {
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                double x = (double) hs.get(am, methodType(double.class, Void.class, int.class)).
-                    invoke(null, 0);
+                double x = (double) hs.get(am, methodType(double.class, double[].class, int.class)).
+                    invokeExact((double[]) null, 0);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 double x = (double) hs.get(am, methodType(double.class, Class.class, int.class)).
-                    invoke(Void.class, 0);
+                    invokeExact(Void.class, 0);
             });
             checkWMTE(() -> { // array primitive class
                 double x = (double) hs.get(am, methodType(double.class, int.class, int.class)).
-                    invoke(0, 0);
+                    invokeExact(0, 0);
             });
             checkWMTE(() -> { // index reference class
                 double x = (double) hs.get(am, methodType(double.class, double[].class, Class.class)).
-                    invoke(array, Void.class);
+                    invokeExact(array, Void.class);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void x = (Void) hs.get(am, methodType(Void.class, double[].class, int.class)).
-                    invoke(array, 0);
+                    invokeExact(array, 0);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, double[].class, int.class)).
-                    invoke(array, 0);
+                    invokeExact(array, 0);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 double x = (double) hs.get(am, methodType(double.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 double x = (double) hs.get(am, methodType(double.class, double[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                hs.get(am, methodType(void.class, Void.class, int.class, double.class)).
-                    invoke(null, 0, 1.0d);
+                hs.get(am, methodType(void.class, double[].class, int.class, double.class)).
+                    invokeExact((double[]) null, 0, 1.0d);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 hs.get(am, methodType(void.class, Class.class, int.class, double.class)).
-                    invoke(Void.class, 0, 1.0d);
+                    invokeExact(Void.class, 0, 1.0d);
             });
             checkWMTE(() -> { // value reference class
                 hs.get(am, methodType(void.class, double[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 hs.get(am, methodType(void.class, int.class, int.class, double.class)).
-                    invoke(0, 0, 1.0d);
+                    invokeExact(0, 0, 1.0d);
             });
             checkWMTE(() -> { // index reference class
                 hs.get(am, methodType(void.class, double[].class, Class.class, double.class)).
-                    invoke(array, Void.class, 1.0d);
+                    invokeExact(array, Void.class, 1.0d);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, double[].class, int.class, Class.class)).
-                    invoke(array, 0, 1.0d, Void.class);
+                    invokeExact(array, 0, 1.0d, Void.class);
             });
         }
 
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeFloat.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeFloat.java
index c1bee039b73..b07049d64b0 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeFloat.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeFloat.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @bug 8156486
  * @run testng/othervm VarHandleTestMethodTypeFloat
  * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodTypeFloat
  */
@@ -81,27 +82,28 @@ public class VarHandleTestMethodTypeFloat extends VarHandleBaseTest {
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
-        cases.add(new VarHandleAccessTestCase("Instance field wrong method type",
+        cases.add(new VarHandleAccessTestCase("Instance field",
                                               vhField, vh -> testInstanceFieldWrongMethodType(this, vh),
                                               false));
 
-        cases.add(new VarHandleAccessTestCase("Static field wrong method type",
+        cases.add(new VarHandleAccessTestCase("Static field",
                                               vhStaticField, VarHandleTestMethodTypeFloat::testStaticFieldWrongMethodType,
                                               false));
 
-        cases.add(new VarHandleAccessTestCase("Array wrong method type",
+        cases.add(new VarHandleAccessTestCase("Array",
                                               vhArray, VarHandleTestMethodTypeFloat::testArrayWrongMethodType,
                                               false));
+
         for (VarHandleToMethodHandle f : VarHandleToMethodHandle.values()) {
-            cases.add(new MethodHandleAccessTestCase("Instance field wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Instance field",
                                                      vhField, f, hs -> testInstanceFieldWrongMethodType(this, hs),
                                                      false));
 
-            cases.add(new MethodHandleAccessTestCase("Static field wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Static field",
                                                      vhStaticField, f, VarHandleTestMethodTypeFloat::testStaticFieldWrongMethodType,
                                                      false));
 
-            cases.add(new MethodHandleAccessTestCase("Array wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Array",
                                                      vhArray, f, VarHandleTestMethodTypeFloat::testArrayWrongMethodType,
                                                      false));
         }
@@ -329,63 +331,63 @@ public class VarHandleTestMethodTypeFloat extends VarHandleBaseTest {
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                float x = (float) hs.get(am, methodType(float.class, Void.class)).
-                    invoke(null);
+                float x = (float) hs.get(am, methodType(float.class, VarHandleTestMethodTypeFloat.class)).
+                    invokeExact((VarHandleTestMethodTypeFloat) null);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 float x = (float) hs.get(am, methodType(float.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 float x = (float) hs.get(am, methodType(float.class, int.class)).
-                    invoke(0);
+                    invokeExact(0);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
-                Void x = (Void) hs.get(am, methodType(float.class, VarHandleTestMethodTypeFloat.class)).
-                    invoke(recv);
+                Void x = (Void) hs.get(am, methodType(Void.class, VarHandleTestMethodTypeFloat.class)).
+                    invokeExact(recv);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeFloat.class)).
-                    invoke(recv);
+                    invokeExact(recv);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 float x = (float) hs.get(am, methodType(float.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 float x = (float) hs.get(am, methodType(float.class, VarHandleTestMethodTypeFloat.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                hs.get(am, methodType(void.class, Void.class, float.class)).
-                    invoke(null, 1.0f);
+                hs.get(am, methodType(void.class, VarHandleTestMethodTypeFloat.class, float.class)).
+                    invokeExact((VarHandleTestMethodTypeFloat) null, 1.0f);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 hs.get(am, methodType(void.class, Class.class, float.class)).
-                    invoke(Void.class, 1.0f);
+                    invokeExact(Void.class, 1.0f);
             });
             checkWMTE(() -> { // value reference class
                 hs.get(am, methodType(void.class, VarHandleTestMethodTypeFloat.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 hs.get(am, methodType(void.class, int.class, float.class)).
-                    invoke(0, 1.0f);
+                    invokeExact(0, 1.0f);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, VarHandleTestMethodTypeFloat.class, float.class, Class.class)).
-                    invoke(recv, 1.0f, Void.class);
+                    invokeExact(recv, 1.0f, Void.class);
             });
         }
 
@@ -513,32 +515,32 @@ public class VarHandleTestMethodTypeFloat extends VarHandleBaseTest {
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void x = (Void) hs.get(am, methodType(Void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class)).
-                    invoke();
+                    invokeExact();
             });
             // Incorrect arity
             checkWMTE(() -> { // >
                 float x = (float) hs.get(am, methodType(Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             checkWMTE(() -> { // value reference class
                 hs.get(am, methodType(void.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, float.class, Class.class)).
-                    invoke(1.0f, Void.class);
+                    invokeExact(1.0f, Void.class);
             });
         }
 
@@ -783,71 +785,71 @@ public class VarHandleTestMethodTypeFloat extends VarHandleBaseTest {
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                float x = (float) hs.get(am, methodType(float.class, Void.class, int.class)).
-                    invoke(null, 0);
+                float x = (float) hs.get(am, methodType(float.class, float[].class, int.class)).
+                    invokeExact((float[]) null, 0);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 float x = (float) hs.get(am, methodType(float.class, Class.class, int.class)).
-                    invoke(Void.class, 0);
+                    invokeExact(Void.class, 0);
             });
             checkWMTE(() -> { // array primitive class
                 float x = (float) hs.get(am, methodType(float.class, int.class, int.class)).
-                    invoke(0, 0);
+                    invokeExact(0, 0);
             });
             checkWMTE(() -> { // index reference class
                 float x = (float) hs.get(am, methodType(float.class, float[].class, Class.class)).
-                    invoke(array, Void.class);
+                    invokeExact(array, Void.class);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void x = (Void) hs.get(am, methodType(Void.class, float[].class, int.class)).
-                    invoke(array, 0);
+                    invokeExact(array, 0);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, float[].class, int.class)).
-                    invoke(array, 0);
+                    invokeExact(array, 0);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 float x = (float) hs.get(am, methodType(float.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 float x = (float) hs.get(am, methodType(float.class, float[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                hs.get(am, methodType(void.class, Void.class, int.class, float.class)).
-                    invoke(null, 0, 1.0f);
+                hs.get(am, methodType(void.class, float[].class, int.class, float.class)).
+                    invokeExact((float[]) null, 0, 1.0f);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 hs.get(am, methodType(void.class, Class.class, int.class, float.class)).
-                    invoke(Void.class, 0, 1.0f);
+                    invokeExact(Void.class, 0, 1.0f);
             });
             checkWMTE(() -> { // value reference class
                 hs.get(am, methodType(void.class, float[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 hs.get(am, methodType(void.class, int.class, int.class, float.class)).
-                    invoke(0, 0, 1.0f);
+                    invokeExact(0, 0, 1.0f);
             });
             checkWMTE(() -> { // index reference class
                 hs.get(am, methodType(void.class, float[].class, Class.class, float.class)).
-                    invoke(array, Void.class, 1.0f);
+                    invokeExact(array, Void.class, 1.0f);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, float[].class, int.class, Class.class)).
-                    invoke(array, 0, 1.0f, Void.class);
+                    invokeExact(array, 0, 1.0f, Void.class);
             });
         }
 
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeInt.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeInt.java
index 13b6b0607b0..67fca94c49a 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeInt.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeInt.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @bug 8156486
  * @run testng/othervm VarHandleTestMethodTypeInt
  * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodTypeInt
  */
@@ -81,27 +82,28 @@ public class VarHandleTestMethodTypeInt extends VarHandleBaseTest {
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
-        cases.add(new VarHandleAccessTestCase("Instance field wrong method type",
+        cases.add(new VarHandleAccessTestCase("Instance field",
                                               vhField, vh -> testInstanceFieldWrongMethodType(this, vh),
                                               false));
 
-        cases.add(new VarHandleAccessTestCase("Static field wrong method type",
+        cases.add(new VarHandleAccessTestCase("Static field",
                                               vhStaticField, VarHandleTestMethodTypeInt::testStaticFieldWrongMethodType,
                                               false));
 
-        cases.add(new VarHandleAccessTestCase("Array wrong method type",
+        cases.add(new VarHandleAccessTestCase("Array",
                                               vhArray, VarHandleTestMethodTypeInt::testArrayWrongMethodType,
                                               false));
+
         for (VarHandleToMethodHandle f : VarHandleToMethodHandle.values()) {
-            cases.add(new MethodHandleAccessTestCase("Instance field wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Instance field",
                                                      vhField, f, hs -> testInstanceFieldWrongMethodType(this, hs),
                                                      false));
 
-            cases.add(new MethodHandleAccessTestCase("Static field wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Static field",
                                                      vhStaticField, f, VarHandleTestMethodTypeInt::testStaticFieldWrongMethodType,
                                                      false));
 
-            cases.add(new MethodHandleAccessTestCase("Array wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Array",
                                                      vhArray, f, VarHandleTestMethodTypeInt::testArrayWrongMethodType,
                                                      false));
         }
@@ -644,211 +646,211 @@ public class VarHandleTestMethodTypeInt extends VarHandleBaseTest {
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                int x = (int) hs.get(am, methodType(int.class, Void.class)).
-                    invoke(null);
+                int x = (int) hs.get(am, methodType(int.class, VarHandleTestMethodTypeInt.class)).
+                    invokeExact((VarHandleTestMethodTypeInt) null);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 int x = (int) hs.get(am, methodType(int.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 int x = (int) hs.get(am, methodType(int.class, int.class)).
-                    invoke(0);
+                    invokeExact(0);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
-                Void x = (Void) hs.get(am, methodType(int.class, VarHandleTestMethodTypeInt.class)).
-                    invoke(recv);
+                Void x = (Void) hs.get(am, methodType(Void.class, VarHandleTestMethodTypeInt.class)).
+                    invokeExact(recv);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeInt.class)).
-                    invoke(recv);
+                    invokeExact(recv);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 int x = (int) hs.get(am, methodType(int.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 int x = (int) hs.get(am, methodType(int.class, VarHandleTestMethodTypeInt.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                hs.get(am, methodType(void.class, Void.class, int.class)).
-                    invoke(null, 1);
+                hs.get(am, methodType(void.class, VarHandleTestMethodTypeInt.class, int.class)).
+                    invokeExact((VarHandleTestMethodTypeInt) null, 1);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 hs.get(am, methodType(void.class, Class.class, int.class)).
-                    invoke(Void.class, 1);
+                    invokeExact(Void.class, 1);
             });
             checkWMTE(() -> { // value reference class
                 hs.get(am, methodType(void.class, VarHandleTestMethodTypeInt.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 hs.get(am, methodType(void.class, int.class, int.class)).
-                    invoke(0, 1);
+                    invokeExact(0, 1);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, VarHandleTestMethodTypeInt.class, int.class, Class.class)).
-                    invoke(recv, 1, Void.class);
+                    invokeExact(recv, 1, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.COMPARE_AND_SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                boolean r = (boolean) hs.get(am, methodType(boolean.class, Void.class, int.class, int.class)).
-                    invoke(null, 1, 1);
+                boolean r = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeInt.class, int.class, int.class)).
+                    invokeExact((VarHandleTestMethodTypeInt) null, 1, 1);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, Class.class, int.class, int.class)).
-                    invoke(Void.class, 1, 1);
+                    invokeExact(Void.class, 1, 1);
             });
             checkWMTE(() -> { // expected reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeInt.class, Class.class, int.class)).
-                    invoke(recv, Void.class, 1);
+                    invokeExact(recv, Void.class, 1);
             });
             checkWMTE(() -> { // actual reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeInt.class, int.class, Class.class)).
-                    invoke(recv, 1, Void.class);
+                    invokeExact(recv, 1, Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, int.class , int.class, int.class)).
-                    invoke(0, 1, 1);
+                    invokeExact(0, 1, 1);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 boolean r = (boolean) hs.get(am, methodType(boolean.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeInt.class, int.class, int.class, Class.class)).
-                    invoke(recv, 1, 1, Void.class);
+                    invokeExact(recv, 1, 1, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.COMPARE_AND_EXCHANGE)) {
             checkNPE(() -> { // null receiver
-                int x = (int) hs.get(am, methodType(int.class, Void.class, int.class, int.class)).
-                    invoke(null, 1, 1);
+                int x = (int) hs.get(am, methodType(int.class, VarHandleTestMethodTypeInt.class, int.class, int.class)).
+                    invokeExact((VarHandleTestMethodTypeInt) null, 1, 1);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 int x = (int) hs.get(am, methodType(int.class, Class.class, int.class, int.class)).
-                    invoke(Void.class, 1, 1);
+                    invokeExact(Void.class, 1, 1);
             });
             checkWMTE(() -> { // expected reference class
                 int x = (int) hs.get(am, methodType(int.class, VarHandleTestMethodTypeInt.class, Class.class, int.class)).
-                    invoke(recv, Void.class, 1);
+                    invokeExact(recv, Void.class, 1);
             });
             checkWMTE(() -> { // actual reference class
                 int x = (int) hs.get(am, methodType(int.class, VarHandleTestMethodTypeInt.class, int.class, Class.class)).
-                    invoke(recv, 1, Void.class);
+                    invokeExact(recv, 1, Void.class);
             });
             checkWMTE(() -> { // reciever primitive class
                 int x = (int) hs.get(am, methodType(int.class, int.class , int.class, int.class)).
-                    invoke(0, 1, 1);
+                    invokeExact(0, 1, 1);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, VarHandleTestMethodTypeInt.class , int.class, int.class)).
-                    invoke(recv, 1, 1);
+                    invokeExact(recv, 1, 1);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeInt.class , int.class, int.class)).
-                    invoke(recv, 1, 1);
+                    invokeExact(recv, 1, 1);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 int x = (int) hs.get(am, methodType(int.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 int x = (int) hs.get(am, methodType(int.class, VarHandleTestMethodTypeInt.class, int.class, int.class, Class.class)).
-                    invoke(recv, 1, 1, Void.class);
+                    invokeExact(recv, 1, 1, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET_AND_SET)) {
             checkNPE(() -> { // null receiver
-                int x = (int) hs.get(am, methodType(int.class, Void.class, int.class)).
-                    invoke(null, 1);
+                int x = (int) hs.get(am, methodType(int.class, VarHandleTestMethodTypeInt.class, int.class)).
+                    invokeExact((VarHandleTestMethodTypeInt) null, 1);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 int x = (int) hs.get(am, methodType(int.class, Class.class, int.class)).
-                    invoke(Void.class, 1);
+                    invokeExact(Void.class, 1);
             });
             checkWMTE(() -> { // value reference class
                 int x = (int) hs.get(am, methodType(int.class, VarHandleTestMethodTypeInt.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
             checkWMTE(() -> { // reciever primitive class
                 int x = (int) hs.get(am, methodType(int.class, int.class, int.class)).
-                    invoke(0, 1);
+                    invokeExact(0, 1);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, VarHandleTestMethodTypeInt.class, int.class)).
-                    invoke(recv, 1);
+                    invokeExact(recv, 1);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeInt.class, int.class)).
-                    invoke(recv, 1);
+                    invokeExact(recv, 1);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 int x = (int) hs.get(am, methodType(int.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 int x = (int) hs.get(am, methodType(int.class, VarHandleTestMethodTypeInt.class, int.class)).
-                    invoke(recv, 1, Void.class);
+                    invokeExact(recv, 1, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET_AND_ADD)) {
             checkNPE(() -> { // null receiver
-                int x = (int) hs.get(am, methodType(int.class, Void.class, int.class)).
-                    invoke(null, 1);
+                int x = (int) hs.get(am, methodType(int.class, VarHandleTestMethodTypeInt.class, int.class)).
+                    invokeExact((VarHandleTestMethodTypeInt) null, 1);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 int x = (int) hs.get(am, methodType(int.class, Class.class, int.class)).
-                    invoke(Void.class, 1);
+                    invokeExact(Void.class, 1);
             });
             checkWMTE(() -> { // value reference class
                 int x = (int) hs.get(am, methodType(int.class, VarHandleTestMethodTypeInt.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
             checkWMTE(() -> { // reciever primitive class
                 int x = (int) hs.get(am, methodType(int.class, int.class, int.class)).
-                    invoke(0, 1);
+                    invokeExact(0, 1);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, VarHandleTestMethodTypeInt.class, int.class)).
-                    invoke(recv, 1);
+                    invokeExact(recv, 1);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeInt.class, int.class)).
-                    invoke(recv, 1);
+                    invokeExact(recv, 1);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 int x = (int) hs.get(am, methodType(int.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 int x = (int) hs.get(am, methodType(int.class, VarHandleTestMethodTypeInt.class, int.class)).
-                    invoke(recv, 1, Void.class);
+                    invokeExact(recv, 1, Void.class);
             });
         }
     }
@@ -1190,52 +1192,52 @@ public class VarHandleTestMethodTypeInt extends VarHandleBaseTest {
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void x = (Void) hs.get(am, methodType(Void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class)).
-                    invoke();
+                    invokeExact();
             });
             // Incorrect arity
             checkWMTE(() -> { // >
                 int x = (int) hs.get(am, methodType(Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             checkWMTE(() -> { // value reference class
                 hs.get(am, methodType(void.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, int.class, Class.class)).
-                    invoke(1, Void.class);
+                    invokeExact(1, Void.class);
             });
         }
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.COMPARE_AND_SET)) {
             // Incorrect argument types
             checkWMTE(() -> { // expected reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, Class.class, int.class)).
-                    invoke(Void.class, 1);
+                    invokeExact(Void.class, 1);
             });
             checkWMTE(() -> { // actual reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, int.class, Class.class)).
-                    invoke(1, Void.class);
+                    invokeExact(1, Void.class);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 boolean r = (boolean) hs.get(am, methodType(boolean.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, int.class, int.class, Class.class)).
-                    invoke(1, 1, Void.class);
+                    invokeExact(1, 1, Void.class);
             });
         }
 
@@ -1243,29 +1245,29 @@ public class VarHandleTestMethodTypeInt extends VarHandleBaseTest {
             // Incorrect argument types
             checkWMTE(() -> { // expected reference class
                 int x = (int) hs.get(am, methodType(int.class, Class.class, int.class)).
-                    invoke(Void.class, 1);
+                    invokeExact(Void.class, 1);
             });
             checkWMTE(() -> { // actual reference class
                 int x = (int) hs.get(am, methodType(int.class, int.class, Class.class)).
-                    invoke(1, Void.class);
+                    invokeExact(1, Void.class);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, int.class, int.class)).
-                    invoke(1, 1);
+                    invokeExact(1, 1);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, int.class, int.class)).
-                    invoke(1, 1);
+                    invokeExact(1, 1);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 int x = (int) hs.get(am, methodType(int.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 int x = (int) hs.get(am, methodType(int.class, int.class, int.class, Class.class)).
-                    invoke(1, 1, Void.class);
+                    invokeExact(1, 1, Void.class);
             });
         }
 
@@ -1273,25 +1275,25 @@ public class VarHandleTestMethodTypeInt extends VarHandleBaseTest {
             // Incorrect argument types
             checkWMTE(() -> { // value reference class
                 int x = (int) hs.get(am, methodType(int.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, int.class)).
-                    invoke(1);
+                    invokeExact(1);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, int.class)).
-                    invoke(1);
+                    invokeExact(1);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 int x = (int) hs.get(am, methodType(int.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 int x = (int) hs.get(am, methodType(int.class, int.class, Class.class)).
-                    invoke(1, Void.class);
+                    invokeExact(1, Void.class);
             });
         }
 
@@ -1299,25 +1301,25 @@ public class VarHandleTestMethodTypeInt extends VarHandleBaseTest {
             // Incorrect argument types
             checkWMTE(() -> { // value reference class
                 int x = (int) hs.get(am, methodType(int.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, int.class)).
-                    invoke(1);
+                    invokeExact(1);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, int.class)).
-                    invoke(1);
+                    invokeExact(1);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 int x = (int) hs.get(am, methodType(int.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 int x = (int) hs.get(am, methodType(int.class, int.class, Class.class)).
-                    invoke(1, Void.class);
+                    invokeExact(1, Void.class);
             });
         }
     }
@@ -1909,237 +1911,237 @@ public class VarHandleTestMethodTypeInt extends VarHandleBaseTest {
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                int x = (int) hs.get(am, methodType(int.class, Void.class, int.class)).
-                    invoke(null, 0);
+                int x = (int) hs.get(am, methodType(int.class, int[].class, int.class)).
+                    invokeExact((int[]) null, 0);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 int x = (int) hs.get(am, methodType(int.class, Class.class, int.class)).
-                    invoke(Void.class, 0);
+                    invokeExact(Void.class, 0);
             });
             checkWMTE(() -> { // array primitive class
                 int x = (int) hs.get(am, methodType(int.class, int.class, int.class)).
-                    invoke(0, 0);
+                    invokeExact(0, 0);
             });
             checkWMTE(() -> { // index reference class
                 int x = (int) hs.get(am, methodType(int.class, int[].class, Class.class)).
-                    invoke(array, Void.class);
+                    invokeExact(array, Void.class);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void x = (Void) hs.get(am, methodType(Void.class, int[].class, int.class)).
-                    invoke(array, 0);
+                    invokeExact(array, 0);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, int[].class, int.class)).
-                    invoke(array, 0);
+                    invokeExact(array, 0);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 int x = (int) hs.get(am, methodType(int.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 int x = (int) hs.get(am, methodType(int.class, int[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                hs.get(am, methodType(void.class, Void.class, int.class, int.class)).
-                    invoke(null, 0, 1);
+                hs.get(am, methodType(void.class, int[].class, int.class, int.class)).
+                    invokeExact((int[]) null, 0, 1);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 hs.get(am, methodType(void.class, Class.class, int.class, int.class)).
-                    invoke(Void.class, 0, 1);
+                    invokeExact(Void.class, 0, 1);
             });
             checkWMTE(() -> { // value reference class
                 hs.get(am, methodType(void.class, int[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 hs.get(am, methodType(void.class, int.class, int.class, int.class)).
-                    invoke(0, 0, 1);
+                    invokeExact(0, 0, 1);
             });
             checkWMTE(() -> { // index reference class
                 hs.get(am, methodType(void.class, int[].class, Class.class, int.class)).
-                    invoke(array, Void.class, 1);
+                    invokeExact(array, Void.class, 1);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, int[].class, int.class, Class.class)).
-                    invoke(array, 0, 1, Void.class);
+                    invokeExact(array, 0, 1, Void.class);
             });
         }
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.COMPARE_AND_SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                boolean r = (boolean) hs.get(am, methodType(boolean.class, Void.class, int.class, int.class, int.class)).
-                    invoke(null, 0, 1, 1);
+                boolean r = (boolean) hs.get(am, methodType(boolean.class, int[].class, int.class, int.class, int.class)).
+                    invokeExact((int[]) null, 0, 1, 1);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, Class.class, int.class, int.class, int.class)).
-                    invoke(Void.class, 0, 1, 1);
+                    invokeExact(Void.class, 0, 1, 1);
             });
             checkWMTE(() -> { // expected reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, int[].class, int.class, Class.class, int.class)).
-                    invoke(array, 0, Void.class, 1);
+                    invokeExact(array, 0, Void.class, 1);
             });
             checkWMTE(() -> { // actual reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, int[].class, int.class, int.class, Class.class)).
-                    invoke(array, 0, 1, Void.class);
+                    invokeExact(array, 0, 1, Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, int.class, int.class, int.class, int.class)).
-                    invoke(0, 0, 1, 1);
+                    invokeExact(0, 0, 1, 1);
             });
             checkWMTE(() -> { // index reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, int[].class, Class.class, int.class, int.class)).
-                    invoke(array, Void.class, 1, 1);
+                    invokeExact(array, Void.class, 1, 1);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 boolean r = (boolean) hs.get(am, methodType(boolean.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, int[].class, int.class, int.class, int.class, Class.class)).
-                    invoke(array, 0, 1, 1, Void.class);
+                    invokeExact(array, 0, 1, 1, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.COMPARE_AND_EXCHANGE)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                int x = (int) hs.get(am, methodType(int.class, Void.class, int.class, int.class, int.class)).
-                    invoke(null, 0, 1, 1);
+                int x = (int) hs.get(am, methodType(int.class, int[].class, int.class, int.class, int.class)).
+                    invokeExact((int[]) null, 0, 1, 1);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 int x = (int) hs.get(am, methodType(int.class, Class.class, int.class, int.class, int.class)).
-                    invoke(Void.class, 0, 1, 1);
+                    invokeExact(Void.class, 0, 1, 1);
             });
             checkWMTE(() -> { // expected reference class
                 int x = (int) hs.get(am, methodType(int.class, int[].class, int.class, Class.class, int.class)).
-                    invoke(array, 0, Void.class, 1);
+                    invokeExact(array, 0, Void.class, 1);
             });
             checkWMTE(() -> { // actual reference class
                 int x = (int) hs.get(am, methodType(int.class, int[].class, int.class, int.class, Class.class)).
-                    invoke(array, 0, 1, Void.class);
+                    invokeExact(array, 0, 1, Void.class);
             });
             checkWMTE(() -> { // array primitive class
                 int x = (int) hs.get(am, methodType(int.class, int.class, int.class, int.class, int.class)).
-                    invoke(0, 0, 1, 1);
+                    invokeExact(0, 0, 1, 1);
             });
             checkWMTE(() -> { // index reference class
                 int x = (int) hs.get(am, methodType(int.class, int[].class, Class.class, int.class, int.class)).
-                    invoke(array, Void.class, 1, 1);
+                    invokeExact(array, Void.class, 1, 1);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, int[].class, int.class, int.class, int.class)).
-                    invoke(array, 0, 1, 1);
+                    invokeExact(array, 0, 1, 1);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, int[].class, int.class, int.class, int.class)).
-                    invoke(array, 0, 1, 1);
+                    invokeExact(array, 0, 1, 1);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 int x = (int) hs.get(am, methodType(int.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 int x = (int) hs.get(am, methodType(int.class, int[].class, int.class, int.class, int.class, Class.class)).
-                    invoke(array, 0, 1, 1, Void.class);
+                    invokeExact(array, 0, 1, 1, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET_AND_SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                int x = (int) hs.get(am, methodType(int.class, Void.class, int.class, int.class)).
-                    invoke(null, 0, 1);
+                int x = (int) hs.get(am, methodType(int.class, int[].class, int.class, int.class)).
+                    invokeExact((int[]) null, 0, 1);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 int x = (int) hs.get(am, methodType(int.class, Class.class, int.class, int.class)).
-                    invoke(Void.class, 0, 1);
+                    invokeExact(Void.class, 0, 1);
             });
             checkWMTE(() -> { // value reference class
                 int x = (int) hs.get(am, methodType(int.class, int[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
             checkWMTE(() -> { // array primitive class
                 int x = (int) hs.get(am, methodType(int.class, int.class, int.class, int.class)).
-                    invoke(0, 0, 1);
+                    invokeExact(0, 0, 1);
             });
             checkWMTE(() -> { // index reference class
                 int x = (int) hs.get(am, methodType(int.class, int[].class, Class.class, int.class)).
-                    invoke(array, Void.class, 1);
+                    invokeExact(array, Void.class, 1);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, int[].class, int.class, int.class)).
-                    invoke(array, 0, 1);
+                    invokeExact(array, 0, 1);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, int[].class, int.class, int.class)).
-                    invoke(array, 0, 1);
+                    invokeExact(array, 0, 1);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 int x = (int) hs.get(am, methodType(int.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 int x = (int) hs.get(am, methodType(int.class, int[].class, int.class, int.class, Class.class)).
-                    invoke(array, 0, 1, Void.class);
+                    invokeExact(array, 0, 1, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET_AND_ADD)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                int x = (int) hs.get(am, methodType(int.class, Void.class, int.class, int.class)).
-                    invoke(null, 0, 1);
+                int x = (int) hs.get(am, methodType(int.class, int[].class, int.class, int.class)).
+                    invokeExact((int[]) null, 0, 1);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 int x = (int) hs.get(am, methodType(int.class, Class.class, int.class, int.class)).
-                    invoke(Void.class, 0, 1);
+                    invokeExact(Void.class, 0, 1);
             });
             checkWMTE(() -> { // value reference class
                 int x = (int) hs.get(am, methodType(int.class, int[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
             checkWMTE(() -> { // array primitive class
                 int x = (int) hs.get(am, methodType(int.class, int.class, int.class, int.class)).
-                    invoke(0, 0, 1);
+                    invokeExact(0, 0, 1);
             });
             checkWMTE(() -> { // index reference class
                 int x = (int) hs.get(am, methodType(int.class, int[].class, Class.class, int.class)).
-                    invoke(array, Void.class, 1);
+                    invokeExact(array, Void.class, 1);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, int[].class, int.class, int.class)).
-                    invoke(array, 0, 1);
+                    invokeExact(array, 0, 1);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, int[].class, int.class, int.class)).
-                    invoke(array, 0, 1);
+                    invokeExact(array, 0, 1);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 int x = (int) hs.get(am, methodType(int.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 int x = (int) hs.get(am, methodType(int.class, int[].class, int.class, int.class, Class.class)).
-                    invoke(array, 0, 1, Void.class);
+                    invokeExact(array, 0, 1, Void.class);
             });
         }
     }
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeLong.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeLong.java
index 44151683133..0972e663cc7 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeLong.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeLong.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @bug 8156486
  * @run testng/othervm VarHandleTestMethodTypeLong
  * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodTypeLong
  */
@@ -81,27 +82,28 @@ public class VarHandleTestMethodTypeLong extends VarHandleBaseTest {
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
-        cases.add(new VarHandleAccessTestCase("Instance field wrong method type",
+        cases.add(new VarHandleAccessTestCase("Instance field",
                                               vhField, vh -> testInstanceFieldWrongMethodType(this, vh),
                                               false));
 
-        cases.add(new VarHandleAccessTestCase("Static field wrong method type",
+        cases.add(new VarHandleAccessTestCase("Static field",
                                               vhStaticField, VarHandleTestMethodTypeLong::testStaticFieldWrongMethodType,
                                               false));
 
-        cases.add(new VarHandleAccessTestCase("Array wrong method type",
+        cases.add(new VarHandleAccessTestCase("Array",
                                               vhArray, VarHandleTestMethodTypeLong::testArrayWrongMethodType,
                                               false));
+
         for (VarHandleToMethodHandle f : VarHandleToMethodHandle.values()) {
-            cases.add(new MethodHandleAccessTestCase("Instance field wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Instance field",
                                                      vhField, f, hs -> testInstanceFieldWrongMethodType(this, hs),
                                                      false));
 
-            cases.add(new MethodHandleAccessTestCase("Static field wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Static field",
                                                      vhStaticField, f, VarHandleTestMethodTypeLong::testStaticFieldWrongMethodType,
                                                      false));
 
-            cases.add(new MethodHandleAccessTestCase("Array wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Array",
                                                      vhArray, f, VarHandleTestMethodTypeLong::testArrayWrongMethodType,
                                                      false));
         }
@@ -644,211 +646,211 @@ public class VarHandleTestMethodTypeLong extends VarHandleBaseTest {
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                long x = (long) hs.get(am, methodType(long.class, Void.class)).
-                    invoke(null);
+                long x = (long) hs.get(am, methodType(long.class, VarHandleTestMethodTypeLong.class)).
+                    invokeExact((VarHandleTestMethodTypeLong) null);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 long x = (long) hs.get(am, methodType(long.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 long x = (long) hs.get(am, methodType(long.class, int.class)).
-                    invoke(0);
+                    invokeExact(0);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
-                Void x = (Void) hs.get(am, methodType(long.class, VarHandleTestMethodTypeLong.class)).
-                    invoke(recv);
+                Void x = (Void) hs.get(am, methodType(Void.class, VarHandleTestMethodTypeLong.class)).
+                    invokeExact(recv);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeLong.class)).
-                    invoke(recv);
+                    invokeExact(recv);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 long x = (long) hs.get(am, methodType(long.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 long x = (long) hs.get(am, methodType(long.class, VarHandleTestMethodTypeLong.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                hs.get(am, methodType(void.class, Void.class, long.class)).
-                    invoke(null, 1L);
+                hs.get(am, methodType(void.class, VarHandleTestMethodTypeLong.class, long.class)).
+                    invokeExact((VarHandleTestMethodTypeLong) null, 1L);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 hs.get(am, methodType(void.class, Class.class, long.class)).
-                    invoke(Void.class, 1L);
+                    invokeExact(Void.class, 1L);
             });
             checkWMTE(() -> { // value reference class
                 hs.get(am, methodType(void.class, VarHandleTestMethodTypeLong.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 hs.get(am, methodType(void.class, int.class, long.class)).
-                    invoke(0, 1L);
+                    invokeExact(0, 1L);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, VarHandleTestMethodTypeLong.class, long.class, Class.class)).
-                    invoke(recv, 1L, Void.class);
+                    invokeExact(recv, 1L, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.COMPARE_AND_SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                boolean r = (boolean) hs.get(am, methodType(boolean.class, Void.class, long.class, long.class)).
-                    invoke(null, 1L, 1L);
+                boolean r = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeLong.class, long.class, long.class)).
+                    invokeExact((VarHandleTestMethodTypeLong) null, 1L, 1L);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, Class.class, long.class, long.class)).
-                    invoke(Void.class, 1L, 1L);
+                    invokeExact(Void.class, 1L, 1L);
             });
             checkWMTE(() -> { // expected reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeLong.class, Class.class, long.class)).
-                    invoke(recv, Void.class, 1L);
+                    invokeExact(recv, Void.class, 1L);
             });
             checkWMTE(() -> { // actual reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeLong.class, long.class, Class.class)).
-                    invoke(recv, 1L, Void.class);
+                    invokeExact(recv, 1L, Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, int.class , long.class, long.class)).
-                    invoke(0, 1L, 1L);
+                    invokeExact(0, 1L, 1L);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 boolean r = (boolean) hs.get(am, methodType(boolean.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeLong.class, long.class, long.class, Class.class)).
-                    invoke(recv, 1L, 1L, Void.class);
+                    invokeExact(recv, 1L, 1L, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.COMPARE_AND_EXCHANGE)) {
             checkNPE(() -> { // null receiver
-                long x = (long) hs.get(am, methodType(long.class, Void.class, long.class, long.class)).
-                    invoke(null, 1L, 1L);
+                long x = (long) hs.get(am, methodType(long.class, VarHandleTestMethodTypeLong.class, long.class, long.class)).
+                    invokeExact((VarHandleTestMethodTypeLong) null, 1L, 1L);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 long x = (long) hs.get(am, methodType(long.class, Class.class, long.class, long.class)).
-                    invoke(Void.class, 1L, 1L);
+                    invokeExact(Void.class, 1L, 1L);
             });
             checkWMTE(() -> { // expected reference class
                 long x = (long) hs.get(am, methodType(long.class, VarHandleTestMethodTypeLong.class, Class.class, long.class)).
-                    invoke(recv, Void.class, 1L);
+                    invokeExact(recv, Void.class, 1L);
             });
             checkWMTE(() -> { // actual reference class
                 long x = (long) hs.get(am, methodType(long.class, VarHandleTestMethodTypeLong.class, long.class, Class.class)).
-                    invoke(recv, 1L, Void.class);
+                    invokeExact(recv, 1L, Void.class);
             });
             checkWMTE(() -> { // reciever primitive class
                 long x = (long) hs.get(am, methodType(long.class, int.class , long.class, long.class)).
-                    invoke(0, 1L, 1L);
+                    invokeExact(0, 1L, 1L);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, VarHandleTestMethodTypeLong.class , long.class, long.class)).
-                    invoke(recv, 1L, 1L);
+                    invokeExact(recv, 1L, 1L);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeLong.class , long.class, long.class)).
-                    invoke(recv, 1L, 1L);
+                    invokeExact(recv, 1L, 1L);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 long x = (long) hs.get(am, methodType(long.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 long x = (long) hs.get(am, methodType(long.class, VarHandleTestMethodTypeLong.class, long.class, long.class, Class.class)).
-                    invoke(recv, 1L, 1L, Void.class);
+                    invokeExact(recv, 1L, 1L, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET_AND_SET)) {
             checkNPE(() -> { // null receiver
-                long x = (long) hs.get(am, methodType(long.class, Void.class, long.class)).
-                    invoke(null, 1L);
+                long x = (long) hs.get(am, methodType(long.class, VarHandleTestMethodTypeLong.class, long.class)).
+                    invokeExact((VarHandleTestMethodTypeLong) null, 1L);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 long x = (long) hs.get(am, methodType(long.class, Class.class, long.class)).
-                    invoke(Void.class, 1L);
+                    invokeExact(Void.class, 1L);
             });
             checkWMTE(() -> { // value reference class
                 long x = (long) hs.get(am, methodType(long.class, VarHandleTestMethodTypeLong.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
             checkWMTE(() -> { // reciever primitive class
                 long x = (long) hs.get(am, methodType(long.class, int.class, long.class)).
-                    invoke(0, 1L);
+                    invokeExact(0, 1L);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, VarHandleTestMethodTypeLong.class, long.class)).
-                    invoke(recv, 1L);
+                    invokeExact(recv, 1L);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeLong.class, long.class)).
-                    invoke(recv, 1L);
+                    invokeExact(recv, 1L);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 long x = (long) hs.get(am, methodType(long.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 long x = (long) hs.get(am, methodType(long.class, VarHandleTestMethodTypeLong.class, long.class)).
-                    invoke(recv, 1L, Void.class);
+                    invokeExact(recv, 1L, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET_AND_ADD)) {
             checkNPE(() -> { // null receiver
-                long x = (long) hs.get(am, methodType(long.class, Void.class, long.class)).
-                    invoke(null, 1L);
+                long x = (long) hs.get(am, methodType(long.class, VarHandleTestMethodTypeLong.class, long.class)).
+                    invokeExact((VarHandleTestMethodTypeLong) null, 1L);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 long x = (long) hs.get(am, methodType(long.class, Class.class, long.class)).
-                    invoke(Void.class, 1L);
+                    invokeExact(Void.class, 1L);
             });
             checkWMTE(() -> { // value reference class
                 long x = (long) hs.get(am, methodType(long.class, VarHandleTestMethodTypeLong.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
             checkWMTE(() -> { // reciever primitive class
                 long x = (long) hs.get(am, methodType(long.class, int.class, long.class)).
-                    invoke(0, 1L);
+                    invokeExact(0, 1L);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, VarHandleTestMethodTypeLong.class, long.class)).
-                    invoke(recv, 1L);
+                    invokeExact(recv, 1L);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeLong.class, long.class)).
-                    invoke(recv, 1L);
+                    invokeExact(recv, 1L);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 long x = (long) hs.get(am, methodType(long.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 long x = (long) hs.get(am, methodType(long.class, VarHandleTestMethodTypeLong.class, long.class)).
-                    invoke(recv, 1L, Void.class);
+                    invokeExact(recv, 1L, Void.class);
             });
         }
     }
@@ -1190,52 +1192,52 @@ public class VarHandleTestMethodTypeLong extends VarHandleBaseTest {
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void x = (Void) hs.get(am, methodType(Void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class)).
-                    invoke();
+                    invokeExact();
             });
             // Incorrect arity
             checkWMTE(() -> { // >
                 long x = (long) hs.get(am, methodType(Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             checkWMTE(() -> { // value reference class
                 hs.get(am, methodType(void.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, long.class, Class.class)).
-                    invoke(1L, Void.class);
+                    invokeExact(1L, Void.class);
             });
         }
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.COMPARE_AND_SET)) {
             // Incorrect argument types
             checkWMTE(() -> { // expected reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, Class.class, long.class)).
-                    invoke(Void.class, 1L);
+                    invokeExact(Void.class, 1L);
             });
             checkWMTE(() -> { // actual reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, long.class, Class.class)).
-                    invoke(1L, Void.class);
+                    invokeExact(1L, Void.class);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 boolean r = (boolean) hs.get(am, methodType(boolean.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, long.class, long.class, Class.class)).
-                    invoke(1L, 1L, Void.class);
+                    invokeExact(1L, 1L, Void.class);
             });
         }
 
@@ -1243,29 +1245,29 @@ public class VarHandleTestMethodTypeLong extends VarHandleBaseTest {
             // Incorrect argument types
             checkWMTE(() -> { // expected reference class
                 long x = (long) hs.get(am, methodType(long.class, Class.class, long.class)).
-                    invoke(Void.class, 1L);
+                    invokeExact(Void.class, 1L);
             });
             checkWMTE(() -> { // actual reference class
                 long x = (long) hs.get(am, methodType(long.class, long.class, Class.class)).
-                    invoke(1L, Void.class);
+                    invokeExact(1L, Void.class);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, long.class, long.class)).
-                    invoke(1L, 1L);
+                    invokeExact(1L, 1L);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, long.class, long.class)).
-                    invoke(1L, 1L);
+                    invokeExact(1L, 1L);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 long x = (long) hs.get(am, methodType(long.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 long x = (long) hs.get(am, methodType(long.class, long.class, long.class, Class.class)).
-                    invoke(1L, 1L, Void.class);
+                    invokeExact(1L, 1L, Void.class);
             });
         }
 
@@ -1273,25 +1275,25 @@ public class VarHandleTestMethodTypeLong extends VarHandleBaseTest {
             // Incorrect argument types
             checkWMTE(() -> { // value reference class
                 long x = (long) hs.get(am, methodType(long.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, long.class)).
-                    invoke(1L);
+                    invokeExact(1L);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, long.class)).
-                    invoke(1L);
+                    invokeExact(1L);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 long x = (long) hs.get(am, methodType(long.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 long x = (long) hs.get(am, methodType(long.class, long.class, Class.class)).
-                    invoke(1L, Void.class);
+                    invokeExact(1L, Void.class);
             });
         }
 
@@ -1299,25 +1301,25 @@ public class VarHandleTestMethodTypeLong extends VarHandleBaseTest {
             // Incorrect argument types
             checkWMTE(() -> { // value reference class
                 long x = (long) hs.get(am, methodType(long.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, long.class)).
-                    invoke(1L);
+                    invokeExact(1L);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, long.class)).
-                    invoke(1L);
+                    invokeExact(1L);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 long x = (long) hs.get(am, methodType(long.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 long x = (long) hs.get(am, methodType(long.class, long.class, Class.class)).
-                    invoke(1L, Void.class);
+                    invokeExact(1L, Void.class);
             });
         }
     }
@@ -1909,237 +1911,237 @@ public class VarHandleTestMethodTypeLong extends VarHandleBaseTest {
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                long x = (long) hs.get(am, methodType(long.class, Void.class, int.class)).
-                    invoke(null, 0);
+                long x = (long) hs.get(am, methodType(long.class, long[].class, int.class)).
+                    invokeExact((long[]) null, 0);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 long x = (long) hs.get(am, methodType(long.class, Class.class, int.class)).
-                    invoke(Void.class, 0);
+                    invokeExact(Void.class, 0);
             });
             checkWMTE(() -> { // array primitive class
                 long x = (long) hs.get(am, methodType(long.class, int.class, int.class)).
-                    invoke(0, 0);
+                    invokeExact(0, 0);
             });
             checkWMTE(() -> { // index reference class
                 long x = (long) hs.get(am, methodType(long.class, long[].class, Class.class)).
-                    invoke(array, Void.class);
+                    invokeExact(array, Void.class);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void x = (Void) hs.get(am, methodType(Void.class, long[].class, int.class)).
-                    invoke(array, 0);
+                    invokeExact(array, 0);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, long[].class, int.class)).
-                    invoke(array, 0);
+                    invokeExact(array, 0);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 long x = (long) hs.get(am, methodType(long.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 long x = (long) hs.get(am, methodType(long.class, long[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                hs.get(am, methodType(void.class, Void.class, int.class, long.class)).
-                    invoke(null, 0, 1L);
+                hs.get(am, methodType(void.class, long[].class, int.class, long.class)).
+                    invokeExact((long[]) null, 0, 1L);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 hs.get(am, methodType(void.class, Class.class, int.class, long.class)).
-                    invoke(Void.class, 0, 1L);
+                    invokeExact(Void.class, 0, 1L);
             });
             checkWMTE(() -> { // value reference class
                 hs.get(am, methodType(void.class, long[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 hs.get(am, methodType(void.class, int.class, int.class, long.class)).
-                    invoke(0, 0, 1L);
+                    invokeExact(0, 0, 1L);
             });
             checkWMTE(() -> { // index reference class
                 hs.get(am, methodType(void.class, long[].class, Class.class, long.class)).
-                    invoke(array, Void.class, 1L);
+                    invokeExact(array, Void.class, 1L);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, long[].class, int.class, Class.class)).
-                    invoke(array, 0, 1L, Void.class);
+                    invokeExact(array, 0, 1L, Void.class);
             });
         }
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.COMPARE_AND_SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                boolean r = (boolean) hs.get(am, methodType(boolean.class, Void.class, int.class, long.class, long.class)).
-                    invoke(null, 0, 1L, 1L);
+                boolean r = (boolean) hs.get(am, methodType(boolean.class, long[].class, int.class, long.class, long.class)).
+                    invokeExact((long[]) null, 0, 1L, 1L);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, Class.class, int.class, long.class, long.class)).
-                    invoke(Void.class, 0, 1L, 1L);
+                    invokeExact(Void.class, 0, 1L, 1L);
             });
             checkWMTE(() -> { // expected reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, long[].class, int.class, Class.class, long.class)).
-                    invoke(array, 0, Void.class, 1L);
+                    invokeExact(array, 0, Void.class, 1L);
             });
             checkWMTE(() -> { // actual reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, long[].class, int.class, long.class, Class.class)).
-                    invoke(array, 0, 1L, Void.class);
+                    invokeExact(array, 0, 1L, Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, int.class, int.class, long.class, long.class)).
-                    invoke(0, 0, 1L, 1L);
+                    invokeExact(0, 0, 1L, 1L);
             });
             checkWMTE(() -> { // index reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, long[].class, Class.class, long.class, long.class)).
-                    invoke(array, Void.class, 1L, 1L);
+                    invokeExact(array, Void.class, 1L, 1L);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 boolean r = (boolean) hs.get(am, methodType(boolean.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, long[].class, int.class, long.class, long.class, Class.class)).
-                    invoke(array, 0, 1L, 1L, Void.class);
+                    invokeExact(array, 0, 1L, 1L, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.COMPARE_AND_EXCHANGE)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                long x = (long) hs.get(am, methodType(long.class, Void.class, int.class, long.class, long.class)).
-                    invoke(null, 0, 1L, 1L);
+                long x = (long) hs.get(am, methodType(long.class, long[].class, int.class, long.class, long.class)).
+                    invokeExact((long[]) null, 0, 1L, 1L);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 long x = (long) hs.get(am, methodType(long.class, Class.class, int.class, long.class, long.class)).
-                    invoke(Void.class, 0, 1L, 1L);
+                    invokeExact(Void.class, 0, 1L, 1L);
             });
             checkWMTE(() -> { // expected reference class
                 long x = (long) hs.get(am, methodType(long.class, long[].class, int.class, Class.class, long.class)).
-                    invoke(array, 0, Void.class, 1L);
+                    invokeExact(array, 0, Void.class, 1L);
             });
             checkWMTE(() -> { // actual reference class
                 long x = (long) hs.get(am, methodType(long.class, long[].class, int.class, long.class, Class.class)).
-                    invoke(array, 0, 1L, Void.class);
+                    invokeExact(array, 0, 1L, Void.class);
             });
             checkWMTE(() -> { // array primitive class
                 long x = (long) hs.get(am, methodType(long.class, int.class, int.class, long.class, long.class)).
-                    invoke(0, 0, 1L, 1L);
+                    invokeExact(0, 0, 1L, 1L);
             });
             checkWMTE(() -> { // index reference class
                 long x = (long) hs.get(am, methodType(long.class, long[].class, Class.class, long.class, long.class)).
-                    invoke(array, Void.class, 1L, 1L);
+                    invokeExact(array, Void.class, 1L, 1L);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, long[].class, int.class, long.class, long.class)).
-                    invoke(array, 0, 1L, 1L);
+                    invokeExact(array, 0, 1L, 1L);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, long[].class, int.class, long.class, long.class)).
-                    invoke(array, 0, 1L, 1L);
+                    invokeExact(array, 0, 1L, 1L);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 long x = (long) hs.get(am, methodType(long.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 long x = (long) hs.get(am, methodType(long.class, long[].class, int.class, long.class, long.class, Class.class)).
-                    invoke(array, 0, 1L, 1L, Void.class);
+                    invokeExact(array, 0, 1L, 1L, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET_AND_SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                long x = (long) hs.get(am, methodType(long.class, Void.class, int.class, long.class)).
-                    invoke(null, 0, 1L);
+                long x = (long) hs.get(am, methodType(long.class, long[].class, int.class, long.class)).
+                    invokeExact((long[]) null, 0, 1L);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 long x = (long) hs.get(am, methodType(long.class, Class.class, int.class, long.class)).
-                    invoke(Void.class, 0, 1L);
+                    invokeExact(Void.class, 0, 1L);
             });
             checkWMTE(() -> { // value reference class
                 long x = (long) hs.get(am, methodType(long.class, long[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
             checkWMTE(() -> { // array primitive class
                 long x = (long) hs.get(am, methodType(long.class, int.class, int.class, long.class)).
-                    invoke(0, 0, 1L);
+                    invokeExact(0, 0, 1L);
             });
             checkWMTE(() -> { // index reference class
                 long x = (long) hs.get(am, methodType(long.class, long[].class, Class.class, long.class)).
-                    invoke(array, Void.class, 1L);
+                    invokeExact(array, Void.class, 1L);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, long[].class, int.class, long.class)).
-                    invoke(array, 0, 1L);
+                    invokeExact(array, 0, 1L);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, long[].class, int.class, long.class)).
-                    invoke(array, 0, 1L);
+                    invokeExact(array, 0, 1L);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 long x = (long) hs.get(am, methodType(long.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 long x = (long) hs.get(am, methodType(long.class, long[].class, int.class, long.class, Class.class)).
-                    invoke(array, 0, 1L, Void.class);
+                    invokeExact(array, 0, 1L, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET_AND_ADD)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                long x = (long) hs.get(am, methodType(long.class, Void.class, int.class, long.class)).
-                    invoke(null, 0, 1L);
+                long x = (long) hs.get(am, methodType(long.class, long[].class, int.class, long.class)).
+                    invokeExact((long[]) null, 0, 1L);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 long x = (long) hs.get(am, methodType(long.class, Class.class, int.class, long.class)).
-                    invoke(Void.class, 0, 1L);
+                    invokeExact(Void.class, 0, 1L);
             });
             checkWMTE(() -> { // value reference class
                 long x = (long) hs.get(am, methodType(long.class, long[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
             checkWMTE(() -> { // array primitive class
                 long x = (long) hs.get(am, methodType(long.class, int.class, int.class, long.class)).
-                    invoke(0, 0, 1L);
+                    invokeExact(0, 0, 1L);
             });
             checkWMTE(() -> { // index reference class
                 long x = (long) hs.get(am, methodType(long.class, long[].class, Class.class, long.class)).
-                    invoke(array, Void.class, 1L);
+                    invokeExact(array, Void.class, 1L);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, long[].class, int.class, long.class)).
-                    invoke(array, 0, 1L);
+                    invokeExact(array, 0, 1L);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, long[].class, int.class, long.class)).
-                    invoke(array, 0, 1L);
+                    invokeExact(array, 0, 1L);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 long x = (long) hs.get(am, methodType(long.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 long x = (long) hs.get(am, methodType(long.class, long[].class, int.class, long.class, Class.class)).
-                    invoke(array, 0, 1L, Void.class);
+                    invokeExact(array, 0, 1L, Void.class);
             });
         }
     }
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeShort.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeShort.java
index 634646e78c1..16efabe0917 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeShort.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeShort.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @bug 8156486
  * @run testng/othervm VarHandleTestMethodTypeShort
  * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodTypeShort
  */
@@ -81,27 +82,28 @@ public class VarHandleTestMethodTypeShort extends VarHandleBaseTest {
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
-        cases.add(new VarHandleAccessTestCase("Instance field wrong method type",
+        cases.add(new VarHandleAccessTestCase("Instance field",
                                               vhField, vh -> testInstanceFieldWrongMethodType(this, vh),
                                               false));
 
-        cases.add(new VarHandleAccessTestCase("Static field wrong method type",
+        cases.add(new VarHandleAccessTestCase("Static field",
                                               vhStaticField, VarHandleTestMethodTypeShort::testStaticFieldWrongMethodType,
                                               false));
 
-        cases.add(new VarHandleAccessTestCase("Array wrong method type",
+        cases.add(new VarHandleAccessTestCase("Array",
                                               vhArray, VarHandleTestMethodTypeShort::testArrayWrongMethodType,
                                               false));
+
         for (VarHandleToMethodHandle f : VarHandleToMethodHandle.values()) {
-            cases.add(new MethodHandleAccessTestCase("Instance field wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Instance field",
                                                      vhField, f, hs -> testInstanceFieldWrongMethodType(this, hs),
                                                      false));
 
-            cases.add(new MethodHandleAccessTestCase("Static field wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Static field",
                                                      vhStaticField, f, VarHandleTestMethodTypeShort::testStaticFieldWrongMethodType,
                                                      false));
 
-            cases.add(new MethodHandleAccessTestCase("Array wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Array",
                                                      vhArray, f, VarHandleTestMethodTypeShort::testArrayWrongMethodType,
                                                      false));
         }
@@ -329,63 +331,63 @@ public class VarHandleTestMethodTypeShort extends VarHandleBaseTest {
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                short x = (short) hs.get(am, methodType(short.class, Void.class)).
-                    invoke(null);
+                short x = (short) hs.get(am, methodType(short.class, VarHandleTestMethodTypeShort.class)).
+                    invokeExact((VarHandleTestMethodTypeShort) null);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 short x = (short) hs.get(am, methodType(short.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 short x = (short) hs.get(am, methodType(short.class, int.class)).
-                    invoke(0);
+                    invokeExact(0);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
-                Void x = (Void) hs.get(am, methodType(short.class, VarHandleTestMethodTypeShort.class)).
-                    invoke(recv);
+                Void x = (Void) hs.get(am, methodType(Void.class, VarHandleTestMethodTypeShort.class)).
+                    invokeExact(recv);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeShort.class)).
-                    invoke(recv);
+                    invokeExact(recv);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 short x = (short) hs.get(am, methodType(short.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 short x = (short) hs.get(am, methodType(short.class, VarHandleTestMethodTypeShort.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                hs.get(am, methodType(void.class, Void.class, short.class)).
-                    invoke(null, (short)1);
+                hs.get(am, methodType(void.class, VarHandleTestMethodTypeShort.class, short.class)).
+                    invokeExact((VarHandleTestMethodTypeShort) null, (short)1);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 hs.get(am, methodType(void.class, Class.class, short.class)).
-                    invoke(Void.class, (short)1);
+                    invokeExact(Void.class, (short)1);
             });
             checkWMTE(() -> { // value reference class
                 hs.get(am, methodType(void.class, VarHandleTestMethodTypeShort.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 hs.get(am, methodType(void.class, int.class, short.class)).
-                    invoke(0, (short)1);
+                    invokeExact(0, (short)1);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, VarHandleTestMethodTypeShort.class, short.class, Class.class)).
-                    invoke(recv, (short)1, Void.class);
+                    invokeExact(recv, (short)1, Void.class);
             });
         }
 
@@ -513,32 +515,32 @@ public class VarHandleTestMethodTypeShort extends VarHandleBaseTest {
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void x = (Void) hs.get(am, methodType(Void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class)).
-                    invoke();
+                    invokeExact();
             });
             // Incorrect arity
             checkWMTE(() -> { // >
                 short x = (short) hs.get(am, methodType(Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             checkWMTE(() -> { // value reference class
                 hs.get(am, methodType(void.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, short.class, Class.class)).
-                    invoke((short)1, Void.class);
+                    invokeExact((short)1, Void.class);
             });
         }
 
@@ -783,71 +785,71 @@ public class VarHandleTestMethodTypeShort extends VarHandleBaseTest {
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                short x = (short) hs.get(am, methodType(short.class, Void.class, int.class)).
-                    invoke(null, 0);
+                short x = (short) hs.get(am, methodType(short.class, short[].class, int.class)).
+                    invokeExact((short[]) null, 0);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 short x = (short) hs.get(am, methodType(short.class, Class.class, int.class)).
-                    invoke(Void.class, 0);
+                    invokeExact(Void.class, 0);
             });
             checkWMTE(() -> { // array primitive class
                 short x = (short) hs.get(am, methodType(short.class, int.class, int.class)).
-                    invoke(0, 0);
+                    invokeExact(0, 0);
             });
             checkWMTE(() -> { // index reference class
                 short x = (short) hs.get(am, methodType(short.class, short[].class, Class.class)).
-                    invoke(array, Void.class);
+                    invokeExact(array, Void.class);
             });
             // Incorrect return type
             checkWMTE(() -> { // reference class
                 Void x = (Void) hs.get(am, methodType(Void.class, short[].class, int.class)).
-                    invoke(array, 0);
+                    invokeExact(array, 0);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, short[].class, int.class)).
-                    invoke(array, 0);
+                    invokeExact(array, 0);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 short x = (short) hs.get(am, methodType(short.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 short x = (short) hs.get(am, methodType(short.class, short[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                hs.get(am, methodType(void.class, Void.class, int.class, short.class)).
-                    invoke(null, 0, (short)1);
+                hs.get(am, methodType(void.class, short[].class, int.class, short.class)).
+                    invokeExact((short[]) null, 0, (short)1);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 hs.get(am, methodType(void.class, Class.class, int.class, short.class)).
-                    invoke(Void.class, 0, (short)1);
+                    invokeExact(Void.class, 0, (short)1);
             });
             checkWMTE(() -> { // value reference class
                 hs.get(am, methodType(void.class, short[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 hs.get(am, methodType(void.class, int.class, int.class, short.class)).
-                    invoke(0, 0, (short)1);
+                    invokeExact(0, 0, (short)1);
             });
             checkWMTE(() -> { // index reference class
                 hs.get(am, methodType(void.class, short[].class, Class.class, short.class)).
-                    invoke(array, Void.class, (short)1);
+                    invokeExact(array, Void.class, (short)1);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, short[].class, int.class, Class.class)).
-                    invoke(array, 0, (short)1, Void.class);
+                    invokeExact(array, 0, (short)1, Void.class);
             });
         }
 
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeString.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeString.java
index f3b58c9e2f9..2cc853349ce 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeString.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeString.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @bug 8156486
  * @run testng/othervm VarHandleTestMethodTypeString
  * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodTypeString
  */
@@ -81,27 +82,28 @@ public class VarHandleTestMethodTypeString extends VarHandleBaseTest {
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
-        cases.add(new VarHandleAccessTestCase("Instance field wrong method type",
+        cases.add(new VarHandleAccessTestCase("Instance field",
                                               vhField, vh -> testInstanceFieldWrongMethodType(this, vh),
                                               false));
 
-        cases.add(new VarHandleAccessTestCase("Static field wrong method type",
+        cases.add(new VarHandleAccessTestCase("Static field",
                                               vhStaticField, VarHandleTestMethodTypeString::testStaticFieldWrongMethodType,
                                               false));
 
-        cases.add(new VarHandleAccessTestCase("Array wrong method type",
+        cases.add(new VarHandleAccessTestCase("Array",
                                               vhArray, VarHandleTestMethodTypeString::testArrayWrongMethodType,
                                               false));
+
         for (VarHandleToMethodHandle f : VarHandleToMethodHandle.values()) {
-            cases.add(new MethodHandleAccessTestCase("Instance field wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Instance field",
                                                      vhField, f, hs -> testInstanceFieldWrongMethodType(this, hs),
                                                      false));
 
-            cases.add(new MethodHandleAccessTestCase("Static field wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Static field",
                                                      vhStaticField, f, VarHandleTestMethodTypeString::testStaticFieldWrongMethodType,
                                                      false));
 
-            cases.add(new MethodHandleAccessTestCase("Array wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Array",
                                                      vhArray, f, VarHandleTestMethodTypeString::testArrayWrongMethodType,
                                                      false));
         }
@@ -586,174 +588,174 @@ public class VarHandleTestMethodTypeString extends VarHandleBaseTest {
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                String x = (String) hs.get(am, methodType(String.class, Void.class)).
-                    invoke(null);
+                String x = (String) hs.get(am, methodType(String.class, VarHandleTestMethodTypeString.class)).
+                    invokeExact((VarHandleTestMethodTypeString) null);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 String x = (String) hs.get(am, methodType(String.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 String x = (String) hs.get(am, methodType(String.class, int.class)).
-                    invoke(0);
+                    invokeExact(0);
             });
             // Incorrect return type
-            checkCCE(() -> { // reference class
-                Void x = (Void) hs.get(am, methodType(String.class, VarHandleTestMethodTypeString.class)).
-                    invoke(recv);
+            hs.checkWMTEOrCCE(() -> { // reference class
+                Void x = (Void) hs.get(am, methodType(Void.class, VarHandleTestMethodTypeString.class)).
+                    invokeExact(recv);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeString.class)).
-                    invoke(recv);
+                    invokeExact(recv);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 String x = (String) hs.get(am, methodType(String.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 String x = (String) hs.get(am, methodType(String.class, VarHandleTestMethodTypeString.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                hs.get(am, methodType(void.class, Void.class, String.class)).
-                    invoke(null, "foo");
+                hs.get(am, methodType(void.class, VarHandleTestMethodTypeString.class, String.class)).
+                    invokeExact((VarHandleTestMethodTypeString) null, "foo");
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 hs.get(am, methodType(void.class, Class.class, String.class)).
-                    invoke(Void.class, "foo");
+                    invokeExact(Void.class, "foo");
             });
-            checkCCE(() -> { // value reference class
+            hs.checkWMTEOrCCE(() -> { // value reference class
                 hs.get(am, methodType(void.class, VarHandleTestMethodTypeString.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 hs.get(am, methodType(void.class, int.class, String.class)).
-                    invoke(0, "foo");
+                    invokeExact(0, "foo");
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, VarHandleTestMethodTypeString.class, String.class, Class.class)).
-                    invoke(recv, "foo", Void.class);
+                    invokeExact(recv, "foo", Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.COMPARE_AND_SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                boolean r = (boolean) hs.get(am, methodType(boolean.class, Void.class, String.class, String.class)).
-                    invoke(null, "foo", "foo");
+                boolean r = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeString.class, String.class, String.class)).
+                    invokeExact((VarHandleTestMethodTypeString) null, "foo", "foo");
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, Class.class, String.class, String.class)).
-                    invoke(Void.class, "foo", "foo");
+                    invokeExact(Void.class, "foo", "foo");
             });
-            checkCCE(() -> { // expected reference class
+            hs.checkWMTEOrCCE(() -> { // expected reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeString.class, Class.class, String.class)).
-                    invoke(recv, Void.class, "foo");
+                    invokeExact(recv, Void.class, "foo");
             });
-            checkCCE(() -> { // actual reference class
+            hs.checkWMTEOrCCE(() -> { // actual reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeString.class, String.class, Class.class)).
-                    invoke(recv, "foo", Void.class);
+                    invokeExact(recv, "foo", Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, int.class , String.class, String.class)).
-                    invoke(0, "foo", "foo");
+                    invokeExact(0, "foo", "foo");
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 boolean r = (boolean) hs.get(am, methodType(boolean.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeString.class, String.class, String.class, Class.class)).
-                    invoke(recv, "foo", "foo", Void.class);
+                    invokeExact(recv, "foo", "foo", Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.COMPARE_AND_EXCHANGE)) {
             checkNPE(() -> { // null receiver
-                String x = (String) hs.get(am, methodType(String.class, Void.class, String.class, String.class)).
-                    invoke(null, "foo", "foo");
+                String x = (String) hs.get(am, methodType(String.class, VarHandleTestMethodTypeString.class, String.class, String.class)).
+                    invokeExact((VarHandleTestMethodTypeString) null, "foo", "foo");
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 String x = (String) hs.get(am, methodType(String.class, Class.class, String.class, String.class)).
-                    invoke(Void.class, "foo", "foo");
+                    invokeExact(Void.class, "foo", "foo");
             });
-            checkCCE(() -> { // expected reference class
+            hs.checkWMTEOrCCE(() -> { // expected reference class
                 String x = (String) hs.get(am, methodType(String.class, VarHandleTestMethodTypeString.class, Class.class, String.class)).
-                    invoke(recv, Void.class, "foo");
+                    invokeExact(recv, Void.class, "foo");
             });
-            checkCCE(() -> { // actual reference class
+            hs.checkWMTEOrCCE(() -> { // actual reference class
                 String x = (String) hs.get(am, methodType(String.class, VarHandleTestMethodTypeString.class, String.class, Class.class)).
-                    invoke(recv, "foo", Void.class);
+                    invokeExact(recv, "foo", Void.class);
             });
             checkWMTE(() -> { // reciever primitive class
                 String x = (String) hs.get(am, methodType(String.class, int.class , String.class, String.class)).
-                    invoke(0, "foo", "foo");
+                    invokeExact(0, "foo", "foo");
             });
             // Incorrect return type
-            checkCCE(() -> { // reference class
+            hs.checkWMTEOrCCE(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, VarHandleTestMethodTypeString.class , String.class, String.class)).
-                    invoke(recv, "foo", "foo");
+                    invokeExact(recv, "foo", "foo");
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeString.class , String.class, String.class)).
-                    invoke(recv, "foo", "foo");
+                    invokeExact(recv, "foo", "foo");
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 String x = (String) hs.get(am, methodType(String.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 String x = (String) hs.get(am, methodType(String.class, VarHandleTestMethodTypeString.class, String.class, String.class, Class.class)).
-                    invoke(recv, "foo", "foo", Void.class);
+                    invokeExact(recv, "foo", "foo", Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET_AND_SET)) {
             checkNPE(() -> { // null receiver
-                String x = (String) hs.get(am, methodType(String.class, Void.class, String.class)).
-                    invoke(null, "foo");
+                String x = (String) hs.get(am, methodType(String.class, VarHandleTestMethodTypeString.class, String.class)).
+                    invokeExact((VarHandleTestMethodTypeString) null, "foo");
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 String x = (String) hs.get(am, methodType(String.class, Class.class, String.class)).
-                    invoke(Void.class, "foo");
+                    invokeExact(Void.class, "foo");
             });
-            checkCCE(() -> { // value reference class
+            hs.checkWMTEOrCCE(() -> { // value reference class
                 String x = (String) hs.get(am, methodType(String.class, VarHandleTestMethodTypeString.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
             checkWMTE(() -> { // reciever primitive class
                 String x = (String) hs.get(am, methodType(String.class, int.class, String.class)).
-                    invoke(0, "foo");
+                    invokeExact(0, "foo");
             });
             // Incorrect return type
-            checkCCE(() -> { // reference class
+            hs.checkWMTEOrCCE(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, VarHandleTestMethodTypeString.class, String.class)).
-                    invoke(recv, "foo");
+                    invokeExact(recv, "foo");
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodTypeString.class, String.class)).
-                    invoke(recv, "foo");
+                    invokeExact(recv, "foo");
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 String x = (String) hs.get(am, methodType(String.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 String x = (String) hs.get(am, methodType(String.class, VarHandleTestMethodTypeString.class, String.class)).
-                    invoke(recv, "foo", Void.class);
+                    invokeExact(recv, "foo", Void.class);
             });
         }
 
@@ -1054,110 +1056,110 @@ public class VarHandleTestMethodTypeString extends VarHandleBaseTest {
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET)) {
             // Incorrect return type
-            checkCCE(() -> { // reference class
+            hs.checkWMTEOrCCE(() -> { // reference class
                 Void x = (Void) hs.get(am, methodType(Void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class)).
-                    invoke();
+                    invokeExact();
             });
             // Incorrect arity
             checkWMTE(() -> { // >
                 String x = (String) hs.get(am, methodType(Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
-            checkCCE(() -> { // value reference class
+            hs.checkWMTEOrCCE(() -> { // value reference class
                 hs.get(am, methodType(void.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, String.class, Class.class)).
-                    invoke("foo", Void.class);
+                    invokeExact("foo", Void.class);
             });
         }
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.COMPARE_AND_SET)) {
             // Incorrect argument types
-            checkCCE(() -> { // expected reference class
+            hs.checkWMTEOrCCE(() -> { // expected reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, Class.class, String.class)).
-                    invoke(Void.class, "foo");
+                    invokeExact(Void.class, "foo");
             });
-            checkCCE(() -> { // actual reference class
+            hs.checkWMTEOrCCE(() -> { // actual reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, String.class, Class.class)).
-                    invoke("foo", Void.class);
+                    invokeExact("foo", Void.class);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 boolean r = (boolean) hs.get(am, methodType(boolean.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, String.class, String.class, Class.class)).
-                    invoke("foo", "foo", Void.class);
+                    invokeExact("foo", "foo", Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.COMPARE_AND_EXCHANGE)) {
             // Incorrect argument types
-            checkCCE(() -> { // expected reference class
+            hs.checkWMTEOrCCE(() -> { // expected reference class
                 String x = (String) hs.get(am, methodType(String.class, Class.class, String.class)).
-                    invoke(Void.class, "foo");
+                    invokeExact(Void.class, "foo");
             });
-            checkCCE(() -> { // actual reference class
+            hs.checkWMTEOrCCE(() -> { // actual reference class
                 String x = (String) hs.get(am, methodType(String.class, String.class, Class.class)).
-                    invoke("foo", Void.class);
+                    invokeExact("foo", Void.class);
             });
             // Incorrect return type
-            checkCCE(() -> { // reference class
+            hs.checkWMTEOrCCE(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, String.class, String.class)).
-                    invoke("foo", "foo");
+                    invokeExact("foo", "foo");
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, String.class, String.class)).
-                    invoke("foo", "foo");
+                    invokeExact("foo", "foo");
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 String x = (String) hs.get(am, methodType(String.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 String x = (String) hs.get(am, methodType(String.class, String.class, String.class, Class.class)).
-                    invoke("foo", "foo", Void.class);
+                    invokeExact("foo", "foo", Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET_AND_SET)) {
             // Incorrect argument types
-            checkCCE(() -> { // value reference class
+            hs.checkWMTEOrCCE(() -> { // value reference class
                 String x = (String) hs.get(am, methodType(String.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             // Incorrect return type
-            checkCCE(() -> { // reference class
+            hs.checkWMTEOrCCE(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, String.class)).
-                    invoke("foo");
+                    invokeExact("foo");
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, String.class)).
-                    invoke("foo");
+                    invokeExact("foo");
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 String x = (String) hs.get(am, methodType(String.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 String x = (String) hs.get(am, methodType(String.class, String.class, Class.class)).
-                    invoke("foo", Void.class);
+                    invokeExact("foo", Void.class);
             });
         }
 
@@ -1686,195 +1688,195 @@ public class VarHandleTestMethodTypeString extends VarHandleBaseTest {
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                String x = (String) hs.get(am, methodType(String.class, Void.class, int.class)).
-                    invoke(null, 0);
+                String x = (String) hs.get(am, methodType(String.class, String[].class, int.class)).
+                    invokeExact((String[]) null, 0);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 String x = (String) hs.get(am, methodType(String.class, Class.class, int.class)).
-                    invoke(Void.class, 0);
+                    invokeExact(Void.class, 0);
             });
             checkWMTE(() -> { // array primitive class
                 String x = (String) hs.get(am, methodType(String.class, int.class, int.class)).
-                    invoke(0, 0);
+                    invokeExact(0, 0);
             });
             checkWMTE(() -> { // index reference class
                 String x = (String) hs.get(am, methodType(String.class, String[].class, Class.class)).
-                    invoke(array, Void.class);
+                    invokeExact(array, Void.class);
             });
             // Incorrect return type
-            checkCCE(() -> { // reference class
+            hs.checkWMTEOrCCE(() -> { // reference class
                 Void x = (Void) hs.get(am, methodType(Void.class, String[].class, int.class)).
-                    invoke(array, 0);
+                    invokeExact(array, 0);
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, String[].class, int.class)).
-                    invoke(array, 0);
+                    invokeExact(array, 0);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 String x = (String) hs.get(am, methodType(String.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 String x = (String) hs.get(am, methodType(String.class, String[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                hs.get(am, methodType(void.class, Void.class, int.class, String.class)).
-                    invoke(null, 0, "foo");
+                hs.get(am, methodType(void.class, String[].class, int.class, String.class)).
+                    invokeExact((String[]) null, 0, "foo");
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 hs.get(am, methodType(void.class, Class.class, int.class, String.class)).
-                    invoke(Void.class, 0, "foo");
+                    invokeExact(Void.class, 0, "foo");
             });
-            checkCCE(() -> { // value reference class
+            hs.checkWMTEOrCCE(() -> { // value reference class
                 hs.get(am, methodType(void.class, String[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 hs.get(am, methodType(void.class, int.class, int.class, String.class)).
-                    invoke(0, 0, "foo");
+                    invokeExact(0, 0, "foo");
             });
             checkWMTE(() -> { // index reference class
                 hs.get(am, methodType(void.class, String[].class, Class.class, String.class)).
-                    invoke(array, Void.class, "foo");
+                    invokeExact(array, Void.class, "foo");
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, String[].class, int.class, Class.class)).
-                    invoke(array, 0, "foo", Void.class);
+                    invokeExact(array, 0, "foo", Void.class);
             });
         }
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.COMPARE_AND_SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                boolean r = (boolean) hs.get(am, methodType(boolean.class, Void.class, int.class, String.class, String.class)).
-                    invoke(null, 0, "foo", "foo");
+                boolean r = (boolean) hs.get(am, methodType(boolean.class, String[].class, int.class, String.class, String.class)).
+                    invokeExact((String[]) null, 0, "foo", "foo");
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, Class.class, int.class, String.class, String.class)).
-                    invoke(Void.class, 0, "foo", "foo");
+                    invokeExact(Void.class, 0, "foo", "foo");
             });
-            checkCCE(() -> { // expected reference class
+            hs.checkWMTEOrCCE(() -> { // expected reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, String[].class, int.class, Class.class, String.class)).
-                    invoke(array, 0, Void.class, "foo");
+                    invokeExact(array, 0, Void.class, "foo");
             });
-            checkCCE(() -> { // actual reference class
+            hs.checkWMTEOrCCE(() -> { // actual reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, String[].class, int.class, String.class, Class.class)).
-                    invoke(array, 0, "foo", Void.class);
+                    invokeExact(array, 0, "foo", Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, int.class, int.class, String.class, String.class)).
-                    invoke(0, 0, "foo", "foo");
+                    invokeExact(0, 0, "foo", "foo");
             });
             checkWMTE(() -> { // index reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, String[].class, Class.class, String.class, String.class)).
-                    invoke(array, Void.class, "foo", "foo");
+                    invokeExact(array, Void.class, "foo", "foo");
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 boolean r = (boolean) hs.get(am, methodType(boolean.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, String[].class, int.class, String.class, String.class, Class.class)).
-                    invoke(array, 0, "foo", "foo", Void.class);
+                    invokeExact(array, 0, "foo", "foo", Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.COMPARE_AND_EXCHANGE)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                String x = (String) hs.get(am, methodType(String.class, Void.class, int.class, String.class, String.class)).
-                    invoke(null, 0, "foo", "foo");
+                String x = (String) hs.get(am, methodType(String.class, String[].class, int.class, String.class, String.class)).
+                    invokeExact((String[]) null, 0, "foo", "foo");
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 String x = (String) hs.get(am, methodType(String.class, Class.class, int.class, String.class, String.class)).
-                    invoke(Void.class, 0, "foo", "foo");
+                    invokeExact(Void.class, 0, "foo", "foo");
             });
-            checkCCE(() -> { // expected reference class
+            hs.checkWMTEOrCCE(() -> { // expected reference class
                 String x = (String) hs.get(am, methodType(String.class, String[].class, int.class, Class.class, String.class)).
-                    invoke(array, 0, Void.class, "foo");
+                    invokeExact(array, 0, Void.class, "foo");
             });
-            checkCCE(() -> { // actual reference class
+            hs.checkWMTEOrCCE(() -> { // actual reference class
                 String x = (String) hs.get(am, methodType(String.class, String[].class, int.class, String.class, Class.class)).
-                    invoke(array, 0, "foo", Void.class);
+                    invokeExact(array, 0, "foo", Void.class);
             });
             checkWMTE(() -> { // array primitive class
                 String x = (String) hs.get(am, methodType(String.class, int.class, int.class, String.class, String.class)).
-                    invoke(0, 0, "foo", "foo");
+                    invokeExact(0, 0, "foo", "foo");
             });
             checkWMTE(() -> { // index reference class
                 String x = (String) hs.get(am, methodType(String.class, String[].class, Class.class, String.class, String.class)).
-                    invoke(array, Void.class, "foo", "foo");
+                    invokeExact(array, Void.class, "foo", "foo");
             });
             // Incorrect return type
-            checkCCE(() -> { // reference class
+            hs.checkWMTEOrCCE(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, String[].class, int.class, String.class, String.class)).
-                    invoke(array, 0, "foo", "foo");
+                    invokeExact(array, 0, "foo", "foo");
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, String[].class, int.class, String.class, String.class)).
-                    invoke(array, 0, "foo", "foo");
+                    invokeExact(array, 0, "foo", "foo");
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 String x = (String) hs.get(am, methodType(String.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 String x = (String) hs.get(am, methodType(String.class, String[].class, int.class, String.class, String.class, Class.class)).
-                    invoke(array, 0, "foo", "foo", Void.class);
+                    invokeExact(array, 0, "foo", "foo", Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET_AND_SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                String x = (String) hs.get(am, methodType(String.class, Void.class, int.class, String.class)).
-                    invoke(null, 0, "foo");
+                String x = (String) hs.get(am, methodType(String.class, String[].class, int.class, String.class)).
+                    invokeExact((String[]) null, 0, "foo");
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 String x = (String) hs.get(am, methodType(String.class, Class.class, int.class, String.class)).
-                    invoke(Void.class, 0, "foo");
+                    invokeExact(Void.class, 0, "foo");
             });
-            checkCCE(() -> { // value reference class
+            hs.checkWMTEOrCCE(() -> { // value reference class
                 String x = (String) hs.get(am, methodType(String.class, String[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
             checkWMTE(() -> { // array primitive class
                 String x = (String) hs.get(am, methodType(String.class, int.class, int.class, String.class)).
-                    invoke(0, 0, "foo");
+                    invokeExact(0, 0, "foo");
             });
             checkWMTE(() -> { // index reference class
                 String x = (String) hs.get(am, methodType(String.class, String[].class, Class.class, String.class)).
-                    invoke(array, Void.class, "foo");
+                    invokeExact(array, Void.class, "foo");
             });
             // Incorrect return type
-            checkCCE(() -> { // reference class
+            hs.checkWMTEOrCCE(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, String[].class, int.class, String.class)).
-                    invoke(array, 0, "foo");
+                    invokeExact(array, 0, "foo");
             });
             checkWMTE(() -> { // primitive class
                 boolean x = (boolean) hs.get(am, methodType(boolean.class, String[].class, int.class, String.class)).
-                    invoke(array, 0, "foo");
+                    invokeExact(array, 0, "foo");
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 String x = (String) hs.get(am, methodType(String.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 String x = (String) hs.get(am, methodType(String.class, String[].class, int.class, String.class, Class.class)).
-                    invoke(array, 0, "foo", Void.class);
+                    invokeExact(array, 0, "foo", Void.class);
             });
         }
 
diff --git a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template b/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template
index 391dc1a5197..dc4aed56fd4 100644
--- a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template
+++ b/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template
@@ -27,6 +27,7 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestAccess$Type$
  * @run testng/othervm -Diters=20000                         VarHandleTestAccess$Type$
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestAccess$Type$
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestAccess$Type$
  */
 
 import org.testng.annotations.BeforeClass;
@@ -309,6 +310,10 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
         checkUOE(() -> {
             boolean r = vh.weakCompareAndSetRelease(recv, $value1$, $value2$);
         });
+
+        checkUOE(() -> {
+            $type$ r = ($type$) vh.getAndSet(recv, $value1$);
+        });
 #end[CAS]
 
 #if[!AtomicAdd]
@@ -399,6 +404,10 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
         checkUOE(() -> {
             boolean r = vh.weakCompareAndSetRelease($value1$, $value2$);
         });
+
+        checkUOE(() -> {
+            $type$ r = ($type$) vh.getAndSet($value1$);
+        });
 #end[CAS]
 
 #if[!AtomicAdd]
@@ -586,6 +595,10 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
         checkUOE(() -> {
             boolean r = vh.weakCompareAndSetRelease(recv, $value1$, $value2$);
         });
+
+        checkUOE(() -> {
+            $type$ r = ($type$) vh.getAndSet(recv, $value1$);
+        });
 #end[CAS]
 
 #if[!AtomicAdd]
@@ -773,6 +786,10 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
         checkUOE(() -> {
             boolean r = vh.weakCompareAndSetRelease($value1$, $value2$);
         });
+
+        checkUOE(() -> {
+            $type$ r = ($type$) vh.getAndSet($value1$);
+        });
 #end[CAS]
 
 #if[!AtomicAdd]
@@ -967,6 +984,10 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
         checkUOE(() -> {
             boolean r = vh.weakCompareAndSetRelease(array, i, $value1$, $value2$);
         });
+
+        checkUOE(() -> {
+            $type$ r = ($type$) vh.getAndSet(array, i, $value1$);
+        });
 #end[CAS]
 
 #if[!AtomicAdd]
diff --git a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template b/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template
index e433789f8cd..bb0cbb11f76 100644
--- a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template
+++ b/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template
@@ -27,6 +27,7 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAs$Type$
  * @run testng/othervm -Diters=20000                         VarHandleTestByteArrayAs$Type$
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestByteArrayAs$Type$
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestByteArrayAs$Type$
  */
 
 import org.testng.annotations.DataProvider;
@@ -311,10 +312,12 @@ public class VarHandleTestByteArrayAs$Type$ extends VarHandleBaseByteArrayTest {
             checkROBE(() -> {
                 $type$ o = ($type$) vh.getAndSet(array, ci, VALUE_1);
             });
+
+#else[CAS]
             checkUOE(() -> {
                 boolean r = vh.compareAndSet(array, ci, VALUE_1, VALUE_2);
             });
-#else[CAS]
+
             checkUOE(() -> {
                 $type$ r = ($type$) vh.compareAndExchangeVolatile(array, ci, VALUE_2, VALUE_1);
             });
diff --git a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template b/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template
index f56d9a641a7..9d48ba47431 100644
--- a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template
+++ b/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template
@@ -24,6 +24,7 @@
 /*
  * @test
  * @run testng/othervm -Diters=20000 VarHandleTestMethodHandleAccess$Type$
+ * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodHandleAccess$Type$
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodType.java.template b/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodType.java.template
index fe504902f10..5bec8b46a10 100644
--- a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodType.java.template
+++ b/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodType.java.template
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @bug 8156486
  * @run testng/othervm VarHandleTestMethodType$Type$
  * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodType$Type$
  */
@@ -81,27 +82,28 @@ public class VarHandleTestMethodType$Type$ extends VarHandleBaseTest {
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
-        cases.add(new VarHandleAccessTestCase("Instance field wrong method type",
+        cases.add(new VarHandleAccessTestCase("Instance field",
                                               vhField, vh -> testInstanceFieldWrongMethodType(this, vh),
                                               false));
 
-        cases.add(new VarHandleAccessTestCase("Static field wrong method type",
+        cases.add(new VarHandleAccessTestCase("Static field",
                                               vhStaticField, VarHandleTestMethodType$Type$::testStaticFieldWrongMethodType,
                                               false));
 
-        cases.add(new VarHandleAccessTestCase("Array wrong method type",
+        cases.add(new VarHandleAccessTestCase("Array",
                                               vhArray, VarHandleTestMethodType$Type$::testArrayWrongMethodType,
                                               false));
+
         for (VarHandleToMethodHandle f : VarHandleToMethodHandle.values()) {
-            cases.add(new MethodHandleAccessTestCase("Instance field wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Instance field",
                                                      vhField, f, hs -> testInstanceFieldWrongMethodType(this, hs),
                                                      false));
 
-            cases.add(new MethodHandleAccessTestCase("Static field wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Static field",
                                                      vhStaticField, f, VarHandleTestMethodType$Type$::testStaticFieldWrongMethodType,
                                                      false));
 
-            cases.add(new MethodHandleAccessTestCase("Array wrong method type",
+            cases.add(new MethodHandleAccessTestCase("Array",
                                                      vhArray, f, VarHandleTestMethodType$Type$::testArrayWrongMethodType,
                                                      false));
         }
@@ -648,63 +650,63 @@ public class VarHandleTestMethodType$Type$ extends VarHandleBaseTest {
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                $type$ x = ($type$) hs.get(am, methodType($type$.class, Void.class)).
-                    invoke(null);
+                $type$ x = ($type$) hs.get(am, methodType($type$.class, VarHandleTestMethodType$Type$.class)).
+                    invokeExact((VarHandleTestMethodType$Type$) null);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, int.class)).
-                    invoke(0);
+                    invokeExact(0);
             });
             // Incorrect return type
-            check{#if[String]?CCE:WMTE}(() -> { // reference class
-                Void x = (Void) hs.get(am, methodType($type$.class, VarHandleTestMethodType$Type$.class)).
-                    invoke(recv);
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
+                Void x = (Void) hs.get(am, methodType(Void.class, VarHandleTestMethodType$Type$.class)).
+                    invokeExact(recv);
             });
             checkWMTE(() -> { // primitive class
                 $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class, VarHandleTestMethodType$Type$.class)).
-                    invoke(recv);
+                    invokeExact(recv);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 $type$ x = ($type$) hs.get(am, methodType($type$.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, VarHandleTestMethodType$Type$.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                hs.get(am, methodType(void.class, Void.class, $type$.class)).
-                    invoke(null, $value1$);
+                hs.get(am, methodType(void.class, VarHandleTestMethodType$Type$.class, $type$.class)).
+                    invokeExact((VarHandleTestMethodType$Type$) null, $value1$);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 hs.get(am, methodType(void.class, Class.class, $type$.class)).
-                    invoke(Void.class, $value1$);
+                    invokeExact(Void.class, $value1$);
             });
-            check{#if[String]?CCE:WMTE}(() -> { // value reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
                 hs.get(am, methodType(void.class, VarHandleTestMethodType$Type$.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 hs.get(am, methodType(void.class, int.class, $type$.class)).
-                    invoke(0, $value1$);
+                    invokeExact(0, $value1$);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, VarHandleTestMethodType$Type$.class, $type$.class, Class.class)).
-                    invoke(recv, $value1$, Void.class);
+                    invokeExact(recv, $value1$, Void.class);
             });
         }
 
@@ -712,111 +714,111 @@ public class VarHandleTestMethodType$Type$ extends VarHandleBaseTest {
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.COMPARE_AND_SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                boolean r = (boolean) hs.get(am, methodType(boolean.class, Void.class, $type$.class, $type$.class)).
-                    invoke(null, $value1$, $value1$);
+                boolean r = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodType$Type$.class, $type$.class, $type$.class)).
+                    invokeExact((VarHandleTestMethodType$Type$) null, $value1$, $value1$);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, Class.class, $type$.class, $type$.class)).
-                    invoke(Void.class, $value1$, $value1$);
+                    invokeExact(Void.class, $value1$, $value1$);
             });
-            check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // expected reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodType$Type$.class, Class.class, $type$.class)).
-                    invoke(recv, Void.class, $value1$);
+                    invokeExact(recv, Void.class, $value1$);
             });
-            check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // actual reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodType$Type$.class, $type$.class, Class.class)).
-                    invoke(recv, $value1$, Void.class);
+                    invokeExact(recv, $value1$, Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, int.class , $type$.class, $type$.class)).
-                    invoke(0, $value1$, $value1$);
+                    invokeExact(0, $value1$, $value1$);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 boolean r = (boolean) hs.get(am, methodType(boolean.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodType$Type$.class, $type$.class, $type$.class, Class.class)).
-                    invoke(recv, $value1$, $value1$, Void.class);
+                    invokeExact(recv, $value1$, $value1$, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.COMPARE_AND_EXCHANGE)) {
             checkNPE(() -> { // null receiver
-                $type$ x = ($type$) hs.get(am, methodType($type$.class, Void.class, $type$.class, $type$.class)).
-                    invoke(null, $value1$, $value1$);
+                $type$ x = ($type$) hs.get(am, methodType($type$.class, VarHandleTestMethodType$Type$.class, $type$.class, $type$.class)).
+                    invokeExact((VarHandleTestMethodType$Type$) null, $value1$, $value1$);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, Class.class, $type$.class, $type$.class)).
-                    invoke(Void.class, $value1$, $value1$);
+                    invokeExact(Void.class, $value1$, $value1$);
             });
-            check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // expected reference class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, VarHandleTestMethodType$Type$.class, Class.class, $type$.class)).
-                    invoke(recv, Void.class, $value1$);
+                    invokeExact(recv, Void.class, $value1$);
             });
-            check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // actual reference class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, VarHandleTestMethodType$Type$.class, $type$.class, Class.class)).
-                    invoke(recv, $value1$, Void.class);
+                    invokeExact(recv, $value1$, Void.class);
             });
             checkWMTE(() -> { // reciever primitive class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, int.class , $type$.class, $type$.class)).
-                    invoke(0, $value1$, $value1$);
+                    invokeExact(0, $value1$, $value1$);
             });
             // Incorrect return type
-            check{#if[String]?CCE:WMTE}(() -> { // reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, VarHandleTestMethodType$Type$.class , $type$.class, $type$.class)).
-                    invoke(recv, $value1$, $value1$);
+                    invokeExact(recv, $value1$, $value1$);
             });
             checkWMTE(() -> { // primitive class
                 $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class, VarHandleTestMethodType$Type$.class , $type$.class, $type$.class)).
-                    invoke(recv, $value1$, $value1$);
+                    invokeExact(recv, $value1$, $value1$);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 $type$ x = ($type$) hs.get(am, methodType($type$.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, VarHandleTestMethodType$Type$.class, $type$.class, $type$.class, Class.class)).
-                    invoke(recv, $value1$, $value1$, Void.class);
+                    invokeExact(recv, $value1$, $value1$, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET_AND_SET)) {
             checkNPE(() -> { // null receiver
-                $type$ x = ($type$) hs.get(am, methodType($type$.class, Void.class, $type$.class)).
-                    invoke(null, $value1$);
+                $type$ x = ($type$) hs.get(am, methodType($type$.class, VarHandleTestMethodType$Type$.class, $type$.class)).
+                    invokeExact((VarHandleTestMethodType$Type$) null, $value1$);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, Class.class, $type$.class)).
-                    invoke(Void.class, $value1$);
+                    invokeExact(Void.class, $value1$);
             });
-            check{#if[String]?CCE:WMTE}(() -> { // value reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, VarHandleTestMethodType$Type$.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
             checkWMTE(() -> { // reciever primitive class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, int.class, $type$.class)).
-                    invoke(0, $value1$);
+                    invokeExact(0, $value1$);
             });
             // Incorrect return type
-            check{#if[String]?CCE:WMTE}(() -> { // reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, VarHandleTestMethodType$Type$.class, $type$.class)).
-                    invoke(recv, $value1$);
+                    invokeExact(recv, $value1$);
             });
             checkWMTE(() -> { // primitive class
                 $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class, VarHandleTestMethodType$Type$.class, $type$.class)).
-                    invoke(recv, $value1$);
+                    invokeExact(recv, $value1$);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 $type$ x = ($type$) hs.get(am, methodType($type$.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, VarHandleTestMethodType$Type$.class, $type$.class)).
-                    invoke(recv, $value1$, Void.class);
+                    invokeExact(recv, $value1$, Void.class);
             });
         }
 #end[CAS]
@@ -824,38 +826,38 @@ public class VarHandleTestMethodType$Type$ extends VarHandleBaseTest {
 #if[AtomicAdd]
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET_AND_ADD)) {
             checkNPE(() -> { // null receiver
-                $type$ x = ($type$) hs.get(am, methodType($type$.class, Void.class, $type$.class)).
-                    invoke(null, $value1$);
+                $type$ x = ($type$) hs.get(am, methodType($type$.class, VarHandleTestMethodType$Type$.class, $type$.class)).
+                    invokeExact((VarHandleTestMethodType$Type$) null, $value1$);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, Class.class, $type$.class)).
-                    invoke(Void.class, $value1$);
+                    invokeExact(Void.class, $value1$);
             });
-            check{#if[String]?CCE:WMTE}(() -> { // value reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, VarHandleTestMethodType$Type$.class, Class.class)).
-                    invoke(recv, Void.class);
+                    invokeExact(recv, Void.class);
             });
             checkWMTE(() -> { // reciever primitive class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, int.class, $type$.class)).
-                    invoke(0, $value1$);
+                    invokeExact(0, $value1$);
             });
             // Incorrect return type
-            check{#if[String]?CCE:WMTE}(() -> { // reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, VarHandleTestMethodType$Type$.class, $type$.class)).
-                    invoke(recv, $value1$);
+                    invokeExact(recv, $value1$);
             });
             checkWMTE(() -> { // primitive class
                 $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class, VarHandleTestMethodType$Type$.class, $type$.class)).
-                    invoke(recv, $value1$);
+                    invokeExact(recv, $value1$);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 $type$ x = ($type$) hs.get(am, methodType($type$.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, VarHandleTestMethodType$Type$.class, $type$.class)).
-                    invoke(recv, $value1$, Void.class);
+                    invokeExact(recv, $value1$, Void.class);
             });
         }
 #end[AtomicAdd]
@@ -1200,111 +1202,111 @@ public class VarHandleTestMethodType$Type$ extends VarHandleBaseTest {
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET)) {
             // Incorrect return type
-            check{#if[String]?CCE:WMTE}(() -> { // reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
                 Void x = (Void) hs.get(am, methodType(Void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // primitive class
                 $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class)).
-                    invoke();
+                    invokeExact();
             });
             // Incorrect arity
             checkWMTE(() -> { // >
                 $type$ x = ($type$) hs.get(am, methodType(Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
-            check{#if[String]?CCE:WMTE}(() -> { // value reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
                 hs.get(am, methodType(void.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, $type$.class, Class.class)).
-                    invoke($value1$, Void.class);
+                    invokeExact($value1$, Void.class);
             });
         }
 #if[CAS]
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.COMPARE_AND_SET)) {
             // Incorrect argument types
-            check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // expected reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, Class.class, $type$.class)).
-                    invoke(Void.class, $value1$);
+                    invokeExact(Void.class, $value1$);
             });
-            check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // actual reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, $type$.class, Class.class)).
-                    invoke($value1$, Void.class);
+                    invokeExact($value1$, Void.class);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 boolean r = (boolean) hs.get(am, methodType(boolean.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, $type$.class, $type$.class, Class.class)).
-                    invoke($value1$, $value1$, Void.class);
+                    invokeExact($value1$, $value1$, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.COMPARE_AND_EXCHANGE)) {
             // Incorrect argument types
-            check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // expected reference class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, Class.class, $type$.class)).
-                    invoke(Void.class, $value1$);
+                    invokeExact(Void.class, $value1$);
             });
-            check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // actual reference class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$.class, Class.class)).
-                    invoke($value1$, Void.class);
+                    invokeExact($value1$, Void.class);
             });
             // Incorrect return type
-            check{#if[String]?CCE:WMTE}(() -> { // reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, $type$.class, $type$.class)).
-                    invoke($value1$, $value1$);
+                    invokeExact($value1$, $value1$);
             });
             checkWMTE(() -> { // primitive class
                 $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class, $type$.class, $type$.class)).
-                    invoke($value1$, $value1$);
+                    invokeExact($value1$, $value1$);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 $type$ x = ($type$) hs.get(am, methodType($type$.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$.class, $type$.class, Class.class)).
-                    invoke($value1$, $value1$, Void.class);
+                    invokeExact($value1$, $value1$, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET_AND_SET)) {
             // Incorrect argument types
-            check{#if[String]?CCE:WMTE}(() -> { // value reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             // Incorrect return type
-            check{#if[String]?CCE:WMTE}(() -> { // reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, $type$.class)).
-                    invoke($value1$);
+                    invokeExact($value1$);
             });
             checkWMTE(() -> { // primitive class
                 $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class, $type$.class)).
-                    invoke($value1$);
+                    invokeExact($value1$);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 $type$ x = ($type$) hs.get(am, methodType($type$.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$.class, Class.class)).
-                    invoke($value1$, Void.class);
+                    invokeExact($value1$, Void.class);
             });
         }
 #end[CAS]
@@ -1314,25 +1316,25 @@ public class VarHandleTestMethodType$Type$ extends VarHandleBaseTest {
             // Incorrect argument types
             check{#if[String]?CCE:WMTE}(() -> { // value reference class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, Class.class)).
-                    invoke(Void.class);
+                    invokeExact(Void.class);
             });
             // Incorrect return type
             check{#if[String]?CCE:WMTE}(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, $type$.class)).
-                    invoke($value1$);
+                    invokeExact($value1$);
             });
             checkWMTE(() -> { // primitive class
                 $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class, $type$.class)).
-                    invoke($value1$);
+                    invokeExact($value1$);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 $type$ x = ($type$) hs.get(am, methodType($type$.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$.class, Class.class)).
-                    invoke($value1$, Void.class);
+                    invokeExact($value1$, Void.class);
             });
         }
 #end[AtomicAdd]
@@ -1929,196 +1931,196 @@ public class VarHandleTestMethodType$Type$ extends VarHandleBaseTest {
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                $type$ x = ($type$) hs.get(am, methodType($type$.class, Void.class, int.class)).
-                    invoke(null, 0);
+                $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$[].class, int.class)).
+                    invokeExact(($type$[]) null, 0);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, Class.class, int.class)).
-                    invoke(Void.class, 0);
+                    invokeExact(Void.class, 0);
             });
             checkWMTE(() -> { // array primitive class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, int.class, int.class)).
-                    invoke(0, 0);
+                    invokeExact(0, 0);
             });
             checkWMTE(() -> { // index reference class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$[].class, Class.class)).
-                    invoke(array, Void.class);
+                    invokeExact(array, Void.class);
             });
             // Incorrect return type
-            check{#if[String]?CCE:WMTE}(() -> { // reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
                 Void x = (Void) hs.get(am, methodType(Void.class, $type$[].class, int.class)).
-                    invoke(array, 0);
+                    invokeExact(array, 0);
             });
             checkWMTE(() -> { // primitive class
                 $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class, $type$[].class, int.class)).
-                    invoke(array, 0);
+                    invokeExact(array, 0);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 $type$ x = ($type$) hs.get(am, methodType($type$.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                hs.get(am, methodType(void.class, Void.class, int.class, $type$.class)).
-                    invoke(null, 0, $value1$);
+                hs.get(am, methodType(void.class, $type$[].class, int.class, $type$.class)).
+                    invokeExact(($type$[]) null, 0, $value1$);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 hs.get(am, methodType(void.class, Class.class, int.class, $type$.class)).
-                    invoke(Void.class, 0, $value1$);
+                    invokeExact(Void.class, 0, $value1$);
             });
-            check{#if[String]?CCE:WMTE}(() -> { // value reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
                 hs.get(am, methodType(void.class, $type$[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 hs.get(am, methodType(void.class, int.class, int.class, $type$.class)).
-                    invoke(0, 0, $value1$);
+                    invokeExact(0, 0, $value1$);
             });
             checkWMTE(() -> { // index reference class
                 hs.get(am, methodType(void.class, $type$[].class, Class.class, $type$.class)).
-                    invoke(array, Void.class, $value1$);
+                    invokeExact(array, Void.class, $value1$);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 hs.get(am, methodType(void.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 hs.get(am, methodType(void.class, $type$[].class, int.class, Class.class)).
-                    invoke(array, 0, $value1$, Void.class);
+                    invokeExact(array, 0, $value1$, Void.class);
             });
         }
 #if[CAS]
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.COMPARE_AND_SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                boolean r = (boolean) hs.get(am, methodType(boolean.class, Void.class, int.class, $type$.class, $type$.class)).
-                    invoke(null, 0, $value1$, $value1$);
+                boolean r = (boolean) hs.get(am, methodType(boolean.class, $type$[].class, int.class, $type$.class, $type$.class)).
+                    invokeExact(($type$[]) null, 0, $value1$, $value1$);
             });
-            checkCCE(() -> { // receiver reference class
+            hs.checkWMTEOrCCE(() -> { // receiver reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, Class.class, int.class, $type$.class, $type$.class)).
-                    invoke(Void.class, 0, $value1$, $value1$);
+                    invokeExact(Void.class, 0, $value1$, $value1$);
             });
-            check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // expected reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, $type$[].class, int.class, Class.class, $type$.class)).
-                    invoke(array, 0, Void.class, $value1$);
+                    invokeExact(array, 0, Void.class, $value1$);
             });
-            check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // actual reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, $type$[].class, int.class, $type$.class, Class.class)).
-                    invoke(array, 0, $value1$, Void.class);
+                    invokeExact(array, 0, $value1$, Void.class);
             });
             checkWMTE(() -> { // receiver primitive class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, int.class, int.class, $type$.class, $type$.class)).
-                    invoke(0, 0, $value1$, $value1$);
+                    invokeExact(0, 0, $value1$, $value1$);
             });
             checkWMTE(() -> { // index reference class
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, $type$[].class, Class.class, $type$.class, $type$.class)).
-                    invoke(array, Void.class, $value1$, $value1$);
+                    invokeExact(array, Void.class, $value1$, $value1$);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 boolean r = (boolean) hs.get(am, methodType(boolean.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 boolean r = (boolean) hs.get(am, methodType(boolean.class, $type$[].class, int.class, $type$.class, $type$.class, Class.class)).
-                    invoke(array, 0, $value1$, $value1$, Void.class);
+                    invokeExact(array, 0, $value1$, $value1$, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.COMPARE_AND_EXCHANGE)) {
             // Incorrect argument types
             checkNPE(() -> { // null receiver
-                $type$ x = ($type$) hs.get(am, methodType($type$.class, Void.class, int.class, $type$.class, $type$.class)).
-                    invoke(null, 0, $value1$, $value1$);
+                $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$[].class, int.class, $type$.class, $type$.class)).
+                    invokeExact(($type$[]) null, 0, $value1$, $value1$);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, Class.class, int.class, $type$.class, $type$.class)).
-                    invoke(Void.class, 0, $value1$, $value1$);
+                    invokeExact(Void.class, 0, $value1$, $value1$);
             });
-            check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // expected reference class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$[].class, int.class, Class.class, $type$.class)).
-                    invoke(array, 0, Void.class, $value1$);
+                    invokeExact(array, 0, Void.class, $value1$);
             });
-            check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // actual reference class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$[].class, int.class, $type$.class, Class.class)).
-                    invoke(array, 0, $value1$, Void.class);
+                    invokeExact(array, 0, $value1$, Void.class);
             });
             checkWMTE(() -> { // array primitive class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, int.class, int.class, $type$.class, $type$.class)).
-                    invoke(0, 0, $value1$, $value1$);
+                    invokeExact(0, 0, $value1$, $value1$);
             });
             checkWMTE(() -> { // index reference class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$[].class, Class.class, $type$.class, $type$.class)).
-                    invoke(array, Void.class, $value1$, $value1$);
+                    invokeExact(array, Void.class, $value1$, $value1$);
             });
             // Incorrect return type
-            check{#if[String]?CCE:WMTE}(() -> { // reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, $type$[].class, int.class, $type$.class, $type$.class)).
-                    invoke(array, 0, $value1$, $value1$);
+                    invokeExact(array, 0, $value1$, $value1$);
             });
             checkWMTE(() -> { // primitive class
                 $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class, $type$[].class, int.class, $type$.class, $type$.class)).
-                    invoke(array, 0, $value1$, $value1$);
+                    invokeExact(array, 0, $value1$, $value1$);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 $type$ x = ($type$) hs.get(am, methodType($type$.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$[].class, int.class, $type$.class, $type$.class, Class.class)).
-                    invoke(array, 0, $value1$, $value1$, Void.class);
+                    invokeExact(array, 0, $value1$, $value1$, Void.class);
             });
         }
 
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET_AND_SET)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                $type$ x = ($type$) hs.get(am, methodType($type$.class, Void.class, int.class, $type$.class)).
-                    invoke(null, 0, $value1$);
+                $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$[].class, int.class, $type$.class)).
+                    invokeExact(($type$[]) null, 0, $value1$);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, Class.class, int.class, $type$.class)).
-                    invoke(Void.class, 0, $value1$);
+                    invokeExact(Void.class, 0, $value1$);
             });
-            check{#if[String]?CCE:WMTE}(() -> { // value reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
             checkWMTE(() -> { // array primitive class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, int.class, int.class, $type$.class)).
-                    invoke(0, 0, $value1$);
+                    invokeExact(0, 0, $value1$);
             });
             checkWMTE(() -> { // index reference class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$[].class, Class.class, $type$.class)).
-                    invoke(array, Void.class, $value1$);
+                    invokeExact(array, Void.class, $value1$);
             });
             // Incorrect return type
-            check{#if[String]?CCE:WMTE}(() -> { // reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, $type$[].class, int.class, $type$.class)).
-                    invoke(array, 0, $value1$);
+                    invokeExact(array, 0, $value1$);
             });
             checkWMTE(() -> { // primitive class
                 $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class, $type$[].class, int.class, $type$.class)).
-                    invoke(array, 0, $value1$);
+                    invokeExact(array, 0, $value1$);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 $type$ x = ($type$) hs.get(am, methodType($type$.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$[].class, int.class, $type$.class, Class.class)).
-                    invoke(array, 0, $value1$, Void.class);
+                    invokeExact(array, 0, $value1$, Void.class);
             });
         }
 #end[CAS]
@@ -2127,42 +2129,42 @@ public class VarHandleTestMethodType$Type$ extends VarHandleBaseTest {
         for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET_AND_ADD)) {
             // Incorrect argument types
             checkNPE(() -> { // null array
-                $type$ x = ($type$) hs.get(am, methodType($type$.class, Void.class, int.class, $type$.class)).
-                    invoke(null, 0, $value1$);
+                $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$[].class, int.class, $type$.class)).
+                    invokeExact(($type$[]) null, 0, $value1$);
             });
-            checkCCE(() -> { // array reference class
+            hs.checkWMTEOrCCE(() -> { // array reference class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, Class.class, int.class, $type$.class)).
-                    invoke(Void.class, 0, $value1$);
+                    invokeExact(Void.class, 0, $value1$);
             });
-            check{#if[String]?CCE:WMTE}(() -> { // value reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$[].class, int.class, Class.class)).
-                    invoke(array, 0, Void.class);
+                    invokeExact(array, 0, Void.class);
             });
             checkWMTE(() -> { // array primitive class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, int.class, int.class, $type$.class)).
-                    invoke(0, 0, $value1$);
+                    invokeExact(0, 0, $value1$);
             });
             checkWMTE(() -> { // index reference class
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$[].class, Class.class, $type$.class)).
-                    invoke(array, Void.class, $value1$);
+                    invokeExact(array, Void.class, $value1$);
             });
             // Incorrect return type
-            check{#if[String]?CCE:WMTE}(() -> { // reference class
+            {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
                 Void r = (Void) hs.get(am, methodType(Void.class, $type$[].class, int.class, $type$.class)).
-                    invoke(array, 0, $value1$);
+                    invokeExact(array, 0, $value1$);
             });
             checkWMTE(() -> { // primitive class
                 $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class, $type$[].class, int.class, $type$.class)).
-                    invoke(array, 0, $value1$);
+                    invokeExact(array, 0, $value1$);
             });
             // Incorrect arity
             checkWMTE(() -> { // 0
                 $type$ x = ($type$) hs.get(am, methodType($type$.class)).
-                    invoke();
+                    invokeExact();
             });
             checkWMTE(() -> { // >
                 $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$[].class, int.class, $type$.class, Class.class)).
-                    invoke(array, 0, $value1$, Void.class);
+                    invokeExact(array, 0, $value1$, Void.class);
             });
         }
 #end[AtomicAdd]

From 38f007ac7fe9f3a94e78f6bbfbaf377323ee50fa Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Tue, 17 May 2016 19:53:43 +0530
Subject: [PATCH 035/228] 8157146: Add debug printlns to tests
 FieldSetAccessibleTest and VerifyJimage.java

Reviewed-by: alanb, shade
---
 .../Class/getDeclaredField/FieldSetAccessibleTest.java    | 8 +++++++-
 jdk/test/tools/jimage/VerifyJimage.java                   | 4 ++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/jdk/test/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java b/jdk/test/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java
index a162debb3f8..9052737aad5 100644
--- a/jdk/test/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java
+++ b/jdk/test/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java
@@ -228,12 +228,18 @@ public class FieldSetAccessibleTest {
     }
 
     static boolean test(String s, boolean addExports) {
+        String clsName = s.replace('/', '.').substring(0, s.length() - 6);
         try {
+            System.out.println("Loading " + clsName);
             final Class<?> c = Class.forName(
-                    s.replace('/', '.').substring(0, s.length() - 6),
+                    clsName,
                     false,
                     systemClassLoader);
             return test(c, addExports);
+        } catch (VerifyError ve) {
+            System.err.println("VerifyError for " + clsName);
+            ve.printStackTrace(System.err);
+            failed.add(s);
         } catch (Exception t) {
             t.printStackTrace(System.err);
             failed.add(s);
diff --git a/jdk/test/tools/jimage/VerifyJimage.java b/jdk/test/tools/jimage/VerifyJimage.java
index 9c33cc3fa74..5056e6322a5 100644
--- a/jdk/test/tools/jimage/VerifyJimage.java
+++ b/jdk/test/tools/jimage/VerifyJimage.java
@@ -188,7 +188,11 @@ public class VerifyJimage {
                         String cn = removeModule(n).replaceAll("\\.class$", "").replace('/', '.');
                         count.incrementAndGet();
                         try {
+                            System.out.println("Loading " + cn);
                             Class.forName(cn, false, loader);
+                        } catch (VerifyError ve) {
+                            System.err.println("VerifyError for " + cn);
+                            failed.add(reader.imageName() + ": " + cn + " not verified: " + ve.getMessage());
                         } catch (ClassNotFoundException e) {
                             failed.add(reader.imageName() + ": " + cn + " not found");
                         }

From a96b7f7d25bbe58412429be59b224af27eec140c Mon Sep 17 00:00:00 2001
From: Daniel Fuchs <dfuchs@openjdk.org>
Date: Tue, 17 May 2016 19:24:46 +0200
Subject: [PATCH 036/228] 8139982: Re-examine java.management dependency on
 java.util.logging.LoggingMXBean

The logging MXBean implementation no longer implements java.util.logging.LoggingMXBean. java.lang.management.PlatformLoggingMXBean is used instead. java.util.logging.LoggingMXBean and java.util.logging.LogManager::getLoggingMXBean are now deprecated. Types and accessors defined in java.lang.management should be used instead.

Reviewed-by: mchung
---
 .../classes/java/util/logging/LogManager.java |  22 +-
 .../classes/java/util/logging/Logging.java    |  16 +-
 .../java/util/logging/LoggingMXBean.java      |  38 ++--
 .../lang/management/ManagementFactory.java    |  30 ++-
 .../management/PlatformLoggingMXBean.java     |   4 -
 .../management/ManagementFactoryHelper.java   | 193 ++++++++++++------
 .../PlatformLoggingMXBeanTest.java            |   3 +-
 7 files changed, 202 insertions(+), 104 deletions(-)

diff --git a/jdk/src/java.logging/share/classes/java/util/logging/LogManager.java b/jdk/src/java.logging/share/classes/java/util/logging/LogManager.java
index bc06286e8da..f429452419e 100644
--- a/jdk/src/java.logging/share/classes/java/util/logging/LogManager.java
+++ b/jdk/src/java.logging/share/classes/java/util/logging/LogManager.java
@@ -2506,15 +2506,12 @@ public class LogManager {
         }
     }
 
-    // Management Support
-    private static LoggingMXBean loggingMXBean = null;
     /**
      * String representation of the
      * {@link javax.management.ObjectName} for the management interface
      * for the logging facility.
      *
      * @see java.lang.management.PlatformLoggingMXBean
-     * @see java.util.logging.LoggingMXBean
      *
      * @since 1.5
      */
@@ -2523,24 +2520,21 @@ public class LogManager {
 
     /**
      * Returns {@code LoggingMXBean} for managing loggers.
-     * An alternative way to manage loggers is through the
-     * {@link java.lang.management.PlatformLoggingMXBean} interface
-     * that can be obtained by calling:
-     * <pre>
-     *     PlatformLoggingMXBean logging = {@link java.lang.management.ManagementFactory#getPlatformMXBean(Class)
-     *         ManagementFactory.getPlatformMXBean}(PlatformLoggingMXBean.class);
-     * </pre>
      *
      * @return a {@link LoggingMXBean} object.
      *
+     * @deprecated {@code java.util.logging.LoggingMXBean} is deprecated and
+     *      replaced with {@code java.lang.management.PlatformLoggingMXBean}. Use
+     *      {@link java.lang.management.ManagementFactory#getPlatformMXBean(Class)
+     *      ManagementFactory.getPlatformMXBean}(PlatformLoggingMXBean.class)
+     *      instead.
+     *
      * @see java.lang.management.PlatformLoggingMXBean
      * @since 1.5
      */
+    @Deprecated(since="9")
     public static synchronized LoggingMXBean getLoggingMXBean() {
-        if (loggingMXBean == null) {
-            loggingMXBean =  new Logging();
-        }
-        return loggingMXBean;
+        return Logging.getInstance();
     }
 
     /**
diff --git a/jdk/src/java.logging/share/classes/java/util/logging/Logging.java b/jdk/src/java.logging/share/classes/java/util/logging/Logging.java
index 70c59503e4e..716e8bc150d 100644
--- a/jdk/src/java.logging/share/classes/java/util/logging/Logging.java
+++ b/jdk/src/java.logging/share/classes/java/util/logging/Logging.java
@@ -44,16 +44,18 @@ import java.util.ArrayList;
  * @see Logger
  * @see LogManager
  */
-class Logging implements LoggingMXBean {
+@SuppressWarnings("deprecation") // implements LoggingMXBean
+final class Logging implements LoggingMXBean {
 
     private static LogManager logManager = LogManager.getLogManager();
 
     /** Constructor of Logging which is the implementation class
      *  of LoggingMXBean.
      */
-    Logging() {
+    private Logging() {
     }
 
+    @Override
     public List<String> getLoggerNames() {
         Enumeration<String> loggers = logManager.getLoggerNames();
         ArrayList<String> array = new ArrayList<>();
@@ -65,6 +67,7 @@ class Logging implements LoggingMXBean {
     }
 
     private static String EMPTY_STRING = "";
+    @Override
     public String getLoggerLevel(String loggerName) {
         Logger l = logManager.getLogger(loggerName);
         if (l == null) {
@@ -79,6 +82,7 @@ class Logging implements LoggingMXBean {
         }
     }
 
+    @Override
     public void setLoggerLevel(String loggerName, String levelName) {
         if (loggerName == null) {
             throw new NullPointerException("loggerName is null");
@@ -102,6 +106,7 @@ class Logging implements LoggingMXBean {
         logger.setLevel(level);
     }
 
+    @Override
     public String getParentLoggerName( String loggerName ) {
         Logger l = logManager.getLogger( loggerName );
         if (l == null) {
@@ -116,4 +121,11 @@ class Logging implements LoggingMXBean {
             return p.getName();
         }
     }
+
+    static Logging getInstance() {
+        return INSTANCE;
+    }
+
+    private static final Logging INSTANCE = new Logging();
+
 }
diff --git a/jdk/src/java.logging/share/classes/java/util/logging/LoggingMXBean.java b/jdk/src/java.logging/share/classes/java/util/logging/LoggingMXBean.java
index 9d545d8d28d..812eb36622d 100644
--- a/jdk/src/java.logging/share/classes/java/util/logging/LoggingMXBean.java
+++ b/jdk/src/java.logging/share/classes/java/util/logging/LoggingMXBean.java
@@ -27,30 +27,23 @@ package java.util.logging;
 
 
 /**
- * The management interface for the logging facility. It is recommended
- * to use the {@link java.lang.management.PlatformLoggingMXBean} management
- * interface that implements all attributes defined in this
- * {@code LoggingMXBean}.  The
- * {@link java.lang.management.ManagementFactory#getPlatformMXBean(Class)
- * ManagementFactory.getPlatformMXBean} method can be used to obtain
- * the {@code PlatformLoggingMXBean} object representing the management
- * interface for logging.
+ * The management interface for the logging facility.
  *
- * <p>There is a single global instance of the {@code LoggingMXBean}.
- * This instance is an {@link javax.management.MXBean MXBean} that
- * can be obtained by calling the {@link LogManager#getLoggingMXBean}
- * method or from the
- * {@linkplain java.lang.management.ManagementFactory#getPlatformMBeanServer
+ * {@link java.lang.management.PlatformLoggingMXBean
+ * java.lang.management.PlatformLoggingMXBean} is the management interface
+ * for logging facility registered in the {@link
+ * java.lang.management.ManagementFactory#getPlatformMBeanServer()
  * platform MBeanServer}.
- * <p>
- * The {@link javax.management.ObjectName ObjectName} that uniquely identifies
- * the management interface for logging within the {@code MBeanServer} is:
- * <pre>
- *    {@link LogManager#LOGGING_MXBEAN_NAME java.util.logging:type=Logging}
- * </pre>
- * <p>
- * The instance registered in the platform {@code MBeanServer}
- * is also a {@link java.lang.management.PlatformLoggingMXBean}.
+ * It is recommended to use the {@code PlatformLoggingMXBean} obtained via
+ * the {@link java.lang.management.ManagementFactory#getPlatformMXBean(Class)
+ * ManagementFactory.getPlatformMXBean(PlatformLoggingMXBean.class)} method.
+ *
+ * @deprecated {@code LoggingMXBean} is no longer a {@link
+ * java.lang.management.PlatformManagedObject platform MXBean} and is replaced
+ * with {@link java.lang.management.PlatformLoggingMXBean}.
+ * It will not register in the platform {@code MBeanServer}.
+ * Use {@code ManagementFactory.getPlatformMXBean(PlatformLoggingMXBean.class)}
+ * instead.
  *
  * @author  Ron Mann
  * @author  Mandy Chung
@@ -58,6 +51,7 @@ package java.util.logging;
  *
  * @see java.lang.management.PlatformLoggingMXBean
  */
+@Deprecated(since="9")
 public interface LoggingMXBean {
 
     /**
diff --git a/jdk/src/java.management/share/classes/java/lang/management/ManagementFactory.java b/jdk/src/java.management/share/classes/java/lang/management/ManagementFactory.java
index 8d0083ff807..9a6252add85 100644
--- a/jdk/src/java.management/share/classes/java/lang/management/ManagementFactory.java
+++ b/jdk/src/java.management/share/classes/java/lang/management/ManagementFactory.java
@@ -598,9 +598,8 @@ public class ManagementFactory {
 
         try {
             final ObjectName objName = new ObjectName(mxbeanName);
-            // skip the isInstanceOf check for LoggingMXBean
             String intfName = mxbeanInterface.getName();
-            if (!connection.isInstanceOf(objName, intfName)) {
+            if (!isInstanceOf(connection, objName, intfName)) {
                 throw new IllegalArgumentException(mxbeanName +
                     " is not an instance of " + mxbeanInterface);
             }
@@ -616,6 +615,33 @@ public class ManagementFactory {
         }
     }
 
+    // This makes it possible to obtain an instance of LoggingMXBean
+    // using newPlatformMXBeanProxy(mbs, on, LoggingMXBean.class)
+    // even though the underlying MXBean no longer implements
+    // java.util.logging.LoggingMXBean.
+    // Altough java.util.logging.LoggingMXBean is deprecated, an application
+    // that uses newPlatformMXBeanProxy(mbs, on, LoggingMXBean.class) will
+    // continue to work.
+    //
+    private static boolean isInstanceOf(MBeanServerConnection connection,
+            ObjectName objName, String intfName)
+            throws InstanceNotFoundException, IOException
+    {
+        // special case for java.util.logging.LoggingMXBean.
+        // java.util.logging.LoggingMXBean is deprecated and
+        // replaced with java.lang.management.PlatformLoggingMXBean,
+        // so we will consider that any MBean implementing
+        // java.lang.management.PlatformLoggingMXBean also implements
+        // java.util.logging.LoggingMXBean.
+        if ("java.util.logging.LoggingMXBean".equals(intfName)) {
+            if (connection.isInstanceOf(objName,
+                    PlatformLoggingMXBean.class.getName())) {
+                return true;
+            }
+        }
+        return connection.isInstanceOf(objName, intfName);
+    }
+
     /**
      * Returns the platform MXBean implementing
      * the given {@code mxbeanInterface} which is specified
diff --git a/jdk/src/java.management/share/classes/java/lang/management/PlatformLoggingMXBean.java b/jdk/src/java.management/share/classes/java/lang/management/PlatformLoggingMXBean.java
index d18d0b30c40..80595dd75d6 100644
--- a/jdk/src/java.management/share/classes/java/lang/management/PlatformLoggingMXBean.java
+++ b/jdk/src/java.management/share/classes/java/lang/management/PlatformLoggingMXBean.java
@@ -44,10 +44,6 @@ package java.lang.management;
  *      {@link java.util.logging.LogManager#LOGGING_MXBEAN_NAME java.util.logging:type=Logging}
  * </pre>
  *
- * <p>The instance registered in the platform {@code MBeanServer} with
- * this {@code ObjectName} implements all attributes defined by
- * {@link java.util.logging.LoggingMXBean}.
- *
  * @since   1.7
  */
 public interface PlatformLoggingMXBean extends PlatformManagedObject {
diff --git a/jdk/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java b/jdk/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java
index 44682b29971..4eb5742b2ba 100644
--- a/jdk/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java
+++ b/jdk/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java
@@ -26,6 +26,8 @@
 package sun.management;
 
 import java.lang.management.*;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import javax.management.InstanceAlreadyExistsException;
 import javax.management.InstanceNotFoundException;
 import javax.management.MBeanServer;
@@ -43,9 +45,13 @@ import jdk.internal.misc.SharedSecrets;
 import java.util.ArrayList;
 import java.util.List;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Module;
+import java.lang.reflect.UndeclaredThrowableException;
 import java.security.PrivilegedAction;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
 
 /**
  * ManagementFactoryHelper provides static factory methods to create
@@ -66,6 +72,7 @@ public class ManagementFactoryHelper {
         return jvm;
     }
 
+    static final String LOGGING_MXBEAN_NAME = "java.util.logging:type=Logging";
     private static ClassLoadingImpl    classMBean = null;
     private static MemoryImpl          memoryMBean = null;
     private static ThreadImpl          threadMBean = null;
@@ -145,74 +152,138 @@ public class ManagementFactoryHelper {
     }
 
     public static PlatformLoggingMXBean getPlatformLoggingMXBean() {
-        if (LoggingMXBeanSupport.isAvailable()) {
-            return PlatformLoggingImpl.instance;
+        if (LoggingMXBeanAccess.isAvailable()) {
+            return PlatformLoggingImpl.MBEAN;
         } else {
             return null;
         }
     }
 
     public static boolean isPlatformLoggingMXBeanAvailable() {
-        return LoggingMXBeanSupport.isAvailable();
+        return LoggingMXBeanAccess.isAvailable();
     }
 
-    /**
-     * The logging MXBean object is an instance of
-     * PlatformLoggingMXBean and java.util.logging.LoggingMXBean
-     * but it can't directly implement two MXBean interfaces
-     * as a compliant MXBean implements exactly one MXBean interface,
-     * or if it implements one interface that is a subinterface of
-     * all the others; otherwise, it is a non-compliant MXBean
-     * and MBeanServer will throw NotCompliantMBeanException.
-     * See the Definition of an MXBean section in javax.management.MXBean spec.
-     *
-     * To create a compliant logging MXBean, define a LoggingMXBean interface
-     * that extend PlatformLoggingMXBean and j.u.l.LoggingMXBean
-    */
-    public interface LoggingMXBean
-        extends PlatformLoggingMXBean, java.util.logging.LoggingMXBean {
-    }
-
-    // This is a trick: if java.util.logging is not present then
-    // attempting to access something that implements
-    // java.util.logging.LoggingMXBean will trigger a CNFE.
-    // So we cannot directly call any static method or access any static field
-    // on PlatformLoggingImpl, as we would risk raising a CNFE.
-    // Instead we use this intermediate LoggingMXBeanSupport class to determine
+    // The LoggingMXBeanAccess class uses reflection to determine
     // whether java.util.logging is present, and load the actual LoggingMXBean
     // implementation.
     //
-    static final class LoggingMXBeanSupport {
-        final static Object loggingImpl =
-                AccessController.doPrivileged(new PrivilegedAction<Object>() {
-            @Override
-            public Object run() {
-                try {
-                    // create a LoggingProxyImpl instance when
-                    // java.util.logging classes exist
-                    Class<?> c = Class.forName("java.util.logging.Logging", true, null);
-                    Constructor<?> cons = c.getDeclaredConstructor();
-                    cons.setAccessible(true);
-                    return cons.newInstance();
-                } catch (ClassNotFoundException cnf) {
-                    return null;
-                } catch (NoSuchMethodException | InstantiationException
-                        | IllegalAccessException | InvocationTargetException e) {
-                    throw new AssertionError(e);
-                }
-            }});
+    static final class LoggingMXBeanAccess {
+
+        final static String LOG_MANAGER_CLASS_NAME = "java.util.logging.LogManager";
+        final static String LOGGING_MXBEAN_CLASS_NAME = "java.util.logging.LoggingMXBean";
+        final static Class<?> LOG_MANAGER_CLASS = loadLoggingClass(LOG_MANAGER_CLASS_NAME);
 
         static boolean isAvailable() {
-            return loggingImpl != null;
+            return LOG_MANAGER_CLASS != null;
         }
+
+        private static Class<?> loadLoggingClass(String className) {
+            return AccessController.doPrivileged(new PrivilegedAction<>() {
+                @Override
+                public Class<?> run() {
+                    Optional<Module> logging = java.lang.reflect.Layer.boot()
+                        .findModule("java.logging");
+                    if (logging.isPresent()) {
+                        return Class.forName(logging.get(), className);
+                    }
+                    return null;
+                }
+            });
+        }
+
+        private Map<String, Method> initMethodMap(Object impl) {
+            if (impl == null) {
+                return Collections.emptyMap();
+            }
+            Class<?> intfClass = loadLoggingClass(LOGGING_MXBEAN_CLASS_NAME);
+            final Map<String, Method> methodsMap = new HashMap<>();
+            for (Method m : intfClass.getMethods()) {
+                try {
+                    // Sanity checking: all public methods present in
+                    // java.util.logging.LoggingMXBean should
+                    // also be in PlatformLoggingMXBean
+                    Method specMethod = PlatformLoggingMXBean.class
+                             .getMethod(m.getName(), m.getParameterTypes());
+                    if (specMethod.getReturnType().isAssignableFrom(m.getReturnType())) {
+                        if (methodsMap.putIfAbsent(m.getName(), m) != null) {
+                            throw new RuntimeException("unexpected polymorphic method: "
+                                     + m.getName());
+                        }
+                    }
+                } catch (NoSuchMethodException x) {
+                    // All methods in java.util.logging.LoggingMXBean should
+                    // also be in PlatformLoggingMXBean
+                    throw new InternalError(x);
+                }
+            }
+            return Collections.unmodifiableMap(methodsMap);
+        }
+
+        private static Object getMXBeanImplementation() {
+            if (!isAvailable()) {
+                // should not happen
+                throw new NoClassDefFoundError(LOG_MANAGER_CLASS_NAME);
+            }
+            try {
+                final Method m = LOG_MANAGER_CLASS.getMethod("getLoggingMXBean");
+                return m.invoke(null);
+            } catch (NoSuchMethodException
+                    | IllegalAccessException
+                    | InvocationTargetException x) {
+                throw new ExceptionInInitializerError(x);
+            }
+         }
+
+        // The implementation object, which will be invoked through
+        // reflection. The implementation does not need to implement
+        // PlatformLoggingMXBean, but must declare the same methods
+        // with same signatures, and they must be public, with one
+        // exception:
+        // getObjectName will not be called on the implementation object,
+        // so the implementation object does not need to declare such
+        // a method.
+        final Object impl = getMXBeanImplementation();
+        final Map<String, Method> methods = initMethodMap(impl);
+
+        LoggingMXBeanAccess() {
+        }
+
+        <T> T invoke(String methodName, Object... args) {
+            Method m = methods.get(methodName);
+            if (m == null) {
+                throw new UnsupportedOperationException(methodName);
+            }
+            try {
+                @SuppressWarnings("unchecked")
+                T result = (T) m.invoke(impl, args);
+                return result;
+            } catch (IllegalAccessException ex) {
+                throw new UnsupportedOperationException(ex);
+            } catch (InvocationTargetException ex) {
+                throw unwrap(ex);
+            }
+        }
+
+        private static RuntimeException unwrap(InvocationTargetException x) {
+            Throwable t = x.getCause();
+            if (t instanceof RuntimeException) {
+                return (RuntimeException)t;
+            }
+            if (t instanceof Error) {
+                throw (Error)t;
+            }
+            return new UndeclaredThrowableException(t == null ? x : t);
+        }
+
+
     }
 
-    static class PlatformLoggingImpl implements LoggingMXBean
-    {
-        final static java.util.logging.LoggingMXBean impl =
-                (java.util.logging.LoggingMXBean) LoggingMXBeanSupport.loggingImpl;
-        final static PlatformLoggingMXBean instance = new PlatformLoggingImpl();
-        final static String LOGGING_MXBEAN_NAME = "java.util.logging:type=Logging";
+    static final class PlatformLoggingImpl implements PlatformLoggingMXBean {
+
+        private final LoggingMXBeanAccess loggingAccess;
+        private PlatformLoggingImpl(LoggingMXBeanAccess loggingAccess) {
+            this.loggingAccess = loggingAccess;
+        }
 
         private volatile ObjectName objname;  // created lazily
         @Override
@@ -232,23 +303,29 @@ public class ManagementFactoryHelper {
 
         @Override
         public java.util.List<String> getLoggerNames() {
-            return impl.getLoggerNames();
+            return loggingAccess.invoke("getLoggerNames");
         }
 
         @Override
         public String getLoggerLevel(String loggerName) {
-            return impl.getLoggerLevel(loggerName);
+            return loggingAccess.invoke("getLoggerLevel", loggerName);
         }
 
         @Override
         public void setLoggerLevel(String loggerName, String levelName) {
-            impl.setLoggerLevel(loggerName, levelName);
+            loggingAccess.invoke("setLoggerLevel", loggerName, levelName);
         }
 
         @Override
         public String getParentLoggerName(String loggerName) {
-            return impl.getParentLoggerName(loggerName);
+            return loggingAccess.invoke("getParentLoggerName", loggerName);
         }
+
+        private static PlatformLoggingImpl getInstance() {
+            return new PlatformLoggingImpl(new LoggingMXBeanAccess());
+         }
+
+        static final PlatformLoggingMXBean MBEAN = getInstance();
     }
 
     private static List<BufferPoolMXBean> bufferPools = null;
diff --git a/jdk/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java b/jdk/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java
index ac0bc89f98c..63f5c5fbc31 100644
--- a/jdk/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java
+++ b/jdk/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java
@@ -270,8 +270,7 @@ public class PlatformLoggingMXBeanTest
         // Calling getMBeanInfo will throw exception if not found.
         platformMBS.getMBeanInfo(objName);
 
-        if (!platformMBS.isInstanceOf(objName, "java.lang.management.PlatformLoggingMXBean") ||
-            !platformMBS.isInstanceOf(objName, "java.util.logging.LoggingMXBean")) {
+        if (!platformMBS.isInstanceOf(objName, "java.lang.management.PlatformLoggingMXBean")) {
             throw new RuntimeException(objName + " is of unexpected type");
         }
 

From f8157334a83a3462f2a51c923a1238d3f9c70b05 Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Tue, 3 May 2016 15:35:39 +0200
Subject: [PATCH 037/228] 8136777: Introduce bundle targets

Reviewed-by: tbell, ihse
---
 jdk/make/Import.gmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdk/make/Import.gmk b/jdk/make/Import.gmk
index d479b095514..29e4ce0f19e 100644
--- a/jdk/make/Import.gmk
+++ b/jdk/make/Import.gmk
@@ -112,7 +112,7 @@ $(BASE_INSTALL_LIBRARIES_HERE)/server/%$(SHARED_LIBRARY_SUFFIX): $(BASE_INSTALL_
 	$(LN) -s ../$(@F) $@
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
-  $(BASE_INSTALL_LIBRARIES_HERE)/server/%.dSYM : $(BASE_INSTALL_LIBRARIES_HERE)/%.dSYM
+  $(BASE_INSTALL_LIBRARIES_HERE)/server/%.dSYM:
 	$(MKDIR) -p $(@D)
 	$(RM) $@
 	$(LN) -s ../$(@F) $@

From 5302ecdbff769171e41aabbef529d19bb5346b0c Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Tue, 3 May 2016 09:48:02 -0700
Subject: [PATCH 038/228] 8149560: TIFFField#createFromMetadataNode throws a
 NullPointerException when the node is set with "tagNumber" attribute

In the specification of createFromMetadataNode() change "tagNumber" to "number" and add two throws clauses which match the behavior.

Reviewed-by: prr
---
 .../share/classes/javax/imageio/plugins/tiff/TIFFField.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java
index 168e6b17328..3ac06d98414 100644
--- a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java
+++ b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java
@@ -412,7 +412,7 @@ public class TIFFField implements Cloneable {
 
     /**
      * Creates a {@code TIFFField} from a TIFF native image
-     * metadata node. If the value of the <tt>"tagNumber"</tt> attribute
+     * metadata node. If the value of the <tt>"number"</tt> attribute
      * of the node is not found in {@code tagSet} then a new
      * {@code TIFFTag} with name {@code TIFFTag.UNKNOWN_TAG_NAME}
      * will be created and assigned to the field.
@@ -424,6 +424,10 @@ public class TIFFField implements Cloneable {
      * {@code null}.
      * @throws IllegalArgumentException if the name of the node is not
      * {@code "TIFFField"}.
+     * @throws NullPointerException if the node does not contain any data.
+     * @throws IllegalArgumentException if the combination of node attributes
+     * and data is not legal per the {@link #TIFFField(TIFFTag,int,int,Object)}
+     * constructor specification.
      * @return A new {@code TIFFField}.
      */
     public static TIFFField createFromMetadataNode(TIFFTagSet tagSet,

From 214029ed2b8f243b75a0033f8b26617e7a71025e Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Wed, 4 May 2016 01:03:46 +0300
Subject: [PATCH 039/228] 6729836: JavaSound treats large file sizes as
 negative and cannot read or skip

Reviewed-by: prr
---
 .../com/sun/media/sound/AiffFileFormat.java   |  14 +-
 .../com/sun/media/sound/AiffFileReader.java   |  13 +-
 .../com/sun/media/sound/AuFileFormat.java     |  15 +-
 .../com/sun/media/sound/AuFileReader.java     |  23 +-
 .../media/sound/SoftMidiAudioFileReader.java  |   9 +-
 .../sun/media/sound/StandardFileFormat.java   | 114 ++++++++
 .../com/sun/media/sound/SunFileReader.java    |  12 +-
 .../media/sound/WaveExtensibleFileReader.java |  17 +-
 .../com/sun/media/sound/WaveFileFormat.java   |   8 +-
 .../com/sun/media/sound/WaveFileReader.java   |  21 +-
 .../sun/media/sound/WaveFloatFileReader.java  |  18 +-
 .../RecognizeHugeAiffFiles.java               | 247 ++++++++++++++++++
 .../AudioFileReader/RecognizeHugeAuFiles.java | 232 ++++++++++++++++
 .../RecognizeHugeWaveExtFiles.java            |   7 +-
 ...Files.java => RecognizeHugeWaveFiles.java} |  23 +-
 15 files changed, 680 insertions(+), 93 deletions(-)
 create mode 100644 jdk/src/java.desktop/share/classes/com/sun/media/sound/StandardFileFormat.java
 create mode 100644 jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeAiffFiles.java
 create mode 100644 jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeAuFiles.java
 rename jdk/test/javax/sound/sampled/spi/AudioFileReader/{RecognizeHugeWaveFloatFiles.java => RecognizeHugeWaveFiles.java} (91%)

diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AiffFileFormat.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AiffFileFormat.java
index 8d5e7f07468..010bd3d4b56 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AiffFileFormat.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AiffFileFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2016, 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,17 +25,14 @@
 
 package com.sun.media.sound;
 
-import javax.sound.sampled.AudioFileFormat;
 import javax.sound.sampled.AudioFormat;
 
-
 /**
  * AIFF file format.
  *
  * @author Jan Borgersen
  */
-
-final class AiffFileFormat extends AudioFileFormat {
+final class AiffFileFormat extends StandardFileFormat {
 
     static final int AIFF_MAGIC         = 1179603533;
 
@@ -70,11 +67,8 @@ final class AiffFileFormat extends AudioFileFormat {
     /** FVER chunk size in bytes, inclusive magic and length field */
     private final int fverChunkSize=0;
 
-    AiffFileFormat( AudioFileFormat aff ) {
-        this( aff.getType(), aff.getByteLength(), aff.getFormat(), aff.getFrameLength() );
-    }
-
-    AiffFileFormat(Type type, int byteLength, AudioFormat format, int frameLength) {
+    AiffFileFormat(final Type type, final long byteLength,
+                   final AudioFormat format, final long frameLength) {
         super(type, byteLength, format, frameLength);
     }
 
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AiffFileReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AiffFileReader.java
index c0ac8bf6d40..20dc68409ff 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AiffFileReader.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AiffFileReader.java
@@ -45,7 +45,7 @@ import javax.sound.sampled.UnsupportedAudioFileException;
 public final class AiffFileReader extends SunFileReader {
 
     @Override
-    AudioFileFormat getAudioFileFormatImpl(final InputStream stream)
+    StandardFileFormat getAudioFileFormatImpl(final InputStream stream)
             throws UnsupportedAudioFileException, IOException {
         DataInputStream dis = new DataInputStream(stream);
 
@@ -60,11 +60,11 @@ public final class AiffFileReader extends SunFileReader {
             throw new UnsupportedAudioFileException("not an AIFF file");
         }
 
-        int frameLength = 0;
+        long /* unsigned 32bit */ frameLength = 0;
         int length = dis.readInt();
         int iffType = dis.readInt();
 
-        int totallength;
+        final long totallength;
         if(length <= 0 ) {
             length = AudioSystem.NOT_SPECIFIED;
             totallength = AudioSystem.NOT_SPECIFIED;
@@ -106,12 +106,7 @@ public final class AiffFileReader extends SunFileReader {
                 if (channels <= 0) {
                     throw new UnsupportedAudioFileException("Invalid number of channels");
                 }
-                frameLength = dis.readInt(); // numSampleFrames
-                if (frameLength < 0) {
-                    // AiffFileFormat uses int, unlike AIS which uses long
-                    //TODO this (negative) value should be passed as long to AIS
-                    frameLength = AudioSystem.NOT_SPECIFIED;
-                }
+                frameLength = dis.readInt() & 0xffffffffL; // numSampleFrames
 
                 int sampleSizeInBits = dis.readUnsignedShort();
                 if (sampleSizeInBits < 1 || sampleSizeInBits > 32) {
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileFormat.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileFormat.java
index 7a91bfc0a75..dc425e40a65 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileFormat.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileFormat.java
@@ -33,7 +33,7 @@ import javax.sound.sampled.AudioFormat;
  *
  * @author Jan Borgersen
  */
-final class AuFileFormat extends AudioFileFormat {
+final class AuFileFormat extends StandardFileFormat {
 
     // magic numbers
     static final int AU_SUN_MAGIC = 0x2e736e64; // ".snd"
@@ -55,11 +55,18 @@ final class AuFileFormat extends AudioFileFormat {
 
     static final int AU_HEADERSIZE       = 24;
 
+    /**
+     * According the specification of AU file format this is the value for
+     * length field if length is not known. This is a maximum possible value for
+     * the unsigned int.
+     */
+    static final long /*unsigned int */ UNKNOWN_SIZE = 0xffffffffL;
+
     private int auType;
 
-    AuFileFormat(AudioFileFormat.Type type, int lengthInBytes, AudioFormat format, int lengthInFrames) {
-
-        super(type,lengthInBytes,format,lengthInFrames);
+    AuFileFormat(final AudioFileFormat.Type type, final long byteLength,
+                 final AudioFormat format, final long frameLength) {
+        super(type, byteLength, format, frameLength);
 
         AudioFormat.Encoding encoding = format.getEncoding();
 
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileReader.java
index 876c3b78e80..097b64b4746 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileReader.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileReader.java
@@ -29,7 +29,6 @@ import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import javax.sound.sampled.AudioFileFormat;
 import javax.sound.sampled.AudioFileFormat.Type;
 import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.AudioSystem;
@@ -45,7 +44,7 @@ import javax.sound.sampled.UnsupportedAudioFileException;
 public final class AuFileReader extends SunFileReader {
 
     @Override
-    public AudioFileFormat getAudioFileFormatImpl(final InputStream stream)
+    public StandardFileFormat getAudioFileFormatImpl(final InputStream stream)
             throws UnsupportedAudioFileException, IOException {
         final DataInputStream dis = new DataInputStream(stream);
         final int magic = dis.readInt();
@@ -56,7 +55,7 @@ public final class AuFileReader extends SunFileReader {
         }
 
         final int headerSize = dis.readInt();
-        final int dataSize = dis.readInt();
+        final long /* unsigned int */ dataSize = dis.readInt() & 0xffffffffL;
         final int auType = dis.readInt();
         final int sampleRate = dis.readInt();
         final int channels = dis.readInt();
@@ -120,21 +119,21 @@ public final class AuFileReader extends SunFileReader {
                 // unsupported filetype, throw exception
                 throw new UnsupportedAudioFileException("not a valid AU file");
         }
+        // now seek past the header
+        dis.skipBytes(headerSize - AuFileFormat.AU_HEADERSIZE);
 
         final int frameSize = calculatePCMFrameSize(sampleSizeInBits, channels);
         //$$fb 2002-11-02: fix for 4629669: AU file reader: problems with empty files
-        final int length;
-        if (dataSize < 0) {
-            length = AudioSystem.NOT_SPECIFIED;
-        } else {
-            //$$fb 2003-10-20: fix for 4940459: AudioInputStream.getFrameLength() returns 0 instead of NOT_SPECIFIED
-            length = dataSize / frameSize;
+        //$$fb 2003-10-20: fix for 4940459: AudioInputStream.getFrameLength() returns 0 instead of NOT_SPECIFIED
+        long frameLength = AudioSystem.NOT_SPECIFIED;
+        long byteLength = AudioSystem.NOT_SPECIFIED;
+        if (dataSize != AuFileFormat.UNKNOWN_SIZE) {
+            frameLength = dataSize / frameSize;
+            byteLength = dataSize + headerSize;
         }
-        // now seek past the header
-        dis.skipBytes(headerSize - AuFileFormat.AU_HEADERSIZE);
         final AudioFormat format = new AudioFormat(encoding, sampleRate,
                                                    sampleSizeInBits, channels,
                                                    frameSize, sampleRate, true);
-        return new AuFileFormat(Type.AU, dataSize + headerSize, format, length);
+        return new AuFileFormat(Type.AU, byteLength, format, frameLength);
     }
 }
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java
index 715cfcf9e76..b573b16d935 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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,6 @@ import javax.sound.midi.MidiUnavailableException;
 import javax.sound.midi.Receiver;
 import javax.sound.midi.Sequence;
 import javax.sound.midi.Track;
-import javax.sound.sampled.AudioFileFormat;
 import javax.sound.sampled.AudioFileFormat.Type;
 import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.AudioInputStream;
@@ -56,10 +55,10 @@ public final class SoftMidiAudioFileReader extends SunFileReader {
     private static final AudioFormat format = new AudioFormat(44100, 16, 2,
                                                               true, false);
 
-    private static AudioFileFormat getAudioFileFormat(final Sequence seq) {
+    private static StandardFileFormat getAudioFileFormat(final Sequence seq) {
         long totallen = seq.getMicrosecondLength() / 1000000;
         long len = (long) (format.getFrameRate() * (totallen + 4));
-        return new AudioFileFormat(MIDI, format, (int) len);
+        return new StandardFileFormat(MIDI, format, len);
     }
 
     private AudioInputStream getAudioInputStream(final Sequence seq)
@@ -140,7 +139,7 @@ public final class SoftMidiAudioFileReader extends SunFileReader {
     }
 
     @Override
-    AudioFileFormat getAudioFileFormatImpl(final InputStream stream)
+    StandardFileFormat getAudioFileFormatImpl(final InputStream stream)
             throws UnsupportedAudioFileException, IOException {
         try {
             return getAudioFileFormat(MidiSystem.getSequence(stream));
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/StandardFileFormat.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/StandardFileFormat.java
new file mode 100644
index 00000000000..5be7149929c
--- /dev/null
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/StandardFileFormat.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2016, 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 com.sun.media.sound;
+
+import javax.sound.sampled.AudioFileFormat;
+import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioSystem;
+
+/**
+ * An instance of the {@code StandardFileFormat} describes the file's length in
+ * bytes and the length in sample frames as longs. This will provide an
+ * additional precision unlike the {@code AudioFileFormat}.
+ */
+class StandardFileFormat extends AudioFileFormat {
+
+    /**
+     * File length in bytes stored as long.
+     */
+    private final long byteLength;
+
+    /**
+     * Audio data length in sample frames stored as long.
+     */
+    private final long frameLength;
+
+    /**
+     * Constructs {@code StandardFileFormat} object.
+     *
+     * @param  type the type of the audio file
+     * @param  format the format of the audio data contained in the file
+     * @param  frameLength the audio data length in sample frames, or
+     *         {@code AudioSystem.NOT_SPECIFIED}
+     */
+    StandardFileFormat(final Type type, final AudioFormat format,
+                       final long frameLength) {
+        this(type, AudioSystem.NOT_SPECIFIED, format, frameLength);
+    }
+
+    /**
+     * Constructs {@code StandardFileFormat} object.
+     *
+     * @param  type the type of the audio file
+     * @param  byteLength the length of the file in bytes, or
+     *         {@code AudioSystem.NOT_SPECIFIED}
+     * @param  format the format of the audio data contained in the file
+     * @param  frameLength the audio data length in sample frames, or
+     *         {@code AudioSystem.NOT_SPECIFIED}
+     */
+    StandardFileFormat(final Type type, final long byteLength,
+                       final AudioFormat format, final long frameLength) {
+        super(type, clip(byteLength), format, clip(frameLength));
+        this.byteLength = byteLength;
+        this.frameLength = frameLength;
+    }
+
+    /**
+     * Replaces the passed value to {@code AudioSystem.NOT_SPECIFIED} if the
+     * value is greater than {@code Integer.MAX_VALUE}.
+     *
+     * @param  value which should be clipped
+     * @return the clipped value
+     */
+    private static int clip(final long value) {
+        if (value > Integer.MAX_VALUE) {
+            return AudioSystem.NOT_SPECIFIED;
+        }
+        return (int) value;
+    }
+
+    /**
+     * Obtains the length of the audio data contained in the file, expressed in
+     * sample frames. The long precision is used.
+     *
+     * @return the number of sample frames of audio data in the file
+     * @see AudioSystem#NOT_SPECIFIED
+     */
+    public final long getLongFrameLength() {
+        return frameLength;
+    }
+
+    /**
+     * Obtains the size in bytes of the entire audio file (not just its audio
+     * data). The long precision is used.
+     *
+     * @return the audio file length in bytes
+     * @see AudioSystem#NOT_SPECIFIED
+     */
+    public final long getLongByteLength() {
+        return byteLength;
+    }
+}
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SunFileReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SunFileReader.java
index a9e40ff33c5..01307d59514 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SunFileReader.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SunFileReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2016, 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,7 +47,7 @@ import javax.sound.sampled.spi.AudioFileReader;
 abstract class SunFileReader extends AudioFileReader {
 
     @Override
-    public final AudioFileFormat getAudioFileFormat(final InputStream stream)
+    public final StandardFileFormat getAudioFileFormat(final InputStream stream)
             throws UnsupportedAudioFileException, IOException {
         stream.mark(200); // The biggest value which was historically used
         try {
@@ -87,11 +87,11 @@ abstract class SunFileReader extends AudioFileReader {
             throws UnsupportedAudioFileException, IOException {
         stream.mark(200); // The biggest value which was historically used
         try {
-            final AudioFileFormat fileFormat = getAudioFileFormatImpl(stream);
+            final StandardFileFormat format = getAudioFileFormatImpl(stream);
             // we've got everything, the stream is supported and it is at the
             // beginning of the audio data, so return an AudioInputStream
-            return new AudioInputStream(stream, fileFormat.getFormat(),
-                                        fileFormat.getFrameLength());
+            return new AudioInputStream(stream, format.getFormat(),
+                                        format.getLongFrameLength());
         } catch (UnsupportedAudioFileException | EOFException ignored) {
             // stream is unsupported or the header is less than was expected
             stream.reset();
@@ -140,7 +140,7 @@ abstract class SunFileReader extends AudioFileReader {
      *         UnsupportedAudioFileException if the header is less than was
      *         expected
      */
-    abstract AudioFileFormat getAudioFileFormatImpl(InputStream stream)
+    abstract StandardFileFormat getAudioFileFormatImpl(InputStream stream)
             throws UnsupportedAudioFileException, IOException;
 
     // HELPER METHODS
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java
index 7d6ec18239b..5066ba29ea5 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java
@@ -34,7 +34,6 @@ import javax.sound.sampled.AudioFileFormat;
 import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.AudioFormat.Encoding;
 import javax.sound.sampled.AudioInputStream;
-import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.UnsupportedAudioFileException;
 
 /**
@@ -167,7 +166,7 @@ public final class WaveExtensibleFileReader extends SunFileReader {
     }
 
     @Override
-    AudioFileFormat getAudioFileFormatImpl(final InputStream stream)
+    StandardFileFormat getAudioFileFormatImpl(final InputStream stream)
             throws UnsupportedAudioFileException, IOException {
 
         RIFFReader riffiterator = new RIFFReader(stream);
@@ -249,19 +248,17 @@ public final class WaveExtensibleFileReader extends SunFileReader {
         } else {
             throw new UnsupportedAudioFileException();
         }
-        long frameLength = dataSize / audioformat.getFrameSize();
-        if (frameLength > Integer.MAX_VALUE) {
-            frameLength = AudioSystem.NOT_SPECIFIED;
-        }
-        return new AudioFileFormat(AudioFileFormat.Type.WAVE, audioformat,
-                                   (int) frameLength);
+        return new StandardFileFormat(AudioFileFormat.Type.WAVE, audioformat,
+                                      dataSize / audioformat.getFrameSize());
     }
 
     @Override
     public AudioInputStream getAudioInputStream(final InputStream stream)
             throws UnsupportedAudioFileException, IOException {
 
-        final AudioFileFormat format = getAudioFileFormat(stream);
+        final StandardFileFormat format = getAudioFileFormat(stream);
+        final AudioFormat af = format.getFormat();
+        final long length = format.getLongFrameLength();
         // we've got everything, the stream is supported and it is at the
         // beginning of the header, so find the data chunk again and return an
         // AudioInputStream
@@ -269,8 +266,6 @@ public final class WaveExtensibleFileReader extends SunFileReader {
         while (riffiterator.hasNextChunk()) {
             RIFFReader chunk = riffiterator.nextChunk();
             if (chunk.getFormat().equals("data")) {
-                final AudioFormat af = format.getFormat();
-                final long length = chunk.getSize() / af.getFrameSize();
                 return new AudioInputStream(chunk, af, length);
             }
         }
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFileFormat.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFileFormat.java
index 9bf8c9200ad..bf3abbf684a 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFileFormat.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFileFormat.java
@@ -33,7 +33,7 @@ import javax.sound.sampled.AudioFormat;
  *
  * @author Jan Borgersen
  */
-final class WaveFileFormat extends AudioFileFormat {
+final class WaveFileFormat extends StandardFileFormat {
 
     /**
      * Wave format type.
@@ -73,9 +73,9 @@ final class WaveFileFormat extends AudioFileFormat {
     static final int WAVE_FORMAT_SX7383    = 0x1C07;
     static final int WAVE_FORMAT_EXTENSIBLE= 0xFFFE;
 
-    WaveFileFormat(AudioFileFormat.Type type, int lengthInBytes, AudioFormat format, int lengthInFrames) {
-
-        super(type,lengthInBytes,format,lengthInFrames);
+    WaveFileFormat(final AudioFileFormat.Type type, final long byteLength,
+                   final AudioFormat format, final long frameLength) {
+        super(type, byteLength, format, frameLength);
 
         AudioFormat.Encoding encoding = format.getEncoding();
 
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFileReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFileReader.java
index 96a4bd7cd1f..7295b180ed1 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFileReader.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFileReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2016, 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,7 @@ import javax.sound.sampled.UnsupportedAudioFileException;
 public final class WaveFileReader extends SunFileReader {
 
     @Override
-    AudioFileFormat getAudioFileFormatImpl(final InputStream stream)
+    StandardFileFormat getAudioFileFormatImpl(final InputStream stream)
             throws UnsupportedAudioFileException, IOException {
 
         // assumes sream is rewound
@@ -64,9 +64,9 @@ public final class WaveFileReader extends SunFileReader {
         DataInputStream dis = new DataInputStream( stream );
 
         int magic = dis.readInt();
-        int fileLength = rllong(dis);
+        long /* unsigned int */ fileLength = rllong(dis) & 0xffffffffL;
         int waveMagic = dis.readInt();
-        int totallength;
+        long totallength;
         if (fileLength <= 0) {
             fileLength = AudioSystem.NOT_SPECIFIED;
             totallength = AudioSystem.NOT_SPECIFIED;
@@ -186,19 +186,18 @@ public final class WaveFileReader extends SunFileReader {
             }
         }
         // this is the length of the data chunk
-        int dataLength = rllong(dis); nread += 4;
+        long /* unsigned int */ dataLength = rllong(dis) & 0xffffffffL; nread += 4;
 
         // now build the new AudioFileFormat and return
-
+        final int frameSize = calculatePCMFrameSize(sampleSizeInBits, channels);
         AudioFormat format = new AudioFormat(encoding,
                                              (float)sampleRate,
                                              sampleSizeInBits, channels,
-                                             calculatePCMFrameSize(sampleSizeInBits, channels),
+                                             frameSize,
                                              (float)sampleRate, false);
 
-        return new WaveFileFormat(AudioFileFormat.Type.WAVE,
-                                  totallength,
-                                  format,
-                                  dataLength / format.getFrameSize());
+        long frameLength = dataLength / format.getFrameSize();
+        return new WaveFileFormat(AudioFileFormat.Type.WAVE, totallength,
+                                  format, frameLength);
     }
 }
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFloatFileReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFloatFileReader.java
index 284877d1599..2c3be1507fc 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFloatFileReader.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFloatFileReader.java
@@ -32,7 +32,6 @@ import javax.sound.sampled.AudioFileFormat;
 import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.AudioFormat.Encoding;
 import javax.sound.sampled.AudioInputStream;
-import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.UnsupportedAudioFileException;
 
 /**
@@ -43,7 +42,7 @@ import javax.sound.sampled.UnsupportedAudioFileException;
 public final class WaveFloatFileReader extends SunFileReader {
 
     @Override
-    AudioFileFormat getAudioFileFormatImpl(final InputStream stream)
+    StandardFileFormat getAudioFileFormatImpl(final InputStream stream)
             throws UnsupportedAudioFileException, IOException {
 
         RIFFReader riffiterator = new RIFFReader(stream);
@@ -88,20 +87,17 @@ public final class WaveFloatFileReader extends SunFileReader {
         AudioFormat audioformat = new AudioFormat(
                 Encoding.PCM_FLOAT, samplerate, bits, channels,
                 framesize, samplerate, false);
-        long frameLength = dataSize / audioformat.getFrameSize();
-        if (frameLength > Integer.MAX_VALUE) {
-            frameLength = AudioSystem.NOT_SPECIFIED;
-        }
-
-        return new AudioFileFormat(AudioFileFormat.Type.WAVE, audioformat,
-                                   (int) frameLength);
+        return new StandardFileFormat(AudioFileFormat.Type.WAVE, audioformat,
+                                      dataSize / audioformat.getFrameSize());
     }
 
     @Override
     public AudioInputStream getAudioInputStream(final InputStream stream)
             throws UnsupportedAudioFileException, IOException {
 
-        final AudioFileFormat format = getAudioFileFormat(stream);
+        final StandardFileFormat format = getAudioFileFormat(stream);
+        final AudioFormat af = format.getFormat();
+        final long length = format.getLongFrameLength();
         // we've got everything, the stream is supported and it is at the
         // beginning of the header, so find the data chunk again and return an
         // AudioInputStream
@@ -109,8 +105,6 @@ public final class WaveFloatFileReader extends SunFileReader {
         while (riffiterator.hasNextChunk()) {
             RIFFReader chunk = riffiterator.nextChunk();
             if (chunk.getFormat().equals("data")) {
-                final AudioFormat af = format.getFormat();
-                final long length = chunk.getSize() / af.getFrameSize();
                 return new AudioInputStream(chunk, af, length);
             }
         }
diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeAiffFiles.java b/jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeAiffFiles.java
new file mode 100644
index 00000000000..c0899484328
--- /dev/null
+++ b/jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeAiffFiles.java
@@ -0,0 +1,247 @@
+/*
+ * Copyright (c) 2016, 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 java.io.ByteArrayInputStream;
+
+import javax.sound.sampled.AudioFileFormat;
+import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.AudioSystem;
+
+/**
+ * @test
+ * @bug 6729836
+ */
+public final class RecognizeHugeAiffFiles {
+
+    /**
+     * The maximum number of sample frames per AIFF specification.
+     */
+    private static final /* unsigned int */ long MAX_UNSIGNED_INT = 0xffffffffL;
+
+    /**
+     * The supported aiff sample size in bits.
+     */
+    private static final byte[] aiffBits = {
+            1, 2, 4, 8, 11, 16, 20, 24, 27, 32
+    };
+
+    /**
+     * The list of supported sample rates.
+     */
+    private static final int[] sampleRates = {
+            8000, 11025, 16000, 22050, 32000, 37800, 44056, 44100, 47250, 48000,
+            50000, 50400, 88200, 96000, 176400, 192000, 352800, 2822400,
+            5644800, Integer.MAX_VALUE
+    };
+
+    /**
+     * The list of supported channels.
+     */
+    private static final int[] channels = {
+            1, 2, 3, 4, 5, 6, 7, 8, 9, 10
+    };
+
+    /**
+     * The list of supported number of frames.
+     * <p>
+     * The {@code MAX_UNSIGNED_INT} is a maximum.
+     */
+    private static final long[] numberOfFrames = {
+            0, 1, 2, 3, Integer.MAX_VALUE - 1, Integer.MAX_VALUE,
+            (long) Integer.MAX_VALUE + 1, MAX_UNSIGNED_INT - 1, MAX_UNSIGNED_INT
+    };
+
+    public static void main(final String[] args) throws Exception {
+        for (final byte bits : aiffBits) {
+            for (final int sampleRate : sampleRates) {
+                for (final int channel : channels) {
+                    for (final long dataSize : numberOfFrames) {
+                        testAFF(bits, sampleRate, channel, dataSize);
+                        testAIS(bits, sampleRate, channel, dataSize);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Tests the {@code AudioFileFormat} fetched from the fake header.
+     * <p>
+     * Note that the frameLength and byteLength are stored as int which means
+     * that {@code AudioFileFormat} will store the data above {@code MAX_INT} as
+     * NOT_SPECIFIED.
+     */
+    private static void testAFF(final byte bits, final int rate,
+                                final int channel, final long frameLength)
+            throws Exception {
+        final byte[] header = createHeader(bits, rate, channel, frameLength);
+        final ByteArrayInputStream fake = new ByteArrayInputStream(header);
+        final AudioFileFormat aff = AudioSystem.getAudioFileFormat(fake);
+
+        if (aff.getType() != AudioFileFormat.Type.AIFF) {
+            throw new RuntimeException("Error");
+        }
+
+        if (frameLength <= Integer.MAX_VALUE) {
+            if (aff.getFrameLength() != frameLength) {
+                System.err.println("Expected: " + frameLength);
+                System.err.println("Actual: " + aff.getFrameLength());
+                throw new RuntimeException();
+            }
+        } else {
+            if (aff.getFrameLength() != AudioSystem.NOT_SPECIFIED) {
+                System.err.println("Expected: " + AudioSystem.NOT_SPECIFIED);
+                System.err.println("Actual: " + aff.getFrameLength());
+                throw new RuntimeException();
+            }
+        }
+        validateFormat(bits, rate, channel, aff.getFormat());
+    }
+
+    /**
+     * Tests the {@code AudioInputStream} fetched from the fake header.
+     * <p>
+     * Note that the frameLength is stored as long which means that {@code
+     * AudioInputStream} must store all possible data from aiff file.
+     */
+    private static void testAIS(final byte bits, final int rate,
+                                final int channel, final long frameLength)
+            throws Exception {
+        final byte[] header = createHeader(bits, rate, channel, frameLength);
+        final ByteArrayInputStream fake = new ByteArrayInputStream(header);
+        final AudioInputStream ais = AudioSystem.getAudioInputStream(fake);
+        final AudioFormat format = ais.getFormat();
+
+        if (frameLength != ais.getFrameLength()) {
+            System.err.println("Expected: " + frameLength);
+            System.err.println("Actual: " + ais.getFrameLength());
+            throw new RuntimeException();
+        }
+        if (ais.available() < 0) {
+            System.err.println("available should be >=0: " + ais.available());
+            throw new RuntimeException();
+        }
+
+        validateFormat(bits, rate, channel, format);
+    }
+
+    /**
+     * Tests that format contains the same data as were provided to the fake
+     * stream.
+     */
+    private static void validateFormat(final byte bits, final int rate,
+                                       final int channel,
+                                       final AudioFormat format) {
+
+        if (Float.compare(format.getSampleRate(), rate) != 0) {
+            System.err.println("Expected: " + rate);
+            System.err.println("Actual: " + format.getSampleRate());
+            throw new RuntimeException();
+        }
+        if (format.getChannels() != channel) {
+            System.err.println("Expected: " + channel);
+            System.err.println("Actual: " + format.getChannels());
+            throw new RuntimeException();
+        }
+        int frameSize = ((bits + 7) / 8) * channel;
+        if (format.getFrameSize() != frameSize) {
+            System.out.println("Expected: " + frameSize);
+            System.err.println("Actual: " + format.getFrameSize());
+            throw new RuntimeException();
+        }
+    }
+
+    private static final int DOUBLE_MANTISSA_LENGTH = 52;
+    private static final int DOUBLE_EXPONENT_LENGTH = 11;
+    private static final long DOUBLE_SIGN_MASK     = 0x8000000000000000L;
+    private static final long DOUBLE_EXPONENT_MASK = 0x7FF0000000000000L;
+    private static final long DOUBLE_MANTISSA_MASK = 0x000FFFFFFFFFFFFFL;
+    private static final int DOUBLE_EXPONENT_OFFSET = 1023;
+
+    private static final int EXTENDED_EXPONENT_OFFSET = 16383;
+    private static final int EXTENDED_MANTISSA_LENGTH = 63;
+    private static final int EXTENDED_EXPONENT_LENGTH = 15;
+    private static final long EXTENDED_INTEGER_MASK = 0x8000000000000000L;
+
+    /**
+     * Creates the custom header of the AIFF file. It is expected that all
+     * passed data are supported.
+     */
+    private static byte[] createHeader(final byte bits, final int rate,
+                                       final int channel, final long frameLength) {
+        long doubleBits = Double.doubleToLongBits(rate);
+
+        long sign = (doubleBits & DOUBLE_SIGN_MASK)
+                >> (DOUBLE_EXPONENT_LENGTH + DOUBLE_MANTISSA_LENGTH);
+        long doubleExponent = (doubleBits & DOUBLE_EXPONENT_MASK)
+                >> DOUBLE_MANTISSA_LENGTH;
+        long doubleMantissa = doubleBits & DOUBLE_MANTISSA_MASK;
+
+        long extendedExponent = doubleExponent - DOUBLE_EXPONENT_OFFSET
+                + EXTENDED_EXPONENT_OFFSET;
+        long extendedMantissa = doubleMantissa
+                << (EXTENDED_MANTISSA_LENGTH - DOUBLE_MANTISSA_LENGTH);
+        long extendedSign = sign << EXTENDED_EXPONENT_LENGTH;
+        short extendedBits79To64 = (short) (extendedSign | extendedExponent);
+        long extendedBits63To0 = EXTENDED_INTEGER_MASK | extendedMantissa;
+
+        return new byte[]{
+                // AIFF_MAGIC
+                0x46, 0x4f, 0x52, 0x4d,
+                // fileLength (will use the number of frames for testing)
+                (byte) (frameLength >> 24), (byte) (frameLength >> 16),
+                (byte) (frameLength >> 8), (byte) frameLength,
+                //  form aiff
+                0x41, 0x49, 0x46, 0x46,
+                // COMM_MAGIC
+                0x43, 0x4f, 0x4d, 0x4d,
+                // comm chunk size
+                0, 0, 0, 18,
+                // channels
+                (byte) (channel >> 8),(byte) channel,
+                // numSampleFrames
+                (byte) (frameLength >> 24), (byte) (frameLength >> 16),
+                (byte) (frameLength >> 8), (byte) (frameLength),
+                // samplesize
+                (byte) (bits >> 8),(byte) (bits),
+                // samplerate
+                (byte) (extendedBits79To64 >> 8),
+                (byte) extendedBits79To64,
+                (byte) (extendedBits63To0 >> 56),
+                (byte) (extendedBits63To0 >> 48),
+                (byte) (extendedBits63To0 >> 40),
+                (byte) (extendedBits63To0 >> 32), (byte) (extendedBits63To0 >> 24),
+                (byte) (extendedBits63To0 >> 16), (byte) (extendedBits63To0 >> 8),
+                (byte) extendedBits63To0,
+                // SND_MAGIC
+                0x53, 0x53, 0x4e, 0x44,
+                // data chunk size
+                0, 0, 0, 0,
+                // dataOffset
+                0, 0, 0, 0,
+                // blocksize
+                0, 0, 0, 0,
+        };
+    }
+}
diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeAuFiles.java b/jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeAuFiles.java
new file mode 100644
index 00000000000..ba908667299
--- /dev/null
+++ b/jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeAuFiles.java
@@ -0,0 +1,232 @@
+/*
+ * Copyright (c) 2016, 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 java.io.ByteArrayInputStream;
+
+import javax.sound.sampled.AudioFileFormat;
+import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.AudioSystem;
+
+/**
+ * @test
+ * @bug 6729836
+ */
+public final class RecognizeHugeAuFiles {
+
+    /**
+     * The size of the header's data.
+     */
+    private static final byte AU_HEADER = 44;
+
+    /**
+     * This value should be used if the size in bytes is unknown.
+     */
+    private static final /* unsigned int */ long MAX_UNSIGNED_INT = 0xffffffffL;
+
+    /**
+     * The list of supported au formats and sample size in bits per format.
+     */
+    private static final byte[][] auTypeBits = {
+            {1, 8}, {2, 8}, {3, 16}, {4, 24}, {5, 32}, {6, 32}, {27, 8}
+    };
+
+    /**
+     * The list of supported sample rates(stored as unsigned int).
+     */
+    private static final int[] sampleRates = {
+            8000, 11025, 16000, 22050, 32000, 37800, 44056, 44100, 47250, 48000,
+            50000, 50400, 88200, 96000, 176400, 192000, 352800, 2822400,
+            5644800, Integer.MAX_VALUE
+    };
+
+    /**
+     * The list of supported channels (stored as unsigned int).
+     */
+    private static final int[] channels = {
+            1, 2, 3, 4, 5, 6, 7, 8, 9, 10
+    };
+
+    /**
+     * The list of supported size of data (stored as unsigned int).
+     * <p>
+     * The {@code MAX_UNSIGNED_INT} used if the size in bytes is unknown.
+     */
+    private static final long[] dataSizes = {
+            0, 1, 2, 3, Integer.MAX_VALUE - AU_HEADER, Integer.MAX_VALUE - 1,
+            Integer.MAX_VALUE, (long) Integer.MAX_VALUE + 1,
+            (long) Integer.MAX_VALUE + AU_HEADER, MAX_UNSIGNED_INT - AU_HEADER,
+            MAX_UNSIGNED_INT - 1, MAX_UNSIGNED_INT
+    };
+
+    public static void main(final String[] args) throws Exception {
+        for (final byte[] type : auTypeBits) {
+            for (final int sampleRate : sampleRates) {
+                for (final int channel : channels) {
+                    for (final long dataSize : dataSizes) {
+                        testAFF(type, sampleRate, channel, dataSize);
+                        testAIS(type, sampleRate, channel, dataSize);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Tests the {@code AudioFileFormat} fetched from the fake header.
+     * <p>
+     * Note that the frameLength and byteLength are stored as int which means
+     * that {@code AudioFileFormat} will store the data above {@code  MAX_INT}
+     * as NOT_SPECIFIED.
+     */
+    private static void testAFF(final byte[] type, final int rate,
+                                final int channel, final long size)
+            throws Exception {
+        final byte[] header = createHeader(type, rate, channel, size);
+        final ByteArrayInputStream fake = new ByteArrayInputStream(header);
+        final AudioFileFormat aff = AudioSystem.getAudioFileFormat(fake);
+        final AudioFormat format = aff.getFormat();
+
+        if (aff.getType() != AudioFileFormat.Type.AU) {
+            throw new RuntimeException("Error");
+        }
+
+        final long frameLength = size / format.getFrameSize();
+        if (size != MAX_UNSIGNED_INT && frameLength <= Integer.MAX_VALUE) {
+            if (aff.getFrameLength() != frameLength) {
+                System.err.println("Expected: " + frameLength);
+                System.err.println("Actual: " + aff.getFrameLength());
+                throw new RuntimeException();
+            }
+        } else {
+            if (aff.getFrameLength() != AudioSystem.NOT_SPECIFIED) {
+                System.err.println("Expected: " + AudioSystem.NOT_SPECIFIED);
+                System.err.println("Actual: " + aff.getFrameLength());
+                throw new RuntimeException();
+            }
+        }
+
+        final long byteLength = size + AU_HEADER;
+        if (byteLength <= Integer.MAX_VALUE) {
+            if (aff.getByteLength() != byteLength) {
+                System.err.println("Expected: " + byteLength);
+                System.err.println("Actual: " + aff.getByteLength());
+                throw new RuntimeException();
+            }
+        } else {
+            if (aff.getByteLength() != AudioSystem.NOT_SPECIFIED) {
+                System.err.println("Expected: " + AudioSystem.NOT_SPECIFIED);
+                System.err.println("Actual: " + aff.getByteLength());
+                throw new RuntimeException();
+            }
+        }
+        validateFormat(type[1], rate, channel, aff.getFormat());
+    }
+
+    /**
+     * Tests the {@code AudioInputStream} fetched from the fake header.
+     * <p>
+     * Note that the frameLength is stored as long which means
+     * that {@code AudioInputStream} must store all possible data from au file.
+     */
+    private static void testAIS(final byte[] type, final int rate,
+                                final int channel, final long size)
+            throws Exception {
+        final byte[] header = createHeader(type, rate, channel, size);
+        final ByteArrayInputStream fake = new ByteArrayInputStream(header);
+        final AudioInputStream ais = AudioSystem.getAudioInputStream(fake);
+        final AudioFormat format = ais.getFormat();
+        final long frameLength = size / format.getFrameSize();
+        if (size != MAX_UNSIGNED_INT) {
+            if (frameLength != ais.getFrameLength()) {
+                System.err.println("Expected: " + frameLength);
+                System.err.println("Actual: " + ais.getFrameLength());
+                throw new RuntimeException();
+            }
+        } else {
+            if (ais.getFrameLength() != AudioSystem.NOT_SPECIFIED) {
+                System.err.println("Expected: " + AudioSystem.NOT_SPECIFIED);
+                System.err.println("Actual: " + ais.getFrameLength());
+                throw new RuntimeException();
+            }
+        }
+        if (ais.available() < 0) {
+            System.err.println("available should be >=0: " + ais.available());
+            throw new RuntimeException();
+        }
+        validateFormat(type[1], rate, channel, format);
+    }
+
+    /**
+     * Tests that format contains the same data as were provided to the fake
+     * stream.
+     */
+    private static void validateFormat(final byte bits, final int rate,
+                                       final int channel,
+                                       final AudioFormat format) {
+
+        if (Float.compare(format.getSampleRate(), rate) != 0) {
+            System.out.println("Expected: " + rate);
+            System.out.println("Actual: " + format.getSampleRate());
+            throw new RuntimeException();
+        }
+        if (format.getChannels() != channel) {
+            System.out.println("Expected: " + channel);
+            System.out.println("Actual: " + format.getChannels());
+            throw new RuntimeException();
+        }
+        int frameSize = ((bits + 7) / 8) * channel;
+        if (format.getFrameSize() != frameSize) {
+            System.out.println("Expected: " + frameSize);
+            System.out.println("Actual: " + format.getFrameSize());
+            throw new RuntimeException();
+        }
+    }
+
+    /**
+     * Creates the custom header of the AU file. It is expected that all passed
+     * data are supported.
+     */
+    private static byte[] createHeader(final byte[] type, final int rate,
+                                       final int channel, final long size) {
+        return new byte[]{
+                // AU_SUN_MAGIC
+                0x2e, 0x73, 0x6e, 0x64,
+                // headerSize
+                0, 0, 0, AU_HEADER,
+                // dataSize
+                (byte) (size >> 24), (byte) (size >> 16), (byte) (size >> 8),
+                (byte) size,
+                // encoding
+                0, 0, 0, type[0],
+                // sampleRate
+                (byte) (rate >> 24), (byte) (rate >> 16), (byte) (rate >> 8),
+                (byte) (rate),
+                // channels
+                (byte) (channel >> 24), (byte) (channel >> 16),
+                (byte) (channel >> 8), (byte) (channel),
+                // data
+                0, 0, 0, 0, 0, 0
+        };
+    }
+}
diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeWaveExtFiles.java b/jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeWaveExtFiles.java
index 88b231d62d7..ca8d17e3e78 100644
--- a/jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeWaveExtFiles.java
+++ b/jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeWaveExtFiles.java
@@ -125,7 +125,7 @@ public final class RecognizeHugeWaveExtFiles {
      * Tests the {@code AudioInputStream} fetched from the fake header.
      * <p>
      * Note that the frameLength is stored as long which means that {@code
-     * AudioInputStream} must store all possible data from au file.
+     * AudioInputStream} must store all possible data from wave file.
      */
     private static void testAIS(final int[] type, final int rate,
                                 final int channel, final long size)
@@ -166,8 +166,9 @@ public final class RecognizeHugeWaveExtFiles {
             System.err.println("Actual: " + format.getChannels());
             throw new RuntimeException();
         }
-        if (format.getFrameSize() != ((bits + 7) / 8) * channel) {
-            System.err.println("Expected: " + (bits * channel + 1) / 8);
+        int frameSize = ((bits + 7) / 8) * channel;
+        if (format.getFrameSize() != frameSize) {
+            System.err.println("Expected: " + frameSize);
             System.err.println("Actual: " + format.getFrameSize());
             throw new RuntimeException();
         }
diff --git a/jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeWaveFloatFiles.java b/jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeWaveFiles.java
similarity index 91%
rename from jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeWaveFloatFiles.java
rename to jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeWaveFiles.java
index e36a7e2b180..191290a128e 100644
--- a/jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeWaveFloatFiles.java
+++ b/jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeWaveFiles.java
@@ -30,9 +30,9 @@ import javax.sound.sampled.AudioSystem;
 
 /**
  * @test
- * @bug 8132782
+ * @bug 8132782 6729836
  */
-public final class RecognizeHugeWaveFloatFiles {
+public final class RecognizeHugeWaveFiles {
 
     /**
      * The maximum size in bytes per WAVE specification.
@@ -43,7 +43,17 @@ public final class RecognizeHugeWaveFloatFiles {
      * The  supported wave pcm_float format and sample size in bits.
      */
     private static final byte[][] waveTypeBits = {
-            {0x0003/*WAVE_FORMAT_IEEE_FLOAT*/, 32}
+            {0x0001/*WAVE_FORMAT_PCM*/,1},
+            {0x0001/*WAVE_FORMAT_PCM*/,2},
+            {0x0001/*WAVE_FORMAT_PCM*/,4},
+            {0x0001/*WAVE_FORMAT_PCM*/,8},
+            {0x0001/*WAVE_FORMAT_PCM*/,16},
+            {0x0001/*WAVE_FORMAT_PCM*/,20},
+            {0x0001/*WAVE_FORMAT_PCM*/,24},
+            {0x0001/*WAVE_FORMAT_PCM*/,32},
+            {0x0003/*WAVE_FORMAT_IEEE_FLOAT*/, 32},
+            {0x0006/*WAVE_FORMAT_ALAW*/, 8},
+            {0x0007/*WAVE_FORMAT_MULAW*/, 8}
     };
 
     /**
@@ -125,7 +135,7 @@ public final class RecognizeHugeWaveFloatFiles {
      * Tests the {@code AudioInputStream} fetched from the fake header.
      * <p>
      * Note that the frameLength is stored as long which means that {@code
-     * AudioInputStream} must store all possible data from au file.
+     * AudioInputStream} must store all possible data from wave file.
      */
     private static void testAIS(final byte[] type, final int rate,
                                 final int channel, final long size)
@@ -166,8 +176,9 @@ public final class RecognizeHugeWaveFloatFiles {
             System.err.println("Actual: " + format.getChannels());
             throw new RuntimeException();
         }
-        if (format.getFrameSize() != ((bits + 7) / 8) * channel) {
-            System.err.println("Expected: " + (bits * channel + 1) / 8);
+        int frameSize = ((bits + 7) / 8) * channel;
+        if (format.getFrameSize() != frameSize) {
+            System.err.println("Expected: " + frameSize);
             System.err.println("Actual: " + format.getFrameSize());
             throw new RuntimeException();
         }

From 08cdde3f7c9f1fc8dab50fd236853fdfc14db56a Mon Sep 17 00:00:00 2001
From: Roland Schatz <rschatz@openjdk.org>
Date: Wed, 4 May 2016 12:06:51 +0200
Subject: [PATCH 040/228] 8156025: [JVMCI] make
 HotSpotResolvedObjectTypeImpl.createField non-public

Reviewed-by: twisti
---
 .../src/jdk/vm/ci/hotspot/HotSpotResolvedObjectType.java | 3 ---
 .../jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java | 9 +++++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectType.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectType.java
index 3501387061b..b207f9c32de 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectType.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectType.java
@@ -28,7 +28,6 @@ import jdk.vm.ci.meta.ConstantPool;
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
-import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
@@ -109,6 +108,4 @@ public interface HotSpotResolvedObjectType extends ResolvedJavaType {
     HotSpotResolvedObjectType getEnclosingType();
 
     ResolvedJavaMethod getClassInitializer();
-
-    ResolvedJavaField createField(String name, JavaType type, long offset, int modifiers);
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
index a44404ffc56..51164cecc90 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
@@ -469,7 +469,7 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
         return result;
     }
 
-    public synchronized HotSpotResolvedJavaField createField(String fieldName, JavaType type, long offset, int rawFlags) {
+    synchronized HotSpotResolvedJavaField createField(String fieldName, JavaType type, long offset, int rawFlags) {
         HotSpotResolvedJavaField result = null;
 
         final int flags = rawFlags & ModifiersProvider.jvmFieldModifiers();
@@ -489,7 +489,12 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
             fieldCache.put(id, result);
         } else {
             assert result.getName().equals(fieldName);
-            // assert result.getType().equals(type);
+            /*
+             * Comparing the types directly is too strict, because the type in the cache could be
+             * resolved while the incoming type is unresolved. The name comparison is sufficient
+             * because the type will always be resolved in the context of the holder.
+             */
+            assert result.getType().getName().equals(type.getName());
             assert result.offset() == offset;
             assert result.getModifiers() == flags;
         }

From 4f53885343025864dedb15af3c22156242809e17 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 4 May 2016 17:17:28 +0300
Subject: [PATCH 041/228] 8155739: [TESTBUG] VarHandles/Unsafe tests for
 weakCAS should allow spurious failures

Reviewed-by: psandoz, vlivanov, simonis
---
 .../invoke/VarHandles/VarHandleBaseTest.java  |  3 +-
 .../VarHandleTestAccessBoolean.java           |  1 -
 .../VarHandles/VarHandleTestAccessByte.java   |  1 -
 .../VarHandles/VarHandleTestAccessChar.java   |  1 -
 .../VarHandles/VarHandleTestAccessDouble.java |  1 -
 .../VarHandles/VarHandleTestAccessFloat.java  |  1 -
 .../VarHandles/VarHandleTestAccessInt.java    | 64 +++++++++++++------
 .../VarHandles/VarHandleTestAccessLong.java   | 64 +++++++++++++------
 .../VarHandles/VarHandleTestAccessShort.java  |  1 -
 .../VarHandles/VarHandleTestAccessString.java | 64 +++++++++++++------
 .../VarHandleTestByteArrayAsChar.java         |  1 -
 .../VarHandleTestByteArrayAsDouble.java       | 43 +++++++++----
 .../VarHandleTestByteArrayAsFloat.java        | 43 +++++++++----
 .../VarHandleTestByteArrayAsInt.java          | 43 +++++++++----
 .../VarHandleTestByteArrayAsLong.java         | 43 +++++++++----
 .../VarHandleTestByteArrayAsShort.java        |  1 -
 .../VarHandleTestMethodHandleAccessInt.java   | 63 ++++++++++++------
 .../VarHandleTestMethodHandleAccessLong.java  | 63 ++++++++++++------
 ...VarHandleTestMethodHandleAccessString.java | 63 ++++++++++++------
 .../X-VarHandleTestAccess.java.template       | 63 ++++++++++++------
 ...X-VarHandleTestByteArrayView.java.template | 42 ++++++++----
 ...HandleTestMethodHandleAccess.java.template | 63 ++++++++++++------
 22 files changed, 512 insertions(+), 220 deletions(-)

diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleBaseTest.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleBaseTest.java
index 241d821c00a..ee6205d1ed7 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleBaseTest.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleBaseTest.java
@@ -40,6 +40,7 @@ import static org.testng.Assert.*;
 
 abstract class VarHandleBaseTest {
     static final int ITERS = Integer.getInteger("iters", 1);
+    static final int WEAK_ATTEMPTS = Integer.getInteger("weakAttempts", 10);
 
     interface ThrowingRunnable {
         void run() throws Throwable;
@@ -474,4 +475,4 @@ abstract class VarHandleBaseTest {
             assertEquals(mt.parameterType(mt.parameterCount() - 1), vh.varType());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java
index 5590984e493..b22fc3e182a 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java
@@ -106,7 +106,6 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_ACQUIRE));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
-        assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_SET));
 
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_ADD));
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java
index f9c9d4fc31e..088a519e920 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java
@@ -106,7 +106,6 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_ACQUIRE));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
-        assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_SET));
 
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_ADD));
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java
index bd1174efc5a..18ff6542615 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java
@@ -106,7 +106,6 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_ACQUIRE));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
-        assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_SET));
 
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_ADD));
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java
index d8732d239b4..36c84e2f753 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java
@@ -106,7 +106,6 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_ACQUIRE));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
-        assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_SET));
 
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_ADD));
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java
index 9976102d027..2ea2d9617be 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java
@@ -106,7 +106,6 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_ACQUIRE));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
-        assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_SET));
 
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_ADD));
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java
index c78e5cb7199..25683af1097 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java
@@ -106,7 +106,6 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_ACQUIRE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
-        assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_SET));
 
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_ADD));
@@ -402,22 +401,31 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
         }
 
         {
-            boolean r = vh.weakCompareAndSet(recv, 1, 2);
-            assertEquals(r, true, "weakCompareAndSet int");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSet(recv, 1, 2);
+            }
+            assertEquals(success, true, "weakCompareAndSet int");
             int x = (int) vh.get(recv);
             assertEquals(x, 2, "weakCompareAndSet int value");
         }
 
         {
-            boolean r = vh.weakCompareAndSetAcquire(recv, 2, 1);
-            assertEquals(r, true, "weakCompareAndSetAcquire int");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSetAcquire(recv, 2, 1);
+            }
+            assertEquals(success, true, "weakCompareAndSetAcquire int");
             int x = (int) vh.get(recv);
             assertEquals(x, 1, "weakCompareAndSetAcquire int");
         }
 
         {
-            boolean r = vh.weakCompareAndSetRelease(recv, 1, 2);
-            assertEquals(r, true, "weakCompareAndSetRelease int");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSetRelease(recv, 1, 2);
+            }
+            assertEquals(success, true, "weakCompareAndSetRelease int");
             int x = (int) vh.get(recv);
             assertEquals(x, 2, "weakCompareAndSetRelease int");
         }
@@ -536,22 +544,31 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
         }
 
         {
-            boolean r = (boolean) vh.weakCompareAndSet(1, 2);
-            assertEquals(r, true, "weakCompareAndSet int");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSet(1, 2);
+            }
+            assertEquals(success, true, "weakCompareAndSet int");
             int x = (int) vh.get();
             assertEquals(x, 2, "weakCompareAndSet int value");
         }
 
         {
-            boolean r = (boolean) vh.weakCompareAndSetAcquire(2, 1);
-            assertEquals(r, true, "weakCompareAndSetAcquire int");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSetAcquire(2, 1);
+            }
+            assertEquals(success, true, "weakCompareAndSetAcquire int");
             int x = (int) vh.get();
             assertEquals(x, 1, "weakCompareAndSetAcquire int");
         }
 
         {
-            boolean r = (boolean) vh.weakCompareAndSetRelease( 1, 2);
-            assertEquals(r, true, "weakCompareAndSetRelease int");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSetRelease(1, 2);
+            }
+            assertEquals(success, true, "weakCompareAndSetRelease int");
             int x = (int) vh.get();
             assertEquals(x, 2, "weakCompareAndSetRelease int");
         }
@@ -673,22 +690,31 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
             }
 
             {
-                boolean r = vh.weakCompareAndSet(array, i, 1, 2);
-                assertEquals(r, true, "weakCompareAndSet int");
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = vh.weakCompareAndSet(array, i, 1, 2);
+                }
+                assertEquals(success, true, "weakCompareAndSet int");
                 int x = (int) vh.get(array, i);
                 assertEquals(x, 2, "weakCompareAndSet int value");
             }
 
             {
-                boolean r = vh.weakCompareAndSetAcquire(array, i, 2, 1);
-                assertEquals(r, true, "weakCompareAndSetAcquire int");
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = vh.weakCompareAndSetAcquire(array, i, 2, 1);
+                }
+                assertEquals(success, true, "weakCompareAndSetAcquire int");
                 int x = (int) vh.get(array, i);
                 assertEquals(x, 1, "weakCompareAndSetAcquire int");
             }
 
             {
-                boolean r = vh.weakCompareAndSetRelease(array, i, 1, 2);
-                assertEquals(r, true, "weakCompareAndSetRelease int");
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = vh.weakCompareAndSetRelease(array, i, 1, 2);
+                }
+                assertEquals(success, true, "weakCompareAndSetRelease int");
                 int x = (int) vh.get(array, i);
                 assertEquals(x, 2, "weakCompareAndSetRelease int");
             }
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java
index f82ee67960e..2b44b4793f7 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java
@@ -106,7 +106,6 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_ACQUIRE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
-        assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_SET));
 
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_ADD));
@@ -402,22 +401,31 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
         }
 
         {
-            boolean r = vh.weakCompareAndSet(recv, 1L, 2L);
-            assertEquals(r, true, "weakCompareAndSet long");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSet(recv, 1L, 2L);
+            }
+            assertEquals(success, true, "weakCompareAndSet long");
             long x = (long) vh.get(recv);
             assertEquals(x, 2L, "weakCompareAndSet long value");
         }
 
         {
-            boolean r = vh.weakCompareAndSetAcquire(recv, 2L, 1L);
-            assertEquals(r, true, "weakCompareAndSetAcquire long");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSetAcquire(recv, 2L, 1L);
+            }
+            assertEquals(success, true, "weakCompareAndSetAcquire long");
             long x = (long) vh.get(recv);
             assertEquals(x, 1L, "weakCompareAndSetAcquire long");
         }
 
         {
-            boolean r = vh.weakCompareAndSetRelease(recv, 1L, 2L);
-            assertEquals(r, true, "weakCompareAndSetRelease long");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSetRelease(recv, 1L, 2L);
+            }
+            assertEquals(success, true, "weakCompareAndSetRelease long");
             long x = (long) vh.get(recv);
             assertEquals(x, 2L, "weakCompareAndSetRelease long");
         }
@@ -536,22 +544,31 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
         }
 
         {
-            boolean r = (boolean) vh.weakCompareAndSet(1L, 2L);
-            assertEquals(r, true, "weakCompareAndSet long");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSet(1L, 2L);
+            }
+            assertEquals(success, true, "weakCompareAndSet long");
             long x = (long) vh.get();
             assertEquals(x, 2L, "weakCompareAndSet long value");
         }
 
         {
-            boolean r = (boolean) vh.weakCompareAndSetAcquire(2L, 1L);
-            assertEquals(r, true, "weakCompareAndSetAcquire long");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSetAcquire(2L, 1L);
+            }
+            assertEquals(success, true, "weakCompareAndSetAcquire long");
             long x = (long) vh.get();
             assertEquals(x, 1L, "weakCompareAndSetAcquire long");
         }
 
         {
-            boolean r = (boolean) vh.weakCompareAndSetRelease( 1L, 2L);
-            assertEquals(r, true, "weakCompareAndSetRelease long");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSetRelease(1L, 2L);
+            }
+            assertEquals(success, true, "weakCompareAndSetRelease long");
             long x = (long) vh.get();
             assertEquals(x, 2L, "weakCompareAndSetRelease long");
         }
@@ -673,22 +690,31 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
             }
 
             {
-                boolean r = vh.weakCompareAndSet(array, i, 1L, 2L);
-                assertEquals(r, true, "weakCompareAndSet long");
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = vh.weakCompareAndSet(array, i, 1L, 2L);
+                }
+                assertEquals(success, true, "weakCompareAndSet long");
                 long x = (long) vh.get(array, i);
                 assertEquals(x, 2L, "weakCompareAndSet long value");
             }
 
             {
-                boolean r = vh.weakCompareAndSetAcquire(array, i, 2L, 1L);
-                assertEquals(r, true, "weakCompareAndSetAcquire long");
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = vh.weakCompareAndSetAcquire(array, i, 2L, 1L);
+                }
+                assertEquals(success, true, "weakCompareAndSetAcquire long");
                 long x = (long) vh.get(array, i);
                 assertEquals(x, 1L, "weakCompareAndSetAcquire long");
             }
 
             {
-                boolean r = vh.weakCompareAndSetRelease(array, i, 1L, 2L);
-                assertEquals(r, true, "weakCompareAndSetRelease long");
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = vh.weakCompareAndSetRelease(array, i, 1L, 2L);
+                }
+                assertEquals(success, true, "weakCompareAndSetRelease long");
                 long x = (long) vh.get(array, i);
                 assertEquals(x, 2L, "weakCompareAndSetRelease long");
             }
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java
index d235e03a7bf..4ff25cc4a5f 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java
@@ -106,7 +106,6 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_ACQUIRE));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
-        assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_SET));
 
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_ADD));
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessString.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessString.java
index 61e3690447c..1e876059a69 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessString.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessString.java
@@ -106,7 +106,6 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_ACQUIRE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
-        assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_SET));
 
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_ADD));
@@ -416,22 +415,31 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
         }
 
         {
-            boolean r = vh.weakCompareAndSet(recv, "foo", "bar");
-            assertEquals(r, true, "weakCompareAndSet String");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSet(recv, "foo", "bar");
+            }
+            assertEquals(success, true, "weakCompareAndSet String");
             String x = (String) vh.get(recv);
             assertEquals(x, "bar", "weakCompareAndSet String value");
         }
 
         {
-            boolean r = vh.weakCompareAndSetAcquire(recv, "bar", "foo");
-            assertEquals(r, true, "weakCompareAndSetAcquire String");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSetAcquire(recv, "bar", "foo");
+            }
+            assertEquals(success, true, "weakCompareAndSetAcquire String");
             String x = (String) vh.get(recv);
             assertEquals(x, "foo", "weakCompareAndSetAcquire String");
         }
 
         {
-            boolean r = vh.weakCompareAndSetRelease(recv, "foo", "bar");
-            assertEquals(r, true, "weakCompareAndSetRelease String");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSetRelease(recv, "foo", "bar");
+            }
+            assertEquals(success, true, "weakCompareAndSetRelease String");
             String x = (String) vh.get(recv);
             assertEquals(x, "bar", "weakCompareAndSetRelease String");
         }
@@ -548,22 +556,31 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
         }
 
         {
-            boolean r = (boolean) vh.weakCompareAndSet("foo", "bar");
-            assertEquals(r, true, "weakCompareAndSet String");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSet("foo", "bar");
+            }
+            assertEquals(success, true, "weakCompareAndSet String");
             String x = (String) vh.get();
             assertEquals(x, "bar", "weakCompareAndSet String value");
         }
 
         {
-            boolean r = (boolean) vh.weakCompareAndSetAcquire("bar", "foo");
-            assertEquals(r, true, "weakCompareAndSetAcquire String");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSetAcquire("bar", "foo");
+            }
+            assertEquals(success, true, "weakCompareAndSetAcquire String");
             String x = (String) vh.get();
             assertEquals(x, "foo", "weakCompareAndSetAcquire String");
         }
 
         {
-            boolean r = (boolean) vh.weakCompareAndSetRelease( "foo", "bar");
-            assertEquals(r, true, "weakCompareAndSetRelease String");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSetRelease("foo", "bar");
+            }
+            assertEquals(success, true, "weakCompareAndSetRelease String");
             String x = (String) vh.get();
             assertEquals(x, "bar", "weakCompareAndSetRelease String");
         }
@@ -683,22 +700,31 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
             }
 
             {
-                boolean r = vh.weakCompareAndSet(array, i, "foo", "bar");
-                assertEquals(r, true, "weakCompareAndSet String");
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = vh.weakCompareAndSet(array, i, "foo", "bar");
+                }
+                assertEquals(success, true, "weakCompareAndSet String");
                 String x = (String) vh.get(array, i);
                 assertEquals(x, "bar", "weakCompareAndSet String value");
             }
 
             {
-                boolean r = vh.weakCompareAndSetAcquire(array, i, "bar", "foo");
-                assertEquals(r, true, "weakCompareAndSetAcquire String");
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = vh.weakCompareAndSetAcquire(array, i, "bar", "foo");
+                }
+                assertEquals(success, true, "weakCompareAndSetAcquire String");
                 String x = (String) vh.get(array, i);
                 assertEquals(x, "foo", "weakCompareAndSetAcquire String");
             }
 
             {
-                boolean r = vh.weakCompareAndSetRelease(array, i, "foo", "bar");
-                assertEquals(r, true, "weakCompareAndSetRelease String");
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = vh.weakCompareAndSetRelease(array, i, "foo", "bar");
+                }
+                assertEquals(success, true, "weakCompareAndSetRelease String");
                 String x = (String) vh.get(array, i);
                 assertEquals(x, "bar", "weakCompareAndSetRelease String");
             }
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java
index e6941f5fa3c..842a9f55327 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java
@@ -93,7 +93,6 @@ public class VarHandleTestByteArrayAsChar extends VarHandleBaseByteArrayTest {
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_ACQUIRE));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
-        assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_SET));
 
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_ADD));
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java
index ec4b843b2aa..57635e95474 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java
@@ -93,7 +93,6 @@ public class VarHandleTestByteArrayAsDouble extends VarHandleBaseByteArrayTest {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_ACQUIRE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
-        assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_SET));
 
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_ADD));
@@ -678,22 +677,31 @@ public class VarHandleTestByteArrayAsDouble extends VarHandleBaseByteArrayTest {
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSet(array, i, VALUE_1, VALUE_2);
-                    assertEquals(r, true, "weakCompareAndSet double");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSet(array, i, VALUE_1, VALUE_2);
+                    }
+                    assertEquals(success, true, "weakCompareAndSet double");
                     double x = (double) vh.get(array, i);
                     assertEquals(x, VALUE_2, "weakCompareAndSet double value");
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSetAcquire(array, i, VALUE_2, VALUE_1);
-                    assertEquals(r, true, "weakCompareAndSetAcquire double");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSetAcquire(array, i, VALUE_2, VALUE_1);
+                    }
+                    assertEquals(success, true, "weakCompareAndSetAcquire double");
                     double x = (double) vh.get(array, i);
                     assertEquals(x, VALUE_1, "weakCompareAndSetAcquire double");
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSetRelease(array, i, VALUE_1, VALUE_2);
-                    assertEquals(r, true, "weakCompareAndSetRelease double");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSetRelease(array, i, VALUE_1, VALUE_2);
+                    }
+                    assertEquals(success, true, "weakCompareAndSetRelease double");
                     double x = (double) vh.get(array, i);
                     assertEquals(x, VALUE_2, "weakCompareAndSetRelease double");
                 }
@@ -811,22 +819,31 @@ public class VarHandleTestByteArrayAsDouble extends VarHandleBaseByteArrayTest {
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSet(array, i, VALUE_1, VALUE_2);
-                    assertEquals(r, true, "weakCompareAndSet double");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSet(array, i, VALUE_1, VALUE_2);
+                    }
+                    assertEquals(success, true, "weakCompareAndSet double");
                     double x = (double) vh.get(array, i);
                     assertEquals(x, VALUE_2, "weakCompareAndSet double value");
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSetAcquire(array, i, VALUE_2, VALUE_1);
-                    assertEquals(r, true, "weakCompareAndSetAcquire double");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSetAcquire(array, i, VALUE_2, VALUE_1);
+                    }
+                    assertEquals(success, true, "weakCompareAndSetAcquire double");
                     double x = (double) vh.get(array, i);
                     assertEquals(x, VALUE_1, "weakCompareAndSetAcquire double");
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSetRelease(array, i, VALUE_1, VALUE_2);
-                    assertEquals(r, true, "weakCompareAndSetRelease double");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSetRelease(array, i, VALUE_1, VALUE_2);
+                    }
+                    assertEquals(success, true, "weakCompareAndSetRelease double");
                     double x = (double) vh.get(array, i);
                     assertEquals(x, VALUE_2, "weakCompareAndSetRelease double");
                 }
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java
index 57d37cbe523..23d5072e274 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java
@@ -93,7 +93,6 @@ public class VarHandleTestByteArrayAsFloat extends VarHandleBaseByteArrayTest {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_ACQUIRE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
-        assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_SET));
 
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_ADD));
@@ -678,22 +677,31 @@ public class VarHandleTestByteArrayAsFloat extends VarHandleBaseByteArrayTest {
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSet(array, i, VALUE_1, VALUE_2);
-                    assertEquals(r, true, "weakCompareAndSet float");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSet(array, i, VALUE_1, VALUE_2);
+                    }
+                    assertEquals(success, true, "weakCompareAndSet float");
                     float x = (float) vh.get(array, i);
                     assertEquals(x, VALUE_2, "weakCompareAndSet float value");
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSetAcquire(array, i, VALUE_2, VALUE_1);
-                    assertEquals(r, true, "weakCompareAndSetAcquire float");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSetAcquire(array, i, VALUE_2, VALUE_1);
+                    }
+                    assertEquals(success, true, "weakCompareAndSetAcquire float");
                     float x = (float) vh.get(array, i);
                     assertEquals(x, VALUE_1, "weakCompareAndSetAcquire float");
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSetRelease(array, i, VALUE_1, VALUE_2);
-                    assertEquals(r, true, "weakCompareAndSetRelease float");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSetRelease(array, i, VALUE_1, VALUE_2);
+                    }
+                    assertEquals(success, true, "weakCompareAndSetRelease float");
                     float x = (float) vh.get(array, i);
                     assertEquals(x, VALUE_2, "weakCompareAndSetRelease float");
                 }
@@ -811,22 +819,31 @@ public class VarHandleTestByteArrayAsFloat extends VarHandleBaseByteArrayTest {
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSet(array, i, VALUE_1, VALUE_2);
-                    assertEquals(r, true, "weakCompareAndSet float");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSet(array, i, VALUE_1, VALUE_2);
+                    }
+                    assertEquals(success, true, "weakCompareAndSet float");
                     float x = (float) vh.get(array, i);
                     assertEquals(x, VALUE_2, "weakCompareAndSet float value");
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSetAcquire(array, i, VALUE_2, VALUE_1);
-                    assertEquals(r, true, "weakCompareAndSetAcquire float");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSetAcquire(array, i, VALUE_2, VALUE_1);
+                    }
+                    assertEquals(success, true, "weakCompareAndSetAcquire float");
                     float x = (float) vh.get(array, i);
                     assertEquals(x, VALUE_1, "weakCompareAndSetAcquire float");
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSetRelease(array, i, VALUE_1, VALUE_2);
-                    assertEquals(r, true, "weakCompareAndSetRelease float");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSetRelease(array, i, VALUE_1, VALUE_2);
+                    }
+                    assertEquals(success, true, "weakCompareAndSetRelease float");
                     float x = (float) vh.get(array, i);
                     assertEquals(x, VALUE_2, "weakCompareAndSetRelease float");
                 }
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java
index ae66477d3b6..91eee4f4775 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java
@@ -93,7 +93,6 @@ public class VarHandleTestByteArrayAsInt extends VarHandleBaseByteArrayTest {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_ACQUIRE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
-        assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_SET));
 
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_ADD));
@@ -692,22 +691,31 @@ public class VarHandleTestByteArrayAsInt extends VarHandleBaseByteArrayTest {
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSet(array, i, VALUE_1, VALUE_2);
-                    assertEquals(r, true, "weakCompareAndSet int");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSet(array, i, VALUE_1, VALUE_2);
+                    }
+                    assertEquals(success, true, "weakCompareAndSet int");
                     int x = (int) vh.get(array, i);
                     assertEquals(x, VALUE_2, "weakCompareAndSet int value");
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSetAcquire(array, i, VALUE_2, VALUE_1);
-                    assertEquals(r, true, "weakCompareAndSetAcquire int");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSetAcquire(array, i, VALUE_2, VALUE_1);
+                    }
+                    assertEquals(success, true, "weakCompareAndSetAcquire int");
                     int x = (int) vh.get(array, i);
                     assertEquals(x, VALUE_1, "weakCompareAndSetAcquire int");
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSetRelease(array, i, VALUE_1, VALUE_2);
-                    assertEquals(r, true, "weakCompareAndSetRelease int");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSetRelease(array, i, VALUE_1, VALUE_2);
+                    }
+                    assertEquals(success, true, "weakCompareAndSetRelease int");
                     int x = (int) vh.get(array, i);
                     assertEquals(x, VALUE_2, "weakCompareAndSetRelease int");
                 }
@@ -834,22 +842,31 @@ public class VarHandleTestByteArrayAsInt extends VarHandleBaseByteArrayTest {
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSet(array, i, VALUE_1, VALUE_2);
-                    assertEquals(r, true, "weakCompareAndSet int");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSet(array, i, VALUE_1, VALUE_2);
+                    }
+                    assertEquals(success, true, "weakCompareAndSet int");
                     int x = (int) vh.get(array, i);
                     assertEquals(x, VALUE_2, "weakCompareAndSet int value");
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSetAcquire(array, i, VALUE_2, VALUE_1);
-                    assertEquals(r, true, "weakCompareAndSetAcquire int");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSetAcquire(array, i, VALUE_2, VALUE_1);
+                    }
+                    assertEquals(success, true, "weakCompareAndSetAcquire int");
                     int x = (int) vh.get(array, i);
                     assertEquals(x, VALUE_1, "weakCompareAndSetAcquire int");
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSetRelease(array, i, VALUE_1, VALUE_2);
-                    assertEquals(r, true, "weakCompareAndSetRelease int");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSetRelease(array, i, VALUE_1, VALUE_2);
+                    }
+                    assertEquals(success, true, "weakCompareAndSetRelease int");
                     int x = (int) vh.get(array, i);
                     assertEquals(x, VALUE_2, "weakCompareAndSetRelease int");
                 }
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java
index ac08db2af5c..8adaf2b3428 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java
@@ -93,7 +93,6 @@ public class VarHandleTestByteArrayAsLong extends VarHandleBaseByteArrayTest {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_ACQUIRE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
-        assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_SET));
 
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_ADD));
@@ -692,22 +691,31 @@ public class VarHandleTestByteArrayAsLong extends VarHandleBaseByteArrayTest {
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSet(array, i, VALUE_1, VALUE_2);
-                    assertEquals(r, true, "weakCompareAndSet long");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSet(array, i, VALUE_1, VALUE_2);
+                    }
+                    assertEquals(success, true, "weakCompareAndSet long");
                     long x = (long) vh.get(array, i);
                     assertEquals(x, VALUE_2, "weakCompareAndSet long value");
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSetAcquire(array, i, VALUE_2, VALUE_1);
-                    assertEquals(r, true, "weakCompareAndSetAcquire long");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSetAcquire(array, i, VALUE_2, VALUE_1);
+                    }
+                    assertEquals(success, true, "weakCompareAndSetAcquire long");
                     long x = (long) vh.get(array, i);
                     assertEquals(x, VALUE_1, "weakCompareAndSetAcquire long");
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSetRelease(array, i, VALUE_1, VALUE_2);
-                    assertEquals(r, true, "weakCompareAndSetRelease long");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSetRelease(array, i, VALUE_1, VALUE_2);
+                    }
+                    assertEquals(success, true, "weakCompareAndSetRelease long");
                     long x = (long) vh.get(array, i);
                     assertEquals(x, VALUE_2, "weakCompareAndSetRelease long");
                 }
@@ -834,22 +842,31 @@ public class VarHandleTestByteArrayAsLong extends VarHandleBaseByteArrayTest {
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSet(array, i, VALUE_1, VALUE_2);
-                    assertEquals(r, true, "weakCompareAndSet long");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSet(array, i, VALUE_1, VALUE_2);
+                    }
+                    assertEquals(success, true, "weakCompareAndSet long");
                     long x = (long) vh.get(array, i);
                     assertEquals(x, VALUE_2, "weakCompareAndSet long value");
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSetAcquire(array, i, VALUE_2, VALUE_1);
-                    assertEquals(r, true, "weakCompareAndSetAcquire long");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSetAcquire(array, i, VALUE_2, VALUE_1);
+                    }
+                    assertEquals(success, true, "weakCompareAndSetAcquire long");
                     long x = (long) vh.get(array, i);
                     assertEquals(x, VALUE_1, "weakCompareAndSetAcquire long");
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSetRelease(array, i, VALUE_1, VALUE_2);
-                    assertEquals(r, true, "weakCompareAndSetRelease long");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSetRelease(array, i, VALUE_1, VALUE_2);
+                    }
+                    assertEquals(success, true, "weakCompareAndSetRelease long");
                     long x = (long) vh.get(array, i);
                     assertEquals(x, VALUE_2, "weakCompareAndSetRelease long");
                 }
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java
index 9742fbd2522..f554fb35058 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java
@@ -93,7 +93,6 @@ public class VarHandleTestByteArrayAsShort extends VarHandleBaseByteArrayTest {
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_ACQUIRE));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
-        assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_SET));
 
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_ADD));
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java
index 4e8de0c3bc8..4985136f2fd 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java
@@ -208,22 +208,31 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
         }
 
         {
-            boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(recv, 1, 2);
-            assertEquals(r, true, "weakCompareAndSet int");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(recv, 1, 2);
+            }
+            assertEquals(success, true, "weakCompareAndSet int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
             assertEquals(x, 2, "weakCompareAndSet int value");
         }
 
         {
-            boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(recv, 2, 1);
-            assertEquals(r, true, "weakCompareAndSetAcquire int");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(recv, 2, 1);
+            }
+            assertEquals(success, true, "weakCompareAndSetAcquire int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
             assertEquals(x, 1, "weakCompareAndSetAcquire int");
         }
 
         {
-            boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(recv, 1, 2);
-            assertEquals(r, true, "weakCompareAndSetRelease int");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(recv, 1, 2);
+            }
+            assertEquals(success, true, "weakCompareAndSetRelease int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
             assertEquals(x, 2, "weakCompareAndSetRelease int");
         }
@@ -342,22 +351,31 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
         }
 
         {
-            boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(1, 2);
-            assertEquals(r, true, "weakCompareAndSet int");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(1, 2);
+            }
+            assertEquals(success, true, "weakCompareAndSet int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
             assertEquals(x, 2, "weakCompareAndSet int value");
         }
 
         {
-            boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(2, 1);
-            assertEquals(r, true, "weakCompareAndSetAcquire int");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(2, 1);
+            }
+            assertEquals(success, true, "weakCompareAndSetAcquire int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
             assertEquals(x, 1, "weakCompareAndSetAcquire int");
         }
 
         {
-            boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact( 1, 2);
-            assertEquals(r, true, "weakCompareAndSetRelease int");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(1, 2);
+            }
+            assertEquals(success, true, "weakCompareAndSetRelease int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
             assertEquals(x, 2, "weakCompareAndSetRelease int");
         }
@@ -479,22 +497,31 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             }
 
             {
-                boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(array, i, 1, 2);
-                assertEquals(r, true, "weakCompareAndSet int");
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(array, i, 1, 2);
+                }
+                assertEquals(success, true, "weakCompareAndSet int");
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
                 assertEquals(x, 2, "weakCompareAndSet int value");
             }
 
             {
-                boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, 2, 1);
-                assertEquals(r, true, "weakCompareAndSetAcquire int");
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, 2, 1);
+                }
+                assertEquals(success, true, "weakCompareAndSetAcquire int");
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
                 assertEquals(x, 1, "weakCompareAndSetAcquire int");
             }
 
             {
-                boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(array, i, 1, 2);
-                assertEquals(r, true, "weakCompareAndSetRelease int");
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(array, i, 1, 2);
+                }
+                assertEquals(success, true, "weakCompareAndSetRelease int");
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
                 assertEquals(x, 2, "weakCompareAndSetRelease int");
             }
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java
index 05efd70079b..59a3941c4db 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java
@@ -208,22 +208,31 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
         }
 
         {
-            boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(recv, 1L, 2L);
-            assertEquals(r, true, "weakCompareAndSet long");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(recv, 1L, 2L);
+            }
+            assertEquals(success, true, "weakCompareAndSet long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
             assertEquals(x, 2L, "weakCompareAndSet long value");
         }
 
         {
-            boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(recv, 2L, 1L);
-            assertEquals(r, true, "weakCompareAndSetAcquire long");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(recv, 2L, 1L);
+            }
+            assertEquals(success, true, "weakCompareAndSetAcquire long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
             assertEquals(x, 1L, "weakCompareAndSetAcquire long");
         }
 
         {
-            boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(recv, 1L, 2L);
-            assertEquals(r, true, "weakCompareAndSetRelease long");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(recv, 1L, 2L);
+            }
+            assertEquals(success, true, "weakCompareAndSetRelease long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
             assertEquals(x, 2L, "weakCompareAndSetRelease long");
         }
@@ -342,22 +351,31 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
         }
 
         {
-            boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(1L, 2L);
-            assertEquals(r, true, "weakCompareAndSet long");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(1L, 2L);
+            }
+            assertEquals(success, true, "weakCompareAndSet long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
             assertEquals(x, 2L, "weakCompareAndSet long value");
         }
 
         {
-            boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(2L, 1L);
-            assertEquals(r, true, "weakCompareAndSetAcquire long");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(2L, 1L);
+            }
+            assertEquals(success, true, "weakCompareAndSetAcquire long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
             assertEquals(x, 1L, "weakCompareAndSetAcquire long");
         }
 
         {
-            boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact( 1L, 2L);
-            assertEquals(r, true, "weakCompareAndSetRelease long");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(1L, 2L);
+            }
+            assertEquals(success, true, "weakCompareAndSetRelease long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
             assertEquals(x, 2L, "weakCompareAndSetRelease long");
         }
@@ -479,22 +497,31 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             }
 
             {
-                boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(array, i, 1L, 2L);
-                assertEquals(r, true, "weakCompareAndSet long");
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(array, i, 1L, 2L);
+                }
+                assertEquals(success, true, "weakCompareAndSet long");
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
                 assertEquals(x, 2L, "weakCompareAndSet long value");
             }
 
             {
-                boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, 2L, 1L);
-                assertEquals(r, true, "weakCompareAndSetAcquire long");
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, 2L, 1L);
+                }
+                assertEquals(success, true, "weakCompareAndSetAcquire long");
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
                 assertEquals(x, 1L, "weakCompareAndSetAcquire long");
             }
 
             {
-                boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(array, i, 1L, 2L);
-                assertEquals(r, true, "weakCompareAndSetRelease long");
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(array, i, 1L, 2L);
+                }
+                assertEquals(success, true, "weakCompareAndSetRelease long");
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
                 assertEquals(x, 2L, "weakCompareAndSetRelease long");
             }
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java
index 62ef4ae7f37..eb2ed9d3c08 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java
@@ -208,22 +208,31 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
         }
 
         {
-            boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(recv, "foo", "bar");
-            assertEquals(r, true, "weakCompareAndSet String");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(recv, "foo", "bar");
+            }
+            assertEquals(success, true, "weakCompareAndSet String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact(recv);
             assertEquals(x, "bar", "weakCompareAndSet String value");
         }
 
         {
-            boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(recv, "bar", "foo");
-            assertEquals(r, true, "weakCompareAndSetAcquire String");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(recv, "bar", "foo");
+            }
+            assertEquals(success, true, "weakCompareAndSetAcquire String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact(recv);
             assertEquals(x, "foo", "weakCompareAndSetAcquire String");
         }
 
         {
-            boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(recv, "foo", "bar");
-            assertEquals(r, true, "weakCompareAndSetRelease String");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(recv, "foo", "bar");
+            }
+            assertEquals(success, true, "weakCompareAndSetRelease String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact(recv);
             assertEquals(x, "bar", "weakCompareAndSetRelease String");
         }
@@ -338,22 +347,31 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
         }
 
         {
-            boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact("foo", "bar");
-            assertEquals(r, true, "weakCompareAndSet String");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact("foo", "bar");
+            }
+            assertEquals(success, true, "weakCompareAndSet String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact();
             assertEquals(x, "bar", "weakCompareAndSet String value");
         }
 
         {
-            boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact("bar", "foo");
-            assertEquals(r, true, "weakCompareAndSetAcquire String");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact("bar", "foo");
+            }
+            assertEquals(success, true, "weakCompareAndSetAcquire String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact();
             assertEquals(x, "foo", "weakCompareAndSetAcquire String");
         }
 
         {
-            boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact( "foo", "bar");
-            assertEquals(r, true, "weakCompareAndSetRelease String");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact("foo", "bar");
+            }
+            assertEquals(success, true, "weakCompareAndSetRelease String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact();
             assertEquals(x, "bar", "weakCompareAndSetRelease String");
         }
@@ -471,22 +489,31 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
             }
 
             {
-                boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(array, i, "foo", "bar");
-                assertEquals(r, true, "weakCompareAndSet String");
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(array, i, "foo", "bar");
+                }
+                assertEquals(success, true, "weakCompareAndSet String");
                 String x = (String) hs.get(TestAccessMode.GET).invokeExact(array, i);
                 assertEquals(x, "bar", "weakCompareAndSet String value");
             }
 
             {
-                boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, "bar", "foo");
-                assertEquals(r, true, "weakCompareAndSetAcquire String");
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, "bar", "foo");
+                }
+                assertEquals(success, true, "weakCompareAndSetAcquire String");
                 String x = (String) hs.get(TestAccessMode.GET).invokeExact(array, i);
                 assertEquals(x, "foo", "weakCompareAndSetAcquire String");
             }
 
             {
-                boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(array, i, "foo", "bar");
-                assertEquals(r, true, "weakCompareAndSetRelease String");
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(array, i, "foo", "bar");
+                }
+                assertEquals(success, true, "weakCompareAndSetRelease String");
                 String x = (String) hs.get(TestAccessMode.GET).invokeExact(array, i);
                 assertEquals(x, "bar", "weakCompareAndSetRelease String");
             }
diff --git a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template b/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template
index fb44c8bbb2b..dbee4cbb347 100644
--- a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template
+++ b/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template
@@ -494,22 +494,31 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
         }
 
         {
-            boolean r = vh.weakCompareAndSet(recv, $value1$, $value2$);
-            assertEquals(r, true, "weakCompareAndSet $type$");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSet(recv, $value1$, $value2$);
+            }
+            assertEquals(success, true, "weakCompareAndSet $type$");
             $type$ x = ($type$) vh.get(recv);
             assertEquals(x, $value2$, "weakCompareAndSet $type$ value");
         }
 
         {
-            boolean r = vh.weakCompareAndSetAcquire(recv, $value2$, $value1$);
-            assertEquals(r, true, "weakCompareAndSetAcquire $type$");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSetAcquire(recv, $value2$, $value1$);
+            }
+            assertEquals(success, true, "weakCompareAndSetAcquire $type$");
             $type$ x = ($type$) vh.get(recv);
             assertEquals(x, $value1$, "weakCompareAndSetAcquire $type$");
         }
 
         {
-            boolean r = vh.weakCompareAndSetRelease(recv, $value1$, $value2$);
-            assertEquals(r, true, "weakCompareAndSetRelease $type$");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSetRelease(recv, $value1$, $value2$);
+            }
+            assertEquals(success, true, "weakCompareAndSetRelease $type$");
             $type$ x = ($type$) vh.get(recv);
             assertEquals(x, $value2$, "weakCompareAndSetRelease $type$");
         }
@@ -670,22 +679,31 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
         }
 
         {
-            boolean r = (boolean) vh.weakCompareAndSet($value1$, $value2$);
-            assertEquals(r, true, "weakCompareAndSet $type$");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSet($value1$, $value2$);
+            }
+            assertEquals(success, true, "weakCompareAndSet $type$");
             $type$ x = ($type$) vh.get();
             assertEquals(x, $value2$, "weakCompareAndSet $type$ value");
         }
 
         {
-            boolean r = (boolean) vh.weakCompareAndSetAcquire($value2$, $value1$);
-            assertEquals(r, true, "weakCompareAndSetAcquire $type$");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSetAcquire($value2$, $value1$);
+            }
+            assertEquals(success, true, "weakCompareAndSetAcquire $type$");
             $type$ x = ($type$) vh.get();
             assertEquals(x, $value1$, "weakCompareAndSetAcquire $type$");
         }
 
         {
-            boolean r = (boolean) vh.weakCompareAndSetRelease( $value1$, $value2$);
-            assertEquals(r, true, "weakCompareAndSetRelease $type$");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSetRelease($value1$, $value2$);
+            }
+            assertEquals(success, true, "weakCompareAndSetRelease $type$");
             $type$ x = ($type$) vh.get();
             assertEquals(x, $value2$, "weakCompareAndSetRelease $type$");
         }
@@ -849,22 +867,31 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             }
 
             {
-                boolean r = vh.weakCompareAndSet(array, i, $value1$, $value2$);
-                assertEquals(r, true, "weakCompareAndSet $type$");
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = vh.weakCompareAndSet(array, i, $value1$, $value2$);
+                }
+                assertEquals(success, true, "weakCompareAndSet $type$");
                 $type$ x = ($type$) vh.get(array, i);
                 assertEquals(x, $value2$, "weakCompareAndSet $type$ value");
             }
 
             {
-                boolean r = vh.weakCompareAndSetAcquire(array, i, $value2$, $value1$);
-                assertEquals(r, true, "weakCompareAndSetAcquire $type$");
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = vh.weakCompareAndSetAcquire(array, i, $value2$, $value1$);
+                }
+                assertEquals(success, true, "weakCompareAndSetAcquire $type$");
                 $type$ x = ($type$) vh.get(array, i);
                 assertEquals(x, $value1$, "weakCompareAndSetAcquire $type$");
             }
 
             {
-                boolean r = vh.weakCompareAndSetRelease(array, i, $value1$, $value2$);
-                assertEquals(r, true, "weakCompareAndSetRelease $type$");
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = vh.weakCompareAndSetRelease(array, i, $value1$, $value2$);
+                }
+                assertEquals(success, true, "weakCompareAndSetRelease $type$");
                 $type$ x = ($type$) vh.get(array, i);
                 assertEquals(x, $value2$, "weakCompareAndSetRelease $type$");
             }
diff --git a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template b/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template
index 1c323e2f195..12a0fcef8ad 100644
--- a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template
+++ b/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template
@@ -848,22 +848,31 @@ public class VarHandleTestByteArrayAs$Type$ extends VarHandleBaseByteArrayTest {
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSet(array, i, VALUE_1, VALUE_2);
-                    assertEquals(r, true, "weakCompareAndSet $type$");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSet(array, i, VALUE_1, VALUE_2);
+                    }
+                    assertEquals(success, true, "weakCompareAndSet $type$");
                     $type$ x = ($type$) vh.get(array, i);
                     assertEquals(x, VALUE_2, "weakCompareAndSet $type$ value");
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSetAcquire(array, i, VALUE_2, VALUE_1);
-                    assertEquals(r, true, "weakCompareAndSetAcquire $type$");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSetAcquire(array, i, VALUE_2, VALUE_1);
+                    }
+                    assertEquals(success, true, "weakCompareAndSetAcquire $type$");
                     $type$ x = ($type$) vh.get(array, i);
                     assertEquals(x, VALUE_1, "weakCompareAndSetAcquire $type$");
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSetRelease(array, i, VALUE_1, VALUE_2);
-                    assertEquals(r, true, "weakCompareAndSetRelease $type$");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSetRelease(array, i, VALUE_1, VALUE_2);
+                    }
+                    assertEquals(success, true, "weakCompareAndSetRelease $type$");
                     $type$ x = ($type$) vh.get(array, i);
                     assertEquals(x, VALUE_2, "weakCompareAndSetRelease $type$");
                 }
@@ -994,22 +1003,31 @@ public class VarHandleTestByteArrayAs$Type$ extends VarHandleBaseByteArrayTest {
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSet(array, i, VALUE_1, VALUE_2);
-                    assertEquals(r, true, "weakCompareAndSet $type$");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSet(array, i, VALUE_1, VALUE_2);
+                    }
+                    assertEquals(success, true, "weakCompareAndSet $type$");
                     $type$ x = ($type$) vh.get(array, i);
                     assertEquals(x, VALUE_2, "weakCompareAndSet $type$ value");
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSetAcquire(array, i, VALUE_2, VALUE_1);
-                    assertEquals(r, true, "weakCompareAndSetAcquire $type$");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSetAcquire(array, i, VALUE_2, VALUE_1);
+                    }
+                    assertEquals(success, true, "weakCompareAndSetAcquire $type$");
                     $type$ x = ($type$) vh.get(array, i);
                     assertEquals(x, VALUE_1, "weakCompareAndSetAcquire $type$");
                 }
 
                 {
-                    boolean r = vh.weakCompareAndSetRelease(array, i, VALUE_1, VALUE_2);
-                    assertEquals(r, true, "weakCompareAndSetRelease $type$");
+                    boolean success = false;
+                    for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                        success = vh.weakCompareAndSetRelease(array, i, VALUE_1, VALUE_2);
+                    }
+                    assertEquals(success, true, "weakCompareAndSetRelease $type$");
                     $type$ x = ($type$) vh.get(array, i);
                     assertEquals(x, VALUE_2, "weakCompareAndSetRelease $type$");
                 }
diff --git a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template b/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template
index 8e40761a4f3..a3b3aa5c43f 100644
--- a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template
+++ b/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template
@@ -209,22 +209,31 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
         }
 
         {
-            boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(recv, $value1$, $value2$);
-            assertEquals(r, true, "weakCompareAndSet $type$");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(recv, $value1$, $value2$);
+            }
+            assertEquals(success, true, "weakCompareAndSet $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
             assertEquals(x, $value2$, "weakCompareAndSet $type$ value");
         }
 
         {
-            boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(recv, $value2$, $value1$);
-            assertEquals(r, true, "weakCompareAndSetAcquire $type$");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(recv, $value2$, $value1$);
+            }
+            assertEquals(success, true, "weakCompareAndSetAcquire $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
             assertEquals(x, $value1$, "weakCompareAndSetAcquire $type$");
         }
 
         {
-            boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(recv, $value1$, $value2$);
-            assertEquals(r, true, "weakCompareAndSetRelease $type$");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(recv, $value1$, $value2$);
+            }
+            assertEquals(success, true, "weakCompareAndSetRelease $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
             assertEquals(x, $value2$, "weakCompareAndSetRelease $type$");
         }
@@ -373,22 +382,31 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
         }
 
         {
-            boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact($value1$, $value2$);
-            assertEquals(r, true, "weakCompareAndSet $type$");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact($value1$, $value2$);
+            }
+            assertEquals(success, true, "weakCompareAndSet $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
             assertEquals(x, $value2$, "weakCompareAndSet $type$ value");
         }
 
         {
-            boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact($value2$, $value1$);
-            assertEquals(r, true, "weakCompareAndSetAcquire $type$");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact($value2$, $value1$);
+            }
+            assertEquals(success, true, "weakCompareAndSetAcquire $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
             assertEquals(x, $value1$, "weakCompareAndSetAcquire $type$");
         }
 
         {
-            boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact( $value1$, $value2$);
-            assertEquals(r, true, "weakCompareAndSetRelease $type$");
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact($value1$, $value2$);
+            }
+            assertEquals(success, true, "weakCompareAndSetRelease $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
             assertEquals(x, $value2$, "weakCompareAndSetRelease $type$");
         }
@@ -540,22 +558,31 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             }
 
             {
-                boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(array, i, $value1$, $value2$);
-                assertEquals(r, true, "weakCompareAndSet $type$");
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(array, i, $value1$, $value2$);
+                }
+                assertEquals(success, true, "weakCompareAndSet $type$");
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
                 assertEquals(x, $value2$, "weakCompareAndSet $type$ value");
             }
 
             {
-                boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, $value2$, $value1$);
-                assertEquals(r, true, "weakCompareAndSetAcquire $type$");
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, $value2$, $value1$);
+                }
+                assertEquals(success, true, "weakCompareAndSetAcquire $type$");
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
                 assertEquals(x, $value1$, "weakCompareAndSetAcquire $type$");
             }
 
             {
-                boolean r = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(array, i, $value1$, $value2$);
-                assertEquals(r, true, "weakCompareAndSetRelease $type$");
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(array, i, $value1$, $value2$);
+                }
+                assertEquals(success, true, "weakCompareAndSetRelease $type$");
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
                 assertEquals(x, $value2$, "weakCompareAndSetRelease $type$");
             }

From fa5b3ae32f3aa6e30135cbb0e1ef4e69a318f741 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Wed, 4 May 2016 10:01:00 -0700
Subject: [PATCH 042/228] 8149816: TIFFField#getValueAsString result is
 unexpected for RATIONAL and SRATIONAL types (when modulo is 0)

Add more precision to the specification verbiage of getValueAsString().

Reviewed-by: prr
---
 .../share/classes/javax/imageio/plugins/tiff/TIFFField.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java
index 3ac06d98414..a6ba3859d2b 100644
--- a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java
+++ b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java
@@ -1303,7 +1303,11 @@ public class TIFFField implements Cloneable {
      * version of the data item.  Data of type
      * {@code TIFFTag.TIFF_RATIONAL} or {@code TIFF_SRATIONAL} are
      * represented as a pair of integers separated by a
-     * {@code '/'} character.
+     * {@code '/'} character.  If the numerator of a
+     * {@code TIFFTag.TIFF_RATIONAL} or {@code TIFF_SRATIONAL} is an integral
+     * multiple of the denominator, then the value is represented as
+     * {@code "q/1"} where {@code q} is the quotient of the numerator and
+     * denominator.
      *
      * @param index The index of the data.
      * @return The data at the given index as a {@code String}.

From 09a7921d55215d9c97bf387287efbd238f3efc8f Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Thu, 5 May 2016 01:30:23 +0300
Subject: [PATCH 043/228] 8151786: [TESTBUG]
 java/beans/XMLEncoder/Test4625418.java timed out intermittently

Reviewed-by: alexsch, yan
---
 .../java/beans/XMLEncoder/Test4625418.java    | 658 +++++++++---------
 1 file changed, 329 insertions(+), 329 deletions(-)

diff --git a/jdk/test/java/beans/XMLEncoder/Test4625418.java b/jdk/test/java/beans/XMLEncoder/Test4625418.java
index 0f9203e864d..a8a23aced37 100644
--- a/jdk/test/java/beans/XMLEncoder/Test4625418.java
+++ b/jdk/test/java/beans/XMLEncoder/Test4625418.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2016, 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,332 +26,338 @@
  * @bug 4625418
  * @summary Tests XML <a href="http://download.java.net/jdk6/docs/technotes/guides/intl/encoding.doc.html">encoding</a>
  * @author Sergey Malenkov
- *
- * @run main Test4625418 ASCII
- * @run main Test4625418 Big5
- * ?run main Test4625418 Big5-HKSCS
- * ?run main Test4625418 Big5_HKSCS
- * @run main Test4625418 Big5_Solaris
- * ?run main Test4625418 Cp037
- * @run main Test4625418 Cp1006
- * ?run main Test4625418 Cp1025
- * -run main Test4625418 Cp1026
- * @run main Test4625418 Cp1046
- * @run main Test4625418 Cp1047
- * @run main Test4625418 Cp1097
- * @run main Test4625418 Cp1098
- * ?run main Test4625418 Cp1112
- * ?run main Test4625418 Cp1122
- * ?run main Test4625418 Cp1123
- * @run main Test4625418 Cp1124
- * ?run main Test4625418 Cp1140
- * ?run main Test4625418 Cp1141
- * ?run main Test4625418 Cp1142
- * ?run main Test4625418 Cp1143
- * ?run main Test4625418 Cp1144
- * ?run main Test4625418 Cp1145
- * ?run main Test4625418 Cp1146
- * ?run main Test4625418 Cp1147
- * ?run main Test4625418 Cp1148
- * ?run main Test4625418 Cp1149
- * @run main Test4625418 Cp1250
- * @run main Test4625418 Cp1251
- * @run main Test4625418 Cp1252
- * @run main Test4625418 Cp1253
- * @run main Test4625418 Cp1254
- * @run main Test4625418 Cp1255
- * @run main Test4625418 Cp1256
- * @run main Test4625418 Cp1257
- * @run main Test4625418 Cp1258
- * ?run main Test4625418 Cp1381
- * ?run main Test4625418 Cp1383
- * ?run main Test4625418 Cp273
- * ?run main Test4625418 Cp277
- * ?run main Test4625418 Cp278
- * ?run main Test4625418 Cp280
- * ?run main Test4625418 Cp284
- * ?run main Test4625418 Cp285
- * ?run main Test4625418 Cp297
- * ?run main Test4625418 Cp33722
- * ?run main Test4625418 Cp420
- * ?run main Test4625418 Cp424
- * @run main Test4625418 Cp437
- * ?run main Test4625418 Cp500
- * ?run main Test4625418 Cp50220
- * ?run main Test4625418 Cp50221
- * @run main Test4625418 Cp737
- * @run main Test4625418 Cp775
- * -run main Test4625418 Cp834
- * ?run main Test4625418 Cp838
- * @run main Test4625418 Cp850
- * @run main Test4625418 Cp852
- * @run main Test4625418 Cp855
- * @run main Test4625418 Cp856
- * @run main Test4625418 Cp857
- * @run main Test4625418 Cp858
- * @run main Test4625418 Cp860
- * @run main Test4625418 Cp861
- * @run main Test4625418 Cp862
- * @run main Test4625418 Cp863
- * @run main Test4625418 Cp864
- * @run main Test4625418 Cp865
- * @run main Test4625418 Cp866
- * @run main Test4625418 Cp868
- * @run main Test4625418 Cp869
- * ?run main Test4625418 Cp870
- * ?run main Test4625418 Cp871
- * @run main Test4625418 Cp874
- * ?run main Test4625418 Cp875
- * ?run main Test4625418 Cp918
- * @run main Test4625418 Cp921
- * @run main Test4625418 Cp922
- * -run main Test4625418 Cp930
- * @run main Test4625418 Cp933
- * ?run main Test4625418 Cp935
- * ?run main Test4625418 Cp937
- * ?run main Test4625418 Cp939
- * ?run main Test4625418 Cp942
- * ?run main Test4625418 Cp942C
- * @run main Test4625418 Cp943
- * ?run main Test4625418 Cp943C
- * @run main Test4625418 Cp948
- * @run main Test4625418 Cp949
- * ?run main Test4625418 Cp949C
- * @run main Test4625418 Cp950
- * @run main Test4625418 Cp964
- * ?run main Test4625418 Cp970
- * ?run main Test4625418 EUC-JP
- * @run main Test4625418 EUC-KR
- * @run main Test4625418 EUC_CN
- * ?run main Test4625418 EUC_JP
- * ?run main Test4625418 EUC_JP_LINUX
- * ?run main Test4625418 EUC_JP_Solaris
- * @run main Test4625418 EUC_KR
- * ?run main Test4625418 EUC_TW
- * @run main Test4625418 GB18030
- * @run main Test4625418 GB2312
- * @run main Test4625418 GBK
- * ?run main Test4625418 IBM-Thai
- * @run main Test4625418 IBM00858
- * ?run main Test4625418 IBM01140
- * ?run main Test4625418 IBM01141
- * ?run main Test4625418 IBM01142
- * ?run main Test4625418 IBM01143
- * ?run main Test4625418 IBM01144
- * ?run main Test4625418 IBM01145
- * ?run main Test4625418 IBM01146
- * ?run main Test4625418 IBM01147
- * ?run main Test4625418 IBM01148
- * ?run main Test4625418 IBM01149
- * ?run main Test4625418 IBM037
- * -run main Test4625418 IBM1026
- * @run main Test4625418 IBM1047
- * ?run main Test4625418 IBM273
- * ?run main Test4625418 IBM277
- * ?run main Test4625418 IBM278
- * ?run main Test4625418 IBM280
- * ?run main Test4625418 IBM284
- * ?run main Test4625418 IBM285
- * ?run main Test4625418 IBM297
- * ?run main Test4625418 IBM420
- * ?run main Test4625418 IBM424
- * @run main Test4625418 IBM437
- * ?run main Test4625418 IBM500
- * @run main Test4625418 IBM775
- * @run main Test4625418 IBM850
- * @run main Test4625418 IBM852
- * @run main Test4625418 IBM855
- * @run main Test4625418 IBM857
- * @run main Test4625418 IBM860
- * @run main Test4625418 IBM861
- * @run main Test4625418 IBM862
- * @run main Test4625418 IBM863
- * @run main Test4625418 IBM864
- * @run main Test4625418 IBM865
- * @run main Test4625418 IBM866
- * @run main Test4625418 IBM868
- * @run main Test4625418 IBM869
- * ?run main Test4625418 IBM870
- * ?run main Test4625418 IBM871
- * ?run main Test4625418 IBM918
- * ?run main Test4625418 ISCII91
- * -run main Test4625418 ISO-2022-CN
- * @run main Test4625418 ISO-2022-JP
- * @run main Test4625418 ISO-2022-KR
- * @run main Test4625418 ISO-8859-1
- * @run main Test4625418 ISO-8859-13
- * @run main Test4625418 ISO-8859-15
- * @run main Test4625418 ISO-8859-2
- * @run main Test4625418 ISO-8859-3
- * @run main Test4625418 ISO-8859-4
- * @run main Test4625418 ISO-8859-5
- * @run main Test4625418 ISO-8859-6
- * @run main Test4625418 ISO-8859-7
- * @run main Test4625418 ISO-8859-8
- * @run main Test4625418 ISO-8859-9
- * -run main Test4625418 ISO2022CN
- * @run main Test4625418 ISO2022JP
- * @run main Test4625418 ISO2022KR
- * -run main Test4625418 ISO2022_CN_CNS
- * -run main Test4625418 ISO2022_CN_GB
- * @run main Test4625418 ISO8859_1
- * @run main Test4625418 ISO8859_13
- * @run main Test4625418 ISO8859_15
- * @run main Test4625418 ISO8859_2
- * @run main Test4625418 ISO8859_3
- * @run main Test4625418 ISO8859_4
- * @run main Test4625418 ISO8859_5
- * @run main Test4625418 ISO8859_6
- * @run main Test4625418 ISO8859_7
- * @run main Test4625418 ISO8859_8
- * @run main Test4625418 ISO8859_9
- * -run main Test4625418 JISAutoDetect
- * ?run main Test4625418 JIS_X0201
- * -run main Test4625418 JIS_X0212-1990
- * @run main Test4625418 KOI8-R
- * @run main Test4625418 KOI8-U
- * @run main Test4625418 KOI8_R
- * @run main Test4625418 KOI8_U
- * @run main Test4625418 MS874
- * ?run main Test4625418 MS932
- * ?run main Test4625418 MS936
- * @run main Test4625418 MS949
- * @run main Test4625418 MS950
- * ?run main Test4625418 MS950_HKSCS
- * @run main Test4625418 MacArabic
- * @run main Test4625418 MacCentralEurope
- * @run main Test4625418 MacCroatian
- * @run main Test4625418 MacCyrillic
- * -run main Test4625418 MacDingbat
- * @run main Test4625418 MacGreek
- * @run main Test4625418 MacHebrew
- * @run main Test4625418 MacIceland
- * @run main Test4625418 MacRoman
- * @run main Test4625418 MacRomania
- * -run main Test4625418 MacSymbol
- * @run main Test4625418 MacThai
- * @run main Test4625418 MacTurkish
- * @run main Test4625418 MacUkraine
- * ?run main Test4625418 PCK
- * ?run main Test4625418 SJIS
- * ?run main Test4625418 Shift_JIS
- * @run main Test4625418 TIS-620
- * @run main Test4625418 TIS620
- * @run main Test4625418 US-ASCII
- * @run main Test4625418 UTF-16
- * @run main Test4625418 UTF-16BE
- * @run main Test4625418 UTF-16LE
- * @run main Test4625418 UTF-32
- * @run main Test4625418 UTF-32BE
- * @run main Test4625418 UTF-32LE
- * @run main Test4625418 UTF-8
- * @run main Test4625418 UTF8
- * @run main Test4625418 UTF_32
- * @run main Test4625418 UTF_32BE
- * -run main Test4625418 UTF_32BE_BOM
- * @run main Test4625418 UTF_32LE
- * -run main Test4625418 UTF_32LE_BOM
- * @run main Test4625418 UnicodeBig
- * @run main Test4625418 UnicodeBigUnmarked
- * @run main Test4625418 UnicodeLittle
- * @run main Test4625418 UnicodeLittleUnmarked
- * @run main Test4625418 windows-1250
- * @run main Test4625418 windows-1251
- * @run main Test4625418 windows-1252
- * @run main Test4625418 windows-1253
- * @run main Test4625418 windows-1254
- * @run main Test4625418 windows-1255
- * @run main Test4625418 windows-1256
- * @run main Test4625418 windows-1257
- * @run main Test4625418 windows-1258
- * ?run main Test4625418 windows-31j
- * -run main Test4625418 x-Big5_Solaris
- * ?run main Test4625418 x-EUC-TW
- * @run main Test4625418 x-IBM1006
- * ?run main Test4625418 x-IBM1025
- * @run main Test4625418 x-IBM1046
- * @run main Test4625418 x-IBM1097
- * @run main Test4625418 x-IBM1098
- * ?run main Test4625418 x-IBM1112
- * ?run main Test4625418 x-IBM1122
- * ?run main Test4625418 x-IBM1123
- * @run main Test4625418 x-IBM1124
- * ?run main Test4625418 x-IBM1381
- * ?run main Test4625418 x-IBM1383
- * ?run main Test4625418 x-IBM33722
- * @run main Test4625418 x-IBM737
- * -run main Test4625418 x-IBM834
- * @run main Test4625418 x-IBM856
- * @run main Test4625418 x-IBM874
- * ?run main Test4625418 x-IBM875
- * @run main Test4625418 x-IBM921
- * @run main Test4625418 x-IBM922
- * -run main Test4625418 x-IBM930
- * @run main Test4625418 x-IBM933
- * ?run main Test4625418 x-IBM935
- * ?run main Test4625418 x-IBM937
- * ?run main Test4625418 x-IBM939
- * ?run main Test4625418 x-IBM942
- * ?run main Test4625418 x-IBM942C
- * @run main Test4625418 x-IBM943
- * ?run main Test4625418 x-IBM943C
- * @run main Test4625418 x-IBM948
- * @run main Test4625418 x-IBM949
- * ?run main Test4625418 x-IBM949C
- * @run main Test4625418 x-IBM950
- * @run main Test4625418 x-IBM964
- * ?run main Test4625418 x-IBM970
- * ?run main Test4625418 x-ISCII91
- * -run main Test4625418 x-ISO2022-CN-CNS
- * -run main Test4625418 x-ISO2022-CN-GB
- * -run main Test4625418 x-JIS0208
- * -run main Test4625418 x-JISAutoDetect
- * @run main Test4625418 x-Johab
- * ?run main Test4625418 x-MS950-HKSCS
- * @run main Test4625418 x-MacArabic
- * @run main Test4625418 x-MacCentralEurope
- * @run main Test4625418 x-MacCroatian
- * @run main Test4625418 x-MacCyrillic
- * -run main Test4625418 x-MacDingbat
- * @run main Test4625418 x-MacGreek
- * @run main Test4625418 x-MacHebrew
- * @run main Test4625418 x-MacIceland
- * @run main Test4625418 x-MacRoman
- * @run main Test4625418 x-MacRomania
- * -run main Test4625418 x-MacSymbol
- * @run main Test4625418 x-MacThai
- * @run main Test4625418 x-MacTurkish
- * @run main Test4625418 x-MacUkraine
- * ?run main Test4625418 x-PCK
- * @run main Test4625418 x-UTF-16LE-BOM
- * -run main Test4625418 x-UTF-32BE-BOM
- * -run main Test4625418 x-UTF-32LE-BOM
- * ?run main Test4625418 x-euc-jp-linux
- * ?run main Test4625418 x-eucJP-Open
- * @run main Test4625418 x-iso-8859-11
- * @run main Test4625418 x-mswin-936
- * ?run main Test4625418 x-windows-50220
- * ?run main Test4625418 x-windows-50221
- * @run main Test4625418 x-windows-874
- * @run main Test4625418 x-windows-949
- * @run main Test4625418 x-windows-950
- * ?run main Test4625418 x-windows-iso2022jp
+ * @run main/timeout=360 Test4625418
  */
 
 import java.beans.ExceptionListener;
 import java.beans.XMLDecoder;
 import java.beans.XMLEncoder;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
 import java.nio.charset.IllegalCharsetNameException;
 import java.nio.charset.UnsupportedCharsetException;
 
 public final class Test4625418 implements ExceptionListener {
-    public static void main(String[] args) {
-        new Test4625418(args[0]).test(createString(0x10000));
-        System.out.println("Test passed: " + args[0]);
+
+    private static final String[] encodings = {
+        "ASCII",
+        "Big5",
+        //"Big5-HKSCS",
+        //"Big5_HKSCS",
+        "Big5_Solaris",
+        //"Cp037",
+        "Cp1006",
+        //"Cp1025",
+        //"Cp1026",
+        "Cp1046",
+        "Cp1047",
+        "Cp1097",
+        "Cp1098",
+        //"Cp1112",
+        //"Cp1122",
+        //"Cp1123",
+        "Cp1124",
+        //"Cp1140",
+        //"Cp1141",
+        //"Cp1142",
+        //"Cp1143",
+        //"Cp1144",
+        //"Cp1145",
+        //"Cp1146",
+        //"Cp1147",
+        //"Cp1148",
+        //"Cp1149",
+        "Cp1250",
+        "Cp1251",
+        "Cp1252",
+        "Cp1253",
+        "Cp1254",
+        "Cp1255",
+        "Cp1256",
+        "Cp1257",
+        "Cp1258",
+        //"Cp1381",
+        //"Cp1383",
+        //"Cp273",
+        //"Cp277",
+        //"Cp278",
+        //"Cp280",
+        //"Cp284",
+        //"Cp285",
+        //"Cp297",
+        //"Cp33722",
+        //"Cp420",
+        //"Cp424",
+        "Cp437",
+        //"Cp500",
+        //"Cp50220",
+        //"Cp50221",
+        "Cp737",
+        "Cp775",
+        //"Cp834",
+        //"Cp838",
+        "Cp850",
+        "Cp852",
+        "Cp855",
+        "Cp856",
+        "Cp857",
+        "Cp858",
+        "Cp860",
+        "Cp861",
+        "Cp862",
+        "Cp863",
+        "Cp864",
+        "Cp865",
+        "Cp866",
+        "Cp868",
+        "Cp869",
+        //"Cp870",
+        //"Cp871",
+        "Cp874",
+        //"Cp875",
+        //"Cp918",
+        "Cp921",
+        "Cp922",
+        //"Cp930",
+        "Cp933",
+        //"Cp935",
+        //"Cp937",
+        //"Cp939",
+        //"Cp942",
+        //"Cp942C",
+        "Cp943",
+        //"Cp943C",
+        "Cp948",
+        "Cp949",
+        //"Cp949C",
+        "Cp950",
+        "Cp964",
+        //"Cp970",
+        //"EUC-JP",
+        "EUC-KR",
+        "EUC_CN",
+        //"EUC_JP",
+        //"EUC_JP_LINUX",
+        //"EUC_JP_Solaris",
+        "EUC_KR",
+        //"EUC_TW",
+        "GB18030",
+        "GB2312",
+        "GBK",
+        //"IBM-Thai",
+        "IBM00858",
+        //"IBM01140",
+        //"IBM01141",
+        //"IBM01142",
+        //"IBM01143",
+        //"IBM01144",
+        //"IBM01145",
+        //"IBM01146",
+        //"IBM01147",
+        //"IBM01148",
+        //"IBM01149",
+        //"IBM037",
+        //"IBM1026",
+        "IBM1047",
+        //"IBM273",
+        //"IBM277",
+        //"IBM278",
+        //"IBM280",
+        //"IBM284",
+        //"IBM285",
+        //"IBM297",
+        //"IBM420",
+        //"IBM424",
+        "IBM437",
+        //"IBM500",
+        "IBM775",
+        "IBM850",
+        "IBM852",
+        "IBM855",
+        "IBM857",
+        "IBM860",
+        "IBM861",
+        "IBM862",
+        "IBM863",
+        "IBM864",
+        "IBM865",
+        "IBM866",
+        "IBM868",
+        "IBM869",
+        //"IBM870",
+        //"IBM871",
+        //"IBM918",
+        //"ISCII91",
+        //"ISO-2022-CN",
+        "ISO-2022-JP",
+        "ISO-2022-KR",
+        "ISO-8859-1",
+        "ISO-8859-13",
+        "ISO-8859-15",
+        "ISO-8859-2",
+        "ISO-8859-3",
+        "ISO-8859-4",
+        "ISO-8859-5",
+        "ISO-8859-6",
+        "ISO-8859-7",
+        "ISO-8859-8",
+        "ISO-8859-9",
+        //"ISO2022CN",
+        "ISO2022JP",
+        "ISO2022KR",
+        //"ISO2022_CN_CNS",
+        //"ISO2022_CN_GB",
+        "ISO8859_1",
+        "ISO8859_13",
+        "ISO8859_15",
+        "ISO8859_2",
+        "ISO8859_3",
+        "ISO8859_4",
+        "ISO8859_5",
+        "ISO8859_6",
+        "ISO8859_7",
+        "ISO8859_8",
+        "ISO8859_9",
+        //"JISAutoDetect",
+        //"JIS_X0201",
+        //"JIS_X0212-1990",
+        "KOI8-R",
+        "KOI8-U",
+        "KOI8_R",
+        "KOI8_U",
+        "MS874",
+        //"MS932",
+        //"MS936",
+        "MS949",
+        "MS950",
+        //"MS950_HKSCS",
+        "MacArabic",
+        "MacCentralEurope",
+        "MacCroatian",
+        "MacCyrillic",
+        //"MacDingbat",
+        "MacGreek",
+        "MacHebrew",
+        "MacIceland",
+        "MacRoman",
+        "MacRomania",
+        //"MacSymbol",
+        "MacThai",
+        "MacTurkish",
+        "MacUkraine",
+        //"PCK",
+        //"SJIS",
+        //"Shift_JIS",
+        "TIS-620",
+        "TIS620",
+        "US-ASCII",
+        "UTF-16",
+        "UTF-16BE",
+        "UTF-16LE",
+        "UTF-32",
+        "UTF-32BE",
+        "UTF-32LE",
+        "UTF-8",
+        "UTF8",
+        "UTF_32",
+        "UTF_32BE",
+        //"UTF_32BE_BOM",
+        "UTF_32LE",
+        //"UTF_32LE_BOM",
+        "UnicodeBig",
+        "UnicodeBigUnmarked",
+        "UnicodeLittle",
+        "UnicodeLittleUnmarked",
+        "windows-1250",
+        "windows-1251",
+        "windows-1252",
+        "windows-1253",
+        "windows-1254",
+        "windows-1255",
+        "windows-1256",
+        "windows-1257",
+        "windows-1258",
+        //"windows-31j",
+        //"x-Big5_Solaris",
+        //"x-EUC-TW",
+        "x-IBM1006",
+        //"x-IBM1025",
+        "x-IBM1046",
+        "x-IBM1097",
+        "x-IBM1098",
+        //"x-IBM1112",
+        //"x-IBM1122",
+        //"x-IBM1123",
+        "x-IBM1124",
+        //"x-IBM1381",
+        //"x-IBM1383",
+        //"x-IBM33722",
+        "x-IBM737",
+        //"x-IBM834",
+        "x-IBM856",
+        "x-IBM874",
+        //"x-IBM875",
+        "x-IBM921",
+        "x-IBM922",
+        //"x-IBM930",
+        "x-IBM933",
+        //"x-IBM935",
+        //"x-IBM937",
+        //"x-IBM939",
+        //"x-IBM942",
+        //"x-IBM942C",
+        "x-IBM943",
+        //"x-IBM943C",
+        "x-IBM948",
+        "x-IBM949",
+        //"x-IBM949C",
+        "x-IBM950",
+        "x-IBM964",
+        //"x-IBM970",
+        //"x-ISCII91",
+        //"x-ISO2022-CN-CNS",
+        //"x-ISO2022-CN-GB",
+        //"x-JIS0208",
+        //"x-JISAutoDetect",
+        "x-Johab",
+        //"x-MS950-HKSCS",
+        "x-MacArabic",
+        "x-MacCentralEurope",
+        "x-MacCroatian",
+        "x-MacCyrillic",
+        //"x-MacDingbat",
+        "x-MacGreek",
+        "x-MacHebrew",
+        "x-MacIceland",
+        "x-MacRoman",
+        "x-MacRomania",
+        //"x-MacSymbol",
+        "x-MacThai",
+        "x-MacTurkish",
+        "x-MacUkraine",
+        //"x-PCK",
+        "x-UTF-16LE-BOM",
+        //"x-UTF-32BE-BOM",
+        //"x-UTF-32LE-BOM",
+        //"x-euc-jp-linux",
+        //"x-eucJP-Open",
+        "x-iso-8859-11",
+        "x-mswin-936",
+        //"x-windows-50220",
+        //"x-windows-50221",
+        "x-windows-874",
+        "x-windows-949",
+        "x-windows-950",
+        //"x-windows-iso2022jp",
+    };
+
+    public static void main(final String[] args) {
+        final String string = createString(0x10000);
+        for (String encoding : encodings) {
+            System.out.println("Test encoding: " + encoding);
+            new Test4625418(encoding).test(string);
+        }
     }
 
     private static String createString(int length) {
@@ -364,33 +370,27 @@ public final class Test4625418 implements ExceptionListener {
 
     private final String encoding;
 
-    private Test4625418(String encoding) {
+    private Test4625418(final String encoding) {
         this.encoding = encoding;
     }
 
     private void test(String string) {
         try {
-            File file = new File("4625418." + this.encoding + ".xml");
-
-            FileOutputStream output = new FileOutputStream(file);
+            ByteArrayOutputStream output = new ByteArrayOutputStream();
             XMLEncoder encoder = new XMLEncoder(output, this.encoding, true, 0);
             encoder.setExceptionListener(this);
             encoder.writeObject(string);
             encoder.close();
 
-            FileInputStream input = new FileInputStream(file);
+            InputStream input = new ByteArrayInputStream(output.toByteArray());
             XMLDecoder decoder = new XMLDecoder(input);
             decoder.setExceptionListener(this);
             Object object = decoder.readObject();
             decoder.close();
 
-            if (!string.equals(object))
+            if (!string.equals(object)) {
                 throw new Error(this.encoding + " - can't read properly");
-
-            file.delete();
-        }
-        catch (FileNotFoundException exception) {
-            throw new Error(this.encoding + " - file not found", exception);
+            }
         }
         catch (IllegalCharsetNameException exception) {
             throw new Error(this.encoding + " - illegal charset name", exception);

From 182152c38568d5f73b469d37e7b663677620d50d Mon Sep 17 00:00:00 2001
From: Harsha Wardhana B <hb@openjdk.org>
Date: Thu, 5 May 2016 01:52:03 -0700
Subject: [PATCH 044/228] 8154166:
 java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java fails with
 RuntimeException

Fix the RuntimeException issue

Reviewed-by: jbachorik
---
 .../management/MemoryMXBean/ResetPeakMemoryUsage.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/jdk/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java b/jdk/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java
index b1f6e781044..dc85eb6bb03 100644
--- a/jdk/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java
+++ b/jdk/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java
@@ -36,9 +36,13 @@
  * @modules java.management
  * @build jdk.testlibrary.* ResetPeakMemoryUsage MemoryUtil RunUtil
  * @run main ResetPeakMemoryUsage
+ * @requires vm.opt.ExplicitGCInvokesConcurrent != "true"
+ * @requires vm.opt.ExplicitGCInvokesConcurrentAndUnloadsClasses != "true"
+ * @requires vm.opt.DisableExplicitGC != "true"
  */
 
 import java.lang.management.*;
+import java.lang.ref.WeakReference;
 import java.util.*;
 
 public class ResetPeakMemoryUsage {
@@ -100,6 +104,7 @@ public class ResetPeakMemoryUsage {
         printMemoryUsage(usage0, peak0);
 
         obj = new Object[largeArraySize];
+        WeakReference<Object> weakRef = new WeakReference<>(obj);
 
         MemoryUsage usage1 = mpool.getUsage();
         MemoryUsage peak1 = mpool.getPeakUsage();
@@ -124,7 +129,11 @@ public class ResetPeakMemoryUsage {
         // The object is now garbage and do a GC
         // memory usage should drop
         obj = null;
-        mbean.gc();
+
+        //This will cause sure shot GC unlike Runtime.gc() invoked by mbean.gc()
+        while(weakRef.get() != null) {
+            mbean.gc();
+        }
 
         MemoryUsage usage2 = mpool.getUsage();
         MemoryUsage peak2 = mpool.getPeakUsage();

From 6fd98f9b985399fe5ab818066fe8a080b30b5949 Mon Sep 17 00:00:00 2001
From: Ambarish Rapte <arapte@openjdk.org>
Date: Thu, 5 May 2016 14:44:25 +0300
Subject: [PATCH 045/228] 6384991: TrayIcon ActionListener called at wrong time

Reviewed-by: rchamyal, serb
---
 .../classes/sun/awt/X11/XTrayIconPeer.java    |   2 +-
 .../TrayIconMouseTest/TrayIconMouseTest.java  | 131 ++++++++++--------
 2 files changed, 74 insertions(+), 59 deletions(-)

diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java
index 20b7a9d7899..fa1ba5dcf03 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java
@@ -464,7 +464,7 @@ public class XTrayIconPeer implements TrayIconPeer,
             XToolkit.postEvent(XToolkit.targetToAppContext(e.getSource()), e);
         }
         public void mouseClicked(MouseEvent e) {
-            if ((e.getClickCount() > 1 || xtiPeer.balloon.isVisible()) &&
+            if ((e.getClickCount() == 1 || xtiPeer.balloon.isVisible()) &&
                 e.getButton() == MouseEvent.BUTTON1)
             {
                 ActionEvent aev = new ActionEvent(xtiPeer.target, ActionEvent.ACTION_PERFORMED,
diff --git a/jdk/test/java/awt/TrayIcon/TrayIconMouseTest/TrayIconMouseTest.java b/jdk/test/java/awt/TrayIcon/TrayIconMouseTest/TrayIconMouseTest.java
index 551878efb04..f7549a385eb 100644
--- a/jdk/test/java/awt/TrayIcon/TrayIconMouseTest/TrayIconMouseTest.java
+++ b/jdk/test/java/awt/TrayIcon/TrayIconMouseTest/TrayIconMouseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -21,16 +21,19 @@
  * questions.
  */
 
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.EventQueue;
+import java.awt.Point;
+import java.awt.SystemTray;
+import java.awt.TrayIcon;
+import java.awt.event.InputEvent;
 import java.awt.image.BufferedImage;
 
 /*
- * @test
- * @summary Check if ActionEvent is triggered by a TrayIcon only when
- *          it is double clicked using mouse button 1 (or single clicked
- *          with button 3 (on Mac OS X))
- * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
+ * @test 6384991
+ * @summary Check if ActionEvent is triggered by a TrayIcon when
+ *          it is double clicked with mouse button 1 on windows
+ *          or single clicked with button 3 on Mac OS X
+ *          or single clicked with button 1 on rest.
  * @library /java/awt/patchlib
  * @library ../../../../lib/testlibrary ../
  * @build java.desktop/java.awt.Helper
@@ -42,19 +45,17 @@ public class TrayIconMouseTest {
 
     TrayIcon icon;
     ExtendedRobot robot;
-
     boolean actionPerformed = false;
     Object actionLock = new Object();
     static boolean isMacOS = false;
-
+    static boolean isWinOS = false;
+    static boolean isOelOS = false;
     String caption = "Sample Icon";
-
     int[] buttonTypes = {
         InputEvent.BUTTON1_MASK,
         InputEvent.BUTTON2_MASK,
         InputEvent.BUTTON3_MASK
     };
-
     String[] buttonNames = {
         "BUTTON1",
         "BUTTON2",
@@ -62,30 +63,31 @@ public class TrayIconMouseTest {
     };
 
     public static void main(String[] args) throws Exception {
-        if (! SystemTray.isSupported()) {
-            System.out.println("SystemTray not supported on the platform under test. " +
-                    "Marking the test passed");
+        if (!SystemTray.isSupported()) {
+            System.out.println("SystemTray not supported on the platform "
+                    + "under test. Marking the test passed");
         } else {
-            if (System.getProperty("os.name").toLowerCase().startsWith("mac")) {
+            String osName = System.getProperty("os.name").toLowerCase();
+            if (osName.startsWith("mac")) {
                 isMacOS = true;
-            } else if (SystemTrayIconHelper.isOel7()) {
-                System.out.println("OEL 7 doesn't support double click in " +
-                        "systray. Skipped");
-                return;
+            } else if (osName.startsWith("win")) {
+                isWinOS = true;
+            } else {
+                isOelOS = SystemTrayIconHelper.isOel7();
             }
             new TrayIconMouseTest().doTest();
         }
     }
 
-    TrayIconMouseTest() throws Exception{
+    TrayIconMouseTest() throws Exception {
         robot = new ExtendedRobot();
         EventQueue.invokeAndWait(this::initializeGUI);
     }
 
     void initializeGUI() {
-
         SystemTray tray = SystemTray.getSystemTray();
-        icon = new TrayIcon(new BufferedImage(20, 20, BufferedImage.TYPE_INT_RGB), caption);
+        icon = new TrayIcon(
+                new BufferedImage(20, 20, BufferedImage.TYPE_INT_RGB), caption);
         icon.addActionListener(event -> {
             actionPerformed = true;
             synchronized (actionLock) {
@@ -103,31 +105,32 @@ public class TrayIconMouseTest {
     }
 
     private void doTest() throws Exception {
-
         Point iconPosition = SystemTrayIconHelper.getTrayIconLocation(icon);
-        if (iconPosition == null)
+        if (iconPosition == null) {
             throw new RuntimeException("Unable to find the icon location!");
-
+        }
         robot.mouseMove(iconPosition.x, iconPosition.y);
         robot.waitForIdle();
 
         for (int i = 0; i < buttonTypes.length; i++) {
             actionPerformed = false;
             robot.click(buttonTypes[i]);
-            robot.waitForIdle(6000);
+            robot.waitForIdle();
+            delayIfRequired();
 
-            if (isMacOS && actionPerformed && i == 2) {
-
-            }else if (isMacOS && i == 2) {
-                throw new RuntimeException("FAIL: ActionEvent NOT triggered when " +
-                        buttonNames[i] + " is single clicked on Mac OS");
-            }else if (actionPerformed) {
-                throw new RuntimeException("FAIL: ActionEvent triggered when " +
-                        buttonNames[i] + " is single clicked");
+            if (isMacOS && i == 2 && !actionPerformed) {
+                throw new RuntimeException("FAIL: ActionEvent NOT triggered "
+                    + "when " + buttonNames[i] + " is single clicked on Mac");
+            } else if (isWinOS && actionPerformed) {
+                throw new RuntimeException("FAIL: ActionEvent triggered "
+                    + "when " + buttonNames[i] + " is single clicked");
+            } else if (!isMacOS && !isWinOS && i == 0 && !actionPerformed) {
+                throw new RuntimeException("FAIL: ActionEvent NOT triggered "
+                    + "when " + buttonNames[i] + " is single clicked");
             }
         }
 
-        if(!isMacOS) {
+        if (!isMacOS && !isOelOS) {
             for (int i = 0; i < buttonTypes.length; i++) {
                 for (int j = 0; j < buttonTypes.length; j++) {
                     if (j != i) {
@@ -136,13 +139,22 @@ public class TrayIconMouseTest {
                         robot.mousePress(buttonTypes[j]);
                         robot.mouseRelease(buttonTypes[j]);
                         robot.mouseRelease(buttonTypes[i]);
-
                         robot.waitForIdle();
+                        delayIfRequired();
 
-                        if (actionPerformed)
-                            throw new RuntimeException("FAIL: ActionEvent triggered when " +
-                                    buttonNames[i] + " and " + buttonNames[j] +
-                                    " is clicked and released");
+                        if (isWinOS) {
+                            if (actionPerformed) {
+                                throw new RuntimeException(
+                                    "FAIL: ActionEvent triggered when "
+                                    + buttonNames[i] + " & " + buttonNames[j]
+                                    + " is clicked and released");
+                            }
+
+                        } else if ((i == 0 || j == 0) && !actionPerformed) {
+                            throw new RuntimeException("FAIL: ActionEvent is "
+                                + "NOT triggered when " + buttonNames[i] + " & "
+                                + buttonNames[j] + " is pressed & released");
+                        }
                     }
                 }
             }
@@ -150,31 +162,34 @@ public class TrayIconMouseTest {
             for (int i = 0; i < buttonTypes.length; i++) {
                 actionPerformed = false;
                 robot.mousePress(buttonTypes[i]);
-                robot.delay(50);
                 robot.mouseRelease(buttonTypes[i]);
                 robot.delay(50);
                 robot.mousePress(buttonTypes[i]);
-                robot.delay(50);
                 robot.mouseRelease(buttonTypes[i]);
+                robot.waitForIdle();
+                delayIfRequired();
 
                 if (i == 0) {
-                    if (! actionPerformed) {
-                        synchronized (actionLock) {
-                            try {
-                                actionLock.wait(6000);
-                            } catch (Exception e) {
-                            }
-                        }
+                    if (!actionPerformed) {
+                        throw new RuntimeException("FAIL: ActionEvent not "
+                                + "triggered when " + buttonNames[i]
+                                + " is double clicked");
                     }
-                    if (! actionPerformed)
-                        throw new RuntimeException("FAIL: ActionEvent not triggered when " +
-                                buttonNames[i] + " is double clicked");
-                } else {
-                    robot.waitForIdle();
+                } else if (actionPerformed) {
+                    throw new RuntimeException("FAIL: ActionEvent "
+                            + "triggered when " + buttonNames[i]
+                            + " is double clicked");
+                }
+            }
+        }
+    }
 
-                    if (actionPerformed)
-                        throw new RuntimeException("FAIL: ActionEvent triggered when " +
-                                buttonNames[i] + " is double clicked");
+    public void delayIfRequired() {
+        if (!actionPerformed) {
+            synchronized (actionLock) {
+                try {
+                    actionLock.wait(500);
+                } catch (Exception e) {
                 }
             }
         }

From 08482543b496efa11dc8084a14a831799de60a93 Mon Sep 17 00:00:00 2001
From: Ambarish Rapte <arapte@openjdk.org>
Date: Thu, 5 May 2016 14:56:42 +0300
Subject: [PATCH 046/228] 8155742: [Windows]
 robot.keyPress(KeyEvent.VK_ALT_GRAPH) throws
 java.lang.IllegalArgumentException in windows

Reviewed-by: rchamyal, serb
---
 .../native/libawt/windows/awt_Component.cpp   |  1 +
 .../native/libawt/windows/awt_Robot.cpp       |  3 +++
 .../ModifierRobotKeyTest.java                 | 26 ++++++++++++-------
 .../AltGraphModifierTest.java                 |  8 ++----
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp
index 746b1114488..781d4c5201e 100644
--- a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp
+++ b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp
@@ -2720,6 +2720,7 @@ KeyMapEntry keyMapTable[] = {
     {java_awt_event_KeyEvent_VK_SHIFT,            VK_SHIFT},
     {java_awt_event_KeyEvent_VK_CONTROL,          VK_CONTROL},
     {java_awt_event_KeyEvent_VK_ALT,              VK_MENU},
+    {java_awt_event_KeyEvent_VK_ALT_GRAPH,        VK_RMENU},
     {java_awt_event_KeyEvent_VK_NUM_LOCK,         VK_NUMLOCK},
 
     // Miscellaneous Windows keys
diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp
index 0528148e23e..3baf7f7448c 100644
--- a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp
+++ b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp
@@ -335,6 +335,9 @@ void AwtRobot::DoKeyEvent( jint jkey, DWORD dwFlags )
     } else {
         // get the scancode from the virtual key
         scancode = ::MapVirtualKey(vkey, 0);
+        if (vkey == VK_RMENU) {
+            dwFlags |= KEYEVENTF_EXTENDEDKEY;
+        }
         keybd_event(vkey, scancode, dwFlags, 0);
     }
 }
diff --git a/jdk/test/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java b/jdk/test/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java
index 5cdc8085255..1e941473061 100644
--- a/jdk/test/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java
+++ b/jdk/test/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -21,17 +21,23 @@
  * questions.
  */
 
-
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.BorderLayout;
+import java.awt.Canvas;
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
 
 import static jdk.testlibrary.Asserts.assertTrue;
 
 /*
- * @test
+ * @test 8155742
  * @summary Make sure that modifier key mask is set when robot press
- * some key with one or more modifiers.
- *
+ *          some key with one or more modifiers.
  * @library ../../../../lib/testlibrary/
  * @build ExtendedRobot
  * @run main ModifierRobotKeyTest
@@ -60,15 +66,17 @@ public class ModifierRobotKeyTest extends KeyAdapter {
     }
 
     public ModifierRobotKeyTest() throws Exception {
-        modifierKeys =  new int[3];
+        modifierKeys =  new int[4];
         modifierKeys[0] = KeyEvent.VK_SHIFT;
         modifierKeys[1] = KeyEvent.VK_CONTROL;
         modifierKeys[2] = KeyEvent.VK_ALT;
+        modifierKeys[3] = KeyEvent.VK_ALT_GRAPH;
 
-        inputMasks = new int[3];
+        inputMasks = new int[4];
         inputMasks[0] =  InputEvent.SHIFT_MASK;
         inputMasks[1] =  InputEvent.CTRL_MASK;
         inputMasks[2] =  InputEvent.ALT_MASK;
+        inputMasks[3] =  InputEvent.ALT_GRAPH_MASK;
 
         modifierStatus = new boolean[modifierKeys.length];
 
diff --git a/jdk/test/java/awt/event/MouseEvent/AltGraphModifierTest/AltGraphModifierTest.java b/jdk/test/java/awt/event/MouseEvent/AltGraphModifierTest/AltGraphModifierTest.java
index 00c471ad7f4..11cd886d598 100644
--- a/jdk/test/java/awt/event/MouseEvent/AltGraphModifierTest/AltGraphModifierTest.java
+++ b/jdk/test/java/awt/event/MouseEvent/AltGraphModifierTest/AltGraphModifierTest.java
@@ -44,12 +44,8 @@ public class AltGraphModifierTest {
                 = {
                     "This test is for verifying Alt-Gr modifier of an event.",
                     "Windows :-",
-                    "1. Please check if Alt-Gr key is present on keyboard.",
-                    "2. If present, press the Alt-Gr key and perform",
-                    "   mouse click on the TestWindow.",
-                    "3. If Alt-Gr key is not present, press Ctrl+Alt keys &",
-                    "   perform mouse click on the TestWindow.",
-                    "4. Test will exit by itself with appropriate result.",
+                    "1. Click Pass.",
+                    "2. Alt-Gr modifier is tested under Robot tests.",
                     " ",
                     "Linux :-",
                     "1. Please check if Alt-Gr key is present on keyboard.",

From b1cc284a24642d5d53e8eddb670d98367131c67b Mon Sep 17 00:00:00 2001
From: Manajit Halder <mhalder@openjdk.org>
Date: Thu, 5 May 2016 16:08:34 +0300
Subject: [PATCH 047/228] 8137137: [macosx] The native dialog doesn't have
 'close'(X) button on Mac

Reviewed-by: psadhukhan, prr
---
 .../RestoreActiveWindowTest.html              |  43 --
 .../RestoreActiveWindowTest.java              | 374 +++++++++---------
 2 files changed, 179 insertions(+), 238 deletions(-)
 delete mode 100644 jdk/test/java/awt/print/Dialog/RestoreActiveWindowTest/RestoreActiveWindowTest.html

diff --git a/jdk/test/java/awt/print/Dialog/RestoreActiveWindowTest/RestoreActiveWindowTest.html b/jdk/test/java/awt/print/Dialog/RestoreActiveWindowTest/RestoreActiveWindowTest.html
deleted file mode 100644
index 9973c033612..00000000000
--- a/jdk/test/java/awt/print/Dialog/RestoreActiveWindowTest/RestoreActiveWindowTest.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
- Copyright (c) 2007, 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.
--->
-
-<html>
-<!--  
-  @test
-  @bug 6365992 6379599
-  @summary REG: Showing and disposing a native print dialog makes the main frame inactive, Win32
-  @author Dmitry.Cherepanov@SUN.COM area=awt.printdialog
-  @run applet/manual=yesno RestoreActiveWindowTest.html
-  -->
-<head>
-<title>RestoreActiveWindowTest</title>
-</head>
-<body>
-
-<h1>RestoreActiveWindowTest<br>Bug ID: 6365992</h1>
-
-<p> See the dialog box (usually in upper left corner) for instructions</p>
-
-<APPLET CODE="RestoreActiveWindowTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
diff --git a/jdk/test/java/awt/print/Dialog/RestoreActiveWindowTest/RestoreActiveWindowTest.java b/jdk/test/java/awt/print/Dialog/RestoreActiveWindowTest/RestoreActiveWindowTest.java
index 66e4148931c..8d29dbb5849 100644
--- a/jdk/test/java/awt/print/Dialog/RestoreActiveWindowTest/RestoreActiveWindowTest.java
+++ b/jdk/test/java/awt/print/Dialog/RestoreActiveWindowTest/RestoreActiveWindowTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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,210 +22,194 @@
  */
 
 /*
-  test
-  @bug 6365992 6379599
-  @summary REG: Showing and disposing a native print dialog makes the main frame inactive, Win32
-  @author Dmitry.Cherepanov@SUN.COM area=awt.printdialog
-  @run applet/manual=yesno RestoreActiveWindowTest.html
-*/
-
-import java.applet.Applet;
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.print.*;
-import javax.print.attribute.*;
-
-public class RestoreActiveWindowTest extends Applet
-{
-    Button showBtn1 = new Button("show a native print dialog");
-    Button showBtn2 = new Button("show a native page dialog");
-
-    public void init()
-    {
-        showBtn1.addActionListener(new ActionListener(){
-                public void actionPerformed(ActionEvent ae) {
-                    PrinterJob.getPrinterJob().printDialog();
-                }
-            });
-        showBtn2.addActionListener(new ActionListener(){
-                public void actionPerformed(ActionEvent ae){
-                    PrinterJob.getPrinterJob().pageDialog(new PageFormat());
-                }
-            });
-
-        add(showBtn1);
-        add(showBtn2);
-
-        String[] instructions = {
-            "1.1) Click on 'show a native print dialog'. A native print dialog will come up.",
-            "1.2) Click on the 'close'(X) button. The dialog will be closed.",
-            "1.3) After the dialog closing another window should become the active window.",
-            "1.4) If there no any active window then the test failed.",
-            "2.1) Click on 'show a native page dialog'. A native page dialog will come up.",
-            "2.2) Click on the 'close'(X) button. The dialog will be closed.",
-            "2.3) After the dialog closing another window should become the active window.",
-            "2.4) If there no any active window then the test failed.",
-            "3) Test Passed."
-        };
-
-        Sysout.createDialogWithInstructions( instructions );
-
-    }//End  init()
-
-   public void start ()
-    {
-      //Get things going.  Request focus, set size, et cetera
-      setSize (200,200);
-      show();
-
-    }// start()
-
-    //The rest of this class is the actions which perform the test...
-
-    //Use Sysout.println to communicate with the user NOT System.out!!
-    //Sysout.println ("Something Happened!");
-
-}// class ManualYesNoTest
-
-/* Place other classes related to the test after this line */
-
-
-
-
-
-/****************************************************
- Standard Test Machinery
- DO NOT modify anything below -- it's a standard
-  chunk of code whose purpose is to make user
-  interaction uniform, and thereby make it simpler
-  to read and understand someone else's test.
- ****************************************************/
-
-/**
- This is part of the standard test machinery.
- It creates a dialog (with the instructions), and is the interface
-  for sending text messages to the user.
- To print the instructions, send an array of strings to Sysout.createDialog
-  WithInstructions method.  Put one line of instructions per array entry.
- To display a message for the tester to see, simply call Sysout.println
-  with the string to be displayed.
- This mimics System.out.println but works within the test harness as well
-  as standalone.
+ * @test
+ * @bug 6365992 6379599 8137137
+ * @summary REG: Showing and disposing a native print dialog makes the main
+ *  frame inactive, Win32
+ * @run main/manual RestoreActiveWindowTest
  */
+import java.awt.Frame;
+import java.awt.Button;
+import java.awt.GridBagLayout;
+import java.awt.Panel;
+import java.awt.TextArea;
+import java.awt.GridLayout;
+import java.awt.GridBagConstraints;
+import java.awt.Color;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.print.PrinterJob;
+import java.awt.print.PageFormat;
 
-class Sysout
-{
-    private static TestDialog dialog;
+public class RestoreActiveWindowTest implements ActionListener {
 
-    public static void createDialogWithInstructions( String[] instructions )
-    {
-        dialog = new TestDialog( new Frame(), "Instructions" );
-        dialog.printInstructions( instructions );
-        dialog.setVisible(true);
-        println( "Any messages for the tester will display here." );
+    private static Frame mainFrame;
+    private static Button printDialogButton;
+    private static Button pageDialogButton;
+    private static Frame instructionFrame;
+    private static GridBagLayout layout;
+    private static Panel mainControlPanel;
+    private static Panel resultButtonPanel;
+    private static TextArea instructionTextArea;
+    private static Button passButton;
+    private static Button failButton;
+    private static Thread mainThread = null;
+    private static boolean testPassed = false;
+    private static boolean isInterrupted = false;
+    private static final int testTimeOut = 300000;
+    private static String testFailMessage;
+
+    public void createAndShowGUI() {
+        mainFrame = new Frame("Test");
+        mainFrame.setSize(200, 200);
+        mainFrame.setLocationRelativeTo(null);
+        mainFrame.setLayout(new GridLayout(2, 1));
+
+        printDialogButton = new Button("show a native print dialog");
+        pageDialogButton = new Button("show a native page dialog");
+        printDialogButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent ae) {
+                PrinterJob.getPrinterJob().printDialog();
+                setButtonEnable(true);
+                testFailMessage = "Print dialog test failed.";
+            }
+        });
+        pageDialogButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent ae) {
+                PrinterJob.getPrinterJob().pageDialog(new PageFormat());
+                setButtonEnable(true);
+                testFailMessage = "Page dialog test failed.";
+            }
+        });
+
+        mainFrame.add(printDialogButton);
+        mainFrame.add(pageDialogButton);
+        mainFrame.setVisible(true);
+
+       mainFrame.addWindowListener(new WindowAdapter() {
+            public void windowClosing(WindowEvent we) {
+                cleanUp();
+                throw new RuntimeException("User has closed the test window "
+                        + "without clicking Pass or Fail.");
+            }
+        });
     }
 
-    public static void createDialog( )
-    {
-        dialog = new TestDialog( new Frame(), "Instructions" );
-        String[] defInstr = { "Instructions will appear here. ", "" } ;
-        dialog.printInstructions( defInstr );
-        dialog.setVisible(true);
-        println( "Any messages for the tester will display here." );
+    private void createInstructionUI() {
+        instructionFrame = new Frame("Native Print Dialog and Page Dialog");
+        layout = new GridBagLayout();
+        mainControlPanel = new Panel(layout);
+        resultButtonPanel = new Panel(layout);
+
+        GridBagConstraints gbc = new GridBagConstraints();
+        String instructions
+                = "\nINSTRUCTIONS:\n"
+                + "\n   1. Click on the 'show a native print dialog' button. A "
+                + "native print dialog will come up."
+                + "\n   2. Click on the 'Cancel' button on Mac OS X or "
+                + "'close'(X) on other paltforms. Dialog will be closed."
+                + "\n   3. After the dialog is closed another window should "
+                + "become the active window."
+                + "\n   4. If there no any active window then the test has "
+                + "failed. Click on 'Fail' Button."
+                + "\n   5. Click on the 'show a native page dialog' button. A "
+                + "native page dialog will come up."
+                + "\n   6. Click on the 'Cancel' button on Mac OS X or "
+                + "'close'(X) on other paltforms. Dialog will be closed."
+                + "\n   7. After the dialog is closed another window should "
+                + "become the active window."
+                + "\n   8. If there no any active window then the test has "
+                + "failed. Click on 'Fail' Button."
+                + "\n   9. Test Passed. Click on 'Pass' Button.";
+
+        instructionTextArea = new TextArea(13, 80);
+        instructionTextArea.setText(instructions);
+        instructionTextArea.setEnabled(false);
+        instructionTextArea.setBackground(Color.white);
+
+        gbc.gridx = 0;
+        gbc.gridy = 0;
+        gbc.weightx = 0.5;
+        gbc.fill = GridBagConstraints.HORIZONTAL;
+        mainControlPanel.add(instructionTextArea, gbc);
+
+        passButton = new Button("Pass");
+        passButton.setName("Pass");
+        passButton.addActionListener((ActionListener) this);
+
+        failButton = new Button("Fail");
+        failButton.setName("Fail");
+        failButton.addActionListener((ActionListener) this);
+
+        setButtonEnable(false);
+
+        gbc.gridx = 0;
+        gbc.gridy = 0;
+        resultButtonPanel.add(passButton, gbc);
+        gbc.gridx = 1;
+        gbc.gridy = 0;
+        resultButtonPanel.add(failButton, gbc);
+        gbc.gridx = 0;
+        gbc.gridy = 1;
+        mainControlPanel.add(resultButtonPanel, gbc);
+
+        instructionFrame.add(mainControlPanel);
+        instructionFrame.pack();
+        instructionFrame.setVisible(true);
     }
 
-
-    public static void printInstructions( String[] instructions )
-    {
-        dialog.printInstructions( instructions );
+    @Override
+    public void actionPerformed(ActionEvent ae) {
+        if (ae.getSource() instanceof Button) {
+            Button btn = (Button) ae.getSource();
+            switch (btn.getName()) {
+                case "Pass":
+                    testPassed = true;
+                    isInterrupted = true;
+                    mainThread.interrupt();
+                    break;
+                case "Fail":
+                    testPassed = false;
+                    isInterrupted = true;
+                    mainThread.interrupt();
+                    break;
+            }
+        }
     }
 
-
-    public static void println( String messageIn )
-    {
-        dialog.displayMessage( messageIn );
+    private static void setButtonEnable(boolean status) {
+        passButton.setEnabled(status);
+        failButton.setEnabled(status);
     }
 
-}// Sysout  class
-
-/**
-  This is part of the standard test machinery.  It provides a place for the
-   test instructions to be displayed, and a place for interactive messages
-   to the user to be displayed.
-  To have the test instructions displayed, see Sysout.
-  To have a message to the user be displayed, see Sysout.
-  Do not call anything in this dialog directly.
-  */
-class TestDialog extends Dialog
-{
-
-    TextArea instructionsText;
-    TextArea messageText;
-    int maxStringLength = 80;
-
-    //DO NOT call this directly, go through Sysout
-    public TestDialog( Frame frame, String name )
-    {
-        super( frame, name );
-        int scrollBoth = TextArea.SCROLLBARS_BOTH;
-        instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth );
-        add( "North", instructionsText );
-
-        messageText = new TextArea( "", 5, maxStringLength, scrollBoth );
-        add("Center", messageText);
-
-        pack();
-
-        setVisible(true);
-    }// TestDialog()
-
-    //DO NOT call this directly, go through Sysout
-    public void printInstructions( String[] instructions )
-    {
-        //Clear out any current instructions
-        instructionsText.setText( "" );
-
-        //Go down array of instruction strings
-
-        String printStr, remainingStr;
-        for( int i=0; i < instructions.length; i++ )
-        {
-            //chop up each into pieces maxSringLength long
-            remainingStr = instructions[ i ];
-            while( remainingStr.length() > 0 )
-            {
-                //if longer than max then chop off first max chars to print
-                if( remainingStr.length() >= maxStringLength )
-                {
-                    //Try to chop on a word boundary
-                    int posOfSpace = remainingStr.
-                        lastIndexOf( ' ', maxStringLength - 1 );
-
-                    if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1;
-
-                    printStr = remainingStr.substring( 0, posOfSpace + 1 );
-                    remainingStr = remainingStr.substring( posOfSpace + 1 );
-                }
-                //else just print
-                else
-                {
-                    printStr = remainingStr;
-                    remainingStr = "";
-                }
-
-                instructionsText.append( printStr + "\n" );
-
-            }// while
-
-        }// for
-
-    }//printInstructions()
-
-    //DO NOT call this directly, go through Sysout
-    public void displayMessage( String messageIn )
-    {
-        messageText.append( messageIn + "\n" );
-        System.out.println(messageIn);
+    private static void cleanUp() {
+        mainFrame.dispose();
+        instructionFrame.dispose();
     }
 
-}// TestDialog  class
+    public static void main(String args[]) {
+        RestoreActiveWindowTest printDialogs = new RestoreActiveWindowTest();
+        printDialogs.createInstructionUI();
+        printDialogs.createAndShowGUI();
+
+        mainThread = Thread.currentThread();
+        try {
+            mainThread.sleep(testTimeOut);
+        } catch (InterruptedException ex) {
+            if (!testPassed) {
+                throw new RuntimeException(testFailMessage);
+            }
+        } finally {
+            cleanUp();
+        }
+
+        if (!isInterrupted) {
+            throw new RuntimeException("Test Timed out after "
+                    + testTimeOut / 1000 + " seconds");
+        }
+    }
+}

From b52c5bbd676a3d78caf1cee59abfa4846f540c9c Mon Sep 17 00:00:00 2001
From: Brent Christian <bchristi@openjdk.org>
Date: Thu, 5 May 2016 11:44:01 -0700
Subject: [PATCH 048/228] 8147039: Incorrect locals and operands in compiled
 frames

Implement stack walking using javaVFrame instead of vframeStream

Reviewed-by: mchung, vlivanov
---
 .../lang/StackWalker/CountLocalSlots.java     |  61 +++
 .../lang/StackWalker/LocalsAndOperands.java   | 378 ++++++++++++++----
 .../java/lang/StackWalker/LocalsCrash.java    |  74 ++++
 3 files changed, 439 insertions(+), 74 deletions(-)
 create mode 100644 jdk/test/java/lang/StackWalker/CountLocalSlots.java
 create mode 100644 jdk/test/java/lang/StackWalker/LocalsCrash.java

diff --git a/jdk/test/java/lang/StackWalker/CountLocalSlots.java b/jdk/test/java/lang/StackWalker/CountLocalSlots.java
new file mode 100644
index 00000000000..c78a4cb7bf4
--- /dev/null
+++ b/jdk/test/java/lang/StackWalker/CountLocalSlots.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2016 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 8147039
+ * @summary Confirm locals[] always has expected length, even for "dead" locals
+ * @compile LocalsAndOperands.java
+ * @run testng/othervm -Xcomp CountLocalSlots
+ */
+
+import org.testng.annotations.Test;
+import java.lang.StackWalker.StackFrame;
+
+public class CountLocalSlots {
+    final static boolean debug = true;
+
+    @Test(dataProvider = "provider", dataProviderClass = LocalsAndOperands.class)
+    public void countLocalSlots(StackFrame... frames) {
+        for (StackFrame frame : frames) {
+            if (debug) {
+                System.out.println("Running countLocalSlots");
+                LocalsAndOperands.dumpStackWithLocals(frames);
+            }
+            // Confirm expected number of locals
+            String methodName = frame.getMethodName();
+            Integer expectedObj = (Integer) LocalsAndOperands.Tester.NUM_LOCALS.get(methodName);
+            if (expectedObj == null) {
+                if (!debug) { LocalsAndOperands.dumpStackWithLocals(frames); }
+                throw new RuntimeException("No NUM_LOCALS entry for " +
+                        methodName + "().  Update test?");
+            }
+            Object[] locals = (Object[]) LocalsAndOperands.invokeGetLocals(frame);
+            if (locals.length != expectedObj) {
+                if (!debug) { LocalsAndOperands.dumpStackWithLocals(frames); }
+                throw new RuntimeException(methodName + "(): number of locals (" +
+                        locals.length + ") did not match expected (" + expectedObj + ")");
+            }
+        }
+    }
+}
diff --git a/jdk/test/java/lang/StackWalker/LocalsAndOperands.java b/jdk/test/java/lang/StackWalker/LocalsAndOperands.java
index 63a6731a164..b253ab27e81 100644
--- a/jdk/test/java/lang/StackWalker/LocalsAndOperands.java
+++ b/jdk/test/java/lang/StackWalker/LocalsAndOperands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016 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,17 +23,20 @@
 
 /*
  * @test
- * @bug 8020968
- * @summary Sanity test for locals and operands
- * @run main LocalsAndOperands
+ * @bug 8020968 8147039
+ * @summary Tests for locals and operands
+ * @run testng LocalsAndOperands
  */
 
+import org.testng.annotations.*;
 import java.lang.StackWalker.StackFrame;
 import java.lang.reflect.*;
-import java.util.List;
-import java.util.stream.Collectors;
+import java.util.*;
+import java.util.stream.*;
 
 public class LocalsAndOperands {
+    static final boolean debug = true;
+
     static Class<?> liveStackFrameClass;
     static Class<?> primitiveValueClass;
     static StackWalker extendedWalker;
@@ -41,92 +44,319 @@ public class LocalsAndOperands {
     static Method getOperands;
     static Method getMonitors;
     static Method primitiveType;
-    public static void main(String... args) throws Exception {
-        liveStackFrameClass = Class.forName("java.lang.LiveStackFrame");
-        primitiveValueClass = Class.forName("java.lang.LiveStackFrame$PrimitiveValue");
 
-        getLocals = liveStackFrameClass.getDeclaredMethod("getLocals");
-        getLocals.setAccessible(true);
+    static {
+        try {
+            liveStackFrameClass = Class.forName("java.lang.LiveStackFrame");
+            primitiveValueClass = Class.forName("java.lang.LiveStackFrame$PrimitiveValue");
 
-        getOperands = liveStackFrameClass.getDeclaredMethod("getStack");
-        getOperands.setAccessible(true);
+            getLocals = liveStackFrameClass.getDeclaredMethod("getLocals");
+            getLocals.setAccessible(true);
 
-        getMonitors = liveStackFrameClass.getDeclaredMethod("getMonitors");
-        getMonitors.setAccessible(true);
+            getOperands = liveStackFrameClass.getDeclaredMethod("getStack");
+            getOperands.setAccessible(true);
 
-        primitiveType = primitiveValueClass.getDeclaredMethod("type");
-        primitiveType.setAccessible(true);
+            getMonitors = liveStackFrameClass.getDeclaredMethod("getMonitors");
+            getMonitors.setAccessible(true);
 
-        Method method = liveStackFrameClass.getMethod("getStackWalker");
-        method.setAccessible(true);
-        extendedWalker = (StackWalker) method.invoke(null);
-        new LocalsAndOperands(extendedWalker, true).test();
+            primitiveType = primitiveValueClass.getDeclaredMethod("type");
+            primitiveType.setAccessible(true);
 
-        // no access to local and operands.
-        new LocalsAndOperands(StackWalker.getInstance(), false).test();
+            Method method = liveStackFrameClass.getMethod("getStackWalker");
+            method.setAccessible(true);
+            extendedWalker = (StackWalker) method.invoke(null);
+        } catch (Throwable t) { throw new RuntimeException(t); }
     }
 
-    private final StackWalker walker;
-    private final boolean extended;
-    LocalsAndOperands(StackWalker walker, boolean extended) {
-        this.walker = walker;
-        this.extended = extended;
+    /** Helper method to return a StackFrame's locals */
+    static Object[] invokeGetLocals(StackFrame arg) {
+        try {
+            return (Object[]) getLocals.invoke(arg);
+        } catch (Exception e) { throw new RuntimeException(e); }
     }
 
-    synchronized void test() throws Exception {
-        int x = 10;
-        char c = 'z';
-        String hi = "himom";
-        long l = 1000000L;
-        double d =  3.1415926;
+    /*****************
+     * DataProviders *
+     *****************/
 
-        List<StackWalker.StackFrame> frames = walker.walk(s -> s.collect(Collectors.toList()));
-        if (extended) {
-            for (StackWalker.StackFrame f : frames) {
-                System.out.println("frame: " + f);
-                Object[] locals = (Object[]) getLocals.invoke(f);
+    /** Calls testLocals() and provides LiveStackFrames for testLocals* methods */
+    @DataProvider
+    public static StackFrame[][] provider() {
+        return new StackFrame[][] {
+            new Tester().testLocals()
+        };
+    }
+
+    /**
+     * Calls testLocalsKeepAlive() and provides LiveStackFrames for testLocals* methods.
+     * Local variables in testLocalsKeepAlive() are ensured to not become dead.
+     */
+    @DataProvider
+    public static StackFrame[][] keepAliveProvider() {
+        return new StackFrame[][] {
+            new Tester().testLocalsKeepAlive()
+        };
+    }
+
+    /**
+     * Provides StackFrames from a StackWalker without the LOCALS_AND_OPERANDS
+     * option.
+     */
+    @DataProvider
+    public static StackFrame[][] noLocalsProvider() {
+        // Use default StackWalker
+        return new StackFrame[][] {
+            new Tester(StackWalker.getInstance(), true).testLocals()
+        };
+    }
+
+    /**
+     * Calls testLocals() and provides LiveStackFrames for *all* called methods,
+     * including test infrastructure (jtreg, testng, etc)
+     *
+     */
+    @DataProvider
+    public static StackFrame[][] unfilteredProvider() {
+        return new StackFrame[][] {
+            new Tester(extendedWalker, false).testLocals()
+        };
+    }
+
+    /****************
+     * Test methods *
+     ****************/
+
+    /**
+     * Check for expected local values and types in the LiveStackFrame
+     */
+    @Test(dataProvider = "keepAliveProvider")
+    public static void checkLocalValues(StackFrame... frames) {
+        if (debug) {
+            System.out.println("Running checkLocalValues");
+            dumpStackWithLocals(frames);
+        }
+        Arrays.stream(frames).filter(f -> f.getMethodName()
+                                           .equals("testLocalsKeepAlive"))
+                                           .forEach(
+            f -> {
+                Object[] locals = invokeGetLocals(f);
                 for (int i = 0; i < locals.length; i++) {
-                    System.out.format("  local %d: %s type %s\n", i, locals[i], type(locals[i]));
+                    // Value
+                    String expected = Tester.LOCAL_VALUES[i];
+                    Object observed = locals[i];
+                    if (expected != null /* skip nulls in golden values */ &&
+                            !expected.equals(observed.toString())) {
+                        System.err.println("Local value mismatch:");
+                        if (!debug) { dumpStackWithLocals(frames); }
+                        throw new RuntimeException("local " + i + " value is " +
+                                observed + ", expected " + expected);
+                    }
 
-                    // check for non-null locals in LocalsAndOperands.test()
-                    if (f.getClassName().equals("LocalsAndOperands") &&
-                            f.getMethodName().equals("test")) {
-                        if (locals[i] == null) {
-                            throw new RuntimeException("kept-alive locals should not be null");
-                        }
+                    // Type
+                    expected = Tester.LOCAL_TYPES[i];
+                    observed = type(locals[i]);
+                    if (expected != null /* skip nulls in golden values */ &&
+                            !expected.equals(observed)) {
+                        System.err.println("Local type mismatch:");
+                        if (!debug) { dumpStackWithLocals(frames); }
+                        throw new RuntimeException("local " + i + " type is " +
+                                observed + ", expected " + expected);
                     }
                 }
-
-                Object[] operands = (Object[]) getOperands.invoke(f);
-                for (int i = 0; i < operands.length; i++) {
-                    System.out.format("  operand %d: %s type %s%n", i, operands[i],
-                                      type(operands[i]));
-                }
-
-                Object[] monitors = (Object[]) getMonitors.invoke(f);
-                for (int i = 0; i < monitors.length; i++) {
-                    System.out.format("  monitor %d: %s%n", i, monitors[i]);
-                }
             }
-        } else {
-            for (StackFrame f : frames) {
-                if (liveStackFrameClass.isInstance(f)) {
-                    throw new RuntimeException("should not be LiveStackFrame");
-                }
-            }
-        }
-        // Use local variables so they stay alive
-        System.out.println("Stayin' alive: "+x+" "+c+" "+hi+" "+l+" "+d);
+        );
     }
 
-    String type(Object o) throws Exception {
-        if (o == null) {
-            return "null";
-        } else if (primitiveValueClass.isInstance(o)) {
-            char c = (char)primitiveType.invoke(o);
-            return String.valueOf(c);
-        } else {
-            return o.getClass().getName();
+    /**
+     * Basic sanity check for locals and operands
+     */
+    @Test(dataProvider = "provider")
+    public static void sanityCheck(StackFrame... frames) {
+        if (debug) {
+            System.out.println("Running sanityCheck");
         }
+        try {
+            Stream<StackFrame> stream = Arrays.stream(frames);
+            if (debug) {
+                stream.forEach(LocalsAndOperands::printLocals);
+            } else {
+                System.out.println(stream.count() + " frames");
+            }
+        } catch (Throwable t) {
+            dumpStackWithLocals(frames);
+            throw t;
+        }
+    }
+
+    /**
+     * Sanity check for locals and operands, including testng/jtreg frames
+     */
+    @Test(dataProvider = "unfilteredProvider")
+    public static void unfilteredSanityCheck(StackFrame... frames) {
+        if (debug) {
+            System.out.println("Running unfilteredSanityCheck");
+        }
+        try {
+            Stream<StackFrame> stream = Arrays.stream(frames);
+            if (debug) {
+                stream.forEach(f -> { System.out.println(f + ": " +
+                        invokeGetLocals(f).length + " locals"); } );
+            } else {
+                System.out.println(stream.count() + " frames");
+            }
+        } catch (Throwable t) {
+            dumpStackWithLocals(frames);
+            throw t;
+        }
+    }
+
+    /**
+     * Test that LiveStackFrames are not provided with the default StackWalker
+     * options.
+     */
+    @Test(dataProvider = "noLocalsProvider")
+    public static void withoutLocalsAndOperands(StackFrame... frames) {
+        for (StackFrame frame : frames) {
+            if (liveStackFrameClass.isInstance(frame)) {
+                throw new RuntimeException("should not be LiveStackFrame");
+            }
+        }
+    }
+
+    static class Tester {
+        private StackWalker walker;
+        private boolean filter = true; // Filter out testng/jtreg/etc frames?
+
+        Tester() {
+            this.walker = extendedWalker;
+        }
+
+        Tester(StackWalker walker, boolean filter) {
+            this.walker = walker;
+            this.filter = filter;
+        }
+
+        /**
+         * Perform stackwalk without keeping local variables alive and return an
+         * array of the collected StackFrames
+         */
+        private synchronized StackFrame[] testLocals() {
+            // Unused local variables will become dead
+            int x = 10;
+            char c = 'z';
+            String hi = "himom";
+            long l = 1000000L;
+            double d =  3.1415926;
+
+            if (filter) {
+                return walker.walk(s -> s.filter(f -> TEST_METHODS.contains(f
+                        .getMethodName())).collect(Collectors.toList()))
+                        .toArray(new StackFrame[0]);
+            } else {
+                return walker.walk(s -> s.collect(Collectors.toList()))
+                        .toArray(new StackFrame[0]);
+            }
+        }
+
+        /**
+         * Perform stackwalk, keeping local variables alive, and return a list of
+         * the collected StackFrames
+         */
+        private synchronized StackFrame[] testLocalsKeepAlive() {
+            int x = 10;
+            char c = 'z';
+            String hi = "himom";
+            long l = 1000000L;
+            double d =  3.1415926;
+
+            List<StackWalker.StackFrame> frames;
+            if (filter) {
+                frames = walker.walk(s -> s.filter(f -> TEST_METHODS.contains(f
+                        .getMethodName())).collect(Collectors.toList()));
+            } else {
+                frames = walker.walk(s -> s.collect(Collectors.toList()));
+            }
+
+            // Use local variables so they stay alive
+            System.out.println("Stayin' alive: "+x+" "+c+" "+hi+" "+l+" "+d);
+            return frames.toArray(new StackFrame[0]); // FIXME: convert to Array here
+        }
+
+        // Expected values for locals in testLocals() & testLocalsKeepAlive()
+        // TODO: use real values instead of Strings, rebuild doubles & floats, etc
+        private final static String[] LOCAL_VALUES = new String[] {
+            null, // skip, LocalsAndOperands$Tester@XXX identity is different each run
+            "10",
+            "122",
+            "himom",
+            "0",
+            null, // skip, fix in 8156073
+            null, // skip, fix in 8156073
+            null, // skip, fix in 8156073
+            "0"
+        };
+
+        // Expected types for locals in testLocals() & testLocalsKeepAlive()
+        // TODO: use real types
+        private final static String[] LOCAL_TYPES = new String[] {
+            null, // skip
+            "I",
+            "I",
+            "java.lang.String",
+            "I",
+            "I",
+            "I",
+            "I",
+            "I"
+        };
+
+        final static Map NUM_LOCALS = Map.of("testLocals", 8,
+                                             "testLocalsKeepAlive",
+                                             LOCAL_VALUES.length);
+        private final static Collection<String> TEST_METHODS = NUM_LOCALS.keySet();
+    }
+
+    /**
+     * Print stack trace with locals
+     */
+    public static void dumpStackWithLocals(StackFrame...frames) {
+        Arrays.stream(frames).forEach(LocalsAndOperands::printLocals);
+    }
+
+    /**
+     * Print the StackFrame and an indexed list of its locals
+     */
+    public static void printLocals(StackWalker.StackFrame frame) {
+        try {
+            System.out.println(frame);
+            Object[] locals = (Object[]) getLocals.invoke(frame);
+            for (int i = 0; i < locals.length; i++) {
+                System.out.format("  local %d: %s type %s\n", i, locals[i], type(locals[i]));
+            }
+
+            Object[] operands = (Object[]) getOperands.invoke(frame);
+            for (int i = 0; i < operands.length; i++) {
+                System.out.format("  operand %d: %s type %s%n", i, operands[i],
+                                  type(operands[i]));
+            }
+
+            Object[] monitors = (Object[]) getMonitors.invoke(frame);
+            for (int i = 0; i < monitors.length; i++) {
+                System.out.format("  monitor %d: %s%n", i, monitors[i]);
+            }
+        } catch (Exception e) { throw new RuntimeException(e); }
+    }
+
+    private static String type(Object o) {
+        try {
+            if (o == null) {
+                return "null";
+            } else if (primitiveValueClass.isInstance(o)) {
+                char c = (char)primitiveType.invoke(o);
+                return String.valueOf(c);
+            } else {
+                return o.getClass().getName();
+            }
+        } catch(Exception e) { throw new RuntimeException(e); }
     }
 }
diff --git a/jdk/test/java/lang/StackWalker/LocalsCrash.java b/jdk/test/java/lang/StackWalker/LocalsCrash.java
new file mode 100644
index 00000000000..b50dd263f00
--- /dev/null
+++ b/jdk/test/java/lang/StackWalker/LocalsCrash.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2016 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 8147039
+ * @summary Test for -Xcomp crash that happened before 8147039 fix
+ * @run testng/othervm -Xcomp LocalsCrash
+ */
+
+import org.testng.annotations.*;
+import java.lang.reflect.*;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class LocalsCrash {
+    static Class<?> liveStackFrameClass;
+    static Method getStackWalker;
+
+    static {
+        try {
+            liveStackFrameClass = Class.forName("java.lang.LiveStackFrame");
+            getStackWalker = liveStackFrameClass.getMethod("getStackWalker");
+            getStackWalker.setAccessible(true);
+        } catch (Throwable t) { throw new RuntimeException(t); }
+    }
+
+    private StackWalker walker;
+
+    LocalsCrash() {
+        try {
+            walker = (StackWalker) getStackWalker.invoke(null);
+        } catch (Exception e) { throw new RuntimeException(e); }
+    }
+
+    @Test
+    public void test00() { doStackWalk(); }
+
+    @Test
+    public void test01() { doStackWalk(); }
+
+    private synchronized List<StackWalker.StackFrame> doStackWalk() {
+        try {
+            // Unused local variables will become dead
+            int x = 10;
+            char c = 'z';
+            String hi = "himom";
+            long l = 1000000L;
+            double d =  3.1415926;
+
+            return walker.walk(s -> s.collect(Collectors.toList()));
+        } catch (Exception e) { throw new RuntimeException(e); }
+    }
+}

From 3d8d9fe7fa31fe7302e0d06274bf6980a53dd434 Mon Sep 17 00:00:00 2001
From: Paul Sandoz <psandoz@openjdk.org>
Date: Thu, 5 May 2016 18:14:47 -0700
Subject: [PATCH 049/228] 8155794: Move Objects.checkIndex BiFunction accepting
 methods to an internal package

Reviewed-by: chegar, shade, forax, vlivanov
---
 .../classes/java/lang/invoke/VarHandle.java   |   4 +-
 .../lang/invoke/X-VarHandle.java.template     |  36 +-
 .../X-VarHandleByteArrayView.java.template    |   7 +-
 .../share/classes/java/util/Objects.java      | 343 +----------------
 .../jdk/internal/util/Preconditions.java      | 346 ++++++++++++++++++
 jdk/test/java/util/Objects/CheckIndex.java    |  70 ++--
 6 files changed, 414 insertions(+), 392 deletions(-)
 create mode 100644 jdk/src/java.base/share/classes/jdk/internal/util/Preconditions.java

diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/VarHandle.java b/jdk/src/java.base/share/classes/java/lang/invoke/VarHandle.java
index cf869b3ebe7..8b555bcf7e2 100644
--- a/jdk/src/java.base/share/classes/java/lang/invoke/VarHandle.java
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/VarHandle.java
@@ -26,6 +26,7 @@
 package java.lang.invoke;
 
 import jdk.internal.HotSpotIntrinsicCandidate;
+import jdk.internal.util.Preconditions;
 import jdk.internal.vm.annotation.ForceInline;
 
 import java.lang.reflect.Method;
@@ -34,7 +35,6 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
@@ -1380,7 +1380,7 @@ public abstract class VarHandle {
     }
 
     static final BiFunction<String, List<Integer>, ArrayIndexOutOfBoundsException>
-            AIOOBE_SUPPLIER = Objects.outOfBoundsExceptionFormatter(
+            AIOOBE_SUPPLIER = Preconditions.outOfBoundsExceptionFormatter(
             new Function<String, ArrayIndexOutOfBoundsException>() {
                 @Override
                 public ArrayIndexOutOfBoundsException apply(String s) {
diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template b/jdk/src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template
index bcec64bd390..20514c79bf0 100644
--- a/jdk/src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template
@@ -24,9 +24,11 @@
  */
 package java.lang.invoke;
 
-import java.util.Objects;
+import jdk.internal.util.Preconditions;
 import jdk.internal.vm.annotation.ForceInline;
 
+import java.util.Objects;
+
 import static java.lang.invoke.MethodHandleStatics.UNSAFE;
 
 #warn
@@ -407,7 +409,7 @@ final class VarHandle$Type$s {
             $type$[] array = ($type$[]) oarray;
 #end[Object]
             return UNSAFE.get$Type$Volatile(array,
-                    (((long) Objects.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase);
+                    (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase);
         }
 
         @ForceInline
@@ -418,7 +420,7 @@ final class VarHandle$Type$s {
             $type$[] array = ($type$[]) oarray;
 #end[Object]
             UNSAFE.put$Type$Volatile(array,
-                    (((long) Objects.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
+                    (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
                     {#if[Object]?handle.componentType.cast(value):value});
         }
 
@@ -430,7 +432,7 @@ final class VarHandle$Type$s {
             $type$[] array = ($type$[]) oarray;
 #end[Object]
             return UNSAFE.get$Type$Opaque(array,
-                    (((long) Objects.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase);
+                    (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase);
         }
 
         @ForceInline
@@ -441,7 +443,7 @@ final class VarHandle$Type$s {
             $type$[] array = ($type$[]) oarray;
 #end[Object]
             UNSAFE.put$Type$Opaque(array,
-                    (((long) Objects.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
+                    (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
                     {#if[Object]?handle.componentType.cast(value):value});
         }
 
@@ -453,7 +455,7 @@ final class VarHandle$Type$s {
             $type$[] array = ($type$[]) oarray;
 #end[Object]
             return UNSAFE.get$Type$Acquire(array,
-                    (((long) Objects.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase);
+                    (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase);
         }
 
         @ForceInline
@@ -464,7 +466,7 @@ final class VarHandle$Type$s {
             $type$[] array = ($type$[]) oarray;
 #end[Object]
             UNSAFE.put$Type$Release(array,
-                    (((long) Objects.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
+                    (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
                     {#if[Object]?handle.componentType.cast(value):value});
         }
 #if[CAS]
@@ -477,7 +479,7 @@ final class VarHandle$Type$s {
             $type$[] array = ($type$[]) oarray;
 #end[Object]
             return UNSAFE.compareAndSwap$Type$(array,
-                    (((long) Objects.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
+                    (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
                     {#if[Object]?handle.componentType.cast(expected):expected},
                     {#if[Object]?handle.componentType.cast(value):value});
         }
@@ -490,7 +492,7 @@ final class VarHandle$Type$s {
             $type$[] array = ($type$[]) oarray;
 #end[Object]
             return UNSAFE.compareAndExchange$Type$Volatile(array,
-                    (((long) Objects.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
+                    (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
                     {#if[Object]?handle.componentType.cast(expected):expected},
                     {#if[Object]?handle.componentType.cast(value):value});
         }
@@ -503,7 +505,7 @@ final class VarHandle$Type$s {
             $type$[] array = ($type$[]) oarray;
 #end[Object]
             return UNSAFE.compareAndExchange$Type$Acquire(array,
-                    (((long) Objects.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
+                    (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
                     {#if[Object]?handle.componentType.cast(expected):expected},
                     {#if[Object]?handle.componentType.cast(value):value});
         }
@@ -516,7 +518,7 @@ final class VarHandle$Type$s {
             $type$[] array = ($type$[]) oarray;
 #end[Object]
             return UNSAFE.compareAndExchange$Type$Release(array,
-                    (((long) Objects.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
+                    (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
                     {#if[Object]?handle.componentType.cast(expected):expected},
                     {#if[Object]?handle.componentType.cast(value):value});
         }
@@ -529,7 +531,7 @@ final class VarHandle$Type$s {
             $type$[] array = ($type$[]) oarray;
 #end[Object]
             return UNSAFE.weakCompareAndSwap$Type$(array,
-                    (((long) Objects.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
+                    (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
                     {#if[Object]?handle.componentType.cast(expected):expected},
                     {#if[Object]?handle.componentType.cast(value):value});
         }
@@ -542,7 +544,7 @@ final class VarHandle$Type$s {
             $type$[] array = ($type$[]) oarray;
 #end[Object]
             return UNSAFE.weakCompareAndSwap$Type$Acquire(array,
-                    (((long) Objects.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
+                    (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
                     {#if[Object]?handle.componentType.cast(expected):expected},
                     {#if[Object]?handle.componentType.cast(value):value});
         }
@@ -555,7 +557,7 @@ final class VarHandle$Type$s {
             $type$[] array = ($type$[]) oarray;
 #end[Object]
             return UNSAFE.weakCompareAndSwap$Type$Release(array,
-                    (((long) Objects.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
+                    (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
                     {#if[Object]?handle.componentType.cast(expected):expected},
                     {#if[Object]?handle.componentType.cast(value):value});
         }
@@ -568,7 +570,7 @@ final class VarHandle$Type$s {
             $type$[] array = ($type$[]) oarray;
 #end[Object]
             return UNSAFE.getAndSet$Type$(array,
-                    (((long) Objects.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
+                    (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
                     {#if[Object]?handle.componentType.cast(value):value});
         }
 #end[CAS]
@@ -582,7 +584,7 @@ final class VarHandle$Type$s {
             $type$[] array = ($type$[]) oarray;
 #end[Object]
             return UNSAFE.getAndAdd$Type$(array,
-                    (((long) Objects.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
+                    (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
                     value);
         }
 
@@ -594,7 +596,7 @@ final class VarHandle$Type$s {
             $type$[] array = ($type$[]) oarray;
 #end[Object]
             return UNSAFE.getAndAdd$Type$(array,
-                    (((long) Objects.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
+                    (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
                     value) + value;
         }
 #end[AtomicAdd]
diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template b/jdk/src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template
index bdc77a820d2..f0721b60778 100644
--- a/jdk/src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template
@@ -25,6 +25,7 @@
 package java.lang.invoke;
 
 import jdk.internal.misc.Unsafe;
+import jdk.internal.util.Preconditions;
 import jdk.internal.vm.annotation.ForceInline;
 
 import java.nio.ByteBuffer;
@@ -78,7 +79,7 @@ final class VarHandleByteArrayAs$Type$s extends VarHandleByteArrayBase {
 
         @ForceInline
         static int index(byte[] ba, int index) {
-            return Objects.checkIndex(index, ba.length - ALIGN, null);
+            return Preconditions.checkIndex(index, ba.length - ALIGN, null);
         }
 
         @ForceInline
@@ -287,14 +288,14 @@ final class VarHandleByteArrayAs$Type$s extends VarHandleByteArrayBase {
 
         @ForceInline
         static int index(ByteBuffer bb, int index) {
-            return Objects.checkIndex(index, UNSAFE.getInt(bb, BUFFER_LIMIT) - ALIGN, null);
+            return Preconditions.checkIndex(index, UNSAFE.getInt(bb, BUFFER_LIMIT) - ALIGN, null);
         }
 
         @ForceInline
         static int indexRO(ByteBuffer bb, int index) {
             if (UNSAFE.getBoolean(bb, BYTE_BUFFER_IS_READ_ONLY))
                 throw new ReadOnlyBufferException();
-            return Objects.checkIndex(index, UNSAFE.getInt(bb, BUFFER_LIMIT) - ALIGN, null);
+            return Preconditions.checkIndex(index, UNSAFE.getInt(bb, BUFFER_LIMIT) - ALIGN, null);
         }
 
         @ForceInline
diff --git a/jdk/src/java.base/share/classes/java/util/Objects.java b/jdk/src/java.base/share/classes/java/util/Objects.java
index 28b39d08969..dad583b9206 100644
--- a/jdk/src/java.base/share/classes/java/util/Objects.java
+++ b/jdk/src/java.base/share/classes/java/util/Objects.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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,10 +25,9 @@
 
 package java.util;
 
-import jdk.internal.HotSpotIntrinsicCandidate;
+import jdk.internal.util.Preconditions;
+import jdk.internal.vm.annotation.ForceInline;
 
-import java.util.function.BiFunction;
-import java.util.function.Function;
 import java.util.function.Supplier;
 
 /**
@@ -348,172 +347,6 @@ public final class Objects {
         return obj;
     }
 
-    /**
-     * Maps out-of-bounds values to a runtime exception.
-     *
-     * @param checkKind the kind of bounds check, whose name may correspond
-     *        to the name of one of the range check methods, checkIndex,
-     *        checkFromToIndex, checkFromIndexSize
-     * @param args the out-of-bounds arguments that failed the range check.
-     *        If the checkKind corresponds a the name of a range check method
-     *        then the bounds arguments are those that can be passed in order
-     *        to the method.
-     * @param oobef the exception formatter that when applied with a checkKind
-     *        and a list out-of-bounds arguments returns a runtime exception.
-     *        If {@code null} then, it is as if an exception formatter was
-     *        supplied that returns {@link IndexOutOfBoundsException} for any
-     *        given arguments.
-     * @return the runtime exception
-     */
-    private static RuntimeException outOfBounds(
-            BiFunction<String, List<Integer>, ? extends RuntimeException> oobef,
-            String checkKind,
-            Integer... args) {
-        List<Integer> largs = List.of(args);
-        RuntimeException e = oobef == null
-                             ? null : oobef.apply(checkKind, largs);
-        return e == null
-               ? new IndexOutOfBoundsException(outOfBoundsMessage(checkKind, largs)) : e;
-    }
-
-    // Specific out-of-bounds exception producing methods that avoid
-    // the varargs-based code in the critical methods there by reducing their
-    // the byte code size, and therefore less likely to peturb inlining
-
-    private static RuntimeException outOfBoundsCheckIndex(
-            BiFunction<String, List<Integer>, ? extends RuntimeException> oobe,
-            int index, int length) {
-        return outOfBounds(oobe, "checkIndex", index, length);
-    }
-
-    private static RuntimeException outOfBoundsCheckFromToIndex(
-            BiFunction<String, List<Integer>, ? extends RuntimeException> oobe,
-            int fromIndex, int toIndex, int length) {
-        return outOfBounds(oobe, "checkFromToIndex", fromIndex, toIndex, length);
-    }
-
-    private static RuntimeException outOfBoundsCheckFromIndexSize(
-            BiFunction<String, List<Integer>, ? extends RuntimeException> oobe,
-            int fromIndex, int size, int length) {
-        return outOfBounds(oobe, "checkFromIndexSize", fromIndex, size, length);
-    }
-
-    /**
-     * Returns an out-of-bounds exception formatter from an given exception
-     * factory.  The exception formatter is a function that formats an
-     * out-of-bounds message from its arguments and applies that message to the
-     * given exception factory to produce and relay an exception.
-     *
-     * <p>The exception formatter accepts two arguments: a {@code String}
-     * describing the out-of-bounds range check that failed, referred to as the
-     * <em>check kind</em>; and a {@code List<Integer>} containing the
-     * out-of-bound integer values that failed the check.  The list of
-     * out-of-bound values is not modified.
-     *
-     * <p>Three check kinds are supported {@code checkIndex},
-     * {@code checkFromToIndex} and {@code checkFromIndexSize} corresponding
-     * respectively to the specified application of an exception formatter as an
-     * argument to the out-of-bounds range check methods
-     * {@link #checkIndex(int, int, BiFunction) checkIndex},
-     * {@link #checkFromToIndex(int, int, int, BiFunction) checkFromToIndex}, and
-     * {@link #checkFromIndexSize(int, int, int, BiFunction) checkFromIndexSize}.
-     * Thus a supported check kind corresponds to a method name and the
-     * out-of-bound integer values correspond to method argument values, in
-     * order, preceding the exception formatter argument (similar in many
-     * respects to the form of arguments required for a reflective invocation of
-     * such a range check method).
-     *
-     * <p>Formatter arguments conforming to such supported check kinds will
-     * produce specific exception messages describing failed out-of-bounds
-     * checks.  Otherwise, more generic exception messages will be produced in
-     * any of the following cases: the check kind is supported but fewer
-     * or more out-of-bounds values are supplied, the check kind is not
-     * supported, the check kind is {@code null}, or the list of out-of-bound
-     * values is {@code null}.
-     *
-     * @apiNote
-     * This method produces an out-of-bounds exception formatter that can be
-     * passed as an argument to any of the supported out-of-bounds range check
-     * methods declared by {@code Objects}.  For example, a formatter producing
-     * an {@code ArrayIndexOutOfBoundsException} may be produced and stored on a
-     * {@code static final} field as follows:
-     * <pre>{@code
-     * static final
-     * BiFunction<String, List<Integer>, ArrayIndexOutOfBoundsException> AIOOBEF =
-     *     outOfBoundsExceptionFormatter(ArrayIndexOutOfBoundsException::new);
-     * }</pre>
-     * The formatter instance {@code AIOOBEF} may be passed as an argument to an
-     * out-of-bounds range check method, such as checking if an {@code index}
-     * is within the bounds of a {@code limit}:
-     * <pre>{@code
-     * checkIndex(index, limit, AIOOBEF);
-     * }</pre>
-     * If the bounds check fails then the range check method will throw an
-     * {@code ArrayIndexOutOfBoundsException} with an appropriate exception
-     * message that is a produced from {@code AIOOBEF} as follows:
-     * <pre>{@code
-     * AIOOBEF.apply("checkIndex", List.of(index, limit));
-     * }</pre>
-     *
-     * @param f the exception factory, that produces an exception from a message
-     *        where the message is produced and formatted by the returned
-     *        exception formatter.  If this factory is stateless and side-effect
-     *        free then so is the returned formatter.
-     *        Exceptions thrown by the factory are relayed to the caller
-     *        of the returned formatter.
-     * @param <X> the type of runtime exception to be returned by the given
-     *        exception factory and relayed by the exception formatter
-     * @return the out-of-bounds exception formatter
-     */
-    public static <X extends RuntimeException>
-    BiFunction<String, List<Integer>, X> outOfBoundsExceptionFormatter(Function<String, X> f) {
-        // Use anonymous class to avoid bootstrap issues if this method is
-        // used early in startup
-        return new BiFunction<String, List<Integer>, X>() {
-            @Override
-            public X apply(String checkKind, List<Integer> args) {
-                return f.apply(outOfBoundsMessage(checkKind, args));
-            }
-        };
-    }
-
-    private static String outOfBoundsMessage(String checkKind, List<Integer> args) {
-        if (checkKind == null && args == null) {
-            return String.format("Range check failed");
-        } else if (checkKind == null) {
-            return String.format("Range check failed: %s", args);
-        } else if (args == null) {
-            return String.format("Range check failed: %s", checkKind);
-        }
-
-        int argSize = 0;
-        switch (checkKind) {
-            case "checkIndex":
-                argSize = 2;
-                break;
-            case "checkFromToIndex":
-            case "checkFromIndexSize":
-                argSize = 3;
-                break;
-            default:
-        }
-
-        // Switch to default if fewer or more arguments than required are supplied
-        switch ((args.size() != argSize) ? "" : checkKind) {
-            case "checkIndex":
-                return String.format("Index %d out-of-bounds for length %d",
-                                     args.get(0), args.get(1));
-            case "checkFromToIndex":
-                return String.format("Range [%d, %d) out-of-bounds for length %d",
-                                     args.get(0), args.get(1), args.get(2));
-            case "checkFromIndexSize":
-                return String.format("Range [%d, %<d + %d) out-of-bounds for length %d",
-                                     args.get(0), args.get(1), args.get(2));
-            default:
-                return String.format("Range check failed: %s %s", checkKind, args);
-        }
-    }
-
     /**
      * Checks if the {@code index} is within the bounds of the range from
      * {@code 0} (inclusive) to {@code length} (exclusive).
@@ -526,72 +359,16 @@ public final class Objects {
      *  <li>{@code length < 0}, which is implied from the former inequalities</li>
      * </ul>
      *
-     * <p>This method behaves as if {@link #checkIndex(int, int, BiFunction)}
-     * was called with same out-of-bounds arguments and an exception formatter
-     * argument produced from an invocation of
-     * {@code outOfBoundsExceptionFormatter(IndexOutOfBounds::new)} (though it may
-     * be more efficient).
-     *
      * @param index the index
      * @param length the upper-bound (exclusive) of the range
      * @return {@code index} if it is within bounds of the range
      * @throws IndexOutOfBoundsException if the {@code index} is out-of-bounds
      * @since 9
      */
+    @ForceInline
     public static
     int checkIndex(int index, int length) {
-        return checkIndex(index, length, null);
-    }
-
-    /**
-     * Checks if the {@code index} is within the bounds of the range from
-     * {@code 0} (inclusive) to {@code length} (exclusive).
-     *
-     * <p>The {@code index} is defined to be out-of-bounds if any of the
-     * following inequalities is true:
-     * <ul>
-     *  <li>{@code index < 0}</li>
-     *  <li>{@code index >= length}</li>
-     *  <li>{@code length < 0}, which is implied from the former inequalities</li>
-     * </ul>
-     *
-     * <p>If the {@code index} is out-of-bounds, then a runtime exception is
-     * thrown that is the result of applying the following arguments to the
-     * exception formatter: the name of this method, {@code checkIndex};
-     * and an unmodifiable list integers whose values are, in order, the
-     * out-of-bounds arguments {@code index} and {@code length}.
-     *
-     * @param <X> the type of runtime exception to throw if the arguments are
-     *        out-of-bounds
-     * @param index the index
-     * @param length the upper-bound (exclusive) of the range
-     * @param oobef the exception formatter that when applied with this
-     *        method name and out-of-bounds arguments returns a runtime
-     *        exception.  If {@code null} or returns {@code null} then, it is as
-     *        if an exception formatter produced from an invocation of
-     *        {@code outOfBoundsExceptionFormatter(IndexOutOfBounds::new)} is used
-     *        instead (though it may be more efficient).
-     *        Exceptions thrown by the formatter are relayed to the caller.
-     * @return {@code index} if it is within bounds of the range
-     * @throws X if the {@code index} is out-of-bounds and the exception
-     *         formatter is non-{@code null}
-     * @throws IndexOutOfBoundsException if the {@code index} is out-of-bounds
-     *         and the exception formatter is {@code null}
-     * @since 9
-     *
-     * @implNote
-     * This method is made intrinsic in optimizing compilers to guide them to
-     * perform unsigned comparisons of the index and length when it is known the
-     * length is a non-negative value (such as that of an array length or from
-     * the upper bound of a loop)
-    */
-    @HotSpotIntrinsicCandidate
-    public static <X extends RuntimeException>
-    int checkIndex(int index, int length,
-                   BiFunction<String, List<Integer>, X> oobef) {
-        if (index < 0 || index >= length)
-            throw outOfBoundsCheckIndex(oobef, index, length);
-        return index;
+        return Preconditions.checkIndex(index, length, null);
     }
 
     /**
@@ -608,12 +385,6 @@ public final class Objects {
      *  <li>{@code length < 0}, which is implied from the former inequalities</li>
      * </ul>
      *
-     * <p>This method behaves as if {@link #checkFromToIndex(int, int, int, BiFunction)}
-     * was called with same out-of-bounds arguments and an exception formatter
-     * argument produced from an invocation of
-     * {@code outOfBoundsExceptionFormatter(IndexOutOfBounds::new)} (though it may
-     * be more efficient).
-     *
      * @param fromIndex the lower-bound (inclusive) of the sub-range
      * @param toIndex the upper-bound (exclusive) of the sub-range
      * @param length the upper-bound (exclusive) the range
@@ -623,54 +394,7 @@ public final class Objects {
      */
     public static
     int checkFromToIndex(int fromIndex, int toIndex, int length) {
-        return checkFromToIndex(fromIndex, toIndex, length, null);
-    }
-
-    /**
-     * Checks if the sub-range from {@code fromIndex} (inclusive) to
-     * {@code toIndex} (exclusive) is within the bounds of range from {@code 0}
-     * (inclusive) to {@code length} (exclusive).
-     *
-     * <p>The sub-range is defined to be out-of-bounds if any of the following
-     * inequalities is true:
-     * <ul>
-     *  <li>{@code fromIndex < 0}</li>
-     *  <li>{@code fromIndex > toIndex}</li>
-     *  <li>{@code toIndex > length}</li>
-     *  <li>{@code length < 0}, which is implied from the former inequalities</li>
-     * </ul>
-     *
-     * <p>If the sub-range  is out-of-bounds, then a runtime exception is
-     * thrown that is the result of applying the following arguments to the
-     * exception formatter: the name of this method, {@code checkFromToIndex};
-     * and an unmodifiable list integers whose values are, in order, the
-     * out-of-bounds arguments {@code fromIndex}, {@code toIndex}, and {@code length}.
-     *
-     * @param <X> the type of runtime exception to throw if the arguments are
-     *        out-of-bounds
-     * @param fromIndex the lower-bound (inclusive) of the sub-range
-     * @param toIndex the upper-bound (exclusive) of the sub-range
-     * @param length the upper-bound (exclusive) the range
-     * @param oobef the exception formatter that when applied with this
-     *        method name and out-of-bounds arguments returns a runtime
-     *        exception.  If {@code null} or returns {@code null} then, it is as
-     *        if an exception formatter produced from an invocation of
-     *        {@code outOfBoundsExceptionFormatter(IndexOutOfBounds::new)} is used
-     *        instead (though it may be more efficient).
-     *        Exceptions thrown by the formatter are relayed to the caller.
-     * @return {@code fromIndex} if the sub-range within bounds of the range
-     * @throws X if the sub-range is out-of-bounds and the exception factory
-     *         function is non-{@code null}
-     * @throws IndexOutOfBoundsException if the sub-range is out-of-bounds and
-     *         the exception factory function is {@code null}
-     * @since 9
-     */
-    public static <X extends RuntimeException>
-    int checkFromToIndex(int fromIndex, int toIndex, int length,
-                         BiFunction<String, List<Integer>, X> oobef) {
-        if (fromIndex < 0 || fromIndex > toIndex || toIndex > length)
-            throw outOfBoundsCheckFromToIndex(oobef, fromIndex, toIndex, length);
-        return fromIndex;
+        return Preconditions.checkFromToIndex(fromIndex, toIndex, length, null);
     }
 
     /**
@@ -687,12 +411,6 @@ public final class Objects {
      *  <li>{@code length < 0}, which is implied from the former inequalities</li>
      * </ul>
      *
-     * <p>This method behaves as if {@link #checkFromIndexSize(int, int, int, BiFunction)}
-     * was called with same out-of-bounds arguments and an exception formatter
-     * argument produced from an invocation of
-     * {@code outOfBoundsExceptionFormatter(IndexOutOfBounds::new)} (though it may
-     * be more efficient).
-     *
      * @param fromIndex the lower-bound (inclusive) of the sub-interval
      * @param size the size of the sub-range
      * @param length the upper-bound (exclusive) of the range
@@ -702,54 +420,7 @@ public final class Objects {
      */
     public static
     int checkFromIndexSize(int fromIndex, int size, int length) {
-        return checkFromIndexSize(fromIndex, size, length, null);
+        return Preconditions.checkFromIndexSize(fromIndex, size, length, null);
     }
 
-    /**
-     * Checks if the sub-range from {@code fromIndex} (inclusive) to
-     * {@code fromIndex + size} (exclusive) is within the bounds of range from
-     * {@code 0} (inclusive) to {@code length} (exclusive).
-     *
-     * <p>The sub-range is defined to be out-of-bounds if any of the following
-     * inequalities is true:
-     * <ul>
-     *  <li>{@code fromIndex < 0}</li>
-     *  <li>{@code size < 0}</li>
-     *  <li>{@code fromIndex + size > length}, taking into account integer overflow</li>
-     *  <li>{@code length < 0}, which is implied from the former inequalities</li>
-     * </ul>
-     *
-     * <p>If the sub-range  is out-of-bounds, then a runtime exception is
-     * thrown that is the result of applying the following arguments to the
-     * exception formatter: the name of this method, {@code checkFromIndexSize};
-     * and an unmodifiable list integers whose values are, in order, the
-     * out-of-bounds arguments {@code fromIndex}, {@code size}, and
-     * {@code length}.
-     *
-     * @param <X> the type of runtime exception to throw if the arguments are
-     *        out-of-bounds
-     * @param fromIndex the lower-bound (inclusive) of the sub-interval
-     * @param size the size of the sub-range
-     * @param length the upper-bound (exclusive) of the range
-     * @param oobef the exception formatter that when applied with this
-     *        method name and out-of-bounds arguments returns a runtime
-     *        exception.  If {@code null} or returns {@code null} then, it is as
-     *        if an exception formatter produced from an invocation of
-     *        {@code outOfBoundsExceptionFormatter(IndexOutOfBounds::new)} is used
-     *        instead (though it may be more efficient).
-     *        Exceptions thrown by the formatter are relayed to the caller.
-     * @return {@code fromIndex} if the sub-range within bounds of the range
-     * @throws X if the sub-range is out-of-bounds and the exception factory
-     *         function is non-{@code null}
-     * @throws IndexOutOfBoundsException if the sub-range is out-of-bounds and
-     *         the exception factory function is {@code null}
-     * @since 9
-     */
-    public static <X extends RuntimeException>
-    int checkFromIndexSize(int fromIndex, int size, int length,
-                           BiFunction<String, List<Integer>, X> oobef) {
-        if ((length | fromIndex | size) < 0 || size > length - fromIndex)
-            throw outOfBoundsCheckFromIndexSize(oobef, fromIndex, size, length);
-        return fromIndex;
-    }
 }
diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/Preconditions.java b/jdk/src/java.base/share/classes/jdk/internal/util/Preconditions.java
new file mode 100644
index 00000000000..cb1b748f620
--- /dev/null
+++ b/jdk/src/java.base/share/classes/jdk/internal/util/Preconditions.java
@@ -0,0 +1,346 @@
+/*
+ * Copyright (c) 2016, 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.util;
+
+import jdk.internal.HotSpotIntrinsicCandidate;
+
+import java.util.List;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+
+/**
+ * Utility methods to check if state or arguments are correct.
+ *
+ */
+public class Preconditions {
+
+    /**
+     * Maps out-of-bounds values to a runtime exception.
+     *
+     * @param checkKind the kind of bounds check, whose name may correspond
+     *        to the name of one of the range check methods, checkIndex,
+     *        checkFromToIndex, checkFromIndexSize
+     * @param args the out-of-bounds arguments that failed the range check.
+     *        If the checkKind corresponds a the name of a range check method
+     *        then the bounds arguments are those that can be passed in order
+     *        to the method.
+     * @param oobef the exception formatter that when applied with a checkKind
+     *        and a list out-of-bounds arguments returns a runtime exception.
+     *        If {@code null} then, it is as if an exception formatter was
+     *        supplied that returns {@link IndexOutOfBoundsException} for any
+     *        given arguments.
+     * @return the runtime exception
+     */
+    private static RuntimeException outOfBounds(
+            BiFunction<String, List<Integer>, ? extends RuntimeException> oobef,
+            String checkKind,
+            Integer... args) {
+        List<Integer> largs = List.of(args);
+        RuntimeException e = oobef == null
+                             ? null : oobef.apply(checkKind, largs);
+        return e == null
+               ? new IndexOutOfBoundsException(outOfBoundsMessage(checkKind, largs)) : e;
+    }
+
+    private static RuntimeException outOfBoundsCheckIndex(
+            BiFunction<String, List<Integer>, ? extends RuntimeException> oobe,
+            int index, int length) {
+        return outOfBounds(oobe, "checkIndex", index, length);
+    }
+
+    private static RuntimeException outOfBoundsCheckFromToIndex(
+            BiFunction<String, List<Integer>, ? extends RuntimeException> oobe,
+            int fromIndex, int toIndex, int length) {
+        return outOfBounds(oobe, "checkFromToIndex", fromIndex, toIndex, length);
+    }
+
+    private static RuntimeException outOfBoundsCheckFromIndexSize(
+            BiFunction<String, List<Integer>, ? extends RuntimeException> oobe,
+            int fromIndex, int size, int length) {
+        return outOfBounds(oobe, "checkFromIndexSize", fromIndex, size, length);
+    }
+
+    /**
+     * Returns an out-of-bounds exception formatter from an given exception
+     * factory.  The exception formatter is a function that formats an
+     * out-of-bounds message from its arguments and applies that message to the
+     * given exception factory to produce and relay an exception.
+     *
+     * <p>The exception formatter accepts two arguments: a {@code String}
+     * describing the out-of-bounds range check that failed, referred to as the
+     * <em>check kind</em>; and a {@code List<Integer>} containing the
+     * out-of-bound integer values that failed the check.  The list of
+     * out-of-bound values is not modified.
+     *
+     * <p>Three check kinds are supported {@code checkIndex},
+     * {@code checkFromToIndex} and {@code checkFromIndexSize} corresponding
+     * respectively to the specified application of an exception formatter as an
+     * argument to the out-of-bounds range check methods
+     * {@link #checkIndex(int, int, BiFunction) checkIndex},
+     * {@link #checkFromToIndex(int, int, int, BiFunction) checkFromToIndex}, and
+     * {@link #checkFromIndexSize(int, int, int, BiFunction) checkFromIndexSize}.
+     * Thus a supported check kind corresponds to a method name and the
+     * out-of-bound integer values correspond to method argument values, in
+     * order, preceding the exception formatter argument (similar in many
+     * respects to the form of arguments required for a reflective invocation of
+     * such a range check method).
+     *
+     * <p>Formatter arguments conforming to such supported check kinds will
+     * produce specific exception messages describing failed out-of-bounds
+     * checks.  Otherwise, more generic exception messages will be produced in
+     * any of the following cases: the check kind is supported but fewer
+     * or more out-of-bounds values are supplied, the check kind is not
+     * supported, the check kind is {@code null}, or the list of out-of-bound
+     * values is {@code null}.
+     *
+     * @apiNote
+     * This method produces an out-of-bounds exception formatter that can be
+     * passed as an argument to any of the supported out-of-bounds range check
+     * methods declared by {@code Objects}.  For example, a formatter producing
+     * an {@code ArrayIndexOutOfBoundsException} may be produced and stored on a
+     * {@code static final} field as follows:
+     * <pre>{@code
+     * static final
+     * BiFunction<String, List<Integer>, ArrayIndexOutOfBoundsException> AIOOBEF =
+     *     outOfBoundsExceptionFormatter(ArrayIndexOutOfBoundsException::new);
+     * }</pre>
+     * The formatter instance {@code AIOOBEF} may be passed as an argument to an
+     * out-of-bounds range check method, such as checking if an {@code index}
+     * is within the bounds of a {@code limit}:
+     * <pre>{@code
+     * checkIndex(index, limit, AIOOBEF);
+     * }</pre>
+     * If the bounds check fails then the range check method will throw an
+     * {@code ArrayIndexOutOfBoundsException} with an appropriate exception
+     * message that is a produced from {@code AIOOBEF} as follows:
+     * <pre>{@code
+     * AIOOBEF.apply("checkIndex", List.of(index, limit));
+     * }</pre>
+     *
+     * @param f the exception factory, that produces an exception from a message
+     *        where the message is produced and formatted by the returned
+     *        exception formatter.  If this factory is stateless and side-effect
+     *        free then so is the returned formatter.
+     *        Exceptions thrown by the factory are relayed to the caller
+     *        of the returned formatter.
+     * @param <X> the type of runtime exception to be returned by the given
+     *        exception factory and relayed by the exception formatter
+     * @return the out-of-bounds exception formatter
+     */
+    public static <X extends RuntimeException>
+    BiFunction<String, List<Integer>, X> outOfBoundsExceptionFormatter(Function<String, X> f) {
+        // Use anonymous class to avoid bootstrap issues if this method is
+        // used early in startup
+        return new BiFunction<String, List<Integer>, X>() {
+            @Override
+            public X apply(String checkKind, List<Integer> args) {
+                return f.apply(outOfBoundsMessage(checkKind, args));
+            }
+        };
+    }
+
+    private static String outOfBoundsMessage(String checkKind, List<Integer> args) {
+        if (checkKind == null && args == null) {
+            return String.format("Range check failed");
+        } else if (checkKind == null) {
+            return String.format("Range check failed: %s", args);
+        } else if (args == null) {
+            return String.format("Range check failed: %s", checkKind);
+        }
+
+        int argSize = 0;
+        switch (checkKind) {
+            case "checkIndex":
+                argSize = 2;
+                break;
+            case "checkFromToIndex":
+            case "checkFromIndexSize":
+                argSize = 3;
+                break;
+            default:
+        }
+
+        // Switch to default if fewer or more arguments than required are supplied
+        switch ((args.size() != argSize) ? "" : checkKind) {
+            case "checkIndex":
+                return String.format("Index %d out-of-bounds for length %d",
+                                     args.get(0), args.get(1));
+            case "checkFromToIndex":
+                return String.format("Range [%d, %d) out-of-bounds for length %d",
+                                     args.get(0), args.get(1), args.get(2));
+            case "checkFromIndexSize":
+                return String.format("Range [%d, %<d + %d) out-of-bounds for length %d",
+                                     args.get(0), args.get(1), args.get(2));
+            default:
+                return String.format("Range check failed: %s %s", checkKind, args);
+        }
+    }
+
+    /**
+     * Checks if the {@code index} is within the bounds of the range from
+     * {@code 0} (inclusive) to {@code length} (exclusive).
+     *
+     * <p>The {@code index} is defined to be out-of-bounds if any of the
+     * following inequalities is true:
+     * <ul>
+     *  <li>{@code index < 0}</li>
+     *  <li>{@code index >= length}</li>
+     *  <li>{@code length < 0}, which is implied from the former inequalities</li>
+     * </ul>
+     *
+     * <p>If the {@code index} is out-of-bounds, then a runtime exception is
+     * thrown that is the result of applying the following arguments to the
+     * exception formatter: the name of this method, {@code checkIndex};
+     * and an unmodifiable list integers whose values are, in order, the
+     * out-of-bounds arguments {@code index} and {@code length}.
+     *
+     * @param <X> the type of runtime exception to throw if the arguments are
+     *        out-of-bounds
+     * @param index the index
+     * @param length the upper-bound (exclusive) of the range
+     * @param oobef the exception formatter that when applied with this
+     *        method name and out-of-bounds arguments returns a runtime
+     *        exception.  If {@code null} or returns {@code null} then, it is as
+     *        if an exception formatter produced from an invocation of
+     *        {@code outOfBoundsExceptionFormatter(IndexOutOfBounds::new)} is used
+     *        instead (though it may be more efficient).
+     *        Exceptions thrown by the formatter are relayed to the caller.
+     * @return {@code index} if it is within bounds of the range
+     * @throws X if the {@code index} is out-of-bounds and the exception
+     *         formatter is non-{@code null}
+     * @throws IndexOutOfBoundsException if the {@code index} is out-of-bounds
+     *         and the exception formatter is {@code null}
+     * @since 9
+     *
+     * @implNote
+     * This method is made intrinsic in optimizing compilers to guide them to
+     * perform unsigned comparisons of the index and length when it is known the
+     * length is a non-negative value (such as that of an array length or from
+     * the upper bound of a loop)
+    */
+    @HotSpotIntrinsicCandidate
+    public static <X extends RuntimeException>
+    int checkIndex(int index, int length,
+                   BiFunction<String, List<Integer>, X> oobef) {
+        if (index < 0 || index >= length)
+            throw outOfBoundsCheckIndex(oobef, index, length);
+        return index;
+    }
+
+    /**
+     * Checks if the sub-range from {@code fromIndex} (inclusive) to
+     * {@code toIndex} (exclusive) is within the bounds of range from {@code 0}
+     * (inclusive) to {@code length} (exclusive).
+     *
+     * <p>The sub-range is defined to be out-of-bounds if any of the following
+     * inequalities is true:
+     * <ul>
+     *  <li>{@code fromIndex < 0}</li>
+     *  <li>{@code fromIndex > toIndex}</li>
+     *  <li>{@code toIndex > length}</li>
+     *  <li>{@code length < 0}, which is implied from the former inequalities</li>
+     * </ul>
+     *
+     * <p>If the sub-range  is out-of-bounds, then a runtime exception is
+     * thrown that is the result of applying the following arguments to the
+     * exception formatter: the name of this method, {@code checkFromToIndex};
+     * and an unmodifiable list integers whose values are, in order, the
+     * out-of-bounds arguments {@code fromIndex}, {@code toIndex}, and {@code length}.
+     *
+     * @param <X> the type of runtime exception to throw if the arguments are
+     *        out-of-bounds
+     * @param fromIndex the lower-bound (inclusive) of the sub-range
+     * @param toIndex the upper-bound (exclusive) of the sub-range
+     * @param length the upper-bound (exclusive) the range
+     * @param oobef the exception formatter that when applied with this
+     *        method name and out-of-bounds arguments returns a runtime
+     *        exception.  If {@code null} or returns {@code null} then, it is as
+     *        if an exception formatter produced from an invocation of
+     *        {@code outOfBoundsExceptionFormatter(IndexOutOfBounds::new)} is used
+     *        instead (though it may be more efficient).
+     *        Exceptions thrown by the formatter are relayed to the caller.
+     * @return {@code fromIndex} if the sub-range within bounds of the range
+     * @throws X if the sub-range is out-of-bounds and the exception factory
+     *         function is non-{@code null}
+     * @throws IndexOutOfBoundsException if the sub-range is out-of-bounds and
+     *         the exception factory function is {@code null}
+     * @since 9
+     */
+    public static <X extends RuntimeException>
+    int checkFromToIndex(int fromIndex, int toIndex, int length,
+                         BiFunction<String, List<Integer>, X> oobef) {
+        if (fromIndex < 0 || fromIndex > toIndex || toIndex > length)
+            throw outOfBoundsCheckFromToIndex(oobef, fromIndex, toIndex, length);
+        return fromIndex;
+    }
+
+    /**
+     * Checks if the sub-range from {@code fromIndex} (inclusive) to
+     * {@code fromIndex + size} (exclusive) is within the bounds of range from
+     * {@code 0} (inclusive) to {@code length} (exclusive).
+     *
+     * <p>The sub-range is defined to be out-of-bounds if any of the following
+     * inequalities is true:
+     * <ul>
+     *  <li>{@code fromIndex < 0}</li>
+     *  <li>{@code size < 0}</li>
+     *  <li>{@code fromIndex + size > length}, taking into account integer overflow</li>
+     *  <li>{@code length < 0}, which is implied from the former inequalities</li>
+     * </ul>
+     *
+     * <p>If the sub-range  is out-of-bounds, then a runtime exception is
+     * thrown that is the result of applying the following arguments to the
+     * exception formatter: the name of this method, {@code checkFromIndexSize};
+     * and an unmodifiable list integers whose values are, in order, the
+     * out-of-bounds arguments {@code fromIndex}, {@code size}, and
+     * {@code length}.
+     *
+     * @param <X> the type of runtime exception to throw if the arguments are
+     *        out-of-bounds
+     * @param fromIndex the lower-bound (inclusive) of the sub-interval
+     * @param size the size of the sub-range
+     * @param length the upper-bound (exclusive) of the range
+     * @param oobef the exception formatter that when applied with this
+     *        method name and out-of-bounds arguments returns a runtime
+     *        exception.  If {@code null} or returns {@code null} then, it is as
+     *        if an exception formatter produced from an invocation of
+     *        {@code outOfBoundsExceptionFormatter(IndexOutOfBounds::new)} is used
+     *        instead (though it may be more efficient).
+     *        Exceptions thrown by the formatter are relayed to the caller.
+     * @return {@code fromIndex} if the sub-range within bounds of the range
+     * @throws X if the sub-range is out-of-bounds and the exception factory
+     *         function is non-{@code null}
+     * @throws IndexOutOfBoundsException if the sub-range is out-of-bounds and
+     *         the exception factory function is {@code null}
+     * @since 9
+     */
+    public static <X extends RuntimeException>
+    int checkFromIndexSize(int fromIndex, int size, int length,
+                           BiFunction<String, List<Integer>, X> oobef) {
+        if ((length | fromIndex | size) < 0 || size > length - fromIndex)
+            throw outOfBoundsCheckFromIndexSize(oobef, fromIndex, size, length);
+        return fromIndex;
+    }
+}
diff --git a/jdk/test/java/util/Objects/CheckIndex.java b/jdk/test/java/util/Objects/CheckIndex.java
index c4efdb1c253..bcfa1d5b23d 100644
--- a/jdk/test/java/util/Objects/CheckIndex.java
+++ b/jdk/test/java/util/Objects/CheckIndex.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016 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,11 +23,13 @@
 
 /**
  * @test
- * @summary IndexOutOfBoundsException check index tests
+ * @summary Objects.checkIndex/jdk.internal.util.Preconditions.checkIndex tests
  * @run testng CheckIndex
- * @bug 8135248 8142493
+ * @bug 8135248 8142493 8155794
+ * @modules java.base/jdk.internal.util
  */
 
+import jdk.internal.util.Preconditions;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -95,7 +97,7 @@ public class CheckIndex {
     public void testCheckIndex(int index, int length, boolean withinBounds) {
         String expectedMessage = withinBounds
                                  ? null
-                                 : Objects.outOfBoundsExceptionFormatter(IndexOutOfBoundsException::new).
+                                 : Preconditions.outOfBoundsExceptionFormatter(IndexOutOfBoundsException::new).
                 apply("checkIndex", List.of(index, length)).getMessage();
 
         BiConsumer<Class<? extends RuntimeException>, IntSupplier> checker = (ec, s) -> {
@@ -117,21 +119,21 @@ public class CheckIndex {
         };
 
         checker.accept(AssertingOutOfBoundsException.class,
-                     () -> Objects.checkIndex(index, length,
-                                              assertingOutOfBounds(expectedMessage, "checkIndex", index, length)));
+                     () -> Preconditions.checkIndex(index, length,
+                                                    assertingOutOfBounds(expectedMessage, "checkIndex", index, length)));
         checker.accept(IndexOutOfBoundsException.class,
-                     () -> Objects.checkIndex(index, length,
-                                              assertingOutOfBoundsReturnNull("checkIndex", index, length)));
+                     () -> Preconditions.checkIndex(index, length,
+                                                    assertingOutOfBoundsReturnNull("checkIndex", index, length)));
         checker.accept(IndexOutOfBoundsException.class,
-                     () -> Objects.checkIndex(index, length, null));
+                     () -> Preconditions.checkIndex(index, length, null));
         checker.accept(IndexOutOfBoundsException.class,
                      () -> Objects.checkIndex(index, length));
         checker.accept(ArrayIndexOutOfBoundsException.class,
-                     () -> Objects.checkIndex(index, length,
-                                              Objects.outOfBoundsExceptionFormatter(ArrayIndexOutOfBoundsException::new)));
+                     () -> Preconditions.checkIndex(index, length,
+                                                    Preconditions.outOfBoundsExceptionFormatter(ArrayIndexOutOfBoundsException::new)));
         checker.accept(StringIndexOutOfBoundsException.class,
-                     () -> Objects.checkIndex(index, length,
-                                              Objects.outOfBoundsExceptionFormatter(StringIndexOutOfBoundsException::new)));
+                     () -> Preconditions.checkIndex(index, length,
+                                                    Preconditions.outOfBoundsExceptionFormatter(StringIndexOutOfBoundsException::new)));
     }
 
 
@@ -157,7 +159,7 @@ public class CheckIndex {
     public void testCheckFromToIndex(int fromIndex, int toIndex, int length, boolean withinBounds) {
         String expectedMessage = withinBounds
                                  ? null
-                                 : Objects.outOfBoundsExceptionFormatter(IndexOutOfBoundsException::new).
+                                 : Preconditions.outOfBoundsExceptionFormatter(IndexOutOfBoundsException::new).
                 apply("checkFromToIndex", List.of(fromIndex, toIndex, length)).getMessage();
 
         BiConsumer<Class<? extends RuntimeException>, IntSupplier> check = (ec, s) -> {
@@ -179,21 +181,21 @@ public class CheckIndex {
         };
 
         check.accept(AssertingOutOfBoundsException.class,
-                     () -> Objects.checkFromToIndex(fromIndex, toIndex, length,
-                                                    assertingOutOfBounds(expectedMessage, "checkFromToIndex", fromIndex, toIndex, length)));
+                     () -> Preconditions.checkFromToIndex(fromIndex, toIndex, length,
+                                                          assertingOutOfBounds(expectedMessage, "checkFromToIndex", fromIndex, toIndex, length)));
         check.accept(IndexOutOfBoundsException.class,
-                     () -> Objects.checkFromToIndex(fromIndex, toIndex, length,
-                                                    assertingOutOfBoundsReturnNull("checkFromToIndex", fromIndex, toIndex, length)));
+                     () -> Preconditions.checkFromToIndex(fromIndex, toIndex, length,
+                                                          assertingOutOfBoundsReturnNull("checkFromToIndex", fromIndex, toIndex, length)));
         check.accept(IndexOutOfBoundsException.class,
-                     () -> Objects.checkFromToIndex(fromIndex, toIndex, length, null));
+                     () -> Preconditions.checkFromToIndex(fromIndex, toIndex, length, null));
         check.accept(IndexOutOfBoundsException.class,
                      () -> Objects.checkFromToIndex(fromIndex, toIndex, length));
         check.accept(ArrayIndexOutOfBoundsException.class,
-                     () -> Objects.checkFromToIndex(fromIndex, toIndex, length,
-                                              Objects.outOfBoundsExceptionFormatter(ArrayIndexOutOfBoundsException::new)));
+                     () -> Preconditions.checkFromToIndex(fromIndex, toIndex, length,
+                                                          Preconditions.outOfBoundsExceptionFormatter(ArrayIndexOutOfBoundsException::new)));
         check.accept(StringIndexOutOfBoundsException.class,
-                     () -> Objects.checkFromToIndex(fromIndex, toIndex, length,
-                                              Objects.outOfBoundsExceptionFormatter(StringIndexOutOfBoundsException::new)));
+                     () -> Preconditions.checkFromToIndex(fromIndex, toIndex, length,
+                                                          Preconditions.outOfBoundsExceptionFormatter(StringIndexOutOfBoundsException::new)));
     }
 
 
@@ -226,7 +228,7 @@ public class CheckIndex {
     public void testCheckFromIndexSize(int fromIndex, int size, int length, boolean withinBounds) {
         String expectedMessage = withinBounds
                                  ? null
-                                 : Objects.outOfBoundsExceptionFormatter(IndexOutOfBoundsException::new).
+                                 : Preconditions.outOfBoundsExceptionFormatter(IndexOutOfBoundsException::new).
                 apply("checkFromIndexSize", List.of(fromIndex, size, length)).getMessage();
 
         BiConsumer<Class<? extends RuntimeException>, IntSupplier> check = (ec, s) -> {
@@ -248,27 +250,27 @@ public class CheckIndex {
         };
 
         check.accept(AssertingOutOfBoundsException.class,
-                     () -> Objects.checkFromIndexSize(fromIndex, size, length,
-                                                      assertingOutOfBounds(expectedMessage, "checkFromIndexSize", fromIndex, size, length)));
+                     () -> Preconditions.checkFromIndexSize(fromIndex, size, length,
+                                                            assertingOutOfBounds(expectedMessage, "checkFromIndexSize", fromIndex, size, length)));
         check.accept(IndexOutOfBoundsException.class,
-                     () -> Objects.checkFromIndexSize(fromIndex, size, length,
-                                                      assertingOutOfBoundsReturnNull("checkFromIndexSize", fromIndex, size, length)));
+                     () -> Preconditions.checkFromIndexSize(fromIndex, size, length,
+                                                            assertingOutOfBoundsReturnNull("checkFromIndexSize", fromIndex, size, length)));
         check.accept(IndexOutOfBoundsException.class,
-                     () -> Objects.checkFromIndexSize(fromIndex, size, length, null));
+                     () -> Preconditions.checkFromIndexSize(fromIndex, size, length, null));
         check.accept(IndexOutOfBoundsException.class,
                      () -> Objects.checkFromIndexSize(fromIndex, size, length));
         check.accept(ArrayIndexOutOfBoundsException.class,
-                     () -> Objects.checkFromIndexSize(fromIndex, size, length,
-                                                    Objects.outOfBoundsExceptionFormatter(ArrayIndexOutOfBoundsException::new)));
+                     () -> Preconditions.checkFromIndexSize(fromIndex, size, length,
+                                                            Preconditions.outOfBoundsExceptionFormatter(ArrayIndexOutOfBoundsException::new)));
         check.accept(StringIndexOutOfBoundsException.class,
-                     () -> Objects.checkFromIndexSize(fromIndex, size, length,
-                                                    Objects.outOfBoundsExceptionFormatter(StringIndexOutOfBoundsException::new)));
+                     () -> Preconditions.checkFromIndexSize(fromIndex, size, length,
+                                                            Preconditions.outOfBoundsExceptionFormatter(StringIndexOutOfBoundsException::new)));
     }
 
     @Test
     public void uniqueMessagesForCheckKinds() {
         BiFunction<String, List<Integer>, IndexOutOfBoundsException> f =
-                Objects.outOfBoundsExceptionFormatter(IndexOutOfBoundsException::new);
+                Preconditions.outOfBoundsExceptionFormatter(IndexOutOfBoundsException::new);
 
         List<String> messages = new ArrayList<>();
         // Exact arguments

From 096e59e6c9d39e1704fb182a61c5debe748cc3e5 Mon Sep 17 00:00:00 2001
From: Sharath Ballal <sharath.ballal@oracle.com>
Date: Fri, 6 May 2016 11:47:45 +0300
Subject: [PATCH 050/228] 8154144: Tests in com/sun/jdi fails intermittently
 with &quot;jdb input stream closed prematurely&quot;

Don't print stream closed message during shutdown

Reviewed-by: dcubed, sla, dsamersoff
---
 .../tools/example/debug/tty/EventHandler.java |  6 +++++-
 .../com/sun/tools/example/debug/tty/TTY.java  | 20 +++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventHandler.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventHandler.java
index fe6dd070f0d..cd416ccf24e 100644
--- a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventHandler.java
+++ b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2016, 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,6 +133,10 @@ public class EventHandler implements Runnable {
             if (!vmDied) {
                 vmDisconnectEvent(event);
             }
+            /*
+             * Inform jdb command line processor that jdb is being shutdown. JDK-8154144.
+             */
+            ((TTY)notifier).setShuttingDown(true);
             Env.shutdown(shutdownMessageKey);
             return false;
         } else {
diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java
index 0bd403af2b9..ee716a55dcb 100644
--- a/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java
+++ b/jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2016, 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,6 +56,16 @@ public class TTY implements EventNotifier {
      */
     private static final String progname = "jdb";
 
+    private volatile boolean shuttingDown = false;
+
+    public void setShuttingDown(boolean s) {
+       shuttingDown = s;
+    }
+
+    public boolean isShuttingDown() {
+        return shuttingDown;
+    }
+
     @Override
     public void vmStartEvent(VMStartEvent se)  {
         Thread.yield();  // fetch output
@@ -750,7 +760,13 @@ public class TTY implements EventNotifier {
             while (true) {
                 String ln = in.readLine();
                 if (ln == null) {
-                    MessageOutput.println("Input stream closed.");
+                    /*
+                     *  Jdb is being shutdown because debuggee exited, ignore any 'null'
+                     *  returned by readLine() during shutdown. JDK-8154144.
+                     */
+                    if (!isShuttingDown()) {
+                        MessageOutput.println("Input stream closed.");
+                    }
                     ln = "quit";
                 }
 

From b1cc5f555f68a14f4c2c18c6d8518c9d4d3f5356 Mon Sep 17 00:00:00 2001
From: Ambarish Rapte <arapte@openjdk.org>
Date: Fri, 6 May 2016 17:43:36 +0300
Subject: [PATCH 051/228] 8154328: [TEST_BUG]
 java/awt/TrayIcon/ActionEventTest/ActionEventTest.java

Reviewed-by: serb, rchamyal
---
 .../ActionEventTest/ActionEventTest.java        | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/jdk/test/java/awt/TrayIcon/ActionEventTest/ActionEventTest.java b/jdk/test/java/awt/TrayIcon/ActionEventTest/ActionEventTest.java
index 7a5f87a38f3..95879ce4f80 100644
--- a/jdk/test/java/awt/TrayIcon/ActionEventTest/ActionEventTest.java
+++ b/jdk/test/java/awt/TrayIcon/ActionEventTest/ActionEventTest.java
@@ -23,10 +23,13 @@
 
 /*
  * @test
- * @bug 6191390
+ * @bug 6191390 8154328
  * @summary Verify that ActionEvent is received with correct modifiers set.
  * @library ../../../../lib/testlibrary ../
+ * @library /java/awt/patchlib
+ * @build java.desktop/java.awt.Helper
  * @build ExtendedRobot SystemTrayIconHelper
+ * @run main ActionEventTest
  */
 
 import java.awt.Image;
@@ -46,6 +49,7 @@ public class ActionEventTest {
     Image image;
     TrayIcon icon;
     Robot robot;
+    boolean actionPerformed;
 
     public static void main(String[] args) throws Exception {
         if (!SystemTray.isSupported()) {
@@ -82,6 +86,7 @@ public class ActionEventTest {
         icon.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent ae) {
+                actionPerformed = true;
                 int md = ae.getModifiers();
                 int expectedMask = ActionEvent.ALT_MASK | ActionEvent.CTRL_MASK
                         | ActionEvent.SHIFT_MASK;
@@ -102,6 +107,9 @@ public class ActionEventTest {
     }
 
     public void clear() {
+        robot.keyRelease(KeyEvent.VK_ALT);
+        robot.keyRelease(KeyEvent.VK_SHIFT);
+        robot.keyRelease(KeyEvent.VK_CONTROL);
         SystemTray.getSystemTray().remove(icon);
     }
 
@@ -123,10 +131,9 @@ public class ActionEventTest {
         robot.delay(100);
         robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
         robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
-        robot.delay(100);
         robot.waitForIdle();
-        robot.keyRelease(KeyEvent.VK_ALT);
-        robot.keyRelease(KeyEvent.VK_SHIFT);
-        robot.keyRelease(KeyEvent.VK_CONTROL);
+        if (!actionPerformed) {
+            robot.delay(500);
+        }
     }
 }

From 85f537701c959dd32065f8e33a31999022dfbe5c Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Fri, 6 May 2016 17:59:49 +0300
Subject: [PATCH 052/228] 8155965: Unsafe.weakCompareAndSetVolatile entry
 points and intrinsics

Reviewed-by: psandoz, vlivanov
---
 .../classes/jdk/internal/misc/Unsafe.java     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/Unsafe.java b/jdk/src/java.base/share/classes/jdk/internal/misc/Unsafe.java
index beb64fd5155..fbd994da432 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/misc/Unsafe.java
+++ b/jdk/src/java.base/share/classes/jdk/internal/misc/Unsafe.java
@@ -1271,6 +1271,13 @@ public final class Unsafe {
         return compareAndSwapObject(o, offset, expected, x);
     }
 
+    @HotSpotIntrinsicCandidate
+    public final boolean weakCompareAndSwapObjectVolatile(Object o, long offset,
+                                                                Object expected,
+                                                                Object x) {
+        return compareAndSwapObject(o, offset, expected, x);
+    }
+
     /**
      * Atomically updates Java variable to {@code x} if it is currently
      * holding {@code expected}.
@@ -1325,6 +1332,13 @@ public final class Unsafe {
         return compareAndSwapInt(o, offset, expected, x);
     }
 
+    @HotSpotIntrinsicCandidate
+    public final boolean weakCompareAndSwapIntVolatile(Object o, long offset,
+                                                             int expected,
+                                                             int x) {
+        return compareAndSwapInt(o, offset, expected, x);
+    }
+
     /**
      * Atomically updates Java variable to {@code x} if it is currently
      * holding {@code expected}.
@@ -1379,6 +1393,13 @@ public final class Unsafe {
         return compareAndSwapLong(o, offset, expected, x);
     }
 
+    @HotSpotIntrinsicCandidate
+    public final boolean weakCompareAndSwapLongVolatile(Object o, long offset,
+                                                              long expected,
+                                                              long x) {
+        return compareAndSwapLong(o, offset, expected, x);
+    }
+
     /**
      * Fetches a reference value from a given Java variable, with volatile
      * load semantics. Otherwise identical to {@link #getObject(Object, long)}

From 144b4fb478e0da86303c6d63d162664c63ae48e9 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Fri, 6 May 2016 12:57:37 -0700
Subject: [PATCH 053/228] 8156459: SimpleCMYKColorSpace serialVersionUID is
 inappropriate

Generate an appropriate value using the 'serialver' command.

Reviewed-by: prr
---
 .../com/sun/imageio/plugins/common/SimpleCMYKColorSpace.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleCMYKColorSpace.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleCMYKColorSpace.java
index a1097b3853e..db96e67bb1d 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleCMYKColorSpace.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleCMYKColorSpace.java
@@ -31,7 +31,7 @@ import java.awt.color.ColorSpace;
  * color space.
  */
 public final class SimpleCMYKColorSpace extends ColorSpace {
-    private static final long serialVersionUID = 666L; // XXX Revise UID value
+    private static final long serialVersionUID = 5387117338644522424L;
 
     private static ColorSpace theInstance = null;
     private ColorSpace csRGB;

From 2b1fdef17a5fffe8ce0076a5e2d1b0e70aafd3ae Mon Sep 17 00:00:00 2001
From: Mikael Vidstedt <mikael@openjdk.org>
Date: Fri, 6 May 2016 15:59:27 -0700
Subject: [PATCH 054/228] 8150921: Update Unsafe getters/setters to use
 double-register variants

Reviewed-by: dholmes, shade, psandoz, jrose
---
 .../classes/jdk/internal/misc/Unsafe.java     | 213 ++++++++++++------
 1 file changed, 146 insertions(+), 67 deletions(-)

diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/Unsafe.java b/jdk/src/java.base/share/classes/jdk/internal/misc/Unsafe.java
index 735d1b86143..c7ee6a2f44f 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/misc/Unsafe.java
+++ b/jdk/src/java.base/share/classes/jdk/internal/misc/Unsafe.java
@@ -33,6 +33,7 @@ import jdk.internal.reflect.Reflection;
 import jdk.internal.misc.VM;
 
 import jdk.internal.HotSpotIntrinsicCandidate;
+import jdk.internal.vm.annotation.ForceInline;
 
 
 /**
@@ -209,46 +210,103 @@ public final class Unsafe {
     /** @see #getInt(Object, long) */
     @HotSpotIntrinsicCandidate
     public native boolean getBoolean(Object o, long offset);
+
     /** @see #putInt(Object, long, int) */
     @HotSpotIntrinsicCandidate
     public native void    putBoolean(Object o, long offset, boolean x);
+
     /** @see #getInt(Object, long) */
     @HotSpotIntrinsicCandidate
     public native byte    getByte(Object o, long offset);
+
     /** @see #putInt(Object, long, int) */
     @HotSpotIntrinsicCandidate
     public native void    putByte(Object o, long offset, byte x);
+
     /** @see #getInt(Object, long) */
     @HotSpotIntrinsicCandidate
     public native short   getShort(Object o, long offset);
+
     /** @see #putInt(Object, long, int) */
     @HotSpotIntrinsicCandidate
     public native void    putShort(Object o, long offset, short x);
+
     /** @see #getInt(Object, long) */
     @HotSpotIntrinsicCandidate
     public native char    getChar(Object o, long offset);
+
     /** @see #putInt(Object, long, int) */
     @HotSpotIntrinsicCandidate
     public native void    putChar(Object o, long offset, char x);
+
     /** @see #getInt(Object, long) */
     @HotSpotIntrinsicCandidate
     public native long    getLong(Object o, long offset);
+
     /** @see #putInt(Object, long, int) */
     @HotSpotIntrinsicCandidate
     public native void    putLong(Object o, long offset, long x);
+
     /** @see #getInt(Object, long) */
     @HotSpotIntrinsicCandidate
     public native float   getFloat(Object o, long offset);
+
     /** @see #putInt(Object, long, int) */
     @HotSpotIntrinsicCandidate
     public native void    putFloat(Object o, long offset, float x);
+
     /** @see #getInt(Object, long) */
     @HotSpotIntrinsicCandidate
     public native double  getDouble(Object o, long offset);
+
     /** @see #putInt(Object, long, int) */
     @HotSpotIntrinsicCandidate
     public native void    putDouble(Object o, long offset, double x);
 
+    /**
+     * Fetches a native pointer from a given memory address.  If the address is
+     * zero, or does not point into a block obtained from {@link
+     * #allocateMemory}, the results are undefined.
+     *
+     * <p>If the native pointer is less than 64 bits wide, it is extended as
+     * an unsigned number to a Java long.  The pointer may be indexed by any
+     * given byte offset, simply by adding that offset (as a simple integer) to
+     * the long representing the pointer.  The number of bytes actually read
+     * from the target address may be determined by consulting {@link
+     * #addressSize}.
+     *
+     * @see #allocateMemory
+     * @see #getInt(Object, long)
+     */
+    @ForceInline
+    public long getAddress(Object o, long offset) {
+        if (ADDRESS_SIZE == 4) {
+            return Integer.toUnsignedLong(getInt(o, offset));
+        } else {
+            return getLong(o, offset);
+        }
+    }
+
+    /**
+     * Stores a native pointer into a given memory address.  If the address is
+     * zero, or does not point into a block obtained from {@link
+     * #allocateMemory}, the results are undefined.
+     *
+     * <p>The number of bytes actually written at the target address may be
+     * determined by consulting {@link #addressSize}.
+     *
+     * @see #allocateMemory
+     * @see #putInt(Object, long, int)
+     */
+    @ForceInline
+    public void putAddress(Object o, long offset, long x) {
+        if (ADDRESS_SIZE == 4) {
+            putInt(o, offset, (int)x);
+        } else {
+            putLong(o, offset, x);
+        }
+    }
+
     // These read VM internal data.
 
     /**
@@ -287,8 +345,10 @@ public final class Unsafe {
      *
      * @see #allocateMemory
      */
-    @HotSpotIntrinsicCandidate
-    public native byte    getByte(long address);
+    @ForceInline
+    public byte getByte(long address) {
+        return getByte(null, address);
+    }
 
     /**
      * Stores a value into a given memory address.  If the address is zero, or
@@ -297,75 +357,94 @@ public final class Unsafe {
      *
      * @see #getByte(long)
      */
-    @HotSpotIntrinsicCandidate
-    public native void    putByte(long address, byte x);
+    @ForceInline
+    public void putByte(long address, byte x) {
+        putByte(null, address, x);
+    }
 
     /** @see #getByte(long) */
-    @HotSpotIntrinsicCandidate
-    public native short   getShort(long address);
-    /** @see #putByte(long, byte) */
-    @HotSpotIntrinsicCandidate
-    public native void    putShort(long address, short x);
-    /** @see #getByte(long) */
-    @HotSpotIntrinsicCandidate
-    public native char    getChar(long address);
-    /** @see #putByte(long, byte) */
-    @HotSpotIntrinsicCandidate
-    public native void    putChar(long address, char x);
-    /** @see #getByte(long) */
-    @HotSpotIntrinsicCandidate
-    public native int     getInt(long address);
-    /** @see #putByte(long, byte) */
-    @HotSpotIntrinsicCandidate
-    public native void    putInt(long address, int x);
-    /** @see #getByte(long) */
-    @HotSpotIntrinsicCandidate
-    public native long    getLong(long address);
-    /** @see #putByte(long, byte) */
-    @HotSpotIntrinsicCandidate
-    public native void    putLong(long address, long x);
-    /** @see #getByte(long) */
-    @HotSpotIntrinsicCandidate
-    public native float   getFloat(long address);
-    /** @see #putByte(long, byte) */
-    @HotSpotIntrinsicCandidate
-    public native void    putFloat(long address, float x);
-    /** @see #getByte(long) */
-    @HotSpotIntrinsicCandidate
-    public native double  getDouble(long address);
-    /** @see #putByte(long, byte) */
-    @HotSpotIntrinsicCandidate
-    public native void    putDouble(long address, double x);
+    @ForceInline
+    public short getShort(long address) {
+        return getShort(null, address);
+    }
 
-    /**
-     * Fetches a native pointer from a given memory address.  If the address is
-     * zero, or does not point into a block obtained from {@link
-     * #allocateMemory}, the results are undefined.
-     *
-     * <p>If the native pointer is less than 64 bits wide, it is extended as
-     * an unsigned number to a Java long.  The pointer may be indexed by any
-     * given byte offset, simply by adding that offset (as a simple integer) to
-     * the long representing the pointer.  The number of bytes actually read
-     * from the target address may be determined by consulting {@link
-     * #addressSize}.
-     *
-     * @see #allocateMemory
-     */
-    @HotSpotIntrinsicCandidate
-    public native long getAddress(long address);
+    /** @see #putByte(long, byte) */
+    @ForceInline
+    public void putShort(long address, short x) {
+        putShort(null, address, x);
+    }
 
-    /**
-     * Stores a native pointer into a given memory address.  If the address is
-     * zero, or does not point into a block obtained from {@link
-     * #allocateMemory}, the results are undefined.
-     *
-     * <p>The number of bytes actually written at the target address may be
-     * determined by consulting {@link #addressSize}.
-     *
-     * @see #getAddress(long)
-     */
-    @HotSpotIntrinsicCandidate
-    public native void putAddress(long address, long x);
+    /** @see #getByte(long) */
+    @ForceInline
+    public char getChar(long address) {
+        return getChar(null, address);
+    }
+
+    /** @see #putByte(long, byte) */
+    @ForceInline
+    public void putChar(long address, char x) {
+        putChar(null, address, x);
+    }
+
+    /** @see #getByte(long) */
+    @ForceInline
+    public int getInt(long address) {
+        return getInt(null, address);
+    }
+
+    /** @see #putByte(long, byte) */
+    @ForceInline
+    public void putInt(long address, int x) {
+        putInt(null, address, x);
+    }
+
+    /** @see #getByte(long) */
+    @ForceInline
+    public long getLong(long address) {
+        return getLong(null, address);
+    }
+
+    /** @see #putByte(long, byte) */
+    @ForceInline
+    public void putLong(long address, long x) {
+        putLong(null, address, x);
+    }
+
+    /** @see #getByte(long) */
+    @ForceInline
+    public float getFloat(long address) {
+        return getFloat(null, address);
+    }
+
+    /** @see #putByte(long, byte) */
+    @ForceInline
+    public void putFloat(long address, float x) {
+        putFloat(null, address, x);
+    }
+
+    /** @see #getByte(long) */
+    @ForceInline
+    public double getDouble(long address) {
+        return getDouble(null, address);
+    }
+
+    /** @see #putByte(long, byte) */
+    @ForceInline
+    public void putDouble(long address, double x) {
+        putDouble(null, address, x);
+    }
+
+    /** @see #getAddress(Object, long) */
+    @ForceInline
+    public long getAddress(long address) {
+        return getAddress(null, address);
+    }
+
+    /** @see #putAddress(Object, long, long) */
+    @ForceInline
+    public void putAddress(long address, long x) {
+        putAddress(null, address, x);
+    }
 
 
 

From 529e4623639ff721a272e19b01191fb606abfac9 Mon Sep 17 00:00:00 2001
From: Yasumasa Suenaga <ysuenaga@openjdk.org>
Date: Sat, 7 May 2016 10:32:56 +0900
Subject: [PATCH 055/228] 8156033: jhsdb jmap cannot set heapdump name

Reviewed-by: dsamersoff
---
 .../sun/tools/jhsdb/BasicLauncherTest.java    | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/jdk/test/sun/tools/jhsdb/BasicLauncherTest.java b/jdk/test/sun/tools/jhsdb/BasicLauncherTest.java
index afba30c6055..b0f3b8d4f73 100644
--- a/jdk/test/sun/tools/jhsdb/BasicLauncherTest.java
+++ b/jdk/test/sun/tools/jhsdb/BasicLauncherTest.java
@@ -31,9 +31,12 @@
  * @run main BasicLauncherTest
  */
 
+import static jdk.testlibrary.Asserts.assertTrue;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Arrays;
@@ -99,7 +102,7 @@ public class BasicLauncherTest {
 
         System.out.println("Starting LingeredApp");
         try {
-            theApp = LingeredApp.startApp();
+            theApp = LingeredApp.startApp(Arrays.asList("-Xmx256m"));
 
             System.out.println("Starting " + toolName + " " + toolArgs.get(0) + " against " + theApp.getPid());
             JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK(toolName);
@@ -129,6 +132,21 @@ public class BasicLauncherTest {
         launch(expectedMessage, Arrays.asList(toolArgs));
     }
 
+    public static void testHeapDump() throws IOException {
+        File dump = new File("jhsdb.jmap.dump." +
+                             System.currentTimeMillis() + ".hprof");
+        if (dump.exists()) {
+            dump.delete();
+        }
+        dump.deleteOnExit();
+
+        launch("heap written to", "jmap",
+               "--binaryheap", "--dumpfile=" + dump.getAbsolutePath());
+
+        assertTrue(dump.exists() && dump.isFile(),
+                   "Could not create dump file " + dump.getAbsolutePath());
+    }
+
     public static void main(String[] args)
         throws IOException {
 
@@ -145,6 +163,8 @@ public class BasicLauncherTest {
         launch("Java System Properties", "jinfo");
         launch("java.threads", "jsnap");
 
+        testHeapDump();
+
         // The test throws RuntimeException on error.
         // IOException is thrown if LingeredApp can't start because of some bad
         // environment condition

From 6b75dd66682413d460c7ccb46906d9bc0ec4865a Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Mon, 9 May 2016 12:55:03 +0300
Subject: [PATCH 056/228] 8155071: AppletViewer should print the deprecation
 warning that the Applet API is deprecated

Reviewed-by: prr, smarks
---
 .../share/classes/sun/applet/resources/MsgAppletViewer.java    | 2 +-
 .../applet/DeprecatedAppletViewer/DeprecatedAppletViewer.java  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java b/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java
index 2b2bf2de74f..d9ba0253213 100644
--- a/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java
+++ b/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java
@@ -73,7 +73,7 @@ public class MsgAppletViewer extends ListResourceBundle {
             {"appletviewer.parse.warning.embed.requiresheight", "Warning: <embed> tag requires height attribute."},
             {"appletviewer.parse.warning.embed.requireswidth", "Warning: <embed> tag requires width attribute."},
             {"appletviewer.parse.warning.appnotLongersupported", "Warning: <app> tag no longer supported, use <applet> instead:"},
-            {"appletviewer.deprecated", "AppletViewer is deprecated."},
+            {"appletviewer.deprecated", "Warning: Applet API and AppletViewer are deprecated."},
             {"appletviewer.usage", "Usage: appletviewer <options> url(s)\n\nwhere <options> include:\n  -encoding <encoding>    Specify character encoding used by HTML files\n  -J<runtime flag>        Pass argument to the java interpreter\n\nThe -J option is non-standard and subject to change without notice."},
             {"appletviewer.main.err.unsupportedopt", "Unsupported option: {0}"},
             {"appletviewer.main.err.unrecognizedarg", "Unrecognized argument: {0}"},
diff --git a/jdk/test/sun/applet/DeprecatedAppletViewer/DeprecatedAppletViewer.java b/jdk/test/sun/applet/DeprecatedAppletViewer/DeprecatedAppletViewer.java
index 3c491011794..27cf0330389 100644
--- a/jdk/test/sun/applet/DeprecatedAppletViewer/DeprecatedAppletViewer.java
+++ b/jdk/test/sun/applet/DeprecatedAppletViewer/DeprecatedAppletViewer.java
@@ -32,7 +32,8 @@ import java.io.PrintStream;
  */
 public final class DeprecatedAppletViewer {
 
-    private static final String TEXT = "AppletViewer is deprecated.";
+    private static final String TEXT
+            = "Warning: Applet API and AppletViewer are deprecated.";
 
     public static void main(final String[] args) {
         final PrintStream old = System.err;

From 35d36c1c1016298c9c12ea88fd20cd5e94fb532a Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Mon, 9 May 2016 09:53:55 -0700
Subject: [PATCH 057/228] 8155682: Get rid of legacy Windows Flags for DX

Reviewed-by: serb, jgodinez
---
 .../sun/java2d/windows/WindowsFlags.java      | 43 +------------------
 .../libawt/java2d/windows/WindowsFlags.cpp    | 15 -------
 .../libawt/java2d/windows/WindowsFlags.h      |  3 --
 3 files changed, 1 insertion(+), 60 deletions(-)

diff --git a/jdk/src/java.desktop/windows/classes/sun/java2d/windows/WindowsFlags.java b/jdk/src/java.desktop/windows/classes/sun/java2d/windows/WindowsFlags.java
index 4973ac389bd..8fc1a827e38 100644
--- a/jdk/src/java.desktop/windows/classes/sun/java2d/windows/WindowsFlags.java
+++ b/jdk/src/java.desktop/windows/classes/sun/java2d/windows/WindowsFlags.java
@@ -55,8 +55,6 @@ public class WindowsFlags {
      *               This flag can force us to use d3d
      *               anyway in these situations.  Or, this flag can force us to
      *               not use d3d in a situation where we would use it otherwise.
-     *      translAccelEnabled: usage: "-Dsun.java2d.translaccel=true"
-     *               equivalent to sun.java2d.d3d=true
      *      offscreenSharingEnabled: usage: "-Dsun.java2d.offscreenSharing=true"
      *               Turns on the ability to share a hardware-accelerated
      *               offscreen surface through the JAWT interface.  See
@@ -67,23 +65,6 @@ public class WindowsFlags {
      *               without being very sure that we will be willing to support
      *               that API in the future regardless of other native
      *               rendering pipeline changes.
-     *      accelReset: usage: "-Dsun.java2d.accelReset"
-     *               This flag tells us to reset any persistent information
-     *               the display device acceleration characteristics so that
-     *               we are forced to retest these characteristics.  This flag
-     *               is primarily used for debugging purposes (to allow testing
-     *               of the persistent storage mechanisms) but may also be
-     *               needed by some users if, for example, a driver upgrade
-     *               may change the runtime characteristics and they want the
-     *               tests to be re-run.
-     *      checkRegistry: usage: "-Dsun.java2d.checkRegistry"
-     *               This flag tells us to output the current registry settings
-     *               (after our initialization) to the console.
-     *      disableRegistry: usage: "-Dsun.java2d.disableRegistry"
-     *               This flag tells us to disable all registry-related
-     *               activities.  It is mainly here for debugging purposes,
-     *               to allow us to see whether any runtime bugs are caused
-     *               by or related to registry problems.
      *      magPresent: usage: "-Djavax.accessibility.screen_magnifier_present"
      *               This flag is set either on the command line or in the
      *               properties file.  It tells Swing whether the user is
@@ -121,9 +102,6 @@ public class WindowsFlags {
     private static boolean oglEnabled;
     private static boolean oglVerbose;
     private static boolean offscreenSharingEnabled;
-    private static boolean accelReset;
-    private static boolean checkRegistry;
-    private static boolean disableRegistry;
     private static boolean magPresent;
     private static boolean setHighDPIAware;
     // TODO: other flags, including nopixfmt
@@ -234,11 +212,6 @@ public class WindowsFlags {
                 }
                 offscreenSharingEnabled =
                     getBooleanProp("sun.java2d.offscreenSharing", false);
-                accelReset = getBooleanProp("sun.java2d.accelReset", false);
-                checkRegistry =
-                    getBooleanProp("sun.java2d.checkRegistry", false);
-                disableRegistry =
-                    getBooleanProp("sun.java2d.disableRegistry", false);
                 String dpiOverride = System.getProperty("sun.java2d.dpiaware");
                 if (dpiOverride != null) {
                     setHighDPIAware = dpiOverride.equalsIgnoreCase("true");
@@ -265,22 +238,12 @@ public class WindowsFlags {
         System.out.println("WindowsFlags (Java):");
         System.out.println("  ddEnabled: " + ddEnabled + "\n" +
                            "  ddOffscreenEnabled: " + ddOffscreenEnabled + "\n" +
-                           "  ddVramForced: " + ddVramForced + "\n" +
-                           "  ddLockEnabled: " + ddLockEnabled + "\n" +
-                           "  ddLockSet: " + ddLockSet + "\n" +
-                           "  ddBlitEnabled: " + ddBlitEnabled + "\n" +
-                           "  ddScaleEnabled: " + ddScaleEnabled + "\n" +
                            "  d3dEnabled: " + d3dEnabled + "\n" +
                            "  d3dSet: " + d3dSet + "\n" +
                            "  oglEnabled: " + oglEnabled + "\n" +
                            "  oglVerbose: " + oglVerbose + "\n" +
                            "  gdiBlitEnabled: " + gdiBlitEnabled + "\n" +
-                           "  translAccelEnabled: " + translAccelEnabled + "\n" +
-                           "  offscreenSharingEnabled: " + offscreenSharingEnabled + "\n" +
-                           "  accelReset: " + accelReset + "\n" +
-                           "  checkRegistry: " + checkRegistry + "\n" +
-                           "  disableRegistry: " + disableRegistry + "\n" +
-                           "  d3dTexBPP: " + d3dTexBpp);
+                           "  offscreenSharingEnabled: " + offscreenSharingEnabled);
         */
     }
 
@@ -304,10 +267,6 @@ public class WindowsFlags {
         return gdiBlitEnabled;
     }
 
-    public static boolean isTranslucentAccelerationEnabled() {
-        return d3dEnabled;
-    }
-
     public static boolean isOffscreenSharingEnabled() {
         return offscreenSharingEnabled;
     }
diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.cpp b/jdk/src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.cpp
index 1de213f838e..528e95e326a 100644
--- a/jdk/src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.cpp
+++ b/jdk/src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.cpp
@@ -27,13 +27,10 @@
 #include "Trace.h"
 #include "WindowsFlags.h"
 
-BOOL      accelReset;         // reset registry 2d acceleration settings
 BOOL      useD3D = TRUE;      // d3d enabled flag
                               // initially is TRUE to allow D3D preloading
 BOOL      forceD3DUsage;      // force d3d on or off
 jboolean  g_offscreenSharing; // JAWT accelerated surface sharing
-BOOL      checkRegistry;      // Diagnostic tool: outputs 2d registry settings
-BOOL      disableRegistry;    // Diagnostic tool: disables registry interaction
 BOOL      setHighDPIAware;    // Whether to set the high-DPI awareness flag
 
 extern WCHAR *j2dAccelKey;       // Name of java2d root key
@@ -95,12 +92,6 @@ void GetFlagValues(JNIEnv *env, jclass wFlagsClass)
     g_offscreenSharing = GetStaticBoolean(env, wFlagsClass,
                                           "offscreenSharingEnabled");
     JNU_CHECK_EXCEPTION(env);
-    accelReset = GetStaticBoolean(env, wFlagsClass, "accelReset");
-    JNU_CHECK_EXCEPTION(env);
-    checkRegistry = GetStaticBoolean(env, wFlagsClass, "checkRegistry");
-    JNU_CHECK_EXCEPTION(env);
-    disableRegistry = GetStaticBoolean(env, wFlagsClass, "disableRegistry");
-    JNU_CHECK_EXCEPTION(env);
 
     setHighDPIAware =
         (IS_WINVISTA && GetStaticBoolean(env, wFlagsClass, "setHighDPIAware"));
@@ -113,12 +104,6 @@ void GetFlagValues(JNIEnv *env, jclass wFlagsClass)
                 (forceD3DUsage ? "true" : "false"));
     J2dTraceLn1(J2D_TRACE_INFO, "  offscreenSharing = %s",
                 (g_offscreenSharing ? "true" : "false"));
-    J2dTraceLn1(J2D_TRACE_INFO, "  accelReset = %s",
-                (accelReset ? "true" : "false"));
-    J2dTraceLn1(J2D_TRACE_INFO, "  checkRegistry = %s",
-                (checkRegistry ? "true" : "false"));
-    J2dTraceLn1(J2D_TRACE_INFO, "  disableRegistry = %s",
-                (disableRegistry ? "true" : "false"));
     J2dTraceLn1(J2D_TRACE_INFO, "  setHighDPIAware = %s",
                 (setHighDPIAware ? "true" : "false"));
 }
diff --git a/jdk/src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.h b/jdk/src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.h
index 68a51e4e940..1a3f0418a6f 100644
--- a/jdk/src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.h
+++ b/jdk/src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.h
@@ -27,12 +27,9 @@
 #ifndef WINDOWSFLAGS_H
 #define WINDOWSFLAGS_H
 
-extern BOOL      accelReset;         // reset registry 2d acceleration settings
 extern BOOL      useD3D;             // d3d enabled flag
 extern BOOL      forceD3DUsage;      // force d3d on or off
 extern jboolean  g_offscreenSharing; // JAWT accelerated surface sharing
-extern BOOL      checkRegistry;      // Diag tool: outputs 2d registry settings
-extern BOOL      disableRegistry;    // Diag tool: disables registry interaction
 extern BOOL      setHighDPIAware;    // whether to set High DPI Aware flag on Vista
 
 void SetD3DEnabledFlag(JNIEnv *env, BOOL d3dEnabled, BOOL d3dSet);

From ae4d032d4143fd7b7bef4af7a8b7a75976f37707 Mon Sep 17 00:00:00 2001
From: Dmitry Samersoff <dsamersoff@openjdk.org>
Date: Mon, 9 May 2016 23:41:59 +0300
Subject: [PATCH 058/228] 8155091: Remove SA related functions from tmtools

Remove options that enables support for non-cooperative mode

Reviewed-by: alanb, mchung, sla
---
 .../tools/attach/HotSpotVirtualMachine.java   |   2 +-
 .../internal/vm/agent/spi/ToolProvider.java   |  42 --
 .../vm/agent/spi/ToolProviderFinder.java      |  46 ---
 .../jdk.jcmd/share/classes/module-info.java   |   5 -
 .../share/classes/sun/tools/jinfo/JInfo.java  | 282 +++++--------
 .../share/classes/sun/tools/jmap/JMap.java    | 379 ++++++------------
 .../classes/sun/tools/jstack/JStack.java      | 144 +++----
 .../heapconfig/JMapHeapConfigTest.java        |   4 +-
 .../heapconfig/TmtoolTestScenario.java        |   4 +-
 .../{JInfoHelper.java => BasicJInfoTest.java} |  67 ++--
 .../sun/tools/jinfo/JInfoLauncherTest.java    | 343 ----------------
 .../jinfo/JInfoRunningProcessFlagTest.java    | 129 ------
 .../tools/jinfo/JInfoRunningProcessTest.java  |  65 ---
 jdk/test/sun/tools/jinfo/JInfoSanityTest.java |  77 ----
 jdk/test/sun/tools/jmap/BasicJMapTest.java    |  17 +-
 .../sun/tools/jstack/BasicJStackTest.java     |   2 -
 .../tools/jstack/DeadlockDetectionTest.java   |   1 -
 17 files changed, 333 insertions(+), 1276 deletions(-)
 delete mode 100644 jdk/src/jdk.jcmd/share/classes/jdk/internal/vm/agent/spi/ToolProvider.java
 delete mode 100644 jdk/src/jdk.jcmd/share/classes/jdk/internal/vm/agent/spi/ToolProviderFinder.java
 rename jdk/test/sun/tools/{jmap => jhsdb}/heapconfig/JMapHeapConfigTest.java (98%)
 rename jdk/test/sun/tools/{jmap => jhsdb}/heapconfig/TmtoolTestScenario.java (97%)
 rename jdk/test/sun/tools/jinfo/{JInfoHelper.java => BasicJInfoTest.java} (51%)
 delete mode 100644 jdk/test/sun/tools/jinfo/JInfoLauncherTest.java
 delete mode 100644 jdk/test/sun/tools/jinfo/JInfoRunningProcessFlagTest.java
 delete mode 100644 jdk/test/sun/tools/jinfo/JInfoRunningProcessTest.java
 delete mode 100644 jdk/test/sun/tools/jinfo/JInfoSanityTest.java

diff --git a/jdk/src/jdk.attach/share/classes/sun/tools/attach/HotSpotVirtualMachine.java b/jdk/src/jdk.attach/share/classes/sun/tools/attach/HotSpotVirtualMachine.java
index 4a9562b069f..a5e965e5ec3 100644
--- a/jdk/src/jdk.attach/share/classes/sun/tools/attach/HotSpotVirtualMachine.java
+++ b/jdk/src/jdk.attach/share/classes/sun/tools/attach/HotSpotVirtualMachine.java
@@ -258,7 +258,7 @@ public abstract class HotSpotVirtualMachine extends VirtualMachine {
     /*
      * Convenience method for simple commands
      */
-    private InputStream executeCommand(String cmd, Object ... args) throws IOException {
+    public InputStream executeCommand(String cmd, Object ... args) throws IOException {
         try {
             return execute(cmd, args);
         } catch (AgentLoadException x) {
diff --git a/jdk/src/jdk.jcmd/share/classes/jdk/internal/vm/agent/spi/ToolProvider.java b/jdk/src/jdk.jcmd/share/classes/jdk/internal/vm/agent/spi/ToolProvider.java
deleted file mode 100644
index 55be308348a..00000000000
--- a/jdk/src/jdk.jcmd/share/classes/jdk/internal/vm/agent/spi/ToolProvider.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2016, 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.vm.agent.spi;
-
-/**
- * Service interface for jdk.hotspot.agent to provide the tools that
- * jstack, jmap, jinfo will invoke, if present.
- */
-public interface ToolProvider {
-    /**
-     * Returns the name of the tool provider
-     */
-    String getName();
-
-    /**
-     * Invoke the tool provider with the given arguments
-     */
-    void run(String... arguments);
-}
diff --git a/jdk/src/jdk.jcmd/share/classes/jdk/internal/vm/agent/spi/ToolProviderFinder.java b/jdk/src/jdk.jcmd/share/classes/jdk/internal/vm/agent/spi/ToolProviderFinder.java
deleted file mode 100644
index b96e6ae6239..00000000000
--- a/jdk/src/jdk.jcmd/share/classes/jdk/internal/vm/agent/spi/ToolProviderFinder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2016, 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.vm.agent.spi;
-
-import java.lang.reflect.Layer;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.ServiceLoader;
-
-public final class ToolProviderFinder {
-    private static final Map<String, ToolProvider> providers = init();
-
-    public static ToolProvider find(String name) {
-        return providers.get(name);
-    }
-
-    private static Map<String, ToolProvider> init() {
-        Map<String, ToolProvider> providers = new HashMap<>();
-        ServiceLoader.load(Layer.boot(), ToolProvider.class)
-                     .forEach(p -> providers.putIfAbsent(p.getName(), p));
-        return providers;
-    }
-}
diff --git a/jdk/src/jdk.jcmd/share/classes/module-info.java b/jdk/src/jdk.jcmd/share/classes/module-info.java
index 4b8dbce1304..c78803b774c 100644
--- a/jdk/src/jdk.jcmd/share/classes/module-info.java
+++ b/jdk/src/jdk.jcmd/share/classes/module-info.java
@@ -26,9 +26,4 @@
 module jdk.jcmd {
     requires jdk.attach;
     requires jdk.jvmstat;
-
-    exports jdk.internal.vm.agent.spi to jdk.hotspot.agent;
-
-    uses jdk.internal.vm.agent.spi.ToolProvider;
 }
-
diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jinfo/JInfo.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jinfo/JInfo.java
index f19b6d159f0..dbfbaf2e25b 100644
--- a/jdk/src/jdk.jcmd/share/classes/sun/tools/jinfo/JInfo.java
+++ b/jdk/src/jdk.jcmd/share/classes/sun/tools/jinfo/JInfo.java
@@ -32,8 +32,6 @@ import java.io.InputStream;
 import com.sun.tools.attach.VirtualMachine;
 
 import sun.tools.attach.HotSpotVirtualMachine;
-import jdk.internal.vm.agent.spi.ToolProvider;
-import jdk.internal.vm.agent.spi.ToolProviderFinder;
 
 /*
  * This class is the main class for the JInfo utility. It parses its arguments
@@ -41,155 +39,73 @@ import jdk.internal.vm.agent.spi.ToolProviderFinder;
  * or an SA tool.
  */
 final public class JInfo {
-    private static final String SA_JINFO_TOOL_NAME = "jinfo";
-    private boolean useSA = false;
-    private String[] args = null;
-
-    private JInfo(String[] args) throws IllegalArgumentException {
-        if (args.length == 0) {
-            throw new IllegalArgumentException();
-        }
-
-        int argCopyIndex = 0;
-        // First determine if we should launch SA or not
-        if (args[0].equals("-F")) {
-            // delete the -F
-            argCopyIndex = 1;
-            useSA = true;
-        } else if (args[0].equals("-flags")
-                   || args[0].equals("-sysprops"))
-        {
-            if (args.length == 2) {
-                if (!isPid(args[1])) {
-                    // If args[1] doesn't parse to a number then
-                    // it must be the SA debug server
-                    // (otherwise it is the pid)
-                    useSA = true;
-                }
-            } else if (args.length == 3) {
-                // arguments include an executable and a core file
-                useSA = true;
-            } else {
-                throw new IllegalArgumentException();
-            }
-        } else if (!args[0].startsWith("-")) {
-            if (args.length == 2) {
-                // the only arguments are an executable and a core file
-                useSA = true;
-            } else if (args.length == 1) {
-                if (!isPid(args[0])) {
-                    // The only argument is not a PID; it must be SA debug
-                    // server
-                    useSA = true;
-                }
-            } else {
-                throw new IllegalArgumentException();
-            }
-        } else if (args[0].equals("-h") || args[0].equals("-help")) {
-            if (args.length > 1) {
-                throw new IllegalArgumentException();
-            }
-        } else if (args[0].equals("-flag")) {
-            if (args.length == 3) {
-                if (!isPid(args[2])) {
-                    throw new IllegalArgumentException();
-                }
-            } else {
-                throw new IllegalArgumentException();
-            }
-        } else {
-            throw new IllegalArgumentException();
-        }
-
-        this.args = Arrays.copyOfRange(args, argCopyIndex, args.length);
-    }
-
-    @SuppressWarnings("fallthrough")
-    private void execute() throws Exception {
-        if (args[0].equals("-h")
-            || args[0].equals("-help")) {
-            usage(0);
-        }
-
-        if (useSA) {
-            // SA only supports -flags or -sysprops
-            if (args[0].startsWith("-")) {
-                if (!(args[0].equals("-flags") || args[0].equals("-sysprops"))) {
-                    usage(1);
-                }
-            }
-
-            // invoke SA which does it's own argument parsing
-            runTool();
-
-        } else {
-            // Now we can parse arguments for the non-SA case
-            String pid = null;
-
-            switch(args[0]) {
-                case "-flag":
-                    if (args.length != 3) {
-                        usage(1);
-                    }
-                    String option = args[1];
-                    pid = args[2];
-                    flag(pid, option);
-                    break;
-                case "-flags":
-                    if (args.length != 2) {
-                        usage(1);
-                    }
-                    pid = args[1];
-                    flags(pid);
-                    break;
-                case "-sysprops":
-                    if (args.length != 2) {
-                        usage(1);
-                    }
-                    pid = args[1];
-                    sysprops(pid);
-                    break;
-                case "-help":
-                case "-h":
-                    usage(0);
-                    // Fall through
-                default:
-                    if (args.length == 1) {
-                        // no flags specified, we do -sysprops and -flags
-                        pid = args[0];
-                        sysprops(pid);
-                        System.out.println();
-                        flags(pid);
-                        System.out.println();
-                        commandLine(pid);
-                    } else {
-                        usage(1);
-                    }
-            }
-        }
-    }
 
     public static void main(String[] args) throws Exception {
-        JInfo jinfo = null;
-        try {
-            jinfo = new JInfo(args);
-            jinfo.execute();
-        } catch (IllegalArgumentException e) {
+        if (args.length == 0) {
+            usage(1); // no arguments
+        }
+        checkForUnsupportedOptions(args);
+
+        boolean doFlag = false;
+        boolean doFlags = false;
+        boolean doSysprops = false;
+
+        // Parse the options (arguments starting with "-" )
+        int optionCount = 0;
+        while (optionCount < args.length) {
+            String arg = args[optionCount];
+            if (!arg.startsWith("-")) {
+                break;
+            }
+
+            optionCount++;
+
+            if (arg.equals("-help") || arg.equals("-h")) {
+                usage(0);
+            }
+
+            if (arg.equals("-flag")) {
+                doFlag = true;
+                continue;
+            }
+
+            if (arg.equals("-flags")) {
+                doFlags = true;
+                continue;
+            }
+
+            if (arg.equals("-sysprops")) {
+                doSysprops = true;
+                continue;
+            }
+        }
+
+        // Next we check the parameter count. -flag allows extra parameters
+        int paramCount = args.length - optionCount;
+        if ((doFlag && paramCount != 2) || (paramCount != 1)) {
             usage(1);
         }
-    }
 
-    private static boolean isPid(String arg) {
-        return arg.matches("[0-9]+");
-    }
-
-    // Invoke SA tool with the given arguments
-    private void runTool() throws Exception {
-        ToolProvider tool = ToolProviderFinder.find(SA_JINFO_TOOL_NAME);
-        if (tool == null) {
-            usage(1);
+        if (!doFlag && !doFlags && !doSysprops) {
+            // Print flags and sysporps if no options given
+            sysprops(args[optionCount]);
+            System.out.println();
+            flags(args[optionCount]);
+            System.out.println();
+            commandLine(args[optionCount]);
+        }
+
+        if (doFlag) {
+            flag(args[optionCount+1], args[optionCount]);
+        }
+        else {
+            if (doFlags) {
+                flags(args[optionCount]);
+            }
+            else if (doSysprops) {
+                sysprops(args[optionCount]);
+            }
         }
-        tool.run(args);
     }
 
     private static void flag(String pid, String option) throws IOException {
@@ -274,46 +190,50 @@ final public class JInfo {
         vm.detach();
     }
 
+    private static void checkForUnsupportedOptions(String[] args) {
+        // Check arguments for -F, and non-numeric value
+        // and warn the user that SA is not supported anymore
 
-    // print usage message
-    private static void usage(int exit) {
-        boolean usageSA = ToolProviderFinder.find(SA_JINFO_TOOL_NAME) != null;
+        int paramCount = 0;
 
-        System.err.println("Usage:");
-        if (usageSA) {
-            System.err.println("    jinfo [option] <pid>");
-            System.err.println("        (to connect to a running process)");
-            System.err.println("    jinfo -F [option] <pid>");
-            System.err.println("        (to connect to a hung process)");
-            System.err.println("    jinfo [option] <executable> <core>");
-            System.err.println("        (to connect to a core file)");
-            System.err.println("    jinfo [option] [server_id@]<remote server IP or hostname>");
-            System.err.println("        (to connect to remote debug server)");
-            System.err.println("");
-            System.err.println("where <option> is one of:");
-            System.err.println("  for running processes:");
-            System.err.println("    -flag <name>         to print the value of the named VM flag");
-            System.err.println("    -flag [+|-]<name>    to enable or disable the named VM flag");
-            System.err.println("    -flag <name>=<value> to set the named VM flag to the given value");
-            System.err.println("  for running or hung processes and core files:");
-            System.err.println("    -flags               to print VM flags");
-            System.err.println("    -sysprops            to print Java system properties");
-            System.err.println("    <no option>          to print both VM flags and system properties");
-            System.err.println("    -h | -help           to print this help message");
-        } else {
-            System.err.println("    jinfo <option> <pid>");
-            System.err.println("       (to connect to a running process)");
-            System.err.println("");
-            System.err.println("where <option> is one of:");
-            System.err.println("    -flag <name>         to print the value of the named VM flag");
-            System.err.println("    -flag [+|-]<name>    to enable or disable the named VM flag");
-            System.err.println("    -flag <name>=<value> to set the named VM flag to the given value");
-            System.err.println("    -flags               to print VM flags");
-            System.err.println("    -sysprops            to print Java system properties");
-            System.err.println("    <no option>          to print both VM flags and system properties");
-            System.err.println("    -h | -help           to print this help message");
+        for (String s : args) {
+            if (s.equals("-F")) {
+                SAOptionError("-F option used");
+            }
+
+            if (! s.startsWith("-")) {
+                if (! s.matches("[0-9]+")) {
+                   SAOptionError("non PID argument");
+                }
+                paramCount += 1;
+            }
         }
 
+        if (paramCount > 1) {
+            SAOptionError("More than one non-option argument");
+        }
+    }
+
+    private static void SAOptionError(String msg) {
+        System.err.println("Error: " + msg);
+        System.err.println("Cannot connect to core dump or remote debug server. Use jhsdb jinfo instead");
+        System.exit(1);
+    }
+
+     // print usage message
+    private static void usage(int exit) {
+        System.err.println("Usage:");
+        System.err.println("    jinfo <option> <pid>");
+        System.err.println("       (to connect to a running process)");
+        System.err.println("");
+        System.err.println("where <option> is one of:");
+        System.err.println("    -flag <name>         to print the value of the named VM flag");
+        System.err.println("    -flag [+|-]<name>    to enable or disable the named VM flag");
+        System.err.println("    -flag <name>=<value> to set the named VM flag to the given value");
+        System.err.println("    -flags               to print VM flags");
+        System.err.println("    -sysprops            to print Java system properties");
+        System.err.println("    <no option>          to print both VM flags and system properties");
+        System.err.println("    -h | -help           to print this help message");
         System.exit(exit);
     }
 }
diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jmap/JMap.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jmap/JMap.java
index cb7651e476b..9815f5234ab 100644
--- a/jdk/src/jdk.jcmd/share/classes/sun/tools/jmap/JMap.java
+++ b/jdk/src/jdk.jcmd/share/classes/sun/tools/jmap/JMap.java
@@ -28,12 +28,11 @@ package sun.tools.jmap;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
 
 import com.sun.tools.attach.VirtualMachine;
 import com.sun.tools.attach.AttachNotSupportedException;
 import sun.tools.attach.HotSpotVirtualMachine;
-import jdk.internal.vm.agent.spi.ToolProvider;
-import jdk.internal.vm.agent.spi.ToolProviderFinder;
 
 /*
  * This class is the main class for the JMap utility. It parses its arguments
@@ -44,34 +43,18 @@ import jdk.internal.vm.agent.spi.ToolProviderFinder;
  */
 public class JMap {
 
-    // Options handled by the attach mechanism
-    private static String HISTO_OPTION = "-histo";
-    private static String LIVE_HISTO_OPTION = "-histo:live";
-    private static String DUMP_OPTION_PREFIX = "-dump:";
-
-    // These options imply the use of a SA tool
-    private static String SA_TOOL_OPTIONS =
-      "-heap|-heap:format=b|-clstats|-finalizerinfo";
-
-    // The -F (force) option is currently not passed through to SA
-    private static String FORCE_SA_OPTION = "-F";
-
-    // Default option (if nothing provided)
-    private static String DEFAULT_OPTION = "-pmap";
-
     public static void main(String[] args) throws Exception {
         if (args.length == 0) {
             usage(1); // no arguments
         }
 
-        // used to indicate if we should use SA
-        boolean useSA = false;
+        checkForUnsupportedOptions(args);
 
-        // the chosen option (-heap, -dump:*, ... )
+        // the chosen option
         String option = null;
 
         // First iterate over the options (arguments starting with -).  There should be
-        // one (but maybe two if -F is also used).
+        // one.
         int optionCount = 0;
         while (optionCount < args.length) {
             String arg = args[optionCount];
@@ -80,8 +63,6 @@ public class JMap {
             }
             if (arg.equals("-help") || arg.equals("-h")) {
                 usage(0);
-            } else if (arg.equals(FORCE_SA_OPTION)) {
-                useSA = true;
             } else {
                 if (option != null) {
                     usage(1);  // option already specified
@@ -93,123 +74,95 @@ public class JMap {
 
         // if no option provided then use default.
         if (option == null) {
-            option = DEFAULT_OPTION;
-        }
-        if (option.matches(SA_TOOL_OPTIONS)) {
-            useSA = true;
+            usage(0);
         }
 
-        // Next we check the parameter count. For the SA tools there are
-        // one or two parameters. For the built-in -dump option there is
-        // only one parameter (the process-id)
+        // Next we check the parameter count.
         int paramCount = args.length - optionCount;
-        if (paramCount == 0 || paramCount > 2) {
+        if (paramCount != 1) {
             usage(1);
         }
 
-        if (optionCount == 0 || paramCount != 1) {
-            useSA = true;
+        String pid = args[1];
+        // Here we handle the built-in options
+        // As more options are added we should create an abstract tool class and
+        // have a table to map the options
+        if (option.equals("-histo")) {
+            histo(pid, "");
+        } else if (option.startsWith("-histo:")) {
+            histo(pid, option.substring("-histo:".length()));
+        } else if (option.startsWith("-dump:")) {
+            dump(pid, option.substring("-dump:".length()));
+        } else if (option.equals("-finalizerinfo")) {
+            executeCommandForPid(pid, "jcmd", "GC.finalizer_info");
+        } else if (option.equals("-clstats")) {
+            executeCommandForPid(pid, "jcmd", "GC.class_stats");
         } else {
-            // the parameter for the -dump option is a process-id.
-            // If it doesn't parse to a number then it must be SA
-            // debug server
-            if (!args[optionCount].matches("[0-9]+")) {
-                useSA = true;
-            }
-        }
-
-
-        // at this point we know if we are executing an SA tool or a built-in
-        // option.
-
-        if (useSA) {
-            // parameters (<pid> or <exe> <core>)
-            String params[] = new String[paramCount];
-            for (int i=optionCount; i<args.length; i++ ){
-                params[i-optionCount] = args[i];
-            }
-            runTool(option, params);
-
-        } else {
-            String pid = args[1];
-            // Here we handle the built-in options
-            // As more options are added we should create an abstract tool class and
-            // have a table to map the options
-            if (option.equals(HISTO_OPTION)) {
-                histo(pid, false);
-            } else if (option.equals(LIVE_HISTO_OPTION)) {
-                histo(pid, true);
-            } else if (option.startsWith(DUMP_OPTION_PREFIX)) {
-                dump(pid, option);
-            } else {
-                usage(1);
-            }
+          usage(1);
         }
     }
 
-    // Invoke SA tool  with the given arguments
-    private static void runTool(String option, String args[]) throws Exception {
-        String[][] tools = {
-            { "-pmap",          "pmap"             },
-            { "-heap",          "heapSummary"      },
-            { "-heap:format=b", "heapDumper"       },
-            { "-histo",         "objectHistogram"  },
-            { "-clstats",       "classLoaderStats" },
-            { "-finalizerinfo", "finalizerInfo"    },
-        };
+    private static void executeCommandForPid(String pid, String command, Object ... args)
+        throws AttachNotSupportedException, IOException,
+               UnsupportedEncodingException {
+        VirtualMachine vm = VirtualMachine.attach(pid);
 
-        String name = null;
+        // Cast to HotSpotVirtualMachine as this is an
+        // implementation specific method.
+        HotSpotVirtualMachine hvm = (HotSpotVirtualMachine) vm;
+        try (InputStream in = hvm.executeCommand(command, args)) {
+          // read to EOF and just print output
+          byte b[] = new byte[256];
+          int n;
+          do {
+              n = in.read(b);
+              if (n > 0) {
+                  String s = new String(b, 0, n, "UTF-8");
+                  System.out.print(s);
+              }
+          } while (n > 0);
+        }
+        vm.detach();
+    }
 
-        // -dump option needs to be handled in a special way
-        if (option.startsWith(DUMP_OPTION_PREFIX)) {
-            // first check that the option can be parsed
-            String fn = parseDumpOptions(option);
-            if (fn == null) {
-                usage(1);
-            }
+    private static void histo(String pid, String options)
+        throws AttachNotSupportedException, IOException,
+               UnsupportedEncodingException {
+        String liveopt = "-all";
+        if (options.equals("") || options.equals("all")) {
+            //  pass
+        }
+        else if (options.equals("live")) {
+            liveopt = "-live";
+        }
+        else {
+            usage(1);
+        }
 
-            // tool for heap dumping
-            name = "heapDumper";
+        // inspectHeap is not the same as jcmd GC.class_histogram
+        executeCommandForPid(pid, "inspectheap", liveopt);
+    }
 
-            // HeapDumper -f <file>
-            args = prepend(fn, args);
-            args = prepend("-f", args);
-        } else {
-            int i=0;
-            while (i < tools.length) {
-                if (option.equals(tools[i][0])) {
-                    name = tools[i][1];
-                    break;
+    private static void dump(String pid, String options)
+        throws AttachNotSupportedException, IOException,
+               UnsupportedEncodingException {
+
+        String subopts[] = options.split(",");
+        String filename = null;
+        String liveopt = "-all";
+
+        for (int i = 0; i < subopts.length; i++) {
+            String subopt = subopts[i];
+            if (subopt.equals("live")) {
+                liveopt = "-live";
+            } else if (subopt.startsWith("file=")) {
+                // file=<file> - check that <file> is specified
+                if (subopt.length() > 5) {
+                    filename = subopt.substring(5);
                 }
-                i++;
             }
         }
-        if (name == null) {
-            usage(1);   // no mapping to tool
-        }
 
-        // Tool not available on this platform.
-        ToolProvider tool = ToolProviderFinder.find(name);
-        if (tool == null) {
-            usage(1);
-        }
-
-        // invoke the main method with the arguments
-        tool.run(args);
-    }
-
-    private static final String LIVE_OBJECTS_OPTION = "-live";
-    private static final String ALL_OBJECTS_OPTION = "-all";
-    private static void histo(String pid, boolean live) throws IOException {
-        VirtualMachine vm = attach(pid);
-        InputStream in = ((HotSpotVirtualMachine)vm).
-            heapHisto(live ? LIVE_OBJECTS_OPTION : ALL_OBJECTS_OPTION);
-        drain(vm, in);
-    }
-
-    private static void dump(String pid, String options) throws IOException {
-        // parse the options to get the dump filename
-        String filename = parseDumpOptions(options);
         if (filename == null) {
             usage(1);  // invalid options or no filename
         }
@@ -219,156 +172,76 @@ public class JMap {
         // working directory rather than the directory where jmap
         // is executed.
         filename = new File(filename).getCanonicalPath();
-
-        // dump live objects only or not
-        boolean live = isDumpLiveObjects(options);
-
-        VirtualMachine vm = attach(pid);
-        System.out.println("Dumping heap to " + filename + " ...");
-        InputStream in = ((HotSpotVirtualMachine)vm).
-            dumpHeap((Object)filename,
-                     (live ? LIVE_OBJECTS_OPTION : ALL_OBJECTS_OPTION));
-        drain(vm, in);
+        // dumpHeap is not the same as jcmd GC.heap_dump
+        executeCommandForPid(pid, "dumpheap", filename, liveopt);
     }
 
-    // Parse the options to the -dump option. Valid options are format=b and
-    // file=<file>. Returns <file> if provided. Returns null if <file> not
-    // provided, or invalid option.
-    private static String parseDumpOptions(String arg) {
-        assert arg.startsWith(DUMP_OPTION_PREFIX);
+    private static void checkForUnsupportedOptions(String[] args) {
+        // Check arguments for -F, -m, and non-numeric value
+        // and warn the user that SA is not supported anymore
 
-        String filename = null;
+        int paramCount = 0;
 
-        // options are separated by comma (,)
-        String options[] = arg.substring(DUMP_OPTION_PREFIX.length()).split(",");
+        for (String s : args) {
+            if (s.equals("-F")) {
+                SAOptionError("-F option used");
+            }
 
-        for (int i=0; i<options.length; i++) {
-            String option = options[i];
+            if (s.equals("-heap")) {
+                SAOptionError("-heap option used");
+            }
 
-            if (option.equals("format=b")) {
-                // ignore format (not needed at this time)
-            } else if (option.equals("live")) {
-                // a valid suboption
-            } else {
+            /* Reimplemented using jcmd, output format is different
+               from original one
 
-                // file=<file> - check that <file> is specified
-                if (option.startsWith("file=")) {
-                    filename = option.substring(5);
-                    if (filename.length() == 0) {
-                        return null;
-                    }
-                } else {
-                    return null;  // option not recognized
+            if (s.equals("-clstats")) {
+                warnSA("-clstats option used");
+            }
+
+            if (s.equals("-finalizerinfo")) {
+                warnSA("-finalizerinfo option used");
+            }
+            */
+
+            if (! s.startsWith("-")) {
+                if (! s.matches("[0-9]+")) {
+                    SAOptionError("non PID argument");
                 }
+                paramCount += 1;
             }
         }
-        return filename;
-    }
 
-    private static boolean isDumpLiveObjects(String arg) {
-        // options are separated by comma (,)
-        String options[] = arg.substring(DUMP_OPTION_PREFIX.length()).split(",");
-        for (String suboption : options) {
-            if (suboption.equals("live")) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    // Attach to <pid>, existing if we fail to attach
-    private static VirtualMachine attach(String pid) {
-        try {
-            return VirtualMachine.attach(pid);
-        } catch (Exception x) {
-            String msg = x.getMessage();
-            if (msg != null) {
-                System.err.println(pid + ": " + msg);
-            } else {
-                x.printStackTrace();
-            }
-            if ((x instanceof AttachNotSupportedException) && haveSA()) {
-                System.err.println("The -F option can be used when the " +
-                  "target process is not responding");
-            }
-            System.exit(1);
-            return null; // keep compiler happy
+        if (paramCount > 1) {
+            SAOptionError("More than one non-option argument");
         }
     }
 
-    // Read the stream from the target VM until EOF, then detach
-    private static void drain(VirtualMachine vm, InputStream in) throws IOException {
-        // read to EOF and just print output
-        byte b[] = new byte[256];
-        int n;
-        do {
-            n = in.read(b);
-            if (n > 0) {
-                String s = new String(b, 0, n, "UTF-8");
-                System.out.print(s);
-            }
-        } while (n > 0);
-        in.close();
-        vm.detach();
-    }
-
-    // return a new string array with arg as the first element
-    private static String[] prepend(String arg, String args[]) {
-        String[] newargs = new String[args.length+1];
-        newargs[0] = arg;
-        System.arraycopy(args, 0, newargs, 1, args.length);
-        return newargs;
-    }
-
-    // returns true if SA is available
-    private static boolean haveSA() {
-        return ToolProviderFinder.find("heapSummary") != null;
+    private static void SAOptionError(String msg) {
+        System.err.println("Error: " + msg);
+        System.err.println("Cannot connect to core dump or remote debug server. Use jhsdb jmap instead");
+        System.exit(1);
     }
 
     // print usage message
     private static void usage(int exit) {
         System.err.println("Usage:");
-        if (haveSA()) {
-            System.err.println("    jmap [option] <pid>");
-            System.err.println("        (to connect to running process)");
-            System.err.println("    jmap [option] <executable <core>");
-            System.err.println("        (to connect to a core file)");
-            System.err.println("    jmap [option] [server_id@]<remote server IP or hostname>");
-            System.err.println("        (to connect to remote debug server)");
-            System.err.println("");
-            System.err.println("where <option> is one of:");
-            System.err.println("    <none>               to print same info as Solaris pmap");
-            System.err.println("    -heap                to print java heap summary");
-            System.err.println("    -histo[:live]        to print histogram of java object heap; if the \"live\"");
-            System.err.println("                         suboption is specified, only count live objects");
-            System.err.println("    -clstats             to print class loader statistics");
-            System.err.println("    -finalizerinfo       to print information on objects awaiting finalization");
-            System.err.println("    -dump:<dump-options> to dump java heap in hprof binary format");
-            System.err.println("                         dump-options:");
-            System.err.println("                           live         dump only live objects; if not specified,");
-            System.err.println("                                        all objects in the heap are dumped.");
-            System.err.println("                           format=b     binary format");
-            System.err.println("                           file=<file>  dump heap to <file>");
-            System.err.println("                         Example: jmap -dump:live,format=b,file=heap.bin <pid>");
-            System.err.println("    -F                   force. Use with -dump:<dump-options> <pid> or -histo");
-            System.err.println("                         to force a heap dump or histogram when <pid> does not");
-            System.err.println("                         respond. The \"live\" suboption is not supported");
-            System.err.println("                         in this mode.");
-            System.err.println("    -h | -help           to print this help message");
-            System.err.println("    -J<flag>             to pass <flag> directly to the runtime system");
-        } else {
-            System.err.println("    jmap -histo <pid>");
-            System.err.println("      (to connect to running process and print histogram of java object heap");
-            System.err.println("    jmap -dump:<dump-options> <pid>");
-            System.err.println("      (to connect to running process and dump java heap)");
-            System.err.println("");
-            System.err.println("    dump-options:");
-            System.err.println("      format=b     binary default");
-            System.err.println("      file=<file>  dump heap to <file>");
-            System.err.println("");
-            System.err.println("    Example:       jmap -dump:format=b,file=heap.bin <pid>");
-        }
-
+        System.err.println("    jmap -clstats <pid>");
+        System.err.println("        to connect to running process and print class loader statistics");
+        System.err.println("    jmap -finalizerinfo <pid>");
+        System.err.println("        to connect to running process and print information on objects awaiting finalization");
+        System.err.println("    jmap -histo[:live] <pid>");
+        System.err.println("        to connect to running process and print histogram of java object heap");
+        System.err.println("        if the \"live\" suboption is specified, only count live objects");
+        System.err.println("    jmap -dump:<dump-options> <pid>");
+        System.err.println("        to connect to running process and dump java heap");
+        System.err.println("");
+        System.err.println("    dump-options:");
+        System.err.println("      live         dump only live objects; if not specified,");
+        System.err.println("                   all objects in the heap are dumped.");
+        System.err.println("      format=b     binary format");
+        System.err.println("      file=<file>  dump heap to <file>");
+        System.err.println("");
+        System.err.println("    Example: jmap -dump:live,format=b,file=heap.bin <pid>");
         System.exit(exit);
     }
 }
diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstack/JStack.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstack/JStack.java
index 355328474fd..1c8cdd8574e 100644
--- a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstack/JStack.java
+++ b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstack/JStack.java
@@ -30,8 +30,6 @@ import java.io.InputStream;
 import com.sun.tools.attach.VirtualMachine;
 import com.sun.tools.attach.AttachNotSupportedException;
 import sun.tools.attach.HotSpotVirtualMachine;
-import jdk.internal.vm.agent.spi.ToolProvider;
-import jdk.internal.vm.agent.spi.ToolProviderFinder;
 
 /*
  * This class is the main class for the JStack utility. It parses its arguments
@@ -39,15 +37,14 @@ import jdk.internal.vm.agent.spi.ToolProviderFinder;
  * obtained the thread dump from a target process using the VM attach mechanism
  */
 public class JStack {
-    private static final String SA_JSTACK_TOOL_NAME = "jstack";
 
     public static void main(String[] args) throws Exception {
         if (args.length == 0) {
             usage(1); // no arguments
         }
 
-        boolean useSA = false;
-        boolean mixed = false;
+        checkForUnsupportedOptions(args);
+
         boolean locks = false;
 
         // Parse the options (arguments starting with "-" )
@@ -60,87 +57,33 @@ public class JStack {
             if (arg.equals("-help") || arg.equals("-h")) {
                 usage(0);
             }
-            else if (arg.equals("-F")) {
-                useSA = true;
-            }
             else {
-                if (arg.equals("-m")) {
-                    mixed = true;
+                if (arg.equals("-l")) {
+                    locks = true;
                 } else {
-                    if (arg.equals("-l")) {
-                       locks = true;
-                    } else {
-                        usage(1);
-                    }
+                    usage(1);
                 }
             }
             optionCount++;
         }
 
-        // mixed stack implies SA tool
-        if (mixed) {
-            useSA = true;
-        }
-
-        // Next we check the parameter count. If there are two parameters
-        // we assume core file and executable so we use SA.
+        // Next we check the parameter count.
         int paramCount = args.length - optionCount;
-        if (paramCount == 0 || paramCount > 2) {
+        if (paramCount != 1) {
             usage(1);
         }
-        if (paramCount == 2) {
-            useSA = true;
-        } else {
-            // If we can't parse it as a pid then it must be debug server
-            if (!args[optionCount].matches("[0-9]+")) {
-                useSA = true;
-            }
-        }
 
-        // now execute using the SA JStack tool or the built-in thread dumper
-        if (useSA) {
-            // parameters (<pid> or <exe> <core>
-            String params[] = new String[paramCount];
-            for (int i=optionCount; i<args.length; i++ ){
-                params[i-optionCount] = args[i];
-            }
-            runJStackTool(mixed, locks, params);
-        } else {
-            // pass -l to thread dump operation to get extra lock info
-            String pid = args[optionCount];
-            String params[];
-            if (locks) {
-                params = new String[] { "-l" };
-            } else {
-                params = new String[0];
-            }
-            runThreadDump(pid, params);
-        }
-    }
-
-    // SA JStack tool
-    private static boolean isAgentToolPresent() {
-        return ToolProviderFinder.find(SA_JSTACK_TOOL_NAME) != null;
-    }
-
-    private static void runJStackTool(boolean mixed, boolean locks, String args[]) throws Exception {
-        ToolProvider tool = ToolProviderFinder.find(SA_JSTACK_TOOL_NAME);
-        if (tool == null) {
-            usage(1);            // SA not available
-        }
-
-        // JStack tool also takes -m and -l arguments
-        if (mixed) {
-            args = prepend("-m", args);
-        }
+        // pass -l to thread dump operation to get extra lock info
+        String pid = args[optionCount];
+        String params[];
         if (locks) {
-            args = prepend("-l", args);
+            params = new String[] { "-l" };
+        } else {
+            params = new String[0];
         }
-
-        tool.run(args);
+        runThreadDump(pid, params);
     }
 
-
     // Attach to pid and perform a thread dump
     private static void runThreadDump(String pid, String args[]) throws Exception {
         VirtualMachine vm = null;
@@ -153,10 +96,6 @@ public class JStack {
             } else {
                 x.printStackTrace();
             }
-            if ((x instanceof AttachNotSupportedException) && isAgentToolPresent()) {
-                System.err.println("The -F option can be used when the target " +
-                    "process is not responding");
-            }
             System.exit(1);
         }
 
@@ -178,12 +117,38 @@ public class JStack {
         vm.detach();
     }
 
-    // return a new string array with arg as the first element
-    private static String[] prepend(String arg, String args[]) {
-        String[] newargs = new String[args.length+1];
-        newargs[0] = arg;
-        System.arraycopy(args, 0, newargs, 1, args.length);
-        return newargs;
+    private static void checkForUnsupportedOptions(String[] args) {
+        // Check arguments for -F, -m, and non-numeric value
+        // and warn the user that SA is not supported anymore
+
+        int paramCount = 0;
+
+        for (String s : args) {
+            if (s.equals("-F")) {
+                SAOptionError("-F option used");
+            }
+
+            if (s.equals("-m")) {
+                SAOptionError("-m option used");
+            }
+
+            if (! s.startsWith("-")) {
+                if (! s.matches("[0-9]+")) {
+                    SAOptionError("non PID argument");
+                }
+                paramCount += 1;
+            }
+        }
+
+        if (paramCount > 1) {
+            SAOptionError("More than one non-option argument");
+        }
+    }
+
+    private static void SAOptionError(String msg) {
+        System.err.println("Error: " + msg);
+        System.err.println("Cannot connect to core dump or remote debug server. Use jhsdb jstack instead");
+        System.exit(1);
     }
 
     // print usage message
@@ -191,25 +156,8 @@ public class JStack {
         System.err.println("Usage:");
         System.err.println("    jstack [-l] <pid>");
         System.err.println("        (to connect to running process)");
-
-        if (isAgentToolPresent()) {
-            System.err.println("    jstack -F [-m] [-l] <pid>");
-            System.err.println("        (to connect to a hung process)");
-            System.err.println("    jstack [-m] [-l] <executable> <core>");
-            System.err.println("        (to connect to a core file)");
-            System.err.println("    jstack [-m] [-l] [server_id@]<remote server IP or hostname>");
-            System.err.println("        (to connect to a remote debug server)");
-        }
-
         System.err.println("");
         System.err.println("Options:");
-
-        if (isAgentToolPresent()) {
-            System.err.println("    -F  to force a thread dump. Use when jstack <pid> does not respond" +
-                " (process is hung)");
-            System.err.println("    -m  to print both java and native frames (mixed mode)");
-        }
-
         System.err.println("    -l  long listing. Prints additional information about locks");
         System.err.println("    -h or -help to print this help message");
         System.exit(exit);
diff --git a/jdk/test/sun/tools/jmap/heapconfig/JMapHeapConfigTest.java b/jdk/test/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java
similarity index 98%
rename from jdk/test/sun/tools/jmap/heapconfig/JMapHeapConfigTest.java
rename to jdk/test/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java
index 5a84b6261d6..c768dd6eb01 100644
--- a/jdk/test/sun/tools/jmap/heapconfig/JMapHeapConfigTest.java
+++ b/jdk/test/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java
@@ -36,9 +36,9 @@ import jdk.testlibrary.Platform;
  * @test
  * @bug 8042397
  * @summary Unit test for jmap utility test heap configuration reader
+ * @modules jdk.hotspot.agent/sun.jvm.hotspot
  * @library /test/lib/share/classes
  * @library /lib/testlibrary
- * @modules java.management
  * @build jdk.testlibrary.*
  * @build jdk.test.lib.apps.*
  * @build JMapHeapConfigTest TmtoolTestScenario
@@ -149,7 +149,7 @@ public class JMapHeapConfigTest {
         }
         cmd.add("-XX:+PrintFlagsFinal");
 
-        TmtoolTestScenario tmt = TmtoolTestScenario.create("jmap", "-heap");
+        TmtoolTestScenario tmt = TmtoolTestScenario.create("jmap", "--heap");
         int exitcode = tmt.launch(cmd);
         if (exitcode != 0) {
             throw new RuntimeException("Test FAILED jmap exits with non zero exit code " + exitcode);
diff --git a/jdk/test/sun/tools/jmap/heapconfig/TmtoolTestScenario.java b/jdk/test/sun/tools/jhsdb/heapconfig/TmtoolTestScenario.java
similarity index 97%
rename from jdk/test/sun/tools/jmap/heapconfig/TmtoolTestScenario.java
rename to jdk/test/sun/tools/jhsdb/heapconfig/TmtoolTestScenario.java
index 4558f3e346b..25beea66f72 100644
--- a/jdk/test/sun/tools/jmap/heapconfig/TmtoolTestScenario.java
+++ b/jdk/test/sun/tools/jhsdb/heapconfig/TmtoolTestScenario.java
@@ -100,11 +100,13 @@ public class TmtoolTestScenario {
                 theApp = LingeredApp.startApp(vmArgsExtended);
 
                 System.out.println("Starting " + toolName + " against " + theApp.getPid());
-                JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK(toolName);
+                JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jhsdb");
+                launcher.addToolArg(toolName);
 
                 for (String cmd : toolArgs) {
                     launcher.addToolArg(cmd);
                 }
+                launcher.addToolArg("--pid");
                 launcher.addToolArg(Long.toString(theApp.getPid()));
 
                 ProcessBuilder processBuilder = new ProcessBuilder(launcher.getCommand());
diff --git a/jdk/test/sun/tools/jinfo/JInfoHelper.java b/jdk/test/sun/tools/jinfo/BasicJInfoTest.java
similarity index 51%
rename from jdk/test/sun/tools/jinfo/JInfoHelper.java
rename to jdk/test/sun/tools/jinfo/BasicJInfoTest.java
index 7f945136b4f..c612652f46b 100644
--- a/jdk/test/sun/tools/jinfo/JInfoHelper.java
+++ b/jdk/test/sun/tools/jinfo/BasicJInfoTest.java
@@ -1,12 +1,10 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, 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.
+ * 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
@@ -29,41 +27,58 @@ import jdk.testlibrary.JDKToolLauncher;
 import jdk.testlibrary.OutputAnalyzer;
 import jdk.testlibrary.ProcessTools;
 
-/**
- *  The helper class for running jinfo utility.
+/*
+ * @test
+ * @summary Unit test for jinfo utility
+ * @library /lib/testlibrary
+ * @build jdk.testlibrary.*
+ * @run main BasicJInfoTest
  */
-public final class JInfoHelper {
+public class BasicJInfoTest {
 
-    /**
-     * Print configuration information for the current process
-     *
-     * @param toolArgs List of jinfo options
-     */
-    public static OutputAnalyzer jinfo(String... toolArgs) throws Exception {
-        return jinfo(true, toolArgs);
+    private static ProcessBuilder processBuilder = new ProcessBuilder();
+
+    public static void main(String[] args) throws Exception {
+        testJinfoNoArgs();
+        testJinfoFlags();
+        testJinfoProps();
+        testJinfoFlagInvalid();
     }
 
-    /**
-     * Print usage information
-     *
-     * @param toolArgs List of jinfo options
-     */
-    public static OutputAnalyzer jinfoNoPid(String... toolArgs) throws Exception {
-        return jinfo(false, toolArgs);
+    private static void testJinfoNoArgs() throws Exception {
+        OutputAnalyzer output = jinfo();
+        output.shouldContain("-XX");
+        output.shouldContain("test.jdk=");
+        output.shouldHaveExitValue(0);
     }
 
-    private static OutputAnalyzer jinfo(boolean toPid, String... toolArgs) throws Exception {
+    private static void testJinfoFlagInvalid() throws Exception {
+        OutputAnalyzer output = jinfo("-flag");
+        output.shouldHaveExitValue(1);
+    }
+
+    private static void testJinfoFlags() throws Exception {
+        OutputAnalyzer output = jinfo("-flags");
+        output.shouldContain("-XX");
+        output.shouldHaveExitValue(0);
+    }
+
+    private static void testJinfoProps() throws Exception {
+        OutputAnalyzer output = jinfo("-props");
+        output.shouldContain("test.jdk=");
+        output.shouldHaveExitValue(0);
+    }
+
+    private static OutputAnalyzer jinfo(String... toolArgs) throws Exception {
         JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jinfo");
         if (toolArgs != null) {
             for (String toolArg : toolArgs) {
                 launcher.addToolArg(toolArg);
             }
         }
-        if (toPid) {
-            launcher.addToolArg(Long.toString(ProcessTools.getProcessId()));
-        }
+        launcher.addToolArg(Long.toString(ProcessTools.getProcessId()));
 
-        ProcessBuilder processBuilder = new ProcessBuilder(launcher.getCommand());
+        processBuilder.command(launcher.getCommand());
         System.out.println(Arrays.toString(processBuilder.command().toArray()).replace(",", ""));
         OutputAnalyzer output = ProcessTools.executeProcess(processBuilder);
         System.out.println(output.getOutput());
diff --git a/jdk/test/sun/tools/jinfo/JInfoLauncherTest.java b/jdk/test/sun/tools/jinfo/JInfoLauncherTest.java
deleted file mode 100644
index 09b4750d778..00000000000
--- a/jdk/test/sun/tools/jinfo/JInfoLauncherTest.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * Copyright (c) 2014, 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.
- */
-
-import org.testng.annotations.Test;
-import org.testng.annotations.BeforeClass;
-import sun.tools.jinfo.JInfo;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.util.Arrays;
-
-import static org.testng.Assert.*;
-
-/**
- * @test
- * @bug 8039080
- * @modules jdk.jcmd/sun.tools.jinfo
- * @run testng JInfoLauncherTest
- * @summary Test JInfo launcher argument parsing
- */
-@Test
-public class JInfoLauncherTest {
-    public static final String VALIDATION_EXCEPTION_CLSNAME =
-                                IllegalArgumentException.class.getName();
-
-    private Constructor<JInfo> jInfoConstructor;
-    private Field fldUseSA;
-
-    @BeforeClass
-    public void setup() throws Exception {
-        jInfoConstructor = JInfo.class.getDeclaredConstructor(String[].class);
-        jInfoConstructor.setAccessible(true);
-        fldUseSA = JInfo.class.getDeclaredField("useSA");
-        fldUseSA.setAccessible(true);
-    }
-
-    private JInfo newJInfo(String[] args) throws Exception {
-        try {
-            return jInfoConstructor.newInstance((Object) args);
-        } catch (Exception e) {
-            if (isValidationException(e.getCause())) {
-                throw (Exception)e.getCause();
-            }
-            throw e;
-        }
-    }
-
-    private boolean getUseSA(JInfo jinfo) throws Exception {
-        return fldUseSA.getBoolean(jinfo);
-    }
-
-    private void cmdPID(String cmd, String ... params) throws Exception {
-        int offset = (cmd != null ? 1 : 0);
-        String[] args = new String[offset + params.length];
-        args[0] = cmd;
-        System.arraycopy(params, 0, args, offset, params.length);
-        JInfo j = newJInfo(args);
-        assertFalse(getUseSA(j), "Local jinfo must not forward to SA");
-    }
-
-    private void cmdCore(String cmd, String ... params) throws Exception {
-        int offset = (cmd != null ? 1 : 0);
-        String[] args = new String[offset + params.length];
-        args[0] = cmd;
-        System.arraycopy(params, 0, args, offset, params.length);
-        JInfo j = newJInfo(args);
-        assertTrue(getUseSA(j), "Core jinfo must forward to SA");
-    }
-
-    private void cmdRemote(String cmd, String ... params) throws Exception {
-        int offset = (cmd != null ? 1 : 0);
-        String[] args = new String[offset + params.length];
-        args[0] = cmd;
-        System.arraycopy(params, 0, args, offset, params.length);
-        JInfo j = newJInfo(args);
-        assertTrue(getUseSA(j), "Remote jinfo must forward to SA");
-    }
-
-    private void cmdExtraArgs(String cmd, int argsLen) throws Exception {
-        String[] args = new String[argsLen + 1 + (cmd != null ? 1 : 0)];
-        Arrays.fill(args, "a");
-        if (cmd != null) {
-            args[0] = cmd;
-        } else {
-            cmd = "default";
-        }
-        try {
-            JInfo j = newJInfo(args);
-            fail("\"" + cmd + "\" does not support more than " + argsLen +
-                 " arguments");
-        } catch (Exception e) {
-            if (!isValidationException(e)) {
-                throw e;
-            }
-            // ignore
-        }
-    }
-
-    private void cmdMissingArgs(String cmd, int reqArgs) throws Exception {
-        String[] args = new String[reqArgs - 1 + (cmd != null ? 1 : 0)];
-        Arrays.fill(args, "a");
-        if (cmd != null) {
-            args[0] = cmd;
-        } else {
-            cmd = "default";
-        }
-        try {
-            JInfo j = newJInfo(args);
-            fail("\"" + cmd + "\" requires at least " + reqArgs + " argument");
-        } catch (Exception e) {
-            if (!isValidationException(e)) {
-                throw e;
-            }
-            // ignore
-        }
-    }
-
-    public void testDefaultPID() throws Exception {
-        cmdPID(null, "1234");
-    }
-
-    public void testFlagsPID() throws Exception {
-        cmdPID("-flags", "1234");
-    }
-
-    public void testSyspropsPID() throws Exception {
-        cmdPID("-sysprops", "1234");
-    }
-
-    public void testReadFlagPID() throws Exception {
-        cmdPID("-flag", "SomeManagementFlag", "1234");
-    }
-
-    public void testSetFlag1PID() throws Exception {
-        cmdPID("-flag", "+SomeManagementFlag", "1234");
-    }
-
-    public void testSetFlag2PID() throws Exception {
-        cmdPID("-flag", "-SomeManagementFlag", "1234");
-    }
-
-    public void testSetFlag3PID() throws Exception {
-        cmdPID("-flag", "SomeManagementFlag=314", "1234");
-    }
-
-    public void testDefaultCore() throws Exception {
-        cmdCore(null, "myapp.exe", "my.core");
-    }
-
-    public void testFlagsCore() throws Exception {
-        cmdCore("-flags", "myapp.exe", "my.core");
-    }
-
-    public void testSyspropsCore() throws Exception {
-        cmdCore("-sysprops", "myapp.exe", "my.core");
-    }
-
-    public void testReadFlagCore() throws Exception {
-        try {
-            cmdCore("-flag", "SomeManagementFlag", "myapp.exe", "my.core");
-            fail("Flags can not be read from core files");
-        } catch (Exception e) {
-            if (!isValidationException(e)) {
-                throw e;
-            }
-            // ignore
-        }
-    }
-
-    public void testSetFlag1Core() throws Exception {
-        try {
-            cmdCore("-flag", "+SomeManagementFlag", "myapp.exe", "my.core");
-            fail("Flags can not be set in core files");
-        } catch (Exception e) {
-            if (!isValidationException(e)) {
-                throw e;
-            }
-            // ignore
-        }
-    }
-
-    public void testSetFlag2Core() throws Exception {
-        try {
-            cmdCore("-flag", "-SomeManagementFlag", "myapp.exe", "my.core");
-            fail("Flags can not be set in core files");
-        } catch (Exception e) {
-            if (!isValidationException(e)) {
-                throw e;
-            }
-            // ignore
-        }
-    }
-
-    public void testSetFlag3Core() throws Exception {
-        try {
-            cmdCore("-flag", "SomeManagementFlag=314", "myapp.exe", "my.core");
-            fail("Flags can not be set in core files");
-        } catch (Exception e) {
-            if (!isValidationException(e)) {
-                throw e;
-            }
-            // ignore
-        }
-    }
-
-    public void testDefaultRemote() throws Exception {
-        cmdRemote(null, "serverid@host");
-    }
-
-    public void testFlagsRemote() throws Exception {
-        cmdRemote("-flags", "serverid@host");
-    }
-
-    public void testSyspropsRemote() throws Exception {
-        cmdRemote("-sysprops", "serverid@host");
-    }
-
-    public void testReadFlagRemote() throws Exception {
-        try {
-            cmdCore("-flag", "SomeManagementFlag", "serverid@host");
-            fail("Flags can not be read from SA server");
-        } catch (Exception e) {
-            if (!isValidationException(e)) {
-                throw e;
-            }
-            // ignore
-        }
-    }
-
-    public void testSetFlag1Remote() throws Exception {
-        try {
-            cmdCore("-flag", "+SomeManagementFlag","serverid@host");
-            fail("Flags can not be set on SA server");
-        } catch (Exception e) {
-            if (!isValidationException(e)) {
-                throw e;
-            }
-            // ignore
-        }
-    }
-
-    public void testSetFlag2Remote() throws Exception {
-        try {
-            cmdCore("-flag", "-SomeManagementFlag", "serverid@host");
-            fail("Flags can not be read set on SA server");
-        } catch (Exception e) {
-            if (!isValidationException(e)) {
-                throw e;
-            }
-            // ignore
-        }
-    }
-
-    public void testSetFlag3Remote() throws Exception {
-        try {
-            cmdCore("-flag", "SomeManagementFlag=314", "serverid@host");
-            fail("Flags can not be read set on SA server");
-        } catch (Exception e) {
-            if (!isValidationException(e)) {
-                throw e;
-            }
-            // ignore
-        }
-    }
-
-    public void testDefaultExtraArgs() throws Exception {
-        cmdExtraArgs(null, 2);
-    }
-
-    public void testFlagsExtraArgs() throws Exception {
-        cmdExtraArgs("-flags", 2);
-    }
-
-    public void testSyspropsExtraArgs() throws Exception {
-        cmdExtraArgs("-sysprops", 2);
-    }
-
-    public void testFlagExtraArgs() throws Exception {
-        cmdExtraArgs("-flag", 2);
-    }
-
-    public void testHelp1ExtraArgs() throws Exception {
-        cmdExtraArgs("-h", 0);
-    }
-
-    public void testHelp2ExtraArgs() throws Exception {
-        cmdExtraArgs("-help", 0);
-    }
-
-    public void testDefaultMissingArgs() throws Exception {
-        cmdMissingArgs(null, 1);
-    }
-
-    public void testFlagsMissingArgs() throws Exception {
-        cmdMissingArgs("-flags", 1);
-    }
-
-    public void testSyspropsMissingArgs() throws Exception {
-        cmdMissingArgs("-sysprops", 1);
-    }
-
-    public void testFlagMissingArgs() throws Exception {
-        cmdMissingArgs("-flag", 2);
-    }
-
-    public void testUnknownCommand() throws Exception {
-        try {
-            JInfo j = newJInfo(new String[]{"-unknown_command"});
-            fail("JInfo accepts unknown commands");
-        } catch (Exception e) {
-            if (!isValidationException(e)) {
-                throw e;
-            }
-            // ignore
-        }
-    }
-
-    private static boolean isValidationException(Throwable e) {
-        return e.getClass().getName().equals(VALIDATION_EXCEPTION_CLSNAME);
-    }
-}
diff --git a/jdk/test/sun/tools/jinfo/JInfoRunningProcessFlagTest.java b/jdk/test/sun/tools/jinfo/JInfoRunningProcessFlagTest.java
deleted file mode 100644
index cb28cc7a49f..00000000000
--- a/jdk/test/sun/tools/jinfo/JInfoRunningProcessFlagTest.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2014, 2015, 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.
- */
-
-import java.lang.management.ManagementFactory;
-import com.sun.management.HotSpotDiagnosticMXBean;
-import jdk.testlibrary.OutputAnalyzer;
-import static jdk.testlibrary.Platform.isSolaris;
-import static jdk.testlibrary.Asserts.assertEquals;
-import static jdk.testlibrary.Asserts.assertNotEquals;
-import static jdk.testlibrary.Asserts.assertTrue;
-
-/**
- * @test
- * @summary The test sanity checks 'jinfo -flag' option.
- * @library /lib/testlibrary
- * @modules java.management
- * @build jdk.testlibrary.* JInfoHelper
- * @run main/othervm -XX:+HeapDumpOnOutOfMemoryError JInfoRunningProcessFlagTest
- */
-public class JInfoRunningProcessFlagTest {
-
-    public static void main(String[] args) throws Exception {
-        testFlag();
-        testFlagPlus();
-        testFlagMinus();
-        testFlagEqual();
-
-        testInvalidFlag();
-
-        testSolarisSpecificFlag();
-    }
-
-    private static void testFlag() throws Exception {
-        OutputAnalyzer output = JInfoHelper.jinfo("-flag", "HeapDumpOnOutOfMemoryError");
-        output.shouldHaveExitValue(0);
-        assertTrue(output.getStderr().isEmpty(), "'jinfo -flag HeapDumpOnOutOfMemoryError' stderr should be empty");
-        output.shouldContain("+HeapDumpOnOutOfMemoryError");
-    }
-
-    private static void testFlagPlus() throws Exception {
-        OutputAnalyzer output = JInfoHelper.jinfo("-flag", "+HeapDumpOnOutOfMemoryError");
-        output.shouldHaveExitValue(0);
-        output = JInfoHelper.jinfo("-flag", "HeapDumpOnOutOfMemoryError");
-        output.shouldHaveExitValue(0);
-        output.shouldContain("+HeapDumpOnOutOfMemoryError");
-        verifyIsEnabled("HeapDumpOnOutOfMemoryError");
-    }
-
-    private static void testFlagMinus() throws Exception {
-        OutputAnalyzer output = JInfoHelper.jinfo("-flag", "-HeapDumpOnOutOfMemoryError");
-        output.shouldHaveExitValue(0);
-        output = JInfoHelper.jinfo("-flag", "HeapDumpOnOutOfMemoryError");
-        output.shouldHaveExitValue(0);
-        output.shouldContain("-HeapDumpOnOutOfMemoryError");
-        verifyIsDisabled("HeapDumpOnOutOfMemoryError");
-    }
-
-    private static void testFlagEqual() throws Exception {
-        OutputAnalyzer output = JInfoHelper.jinfo("-flag", "HeapDumpOnOutOfMemoryError=1");
-        output.shouldHaveExitValue(0);
-        output = JInfoHelper.jinfo("-flag", "HeapDumpOnOutOfMemoryError");
-        output.shouldHaveExitValue(0);
-        output.shouldContain("+HeapDumpOnOutOfMemoryError");
-        verifyIsEnabled("HeapDumpOnOutOfMemoryError");
-    }
-
-    private static void testInvalidFlag() throws Exception {
-        OutputAnalyzer output = JInfoHelper.jinfo("-flag", "monkey");
-        assertNotEquals(output.getExitValue(), 0, "A non-zero exit code should be returned for invalid flag");
-    }
-
-    private static void testSolarisSpecificFlag() throws Exception {
-        if (!isSolaris())
-            return;
-
-        OutputAnalyzer output = JInfoHelper.jinfo("-flag", "+ExtendedDTraceProbes");
-        output.shouldHaveExitValue(0);
-        output = JInfoHelper.jinfo();
-        output.shouldContain("+ExtendedDTraceProbes");
-        verifyIsEnabled("ExtendedDTraceProbes");
-
-        output = JInfoHelper.jinfo("-flag", "-ExtendedDTraceProbes");
-        output.shouldHaveExitValue(0);
-        output = JInfoHelper.jinfo();
-        output.shouldContain("-ExtendedDTraceProbes");
-        verifyIsDisabled("ExtendedDTraceProbes");
-
-        output = JInfoHelper.jinfo("-flag", "ExtendedDTraceProbes");
-        output.shouldContain("-ExtendedDTraceProbes");
-        output.shouldHaveExitValue(0);
-    }
-
-    private static void verifyIsEnabled(String flag) {
-        HotSpotDiagnosticMXBean hotspotDiagnostic =
-                ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class);
-        String flagValue = hotspotDiagnostic.getVMOption(flag).getValue();
-        assertEquals(flagValue, "true", "Expected '" + flag + "' flag be enabled");
-    }
-
-    private static void verifyIsDisabled(String flag) {
-        HotSpotDiagnosticMXBean hotspotDiagnostic =
-                ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class);
-        String flagValue = hotspotDiagnostic.getVMOption(flag).getValue();
-        assertEquals(flagValue, "false", "Expected '" + flag + "' flag be disabled");
-    }
-
-}
diff --git a/jdk/test/sun/tools/jinfo/JInfoRunningProcessTest.java b/jdk/test/sun/tools/jinfo/JInfoRunningProcessTest.java
deleted file mode 100644
index 633a2c99b51..00000000000
--- a/jdk/test/sun/tools/jinfo/JInfoRunningProcessTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2014, 2015, 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.
- */
-
-import jdk.testlibrary.OutputAnalyzer;
-import static jdk.testlibrary.Asserts.assertTrue;
-
-/**
- * @test
- * @summary The test sanity checks functionality of 'jinfo', 'jinfo -sysprops' and 'jinfo -flags'
- * @library /lib/testlibrary
- * @modules java.management
- * @build jdk.testlibrary.* JInfoHelper
- * @run main/othervm -XX:+HeapDumpOnOutOfMemoryError JInfoRunningProcessTest
- */
-public class JInfoRunningProcessTest {
-
-    public static void main(String[] args) throws Exception {
-        testNoOptions();
-        testSysprops();
-        testFlags();
-    }
-
-    private static void testNoOptions() throws Exception {
-        OutputAnalyzer output = JInfoHelper.jinfo();
-        output.shouldHaveExitValue(0);
-        assertTrue(output.getStderr().isEmpty(), "'jinfo' stderr should be empty");
-        output.shouldContain("+HeapDumpOnOutOfMemoryError");
-    }
-
-    private static void testSysprops() throws Exception {
-        OutputAnalyzer output = JInfoHelper.jinfo("-sysprops");
-        output.shouldHaveExitValue(0);
-        assertTrue(output.getStderr().isEmpty(), "'jinfo -sysprops' stderr should be empty");
-    }
-
-    private static void testFlags() throws Exception {
-        OutputAnalyzer output = JInfoHelper.jinfo("-flags");
-        output.shouldHaveExitValue(0);
-        assertTrue(output.getStderr().isEmpty(), "'jinfo -flags' stderr should be empty");
-        output.shouldContain("+HeapDumpOnOutOfMemoryError");
-    }
-
-}
diff --git a/jdk/test/sun/tools/jinfo/JInfoSanityTest.java b/jdk/test/sun/tools/jinfo/JInfoSanityTest.java
deleted file mode 100644
index 9b0bcf1b141..00000000000
--- a/jdk/test/sun/tools/jinfo/JInfoSanityTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2014, 2015, 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.
- */
-
-import static jdk.testlibrary.Asserts.assertNotEquals;
-import static jdk.testlibrary.Asserts.assertTrue;
-import static jdk.testlibrary.Asserts.assertFalse;
-import jdk.testlibrary.OutputAnalyzer;
-
-/**
- * @test
- * @summary The test sanity checks functionality of 'jinfo -h', 'jinfo -help',
- *          and verifies jinfo exits abnormally if started with invalid options.
- * @library /lib/testlibrary
- * @modules java.management
- * @build jdk.testlibrary.* JInfoHelper
- * @run main JInfoSanityTest
- */
-public class JInfoSanityTest {
-
-    public static void main(String[] args) throws Exception {
-        test_h();
-        test_help();
-        testVersion();
-        testUnknownHost();
-    }
-
-    private static void test_h() throws Exception {
-        OutputAnalyzer output = JInfoHelper.jinfoNoPid("-h");
-        output.shouldHaveExitValue(0);
-        assertFalse(output.getStderr().isEmpty(), "'jinfo -h' stderr should not be empty");
-        assertTrue(output.getStdout().isEmpty(), "'jinfo -h' stdout should be empty");
-    }
-
-    private static void test_help() throws Exception {
-        OutputAnalyzer output = JInfoHelper.jinfoNoPid("-help");
-        output.shouldHaveExitValue(0);
-        assertFalse(output.getStderr().isEmpty(), "'jinfo -help' stderr should not be empty");
-        assertTrue(output.getStdout().isEmpty(), "'jinfo -help' stdout should be empty");
-    }
-
-    private static void testVersion() throws Exception {
-        OutputAnalyzer output = JInfoHelper.jinfoNoPid("-version");
-        output.shouldHaveExitValue(1);
-        assertFalse(output.getStderr().isEmpty(), "'jinfo -version' stderr should not be empty");
-        assertTrue(output.getStdout().isEmpty(), "'jinfo -version' stdout should be empty");
-    }
-
-    private static void testUnknownHost() throws Exception {
-        String unknownHost = "Oja781nh2ev7vcvbajdg-Sda1-C";
-        OutputAnalyzer output = JInfoHelper.jinfoNoPid("med@" + unknownHost);
-        assertNotEquals(output.getExitValue(), 0, "A non-zero exit code should be returned for invalid operation");
-        output.shouldMatch(".*(Connection refused to host\\:|UnknownHostException\\:) " + unknownHost + ".*");
-    }
-
-}
diff --git a/jdk/test/sun/tools/jmap/BasicJMapTest.java b/jdk/test/sun/tools/jmap/BasicJMapTest.java
index 75c80a2eec3..fa333cddea7 100644
--- a/jdk/test/sun/tools/jmap/BasicJMapTest.java
+++ b/jdk/test/sun/tools/jmap/BasicJMapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, 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,12 +34,10 @@ import jdk.testlibrary.ProcessTools;
 
 /*
  * @test
- * @bug 6321286
  * @summary Unit test for jmap utility
  * @key intermittent
  * @library /lib/testlibrary
  * @library /test/lib/share/classes
- * @modules java.management
  * @build jdk.testlibrary.*
  * @build jdk.test.lib.hprof.*
  * @build jdk.test.lib.hprof.model.*
@@ -54,6 +52,8 @@ public class BasicJMapTest {
     public static void main(String[] args) throws Exception {
         testHisto();
         testHistoLive();
+        testFinalizerInfo();
+        testClstats();
         testDump();
         testDumpLive();
     }
@@ -68,6 +68,16 @@ public class BasicJMapTest {
         output.shouldHaveExitValue(0);
     }
 
+    private static void testFinalizerInfo() throws Exception {
+        OutputAnalyzer output = jmap("-finalizerinfo");
+        output.shouldHaveExitValue(0);
+    }
+
+    private static void testClstats() throws Exception {
+        OutputAnalyzer output = jmap("-clstats");
+        output.shouldHaveExitValue(0);
+    }
+
     private static void testDump() throws Exception {
         dump(false);
     }
@@ -105,7 +115,6 @@ public class BasicJMapTest {
 
     private static OutputAnalyzer jmap(String... toolArgs) throws Exception {
         JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jmap");
-        launcher.addVMArg("-XX:+UsePerfData");
         if (toolArgs != null) {
             for (String toolArg : toolArgs) {
                 launcher.addToolArg(toolArg);
diff --git a/jdk/test/sun/tools/jstack/BasicJStackTest.java b/jdk/test/sun/tools/jstack/BasicJStackTest.java
index 9fd0b66b578..997876a54c5 100644
--- a/jdk/test/sun/tools/jstack/BasicJStackTest.java
+++ b/jdk/test/sun/tools/jstack/BasicJStackTest.java
@@ -29,10 +29,8 @@ import jdk.testlibrary.ProcessTools;
 
 /*
  * @test
- * @bug 6260070
  * @summary Unit test for jstack utility
  * @library /lib/testlibrary
- * @modules java.management
  * @build jdk.testlibrary.*
  * @run main BasicJStackTest
  */
diff --git a/jdk/test/sun/tools/jstack/DeadlockDetectionTest.java b/jdk/test/sun/tools/jstack/DeadlockDetectionTest.java
index 4ff2508673b..771fd128ff7 100644
--- a/jdk/test/sun/tools/jstack/DeadlockDetectionTest.java
+++ b/jdk/test/sun/tools/jstack/DeadlockDetectionTest.java
@@ -39,7 +39,6 @@ import jdk.testlibrary.ProcessTools;
  * @summary Test deadlock detection
  * @library /test/lib/share/classes
  * @library /lib/testlibrary
- * @modules java.management
  * @build jdk.testlibrary.*
  * @build jdk.test.lib.apps.*
  * @build DeadlockDetectionTest

From d0b67fecb379042c637da9a583888f87cf869853 Mon Sep 17 00:00:00 2001
From: Robbin Ehn <rehn@openjdk.org>
Date: Tue, 10 May 2016 06:52:40 +0200
Subject: [PATCH 059/228] 8154985: Add the ability to use main class as lookup
 (as jcmd) to jinfo, jmap, jstack

Reviewed-by: sla, dsamersoff
---
 .../tools/common/ProcessArgumentMatcher.java  | 128 ++++++++++++++++++
 .../classes/sun/tools/jcmd/Arguments.java     |  16 +--
 .../share/classes/sun/tools/jcmd/JCmd.java    |  90 ++----------
 .../share/classes/sun/tools/jinfo/JInfo.java  |  63 ++++++---
 .../share/classes/sun/tools/jmap/JMap.java    |  38 +++---
 .../classes/sun/tools/jstack/JStack.java      |  17 ++-
 6 files changed, 219 insertions(+), 133 deletions(-)
 create mode 100644 jdk/src/jdk.jcmd/share/classes/sun/tools/common/ProcessArgumentMatcher.java

diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/common/ProcessArgumentMatcher.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/common/ProcessArgumentMatcher.java
new file mode 100644
index 00000000000..e08b11d6cb5
--- /dev/null
+++ b/jdk/src/jdk.jcmd/share/classes/sun/tools/common/ProcessArgumentMatcher.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2016, 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 sun.tools.common;
+
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import com.sun.tools.attach.VirtualMachine;
+import com.sun.tools.attach.VirtualMachineDescriptor;
+
+import sun.jvmstat.monitor.MonitorException;
+import sun.jvmstat.monitor.MonitoredHost;
+import sun.jvmstat.monitor.MonitoredVm;
+import sun.jvmstat.monitor.MonitoredVmUtil;
+import sun.jvmstat.monitor.VmIdentifier;
+
+/**
+ * Class for finding process matching a process argument,
+ * excluding tool it self and returning a list containing
+ * the process identifiers.
+ */
+public class ProcessArgumentMatcher {
+    private String excludeCls;
+    private String matchClass = null;
+    private String singlePid = null;
+    private boolean matchAll = false;
+
+    public ProcessArgumentMatcher(String pidArg, Class<?> excludeClass) {
+        excludeCls = excludeClass.getName();
+        if (pidArg == null || pidArg.isEmpty()) {
+            throw new IllegalArgumentException("Pid string is invalid");
+        }
+        if (pidArg.charAt(0) == '-') {
+            throw new IllegalArgumentException("Unrecognized " + pidArg);
+        }
+        try {
+            long pid = Long.parseLong(pidArg);
+            if (pid == 0) {
+                matchAll = true;
+            } else {
+                singlePid = String.valueOf(pid);
+            }
+        } catch (NumberFormatException nfe) {
+            matchClass = pidArg;
+        }
+    }
+
+    private boolean check(VirtualMachineDescriptor vmd) {
+        String mainClass = null;
+        try {
+            VmIdentifier vmId = new VmIdentifier(vmd.id());
+            MonitoredHost monitoredHost = MonitoredHost.getMonitoredHost(vmId);
+            MonitoredVm monitoredVm = monitoredHost.getMonitoredVm(vmId, -1);
+            mainClass = MonitoredVmUtil.mainClass(monitoredVm, true);
+            monitoredHost.detach(monitoredVm);
+        } catch (NullPointerException npe) {
+            // There is a potential race, where a running java app is being
+            // queried, unfortunately the java app has shutdown after this
+            // method is started but before getMonitoredVM is called.
+            // If this is the case, then the /tmp/hsperfdata_xxx/pid file
+            // will have disappeared and we will get a NullPointerException.
+            // Handle this gracefully....
+            return false;
+        } catch (MonitorException | URISyntaxException e) {
+            if (e.getMessage() != null) {
+                System.err.println(e.getMessage());
+            } else {
+                Throwable cause = e.getCause();
+                if ((cause != null) && (cause.getMessage() != null)) {
+                    System.err.println(cause.getMessage());
+                } else {
+                    e.printStackTrace();
+                }
+            }
+            return false;
+        }
+
+        if (mainClass.equals(excludeCls)) {
+            return false;
+        }
+
+        if (matchAll || mainClass.indexOf(matchClass) != -1) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public Collection<String> getPids() {
+        Collection<String> pids = new ArrayList<>();
+        if (singlePid != null) {
+            pids.add(singlePid);
+            return pids;
+        }
+        List<VirtualMachineDescriptor> vmds = VirtualMachine.list();
+        for (VirtualMachineDescriptor vmd : vmds) {
+            if (check(vmd)) {
+                pids.add(vmd.id());
+            }
+        }
+        return pids;
+    }
+}
diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jcmd/Arguments.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jcmd/Arguments.java
index fbd4ca9aae4..80708f5aa37 100644
--- a/jdk/src/jdk.jcmd/share/classes/sun/tools/jcmd/Arguments.java
+++ b/jdk/src/jdk.jcmd/share/classes/sun/tools/jcmd/Arguments.java
@@ -33,16 +33,14 @@ class Arguments {
     private boolean listProcesses = false;
     private boolean listCounters  = false;
     private boolean showUsage     = false;
-    private int     pid           = -1;
     private String  command       = null;
-    private String  processSubstring;
+    private String  processString = null;
 
     public boolean isListProcesses() { return listProcesses; }
     public boolean isListCounters() { return listCounters; }
     public boolean isShowUsage() { return showUsage; }
-    public int getPid() { return pid; }
     public String getCommand() { return command; }
-    public String getProcessSubstring() { return processSubstring; }
+    public String getProcessString() { return processString; }
 
     public Arguments(String[] args) {
         if (args.length == 0 || args[0].equals("-l")) {
@@ -55,15 +53,7 @@ class Arguments {
             return;
         }
 
-        try {
-            pid = Integer.parseInt(args[0]);
-        } catch (NumberFormatException ex) {
-            // use as a partial class-name instead
-            if (args[0].charAt(0) != '-') {
-                // unless it starts with a '-'
-                processSubstring = args[0];
-            }
-        }
+        processString = args[0];
 
         StringBuilder sb = new StringBuilder();
         for (int i = 1; i < args.length; i++) {
diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jcmd/JCmd.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jcmd/JCmd.java
index 0ff46323ec6..ab77547a077 100644
--- a/jdk/src/jdk.jcmd/share/classes/sun/tools/jcmd/JCmd.java
+++ b/jdk/src/jdk.jcmd/share/classes/sun/tools/jcmd/JCmd.java
@@ -29,22 +29,22 @@ import java.io.InputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
-import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Comparator;
 import java.net.URISyntaxException;
 
 import com.sun.tools.attach.AttachOperationFailedException;
 import com.sun.tools.attach.VirtualMachine;
 import com.sun.tools.attach.VirtualMachineDescriptor;
-import com.sun.tools.attach.AgentLoadException;
 import com.sun.tools.attach.AttachNotSupportedException;
 
 import sun.tools.attach.HotSpotVirtualMachine;
+import sun.tools.common.ProcessArgumentMatcher;
 import sun.tools.jstat.JStatLogger;
 import sun.jvmstat.monitor.Monitor;
 import sun.jvmstat.monitor.MonitoredHost;
 import sun.jvmstat.monitor.MonitoredVm;
-import sun.jvmstat.monitor.MonitoredVmUtil;
 import sun.jvmstat.monitor.MonitorException;
 import sun.jvmstat.monitor.VmIdentifier;
 
@@ -73,52 +73,18 @@ public class JCmd {
             System.exit(0);
         }
 
-        List<String> pids = new ArrayList<String>();
-        if (arg.getPid() == 0) {
-            // find all VMs
-            List<VirtualMachineDescriptor> vmds = VirtualMachine.list();
-            for (VirtualMachineDescriptor vmd : vmds) {
-                if (!isJCmdProcess(vmd)) {
-                    pids.add(vmd.id());
-                }
-            }
-        } else if (arg.getProcessSubstring() != null) {
-            // use the partial class-name match
-            List<VirtualMachineDescriptor> vmds = VirtualMachine.list();
-            for (VirtualMachineDescriptor vmd : vmds) {
-                if (isJCmdProcess(vmd)) {
-                    continue;
-                }
-                try {
-                    String mainClass = getMainClass(vmd);
-                    if (mainClass != null
-                        && mainClass.indexOf(arg.getProcessSubstring()) != -1) {
-                            pids.add(vmd.id());
-                    }
-                } catch (MonitorException|URISyntaxException e) {
-                    if (e.getMessage() != null) {
-                        System.err.println(e.getMessage());
-                    } else {
-                        Throwable cause = e.getCause();
-                        if ((cause != null) && (cause.getMessage() != null)) {
-                            System.err.println(cause.getMessage());
-                        } else {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            }
-            if (pids.isEmpty()) {
-                System.err.println("Could not find any processes matching : '"
-                                   + arg.getProcessSubstring() + "'");
-                System.exit(1);
-            }
-        } else if (arg.getPid() == -1) {
+        Collection<String> pids = Collections.emptyList();
+        try {
+            ProcessArgumentMatcher ap = new ProcessArgumentMatcher(arg.getProcessString(), JCmd.class);
+            pids = ap.getPids();
+        } catch (IllegalArgumentException iae) {
             System.err.println("Invalid pid specified");
             System.exit(1);
-        } else {
-            // Use the found pid
-            pids.add(arg.getPid() + "");
+        }
+        if (pids.isEmpty()) {
+            System.err.println("Could not find any processes matching : '"
+                               + arg.getProcessString() + "'");
+            System.exit(1);
         }
 
         boolean success = true;
@@ -199,36 +165,6 @@ public class JCmd {
         }
     }
 
-    private static boolean isJCmdProcess(VirtualMachineDescriptor vmd) {
-        try {
-            String mainClass = getMainClass(vmd);
-            return mainClass != null && mainClass.equals(JCmd.class.getName());
-        } catch (URISyntaxException|MonitorException ex) {
-            return false;
-        }
-    }
-
-    private static String getMainClass(VirtualMachineDescriptor vmd)
-            throws URISyntaxException, MonitorException {
-        try {
-            String mainClass = null;
-            VmIdentifier vmId = new VmIdentifier(vmd.id());
-            MonitoredHost monitoredHost = MonitoredHost.getMonitoredHost(vmId);
-            MonitoredVm monitoredVm = monitoredHost.getMonitoredVm(vmId, -1);
-            mainClass = MonitoredVmUtil.mainClass(monitoredVm, true);
-            monitoredHost.detach(monitoredVm);
-            return mainClass;
-        } catch(NullPointerException e) {
-            // There is a potential race, where a running java app is being
-            // queried, unfortunately the java app has shutdown after this
-            // method is started but before getMonitoredVM is called.
-            // If this is the case, then the /tmp/hsperfdata_xxx/pid file
-            // will have disappeared and we will get a NullPointerException.
-            // Handle this gracefully....
-            return null;
-        }
-    }
-
     /**
      * Class to compare two Monitor objects by name in ascending order.
      * (from jstat)
diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jinfo/JInfo.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jinfo/JInfo.java
index dbfbaf2e25b..ca774122a17 100644
--- a/jdk/src/jdk.jcmd/share/classes/sun/tools/jinfo/JInfo.java
+++ b/jdk/src/jdk.jcmd/share/classes/sun/tools/jinfo/JInfo.java
@@ -25,13 +25,14 @@
 
 package sun.tools.jinfo;
 
-import java.util.Arrays;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Collection;
 
 import com.sun.tools.attach.VirtualMachine;
 
 import sun.tools.attach.HotSpotVirtualMachine;
+import sun.tools.common.ProcessArgumentMatcher;
 
 /*
  * This class is the main class for the JInfo utility. It parses its arguments
@@ -82,28 +83,49 @@ final public class JInfo {
 
         // Next we check the parameter count. -flag allows extra parameters
         int paramCount = args.length - optionCount;
-        if ((doFlag && paramCount != 2) || (paramCount != 1)) {
+        if ((doFlag && paramCount != 2) || ((!doFlag && paramCount != 1))) {
             usage(1);
         }
 
         if (!doFlag && !doFlags && !doSysprops) {
             // Print flags and sysporps if no options given
-            sysprops(args[optionCount]);
-            System.out.println();
-            flags(args[optionCount]);
-            System.out.println();
-            commandLine(args[optionCount]);
+            ProcessArgumentMatcher ap = new ProcessArgumentMatcher(args[optionCount], JInfo.class);
+            Collection<String> pids = ap.getPids();
+            for (String pid : pids) {
+                if (pids.size() > 1) {
+                    System.out.println("Pid:" + pid);
+                }
+                sysprops(pid);
+                System.out.println();
+                flags(pid);
+                System.out.println();
+                commandLine(pid);
+            }
         }
 
         if (doFlag) {
-            flag(args[optionCount+1], args[optionCount]);
-        }
-        else {
-            if (doFlags) {
-                flags(args[optionCount]);
+            ProcessArgumentMatcher ap = new ProcessArgumentMatcher(args[optionCount+1], JInfo.class);
+            Collection<String> pids = ap.getPids();
+            for (String pid : pids) {
+                if (pids.size() > 1) {
+                    System.out.println("Pid:" + pid);
+                }
+                flag(pid, args[optionCount]);
             }
-            else if (doSysprops) {
-                sysprops(args[optionCount]);
+        }
+        else if (doFlags || doSysprops) {
+            ProcessArgumentMatcher ap = new ProcessArgumentMatcher(args[optionCount], JInfo.class);
+            Collection<String> pids = ap.getPids();
+            for (String pid : pids) {
+                if (pids.size() > 1) {
+                    System.out.println("Pid:" + pid);
+                }
+                if (doFlags) {
+                    flags(pid);
+                }
+                else if (doSysprops) {
+                    sysprops(pid);
+                }
             }
         }
     }
@@ -193,24 +215,23 @@ final public class JInfo {
     private static void checkForUnsupportedOptions(String[] args) {
         // Check arguments for -F, and non-numeric value
         // and warn the user that SA is not supported anymore
-
+        int maxCount = 1;
         int paramCount = 0;
 
         for (String s : args) {
             if (s.equals("-F")) {
                 SAOptionError("-F option used");
             }
-
+            if (s.equals("-flag")) {
+                maxCount = 2;
+            }
             if (! s.startsWith("-")) {
-                if (! s.matches("[0-9]+")) {
-                   SAOptionError("non PID argument");
-                }
                 paramCount += 1;
             }
         }
 
-        if (paramCount > 1) {
-            SAOptionError("More than one non-option argument");
+        if (paramCount > maxCount) {
+            SAOptionError("More than " + maxCount + " non-option argument");
         }
     }
 
diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jmap/JMap.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jmap/JMap.java
index 9815f5234ab..810a44eee6f 100644
--- a/jdk/src/jdk.jcmd/share/classes/sun/tools/jmap/JMap.java
+++ b/jdk/src/jdk.jcmd/share/classes/sun/tools/jmap/JMap.java
@@ -29,10 +29,12 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
+import java.util.Collection;
 
 import com.sun.tools.attach.VirtualMachine;
 import com.sun.tools.attach.AttachNotSupportedException;
 import sun.tools.attach.HotSpotVirtualMachine;
+import sun.tools.common.ProcessArgumentMatcher;
 
 /*
  * This class is the main class for the JMap utility. It parses its arguments
@@ -83,22 +85,29 @@ public class JMap {
             usage(1);
         }
 
-        String pid = args[1];
+        String pidArg = args[1];
         // Here we handle the built-in options
         // As more options are added we should create an abstract tool class and
         // have a table to map the options
-        if (option.equals("-histo")) {
-            histo(pid, "");
-        } else if (option.startsWith("-histo:")) {
-            histo(pid, option.substring("-histo:".length()));
-        } else if (option.startsWith("-dump:")) {
-            dump(pid, option.substring("-dump:".length()));
-        } else if (option.equals("-finalizerinfo")) {
-            executeCommandForPid(pid, "jcmd", "GC.finalizer_info");
-        } else if (option.equals("-clstats")) {
-            executeCommandForPid(pid, "jcmd", "GC.class_stats");
-        } else {
-          usage(1);
+        ProcessArgumentMatcher ap = new ProcessArgumentMatcher(pidArg, JMap.class);
+        Collection<String> pids = ap.getPids();
+        for (String pid : pids) {
+            if (pids.size() > 1) {
+                System.out.println("Pid:" + pid);
+            }
+            if (option.equals("-histo")) {
+                histo(pid, "");
+            } else if (option.startsWith("-histo:")) {
+                histo(pid, option.substring("-histo:".length()));
+            } else if (option.startsWith("-dump:")) {
+                dump(pid, option.substring("-dump:".length()));
+            } else if (option.equals("-finalizerinfo")) {
+                executeCommandForPid(pid, "jcmd", "GC.finalizer_info");
+            } else if (option.equals("-clstats")) {
+                executeCommandForPid(pid, "jcmd", "GC.class_stats");
+            } else {
+              usage(1);
+            }
         }
     }
 
@@ -204,9 +213,6 @@ public class JMap {
             */
 
             if (! s.startsWith("-")) {
-                if (! s.matches("[0-9]+")) {
-                    SAOptionError("non PID argument");
-                }
                 paramCount += 1;
             }
         }
diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstack/JStack.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstack/JStack.java
index 1c8cdd8574e..7d629e3854e 100644
--- a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstack/JStack.java
+++ b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstack/JStack.java
@@ -26,10 +26,11 @@
 package sun.tools.jstack;
 
 import java.io.InputStream;
+import java.util.Collection;
 
 import com.sun.tools.attach.VirtualMachine;
-import com.sun.tools.attach.AttachNotSupportedException;
 import sun.tools.attach.HotSpotVirtualMachine;
+import sun.tools.common.ProcessArgumentMatcher;
 
 /*
  * This class is the main class for the JStack utility. It parses its arguments
@@ -74,14 +75,21 @@ public class JStack {
         }
 
         // pass -l to thread dump operation to get extra lock info
-        String pid = args[optionCount];
+        String pidArg = args[optionCount];
         String params[];
         if (locks) {
             params = new String[] { "-l" };
         } else {
             params = new String[0];
         }
-        runThreadDump(pid, params);
+        ProcessArgumentMatcher ap = new ProcessArgumentMatcher(pidArg, JStack.class);
+        Collection<String> pids = ap.getPids();
+        for (String pid : pids) {
+            if (pids.size() > 1) {
+                System.out.println("Pid:" + pid);
+            }
+            runThreadDump(pid, params);
+        }
     }
 
     // Attach to pid and perform a thread dump
@@ -133,9 +141,6 @@ public class JStack {
             }
 
             if (! s.startsWith("-")) {
-                if (! s.matches("[0-9]+")) {
-                    SAOptionError("non PID argument");
-                }
                 paramCount += 1;
             }
         }

From d338c44a68f210d2a02261112a2f591ff864945e Mon Sep 17 00:00:00 2001
From: Yuri Nesterenko <yan@openjdk.org>
Date: Tue, 10 May 2016 12:15:07 +0300
Subject: [PATCH 060/228] 8156128: Tests for [AWT/Swing] Conditional support
 for GTK 3 on Linux

Reviewed-by: prr
---
 .../swing/LookAndFeel/8145547/DemandGTK.java  | 71 +++++++++++++++
 .../swing/LookAndFeel/8145547/DemandGTK2.sh   | 89 +++++++++++++++++++
 .../swing/LookAndFeel/8145547/DemandGTK2.txt  | 36 ++++++++
 .../swing/LookAndFeel/8145547/DemandGTK3.sh   | 81 +++++++++++++++++
 .../swing/LookAndFeel/8145547/ProvokeGTK.java | 57 ++++++++++++
 5 files changed, 334 insertions(+)
 create mode 100644 jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK.java
 create mode 100644 jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK2.sh
 create mode 100644 jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK2.txt
 create mode 100644 jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK3.sh
 create mode 100644 jdk/test/javax/swing/LookAndFeel/8145547/ProvokeGTK.java

diff --git a/jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK.java b/jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK.java
new file mode 100644
index 00000000000..c1b7214e406
--- /dev/null
+++ b/jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2016, 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
+  @summary  Tests that GTK LaF is supported on solaris
+            regardless of jdk.gtk.version flag values.
+  @bug 8156121
+  @requires (os.name == "linux" | os.name == "solaris")
+  @run main/othervm -Djdk.gtk.version=2 DemandGTK
+  @run main/othervm -Djdk.gtk.version=3 DemandGTK
+*/
+
+import javax.swing.JFrame;
+import javax.swing.UIManager;
+import javax.swing.SwingUtilities;
+import java.awt.Robot;
+
+public class DemandGTK {
+
+    static JFrame frame;
+    public static void createAndShow() {
+        try {
+            UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
+        } catch(Exception cnf) {
+            cnf.printStackTrace();
+            throw new RuntimeException("GTK LaF must be supported");
+        }
+        frame = new JFrame("JFrame");
+        frame.setSize(200, 200);
+
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        frame.setVisible(true);
+    }
+
+    /**
+     * @param args the command line arguments
+     */
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(DemandGTK::createAndShow);
+        Robot robot = new Robot();
+        robot.waitForIdle();
+        robot.delay(1000);
+        SwingUtilities.invokeAndWait( () -> {
+            frame.setVisible(false);
+            frame.dispose();
+        });
+
+    }
+}
+
diff --git a/jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK2.sh b/jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK2.sh
new file mode 100644
index 00000000000..93de97904fd
--- /dev/null
+++ b/jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK2.sh
@@ -0,0 +1,89 @@
+#!/bin/ksh -p
+
+#
+# Copyright (c) 2016, 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
+#   @summary  Try to force GTK2. We must bail out to GTK3 (if any) if no 2 available.
+#
+#   @compile ProvokeGTK.java
+#   @requires os.family == "linux"
+#   @run shell/timeout=400 DemandGTK2.sh
+
+#
+# Note that we depend on
+# strace in the PATH
+# /sbin/ldconfig (which may be not in PATH)
+# It is true for OEL 7 and Ubuntu 14, 16
+# but may fail in future. Save tomorrow for tomorrow.
+#
+# Read DemandGTK2.txt how to prepare GTK2-less machine.
+#
+
+which strace
+if [ $?  -ne 0 ]
+then
+    echo "Please provide strace: \"which strace\" failed."
+    exit 1
+fi
+
+HAVE_2=`/sbin/ldconfig -v 2>/dev/null | grep libgtk-x11-2 | wc -l`
+HAVE_3=`/sbin/ldconfig -v 2>/dev/null | grep libgtk-3.so | wc -l`
+
+
+if [ "${HAVE_2}" = "0" ]
+then
+    
+    if [ "${HAVE_3}" = "0" ]
+    then
+        echo "Neither GTK2 nor GTK3 found: system misconfiguration. Exit."
+        exit 1
+    fi
+    echo "No GTK 2 library found: we should bail out to 3"
+    strace -o strace.log -fe open ${TESTJAVA}/bin/java  -cp ${TESTCLASSPATH}  -Djdk.gtk.version=2 ProvokeGTK
+    EXECRES=$?
+    grep  'libgtk-3.*=\ *[0-9]*$' strace.log > logg
+else
+    echo "There is GTK 2 library: we should use it"
+    strace -o strace.log -fe open ${TESTJAVA}/bin/java  -cp ${TESTCLASSPATH}  -Djdk.gtk.version=2 ProvokeGTK
+    EXECRES=$?
+    grep  'libgtk-x11.*=\ *[0-9]*$' strace.log > logg
+fi
+
+if [ ${EXECRES}  -ne 0 ]
+then
+    echo "java execution failed for unknown reason, see logs"
+    exit 2
+fi
+
+cat logg
+if [ -s logg ]
+then
+    echo "Success."
+    exit 0
+else
+    echo "Failed. Examine logs."
+    exit 3
+fi
+
+
diff --git a/jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK2.txt b/jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK2.txt
new file mode 100644
index 00000000000..7313e3ee4a7
--- /dev/null
+++ b/jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK2.txt
@@ -0,0 +1,36 @@
+How to prepare an Ubuntu machine for GTK-2-less test run.
+
+The test DemandGTK2.sh should work well without GTK-2 switching to version 3
+if there's no GTK-2 library available. 
+At the moment, it's not easy to find a system with GTK-3 and without GTK-2:
+many programs still depend on version 2.
+We can, however, rename GTK-2 library for a single test run and then restore
+it back.
+
+(1) Find GTK2 library: run
+  /sbin/ldconfig -v 2>/dev/null |  grep libgtk-x11-2
+
+It will output one or two lines like 
+libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.2400.23
+Search for the target of that symlink for instance with locate:
+locate libgtk-x11-2.0.so.0.2400.23
+Finally, you'll find the libraries. On my current machine they are
+/usr/lib/i386-linux-gnu/libgtk-x11-2.0.so.0.2400.23
+/usr/lib/x86_64-linux-gnu/libgtk-x11-2.0.so.0.2400.23
+
+I'm running 64-bit JDK and need to tamper with x86_64 copy only.
+
+(2) Find running programs depending on this library. They probably would crash
+if you rename it. Stop them for this test run.
+That said, I'm afraid it would be impossible to do on a system older than Ubuntu 16.04.
+On my Ubuntu 16.04 I have only hud-service using this library, and that's OK, it will restart
+after a crash, if any.
+To find these programs, run
+lsof /usr/lib/x86_64-linux-gnu/libgtk-x11-2.0.so.0.2400.23
+
+(3) Now,
+sudo mv  /usr/lib/x86_64-linux-gnu/libgtk-x11-2.0.so.0.2400.23  /usr/lib/x86_64-linux-gnu/bak.libgtk-x11-2.0.so.0.2400.23
+jtreg DemandGTK2.sh 
+sudo mv  /usr/lib/x86_64-linux-gnu/bak.libgtk-x11-2.0.so.0.2400.23  /usr/lib/x86_64-linux-gnu/libgtk-x11-2.0.so.0.2400.23
+
+Needless to say, you should substitute your own library path and however you run jtreg.
diff --git a/jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK3.sh b/jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK3.sh
new file mode 100644
index 00000000000..1a9038a4bef
--- /dev/null
+++ b/jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK3.sh
@@ -0,0 +1,81 @@
+#!/bin/ksh -p
+
+#
+# Copyright (c) 2016, 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
+#   @summary  Try to force GTK3. We must bail out to GTK2 if no 3 available.
+#
+#   @compile ProvokeGTK.java
+#   @requires os.family == "linux"
+#   @run shell/timeout=400 DemandGTK3.sh
+
+#
+# Note that we depend on
+# strace in the PATH
+# /sbin/ldconfig (which may be is not in PATH)
+# It is true for OEL 7 and Ubuntu 14, 16
+# but may fail in future. Save tomorrow for tomorrow.
+#
+
+which strace
+if [ $?  -ne 0 ]
+then
+    echo "Please provide strace: \"which strace\" failed."
+    exit 1
+fi
+
+HAVE_3=`/sbin/ldconfig -v 2>/dev/null | grep libgtk-3.so | wc -l`
+
+
+if [ "${HAVE_3}" = "0" ]
+then
+    
+    echo "No GTK 3 library found: we should bail out to 2"
+    strace -o strace.log -fe open ${TESTJAVA}/bin/java  -cp ${TESTCLASSPATH}  -Djdk.gtk.version=3 ProvokeGTK
+    EXECRES=$?
+    grep  'libgtk-x11.*=\ *[0-9]*$' strace.log > logg
+else
+    echo "There is GTK 3 library: we should use it"
+    strace -o strace.log -fe open ${TESTJAVA}/bin/java  -cp ${TESTCLASSPATH}  -Djdk.gtk.version=3 ProvokeGTK
+    EXECRES=$?
+    grep  'libgtk-3.*=\ *[0-9]*$' strace.log > logg
+fi
+
+if [ ${EXECRES}  -ne 0 ]
+then
+    echo "java execution failed for unknown reason, see logs"
+    exit 2
+fi
+
+cat logg
+if [  -s logg ]
+then
+    echo "Success."
+    exit 0
+else
+    echo "Failed. Examine logs."
+    exit 3
+fi
+
diff --git a/jdk/test/javax/swing/LookAndFeel/8145547/ProvokeGTK.java b/jdk/test/javax/swing/LookAndFeel/8145547/ProvokeGTK.java
new file mode 100644
index 00000000000..485ea05beaa
--- /dev/null
+++ b/jdk/test/javax/swing/LookAndFeel/8145547/ProvokeGTK.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2016, 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 javax.swing.JFrame;
+import javax.swing.UIManager;
+import javax.swing.SwingUtilities;
+
+public class ProvokeGTK {
+
+    static JFrame frame;
+    public static void createAndShow() {
+        try {
+            UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
+        } catch(Exception cnf) {
+            cnf.printStackTrace();
+        }
+        frame = new JFrame("JFrame");
+        frame.setSize(200, 200);
+
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        frame.setVisible(true);
+    }
+
+    /**
+     * @param args the command line arguments
+     */
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(ProvokeGTK::createAndShow);
+        Thread.sleep(1000);
+        SwingUtilities.invokeAndWait( () -> {
+            frame.setVisible(false);
+            frame.dispose();
+        });
+
+    }
+}
+

From 79fa047585fbfbab87ef716b015ebcf11198cf39 Mon Sep 17 00:00:00 2001
From: Vojin Jovanovic <vojin.jovanovic@oracle.com>
Date: Tue, 10 May 2016 11:18:40 +0200
Subject: [PATCH 061/228] 8156211: [JVMCI] ResolvedJava* interfaces should
 extend AnnotatedElement

Reviewed-by: twisti
---
 .../hotspot/HotSpotResolvedJavaFieldImpl.java |  9 +++++++++
 .../HotSpotResolvedJavaMethodImpl.java        | 14 ++++++++++++-
 .../HotSpotResolvedObjectTypeImpl.java        |  5 +++++
 .../hotspot/HotSpotResolvedPrimitiveType.java |  5 +++++
 .../src/jdk/vm/ci/meta/ResolvedJavaField.java | 20 ++-----------------
 .../jdk/vm/ci/meta/ResolvedJavaMethod.java    | 19 ++----------------
 .../src/jdk/vm/ci/meta/ResolvedJavaType.java  | 20 ++-----------------
 7 files changed, 38 insertions(+), 54 deletions(-)

diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java
index 6762eced201..51e803f58df 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java
@@ -209,6 +209,15 @@ class HotSpotResolvedJavaFieldImpl implements HotSpotResolvedJavaField, HotSpotP
         return new Annotation[0];
     }
 
+    @Override
+    public Annotation[] getDeclaredAnnotations() {
+        Field javaField = toJava();
+        if (javaField != null) {
+            return javaField.getDeclaredAnnotations();
+        }
+        return new Annotation[0];
+    }
+
     @Override
     public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
         Field javaField = toJava();
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
index fc4effd2408..432d5f19edd 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
@@ -472,7 +472,19 @@ final class HotSpotResolvedJavaMethodImpl extends HotSpotMethod implements HotSp
     @Override
     public Annotation[] getAnnotations() {
         Executable javaMethod = toJava();
-        return javaMethod == null ? new Annotation[0] : javaMethod.getAnnotations();
+        if (javaMethod != null) {
+            return javaMethod.getAnnotations();
+        }
+        return new Annotation[0];
+    }
+
+    @Override
+    public Annotation[] getDeclaredAnnotations() {
+        Executable javaMethod = toJava();
+        if (javaMethod != null) {
+            return javaMethod.getDeclaredAnnotations();
+        }
+        return new Annotation[0];
     }
 
     @Override
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
index 08117b8be06..a44404ffc56 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
@@ -743,6 +743,11 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
         return mirror().getAnnotations();
     }
 
+    @Override
+    public Annotation[] getDeclaredAnnotations() {
+        return mirror().getDeclaredAnnotations();
+    }
+
     @Override
     public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
         return mirror().getAnnotation(annotationClass);
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java
index 3064d1c41de..c98f130f4b9 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java
@@ -203,6 +203,11 @@ public final class HotSpotResolvedPrimitiveType extends HotSpotResolvedJavaType
         return new Annotation[0];
     }
 
+    @Override
+    public Annotation[] getDeclaredAnnotations() {
+        return new Annotation[0];
+    }
+
     @Override
     public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
         return null;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaField.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaField.java
index b1eb007c065..02f8530ffe0 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaField.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaField.java
@@ -22,14 +22,14 @@
  */
 package jdk.vm.ci.meta;
 
-import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Modifier;
 
 /**
  * Represents a reference to a resolved Java field. Fields, like methods and types, are resolved
  * through {@link ConstantPool constant pools}.
  */
-public interface ResolvedJavaField extends JavaField, ModifiersProvider {
+public interface ResolvedJavaField extends JavaField, ModifiersProvider, AnnotatedElement {
 
     /**
      * {@inheritDoc}
@@ -60,22 +60,6 @@ public interface ResolvedJavaField extends JavaField, ModifiersProvider {
      */
     ResolvedJavaType getDeclaringClass();
 
-    /**
-     * Returns all annotations of this field. If no annotations are present, an array of length 0 is
-     * returned.
-     */
-    Annotation[] getAnnotations();
-
-    /**
-     * Returns the annotation for the specified type of this field, if such an annotation is
-     * present.
-     *
-     * @param annotationClass the Class object corresponding to the annotation type
-     * @return this element's annotation for the specified annotation type if present on this field,
-     *         else {@code null}
-     */
-    <T extends Annotation> T getAnnotation(Class<T> annotationClass);
-
     /**
      * Returns an object representing the unique location identity of this resolved Java field.
      *
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaMethod.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaMethod.java
index 326a24bd29e..ddf86fbdcd2 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaMethod.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaMethod.java
@@ -24,6 +24,7 @@ package jdk.vm.ci.meta;
 
 import java.lang.annotation.Annotation;
 import java.lang.invoke.MethodHandle;
+import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Array;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -33,7 +34,7 @@ import java.lang.reflect.Type;
  * Represents a resolved Java method. Methods, like fields and types, are resolved through
  * {@link ConstantPool constant pools}.
  */
-public interface ResolvedJavaMethod extends JavaMethod, InvokeTarget, ModifiersProvider {
+public interface ResolvedJavaMethod extends JavaMethod, InvokeTarget, ModifiersProvider, AnnotatedElement {
 
     /**
      * Returns the bytecode of this method, if the method has code. The returned byte array does not
@@ -188,22 +189,6 @@ public interface ResolvedJavaMethod extends JavaMethod, InvokeTarget, ModifiersP
      */
     ConstantPool getConstantPool();
 
-    /**
-     * Returns all annotations of this method. If no annotations are present, an array of length 0
-     * is returned.
-     */
-    Annotation[] getAnnotations();
-
-    /**
-     * Returns the annotation for the specified type of this method, if such an annotation is
-     * present.
-     *
-     * @param annotationClass the Class object corresponding to the annotation type
-     * @return this element's annotation for the specified annotation type if present on this
-     *         method, else {@code null}
-     */
-    <T extends Annotation> T getAnnotation(Class<T> annotationClass);
-
     /**
      * Returns an array of arrays that represent the annotations on the formal parameters, in
      * declaration order, of this method.
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java
index a0950e809f0..e99624082f9 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java
@@ -22,7 +22,7 @@
  */
 package jdk.vm.ci.meta;
 
-import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
 
 import jdk.vm.ci.meta.Assumptions.AssumptionResult;
 
@@ -31,7 +31,7 @@ import jdk.vm.ci.meta.Assumptions.AssumptionResult;
  * thereof. Types, like fields and methods, are resolved through {@link ConstantPool constant pools}
  * .
  */
-public interface ResolvedJavaType extends JavaType, ModifiersProvider {
+public interface ResolvedJavaType extends JavaType, ModifiersProvider, AnnotatedElement {
     /**
      * Checks whether this type has a finalizer method.
      *
@@ -283,22 +283,6 @@ public interface ResolvedJavaType extends JavaType, ModifiersProvider {
      */
     ResolvedJavaField[] getStaticFields();
 
-    /**
-     * Returns all annotations of this class. If no annotations are present, an array of length 0 is
-     * returned.
-     */
-    Annotation[] getAnnotations();
-
-    /**
-     * Returns the annotation for the specified type of this class, if such an annotation is
-     * present.
-     *
-     * @param annotationClass the Class object corresponding to the annotation type
-     * @return this element's annotation for the specified annotation type if present on this class,
-     *         else {@code null}
-     */
-    <T extends Annotation> T getAnnotation(Class<T> annotationClass);
-
     /**
      * Returns the instance field of this class (or one of its super classes) at the given offset,
      * or {@code null} if there is no such field.

From aab69bdeb5f20efcd89940be772ace29b32b798a Mon Sep 17 00:00:00 2001
From: Roland Schatz <rschatz@openjdk.org>
Date: Tue, 10 May 2016 12:18:22 +0200
Subject: [PATCH 062/228] 8155719: remove TrustedInterface from JVMCI

Reviewed-by: twisti
---
 .../HotSpotResolvedObjectTypeImpl.java        |  6 ----
 .../hotspot/HotSpotResolvedPrimitiveType.java |  7 +---
 .../src/jdk/vm/ci/meta/JavaField.java         |  4 +--
 .../src/jdk/vm/ci/meta/JavaMethod.java        |  4 +--
 .../src/jdk/vm/ci/meta/JavaType.java          |  4 +--
 .../src/jdk/vm/ci/meta/ResolvedJavaType.java  |  8 +----
 .../src/jdk/vm/ci/meta/TrustedInterface.java  | 32 -------------------
 .../ci/runtime/test/TestResolvedJavaType.java | 13 +-------
 .../jdk/vm/ci/runtime/test/TypeUniverse.java  |  7 ++--
 9 files changed, 12 insertions(+), 73 deletions(-)
 delete mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/TrustedInterface.java

diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
index 75a76e82240..08117b8be06 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
@@ -52,7 +52,6 @@ import jdk.vm.ci.meta.ModifiersProvider;
 import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
-import jdk.vm.ci.meta.TrustedInterface;
 
 /**
  * Implementation of {@link JavaType} for resolved non-primitive HotSpot classes.
@@ -878,11 +877,6 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
         return "HotSpotType<" + getName() + ", resolved>";
     }
 
-    @Override
-    public boolean isTrustedInterfaceType() {
-        return TrustedInterface.class.isAssignableFrom(mirror());
-    }
-
     @Override
     public boolean isCloneableWithAllocation() {
         return (getAccessFlags() & config().jvmAccIsCloneableFast) != 0;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java
index 64f9027fe66..3064d1c41de 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
@@ -263,11 +263,6 @@ public final class HotSpotResolvedPrimitiveType extends HotSpotResolvedJavaType
         return null;
     }
 
-    @Override
-    public boolean isTrustedInterfaceType() {
-        return false;
-    }
-
     @Override
     public boolean isCloneableWithAllocation() {
         return false;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaField.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaField.java
index 73ab3f5680c..f4b386a0ee4 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaField.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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,7 @@ import java.util.UnknownFormatConversionException;
  * Represents a reference to a Java field, either resolved or unresolved fields. Fields, like
  * methods and types, are resolved through {@link ConstantPool constant pools}.
  */
-public interface JavaField extends TrustedInterface {
+public interface JavaField {
 
     /**
      * Returns the name of this field.
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaMethod.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaMethod.java
index da61e58b027..122c888d52d 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaMethod.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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,7 @@ import java.util.UnknownFormatConversionException;
  * Represents a reference to a Java method, either resolved or unresolved. Methods, like fields and
  * types, are resolved through {@link ConstantPool constant pools}.
  */
-public interface JavaMethod extends TrustedInterface {
+public interface JavaMethod {
 
     /**
      * Returns the name of this method.
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaType.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaType.java
index 9f5ff78f0a3..c010a2b510a 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaType.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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,7 @@ import static jdk.vm.ci.meta.MetaUtil.internalNameToJava;
  * Represents a resolved or unresolved type. Types include primitives, objects, {@code void}, and
  * arrays thereof.
  */
-public interface JavaType extends TrustedInterface {
+public interface JavaType {
 
     /**
      * Returns the name of this type in internal form. The following are examples of strings
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java
index 9a882975984..a0950e809f0 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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
@@ -345,12 +345,6 @@ public interface ResolvedJavaType extends JavaType, ModifiersProvider {
      */
     ResolvedJavaMethod getClassInitializer();
 
-    /**
-     * Returns true if this type represents an interface and it should be trusted even in places
-     * where the JVM verifier would not give any guarantees other than {@link Object}.
-     */
-    boolean isTrustedInterfaceType();
-
     default ResolvedJavaMethod findMethod(String name, Signature signature) {
         for (ResolvedJavaMethod method : getDeclaredMethods()) {
             if (method.getName().equals(name) && method.getSignature().equals(signature)) {
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/TrustedInterface.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/TrustedInterface.java
deleted file mode 100644
index ace5c0145bf..00000000000
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/TrustedInterface.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2014, 2014, 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;
-
-/**
- * Interfaces extending this interface should be trusted by the compiler. See
- * {@link ResolvedJavaType#isTrustedInterfaceType()}.
- *
- */
-public interface TrustedInterface {
-
-}
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java
index 48946aa9904..106523ce255 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
@@ -68,7 +68,6 @@ import jdk.vm.ci.meta.ModifiersProvider;
 import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
-import jdk.vm.ci.meta.TrustedInterface;
 
 import org.junit.Test;
 
@@ -841,16 +840,6 @@ public class TestResolvedJavaType extends TypeUniverse {
         }
     }
 
-    @Test
-    public void isTrustedInterfaceTypeTest() {
-        for (Class<?> c : classes) {
-            ResolvedJavaType type = metaAccess.lookupJavaType(c);
-            if (TrustedInterface.class.isAssignableFrom(c)) {
-                assertTrue(type.isTrustedInterfaceType());
-            }
-        }
-    }
-
     @Test
     public void isLeafTest() {
         for (Class<?> c : classes) {
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TypeUniverse.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TypeUniverse.java
index 59969f846e3..41081b2beb7 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TypeUniverse.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TypeUniverse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 +52,6 @@ import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaType;
-import jdk.vm.ci.meta.TrustedInterface;
 import jdk.vm.ci.runtime.JVMCI;
 
 import org.junit.Test;
@@ -116,8 +115,8 @@ public class TypeUniverse {
                         byte[].class, short[].class, char[].class, int[].class, float[].class, long[].class, double[].class, Object[].class, Class[].class, List[].class, boolean[][].class,
                         byte[][].class, short[][].class, char[][].class, int[][].class, float[][].class, long[][].class, double[][].class, Object[][].class, Class[][].class, List[][].class,
                         ClassLoader.class, String.class, Serializable.class, Cloneable.class, Test.class, TestMetaAccessProvider.class, List.class, Collection.class, Map.class, Queue.class,
-                        HashMap.class, LinkedHashMap.class, IdentityHashMap.class, AbstractCollection.class, AbstractList.class, ArrayList.class, TrustedInterface.class, InnerClass.class,
-                        InnerStaticClass.class, InnerStaticFinalClass.class, PrivateInnerClass.class, ProtectedInnerClass.class};
+                        HashMap.class, LinkedHashMap.class, IdentityHashMap.class, AbstractCollection.class, AbstractList.class, ArrayList.class, InnerClass.class, InnerStaticClass.class,
+                        InnerStaticFinalClass.class, PrivateInnerClass.class, ProtectedInnerClass.class};
         for (Class<?> c : initialClasses) {
             addClass(c);
         }

From db7608c21cc9d2ca4a7932e2bbe68390af59b042 Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Tue, 10 May 2016 08:52:43 -0700
Subject: [PATCH 063/228] 8155023: jdk.vm.ci needs to securely export services

Reviewed-by: twisti, kvn, alanb
---
 hotspot/.mx.jvmci/mx_jvmci.py                 |  2 +-
 hotspot/.mx.jvmci/suite.py                    |  1 +
 .../hotspot/HotSpotJVMCICompilerConfig.java   | 11 ++-
 .../vm/ci/hotspot/HotSpotJVMCIRuntime.java    |  1 +
 .../EmptyEventProvider.java                   | 42 +++++----
 .../{events => services}/EventProvider.java   | 66 ++++++++++++--
 .../HotSpotVMEventListener.java               | 41 +++++++--
 .../vm/ci/runtime/JVMCICompilerFactory.java   | 52 -----------
 .../services/JVMCICompilerFactory.java        | 86 +++++++++++++++++++
 .../jdk/vm/ci/services/JVMCIPermission.java}  | 20 +++--
 .../src/jdk/vm/ci/services/Services.java      | 57 +++++++++++-
 .../jdk.vm.ci/share/classes/module-info.java  |  8 +-
 .../compiler/jvmci/common/JVMCIHelpers.java   |  8 +-
 .../JvmciCreateMetaAccessContextTest.java     |  6 +-
 .../events/JvmciShutdownEventListener.java    |  4 +-
 .../jvmci/events/JvmciShutdownEventTest.java  |  2 +-
 16 files changed, 300 insertions(+), 107 deletions(-)
 rename hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/{events => services}/EmptyEventProvider.java (73%)
 rename hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/{events => services}/EventProvider.java (57%)
 rename hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/{ => services}/HotSpotVMEventListener.java (59%)
 delete mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/JVMCICompilerFactory.java
 create mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/services/JVMCICompilerFactory.java
 rename hotspot/src/jdk.vm.ci/share/classes/{jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/logging/package-info.java => jdk.vm.ci.services/src/jdk/vm/ci/services/JVMCIPermission.java} (71%)

diff --git a/hotspot/.mx.jvmci/mx_jvmci.py b/hotspot/.mx.jvmci/mx_jvmci.py
index 1db4fbb5dcd..7e5a2d43510 100644
--- a/hotspot/.mx.jvmci/mx_jvmci.py
+++ b/hotspot/.mx.jvmci/mx_jvmci.py
@@ -194,7 +194,7 @@ To build hotspot and import it into the JDK: "mx make hotspot import-hotspot"
         # JDK9 must be bootstrapped with a JDK8
         compliance = mx.JavaCompliance('8')
         jdk8 = mx.get_jdk(compliance.exactMatch, versionDescription=compliance.value)
-        cmd = ['sh', 'configure', '--with-debug-level=' + _vm.debugLevel, '--with-native-debug-symbols=none', '--disable-precompiled-headers',
+        cmd = ['sh', 'configure', '--with-debug-level=' + _vm.debugLevel, '--with-native-debug-symbols=external', '--disable-precompiled-headers',
                '--with-jvm-variants=' + _vm.jvmVariant, '--disable-warnings-as-errors', '--with-boot-jdk=' + jdk8.home]
         mx.run(cmd, cwd=_jdkSourceRoot)
     cmd = [mx.gmake_cmd(), 'CONF=' + _vm.debugLevel]
diff --git a/hotspot/.mx.jvmci/suite.py b/hotspot/.mx.jvmci/suite.py
index 3da6124dbca..63e00ca4c48 100644
--- a/hotspot/.mx.jvmci/suite.py
+++ b/hotspot/.mx.jvmci/suite.py
@@ -103,6 +103,7 @@ suite = {
       "sourceDirs" : ["src"],
       "dependencies" : [
         "jdk.vm.ci.code",
+        "jdk.vm.ci.services",
       ],
       "checkstyle" : "jdk.vm.ci.services",
       "javaCompliance" : "1.8",
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java
index b7b7f9ad347..2a1c225f07d 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java
@@ -22,27 +22,31 @@
  */
 package jdk.vm.ci.hotspot;
 
+import java.lang.reflect.Module;
+
 import jdk.vm.ci.code.CompilationRequest;
 import jdk.vm.ci.code.CompilationRequestResult;
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.Option;
 import jdk.vm.ci.runtime.JVMCICompiler;
-import jdk.vm.ci.runtime.JVMCICompilerFactory;
 import jdk.vm.ci.runtime.JVMCIRuntime;
+import jdk.vm.ci.runtime.services.JVMCICompilerFactory;
 import jdk.vm.ci.services.Services;
 
 final class HotSpotJVMCICompilerConfig {
 
-    private static class DummyCompilerFactory implements JVMCICompilerFactory, JVMCICompiler {
+    private static class DummyCompilerFactory extends JVMCICompilerFactory implements JVMCICompiler {
 
         public CompilationRequestResult compileMethod(CompilationRequest request) {
             throw new JVMCIError("no JVMCI compiler selected");
         }
 
+        @Override
         public String getCompilerName() {
             return "<none>";
         }
 
+        @Override
         public JVMCICompiler createCompiler(JVMCIRuntime runtime) {
             return this;
         }
@@ -65,6 +69,9 @@ final class HotSpotJVMCICompilerConfig {
             if (compilerName != null) {
                 for (JVMCICompilerFactory f : Services.load(JVMCICompilerFactory.class)) {
                     if (f.getCompilerName().equals(compilerName)) {
+                        Module jvmciModule = JVMCICompilerFactory.class.getModule();
+                        Services.exportJVMCITo(f.getClass());
+                        f.onSelection();
                         factory = f;
                     }
                 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
index 802bc1ccef0..8da416f1840 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
@@ -42,6 +42,7 @@ import jdk.vm.ci.code.CompilationRequestResult;
 import jdk.vm.ci.code.CompiledCode;
 import jdk.vm.ci.code.InstalledCode;
 import jdk.vm.ci.common.JVMCIError;
+import jdk.vm.ci.hotspot.services.HotSpotVMEventListener;
 import jdk.vm.ci.inittimer.InitTimer;
 import jdk.vm.ci.inittimer.SuppressFBWarnings;
 import jdk.vm.ci.meta.JVMCIMetaAccessContext;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/events/EmptyEventProvider.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/services/EmptyEventProvider.java
similarity index 73%
rename from hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/events/EmptyEventProvider.java
rename to hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/services/EmptyEventProvider.java
index 8e39f7191f1..c217964fb34 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/events/EmptyEventProvider.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/services/EmptyEventProvider.java
@@ -20,23 +20,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.vm.ci.hotspot.events;
-
-import jdk.vm.ci.common.JVMCIError;
+package jdk.vm.ci.hotspot.services;
 
 /**
  * An empty implementation for {@link EventProvider}. This implementation is used when no logging is
  * requested.
  */
-public final class EmptyEventProvider implements EventProvider {
+final class EmptyEventProvider extends EventProvider {
 
+    EmptyEventProvider() {
+        super(null);
+    }
+
+    static InternalError shouldNotReachHere() {
+        throw new InternalError("should not reach here");
+    }
+
+    @Override
     public CompilationEvent newCompilationEvent() {
         return new EmptyCompilationEvent();
     }
 
-    public static class EmptyCompilationEvent implements CompilationEvent {
+    static class EmptyCompilationEvent implements CompilationEvent {
         public void commit() {
-            throw JVMCIError.shouldNotReachHere();
+            throw shouldNotReachHere();
         }
 
         public boolean shouldWrite() {
@@ -51,41 +58,42 @@ public final class EmptyEventProvider implements EventProvider {
         }
 
         public void setMethod(String method) {
-            throw JVMCIError.shouldNotReachHere();
+            throw shouldNotReachHere();
         }
 
         public void setCompileId(int compileId) {
-            throw JVMCIError.shouldNotReachHere();
+            throw shouldNotReachHere();
         }
 
         public void setCompileLevel(int compileLevel) {
-            throw JVMCIError.shouldNotReachHere();
+            throw shouldNotReachHere();
         }
 
         public void setSucceeded(boolean succeeded) {
-            throw JVMCIError.shouldNotReachHere();
+            throw shouldNotReachHere();
         }
 
         public void setIsOsr(boolean isOsr) {
-            throw JVMCIError.shouldNotReachHere();
+            throw shouldNotReachHere();
         }
 
         public void setCodeSize(int codeSize) {
-            throw JVMCIError.shouldNotReachHere();
+            throw shouldNotReachHere();
         }
 
         public void setInlinedBytes(int inlinedBytes) {
-            throw JVMCIError.shouldNotReachHere();
+            throw shouldNotReachHere();
         }
     }
 
+    @Override
     public CompilerFailureEvent newCompilerFailureEvent() {
         return new EmptyCompilerFailureEvent();
     }
 
-    public static class EmptyCompilerFailureEvent implements CompilerFailureEvent {
+    static class EmptyCompilerFailureEvent implements CompilerFailureEvent {
         public void commit() {
-            throw JVMCIError.shouldNotReachHere();
+            throw shouldNotReachHere();
         }
 
         public boolean shouldWrite() {
@@ -94,11 +102,11 @@ public final class EmptyEventProvider implements EventProvider {
         }
 
         public void setCompileId(int compileId) {
-            throw JVMCIError.shouldNotReachHere();
+            throw shouldNotReachHere();
         }
 
         public void setMessage(String message) {
-            throw JVMCIError.shouldNotReachHere();
+            throw shouldNotReachHere();
         }
     }
 
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/events/EventProvider.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/services/EventProvider.java
similarity index 57%
rename from hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/events/EventProvider.java
rename to hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/services/EventProvider.java
index 469868d0bf7..d351060d452 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/events/EventProvider.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/services/EventProvider.java
@@ -20,17 +20,65 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.vm.ci.hotspot.events;
+package jdk.vm.ci.hotspot.services;
+
+import jdk.vm.ci.hotspot.services.EmptyEventProvider.EmptyCompilationEvent;
+import jdk.vm.ci.hotspot.services.EmptyEventProvider.EmptyCompilerFailureEvent;
+import jdk.vm.ci.services.JVMCIPermission;
 
 /**
- * A provider that provides a specific implementation for events that can be logged in the compiler.
+ * Service-provider class for logging compiler related events.
  */
-public interface EventProvider {
+public abstract class EventProvider {
+
+    private static Void checkPermission() {
+        SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            sm.checkPermission(new JVMCIPermission());
+        }
+        return null;
+    }
+
+    @SuppressWarnings("unused")
+    EventProvider(Void ignore) {
+    }
+
+    /**
+     * Initializes a new instance of this class.
+     *
+     * @throws SecurityException if a security manager has been installed and it denies
+     *             {@link JVMCIPermission}
+     */
+    protected EventProvider() {
+        this(checkPermission());
+    }
+
+    /**
+     * Creates and returns an empty implementation for {@link EventProvider}. This implementation
+     * can be used when no logging is requested.
+     */
+    public static EventProvider createEmptyEventProvider() {
+        return new EmptyEventProvider();
+    }
+
+    /**
+     * Creates and returns an empty implementation for {@link CompilationEvent}.
+     */
+    public static CompilationEvent createEmptyCompilationEvent() {
+        return new EmptyCompilationEvent();
+    }
+
+    /**
+     * Creates and returns an empty implementation for {@link CompilationEvent}.
+     */
+    public static CompilerFailureEvent createEmptyCompilerFailureEvent() {
+        return new EmptyCompilerFailureEvent();
+    }
 
     /**
      * An instant event is an event that is not considered to have taken any time.
      */
-    interface InstantEvent {
+    public interface InstantEvent {
         /**
          * Commits the event.
          */
@@ -49,7 +97,7 @@ public interface EventProvider {
     /**
      * Timed events describe an operation that somehow consumes time.
      */
-    interface TimedEvent extends InstantEvent {
+    public interface TimedEvent extends InstantEvent {
         /**
          * Starts the timing for this event.
          */
@@ -66,12 +114,12 @@ public interface EventProvider {
      *
      * @return a compilation event
      */
-    CompilationEvent newCompilationEvent();
+    public abstract CompilationEvent newCompilationEvent();
 
     /**
      * A compilation event.
      */
-    interface CompilationEvent extends TimedEvent {
+    public interface CompilationEvent extends TimedEvent {
         void setMethod(String method);
 
         void setCompileId(int compileId);
@@ -92,12 +140,12 @@ public interface EventProvider {
      *
      * @return a compiler failure event
      */
-    CompilerFailureEvent newCompilerFailureEvent();
+    public abstract CompilerFailureEvent newCompilerFailureEvent();
 
     /**
      * A compiler failure event.
      */
-    interface CompilerFailureEvent extends InstantEvent {
+    public interface CompilerFailureEvent extends InstantEvent {
         void setCompileId(int compileId);
 
         void setMessage(String message);
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMEventListener.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/services/HotSpotVMEventListener.java
similarity index 59%
rename from hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMEventListener.java
rename to hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/services/HotSpotVMEventListener.java
index c14a32dbffc..06c4f645815 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMEventListener.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/services/HotSpotVMEventListener.java
@@ -20,19 +20,48 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.vm.ci.hotspot;
+package jdk.vm.ci.hotspot.services;
 
 import jdk.vm.ci.code.CompiledCode;
 import jdk.vm.ci.code.InstalledCode;
+import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider;
+import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
 import jdk.vm.ci.meta.JVMCIMetaAccessContext;
 import jdk.vm.ci.meta.ResolvedJavaType;
+import jdk.vm.ci.services.JVMCIPermission;
 
-public interface HotSpotVMEventListener {
+/**
+ * Service-provider class for responding to VM events and for creating
+ * {@link JVMCIMetaAccessContext}s.
+ */
+public abstract class HotSpotVMEventListener {
+
+    private static Void checkPermission() {
+        SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            sm.checkPermission(new JVMCIPermission());
+        }
+        return null;
+    }
+
+    @SuppressWarnings("unused")
+    HotSpotVMEventListener(Void ignore) {
+    }
+
+    /**
+     * Initializes a new instance of this class.
+     *
+     * @throws SecurityException if a security manager has been installed and it denies
+     *             {@link JVMCIPermission}
+     */
+    protected HotSpotVMEventListener() {
+        this(checkPermission());
+    }
 
     /**
      * Notifies this client that the VM is shutting down.
      */
-    default void notifyShutdown() {
+    public void notifyShutdown() {
     }
 
     /**
@@ -42,7 +71,7 @@ public interface HotSpotVMEventListener {
      * @param installedCode
      * @param compiledCode
      */
-    default void notifyInstall(HotSpotCodeCacheProvider hotSpotCodeCacheProvider, InstalledCode installedCode, CompiledCode compiledCode) {
+    public void notifyInstall(HotSpotCodeCacheProvider hotSpotCodeCacheProvider, InstalledCode installedCode, CompiledCode compiledCode) {
     }
 
     /**
@@ -50,10 +79,10 @@ public interface HotSpotVMEventListener {
      * metadata. It a custom one isn't created then the default implementation will be a single
      * context with globally shared instances of {@link ResolvedJavaType} that are never released.
      *
-     * @param hotSpotJVMCIRuntime
+     * @param runtime the runtime instance that will use the returned context
      * @return a custom context or null
      */
-    default JVMCIMetaAccessContext createMetaAccessContext(HotSpotJVMCIRuntime hotSpotJVMCIRuntime) {
+    public JVMCIMetaAccessContext createMetaAccessContext(HotSpotJVMCIRuntime runtime) {
         return null;
     }
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/JVMCICompilerFactory.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/JVMCICompilerFactory.java
deleted file mode 100644
index 8262924bf5a..00000000000
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/JVMCICompilerFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2015, 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.runtime;
-
-/**
- * Factory for a JVMCI compiler.
- */
-public interface JVMCICompilerFactory {
-
-    /**
-     * Get the name of this compiler.
-     */
-    String getCompilerName();
-
-    /**
-     * Create a new instance of the {@link JVMCICompiler}.
-     */
-    JVMCICompiler createCompiler(JVMCIRuntime runtime);
-
-    /**
-     * In a tiered system it might be advantageous for startup to keep the JVMCI compiler from
-     * compiling itself so provide a hook to request that certain packages are compiled only by an
-     * optimizing first tier. The prefixes should class or package names using / as the separator,
-     * i.e. jdk/vm/ci for instance.
-     *
-     * @return 0 or more Strings identifying packages that should by compiled by the first tier
-     *         only.
-     */
-    default String[] getTrivialPrefixes() {
-        return null;
-    }
-}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/services/JVMCICompilerFactory.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/services/JVMCICompilerFactory.java
new file mode 100644
index 00000000000..2c441ac29a1
--- /dev/null
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/services/JVMCICompilerFactory.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2015, 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.runtime.services;
+
+import jdk.vm.ci.runtime.JVMCICompiler;
+import jdk.vm.ci.runtime.JVMCIRuntime;
+import jdk.vm.ci.services.JVMCIPermission;
+
+/**
+ * Service-provider class for creating JVMCI compilers.
+ */
+public abstract class JVMCICompilerFactory {
+
+    private static Void checkPermission() {
+        SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            sm.checkPermission(new JVMCIPermission());
+        }
+        return null;
+    }
+
+    @SuppressWarnings("unused")
+    private JVMCICompilerFactory(Void ignore) {
+    }
+
+    /**
+     * Initializes a new instance of this class.
+     *
+     * @throws SecurityException if a security manager has been installed and it denies
+     *             {@link JVMCIPermission}
+     */
+    protected JVMCICompilerFactory() {
+        this(checkPermission());
+    }
+
+    /**
+     * Get the name of this compiler. The name is used by JVMCI to determine which factory to use.
+     */
+    public abstract String getCompilerName();
+
+    /**
+     * Notifies this object that it has been selected to {@linkplain #createCompiler(JVMCIRuntime)
+     * create} a compiler and it should now perform any heavy weight initialization that it deferred
+     * during construction.
+     */
+    public void onSelection() {
+    }
+
+    /**
+     * Create a new instance of a {@link JVMCICompiler}.
+     */
+    public abstract JVMCICompiler createCompiler(JVMCIRuntime runtime);
+
+    /**
+     * In a tiered system it might be advantageous for startup to keep the JVMCI compiler from
+     * compiling itself so provide a hook to request that certain packages are compiled only by an
+     * optimizing first tier. The prefixes should class or package names using / as the separator,
+     * i.e. jdk/vm/ci for instance.
+     *
+     * @return 0 or more Strings identifying packages that should by compiled by the first tier only
+     *         or null if no redirection to C1 should be performed.
+     */
+    public String[] getTrivialPrefixes() {
+        return null;
+    }
+}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/logging/package-info.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/JVMCIPermission.java
similarity index 71%
rename from hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/logging/package-info.java
rename to hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/JVMCIPermission.java
index eb58e4c3336..2548dd78093 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/logging/package-info.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/JVMCIPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
@@ -20,8 +20,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/**
- * Logging framework for the HotSpot CRI implementation.
- */
-package jdk.vm.ci.hotspot.logging;
+package jdk.vm.ci.services;
 
+import java.security.BasicPermission;
+
+/**
+ * This class represents the permission to access JVMCI services.
+ */
+public class JVMCIPermission extends BasicPermission {
+
+    private static final long serialVersionUID = 6346818963934448226L;
+
+    public JVMCIPermission() {
+        super("jvmci");
+    }
+}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/Services.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/Services.java
index be4a1cc1afa..83085fe08d2 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/Services.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/Services.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,6 +22,7 @@
  */
 package jdk.vm.ci.services;
 
+import java.lang.reflect.Module;
 import java.util.Formatter;
 import java.util.Iterator;
 import java.util.ServiceConfigurationError;
@@ -35,11 +36,52 @@ public final class Services {
     private Services() {
     }
 
+    /**
+     * Performs any required security checks and dynamic reconfiguration to allow the module of a
+     * given class to access the classes in the JVMCI module.
+     *
+     * Note: This API uses {@link Class} instead of {@link Module} to provide backwards
+     * compatibility for JVMCI clients compiled against a JDK release earlier than 9.
+     *
+     * @param requestor a class requesting access to the JVMCI module for its module
+     * @throws SecurityException if a security manager is present and it denies
+     *             {@link JVMCIPermission}
+     */
+    public static void exportJVMCITo(Class<?> requestor) {
+        SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            sm.checkPermission(new JVMCIPermission());
+        }
+        Module jvmci = Services.class.getModule();
+        Module requestorModule = requestor.getModule();
+        if (jvmci != requestorModule) {
+            for (String pkg : jvmci.getPackages()) {
+                // Export all JVMCI packages dynamically instead
+                // of requiring a long list of -XaddExports
+                // options on the JVM command line.
+                if (!jvmci.isExported(pkg, requestorModule)) {
+                    jvmci.addExports(pkg, requestorModule);
+                }
+            }
+        }
+    }
+
     /**
      * Gets an {@link Iterable} of the JVMCI providers available for a given service.
+     *
+     * @throws SecurityException if a security manager is present and it denies
+     *             {@link JVMCIPermission}
      */
     public static <S> Iterable<S> load(Class<S> service) {
-        return ServiceLoader.load(service);
+        SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            sm.checkPermission(new JVMCIPermission());
+        }
+        Module jvmci = Services.class.getModule();
+        jvmci.addUses(service);
+
+        // Restrict JVMCI clients to be on the class path or module path
+        return ServiceLoader.load(service, ClassLoader.getSystemClassLoader());
     }
 
     /**
@@ -48,9 +90,18 @@ public final class Services {
      * @param service the service whose provider is being requested
      * @param required specifies if an {@link InternalError} should be thrown if no provider of
      *            {@code service} is available
+     * @throws SecurityException if a security manager is present and it denies
+     *             {@link JVMCIPermission}
      */
     public static <S> S loadSingle(Class<S> service, boolean required) {
-        Iterable<S> providers = ServiceLoader.load(service);
+        SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            sm.checkPermission(new JVMCIPermission());
+        }
+        Module jvmci = Services.class.getModule();
+        jvmci.addUses(service);
+        // Restrict JVMCI clients to be on the class path or module path
+        Iterable<S> providers = ServiceLoader.load(service, ClassLoader.getSystemClassLoader());
         S singleProvider = null;
         try {
             for (Iterator<S> it = providers.iterator(); it.hasNext();) {
diff --git a/hotspot/src/jdk.vm.ci/share/classes/module-info.java b/hotspot/src/jdk.vm.ci/share/classes/module-info.java
index a59a37d56e2..062737395e2 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/module-info.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/module-info.java
@@ -24,9 +24,13 @@
  */
 
 module jdk.vm.ci {
-    uses jdk.vm.ci.hotspot.HotSpotVMEventListener;
+    exports jdk.vm.ci.services;
+    exports jdk.vm.ci.runtime.services;
+    exports jdk.vm.ci.hotspot.services;
+
+    uses jdk.vm.ci.hotspot.services.HotSpotVMEventListener;
     uses jdk.vm.ci.hotspot.HotSpotJVMCIBackendFactory;
-    uses jdk.vm.ci.runtime.JVMCICompilerFactory;
+    uses jdk.vm.ci.runtime.services.JVMCICompilerFactory;
 
     provides jdk.vm.ci.hotspot.HotSpotJVMCIBackendFactory with
         jdk.vm.ci.hotspot.aarch64.AArch64HotSpotJVMCIBackendFactory;
diff --git a/hotspot/test/compiler/jvmci/common/JVMCIHelpers.java b/hotspot/test/compiler/jvmci/common/JVMCIHelpers.java
index a99c0908fc5..f206eb069dd 100644
--- a/hotspot/test/compiler/jvmci/common/JVMCIHelpers.java
+++ b/hotspot/test/compiler/jvmci/common/JVMCIHelpers.java
@@ -26,10 +26,10 @@ package compiler.jvmci.common;
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.CompilationRequest;
 import jdk.vm.ci.code.CompilationRequestResult;
-import jdk.vm.ci.hotspot.HotSpotVMEventListener;
+import jdk.vm.ci.hotspot.services.HotSpotVMEventListener;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.runtime.JVMCICompiler;
-import jdk.vm.ci.runtime.JVMCICompilerFactory;
+import jdk.vm.ci.runtime.services.JVMCICompilerFactory;
 import jdk.vm.ci.runtime.JVMCIRuntime;
 
 /*
@@ -37,7 +37,7 @@ import jdk.vm.ci.runtime.JVMCIRuntime;
  */
 public class JVMCIHelpers {
 
-    public static class EmptyVMEventListener implements HotSpotVMEventListener {
+    public static class EmptyVMEventListener extends HotSpotVMEventListener {
         // just empty, using default interface methods
     }
 
@@ -50,7 +50,7 @@ public class JVMCIHelpers {
         }
     }
 
-    public static class EmptyCompilerFactory implements JVMCICompilerFactory {
+    public static class EmptyCompilerFactory extends JVMCICompilerFactory {
 
         @Override
         public String getCompilerName() {
diff --git a/hotspot/test/compiler/jvmci/events/JvmciCreateMetaAccessContextTest.java b/hotspot/test/compiler/jvmci/events/JvmciCreateMetaAccessContextTest.java
index c86938943c5..0eeba44b2e0 100644
--- a/hotspot/test/compiler/jvmci/events/JvmciCreateMetaAccessContextTest.java
+++ b/hotspot/test/compiler/jvmci/events/JvmciCreateMetaAccessContextTest.java
@@ -38,7 +38,7 @@
  * @run main jdk.test.lib.FileInstaller ../common/services/ ./META-INF/services/
  * @run main jdk.test.lib.FileInstaller
  *     ./JvmciCreateMetaAccessContextTest.config
- *     ./META-INF/services/jdk.vm.ci.hotspot.HotSpotVMEventListener
+ *     ./META-INF/services/jdk.vm.ci.hotspot.services.HotSpotVMEventListener
  * @run main ClassFileInstaller
  *     compiler.jvmci.common.JVMCIHelpers$EmptyHotspotCompiler
  *     compiler.jvmci.common.JVMCIHelpers$EmptyCompilerFactory
@@ -57,13 +57,13 @@
 package compiler.jvmci.events;
 
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
-import jdk.vm.ci.hotspot.HotSpotVMEventListener;
+import jdk.vm.ci.hotspot.services.HotSpotVMEventListener;
 import jdk.vm.ci.hotspot.MetaAccessWrapper;
 import jdk.vm.ci.meta.JVMCIMetaAccessContext;
 import jdk.test.lib.Asserts;
 
 public class JvmciCreateMetaAccessContextTest
-        implements HotSpotVMEventListener {
+        extends HotSpotVMEventListener {
     private static final boolean PROVIDE_NULL_CONTEXT = Boolean.getBoolean(
             "compiler.jvmci.events.JvmciCreateMetaAccessContextTest"
                     + ".providenull");
diff --git a/hotspot/test/compiler/jvmci/events/JvmciShutdownEventListener.java b/hotspot/test/compiler/jvmci/events/JvmciShutdownEventListener.java
index c82cbd10201..5ddc9e126ae 100644
--- a/hotspot/test/compiler/jvmci/events/JvmciShutdownEventListener.java
+++ b/hotspot/test/compiler/jvmci/events/JvmciShutdownEventListener.java
@@ -24,9 +24,9 @@
 package compiler.jvmci.events;
 
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
-import jdk.vm.ci.hotspot.HotSpotVMEventListener;
+import jdk.vm.ci.hotspot.services.HotSpotVMEventListener;
 
-public class JvmciShutdownEventListener implements HotSpotVMEventListener {
+public class JvmciShutdownEventListener extends HotSpotVMEventListener {
     public static final String MESSAGE = "Shutdown notified";
     public static final String GOT_INTERNAL_ERROR = "Got internal error";
 
diff --git a/hotspot/test/compiler/jvmci/events/JvmciShutdownEventTest.java b/hotspot/test/compiler/jvmci/events/JvmciShutdownEventTest.java
index 2c2493221ad..c5c5a19ddde 100644
--- a/hotspot/test/compiler/jvmci/events/JvmciShutdownEventTest.java
+++ b/hotspot/test/compiler/jvmci/events/JvmciShutdownEventTest.java
@@ -36,7 +36,7 @@
  *        compiler.jvmci.events.JvmciShutdownEventTest
  * @run main jdk.test.lib.FileInstaller ../common/services/ ./META-INF/services/
  * @run main jdk.test.lib.FileInstaller ./JvmciShutdownEventTest.config
- *     ./META-INF/services/jdk.vm.ci.hotspot.HotSpotVMEventListener
+ *     ./META-INF/services/jdk.vm.ci.hotspot.services.HotSpotVMEventListener
  * @run main ClassFileInstaller
  *     compiler.jvmci.common.JVMCIHelpers$EmptyHotspotCompiler
  *     compiler.jvmci.common.JVMCIHelpers$EmptyCompilerFactory

From 32a12da3bf7e78b2cef0c40ec4933e2165a161dc Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Tue, 10 May 2016 11:48:06 +0200
Subject: [PATCH 064/228] 8152311: [JVMCI] allow JVMCI compiler to change the
 compilation policy for a method

Reviewed-by: kvn, never
---
 .../vm/ci/hotspot/HotSpotJVMCIRuntime.java    | 35 ++++++++-
 .../jdk/vm/ci/hotspot/HotSpotVMConfig.java    |  8 ++
 .../services/HotSpotJVMCICompilerFactory.java | 76 +++++++++++++++++++
 .../services/JVMCICompilerFactory.java        | 13 ----
 hotspot/src/share/vm/jvmci/jvmciCompiler.cpp  |  9 +++
 hotspot/src/share/vm/jvmci/jvmciCompiler.hpp  |  6 ++
 .../src/share/vm/jvmci/jvmciJavaClasses.hpp   | 31 ++++----
 hotspot/src/share/vm/jvmci/jvmciRuntime.cpp   | 64 ++++++++++++++++
 hotspot/src/share/vm/jvmci/jvmciRuntime.hpp   | 31 ++++++--
 .../src/share/vm/jvmci/vmStructs_jvmci.cpp    |  7 ++
 .../src/share/vm/jvmci/vmSymbols_jvmci.hpp    |  2 +
 .../vm/runtime/advancedThresholdPolicy.cpp    | 25 ++++--
 .../vm/runtime/advancedThresholdPolicy.hpp    |  4 +-
 .../vm/runtime/simpleThresholdPolicy.cpp      | 24 ++++--
 .../vm/runtime/simpleThresholdPolicy.hpp      |  4 +-
 hotspot/src/share/vm/runtime/thread.cpp       |  1 +
 hotspot/src/share/vm/runtime/thread.hpp       |  5 ++
 17 files changed, 293 insertions(+), 52 deletions(-)
 create mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/services/HotSpotJVMCICompilerFactory.java

diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
index 8da416f1840..58d221e7bae 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
@@ -42,6 +42,7 @@ import jdk.vm.ci.code.CompilationRequestResult;
 import jdk.vm.ci.code.CompiledCode;
 import jdk.vm.ci.code.InstalledCode;
 import jdk.vm.ci.common.JVMCIError;
+import jdk.vm.ci.hotspot.services.HotSpotJVMCICompilerFactory;
 import jdk.vm.ci.hotspot.services.HotSpotVMEventListener;
 import jdk.vm.ci.inittimer.InitTimer;
 import jdk.vm.ci.inittimer.SuppressFBWarnings;
@@ -52,6 +53,7 @@ import jdk.vm.ci.meta.ResolvedJavaType;
 import jdk.vm.ci.runtime.JVMCI;
 import jdk.vm.ci.runtime.JVMCIBackend;
 import jdk.vm.ci.runtime.JVMCICompiler;
+import jdk.vm.ci.runtime.services.JVMCICompilerFactory;
 import jdk.vm.ci.services.Services;
 import jdk.internal.misc.VM;
 
@@ -204,13 +206,25 @@ public final class HotSpotJVMCIRuntime implements HotSpotJVMCIRuntimeProvider, H
     protected final HotSpotVMConfig config;
     private final JVMCIBackend hostBackend;
 
+    private final JVMCICompilerFactory compilerFactory;
+    private final HotSpotJVMCICompilerFactory hsCompilerFactory;
     private volatile JVMCICompiler compiler;
     protected final JVMCIMetaAccessContext metaAccessContext;
 
+    /**
+     * Stores the result of {@link HotSpotJVMCICompilerFactory#getCompilationLevelAdjustment} so
+     * that it can be read from the VM.
+     */
+    @SuppressWarnings("unused") private final int compilationLevelAdjustment;
+
     private final Map<Class<? extends Architecture>, JVMCIBackend> backends = new HashMap<>();
 
     private final Iterable<HotSpotVMEventListener> vmEventListeners;
 
+    /**
+     * Stores the result of {@link HotSpotJVMCICompilerFactory#getTrivialPrefixes()} so that it can
+     * be read from the VM.
+     */
     @SuppressWarnings("unused") private final String[] trivialPrefixes;
 
     @SuppressWarnings("try")
@@ -259,7 +273,16 @@ public final class HotSpotJVMCIRuntime implements HotSpotJVMCIRuntimeProvider, H
             printConfig(config, compilerToVm);
         }
 
-        trivialPrefixes = HotSpotJVMCICompilerConfig.getCompilerFactory().getTrivialPrefixes();
+        compilerFactory = HotSpotJVMCICompilerConfig.getCompilerFactory();
+        if (compilerFactory instanceof HotSpotJVMCICompilerFactory) {
+            hsCompilerFactory = (HotSpotJVMCICompilerFactory) compilerFactory;
+            trivialPrefixes = hsCompilerFactory.getTrivialPrefixes();
+            compilationLevelAdjustment = hsCompilerFactory.getCompilationLevelAdjustment(config);
+        } else {
+            hsCompilerFactory = null;
+            trivialPrefixes = null;
+            compilationLevelAdjustment = 0;
+        }
     }
 
     private JVMCIBackend registerBackend(JVMCIBackend backend) {
@@ -289,7 +312,7 @@ public final class HotSpotJVMCIRuntime implements HotSpotJVMCIRuntimeProvider, H
         if (compiler == null) {
             synchronized (this) {
                 if (compiler == null) {
-                    compiler = HotSpotJVMCICompilerConfig.getCompilerFactory().createCompiler(this);
+                    compiler = compilerFactory.createCompiler(this);
                 }
             }
         }
@@ -328,6 +351,14 @@ public final class HotSpotJVMCIRuntime implements HotSpotJVMCIRuntimeProvider, H
         return Collections.unmodifiableMap(backends);
     }
 
+    /**
+     * Called from the VM.
+     */
+    @SuppressWarnings({"unused"})
+    private int adjustCompilationLevel(Class<?> declaringClass, String name, String signature, boolean isOsr, int level) {
+        return hsCompilerFactory.adjustCompilationLevel(config, declaringClass, name, signature, isOsr, level);
+    }
+
     /**
      * Called from the VM.
      */
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java
index 1f7ffc18a71..1fa64cb19b3 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java
@@ -1256,8 +1256,16 @@ public class HotSpotVMConfig {
     @HotSpotVMField(name = "nmethod::_verified_entry_point", type = "address", get = HotSpotVMField.Type.OFFSET) @Stable public int nmethodEntryOffset;
     @HotSpotVMField(name = "nmethod::_comp_level", type = "int", get = HotSpotVMField.Type.OFFSET) @Stable public int nmethodCompLevelOffset;
 
+    @HotSpotVMConstant(name = "CompLevel_none") @Stable public int compilationLevelNone;
+    @HotSpotVMConstant(name = "CompLevel_simple") @Stable public int compilationLevelSimple;
+    @HotSpotVMConstant(name = "CompLevel_limited_profile") @Stable public int compilationLevelLimitedProfile;
+    @HotSpotVMConstant(name = "CompLevel_full_profile") @Stable public int compilationLevelFullProfile;
     @HotSpotVMConstant(name = "CompLevel_full_optimization") @Stable public int compilationLevelFullOptimization;
 
+    @HotSpotVMConstant(name = "JVMCIRuntime::none") @Stable public int compLevelAdjustmentNone;
+    @HotSpotVMConstant(name = "JVMCIRuntime::by_holder") @Stable public int compLevelAdjustmentByHolder;
+    @HotSpotVMConstant(name = "JVMCIRuntime::by_full_signature") @Stable public int compLevelAdjustmentByFullSignature;
+
     @HotSpotVMConstant(name = "InvocationEntryBci") @Stable public int invocationEntryBci;
 
     @HotSpotVMField(name = "JVMCIEnv::_task", type = "CompileTask*", get = HotSpotVMField.Type.OFFSET) @Stable public int jvmciEnvTaskOffset;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/services/HotSpotJVMCICompilerFactory.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/services/HotSpotJVMCICompilerFactory.java
new file mode 100644
index 00000000000..6b7d48bec07
--- /dev/null
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/services/HotSpotJVMCICompilerFactory.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2016, 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.services;
+
+import jdk.vm.ci.hotspot.HotSpotVMConfig;
+import jdk.vm.ci.runtime.services.JVMCICompilerFactory;
+
+/**
+ * HotSpot extensions to {@link JVMCICompilerFactory}.
+ */
+public abstract class HotSpotJVMCICompilerFactory extends JVMCICompilerFactory {
+
+    /**
+     * Gets 0 or more prefixes identifying classes that should by compiled by C1 in simple mode
+     * (i.e., {@code CompLevel_simple}) when HotSpot is running with tiered compilation. The
+     * prefixes should be class or package names using "/" as the separator, e.g. "jdk/vm/ci".
+     *
+     * @return 0 or more Strings identifying packages that should by compiled by the first tier only
+     *         or null if no redirection to C1 should be performed.
+     */
+    public String[] getTrivialPrefixes() {
+        return null;
+    }
+
+    /**
+     * Determines if this object may want to adjust the compilation level for a method that is being
+     * scheduled by the VM for compilation. The legal return values and their meanings are:
+     * <ul>
+     * <li>0 - no adjustment</li>
+     * <li>1 - adjust based on declaring class of method</li>
+     * <li>2 - adjust based on declaring class, name and signature of method</li>
+     * </ul>
+     */
+    public int getCompilationLevelAdjustment(HotSpotVMConfig config) {
+        return config.compLevelAdjustmentNone;
+    }
+
+    /**
+     * Potentially modifies the compilation level currently selected by the VM compilation policy
+     * for a method.
+     *
+     * @param config object for reading HotSpot {@code CompLevel} enum values
+     * @param declaringClass the class in which the method is declared
+     * @param name the name of the method or {@code null} depending on the value that was returned
+     *            by {@link #getCompilationLevelAdjustment(HotSpotVMConfig)}
+     * @param signature the signature of the method or {@code null} depending on the value that was
+     *            returned by {@link #getCompilationLevelAdjustment(HotSpotVMConfig)}
+     * @param isOsr specifies if the compilation being scheduled in an OSR compilation
+     * @param level the compilation level currently selected by the VM compilation policy
+     * @return the compilation level to use for the compilation being scheduled (must be a valid
+     *         {@code CompLevel} enum value)
+     */
+    public int adjustCompilationLevel(HotSpotVMConfig config, Class<?> declaringClass, String name, String signature, boolean isOsr, int level) {
+        throw new InternalError("Should not reach here");
+    }
+}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/services/JVMCICompilerFactory.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/services/JVMCICompilerFactory.java
index 2c441ac29a1..d18ea2db104 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/services/JVMCICompilerFactory.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/services/JVMCICompilerFactory.java
@@ -70,17 +70,4 @@ public abstract class JVMCICompilerFactory {
      * Create a new instance of a {@link JVMCICompiler}.
      */
     public abstract JVMCICompiler createCompiler(JVMCIRuntime runtime);
-
-    /**
-     * In a tiered system it might be advantageous for startup to keep the JVMCI compiler from
-     * compiling itself so provide a hook to request that certain packages are compiled only by an
-     * optimizing first tier. The prefixes should class or package names using / as the separator,
-     * i.e. jdk/vm/ci for instance.
-     *
-     * @return 0 or more Strings identifying packages that should by compiled by the first tier only
-     *         or null if no redirection to C1 should be performed.
-     */
-    public String[] getTrivialPrefixes() {
-        return null;
-    }
 }
diff --git a/hotspot/src/share/vm/jvmci/jvmciCompiler.cpp b/hotspot/src/share/vm/jvmci/jvmciCompiler.cpp
index 8b34d14e589..cc79abe1854 100644
--- a/hotspot/src/share/vm/jvmci/jvmciCompiler.cpp
+++ b/hotspot/src/share/vm/jvmci/jvmciCompiler.cpp
@@ -189,6 +189,15 @@ void JVMCICompiler::compile_method(const methodHandle& method, int entry_bci, JV
   }
 }
 
+CompLevel JVMCIRuntime::adjust_comp_level(methodHandle method, bool is_osr, CompLevel level, JavaThread* thread) {
+  if (!thread->adjusting_comp_level()) {
+    thread->set_adjusting_comp_level(true);
+    level = adjust_comp_level_inner(method, is_osr, level, thread);
+    thread->set_adjusting_comp_level(false);
+  }
+  return level;
+}
+
 /**
  * Aborts the VM due to an unexpected exception.
  */
diff --git a/hotspot/src/share/vm/jvmci/jvmciCompiler.hpp b/hotspot/src/share/vm/jvmci/jvmciCompiler.hpp
index 44fbc48ea2d..22ff75ac571 100644
--- a/hotspot/src/share/vm/jvmci/jvmciCompiler.hpp
+++ b/hotspot/src/share/vm/jvmci/jvmciCompiler.hpp
@@ -68,8 +68,14 @@ public:
   // Initialization
   virtual void initialize();
 
+  /**
+   * Initialize the compile queue with the methods in java.lang.Object and
+   * then wait until the queue is empty.
+   */
   void bootstrap();
 
+  bool is_bootstrapping() const { return _bootstrapping; }
+
   // Compilation entry point for methods
   virtual void compile_method(ciEnv* env, ciMethod* target, int entry_bci, DirectiveSet* directive);
 
diff --git a/hotspot/src/share/vm/jvmci/jvmciJavaClasses.hpp b/hotspot/src/share/vm/jvmci/jvmciJavaClasses.hpp
index 0988998b599..5430a9fe6ed 100644
--- a/hotspot/src/share/vm/jvmci/jvmciJavaClasses.hpp
+++ b/hotspot/src/share/vm/jvmci/jvmciJavaClasses.hpp
@@ -33,7 +33,7 @@ class JVMCIJavaClasses : AllStatic {
   static void compute_offsets(TRAPS);
 };
 
-/* This macro defines the structure of the CompilationResult - classes.
+/* This macro defines the structure of the JVMCI classes accessed from VM code.
  * It will generate classes with accessors similar to javaClasses.hpp, but with specializations for oops, Handles and jni handles.
  *
  * The public interface of these classes will look like this:
@@ -219,7 +219,7 @@ class JVMCIJavaClasses : AllStatic {
     boolean_field(HotSpotObjectConstantImpl, compressed)                                                                                                       \
   end_class                                                                                                                                                    \
   start_class(HotSpotMetaspaceConstantImpl)                                                                                                                    \
-    oop_field(HotSpotMetaspaceConstantImpl, metaspaceObject, "Ljdk/vm/ci/hotspot/MetaspaceWrapperObject;")                                            \
+    oop_field(HotSpotMetaspaceConstantImpl, metaspaceObject, "Ljdk/vm/ci/hotspot/MetaspaceWrapperObject;")                                                     \
     boolean_field(HotSpotMetaspaceConstantImpl, compressed)                                                                                                    \
   end_class                                                                                                                                                    \
   start_class(HotSpotSentinelConstant)                                                                                                                         \
@@ -279,24 +279,25 @@ class JVMCIJavaClasses : AllStatic {
     objArrayOop_field(HotSpotStackFrameReference, locals, "[Ljava/lang/Object;")                                                                               \
     typeArrayOop_field(HotSpotStackFrameReference, localIsVirtual, "[Z")                                                                                       \
   end_class                                                                                                                                                    \
-  start_class(HotSpotMetaData) \
-    typeArrayOop_field(HotSpotMetaData, pcDescBytes, "[B") \
-    typeArrayOop_field(HotSpotMetaData, scopesDescBytes, "[B") \
-    typeArrayOop_field(HotSpotMetaData, relocBytes, "[B") \
-    typeArrayOop_field(HotSpotMetaData, exceptionBytes, "[B") \
-    typeArrayOop_field(HotSpotMetaData, oopMaps, "[B") \
-    objArrayOop_field(HotSpotMetaData, metadata, "[Ljava/lang/String;") \
-  end_class \
-  start_class(HotSpotOopMap) \
-    int_field(HotSpotOopMap, offset) \
-    int_field(HotSpotOopMap, count) \
-    typeArrayOop_field(HotSpotOopMap, data, "[B") \
+  start_class(HotSpotMetaData)                                                                                                                                 \
+    typeArrayOop_field(HotSpotMetaData, pcDescBytes, "[B")                                                                                                     \
+    typeArrayOop_field(HotSpotMetaData, scopesDescBytes, "[B")                                                                                                 \
+    typeArrayOop_field(HotSpotMetaData, relocBytes, "[B")                                                                                                      \
+    typeArrayOop_field(HotSpotMetaData, exceptionBytes, "[B")                                                                                                  \
+    typeArrayOop_field(HotSpotMetaData, oopMaps, "[B")                                                                                                         \
+    objArrayOop_field(HotSpotMetaData, metadata, "[Ljava/lang/String;")                                                                                        \
+  end_class                                                                                                                                                    \
+  start_class(HotSpotOopMap)                                                                                                                                   \
+    int_field(HotSpotOopMap, offset)                                                                                                                           \
+    int_field(HotSpotOopMap, count)                                                                                                                            \
+    typeArrayOop_field(HotSpotOopMap, data, "[B")                                                                                                              \
   end_class                                                                                                                                                    \
   start_class(HotSpotConstantPool)                                                                                                                             \
     long_field(HotSpotConstantPool, metaspaceConstantPool)                                                                                                     \
   end_class                                                                                                                                                    \
   start_class(HotSpotJVMCIRuntime)                                                                                                                             \
     objArrayOop_field(HotSpotJVMCIRuntime, trivialPrefixes, "[Ljava/lang/String;")                                                                             \
+    int_field(HotSpotJVMCIRuntime, compilationLevelAdjustment)                                                                                                 \
   end_class                                                                                                                                                    \
   /* end*/
 
@@ -309,7 +310,7 @@ class name : AllStatic {
         assert(obj->is_a(SystemDictionary::name##_klass()), "wrong class, " #name " expected, found %s", obj->klass()->external_name());                       \
         assert(offset != 0, "must be valid offset");                                                                                                           \
     }                                                                                                                                                          \
-    static void compute_offsets(TRAPS);                                                                                                                             \
+    static void compute_offsets(TRAPS);                                                                                                                        \
   public:                                                                                                                                                      \
     static InstanceKlass* klass() { return SystemDictionary::name##_klass(); }
 
diff --git a/hotspot/src/share/vm/jvmci/jvmciRuntime.cpp b/hotspot/src/share/vm/jvmci/jvmciRuntime.cpp
index 219ad61d9f4..d5bc051563b 100644
--- a/hotspot/src/share/vm/jvmci/jvmciRuntime.cpp
+++ b/hotspot/src/share/vm/jvmci/jvmciRuntime.cpp
@@ -54,6 +54,7 @@ bool JVMCIRuntime::_HotSpotJVMCIRuntime_initialized = false;
 bool JVMCIRuntime::_well_known_classes_initialized = false;
 int JVMCIRuntime::_trivial_prefixes_count = 0;
 char** JVMCIRuntime::_trivial_prefixes = NULL;
+JVMCIRuntime::CompLevelAdjustment JVMCIRuntime::_comp_level_adjustment = JVMCIRuntime::none;
 bool JVMCIRuntime::_shutdown_called = false;
 
 BasicType JVMCIRuntime::kindToBasicType(Handle kind, TRAPS) {
@@ -666,6 +667,11 @@ void JVMCIRuntime::initialize_HotSpotJVMCIRuntime(TRAPS) {
       _trivial_prefixes = prefixes;
       _trivial_prefixes_count = trivial_prefixes->length();
     }
+    int adjustment = HotSpotJVMCIRuntime::compilationLevelAdjustment(result);
+    assert(adjustment >= JVMCIRuntime::none &&
+           adjustment <= JVMCIRuntime::by_full_signature,
+           "compilation level adjustment out of bounds");
+    _comp_level_adjustment = (CompLevelAdjustment) adjustment;
     _HotSpotJVMCIRuntime_initialized = true;
     _HotSpotJVMCIRuntime_instance = JNIHandles::make_global(result());
   }
@@ -803,6 +809,64 @@ void JVMCIRuntime::shutdown(TRAPS) {
   }
 }
 
+CompLevel JVMCIRuntime::adjust_comp_level_inner(methodHandle method, bool is_osr, CompLevel level, JavaThread* thread) {
+  JVMCICompiler* compiler = JVMCICompiler::instance(thread);
+  if (compiler != NULL && compiler->is_bootstrapping()) {
+    return level;
+  }
+  if (!is_HotSpotJVMCIRuntime_initialized() || !_comp_level_adjustment) {
+    // JVMCI cannot participate in compilation scheduling until
+    // JVMCI is initialized and indicates it wants to participate.
+    return level;
+  }
+
+#define CHECK_RETURN THREAD); \
+if (HAS_PENDING_EXCEPTION) { \
+  Handle exception(THREAD, PENDING_EXCEPTION); \
+  CLEAR_PENDING_EXCEPTION; \
+\
+  java_lang_Throwable::java_printStackTrace(exception, THREAD); \
+  if (HAS_PENDING_EXCEPTION) { \
+    CLEAR_PENDING_EXCEPTION; \
+  } \
+  return level; \
+} \
+(void)(0
+
+
+  Thread* THREAD = thread;
+  HandleMark hm;
+  Handle receiver = JVMCIRuntime::get_HotSpotJVMCIRuntime(CHECK_RETURN);
+  Handle name;
+  Handle sig;
+  if (_comp_level_adjustment == JVMCIRuntime::by_full_signature) {
+    name = java_lang_String::create_from_symbol(method->name(), CHECK_RETURN);
+    sig = java_lang_String::create_from_symbol(method->signature(), CHECK_RETURN);
+  } else {
+    name = Handle();
+    sig = Handle();
+  }
+
+  JavaValue result(T_INT);
+  JavaCallArguments args;
+  args.push_oop(receiver);
+  args.push_oop(method->method_holder()->java_mirror());
+  args.push_oop(name());
+  args.push_oop(sig());
+  args.push_int(is_osr);
+  args.push_int(level);
+  JavaCalls::call_special(&result, receiver->klass(), vmSymbols::adjustCompilationLevel_name(),
+                          vmSymbols::adjustCompilationLevel_signature(), &args, CHECK_RETURN);
+
+  int comp_level = result.get_jint();
+  if (comp_level < CompLevel_none || comp_level > CompLevel_full_optimization) {
+    assert(false, "compilation level out of bounds");
+    return level;
+  }
+  return (CompLevel) comp_level;
+#undef CHECK_RETURN
+}
+
 bool JVMCIRuntime::treat_as_trivial(Method* method) {
   if (_HotSpotJVMCIRuntime_initialized) {
     for (int i = 0; i < _trivial_prefixes_count; i++) {
diff --git a/hotspot/src/share/vm/jvmci/jvmciRuntime.hpp b/hotspot/src/share/vm/jvmci/jvmciRuntime.hpp
index d3deb1d8ff5..23091b08929 100644
--- a/hotspot/src/share/vm/jvmci/jvmciRuntime.hpp
+++ b/hotspot/src/share/vm/jvmci/jvmciRuntime.hpp
@@ -66,6 +66,16 @@ protected:
 };
 
 class JVMCIRuntime: public AllStatic {
+ public:
+  // Constants describing whether JVMCI wants to be able to adjust the compilation
+  // level selected for a method by the VM compilation policy and if so, based on
+  // what information about the method being schedule for compilation.
+  enum CompLevelAdjustment {
+     none = 0,             // no adjustment
+     by_holder = 1,        // adjust based on declaring class of method
+     by_full_signature = 2 // adjust based on declaring class, name and signature of method
+  };
+
  private:
   static jobject _HotSpotJVMCIRuntime_instance;
   static bool _HotSpotJVMCIRuntime_initialized;
@@ -74,14 +84,11 @@ class JVMCIRuntime: public AllStatic {
   static int _trivial_prefixes_count;
   static char** _trivial_prefixes;
 
+  static CompLevelAdjustment _comp_level_adjustment;
+
   static bool _shutdown_called;
 
-  /**
-   * Instantiates a service object, calls its default constructor and returns it.
-   *
-   * @param name the name of a class implementing jdk.vm.ci.service.Service
-   */
-  static Handle create_Service(const char* name, TRAPS);
+  static CompLevel adjust_comp_level_inner(methodHandle method, bool is_osr, CompLevel level, JavaThread* thread);
 
  public:
   static bool is_HotSpotJVMCIRuntime_initialized() {
@@ -126,6 +133,18 @@ class JVMCIRuntime: public AllStatic {
 
   static bool treat_as_trivial(Method* method);
 
+  /**
+   * Lets JVMCI modify the compilation level currently selected for a method by
+   * the VM compilation policy.
+   *
+   * @param method the method being scheduled for compilation
+   * @param is_osr specifies if the compilation is an OSR compilation
+   * @param level the compilation level currently selected by the VM compilation policy
+   * @param thread the current thread
+   * @return the compilation level to use for the compilation
+   */
+  static CompLevel adjust_comp_level(methodHandle method, bool is_osr, CompLevel level, JavaThread* thread);
+
   static BasicType kindToBasicType(Handle kind, TRAPS);
 
   // The following routines are all called from compiled JVMCI code
diff --git a/hotspot/src/share/vm/jvmci/vmStructs_jvmci.cpp b/hotspot/src/share/vm/jvmci/vmStructs_jvmci.cpp
index a40a3e11867..e35345b42a8 100644
--- a/hotspot/src/share/vm/jvmci/vmStructs_jvmci.cpp
+++ b/hotspot/src/share/vm/jvmci/vmStructs_jvmci.cpp
@@ -308,6 +308,10 @@
   declare_preprocessor_constant("FIELDINFO_TAG_SIZE", FIELDINFO_TAG_SIZE) \
   declare_preprocessor_constant("STACK_BIAS", STACK_BIAS)                 \
                                                                           \
+  declare_constant(CompLevel_none)                                        \
+  declare_constant(CompLevel_simple)                                      \
+  declare_constant(CompLevel_limited_profile)                             \
+  declare_constant(CompLevel_full_profile)                                \
   declare_constant(CompLevel_full_optimization)                           \
   declare_constant(HeapWordSize)                                          \
   declare_constant(InvocationEntryBci)                                    \
@@ -464,6 +468,9 @@
   declare_constant(JVMCIEnv::dependencies_invalid)                        \
   declare_constant(JVMCIEnv::cache_full)                                  \
   declare_constant(JVMCIEnv::code_too_large)                              \
+  declare_constant(JVMCIRuntime::none)                                    \
+  declare_constant(JVMCIRuntime::by_holder)                               \
+  declare_constant(JVMCIRuntime::by_full_signature)                       \
                                                                           \
   declare_constant(Klass::_lh_neutral_value)                              \
   declare_constant(Klass::_lh_instance_slow_path_bit)                     \
diff --git a/hotspot/src/share/vm/jvmci/vmSymbols_jvmci.hpp b/hotspot/src/share/vm/jvmci/vmSymbols_jvmci.hpp
index 49e141715b7..62a96787316 100644
--- a/hotspot/src/share/vm/jvmci/vmSymbols_jvmci.hpp
+++ b/hotspot/src/share/vm/jvmci/vmSymbols_jvmci.hpp
@@ -89,6 +89,8 @@
   template(jdk_vm_ci_code_site_Site,                              "jdk/vm/ci/code/site/Site")                              \
   template(jdk_vm_ci_code_site_InfopointReason,                   "jdk/vm/ci/code/site/InfopointReason")                   \
   template(jdk_vm_ci_common_JVMCIError,                           "jdk/vm/ci/common/JVMCIError")                           \
+  template(adjustCompilationLevel_name,                           "adjustCompilationLevel")                                \
+  template(adjustCompilationLevel_signature,                      "(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;ZI)I") \
   template(compileMethod_name,                                    "compileMethod")                                         \
   template(compileMethod_signature,                               "(Ljdk/vm/ci/hotspot/HotSpotResolvedJavaMethod;IJI)Ljdk/vm/ci/code/CompilationRequestResult;") \
   template(fromMetaspace_name,                                    "fromMetaspace")                                         \
diff --git a/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp b/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp
index f8f6a454548..fc1ea544cce 100644
--- a/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp
+++ b/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp
@@ -27,6 +27,9 @@
 #include "compiler/compileTask.hpp"
 #include "runtime/advancedThresholdPolicy.hpp"
 #include "runtime/simpleThresholdPolicy.inline.hpp"
+#if INCLUDE_JVMCI
+#include "jvmci/jvmciRuntime.hpp"
+#endif
 
 #ifdef TIERED
 // Print an event.
@@ -453,7 +456,7 @@ CompLevel AdvancedThresholdPolicy::common(Predicate p, Method* method, CompLevel
 }
 
 // Determine if a method should be compiled with a normal entry point at a different level.
-CompLevel AdvancedThresholdPolicy::call_event(Method* method, CompLevel cur_level) {
+CompLevel AdvancedThresholdPolicy::call_event(Method* method, CompLevel cur_level, JavaThread * thread) {
   CompLevel osr_level = MIN2((CompLevel) method->highest_osr_comp_level(),
                              common(&AdvancedThresholdPolicy::loop_predicate, method, cur_level, true));
   CompLevel next_level = common(&AdvancedThresholdPolicy::call_predicate, method, cur_level);
@@ -470,11 +473,16 @@ CompLevel AdvancedThresholdPolicy::call_event(Method* method, CompLevel cur_leve
   } else {
     next_level = MAX2(osr_level, next_level);
   }
+#if INCLUDE_JVMCI
+  if (UseJVMCICompiler) {
+    next_level = JVMCIRuntime::adjust_comp_level(method, false, next_level, thread);
+  }
+#endif
   return next_level;
 }
 
 // Determine if we should do an OSR compilation of a given method.
-CompLevel AdvancedThresholdPolicy::loop_event(Method* method, CompLevel cur_level) {
+CompLevel AdvancedThresholdPolicy::loop_event(Method* method, CompLevel cur_level, JavaThread * thread) {
   CompLevel next_level = common(&AdvancedThresholdPolicy::loop_predicate, method, cur_level, true);
   if (cur_level == CompLevel_none) {
     // If there is a live OSR method that means that we deopted to the interpreter
@@ -484,6 +492,11 @@ CompLevel AdvancedThresholdPolicy::loop_event(Method* method, CompLevel cur_leve
       return osr_level;
     }
   }
+#if INCLUDE_JVMCI
+  if (UseJVMCICompiler) {
+    next_level = JVMCIRuntime::adjust_comp_level(method, true, next_level, thread);
+  }
+#endif
   return next_level;
 }
 
@@ -501,7 +514,7 @@ void AdvancedThresholdPolicy::method_invocation_event(const methodHandle& mh, co
     create_mdo(mh, thread);
   }
   if (is_compilation_enabled() && !CompileBroker::compilation_is_in_queue(mh)) {
-    CompLevel next_level = call_event(mh(), level);
+    CompLevel next_level = call_event(mh(), level, thread);
     if (next_level != level) {
       compile(mh, InvocationEntryBci, next_level, thread);
     }
@@ -521,7 +534,7 @@ void AdvancedThresholdPolicy::method_back_branch_event(const methodHandle& mh, c
   }
 
   if (is_compilation_enabled()) {
-    CompLevel next_osr_level = loop_event(imh(), level);
+    CompLevel next_osr_level = loop_event(imh(), level, thread);
     CompLevel max_osr_level = (CompLevel)imh->highest_osr_comp_level();
     // At the very least compile the OSR version
     if (!CompileBroker::compilation_is_in_queue(imh) && (next_osr_level != level)) {
@@ -534,7 +547,7 @@ void AdvancedThresholdPolicy::method_back_branch_event(const methodHandle& mh, c
     if (mh() != imh()) { // If there is an enclosing method
       guarantee(nm != NULL, "Should have nmethod here");
       cur_level = comp_level(mh());
-      next_level = call_event(mh(), cur_level);
+      next_level = call_event(mh(), cur_level, thread);
 
       if (max_osr_level == CompLevel_full_optimization) {
         // The inlinee OSRed to full opt, we need to modify the enclosing method to avoid deopts
@@ -569,7 +582,7 @@ void AdvancedThresholdPolicy::method_back_branch_event(const methodHandle& mh, c
       }
     } else {
       cur_level = comp_level(imh());
-      next_level = call_event(imh(), cur_level);
+      next_level = call_event(imh(), cur_level, thread);
       if (!CompileBroker::compilation_is_in_queue(imh) && (next_level != cur_level)) {
         compile(imh, InvocationEntryBci, next_level, thread);
       }
diff --git a/hotspot/src/share/vm/runtime/advancedThresholdPolicy.hpp b/hotspot/src/share/vm/runtime/advancedThresholdPolicy.hpp
index 0e8494fc020..c96b5e71461 100644
--- a/hotspot/src/share/vm/runtime/advancedThresholdPolicy.hpp
+++ b/hotspot/src/share/vm/runtime/advancedThresholdPolicy.hpp
@@ -174,10 +174,10 @@ class AdvancedThresholdPolicy : public SimpleThresholdPolicy {
   // Transition functions.
   // call_event determines if a method should be compiled at a different
   // level with a regular invocation entry.
-  CompLevel call_event(Method* method, CompLevel cur_level);
+  CompLevel call_event(Method* method, CompLevel cur_level, JavaThread * thread);
   // loop_event checks if a method should be OSR compiled at a different
   // level.
-  CompLevel loop_event(Method* method, CompLevel cur_level);
+  CompLevel loop_event(Method* method, CompLevel cur_level, JavaThread * thread);
   // Has a method been long around?
   // We don't remove old methods from the compile queue even if they have
   // very low activity (see select_task()).
diff --git a/hotspot/src/share/vm/runtime/simpleThresholdPolicy.cpp b/hotspot/src/share/vm/runtime/simpleThresholdPolicy.cpp
index 40f4d1aaeee..4fbfd0033f9 100644
--- a/hotspot/src/share/vm/runtime/simpleThresholdPolicy.cpp
+++ b/hotspot/src/share/vm/runtime/simpleThresholdPolicy.cpp
@@ -29,6 +29,9 @@
 #include "runtime/simpleThresholdPolicy.hpp"
 #include "runtime/simpleThresholdPolicy.inline.hpp"
 #include "code/scopeDesc.hpp"
+#if INCLUDE_JVMCI
+#include "jvmci/jvmciRuntime.hpp"
+#endif
 
 
 void SimpleThresholdPolicy::print_counters(const char* prefix, methodHandle mh) {
@@ -354,7 +357,7 @@ CompLevel SimpleThresholdPolicy::common(Predicate p, Method* method, CompLevel c
 }
 
 // Determine if a method should be compiled with a normal entry point at a different level.
-CompLevel SimpleThresholdPolicy::call_event(Method* method,  CompLevel cur_level) {
+CompLevel SimpleThresholdPolicy::call_event(Method* method,  CompLevel cur_level, JavaThread* thread) {
   CompLevel osr_level = MIN2((CompLevel) method->highest_osr_comp_level(),
                              common(&SimpleThresholdPolicy::loop_predicate, method, cur_level));
   CompLevel next_level = common(&SimpleThresholdPolicy::call_predicate, method, cur_level);
@@ -371,12 +374,16 @@ CompLevel SimpleThresholdPolicy::call_event(Method* method,  CompLevel cur_level
   } else {
     next_level = MAX2(osr_level, next_level);
   }
-
+#if INCLUDE_JVMCI
+  if (UseJVMCICompiler) {
+    next_level = JVMCIRuntime::adjust_comp_level(method, false, next_level, thread);
+  }
+#endif
   return next_level;
 }
 
 // Determine if we should do an OSR compilation of a given method.
-CompLevel SimpleThresholdPolicy::loop_event(Method* method, CompLevel cur_level) {
+CompLevel SimpleThresholdPolicy::loop_event(Method* method, CompLevel cur_level, JavaThread* thread) {
   CompLevel next_level = common(&SimpleThresholdPolicy::loop_predicate, method, cur_level);
   if (cur_level == CompLevel_none) {
     // If there is a live OSR method that means that we deopted to the interpreter
@@ -386,6 +393,11 @@ CompLevel SimpleThresholdPolicy::loop_event(Method* method, CompLevel cur_level)
       return osr_level;
     }
   }
+#if INCLUDE_JVMCI
+  if (UseJVMCICompiler) {
+    next_level = JVMCIRuntime::adjust_comp_level(method, true, next_level, thread);
+  }
+#endif
   return next_level;
 }
 
@@ -394,7 +406,7 @@ CompLevel SimpleThresholdPolicy::loop_event(Method* method, CompLevel cur_level)
 void SimpleThresholdPolicy::method_invocation_event(const methodHandle& mh, const methodHandle& imh,
                                               CompLevel level, CompiledMethod* nm, JavaThread* thread) {
   if (is_compilation_enabled() && !CompileBroker::compilation_is_in_queue(mh)) {
-    CompLevel next_level = call_event(mh(), level);
+    CompLevel next_level = call_event(mh(), level, thread);
     if (next_level != level) {
       compile(mh, InvocationEntryBci, next_level, thread);
     }
@@ -410,8 +422,8 @@ void SimpleThresholdPolicy::method_back_branch_event(const methodHandle& mh, con
     // Use loop event as an opportunity to also check there's been
     // enough calls.
     CompLevel cur_level = comp_level(mh());
-    CompLevel next_level = call_event(mh(), cur_level);
-    CompLevel next_osr_level = loop_event(mh(), level);
+    CompLevel next_level = call_event(mh(), cur_level, thread);
+    CompLevel next_osr_level = loop_event(mh(), level, thread);
 
     next_level = MAX2(next_level,
                       next_osr_level < CompLevel_full_optimization ? next_osr_level : cur_level);
diff --git a/hotspot/src/share/vm/runtime/simpleThresholdPolicy.hpp b/hotspot/src/share/vm/runtime/simpleThresholdPolicy.hpp
index d2dd9cc971c..9960c14c268 100644
--- a/hotspot/src/share/vm/runtime/simpleThresholdPolicy.hpp
+++ b/hotspot/src/share/vm/runtime/simpleThresholdPolicy.hpp
@@ -51,10 +51,10 @@ class SimpleThresholdPolicy : public CompilationPolicy {
   // Transition functions.
   // call_event determines if a method should be compiled at a different
   // level with a regular invocation entry.
-  CompLevel call_event(Method* method, CompLevel cur_level);
+  CompLevel call_event(Method* method, CompLevel cur_level, JavaThread* thread);
   // loop_event checks if a method should be OSR compiled at a different
   // level.
-  CompLevel loop_event(Method* method, CompLevel cur_level);
+  CompLevel loop_event(Method* method, CompLevel cur_level, JavaThread* thread);
   void print_counters(const char* prefix, methodHandle mh);
 protected:
   int c1_count() const     { return _c1_count; }
diff --git a/hotspot/src/share/vm/runtime/thread.cpp b/hotspot/src/share/vm/runtime/thread.cpp
index f1794e0e692..82043f904e6 100644
--- a/hotspot/src/share/vm/runtime/thread.cpp
+++ b/hotspot/src/share/vm/runtime/thread.cpp
@@ -1449,6 +1449,7 @@ void JavaThread::initialize() {
   _pending_deoptimization = -1;
   _pending_failed_speculation = NULL;
   _pending_transfer_to_interpreter = false;
+  _adjusting_comp_level = false;
   _jvmci._alternate_call_target = NULL;
   assert(_jvmci._implicit_exception_pc == NULL, "must be");
   if (JVMCICounterSize > 0) {
diff --git a/hotspot/src/share/vm/runtime/thread.hpp b/hotspot/src/share/vm/runtime/thread.hpp
index bbbf21b462e..ea0d9683fde 100644
--- a/hotspot/src/share/vm/runtime/thread.hpp
+++ b/hotspot/src/share/vm/runtime/thread.hpp
@@ -928,6 +928,9 @@ class JavaThread: public Thread {
   // Specifies if the DeoptReason for the last uncommon trap was Reason_transfer_to_interpreter
   bool      _pending_transfer_to_interpreter;
 
+  // Guard for re-entrant call to JVMCIRuntime::adjust_comp_level
+  bool      _adjusting_comp_level;
+
   // An object that JVMCI compiled code can use to further describe and
   // uniquely identify the  speculative optimization guarded by the uncommon trap
   oop       _pending_failed_speculation;
@@ -1316,6 +1319,8 @@ class JavaThread: public Thread {
 #if INCLUDE_JVMCI
   int  pending_deoptimization() const             { return _pending_deoptimization; }
   oop  pending_failed_speculation() const         { return _pending_failed_speculation; }
+  bool adjusting_comp_level() const               { return _adjusting_comp_level; }
+  void set_adjusting_comp_level(bool b)           { _adjusting_comp_level = b; }
   bool has_pending_monitorenter() const           { return _pending_monitorenter; }
   void set_pending_monitorenter(bool b)           { _pending_monitorenter = b; }
   void set_pending_deoptimization(int reason)     { _pending_deoptimization = reason; }

From 12675924fcc621594a24564c6dc3f0da2ae9d84c Mon Sep 17 00:00:00 2001
From: Prem Balakrishnan <pkbalakr@openjdk.org>
Date: Tue, 10 May 2016 16:08:21 +0530
Subject: [PATCH 065/228] 6421058: When calls JSpinner.setEditor() the font in
 a JSpinner become is a bold

Reviewed-by: serb, alexsch
---
 .../swing/plaf/basic/BasicSpinnerUI.java      | 10 ++
 .../swing/JSpinner/6421058/bug6421058.java    | 94 +++++++++++++++++++
 2 files changed, 104 insertions(+)
 create mode 100644 jdk/test/javax/swing/JSpinner/6421058/bug6421058.java

diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSpinnerUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSpinnerUI.java
index f6d211f5f9f..5ee8bedcf8e 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSpinnerUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSpinnerUI.java
@@ -210,6 +210,16 @@ public class BasicSpinnerUI extends SpinnerUI
         LookAndFeel.installBorder(spinner, "Spinner.border");
         LookAndFeel.installColorsAndFont(spinner, "Spinner.background", "Spinner.foreground", "Spinner.font");
         LookAndFeel.installProperty(spinner, "opaque", Boolean.TRUE);
+
+        JComponent editor = spinner.getEditor();
+        if (editor instanceof JSpinner.DefaultEditor) {
+            JTextField tf = ((JSpinner.DefaultEditor) editor).getTextField();
+            if (tf != null) {
+                if (tf.getFont() instanceof UIResource) {
+                    tf.setFont(new FontUIResource(spinner.getFont()));
+                }
+            }
+        }
     }
 
 
diff --git a/jdk/test/javax/swing/JSpinner/6421058/bug6421058.java b/jdk/test/javax/swing/JSpinner/6421058/bug6421058.java
new file mode 100644
index 00000000000..d67762b21d7
--- /dev/null
+++ b/jdk/test/javax/swing/JSpinner/6421058/bug6421058.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2016, 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 6421058
+  * @summary Verify font of the text field is changed to the font of
+  *        JSpinner if the font of text field was NOT set by the user
+  * @run main bug6421058
+  */
+
+import java.awt.Font;
+import javax.swing.JFrame;
+import javax.swing.JSpinner;
+import javax.swing.JSpinner.DefaultEditor;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.plaf.UIResource;
+import static javax.swing.UIManager.getInstalledLookAndFeels;
+
+public class bug6421058 implements Runnable {
+
+    public static void main(final String[] args) throws Exception {
+        for (final UIManager.LookAndFeelInfo laf : getInstalledLookAndFeels()) {
+            SwingUtilities.invokeAndWait(() -> setLookAndFeel(laf));
+            SwingUtilities.invokeAndWait(new bug6421058());
+        }
+    }
+
+    @Override
+    public void run() {
+        final JFrame mainFrame = new JFrame();
+        try {
+            testDefaultFont(mainFrame);
+        } finally {
+            mainFrame.dispose();
+        }
+    }
+
+    private static void testDefaultFont(final JFrame frame) {
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+        JSpinner spinner = new JSpinner();
+        frame.add(spinner);
+        frame.setSize(300, 100);
+        frame.setVisible(true);
+
+        final DefaultEditor editor = (DefaultEditor) spinner.getEditor();
+        final Font editorFont = editor.getTextField().getFont();
+
+        /*
+         * Validate that the font of the text field is changed to the
+         * font of JSpinner if the font of text field was not set by the
+         * user.
+         */
+
+        if (!(editorFont instanceof UIResource)) {
+            throw new RuntimeException("Font must be UIResource");
+        }
+        if (!editorFont.equals(spinner.getFont())) {
+            throw new RuntimeException("Wrong FONT");
+        }
+    }
+
+    private static void setLookAndFeel(final UIManager.LookAndFeelInfo laf) {
+        try {
+            UIManager.setLookAndFeel(laf.getClassName());
+        } catch (ClassNotFoundException | InstantiationException |
+                UnsupportedLookAndFeelException | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

From bcec429910a75a9c04bad23cfb06cc2d82f17ebe Mon Sep 17 00:00:00 2001
From: Paul Sandoz <psandoz@openjdk.org>
Date: Wed, 11 May 2016 09:13:45 +0200
Subject: [PATCH 066/228] 8144826: [JVMCI] Remove jdk.vm.ci.hotspot.Stable and
 use jdk.internal.vm.annotation.Stable

Reviewed-by: twisti
---
 jdk/src/java.base/share/classes/module-info.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jdk/src/java.base/share/classes/module-info.java b/jdk/src/java.base/share/classes/module-info.java
index 974654bcce0..a2c4bf17fef 100644
--- a/jdk/src/java.base/share/classes/module-info.java
+++ b/jdk/src/java.base/share/classes/module-info.java
@@ -187,7 +187,8 @@ module java.base {
         jdk.scripting.nashorn,
         jdk.unsupported;
     exports jdk.internal.vm.annotation to
-        jdk.unsupported;
+        jdk.unsupported,
+        jdk.vm.ci;
     exports jdk.internal.util.jar to
         jdk.jartool;
     exports jdk.internal.vm to

From 1917be9572be1fa6672d1ae40329becbfbcd4b8c Mon Sep 17 00:00:00 2001
From: Paul Sandoz <psandoz@openjdk.org>
Date: Wed, 11 May 2016 09:13:49 +0200
Subject: [PATCH 067/228] 8144826: [JVMCI] Remove jdk.vm.ci.hotspot.Stable and
 use jdk.internal.vm.annotation.Stable

Reviewed-by: twisti
---
 .../HotSpotConstantReflectionProvider.java    |  1 +
 .../hotspot/HotSpotResolvedJavaFieldImpl.java |  1 +
 .../jdk/vm/ci/hotspot/HotSpotVMConfig.java    |  1 +
 .../src/jdk/vm/ci/hotspot/Stable.java         | 38 -------------------
 .../share/vm/classfile/classFileParser.cpp    |  7 ----
 .../src/share/vm/jvmci/vmSymbols_jvmci.hpp    |  3 +-
 6 files changed, 4 insertions(+), 47 deletions(-)
 delete mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/Stable.java

diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java
index c957b05e1d5..bd60a98772b 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java
@@ -28,6 +28,7 @@ import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayIndexScale;
 import java.lang.reflect.Array;
 import java.util.Objects;
 
+import jdk.internal.vm.annotation.Stable;
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.Option;
 import jdk.vm.ci.meta.Constant;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java
index 51e803f58df..8bfe7c1fd64 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java
@@ -28,6 +28,7 @@ import static jdk.vm.ci.hotspot.HotSpotVMConfig.config;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 
+import jdk.internal.vm.annotation.Stable;
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.Option;
 import jdk.vm.ci.meta.JavaType;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java
index 1fa64cb19b3..b610b8f699c 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java
@@ -31,6 +31,7 @@ import java.lang.reflect.Modifier;
 import java.util.HashMap;
 import java.util.Iterator;
 
+import jdk.internal.vm.annotation.Stable;
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.hotspotvmconfig.HotSpotVMAddress;
 import jdk.vm.ci.hotspotvmconfig.HotSpotVMConstant;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/Stable.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/Stable.java
deleted file mode 100644
index f313238bf41..00000000000
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/Stable.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2013, 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;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * This annotation functions as an alias for the jdk.internal.vm.annotation.Stable annotation within JVMCI
- * code. It is specially recognized during class file parsing in the same way as that annotation.
- */
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Stable {
-}
diff --git a/hotspot/src/share/vm/classfile/classFileParser.cpp b/hotspot/src/share/vm/classfile/classFileParser.cpp
index 84d6673b860..1e164e4e037 100644
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp
@@ -2004,13 +2004,6 @@ AnnotationCollector::annotation_index(const ClassLoaderData* loader_data,
       if (!privileged)              break;  // only allow in privileged code
       return _method_HotSpotIntrinsicCandidate;
     }
-#if INCLUDE_JVMCI
-    case vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_vm_ci_hotspot_Stable_signature): {
-      if (_location != _in_field)   break;  // only allow for fields
-      if (!privileged)              break;  // only allow in privileged code
-      return _field_Stable;
-    }
-#endif
     case vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_internal_vm_annotation_Stable_signature): {
       if (_location != _in_field)   break;  // only allow for fields
       if (!privileged)              break;  // only allow in privileged code
diff --git a/hotspot/src/share/vm/jvmci/vmSymbols_jvmci.hpp b/hotspot/src/share/vm/jvmci/vmSymbols_jvmci.hpp
index 62a96787316..823ed75023b 100644
--- a/hotspot/src/share/vm/jvmci/vmSymbols_jvmci.hpp
+++ b/hotspot/src/share/vm/jvmci/vmSymbols_jvmci.hpp
@@ -96,8 +96,7 @@
   template(fromMetaspace_name,                                    "fromMetaspace")                                         \
   template(method_fromMetaspace_signature,                        "(J)Ljdk/vm/ci/hotspot/HotSpotResolvedJavaMethod;")      \
   template(constantPool_fromMetaspace_signature,                  "(J)Ljdk/vm/ci/hotspot/HotSpotConstantPool;")            \
-  template(klass_fromMetaspace_signature,                         "(Ljava/lang/Class;)Ljdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl;") \
-  template(jdk_vm_ci_hotspot_Stable_signature,                    "Ljdk/vm/ci/hotspot/Stable;")
+  template(klass_fromMetaspace_signature,                         "(Ljava/lang/Class;)Ljdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl;")
 #endif
 
 #endif // SHARE_VM_JVMCI_VMSYMBOLS_JVMCI_HPP

From 037bd781825c0417cf98b705e9e1b7f8435e8824 Mon Sep 17 00:00:00 2001
From: Roland Schatz <rschatz@openjdk.org>
Date: Wed, 11 May 2016 13:27:56 +0200
Subject: [PATCH 068/228] 8156741: [JVMCI] remove LocationIdentity interface

Reviewed-by: kvn, iveresov
---
 .../hotspot/HotSpotResolvedJavaFieldImpl.java | 42 ----------
 .../src/jdk/vm/ci/meta/LocationIdentity.java  | 78 -------------------
 .../src/jdk/vm/ci/meta/ResolvedJavaField.java |  7 --
 .../runtime/test/TestResolvedJavaField.java   |  9 ---
 4 files changed, 136 deletions(-)
 delete mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LocationIdentity.java

diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java
index 8bfe7c1fd64..9765d274a6e 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java
@@ -32,7 +32,6 @@ import jdk.internal.vm.annotation.Stable;
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.Option;
 import jdk.vm.ci.meta.JavaType;
-import jdk.vm.ci.meta.LocationIdentity;
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ModifiersProvider;
 import jdk.vm.ci.meta.ResolvedJavaField;
@@ -52,43 +51,6 @@ class HotSpotResolvedJavaFieldImpl implements HotSpotResolvedJavaField, HotSpotP
      * This value contains all flags as stored in the VM including internal ones.
      */
     private final int modifiers;
-    private final LocationIdentity locationIdentity = new FieldLocationIdentity(this);
-
-    public static class FieldLocationIdentity extends LocationIdentity {
-        HotSpotResolvedJavaField inner;
-
-        FieldLocationIdentity(HotSpotResolvedJavaFieldImpl inner) {
-            this.inner = inner;
-        }
-
-        @Override
-        public boolean isImmutable() {
-            return false;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj instanceof FieldLocationIdentity) {
-                FieldLocationIdentity fieldLocationIdentity = (FieldLocationIdentity) obj;
-                return inner.equals(fieldLocationIdentity.inner);
-
-            }
-            return false;
-        }
-
-        @Override
-        public int hashCode() {
-            return inner.hashCode();
-        }
-
-        @Override
-        public String toString() {
-            return inner.getName();
-        }
-    }
 
     HotSpotResolvedJavaFieldImpl(HotSpotResolvedObjectTypeImpl holder, String name, JavaType type, long offset, int modifiers) {
         this.holder = holder;
@@ -305,8 +267,4 @@ class HotSpotResolvedJavaFieldImpl implements HotSpotResolvedJavaField, HotSpotP
             }
         }
     }
-
-    public LocationIdentity getLocationIdentity() {
-        return locationIdentity;
-    }
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LocationIdentity.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LocationIdentity.java
deleted file mode 100644
index b63b3dc740a..00000000000
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LocationIdentity.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2011, 2012, 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.IdentityHashMap;
-
-// JaCoCo Exclude
-
-/**
- * Marker interface for location identities. A different location identity of two memory accesses
- * guarantees that the two accesses do not interfere.
- *
- * Clients of {@link LocationIdentity} must use {@link #equals(Object)}, not {@code ==}, when
- * comparing two {@link LocationIdentity} values for equality. Likewise, they must not use
- * {@link IdentityHashMap}s with {@link LocationIdentity} values as keys.
- */
-public abstract class LocationIdentity {
-
-    private static final class AnyLocationIdentity extends LocationIdentity {
-        @Override
-        public boolean isImmutable() {
-            return false;
-        }
-
-        @Override
-        public String toString() {
-            return "ANY_LOCATION";
-        }
-    }
-
-    public static final LocationIdentity ANY_LOCATION = new AnyLocationIdentity();
-
-    public static LocationIdentity any() {
-        return ANY_LOCATION;
-    }
-
-    /**
-     * Denotes a location is unchanging in all cases. Not that this is different than the Java
-     * notion of final which only requires definite assignment.
-     */
-    public abstract boolean isImmutable();
-
-    public final boolean isMutable() {
-        return !isImmutable();
-    }
-
-    public final boolean isAny() {
-        return this == ANY_LOCATION;
-    }
-
-    public final boolean isSingle() {
-        return this != ANY_LOCATION;
-    }
-
-    public final boolean overlaps(LocationIdentity other) {
-        return isAny() || other.isAny() || this.equals(other);
-    }
-}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaField.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaField.java
index 02f8530ffe0..3704909fdb3 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaField.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaField.java
@@ -59,11 +59,4 @@ public interface ResolvedJavaField extends JavaField, ModifiersProvider, Annotat
      * this field.
      */
     ResolvedJavaType getDeclaringClass();
-
-    /**
-     * Returns an object representing the unique location identity of this resolved Java field.
-     *
-     * @return the location identity of the field
-     */
-    LocationIdentity getLocationIdentity();
 }
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java
index defa1997026..61a05eb4235 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java
@@ -50,7 +50,6 @@ import java.util.Map;
 import java.util.Set;
 
 import jdk.vm.ci.meta.JavaConstant;
-import jdk.vm.ci.meta.LocationIdentity;
 import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
@@ -103,14 +102,6 @@ public class TestResolvedJavaField extends FieldUniverse {
         }
     }
 
-    @Test
-    public void getLocationIdentityTest() {
-        for (Map.Entry<Field, ResolvedJavaField> e : fields.entrySet()) {
-            LocationIdentity identity = e.getValue().getLocationIdentity();
-            assertTrue(identity != null);
-        }
-    }
-
     static class ReadConstantValueTestConstants {
         String stringField = "field";
         final String constantStringField = "constantField";

From 1d60ce77a0e169da6f1564a294f842f10e29b699 Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Wed, 11 May 2016 16:40:04 +0000
Subject: [PATCH 069/228] 8153782: [JVMCI] update JVMCI sources to Eclipse
 4.5.2 format style

Reviewed-by: twisti, never
---
 .../src/jdk/vm/ci/code/MemoryBarriers.java    |   4 +-
 .../src/jdk/vm/ci/code/TargetDescription.java |   4 +-
 .../src/jdk/vm/ci/code/package-info.java      |   8 +-
 .../AArch64HotSpotJVMCIBackendFactory.java    |   3 +-
 .../AMD64HotSpotJVMCIBackendFactory.java      |   3 +-
 .../src/jdk/vm/ci/hotspot/CompilerToVM.java   |   4 +-
 .../ci/hotspot/HotSpotMetaAccessProvider.java |   3 +-
 .../src/jdk/vm/ci/hotspot/HotSpotMethod.java  |   2 +-
 .../vm/ci/inittimer/SuppressFBWarnings.java   |   4 +-
 .../ci/meta/ConstantReflectionProvider.java   |   8 +-
 .../jdk/vm/ci/meta/MetaAccessProvider.java    |   4 +-
 .../jdk/vm/ci/meta/ResolvedJavaMethod.java    |  12 +-
 .../src/jdk/vm/ci/meta/ResolvedJavaType.java  |   8 +-
 .../src/jdk/vm/ci/meta/Signature.java         |   4 +-
 .../src/jdk/vm/ci/meta/package-info.java      |   6 +-
 .../hotspot/test/AsJavaTypeDataProvider.java  |  42 +-
 .../test/BoxPrimitiveDataProvider.java        |  16 +-
 .../test/ConstantEqualsDataProvider.java      |  30 +-
 .../hotspot/test/ForObjectDataProvider.java   |  44 +-
 .../hotspot/test/ForStringDataProvider.java   |   6 +-
 ...HotSpotConstantReflectionProviderTest.java |  85 ++-
 .../test/IsEmbeddableDataProvider.java        |  18 +-
 .../test/ReadArrayElementDataProvider.java    |  54 +-
 .../ReadConstantArrayElementDataProvider.java | 150 +++---
 .../ReadConstantFieldValueDataProvider.java   |  25 +-
 .../test/ReadFieldValueDataProvider.java      |  37 +-
 .../ReadStableFieldValueDataProvider.java     |  80 +--
 .../jdk/vm/ci/hotspot/test/TestHelper.java    | 502 +++++++++---------
 .../test/UnboxPrimitiveDataProvider.java      |  42 +-
 29 files changed, 592 insertions(+), 616 deletions(-)

diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/MemoryBarriers.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/MemoryBarriers.java
index 6e708ca7a0f..074882c9054 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/MemoryBarriers.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/MemoryBarriers.java
@@ -25,8 +25,8 @@ package jdk.vm.ci.code;
 /**
  * Constants and intrinsic definition for memory barriers.
  *
- * The documentation for each constant is taken from Doug Lea's <a
- * href="http://gee.cs.oswego.edu/dl/jmm/cookbook.html">The JSR-133 Cookbook for Compiler
+ * The documentation for each constant is taken from Doug Lea's
+ * <a href="http://gee.cs.oswego.edu/dl/jmm/cookbook.html">The JSR-133 Cookbook for Compiler
  * Writers</a>.
  * <p>
  * The {@code JMM_*} constants capture the memory barriers necessary to implement the Java Memory
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/TargetDescription.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/TargetDescription.java
index edd26878d25..d611dce0919 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/TargetDescription.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/TargetDescription.java
@@ -56,8 +56,8 @@ public class TargetDescription {
     public final JavaKind wordJavaKind;
 
     /**
-     * The stack alignment requirement of the platform. For example, from Appendix D of <a
-     * href="http://www.intel.com/Assets/PDF/manual/248966.pdf">Intel 64 and IA-32 Architectures
+     * The stack alignment requirement of the platform. For example, from Appendix D of
+     * <a href="http://www.intel.com/Assets/PDF/manual/248966.pdf">Intel 64 and IA-32 Architectures
      * Optimization Reference Manual</a>:
      *
      * <pre>
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/package-info.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/package-info.java
index 8183f89b22d..753e40c90a3 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/package-info.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/package-info.java
@@ -21,10 +21,10 @@
  * questions.
  */
 /**
- * Package that defines the interface between a Java application that wants to install code and the runtime.
- * The runtime provides in implementation of the {@link jdk.vm.ci.code.CodeCacheProvider} interface.
- * The method {@link jdk.vm.ci.code.CodeCacheProvider#addCode(jdk.vm.ci.meta.ResolvedJavaMethod, CompiledCode, jdk.vm.ci.meta.SpeculationLog, InstalledCode)}
+ * Package that defines the interface between a Java application that wants to install code and the
+ * runtime. The runtime provides in implementation of the {@link jdk.vm.ci.code.CodeCacheProvider}
+ * interface. The method
+ * {@link jdk.vm.ci.code.CodeCacheProvider#addCode(jdk.vm.ci.meta.ResolvedJavaMethod, CompiledCode, jdk.vm.ci.meta.SpeculationLog, InstalledCode)}
  * can be used to install code.
  */
 package jdk.vm.ci.code;
-
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java
index 79caafca05a..4140aef2669 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java
@@ -122,7 +122,8 @@ public class AArch64HotSpotJVMCIBackendFactory implements HotSpotJVMCIBackendFac
         }
     }
 
-    protected JVMCIBackend createBackend(HotSpotMetaAccessProvider metaAccess, HotSpotCodeCacheProvider codeCache, ConstantReflectionProvider constantReflection, StackIntrospection stackIntrospection) {
+    protected JVMCIBackend createBackend(HotSpotMetaAccessProvider metaAccess, HotSpotCodeCacheProvider codeCache, ConstantReflectionProvider constantReflection,
+                    StackIntrospection stackIntrospection) {
         return new JVMCIBackend(metaAccess, codeCache, constantReflection, stackIntrospection);
     }
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java
index b2fec728519..8750700e200 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java
@@ -206,7 +206,8 @@ public class AMD64HotSpotJVMCIBackendFactory implements HotSpotJVMCIBackendFacto
         }
     }
 
-    protected JVMCIBackend createBackend(HotSpotMetaAccessProvider metaAccess, HotSpotCodeCacheProvider codeCache, ConstantReflectionProvider constantReflection, StackIntrospection stackIntrospection) {
+    protected JVMCIBackend createBackend(HotSpotMetaAccessProvider metaAccess, HotSpotCodeCacheProvider codeCache, ConstantReflectionProvider constantReflection,
+                    StackIntrospection stackIntrospection) {
         return new JVMCIBackend(metaAccess, codeCache, constantReflection, stackIntrospection);
     }
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
index 6f2d8c5e6aa..fb087e209e0 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
@@ -246,8 +246,8 @@ final class CompilerToVM {
     native void resolveInvokeDynamicInPool(HotSpotConstantPool constantPool, int cpi);
 
     /**
-     * Ensures that the type referenced by the entry for a <a
-     * href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-2.html#jvms-2.9">signature
+     * Ensures that the type referenced by the entry for a
+     * <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-2.html#jvms-2.9">signature
      * polymorphic</a> method at index {@code cpi} in {@code constantPool} is loaded and
      * initialized.
      *
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaAccessProvider.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaAccessProvider.java
index 1eef812be32..dcc0c518ce3 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaAccessProvider.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaAccessProvider.java
@@ -152,7 +152,8 @@ public class HotSpotMetaAccessProvider implements MetaAccessProvider, HotSpotPro
         int actionValue = convertDeoptAction(action);
         int reasonValue = convertDeoptReason(reason);
         int debugValue = debugId & intMaskRight(config.deoptimizationDebugIdBits);
-        JavaConstant c = JavaConstant.forInt(~((debugValue << config.deoptimizationDebugIdShift) | (reasonValue << config.deoptimizationReasonShift) | (actionValue << config.deoptimizationActionShift)));
+        JavaConstant c = JavaConstant.forInt(
+                        ~((debugValue << config.deoptimizationDebugIdShift) | (reasonValue << config.deoptimizationReasonShift) | (actionValue << config.deoptimizationActionShift)));
         assert c.asInt() < 0;
         return c;
     }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethod.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethod.java
index 3fa045a618e..8370ac4ae27 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethod.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethod.java
@@ -32,7 +32,7 @@ import java.util.Formatter;
 import jdk.vm.ci.meta.JavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
-abstract class HotSpotMethod implements JavaMethod, Formattable /* , JavaMethodContex */{
+abstract class HotSpotMethod implements JavaMethod, Formattable /* , JavaMethodContex */ {
 
     public static String applyFormattingFlagsAndWidth(String s, int flags, int width) {
         if (flags == 0 && width < 0) {
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.inittimer/src/jdk/vm/ci/inittimer/SuppressFBWarnings.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.inittimer/src/jdk/vm/ci/inittimer/SuppressFBWarnings.java
index 0105893e7f9..0a0a7c3aae4 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.inittimer/src/jdk/vm/ci/inittimer/SuppressFBWarnings.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.inittimer/src/jdk/vm/ci/inittimer/SuppressFBWarnings.java
@@ -27,8 +27,8 @@ package jdk.vm.ci.inittimer;
  */
 public @interface SuppressFBWarnings {
     /**
-     * The set of FindBugs <a
-     * href="http://findbugs.sourceforge.net/bugDescriptions.html">warnings</a> that are to be
+     * The set of FindBugs
+     * <a href="http://findbugs.sourceforge.net/bugDescriptions.html">warnings</a> that are to be
      * suppressed in annotated element. The value can be a bug category, kind or pattern.
      */
     String[] value();
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ConstantReflectionProvider.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ConstantReflectionProvider.java
index f6e2cbb6a7e..a1347d18f4e 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ConstantReflectionProvider.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ConstantReflectionProvider.java
@@ -123,10 +123,10 @@ public interface ConstantReflectionProvider {
     JavaConstant boxPrimitive(JavaConstant source);
 
     /**
-     * Converts the given {@link JavaKind#Object object} constant to a
-     * {@link JavaKind#isPrimitive() primitive} constant, according to the Java unboxing rules.
-     * Returns {@code null} if the source is is not an object constant that can be unboxed, or the
-     * unboxed value is not available at this point.
+     * Converts the given {@link JavaKind#Object object} constant to a {@link JavaKind#isPrimitive()
+     * primitive} constant, according to the Java unboxing rules. Returns {@code null} if the source
+     * is is not an object constant that can be unboxed, or the unboxed value is not available at
+     * this point.
      */
     JavaConstant unboxPrimitive(JavaConstant source);
 
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MetaAccessProvider.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MetaAccessProvider.java
index 5bc8f20a437..39cac799447 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MetaAccessProvider.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MetaAccessProvider.java
@@ -81,8 +81,8 @@ public interface MetaAccessProvider {
     long getMemorySize(JavaConstant constant);
 
     /**
-     * Parses a <a
-     * href="http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.3.3">method
+     * Parses a
+     * <a href="http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.3.3">method
      * descriptor</a> into a {@link Signature}. The behavior of this method is undefined if the
      * method descriptor is not well formed.
      */
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaMethod.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaMethod.java
index ddf86fbdcd2..2c6736bacfa 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaMethod.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaMethod.java
@@ -94,8 +94,8 @@ public interface ResolvedJavaMethod extends JavaMethod, InvokeTarget, ModifiersP
     }
 
     /**
-     * Checks that the method is a <a
-     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.6">varargs</a>
+     * Checks that the method is a
+     * <a href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.6">varargs</a>
      * method.
      *
      * @return whether the method is a varargs method
@@ -105,8 +105,8 @@ public interface ResolvedJavaMethod extends JavaMethod, InvokeTarget, ModifiersP
     }
 
     /**
-     * Checks that the method is a <a
-     * href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.6">bridge</a>
+     * Checks that the method is a
+     * <a href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.6">bridge</a>
      * method.
      *
      * @return whether the method is a bridge method
@@ -332,8 +332,8 @@ public interface ResolvedJavaMethod extends JavaMethod, InvokeTarget, ModifiersP
     SpeculationLog getSpeculationLog();
 
     /**
-     * Determines if the method identified by its holder and name is a <a
-     * href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-2.html#jvms-2.9">signature
+     * Determines if the method identified by its holder and name is a
+     * <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-2.html#jvms-2.9">signature
      * polymorphic</a> method.
      */
     static boolean isSignaturePolymorphic(JavaType holder, String name, MetaAccessProvider metaAccess) {
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java
index e99624082f9..a62f26fa854 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java
@@ -276,10 +276,10 @@ public interface ResolvedJavaType extends JavaType, ModifiersProvider, Annotated
     ResolvedJavaField[] getInstanceFields(boolean includeSuperclasses);
 
     /**
-     * Returns the static fields of this class, including
-     * {@linkplain ResolvedJavaField#isInternal() internal} fields. A zero-length array is returned
-     * for array and primitive types. The order of fields returned by this method is stable. That
-     * is, for a single JVM execution the same order is returned each time this method is called.
+     * Returns the static fields of this class, including {@linkplain ResolvedJavaField#isInternal()
+     * internal} fields. A zero-length array is returned for array and primitive types. The order of
+     * fields returned by this method is stable. That is, for a single JVM execution the same order
+     * is returned each time this method is called.
      */
     ResolvedJavaField[] getStaticFields();
 
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Signature.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Signature.java
index ae3faeea21b..e63ac33ac26 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Signature.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Signature.java
@@ -84,8 +84,8 @@ public interface Signature {
     }
 
     /**
-     * Gets the <a
-     * href="http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.3.3">method
+     * Gets the
+     * <a href="http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.3.3">method
      * descriptor</a> corresponding to this signature. For example:
      *
      * <pre>
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/package-info.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/package-info.java
index 0b769e44202..421bfefe537 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/package-info.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/package-info.java
@@ -22,8 +22,8 @@
  */
 
 /**
- * Package that defines the interface between a runtime and a Java application that wants to access meta information. The runtime
- * provides an implementation of the {@link jdk.vm.ci.meta.MetaAccessProvider} interface.
+ * Package that defines the interface between a runtime and a Java application that wants to access
+ * meta information. The runtime provides an implementation of the
+ * {@link jdk.vm.ci.meta.MetaAccessProvider} interface.
  */
 package jdk.vm.ci.meta;
-
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/AsJavaTypeDataProvider.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/AsJavaTypeDataProvider.java
index 24bedbca695..2278a1821a8 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/AsJavaTypeDataProvider.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/AsJavaTypeDataProvider.java
@@ -34,26 +34,26 @@ public class AsJavaTypeDataProvider {
     @DataProvider(name = "asJavaTypeDataProvider")
     public static Object[][] asJavaTypeDataProvider() {
         return new Object[][]{
-                {CONSTANT_REFLECTION_PROVIDER.forObject(DummyClass.class),
-                        "jdk.vm.ci.hotspot.test.DummyClass"},
-                {CONSTANT_REFLECTION_PROVIDER.forObject(boolean.class), "boolean"},
-                {CONSTANT_REFLECTION_PROVIDER.forObject(byte.class), "byte"},
-                {CONSTANT_REFLECTION_PROVIDER.forObject(short.class), "short"},
-                {CONSTANT_REFLECTION_PROVIDER.forObject(char.class), "char"},
-                {CONSTANT_REFLECTION_PROVIDER.forObject(int.class), "int"},
-                {CONSTANT_REFLECTION_PROVIDER.forObject(long.class), "long"},
-                {CONSTANT_REFLECTION_PROVIDER.forObject(float.class), "float"},
-                {CONSTANT_REFLECTION_PROVIDER.forObject(double.class), "double"},
-                {CONSTANT_REFLECTION_PROVIDER.forObject(Object.class), "java.lang.Object"},
-                {CONSTANT_REFLECTION_PROVIDER.forObject(boolean[].class), "boolean[]"},
-                {CONSTANT_REFLECTION_PROVIDER.forObject(boolean[][].class), "boolean[][]"},
-                {CONSTANT_REFLECTION_PROVIDER.forObject(Object[].class), "java.lang.Object[]"},
-                {CONSTANT_REFLECTION_PROVIDER.forObject(Object[][].class), "java.lang.Object[][]"},
-                {JavaConstant.forBoolean(DUMMY_CLASS_INSTANCE.booleanField), null},
-                {CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.objectField), null},
-                {CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE), null},
-                {CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.booleanArrayWithValues), null},
-                {CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.booleanArrayArrayWithValues), null},
-                {JavaConstant.NULL_POINTER, null}, {null, null}};
+                        {CONSTANT_REFLECTION_PROVIDER.forObject(DummyClass.class),
+                                        "jdk.vm.ci.hotspot.test.DummyClass"},
+                        {CONSTANT_REFLECTION_PROVIDER.forObject(boolean.class), "boolean"},
+                        {CONSTANT_REFLECTION_PROVIDER.forObject(byte.class), "byte"},
+                        {CONSTANT_REFLECTION_PROVIDER.forObject(short.class), "short"},
+                        {CONSTANT_REFLECTION_PROVIDER.forObject(char.class), "char"},
+                        {CONSTANT_REFLECTION_PROVIDER.forObject(int.class), "int"},
+                        {CONSTANT_REFLECTION_PROVIDER.forObject(long.class), "long"},
+                        {CONSTANT_REFLECTION_PROVIDER.forObject(float.class), "float"},
+                        {CONSTANT_REFLECTION_PROVIDER.forObject(double.class), "double"},
+                        {CONSTANT_REFLECTION_PROVIDER.forObject(Object.class), "java.lang.Object"},
+                        {CONSTANT_REFLECTION_PROVIDER.forObject(boolean[].class), "boolean[]"},
+                        {CONSTANT_REFLECTION_PROVIDER.forObject(boolean[][].class), "boolean[][]"},
+                        {CONSTANT_REFLECTION_PROVIDER.forObject(Object[].class), "java.lang.Object[]"},
+                        {CONSTANT_REFLECTION_PROVIDER.forObject(Object[][].class), "java.lang.Object[][]"},
+                        {JavaConstant.forBoolean(DUMMY_CLASS_INSTANCE.booleanField), null},
+                        {CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.objectField), null},
+                        {CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE), null},
+                        {CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.booleanArrayWithValues), null},
+                        {CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.booleanArrayArrayWithValues), null},
+                        {JavaConstant.NULL_POINTER, null}, {null, null}};
     }
 }
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/BoxPrimitiveDataProvider.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/BoxPrimitiveDataProvider.java
index 4aa25b5c678..d6516e40432 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/BoxPrimitiveDataProvider.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/BoxPrimitiveDataProvider.java
@@ -37,25 +37,25 @@ public class BoxPrimitiveDataProvider {
         LinkedList<Object[]> cfgSet = new LinkedList<>();
         // Boolean testing
         cfgSet.add(
-                new Object[]{JavaConstant.forBoolean(true), CONSTANT_REFLECTION_PROVIDER.forObject((Boolean) true)});
+                        new Object[]{JavaConstant.forBoolean(true), CONSTANT_REFLECTION_PROVIDER.forObject((Boolean) true)});
         cfgSet.add(new Object[]{JavaConstant.forBoolean(false),
-                CONSTANT_REFLECTION_PROVIDER.forObject((Boolean) false)});
+                        CONSTANT_REFLECTION_PROVIDER.forObject((Boolean) false)});
         // Boxed boolean testing (returns null)
         cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject((Boolean) true), null});
         cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject((Boolean) false), null});
         for (byte number : new byte[]{-128, 0, 1, 127}) {
             // Integer primitives testing
             cfgSet.add(new Object[]{JavaConstant.forByte(number),
-                    CONSTANT_REFLECTION_PROVIDER.forObject(Byte.valueOf(number))});
+                            CONSTANT_REFLECTION_PROVIDER.forObject(Byte.valueOf(number))});
             cfgSet.add(new Object[]{JavaConstant.forShort(number),
-                    CONSTANT_REFLECTION_PROVIDER.forObject(Short.valueOf(number))});
+                            CONSTANT_REFLECTION_PROVIDER.forObject(Short.valueOf(number))});
             cfgSet.add(new Object[]{JavaConstant.forInt(number),
-                    CONSTANT_REFLECTION_PROVIDER.forObject(Integer.valueOf(number))});
+                            CONSTANT_REFLECTION_PROVIDER.forObject(Integer.valueOf(number))});
             cfgSet.add(new Object[]{JavaConstant.forLong(number),
-                    CONSTANT_REFLECTION_PROVIDER.forObject(Long.valueOf(number))});
+                            CONSTANT_REFLECTION_PROVIDER.forObject(Long.valueOf(number))});
             if (number >= 0) {
                 cfgSet.add(new Object[]{JavaConstant.forChar((char) number),
-                        CONSTANT_REFLECTION_PROVIDER.forObject(Character.valueOf((char) number))});
+                                CONSTANT_REFLECTION_PROVIDER.forObject(Character.valueOf((char) number))});
             }
             // Float and Double variables are not cached,
             // so the tested method returns "null" on them
@@ -78,7 +78,7 @@ public class BoxPrimitiveDataProvider {
         // Non-primitives testing
         cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.objectField), null});
         cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.booleanArrayWithValues),
-                null});
+                        null});
         // Null testing
         cfgSet.add(new Object[]{JavaConstant.NULL_POINTER, null});
         cfgSet.add(new Object[]{null, null});
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ConstantEqualsDataProvider.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ConstantEqualsDataProvider.java
index 93fa1e024a4..dff8c48c0d4 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ConstantEqualsDataProvider.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ConstantEqualsDataProvider.java
@@ -39,53 +39,53 @@ public class ConstantEqualsDataProvider {
         HashMap<Object, Constant> constMap = new HashMap<>();
         constMap.put(DUMMY_CLASS_INSTANCE.booleanField, JavaConstant.forBoolean(DUMMY_CLASS_INSTANCE.booleanField));
         constMap.put(DUMMY_CLASS_INSTANCE.stableDefaultBooleanField,
-                JavaConstant.forBoolean(DUMMY_CLASS_INSTANCE.stableDefaultBooleanField));
+                        JavaConstant.forBoolean(DUMMY_CLASS_INSTANCE.stableDefaultBooleanField));
         constMap.put(DUMMY_CLASS_INSTANCE.byteField, JavaConstant.forByte(DUMMY_CLASS_INSTANCE.byteField));
         constMap.put(DUMMY_CLASS_INSTANCE.finalByteField, JavaConstant.forByte(DUMMY_CLASS_INSTANCE.finalByteField));
         constMap.put(DUMMY_CLASS_INSTANCE.stableDefaultByteField,
-                JavaConstant.forByte(DUMMY_CLASS_INSTANCE.stableDefaultByteField));
+                        JavaConstant.forByte(DUMMY_CLASS_INSTANCE.stableDefaultByteField));
         constMap.put(DUMMY_CLASS_INSTANCE.shortField, JavaConstant.forShort(DUMMY_CLASS_INSTANCE.shortField));
         constMap.put(DUMMY_CLASS_INSTANCE.finalShortField, JavaConstant.forShort(DUMMY_CLASS_INSTANCE.finalShortField));
         constMap.put(DUMMY_CLASS_INSTANCE.stableDefaultShortField,
-                JavaConstant.forShort(DUMMY_CLASS_INSTANCE.stableDefaultShortField));
+                        JavaConstant.forShort(DUMMY_CLASS_INSTANCE.stableDefaultShortField));
         constMap.put(DUMMY_CLASS_INSTANCE.intField, JavaConstant.forInt(DUMMY_CLASS_INSTANCE.intField));
         constMap.put(DUMMY_CLASS_INSTANCE.finalIntField, JavaConstant.forInt(DUMMY_CLASS_INSTANCE.finalIntField));
         constMap.put(DUMMY_CLASS_INSTANCE.stableDefaultIntField,
-                JavaConstant.forInt(DUMMY_CLASS_INSTANCE.stableDefaultIntField));
+                        JavaConstant.forInt(DUMMY_CLASS_INSTANCE.stableDefaultIntField));
         constMap.put(DUMMY_CLASS_INSTANCE.longField, JavaConstant.forLong(DUMMY_CLASS_INSTANCE.longField));
         constMap.put(DUMMY_CLASS_INSTANCE.finalLongField, JavaConstant.forLong(DUMMY_CLASS_INSTANCE.finalLongField));
         constMap.put(DUMMY_CLASS_INSTANCE.stableDefaultLongField,
-                JavaConstant.forLong(DUMMY_CLASS_INSTANCE.stableDefaultLongField));
+                        JavaConstant.forLong(DUMMY_CLASS_INSTANCE.stableDefaultLongField));
         constMap.put(DUMMY_CLASS_INSTANCE.doubleField, JavaConstant.forDouble(DUMMY_CLASS_INSTANCE.doubleField));
         constMap.put(DUMMY_CLASS_INSTANCE.finalDoubleField,
-                JavaConstant.forDouble(DUMMY_CLASS_INSTANCE.finalDoubleField));
+                        JavaConstant.forDouble(DUMMY_CLASS_INSTANCE.finalDoubleField));
         constMap.put(DUMMY_CLASS_INSTANCE.stableDefaultDoubleField,
-                JavaConstant.forDouble(DUMMY_CLASS_INSTANCE.stableDefaultDoubleField));
+                        JavaConstant.forDouble(DUMMY_CLASS_INSTANCE.stableDefaultDoubleField));
         constMap.put(DUMMY_CLASS_INSTANCE.floatField, JavaConstant.forFloat(DUMMY_CLASS_INSTANCE.floatField));
         constMap.put(DUMMY_CLASS_INSTANCE.finalFloatField, JavaConstant.forFloat(DUMMY_CLASS_INSTANCE.finalFloatField));
         constMap.put(DUMMY_CLASS_INSTANCE.stableDefaultFloatField,
-                JavaConstant.forFloat(DUMMY_CLASS_INSTANCE.stableDefaultFloatField));
+                        JavaConstant.forFloat(DUMMY_CLASS_INSTANCE.stableDefaultFloatField));
         constMap.put(DUMMY_CLASS_INSTANCE.charField, JavaConstant.forChar(DUMMY_CLASS_INSTANCE.charField));
         constMap.put(DUMMY_CLASS_INSTANCE.finalCharField, JavaConstant.forChar(DUMMY_CLASS_INSTANCE.finalCharField));
         constMap.put(DUMMY_CLASS_INSTANCE.stableDefaultCharField,
-                JavaConstant.forChar(DUMMY_CLASS_INSTANCE.stableDefaultCharField));
+                        JavaConstant.forChar(DUMMY_CLASS_INSTANCE.stableDefaultCharField));
         constMap.put(DUMMY_CLASS_INSTANCE.stringField,
-                CONSTANT_REFLECTION_PROVIDER.forString(DUMMY_CLASS_INSTANCE.stringField));
+                        CONSTANT_REFLECTION_PROVIDER.forString(DUMMY_CLASS_INSTANCE.stringField));
         constMap.put(DUMMY_CLASS_INSTANCE.stringField2,
-                CONSTANT_REFLECTION_PROVIDER.forString(DUMMY_CLASS_INSTANCE.stringField2));
+                        CONSTANT_REFLECTION_PROVIDER.forString(DUMMY_CLASS_INSTANCE.stringField2));
         constMap.put(DUMMY_CLASS_INSTANCE.objectField,
-                CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.objectField));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.objectField));
         constMap.put(DUMMY_CLASS_INSTANCE.finalObjectField,
-                CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.finalObjectField));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.finalObjectField));
         constMap.put(DUMMY_CLASS_INSTANCE.stableDefaultObjectField,
-                CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.stableDefaultObjectField));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.stableDefaultObjectField));
         constMap.put(null, null);
         constMap.put(JavaConstant.NULL_POINTER, JavaConstant.NULL_POINTER);
         LinkedList<Object[]> cfgSet = new LinkedList<>();
         constMap.entrySet().stream().forEach((obj1) -> {
             constMap.entrySet().stream().forEach((obj2) -> {
                 cfgSet.add(new Object[]{obj1.getValue(), obj2.getValue(),
-                        Objects.equals(obj1.getKey(), obj2.getKey())});
+                                Objects.equals(obj1.getKey(), obj2.getKey())});
             });
         });
         return cfgSet.toArray(new Object[0][0]);
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ForObjectDataProvider.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ForObjectDataProvider.java
index f6305e41d1d..85d22f2efda 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ForObjectDataProvider.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ForObjectDataProvider.java
@@ -29,27 +29,27 @@ public class ForObjectDataProvider {
     @DataProvider(name = "forObjectDataProvider")
     public static Object[][] forObjectDataProvider() {
         return new Object[][]{
-                {TestHelper.DUMMY_CLASS_INSTANCE.objectField,
-                        "Object[Object@" + TestHelper.DUMMY_CLASS_INSTANCE.objectField.hashCode() + "]"},
-                {TestHelper.DUMMY_CLASS_INSTANCE.stringField,
-                        "Object[String:\"" + TestHelper.DUMMY_CLASS_INSTANCE.stringField + "\"]"},
-                {TestHelper.DUMMY_CLASS_INSTANCE.booleanField,
-                        "Object[" + TestHelper.DUMMY_CLASS_INSTANCE.booleanField + "]"},
-                {TestHelper.DUMMY_CLASS_INSTANCE.byteField,
-                        "Object[" + TestHelper.DUMMY_CLASS_INSTANCE.byteField + "]"},
-                {TestHelper.DUMMY_CLASS_INSTANCE.charField,
-                        "Object[" + TestHelper.DUMMY_CLASS_INSTANCE.charField + "]"},
-                {TestHelper.DUMMY_CLASS_INSTANCE.shortField,
-                        "Object[" + TestHelper.DUMMY_CLASS_INSTANCE.shortField + "]"},
-                {TestHelper.DUMMY_CLASS_INSTANCE.intField,
-                        "Object[" + TestHelper.DUMMY_CLASS_INSTANCE.intField + "]"},
-                {TestHelper.DUMMY_CLASS_INSTANCE.longField,
-                        "Object[" + TestHelper.DUMMY_CLASS_INSTANCE.longField + "]"},
-                {TestHelper.DUMMY_CLASS_INSTANCE.floatField,
-                        "Object[" + TestHelper.DUMMY_CLASS_INSTANCE.floatField + "]"},
-                {TestHelper.DUMMY_CLASS_INSTANCE.doubleField,
-                        "Object[" + TestHelper.DUMMY_CLASS_INSTANCE.doubleField + "]"},
-                {new Object[0], "Object[Object[" + 0 + "]{}]"}, {new Object[1], "Object[Object[" + 1 + "]{null}]"},
-                {null, "Object[null]"}};
+                        {TestHelper.DUMMY_CLASS_INSTANCE.objectField,
+                                        "Object[Object@" + TestHelper.DUMMY_CLASS_INSTANCE.objectField.hashCode() + "]"},
+                        {TestHelper.DUMMY_CLASS_INSTANCE.stringField,
+                                        "Object[String:\"" + TestHelper.DUMMY_CLASS_INSTANCE.stringField + "\"]"},
+                        {TestHelper.DUMMY_CLASS_INSTANCE.booleanField,
+                                        "Object[" + TestHelper.DUMMY_CLASS_INSTANCE.booleanField + "]"},
+                        {TestHelper.DUMMY_CLASS_INSTANCE.byteField,
+                                        "Object[" + TestHelper.DUMMY_CLASS_INSTANCE.byteField + "]"},
+                        {TestHelper.DUMMY_CLASS_INSTANCE.charField,
+                                        "Object[" + TestHelper.DUMMY_CLASS_INSTANCE.charField + "]"},
+                        {TestHelper.DUMMY_CLASS_INSTANCE.shortField,
+                                        "Object[" + TestHelper.DUMMY_CLASS_INSTANCE.shortField + "]"},
+                        {TestHelper.DUMMY_CLASS_INSTANCE.intField,
+                                        "Object[" + TestHelper.DUMMY_CLASS_INSTANCE.intField + "]"},
+                        {TestHelper.DUMMY_CLASS_INSTANCE.longField,
+                                        "Object[" + TestHelper.DUMMY_CLASS_INSTANCE.longField + "]"},
+                        {TestHelper.DUMMY_CLASS_INSTANCE.floatField,
+                                        "Object[" + TestHelper.DUMMY_CLASS_INSTANCE.floatField + "]"},
+                        {TestHelper.DUMMY_CLASS_INSTANCE.doubleField,
+                                        "Object[" + TestHelper.DUMMY_CLASS_INSTANCE.doubleField + "]"},
+                        {new Object[0], "Object[Object[" + 0 + "]{}]"}, {new Object[1], "Object[Object[" + 1 + "]{null}]"},
+                        {null, "Object[null]"}};
     }
 }
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ForStringDataProvider.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ForStringDataProvider.java
index 5c753557ae8..8db71853d98 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ForStringDataProvider.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ForStringDataProvider.java
@@ -31,8 +31,8 @@ public class ForStringDataProvider {
     @DataProvider(name = "forStringDataProvider")
     public static Object[][] forStringDataProvider() {
         return new Object[][]{
-                {DUMMY_CLASS_INSTANCE.stringField, "Object[String:\"" + DUMMY_CLASS_INSTANCE.stringField + "\"]"},
-                {DUMMY_CLASS_INSTANCE.stringEmptyField, "Object[String:\"\"]"},
-                {null, "Object[null]"}};
+                        {DUMMY_CLASS_INSTANCE.stringField, "Object[String:\"" + DUMMY_CLASS_INSTANCE.stringField + "\"]"},
+                        {DUMMY_CLASS_INSTANCE.stringEmptyField, "Object[String:\"\"]"},
+                        {null, "Object[null]"}};
     }
 }
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/HotSpotConstantReflectionProviderTest.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/HotSpotConstantReflectionProviderTest.java
index 879a1c0c833..35c712a4e10 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/HotSpotConstantReflectionProviderTest.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/HotSpotConstantReflectionProviderTest.java
@@ -58,7 +58,7 @@ public class HotSpotConstantReflectionProviderTest {
     public void testForObject(Object obj, String expected) {
         JavaConstant jConst = TestHelper.CONSTANT_REFLECTION_PROVIDER.forObject(obj);
         Assert.assertNotNull(jConst,
-                             "An instance of JavaConstant returned by" + " \"forObject\" method should not be null");
+                        "An instance of JavaConstant returned by" + " \"forObject\" method should not be null");
         Assert.assertEquals(jConst.toString(), expected, "Unexpected result:");
     }
 
@@ -66,67 +66,63 @@ public class HotSpotConstantReflectionProviderTest {
     public void testForString(String string, String expected) {
         JavaConstant jConst = CONSTANT_REFLECTION_PROVIDER.forString(string);
         Assert.assertNotNull(jConst,
-                             "An instance of JavaConstant returned by" + " \"forString\" method should not be null");
+                        "An instance of JavaConstant returned by" + " \"forString\" method should not be null");
         Assert.assertEquals(jConst.toString(), expected, "Unexpected result:");
     }
 
     @Test(dataProvider = "constantEqualsDataProvider", dataProviderClass = ConstantEqualsDataProvider.class)
     public void testConstantEquals(Constant const1, Constant const2, Boolean expected) {
         Assert.assertEquals(CONSTANT_REFLECTION_PROVIDER.constantEquals(const1, const2), expected,
-                            "Unexpected result:");
+                        "Unexpected result:");
     }
 
     @Test(dataProvider = "readArrayLengthDataProvider", dataProviderClass = ReadArrayLengthDataProvider.class)
     public void testReadArrayLength(JavaConstant array, Integer expected) {
         Assert.assertEquals(CONSTANT_REFLECTION_PROVIDER.readArrayLength(array), expected,
-                            "Unexpected result:");
+                        "Unexpected result:");
     }
 
     @Test(dataProvider = "readArrayElementDataProvider", dataProviderClass = ReadArrayElementDataProvider.class)
     public void testReadArrayElement(JavaConstant array, int index, Object expected) {
         Assert.assertEquals(CONSTANT_REFLECTION_PROVIDER.readArrayElement(array, index), expected,
-                            "Unexpected result:");
+                        "Unexpected result:");
     }
 
     @Test(dataProvider = "readFieldValueDataProvider", dataProviderClass = ReadFieldValueDataProvider.class)
     public void testReadFieldValue(ResolvedJavaField field, JavaConstant receiver, JavaConstant expected) {
         JavaConstant actual = CONSTANT_REFLECTION_PROVIDER.readFieldValue(field, receiver);
         Assert.assertEquals(actual == null ? "null" : actual.toString(),
-                            expected == null ? "null" : expected.toString(), "Unexpected result:");
+                        expected == null ? "null" : expected.toString(), "Unexpected result:");
     }
 
-    @Test(dataProvider = "readFieldValueNegativeDataProvider",
-            dataProviderClass = ReadFieldValueDataProvider.class,
-            expectedExceptions = {NullPointerException.class})
+    @Test(dataProvider = "readFieldValueNegativeDataProvider", dataProviderClass = ReadFieldValueDataProvider.class, expectedExceptions = {NullPointerException.class})
     public void testNegativeReadFieldValue(ResolvedJavaField field, JavaConstant receiver) {
         CONSTANT_REFLECTION_PROVIDER.readFieldValue(field, receiver);
     }
 
-    @Test(dataProvider = "readStableFieldValueDataProvider",
-            dataProviderClass = ReadStableFieldValueDataProvider.class)
+    @Test(dataProvider = "readStableFieldValueDataProvider", dataProviderClass = ReadStableFieldValueDataProvider.class)
     public void testReadStableFieldValue(ResolvedJavaField field, JavaConstant receiver, boolean isDefStab,
-                                         JavaConstant expected) {
+                    JavaConstant expected) {
         Assert.assertEquals(
-                CONSTANT_REFLECTION_PROVIDER.readStableFieldValue(field, receiver, isDefStab),
-                expected,
-                "Unexpected result:");
+                        CONSTANT_REFLECTION_PROVIDER.readStableFieldValue(field, receiver, isDefStab),
+                        expected,
+                        "Unexpected result:");
     }
 
-    @Test(dataProvider = "readStableFieldValueArrayDataProvider",
-            dataProviderClass = ReadStableFieldValueDataProvider.class)
+    @Test(dataProvider = "readStableFieldValueArrayDataProvider", dataProviderClass = ReadStableFieldValueDataProvider.class)
     public void testReadStableFieldValueForArray(ResolvedJavaField field, JavaConstant receiver, boolean isDefStab,
-                                                 int arrayDim, JavaConstant expected) {
+                    int arrayDim, JavaConstant expected) {
         JavaConstant result = CONSTANT_REFLECTION_PROVIDER.readStableFieldValue(field, receiver,
-                                                                                isDefStab);
+                        isDefStab);
         boolean resultDefStab = false;
         int resultStableDim = -1;
         try {
             Class<?> hotSpotObjectConstantImplClass = Class.forName(
-                    "jdk.vm.ci.hotspot.HotSpotObjectConstantImpl");
+                            "jdk.vm.ci.hotspot.HotSpotObjectConstantImpl");
             Method getStableDimensionMethod = hotSpotObjectConstantImplClass.getDeclaredMethod(
-                    "getStableDimension");
+                            "getStableDimension");
             Method isDefaultStableMethod = hotSpotObjectConstantImplClass.getDeclaredMethod(
-                    "isDefaultStable");
+                            "isDefaultStable");
             getStableDimensionMethod.setAccessible(true);
             isDefaultStableMethod.setAccessible(true);
             resultDefStab = (boolean) isDefaultStableMethod.invoke(result);
@@ -135,62 +131,55 @@ public class HotSpotConstantReflectionProviderTest {
             throw new Error("Unexpected error: " + e, e);
         }
         Assert.assertEquals(resultDefStab, isDefStab,
-                            "Wrong default stable value for " + result.toString());
+                        "Wrong default stable value for " + result.toString());
         Assert.assertEquals(resultStableDim, arrayDim,
-                            "Wrong array dimension for " + result.toString());
+                        "Wrong array dimension for " + result.toString());
         Assert.assertEquals(result.toString(), expected.toString(), "Unexpected result:");
     }
 
-    @Test(dataProvider = "readStableFieldValueNegativeDataProvider",
-            dataProviderClass = ReadStableFieldValueDataProvider.class,
-            expectedExceptions = {NullPointerException.class})
+    @Test(dataProvider = "readStableFieldValueNegativeDataProvider", dataProviderClass = ReadStableFieldValueDataProvider.class, expectedExceptions = {NullPointerException.class})
     public void testNegativeReadStableFieldValue(ResolvedJavaField field, JavaConstant receiver, boolean isDefStab) {
         CONSTANT_REFLECTION_PROVIDER.readStableFieldValue(field, receiver, isDefStab);
     }
 
-    @Test(dataProvider = "readConstantFieldValueDataProvider",
-            dataProviderClass = ReadConstantFieldValueDataProvider.class)
+    @Test(dataProvider = "readConstantFieldValueDataProvider", dataProviderClass = ReadConstantFieldValueDataProvider.class)
     public void testReadConstantFieldValue(ResolvedJavaField field, JavaConstant receiver, JavaConstant expected,
-                                           String testInfo) {
+                    String testInfo) {
         String msg = String.format("Unexpected result for %s. Field is stable = %s.", testInfo,
-                                   ((HotSpotResolvedJavaField) field).isStable());
+                        ((HotSpotResolvedJavaField) field).isStable());
         Assert.assertEquals(CONSTANT_REFLECTION_PROVIDER.readConstantFieldValue(field, receiver),
-                            expected, msg);
+                        expected, msg);
     }
 
-    @Test(dataProvider = "readConstantFieldValueNegativeDataProvider",
-            dataProviderClass = ReadConstantFieldValueDataProvider.class,
-            expectedExceptions = {NullPointerException.class})
+    @Test(dataProvider = "readConstantFieldValueNegativeDataProvider", dataProviderClass = ReadConstantFieldValueDataProvider.class, expectedExceptions = {NullPointerException.class})
     public void testNegativeReadConstantFieldValue(ResolvedJavaField field, JavaConstant receiver) {
         CONSTANT_REFLECTION_PROVIDER.readConstantFieldValue(field, receiver);
     }
 
-    @Test(dataProvider = "readConstantArrayElementDataProvider",
-            dataProviderClass = ReadConstantArrayElementDataProvider.class)
+    @Test(dataProvider = "readConstantArrayElementDataProvider", dataProviderClass = ReadConstantArrayElementDataProvider.class)
     public void testReadConstantArrayElement(JavaConstant array, int index, JavaConstant expected, String testInfo) {
         JavaConstant actual = CONSTANT_REFLECTION_PROVIDER.readConstantArrayElement(array, index);
         Assert.assertEquals(actual == null ? "null" : actual.toString(),
-                            expected == null ? "null" : expected.toString(),
-                            String.format("Unexpected result while testing %s:", testInfo));
+                        expected == null ? "null" : expected.toString(),
+                        String.format("Unexpected result while testing %s:", testInfo));
     }
 
-    @Test(dataProvider = "readConstantArrayElementForOffsetDataProvider",
-            dataProviderClass = ReadConstantArrayElementDataProvider.class)
+    @Test(dataProvider = "readConstantArrayElementForOffsetDataProvider", dataProviderClass = ReadConstantArrayElementDataProvider.class)
     public void testReadConstantArrayElementForOffset(JavaConstant array, long offset, JavaConstant expected,
-                                                      String testInfo) {
+                    String testInfo) {
         JavaConstant actual = CONSTANT_REFLECTION_PROVIDER.readConstantArrayElementForOffset(array,
-                                                                                             offset);
+                        offset);
         Assert.assertEquals(actual == null ? "null" : actual.toString(),
-                            expected == null ? "null" : expected.toString(),
-                            String.format("Unexpected result while testing %s:", testInfo));
+                        expected == null ? "null" : expected.toString(),
+                        String.format("Unexpected result while testing %s:", testInfo));
     }
 
     @Test(dataProvider = "asJavaTypeDataProvider", dataProviderClass = AsJavaTypeDataProvider.class)
     public void testAsJavaType(JavaConstant constant, String expected) {
         ResolvedJavaType actual = CONSTANT_REFLECTION_PROVIDER.asJavaType(constant);
         Assert.assertEquals(actual == null ? "null" : actual.toJavaName(),
-                            expected == null ? "null" : expected,
-                            "Unexpected result, wrong type returned:");
+                        expected == null ? "null" : expected,
+                        "Unexpected result, wrong type returned:");
     }
 
     @Test(dataProvider = "boxPrimitiveDataProvider", dataProviderClass = BoxPrimitiveDataProvider.class)
@@ -221,6 +210,6 @@ public class HotSpotConstantReflectionProviderTest {
     public void testGetMethodHandleAccess() {
         MethodHandleAccessProvider actual = CONSTANT_REFLECTION_PROVIDER.getMethodHandleAccess();
         Assert.assertNotNull(actual,
-                             "Returned MethodHandleAccessProvider instance should not be null");
+                        "Returned MethodHandleAccessProvider instance should not be null");
     }
 }
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/IsEmbeddableDataProvider.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/IsEmbeddableDataProvider.java
index b586a65e952..62c64a4bf9a 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/IsEmbeddableDataProvider.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/IsEmbeddableDataProvider.java
@@ -33,14 +33,14 @@ public class IsEmbeddableDataProvider {
     @DataProvider(name = "isEmbeddableDataProvider")
     public static Object[][] isEmbeddableDataProvider() {
         return new Object[][]{{JavaConstant.forBoolean(DUMMY_CLASS_INSTANCE.booleanField), true},
-                {JavaConstant.forByte(DUMMY_CLASS_INSTANCE.byteField), true},
-                {JavaConstant.forShort(DUMMY_CLASS_INSTANCE.shortField), true},
-                {JavaConstant.forInt(DUMMY_CLASS_INSTANCE.intField), true},
-                {JavaConstant.forLong(DUMMY_CLASS_INSTANCE.longField), true},
-                {JavaConstant.forChar(DUMMY_CLASS_INSTANCE.charField), true},
-                {JavaConstant.forFloat(DUMMY_CLASS_INSTANCE.floatField), true},
-                {JavaConstant.forDouble(DUMMY_CLASS_INSTANCE.doubleField), true},
-                {CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.objectField), true},
-                {JavaConstant.NULL_POINTER, true}, {null, true}};
+                        {JavaConstant.forByte(DUMMY_CLASS_INSTANCE.byteField), true},
+                        {JavaConstant.forShort(DUMMY_CLASS_INSTANCE.shortField), true},
+                        {JavaConstant.forInt(DUMMY_CLASS_INSTANCE.intField), true},
+                        {JavaConstant.forLong(DUMMY_CLASS_INSTANCE.longField), true},
+                        {JavaConstant.forChar(DUMMY_CLASS_INSTANCE.charField), true},
+                        {JavaConstant.forFloat(DUMMY_CLASS_INSTANCE.floatField), true},
+                        {JavaConstant.forDouble(DUMMY_CLASS_INSTANCE.doubleField), true},
+                        {CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.objectField), true},
+                        {JavaConstant.NULL_POINTER, true}, {null, true}};
     }
 }
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadArrayElementDataProvider.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadArrayElementDataProvider.java
index 1e4bb40e6db..fbaea6edeea 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadArrayElementDataProvider.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadArrayElementDataProvider.java
@@ -42,50 +42,50 @@ public class ReadArrayElementDataProvider {
         LinkedList<Object[]> cfgSet = new LinkedList<>();
         for (int i : new int[]{0, 1}) {
             cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.booleanArrayWithValues),
-                    i, JavaConstant.forBoolean(DUMMY_CLASS_INSTANCE.booleanArrayWithValues[i])});
+                            i, JavaConstant.forBoolean(DUMMY_CLASS_INSTANCE.booleanArrayWithValues[i])});
             cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.byteArrayWithValues),
-                    i, JavaConstant.forByte(DUMMY_CLASS_INSTANCE.byteArrayWithValues[i])});
+                            i, JavaConstant.forByte(DUMMY_CLASS_INSTANCE.byteArrayWithValues[i])});
             cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.shortArrayWithValues),
-                    i, JavaConstant.forShort(DUMMY_CLASS_INSTANCE.shortArrayWithValues[i])});
+                            i, JavaConstant.forShort(DUMMY_CLASS_INSTANCE.shortArrayWithValues[i])});
             cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.charArrayWithValues),
-                    i, JavaConstant.forChar(DUMMY_CLASS_INSTANCE.charArrayWithValues[i])});
+                            i, JavaConstant.forChar(DUMMY_CLASS_INSTANCE.charArrayWithValues[i])});
             cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.intArrayWithValues),
-                    i, JavaConstant.forInt(DUMMY_CLASS_INSTANCE.intArrayWithValues[i])});
+                            i, JavaConstant.forInt(DUMMY_CLASS_INSTANCE.intArrayWithValues[i])});
             cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.longArrayWithValues),
-                    i, JavaConstant.forLong(DUMMY_CLASS_INSTANCE.longArrayWithValues[i])});
+                            i, JavaConstant.forLong(DUMMY_CLASS_INSTANCE.longArrayWithValues[i])});
             cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.floatArrayWithValues),
-                    i, JavaConstant.forFloat(DUMMY_CLASS_INSTANCE.floatArrayWithValues[i])});
+                            i, JavaConstant.forFloat(DUMMY_CLASS_INSTANCE.floatArrayWithValues[i])});
             cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.doubleArrayWithValues),
-                    i, JavaConstant.forDouble(DUMMY_CLASS_INSTANCE.doubleArrayWithValues[i])});
+                            i, JavaConstant.forDouble(DUMMY_CLASS_INSTANCE.doubleArrayWithValues[i])});
             cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.objectArrayWithValues),
-                    i, CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.objectArrayWithValues[i])});
+                            i, CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.objectArrayWithValues[i])});
             cfgSet.add(new Object[]{
-                    CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.booleanArrayArrayWithValues), i,
-                    CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.booleanArrayArrayWithValues[i])});
+                            CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.booleanArrayArrayWithValues), i,
+                            CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.booleanArrayArrayWithValues[i])});
             cfgSet.add(new Object[]{
-                    CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.byteArrayArrayWithValues), i,
-                    CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.byteArrayArrayWithValues[i])});
+                            CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.byteArrayArrayWithValues), i,
+                            CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.byteArrayArrayWithValues[i])});
             cfgSet.add(new Object[]{
-                    CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.shortArrayArrayWithValues), i,
-                    CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.shortArrayArrayWithValues[i])});
+                            CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.shortArrayArrayWithValues), i,
+                            CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.shortArrayArrayWithValues[i])});
             cfgSet.add(new Object[]{
-                    CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.charArrayArrayWithValues), i,
-                    CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.charArrayArrayWithValues[i])});
+                            CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.charArrayArrayWithValues), i,
+                            CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.charArrayArrayWithValues[i])});
             cfgSet.add(new Object[]{
-                    CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.intArrayArrayWithValues), i,
-                    CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.intArrayArrayWithValues[i])});
+                            CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.intArrayArrayWithValues), i,
+                            CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.intArrayArrayWithValues[i])});
             cfgSet.add(new Object[]{
-                    CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.longArrayArrayWithValues), i,
-                    CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.longArrayArrayWithValues[i])});
+                            CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.longArrayArrayWithValues), i,
+                            CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.longArrayArrayWithValues[i])});
             cfgSet.add(new Object[]{
-                    CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.floatArrayArrayWithValues), i,
-                    CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.floatArrayArrayWithValues[i])});
+                            CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.floatArrayArrayWithValues), i,
+                            CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.floatArrayArrayWithValues[i])});
             cfgSet.add(new Object[]{
-                    CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.doubleArrayArrayWithValues), i,
-                    CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.doubleArrayArrayWithValues[i])});
+                            CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.doubleArrayArrayWithValues), i,
+                            CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.doubleArrayArrayWithValues[i])});
             cfgSet.add(new Object[]{
-                    CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.objectArrayArrayWithValues), i,
-                    CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.objectArrayArrayWithValues[i])});
+                            CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.objectArrayArrayWithValues), i,
+                            CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.objectArrayArrayWithValues[i])});
         }
         Stream.concat(ARRAYS_MAP.values().stream(), ARRAY_ARRAYS_MAP.values().stream()).forEach((array) -> {
             for (int i : new int[]{-1, 2}) {
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadConstantArrayElementDataProvider.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadConstantArrayElementDataProvider.java
index f67cec8080c..2b9dc0ca401 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadConstantArrayElementDataProvider.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadConstantArrayElementDataProvider.java
@@ -48,69 +48,67 @@ import jdk.vm.ci.meta.ResolvedJavaField;
 public class ReadConstantArrayElementDataProvider {
 
     // Non-stable array fields names mapped to their base offsets and index scale
-    private static final List<ArrayFieldParams> NON_STABLE_ARRAY_NAMES
-            = new LinkedList<>();
+    private static final List<ArrayFieldParams> NON_STABLE_ARRAY_NAMES = new LinkedList<>();
 
     static {
         NON_STABLE_ARRAY_NAMES.add(
-                new ArrayFieldParams("booleanArrayWithValues", Unsafe.ARRAY_BOOLEAN_BASE_OFFSET,
-                             Unsafe.ARRAY_BOOLEAN_INDEX_SCALE));
+                        new ArrayFieldParams("booleanArrayWithValues", Unsafe.ARRAY_BOOLEAN_BASE_OFFSET,
+                                        Unsafe.ARRAY_BOOLEAN_INDEX_SCALE));
         NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("byteArrayWithValues",
-                                                Unsafe.ARRAY_BYTE_BASE_OFFSET,
-                                                Unsafe.ARRAY_BYTE_INDEX_SCALE));
+                        Unsafe.ARRAY_BYTE_BASE_OFFSET,
+                        Unsafe.ARRAY_BYTE_INDEX_SCALE));
         NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("shortArrayWithValues",
-                                                Unsafe.ARRAY_SHORT_BASE_OFFSET,
-                                                Unsafe.ARRAY_SHORT_INDEX_SCALE));
+                        Unsafe.ARRAY_SHORT_BASE_OFFSET,
+                        Unsafe.ARRAY_SHORT_INDEX_SCALE));
         NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("charArrayWithValues",
-                                                Unsafe.ARRAY_CHAR_BASE_OFFSET,
-                                                Unsafe.ARRAY_CHAR_INDEX_SCALE));
+                        Unsafe.ARRAY_CHAR_BASE_OFFSET,
+                        Unsafe.ARRAY_CHAR_INDEX_SCALE));
         NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("intArrayWithValues",
-                                                Unsafe.ARRAY_INT_BASE_OFFSET,
-                                                Unsafe.ARRAY_INT_INDEX_SCALE));
+                        Unsafe.ARRAY_INT_BASE_OFFSET,
+                        Unsafe.ARRAY_INT_INDEX_SCALE));
         NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("longArrayWithValues",
-                                                Unsafe.ARRAY_LONG_BASE_OFFSET,
-                                                Unsafe.ARRAY_LONG_INDEX_SCALE));
+                        Unsafe.ARRAY_LONG_BASE_OFFSET,
+                        Unsafe.ARRAY_LONG_INDEX_SCALE));
         NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("floatArrayWithValues",
-                                                Unsafe.ARRAY_FLOAT_BASE_OFFSET,
-                                                Unsafe.ARRAY_FLOAT_INDEX_SCALE));
+                        Unsafe.ARRAY_FLOAT_BASE_OFFSET,
+                        Unsafe.ARRAY_FLOAT_INDEX_SCALE));
         NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("doubleArrayWithValues",
-                                                Unsafe.ARRAY_DOUBLE_BASE_OFFSET,
-                                                Unsafe.ARRAY_DOUBLE_INDEX_SCALE));
+                        Unsafe.ARRAY_DOUBLE_BASE_OFFSET,
+                        Unsafe.ARRAY_DOUBLE_INDEX_SCALE));
         NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("objectArrayWithValues",
-                                                Unsafe.ARRAY_BOOLEAN_BASE_OFFSET,
-                                                Unsafe.ARRAY_BOOLEAN_INDEX_SCALE));
+                        Unsafe.ARRAY_BOOLEAN_BASE_OFFSET,
+                        Unsafe.ARRAY_BOOLEAN_INDEX_SCALE));
         NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("booleanArrayArrayWithValues",
-                                                Unsafe.ARRAY_OBJECT_BASE_OFFSET,
-                                                Unsafe.ARRAY_OBJECT_INDEX_SCALE));
+                        Unsafe.ARRAY_OBJECT_BASE_OFFSET,
+                        Unsafe.ARRAY_OBJECT_INDEX_SCALE));
         NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("byteArrayArrayWithValues",
-                                                Unsafe.ARRAY_OBJECT_BASE_OFFSET,
-                                                Unsafe.ARRAY_OBJECT_INDEX_SCALE));
+                        Unsafe.ARRAY_OBJECT_BASE_OFFSET,
+                        Unsafe.ARRAY_OBJECT_INDEX_SCALE));
         NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("shortArrayArrayWithValues",
-                                                Unsafe.ARRAY_OBJECT_BASE_OFFSET,
-                                                Unsafe.ARRAY_OBJECT_INDEX_SCALE));
+                        Unsafe.ARRAY_OBJECT_BASE_OFFSET,
+                        Unsafe.ARRAY_OBJECT_INDEX_SCALE));
         NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("charArrayArrayWithValues",
-                                                Unsafe.ARRAY_OBJECT_BASE_OFFSET,
-                                                Unsafe.ARRAY_OBJECT_INDEX_SCALE));
+                        Unsafe.ARRAY_OBJECT_BASE_OFFSET,
+                        Unsafe.ARRAY_OBJECT_INDEX_SCALE));
         NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("intArrayArrayWithValues",
-                                                Unsafe.ARRAY_OBJECT_BASE_OFFSET,
-                                                Unsafe.ARRAY_OBJECT_INDEX_SCALE));
+                        Unsafe.ARRAY_OBJECT_BASE_OFFSET,
+                        Unsafe.ARRAY_OBJECT_INDEX_SCALE));
         NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("longArrayArrayWithValues",
-                                                Unsafe.ARRAY_OBJECT_BASE_OFFSET,
-                                                Unsafe.ARRAY_OBJECT_INDEX_SCALE));
+                        Unsafe.ARRAY_OBJECT_BASE_OFFSET,
+                        Unsafe.ARRAY_OBJECT_INDEX_SCALE));
         NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("floatArrayArrayWithValues",
-                                                Unsafe.ARRAY_OBJECT_BASE_OFFSET,
-                                                Unsafe.ARRAY_OBJECT_INDEX_SCALE));
+                        Unsafe.ARRAY_OBJECT_BASE_OFFSET,
+                        Unsafe.ARRAY_OBJECT_INDEX_SCALE));
         NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("doubleArrayArrayWithValues",
-                                                Unsafe.ARRAY_OBJECT_BASE_OFFSET,
-                                                Unsafe.ARRAY_OBJECT_INDEX_SCALE));
+                        Unsafe.ARRAY_OBJECT_BASE_OFFSET,
+                        Unsafe.ARRAY_OBJECT_INDEX_SCALE));
         NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("objectArrayArrayWithValues",
-                                                Unsafe.ARRAY_OBJECT_BASE_OFFSET,
-                                                Unsafe.ARRAY_OBJECT_INDEX_SCALE));
+                        Unsafe.ARRAY_OBJECT_BASE_OFFSET,
+                        Unsafe.ARRAY_OBJECT_INDEX_SCALE));
     }
 
     // Stable array fields names mapped to their base offsets and index scale
-    private static final List<ArrayFieldParams> STABLE_ARRAY_NAMES
-            = new LinkedList<>();
+    private static final List<ArrayFieldParams> STABLE_ARRAY_NAMES = new LinkedList<>();
 
     static {
         NON_STABLE_ARRAY_NAMES.stream().forEach((entry) -> {
@@ -118,7 +116,7 @@ public class ReadConstantArrayElementDataProvider {
             char firstChar = nsFieldName.charAt(0);
             char newFirstChar = Character.toUpperCase(firstChar);
             String sFieldName = nsFieldName.replaceFirst("" + firstChar,
-                                                         "" + newFirstChar);
+                            "" + newFirstChar);
             sFieldName = "stable" + sFieldName;
             STABLE_ARRAY_NAMES.add(new ArrayFieldParams(sFieldName, entry.offsetBase, entry.scale));
         });
@@ -131,33 +129,31 @@ public class ReadConstantArrayElementDataProvider {
             NON_STABLE_ARRAY_NAMES.stream().forEach((entry) -> {
                 String fieldName = entry.name;
                 cfgSet.add(new Object[]{
-                        readFieldValue(fieldName),
-                        i,
-                        null,
-                        "array field \"" + fieldName + "\" for index " + i});
+                                readFieldValue(fieldName),
+                                i,
+                                null,
+                                "array field \"" + fieldName + "\" for index " + i});
             });
             STABLE_ARRAY_NAMES.stream().forEach((entry) -> {
                 String fieldName = entry.name;
                 cfgSet.add(new Object[]{
-                        readFieldValue(fieldName),
-                        i,
-                        i == 0 ? getJavaConstant(fieldName) : null,
-                        "array field \"" + fieldName + "\" for index " + i});
+                                readFieldValue(fieldName),
+                                i,
+                                i == 0 ? getJavaConstant(fieldName) : null,
+                                "array field \"" + fieldName + "\" for index " + i});
             });
         }
-        Stream<Map.Entry<ResolvedJavaField, JavaConstant>> arraysStream1
-                = Stream.concat(ARRAYS_MAP.entrySet().stream(),
-                                ARRAY_ARRAYS_MAP.entrySet().stream());
-        Stream<Map.Entry<ResolvedJavaField, JavaConstant>> arraysStream2
-                = Stream.concat(STABLE_ARRAYS_MAP.entrySet().stream(),
-                                STABLE_ARRAY_ARRAYS_MAP.entrySet().stream());
+        Stream<Map.Entry<ResolvedJavaField, JavaConstant>> arraysStream1 = Stream.concat(ARRAYS_MAP.entrySet().stream(),
+                        ARRAY_ARRAYS_MAP.entrySet().stream());
+        Stream<Map.Entry<ResolvedJavaField, JavaConstant>> arraysStream2 = Stream.concat(STABLE_ARRAYS_MAP.entrySet().stream(),
+                        STABLE_ARRAY_ARRAYS_MAP.entrySet().stream());
         Stream.concat(arraysStream1, arraysStream2).forEach((array) -> {
             for (int i : new int[]{-1, 2}) {
                 cfgSet.add(new Object[]{
-                        array.getValue(),
-                        i,
-                        null,
-                        "array field \"" + array.getKey() + "\" for index " + i});
+                                array.getValue(),
+                                i,
+                                null,
+                                "array field \"" + array.getKey() + "\" for index " + i});
             }
         });
         cfgSet.add(new Object[]{null, 0, null, "null"});
@@ -180,10 +176,10 @@ public class ReadConstantArrayElementDataProvider {
                 String fieldName = entry.name;
                 long offset = (long) (entry.offsetBase + i * entry.scale);
                 cfgSet.add(new Object[]{
-                        readFieldValue(fieldName),
-                        offset,
-                        null,
-                        "array field \"" + fieldName + "\" for offset " + offset});
+                                readFieldValue(fieldName),
+                                offset,
+                                null,
+                                "array field \"" + fieldName + "\" for offset " + offset});
             });
         }
         // Testing stable arrays. Result should be null in all cases except "offset = base + 0"
@@ -192,10 +188,10 @@ public class ReadConstantArrayElementDataProvider {
                 String fieldName = entry.name;
                 long offset = (long) Math.ceil(entry.offsetBase + i * entry.scale);
                 cfgSet.add(new Object[]{
-                        readFieldValue(fieldName),
-                        offset,
-                        null,
-                        "array field \"" + fieldName + "\" for offset " + offset});
+                                readFieldValue(fieldName),
+                                offset,
+                                null,
+                                "array field \"" + fieldName + "\" for offset " + offset});
             });
         }
         // Testing stable arrays "offset = base + 0". Result should be non-null
@@ -203,10 +199,10 @@ public class ReadConstantArrayElementDataProvider {
             String fieldName = entry.name;
             long offset = (long) entry.offsetBase;
             cfgSet.add(new Object[]{
-                    readFieldValue(fieldName),
-                    offset,
-                    getJavaConstant(fieldName),
-                    "array field \"" + fieldName + "\" for offset " + offset});
+                            readFieldValue(fieldName),
+                            offset,
+                            getJavaConstant(fieldName),
+                            "array field \"" + fieldName + "\" for offset " + offset});
         });
         // Testing null as array
         cfgSet.add(new Object[]{null, 0, null, "null"});
@@ -225,7 +221,7 @@ public class ReadConstantArrayElementDataProvider {
 
     private static JavaConstant readFieldValue(String fieldName) {
         return CONSTANT_REFLECTION_PROVIDER.readFieldValue(getResolvedJavaField(DummyClass.class, fieldName),
-                                                           DUMMY_CLASS_CONSTANT);
+                        DUMMY_CLASS_CONSTANT);
     }
 
     private static JavaConstant getJavaConstant(String fieldName) {
@@ -281,10 +277,10 @@ public class ReadConstantArrayElementDataProvider {
         public final int offsetBase;
         public final int scale;
 
-       ArrayFieldParams(String name, int offsetBase, int scale) {
-           this.name = name;
-           this.offsetBase = offsetBase;
-           this.scale = scale;
-       }
+        ArrayFieldParams(String name, int offsetBase, int scale) {
+            this.name = name;
+            this.offsetBase = offsetBase;
+            this.scale = scale;
+        }
     }
 }
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadConstantFieldValueDataProvider.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadConstantFieldValueDataProvider.java
index c22afec8792..9f3033ae7dc 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadConstantFieldValueDataProvider.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadConstantFieldValueDataProvider.java
@@ -39,7 +39,6 @@ import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
 import jdk.vm.ci.meta.JavaConstant;
 import org.testng.annotations.DataProvider;
 
-
 public class ReadConstantFieldValueDataProvider {
 
     @DataProvider(name = "readConstantFieldValueDataProvider")
@@ -56,32 +55,32 @@ public class ReadConstantFieldValueDataProvider {
         // Testing instance final non-default fields
         INSTANCE_FINAL_FIELDS_MAP.entrySet().stream().forEach((field) -> {
             cfgSet.add(new Object[]{field.getKey(),
-                    DUMMY_CLASS_CONSTANT,
-                    field.getValue(),
-                    "instance final field"});
+                            DUMMY_CLASS_CONSTANT,
+                            field.getValue(),
+                            "instance final field"});
         });
         // Testing instance final default fields.
         boolean trustDefFinal = HotSpotJVMCIRuntime.Option.TrustFinalDefaultFields.getBoolean();
         INSTANCE_FINAL_DEFAULT_FIELDS_MAP.entrySet().stream().forEach((field) -> {
             JavaConstant expected = trustDefFinal ? field.getValue() : null;
             cfgSet.add(new Object[]{field.getKey(),
-                    DUMMY_CLASS_CONSTANT,
-                    expected,
-                    "instance final default field"});
+                            DUMMY_CLASS_CONSTANT,
+                            expected,
+                            "instance final default field"});
         });
         // Testing instance stable non-default fields
         INSTANCE_STABLE_FIELDS_MAP.entrySet().stream().forEach((field) -> {
             cfgSet.add(new Object[]{field.getKey(),
-                    DUMMY_CLASS_CONSTANT,
-                    field.getValue(),
-                    "instance stable field"});
+                            DUMMY_CLASS_CONSTANT,
+                            field.getValue(),
+                            "instance stable field"});
         });
         // Testing instance stable default fields
         INSTANCE_STABLE_DEFAULT_FIELDS_MAP.entrySet().stream().forEach((field) -> {
             cfgSet.add(new Object[]{field.getKey(),
-                    DUMMY_CLASS_CONSTANT,
-                    null,
-                    "instance stable default field"});
+                            DUMMY_CLASS_CONSTANT,
+                            null,
+                            "instance stable default field"});
         });
         // Testing regular instance fields
         INSTANCE_FIELDS_MAP.entrySet().stream().forEach((field) -> {
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadFieldValueDataProvider.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadFieldValueDataProvider.java
index c3872352ee8..a46f25ccf5f 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadFieldValueDataProvider.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadFieldValueDataProvider.java
@@ -39,7 +39,6 @@ import java.util.LinkedList;
 import jdk.vm.ci.meta.JavaConstant;
 import org.testng.annotations.DataProvider;
 
-
 public class ReadFieldValueDataProvider {
 
     @DataProvider(name = "readFieldValueDataProvider")
@@ -48,8 +47,8 @@ public class ReadFieldValueDataProvider {
         // Testing instance non-stable fields
         INSTANCE_FIELDS_MAP.entrySet().stream().forEach((instanceField) -> {
             cfgSet.add(new Object[]{instanceField.getKey(),
-                    DUMMY_CLASS_CONSTANT,
-                    instanceField.getValue()});
+                            DUMMY_CLASS_CONSTANT,
+                            instanceField.getValue()});
         });
         // Testing static non-stable fields with null as receiver
         STATIC_FIELDS_MAP.entrySet().stream().forEach((staticField) -> {
@@ -58,14 +57,14 @@ public class ReadFieldValueDataProvider {
         // Testing static non-stable fields with JavaConstant.NULL_POINTER as receiver
         STATIC_FIELDS_MAP.entrySet().stream().forEach((staticField) -> {
             cfgSet.add(new Object[]{staticField.getKey(),
-                    JavaConstant.NULL_POINTER,
-                    staticField.getValue()});
+                            JavaConstant.NULL_POINTER,
+                            staticField.getValue()});
         });
         // Testing instance stable fields
         INSTANCE_STABLE_FIELDS_MAP.entrySet().stream().forEach((instanceField) -> {
             cfgSet.add(new Object[]{instanceField.getKey(),
-                    DUMMY_CLASS_CONSTANT,
-                    instanceField.getValue()});
+                            DUMMY_CLASS_CONSTANT,
+                            instanceField.getValue()});
         });
         // Testing static stable fields with null as receiver
         STATIC_STABLE_FIELDS_MAP.entrySet().stream().forEach((staticField) -> {
@@ -74,32 +73,32 @@ public class ReadFieldValueDataProvider {
         // Testing static stable fields with JavaConstant.NULL_POINTER as receiver
         STATIC_STABLE_FIELDS_MAP.entrySet().stream().forEach((staticField) -> {
             cfgSet.add(new Object[]{staticField.getKey(),
-                    JavaConstant.NULL_POINTER,
-                    staticField.getValue()});
+                            JavaConstant.NULL_POINTER,
+                            staticField.getValue()});
         });
         // Testing instance non-stable array fields
         ARRAYS_MAP.entrySet().stream().forEach((instanceField) -> {
             cfgSet.add(new Object[]{instanceField.getKey(),
-                    DUMMY_CLASS_CONSTANT,
-                    instanceField.getValue()});
+                            DUMMY_CLASS_CONSTANT,
+                            instanceField.getValue()});
         });
         // Testing instance stable array fields
         STABLE_ARRAYS_MAP.entrySet().stream().forEach((instanceField) -> {
             cfgSet.add(new Object[]{instanceField.getKey(),
-                    DUMMY_CLASS_CONSTANT,
-                    instanceField.getValue()});
+                            DUMMY_CLASS_CONSTANT,
+                            instanceField.getValue()});
         });
         // Testing instance non-stable array-of-array fields
         ARRAY_ARRAYS_MAP.entrySet().stream().forEach((instanceField) -> {
             cfgSet.add(new Object[]{instanceField.getKey(),
-                    DUMMY_CLASS_CONSTANT,
-                    instanceField.getValue()});
+                            DUMMY_CLASS_CONSTANT,
+                            instanceField.getValue()});
         });
         // Testing instance stable array-of-array fields
         STABLE_ARRAY_ARRAYS_MAP.entrySet().stream().forEach((instanceField) -> {
             cfgSet.add(new Object[]{instanceField.getKey(),
-                    DUMMY_CLASS_CONSTANT,
-                    instanceField.getValue()});
+                            DUMMY_CLASS_CONSTANT,
+                            instanceField.getValue()});
         });
         // Testing instance fields with JavaConstant.NULL_POINTER as receiver
         INSTANCE_FIELDS_MAP.entrySet().stream().forEach((instanceField) -> {
@@ -108,8 +107,8 @@ public class ReadFieldValueDataProvider {
         // Testing instance fields with an object that does not have the field
         INSTANCE_FIELDS_MAP.entrySet().stream().forEach((instanceField) -> {
             cfgSet.add(new Object[]{instanceField.getKey(),
-                    CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.objectField),
-                    null});
+                            CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.objectField),
+                            null});
         });
         return cfgSet.toArray(new Object[0][0]);
     }
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadStableFieldValueDataProvider.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadStableFieldValueDataProvider.java
index 5a62a15a18c..ef8f8d392fd 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadStableFieldValueDataProvider.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadStableFieldValueDataProvider.java
@@ -48,58 +48,58 @@ public class ReadStableFieldValueDataProvider {
             // Testing instance non-stable fields
             INSTANCE_FIELDS_MAP.entrySet().stream().forEach((instanceField) -> {
                 cfgSet.add(new Object[]{instanceField.getKey(),
-                        DUMMY_CLASS_CONSTANT,
-                        isDefStab,
-                        instanceField.getValue()});
+                                DUMMY_CLASS_CONSTANT,
+                                isDefStab,
+                                instanceField.getValue()});
             });
             // Testing static non-stable fields with null as receiver
             STATIC_FIELDS_MAP.entrySet().stream().forEach((staticField) -> {
                 cfgSet.add(new Object[]{staticField.getKey(),
-                        null,
-                        isDefStab,
-                        staticField.getValue()});
+                                null,
+                                isDefStab,
+                                staticField.getValue()});
             });
             // Testing static non-stable fields with JavaConstant.NULL_POINTER as receiver
             STATIC_FIELDS_MAP.entrySet().stream().forEach((staticField) -> {
                 cfgSet.add(new Object[]{staticField.getKey(),
-                        JavaConstant.NULL_POINTER,
-                        isDefStab,
-                        staticField.getValue()});
+                                JavaConstant.NULL_POINTER,
+                                isDefStab,
+                                staticField.getValue()});
             });
             // Testing instance stable fields
             INSTANCE_STABLE_FIELDS_MAP.entrySet().stream().forEach((instanceField) -> {
                 cfgSet.add(new Object[]{instanceField.getKey(),
-                        DUMMY_CLASS_CONSTANT,
-                        isDefStab,
-                        instanceField.getValue()});
+                                DUMMY_CLASS_CONSTANT,
+                                isDefStab,
+                                instanceField.getValue()});
             });
             // Testing static stable fields with null as receiver
             STATIC_STABLE_FIELDS_MAP.entrySet().stream().forEach((staticField) -> {
                 cfgSet.add(new Object[]{staticField.getKey(),
-                        null,
-                        isDefStab,
-                        staticField.getValue()});
+                                null,
+                                isDefStab,
+                                staticField.getValue()});
             });
             // Testing static stable fields with JavaConstant.NULL_POINTER as receiver
             STATIC_STABLE_FIELDS_MAP.entrySet().stream().forEach((staticField) -> {
                 cfgSet.add(new Object[]{staticField.getKey(),
-                        JavaConstant.NULL_POINTER,
-                        isDefStab,
-                        staticField.getValue()});
+                                JavaConstant.NULL_POINTER,
+                                isDefStab,
+                                staticField.getValue()});
             });
             // Testing instance fields with JavaConstant.NULL_POINTER as receiver
             INSTANCE_FIELDS_MAP.entrySet().stream().forEach((instanceField) -> {
                 cfgSet.add(new Object[]{instanceField.getKey(),
-                        JavaConstant.NULL_POINTER,
-                        isDefStab,
-                        null});
+                                JavaConstant.NULL_POINTER,
+                                isDefStab,
+                                null});
             });
             // Testing instance fields with an object that does not have the field
             INSTANCE_FIELDS_MAP.entrySet().stream().forEach((instanceField) -> {
                 cfgSet.add(new Object[]{instanceField.getKey(),
-                        CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.objectField),
-                        isDefStab,
-                        null});
+                                CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.objectField),
+                                isDefStab,
+                                null});
             });
         }
         return cfgSet.toArray(new Object[0][0]);
@@ -112,34 +112,34 @@ public class ReadStableFieldValueDataProvider {
             // Testing instance non-stable array fields
             ARRAYS_MAP.entrySet().stream().forEach((instanceField) -> {
                 cfgSet.add(new Object[]{instanceField.getKey(),
-                        DUMMY_CLASS_CONSTANT,
-                        isDefStab,
-                        TestHelper.ARRAY_DIMENSION,
-                        instanceField.getValue()});
+                                DUMMY_CLASS_CONSTANT,
+                                isDefStab,
+                                TestHelper.ARRAY_DIMENSION,
+                                instanceField.getValue()});
             });
             // Testing instance stable array fields
             STABLE_ARRAYS_MAP.entrySet().stream().forEach((instanceField) -> {
                 cfgSet.add(new Object[]{instanceField.getKey(),
-                        DUMMY_CLASS_CONSTANT,
-                        isDefStab,
-                        TestHelper.ARRAY_DIMENSION,
-                        instanceField.getValue()});
+                                DUMMY_CLASS_CONSTANT,
+                                isDefStab,
+                                TestHelper.ARRAY_DIMENSION,
+                                instanceField.getValue()});
             });
             // Testing instance non-stable array-of-array fields
             ARRAY_ARRAYS_MAP.entrySet().stream().forEach((instanceField) -> {
                 cfgSet.add(new Object[]{instanceField.getKey(),
-                        DUMMY_CLASS_CONSTANT,
-                        isDefStab,
-                        TestHelper.ARRAY_OF_ARRAYS_DIMENSION,
-                        instanceField.getValue()});
+                                DUMMY_CLASS_CONSTANT,
+                                isDefStab,
+                                TestHelper.ARRAY_OF_ARRAYS_DIMENSION,
+                                instanceField.getValue()});
             });
             // Testing instance stable array-of-array fields
             STABLE_ARRAY_ARRAYS_MAP.entrySet().stream().forEach((instanceField) -> {
                 cfgSet.add(new Object[]{instanceField.getKey(),
-                        DUMMY_CLASS_CONSTANT,
-                        isDefStab,
-                        TestHelper.ARRAY_OF_ARRAYS_DIMENSION,
-                        instanceField.getValue()});
+                                DUMMY_CLASS_CONSTANT,
+                                isDefStab,
+                                TestHelper.ARRAY_OF_ARRAYS_DIMENSION,
+                                instanceField.getValue()});
             });
         }
         return cfgSet.toArray(new Object[0][0]);
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestHelper.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestHelper.java
index bb2c977e582..09ee0d713c7 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestHelper.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestHelper.java
@@ -35,298 +35,288 @@ import jdk.vm.ci.runtime.JVMCI;
 public class TestHelper {
 
     public static final DummyClass DUMMY_CLASS_INSTANCE = new DummyClass();
-    public static final HotSpotConstantReflectionProvider CONSTANT_REFLECTION_PROVIDER
-            = (HotSpotConstantReflectionProvider) JVMCI.getRuntime().getHostJVMCIBackend().getConstantReflection();
-    public static final JavaConstant DUMMY_CLASS_CONSTANT
-            = CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE);
+    public static final HotSpotConstantReflectionProvider CONSTANT_REFLECTION_PROVIDER = (HotSpotConstantReflectionProvider) JVMCI.getRuntime().getHostJVMCIBackend().getConstantReflection();
+    public static final JavaConstant DUMMY_CLASS_CONSTANT = CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE);
 
-    public static final Map<ResolvedJavaField, JavaConstant> INSTANCE_FIELDS_MAP
-            = new HashMap<>();
+    public static final Map<ResolvedJavaField, JavaConstant> INSTANCE_FIELDS_MAP = new HashMap<>();
 
     static {
         INSTANCE_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "booleanField"),
-                                JavaConstant.forBoolean(DUMMY_CLASS_INSTANCE.booleanField));
+                        JavaConstant.forBoolean(DUMMY_CLASS_INSTANCE.booleanField));
         INSTANCE_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "byteField"),
-                                JavaConstant.forByte(DUMMY_CLASS_INSTANCE.byteField));
+                        JavaConstant.forByte(DUMMY_CLASS_INSTANCE.byteField));
         INSTANCE_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "shortField"),
-                                JavaConstant.forShort(DUMMY_CLASS_INSTANCE.shortField));
+                        JavaConstant.forShort(DUMMY_CLASS_INSTANCE.shortField));
         INSTANCE_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "charField"),
-                                JavaConstant.forChar(DUMMY_CLASS_INSTANCE.charField));
+                        JavaConstant.forChar(DUMMY_CLASS_INSTANCE.charField));
         INSTANCE_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "intField"),
-                                JavaConstant.forInt(DUMMY_CLASS_INSTANCE.intField));
+                        JavaConstant.forInt(DUMMY_CLASS_INSTANCE.intField));
         INSTANCE_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "longField"),
-                                JavaConstant.forLong(DUMMY_CLASS_INSTANCE.longField));
+                        JavaConstant.forLong(DUMMY_CLASS_INSTANCE.longField));
         INSTANCE_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "floatField"),
-                                JavaConstant.forFloat(DUMMY_CLASS_INSTANCE.floatField));
+                        JavaConstant.forFloat(DUMMY_CLASS_INSTANCE.floatField));
         INSTANCE_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "doubleField"),
-                                JavaConstant.forDouble(DUMMY_CLASS_INSTANCE.doubleField));
+                        JavaConstant.forDouble(DUMMY_CLASS_INSTANCE.doubleField));
         INSTANCE_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "objectField"),
-                                CONSTANT_REFLECTION_PROVIDER.forObject(
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
                                         DUMMY_CLASS_INSTANCE.objectField));
     }
 
-    public static final Map<ResolvedJavaField, JavaConstant> INSTANCE_FINAL_FIELDS_MAP
-            = new HashMap<>();
+    public static final Map<ResolvedJavaField, JavaConstant> INSTANCE_FINAL_FIELDS_MAP = new HashMap<>();
 
     static {
         INSTANCE_FINAL_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "finalBooleanField"),
-                                      JavaConstant.forBoolean(
-                                              DUMMY_CLASS_INSTANCE.finalBooleanField));
+                        JavaConstant.forBoolean(
+                                        DUMMY_CLASS_INSTANCE.finalBooleanField));
         INSTANCE_FINAL_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "finalByteField"),
-                                      JavaConstant.forByte(DUMMY_CLASS_INSTANCE.finalByteField));
+                        JavaConstant.forByte(DUMMY_CLASS_INSTANCE.finalByteField));
         INSTANCE_FINAL_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "finalShortField"),
-                                      JavaConstant.forShort(DUMMY_CLASS_INSTANCE.finalShortField));
+                        JavaConstant.forShort(DUMMY_CLASS_INSTANCE.finalShortField));
         INSTANCE_FINAL_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "finalCharField"),
-                                      JavaConstant.forChar(DUMMY_CLASS_INSTANCE.finalCharField));
+                        JavaConstant.forChar(DUMMY_CLASS_INSTANCE.finalCharField));
         INSTANCE_FINAL_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "finalIntField"),
-                                      JavaConstant.forInt(DUMMY_CLASS_INSTANCE.finalIntField));
+                        JavaConstant.forInt(DUMMY_CLASS_INSTANCE.finalIntField));
         INSTANCE_FINAL_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "finalLongField"),
-                                      JavaConstant.forLong(DUMMY_CLASS_INSTANCE.finalLongField));
+                        JavaConstant.forLong(DUMMY_CLASS_INSTANCE.finalLongField));
         INSTANCE_FINAL_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "finalFloatField"),
-                                      JavaConstant.forFloat(DUMMY_CLASS_INSTANCE.finalFloatField));
+                        JavaConstant.forFloat(DUMMY_CLASS_INSTANCE.finalFloatField));
         INSTANCE_FINAL_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "finalDoubleField"),
-                                      JavaConstant.forDouble(
-                                              DUMMY_CLASS_INSTANCE.finalDoubleField));
+                        JavaConstant.forDouble(
+                                        DUMMY_CLASS_INSTANCE.finalDoubleField));
         INSTANCE_FINAL_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "finalObjectField"),
-                                      CONSTANT_REFLECTION_PROVIDER.forObject(
-                                              DUMMY_CLASS_INSTANCE.finalObjectField));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.finalObjectField));
     }
 
-    public static final Map<ResolvedJavaField, JavaConstant> INSTANCE_FINAL_DEFAULT_FIELDS_MAP
-            = new HashMap<>();
+    public static final Map<ResolvedJavaField, JavaConstant> INSTANCE_FINAL_DEFAULT_FIELDS_MAP = new HashMap<>();
 
     static {
         INSTANCE_FINAL_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                   "finalDefaultBooleanField"),
-                                              JavaConstant.forBoolean(
-                                                      DUMMY_CLASS_INSTANCE.finalDefaultBooleanField));
+                        "finalDefaultBooleanField"),
+                        JavaConstant.forBoolean(
+                                        DUMMY_CLASS_INSTANCE.finalDefaultBooleanField));
         INSTANCE_FINAL_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                   "finalDefaultByteField"),
-                                              JavaConstant.forByte(
-                                                      DUMMY_CLASS_INSTANCE.finalDefaultByteField));
+                        "finalDefaultByteField"),
+                        JavaConstant.forByte(
+                                        DUMMY_CLASS_INSTANCE.finalDefaultByteField));
         INSTANCE_FINAL_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                   "finalDefaultShortField"),
-                                              JavaConstant.forShort(
-                                                      DUMMY_CLASS_INSTANCE.finalDefaultShortField));
+                        "finalDefaultShortField"),
+                        JavaConstant.forShort(
+                                        DUMMY_CLASS_INSTANCE.finalDefaultShortField));
         INSTANCE_FINAL_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                   "finalDefaultCharField"),
-                                              JavaConstant.forChar(
-                                                      DUMMY_CLASS_INSTANCE.finalDefaultCharField));
+                        "finalDefaultCharField"),
+                        JavaConstant.forChar(
+                                        DUMMY_CLASS_INSTANCE.finalDefaultCharField));
         INSTANCE_FINAL_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                   "finalDefaultIntField"),
-                                              JavaConstant.forInt(
-                                                      DUMMY_CLASS_INSTANCE.finalDefaultIntField));
+                        "finalDefaultIntField"),
+                        JavaConstant.forInt(
+                                        DUMMY_CLASS_INSTANCE.finalDefaultIntField));
         INSTANCE_FINAL_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                   "finalDefaultLongField"),
-                                              JavaConstant.forLong(
-                                                      DUMMY_CLASS_INSTANCE.finalDefaultLongField));
+                        "finalDefaultLongField"),
+                        JavaConstant.forLong(
+                                        DUMMY_CLASS_INSTANCE.finalDefaultLongField));
         INSTANCE_FINAL_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                   "finalDefaultFloatField"),
-                                              JavaConstant.forFloat(
-                                                      DUMMY_CLASS_INSTANCE.finalDefaultFloatField));
+                        "finalDefaultFloatField"),
+                        JavaConstant.forFloat(
+                                        DUMMY_CLASS_INSTANCE.finalDefaultFloatField));
         INSTANCE_FINAL_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                   "finalDefaultDoubleField"),
-                                              JavaConstant.forDouble(
-                                                      DUMMY_CLASS_INSTANCE.finalDefaultDoubleField));
+                        "finalDefaultDoubleField"),
+                        JavaConstant.forDouble(
+                                        DUMMY_CLASS_INSTANCE.finalDefaultDoubleField));
         INSTANCE_FINAL_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                   "finalDefaultObjectField"),
-                                              CONSTANT_REFLECTION_PROVIDER.forObject(
-                                                      DUMMY_CLASS_INSTANCE.finalDefaultObjectField));
+                        "finalDefaultObjectField"),
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.finalDefaultObjectField));
     }
 
-    public static final Map<ResolvedJavaField, JavaConstant> INSTANCE_STABLE_FIELDS_MAP
-            = new HashMap<>();
+    public static final Map<ResolvedJavaField, JavaConstant> INSTANCE_STABLE_FIELDS_MAP = new HashMap<>();
 
     static {
         INSTANCE_STABLE_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "stableBooleanField"),
-                                       JavaConstant.forBoolean(
-                                               DUMMY_CLASS_INSTANCE.stableBooleanField));
+                        JavaConstant.forBoolean(
+                                        DUMMY_CLASS_INSTANCE.stableBooleanField));
         INSTANCE_STABLE_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "stableByteField"),
-                                       JavaConstant.forByte(DUMMY_CLASS_INSTANCE.stableByteField));
+                        JavaConstant.forByte(DUMMY_CLASS_INSTANCE.stableByteField));
         INSTANCE_STABLE_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "stableShortField"),
-                                       JavaConstant.forShort(
-                                               DUMMY_CLASS_INSTANCE.stableShortField));
+                        JavaConstant.forShort(
+                                        DUMMY_CLASS_INSTANCE.stableShortField));
         INSTANCE_STABLE_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "stableCharField"),
-                                       JavaConstant.forChar(DUMMY_CLASS_INSTANCE.stableCharField));
+                        JavaConstant.forChar(DUMMY_CLASS_INSTANCE.stableCharField));
         INSTANCE_STABLE_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "stableIntField"),
-                                       JavaConstant.forInt(DUMMY_CLASS_INSTANCE.stableIntField));
+                        JavaConstant.forInt(DUMMY_CLASS_INSTANCE.stableIntField));
         INSTANCE_STABLE_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "stableLongField"),
-                                       JavaConstant.forLong(DUMMY_CLASS_INSTANCE.stableLongField));
+                        JavaConstant.forLong(DUMMY_CLASS_INSTANCE.stableLongField));
         INSTANCE_STABLE_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "stableFloatField"),
-                                       JavaConstant.forFloat(
-                                               DUMMY_CLASS_INSTANCE.stableFloatField));
+                        JavaConstant.forFloat(
+                                        DUMMY_CLASS_INSTANCE.stableFloatField));
         INSTANCE_STABLE_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "stableDoubleField"),
-                                       JavaConstant.forDouble(
-                                               DUMMY_CLASS_INSTANCE.stableDoubleField));
+                        JavaConstant.forDouble(
+                                        DUMMY_CLASS_INSTANCE.stableDoubleField));
         INSTANCE_STABLE_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "stableObjectField"),
-                                       CONSTANT_REFLECTION_PROVIDER.forObject(
-                                               DUMMY_CLASS_INSTANCE.stableObjectField));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.stableObjectField));
     }
 
-    public static final Map<ResolvedJavaField, JavaConstant> INSTANCE_STABLE_DEFAULT_FIELDS_MAP
-            = new HashMap<>();
+    public static final Map<ResolvedJavaField, JavaConstant> INSTANCE_STABLE_DEFAULT_FIELDS_MAP = new HashMap<>();
 
     static {
         INSTANCE_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                    "stableDefaultBooleanField"),
-                                               JavaConstant.forBoolean(
-                                                       DUMMY_CLASS_INSTANCE.stableDefaultBooleanField));
+                        "stableDefaultBooleanField"),
+                        JavaConstant.forBoolean(
+                                        DUMMY_CLASS_INSTANCE.stableDefaultBooleanField));
         INSTANCE_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                    "stableDefaultByteField"),
-                                               JavaConstant.forByte(
-                                                       DUMMY_CLASS_INSTANCE.stableDefaultByteField));
+                        "stableDefaultByteField"),
+                        JavaConstant.forByte(
+                                        DUMMY_CLASS_INSTANCE.stableDefaultByteField));
         INSTANCE_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                    "stableDefaultShortField"),
-                                               JavaConstant.forShort(
-                                                       DUMMY_CLASS_INSTANCE.stableDefaultShortField));
+                        "stableDefaultShortField"),
+                        JavaConstant.forShort(
+                                        DUMMY_CLASS_INSTANCE.stableDefaultShortField));
         INSTANCE_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                    "stableDefaultCharField"),
-                                               JavaConstant.forChar(
-                                                       DUMMY_CLASS_INSTANCE.stableDefaultCharField));
+                        "stableDefaultCharField"),
+                        JavaConstant.forChar(
+                                        DUMMY_CLASS_INSTANCE.stableDefaultCharField));
         INSTANCE_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                    "stableDefaultIntField"),
-                                               JavaConstant.forInt(
-                                                       DUMMY_CLASS_INSTANCE.stableDefaultIntField));
+                        "stableDefaultIntField"),
+                        JavaConstant.forInt(
+                                        DUMMY_CLASS_INSTANCE.stableDefaultIntField));
         INSTANCE_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                    "stableDefaultLongField"),
-                                               JavaConstant.forLong(
-                                                       DUMMY_CLASS_INSTANCE.stableDefaultLongField));
+                        "stableDefaultLongField"),
+                        JavaConstant.forLong(
+                                        DUMMY_CLASS_INSTANCE.stableDefaultLongField));
         INSTANCE_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                    "stableDefaultFloatField"),
-                                               JavaConstant.forFloat(
-                                                       DUMMY_CLASS_INSTANCE.stableDefaultFloatField));
+                        "stableDefaultFloatField"),
+                        JavaConstant.forFloat(
+                                        DUMMY_CLASS_INSTANCE.stableDefaultFloatField));
         INSTANCE_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                    "stableDefaultDoubleField"),
-                                               JavaConstant.forDouble(
-                                                       DUMMY_CLASS_INSTANCE.stableDefaultDoubleField));
+                        "stableDefaultDoubleField"),
+                        JavaConstant.forDouble(
+                                        DUMMY_CLASS_INSTANCE.stableDefaultDoubleField));
         INSTANCE_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                    "stableDefaultObjectField"),
-                                               CONSTANT_REFLECTION_PROVIDER.forObject(
-                                                       DUMMY_CLASS_INSTANCE.stableDefaultObjectField));
+                        "stableDefaultObjectField"),
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.stableDefaultObjectField));
     }
 
     public static final Map<ResolvedJavaField, JavaConstant> STATIC_FIELDS_MAP = new HashMap<>();
 
     static {
         STATIC_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "staticBooleanField"),
-                              JavaConstant.forBoolean(DummyClass.staticBooleanField));
+                        JavaConstant.forBoolean(DummyClass.staticBooleanField));
         STATIC_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "staticByteField"),
-                              JavaConstant.forByte(DummyClass.staticByteField));
+                        JavaConstant.forByte(DummyClass.staticByteField));
         STATIC_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "staticShortField"),
-                              JavaConstant.forShort(DummyClass.staticShortField));
+                        JavaConstant.forShort(DummyClass.staticShortField));
         STATIC_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "staticCharField"),
-                              JavaConstant.forChar(DummyClass.staticCharField));
+                        JavaConstant.forChar(DummyClass.staticCharField));
         STATIC_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "staticIntField"),
-                              JavaConstant.forInt(DummyClass.staticIntField));
+                        JavaConstant.forInt(DummyClass.staticIntField));
         STATIC_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "staticLongField"),
-                              JavaConstant.forLong(DummyClass.staticLongField));
+                        JavaConstant.forLong(DummyClass.staticLongField));
         STATIC_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "staticFloatField"),
-                              JavaConstant.forFloat(DummyClass.staticFloatField));
+                        JavaConstant.forFloat(DummyClass.staticFloatField));
         STATIC_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "staticDoubleField"),
-                              JavaConstant.forDouble(DummyClass.staticDoubleField));
+                        JavaConstant.forDouble(DummyClass.staticDoubleField));
         STATIC_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "staticObjectField"),
-                              CONSTANT_REFLECTION_PROVIDER.forObject(DummyClass.staticObjectField));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(DummyClass.staticObjectField));
     }
 
-    public static final Map<ResolvedJavaField, JavaConstant> STATIC_FINAL_FIELDS_MAP
-            = new HashMap<>();
+    public static final Map<ResolvedJavaField, JavaConstant> STATIC_FINAL_FIELDS_MAP = new HashMap<>();
 
     static {
         STATIC_FINAL_FIELDS_MAP.put(
-                getResolvedJavaField(DummyClass.class, "staticFinalBooleanField"),
-                JavaConstant.forBoolean(DummyClass.staticFinalBooleanField));
+                        getResolvedJavaField(DummyClass.class, "staticFinalBooleanField"),
+                        JavaConstant.forBoolean(DummyClass.staticFinalBooleanField));
         STATIC_FINAL_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "staticFinalByteField"),
-                                    JavaConstant.forByte(DummyClass.staticFinalByteField));
+                        JavaConstant.forByte(DummyClass.staticFinalByteField));
         STATIC_FINAL_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "staticFinalShortField"),
-                                    JavaConstant.forShort(DummyClass.staticFinalShortField));
+                        JavaConstant.forShort(DummyClass.staticFinalShortField));
         STATIC_FINAL_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "staticFinalCharField"),
-                                    JavaConstant.forChar(DummyClass.staticFinalCharField));
+                        JavaConstant.forChar(DummyClass.staticFinalCharField));
         STATIC_FINAL_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "staticFinalIntField"),
-                                    JavaConstant.forInt(DummyClass.staticFinalIntField));
+                        JavaConstant.forInt(DummyClass.staticFinalIntField));
         STATIC_FINAL_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "staticFinalLongField"),
-                                    JavaConstant.forLong(DummyClass.staticFinalLongField));
+                        JavaConstant.forLong(DummyClass.staticFinalLongField));
         STATIC_FINAL_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "staticFinalFloatField"),
-                                    JavaConstant.forFloat(DummyClass.staticFinalFloatField));
+                        JavaConstant.forFloat(DummyClass.staticFinalFloatField));
         STATIC_FINAL_FIELDS_MAP.put(
-                getResolvedJavaField(DummyClass.class, "staticFinalDoubleField"),
-                JavaConstant.forDouble(DummyClass.staticFinalDoubleField));
+                        getResolvedJavaField(DummyClass.class, "staticFinalDoubleField"),
+                        JavaConstant.forDouble(DummyClass.staticFinalDoubleField));
         STATIC_FINAL_FIELDS_MAP.put(
-                getResolvedJavaField(DummyClass.class, "staticFinalObjectField"),
-                CONSTANT_REFLECTION_PROVIDER.forObject(DummyClass.staticFinalObjectField));
+                        getResolvedJavaField(DummyClass.class, "staticFinalObjectField"),
+                        CONSTANT_REFLECTION_PROVIDER.forObject(DummyClass.staticFinalObjectField));
     }
 
-    public static final Map<ResolvedJavaField, JavaConstant> STATIC_STABLE_FIELDS_MAP
-            = new HashMap<>();
+    public static final Map<ResolvedJavaField, JavaConstant> STATIC_STABLE_FIELDS_MAP = new HashMap<>();
 
     static {
         STATIC_STABLE_FIELDS_MAP.put(
-                getResolvedJavaField(DummyClass.class, "staticStableBooleanField"),
-                JavaConstant.forBoolean(DummyClass.staticStableBooleanField));
+                        getResolvedJavaField(DummyClass.class, "staticStableBooleanField"),
+                        JavaConstant.forBoolean(DummyClass.staticStableBooleanField));
         STATIC_STABLE_FIELDS_MAP.put(
-                getResolvedJavaField(DummyClass.class, "staticStableByteField"),
-                JavaConstant.forByte(DummyClass.staticStableByteField));
+                        getResolvedJavaField(DummyClass.class, "staticStableByteField"),
+                        JavaConstant.forByte(DummyClass.staticStableByteField));
         STATIC_STABLE_FIELDS_MAP.put(
-                getResolvedJavaField(DummyClass.class, "staticStableShortField"),
-                JavaConstant.forShort(DummyClass.staticStableShortField));
+                        getResolvedJavaField(DummyClass.class, "staticStableShortField"),
+                        JavaConstant.forShort(DummyClass.staticStableShortField));
         STATIC_STABLE_FIELDS_MAP.put(
-                getResolvedJavaField(DummyClass.class, "staticStableCharField"),
-                JavaConstant.forChar(DummyClass.staticStableCharField));
+                        getResolvedJavaField(DummyClass.class, "staticStableCharField"),
+                        JavaConstant.forChar(DummyClass.staticStableCharField));
         STATIC_STABLE_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class, "staticStableIntField"),
-                                     JavaConstant.forInt(DummyClass.staticStableIntField));
+                        JavaConstant.forInt(DummyClass.staticStableIntField));
         STATIC_STABLE_FIELDS_MAP.put(
-                getResolvedJavaField(DummyClass.class, "staticStableLongField"),
-                JavaConstant.forLong(DummyClass.staticStableLongField));
+                        getResolvedJavaField(DummyClass.class, "staticStableLongField"),
+                        JavaConstant.forLong(DummyClass.staticStableLongField));
         STATIC_STABLE_FIELDS_MAP.put(
-                getResolvedJavaField(DummyClass.class, "staticStableFloatField"),
-                JavaConstant.forFloat(DummyClass.staticStableFloatField));
+                        getResolvedJavaField(DummyClass.class, "staticStableFloatField"),
+                        JavaConstant.forFloat(DummyClass.staticStableFloatField));
         STATIC_STABLE_FIELDS_MAP.put(
-                getResolvedJavaField(DummyClass.class, "staticStableDoubleField"),
-                JavaConstant.forDouble(DummyClass.staticStableDoubleField));
+                        getResolvedJavaField(DummyClass.class, "staticStableDoubleField"),
+                        JavaConstant.forDouble(DummyClass.staticStableDoubleField));
         STATIC_STABLE_FIELDS_MAP.put(
-                getResolvedJavaField(DummyClass.class, "staticStableObjectField"),
-                CONSTANT_REFLECTION_PROVIDER.forObject(DummyClass.staticStableObjectField));
+                        getResolvedJavaField(DummyClass.class, "staticStableObjectField"),
+                        CONSTANT_REFLECTION_PROVIDER.forObject(DummyClass.staticStableObjectField));
     }
 
-    public static final Map<ResolvedJavaField, JavaConstant> STATIC_STABLE_DEFAULT_FIELDS_MAP
-            = new HashMap<>();
+    public static final Map<ResolvedJavaField, JavaConstant> STATIC_STABLE_DEFAULT_FIELDS_MAP = new HashMap<>();
 
     static {
         STATIC_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                  "staticStableDefaultBooleanField"),
-                                             JavaConstant.forBoolean(
-                                                     DummyClass.staticStableDefaultBooleanField));
+                        "staticStableDefaultBooleanField"),
+                        JavaConstant.forBoolean(
+                                        DummyClass.staticStableDefaultBooleanField));
         STATIC_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                  "staticStableDefaultByteField"),
-                                             JavaConstant.forByte(
-                                                     DummyClass.staticStableDefaultByteField));
+                        "staticStableDefaultByteField"),
+                        JavaConstant.forByte(
+                                        DummyClass.staticStableDefaultByteField));
         STATIC_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                  "staticStableDefaultShortField"),
-                                             JavaConstant.forShort(
-                                                     DummyClass.staticStableDefaultShortField));
+                        "staticStableDefaultShortField"),
+                        JavaConstant.forShort(
+                                        DummyClass.staticStableDefaultShortField));
         STATIC_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                  "staticStableDefaultCharField"),
-                                             JavaConstant.forChar(
-                                                     DummyClass.staticStableDefaultCharField));
+                        "staticStableDefaultCharField"),
+                        JavaConstant.forChar(
+                                        DummyClass.staticStableDefaultCharField));
         STATIC_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                  "staticStableDefaultIntField"),
-                                             JavaConstant.forInt(
-                                                     DummyClass.staticStableDefaultIntField));
+                        "staticStableDefaultIntField"),
+                        JavaConstant.forInt(
+                                        DummyClass.staticStableDefaultIntField));
         STATIC_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                  "staticStableDefaultLongField"),
-                                             JavaConstant.forLong(
-                                                     DummyClass.staticStableDefaultLongField));
+                        "staticStableDefaultLongField"),
+                        JavaConstant.forLong(
+                                        DummyClass.staticStableDefaultLongField));
         STATIC_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                  "staticStableDefaultFloatField"),
-                                             JavaConstant.forFloat(
-                                                     DummyClass.staticStableDefaultFloatField));
+                        "staticStableDefaultFloatField"),
+                        JavaConstant.forFloat(
+                                        DummyClass.staticStableDefaultFloatField));
         STATIC_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                  "staticStableDefaultDoubleField"),
-                                             JavaConstant.forDouble(
-                                                     DummyClass.staticStableDefaultDoubleField));
+                        "staticStableDefaultDoubleField"),
+                        JavaConstant.forDouble(
+                                        DummyClass.staticStableDefaultDoubleField));
         STATIC_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                                                                  "staticStableDefaultObjectField"),
-                                             CONSTANT_REFLECTION_PROVIDER.forObject(
-                                                     DummyClass.staticStableDefaultObjectField));
+                        "staticStableDefaultObjectField"),
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DummyClass.staticStableDefaultObjectField));
     }
 
     public static final int ARRAY_DIMENSION = 1;
@@ -336,138 +326,138 @@ public class TestHelper {
 
     static {
         ARRAYS_MAP.put(getResolvedJavaField(DummyClass.class, "booleanArrayWithValues"),
-                       CONSTANT_REFLECTION_PROVIDER.forObject(
-                               DUMMY_CLASS_INSTANCE.booleanArrayWithValues));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.booleanArrayWithValues));
         ARRAYS_MAP.put(getResolvedJavaField(DummyClass.class, "byteArrayWithValues"),
-                       CONSTANT_REFLECTION_PROVIDER.forObject(
-                               DUMMY_CLASS_INSTANCE.byteArrayWithValues));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.byteArrayWithValues));
         ARRAYS_MAP.put(getResolvedJavaField(DummyClass.class, "shortArrayWithValues"),
-                       CONSTANT_REFLECTION_PROVIDER.forObject(
-                               DUMMY_CLASS_INSTANCE.shortArrayWithValues));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.shortArrayWithValues));
         ARRAYS_MAP.put(getResolvedJavaField(DummyClass.class, "charArrayWithValues"),
-                       CONSTANT_REFLECTION_PROVIDER.forObject(
-                               DUMMY_CLASS_INSTANCE.charArrayWithValues));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.charArrayWithValues));
         ARRAYS_MAP.put(getResolvedJavaField(DummyClass.class, "intArrayWithValues"),
-                       CONSTANT_REFLECTION_PROVIDER.forObject(
-                               DUMMY_CLASS_INSTANCE.intArrayWithValues));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.intArrayWithValues));
         ARRAYS_MAP.put(getResolvedJavaField(DummyClass.class, "longArrayWithValues"),
-                       CONSTANT_REFLECTION_PROVIDER.forObject(
-                               DUMMY_CLASS_INSTANCE.longArrayWithValues));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.longArrayWithValues));
         ARRAYS_MAP.put(getResolvedJavaField(DummyClass.class, "floatArrayWithValues"),
-                       CONSTANT_REFLECTION_PROVIDER.forObject(
-                               DUMMY_CLASS_INSTANCE.floatArrayWithValues));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.floatArrayWithValues));
         ARRAYS_MAP.put(getResolvedJavaField(DummyClass.class, "doubleArrayWithValues"),
-                       CONSTANT_REFLECTION_PROVIDER.forObject(
-                               DUMMY_CLASS_INSTANCE.doubleArrayWithValues));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.doubleArrayWithValues));
         ARRAYS_MAP.put(getResolvedJavaField(DummyClass.class, "objectArrayWithValues"),
-                       CONSTANT_REFLECTION_PROVIDER.forObject(
-                               DUMMY_CLASS_INSTANCE.objectArrayWithValues));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.objectArrayWithValues));
     }
 
     public static final Map<ResolvedJavaField, JavaConstant> STABLE_ARRAYS_MAP = new HashMap<>();
 
     static {
         STABLE_ARRAYS_MAP.put(
-                getResolvedJavaField(DummyClass.class, "stableBooleanArrayWithValues"),
-                CONSTANT_REFLECTION_PROVIDER.forObject(
-                        DUMMY_CLASS_INSTANCE.stableBooleanArrayWithValues));
+                        getResolvedJavaField(DummyClass.class, "stableBooleanArrayWithValues"),
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.stableBooleanArrayWithValues));
         STABLE_ARRAYS_MAP.put(getResolvedJavaField(DummyClass.class, "stableByteArrayWithValues"),
-                              CONSTANT_REFLECTION_PROVIDER.forObject(
-                                      DUMMY_CLASS_INSTANCE.stableByteArrayWithValues));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.stableByteArrayWithValues));
         STABLE_ARRAYS_MAP.put(getResolvedJavaField(DummyClass.class, "stableShortArrayWithValues"),
-                              CONSTANT_REFLECTION_PROVIDER.forObject(
-                                      DUMMY_CLASS_INSTANCE.stableShortArrayWithValues));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.stableShortArrayWithValues));
         STABLE_ARRAYS_MAP.put(getResolvedJavaField(DummyClass.class, "stableCharArrayWithValues"),
-                              CONSTANT_REFLECTION_PROVIDER.forObject(
-                                      DUMMY_CLASS_INSTANCE.stableCharArrayWithValues));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.stableCharArrayWithValues));
         STABLE_ARRAYS_MAP.put(getResolvedJavaField(DummyClass.class, "stableIntArrayWithValues"),
-                              CONSTANT_REFLECTION_PROVIDER.forObject(
-                                      DUMMY_CLASS_INSTANCE.stableIntArrayWithValues));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.stableIntArrayWithValues));
         STABLE_ARRAYS_MAP.put(getResolvedJavaField(DummyClass.class, "stableLongArrayWithValues"),
-                              CONSTANT_REFLECTION_PROVIDER.forObject(
-                                      DUMMY_CLASS_INSTANCE.stableLongArrayWithValues));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.stableLongArrayWithValues));
         STABLE_ARRAYS_MAP.put(getResolvedJavaField(DummyClass.class, "stableFloatArrayWithValues"),
-                              CONSTANT_REFLECTION_PROVIDER.forObject(
-                                      DUMMY_CLASS_INSTANCE.stableFloatArrayWithValues));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.stableFloatArrayWithValues));
         STABLE_ARRAYS_MAP.put(getResolvedJavaField(DummyClass.class, "stableDoubleArrayWithValues"),
-                              CONSTANT_REFLECTION_PROVIDER.forObject(
-                                      DUMMY_CLASS_INSTANCE.stableDoubleArrayWithValues));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.stableDoubleArrayWithValues));
         STABLE_ARRAYS_MAP.put(getResolvedJavaField(DummyClass.class, "stableObjectArrayWithValues"),
-                              CONSTANT_REFLECTION_PROVIDER.forObject(
-                                      DUMMY_CLASS_INSTANCE.stableObjectArrayWithValues));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.stableObjectArrayWithValues));
     }
 
     public static final Map<ResolvedJavaField, JavaConstant> ARRAY_ARRAYS_MAP = new HashMap<>();
 
     static {
         ARRAY_ARRAYS_MAP.put(getResolvedJavaField(DummyClass.class, "booleanArrayArrayWithValues"),
-                             CONSTANT_REFLECTION_PROVIDER.forObject(
-                                     DUMMY_CLASS_INSTANCE.booleanArrayArrayWithValues));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.booleanArrayArrayWithValues));
         ARRAY_ARRAYS_MAP.put(getResolvedJavaField(DummyClass.class, "byteArrayArrayWithValues"),
-                             CONSTANT_REFLECTION_PROVIDER.forObject(
-                                     DUMMY_CLASS_INSTANCE.byteArrayArrayWithValues));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.byteArrayArrayWithValues));
         ARRAY_ARRAYS_MAP.put(getResolvedJavaField(DummyClass.class, "shortArrayArrayWithValues"),
-                             CONSTANT_REFLECTION_PROVIDER.forObject(
-                                     DUMMY_CLASS_INSTANCE.shortArrayArrayWithValues));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.shortArrayArrayWithValues));
         ARRAY_ARRAYS_MAP.put(getResolvedJavaField(DummyClass.class, "charArrayArrayWithValues"),
-                             CONSTANT_REFLECTION_PROVIDER.forObject(
-                                     DUMMY_CLASS_INSTANCE.charArrayArrayWithValues));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.charArrayArrayWithValues));
         ARRAY_ARRAYS_MAP.put(getResolvedJavaField(DummyClass.class, "intArrayArrayWithValues"),
-                             CONSTANT_REFLECTION_PROVIDER.forObject(
-                                     DUMMY_CLASS_INSTANCE.intArrayArrayWithValues));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.intArrayArrayWithValues));
         ARRAY_ARRAYS_MAP.put(getResolvedJavaField(DummyClass.class, "longArrayArrayWithValues"),
-                             CONSTANT_REFLECTION_PROVIDER.forObject(
-                                     DUMMY_CLASS_INSTANCE.longArrayArrayWithValues));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.longArrayArrayWithValues));
         ARRAY_ARRAYS_MAP.put(getResolvedJavaField(DummyClass.class, "floatArrayArrayWithValues"),
-                             CONSTANT_REFLECTION_PROVIDER.forObject(
-                                     DUMMY_CLASS_INSTANCE.floatArrayArrayWithValues));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.floatArrayArrayWithValues));
         ARRAY_ARRAYS_MAP.put(getResolvedJavaField(DummyClass.class, "doubleArrayArrayWithValues"),
-                             CONSTANT_REFLECTION_PROVIDER.forObject(
-                                     DUMMY_CLASS_INSTANCE.doubleArrayArrayWithValues));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.doubleArrayArrayWithValues));
         ARRAY_ARRAYS_MAP.put(getResolvedJavaField(DummyClass.class, "objectArrayArrayWithValues"),
-                             CONSTANT_REFLECTION_PROVIDER.forObject(
-                                     DUMMY_CLASS_INSTANCE.objectArrayArrayWithValues));
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.objectArrayArrayWithValues));
     }
 
     public static final Map<ResolvedJavaField, JavaConstant> STABLE_ARRAY_ARRAYS_MAP = new HashMap<>();
 
     static {
         STABLE_ARRAY_ARRAYS_MAP.put(
-                getResolvedJavaField(DummyClass.class, "stableBooleanArrayArrayWithValues"),
-                CONSTANT_REFLECTION_PROVIDER.forObject(
-                        DUMMY_CLASS_INSTANCE.stableBooleanArrayArrayWithValues));
+                        getResolvedJavaField(DummyClass.class, "stableBooleanArrayArrayWithValues"),
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.stableBooleanArrayArrayWithValues));
         STABLE_ARRAY_ARRAYS_MAP.put(
-                getResolvedJavaField(DummyClass.class, "stableByteArrayArrayWithValues"),
-                CONSTANT_REFLECTION_PROVIDER.forObject(
-                        DUMMY_CLASS_INSTANCE.stableByteArrayArrayWithValues));
+                        getResolvedJavaField(DummyClass.class, "stableByteArrayArrayWithValues"),
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.stableByteArrayArrayWithValues));
         STABLE_ARRAY_ARRAYS_MAP.put(
-                getResolvedJavaField(DummyClass.class, "stableShortArrayArrayWithValues"),
-                CONSTANT_REFLECTION_PROVIDER.forObject(
-                        DUMMY_CLASS_INSTANCE.stableShortArrayArrayWithValues));
+                        getResolvedJavaField(DummyClass.class, "stableShortArrayArrayWithValues"),
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.stableShortArrayArrayWithValues));
         STABLE_ARRAY_ARRAYS_MAP.put(
-                getResolvedJavaField(DummyClass.class, "stableCharArrayArrayWithValues"),
-                CONSTANT_REFLECTION_PROVIDER.forObject(
-                        DUMMY_CLASS_INSTANCE.stableCharArrayArrayWithValues));
+                        getResolvedJavaField(DummyClass.class, "stableCharArrayArrayWithValues"),
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.stableCharArrayArrayWithValues));
         STABLE_ARRAY_ARRAYS_MAP.put(
-                getResolvedJavaField(DummyClass.class, "stableIntArrayArrayWithValues"),
-                CONSTANT_REFLECTION_PROVIDER.forObject(
-                        DUMMY_CLASS_INSTANCE.stableIntArrayArrayWithValues));
+                        getResolvedJavaField(DummyClass.class, "stableIntArrayArrayWithValues"),
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.stableIntArrayArrayWithValues));
         STABLE_ARRAY_ARRAYS_MAP.put(
-                getResolvedJavaField(DummyClass.class, "stableLongArrayArrayWithValues"),
-                CONSTANT_REFLECTION_PROVIDER.forObject(
-                        DUMMY_CLASS_INSTANCE.stableLongArrayArrayWithValues));
+                        getResolvedJavaField(DummyClass.class, "stableLongArrayArrayWithValues"),
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.stableLongArrayArrayWithValues));
         STABLE_ARRAY_ARRAYS_MAP.put(
-                getResolvedJavaField(DummyClass.class, "stableFloatArrayArrayWithValues"),
-                CONSTANT_REFLECTION_PROVIDER.forObject(
-                        DUMMY_CLASS_INSTANCE.stableFloatArrayArrayWithValues));
+                        getResolvedJavaField(DummyClass.class, "stableFloatArrayArrayWithValues"),
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.stableFloatArrayArrayWithValues));
         STABLE_ARRAY_ARRAYS_MAP.put(
-                getResolvedJavaField(DummyClass.class, "stableDoubleArrayArrayWithValues"),
-                CONSTANT_REFLECTION_PROVIDER.forObject(
-                        DUMMY_CLASS_INSTANCE.stableDoubleArrayArrayWithValues));
+                        getResolvedJavaField(DummyClass.class, "stableDoubleArrayArrayWithValues"),
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.stableDoubleArrayArrayWithValues));
         STABLE_ARRAY_ARRAYS_MAP.put(
-                getResolvedJavaField(DummyClass.class, "stableObjectArrayArrayWithValues"),
-                CONSTANT_REFLECTION_PROVIDER.forObject(
-                        DUMMY_CLASS_INSTANCE.stableObjectArrayArrayWithValues));
+                        getResolvedJavaField(DummyClass.class, "stableObjectArrayArrayWithValues"),
+                        CONSTANT_REFLECTION_PROVIDER.forObject(
+                                        DUMMY_CLASS_INSTANCE.stableObjectArrayArrayWithValues));
     }
 
     public static ResolvedJavaField getResolvedJavaField(Class<?> clazz, String fieldName) {
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/UnboxPrimitiveDataProvider.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/UnboxPrimitiveDataProvider.java
index 122ad426600..b203bcc8346 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/UnboxPrimitiveDataProvider.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/UnboxPrimitiveDataProvider.java
@@ -38,32 +38,32 @@ public class UnboxPrimitiveDataProvider {
         LinkedList<Object[]> cfgSet = new LinkedList<>();
         // Testing boolean
         cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(
-                (Boolean) true), JavaConstant.forBoolean(true)});
+                        (Boolean) true), JavaConstant.forBoolean(true)});
         cfgSet.add(new Object[]{JavaConstant.forBoolean(true), null});
         cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject((Boolean) false),
-                JavaConstant.forBoolean(false)});
+                        JavaConstant.forBoolean(false)});
         cfgSet.add(new Object[]{JavaConstant.forBoolean(false), null});
         for (byte number : new byte[]{-128, 0, 1, 127}) {
             // Testing boxed primitives
             cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(Byte.valueOf(number)),
-                    JavaConstant.forByte(number)});
+                            JavaConstant.forByte(number)});
             cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(Short.valueOf(number)),
-                    JavaConstant.forShort(number)});
+                            JavaConstant.forShort(number)});
             cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(Integer.valueOf(number)),
-                    JavaConstant.forInt(number)});
+                            JavaConstant.forInt(number)});
             cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(Long.valueOf(number)),
-                    JavaConstant.forLong(number)});
+                            JavaConstant.forLong(number)});
             if (number >= 0) {
                 cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(
-                        Character.valueOf((char) number)),
-                        JavaConstant.forChar((char) number)});
+                                Character.valueOf((char) number)),
+                                JavaConstant.forChar((char) number)});
             }
             cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(
-                    Float.valueOf(number * 1.1f)),
-                    JavaConstant.forFloat(number * 1.1f)});
+                            Float.valueOf(number * 1.1f)),
+                            JavaConstant.forFloat(number * 1.1f)});
             cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(
-                    Double.valueOf(number * 1.1)),
-                    JavaConstant.forDouble(number * 1.1)});
+                            Double.valueOf(number * 1.1)),
+                            JavaConstant.forDouble(number * 1.1)});
             // Testing non-boxed primitives (should result in returning of "null")
             cfgSet.add(new Object[]{JavaConstant.forByte(number), null});
             cfgSet.add(new Object[]{JavaConstant.forShort(number), null});
@@ -75,23 +75,23 @@ public class UnboxPrimitiveDataProvider {
         }
         // Testing boxed primitives with max values
         cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(Short.MAX_VALUE),
-                JavaConstant.forShort(Short.MAX_VALUE)});
+                        JavaConstant.forShort(Short.MAX_VALUE)});
         cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(Integer.MAX_VALUE),
-                JavaConstant.forInt(Integer.MAX_VALUE)});
+                        JavaConstant.forInt(Integer.MAX_VALUE)});
         cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(Long.MAX_VALUE),
-                JavaConstant.forLong(Long.MAX_VALUE)});
+                        JavaConstant.forLong(Long.MAX_VALUE)});
         cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(Character.MAX_VALUE),
-                JavaConstant.forChar(Character.MAX_VALUE)});
+                        JavaConstant.forChar(Character.MAX_VALUE)});
         cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(Float.MAX_VALUE),
-                JavaConstant.forFloat(Float.MAX_VALUE)});
+                        JavaConstant.forFloat(Float.MAX_VALUE)});
         cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(Double.MAX_VALUE),
-                JavaConstant.forDouble(Double.MAX_VALUE)});
+                        JavaConstant.forDouble(Double.MAX_VALUE)});
         // Non-primitives testing
         cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(
-                DUMMY_CLASS_INSTANCE.objectField), null});
+                        DUMMY_CLASS_INSTANCE.objectField), null});
         cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(
-                DUMMY_CLASS_INSTANCE.booleanArrayWithValues),
-                null});
+                        DUMMY_CLASS_INSTANCE.booleanArrayWithValues),
+                        null});
         // Null testing
         cfgSet.add(new Object[]{JavaConstant.NULL_POINTER, null});
         cfgSet.add(new Object[]{null, null});

From b6c0e4788c4b5e2c7592f505071eac1405dfbc66 Mon Sep 17 00:00:00 2001
From: Tom Rodriguez <never@openjdk.org>
Date: Wed, 11 May 2016 09:44:39 -0700
Subject: [PATCH 070/228] 8156775: IGV: StringUtils is absent

Reviewed-by: kvn
---
 .../com/sun/hotspot/igv/util/StringUtils.java | 116 ++++++++++++++++++
 1 file changed, 116 insertions(+)
 create mode 100644 hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/StringUtils.java

diff --git a/hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/StringUtils.java b/hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/StringUtils.java
new file mode 100644
index 00000000000..2fcc12af03a
--- /dev/null
+++ b/hotspot/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/StringUtils.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2016, 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 com.sun.hotspot.igv.util;
+
+/**
+ *
+ * @author tkrodrig
+ */
+public class StringUtils {
+
+    public static String escapeHTML(String s) {
+        StringBuilder str = null;
+        for (int i = 0; i < s.length(); i++) {
+            char c = s.charAt(i);
+            switch (c) {
+                case '&':
+                case '<':
+                case '>':
+                case '"':
+                case '\'':
+                    if (str == null) {
+                        str = new StringBuilder();
+                        str.append(s, 0, i);
+                    }
+                    switch (c) {
+                        case '&':
+                            str.append("&amp;");
+                            break;
+                        case '<':
+                            str.append("&lt;");
+                            break;
+                        case '>':
+                            str.append("&gt;");
+                            break;
+                        case '"':
+                            str.append("&quot;");
+                            break;
+                        case '\'':
+                            str.append("&apos;");
+                            break;
+                        default:
+                            assert false;
+                    }
+                    break;
+                case '\u0000':
+                case '\u0001':
+                case '\u0002':
+                case '\u0003':
+                case '\u0004':
+                case '\u0005':
+                case '\u0006':
+                case '\u0007':
+                case '\u0008':
+                case '\u000b':
+                case '\u000c':
+                case '\u000e':
+                case '\u000f':
+                case '\u0010':
+                case '\u0011':
+                case '\u0012':
+                case '\u0013':
+                case '\u0014':
+                case '\u0015':
+                case '\u0016':
+                case '\u0017':
+                case '\u0018':
+                case '\u0019':
+                case '\u001a':
+                case '\u001b':
+                case '\u001c':
+                case '\u001d':
+                case '\u001e':
+                case '\u001f':
+                    if (str == null) {
+                        str = new StringBuilder();
+                        str.append(s, 0, i);
+                    }
+                    str.append("'0x").append(Integer.toHexString(c));
+                    break;
+                default:
+                    if (str != null) {
+                        str.append(c);
+                    }
+                    break;
+            }
+        }
+        if (str == null) {
+            return s;
+        } else {
+            return str.toString();
+        }
+    }
+
+}

From 3c0ef9eadc0e1a09f32c552bd0b12a5ef708f7a3 Mon Sep 17 00:00:00 2001
From: Christian Thalinger <twisti@openjdk.org>
Date: Wed, 11 May 2016 10:23:59 -1000
Subject: [PATCH 071/228] 8156159: replace CompilerToVM.readUncompressedOop
 with Unsafe.getUncompressedObject

Reviewed-by: kvn
---
 .../src/jdk/vm/ci/hotspot/CompilerToVM.java   | 14 ---
 .../HotSpotMemoryAccessProviderImpl.java      |  2 +-
 .../src/share/vm/jvmci/jvmciCompilerToVM.cpp  |  6 --
 .../jdk/vm/ci/hotspot/CompilerToVMHelper.java |  6 +-
 .../compilerToVM/ReadUncompressedOopTest.java | 91 -------------------
 5 files changed, 2 insertions(+), 117 deletions(-)
 delete mode 100644 hotspot/test/compiler/jvmci/compilerToVM/ReadUncompressedOopTest.java

diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
index 40b58928d0f..ed3b38fc096 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
@@ -422,20 +422,6 @@ final class CompilerToVM {
      */
     native long getLocalVariableTableStart(HotSpotResolvedJavaMethodImpl method);
 
-    /**
-     * Reads an object pointer within a VM data structure. That is, any {@link HotSpotVMField} whose
-     * {@link HotSpotVMField#type() type} is {@code "oop"} (e.g.,
-     * {@code ArrayKlass::_component_mirror}, {@code Klass::_java_mirror},
-     * {@code JavaThread::_threadObj}).
-     *
-     * Note that {@link Unsafe#getObject(Object, long)} cannot be used for this since it does a
-     * {@code narrowOop} read if the VM is using compressed oops whereas oops within VM data
-     * structures are (currently) always uncompressed.
-     *
-     * @param address address of an oop field within a VM data structure
-     */
-    native Object readUncompressedOop(long address);
-
     /**
      * Determines if {@code method} should not be inlined or compiled.
      */
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java
index 8ca1c73f4e7..76c48451eed 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java
@@ -135,7 +135,7 @@ class HotSpotMemoryAccessProviderImpl implements HotSpotMemoryAccessProvider, Ho
         if (base == null) {
             assert !compressed;
             displacement += asRawPointer(baseConstant);
-            ret = runtime.getCompilerToVM().readUncompressedOop(displacement);
+            ret = UNSAFE.getUncompressedObject(displacement);
         } else {
             assert runtime.getConfig().useCompressedOops == compressed;
             ret = UNSAFE.getObject(base, displacement);
diff --git a/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp b/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
index 50e04b297ea..39207b30ca7 100644
--- a/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
+++ b/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
@@ -1008,11 +1008,6 @@ C2V_VMENTRY(void, invalidateInstalledCode, (JNIEnv*, jobject, jobject installed_
   nmethod::invalidate_installed_code(installed_code_handle, CHECK);
 C2V_END
 
-C2V_VMENTRY(jobject, readUncompressedOop, (JNIEnv*, jobject, jlong addr))
-  oop ret = oopDesc::load_decode_heap_oop((oop*)(address)addr);
-  return JNIHandles::make_local(THREAD, ret);
-C2V_END
-
 C2V_VMENTRY(jlongArray, collectCounters, (JNIEnv*, jobject))
   typeArrayOop arrayOop = oopFactory::new_longArray(JVMCICounterSize, CHECK_NULL);
   JavaThread::collect_counters(arrayOop);
@@ -1469,7 +1464,6 @@ JNINativeMethod CompilerToVM::methods[] = {
   {CC "getLocalVariableTableLength",                  CC "(" HS_RESOLVED_METHOD ")I",                                                       FN_PTR(getLocalVariableTableLength)},
   {CC "reprofile",                                    CC "(" HS_RESOLVED_METHOD ")V",                                                       FN_PTR(reprofile)},
   {CC "invalidateInstalledCode",                      CC "(" INSTALLED_CODE ")V",                                                           FN_PTR(invalidateInstalledCode)},
-  {CC "readUncompressedOop",                          CC "(J)" OBJECT,                                                                      FN_PTR(readUncompressedOop)},
   {CC "collectCounters",                              CC "()[J",                                                                            FN_PTR(collectCounters)},
   {CC "allocateCompileId",                            CC "(" HS_RESOLVED_METHOD "I)I",                                                      FN_PTR(allocateCompileId)},
   {CC "isMature",                                     CC "(" METASPACE_METHOD_DATA ")Z",                                                    FN_PTR(isMature)},
diff --git a/hotspot/test/compiler/jvmci/common/patches/jdk.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java b/hotspot/test/compiler/jvmci/common/patches/jdk.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java
index f9602f33064..726ff9fc5be 100644
--- a/hotspot/test/compiler/jvmci/common/patches/jdk.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java
+++ b/hotspot/test/compiler/jvmci/common/patches/jdk.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -207,10 +207,6 @@ public class CompilerToVMHelper {
         return CTVM.getLocalVariableTableStart((HotSpotResolvedJavaMethodImpl)method);
     }
 
-    public static Object readUncompressedOop(long address) {
-        return CTVM.readUncompressedOop(address);
-    }
-
     public static void doNotInlineOrCompile(HotSpotResolvedJavaMethod method) {
         CTVM.doNotInlineOrCompile((HotSpotResolvedJavaMethodImpl)method);
     }
diff --git a/hotspot/test/compiler/jvmci/compilerToVM/ReadUncompressedOopTest.java b/hotspot/test/compiler/jvmci/compilerToVM/ReadUncompressedOopTest.java
deleted file mode 100644
index 14e53044357..00000000000
--- a/hotspot/test/compiler/jvmci/compilerToVM/ReadUncompressedOopTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2015, 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 8136421
- * @ignore 8155216
- * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
- * @library / /testlibrary /test/lib/
- * @library ../common/patches
- * @modules java.base/jdk.internal.misc
- * @modules jdk.vm.ci/jdk.vm.ci.hotspot
- * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.ReadUncompressedOopTest
- * @build sun.hotspot.WhiteBox
- * @run main ClassFileInstaller
- *     sun.hotspot.WhiteBox
- *     sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -Xbootclasspath/a:.
- *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- *                   -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- *                   -XX:-UseCompressedOops
- *                   compiler.jvmci.compilerToVM.ReadUncompressedOopTest
- * @run main/othervm -Xbootclasspath/a:.
- *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- *                   -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- *                   -XX:+UseCompressedOops
- *                   compiler.jvmci.compilerToVM.ReadUncompressedOopTest
- */
-
-package compiler.jvmci.compilerToVM;
-
-import jdk.vm.ci.hotspot.CompilerToVMHelper;
-import jdk.test.lib.Asserts;
-import jdk.test.lib.Utils;
-import sun.hotspot.WhiteBox;
-import jdk.internal.misc.Unsafe;
-
-import java.lang.reflect.Field;
-
-public class ReadUncompressedOopTest {
-
-    public static void main(String args[])  {
-        new ReadUncompressedOopTest().runTest();
-    }
-
-    private void runTest()  {
-        long ptr = getPtr();
-        System.out.printf("calling readUncompressedOop(0x%x)%n", ptr);
-        Asserts.assertEQ(getClass(),
-                CompilerToVMHelper.readUncompressedOop(ptr),
-                String.format("unexpected class returned for 0x%x", ptr));
-    }
-
-    private static final Unsafe UNSAFE = Utils.getUnsafe();
-    private static final WhiteBox WB = WhiteBox.getWhiteBox();
-    private static final Class<?> CLASS = ReadUncompressedOopTest.class;
-    private static final long PTR = WB.getObjectAddress(CLASS);
-
-    private static long getPtr() {
-        Field field;
-        try {
-            field = CLASS.getDeclaredField("PTR");
-        } catch (NoSuchFieldException nsfe) {
-            throw new Error("TESTBUG : " + nsfe, nsfe);
-        }
-        Object base = UNSAFE.staticFieldBase(field);
-        return WB.getObjectAddress(base) + UNSAFE.staticFieldOffset(field);
-    }
-}
-

From 3548f9ecba03dce53d9849f6cb340b6ab50c9f99 Mon Sep 17 00:00:00 2001
From: Tom Rodriguez <never@openjdk.org>
Date: Wed, 11 May 2016 17:43:23 -0700
Subject: [PATCH 072/228] 8137296: [JVMCI] Enable sharing of debug info by
 default in all configurations

Reviewed-by: kvn, twisti
---
 hotspot/src/share/vm/code/debugInfoRec.cpp | 47 ----------------------
 hotspot/src/share/vm/code/debugInfoRec.hpp |  3 --
 2 files changed, 50 deletions(-)

diff --git a/hotspot/src/share/vm/code/debugInfoRec.cpp b/hotspot/src/share/vm/code/debugInfoRec.cpp
index b026e5a645b..a6f2dbbb971 100644
--- a/hotspot/src/share/vm/code/debugInfoRec.cpp
+++ b/hotspot/src/share/vm/code/debugInfoRec.cpp
@@ -37,9 +37,7 @@ private:
   int  _offset; // location in the stream of this scope
   int  _length; // number of bytes in the stream
   int  _hash;   // hash of stream bytes (for quicker reuse)
-#if INCLUDE_JVMCI
   DebugInformationRecorder* _DIR;
-#endif
 
 public:
   int offset() { return _offset; }
@@ -57,9 +55,7 @@ public:
   DIR_Chunk(int offset, int length, DebugInformationRecorder* dir) {
     _offset = offset;
     _length = length;
-#if INCLUDE_JVMCI
     _DIR = dir;
-#endif
     unsigned int hash = 0;
     address p = dir->stream()->buffer() + _offset;
     for (int i = 0; i < length; i++) {
@@ -87,7 +83,6 @@ public:
     return NULL;
   }
 
-#if INCLUDE_JVMCI
   static int compare(DIR_Chunk* const & a, DIR_Chunk* const & b) {
     if (b->_hash > a->_hash) {
       return 1;
@@ -104,7 +99,6 @@ public:
     address buf = a->_DIR->stream()->buffer();
     return memcmp(buf + b->_offset, buf + a->_offset, a->_length);
   }
-#endif
 };
 
 static inline bool compute_recording_non_safepoints() {
@@ -141,9 +135,6 @@ DebugInformationRecorder::DebugInformationRecorder(OopRecorder* oop_recorder)
   _oop_recorder = oop_recorder;
 
   _all_chunks    = new GrowableArray<DIR_Chunk*>(300);
-#if !INCLUDE_JVMCI
-  _shared_chunks = new GrowableArray<DIR_Chunk*>(30);
-#endif
   _next_chunk = _next_chunk_limit = NULL;
 
   add_new_pc_offset(PcDesc::lower_offset_limit);  // sentinel record
@@ -265,14 +256,6 @@ struct dir_stats_struct {
 
 
 int DebugInformationRecorder::find_sharable_decode_offset(int stream_offset) {
-#if !INCLUDE_JVMCI
-  // Only pull this trick if non-safepoint recording
-  // is enabled, for now.
-  if (!recording_non_safepoints()) {
-    return serialized_null;
-  }
-#endif // INCLUDE_JVMCI
-
   NOT_PRODUCT(++dir_stats.chunks_queried);
   int stream_length = stream()->position() - stream_offset;
   assert(stream_offset != serialized_null, "should not be null");
@@ -280,7 +263,6 @@ int DebugInformationRecorder::find_sharable_decode_offset(int stream_offset) {
 
   DIR_Chunk* ns = new(this) DIR_Chunk(stream_offset, stream_length, this);
 
-#if INCLUDE_JVMCI
   DIR_Chunk* match = _all_chunks->insert_sorted<DIR_Chunk::compare>(ns);
   if (match != ns) {
     // Found an existing chunk
@@ -292,35 +274,6 @@ int DebugInformationRecorder::find_sharable_decode_offset(int stream_offset) {
     // Inserted this chunk, so nothing to do
     return serialized_null;
   }
-#else // INCLUDE_JVMCI
-  // Look in previously shared scopes first:
-  DIR_Chunk* ms = ns->find_match(_shared_chunks, 0, this);
-  if (ms != NULL) {
-    NOT_PRODUCT(++dir_stats.chunks_reshared);
-    assert(ns+1 == _next_chunk, "");
-    _next_chunk = ns;
-    return ms->offset();
-  }
-
-  // Look in recently encountered scopes next:
-  const int MAX_RECENT = 50;
-  int start_index = _all_chunks->length() - MAX_RECENT;
-  if (start_index < 0)  start_index = 0;
-  ms = ns->find_match(_all_chunks, start_index, this);
-  if (ms != NULL) {
-    NOT_PRODUCT(++dir_stats.chunks_shared);
-    // Searching in _all_chunks is limited to a window,
-    // but searching in _shared_chunks is unlimited.
-    _shared_chunks->append(ms);
-    assert(ns+1 == _next_chunk, "");
-    _next_chunk = ns;
-    return ms->offset();
-  }
-
-  // No match.  Add this guy to the list, in hopes of future shares.
-  _all_chunks->append(ns);
-  return serialized_null;
-#endif // INCLUDE_JVMCI
 }
 
 
diff --git a/hotspot/src/share/vm/code/debugInfoRec.hpp b/hotspot/src/share/vm/code/debugInfoRec.hpp
index d8daac3a0f2..26dacd54c06 100644
--- a/hotspot/src/share/vm/code/debugInfoRec.hpp
+++ b/hotspot/src/share/vm/code/debugInfoRec.hpp
@@ -167,9 +167,6 @@ class DebugInformationRecorder: public ResourceObj {
 
   // Scopes that have been described so far.
   GrowableArray<DIR_Chunk*>* _all_chunks;
-#if !INCLUDE_JVMCI
-  GrowableArray<DIR_Chunk*>* _shared_chunks;
-#endif
   DIR_Chunk* _next_chunk;
   DIR_Chunk* _next_chunk_limit;
 

From 536db8741fc403e21a0bd585962387d34529230c Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@jku.at>
Date: Thu, 12 May 2016 04:17:00 +0000
Subject: [PATCH 073/228] 8156034: [JVMCI] Notify the jvmci compiler on
 completion of a bootstrap

Reviewed-by: twisti
---
 .../src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java   | 12 ++++++++++++
 .../ci/hotspot/services/HotSpotVMEventListener.java  |  6 ++++++
 hotspot/src/share/vm/classfile/vmSymbols.hpp         |  1 +
 hotspot/src/share/vm/jvmci/jvmciCompiler.cpp         | 10 +++++++---
 hotspot/src/share/vm/jvmci/jvmciCompiler.hpp         |  7 ++++++-
 hotspot/src/share/vm/jvmci/jvmciRuntime.cpp          |  9 +++++++++
 hotspot/src/share/vm/jvmci/jvmciRuntime.hpp          |  2 ++
 hotspot/src/share/vm/prims/jni.cpp                   |  6 +++++-
 .../jdk.vm.ci.hotspot.HotSpotVMEventListener         |  1 -
 .../services/jdk.vm.ci.runtime.JVMCICompilerFactory  |  1 -
 10 files changed, 48 insertions(+), 7 deletions(-)
 delete mode 100644 hotspot/test/compiler/jvmci/common/services/jdk.vm.ci.hotspot.HotSpotVMEventListener
 delete mode 100644 hotspot/test/compiler/jvmci/common/services/jdk.vm.ci.runtime.JVMCICompilerFactory

diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
index 58d221e7bae..773a39ad10e 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
@@ -381,6 +381,18 @@ public final class HotSpotJVMCIRuntime implements HotSpotJVMCIRuntimeProvider, H
         }
     }
 
+    /**
+     * Notify on completion of a bootstrap.
+     *
+     * Called from the VM.
+     */
+    @SuppressWarnings({"unused"})
+    private void bootstrapFinished() throws Exception {
+        for (HotSpotVMEventListener vmEventListener : vmEventListeners) {
+            vmEventListener.notifyBootstrapFinished();
+        }
+    }
+
     /**
      * Notify on successful install into the CodeCache.
      *
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/services/HotSpotVMEventListener.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/services/HotSpotVMEventListener.java
index 06c4f645815..39759fc357d 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/services/HotSpotVMEventListener.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/services/HotSpotVMEventListener.java
@@ -74,6 +74,12 @@ public abstract class HotSpotVMEventListener {
     public void notifyInstall(HotSpotCodeCacheProvider hotSpotCodeCacheProvider, InstalledCode installedCode, CompiledCode compiledCode) {
     }
 
+    /**
+     * Notify on completion of a bootstrap.
+     */
+    public void notifyBootstrapFinished() {
+    }
+
     /**
      * Create a custom {@link JVMCIMetaAccessContext} to be used for managing the lifetime of loaded
      * metadata. It a custom one isn't created then the default implementation will be a single
diff --git a/hotspot/src/share/vm/classfile/vmSymbols.hpp b/hotspot/src/share/vm/classfile/vmSymbols.hpp
index 6f69aaf5495..4214f7e65ac 100644
--- a/hotspot/src/share/vm/classfile/vmSymbols.hpp
+++ b/hotspot/src/share/vm/classfile/vmSymbols.hpp
@@ -358,6 +358,7 @@
   template(nthreads_name,                             "nthreads")                                 \
   template(ngroups_name,                              "ngroups")                                  \
   template(shutdown_method_name,                      "shutdown")                                 \
+  template(bootstrapFinished_method_name,             "bootstrapFinished")                        \
   template(finalize_method_name,                      "finalize")                                 \
   template(reference_lock_name,                       "lock")                                     \
   template(reference_discovered_name,                 "discovered")                               \
diff --git a/hotspot/src/share/vm/jvmci/jvmciCompiler.cpp b/hotspot/src/share/vm/jvmci/jvmciCompiler.cpp
index cc79abe1854..8e1e3ef4900 100644
--- a/hotspot/src/share/vm/jvmci/jvmciCompiler.cpp
+++ b/hotspot/src/share/vm/jvmci/jvmciCompiler.cpp
@@ -39,6 +39,7 @@ elapsedTimer JVMCICompiler::_codeInstallTimer;
 
 JVMCICompiler::JVMCICompiler() : AbstractCompiler(jvmci) {
   _bootstrapping = false;
+  _bootstrap_compilation_request_handled = false;
   _methods_compiled = 0;
   assert(_instance == NULL, "only one instance allowed");
   _instance = this;
@@ -57,7 +58,7 @@ void JVMCICompiler::initialize() {
   CompilationPolicy::completed_vm_startup();
 }
 
-void JVMCICompiler::bootstrap() {
+void JVMCICompiler::bootstrap(TRAPS) {
   if (Arguments::mode() == Arguments::_int) {
     // Nothing to do in -Xint mode
     return;
@@ -68,7 +69,6 @@ void JVMCICompiler::bootstrap() {
   FlagSetting ctwOff(CompileTheWorld, false);
 #endif
 
-  JavaThread* THREAD = JavaThread::current();
   _bootstrapping = true;
   ResourceMark rm;
   HandleMark hm;
@@ -97,7 +97,7 @@ void JVMCICompiler::bootstrap() {
     do {
       os::sleep(THREAD, 100, true);
       qsize = CompileBroker::queue_size(CompLevel_full_optimization);
-    } while (first_round && qsize == 0);
+    } while (!_bootstrap_compilation_request_handled && first_round && qsize == 0);
     first_round = false;
     if (PrintBootstrap) {
       while (z < (_methods_compiled / 100)) {
@@ -111,6 +111,7 @@ void JVMCICompiler::bootstrap() {
     tty->print_cr(" in " JLONG_FORMAT " ms (compiled %d methods)", os::javaTimeMillis() - start, _methods_compiled);
   }
   _bootstrapping = false;
+  JVMCIRuntime::bootstrap_finished(CHECK);
 }
 
 #define CHECK_ABORT THREAD); \
@@ -187,6 +188,9 @@ void JVMCICompiler::compile_method(const methodHandle& method, int entry_bci, JV
       assert(false, "JVMCICompiler.compileMethod should always return non-null");
     }
   }
+  if (_bootstrapping) {
+    _bootstrap_compilation_request_handled = true;
+  }
 }
 
 CompLevel JVMCIRuntime::adjust_comp_level(methodHandle method, bool is_osr, CompLevel level, JavaThread* thread) {
diff --git a/hotspot/src/share/vm/jvmci/jvmciCompiler.hpp b/hotspot/src/share/vm/jvmci/jvmciCompiler.hpp
index 22ff75ac571..d051086fb44 100644
--- a/hotspot/src/share/vm/jvmci/jvmciCompiler.hpp
+++ b/hotspot/src/share/vm/jvmci/jvmciCompiler.hpp
@@ -32,6 +32,11 @@ class JVMCICompiler : public AbstractCompiler {
 private:
   bool _bootstrapping;
 
+  /**
+   * True if we have seen a bootstrap compilation request.
+   */
+  volatile bool _bootstrap_compilation_request_handled;
+
   /**
    * Number of methods successfully compiled by a call to
    * JVMCICompiler::compile_method().
@@ -72,7 +77,7 @@ public:
    * Initialize the compile queue with the methods in java.lang.Object and
    * then wait until the queue is empty.
    */
-  void bootstrap();
+  void bootstrap(TRAPS);
 
   bool is_bootstrapping() const { return _bootstrapping; }
 
diff --git a/hotspot/src/share/vm/jvmci/jvmciRuntime.cpp b/hotspot/src/share/vm/jvmci/jvmciRuntime.cpp
index d5bc051563b..cbd75e37ad1 100644
--- a/hotspot/src/share/vm/jvmci/jvmciRuntime.cpp
+++ b/hotspot/src/share/vm/jvmci/jvmciRuntime.cpp
@@ -867,6 +867,15 @@ if (HAS_PENDING_EXCEPTION) { \
 #undef CHECK_RETURN
 }
 
+void JVMCIRuntime::bootstrap_finished(TRAPS) {
+  HandleMark hm(THREAD);
+  Handle receiver = get_HotSpotJVMCIRuntime(CHECK);
+  JavaValue result(T_VOID);
+  JavaCallArguments args;
+  args.push_oop(receiver);
+  JavaCalls::call_special(&result, receiver->klass(), vmSymbols::bootstrapFinished_method_name(), vmSymbols::void_method_signature(), &args, CHECK);
+}
+
 bool JVMCIRuntime::treat_as_trivial(Method* method) {
   if (_HotSpotJVMCIRuntime_initialized) {
     for (int i = 0; i < _trivial_prefixes_count; i++) {
diff --git a/hotspot/src/share/vm/jvmci/jvmciRuntime.hpp b/hotspot/src/share/vm/jvmci/jvmciRuntime.hpp
index 23091b08929..ebd5d3c72b6 100644
--- a/hotspot/src/share/vm/jvmci/jvmciRuntime.hpp
+++ b/hotspot/src/share/vm/jvmci/jvmciRuntime.hpp
@@ -127,6 +127,8 @@ class JVMCIRuntime: public AllStatic {
 
   static void shutdown(TRAPS);
 
+  static void bootstrap_finished(TRAPS);
+
   static bool shutdown_called() {
     return _shutdown_called;
   }
diff --git a/hotspot/src/share/vm/prims/jni.cpp b/hotspot/src/share/vm/prims/jni.cpp
index a6f10fc768d..438efc02e7b 100644
--- a/hotspot/src/share/vm/prims/jni.cpp
+++ b/hotspot/src/share/vm/prims/jni.cpp
@@ -3988,7 +3988,11 @@ static jint JNI_CreateJavaVM_inner(JavaVM **vm, void **penv, void *args) {
         if (BootstrapJVMCI) {
           JavaThread* THREAD = thread;
           JVMCICompiler* compiler = JVMCICompiler::instance(CATCH);
-          compiler->bootstrap();
+          compiler->bootstrap(THREAD);
+          if (HAS_PENDING_EXCEPTION) {
+            HandleMark hm;
+            vm_exit_during_initialization(Handle(THREAD, PENDING_EXCEPTION));
+          }
         }
       }
     }
diff --git a/hotspot/test/compiler/jvmci/common/services/jdk.vm.ci.hotspot.HotSpotVMEventListener b/hotspot/test/compiler/jvmci/common/services/jdk.vm.ci.hotspot.HotSpotVMEventListener
deleted file mode 100644
index 2b70db58445..00000000000
--- a/hotspot/test/compiler/jvmci/common/services/jdk.vm.ci.hotspot.HotSpotVMEventListener
+++ /dev/null
@@ -1 +0,0 @@
-compiler.jvmci.common.JVMCIHelpers$EmptyVMEventListener
diff --git a/hotspot/test/compiler/jvmci/common/services/jdk.vm.ci.runtime.JVMCICompilerFactory b/hotspot/test/compiler/jvmci/common/services/jdk.vm.ci.runtime.JVMCICompilerFactory
deleted file mode 100644
index 5a88a1f4914..00000000000
--- a/hotspot/test/compiler/jvmci/common/services/jdk.vm.ci.runtime.JVMCICompilerFactory
+++ /dev/null
@@ -1 +0,0 @@
-compiler.jvmci.common.JVMCIHelpers$EmptyCompilerFactory

From cf5a61530f5f87404ab6a4e7551358ec8456bba7 Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <thartmann@openjdk.org>
Date: Thu, 12 May 2016 08:23:25 +0200
Subject: [PATCH 074/228] 8155643: Java crash with assert in Xcomp mode and
 disabled ReduceInitialCardMarks

We should not emit a subtype check for CloneOop arraycopy.

Reviewed-by: kvn
---
 hotspot/src/share/vm/opto/macroArrayCopy.cpp  | 78 ++++++++++---------
 .../arraycopy/TestObjectArrayClone.java       | 40 ++++++++++
 2 files changed, 81 insertions(+), 37 deletions(-)
 create mode 100644 hotspot/test/compiler/arraycopy/TestObjectArrayClone.java

diff --git a/hotspot/src/share/vm/opto/macroArrayCopy.cpp b/hotspot/src/share/vm/opto/macroArrayCopy.cpp
index 17065895bff..3ed742e3bba 100644
--- a/hotspot/src/share/vm/opto/macroArrayCopy.cpp
+++ b/hotspot/src/share/vm/opto/macroArrayCopy.cpp
@@ -503,46 +503,50 @@ Node* PhaseMacroExpand::generate_arraycopy(ArrayCopyNode *ac, AllocateArrayNode*
     // further to JVM_ArrayCopy on the first per-oop check that fails.
     // (Actually, we don't move raw bits only; the GC requires card marks.)
 
-    // Get the klass* for both src and dest
-    Node* src_klass  = ac->in(ArrayCopyNode::SrcKlass);
-    Node* dest_klass = ac->in(ArrayCopyNode::DestKlass);
+    // We don't need a subtype check for validated copies and Object[].clone()
+    bool skip_subtype_check = ac->is_arraycopy_validated() || ac->is_copyof_validated() ||
+                              ac->is_copyofrange_validated() || ac->is_cloneoop();
+    if (!skip_subtype_check) {
+      // Get the klass* for both src and dest
+      Node* src_klass  = ac->in(ArrayCopyNode::SrcKlass);
+      Node* dest_klass = ac->in(ArrayCopyNode::DestKlass);
 
-    assert(src_klass != NULL && dest_klass != NULL, "should have klasses");
+      assert(src_klass != NULL && dest_klass != NULL, "should have klasses");
 
-    // Generate the subtype check.
-    // This might fold up statically, or then again it might not.
-    //
-    // Non-static example:  Copying List<String>.elements to a new String[].
-    // The backing store for a List<String> is always an Object[],
-    // but its elements are always type String, if the generic types
-    // are correct at the source level.
-    //
-    // Test S[] against D[], not S against D, because (probably)
-    // the secondary supertype cache is less busy for S[] than S.
-    // This usually only matters when D is an interface.
-    Node* not_subtype_ctrl = (ac->is_arraycopy_validated() || ac->is_copyof_validated() || ac->is_copyofrange_validated()) ? top() :
-      Phase::gen_subtype_check(src_klass, dest_klass, ctrl, mem, &_igvn);
-    // Plug failing path into checked_oop_disjoint_arraycopy
-    if (not_subtype_ctrl != top()) {
-      Node* local_ctrl = not_subtype_ctrl;
-      MergeMemNode* local_mem = MergeMemNode::make(mem);
-      transform_later(local_mem);
+      // Generate the subtype check.
+      // This might fold up statically, or then again it might not.
+      //
+      // Non-static example:  Copying List<String>.elements to a new String[].
+      // The backing store for a List<String> is always an Object[],
+      // but its elements are always type String, if the generic types
+      // are correct at the source level.
+      //
+      // Test S[] against D[], not S against D, because (probably)
+      // the secondary supertype cache is less busy for S[] than S.
+      // This usually only matters when D is an interface.
+      Node* not_subtype_ctrl = Phase::gen_subtype_check(src_klass, dest_klass, ctrl, mem, &_igvn);
+      // Plug failing path into checked_oop_disjoint_arraycopy
+      if (not_subtype_ctrl != top()) {
+        Node* local_ctrl = not_subtype_ctrl;
+        MergeMemNode* local_mem = MergeMemNode::make(mem);
+        transform_later(local_mem);
 
-      // (At this point we can assume disjoint_bases, since types differ.)
-      int ek_offset = in_bytes(ObjArrayKlass::element_klass_offset());
-      Node* p1 = basic_plus_adr(dest_klass, ek_offset);
-      Node* n1 = LoadKlassNode::make(_igvn, NULL, C->immutable_memory(), p1, TypeRawPtr::BOTTOM);
-      Node* dest_elem_klass = transform_later(n1);
-      Node* cv = generate_checkcast_arraycopy(&local_ctrl, &local_mem,
-                                              adr_type,
-                                              dest_elem_klass,
-                                              src, src_offset, dest, dest_offset,
-                                              ConvI2X(copy_length), dest_uninitialized);
-      if (cv == NULL)  cv = intcon(-1);  // failure (no stub available)
-      checked_control = local_ctrl;
-      checked_i_o     = *io;
-      checked_mem     = local_mem->memory_at(alias_idx);
-      checked_value   = cv;
+        // (At this point we can assume disjoint_bases, since types differ.)
+        int ek_offset = in_bytes(ObjArrayKlass::element_klass_offset());
+        Node* p1 = basic_plus_adr(dest_klass, ek_offset);
+        Node* n1 = LoadKlassNode::make(_igvn, NULL, C->immutable_memory(), p1, TypeRawPtr::BOTTOM);
+        Node* dest_elem_klass = transform_later(n1);
+        Node* cv = generate_checkcast_arraycopy(&local_ctrl, &local_mem,
+                                                adr_type,
+                                                dest_elem_klass,
+                                                src, src_offset, dest, dest_offset,
+                                                ConvI2X(copy_length), dest_uninitialized);
+        if (cv == NULL)  cv = intcon(-1);  // failure (no stub available)
+        checked_control = local_ctrl;
+        checked_i_o     = *io;
+        checked_mem     = local_mem->memory_at(alias_idx);
+        checked_value   = cv;
+      }
     }
     // At this point we know we do not need type checks on oop stores.
 
diff --git a/hotspot/test/compiler/arraycopy/TestObjectArrayClone.java b/hotspot/test/compiler/arraycopy/TestObjectArrayClone.java
new file mode 100644
index 00000000000..3cf5c65f39d
--- /dev/null
+++ b/hotspot/test/compiler/arraycopy/TestObjectArrayClone.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2016, 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 8155643
+ * @summary Test Object.clone() intrinsic if ReduceInitialCardMarks is disabled.
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -Xcomp -XX:CompileOnly=TestObjectArrayClone.test -XX:-ReduceInitialCardMarks TestObjectArrayClone
+ */
+public class TestObjectArrayClone {
+
+    public static TestObjectArrayClone[] test(TestObjectArrayClone[] arr) {
+        return arr.clone();
+    }
+
+    public static void main(String[] args) {
+        test(new TestObjectArrayClone[42]);
+    }
+}
+

From 8adbc20c875d6511c386ed7d932b8074bab66c08 Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <thartmann@openjdk.org>
Date: Thu, 12 May 2016 08:25:42 +0200
Subject: [PATCH 075/228] 8155241: Crash with assert in Xcomp mode and with
 disabled ReduceBulkZeroing

We should not assume that a CloneBasic arraycopy sets array initialization to complete.

Reviewed-by: kvn, roland
---
 hotspot/src/share/vm/opto/memnode.cpp         |  2 +-
 .../TestReduceBulkZeroingDisabled.java        | 36 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 hotspot/test/compiler/arraycopy/TestReduceBulkZeroingDisabled.java

diff --git a/hotspot/src/share/vm/opto/memnode.cpp b/hotspot/src/share/vm/opto/memnode.cpp
index 4be9e24b883..d4a4e3ab9e4 100644
--- a/hotspot/src/share/vm/opto/memnode.cpp
+++ b/hotspot/src/share/vm/opto/memnode.cpp
@@ -502,7 +502,7 @@ Node* LoadNode::find_previous_arraycopy(PhaseTransform* phase, Node* ld_alloc, N
       if (ac->is_clonebasic()) {
         intptr_t offset;
         AllocateNode* alloc = AllocateNode::Ideal_allocation(ac->in(ArrayCopyNode::Dest), phase, offset);
-        assert(alloc != NULL && alloc->initialization()->is_complete_with_arraycopy(), "broken allocation");
+        assert(alloc != NULL && (!ReduceBulkZeroing || alloc->initialization()->is_complete_with_arraycopy()), "broken allocation");
         if (alloc == ld_alloc) {
           return ac;
         }
diff --git a/hotspot/test/compiler/arraycopy/TestReduceBulkZeroingDisabled.java b/hotspot/test/compiler/arraycopy/TestReduceBulkZeroingDisabled.java
new file mode 100644
index 00000000000..2c789c0ee14
--- /dev/null
+++ b/hotspot/test/compiler/arraycopy/TestReduceBulkZeroingDisabled.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2016, 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 8155241
+ * @summary Test arraycopy elimination with ReduceBulkZeroing disabled.
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -Xcomp -XX:-ReduceBulkZeroing TestReduceBulkZeroingDisabled
+ */
+public class TestReduceBulkZeroingDisabled {
+
+    static public void main(String[] args) {
+        System.out.println("Passed");
+    }
+}
+

From 5e2fa37504047e2affa29ca57f6c0d185d3ceb16 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Thu, 12 May 2016 12:46:07 +0300
Subject: [PATCH 076/228] 8153792: EA: assert(ptn->as_LocalVar()->edge_count()
 > 0) failed: sanity when compiling compareAndExchange

Reviewed-by: kvn, psandoz
---
 hotspot/src/share/vm/opto/escape.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hotspot/src/share/vm/opto/escape.cpp b/hotspot/src/share/vm/opto/escape.cpp
index 15ece3072b0..892a0d3defa 100644
--- a/hotspot/src/share/vm/opto/escape.cpp
+++ b/hotspot/src/share/vm/opto/escape.cpp
@@ -721,7 +721,8 @@ void ConnectionGraph::add_final_edges(Node *n) {
         break;
       }
 #endif
-      if (opcode == Op_GetAndSetP || opcode == Op_GetAndSetN) {
+      if (opcode == Op_GetAndSetP || opcode == Op_GetAndSetN ||
+          opcode == Op_CompareAndExchangeN || opcode == Op_CompareAndExchangeP) {
         add_local_var_and_edge(n, PointsToNode::NoEscape, adr, NULL);
       }
       if (adr_type->isa_oopptr() ||

From 9f43471b5542dbd56d2e65458f2e0e1ca7919d43 Mon Sep 17 00:00:00 2001
From: Roland Schatz <rschatz@openjdk.org>
Date: Thu, 12 May 2016 12:59:35 +0200
Subject: [PATCH 077/228] 8156768: [JVMCI] remove support for patching Symbol
 pointers

Reviewed-by: iveresov
---
 .../src/jdk/vm/ci/hotspot/CompilerToVM.java   |  5 --
 .../hotspot/HotSpotMemoryAccessProvider.java  |  2 -
 .../HotSpotMemoryAccessProviderImpl.java      | 12 ----
 .../ci/hotspot/HotSpotMetaAccessProvider.java |  9 ---
 .../ci/hotspot/HotSpotMetaspaceConstant.java  |  2 -
 .../hotspot/HotSpotMetaspaceConstantImpl.java |  7 ---
 .../src/jdk/vm/ci/hotspot/HotSpotSymbol.java  | 57 -------------------
 .../src/share/vm/jvmci/jvmciCodeInstaller.cpp |  9 +--
 .../src/share/vm/jvmci/jvmciCompilerToVM.cpp  |  6 --
 .../src/share/vm/jvmci/jvmciJavaClasses.hpp   |  3 -
 .../share/vm/jvmci/systemDictionary_jvmci.hpp |  1 -
 .../src/share/vm/jvmci/vmSymbols_jvmci.hpp    |  1 -
 .../jdk/vm/ci/code/test/DataPatchTest.java    | 29 ----------
 13 files changed, 2 insertions(+), 141 deletions(-)
 delete mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSymbol.java

diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
index fb087e209e0..40b58928d0f 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
@@ -479,11 +479,6 @@ final class CompilerToVM {
      */
     native String getSymbol(long metaspaceSymbol);
 
-    /**
-     * Lookup a VMSymbol from a String.
-     */
-    native long lookupSymbol(String symbol);
-
     /**
      * Looks for the next Java stack frame matching an entry in {@code methods}.
      *
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProvider.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProvider.java
index eb156fe74ab..c5779332e5a 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProvider.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProvider.java
@@ -39,6 +39,4 @@ public interface HotSpotMemoryAccessProvider extends MemoryAccessProvider {
     Constant readNarrowKlassPointerConstant(Constant base, long displacement, CompressEncoding encoding);
 
     Constant readMethodPointerConstant(Constant base, long displacement);
-
-    Constant readSymbolConstant(Constant base, long displacement);
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java
index 6914926d661..8ca1c73f4e7 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java
@@ -232,16 +232,4 @@ class HotSpotMemoryAccessProviderImpl implements HotSpotMemoryAccessProvider, Ho
         HotSpotResolvedJavaMethodImpl method = runtime.getCompilerToVM().getResolvedJavaMethod(baseObject, displacement);
         return HotSpotMetaspaceConstantImpl.forMetaspaceObject(method, false);
     }
-
-    @Override
-    public Constant readSymbolConstant(Constant base, long displacement) {
-        int bits = runtime.getConfig().symbolPointerSize * Byte.SIZE;
-        long pointer = readRawValue(base, displacement, bits);
-        if (pointer == 0) {
-            return JavaConstant.NULL_POINTER;
-        } else {
-            String symbol = runtime.getCompilerToVM().getSymbol(pointer);
-            return new HotSpotSymbol(symbol, pointer).asConstant();
-        }
-    }
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaAccessProvider.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaAccessProvider.java
index dcc0c518ce3..bea84c25cd8 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaAccessProvider.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaAccessProvider.java
@@ -78,15 +78,6 @@ public class HotSpotMetaAccessProvider implements MetaAccessProvider, HotSpotPro
         return new HotSpotSignature(runtime, signature);
     }
 
-    public HotSpotSymbol lookupSymbol(String symbol) {
-        long pointer = runtime.getCompilerToVM().lookupSymbol(symbol);
-        if (pointer == 0) {
-            return null;
-        } else {
-            return new HotSpotSymbol(symbol, pointer);
-        }
-    }
-
     /**
      * {@link Field} object of {@link Method#slot}.
      */
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstant.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstant.java
index f02fd38884c..f42d84539dd 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstant.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstant.java
@@ -29,6 +29,4 @@ public interface HotSpotMetaspaceConstant extends HotSpotConstant, VMConstant {
     HotSpotResolvedObjectType asResolvedJavaType();
 
     HotSpotResolvedJavaMethod asResolvedJavaMethod();
-
-    HotSpotSymbol asSymbol();
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstantImpl.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstantImpl.java
index abf349e7690..e85f3b0c26e 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstantImpl.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstantImpl.java
@@ -108,11 +108,4 @@ final class HotSpotMetaspaceConstantImpl implements HotSpotMetaspaceConstant, VM
         }
         return null;
     }
-
-    public HotSpotSymbol asSymbol() {
-        if (metaspaceObject instanceof HotSpotSymbol) {
-            return (HotSpotSymbol) metaspaceObject;
-        }
-        return null;
-    }
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSymbol.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSymbol.java
deleted file mode 100644
index cfb11f338d7..00000000000
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSymbol.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2016, 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;
-
-import jdk.vm.ci.meta.Constant;
-
-/**
- * Class to access the C++ {@code vmSymbols} table.
- */
-public final class HotSpotSymbol implements MetaspaceWrapperObject {
-
-    private final String symbol;
-    private final long pointer;
-
-    HotSpotSymbol(String symbol, long pointer) {
-        this.symbol = symbol;
-        this.pointer = pointer;
-    }
-
-    public String getSymbol() {
-        return symbol;
-    }
-
-    public Constant asConstant() {
-        return HotSpotMetaspaceConstantImpl.forMetaspaceObject(this, false);
-    }
-
-    @Override
-    public long getMetaspacePointer() {
-        return pointer;
-    }
-
-    @Override
-    public String toString() {
-        return "Symbol<" + symbol + ">";
-    }
-}
diff --git a/hotspot/src/share/vm/jvmci/jvmciCodeInstaller.cpp b/hotspot/src/share/vm/jvmci/jvmciCodeInstaller.cpp
index 9586d4438c1..16b64be8c37 100644
--- a/hotspot/src/share/vm/jvmci/jvmciCodeInstaller.cpp
+++ b/hotspot/src/share/vm/jvmci/jvmciCodeInstaller.cpp
@@ -181,8 +181,8 @@ void* CodeInstaller::record_metadata_reference(Handle constant, TRAPS) {
   /*
    * This method needs to return a raw (untyped) pointer, since the value of a pointer to the base
    * class is in general not equal to the pointer of the subclass. When patching metaspace pointers,
-   * the compiler expects a direct pointer to the subclass (Klass*, Method* or Symbol*), not a
-   * pointer to the base class (Metadata* or MetaspaceObj*).
+   * the compiler expects a direct pointer to the subclass (Klass* or Method*), not a pointer to the
+   * base class (Metadata* or MetaspaceObj*).
    */
   oop obj = HotSpotMetaspaceConstantImpl::metaspaceObject(constant);
   if (obj->is_a(HotSpotResolvedObjectTypeImpl::klass())) {
@@ -197,11 +197,6 @@ void* CodeInstaller::record_metadata_reference(Handle constant, TRAPS) {
     int index = _oop_recorder->find_index(method);
     TRACE_jvmci_3("metadata[%d of %d] = %s", index, _oop_recorder->metadata_count(), method->name()->as_C_string());
     return method;
-  } else if (obj->is_a(HotSpotSymbol::klass())) {
-    Symbol* symbol = (Symbol*) (address) HotSpotSymbol::pointer(obj);
-    assert(!HotSpotMetaspaceConstantImpl::compressed(constant), "unexpected compressed symbol pointer %s @ " INTPTR_FORMAT, symbol->as_C_string(), p2i(symbol));
-    TRACE_jvmci_3("symbol = %s", symbol->as_C_string());
-    return symbol;
   } else {
     JVMCI_ERROR_NULL("unexpected metadata reference for constant of type %s", obj->klass()->signature_name());
   }
diff --git a/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp b/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
index 94108e6c75c..50e04b297ea 100644
--- a/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
+++ b/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
@@ -1048,11 +1048,6 @@ C2V_VMENTRY(jobject, getSymbol, (JNIEnv*, jobject, jlong symbol))
   return JNIHandles::make_local(THREAD, sym());
 C2V_END
 
-C2V_VMENTRY(jlong, lookupSymbol, (JNIEnv*, jobject, jobject string))
-  Symbol* symbol = java_lang_String::as_symbol_or_null(JNIHandles::resolve(string));
-  return (jlong) symbol;
-C2V_END
-
 bool matches(jobjectArray methods, Method* method) {
   objArrayOop methods_oop = (objArrayOop) JNIHandles::resolve(methods);
 
@@ -1480,7 +1475,6 @@ JNINativeMethod CompilerToVM::methods[] = {
   {CC "isMature",                                     CC "(" METASPACE_METHOD_DATA ")Z",                                                    FN_PTR(isMature)},
   {CC "hasCompiledCodeForOSR",                        CC "(" HS_RESOLVED_METHOD "II)Z",                                                     FN_PTR(hasCompiledCodeForOSR)},
   {CC "getSymbol",                                    CC "(J)" STRING,                                                                      FN_PTR(getSymbol)},
-  {CC "lookupSymbol",                                 CC "(" STRING ")J",                                                                   FN_PTR(lookupSymbol)},
   {CC "getNextStackFrame",                            CC "(" HS_STACK_FRAME_REF "[" RESOLVED_METHOD "I)" HS_STACK_FRAME_REF,                FN_PTR(getNextStackFrame)},
   {CC "materializeVirtualObjects",                    CC "(" HS_STACK_FRAME_REF "Z)V",                                                      FN_PTR(materializeVirtualObjects)},
   {CC "shouldDebugNonSafepoints",                     CC "()Z",                                                                             FN_PTR(shouldDebugNonSafepoints)},
diff --git a/hotspot/src/share/vm/jvmci/jvmciJavaClasses.hpp b/hotspot/src/share/vm/jvmci/jvmciJavaClasses.hpp
index 5430a9fe6ed..851b4e4244a 100644
--- a/hotspot/src/share/vm/jvmci/jvmciJavaClasses.hpp
+++ b/hotspot/src/share/vm/jvmci/jvmciJavaClasses.hpp
@@ -64,9 +64,6 @@ class JVMCIJavaClasses : AllStatic {
   start_class(HotSpotResolvedJavaMethodImpl)                                                                                                                   \
     long_field(HotSpotResolvedJavaMethodImpl, metaspaceMethod)                                                                                                 \
   end_class                                                                                                                                                    \
-  start_class(HotSpotSymbol)                                                                                                                                   \
-    long_field(HotSpotSymbol, pointer)                                                                                                                         \
-  end_class                                                                                                                                                    \
   start_class(InstalledCode)                                                                                                                                   \
     long_field(InstalledCode, address)                                                                                                                         \
     long_field(InstalledCode, entryPoint)                                                                                                                      \
diff --git a/hotspot/src/share/vm/jvmci/systemDictionary_jvmci.hpp b/hotspot/src/share/vm/jvmci/systemDictionary_jvmci.hpp
index 1d51114071a..864539f6654 100644
--- a/hotspot/src/share/vm/jvmci/systemDictionary_jvmci.hpp
+++ b/hotspot/src/share/vm/jvmci/systemDictionary_jvmci.hpp
@@ -49,7 +49,6 @@
   do_klass(HotSpotJVMCIMetaAccessContext_klass,          jdk_vm_ci_hotspot_HotSpotJVMCIMetaAccessContext,       Jvmci) \
   do_klass(HotSpotJVMCIRuntime_klass,                    jdk_vm_ci_hotspot_HotSpotJVMCIRuntime,                 Jvmci) \
   do_klass(HotSpotSpeculationLog_klass,                  jdk_vm_ci_hotspot_HotSpotSpeculationLog,               Jvmci) \
-  do_klass(HotSpotSymbol_klass,                          jdk_vm_ci_hotspot_HotSpotSymbol,                       Jvmci) \
   do_klass(Assumptions_ConcreteMethod_klass,             jdk_vm_ci_meta_Assumptions_ConcreteMethod,             Jvmci) \
   do_klass(Assumptions_NoFinalizableSubclass_klass,      jdk_vm_ci_meta_Assumptions_NoFinalizableSubclass,      Jvmci) \
   do_klass(Assumptions_ConcreteSubtype_klass,            jdk_vm_ci_meta_Assumptions_ConcreteSubtype,            Jvmci) \
diff --git a/hotspot/src/share/vm/jvmci/vmSymbols_jvmci.hpp b/hotspot/src/share/vm/jvmci/vmSymbols_jvmci.hpp
index 823ed75023b..58bff72bd7e 100644
--- a/hotspot/src/share/vm/jvmci/vmSymbols_jvmci.hpp
+++ b/hotspot/src/share/vm/jvmci/vmSymbols_jvmci.hpp
@@ -50,7 +50,6 @@
   template(jdk_vm_ci_hotspot_HotSpotJVMCIMetaAccessContext,       "jdk/vm/ci/hotspot/HotSpotJVMCIMetaAccessContext")       \
   template(jdk_vm_ci_hotspot_HotSpotJVMCIRuntime,                 "jdk/vm/ci/hotspot/HotSpotJVMCIRuntime")                 \
   template(jdk_vm_ci_hotspot_HotSpotSpeculationLog,               "jdk/vm/ci/hotspot/HotSpotSpeculationLog")               \
-  template(jdk_vm_ci_hotspot_HotSpotSymbol,                       "jdk/vm/ci/hotspot/HotSpotSymbol")                       \
   template(jdk_vm_ci_meta_JavaConstant,                           "jdk/vm/ci/meta/JavaConstant")                           \
   template(jdk_vm_ci_meta_PrimitiveConstant,                      "jdk/vm/ci/meta/PrimitiveConstant")                      \
   template(jdk_vm_ci_meta_RawConstant,                            "jdk/vm/ci/meta/RawConstant")                            \
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DataPatchTest.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DataPatchTest.java
index 3b7c421b2c5..b2070884fc3 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DataPatchTest.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DataPatchTest.java
@@ -42,7 +42,6 @@ import jdk.vm.ci.code.Register;
 import jdk.vm.ci.code.site.DataSectionReference;
 import jdk.vm.ci.hotspot.HotSpotConstant;
 import jdk.vm.ci.hotspot.HotSpotMetaAccessProvider;
-import jdk.vm.ci.hotspot.HotSpotSymbol;
 import jdk.vm.ci.hotspot.HotSpotVMConfig;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
@@ -158,32 +157,4 @@ public class DataPatchTest extends CodeInstallationTest {
             asm.emitPointerRet(ret);
         });
     }
-
-    public static long getConstSymbol(HotSpotMetaAccessProvider meta) {
-        HotSpotSymbol symbol = meta.lookupSymbol("java/lang/Object");
-        return symbol.getMetaspacePointer();
-    }
-
-    private void testSymbol(TestCompiler compiler) {
-        test(compiler, getMethod("getConstSymbol", HotSpotMetaAccessProvider.class), (HotSpotMetaAccessProvider) metaAccess);
-    }
-
-    @Test
-    public void testInlineSymbol() {
-        testSymbol(asm -> {
-            HotSpotSymbol symbol = ((HotSpotMetaAccessProvider) metaAccess).lookupSymbol("java/lang/Object");
-            Register ret = asm.emitLoadPointer((HotSpotConstant) symbol.asConstant());
-            asm.emitPointerRet(ret);
-        });
-    }
-
-    @Test
-    public void testSymbolInDataSection() {
-        testSymbol(asm -> {
-            HotSpotSymbol symbol = ((HotSpotMetaAccessProvider) metaAccess).lookupSymbol("java/lang/Object");
-            DataSectionReference ref = asm.emitDataItem((HotSpotConstant) symbol.asConstant());
-            Register ret = asm.emitLoadPointer(ref);
-            asm.emitPointerRet(ret);
-        });
-    }
 }

From 3b2bc5df71c601c01c5f260658164fa2579f71bf Mon Sep 17 00:00:00 2001
From: Christian Tornqvist <ctornqvi@openjdk.org>
Date: Tue, 17 May 2016 15:44:20 -0400
Subject: [PATCH 078/228] 8151805: fatal error: heap walk aborted with error 1

Reviewed-by: gtriantafill, dcubed
---
 hotspot/src/os/windows/vm/os_windows.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hotspot/src/os/windows/vm/os_windows.cpp b/hotspot/src/os/windows/vm/os_windows.cpp
index 7c3b6da4ed4..fcdddd32c26 100644
--- a/hotspot/src/os/windows/vm/os_windows.cpp
+++ b/hotspot/src/os/windows/vm/os_windows.cpp
@@ -5277,7 +5277,8 @@ bool os::check_heap(bool force) {
         }
       }
       DWORD err = GetLastError();
-      if (err != ERROR_NO_MORE_ITEMS && err != ERROR_CALL_NOT_IMPLEMENTED) {
+      if (err != ERROR_NO_MORE_ITEMS && err != ERROR_CALL_NOT_IMPLEMENTED &&
+         (err == ERROR_INVALID_FUNCTION && phe.lpData != NULL)) {
         HeapUnlock(heap);
         fatal("heap walk aborted with error %d", err);
       }

From 5e087a4336df54c7096fb60bb05fc5f5a2db3cbd Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Thu, 12 May 2016 14:29:02 +0300
Subject: [PATCH 079/228] 8156777: [TESTBUG]
 test/testlibrary_tests/SimpleClassFileLoadHookTest.java requires non minimal
 VM

Reviewed-by: mseledtsov, ctornqvi, gtriantafill
---
 hotspot/test/testlibrary_tests/SimpleClassFileLoadHookTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hotspot/test/testlibrary_tests/SimpleClassFileLoadHookTest.java b/hotspot/test/testlibrary_tests/SimpleClassFileLoadHookTest.java
index 6f5ef8d4a71..d81d6d0ea6c 100644
--- a/hotspot/test/testlibrary_tests/SimpleClassFileLoadHookTest.java
+++ b/hotspot/test/testlibrary_tests/SimpleClassFileLoadHookTest.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /testlibrary
- *
+ * @requires vm.flavor != "minimal"
  * @run main/othervm/native -agentlib:SimpleClassFileLoadHook=Foo,XXX,YYY
  *      SimpleClassFileLoadHookTest
  */

From 72bf5160ac43696b0986e1e6f6730cf06f936e32 Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Thu, 12 May 2016 09:16:17 -0700
Subject: [PATCH 080/228] 8154546: Retire sun.misc.GThreadHelper

Reviewed-by: serb, chegar, kcr
---
 .../native/libawt_xawt/awt/gtk2_interface.c   | 44 ++--------
 .../unix/classes/sun/misc/GThreadHelper.java  | 87 -------------------
 2 files changed, 7 insertions(+), 124 deletions(-)
 delete mode 100644 jdk/src/jdk.unsupported/unix/classes/sun/misc/GThreadHelper.java

diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c
index ef8caa94382..7ce7fae60d5 100644
--- a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c
+++ b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c
@@ -817,52 +817,22 @@ GtkApi* gtk2_load(JNIEnv *env, const char* lib_name)
     io_handler = XSetIOErrorHandler(NULL);
 
     if (fp_gtk_check_version(2, 2, 0) == NULL) {
-        jclass clazz = (*env)->FindClass(env, "sun/misc/GThreadHelper");
-        jmethodID mid_getAndSetInitializationNeededFlag =
-                (*env)->GetStaticMethodID(env, clazz, "getAndSetInitializationNeededFlag", "()Z");
-        jmethodID mid_lock = (*env)->GetStaticMethodID(env, clazz, "lock", "()V");
-        jmethodID mid_unlock = (*env)->GetStaticMethodID(env, clazz, "unlock", "()V");
-
-        // Init the thread system to use GLib in a thread-safe mode
-        (*env)->CallStaticVoidMethod(env, clazz, mid_lock);
-        if ((*env)->ExceptionCheck(env)) {
-            AWT_UNLOCK();
-            return FALSE;
-        }
 
         // Calling g_thread_init() multiple times leads to crash on GLib < 2.24
         // We can use g_thread_get_initialized () but it is available only for
-        // GLib >= 2.20. We rely on GThreadHelper for GLib < 2.20.
+        // GLib >= 2.20.
         gboolean is_g_thread_get_initialized = FALSE;
         if (GLIB_CHECK_VERSION(2, 20, 0)) {
             is_g_thread_get_initialized = fp_g_thread_get_initialized();
         }
 
-        if (!(*env)->CallStaticBooleanMethod(env, clazz, mid_getAndSetInitializationNeededFlag)) {
-            if (!is_g_thread_get_initialized) {
-                fp_g_thread_init(NULL);
-            }
+        if (!is_g_thread_get_initialized) {
+            fp_g_thread_init(NULL);
+        }
 
-            //According the GTK documentation, gdk_threads_init() should be
-            //called before gtk_init() or gtk_init_check()
-            fp_gdk_threads_init();
-        }
-        jthrowable pendExcpn = NULL;
-        // Exception raised during mid_getAndSetInitializationNeededFlag
-        // call is saved and error handling is done
-        // after unlock method is called
-        if ((pendExcpn = (*env)->ExceptionOccurred(env)) != NULL) {
-            (*env)->ExceptionClear(env);
-        }
-        (*env)->CallStaticVoidMethod(env, clazz, mid_unlock);
-        if (pendExcpn != NULL) {
-            (*env)->Throw(env, pendExcpn);
-        }
-        // check if any exception occured during mid_unlock call
-        if ((*env)->ExceptionCheck(env)) {
-            AWT_UNLOCK();
-            return FALSE;
-        }
+        //According the GTK documentation, gdk_threads_init() should be
+        //called before gtk_init() or gtk_init_check()
+        fp_gdk_threads_init();
     }
     result = (*fp_gtk_init_check)(NULL, NULL);
 
diff --git a/jdk/src/jdk.unsupported/unix/classes/sun/misc/GThreadHelper.java b/jdk/src/jdk.unsupported/unix/classes/sun/misc/GThreadHelper.java
deleted file mode 100644
index 180a5d5c1af..00000000000
--- a/jdk/src/jdk.unsupported/unix/classes/sun/misc/GThreadHelper.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2013, 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 sun.misc;
-
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * This class is used to prevent multiple calling of g_thread_init ()
- * and gdk_thread_init ().
- *
- * Since version 2.24 of GLib, calling g_thread_init () multiple times is
- * allowed, but it will crash for older versions. There are two ways to
- * find out if g_thread_init () has been called:
- * g_thread_get_initialized (), but it was introduced in 2.20
- * g_thread_supported (), but it is a macro and cannot be loaded with dlsym.
- *
- * usage:
- * <pre>
- * lock();
- * try {
- *    if (!getAndSetInitializationNeededFlag()) {
- *        //call to g_thread_init();
- *        //call to gdk_thread_init();
- *    }
- * } finally {
- *    unlock();
- * }
- * </pre>
- */
-public final class GThreadHelper {
-
-    private static final ReentrantLock LOCK = new ReentrantLock();
-    private static boolean isGThreadInitialized = false;
-
-    /**
-     * Acquires the lock.
-     */
-    public static void lock() {
-        LOCK.lock();
-    }
-
-    /**
-     * Releases the lock.
-     */
-    public static void unlock() {
-        LOCK.unlock();
-    }
-
-    /**
-     * Gets current value of initialization flag and sets it to {@code true}.
-     * MUST be called under the lock.
-     *
-     * A return value of {@code false} indicates that the calling code
-     * should call the g_thread_init() and gdk_thread_init() functions
-     * before releasing the lock.
-     *
-     * @return {@code true} if initialization has been completed.
-     */
-    public static boolean getAndSetInitializationNeededFlag() {
-        boolean ret = isGThreadInitialized;
-        isGThreadInitialized = true;
-        return ret;
-    }
-}

From 39fe334e1216b35c99353be42393e50df1e30499 Mon Sep 17 00:00:00 2001
From: Alexander Scherbatiy <alexsch@openjdk.org>
Date: Thu, 12 May 2016 20:43:37 +0400
Subject: [PATCH 081/228] 8154539: Examine the desktop module's use of
 sun.misc.SoftCache

Reviewed-by: prr, chegar, mchung
---
 jdk/src/java.desktop/share/classes/module-info.java             | 2 --
 .../misc => java.desktop/share/classes/sun/awt}/SoftCache.java  | 2 +-
 jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java      | 1 -
 .../classes/sun/awt/image/MultiResolutionToolkitImage.java      | 2 +-
 jdk/test/com/sun/jdi/ReferrersTest.java                         | 2 +-
 5 files changed, 3 insertions(+), 6 deletions(-)
 rename jdk/src/{jdk.unsupported/share/classes/sun/misc => java.desktop/share/classes/sun/awt}/SoftCache.java (99%)

diff --git a/jdk/src/java.desktop/share/classes/module-info.java b/jdk/src/java.desktop/share/classes/module-info.java
index 5cf785de71f..77150e17b73 100644
--- a/jdk/src/java.desktop/share/classes/module-info.java
+++ b/jdk/src/java.desktop/share/classes/module-info.java
@@ -27,8 +27,6 @@ module java.desktop {
     requires public java.datatransfer;
     requires public java.xml;
     requires java.prefs;
-    // 8147544
-    requires jdk.unsupported;
 
     exports java.applet;
     exports java.awt;
diff --git a/jdk/src/jdk.unsupported/share/classes/sun/misc/SoftCache.java b/jdk/src/java.desktop/share/classes/sun/awt/SoftCache.java
similarity index 99%
rename from jdk/src/jdk.unsupported/share/classes/sun/misc/SoftCache.java
rename to jdk/src/java.desktop/share/classes/sun/awt/SoftCache.java
index 30bc2ec6068..7b7ea26be86 100644
--- a/jdk/src/jdk.unsupported/share/classes/sun/misc/SoftCache.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/SoftCache.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package sun.misc;
+package sun.awt;
 
 import java.lang.ref.SoftReference;
 import java.lang.ref.ReferenceQueue;
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java b/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java
index fdaeb1ea7ad..8461974375f 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java
@@ -65,7 +65,6 @@ import sun.awt.image.MultiResolutionToolkitImage;
 import sun.awt.image.ToolkitImage;
 import sun.awt.image.URLImageSource;
 import sun.font.FontDesignMetrics;
-import sun.misc.SoftCache;
 import sun.net.util.URLUtil;
 import sun.security.action.GetBooleanAction;
 import sun.security.action.GetPropertyAction;
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionToolkitImage.java b/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionToolkitImage.java
index a8e67f767ca..26a86916824 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionToolkitImage.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionToolkitImage.java
@@ -29,7 +29,7 @@ import java.awt.image.ImageObserver;
 import java.awt.image.MultiResolutionImage;
 import java.util.Arrays;
 import java.util.List;
-import sun.misc.SoftCache;
+import sun.awt.SoftCache;
 
 public class MultiResolutionToolkitImage extends ToolkitImage implements MultiResolutionImage {
 
diff --git a/jdk/test/com/sun/jdi/ReferrersTest.java b/jdk/test/com/sun/jdi/ReferrersTest.java
index b78a5618019..3293b089f31 100644
--- a/jdk/test/com/sun/jdi/ReferrersTest.java
+++ b/jdk/test/com/sun/jdi/ReferrersTest.java
@@ -446,7 +446,7 @@ public class ReferrersTest extends TestScaffold {
         if (rt instanceof ClassType) {
             ClassType ct = (ClassType)rt;
             String name = ct.name();
-            if (name.equals("sun.misc.SoftCache$ValueCell")) {
+            if (name.equals("sun.awt.SoftCache$ValueCell")) {
                 return;
             }
             if (name.equals("java.lang.ref.Finalizer")) {

From 54051259029431db593264bf2ac645e38af413db Mon Sep 17 00:00:00 2001
From: Tom Rodriguez <never@openjdk.org>
Date: Thu, 12 May 2016 22:06:55 +0000
Subject: [PATCH 082/228] 8155047: [JVMCI] findLeafConcreteSubtype should
 handle arrays of leaf concrete subtype

Reviewed-by: twisti
---
 .../HotSpotResolvedObjectTypeImpl.java        | 31 ++++++++++++++++---
 .../src/jdk/vm/ci/meta/Assumptions.java       |  6 +++-
 .../ci/runtime/test/TestResolvedJavaType.java |  5 ++-
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
index 51164cecc90..925e92b1490 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
@@ -166,9 +166,25 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
 
     @Override
     public AssumptionResult<ResolvedJavaType> findLeafConcreteSubtype() {
+        if (isLeaf()) {
+            // No assumptions are required.
+            return new AssumptionResult<>(this);
+        }
         HotSpotVMConfig config = config();
         if (isArray()) {
-            return getElementalType().isLeaf() ? new AssumptionResult<>(this) : null;
+            ResolvedJavaType elementalType = getElementalType();
+            AssumptionResult<ResolvedJavaType> elementType = elementalType.findLeafConcreteSubtype();
+            if (elementType != null && elementType.getResult().equals(elementalType)) {
+                /*
+                 * If the elementType is leaf then the array is leaf under the same assumptions but
+                 * only if the element type is exactly the leaf type. The element type can be
+                 * abstract even if there is only one implementor of the abstract type.
+                 */
+                AssumptionResult<ResolvedJavaType> result = new AssumptionResult<>(this);
+                result.add(elementType);
+                return result;
+            }
+            return null;
         } else if (isInterface()) {
             HotSpotResolvedObjectTypeImpl implementor = getSingleImplementor();
             /*
@@ -191,8 +207,7 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
                 }
                 return null;
             }
-
-            return new AssumptionResult<>(implementor, new LeafType(implementor), new ConcreteSubtype(this, implementor));
+            return concreteSubtype(implementor);
         } else {
             HotSpotResolvedObjectTypeImpl type = this;
             while (type.isAbstract()) {
@@ -206,7 +221,7 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
                 return null;
             }
             if (this.isAbstract()) {
-                return new AssumptionResult<>(type, new LeafType(type), new ConcreteSubtype(this, type));
+                return concreteSubtype(type);
             } else {
                 assert this.equals(type);
                 return new AssumptionResult<>(type, new LeafType(type));
@@ -214,6 +229,14 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
         }
     }
 
+    private AssumptionResult<ResolvedJavaType> concreteSubtype(HotSpotResolvedObjectTypeImpl type) {
+        if (type.isLeaf()) {
+            return new AssumptionResult<>(type, new ConcreteSubtype(this, type));
+        } else {
+            return new AssumptionResult<>(type, new LeafType(type), new ConcreteSubtype(this, type));
+        }
+    }
+
     /**
      * Returns if type {@code type} is a leaf class. This is the case if the
      * {@code Klass::_subklass} field of the underlying class is zero.
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Assumptions.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Assumptions.java
index dbbc950d6b2..a7061f7a63d 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Assumptions.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Assumptions.java
@@ -44,7 +44,10 @@ public final class Assumptions implements Iterable<Assumptions.Assumption> {
 
     /**
      * A class for providing information that is only valid in association with a set of
-     * {@link Assumption}s.
+     * {@link Assumption}s. It is permissible for AssumptionResults to have no assumptions at all.
+     * For instance, if {@link ResolvedJavaType#isLeaf()} returns true for a type
+     * {@link ResolvedJavaType#findLeafConcreteSubtype()} can return an AssumptionResult with no
+     * assumptions since the leaf information is statically true.
      *
      * @param <T>
      */
@@ -187,6 +190,7 @@ public final class Assumptions implements Iterable<Assumptions.Assumption> {
         public final ResolvedJavaType context;
 
         public LeafType(ResolvedJavaType context) {
+            assert !context.isLeaf() : "assumption isn't required for leaf types";
             this.context = context;
         }
 
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java
index 106523ce255..774e0ca78bf 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java
@@ -328,6 +328,7 @@ public class TestResolvedJavaType extends TypeUniverse {
             } else {
                 assertTrue(leafConcreteSubtype.getResult().equals(expected));
             }
+            assertTrue(!type.isLeaf() || leafConcreteSubtype.isAssumptionFree());
         }
 
         if (!type.isArray()) {
@@ -372,8 +373,10 @@ public class TestResolvedJavaType extends TypeUniverse {
 
         ResolvedJavaType a1a = metaAccess.lookupJavaType(Abstract1[].class);
         checkConcreteSubtype(a1a, null);
+        ResolvedJavaType i1a = metaAccess.lookupJavaType(Interface1[].class);
+        checkConcreteSubtype(i1a, null);
         ResolvedJavaType c1a = metaAccess.lookupJavaType(Concrete1[].class);
-        checkConcreteSubtype(c1a, null);
+        checkConcreteSubtype(c1a, c1a);
         ResolvedJavaType f1a = metaAccess.lookupJavaType(Final1[].class);
         checkConcreteSubtype(f1a, f1a);
 

From 476ef7367c9b6e50fca540cdbc0ab2da4768fe42 Mon Sep 17 00:00:00 2001
From: Roland Schatz <rschatz@openjdk.org>
Date: Fri, 13 May 2016 01:06:46 +0000
Subject: [PATCH 083/228] 8156552: [JVMCI] remove final and stable field
 handling from ConstantReflectionProvider

Reviewed-by: kvn, twisti
---
 .../HotSpotConstantReflectionProvider.java    | 171 +----------
 .../vm/ci/hotspot/HotSpotJVMCIRuntime.java    |   4 +-
 .../ci/hotspot/HotSpotObjectConstantImpl.java |  47 +--
 .../ci/hotspot/HotSpotResolvedJavaField.java  |   7 -
 .../hotspot/HotSpotResolvedJavaFieldImpl.java |  71 +----
 .../ci/meta/ConstantReflectionProvider.java   |  48 +--
 ...HotSpotConstantReflectionProviderTest.java |  74 -----
 .../ReadConstantArrayElementDataProvider.java | 286 ------------------
 .../ReadConstantFieldValueDataProvider.java   | 111 -------
 .../ReadStableFieldValueDataProvider.java     | 161 ----------
 .../jdk/vm/ci/hotspot/test/TestHelper.java    |  41 ---
 .../runtime/test/TestResolvedJavaField.java   |  32 --
 .../jdk/vm/ci/runtime/test/TypeUniverse.java  |   2 +-
 13 files changed, 11 insertions(+), 1044 deletions(-)
 delete mode 100644 hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadConstantArrayElementDataProvider.java
 delete mode 100644 hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadConstantFieldValueDataProvider.java
 delete mode 100644 hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadStableFieldValueDataProvider.java

diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java
index bd60a98772b..9734223e129 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java
@@ -22,20 +22,15 @@
  */
 package jdk.vm.ci.hotspot;
 
-import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayBaseOffset;
-import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayIndexScale;
-
 import java.lang.reflect.Array;
 import java.util.Objects;
 
 import jdk.internal.vm.annotation.Stable;
 import jdk.vm.ci.common.JVMCIError;
-import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.Option;
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.MemoryAccessProvider;
 import jdk.vm.ci.meta.MethodHandleAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaField;
@@ -89,50 +84,6 @@ public class HotSpotConstantReflectionProvider implements ConstantReflectionProv
         return Array.getLength(arrayObject);
     }
 
-    public JavaConstant readConstantArrayElement(JavaConstant array, int index) {
-        if (array instanceof HotSpotObjectConstantImpl && ((HotSpotObjectConstantImpl) array).getStableDimension() > 0) {
-            JavaConstant element = readArrayElement(array, index);
-            if (element != null && (((HotSpotObjectConstantImpl) array).isDefaultStable() || !element.isDefaultForKind())) {
-                return element;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Try to convert {@code offset} into an an index into {@code array}.
-     *
-     * @return the computed index or -1 if the offset isn't within the array
-     */
-    private int indexForOffset(JavaConstant array, long offset) {
-        if (array.getJavaKind() != JavaKind.Object || array.isNull()) {
-            return -1;
-        }
-        Class<?> componentType = ((HotSpotObjectConstantImpl) array).object().getClass().getComponentType();
-        JavaKind kind = runtime.getHostJVMCIBackend().getMetaAccess().lookupJavaType(componentType).getJavaKind();
-        int arraybase = getArrayBaseOffset(kind);
-        int scale = getArrayIndexScale(kind);
-        if (offset < arraybase) {
-            return -1;
-        }
-        long index = offset - arraybase;
-        if (index % scale != 0) {
-            return -1;
-        }
-        long result = index / scale;
-        if (result >= Integer.MAX_VALUE) {
-            return -1;
-        }
-        return (int) result;
-    }
-
-    public JavaConstant readConstantArrayElementForOffset(JavaConstant array, long offset) {
-        if (array instanceof HotSpotObjectConstantImpl && ((HotSpotObjectConstantImpl) array).getStableDimension() > 0) {
-            return readConstantArrayElement(array, indexForOffset(array, offset));
-        }
-        return null;
-    }
-
     @Override
     public JavaConstant readArrayElement(JavaConstant array, int index) {
         if (array == null || array.getJavaKind() != JavaKind.Object || array.isNull()) {
@@ -146,11 +97,7 @@ public class HotSpotConstantReflectionProvider implements ConstantReflectionProv
 
         if (a instanceof Object[]) {
             Object element = ((Object[]) a)[index];
-            if (((HotSpotObjectConstantImpl) array).getStableDimension() > 1) {
-                return HotSpotObjectConstantImpl.forStableArray(element, ((HotSpotObjectConstantImpl) array).getStableDimension() - 1, ((HotSpotObjectConstantImpl) array).isDefaultStable());
-            } else {
-                return HotSpotObjectConstantImpl.forObject(element);
-            }
+            return HotSpotObjectConstantImpl.forObject(element);
         } else {
             return JavaConstant.forBoxedPrimitive(Array.get(a, index));
         }
@@ -228,102 +175,7 @@ public class HotSpotConstantReflectionProvider implements ConstantReflectionProv
         return null;
     }
 
-    private static final String SystemClassName = "Ljava/lang/System;";
-
-    /**
-     * Determines if a static field is constant for the purpose of
-     * {@link #readConstantFieldValue(ResolvedJavaField, JavaConstant)}.
-     */
-    protected boolean isStaticFieldConstant(HotSpotResolvedJavaField staticField) {
-        if (staticField.isFinal() || (staticField.isStable() && runtime.getConfig().foldStableValues)) {
-            ResolvedJavaType holder = staticField.getDeclaringClass();
-            if (holder.isInitialized() && !holder.getName().equals(SystemClassName)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Determines if a value read from a {@code final} instance field is considered constant. The
-     * implementation in {@link HotSpotConstantReflectionProvider} returns true if {@code value} is
-     * not the {@link JavaConstant#isDefaultForKind default value} for its kind or if
-     * {@link Option#TrustFinalDefaultFields} is true.
-     *
-     * @param value a value read from a {@code final} instance field
-     * @param receiverClass the {@link Object#getClass() class} of object from which the
-     *            {@code value} was read
-     */
-    protected boolean isFinalInstanceFieldValueConstant(JavaConstant value, Class<?> receiverClass) {
-        return !value.isDefaultForKind() || Option.TrustFinalDefaultFields.getBoolean();
-    }
-
-    /**
-     * Determines if a value read from a {@link Stable} instance field is considered constant. The
-     * implementation in {@link HotSpotConstantReflectionProvider} returns true if {@code value} is
-     * not the {@link JavaConstant#isDefaultForKind default value} for its kind.
-     *
-     * @param value a value read from a {@link Stable} field
-     * @param receiverClass the {@link Object#getClass() class} of object from which the
-     *            {@code value} was read
-     */
-    protected boolean isStableInstanceFieldValueConstant(JavaConstant value, Class<?> receiverClass) {
-        return !value.isDefaultForKind();
-    }
-
-    public JavaConstant readConstantFieldValue(ResolvedJavaField field, JavaConstant receiver) {
-        HotSpotResolvedJavaField hotspotField = (HotSpotResolvedJavaField) field;
-
-        if (hotspotField.isStatic()) {
-            if (isStaticFieldConstant(hotspotField)) {
-                JavaConstant value = readFieldValue(field, receiver);
-                if (hotspotField.isFinal() || !value.isDefaultForKind()) {
-                    return value;
-                }
-            }
-        } else {
-            /*
-             * for non-static final fields, we must assume that they are only initialized if they
-             * have a non-default value.
-             */
-            Object object = receiver.isNull() ? null : ((HotSpotObjectConstantImpl) receiver).object();
-
-            // Canonicalization may attempt to process an unsafe read before
-            // processing a guard (e.g. a null check or a type check) for this read
-            // so we need to check the object being read
-            if (object != null) {
-                if (hotspotField.isFinal()) {
-                    if (hotspotField.isInObject(object)) {
-                        JavaConstant value = readFieldValue(field, receiver);
-                        if (isFinalInstanceFieldValueConstant(value, object.getClass())) {
-                            return value;
-                        }
-                    }
-                } else if (hotspotField.isStable() && runtime.getConfig().foldStableValues) {
-                    if (hotspotField.isInObject(object)) {
-                        JavaConstant value = readFieldValue(field, receiver);
-                        if (isStableInstanceFieldValueConstant(value, object.getClass())) {
-                            return value;
-                        }
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
     public JavaConstant readFieldValue(ResolvedJavaField field, JavaConstant receiver) {
-        HotSpotResolvedJavaField hotspotField = (HotSpotResolvedJavaField) field;
-        if (!hotspotField.isStable()) {
-            return readNonStableFieldValue(field, receiver);
-        } else if (runtime.getConfig().foldStableValues) {
-            return readStableFieldValue(field, receiver, hotspotField.isDefaultStable());
-        } else {
-            return null;
-        }
-    }
-
-    private JavaConstant readNonStableFieldValue(ResolvedJavaField field, JavaConstant receiver) {
         HotSpotResolvedJavaField hotspotField = (HotSpotResolvedJavaField) field;
         if (hotspotField.isStatic()) {
             HotSpotResolvedJavaType holder = (HotSpotResolvedJavaType) hotspotField.getDeclaringClass();
@@ -338,27 +190,6 @@ public class HotSpotConstantReflectionProvider implements ConstantReflectionProv
         return null;
     }
 
-    public JavaConstant readStableFieldValue(ResolvedJavaField field, JavaConstant receiver, boolean isDefaultStable) {
-        JavaConstant fieldValue = readNonStableFieldValue(field, receiver);
-        if (fieldValue != null && fieldValue.isNonNull()) {
-            JavaType declaredType = field.getType();
-            if (declaredType.getComponentType() != null) {
-                int stableDimension = getArrayDimension(declaredType);
-                return HotSpotObjectConstantImpl.forStableArray(((HotSpotObjectConstantImpl) fieldValue).object(), stableDimension, isDefaultStable);
-            }
-        }
-        return fieldValue;
-    }
-
-    private static int getArrayDimension(JavaType type) {
-        int dimensions = 0;
-        JavaType componentType = type;
-        while ((componentType = componentType.getComponentType()) != null) {
-            dimensions++;
-        }
-        return dimensions;
-    }
-
     @Override
     public JavaConstant asJavaClass(ResolvedJavaType type) {
         return HotSpotObjectConstantImpl.forObject(((HotSpotResolvedJavaType) type).mirror());
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
index 773a39ad10e..2a7254a00a4 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
@@ -95,14 +95,12 @@ public final class HotSpotJVMCIRuntime implements HotSpotJVMCIRuntimeProvider, H
      */
     public enum Option {
         Compiler(String.class, null, "Selects the system compiler."),
-        ImplicitStableValues(boolean.class, true, "Mark well-known stable fields as such."),
         // Note: The following one is not used (see InitTimer.ENABLED).
         InitTimer(boolean.class, false, "Specifies if initialization timing is enabled."),
         PrintConfig(boolean.class, false, "Prints all HotSpotVMConfig fields."),
         PrintFlags(boolean.class, false, "Prints all JVMCI flags and exits."),
         ShowFlags(boolean.class, false, "Prints all JVMCI flags and continues."),
-        TraceMethodDataFilter(String.class, null, ""),
-        TrustFinalDefaultFields(boolean.class, true, "Determines whether to treat final fields with default values as constant.");
+        TraceMethodDataFilter(String.class, null, "");
 
         /**
          * The prefix for system properties that are JVMCI options.
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotObjectConstantImpl.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotObjectConstantImpl.java
index 0dd51105445..5a13bae8d31 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotObjectConstantImpl.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotObjectConstantImpl.java
@@ -53,15 +53,6 @@ final class HotSpotObjectConstantImpl implements HotSpotObjectConstant, HotSpotP
         }
     }
 
-    static JavaConstant forStableArray(Object object, int stableDimension, boolean isDefaultStable) {
-        if (object == null) {
-            return JavaConstant.NULL_POINTER;
-        } else {
-            assert object.getClass().isArray();
-            return new HotSpotObjectConstantImpl(object, false, stableDimension, isDefaultStable);
-        }
-    }
-
     public static JavaConstant forBoxedValue(JavaKind kind, Object value) {
         if (kind == JavaKind.Object) {
             return HotSpotObjectConstantImpl.forObject(value);
@@ -82,22 +73,11 @@ final class HotSpotObjectConstantImpl implements HotSpotObjectConstant, HotSpotP
 
     private final Object object;
     private final boolean compressed;
-    private final byte stableDimension;
-    private final boolean isDefaultStable;
-
-    private HotSpotObjectConstantImpl(Object object, boolean compressed, int stableDimension, boolean isDefaultStable) {
-        this.object = object;
-        this.compressed = compressed;
-        this.stableDimension = (byte) stableDimension;
-        this.isDefaultStable = isDefaultStable;
-        assert object != null;
-        assert stableDimension == 0 || (object != null && object.getClass().isArray());
-        assert stableDimension >= 0 && stableDimension <= 255;
-        assert !isDefaultStable || stableDimension > 0;
-    }
 
     private HotSpotObjectConstantImpl(Object object, boolean compressed) {
-        this(object, compressed, 0, false);
+        this.object = object;
+        this.compressed = compressed;
+        assert object != null;
     }
 
     @Override
@@ -118,12 +98,12 @@ final class HotSpotObjectConstantImpl implements HotSpotObjectConstant, HotSpotP
 
     public JavaConstant compress() {
         assert !compressed;
-        return new HotSpotObjectConstantImpl(object, true, stableDimension, isDefaultStable);
+        return new HotSpotObjectConstantImpl(object, true);
     }
 
     public JavaConstant uncompress() {
         assert compressed;
-        return new HotSpotObjectConstantImpl(object, false, stableDimension, isDefaultStable);
+        return new HotSpotObjectConstantImpl(object, false);
     }
 
     public HotSpotResolvedObjectType getType() {
@@ -248,7 +228,7 @@ final class HotSpotObjectConstantImpl implements HotSpotObjectConstant, HotSpotP
             return true;
         } else if (o instanceof HotSpotObjectConstantImpl) {
             HotSpotObjectConstantImpl other = (HotSpotObjectConstantImpl) o;
-            return object == other.object && compressed == other.compressed && stableDimension == other.stableDimension && isDefaultStable == other.isDefaultStable;
+            return object == other.object && compressed == other.compressed;
         }
         return false;
     }
@@ -266,19 +246,4 @@ final class HotSpotObjectConstantImpl implements HotSpotObjectConstant, HotSpotP
     public String toString() {
         return (compressed ? "NarrowOop" : getJavaKind().getJavaName()) + "[" + JavaKind.Object.format(object) + "]";
     }
-
-    /**
-     * Number of stable dimensions if this constant is a stable array.
-     */
-    public int getStableDimension() {
-        return stableDimension & 0xff;
-    }
-
-    /**
-     * Returns {@code true} if this is a stable array constant and its elements should be considered
-     * as stable regardless of whether they are default values.
-     */
-    public boolean isDefaultStable() {
-        return isDefaultStable;
-    }
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaField.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaField.java
index 1fd7e48924f..fb3f14cdfab 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaField.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaField.java
@@ -43,11 +43,4 @@ public interface HotSpotResolvedJavaField extends ResolvedJavaField {
      * Determines if this field should be treated as a constant.
      */
     boolean isStable();
-
-    /**
-     * Determines if this field should be considered constant if it has the default value for its
-     * type (e.g, 0, null, etc.). The result of this method is undefined if this field is not
-     * {@linkplain #isStable() stable}.
-     */
-    boolean isDefaultStable();
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java
index 9765d274a6e..7991b600fef 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java
@@ -22,7 +22,6 @@
  */
 package jdk.vm.ci.hotspot;
 
-import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
 import static jdk.vm.ci.hotspot.HotSpotVMConfig.config;
 
 import java.lang.annotation.Annotation;
@@ -153,14 +152,7 @@ class HotSpotResolvedJavaFieldImpl implements HotSpotResolvedJavaField, HotSpotP
      * @return true if field has {@link Stable} annotation, false otherwise
      */
     public boolean isStable() {
-        if ((config().jvmAccFieldStable & modifiers) != 0) {
-            return true;
-        }
-        assert getAnnotation(Stable.class) == null;
-        if (Option.ImplicitStableValues.getBoolean() && isImplicitStableField()) {
-            return true;
-        }
-        return false;
+        return (config().jvmAccFieldStable & modifiers) != 0;
     }
 
     @Override
@@ -206,65 +198,4 @@ class HotSpotResolvedJavaFieldImpl implements HotSpotResolvedJavaField, HotSpotP
             return null;
         }
     }
-
-    private boolean isArray() {
-        JavaType fieldType = getType();
-        return fieldType instanceof ResolvedJavaType && ((ResolvedJavaType) fieldType).isArray();
-    }
-
-    private boolean isImplicitStableField() {
-        if (isSyntheticEnumSwitchMap()) {
-            return true;
-        }
-        if (isWellKnownImplicitStableField()) {
-            return true;
-        }
-        return false;
-    }
-
-    public boolean isDefaultStable() {
-        assert this.isStable();
-        if (isSyntheticEnumSwitchMap()) {
-            return true;
-        }
-        return false;
-    }
-
-    private boolean isSyntheticEnumSwitchMap() {
-        if (isSynthetic() && isStatic() && isArray()) {
-            if (isFinal() && name.equals("$VALUES") || name.equals("ENUM$VALUES")) {
-                // generated int[] field for EnumClass::values()
-                return true;
-            } else if (name.startsWith("$SwitchMap$") || name.startsWith("$SWITCH_TABLE$")) {
-                // javac and ecj generate a static field in an inner class for a switch on an enum
-                // named $SwitchMap$p$k$g$EnumClass and $SWITCH_TABLE$p$k$g$EnumClass, respectively
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean isWellKnownImplicitStableField() {
-        return WellKnownImplicitStableField.test(this);
-    }
-
-    static class WellKnownImplicitStableField {
-        /**
-         * @return {@code true} if the field is a well-known stable field.
-         */
-        public static boolean test(HotSpotResolvedJavaField field) {
-            return field.equals(STRING_VALUE_FIELD);
-        }
-
-        private static final ResolvedJavaField STRING_VALUE_FIELD;
-
-        static {
-            try {
-                MetaAccessProvider metaAccess = runtime().getHostJVMCIBackend().getMetaAccess();
-                STRING_VALUE_FIELD = metaAccess.lookupJavaField(String.class.getDeclaredField("value"));
-            } catch (SecurityException | NoSuchFieldException e) {
-                throw new JVMCIError(e);
-            }
-        }
-    }
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ConstantReflectionProvider.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ConstantReflectionProvider.java
index a1347d18f4e..adba998705a 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ConstantReflectionProvider.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ConstantReflectionProvider.java
@@ -55,40 +55,11 @@ public interface ConstantReflectionProvider {
      */
     JavaConstant readArrayElement(JavaConstant array, int index);
 
-    /**
-     * Reads a value from the given array at the given index if it is a stable array. Returns
-     * {@code null} if the constant is not a stable array, if it is a default value, if the index is
-     * out of bounds, or if the value is not available at this point.
-     */
-    JavaConstant readConstantArrayElement(JavaConstant array, int index);
-
-    /**
-     * Reads a value from the given array at the given offset if it is a stable array. The offset
-     * will be decoded relative to the platform addressing into an index into the array. Returns
-     * {@code null} if the constant is not a stable array, if it is a default value, if the offset
-     * is out of bounds, or if the value is not available at this point.
-     */
-    JavaConstant readConstantArrayElementForOffset(JavaConstant array, long offset);
-
-    /**
-     * Gets the constant value of this field. Note that a {@code static final} field may not be
-     * considered constant if its declaring class is not yet initialized or if it is a well known
-     * field that can be updated via other means (e.g., {@link System#setOut(java.io.PrintStream)}).
-     *
-     * @param receiver object from which this field's value is to be read. This value is ignored if
-     *            this field is static.
-     * @return the constant value of this field or {@code null} if this field is not considered
-     *         constant by the runtime
-     */
-    JavaConstant readConstantFieldValue(ResolvedJavaField field, JavaConstant receiver);
-
     /**
      * Gets the current value of this field for a given object, if available.
      *
      * There is no guarantee that the same value will be returned by this method for a field unless
-     * the field is considered to be
-     * {@linkplain #readConstantFieldValue(ResolvedJavaField, JavaConstant) constant} by the
-     * runtime.
+     * the field is considered to be constant by the runtime.
      *
      * @param receiver object from which this field's value is to be read. This value is ignored if
      *            this field is static.
@@ -97,23 +68,6 @@ public interface ConstantReflectionProvider {
      */
     JavaConstant readFieldValue(ResolvedJavaField field, JavaConstant receiver);
 
-    /**
-     * Gets the current value of this field for a given object, if available. Like
-     * {@link #readFieldValue(ResolvedJavaField, JavaConstant)} but treats array fields as stable.
-     *
-     * There is no guarantee that the same value will be returned by this method for a field unless
-     * the field is considered to be
-     * {@linkplain #readConstantFieldValue(ResolvedJavaField, JavaConstant) constant} by the
-     * runtime.
-     *
-     * @param receiver object from which this field's value is to be read. This value is ignored if
-     *            this field is static.
-     * @param isDefaultStable if {@code true}, default values are considered stable
-     * @return the value of this field or {@code null} if the value is not available (e.g., because
-     *         the field holder is not yet initialized).
-     */
-    JavaConstant readStableFieldValue(ResolvedJavaField field, JavaConstant receiver, boolean isDefaultStable);
-
     /**
      * Converts the given {@link JavaKind#isPrimitive() primitive} constant to a boxed
      * {@link JavaKind#Object object} constant, according to the Java boxing rules. Returns
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/HotSpotConstantReflectionProviderTest.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/HotSpotConstantReflectionProviderTest.java
index 35c712a4e10..7cd0502bd5a 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/HotSpotConstantReflectionProviderTest.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/HotSpotConstantReflectionProviderTest.java
@@ -100,80 +100,6 @@ public class HotSpotConstantReflectionProviderTest {
         CONSTANT_REFLECTION_PROVIDER.readFieldValue(field, receiver);
     }
 
-    @Test(dataProvider = "readStableFieldValueDataProvider", dataProviderClass = ReadStableFieldValueDataProvider.class)
-    public void testReadStableFieldValue(ResolvedJavaField field, JavaConstant receiver, boolean isDefStab,
-                    JavaConstant expected) {
-        Assert.assertEquals(
-                        CONSTANT_REFLECTION_PROVIDER.readStableFieldValue(field, receiver, isDefStab),
-                        expected,
-                        "Unexpected result:");
-    }
-
-    @Test(dataProvider = "readStableFieldValueArrayDataProvider", dataProviderClass = ReadStableFieldValueDataProvider.class)
-    public void testReadStableFieldValueForArray(ResolvedJavaField field, JavaConstant receiver, boolean isDefStab,
-                    int arrayDim, JavaConstant expected) {
-        JavaConstant result = CONSTANT_REFLECTION_PROVIDER.readStableFieldValue(field, receiver,
-                        isDefStab);
-        boolean resultDefStab = false;
-        int resultStableDim = -1;
-        try {
-            Class<?> hotSpotObjectConstantImplClass = Class.forName(
-                            "jdk.vm.ci.hotspot.HotSpotObjectConstantImpl");
-            Method getStableDimensionMethod = hotSpotObjectConstantImplClass.getDeclaredMethod(
-                            "getStableDimension");
-            Method isDefaultStableMethod = hotSpotObjectConstantImplClass.getDeclaredMethod(
-                            "isDefaultStable");
-            getStableDimensionMethod.setAccessible(true);
-            isDefaultStableMethod.setAccessible(true);
-            resultDefStab = (boolean) isDefaultStableMethod.invoke(result);
-            resultStableDim = (int) getStableDimensionMethod.invoke(result);
-        } catch (ReflectiveOperationException e) {
-            throw new Error("Unexpected error: " + e, e);
-        }
-        Assert.assertEquals(resultDefStab, isDefStab,
-                        "Wrong default stable value for " + result.toString());
-        Assert.assertEquals(resultStableDim, arrayDim,
-                        "Wrong array dimension for " + result.toString());
-        Assert.assertEquals(result.toString(), expected.toString(), "Unexpected result:");
-    }
-
-    @Test(dataProvider = "readStableFieldValueNegativeDataProvider", dataProviderClass = ReadStableFieldValueDataProvider.class, expectedExceptions = {NullPointerException.class})
-    public void testNegativeReadStableFieldValue(ResolvedJavaField field, JavaConstant receiver, boolean isDefStab) {
-        CONSTANT_REFLECTION_PROVIDER.readStableFieldValue(field, receiver, isDefStab);
-    }
-
-    @Test(dataProvider = "readConstantFieldValueDataProvider", dataProviderClass = ReadConstantFieldValueDataProvider.class)
-    public void testReadConstantFieldValue(ResolvedJavaField field, JavaConstant receiver, JavaConstant expected,
-                    String testInfo) {
-        String msg = String.format("Unexpected result for %s. Field is stable = %s.", testInfo,
-                        ((HotSpotResolvedJavaField) field).isStable());
-        Assert.assertEquals(CONSTANT_REFLECTION_PROVIDER.readConstantFieldValue(field, receiver),
-                        expected, msg);
-    }
-
-    @Test(dataProvider = "readConstantFieldValueNegativeDataProvider", dataProviderClass = ReadConstantFieldValueDataProvider.class, expectedExceptions = {NullPointerException.class})
-    public void testNegativeReadConstantFieldValue(ResolvedJavaField field, JavaConstant receiver) {
-        CONSTANT_REFLECTION_PROVIDER.readConstantFieldValue(field, receiver);
-    }
-
-    @Test(dataProvider = "readConstantArrayElementDataProvider", dataProviderClass = ReadConstantArrayElementDataProvider.class)
-    public void testReadConstantArrayElement(JavaConstant array, int index, JavaConstant expected, String testInfo) {
-        JavaConstant actual = CONSTANT_REFLECTION_PROVIDER.readConstantArrayElement(array, index);
-        Assert.assertEquals(actual == null ? "null" : actual.toString(),
-                        expected == null ? "null" : expected.toString(),
-                        String.format("Unexpected result while testing %s:", testInfo));
-    }
-
-    @Test(dataProvider = "readConstantArrayElementForOffsetDataProvider", dataProviderClass = ReadConstantArrayElementDataProvider.class)
-    public void testReadConstantArrayElementForOffset(JavaConstant array, long offset, JavaConstant expected,
-                    String testInfo) {
-        JavaConstant actual = CONSTANT_REFLECTION_PROVIDER.readConstantArrayElementForOffset(array,
-                        offset);
-        Assert.assertEquals(actual == null ? "null" : actual.toString(),
-                        expected == null ? "null" : expected.toString(),
-                        String.format("Unexpected result while testing %s:", testInfo));
-    }
-
     @Test(dataProvider = "asJavaTypeDataProvider", dataProviderClass = AsJavaTypeDataProvider.class)
     public void testAsJavaType(JavaConstant constant, String expected) {
         ResolvedJavaType actual = CONSTANT_REFLECTION_PROVIDER.asJavaType(constant);
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadConstantArrayElementDataProvider.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadConstantArrayElementDataProvider.java
deleted file mode 100644
index 2b9dc0ca401..00000000000
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadConstantArrayElementDataProvider.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Copyright (c) 2016, 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.test;
-
-import static jdk.vm.ci.hotspot.test.TestHelper.ARRAYS_MAP;
-import static jdk.vm.ci.hotspot.test.TestHelper.ARRAY_ARRAYS_MAP;
-import static jdk.vm.ci.hotspot.test.TestHelper.CONSTANT_REFLECTION_PROVIDER;
-import static jdk.vm.ci.hotspot.test.TestHelper.DUMMY_CLASS_CONSTANT;
-import static jdk.vm.ci.hotspot.test.TestHelper.DUMMY_CLASS_INSTANCE;
-import static jdk.vm.ci.hotspot.test.TestHelper.getResolvedJavaField;
-import static jdk.vm.ci.hotspot.test.TestHelper.INSTANCE_STABLE_FIELDS_MAP;
-import static jdk.vm.ci.hotspot.test.TestHelper.INSTANCE_FIELDS_MAP;
-import static jdk.vm.ci.hotspot.test.TestHelper.STABLE_ARRAYS_MAP;
-import static jdk.vm.ci.hotspot.test.TestHelper.STABLE_ARRAY_ARRAYS_MAP;
-
-import java.lang.reflect.Field;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Stream;
-
-import jdk.vm.ci.meta.JavaConstant;
-import org.testng.annotations.DataProvider;
-import jdk.internal.misc.Unsafe;
-import jdk.vm.ci.meta.ResolvedJavaField;
-
-public class ReadConstantArrayElementDataProvider {
-
-    // Non-stable array fields names mapped to their base offsets and index scale
-    private static final List<ArrayFieldParams> NON_STABLE_ARRAY_NAMES = new LinkedList<>();
-
-    static {
-        NON_STABLE_ARRAY_NAMES.add(
-                        new ArrayFieldParams("booleanArrayWithValues", Unsafe.ARRAY_BOOLEAN_BASE_OFFSET,
-                                        Unsafe.ARRAY_BOOLEAN_INDEX_SCALE));
-        NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("byteArrayWithValues",
-                        Unsafe.ARRAY_BYTE_BASE_OFFSET,
-                        Unsafe.ARRAY_BYTE_INDEX_SCALE));
-        NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("shortArrayWithValues",
-                        Unsafe.ARRAY_SHORT_BASE_OFFSET,
-                        Unsafe.ARRAY_SHORT_INDEX_SCALE));
-        NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("charArrayWithValues",
-                        Unsafe.ARRAY_CHAR_BASE_OFFSET,
-                        Unsafe.ARRAY_CHAR_INDEX_SCALE));
-        NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("intArrayWithValues",
-                        Unsafe.ARRAY_INT_BASE_OFFSET,
-                        Unsafe.ARRAY_INT_INDEX_SCALE));
-        NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("longArrayWithValues",
-                        Unsafe.ARRAY_LONG_BASE_OFFSET,
-                        Unsafe.ARRAY_LONG_INDEX_SCALE));
-        NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("floatArrayWithValues",
-                        Unsafe.ARRAY_FLOAT_BASE_OFFSET,
-                        Unsafe.ARRAY_FLOAT_INDEX_SCALE));
-        NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("doubleArrayWithValues",
-                        Unsafe.ARRAY_DOUBLE_BASE_OFFSET,
-                        Unsafe.ARRAY_DOUBLE_INDEX_SCALE));
-        NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("objectArrayWithValues",
-                        Unsafe.ARRAY_BOOLEAN_BASE_OFFSET,
-                        Unsafe.ARRAY_BOOLEAN_INDEX_SCALE));
-        NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("booleanArrayArrayWithValues",
-                        Unsafe.ARRAY_OBJECT_BASE_OFFSET,
-                        Unsafe.ARRAY_OBJECT_INDEX_SCALE));
-        NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("byteArrayArrayWithValues",
-                        Unsafe.ARRAY_OBJECT_BASE_OFFSET,
-                        Unsafe.ARRAY_OBJECT_INDEX_SCALE));
-        NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("shortArrayArrayWithValues",
-                        Unsafe.ARRAY_OBJECT_BASE_OFFSET,
-                        Unsafe.ARRAY_OBJECT_INDEX_SCALE));
-        NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("charArrayArrayWithValues",
-                        Unsafe.ARRAY_OBJECT_BASE_OFFSET,
-                        Unsafe.ARRAY_OBJECT_INDEX_SCALE));
-        NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("intArrayArrayWithValues",
-                        Unsafe.ARRAY_OBJECT_BASE_OFFSET,
-                        Unsafe.ARRAY_OBJECT_INDEX_SCALE));
-        NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("longArrayArrayWithValues",
-                        Unsafe.ARRAY_OBJECT_BASE_OFFSET,
-                        Unsafe.ARRAY_OBJECT_INDEX_SCALE));
-        NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("floatArrayArrayWithValues",
-                        Unsafe.ARRAY_OBJECT_BASE_OFFSET,
-                        Unsafe.ARRAY_OBJECT_INDEX_SCALE));
-        NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("doubleArrayArrayWithValues",
-                        Unsafe.ARRAY_OBJECT_BASE_OFFSET,
-                        Unsafe.ARRAY_OBJECT_INDEX_SCALE));
-        NON_STABLE_ARRAY_NAMES.add(new ArrayFieldParams("objectArrayArrayWithValues",
-                        Unsafe.ARRAY_OBJECT_BASE_OFFSET,
-                        Unsafe.ARRAY_OBJECT_INDEX_SCALE));
-    }
-
-    // Stable array fields names mapped to their base offsets and index scale
-    private static final List<ArrayFieldParams> STABLE_ARRAY_NAMES = new LinkedList<>();
-
-    static {
-        NON_STABLE_ARRAY_NAMES.stream().forEach((entry) -> {
-            String nsFieldName = entry.name;
-            char firstChar = nsFieldName.charAt(0);
-            char newFirstChar = Character.toUpperCase(firstChar);
-            String sFieldName = nsFieldName.replaceFirst("" + firstChar,
-                            "" + newFirstChar);
-            sFieldName = "stable" + sFieldName;
-            STABLE_ARRAY_NAMES.add(new ArrayFieldParams(sFieldName, entry.offsetBase, entry.scale));
-        });
-    }
-
-    @DataProvider(name = "readConstantArrayElementDataProvider")
-    public static Object[][] readConstantArrayElementDataProvider() {
-        LinkedList<Object[]> cfgSet = new LinkedList<>();
-        for (int i : new int[]{0, 1}) {
-            NON_STABLE_ARRAY_NAMES.stream().forEach((entry) -> {
-                String fieldName = entry.name;
-                cfgSet.add(new Object[]{
-                                readFieldValue(fieldName),
-                                i,
-                                null,
-                                "array field \"" + fieldName + "\" for index " + i});
-            });
-            STABLE_ARRAY_NAMES.stream().forEach((entry) -> {
-                String fieldName = entry.name;
-                cfgSet.add(new Object[]{
-                                readFieldValue(fieldName),
-                                i,
-                                i == 0 ? getJavaConstant(fieldName) : null,
-                                "array field \"" + fieldName + "\" for index " + i});
-            });
-        }
-        Stream<Map.Entry<ResolvedJavaField, JavaConstant>> arraysStream1 = Stream.concat(ARRAYS_MAP.entrySet().stream(),
-                        ARRAY_ARRAYS_MAP.entrySet().stream());
-        Stream<Map.Entry<ResolvedJavaField, JavaConstant>> arraysStream2 = Stream.concat(STABLE_ARRAYS_MAP.entrySet().stream(),
-                        STABLE_ARRAY_ARRAYS_MAP.entrySet().stream());
-        Stream.concat(arraysStream1, arraysStream2).forEach((array) -> {
-            for (int i : new int[]{-1, 2}) {
-                cfgSet.add(new Object[]{
-                                array.getValue(),
-                                i,
-                                null,
-                                "array field \"" + array.getKey() + "\" for index " + i});
-            }
-        });
-        cfgSet.add(new Object[]{null, 0, null, "null"});
-        cfgSet.add(new Object[]{JavaConstant.NULL_POINTER, 0, null, "JavaConstant.NULL_POINTER"});
-        INSTANCE_FIELDS_MAP.values().forEach((constant) -> {
-            cfgSet.add(new Object[]{constant, 0, null, "non-stable non-array field"});
-        });
-        INSTANCE_STABLE_FIELDS_MAP.values().forEach((constant) -> {
-            cfgSet.add(new Object[]{constant, 0, null, "stable non-array field"});
-        });
-        return cfgSet.toArray(new Object[0][0]);
-    }
-
-    @DataProvider(name = "readConstantArrayElementForOffsetDataProvider")
-    public static Object[][] readConstantArrayElementForOffsetDataProvider() {
-        LinkedList<Object[]> cfgSet = new LinkedList<>();
-        // Testing non-stable arrays. Result should be null in all cases
-        for (double i : new double[]{-1, 0, 0.5, 1, 1.5, 2}) {
-            NON_STABLE_ARRAY_NAMES.stream().forEach(entry -> {
-                String fieldName = entry.name;
-                long offset = (long) (entry.offsetBase + i * entry.scale);
-                cfgSet.add(new Object[]{
-                                readFieldValue(fieldName),
-                                offset,
-                                null,
-                                "array field \"" + fieldName + "\" for offset " + offset});
-            });
-        }
-        // Testing stable arrays. Result should be null in all cases except "offset = base + 0"
-        for (double i : new double[]{-1, 0.5, 1, 1.5, 2}) {
-            STABLE_ARRAY_NAMES.stream().forEach(entry -> {
-                String fieldName = entry.name;
-                long offset = (long) Math.ceil(entry.offsetBase + i * entry.scale);
-                cfgSet.add(new Object[]{
-                                readFieldValue(fieldName),
-                                offset,
-                                null,
-                                "array field \"" + fieldName + "\" for offset " + offset});
-            });
-        }
-        // Testing stable arrays "offset = base + 0". Result should be non-null
-        STABLE_ARRAY_NAMES.stream().forEach(entry -> {
-            String fieldName = entry.name;
-            long offset = (long) entry.offsetBase;
-            cfgSet.add(new Object[]{
-                            readFieldValue(fieldName),
-                            offset,
-                            getJavaConstant(fieldName),
-                            "array field \"" + fieldName + "\" for offset " + offset});
-        });
-        // Testing null as array
-        cfgSet.add(new Object[]{null, 0, null, "null"});
-        // Testing JavaConstant.NULL_POINTER as array
-        cfgSet.add(new Object[]{JavaConstant.NULL_POINTER, 0, null, "JavaConstant.NULL_POINTER"});
-        // Testing non-stable non-array fields
-        INSTANCE_FIELDS_MAP.values().forEach((constant) -> {
-            cfgSet.add(new Object[]{constant, 0, null, "non-stable non-array field"});
-        });
-        // Testing stable non-array fields
-        INSTANCE_STABLE_FIELDS_MAP.values().forEach((constant) -> {
-            cfgSet.add(new Object[]{constant, 0, null, "stable non-array field"});
-        });
-        return cfgSet.toArray(new Object[0][0]);
-    }
-
-    private static JavaConstant readFieldValue(String fieldName) {
-        return CONSTANT_REFLECTION_PROVIDER.readFieldValue(getResolvedJavaField(DummyClass.class, fieldName),
-                        DUMMY_CLASS_CONSTANT);
-    }
-
-    private static JavaConstant getJavaConstant(String fieldName) {
-        Class<DummyClass> dummyClass = DummyClass.class;
-        Field arrayField;
-        try {
-            arrayField = dummyClass.getDeclaredField(fieldName);
-        } catch (NoSuchFieldException ex) {
-            throw new Error("Test bug: wrong field name " + ex, ex);
-        } catch (SecurityException ex) {
-            throw new Error("Unexpected error: " + ex, ex);
-        }
-        arrayField.setAccessible(true);
-        Class<?> componentType = arrayField.getType().getComponentType();
-        if (componentType == null) {
-            throw new Error("Test error: field is not an array");
-        }
-        Object value;
-        try {
-            value = arrayField.get(DUMMY_CLASS_INSTANCE);
-        } catch (IllegalArgumentException | IllegalAccessException ex) {
-            throw new Error("Unexpected error: " + ex, ex);
-        }
-        if (componentType == boolean.class) {
-            return JavaConstant.forBoolean(((boolean[]) value)[0]);
-        }
-        if (componentType == byte.class) {
-            return JavaConstant.forByte(((byte[]) value)[0]);
-        }
-        if (componentType == short.class) {
-            return JavaConstant.forShort(((short[]) value)[0]);
-        }
-        if (componentType == char.class) {
-            return JavaConstant.forChar(((char[]) value)[0]);
-        }
-        if (componentType == int.class) {
-            return JavaConstant.forInt(((int[]) value)[0]);
-        }
-        if (componentType == long.class) {
-            return JavaConstant.forLong(((long[]) value)[0]);
-        }
-        if (componentType == float.class) {
-            return JavaConstant.forFloat(((float[]) value)[0]);
-        }
-        if (componentType == double.class) {
-            return JavaConstant.forDouble(((double[]) value)[0]);
-        }
-        return CONSTANT_REFLECTION_PROVIDER.forObject(((Object[]) value)[0]);
-    }
-
-    private static class ArrayFieldParams {
-        public final String name;
-        public final int offsetBase;
-        public final int scale;
-
-        ArrayFieldParams(String name, int offsetBase, int scale) {
-            this.name = name;
-            this.offsetBase = offsetBase;
-            this.scale = scale;
-        }
-    }
-}
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadConstantFieldValueDataProvider.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadConstantFieldValueDataProvider.java
deleted file mode 100644
index 9f3033ae7dc..00000000000
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadConstantFieldValueDataProvider.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2016, 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.test;
-
-import static jdk.vm.ci.hotspot.test.TestHelper.DUMMY_CLASS_CONSTANT;
-import static jdk.vm.ci.hotspot.test.TestHelper.INSTANCE_STABLE_FIELDS_MAP;
-import static jdk.vm.ci.hotspot.test.TestHelper.INSTANCE_FINAL_DEFAULT_FIELDS_MAP;
-import static jdk.vm.ci.hotspot.test.TestHelper.INSTANCE_FINAL_FIELDS_MAP;
-import static jdk.vm.ci.hotspot.test.TestHelper.INSTANCE_FIELDS_MAP;
-import static jdk.vm.ci.hotspot.test.TestHelper.INSTANCE_STABLE_DEFAULT_FIELDS_MAP;
-import static jdk.vm.ci.hotspot.test.TestHelper.STATIC_FIELDS_MAP;
-import static jdk.vm.ci.hotspot.test.TestHelper.STATIC_FINAL_FIELDS_MAP;
-import static jdk.vm.ci.hotspot.test.TestHelper.STATIC_STABLE_FIELDS_MAP;
-import static jdk.vm.ci.hotspot.test.TestHelper.STATIC_STABLE_DEFAULT_FIELDS_MAP;
-
-import java.util.LinkedList;
-import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
-import jdk.vm.ci.meta.JavaConstant;
-import org.testng.annotations.DataProvider;
-
-public class ReadConstantFieldValueDataProvider {
-
-    @DataProvider(name = "readConstantFieldValueDataProvider")
-    public static Object[][] readConstantFieldValueDataProvider() {
-        LinkedList<Object[]> cfgSet = new LinkedList<>();
-        // Testing static final fields
-        STATIC_FINAL_FIELDS_MAP.entrySet().stream().forEach((field) -> {
-            cfgSet.add(new Object[]{field.getKey(), null, field.getValue(), "static final field"});
-        });
-        // Testing static stable fields
-        STATIC_STABLE_FIELDS_MAP.entrySet().stream().forEach((field) -> {
-            cfgSet.add(new Object[]{field.getKey(), null, field.getValue(), "static stable field"});
-        });
-        // Testing instance final non-default fields
-        INSTANCE_FINAL_FIELDS_MAP.entrySet().stream().forEach((field) -> {
-            cfgSet.add(new Object[]{field.getKey(),
-                            DUMMY_CLASS_CONSTANT,
-                            field.getValue(),
-                            "instance final field"});
-        });
-        // Testing instance final default fields.
-        boolean trustDefFinal = HotSpotJVMCIRuntime.Option.TrustFinalDefaultFields.getBoolean();
-        INSTANCE_FINAL_DEFAULT_FIELDS_MAP.entrySet().stream().forEach((field) -> {
-            JavaConstant expected = trustDefFinal ? field.getValue() : null;
-            cfgSet.add(new Object[]{field.getKey(),
-                            DUMMY_CLASS_CONSTANT,
-                            expected,
-                            "instance final default field"});
-        });
-        // Testing instance stable non-default fields
-        INSTANCE_STABLE_FIELDS_MAP.entrySet().stream().forEach((field) -> {
-            cfgSet.add(new Object[]{field.getKey(),
-                            DUMMY_CLASS_CONSTANT,
-                            field.getValue(),
-                            "instance stable field"});
-        });
-        // Testing instance stable default fields
-        INSTANCE_STABLE_DEFAULT_FIELDS_MAP.entrySet().stream().forEach((field) -> {
-            cfgSet.add(new Object[]{field.getKey(),
-                            DUMMY_CLASS_CONSTANT,
-                            null,
-                            "instance stable default field"});
-        });
-        // Testing regular instance fields
-        INSTANCE_FIELDS_MAP.entrySet().stream().forEach((field) -> {
-            cfgSet.add(new Object[]{field.getKey(), DUMMY_CLASS_CONSTANT, null, "instance field"});
-        });
-        // Testing regular static fields
-        STATIC_FIELDS_MAP.entrySet().stream().forEach((field) -> {
-            cfgSet.add(new Object[]{field.getKey(), null, null, "static field"});
-        });
-        // Testing static stable fields
-        STATIC_STABLE_DEFAULT_FIELDS_MAP.entrySet().stream().forEach((field) -> {
-            cfgSet.add(new Object[]{field.getKey(), null, null, "static stable default field"});
-        });
-        return cfgSet.toArray(new Object[0][0]);
-    }
-
-    @DataProvider(name = "readConstantFieldValueNegativeDataProvider")
-    public static Object[][] readConstantFieldValueNegativeDataProvider() {
-        LinkedList<Object[]> cfgSet = new LinkedList<>();
-        // Testing instance fields with null as receiver
-        INSTANCE_FIELDS_MAP.entrySet().stream().forEach((field) -> {
-            cfgSet.add(new Object[]{field.getKey(), null});
-        });
-        // Testing null as a field argument
-        cfgSet.add(new Object[]{null, null});
-        return cfgSet.toArray(new Object[0][0]);
-    }
-}
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadStableFieldValueDataProvider.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadStableFieldValueDataProvider.java
deleted file mode 100644
index ef8f8d392fd..00000000000
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ReadStableFieldValueDataProvider.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (c) 2016, 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.test;
-
-import static jdk.vm.ci.hotspot.test.TestHelper.ARRAYS_MAP;
-import static jdk.vm.ci.hotspot.test.TestHelper.ARRAY_ARRAYS_MAP;
-import static jdk.vm.ci.hotspot.test.TestHelper.CONSTANT_REFLECTION_PROVIDER;
-import static jdk.vm.ci.hotspot.test.TestHelper.DUMMY_CLASS_CONSTANT;
-import static jdk.vm.ci.hotspot.test.TestHelper.DUMMY_CLASS_INSTANCE;
-import static jdk.vm.ci.hotspot.test.TestHelper.STABLE_ARRAYS_MAP;
-import static jdk.vm.ci.hotspot.test.TestHelper.STABLE_ARRAY_ARRAYS_MAP;
-import static jdk.vm.ci.hotspot.test.TestHelper.INSTANCE_STABLE_FIELDS_MAP;
-import static jdk.vm.ci.hotspot.test.TestHelper.INSTANCE_FIELDS_MAP;
-import static jdk.vm.ci.hotspot.test.TestHelper.STATIC_FIELDS_MAP;
-import static jdk.vm.ci.hotspot.test.TestHelper.STATIC_STABLE_FIELDS_MAP;
-
-import java.util.LinkedList;
-import jdk.vm.ci.meta.JavaConstant;
-import org.testng.annotations.DataProvider;
-
-public class ReadStableFieldValueDataProvider {
-
-    @DataProvider(name = "readStableFieldValueDataProvider")
-    public static Object[][] readStableFieldValueDataProvider() {
-        LinkedList<Object[]> cfgSet = new LinkedList<>();
-        for (boolean isDefStab : new boolean[]{true, false}) {
-            // Testing instance non-stable fields
-            INSTANCE_FIELDS_MAP.entrySet().stream().forEach((instanceField) -> {
-                cfgSet.add(new Object[]{instanceField.getKey(),
-                                DUMMY_CLASS_CONSTANT,
-                                isDefStab,
-                                instanceField.getValue()});
-            });
-            // Testing static non-stable fields with null as receiver
-            STATIC_FIELDS_MAP.entrySet().stream().forEach((staticField) -> {
-                cfgSet.add(new Object[]{staticField.getKey(),
-                                null,
-                                isDefStab,
-                                staticField.getValue()});
-            });
-            // Testing static non-stable fields with JavaConstant.NULL_POINTER as receiver
-            STATIC_FIELDS_MAP.entrySet().stream().forEach((staticField) -> {
-                cfgSet.add(new Object[]{staticField.getKey(),
-                                JavaConstant.NULL_POINTER,
-                                isDefStab,
-                                staticField.getValue()});
-            });
-            // Testing instance stable fields
-            INSTANCE_STABLE_FIELDS_MAP.entrySet().stream().forEach((instanceField) -> {
-                cfgSet.add(new Object[]{instanceField.getKey(),
-                                DUMMY_CLASS_CONSTANT,
-                                isDefStab,
-                                instanceField.getValue()});
-            });
-            // Testing static stable fields with null as receiver
-            STATIC_STABLE_FIELDS_MAP.entrySet().stream().forEach((staticField) -> {
-                cfgSet.add(new Object[]{staticField.getKey(),
-                                null,
-                                isDefStab,
-                                staticField.getValue()});
-            });
-            // Testing static stable fields with JavaConstant.NULL_POINTER as receiver
-            STATIC_STABLE_FIELDS_MAP.entrySet().stream().forEach((staticField) -> {
-                cfgSet.add(new Object[]{staticField.getKey(),
-                                JavaConstant.NULL_POINTER,
-                                isDefStab,
-                                staticField.getValue()});
-            });
-            // Testing instance fields with JavaConstant.NULL_POINTER as receiver
-            INSTANCE_FIELDS_MAP.entrySet().stream().forEach((instanceField) -> {
-                cfgSet.add(new Object[]{instanceField.getKey(),
-                                JavaConstant.NULL_POINTER,
-                                isDefStab,
-                                null});
-            });
-            // Testing instance fields with an object that does not have the field
-            INSTANCE_FIELDS_MAP.entrySet().stream().forEach((instanceField) -> {
-                cfgSet.add(new Object[]{instanceField.getKey(),
-                                CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.objectField),
-                                isDefStab,
-                                null});
-            });
-        }
-        return cfgSet.toArray(new Object[0][0]);
-    }
-
-    @DataProvider(name = "readStableFieldValueArrayDataProvider")
-    public static Object[][] readStableFieldValueArrayDataProvider() {
-        LinkedList<Object[]> cfgSet = new LinkedList<>();
-        for (boolean isDefStab : new boolean[]{true, false}) {
-            // Testing instance non-stable array fields
-            ARRAYS_MAP.entrySet().stream().forEach((instanceField) -> {
-                cfgSet.add(new Object[]{instanceField.getKey(),
-                                DUMMY_CLASS_CONSTANT,
-                                isDefStab,
-                                TestHelper.ARRAY_DIMENSION,
-                                instanceField.getValue()});
-            });
-            // Testing instance stable array fields
-            STABLE_ARRAYS_MAP.entrySet().stream().forEach((instanceField) -> {
-                cfgSet.add(new Object[]{instanceField.getKey(),
-                                DUMMY_CLASS_CONSTANT,
-                                isDefStab,
-                                TestHelper.ARRAY_DIMENSION,
-                                instanceField.getValue()});
-            });
-            // Testing instance non-stable array-of-array fields
-            ARRAY_ARRAYS_MAP.entrySet().stream().forEach((instanceField) -> {
-                cfgSet.add(new Object[]{instanceField.getKey(),
-                                DUMMY_CLASS_CONSTANT,
-                                isDefStab,
-                                TestHelper.ARRAY_OF_ARRAYS_DIMENSION,
-                                instanceField.getValue()});
-            });
-            // Testing instance stable array-of-array fields
-            STABLE_ARRAY_ARRAYS_MAP.entrySet().stream().forEach((instanceField) -> {
-                cfgSet.add(new Object[]{instanceField.getKey(),
-                                DUMMY_CLASS_CONSTANT,
-                                isDefStab,
-                                TestHelper.ARRAY_OF_ARRAYS_DIMENSION,
-                                instanceField.getValue()});
-            });
-        }
-        return cfgSet.toArray(new Object[0][0]);
-    }
-
-    @DataProvider(name = "readStableFieldValueNegativeDataProvider")
-    public static Object[][] readStableFieldValueNegativeDataProvider() {
-        LinkedList<Object[]> cfgSet = new LinkedList<>();
-        for (boolean isDefStab : new boolean[]{true, false}) {
-            // Testing instance fields with null as receiver
-            INSTANCE_FIELDS_MAP.keySet().stream().forEach((instanceField) -> {
-                cfgSet.add(new Object[]{instanceField, null, isDefStab});
-            });
-            // Testing null as a field argument
-            cfgSet.add(new Object[]{null, null, isDefStab});
-        }
-        return cfgSet.toArray(new Object[0][0]);
-    }
-}
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestHelper.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestHelper.java
index 09ee0d713c7..96f05dacae4 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestHelper.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestHelper.java
@@ -157,47 +157,6 @@ public class TestHelper {
                                         DUMMY_CLASS_INSTANCE.stableObjectField));
     }
 
-    public static final Map<ResolvedJavaField, JavaConstant> INSTANCE_STABLE_DEFAULT_FIELDS_MAP = new HashMap<>();
-
-    static {
-        INSTANCE_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                        "stableDefaultBooleanField"),
-                        JavaConstant.forBoolean(
-                                        DUMMY_CLASS_INSTANCE.stableDefaultBooleanField));
-        INSTANCE_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                        "stableDefaultByteField"),
-                        JavaConstant.forByte(
-                                        DUMMY_CLASS_INSTANCE.stableDefaultByteField));
-        INSTANCE_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                        "stableDefaultShortField"),
-                        JavaConstant.forShort(
-                                        DUMMY_CLASS_INSTANCE.stableDefaultShortField));
-        INSTANCE_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                        "stableDefaultCharField"),
-                        JavaConstant.forChar(
-                                        DUMMY_CLASS_INSTANCE.stableDefaultCharField));
-        INSTANCE_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                        "stableDefaultIntField"),
-                        JavaConstant.forInt(
-                                        DUMMY_CLASS_INSTANCE.stableDefaultIntField));
-        INSTANCE_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                        "stableDefaultLongField"),
-                        JavaConstant.forLong(
-                                        DUMMY_CLASS_INSTANCE.stableDefaultLongField));
-        INSTANCE_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                        "stableDefaultFloatField"),
-                        JavaConstant.forFloat(
-                                        DUMMY_CLASS_INSTANCE.stableDefaultFloatField));
-        INSTANCE_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                        "stableDefaultDoubleField"),
-                        JavaConstant.forDouble(
-                                        DUMMY_CLASS_INSTANCE.stableDefaultDoubleField));
-        INSTANCE_STABLE_DEFAULT_FIELDS_MAP.put(getResolvedJavaField(DummyClass.class,
-                        "stableDefaultObjectField"),
-                        CONSTANT_REFLECTION_PROVIDER.forObject(
-                                        DUMMY_CLASS_INSTANCE.stableDefaultObjectField));
-    }
-
     public static final Map<ResolvedJavaField, JavaConstant> STATIC_FIELDS_MAP = new HashMap<>();
 
     static {
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java
index 61a05eb4235..3fb08386077 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java
@@ -37,7 +37,6 @@ package jdk.vm.ci.runtime.test;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.lang.annotation.Annotation;
@@ -45,11 +44,9 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
@@ -102,35 +99,6 @@ public class TestResolvedJavaField extends FieldUniverse {
         }
     }
 
-    static class ReadConstantValueTestConstants {
-        String stringField = "field";
-        final String constantStringField = "constantField";
-
-        static final Object CONST1 = new ReadConstantValueTestConstants();
-        static final Object CONST2 = null;
-        static final Object CONST3 = new String();
-    }
-
-    @Test
-    public void readConstantValueTest() throws NoSuchFieldException {
-        ResolvedJavaField field = metaAccess.lookupJavaField(ReadConstantValueTestConstants.class.getDeclaredField("stringField"));
-        List<ConstantValue> receiverConstants = readConstants(ReadConstantValueTestConstants.class);
-        for (ConstantValue receiver : receiverConstants) {
-            JavaConstant value = constantReflection.readConstantFieldValue(field, receiver.value);
-            assertNull(value);
-        }
-
-        ResolvedJavaField constField = metaAccess.lookupJavaField(ReadConstantValueTestConstants.class.getDeclaredField("constantStringField"));
-        for (ConstantValue receiver : receiverConstants) {
-            JavaConstant value = constantReflection.readConstantFieldValue(constField, receiver.value);
-            if (value != null) {
-                Object expected = "constantField";
-                String actual = ((ReadConstantValueTestConstants) receiver.boxed).constantStringField;
-                assertTrue(actual + " != " + expected, actual == expected);
-            }
-        }
-    }
-
     private Method findTestMethod(Method apiMethod) {
         String testName = apiMethod.getName() + "Test";
         for (Method m : getClass().getDeclaredMethods()) {
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TypeUniverse.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TypeUniverse.java
index 41081b2beb7..50fc963b832 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TypeUniverse.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TypeUniverse.java
@@ -183,7 +183,7 @@ public class TypeUniverse {
                     if (boxed instanceof JavaConstant) {
                         res.add(new ConstantValue(javaField.format("%H.%n"), (JavaConstant) boxed, boxed));
                     } else {
-                        JavaConstant value = constantReflection.readConstantFieldValue(javaField, null);
+                        JavaConstant value = constantReflection.readFieldValue(javaField, null);
                         if (value != null) {
                             res.add(new ConstantValue(javaField.format("%H.%n"), value, boxed));
                             if (boxed instanceof Object[]) {

From dd051e31bbaaf0446ffdf4cabefe9e9bbe7cc411 Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <thartmann@openjdk.org>
Date: Fri, 13 May 2016 08:31:23 +0200
Subject: [PATCH 084/228] 8155608: String intrinsic range checks are not strict
 enough

Range checks in inflate, compress and getChars are not strict enough.

Reviewed-by: kvn, twisti, jrose
---
 .../java.base/share/classes/java/lang/StringLatin1.java   | 4 ++--
 .../java.base/share/classes/java/lang/StringUTF16.java    | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/jdk/src/java.base/share/classes/java/lang/StringLatin1.java b/jdk/src/java.base/share/classes/java/lang/StringLatin1.java
index c491f4833e1..e4901dd69ad 100644
--- a/jdk/src/java.base/share/classes/java/lang/StringLatin1.java
+++ b/jdk/src/java.base/share/classes/java/lang/StringLatin1.java
@@ -557,7 +557,7 @@ final class StringLatin1 {
 
     // inflatedCopy byte[] -> char[]
     @HotSpotIntrinsicCandidate
-    private static void inflate(byte[] src, int srcOff, char[] dst, int dstOff, int len) {
+    public static void inflate(byte[] src, int srcOff, char[] dst, int dstOff, int len) {
         for (int i = 0; i < len; i++) {
             dst[dstOff++] = (char)(src[srcOff++] & 0xff);
         }
@@ -567,7 +567,7 @@ final class StringLatin1 {
     @HotSpotIntrinsicCandidate
     public static void inflate(byte[] src, int srcOff, byte[] dst, int dstOff, int len) {
         // We need a range check here because 'putChar' has no checks
-        checkBoundsOffCount(dstOff, len, dst.length);
+        checkBoundsOffCount(dstOff << 1, len << 1, dst.length);
         for (int i = 0; i < len; i++) {
             StringUTF16.putChar(dst, dstOff++, src[srcOff++] & 0xff);
         }
diff --git a/jdk/src/java.base/share/classes/java/lang/StringUTF16.java b/jdk/src/java.base/share/classes/java/lang/StringUTF16.java
index fe0c964b290..1e61bd13664 100644
--- a/jdk/src/java.base/share/classes/java/lang/StringUTF16.java
+++ b/jdk/src/java.base/share/classes/java/lang/StringUTF16.java
@@ -144,7 +144,7 @@ final class StringUTF16 {
 
     // compressedCopy char[] -> byte[]
     @HotSpotIntrinsicCandidate
-    private static int compress(char[] src, int srcOff, byte[] dst, int dstOff, int len) {
+    public static int compress(char[] src, int srcOff, byte[] dst, int dstOff, int len) {
         for (int i = 0; i < len; i++) {
             char c = src[srcOff];
             if (c > 0xFF) {
@@ -162,7 +162,7 @@ final class StringUTF16 {
     @HotSpotIntrinsicCandidate
     public static int compress(byte[] src, int srcOff, byte[] dst, int dstOff, int len) {
         // We need a range check here because 'getChar' has no checks
-        checkBoundsOffCount(srcOff, len, src.length);
+        checkBoundsOffCount(srcOff << 1, len << 1, src.length);
         for (int i = 0; i < len; i++) {
             char c = getChar(src, srcOff);
             if (c > 0xFF) {
@@ -211,7 +211,9 @@ final class StringUTF16 {
     @HotSpotIntrinsicCandidate
     public static void getChars(byte[] value, int srcBegin, int srcEnd, char dst[], int dstBegin) {
         // We need a range check here because 'getChar' has no checks
-        checkBoundsOffCount(srcBegin, srcEnd - srcBegin, value.length);
+        if (srcBegin < srcEnd) {
+            checkBoundsOffCount(srcBegin << 1, (srcEnd - srcBegin) << 1, value.length);
+        }
         for (int i = srcBegin; i < srcEnd; i++) {
             dst[dstBegin++] = getChar(value, i);
         }

From b8dd2e555f59299f6d5e2d063abd8c702e79bc4c Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <thartmann@openjdk.org>
Date: Fri, 13 May 2016 08:32:20 +0200
Subject: [PATCH 085/228] 8155608: String intrinsic range checks are not strict
 enough

Range checks in inflate, compress and getChars are not strict enough.

Reviewed-by: kvn, twisti, jrose
---
 .../TestStringIntrinsicRangeChecks.java       | 112 ++++++++++++++++++
 .../patches/java.base/java/lang/Helper.java   |  48 +++++++-
 2 files changed, 156 insertions(+), 4 deletions(-)
 create mode 100644 hotspot/test/compiler/intrinsics/string/TestStringIntrinsicRangeChecks.java

diff --git a/hotspot/test/compiler/intrinsics/string/TestStringIntrinsicRangeChecks.java b/hotspot/test/compiler/intrinsics/string/TestStringIntrinsicRangeChecks.java
new file mode 100644
index 00000000000..d4e1fb0b40c
--- /dev/null
+++ b/hotspot/test/compiler/intrinsics/string/TestStringIntrinsicRangeChecks.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2016, 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.
+ */
+
+/*
+ * @test
+ * @bug 8155608
+ * @summary Verifies that string intrinsics throw array out of bounds exceptions.
+ * @library /compiler/patches /testlibrary /test/lib /
+ * @build java.base/java.lang.Helper
+ * @build compiler.intrinsics.string.TestStringIntrinsicRangeChecks
+ * @run main compiler.intrinsics.string.TestStringIntrinsicRangeChecks
+ */
+package compiler.intrinsics.string;
+
+import java.lang.Helper;
+import java.lang.reflect.*;
+
+public class TestStringIntrinsicRangeChecks {
+    // Prepare test arrays
+    private static int SIZE = 16;
+    private static byte[] byteArray = new byte[SIZE];
+    private static char[] charArray = new char[SIZE];
+
+    public static void check(Method m, boolean shouldThrow, Object... args) throws Exception {
+        // Prepare error message
+        String message = m.getName() + "(";
+        for (int i = 0; i < args.length; ++i) {
+            message += args[i];
+            message += (i+1 < args.length) ? ", " : ")";
+        }
+
+        try {
+            m.invoke(null, args);
+        } catch (InvocationTargetException e) {
+            // Get actual exception
+            Throwable t = e.getTargetException();
+            if (!shouldThrow) {
+                throw new RuntimeException("Unexpected exception thrown for " + message, e);
+            }
+            if (t instanceof StringIndexOutOfBoundsException ||
+                t instanceof ArrayIndexOutOfBoundsException) {
+                // Expected exception. Make sure that the exception was not thrown in UTF16.putChar/getChar
+                // because the corresponding intrinsics are unchecked and the Java code should do all the checks.
+                StackTraceElement[] stack = t.getStackTrace();
+                if (stack.length != 0) {
+                    String methodName = stack[0].getMethodName();
+                    if (methodName.equals("putChar") || methodName.equals("getChar")) {
+                        throw new RuntimeException("Exception thrown in " + methodName + " for " + message, t);
+                    }
+                }
+            }
+            return;
+        }
+        if (shouldThrow) {
+            throw new RuntimeException("No exception thrown for " + message);
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        // Get intrinsified String API methods
+        Method compressByte = Helper.class.getMethod("compressByte", byte[].class, int.class, int.class, int.class, int.class);
+        Method compressChar = Helper.class.getMethod("compressChar", char[].class, int.class, int.class, int.class, int.class);
+        Method inflateByte  = Helper.class.getMethod("inflateByte",  byte[].class, int.class, int.class, int.class, int.class);
+        Method inflateChar  = Helper.class.getMethod("inflateChar",  byte[].class, int.class, int.class, int.class, int.class);
+        Method toBytes      = Helper.class.getMethod("toBytes",      char[].class, int.class, int.class);
+        Method getChars     = Helper.class.getMethod("getChars",     byte[].class, int.class, int.class, int.class, int.class);
+
+        // Check different combinations of arguments (source/destination offset and length)
+        for (int srcOff = 0; srcOff < SIZE; ++srcOff) {
+            for (int dstOff = 0; dstOff < SIZE; ++dstOff) {
+                for (int len = 0; len < SIZE; ++len) {
+                    // Check for potential overlows in source or destination array
+                    boolean srcOverflow  = (srcOff + len) > SIZE;
+                    boolean srcOverflowB = (2*srcOff + 2*len) > SIZE;
+                    boolean dstOverflow  = (dstOff + len) > SIZE;
+                    boolean dstOverflowB = (2*dstOff + 2*len) > SIZE;
+                    boolean getCharsOver = (srcOff < len) && ((2*(len-1) >= SIZE) || ((dstOff + len - srcOff) > SIZE));
+                    // Check if an exception is thrown and bail out if result is inconsistent with above
+                    // assumptions (for example, an exception was not thrown although an overflow happened).
+                    check(compressByte, srcOverflowB || dstOverflow,  byteArray, srcOff, SIZE, dstOff, len);
+                    check(compressChar, srcOverflow  || dstOverflow,  charArray, srcOff, SIZE, dstOff, len);
+                    check(inflateByte,  srcOverflow  || dstOverflowB, byteArray, srcOff, SIZE, dstOff, len);
+                    check(inflateChar,  srcOverflow  || dstOverflow,  byteArray, srcOff, SIZE, dstOff, len);
+                    check(toBytes,      srcOverflow,                  charArray, srcOff, len);
+                    check(getChars,     getCharsOver,                 byteArray, srcOff, len, SIZE, dstOff);
+                }
+            }
+        }
+    }
+}
diff --git a/hotspot/test/compiler/patches/java.base/java/lang/Helper.java b/hotspot/test/compiler/patches/java.base/java/lang/Helper.java
index f0b285c5c07..65347c87b1b 100644
--- a/hotspot/test/compiler/patches/java.base/java/lang/Helper.java
+++ b/hotspot/test/compiler/patches/java.base/java/lang/Helper.java
@@ -29,8 +29,48 @@ package java.lang;
  * A helper class to get access to package-private members
  */
 public class Helper {
-  @jdk.internal.vm.annotation.ForceInline
-  public static boolean StringCodingHasNegatives(byte[] ba, int off, int len) {
-    return StringCoding.hasNegatives(ba, off, len);
-  }
+    @jdk.internal.vm.annotation.ForceInline
+    public static boolean StringCodingHasNegatives(byte[] ba, int off, int len) {
+        return StringCoding.hasNegatives(ba, off, len);
+    }
+
+    @jdk.internal.vm.annotation.ForceInline
+    public static byte[] compressByte(byte[] src, int srcOff, int dstSize, int dstOff, int len) {
+        byte[] dst = new byte[dstSize];
+        StringUTF16.compress(src, srcOff, dst, dstOff, len);
+        return dst;
+    }
+
+    @jdk.internal.vm.annotation.ForceInline
+    public static byte[] compressChar(char[] src, int srcOff, int dstSize, int dstOff, int len) {
+        byte[] dst = new byte[dstSize];
+        StringUTF16.compress(src, srcOff, dst, dstOff, len);
+        return dst;
+    }
+
+    @jdk.internal.vm.annotation.ForceInline
+    public static byte[] inflateByte(byte[] src, int srcOff, int dstSize, int dstOff, int len) {
+        byte[] dst = new byte[dstSize];
+        StringLatin1.inflate(src, srcOff, dst, dstOff, len);
+        return dst;
+    }
+
+    @jdk.internal.vm.annotation.ForceInline
+    public static char[] inflateChar(byte[] src, int srcOff, int dstSize, int dstOff, int len) {
+        char[] dst = new char[dstSize];
+        StringLatin1.inflate(src, srcOff, dst, dstOff, len);
+        return dst;
+    }
+
+    @jdk.internal.vm.annotation.ForceInline
+    public static byte[] toBytes(char[] value, int off, int len) {
+        return StringUTF16.toBytes(value, off, len);
+    }
+
+    @jdk.internal.vm.annotation.ForceInline
+    public static char[] getChars(byte[] value, int srcBegin, int srcEnd, int dstSize, int dstBegin) {
+        char[] dst = new char[dstSize];
+        StringUTF16.getChars(value, srcBegin, srcEnd, dst, dstBegin);
+        return dst;
+    }
 }

From e931bc512f9f14d87587e2aaad0ce961d831ddb2 Mon Sep 17 00:00:00 2001
From: Vadim Pakhnushev <vadim@openjdk.org>
Date: Fri, 13 May 2016 11:31:05 +0300
Subject: [PATCH 086/228] 8047931: Remove unused medialib code

Reviewed-by: bae
---
 jdk/make/lib/Awt2dLibraries.gmk               |   11 -
 .../native/libmlib_image/mlib_ImageAffine.c   |   52 +-
 .../native/libmlib_image/mlib_ImageAffine.h   |   82 +-
 .../libmlib_image/mlib_ImageAffineEdge.c      |  299 +-
 .../native/libmlib_image/mlib_ImageCheck.h    |    6 -
 .../libmlib_image/mlib_ImageColorTrue2Index.c | 4256 -----------------
 .../native/libmlib_image/mlib_ImageColormap.h |  221 -
 .../native/libmlib_image/mlib_ImageConv.h     |  460 --
 .../libmlib_image/mlib_ImageConv2x2_f.c       | 1118 -----
 .../libmlib_image/mlib_ImageConv_16ext.c      | 1380 ------
 .../libmlib_image/mlib_ImageConv_16nw.c       | 1192 -----
 .../libmlib_image/mlib_ImageConv_32nw.c       |  833 ----
 .../libmlib_image/mlib_ImageConv_8ext.c       | 1395 ------
 .../native/libmlib_image/mlib_ImageConv_8nw.c | 1192 -----
 .../libmlib_image/mlib_ImageConv_D64nw.c      |  489 --
 .../libmlib_image/mlib_ImageConv_F32nw.c      |  489 --
 .../libmlib_image/mlib_ImageConv_u16ext.c     | 1370 ------
 .../libmlib_image/mlib_ImageConv_u16nw.c      | 1192 -----
 .../mlib_c_ImageAffineIndex_BC.c              |  413 --
 .../mlib_c_ImageAffineIndex_BL.c              |  280 --
 .../libmlib_image/mlib_c_ImageBlendTable.c    |  263 -
 .../libmlib_image/mlib_c_ImageBlendTable.h    |   41 -
 .../native/libmlib_image/mlib_c_ImageConv.h   |  208 -
 .../native/libmlib_image/mlib_c_ImageConv_f.c |  144 -
 .../libmlib_image/mlib_c_ImageThresh1.h       |  103 -
 .../libmlib_image/mlib_c_ImageThresh1_U8.c    |  848 ----
 .../share/native/libmlib_image/mlib_image.h   |    1 -
 .../libmlib_image/mlib_image_blend_proto.h    | 1448 ------
 .../native/libmlib_image/mlib_image_proto.h   |  229 -
 .../libawt/awt/medialib/mlib_v_ImageCopy.c    |  193 -
 .../awt/medialib/mlib_v_ImageCopy_blk.s       |  262 -
 .../unix/native/libawt/awt/medialib/vis_asi.h |  210 -
 .../mlib_v_ImageAffineIndex_BC.c              | 1443 ------
 .../libmlib_image/mlib_v_ImageAffine_BL.c     |  132 -
 .../libmlib_image/mlib_v_ImageAffine_BL_S16.c |  126 -
 .../libmlib_image/mlib_v_ImageAffine_BL_U16.c |    1 -
 .../mlib_v_ImageChannelExtract.c              |  825 ----
 .../mlib_v_ImageChannelExtract.h              |  319 --
 .../mlib_v_ImageChannelExtract_1.c            | 1980 --------
 .../mlib_v_ImageChannelExtract_43.c           |  919 ----
 .../mlib_v_ImageChannelExtract_f.c            |  784 ---
 .../libmlib_image/mlib_v_ImageChannelInsert.c |  715 ---
 .../libmlib_image/mlib_v_ImageChannelInsert.h |  269 --
 .../mlib_v_ImageChannelInsert_1.c             | 1070 -----
 .../mlib_v_ImageChannelInsert_34.c            | 1225 -----
 .../native/libmlib_image/mlib_v_ImageConv.h   |   22 -
 .../mlib_v_ImageConvIndex3_8_16nw.c           | 1673 -------
 .../mlib_v_ImageConvIndex3_8_8nw.c            | 1673 -------
 .../libmlib_image/mlib_v_ImageConv_8nw.c      | 1015 +---
 49 files changed, 16 insertions(+), 34855 deletions(-)
 delete mode 100644 jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageColorTrue2Index.c
 delete mode 100644 jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageColormap.h
 delete mode 100644 jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv2x2_f.c
 delete mode 100644 jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffineIndex_BC.c
 delete mode 100644 jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffineIndex_BL.c
 delete mode 100644 jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageBlendTable.c
 delete mode 100644 jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageBlendTable.h
 delete mode 100644 jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageThresh1.h
 delete mode 100644 jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageThresh1_U8.c
 delete mode 100644 jdk/src/java.desktop/share/native/libmlib_image/mlib_image_blend_proto.h
 delete mode 100644 jdk/src/java.desktop/unix/native/libawt/awt/medialib/mlib_v_ImageCopy.c
 delete mode 100644 jdk/src/java.desktop/unix/native/libawt/awt/medialib/mlib_v_ImageCopy_blk.s
 delete mode 100644 jdk/src/java.desktop/unix/native/libawt/awt/medialib/vis_asi.h
 delete mode 100644 jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffineIndex_BC.c
 delete mode 100644 jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract.c
 delete mode 100644 jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_f.c
 delete mode 100644 jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert.c
 delete mode 100644 jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert_34.c
 delete mode 100644 jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvIndex3_8_16nw.c
 delete mode 100644 jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvIndex3_8_8nw.c

diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk
index 7215f351700..57067da008d 100644
--- a/jdk/make/lib/Awt2dLibraries.gmk
+++ b/jdk/make/lib/Awt2dLibraries.gmk
@@ -96,10 +96,7 @@ ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
       mlib_c_ImageAffine_BL.c \
       mlib_c_ImageAffine_BL_S16.c \
       mlib_c_ImageAffine_BL_U16.c \
-      mlib_c_ImageAffineIndex_BC.c \
-      mlib_c_ImageAffineIndex_BL.c \
       mlib_c_ImageAffine_NN.c \
-      mlib_c_ImageBlendTable.c \
       mlib_c_ImageConvClearEdge.c \
       mlib_c_ImageConvCopyEdge.c \
       mlib_c_ImageConv_f.c \
@@ -107,14 +104,6 @@ ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
       mlib_c_ImageCopy.c \
       mlib_c_ImageLookUp.c \
       mlib_c_ImageLookUp_f.c \
-      mlib_v_ImageChannelExtract.c \
-      mlib_v_ImageChannelExtract_f.c \
-      mlib_v_ImageChannelInsert_34.c \
-      mlib_v_ImageChannelInsert.c \
-      mlib_v_ImageConvIndex3_8_16nw.c \
-      mlib_v_ImageConvIndex3_8_8nw.c \
-      mlib_v_ImageCopy.c \
-      mlib_v_ImageCopy_blk.s \
       #
 
   LIBMLIB_IMAGE_V_CFLAGS += $(filter-out -DMLIB_NO_LIBSUNMATH, $(BUILD_LIBMLIB_CFLAGS))
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.c
index 42d42ed041b..84d8a147aa3 100644
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.c
+++ b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.c
@@ -73,7 +73,6 @@
  */
 
 #include "mlib_ImageCheck.h"
-#include "mlib_ImageColormap.h"
 #include "mlib_ImageAffine.h"
 
 
@@ -124,18 +123,6 @@ const type_affine_fun mlib_AffineFunArr_bc[] = {
   mlib_ImageAffine_d64_3ch_bc, mlib_ImageAffine_d64_4ch_bc
 };
 
-/***************************************************************/
-const type_affine_i_fun mlib_AffineFunArr_bc_i[] = {
-  mlib_ImageAffineIndex_U8_U8_3CH_BC,
-  mlib_ImageAffineIndex_U8_U8_4CH_BC,
-  mlib_ImageAffineIndex_S16_U8_3CH_BC,
-  mlib_ImageAffineIndex_S16_U8_4CH_BC,
-  mlib_ImageAffineIndex_U8_S16_3CH_BC,
-  mlib_ImageAffineIndex_U8_S16_4CH_BC,
-  mlib_ImageAffineIndex_S16_S16_3CH_BC,
-  mlib_ImageAffineIndex_S16_S16_4CH_BC
-};
-
 /***************************************************************/
 #ifdef i386 /* do not perform the coping by mlib_d64 data type for x86 */
 #define MAX_T_IND  2
@@ -148,8 +135,7 @@ mlib_status mlib_ImageAffine_alltypes(mlib_image       *dst,
                                       const mlib_image *src,
                                       const mlib_d64   *mtx,
                                       mlib_filter      filter,
-                                      mlib_edge        edge,
-                                      const void       *colormap)
+                                      mlib_edge        edge)
 {
   mlib_affine_param param[1];
   mlib_status res;
@@ -213,18 +199,6 @@ mlib_status mlib_ImageAffine_alltypes(mlib_image       *dst,
   else
     return MLIB_FAILURE; /* unknown image type */
 
-  if (colormap != NULL && filter != MLIB_NEAREST) {
-    if (t_ind != 0 && t_ind != 1)
-      return MLIB_FAILURE;
-
-    if (mlib_ImageGetLutType(colormap) == MLIB_SHORT)
-      t_ind += 2;
-    t_ind = 2 * t_ind;
-
-    if (mlib_ImageGetLutChannels(colormap) == 4)
-      t_ind++;
-  }
-
   if (type == MLIB_BIT) {
     mlib_s32 s_bitoff = mlib_ImageGetBitOffset(src);
     mlib_s32 d_bitoff = mlib_ImageGetBitOffset(dst);
@@ -253,25 +227,13 @@ mlib_status mlib_ImageAffine_alltypes(mlib_image       *dst,
 
       case MLIB_BILINEAR:
 
-        if (colormap != NULL) {
-          res = mlib_AffineFunArr_bl_i[t_ind] (param, colormap);
-        }
-        else {
-          res = mlib_AffineFunArr_bl[4 * t_ind + (nchan - 1)] (param);
-        }
-
+        res = mlib_AffineFunArr_bl[4 * t_ind + (nchan - 1)] (param);
         break;
 
       case MLIB_BICUBIC:
       case MLIB_BICUBIC2:
 
-        if (colormap != NULL) {
-          res = mlib_AffineFunArr_bc_i[t_ind] (param, colormap);
-        }
-        else {
-          res = mlib_AffineFunArr_bc[4 * t_ind + (nchan - 1)] (param);
-        }
-
+        res = mlib_AffineFunArr_bc[4 * t_ind + (nchan - 1)] (param);
         break;
     }
 
@@ -303,7 +265,7 @@ mlib_status mlib_ImageAffine_alltypes(mlib_image       *dst,
 
     switch (edge) {
       case MLIB_EDGE_DST_FILL_ZERO:
-        mlib_ImageAffineEdgeZero(param, param_e, colormap);
+        mlib_ImageAffineEdgeZero(param, param_e);
         break;
 
       case MLIB_EDGE_OP_NEAREST:
@@ -313,10 +275,10 @@ mlib_status mlib_ImageAffine_alltypes(mlib_image       *dst,
       case MLIB_EDGE_SRC_EXTEND:
 
         if (filter == MLIB_BILINEAR) {
-          res = mlib_ImageAffineEdgeExtend_BL(param, param_e, colormap);
+          res = mlib_ImageAffineEdgeExtend_BL(param, param_e);
         }
         else {
-          res = mlib_ImageAffineEdgeExtend_BC(param, param_e, colormap);
+          res = mlib_ImageAffineEdgeExtend_BC(param, param_e);
         }
 
         break;
@@ -355,7 +317,7 @@ mlib_status mlib_ImageAffine(mlib_image       *dst,
     return MLIB_FAILURE;
   }
 
-  return mlib_ImageAffine_alltypes(dst, src, mtx, filter, edge, NULL);
+  return mlib_ImageAffine_alltypes(dst, src, mtx, filter, edge);
 }
 
 /***************************************************************/
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.h
index b9f8fe801b5..be21823729c 100644
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.h
+++ b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.h
@@ -162,99 +162,25 @@ mlib_status mlib_ImageAffine_d64_4ch_bc(mlib_affine_param *param);
 
 /***************************************************************/
 void mlib_ImageAffineEdgeZero(mlib_affine_param *param,
-                              mlib_affine_param *param_e,
-                              const void        *colormap);
+                              mlib_affine_param *param_e);
 
 void mlib_ImageAffineEdgeNearest(mlib_affine_param *param,
                                  mlib_affine_param *param_e);
 
 mlib_status mlib_ImageAffineEdgeExtend_BL(mlib_affine_param *param,
-                                          mlib_affine_param *param_e,
-                                          const void        *colormap);
+                                          mlib_affine_param *param_e);
 
 mlib_status mlib_ImageAffineEdgeExtend_BC(mlib_affine_param *param,
-                                          mlib_affine_param *param_e,
-                                          const void        *colormap);
-
-mlib_status mlib_ImageAffineEdgeExtend_BC2(mlib_affine_param *param,
-                                           mlib_affine_param *param_e,
-                                           const void        *colormap);
-
-/***************************************************************/
-typedef mlib_status (*type_affine_i_fun)(mlib_affine_param *param, const void *colormap);
-
-mlib_status mlib_ImageAffine_u8_u8_i_bl(mlib_affine_param *param,
-                                        const void        *colormap);
-mlib_status mlib_ImageAffine_u8_s16_i_bl(mlib_affine_param *param,
-                                         const void        *colormap);
-mlib_status mlib_ImageAffine_s16_u8_i_bl(mlib_affine_param *param,
-                                         const void        *colormap);
-mlib_status mlib_ImageAffine_s16_s16_i_bl(mlib_affine_param *param,
-                                          const void        *colormap);
-
-mlib_status mlib_ImageAffine_u8_u8_i_bc(mlib_affine_param *param,
-                                        const void        *colormap);
-mlib_status mlib_ImageAffine_u8_s16_i_bc(mlib_affine_param *param,
-                                         const void        *colormap);
-mlib_status mlib_ImageAffine_s16_u8_i_bc(mlib_affine_param *param,
-                                         const void        *colormap);
-mlib_status mlib_ImageAffine_s16_s16_i_bc(mlib_affine_param *param,
-                                          const void        *colormap);
-
-void mlib_ImageAffineEdgeZeroIndex(mlib_affine_param *param,
-                                   mlib_affine_param *param_e,
-                                   const void        *colormap);
-
-void mlib_ImageAffineEdgeExtendIndex_BL(mlib_affine_param *param,
-                                        mlib_affine_param *param_e,
-                                        const void        *colormap);
-
-void mlib_ImageAffineEdgeExtendIndex_BC(mlib_affine_param *param,
-                                        mlib_affine_param *param_e,
-                                        const void        *colormap);
-
-void mlib_ImageAffineEdgeExtendIndex_BC2(mlib_affine_param *param,
-                                         mlib_affine_param *param_e,
-                                         const void        *colormap);
-
-/***************************************************************/
-#define PROT_AFFINEINDEX_BC(ITYPE, LTYPE, NCHAN)                                                 \
-  mlib_status mlib_ImageAffineIndex_##ITYPE##_##LTYPE##_##NCHAN##CH_BC(mlib_affine_param *param, \
-                                                                       const void        *colormap)
-
-PROT_AFFINEINDEX_BC(U8, U8, 3);
-PROT_AFFINEINDEX_BC(U8, S16, 3);
-PROT_AFFINEINDEX_BC(U8, U8, 4);
-PROT_AFFINEINDEX_BC(U8, S16, 4);
-PROT_AFFINEINDEX_BC(S16, U8, 3);
-PROT_AFFINEINDEX_BC(S16, S16, 3);
-PROT_AFFINEINDEX_BC(S16, U8, 4);
-PROT_AFFINEINDEX_BC(S16, S16, 4);
-
-/***************************************************************/
-#define PROT_AFFINEINDEX_BL(ITYPE, LTYPE, NCHAN)                                                 \
-  mlib_status mlib_ImageAffineIndex_##ITYPE##_##LTYPE##_##NCHAN##CH_BL(mlib_affine_param *param, \
-                                                                       const void        *colormap)
-
-PROT_AFFINEINDEX_BL(U8, U8, 3);
-PROT_AFFINEINDEX_BL(U8, S16, 3);
-PROT_AFFINEINDEX_BL(U8, U8, 4);
-PROT_AFFINEINDEX_BL(U8, S16, 4);
-PROT_AFFINEINDEX_BL(S16, U8, 3);
-PROT_AFFINEINDEX_BL(S16, S16, 3);
-PROT_AFFINEINDEX_BL(S16, U8, 4);
-PROT_AFFINEINDEX_BL(S16, S16, 4);
+                                          mlib_affine_param *param_e);
 
 /***************************************************************/
 mlib_status mlib_ImageAffine_alltypes(mlib_image       *dst,
                                       const mlib_image *src,
                                       const mlib_d64   *mtx,
                                       mlib_filter      filter,
-                                      mlib_edge        edge,
-                                      const void       *colormap);
+                                      mlib_edge        edge);
 
 /***************************************************************/
-extern const type_affine_i_fun mlib_AffineFunArr_bl_i[];
 extern const type_affine_fun mlib_AffineFunArr_nn[];
 extern const type_affine_fun mlib_AffineFunArr_bl[];
 extern const type_affine_fun mlib_AffineFunArr_bc[];
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffineEdge.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffineEdge.c
index e095a0e9c01..2cb39d0b55a 100644
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffineEdge.c
+++ b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffineEdge.c
@@ -73,7 +73,6 @@
  */
 
 #include "mlib_image.h"
-#include "mlib_ImageColormap.h"
 #include "mlib_ImageAffine.h"
 
 /***************************************************************/
@@ -217,97 +216,6 @@
     dp += channels;                                                     \
   }
 
-/***************************************************************/
-#define LUT(k, ind) plut[channels*sp[ind] + k]
-
-/***************************************************************/
-#define MLIB_EDGE_INDEX(ITYPE, DTYPE, size)                             \
-  for (j = 0; j < size; j++) {                                          \
-    ySrc = ((Y - 32768) >> MLIB_SHIFT);                                 \
-    xSrc = ((X - 32768) >> MLIB_SHIFT);                                 \
-                                                                        \
-    t = ((X - 32768) & MLIB_MASK) * scale;                              \
-    u = ((Y - 32768) & MLIB_MASK) * scale;                              \
-                                                                        \
-    xDelta = (((xSrc + 1 - srcWidth )) >> MLIB_SIGN_SHIFT) & 1;         \
-    yDelta = (((ySrc + 1 - srcHeight)) >> MLIB_SIGN_SHIFT) & srcStride; \
-                                                                        \
-    xFlag = (xSrc >> (MLIB_SIGN_SHIFT - MLIB_SHIFT));                   \
-    xSrc = xSrc + (1 & xFlag);                                          \
-    xDelta = xDelta &~ xFlag;                                           \
-                                                                        \
-    yFlag = (ySrc >> (MLIB_SIGN_SHIFT - MLIB_SHIFT));                   \
-    ySrc = ySrc + (1 & yFlag);                                          \
-    yDelta = yDelta &~ yFlag;                                           \
-                                                                        \
-    sp = (ITYPE*)lineAddr[ySrc] + xSrc;                                 \
-                                                                        \
-    for (k = 0; k < channels; k++) {                                    \
-      a00  = LUT(k, 0);                                                 \
-      a01  = LUT(k, xDelta);                                            \
-      a10  = LUT(k, yDelta);                                            \
-      a11  = LUT(k, yDelta + xDelta);                                   \
-      pix0 = (a00 * (1 - t) + a01 * t) * (1 - u) +                      \
-             (a10 * (1 - t) + a11 * t) * u;                             \
-                                                                        \
-      pbuff[k] = (mlib_s32)pix0;                                        \
-    }                                                                   \
-    pbuff += channels;                                                  \
-                                                                        \
-    X += dX;                                                            \
-    Y += dY;                                                            \
-  }
-
-/***************************************************************/
-#define MLIB_EDGE_INDEX_u8i(ITYPE, Left, Right) {                              \
-  mlib_u8  *pbuff = buff;                                                      \
-                                                                               \
-  size = Right - Left;                                                         \
-                                                                               \
-  MLIB_EDGE_INDEX(ITYPE, mlib_u8, size);                                       \
-                                                                               \
-  dp = (ITYPE*)data + Left;                                                    \
-                                                                               \
-  if (channels == 3) {                                                         \
-    if (sizeof(ITYPE) == 1) {                                                  \
-      mlib_ImageColorTrue2IndexLine_U8_U8_3 (buff, (void*)dp, size, colormap); \
-    } else {                                                                   \
-      mlib_ImageColorTrue2IndexLine_U8_S16_3(buff, (void*)dp, size, colormap); \
-    }                                                                          \
-  } else {                                                                     \
-    if (sizeof(ITYPE) == 1) {                                                  \
-      mlib_ImageColorTrue2IndexLine_U8_U8_4 (buff, (void*)dp, size, colormap); \
-    } else {                                                                   \
-      mlib_ImageColorTrue2IndexLine_U8_S16_4(buff, (void*)dp, size, colormap); \
-    }                                                                          \
-  }                                                                            \
-}
-
-/***************************************************************/
-#define MLIB_EDGE_INDEX_s16i(ITYPE, Left, Right) {                              \
-  mlib_s16 *pbuff = buff;                                                       \
-                                                                                \
-  size = Right - Left;                                                          \
-                                                                                \
-  MLIB_EDGE_INDEX(ITYPE, mlib_s16, size);                                       \
-                                                                                \
-  dp = (ITYPE*)data + Left;                                                     \
-                                                                                \
-  if (channels == 3) {                                                          \
-    if (sizeof(ITYPE) == 1) {                                                   \
-      mlib_ImageColorTrue2IndexLine_S16_U8_3 (buff, (void*)dp, size, colormap); \
-    } else {                                                                    \
-      mlib_ImageColorTrue2IndexLine_S16_S16_3(buff, (void*)dp, size, colormap); \
-    }                                                                           \
-  } else {                                                                      \
-    if (sizeof(ITYPE) == 1) {                                                   \
-      mlib_ImageColorTrue2IndexLine_S16_U8_4 (buff, (void*)dp, size, colormap); \
-    } else {                                                                    \
-      mlib_ImageColorTrue2IndexLine_S16_S16_4(buff, (void*)dp, size, colormap); \
-    }                                                                           \
-  }                                                                             \
-}
-
 /***************************************************************/
 #define GET_FLT_TBL(X, xf0, xf1, xf2, xf3)                      \
   filterpos = ((X - 32768) >> flt_shift) & flt_mask;            \
@@ -423,47 +331,6 @@
 #define MLIB_EDGE_BC2(TYPE, Left, Right)                        \
   MLIB_EDGE_BC_LINE(TYPE, Left, Right, GET_FLT_BC2)
 
-/***************************************************************/
-#define MLIB_EDGE_INDEX_BC(ITYPE, DTYPE, size)                  \
-  for (j = 0; j < size; j++) {                                  \
-    GET_FLT_TBL(X, xf0, xf1, xf2, xf3);                         \
-    GET_FLT_TBL(Y, yf0, yf1, yf2, yf3);                         \
-                                                                \
-    CALC_SRC_POS(X, Y, 1, srcStride);                           \
-                                                                \
-    sp = (ITYPE*)lineAddr[ySrc] + xSrc;                         \
-                                                                \
-    for (k = 0; k < channels; k++) {                            \
-      c0 = LUT(k, yDelta0 + xDelta0) * xf0 +                    \
-           LUT(k, yDelta0          ) * xf1 +                    \
-           LUT(k, yDelta0 + xDelta1) * xf2 +                    \
-           LUT(k, yDelta0 + xDelta2) * xf3;                     \
-                                                                \
-      c1 = LUT(k, xDelta0) * xf0 +                              \
-           LUT(k, 0      ) * xf1 +                              \
-           LUT(k, xDelta1) * xf2 +                              \
-           LUT(k, xDelta2) * xf3;                               \
-                                                                \
-      c2 = LUT(k, yDelta1 + xDelta0) * xf0 +                    \
-           LUT(k, yDelta1          ) * xf1 +                    \
-           LUT(k, yDelta1 + xDelta1) * xf2 +                    \
-           LUT(k, yDelta1 + xDelta2) * xf3;                     \
-                                                                \
-      c3 = LUT(k, yDelta2 + xDelta0) * xf0 +                    \
-           LUT(k, yDelta2          ) * xf1 +                    \
-           LUT(k, yDelta2 + xDelta1) * xf2 +                    \
-           LUT(k, yDelta2 + xDelta2) * xf3;                     \
-                                                                \
-      val0 = c0*yf0 + c1*yf1 + c2*yf2 + c3*yf3;                 \
-                                                                \
-      SAT##DTYPE(pbuff[k], val0);                               \
-    }                                                           \
-    pbuff += channels;                                          \
-                                                                \
-    X += dX;                                                    \
-    Y += dY;                                                    \
-  }
-
 /***************************************************************/
 #define MLIB_PROCESS_EDGES_ZERO(TYPE) {                         \
   TYPE *dp, *dstLineEnd;                                        \
@@ -586,16 +453,11 @@
 
 /***************************************************************/
 void mlib_ImageAffineEdgeZero(mlib_affine_param *param,
-                              mlib_affine_param *param_e,
-                              const void        *colormap)
+                              mlib_affine_param *param_e)
 {
   GET_EDGE_PARAMS_ZERO();
   mlib_s32 zero = 0;
 
-  if (colormap != NULL) {
-    zero = mlib_ImageGetLutOffset(colormap);
-  }
-
   switch (type) {
     case MLIB_BYTE:
       MLIB_PROCESS_EDGES_ZERO(mlib_u8);
@@ -654,8 +516,7 @@ void mlib_ImageAffineEdgeNearest(mlib_affine_param *param,
 
 /***************************************************************/
 mlib_status mlib_ImageAffineEdgeExtend_BL(mlib_affine_param *param,
-                                          mlib_affine_param *param_e,
-                                          const void        *colormap)
+                                          mlib_affine_param *param_e)
 {
   GET_EDGE_PARAMS();
   mlib_d64 scale = 1.0 / (mlib_d64) MLIB_PREC;
@@ -663,79 +524,6 @@ mlib_status mlib_ImageAffineEdgeExtend_BL(mlib_affine_param *param,
   mlib_d64 t, u, pix0;
   mlib_d64 a00, a01, a10, a11;
 
-  if (colormap != NULL) {
-    mlib_s32 max_xsize = param_e->max_xsize;
-    mlib_type ltype = mlib_ImageGetLutType(colormap);
-    mlib_d64 *plut = (mlib_d64 *) mlib_ImageGetLutDoubleData(colormap);
-    void *buff;
-
-    channels = mlib_ImageGetLutChannels(colormap);
-    plut -= channels * mlib_ImageGetLutOffset(colormap);
-
-    if (max_xsize == 0) {
-      return MLIB_SUCCESS;
-    }
-
-    if (ltype == MLIB_BYTE) {
-      buff = mlib_malloc(channels * max_xsize);
-    }
-    else if (ltype == MLIB_SHORT) {
-      buff = mlib_malloc(channels * max_xsize * sizeof(mlib_s16));
-    } else {
-      /* Unsupported type of lookup table. Report a failure */
-      return MLIB_FAILURE;
-    }
-
-    if (buff == NULL)
-      return MLIB_FAILURE;
-
-    switch (ltype) {
-      case MLIB_BYTE:
-        switch (type) {
-          case MLIB_BYTE:
-            MLIB_PROCESS_EDGES(MLIB_EDGE_INDEX_u8i, mlib_u8);
-            break;
-
-          case MLIB_SHORT:
-            srcStride >>= 1;
-            MLIB_PROCESS_EDGES(MLIB_EDGE_INDEX_u8i, mlib_s16);
-            break;
-        default:
-          /* Incompatible image type. Ignore it for now. */
-          break;
-        }
-
-        break;
-
-      case MLIB_SHORT:
-        switch (type) {
-          case MLIB_BYTE:
-            MLIB_PROCESS_EDGES(MLIB_EDGE_INDEX_s16i, mlib_u8);
-            break;
-
-          case MLIB_SHORT:
-            srcStride >>= 1;
-            MLIB_PROCESS_EDGES(MLIB_EDGE_INDEX_s16i, mlib_s16);
-            break;
-        default:
-          /* Incompatible image type. Ignore it for now. */
-          break;
-        }
-
-        break;
-    default:
-      /* Unsupported type of lookup table.
-       * Can not be here due to check on line 685,
-       * so just ignore it.
-       */
-      break;
-    }
-
-    mlib_free(buff);
-
-    return MLIB_SUCCESS;
-  }
-
   switch (type) {
     case MLIB_BYTE:
       MLIB_PROCESS_EDGES(MLIB_EDGE_BL, mlib_u8);
@@ -775,12 +563,8 @@ mlib_status mlib_ImageAffineEdgeExtend_BL(mlib_affine_param *param,
 }
 
 /***************************************************************/
-#undef  MLIB_EDGE_INDEX
-#define MLIB_EDGE_INDEX MLIB_EDGE_INDEX_BC
-
 mlib_status mlib_ImageAffineEdgeExtend_BC(mlib_affine_param *param,
-                                          mlib_affine_param *param_e,
-                                          const void        *colormap)
+                                          mlib_affine_param *param_e)
 {
   GET_EDGE_PARAMS();
   mlib_d64 scale = 1.0 / (mlib_d64) MLIB_PREC;
@@ -789,7 +573,6 @@ mlib_status mlib_ImageAffineEdgeExtend_BC(mlib_affine_param *param,
   mlib_d64 xf0, xf1, xf2, xf3;
   mlib_d64 yf0, yf1, yf2, yf3;
   mlib_d64 c0, c1, c2, c3, val0;
-  mlib_type ltype;
   mlib_filter filter = param->filter;
   mlib_f32 *fptr;
   mlib_f32 const *flt_tbl;
@@ -798,9 +581,7 @@ mlib_status mlib_ImageAffineEdgeExtend_BC(mlib_affine_param *param,
   mlib_s32 yDelta0, yDelta1, yDelta2;
   mlib_d64 sat;
 
-  ltype = (colormap != NULL) ? mlib_ImageGetLutType(colormap) : type;
-
-  if (ltype == MLIB_BYTE) {
+  if (type == MLIB_BYTE) {
     flt_shift = FLT_SHIFT_U8;
     flt_mask = FLT_MASK_U8;
     flt_tbl = (filter == MLIB_BICUBIC) ? mlib_filters_u8f_bc : mlib_filters_u8f_bc2;
@@ -813,78 +594,6 @@ mlib_status mlib_ImageAffineEdgeExtend_BC(mlib_affine_param *param,
     sat = (mlib_d64) 0x7FFF8000;                           /* saturation for U16 */
   }
 
-  if (colormap != NULL) {
-    mlib_s32 max_xsize = param_e->max_xsize;
-    mlib_d64 *plut = (mlib_d64 *) mlib_ImageGetLutDoubleData(colormap);
-    void *buff;
-
-    channels = mlib_ImageGetLutChannels(colormap);
-    plut -= channels * mlib_ImageGetLutOffset(colormap);
-
-    if (max_xsize == 0) {
-      return MLIB_SUCCESS;
-    }
-
-    if (ltype == MLIB_BYTE) {
-      buff = mlib_malloc(channels * max_xsize);
-    }
-    else if (ltype == MLIB_SHORT) {
-      buff = mlib_malloc(channels * max_xsize * sizeof(mlib_s16));
-    } else {
-      /* Unsupported type of lookup table. */
-      return MLIB_FAILURE;
-    }
-
-    if (buff == NULL)
-      return MLIB_FAILURE;
-
-    switch (ltype) {
-      case MLIB_BYTE:
-        switch (type) {
-          case MLIB_BYTE:
-            MLIB_PROCESS_EDGES(MLIB_EDGE_INDEX_u8i, mlib_u8);
-            break;
-
-          case MLIB_SHORT:
-            srcStride >>= 1;
-            MLIB_PROCESS_EDGES(MLIB_EDGE_INDEX_u8i, mlib_s16);
-            break;
-        default:
-          /* Ignore incomatible image type. */
-          break;
-        }
-
-        break;
-
-      case MLIB_SHORT:
-        switch (type) {
-          case MLIB_BYTE:
-            MLIB_PROCESS_EDGES(MLIB_EDGE_INDEX_s16i, mlib_u8);
-            break;
-
-          case MLIB_SHORT:
-            srcStride >>= 1;
-            MLIB_PROCESS_EDGES(MLIB_EDGE_INDEX_s16i, mlib_s16);
-            break;
-        default:
-          /* Ignore incomatible image type. */
-          break;
-        }
-
-        break;
-
-    default:
-      /* Unsupported type of lookup table.
-       * Can not be here due to check on line 836,
-       * so just ignore it.
-       */
-      break;
-    }
-
-    mlib_free(buff);
-
-    return MLIB_SUCCESS;
-  }
 
   switch (type) {
     case MLIB_BYTE:
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageCheck.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageCheck.h
index 3cfaea8c815..8c6a5b19ede 100644
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageCheck.h
+++ b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageCheck.h
@@ -82,12 +82,6 @@ extern "C" {
     return MLIB_FAILURE;                                        \
   }
 
-#define MLIB_IMAGE_AND_COLORMAP_ARE_COMPAT(image,colormap)                 \
-  if ((mlib_ImageGetChannels(image) != mlib_ImageGetLutChannels(colormap)) \
-    || (mlib_ImageGetLutType(colormap) != mlib_ImageGetType(image))) {     \
-    return MLIB_FAILURE;                                                   \
-  }
-
 #define MLIB_IMAGE_GET_ALL_PARAMS(image, type, nchan, width, height, stride, pdata) \
   type   = mlib_ImageGetType(image);                                                \
   nchan  = mlib_ImageGetChannels(image);                                            \
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageColorTrue2Index.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageColorTrue2Index.c
deleted file mode 100644
index 0028fd296c4..00000000000
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageColorTrue2Index.c
+++ /dev/null
@@ -1,4256 +0,0 @@
-/*
- * Copyright (c) 2003, 2011, 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.
- */
-
-/*
- * FUNCTION
- *      mlib_ImageColorTrue2Index - convert a true color image to an indexed
- *                                  color image
- *
- * SYNOPSIS
- *      mlib_status mlib_ImageColorTrue2Index(mlib_image       *dst,
- *                                            const mlib_image *src,
- *                                            const void       *colormap)
- *
- * ARGUMENTS
- *      colormap  Internal data structure for inverse color mapping.
- *      dst       Pointer to destination image.
- *      src       Pointer to source image.
- *
- * DESCRIPTION
- *      Convert a true color image to a pseudo color image with the method
- *      of finding the nearest matched lut entry for each pixel.
- *
- *      The src can be an MLIB_BYTE or MLIB_SHORT image with 3 or 4 channels.
- *      The dst must be a 1-channel MLIB_BYTE or MLIB_SHORT image.
- *
- *      The lut might have either 3 or 4 channels. The type of the lut can be
- *      one of the following:
- *              MLIB_BYTE in, MLIB_BYTE out (i.e., BYTE-to-BYTE)
- *              MLIB_BYTE in, MLIB_SHORT out (i.e., BYTE-to-SHORT)
- *              MLIB_SHORT in, MLIB_SHORT out (i.e., SHORT-to-SHORT)
- *              MLIB_SHORT in, MLIB_BYTE out (i.e., SHORT-to-BYTE)
- *
- *      The src image and the lut must have same number of channels.
- */
-
-#include "mlib_image.h"
-#include "mlib_ImageColormap.h"
-#include "mlib_ImageCheck.h"
-
-/***************************************************************/
-
-/*#define USE_VIS_CODE*/
-
-#ifdef USE_VIS_CODE
-#include "vis_proto.h"
-#define VIS_ALIGNADDR(X, Y)  vis_alignaddr((void *)(X), (Y))
-#endif
-
-/***************************************************************/
-
-#define LUT_BYTE_COLORS_3CHANNELS  1000
-#define LUT_BYTE_COLORS_4CHANNELS  3000
-#define LUT_SHORT_COLORS_3CHANNELS 1000
-#define LUT_SHORT_COLORS_4CHANNELS 1000
-
-/***************************************************************/
-
-#define MAIN_COLORTRUE2INDEX_LOOP( FROM_TYPE, TO_TYPE, NCHANNELS )       \
-  for( y = 0; y < height; y++ )                                          \
-  {                                                                      \
-    mlib_ImageColorTrue2IndexLine_##FROM_TYPE##_##TO_TYPE##_##NCHANNELS( \
-      sdata, ddata, width, colormap );                                   \
-                                                                         \
-    sdata += sstride;                                                    \
-    ddata += dstride;                                                    \
-  }
-
-/***************************************************************/
-
-#define COLOR_CUBE_U8_3_SEARCH( TABLE_POINTER_TYPE, SHIFT, STEP ) \
-{                                                                 \
-  const mlib_u8 *c0, *c1, *c2;                                    \
-  TABLE_POINTER_TYPE *table = s->table;                           \
-  mlib_s32 bits = s->bits;                                        \
-  mlib_s32 nbits = 8 - bits;                                      \
-  mlib_s32 mask = ~( ( 1 << nbits ) - 1 );                        \
-  mlib_s32 j;                                                     \
-                                                                  \
-  c0 = src + SHIFT;                                               \
-  c1 = src + 1 + SHIFT;                                           \
-  c2 = src + 2 + SHIFT;                                           \
-                                                                  \
-  switch( bits )                                                  \
-  {                                                               \
-    case 1:                                                       \
-    case 2:                                                       \
-    {                                                             \
-      mlib_s32 bits0 = 8 - bits;                                  \
-      mlib_s32 bits1 = bits0 - bits;                              \
-      mlib_s32 bits2 = bits1 - bits;                              \
-                                                                  \
-      for( j = 0; j < length; j++ )                               \
-      {                                                           \
-        dst[ j ] = table[ ( ( *c0 & mask ) >> bits2 ) |           \
-          ( ( *c1 & mask ) >> bits1 ) |                           \
-          ( ( *c2 & mask ) >> bits0 ) ];                          \
-                                                                  \
-        c0 += STEP;                                               \
-        c1 += STEP;                                               \
-        c2 += STEP;                                               \
-      }                                                           \
-      break;                                                      \
-    }                                                             \
-    case 3:                                                       \
-    {                                                             \
-      for( j = 0; j < length; j++ )                               \
-      {                                                           \
-        dst[ j ] = table[ ( ( *c0 & mask ) << 1 ) |               \
-          ( ( *c1 & mask ) >> 2 ) |                               \
-          ( ( *c2 & mask ) >> 5 ) ];                              \
-                                                                  \
-        c0 += STEP;                                               \
-        c1 += STEP;                                               \
-        c2 += STEP;                                               \
-      }                                                           \
-      break;                                                      \
-    }                                                             \
-    case 4:                                                       \
-    {                                                             \
-      for( j = 0; j < length; j++ )                               \
-      {                                                           \
-        dst[ j ] = table[ ( ( *c0 & mask ) << 4 ) |               \
-          ( *c1 & mask ) |                                        \
-          ( ( *c2 & mask ) >> 4 ) ];                              \
-                                                                  \
-        c0 += STEP;                                               \
-        c1 += STEP;                                               \
-        c2 += STEP;                                               \
-      }                                                           \
-      break;                                                      \
-    }                                                             \
-    case 5:                                                       \
-    case 6:                                                       \
-    case 7:                                                       \
-    {                                                             \
-      mlib_s32 bits0 = 8 - bits;                                  \
-      mlib_s32 bits1 = bits * 2 - 8;                              \
-      mlib_s32 bits2 = bits1 + bits;                              \
-                                                                  \
-      for( j = 0; j < length; j++ )                               \
-      {                                                           \
-        dst[ j ] = table[ ( ( *c0 & mask ) << bits2 ) |           \
-          ( ( *c1 & mask ) << bits1 ) |                           \
-          ( ( *c2 & mask ) >> bits0 ) ];                          \
-                                                                  \
-        c0 += STEP;                                               \
-        c1 += STEP;                                               \
-        c2 += STEP;                                               \
-      }                                                           \
-      break;                                                      \
-    }                                                             \
-    case 8:                                                       \
-    {                                                             \
-      for( j = 0; j < length; j++ )                               \
-      {                                                           \
-        dst[ j ] = table[ ( ( *c0 & mask ) << 16 ) |              \
-          ( ( *c1 & mask ) << 8 ) |                               \
-          ( *c2 & mask ) ];                                       \
-                                                                  \
-        c0 += STEP;                                               \
-        c1 += STEP;                                               \
-        c2 += STEP;                                               \
-      }                                                           \
-      break;                                                      \
-    }                                                             \
-  }                                                               \
-}
-
-/***************************************************************/
-#define COLOR_CUBE_U8_4_SEARCH( TABLE_TYPE )                    \
-{                                                               \
-  const mlib_u8 *c0, *c1, *c2, *c3;                             \
-  TABLE_TYPE *table = s->table;                                 \
-  mlib_s32 bits = s->bits;                                      \
-  mlib_s32 nbits = 8 - bits;                                    \
-  mlib_s32 mask = ~( ( 1 << nbits ) - 1 );                      \
-  mlib_s32 j;                                                   \
-                                                                \
-  c0 = src;                                                     \
-  c1 = src + 1;                                                 \
-  c2 = src + 2;                                                 \
-  c3 = src + 3;                                                 \
-                                                                \
-  switch( bits )                                                \
-  {                                                             \
-    case 1:                                                     \
-    {                                                           \
-      for( j = 0; j < length; j++ )                             \
-      {                                                         \
-        dst[ j ] = table[ ( ( *c0 & mask ) >> 4 ) |             \
-          ( ( *c1 & mask ) >> 5 ) |                             \
-          ( ( *c2 & mask ) >> 6 ) |                             \
-          ( ( *c3 & mask ) >> 7 ) ];                            \
-                                                                \
-        c0 += 4;                                                \
-        c1 += 4;                                                \
-        c2 += 4;                                                \
-        c3 += 4;                                                \
-      }                                                         \
-      break;                                                    \
-    }                                                           \
-    case 2:                                                     \
-    {                                                           \
-      for( j = 0; j < length; j++ )                             \
-      {                                                         \
-        dst[ j ] = table[ ( *c0 & mask ) |                      \
-          ( ( *c1 & mask ) >> 2 ) |                             \
-          ( ( *c2 & mask ) >> 4 ) |                             \
-          ( ( *c3 & mask ) >> 6 ) ];                            \
-                                                                \
-        c0 += 4;                                                \
-        c1 += 4;                                                \
-        c2 += 4;                                                \
-        c3 += 4;                                                \
-          }                                                     \
-      break;                                                    \
-    }                                                           \
-    case 3:                                                     \
-    {                                                           \
-      for( j = 0; j < length; j++ )                             \
-      {                                                         \
-        dst[ j ] = table[ ( ( *c0 & mask ) << 4 ) |             \
-          ( ( *c1 & mask ) << 1 ) |                             \
-          ( ( *c2 & mask ) >> 2 ) |                             \
-          ( ( *c3 & mask ) >> 5 ) ];                            \
-                                                                \
-        c0 += 4;                                                \
-        c1 += 4;                                                \
-        c2 += 4;                                                \
-        c3 += 4;                                                \
-      }                                                         \
-      break;                                                    \
-    }                                                           \
-    case 4:                                                     \
-    {                                                           \
-      for( j = 0; j < length; j++ )                             \
-      {                                                         \
-        dst[ j ] = table[ ( ( *c0 & mask ) << 8 ) |             \
-          ( ( *c1 & mask ) << 4 ) |                             \
-          ( *c2 & mask ) |                                      \
-          ( ( *c3 & mask ) >> 4 ) ];                            \
-                                                                \
-        c0 += 4;                                                \
-        c1 += 4;                                                \
-        c2 += 4;                                                \
-        c3 += 4;                                                \
-      }                                                         \
-      break;                                                    \
-    }                                                           \
-    case 5:                                                     \
-    case 6:                                                     \
-    {                                                           \
-      mlib_s32 bits3 = bits * 4 - 8;                            \
-      mlib_s32 bits2 = bits3 - bits;                            \
-      mlib_s32 bits1 = bits2 - bits;                            \
-      mlib_s32 bits0 = 8 - bits;                                \
-                                                                \
-      for( j = 0; j < length; j++ )                             \
-      {                                                         \
-        dst[ j ] = table[ ( ( *c0 & mask ) << bits3 ) |         \
-          ( ( *c1 & mask ) << bits2 ) |                         \
-          ( ( *c2 & mask ) << bits1 ) |                         \
-          ( ( *c3 & mask ) >> bits0 ) ];                        \
-                                                                \
-        c0 += 4;                                                \
-        c1 += 4;                                                \
-        c2 += 4;                                                \
-        c3 += 4;                                                \
-      }                                                         \
-      break;                                                    \
-    }                                                           \
-    case 7:                                                     \
-    {                                                           \
-      for( j = 0; j < length; j++ )                             \
-      {                                                         \
-        dst[ j ] = table[ ( ( *c0 & mask ) << 20 ) |            \
-          ( ( *c1 & mask ) << 13 ) |                            \
-          ( ( *c2 & mask ) << 6 ) |                             \
-          ( ( *c3 & mask ) >> 1 ) ];                            \
-                                                                \
-        c0 += 4;                                                \
-        c1 += 4;                                                \
-        c2 += 4;                                                \
-        c3 += 4;                                                \
-      }                                                         \
-      break;                                                    \
-    }                                                           \
-    case 8: /* will never be called */                          \
-    {                                                           \
-      for( j = 0; j < length; j++ )                             \
-      {                                                         \
-        dst[ j ] = table[ ( ( *c0 & mask ) << 24 ) |            \
-          ( ( *c1 & mask ) << 16 ) |                            \
-          ( ( *c2 & mask ) << 8 ) |                             \
-          ( *c3 & mask ) ];                                     \
-                                                                \
-        c0 += 4;                                                \
-        c1 += 4;                                                \
-        c2 += 4;                                                \
-        c3 += 4;                                                \
-      }                                                         \
-      break;                                                    \
-    }                                                           \
-  }                                                             \
-}
-
-/***************************************************************/
-#define COLOR_CUBE_S16_3_SEARCH( TABLE_TYPE, SHIFT, STEP )                 \
-{                                                                          \
-  const mlib_s16 *c0, *c1, *c2;                                            \
-  mlib_s32 bits = s->bits;                                                 \
-  mlib_s32 nbits = 16 - bits;                                              \
-  mlib_s32 mask = ~( ( 1 << nbits ) - 1 );                                 \
-  TABLE_TYPE *table = s->table;                                            \
-  mlib_s32 j;                                                              \
-                                                                           \
-  c0 = src + SHIFT;                                                        \
-  c1 = src + 1 + SHIFT;                                                    \
-  c2 = src + 2 + SHIFT;                                                    \
-                                                                           \
-  switch( bits )                                                           \
-  {                                                                        \
-    case 1:                                                                \
-    case 2:                                                                \
-    case 3:                                                                \
-    case 4:                                                                \
-    case 5:                                                                \
-    {                                                                      \
-      mlib_s32 bits0 = 16 - bits;                                          \
-      mlib_s32 bits1 = bits0 - bits;                                       \
-      mlib_s32 bits2 = bits1 - bits;                                       \
-                                                                           \
-      for( j = 0; j < length; j++ )                                        \
-      {                                                                    \
-        dst[ j ] = table[ ( ( ( *c0 - MLIB_S16_MIN ) & mask ) >> bits2 ) | \
-          ( ( ( *c1 - MLIB_S16_MIN ) & mask ) >> bits1 ) |                 \
-          ( ( ( *c2 - MLIB_S16_MIN ) & mask ) >> bits0 ) ];                \
-                                                                           \
-        c0 += STEP;                                                        \
-        c1 += STEP;                                                        \
-        c2 += STEP;                                                        \
-      }                                                                    \
-      break;                                                               \
-    }                                                                      \
-    case 6:                                                                \
-    case 7:                                                                \
-    {                                                                      \
-      mlib_s32 bits0 = 16 - bits;                                          \
-      mlib_s32 bits1 = bits0 - bits;                                       \
-      mlib_s32 bits2 = bits * 3 - 16;                                      \
-                                                                           \
-      for( j = 0; j < length; j++ )                                        \
-      {                                                                    \
-        dst[ j ] = table[ ( ( ( *c0 - MLIB_S16_MIN ) & mask ) << bits2 ) | \
-          ( ( ( *c1 - MLIB_S16_MIN ) & mask ) >> bits1 ) |                 \
-          ( ( ( *c2 - MLIB_S16_MIN ) & mask ) >> bits0 ) ];                \
-                                                                           \
-        c0 += STEP;                                                        \
-        c1 += STEP;                                                        \
-        c2 += STEP;                                                        \
-      }                                                                    \
-      break;                                                               \
-    }                                                                      \
-    case 8:                                                                \
-    {                                                                      \
-      for( j = 0; j < length; j++ )                                        \
-      {                                                                    \
-        dst[ j ] = table[ ( ( ( *c0 - MLIB_S16_MIN ) & mask ) << 8 ) |     \
-          ( ( *c1 - MLIB_S16_MIN ) & mask ) |                              \
-          ( ( ( *c2 - MLIB_S16_MIN ) & mask ) >> 8 ) ];                    \
-                                                                           \
-        c0 += STEP;                                                        \
-        c1 += STEP;                                                        \
-        c2 += STEP;                                                        \
-      }                                                                    \
-      break;                                                               \
-    }                                                                      \
-    case 9:                                                                \
-    case 10:                                                               \
-    {                                                                      \
-      mlib_s32 bits0 = 16 - bits;                                          \
-      mlib_s32 bits1 = 2 * bits - 16;                                      \
-      mlib_s32 bits2 = bits1 + bits;                                       \
-                                                                           \
-      for( j = 0; j < length; j++ )                                        \
-      {                                                                    \
-        dst[ j ] = table[ ( ( ( *c0 - MLIB_S16_MIN ) & mask ) << bits2 ) | \
-          ( ( ( *c1 - MLIB_S16_MIN ) & mask ) << bits1 ) |                 \
-          ( ( ( *c2 - MLIB_S16_MIN ) & mask ) >> bits0 ) ];                \
-                                                                           \
-        c0 += STEP;                                                        \
-        c1 += STEP;                                                        \
-        c2 += STEP;                                                        \
-      }                                                                    \
-      break;                                                               \
-    }                                                                      \
-    /* Other cases may not be considered as the table size will be more    \
-       than 2^32 */                                                        \
-  }                                                                        \
-}
-
-/***************************************************************/
-#define COLOR_CUBE_S16_4_SEARCH( TABLE_TYPE )                              \
-{                                                                          \
-  const mlib_s16 *c0, *c1, *c2, *c3;                                       \
-  TABLE_TYPE *table = s->table;                                            \
-  mlib_s32 bits = s->bits;                                                 \
-  mlib_s32 nbits = 16 - bits;                                              \
-  mlib_s32 mask = ~( ( 1 << nbits ) - 1 );                                 \
-  mlib_s32 j;                                                              \
-                                                                           \
-  c0 = src;                                                                \
-  c1 = src + 1;                                                            \
-  c2 = src + 2;                                                            \
-  c3 = src + 3;                                                            \
-                                                                           \
-  switch( bits )                                                           \
-  {                                                                        \
-    case 1:                                                                \
-    case 2:                                                                \
-    case 3:                                                                \
-    {                                                                      \
-      mlib_s32 bits0 = 16 - bits;                                          \
-      mlib_s32 bits1 = bits0 - bits;                                       \
-      mlib_s32 bits2 = bits1 - bits;                                       \
-      mlib_s32 bits3 = bits2 - bits;                                       \
-                                                                           \
-      for( j = 0; j < length; j++ )                                        \
-      {                                                                    \
-        dst[ j ] = table[ ( ( ( *c0 - MLIB_S16_MIN ) & mask ) >> bits3 ) | \
-          ( ( ( *c1 - MLIB_S16_MIN ) & mask ) >> bits2 ) |                 \
-          ( ( ( *c2 - MLIB_S16_MIN ) & mask ) >> bits1 ) |                 \
-          ( ( ( *c3 - MLIB_S16_MIN ) & mask ) >> bits0 ) ];                \
-                                                                           \
-        c0 += 4;                                                           \
-        c1 += 4;                                                           \
-        c2 += 4;                                                           \
-        c3 += 4;                                                           \
-      }                                                                    \
-      break;                                                               \
-    }                                                                      \
-    case 4:                                                                \
-    {                                                                      \
-      for( j = 0; j < length; j++ )                                        \
-      {                                                                    \
-        dst[ j ] = table[ ( ( *c0 - MLIB_S16_MIN ) & mask ) |              \
-          ( ( ( *c1 - MLIB_S16_MIN ) & mask ) >> 4 ) |                     \
-          ( ( ( *c2 - MLIB_S16_MIN ) & mask ) >> 8 ) |                     \
-          ( ( ( *c3 - MLIB_S16_MIN ) & mask ) >> 12 ) ];                   \
-                                                                           \
-        c0 += 4;                                                           \
-        c1 += 4;                                                           \
-        c2 += 4;                                                           \
-        c3 += 4;                                                           \
-      }                                                                    \
-      break;                                                               \
-    }                                                                      \
-    case 5:                                                                \
-    {                                                                      \
-      for( j = 0; j < length; j++ )                                        \
-      {                                                                    \
-        dst[ j ] = table[ ( ( ( *c0 - MLIB_S16_MIN ) & mask ) << 4 ) |     \
-          ( ( ( *c1 - MLIB_S16_MIN ) & mask ) >> 1 ) |                     \
-          ( ( ( *c2 - MLIB_S16_MIN ) & mask ) >> 6 ) |                     \
-          ( ( ( *c3 - MLIB_S16_MIN ) & mask ) >> 11 ) ];                   \
-                                                                           \
-        c0 += 4;                                                           \
-        c1 += 4;                                                           \
-        c2 += 4;                                                           \
-        c3 += 4;                                                           \
-      }                                                                    \
-      break;                                                               \
-    }                                                                      \
-    case 6:                                                                \
-    case 7:                                                                \
-    {                                                                      \
-      mlib_s32 bits0 = 16 - bits;                                          \
-      mlib_s32 bits1 = bits0 - bits;                                       \
-      mlib_s32 bits3 = bits * 4 - 16;                                      \
-      mlib_s32 bits2 = bits3 - bits;                                       \
-                                                                           \
-      for( j = 0; j < length; j++ )                                        \
-      {                                                                    \
-        dst[ j ] = table[ ( ( ( *c0 - MLIB_S16_MIN ) & mask ) << bits3 ) | \
-          ( ( ( *c1 - MLIB_S16_MIN ) & mask ) << bits2 ) |                 \
-          ( ( ( *c2 - MLIB_S16_MIN ) & mask ) >> bits1 ) |                 \
-          ( ( ( *c3 - MLIB_S16_MIN ) & mask ) >> bits0 ) ];                \
-                                                                           \
-        c0 += 4;                                                           \
-        c1 += 4;                                                           \
-        c2 += 4;                                                           \
-        c3 += 4;                                                           \
-      }                                                                    \
-      break;                                                               \
-    }                                                                      \
-    case 8:                                                                \
-    {                                                                      \
-      for( j = 0; j < length; j++ )                                        \
-      {                                                                    \
-        dst[ j ] = table[ ( ( ( *c0 - MLIB_S16_MIN ) & mask ) << 16 ) |    \
-          ( ( ( *c1 - MLIB_S16_MIN ) & mask ) << 8 ) |                     \
-          ( ( *c2 - MLIB_S16_MIN ) & mask ) |                              \
-          ( ( ( *c3 - MLIB_S16_MIN ) & mask ) >> 8 ) ];                    \
-                                                                           \
-        c0 += 4;                                                           \
-        c1 += 4;                                                           \
-        c2 += 4;                                                           \
-        c3 += 4;                                                           \
-      }                                                                    \
-      break;                                                               \
-    }                                                                      \
-    /* Other cases may not be considered as the table size will be more    \
-       than 2^32 */                                                        \
-  }                                                                        \
-}
-
-/***************************************************************/
-#define BINARY_TREE_SEARCH_RIGHT( POSITION, COLOR_MAX, SHIFT )  \
-{                                                               \
-  if( ( distance >= ( ( ( position[ POSITION ] + current_size - \
-    c[ POSITION ] ) * ( position[ POSITION ] + current_size -   \
-    c[ POSITION ] ) ) >> SHIFT ) ) &&                           \
-    ( position[ POSITION ] + current_size != COLOR_MAX ) )      \
-    continue_up = 1;                                            \
-}
-
-/***************************************************************/
-#define BINARY_TREE_EXPLORE_RIGHT_3( POSITION, COLOR_MAX, IMAGE_TYPE,    \
-  FIRST_NEIBOUR, SECOND_NEIBOUR, SUBSTRACTION, SHIFT )                   \
-{                                                                        \
-  if( distance >= ( ( ( position[ POSITION ] + current_size -            \
-    c[ POSITION ] ) * ( position[ POSITION ] +                           \
-      current_size - c[ POSITION ] ) ) >> SHIFT ) )                      \
-  {                                                                      \
-    if( distance < ( ( ( COLOR_MAX - c[ POSITION ] ) *                   \
-      ( COLOR_MAX - c[ POSITION ] ) ) >> SHIFT ) )                       \
-    {                                                                    \
-      if( distance < ( ( ( position[ POSITION ] +                        \
-        current_size * 2 - c[ POSITION ] ) *                             \
-        ( position[ POSITION ] + current_size * 2 -                      \
-          c[ POSITION ] ) ) >> SHIFT ) )                                 \
-      {                                                                  \
-        /* Check only a part of quadrant */                              \
-        mlib_s32 qq = q ^ ( 1 << POSITION );                             \
-                                                                         \
-        check_neibours[ FIRST_NEIBOUR ] += 1;                            \
-        check_neibours[ SECOND_NEIBOUR ] += 1;                           \
-        check_corner += 1;                                               \
-        if( node->tag & ( 1 << qq ) )                                    \
-        {                                                                \
-          /* Here is another color cell.                                 \
-             Check the distance */                                       \
-          mlib_s32 new_found_color =                                     \
-            node->contents.index[ qq ];                                  \
-          mlib_u32 newdistance = FIND_DISTANCE_3( c[ 0 ],                \
-            p[ 0 ][ new_found_color ] - SUBSTRACTION, c[ 1 ],            \
-            p[ 1 ][ new_found_color ] - SUBSTRACTION, c[ 2 ],            \
-            p[ 2 ][ new_found_color ] - SUBSTRACTION, SHIFT );           \
-                                                                         \
-          if( newdistance < distance )                                   \
-          {                                                              \
-            found_color = new_found_color;                               \
-            distance = newdistance;                                      \
-          }                                                              \
-        }                                                                \
-        else if( node->contents.quadrants[ qq ] )                        \
-          /* Only a part of quadrant needs checking */                   \
-          distance =                                                     \
-            mlib_search_quadrant_part_to_left_##IMAGE_TYPE##_3(          \
-              node->contents.quadrants[ qq ],                            \
-              distance, &found_color, c, p,                              \
-              position[ POSITION ] + current_size, pass - 1, POSITION ); \
-      }                                                                  \
-      else /* Check whole quadrant */                                    \
-      {                                                                  \
-        mlib_s32 qq = q ^ ( 1 << POSITION );                             \
-                                                                         \
-        check_neibours[ FIRST_NEIBOUR ] += 2;                            \
-        check_neibours[ SECOND_NEIBOUR ] += 2;                           \
-        check_corner += 2;                                               \
-        continue_up = 1;                                                 \
-        if( node->tag & ( 1 << qq ) )                                    \
-        {                                                                \
-          /* Here is another color cell.                                 \
-             Check the distance */                                       \
-          mlib_s32 new_found_color =                                     \
-            node->contents.index[ qq ];                                  \
-          mlib_u32 newdistance = FIND_DISTANCE_3( c[ 0 ],                \
-            p[ 0 ][ new_found_color ] - SUBSTRACTION, c[ 1 ],            \
-            p[ 1 ][ new_found_color ] - SUBSTRACTION, c[ 2 ],            \
-            p[ 2 ][ new_found_color ] - SUBSTRACTION, SHIFT );           \
-                                                                         \
-          if( newdistance < distance )                                   \
-          {                                                              \
-            found_color = new_found_color;                               \
-            distance = newdistance;                                      \
-          }                                                              \
-        }                                                                \
-        else if( node->contents.quadrants[ qq ] )                        \
-          /* Here is a full node. Just explore it */                     \
-          distance = mlib_search_quadrant_##IMAGE_TYPE##_3(              \
-            node->contents.quadrants[ qq ],                              \
-            distance, &found_color, c[ 0 ], c[ 1 ], c[ 2 ], p );         \
-      }                                                                  \
-    }                                                                    \
-    else /* Cell is on the edge of the space */                          \
-    {                                                                    \
-      if( position[ POSITION ] + current_size * 2 ==                     \
-        COLOR_MAX )                                                      \
-      {                                                                  \
-        /* Check only a part of quadrant */                              \
-        mlib_s32 qq = q ^ ( 1 << POSITION );                             \
-                                                                         \
-        check_neibours[ FIRST_NEIBOUR ] += 1;                            \
-        check_neibours[ SECOND_NEIBOUR ] += 1;                           \
-        check_corner += 1;                                               \
-        if( node->tag & ( 1 << qq ) )                                    \
-        {                                                                \
-          /* Here is another color cell.                                 \
-             Check the distance */                                       \
-          mlib_s32 new_found_color =                                     \
-            node->contents.index[ qq ];                                  \
-          mlib_u32 newdistance = FIND_DISTANCE_3( c[ 0 ],                \
-            p[ 0 ][ new_found_color ] - SUBSTRACTION, c[ 1 ],            \
-            p[ 1 ][ new_found_color ] - SUBSTRACTION, c[ 2 ],            \
-            p[ 2 ][ new_found_color ] - SUBSTRACTION, SHIFT );           \
-                                                                         \
-          if( newdistance < distance )                                   \
-          {                                                              \
-            found_color = new_found_color;                               \
-            distance = newdistance;                                      \
-          }                                                              \
-        }                                                                \
-        else if( node->contents.quadrants[ qq ] )                        \
-          /* Only a part of quadrant needs checking */                   \
-          distance =                                                     \
-            mlib_search_quadrant_part_to_left_##IMAGE_TYPE##_3(          \
-              node->contents.quadrants[ qq ],                            \
-              distance, &found_color, c, p,                              \
-              position[ POSITION ] + current_size,                       \
-              pass - 1, POSITION );                                      \
-      }                                                                  \
-      else /* Check whole quadrant */                                    \
-      {                                                                  \
-        mlib_s32 qq = q ^ ( 1 << POSITION );                             \
-                                                                         \
-        check_neibours[ FIRST_NEIBOUR ] += 2;                            \
-        check_neibours[ SECOND_NEIBOUR ] += 2;                           \
-        check_corner += 2;                                               \
-        continue_up = 1;                                                 \
-        if( node->tag & ( 1 << qq ) )                                    \
-        {                                                                \
-          /* Here is another color cell.                                 \
-             Check the distance */                                       \
-          mlib_s32 new_found_color =                                     \
-            node->contents.index[ qq ];                                  \
-          mlib_u32 newdistance = FIND_DISTANCE_3( c[ 0 ],                \
-            p[ 0 ][ new_found_color ] - SUBSTRACTION, c[ 1 ],            \
-            p[ 1 ][ new_found_color ] - SUBSTRACTION, c[ 2 ],            \
-            p[ 2 ][ new_found_color ] - SUBSTRACTION, SHIFT );           \
-                                                                         \
-          if( newdistance < distance )                                   \
-          {                                                              \
-            found_color = new_found_color;                               \
-            distance = newdistance;                                      \
-          }                                                              \
-        }                                                                \
-        else if( node->contents.quadrants[ qq ] )                        \
-          /* Here is a full node. Just explore it */                     \
-          distance = mlib_search_quadrant_##IMAGE_TYPE##_3(              \
-            node->contents.quadrants[ qq ],                              \
-            distance, &found_color, c[ 0 ], c[ 1 ], c[ 2 ], p );         \
-      }                                                                  \
-    }                                                                    \
-  }                                                                      \
-}
-
-/***************************************************************/
-#define BINARY_TREE_EXPLORE_RIGHT_4( POSITION, COLOR_MAX, IMAGE_TYPE,    \
-  FIRST_NEIBOUR, SECOND_NEIBOUR, THIRD_NEIBOUR, SUBSTRACTION, SHIFT )    \
-{                                                                        \
-  if( distance >= ( ( ( position[ POSITION ] + current_size -            \
-    c[ POSITION ] ) * ( position[ POSITION ] +                           \
-      current_size - c[ POSITION ] ) ) >> SHIFT ) )                      \
-  {                                                                      \
-    if( distance < ( ( ( COLOR_MAX - c[ POSITION ] ) *                   \
-      ( COLOR_MAX - c[ POSITION ] ) ) >> SHIFT ) )                       \
-    {                                                                    \
-      if( distance < ( ( ( position[ POSITION ] +                        \
-        current_size * 2 - c[ POSITION ] ) *                             \
-        ( position[ POSITION ] + current_size * 2 -                      \
-          c[ POSITION ] ) ) >> SHIFT ) )                                 \
-      {                                                                  \
-        /* Check only a part of quadrant */                              \
-        mlib_s32 qq = q ^ ( 1 << POSITION );                             \
-                                                                         \
-        check_neibours[ FIRST_NEIBOUR ] += 1;                            \
-        check_neibours[ SECOND_NEIBOUR ] += 1;                           \
-        check_neibours[ THIRD_NEIBOUR ] += 1;                            \
-        if( node->tag & ( 1 << qq ) )                                    \
-        {                                                                \
-          /* Here is another color cell.                                 \
-             Check the distance */                                       \
-          mlib_s32 new_found_color =                                     \
-            node->contents.index[ qq ];                                  \
-          mlib_u32 newdistance = FIND_DISTANCE_4( c[ 0 ],                \
-            p[ 0 ][ new_found_color ] - SUBSTRACTION, c[ 1 ],            \
-            p[ 1 ][ new_found_color ] - SUBSTRACTION, c[ 2 ],            \
-            p[ 2 ][ new_found_color ] - SUBSTRACTION, c[ 3 ],            \
-            p[ 3 ][ new_found_color ] - SUBSTRACTION, SHIFT );           \
-                                                                         \
-          if( newdistance < distance )                                   \
-          {                                                              \
-            found_color = new_found_color;                               \
-            distance = newdistance;                                      \
-          }                                                              \
-        }                                                                \
-        else if( node->contents.quadrants[ qq ] )                        \
-          /* Only a part of quadrant needs checking */                   \
-          distance =                                                     \
-            mlib_search_quadrant_part_to_left_##IMAGE_TYPE##_4(          \
-              node->contents.quadrants[ qq ],                            \
-              distance, &found_color, c, p,                              \
-              position[ POSITION ] + current_size, pass - 1, POSITION ); \
-      }                                                                  \
-      else /* Check whole quadrant */                                    \
-      {                                                                  \
-        mlib_s32 qq = q ^ ( 1 << POSITION );                             \
-                                                                         \
-        check_neibours[ FIRST_NEIBOUR ] += 2;                            \
-        check_neibours[ SECOND_NEIBOUR ] += 2;                           \
-        check_neibours[ THIRD_NEIBOUR ] += 2;                            \
-        continue_up = 1;                                                 \
-        if( node->tag & ( 1 << qq ) )                                    \
-        {                                                                \
-          /* Here is another color cell.                                 \
-             Check the distance */                                       \
-          mlib_s32 new_found_color =                                     \
-            node->contents.index[ qq ];                                  \
-          mlib_u32 newdistance = FIND_DISTANCE_4( c[ 0 ],                \
-            p[ 0 ][ new_found_color ] - SUBSTRACTION, c[ 1 ],            \
-            p[ 1 ][ new_found_color ] - SUBSTRACTION, c[ 2 ],            \
-            p[ 2 ][ new_found_color ] - SUBSTRACTION, c[ 3 ],            \
-            p[ 3 ][ new_found_color ] - SUBSTRACTION, SHIFT );           \
-                                                                         \
-          if( newdistance < distance )                                   \
-          {                                                              \
-            found_color = new_found_color;                               \
-            distance = newdistance;                                      \
-          }                                                              \
-        }                                                                \
-        else if( node->contents.quadrants[ qq ] )                        \
-          /* Here is a full node. Just explore it */                     \
-          distance = mlib_search_quadrant_##IMAGE_TYPE##_4(              \
-            node->contents.quadrants[ qq ],                              \
-            distance, &found_color, c[ 0 ], c[ 1 ], c[ 2 ], c[ 3 ], p ); \
-      }                                                                  \
-    }                                                                    \
-    else /* Cell is on the edge of the space */                          \
-    {                                                                    \
-      if( position[ POSITION ] + current_size * 2 ==                     \
-        COLOR_MAX )                                                      \
-      {                                                                  \
-        /* Check only a part of quadrant */                              \
-        mlib_s32 qq = q ^ ( 1 << POSITION );                             \
-                                                                         \
-        check_neibours[ FIRST_NEIBOUR ] += 1;                            \
-        check_neibours[ SECOND_NEIBOUR ] += 1;                           \
-        check_neibours[ THIRD_NEIBOUR ] += 1;                            \
-        if( node->tag & ( 1 << qq ) )                                    \
-        {                                                                \
-          /* Here is another color cell.                                 \
-             Check the distance */                                       \
-          mlib_s32 new_found_color =                                     \
-            node->contents.index[ qq ];                                  \
-          mlib_u32 newdistance = FIND_DISTANCE_4( c[ 0 ],                \
-            p[ 0 ][ new_found_color ] - SUBSTRACTION, c[ 1 ],            \
-            p[ 1 ][ new_found_color ] - SUBSTRACTION, c[ 2 ],            \
-            p[ 2 ][ new_found_color ] - SUBSTRACTION, c[ 3 ],            \
-            p[ 3 ][ new_found_color ] - SUBSTRACTION, SHIFT );           \
-                                                                         \
-          if( newdistance < distance )                                   \
-          {                                                              \
-            found_color = new_found_color;                               \
-            distance = newdistance;                                      \
-          }                                                              \
-        }                                                                \
-        else if( node->contents.quadrants[ qq ] )                        \
-          /* Only a part of quadrant needs checking */                   \
-          distance =                                                     \
-            mlib_search_quadrant_part_to_left_##IMAGE_TYPE##_4(          \
-              node->contents.quadrants[ qq ],                            \
-              distance, &found_color, c, p,                              \
-              position[ POSITION ] + current_size,                       \
-              pass - 1, POSITION );                                      \
-      }                                                                  \
-      else /* Check whole quadrant */                                    \
-      {                                                                  \
-        mlib_s32 qq = q ^ ( 1 << POSITION );                             \
-                                                                         \
-        check_neibours[ FIRST_NEIBOUR ] += 2;                            \
-        check_neibours[ SECOND_NEIBOUR ] += 2;                           \
-        check_neibours[ THIRD_NEIBOUR ] += 2;                            \
-        continue_up = 1;                                                 \
-        if( node->tag & ( 1 << qq ) )                                    \
-        {                                                                \
-          /* Here is another color cell.                                 \
-             Check the distance */                                       \
-          mlib_s32 new_found_color =                                     \
-            node->contents.index[ qq ];                                  \
-          mlib_u32 newdistance = FIND_DISTANCE_4( c[ 0 ],                \
-            p[ 0 ][ new_found_color ] - SUBSTRACTION, c[ 1 ],            \
-            p[ 1 ][ new_found_color ] - SUBSTRACTION, c[ 2 ],            \
-            p[ 2 ][ new_found_color ] - SUBSTRACTION, c[ 3 ],            \
-            p[ 3 ][ new_found_color ] - SUBSTRACTION, SHIFT );           \
-                                                                         \
-          if( newdistance < distance )                                   \
-          {                                                              \
-            found_color = new_found_color;                               \
-            distance = newdistance;                                      \
-          }                                                              \
-        }                                                                \
-        else if( node->contents.quadrants[ qq ] )                        \
-          /* Here is a full node. Just explore it */                     \
-          distance = mlib_search_quadrant_##IMAGE_TYPE##_4(              \
-            node->contents.quadrants[ qq ],                              \
-            distance, &found_color, c[ 0 ], c[ 1 ], c[ 2 ], c[ 3 ], p ); \
-      }                                                                  \
-    }                                                                    \
-  }                                                                      \
-}
-
-/***************************************************************/
-#define BINARY_TREE_SEARCH_LEFT( POSITION, SHIFT )                \
-{                                                                 \
-  if( ( distance > ( ( ( position[ POSITION ] - c[ POSITION ] ) * \
-    ( position[ POSITION ] - c[ POSITION ] ) ) >> SHIFT ) )  &&   \
-    position[ POSITION ] )                                        \
-    continue_up = 1;                                              \
-}
-
-/***************************************************************/
-#define BINARY_TREE_EXPLORE_LEFT_3( POSITION, IMAGE_TYPE,                \
-  FIRST_NEIBOUR, SECOND_NEIBOUR, SUBSTRACTION, SHIFT )                   \
-{                                                                        \
-  if( distance >                                                         \
-    ( ( ( c[ POSITION ] - position[ POSITION ] ) *                       \
-    ( c[ POSITION ] - position[ POSITION ] ) ) >> SHIFT ) )              \
-  {                                                                      \
-    if( distance <= ( ( c[ POSITION ] * c[ POSITION ] ) >> SHIFT ) )     \
-    {                                                                    \
-      if( distance <= ( ( ( c[ POSITION ] + current_size -               \
-        position[ POSITION ] ) *                                         \
-        ( c[ POSITION ] + current_size -                                 \
-          position[ POSITION ] ) ) >> SHIFT ) )                          \
-      {                                                                  \
-        mlib_s32 qq = q ^ ( 1 << POSITION );                             \
-                                                                         \
-        check_neibours[ FIRST_NEIBOUR ] += 1;                            \
-        check_neibours[ SECOND_NEIBOUR ] += 1;                           \
-        check_corner += 1;                                               \
-        if( node->tag & ( 1 << qq ) )                                    \
-        {                                                                \
-          /* Here is another color cell.                                 \
-             Check the distance */                                       \
-          mlib_s32 new_found_color =                                     \
-            node->contents.index[ qq ];                                  \
-          mlib_u32 newdistance = FIND_DISTANCE_3( c[ 0 ],                \
-            p[ 0 ][ new_found_color ] - SUBSTRACTION, c[ 1 ],            \
-            p[ 1 ][ new_found_color ] - SUBSTRACTION, c[ 2 ],            \
-            p[ 2 ][ new_found_color ] - SUBSTRACTION, SHIFT );           \
-                                                                         \
-          if( newdistance < distance )                                   \
-          {                                                              \
-            found_color = new_found_color;                               \
-            distance = newdistance;                                      \
-          }                                                              \
-        }                                                                \
-        else if( node->contents.quadrants[ qq ] )                        \
-          /* Only a part of quadrant needs checking */                   \
-          distance =                                                     \
-            mlib_search_quadrant_part_to_right_##IMAGE_TYPE##_3(         \
-              node->contents.quadrants[ qq ],                            \
-              distance, &found_color, c, p,                              \
-              position[ POSITION ] - current_size, pass - 1, POSITION ); \
-      }                                                                  \
-      else /* Check whole quadrant */                                    \
-      {                                                                  \
-        mlib_s32 qq = q ^ ( 1 << POSITION );                             \
-                                                                         \
-        check_neibours[ FIRST_NEIBOUR ] += 2;                            \
-        check_neibours[ SECOND_NEIBOUR ] += 2;                           \
-        check_corner += 2;                                               \
-        continue_up = 1;                                                 \
-        if( node->tag & ( 1 << qq ) )                                    \
-        {                                                                \
-          /* Here is another color cell.                                 \
-             Check the distance */                                       \
-          mlib_s32 new_found_color =                                     \
-            node->contents.index[ qq ];                                  \
-          mlib_u32 newdistance = FIND_DISTANCE_3( c[ 0 ],                \
-            p[ 0 ][ new_found_color ] - SUBSTRACTION, c[ 1 ],            \
-            p[ 1 ][ new_found_color ] - SUBSTRACTION, c[ 2 ],            \
-            p[ 2 ][ new_found_color ] - SUBSTRACTION, SHIFT );           \
-                                                                         \
-          if( newdistance < distance )                                   \
-          {                                                              \
-            found_color = new_found_color;                               \
-            distance = newdistance;                                      \
-          }                                                              \
-        }                                                                \
-        else if( node->contents.quadrants[ qq ] )                        \
-          /* Here is a full node. Just explore it */                     \
-          distance = mlib_search_quadrant_##IMAGE_TYPE##_3(              \
-            node->contents.quadrants[ qq ],                              \
-            distance, &found_color, c[ 0 ], c[ 1 ], c[ 2 ], p );         \
-      }                                                                  \
-    }                                                                    \
-    else                                                                 \
-    {                                                                    \
-      if( !( position[ POSITION ] - current_size ) )                     \
-      {                                                                  \
-        mlib_s32 qq = q ^ ( 1 << POSITION );                             \
-                                                                         \
-        check_neibours[ FIRST_NEIBOUR ] += 1;                            \
-        check_neibours[ SECOND_NEIBOUR ] += 1;                           \
-        check_corner += 1;                                               \
-        if( node->tag & ( 1 << qq ) )                                    \
-        {                                                                \
-          /* Here is another color cell.                                 \
-             Check the distance */                                       \
-          mlib_s32 new_found_color =                                     \
-            node->contents.index[ qq ];                                  \
-          mlib_u32 newdistance = FIND_DISTANCE_3( c[ 0 ],                \
-            p[ 0 ][ new_found_color ] - SUBSTRACTION, c[ 1 ],            \
-            p[ 1 ][ new_found_color ] - SUBSTRACTION, c[ 2 ],            \
-            p[ 2 ][ new_found_color ] - SUBSTRACTION, SHIFT );           \
-                                                                         \
-          if( newdistance < distance )                                   \
-          {                                                              \
-            found_color = new_found_color;                               \
-            distance = newdistance;                                      \
-          }                                                              \
-        }                                                                \
-        else if( node->contents.quadrants[ qq ] )                        \
-          /* Only a part of quadrant needs checking */                   \
-          distance =                                                     \
-            mlib_search_quadrant_part_to_right_##IMAGE_TYPE##_3(         \
-              node->contents.quadrants[ qq ],                            \
-              distance, &found_color, c, p,                              \
-              position[ POSITION ] - current_size, pass - 1, POSITION ); \
-      }                                                                  \
-      else                                                               \
-      {                                                                  \
-        mlib_s32 qq = q ^ ( 1 << POSITION );                             \
-                                                                         \
-        check_neibours[ FIRST_NEIBOUR ] += 2;                            \
-        check_neibours[ SECOND_NEIBOUR ] += 2;                           \
-        check_corner += 2;                                               \
-        continue_up = 1;                                                 \
-        if( node->tag & ( 1 << qq ) )                                    \
-        {                                                                \
-          /* Here is another color cell.                                 \
-             Check the distance */                                       \
-          mlib_s32 new_found_color =                                     \
-            node->contents.index[ qq ];                                  \
-          mlib_u32 newdistance = FIND_DISTANCE_3( c[ 0 ],                \
-            p[ 0 ][ new_found_color ] - SUBSTRACTION, c[ 1 ],            \
-            p[ 1 ][ new_found_color ] - SUBSTRACTION, c[ 2 ],            \
-            p[ 2 ][ new_found_color ] - SUBSTRACTION, SHIFT );           \
-                                                                         \
-          if( newdistance < distance )                                   \
-          {                                                              \
-            found_color = new_found_color;                               \
-            distance = newdistance;                                      \
-          }                                                              \
-        }                                                                \
-        else if( node->contents.quadrants[ qq ] )                        \
-          /* Here is a full node. Just explore it */                     \
-          distance = mlib_search_quadrant_##IMAGE_TYPE##_3(              \
-            node->contents.quadrants[ qq ],                              \
-            distance, &found_color, c[ 0 ], c[ 1 ], c[ 2 ], p );         \
-      }                                                                  \
-    }                                                                    \
-  }                                                                      \
-}
-
-/***************************************************************/
-#define BINARY_TREE_EXPLORE_LEFT_4( POSITION, IMAGE_TYPE,                \
-  FIRST_NEIBOUR, SECOND_NEIBOUR, THIRD_NEIBOUR, SUBSTRACTION, SHIFT )    \
-{                                                                        \
-  if( distance >                                                         \
-    ( ( ( c[ POSITION ] - position[ POSITION ] ) *                       \
-    ( c[ POSITION ] - position[ POSITION ] ) ) >> SHIFT ) )              \
-  {                                                                      \
-    if( distance <= ( ( c[ POSITION ] * c[ POSITION ] ) >> SHIFT ) )     \
-    {                                                                    \
-      if( distance <= ( ( ( c[ POSITION ] + current_size -               \
-        position[ POSITION ] ) *                                         \
-        ( c[ POSITION ] + current_size -                                 \
-          position[ POSITION ] ) ) >> SHIFT ) )                          \
-      {                                                                  \
-        mlib_s32 qq = q ^ ( 1 << POSITION );                             \
-                                                                         \
-        check_neibours[ FIRST_NEIBOUR ] += 1;                            \
-        check_neibours[ SECOND_NEIBOUR ] += 1;                           \
-        check_neibours[ THIRD_NEIBOUR ] += 1;                            \
-        if( node->tag & ( 1 << qq ) )                                    \
-        {                                                                \
-          /* Here is another color cell.                                 \
-             Check the distance */                                       \
-          mlib_s32 new_found_color =                                     \
-            node->contents.index[ qq ];                                  \
-          mlib_u32 newdistance = FIND_DISTANCE_4( c[ 0 ],                \
-            p[ 0 ][ new_found_color ] - SUBSTRACTION, c[ 1 ],            \
-            p[ 1 ][ new_found_color ] - SUBSTRACTION, c[ 2 ],            \
-            p[ 2 ][ new_found_color ] - SUBSTRACTION, c[ 3 ],            \
-            p[ 3 ][ new_found_color ] - SUBSTRACTION, SHIFT );           \
-                                                                         \
-          if( newdistance < distance )                                   \
-          {                                                              \
-            found_color = new_found_color;                               \
-            distance = newdistance;                                      \
-          }                                                              \
-        }                                                                \
-        else if( node->contents.quadrants[ qq ] )                        \
-          /* Only a part of quadrant needs checking */                   \
-          distance =                                                     \
-            mlib_search_quadrant_part_to_right_##IMAGE_TYPE##_4(         \
-              node->contents.quadrants[ qq ],                            \
-              distance, &found_color, c, p,                              \
-              position[ POSITION ] - current_size, pass - 1, POSITION ); \
-      }                                                                  \
-      else /* Check whole quadrant */                                    \
-      {                                                                  \
-        mlib_s32 qq = q ^ ( 1 << POSITION );                             \
-                                                                         \
-        check_neibours[ FIRST_NEIBOUR ] += 2;                            \
-        check_neibours[ SECOND_NEIBOUR ] += 2;                           \
-        check_neibours[ THIRD_NEIBOUR ] += 2;                            \
-        continue_up = 1;                                                 \
-        if( node->tag & ( 1 << qq ) )                                    \
-        {                                                                \
-          /* Here is another color cell.                                 \
-             Check the distance */                                       \
-          mlib_s32 new_found_color =                                     \
-            node->contents.index[ qq ];                                  \
-          mlib_u32 newdistance = FIND_DISTANCE_4( c[ 0 ],                \
-            p[ 0 ][ new_found_color ] - SUBSTRACTION, c[ 1 ],            \
-            p[ 1 ][ new_found_color ] - SUBSTRACTION, c[ 2 ],            \
-            p[ 2 ][ new_found_color ] - SUBSTRACTION, c[ 3 ],            \
-            p[ 3 ][ new_found_color ] - SUBSTRACTION, SHIFT );           \
-                                                                         \
-          if( newdistance < distance )                                   \
-          {                                                              \
-            found_color = new_found_color;                               \
-            distance = newdistance;                                      \
-          }                                                              \
-        }                                                                \
-        else if( node->contents.quadrants[ qq ] )                        \
-          /* Here is a full node. Just explore it */                     \
-          distance = mlib_search_quadrant_##IMAGE_TYPE##_4(              \
-            node->contents.quadrants[ qq ],                              \
-            distance, &found_color, c[ 0 ], c[ 1 ], c[ 2 ], c[ 3 ], p ); \
-      }                                                                  \
-    }                                                                    \
-    else                                                                 \
-    {                                                                    \
-      if( !( position[ POSITION ] - current_size ) )                     \
-      {                                                                  \
-        mlib_s32 qq = q ^ ( 1 << POSITION );                             \
-                                                                         \
-        check_neibours[ FIRST_NEIBOUR ] += 1;                            \
-        check_neibours[ SECOND_NEIBOUR ] += 1;                           \
-        check_neibours[ THIRD_NEIBOUR ] += 1;                            \
-        if( node->tag & ( 1 << qq ) )                                    \
-        {                                                                \
-          /* Here is another color cell.                                 \
-             Check the distance */                                       \
-          mlib_s32 new_found_color =                                     \
-            node->contents.index[ qq ];                                  \
-          mlib_u32 newdistance = FIND_DISTANCE_4( c[ 0 ],                \
-            p[ 0 ][ new_found_color ] - SUBSTRACTION, c[ 1 ],            \
-            p[ 1 ][ new_found_color ] - SUBSTRACTION, c[ 2 ],            \
-            p[ 2 ][ new_found_color ] - SUBSTRACTION, c[ 3 ],            \
-            p[ 3 ][ new_found_color ] - SUBSTRACTION, SHIFT );           \
-                                                                         \
-          if( newdistance < distance )                                   \
-          {                                                              \
-            found_color = new_found_color;                               \
-            distance = newdistance;                                      \
-          }                                                              \
-        }                                                                \
-        else if( node->contents.quadrants[ qq ] )                        \
-          /* Only a part of quadrant needs checking */                   \
-          distance =                                                     \
-            mlib_search_quadrant_part_to_right_##IMAGE_TYPE##_4(         \
-              node->contents.quadrants[ qq ],                            \
-              distance, &found_color, c, p,                              \
-              position[ POSITION ] - current_size, pass - 1, POSITION ); \
-      }                                                                  \
-      else                                                               \
-      {                                                                  \
-        mlib_s32 qq = q ^ ( 1 << POSITION );                             \
-                                                                         \
-        check_neibours[ FIRST_NEIBOUR ] += 2;                            \
-        check_neibours[ SECOND_NEIBOUR ] += 2;                           \
-        check_neibours[ THIRD_NEIBOUR ] += 2;                            \
-        continue_up = 1;                                                 \
-        if( node->tag & ( 1 << qq ) )                                    \
-        {                                                                \
-          /* Here is another color cell.                                 \
-             Check the distance */                                       \
-          mlib_s32 new_found_color =                                     \
-            node->contents.index[ qq ];                                  \
-          mlib_u32 newdistance = FIND_DISTANCE_4( c[ 0 ],                \
-            p[ 0 ][ new_found_color ] - SUBSTRACTION, c[ 1 ],            \
-            p[ 1 ][ new_found_color ] - SUBSTRACTION, c[ 2 ],            \
-            p[ 2 ][ new_found_color ] - SUBSTRACTION, c[ 3 ],            \
-            p[ 3 ][ new_found_color ] - SUBSTRACTION, SHIFT );           \
-                                                                         \
-          if( newdistance < distance )                                   \
-          {                                                              \
-            found_color = new_found_color;                               \
-            distance = newdistance;                                      \
-          }                                                              \
-        }                                                                \
-        else if( node->contents.quadrants[ qq ] )                        \
-          /* Here is a full node. Just explore it */                     \
-          distance = mlib_search_quadrant_##IMAGE_TYPE##_4(              \
-            node->contents.quadrants[ qq ],                              \
-            distance, &found_color, c[ 0 ], c[ 1 ], c[ 2 ], c[ 3 ], p ); \
-      }                                                                  \
-    }                                                                    \
-  }                                                                      \
-}
-
-/***************************************************************/
-#define CHECK_QUADRANT_U8_3( qq )                               \
-{                                                               \
-  if( node->tag & ( 1 << qq ) )                                 \
-  {                                                             \
-    /* Here is another color cell. Check the distance */        \
-    mlib_s32 new_found_color = node->contents.index[ qq ];      \
-    mlib_u32 newdistance = FIND_DISTANCE_3( c[ 0 ],             \
-      p[ 0 ][ new_found_color ], c[ 1 ],                        \
-      p[ 1 ][ new_found_color ], c[ 2 ],                        \
-      p[ 2 ][ new_found_color ], 0 );                           \
-                                                                \
-    if( newdistance < distance )                                \
-    {                                                           \
-      found_color = new_found_color;                            \
-      distance = newdistance;                                   \
-    }                                                           \
-  }                                                             \
-  else if( node->contents.quadrants[ qq ] )                     \
-    /* Here is a full node. Just explore it all */              \
-    distance = mlib_search_quadrant_U8_3(                       \
-      node->contents.quadrants[ qq ], distance, &found_color,   \
-      c[ 0 ], c[ 1 ], c[ 2 ], p );                              \
-/* Else there is just an empty cell */                          \
-}
-
-/***************************************************************/
-#define CHECK_QUADRANT_S16_3( qq )                              \
-{                                                               \
-  if( node->tag & ( 1 << qq ) )                                 \
-  {                                                             \
-    /* Here is another color cell. Check the distance */        \
-    mlib_s32 new_found_color = node->contents.index[ qq ];      \
-    mlib_u32 palc0, palc1, palc2, newdistance;                  \
-                                                                \
-    palc0 = p[ 0 ][ new_found_color ] - MLIB_S16_MIN;           \
-    palc1 = p[ 1 ][ new_found_color ] - MLIB_S16_MIN;           \
-    palc2 = p[ 2 ][ new_found_color ] - MLIB_S16_MIN;           \
-                                                                \
-    newdistance = FIND_DISTANCE_3( c[ 0 ], palc0,               \
-      c[ 1 ], palc1,                                            \
-      c[ 2 ], palc2, 2 );                                       \
-                                                                \
-    if( newdistance < distance )                                \
-    {                                                           \
-      found_color = new_found_color;                            \
-      distance = newdistance;                                   \
-    }                                                           \
-  }                                                             \
-  else if( node->contents.quadrants[ qq ] )                     \
-    /* Here is a full node. Just explore it all */              \
-    distance = mlib_search_quadrant_S16_3(                      \
-      node->contents.quadrants[ qq ], distance, &found_color,   \
-      c[ 0 ], c[ 1 ], c[ 2 ], p );                              \
-/* Else there is just an empty cell */                          \
-}
-
-/***************************************************************/
-#define BINARY_TREE_SEARCH_3( SOURCE_IMAGE, POINTER_TYPE, BITS,              \
-  COLOR_MAX, SUBTRACTION, POINTER_SHIFT, STEP, SHIFT )                       \
-{                                                                            \
-  const POINTER_TYPE *channels[ 3 ], *p[ 3 ];                                \
-  mlib_u32 c[ 3 ];                                                           \
-  mlib_s32 j;                                                                \
-                                                                             \
-  p[ 0 ] = s->lut[ 0 ];                                                      \
-  p[ 1 ] = s->lut[ 1 ];                                                      \
-  p[ 2 ] = s->lut[ 2 ];                                                      \
-  channels[ 0 ] = src + POINTER_SHIFT;                                       \
-  channels[ 1 ] = src + 1 + POINTER_SHIFT;                                   \
-  channels[ 2 ] = src + 2 + POINTER_SHIFT;                                   \
-                                                                             \
-  for( j = 0; j < length; j++ )                                              \
-  {                                                                          \
-    mlib_s32 pass = BITS - 1;                                                \
-    mlib_u32 position[ 3 ] = { 0, 0, 0 };                                    \
-    mlib_s32 we_found_it = 0;                                                \
-    struct lut_node_3 *node = s->table;                                      \
-    /* Stack pointer pointers to the first free element of stack. */         \
-    /* The node we are in is in the `node' */                                \
-    struct                                                                   \
-    {                                                                        \
-      struct lut_node_3 *node;                                               \
-      mlib_s32 q;                                                            \
-    } stack[ BITS ];                                                         \
-    mlib_s32 stack_pointer = 0;                                              \
-                                                                             \
-    c[ 0 ] = *channels[ 0 ] - SUBTRACTION;                                   \
-    c[ 1 ] = *channels[ 1 ] - SUBTRACTION;                                   \
-    c[ 2 ] = *channels[ 2 ] - SUBTRACTION;                                   \
-                                                                             \
-    do                                                                       \
-    {                                                                        \
-      mlib_s32 q;                                                            \
-      mlib_u32 current_size = 1 << pass;                                     \
-                                                                             \
-      q = ( ( c[ 0 ] >> pass ) & 1 ) |                                       \
-        ( ( ( c[ 1 ] << 1 ) >> pass ) & 2 ) |                                \
-        ( ( ( c[ 2 ] << 2 ) >> pass ) & 4 );                                 \
-                                                                             \
-      position[ 0 ] |= c[ 0 ] & current_size;                                \
-      position[ 1 ] |= c[ 1 ] & current_size;                                \
-      position[ 2 ] |= c[ 2 ] & current_size;                                \
-                                                                             \
-      if( node->tag & ( 1 << q ) )                                           \
-      {                                                                      \
-        /*                                                                   \
-          Here is a cell with one color. We need to be sure it's             \
-          the one that is the closest to our color                           \
-        */                                                                   \
-        mlib_s32 palindex = node->contents.index[ q ];                       \
-        mlib_u32 palc[ 3 ];                                                  \
-        mlib_s32 identical;                                                  \
-                                                                             \
-        palc[ 0 ] = p[ 0 ][ palindex ] - SUBTRACTION;                        \
-        palc[ 1 ] = p[ 1 ][ palindex ] - SUBTRACTION;                        \
-        palc[ 2 ] = p[ 2 ][ palindex ] - SUBTRACTION;                        \
-                                                                             \
-        identical = ( palc[ 0 ] - c[ 0 ] ) | ( palc[ 1 ] - c[ 1 ] ) |        \
-          ( palc[ 2 ] - c[ 2 ] );                                            \
-                                                                             \
-        if( !identical || BITS - pass == bits )                              \
-        {                                                                    \
-          /* Oh, here it is :) */                                            \
-          dst[ j ] = palindex + s->offset;                                   \
-          we_found_it = 1;                                                   \
-        }                                                                    \
-        else                                                                 \
-        {                                                                    \
-          mlib_u32 distance;                                                 \
-          /* First index is the channel, second is the number of the         \
-             side */                                                         \
-          mlib_s32 found_color;                                              \
-          mlib_s32 continue_up;                                              \
-                                                                             \
-          distance = FIND_DISTANCE_3( c[ 0 ], palc[ 0 ],                     \
-            c[ 1 ], palc[ 1 ], c[ 2 ], palc[ 2 ], SHIFT );                   \
-          found_color = palindex;                                            \
-                                                                             \
-          do                                                                 \
-          {                                                                  \
-            mlib_s32 check_corner;                                           \
-                                                                             \
-            /*                                                               \
-              Neibours are enumerated in a cicle:                            \
-              0 - between quadrants 0 and 1,                                 \
-              1 - between quadrants 1 and 2 and                              \
-              2 - between quadrants 2 and 0                                  \
-            */                                                               \
-            mlib_s32 check_neibours[ 3 ];                                    \
-                                                                             \
-            /*                                                               \
-              Others are three two neibour quadrants                         \
-                                                                             \
-              Side number is [ <number of the coordinate >][ <the bit        \
-              in the quadrant number of the corner, corresponding to         \
-              this coordinate> ], e.g. 2 is 0..010b, so the sides it has     \
-              near are:                                                      \
-              [ 0 (coordinate number) ][ 0 (bit 0 in the number) ]           \
-              [ 1 (coordinate number) ][ 1 (bit 1 in the number) ]           \
-                                                                             \
-              Now we can look in the three nearest quadrants. Do             \
-              we really need it ? Check it.                                  \
-            */                                                               \
-                                                                             \
-            check_corner = check_neibours[ 0 ] = check_neibours[ 1 ] =       \
-              check_neibours[ 2 ] = 0;                                       \
-            continue_up = 0;                                                 \
-                                                                             \
-            if( q & 1 )                                                      \
-            {                                                                \
-              BINARY_TREE_EXPLORE_LEFT_3( 0, SOURCE_IMAGE, 2, 0,             \
-                SUBTRACTION, SHIFT );                                        \
-            }                                                                \
-            else                                                             \
-            {                                                                \
-              BINARY_TREE_EXPLORE_RIGHT_3( 0, COLOR_MAX, SOURCE_IMAGE, 2, 0, \
-                SUBTRACTION, SHIFT );                                        \
-            }                                                                \
-                                                                             \
-            if( q & 2 )                                                      \
-            {                                                                \
-              BINARY_TREE_EXPLORE_LEFT_3( 1, SOURCE_IMAGE, 0, 1,             \
-                SUBTRACTION, SHIFT );                                        \
-            }                                                                \
-            else                                                             \
-            {                                                                \
-              BINARY_TREE_EXPLORE_RIGHT_3( 1, COLOR_MAX, SOURCE_IMAGE, 0, 1, \
-                SUBTRACTION, SHIFT );                                        \
-            }                                                                \
-                                                                             \
-            if( q & 4 )                                                      \
-            {                                                                \
-              BINARY_TREE_EXPLORE_LEFT_3( 2, SOURCE_IMAGE, 1, 2,             \
-                SUBTRACTION, SHIFT );                                        \
-            }                                                                \
-            else                                                             \
-            {                                                                \
-              BINARY_TREE_EXPLORE_RIGHT_3( 2, COLOR_MAX, SOURCE_IMAGE, 1, 2, \
-                SUBTRACTION, SHIFT );                                        \
-            }                                                                \
-                                                                             \
-            if( check_neibours[ 0 ] >= 2 )                                   \
-            {                                                                \
-              mlib_s32 qq = q ^ 3;                                           \
-              CHECK_QUADRANT_##SOURCE_IMAGE##_3( qq );                       \
-            }                                                                \
-                                                                             \
-            if( check_neibours[ 1 ] >= 2 )                                   \
-            {                                                                \
-              mlib_s32 qq = q ^ 6;                                           \
-              CHECK_QUADRANT_##SOURCE_IMAGE##_3( qq );                       \
-            }                                                                \
-                                                                             \
-            if( check_neibours[ 2 ] >= 2 )                                   \
-            {                                                                \
-              mlib_s32 qq = q ^ 5;                                           \
-              CHECK_QUADRANT_##SOURCE_IMAGE##_3( qq );                       \
-            }                                                                \
-                                                                             \
-            if( check_corner >= 3 )                                          \
-            {                                                                \
-              mlib_s32 qq = q ^ 7;                                           \
-              CHECK_QUADRANT_##SOURCE_IMAGE##_3( qq );                       \
-            }                                                                \
-                                                                             \
-            if( q & 1 )                                                      \
-            {                                                                \
-              BINARY_TREE_SEARCH_RIGHT( 0, COLOR_MAX, SHIFT );               \
-            }                                                                \
-            else                                                             \
-            {                                                                \
-              BINARY_TREE_SEARCH_LEFT( 0, SHIFT );                           \
-            }                                                                \
-                                                                             \
-            if( q & 2 )                                                      \
-            {                                                                \
-              BINARY_TREE_SEARCH_RIGHT( 1, COLOR_MAX, SHIFT );               \
-            }                                                                \
-            else                                                             \
-            {                                                                \
-              BINARY_TREE_SEARCH_LEFT( 1, SHIFT );                           \
-            }                                                                \
-                                                                             \
-            if( q & 4 )                                                      \
-            {                                                                \
-              BINARY_TREE_SEARCH_RIGHT( 2, COLOR_MAX, SHIFT );               \
-            }                                                                \
-            else                                                             \
-            {                                                                \
-              BINARY_TREE_SEARCH_LEFT( 2, SHIFT );                           \
-            }                                                                \
-                                                                             \
-            position[ 0 ] &= ~( c[ 0 ] & current_size );                     \
-            position[ 1 ] &= ~( c[ 1 ] & current_size );                     \
-            position[ 2 ] &= ~( c[ 2 ] & current_size );                     \
-                                                                             \
-            current_size <<= 1;                                              \
-                                                                             \
-            pass++;                                                          \
-                                                                             \
-            stack_pointer--;                                                 \
-            q = stack[ stack_pointer ].q;                                    \
-            node = stack[ stack_pointer ].node;                              \
-          } while( continue_up );                                            \
-                                                                             \
-          dst[ j ] = found_color + s->offset;                                \
-                                                                             \
-          we_found_it = 1;                                                   \
-        }                                                                    \
-      }                                                                      \
-      else if( node->contents.quadrants[ q ] )                               \
-      {                                                                      \
-        /* Descend one level */                                              \
-        stack[ stack_pointer ].node = node;                                  \
-        stack[ stack_pointer++ ].q = q;                                      \
-        node = node->contents.quadrants[ q ];                                \
-      }                                                                      \
-      else                                                                   \
-      {                                                                      \
-        /* Found the empty quadrant. Look around */                          \
-        mlib_u32 distance = MLIB_U32_MAX;                                    \
-        mlib_s32 found_color;                                                \
-        mlib_s32 continue_up;                                                \
-                                                                             \
-        /*                                                                   \
-          As we had come to this level, it is warranted that there           \
-          are other points on this level near the empty quadrant             \
-        */                                                                   \
-        do                                                                   \
-        {                                                                    \
-          mlib_s32 check_corner;                                             \
-          mlib_s32 check_neibours[ 3 ];                                      \
-                                                                             \
-          check_corner = check_neibours[ 0 ] = check_neibours[ 1 ] =         \
-            check_neibours[ 2 ] = 0;                                         \
-          continue_up = 0;                                                   \
-                                                                             \
-          if( q & 1 )                                                        \
-          {                                                                  \
-            BINARY_TREE_EXPLORE_LEFT_3( 0, SOURCE_IMAGE, 2, 0,               \
-              SUBTRACTION, SHIFT );                                          \
-          }                                                                  \
-          else                                                               \
-          {                                                                  \
-            BINARY_TREE_EXPLORE_RIGHT_3( 0, COLOR_MAX, SOURCE_IMAGE, 2, 0,   \
-              SUBTRACTION, SHIFT );                                          \
-          }                                                                  \
-                                                                             \
-          if( q & 2 )                                                        \
-          {                                                                  \
-            BINARY_TREE_EXPLORE_LEFT_3( 1, SOURCE_IMAGE, 0, 1,               \
-              SUBTRACTION, SHIFT );                                          \
-          }                                                                  \
-          else                                                               \
-          {                                                                  \
-            BINARY_TREE_EXPLORE_RIGHT_3( 1, COLOR_MAX, SOURCE_IMAGE, 0, 1,   \
-              SUBTRACTION, SHIFT );                                          \
-          }                                                                  \
-                                                                             \
-          if( q & 4 )                                                        \
-          {                                                                  \
-            BINARY_TREE_EXPLORE_LEFT_3( 2, SOURCE_IMAGE, 1, 2,               \
-              SUBTRACTION, SHIFT );                                          \
-          }                                                                  \
-          else                                                               \
-          {                                                                  \
-            BINARY_TREE_EXPLORE_RIGHT_3( 2, COLOR_MAX, SOURCE_IMAGE, 1, 2,   \
-              SUBTRACTION, SHIFT );                                          \
-          }                                                                  \
-                                                                             \
-          if( check_neibours[ 0 ] >= 2 )                                     \
-          {                                                                  \
-            mlib_s32 qq = q ^ 3;                                             \
-            CHECK_QUADRANT_##SOURCE_IMAGE##_3( qq );                         \
-          }                                                                  \
-                                                                             \
-          if( check_neibours[ 1 ] >= 2 )                                     \
-          {                                                                  \
-            mlib_s32 qq = q ^ 6;                                             \
-            CHECK_QUADRANT_##SOURCE_IMAGE##_3( qq );                         \
-          }                                                                  \
-                                                                             \
-          if( check_neibours[ 2 ] >= 2 )                                     \
-          {                                                                  \
-            mlib_s32 qq = q ^ 5;                                             \
-            CHECK_QUADRANT_##SOURCE_IMAGE##_3( qq );                         \
-          }                                                                  \
-                                                                             \
-          if( check_corner >= 3 )                                            \
-          {                                                                  \
-            mlib_s32 qq = q ^ 7;                                             \
-            CHECK_QUADRANT_##SOURCE_IMAGE##_3( qq );                         \
-          }                                                                  \
-                                                                             \
-          if( q & 1 )                                                        \
-          {                                                                  \
-            BINARY_TREE_SEARCH_RIGHT( 0, COLOR_MAX, SHIFT );                 \
-          }                                                                  \
-          else                                                               \
-          {                                                                  \
-            BINARY_TREE_SEARCH_LEFT( 0, SHIFT );                             \
-          }                                                                  \
-                                                                             \
-          if( q & 2 )                                                        \
-          {                                                                  \
-            BINARY_TREE_SEARCH_RIGHT( 1, COLOR_MAX, SHIFT );                 \
-          }                                                                  \
-          else                                                               \
-          {                                                                  \
-            BINARY_TREE_SEARCH_LEFT( 1, SHIFT );                             \
-          }                                                                  \
-                                                                             \
-          if( q & 4 )                                                        \
-          {                                                                  \
-            BINARY_TREE_SEARCH_RIGHT( 2, COLOR_MAX, SHIFT );                 \
-          }                                                                  \
-          else                                                               \
-          {                                                                  \
-            BINARY_TREE_SEARCH_LEFT( 2, SHIFT );                             \
-          }                                                                  \
-                                                                             \
-          position[ 0 ] &= ~( c[ 0 ] & current_size );                       \
-          position[ 1 ] &= ~( c[ 1 ] & current_size );                       \
-          position[ 2 ] &= ~( c[ 2 ] & current_size );                       \
-                                                                             \
-          current_size <<= 1;                                                \
-                                                                             \
-          pass++;                                                            \
-                                                                             \
-          stack_pointer--;                                                   \
-          q = stack[ stack_pointer ].q;                                      \
-          node = stack[ stack_pointer ].node;                                \
-        } while( continue_up );                                              \
-                                                                             \
-        dst[ j ] = found_color + s->offset;                                  \
-        we_found_it = 1;                                                     \
-      }                                                                      \
-                                                                             \
-      pass--;                                                                \
-                                                                             \
-    } while( !we_found_it );                                                 \
-                                                                             \
-    channels[ 0 ] += STEP;                                                   \
-    channels[ 1 ] += STEP;                                                   \
-    channels[ 2 ] += STEP;                                                   \
-  }                                                                          \
-}
-
-/***************************************************************/
-#define CHECK_QUADRANT_U8_4( qq )                               \
-{                                                               \
-  if( node->tag & ( 1 << qq ) )                                 \
-  {                                                             \
-    /* Here is another color cell. Check the distance */        \
-    mlib_s32 new_found_color = node->contents.index[ qq ];      \
-    mlib_u32 newdistance = FIND_DISTANCE_4( c[ 0 ],             \
-      p[ 0 ][ new_found_color ], c[ 1 ],                        \
-      p[ 1 ][ new_found_color ], c[ 2 ],                        \
-      p[ 2 ][ new_found_color ], c[ 3 ],                        \
-      p[ 3 ][ new_found_color ], 0 );                           \
-                                                                \
-    if( newdistance < distance )                                \
-    {                                                           \
-      found_color = new_found_color;                            \
-      distance = newdistance;                                   \
-    }                                                           \
-  }                                                             \
-  else if( node->contents.quadrants[ qq ] )                     \
-    /* Here is a full node. Just explore it all */              \
-    distance = mlib_search_quadrant_U8_4(                       \
-      node->contents.quadrants[ qq ], distance, &found_color,   \
-      c[ 0 ], c[ 1 ], c[ 2 ], c[ 3 ], p );                      \
-/* Else there is just an empty cell */                          \
-}
-
-/***************************************************************/
-#define CHECK_QUADRANT_S16_4( qq )                              \
-{                                                               \
-  if( node->tag & ( 1 << qq ) )                                 \
-  {                                                             \
-    /* Here is another color cell. Check the distance */        \
-    mlib_s32 new_found_color = node->contents.index[ qq ];      \
-    mlib_u32 palc0, palc1, palc2, palc3, newdistance;           \
-                                                                \
-    palc0 = p[ 0 ][ new_found_color ] - MLIB_S16_MIN;           \
-    palc1 = p[ 1 ][ new_found_color ] - MLIB_S16_MIN;           \
-    palc2 = p[ 2 ][ new_found_color ] - MLIB_S16_MIN;           \
-    palc3 = p[ 3 ][ new_found_color ] - MLIB_S16_MIN;           \
-                                                                \
-    newdistance = FIND_DISTANCE_4( c[ 0 ], palc0,               \
-      c[ 1 ], palc1,                                            \
-      c[ 2 ], palc2,                                            \
-      c[ 3 ], palc3, 2 );                                       \
-                                                                \
-    if( newdistance < distance )                                \
-    {                                                           \
-      found_color = new_found_color;                            \
-      distance = newdistance;                                   \
-    }                                                           \
-  }                                                             \
-  else if( node->contents.quadrants[ qq ] )                     \
-    /* Here is a full node. Just explore it all */              \
-    distance = mlib_search_quadrant_S16_4(                      \
-      node->contents.quadrants[ qq ], distance, &found_color,   \
-      c[ 0 ], c[ 1 ], c[ 2 ], c[ 3 ], p );                      \
-/* Else there is just an empty cell */                          \
-}
-
-/***************************************************************/
-#define BINARY_TREE_SEARCH_4( SOURCE_IMAGE, POINTER_TYPE, BITS,               \
-  COLOR_MAX, SUBTRACTION, SHIFT )                                             \
-{                                                                             \
-  const POINTER_TYPE *channels[ 4 ], *p[ 4 ];                                 \
-  mlib_u32 c[ 4 ];                                                            \
-  mlib_s32 j;                                                                 \
-                                                                              \
-  p[ 0 ] = s->lut[ 0 ];                                                       \
-  p[ 1 ] = s->lut[ 1 ];                                                       \
-  p[ 2 ] = s->lut[ 2 ];                                                       \
-  p[ 3 ] = s->lut[ 3 ];                                                       \
-  channels[ 0 ] = src;                                                        \
-  channels[ 1 ] = src + 1;                                                    \
-  channels[ 2 ] = src + 2;                                                    \
-  channels[ 3 ] = src + 3;                                                    \
-                                                                              \
-  for( j = 0; j < length; j++ )                                               \
-  {                                                                           \
-    mlib_s32 pass = BITS - 1;                                                 \
-    mlib_u32 position[ 4 ] = { 0, 0, 0, 0 };                                  \
-    mlib_s32 we_found_it = 0;                                                 \
-    struct lut_node_4 *node = s->table;                                       \
-    /* Stack pointer pointers to the first free element of stack. */          \
-    /* The node we are in is in the `node' */                                 \
-    struct                                                                    \
-    {                                                                         \
-      struct lut_node_4 *node;                                                \
-      mlib_s32 q;                                                             \
-    } stack[ BITS ];                                                          \
-    mlib_s32 stack_pointer = 0;                                               \
-                                                                              \
-    c[ 0 ] = *channels[ 0 ] - SUBTRACTION;                                    \
-    c[ 1 ] = *channels[ 1 ] - SUBTRACTION;                                    \
-    c[ 2 ] = *channels[ 2 ] - SUBTRACTION;                                    \
-    c[ 3 ] = *channels[ 3 ] - SUBTRACTION;                                    \
-                                                                              \
-    do                                                                        \
-    {                                                                         \
-      mlib_s32 q;                                                             \
-      mlib_u32 current_size = 1 << pass;                                      \
-                                                                              \
-      q = ( ( c[ 0 ] >> pass ) & 1 ) |                                        \
-        ( ( ( c[ 1 ] << 1 ) >> pass ) & 2 ) |                                 \
-        ( ( ( c[ 2 ] << 2 ) >> pass ) & 4 ) |                                 \
-        ( ( ( c[ 3 ] << 3 ) >> pass ) & 8 );                                  \
-                                                                              \
-      position[ 0 ] |= c[ 0 ] & current_size;                                 \
-      position[ 1 ] |= c[ 1 ] & current_size;                                 \
-      position[ 2 ] |= c[ 2 ] & current_size;                                 \
-      position[ 3 ] |= c[ 3 ] & current_size;                                 \
-                                                                              \
-      if( node->tag & ( 1 << q ) )                                            \
-      {                                                                       \
-        /*                                                                    \
-          Here is a cell with one color. We need to be sure it's              \
-          the one that is the closest to our color                            \
-        */                                                                    \
-        mlib_s32 palindex = node->contents.index[ q ];                        \
-        mlib_u32 palc[ 4 ];                                                   \
-        mlib_s32 identical;                                                   \
-                                                                              \
-        palc[ 0 ] = p[ 0 ][ palindex ] - SUBTRACTION;                         \
-        palc[ 1 ] = p[ 1 ][ palindex ] - SUBTRACTION;                         \
-        palc[ 2 ] = p[ 2 ][ palindex ] - SUBTRACTION;                         \
-        palc[ 3 ] = p[ 3 ][ palindex ] - SUBTRACTION;                         \
-                                                                              \
-        identical = ( palc[ 0 ] - c[ 0 ] ) | ( palc[ 1 ] - c[ 1 ] ) |         \
-          ( palc[ 2 ] - c[ 2 ] ) | ( palc[ 3 ] - c[ 3 ] );                    \
-                                                                              \
-        if( !identical || BITS - pass == bits )                               \
-        {                                                                     \
-          /* Oh, here it is :) */                                             \
-          dst[ j ] = palindex + s->offset;                                    \
-          we_found_it = 1;                                                    \
-        }                                                                     \
-        else                                                                  \
-        {                                                                     \
-          mlib_u32 distance;                                                  \
-          /* First index is the channel, second is the number of the          \
-             side */                                                          \
-          mlib_s32 found_color;                                               \
-          mlib_s32 continue_up;                                               \
-                                                                              \
-          distance = FIND_DISTANCE_4( c[ 0 ], palc[ 0 ],                      \
-            c[ 1 ], palc[ 1 ], c[ 2 ], palc[ 2 ], c[ 3 ], palc[ 3 ], SHIFT ); \
-          found_color = palindex;                                             \
-                                                                              \
-          do                                                                  \
-          {                                                                   \
-            mlib_s32 check_corner;                                            \
-            mlib_s32 check_neibours[ 6 ];                                     \
-            mlib_s32 check_far_neibours[ 4 ];                                 \
-                                                                              \
-            /*                                                                \
-              Check neibours: quadrants that are different by 2 bits          \
-              from the quadrant, that we are in:                              \
-              3 -  0                                                          \
-              5 -  1                                                          \
-              6 -  2                                                          \
-              9 -  3                                                          \
-              10 - 4                                                          \
-              12 - 5                                                          \
-              Far quadrants: different by 3 bits:                             \
-              7  - 0                                                          \
-              11 - 1                                                          \
-              13 - 2                                                          \
-              14 - 3                                                          \
-            */                                                                \
-                                                                              \
-            check_neibours[ 0 ] = check_neibours[ 1 ] =                       \
-              check_neibours[ 2 ] = check_neibours[ 3 ] =                     \
-              check_neibours[ 4 ] = check_neibours[ 5 ] = 0;                  \
-            continue_up = 0;                                                  \
-                                                                              \
-            if( q & 1 )                                                       \
-            {                                                                 \
-              BINARY_TREE_EXPLORE_LEFT_4( 0, SOURCE_IMAGE, 0, 1, 3,           \
-                SUBTRACTION, SHIFT );                                         \
-            }                                                                 \
-            else                                                              \
-            {                                                                 \
-              BINARY_TREE_EXPLORE_RIGHT_4( 0, COLOR_MAX, SOURCE_IMAGE,        \
-                0, 1, 3, SUBTRACTION, SHIFT );                                \
-            }                                                                 \
-                                                                              \
-            if( q & 2 )                                                       \
-            {                                                                 \
-              BINARY_TREE_EXPLORE_LEFT_4( 1, SOURCE_IMAGE, 0, 2, 4,           \
-                SUBTRACTION, SHIFT );                                         \
-            }                                                                 \
-            else                                                              \
-            {                                                                 \
-              BINARY_TREE_EXPLORE_RIGHT_4( 1, COLOR_MAX, SOURCE_IMAGE,        \
-                0, 2, 4, SUBTRACTION, SHIFT );                                \
-            }                                                                 \
-                                                                              \
-            if( q & 4 )                                                       \
-            {                                                                 \
-              BINARY_TREE_EXPLORE_LEFT_4( 2, SOURCE_IMAGE, 1, 2, 5,           \
-                SUBTRACTION, SHIFT );                                         \
-            }                                                                 \
-            else                                                              \
-            {                                                                 \
-              BINARY_TREE_EXPLORE_RIGHT_4( 2, COLOR_MAX, SOURCE_IMAGE,        \
-                1, 2, 5, SUBTRACTION, SHIFT );                                \
-            }                                                                 \
-                                                                              \
-            if( q & 8 )                                                       \
-            {                                                                 \
-              BINARY_TREE_EXPLORE_LEFT_4( 3, SOURCE_IMAGE, 3, 4, 5,           \
-                SUBTRACTION, SHIFT );                                         \
-            }                                                                 \
-            else                                                              \
-            {                                                                 \
-              BINARY_TREE_EXPLORE_RIGHT_4( 3, COLOR_MAX, SOURCE_IMAGE,        \
-                3, 4, 5, SUBTRACTION, SHIFT );                                \
-            }                                                                 \
-                                                                              \
-            check_far_neibours[ 0 ] = check_neibours[ 0 ] +                   \
-              check_neibours[ 1 ] + check_neibours[ 2 ];                      \
-            check_far_neibours[ 1 ] = check_neibours[ 0 ] +                   \
-              check_neibours[ 3 ] + check_neibours[ 4 ];                      \
-            check_far_neibours[ 2 ] = check_neibours[ 1 ] +                   \
-              check_neibours[ 3 ] + check_neibours[ 5 ];                      \
-            check_far_neibours[ 3 ] = check_neibours[ 2 ] +                   \
-              check_neibours[ 4 ] + check_neibours[ 5 ];                      \
-                                                                              \
-            check_corner = check_far_neibours[ 0 ] +                          \
-              check_far_neibours[ 1 ] +                                       \
-              check_far_neibours[ 2 ] +                                       \
-              check_far_neibours[ 3 ];                                        \
-                                                                              \
-            if( check_neibours[ 0 ] >= 2 )                                    \
-            {                                                                 \
-              mlib_s32 qq = q ^ 3;                                            \
-              CHECK_QUADRANT_##SOURCE_IMAGE##_4( qq );                        \
-            }                                                                 \
-                                                                              \
-            if( check_neibours[ 1 ] >= 2 )                                    \
-            {                                                                 \
-              mlib_s32 qq = q ^ 5;                                            \
-              CHECK_QUADRANT_##SOURCE_IMAGE##_4( qq );                        \
-            }                                                                 \
-                                                                              \
-            if( check_neibours[ 2 ] >= 2 )                                    \
-            {                                                                 \
-              mlib_s32 qq = q ^ 6;                                            \
-              CHECK_QUADRANT_##SOURCE_IMAGE##_4( qq );                        \
-            }                                                                 \
-                                                                              \
-            if( check_neibours[ 3 ] >= 2 )                                    \
-            {                                                                 \
-              mlib_s32 qq = q ^ 9;                                            \
-              CHECK_QUADRANT_##SOURCE_IMAGE##_4( qq );                        \
-            }                                                                 \
-                                                                              \
-            if( check_neibours[ 4 ] >= 2 )                                    \
-            {                                                                 \
-              mlib_s32 qq = q ^ 10;                                           \
-              CHECK_QUADRANT_##SOURCE_IMAGE##_4( qq );                        \
-            }                                                                 \
-                                                                              \
-            if( check_neibours[ 5 ] >= 2 )                                    \
-            {                                                                 \
-              mlib_s32 qq = q ^ 12;                                           \
-              CHECK_QUADRANT_##SOURCE_IMAGE##_4( qq );                        \
-            }                                                                 \
-                                                                              \
-            if( check_far_neibours[ 0 ] >= 3 )                                \
-            {                                                                 \
-              mlib_s32 qq = q ^ 7;                                            \
-              CHECK_QUADRANT_##SOURCE_IMAGE##_4( qq );                        \
-            }                                                                 \
-                                                                              \
-            if( check_far_neibours[ 1 ] >= 3 )                                \
-            {                                                                 \
-              mlib_s32 qq = q ^ 11;                                           \
-              CHECK_QUADRANT_##SOURCE_IMAGE##_4( qq );                        \
-            }                                                                 \
-                                                                              \
-            if( check_far_neibours[ 2 ] >= 3 )                                \
-            {                                                                 \
-              mlib_s32 qq = q ^ 13;                                           \
-              CHECK_QUADRANT_##SOURCE_IMAGE##_4( qq );                        \
-            }                                                                 \
-                                                                              \
-            if( check_far_neibours[ 3 ] >= 3 )                                \
-            {                                                                 \
-              mlib_s32 qq = q ^ 14;                                           \
-              CHECK_QUADRANT_##SOURCE_IMAGE##_4( qq );                        \
-            }                                                                 \
-                                                                              \
-            if( check_corner >= 4 )                                           \
-            {                                                                 \
-              mlib_s32 qq = q ^ 15;                                           \
-              CHECK_QUADRANT_##SOURCE_IMAGE##_4( qq );                        \
-            }                                                                 \
-                                                                              \
-            if( q & 1 )                                                       \
-            {                                                                 \
-              BINARY_TREE_SEARCH_RIGHT( 0, COLOR_MAX, SHIFT );                \
-            }                                                                 \
-            else                                                              \
-            {                                                                 \
-              BINARY_TREE_SEARCH_LEFT( 0, SHIFT );                            \
-            }                                                                 \
-                                                                              \
-            if( q & 2 )                                                       \
-            {                                                                 \
-              BINARY_TREE_SEARCH_RIGHT( 1, COLOR_MAX, SHIFT );                \
-            }                                                                 \
-            else                                                              \
-            {                                                                 \
-              BINARY_TREE_SEARCH_LEFT( 1, SHIFT );                            \
-            }                                                                 \
-                                                                              \
-            if( q & 4 )                                                       \
-            {                                                                 \
-              BINARY_TREE_SEARCH_RIGHT( 2, COLOR_MAX, SHIFT );                \
-            }                                                                 \
-            else                                                              \
-            {                                                                 \
-              BINARY_TREE_SEARCH_LEFT( 2, SHIFT );                            \
-            }                                                                 \
-                                                                              \
-            if( q & 8 )                                                       \
-            {                                                                 \
-              BINARY_TREE_SEARCH_RIGHT( 3, COLOR_MAX, SHIFT );                \
-            }                                                                 \
-            else                                                              \
-            {                                                                 \
-              BINARY_TREE_SEARCH_LEFT( 3, SHIFT );                            \
-            }                                                                 \
-                                                                              \
-            position[ 0 ] &= ~( c[ 0 ] & current_size );                      \
-            position[ 1 ] &= ~( c[ 1 ] & current_size );                      \
-            position[ 2 ] &= ~( c[ 2 ] & current_size );                      \
-            position[ 3 ] &= ~( c[ 3 ] & current_size );                      \
-                                                                              \
-            current_size <<= 1;                                               \
-                                                                              \
-            pass++;                                                           \
-                                                                              \
-            stack_pointer--;                                                  \
-            q = stack[ stack_pointer ].q;                                     \
-            node = stack[ stack_pointer ].node;                               \
-          } while( continue_up );                                             \
-                                                                              \
-          dst[ j ] = found_color + s->offset;                                 \
-          we_found_it = 1;                                                    \
-        }                                                                     \
-      }                                                                       \
-      else if( node->contents.quadrants[ q ] )                                \
-      {                                                                       \
-        /* Descend one level */                                               \
-        stack[ stack_pointer ].node = node;                                   \
-        stack[ stack_pointer++ ].q = q;                                       \
-        node = node->contents.quadrants[ q ];                                 \
-      }                                                                       \
-      else                                                                    \
-      {                                                                       \
-        /* Found the empty quadrant. Look around */                           \
-        mlib_u32 distance = MLIB_U32_MAX;                                     \
-        mlib_s32 found_color;                                                 \
-        mlib_s32 continue_up;                                                 \
-                                                                              \
-        /*                                                                    \
-          As we had come to this level, it is warranted that there            \
-          are other points on this level near the empty quadrant              \
-        */                                                                    \
-        do                                                                    \
-        {                                                                     \
-          mlib_s32 check_corner;                                              \
-          mlib_s32 check_neibours[ 6 ];                                       \
-          mlib_s32 check_far_neibours[ 4 ];                                   \
-                                                                              \
-          /*                                                                  \
-            Check neibours: quadrants that are different by 2 bits            \
-            from the quadrant, that we are in:                                \
-            3 -  0                                                            \
-            5 -  1                                                            \
-            6 -  2                                                            \
-            9 -  3                                                            \
-            10 - 4                                                            \
-            12 - 5                                                            \
-            Far quadrants: different by 3 bits:                               \
-            7  - 0                                                            \
-            11 - 1                                                            \
-            13 - 2                                                            \
-            14 - 3                                                            \
-          */                                                                  \
-                                                                              \
-          check_neibours[ 0 ] = check_neibours[ 1 ] =                         \
-            check_neibours[ 2 ] = check_neibours[ 3 ] =                       \
-            check_neibours[ 4 ] = check_neibours[ 5 ] = 0;                    \
-          continue_up = 0;                                                    \
-                                                                              \
-          if( q & 1 )                                                         \
-          {                                                                   \
-            BINARY_TREE_EXPLORE_LEFT_4( 0, SOURCE_IMAGE, 0, 1, 3,             \
-              SUBTRACTION, SHIFT );                                           \
-          }                                                                   \
-          else                                                                \
-          {                                                                   \
-            BINARY_TREE_EXPLORE_RIGHT_4( 0, COLOR_MAX, SOURCE_IMAGE,          \
-              0, 1, 3, SUBTRACTION, SHIFT );                                  \
-          }                                                                   \
-                                                                              \
-          if( q & 2 )                                                         \
-          {                                                                   \
-            BINARY_TREE_EXPLORE_LEFT_4( 1, SOURCE_IMAGE, 0, 2, 4,             \
-              SUBTRACTION, SHIFT );                                           \
-          }                                                                   \
-          else                                                                \
-          {                                                                   \
-            BINARY_TREE_EXPLORE_RIGHT_4( 1, COLOR_MAX, SOURCE_IMAGE,          \
-              0, 2, 4, SUBTRACTION, SHIFT );                                  \
-          }                                                                   \
-                                                                              \
-          if( q & 4 )                                                         \
-          {                                                                   \
-            BINARY_TREE_EXPLORE_LEFT_4( 2, SOURCE_IMAGE, 1, 2, 5,             \
-              SUBTRACTION, SHIFT );                                           \
-          }                                                                   \
-          else                                                                \
-          {                                                                   \
-            BINARY_TREE_EXPLORE_RIGHT_4( 2, COLOR_MAX, SOURCE_IMAGE,          \
-              1, 2, 5, SUBTRACTION, SHIFT );                                  \
-          }                                                                   \
-                                                                              \
-          if( q & 8 )                                                         \
-          {                                                                   \
-            BINARY_TREE_EXPLORE_LEFT_4( 3, SOURCE_IMAGE, 3, 4, 5,             \
-              SUBTRACTION, SHIFT );                                           \
-          }                                                                   \
-          else                                                                \
-          {                                                                   \
-            BINARY_TREE_EXPLORE_RIGHT_4( 3, COLOR_MAX, SOURCE_IMAGE,          \
-              3, 4, 5, SUBTRACTION, SHIFT );                                  \
-          }                                                                   \
-                                                                              \
-          check_far_neibours[ 0 ] = check_neibours[ 0 ] +                     \
-            check_neibours[ 1 ] + check_neibours[ 2 ];                        \
-          check_far_neibours[ 1 ] = check_neibours[ 0 ] +                     \
-            check_neibours[ 3 ] + check_neibours[ 4 ];                        \
-          check_far_neibours[ 2 ] = check_neibours[ 1 ] +                     \
-            check_neibours[ 3 ] + check_neibours[ 5 ];                        \
-          check_far_neibours[ 3 ] = check_neibours[ 2 ] +                     \
-            check_neibours[ 4 ] + check_neibours[ 5 ];                        \
-                                                                              \
-          check_corner = check_far_neibours[ 0 ] +                            \
-            check_far_neibours[ 1 ] +                                         \
-            check_far_neibours[ 2 ] +                                         \
-            check_far_neibours[ 3 ];                                          \
-                                                                              \
-          if( check_neibours[ 0 ] >= 2 )                                      \
-          {                                                                   \
-            mlib_s32 qq = q ^ 3;                                              \
-            CHECK_QUADRANT_##SOURCE_IMAGE##_4( qq );                          \
-          }                                                                   \
-                                                                              \
-          if( check_neibours[ 1 ] >= 2 )                                      \
-          {                                                                   \
-            mlib_s32 qq = q ^ 5;                                              \
-            CHECK_QUADRANT_##SOURCE_IMAGE##_4( qq );                          \
-          }                                                                   \
-                                                                              \
-          if( check_neibours[ 2 ] >= 2 )                                      \
-          {                                                                   \
-            mlib_s32 qq = q ^ 6;                                              \
-            CHECK_QUADRANT_##SOURCE_IMAGE##_4( qq );                          \
-          }                                                                   \
-                                                                              \
-          if( check_neibours[ 3 ] >= 2 )                                      \
-          {                                                                   \
-            mlib_s32 qq = q ^ 9;                                              \
-            CHECK_QUADRANT_##SOURCE_IMAGE##_4( qq );                          \
-          }                                                                   \
-                                                                              \
-          if( check_neibours[ 4 ] >= 2 )                                      \
-          {                                                                   \
-            mlib_s32 qq = q ^ 10;                                             \
-            CHECK_QUADRANT_##SOURCE_IMAGE##_4( qq );                          \
-          }                                                                   \
-                                                                              \
-          if( check_neibours[ 5 ] >= 2 )                                      \
-          {                                                                   \
-            mlib_s32 qq = q ^ 12;                                             \
-            CHECK_QUADRANT_##SOURCE_IMAGE##_4( qq );                          \
-          }                                                                   \
-                                                                              \
-          if( check_far_neibours[ 0 ] >= 3 )                                  \
-          {                                                                   \
-            mlib_s32 qq = q ^ 7;                                              \
-            CHECK_QUADRANT_##SOURCE_IMAGE##_4( qq );                          \
-          }                                                                   \
-                                                                              \
-          if( check_far_neibours[ 1 ] >= 3 )                                  \
-          {                                                                   \
-            mlib_s32 qq = q ^ 11;                                             \
-            CHECK_QUADRANT_##SOURCE_IMAGE##_4( qq );                          \
-          }                                                                   \
-                                                                              \
-          if( check_far_neibours[ 2 ] >= 3 )                                  \
-          {                                                                   \
-            mlib_s32 qq = q ^ 13;                                             \
-            CHECK_QUADRANT_##SOURCE_IMAGE##_4( qq );                          \
-          }                                                                   \
-                                                                              \
-          if( check_far_neibours[ 3 ] >= 3 )                                  \
-          {                                                                   \
-            mlib_s32 qq = q ^ 14;                                             \
-            CHECK_QUADRANT_##SOURCE_IMAGE##_4( qq );                          \
-          }                                                                   \
-                                                                              \
-          if( check_corner >= 4 )                                             \
-          {                                                                   \
-            mlib_s32 qq = q ^ 15;                                             \
-            CHECK_QUADRANT_##SOURCE_IMAGE##_4( qq );                          \
-          }                                                                   \
-                                                                              \
-          if( q & 1 )                                                         \
-          {                                                                   \
-            BINARY_TREE_SEARCH_RIGHT( 0, COLOR_MAX, SHIFT );                  \
-          }                                                                   \
-          else                                                                \
-          {                                                                   \
-            BINARY_TREE_SEARCH_LEFT( 0, SHIFT );                              \
-          }                                                                   \
-                                                                              \
-          if( q & 2 )                                                         \
-          {                                                                   \
-            BINARY_TREE_SEARCH_RIGHT( 1, COLOR_MAX, SHIFT );                  \
-          }                                                                   \
-          else                                                                \
-          {                                                                   \
-            BINARY_TREE_SEARCH_LEFT( 1, SHIFT );                              \
-          }                                                                   \
-                                                                              \
-          if( q & 4 )                                                         \
-          {                                                                   \
-            BINARY_TREE_SEARCH_RIGHT( 2, COLOR_MAX, SHIFT );                  \
-          }                                                                   \
-          else                                                                \
-          {                                                                   \
-            BINARY_TREE_SEARCH_LEFT( 2, SHIFT );                              \
-          }                                                                   \
-                                                                              \
-          if( q & 8 )                                                         \
-          {                                                                   \
-            BINARY_TREE_SEARCH_RIGHT( 3, COLOR_MAX, SHIFT );                  \
-          }                                                                   \
-          else                                                                \
-          {                                                                   \
-            BINARY_TREE_SEARCH_LEFT( 3, SHIFT );                              \
-          }                                                                   \
-                                                                              \
-          position[ 0 ] &= ~( c[ 0 ] & current_size );                        \
-          position[ 1 ] &= ~( c[ 1 ] & current_size );                        \
-          position[ 2 ] &= ~( c[ 2 ] & current_size );                        \
-          position[ 3 ] &= ~( c[ 3 ] & current_size );                        \
-                                                                              \
-          current_size <<= 1;                                                 \
-                                                                              \
-          pass++;                                                             \
-                                                                              \
-          stack_pointer--;                                                    \
-          q = stack[ stack_pointer ].q;                                       \
-          node = stack[ stack_pointer ].node;                                 \
-        } while( continue_up );                                               \
-                                                                              \
-        dst[ j ] = found_color + s->offset;                                   \
-        we_found_it = 1;                                                      \
-      }                                                                       \
-                                                                              \
-      pass--;                                                                 \
-                                                                              \
-    } while( !we_found_it );                                                  \
-                                                                              \
-    channels[ 0 ] += 4;                                                       \
-    channels[ 1 ] += 4;                                                       \
-    channels[ 2 ] += 4;                                                       \
-    channels[ 3 ] += 4;                                                       \
-  }                                                                           \
-}
-
-/***************************************************************/
-#define FIND_NEAREST_U8_3_C( SHIFT, STEP )                      \
-  mlib_s32 i, k, k_min, min_dist, diff, mask;                   \
-  mlib_s32 offset = mlib_ImageGetLutOffset( s ) - 1;            \
-  mlib_s32 entries = s -> lutlength;                            \
-  mlib_d64 *double_lut = mlib_ImageGetLutDoubleData( s );       \
-  mlib_d64 col0, col1, col2;                                    \
-  mlib_d64 dist, len0, len1, len2;                              \
-                                                                \
-  for ( i = 0; i < length; i++ ) {                              \
-    col0 = src[ STEP * i + SHIFT ];                             \
-    col1 = src[ STEP * i + 1 + SHIFT ];                         \
-    col2 = src[ STEP * i + 2 + SHIFT ];                         \
-    min_dist = MLIB_S32_MAX;                                    \
-    k_min = 1;                                                  \
-    len0 = double_lut[ 0 ] - col0;                              \
-    len1 = double_lut[ 1 ] - col1;                              \
-    len2 = double_lut[ 2 ] - col2;                              \
-                                                                \
-    for ( k = 1; k <= entries; k++ ) {                          \
-      dist = len0 * len0;                                       \
-      len0 = double_lut[ 3 * k ] - col0;                        \
-      dist += len1 * len1;                                      \
-      len1 = double_lut[ 3 * k + 1 ] - col1;                    \
-      dist += len2 * len2;                                      \
-      len2 = double_lut[ 3 * k + 2 ] - col2;                    \
-      diff = ( mlib_s32 )dist - min_dist;                       \
-      mask = diff >> 31;                                        \
-      min_dist += diff & mask;                                  \
-      k_min += ( k - k_min ) & mask;                            \
-    }                                                           \
-                                                                \
-    dst[ i ] = k_min + offset;                                  \
-  }
-
-/***************************************************************/
-#define FIND_NEAREST_U8_4_C                                     \
-  mlib_s32 i, k, k_min, min_dist, diff, mask;                   \
-  mlib_s32 offset = mlib_ImageGetLutOffset( s ) - 1;            \
-  mlib_s32 entries = s -> lutlength;                            \
-  mlib_d64 *double_lut = mlib_ImageGetLutDoubleData( s );       \
-  mlib_d64 col0, col1, col2, col3;                              \
-  mlib_d64 dist, len0, len1, len2, len3;                        \
-                                                                \
-  for ( i = 0; i < length; i++ ) {                              \
-    col0 = src[ 4 * i ];                                        \
-    col1 = src[ 4 * i + 1 ];                                    \
-    col2 = src[ 4 * i + 2 ];                                    \
-    col3 = src[ 4 * i + 3 ];                                    \
-    min_dist = MLIB_S32_MAX;                                    \
-    k_min = 1;                                                  \
-    len0 = double_lut[ 0 ] - col0;                              \
-    len1 = double_lut[ 1 ] - col1;                              \
-    len2 = double_lut[ 2 ] - col2;                              \
-    len3 = double_lut[ 3 ] - col3;                              \
-                                                                \
-    for ( k = 1; k <= entries; k++ ) {                          \
-      dist = len0 * len0;                                       \
-      len0 =  double_lut[ 4 * k ] - col0;                       \
-      dist += len1 * len1;                                      \
-      len1 = double_lut[ 4 * k + 1 ] - col1;                    \
-      dist += len2 * len2;                                      \
-      len2 =  double_lut[ 4 * k + 2 ] - col2;                   \
-      dist += len3 * len3;                                      \
-      len3 =  double_lut[ 4 * k + 3 ] - col3;                   \
-      diff = ( mlib_s32 )dist - min_dist;                       \
-      mask = diff >> 31;                                        \
-      min_dist += diff & mask;                                  \
-      k_min += ( k - k_min ) & mask;                            \
-    }                                                           \
-                                                                \
-    dst[ i ] = k_min + offset;                                  \
-  }
-
-/***************************************************************/
-#define FSQR_S16_HI(dsrc)                                                   \
-  vis_fpadd32( vis_fmuld8ulx16( vis_read_hi( dsrc ), vis_read_hi( dsrc ) ), \
-    vis_fmuld8sux16( vis_read_hi( dsrc ), vis_read_hi( dsrc ) ) )
-
-/***************************************************************/
-#define FSQR_S16_LO(dsrc)                                                  \
-  vis_fpadd32( vis_fmuld8ulx16( vis_read_lo( dsrc ), vis_read_lo( dsrc) ), \
-    vis_fmuld8sux16( vis_read_lo( dsrc ), vis_read_lo( dsrc ) ) )
-
-/***************************************************************/
-#define FIND_NEAREST_U8_3                                             \
-{                                                                     \
-  mlib_d64 *dpsrc, dsrc, dsrc1, ddist, ddist1, ddist2, ddist3;        \
-  mlib_d64 dcolor, dind, dres, dres1, dpind[1], dpmin[1];             \
-  mlib_d64 done = vis_to_double_dup( 1 ),                             \
-           dmax = vis_to_double_dup( MLIB_S32_MAX );                  \
-  mlib_f32 *lut = ( mlib_f32 * )mlib_ImageGetLutNormalTable( s );     \
-  mlib_f32 fone = vis_to_float( 0x100 );                              \
-  mlib_s32 i, k, mask;                                                \
-  mlib_s32 gsr[1];                                                    \
-  mlib_s32 offset = mlib_ImageGetLutOffset( s ) - 1;                  \
-  mlib_s32 entries = s->lutlength;                                    \
-                                                                      \
-  gsr[0] = vis_read_gsr();                                            \
-  for( i = 0; i <= ( length-2 ); i += 2 )                             \
-  {                                                                   \
-    dpsrc = VIS_ALIGNADDR( src, -1 );                                 \
-    src += 6;                                                         \
-    dsrc = dpsrc[ 0 ];                                                \
-    dsrc1 = dpsrc[ 1 ];                                               \
-    dsrc1 = vis_faligndata( dsrc, dsrc1 );                            \
-    dsrc = vis_fmul8x16al( vis_read_hi( dsrc1 ), fone );              \
-    VIS_ALIGNADDR( dpsrc, 3 );                                        \
-    dsrc1 = vis_faligndata( dsrc1, dsrc1 );                           \
-    dsrc1 = vis_fmul8x16al( vis_read_hi( dsrc1 ), fone );             \
-    dpind[ 0 ] = dind = done;                                         \
-    dpmin[ 0 ] = dmax;                                                \
-    dcolor = vis_fmul8x16al( lut[ 0 ], fone );                        \
-    for( k = 1; k <= entries; k++ )                                   \
-    {                                                                 \
-      ddist1 = vis_fpsub16( dcolor, dsrc );                           \
-      ddist = FSQR_S16_HI( ddist1 );                                  \
-      ddist1 = FSQR_S16_LO( ddist1 );                                 \
-      dres = vis_fpadd32( ddist, ddist1 );                            \
-      ddist3 = vis_fpsub16( dcolor, dsrc1 );                          \
-      ddist2 = FSQR_S16_HI( ddist3 );                                 \
-      ddist3 = FSQR_S16_LO( ddist3 );                                 \
-      dres1 = vis_fpadd32( ddist2, ddist3 );                          \
-      dcolor = vis_fmul8x16al( lut[ k ], fone );                      \
-      dres = vis_freg_pair(                                           \
-        vis_fpadd32s( vis_read_hi( dres ), vis_read_lo( dres ) ),     \
-        vis_fpadd32s( vis_read_hi( dres1 ), vis_read_lo( dres1 ) ) ); \
-      mask = vis_fcmplt32( dres, dpmin[ 0 ] );                        \
-      vis_pst_32( dind, ( void * )dpind, mask );                      \
-      dind = vis_fpadd32( dind, done );                               \
-      vis_pst_32( dres, ( void * )dpmin, mask );                      \
-    }                                                                 \
-    dst[ i ] = ( ( mlib_s32 * )dpind )[ 0 ] + offset;                 \
-    dst[ i + 1 ] = ( ( mlib_s32 * )dpind)[ 1 ] + offset;              \
-  }                                                                   \
-  if( i < length )                                                    \
-  {                                                                   \
-    dpsrc = VIS_ALIGNADDR( src, -1 );                                 \
-    dsrc = dpsrc[ 0 ];                                                \
-    dsrc1 = dpsrc[ 1 ];                                               \
-    dsrc1 = vis_faligndata( dsrc, dsrc1 );                            \
-    dsrc = vis_fmul8x16al( vis_read_hi( dsrc1 ), fone );              \
-    dpind[ 0 ] = dind = done;                                         \
-    dpmin[ 0 ] = dmax;                                                \
-    for( k = 0; k < entries; k++ )                                    \
-    {                                                                 \
-      dcolor = vis_fmul8x16al( lut[ k ], fone );                      \
-      ddist1 = vis_fpsub16( dcolor, dsrc );                           \
-      ddist = FSQR_S16_HI( ddist1 );                                  \
-      ddist1 = FSQR_S16_LO( ddist1 );                                 \
-      dres = vis_fpadd32( ddist, ddist1 );                            \
-      dres = vis_write_lo( dres,                                      \
-        vis_fpadd32s( vis_read_hi( dres ), vis_read_lo( dres ) ) );   \
-      mask = vis_fcmplt32( dres, dpmin[ 0 ] );                        \
-      vis_pst_32( dind, ( void * )dpind, mask );                      \
-      dind = vis_fpadd32( dind, done );                               \
-      vis_pst_32( dres, ( void * )dpmin, mask );                      \
-    }                                                                 \
-    dst[ i ] = ( ( mlib_s32 * )dpind)[ 1 ] + offset;                  \
-  }                                                                   \
-  vis_write_gsr(gsr[0]);                                              \
-}
-
-/***************************************************************/
-#define FIND_NEAREST_U8_3_IN4                                         \
-{                                                                     \
-  mlib_d64 *dpsrc, dsrc, dsrc1, ddist, ddist1, ddist2, ddist3;        \
-  mlib_d64 dcolor, dind, dres, dres1, dpind[1], dpmin[1];             \
-  mlib_d64 done = vis_to_double_dup( 1 ),                             \
-           dmax = vis_to_double_dup( MLIB_S32_MAX );                  \
-  mlib_f32 *lut = ( mlib_f32 * )mlib_ImageGetLutNormalTable( s );     \
-  mlib_f32 fone = vis_to_float( 0x100 );                              \
-  mlib_s32 i, k, mask, gsr[1];                                        \
-  mlib_s32 offset = mlib_ImageGetLutOffset( s ) - 1;                  \
-  mlib_s32 entries = s->lutlength;                                    \
-                                                                      \
-  gsr[0] = vis_read_gsr();                                            \
-  dpsrc = VIS_ALIGNADDR( src, 0 );                                    \
-  for( i = 0; i <= ( length-2 ); i += 2 )                             \
-  {                                                                   \
-    dsrc = dpsrc[ 0 ];                                                \
-    dsrc1 = dpsrc[ 1 ];                                               \
-    dsrc1 = vis_faligndata( dsrc, dsrc1 );                            \
-    dpsrc++;                                                          \
-    dsrc = vis_fmul8x16al( vis_read_hi( dsrc1 ), fone );              \
-    dsrc1 = vis_fmul8x16al( vis_read_lo( dsrc1 ), fone );             \
-    dpind[ 0 ] = dind = done;                                         \
-    dpmin[ 0 ] = dmax;                                                \
-    dcolor = vis_fmul8x16al( lut[ 0 ], fone );                        \
-    for( k = 1; k <= entries; k++ )                                   \
-    {                                                                 \
-      ddist1 = vis_fpsub16( dcolor, dsrc );                           \
-      ddist = FSQR_S16_HI( ddist1 );                                  \
-      ddist1 = FSQR_S16_LO( ddist1 );                                 \
-      dres = vis_fpadd32( ddist, ddist1 );                            \
-      ddist3 = vis_fpsub16( dcolor, dsrc1 );                          \
-      ddist2 = FSQR_S16_HI( ddist3 );                                 \
-      ddist3 = FSQR_S16_LO( ddist3 );                                 \
-      dres1 = vis_fpadd32( ddist2, ddist3 );                          \
-      dcolor = vis_fmul8x16al( lut[ k ], fone );                      \
-      dres = vis_freg_pair(                                           \
-        vis_fpadd32s( vis_read_hi( dres ), vis_read_lo( dres ) ),     \
-        vis_fpadd32s( vis_read_hi( dres1 ), vis_read_lo( dres1 ) ) ); \
-      mask = vis_fcmplt32( dres, dpmin[ 0 ] );                        \
-      vis_pst_32( dind, ( void * )dpind, mask );                      \
-      dind = vis_fpadd32( dind, done );                               \
-      vis_pst_32( dres, ( void * )dpmin, mask );                      \
-    }                                                                 \
-    dst[ i ] = ( ( mlib_s32 * )dpind )[ 0 ] + offset;                 \
-    dst[ i + 1 ] = ( ( mlib_s32 * )dpind)[ 1 ] + offset;              \
-  }                                                                   \
-  if( i < length )                                                    \
-  {                                                                   \
-    dsrc = dpsrc[ 0 ];                                                \
-    dsrc1 = dpsrc[ 1 ];                                               \
-    dsrc1 = vis_faligndata( dsrc, dsrc1 );                            \
-    dsrc = vis_fmul8x16al( vis_read_hi( dsrc1 ), fone );              \
-    dpind[ 0 ] = dind = done;                                         \
-    dpmin[ 0 ] = dmax;                                                \
-    for( k = 0; k < entries; k++ )                                    \
-    {                                                                 \
-      dcolor = vis_fmul8x16al( lut[ k ], fone );                      \
-      ddist1 = vis_fpsub16( dcolor, dsrc );                           \
-      ddist = FSQR_S16_HI( ddist1 );                                  \
-      ddist1 = FSQR_S16_LO( ddist1 );                                 \
-      dres = vis_fpadd32( ddist, ddist1 );                            \
-      dres = vis_write_lo( dres,                                      \
-        vis_fpadd32s( vis_read_hi( dres ), vis_read_lo( dres ) ) );   \
-      mask = vis_fcmplt32( dres, dpmin[ 0 ] );                        \
-      vis_pst_32( dind, ( void * )dpind, mask );                      \
-      dind = vis_fpadd32( dind, done );                               \
-      vis_pst_32( dres, ( void * )dpmin, mask );                      \
-    }                                                                 \
-    dst[ i ] = ( ( mlib_s32 * )dpind)[ 1 ] + offset;                  \
-  }                                                                   \
-  vis_write_gsr(gsr[0]);                                              \
-}
-
-/***************************************************************/
-#define FIND_NEAREST_U8_4                                             \
-{                                                                     \
-  mlib_d64 *dpsrc, dsrc, dsrc1, ddist, ddist1, ddist2, ddist3;        \
-  mlib_d64 dcolor, dind, dres, dres1, dpind[ 1 ], dpmin[ 1 ];         \
-  mlib_d64 done = vis_to_double_dup( 1 ),                             \
-           dmax = vis_to_double_dup( MLIB_S32_MAX );                  \
-  mlib_f32 *lut = ( mlib_f32 * )mlib_ImageGetLutNormalTable( s );     \
-  mlib_f32 fone = vis_to_float( 0x100 );                              \
-  mlib_s32 i, k, mask, gsr[1];                                        \
-  mlib_s32 offset = mlib_ImageGetLutOffset( s ) - 1;                  \
-  mlib_s32 entries = s->lutlength;                                    \
-                                                                      \
-  gsr[0] = vis_read_gsr();                                            \
-  dpsrc = VIS_ALIGNADDR( src, 0 );                                    \
-  for( i = 0; i <= ( length-2 ); i += 2 )                             \
-  {                                                                   \
-    dsrc = dpsrc[ 0 ];                                                \
-    dsrc1 = dpsrc[ 1 ];                                               \
-    dsrc1 = vis_faligndata( dsrc, dsrc1 );                            \
-    dpsrc++;                                                          \
-    dsrc = vis_fmul8x16al( vis_read_hi( dsrc1 ), fone );              \
-    dsrc1 = vis_fmul8x16al( vis_read_lo( dsrc1 ), fone );             \
-    dpind[ 0 ] = dind = done;                                         \
-    dpmin[ 0 ] = dmax;                                                \
-    dcolor = vis_fmul8x16al(lut[0], fone);                            \
-    for( k = 1; k <= entries; k++ )                                   \
-    {                                                                 \
-      ddist1 = vis_fpsub16( dcolor, dsrc );                           \
-      ddist = FSQR_S16_HI( ddist1 );                                  \
-      ddist1 = FSQR_S16_LO( ddist1 );                                 \
-      dres = vis_fpadd32( ddist, ddist1 );                            \
-      ddist3 = vis_fpsub16( dcolor, dsrc1 );                          \
-      ddist2 = FSQR_S16_HI( ddist3 );                                 \
-      ddist3 = FSQR_S16_LO( ddist3 );                                 \
-      dres1 = vis_fpadd32( ddist2, ddist3 );                          \
-      dcolor = vis_fmul8x16al( lut[ k ], fone );                      \
-      dres = vis_freg_pair(                                           \
-        vis_fpadd32s( vis_read_hi( dres ), vis_read_lo( dres ) ),     \
-        vis_fpadd32s( vis_read_hi( dres1 ), vis_read_lo( dres1 ) ) ); \
-      mask = vis_fcmplt32( dres, dpmin[ 0 ] );                        \
-      vis_pst_32( dind, ( void * )dpind, mask );                      \
-      dind = vis_fpadd32( dind, done );                               \
-      vis_pst_32( dres, ( void * )dpmin, mask );                      \
-    }                                                                 \
-    dst[ i ] = ( ( mlib_s32 * )dpind )[ 0 ] + offset;                 \
-    dst[ i + 1 ] = ( ( mlib_s32 * )dpind )[ 1 ] + offset;             \
-  }                                                                   \
-  if( i < length )                                                    \
-  {                                                                   \
-    dsrc = dpsrc[ 0 ];                                                \
-    dsrc1 = dpsrc[ 1 ];                                               \
-    dsrc1 = vis_faligndata( dsrc, dsrc1 );                            \
-    dsrc = vis_fmul8x16al( vis_read_hi( dsrc1 ), fone );              \
-    dpind[ 0 ] = dind = done;                                         \
-    dpmin[ 0 ] = dmax;                                                \
-    for( k = 0; k < entries; k++ )                                    \
-    {                                                                 \
-      dcolor = vis_fmul8x16al( lut[ k ], fone );                      \
-      ddist1 = vis_fpsub16( dcolor, dsrc );                           \
-      ddist = FSQR_S16_HI( ddist1 );                                  \
-      ddist1 = FSQR_S16_LO( ddist1 );                                 \
-      dres = vis_fpadd32( ddist, ddist1 );                            \
-      dres = vis_write_lo( dres,                                      \
-        vis_fpadd32s( vis_read_hi( dres ), vis_read_lo( dres ) ) );   \
-      mask = vis_fcmplt32( dres, dpmin[ 0 ] );                        \
-      vis_pst_32( dind, ( void * )dpind, mask );                      \
-      dind = vis_fpadd32( dind, done );                               \
-      vis_pst_32( dres, ( void * )dpmin, mask );                      \
-    }                                                                 \
-    dst[ i ] = ( ( mlib_s32 * )dpind )[ 1 ] + offset;                 \
-  }                                                                   \
-  vis_write_gsr(gsr[0]);                                              \
-}
-
-/***************************************************************/
-#define FIND_NEAREST_S16_3( SHIFT, STEP )                       \
-  mlib_s32 i, k, k_min, min_dist, diff, mask;                   \
-  mlib_s32 offset = mlib_ImageGetLutOffset( s ) - 1;            \
-  mlib_s32 entries = s->lutlength;                              \
-  mlib_d64 *double_lut = mlib_ImageGetLutDoubleData( s );       \
-  mlib_d64 col0, col1, col2;                                    \
-  mlib_d64 dist, len0, len1, len2;                              \
-                                                                \
-  for( i = 0; i < length; i++ )                                 \
-  {                                                             \
-    col0 = src[ STEP * i + SHIFT ];                             \
-    col1 = src[ STEP * i + 1 + SHIFT ];                         \
-    col2 = src[ STEP * i + 2 + SHIFT ];                         \
-    min_dist = MLIB_S32_MAX;                                    \
-    k_min = 1;                                                  \
-    len0 = double_lut[ 0 ] - col0;                              \
-    len1 = double_lut[ 1 ] - col1;                              \
-    len2 = double_lut[ 2 ] - col2;                              \
-    for( k = 1; k <= entries; k++ )                             \
-    {                                                           \
-      dist = len0 * len0;                                       \
-      len0 = double_lut[ 3 * k ] - col0;                        \
-      dist += len1 * len1;                                      \
-      len1 = double_lut[ 3 * k + 1 ] - col1;                    \
-      dist += len2 * len2;                                      \
-      len2 = double_lut[ 3 * k + 2 ] - col2;                    \
-      diff = ( mlib_s32 )( dist * 0.125 ) - min_dist;           \
-      mask = diff >> 31;                                        \
-      min_dist += diff & mask;                                  \
-      k_min += ( k - k_min ) & mask;                            \
-    }                                                           \
-    dst[ i ] = k_min + offset;                                  \
-  }
-
-/***************************************************************/
-#define FIND_NEAREST_S16_4                                      \
-  mlib_s32 i, k, k_min, min_dist, diff, mask;                   \
-  mlib_s32 offset = mlib_ImageGetLutOffset( s ) - 1;            \
-  mlib_s32 entries = s->lutlength;                              \
-  mlib_d64 *double_lut = mlib_ImageGetLutDoubleData( s );       \
-  mlib_d64 col0, col1, col2, col3;                              \
-  mlib_d64 dist, len0, len1, len2, len3;                        \
-                                                                \
-  for( i = 0; i < length; i++ )                                 \
-  {                                                             \
-    col0 = src[ 4 * i ];                                        \
-    col1 = src[ 4 * i + 1 ];                                    \
-    col2 = src[ 4 * i + 2 ];                                    \
-    col3 = src[ 4 * i + 3 ];                                    \
-    min_dist = MLIB_S32_MAX;                                    \
-    k_min = 1;                                                  \
-    len0 = double_lut[ 0 ] - col0;                              \
-    len1 = double_lut[ 1 ] - col1;                              \
-    len2 = double_lut[ 2 ] - col2;                              \
-    len3 = double_lut[ 3 ] - col3;                              \
-    for( k = 1; k <= entries; k++ )                             \
-    {                                                           \
-      dist = len0 * len0;                                       \
-      len0 =  double_lut[ 4 * k ] - col0;                       \
-      dist += len1 * len1;                                      \
-      len1 = double_lut[ 4 * k + 1 ] - col1;                    \
-      dist += len2 * len2;                                      \
-      len2 =  double_lut[ 4 * k + 2 ] - col2;                   \
-      dist += len3 * len3;                                      \
-      len3 =  double_lut[ 4 * k + 3 ] - col3;                   \
-      diff = ( mlib_s32 )( dist * 0.125 ) - min_dist;           \
-      mask = diff >> 31;                                        \
-      min_dist += diff & mask;                                  \
-      k_min += ( k - k_min ) & mask;                            \
-    }                                                           \
-    dst[ i ] = k_min + offset;                                  \
-  }
-
-/***************************************************************/
-mlib_status mlib_ImageColorTrue2Index(mlib_image       *dst,
-                                      const mlib_image *src,
-                                      const void       *colormap)
-{
-  mlib_s32 y, width, height, sstride, dstride, schann;
-  mlib_colormap *s = (mlib_colormap *)colormap;
-  mlib_s32 channels;
-  mlib_type stype, dtype;
-
-  MLIB_IMAGE_CHECK(src);
-  MLIB_IMAGE_CHECK(dst);
-  MLIB_IMAGE_SIZE_EQUAL(src, dst);
-  MLIB_IMAGE_HAVE_CHAN(dst, 1);
-
-  if (!colormap)
-    return MLIB_NULLPOINTER;
-
-  channels = s->channels;
-  stype = mlib_ImageGetType(src);
-  dtype = mlib_ImageGetType(dst);
-  width = mlib_ImageGetWidth(src);
-  height = mlib_ImageGetHeight(src);
-  sstride = mlib_ImageGetStride(src);
-  dstride = mlib_ImageGetStride(dst);
-  schann = mlib_ImageGetChannels(src);
-
-  if (stype != s->intype || dtype != s->outtype)
-    return MLIB_FAILURE;
-
-  if (channels != schann)
-    return MLIB_FAILURE;
-
-  switch (stype) {
-    case MLIB_BYTE:
-      {
-        mlib_u8 *sdata = mlib_ImageGetData(src);
-
-        switch (dtype) {
-          case MLIB_BYTE:
-            {
-              mlib_u8 *ddata = mlib_ImageGetData(dst);
-
-              switch (channels) {
-                case 3:
-                  {
-                    MAIN_COLORTRUE2INDEX_LOOP(U8, U8, 3);
-                    return MLIB_SUCCESS;
-                  }
-
-                case 4:
-                  {
-                    MAIN_COLORTRUE2INDEX_LOOP(U8, U8, 4);
-                    return MLIB_SUCCESS;
-                  }
-
-                default:
-                  return MLIB_FAILURE;
-              }
-            }
-
-          case MLIB_SHORT:
-            {
-              mlib_s16 *ddata = mlib_ImageGetData(dst);
-
-              dstride /= 2;
-              switch (channels) {
-                case 3:
-                  {
-                    MAIN_COLORTRUE2INDEX_LOOP(U8, S16, 3);
-                    return MLIB_SUCCESS;
-                  }
-
-                case 4:
-                  {
-                    MAIN_COLORTRUE2INDEX_LOOP(U8, S16, 4);
-                    return MLIB_SUCCESS;
-                  }
-
-                default:
-                  return MLIB_FAILURE;
-              }
-            }
-        default:
-          /* Unsupported type of destination image */
-          return MLIB_FAILURE;
-        }
-      }
-
-    case MLIB_SHORT:
-      {
-        mlib_s16 *sdata = mlib_ImageGetData(src);
-
-        sstride /= 2;
-        switch (dtype) {
-          case MLIB_BYTE:
-            {
-              mlib_u8 *ddata = mlib_ImageGetData(dst);
-
-              switch (channels) {
-                case 3:
-                  {
-                    MAIN_COLORTRUE2INDEX_LOOP(S16, U8, 3);
-                    return MLIB_SUCCESS;
-                  }
-
-                case 4:
-                  {
-                    MAIN_COLORTRUE2INDEX_LOOP(S16, U8, 4);
-                    return MLIB_SUCCESS;
-                  }
-
-                default:
-                  return MLIB_FAILURE;
-              }
-            }
-
-          case MLIB_SHORT:
-            {
-              mlib_s16 *ddata = mlib_ImageGetData(dst);
-
-              dstride /= 2;
-              switch (channels) {
-                case 3:
-                  {
-                    MAIN_COLORTRUE2INDEX_LOOP(S16, S16, 3);
-                    return MLIB_SUCCESS;
-                  }
-
-                case 4:
-                  {
-                    MAIN_COLORTRUE2INDEX_LOOP(S16, S16, 4);
-                    return MLIB_SUCCESS;
-                  }
-
-                default:
-                  return MLIB_FAILURE;
-              }
-            }
-        default:
-          /* Unsupported type of destination image */
-          return MLIB_FAILURE;
-        }
-      }
-
-    default:
-      return MLIB_FAILURE;
-  }
-}
-
-/***************************************************************/
-mlib_u32 mlib_search_quadrant_U8_3(struct lut_node_3 *node,
-                                   mlib_u32          distance,
-                                    mlib_s32    *found_color,
-                                   mlib_u32          c0,
-                                   mlib_u32          c1,
-                                   mlib_u32          c2,
-                                   const mlib_u8     **base)
-{
-  mlib_s32 i;
-
-  for (i = 0; i < 8; i++) {
-
-    if (node->tag & (1 << i)) {
-      /* Here is alone color cell. Check the distance */
-      mlib_s32 newindex = node->contents.index[i];
-      mlib_u32 newpalc0, newpalc1, newpalc2;
-      mlib_u32 newdistance;
-
-      newpalc0 = base[0][newindex];
-      newpalc1 = base[1][newindex];
-      newpalc2 = base[2][newindex];
-      newdistance = FIND_DISTANCE_3(c0, newpalc0, c1, newpalc1, c2, newpalc2, 0);
-
-      if (distance > newdistance) {
-        *found_color = newindex;
-        distance = newdistance;
-      }
-    }
-    else if (node->contents.quadrants[i])
-      distance =
-        mlib_search_quadrant_U8_3(node->contents.quadrants[i], distance,
-                                  found_color, c0, c1, c2, base);
-  }
-
-  return distance;
-}
-
-/***************************************************************/
-mlib_u32 mlib_search_quadrant_part_to_left_U8_3(struct lut_node_3 *node,
-                                                mlib_u32          distance,
-                                                 mlib_s32    *found_color,
-                                                const mlib_u32    *c,
-                                                const mlib_u8     **base,
-                                                mlib_u32          position,
-                                                mlib_s32          pass,
-                                                mlib_s32          dir_bit)
-{
-  mlib_u32 current_size = 1 << pass;
-  mlib_s32 i;
-  static mlib_s32 opposite_quadrants[3][4] = {
-    {0, 2, 4, 6},
-    {0, 1, 4, 5},
-    {0, 1, 2, 3}
-  };
-
-/* Search only quadrant's half untill it is necessary to check the
-  whole quadrant */
-
-  if (distance < (position + current_size - c[dir_bit]) * (position + current_size - c[dir_bit])) { /* Search half of quadrant */
-    for (i = 0; i < 4; i++) {
-      mlib_s32 qq = opposite_quadrants[dir_bit][i];
-
-      if (node->tag & (1 << qq)) {
-        /* Here is alone color cell. Check the distance */
-        mlib_s32 newindex = node->contents.index[qq];
-        mlib_u32 newpalc0, newpalc1, newpalc2;
-        mlib_u32 newdistance;
-
-        newpalc0 = base[0][newindex];
-        newpalc1 = base[1][newindex];
-        newpalc2 = base[2][newindex];
-        newdistance = FIND_DISTANCE_3(c[0], newpalc0, c[1], newpalc1, c[2], newpalc2, 0);
-
-        if (distance > newdistance) {
-          *found_color = newindex;
-          distance = newdistance;
-        }
-      }
-      else if (node->contents.quadrants[qq])
-        distance =
-          mlib_search_quadrant_part_to_left_U8_3(node->contents.quadrants[qq],
-                                                 distance, found_color, c, base,
-                                                 position, pass - 1, dir_bit);
-    }
-  }
-  else {                                    /* Search whole quadrant */
-
-    mlib_s32 mask = 1 << dir_bit;
-
-    for (i = 0; i < 8; i++) {
-
-      if (node->tag & (1 << i)) {
-        /* Here is alone color cell. Check the distance */
-        mlib_s32 newindex = node->contents.index[i];
-        mlib_u32 newpalc0, newpalc1, newpalc2;
-        mlib_u32 newdistance;
-
-        newpalc0 = base[0][newindex];
-        newpalc1 = base[1][newindex];
-        newpalc2 = base[2][newindex];
-        newdistance = FIND_DISTANCE_3(c[0], newpalc0, c[1], newpalc1, c[2], newpalc2, 0);
-
-        if (distance > newdistance) {
-          *found_color = newindex;
-          distance = newdistance;
-        }
-      }
-      else if (node->contents.quadrants[i]) {
-
-        if (i & mask)
-          /* This quadrant may require partial checking */
-          distance =
-            mlib_search_quadrant_part_to_left_U8_3(node->contents.quadrants[i],
-                                                   distance, found_color, c,
-                                                   base,
-                                                   position + current_size,
-                                                   pass - 1, dir_bit);
-        else
-          /* Here we should check all */
-          distance =
-            mlib_search_quadrant_U8_3(node->contents.quadrants[i], distance,
-                                      found_color, c[0], c[1], c[2], base);
-      }
-    }
-  }
-
-  return distance;
-}
-
-/***************************************************************/
-mlib_u32 mlib_search_quadrant_part_to_right_U8_3(struct lut_node_3 *node,
-                                                 mlib_u32          distance,
-                                                  mlib_s32    *found_color,
-                                                 const mlib_u32    *c,
-                                                 const mlib_u8     **base,
-                                                 mlib_u32          position,
-                                                 mlib_s32          pass,
-                                                 mlib_s32          dir_bit)
-{
-  mlib_u32 current_size = 1 << pass;
-  mlib_s32 i;
-  static mlib_s32 opposite_quadrants[3][4] = {
-    {1, 3, 5, 7},
-    {2, 3, 6, 7},
-    {4, 5, 6, 7}
-  };
-
-/* Search only quadrant's half untill it is necessary to check the
-  whole quadrant */
-
-  if (distance <= (c[dir_bit] - position - current_size) * (c[dir_bit] - position - current_size)) { /* Search half of quadrant */
-    for (i = 0; i < 4; i++) {
-      mlib_s32 qq = opposite_quadrants[dir_bit][i];
-
-      if (node->tag & (1 << qq)) {
-        /* Here is alone color cell. Check the distance */
-        mlib_s32 newindex = node->contents.index[qq];
-        mlib_u32 newpalc0, newpalc1, newpalc2;
-        mlib_u32 newdistance;
-
-        newpalc0 = base[0][newindex];
-        newpalc1 = base[1][newindex];
-        newpalc2 = base[2][newindex];
-        newdistance = FIND_DISTANCE_3(c[0], newpalc0, c[1], newpalc1, c[2], newpalc2, 0);
-
-        if (distance > newdistance) {
-          *found_color = newindex;
-          distance = newdistance;
-        }
-      }
-      else if (node->contents.quadrants[qq])
-        distance =
-          mlib_search_quadrant_part_to_right_U8_3(node->contents.quadrants[qq],
-                                                  distance, found_color, c,
-                                                  base, position + current_size,
-                                                  pass - 1, dir_bit);
-    }
-  }
-  else {                                    /* Search whole quadrant */
-
-    mlib_s32 mask = 1 << dir_bit;
-
-    for (i = 0; i < 8; i++) {
-
-      if (node->tag & (1 << i)) {
-        /* Here is alone color cell. Check the distance */
-        mlib_s32 newindex = node->contents.index[i];
-        mlib_u32 newpalc0, newpalc1, newpalc2;
-        mlib_u32 newdistance;
-
-        newpalc0 = base[0][newindex];
-        newpalc1 = base[1][newindex];
-        newpalc2 = base[2][newindex];
-        newdistance = FIND_DISTANCE_3(c[0], newpalc0, c[1], newpalc1, c[2], newpalc2, 0);
-
-        if (distance > newdistance) {
-          *found_color = newindex;
-          distance = newdistance;
-        }
-      }
-      else if (node->contents.quadrants[i]) {
-
-        if (i & mask)
-          /* Here we should check all */
-          distance =
-            mlib_search_quadrant_U8_3(node->contents.quadrants[i], distance,
-                                      found_color, c[0], c[1], c[2], base);
-        else
-          /* This quadrant may require partial checking */
-          distance =
-            mlib_search_quadrant_part_to_right_U8_3(node->contents.quadrants[i],
-                                                    distance, found_color, c,
-                                                    base, position, pass - 1, dir_bit);
-      }
-    }
-  }
-
-  return distance;
-}
-
-/***************************************************************/
-mlib_u32 mlib_search_quadrant_S16_3(struct lut_node_3 *node,
-                                    mlib_u32          distance,
-                                     mlib_s32    *found_color,
-                                    mlib_u32          c0,
-                                    mlib_u32          c1,
-                                    mlib_u32          c2,
-                                    const mlib_s16    **base)
-{
-  mlib_s32 i;
-
-  for (i = 0; i < 8; i++) {
-
-    if (node->tag & (1 << i)) {
-      /* Here is alone color cell. Check the distance */
-      mlib_s32 newindex = node->contents.index[i];
-      mlib_u32 newpalc0, newpalc1, newpalc2;
-      mlib_u32 newdistance;
-
-      newpalc0 = base[0][newindex] - MLIB_S16_MIN;
-      newpalc1 = base[1][newindex] - MLIB_S16_MIN;
-      newpalc2 = base[2][newindex] - MLIB_S16_MIN;
-      newdistance = FIND_DISTANCE_3(c0, newpalc0, c1, newpalc1, c2, newpalc2, 2);
-
-      if (distance > newdistance) {
-        *found_color = newindex;
-        distance = newdistance;
-      }
-    }
-    else if (node->contents.quadrants[i])
-      distance =
-        mlib_search_quadrant_S16_3(node->contents.quadrants[i], distance,
-                                   found_color, c0, c1, c2, base);
-  }
-
-  return distance;
-}
-
-/***************************************************************/
-mlib_u32 mlib_search_quadrant_part_to_left_S16_3(struct lut_node_3 *node,
-                                                 mlib_u32          distance,
-                                                  mlib_s32    *found_color,
-                                                 const mlib_u32    *c,
-                                                 const mlib_s16    **base,
-                                                 mlib_u32          position,
-                                                 mlib_s32          pass,
-                                                 mlib_s32          dir_bit)
-{
-  mlib_u32 current_size = 1 << pass;
-  mlib_s32 i;
-  static mlib_s32 opposite_quadrants[3][4] = {
-    {0, 2, 4, 6},
-    {0, 1, 4, 5},
-    {0, 1, 2, 3}
-  };
-
-/* Search only quadrant's half untill it is necessary to check the
-  whole quadrant */
-
-  if (distance < (((position + current_size - c[dir_bit]) * (position + current_size - c[dir_bit])) >> 2)) { /* Search half of quadrant */
-    for (i = 0; i < 4; i++) {
-      mlib_s32 qq = opposite_quadrants[dir_bit][i];
-
-      if (node->tag & (1 << qq)) {
-        /* Here is alone color cell. Check the distance */
-        mlib_s32 newindex = node->contents.index[qq];
-        mlib_u32 newpalc0, newpalc1, newpalc2;
-        mlib_u32 newdistance;
-
-        newpalc0 = base[0][newindex] - MLIB_S16_MIN;
-        newpalc1 = base[1][newindex] - MLIB_S16_MIN;
-        newpalc2 = base[2][newindex] - MLIB_S16_MIN;
-        newdistance = FIND_DISTANCE_3(c[0], newpalc0, c[1], newpalc1, c[2], newpalc2, 2);
-
-        if (distance > newdistance) {
-          *found_color = newindex;
-          distance = newdistance;
-        }
-      }
-      else if (node->contents.quadrants[qq])
-        distance =
-          mlib_search_quadrant_part_to_left_S16_3(node->contents.quadrants[qq],
-                                                  distance, found_color, c,
-                                                  base, position, pass - 1, dir_bit);
-    }
-  }
-  else {                                    /* Search whole quadrant */
-
-    mlib_s32 mask = 1 << dir_bit;
-
-    for (i = 0; i < 8; i++) {
-
-      if (node->tag & (1 << i)) {
-        /* Here is alone color cell. Check the distance */
-        mlib_s32 newindex = node->contents.index[i];
-        mlib_u32 newpalc0, newpalc1, newpalc2;
-        mlib_u32 newdistance;
-
-        newpalc0 = base[0][newindex] - MLIB_S16_MIN;
-        newpalc1 = base[1][newindex] - MLIB_S16_MIN;
-        newpalc2 = base[2][newindex] - MLIB_S16_MIN;
-        newdistance = FIND_DISTANCE_3(c[0], newpalc0, c[1], newpalc1, c[2], newpalc2, 2);
-
-        if (distance > newdistance) {
-          *found_color = newindex;
-          distance = newdistance;
-        }
-      }
-      else if (node->contents.quadrants[i]) {
-
-        if (i & mask)
-          /* This quadrant may require partial checking */
-          distance =
-            mlib_search_quadrant_part_to_left_S16_3(node->contents.quadrants[i],
-                                                    distance, found_color, c,
-                                                    base,
-                                                    position + current_size,
-                                                    pass - 1, dir_bit);
-        else
-          /* Here we should check all */
-          distance =
-            mlib_search_quadrant_S16_3(node->contents.quadrants[i], distance,
-                                       found_color, c[0], c[1], c[2], base);
-      }
-    }
-  }
-
-  return distance;
-}
-
-/***************************************************************/
-mlib_u32 mlib_search_quadrant_part_to_right_S16_3(struct lut_node_3 *node,
-                                                  mlib_u32          distance,
-                                                   mlib_s32    *found_color,
-                                                  const mlib_u32    *c,
-                                                  const mlib_s16    **base,
-                                                  mlib_u32          position,
-                                                  mlib_s32          pass,
-                                                  mlib_s32          dir_bit)
-{
-  mlib_u32 current_size = 1 << pass;
-  mlib_s32 i;
-  static mlib_s32 opposite_quadrants[3][4] = {
-    {1, 3, 5, 7},
-    {2, 3, 6, 7},
-    {4, 5, 6, 7}
-  };
-
-/* Search only quadrant's half untill it is necessary to check the
-  whole quadrant */
-
-  if (distance <= (((c[dir_bit] - position - current_size) * (c[dir_bit] - position - current_size)) >> 2)) { /* Search half of quadrant */
-    for (i = 0; i < 4; i++) {
-      mlib_s32 qq = opposite_quadrants[dir_bit][i];
-
-      if (node->tag & (1 << qq)) {
-        /* Here is alone color cell. Check the distance */
-        mlib_s32 newindex = node->contents.index[qq];
-        mlib_u32 newpalc0, newpalc1, newpalc2;
-        mlib_u32 newdistance;
-
-        newpalc0 = base[0][newindex] - MLIB_S16_MIN;
-        newpalc1 = base[1][newindex] - MLIB_S16_MIN;
-        newpalc2 = base[2][newindex] - MLIB_S16_MIN;
-        newdistance = FIND_DISTANCE_3(c[0], newpalc0, c[1], newpalc1, c[2], newpalc2, 2);
-
-        if (distance > newdistance) {
-          *found_color = newindex;
-          distance = newdistance;
-        }
-      }
-      else if (node->contents.quadrants[qq])
-        distance =
-          mlib_search_quadrant_part_to_right_S16_3(node->contents.quadrants[qq],
-                                                   distance, found_color, c,
-                                                   base,
-                                                   position + current_size,
-                                                   pass - 1, dir_bit);
-    }
-  }
-  else {                                    /* Search whole quadrant */
-
-    mlib_s32 mask = 1 << dir_bit;
-
-    for (i = 0; i < 8; i++) {
-
-      if (node->tag & (1 << i)) {
-        /* Here is alone color cell. Check the distance */
-        mlib_s32 newindex = node->contents.index[i];
-        mlib_u32 newpalc0, newpalc1, newpalc2;
-        mlib_u32 newdistance;
-
-        newpalc0 = base[0][newindex] - MLIB_S16_MIN;
-        newpalc1 = base[1][newindex] - MLIB_S16_MIN;
-        newpalc2 = base[2][newindex] - MLIB_S16_MIN;
-        newdistance = FIND_DISTANCE_3(c[0], newpalc0, c[1], newpalc1, c[2], newpalc2, 2);
-
-        if (distance > newdistance) {
-          *found_color = newindex;
-          distance = newdistance;
-        }
-      }
-      else if (node->contents.quadrants[i]) {
-
-        if (i & mask)
-          /* Here we should check all */
-          distance =
-            mlib_search_quadrant_S16_3(node->contents.quadrants[i], distance,
-                                       found_color, c[0], c[1], c[2], base);
-        else
-          /* This quadrant may require partial checking */
-          distance =
-            mlib_search_quadrant_part_to_right_S16_3(node->contents.
-                                                     quadrants[i], distance,
-                                                     found_color, c, base,
-                                                     position, pass - 1, dir_bit);
-      }
-    }
-  }
-
-  return distance;
-}
-
-/***************************************************************/
-mlib_u32 mlib_search_quadrant_U8_4(struct lut_node_4 *node,
-                                   mlib_u32          distance,
-                                    mlib_s32    *found_color,
-                                   mlib_u32          c0,
-                                   mlib_u32          c1,
-                                   mlib_u32          c2,
-                                   mlib_u32          c3,
-                                   const mlib_u8     **base)
-{
-  mlib_s32 i;
-
-  for (i = 0; i < 16; i++) {
-
-    if (node->tag & (1 << i)) {
-      /* Here is alone color cell. Check the distance */
-      mlib_s32 newindex = node->contents.index[i];
-      mlib_u32 newpalc0, newpalc1, newpalc2, newpalc3;
-      mlib_u32 newdistance;
-
-      newpalc0 = base[0][newindex];
-      newpalc1 = base[1][newindex];
-      newpalc2 = base[2][newindex];
-      newpalc3 = base[3][newindex];
-      newdistance = FIND_DISTANCE_4(c0, newpalc0,
-                                    c1, newpalc1, c2, newpalc2, c3, newpalc3, 0);
-
-      if (distance > newdistance) {
-        *found_color = newindex;
-        distance = newdistance;
-      }
-    }
-    else if (node->contents.quadrants[i])
-      distance =
-        mlib_search_quadrant_U8_4(node->contents.quadrants[i], distance,
-                                  found_color, c0, c1, c2, c3, base);
-  }
-
-  return distance;
-}
-
-/***************************************************************/
-mlib_u32 mlib_search_quadrant_part_to_left_U8_4(struct lut_node_4 *node,
-                                                mlib_u32          distance,
-                                                 mlib_s32    *found_color,
-                                                const mlib_u32    *c,
-                                                const mlib_u8     **base,
-                                                mlib_u32          position,
-                                                mlib_s32          pass,
-                                                mlib_s32          dir_bit)
-{
-  mlib_u32 current_size = 1 << pass;
-  mlib_s32 i;
-  static mlib_s32 opposite_quadrants[4][8] = {
-    {0, 2, 4, 6, 8, 10, 12, 14},
-    {0, 1, 4, 5, 8, 9, 12, 13},
-    {0, 1, 2, 3, 8, 9, 10, 11},
-    {0, 1, 2, 3, 4, 5, 6, 7}
-  };
-
-/* Search only quadrant's half untill it is necessary to check the
-  whole quadrant */
-
-  if (distance < (position + current_size - c[dir_bit]) * (position + current_size - c[dir_bit])) { /* Search half of quadrant */
-    for (i = 0; i < 8; i++) {
-      mlib_s32 qq = opposite_quadrants[dir_bit][i];
-
-      if (node->tag & (1 << qq)) {
-        /* Here is alone color cell. Check the distance */
-        mlib_s32 newindex = node->contents.index[qq];
-        mlib_u32 newpalc0, newpalc1, newpalc2, newpalc3;
-        mlib_u32 newdistance;
-
-        newpalc0 = base[0][newindex];
-        newpalc1 = base[1][newindex];
-        newpalc2 = base[2][newindex];
-        newpalc3 = base[3][newindex];
-        newdistance = FIND_DISTANCE_4(c[0], newpalc0,
-                                      c[1], newpalc1, c[2], newpalc2, c[3], newpalc3, 0);
-
-        if (distance > newdistance) {
-          *found_color = newindex;
-          distance = newdistance;
-        }
-      }
-      else if (node->contents.quadrants[qq])
-        distance =
-          mlib_search_quadrant_part_to_left_U8_4(node->contents.quadrants[qq],
-                                                 distance, found_color, c, base,
-                                                 position, pass - 1, dir_bit);
-    }
-  }
-  else {                                    /* Search whole quadrant */
-
-    mlib_s32 mask = 1 << dir_bit;
-
-    for (i = 0; i < 16; i++) {
-
-      if (node->tag & (1 << i)) {
-        /* Here is alone color cell. Check the distance */
-        mlib_s32 newindex = node->contents.index[i];
-        mlib_u32 newpalc0, newpalc1, newpalc2, newpalc3;
-        mlib_u32 newdistance;
-
-        newpalc0 = base[0][newindex];
-        newpalc1 = base[1][newindex];
-        newpalc2 = base[2][newindex];
-        newpalc3 = base[3][newindex];
-        newdistance = FIND_DISTANCE_4(c[0], newpalc0,
-                                      c[1], newpalc1, c[2], newpalc2, c[3], newpalc3, 0);
-
-        if (distance > newdistance) {
-          *found_color = newindex;
-          distance = newdistance;
-        }
-      }
-      else if (node->contents.quadrants[i]) {
-
-        if (i & mask)
-          /* This quadrant may require partial checking */
-          distance =
-            mlib_search_quadrant_part_to_left_U8_4(node->contents.quadrants[i],
-                                                   distance, found_color, c,
-                                                   base,
-                                                   position + current_size,
-                                                   pass - 1, dir_bit);
-        else
-          /* Here we should check all */
-          distance =
-            mlib_search_quadrant_U8_4(node->contents.quadrants[i], distance,
-                                      found_color, c[0], c[1], c[2], c[3], base);
-      }
-    }
-  }
-
-  return distance;
-}
-
-/***************************************************************/
-mlib_u32 mlib_search_quadrant_part_to_right_U8_4(struct lut_node_4 *node,
-                                                 mlib_u32          distance,
-                                                  mlib_s32    *found_color,
-                                                 const mlib_u32    *c,
-                                                 const mlib_u8     **base,
-                                                 mlib_u32          position,
-                                                 mlib_s32          pass,
-                                                 mlib_s32          dir_bit)
-{
-  mlib_u32 current_size = 1 << pass;
-  mlib_s32 i;
-  static mlib_s32 opposite_quadrants[4][8] = {
-    {1, 3, 5, 7, 9, 11, 13, 15},
-    {2, 3, 6, 7, 10, 11, 14, 15},
-    {4, 5, 6, 7, 12, 13, 14, 15},
-    {8, 9, 10, 11, 12, 13, 14, 15}
-  };
-
-/* Search only quadrant's half untill it is necessary to check the
-  whole quadrant */
-
-  if (distance <= (c[dir_bit] - position - current_size) * (c[dir_bit] - position - current_size)) { /* Search half of quadrant */
-    for (i = 0; i < 8; i++) {
-      mlib_s32 qq = opposite_quadrants[dir_bit][i];
-
-      if (node->tag & (1 << qq)) {
-        /* Here is alone color cell. Check the distance */
-        mlib_s32 newindex = node->contents.index[qq];
-        mlib_u32 newpalc0, newpalc1, newpalc2, newpalc3;
-        mlib_u32 newdistance;
-
-        newpalc0 = base[0][newindex];
-        newpalc1 = base[1][newindex];
-        newpalc2 = base[2][newindex];
-        newpalc3 = base[3][newindex];
-        newdistance = FIND_DISTANCE_4(c[0], newpalc0,
-                                      c[1], newpalc1, c[2], newpalc2, c[3], newpalc3, 0);
-
-        if (distance > newdistance) {
-          *found_color = newindex;
-          distance = newdistance;
-        }
-      }
-      else if (node->contents.quadrants[qq])
-        distance =
-          mlib_search_quadrant_part_to_right_U8_4(node->contents.quadrants[qq],
-                                                  distance, found_color, c,
-                                                  base, position + current_size,
-                                                  pass - 1, dir_bit);
-    }
-  }
-  else {                                    /* Search whole quadrant */
-
-    mlib_s32 mask = 1 << dir_bit;
-
-    for (i = 0; i < 16; i++) {
-
-      if (node->tag & (1 << i)) {
-        /* Here is alone color cell. Check the distance */
-        mlib_s32 newindex = node->contents.index[i];
-        mlib_u32 newpalc0, newpalc1, newpalc2, newpalc3;
-        mlib_u32 newdistance;
-
-        newpalc0 = base[0][newindex];
-        newpalc1 = base[1][newindex];
-        newpalc2 = base[2][newindex];
-        newpalc3 = base[3][newindex];
-        newdistance = FIND_DISTANCE_4(c[0], newpalc0,
-                                      c[1], newpalc1, c[2], newpalc2, c[3], newpalc3, 0);
-
-        if (distance > newdistance) {
-          *found_color = newindex;
-          distance = newdistance;
-        }
-      }
-      else if (node->contents.quadrants[i]) {
-
-        if (i & mask)
-          /* Here we should check all */
-          distance =
-            mlib_search_quadrant_U8_4(node->contents.quadrants[i], distance,
-                                      found_color, c[0], c[1], c[2], c[3], base);
-        else
-          /* This quadrant may require partial checking */
-          distance =
-            mlib_search_quadrant_part_to_right_U8_4(node->contents.quadrants[i],
-                                                    distance, found_color, c,
-                                                    base, position, pass - 1, dir_bit);
-      }
-    }
-  }
-
-  return distance;
-}
-
-/***************************************************************/
-mlib_u32 mlib_search_quadrant_S16_4(struct lut_node_4 *node,
-                                    mlib_u32          distance,
-                                     mlib_s32    *found_color,
-                                    mlib_u32          c0,
-                                    mlib_u32          c1,
-                                    mlib_u32          c2,
-                                    mlib_u32          c3,
-                                    const mlib_s16    **base)
-{
-  mlib_s32 i;
-
-  for (i = 0; i < 16; i++) {
-
-    if (node->tag & (1 << i)) {
-      /* Here is alone color cell. Check the distance */
-      mlib_s32 newindex = node->contents.index[i];
-      mlib_u32 newpalc0, newpalc1, newpalc2, newpalc3;
-      mlib_u32 newdistance;
-
-      newpalc0 = base[0][newindex] - MLIB_S16_MIN;
-      newpalc1 = base[1][newindex] - MLIB_S16_MIN;
-      newpalc2 = base[2][newindex] - MLIB_S16_MIN;
-      newpalc3 = base[3][newindex] - MLIB_S16_MIN;
-      newdistance = FIND_DISTANCE_4(c0, newpalc0,
-                                    c1, newpalc1, c2, newpalc2, c3, newpalc3, 2);
-
-      if (distance > newdistance) {
-        *found_color = newindex;
-        distance = newdistance;
-      }
-    }
-    else if (node->contents.quadrants[i])
-      distance =
-        mlib_search_quadrant_S16_4(node->contents.quadrants[i], distance,
-                                   found_color, c0, c1, c2, c3, base);
-  }
-
-  return distance;
-}
-
-/***************************************************************/
-mlib_u32 mlib_search_quadrant_part_to_left_S16_4(struct lut_node_4 *node,
-                                                 mlib_u32          distance,
-                                                  mlib_s32    *found_color,
-                                                 const mlib_u32    *c,
-                                                 const mlib_s16    **base,
-                                                 mlib_u32          position,
-                                                 mlib_s32          pass,
-                                                 mlib_s32          dir_bit)
-{
-  mlib_u32 current_size = 1 << pass;
-  mlib_s32 i;
-  static mlib_s32 opposite_quadrants[4][8] = {
-    {0, 2, 4, 6, 8, 10, 12, 14},
-    {0, 1, 4, 5, 8, 9, 12, 13},
-    {0, 1, 2, 3, 8, 9, 10, 11},
-    {0, 1, 2, 3, 4, 5, 6, 7}
-  };
-
-/* Search only quadrant's half untill it is necessary to check the
-  whole quadrant */
-
-  if (distance < (((position + current_size - c[dir_bit]) * (position + current_size - c[dir_bit])) >> 2)) { /* Search half of quadrant */
-    for (i = 0; i < 8; i++) {
-      mlib_s32 qq = opposite_quadrants[dir_bit][i];
-
-      if (node->tag & (1 << qq)) {
-        /* Here is alone color cell. Check the distance */
-        mlib_s32 newindex = node->contents.index[qq];
-        mlib_u32 newpalc0, newpalc1, newpalc2, newpalc3;
-        mlib_u32 newdistance;
-
-        newpalc0 = base[0][newindex] - MLIB_S16_MIN;
-        newpalc1 = base[1][newindex] - MLIB_S16_MIN;
-        newpalc2 = base[2][newindex] - MLIB_S16_MIN;
-        newpalc3 = base[3][newindex] - MLIB_S16_MIN;
-        newdistance = FIND_DISTANCE_4(c[0], newpalc0,
-                                      c[1], newpalc1, c[2], newpalc2, c[3], newpalc3, 2);
-
-        if (distance > newdistance) {
-          *found_color = newindex;
-          distance = newdistance;
-        }
-      }
-      else if (node->contents.quadrants[qq])
-        distance =
-          mlib_search_quadrant_part_to_left_S16_4(node->contents.quadrants[qq],
-                                                  distance, found_color, c,
-                                                  base, position, pass - 1, dir_bit);
-    }
-  }
-  else {                                    /* Search whole quadrant */
-
-    mlib_s32 mask = 1 << dir_bit;
-
-    for (i = 0; i < 16; i++) {
-
-      if (node->tag & (1 << i)) {
-        /* Here is alone color cell. Check the distance */
-        mlib_s32 newindex = node->contents.index[i];
-        mlib_u32 newpalc0, newpalc1, newpalc2, newpalc3;
-        mlib_u32 newdistance;
-
-        newpalc0 = base[0][newindex] - MLIB_S16_MIN;
-        newpalc1 = base[1][newindex] - MLIB_S16_MIN;
-        newpalc2 = base[2][newindex] - MLIB_S16_MIN;
-        newpalc3 = base[3][newindex] - MLIB_S16_MIN;
-        newdistance = FIND_DISTANCE_4(c[0], newpalc0,
-                                      c[1], newpalc1, c[2], newpalc2, c[3], newpalc3, 2);
-
-        if (distance > newdistance) {
-          *found_color = newindex;
-          distance = newdistance;
-        }
-      }
-      else if (node->contents.quadrants[i]) {
-
-        if (i & mask)
-          /* This quadrant may require partial checking */
-          distance =
-            mlib_search_quadrant_part_to_left_S16_4(node->contents.quadrants[i],
-                                                    distance, found_color, c,
-                                                    base,
-                                                    position + current_size,
-                                                    pass - 1, dir_bit);
-        else
-          /* Here we should check all */
-          distance =
-            mlib_search_quadrant_S16_4(node->contents.quadrants[i], distance,
-                                       found_color, c[0], c[1], c[2], c[3], base);
-      }
-    }
-  }
-
-  return distance;
-}
-
-/***************************************************************/
-mlib_u32 mlib_search_quadrant_part_to_right_S16_4(struct lut_node_4 *node,
-                                                  mlib_u32          distance,
-                                                   mlib_s32    *found_color,
-                                                  const mlib_u32    *c,
-                                                  const mlib_s16    **base,
-                                                  mlib_u32          position,
-                                                  mlib_s32          pass,
-                                                  mlib_s32          dir_bit)
-{
-  mlib_u32 current_size = 1 << pass;
-  mlib_s32 i;
-  static mlib_s32 opposite_quadrants[4][8] = {
-    {1, 3, 5, 7, 9, 11, 13, 15},
-    {2, 3, 6, 7, 10, 11, 14, 15},
-    {4, 5, 6, 7, 12, 13, 14, 15},
-    {8, 9, 10, 11, 12, 13, 14, 15}
-  };
-
-/* Search only quadrant's half untill it is necessary to check the
-  whole quadrant */
-
-  if (distance <= (((c[dir_bit] - position - current_size) * (c[dir_bit] - position - current_size)) >> 2)) { /* Search half of quadrant */
-    for (i = 0; i < 8; i++) {
-      mlib_s32 qq = opposite_quadrants[dir_bit][i];
-
-      if (node->tag & (1 << qq)) {
-        /* Here is alone color cell. Check the distance */
-        mlib_s32 newindex = node->contents.index[qq];
-        mlib_u32 newpalc0, newpalc1, newpalc2, newpalc3;
-        mlib_u32 newdistance;
-
-        newpalc0 = base[0][newindex] - MLIB_S16_MIN;
-        newpalc1 = base[1][newindex] - MLIB_S16_MIN;
-        newpalc2 = base[2][newindex] - MLIB_S16_MIN;
-        newpalc3 = base[3][newindex] - MLIB_S16_MIN;
-        newdistance = FIND_DISTANCE_4(c[0], newpalc0,
-                                      c[1], newpalc1, c[2], newpalc2, c[3], newpalc3, 2);
-
-        if (distance > newdistance) {
-          *found_color = newindex;
-          distance = newdistance;
-        }
-      }
-      else if (node->contents.quadrants[qq])
-        distance =
-          mlib_search_quadrant_part_to_right_S16_4(node->contents.quadrants[qq],
-                                                   distance, found_color, c,
-                                                   base,
-                                                   position + current_size,
-                                                   pass - 1, dir_bit);
-    }
-  }
-  else {                                    /* Search whole quadrant */
-
-    mlib_s32 mask = 1 << dir_bit;
-
-    for (i = 0; i < 16; i++) {
-
-      if (node->tag & (1 << i)) {
-        /* Here is alone color cell. Check the distance */
-        mlib_s32 newindex = node->contents.index[i];
-        mlib_u32 newpalc0, newpalc1, newpalc2, newpalc3;
-        mlib_u32 newdistance;
-
-        newpalc0 = base[0][newindex] - MLIB_S16_MIN;
-        newpalc1 = base[1][newindex] - MLIB_S16_MIN;
-        newpalc2 = base[2][newindex] - MLIB_S16_MIN;
-        newpalc3 = base[3][newindex] - MLIB_S16_MIN;
-        newdistance = FIND_DISTANCE_4(c[0], newpalc0,
-                                      c[1], newpalc1, c[2], newpalc2, c[3], newpalc3, 2);
-
-        if (distance > newdistance) {
-          *found_color = newindex;
-          distance = newdistance;
-        }
-      }
-      else if (node->contents.quadrants[i]) {
-
-        if (i & mask)
-          /* Here we should check all */
-          distance =
-            mlib_search_quadrant_S16_4(node->contents.quadrants[i], distance,
-                                       found_color, c[0], c[1], c[2], c[3], base);
-        else
-          /* This quadrant may require partial checking */
-          distance =
-            mlib_search_quadrant_part_to_right_S16_4(node->contents.
-                                                     quadrants[i], distance,
-                                                     found_color, c, base,
-                                                     position, pass - 1, dir_bit);
-      }
-    }
-  }
-
-  return distance;
-}
-
-/***************************************************************/
-
-#define TAB_SIZE_mlib_u8   256
-#define TAB_SIZE_mlib_s16 1024
-
-#define SRC_mlib_u8(i)    src[i]
-#define SRC_mlib_s16(i)   (((mlib_u16*)src)[i] >> 6)
-
-/***************************************************************/
-
-#define DIMENSIONS_SEARCH_3(STYPE, DTYPE, STEP)                 \
-{                                                               \
-  DTYPE  *tab0 = ((mlib_colormap *)state)->table;               \
-  DTYPE  *tab1 = tab0 + TAB_SIZE_##STYPE;                       \
-  DTYPE  *tab2 = tab1 + TAB_SIZE_##STYPE;                       \
-  mlib_s32 i;                                                   \
-                                                                \
-  for (i = 0; i < length; i++) {                                \
-    dst[i] = tab0[SRC_##STYPE(0)] + tab1[SRC_##STYPE(1)] +      \
-             tab2[SRC_##STYPE(2)];                              \
-    src += STEP;                                                \
-  }                                                             \
-}
-
-/***************************************************************/
-
-#define DIMENSIONS_SEARCH_4(STYPE, DTYPE)                       \
-{                                                               \
-  DTYPE  *tab0 = ((mlib_colormap *)state)->table;               \
-  DTYPE  *tab1 = tab0 + TAB_SIZE_##STYPE;                       \
-  DTYPE  *tab2 = tab1 + TAB_SIZE_##STYPE;                       \
-  DTYPE  *tab3 = tab2 + TAB_SIZE_##STYPE;                       \
-  mlib_s32 i;                                                   \
-                                                                \
-  for (i = 0; i < length; i++) {                                \
-    dst[i] = tab0[SRC_##STYPE(0)] + tab1[SRC_##STYPE(1)] +      \
-             tab2[SRC_##STYPE(2)] + tab3[SRC_##STYPE(3)];       \
-    src += 4;                                                   \
-  }                                                             \
-}
-
-/***************************************************************/
-void mlib_ImageColorTrue2IndexLine_U8_U8_3(const mlib_u8 *src,
-                                           mlib_u8       *dst,
-                                           mlib_s32      length,
-                                           const void    *state)
-{
-  mlib_colormap *s = (mlib_colormap *)state;
-
-  switch (s->method) {
-#if LUT_BYTE_COLORS_3CHANNELS <= 256
-    case LUT_BINARY_TREE_SEARCH:
-      {
-        mlib_s32 bits = s->bits;
-        BINARY_TREE_SEARCH_3(U8, mlib_u8, 8, (MLIB_U8_MAX + 1), 0, 0, 3, 0);
-      }
-      break;
-
-#endif /* LUT_BYTE_COLORS_3CHANNELS <= 256 */
-    case LUT_COLOR_CUBE_SEARCH:
-      {
-        COLOR_CUBE_U8_3_SEARCH(mlib_u8, 0, 3);
-      }
-      break;
-
-    case LUT_STUPID_SEARCH:
-      {
-#ifdef USE_VIS_CODE
-        FIND_NEAREST_U8_3;
-#else
-        FIND_NEAREST_U8_3_C(0, 3);
-#endif
-      }
-      break;
-
-    case LUT_COLOR_DIMENSIONS:
-      DIMENSIONS_SEARCH_3(mlib_u8, mlib_u8, 3)
-      break;
-  }
-}
-
-/***************************************************************/
-void mlib_ImageColorTrue2IndexLine_U8_U8_3_in_4(const mlib_u8 *src,
-                                                mlib_u8       *dst,
-                                                mlib_s32      length,
-                                                const void    *state)
-{
-  mlib_colormap *s = (mlib_colormap *)state;
-
-  switch (s->method) {
-#if LUT_BYTE_COLORS_3CHANNELS <= 256
-    case LUT_BINARY_TREE_SEARCH:
-      {
-        mlib_s32 bits = s->bits;
-        BINARY_TREE_SEARCH_3(U8, mlib_u8, 8, (MLIB_U8_MAX + 1), 0, 1, 4, 0);
-        break;
-      }
-
-#endif /* LUT_BYTE_COLORS_3CHANNELS <= 256 */
-    case LUT_COLOR_CUBE_SEARCH:
-      {
-        COLOR_CUBE_U8_3_SEARCH(mlib_u8, 1, 4);
-        break;
-      }
-
-    case LUT_STUPID_SEARCH:
-      {
-#ifdef USE_VIS_CODE
-        FIND_NEAREST_U8_3_IN4;
-#else
-        FIND_NEAREST_U8_3_C(1, 4);
-#endif
-        break;
-      }
-
-    case LUT_COLOR_DIMENSIONS:
-      src++;
-      DIMENSIONS_SEARCH_3(mlib_u8, mlib_u8, 4)
-      break;
-  }
-}
-
-/***************************************************************/
-void mlib_ImageColorTrue2IndexLine_U8_U8_4(const mlib_u8 *src,
-                                           mlib_u8       *dst,
-                                           mlib_s32      length,
-                                           const void    *state)
-{
-  mlib_colormap *s = (mlib_colormap *)state;
-
-  switch (s->method) {
-#if LUT_BYTE_COLORS_4CHANNELS <= 256
-    case LUT_BINARY_TREE_SEARCH:
-      {
-        mlib_s32 bits = s->bits;
-        BINARY_TREE_SEARCH_4(U8, mlib_u8, 8, (MLIB_U8_MAX + 1), 0, 0);
-        break;
-      }
-
-#endif /* LUT_BYTE_COLORS_4CHANNELS <= 256 */
-    case LUT_COLOR_CUBE_SEARCH:
-      {
-        COLOR_CUBE_U8_4_SEARCH(mlib_u8);
-        break;
-      }
-
-    case LUT_STUPID_SEARCH:
-      {
-#ifdef USE_VIS_CODE
-        FIND_NEAREST_U8_4;
-#else
-        FIND_NEAREST_U8_4_C;
-#endif
-        break;
-      }
-
-    case LUT_COLOR_DIMENSIONS:
-      DIMENSIONS_SEARCH_4(mlib_u8, mlib_u8)
-      break;
-  }
-}
-
-/***************************************************************/
-void mlib_ImageColorTrue2IndexLine_U8_S16_3(const mlib_u8 *src,
-                                            mlib_s16      *dst,
-                                            mlib_s32      length,
-                                            const void    *state)
-{
-  mlib_colormap *s = (mlib_colormap *)state;
-  mlib_s32 bits = s->bits;
-
-  switch (s->method) {
-    case LUT_BINARY_TREE_SEARCH:
-      {
-        BINARY_TREE_SEARCH_3(U8, mlib_u8, 8, (MLIB_U8_MAX + 1), 0, 0, 3, 0);
-        break;
-      }
-
-    case LUT_COLOR_CUBE_SEARCH:
-      {
-        switch (s->indexsize) {
-          case 1:
-            {
-              COLOR_CUBE_U8_3_SEARCH(mlib_u8, 0, 3);
-              break;
-            }
-
-          case 2:
-            {
-              COLOR_CUBE_U8_3_SEARCH(mlib_s16, 0, 3);
-              break;
-            }
-        }
-
-        break;
-      }
-
-    case LUT_STUPID_SEARCH:
-      {
-#ifdef USE_VIS_CODE
-        FIND_NEAREST_U8_3;
-#else
-        FIND_NEAREST_U8_3_C(0, 3);
-#endif
-        break;
-      }
-
-    case LUT_COLOR_DIMENSIONS:
-      DIMENSIONS_SEARCH_3(mlib_u8, mlib_s16, 3)
-      break;
-  }
-}
-
-/***************************************************************/
-void mlib_ImageColorTrue2IndexLine_U8_S16_3_in_4(const mlib_u8 *src,
-                                                 mlib_s16      *dst,
-                                                 mlib_s32      length,
-                                                 const void    *state)
-{
-  mlib_colormap *s = (mlib_colormap *)state;
-  mlib_s32 bits = s->bits;
-
-  switch (s->method) {
-    case LUT_BINARY_TREE_SEARCH:
-      {
-        BINARY_TREE_SEARCH_3(U8, mlib_u8, 8, (MLIB_U8_MAX + 1), 0, 1, 4, 0);
-        break;
-      }
-
-    case LUT_COLOR_CUBE_SEARCH:
-      {
-        switch (s->indexsize) {
-          case 1:
-            {
-              COLOR_CUBE_U8_3_SEARCH(mlib_u8, 1, 4);
-              break;
-            }
-
-          case 2:
-            {
-              COLOR_CUBE_U8_3_SEARCH(mlib_s16, 1, 4);
-              break;
-            }
-        }
-
-        break;
-      }
-
-    case LUT_STUPID_SEARCH:
-      {
-#ifdef USE_VIS_CODE
-        FIND_NEAREST_U8_3_IN4;
-#else
-        FIND_NEAREST_U8_3_C(1, 4);
-#endif
-        break;
-      }
-
-    case LUT_COLOR_DIMENSIONS:
-      src++;
-      DIMENSIONS_SEARCH_3(mlib_u8, mlib_s16, 4)
-      break;
-  }
-}
-
-/***************************************************************/
-void mlib_ImageColorTrue2IndexLine_U8_S16_4(const mlib_u8 *src,
-                                            mlib_s16      *dst,
-                                            mlib_s32      length,
-                                            const void    *state)
-{
-  mlib_colormap *s = (mlib_colormap *)state;
-  mlib_s32 bits = s->bits;
-
-  switch (s->method) {
-    case LUT_BINARY_TREE_SEARCH:
-      {
-        BINARY_TREE_SEARCH_4(U8, mlib_u8, 8, (MLIB_U8_MAX + 1), 0, 0);
-        break;
-      }
-
-    case LUT_COLOR_CUBE_SEARCH:
-      {
-        switch (s->indexsize) {
-          case 1:
-            {
-              COLOR_CUBE_U8_4_SEARCH(mlib_u8);
-              break;
-            }
-
-          case 2:
-            {
-              COLOR_CUBE_U8_4_SEARCH(mlib_s16);
-              break;
-            }
-        }
-
-        break;
-      }
-
-    case LUT_STUPID_SEARCH:
-      {
-#ifdef USE_VIS_CODE
-        FIND_NEAREST_U8_4;
-#else
-        FIND_NEAREST_U8_4_C;
-#endif
-        break;
-      }
-
-    case LUT_COLOR_DIMENSIONS:
-      DIMENSIONS_SEARCH_4(mlib_u8, mlib_s16)
-      break;
-  }
-}
-
-/***************************************************************/
-void mlib_ImageColorTrue2IndexLine_S16_S16_3(const mlib_s16 *src,
-                                             mlib_s16       *dst,
-                                             mlib_s32       length,
-                                             const void     *state)
-{
-  mlib_colormap *s = (mlib_colormap *)state;
-  mlib_s32 bits = s->bits;
-
-  switch (s->method) {
-    case LUT_BINARY_TREE_SEARCH:
-      {
-        BINARY_TREE_SEARCH_3(S16, mlib_s16, 16, ((MLIB_S16_MAX + 1) * 2),
-                             MLIB_S16_MIN, 0, 3, 2);
-        break;
-      }
-
-    case LUT_COLOR_CUBE_SEARCH:
-      {
-        switch (s->indexsize) {
-          case 1:
-            {
-              COLOR_CUBE_S16_3_SEARCH(mlib_u8, 0, 3);
-              break;
-            }
-
-          case 2:
-            {
-              COLOR_CUBE_S16_3_SEARCH(mlib_s16, 0, 3);
-              break;
-            }
-        }
-
-        break;
-      }
-
-    case LUT_STUPID_SEARCH:
-      {
-        FIND_NEAREST_S16_3(0, 3);
-        break;
-      }
-
-    case LUT_COLOR_DIMENSIONS:
-      DIMENSIONS_SEARCH_3(mlib_s16, mlib_s16, 3)
-      break;
-  }
-}
-
-/***************************************************************/
-void mlib_ImageColorTrue2IndexLine_S16_S16_3_in_4(const mlib_s16 *src,
-                                                  mlib_s16       *dst,
-                                                  mlib_s32       length,
-                                                  const void     *state)
-{
-  mlib_colormap *s = (mlib_colormap *)state;
-  mlib_s32 bits = s->bits;
-
-  switch (s->method) {
-    case LUT_BINARY_TREE_SEARCH:
-      {
-        BINARY_TREE_SEARCH_3(S16, mlib_s16, 16, ((MLIB_S16_MAX + 1) * 2),
-                             MLIB_S16_MIN, 1, 4, 2);
-        break;
-      }
-
-    case LUT_COLOR_CUBE_SEARCH:
-      {
-        switch (s->indexsize) {
-          case 1:
-            {
-              COLOR_CUBE_S16_3_SEARCH(mlib_u8, 1, 4);
-              break;
-            }
-
-          case 2:
-            {
-              COLOR_CUBE_S16_3_SEARCH(mlib_s16, 1, 4);
-              break;
-            }
-        }
-
-        break;
-      }
-
-    case LUT_STUPID_SEARCH:
-      {
-        FIND_NEAREST_S16_3(1, 4);
-        break;
-      }
-
-    case LUT_COLOR_DIMENSIONS:
-      src++;
-      DIMENSIONS_SEARCH_3(mlib_s16, mlib_s16, 4)
-      break;
-  }
-}
-
-/***************************************************************/
-void mlib_ImageColorTrue2IndexLine_S16_S16_4(const mlib_s16 *src,
-                                             mlib_s16       *dst,
-                                             mlib_s32       length,
-                                             const void     *state)
-{
-  mlib_colormap *s = (mlib_colormap *)state;
-  mlib_s32 bits = s->bits;
-
-  switch (s->method) {
-    case LUT_BINARY_TREE_SEARCH:
-      {
-        BINARY_TREE_SEARCH_4(S16, mlib_s16, 16, ((MLIB_S16_MAX + 1) * 2),
-                             MLIB_S16_MIN, 2);
-        break;
-      }
-
-    case LUT_COLOR_CUBE_SEARCH:
-      {
-        switch (s->indexsize) {
-          case 1:
-            {
-              COLOR_CUBE_S16_4_SEARCH(mlib_u8);
-              break;
-            }
-
-          case 2:
-            {
-              COLOR_CUBE_S16_4_SEARCH(mlib_s16);
-              break;
-            }
-        }
-
-        break;
-      }
-
-    case LUT_STUPID_SEARCH:
-      {
-        FIND_NEAREST_S16_4;
-        break;
-      }
-
-    case LUT_COLOR_DIMENSIONS:
-      DIMENSIONS_SEARCH_4(mlib_s16, mlib_s16)
-      break;
-  }
-}
-
-/***************************************************************/
-void mlib_ImageColorTrue2IndexLine_S16_U8_3(const mlib_s16 *src,
-                                            mlib_u8        *dst,
-                                            mlib_s32       length,
-                                            const void     *state)
-{
-  mlib_colormap *s = (mlib_colormap *)state;
-
-  switch (s->method) {
-#if LUT_SHORT_COLORS_3CHANNELS <= 256
-    case LUT_BINARY_TREE_SEARCH:
-      {
-        mlib_s32 bits = s->bits;
-        BINARY_TREE_SEARCH_3(S16, mlib_s16, 16, ((MLIB_S16_MAX + 1) * 2),
-                             MLIB_S16_MIN, 0, 3, 2);
-        break;
-      }
-
-#endif /* LUT_SHORT_COLORS_3CHANNELS <= 256 */
-    case LUT_COLOR_CUBE_SEARCH:
-      {
-        COLOR_CUBE_S16_3_SEARCH(mlib_u8, 0, 3);
-        break;
-      }
-
-    case LUT_STUPID_SEARCH:
-      {
-        FIND_NEAREST_S16_3(0, 3);
-        break;
-      }
-
-    case LUT_COLOR_DIMENSIONS:
-      DIMENSIONS_SEARCH_3(mlib_s16, mlib_u8, 3)
-      break;
-  }
-}
-
-/***************************************************************/
-void mlib_ImageColorTrue2IndexLine_S16_U8_3_in_4(const mlib_s16 *src,
-                                                 mlib_u8        *dst,
-                                                 mlib_s32       length,
-                                                 const void     *state)
-{
-  mlib_colormap *s = (mlib_colormap *)state;
-
-  switch (s->method) {
-#if LUT_SHORT_COLORS_3CHANNELS <= 256
-    case LUT_BINARY_TREE_SEARCH:
-      {
-        mlib_s32 bits = s->bits;
-        BINARY_TREE_SEARCH_3(S16, mlib_s16, 16, ((MLIB_S16_MAX + 1) * 2),
-                             MLIB_S16_MIN, 1, 4, 2);
-        break;
-      }
-
-#endif /* LUT_SHORT_COLORS_3CHANNELS <= 256 */
-    case LUT_COLOR_CUBE_SEARCH:
-      {
-        COLOR_CUBE_S16_3_SEARCH(mlib_u8, 1, 4);
-        break;
-      }
-
-    case LUT_STUPID_SEARCH:
-      {
-        FIND_NEAREST_S16_3(1, 4);
-        break;
-      }
-
-    case LUT_COLOR_DIMENSIONS:
-      src++;
-      DIMENSIONS_SEARCH_3(mlib_s16, mlib_u8, 4)
-      break;
-  }
-}
-
-/***************************************************************/
-void mlib_ImageColorTrue2IndexLine_S16_U8_4(const mlib_s16 *src,
-                                            mlib_u8        *dst,
-                                            mlib_s32       length,
-                                            const void     *state)
-{
-  mlib_colormap *s = (mlib_colormap *)state;
-
-  switch (s->method) {
-#if LUT_SHORT_COLORS_4CHANNELS <= 256
-    case LUT_BINARY_TREE_SEARCH:
-      {
-        mlib_s32 bits = s->bits;
-        BINARY_TREE_SEARCH_4(S16, mlib_s16, 16, ((MLIB_S16_MAX + 1) * 2),
-                             MLIB_S16_MIN, 2);
-        break;
-      }
-
-#endif /* LUT_SHORT_COLORS_4CHANNELS <= 256 */
-    case LUT_COLOR_CUBE_SEARCH:
-      {
-        COLOR_CUBE_S16_4_SEARCH(mlib_u8);
-        break;
-      }
-
-    case LUT_STUPID_SEARCH:
-      {
-        FIND_NEAREST_S16_4;
-        break;
-      }
-
-    case LUT_COLOR_DIMENSIONS:
-      DIMENSIONS_SEARCH_4(mlib_s16, mlib_u8)
-      break;
-  }
-}
-
-/***************************************************************/
-
-#ifndef VIS
-
-void mlib_c_ImageThresh1_U81_1B(void     *psrc,
-                                void     *pdst,
-                                mlib_s32 src_stride,
-                                mlib_s32 dst_stride,
-                                mlib_s32 width,
-                                mlib_s32 height,
-                                void     *thresh,
-                                void     *ghigh,
-                                void     *glow,
-                                mlib_s32 dbit_off);
-
-/***************************************************************/
-
-void mlib_ImageColorTrue2IndexLine_U8_BIT_1(const mlib_u8 *src,
-                                            mlib_u8       *dst,
-                                            mlib_s32      bit_offset,
-                                            mlib_s32      length,
-                                            const void    *state)
-{
-  mlib_u8  *lut = ((mlib_colormap *)state)->table;
-  mlib_s32 thresh[1];
-  mlib_s32 ghigh[1];
-  mlib_s32 glow[1];
-
-  thresh[0] = lut[2];
-
-  glow[0]  = lut[0] - lut[1];
-  ghigh[0] = lut[1] - lut[0];
-
-  mlib_c_ImageThresh1_U81_1B((void*)src, dst, 0, 0, length, 1,
-                             thresh, ghigh, glow, bit_offset);
-}
-
-#else
-
-/***************************************************************/
-
-void mlib_v_ImageThresh1B_U8_1(const mlib_u8  *src,
-                               mlib_s32       slb,
-                               mlib_u8        *dst,
-                               mlib_s32       dlb,
-                               mlib_s32       xsize,
-                               mlib_s32       ysize,
-                               mlib_s32       dbit_off,
-                               const mlib_s32 *th,
-                               mlib_s32       hc,
-                               mlib_s32       lc);
-
-/***************************************************************/
-
-void mlib_ImageColorTrue2IndexLine_U8_BIT_1(const mlib_u8 *src,
-                                            mlib_u8       *dst,
-                                            mlib_s32      bit_offset,
-                                            mlib_s32      length,
-                                            const void    *state)
-{
-  mlib_u8  *lut = ((mlib_colormap *)state)->table;
-  mlib_s32 thresh[4];
-  mlib_s32 ghigh[1];
-  mlib_s32 glow[1];
-
-  thresh[0] = thresh[1] = thresh[2] = thresh[3] = lut[2];
-
-  glow[0]  = (lut[1] < lut[0]) ? 0xFF : 0;
-  ghigh[0] = (lut[1] < lut[0]) ? 0 : 0xFF;
-
-  mlib_v_ImageThresh1B_U8_1((void*)src, 0, dst, 0, length, 1,
-                            bit_offset, thresh, ghigh[0], glow[0]);
-}
-
-/***************************************************************/
-
-#endif
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageColormap.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageColormap.h
deleted file mode 100644
index 331851bfc7a..00000000000
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageColormap.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, 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.
- */
-
-
-#ifndef __MLIB_IMAGECOLORMAP_H
-#define __MLIB_IMAGECOLORMAP_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-typedef struct {
-  void **lut;
-  mlib_s32 channels;
-  mlib_type intype;
-  mlib_s32 offset;
-  void *table;
-  mlib_s32 bits;
-  mlib_s32 method;
-  mlib_s32 lutlength;
-  mlib_s32 indexsize;
-  mlib_type outtype;
-  void *normal_table;
-  mlib_d64 *double_lut;
-} mlib_colormap;
-
-/***************************************************************/
-#define LUT_COLOR_CUBE_SEARCH  0
-#define LUT_BINARY_TREE_SEARCH 1
-#define LUT_STUPID_SEARCH      2
-#define LUT_COLOR_DIMENSIONS   3
-
-/***************************************************************/
-
-/* Bit set in the tag denotes that the corresponding quadrant is a
-   palette index, not node. If the bit is clear, this means that that
-   is a pointer to the down level node. If the bit is clear and the
-   corresponding quadrant is NULL, then there is no way down there and
-   this quadrant is clear. */
-
-struct lut_node_3 {
-  mlib_u8 tag;
-  union {
-    struct lut_node_3 *quadrants[8];
-    long index[8];
-  } contents;
-};
-
-struct lut_node_4 {
-  mlib_u16 tag;
-  union {
-    struct lut_node_4 *quadrants[16];
-    long index[16];
-  } contents;
-};
-
-/***************************************************************/
-
-#define mlib_ImageGetLutData(colormap)                          \
-  ((void **)((( mlib_colormap *)( colormap))->lut))
-
-/***************************************************************/
-#define mlib_ImageGetLutNormalTable(colormap)                   \
-  ((void *)((( mlib_colormap *)( colormap))->normal_table))
-
-/***************************************************************/
-#define mlib_ImageGetLutInversTable(colormap)                   \
-  ((void *)((( mlib_colormap *)( colormap))->table))
-
-/***************************************************************/
-#define mlib_ImageGetLutChannels(colormap)                      \
-  ((mlib_s32)((( mlib_colormap *)( colormap))->channels))
-
-/***************************************************************/
-#define mlib_ImageGetLutType(colormap)                          \
-  ((mlib_type)((( mlib_colormap *)( colormap))->intype))
-
-/***************************************************************/
-#define mlib_ImageGetIndexSize(colormap)                        \
-  ((mlib_s32)((( mlib_colormap *)( colormap))->indexsize))
-
-/***************************************************************/
-#define mlib_ImageGetOutType(colormap)                          \
-  ((mlib_type)((( mlib_colormap *)( colormap))->outtype))
-
-/***************************************************************/
-#define mlib_ImageGetLutOffset(colormap)                        \
-  ((mlib_s32)((( mlib_colormap *)( colormap))->offset))
-
-/***************************************************************/
-#define mlib_ImageGetBits(colormap)                             \
-  ((mlib_s32)((( mlib_colormap *)( colormap))->bits))
-
-/***************************************************************/
-#define mlib_ImageGetMethod(colormap)                           \
-  ((mlib_s32)((( mlib_colormap *)( colormap))->method))
-
-/***************************************************************/
-#define mlib_ImageGetLutDoubleData(colormap)                    \
-  ((mlib_d64 *)((( mlib_colormap *)( colormap))->double_lut))
-
-/***************************************************************/
-#define FIND_DISTANCE_3( x1, x2, y1, y2, z1, z2, SHIFT )        \
- (( ( ( ( x1 ) - ( x2 ) ) * ( ( x1 ) - ( x2 ) ) ) >> SHIFT ) +  \
-  ( ( ( ( y1 ) - ( y2 ) ) * ( ( y1 ) - ( y2 ) ) ) >> SHIFT ) +  \
-  ( ( ( ( z1 ) - ( z2 ) ) * ( ( z1 ) - ( z2 ) ) ) >> SHIFT ) )
-
-/***************************************************************/
-#define FIND_DISTANCE_4( x1, x2, y1, y2, z1, z2, w1, w2, SHIFT ) \
-  (( ( ( ( x1 ) - ( x2 ) ) * ( ( x1 ) - ( x2 ) ) ) >> SHIFT ) +  \
-   ( ( ( ( y1 ) - ( y2 ) ) * ( ( y1 ) - ( y2 ) ) ) >> SHIFT ) +  \
-   ( ( ( ( z1 ) - ( z2 ) ) * ( ( z1 ) - ( z2 ) ) ) >> SHIFT ) +  \
-   ( ( ( ( w1 ) - ( w2 ) ) * ( ( w1 ) - ( w2 ) ) ) >> SHIFT ) )
-
-/***************************************************************/
-
-void mlib_ImageColorTrue2IndexLine_U8_BIT_1(const mlib_u8 *src,
-                                            mlib_u8       *dst,
-                                            mlib_s32      bit_offset,
-                                            mlib_s32      length,
-                                            const void    *state);
-
-
-void mlib_ImageColorTrue2IndexLine_U8_U8_3(const mlib_u8 *src,
-                                           mlib_u8       *dst,
-                                           mlib_s32      length,
-                                           const void    *colormap);
-
-
-void mlib_ImageColorTrue2IndexLine_U8_U8_3_in_4(const mlib_u8 *src,
-                                                mlib_u8       *dst,
-                                                mlib_s32      length,
-                                                const void    *colormap);
-
-
-void mlib_ImageColorTrue2IndexLine_U8_U8_4(const mlib_u8 *src,
-                                           mlib_u8       *dst,
-                                           mlib_s32      length,
-                                           const void    *colormap);
-
-
-void mlib_ImageColorTrue2IndexLine_U8_S16_3(const mlib_u8 *src,
-                                            mlib_s16      *dst,
-                                            mlib_s32      length,
-                                            const void    *colormap);
-
-
-void mlib_ImageColorTrue2IndexLine_U8_S16_3_in_4(const mlib_u8 *src,
-                                                 mlib_s16      *dst,
-                                                 mlib_s32      length,
-                                                 const void    *colormap);
-
-
-void mlib_ImageColorTrue2IndexLine_U8_S16_4(const mlib_u8 *src,
-                                            mlib_s16      *dst,
-                                            mlib_s32      length,
-                                            const void    *colormap);
-
-
-void mlib_ImageColorTrue2IndexLine_S16_S16_3(const mlib_s16 *src,
-                                             mlib_s16       *dst,
-                                             mlib_s32       length,
-                                             const void     *colormap);
-
-
-void mlib_ImageColorTrue2IndexLine_S16_S16_3_in_4(const mlib_s16 *src,
-                                                  mlib_s16       *dst,
-                                                  mlib_s32       length,
-                                                  const void     *colormap);
-
-
-void mlib_ImageColorTrue2IndexLine_S16_S16_4(const mlib_s16 *src,
-                                             mlib_s16       *dst,
-                                             mlib_s32       length,
-                                             const void     *colormap);
-
-
-void mlib_ImageColorTrue2IndexLine_S16_U8_3(const mlib_s16 *src,
-                                            mlib_u8        *dst,
-                                            mlib_s32       length,
-                                            const void     *colormap);
-
-
-void mlib_ImageColorTrue2IndexLine_S16_U8_3_in_4(const mlib_s16 *src,
-                                                 mlib_u8        *dst,
-                                                 mlib_s32       length,
-                                                 const void     *colormap);
-
-
-void mlib_ImageColorTrue2IndexLine_S16_U8_4(const mlib_s16 *src,
-                                            mlib_u8        *dst,
-                                            mlib_s32       length,
-                                            const void     *colormap);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* __MLIB_IMAGECOLORMAP_H */
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv.h
index a4f37d90386..dc4b6bd4cd7 100644
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv.h
+++ b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv.h
@@ -41,466 +41,6 @@ return status; \
 }
 #endif /* FREE_AND_RETURN_STATUS */
 
-void mlib_ImageXor80_aa(mlib_u8  *dl,
-                        mlib_s32 wid,
-                        mlib_s32 hgt,
-                        mlib_s32 str);
-
-void mlib_ImageXor80(mlib_u8  *dl,
-                     mlib_s32 wid,
-                     mlib_s32 hgt,
-                     mlib_s32 str,
-                     mlib_s32 nchan,
-                     mlib_s32 cmask);
-
-mlib_status mlib_conv2x2ext_d64(mlib_image       *dst,
-                                const mlib_image *src,
-                                mlib_s32         dx_l,
-                                mlib_s32         dx_r,
-                                mlib_s32         dy_t,
-                                mlib_s32         dy_b,
-                                const mlib_d64   *kern,
-                                mlib_s32         cmask);
-
-mlib_status mlib_conv2x2ext_f32(mlib_image       *dst,
-                                const mlib_image *src,
-                                mlib_s32         dx_l,
-                                mlib_s32         dx_r,
-                                mlib_s32         dy_t,
-                                mlib_s32         dy_b,
-                                const mlib_d64   *kern,
-                                mlib_s32         cmask);
-
-mlib_status mlib_conv2x2ext_s16(mlib_image       *dst,
-                                const mlib_image *src,
-                                mlib_s32         dx_l,
-                                mlib_s32         dx_r,
-                                mlib_s32         dy_t,
-                                mlib_s32         dy_b,
-                                const mlib_s32   *kern,
-                                mlib_s32         scale,
-                                mlib_s32         cmask);
-
-mlib_status mlib_conv2x2ext_s32(mlib_image       *dst,
-                                const mlib_image *src,
-                                mlib_s32         dx_l,
-                                mlib_s32         dx_r,
-                                mlib_s32         dy_t,
-                                mlib_s32         dy_b,
-                                const mlib_s32   *kern,
-                                mlib_s32         scale,
-                                mlib_s32         cmask);
-
-mlib_status mlib_conv2x2ext_u16(mlib_image       *dst,
-                                const mlib_image *src,
-                                mlib_s32         dx_l,
-                                mlib_s32         dx_r,
-                                mlib_s32         dy_t,
-                                mlib_s32         dy_b,
-                                const mlib_s32   *kern,
-                                mlib_s32         scale,
-                                mlib_s32         cmask);
-
-mlib_status mlib_conv2x2ext_u8(mlib_image       *dst,
-                               const mlib_image *src,
-                               mlib_s32         dx_l,
-                               mlib_s32         dx_r,
-                               mlib_s32         dy_t,
-                               mlib_s32         dy_b,
-                               const mlib_s32   *kern,
-                               mlib_s32         scale,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv2x2nw_d64(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_d64   *kern,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv2x2nw_f32(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_d64   *kern,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv2x2nw_s16(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_s32   *kern,
-                               mlib_s32         scale,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv2x2nw_s32(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_s32   *kern,
-                               mlib_s32         scale,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv2x2nw_u16(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_s32   *kern,
-                               mlib_s32         scale,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv2x2nw_u8(mlib_image       *dst,
-                              const mlib_image *src,
-                              const mlib_s32   *kern,
-                              mlib_s32         scale,
-                              mlib_s32         cmask);
-
-mlib_status mlib_conv3x3ext_bit(mlib_image       *dst,
-                                const mlib_image *src,
-                                mlib_s32         dx_l,
-                                mlib_s32         dx_r,
-                                mlib_s32         dy_t,
-                                mlib_s32         dy_b,
-                                const mlib_s32   *kern,
-                                mlib_s32         scale,
-                                mlib_s32         cmask);
-
-mlib_status mlib_conv3x3ext_d64(mlib_image       *dst,
-                                const mlib_image *src,
-                                mlib_s32         dx_l,
-                                mlib_s32         dx_r,
-                                mlib_s32         dy_t,
-                                mlib_s32         dy_b,
-                                const mlib_d64   *kern,
-                                mlib_s32         cmask);
-
-mlib_status mlib_conv3x3ext_f32(mlib_image       *dst,
-                                const mlib_image *src,
-                                mlib_s32         dx_l,
-                                mlib_s32         dx_r,
-                                mlib_s32         dy_t,
-                                mlib_s32         dy_b,
-                                const mlib_d64   *kern,
-                                mlib_s32         cmask);
-
-mlib_status mlib_conv3x3ext_s16(mlib_image       *dst,
-                                const mlib_image *src,
-                                mlib_s32         dx_l,
-                                mlib_s32         dx_r,
-                                mlib_s32         dy_t,
-                                mlib_s32         dy_b,
-                                const mlib_s32   *kern,
-                                mlib_s32         scale,
-                                mlib_s32         cmask);
-
-mlib_status mlib_conv3x3ext_s32(mlib_image       *dst,
-                                const mlib_image *src,
-                                mlib_s32         dx_l,
-                                mlib_s32         dx_r,
-                                mlib_s32         dy_t,
-                                mlib_s32         dy_b,
-                                const mlib_s32   *kern,
-                                mlib_s32         scale,
-                                mlib_s32         cmask);
-
-mlib_status mlib_conv3x3ext_u16(mlib_image       *dst,
-                                const mlib_image *src,
-                                mlib_s32         dx_l,
-                                mlib_s32         dx_r,
-                                mlib_s32         dy_t,
-                                mlib_s32         dy_b,
-                                const mlib_s32   *kern,
-                                mlib_s32         scale,
-                                mlib_s32         cmask);
-
-mlib_status mlib_conv3x3ext_u8(mlib_image       *dst,
-                               const mlib_image *src,
-                               mlib_s32         dx_l,
-                               mlib_s32         dx_r,
-                               mlib_s32         dy_t,
-                               mlib_s32         dy_b,
-                               const mlib_s32   *kern,
-                               mlib_s32         scale,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv3x3nw_bit(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_s32   *kern,
-                               mlib_s32         scale,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv3x3nw_d64(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_d64   *kern,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv3x3nw_f32(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_d64   *kern,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv3x3nw_s16(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_s32   *kern,
-                               mlib_s32         scale,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv3x3nw_s32(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_s32   *kern,
-                               mlib_s32         scale,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv3x3nw_u16(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_s32   *kern,
-                               mlib_s32         scale,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv3x3nw_u8(mlib_image       *dst,
-                              const mlib_image *src,
-                              const mlib_s32   *kern,
-                              mlib_s32         scale,
-                              mlib_s32         cmask);
-
-mlib_status mlib_conv4x4ext_d64(mlib_image       *dst,
-                                const mlib_image *src,
-                                mlib_s32         dx_l,
-                                mlib_s32         dx_r,
-                                mlib_s32         dy_t,
-                                mlib_s32         dy_b,
-                                const mlib_d64   *kern,
-                                mlib_s32         cmask);
-
-mlib_status mlib_conv4x4ext_f32(mlib_image       *dst,
-                                const mlib_image *src,
-                                mlib_s32         dx_l,
-                                mlib_s32         dx_r,
-                                mlib_s32         dy_t,
-                                mlib_s32         dy_b,
-                                const mlib_d64   *kern,
-                                mlib_s32         cmask);
-
-mlib_status mlib_conv4x4ext_s16(mlib_image       *dst,
-                                const mlib_image *src,
-                                mlib_s32         dx_l,
-                                mlib_s32         dx_r,
-                                mlib_s32         dy_t,
-                                mlib_s32         dy_b,
-                                const mlib_s32   *kern,
-                                mlib_s32         scale,
-                                mlib_s32         cmask);
-
-mlib_status mlib_conv4x4ext_s32(mlib_image       *dst,
-                                const mlib_image *src,
-                                mlib_s32         dx_l,
-                                mlib_s32         dx_r,
-                                mlib_s32         dy_t,
-                                mlib_s32         dy_b,
-                                const mlib_s32   *kern,
-                                mlib_s32         scale,
-                                mlib_s32         cmask);
-
-mlib_status mlib_conv4x4ext_u16(mlib_image       *dst,
-                                const mlib_image *src,
-                                mlib_s32         dx_l,
-                                mlib_s32         dx_r,
-                                mlib_s32         dy_t,
-                                mlib_s32         dy_b,
-                                const mlib_s32   *kern,
-                                mlib_s32         scale,
-                                mlib_s32         cmask);
-
-mlib_status mlib_conv4x4ext_u8(mlib_image       *dst,
-                               const mlib_image *src,
-                               mlib_s32         dx_l,
-                               mlib_s32         dx_r,
-                               mlib_s32         dy_t,
-                               mlib_s32         dy_b,
-                               const mlib_s32   *kern,
-                               mlib_s32         scale,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv4x4nw_d64(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_d64   *kern,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv4x4nw_f32(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_d64   *kern,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv4x4nw_s16(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_s32   *kern,
-                               mlib_s32         scale,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv4x4nw_s32(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_s32   *kern,
-                               mlib_s32         scale,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv4x4nw_u16(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_s32   *kern,
-                               mlib_s32         scale,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv4x4nw_u8(mlib_image       *dst,
-                              const mlib_image *src,
-                              const mlib_s32   *kern,
-                              mlib_s32         scale,
-                              mlib_s32         cmask);
-
-mlib_status mlib_conv5x5ext_d64(mlib_image       *dst,
-                                const mlib_image *src,
-                                mlib_s32         dx_l,
-                                mlib_s32         dx_r,
-                                mlib_s32         dy_t,
-                                mlib_s32         dy_b,
-                                const mlib_d64   *kern,
-                                mlib_s32         cmask);
-
-mlib_status mlib_conv5x5ext_f32(mlib_image       *dst,
-                                const mlib_image *src,
-                                mlib_s32         dx_l,
-                                mlib_s32         dx_r,
-                                mlib_s32         dy_t,
-                                mlib_s32         dy_b,
-                                const mlib_d64   *kern,
-                                mlib_s32         cmask);
-
-mlib_status mlib_conv5x5ext_s16(mlib_image       *dst,
-                                const mlib_image *src,
-                                mlib_s32         dx_l,
-                                mlib_s32         dx_r,
-                                mlib_s32         dy_t,
-                                mlib_s32         dy_b,
-                                const mlib_s32   *kern,
-                                mlib_s32         scale,
-                                mlib_s32         cmask);
-
-mlib_status mlib_conv5x5ext_s32(mlib_image       *dst,
-                                const mlib_image *src,
-                                mlib_s32         dx_l,
-                                mlib_s32         dx_r,
-                                mlib_s32         dy_t,
-                                mlib_s32         dy_b,
-                                const mlib_s32   *kern,
-                                mlib_s32         scale,
-                                mlib_s32         cmask);
-
-mlib_status mlib_conv5x5ext_u16(mlib_image       *dst,
-                                const mlib_image *src,
-                                mlib_s32         dx_l,
-                                mlib_s32         dx_r,
-                                mlib_s32         dy_t,
-                                mlib_s32         dy_b,
-                                const mlib_s32   *kern,
-                                mlib_s32         scale,
-                                mlib_s32         cmask);
-
-mlib_status mlib_conv5x5ext_u8(mlib_image       *dst,
-                               const mlib_image *src,
-                               mlib_s32         dx_l,
-                               mlib_s32         dx_r,
-                               mlib_s32         dy_t,
-                               mlib_s32         dy_b,
-                               const mlib_s32   *kern,
-                               mlib_s32         scale,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv5x5nw_d64(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_d64   *kern,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv5x5nw_f32(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_d64   *kern,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv5x5nw_s16(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_s32   *kern,
-                               mlib_s32         scale,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv5x5nw_s32(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_s32   *kern,
-                               mlib_s32         scale,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv5x5nw_u16(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_s32   *kern,
-                               mlib_s32         scale,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv5x5nw_u8(mlib_image       *dst,
-                              const mlib_image *src,
-                              const mlib_s32   *kern,
-                              mlib_s32         scale,
-                              mlib_s32         cmask);
-
-mlib_status mlib_conv7x7ext_s16(mlib_image       *dst,
-                                const mlib_image *src,
-                                mlib_s32         dx_l,
-                                mlib_s32         dx_r,
-                                mlib_s32         dy_t,
-                                mlib_s32         dy_b,
-                                const mlib_s32   *kern,
-                                mlib_s32         scale,
-                                mlib_s32         cmask);
-
-mlib_status mlib_conv7x7ext_s32(mlib_image       *dst,
-                                const mlib_image *src,
-                                mlib_s32         dx_l,
-                                mlib_s32         dx_r,
-                                mlib_s32         dy_t,
-                                mlib_s32         dy_b,
-                                const mlib_s32   *kern,
-                                mlib_s32         scale,
-                                mlib_s32         cmask);
-
-mlib_status mlib_conv7x7ext_u16(mlib_image       *dst,
-                                const mlib_image *src,
-                                mlib_s32         dx_l,
-                                mlib_s32         dx_r,
-                                mlib_s32         dy_t,
-                                mlib_s32         dy_b,
-                                const mlib_s32   *kern,
-                                mlib_s32         scale,
-                                mlib_s32         cmask);
-
-mlib_status mlib_conv7x7ext_u8(mlib_image       *dst,
-                               const mlib_image *src,
-                               mlib_s32         dx_l,
-                               mlib_s32         dx_r,
-                               mlib_s32         dy_t,
-                               mlib_s32         dy_b,
-                               const mlib_s32   *kern,
-                               mlib_s32         scale,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv7x7nw_s16(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_s32   *kern,
-                               mlib_s32         scale,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv7x7nw_s32(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_s32   *kern,
-                               mlib_s32         scale,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv7x7nw_u16(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_s32   *kern,
-                               mlib_s32         scale,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv7x7nw_u8(mlib_image       *dst,
-                              const mlib_image *src,
-                              const mlib_s32   *kern,
-                              mlib_s32         scale,
-                              mlib_s32         cmask);
-
 mlib_status mlib_convMxNext_s32(mlib_image       *dst,
                                 const mlib_image *src,
                                 const mlib_s32   *kernel,
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv2x2_f.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv2x2_f.c
deleted file mode 100644
index f10cbe61eb2..00000000000
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv2x2_f.c
+++ /dev/null
@@ -1,1118 +0,0 @@
-/*
- * Copyright (c) 2003, 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.
- */
-
-
-/*
- * FUNCTION
- *      Internal functions for mlib_ImageConv2x2 on U8/S16/U16 types
- *      and MLIB_EDGE_DST_NO_WRITE mask.
- */
-
-#include "mlib_image.h"
-#include "mlib_ImageConv.h"
-#include "mlib_c_ImageConv.h"
-
-/***************************************************************/
-#ifdef i386 /* do not copy by mlib_d64 data type for x86 */
-
-typedef struct {
-  mlib_s32 int0, int1;
-} two_int;
-
-#define TYPE_64BIT two_int
-
-#else /* i386 */
-
-#define TYPE_64BIT mlib_d64
-
-#endif /* i386 ( do not copy by mlib_d64 data type for x86 ) */
-
-/***************************************************************/
-#define LOAD_KERNEL_INTO_DOUBLE()                                        \
-  while (scalef_expon > 30) {                                            \
-    scalef /= (1 << 30);                                                 \
-    scalef_expon -= 30;                                                  \
-  }                                                                      \
-                                                                         \
-  scalef /= (1 << scalef_expon);                                         \
-                                                                         \
-  /* keep kernel in regs */                                              \
-  k0 = scalef * kern[0];  k1 = scalef * kern[1];  k2 = scalef * kern[2]; \
-  k3 = scalef * kern[3]
-
-/***************************************************************/
-#define GET_SRC_DST_PARAMETERS(type)                            \
-  hgt = mlib_ImageGetHeight(src);                               \
-  wid = mlib_ImageGetWidth(src);                                \
-  nchannel = mlib_ImageGetChannels(src);                        \
-  sll = mlib_ImageGetStride(src) / sizeof(type);                \
-  dll = mlib_ImageGetStride(dst) / sizeof(type);                \
-  adr_src = (type *)mlib_ImageGetData(src);                     \
-  adr_dst = (type *)mlib_ImageGetData(dst)
-
-/***************************************************************/
-#ifndef MLIB_USE_FTOI_CLAMPING
-
-#define CLAMP_S32(x)                                            \
-  (((x) <= MLIB_S32_MIN) ? MLIB_S32_MIN :                       \
-  (((x) >= MLIB_S32_MAX) ? MLIB_S32_MAX : (mlib_s32)(x)))
-
-#else
-
-#define CLAMP_S32(x) ((mlib_s32)(x))
-
-#endif /* MLIB_USE_FTOI_CLAMPING */
-
-/***************************************************************/
-#if defined(_LITTLE_ENDIAN) && !defined(_NO_LONGLONG)
-
-/* NB: Explicit cast to DTYPE is necessary to avoid warning from Microsoft VC compiler.
-      And we need to explicitly define cast behavior if source exceeds destination range.
-      (it is undefined according to C99 spec). We use mask here because this macro is typically
-      used to extract bit regions. */
-
-#define STORE2(res0, res1)                                      \
-  dp[0    ] = (DTYPE) ((res1) & DTYPE_MASK);                      \
-  dp[chan1] = (DTYPE) ((res0) & DTYPE_MASK)
-
-#else
-
-#define STORE2(res0, res1)                                      \
-  dp[0    ] = (DTYPE) ((res0) & DTYPE_MASK);                      \
-  dp[chan1] = (DTYPE) ((res1) & DTYPE_MASK)
-
-#endif /* defined(_LITTLE_ENDIAN) && !defined(_NO_LONGLONG) */
-
-/***************************************************************/
-#ifdef _NO_LONGLONG
-
-#define LOAD_BUFF(buff)                                         \
-  buff[i    ] = sp[0];                                          \
-  buff[i + 1] = sp[chan1]
-
-#else /* _NO_LONGLONG */
-
-#ifdef _LITTLE_ENDIAN
-
-#define LOAD_BUFF(buff)                                         \
-  *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | ((mlib_s64)sp[0] & 0xffffffff)
-
-#else /* _LITTLE_ENDIAN */
-
-#define LOAD_BUFF(buff)                                         \
-  *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | ((mlib_s64)sp[chan1] & 0xffffffff)
-
-#endif /* _LITTLE_ENDIAN */
-
-#endif /* _NO_LONGLONG */
-
-/***************************************************************/
-typedef union {
-  TYPE_64BIT d64;
-  struct {
-    mlib_s32 i0, i1;
-  } i32s;
-} d64_2x32;
-
-/***************************************************************/
-#define D_KER     1
-
-#define BUFF_LINE 256
-
-/***************************************************************/
-#define XOR_80(x) x ^= 0x80
-
-void mlib_ImageXor80_aa(mlib_u8  *dl,
-                        mlib_s32 wid,
-                        mlib_s32 hgt,
-                        mlib_s32 str)
-{
-  mlib_u8  *dp, *dend;
-#ifdef _NO_LONGLONG
-  mlib_u32 cadd = 0x80808080;
-#else /* _NO_LONGLONG */
-  mlib_u64 cadd = MLIB_U64_CONST(0x8080808080808080);
-#endif /* _NO_LONGLONG */
-  mlib_s32 j;
-
-  if (wid == str) {
-    wid *= hgt;
-    hgt = 1;
-  }
-
-  for (j = 0; j < hgt; j++) {
-    dend = dl + wid;
-
-    for (dp = dl; ((mlib_addr)dp & 7) && (dp < dend); dp++) XOR_80(dp[0]);
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (; dp <= (dend - 8); dp += 8) {
-#ifdef _NO_LONGLONG
-      *((mlib_s32*)dp) ^= cadd;
-      *((mlib_s32*)dp+1) ^= cadd;
-#else /* _NO_LONGLONG */
-      *((mlib_u64*)dp) ^= cadd;
-#endif /* _NO_LONGLONG */
-    }
-
-    for (; (dp < dend); dp++) XOR_80(dp[0]);
-
-    dl += str;
-  }
-}
-
-/***************************************************************/
-void mlib_ImageXor80(mlib_u8  *dl,
-                     mlib_s32 wid,
-                     mlib_s32 hgt,
-                     mlib_s32 str,
-                     mlib_s32 nchan,
-                     mlib_s32 cmask)
-{
-  mlib_s32 i, j, c;
-
-  for (j = 0; j < hgt; j++) {
-    for (c = 0; c < nchan; c++) {
-      if (cmask & (1 << (nchan - 1 - c))) {
-        mlib_u8 *dp = dl + c;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-        for (i = 0; i < wid; i++) XOR_80(dp[i*nchan]);
-      }
-    }
-
-    dl += str;
-  }
-}
-
-/***************************************************************/
-#define DTYPE mlib_s16
-#define DTYPE_MASK 0xffff
-
-mlib_status mlib_c_conv2x2nw_s16(mlib_image       *dst,
-                                 const mlib_image *src,
-                                 const mlib_s32   *kern,
-                                 mlib_s32         scalef_expon,
-                                 mlib_s32         cmask)
-{
-  mlib_d64 buff_arr[2*BUFF_LINE];
-  mlib_s32 *pbuff = (mlib_s32*)buff_arr, *buffo, *buff0, *buff1, *buff2, *buffT;
-  DTYPE    *adr_src, *sl, *sp, *sl1;
-  DTYPE    *adr_dst, *dl, *dp;
-  mlib_d64 k0, k1, k2, k3, scalef = 65536.0;
-  mlib_d64 p00, p01, p02,
-           p10, p11, p12;
-  mlib_s32 wid, hgt, sll, dll, wid1;
-  mlib_s32 nchannel, chan1, chan2;
-  mlib_s32 i, j, c;
-  LOAD_KERNEL_INTO_DOUBLE();
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  wid1 = (wid + 1) &~ 1;
-
-  if (wid1 > BUFF_LINE) {
-    pbuff = mlib_malloc(4*sizeof(mlib_s32)*wid1);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buffo = pbuff;
-  buff0 = buffo + wid1;
-  buff1 = buff0 + wid1;
-  buff2 = buff1 + wid1;
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  wid -= D_KER;
-  hgt -= D_KER;
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    sl1 = sl + sll;
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid + D_KER; i++) {
-      buff0[i - 1] = (mlib_s32)sl[i*chan1];
-      buff1[i - 1] = (mlib_s32)sl1[i*chan1];
-    }
-
-    sl += (D_KER + 1)*sll;
-
-    for (j = 0; j < hgt; j++) {
-      sp = sl;
-      dp = dl;
-
-      buff2[-1] = (mlib_s32)sp[0];
-      sp += chan1;
-
-      p02 = buff0[-1];
-      p12 = buff1[-1];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-#ifdef _NO_LONGLONG
-        mlib_s32 o64_1, o64_2;
-#else /* _NO_LONGLONG */
-        mlib_s64 o64;
-#endif /* _NO_LONGLONG */
-        d64_2x32 sd0, sd1, dd;
-
-        p00 = p02; p10 = p12;
-
-        sd0.d64 = *(TYPE_64BIT*)(buff0 + i);
-        sd1.d64 = *(TYPE_64BIT*)(buff1 + i);
-        p01 = (mlib_d64)sd0.i32s.i0;
-        p02 = (mlib_d64)sd0.i32s.i1;
-        p11 = (mlib_d64)sd1.i32s.i0;
-        p12 = (mlib_d64)sd1.i32s.i1;
-
-        LOAD_BUFF(buff2);
-
-        dd.i32s.i0 = CLAMP_S32(p00 * k0 + p01 * k1 + p10 * k2 + p11 * k3);
-        dd.i32s.i1 = CLAMP_S32(p01 * k0 + p02 * k1 + p11 * k2 + p12 * k3);
-        *(TYPE_64BIT*)(buffo + i) = dd.d64;
-
-#ifdef _NO_LONGLONG
-
-        o64_1 = buffo[i];
-        o64_2 = buffo[i+1];
-        STORE2(o64_1 >> 16, o64_2 >> 16);
-
-#else /* _NO_LONGLONG */
-
-        o64 = *(mlib_s64*)(buffo + i);
-        STORE2(o64 >> 48, o64 >> 16);
-
-#endif /* _NO_LONGLONG */
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      for (; i < wid; i++) {
-        p00 = buff0[i - 1]; p10 = buff1[i - 1];
-        p01 = buff0[i];     p11 = buff1[i];
-
-        buff2[i] = (mlib_s32)sp[0];
-
-        buffo[i] = CLAMP_S32(p00 * k0 + p01 * k1 + p10 * k2 + p11 * k3);
-        dp[0] = buffo[i] >> 16;
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buffT;
-    }
-  }
-
-  if (pbuff != (mlib_s32*)buff_arr) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-mlib_status mlib_c_conv2x2ext_s16(mlib_image       *dst,
-                                  const mlib_image *src,
-                                  mlib_s32         dx_l,
-                                  mlib_s32         dx_r,
-                                  mlib_s32         dy_t,
-                                  mlib_s32         dy_b,
-                                  const mlib_s32   *kern,
-                                  mlib_s32         scalef_expon,
-                                  mlib_s32         cmask)
-{
-  mlib_d64 buff_arr[2*BUFF_LINE];
-  mlib_s32 *pbuff = (mlib_s32*)buff_arr, *buffo, *buff0, *buff1, *buff2, *buffT;
-  DTYPE    *adr_src, *sl, *sp, *sl1;
-  DTYPE    *adr_dst, *dl, *dp;
-  mlib_d64 k0, k1, k2, k3, scalef = 65536.0;
-  mlib_d64 p00, p01, p02,
-           p10, p11, p12;
-  mlib_s32 wid, hgt, sll, dll, wid1;
-  mlib_s32 nchannel, chan1, chan2;
-  mlib_s32 i, j, c, swid;
-  LOAD_KERNEL_INTO_DOUBLE();
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  swid = wid + D_KER;
-
-  wid1 = (swid + 1) &~ 1;
-
-  if (wid1 > BUFF_LINE) {
-    pbuff = mlib_malloc(4*sizeof(mlib_s32)*wid1);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buffo = pbuff;
-  buff0 = buffo + wid1;
-  buff1 = buff0 + wid1;
-  buff2 = buff1 + wid1;
-
-  swid -= dx_r;
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    if ((hgt - dy_b) > 0) sl1 = sl + sll;
-    else sl1 = sl;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < swid; i++) {
-      buff0[i - 1] = (mlib_s32)sl[i*chan1];
-      buff1[i - 1] = (mlib_s32)sl1[i*chan1];
-    }
-
-    if (dx_r != 0) {
-      buff0[swid - 1] = buff0[swid - 2];
-      buff1[swid - 1] = buff1[swid - 2];
-    }
-
-    if ((hgt - dy_b) > 1) sl = sl1 + sll;
-    else sl = sl1;
-
-    for (j = 0; j < hgt; j++) {
-      sp = sl;
-      dp = dl;
-
-      buff2[-1] = (mlib_s32)sp[0];
-      sp += chan1;
-
-      p02 = buff0[-1];
-      p12 = buff1[-1];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-#ifdef _NO_LONGLONG
-        mlib_s32 o64_1, o64_2;
-#else /* _NO_LONGLONG */
-        mlib_s64 o64;
-#endif /* _NO_LONGLONG */
-        d64_2x32 sd0, sd1, dd;
-
-        p00 = p02; p10 = p12;
-
-        sd0.d64 = *(TYPE_64BIT*)(buff0 + i);
-        sd1.d64 = *(TYPE_64BIT*)(buff1 + i);
-        p01 = (mlib_d64)sd0.i32s.i0;
-        p02 = (mlib_d64)sd0.i32s.i1;
-        p11 = (mlib_d64)sd1.i32s.i0;
-        p12 = (mlib_d64)sd1.i32s.i1;
-
-        LOAD_BUFF(buff2);
-
-        dd.i32s.i0 = CLAMP_S32(p00 * k0 + p01 * k1 + p10 * k2 + p11 * k3);
-        dd.i32s.i1 = CLAMP_S32(p01 * k0 + p02 * k1 + p11 * k2 + p12 * k3);
-        *(TYPE_64BIT*)(buffo + i) = dd.d64;
-
-#ifdef _NO_LONGLONG
-
-        o64_1 = buffo[i];
-        o64_2 = buffo[i+1];
-        STORE2(o64_1 >> 16, o64_2 >> 16);
-
-#else /* _NO_LONGLONG */
-
-        o64 = *(mlib_s64*)(buffo + i);
-        STORE2(o64 >> 48, o64 >> 16);
-
-#endif /* _NO_LONGLONG */
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      for (; i < wid; i++) {
-        p00 = buff0[i - 1]; p10 = buff1[i - 1];
-        p01 = buff0[i];     p11 = buff1[i];
-
-        buff2[i] = (mlib_s32)sp[0];
-
-        buffo[i] = CLAMP_S32(p00 * k0 + p01 * k1 + p10 * k2 + p11 * k3);
-        dp[0] = buffo[i] >> 16;
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      if (dx_r != 0) buff2[swid - 1] = buff2[swid - 2];
-
-      if (j < hgt - dy_b - 2) sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buffT;
-    }
-  }
-
-  if (pbuff != (mlib_s32*)buff_arr) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  DTYPE
-#define DTYPE mlib_u16
-
-mlib_status mlib_c_conv2x2nw_u16(mlib_image       *dst,
-                                 const mlib_image *src,
-                                 const mlib_s32   *kern,
-                                 mlib_s32         scalef_expon,
-                                 mlib_s32         cmask)
-{
-  mlib_d64 buff_arr[2*BUFF_LINE];
-  mlib_s32 *pbuff = (mlib_s32*)buff_arr, *buffo, *buff0, *buff1, *buff2, *buffT;
-  DTYPE    *adr_src, *sl, *sp, *sl1;
-  DTYPE    *adr_dst, *dl, *dp;
-  mlib_d64 k0, k1, k2, k3, scalef = 65536.0;
-  mlib_d64 p00, p01, p02,
-           p10, p11, p12;
-  mlib_s32 wid, hgt, sll, dll, wid1;
-  mlib_s32 nchannel, chan1, chan2;
-  mlib_s32 i, j, c;
-  mlib_d64 doff = 0x7FFF8000;
-  LOAD_KERNEL_INTO_DOUBLE();
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  wid1 = (wid + 1) &~ 1;
-
-  if (wid1 > BUFF_LINE) {
-    pbuff = mlib_malloc(4*sizeof(mlib_s32)*wid1);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buffo = pbuff;
-  buff0 = buffo + wid1;
-  buff1 = buff0 + wid1;
-  buff2 = buff1 + wid1;
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  wid -= D_KER;
-  hgt -= D_KER;
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    sl1 = sl + sll;
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid + D_KER; i++) {
-      buff0[i - 1] = (mlib_s32)sl[i*chan1];
-      buff1[i - 1] = (mlib_s32)sl1[i*chan1];
-    }
-
-    sl += (D_KER + 1)*sll;
-
-    for (j = 0; j < hgt; j++) {
-      sp = sl;
-      dp = dl;
-
-      buff2[-1] = (mlib_s32)sp[0];
-      sp += chan1;
-
-      p02 = buff0[-1];
-      p12 = buff1[-1];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-#ifdef _NO_LONGLONG
-        mlib_s32 o64_1, o64_2;
-#else /* _NO_LONGLONG */
-        mlib_s64 o64;
-#endif /* _NO_LONGLONG */
-        d64_2x32 sd0, sd1, dd;
-
-        p00 = p02; p10 = p12;
-
-        sd0.d64 = *(TYPE_64BIT*)(buff0 + i);
-        sd1.d64 = *(TYPE_64BIT*)(buff1 + i);
-        p01 = (mlib_d64)sd0.i32s.i0;
-        p02 = (mlib_d64)sd0.i32s.i1;
-        p11 = (mlib_d64)sd1.i32s.i0;
-        p12 = (mlib_d64)sd1.i32s.i1;
-
-        LOAD_BUFF(buff2);
-
-        dd.i32s.i0 = CLAMP_S32(p00 * k0 + p01 * k1 + p10 * k2 + p11 * k3 - doff);
-        dd.i32s.i1 = CLAMP_S32(p01 * k0 + p02 * k1 + p11 * k2 + p12 * k3 - doff);
-        *(TYPE_64BIT*)(buffo + i) = dd.d64;
-
-#ifdef _NO_LONGLONG
-
-        o64_1 = buffo[i];
-        o64_2 = buffo[i+1];
-        o64_1 = o64_1 ^ 0x80000000U;
-        o64_2 = o64_2 ^ 0x80000000U;
-        STORE2(o64_1 >> 16, o64_2 >> 16);
-
-#else /* _NO_LONGLONG */
-
-        o64 = *(mlib_s64*)(buffo + i);
-        o64 = o64 ^ MLIB_U64_CONST(0x8000000080000000);
-        STORE2(o64 >> 48, o64 >> 16);
-
-#endif /* _NO_LONGLONG */
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      for (; i < wid; i++) {
-        p00 = buff0[i - 1]; p10 = buff1[i - 1];
-        p01 = buff0[i];     p11 = buff1[i];
-
-        buff2[i] = (mlib_s32)sp[0];
-
-        buffo[i] = CLAMP_S32(p00 * k0 + p01 * k1 + p10 * k2 + p11 * k3 - doff);
-        dp[0] = (buffo[i] >> 16) ^ 0x8000;
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buffT;
-    }
-  }
-
-  if (pbuff != (mlib_s32*)buff_arr) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-mlib_status mlib_c_conv2x2ext_u16(mlib_image       *dst,
-                                  const mlib_image *src,
-                                  mlib_s32         dx_l,
-                                  mlib_s32         dx_r,
-                                  mlib_s32         dy_t,
-                                  mlib_s32         dy_b,
-                                  const mlib_s32   *kern,
-                                  mlib_s32         scalef_expon,
-                                  mlib_s32         cmask)
-{
-  mlib_d64 buff_arr[2*BUFF_LINE];
-  mlib_s32 *pbuff = (mlib_s32*)buff_arr, *buffo, *buff0, *buff1, *buff2, *buffT;
-  DTYPE    *adr_src, *sl, *sp, *sl1;
-  DTYPE    *adr_dst, *dl, *dp;
-  mlib_d64 k0, k1, k2, k3, scalef = 65536.0;
-  mlib_d64 p00, p01, p02,
-           p10, p11, p12;
-  mlib_s32 wid, hgt, sll, dll, wid1;
-  mlib_s32 nchannel, chan1, chan2;
-  mlib_s32 i, j, c, swid;
-  mlib_d64 doff = 0x7FFF8000;
-  LOAD_KERNEL_INTO_DOUBLE();
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  swid = wid + D_KER;
-
-  wid1 = (swid + 1) &~ 1;
-
-  if (wid1 > BUFF_LINE) {
-    pbuff = mlib_malloc(4*sizeof(mlib_s32)*wid1);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buffo = pbuff;
-  buff0 = buffo + wid1;
-  buff1 = buff0 + wid1;
-  buff2 = buff1 + wid1;
-
-  swid -= dx_r;
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    if ((hgt - dy_b) > 0) sl1 = sl + sll;
-    else sl1 = sl;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < swid; i++) {
-      buff0[i - 1] = (mlib_s32)sl[i*chan1];
-      buff1[i - 1] = (mlib_s32)sl1[i*chan1];
-    }
-
-    if (dx_r != 0) {
-      buff0[swid - 1] = buff0[swid - 2];
-      buff1[swid - 1] = buff1[swid - 2];
-    }
-
-    if ((hgt - dy_b) > 1) sl = sl1 + sll;
-    else sl = sl1;
-
-    for (j = 0; j < hgt; j++) {
-      sp = sl;
-      dp = dl;
-
-      buff2[-1] = (mlib_s32)sp[0];
-      sp += chan1;
-
-      p02 = buff0[-1];
-      p12 = buff1[-1];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-#ifdef _NO_LONGLONG
-        mlib_s32 o64_1, o64_2;
-#else /* _NO_LONGLONG */
-        mlib_s64 o64;
-#endif /* _NO_LONGLONG */
-        d64_2x32 sd0, sd1, dd;
-
-        p00 = p02; p10 = p12;
-
-        sd0.d64 = *(TYPE_64BIT*)(buff0 + i);
-        sd1.d64 = *(TYPE_64BIT*)(buff1 + i);
-        p01 = (mlib_d64)sd0.i32s.i0;
-        p02 = (mlib_d64)sd0.i32s.i1;
-        p11 = (mlib_d64)sd1.i32s.i0;
-        p12 = (mlib_d64)sd1.i32s.i1;
-
-        LOAD_BUFF(buff2);
-
-        dd.i32s.i0 = CLAMP_S32(p00 * k0 + p01 * k1 + p10 * k2 + p11 * k3 - doff);
-        dd.i32s.i1 = CLAMP_S32(p01 * k0 + p02 * k1 + p11 * k2 + p12 * k3 - doff);
-        *(TYPE_64BIT*)(buffo + i) = dd.d64;
-
-#ifdef _NO_LONGLONG
-
-        o64_1 = buffo[i];
-        o64_2 = buffo[i+1];
-        o64_1 = o64_1 ^ 0x80000000U;
-        o64_2 = o64_2 ^ 0x80000000U;
-        STORE2(o64_1 >> 16, o64_2 >> 16);
-
-#else /* _NO_LONGLONG */
-
-        o64 = *(mlib_s64*)(buffo + i);
-        o64 = o64 ^ MLIB_U64_CONST(0x8000000080000000);
-        STORE2(o64 >> 48, o64 >> 16);
-
-#endif /* _NO_LONGLONG */
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      for (; i < wid; i++) {
-        p00 = buff0[i - 1]; p10 = buff1[i - 1];
-        p01 = buff0[i];     p11 = buff1[i];
-
-        buff2[i] = (mlib_s32)sp[0];
-
-        buffo[i] = CLAMP_S32(p00 * k0 + p01 * k1 + p10 * k2 + p11 * k3 - doff);
-        dp[0] = (buffo[i] >> 16) ^ 0x8000;
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      if (dx_r != 0) buff2[swid - 1] = buff2[swid - 2];
-
-      if (j < hgt - dy_b - 2) sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buffT;
-    }
-  }
-
-  if (pbuff != (mlib_s32*)buff_arr) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  DTYPE
-#define DTYPE mlib_u8
-
-mlib_status mlib_c_conv2x2nw_u8(mlib_image       *dst,
-                                const mlib_image *src,
-                                const mlib_s32   *kern,
-                                mlib_s32         scalef_expon,
-                                mlib_s32         cmask)
-{
-  mlib_d64 buff_arr[2*BUFF_LINE];
-  mlib_s32 *pbuff = (mlib_s32*)buff_arr, *buffo, *buff0, *buff1, *buff2, *buffT;
-  DTYPE    *adr_src, *sl, *sp, *sl1;
-  DTYPE    *adr_dst, *dl, *dp;
-  mlib_d64 k0, k1, k2, k3, scalef = (1 << 24);
-  mlib_d64 p00, p01, p02,
-           p10, p11, p12;
-  mlib_s32 wid, hgt, sll, dll, wid1;
-  mlib_s32 nchannel, chan1, chan2;
-  mlib_s32 i, j, c;
-  LOAD_KERNEL_INTO_DOUBLE();
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  wid1 = (wid + 1) &~ 1;
-
-  if (wid1 > BUFF_LINE) {
-    pbuff = mlib_malloc(4*sizeof(mlib_s32)*wid1);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buffo = pbuff;
-  buff0 = buffo + wid1;
-  buff1 = buff0 + wid1;
-  buff2 = buff1 + wid1;
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  wid -= D_KER;
-  hgt -= D_KER;
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    sl1 = sl + sll;
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid + D_KER; i++) {
-      buff0[i - 1] = (mlib_s32)sl[i*chan1];
-      buff1[i - 1] = (mlib_s32)sl1[i*chan1];
-    }
-
-    sl += (D_KER + 1)*sll;
-
-    for (j = 0; j < hgt; j++) {
-      sp = sl;
-      dp = dl;
-
-      buff2[-1] = (mlib_s32)sp[0];
-      sp += chan1;
-
-      p02 = buff0[-1];
-      p12 = buff1[-1];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-#ifdef _NO_LONGLONG
-        mlib_s32 o64_1, o64_2;
-#else /* _NO_LONGLONG */
-        mlib_s64 o64;
-#endif /* _NO_LONGLONG */
-        d64_2x32 sd0, sd1, dd;
-
-        p00 = p02; p10 = p12;
-
-        sd0.d64 = *(TYPE_64BIT*)(buff0 + i);
-        sd1.d64 = *(TYPE_64BIT*)(buff1 + i);
-        p01 = (mlib_d64)sd0.i32s.i0;
-        p02 = (mlib_d64)sd0.i32s.i1;
-        p11 = (mlib_d64)sd1.i32s.i0;
-        p12 = (mlib_d64)sd1.i32s.i1;
-
-        LOAD_BUFF(buff2);
-
-        dd.i32s.i0 = CLAMP_S32(p00 * k0 + p01 * k1 + p10 * k2 + p11 * k3 - (1u << 31));
-        dd.i32s.i1 = CLAMP_S32(p01 * k0 + p02 * k1 + p11 * k2 + p12 * k3 - (1u << 31));
-        *(TYPE_64BIT*)(buffo + i) = dd.d64;
-
-#ifdef _NO_LONGLONG
-
-        o64_1 = buffo[i];
-        o64_2 = buffo[i+1];
-        STORE2(o64_1 >> 24, o64_2 >> 24);
-
-#else /* _NO_LONGLONG */
-
-        o64 = *(mlib_s64*)(buffo + i);
-        STORE2(o64 >> 56, o64 >> 24);
-
-#endif /* _NO_LONGLONG */
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      for (; i < wid; i++) {
-        p00 = buff0[i - 1]; p10 = buff1[i - 1];
-        p01 = buff0[i];     p11 = buff1[i];
-
-        buff2[i] = (mlib_s32)sp[0];
-
-        buffo[i] = CLAMP_S32(p00 * k0 + p01 * k1 + p10 * k2 + p11 * k3 - (1u << 31));
-        dp[0] = (buffo[i] >> 24);
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buffT;
-    }
-  }
-
-  {
-    mlib_s32 amask = (1 << nchannel) - 1;
-
-    if ((cmask & amask) != amask) {
-      mlib_ImageXor80(adr_dst, wid, hgt, dll, nchannel, cmask);
-    } else {
-      mlib_ImageXor80_aa(adr_dst, wid*nchannel, hgt, dll);
-    }
-  }
-
-  if (pbuff != (mlib_s32*)buff_arr) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-mlib_status mlib_c_conv2x2ext_u8(mlib_image       *dst,
-                                 const mlib_image *src,
-                                 mlib_s32         dx_l,
-                                 mlib_s32         dx_r,
-                                 mlib_s32         dy_t,
-                                 mlib_s32         dy_b,
-                                 const mlib_s32   *kern,
-                                 mlib_s32         scalef_expon,
-                                 mlib_s32         cmask)
-{
-  mlib_d64 buff_arr[4*BUFF_LINE];
-  mlib_s32 *pbuff = (mlib_s32*)buff_arr, *buffo, *buff0, *buff1, *buff2, *buffT;
-  DTYPE    *adr_src, *sl, *sp, *sl1;
-  DTYPE    *adr_dst, *dl, *dp;
-  mlib_d64 k0, k1, k2, k3, scalef = (1 << 24);
-  mlib_d64 p00, p01, p02,
-           p10, p11, p12;
-  mlib_s32 wid, hgt, sll, dll, wid1;
-  mlib_s32 nchannel, chan1, chan2;
-  mlib_s32 i, j, c, swid;
-  LOAD_KERNEL_INTO_DOUBLE();
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  swid = wid + D_KER;
-
-  wid1 = (swid + 1) &~ 1;
-
-  if (wid1 > BUFF_LINE) {
-    pbuff = mlib_malloc(4*sizeof(mlib_s32)*wid1);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buffo = pbuff;
-  buff0 = buffo + wid1;
-  buff1 = buff0 + wid1;
-  buff2 = buff1 + wid1;
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  swid -= dx_r;
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    if ((hgt - dy_b) > 0) sl1 = sl + sll;
-    else sl1 = sl;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < swid; i++) {
-      buff0[i - 1] = (mlib_s32)sl[i*chan1];
-      buff1[i - 1] = (mlib_s32)sl1[i*chan1];
-    }
-
-    if (dx_r != 0) {
-      buff0[swid - 1] = buff0[swid - 2];
-      buff1[swid - 1] = buff1[swid - 2];
-    }
-
-    if ((hgt - dy_b) > 1) sl = sl1 + sll;
-    else sl = sl1;
-
-    for (j = 0; j < hgt; j++) {
-      sp = sl;
-      dp = dl;
-
-      buff2[-1] = (mlib_s32)sp[0];
-      sp += chan1;
-
-      p02 = buff0[-1];
-      p12 = buff1[-1];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-#ifdef _NO_LONGLONG
-        mlib_s32 o64_1, o64_2;
-#else /* _NO_LONGLONG */
-        mlib_s64 o64;
-#endif /* _NO_LONGLONG */
-        d64_2x32 sd0, sd1, dd;
-
-        p00 = p02; p10 = p12;
-
-        sd0.d64 = *(TYPE_64BIT*)(buff0 + i);
-        sd1.d64 = *(TYPE_64BIT*)(buff1 + i);
-        p01 = (mlib_d64)sd0.i32s.i0;
-        p02 = (mlib_d64)sd0.i32s.i1;
-        p11 = (mlib_d64)sd1.i32s.i0;
-        p12 = (mlib_d64)sd1.i32s.i1;
-
-        LOAD_BUFF(buff2);
-
-        dd.i32s.i0 = CLAMP_S32(p00 * k0 + p01 * k1 + p10 * k2 + p11 * k3 - (1u << 31));
-        dd.i32s.i1 = CLAMP_S32(p01 * k0 + p02 * k1 + p11 * k2 + p12 * k3 - (1u << 31));
-        *(TYPE_64BIT*)(buffo + i) = dd.d64;
-
-#ifdef _NO_LONGLONG
-
-        o64_1 = buffo[i];
-        o64_2 = buffo[i+1];
-        STORE2(o64_1 >> 24, o64_2 >> 24);
-
-#else /* _NO_LONGLONG */
-
-        o64 = *(mlib_s64*)(buffo + i);
-        STORE2(o64 >> 56, o64 >> 24);
-
-#endif /* _NO_LONGLONG */
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      for (; i < wid; i++) {
-        p00 = buff0[i - 1]; p10 = buff1[i - 1];
-        p01 = buff0[i];     p11 = buff1[i];
-
-        buff2[i] = (mlib_s32)sp[0];
-
-        buffo[i] = CLAMP_S32(p00 * k0 + p01 * k1 + p10 * k2 + p11 * k3 - (1u << 31));
-        dp[0] = (buffo[i] >> 24);
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      if (dx_r != 0) buff2[swid - 1] = buff2[swid - 2];
-
-      if (j < hgt - dy_b - 2) sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buffT;
-    }
-  }
-
-  {
-    mlib_s32 amask = (1 << nchannel) - 1;
-
-    if ((cmask & amask) != amask) {
-      mlib_ImageXor80(adr_dst, wid, hgt, dll, nchannel, cmask);
-    } else {
-      mlib_ImageXor80_aa(adr_dst, wid*nchannel, hgt, dll);
-    }
-  }
-
-  if (pbuff != (mlib_s32*)buff_arr) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16ext.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16ext.c
index 11a68ad31f2..7226fd789ec 100644
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16ext.c
+++ b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16ext.c
@@ -79,9 +79,6 @@
 
 #endif /* IMG_TYPE == 1 */
 
-/***************************************************************/
-#define KSIZE1 (KSIZE - 1)
-
 /***************************************************************/
 #define PARAM                                                   \
   mlib_image       *dst,                                        \
@@ -162,9 +159,6 @@
 #endif /* _LITTLE_ENDIAN */
 #endif /* _NO_LONGLONG */
 
-/***************************************************************/
-#define MLIB_D2_24 16777216.0f
-
 /***************************************************************/
 typedef union {
   mlib_d64 d64;
@@ -174,52 +168,6 @@ typedef union {
   } i32s;
 } d64_2x32;
 
-/***************************************************************/
-#define BUFF_LINE 256
-
-/***************************************************************/
-#define DEF_VARS(type)                                          \
-  type     *adr_src, *sl, *sp, *sl1;                            \
-  type     *adr_dst, *dl, *dp;                                  \
-  FTYPE    *pbuff = buff;                                       \
-  mlib_s32 *buffi, *buffo;                                      \
-  mlib_s32 wid, hgt, sll, dll;                                  \
-  mlib_s32 nchannel, chan1, chan2;                              \
-  mlib_s32 i, j, c, swid
-
-/***************************************************************/
-#define LOAD_KERNEL3()                                                   \
-  FTYPE    scalef = DSCALE;                                              \
-  FTYPE    k0, k1, k2, k3, k4, k5, k6, k7, k8;                           \
-  FTYPE    p00, p01, p02, p03,                                           \
-           p10, p11, p12, p13,                                           \
-           p20, p21, p22, p23;                                           \
-                                                                         \
-  while (scalef_expon > 30) {                                            \
-    scalef /= (1 << 30);                                                 \
-    scalef_expon -= 30;                                                  \
-  }                                                                      \
-                                                                         \
-  scalef /= (1 << scalef_expon);                                         \
-                                                                         \
-  /* keep kernel in regs */                                              \
-  k0 = scalef * kern[0];  k1 = scalef * kern[1];  k2 = scalef * kern[2]; \
-  k3 = scalef * kern[3];  k4 = scalef * kern[4];  k5 = scalef * kern[5]; \
-  k6 = scalef * kern[6];  k7 = scalef * kern[7];  k8 = scalef * kern[8]
-
-/***************************************************************/
-#define LOAD_KERNEL(SIZE)                                       \
-  FTYPE    scalef = DSCALE;                                     \
-                                                                \
-  while (scalef_expon > 30) {                                   \
-    scalef /= (1 << 30);                                        \
-    scalef_expon -= 30;                                         \
-  }                                                             \
-                                                                \
-  scalef /= (1 << scalef_expon);                                \
-                                                                \
-  for (j = 0; j < SIZE; j++) k[j] = scalef * kern[j]
-
 /***************************************************************/
 #define GET_SRC_DST_PARAMETERS(type)                            \
   hgt = mlib_ImageGetHeight(src);                               \
@@ -277,1334 +225,6 @@ typedef union {
 #endif /* IMG_TYPE == 1 */
 #endif /* __sparc */
 
-/***************************************************************/
-#define KSIZE  3
-
-mlib_status CONV_FUNC(3x3)
-{
-  FTYPE    buff[(KSIZE + 2)*BUFF_LINE], *buff0, *buff1, *buff2, *buff3, *buffT;
-  DEF_VARS(DTYPE);
-  DTYPE *sl2;
-#ifndef __sparc
-  mlib_s32 d0, d1;
-#endif /* __sparc */
-  LOAD_KERNEL3();
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  swid = wid + KSIZE1;
-
-  if (swid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 2)*sizeof(FTYPE   )*swid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buff0 = pbuff;
-  buff1 = buff0 + swid;
-  buff2 = buff1 + swid;
-  buff3 = buff2 + swid;
-  buffo = (mlib_s32*)(buff3 + swid);
-  buffi = buffo + (swid &~ 1);
-
-  swid -= (dx_l + dx_r);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    if ((1 > dy_t) && (1 < hgt + KSIZE1 - dy_b)) sl1 = sl + sll;
-    else sl1 = sl;
-
-    if ((hgt - dy_b) > 0) sl2 = sl1 + sll;
-    else sl2 = sl1;
-
-    for (i = 0; i < dx_l; i++) {
-      buff0[i] = (FTYPE)sl[0];
-      buff1[i] = (FTYPE)sl1[0];
-      buff2[i] = (FTYPE)sl2[0];
-    }
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < swid; i++) {
-      buff0[i + dx_l] = (FTYPE)sl[i*chan1];
-      buff1[i + dx_l] = (FTYPE)sl1[i*chan1];
-      buff2[i + dx_l] = (FTYPE)sl2[i*chan1];
-    }
-
-    for (i = 0; i < dx_r; i++) {
-      buff0[swid + dx_l + i] = buff0[swid + dx_l - 1];
-      buff1[swid + dx_l + i] = buff1[swid + dx_l - 1];
-      buff2[swid + dx_l + i] = buff2[swid + dx_l - 1];
-    }
-
-    if ((hgt - dy_b) > 1) sl = sl2 + sll;
-    else sl = sl2;
-
-    for (j = 0; j < hgt; j++) {
-      FTYPE    s0, s1;
-
-      p02 = buff0[0];
-      p12 = buff1[0];
-      p22 = buff2[0];
-
-      p03 = buff0[1];
-      p13 = buff1[1];
-      p23 = buff2[1];
-
-      s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-      s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-      sp = sl;
-      dp = dl;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-#ifdef __sparc
-#ifdef _NO_LONGLONG
-        mlib_s32 o64_1, o64_2;
-#else /* _NO_LONGLONG */
-        mlib_s64 o64;
-#endif /* _NO_LONGLONG */
-#endif /* __sparc */
-        d64_2x32 dd;
-
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3]; p23 = buff2[i + 3];
-
-        LOAD_BUFF(buffi);
-
-        dd.d64 = *(FTYPE   *)(buffi + i);
-        buff3[i + dx_l    ] = (FTYPE)dd.i32s.i0;
-        buff3[i + dx_l + 1] = (FTYPE)dd.i32s.i1;
-
-#ifndef __sparc
-
-        d0 = D2I(s0 + p02 * k2 + p12 * k5 + p22 * k8);
-        d1 = D2I(s1 + p02 * k1 + p03 * k2 + p12 * k4 + p13 * k5 + p22 * k7 + p23 * k8);
-
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-        dp[0    ] = FROM_S32(d0);
-        dp[chan1] = FROM_S32(d1);
-
-#else /* __sparc */
-
-        dd.i32s.i0 = D2I(s0 + p02 * k2 + p12 * k5 + p22 * k8);
-        dd.i32s.i1 = D2I(s1 + p02 * k1 + p03 * k2 + p12 * k4 + p13 * k5 + p22 * k7 + p23 * k8);
-        *(FTYPE   *)(buffo + i) = dd.d64;
-
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-#ifdef _NO_LONGLONG
-
-        o64_1 = buffo[i];
-        o64_2 = buffo[i+1];
-#if IMG_TYPE != 1
-        STORE2(FROM_S32(o64_1), FROM_S32(o64_2));
-#else
-        STORE2(o64_1 >> 24, o64_2 >> 24);
-#endif /* IMG_TYPE != 1 */
-
-#else /* _NO_LONGLONG */
-
-        o64 = *(mlib_s64*)(buffo + i);
-#if IMG_TYPE != 1
-        STORE2(FROM_S32(o64 >> 32), FROM_S32(o64));
-#else
-        STORE2(o64 >> 56, o64 >> 24);
-#endif /* IMG_TYPE != 1 */
-#endif /* _NO_LONGLONG */
-#endif /* __sparc */
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      for (; i < wid; i++) {
-        p00 = buff0[i];     p10 = buff1[i];     p20 = buff2[i];
-        p01 = buff0[i + 1]; p11 = buff1[i + 1]; p21 = buff2[i + 1];
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2];
-
-        buffi[i] = (mlib_s32)sp[0];
-        buff3[i + dx_l] = (FTYPE)buffi[i];
-
-#ifndef __sparc
-
-        d0 = D2I(p00 * k0 + p01 * k1 + p02 * k2 + p10 * k3 + p11 * k4 +
-                 p12 * k5 + p20 * k6 + p21 * k7 + p22 * k8);
-
-        dp[0] = FROM_S32(d0);
-
-#else  /* __sparc */
-
-        buffo[i] = D2I(p00 * k0 + p01 * k1 + p02 * k2 + p10 * k3 + p11 * k4 +
-                       p12 * k5 + p20 * k6 + p21 * k7 + p22 * k8);
-#if IMG_TYPE != 1
-        dp[0] = FROM_S32(buffo[i]);
-#else
-        dp[0] = buffo[i] >> 24;
-#endif /* IMG_TYPE != 1 */
-#endif /* __sparc */
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      for (; i < swid; i++) {
-        buffi[i] = (mlib_s32)sp[0];
-        buff3[i + dx_l] = (FTYPE)buffi[i];
-        sp += chan1;
-      }
-
-      for (i = 0; i < dx_l; i++) buff3[i] = buff3[dx_l];
-      for (i = 0; i < dx_r; i++) buff3[swid + dx_l + i] = buff3[swid + dx_l - 1];
-
-      if (j < hgt - dy_b - 2) sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buff3;
-      buff3 = buffT;
-    }
-  }
-
-#ifdef __sparc
-#if IMG_TYPE == 1
-  {
-    mlib_s32 amask = (1 << nchannel) - 1;
-
-    if ((cmask & amask) != amask) {
-      mlib_ImageXor80(adr_dst, wid, hgt, dll, nchannel, cmask);
-    } else {
-      mlib_ImageXor80_aa(adr_dst, wid*nchannel, hgt, dll);
-    }
-  }
-
-#endif /* IMG_TYPE == 1 */
-#endif /* __sparc */
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#ifndef __sparc /* for x86, using integer multiplies is faster */
-
-mlib_status CONV_FUNC_I(3x3)
-{
-  DTYPE    *adr_src, *sl, *sp0, *sp1, *sp2, *sp_1, *sp_2;
-  DTYPE    *adr_dst, *dl, *dp;
-  mlib_s32 wid, hgt, sll, dll;
-  mlib_s32 nchannel, chan1, chan2, delta_chan;
-  mlib_s32 i, j, c;
-  mlib_s32 shift1, shift2;
-  mlib_s32 k0, k1, k2, k3, k4, k5, k6, k7, k8;
-  mlib_s32 p02, p03,
-           p12, p13,
-           p22, p23;
-
-#if IMG_TYPE != 1
-  shift1 = 16;
-#else
-  shift1 = 8;
-#endif /* IMG_TYPE != 1 */
-
-  shift2 = scalef_expon - shift1;
-
-  /* keep kernel in regs */
-  k0 = kern[0] >> shift1;  k1 = kern[1] >> shift1;  k2 = kern[2] >> shift1;
-  k3 = kern[3] >> shift1;  k4 = kern[4] >> shift1;  k5 = kern[5] >> shift1;
-  k6 = kern[6] >> shift1;  k7 = kern[7] >> shift1;  k8 = kern[8] >> shift1;
-
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-  delta_chan = 0;
-
-  if ((1 > dx_l) && (1 < wid + KSIZE1 - dx_r)) delta_chan = chan1;
-
-  for (c = 0; c < chan1; c++) {
-    if (!(cmask & (1 << (chan1 - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    sp_1 = sl;
-
-    if ((1 > dy_t) && (1 < hgt + KSIZE1 - dy_b)) sl += sll;
-    sp_2 = sl;
-
-    if ((hgt - dy_b) > 0) sl += sll;
-
-    for (j = 0; j < hgt; j++) {
-      mlib_s32 s0, s1;
-      mlib_s32 pix0, pix1;
-
-      dp  = dl;
-      sp0 = sp_1;
-      sp_1 = sp_2;
-      sp_2 = sl;
-
-      sp1 = sp_1;
-      sp2 = sp_2;
-
-      p02 = sp0[0];
-      p12 = sp1[0];
-      p22 = sp2[0];
-
-      p03 = sp0[delta_chan];
-      p13 = sp1[delta_chan];
-      p23 = sp2[delta_chan];
-
-      s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-      s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-      sp0 += (chan1 + delta_chan);
-      sp1 += (chan1 + delta_chan);
-      sp2 += (chan1 + delta_chan);
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - dx_r - 2); i += 2) {
-        p02 = sp0[0];     p12 = sp1[0];     p22 = sp2[0];
-        p03 = sp0[chan1]; p13 = sp1[chan1]; p23 = sp2[chan1];
-
-        pix0 = (s0 + p02 * k2 + p12 * k5 + p22 * k8) >> shift2;
-        pix1 = (s1 + p02 * k1 + p03 * k2 + p12 * k4 +
-                p13 * k5 + p22 * k7 + p23 * k8) >> shift2;
-
-        CLAMP_STORE(dp[0],     pix0);
-        CLAMP_STORE(dp[chan1], pix1);
-
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-        sp0 += chan2;
-        sp1 += chan2;
-        sp2 += chan2;
-        dp += chan2;
-      }
-
-      p02 = p03; p12 = p13; p22 = p23;
-
-      for (; i < wid - dx_r; i++) {
-        p03 = sp0[0]; p13 = sp1[0]; p23 = sp2[0];
-        pix0 = (s0 + p03 * k2 + p13 * k5 + p23 * k8) >> shift2;
-        CLAMP_STORE(dp[0], pix0);
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        p02 = p03; p12 = p13; p22 = p23;
-        sp0 += chan1;
-        sp1 += chan1;
-        sp2 += chan1;
-        dp += chan1;
-      }
-
-      sp0 -= chan1;
-      sp1 -= chan1;
-      sp2 -= chan1;
-
-      for (; i < wid; i++) {
-        p03 = sp0[0]; p13 = sp1[0]; p23 = sp2[0];
-        pix0 = (s0 + p03 * k2 + p13 * k5 + p23 * k8) >> shift2;
-        CLAMP_STORE(dp[0], pix0);
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        p02 = p03; p12 = p13; p22 = p23;
-        dp += chan1;
-      }
-
-      if (j < hgt - dy_b - 1) sl += sll;
-      dl += dll;
-    }
-  }
-
-  return MLIB_SUCCESS;
-}
-
-#endif /* __sparc ( for x86, using integer multiplies is faster ) */
-
-/***************************************************************/
-#undef  KSIZE
-#define KSIZE 4
-
-mlib_status CONV_FUNC(4x4)
-{
-  FTYPE    buff[(KSIZE + 3)*BUFF_LINE];
-  FTYPE    *buff0, *buff1, *buff2, *buff3, *buff4, *buffd, *buffT;
-  FTYPE    k[KSIZE*KSIZE];
-  mlib_s32 d0, d1;
-  FTYPE    k0, k1, k2, k3, k4, k5, k6, k7;
-  FTYPE    p00, p01, p02, p03, p04,
-           p10, p11, p12, p13, p14,
-           p20, p21, p22, p23,
-           p30, p31, p32, p33;
-  DEF_VARS(DTYPE);
-  DTYPE *sl2, *sl3;
-  LOAD_KERNEL(KSIZE*KSIZE);
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  swid = wid + KSIZE1;
-
-  if (swid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 3)*sizeof(FTYPE   )*swid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buff0 = pbuff;
-  buff1 = buff0 + swid;
-  buff2 = buff1 + swid;
-  buff3 = buff2 + swid;
-  buff4 = buff3 + swid;
-  buffd = buff4 + swid;
-  buffo = (mlib_s32*)(buffd + swid);
-  buffi = buffo + (swid &~ 1);
-
-  swid -= (dx_l + dx_r);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    if ((1 > dy_t) && (1 < hgt + KSIZE1 - dy_b)) sl1 = sl + sll;
-    else sl1 = sl;
-
-    if ((2 > dy_t) && (2 < hgt + KSIZE1 - dy_b)) sl2 = sl1 + sll;
-    else sl2 = sl1;
-
-    if ((hgt - dy_b) > 0) sl3 = sl2 + sll;
-    else sl3 = sl2;
-
-    for (i = 0; i < dx_l; i++) {
-      buff0[i] = (FTYPE)sl[0];
-      buff1[i] = (FTYPE)sl1[0];
-      buff2[i] = (FTYPE)sl2[0];
-      buff3[i] = (FTYPE)sl3[0];
-    }
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < swid; i++) {
-      buff0[i + dx_l] = (FTYPE)sl[i*chan1];
-      buff1[i + dx_l] = (FTYPE)sl1[i*chan1];
-      buff2[i + dx_l] = (FTYPE)sl2[i*chan1];
-      buff3[i + dx_l] = (FTYPE)sl3[i*chan1];
-    }
-
-    for (i = 0; i < dx_r; i++) {
-      buff0[swid + dx_l + i] = buff0[swid + dx_l - 1];
-      buff1[swid + dx_l + i] = buff1[swid + dx_l - 1];
-      buff2[swid + dx_l + i] = buff2[swid + dx_l - 1];
-      buff3[swid + dx_l + i] = buff3[swid + dx_l - 1];
-    }
-
-    if ((hgt - dy_b) > 1) sl = sl3 + sll;
-    else sl = sl3;
-
-    for (j = 0; j < hgt; j++) {
-      d64_2x32 dd;
-
-      /*
-       *  First loop on two first lines of kernel
-       */
-      k0 = k[0]; k1 = k[1]; k2 = k[2]; k3 = k[3];
-      k4 = k[4]; k5 = k[5]; k6 = k[6]; k7 = k[7];
-
-      sp = sl;
-      dp = dl;
-
-      p02 = buff0[0];
-      p12 = buff1[0];
-      p03 = buff0[1];
-      p13 = buff1[1];
-      p04 = buff0[2];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = buff1[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3];
-        p04 = buff0[i + 4]; p14 = buff1[i + 4];
-
-        LOAD_BUFF(buffi);
-
-        dd.d64 = *(FTYPE   *)(buffi + i);
-        buff4[i + dx_l    ] = (FTYPE)dd.i32s.i0;
-        buff4[i + dx_l + 1] = (FTYPE)dd.i32s.i1;
-
-        buffd[i    ] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 +
-                        p10 * k4 + p11 * k5 + p12 * k6 + p13 * k7);
-        buffd[i + 1] = (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 +
-                        p11 * k4 + p12 * k5 + p13 * k6 + p14 * k7);
-
-        sp += chan2;
-      }
-
-      /*
-       *  Second loop on two last lines of kernel
-       */
-      k0 = k[ 8]; k1 = k[ 9]; k2 = k[10]; k3 = k[11];
-      k4 = k[12]; k5 = k[13]; k6 = k[14]; k7 = k[15];
-
-      p02 = buff2[0];
-      p12 = buff3[0];
-      p03 = buff2[1];
-      p13 = buff3[1];
-      p04 = buff2[2];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = buff3[i + 2];
-        p03 = buff2[i + 3]; p13 = buff3[i + 3];
-        p04 = buff2[i + 4]; p14 = buff3[i + 4];
-
-        d0 = D2I(p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 +
-                 p10 * k4 + p11 * k5 + p12 * k6 + p13 * k7 + buffd[i]);
-        d1 = D2I(p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 +
-                 p11 * k4 + p12 * k5 + p13 * k6 + p14 * k7 + buffd[i + 1]);
-
-        dp[0    ] = FROM_S32(d0);
-        dp[chan1] = FROM_S32(d1);
-
-        dp += chan2;
-      }
-
-      /* last pixels */
-      for (; i < wid; i++) {
-        p00 = buff0[i];     p10 = buff1[i];     p20 = buff2[i];     p30 = buff3[i];
-        p01 = buff0[i + 1]; p11 = buff1[i + 1]; p21 = buff2[i + 1]; p31 = buff3[i + 1];
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2]; p32 = buff3[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3]; p23 = buff2[i + 3]; p33 = buff3[i + 3];
-
-        buff4[i + dx_l] = (FTYPE)sp[0];
-
-        buffo[i] = D2I(p00 * k[0] + p01 * k[1] + p02 * k[2] + p03 * k[3] +
-                       p10 * k[4] + p11 * k[5] + p12 * k[6] + p13 * k[7] +
-                       p20 * k[ 8] + p21 * k[ 9] + p22 * k[10] + p23 * k[11] +
-                       p30 * k[12] + p31 * k[13] + p32 * k[14] + p33 * k[15]);
-
-        dp[0] = FROM_S32(buffo[i]);
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      for (; i < swid; i++) {
-        buff4[i + dx_l] = (FTYPE)sp[0];
-        sp += chan1;
-      }
-
-      for (i = 0; i < dx_l; i++) buff4[i] = buff4[dx_l];
-      for (i = 0; i < dx_r; i++) buff4[swid + dx_l + i] = buff4[swid + dx_l - 1];
-
-      /* next line */
-
-      if (j < hgt - dy_b - 2) sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buff3;
-      buff3 = buff4;
-      buff4 = buffT;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  KSIZE
-#define KSIZE 5
-
-mlib_status CONV_FUNC(5x5)
-{
-  FTYPE    buff[(KSIZE + 3)*BUFF_LINE];
-  FTYPE    *buff0, *buff1, *buff2, *buff3, *buff4, *buff5, *buffd, *buffT;
-  FTYPE    k[KSIZE*KSIZE];
-  mlib_s32 d0, d1;
-  FTYPE    k0, k1, k2, k3, k4, k5, k6, k7, k8, k9;
-  FTYPE    p00, p01, p02, p03, p04, p05,
-           p10, p11, p12, p13, p14, p15,
-           p20, p21, p22, p23, p24,
-           p30, p31, p32, p33, p34,
-           p40, p41, p42, p43, p44;
-  DEF_VARS(DTYPE);
-  DTYPE *sl2, *sl3, *sl4;
-  LOAD_KERNEL(KSIZE*KSIZE);
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  swid = wid + KSIZE1;
-
-  if (swid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 3)*sizeof(FTYPE   )*swid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buff0 = pbuff;
-  buff1 = buff0 + swid;
-  buff2 = buff1 + swid;
-  buff3 = buff2 + swid;
-  buff4 = buff3 + swid;
-  buff5 = buff4 + swid;
-  buffd = buff5 + swid;
-  buffo = (mlib_s32*)(buffd + swid);
-  buffi = buffo + (swid &~ 1);
-
-  swid -= (dx_l + dx_r);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    if ((1 > dy_t) && (1 < hgt + KSIZE1 - dy_b)) sl1 = sl + sll;
-    else sl1 = sl;
-
-    if ((2 > dy_t) && (2 < hgt + KSIZE1 - dy_b)) sl2 = sl1 + sll;
-    else sl2 = sl1;
-
-    if ((3 > dy_t) && (3 < hgt + KSIZE1 - dy_b)) sl3 = sl2 + sll;
-    else sl3 = sl2;
-
-    if ((hgt - dy_b) > 0) sl4 = sl3 + sll;
-    else sl4 = sl3;
-
-    for (i = 0; i < dx_l; i++) {
-      buff0[i] = (FTYPE)sl[0];
-      buff1[i] = (FTYPE)sl1[0];
-      buff2[i] = (FTYPE)sl2[0];
-      buff3[i] = (FTYPE)sl3[0];
-      buff4[i] = (FTYPE)sl4[0];
-    }
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < swid; i++) {
-      buff0[i + dx_l] = (FTYPE)sl[i*chan1];
-      buff1[i + dx_l] = (FTYPE)sl1[i*chan1];
-      buff2[i + dx_l] = (FTYPE)sl2[i*chan1];
-      buff3[i + dx_l] = (FTYPE)sl3[i*chan1];
-      buff4[i + dx_l] = (FTYPE)sl4[i*chan1];
-    }
-
-    for (i = 0; i < dx_r; i++) {
-      buff0[swid + dx_l + i] = buff0[swid + dx_l - 1];
-      buff1[swid + dx_l + i] = buff1[swid + dx_l - 1];
-      buff2[swid + dx_l + i] = buff2[swid + dx_l - 1];
-      buff3[swid + dx_l + i] = buff3[swid + dx_l - 1];
-      buff4[swid + dx_l + i] = buff4[swid + dx_l - 1];
-    }
-
-    if ((hgt - dy_b) > 1) sl = sl4 + sll;
-    else sl = sl4;
-
-    for (j = 0; j < hgt; j++) {
-      d64_2x32 dd;
-
-      /*
-       *  First loop
-       */
-      k0 = k[0]; k1 = k[1]; k2 = k[2]; k3 = k[3]; k4 = k[4];
-      k5 = k[5]; k6 = k[6]; k7 = k[7]; k8 = k[8]; k9 = k[9];
-
-      sp = sl;
-      dp = dl;
-
-      p02 = buff0[0];
-      p12 = buff1[0];
-      p03 = buff0[1];
-      p13 = buff1[1];
-      p04 = buff0[2];
-      p14 = buff1[2];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-
-        LOAD_BUFF(buffi);
-
-        p03 = buff0[i + 3]; p13 = buff1[i + 3];
-        p04 = buff0[i + 4]; p14 = buff1[i + 4];
-        p05 = buff0[i + 5]; p15 = buff1[i + 5];
-
-        buffd[i    ] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                        p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        buffd[i + 1] = (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                        p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp += chan2;
-      }
-
-      /*
-       *  Second loop
-       */
-      k0 = k[10]; k1 = k[11]; k2 = k[12]; k3 = k[13]; k4 = k[14];
-      k5 = k[15]; k6 = k[16]; k7 = k[17]; k8 = k[18]; k9 = k[19];
-
-      p02 = buff2[0];
-      p12 = buff3[0];
-      p03 = buff2[1];
-      p13 = buff3[1];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-
-        p02 = buff2[i + 2]; p12 = buff3[i + 2];
-        p03 = buff2[i + 3]; p13 = buff3[i + 3];
-        p04 = buff2[i + 4]; p14 = buff3[i + 4];
-        p05 = buff2[i + 5]; p15 = buff3[i + 5];
-
-        dd.d64 = *(FTYPE   *)(buffi + i);
-        buff5[i + dx_l    ] = (FTYPE)dd.i32s.i0;
-        buff5[i + dx_l + 1] = (FTYPE)dd.i32s.i1;
-
-        buffd[i    ] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                         p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        buffd[i + 1] += (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                         p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-      }
-
-      /*
-       *  3 loop
-       */
-      k0 = k[20]; k1 = k[21]; k2 = k[22]; k3 = k[23]; k4 = k[24];
-
-      p02 = buff4[0];
-      p03 = buff4[1];
-      p04 = buff4[2];
-      p05 = buff4[3];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p01 = p03; p02 = p04; p03 = p05;
-
-        p04 = buff4[i + 4]; p05 = buff4[i + 5];
-
-        d0 = D2I(p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 + buffd[i]);
-        d1 = D2I(p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 + buffd[i + 1]);
-
-        dp[0    ] = FROM_S32(d0);
-        dp[chan1] = FROM_S32(d1);
-
-        dp += chan2;
-      }
-
-      /* last pixels */
-      for (; i < wid; i++) {
-        p00 = buff0[i];     p10 = buff1[i];     p20 = buff2[i];     p30 = buff3[i];
-        p01 = buff0[i + 1]; p11 = buff1[i + 1]; p21 = buff2[i + 1]; p31 = buff3[i + 1];
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2]; p32 = buff3[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3]; p23 = buff2[i + 3]; p33 = buff3[i + 3];
-        p04 = buff0[i + 4]; p14 = buff1[i + 4]; p24 = buff2[i + 4]; p34 = buff3[i + 4];
-
-        p40 = buff4[i];     p41 = buff4[i + 1]; p42 = buff4[i + 2];
-        p43 = buff4[i + 3]; p44 = buff4[i + 4];
-
-        buff5[i + dx_l] = (FTYPE)sp[0];
-
-        buffo[i] = D2I(p00 * k[0] + p01 * k[1] + p02 * k[2] + p03 * k[3] + p04 * k[4] +
-                       p10 * k[5] + p11 * k[6] + p12 * k[7] + p13 * k[8] + p14 * k[9] +
-                       p20 * k[10] + p21 * k[11] + p22 * k[12] + p23 * k[13] + p24 * k[14] +
-                       p30 * k[15] + p31 * k[16] + p32 * k[17] + p33 * k[18] + p34 * k[19] +
-                       p40 * k[20] + p41 * k[21] + p42 * k[22] + p43 * k[23] + p44 * k[24]);
-
-        dp[0] = FROM_S32(buffo[i]);
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      for (; i < swid; i++) {
-        buff5[i + dx_l] = (FTYPE)sp[0];
-        sp += chan1;
-      }
-
-      for (i = 0; i < dx_l; i++) buff5[i] = buff5[dx_l];
-      for (i = 0; i < dx_r; i++) buff5[swid + dx_l + i] = buff5[swid + dx_l - 1];
-
-      /* next line */
-
-      if (j < hgt - dy_b - 2) sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buff3;
-      buff3 = buff4;
-      buff4 = buff5;
-      buff5 = buffT;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#ifndef __sparc /* for x86, using integer multiplies is faster */
-
-mlib_status CONV_FUNC_I(5x5)
-{
-  mlib_s32 buff[BUFF_LINE];
-  mlib_s32 *buffd;
-  mlib_s32 k[KSIZE*KSIZE];
-  mlib_s32 shift1, shift2;
-  mlib_s32 k0, k1, k2, k3, k4, k5, k6, k7, k8, k9;
-  mlib_s32 p00, p01, p02, p03, p04, p05,
-           p10, p11, p12, p13, p14, p15;
-  DTYPE    *adr_src, *sl, *sp0, *sp1, *sp2, *sp3, *sp4;
-  DTYPE    *sp_1, *sp_2, *sp_3, *sp_4;
-  DTYPE    *adr_dst, *dl, *dp;
-  mlib_s32 *pbuff = buff;
-  mlib_s32 wid, hgt, sll, dll;
-  mlib_s32 nchannel, chan1, chan2, chan4;
-  mlib_s32 delta_chan1, delta_chan2, delta_chan3;
-  mlib_s32 i, j, c;
-
-#if IMG_TYPE != 1
-  shift1 = 16;
-#else
-  shift1 = 8;
-#endif /* IMG_TYPE != 1 */
-
-  shift2 = scalef_expon - shift1;
-
-  for (j = 0; j < KSIZE*KSIZE; j++) k[j] = kern[j] >> shift1;
-
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  if (wid > BUFF_LINE) {
-    pbuff = mlib_malloc(sizeof(mlib_s32)*wid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buffd = pbuff;
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  if ((1 > dx_l) && (1 < wid + KSIZE1 - dx_r)) delta_chan1 = chan1;
-  else delta_chan1 = 0;
-
-  if ((2 > dx_l) && (2 < wid + KSIZE1 - dx_r)) delta_chan2 = delta_chan1 + chan1;
-  else delta_chan2 = delta_chan1;
-
-  if ((3 > dx_l) && (3 < wid + KSIZE1 - dx_r)) delta_chan3 = delta_chan2 + chan1;
-  else delta_chan3 = delta_chan2;
-
-  chan4 = chan1 + delta_chan3;
-
-  for (c = 0; c < chan1; c++) {
-    if (!(cmask & (1 << (chan1 - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    sp_1 = sl;
-
-    if ((1 > dy_t) && (1 < hgt + KSIZE1 - dy_b)) sl += sll;
-    sp_2 = sl;
-
-    if ((2 > dy_t) && (2 < hgt + KSIZE1 - dy_b)) sl += sll;
-    sp_3 = sl;
-
-    if ((3 > dy_t) && (3 < hgt + KSIZE1 - dy_b)) sl += sll;
-    sp_4 = sl;
-
-    if ((hgt - dy_b) > 0) sl += sll;
-
-    for (j = 0; j < hgt; j++) {
-      mlib_s32 pix0, pix1;
-
-      dp  = dl;
-      sp0 = sp_1;
-      sp_1 = sp_2;
-      sp_2 = sp_3;
-      sp_3 = sp_4;
-      sp_4 = sl;
-
-      sp1 = sp_1;
-      sp2 = sp_2;
-      sp3 = sp_3;
-      sp4 = sp_4;
-
-      /*
-       *  First loop
-       */
-
-      k0 = k[0]; k1 = k[1]; k2 = k[2]; k3 = k[3]; k4 = k[4];
-      k5 = k[5]; k6 = k[6]; k7 = k[7]; k8 = k[8]; k9 = k[9];
-
-      p02 = sp0[0];           p12 = sp1[0];
-      p03 = sp0[delta_chan1]; p13 = sp1[delta_chan1];
-      p04 = sp0[delta_chan2]; p14 = sp1[delta_chan2];
-      p05 = sp0[delta_chan3]; p15 = sp1[delta_chan3];
-
-      sp0 += chan4;
-      sp1 += chan4;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - dx_r - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = p05; p13 = p15;
-
-        p04 = sp0[0];     p14 = sp1[0];
-        p05 = sp0[chan1]; p15 = sp1[chan1];
-
-        buffd[i    ] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                        p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        buffd[i + 1] = (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                        p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp0 += chan2;
-        sp1 += chan2;
-      }
-
-      p01 = p02; p02 = p03; p03 = p04; p04 = p05;
-      p11 = p12; p12 = p13; p13 = p14; p14 = p15;
-
-      for (; i < wid - dx_r; i++) {
-        p00 = p01; p10 = p11;
-        p01 = p02; p11 = p12;
-        p02 = p03; p12 = p13;
-        p03 = p04; p13 = p14;
-
-        p04 = sp0[0];     p14 = sp1[0];
-
-        buffd[i] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                    p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-
-        sp0 += chan1;
-        sp1 += chan1;
-      }
-
-      sp0 -= chan1;
-      sp1 -= chan1;
-
-      for (; i < wid; i++) {
-        p00 = p01; p10 = p11;
-        p01 = p02; p11 = p12;
-        p02 = p03; p12 = p13;
-        p03 = p04; p13 = p14;
-
-        p04 = sp0[0];     p14 = sp1[0];
-
-        buffd[i] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                    p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-      }
-
-      /*
-       *  Second loop
-       */
-
-      k0 = k[10]; k1 = k[11]; k2 = k[12]; k3 = k[13]; k4 = k[14];
-      k5 = k[15]; k6 = k[16]; k7 = k[17]; k8 = k[18]; k9 = k[19];
-
-      p02 = sp2[0];           p12 = sp3[0];
-      p03 = sp2[delta_chan1]; p13 = sp3[delta_chan1];
-      p04 = sp2[delta_chan2]; p14 = sp3[delta_chan2];
-      p05 = sp2[delta_chan3]; p15 = sp3[delta_chan3];
-
-      sp2 += chan4;
-      sp3 += chan4;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - dx_r - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = p05; p13 = p15;
-
-        p04 = sp2[0];     p14 = sp3[0];
-        p05 = sp2[chan1]; p15 = sp3[chan1];
-
-        buffd[i    ] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                         p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        buffd[i + 1] += (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                         p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp2 += chan2;
-        sp3 += chan2;
-      }
-
-      p01 = p02; p02 = p03; p03 = p04; p04 = p05;
-      p11 = p12; p12 = p13; p13 = p14; p14 = p15;
-
-      for (; i < wid - dx_r; i++) {
-        p00 = p01; p10 = p11;
-        p01 = p02; p11 = p12;
-        p02 = p03; p12 = p13;
-        p03 = p04; p13 = p14;
-
-        p04 = sp2[0];     p14 = sp3[0];
-
-        buffd[i] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                     p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-
-        sp2 += chan1;
-        sp3 += chan1;
-      }
-
-      sp2 -= chan1;
-      sp3 -= chan1;
-
-      for (; i < wid; i++) {
-        p00 = p01; p10 = p11;
-        p01 = p02; p11 = p12;
-        p02 = p03; p12 = p13;
-        p03 = p04; p13 = p14;
-
-        p04 = sp2[0];     p14 = sp3[0];
-
-        buffd[i] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                     p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-      }
-
-      /*
-       *  3 loop
-       */
-
-      k0 = k[20]; k1 = k[21]; k2 = k[22]; k3 = k[23]; k4 = k[24];
-
-      p02 = sp4[0];
-      p03 = sp4[delta_chan1];
-      p04 = sp4[delta_chan2];
-      p05 = sp4[delta_chan3];
-
-      sp4 += chan4;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - dx_r - 2); i += 2) {
-        p00 = p02; p01 = p03; p02 = p04; p03 = p05;
-
-        p04 = sp4[0]; p05 = sp4[chan1];
-
-        pix0 = (buffd[i    ] + p00 * k0 + p01 * k1 + p02 * k2 +
-                p03 * k3 + p04 * k4) >> shift2;
-        pix1 = (buffd[i + 1] + p01 * k0 + p02 * k1 + p03 * k2 +
-                p04 * k3 + p05 * k4) >> shift2;
-
-        CLAMP_STORE(dp[0],     pix0);
-        CLAMP_STORE(dp[chan1], pix1);
-
-        dp  += chan2;
-        sp4 += chan2;
-      }
-
-      p01 = p02; p02 = p03; p03 = p04; p04 = p05;
-
-      for (; i < wid - dx_r; i++) {
-        p00 = p01; p01 = p02; p02 = p03; p03 = p04;
-
-        p04 = sp4[0];
-
-        pix0 = (buffd[i    ] + p00 * k0 + p01 * k1 + p02 * k2 +
-                p03 * k3 + p04 * k4) >> shift2;
-        CLAMP_STORE(dp[0],     pix0);
-
-        dp  += chan1;
-        sp4 += chan1;
-      }
-
-      sp4 -= chan1;
-
-      for (; i < wid; i++) {
-        p00 = p01; p01 = p02; p02 = p03; p03 = p04;
-
-        p04 = sp4[0];
-
-        pix0 = (buffd[i    ] + p00 * k0 + p01 * k1 + p02 * k2 +
-                p03 * k3 + p04 * k4) >> shift2;
-        CLAMP_STORE(dp[0],     pix0);
-
-        dp  += chan1;
-      }
-
-      /* next line */
-
-      if (j < hgt - dy_b - 1) sl += sll;
-      dl += dll;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-#endif /* __sparc ( for x86, using integer multiplies is faster ) */
-
-/***************************************************************/
-#if IMG_TYPE == 1
-
-#undef  KSIZE
-#define KSIZE 7
-
-mlib_status CONV_FUNC(7x7)
-{
-  FTYPE    buff[(KSIZE + 3)*BUFF_LINE], *buffs[2*(KSIZE + 1)], *buffd;
-  FTYPE    k[KSIZE*KSIZE];
-  mlib_s32 l, m, buff_ind;
-  mlib_s32 d0, d1;
-  FTYPE    k0, k1, k2, k3, k4, k5, k6;
-  FTYPE    p0, p1, p2, p3, p4, p5, p6, p7;
-  DTYPE *sl2, *sl3, *sl4, *sl5, *sl6;
-  DEF_VARS(DTYPE);
-  LOAD_KERNEL(KSIZE*KSIZE);
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  swid = wid + KSIZE1;
-
-  if (wid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 3)*sizeof(FTYPE   )*wid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  for (l = 0; l < KSIZE + 1; l++) buffs[l] = pbuff + l*swid;
-  for (l = 0; l < KSIZE + 1; l++) buffs[l + (KSIZE + 1)] = buffs[l];
-  buffd = buffs[KSIZE] + swid;
-  buffo = (mlib_s32*)(buffd + swid);
-  buffi = buffo + (swid &~ 1);
-
-  swid -= (dx_l + dx_r);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    if ((1 > dy_t) && (1 < hgt + KSIZE1 - dy_b)) sl1 = sl + sll;
-    else sl1 = sl;
-
-    if ((2 > dy_t) && (2 < hgt + KSIZE1 - dy_b)) sl2 = sl1 + sll;
-    else sl2 = sl1;
-
-    if ((3 > dy_t) && (3 < hgt + KSIZE1 - dy_b)) sl3 = sl2 + sll;
-    else sl3 = sl2;
-
-    if ((4 > dy_t) && (4 < hgt + KSIZE1 - dy_b)) sl4 = sl3 + sll;
-    else sl4 = sl3;
-
-    if ((5 > dy_t) && (5 < hgt + KSIZE1 - dy_b)) sl5 = sl4 + sll;
-    else sl5 = sl4;
-
-    if ((hgt - dy_b) > 0) sl6 = sl5 + sll;
-    else sl6 = sl5;
-
-    for (i = 0; i < dx_l; i++) {
-      buffs[0][i] = (FTYPE)sl[0];
-      buffs[1][i] = (FTYPE)sl1[0];
-      buffs[2][i] = (FTYPE)sl2[0];
-      buffs[3][i] = (FTYPE)sl3[0];
-      buffs[4][i] = (FTYPE)sl4[0];
-      buffs[5][i] = (FTYPE)sl5[0];
-      buffs[6][i] = (FTYPE)sl6[0];
-    }
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < swid; i++) {
-      buffs[0][i + dx_l] = (FTYPE)sl[i*chan1];
-      buffs[1][i + dx_l] = (FTYPE)sl1[i*chan1];
-      buffs[2][i + dx_l] = (FTYPE)sl2[i*chan1];
-      buffs[3][i + dx_l] = (FTYPE)sl3[i*chan1];
-      buffs[4][i + dx_l] = (FTYPE)sl4[i*chan1];
-      buffs[5][i + dx_l] = (FTYPE)sl5[i*chan1];
-      buffs[6][i + dx_l] = (FTYPE)sl6[i*chan1];
-    }
-
-    for (i = 0; i < dx_r; i++) {
-      buffs[0][swid + dx_l + i] = buffs[0][swid + dx_l - 1];
-      buffs[1][swid + dx_l + i] = buffs[1][swid + dx_l - 1];
-      buffs[2][swid + dx_l + i] = buffs[2][swid + dx_l - 1];
-      buffs[3][swid + dx_l + i] = buffs[3][swid + dx_l - 1];
-      buffs[4][swid + dx_l + i] = buffs[4][swid + dx_l - 1];
-      buffs[5][swid + dx_l + i] = buffs[5][swid + dx_l - 1];
-      buffs[6][swid + dx_l + i] = buffs[6][swid + dx_l - 1];
-    }
-
-    buff_ind = 0;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid; i++) buffd[i] = 0.0;
-
-    if ((hgt - dy_b) > 1) sl = sl6 + sll;
-    else sl = sl6;
-
-    for (j = 0; j < hgt; j++) {
-      FTYPE    **buffc = buffs + buff_ind;
-      FTYPE    *buffn = buffc[KSIZE];
-      FTYPE    *pk = k;
-
-      for (l = 0; l < KSIZE; l++) {
-        FTYPE    *buff = buffc[l];
-        d64_2x32 dd;
-
-        sp = sl;
-        dp = dl;
-
-        p2 = buff[0]; p3 = buff[1]; p4 = buff[2];
-        p5 = buff[3]; p6 = buff[4]; p7 = buff[5];
-
-        k0 = *pk++; k1 = *pk++; k2 = *pk++; k3 = *pk++;
-        k4 = *pk++; k5 = *pk++; k6 = *pk++;
-
-        if (l < (KSIZE - 1)) {
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-          for (i = 0; i <= (wid - 2); i += 2) {
-            p0 = p2; p1 = p3; p2 = p4; p3 = p5; p4 = p6; p5 = p7;
-
-            p6 = buff[i + 6]; p7 = buff[i + 7];
-
-            buffd[i    ] += p0*k0 + p1*k1 + p2*k2 + p3*k3 + p4*k4 + p5*k5 + p6*k6;
-            buffd[i + 1] += p1*k0 + p2*k1 + p3*k2 + p4*k3 + p5*k4 + p6*k5 + p7*k6;
-          }
-
-        } else {
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-          for (i = 0; i <= (wid - 2); i += 2) {
-            p0 = p2; p1 = p3; p2 = p4; p3 = p5; p4 = p6; p5 = p7;
-
-            p6 = buff[i + 6]; p7 = buff[i + 7];
-
-            LOAD_BUFF(buffi);
-
-            dd.d64 = *(FTYPE   *)(buffi + i);
-            buffn[i + dx_l    ] = (FTYPE)dd.i32s.i0;
-            buffn[i + dx_l + 1] = (FTYPE)dd.i32s.i1;
-
-            d0 = D2I(p0*k0 + p1*k1 + p2*k2 + p3*k3 + p4*k4 + p5*k5 + p6*k6 + buffd[i    ]);
-            d1 = D2I(p1*k0 + p2*k1 + p3*k2 + p4*k3 + p5*k4 + p6*k5 + p7*k6 + buffd[i + 1]);
-
-            dp[0    ] = FROM_S32(d0);
-            dp[chan1] = FROM_S32(d1);
-
-            buffd[i    ] = 0.0;
-            buffd[i + 1] = 0.0;
-
-            sp += chan2;
-            dp += chan2;
-          }
-        }
-      }
-
-      /* last pixels */
-      for (; i < wid; i++) {
-        FTYPE    *pk = k, s = 0;
-        mlib_s32 d0;
-
-        for (l = 0; l < KSIZE; l++) {
-          FTYPE    *buff = buffc[l] + i;
-
-          for (m = 0; m < KSIZE; m++) s += buff[m] * (*pk++);
-        }
-
-        d0 = D2I(s);
-        dp[0] = FROM_S32(d0);
-
-        buffn[i + dx_l] = (FTYPE)sp[0];
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      for (; i < swid; i++) {
-        buffn[i + dx_l] = (FTYPE)sp[0];
-        sp += chan1;
-      }
-
-      for (i = 0; i < dx_l; i++) buffn[i] = buffn[dx_l];
-      for (i = 0; i < dx_r; i++) buffn[swid + dx_l + i] = buffn[swid + dx_l - 1];
-
-      /* next line */
-
-      if (j < hgt - dy_b - 2) sl += sll;
-      dl += dll;
-
-      buff_ind++;
-
-      if (buff_ind >= KSIZE + 1) buff_ind = 0;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-#endif /* IMG_TYPE == 1 */
-
 /***************************************************************/
 #define MAX_KER   7
 #define MAX_N    15
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16nw.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16nw.c
index 0be65cda597..4d0ba0ce493 100644
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16nw.c
+++ b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16nw.c
@@ -143,9 +143,6 @@ typedef union {
   } f32s;
 } d64_2x32;
 
-/***************************************************************/
-#define BUFF_LINE 256
-
 /***************************************************************/
 #define DEF_VARS(type)                                          \
   type     *adr_src, *sl, *sp = NULL;                           \
@@ -155,39 +152,6 @@ typedef union {
   mlib_s32 nchannel, chan1;                                     \
   mlib_s32 i, j, c
 
-/***************************************************************/
-#define LOAD_KERNEL3()                                                   \
-  FTYPE    scalef = DSCALE;                                              \
-  FTYPE    k0, k1, k2, k3, k4, k5, k6, k7, k8;                           \
-  FTYPE    p00, p01, p02, p03,                                           \
-           p10, p11, p12, p13,                                           \
-           p20, p21, p22, p23;                                           \
-                                                                         \
-  while (scalef_expon > 30) {                                            \
-    scalef /= (1 << 30);                                                 \
-    scalef_expon -= 30;                                                  \
-  }                                                                      \
-                                                                         \
-  scalef /= (1 << scalef_expon);                                         \
-                                                                         \
-  /* keep kernel in regs */                                              \
-  k0 = scalef * kern[0];  k1 = scalef * kern[1];  k2 = scalef * kern[2]; \
-  k3 = scalef * kern[3];  k4 = scalef * kern[4];  k5 = scalef * kern[5]; \
-  k6 = scalef * kern[6];  k7 = scalef * kern[7];  k8 = scalef * kern[8]
-
-/***************************************************************/
-#define LOAD_KERNEL(SIZE)                                       \
-  FTYPE    scalef = DSCALE;                                     \
-                                                                \
-  while (scalef_expon > 30) {                                   \
-    scalef /= (1 << 30);                                        \
-    scalef_expon -= 30;                                         \
-  }                                                             \
-                                                                \
-  scalef /= (1 << scalef_expon);                                \
-                                                                \
-  for (j = 0; j < SIZE; j++) k[j] = scalef * kern[j]
-
 /***************************************************************/
 #define GET_SRC_DST_PARAMETERS(type)                            \
   hgt = mlib_ImageGetHeight(src);                               \
@@ -245,1162 +209,6 @@ typedef union {
 #endif /* IMG_TYPE == 1 */
 #endif /* __sparc */
 
-/***************************************************************/
-#define KSIZE  3
-
-mlib_status CONV_FUNC(3x3)(mlib_image       *dst,
-                           const mlib_image *src,
-                           const mlib_s32   *kern,
-                           mlib_s32         scalef_expon,
-                           mlib_s32         cmask)
-{
-  FTYPE    buff[(KSIZE + 2)*BUFF_LINE], *buff0, *buff1, *buff2, *buff3, *buffT;
-  DEF_VARS(DTYPE);
-  DTYPE *sl1;
-  mlib_s32 chan2;
-  mlib_s32 *buffo, *buffi;
-  DTYPE *sl2;
-#ifndef __sparc
-  mlib_s32 d0, d1;
-#endif /* __sparc */
-  LOAD_KERNEL3();
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  if (wid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 2)*sizeof(FTYPE)*wid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buff0 = pbuff;
-  buff1 = buff0 + wid;
-  buff2 = buff1 + wid;
-  buff3 = buff2 + wid;
-  buffo = (mlib_s32*)(buff3 + wid);
-  buffi = buffo + (wid &~ 1);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    sl1 = sl  + sll;
-    sl2 = sl1 + sll;
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid + (KSIZE - 1); i++) {
-      buff0[i] = (FTYPE)sl[i*chan1];
-      buff1[i] = (FTYPE)sl1[i*chan1];
-      buff2[i] = (FTYPE)sl2[i*chan1];
-    }
-
-    sl += KSIZE*sll;
-
-    for (j = 0; j < hgt; j++) {
-      FTYPE    s0, s1;
-
-      p02 = buff0[0];
-      p12 = buff1[0];
-      p22 = buff2[0];
-
-      p03 = buff0[1];
-      p13 = buff1[1];
-      p23 = buff2[1];
-
-      s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-      s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-      sp = sl;
-      dp = dl;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-#ifdef __sparc
-#ifdef _NO_LONGLONG
-        mlib_s32 o64_1, o64_2;
-#else /* _NO_LONGLONG */
-        mlib_s64 o64;
-#endif /* _NO_LONGLONG */
-#endif /* __sparc */
-        d64_2x32 dd;
-
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3]; p23 = buff2[i + 3];
-
-        LOAD_BUFF(buffi);
-
-        dd.d64 = *(FTYPE   *)(buffi + i);
-        buff3[i    ] = (FTYPE)dd.i32s.i0;
-        buff3[i + 1] = (FTYPE)dd.i32s.i1;
-
-#ifndef __sparc
-        d0 = D2I(s0 + p02 * k2 + p12 * k5 + p22 * k8);
-        d1 = D2I(s1 + p02 * k1 + p03 * k2 + p12 * k4 + p13 * k5 + p22 * k7 + p23 * k8);
-
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-        dp[0    ] = FROM_S32(d0);
-        dp[chan1] = FROM_S32(d1);
-
-#else /* __sparc */
-
-        dd.i32s.i0 = D2I(s0 + p02 * k2 + p12 * k5 + p22 * k8);
-        dd.i32s.i1 = D2I(s1 + p02 * k1 + p03 * k2 + p12 * k4 + p13 * k5 + p22 * k7 + p23 * k8);
-        *(FTYPE   *)(buffo + i) = dd.d64;
-
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-#ifdef _NO_LONGLONG
-
-        o64_1 = buffo[i];
-        o64_2 = buffo[i+1];
-#if IMG_TYPE != 1
-        STORE2(FROM_S32(o64_1), FROM_S32(o64_2));
-#else
-        STORE2(o64_1 >> 24, o64_2 >> 24);
-#endif /* IMG_TYPE != 1 */
-
-#else /* _NO_LONGLONG */
-
-        o64 = *(mlib_s64*)(buffo + i);
-#if IMG_TYPE != 1
-        STORE2(FROM_S32(o64 >> 32), FROM_S32(o64));
-#else
-        STORE2(o64 >> 56, o64 >> 24);
-#endif /* IMG_TYPE != 1 */
-#endif /* _NO_LONGLONG */
-#endif /* __sparc */
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      for (; i < wid; i++) {
-        p00 = buff0[i];     p10 = buff1[i];     p20 = buff2[i];
-        p01 = buff0[i + 1]; p11 = buff1[i + 1]; p21 = buff2[i + 1];
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2];
-
-        buffi[i] = (mlib_s32)sp[0];
-        buff3[i] = (FTYPE)buffi[i];
-
-#ifndef __sparc
-
-        d0 = D2I(p00 * k0 + p01 * k1 + p02 * k2 + p10 * k3 + p11 * k4 +
-                 p12 * k5 + p20 * k6 + p21 * k7 + p22 * k8);
-
-        dp[0] = FROM_S32(d0);
-
-#else  /* __sparc */
-
-        buffo[i] = D2I(p00 * k0 + p01 * k1 + p02 * k2 + p10 * k3 + p11 * k4 +
-                       p12 * k5 + p20 * k6 + p21 * k7 + p22 * k8);
-#if IMG_TYPE != 1
-        dp[0] = FROM_S32(buffo[i]);
-#else
-        dp[0] = buffo[i] >> 24;
-#endif /* IMG_TYPE != 1 */
-#endif /* __sparc */
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      buffi[wid] = (mlib_s32)sp[0];
-      buff3[wid] = (FTYPE)buffi[wid];
-      buffi[wid + 1] = (mlib_s32)sp[chan1];
-      buff3[wid + 1] = (FTYPE)buffi[wid + 1];
-
-      sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buff3;
-      buff3 = buffT;
-    }
-  }
-
-#ifdef __sparc
-#if IMG_TYPE == 1
-  {
-    mlib_s32 amask = (1 << nchannel) - 1;
-
-    if ((cmask & amask) != amask) {
-      mlib_ImageXor80(adr_dst, wid, hgt, dll, nchannel, cmask);
-    } else {
-      mlib_ImageXor80_aa(adr_dst, wid*nchannel, hgt, dll);
-    }
-  }
-
-#endif /* IMG_TYPE == 1 */
-#endif /* __sparc */
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#ifndef __sparc /* for x86, using integer multiplies is faster */
-
-mlib_status CONV_FUNC_I(3x3)(mlib_image       *dst,
-                             const mlib_image *src,
-                             const mlib_s32   *kern,
-                             mlib_s32         scalef_expon,
-                             mlib_s32         cmask)
-{
-  DTYPE    *adr_src, *sl, *sp0, *sp1, *sp2;
-  DTYPE    *adr_dst, *dl, *dp;
-  mlib_s32 wid, hgt, sll, dll;
-  mlib_s32 nchannel, chan1, chan2;
-  mlib_s32 i, j, c;
-  mlib_s32 shift1, shift2;
-  mlib_s32 k0, k1, k2, k3, k4, k5, k6, k7, k8;
-  mlib_s32 p02, p03,
-           p12, p13,
-           p22, p23;
-
-#if IMG_TYPE != 1
-  shift1 = 16;
-#else
-  shift1 = 8;
-#endif /* IMG_TYPE != 1 */
-
-  shift2 = scalef_expon - shift1;
-
-  /* keep kernel in regs */
-  k0 = kern[0] >> shift1;  k1 = kern[1] >> shift1;  k2 = kern[2] >> shift1;
-  k3 = kern[3] >> shift1;  k4 = kern[4] >> shift1;  k5 = kern[5] >> shift1;
-  k6 = kern[6] >> shift1;  k7 = kern[7] >> shift1;  k8 = kern[8] >> shift1;
-
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  for (c = 0; c < chan1; c++) {
-    if (!(cmask & (1 << (chan1 - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    for (j = 0; j < hgt; j++) {
-      mlib_s32 s0, s1;
-      mlib_s32 pix0, pix1;
-
-      dp  = dl;
-      sp0 = sl;
-      sp1 = sp0 + sll;
-      sp2 = sp1 + sll;
-
-      p02 = sp0[0];
-      p12 = sp1[0];
-      p22 = sp2[0];
-
-      p03 = sp0[chan1];
-      p13 = sp1[chan1];
-      p23 = sp2[chan1];
-
-      s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-      s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-      sp0 += chan2;
-      sp1 += chan2;
-      sp2 += chan2;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p02 = sp0[0];     p12 = sp1[0];     p22 = sp2[0];
-        p03 = sp0[chan1]; p13 = sp1[chan1]; p23 = sp2[chan1];
-
-        pix0 = (s0 + p02 * k2 + p12 * k5 + p22 * k8) >> shift2;
-        pix1 = (s1 + p02 * k1 + p03 * k2 + p12 * k4 +
-                p13 * k5 + p22 * k7 + p23 * k8) >> shift2;
-
-        CLAMP_STORE(dp[0],     pix0);
-        CLAMP_STORE(dp[chan1], pix1);
-
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-        sp0 += chan2;
-        sp1 += chan2;
-        sp2 += chan2;
-        dp += chan2;
-      }
-
-      if (wid & 1) {
-        p02 = sp0[0]; p12 = sp1[0]; p22 = sp2[0];
-        pix0 = (s0 + p02 * k2 + p12 * k5 + p22 * k8) >> shift2;
-        CLAMP_STORE(dp[0], pix0);
-      }
-
-      sl += sll;
-      dl += dll;
-    }
-  }
-
-  return MLIB_SUCCESS;
-}
-
-#endif /* __sparc ( for x86, using integer multiplies is faster ) */
-
-/***************************************************************/
-#undef  KSIZE
-#define KSIZE 4
-
-mlib_status CONV_FUNC(4x4)(mlib_image       *dst,
-                           const mlib_image *src,
-                           const mlib_s32   *kern,
-                           mlib_s32         scalef_expon,
-                           mlib_s32         cmask)
-{
-  FTYPE    buff[(KSIZE + 3)*BUFF_LINE];
-  FTYPE    *buff0, *buff1, *buff2, *buff3, *buff4, *buffd, *buffT;
-  FTYPE    k[KSIZE*KSIZE];
-  mlib_s32 d0, d1;
-  FTYPE    k0, k1, k2, k3, k4, k5, k6, k7;
-  FTYPE    p00, p01, p02, p03, p04,
-           p10, p11, p12, p13, p14,
-           p20, p21, p22, p23,
-           p30, p31, p32, p33;
-  DEF_VARS(DTYPE);
-  DTYPE *sl1;
-  mlib_s32 chan2;
-  mlib_s32 *buffo, *buffi;
-  DTYPE *sl2, *sl3;
-  LOAD_KERNEL(KSIZE*KSIZE);
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  if (wid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 3)*sizeof(FTYPE)*wid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buff0 = pbuff;
-  buff1 = buff0 + wid;
-  buff2 = buff1 + wid;
-  buff3 = buff2 + wid;
-  buff4 = buff3 + wid;
-  buffd = buff4 + wid;
-  buffo = (mlib_s32*)(buffd + wid);
-  buffi = buffo + (wid &~ 1);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    sl1 = sl  + sll;
-    sl2 = sl1 + sll;
-    sl3 = sl2 + sll;
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid + (KSIZE - 1); i++) {
-      buff0[i] = (FTYPE)sl[i*chan1];
-      buff1[i] = (FTYPE)sl1[i*chan1];
-      buff2[i] = (FTYPE)sl2[i*chan1];
-      buff3[i] = (FTYPE)sl3[i*chan1];
-    }
-
-    sl += KSIZE*sll;
-
-    for (j = 0; j < hgt; j++) {
-      d64_2x32 dd;
-
-      /*
-       *  First loop on two first lines of kernel
-       */
-      k0 = k[0]; k1 = k[1]; k2 = k[2]; k3 = k[3];
-      k4 = k[4]; k5 = k[5]; k6 = k[6]; k7 = k[7];
-
-      sp = sl;
-      dp = dl;
-
-      p02 = buff0[0];
-      p12 = buff1[0];
-      p03 = buff0[1];
-      p13 = buff1[1];
-      p04 = buff0[2];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = buff1[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3];
-        p04 = buff0[i + 4]; p14 = buff1[i + 4];
-
-        LOAD_BUFF(buffi);
-
-        dd.d64 = *(FTYPE   *)(buffi + i);
-        buff4[i    ] = (FTYPE)dd.i32s.i0;
-        buff4[i + 1] = (FTYPE)dd.i32s.i1;
-
-        buffd[i    ] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 +
-                        p10 * k4 + p11 * k5 + p12 * k6 + p13 * k7);
-        buffd[i + 1] = (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 +
-                        p11 * k4 + p12 * k5 + p13 * k6 + p14 * k7);
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      /*
-       *  Second loop on two last lines of kernel
-       */
-      k0 = k[ 8]; k1 = k[ 9]; k2 = k[10]; k3 = k[11];
-      k4 = k[12]; k5 = k[13]; k6 = k[14]; k7 = k[15];
-
-      sp = sl;
-      dp = dl;
-
-      p02 = buff2[0];
-      p12 = buff3[0];
-      p03 = buff2[1];
-      p13 = buff3[1];
-      p04 = buff2[2];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = buff3[i + 2];
-        p03 = buff2[i + 3]; p13 = buff3[i + 3];
-        p04 = buff2[i + 4]; p14 = buff3[i + 4];
-
-        d0 = D2I(p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 +
-                 p10 * k4 + p11 * k5 + p12 * k6 + p13 * k7 + buffd[i]);
-        d1 = D2I(p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 +
-                 p11 * k4 + p12 * k5 + p13 * k6 + p14 * k7 + buffd[i + 1]);
-
-        dp[0    ] = FROM_S32(d0);
-        dp[chan1] = FROM_S32(d1);
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      /* last pixels */
-      for (; i < wid; i++) {
-        p00 = buff0[i];     p10 = buff1[i];     p20 = buff2[i];     p30 = buff3[i];
-        p01 = buff0[i + 1]; p11 = buff1[i + 1]; p21 = buff2[i + 1]; p31 = buff3[i + 1];
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2]; p32 = buff3[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3]; p23 = buff2[i + 3]; p33 = buff3[i + 3];
-
-        buff4[i] = (FTYPE)sp[0];
-
-        buffo[i] = D2I(p00 * k[0] + p01 * k[1] + p02 * k[2] + p03 * k[3] +
-                       p10 * k[4] + p11 * k[5] + p12 * k[6] + p13 * k[7] +
-                       p20 * k[ 8] + p21 * k[ 9] + p22 * k[10] + p23 * k[11] +
-                       p30 * k[12] + p31 * k[13] + p32 * k[14] + p33 * k[15]);
-
-        dp[0] = FROM_S32(buffo[i]);
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      buff4[wid    ] = (FTYPE)sp[0];
-      buff4[wid + 1] = (FTYPE)sp[chan1];
-      buff4[wid + 2] = (FTYPE)sp[chan2];
-
-      /* next line */
-      sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buff3;
-      buff3 = buff4;
-      buff4 = buffT;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  KSIZE
-#define KSIZE 5
-
-mlib_status CONV_FUNC(5x5)(mlib_image       *dst,
-                           const mlib_image *src,
-                           const mlib_s32   *kern,
-                           mlib_s32         scalef_expon,
-                           mlib_s32         cmask)
-{
-  FTYPE    buff[(KSIZE + 3)*BUFF_LINE];
-  FTYPE    *buff0, *buff1, *buff2, *buff3, *buff4, *buff5, *buffd, *buffT;
-  FTYPE    k[KSIZE*KSIZE];
-  mlib_s32 d0, d1;
-  FTYPE    k0, k1, k2, k3, k4, k5, k6, k7, k8, k9;
-  FTYPE    p00, p01, p02, p03, p04, p05,
-           p10, p11, p12, p13, p14, p15,
-           p20, p21, p22, p23, p24,
-           p30, p31, p32, p33, p34,
-           p40, p41, p42, p43, p44;
-  DEF_VARS(DTYPE);
-  DTYPE *sl1;
-  mlib_s32 chan2;
-  mlib_s32 *buffo, *buffi;
-  DTYPE *sl2, *sl3, *sl4;
-  LOAD_KERNEL(KSIZE*KSIZE);
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  if (wid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 3)*sizeof(FTYPE)*wid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buff0 = pbuff;
-  buff1 = buff0 + wid;
-  buff2 = buff1 + wid;
-  buff3 = buff2 + wid;
-  buff4 = buff3 + wid;
-  buff5 = buff4 + wid;
-  buffd = buff5 + wid;
-  buffo = (mlib_s32*)(buffd + wid);
-  buffi = buffo + (wid &~ 1);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    sl1 = sl  + sll;
-    sl2 = sl1 + sll;
-    sl3 = sl2 + sll;
-    sl4 = sl3 + sll;
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid + (KSIZE - 1); i++) {
-      buff0[i] = (FTYPE)sl[i*chan1];
-      buff1[i] = (FTYPE)sl1[i*chan1];
-      buff2[i] = (FTYPE)sl2[i*chan1];
-      buff3[i] = (FTYPE)sl3[i*chan1];
-      buff4[i] = (FTYPE)sl4[i*chan1];
-    }
-
-    sl += KSIZE*sll;
-
-    for (j = 0; j < hgt; j++) {
-      d64_2x32 dd;
-
-      /*
-       *  First loop
-       */
-      k0 = k[0]; k1 = k[1]; k2 = k[2]; k3 = k[3]; k4 = k[4];
-      k5 = k[5]; k6 = k[6]; k7 = k[7]; k8 = k[8]; k9 = k[9];
-
-      sp = sl;
-      dp = dl;
-
-      p02 = buff0[0];
-      p12 = buff1[0];
-      p03 = buff0[1];
-      p13 = buff1[1];
-      p04 = buff0[2];
-      p14 = buff1[2];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-
-        LOAD_BUFF(buffi);
-
-        p03 = buff0[i + 3]; p13 = buff1[i + 3];
-        p04 = buff0[i + 4]; p14 = buff1[i + 4];
-        p05 = buff0[i + 5]; p15 = buff1[i + 5];
-
-        buffd[i    ] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                        p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        buffd[i + 1] = (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                        p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      /*
-       *  Second loop
-       */
-      k0 = k[10]; k1 = k[11]; k2 = k[12]; k3 = k[13]; k4 = k[14];
-      k5 = k[15]; k6 = k[16]; k7 = k[17]; k8 = k[18]; k9 = k[19];
-
-      sp = sl;
-      dp = dl;
-
-      p02 = buff2[0];
-      p12 = buff3[0];
-      p03 = buff2[1];
-      p13 = buff3[1];
-      p04 = buff2[2];
-      p14 = buff3[2];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-
-        p02 = buff2[i + 2]; p12 = buff3[i + 2];
-        p03 = buff2[i + 3]; p13 = buff3[i + 3];
-        p04 = buff2[i + 4]; p14 = buff3[i + 4];
-        p05 = buff2[i + 5]; p15 = buff3[i + 5];
-
-        dd.d64 = *(FTYPE   *)(buffi + i);
-        buff5[i    ] = (FTYPE)dd.i32s.i0;
-        buff5[i + 1] = (FTYPE)dd.i32s.i1;
-
-        buffd[i    ] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                         p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        buffd[i + 1] += (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                         p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      /*
-       *  3 loop
-       */
-      k0 = k[20]; k1 = k[21]; k2 = k[22]; k3 = k[23]; k4 = k[24];
-
-      sp = sl;
-      dp = dl;
-
-      p02 = buff4[0];
-      p03 = buff4[1];
-      p04 = buff4[2];
-      p05 = buff4[3];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p01 = p03; p02 = p04; p03 = p05;
-
-        p04 = buff4[i + 4]; p05 = buff4[i + 5];
-
-        d0 = D2I(p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 + buffd[i]);
-        d1 = D2I(p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 + buffd[i + 1]);
-
-        dp[0    ] = FROM_S32(d0);
-        dp[chan1] = FROM_S32(d1);
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      /* last pixels */
-      for (; i < wid; i++) {
-        p00 = buff0[i];     p10 = buff1[i];     p20 = buff2[i];     p30 = buff3[i];
-        p01 = buff0[i + 1]; p11 = buff1[i + 1]; p21 = buff2[i + 1]; p31 = buff3[i + 1];
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2]; p32 = buff3[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3]; p23 = buff2[i + 3]; p33 = buff3[i + 3];
-        p04 = buff0[i + 4]; p14 = buff1[i + 4]; p24 = buff2[i + 4]; p34 = buff3[i + 4];
-
-        p40 = buff4[i];     p41 = buff4[i + 1]; p42 = buff4[i + 2];
-        p43 = buff4[i + 3]; p44 = buff4[i + 4];
-
-        buff5[i] = (FTYPE)sp[0];
-
-        buffo[i] = D2I(p00 * k[0] + p01 * k[1] + p02 * k[2] + p03 * k[3] + p04 * k[4] +
-                       p10 * k[5] + p11 * k[6] + p12 * k[7] + p13 * k[8] + p14 * k[9] +
-                       p20 * k[10] + p21 * k[11] + p22 * k[12] + p23 * k[13] + p24 * k[14] +
-                       p30 * k[15] + p31 * k[16] + p32 * k[17] + p33 * k[18] + p34 * k[19] +
-                       p40 * k[20] + p41 * k[21] + p42 * k[22] + p43 * k[23] + p44 * k[24]);
-
-        dp[0] = FROM_S32(buffo[i]);
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      buff5[wid    ] = (FTYPE)sp[0];
-      buff5[wid + 1] = (FTYPE)sp[chan1];
-      buff5[wid + 2] = (FTYPE)sp[chan2];
-      buff5[wid + 3] = (FTYPE)sp[chan2 + chan1];
-
-      /* next line */
-      sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buff3;
-      buff3 = buff4;
-      buff4 = buff5;
-      buff5 = buffT;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#ifndef __sparc /* for x86, using integer multiplies is faster */
-
-mlib_status CONV_FUNC_I(5x5)(mlib_image       *dst,
-                             const mlib_image *src,
-                             const mlib_s32   *kern,
-                             mlib_s32         scalef_expon,
-                             mlib_s32         cmask)
-{
-  mlib_s32 buff[BUFF_LINE];
-  mlib_s32 *buffd;
-  mlib_s32 k[KSIZE*KSIZE];
-  mlib_s32 shift1, shift2;
-  mlib_s32 k0, k1, k2, k3, k4, k5, k6, k7, k8, k9;
-  mlib_s32 p00, p01, p02, p03, p04, p05,
-           p10, p11, p12, p13, p14, p15;
-  DTYPE    *adr_src, *sl, *sp0, *sp1;
-  DTYPE    *adr_dst, *dl, *dp;
-  mlib_s32 *pbuff = buff;
-  mlib_s32 wid, hgt, sll, dll;
-  mlib_s32 nchannel, chan1, chan2, chan3, chan4;
-  mlib_s32 i, j, c;
-
-#if IMG_TYPE != 1
-  shift1 = 16;
-#else
-  shift1 = 8;
-#endif /* IMG_TYPE != 1 */
-
-  shift2 = scalef_expon - shift1;
-
-  for (j = 0; j < KSIZE*KSIZE; j++) k[j] = kern[j] >> shift1;
-
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  if (wid > BUFF_LINE) {
-    pbuff = mlib_malloc(sizeof(mlib_s32)*wid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buffd = pbuff;
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-  chan3 = chan2 + chan1;
-  chan4 = chan3 + chan1;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  for (c = 0; c < chan1; c++) {
-    if (!(cmask & (1 << (chan1 - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    for (j = 0; j < hgt; j++) {
-      mlib_s32 pix0, pix1;
-      /*
-       *  First loop
-       */
-      sp0 = sl;
-      sp1 = sp0 + sll;
-      dp = dl;
-
-      k0 = k[0]; k1 = k[1]; k2 = k[2]; k3 = k[3]; k4 = k[4];
-      k5 = k[5]; k6 = k[6]; k7 = k[7]; k8 = k[8]; k9 = k[9];
-
-      p02 = sp0[0];     p12 = sp1[0];
-      p03 = sp0[chan1]; p13 = sp1[chan1];
-      p04 = sp0[chan2]; p14 = sp1[chan2];
-      p05 = sp0[chan3]; p15 = sp1[chan3];
-
-      sp0 += chan4;
-      sp1 += chan4;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = p05; p13 = p15;
-
-        p04 = sp0[0];     p14 = sp1[0];
-        p05 = sp0[chan1]; p15 = sp1[chan1];
-
-        buffd[i    ] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                        p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        buffd[i + 1] = (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                        p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp0 += chan2;
-        sp1 += chan2;
-        dp += chan2;
-      }
-
-      if (wid & 1) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = p05; p13 = p15;
-
-        p04 = sp0[0];     p14 = sp1[0];
-
-        buffd[i] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                    p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-      }
-
-      /*
-       *  Second loop
-       */
-      sp0 = sl + 2*sll;
-      sp1 = sp0 + sll;
-      dp = dl;
-
-      k0 = k[10]; k1 = k[11]; k2 = k[12]; k3 = k[13]; k4 = k[14];
-      k5 = k[15]; k6 = k[16]; k7 = k[17]; k8 = k[18]; k9 = k[19];
-
-      p02 = sp0[0];     p12 = sp1[0];
-      p03 = sp0[chan1]; p13 = sp1[chan1];
-      p04 = sp0[chan2]; p14 = sp1[chan2];
-      p05 = sp0[chan3]; p15 = sp1[chan3];
-
-      sp0 += chan4;
-      sp1 += chan4;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = p05; p13 = p15;
-
-        p04 = sp0[0];     p14 = sp1[0];
-        p05 = sp0[chan1]; p15 = sp1[chan1];
-
-        buffd[i    ] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                         p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        buffd[i + 1] += (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                         p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp0 += chan2;
-        sp1 += chan2;
-        dp += chan2;
-      }
-
-      if (wid & 1) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = p05; p13 = p15;
-
-        p04 = sp0[0];     p14 = sp1[0];
-
-        buffd[i] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                     p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-      }
-
-      /*
-       *  3 loop
-       */
-      dp = dl;
-      sp0 = sl + 4*sll;
-
-      k0 = k[20]; k1 = k[21]; k2 = k[22]; k3 = k[23]; k4 = k[24];
-
-      p02 = sp0[0];
-      p03 = sp0[chan1];
-      p04 = sp0[chan2];
-      p05 = sp0[chan3];
-
-      sp0 += chan2 + chan2;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p01 = p03; p02 = p04; p03 = p05;
-
-        p04 = sp0[0]; p05 = sp0[chan1];
-
-        pix0 = (buffd[i    ] + p00 * k0 + p01 * k1 + p02 * k2 +
-                p03 * k3 + p04 * k4) >> shift2;
-        pix1 = (buffd[i + 1] + p01 * k0 + p02 * k1 + p03 * k2 +
-                p04 * k3 + p05 * k4) >> shift2;
-
-        CLAMP_STORE(dp[0],     pix0);
-        CLAMP_STORE(dp[chan1], pix1);
-
-        dp  += chan2;
-        sp0 += chan2;
-      }
-
-      if (wid & 1) {
-        p00 = p02; p01 = p03; p02 = p04; p03 = p05;
-
-        p04 = sp0[0];
-
-        pix0 = (buffd[i    ] + p00 * k0 + p01 * k1 + p02 * k2 +
-                p03 * k3 + p04 * k4) >> shift2;
-        CLAMP_STORE(dp[0],     pix0);
-      }
-
-      /* next line */
-      sl += sll;
-      dl += dll;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-#endif /* __sparc ( for x86, using integer multiplies is faster ) */
-
-/***************************************************************/
-#if IMG_TYPE == 1
-
-#undef  KSIZE
-#define KSIZE 7
-
-mlib_status CONV_FUNC(7x7)(mlib_image       *dst,
-                           const mlib_image *src,
-                           const mlib_s32   *kern,
-                           mlib_s32         scalef_expon,
-                           mlib_s32         cmask)
-{
-  FTYPE    buff[(KSIZE + 3)*BUFF_LINE], *buffs[2*(KSIZE + 1)], *buffd;
-  FTYPE    k[KSIZE*KSIZE];
-  mlib_s32 l, m, buff_ind;
-  mlib_s32 d0, d1;
-  FTYPE    k0, k1, k2, k3, k4, k5, k6;
-  FTYPE    p0, p1, p2, p3, p4, p5, p6, p7;
-  DTYPE *sl2, *sl3, *sl4, *sl5, *sl6;
-  DEF_VARS(DTYPE);
-  DTYPE *sl1;
-  mlib_s32 chan2;
-  mlib_s32 *buffo, *buffi;
-  LOAD_KERNEL(KSIZE*KSIZE);
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  if (wid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 3)*sizeof(FTYPE)*wid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  for (l = 0; l < KSIZE + 1; l++) buffs[l] = pbuff + l*wid;
-  for (l = 0; l < KSIZE + 1; l++) buffs[l + (KSIZE + 1)] = buffs[l];
-  buffd = buffs[KSIZE] + wid;
-  buffo = (mlib_s32*)(buffd + wid);
-  buffi = buffo + (wid &~ 1);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    sl1 = sl  + sll;
-    sl2 = sl1 + sll;
-    sl3 = sl2 + sll;
-    sl4 = sl3 + sll;
-    sl5 = sl4 + sll;
-    sl6 = sl5 + sll;
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid + (KSIZE - 1); i++) {
-      buffs[0][i] = (FTYPE)sl[i*chan1];
-      buffs[1][i] = (FTYPE)sl1[i*chan1];
-      buffs[2][i] = (FTYPE)sl2[i*chan1];
-      buffs[3][i] = (FTYPE)sl3[i*chan1];
-      buffs[4][i] = (FTYPE)sl4[i*chan1];
-      buffs[5][i] = (FTYPE)sl5[i*chan1];
-      buffs[6][i] = (FTYPE)sl6[i*chan1];
-    }
-
-    buff_ind = 0;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid; i++) buffd[i] = 0.0;
-
-    sl += KSIZE*sll;
-
-    for (j = 0; j < hgt; j++) {
-      FTYPE    **buffc = buffs + buff_ind;
-      FTYPE    *buffn = buffc[KSIZE];
-      FTYPE    *pk = k;
-
-      for (l = 0; l < KSIZE; l++) {
-        FTYPE    *buff = buffc[l];
-        d64_2x32 dd;
-
-        sp = sl;
-        dp = dl;
-
-        p2 = buff[0]; p3 = buff[1]; p4 = buff[2];
-        p5 = buff[3]; p6 = buff[4]; p7 = buff[5];
-
-        k0 = *pk++; k1 = *pk++; k2 = *pk++; k3 = *pk++;
-        k4 = *pk++; k5 = *pk++; k6 = *pk++;
-
-        if (l < (KSIZE - 1)) {
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-          for (i = 0; i <= (wid - 2); i += 2) {
-            p0 = p2; p1 = p3; p2 = p4; p3 = p5; p4 = p6; p5 = p7;
-
-            p6 = buff[i + 6]; p7 = buff[i + 7];
-
-            buffd[i    ] += p0*k0 + p1*k1 + p2*k2 + p3*k3 + p4*k4 + p5*k5 + p6*k6;
-            buffd[i + 1] += p1*k0 + p2*k1 + p3*k2 + p4*k3 + p5*k4 + p6*k5 + p7*k6;
-          }
-
-        } else {
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-          for (i = 0; i <= (wid - 2); i += 2) {
-            p0 = p2; p1 = p3; p2 = p4; p3 = p5; p4 = p6; p5 = p7;
-
-            p6 = buff[i + 6]; p7 = buff[i + 7];
-
-            LOAD_BUFF(buffi);
-
-            dd.d64 = *(FTYPE   *)(buffi + i);
-            buffn[i    ] = (FTYPE)dd.i32s.i0;
-            buffn[i + 1] = (FTYPE)dd.i32s.i1;
-
-            d0 = D2I(p0*k0 + p1*k1 + p2*k2 + p3*k3 + p4*k4 + p5*k5 + p6*k6 + buffd[i    ]);
-            d1 = D2I(p1*k0 + p2*k1 + p3*k2 + p4*k3 + p5*k4 + p6*k5 + p7*k6 + buffd[i + 1]);
-
-            dp[0    ] = FROM_S32(d0);
-            dp[chan1] = FROM_S32(d1);
-
-            buffd[i    ] = 0.0;
-            buffd[i + 1] = 0.0;
-
-            sp += chan2;
-            dp += chan2;
-          }
-        }
-      }
-
-      /* last pixels */
-      for (; i < wid; i++) {
-        FTYPE    *pk = k, s = 0;
-        mlib_s32 d0;
-
-        for (l = 0; l < KSIZE; l++) {
-          FTYPE    *buff = buffc[l] + i;
-
-          for (m = 0; m < KSIZE; m++) s += buff[m] * (*pk++);
-        }
-
-        d0 = D2I(s);
-        dp[0] = FROM_S32(d0);
-
-        buffn[i] = (FTYPE)sp[0];
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      for (l = 0; l < (KSIZE - 1); l++) buffn[wid + l] = sp[l*chan1];
-
-      /* next line */
-      sl += sll;
-      dl += dll;
-
-      buff_ind++;
-
-      if (buff_ind >= KSIZE + 1) buff_ind = 0;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-#endif /* IMG_TYPE == 1 */
-
 /***************************************************************/
 #define MAX_KER   7
 #define MAX_N    15
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_32nw.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_32nw.c
index b0697c831dc..1b5b120f963 100644
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_32nw.c
+++ b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_32nw.c
@@ -35,8 +35,6 @@
 #include "mlib_ImageConv.h"
 
 /***************************************************************/
-#define BUFF_LINE  256
-
 #define CACHE_SIZE (64*1024)
 
 /***************************************************************/
@@ -82,837 +80,6 @@
   mlib_d64 *pbuff = buff;                                       \
   mlib_s32 i, j, c
 
-/***************************************************************/
-#define CALC_SCALE()                                            \
-  scalef = 1.0;                                                 \
-  while (scalef_expon > 30) {                                   \
-    scalef /= (1 << 30);                                        \
-    scalef_expon -= 30;                                         \
-  }                                                             \
-                                                                \
-  scalef /= (1 << scalef_expon)
-
-/***************************************************************/
-#undef  KSIZE
-#define KSIZE 2
-
-mlib_status CONV_FUNC(2x2)(mlib_image       *dst,
-                           const mlib_image *src,
-                           const mlib_s32   *kern,
-                           mlib_s32         scalef_expon,
-                           mlib_s32         cmask)
-{
-  mlib_d64 buff[(KSIZE + 1)*BUFF_LINE];
-  mlib_d64 k0, k1, k2, k3;
-  mlib_d64 p00, p01, p02, p03,
-           p10, p11, p12, p13;
-  mlib_d64 d2;
-  DEF_VARS(mlib_s32);
-  mlib_s32 chan2 = chan1 + chan1;
-  mlib_s32 chan3 = chan1 + chan2;
-
-  if (wid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 1)*sizeof(mlib_d64)*wid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buff0 = pbuff;
-  buff1 = buff0 + wid;
-  buff2 = buff1 + wid;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  /* keep kernel in regs */
-  CALC_SCALE();
-  k0 = scalef * kern[0];  k1 = scalef * kern[1];
-  k2 = scalef * kern[2];  k3 = scalef * kern[3];
-
-  for (c = 0; c < chan1; c++) {
-    if (!(cmask & (1 << (chan1 - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    sl1 = sl + sll;
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid + (KSIZE - 1); i++) {
-      buff0[i] = (mlib_d64)sl[i*chan1];
-      buff1[i] = (mlib_d64)sl1[i*chan1];
-    }
-
-    sl += KSIZE*sll;
-
-    for (j = 0; j < hgt; j++) {
-      p03 = buff0[0];
-      p13 = buff1[0];
-
-      sp = sl;
-      dp = dl;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 3); i += 3) {
-
-        p00 = p03; p10 = p13;
-
-        p01 = buff0[i + 1]; p11 = buff1[i + 1];
-        p02 = buff0[i + 2]; p12 = buff1[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3];
-
-        buff2[i    ] = (mlib_d64)sp[0];
-        buff2[i + 1] = (mlib_d64)sp[chan1];
-        buff2[i + 2] = (mlib_d64)sp[chan2];
-
-        d0 = p00 * k0 + p01 * k1 + p10 * k2 + p11 * k3;
-        d1 = p01 * k0 + p02 * k1 + p11 * k2 + p12 * k3;
-        d2 = p02 * k0 + p03 * k1 + p12 * k2 + p13 * k3;
-
-        CLAMP_S32(dp[0    ], d0);
-        CLAMP_S32(dp[chan1], d1);
-        CLAMP_S32(dp[chan2], d2);
-
-        sp += chan3;
-        dp += chan3;
-      }
-
-      for (; i < wid; i++) {
-        p00 = buff0[i];     p10 = buff1[i];
-        p01 = buff0[i + 1]; p11 = buff1[i + 1];
-
-        buff2[i] = (mlib_d64)sp[0];
-
-        d0 = p00 * k0 + p01 * k1 + p10 * k2 + p11 * k3;
-        CLAMP_S32(dp[0], d0);
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      buff2[wid] = (mlib_d64)sp[0];
-
-      sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buffT;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  KSIZE
-#define KSIZE 3
-
-mlib_status CONV_FUNC(3x3)(mlib_image       *dst,
-                           const mlib_image *src,
-                           const mlib_s32   *kern,
-                           mlib_s32         scalef_expon,
-                           mlib_s32         cmask)
-{
-  mlib_d64 buff[(KSIZE + 1)*BUFF_LINE], *buff3;
-  mlib_d64 k0, k1, k2, k3, k4, k5, k6, k7, k8;
-  mlib_d64 p00, p01, p02, p03,
-           p10, p11, p12, p13,
-           p20, p21, p22, p23;
-  mlib_s32 *sl2;
-  DEF_VARS(mlib_s32);
-  mlib_s32 chan2 = chan1 + chan1;
-
-  if (wid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 1)*sizeof(mlib_d64)*wid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buff0 = pbuff;
-  buff1 = buff0 + wid;
-  buff2 = buff1 + wid;
-  buff3 = buff2 + wid;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  CALC_SCALE();
-  k0 = scalef * kern[0];  k1 = scalef * kern[1];  k2 = scalef * kern[2];
-  k3 = scalef * kern[3];  k4 = scalef * kern[4];  k5 = scalef * kern[5];
-  k6 = scalef * kern[6];  k7 = scalef * kern[7];  k8 = scalef * kern[8];
-
-  for (c = 0; c < chan1; c++) {
-    if (!(cmask & (1 << (chan1 - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    sl1 = sl  + sll;
-    sl2 = sl1 + sll;
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid + (KSIZE - 1); i++) {
-      buff0[i] = (mlib_d64)sl[i*chan1];
-      buff1[i] = (mlib_d64)sl1[i*chan1];
-      buff2[i] = (mlib_d64)sl2[i*chan1];
-    }
-
-    sl += KSIZE*sll;
-
-    for (j = 0; j < hgt; j++) {
-      mlib_d64 s0, s1;
-
-      p02 = buff0[0];
-      p12 = buff1[0];
-      p22 = buff2[0];
-
-      p03 = buff0[1];
-      p13 = buff1[1];
-      p23 = buff2[1];
-
-      sp = sl;
-      dp = dl;
-
-      s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-      s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3]; p23 = buff2[i + 3];
-
-        buff3[i    ] = (mlib_d64)sp[0];
-        buff3[i + 1] = (mlib_d64)sp[chan1];
-
-        d0 = s0 + p02 * k2 + p12 * k5 + p22 * k8;
-        d1 = s1 + p02 * k1 + p03 * k2 + p12 * k4 + p13 * k5 + p22 * k7 + p23 * k8;
-
-        CLAMP_S32(dp[0    ], d0);
-        CLAMP_S32(dp[chan1], d1);
-
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      for (; i < wid; i++) {
-        p00 = buff0[i];     p10 = buff1[i];     p20 = buff2[i];
-        p01 = buff0[i + 1]; p11 = buff1[i + 1]; p21 = buff2[i + 1];
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2];
-
-        buff3[i] = (mlib_d64)sp[0];
-
-        d0 = (p00 * k0 + p01 * k1 + p02 * k2 + p10 * k3 + p11 * k4 +
-              p12 * k5 + p20 * k6 + p21 * k7 + p22 * k8);
-
-        CLAMP_S32(dp[0], d0);
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      buff3[wid    ] = (mlib_d64)sp[0];
-      buff3[wid + 1] = (mlib_d64)sp[chan1];
-
-      sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buff3;
-      buff3 = buffT;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  KSIZE
-#define KSIZE 4
-
-mlib_status CONV_FUNC(4x4)(mlib_image       *dst,
-                           const mlib_image *src,
-                           const mlib_s32   *kern,
-                           mlib_s32         scalef_expon,
-                           mlib_s32         cmask)
-{
-  mlib_d64 buff[(KSIZE + 2)*BUFF_LINE], *buff3, *buff4, *buff5;
-  mlib_d64 k[KSIZE*KSIZE];
-  mlib_d64 k0, k1, k2, k3, k4, k5, k6, k7;
-  mlib_d64 p00, p01, p02, p03, p04,
-           p10, p11, p12, p13, p14,
-           p20, p21, p22, p23,
-           p30, p31, p32, p33;
-  mlib_s32 *sl2, *sl3;
-  DEF_VARS(mlib_s32);
-  mlib_s32 chan2 = chan1 + chan1;
-
-  if (wid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 2)*sizeof(mlib_d64)*wid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buff0 = pbuff;
-  buff1 = buff0 + wid;
-  buff2 = buff1 + wid;
-  buff3 = buff2 + wid;
-  buff4 = buff3 + wid;
-  buff5 = buff4 + wid;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  CALC_SCALE();
-  for (j = 0; j < 16; j++) k[j] = scalef * kern[j];
-
-  for (c = 0; c < chan1; c++) {
-    if (!(cmask & (1 << (chan1 - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    sl1 = sl  + sll;
-    sl2 = sl1 + sll;
-    sl3 = sl2 + sll;
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid + (KSIZE - 1); i++) {
-      buff0[i] = (mlib_d64)sl[i*chan1];
-      buff1[i] = (mlib_d64)sl1[i*chan1];
-      buff2[i] = (mlib_d64)sl2[i*chan1];
-      buff3[i] = (mlib_d64)sl3[i*chan1];
-    }
-
-    sl += KSIZE*sll;
-
-    for (j = 0; j < hgt; j++) {
-      /*
-       *  First loop on two first lines of kernel
-       */
-      k0 = k[0]; k1 = k[1]; k2 = k[2]; k3 = k[3];
-      k4 = k[4]; k5 = k[5]; k6 = k[6]; k7 = k[7];
-
-      sp = sl;
-      dp = dl;
-
-      p02 = buff0[0];
-      p12 = buff1[0];
-      p03 = buff0[1];
-      p13 = buff1[1];
-      p04 = buff0[2];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = buff1[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3];
-        p04 = buff0[i + 4]; p14 = buff1[i + 4];
-
-        buff4[i] = (mlib_d64)sp[0];
-        buff4[i + 1] = (mlib_d64)sp[chan1];
-
-        buff5[i    ] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 +
-                        p10 * k4 + p11 * k5 + p12 * k6 + p13 * k7);
-        buff5[i + 1] = (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 +
-                        p11 * k4 + p12 * k5 + p13 * k6 + p14 * k7);
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      /*
-       *  Second loop on two last lines of kernel
-       */
-      k0 = k[ 8]; k1 = k[ 9]; k2 = k[10]; k3 = k[11];
-      k4 = k[12]; k5 = k[13]; k6 = k[14]; k7 = k[15];
-
-      sp = sl;
-      dp = dl;
-
-      p02 = buff2[0];
-      p12 = buff3[0];
-      p03 = buff2[1];
-      p13 = buff3[1];
-      p04 = buff2[2];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = buff3[i + 2];
-        p03 = buff2[i + 3]; p13 = buff3[i + 3];
-        p04 = buff2[i + 4]; p14 = buff3[i + 4];
-
-        d0 = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 +
-              p10 * k4 + p11 * k5 + p12 * k6 + p13 * k7 + buff5[i]);
-        d1 = (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 +
-              p11 * k4 + p12 * k5 + p13 * k6 + p14 * k7 + buff5[i + 1]);
-
-        CLAMP_S32(dp[0    ], d0);
-        CLAMP_S32(dp[chan1], d1);
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      /* last pixels */
-      for (; i < wid; i++) {
-        p00 = buff0[i];     p10 = buff1[i];     p20 = buff2[i];     p30 = buff3[i];
-        p01 = buff0[i + 1]; p11 = buff1[i + 1]; p21 = buff2[i + 1]; p31 = buff3[i + 1];
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2]; p32 = buff3[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3]; p23 = buff2[i + 3]; p33 = buff3[i + 3];
-
-        buff4[i] = (mlib_d64)sp[0];
-
-        d0 = (p00 * k[0] + p01 * k[1] + p02 * k[2] + p03 * k[3] +
-              p10 * k[4] + p11 * k[5] + p12 * k[6] + p13 * k[7] +
-              p20 * k[ 8] + p21 * k[ 9] + p22 * k[10] + p23 * k[11] +
-              p30 * k[12] + p31 * k[13] + p32 * k[14] + p33 * k[15]);
-
-        CLAMP_S32(dp[0], d0);
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      buff4[wid    ] = (mlib_d64)sp[0];
-      buff4[wid + 1] = (mlib_d64)sp[chan1];
-      buff4[wid + 2] = (mlib_d64)sp[chan2];
-
-      /* next line */
-      sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buff3;
-      buff3 = buff4;
-      buff4 = buffT;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  KSIZE
-#define KSIZE 5
-
-mlib_status CONV_FUNC(5x5)(mlib_image       *dst,
-                           const mlib_image *src,
-                           const mlib_s32   *kern,
-                           mlib_s32         scalef_expon,
-                           mlib_s32         cmask)
-{
-  mlib_d64 buff[(KSIZE + 2)*BUFF_LINE], *buff3, *buff4, *buff5, *buff6;
-  mlib_d64 k[KSIZE*KSIZE];
-  mlib_d64 k0, k1, k2, k3, k4, k5, k6, k7, k8, k9;
-  mlib_d64 p00, p01, p02, p03, p04, p05,
-           p10, p11, p12, p13, p14, p15,
-           p20, p21, p22, p23, p24,
-           p30, p31, p32, p33, p34,
-           p40, p41, p42, p43, p44;
-  mlib_s32 *sl2, *sl3, *sl4;
-  DEF_VARS(mlib_s32);
-  mlib_s32 chan2 = chan1 + chan1;
-  mlib_s32 chan3 = chan1 + chan2;
-
-  if (wid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 2)*sizeof(mlib_d64)*wid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buff0 = pbuff;
-  buff1 = buff0 + wid;
-  buff2 = buff1 + wid;
-  buff3 = buff2 + wid;
-  buff4 = buff3 + wid;
-  buff5 = buff4 + wid;
-  buff6 = buff5 + wid;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  CALC_SCALE();
-  for (j = 0; j < 25; j++) k[j] = scalef * kern[j];
-
-  for (c = 0; c < chan1; c++) {
-    if (!(cmask & (1 << (chan1 - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    sl1 = sl  + sll;
-    sl2 = sl1 + sll;
-    sl3 = sl2 + sll;
-    sl4 = sl3 + sll;
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid + (KSIZE - 1); i++) {
-      buff0[i] = (mlib_d64)sl[i*chan1];
-      buff1[i] = (mlib_d64)sl1[i*chan1];
-      buff2[i] = (mlib_d64)sl2[i*chan1];
-      buff3[i] = (mlib_d64)sl3[i*chan1];
-      buff4[i] = (mlib_d64)sl4[i*chan1];
-    }
-
-    sl += KSIZE*sll;
-
-    for (j = 0; j < hgt; j++) {
-      /*
-       *  First loop
-       */
-      k0 = k[0]; k1 = k[1]; k2 = k[2]; k3 = k[3]; k4 = k[4];
-      k5 = k[5]; k6 = k[6]; k7 = k[7]; k8 = k[8]; k9 = k[9];
-
-      sp = sl;
-      dp = dl;
-
-      p02 = buff0[0];
-      p12 = buff1[0];
-      p03 = buff0[1];
-      p13 = buff1[1];
-      p04 = buff0[2];
-      p14 = buff1[2];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-
-        p03 = buff0[i + 3]; p13 = buff1[i + 3];
-        p04 = buff0[i + 4]; p14 = buff1[i + 4];
-        p05 = buff0[i + 5]; p15 = buff1[i + 5];
-
-        buff6[i    ] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                        p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        buff6[i + 1] = (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                        p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      /*
-       *  Second loop
-       */
-      k0 = k[10]; k1 = k[11]; k2 = k[12]; k3 = k[13]; k4 = k[14];
-      k5 = k[15]; k6 = k[16]; k7 = k[17]; k8 = k[18]; k9 = k[19];
-
-      sp = sl;
-      dp = dl;
-
-      p02 = buff2[0];
-      p12 = buff3[0];
-      p03 = buff2[1];
-      p13 = buff3[1];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-
-        p02 = buff2[i + 2]; p12 = buff3[i + 2];
-        p03 = buff2[i + 3]; p13 = buff3[i + 3];
-        p04 = buff2[i + 4]; p14 = buff3[i + 4];
-        p05 = buff2[i + 5]; p15 = buff3[i + 5];
-
-        buff6[i    ] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                         p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        buff6[i + 1] += (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                         p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      /*
-       *  3 loop
-       */
-      k0 = k[20]; k1 = k[21]; k2 = k[22]; k3 = k[23]; k4 = k[24];
-
-      sp = sl;
-      dp = dl;
-
-      p02 = buff4[0];
-      p03 = buff4[1];
-      p04 = buff4[2];
-      p05 = buff4[3];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p01 = p03; p02 = p04; p03 = p05;
-
-        p04 = buff4[i + 4]; p05 = buff4[i + 5];
-
-        buff5[i    ] = (mlib_d64)sp[0];
-        buff5[i + 1] = (mlib_d64)sp[chan1];
-
-        d0 = p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 + buff6[i];
-        d1 = p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 + buff6[i + 1];
-
-        CLAMP_S32(dp[0    ], d0);
-        CLAMP_S32(dp[chan1], d1);
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      /* last pixels */
-      for (; i < wid; i++) {
-        p00 = buff0[i];     p10 = buff1[i];     p20 = buff2[i];     p30 = buff3[i];
-        p01 = buff0[i + 1]; p11 = buff1[i + 1]; p21 = buff2[i + 1]; p31 = buff3[i + 1];
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2]; p32 = buff3[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3]; p23 = buff2[i + 3]; p33 = buff3[i + 3];
-        p04 = buff0[i + 4]; p14 = buff1[i + 4]; p24 = buff2[i + 4]; p34 = buff3[i + 4];
-
-        p40 = buff4[i];        p41 = buff4[i + 1]; p42 = buff4[i + 2];
-        p43 = buff4[i + 3]; p44 = buff4[i + 4];
-
-        buff5[i] = (mlib_d64)sp[0];
-
-        d0 = (p00 * k[0] + p01 * k[1] + p02 * k[2] + p03 * k[3] + p04 * k[4] +
-              p10 * k[5] + p11 * k[6] + p12 * k[7] + p13 * k[8] + p14 * k[9] +
-              p20 * k[10] + p21 * k[11] + p22 * k[12] + p23 * k[13] + p24 * k[14] +
-              p30 * k[15] + p31 * k[16] + p32 * k[17] + p33 * k[18] + p34 * k[19] +
-              p40 * k[20] + p41 * k[21] + p42 * k[22] + p43 * k[23] + p44 * k[24]);
-
-        CLAMP_S32(dp[0], d0);
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      buff5[wid    ] = (mlib_d64)sp[0];
-      buff5[wid + 1] = (mlib_d64)sp[chan1];
-      buff5[wid + 2] = (mlib_d64)sp[chan2];
-      buff5[wid + 3] = (mlib_d64)sp[chan3];
-
-      /* next line */
-      sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buff3;
-      buff3 = buff4;
-      buff4 = buff5;
-      buff5 = buffT;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  KSIZE
-#define KSIZE 7
-
-mlib_status CONV_FUNC(7x7)(mlib_image       *dst,
-                           const mlib_image *src,
-                           const mlib_s32   *kern,
-                           mlib_s32         scalef_expon,
-                           mlib_s32         cmask)
-{
-  mlib_d64 buff[(KSIZE + 2)*BUFF_LINE], *buffs[2*(KSIZE + 1)], *buffd;
-  mlib_d64 k[KSIZE*KSIZE];
-  mlib_d64 k0, k1, k2, k3, k4, k5, k6;
-  mlib_d64 p0, p1, p2, p3, p4, p5, p6, p7;
-  mlib_d64 d0, d1;
-  mlib_s32 l, m, buff_ind, *sl2, *sl3, *sl4, *sl5, *sl6;
-  mlib_d64 scalef;
-  DEF_VARS_MxN(mlib_s32);
-  mlib_s32 chan2 = chan1 + chan1;
-  mlib_s32 *sl1;
-
-  if (wid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 2)*sizeof(mlib_d64)*wid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  for (l = 0; l < KSIZE + 1; l++) buffs[l] = pbuff + l*wid;
-  for (l = 0; l < KSIZE + 1; l++) buffs[l + (KSIZE + 1)] = buffs[l];
-  buffd = buffs[KSIZE] + wid;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  CALC_SCALE();
-  for (j = 0; j < 49; j++) k[j] = scalef * kern[j];
-
-  for (c = 0; c < chan1; c++) {
-    if (!(cmask & (1 << (chan1 - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    sl1 = sl  + sll;
-    sl2 = sl1 + sll;
-    sl3 = sl2 + sll;
-    sl4 = sl3 + sll;
-    sl5 = sl4 + sll;
-    sl6 = sl5 + sll;
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid + (KSIZE - 1); i++) {
-      buffs[0][i] = (mlib_d64)sl[i*chan1];
-      buffs[1][i] = (mlib_d64)sl1[i*chan1];
-      buffs[2][i] = (mlib_d64)sl2[i*chan1];
-      buffs[3][i] = (mlib_d64)sl3[i*chan1];
-      buffs[4][i] = (mlib_d64)sl4[i*chan1];
-      buffs[5][i] = (mlib_d64)sl5[i*chan1];
-      buffs[6][i] = (mlib_d64)sl6[i*chan1];
-    }
-
-    buff_ind = 0;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid; i++) buffd[i] = 0.0;
-
-    sl += KSIZE*sll;
-
-    for (j = 0; j < hgt; j++) {
-      mlib_d64 **buffc = buffs + buff_ind;
-      mlib_d64 *buffn = buffc[KSIZE];
-      mlib_d64 *pk = k;
-
-      for (l = 0; l < KSIZE; l++) {
-        mlib_d64 *buff = buffc[l];
-
-        sp = sl;
-        dp = dl;
-
-        p2 = buff[0]; p3 = buff[1]; p4 = buff[2];
-        p5 = buff[3]; p6 = buff[4]; p7 = buff[5];
-
-        k0 = *pk++; k1 = *pk++; k2 = *pk++; k3 = *pk++;
-        k4 = *pk++; k5 = *pk++; k6 = *pk++;
-
-        if (l < (KSIZE - 1)) {
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-          for (i = 0; i <= (wid - 2); i += 2) {
-            p0 = p2; p1 = p3; p2 = p4; p3 = p5; p4 = p6; p5 = p7;
-
-            p6 = buff[i + 6]; p7 = buff[i + 7];
-
-            buffd[i    ] += p0*k0 + p1*k1 + p2*k2 + p3*k3 + p4*k4 + p5*k5 + p6*k6;
-            buffd[i + 1] += p1*k0 + p2*k1 + p3*k2 + p4*k3 + p5*k4 + p6*k5 + p7*k6;
-          }
-
-        } else {
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-          for (i = 0; i <= (wid - 2); i += 2) {
-            p0 = p2; p1 = p3; p2 = p4; p3 = p5; p4 = p6; p5 = p7;
-
-            p6 = buff[i + 6]; p7 = buff[i + 7];
-
-            buffn[i    ] = (mlib_d64)sp[0];
-            buffn[i + 1] = (mlib_d64)sp[chan1];
-
-            d0 = p0*k0 + p1*k1 + p2*k2 + p3*k3 + p4*k4 + p5*k5 + p6*k6 + buffd[i    ];
-            d1 = p1*k0 + p2*k1 + p3*k2 + p4*k3 + p5*k4 + p6*k5 + p7*k6 + buffd[i + 1];
-
-            CLAMP_S32(dp[0    ], d0);
-            CLAMP_S32(dp[chan1], d1);
-
-            buffd[i    ] = 0.0;
-            buffd[i + 1] = 0.0;
-
-            sp += chan2;
-            dp += chan2;
-          }
-        }
-      }
-
-      /* last pixels */
-      for (; i < wid; i++) {
-        mlib_d64 *pk = k, s = 0;
-
-        for (l = 0; l < KSIZE; l++) {
-          mlib_d64 *buff = buffc[l] + i;
-
-          for (m = 0; m < KSIZE; m++) s += buff[m] * (*pk++);
-        }
-
-        CLAMP_S32(dp[0], s);
-
-        buffn[i] = (mlib_d64)sp[0];
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      for (l = 0; l < (KSIZE - 1); l++) buffn[wid + l] = sp[l*chan1];
-
-      /* next line */
-      sl += sll;
-      dl += dll;
-
-      buff_ind++;
-
-      if (buff_ind >= KSIZE + 1) buff_ind = 0;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
 /***************************************************************/
 #define FTYPE  mlib_d64
 #define DTYPE  mlib_s32
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8ext.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8ext.c
index c7420a9136b..15799a46d32 100644
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8ext.c
+++ b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8ext.c
@@ -79,9 +79,6 @@
 
 #endif /* IMG_TYPE == 1 */
 
-/***************************************************************/
-#define KSIZE1 (KSIZE - 1)
-
 /***************************************************************/
 #define PARAM                                                   \
   mlib_image       *dst,                                        \
@@ -125,21 +122,6 @@
 /***************************************************************/
 #define D2I(x) CLAMP_S32((x) SAT_OFF)
 
-/***************************************************************/
-#ifdef _LITTLE_ENDIAN
-
-#define STORE2(res0, res1)                                      \
-  dp[0    ] = res1;                                             \
-  dp[chan1] = res0
-
-#else
-
-#define STORE2(res0, res1)                                      \
-  dp[0    ] = res0;                                             \
-  dp[chan1] = res1
-
-#endif /* _LITTLE_ENDIAN */
-
 /***************************************************************/
 #ifdef _NO_LONGLONG
 
@@ -162,9 +144,6 @@
 #endif /* _LITTLE_ENDIAN */
 #endif /* _NO_LONGLONG */
 
-/***************************************************************/
-#define MLIB_D2_24 16777216.0f
-
 /***************************************************************/
 typedef union {
   mlib_d64 d64;
@@ -174,52 +153,6 @@ typedef union {
   } i32s;
 } d64_2x32;
 
-/***************************************************************/
-#define BUFF_LINE 256
-
-/***************************************************************/
-#define DEF_VARS(type)                                          \
-  type     *adr_src, *sl, *sp, *sl1;                            \
-  type     *adr_dst, *dl, *dp;                                  \
-  FTYPE    *pbuff = buff;                                       \
-  mlib_s32 *buffi, *buffo;                                      \
-  mlib_s32 wid, hgt, sll, dll;                                  \
-  mlib_s32 nchannel, chan1, chan2;                              \
-  mlib_s32 i, j, c, swid
-
-/***************************************************************/
-#define LOAD_KERNEL3()                                                   \
-  FTYPE    scalef = DSCALE;                                              \
-  FTYPE    k0, k1, k2, k3, k4, k5, k6, k7, k8;                           \
-  FTYPE    p00, p01, p02, p03,                                           \
-           p10, p11, p12, p13,                                           \
-           p20, p21, p22, p23;                                           \
-                                                                         \
-  while (scalef_expon > 30) {                                            \
-    scalef /= (1 << 30);                                                 \
-    scalef_expon -= 30;                                                  \
-  }                                                                      \
-                                                                         \
-  scalef /= (1 << scalef_expon);                                         \
-                                                                         \
-  /* keep kernel in regs */                                              \
-  k0 = scalef * kern[0];  k1 = scalef * kern[1];  k2 = scalef * kern[2]; \
-  k3 = scalef * kern[3];  k4 = scalef * kern[4];  k5 = scalef * kern[5]; \
-  k6 = scalef * kern[6];  k7 = scalef * kern[7];  k8 = scalef * kern[8]
-
-/***************************************************************/
-#define LOAD_KERNEL(SIZE)                                       \
-  FTYPE    scalef = DSCALE;                                     \
-                                                                \
-  while (scalef_expon > 30) {                                   \
-    scalef /= (1 << 30);                                        \
-    scalef_expon -= 30;                                         \
-  }                                                             \
-                                                                \
-  scalef /= (1 << scalef_expon);                                \
-                                                                \
-  for (j = 0; j < SIZE; j++) k[j] = scalef * kern[j]
-
 /***************************************************************/
 #define GET_SRC_DST_PARAMETERS(type)                            \
   hgt = mlib_ImageGetHeight(src);                               \
@@ -277,1334 +210,6 @@ typedef union {
 #endif /* IMG_TYPE == 1 */
 #endif /* __sparc */
 
-/***************************************************************/
-#define KSIZE  3
-
-mlib_status CONV_FUNC(3x3)
-{
-  FTYPE    buff[(KSIZE + 2)*BUFF_LINE], *buff0, *buff1, *buff2, *buff3, *buffT;
-  DEF_VARS(DTYPE);
-  DTYPE *sl2;
-#ifndef __sparc
-  mlib_s32 d0, d1;
-#endif /* __sparc */
-  LOAD_KERNEL3();
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  swid = wid + KSIZE1;
-
-  if (swid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 2)*sizeof(FTYPE   )*swid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buff0 = pbuff;
-  buff1 = buff0 + swid;
-  buff2 = buff1 + swid;
-  buff3 = buff2 + swid;
-  buffo = (mlib_s32*)(buff3 + swid);
-  buffi = buffo + (swid &~ 1);
-
-  swid -= (dx_l + dx_r);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    if ((1 > dy_t) && (1 < hgt + KSIZE1 - dy_b)) sl1 = sl + sll;
-    else sl1 = sl;
-
-    if ((hgt - dy_b) > 0) sl2 = sl1 + sll;
-    else sl2 = sl1;
-
-    for (i = 0; i < dx_l; i++) {
-      buff0[i] = (FTYPE)sl[0];
-      buff1[i] = (FTYPE)sl1[0];
-      buff2[i] = (FTYPE)sl2[0];
-    }
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < swid; i++) {
-      buff0[i + dx_l] = (FTYPE)sl[i*chan1];
-      buff1[i + dx_l] = (FTYPE)sl1[i*chan1];
-      buff2[i + dx_l] = (FTYPE)sl2[i*chan1];
-    }
-
-    for (i = 0; i < dx_r; i++) {
-      buff0[swid + dx_l + i] = buff0[swid + dx_l - 1];
-      buff1[swid + dx_l + i] = buff1[swid + dx_l - 1];
-      buff2[swid + dx_l + i] = buff2[swid + dx_l - 1];
-    }
-
-    if ((hgt - dy_b) > 1) sl = sl2 + sll;
-    else sl = sl2;
-
-    for (j = 0; j < hgt; j++) {
-      FTYPE    s0, s1;
-
-      p02 = buff0[0];
-      p12 = buff1[0];
-      p22 = buff2[0];
-
-      p03 = buff0[1];
-      p13 = buff1[1];
-      p23 = buff2[1];
-
-      s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-      s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-      sp = sl;
-      dp = dl;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-#ifdef __sparc
-#ifdef _NO_LONGLONG
-        mlib_s32 o64_1, o64_2;
-#else /* _NO_LONGLONG */
-        mlib_s64 o64;
-#endif /* _NO_LONGLONG */
-#endif /* __sparc */
-        d64_2x32 dd;
-
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3]; p23 = buff2[i + 3];
-
-        LOAD_BUFF(buffi);
-
-        dd.d64 = *(FTYPE   *)(buffi + i);
-        buff3[i + dx_l    ] = (FTYPE)dd.i32s.i0;
-        buff3[i + dx_l + 1] = (FTYPE)dd.i32s.i1;
-
-#ifndef __sparc
-
-        d0 = D2I(s0 + p02 * k2 + p12 * k5 + p22 * k8);
-        d1 = D2I(s1 + p02 * k1 + p03 * k2 + p12 * k4 + p13 * k5 + p22 * k7 + p23 * k8);
-
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-        dp[0    ] = FROM_S32(d0);
-        dp[chan1] = FROM_S32(d1);
-
-#else /* __sparc */
-
-        dd.i32s.i0 = D2I(s0 + p02 * k2 + p12 * k5 + p22 * k8);
-        dd.i32s.i1 = D2I(s1 + p02 * k1 + p03 * k2 + p12 * k4 + p13 * k5 + p22 * k7 + p23 * k8);
-        *(FTYPE   *)(buffo + i) = dd.d64;
-
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-#ifdef _NO_LONGLONG
-
-        o64_1 = buffo[i];
-        o64_2 = buffo[i+1];
-#if IMG_TYPE != 1
-        STORE2(FROM_S32(o64_1), FROM_S32(o64_2));
-#else
-        STORE2(o64_1 >> 24, o64_2 >> 24);
-#endif /* IMG_TYPE != 1 */
-
-#else /* _NO_LONGLONG */
-
-        o64 = *(mlib_s64*)(buffo + i);
-#if IMG_TYPE != 1
-        STORE2(FROM_S32(o64 >> 32), FROM_S32(o64));
-#else
-        STORE2(o64 >> 56, o64 >> 24);
-#endif /* IMG_TYPE != 1 */
-#endif /* _NO_LONGLONG */
-#endif /* __sparc */
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      for (; i < wid; i++) {
-        p00 = buff0[i];     p10 = buff1[i];     p20 = buff2[i];
-        p01 = buff0[i + 1]; p11 = buff1[i + 1]; p21 = buff2[i + 1];
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2];
-
-        buffi[i] = (mlib_s32)sp[0];
-        buff3[i + dx_l] = (FTYPE)buffi[i];
-
-#ifndef __sparc
-
-        d0 = D2I(p00 * k0 + p01 * k1 + p02 * k2 + p10 * k3 + p11 * k4 +
-                 p12 * k5 + p20 * k6 + p21 * k7 + p22 * k8);
-
-        dp[0] = FROM_S32(d0);
-
-#else  /* __sparc */
-
-        buffo[i] = D2I(p00 * k0 + p01 * k1 + p02 * k2 + p10 * k3 + p11 * k4 +
-                       p12 * k5 + p20 * k6 + p21 * k7 + p22 * k8);
-#if IMG_TYPE != 1
-        dp[0] = FROM_S32(buffo[i]);
-#else
-        dp[0] = buffo[i] >> 24;
-#endif /* IMG_TYPE != 1 */
-#endif /* __sparc */
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      for (; i < swid; i++) {
-        buffi[i] = (mlib_s32)sp[0];
-        buff3[i + dx_l] = (FTYPE)buffi[i];
-        sp += chan1;
-      }
-
-      for (i = 0; i < dx_l; i++) buff3[i] = buff3[dx_l];
-      for (i = 0; i < dx_r; i++) buff3[swid + dx_l + i] = buff3[swid + dx_l - 1];
-
-      if (j < hgt - dy_b - 2) sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buff3;
-      buff3 = buffT;
-    }
-  }
-
-#ifdef __sparc
-#if IMG_TYPE == 1
-  {
-    mlib_s32 amask = (1 << nchannel) - 1;
-
-    if ((cmask & amask) != amask) {
-      mlib_ImageXor80(adr_dst, wid, hgt, dll, nchannel, cmask);
-    } else {
-      mlib_ImageXor80_aa(adr_dst, wid*nchannel, hgt, dll);
-    }
-  }
-
-#endif /* IMG_TYPE == 1 */
-#endif /* __sparc */
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#ifndef __sparc /* for x86, using integer multiplies is faster */
-
-mlib_status CONV_FUNC_I(3x3)
-{
-  DTYPE    *adr_src, *sl, *sp0, *sp1, *sp2, *sp_1, *sp_2;
-  DTYPE    *adr_dst, *dl, *dp;
-  mlib_s32 wid, hgt, sll, dll;
-  mlib_s32 nchannel, chan1, chan2, delta_chan;
-  mlib_s32 i, j, c;
-  mlib_s32 shift1, shift2;
-  mlib_s32 k0, k1, k2, k3, k4, k5, k6, k7, k8;
-  mlib_s32 p02, p03,
-           p12, p13,
-           p22, p23;
-
-#if IMG_TYPE != 1
-  shift1 = 16;
-#else
-  shift1 = 8;
-#endif /* IMG_TYPE != 1 */
-
-  shift2 = scalef_expon - shift1;
-
-  /* keep kernel in regs */
-  k0 = kern[0] >> shift1;  k1 = kern[1] >> shift1;  k2 = kern[2] >> shift1;
-  k3 = kern[3] >> shift1;  k4 = kern[4] >> shift1;  k5 = kern[5] >> shift1;
-  k6 = kern[6] >> shift1;  k7 = kern[7] >> shift1;  k8 = kern[8] >> shift1;
-
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-  delta_chan = 0;
-
-  if ((1 > dx_l) && (1 < wid + KSIZE1 - dx_r)) delta_chan = chan1;
-
-  for (c = 0; c < chan1; c++) {
-    if (!(cmask & (1 << (chan1 - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    sp_1 = sl;
-
-    if ((1 > dy_t) && (1 < hgt + KSIZE1 - dy_b)) sl += sll;
-    sp_2 = sl;
-
-    if ((hgt - dy_b) > 0) sl += sll;
-
-    for (j = 0; j < hgt; j++) {
-      mlib_s32 s0, s1;
-      mlib_s32 pix0, pix1;
-
-      dp  = dl;
-      sp0 = sp_1;
-      sp_1 = sp_2;
-      sp_2 = sl;
-
-      sp1 = sp_1;
-      sp2 = sp_2;
-
-      p02 = sp0[0];
-      p12 = sp1[0];
-      p22 = sp2[0];
-
-      p03 = sp0[delta_chan];
-      p13 = sp1[delta_chan];
-      p23 = sp2[delta_chan];
-
-      s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-      s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-      sp0 += (chan1 + delta_chan);
-      sp1 += (chan1 + delta_chan);
-      sp2 += (chan1 + delta_chan);
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - dx_r - 2); i += 2) {
-        p02 = sp0[0];     p12 = sp1[0];     p22 = sp2[0];
-        p03 = sp0[chan1]; p13 = sp1[chan1]; p23 = sp2[chan1];
-
-        pix0 = (s0 + p02 * k2 + p12 * k5 + p22 * k8) >> shift2;
-        pix1 = (s1 + p02 * k1 + p03 * k2 + p12 * k4 +
-                p13 * k5 + p22 * k7 + p23 * k8) >> shift2;
-
-        CLAMP_STORE(dp[0],     pix0)
-        CLAMP_STORE(dp[chan1], pix1)
-
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-        sp0 += chan2;
-        sp1 += chan2;
-        sp2 += chan2;
-        dp += chan2;
-      }
-
-      p02 = p03; p12 = p13; p22 = p23;
-
-      for (; i < wid - dx_r; i++) {
-        p03 = sp0[0]; p13 = sp1[0]; p23 = sp2[0];
-        pix0 = (s0 + p03 * k2 + p13 * k5 + p23 * k8) >> shift2;
-        CLAMP_STORE(dp[0], pix0)
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        p02 = p03; p12 = p13; p22 = p23;
-        sp0 += chan1;
-        sp1 += chan1;
-        sp2 += chan1;
-        dp += chan1;
-      }
-
-      sp0 -= chan1;
-      sp1 -= chan1;
-      sp2 -= chan1;
-
-      for (; i < wid; i++) {
-        p03 = sp0[0]; p13 = sp1[0]; p23 = sp2[0];
-        pix0 = (s0 + p03 * k2 + p13 * k5 + p23 * k8) >> shift2;
-        CLAMP_STORE(dp[0], pix0)
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        p02 = p03; p12 = p13; p22 = p23;
-        dp += chan1;
-      }
-
-      if (j < hgt - dy_b - 1) sl += sll;
-      dl += dll;
-    }
-  }
-
-  return MLIB_SUCCESS;
-}
-
-#endif /* __sparc ( for x86, using integer multiplies is faster ) */
-
-/***************************************************************/
-#undef  KSIZE
-#define KSIZE 4
-
-mlib_status CONV_FUNC(4x4)
-{
-  FTYPE    buff[(KSIZE + 3)*BUFF_LINE];
-  FTYPE    *buff0, *buff1, *buff2, *buff3, *buff4, *buffd, *buffT;
-  FTYPE    k[KSIZE*KSIZE];
-  mlib_s32 d0, d1;
-  FTYPE    k0, k1, k2, k3, k4, k5, k6, k7;
-  FTYPE    p00, p01, p02, p03, p04,
-           p10, p11, p12, p13, p14,
-           p20, p21, p22, p23,
-           p30, p31, p32, p33;
-  DEF_VARS(DTYPE);
-  DTYPE *sl2, *sl3;
-  LOAD_KERNEL(KSIZE*KSIZE);
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  swid = wid + KSIZE1;
-
-  if (swid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 3)*sizeof(FTYPE   )*swid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buff0 = pbuff;
-  buff1 = buff0 + swid;
-  buff2 = buff1 + swid;
-  buff3 = buff2 + swid;
-  buff4 = buff3 + swid;
-  buffd = buff4 + swid;
-  buffo = (mlib_s32*)(buffd + swid);
-  buffi = buffo + (swid &~ 1);
-
-  swid -= (dx_l + dx_r);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    if ((1 > dy_t) && (1 < hgt + KSIZE1 - dy_b)) sl1 = sl + sll;
-    else sl1 = sl;
-
-    if ((2 > dy_t) && (2 < hgt + KSIZE1 - dy_b)) sl2 = sl1 + sll;
-    else sl2 = sl1;
-
-    if ((hgt - dy_b) > 0) sl3 = sl2 + sll;
-    else sl3 = sl2;
-
-    for (i = 0; i < dx_l; i++) {
-      buff0[i] = (FTYPE)sl[0];
-      buff1[i] = (FTYPE)sl1[0];
-      buff2[i] = (FTYPE)sl2[0];
-      buff3[i] = (FTYPE)sl3[0];
-    }
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < swid; i++) {
-      buff0[i + dx_l] = (FTYPE)sl[i*chan1];
-      buff1[i + dx_l] = (FTYPE)sl1[i*chan1];
-      buff2[i + dx_l] = (FTYPE)sl2[i*chan1];
-      buff3[i + dx_l] = (FTYPE)sl3[i*chan1];
-    }
-
-    for (i = 0; i < dx_r; i++) {
-      buff0[swid + dx_l + i] = buff0[swid + dx_l - 1];
-      buff1[swid + dx_l + i] = buff1[swid + dx_l - 1];
-      buff2[swid + dx_l + i] = buff2[swid + dx_l - 1];
-      buff3[swid + dx_l + i] = buff3[swid + dx_l - 1];
-    }
-
-    if ((hgt - dy_b) > 1) sl = sl3 + sll;
-    else sl = sl3;
-
-    for (j = 0; j < hgt; j++) {
-      d64_2x32 dd;
-
-      /*
-       *  First loop on two first lines of kernel
-       */
-      k0 = k[0]; k1 = k[1]; k2 = k[2]; k3 = k[3];
-      k4 = k[4]; k5 = k[5]; k6 = k[6]; k7 = k[7];
-
-      sp = sl;
-      dp = dl;
-
-      p02 = buff0[0];
-      p12 = buff1[0];
-      p03 = buff0[1];
-      p13 = buff1[1];
-      p04 = buff0[2];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = buff1[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3];
-        p04 = buff0[i + 4]; p14 = buff1[i + 4];
-
-        LOAD_BUFF(buffi);
-
-        dd.d64 = *(FTYPE   *)(buffi + i);
-        buff4[i + dx_l    ] = (FTYPE)dd.i32s.i0;
-        buff4[i + dx_l + 1] = (FTYPE)dd.i32s.i1;
-
-        buffd[i    ] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 +
-                        p10 * k4 + p11 * k5 + p12 * k6 + p13 * k7);
-        buffd[i + 1] = (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 +
-                        p11 * k4 + p12 * k5 + p13 * k6 + p14 * k7);
-
-        sp += chan2;
-      }
-
-      /*
-       *  Second loop on two last lines of kernel
-       */
-      k0 = k[ 8]; k1 = k[ 9]; k2 = k[10]; k3 = k[11];
-      k4 = k[12]; k5 = k[13]; k6 = k[14]; k7 = k[15];
-
-      p02 = buff2[0];
-      p12 = buff3[0];
-      p03 = buff2[1];
-      p13 = buff3[1];
-      p04 = buff2[2];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = buff3[i + 2];
-        p03 = buff2[i + 3]; p13 = buff3[i + 3];
-        p04 = buff2[i + 4]; p14 = buff3[i + 4];
-
-        d0 = D2I(p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 +
-                 p10 * k4 + p11 * k5 + p12 * k6 + p13 * k7 + buffd[i]);
-        d1 = D2I(p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 +
-                 p11 * k4 + p12 * k5 + p13 * k6 + p14 * k7 + buffd[i + 1]);
-
-        dp[0    ] = FROM_S32(d0);
-        dp[chan1] = FROM_S32(d1);
-
-        dp += chan2;
-      }
-
-      /* last pixels */
-      for (; i < wid; i++) {
-        p00 = buff0[i];     p10 = buff1[i];     p20 = buff2[i];     p30 = buff3[i];
-        p01 = buff0[i + 1]; p11 = buff1[i + 1]; p21 = buff2[i + 1]; p31 = buff3[i + 1];
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2]; p32 = buff3[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3]; p23 = buff2[i + 3]; p33 = buff3[i + 3];
-
-        buff4[i + dx_l] = (FTYPE)sp[0];
-
-        buffo[i] = D2I(p00 * k[0] + p01 * k[1] + p02 * k[2] + p03 * k[3] +
-                       p10 * k[4] + p11 * k[5] + p12 * k[6] + p13 * k[7] +
-                       p20 * k[ 8] + p21 * k[ 9] + p22 * k[10] + p23 * k[11] +
-                       p30 * k[12] + p31 * k[13] + p32 * k[14] + p33 * k[15]);
-
-        dp[0] = FROM_S32(buffo[i]);
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      for (; i < swid; i++) {
-        buff4[i + dx_l] = (FTYPE)sp[0];
-        sp += chan1;
-      }
-
-      for (i = 0; i < dx_l; i++) buff4[i] = buff4[dx_l];
-      for (i = 0; i < dx_r; i++) buff4[swid + dx_l + i] = buff4[swid + dx_l - 1];
-
-      /* next line */
-
-      if (j < hgt - dy_b - 2) sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buff3;
-      buff3 = buff4;
-      buff4 = buffT;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  KSIZE
-#define KSIZE 5
-
-mlib_status CONV_FUNC(5x5)
-{
-  FTYPE    buff[(KSIZE + 3)*BUFF_LINE];
-  FTYPE    *buff0, *buff1, *buff2, *buff3, *buff4, *buff5, *buffd, *buffT;
-  FTYPE    k[KSIZE*KSIZE];
-  mlib_s32 d0, d1;
-  FTYPE    k0, k1, k2, k3, k4, k5, k6, k7, k8, k9;
-  FTYPE    p00, p01, p02, p03, p04, p05,
-           p10, p11, p12, p13, p14, p15,
-           p20, p21, p22, p23, p24,
-           p30, p31, p32, p33, p34,
-           p40, p41, p42, p43, p44;
-  DEF_VARS(DTYPE);
-  DTYPE *sl2, *sl3, *sl4;
-  LOAD_KERNEL(KSIZE*KSIZE);
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  swid = wid + KSIZE1;
-
-  if (swid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 3)*sizeof(FTYPE   )*swid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buff0 = pbuff;
-  buff1 = buff0 + swid;
-  buff2 = buff1 + swid;
-  buff3 = buff2 + swid;
-  buff4 = buff3 + swid;
-  buff5 = buff4 + swid;
-  buffd = buff5 + swid;
-  buffo = (mlib_s32*)(buffd + swid);
-  buffi = buffo + (swid &~ 1);
-
-  swid -= (dx_l + dx_r);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    if ((1 > dy_t) && (1 < hgt + KSIZE1 - dy_b)) sl1 = sl + sll;
-    else sl1 = sl;
-
-    if ((2 > dy_t) && (2 < hgt + KSIZE1 - dy_b)) sl2 = sl1 + sll;
-    else sl2 = sl1;
-
-    if ((3 > dy_t) && (3 < hgt + KSIZE1 - dy_b)) sl3 = sl2 + sll;
-    else sl3 = sl2;
-
-    if ((hgt - dy_b) > 0) sl4 = sl3 + sll;
-    else sl4 = sl3;
-
-    for (i = 0; i < dx_l; i++) {
-      buff0[i] = (FTYPE)sl[0];
-      buff1[i] = (FTYPE)sl1[0];
-      buff2[i] = (FTYPE)sl2[0];
-      buff3[i] = (FTYPE)sl3[0];
-      buff4[i] = (FTYPE)sl4[0];
-    }
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < swid; i++) {
-      buff0[i + dx_l] = (FTYPE)sl[i*chan1];
-      buff1[i + dx_l] = (FTYPE)sl1[i*chan1];
-      buff2[i + dx_l] = (FTYPE)sl2[i*chan1];
-      buff3[i + dx_l] = (FTYPE)sl3[i*chan1];
-      buff4[i + dx_l] = (FTYPE)sl4[i*chan1];
-    }
-
-    for (i = 0; i < dx_r; i++) {
-      buff0[swid + dx_l + i] = buff0[swid + dx_l - 1];
-      buff1[swid + dx_l + i] = buff1[swid + dx_l - 1];
-      buff2[swid + dx_l + i] = buff2[swid + dx_l - 1];
-      buff3[swid + dx_l + i] = buff3[swid + dx_l - 1];
-      buff4[swid + dx_l + i] = buff4[swid + dx_l - 1];
-    }
-
-    if ((hgt - dy_b) > 1) sl = sl4 + sll;
-    else sl = sl4;
-
-    for (j = 0; j < hgt; j++) {
-      d64_2x32 dd;
-
-      /*
-       *  First loop
-       */
-      k0 = k[0]; k1 = k[1]; k2 = k[2]; k3 = k[3]; k4 = k[4];
-      k5 = k[5]; k6 = k[6]; k7 = k[7]; k8 = k[8]; k9 = k[9];
-
-      sp = sl;
-      dp = dl;
-
-      p02 = buff0[0];
-      p12 = buff1[0];
-      p03 = buff0[1];
-      p13 = buff1[1];
-      p04 = buff0[2];
-      p14 = buff1[2];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-
-        LOAD_BUFF(buffi);
-
-        p03 = buff0[i + 3]; p13 = buff1[i + 3];
-        p04 = buff0[i + 4]; p14 = buff1[i + 4];
-        p05 = buff0[i + 5]; p15 = buff1[i + 5];
-
-        buffd[i    ] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                        p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        buffd[i + 1] = (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                        p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp += chan2;
-      }
-
-      /*
-       *  Second loop
-       */
-      k0 = k[10]; k1 = k[11]; k2 = k[12]; k3 = k[13]; k4 = k[14];
-      k5 = k[15]; k6 = k[16]; k7 = k[17]; k8 = k[18]; k9 = k[19];
-
-      p02 = buff2[0];
-      p12 = buff3[0];
-      p03 = buff2[1];
-      p13 = buff3[1];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-
-        p02 = buff2[i + 2]; p12 = buff3[i + 2];
-        p03 = buff2[i + 3]; p13 = buff3[i + 3];
-        p04 = buff2[i + 4]; p14 = buff3[i + 4];
-        p05 = buff2[i + 5]; p15 = buff3[i + 5];
-
-        dd.d64 = *(FTYPE   *)(buffi + i);
-        buff5[i + dx_l    ] = (FTYPE)dd.i32s.i0;
-        buff5[i + dx_l + 1] = (FTYPE)dd.i32s.i1;
-
-        buffd[i    ] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                         p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        buffd[i + 1] += (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                         p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-      }
-
-      /*
-       *  3 loop
-       */
-      k0 = k[20]; k1 = k[21]; k2 = k[22]; k3 = k[23]; k4 = k[24];
-
-      p02 = buff4[0];
-      p03 = buff4[1];
-      p04 = buff4[2];
-      p05 = buff4[3];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p01 = p03; p02 = p04; p03 = p05;
-
-        p04 = buff4[i + 4]; p05 = buff4[i + 5];
-
-        d0 = D2I(p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 + buffd[i]);
-        d1 = D2I(p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 + buffd[i + 1]);
-
-        dp[0    ] = FROM_S32(d0);
-        dp[chan1] = FROM_S32(d1);
-
-        dp += chan2;
-      }
-
-      /* last pixels */
-      for (; i < wid; i++) {
-        p00 = buff0[i];     p10 = buff1[i];     p20 = buff2[i];     p30 = buff3[i];
-        p01 = buff0[i + 1]; p11 = buff1[i + 1]; p21 = buff2[i + 1]; p31 = buff3[i + 1];
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2]; p32 = buff3[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3]; p23 = buff2[i + 3]; p33 = buff3[i + 3];
-        p04 = buff0[i + 4]; p14 = buff1[i + 4]; p24 = buff2[i + 4]; p34 = buff3[i + 4];
-
-        p40 = buff4[i];     p41 = buff4[i + 1]; p42 = buff4[i + 2];
-        p43 = buff4[i + 3]; p44 = buff4[i + 4];
-
-        buff5[i + dx_l] = (FTYPE)sp[0];
-
-        buffo[i] = D2I(p00 * k[0] + p01 * k[1] + p02 * k[2] + p03 * k[3] + p04 * k[4] +
-                       p10 * k[5] + p11 * k[6] + p12 * k[7] + p13 * k[8] + p14 * k[9] +
-                       p20 * k[10] + p21 * k[11] + p22 * k[12] + p23 * k[13] + p24 * k[14] +
-                       p30 * k[15] + p31 * k[16] + p32 * k[17] + p33 * k[18] + p34 * k[19] +
-                       p40 * k[20] + p41 * k[21] + p42 * k[22] + p43 * k[23] + p44 * k[24]);
-
-        dp[0] = FROM_S32(buffo[i]);
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      for (; i < swid; i++) {
-        buff5[i + dx_l] = (FTYPE)sp[0];
-        sp += chan1;
-      }
-
-      for (i = 0; i < dx_l; i++) buff5[i] = buff5[dx_l];
-      for (i = 0; i < dx_r; i++) buff5[swid + dx_l + i] = buff5[swid + dx_l - 1];
-
-      /* next line */
-
-      if (j < hgt - dy_b - 2) sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buff3;
-      buff3 = buff4;
-      buff4 = buff5;
-      buff5 = buffT;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#ifndef __sparc /* for x86, using integer multiplies is faster */
-
-mlib_status CONV_FUNC_I(5x5)
-{
-  mlib_s32 buff[BUFF_LINE];
-  mlib_s32 *buffd;
-  mlib_s32 k[KSIZE*KSIZE];
-  mlib_s32 shift1, shift2;
-  mlib_s32 k0, k1, k2, k3, k4, k5, k6, k7, k8, k9;
-  mlib_s32 p00, p01, p02, p03, p04, p05,
-           p10, p11, p12, p13, p14, p15;
-  DTYPE    *adr_src, *sl, *sp0, *sp1, *sp2, *sp3, *sp4;
-  DTYPE    *sp_1, *sp_2, *sp_3, *sp_4;
-  DTYPE    *adr_dst, *dl, *dp;
-  mlib_s32 *pbuff = buff;
-  mlib_s32 wid, hgt, sll, dll;
-  mlib_s32 nchannel, chan1, chan2, chan4;
-  mlib_s32 delta_chan1, delta_chan2, delta_chan3;
-  mlib_s32 i, j, c;
-
-#if IMG_TYPE != 1
-  shift1 = 16;
-#else
-  shift1 = 8;
-#endif /* IMG_TYPE != 1 */
-
-  shift2 = scalef_expon - shift1;
-
-  for (j = 0; j < KSIZE*KSIZE; j++) k[j] = kern[j] >> shift1;
-
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  if (wid > BUFF_LINE) {
-    pbuff = mlib_malloc(sizeof(mlib_s32)*wid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buffd = pbuff;
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  if ((1 > dx_l) && (1 < wid + KSIZE1 - dx_r)) delta_chan1 = chan1;
-  else delta_chan1 = 0;
-
-  if ((2 > dx_l) && (2 < wid + KSIZE1 - dx_r)) delta_chan2 = delta_chan1 + chan1;
-  else delta_chan2 = delta_chan1;
-
-  if ((3 > dx_l) && (3 < wid + KSIZE1 - dx_r)) delta_chan3 = delta_chan2 + chan1;
-  else delta_chan3 = delta_chan2;
-
-  chan4 = chan1 + delta_chan3;
-
-  for (c = 0; c < chan1; c++) {
-    if (!(cmask & (1 << (chan1 - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    sp_1 = sl;
-
-    if ((1 > dy_t) && (1 < hgt + KSIZE1 - dy_b)) sl += sll;
-    sp_2 = sl;
-
-    if ((2 > dy_t) && (2 < hgt + KSIZE1 - dy_b)) sl += sll;
-    sp_3 = sl;
-
-    if ((3 > dy_t) && (3 < hgt + KSIZE1 - dy_b)) sl += sll;
-    sp_4 = sl;
-
-    if ((hgt - dy_b) > 0) sl += sll;
-
-    for (j = 0; j < hgt; j++) {
-      mlib_s32 pix0, pix1;
-
-      dp  = dl;
-      sp0 = sp_1;
-      sp_1 = sp_2;
-      sp_2 = sp_3;
-      sp_3 = sp_4;
-      sp_4 = sl;
-
-      sp1 = sp_1;
-      sp2 = sp_2;
-      sp3 = sp_3;
-      sp4 = sp_4;
-
-      /*
-       *  First loop
-       */
-
-      k0 = k[0]; k1 = k[1]; k2 = k[2]; k3 = k[3]; k4 = k[4];
-      k5 = k[5]; k6 = k[6]; k7 = k[7]; k8 = k[8]; k9 = k[9];
-
-      p02 = sp0[0];           p12 = sp1[0];
-      p03 = sp0[delta_chan1]; p13 = sp1[delta_chan1];
-      p04 = sp0[delta_chan2]; p14 = sp1[delta_chan2];
-      p05 = sp0[delta_chan3]; p15 = sp1[delta_chan3];
-
-      sp0 += chan4;
-      sp1 += chan4;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - dx_r - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = p05; p13 = p15;
-
-        p04 = sp0[0];     p14 = sp1[0];
-        p05 = sp0[chan1]; p15 = sp1[chan1];
-
-        buffd[i    ] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                        p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        buffd[i + 1] = (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                        p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp0 += chan2;
-        sp1 += chan2;
-      }
-
-      p01 = p02; p02 = p03; p03 = p04; p04 = p05;
-      p11 = p12; p12 = p13; p13 = p14; p14 = p15;
-
-      for (; i < wid - dx_r; i++) {
-        p00 = p01; p10 = p11;
-        p01 = p02; p11 = p12;
-        p02 = p03; p12 = p13;
-        p03 = p04; p13 = p14;
-
-        p04 = sp0[0];     p14 = sp1[0];
-
-        buffd[i] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                    p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-
-        sp0 += chan1;
-        sp1 += chan1;
-      }
-
-      sp0 -= chan1;
-      sp1 -= chan1;
-
-      for (; i < wid; i++) {
-        p00 = p01; p10 = p11;
-        p01 = p02; p11 = p12;
-        p02 = p03; p12 = p13;
-        p03 = p04; p13 = p14;
-
-        p04 = sp0[0];     p14 = sp1[0];
-
-        buffd[i] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                    p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-      }
-
-      /*
-       *  Second loop
-       */
-
-      k0 = k[10]; k1 = k[11]; k2 = k[12]; k3 = k[13]; k4 = k[14];
-      k5 = k[15]; k6 = k[16]; k7 = k[17]; k8 = k[18]; k9 = k[19];
-
-      p02 = sp2[0];           p12 = sp3[0];
-      p03 = sp2[delta_chan1]; p13 = sp3[delta_chan1];
-      p04 = sp2[delta_chan2]; p14 = sp3[delta_chan2];
-      p05 = sp2[delta_chan3]; p15 = sp3[delta_chan3];
-
-      sp2 += chan4;
-      sp3 += chan4;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - dx_r - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = p05; p13 = p15;
-
-        p04 = sp2[0];     p14 = sp3[0];
-        p05 = sp2[chan1]; p15 = sp3[chan1];
-
-        buffd[i    ] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                         p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        buffd[i + 1] += (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                         p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp2 += chan2;
-        sp3 += chan2;
-      }
-
-      p01 = p02; p02 = p03; p03 = p04; p04 = p05;
-      p11 = p12; p12 = p13; p13 = p14; p14 = p15;
-
-      for (; i < wid - dx_r; i++) {
-        p00 = p01; p10 = p11;
-        p01 = p02; p11 = p12;
-        p02 = p03; p12 = p13;
-        p03 = p04; p13 = p14;
-
-        p04 = sp2[0];     p14 = sp3[0];
-
-        buffd[i] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                     p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-
-        sp2 += chan1;
-        sp3 += chan1;
-      }
-
-      sp2 -= chan1;
-      sp3 -= chan1;
-
-      for (; i < wid; i++) {
-        p00 = p01; p10 = p11;
-        p01 = p02; p11 = p12;
-        p02 = p03; p12 = p13;
-        p03 = p04; p13 = p14;
-
-        p04 = sp2[0];     p14 = sp3[0];
-
-        buffd[i] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                     p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-      }
-
-      /*
-       *  3 loop
-       */
-
-      k0 = k[20]; k1 = k[21]; k2 = k[22]; k3 = k[23]; k4 = k[24];
-
-      p02 = sp4[0];
-      p03 = sp4[delta_chan1];
-      p04 = sp4[delta_chan2];
-      p05 = sp4[delta_chan3];
-
-      sp4 += chan4;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - dx_r - 2); i += 2) {
-        p00 = p02; p01 = p03; p02 = p04; p03 = p05;
-
-        p04 = sp4[0]; p05 = sp4[chan1];
-
-        pix0 = (buffd[i    ] + p00 * k0 + p01 * k1 + p02 * k2 +
-                p03 * k3 + p04 * k4) >> shift2;
-        pix1 = (buffd[i + 1] + p01 * k0 + p02 * k1 + p03 * k2 +
-                p04 * k3 + p05 * k4) >> shift2;
-
-        CLAMP_STORE(dp[0],     pix0)
-        CLAMP_STORE(dp[chan1], pix1)
-
-        dp  += chan2;
-        sp4 += chan2;
-      }
-
-      p01 = p02; p02 = p03; p03 = p04; p04 = p05;
-
-      for (; i < wid - dx_r; i++) {
-        p00 = p01; p01 = p02; p02 = p03; p03 = p04;
-
-        p04 = sp4[0];
-
-        pix0 = (buffd[i    ] + p00 * k0 + p01 * k1 + p02 * k2 +
-                p03 * k3 + p04 * k4) >> shift2;
-        CLAMP_STORE(dp[0],     pix0)
-
-        dp  += chan1;
-        sp4 += chan1;
-      }
-
-      sp4 -= chan1;
-
-      for (; i < wid; i++) {
-        p00 = p01; p01 = p02; p02 = p03; p03 = p04;
-
-        p04 = sp4[0];
-
-        pix0 = (buffd[i    ] + p00 * k0 + p01 * k1 + p02 * k2 +
-                p03 * k3 + p04 * k4) >> shift2;
-        CLAMP_STORE(dp[0],     pix0)
-
-        dp  += chan1;
-      }
-
-      /* next line */
-
-      if (j < hgt - dy_b - 1) sl += sll;
-      dl += dll;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-#endif /* __sparc ( for x86, using integer multiplies is faster ) */
-
-/***************************************************************/
-#if IMG_TYPE == 1
-
-#undef  KSIZE
-#define KSIZE 7
-
-mlib_status CONV_FUNC(7x7)
-{
-  FTYPE    buff[(KSIZE + 3)*BUFF_LINE], *buffs[2*(KSIZE + 1)], *buffd;
-  FTYPE    k[KSIZE*KSIZE];
-  mlib_s32 l, m, buff_ind;
-  mlib_s32 d0, d1;
-  FTYPE    k0, k1, k2, k3, k4, k5, k6;
-  FTYPE    p0, p1, p2, p3, p4, p5, p6, p7;
-  DTYPE *sl2, *sl3, *sl4, *sl5, *sl6;
-  DEF_VARS(DTYPE);
-  LOAD_KERNEL(KSIZE*KSIZE);
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  swid = wid + KSIZE1;
-
-  if (wid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 3)*sizeof(FTYPE   )*wid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  for (l = 0; l < KSIZE + 1; l++) buffs[l] = pbuff + l*swid;
-  for (l = 0; l < KSIZE + 1; l++) buffs[l + (KSIZE + 1)] = buffs[l];
-  buffd = buffs[KSIZE] + swid;
-  buffo = (mlib_s32*)(buffd + swid);
-  buffi = buffo + (swid &~ 1);
-
-  swid -= (dx_l + dx_r);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    if ((1 > dy_t) && (1 < hgt + KSIZE1 - dy_b)) sl1 = sl + sll;
-    else sl1 = sl;
-
-    if ((2 > dy_t) && (2 < hgt + KSIZE1 - dy_b)) sl2 = sl1 + sll;
-    else sl2 = sl1;
-
-    if ((3 > dy_t) && (3 < hgt + KSIZE1 - dy_b)) sl3 = sl2 + sll;
-    else sl3 = sl2;
-
-    if ((4 > dy_t) && (4 < hgt + KSIZE1 - dy_b)) sl4 = sl3 + sll;
-    else sl4 = sl3;
-
-    if ((5 > dy_t) && (5 < hgt + KSIZE1 - dy_b)) sl5 = sl4 + sll;
-    else sl5 = sl4;
-
-    if ((hgt - dy_b) > 0) sl6 = sl5 + sll;
-    else sl6 = sl5;
-
-    for (i = 0; i < dx_l; i++) {
-      buffs[0][i] = (FTYPE)sl[0];
-      buffs[1][i] = (FTYPE)sl1[0];
-      buffs[2][i] = (FTYPE)sl2[0];
-      buffs[3][i] = (FTYPE)sl3[0];
-      buffs[4][i] = (FTYPE)sl4[0];
-      buffs[5][i] = (FTYPE)sl5[0];
-      buffs[6][i] = (FTYPE)sl6[0];
-    }
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < swid; i++) {
-      buffs[0][i + dx_l] = (FTYPE)sl[i*chan1];
-      buffs[1][i + dx_l] = (FTYPE)sl1[i*chan1];
-      buffs[2][i + dx_l] = (FTYPE)sl2[i*chan1];
-      buffs[3][i + dx_l] = (FTYPE)sl3[i*chan1];
-      buffs[4][i + dx_l] = (FTYPE)sl4[i*chan1];
-      buffs[5][i + dx_l] = (FTYPE)sl5[i*chan1];
-      buffs[6][i + dx_l] = (FTYPE)sl6[i*chan1];
-    }
-
-    for (i = 0; i < dx_r; i++) {
-      buffs[0][swid + dx_l + i] = buffs[0][swid + dx_l - 1];
-      buffs[1][swid + dx_l + i] = buffs[1][swid + dx_l - 1];
-      buffs[2][swid + dx_l + i] = buffs[2][swid + dx_l - 1];
-      buffs[3][swid + dx_l + i] = buffs[3][swid + dx_l - 1];
-      buffs[4][swid + dx_l + i] = buffs[4][swid + dx_l - 1];
-      buffs[5][swid + dx_l + i] = buffs[5][swid + dx_l - 1];
-      buffs[6][swid + dx_l + i] = buffs[6][swid + dx_l - 1];
-    }
-
-    buff_ind = 0;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid; i++) buffd[i] = 0.0;
-
-    if ((hgt - dy_b) > 1) sl = sl6 + sll;
-    else sl = sl6;
-
-    for (j = 0; j < hgt; j++) {
-      FTYPE    **buffc = buffs + buff_ind;
-      FTYPE    *buffn = buffc[KSIZE];
-      FTYPE    *pk = k;
-
-      for (l = 0; l < KSIZE; l++) {
-        FTYPE    *buff = buffc[l];
-        d64_2x32 dd;
-
-        sp = sl;
-        dp = dl;
-
-        p2 = buff[0]; p3 = buff[1]; p4 = buff[2];
-        p5 = buff[3]; p6 = buff[4]; p7 = buff[5];
-
-        k0 = *pk++; k1 = *pk++; k2 = *pk++; k3 = *pk++;
-        k4 = *pk++; k5 = *pk++; k6 = *pk++;
-
-        if (l < (KSIZE - 1)) {
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-          for (i = 0; i <= (wid - 2); i += 2) {
-            p0 = p2; p1 = p3; p2 = p4; p3 = p5; p4 = p6; p5 = p7;
-
-            p6 = buff[i + 6]; p7 = buff[i + 7];
-
-            buffd[i    ] += p0*k0 + p1*k1 + p2*k2 + p3*k3 + p4*k4 + p5*k5 + p6*k6;
-            buffd[i + 1] += p1*k0 + p2*k1 + p3*k2 + p4*k3 + p5*k4 + p6*k5 + p7*k6;
-          }
-
-        } else {
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-          for (i = 0; i <= (wid - 2); i += 2) {
-            p0 = p2; p1 = p3; p2 = p4; p3 = p5; p4 = p6; p5 = p7;
-
-            p6 = buff[i + 6]; p7 = buff[i + 7];
-
-            LOAD_BUFF(buffi);
-
-            dd.d64 = *(FTYPE   *)(buffi + i);
-            buffn[i + dx_l    ] = (FTYPE)dd.i32s.i0;
-            buffn[i + dx_l + 1] = (FTYPE)dd.i32s.i1;
-
-            d0 = D2I(p0*k0 + p1*k1 + p2*k2 + p3*k3 + p4*k4 + p5*k5 + p6*k6 + buffd[i    ]);
-            d1 = D2I(p1*k0 + p2*k1 + p3*k2 + p4*k3 + p5*k4 + p6*k5 + p7*k6 + buffd[i + 1]);
-
-            dp[0    ] = FROM_S32(d0);
-            dp[chan1] = FROM_S32(d1);
-
-            buffd[i    ] = 0.0;
-            buffd[i + 1] = 0.0;
-
-            sp += chan2;
-            dp += chan2;
-          }
-        }
-      }
-
-      /* last pixels */
-      for (; i < wid; i++) {
-        FTYPE    *pk = k, s = 0;
-        mlib_s32 d0;
-
-        for (l = 0; l < KSIZE; l++) {
-          FTYPE    *buff = buffc[l] + i;
-
-          for (m = 0; m < KSIZE; m++) s += buff[m] * (*pk++);
-        }
-
-        d0 = D2I(s);
-        dp[0] = FROM_S32(d0);
-
-        buffn[i + dx_l] = (FTYPE)sp[0];
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      for (; i < swid; i++) {
-        buffn[i + dx_l] = (FTYPE)sp[0];
-        sp += chan1;
-      }
-
-      for (i = 0; i < dx_l; i++) buffn[i] = buffn[dx_l];
-      for (i = 0; i < dx_r; i++) buffn[swid + dx_l + i] = buffn[swid + dx_l - 1];
-
-      /* next line */
-
-      if (j < hgt - dy_b - 2) sl += sll;
-      dl += dll;
-
-      buff_ind++;
-
-      if (buff_ind >= KSIZE + 1) buff_ind = 0;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-#endif /* IMG_TYPE == 1 */
-
 /***************************************************************/
 #define MAX_KER   7
 #define MAX_N    15
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8nw.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8nw.c
index c81dbd08a35..4cdba6d1fa5 100644
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8nw.c
+++ b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8nw.c
@@ -144,9 +144,6 @@ typedef union {
   } f32s;
 } d64_2x32;
 
-/***************************************************************/
-#define BUFF_LINE 256
-
 /***************************************************************/
 #define DEF_VARS(type)                                          \
   type     *adr_src, *sl, *sp = NULL;                           \
@@ -156,39 +153,6 @@ typedef union {
   mlib_s32 nchannel, chan1;                                     \
   mlib_s32 i, j, c
 
-/***************************************************************/
-#define LOAD_KERNEL3()                                                   \
-  FTYPE    scalef = DSCALE;                                              \
-  FTYPE    k0, k1, k2, k3, k4, k5, k6, k7, k8;                           \
-  FTYPE    p00, p01, p02, p03,                                           \
-           p10, p11, p12, p13,                                           \
-           p20, p21, p22, p23;                                           \
-                                                                         \
-  while (scalef_expon > 30) {                                            \
-    scalef /= (1 << 30);                                                 \
-    scalef_expon -= 30;                                                  \
-  }                                                                      \
-                                                                         \
-  scalef /= (1 << scalef_expon);                                         \
-                                                                         \
-  /* keep kernel in regs */                                              \
-  k0 = scalef * kern[0];  k1 = scalef * kern[1];  k2 = scalef * kern[2]; \
-  k3 = scalef * kern[3];  k4 = scalef * kern[4];  k5 = scalef * kern[5]; \
-  k6 = scalef * kern[6];  k7 = scalef * kern[7];  k8 = scalef * kern[8]
-
-/***************************************************************/
-#define LOAD_KERNEL(SIZE)                                       \
-  FTYPE    scalef = DSCALE;                                     \
-                                                                \
-  while (scalef_expon > 30) {                                   \
-    scalef /= (1 << 30);                                        \
-    scalef_expon -= 30;                                         \
-  }                                                             \
-                                                                \
-  scalef /= (1 << scalef_expon);                                \
-                                                                \
-  for (j = 0; j < SIZE; j++) k[j] = scalef * kern[j]
-
 /***************************************************************/
 #define GET_SRC_DST_PARAMETERS(type)                            \
   hgt = mlib_ImageGetHeight(src);                               \
@@ -246,1162 +210,6 @@ typedef union {
 #endif /* IMG_TYPE == 1 */
 #endif /* __sparc */
 
-/***************************************************************/
-#define KSIZE  3
-
-mlib_status CONV_FUNC(3x3)(mlib_image       *dst,
-                           const mlib_image *src,
-                           const mlib_s32   *kern,
-                           mlib_s32         scalef_expon,
-                           mlib_s32         cmask)
-{
-  FTYPE    buff[(KSIZE + 2)*BUFF_LINE], *buff0, *buff1, *buff2, *buff3, *buffT;
-  DEF_VARS(DTYPE);
-  DTYPE *sl1;
-  mlib_s32 chan2;
-  mlib_s32 *buffo, *buffi;
-  DTYPE *sl2;
-#ifndef __sparc
-  mlib_s32 d0, d1;
-#endif /* __sparc */
-  LOAD_KERNEL3();
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  if (wid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 2)*sizeof(FTYPE)*wid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buff0 = pbuff;
-  buff1 = buff0 + wid;
-  buff2 = buff1 + wid;
-  buff3 = buff2 + wid;
-  buffo = (mlib_s32*)(buff3 + wid);
-  buffi = buffo + (wid &~ 1);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    sl1 = sl  + sll;
-    sl2 = sl1 + sll;
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid + (KSIZE - 1); i++) {
-      buff0[i] = (FTYPE)sl[i*chan1];
-      buff1[i] = (FTYPE)sl1[i*chan1];
-      buff2[i] = (FTYPE)sl2[i*chan1];
-    }
-
-    sl += KSIZE*sll;
-
-    for (j = 0; j < hgt; j++) {
-      FTYPE    s0, s1;
-
-      p02 = buff0[0];
-      p12 = buff1[0];
-      p22 = buff2[0];
-
-      p03 = buff0[1];
-      p13 = buff1[1];
-      p23 = buff2[1];
-
-      s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-      s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-      sp = sl;
-      dp = dl;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-#ifdef __sparc
-#ifdef _NO_LONGLONG
-        mlib_s32 o64_1, o64_2;
-#else /* _NO_LONGLONG */
-        mlib_s64 o64;
-#endif /* _NO_LONGLONG */
-#endif /* __sparc */
-        d64_2x32 dd;
-
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3]; p23 = buff2[i + 3];
-
-        LOAD_BUFF(buffi);
-
-        dd.d64 = *(FTYPE   *)(buffi + i);
-        buff3[i    ] = (FTYPE)dd.i32s.i0;
-        buff3[i + 1] = (FTYPE)dd.i32s.i1;
-
-#ifndef __sparc
-        d0 = D2I(s0 + p02 * k2 + p12 * k5 + p22 * k8);
-        d1 = D2I(s1 + p02 * k1 + p03 * k2 + p12 * k4 + p13 * k5 + p22 * k7 + p23 * k8);
-
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-        dp[0    ] = FROM_S32(d0);
-        dp[chan1] = FROM_S32(d1);
-
-#else /* __sparc */
-
-        dd.i32s.i0 = D2I(s0 + p02 * k2 + p12 * k5 + p22 * k8);
-        dd.i32s.i1 = D2I(s1 + p02 * k1 + p03 * k2 + p12 * k4 + p13 * k5 + p22 * k7 + p23 * k8);
-        *(FTYPE   *)(buffo + i) = dd.d64;
-
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-#ifdef _NO_LONGLONG
-
-        o64_1 = buffo[i];
-        o64_2 = buffo[i+1];
-#if IMG_TYPE != 1
-        STORE2(FROM_S32(o64_1), FROM_S32(o64_2));
-#else
-        STORE2(o64_1 >> 24, o64_2 >> 24);
-#endif /* IMG_TYPE != 1 */
-
-#else /* _NO_LONGLONG */
-
-        o64 = *(mlib_s64*)(buffo + i);
-#if IMG_TYPE != 1
-        STORE2(FROM_S32(o64 >> 32), FROM_S32(o64));
-#else
-        STORE2(o64 >> 56, o64 >> 24);
-#endif /* IMG_TYPE != 1 */
-#endif /* _NO_LONGLONG */
-#endif /* __sparc */
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      for (; i < wid; i++) {
-        p00 = buff0[i];     p10 = buff1[i];     p20 = buff2[i];
-        p01 = buff0[i + 1]; p11 = buff1[i + 1]; p21 = buff2[i + 1];
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2];
-
-        buffi[i] = (mlib_s32)sp[0];
-        buff3[i] = (FTYPE)buffi[i];
-
-#ifndef __sparc
-
-        d0 = D2I(p00 * k0 + p01 * k1 + p02 * k2 + p10 * k3 + p11 * k4 +
-                 p12 * k5 + p20 * k6 + p21 * k7 + p22 * k8);
-
-        dp[0] = FROM_S32(d0);
-
-#else  /* __sparc */
-
-        buffo[i] = D2I(p00 * k0 + p01 * k1 + p02 * k2 + p10 * k3 + p11 * k4 +
-                       p12 * k5 + p20 * k6 + p21 * k7 + p22 * k8);
-#if IMG_TYPE != 1
-        dp[0] = FROM_S32(buffo[i]);
-#else
-        dp[0] = buffo[i] >> 24;
-#endif /* IMG_TYPE != 1 */
-#endif /* __sparc */
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      buffi[wid] = (mlib_s32)sp[0];
-      buff3[wid] = (FTYPE)buffi[wid];
-      buffi[wid + 1] = (mlib_s32)sp[chan1];
-      buff3[wid + 1] = (FTYPE)buffi[wid + 1];
-
-      sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buff3;
-      buff3 = buffT;
-    }
-  }
-
-#ifdef __sparc
-#if IMG_TYPE == 1
-  {
-    mlib_s32 amask = (1 << nchannel) - 1;
-
-    if ((cmask & amask) != amask) {
-      mlib_ImageXor80(adr_dst, wid, hgt, dll, nchannel, cmask);
-    } else {
-      mlib_ImageXor80_aa(adr_dst, wid*nchannel, hgt, dll);
-    }
-  }
-
-#endif /* IMG_TYPE == 1 */
-#endif /* __sparc */
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#ifndef __sparc /* for x86, using integer multiplies is faster */
-
-mlib_status CONV_FUNC_I(3x3)(mlib_image       *dst,
-                             const mlib_image *src,
-                             const mlib_s32   *kern,
-                             mlib_s32         scalef_expon,
-                             mlib_s32         cmask)
-{
-  DTYPE    *adr_src, *sl, *sp0, *sp1, *sp2;
-  DTYPE    *adr_dst, *dl, *dp;
-  mlib_s32 wid, hgt, sll, dll;
-  mlib_s32 nchannel, chan1, chan2;
-  mlib_s32 i, j, c;
-  mlib_s32 shift1, shift2;
-  mlib_s32 k0, k1, k2, k3, k4, k5, k6, k7, k8;
-  mlib_s32 p02, p03,
-           p12, p13,
-           p22, p23;
-
-#if IMG_TYPE != 1
-  shift1 = 16;
-#else
-  shift1 = 8;
-#endif /* IMG_TYPE != 1 */
-
-  shift2 = scalef_expon - shift1;
-
-  /* keep kernel in regs */
-  k0 = kern[0] >> shift1;  k1 = kern[1] >> shift1;  k2 = kern[2] >> shift1;
-  k3 = kern[3] >> shift1;  k4 = kern[4] >> shift1;  k5 = kern[5] >> shift1;
-  k6 = kern[6] >> shift1;  k7 = kern[7] >> shift1;  k8 = kern[8] >> shift1;
-
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  for (c = 0; c < chan1; c++) {
-    if (!(cmask & (1 << (chan1 - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    for (j = 0; j < hgt; j++) {
-      mlib_s32 s0, s1;
-      mlib_s32 pix0, pix1;
-
-      dp  = dl;
-      sp0 = sl;
-      sp1 = sp0 + sll;
-      sp2 = sp1 + sll;
-
-      p02 = sp0[0];
-      p12 = sp1[0];
-      p22 = sp2[0];
-
-      p03 = sp0[chan1];
-      p13 = sp1[chan1];
-      p23 = sp2[chan1];
-
-      s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-      s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-      sp0 += chan2;
-      sp1 += chan2;
-      sp2 += chan2;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p02 = sp0[0];     p12 = sp1[0];     p22 = sp2[0];
-        p03 = sp0[chan1]; p13 = sp1[chan1]; p23 = sp2[chan1];
-
-        pix0 = (s0 + p02 * k2 + p12 * k5 + p22 * k8) >> shift2;
-        pix1 = (s1 + p02 * k1 + p03 * k2 + p12 * k4 +
-                p13 * k5 + p22 * k7 + p23 * k8) >> shift2;
-
-        CLAMP_STORE(dp[0],     pix0)
-        CLAMP_STORE(dp[chan1], pix1)
-
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-        sp0 += chan2;
-        sp1 += chan2;
-        sp2 += chan2;
-        dp += chan2;
-      }
-
-      if (wid & 1) {
-        p02 = sp0[0]; p12 = sp1[0]; p22 = sp2[0];
-        pix0 = (s0 + p02 * k2 + p12 * k5 + p22 * k8) >> shift2;
-        CLAMP_STORE(dp[0], pix0)
-      }
-
-      sl += sll;
-      dl += dll;
-    }
-  }
-
-  return MLIB_SUCCESS;
-}
-
-#endif /* __sparc ( for x86, using integer multiplies is faster ) */
-
-/***************************************************************/
-#undef  KSIZE
-#define KSIZE 4
-
-mlib_status CONV_FUNC(4x4)(mlib_image       *dst,
-                           const mlib_image *src,
-                           const mlib_s32   *kern,
-                           mlib_s32         scalef_expon,
-                           mlib_s32         cmask)
-{
-  FTYPE    buff[(KSIZE + 3)*BUFF_LINE];
-  FTYPE    *buff0, *buff1, *buff2, *buff3, *buff4, *buffd, *buffT;
-  FTYPE    k[KSIZE*KSIZE];
-  mlib_s32 d0, d1;
-  FTYPE    k0, k1, k2, k3, k4, k5, k6, k7;
-  FTYPE    p00, p01, p02, p03, p04,
-           p10, p11, p12, p13, p14,
-           p20, p21, p22, p23,
-           p30, p31, p32, p33;
-  DEF_VARS(DTYPE);
-  DTYPE *sl1;
-  mlib_s32 chan2;
-  mlib_s32 *buffo, *buffi;
-  DTYPE *sl2, *sl3;
-  LOAD_KERNEL(KSIZE*KSIZE);
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  if (wid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 3)*sizeof(FTYPE)*wid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buff0 = pbuff;
-  buff1 = buff0 + wid;
-  buff2 = buff1 + wid;
-  buff3 = buff2 + wid;
-  buff4 = buff3 + wid;
-  buffd = buff4 + wid;
-  buffo = (mlib_s32*)(buffd + wid);
-  buffi = buffo + (wid &~ 1);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    sl1 = sl  + sll;
-    sl2 = sl1 + sll;
-    sl3 = sl2 + sll;
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid + (KSIZE - 1); i++) {
-      buff0[i] = (FTYPE)sl[i*chan1];
-      buff1[i] = (FTYPE)sl1[i*chan1];
-      buff2[i] = (FTYPE)sl2[i*chan1];
-      buff3[i] = (FTYPE)sl3[i*chan1];
-    }
-
-    sl += KSIZE*sll;
-
-    for (j = 0; j < hgt; j++) {
-      d64_2x32 dd;
-
-      /*
-       *  First loop on two first lines of kernel
-       */
-      k0 = k[0]; k1 = k[1]; k2 = k[2]; k3 = k[3];
-      k4 = k[4]; k5 = k[5]; k6 = k[6]; k7 = k[7];
-
-      sp = sl;
-      dp = dl;
-
-      p02 = buff0[0];
-      p12 = buff1[0];
-      p03 = buff0[1];
-      p13 = buff1[1];
-      p04 = buff0[2];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = buff1[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3];
-        p04 = buff0[i + 4]; p14 = buff1[i + 4];
-
-        LOAD_BUFF(buffi);
-
-        dd.d64 = *(FTYPE   *)(buffi + i);
-        buff4[i    ] = (FTYPE)dd.i32s.i0;
-        buff4[i + 1] = (FTYPE)dd.i32s.i1;
-
-        buffd[i    ] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 +
-                        p10 * k4 + p11 * k5 + p12 * k6 + p13 * k7);
-        buffd[i + 1] = (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 +
-                        p11 * k4 + p12 * k5 + p13 * k6 + p14 * k7);
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      /*
-       *  Second loop on two last lines of kernel
-       */
-      k0 = k[ 8]; k1 = k[ 9]; k2 = k[10]; k3 = k[11];
-      k4 = k[12]; k5 = k[13]; k6 = k[14]; k7 = k[15];
-
-      sp = sl;
-      dp = dl;
-
-      p02 = buff2[0];
-      p12 = buff3[0];
-      p03 = buff2[1];
-      p13 = buff3[1];
-      p04 = buff2[2];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = buff3[i + 2];
-        p03 = buff2[i + 3]; p13 = buff3[i + 3];
-        p04 = buff2[i + 4]; p14 = buff3[i + 4];
-
-        d0 = D2I(p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 +
-                 p10 * k4 + p11 * k5 + p12 * k6 + p13 * k7 + buffd[i]);
-        d1 = D2I(p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 +
-                 p11 * k4 + p12 * k5 + p13 * k6 + p14 * k7 + buffd[i + 1]);
-
-        dp[0    ] = FROM_S32(d0);
-        dp[chan1] = FROM_S32(d1);
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      /* last pixels */
-      for (; i < wid; i++) {
-        p00 = buff0[i];     p10 = buff1[i];     p20 = buff2[i];     p30 = buff3[i];
-        p01 = buff0[i + 1]; p11 = buff1[i + 1]; p21 = buff2[i + 1]; p31 = buff3[i + 1];
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2]; p32 = buff3[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3]; p23 = buff2[i + 3]; p33 = buff3[i + 3];
-
-        buff4[i] = (FTYPE)sp[0];
-
-        buffo[i] = D2I(p00 * k[0] + p01 * k[1] + p02 * k[2] + p03 * k[3] +
-                       p10 * k[4] + p11 * k[5] + p12 * k[6] + p13 * k[7] +
-                       p20 * k[ 8] + p21 * k[ 9] + p22 * k[10] + p23 * k[11] +
-                       p30 * k[12] + p31 * k[13] + p32 * k[14] + p33 * k[15]);
-
-        dp[0] = FROM_S32(buffo[i]);
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      buff4[wid    ] = (FTYPE)sp[0];
-      buff4[wid + 1] = (FTYPE)sp[chan1];
-      buff4[wid + 2] = (FTYPE)sp[chan2];
-
-      /* next line */
-      sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buff3;
-      buff3 = buff4;
-      buff4 = buffT;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  KSIZE
-#define KSIZE 5
-
-mlib_status CONV_FUNC(5x5)(mlib_image       *dst,
-                           const mlib_image *src,
-                           const mlib_s32   *kern,
-                           mlib_s32         scalef_expon,
-                           mlib_s32         cmask)
-{
-  FTYPE    buff[(KSIZE + 3)*BUFF_LINE];
-  FTYPE    *buff0, *buff1, *buff2, *buff3, *buff4, *buff5, *buffd, *buffT;
-  FTYPE    k[KSIZE*KSIZE];
-  mlib_s32 d0, d1;
-  FTYPE    k0, k1, k2, k3, k4, k5, k6, k7, k8, k9;
-  FTYPE    p00, p01, p02, p03, p04, p05,
-           p10, p11, p12, p13, p14, p15,
-           p20, p21, p22, p23, p24,
-           p30, p31, p32, p33, p34,
-           p40, p41, p42, p43, p44;
-  DEF_VARS(DTYPE);
-  DTYPE *sl1;
-  mlib_s32 chan2;
-  mlib_s32 *buffo, *buffi;
-  DTYPE *sl2, *sl3, *sl4;
-  LOAD_KERNEL(KSIZE*KSIZE);
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  if (wid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 3)*sizeof(FTYPE)*wid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buff0 = pbuff;
-  buff1 = buff0 + wid;
-  buff2 = buff1 + wid;
-  buff3 = buff2 + wid;
-  buff4 = buff3 + wid;
-  buff5 = buff4 + wid;
-  buffd = buff5 + wid;
-  buffo = (mlib_s32*)(buffd + wid);
-  buffi = buffo + (wid &~ 1);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    sl1 = sl  + sll;
-    sl2 = sl1 + sll;
-    sl3 = sl2 + sll;
-    sl4 = sl3 + sll;
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid + (KSIZE - 1); i++) {
-      buff0[i] = (FTYPE)sl[i*chan1];
-      buff1[i] = (FTYPE)sl1[i*chan1];
-      buff2[i] = (FTYPE)sl2[i*chan1];
-      buff3[i] = (FTYPE)sl3[i*chan1];
-      buff4[i] = (FTYPE)sl4[i*chan1];
-    }
-
-    sl += KSIZE*sll;
-
-    for (j = 0; j < hgt; j++) {
-      d64_2x32 dd;
-
-      /*
-       *  First loop
-       */
-      k0 = k[0]; k1 = k[1]; k2 = k[2]; k3 = k[3]; k4 = k[4];
-      k5 = k[5]; k6 = k[6]; k7 = k[7]; k8 = k[8]; k9 = k[9];
-
-      sp = sl;
-      dp = dl;
-
-      p02 = buff0[0];
-      p12 = buff1[0];
-      p03 = buff0[1];
-      p13 = buff1[1];
-      p04 = buff0[2];
-      p14 = buff1[2];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-
-        LOAD_BUFF(buffi);
-
-        p03 = buff0[i + 3]; p13 = buff1[i + 3];
-        p04 = buff0[i + 4]; p14 = buff1[i + 4];
-        p05 = buff0[i + 5]; p15 = buff1[i + 5];
-
-        buffd[i    ] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                        p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        buffd[i + 1] = (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                        p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      /*
-       *  Second loop
-       */
-      k0 = k[10]; k1 = k[11]; k2 = k[12]; k3 = k[13]; k4 = k[14];
-      k5 = k[15]; k6 = k[16]; k7 = k[17]; k8 = k[18]; k9 = k[19];
-
-      sp = sl;
-      dp = dl;
-
-      p02 = buff2[0];
-      p12 = buff3[0];
-      p03 = buff2[1];
-      p13 = buff3[1];
-      p04 = buff2[2];
-      p14 = buff3[2];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-
-        p02 = buff2[i + 2]; p12 = buff3[i + 2];
-        p03 = buff2[i + 3]; p13 = buff3[i + 3];
-        p04 = buff2[i + 4]; p14 = buff3[i + 4];
-        p05 = buff2[i + 5]; p15 = buff3[i + 5];
-
-        dd.d64 = *(FTYPE   *)(buffi + i);
-        buff5[i    ] = (FTYPE)dd.i32s.i0;
-        buff5[i + 1] = (FTYPE)dd.i32s.i1;
-
-        buffd[i    ] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                         p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        buffd[i + 1] += (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                         p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      /*
-       *  3 loop
-       */
-      k0 = k[20]; k1 = k[21]; k2 = k[22]; k3 = k[23]; k4 = k[24];
-
-      sp = sl;
-      dp = dl;
-
-      p02 = buff4[0];
-      p03 = buff4[1];
-      p04 = buff4[2];
-      p05 = buff4[3];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p01 = p03; p02 = p04; p03 = p05;
-
-        p04 = buff4[i + 4]; p05 = buff4[i + 5];
-
-        d0 = D2I(p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 + buffd[i]);
-        d1 = D2I(p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 + buffd[i + 1]);
-
-        dp[0    ] = FROM_S32(d0);
-        dp[chan1] = FROM_S32(d1);
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      /* last pixels */
-      for (; i < wid; i++) {
-        p00 = buff0[i];     p10 = buff1[i];     p20 = buff2[i];     p30 = buff3[i];
-        p01 = buff0[i + 1]; p11 = buff1[i + 1]; p21 = buff2[i + 1]; p31 = buff3[i + 1];
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2]; p32 = buff3[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3]; p23 = buff2[i + 3]; p33 = buff3[i + 3];
-        p04 = buff0[i + 4]; p14 = buff1[i + 4]; p24 = buff2[i + 4]; p34 = buff3[i + 4];
-
-        p40 = buff4[i];     p41 = buff4[i + 1]; p42 = buff4[i + 2];
-        p43 = buff4[i + 3]; p44 = buff4[i + 4];
-
-        buff5[i] = (FTYPE)sp[0];
-
-        buffo[i] = D2I(p00 * k[0] + p01 * k[1] + p02 * k[2] + p03 * k[3] + p04 * k[4] +
-                       p10 * k[5] + p11 * k[6] + p12 * k[7] + p13 * k[8] + p14 * k[9] +
-                       p20 * k[10] + p21 * k[11] + p22 * k[12] + p23 * k[13] + p24 * k[14] +
-                       p30 * k[15] + p31 * k[16] + p32 * k[17] + p33 * k[18] + p34 * k[19] +
-                       p40 * k[20] + p41 * k[21] + p42 * k[22] + p43 * k[23] + p44 * k[24]);
-
-        dp[0] = FROM_S32(buffo[i]);
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      buff5[wid    ] = (FTYPE)sp[0];
-      buff5[wid + 1] = (FTYPE)sp[chan1];
-      buff5[wid + 2] = (FTYPE)sp[chan2];
-      buff5[wid + 3] = (FTYPE)sp[chan2 + chan1];
-
-      /* next line */
-      sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buff3;
-      buff3 = buff4;
-      buff4 = buff5;
-      buff5 = buffT;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#ifndef __sparc /* for x86, using integer multiplies is faster */
-
-mlib_status CONV_FUNC_I(5x5)(mlib_image       *dst,
-                             const mlib_image *src,
-                             const mlib_s32   *kern,
-                             mlib_s32         scalef_expon,
-                             mlib_s32         cmask)
-{
-  mlib_s32 buff[BUFF_LINE];
-  mlib_s32 *buffd;
-  mlib_s32 k[KSIZE*KSIZE];
-  mlib_s32 shift1, shift2;
-  mlib_s32 k0, k1, k2, k3, k4, k5, k6, k7, k8, k9;
-  mlib_s32 p00, p01, p02, p03, p04, p05,
-           p10, p11, p12, p13, p14, p15;
-  DTYPE    *adr_src, *sl, *sp0, *sp1;
-  DTYPE    *adr_dst, *dl, *dp;
-  mlib_s32 *pbuff = buff;
-  mlib_s32 wid, hgt, sll, dll;
-  mlib_s32 nchannel, chan1, chan2, chan3, chan4;
-  mlib_s32 i, j, c;
-
-#if IMG_TYPE != 1
-  shift1 = 16;
-#else
-  shift1 = 8;
-#endif /* IMG_TYPE != 1 */
-
-  shift2 = scalef_expon - shift1;
-
-  for (j = 0; j < KSIZE*KSIZE; j++) k[j] = kern[j] >> shift1;
-
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  if (wid > BUFF_LINE) {
-    pbuff = mlib_malloc(sizeof(mlib_s32)*wid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buffd = pbuff;
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-  chan3 = chan2 + chan1;
-  chan4 = chan3 + chan1;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  for (c = 0; c < chan1; c++) {
-    if (!(cmask & (1 << (chan1 - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    for (j = 0; j < hgt; j++) {
-      mlib_s32 pix0, pix1;
-      /*
-       *  First loop
-       */
-      sp0 = sl;
-      sp1 = sp0 + sll;
-      dp = dl;
-
-      k0 = k[0]; k1 = k[1]; k2 = k[2]; k3 = k[3]; k4 = k[4];
-      k5 = k[5]; k6 = k[6]; k7 = k[7]; k8 = k[8]; k9 = k[9];
-
-      p02 = sp0[0];     p12 = sp1[0];
-      p03 = sp0[chan1]; p13 = sp1[chan1];
-      p04 = sp0[chan2]; p14 = sp1[chan2];
-      p05 = sp0[chan3]; p15 = sp1[chan3];
-
-      sp0 += chan4;
-      sp1 += chan4;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = p05; p13 = p15;
-
-        p04 = sp0[0];     p14 = sp1[0];
-        p05 = sp0[chan1]; p15 = sp1[chan1];
-
-        buffd[i    ] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                        p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        buffd[i + 1] = (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                        p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp0 += chan2;
-        sp1 += chan2;
-        dp += chan2;
-      }
-
-      if (wid & 1) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = p05; p13 = p15;
-
-        p04 = sp0[0];     p14 = sp1[0];
-
-        buffd[i] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                    p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-      }
-
-      /*
-       *  Second loop
-       */
-      sp0 = sl + 2*sll;
-      sp1 = sp0 + sll;
-      dp = dl;
-
-      k0 = k[10]; k1 = k[11]; k2 = k[12]; k3 = k[13]; k4 = k[14];
-      k5 = k[15]; k6 = k[16]; k7 = k[17]; k8 = k[18]; k9 = k[19];
-
-      p02 = sp0[0];     p12 = sp1[0];
-      p03 = sp0[chan1]; p13 = sp1[chan1];
-      p04 = sp0[chan2]; p14 = sp1[chan2];
-      p05 = sp0[chan3]; p15 = sp1[chan3];
-
-      sp0 += chan4;
-      sp1 += chan4;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = p05; p13 = p15;
-
-        p04 = sp0[0];     p14 = sp1[0];
-        p05 = sp0[chan1]; p15 = sp1[chan1];
-
-        buffd[i    ] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                         p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        buffd[i + 1] += (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                         p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp0 += chan2;
-        sp1 += chan2;
-        dp += chan2;
-      }
-
-      if (wid & 1) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = p05; p13 = p15;
-
-        p04 = sp0[0];     p14 = sp1[0];
-
-        buffd[i] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                     p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-      }
-
-      /*
-       *  3 loop
-       */
-      dp = dl;
-      sp0 = sl + 4*sll;
-
-      k0 = k[20]; k1 = k[21]; k2 = k[22]; k3 = k[23]; k4 = k[24];
-
-      p02 = sp0[0];
-      p03 = sp0[chan1];
-      p04 = sp0[chan2];
-      p05 = sp0[chan3];
-
-      sp0 += chan2 + chan2;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p01 = p03; p02 = p04; p03 = p05;
-
-        p04 = sp0[0]; p05 = sp0[chan1];
-
-        pix0 = (buffd[i    ] + p00 * k0 + p01 * k1 + p02 * k2 +
-                p03 * k3 + p04 * k4) >> shift2;
-        pix1 = (buffd[i + 1] + p01 * k0 + p02 * k1 + p03 * k2 +
-                p04 * k3 + p05 * k4) >> shift2;
-
-        CLAMP_STORE(dp[0],     pix0)
-        CLAMP_STORE(dp[chan1], pix1)
-
-        dp  += chan2;
-        sp0 += chan2;
-      }
-
-      if (wid & 1) {
-        p00 = p02; p01 = p03; p02 = p04; p03 = p05;
-
-        p04 = sp0[0];
-
-        pix0 = (buffd[i    ] + p00 * k0 + p01 * k1 + p02 * k2 +
-                p03 * k3 + p04 * k4) >> shift2;
-        CLAMP_STORE(dp[0],     pix0)
-      }
-
-      /* next line */
-      sl += sll;
-      dl += dll;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-#endif /* __sparc ( for x86, using integer multiplies is faster ) */
-
-/***************************************************************/
-#if IMG_TYPE == 1
-
-#undef  KSIZE
-#define KSIZE 7
-
-mlib_status CONV_FUNC(7x7)(mlib_image       *dst,
-                           const mlib_image *src,
-                           const mlib_s32   *kern,
-                           mlib_s32         scalef_expon,
-                           mlib_s32         cmask)
-{
-  FTYPE    buff[(KSIZE + 3)*BUFF_LINE], *buffs[2*(KSIZE + 1)], *buffd;
-  FTYPE    k[KSIZE*KSIZE];
-  mlib_s32 l, m, buff_ind;
-  mlib_s32 d0, d1;
-  FTYPE    k0, k1, k2, k3, k4, k5, k6;
-  FTYPE    p0, p1, p2, p3, p4, p5, p6, p7;
-  DTYPE *sl2, *sl3, *sl4, *sl5, *sl6;
-  DEF_VARS(DTYPE);
-  DTYPE *sl1;
-  mlib_s32 chan2;
-  mlib_s32 *buffo, *buffi;
-  LOAD_KERNEL(KSIZE*KSIZE);
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  if (wid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 3)*sizeof(FTYPE)*wid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  for (l = 0; l < KSIZE + 1; l++) buffs[l] = pbuff + l*wid;
-  for (l = 0; l < KSIZE + 1; l++) buffs[l + (KSIZE + 1)] = buffs[l];
-  buffd = buffs[KSIZE] + wid;
-  buffo = (mlib_s32*)(buffd + wid);
-  buffi = buffo + (wid &~ 1);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    sl1 = sl  + sll;
-    sl2 = sl1 + sll;
-    sl3 = sl2 + sll;
-    sl4 = sl3 + sll;
-    sl5 = sl4 + sll;
-    sl6 = sl5 + sll;
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid + (KSIZE - 1); i++) {
-      buffs[0][i] = (FTYPE)sl[i*chan1];
-      buffs[1][i] = (FTYPE)sl1[i*chan1];
-      buffs[2][i] = (FTYPE)sl2[i*chan1];
-      buffs[3][i] = (FTYPE)sl3[i*chan1];
-      buffs[4][i] = (FTYPE)sl4[i*chan1];
-      buffs[5][i] = (FTYPE)sl5[i*chan1];
-      buffs[6][i] = (FTYPE)sl6[i*chan1];
-    }
-
-    buff_ind = 0;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid; i++) buffd[i] = 0.0;
-
-    sl += KSIZE*sll;
-
-    for (j = 0; j < hgt; j++) {
-      FTYPE    **buffc = buffs + buff_ind;
-      FTYPE    *buffn = buffc[KSIZE];
-      FTYPE    *pk = k;
-
-      for (l = 0; l < KSIZE; l++) {
-        FTYPE    *buff = buffc[l];
-        d64_2x32 dd;
-
-        sp = sl;
-        dp = dl;
-
-        p2 = buff[0]; p3 = buff[1]; p4 = buff[2];
-        p5 = buff[3]; p6 = buff[4]; p7 = buff[5];
-
-        k0 = *pk++; k1 = *pk++; k2 = *pk++; k3 = *pk++;
-        k4 = *pk++; k5 = *pk++; k6 = *pk++;
-
-        if (l < (KSIZE - 1)) {
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-          for (i = 0; i <= (wid - 2); i += 2) {
-            p0 = p2; p1 = p3; p2 = p4; p3 = p5; p4 = p6; p5 = p7;
-
-            p6 = buff[i + 6]; p7 = buff[i + 7];
-
-            buffd[i    ] += p0*k0 + p1*k1 + p2*k2 + p3*k3 + p4*k4 + p5*k5 + p6*k6;
-            buffd[i + 1] += p1*k0 + p2*k1 + p3*k2 + p4*k3 + p5*k4 + p6*k5 + p7*k6;
-          }
-
-        } else {
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-          for (i = 0; i <= (wid - 2); i += 2) {
-            p0 = p2; p1 = p3; p2 = p4; p3 = p5; p4 = p6; p5 = p7;
-
-            p6 = buff[i + 6]; p7 = buff[i + 7];
-
-            LOAD_BUFF(buffi);
-
-            dd.d64 = *(FTYPE   *)(buffi + i);
-            buffn[i    ] = (FTYPE)dd.i32s.i0;
-            buffn[i + 1] = (FTYPE)dd.i32s.i1;
-
-            d0 = D2I(p0*k0 + p1*k1 + p2*k2 + p3*k3 + p4*k4 + p5*k5 + p6*k6 + buffd[i    ]);
-            d1 = D2I(p1*k0 + p2*k1 + p3*k2 + p4*k3 + p5*k4 + p6*k5 + p7*k6 + buffd[i + 1]);
-
-            dp[0    ] = FROM_S32(d0);
-            dp[chan1] = FROM_S32(d1);
-
-            buffd[i    ] = 0.0;
-            buffd[i + 1] = 0.0;
-
-            sp += chan2;
-            dp += chan2;
-          }
-        }
-      }
-
-      /* last pixels */
-      for (; i < wid; i++) {
-        FTYPE    *pk = k, s = 0;
-        mlib_s32 d0;
-
-        for (l = 0; l < KSIZE; l++) {
-          FTYPE    *buff = buffc[l] + i;
-
-          for (m = 0; m < KSIZE; m++) s += buff[m] * (*pk++);
-        }
-
-        d0 = D2I(s);
-        dp[0] = FROM_S32(d0);
-
-        buffn[i] = (FTYPE)sp[0];
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      for (l = 0; l < (KSIZE - 1); l++) buffn[wid + l] = sp[l*chan1];
-
-      /* next line */
-      sl += sll;
-      dl += dll;
-
-      buff_ind++;
-
-      if (buff_ind >= KSIZE + 1) buff_ind = 0;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-#endif /* IMG_TYPE == 1 */
-
 /***************************************************************/
 #define MAX_KER   7
 #define MAX_N    15
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_D64nw.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_D64nw.c
index 551ea197876..ef111ba1f44 100644
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_D64nw.c
+++ b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_D64nw.c
@@ -74,495 +74,6 @@
   type     *dl, *dp = NULL;                                     \
   mlib_s32 i = 0, j, c
 
-/***************************************************************/
-#undef  KSIZE
-#define KSIZE 2
-
-mlib_status CONV_FUNC(2x2)(mlib_image       *dst,
-                           const mlib_image *src,
-                           const mlib_d64   *kern,
-                           mlib_s32         cmask)
-{
-  DEF_VARS(DTYPE);
-  DTYPE    *sp0, *sp1;
-  mlib_s32 chan2 = chan1 + chan1;
-  mlib_s32 chan3 = chan1 + chan2;
-  mlib_s32 chan4 = chan3 + chan1;
-  DTYPE k0, k1, k2, k3;
-  DTYPE p00, p01, p02, p03, p04,
-        p10, p11, p12, p13, p14;
-
-  /* keep kernel in regs */
-  k0 = (DTYPE)kern[0];  k1 = (DTYPE)kern[1];
-  k2 = (DTYPE)kern[2];  k3 = (DTYPE)kern[3];
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  for (c = 0; c < chan1; c++) {
-    if (!(cmask & (1 << (chan1 - 1 - c)))) continue;
-
-    dl = adr_dst + c;
-    sl = adr_src + c;
-
-    for (j = 0; j < hgt; j++) {
-      dp  = dl;
-      sp0 = sl;
-      sp1 = sp0 + sll;
-
-      p04 = sp0[0];
-      p14 = sp1[0];
-
-      sp0 += chan1;
-      sp1 += chan1;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 4); i += 4) {
-        p00 = p04; p10 = p14;
-
-        p01 = sp0[0];     p11 = sp1[0];
-        p02 = sp0[chan1]; p12 = sp1[chan1];
-        p03 = sp0[chan2]; p13 = sp1[chan2];
-        p04 = sp0[chan3]; p14 = sp1[chan3];
-
-        dp[0    ] = p00 * k0 + p01 * k1 + p10 * k2 + p11 * k3;
-        dp[chan1] = p01 * k0 + p02 * k1 + p11 * k2 + p12 * k3;
-        dp[chan2] = p02 * k0 + p03 * k1 + p12 * k2 + p13 * k3;
-        dp[chan3] = p03 * k0 + p04 * k1 + p13 * k2 + p14 * k3;
-
-        dp  += chan4;
-        sp0 += chan4;
-        sp1 += chan4;
-      }
-
-      if (i < wid) {
-        p00 = p04;    p10 = p14;
-        p01 = sp0[0]; p11 = sp1[0];
-        dp[0] = p00 * k0 + p01 * k1 + p10 * k2 + p11 * k3;
-
-        if ((i + 1) < wid) {
-          p02 = sp0[chan1]; p12 = sp1[chan1];
-          dp[chan1] = p01 * k0 + p02 * k1 + p11 * k2 + p12 * k3;
-
-          if ((i + 2) < wid) {
-            p03 = sp0[chan2]; p13 = sp1[chan2];
-            dp[chan2] = p02 * k0 + p03 * k1 + p12 * k2 + p13 * k3;
-          }
-        }
-      }
-
-      sl += sll;
-      dl += dll;
-    }
-  }
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  KSIZE
-#define KSIZE 3
-
-mlib_status CONV_FUNC(3x3)(mlib_image       *dst,
-                           const mlib_image *src,
-                           const mlib_d64   *kern,
-                           mlib_s32         cmask)
-{
-  DEF_VARS(DTYPE);
-  mlib_s32 chan2 = chan1 + chan1;
-  DTYPE    *sp0, *sp1;
-  DTYPE *sp2;
-  DTYPE k0, k1, k2, k3, k4, k5, k6, k7, k8;
-  DTYPE p02, p03, p12, p13, p22, p23;
-
-  /* keep kernel in regs */
-  k0 = (DTYPE)kern[0];  k1 = (DTYPE)kern[1];  k2 = (DTYPE)kern[2];
-  k3 = (DTYPE)kern[3];  k4 = (DTYPE)kern[4];  k5 = (DTYPE)kern[5];
-  k6 = (DTYPE)kern[6];  k7 = (DTYPE)kern[7];  k8 = (DTYPE)kern[8];
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  for (c = 0; c < chan1; c++) {
-    if (!(cmask & (1 << (chan1 - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    for (j = 0; j < hgt; j++) {
-      DTYPE s0, s1;
-
-      dp  = dl;
-      sp0 = sl;
-      sp1 = sp0 + sll;
-      sp2 = sp1 + sll;
-
-      p02 = sp0[0];
-      p12 = sp1[0];
-      p22 = sp2[0];
-
-      p03 = sp0[chan1];
-      p13 = sp1[chan1];
-      p23 = sp2[chan1];
-
-      s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-      s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-      sp0 += chan2;
-      sp1 += chan2;
-      sp2 += chan2;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p02 = sp0[0];     p12 = sp1[0];     p22 = sp2[0];
-        p03 = sp0[chan1]; p13 = sp1[chan1]; p23 = sp2[chan1];
-
-        dp[0    ] = s0 + p02 * k2 + p12 * k5 + p22 * k8;
-        dp[chan1] = s1 + p02 * k1 + p03 * k2 + p12 * k4 + p13 * k5 + p22 * k7 + p23 * k8;
-
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-        sp0 += chan2;
-        sp1 += chan2;
-        sp2 += chan2;
-        dp += chan2;
-      }
-
-      if (wid & 1) {
-        p02 = sp0[0]; p12 = sp1[0]; p22 = sp2[0];
-        dp[0] = s0 + p02 * k2 + p12 * k5 + p22 * k8;
-      }
-
-      sl += sll;
-      dl += dll;
-    }
-  }
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  KSIZE
-#define KSIZE 4
-
-mlib_status CONV_FUNC(4x4)(mlib_image       *dst,
-                           const mlib_image *src,
-                           const mlib_d64   *k,
-                           mlib_s32         cmask)
-{
-  DTYPE k0, k1, k2, k3, k4, k5, k6, k7;
-  DTYPE p00, p01, p02, p03, p04,
-        p10, p11, p12, p13, p14;
-  DEF_VARS(DTYPE);
-  DTYPE    *sp0, *sp1;
-  mlib_s32 chan2 = chan1 + chan1;
-  mlib_s32 chan3 = chan1 + chan2;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  for (c = 0; c < chan1; c++) {
-    if (!(cmask & (1 << (chan1 - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    for (j = 0; j < hgt; j++) {
-      /*
-       *  First loop on two first lines of kernel
-       */
-      sp0 = sl;
-      sp1 = sp0 + sll;
-      dp = dl;
-
-      k0 = (DTYPE)k[0]; k1 = (DTYPE)k[1]; k2 = (DTYPE)k[2]; k3 = (DTYPE)k[3];
-      k4 = (DTYPE)k[4]; k5 = (DTYPE)k[5]; k6 = (DTYPE)k[6]; k7 = (DTYPE)k[7];
-
-      p02 = sp0[0];     p12 = sp1[0];
-      p03 = sp0[chan1]; p13 = sp1[chan1];
-      p04 = sp0[chan2]; p14 = sp1[chan2];
-
-      sp0 += chan3;
-      sp1 += chan3;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-
-        p03 = sp0[0];     p13 = sp1[0];
-        p04 = sp0[chan1]; p14 = sp1[chan1];
-
-        dp[0    ] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 +
-                     p10 * k4 + p11 * k5 + p12 * k6 + p13 * k7);
-        dp[chan1] = (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 +
-                     p11 * k4 + p12 * k5 + p13 * k6 + p14 * k7);
-
-        sp0 += chan2;
-        sp1 += chan2;
-        dp += chan2;
-      }
-
-      if (wid & 1) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = sp0[0]; p13 = sp1[0];
-
-        dp[0] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 +
-                 p10 * k4 + p11 * k5 + p12 * k6 + p13 * k7);
-      }
-
-      /*
-       *  Second loop on two last lines of kernel
-       */
-      sp0 = sl + 2*sll;
-      sp1 = sp0 + sll;
-      dp = dl;
-
-      k0 = (DTYPE)k[ 8]; k1 = (DTYPE)k[ 9]; k2 = (DTYPE)k[10]; k3 = (DTYPE)k[11];
-      k4 = (DTYPE)k[12]; k5 = (DTYPE)k[13]; k6 = (DTYPE)k[14]; k7 = (DTYPE)k[15];
-
-      p02 = sp0[0];     p12 = sp1[0];
-      p03 = sp0[chan1]; p13 = sp1[chan1];
-      p04 = sp0[chan2]; p14 = sp1[chan2];
-
-      sp0 += chan3;
-      sp1 += chan3;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-
-        p03 = sp0[0];     p13 = sp1[0];
-        p04 = sp0[chan1]; p14 = sp1[chan1];
-
-        dp[0    ] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 +
-                      p10 * k4 + p11 * k5 + p12 * k6 + p13 * k7);
-        dp[chan1] += (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 +
-                      p11 * k4 + p12 * k5 + p13 * k6 + p14 * k7);
-
-        sp0 += chan2;
-        sp1 += chan2;
-        dp += chan2;
-      }
-
-      if (wid & 1) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = sp0[0]; p13 = sp1[0];
-
-        dp[0] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 +
-                  p10 * k4 + p11 * k5 + p12 * k6 + p13 * k7);
-      }
-
-      /* next line */
-      sl += sll;
-      dl += dll;
-    }
-  }
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  KSIZE
-#define KSIZE 5
-
-mlib_status CONV_FUNC(5x5)(mlib_image       *dst,
-                           const mlib_image *src,
-                           const mlib_d64   *k,
-                           mlib_s32         cmask)
-{
-  DTYPE k0, k1, k2, k3, k4, k5, k6, k7, k8, k9;
-  DTYPE p00, p01, p02, p03, p04, p05,
-        p10, p11, p12, p13, p14, p15;
-  DEF_VARS(DTYPE);
-  DTYPE    *sp0, *sp1;
-  mlib_s32 chan2 = chan1 + chan1;
-  mlib_s32 chan3 = chan1 + chan2;
-  mlib_s32 chan4 = chan3 + chan1;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  for (c = 0; c < chan1; c++) {
-    if (!(cmask & (1 << (chan1 - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    for (j = 0; j < hgt; j++) {
-      /*
-       *  First loop
-       */
-      sp0 = sl;
-      sp1 = sp0 + sll;
-      dp = dl;
-
-      k0 = (DTYPE)k[0]; k1 = (DTYPE)k[1]; k2 = (DTYPE)k[2]; k3 = (DTYPE)k[3]; k4 = (DTYPE)k[4];
-      k5 = (DTYPE)k[5]; k6 = (DTYPE)k[6]; k7 = (DTYPE)k[7]; k8 = (DTYPE)k[8]; k9 = (DTYPE)k[9];
-
-      p02 = sp0[0];     p12 = sp1[0];
-      p03 = sp0[chan1]; p13 = sp1[chan1];
-      p04 = sp0[chan2]; p14 = sp1[chan2];
-      p05 = sp0[chan3]; p15 = sp1[chan3];
-
-      sp0 += chan4;
-      sp1 += chan4;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = p05; p13 = p15;
-
-        p04 = sp0[0];     p14 = sp1[0];
-        p05 = sp0[chan1]; p15 = sp1[chan1];
-
-        dp[    0] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                     p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        dp[chan1] = (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                     p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp0 += chan2;
-        sp1 += chan2;
-        dp += chan2;
-      }
-
-      if (wid & 1) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = p05; p13 = p15;
-
-        p04 = sp0[0];     p14 = sp1[0];
-
-        dp[0] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                 p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-      }
-
-      /*
-       *  Second loop
-       */
-      sp0 = sl + 2*sll;
-      sp1 = sp0 + sll;
-      dp = dl;
-
-      k0 = (DTYPE)k[10]; k1 = (DTYPE)k[11]; k2 = (DTYPE)k[12]; k3 = (DTYPE)k[13]; k4 = (DTYPE)k[14];
-      k5 = (DTYPE)k[15]; k6 = (DTYPE)k[16]; k7 = (DTYPE)k[17]; k8 = (DTYPE)k[18]; k9 = (DTYPE)k[19];
-
-      p02 = sp0[0];     p12 = sp1[0];
-      p03 = sp0[chan1]; p13 = sp1[chan1];
-      p04 = sp0[chan2]; p14 = sp1[chan2];
-      p05 = sp0[chan3]; p15 = sp1[chan3];
-
-      sp0 += chan4;
-      sp1 += chan4;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = p05; p13 = p15;
-
-        p04 = sp0[0];     p14 = sp1[0];
-        p05 = sp0[chan1]; p15 = sp1[chan1];
-
-        dp[    0] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                      p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        dp[chan1] += (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                      p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp0 += chan2;
-        sp1 += chan2;
-        dp += chan2;
-      }
-
-      if (wid & 1) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = p05; p13 = p15;
-
-        p04 = sp0[0];     p14 = sp1[0];
-
-        dp[0] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                  p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-      }
-
-      /*
-       *  3 loop
-       */
-      dp = dl;
-      sp0 = sl + 4*sll;
-
-      k0 = (DTYPE)k[20]; k1 = (DTYPE)k[21]; k2 = (DTYPE)k[22]; k3 = (DTYPE)k[23]; k4 = (DTYPE)k[24];
-
-      p02 = sp0[0];
-      p03 = sp0[chan1];
-      p04 = sp0[chan2];
-      p05 = sp0[chan3];
-
-      sp0 += chan2 + chan2;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p01 = p03; p02 = p04; p03 = p05;
-
-        p04 = sp0[0]; p05 = sp0[chan1];
-
-        dp[0    ] += p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4;
-        dp[chan1] += p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4;
-
-        dp  += chan2;
-        sp0 += chan2;
-      }
-
-      if (wid & 1) {
-        p00 = p02; p01 = p03; p02 = p04; p03 = p05;
-
-        p04 = sp0[0];
-
-        dp[0] += p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4;
-      }
-
-      /* next line */
-      sl += sll;
-      dl += dll;
-    }
-  }
-
-  return MLIB_SUCCESS;
-}
-
 /***************************************************************/
 #define BUFF_SIZE  1600
 
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_F32nw.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_F32nw.c
index 7e279d7a61e..c825c97c437 100644
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_F32nw.c
+++ b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_F32nw.c
@@ -74,495 +74,6 @@
   type     *dl, *dp = NULL;                                     \
   mlib_s32 i, j, c
 
-/***************************************************************/
-#undef  KSIZE
-#define KSIZE 2
-
-mlib_status CONV_FUNC(2x2)(mlib_image       *dst,
-                           const mlib_image *src,
-                           const mlib_d64   *kern,
-                           mlib_s32         cmask)
-{
-  DEF_VARS(DTYPE);
-  DTYPE    *sp0, *sp1;
-  mlib_s32 chan2 = chan1 + chan1;
-  mlib_s32 chan3 = chan1 + chan2;
-  mlib_s32 chan4 = chan3 + chan1;
-  DTYPE k0, k1, k2, k3;
-  DTYPE p00, p01, p02, p03, p04,
-        p10, p11, p12, p13, p14;
-
-  /* keep kernel in regs */
-  k0 = (DTYPE)kern[0];  k1 = (DTYPE)kern[1];
-  k2 = (DTYPE)kern[2];  k3 = (DTYPE)kern[3];
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  for (c = 0; c < chan1; c++) {
-    if (!(cmask & (1 << (chan1 - 1 - c)))) continue;
-
-    dl = adr_dst + c;
-    sl = adr_src + c;
-
-    for (j = 0; j < hgt; j++) {
-      dp  = dl;
-      sp0 = sl;
-      sp1 = sp0 + sll;
-
-      p04 = sp0[0];
-      p14 = sp1[0];
-
-      sp0 += chan1;
-      sp1 += chan1;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 4); i += 4) {
-        p00 = p04; p10 = p14;
-
-        p01 = sp0[0];     p11 = sp1[0];
-        p02 = sp0[chan1]; p12 = sp1[chan1];
-        p03 = sp0[chan2]; p13 = sp1[chan2];
-        p04 = sp0[chan3]; p14 = sp1[chan3];
-
-        dp[0    ] = p00 * k0 + p01 * k1 + p10 * k2 + p11 * k3;
-        dp[chan1] = p01 * k0 + p02 * k1 + p11 * k2 + p12 * k3;
-        dp[chan2] = p02 * k0 + p03 * k1 + p12 * k2 + p13 * k3;
-        dp[chan3] = p03 * k0 + p04 * k1 + p13 * k2 + p14 * k3;
-
-        dp  += chan4;
-        sp0 += chan4;
-        sp1 += chan4;
-      }
-
-      if (i < wid) {
-        p00 = p04;    p10 = p14;
-        p01 = sp0[0]; p11 = sp1[0];
-        dp[0] = p00 * k0 + p01 * k1 + p10 * k2 + p11 * k3;
-
-        if ((i + 1) < wid) {
-          p02 = sp0[chan1]; p12 = sp1[chan1];
-          dp[chan1] = p01 * k0 + p02 * k1 + p11 * k2 + p12 * k3;
-
-          if ((i + 2) < wid) {
-            p03 = sp0[chan2]; p13 = sp1[chan2];
-            dp[chan2] = p02 * k0 + p03 * k1 + p12 * k2 + p13 * k3;
-          }
-        }
-      }
-
-      sl += sll;
-      dl += dll;
-    }
-  }
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  KSIZE
-#define KSIZE 3
-
-mlib_status CONV_FUNC(3x3)(mlib_image       *dst,
-                           const mlib_image *src,
-                           const mlib_d64   *kern,
-                           mlib_s32         cmask)
-{
-  DEF_VARS(DTYPE);
-  mlib_s32 chan2 = chan1 + chan1;
-  DTYPE    *sp0, *sp1;
-  DTYPE *sp2;
-  DTYPE k0, k1, k2, k3, k4, k5, k6, k7, k8;
-  DTYPE p02, p03, p12, p13, p22, p23;
-
-  /* keep kernel in regs */
-  k0 = (DTYPE)kern[0];  k1 = (DTYPE)kern[1];  k2 = (DTYPE)kern[2];
-  k3 = (DTYPE)kern[3];  k4 = (DTYPE)kern[4];  k5 = (DTYPE)kern[5];
-  k6 = (DTYPE)kern[6];  k7 = (DTYPE)kern[7];  k8 = (DTYPE)kern[8];
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  for (c = 0; c < chan1; c++) {
-    if (!(cmask & (1 << (chan1 - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    for (j = 0; j < hgt; j++) {
-      DTYPE s0, s1;
-
-      dp  = dl;
-      sp0 = sl;
-      sp1 = sp0 + sll;
-      sp2 = sp1 + sll;
-
-      p02 = sp0[0];
-      p12 = sp1[0];
-      p22 = sp2[0];
-
-      p03 = sp0[chan1];
-      p13 = sp1[chan1];
-      p23 = sp2[chan1];
-
-      s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-      s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-      sp0 += chan2;
-      sp1 += chan2;
-      sp2 += chan2;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p02 = sp0[0];     p12 = sp1[0];     p22 = sp2[0];
-        p03 = sp0[chan1]; p13 = sp1[chan1]; p23 = sp2[chan1];
-
-        dp[0    ] = s0 + p02 * k2 + p12 * k5 + p22 * k8;
-        dp[chan1] = s1 + p02 * k1 + p03 * k2 + p12 * k4 + p13 * k5 + p22 * k7 + p23 * k8;
-
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-        sp0 += chan2;
-        sp1 += chan2;
-        sp2 += chan2;
-        dp += chan2;
-      }
-
-      if (wid & 1) {
-        p02 = sp0[0]; p12 = sp1[0]; p22 = sp2[0];
-        dp[0] = s0 + p02 * k2 + p12 * k5 + p22 * k8;
-      }
-
-      sl += sll;
-      dl += dll;
-    }
-  }
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  KSIZE
-#define KSIZE 4
-
-mlib_status CONV_FUNC(4x4)(mlib_image       *dst,
-                           const mlib_image *src,
-                           const mlib_d64   *k,
-                           mlib_s32         cmask)
-{
-  DTYPE k0, k1, k2, k3, k4, k5, k6, k7;
-  DTYPE p00, p01, p02, p03, p04,
-        p10, p11, p12, p13, p14;
-  DEF_VARS(DTYPE);
-  DTYPE    *sp0, *sp1;
-  mlib_s32 chan2 = chan1 + chan1;
-  mlib_s32 chan3 = chan1 + chan2;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  for (c = 0; c < chan1; c++) {
-    if (!(cmask & (1 << (chan1 - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    for (j = 0; j < hgt; j++) {
-      /*
-       *  First loop on two first lines of kernel
-       */
-      sp0 = sl;
-      sp1 = sp0 + sll;
-      dp = dl;
-
-      k0 = (DTYPE)k[0]; k1 = (DTYPE)k[1]; k2 = (DTYPE)k[2]; k3 = (DTYPE)k[3];
-      k4 = (DTYPE)k[4]; k5 = (DTYPE)k[5]; k6 = (DTYPE)k[6]; k7 = (DTYPE)k[7];
-
-      p02 = sp0[0];     p12 = sp1[0];
-      p03 = sp0[chan1]; p13 = sp1[chan1];
-      p04 = sp0[chan2]; p14 = sp1[chan2];
-
-      sp0 += chan3;
-      sp1 += chan3;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-
-        p03 = sp0[0];     p13 = sp1[0];
-        p04 = sp0[chan1]; p14 = sp1[chan1];
-
-        dp[0    ] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 +
-                     p10 * k4 + p11 * k5 + p12 * k6 + p13 * k7);
-        dp[chan1] = (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 +
-                     p11 * k4 + p12 * k5 + p13 * k6 + p14 * k7);
-
-        sp0 += chan2;
-        sp1 += chan2;
-        dp += chan2;
-      }
-
-      if (wid & 1) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = sp0[0]; p13 = sp1[0];
-
-        dp[0] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 +
-                 p10 * k4 + p11 * k5 + p12 * k6 + p13 * k7);
-      }
-
-      /*
-       *  Second loop on two last lines of kernel
-       */
-      sp0 = sl + 2*sll;
-      sp1 = sp0 + sll;
-      dp = dl;
-
-      k0 = (DTYPE)k[ 8]; k1 = (DTYPE)k[ 9]; k2 = (DTYPE)k[10]; k3 = (DTYPE)k[11];
-      k4 = (DTYPE)k[12]; k5 = (DTYPE)k[13]; k6 = (DTYPE)k[14]; k7 = (DTYPE)k[15];
-
-      p02 = sp0[0];     p12 = sp1[0];
-      p03 = sp0[chan1]; p13 = sp1[chan1];
-      p04 = sp0[chan2]; p14 = sp1[chan2];
-
-      sp0 += chan3;
-      sp1 += chan3;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-
-        p03 = sp0[0];     p13 = sp1[0];
-        p04 = sp0[chan1]; p14 = sp1[chan1];
-
-        dp[0    ] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 +
-                      p10 * k4 + p11 * k5 + p12 * k6 + p13 * k7);
-        dp[chan1] += (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 +
-                      p11 * k4 + p12 * k5 + p13 * k6 + p14 * k7);
-
-        sp0 += chan2;
-        sp1 += chan2;
-        dp += chan2;
-      }
-
-      if (wid & 1) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = sp0[0]; p13 = sp1[0];
-
-        dp[0] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 +
-                  p10 * k4 + p11 * k5 + p12 * k6 + p13 * k7);
-      }
-
-      /* next line */
-      sl += sll;
-      dl += dll;
-    }
-  }
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  KSIZE
-#define KSIZE 5
-
-mlib_status CONV_FUNC(5x5)(mlib_image       *dst,
-                           const mlib_image *src,
-                           const mlib_d64   *k,
-                           mlib_s32         cmask)
-{
-  DTYPE k0, k1, k2, k3, k4, k5, k6, k7, k8, k9;
-  DTYPE p00, p01, p02, p03, p04, p05,
-        p10, p11, p12, p13, p14, p15;
-  DEF_VARS(DTYPE);
-  DTYPE    *sp0, *sp1;
-  mlib_s32 chan2 = chan1 + chan1;
-  mlib_s32 chan3 = chan1 + chan2;
-  mlib_s32 chan4 = chan3 + chan1;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  for (c = 0; c < chan1; c++) {
-    if (!(cmask & (1 << (chan1 - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    for (j = 0; j < hgt; j++) {
-      /*
-       *  First loop
-       */
-      sp0 = sl;
-      sp1 = sp0 + sll;
-      dp = dl;
-
-      k0 = (DTYPE)k[0]; k1 = (DTYPE)k[1]; k2 = (DTYPE)k[2]; k3 = (DTYPE)k[3]; k4 = (DTYPE)k[4];
-      k5 = (DTYPE)k[5]; k6 = (DTYPE)k[6]; k7 = (DTYPE)k[7]; k8 = (DTYPE)k[8]; k9 = (DTYPE)k[9];
-
-      p02 = sp0[0];     p12 = sp1[0];
-      p03 = sp0[chan1]; p13 = sp1[chan1];
-      p04 = sp0[chan2]; p14 = sp1[chan2];
-      p05 = sp0[chan3]; p15 = sp1[chan3];
-
-      sp0 += chan4;
-      sp1 += chan4;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = p05; p13 = p15;
-
-        p04 = sp0[0];     p14 = sp1[0];
-        p05 = sp0[chan1]; p15 = sp1[chan1];
-
-        dp[    0] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                     p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        dp[chan1] = (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                     p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp0 += chan2;
-        sp1 += chan2;
-        dp += chan2;
-      }
-
-      if (wid & 1) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = p05; p13 = p15;
-
-        p04 = sp0[0];     p14 = sp1[0];
-
-        dp[0] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                 p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-      }
-
-      /*
-       *  Second loop
-       */
-      sp0 = sl + 2*sll;
-      sp1 = sp0 + sll;
-      dp = dl;
-
-      k0 = (DTYPE)k[10]; k1 = (DTYPE)k[11]; k2 = (DTYPE)k[12]; k3 = (DTYPE)k[13]; k4 = (DTYPE)k[14];
-      k5 = (DTYPE)k[15]; k6 = (DTYPE)k[16]; k7 = (DTYPE)k[17]; k8 = (DTYPE)k[18]; k9 = (DTYPE)k[19];
-
-      p02 = sp0[0];     p12 = sp1[0];
-      p03 = sp0[chan1]; p13 = sp1[chan1];
-      p04 = sp0[chan2]; p14 = sp1[chan2];
-      p05 = sp0[chan3]; p15 = sp1[chan3];
-
-      sp0 += chan4;
-      sp1 += chan4;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = p05; p13 = p15;
-
-        p04 = sp0[0];     p14 = sp1[0];
-        p05 = sp0[chan1]; p15 = sp1[chan1];
-
-        dp[    0] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                      p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        dp[chan1] += (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                      p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp0 += chan2;
-        sp1 += chan2;
-        dp += chan2;
-      }
-
-      if (wid & 1) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = p05; p13 = p15;
-
-        p04 = sp0[0];     p14 = sp1[0];
-
-        dp[0] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                  p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-      }
-
-      /*
-       *  3 loop
-       */
-      dp = dl;
-      sp0 = sl + 4*sll;
-
-      k0 = (DTYPE)k[20]; k1 = (DTYPE)k[21]; k2 = (DTYPE)k[22]; k3 = (DTYPE)k[23]; k4 = (DTYPE)k[24];
-
-      p02 = sp0[0];
-      p03 = sp0[chan1];
-      p04 = sp0[chan2];
-      p05 = sp0[chan3];
-
-      sp0 += chan2 + chan2;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p01 = p03; p02 = p04; p03 = p05;
-
-        p04 = sp0[0]; p05 = sp0[chan1];
-
-        dp[0    ] += p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4;
-        dp[chan1] += p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4;
-
-        dp  += chan2;
-        sp0 += chan2;
-      }
-
-      if (wid & 1) {
-        p00 = p02; p01 = p03; p02 = p04; p03 = p05;
-
-        p04 = sp0[0];
-
-        dp[0] += p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4;
-      }
-
-      /* next line */
-      sl += sll;
-      dl += dll;
-    }
-  }
-
-  return MLIB_SUCCESS;
-}
-
 /***************************************************************/
 #define BUFF_SIZE  1600
 
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16ext.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16ext.c
index 926459d1170..b6a641039fa 100644
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16ext.c
+++ b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16ext.c
@@ -79,9 +79,6 @@
 
 #endif /* IMG_TYPE == 1 */
 
-/***************************************************************/
-#define KSIZE1 (KSIZE - 1)
-
 /***************************************************************/
 #define PARAM                                                   \
   mlib_image       *dst,                                        \
@@ -162,9 +159,6 @@
 #endif /* _LITTLE_ENDIAN */
 #endif /* _NO_LONGLONG */
 
-/***************************************************************/
-#define MLIB_D2_24 16777216.0f
-
 /***************************************************************/
 typedef union {
   mlib_d64 d64;
@@ -174,9 +168,6 @@ typedef union {
   } i32s;
 } d64_2x32;
 
-/***************************************************************/
-#define BUFF_LINE 256
-
 /***************************************************************/
 #define DEF_VARS(type)                                          \
   type     *adr_src, *sl, *sp, *sl1;                            \
@@ -187,39 +178,6 @@ typedef union {
   mlib_s32 nchannel, chan1, chan2;                              \
   mlib_s32 i, j, c, swid
 
-/***************************************************************/
-#define LOAD_KERNEL3()                                                   \
-  FTYPE    scalef = DSCALE;                                              \
-  FTYPE    k0, k1, k2, k3, k4, k5, k6, k7, k8;                           \
-  FTYPE    p00, p01, p02, p03,                                           \
-           p10, p11, p12, p13,                                           \
-           p20, p21, p22, p23;                                           \
-                                                                         \
-  while (scalef_expon > 30) {                                            \
-    scalef /= (1 << 30);                                                 \
-    scalef_expon -= 30;                                                  \
-  }                                                                      \
-                                                                         \
-  scalef /= (1 << scalef_expon);                                         \
-                                                                         \
-  /* keep kernel in regs */                                              \
-  k0 = scalef * kern[0];  k1 = scalef * kern[1];  k2 = scalef * kern[2]; \
-  k3 = scalef * kern[3];  k4 = scalef * kern[4];  k5 = scalef * kern[5]; \
-  k6 = scalef * kern[6];  k7 = scalef * kern[7];  k8 = scalef * kern[8]
-
-/***************************************************************/
-#define LOAD_KERNEL(SIZE)                                       \
-  FTYPE    scalef = DSCALE;                                     \
-                                                                \
-  while (scalef_expon > 30) {                                   \
-    scalef /= (1 << 30);                                        \
-    scalef_expon -= 30;                                         \
-  }                                                             \
-                                                                \
-  scalef /= (1 << scalef_expon);                                \
-                                                                \
-  for (j = 0; j < SIZE; j++) k[j] = scalef * kern[j]
-
 /***************************************************************/
 #define GET_SRC_DST_PARAMETERS(type)                            \
   hgt = mlib_ImageGetHeight(src);                               \
@@ -277,1334 +235,6 @@ typedef union {
 #endif /* IMG_TYPE == 1 */
 #endif /* __sparc */
 
-/***************************************************************/
-#define KSIZE  3
-
-mlib_status CONV_FUNC(3x3)
-{
-  FTYPE    buff[(KSIZE + 2)*BUFF_LINE], *buff0, *buff1, *buff2, *buff3, *buffT;
-  DEF_VARS(DTYPE);
-  DTYPE *sl2;
-#ifndef __sparc
-  mlib_s32 d0, d1;
-#endif /* __sparc */
-  LOAD_KERNEL3();
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  swid = wid + KSIZE1;
-
-  if (swid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 2)*sizeof(FTYPE   )*swid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buff0 = pbuff;
-  buff1 = buff0 + swid;
-  buff2 = buff1 + swid;
-  buff3 = buff2 + swid;
-  buffo = (mlib_s32*)(buff3 + swid);
-  buffi = buffo + (swid &~ 1);
-
-  swid -= (dx_l + dx_r);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    if ((1 > dy_t) && (1 < hgt + KSIZE1 - dy_b)) sl1 = sl + sll;
-    else sl1 = sl;
-
-    if ((hgt - dy_b) > 0) sl2 = sl1 + sll;
-    else sl2 = sl1;
-
-    for (i = 0; i < dx_l; i++) {
-      buff0[i] = (FTYPE)sl[0];
-      buff1[i] = (FTYPE)sl1[0];
-      buff2[i] = (FTYPE)sl2[0];
-    }
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < swid; i++) {
-      buff0[i + dx_l] = (FTYPE)sl[i*chan1];
-      buff1[i + dx_l] = (FTYPE)sl1[i*chan1];
-      buff2[i + dx_l] = (FTYPE)sl2[i*chan1];
-    }
-
-    for (i = 0; i < dx_r; i++) {
-      buff0[swid + dx_l + i] = buff0[swid + dx_l - 1];
-      buff1[swid + dx_l + i] = buff1[swid + dx_l - 1];
-      buff2[swid + dx_l + i] = buff2[swid + dx_l - 1];
-    }
-
-    if ((hgt - dy_b) > 1) sl = sl2 + sll;
-    else sl = sl2;
-
-    for (j = 0; j < hgt; j++) {
-      FTYPE    s0, s1;
-
-      p02 = buff0[0];
-      p12 = buff1[0];
-      p22 = buff2[0];
-
-      p03 = buff0[1];
-      p13 = buff1[1];
-      p23 = buff2[1];
-
-      s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-      s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-      sp = sl;
-      dp = dl;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-#ifdef __sparc
-#ifdef _NO_LONGLONG
-        mlib_s32 o64_1, o64_2;
-#else /* _NO_LONGLONG */
-        mlib_s64 o64;
-#endif /* _NO_LONGLONG */
-#endif /* __sparc */
-        d64_2x32 dd;
-
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3]; p23 = buff2[i + 3];
-
-        LOAD_BUFF(buffi);
-
-        dd.d64 = *(FTYPE   *)(buffi + i);
-        buff3[i + dx_l    ] = (FTYPE)dd.i32s.i0;
-        buff3[i + dx_l + 1] = (FTYPE)dd.i32s.i1;
-
-#ifndef __sparc
-
-        d0 = D2I(s0 + p02 * k2 + p12 * k5 + p22 * k8);
-        d1 = D2I(s1 + p02 * k1 + p03 * k2 + p12 * k4 + p13 * k5 + p22 * k7 + p23 * k8);
-
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-        dp[0    ] = FROM_S32(d0);
-        dp[chan1] = FROM_S32(d1);
-
-#else /* __sparc */
-
-        dd.i32s.i0 = D2I(s0 + p02 * k2 + p12 * k5 + p22 * k8);
-        dd.i32s.i1 = D2I(s1 + p02 * k1 + p03 * k2 + p12 * k4 + p13 * k5 + p22 * k7 + p23 * k8);
-        *(FTYPE   *)(buffo + i) = dd.d64;
-
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-#ifdef _NO_LONGLONG
-
-        o64_1 = buffo[i];
-        o64_2 = buffo[i+1];
-#if IMG_TYPE != 1
-        STORE2(FROM_S32(o64_1), FROM_S32(o64_2));
-#else
-        STORE2(o64_1 >> 24, o64_2 >> 24);
-#endif /* IMG_TYPE != 1 */
-
-#else /* _NO_LONGLONG */
-
-        o64 = *(mlib_s64*)(buffo + i);
-#if IMG_TYPE != 1
-        STORE2(FROM_S32(o64 >> 32), FROM_S32(o64));
-#else
-        STORE2(o64 >> 56, o64 >> 24);
-#endif /* IMG_TYPE != 1 */
-#endif /* _NO_LONGLONG */
-#endif /* __sparc */
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      for (; i < wid; i++) {
-        p00 = buff0[i];     p10 = buff1[i];     p20 = buff2[i];
-        p01 = buff0[i + 1]; p11 = buff1[i + 1]; p21 = buff2[i + 1];
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2];
-
-        buffi[i] = (mlib_s32)sp[0];
-        buff3[i + dx_l] = (FTYPE)buffi[i];
-
-#ifndef __sparc
-
-        d0 = D2I(p00 * k0 + p01 * k1 + p02 * k2 + p10 * k3 + p11 * k4 +
-                 p12 * k5 + p20 * k6 + p21 * k7 + p22 * k8);
-
-        dp[0] = FROM_S32(d0);
-
-#else  /* __sparc */
-
-        buffo[i] = D2I(p00 * k0 + p01 * k1 + p02 * k2 + p10 * k3 + p11 * k4 +
-                       p12 * k5 + p20 * k6 + p21 * k7 + p22 * k8);
-#if IMG_TYPE != 1
-        dp[0] = FROM_S32(buffo[i]);
-#else
-        dp[0] = buffo[i] >> 24;
-#endif /* IMG_TYPE != 1 */
-#endif /* __sparc */
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      for (; i < swid; i++) {
-        buffi[i] = (mlib_s32)sp[0];
-        buff3[i + dx_l] = (FTYPE)buffi[i];
-        sp += chan1;
-      }
-
-      for (i = 0; i < dx_l; i++) buff3[i] = buff3[dx_l];
-      for (i = 0; i < dx_r; i++) buff3[swid + dx_l + i] = buff3[swid + dx_l - 1];
-
-      if (j < hgt - dy_b - 2) sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buff3;
-      buff3 = buffT;
-    }
-  }
-
-#ifdef __sparc
-#if IMG_TYPE == 1
-  {
-    mlib_s32 amask = (1 << nchannel) - 1;
-
-    if ((cmask & amask) != amask) {
-      mlib_ImageXor80(adr_dst, wid, hgt, dll, nchannel, cmask);
-    } else {
-      mlib_ImageXor80_aa(adr_dst, wid*nchannel, hgt, dll);
-    }
-  }
-
-#endif /* IMG_TYPE == 1 */
-#endif /* __sparc */
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#ifndef __sparc /* for x86, using integer multiplies is faster */
-
-mlib_status CONV_FUNC_I(3x3)
-{
-  DTYPE    *adr_src, *sl, *sp0, *sp1, *sp2, *sp_1, *sp_2;
-  DTYPE    *adr_dst, *dl, *dp;
-  mlib_s32 wid, hgt, sll, dll;
-  mlib_s32 nchannel, chan1, chan2, delta_chan;
-  mlib_s32 i, j, c;
-  mlib_s32 shift1, shift2;
-  mlib_s32 k0, k1, k2, k3, k4, k5, k6, k7, k8;
-  mlib_s32 p02, p03,
-           p12, p13,
-           p22, p23;
-
-#if IMG_TYPE != 1
-  shift1 = 16;
-#else
-  shift1 = 8;
-#endif /* IMG_TYPE != 1 */
-
-  shift2 = scalef_expon - shift1;
-
-  /* keep kernel in regs */
-  k0 = kern[0] >> shift1;  k1 = kern[1] >> shift1;  k2 = kern[2] >> shift1;
-  k3 = kern[3] >> shift1;  k4 = kern[4] >> shift1;  k5 = kern[5] >> shift1;
-  k6 = kern[6] >> shift1;  k7 = kern[7] >> shift1;  k8 = kern[8] >> shift1;
-
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-  delta_chan = 0;
-
-  if ((1 > dx_l) && (1 < wid + KSIZE1 - dx_r)) delta_chan = chan1;
-
-  for (c = 0; c < chan1; c++) {
-    if (!(cmask & (1 << (chan1 - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    sp_1 = sl;
-
-    if ((1 > dy_t) && (1 < hgt + KSIZE1 - dy_b)) sl += sll;
-    sp_2 = sl;
-
-    if ((hgt - dy_b) > 0) sl += sll;
-
-    for (j = 0; j < hgt; j++) {
-      mlib_s32 s0, s1;
-      mlib_s32 pix0, pix1;
-
-      dp  = dl;
-      sp0 = sp_1;
-      sp_1 = sp_2;
-      sp_2 = sl;
-
-      sp1 = sp_1;
-      sp2 = sp_2;
-
-      p02 = sp0[0];
-      p12 = sp1[0];
-      p22 = sp2[0];
-
-      p03 = sp0[delta_chan];
-      p13 = sp1[delta_chan];
-      p23 = sp2[delta_chan];
-
-      s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-      s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-      sp0 += (chan1 + delta_chan);
-      sp1 += (chan1 + delta_chan);
-      sp2 += (chan1 + delta_chan);
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - dx_r - 2); i += 2) {
-        p02 = sp0[0];     p12 = sp1[0];     p22 = sp2[0];
-        p03 = sp0[chan1]; p13 = sp1[chan1]; p23 = sp2[chan1];
-
-        pix0 = (s0 + p02 * k2 + p12 * k5 + p22 * k8) >> shift2;
-        pix1 = (s1 + p02 * k1 + p03 * k2 + p12 * k4 +
-                p13 * k5 + p22 * k7 + p23 * k8) >> shift2;
-
-        CLAMP_STORE(dp[0],     pix0);
-        CLAMP_STORE(dp[chan1], pix1);
-
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-        sp0 += chan2;
-        sp1 += chan2;
-        sp2 += chan2;
-        dp += chan2;
-      }
-
-      p02 = p03; p12 = p13; p22 = p23;
-
-      for (; i < wid - dx_r; i++) {
-        p03 = sp0[0]; p13 = sp1[0]; p23 = sp2[0];
-        pix0 = (s0 + p03 * k2 + p13 * k5 + p23 * k8) >> shift2;
-        CLAMP_STORE(dp[0], pix0);
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        p02 = p03; p12 = p13; p22 = p23;
-        sp0 += chan1;
-        sp1 += chan1;
-        sp2 += chan1;
-        dp += chan1;
-      }
-
-      sp0 -= chan1;
-      sp1 -= chan1;
-      sp2 -= chan1;
-
-      for (; i < wid; i++) {
-        p03 = sp0[0]; p13 = sp1[0]; p23 = sp2[0];
-        pix0 = (s0 + p03 * k2 + p13 * k5 + p23 * k8) >> shift2;
-        CLAMP_STORE(dp[0], pix0);
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        p02 = p03; p12 = p13; p22 = p23;
-        dp += chan1;
-      }
-
-      if (j < hgt - dy_b - 1) sl += sll;
-      dl += dll;
-    }
-  }
-
-  return MLIB_SUCCESS;
-}
-
-#endif /* __sparc ( for x86, using integer multiplies is faster ) */
-
-/***************************************************************/
-#undef  KSIZE
-#define KSIZE 4
-
-mlib_status CONV_FUNC(4x4)
-{
-  FTYPE    buff[(KSIZE + 3)*BUFF_LINE];
-  FTYPE    *buff0, *buff1, *buff2, *buff3, *buff4, *buffd, *buffT;
-  FTYPE    k[KSIZE*KSIZE];
-  mlib_s32 d0, d1;
-  FTYPE    k0, k1, k2, k3, k4, k5, k6, k7;
-  FTYPE    p00, p01, p02, p03, p04,
-           p10, p11, p12, p13, p14,
-           p20, p21, p22, p23,
-           p30, p31, p32, p33;
-  DEF_VARS(DTYPE);
-  DTYPE *sl2, *sl3;
-  LOAD_KERNEL(KSIZE*KSIZE);
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  swid = wid + KSIZE1;
-
-  if (swid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 3)*sizeof(FTYPE   )*swid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buff0 = pbuff;
-  buff1 = buff0 + swid;
-  buff2 = buff1 + swid;
-  buff3 = buff2 + swid;
-  buff4 = buff3 + swid;
-  buffd = buff4 + swid;
-  buffo = (mlib_s32*)(buffd + swid);
-  buffi = buffo + (swid &~ 1);
-
-  swid -= (dx_l + dx_r);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    if ((1 > dy_t) && (1 < hgt + KSIZE1 - dy_b)) sl1 = sl + sll;
-    else sl1 = sl;
-
-    if ((2 > dy_t) && (2 < hgt + KSIZE1 - dy_b)) sl2 = sl1 + sll;
-    else sl2 = sl1;
-
-    if ((hgt - dy_b) > 0) sl3 = sl2 + sll;
-    else sl3 = sl2;
-
-    for (i = 0; i < dx_l; i++) {
-      buff0[i] = (FTYPE)sl[0];
-      buff1[i] = (FTYPE)sl1[0];
-      buff2[i] = (FTYPE)sl2[0];
-      buff3[i] = (FTYPE)sl3[0];
-    }
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < swid; i++) {
-      buff0[i + dx_l] = (FTYPE)sl[i*chan1];
-      buff1[i + dx_l] = (FTYPE)sl1[i*chan1];
-      buff2[i + dx_l] = (FTYPE)sl2[i*chan1];
-      buff3[i + dx_l] = (FTYPE)sl3[i*chan1];
-    }
-
-    for (i = 0; i < dx_r; i++) {
-      buff0[swid + dx_l + i] = buff0[swid + dx_l - 1];
-      buff1[swid + dx_l + i] = buff1[swid + dx_l - 1];
-      buff2[swid + dx_l + i] = buff2[swid + dx_l - 1];
-      buff3[swid + dx_l + i] = buff3[swid + dx_l - 1];
-    }
-
-    if ((hgt - dy_b) > 1) sl = sl3 + sll;
-    else sl = sl3;
-
-    for (j = 0; j < hgt; j++) {
-      d64_2x32 dd;
-
-      /*
-       *  First loop on two first lines of kernel
-       */
-      k0 = k[0]; k1 = k[1]; k2 = k[2]; k3 = k[3];
-      k4 = k[4]; k5 = k[5]; k6 = k[6]; k7 = k[7];
-
-      sp = sl;
-      dp = dl;
-
-      p02 = buff0[0];
-      p12 = buff1[0];
-      p03 = buff0[1];
-      p13 = buff1[1];
-      p04 = buff0[2];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = buff1[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3];
-        p04 = buff0[i + 4]; p14 = buff1[i + 4];
-
-        LOAD_BUFF(buffi);
-
-        dd.d64 = *(FTYPE   *)(buffi + i);
-        buff4[i + dx_l    ] = (FTYPE)dd.i32s.i0;
-        buff4[i + dx_l + 1] = (FTYPE)dd.i32s.i1;
-
-        buffd[i    ] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 +
-                        p10 * k4 + p11 * k5 + p12 * k6 + p13 * k7);
-        buffd[i + 1] = (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 +
-                        p11 * k4 + p12 * k5 + p13 * k6 + p14 * k7);
-
-        sp += chan2;
-      }
-
-      /*
-       *  Second loop on two last lines of kernel
-       */
-      k0 = k[ 8]; k1 = k[ 9]; k2 = k[10]; k3 = k[11];
-      k4 = k[12]; k5 = k[13]; k6 = k[14]; k7 = k[15];
-
-      p02 = buff2[0];
-      p12 = buff3[0];
-      p03 = buff2[1];
-      p13 = buff3[1];
-      p04 = buff2[2];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = buff3[i + 2];
-        p03 = buff2[i + 3]; p13 = buff3[i + 3];
-        p04 = buff2[i + 4]; p14 = buff3[i + 4];
-
-        d0 = D2I(p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 +
-                 p10 * k4 + p11 * k5 + p12 * k6 + p13 * k7 + buffd[i]);
-        d1 = D2I(p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 +
-                 p11 * k4 + p12 * k5 + p13 * k6 + p14 * k7 + buffd[i + 1]);
-
-        dp[0    ] = FROM_S32(d0);
-        dp[chan1] = FROM_S32(d1);
-
-        dp += chan2;
-      }
-
-      /* last pixels */
-      for (; i < wid; i++) {
-        p00 = buff0[i];     p10 = buff1[i];     p20 = buff2[i];     p30 = buff3[i];
-        p01 = buff0[i + 1]; p11 = buff1[i + 1]; p21 = buff2[i + 1]; p31 = buff3[i + 1];
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2]; p32 = buff3[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3]; p23 = buff2[i + 3]; p33 = buff3[i + 3];
-
-        buff4[i + dx_l] = (FTYPE)sp[0];
-
-        buffo[i] = D2I(p00 * k[0] + p01 * k[1] + p02 * k[2] + p03 * k[3] +
-                       p10 * k[4] + p11 * k[5] + p12 * k[6] + p13 * k[7] +
-                       p20 * k[ 8] + p21 * k[ 9] + p22 * k[10] + p23 * k[11] +
-                       p30 * k[12] + p31 * k[13] + p32 * k[14] + p33 * k[15]);
-
-        dp[0] = FROM_S32(buffo[i]);
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      for (; i < swid; i++) {
-        buff4[i + dx_l] = (FTYPE)sp[0];
-        sp += chan1;
-      }
-
-      for (i = 0; i < dx_l; i++) buff4[i] = buff4[dx_l];
-      for (i = 0; i < dx_r; i++) buff4[swid + dx_l + i] = buff4[swid + dx_l - 1];
-
-      /* next line */
-
-      if (j < hgt - dy_b - 2) sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buff3;
-      buff3 = buff4;
-      buff4 = buffT;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  KSIZE
-#define KSIZE 5
-
-mlib_status CONV_FUNC(5x5)
-{
-  FTYPE    buff[(KSIZE + 3)*BUFF_LINE];
-  FTYPE    *buff0, *buff1, *buff2, *buff3, *buff4, *buff5, *buffd, *buffT;
-  FTYPE    k[KSIZE*KSIZE];
-  mlib_s32 d0, d1;
-  FTYPE    k0, k1, k2, k3, k4, k5, k6, k7, k8, k9;
-  FTYPE    p00, p01, p02, p03, p04, p05,
-           p10, p11, p12, p13, p14, p15,
-           p20, p21, p22, p23, p24,
-           p30, p31, p32, p33, p34,
-           p40, p41, p42, p43, p44;
-  DEF_VARS(DTYPE);
-  DTYPE *sl2, *sl3, *sl4;
-  LOAD_KERNEL(KSIZE*KSIZE);
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  swid = wid + KSIZE1;
-
-  if (swid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 3)*sizeof(FTYPE   )*swid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buff0 = pbuff;
-  buff1 = buff0 + swid;
-  buff2 = buff1 + swid;
-  buff3 = buff2 + swid;
-  buff4 = buff3 + swid;
-  buff5 = buff4 + swid;
-  buffd = buff5 + swid;
-  buffo = (mlib_s32*)(buffd + swid);
-  buffi = buffo + (swid &~ 1);
-
-  swid -= (dx_l + dx_r);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    if ((1 > dy_t) && (1 < hgt + KSIZE1 - dy_b)) sl1 = sl + sll;
-    else sl1 = sl;
-
-    if ((2 > dy_t) && (2 < hgt + KSIZE1 - dy_b)) sl2 = sl1 + sll;
-    else sl2 = sl1;
-
-    if ((3 > dy_t) && (3 < hgt + KSIZE1 - dy_b)) sl3 = sl2 + sll;
-    else sl3 = sl2;
-
-    if ((hgt - dy_b) > 0) sl4 = sl3 + sll;
-    else sl4 = sl3;
-
-    for (i = 0; i < dx_l; i++) {
-      buff0[i] = (FTYPE)sl[0];
-      buff1[i] = (FTYPE)sl1[0];
-      buff2[i] = (FTYPE)sl2[0];
-      buff3[i] = (FTYPE)sl3[0];
-      buff4[i] = (FTYPE)sl4[0];
-    }
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < swid; i++) {
-      buff0[i + dx_l] = (FTYPE)sl[i*chan1];
-      buff1[i + dx_l] = (FTYPE)sl1[i*chan1];
-      buff2[i + dx_l] = (FTYPE)sl2[i*chan1];
-      buff3[i + dx_l] = (FTYPE)sl3[i*chan1];
-      buff4[i + dx_l] = (FTYPE)sl4[i*chan1];
-    }
-
-    for (i = 0; i < dx_r; i++) {
-      buff0[swid + dx_l + i] = buff0[swid + dx_l - 1];
-      buff1[swid + dx_l + i] = buff1[swid + dx_l - 1];
-      buff2[swid + dx_l + i] = buff2[swid + dx_l - 1];
-      buff3[swid + dx_l + i] = buff3[swid + dx_l - 1];
-      buff4[swid + dx_l + i] = buff4[swid + dx_l - 1];
-    }
-
-    if ((hgt - dy_b) > 1) sl = sl4 + sll;
-    else sl = sl4;
-
-    for (j = 0; j < hgt; j++) {
-      d64_2x32 dd;
-
-      /*
-       *  First loop
-       */
-      k0 = k[0]; k1 = k[1]; k2 = k[2]; k3 = k[3]; k4 = k[4];
-      k5 = k[5]; k6 = k[6]; k7 = k[7]; k8 = k[8]; k9 = k[9];
-
-      sp = sl;
-      dp = dl;
-
-      p02 = buff0[0];
-      p12 = buff1[0];
-      p03 = buff0[1];
-      p13 = buff1[1];
-      p04 = buff0[2];
-      p14 = buff1[2];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-
-        LOAD_BUFF(buffi);
-
-        p03 = buff0[i + 3]; p13 = buff1[i + 3];
-        p04 = buff0[i + 4]; p14 = buff1[i + 4];
-        p05 = buff0[i + 5]; p15 = buff1[i + 5];
-
-        buffd[i    ] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                        p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        buffd[i + 1] = (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                        p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp += chan2;
-      }
-
-      /*
-       *  Second loop
-       */
-      k0 = k[10]; k1 = k[11]; k2 = k[12]; k3 = k[13]; k4 = k[14];
-      k5 = k[15]; k6 = k[16]; k7 = k[17]; k8 = k[18]; k9 = k[19];
-
-      p02 = buff2[0];
-      p12 = buff3[0];
-      p03 = buff2[1];
-      p13 = buff3[1];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-
-        p02 = buff2[i + 2]; p12 = buff3[i + 2];
-        p03 = buff2[i + 3]; p13 = buff3[i + 3];
-        p04 = buff2[i + 4]; p14 = buff3[i + 4];
-        p05 = buff2[i + 5]; p15 = buff3[i + 5];
-
-        dd.d64 = *(FTYPE   *)(buffi + i);
-        buff5[i + dx_l    ] = (FTYPE)dd.i32s.i0;
-        buff5[i + dx_l + 1] = (FTYPE)dd.i32s.i1;
-
-        buffd[i    ] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                         p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        buffd[i + 1] += (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                         p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-      }
-
-      /*
-       *  3 loop
-       */
-      k0 = k[20]; k1 = k[21]; k2 = k[22]; k3 = k[23]; k4 = k[24];
-
-      p02 = buff4[0];
-      p03 = buff4[1];
-      p04 = buff4[2];
-      p05 = buff4[3];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p01 = p03; p02 = p04; p03 = p05;
-
-        p04 = buff4[i + 4]; p05 = buff4[i + 5];
-
-        d0 = D2I(p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 + buffd[i]);
-        d1 = D2I(p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 + buffd[i + 1]);
-
-        dp[0    ] = FROM_S32(d0);
-        dp[chan1] = FROM_S32(d1);
-
-        dp += chan2;
-      }
-
-      /* last pixels */
-      for (; i < wid; i++) {
-        p00 = buff0[i];     p10 = buff1[i];     p20 = buff2[i];     p30 = buff3[i];
-        p01 = buff0[i + 1]; p11 = buff1[i + 1]; p21 = buff2[i + 1]; p31 = buff3[i + 1];
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2]; p32 = buff3[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3]; p23 = buff2[i + 3]; p33 = buff3[i + 3];
-        p04 = buff0[i + 4]; p14 = buff1[i + 4]; p24 = buff2[i + 4]; p34 = buff3[i + 4];
-
-        p40 = buff4[i];     p41 = buff4[i + 1]; p42 = buff4[i + 2];
-        p43 = buff4[i + 3]; p44 = buff4[i + 4];
-
-        buff5[i + dx_l] = (FTYPE)sp[0];
-
-        buffo[i] = D2I(p00 * k[0] + p01 * k[1] + p02 * k[2] + p03 * k[3] + p04 * k[4] +
-                       p10 * k[5] + p11 * k[6] + p12 * k[7] + p13 * k[8] + p14 * k[9] +
-                       p20 * k[10] + p21 * k[11] + p22 * k[12] + p23 * k[13] + p24 * k[14] +
-                       p30 * k[15] + p31 * k[16] + p32 * k[17] + p33 * k[18] + p34 * k[19] +
-                       p40 * k[20] + p41 * k[21] + p42 * k[22] + p43 * k[23] + p44 * k[24]);
-
-        dp[0] = FROM_S32(buffo[i]);
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      for (; i < swid; i++) {
-        buff5[i + dx_l] = (FTYPE)sp[0];
-        sp += chan1;
-      }
-
-      for (i = 0; i < dx_l; i++) buff5[i] = buff5[dx_l];
-      for (i = 0; i < dx_r; i++) buff5[swid + dx_l + i] = buff5[swid + dx_l - 1];
-
-      /* next line */
-
-      if (j < hgt - dy_b - 2) sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buff3;
-      buff3 = buff4;
-      buff4 = buff5;
-      buff5 = buffT;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#ifndef __sparc /* for x86, using integer multiplies is faster */
-
-mlib_status CONV_FUNC_I(5x5)
-{
-  mlib_s32 buff[BUFF_LINE];
-  mlib_s32 *buffd;
-  mlib_s32 k[KSIZE*KSIZE];
-  mlib_s32 shift1, shift2;
-  mlib_s32 k0, k1, k2, k3, k4, k5, k6, k7, k8, k9;
-  mlib_s32 p00, p01, p02, p03, p04, p05,
-           p10, p11, p12, p13, p14, p15;
-  DTYPE    *adr_src, *sl, *sp0, *sp1, *sp2, *sp3, *sp4;
-  DTYPE    *sp_1, *sp_2, *sp_3, *sp_4;
-  DTYPE    *adr_dst, *dl, *dp;
-  mlib_s32 *pbuff = buff;
-  mlib_s32 wid, hgt, sll, dll;
-  mlib_s32 nchannel, chan1, chan2, chan4;
-  mlib_s32 delta_chan1, delta_chan2, delta_chan3;
-  mlib_s32 i, j, c;
-
-#if IMG_TYPE != 1
-  shift1 = 16;
-#else
-  shift1 = 8;
-#endif /* IMG_TYPE != 1 */
-
-  shift2 = scalef_expon - shift1;
-
-  for (j = 0; j < KSIZE*KSIZE; j++) k[j] = kern[j] >> shift1;
-
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  if (wid > BUFF_LINE) {
-    pbuff = mlib_malloc(sizeof(mlib_s32)*wid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buffd = pbuff;
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  if ((1 > dx_l) && (1 < wid + KSIZE1 - dx_r)) delta_chan1 = chan1;
-  else delta_chan1 = 0;
-
-  if ((2 > dx_l) && (2 < wid + KSIZE1 - dx_r)) delta_chan2 = delta_chan1 + chan1;
-  else delta_chan2 = delta_chan1;
-
-  if ((3 > dx_l) && (3 < wid + KSIZE1 - dx_r)) delta_chan3 = delta_chan2 + chan1;
-  else delta_chan3 = delta_chan2;
-
-  chan4 = chan1 + delta_chan3;
-
-  for (c = 0; c < chan1; c++) {
-    if (!(cmask & (1 << (chan1 - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    sp_1 = sl;
-
-    if ((1 > dy_t) && (1 < hgt + KSIZE1 - dy_b)) sl += sll;
-    sp_2 = sl;
-
-    if ((2 > dy_t) && (2 < hgt + KSIZE1 - dy_b)) sl += sll;
-    sp_3 = sl;
-
-    if ((3 > dy_t) && (3 < hgt + KSIZE1 - dy_b)) sl += sll;
-    sp_4 = sl;
-
-    if ((hgt - dy_b) > 0) sl += sll;
-
-    for (j = 0; j < hgt; j++) {
-      mlib_s32 pix0, pix1;
-
-      dp  = dl;
-      sp0 = sp_1;
-      sp_1 = sp_2;
-      sp_2 = sp_3;
-      sp_3 = sp_4;
-      sp_4 = sl;
-
-      sp1 = sp_1;
-      sp2 = sp_2;
-      sp3 = sp_3;
-      sp4 = sp_4;
-
-      /*
-       *  First loop
-       */
-
-      k0 = k[0]; k1 = k[1]; k2 = k[2]; k3 = k[3]; k4 = k[4];
-      k5 = k[5]; k6 = k[6]; k7 = k[7]; k8 = k[8]; k9 = k[9];
-
-      p02 = sp0[0];           p12 = sp1[0];
-      p03 = sp0[delta_chan1]; p13 = sp1[delta_chan1];
-      p04 = sp0[delta_chan2]; p14 = sp1[delta_chan2];
-      p05 = sp0[delta_chan3]; p15 = sp1[delta_chan3];
-
-      sp0 += chan4;
-      sp1 += chan4;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - dx_r - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = p05; p13 = p15;
-
-        p04 = sp0[0];     p14 = sp1[0];
-        p05 = sp0[chan1]; p15 = sp1[chan1];
-
-        buffd[i    ] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                        p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        buffd[i + 1] = (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                        p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp0 += chan2;
-        sp1 += chan2;
-      }
-
-      p01 = p02; p02 = p03; p03 = p04; p04 = p05;
-      p11 = p12; p12 = p13; p13 = p14; p14 = p15;
-
-      for (; i < wid - dx_r; i++) {
-        p00 = p01; p10 = p11;
-        p01 = p02; p11 = p12;
-        p02 = p03; p12 = p13;
-        p03 = p04; p13 = p14;
-
-        p04 = sp0[0];     p14 = sp1[0];
-
-        buffd[i] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                    p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-
-        sp0 += chan1;
-        sp1 += chan1;
-      }
-
-      sp0 -= chan1;
-      sp1 -= chan1;
-
-      for (; i < wid; i++) {
-        p00 = p01; p10 = p11;
-        p01 = p02; p11 = p12;
-        p02 = p03; p12 = p13;
-        p03 = p04; p13 = p14;
-
-        p04 = sp0[0];     p14 = sp1[0];
-
-        buffd[i] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                    p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-      }
-
-      /*
-       *  Second loop
-       */
-
-      k0 = k[10]; k1 = k[11]; k2 = k[12]; k3 = k[13]; k4 = k[14];
-      k5 = k[15]; k6 = k[16]; k7 = k[17]; k8 = k[18]; k9 = k[19];
-
-      p02 = sp2[0];           p12 = sp3[0];
-      p03 = sp2[delta_chan1]; p13 = sp3[delta_chan1];
-      p04 = sp2[delta_chan2]; p14 = sp3[delta_chan2];
-      p05 = sp2[delta_chan3]; p15 = sp3[delta_chan3];
-
-      sp2 += chan4;
-      sp3 += chan4;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - dx_r - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = p05; p13 = p15;
-
-        p04 = sp2[0];     p14 = sp3[0];
-        p05 = sp2[chan1]; p15 = sp3[chan1];
-
-        buffd[i    ] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                         p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        buffd[i + 1] += (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                         p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp2 += chan2;
-        sp3 += chan2;
-      }
-
-      p01 = p02; p02 = p03; p03 = p04; p04 = p05;
-      p11 = p12; p12 = p13; p13 = p14; p14 = p15;
-
-      for (; i < wid - dx_r; i++) {
-        p00 = p01; p10 = p11;
-        p01 = p02; p11 = p12;
-        p02 = p03; p12 = p13;
-        p03 = p04; p13 = p14;
-
-        p04 = sp2[0];     p14 = sp3[0];
-
-        buffd[i] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                     p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-
-        sp2 += chan1;
-        sp3 += chan1;
-      }
-
-      sp2 -= chan1;
-      sp3 -= chan1;
-
-      for (; i < wid; i++) {
-        p00 = p01; p10 = p11;
-        p01 = p02; p11 = p12;
-        p02 = p03; p12 = p13;
-        p03 = p04; p13 = p14;
-
-        p04 = sp2[0];     p14 = sp3[0];
-
-        buffd[i] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                     p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-      }
-
-      /*
-       *  3 loop
-       */
-
-      k0 = k[20]; k1 = k[21]; k2 = k[22]; k3 = k[23]; k4 = k[24];
-
-      p02 = sp4[0];
-      p03 = sp4[delta_chan1];
-      p04 = sp4[delta_chan2];
-      p05 = sp4[delta_chan3];
-
-      sp4 += chan4;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - dx_r - 2); i += 2) {
-        p00 = p02; p01 = p03; p02 = p04; p03 = p05;
-
-        p04 = sp4[0]; p05 = sp4[chan1];
-
-        pix0 = (buffd[i    ] + p00 * k0 + p01 * k1 + p02 * k2 +
-                p03 * k3 + p04 * k4) >> shift2;
-        pix1 = (buffd[i + 1] + p01 * k0 + p02 * k1 + p03 * k2 +
-                p04 * k3 + p05 * k4) >> shift2;
-
-        CLAMP_STORE(dp[0],     pix0);
-        CLAMP_STORE(dp[chan1], pix1);
-
-        dp  += chan2;
-        sp4 += chan2;
-      }
-
-      p01 = p02; p02 = p03; p03 = p04; p04 = p05;
-
-      for (; i < wid - dx_r; i++) {
-        p00 = p01; p01 = p02; p02 = p03; p03 = p04;
-
-        p04 = sp4[0];
-
-        pix0 = (buffd[i    ] + p00 * k0 + p01 * k1 + p02 * k2 +
-                p03 * k3 + p04 * k4) >> shift2;
-        CLAMP_STORE(dp[0],     pix0);
-
-        dp  += chan1;
-        sp4 += chan1;
-      }
-
-      sp4 -= chan1;
-
-      for (; i < wid; i++) {
-        p00 = p01; p01 = p02; p02 = p03; p03 = p04;
-
-        p04 = sp4[0];
-
-        pix0 = (buffd[i    ] + p00 * k0 + p01 * k1 + p02 * k2 +
-                p03 * k3 + p04 * k4) >> shift2;
-        CLAMP_STORE(dp[0],     pix0);
-
-        dp  += chan1;
-      }
-
-      /* next line */
-
-      if (j < hgt - dy_b - 1) sl += sll;
-      dl += dll;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-#endif /* __sparc ( for x86, using integer multiplies is faster ) */
-
-/***************************************************************/
-#if IMG_TYPE == 1
-
-#undef  KSIZE
-#define KSIZE 7
-
-mlib_status CONV_FUNC(7x7)
-{
-  FTYPE    buff[(KSIZE + 3)*BUFF_LINE], *buffs[2*(KSIZE + 1)], *buffd;
-  FTYPE    k[KSIZE*KSIZE];
-  mlib_s32 l, m, buff_ind;
-  mlib_s32 d0, d1;
-  FTYPE    k0, k1, k2, k3, k4, k5, k6;
-  FTYPE    p0, p1, p2, p3, p4, p5, p6, p7;
-  DTYPE *sl2, *sl3, *sl4, *sl5, *sl6;
-  DEF_VARS(DTYPE);
-  LOAD_KERNEL(KSIZE*KSIZE);
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  swid = wid + KSIZE1;
-
-  if (wid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 3)*sizeof(FTYPE   )*wid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  for (l = 0; l < KSIZE + 1; l++) buffs[l] = pbuff + l*swid;
-  for (l = 0; l < KSIZE + 1; l++) buffs[l + (KSIZE + 1)] = buffs[l];
-  buffd = buffs[KSIZE] + swid;
-  buffo = (mlib_s32*)(buffd + swid);
-  buffi = buffo + (swid &~ 1);
-
-  swid -= (dx_l + dx_r);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    if ((1 > dy_t) && (1 < hgt + KSIZE1 - dy_b)) sl1 = sl + sll;
-    else sl1 = sl;
-
-    if ((2 > dy_t) && (2 < hgt + KSIZE1 - dy_b)) sl2 = sl1 + sll;
-    else sl2 = sl1;
-
-    if ((3 > dy_t) && (3 < hgt + KSIZE1 - dy_b)) sl3 = sl2 + sll;
-    else sl3 = sl2;
-
-    if ((4 > dy_t) && (4 < hgt + KSIZE1 - dy_b)) sl4 = sl3 + sll;
-    else sl4 = sl3;
-
-    if ((5 > dy_t) && (5 < hgt + KSIZE1 - dy_b)) sl5 = sl4 + sll;
-    else sl5 = sl4;
-
-    if ((hgt - dy_b) > 0) sl6 = sl5 + sll;
-    else sl6 = sl5;
-
-    for (i = 0; i < dx_l; i++) {
-      buffs[0][i] = (FTYPE)sl[0];
-      buffs[1][i] = (FTYPE)sl1[0];
-      buffs[2][i] = (FTYPE)sl2[0];
-      buffs[3][i] = (FTYPE)sl3[0];
-      buffs[4][i] = (FTYPE)sl4[0];
-      buffs[5][i] = (FTYPE)sl5[0];
-      buffs[6][i] = (FTYPE)sl6[0];
-    }
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < swid; i++) {
-      buffs[0][i + dx_l] = (FTYPE)sl[i*chan1];
-      buffs[1][i + dx_l] = (FTYPE)sl1[i*chan1];
-      buffs[2][i + dx_l] = (FTYPE)sl2[i*chan1];
-      buffs[3][i + dx_l] = (FTYPE)sl3[i*chan1];
-      buffs[4][i + dx_l] = (FTYPE)sl4[i*chan1];
-      buffs[5][i + dx_l] = (FTYPE)sl5[i*chan1];
-      buffs[6][i + dx_l] = (FTYPE)sl6[i*chan1];
-    }
-
-    for (i = 0; i < dx_r; i++) {
-      buffs[0][swid + dx_l + i] = buffs[0][swid + dx_l - 1];
-      buffs[1][swid + dx_l + i] = buffs[1][swid + dx_l - 1];
-      buffs[2][swid + dx_l + i] = buffs[2][swid + dx_l - 1];
-      buffs[3][swid + dx_l + i] = buffs[3][swid + dx_l - 1];
-      buffs[4][swid + dx_l + i] = buffs[4][swid + dx_l - 1];
-      buffs[5][swid + dx_l + i] = buffs[5][swid + dx_l - 1];
-      buffs[6][swid + dx_l + i] = buffs[6][swid + dx_l - 1];
-    }
-
-    buff_ind = 0;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid; i++) buffd[i] = 0.0;
-
-    if ((hgt - dy_b) > 1) sl = sl6 + sll;
-    else sl = sl6;
-
-    for (j = 0; j < hgt; j++) {
-      FTYPE    **buffc = buffs + buff_ind;
-      FTYPE    *buffn = buffc[KSIZE];
-      FTYPE    *pk = k;
-
-      for (l = 0; l < KSIZE; l++) {
-        FTYPE    *buff = buffc[l];
-        d64_2x32 dd;
-
-        sp = sl;
-        dp = dl;
-
-        p2 = buff[0]; p3 = buff[1]; p4 = buff[2];
-        p5 = buff[3]; p6 = buff[4]; p7 = buff[5];
-
-        k0 = *pk++; k1 = *pk++; k2 = *pk++; k3 = *pk++;
-        k4 = *pk++; k5 = *pk++; k6 = *pk++;
-
-        if (l < (KSIZE - 1)) {
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-          for (i = 0; i <= (wid - 2); i += 2) {
-            p0 = p2; p1 = p3; p2 = p4; p3 = p5; p4 = p6; p5 = p7;
-
-            p6 = buff[i + 6]; p7 = buff[i + 7];
-
-            buffd[i    ] += p0*k0 + p1*k1 + p2*k2 + p3*k3 + p4*k4 + p5*k5 + p6*k6;
-            buffd[i + 1] += p1*k0 + p2*k1 + p3*k2 + p4*k3 + p5*k4 + p6*k5 + p7*k6;
-          }
-
-        } else {
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-          for (i = 0; i <= (wid - 2); i += 2) {
-            p0 = p2; p1 = p3; p2 = p4; p3 = p5; p4 = p6; p5 = p7;
-
-            p6 = buff[i + 6]; p7 = buff[i + 7];
-
-            LOAD_BUFF(buffi);
-
-            dd.d64 = *(FTYPE   *)(buffi + i);
-            buffn[i + dx_l    ] = (FTYPE)dd.i32s.i0;
-            buffn[i + dx_l + 1] = (FTYPE)dd.i32s.i1;
-
-            d0 = D2I(p0*k0 + p1*k1 + p2*k2 + p3*k3 + p4*k4 + p5*k5 + p6*k6 + buffd[i    ]);
-            d1 = D2I(p1*k0 + p2*k1 + p3*k2 + p4*k3 + p5*k4 + p6*k5 + p7*k6 + buffd[i + 1]);
-
-            dp[0    ] = FROM_S32(d0);
-            dp[chan1] = FROM_S32(d1);
-
-            buffd[i    ] = 0.0;
-            buffd[i + 1] = 0.0;
-
-            sp += chan2;
-            dp += chan2;
-          }
-        }
-      }
-
-      /* last pixels */
-      for (; i < wid; i++) {
-        FTYPE    *pk = k, s = 0;
-        mlib_s32 d0;
-
-        for (l = 0; l < KSIZE; l++) {
-          FTYPE    *buff = buffc[l] + i;
-
-          for (m = 0; m < KSIZE; m++) s += buff[m] * (*pk++);
-        }
-
-        d0 = D2I(s);
-        dp[0] = FROM_S32(d0);
-
-        buffn[i + dx_l] = (FTYPE)sp[0];
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      for (; i < swid; i++) {
-        buffn[i + dx_l] = (FTYPE)sp[0];
-        sp += chan1;
-      }
-
-      for (i = 0; i < dx_l; i++) buffn[i] = buffn[dx_l];
-      for (i = 0; i < dx_r; i++) buffn[swid + dx_l + i] = buffn[swid + dx_l - 1];
-
-      /* next line */
-
-      if (j < hgt - dy_b - 2) sl += sll;
-      dl += dll;
-
-      buff_ind++;
-
-      if (buff_ind >= KSIZE + 1) buff_ind = 0;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-#endif /* IMG_TYPE == 1 */
-
 /***************************************************************/
 #define MAX_KER   7
 #define MAX_N    15
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16nw.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16nw.c
index 2aebcb86bae..9bfbe939abb 100644
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16nw.c
+++ b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16nw.c
@@ -143,9 +143,6 @@ typedef union {
   } f32s;
 } d64_2x32;
 
-/***************************************************************/
-#define BUFF_LINE 256
-
 /***************************************************************/
 #define DEF_VARS(type)                                          \
   type     *adr_src, *sl, *sp = NULL;                           \
@@ -155,39 +152,6 @@ typedef union {
   mlib_s32 nchannel, chan1;                                     \
   mlib_s32 i, j, c
 
-/***************************************************************/
-#define LOAD_KERNEL3()                                                   \
-  FTYPE    scalef = DSCALE;                                              \
-  FTYPE    k0, k1, k2, k3, k4, k5, k6, k7, k8;                           \
-  FTYPE    p00, p01, p02, p03,                                           \
-           p10, p11, p12, p13,                                           \
-           p20, p21, p22, p23;                                           \
-                                                                         \
-  while (scalef_expon > 30) {                                            \
-    scalef /= (1 << 30);                                                 \
-    scalef_expon -= 30;                                                  \
-  }                                                                      \
-                                                                         \
-  scalef /= (1 << scalef_expon);                                         \
-                                                                         \
-  /* keep kernel in regs */                                              \
-  k0 = scalef * kern[0];  k1 = scalef * kern[1];  k2 = scalef * kern[2]; \
-  k3 = scalef * kern[3];  k4 = scalef * kern[4];  k5 = scalef * kern[5]; \
-  k6 = scalef * kern[6];  k7 = scalef * kern[7];  k8 = scalef * kern[8]
-
-/***************************************************************/
-#define LOAD_KERNEL(SIZE)                                       \
-  FTYPE    scalef = DSCALE;                                     \
-                                                                \
-  while (scalef_expon > 30) {                                   \
-    scalef /= (1 << 30);                                        \
-    scalef_expon -= 30;                                         \
-  }                                                             \
-                                                                \
-  scalef /= (1 << scalef_expon);                                \
-                                                                \
-  for (j = 0; j < SIZE; j++) k[j] = scalef * kern[j]
-
 /***************************************************************/
 #define GET_SRC_DST_PARAMETERS(type)                            \
   hgt = mlib_ImageGetHeight(src);                               \
@@ -245,1162 +209,6 @@ typedef union {
 #endif /* IMG_TYPE == 1 */
 #endif /* __sparc */
 
-/***************************************************************/
-#define KSIZE  3
-
-mlib_status CONV_FUNC(3x3)(mlib_image       *dst,
-                           const mlib_image *src,
-                           const mlib_s32   *kern,
-                           mlib_s32         scalef_expon,
-                           mlib_s32         cmask)
-{
-  FTYPE    buff[(KSIZE + 2)*BUFF_LINE], *buff0, *buff1, *buff2, *buff3, *buffT;
-  DEF_VARS(DTYPE);
-  DTYPE *sl1;
-  mlib_s32 chan2;
-  mlib_s32 *buffo, *buffi;
-  DTYPE *sl2;
-#ifndef __sparc
-  mlib_s32 d0, d1;
-#endif /* __sparc */
-  LOAD_KERNEL3();
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  if (wid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 2)*sizeof(FTYPE)*wid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buff0 = pbuff;
-  buff1 = buff0 + wid;
-  buff2 = buff1 + wid;
-  buff3 = buff2 + wid;
-  buffo = (mlib_s32*)(buff3 + wid);
-  buffi = buffo + (wid &~ 1);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    sl1 = sl  + sll;
-    sl2 = sl1 + sll;
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid + (KSIZE - 1); i++) {
-      buff0[i] = (FTYPE)sl[i*chan1];
-      buff1[i] = (FTYPE)sl1[i*chan1];
-      buff2[i] = (FTYPE)sl2[i*chan1];
-    }
-
-    sl += KSIZE*sll;
-
-    for (j = 0; j < hgt; j++) {
-      FTYPE    s0, s1;
-
-      p02 = buff0[0];
-      p12 = buff1[0];
-      p22 = buff2[0];
-
-      p03 = buff0[1];
-      p13 = buff1[1];
-      p23 = buff2[1];
-
-      s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-      s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-      sp = sl;
-      dp = dl;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-#ifdef __sparc
-#ifdef _NO_LONGLONG
-        mlib_s32 o64_1, o64_2;
-#else /* _NO_LONGLONG */
-        mlib_s64 o64;
-#endif /* _NO_LONGLONG */
-#endif /* __sparc */
-        d64_2x32 dd;
-
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3]; p23 = buff2[i + 3];
-
-        LOAD_BUFF(buffi);
-
-        dd.d64 = *(FTYPE   *)(buffi + i);
-        buff3[i    ] = (FTYPE)dd.i32s.i0;
-        buff3[i + 1] = (FTYPE)dd.i32s.i1;
-
-#ifndef __sparc
-        d0 = D2I(s0 + p02 * k2 + p12 * k5 + p22 * k8);
-        d1 = D2I(s1 + p02 * k1 + p03 * k2 + p12 * k4 + p13 * k5 + p22 * k7 + p23 * k8);
-
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-        dp[0    ] = FROM_S32(d0);
-        dp[chan1] = FROM_S32(d1);
-
-#else /* __sparc */
-
-        dd.i32s.i0 = D2I(s0 + p02 * k2 + p12 * k5 + p22 * k8);
-        dd.i32s.i1 = D2I(s1 + p02 * k1 + p03 * k2 + p12 * k4 + p13 * k5 + p22 * k7 + p23 * k8);
-        *(FTYPE   *)(buffo + i) = dd.d64;
-
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-#ifdef _NO_LONGLONG
-
-        o64_1 = buffo[i];
-        o64_2 = buffo[i+1];
-#if IMG_TYPE != 1
-        STORE2(FROM_S32(o64_1), FROM_S32(o64_2));
-#else
-        STORE2(o64_1 >> 24, o64_2 >> 24);
-#endif /* IMG_TYPE != 1 */
-
-#else /* _NO_LONGLONG */
-
-        o64 = *(mlib_s64*)(buffo + i);
-#if IMG_TYPE != 1
-        STORE2(FROM_S32(o64 >> 32), FROM_S32(o64));
-#else
-        STORE2(o64 >> 56, o64 >> 24);
-#endif /* IMG_TYPE != 1 */
-#endif /* _NO_LONGLONG */
-#endif /* __sparc */
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      for (; i < wid; i++) {
-        p00 = buff0[i];     p10 = buff1[i];     p20 = buff2[i];
-        p01 = buff0[i + 1]; p11 = buff1[i + 1]; p21 = buff2[i + 1];
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2];
-
-        buffi[i] = (mlib_s32)sp[0];
-        buff3[i] = (FTYPE)buffi[i];
-
-#ifndef __sparc
-
-        d0 = D2I(p00 * k0 + p01 * k1 + p02 * k2 + p10 * k3 + p11 * k4 +
-                 p12 * k5 + p20 * k6 + p21 * k7 + p22 * k8);
-
-        dp[0] = FROM_S32(d0);
-
-#else  /* __sparc */
-
-        buffo[i] = D2I(p00 * k0 + p01 * k1 + p02 * k2 + p10 * k3 + p11 * k4 +
-                       p12 * k5 + p20 * k6 + p21 * k7 + p22 * k8);
-#if IMG_TYPE != 1
-        dp[0] = FROM_S32(buffo[i]);
-#else
-        dp[0] = buffo[i] >> 24;
-#endif /* IMG_TYPE != 1 */
-#endif /* __sparc */
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      buffi[wid] = (mlib_s32)sp[0];
-      buff3[wid] = (FTYPE)buffi[wid];
-      buffi[wid + 1] = (mlib_s32)sp[chan1];
-      buff3[wid + 1] = (FTYPE)buffi[wid + 1];
-
-      sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buff3;
-      buff3 = buffT;
-    }
-  }
-
-#ifdef __sparc
-#if IMG_TYPE == 1
-  {
-    mlib_s32 amask = (1 << nchannel) - 1;
-
-    if ((cmask & amask) != amask) {
-      mlib_ImageXor80(adr_dst, wid, hgt, dll, nchannel, cmask);
-    } else {
-      mlib_ImageXor80_aa(adr_dst, wid*nchannel, hgt, dll);
-    }
-  }
-
-#endif /* IMG_TYPE == 1 */
-#endif /* __sparc */
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#ifndef __sparc /* for x86, using integer multiplies is faster */
-
-mlib_status CONV_FUNC_I(3x3)(mlib_image       *dst,
-                             const mlib_image *src,
-                             const mlib_s32   *kern,
-                             mlib_s32         scalef_expon,
-                             mlib_s32         cmask)
-{
-  DTYPE    *adr_src, *sl, *sp0, *sp1, *sp2;
-  DTYPE    *adr_dst, *dl, *dp;
-  mlib_s32 wid, hgt, sll, dll;
-  mlib_s32 nchannel, chan1, chan2;
-  mlib_s32 i, j, c;
-  mlib_s32 shift1, shift2;
-  mlib_s32 k0, k1, k2, k3, k4, k5, k6, k7, k8;
-  mlib_s32 p02, p03,
-           p12, p13,
-           p22, p23;
-
-#if IMG_TYPE != 1
-  shift1 = 16;
-#else
-  shift1 = 8;
-#endif /* IMG_TYPE != 1 */
-
-  shift2 = scalef_expon - shift1;
-
-  /* keep kernel in regs */
-  k0 = kern[0] >> shift1;  k1 = kern[1] >> shift1;  k2 = kern[2] >> shift1;
-  k3 = kern[3] >> shift1;  k4 = kern[4] >> shift1;  k5 = kern[5] >> shift1;
-  k6 = kern[6] >> shift1;  k7 = kern[7] >> shift1;  k8 = kern[8] >> shift1;
-
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  for (c = 0; c < chan1; c++) {
-    if (!(cmask & (1 << (chan1 - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    for (j = 0; j < hgt; j++) {
-      mlib_s32 s0, s1;
-      mlib_s32 pix0, pix1;
-
-      dp  = dl;
-      sp0 = sl;
-      sp1 = sp0 + sll;
-      sp2 = sp1 + sll;
-
-      p02 = sp0[0];
-      p12 = sp1[0];
-      p22 = sp2[0];
-
-      p03 = sp0[chan1];
-      p13 = sp1[chan1];
-      p23 = sp2[chan1];
-
-      s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-      s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-      sp0 += chan2;
-      sp1 += chan2;
-      sp2 += chan2;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p02 = sp0[0];     p12 = sp1[0];     p22 = sp2[0];
-        p03 = sp0[chan1]; p13 = sp1[chan1]; p23 = sp2[chan1];
-
-        pix0 = (s0 + p02 * k2 + p12 * k5 + p22 * k8) >> shift2;
-        pix1 = (s1 + p02 * k1 + p03 * k2 + p12 * k4 +
-                p13 * k5 + p22 * k7 + p23 * k8) >> shift2;
-
-        CLAMP_STORE(dp[0],     pix0);
-        CLAMP_STORE(dp[chan1], pix1);
-
-        s0 = p02 * k0 + p03 * k1 + p12 * k3 + p13 * k4 + p22 * k6 + p23 * k7;
-        s1 = p03 * k0 + p13 * k3 + p23 * k6;
-
-        sp0 += chan2;
-        sp1 += chan2;
-        sp2 += chan2;
-        dp += chan2;
-      }
-
-      if (wid & 1) {
-        p02 = sp0[0]; p12 = sp1[0]; p22 = sp2[0];
-        pix0 = (s0 + p02 * k2 + p12 * k5 + p22 * k8) >> shift2;
-        CLAMP_STORE(dp[0], pix0);
-      }
-
-      sl += sll;
-      dl += dll;
-    }
-  }
-
-  return MLIB_SUCCESS;
-}
-
-#endif /* __sparc ( for x86, using integer multiplies is faster ) */
-
-/***************************************************************/
-#undef  KSIZE
-#define KSIZE 4
-
-mlib_status CONV_FUNC(4x4)(mlib_image       *dst,
-                           const mlib_image *src,
-                           const mlib_s32   *kern,
-                           mlib_s32         scalef_expon,
-                           mlib_s32         cmask)
-{
-  FTYPE    buff[(KSIZE + 3)*BUFF_LINE];
-  FTYPE    *buff0, *buff1, *buff2, *buff3, *buff4, *buffd, *buffT;
-  FTYPE    k[KSIZE*KSIZE];
-  mlib_s32 d0, d1;
-  FTYPE    k0, k1, k2, k3, k4, k5, k6, k7;
-  FTYPE    p00, p01, p02, p03, p04,
-           p10, p11, p12, p13, p14,
-           p20, p21, p22, p23,
-           p30, p31, p32, p33;
-  DEF_VARS(DTYPE);
-  DTYPE *sl1;
-  mlib_s32 chan2;
-  mlib_s32 *buffo, *buffi;
-  DTYPE *sl2, *sl3;
-  LOAD_KERNEL(KSIZE*KSIZE);
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  if (wid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 3)*sizeof(FTYPE)*wid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buff0 = pbuff;
-  buff1 = buff0 + wid;
-  buff2 = buff1 + wid;
-  buff3 = buff2 + wid;
-  buff4 = buff3 + wid;
-  buffd = buff4 + wid;
-  buffo = (mlib_s32*)(buffd + wid);
-  buffi = buffo + (wid &~ 1);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    sl1 = sl  + sll;
-    sl2 = sl1 + sll;
-    sl3 = sl2 + sll;
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid + (KSIZE - 1); i++) {
-      buff0[i] = (FTYPE)sl[i*chan1];
-      buff1[i] = (FTYPE)sl1[i*chan1];
-      buff2[i] = (FTYPE)sl2[i*chan1];
-      buff3[i] = (FTYPE)sl3[i*chan1];
-    }
-
-    sl += KSIZE*sll;
-
-    for (j = 0; j < hgt; j++) {
-      d64_2x32 dd;
-
-      /*
-       *  First loop on two first lines of kernel
-       */
-      k0 = k[0]; k1 = k[1]; k2 = k[2]; k3 = k[3];
-      k4 = k[4]; k5 = k[5]; k6 = k[6]; k7 = k[7];
-
-      sp = sl;
-      dp = dl;
-
-      p02 = buff0[0];
-      p12 = buff1[0];
-      p03 = buff0[1];
-      p13 = buff1[1];
-      p04 = buff0[2];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = buff1[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3];
-        p04 = buff0[i + 4]; p14 = buff1[i + 4];
-
-        LOAD_BUFF(buffi);
-
-        dd.d64 = *(FTYPE   *)(buffi + i);
-        buff4[i    ] = (FTYPE)dd.i32s.i0;
-        buff4[i + 1] = (FTYPE)dd.i32s.i1;
-
-        buffd[i    ] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 +
-                        p10 * k4 + p11 * k5 + p12 * k6 + p13 * k7);
-        buffd[i + 1] = (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 +
-                        p11 * k4 + p12 * k5 + p13 * k6 + p14 * k7);
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      /*
-       *  Second loop on two last lines of kernel
-       */
-      k0 = k[ 8]; k1 = k[ 9]; k2 = k[10]; k3 = k[11];
-      k4 = k[12]; k5 = k[13]; k6 = k[14]; k7 = k[15];
-
-      sp = sl;
-      dp = dl;
-
-      p02 = buff2[0];
-      p12 = buff3[0];
-      p03 = buff2[1];
-      p13 = buff3[1];
-      p04 = buff2[2];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = buff3[i + 2];
-        p03 = buff2[i + 3]; p13 = buff3[i + 3];
-        p04 = buff2[i + 4]; p14 = buff3[i + 4];
-
-        d0 = D2I(p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 +
-                 p10 * k4 + p11 * k5 + p12 * k6 + p13 * k7 + buffd[i]);
-        d1 = D2I(p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 +
-                 p11 * k4 + p12 * k5 + p13 * k6 + p14 * k7 + buffd[i + 1]);
-
-        dp[0    ] = FROM_S32(d0);
-        dp[chan1] = FROM_S32(d1);
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      /* last pixels */
-      for (; i < wid; i++) {
-        p00 = buff0[i];     p10 = buff1[i];     p20 = buff2[i];     p30 = buff3[i];
-        p01 = buff0[i + 1]; p11 = buff1[i + 1]; p21 = buff2[i + 1]; p31 = buff3[i + 1];
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2]; p32 = buff3[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3]; p23 = buff2[i + 3]; p33 = buff3[i + 3];
-
-        buff4[i] = (FTYPE)sp[0];
-
-        buffo[i] = D2I(p00 * k[0] + p01 * k[1] + p02 * k[2] + p03 * k[3] +
-                       p10 * k[4] + p11 * k[5] + p12 * k[6] + p13 * k[7] +
-                       p20 * k[ 8] + p21 * k[ 9] + p22 * k[10] + p23 * k[11] +
-                       p30 * k[12] + p31 * k[13] + p32 * k[14] + p33 * k[15]);
-
-        dp[0] = FROM_S32(buffo[i]);
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      buff4[wid    ] = (FTYPE)sp[0];
-      buff4[wid + 1] = (FTYPE)sp[chan1];
-      buff4[wid + 2] = (FTYPE)sp[chan2];
-
-      /* next line */
-      sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buff3;
-      buff3 = buff4;
-      buff4 = buffT;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  KSIZE
-#define KSIZE 5
-
-mlib_status CONV_FUNC(5x5)(mlib_image       *dst,
-                           const mlib_image *src,
-                           const mlib_s32   *kern,
-                           mlib_s32         scalef_expon,
-                           mlib_s32         cmask)
-{
-  FTYPE    buff[(KSIZE + 3)*BUFF_LINE];
-  FTYPE    *buff0, *buff1, *buff2, *buff3, *buff4, *buff5, *buffd, *buffT;
-  FTYPE    k[KSIZE*KSIZE];
-  mlib_s32 d0, d1;
-  FTYPE    k0, k1, k2, k3, k4, k5, k6, k7, k8, k9;
-  FTYPE    p00, p01, p02, p03, p04, p05,
-           p10, p11, p12, p13, p14, p15,
-           p20, p21, p22, p23, p24,
-           p30, p31, p32, p33, p34,
-           p40, p41, p42, p43, p44;
-  DEF_VARS(DTYPE);
-  DTYPE *sl1;
-  mlib_s32 chan2;
-  mlib_s32 *buffo, *buffi;
-  DTYPE *sl2, *sl3, *sl4;
-  LOAD_KERNEL(KSIZE*KSIZE);
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  if (wid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 3)*sizeof(FTYPE)*wid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buff0 = pbuff;
-  buff1 = buff0 + wid;
-  buff2 = buff1 + wid;
-  buff3 = buff2 + wid;
-  buff4 = buff3 + wid;
-  buff5 = buff4 + wid;
-  buffd = buff5 + wid;
-  buffo = (mlib_s32*)(buffd + wid);
-  buffi = buffo + (wid &~ 1);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    sl1 = sl  + sll;
-    sl2 = sl1 + sll;
-    sl3 = sl2 + sll;
-    sl4 = sl3 + sll;
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid + (KSIZE - 1); i++) {
-      buff0[i] = (FTYPE)sl[i*chan1];
-      buff1[i] = (FTYPE)sl1[i*chan1];
-      buff2[i] = (FTYPE)sl2[i*chan1];
-      buff3[i] = (FTYPE)sl3[i*chan1];
-      buff4[i] = (FTYPE)sl4[i*chan1];
-    }
-
-    sl += KSIZE*sll;
-
-    for (j = 0; j < hgt; j++) {
-      d64_2x32 dd;
-
-      /*
-       *  First loop
-       */
-      k0 = k[0]; k1 = k[1]; k2 = k[2]; k3 = k[3]; k4 = k[4];
-      k5 = k[5]; k6 = k[6]; k7 = k[7]; k8 = k[8]; k9 = k[9];
-
-      sp = sl;
-      dp = dl;
-
-      p02 = buff0[0];
-      p12 = buff1[0];
-      p03 = buff0[1];
-      p13 = buff1[1];
-      p04 = buff0[2];
-      p14 = buff1[2];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-
-        LOAD_BUFF(buffi);
-
-        p03 = buff0[i + 3]; p13 = buff1[i + 3];
-        p04 = buff0[i + 4]; p14 = buff1[i + 4];
-        p05 = buff0[i + 5]; p15 = buff1[i + 5];
-
-        buffd[i    ] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                        p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        buffd[i + 1] = (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                        p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      /*
-       *  Second loop
-       */
-      k0 = k[10]; k1 = k[11]; k2 = k[12]; k3 = k[13]; k4 = k[14];
-      k5 = k[15]; k6 = k[16]; k7 = k[17]; k8 = k[18]; k9 = k[19];
-
-      sp = sl;
-      dp = dl;
-
-      p02 = buff2[0];
-      p12 = buff3[0];
-      p03 = buff2[1];
-      p13 = buff3[1];
-      p04 = buff2[2];
-      p14 = buff3[2];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-
-        p02 = buff2[i + 2]; p12 = buff3[i + 2];
-        p03 = buff2[i + 3]; p13 = buff3[i + 3];
-        p04 = buff2[i + 4]; p14 = buff3[i + 4];
-        p05 = buff2[i + 5]; p15 = buff3[i + 5];
-
-        dd.d64 = *(FTYPE   *)(buffi + i);
-        buff5[i    ] = (FTYPE)dd.i32s.i0;
-        buff5[i + 1] = (FTYPE)dd.i32s.i1;
-
-        buffd[i    ] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                         p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        buffd[i + 1] += (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                         p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      /*
-       *  3 loop
-       */
-      k0 = k[20]; k1 = k[21]; k2 = k[22]; k3 = k[23]; k4 = k[24];
-
-      sp = sl;
-      dp = dl;
-
-      p02 = buff4[0];
-      p03 = buff4[1];
-      p04 = buff4[2];
-      p05 = buff4[3];
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p01 = p03; p02 = p04; p03 = p05;
-
-        p04 = buff4[i + 4]; p05 = buff4[i + 5];
-
-        d0 = D2I(p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 + buffd[i]);
-        d1 = D2I(p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 + buffd[i + 1]);
-
-        dp[0    ] = FROM_S32(d0);
-        dp[chan1] = FROM_S32(d1);
-
-        sp += chan2;
-        dp += chan2;
-      }
-
-      /* last pixels */
-      for (; i < wid; i++) {
-        p00 = buff0[i];     p10 = buff1[i];     p20 = buff2[i];     p30 = buff3[i];
-        p01 = buff0[i + 1]; p11 = buff1[i + 1]; p21 = buff2[i + 1]; p31 = buff3[i + 1];
-        p02 = buff0[i + 2]; p12 = buff1[i + 2]; p22 = buff2[i + 2]; p32 = buff3[i + 2];
-        p03 = buff0[i + 3]; p13 = buff1[i + 3]; p23 = buff2[i + 3]; p33 = buff3[i + 3];
-        p04 = buff0[i + 4]; p14 = buff1[i + 4]; p24 = buff2[i + 4]; p34 = buff3[i + 4];
-
-        p40 = buff4[i];     p41 = buff4[i + 1]; p42 = buff4[i + 2];
-        p43 = buff4[i + 3]; p44 = buff4[i + 4];
-
-        buff5[i] = (FTYPE)sp[0];
-
-        buffo[i] = D2I(p00 * k[0] + p01 * k[1] + p02 * k[2] + p03 * k[3] + p04 * k[4] +
-                       p10 * k[5] + p11 * k[6] + p12 * k[7] + p13 * k[8] + p14 * k[9] +
-                       p20 * k[10] + p21 * k[11] + p22 * k[12] + p23 * k[13] + p24 * k[14] +
-                       p30 * k[15] + p31 * k[16] + p32 * k[17] + p33 * k[18] + p34 * k[19] +
-                       p40 * k[20] + p41 * k[21] + p42 * k[22] + p43 * k[23] + p44 * k[24]);
-
-        dp[0] = FROM_S32(buffo[i]);
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      buff5[wid    ] = (FTYPE)sp[0];
-      buff5[wid + 1] = (FTYPE)sp[chan1];
-      buff5[wid + 2] = (FTYPE)sp[chan2];
-      buff5[wid + 3] = (FTYPE)sp[chan2 + chan1];
-
-      /* next line */
-      sl += sll;
-      dl += dll;
-
-      buffT = buff0;
-      buff0 = buff1;
-      buff1 = buff2;
-      buff2 = buff3;
-      buff3 = buff4;
-      buff4 = buff5;
-      buff5 = buffT;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#ifndef __sparc /* for x86, using integer multiplies is faster */
-
-mlib_status CONV_FUNC_I(5x5)(mlib_image       *dst,
-                             const mlib_image *src,
-                             const mlib_s32   *kern,
-                             mlib_s32         scalef_expon,
-                             mlib_s32         cmask)
-{
-  mlib_s32 buff[BUFF_LINE];
-  mlib_s32 *buffd;
-  mlib_s32 k[KSIZE*KSIZE];
-  mlib_s32 shift1, shift2;
-  mlib_s32 k0, k1, k2, k3, k4, k5, k6, k7, k8, k9;
-  mlib_s32 p00, p01, p02, p03, p04, p05,
-           p10, p11, p12, p13, p14, p15;
-  DTYPE    *adr_src, *sl, *sp0, *sp1;
-  DTYPE    *adr_dst, *dl, *dp;
-  mlib_s32 *pbuff = buff;
-  mlib_s32 wid, hgt, sll, dll;
-  mlib_s32 nchannel, chan1, chan2, chan3, chan4;
-  mlib_s32 i, j, c;
-
-#if IMG_TYPE != 1
-  shift1 = 16;
-#else
-  shift1 = 8;
-#endif /* IMG_TYPE != 1 */
-
-  shift2 = scalef_expon - shift1;
-
-  for (j = 0; j < KSIZE*KSIZE; j++) k[j] = kern[j] >> shift1;
-
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  if (wid > BUFF_LINE) {
-    pbuff = mlib_malloc(sizeof(mlib_s32)*wid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  buffd = pbuff;
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-  chan3 = chan2 + chan1;
-  chan4 = chan3 + chan1;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  for (c = 0; c < chan1; c++) {
-    if (!(cmask & (1 << (chan1 - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    for (j = 0; j < hgt; j++) {
-      mlib_s32 pix0, pix1;
-      /*
-       *  First loop
-       */
-      sp0 = sl;
-      sp1 = sp0 + sll;
-      dp = dl;
-
-      k0 = k[0]; k1 = k[1]; k2 = k[2]; k3 = k[3]; k4 = k[4];
-      k5 = k[5]; k6 = k[6]; k7 = k[7]; k8 = k[8]; k9 = k[9];
-
-      p02 = sp0[0];     p12 = sp1[0];
-      p03 = sp0[chan1]; p13 = sp1[chan1];
-      p04 = sp0[chan2]; p14 = sp1[chan2];
-      p05 = sp0[chan3]; p15 = sp1[chan3];
-
-      sp0 += chan4;
-      sp1 += chan4;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = p05; p13 = p15;
-
-        p04 = sp0[0];     p14 = sp1[0];
-        p05 = sp0[chan1]; p15 = sp1[chan1];
-
-        buffd[i    ] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                        p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        buffd[i + 1] = (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                        p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp0 += chan2;
-        sp1 += chan2;
-        dp += chan2;
-      }
-
-      if (wid & 1) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = p05; p13 = p15;
-
-        p04 = sp0[0];     p14 = sp1[0];
-
-        buffd[i] = (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                    p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-      }
-
-      /*
-       *  Second loop
-       */
-      sp0 = sl + 2*sll;
-      sp1 = sp0 + sll;
-      dp = dl;
-
-      k0 = k[10]; k1 = k[11]; k2 = k[12]; k3 = k[13]; k4 = k[14];
-      k5 = k[15]; k6 = k[16]; k7 = k[17]; k8 = k[18]; k9 = k[19];
-
-      p02 = sp0[0];     p12 = sp1[0];
-      p03 = sp0[chan1]; p13 = sp1[chan1];
-      p04 = sp0[chan2]; p14 = sp1[chan2];
-      p05 = sp0[chan3]; p15 = sp1[chan3];
-
-      sp0 += chan4;
-      sp1 += chan4;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = p05; p13 = p15;
-
-        p04 = sp0[0];     p14 = sp1[0];
-        p05 = sp0[chan1]; p15 = sp1[chan1];
-
-        buffd[i    ] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                         p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-        buffd[i + 1] += (p01 * k0 + p02 * k1 + p03 * k2 + p04 * k3 + p05 * k4 +
-                         p11 * k5 + p12 * k6 + p13 * k7 + p14 * k8 + p15 * k9);
-
-        sp0 += chan2;
-        sp1 += chan2;
-        dp += chan2;
-      }
-
-      if (wid & 1) {
-        p00 = p02; p10 = p12;
-        p01 = p03; p11 = p13;
-        p02 = p04; p12 = p14;
-        p03 = p05; p13 = p15;
-
-        p04 = sp0[0];     p14 = sp1[0];
-
-        buffd[i] += (p00 * k0 + p01 * k1 + p02 * k2 + p03 * k3 + p04 * k4 +
-                     p10 * k5 + p11 * k6 + p12 * k7 + p13 * k8 + p14 * k9);
-      }
-
-      /*
-       *  3 loop
-       */
-      dp = dl;
-      sp0 = sl + 4*sll;
-
-      k0 = k[20]; k1 = k[21]; k2 = k[22]; k3 = k[23]; k4 = k[24];
-
-      p02 = sp0[0];
-      p03 = sp0[chan1];
-      p04 = sp0[chan2];
-      p05 = sp0[chan3];
-
-      sp0 += chan2 + chan2;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-      for (i = 0; i <= (wid - 2); i += 2) {
-        p00 = p02; p01 = p03; p02 = p04; p03 = p05;
-
-        p04 = sp0[0]; p05 = sp0[chan1];
-
-        pix0 = (buffd[i    ] + p00 * k0 + p01 * k1 + p02 * k2 +
-                p03 * k3 + p04 * k4) >> shift2;
-        pix1 = (buffd[i + 1] + p01 * k0 + p02 * k1 + p03 * k2 +
-                p04 * k3 + p05 * k4) >> shift2;
-
-        CLAMP_STORE(dp[0],     pix0);
-        CLAMP_STORE(dp[chan1], pix1);
-
-        dp  += chan2;
-        sp0 += chan2;
-      }
-
-      if (wid & 1) {
-        p00 = p02; p01 = p03; p02 = p04; p03 = p05;
-
-        p04 = sp0[0];
-
-        pix0 = (buffd[i    ] + p00 * k0 + p01 * k1 + p02 * k2 +
-                p03 * k3 + p04 * k4) >> shift2;
-        CLAMP_STORE(dp[0],     pix0);
-      }
-
-      /* next line */
-      sl += sll;
-      dl += dll;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-#endif /* __sparc ( for x86, using integer multiplies is faster ) */
-
-/***************************************************************/
-#if IMG_TYPE == 1
-
-#undef  KSIZE
-#define KSIZE 7
-
-mlib_status CONV_FUNC(7x7)(mlib_image       *dst,
-                           const mlib_image *src,
-                           const mlib_s32   *kern,
-                           mlib_s32         scalef_expon,
-                           mlib_s32         cmask)
-{
-  FTYPE    buff[(KSIZE + 3)*BUFF_LINE], *buffs[2*(KSIZE + 1)], *buffd;
-  FTYPE    k[KSIZE*KSIZE];
-  mlib_s32 l, m, buff_ind;
-  mlib_s32 d0, d1;
-  FTYPE    k0, k1, k2, k3, k4, k5, k6;
-  FTYPE    p0, p1, p2, p3, p4, p5, p6, p7;
-  DTYPE *sl2, *sl3, *sl4, *sl5, *sl6;
-  DEF_VARS(DTYPE);
-  DTYPE *sl1;
-  mlib_s32 chan2;
-  mlib_s32 *buffo, *buffi;
-  LOAD_KERNEL(KSIZE*KSIZE);
-  GET_SRC_DST_PARAMETERS(DTYPE);
-
-  if (wid > BUFF_LINE) {
-    pbuff = mlib_malloc((KSIZE + 3)*sizeof(FTYPE)*wid);
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  for (l = 0; l < KSIZE + 1; l++) buffs[l] = pbuff + l*wid;
-  for (l = 0; l < KSIZE + 1; l++) buffs[l + (KSIZE + 1)] = buffs[l];
-  buffd = buffs[KSIZE] + wid;
-  buffo = (mlib_s32*)(buffd + wid);
-  buffi = buffo + (wid &~ 1);
-
-  chan1 = nchannel;
-  chan2 = chan1 + chan1;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-
-  adr_dst += ((KSIZE - 1)/2)*(dll + chan1);
-
-  for (c = 0; c < nchannel; c++) {
-    if (!(cmask & (1 << (nchannel - 1 - c)))) continue;
-
-    sl = adr_src + c;
-    dl = adr_dst + c;
-
-    sl1 = sl  + sll;
-    sl2 = sl1 + sll;
-    sl3 = sl2 + sll;
-    sl4 = sl3 + sll;
-    sl5 = sl4 + sll;
-    sl6 = sl5 + sll;
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid + (KSIZE - 1); i++) {
-      buffs[0][i] = (FTYPE)sl[i*chan1];
-      buffs[1][i] = (FTYPE)sl1[i*chan1];
-      buffs[2][i] = (FTYPE)sl2[i*chan1];
-      buffs[3][i] = (FTYPE)sl3[i*chan1];
-      buffs[4][i] = (FTYPE)sl4[i*chan1];
-      buffs[5][i] = (FTYPE)sl5[i*chan1];
-      buffs[6][i] = (FTYPE)sl6[i*chan1];
-    }
-
-    buff_ind = 0;
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (i = 0; i < wid; i++) buffd[i] = 0.0;
-
-    sl += KSIZE*sll;
-
-    for (j = 0; j < hgt; j++) {
-      FTYPE    **buffc = buffs + buff_ind;
-      FTYPE    *buffn = buffc[KSIZE];
-      FTYPE    *pk = k;
-
-      for (l = 0; l < KSIZE; l++) {
-        FTYPE    *buff = buffc[l];
-        d64_2x32 dd;
-
-        sp = sl;
-        dp = dl;
-
-        p2 = buff[0]; p3 = buff[1]; p4 = buff[2];
-        p5 = buff[3]; p6 = buff[4]; p7 = buff[5];
-
-        k0 = *pk++; k1 = *pk++; k2 = *pk++; k3 = *pk++;
-        k4 = *pk++; k5 = *pk++; k6 = *pk++;
-
-        if (l < (KSIZE - 1)) {
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-          for (i = 0; i <= (wid - 2); i += 2) {
-            p0 = p2; p1 = p3; p2 = p4; p3 = p5; p4 = p6; p5 = p7;
-
-            p6 = buff[i + 6]; p7 = buff[i + 7];
-
-            buffd[i    ] += p0*k0 + p1*k1 + p2*k2 + p3*k3 + p4*k4 + p5*k5 + p6*k6;
-            buffd[i + 1] += p1*k0 + p2*k1 + p3*k2 + p4*k3 + p5*k4 + p6*k5 + p7*k6;
-          }
-
-        } else {
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-          for (i = 0; i <= (wid - 2); i += 2) {
-            p0 = p2; p1 = p3; p2 = p4; p3 = p5; p4 = p6; p5 = p7;
-
-            p6 = buff[i + 6]; p7 = buff[i + 7];
-
-            LOAD_BUFF(buffi);
-
-            dd.d64 = *(FTYPE   *)(buffi + i);
-            buffn[i    ] = (FTYPE)dd.i32s.i0;
-            buffn[i + 1] = (FTYPE)dd.i32s.i1;
-
-            d0 = D2I(p0*k0 + p1*k1 + p2*k2 + p3*k3 + p4*k4 + p5*k5 + p6*k6 + buffd[i    ]);
-            d1 = D2I(p1*k0 + p2*k1 + p3*k2 + p4*k3 + p5*k4 + p6*k5 + p7*k6 + buffd[i + 1]);
-
-            dp[0    ] = FROM_S32(d0);
-            dp[chan1] = FROM_S32(d1);
-
-            buffd[i    ] = 0.0;
-            buffd[i + 1] = 0.0;
-
-            sp += chan2;
-            dp += chan2;
-          }
-        }
-      }
-
-      /* last pixels */
-      for (; i < wid; i++) {
-        FTYPE    *pk = k, s = 0;
-        mlib_s32 d0;
-
-        for (l = 0; l < KSIZE; l++) {
-          FTYPE    *buff = buffc[l] + i;
-
-          for (m = 0; m < KSIZE; m++) s += buff[m] * (*pk++);
-        }
-
-        d0 = D2I(s);
-        dp[0] = FROM_S32(d0);
-
-        buffn[i] = (FTYPE)sp[0];
-
-        sp += chan1;
-        dp += chan1;
-      }
-
-      for (l = 0; l < (KSIZE - 1); l++) buffn[wid + l] = sp[l*chan1];
-
-      /* next line */
-      sl += sll;
-      dl += dll;
-
-      buff_ind++;
-
-      if (buff_ind >= KSIZE + 1) buff_ind = 0;
-    }
-  }
-
-  if (pbuff != buff) mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-#endif /* IMG_TYPE == 1 */
-
 /***************************************************************/
 #define MAX_KER   7
 #define MAX_N    15
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffineIndex_BC.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffineIndex_BC.c
deleted file mode 100644
index cd763f534a4..00000000000
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffineIndex_BC.c
+++ /dev/null
@@ -1,413 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, 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.
- */
-
-
-#include "mlib_image.h"
-#include "mlib_ImageAffine.h"
-#include "mlib_ImageColormap.h"
-
-/***************************************************************/
-#define MLIB_LIMIT  512
-#define MLIB_SHIFT   16
-#define MLIB_PREC    (1 << MLIB_SHIFT)
-#define MLIB_MASK    (MLIB_PREC - 1)
-
-/***************************************************************/
-#define DTYPE  MLIB_TYPE
-
-/***************************************************************/
-#define DECLAREVAR_IND()                                        \
-  DECLAREVAR0();                                                \
-  mlib_s32  *warp_tbl   = param -> warp_tbl;                    \
-  mlib_s32  xSrc, ySrc;                                         \
-  mlib_s32  srcYStride = param -> srcYStride;                   \
-  mlib_s32  max_xsize  = param -> max_xsize;                    \
-  mlib_filter filter = param -> filter;                         \
-  MLIB_TYPE *sp, *dl;                                           \
-  mlib_d64  xf0, xf1, xf2, xf3;                                 \
-  mlib_d64  yf0, yf1, yf2, yf3;                                 \
-  mlib_d64  c0, c1, c2, c3, val0;                               \
-  mlib_s32  filterpos;                                          \
-  mlib_f32  *fptr;                                              \
-  mlib_d64  s0, s1, s2, s3;                                     \
-  mlib_s32  i, size
-
-/***************************************************************/
-#define GET_FILTERS_KOEF()                                         \
-  filterpos = (X >> FILTER_SHIFT) & FILTER_MASK;                   \
-  fptr = (mlib_f32 *) ((mlib_u8 *)mlib_filters_table + filterpos); \
-                                                                   \
-  xf0 = fptr[0];                                                   \
-  xf1 = fptr[1];                                                   \
-  xf2 = fptr[2];                                                   \
-  xf3 = fptr[3];                                                   \
-                                                                   \
-  filterpos = (Y >> FILTER_SHIFT) & FILTER_MASK;                   \
-  fptr = (mlib_f32 *) ((mlib_u8 *)mlib_filters_table + filterpos); \
-                                                                   \
-  yf0 = fptr[0];                                                   \
-  yf1 = fptr[1];                                                   \
-  yf2 = fptr[2];                                                   \
-  yf3 = fptr[3]
-
-/***************************************************************/
-#define GET_POINTER()                                           \
-  xSrc = (X >> MLIB_SHIFT)-1;                                   \
-  ySrc = (Y >> MLIB_SHIFT)-1;                                   \
-  sp = ((MLIB_TYPE **)lineAddr)[ySrc] + xSrc
-
-/***************************************************************/
-#define LOAD_FIRST_ROW(nchan, chan)                             \
-  s0 = *(lut + sp[0]*nchan + chan);                             \
-  s1 = *(lut + sp[1]*nchan + chan);                             \
-  s2 = *(lut + sp[2]*nchan + chan);                             \
-  s3 = *(lut + sp[3]*nchan + chan)
-
-/***************************************************************/
-#define COUNT_NEXT_ROW(dst, nchan, chan)                        \
-  sp = (MLIB_TYPE*)((mlib_addr)sp + srcYStride);                \
-  dst = ((*(lut + sp[0]*nchan + chan))*xf0 +                    \
-         (*(lut + sp[1]*nchan + chan))*xf1 +                    \
-         (*(lut + sp[2]*nchan + chan))*xf2 +                    \
-         (*(lut + sp[3]*nchan + chan))*xf3)
-
-/***************************************************************/
-#ifdef MLIB_USE_FTOI_CLAMPING
-
-/***********/
-#define STORE_SAT_VALUE_U8(ind)                                 \
-  dp[ind] = ((mlib_s32)(val0 - (mlib_d64)0x7F800000) >> 24) ^ 0x80
-
-/***********/
-#define STORE_SAT_VALUE_S16(ind)                                \
-  dp[ind] = ((mlib_s32)(val0)) >> 16
-
-#else
-
-/***********/
-#define STORE_SAT_VALUE_U8(ind)                                 \
-  val0 -= (mlib_d64)0x7F800000;                                 \
-  if (val0 >= MLIB_S32_MAX)                                     \
-    dp[ind] = MLIB_U8_MAX;                                      \
-  else if (val0 <= MLIB_S32_MIN)                                \
-    dp[ind] = MLIB_U8_MIN;                                      \
-  else                                                          \
-    dp[ind] = ((mlib_s32)val0 >> 24) ^ 0x80
-
-/***********/
-#define STORE_SAT_VALUE_S16(ind)                                \
-  if (val0 >= MLIB_S32_MAX)                                     \
-    dp[ind] = MLIB_S16_MAX;                                     \
-  else if (val0 <= MLIB_S32_MIN)                                \
-    dp[ind] = MLIB_S16_MIN;                                     \
-  else                                                          \
-    dp[ind] = (mlib_s32)val0 >> 16
-
-#endif /* MLIB_USE_FTOI_CLAMPING */
-
-/***************************************************************/
-#define MAKE_BC_3CH(lut_format)                                 \
-  X += dX;                                                      \
-  Y += dY;                                                      \
-  c0 = (s0*xf0 + s1*xf1 + s2*xf2 + s3*xf3);                     \
-  COUNT_NEXT_ROW(c1, 3, 0);                                     \
-  COUNT_NEXT_ROW(c2, 3, 0);                                     \
-  COUNT_NEXT_ROW(c3, 3, 0);                                     \
-  val0 = (c0*yf0 + c1*yf1 + c2*yf2 + c3*yf3);                   \
-  sp = (MLIB_TYPE*)((mlib_addr)sp - 3*srcYStride);              \
-  LOAD_FIRST_ROW(3, 1);                                         \
-  STORE_SAT_VALUE_##lut_format(0);                              \
-  c0 = (s0*xf0 + s1*xf1 + s2*xf2 + s3*xf3);                     \
-  COUNT_NEXT_ROW(c1, 3, 1);                                     \
-  COUNT_NEXT_ROW(c2, 3, 1);                                     \
-  COUNT_NEXT_ROW(c3, 3, 1);                                     \
-  val0 = (c0*yf0 + c1*yf1 + c2*yf2 + c3*yf3);                   \
-  sp = (MLIB_TYPE*)((mlib_addr)sp - 3*srcYStride);              \
-  LOAD_FIRST_ROW(3, 2);                                         \
-  STORE_SAT_VALUE_##lut_format(1);                              \
-  c0 = (s0*xf0 + s1*xf1 + s2*xf2 + s3*xf3);                     \
-  COUNT_NEXT_ROW(c1, 3, 2);                                     \
-  COUNT_NEXT_ROW(c2, 3, 2);                                     \
-  COUNT_NEXT_ROW(c3, 3, 2);                                     \
-  val0 = (c0*yf0 + c1*yf1 + c2*yf2 + c3*yf3);                   \
-  GET_FILTERS_KOEF();                                           \
-  GET_POINTER();                                                \
-  LOAD_FIRST_ROW(3, 0);                                         \
-  STORE_SAT_VALUE_##lut_format(2);
-
-/***************************************************************/
-#define MAKE_LAST_PIXEL_BC_3CH(lut_format)                      \
-  c0 = (s0*xf0 + s1*xf1 + s2*xf2 + s3*xf3);                     \
-  COUNT_NEXT_ROW(c1, 3, 0);                                     \
-  COUNT_NEXT_ROW(c2, 3, 0);                                     \
-  COUNT_NEXT_ROW(c3, 3, 0);                                     \
-  val0 = (c0*yf0 + c1*yf1 + c2*yf2 + c3*yf3);                   \
-  sp = (MLIB_TYPE*)((mlib_addr)sp - 3*srcYStride);              \
-  LOAD_FIRST_ROW(3, 1);                                         \
-  STORE_SAT_VALUE_##lut_format(0);                              \
-  c0 = (s0*xf0 + s1*xf1 + s2*xf2 + s3*xf3);                     \
-  COUNT_NEXT_ROW(c1, 3, 1);                                     \
-  COUNT_NEXT_ROW(c2, 3, 1);                                     \
-  COUNT_NEXT_ROW(c3, 3, 1);                                     \
-  val0 = (c0*yf0 + c1*yf1 + c2*yf2 + c3*yf3);                   \
-  sp = (MLIB_TYPE*)((mlib_addr)sp - 3*srcYStride);              \
-  LOAD_FIRST_ROW(3, 2);                                         \
-  STORE_SAT_VALUE_##lut_format(1);                              \
-  c0 = (s0*xf0 + s1*xf1 + s2*xf2 + s3*xf3);                     \
-  COUNT_NEXT_ROW(c1, 3, 2);                                     \
-  COUNT_NEXT_ROW(c2, 3, 2);                                     \
-  COUNT_NEXT_ROW(c3, 3, 2);                                     \
-  val0 = (c0*yf0 + c1*yf1 + c2*yf2 + c3*yf3);                   \
-  STORE_SAT_VALUE_##lut_format(2);
-
-/***************************************************************/
-#define MAKE_BC_4CH(lut_format)                                 \
-  X += dX;                                                      \
-  Y += dY;                                                      \
-  c0 = (s0*xf0 + s1*xf1 + s2*xf2 + s3*xf3);                     \
-  COUNT_NEXT_ROW(c1, 4, 0);                                     \
-  COUNT_NEXT_ROW(c2, 4, 0);                                     \
-  COUNT_NEXT_ROW(c3, 4, 0);                                     \
-  val0 = (c0*yf0 + c1*yf1 + c2*yf2 + c3*yf3);                   \
-  sp = (MLIB_TYPE*)((mlib_addr)sp - 3*srcYStride);              \
-  LOAD_FIRST_ROW(4, 1);                                         \
-  STORE_SAT_VALUE_##lut_format(0);                              \
-  c0 = (s0*xf0 + s1*xf1 + s2*xf2 + s3*xf3);                     \
-  COUNT_NEXT_ROW(c1, 4, 1);                                     \
-  COUNT_NEXT_ROW(c2, 4, 1);                                     \
-  COUNT_NEXT_ROW(c3, 4, 1);                                     \
-  val0 = (c0*yf0 + c1*yf1 + c2*yf2 + c3*yf3);                   \
-  sp = (MLIB_TYPE*)((mlib_addr)sp - 3*srcYStride);              \
-  LOAD_FIRST_ROW(4, 2);                                         \
-  STORE_SAT_VALUE_##lut_format(1);                              \
-  c0 = (s0*xf0 + s1*xf1 + s2*xf2 + s3*xf3);                     \
-  COUNT_NEXT_ROW(c1, 4, 2);                                     \
-  COUNT_NEXT_ROW(c2, 4, 2);                                     \
-  COUNT_NEXT_ROW(c3, 4, 2);                                     \
-  val0 = (c0*yf0 + c1*yf1 + c2*yf2 + c3*yf3);                   \
-  sp = (MLIB_TYPE*)((mlib_addr)sp - 3*srcYStride);              \
-  LOAD_FIRST_ROW(4, 3);                                         \
-  STORE_SAT_VALUE_##lut_format(2);                              \
-  c0 = (s0*xf0 + s1*xf1 + s2*xf2 + s3*xf3);                     \
-  COUNT_NEXT_ROW(c1, 4, 3);                                     \
-  COUNT_NEXT_ROW(c2, 4, 3);                                     \
-  COUNT_NEXT_ROW(c3, 4, 3);                                     \
-  val0 = (c0*yf0 + c1*yf1 + c2*yf2 + c3*yf3);                   \
-  GET_FILTERS_KOEF();                                           \
-  GET_POINTER();                                                \
-  LOAD_FIRST_ROW(4, 0);                                         \
-  STORE_SAT_VALUE_##lut_format(3);
-
-/***************************************************************/
-#define MAKE_LAST_PIXEL_BC_4CH(lut_format)                      \
-  c0 = (s0*xf0 + s1*xf1 + s2*xf2 + s3*xf3);                     \
-  COUNT_NEXT_ROW(c1, 4, 0);                                     \
-  COUNT_NEXT_ROW(c2, 4, 0);                                     \
-  COUNT_NEXT_ROW(c3, 4, 0);                                     \
-  val0 = (c0*yf0 + c1*yf1 + c2*yf2 + c3*yf3);                   \
-  sp = (MLIB_TYPE*)((mlib_addr)sp - 3*srcYStride);              \
-  LOAD_FIRST_ROW(4, 1);                                         \
-  STORE_SAT_VALUE_##lut_format(0);                              \
-  c0 = (s0*xf0 + s1*xf1 + s2*xf2 + s3*xf3);                     \
-  COUNT_NEXT_ROW(c1, 4, 1);                                     \
-  COUNT_NEXT_ROW(c2, 4, 1);                                     \
-  COUNT_NEXT_ROW(c3, 4, 1);                                     \
-  val0 = (c0*yf0 + c1*yf1 + c2*yf2 + c3*yf3);                   \
-  sp = (MLIB_TYPE*)((mlib_addr)sp - 3*srcYStride);              \
-  LOAD_FIRST_ROW(4, 2);                                         \
-  STORE_SAT_VALUE_##lut_format(1);                              \
-  c0 = (s0*xf0 + s1*xf1 + s2*xf2 + s3*xf3);                     \
-  COUNT_NEXT_ROW(c1, 4, 2);                                     \
-  COUNT_NEXT_ROW(c2, 4, 2);                                     \
-  COUNT_NEXT_ROW(c3, 4, 2);                                     \
-  val0 = (c0*yf0 + c1*yf1 + c2*yf2 + c3*yf3);                   \
-  sp = (MLIB_TYPE*)((mlib_addr)sp - 3*srcYStride);              \
-  LOAD_FIRST_ROW(4, 3);                                         \
-  STORE_SAT_VALUE_##lut_format(2);                              \
-  c0 = (s0*xf0 + s1*xf1 + s2*xf2 + s3*xf3);                     \
-  COUNT_NEXT_ROW(c1, 4, 3);                                     \
-  COUNT_NEXT_ROW(c2, 4, 3);                                     \
-  COUNT_NEXT_ROW(c3, 4, 3);                                     \
-  val0 = (c0*yf0 + c1*yf1 + c2*yf2 + c3*yf3);                   \
-  STORE_SAT_VALUE_##lut_format(3);
-
-/***************************************************************/
-#define FILTER_U8  ((filter == MLIB_BICUBIC) ? mlib_filters_u8f_bc  : mlib_filters_u8f_bc2)
-#define FILTER_S16 ((filter == MLIB_BICUBIC) ? mlib_filters_s16f_bc : mlib_filters_s16f_bc2)
-
-/***************************************************************/
-#define mlib_U8  mlib_u8
-#define mlib_S16 mlib_s16
-
-/***************************************************************/
-#define FUNC_AFFINEINDEX_BC_0(ITYPE, LTYPE, NCHAN)                                                  \
-  mlib_status mlib_ImageAffineIndex_##ITYPE##_##LTYPE##_##NCHAN##CH_BC(mlib_affine_param *param,    \
-                                                                       const void        *colormap) \
-  {                                                                                                 \
-    DECLAREVAR_IND();                                                                               \
-    mlib_##LTYPE buff_lcl[NCHAN * MLIB_LIMIT], *pbuff = buff_lcl, *dp;                              \
-    mlib_d64  *lut = ((mlib_d64*)mlib_ImageGetLutDoubleData(colormap) -                             \
-                      NCHAN * mlib_ImageGetLutOffset(colormap));                                    \
-    const mlib_f32 *mlib_filters_table = FILTER_##LTYPE;                                            \
-                                                                                                    \
-    if (max_xsize > MLIB_LIMIT) {                                                                   \
-      pbuff = mlib_malloc(NCHAN * sizeof(mlib_##LTYPE) * max_xsize);                                \
-      if (pbuff == NULL) return MLIB_FAILURE;                                                       \
-    }                                                                                               \
-                                                                                                    \
-    for (j = yStart; j <= yFinish; j++) {                                                           \
-                                                                                                    \
-      NEW_LINE(1);                                                                                  \
-      dp = pbuff;                                                                                   \
-                                                                                                    \
-      GET_FILTERS_KOEF();                                                                           \
-      GET_POINTER();                                                                                \
-      LOAD_FIRST_ROW(NCHAN, 0);
-
-    /* pragma pipeloop(0) must be here */
-
-/***************************************************************/
-#define FUNC_AFFINEINDEX_BC_1(ITYPE, LTYPE, NCHAN)                         \
-                                                                           \
-      for (i = 0; i < (xRight - xLeft); i++, dp += NCHAN) {                \
-        MAKE_BC_##NCHAN##CH(LTYPE);                                        \
-      }                                                                    \
-                                                                           \
-      MAKE_LAST_PIXEL_BC_##NCHAN##CH(LTYPE);                               \
-                                                                           \
-      mlib_ImageColorTrue2IndexLine_##LTYPE##_##ITYPE##_##NCHAN            \
-                                (pbuff, dl, xRight - xLeft + 1, colormap); \
-    }                                                                      \
-                                                                           \
-    if (pbuff != buff_lcl) mlib_free(pbuff);                               \
-                                                                           \
-    return MLIB_SUCCESS;                                                   \
-  }
-
-/***************************************************************/
-#undef MLIB_TYPE
-#define MLIB_TYPE mlib_u8
-
-/***************************************************************/
-#undef  FILTER_SHIFT
-#define FILTER_SHIFT 4
-#undef  FILTER_MASK
-#define FILTER_MASK  (((1 << 8) - 1) << 4)
-
-FUNC_AFFINEINDEX_BC_0(U8, U8, 3)
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-FUNC_AFFINEINDEX_BC_1(U8, U8, 3)
-
-/***************************************************************/
-#undef  FILTER_SHIFT
-#define FILTER_SHIFT 3
-#undef  FILTER_MASK
-#define FILTER_MASK  (((1 << 9) - 1) << 4)
-
-FUNC_AFFINEINDEX_BC_0(U8, S16, 3)
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-FUNC_AFFINEINDEX_BC_1(U8, S16, 3)
-
-/***************************************************************/
-#undef  FILTER_SHIFT
-#define FILTER_SHIFT 4
-#undef  FILTER_MASK
-#define FILTER_MASK  (((1 << 8) - 1) << 4)
-
-FUNC_AFFINEINDEX_BC_0(U8, U8, 4)
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-FUNC_AFFINEINDEX_BC_1(U8, U8, 4)
-
-/***************************************************************/
-#undef  FILTER_SHIFT
-#define FILTER_SHIFT 3
-#undef  FILTER_MASK
-#define FILTER_MASK  (((1 << 9) - 1) << 4)
-
-FUNC_AFFINEINDEX_BC_0(U8, S16, 4)
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-FUNC_AFFINEINDEX_BC_1(U8, S16, 4)
-
-/***************************************************************/
-#undef  MLIB_TYPE
-#define MLIB_TYPE mlib_s16
-
-/***************************************************************/
-#undef  FILTER_SHIFT
-#define FILTER_SHIFT 4
-#undef  FILTER_MASK
-#define FILTER_MASK  (((1 << 8) - 1) << 4)
-
-FUNC_AFFINEINDEX_BC_0(S16, U8, 3)
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-FUNC_AFFINEINDEX_BC_1(S16, U8, 3)
-
-/***************************************************************/
-#undef  FILTER_SHIFT
-#define FILTER_SHIFT 3
-#undef  FILTER_MASK
-#define FILTER_MASK  (((1 << 9) - 1) << 4)
-
-FUNC_AFFINEINDEX_BC_0(S16, S16, 3)
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-FUNC_AFFINEINDEX_BC_1(S16, S16, 3)
-
-/***************************************************************/
-#undef  FILTER_SHIFT
-#define FILTER_SHIFT 4
-#undef  FILTER_MASK
-#define FILTER_MASK  (((1 << 8) - 1) << 4)
-
-FUNC_AFFINEINDEX_BC_0(S16, U8, 4)
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-FUNC_AFFINEINDEX_BC_1(S16, U8, 4)
-
-/***************************************************************/
-#undef  FILTER_SHIFT
-#define FILTER_SHIFT 3
-#undef  FILTER_MASK
-#define FILTER_MASK  (((1 << 9) - 1) << 4)
-
-FUNC_AFFINEINDEX_BC_0(S16, S16, 4)
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-FUNC_AFFINEINDEX_BC_1(S16, S16, 4)
-
-/***************************************************************/
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffineIndex_BL.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffineIndex_BL.c
deleted file mode 100644
index 83ef3e5b1f5..00000000000
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffineIndex_BL.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, 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.
- */
-
-
-#include "mlib_image.h"
-#include "mlib_ImageAffine.h"
-#include "mlib_ImageColormap.h"
-
-/***************************************************************/
-#define MLIB_LIMIT  512
-
-/***************************************************************/
-#define DTYPE  MLIB_TYPE
-
-/***************************************************************/
-#define DECLAREVAR_IND()                                        \
-  DECLAREVAR0();                                                \
-  mlib_s32  *warp_tbl   = param -> warp_tbl;                    \
-  mlib_s32  xSrc, ySrc;                                         \
-  mlib_s32  srcYStride = param -> srcYStride;                   \
-  mlib_s32  max_xsize  = param -> max_xsize;                    \
-  MLIB_TYPE *sp0, *sp1;                                         \
-  MLIB_TYPE *dl;                                                \
-  mlib_d64  scale = 1.0 / 65536.0;                              \
-  mlib_s32  i, size
-
-/***************************************************************/
-#define DECLARE_INTERNAL_VAR_3CH()                              \
-  mlib_d64  fdx, fdy;                                           \
-  mlib_d64  a00_0, a01_0, a10_0, a11_0;                         \
-  mlib_d64  a00_1, a01_1, a10_1, a11_1;                         \
-  mlib_d64  a00_2, a01_2, a10_2, a11_2;                         \
-  mlib_d64  pix0_0, pix1_0, res0;                               \
-  mlib_d64  pix0_1, pix1_1, res1;                               \
-  mlib_d64  pix0_2, pix1_2, res2
-
-/***************************************************************/
-#define DECLARE_INTERNAL_VAR_4CH()                              \
-  mlib_d64  fdx, fdy;                                           \
-  mlib_d64  a00_0, a01_0, a10_0, a11_0;                         \
-  mlib_d64  a00_1, a01_1, a10_1, a11_1;                         \
-  mlib_d64  a00_2, a01_2, a10_2, a11_2;                         \
-  mlib_d64  a00_3, a01_3, a10_3, a11_3;                         \
-  mlib_d64  pix0_0, pix1_0, res0;                               \
-  mlib_d64  pix0_1, pix1_1, res1;                               \
-  mlib_d64  pix0_2, pix1_2, res2;                               \
-  mlib_d64  pix0_3, pix1_3, res3
-
-/***************************************************************/
-#define GET_PIXELS_POINTERS()                                   \
-  fdx = (X & MLIB_MASK) * scale;                                \
-  fdy = (Y & MLIB_MASK) * scale;                                \
-  ySrc = MLIB_POINTER_SHIFT(Y);  Y += dY;                       \
-  xSrc = X >> MLIB_SHIFT;  X += dX;                             \
-  sp0 = MLIB_POINTER_GET(lineAddr, ySrc) + xSrc;                \
-  sp1 = (MLIB_TYPE *)((mlib_u8 *)sp0 + srcYStride)
-
-/***************************************************************/
-#define GET_COLOR_POINTERS(ind)                                 \
-  pcolor00 = (lut + sp0[0]*ind);                                \
-  pcolor10 = (lut + sp1[0]*ind);                                \
-  pcolor01 = (lut + sp0[1]*ind);                                \
-  pcolor11 = (lut + sp1[1]*ind)
-
-/***************************************************************/
-#define COUNT_BL_U8(ind)                                        \
-  pix0_##ind = a00_##ind + fdy * (a10_##ind - a00_##ind);       \
-  pix1_##ind = a01_##ind + fdy * (a11_##ind - a01_##ind);       \
-  res##ind = pix0_##ind + fdx * (pix1_##ind - pix0_##ind) + 0.5
-
-/***************************************************************/
-#define COUNT_BL_U8_3CH()                                       \
-  COUNT_BL_U8(0);                                               \
-  COUNT_BL_U8(1);                                               \
-  COUNT_BL_U8(2);
-
-/***************************************************************/
-#define COUNT_BL_U8_4CH()                                       \
-  COUNT_BL_U8_3CH();                                            \
-  COUNT_BL_U8(3);
-
-/***************************************************************/
-#define COUNT_BL_S16(ind)                                       \
-  pix0_##ind = a00_##ind + fdy * (a10_##ind - a00_##ind);       \
-  pix1_##ind = a01_##ind + fdy * (a11_##ind - a01_##ind);       \
-  res##ind = pix0_##ind + fdx * (pix1_##ind - pix0_##ind)
-
-/***************************************************************/
-#define COUNT_BL_S16_3CH()                                      \
-  COUNT_BL_S16(0);                                              \
-  COUNT_BL_S16(1);                                              \
-  COUNT_BL_S16(2);
-
-/***************************************************************/
-#define COUNT_BL_S16_4CH()                                      \
-  COUNT_BL_S16_3CH();                                           \
-  COUNT_BL_S16(3);
-
-/***************************************************************/
-#define LOAD(ind)                                               \
-  a00_##ind = pcolor00[ind];                                    \
-  a01_##ind = pcolor01[ind];                                    \
-  a10_##ind = pcolor10[ind];                                    \
-  a11_##ind = pcolor11[ind]
-
-/***************************************************************/
-#define LOAD_3CH()                                              \
-  LOAD(0);                                                      \
-  LOAD(1);                                                      \
-  LOAD(2);
-
-/***************************************************************/
-#define LOAD_4CH()                                              \
-  LOAD_3CH();                                                   \
-  LOAD(3);
-
-/***************************************************************/
-#define STORE_INTO_INTERM_BUF_3CH(LTYPE)                        \
-  dp[0] = (mlib_##LTYPE)res0;                                   \
-  dp[1] = (mlib_##LTYPE)res1;                                   \
-  dp[2] = (mlib_##LTYPE)res2
-
-/***************************************************************/
-#define STORE_INTO_INTERM_BUF_4CH(LTYPE)                        \
-  dp[0] = (mlib_##LTYPE)res0;                                   \
-  dp[1] = (mlib_##LTYPE)res1;                                   \
-  dp[2] = (mlib_##LTYPE)res2;                                   \
-  dp[3] = (mlib_##LTYPE)res3
-
-/***************************************************************/
-#undef  MLIB_TYPE
-#define MLIB_TYPE mlib_u8
-
-/***************************************************************/
-#define mlib_U8  mlib_u8
-#define mlib_S16 mlib_s16
-
-/***************************************************************/
-#define FUNC_AFFINEINDEX_BL_0(ITYPE, LTYPE, NCHAN)                                               \
-  mlib_status mlib_ImageAffineIndex_##ITYPE##_##LTYPE##_##NCHAN##CH_BL(mlib_affine_param *param, \
-                                                                       const void        *colormap) \
-  {                                                                                              \
-    DECLAREVAR_IND();                                                                            \
-    mlib_##LTYPE  *dp, buff_lcl[NCHAN*MLIB_LIMIT], *pbuff = buff_lcl;                            \
-    mlib_d64 *pcolor00, *pcolor10, *pcolor01, *pcolor11;                                         \
-    mlib_d64 *lut = mlib_ImageGetLutDoubleData(colormap);                                        \
-                                                                                                 \
-    lut -= NCHAN*mlib_ImageGetLutOffset(colormap);                                               \
-                                                                                                 \
-    if (max_xsize > MLIB_LIMIT) {                                                                \
-      pbuff = mlib_malloc(NCHAN * sizeof(mlib_##LTYPE) * max_xsize);                             \
-      if (pbuff == NULL) return MLIB_FAILURE;                                                    \
-    }                                                                                            \
-                                                                                                 \
-    for (j = yStart; j <= yFinish; j++) {                                                        \
-      DECLARE_INTERNAL_VAR_##NCHAN##CH();                                                        \
-                                                                                                 \
-      NEW_LINE(1);                                                                               \
-      dp = pbuff;                                                                                \
-                                                                                                 \
-      GET_PIXELS_POINTERS();                                                                     \
-      GET_COLOR_POINTERS(NCHAN);                                                                 \
-      LOAD_##NCHAN##CH();
-
-    /* pragma pipeloop(0) must be here */
-
-/***************************************************************/
-#define FUNC_AFFINEINDEX_BL_1(ITYPE, LTYPE, NCHAN)                   \
-      for (i = 0; i < (xRight - xLeft); i++, dp += NCHAN) {          \
-        COUNT_BL_##LTYPE##_##NCHAN##CH();                            \
-                                                                     \
-        GET_PIXELS_POINTERS();                                       \
-        GET_COLOR_POINTERS(NCHAN);                                   \
-        LOAD_##NCHAN##CH();                                          \
-                                                                     \
-        STORE_INTO_INTERM_BUF_##NCHAN##CH(LTYPE);                    \
-      }                                                              \
-                                                                     \
-      COUNT_BL_##LTYPE##_##NCHAN##CH();                              \
-      STORE_INTO_INTERM_BUF_##NCHAN##CH(LTYPE);                      \
-                                                                     \
-      mlib_ImageColorTrue2IndexLine_##LTYPE##_##ITYPE##_##NCHAN      \
-                          (pbuff, dl, xRight - xLeft + 1, colormap); \
-    }                                                                \
-                                                                     \
-    if (pbuff != buff_lcl) mlib_free(pbuff);                         \
-                                                                     \
-    return MLIB_SUCCESS;                                             \
-  }
-
-/***************************************************************/
-#undef  MLIB_TYPE
-#define MLIB_TYPE mlib_u8
-
-FUNC_AFFINEINDEX_BL_0(U8, U8, 3)
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-FUNC_AFFINEINDEX_BL_1(U8, U8, 3)
-
-FUNC_AFFINEINDEX_BL_0(U8, S16, 3)
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-FUNC_AFFINEINDEX_BL_1(U8, S16, 3)
-
-FUNC_AFFINEINDEX_BL_0(U8, U8, 4)
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-FUNC_AFFINEINDEX_BL_1(U8, U8, 4)
-
-FUNC_AFFINEINDEX_BL_0(U8, S16, 4)
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-FUNC_AFFINEINDEX_BL_1(U8, S16, 4)
-
-/***************************************************************/
-#undef  MLIB_TYPE
-#define MLIB_TYPE mlib_s16
-
-FUNC_AFFINEINDEX_BL_0(S16, U8, 3)
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-FUNC_AFFINEINDEX_BL_1(S16, U8, 3)
-
-FUNC_AFFINEINDEX_BL_0(S16, S16, 3)
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-FUNC_AFFINEINDEX_BL_1(S16, S16, 3)
-
-FUNC_AFFINEINDEX_BL_0(S16, U8, 4)
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-FUNC_AFFINEINDEX_BL_1(S16, U8, 4)
-
-FUNC_AFFINEINDEX_BL_0(S16, S16, 4)
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-FUNC_AFFINEINDEX_BL_1(S16, S16, 4)
-
-/***************************************************************/
-const type_affine_i_fun mlib_AffineFunArr_bl_i[] = {
-  mlib_ImageAffineIndex_U8_U8_3CH_BL,
-  mlib_ImageAffineIndex_U8_U8_4CH_BL,
-  mlib_ImageAffineIndex_S16_U8_3CH_BL,
-  mlib_ImageAffineIndex_S16_U8_4CH_BL,
-  mlib_ImageAffineIndex_U8_S16_3CH_BL,
-  mlib_ImageAffineIndex_U8_S16_4CH_BL,
-  mlib_ImageAffineIndex_S16_S16_3CH_BL,
-  mlib_ImageAffineIndex_S16_S16_4CH_BL
-};
-/***************************************************************/
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageBlendTable.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageBlendTable.c
deleted file mode 100644
index 2447f769e69..00000000000
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageBlendTable.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, 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.
- */
-
-#include <mlib_image.h>
-#include "mlib_c_ImageBlendTable.h"
-
-const mlib_f32 mlib_c_blend_u8[] = {
-    0.0f,   1.0f,   2.0f,   3.0f,   4.0f,   5.0f,   6.0f,   7.0f,
-    8.0f,   9.0f,  10.0f,  11.0f,  12.0f,  13.0f,  14.0f,  15.0f,
-   16.0f,  17.0f,  18.0f,  19.0f,  20.0f,  21.0f,  22.0f,  23.0f,
-   24.0f,  25.0f,  26.0f,  27.0f,  28.0f,  29.0f,  30.0f,  31.0f,
-   32.0f,  33.0f,  34.0f,  35.0f,  36.0f,  37.0f,  38.0f,  39.0f,
-   40.0f,  41.0f,  42.0f,  43.0f,  44.0f,  45.0f,  46.0f,  47.0f,
-   48.0f,  49.0f,  50.0f,  51.0f,  52.0f,  53.0f,  54.0f,  55.0f,
-   56.0f,  57.0f,  58.0f,  59.0f,  60.0f,  61.0f,  62.0f,  63.0f,
-   64.0f,  65.0f,  66.0f,  67.0f,  68.0f,  69.0f,  70.0f,  71.0f,
-   72.0f,  73.0f,  74.0f,  75.0f,  76.0f,  77.0f,  78.0f,  79.0f,
-   80.0f,  81.0f,  82.0f,  83.0f,  84.0f,  85.0f,  86.0f,  87.0f,
-   88.0f,  89.0f,  90.0f,  91.0f,  92.0f,  93.0f,  94.0f,  95.0f,
-   96.0f,  97.0f,  98.0f,  99.0f, 100.0f, 101.0f, 102.0f, 103.0f,
-  104.0f, 105.0f, 106.0f, 107.0f, 108.0f, 109.0f, 110.0f, 111.0f,
-  112.0f, 113.0f, 114.0f, 115.0f, 116.0f, 117.0f, 118.0f, 119.0f,
-  120.0f, 121.0f, 122.0f, 123.0f, 124.0f, 125.0f, 126.0f, 127.0f,
-  128.0f, 129.0f, 130.0f, 131.0f, 132.0f, 133.0f, 134.0f, 135.0f,
-  136.0f, 137.0f, 138.0f, 139.0f, 140.0f, 141.0f, 142.0f, 143.0f,
-  144.0f, 145.0f, 146.0f, 147.0f, 148.0f, 149.0f, 150.0f, 151.0f,
-  152.0f, 153.0f, 154.0f, 155.0f, 156.0f, 157.0f, 158.0f, 159.0f,
-  160.0f, 161.0f, 162.0f, 163.0f, 164.0f, 165.0f, 166.0f, 167.0f,
-  168.0f, 169.0f, 170.0f, 171.0f, 172.0f, 173.0f, 174.0f, 175.0f,
-  176.0f, 177.0f, 178.0f, 179.0f, 180.0f, 181.0f, 182.0f, 183.0f,
-  184.0f, 185.0f, 186.0f, 187.0f, 188.0f, 189.0f, 190.0f, 191.0f,
-  192.0f, 193.0f, 194.0f, 195.0f, 196.0f, 197.0f, 198.0f, 199.0f,
-  200.0f, 201.0f, 202.0f, 203.0f, 204.0f, 205.0f, 206.0f, 207.0f,
-  208.0f, 209.0f, 210.0f, 211.0f, 212.0f, 213.0f, 214.0f, 215.0f,
-  216.0f, 217.0f, 218.0f, 219.0f, 220.0f, 221.0f, 222.0f, 223.0f,
-  224.0f, 225.0f, 226.0f, 227.0f, 228.0f, 229.0f, 230.0f, 231.0f,
-  232.0f, 233.0f, 234.0f, 235.0f, 236.0f, 237.0f, 238.0f, 239.0f,
-  240.0f, 241.0f, 242.0f, 243.0f, 244.0f, 245.0f, 246.0f, 247.0f,
-  248.0f, 249.0f, 250.0f, 251.0f, 252.0f, 253.0f, 254.0f, 255.0f,
-  256.0f
-};
-
-const mlib_f32 mlib_c_blend_Q8[] = {
-  0.00000000f, 0.00390625f, 0.00781250f, 0.01171875f,
-  0.01562500f, 0.01953125f, 0.02343750f, 0.02734375f,
-  0.03125000f, 0.03515625f, 0.03906250f, 0.04296875f,
-  0.04687500f, 0.05078125f, 0.05468750f, 0.05859375f,
-  0.06250000f, 0.06640625f, 0.07031250f, 0.07421875f,
-  0.07812500f, 0.08203125f, 0.08593750f, 0.08984375f,
-  0.09375000f, 0.09765625f, 0.10156250f, 0.10546875f,
-  0.10937500f, 0.11328125f, 0.11718750f, 0.12109375f,
-  0.12500000f, 0.12890625f, 0.13281250f, 0.13671875f,
-  0.14062500f, 0.14453125f, 0.14843750f, 0.15234375f,
-  0.15625000f, 0.16015625f, 0.16406250f, 0.16796875f,
-  0.17187500f, 0.17578125f, 0.17968750f, 0.18359375f,
-  0.18750000f, 0.19140625f, 0.19531250f, 0.19921875f,
-  0.20312500f, 0.20703125f, 0.21093750f, 0.21484375f,
-  0.21875000f, 0.22265625f, 0.22656250f, 0.23046875f,
-  0.23437500f, 0.23828125f, 0.24218750f, 0.24609375f,
-  0.25000000f, 0.25390625f, 0.25781250f, 0.26171875f,
-  0.26562500f, 0.26953125f, 0.27343750f, 0.27734375f,
-  0.28125000f, 0.28515625f, 0.28906250f, 0.29296875f,
-  0.29687500f, 0.30078125f, 0.30468750f, 0.30859375f,
-  0.31250000f, 0.31640625f, 0.32031250f, 0.32421875f,
-  0.32812500f, 0.33203125f, 0.33593750f, 0.33984375f,
-  0.34375000f, 0.34765625f, 0.35156250f, 0.35546875f,
-  0.35937500f, 0.36328125f, 0.36718750f, 0.37109375f,
-  0.37500000f, 0.37890625f, 0.38281250f, 0.38671875f,
-  0.39062500f, 0.39453125f, 0.39843750f, 0.40234375f,
-  0.40625000f, 0.41015625f, 0.41406250f, 0.41796875f,
-  0.42187500f, 0.42578125f, 0.42968750f, 0.43359375f,
-  0.43750000f, 0.44140625f, 0.44531250f, 0.44921875f,
-  0.45312500f, 0.45703125f, 0.46093750f, 0.46484375f,
-  0.46875000f, 0.47265625f, 0.47656250f, 0.48046875f,
-  0.48437500f, 0.48828125f, 0.49218750f, 0.49609375f,
-  0.50000000f, 0.50390625f, 0.50781250f, 0.51171875f,
-  0.51562500f, 0.51953125f, 0.52343750f, 0.52734375f,
-  0.53125000f, 0.53515625f, 0.53906250f, 0.54296875f,
-  0.54687500f, 0.55078125f, 0.55468750f, 0.55859375f,
-  0.56250000f, 0.56640625f, 0.57031250f, 0.57421875f,
-  0.57812500f, 0.58203125f, 0.58593750f, 0.58984375f,
-  0.59375000f, 0.59765625f, 0.60156250f, 0.60546875f,
-  0.60937500f, 0.61328125f, 0.61718750f, 0.62109375f,
-  0.62500000f, 0.62890625f, 0.63281250f, 0.63671875f,
-  0.64062500f, 0.64453125f, 0.64843750f, 0.65234375f,
-  0.65625000f, 0.66015625f, 0.66406250f, 0.66796875f,
-  0.67187500f, 0.67578125f, 0.67968750f, 0.68359375f,
-  0.68750000f, 0.69140625f, 0.69531250f, 0.69921875f,
-  0.70312500f, 0.70703125f, 0.71093750f, 0.71484375f,
-  0.71875000f, 0.72265625f, 0.72656250f, 0.73046875f,
-  0.73437500f, 0.73828125f, 0.74218750f, 0.74609375f,
-  0.75000000f, 0.75390625f, 0.75781250f, 0.76171875f,
-  0.76562500f, 0.76953125f, 0.77343750f, 0.77734375f,
-  0.78125000f, 0.78515625f, 0.78906250f, 0.79296875f,
-  0.79687500f, 0.80078125f, 0.80468750f, 0.80859375f,
-  0.81250000f, 0.81640625f, 0.82031250f, 0.82421875f,
-  0.82812500f, 0.83203125f, 0.83593750f, 0.83984375f,
-  0.84375000f, 0.84765625f, 0.85156250f, 0.85546875f,
-  0.85937500f, 0.86328125f, 0.86718750f, 0.87109375f,
-  0.87500000f, 0.87890625f, 0.88281250f, 0.88671875f,
-  0.89062500f, 0.89453125f, 0.89843750f, 0.90234375f,
-  0.90625000f, 0.91015625f, 0.91406250f, 0.91796875f,
-  0.92187500f, 0.92578125f, 0.92968750f, 0.93359375f,
-  0.93750000f, 0.94140625f, 0.94531250f, 0.94921875f,
-  0.95312500f, 0.95703125f, 0.96093750f, 0.96484375f,
-  0.96875000f, 0.97265625f, 0.97656250f, 0.98046875f,
-  0.98437500f, 0.98828125f, 0.99218750f, 0.99609375f,
-  1.00000000f, 1.00390625f, 1.00781250f, 1.01171875f,
-  1.01562500f, 1.01953125f, 1.02343750f, 1.02734375f,
-  1.03125000f, 1.03515625f, 1.03906250f, 1.04296875f,
-  1.04687500f, 1.05078125f, 1.05468750f, 1.05859375f,
-  1.06250000f, 1.06640625f, 1.07031250f, 1.07421875f,
-  1.07812500f, 1.08203125f, 1.08593750f, 1.08984375f,
-  1.09375000f, 1.09765625f, 1.10156250f, 1.10546875f,
-  1.10937500f, 1.11328125f, 1.11718750f, 1.12109375f,
-  1.12500000f, 1.12890625f, 1.13281250f, 1.13671875f,
-  1.14062500f, 1.14453125f, 1.14843750f, 1.15234375f,
-  1.15625000f, 1.16015625f, 1.16406250f, 1.16796875f,
-  1.17187500f, 1.17578125f, 1.17968750f, 1.18359375f,
-  1.18750000f, 1.19140625f, 1.19531250f, 1.19921875f,
-  1.20312500f, 1.20703125f, 1.21093750f, 1.21484375f,
-  1.21875000f, 1.22265625f, 1.22656250f, 1.23046875f,
-  1.23437500f, 1.23828125f, 1.24218750f, 1.24609375f,
-  1.25000000f, 1.25390625f, 1.25781250f, 1.26171875f,
-  1.26562500f, 1.26953125f, 1.27343750f, 1.27734375f,
-  1.28125000f, 1.28515625f, 1.28906250f, 1.29296875f,
-  1.29687500f, 1.30078125f, 1.30468750f, 1.30859375f,
-  1.31250000f, 1.31640625f, 1.32031250f, 1.32421875f,
-  1.32812500f, 1.33203125f, 1.33593750f, 1.33984375f,
-  1.34375000f, 1.34765625f, 1.35156250f, 1.35546875f,
-  1.35937500f, 1.36328125f, 1.36718750f, 1.37109375f,
-  1.37500000f, 1.37890625f, 1.38281250f, 1.38671875f,
-  1.39062500f, 1.39453125f, 1.39843750f, 1.40234375f,
-  1.40625000f, 1.41015625f, 1.41406250f, 1.41796875f,
-  1.42187500f, 1.42578125f, 1.42968750f, 1.43359375f,
-  1.43750000f, 1.44140625f, 1.44531250f, 1.44921875f,
-  1.45312500f, 1.45703125f, 1.46093750f, 1.46484375f,
-  1.46875000f, 1.47265625f, 1.47656250f, 1.48046875f,
-  1.48437500f, 1.48828125f, 1.49218750f, 1.49609375f,
-  1.50000000f, 1.50390625f, 1.50781250f, 1.51171875f,
-  1.51562500f, 1.51953125f, 1.52343750f, 1.52734375f,
-  1.53125000f, 1.53515625f, 1.53906250f, 1.54296875f,
-  1.54687500f, 1.55078125f, 1.55468750f, 1.55859375f,
-  1.56250000f, 1.56640625f, 1.57031250f, 1.57421875f,
-  1.57812500f, 1.58203125f, 1.58593750f, 1.58984375f,
-  1.59375000f, 1.59765625f, 1.60156250f, 1.60546875f,
-  1.60937500f, 1.61328125f, 1.61718750f, 1.62109375f,
-  1.62500000f, 1.62890625f, 1.63281250f, 1.63671875f,
-  1.64062500f, 1.64453125f, 1.64843750f, 1.65234375f,
-  1.65625000f, 1.66015625f, 1.66406250f, 1.66796875f,
-  1.67187500f, 1.67578125f, 1.67968750f, 1.68359375f,
-  1.68750000f, 1.69140625f, 1.69531250f, 1.69921875f,
-  1.70312500f, 1.70703125f, 1.71093750f, 1.71484375f,
-  1.71875000f, 1.72265625f, 1.72656250f, 1.73046875f,
-  1.73437500f, 1.73828125f, 1.74218750f, 1.74609375f,
-  1.75000000f, 1.75390625f, 1.75781250f, 1.76171875f,
-  1.76562500f, 1.76953125f, 1.77343750f, 1.77734375f,
-  1.78125000f, 1.78515625f, 1.78906250f, 1.79296875f,
-  1.79687500f, 1.80078125f, 1.80468750f, 1.80859375f,
-  1.81250000f, 1.81640625f, 1.82031250f, 1.82421875f,
-  1.82812500f, 1.83203125f, 1.83593750f, 1.83984375f,
-  1.84375000f, 1.84765625f, 1.85156250f, 1.85546875f,
-  1.85937500f, 1.86328125f, 1.86718750f, 1.87109375f,
-  1.87500000f, 1.87890625f, 1.88281250f, 1.88671875f,
-  1.89062500f, 1.89453125f, 1.89843750f, 1.90234375f,
-  1.90625000f, 1.91015625f, 1.91406250f, 1.91796875f,
-  1.92187500f, 1.92578125f, 1.92968750f, 1.93359375f,
-  1.93750000f, 1.94140625f, 1.94531250f, 1.94921875f,
-  1.95312500f, 1.95703125f, 1.96093750f, 1.96484375f,
-  1.96875000f, 1.97265625f, 1.97656250f, 1.98046875f,
-  1.98437500f, 1.98828125f, 1.99218750f, 1.99609375f,
-  2.00000000f
-};
-
-const mlib_f32 mlib_c_blend_u8_sat[] = {
-           0.0f,    8388608.0f,   16777216.0f,   25165824.0f,
-    33554432.0f,   41943040.0f,   50331648.0f,   58720256.0f,
-    67108864.0f,   75497472.0f,   83886080.0f,   92274688.0f,
-   100663296.0f,  109051904.0f,  117440512.0f,  125829120.0f,
-   134217728.0f,  142606336.0f,  150994944.0f,  159383552.0f,
-   167772160.0f,  176160768.0f,  184549376.0f,  192937984.0f,
-   201326592.0f,  209715200.0f,  218103808.0f,  226492416.0f,
-   234881024.0f,  243269632.0f,  251658240.0f,  260046848.0f,
-   268435456.0f,  276824064.0f,  285212672.0f,  293601280.0f,
-   301989888.0f,  310378496.0f,  318767104.0f,  327155712.0f,
-   335544320.0f,  343932928.0f,  352321536.0f,  360710144.0f,
-   369098752.0f,  377487360.0f,  385875968.0f,  394264576.0f,
-   402653184.0f,  411041792.0f,  419430400.0f,  427819008.0f,
-   436207616.0f,  444596224.0f,  452984832.0f,  461373440.0f,
-   469762048.0f,  478150656.0f,  486539264.0f,  494927872.0f,
-   503316480.0f,  511705088.0f,  520093696.0f,  528482304.0f,
-   536870912.0f,  545259520.0f,  553648128.0f,  562036736.0f,
-   570425344.0f,  578813952.0f,  587202560.0f,  595591168.0f,
-   603979776.0f,  612368384.0f,  620756992.0f,  629145600.0f,
-   637534208.0f,  645922816.0f,  654311424.0f,  662700032.0f,
-   671088640.0f,  679477248.0f,  687865856.0f,  696254464.0f,
-   704643072.0f,  713031680.0f,  721420288.0f,  729808896.0f,
-   738197504.0f,  746586112.0f,  754974720.0f,  763363328.0f,
-   771751936.0f,  780140544.0f,  788529152.0f,  796917760.0f,
-   805306368.0f,  813694976.0f,  822083584.0f,  830472192.0f,
-   838860800.0f,  847249408.0f,  855638016.0f,  864026624.0f,
-   872415232.0f,  880803840.0f,  889192448.0f,  897581056.0f,
-   905969664.0f,  914358272.0f,  922746880.0f,  931135488.0f,
-   939524096.0f,  947912704.0f,  956301312.0f,  964689920.0f,
-   973078528.0f,  981467136.0f,  989855744.0f,  998244352.0f,
-  1006632960.0f, 1015021568.0f, 1023410176.0f, 1031798784.0f,
-  1040187392.0f, 1048576000.0f, 1056964608.0f, 1065353216.0f,
-  1073741824.0f, 1082130432.0f, 1090519040.0f, 1098907648.0f,
-  1107296256.0f, 1115684864.0f, 1124073472.0f, 1132462080.0f,
-  1140850688.0f, 1149239296.0f, 1157627904.0f, 1166016512.0f,
-  1174405120.0f, 1182793728.0f, 1191182336.0f, 1199570944.0f,
-  1207959552.0f, 1216348160.0f, 1224736768.0f, 1233125376.0f,
-  1241513984.0f, 1249902592.0f, 1258291200.0f, 1266679808.0f,
-  1275068416.0f, 1283457024.0f, 1291845632.0f, 1300234240.0f,
-  1308622848.0f, 1317011456.0f, 1325400064.0f, 1333788672.0f,
-  1342177280.0f, 1350565888.0f, 1358954496.0f, 1367343104.0f,
-  1375731712.0f, 1384120320.0f, 1392508928.0f, 1400897536.0f,
-  1409286144.0f, 1417674752.0f, 1426063360.0f, 1434451968.0f,
-  1442840576.0f, 1451229184.0f, 1459617792.0f, 1468006400.0f,
-  1476395008.0f, 1484783616.0f, 1493172224.0f, 1501560832.0f,
-  1509949440.0f, 1518338048.0f, 1526726656.0f, 1535115264.0f,
-  1543503872.0f, 1551892480.0f, 1560281088.0f, 1568669696.0f,
-  1577058304.0f, 1585446912.0f, 1593835520.0f, 1602224128.0f,
-  1610612736.0f, 1619001344.0f, 1627389952.0f, 1635778560.0f,
-  1644167168.0f, 1652555776.0f, 1660944384.0f, 1669332992.0f,
-  1677721600.0f, 1686110208.0f, 1694498816.0f, 1702887424.0f,
-  1711276032.0f, 1719664640.0f, 1728053248.0f, 1736441856.0f,
-  1744830464.0f, 1753219072.0f, 1761607680.0f, 1769996288.0f,
-  1778384896.0f, 1786773504.0f, 1795162112.0f, 1803550720.0f,
-  1811939328.0f, 1820327936.0f, 1828716544.0f, 1837105152.0f,
-  1845493760.0f, 1853882368.0f, 1862270976.0f, 1870659584.0f,
-  1879048192.0f, 1887436800.0f, 1895825408.0f, 1904214016.0f,
-  1912602624.0f, 1920991232.0f, 1929379840.0f, 1937768448.0f,
-  1946157056.0f, 1954545664.0f, 1962934272.0f, 1971322880.0f,
-  1979711488.0f, 1988100096.0f, 1996488704.0f, 2004877312.0f,
-  2013265920.0f, 2021654528.0f, 2030043136.0f, 2038431744.0f,
-  2046820352.0f, 2055208960.0f, 2063597568.0f, 2071986176.0f,
-  2080374784.0f, 2088763392.0f, 2097152000.0f, 2105540608.0f,
-  2113929216.0f, 2122317824.0f, 2130706432.0f, 2139095040.0f,
-  2147483648.0f
-};
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageBlendTable.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageBlendTable.h
deleted file mode 100644
index 2e95d502478..00000000000
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageBlendTable.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, 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.
- */
-
-/*
- *    These tables are used by C versions of the
- *    mlib_ImageBlend_... functions.
- */
-
-#ifndef MLIB_C_IMAGE_BLEND_TABLE_H
-#define MLIB_C_IMAGE_BLEND_TABLE_H
-
-#include "mlib_image.h"
-
-extern const mlib_f32 mlib_c_blend_u8[];
-extern const mlib_f32 mlib_U82F32[];
-extern const mlib_f32 mlib_c_blend_Q8[];
-extern const mlib_f32 mlib_c_blend_u8_sat[];
-
-#endif /* MLIB_C_IMAGEF_BLEND_TABLE_H */
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv.h
index 41fb98072b9..8097c7d11ed 100644
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv.h
+++ b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv.h
@@ -41,118 +41,6 @@ return status; \
 }
 #endif /* FREE_AND_RETURN_STATUS */
 
-mlib_status mlib_c_conv2x2ext_s16(mlib_image       *dst,
-                                  const mlib_image *src,
-                                  mlib_s32         dx_l,
-                                  mlib_s32         dx_r,
-                                  mlib_s32         dy_t,
-                                  mlib_s32         dy_b,
-                                  const mlib_s32   *kern,
-                                  mlib_s32         scale,
-                                  mlib_s32         cmask);
-
-mlib_status mlib_c_conv2x2ext_u16(mlib_image       *dst,
-                                  const mlib_image *src,
-                                  mlib_s32         dx_l,
-                                  mlib_s32         dx_r,
-                                  mlib_s32         dy_t,
-                                  mlib_s32         dy_b,
-                                  const mlib_s32   *kern,
-                                  mlib_s32         scale,
-                                  mlib_s32         cmask);
-
-mlib_status mlib_c_conv2x2ext_u8(mlib_image       *dst,
-                                 const mlib_image *src,
-                                 mlib_s32         dx_l,
-                                 mlib_s32         dx_r,
-                                 mlib_s32         dy_t,
-                                 mlib_s32         dy_b,
-                                 const mlib_s32   *kern,
-                                 mlib_s32         scale,
-                                 mlib_s32         cmask);
-
-mlib_status mlib_c_conv2x2nw_s16(mlib_image       *dst,
-                                 const mlib_image *src,
-                                 const mlib_s32   *kern,
-                                 mlib_s32         scale,
-                                 mlib_s32         cmask);
-
-mlib_status mlib_c_conv2x2nw_u16(mlib_image       *dst,
-                                 const mlib_image *src,
-                                 const mlib_s32   *kern,
-                                 mlib_s32         scale,
-                                 mlib_s32         cmask);
-
-mlib_status mlib_c_conv2x2nw_u8(mlib_image       *dst,
-                                const mlib_image *src,
-                                const mlib_s32   *kern,
-                                mlib_s32         scale,
-                                mlib_s32         cmask);
-
-mlib_status mlib_c_conv3x3ext_u8(mlib_image       *dst,
-                                 const mlib_image *src,
-                                 mlib_s32         dx_l,
-                                 mlib_s32         dx_r,
-                                 mlib_s32         dy_t,
-                                 mlib_s32         dy_b,
-                                 const mlib_s32   *kern,
-                                 mlib_s32         scale,
-                                 mlib_s32         cmask);
-
-mlib_status mlib_c_conv3x3nw_u8(mlib_image       *dst,
-                                const mlib_image *src,
-                                const mlib_s32   *kern,
-                                mlib_s32         scale,
-                                mlib_s32         cmask);
-
-mlib_status mlib_c_conv4x4ext_u8(mlib_image       *dst,
-                                 const mlib_image *src,
-                                 mlib_s32         dx_l,
-                                 mlib_s32         dx_r,
-                                 mlib_s32         dy_t,
-                                 mlib_s32         dy_b,
-                                 const mlib_s32   *kern,
-                                 mlib_s32         scale,
-                                 mlib_s32         cmask);
-
-mlib_status mlib_c_conv4x4nw_u8(mlib_image       *dst,
-                                const mlib_image *src,
-                                const mlib_s32   *kern,
-                                mlib_s32         scale,
-                                mlib_s32         cmask);
-
-mlib_status mlib_c_conv5x5ext_u8(mlib_image       *dst,
-                                 const mlib_image *src,
-                                 mlib_s32         dx_l,
-                                 mlib_s32         dx_r,
-                                 mlib_s32         dy_t,
-                                 mlib_s32         dy_b,
-                                 const mlib_s32   *kern,
-                                 mlib_s32         scale,
-                                 mlib_s32         cmask);
-
-mlib_status mlib_c_conv5x5nw_u8(mlib_image       *dst,
-                                const mlib_image *src,
-                                const mlib_s32   *kern,
-                                mlib_s32         scale,
-                                mlib_s32         cmask);
-
-mlib_status mlib_c_conv7x7ext_u8(mlib_image       *dst,
-                                 const mlib_image *src,
-                                 mlib_s32         dx_l,
-                                 mlib_s32         dx_r,
-                                 mlib_s32         dy_t,
-                                 mlib_s32         dy_b,
-                                 const mlib_s32   *kern,
-                                 mlib_s32         scale,
-                                 mlib_s32         cmask);
-
-mlib_status mlib_c_conv7x7nw_u8(mlib_image       *dst,
-                                const mlib_image *src,
-                                const mlib_s32   *kern,
-                                mlib_s32         scale,
-                                mlib_s32         cmask);
-
 mlib_status mlib_c_convMxNnw_u8(mlib_image       *dst,
                                 const mlib_image *src,
                                 const mlib_s32   *kernel,
@@ -177,102 +65,6 @@ mlib_status mlib_c_convMxNext_u8(mlib_image       *dst,
 
 #if ! defined ( __sparc ) /* for x86, using integer multiplies is faster */
 
-mlib_status mlib_i_conv3x3ext_s16(mlib_image       *dst,
-                                  const mlib_image *src,
-                                  mlib_s32         dx_l,
-                                  mlib_s32         dx_r,
-                                  mlib_s32         dy_t,
-                                  mlib_s32         dy_b,
-                                  const mlib_s32   *kern,
-                                  mlib_s32         scale,
-                                  mlib_s32         cmask);
-
-mlib_status mlib_i_conv3x3ext_u16(mlib_image       *dst,
-                                  const mlib_image *src,
-                                  mlib_s32         dx_l,
-                                  mlib_s32         dx_r,
-                                  mlib_s32         dy_t,
-                                  mlib_s32         dy_b,
-                                  const mlib_s32   *kern,
-                                  mlib_s32         scale,
-                                  mlib_s32         cmask);
-
-mlib_status mlib_i_conv3x3ext_u8(mlib_image       *dst,
-                                 const mlib_image *src,
-                                 mlib_s32         dx_l,
-                                 mlib_s32         dx_r,
-                                 mlib_s32         dy_t,
-                                 mlib_s32         dy_b,
-                                 const mlib_s32   *kern,
-                                 mlib_s32         scale,
-                                 mlib_s32         cmask);
-
-mlib_status mlib_i_conv3x3nw_s16(mlib_image       *dst,
-                                 const mlib_image *src,
-                                 const mlib_s32   *kern,
-                                 mlib_s32         scale,
-                                 mlib_s32         cmask);
-
-mlib_status mlib_i_conv3x3nw_u16(mlib_image       *dst,
-                                 const mlib_image *src,
-                                 const mlib_s32   *kern,
-                                 mlib_s32         scale,
-                                 mlib_s32         cmask);
-
-mlib_status mlib_i_conv3x3nw_u8(mlib_image       *dst,
-                                const mlib_image *src,
-                                const mlib_s32   *kern,
-                                mlib_s32         scale,
-                                mlib_s32         cmask);
-
-mlib_status mlib_i_conv5x5ext_s16(mlib_image       *dst,
-                                  const mlib_image *src,
-                                  mlib_s32         dx_l,
-                                  mlib_s32         dx_r,
-                                  mlib_s32         dy_t,
-                                  mlib_s32         dy_b,
-                                  const mlib_s32   *kern,
-                                  mlib_s32         scale,
-                                  mlib_s32         cmask);
-
-mlib_status mlib_i_conv5x5ext_u16(mlib_image       *dst,
-                                  const mlib_image *src,
-                                  mlib_s32         dx_l,
-                                  mlib_s32         dx_r,
-                                  mlib_s32         dy_t,
-                                  mlib_s32         dy_b,
-                                  const mlib_s32   *kern,
-                                  mlib_s32         scale,
-                                  mlib_s32         cmask);
-
-mlib_status mlib_i_conv5x5ext_u8(mlib_image       *dst,
-                                 const mlib_image *src,
-                                 mlib_s32         dx_l,
-                                 mlib_s32         dx_r,
-                                 mlib_s32         dy_t,
-                                 mlib_s32         dy_b,
-                                 const mlib_s32   *kern,
-                                 mlib_s32         scale,
-                                 mlib_s32         cmask);
-
-mlib_status mlib_i_conv5x5nw_s16(mlib_image       *dst,
-                                 const mlib_image *src,
-                                 const mlib_s32   *kern,
-                                 mlib_s32         scale,
-                                 mlib_s32         cmask);
-
-mlib_status mlib_i_conv5x5nw_u16(mlib_image       *dst,
-                                 const mlib_image *src,
-                                 const mlib_s32   *kern,
-                                 mlib_s32         scale,
-                                 mlib_s32         cmask);
-
-mlib_status mlib_i_conv5x5nw_u8(mlib_image       *dst,
-                                const mlib_image *src,
-                                const mlib_s32   *kern,
-                                mlib_s32         scale,
-                                mlib_s32         cmask);
-
 mlib_status mlib_i_convMxNnw_s16(mlib_image       *dst,
                                  const mlib_image *src,
                                  const mlib_s32   *kernel,
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv_f.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv_f.c
index de4276b9bc3..825f973779e 100644
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv_f.c
+++ b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv_f.c
@@ -28,34 +28,6 @@
 #include "mlib_ImageConv.h"
 #include "mlib_c_ImageConv.h"
 
-/***************************************************************/
-#define MLIB_PARAMS_CONV_NW                                     \
-  mlib_image       *dst,                                        \
-  const mlib_image *src,                                        \
-  const mlib_s32   *kern,                                       \
-  mlib_s32         scale,                                       \
-  mlib_s32         cmask
-
-/***************************************************************/
-#define MLIB_CALL_PARAMS_CONV_NW                                \
-  dst, src, kern, scale, cmask
-
-/***************************************************************/
-#define MLIB_PARAMS_CONV_EXT                                    \
-  mlib_image       *dst,                                        \
-  const mlib_image *src,                                        \
-  mlib_s32         dx_l,                                        \
-  mlib_s32         dx_r,                                        \
-  mlib_s32         dy_t,                                        \
-  mlib_s32         dy_b,                                        \
-  const mlib_s32   *kern,                                       \
-  mlib_s32         scale,                                       \
-  mlib_s32         cmask
-
-/***************************************************************/
-#define MLIB_CALL_PARAMS_CONV_EXT                               \
-  dst, src, dx_l, dx_r, dy_t, dy_b, kern, scale, cmask
-
 /***************************************************************/
 #define MLIB_PARAMS_CONV_MN_NW                                  \
   mlib_image *dst,                                              \
@@ -91,52 +63,6 @@
   dst, src, kern, m, n, dx_l, dx_r, dy_t, dy_b, scale, cmask
 
 
-/***************************************************************/
-mlib_status mlib_conv2x2nw_u8(MLIB_PARAMS_CONV_NW)
-{
-  return mlib_c_conv2x2nw_u8(MLIB_CALL_PARAMS_CONV_NW);
-}
-
-/***************************************************************/
-mlib_status mlib_conv3x3nw_u8(MLIB_PARAMS_CONV_NW)
-{
-#ifdef __sparc
-  return mlib_c_conv3x3nw_u8(MLIB_CALL_PARAMS_CONV_NW);
-#else
-
-  if (mlib_ImageConvVersion(3, 3, scale, MLIB_BYTE) == 0)
-    return mlib_c_conv3x3nw_u8(MLIB_CALL_PARAMS_CONV_NW);
-  else
-    return mlib_i_conv3x3nw_u8(MLIB_CALL_PARAMS_CONV_NW);
-#endif /* __sparc */
-}
-
-/***************************************************************/
-mlib_status mlib_conv4x4nw_u8(MLIB_PARAMS_CONV_NW)
-{
-  return mlib_c_conv4x4nw_u8(MLIB_CALL_PARAMS_CONV_NW);
-}
-
-/***************************************************************/
-mlib_status mlib_conv5x5nw_u8(MLIB_PARAMS_CONV_NW)
-{
-#ifdef __sparc
-  return mlib_c_conv5x5nw_u8(MLIB_CALL_PARAMS_CONV_NW);
-#else
-
-  if (mlib_ImageConvVersion(5, 5, scale, MLIB_BYTE) == 0)
-    return mlib_c_conv5x5nw_u8(MLIB_CALL_PARAMS_CONV_NW);
-  else
-    return mlib_i_conv5x5nw_u8(MLIB_CALL_PARAMS_CONV_NW);
-#endif /* __sparc */
-}
-
-/***************************************************************/
-mlib_status mlib_conv7x7nw_u8(MLIB_PARAMS_CONV_NW)
-{
-  return mlib_c_conv7x7nw_u8(MLIB_CALL_PARAMS_CONV_NW);
-}
-
 /***************************************************************/
 mlib_status mlib_convMxNnw_u8(MLIB_PARAMS_CONV_MN_NW)
 {
@@ -151,52 +77,6 @@ mlib_status mlib_convMxNnw_u8(MLIB_PARAMS_CONV_MN_NW)
 #endif /* __sparc */
 }
 
-/***************************************************************/
-mlib_status mlib_conv2x2ext_u8(MLIB_PARAMS_CONV_EXT)
-{
-  return mlib_c_conv2x2ext_u8(MLIB_CALL_PARAMS_CONV_EXT);
-}
-
-/***************************************************************/
-mlib_status mlib_conv3x3ext_u8(MLIB_PARAMS_CONV_EXT)
-{
-#ifdef __sparc
-  return mlib_c_conv3x3ext_u8(MLIB_CALL_PARAMS_CONV_EXT);
-#else
-
-  if (mlib_ImageConvVersion(3, 3, scale, MLIB_BYTE) == 0)
-    return mlib_c_conv3x3ext_u8(MLIB_CALL_PARAMS_CONV_EXT);
-  else
-    return mlib_i_conv3x3ext_u8(MLIB_CALL_PARAMS_CONV_EXT);
-#endif /* __sparc */
-}
-
-/***************************************************************/
-mlib_status mlib_conv4x4ext_u8(MLIB_PARAMS_CONV_EXT)
-{
-  return mlib_c_conv4x4ext_u8(MLIB_CALL_PARAMS_CONV_EXT);
-}
-
-/***************************************************************/
-mlib_status mlib_conv5x5ext_u8(MLIB_PARAMS_CONV_EXT)
-{
-#ifdef __sparc
-  return mlib_c_conv5x5ext_u8(MLIB_CALL_PARAMS_CONV_EXT);
-#else
-
-  if (mlib_ImageConvVersion(5, 5, scale, MLIB_BYTE) == 0)
-    return mlib_c_conv5x5ext_u8(MLIB_CALL_PARAMS_CONV_EXT);
-  else
-    return mlib_i_conv5x5ext_u8(MLIB_CALL_PARAMS_CONV_EXT);
-#endif /* __sparc */
-}
-
-/***************************************************************/
-mlib_status mlib_conv7x7ext_u8(MLIB_PARAMS_CONV_EXT)
-{
-  return mlib_c_conv7x7ext_u8(MLIB_CALL_PARAMS_CONV_EXT);
-}
-
 /***************************************************************/
 mlib_status mlib_convMxNext_u8(MLIB_PARAMS_CONV_MN_EXT)
 {
@@ -212,27 +92,3 @@ mlib_status mlib_convMxNext_u8(MLIB_PARAMS_CONV_MN_EXT)
 }
 
 /***************************************************************/
-mlib_status mlib_conv2x2nw_s16(MLIB_PARAMS_CONV_NW)
-{
-  return mlib_c_conv2x2nw_s16(MLIB_CALL_PARAMS_CONV_NW);
-}
-
-/***************************************************************/
-mlib_status mlib_conv2x2nw_u16(MLIB_PARAMS_CONV_NW)
-{
-  return mlib_c_conv2x2nw_u16(MLIB_CALL_PARAMS_CONV_NW);
-}
-
-/***************************************************************/
-mlib_status mlib_conv2x2ext_s16(MLIB_PARAMS_CONV_EXT)
-{
-  return mlib_c_conv2x2ext_s16(MLIB_CALL_PARAMS_CONV_EXT);
-}
-
-/***************************************************************/
-mlib_status mlib_conv2x2ext_u16(MLIB_PARAMS_CONV_EXT)
-{
-  return mlib_c_conv2x2ext_u16(MLIB_CALL_PARAMS_CONV_EXT);
-}
-
-/***************************************************************/
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageThresh1.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageThresh1.h
deleted file mode 100644
index 54449b45da2..00000000000
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageThresh1.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2003, 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.
- */
-
-
-#ifndef __MLIB_C_IMAGETHRESH1_H
-#define __MLIB_C_IMAGETHRESH1_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/***************************************************************/
-#define PARAMS                                                  \
-  void     *psrc,                                               \
-  void     *pdst,                                               \
-  mlib_s32 src_stride,                                          \
-  mlib_s32 dst_stride,                                          \
-  mlib_s32 width,                                               \
-  mlib_s32 height,                                              \
-  void     *__thresh,                                           \
-  void     *__ghigh,                                            \
-  void     *__glow
-
-void mlib_c_ImageThresh1_D641(PARAMS);
-void mlib_c_ImageThresh1_D642(PARAMS);
-void mlib_c_ImageThresh1_D643(PARAMS);
-void mlib_c_ImageThresh1_D644(PARAMS);
-void mlib_c_ImageThresh1_D641_1B(PARAMS, mlib_s32 dbit_off);
-void mlib_c_ImageThresh1_D642_1B(PARAMS, mlib_s32 dbit_off);
-void mlib_c_ImageThresh1_D643_1B(PARAMS, mlib_s32 dbit_off);
-void mlib_c_ImageThresh1_D644_1B(PARAMS, mlib_s32 dbit_off);
-
-void mlib_c_ImageThresh1_F321(PARAMS);
-void mlib_c_ImageThresh1_F322(PARAMS);
-void mlib_c_ImageThresh1_F323(PARAMS);
-void mlib_c_ImageThresh1_F324(PARAMS);
-void mlib_c_ImageThresh1_F321_1B(PARAMS, mlib_s32 dbit_off);
-void mlib_c_ImageThresh1_F322_1B(PARAMS, mlib_s32 dbit_off);
-void mlib_c_ImageThresh1_F323_1B(PARAMS, mlib_s32 dbit_off);
-void mlib_c_ImageThresh1_F324_1B(PARAMS, mlib_s32 dbit_off);
-
-void mlib_c_ImageThresh1_S321(PARAMS);
-void mlib_c_ImageThresh1_S322(PARAMS);
-void mlib_c_ImageThresh1_S323(PARAMS);
-void mlib_c_ImageThresh1_S324(PARAMS);
-void mlib_c_ImageThresh1_S321_1B(PARAMS, mlib_s32 dbit_off);
-void mlib_c_ImageThresh1_S322_1B(PARAMS, mlib_s32 dbit_off);
-void mlib_c_ImageThresh1_S323_1B(PARAMS, mlib_s32 dbit_off);
-void mlib_c_ImageThresh1_S324_1B(PARAMS, mlib_s32 dbit_off);
-
-void mlib_c_ImageThresh1_S161(PARAMS);
-void mlib_c_ImageThresh1_S162(PARAMS);
-void mlib_c_ImageThresh1_S163(PARAMS);
-void mlib_c_ImageThresh1_S164(PARAMS);
-void mlib_c_ImageThresh1_S161_1B(PARAMS, mlib_s32 dbit_off);
-void mlib_c_ImageThresh1_S162_1B(PARAMS, mlib_s32 dbit_off);
-void mlib_c_ImageThresh1_S163_1B(PARAMS, mlib_s32 dbit_off);
-void mlib_c_ImageThresh1_S164_1B(PARAMS, mlib_s32 dbit_off);
-
-void mlib_c_ImageThresh1_U161(PARAMS);
-void mlib_c_ImageThresh1_U162(PARAMS);
-void mlib_c_ImageThresh1_U163(PARAMS);
-void mlib_c_ImageThresh1_U164(PARAMS);
-void mlib_c_ImageThresh1_U161_1B(PARAMS, mlib_s32 dbit_off);
-void mlib_c_ImageThresh1_U162_1B(PARAMS, mlib_s32 dbit_off);
-void mlib_c_ImageThresh1_U163_1B(PARAMS, mlib_s32 dbit_off);
-void mlib_c_ImageThresh1_U164_1B(PARAMS, mlib_s32 dbit_off);
-
-void mlib_c_ImageThresh1_U81(PARAMS);
-void mlib_c_ImageThresh1_U82(PARAMS);
-void mlib_c_ImageThresh1_U83(PARAMS);
-void mlib_c_ImageThresh1_U84(PARAMS);
-void mlib_c_ImageThresh1_U81_1B(PARAMS, mlib_s32 dbit_off);
-void mlib_c_ImageThresh1_U82_1B(PARAMS, mlib_s32 dbit_off);
-void mlib_c_ImageThresh1_U83_1B(PARAMS, mlib_s32 dbit_off);
-void mlib_c_ImageThresh1_U84_1B(PARAMS, mlib_s32 dbit_off);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* __MLIB_C_IMAGETHRESH1_H */
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageThresh1_U8.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageThresh1_U8.c
deleted file mode 100644
index d16b069109c..00000000000
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageThresh1_U8.c
+++ /dev/null
@@ -1,848 +0,0 @@
-/*
- * Copyright (c) 2003, 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.
- */
-
-
-/*
- * FUNCTION
- *      mlib_ImageThresh1 - thresholding
- *
- * SYNOPSIS
- *      mlib_status mlib_ImageThresh1(mlib_image       *dst,
- *                                    const mlib_image *src,
- *                                    const mlib_s32   *thresh,
- *                                    const mlib_s32   *ghigh,
- *                                    const mlib_s32   *glow);
- *
- * ARGUMENT
- *      dst     pointer to output image
- *      src     pointer to input image
- *      thresh  array of thresholds
- *      ghigh   array of values above thresholds
- *      glow    array of values below thresholds
- *
- * RESTRICTION
- *      The images must have the same size, and the same number
- *      of channels.
- *      The images can have 1, 2, 3, or 4 channels.
- *      The images can be in MLIB_BYTE, MLIB_SHORT or MLIB_INT data type.
- *      The type of the output image can be MLIB_BIT, or the same as the
- *      type of the input image.
- *
- * DESCRIPTION
- *      If the pixel band value is above the threshold for that channel,
- *      set the destination to the ghigh value for that channel.
- *      Otherwise, set the destination to the glow value for that channel.
- *
- *                      +- glow[c]   src[x][y][c] <= thresh[c]
- *      dst[x][y][c]  = |
- *                      +- ghigh[c]  src[x][y][c] >  thresh[c]
- */
-
-#include "mlib_image.h"
-#include "mlib_ImageCheck.h"
-#include "mlib_c_ImageThresh1.h"
-
-/***************************************************************/
-#define STYPE           mlib_u8
-#define TTYPE           mlib_s32
-#define T_SHIFT         31
-
-/***************************************************************/
-#define DO_THRESH(s0, th, gl, gh)                               \
-  (((gh) & (((th) - (TTYPE)(s0)) >> T_SHIFT)) |                 \
-   ((gl) &~ (((th) - (TTYPE)(s0)) >> T_SHIFT)))
-
-/***************************************************************/
-#define THRESH1_CMP_SHIFT(s0, th, sh)                           \
-  ((((th) - (s0)) >> T_SHIFT) & (1 << (sh)))
-
-/***************************************************************/
-#define STRIP(pd, ps, w, h, ch, th, gh, gl) {                   \
-    STYPE s0;                                                   \
-    for ( i = 0; i < h; i++ ) {                                 \
-      for (j = 0; j < w; j ++)  {                               \
-        for (k = 0; k < ch; k++) {                              \
-          s0 = ((STYPE*)ps)[i*src_stride + j*ch + k];           \
-          ((STYPE*)pd)[i*dst_stride + j*ch + k] =               \
-                (s0 <= th[k]) ? gl[k]: gh[k];                   \
-        }                                                       \
-      }                                                         \
-    }                                                           \
-  }
-
-/***************************************************************/
-#define INIT_THRESH0(n)                                         \
-  thresh0 = thresh[n];                                          \
-  ghigh0  = ghigh[n];                                           \
-  glow0   = glow[n]
-
-/***************************************************************/
-#define INIT_THRESH1(n)                                         \
-  thresh1 = thresh[n];                                          \
-  ghigh1  = ghigh[n];                                           \
-  glow1   = glow[n]
-
-/***************************************************************/
-#define INIT_THRESH2(n)                                         \
-  thresh2 = thresh[n];                                          \
-  ghigh2  = ghigh[n];                                           \
-  glow2   = glow[n]
-
-/***************************************************************/
-#define INIT_THRESH3(n)                                         \
-  thresh3 = thresh[n];                                          \
-  ghigh3  = ghigh[n];                                           \
-  glow3   = glow[n]
-
-/***************************************************************/
-#define THRESH0(s0) DO_THRESH(s0, thresh0, glow0, ghigh0)
-#define THRESH1(s0) DO_THRESH(s0, thresh1, glow1, ghigh1)
-#define THRESH2(s0) DO_THRESH(s0, thresh2, glow2, ghigh2)
-#define THRESH3(s0) DO_THRESH(s0, thresh3, glow3, ghigh3)
-
-/***************************************************************/
-void mlib_c_ImageThresh1_U81(PARAMS)
-{
-  mlib_s32 *thresh = (void *)__thresh;
-  mlib_s32 *ghigh = (void *)__ghigh;
-  mlib_s32 *glow = (void *)__glow;
-  STYPE *psrc_row = psrc;
-  STYPE *pdst_row = pdst;
-  TTYPE thresh0;
-  TTYPE ghigh0;
-  TTYPE glow0;
-  mlib_s32 i, j, k;
-
-  if (width < 16) {
-    STRIP(pdst, psrc, width, height, 1, thresh, ghigh, glow);
-    return;
-  }
-
-  INIT_THRESH0(0);
-
-  for (i = 0; i < height; i++) {
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (j = 0; j <= (width - 8); j += 8) {
-      pdst_row[j] = THRESH0(psrc_row[j]);
-      pdst_row[j + 1] = THRESH0(psrc_row[j + 1]);
-      pdst_row[j + 2] = THRESH0(psrc_row[j + 2]);
-      pdst_row[j + 3] = THRESH0(psrc_row[j + 3]);
-      pdst_row[j + 4] = THRESH0(psrc_row[j + 4]);
-      pdst_row[j + 5] = THRESH0(psrc_row[j + 5]);
-      pdst_row[j + 6] = THRESH0(psrc_row[j + 6]);
-      pdst_row[j + 7] = THRESH0(psrc_row[j + 7]);
-    }
-
-    for (; j < width; j++) {
-      pdst_row[j] = THRESH0(psrc_row[j]);
-    }
-
-    psrc_row += src_stride;
-    pdst_row += dst_stride;
-  }
-}
-
-/***************************************************************/
-void mlib_c_ImageThresh1_U82(PARAMS)
-{
-  mlib_s32 *thresh = (void *)__thresh;
-  mlib_s32 *ghigh = (void *)__ghigh;
-  mlib_s32 *glow = (void *)__glow;
-  STYPE *psrc_row = psrc;
-  STYPE *pdst_row = pdst;
-  TTYPE thresh0, thresh1;
-  TTYPE ghigh0, ghigh1;
-  TTYPE glow0, glow1;
-  mlib_s32 i, j, k;
-
-  if (width < 16) {
-    STRIP(pdst, psrc, width, height, 2, thresh, ghigh, glow);
-    return;
-  }
-
-  INIT_THRESH0(0);
-  INIT_THRESH1(1);
-  width <<= 1;
-
-  for (i = 0; i < height; i++) {
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (j = 0; j <= (width - 8); j += 8) {
-      pdst_row[j] = THRESH0(psrc_row[j]);
-      pdst_row[j + 1] = THRESH1(psrc_row[j + 1]);
-      pdst_row[j + 2] = THRESH0(psrc_row[j + 2]);
-      pdst_row[j + 3] = THRESH1(psrc_row[j + 3]);
-      pdst_row[j + 4] = THRESH0(psrc_row[j + 4]);
-      pdst_row[j + 5] = THRESH1(psrc_row[j + 5]);
-      pdst_row[j + 6] = THRESH0(psrc_row[j + 6]);
-      pdst_row[j + 7] = THRESH1(psrc_row[j + 7]);
-    }
-
-    for (; j < width; j += 2) {
-      pdst_row[j] = THRESH0(psrc_row[j]);
-      pdst_row[j + 1] = THRESH1(psrc_row[j + 1]);
-    }
-
-    psrc_row += src_stride;
-    pdst_row += dst_stride;
-  }
-}
-
-/***************************************************************/
-void mlib_c_ImageThresh1_U83(PARAMS)
-{
-  mlib_s32 *thresh = (void *)__thresh;
-  mlib_s32 *ghigh = (void *)__ghigh;
-  mlib_s32 *glow = (void *)__glow;
-  STYPE *psrc_row = psrc;
-  STYPE *pdst_row = pdst;
-  TTYPE thresh0, thresh1, thresh2;
-  TTYPE ghigh0, ghigh1, ghigh2;
-  TTYPE glow0, glow1, glow2;
-  mlib_s32 i, j, k;
-
-  if (width < 16) {
-    STRIP(pdst, psrc, width, height, 3, thresh, ghigh, glow);
-    return;
-  }
-
-  width = 3 * width;
-  INIT_THRESH0(0);
-  INIT_THRESH1(1);
-  INIT_THRESH2(2);
-
-  for (i = 0; i < height; i++) {
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (j = 0; j <= (width - 12); j += 12) {
-      pdst_row[j] = THRESH0(psrc_row[j]);
-      pdst_row[j + 1] = THRESH1(psrc_row[j + 1]);
-      pdst_row[j + 2] = THRESH2(psrc_row[j + 2]);
-      pdst_row[j + 3] = THRESH0(psrc_row[j + 3]);
-      pdst_row[j + 4] = THRESH1(psrc_row[j + 4]);
-      pdst_row[j + 5] = THRESH2(psrc_row[j + 5]);
-      pdst_row[j + 6] = THRESH0(psrc_row[j + 6]);
-      pdst_row[j + 7] = THRESH1(psrc_row[j + 7]);
-      pdst_row[j + 8] = THRESH2(psrc_row[j + 8]);
-      pdst_row[j + 9] = THRESH0(psrc_row[j + 9]);
-      pdst_row[j + 10] = THRESH1(psrc_row[j + 10]);
-      pdst_row[j + 11] = THRESH2(psrc_row[j + 11]);
-    }
-
-    for (; j < width; j += 3) {
-      pdst_row[j] = THRESH0(psrc_row[j]);
-      pdst_row[j + 1] = THRESH1(psrc_row[j + 1]);
-      pdst_row[j + 2] = THRESH2(psrc_row[j + 2]);
-    }
-
-    psrc_row += src_stride;
-    pdst_row += dst_stride;
-  }
-}
-
-/***************************************************************/
-void mlib_c_ImageThresh1_U84(PARAMS)
-{
-  mlib_s32 *thresh = (void *)__thresh;
-  mlib_s32 *ghigh = (void *)__ghigh;
-  mlib_s32 *glow = (void *)__glow;
-  STYPE *psrc_row = psrc;
-  STYPE *pdst_row = pdst;
-  TTYPE thresh0, thresh1, thresh2, thresh3;
-  TTYPE ghigh0, ghigh1, ghigh2, ghigh3;
-  TTYPE glow0, glow1, glow2, glow3;
-  mlib_s32 i, j, k;
-
-  if (width < 16) {
-    STRIP(pdst, psrc, width, height, 4, thresh, ghigh, glow);
-    return;
-  }
-
-  INIT_THRESH0(0);
-  INIT_THRESH1(1);
-  INIT_THRESH2(2);
-  INIT_THRESH3(3);
-
-  width *= 4;
-
-  for (i = 0; i < height; i++) {
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (j = 0; j <= (width - 8); j += 8) {
-      pdst_row[j] = THRESH0(psrc_row[j]);
-      pdst_row[j + 1] = THRESH1(psrc_row[j + 1]);
-      pdst_row[j + 2] = THRESH2(psrc_row[j + 2]);
-      pdst_row[j + 3] = THRESH3(psrc_row[j + 3]);
-      pdst_row[j + 4] = THRESH0(psrc_row[j + 4]);
-      pdst_row[j + 5] = THRESH1(psrc_row[j + 5]);
-      pdst_row[j + 6] = THRESH2(psrc_row[j + 6]);
-      pdst_row[j + 7] = THRESH3(psrc_row[j + 7]);
-    }
-
-    if (j < width) {
-      pdst_row[j] = THRESH0(psrc_row[j]);
-      pdst_row[j + 1] = THRESH1(psrc_row[j + 1]);
-      pdst_row[j + 2] = THRESH2(psrc_row[j + 2]);
-      pdst_row[j + 3] = THRESH3(psrc_row[j + 3]);
-    }
-
-    psrc_row += src_stride;
-    pdst_row += dst_stride;
-  }
-}
-
-/***************************************************************/
-void mlib_c_ImageThresh1_U81_1B(PARAMS,
-                                mlib_s32 dbit_off)
-{
-  mlib_s32 *thresh = (void *)__thresh;
-  mlib_s32 *ghigh = (void *)__ghigh;
-  mlib_s32 *glow = (void *)__glow;
-  STYPE *psrc_row = psrc;
-  mlib_u8 *pdst_row = pdst;
-  TTYPE thresh0 = thresh[0];
-  mlib_s32 mhigh, mlow, emask, dst0;
-  mlib_s32 i, j, jbit, l;
-
-  mhigh = (ghigh[0] > 0) ? 0xff : 0;
-  mlow = (glow[0] > 0) ? 0xff : 0;
-
-  for (i = 0; i < height; i++) {
-    j = 0;
-    jbit = 0;
-
-    if (dbit_off) {
-      mlib_s32 nume = 8 - dbit_off;
-
-      if (nume > width)
-        nume = width;
-      dst0 = 0;
-      emask = 0;
-
-      for (; j < nume; j++) {
-        emask |= (1 << (7 - (dbit_off + j)));
-        dst0 |= THRESH1_CMP_SHIFT(psrc_row[j], thresh0, 7 - (dbit_off + j));
-      }
-
-      dst0 = (mhigh & dst0) | (mlow & ~dst0);
-      pdst_row[0] = (dst0 & emask) | (pdst_row[0] & ~emask);
-      jbit++;
-    }
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (; j <= (width - 16); j += 16) {
-      dst0 = THRESH1_CMP_SHIFT(psrc_row[j], thresh0, 7) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 1], thresh0, 6) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 2], thresh0, 5) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 3], thresh0, 4) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 4], thresh0, 3) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 5], thresh0, 2) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 6], thresh0, 1) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 7], thresh0, 0);
-      dst0 = (mhigh & dst0) | (mlow & ~dst0);
-      *(pdst_row + jbit) = (mlib_u8) dst0;
-      jbit++;
-      dst0 = THRESH1_CMP_SHIFT(psrc_row[j + 8], thresh0, 7) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 9], thresh0, 6) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 10], thresh0, 5) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 11], thresh0, 4) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 12], thresh0, 3) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 13], thresh0, 2) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 14], thresh0, 1) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 15], thresh0, 0);
-      dst0 = (mhigh & dst0) | (mlow & ~dst0);
-      *(pdst_row + jbit) = (mlib_u8) dst0;
-      jbit++;
-    }
-
-    if (width - j >= 8) {
-      dst0 = THRESH1_CMP_SHIFT(psrc_row[j], thresh0, 7) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 1], thresh0, 6) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 2], thresh0, 5) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 3], thresh0, 4) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 4], thresh0, 3) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 5], thresh0, 2) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 6], thresh0, 1) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 7], thresh0, 0);
-      dst0 = (mhigh & dst0) | (mlow & ~dst0);
-      *(pdst_row + jbit) = (mlib_u8) dst0;
-      jbit++;
-      j += 8;
-    }
-
-    if (j < width) {
-      dst0 = 0;
-      l = 7;
-      for (; j < width; j++) {
-        dst0 |= THRESH1_CMP_SHIFT(psrc_row[j], thresh0, l);
-        l--;
-      }
-
-      emask = (0xFF << (l + 1));
-      dst0 = (mhigh & dst0) | (mlow & ~dst0);
-      pdst_row[jbit] = (dst0 & emask) | (pdst_row[jbit] & ~emask);
-    }
-
-    psrc_row += src_stride;
-    pdst_row += dst_stride;
-  }
-}
-
-/***************************************************************/
-void mlib_c_ImageThresh1_U82_1B(PARAMS,
-                                mlib_s32 dbit_off)
-{
-  mlib_s32 *thresh = (void *)__thresh;
-  mlib_s32 *ghigh = (void *)__ghigh;
-  mlib_s32 *glow = (void *)__glow;
-  STYPE *psrc_row = psrc;
-  mlib_u8 *pdst_row = pdst;
-  TTYPE thresh0 = thresh[0], thresh1 = thresh[1];
-  mlib_s32 mhigh0, mlow0, mhigh, mlow, emask, dst0;
-  mlib_s32 i, j, jbit, l;
-
-  mhigh0 = (ghigh[0] > 0) ? 0xaaa : 0;
-  mhigh0 |= (ghigh[1] > 0) ? 0x555 : 0;
-  mlow0 = (glow[0] > 0) ? 0xaaa : 0;
-  mlow0 |= (glow[1] > 0) ? 0x555 : 0;
-
-  width *= 2;
-
-  for (i = 0; i < height; i++) {
-    thresh0 = thresh[0];
-    thresh1 = thresh[1];
-
-    j = 0;
-    jbit = 0;
-    mhigh = mhigh0 >> (dbit_off & 1);
-    mlow = mlow0 >> (dbit_off & 1);
-
-    if (dbit_off) {
-      mlib_s32 nume = 8 - dbit_off;
-
-      if (nume > width)
-        nume = width;
-      dst0 = 0;
-      emask = 0;
-
-      for (; j <= (nume - 2); j += 2) {
-        emask |= (3 << (6 - (dbit_off + j)));
-        dst0 |= THRESH1_CMP_SHIFT(psrc_row[j], thresh0, 7 - (dbit_off + j));
-        dst0 |= THRESH1_CMP_SHIFT(psrc_row[j + 1], thresh1, 6 - (dbit_off + j));
-      }
-
-      if (j < nume) {
-        emask |= (1 << (7 - (dbit_off + j)));
-        dst0 |= THRESH1_CMP_SHIFT(psrc_row[j], thresh0, 7 - (dbit_off + j));
-        /* swap threshes */
-        thresh0 = thresh[1];
-        thresh1 = thresh[0];
-        j++;
-      }
-
-      dst0 = (mhigh & dst0) | (mlow & ~dst0);
-      pdst_row[0] = (dst0 & emask) | (pdst_row[0] & ~emask);
-      jbit++;
-    }
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (; j <= (width - 16); j += 16) {
-      dst0 = THRESH1_CMP_SHIFT(psrc_row[j], thresh0, 7) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 1], thresh1, 6) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 2], thresh0, 5) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 3], thresh1, 4) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 4], thresh0, 3) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 5], thresh1, 2) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 6], thresh0, 1) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 7], thresh1, 0);
-      dst0 = (mhigh & dst0) | (mlow & ~dst0);
-      *(pdst_row + jbit) = (mlib_u8) dst0;
-      jbit++;
-      dst0 = THRESH1_CMP_SHIFT(psrc_row[j + 8], thresh0, 7) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 9], thresh1, 6) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 10], thresh0, 5) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 11], thresh1, 4) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 12], thresh0, 3) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 13], thresh1, 2) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 14], thresh0, 1) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 15], thresh1, 0);
-      dst0 = (mhigh & dst0) | (mlow & ~dst0);
-      *(pdst_row + jbit) = (mlib_u8) dst0;
-      jbit++;
-    }
-
-    if (width - j >= 8) {
-      dst0 = THRESH1_CMP_SHIFT(psrc_row[j], thresh0, 7) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 1], thresh1, 6) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 2], thresh0, 5) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 3], thresh1, 4) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 4], thresh0, 3) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 5], thresh1, 2) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 6], thresh0, 1) |
-        THRESH1_CMP_SHIFT(psrc_row[j + 7], thresh1, 0);
-      dst0 = (mhigh & dst0) | (mlow & ~dst0);
-      *(pdst_row + jbit) = (mlib_u8) dst0;
-      jbit++;
-      j += 8;
-    }
-
-    if (j < width) {
-      dst0 = 0;
-      l = 7;
-      for (; j <= (width - 2); j += 2) {
-        dst0 |= THRESH1_CMP_SHIFT(psrc_row[j], thresh0, l);
-        dst0 |= THRESH1_CMP_SHIFT(psrc_row[j + 1], thresh1, l - 1);
-        l -= 2;
-      }
-
-      if (j < width) {
-        dst0 |= THRESH1_CMP_SHIFT(psrc_row[j], thresh0, l);
-        l--;
-      }
-
-      emask = (0xFF << (l + 1));
-      dst0 = (mhigh & dst0) | (mlow & ~dst0);
-      pdst_row[jbit] = (dst0 & emask) | (pdst_row[jbit] & ~emask);
-    }
-
-    psrc_row += src_stride;
-    pdst_row += dst_stride;
-  }
-}
-
-/***************************************************************/
-void mlib_c_ImageThresh1_U83_1B(PARAMS,
-                                mlib_s32 dbit_off)
-{
-  mlib_s32 *thresh = (void *)__thresh;
-  mlib_s32 *ghigh = (void *)__ghigh;
-  mlib_s32 *glow = (void *)__glow;
-  STYPE *psrc_row = psrc;
-  mlib_u8 *pdst_row = pdst;
-  TTYPE thresh0, thresh1, thresh2, threshT;
-  mlib_s32 mhigh = 0, mlow = 0;
-  mlib_s32 mhigh0, mlow0, mhigh1, mlow1, mhigh2, mlow2, emask, dst0, dst1;
-  mlib_s32 i, j, jbit, k, l;
-
-  if (ghigh[0] > 0)
-    mhigh = 0x492492;
-
-  if (ghigh[1] > 0)
-    mhigh |= 0x249249;
-
-  if (ghigh[2] > 0)
-    mhigh |= 0x924924;
-
-  if (glow[0] > 0)
-    mlow = 0x492492;
-
-  if (glow[1] > 0)
-    mlow |= 0x249249;
-
-  if (glow[2] > 0)
-    mlow |= 0x924924;
-
-  width = 3 * width;
-
-  for (i = 0; i < height; i++) {
-    thresh0 = thresh[0];
-    thresh1 = thresh[1];
-    thresh2 = thresh[2];
-
-    j = 0;
-    jbit = 0;
-    mhigh0 = mhigh >> (dbit_off & 7);
-    mlow0 = mlow >> (dbit_off & 7);
-    mhigh1 = mhigh0 >> 1;
-    mlow1 = mlow0 >> 1;
-    mhigh2 = mhigh0 >> 2;
-    mlow2 = mlow0 >> 2;
-
-    if (dbit_off) {
-      mlib_s32 nume = 8 - dbit_off;
-
-      if (nume > width)
-        nume = width;
-      dst0 = 0;
-      emask = 0;
-
-      for (; j <= (nume - 3); j += 3) {
-        emask |= (7 << (5 - (dbit_off + j)));
-        dst0 |= THRESH1_CMP_SHIFT(psrc_row[j], thresh0, 7 - (dbit_off + j));
-        dst0 |= THRESH1_CMP_SHIFT(psrc_row[j + 1], thresh1, 6 - (dbit_off + j));
-        dst0 |= THRESH1_CMP_SHIFT(psrc_row[j + 2], thresh2, 5 - (dbit_off + j));
-      }
-
-      for (; j < nume; j++) {
-        emask |= (1 << (7 - (dbit_off + j)));
-        dst0 |= THRESH1_CMP_SHIFT(psrc_row[j], thresh0, 7 - (dbit_off + j));
-        /* swap threshes */
-        threshT = thresh0;
-        thresh0 = thresh1;
-        thresh1 = thresh2;
-        thresh2 = threshT;
-      }
-
-      dst0 = (mhigh0 & dst0) | (mlow0 & ~dst0);
-      pdst_row[0] = (dst0 & emask) | (pdst_row[0] & ~emask);
-      jbit++;
-
-      mhigh0 = mhigh >> (9 - nume);
-      mlow0 = mlow >> (9 - nume);
-      mhigh1 = mhigh0 >> 1;
-      mlow1 = mlow0 >> 1;
-      mhigh2 = mhigh0 >> 2;
-      mlow2 = mlow0 >> 2;
-    }
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (; j <= (width - 24); j += 24) {
-      dst0 = (THRESH1_CMP_SHIFT(psrc_row[j], thresh0, 7) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 1], thresh1, 6) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 2], thresh2, 5) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 3], thresh0, 4) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 4], thresh1, 3) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 5], thresh2, 2) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 6], thresh0, 1) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 7], thresh1, 0));
-      dst0 = (mhigh0 & dst0) | (mlow0 & ~dst0);
-      *(pdst_row + jbit) = dst0;
-      jbit++;
-      dst0 = (THRESH1_CMP_SHIFT(psrc_row[j + 8], thresh2, 7) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 9], thresh0, 6) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 10], thresh1, 5) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 11], thresh2, 4) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 12], thresh0, 3) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 13], thresh1, 2) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 14], thresh2, 1) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 15], thresh0, 0));
-      dst0 = (mhigh1 & dst0) | (mlow1 & ~dst0);
-      *(pdst_row + jbit) = dst0;
-      jbit++;
-      dst0 = (THRESH1_CMP_SHIFT(psrc_row[j + 16], thresh1, 7) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 17], thresh2, 6) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 18], thresh0, 5) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 19], thresh1, 4) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 20], thresh2, 3) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 21], thresh0, 2) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 22], thresh1, 1) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 23], thresh2, 0));
-      dst0 = (mhigh2 & dst0) | (mlow2 & ~dst0);
-      *(pdst_row + jbit) = dst0;
-      jbit++;
-    }
-
-    if (j < width) {
-      k = width - j;
-      dst0 = 0;
-      l = 31;
-      for (; j < width; j += 3) {
-        dst0 |= (THRESH1_CMP_SHIFT(psrc_row[j], thresh0, l) |
-                 THRESH1_CMP_SHIFT(psrc_row[j + 1], thresh1, l - 1) |
-                 THRESH1_CMP_SHIFT(psrc_row[j + 2], thresh2, l - 2));
-        l -= 3;
-      }
-
-      l = (k + 7) >> 3;
-      k = (l << 3) - k;
-      emask = (0xFF << k);
-
-      if (l == 3) {
-        dst1 = dst0 >> 24;
-        dst1 = (mhigh0 & dst1) | (mlow0 & ~dst1);
-        pdst_row[jbit] = dst1;
-        dst1 = (dst0 >> 16);
-        dst1 = (mhigh1 & dst1) | (mlow1 & ~dst1);
-        pdst_row[jbit + 1] = dst1;
-        dst1 = (dst0 >> 8);
-        dst1 = (mhigh2 & dst1) | (mlow2 & ~dst1);
-        pdst_row[jbit + 2] = (dst1 & emask) | (pdst_row[jbit + 2] & ~emask);
-      }
-      else if (l == 2) {
-        dst1 = dst0 >> 24;
-        dst1 = (mhigh0 & dst1) | (mlow0 & ~dst1);
-        pdst_row[jbit] = dst1;
-        dst1 = (dst0 >> 16);
-        dst1 = (mhigh1 & dst1) | (mlow1 & ~dst1);
-        pdst_row[jbit + 1] = (dst1 & emask) | (pdst_row[jbit + 1] & ~emask);
-      }
-      else {
-        dst1 = dst0 >> 24;
-        dst1 = (mhigh0 & dst1) | (mlow0 & ~dst1);
-        pdst_row[jbit] = (dst1 & emask) | (pdst_row[jbit] & ~emask);
-      }
-    }
-
-    psrc_row += src_stride;
-    pdst_row += dst_stride;
-  }
-}
-
-/***************************************************************/
-void mlib_c_ImageThresh1_U84_1B(PARAMS,
-                                mlib_s32 dbit_off)
-{
-  mlib_s32 *thresh = (void *)__thresh;
-  mlib_s32 *ghigh = (void *)__ghigh;
-  mlib_s32 *glow = (void *)__glow;
-  STYPE *psrc_row = psrc;
-  mlib_u8 *pdst_row = pdst;
-  TTYPE thresh0, thresh1, thresh2, thresh3, threshT;
-  mlib_s32 mhigh0, mlow0, mhigh, mlow, emask, dst0;
-  mlib_s32 i, j, jbit;
-
-  mhigh0 = (ghigh[0] > 0) ? 0x8888 : 0;
-  mhigh0 |= (ghigh[1] > 0) ? 0x4444 : 0;
-  mhigh0 |= (ghigh[2] > 0) ? 0x2222 : 0;
-  mhigh0 |= (ghigh[3] > 0) ? 0x1111 : 0;
-
-  mlow0 = (glow[0] > 0) ? 0x8888 : 0;
-  mlow0 |= (glow[1] > 0) ? 0x4444 : 0;
-  mlow0 |= (glow[2] > 0) ? 0x2222 : 0;
-  mlow0 |= (glow[3] > 0) ? 0x1111 : 0;
-
-  width *= 4;
-
-  for (i = 0; i < height; i++) {
-    thresh0 = thresh[0];
-    thresh1 = thresh[1];
-    thresh2 = thresh[2];
-    thresh3 = thresh[3];
-
-    j = 0;
-    jbit = 0;
-    mhigh = mhigh0 >> dbit_off;
-    mlow = mlow0 >> dbit_off;
-
-    if (dbit_off) {
-      mlib_s32 nume = 8 - dbit_off;
-
-      if (nume > width)
-        nume = width;
-      dst0 = 0;
-      emask = 0;
-
-      for (; j <= (nume - 4); j += 4) {
-        emask |= (0xf << (4 - (dbit_off + j)));
-        dst0 |= THRESH1_CMP_SHIFT(psrc_row[j], thresh0, 7 - (dbit_off + j));
-        dst0 |= THRESH1_CMP_SHIFT(psrc_row[j + 1], thresh1, 6 - (dbit_off + j));
-        dst0 |= THRESH1_CMP_SHIFT(psrc_row[j + 2], thresh2, 5 - (dbit_off + j));
-        dst0 |= THRESH1_CMP_SHIFT(psrc_row[j + 3], thresh3, 4 - (dbit_off + j));
-      }
-
-      for (; j < nume; j++) {
-        emask |= (1 << (7 - (dbit_off + j)));
-        dst0 |= THRESH1_CMP_SHIFT(psrc_row[j], thresh0, 7 - (dbit_off + j));
-        /* swap threshes */
-        threshT = thresh0;
-        thresh0 = thresh1;
-        thresh1 = thresh2;
-        thresh2 = thresh3;
-        thresh3 = threshT;
-      }
-
-      dst0 = (mhigh & dst0) | (mlow & ~dst0);
-      pdst_row[0] = (dst0 & emask) | (pdst_row[0] & ~emask);
-      jbit++;
-    }
-
-#ifdef __SUNPRO_C
-#pragma pipeloop(0)
-#endif /* __SUNPRO_C */
-    for (; j <= (width - 16); j += 16) {
-      dst0 = (THRESH1_CMP_SHIFT(psrc_row[j], thresh0, 7) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 1], thresh1, 6) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 2], thresh2, 5) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 3], thresh3, 4) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 4], thresh0, 3) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 5], thresh1, 2) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 6], thresh2, 1) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 7], thresh3, 0));
-      dst0 = (mhigh & dst0) | (mlow & ~dst0);
-      pdst_row[jbit] = dst0;
-      jbit++;
-      dst0 = (THRESH1_CMP_SHIFT(psrc_row[j + 8], thresh0, 7) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 9], thresh1, 6) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 10], thresh2, 5) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 11], thresh3, 4) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 12], thresh0, 3) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 13], thresh1, 2) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 14], thresh2, 1) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 15], thresh3, 0));
-      dst0 = (mhigh & dst0) | (mlow & ~dst0);
-      pdst_row[jbit] = dst0;
-      jbit++;
-    }
-
-    if (j <= width - 8) {
-      dst0 = (THRESH1_CMP_SHIFT(psrc_row[j], thresh0, 7) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 1], thresh1, 6) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 2], thresh2, 5) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 3], thresh3, 4) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 4], thresh0, 3) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 5], thresh1, 2) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 6], thresh2, 1) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 7], thresh3, 0));
-      dst0 = (mhigh & dst0) | (mlow & ~dst0);
-      pdst_row[jbit] = dst0;
-      jbit++;
-      j += 8;
-    }
-
-    if (j < width) {
-      dst0 = (THRESH1_CMP_SHIFT(psrc_row[j], thresh0, 7) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 1], thresh1, 6) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 2], thresh2, 5) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 3], thresh3, 4) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 4], thresh0, 3) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 5], thresh1, 2) |
-              THRESH1_CMP_SHIFT(psrc_row[j + 6], thresh2, 1));
-
-      emask = (0xFF << (8 - (width - j)));
-      dst0 = (mhigh & dst0) | (mlow & ~dst0);
-      pdst_row[jbit] = (dst0 & emask) | (pdst_row[jbit] & ~emask);
-    }
-
-    psrc_row += src_stride;
-    pdst_row += dst_stride;
-  }
-}
-
-/***************************************************************/
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_image.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_image.h
index 60d776a8558..ae1d2247fd2 100644
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_image.h
+++ b/jdk/src/java.desktop/share/native/libmlib_image/mlib_image.h
@@ -35,7 +35,6 @@
 #include <mlib_sys.h>
 #include <mlib_image_types.h>
 #include <mlib_image_proto.h>
-#include <mlib_image_blend_proto.h>
 #include <mlib_image_get.h>
 
 #endif  /* MLIB_IMAGE_H */
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_image_blend_proto.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_image_blend_proto.h
deleted file mode 100644
index 5a7b0017d5f..00000000000
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_image_blend_proto.h
+++ /dev/null
@@ -1,1448 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, 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.
- */
-
-
-#ifndef __ORIG_MLIB_IMAGE_BLEND_PROTO_H
-#define __ORIG_MLIB_IMAGE_BLEND_PROTO_H
-
-#include <mlib_types.h>
-#include <mlib_status.h>
-#include <mlib_image_types.h>
-#if defined ( __MEDIALIB_OLD_NAMES_ADDED )
-#include <../include/mlib_image_blend_proto.h>
-#endif /* defined ( __MEDIALIB_OLD_NAMES_ADDED ) */
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#if defined ( _MSC_VER )
-#if ! defined ( __MEDIALIB_OLD_NAMES )
-#define __MEDIALIB_OLD_NAMES
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-#endif /* defined ( _MSC_VER ) */
-
-/***********************************************************************
-
-    NOTE: f = min(ALPHAsrc2, 1 - ALPHAsrc1)
-          f = min(ALPHAscr2, 1 - ALPHAsrc1dst) for In-place function
-          ALPHA = (ALPHA, ALPHA, ALPHA, ALPHA)
-
-************************************************************************/
-
-/* dst = 0 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ZERO_ZERO mlib_ImageBlend_ZERO_ZERO
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ZERO_ZERO(mlib_image *dst,
-                                         const mlib_image *src1,
-                                         const mlib_image *src2,
-                                         mlib_s32 cmask);
-
-/* src1dst = 0 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ZERO_ZERO_Inp mlib_ImageBlend_ZERO_ZERO_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ZERO_ZERO_Inp(mlib_image *src1dst,
-                                             const mlib_image *src2,
-                                             mlib_s32 cmask);
-
-/* dst = src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ZERO_ONE mlib_ImageBlend_ZERO_ONE
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ZERO_ONE(mlib_image *dst,
-                                        const mlib_image *src1,
-                                        const mlib_image *src2,
-                                        mlib_s32 cmask);
-
-/* src1dst = src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ZERO_ONE_Inp mlib_ImageBlend_ZERO_ONE_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ZERO_ONE_Inp(mlib_image *src1dst,
-                                            const mlib_image *src2,
-                                            mlib_s32 cmask);
-
-/* dst = src2 * src1 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ZERO_DC mlib_ImageBlend_ZERO_DC
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ZERO_DC(mlib_image *dst,
-                                       const mlib_image *src1,
-                                       const mlib_image *src2,
-                                       mlib_s32 cmask);
-
-/* src1dst = src2 * src1dst */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ZERO_DC_Inp mlib_ImageBlend_ZERO_DC_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ZERO_DC_Inp(mlib_image *src1dst,
-                                           const mlib_image *src2,
-                                           mlib_s32 cmask);
-
-/* dst = src2 * (1 - src1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ZERO_OMDC mlib_ImageBlend_ZERO_OMDC
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ZERO_OMDC(mlib_image *dst,
-                                         const mlib_image *src1,
-                                         const mlib_image *src2,
-                                         mlib_s32 cmask);
-
-/* src1dst = src2 * (1 - src1dst) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ZERO_OMDC_Inp mlib_ImageBlend_ZERO_OMDC_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ZERO_OMDC_Inp(mlib_image *src1dst,
-                                             const mlib_image *src2,
-                                             mlib_s32 cmask);
-
-/* dst = src2 * ALPHAsrc2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ZERO_SA mlib_ImageBlend_ZERO_SA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ZERO_SA(mlib_image *dst,
-                                       const mlib_image *src1,
-                                       const mlib_image *src2,
-                                       mlib_s32 cmask);
-
-/* src1dst = src2 * ALPHAsrc2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ZERO_SA_Inp mlib_ImageBlend_ZERO_SA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ZERO_SA_Inp(mlib_image *src1dst,
-                                           const mlib_image *src2,
-                                           mlib_s32 cmask);
-
-/* dst = src2 * (1 - ALPHAsrc2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ZERO_OMSA mlib_ImageBlend_ZERO_OMSA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ZERO_OMSA(mlib_image *dst,
-                                         const mlib_image *src1,
-                                         const mlib_image *src2,
-                                         mlib_s32 cmask);
-
-/* src1dst = src2 * (1 - ALPHAsrc2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ZERO_OMSA_Inp mlib_ImageBlend_ZERO_OMSA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ZERO_OMSA_Inp(mlib_image *src1dst,
-                                             const mlib_image *src2,
-                                             mlib_s32 cmask);
-
-/* dst = src2 * ALPHAsrc1 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ZERO_DA mlib_ImageBlend_ZERO_DA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ZERO_DA(mlib_image *dst,
-                                       const mlib_image *src1,
-                                       const mlib_image *src2,
-                                       mlib_s32 cmask);
-
-/* src1dst = src2 * ALPHAsrc1dst */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ZERO_DA_Inp mlib_ImageBlend_ZERO_DA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ZERO_DA_Inp(mlib_image *src1dst,
-                                           const mlib_image *src2,
-                                           mlib_s32 cmask);
-
-/* dst = src2 * (1 - ALPHAsrc1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ZERO_OMDA mlib_ImageBlend_ZERO_OMDA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ZERO_OMDA(mlib_image *dst,
-                                         const mlib_image *src1,
-                                         const mlib_image *src2,
-                                         mlib_s32 cmask);
-
-/* src1dst = src2 * (1 - ALPHAsrc1dst) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ZERO_OMDA_Inp mlib_ImageBlend_ZERO_OMDA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ZERO_OMDA_Inp(mlib_image *src1dst,
-                                             const mlib_image *src2,
-                                             mlib_s32 cmask);
-
-/* dst = src2 * (f, f, f, 1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ZERO_SAS mlib_ImageBlend_ZERO_SAS
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ZERO_SAS(mlib_image *dst,
-                                        const mlib_image *src1,
-                                        const mlib_image *src2,
-                                        mlib_s32 cmask);
-
-/* src1dst = src2 * (f, f, f, 1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ZERO_SAS_Inp mlib_ImageBlend_ZERO_SAS_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ZERO_SAS_Inp(mlib_image *src1dst,
-                                            const mlib_image *src2,
-                                            mlib_s32 cmask);
-
-/* dst = src1 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ONE_ZERO mlib_ImageBlend_ONE_ZERO
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ONE_ZERO(mlib_image *dst,
-                                        const mlib_image *src1,
-                                        const mlib_image *src2,
-                                        mlib_s32 cmask);
-
-/* src1dst = src1dst */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ONE_ZERO_Inp mlib_ImageBlend_ONE_ZERO_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ONE_ZERO_Inp(mlib_image *src1dst,
-                                            const mlib_image *src2,
-                                            mlib_s32 cmask);
-
-/* dst = src1 + src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ONE_ONE mlib_ImageBlend_ONE_ONE
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ONE_ONE(mlib_image *dst,
-                                       const mlib_image *src1,
-                                       const mlib_image *src2,
-                                       mlib_s32 cmask);
-
-/* src1dst = src1dst + src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ONE_ONE_Inp mlib_ImageBlend_ONE_ONE_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ONE_ONE_Inp(mlib_image *src1dst,
-                                           const mlib_image *src2,
-                                           mlib_s32 cmask);
-
-/* dst = src1 * (1 + src2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ONE_DC mlib_ImageBlend_ONE_DC
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ONE_DC(mlib_image *dst,
-                                      const mlib_image *src1,
-                                      const mlib_image *src2,
-                                      mlib_s32 cmask);
-
-/* src1dst = src1dst * (1 + src2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ONE_DC_Inp mlib_ImageBlend_ONE_DC_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ONE_DC_Inp(mlib_image *src1dst,
-                                          const mlib_image *src2,
-                                          mlib_s32 cmask);
-
-/* dst = src2 + src1 * (1 - src2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ONE_OMDC mlib_ImageBlend_ONE_OMDC
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ONE_OMDC(mlib_image *dst,
-                                        const mlib_image *src1,
-                                        const mlib_image *src2,
-                                        mlib_s32 cmask);
-
-/* src1dst = src2 + src1dst * (1 - src2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ONE_OMDC_Inp mlib_ImageBlend_ONE_OMDC_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ONE_OMDC_Inp(mlib_image *src1dst,
-                                            const mlib_image *src2,
-                                            mlib_s32 cmask);
-
-/* dst = src1 + src2 * ALPHAsrc2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ONE_SA mlib_ImageBlend_ONE_SA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ONE_SA(mlib_image *dst,
-                                      const mlib_image *src1,
-                                      const mlib_image *src2,
-                                      mlib_s32 cmask);
-
-/* src1dst = src1dst + src2 * ALPHAsrc2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ONE_SA_Inp mlib_ImageBlend_ONE_SA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ONE_SA_Inp(mlib_image *src1dst,
-                                          const mlib_image *src2,
-                                          mlib_s32 cmask);
-
-/* dst = src1 + src2 * (1 - ALPHAsrc2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ONE_OMSA mlib_ImageBlend_ONE_OMSA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ONE_OMSA(mlib_image *dst,
-                                        const mlib_image *src1,
-                                        const mlib_image *src2,
-                                        mlib_s32 cmask);
-
-/* src1dst = src1dst + src2 * (1 - ALPHAsrc2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ONE_OMSA_Inp mlib_ImageBlend_ONE_OMSA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ONE_OMSA_Inp(mlib_image *src1dst,
-                                            const mlib_image *src2,
-                                            mlib_s32 cmask);
-
-/* dst = src1 + src2 * ALPHAsrc1 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ONE_DA mlib_ImageBlend_ONE_DA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ONE_DA(mlib_image *dst,
-                                      const mlib_image *src1,
-                                      const mlib_image *src2,
-                                      mlib_s32 cmask);
-
-/* src1dst = src1dst + src2 * ALPHAsrc1dst */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ONE_DA_Inp mlib_ImageBlend_ONE_DA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ONE_DA_Inp(mlib_image *src1dst,
-                                          const mlib_image *src2,
-                                          mlib_s32 cmask);
-
-/* dst = src1 + src2 * (1 - ALPHAsrc1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ONE_OMDA mlib_ImageBlend_ONE_OMDA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ONE_OMDA(mlib_image *dst,
-                                        const mlib_image *src1,
-                                        const mlib_image *src2,
-                                        mlib_s32 cmask);
-
-/* src1dst = src1dst + src2 * (1 - ALPHAsrc1dst) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ONE_OMDA_Inp mlib_ImageBlend_ONE_OMDA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ONE_OMDA_Inp(mlib_image *src1dst,
-                                            const mlib_image *src2,
-                                            mlib_s32 cmask);
-
-/* dst = src1 + src2 * (f, f, f, 1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ONE_SAS mlib_ImageBlend_ONE_SAS
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ONE_SAS(mlib_image *dst,
-                                       const mlib_image *src1,
-                                       const mlib_image *src2,
-                                       mlib_s32 cmask);
-
-/* src1dst = src1dst + src2 * (f, f, f, 1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_ONE_SAS_Inp mlib_ImageBlend_ONE_SAS_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_ONE_SAS_Inp(mlib_image *src1dst,
-                                           const mlib_image *src2,
-                                           mlib_s32 cmask);
-
-/* dst = src1 * src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SC_ZERO mlib_ImageBlend_SC_ZERO
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SC_ZERO(mlib_image *dst,
-                                       const mlib_image *src1,
-                                       const mlib_image *src2,
-                                       mlib_s32 cmask);
-
-/* src1dst = src1dst * src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SC_ZERO_Inp mlib_ImageBlend_SC_ZERO_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SC_ZERO_Inp(mlib_image *src1dst,
-                                           const mlib_image *src2,
-                                           mlib_s32 cmask);
-
-/* dst = (src1 + 1) * src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SC_ONE mlib_ImageBlend_SC_ONE
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SC_ONE(mlib_image *dst,
-                                      const mlib_image *src1,
-                                      const mlib_image *src2,
-                                      mlib_s32 cmask);
-
-/* src1dst = (src1dst + 1) * src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SC_ONE_Inp mlib_ImageBlend_SC_ONE_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SC_ONE_Inp(mlib_image *src1dst,
-                                          const mlib_image *src2,
-                                          mlib_s32 cmask);
-
-/* dst = 2 * src1 * src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SC_DC mlib_ImageBlend_SC_DC
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SC_DC(mlib_image *dst,
-                                     const mlib_image *src1,
-                                     const mlib_image *src2,
-                                     mlib_s32 cmask);
-
-/* src1dst = 2 * src1dst * src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SC_DC_Inp mlib_ImageBlend_SC_DC_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SC_DC_Inp(mlib_image *src1dst,
-                                         const mlib_image *src2,
-                                         mlib_s32 cmask);
-
-/* dst = src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SC_OMDC mlib_ImageBlend_SC_OMDC
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SC_OMDC(mlib_image *dst,
-                                       const mlib_image *src1,
-                                       const mlib_image *src2,
-                                       mlib_s32 cmask);
-
-/* src1dst = src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SC_OMDC_Inp mlib_ImageBlend_SC_OMDC_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SC_OMDC_Inp(mlib_image *src1dst,
-                                           const mlib_image *src2,
-                                           mlib_s32 cmask);
-
-/* dst = src2 * (src1 + ALPHAsrc2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SC_SA mlib_ImageBlend_SC_SA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SC_SA(mlib_image *dst,
-                                     const mlib_image *src1,
-                                     const mlib_image *src2,
-                                     mlib_s32 cmask);
-
-/* src1dst = src2 * (src1dst + ALPHAsrc2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SC_SA_Inp mlib_ImageBlend_SC_SA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SC_SA_Inp(mlib_image *src1dst,
-                                         const mlib_image *src2,
-                                         mlib_s32 cmask);
-
-/* dst = src2 * (1 - ALPHAsrc2 + src1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SC_OMSA mlib_ImageBlend_SC_OMSA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SC_OMSA(mlib_image *dst,
-                                       const mlib_image *src1,
-                                       const mlib_image *src2,
-                                       mlib_s32 cmask);
-
-/* src1dst = src2 * (1 - ALPHAsrc2 + src1dst) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SC_OMSA_Inp mlib_ImageBlend_SC_OMSA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SC_OMSA_Inp(mlib_image *src1dst,
-                                           const mlib_image *src2,
-                                           mlib_s32 cmask);
-
-/* dst = src2 * (src1 + ALPHAsrc1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SC_DA mlib_ImageBlend_SC_DA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SC_DA(mlib_image *dst,
-                                     const mlib_image *src1,
-                                     const mlib_image *src2,
-                                     mlib_s32 cmask);
-
-/* src1dst = src2 * (src1dst + ALPHAsrc1dst) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SC_DA_Inp mlib_ImageBlend_SC_DA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SC_DA_Inp(mlib_image *src1dst,
-                                         const mlib_image *src2,
-                                         mlib_s32 cmask);
-
-/* dst = src2 * (1 - ALPHAsrc1 + src1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SC_OMDA mlib_ImageBlend_SC_OMDA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SC_OMDA(mlib_image *dst,
-                                       const mlib_image *src1,
-                                       const mlib_image *src2,
-                                       mlib_s32 cmask);
-
-/* src1dst = src2 * (1 - ALPHAsrc1dst + src1dst) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SC_OMDA_Inp mlib_ImageBlend_SC_OMDA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SC_OMDA_Inp(mlib_image *src1dst,
-                                           const mlib_image *src2,
-                                           mlib_s32 cmask);
-
-/* dst = src2 * ((f, f, f, 1) + src1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SC_SAS mlib_ImageBlend_SC_SAS
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SC_SAS(mlib_image *dst,
-                                      const mlib_image *src1,
-                                      const mlib_image *src2,
-                                      mlib_s32 cmask);
-
-/* src1dst = src2 * ((f, f, f, 1) + src1dst) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SC_SAS_Inp mlib_ImageBlend_SC_SAS_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SC_SAS_Inp(mlib_image *src1dst,
-                                          const mlib_image *src2,
-                                          mlib_s32 cmask);
-
-/* dst = src1 * (1 - src2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSC_ZERO mlib_ImageBlend_OMSC_ZERO
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSC_ZERO(mlib_image *dst,
-                                         const mlib_image *src1,
-                                         const mlib_image *src2,
-                                         mlib_s32 cmask);
-
-/* src1dst = src1dst * (1 - src2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSC_ZERO_Inp mlib_ImageBlend_OMSC_ZERO_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSC_ZERO_Inp(mlib_image *src1dst,
-                                             const mlib_image *src2,
-                                             mlib_s32 cmask);
-
-/* dst = src1 + src2 * (1 - src1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSC_ONE mlib_ImageBlend_OMSC_ONE
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSC_ONE(mlib_image *dst,
-                                        const mlib_image *src1,
-                                        const mlib_image *src2,
-                                        mlib_s32 cmask);
-
-/* src1dst = src1dst + src2 * (1 - src1dst) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSC_ONE_Inp mlib_ImageBlend_OMSC_ONE_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSC_ONE_Inp(mlib_image *src1dst,
-                                            const mlib_image *src2,
-                                            mlib_s32 cmask);
-
-/* dst = src1 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSC_DC mlib_ImageBlend_OMSC_DC
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSC_DC(mlib_image *dst,
-                                       const mlib_image *src1,
-                                       const mlib_image *src2,
-                                       mlib_s32 cmask);
-
-/* src1dst = src1dst */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSC_DC_Inp mlib_ImageBlend_OMSC_DC_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSC_DC_Inp(mlib_image *src1dst,
-                                           const mlib_image *src2,
-                                           mlib_s32 cmask);
-
-/* dst = src1 + src2 - 2 * src1 * src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSC_OMDC mlib_ImageBlend_OMSC_OMDC
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSC_OMDC(mlib_image *dst,
-                                         const mlib_image *src1,
-                                         const mlib_image *src2,
-                                         mlib_s32 cmask);
-
-/* src1dst = src1dst + src2 - 2 * src1dst * src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSC_OMDC_Inp mlib_ImageBlend_OMSC_OMDC_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSC_OMDC_Inp(mlib_image *src1dst,
-                                             const mlib_image *src2,
-                                             mlib_s32 cmask);
-
-/* dst = src1 + src2 * (ALPHAsrc2 - src1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSC_SA mlib_ImageBlend_OMSC_SA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSC_SA(mlib_image *dst,
-                                       const mlib_image *src1,
-                                       const mlib_image *src2,
-                                       mlib_s32 cmask);
-
-/* src1dst = src1dst + src2 * (ALPHAsrc2 - src1dst) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSC_SA_Inp mlib_ImageBlend_OMSC_SA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSC_SA_Inp(mlib_image *src1dst,
-                                           const mlib_image *src2,
-                                           mlib_s32 cmask);
-
-/* dst = src1 + src2 - src2 * (src1 + ALPHAsrc2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSC_OMSA mlib_ImageBlend_OMSC_OMSA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSC_OMSA(mlib_image *dst,
-                                         const mlib_image *src1,
-                                         const mlib_image *src2,
-                                         mlib_s32 cmask);
-
-/* src1dst = src1dst + src2 - src2 * (src1dst + ALPHAsrc2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSC_OMSA_Inp mlib_ImageBlend_OMSC_OMSA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSC_OMSA_Inp(mlib_image *src1dst,
-                                             const mlib_image *src2,
-                                             mlib_s32 cmask);
-
-/* dst = src1 + src2 * (ALPHAsrc1 - src1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSC_DA mlib_ImageBlend_OMSC_DA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSC_DA(mlib_image *dst,
-                                       const mlib_image *src1,
-                                       const mlib_image *src2,
-                                       mlib_s32 cmask);
-
-/* src1dst = src1dst + src2 * (ALPHAsrc1dst - src1dst) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSC_DA_Inp mlib_ImageBlend_OMSC_DA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSC_DA_Inp(mlib_image *src1dst,
-                                           const mlib_image *src2,
-                                           mlib_s32 cmask);
-
-/* dst = src1 + src2 - src2 * (src1 + ALPHAsrc1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSC_OMDA mlib_ImageBlend_OMSC_OMDA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSC_OMDA(mlib_image *dst,
-                                         const mlib_image *src1,
-                                         const mlib_image *src2,
-                                         mlib_s32 cmask);
-
-/* src1dst = src1dst + src2 - src2 * (src1dst + ALPHAsrc1dst) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSC_OMDA_Inp mlib_ImageBlend_OMSC_OMDA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSC_OMDA_Inp(mlib_image *src1dst,
-                                             const mlib_image *src2,
-                                             mlib_s32 cmask);
-
-/* dst = src1 +  src2 * ((f, f, f, 1) - src1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSC_SAS mlib_ImageBlend_OMSC_SAS
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSC_SAS(mlib_image *dst,
-                                        const mlib_image *src1,
-                                        const mlib_image *src2,
-                                        mlib_s32 cmask);
-
-/* src1dst = src1dst +  src2 * ((f, f, f, 1) - src1dst) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSC_SAS_Inp mlib_ImageBlend_OMSC_SAS_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSC_SAS_Inp(mlib_image *src1dst,
-                                            const mlib_image *src2,
-                                            mlib_s32 cmask);
-
-/* dst = src1 * ALPHAsrc2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SA_ZERO mlib_ImageBlend_SA_ZERO
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SA_ZERO(mlib_image *dst,
-                                       const mlib_image *src1,
-                                       const mlib_image *src2,
-                                       mlib_s32 cmask);
-
-/* src1dst = src1dst * ALPHAsrc2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SA_ZERO_Inp mlib_ImageBlend_SA_ZERO_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SA_ZERO_Inp(mlib_image *src1dst,
-                                           const mlib_image *src2,
-                                           mlib_s32 cmask);
-
-/* dst = src1 * ALPHAsrc2 + src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SA_ONE mlib_ImageBlend_SA_ONE
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SA_ONE(mlib_image *dst,
-                                      const mlib_image *src1,
-                                      const mlib_image *src2,
-                                      mlib_s32 cmask);
-
-/* src1dst = src1dst * ALPHAsrc2 + src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SA_ONE_Inp mlib_ImageBlend_SA_ONE_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SA_ONE_Inp(mlib_image *src1dst,
-                                          const mlib_image *src2,
-                                          mlib_s32 cmask);
-
-/* dst = src1 * (ALPHAsrc2 + src2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SA_DC mlib_ImageBlend_SA_DC
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SA_DC(mlib_image *dst,
-                                     const mlib_image *src1,
-                                     const mlib_image *src2,
-                                     mlib_s32 cmask);
-
-/* src1dst = src1dst * (ALPHAsrc2 + src2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SA_DC_Inp mlib_ImageBlend_SA_DC_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SA_DC_Inp(mlib_image *src1dst,
-                                         const mlib_image *src2,
-                                         mlib_s32 cmask);
-
-/* dst = src1 * (ALPHAsrc2 - src2) + src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SA_OMDC mlib_ImageBlend_SA_OMDC
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SA_OMDC(mlib_image *dst,
-                                       const mlib_image *src1,
-                                       const mlib_image *src2,
-                                       mlib_s32 cmask);
-
-/* src1dst = src1dst * (ALPHAsrc2 - src2) + src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SA_OMDC_Inp mlib_ImageBlend_SA_OMDC_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SA_OMDC_Inp(mlib_image *src1dst,
-                                           const mlib_image *src2,
-                                           mlib_s32 cmask);
-
-/* dst = (src1 + src2) * ALPHAsrc2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SA_SA mlib_ImageBlend_SA_SA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SA_SA(mlib_image *dst,
-                                     const mlib_image *src1,
-                                     const mlib_image *src2,
-                                     mlib_s32 cmask);
-
-/* src1dst = (src1dst + src2) * ALPHAsrc2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SA_SA_Inp mlib_ImageBlend_SA_SA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SA_SA_Inp(mlib_image *src1dst,
-                                         const mlib_image *src2,
-                                         mlib_s32 cmask);
-
-/* dst = (src1 - src2) * ALPHAsrc2 + src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SA_OMSA mlib_ImageBlend_SA_OMSA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SA_OMSA(mlib_image *dst,
-                                       const mlib_image *src1,
-                                       const mlib_image *src2,
-                                       mlib_s32 cmask);
-
-/* src1dst = (src1dst - src2) * ALPHAsrc2 + src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SA_OMSA_Inp mlib_ImageBlend_SA_OMSA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SA_OMSA_Inp(mlib_image *src1dst,
-                                           const mlib_image *src2,
-                                           mlib_s32 cmask);
-
-/* dst = src1 * ALPHAsrc2 + src2 * ALPHAsrc1 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SA_DA mlib_ImageBlend_SA_DA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SA_DA(mlib_image *dst,
-                                     const mlib_image *src1,
-                                     const mlib_image *src2,
-                                     mlib_s32 cmask);
-
-/* src1dst = src1dst * ALPHAsrc2 + src2 * ALPHAsrc1dst */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SA_DA_Inp mlib_ImageBlend_SA_DA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SA_DA_Inp(mlib_image *src1dst,
-                                         const mlib_image *src2,
-                                         mlib_s32 cmask);
-
-/* dst = src1 * ALPHAsrc2 + src2 * (1 - ALPHAsrc1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SA_OMDA mlib_ImageBlend_SA_OMDA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SA_OMDA(mlib_image *dst,
-                                       const mlib_image *src1,
-                                       const mlib_image *src2,
-                                       mlib_s32 cmask);
-
-/* src1dst = src1dst * ALPHAsrc2 + src2 * (1 - ALPHAsrc1dst) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SA_OMDA_Inp mlib_ImageBlend_SA_OMDA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SA_OMDA_Inp(mlib_image *src1dst,
-                                           const mlib_image *src2,
-                                           mlib_s32 cmask);
-
-/* dst = src1 * ALPHAsrc2 + src2 * (f, f, f, 1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SA_SAS mlib_ImageBlend_SA_SAS
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SA_SAS(mlib_image *dst,
-                                      const mlib_image *src1,
-                                      const mlib_image *src2,
-                                      mlib_s32 cmask);
-
-/* src1dst = src1dst * ALPHAsrc2 + src2 * (f, f, f, 1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_SA_SAS_Inp mlib_ImageBlend_SA_SAS_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_SA_SAS_Inp(mlib_image *src1dst,
-                                          const mlib_image *src2,
-                                          mlib_s32 cmask);
-
-/* dst = src1 * (1 - ALPHAsrc2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSA_ZERO mlib_ImageBlend_OMSA_ZERO
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSA_ZERO(mlib_image *dst,
-                                         const mlib_image *src1,
-                                         const mlib_image *src2,
-                                         mlib_s32 cmask);
-
-/* src1dst = src1dst * (1 - ALPHAsrc2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSA_ZERO_Inp mlib_ImageBlend_OMSA_ZERO_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSA_ZERO_Inp(mlib_image *src1dst,
-                                             const mlib_image *src2,
-                                             mlib_s32 cmask);
-
-/* dst = src1 * (1 - ALPHAsrc2) + src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSA_ONE mlib_ImageBlend_OMSA_ONE
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSA_ONE(mlib_image *dst,
-                                        const mlib_image *src1,
-                                        const mlib_image *src2,
-                                        mlib_s32 cmask);
-
-/* src1dst = src1dst * (1 - ALPHAsrc2) + src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSA_ONE_Inp mlib_ImageBlend_OMSA_ONE_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSA_ONE_Inp(mlib_image *src1dst,
-                                            const mlib_image *src2,
-                                            mlib_s32 cmask);
-
-/* dst = src1 * (1 - ALPHAsrc2 + src2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSA_DC mlib_ImageBlend_OMSA_DC
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSA_DC(mlib_image *dst,
-                                       const mlib_image *src1,
-                                       const mlib_image *src2,
-                                       mlib_s32 cmask);
-
-/* src1dst = src1dst * (1 - ALPHAsrc2 + src2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSA_DC_Inp mlib_ImageBlend_OMSA_DC_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSA_DC_Inp(mlib_image *src1dst,
-                                           const mlib_image *src2,
-                                           mlib_s32 cmask);
-
-/* dst = src1 * (1 - ALPHAsrc2 - src2) + src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSA_OMDC mlib_ImageBlend_OMSA_OMDC
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSA_OMDC(mlib_image *dst,
-                                         const mlib_image *src1,
-                                         const mlib_image *src2,
-                                         mlib_s32 cmask);
-
-/* src1dst = src1dst * (1 - ALPHAsrc2 - src2) + src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSA_OMDC_Inp mlib_ImageBlend_OMSA_OMDC_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSA_OMDC_Inp(mlib_image *src1dst,
-                                             const mlib_image *src2,
-                                             mlib_s32 cmask);
-
-/* dst = src1 + (src2 - src1) * ALPHAsrc2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSA_SA mlib_ImageBlend_OMSA_SA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSA_SA(mlib_image *dst,
-                                       const mlib_image *src1,
-                                       const mlib_image *src2,
-                                       mlib_s32 cmask);
-
-/* src1dst = src1dst + (src2 - src1dst) * ALPHAsrc2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSA_SA_Inp mlib_ImageBlend_OMSA_SA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSA_SA_Inp(mlib_image *src1dst,
-                                           const mlib_image *src2,
-                                           mlib_s32 cmask);
-
-/* dst = (src1 + src2) * (1 - ALPHAsrc2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSA_OMSA mlib_ImageBlend_OMSA_OMSA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSA_OMSA(mlib_image *dst,
-                                         const mlib_image *src1,
-                                         const mlib_image *src2,
-                                         mlib_s32 cmask);
-
-/* src1dst = (src1dst + src2) * (1 - ALPHAsrc2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSA_OMSA_Inp mlib_ImageBlend_OMSA_OMSA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSA_OMSA_Inp(mlib_image *src1dst,
-                                             const mlib_image *src2,
-                                             mlib_s32 cmask);
-
-/* dst = src1 * (1 - ALPHAsrc2) + src2 * ALPHAsrc1 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSA_DA mlib_ImageBlend_OMSA_DA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSA_DA(mlib_image *dst,
-                                       const mlib_image *src1,
-                                       const mlib_image *src2,
-                                       mlib_s32 cmask);
-
-/* src1dst = src1dst * (1 - ALPHAsrc2) + src2 * ALPHAsrc1dst */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSA_DA_Inp mlib_ImageBlend_OMSA_DA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSA_DA_Inp(mlib_image *src1dst,
-                                           const mlib_image *src2,
-                                           mlib_s32 cmask);
-
-/* dst = src1 * (1 - ALPHAsrc2) + src2 * (1 - ALPHAsrc1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSA_OMDA mlib_ImageBlend_OMSA_OMDA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSA_OMDA(mlib_image *dst,
-                                         const mlib_image *src1,
-                                         const mlib_image *src2,
-                                         mlib_s32 cmask);
-
-/* src1dst = src1dst * (1 - ALPHAsrc2) + src2 * (1 - ALPHAsrc1dst) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSA_OMDA_Inp mlib_ImageBlend_OMSA_OMDA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSA_OMDA_Inp(mlib_image *src1dst,
-                                             const mlib_image *src2,
-                                             mlib_s32 cmask);
-
-/* dst = src1 * (1 - ALPHAsrc2) + src2 * (f, f, f, 1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSA_SAS mlib_ImageBlend_OMSA_SAS
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSA_SAS(mlib_image *dst,
-                                        const mlib_image *src1,
-                                        const mlib_image *src2,
-                                        mlib_s32 cmask);
-
-/* src1dst = src1dst * (1 - ALPHAsrc2) + src2 * (f, f, f, 1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMSA_SAS_Inp mlib_ImageBlend_OMSA_SAS_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMSA_SAS_Inp(mlib_image *src1dst,
-                                            const mlib_image *src2,
-                                            mlib_s32 cmask);
-
-/* dst = src1 * ALPHAsrc1 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_DA_ZERO mlib_ImageBlend_DA_ZERO
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_DA_ZERO(mlib_image *dst,
-                                       const mlib_image *src1,
-                                       const mlib_image *src2,
-                                       mlib_s32 cmask);
-
-/* src1dst = src1dst * ALPHAsrc1dst */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_DA_ZERO_Inp mlib_ImageBlend_DA_ZERO_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_DA_ZERO_Inp(mlib_image *src1dst,
-                                           const mlib_image *src2,
-                                           mlib_s32 cmask);
-
-/* dst = src1 * ALPHAsrc1 + src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_DA_ONE mlib_ImageBlend_DA_ONE
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_DA_ONE(mlib_image *dst,
-                                      const mlib_image *src1,
-                                      const mlib_image *src2,
-                                      mlib_s32 cmask);
-
-/* src1dst = src1dst * ALPHAsrc1dst + src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_DA_ONE_Inp mlib_ImageBlend_DA_ONE_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_DA_ONE_Inp(mlib_image *src1dst,
-                                          const mlib_image *src2,
-                                          mlib_s32 cmask);
-
-/* dst = src1 * (ALPHAsrc1 + src2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_DA_DC mlib_ImageBlend_DA_DC
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_DA_DC(mlib_image *dst,
-                                     const mlib_image *src1,
-                                     const mlib_image *src2,
-                                     mlib_s32 cmask);
-
-/* src1dst = src1dst * (ALPHAsrc1dst + src2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_DA_DC_Inp mlib_ImageBlend_DA_DC_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_DA_DC_Inp(mlib_image *src1dst,
-                                         const mlib_image *src2,
-                                         mlib_s32 cmask);
-
-/* dst = src1 * (ALPHAsrc1 - src2) + src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_DA_OMDC mlib_ImageBlend_DA_OMDC
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_DA_OMDC(mlib_image *dst,
-                                       const mlib_image *src1,
-                                       const mlib_image *src2,
-                                       mlib_s32 cmask);
-
-/* src1dst = src1dst * (ALPHAsrc1dst - src2) + src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_DA_OMDC_Inp mlib_ImageBlend_DA_OMDC_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_DA_OMDC_Inp(mlib_image *src1dst,
-                                           const mlib_image *src2,
-                                           mlib_s32 cmask);
-
-/* dst = src1 * ALPHAsrc1 + src2 * ALPHAsrc2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_DA_SA mlib_ImageBlend_DA_SA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_DA_SA(mlib_image *dst,
-                                     const mlib_image *src1,
-                                     const mlib_image *src2,
-                                     mlib_s32 cmask);
-
-/* src1dst = src1dst * ALPHAsrc1dst + src2 * ALPHAsrc2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_DA_SA_Inp mlib_ImageBlend_DA_SA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_DA_SA_Inp(mlib_image *src1dst,
-                                         const mlib_image *src2,
-                                         mlib_s32 cmask);
-
-/* dst = src1 * ALPHAsrc1 + src2 * (1 - ALPHAsrc2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_DA_OMSA mlib_ImageBlend_DA_OMSA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_DA_OMSA(mlib_image *dst,
-                                       const mlib_image *src1,
-                                       const mlib_image *src2,
-                                       mlib_s32 cmask);
-
-/* src1dst = src1dst * ALPHAsrc1dst + src2 * (1 - ALPHAsrc2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_DA_OMSA_Inp mlib_ImageBlend_DA_OMSA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_DA_OMSA_Inp(mlib_image *src1dst,
-                                           const mlib_image *src2,
-                                           mlib_s32 cmask);
-
-/* dst = (src1 + src2) * ALPHAsrc1 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_DA_DA mlib_ImageBlend_DA_DA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_DA_DA(mlib_image *dst,
-                                     const mlib_image *src1,
-                                     const mlib_image *src2,
-                                     mlib_s32 cmask);
-
-/* src1dst = (src1dst + src2) * ALPHAsrc1dst */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_DA_DA_Inp mlib_ImageBlend_DA_DA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_DA_DA_Inp(mlib_image *src1dst,
-                                         const mlib_image *src2,
-                                         mlib_s32 cmask);
-
-/* dst = (src1 - src2) * ALPHAsrc1 + src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_DA_OMDA mlib_ImageBlend_DA_OMDA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_DA_OMDA(mlib_image *dst,
-                                       const mlib_image *src1,
-                                       const mlib_image *src2,
-                                       mlib_s32 cmask);
-
-/* src1dst = (src1dst - src2) * ALPHAsrc1dst + src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_DA_OMDA_Inp mlib_ImageBlend_DA_OMDA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_DA_OMDA_Inp(mlib_image *src1dst,
-                                           const mlib_image *src2,
-                                           mlib_s32 cmask);
-
-/* dst = src1 * ALPHAsrc1 + src2 * (f, f, f, 1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_DA_SAS mlib_ImageBlend_DA_SAS
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_DA_SAS(mlib_image *dst,
-                                      const mlib_image *src1,
-                                      const mlib_image *src2,
-                                      mlib_s32 cmask);
-
-/* src1dst = src1dst * ALPHAsrc1dst + src2 * (f, f, f, 1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_DA_SAS_Inp mlib_ImageBlend_DA_SAS_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_DA_SAS_Inp(mlib_image *src1dst,
-                                          const mlib_image *src2,
-                                          mlib_s32 cmask);
-
-/* dst = src1 * (1 - ALPHAsrc1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMDA_ZERO mlib_ImageBlend_OMDA_ZERO
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMDA_ZERO(mlib_image *dst,
-                                         const mlib_image *src1,
-                                         const mlib_image *src2,
-                                         mlib_s32 cmask);
-
-/* src1dst = src1dst * (1 - ALPHAsrc1dst) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMDA_ZERO_Inp mlib_ImageBlend_OMDA_ZERO_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMDA_ZERO_Inp(mlib_image *src1dst,
-                                             const mlib_image *src2,
-                                             mlib_s32 cmask);
-
-/* dst = src1 * (1 - ALPHAsrc1) + src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMDA_ONE mlib_ImageBlend_OMDA_ONE
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMDA_ONE(mlib_image *dst,
-                                        const mlib_image *src1,
-                                        const mlib_image *src2,
-                                        mlib_s32 cmask);
-
-/* src1dst = src1dst * (1 - ALPHAsrc1dst) + src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMDA_ONE_Inp mlib_ImageBlend_OMDA_ONE_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMDA_ONE_Inp(mlib_image *src1dst,
-                                            const mlib_image *src2,
-                                            mlib_s32 cmask);
-
-/* dst = src1 * (1 - ALPHAsrc1 + src2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMDA_DC mlib_ImageBlend_OMDA_DC
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMDA_DC(mlib_image *dst,
-                                       const mlib_image *src1,
-                                       const mlib_image *src2,
-                                       mlib_s32 cmask);
-
-/* src1dst = src1dst * (1 - ALPHAsrc1dst + src2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMDA_DC_Inp mlib_ImageBlend_OMDA_DC_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMDA_DC_Inp(mlib_image *src1dst,
-                                           const mlib_image *src2,
-                                           mlib_s32 cmask);
-
-/* dst = src1 * (1 - ALPHAsrc1 - src2) + src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMDA_OMDC mlib_ImageBlend_OMDA_OMDC
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMDA_OMDC(mlib_image *dst,
-                                         const mlib_image *src1,
-                                         const mlib_image *src2,
-                                         mlib_s32 cmask);
-
-/* src1dst = src1dst * (1 - ALPHAsrc1dst - src2) + src2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMDA_OMDC_Inp mlib_ImageBlend_OMDA_OMDC_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMDA_OMDC_Inp(mlib_image *src1dst,
-                                             const mlib_image *src2,
-                                             mlib_s32 cmask);
-
-/* dst = src1 * (1 - ALPHAsrc1) + src2 * ALPHAsrc2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMDA_SA mlib_ImageBlend_OMDA_SA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMDA_SA(mlib_image *dst,
-                                       const mlib_image *src1,
-                                       const mlib_image *src2,
-                                       mlib_s32 cmask);
-
-/* src1dst = src1dst * (1 - ALPHAsrc1dst) + src2 * ALPHAsrc2 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMDA_SA_Inp mlib_ImageBlend_OMDA_SA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMDA_SA_Inp(mlib_image *src1dst,
-                                           const mlib_image *src2,
-                                           mlib_s32 cmask);
-
-/* dst = src1 * (1 - ALPHAsrc1) + src2 * (1 - ALPHAsrc2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMDA_OMSA mlib_ImageBlend_OMDA_OMSA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMDA_OMSA(mlib_image *dst,
-                                         const mlib_image *src1,
-                                         const mlib_image *src2,
-                                         mlib_s32 cmask);
-
-/* src1dst = src1dst * (1 - ALPHAsrc1dst) + src2 * (1 - ALPHAsrc2) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMDA_OMSA_Inp mlib_ImageBlend_OMDA_OMSA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMDA_OMSA_Inp(mlib_image *src1dst,
-                                             const mlib_image *src2,
-                                             mlib_s32 cmask);
-
-/* dst = src1 + (src2 - src1) * ALPHAsrc1 */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMDA_DA mlib_ImageBlend_OMDA_DA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMDA_DA(mlib_image *dst,
-                                       const mlib_image *src1,
-                                       const mlib_image *src2,
-                                       mlib_s32 cmask);
-
-/* src1dst = src1dst + (src2 - src1dst) * ALPHAsrc1dst */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMDA_DA_Inp mlib_ImageBlend_OMDA_DA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMDA_DA_Inp(mlib_image *src1dst,
-                                           const mlib_image *src2,
-                                           mlib_s32 cmask);
-
-/* dst = (src1 + src2) * (1 - ALPHAsrc1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMDA_OMDA mlib_ImageBlend_OMDA_OMDA
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMDA_OMDA(mlib_image *dst,
-                                         const mlib_image *src1,
-                                         const mlib_image *src2,
-                                         mlib_s32 cmask);
-
-/* src1dst = (src1dst + src2) * (1 - ALPHAsrc1dst) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMDA_OMDA_Inp mlib_ImageBlend_OMDA_OMDA_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMDA_OMDA_Inp(mlib_image *src1dst,
-                                             const mlib_image *src2,
-                                             mlib_s32 cmask);
-
-/* dst = src1 * (1 - ALPHAsrc1) + src2 * (f, f, f, 1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMDA_SAS mlib_ImageBlend_OMDA_SAS
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMDA_SAS(mlib_image *dst,
-                                        const mlib_image *src1,
-                                        const mlib_image *src2,
-                                        mlib_s32 cmask);
-
-/* src1dst = src1dst * (1 - ALPHAsrc1dst) + src2 * (f, f, f, 1) */
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageBlend_OMDA_SAS_Inp mlib_ImageBlend_OMDA_SAS_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageBlend_OMDA_SAS_Inp(mlib_image *src1dst,
-                                            const mlib_image *src2,
-                                            mlib_s32 cmask);
-
-
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageComposite mlib_ImageComposite
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageComposite(mlib_image *dst,
-                                   const mlib_image *src1,
-                                   const mlib_image *src2,
-                                   mlib_blend bsrc1,
-                                   mlib_blend bsrc2,
-                                   mlib_s32 cmask);
-
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageComposite_Inp mlib_ImageComposite_Inp
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageComposite_Inp(mlib_image *src1dst,
-                                       const mlib_image *src2,
-                                       mlib_blend bsrc1,
-                                       mlib_blend bsrc2,
-                                       mlib_s32 cmask);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* __ORIG_MLIB_IMAGE_BLEND_PROTO_H */
diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_image_proto.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_image_proto.h
index 3a03e16a207..eabe26828a1 100644
--- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_image_proto.h
+++ b/jdk/src/java.desktop/share/native/libmlib_image/mlib_image_proto.h
@@ -1429,17 +1429,6 @@ mlib_status  __mlib_ImageAffine(mlib_image *dst,
                                 mlib_edge edge);
 
 
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageAffineIndex mlib_ImageAffineIndex
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageAffineIndex(mlib_image *dst,
-                                     const mlib_image *src,
-                                     const mlib_d64 *mtx,
-                                     mlib_filter filter,
-                                     mlib_edge edge,
-                                     const void *colormap);
-
-
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageAffineTable mlib_ImageAffineTable
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
@@ -1470,17 +1459,6 @@ mlib_status  __mlib_ImageAffineTransform(mlib_image *dst,
                                          mlib_edge edge);
 
 
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageAffineTransformIndex mlib_ImageAffineTransformIndex
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageAffineTransformIndex(mlib_image *dst,
-                                              const mlib_image *src,
-                                              const mlib_d64 *mtx,
-                                              mlib_filter filter,
-                                              mlib_edge edge,
-                                              const void *colormap);
-
-
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageAffineTransform_Fp mlib_ImageAffineTransform_Fp
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
@@ -1824,19 +1802,6 @@ mlib_status  __mlib_ImageRotate90_Fp(mlib_image *dst,
                                      const mlib_image *src);
 
 
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageRotateIndex mlib_ImageRotateIndex
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageRotateIndex(mlib_image *dst,
-                                     const mlib_image *src,
-                                     mlib_d64 angle,
-                                     mlib_d64 xcenter,
-                                     mlib_d64 ycenter,
-                                     mlib_filter filter,
-                                     mlib_edge edge,
-                                     const void *colormap);
-
-
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageRotate_Fp mlib_ImageRotate_Fp
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
@@ -1886,16 +1851,6 @@ mlib_status  __mlib_ImageZoomIn2X(mlib_image *dst,
                                   mlib_edge edge);
 
 
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageZoomIn2XIndex mlib_ImageZoomIn2XIndex
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageZoomIn2XIndex(mlib_image *dst,
-                                       const mlib_image *src,
-                                       mlib_filter filter,
-                                       mlib_edge edge,
-                                       const void *colormap);
-
-
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageZoomIn2X_Fp mlib_ImageZoomIn2X_Fp
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
@@ -1914,16 +1869,6 @@ mlib_status  __mlib_ImageZoomOut2X(mlib_image *dst,
                                    mlib_edge edge);
 
 
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageZoomOut2XIndex mlib_ImageZoomOut2XIndex
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageZoomOut2XIndex(mlib_image *dst,
-                                        const mlib_image *src,
-                                        mlib_filter filter,
-                                        mlib_edge edge,
-                                        const void *colormap);
-
-
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageZoomOut2X_Fp mlib_ImageZoomOut2X_Fp
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
@@ -2011,18 +1956,6 @@ mlib_status  __mlib_ImageZoom(mlib_image *dst,
                               mlib_edge edge);
 
 
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageZoomIndex mlib_ImageZoomIndex
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageZoomIndex(mlib_image *dst,
-                                   const mlib_image *src,
-                                   mlib_d64 zoomx,
-                                   mlib_d64 zoomy,
-                                   mlib_filter filter,
-                                   mlib_edge edge,
-                                   const void *colormap);
-
-
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageZoom_Fp mlib_ImageZoom_Fp
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
@@ -2311,98 +2244,6 @@ mlib_status  __mlib_ImageXor_Inp(mlib_image *src1dst,
 /* Radiometric Operations ( radio ) */
 
 
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageColorTrue2IndexInit mlib_ImageColorTrue2IndexInit
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageColorTrue2IndexInit(void **colormap,
-                                             mlib_s32 bits,
-                                             mlib_type intype,
-                                             mlib_type outtype,
-                                             mlib_s32 channels,
-                                             mlib_s32 entries,
-                                             mlib_s32 offset,
-                                             const void **table);
-
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageColorTrue2Index mlib_ImageColorTrue2Index
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageColorTrue2Index(mlib_image *dst,
-                                         const mlib_image *src,
-                                         const void *colormap);
-
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageColorTrue2IndexFree mlib_ImageColorTrue2IndexFree
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-void  __mlib_ImageColorTrue2IndexFree(void *colormap);
-
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageColorDitherInit mlib_ImageColorDitherInit
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageColorDitherInit(void **colormap,
-                                         const mlib_s32 *dimensions,
-                                         mlib_type intype,
-                                         mlib_type outtype,
-                                         mlib_s32 channels,
-                                         mlib_s32 entries,
-                                         mlib_s32 offset,
-                                         void **lut);
-
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageColorDitherFree mlib_ImageColorDitherFree
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-void  __mlib_ImageColorDitherFree(void *colormap);
-
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageColorErrorDiffusion3x3 mlib_ImageColorErrorDiffusion3x3
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageColorErrorDiffusion3x3(mlib_image *dst,
-                                                const mlib_image *src,
-                                                const mlib_s32 *kernel,
-                                                mlib_s32 scale,
-                                                const void *colormap);
-
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageColorErrorDiffusionMxN mlib_ImageColorErrorDiffusionMxN
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageColorErrorDiffusionMxN(mlib_image *dst,
-                                                const mlib_image *src,
-                                                const mlib_s32 *kernel,
-                                                mlib_s32 m,
-                                                mlib_s32 n,
-                                                mlib_s32 dm,
-                                                mlib_s32 dn,
-                                                mlib_s32 scale,
-                                                const void *colormap);
-
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageColorOrderedDither8x8 mlib_ImageColorOrderedDither8x8
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageColorOrderedDither8x8(mlib_image *dst,
-                                               const mlib_image *src,
-                                               const mlib_s32 *dmask,
-                                               mlib_s32 scale,
-                                               const void *colormap);
-
-
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageColorOrderedDitherMxN mlib_ImageColorOrderedDitherMxN
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageColorOrderedDitherMxN(mlib_image *dst,
-                                               const mlib_image *src,
-                                               const mlib_s32 **dmask,
-                                               mlib_s32 m,
-                                               mlib_s32 n,
-                                               mlib_s32 scale,
-                                               const void *colormap);
-
-
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageColorReplace mlib_ImageColorReplace
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
@@ -2693,17 +2534,6 @@ mlib_status  __mlib_ImageConv2x2(mlib_image *dst,
                                  mlib_edge edge);
 
 
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageConv2x2Index mlib_ImageConv2x2Index
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageConv2x2Index(mlib_image *dst,
-                                      const mlib_image *src,
-                                      const mlib_s32 *kernel,
-                                      mlib_s32 scale,
-                                      mlib_edge edge,
-                                      const void *colormap);
-
-
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageConv2x2_Fp mlib_ImageConv2x2_Fp
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
@@ -2725,17 +2555,6 @@ mlib_status  __mlib_ImageConv3x3(mlib_image *dst,
                                  mlib_edge edge);
 
 
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageConv3x3Index mlib_ImageConv3x3Index
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageConv3x3Index(mlib_image *dst,
-                                      const mlib_image *src,
-                                      const mlib_s32 *kernel,
-                                      mlib_s32 scale,
-                                      mlib_edge edge,
-                                      const void *colormap);
-
-
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageConv3x3_Fp mlib_ImageConv3x3_Fp
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
@@ -2757,17 +2576,6 @@ mlib_status  __mlib_ImageConv4x4(mlib_image *dst,
                                  mlib_edge edge);
 
 
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageConv4x4Index mlib_ImageConv4x4Index
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageConv4x4Index(mlib_image *dst,
-                                      const mlib_image *src,
-                                      const mlib_s32 *kernel,
-                                      mlib_s32 scale,
-                                      mlib_edge edge,
-                                      const void *colormap);
-
-
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageConv4x4_Fp mlib_ImageConv4x4_Fp
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
@@ -2789,17 +2597,6 @@ mlib_status  __mlib_ImageConv5x5(mlib_image *dst,
                                  mlib_edge edge);
 
 
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageConv5x5Index mlib_ImageConv5x5Index
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageConv5x5Index(mlib_image *dst,
-                                      const mlib_image *src,
-                                      const mlib_s32 *kernel,
-                                      mlib_s32 scale,
-                                      mlib_edge edge,
-                                      const void *colormap);
-
-
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageConv5x5_Fp mlib_ImageConv5x5_Fp
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
@@ -2821,17 +2618,6 @@ mlib_status  __mlib_ImageConv7x7(mlib_image *dst,
                                  mlib_edge edge);
 
 
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageConv7x7Index mlib_ImageConv7x7Index
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageConv7x7Index(mlib_image *dst,
-                                      const mlib_image *src,
-                                      const mlib_s32 *kernel,
-                                      mlib_s32 scale,
-                                      mlib_edge edge,
-                                      const void *colormap);
-
-
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageConv7x7_Fp mlib_ImageConv7x7_Fp
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
@@ -2870,21 +2656,6 @@ mlib_status  __mlib_ImageConvMxN(mlib_image *dst,
                                  mlib_edge edge);
 
 
-#if defined ( __MEDIALIB_OLD_NAMES )
-#define __mlib_ImageConvMxNIndex mlib_ImageConvMxNIndex
-#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-mlib_status  __mlib_ImageConvMxNIndex(mlib_image *dst,
-                                      const mlib_image *src,
-                                      const mlib_s32 *kernel,
-                                      mlib_s32 m,
-                                      mlib_s32 n,
-                                      mlib_s32 dm,
-                                      mlib_s32 dn,
-                                      mlib_s32 scale,
-                                      mlib_edge edge,
-                                      const void *colormap);
-
-
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageConvMxN_Fp mlib_ImageConvMxN_Fp
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
diff --git a/jdk/src/java.desktop/unix/native/libawt/awt/medialib/mlib_v_ImageCopy.c b/jdk/src/java.desktop/unix/native/libawt/awt/medialib/mlib_v_ImageCopy.c
deleted file mode 100644
index ad2bdf4657c..00000000000
--- a/jdk/src/java.desktop/unix/native/libawt/awt/medialib/mlib_v_ImageCopy.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (c) 2000, 2003, 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.
- */
-
-
-
-/*
- * FUNCTION
- *      mlib_ImageCopy   - Direct copy from one image to another.
- *
- * SYNOPSIS
- *      mlib_status mlib_ImageCopy(mlib_image *dst,
- *                                 mlib_image *src);
- *
- * ARGUMENT
- *      dst     pointer to output or destination image
- *      src     pointer to input or source image
- *
- * RESTRICTION
- *      src and dst must have the same size, type and number of channels.
- *      They can have 1, 2, 3 or 4 channels of MLIB_BIT, MLIB_BYTE,
- *      MLIB_SHORT, MLIB_INT, MLIB_FLOAT or MLIB_DOUBLE data type.
- *
- * DESCRIPTION
- *      Direct copy from one image to another.
- */
-
-#include <stdlib.h>
-#include "mlib_image.h"
-#include "mlib_ImageCheck.h"
-
-/***************************************************************/
-
-extern void mlib_v_ImageCopy_blk(mlib_u8 *sa, mlib_u8 *da, mlib_s32 size);
-extern void mlib_v_ImageCopy_a1(mlib_d64 *sp, mlib_d64 *dp, mlib_s32 size);
-extern void mlib_ImageCopy_na(mlib_u8 *sa, mlib_u8 *da, mlib_s32 size);
-extern void mlib_ImageCopy_bit_al(mlib_u8 *sa, mlib_u8 *da,
-                                  mlib_s32 size, mlib_s32 offset);
-extern void mlib_ImageCopy_bit_na(mlib_u8 *sa, mlib_u8 *da, mlib_s32 size,
-                                  mlib_s32 s_offset, mlib_s32 d_offset);
-
-/***************************************************************/
-
-#ifdef MLIB_TEST
-
-mlib_status mlib_v_ImageCopy(mlib_image *dst, mlib_image *src)
-
-#else
-
-mlib_status mlib_ImageCopy(mlib_image *dst, const mlib_image *src)
-
-#endif
-{
-  mlib_u8  *sa;         /* start point in source */
-  mlib_u8  *da;         /* start points in destination */
-  mlib_s32 width;       /* width in bytes of src and dst */
-  mlib_s32 height;      /* height in lines of src and dst */
-  mlib_s32 s_offset;    /* bit offset of src */
-  mlib_s32 d_offset;    /* bit offset of dst */
-  mlib_s32 stride;      /* stride in bytes in src*/
-  mlib_s32 dstride;     /* stride in bytes in dst */
-  mlib_s32 j;           /* indices for x, y */
-  mlib_s32 size;
-
-  MLIB_IMAGE_CHECK(src);
-  MLIB_IMAGE_CHECK(dst);
-  MLIB_IMAGE_TYPE_EQUAL(src, dst);
-  MLIB_IMAGE_CHAN_EQUAL(src, dst);
-  MLIB_IMAGE_SIZE_EQUAL(src, dst);
-
-  width  = mlib_ImageGetWidth(dst) * mlib_ImageGetChannels(dst);
-  height = mlib_ImageGetHeight(dst);
-  sa = (mlib_u8 *)mlib_ImageGetData(src);
-  da = (mlib_u8 *)mlib_ImageGetData(dst);
-
-  switch (mlib_ImageGetType(dst)) {
-    case MLIB_BIT:
-
-      if (!mlib_ImageIsNotOneDvector(src) &&
-          !mlib_ImageIsNotOneDvector(dst)) {
-          size = height * (width  >> 3);
-          if ((size & 0x3f) == 0 &&
-              !mlib_ImageIsNotAligned64(src) &&
-              !mlib_ImageIsNotAligned64(dst)) {
-
-              mlib_v_ImageCopy_blk(sa, da, size);
-              return MLIB_SUCCESS;
-          }
-          if (((size & 7) == 0) && !mlib_ImageIsNotAligned8(src) &&
-              !mlib_ImageIsNotAligned8(dst)) {
-
-              size >>= 3;                                /* in octlet */
-              mlib_v_ImageCopy_a1((mlib_d64 *)sa, (mlib_d64 *)da, size);
-          }
-          else {
-
-            mlib_ImageCopy_na(sa, da, size);
-          }
-        }
-      else {
-        stride = mlib_ImageGetStride(src);                /* in byte */
-        dstride = mlib_ImageGetStride(dst);               /* in byte */
-        s_offset = mlib_ImageGetBitOffset(src);           /* in bits */
-        d_offset = mlib_ImageGetBitOffset(dst);           /* in bits */
-
-        if (s_offset == d_offset) {
-          for (j = 0; j < height; j++) {
-            mlib_ImageCopy_bit_al(sa, da, width, s_offset);
-            sa += stride;
-            da += dstride;
-          }
-        } else {
-          for (j = 0; j < height; j++) {
-            mlib_ImageCopy_bit_na(sa, da, width, s_offset, d_offset);
-            sa += stride;
-            da += dstride;
-          }
-        }
-      }
-      return MLIB_SUCCESS;
-    case MLIB_BYTE:
-      break;
-    case MLIB_SHORT:
-      width *= 2;
-      break;
-    case MLIB_INT:
-    case MLIB_FLOAT:
-      width *= 4;
-      break;
-    case MLIB_DOUBLE:
-      width *= 8;
-      break;
-    default:
-      return MLIB_FAILURE;
-  }
-
-  if (!mlib_ImageIsNotOneDvector(src) &&
-      !mlib_ImageIsNotOneDvector(dst)) {
-      size = height * width;
-      if ((size & 0x3f) == 0 &&
-          !mlib_ImageIsNotAligned64(src) &&
-          !mlib_ImageIsNotAligned64(dst)) {
-
-          mlib_v_ImageCopy_blk(sa, da, size);
-          return MLIB_SUCCESS;
-      }
-      if (((size & 7) == 0) && !mlib_ImageIsNotAligned8(src) &&
-          !mlib_ImageIsNotAligned8(dst)) {
-
-          size >>= 3;                                /* in octlet */
-          mlib_v_ImageCopy_a1((mlib_d64 *)sa, (mlib_d64 *)da, size);
-      }
-      else {
-
-        mlib_ImageCopy_na(sa, da, size);
-      }
-    }
-  else {
-    stride = mlib_ImageGetStride(src);                /* in byte */
-    dstride = mlib_ImageGetStride(dst);                /* in byte */
-
-    /* row loop */
-    for (j = 0; j < height; j++) {
-      mlib_ImageCopy_na(sa, da, width);
-      sa += stride;
-      da += dstride;
-    }
-  }
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
diff --git a/jdk/src/java.desktop/unix/native/libawt/awt/medialib/mlib_v_ImageCopy_blk.s b/jdk/src/java.desktop/unix/native/libawt/awt/medialib/mlib_v_ImageCopy_blk.s
deleted file mode 100644
index 8261781c3eb..00000000000
--- a/jdk/src/java.desktop/unix/native/libawt/awt/medialib/mlib_v_ImageCopy_blk.s
+++ /dev/null
@@ -1,262 +0,0 @@
-!
-!
-! 
-! Copyright 2000 Sun Microsystems, 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.  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.
-!
-
-
-! FUNCTION
-!      mlib_v_ImageCopy_blk   - Copy an image into another 
-!				(with Block Load/Store)
-!
-! SYNOPSIS
-!      void mlib_v_ImageCopy_blk(void *src,
-!                                void *dst, 
-!                                int size);
-!
-! ARGUMENT
-!      src     source image data
-!      dst     destination image data
-!      size    image size in bytes
-!
-! NOTES
-!      src and dst must point to 64-byte aligned addresses
-!      size must be multiple of 64
-!
-! DESCRIPTION
-!      dst = src
-!
-
-#include "vis_asi.h"
-
-! Minimum size of stack frame according to SPARC ABI
-#define MINFRAME        96
-
-! ENTRY provides the standard procedure entry code
-#define ENTRY(x) \
-	.align  4; \
-	.global x; \
-x:
-
-! SET_SIZE trails a function and sets the size for the ELF symbol table
-#define SET_SIZE(x) \
-	.size   x, (.-x)
-
-! SPARC have four integer register groups. i-registers %i0 to %i7
-! hold input data. o-registers %o0 to %o7 hold output data. l-registers
-! %l0 to %l7 hold local data. g-registers %g0 to %g7 hold global data.
-! Note that %g0 is alway zero, write to it has no program-visible effect.
-
-! When calling an assembly function, the first 6 arguments are stored
-! in i-registers from %i0 to %i5. The rest arguments are stored in stack.
-! Note that %i6 is reserved for stack pointer and %i7 for return address.
-
-! Only the first 32 f-registers can be used as 32-bit registers.
-! The last 32 f-registers can only be used as 16 64-bit registers.
-
-#define src     %i0
-#define dst     %i1
-#define sz      %i2
-
-!frame pointer  %i6
-!return addr    %i7
-
-!stack pointer  %o6
-!call link      %o7
-
-#define sa      %l0
-#define da      %l1
-#define se      %l2
-#define ns      %l3
-
-#define O0      %f16
-#define O1      %f18
-#define O2      %f20
-#define O3      %f22
-#define O4      %f24
-#define O5      %f26
-#define O6      %f28
-#define O7      %f30
-
-#define A0      %f32
-#define A1      %f34
-#define A2      %f36
-#define A3      %f38
-#define A4      %f40
-#define A5      %f42
-#define A6      %f44
-#define A7      %f46
-
-#define B0      %f48
-#define B1      %f50
-#define B2      %f52
-#define B3      %f54
-#define B4      %f56
-#define B5      %f58
-#define B6      %f60
-#define B7      %f62
-
-#define USE_BLD
-#define USE_BST
-
-#define MEMBAR_BEFORE_BLD        membar  #StoreLoad
-#define MEMBAR_AFTER_BLD         membar  #StoreLoad
-
-#ifdef USE_BLD
-#define BLD_A0                                  \
-        ldda    [sa]ASI_BLK_P,A0;               \
-        cmp     sa,se;                          \
-        blu,pt  %icc,1f;                        \
-        inc     64,sa;                          \
-        dec     64,sa;                          \
-1:
-#else
-#define BLD_A0                                  \
-        ldd     [sa +  0],A0;                   \
-        ldd     [sa +  8],A1;                   \
-        ldd     [sa + 16],A2;                   \
-        ldd     [sa + 24],A3;                   \
-        ldd     [sa + 32],A4;                   \
-        ldd     [sa + 40],A5;                   \
-        ldd     [sa + 48],A6;                   \
-        ldd     [sa + 56],A7;                   \
-        cmp     sa,se;                          \
-        blu,pt  %icc,1f;                        \
-        inc     64,sa;                          \
-        dec     64,sa;                          \
-1:
-#endif
-
-#ifdef USE_BLD
-#define BLD_B0                                  \
-        ldda    [sa]ASI_BLK_P,B0;               \
-        cmp     sa,se;                          \
-        blu,pt  %icc,1f;                        \
-        inc     64,sa;                          \
-        dec     64,sa;                          \
-1:
-#else
-#define BLD_B0                                  \
-        ldd     [sa +  0],B0;                   \
-        ldd     [sa +  8],B1;                   \
-        ldd     [sa + 16],B2;                   \
-        ldd     [sa + 24],B3;                   \
-        ldd     [sa + 32],B4;                   \
-        ldd     [sa + 40],B5;                   \
-        ldd     [sa + 48],B6;                   \
-        ldd     [sa + 56],B7;                   \
-        cmp     sa,se;                          \
-        blu,pt  %icc,1f;                        \
-        inc     64,sa;                          \
-        dec     64,sa;                          \
-1:
-#endif
-
-#ifdef USE_BST
-#define BST                                     \
-        stda    O0,[da]ASI_BLK_P;               \
-        inc     64,da;                          \
-        deccc   ns;                             \
-        ble,pn  %icc,mlib_v_ImageCopy_end;	\
-        nop
-#else
-#define BST                                     \
-        std     O0,[da +  0];                   \
-        std     O1,[da +  8];                   \
-        std     O2,[da + 16];                   \
-        std     O3,[da + 24];                   \
-        std     O4,[da + 32];                   \
-        std     O5,[da + 40];                   \
-        std     O6,[da + 48];                   \
-        std     O7,[da + 56];                   \
-        inc     64,da;                          \
-        deccc   ns;                             \
-        ble,pn  %icc,mlib_v_ImageCopy_end;	\
-        nop
-#endif
-
-#define COPY_A0					\
-        fmovd A0, O0;                           \
-        fmovd A1, O1;                           \
-        fmovd A2, O2;                           \
-        fmovd A3, O3;                           \
-        fmovd A4, O4;                           \
-        fmovd A5, O5;                           \
-        fmovd A6, O6;                           \
-        fmovd A7, O7;
-
-#define COPY_B0					\
-        fmovd B0, O0;                           \
-        fmovd B1, O1;                           \
-        fmovd B2, O2;                           \
-        fmovd B3, O3;                           \
-        fmovd B4, O4;                           \
-        fmovd B5, O5;                           \
-        fmovd B6, O6;                           \
-        fmovd B7, O7;
-
-        .section        ".text",#alloc,#execinstr
-
-        ENTRY(mlib_v_ImageCopy_blk)	! function name
-
-        save    %sp,-MINFRAME,%sp	! reserve space for stack
-                                        ! and adjust register window
-! do some error checking
-        tst     sz                      ! size > 0
-        ble,pn  %icc,mlib_v_ImageCopy_ret
-
-! calculate loop count
-        sra     sz,6,ns                 ! 64 bytes per loop
-
-        add     src,sz,se               ! end address of source
-        mov     src,sa
-        mov     dst,da
-                                        ! issue memory barrier instruction
-        MEMBAR_BEFORE_BLD               ! to ensure all previous memory load
-                                        ! and store has completed
-
-        BLD_A0
-        BLD_B0                          ! issue the 2nd block load instruction
-                                        ! to synchronize with returning data
-mlib_v_ImageCopy_bgn:
-
-        COPY_A0				! process data returned by BLD_A0
-        BLD_A0                          ! block load and sync data from BLD_B0
-        BST                             ! block store data from BLD_A0
-
-        COPY_B0				! process data returned by BLD_B0
-        BLD_B0                          ! block load and sync data from BLD_A0
-        BST                             ! block store data from BLD_B0
-
-        bg,pt   %icc,mlib_v_ImageCopy_bgn
-
-mlib_v_ImageCopy_end:
-                                        ! issue memory barrier instruction
-        MEMBAR_AFTER_BLD                ! to ensure all previous memory load
-                                        ! and store has completed.
-mlib_v_ImageCopy_ret:
-        ret                             ! return
-        restore                         ! restore register window
-
-        SET_SIZE(mlib_v_ImageCopy_blk)
diff --git a/jdk/src/java.desktop/unix/native/libawt/awt/medialib/vis_asi.h b/jdk/src/java.desktop/unix/native/libawt/awt/medialib/vis_asi.h
deleted file mode 100644
index d0a75d3b6a2..00000000000
--- a/jdk/src/java.desktop/unix/native/libawt/awt/medialib/vis_asi.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, 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.
- */
-
-
-#ifndef VIS_ASI_H
-#define VIS_ASI_H
-
-/* evolved from asm_asi.h in VSDK 1.0 */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* ASI definitions for VIS */
-
-#define         ASI_N                                   0x04
-#define         ASI_NL                                  0x0C
-#define         ASI_AIUP                                0x10
-#define         ASI_AIUS                                0x11
-#define         ASI_AIUPL                               0x18
-#define         ASI_AIUSL                               0x19
-#define         ASI_PHYS_USE_EC_L                       0x1C
-#define         ASI_PHYS_BYPASS_EC_WITH_EBIT_L          0x1D
-#define         ASI_DC_DATA                             0x46
-#define         ASI_DC_TAG                              0x47
-#define         ASI_UPA_CONTROL                         0x4A
-#define         ASI_MONDO_SEND_CTRL                     0x48
-#define         ASI_MONDO_RECEIVE_CTRL                  0x49
-#define         ASI_AFSR                                0x4C
-#define         ASI_AFAR                                0x4D
-#define         ASI_EC_TAG_DATA                         0x4E
-#define         ASI_ICACHE_DATA                         0x66
-#define         ASI_IC_INSTR                            0x66
-#define         ASI_IC_TAG                              0x67
-#define         ASI_IC_PRE_DECODE                       0x6E
-#define         ASI_IC_NEXT_FIELD                       0x6F
-#define         ASI_BLK_AIUP                            0x70
-#define         ASI_BLK_AIUS                            0x71
-#define         ASI_EC                                  0x76
-#define         ASI_BLK_AIUPL                           0x78
-#define         ASI_BLK_AIUSL                           0x79
-#define         ASI_P                                   0x80
-#define         ASI_S                                   0x81
-#define         ASI_PNF                                 0x82
-#define         ASI_SNF                                 0x83
-#define         ASI_PL                                  0x88
-#define         ASI_SL                                  0x89
-#define         ASI_PNFL                                0x8A
-#define         ASI_SNFL                                0x8B
-#define         ASI_PST8_P                              0xC0
-#define         ASI_PST8_S                              0xC1
-#define         ASI_PST16_P                             0xC2
-#define         ASI_PST16_S                             0xC3
-#define         ASI_PST32_P                             0xC4
-#define         ASI_PST32_S                             0xC5
-#define         ASI_PST8_PL                             0xC8
-#define         ASI_PST8_SL                             0xC9
-#define         ASI_PST16_PL                            0xCA
-#define         ASI_PST16_SL                            0xCB
-#define         ASI_PST32_PL                            0xCC
-#define         ASI_PST32_SL                            0xCD
-#define         ASI_FL8_P                               0xD0
-#define         ASI_FL8_S                               0xD1
-#define         ASI_FL16_P                              0xD2
-#define         ASI_FL16_S                              0xD3
-#define         ASI_FL8_PL                              0xD8
-#define         ASI_FL8_SL                              0xD9
-#define         ASI_FL16_PL                             0xDA
-#define         ASI_FL16_SL                             0xDB
-#define         ASI_COMMIT_P                            0xE0
-#define         ASI_COMMIT_S                            0xE1
-#define         ASI_BLK_P                               0xF0
-#define         ASI_BLK_S                               0xF1
-#define         ASI_BLK_PL                              0xF8
-#define         ASI_BLK_SL                              0xF9
-
-#define         ASI_NUCLEUS                             0x04
-#define         ASI_NUCLEUS_LITTLE                      0x0C
-#define         ASI_AS_IF_USER_PRIMARY                  0x10
-#define         ASI_AS_IF_USER_SECONDARY                0x11
-#define         ASI_PHYS_USE_EC                         0x14
-#define         ASI_PHYS_BYPASS_EC_WITH_EBIT            0x15
-#define         ASI_AS_IF_USER_PRIMARY_LITTLE           0x18
-#define         ASI_AS_IF_USER_SECONDARY_LITTLE         0x19
-#define         ASI_PHYS_USE_EC_LITTLE                  0x1C
-#define         ASI_PHYS_BYPASS_EC_WITH_EBIT_LITTLE     0x1D
-#define         ASI_LSU_CONTROL_REG                     0x45
-#define         ASI_DCACHE_DATA                         0x46
-#define         ASI_DCACHE_TAG                          0x47
-#define         ASI_INTR_DISPATCH_STATUS                0x48
-#define         ASI_INTR_RECEIVE                        0x49
-#define         ASI_UPA_CONFIG_REG                      0x4A
-#define         ASI_ESTATE_ERROR_EN_REG                 0x4B
-#define         ASI_ASYNC_FAULT_STATUS                  0x4C
-#define         ASI_ASYNC_FAULT_ADDR                    0x4D
-#define         ASI_ECACHE_TAG_DATA                     0x4E
-#define         ASI_OBSERVABILITY_REG                   0x4F
-#define         ASI_IMMU                                0x50
-#define         ASI_IMU_TSB_BASE                        0x50
-#define         ASI_IMU_TAG_ACCESS                      0x50
-#define         ASI_IMU_SFSR                            0x50
-#define         ASI_IMU_TAG_TARGET                      0x50
-#define         ASI_IMU_TSB_POINTER_8K                  0x51
-#define         ASI_IMU_TSB_POINTER_64K                 0x52
-#define         ASI_IMU_DATAIN                          0x54
-#define         ASI_IMMU_DATA_IN                        0x54
-#define         ASI_IMU_DATA_ACCESS                     0x55
-#define         ASI_IMU_TAG_READ                        0x56
-#define         ASI_IMU_DEMAP                           0x57
-#define         ASI_DMMU                                0x58
-#define         ASI_PRIMARY_CONTEXT                     0x58
-#define         ASI_SECONDARY_CONTEXT                   0x58
-#define         ASI_DMU_TSB_BASE                        0x58
-#define         ASI_DMU_TAG_ACCESS                      0x58
-#define         ASI_DMU_TAG_TARGET                      0x58
-#define         ASI_DMU_SFSR                            0x58
-#define         ASI_DMU_SFAR                            0x58
-#define         ASI_DMU_VA_WATCHPOINT                   0x58
-#define         ASI_DMU_PA_WATCHPOINT                   0x58
-#define         ASI_DMU_TSB_POINTER_8K                  0x59
-#define         ASI_DMU_TSB_POINTER_64K                 0x5A
-#define         ASI_DMU_TSB_POINTER_DIRECT              0x5B
-#define         ASI_DMU_DATAIN                          0x5C
-#define         ASI_DMMU_DATA_IN                        0x5C
-#define         ASI_DMU_DATA_ACCESS                     0x5D
-#define         ASI_DMU_TAG_READ                        0x5E
-#define         ASI_DMU_DEMAP                           0x5F
-#define         ASI_ICACHE_INSTR                        0x66
-#define         ASI_ICACHE_TAG                          0x67
-#define         ASI_ICACHE_PRE_DECODE                   0x6E
-#define         ASI_ICACHE_NEXT_FIELD                   0x6F
-#define         ASI_BLOCK_AS_IF_USER_PRIMARY            0x70
-#define         ASI_BLOCK_AS_IF_USER_SECONDARY          0x71
-#define         ASI_EXT                                 0x76
-#define         ASI_ECACHE                              0x76
-#define         ASI_ECACHE_DATA                         0x76
-#define         ASI_ECACHE_TAG                          0x76
-#define         ASI_SDB_INTR                            0x77
-#define         ASI_SDBH_ERR_REG                        0x77
-#define         ASI_SDBL_ERR_REG                        0x77
-#define         ASI_SDBH_CONTROL_REG                    0x77
-#define         ASI_SDBL_CONTROL_REG                    0x77
-#define         ASI_INTR_DISPATCH                       0x77
-#define         ASI_INTR_DATA0                          0x77
-#define         ASI_INTR_DATA1                          0x77
-#define         ASI_INTR_DATA2                          0x77
-#define         ASI_BLOCK_AS_IF_USER_PRIMARY_LITTLE     0x78
-#define         ASI_BLOCK_AS_IF_USER_SECONDARY_LITTLE   0x79
-#define         ASI_PRIMARY                             0x80
-#define         ASI_SECONDARY                           0x81
-#define         ASI_PRIMARY_NO_FAULT                    0x82
-#define         ASI_SECONDARY_NO_FAULT                  0x83
-#define         ASI_PRIMARY_LITTLE                      0x88
-#define         ASI_SECONDARY_LITTLE                    0x89
-#define         ASI_PRIMARY_NO_FAULT_LITTLE             0x8A
-#define         ASI_SECONDARY_NO_FAULT_LITTLE           0x8B
-#define         ASI_PST8_PRIMARY                        0xC0
-#define         ASI_PST8_SECONDARY                      0xC1
-#define         ASI_PST16_PRIMARY                       0xC2
-#define         ASI_PST16_SECONDARY                     0xC3
-#define         ASI_PST32_PRIMARY                       0xC4
-#define         ASI_PST32_SECONDARY                     0xC5
-#define         ASI_PST8_PRIMARY_LITTLE                 0xC8
-#define         ASI_PST8_SECONDARY_LITTLE               0xC9
-#define         ASI_PST16_PRIMARY_LITTLE                0xCA
-#define         ASI_PST16_SECONDARY_LITTLE              0xCB
-#define         ASI_PST32_PRIMARY_LITTLE                0xCC
-#define         ASI_PST32_SECONDARY_LITTLE              0xCD
-#define         ASI_FL8_PRIMARY                         0xD0
-#define         ASI_FL8_SECONDARY                       0xD1
-#define         ASI_FL16_PRIMARY                        0xD2
-#define         ASI_FL16_SECONDARY                      0xD3
-#define         ASI_FL8_PRIMARY_LITTLE                  0xD8
-#define         ASI_FL8_SECONDARY_LITTLE                0xD9
-#define         ASI_FL16_PRIMARY_LITTLE                 0xDA
-#define         ASI_FL16_SECONDARY_LITTLE               0xDB
-#define         ASI_COMMIT_PRIMARY                      0xE0
-#define         ASI_COMMIT_SECONDARY                    0xE1
-#define         ASI_BLOCK_PRIMARY                       0xF0
-#define         ASI_BLOCK_SECONDARY                     0xF1
-#define         ASI_BLOCK_PRIMARY_LITTLE                0xF8
-#define         ASI_BLOCK_SECONDARY_LITTLE              0xF9
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif  /* VIS_ASI_H */
diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffineIndex_BC.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffineIndex_BC.c
deleted file mode 100644
index d87fa01926d..00000000000
--- a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffineIndex_BC.c
+++ /dev/null
@@ -1,1443 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, 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.
- */
-
-
-
-#include "vis_proto.h"
-#include "mlib_image.h"
-#include "mlib_ImageColormap.h"
-#include "mlib_ImageAffine.h"
-#include "mlib_v_ImageFilters.h"
-
-/***************************************************************/
-#define MLIB_LIMIT   512
-#define MLIB_SHIFT    16
-
-/***************************************************************/
-#undef  DECLAREVAR
-#define DECLAREVAR()                                            \
-  DECLAREVAR0();                                                \
-  mlib_s32  *warp_tbl   = param -> warp_tbl;                    \
-  mlib_s32  xSrc, ySrc;                                         \
-  mlib_s32  srcYStride = param -> srcYStride;                   \
-  mlib_s32  filter     = param -> filter;                       \
-  mlib_s32  max_xsize  = param -> max_xsize;                    \
-  MLIB_TYPE *srcIndexPtr;                                       \
-  MLIB_TYPE *dstIndexPtr;                                       \
-  mlib_d64  *dstPixelPtr;                                       \
-  mlib_s32  i
-
-/***************************************************************/
-#define DECLAREVAR_U8()                                         \
-  mlib_s32  filterposx, filterposy;                             \
-  mlib_d64  sum0, sum1, sum2, sum3;                             \
-  mlib_f32  hi_row00, hi_row10, hi_row20, hi_row30;             \
-  mlib_f32  hi_row01, hi_row11, hi_row21, hi_row31;             \
-  mlib_f32  lo_row00, lo_row10, lo_row20, lo_row30;             \
-  mlib_f32  lo_row01, lo_row11, lo_row21, lo_row31;             \
-  mlib_d64  xFilter0, xFilter1, xFilter2, xFilter3, yFilter;    \
-  mlib_d64  v00, v10, v20, v30;                                 \
-  mlib_d64  v01, v11, v21, v31;                                 \
-  mlib_d64  v02, v12, v22, v32;                                 \
-  mlib_d64  v03, v13, v23, v33;                                 \
-  mlib_d64  d0, d1, d2, d3;                                     \
-  mlib_d64  d00, d10, d20, d30;                                 \
-  mlib_d64  d01, d11, d21, d31;                                 \
-  mlib_s32  cols;                                               \
-  mlib_d64  res, *xPtr
-
-/***************************************************************/
-#define DECLAREVAR_S16()                                        \
-  mlib_s32  filterposx, filterposy;                             \
-  mlib_d64  sum0, sum1, sum2, sum3;                             \
-  mlib_d64  row00, row10, row20, row30;                         \
-  mlib_d64  row01, row11, row21, row31;                         \
-  mlib_d64  row02, row12, row22, row32;                         \
-  mlib_d64  row03, row13, row23, row33;                         \
-  mlib_d64  xFilter0, xFilter1, xFilter2, xFilter3;             \
-  mlib_d64  yFilter0, yFilter1, yFilter2, yFilter3;             \
-  mlib_d64  v00, v01, v02, v03, v10, v11, v12, v13;             \
-  mlib_d64  v20, v21, v22, v23, v30, v31, v32, v33;             \
-  mlib_d64  u00, u01, u10, u11, u20, u21, u30, u31;             \
-  mlib_d64  d0, d1, d2, d3;                                     \
-  mlib_d64  *yPtr, *xPtr;                                       \
-  mlib_s32  cols;                                               \
-  mlib_d64  res;                                                \
-  mlib_f32  f_x01000100 = vis_to_float(0x01000100)
-
-/***************************************************************/
-#undef  CLIP
-#define CLIP()                                                  \
-  dstData += dstYStride;                                        \
-  xLeft = leftEdges[j];                                         \
-  xRight = rightEdges[j];                                       \
-  X = xStarts[j];                                               \
-  Y = yStarts[j];                                               \
-  PREPARE_DELTAS                                                \
-  if (xLeft > xRight)                                           \
-    continue;                                                   \
-  dstIndexPtr = (MLIB_TYPE *)dstData + xLeft;                   \
-  dstPixelPtr = dstRowPtr
-
-/***************************************************************/
-#define FADD_4BC_U8()                                           \
-  d0 = vis_fpadd16(d00, d10);                                   \
-  d1 = vis_fpadd16(d20, d30);                                   \
-  d0 = vis_fpadd16(d0, d1);                                     \
-  d2 = vis_fpadd16(d01, d11);                                   \
-  d3 = vis_fpadd16(d21, d31);                                   \
-  d2 = vis_fpadd16(d2, d3);                                     \
-  res = vis_fpack16_pair(d0, d2)
-
-/***************************************************************/
-#define LOAD_BC_U8_4CH_1PIXEL(mlib_filters_u8, mlib_filters_u8_4)      \
-  filterposy = (Y >> FILTER_SHIFT) & FILTER_MASK;                      \
-  yFilter = *((mlib_d64 *) ((mlib_u8 *)mlib_filters_u8 + filterposy)); \
-  filterposx = (X >> FILTER_SHIFT) & FILTER_MASK;                      \
-  xPtr = ((mlib_d64 *)((mlib_u8 *)mlib_filters_u8_4+4*filterposx));    \
-  xFilter0 = xPtr[0];                                                  \
-  xFilter1 = xPtr[1];                                                  \
-  xFilter2 = xPtr[2];                                                  \
-  xFilter3 = xPtr[3];                                                  \
-  X += dX;                                                             \
-  Y += dY;                                                             \
-  hi_row00 = flut[srcIndexPtr[0]];                                     \
-  lo_row00 = flut[srcIndexPtr[1]];                                     \
-  hi_row01 = flut[srcIndexPtr[2]];                                     \
-  lo_row01 = flut[srcIndexPtr[3]];                                     \
-  srcIndexPtr += srcYStride;                                           \
-  hi_row10 = flut[srcIndexPtr[0]];                                     \
-  lo_row10 = flut[srcIndexPtr[1]];                                     \
-  hi_row11 = flut[srcIndexPtr[2]];                                     \
-  lo_row11 = flut[srcIndexPtr[3]];                                     \
-  srcIndexPtr += srcYStride;                                           \
-  hi_row20 = flut[srcIndexPtr[0]];                                     \
-  lo_row20 = flut[srcIndexPtr[1]];                                     \
-  hi_row21 = flut[srcIndexPtr[2]];                                     \
-  lo_row21 = flut[srcIndexPtr[3]];                                     \
-  srcIndexPtr += srcYStride;                                           \
-  hi_row30 = flut[srcIndexPtr[0]];                                     \
-  lo_row30 = flut[srcIndexPtr[1]];                                     \
-  hi_row31 = flut[srcIndexPtr[2]];                                     \
-  lo_row31 = flut[srcIndexPtr[3]]
-
-/***************************************************************/
-#define NEXT_PIXEL_4BC()                                        \
-  xSrc = (X >> MLIB_SHIFT)-1;                                   \
-  ySrc = (Y >> MLIB_SHIFT)-1;                                   \
-  srcIndexPtr = (MLIB_TYPE *)lineAddr[ySrc] + xSrc
-
-/***************************************************************/
-#define RESULT_4BC_U8_1PIXEL(ind)                               \
-  v00 = vis_fmul8x16au(hi_row00, vis_read_hi(yFilter));         \
-  v01 = vis_fmul8x16au(lo_row00, vis_read_hi(yFilter));         \
-  v02 = vis_fmul8x16au(hi_row01, vis_read_hi(yFilter));         \
-  v03 = vis_fmul8x16au(lo_row01, vis_read_hi(yFilter));         \
-  v10 = vis_fmul8x16al(hi_row10, vis_read_hi(yFilter));         \
-  v11 = vis_fmul8x16al(lo_row10, vis_read_hi(yFilter));         \
-  sum0 = vis_fpadd16(v00, v10);                                 \
-  v12 = vis_fmul8x16al(hi_row11, vis_read_hi(yFilter));         \
-  sum1 = vis_fpadd16(v01, v11);                                 \
-  v13 = vis_fmul8x16al(lo_row11, vis_read_hi(yFilter));         \
-  sum2 = vis_fpadd16(v02, v12);                                 \
-  v20 = vis_fmul8x16au(hi_row20, vis_read_lo(yFilter));         \
-  sum3 = vis_fpadd16(v03, v13);                                 \
-  v21 = vis_fmul8x16au(lo_row20, vis_read_lo(yFilter));         \
-  sum0 = vis_fpadd16(sum0, v20);                                \
-  v22 = vis_fmul8x16au(hi_row21, vis_read_lo(yFilter));         \
-  sum1 = vis_fpadd16(sum1, v21);                                \
-  v23 = vis_fmul8x16au(lo_row21, vis_read_lo(yFilter));         \
-  sum2 = vis_fpadd16(sum2, v22);                                \
-  v30 = vis_fmul8x16al(hi_row30, vis_read_lo(yFilter));         \
-  sum3 = vis_fpadd16(sum3, v23);                                \
-  v31 = vis_fmul8x16al(lo_row30, vis_read_lo(yFilter));         \
-  sum0 = vis_fpadd16(sum0, v30);                                \
-  v32 = vis_fmul8x16al(hi_row31, vis_read_lo(yFilter));         \
-  sum1 = vis_fpadd16(sum1, v31);                                \
-  v33 = vis_fmul8x16al(lo_row31, vis_read_lo(yFilter));         \
-  sum2 = vis_fpadd16(sum2, v32);                                \
-  v00 = vis_fmul8sux16(sum0, xFilter0);                         \
-  sum3 = vis_fpadd16(sum3, v33);                                \
-  v01 = vis_fmul8ulx16(sum0, xFilter0);                         \
-  v10 = vis_fmul8sux16(sum1, xFilter1);                         \
-  d0##ind = vis_fpadd16(v00, v01);                              \
-  v11 = vis_fmul8ulx16(sum1, xFilter1);                         \
-  v20 = vis_fmul8sux16(sum2, xFilter2);                         \
-  d1##ind = vis_fpadd16(v10, v11);                              \
-  v21 = vis_fmul8ulx16(sum2, xFilter2);                         \
-  v30 = vis_fmul8sux16(sum3, xFilter3);                         \
-  d2##ind = vis_fpadd16(v20, v21);                              \
-  v31 = vis_fmul8ulx16(sum3, xFilter3);                         \
-  d3##ind = vis_fpadd16(v30, v31)
-
-/***************************************************************/
-#define BC_U8_4CH(ind, mlib_filters_u8, mlib_filters_u8_4)            \
-  v00 = vis_fmul8x16au(hi_row00, vis_read_hi(yFilter));               \
-  v01 = vis_fmul8x16au(lo_row00, vis_read_hi(yFilter));               \
-  v02 = vis_fmul8x16au(hi_row01, vis_read_hi(yFilter));               \
-  v03 = vis_fmul8x16au(lo_row01, vis_read_hi(yFilter));               \
-  hi_row00 = flut[srcIndexPtr[0]];                                    \
-  filterposy = (Y >> FILTER_SHIFT);                                   \
-  v10 = vis_fmul8x16al(hi_row10, vis_read_hi(yFilter));               \
-  lo_row00 = flut[srcIndexPtr[1]];                                    \
-  v11 = vis_fmul8x16al(lo_row10, vis_read_hi(yFilter));               \
-  sum0 = vis_fpadd16(v00, v10);                                       \
-  hi_row01 = flut[srcIndexPtr[2]];                                    \
-  v12 = vis_fmul8x16al(hi_row11, vis_read_hi(yFilter));               \
-  lo_row01 = flut[srcIndexPtr[3]];                                    \
-  filterposx = (X >> FILTER_SHIFT);                                   \
-  v13 = vis_fmul8x16al(lo_row11, vis_read_hi(yFilter));               \
-  srcIndexPtr += srcYStride;                                          \
-  hi_row10 = flut[srcIndexPtr[0]];                                    \
-  v20 = vis_fmul8x16au(hi_row20, vis_read_lo(yFilter));               \
-  sum1 = vis_fpadd16(v01, v11);                                       \
-  lo_row10 = flut[srcIndexPtr[1]];                                    \
-  X += dX;                                                            \
-  hi_row11 = flut[srcIndexPtr[2]];                                    \
-  v21 = vis_fmul8x16au(lo_row20, vis_read_lo(yFilter));               \
-  sum2 = vis_fpadd16(v02, v12);                                       \
-  lo_row11 = flut[srcIndexPtr[3]];                                    \
-  v22 = vis_fmul8x16au(hi_row21, vis_read_lo(yFilter));               \
-  srcIndexPtr += srcYStride;                                          \
-  hi_row20 = flut[srcIndexPtr[0]];                                    \
-  v23 = vis_fmul8x16au(lo_row21, vis_read_lo(yFilter));               \
-  sum3 = vis_fpadd16(v03, v13);                                       \
-  Y += dY;                                                            \
-  xSrc = (X >> MLIB_SHIFT)-1;                                         \
-  v30 = vis_fmul8x16al(hi_row30, vis_read_lo(yFilter));               \
-  sum0 = vis_fpadd16(sum0, v20);                                      \
-  lo_row20 = flut[srcIndexPtr[1]];                                    \
-  ySrc = (Y >> MLIB_SHIFT)-1;                                         \
-  hi_row21 = flut[srcIndexPtr[2]];                                    \
-  v31 = vis_fmul8x16al(lo_row30, vis_read_lo(yFilter));               \
-  sum1 = vis_fpadd16(sum1, v21);                                      \
-  filterposy &= FILTER_MASK;                                          \
-  lo_row21 = flut[srcIndexPtr[3]];                                    \
-  v32 = vis_fmul8x16al(hi_row31, vis_read_lo(yFilter));               \
-  srcIndexPtr += srcYStride;                                          \
-  filterposx &= FILTER_MASK;                                          \
-  v33 = vis_fmul8x16al(lo_row31, vis_read_lo(yFilter));               \
-  sum2 = vis_fpadd16(sum2, v22);                                      \
-  hi_row30 = flut[srcIndexPtr[0]];                                    \
-  sum3 = vis_fpadd16(sum3, v23);                                      \
-  sum0 = vis_fpadd16(sum0, v30);                                      \
-  lo_row30 = flut[srcIndexPtr[1]];                                    \
-  sum1 = vis_fpadd16(sum1, v31);                                      \
-  v00 = vis_fmul8sux16(sum0, xFilter0);                               \
-  hi_row31 = flut[srcIndexPtr[2]];                                    \
-  sum2 = vis_fpadd16(sum2, v32);                                      \
-  v01 = vis_fmul8ulx16(sum0, xFilter0);                               \
-  sum3 = vis_fpadd16(sum3, v33);                                      \
-  lo_row31 = flut[srcIndexPtr[3]];                                    \
-  v10 = vis_fmul8sux16(sum1, xFilter1);                               \
-  d0##ind = vis_fpadd16(v00, v01);                                    \
-  yFilter = *((mlib_d64 *)((mlib_u8 *)mlib_filters_u8 + filterposy)); \
-  v11 = vis_fmul8ulx16(sum1, xFilter1);                               \
-  xPtr = ((mlib_d64 *)((mlib_u8 *)mlib_filters_u8_4+4*filterposx));   \
-  xFilter0 = xPtr[0];                                                 \
-  v20 = vis_fmul8sux16(sum2, xFilter2);                               \
-  d1##ind = vis_fpadd16(v10, v11);                                    \
-  xFilter1 = xPtr[1];                                                 \
-  v21 = vis_fmul8ulx16(sum2, xFilter2);                               \
-  xFilter2 = xPtr[2];                                                 \
-  v30 = vis_fmul8sux16(sum3, xFilter3);                               \
-  d2##ind = vis_fpadd16(v20, v21);                                    \
-  xFilter3 = xPtr[3];                                                 \
-  v31 = vis_fmul8ulx16(sum3, xFilter3);                               \
-  srcIndexPtr = (MLIB_TYPE *)lineAddr[ySrc] + xSrc;                   \
-  d3##ind = vis_fpadd16(v30, v31)
-
-/***************************************************************/
-#define LOAD_BC_S16_4CH_1PIXEL(mlib_filters_s16_4)                      \
-  row00 = flut[srcIndexPtr[0]];                                         \
-  row01 = flut[srcIndexPtr[1]];                                         \
-  row02 = flut[srcIndexPtr[2]];                                         \
-  row03 = flut[srcIndexPtr[3]];                                         \
-  srcIndexPtr += srcYStride;                                            \
-  row10 = flut[srcIndexPtr[0]];                                         \
-  row11 = flut[srcIndexPtr[1]];                                         \
-  row12 = flut[srcIndexPtr[2]];                                         \
-  row13 = flut[srcIndexPtr[3]];                                         \
-  srcIndexPtr += srcYStride;                                            \
-  row20 = flut[srcIndexPtr[0]];                                         \
-  row21 = flut[srcIndexPtr[1]];                                         \
-  row22 = flut[srcIndexPtr[2]];                                         \
-  row23 = flut[srcIndexPtr[3]];                                         \
-  srcIndexPtr += srcYStride;                                            \
-  row30 = flut[srcIndexPtr[0]];                                         \
-  row31 = flut[srcIndexPtr[1]];                                         \
-  row32 = flut[srcIndexPtr[2]];                                         \
-  row33 = flut[srcIndexPtr[3]];                                         \
-  filterposy = (Y >> FILTER_SHIFT) & FILTER_MASK;                       \
-  yPtr = ((mlib_d64 *) ((mlib_u8 *)mlib_filters_s16_4 + filterposy*4)); \
-  yFilter0 = yPtr[0];                                                   \
-  yFilter1 = yPtr[1];                                                   \
-  yFilter2 = yPtr[2];                                                   \
-  yFilter3 = yPtr[3];                                                   \
-  filterposx = (X >> FILTER_SHIFT) & FILTER_MASK;                       \
-  xPtr = ((mlib_d64 *)((mlib_u8 *)mlib_filters_s16_4 + filterposx*4));  \
-  xFilter0 = xPtr[0];                                                   \
-  xFilter1 = xPtr[1];                                                   \
-  xFilter2 = xPtr[2];                                                   \
-  xFilter3 = xPtr[3];                                                   \
-  X += dX;                                                              \
-  Y += dY
-
-/***************************************************************/
-#define RESULT_4BC_S16_1PIXEL()                                 \
-  u00 = vis_fmul8sux16(row00, yFilter0);                        \
-  u01 = vis_fmul8ulx16(row00, yFilter0);                        \
-  u10 = vis_fmul8sux16(row01, yFilter0);                        \
-  u11 = vis_fmul8ulx16(row01, yFilter0);                        \
-  v00 = vis_fpadd16(u00, u01);                                  \
-  u20 = vis_fmul8sux16(row02, yFilter0);                        \
-  v01 = vis_fpadd16(u10, u11);                                  \
-  u21 = vis_fmul8ulx16(row02, yFilter0);                        \
-  u30 = vis_fmul8sux16(row03, yFilter0);                        \
-  u31 = vis_fmul8ulx16(row03, yFilter0);                        \
-  v02 = vis_fpadd16(u20, u21);                                  \
-  u00 = vis_fmul8sux16(row10, yFilter1);                        \
-  u01 = vis_fmul8ulx16(row10, yFilter1);                        \
-  v03 = vis_fpadd16(u30, u31);                                  \
-  u10 = vis_fmul8sux16(row11, yFilter1);                        \
-  u11 = vis_fmul8ulx16(row11, yFilter1);                        \
-  v10 = vis_fpadd16(u00, u01);                                  \
-  u20 = vis_fmul8sux16(row12, yFilter1);                        \
-  v11 = vis_fpadd16(u10, u11);                                  \
-  u21 = vis_fmul8ulx16(row12, yFilter1);                        \
-  u30 = vis_fmul8sux16(row13, yFilter1);                        \
-  u31 = vis_fmul8ulx16(row13, yFilter1);                        \
-  u00 = vis_fmul8sux16(row20, yFilter2);                        \
-  v12 = vis_fpadd16(u20, u21);                                  \
-  u01 = vis_fmul8ulx16(row20, yFilter2);                        \
-  v13 = vis_fpadd16(u30, u31);                                  \
-  u10 = vis_fmul8sux16(row21, yFilter2);                        \
-  u11 = vis_fmul8ulx16(row21, yFilter2);                        \
-  v20 = vis_fpadd16(u00, u01);                                  \
-  u20 = vis_fmul8sux16(row22, yFilter2);                        \
-  sum0 = vis_fpadd16(v00, v10);                                 \
-  u21 = vis_fmul8ulx16(row22, yFilter2);                        \
-  u30 = vis_fmul8sux16(row23, yFilter2);                        \
-  u31 = vis_fmul8ulx16(row23, yFilter2);                        \
-  u00 = vis_fmul8sux16(row30, yFilter3);                        \
-  u01 = vis_fmul8ulx16(row30, yFilter3);                        \
-  v21 = vis_fpadd16(u10, u11);                                  \
-  sum1 = vis_fpadd16(v01, v11);                                 \
-  u10 = vis_fmul8sux16(row31, yFilter3);                        \
-  sum2 = vis_fpadd16(v02, v12);                                 \
-  sum3 = vis_fpadd16(v03, v13);                                 \
-  v22 = vis_fpadd16(u20, u21);                                  \
-  u11 = vis_fmul8ulx16(row31, yFilter3);                        \
-  sum0 = vis_fpadd16(sum0, v20);                                \
-  u20 = vis_fmul8sux16(row32, yFilter3);                        \
-  u21 = vis_fmul8ulx16(row32, yFilter3);                        \
-  v23 = vis_fpadd16(u30, u31);                                  \
-  v30 = vis_fpadd16(u00, u01);                                  \
-  sum1 = vis_fpadd16(sum1, v21);                                \
-  u30 = vis_fmul8sux16(row33, yFilter3);                        \
-  u31 = vis_fmul8ulx16(row33, yFilter3);                        \
-  v31 = vis_fpadd16(u10, u11);                                  \
-  sum2 = vis_fpadd16(sum2, v22);                                \
-  sum3 = vis_fpadd16(sum3, v23);                                \
-  v32 = vis_fpadd16(u20, u21);                                  \
-  sum0 = vis_fpadd16(sum0, v30);                                \
-  v33 = vis_fpadd16(u30, u31);                                  \
-  v00 = vis_fmul8sux16(sum0, xFilter0);                         \
-  sum1 = vis_fpadd16(sum1, v31);                                \
-  sum2 = vis_fpadd16(sum2, v32);                                \
-  v01 = vis_fmul8ulx16(sum0, xFilter0);                         \
-  v10 = vis_fmul8sux16(sum1, xFilter1);                         \
-  sum3 = vis_fpadd16(sum3, v33);                                \
-  v11 = vis_fmul8ulx16(sum1, xFilter1);                         \
-  d0 = vis_fpadd16(v00, v01);                                   \
-  v20 = vis_fmul8sux16(sum2, xFilter2);                         \
-  v21 = vis_fmul8ulx16(sum2, xFilter2);                         \
-  d1 = vis_fpadd16(v10, v11);                                   \
-  v30 = vis_fmul8sux16(sum3, xFilter3);                         \
-  v31 = vis_fmul8ulx16(sum3, xFilter3);                         \
-  d2 = vis_fpadd16(v20, v21);                                   \
-  d3 = vis_fpadd16(v30, v31);                                   \
-  d0 = vis_fpadd16(d0, d1);                                     \
-  d2 = vis_fpadd16(d2, d3);                                     \
-  d0 = vis_fpadd16(d0, d2);                                     \
-  d2 = vis_fmuld8sux16(f_x01000100, vis_read_hi(d0));           \
-  d3 = vis_fmuld8sux16(f_x01000100, vis_read_lo(d0));           \
-  res = vis_fpackfix_pair(d2, d3)
-
-/***************************************************************/
-#define BC_S16_4CH(mlib_filters_s16_4)                                  \
-  u00 = vis_fmul8sux16(row00, yFilter0);                                \
-  u01 = vis_fmul8ulx16(row00, yFilter0);                                \
-  u10 = vis_fmul8sux16(row01, yFilter0);                                \
-  u11 = vis_fmul8ulx16(row01, yFilter0);                                \
-  v00 = vis_fpadd16(u00, u01);                                          \
-  u20 = vis_fmul8sux16(row02, yFilter0);                                \
-  v01 = vis_fpadd16(u10, u11);                                          \
-  u21 = vis_fmul8ulx16(row02, yFilter0);                                \
-  u30 = vis_fmul8sux16(row03, yFilter0);                                \
-  u31 = vis_fmul8ulx16(row03, yFilter0);                                \
-  v02 = vis_fpadd16(u20, u21);                                          \
-  row00 = flut[srcIndexPtr[0]];                                         \
-  u00 = vis_fmul8sux16(row10, yFilter1);                                \
-  u01 = vis_fmul8ulx16(row10, yFilter1);                                \
-  filterposy = (Y >> FILTER_SHIFT);                                     \
-  v03 = vis_fpadd16(u30, u31);                                          \
-  row01 = flut[srcIndexPtr[1]];                                         \
-  u10 = vis_fmul8sux16(row11, yFilter1);                                \
-  u11 = vis_fmul8ulx16(row11, yFilter1);                                \
-  v10 = vis_fpadd16(u00, u01);                                          \
-  row02 = flut[srcIndexPtr[2]];                                         \
-  u20 = vis_fmul8sux16(row12, yFilter1);                                \
-  v11 = vis_fpadd16(u10, u11);                                          \
-  u21 = vis_fmul8ulx16(row12, yFilter1);                                \
-  u30 = vis_fmul8sux16(row13, yFilter1);                                \
-  row03 = flut[srcIndexPtr[3]];                                         \
-  u31 = vis_fmul8ulx16(row13, yFilter1);                                \
-  u00 = vis_fmul8sux16(row20, yFilter2);                                \
-  filterposx = (X >> FILTER_SHIFT);                                     \
-  srcIndexPtr += srcYStride;                                            \
-  v12 = vis_fpadd16(u20, u21);                                          \
-  u01 = vis_fmul8ulx16(row20, yFilter2);                                \
-  v13 = vis_fpadd16(u30, u31);                                          \
-  row10 = flut[srcIndexPtr[0]];                                         \
-  u10 = vis_fmul8sux16(row21, yFilter2);                                \
-  X += dX;                                                              \
-  u11 = vis_fmul8ulx16(row21, yFilter2);                                \
-  v20 = vis_fpadd16(u00, u01);                                          \
-  row11 = flut[srcIndexPtr[1]];                                         \
-  u20 = vis_fmul8sux16(row22, yFilter2);                                \
-  sum0 = vis_fpadd16(v00, v10);                                         \
-  u21 = vis_fmul8ulx16(row22, yFilter2);                                \
-  row12 = flut[srcIndexPtr[2]];                                         \
-  u30 = vis_fmul8sux16(row23, yFilter2);                                \
-  u31 = vis_fmul8ulx16(row23, yFilter2);                                \
-  row13 = flut[srcIndexPtr[3]];                                         \
-  u00 = vis_fmul8sux16(row30, yFilter3);                                \
-  srcIndexPtr += srcYStride;                                            \
-  u01 = vis_fmul8ulx16(row30, yFilter3);                                \
-  v21 = vis_fpadd16(u10, u11);                                          \
-  Y += dY;                                                              \
-  xSrc = (X >> MLIB_SHIFT)-1;                                           \
-  sum1 = vis_fpadd16(v01, v11);                                         \
-  row20 = flut[srcIndexPtr[0]];                                         \
-  u10 = vis_fmul8sux16(row31, yFilter3);                                \
-  sum2 = vis_fpadd16(v02, v12);                                         \
-  sum3 = vis_fpadd16(v03, v13);                                         \
-  ySrc = (Y >> MLIB_SHIFT)-1;                                           \
-  row21 = flut[srcIndexPtr[1]];                                         \
-  v22 = vis_fpadd16(u20, u21);                                          \
-  u11 = vis_fmul8ulx16(row31, yFilter3);                                \
-  sum0 = vis_fpadd16(sum0, v20);                                        \
-  u20 = vis_fmul8sux16(row32, yFilter3);                                \
-  row22 = flut[srcIndexPtr[2]];                                         \
-  u21 = vis_fmul8ulx16(row32, yFilter3);                                \
-  v23 = vis_fpadd16(u30, u31);                                          \
-  v30 = vis_fpadd16(u00, u01);                                          \
-  filterposy &= FILTER_MASK;                                            \
-  sum1 = vis_fpadd16(sum1, v21);                                        \
-  u30 = vis_fmul8sux16(row33, yFilter3);                                \
-  row23 = flut[srcIndexPtr[3]];                                         \
-  u31 = vis_fmul8ulx16(row33, yFilter3);                                \
-  srcIndexPtr += srcYStride;                                            \
-  filterposx &= FILTER_MASK;                                            \
-  v31 = vis_fpadd16(u10, u11);                                          \
-  row30 = flut[srcIndexPtr[0]];                                         \
-  sum2 = vis_fpadd16(sum2, v22);                                        \
-  sum3 = vis_fpadd16(sum3, v23);                                        \
-  row31 = flut[srcIndexPtr[1]];                                         \
-  v32 = vis_fpadd16(u20, u21);                                          \
-  sum0 = vis_fpadd16(sum0, v30);                                        \
-  row32 = flut[srcIndexPtr[2]];                                         \
-  v33 = vis_fpadd16(u30, u31);                                          \
-  row33 = flut[srcIndexPtr[3]];                                         \
-  v00 = vis_fmul8sux16(sum0, xFilter0);                                 \
-  yPtr = ((mlib_d64 *) ((mlib_u8 *)mlib_filters_s16_4 + filterposy*4)); \
-  sum1 = vis_fpadd16(sum1, v31);                                        \
-  yFilter0 = yPtr[0];                                                   \
-  sum2 = vis_fpadd16(sum2, v32);                                        \
-  v01 = vis_fmul8ulx16(sum0, xFilter0);                                 \
-  yFilter1 = yPtr[1];                                                   \
-  v10 = vis_fmul8sux16(sum1, xFilter1);                                 \
-  sum3 = vis_fpadd16(sum3, v33);                                        \
-  yFilter2 = yPtr[2];                                                   \
-  v11 = vis_fmul8ulx16(sum1, xFilter1);                                 \
-  d0 = vis_fpadd16(v00, v01);                                           \
-  yFilter3 = yPtr[3];                                                   \
-  xPtr = ((mlib_d64 *)((mlib_u8 *)mlib_filters_s16_4 + filterposx*4));  \
-  v20 = vis_fmul8sux16(sum2, xFilter2);                                 \
-  xFilter0 = xPtr[0];                                                   \
-  v21 = vis_fmul8ulx16(sum2, xFilter2);                                 \
-  d1 = vis_fpadd16(v10, v11);                                           \
-  xFilter1 = xPtr[1];                                                   \
-  v30 = vis_fmul8sux16(sum3, xFilter3);                                 \
-  v31 = vis_fmul8ulx16(sum3, xFilter3);                                 \
-  d2 = vis_fpadd16(v20, v21);                                           \
-  xFilter2 = xPtr[2];                                                   \
-  d3 = vis_fpadd16(v30, v31);                                           \
-  xFilter3 = xPtr[3];                                                   \
-  srcIndexPtr = (MLIB_TYPE *)lineAddr[ySrc] + xSrc
-
-/***************************************************************/
-#define FADD_4BC_S16()                                          \
-  d0 = vis_fpadd16(d0, d1);                                     \
-  d2 = vis_fpadd16(d2, d3);                                     \
-  d0 = vis_fpadd16(d0, d2);                                     \
-  d2 = vis_fmuld8sux16(f_x01000100, vis_read_hi(d0));           \
-  d3 = vis_fmuld8sux16(f_x01000100, vis_read_lo(d0));           \
-  res = vis_fpackfix_pair(d2, d3)
-
-/***************************************************************/
-#undef  MLIB_TYPE
-#define MLIB_TYPE mlib_u8
-
-/***************************************************************/
-#undef  FILTER_SHIFT
-#define FILTER_SHIFT  5
-#undef  FILTER_MASK
-#define FILTER_MASK   (((1 << 8) - 1) << 3)
-
-/***************************************************************/
-mlib_status mlib_ImageAffineIndex_U8_U8_3CH_BC(mlib_affine_param *param,
-                                               const void        *colormap)
-{
-  DECLAREVAR();
-  DECLAREVAR_U8();
-  mlib_f32  *flut   = (mlib_f32 *)mlib_ImageGetLutNormalTable(colormap) -
-  mlib_ImageGetLutOffset(colormap);
-  mlib_d64  dstRowData[MLIB_LIMIT/2];
-  mlib_d64  *dstRowPtr = dstRowData;
-  const mlib_s16 *mlib_filters_table_u8, *mlib_filters_table_u8_4;
-
-  if (filter == MLIB_BICUBIC) {
-    mlib_filters_table_u8   = mlib_filters_u8_bc;
-    mlib_filters_table_u8_4 = mlib_filters_u8_bc_4;
-  } else {
-    mlib_filters_table_u8   = mlib_filters_u8_bc2;
-    mlib_filters_table_u8_4 = mlib_filters_u8_bc2_4;
-  }
-
-  if (max_xsize > MLIB_LIMIT) {
-    dstRowPtr = mlib_malloc(sizeof(mlib_d64) * ((max_xsize + 1) >> 1));
-
-    if (dstRowPtr == NULL) return MLIB_FAILURE;
-  }
-
-  vis_write_gsr(3 << 3);
-
-  for (j = yStart; j <= yFinish; j++) {
-
-    CLIP();
-
-    cols = xRight - xLeft + 1;
-
-    i = 0;
-
-    if (i <= cols - 6) {
-
-      NEXT_PIXEL_4BC();
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-
-      NEXT_PIXEL_4BC();
-
-      BC_U8_4CH(0, mlib_filters_table_u8, mlib_filters_table_u8_4);
-      BC_U8_4CH(1, mlib_filters_table_u8, mlib_filters_table_u8_4);
-      FADD_4BC_U8();
-
-      BC_U8_4CH(0, mlib_filters_table_u8, mlib_filters_table_u8_4);
-      BC_U8_4CH(1, mlib_filters_table_u8, mlib_filters_table_u8_4);
-
-#pragma pipeloop(0)
-      for (; i <= cols-8; i += 2) {
-        *dstPixelPtr++ = res;
-
-        FADD_4BC_U8();
-        BC_U8_4CH(0, mlib_filters_table_u8, mlib_filters_table_u8_4);
-        BC_U8_4CH(1, mlib_filters_table_u8, mlib_filters_table_u8_4);
-      }
-
-      *dstPixelPtr++ = res;
-
-      FADD_4BC_U8();
-      *dstPixelPtr++ = res;
-
-      RESULT_4BC_U8_1PIXEL(0);
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-      RESULT_4BC_U8_1PIXEL(1);
-      FADD_4BC_U8();
-
-      *dstPixelPtr++ = res;
-      i += 6;
-    }
-
-    if (i <= cols-4) {
-      NEXT_PIXEL_4BC();
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-
-      NEXT_PIXEL_4BC();
-
-      BC_U8_4CH(0, mlib_filters_table_u8, mlib_filters_table_u8_4);
-      BC_U8_4CH(1, mlib_filters_table_u8, mlib_filters_table_u8_4);
-      FADD_4BC_U8();
-      *dstPixelPtr++ = res;
-
-      RESULT_4BC_U8_1PIXEL(0);
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-      RESULT_4BC_U8_1PIXEL(1);
-      FADD_4BC_U8();
-
-      *dstPixelPtr++ = res;
-      i += 4;
-    }
-
-    if (i <= cols-2) {
-      NEXT_PIXEL_4BC();
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-      RESULT_4BC_U8_1PIXEL(0);
-
-      NEXT_PIXEL_4BC();
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-      RESULT_4BC_U8_1PIXEL(1);
-      FADD_4BC_U8();
-
-      *dstPixelPtr++ = res;
-      i += 2;
-    }
-
-    if (i < cols) {
-      NEXT_PIXEL_4BC();
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-      RESULT_4BC_U8_1PIXEL(0);
-
-      d0 = vis_fpadd16(d00, d10);
-      d1 = vis_fpadd16(d20, d30);
-      d0 = vis_fpadd16(d0, d1);
-      res = vis_fpack16_pair(d0, d0);
-      *dstPixelPtr++ = res;
-    }
-
-    mlib_ImageColorTrue2IndexLine_U8_U8_3_in_4((mlib_u8 *)dstRowPtr,
-                                               dstIndexPtr,
-                                               xRight - xLeft + 1,
-                                               colormap);
-  }
-
-  if (dstRowPtr != dstRowData) mlib_free(dstRowPtr);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  FILTER_SHIFT
-#define FILTER_SHIFT  4
-#undef  FILTER_MASK
-#define FILTER_MASK   (((1 << 9) - 1) << 3)
-
-/***************************************************************/
-mlib_status mlib_ImageAffineIndex_U8_S16_3CH_BC(mlib_affine_param *param,
-                                                const void        *colormap)
-{
-  DECLAREVAR();
-  DECLAREVAR_S16();
-  mlib_d64 *flut   = (mlib_d64 *)mlib_ImageGetLutNormalTable(colormap) -
-  mlib_ImageGetLutOffset(colormap);
-  mlib_d64 dstRowData[MLIB_LIMIT];
-  mlib_d64 *dstRowPtr = dstRowData;
-  const mlib_s16 *mlib_filters_table_s16_4;
-
-  if (filter == MLIB_BICUBIC) {
-    mlib_filters_table_s16_4 = mlib_filters_s16_bc_4;
-  } else {
-    mlib_filters_table_s16_4 = mlib_filters_s16_bc2_4;
-  }
-
-  if (max_xsize > MLIB_LIMIT) {
-    dstRowPtr = mlib_malloc(sizeof(mlib_d64) * max_xsize);
-
-    if (dstRowPtr == NULL) return MLIB_FAILURE;
-  }
-
-  for (j = yStart; j <= yFinish; j++) {
-
-    CLIP();
-
-    vis_write_gsr(10 << 3);
-
-    cols = xRight - xLeft + 1;
-    i = 0;
-
-    if (i <= cols - 4) {
-
-      NEXT_PIXEL_4BC();
-      LOAD_BC_S16_4CH_1PIXEL(mlib_filters_table_s16_4);
-
-      NEXT_PIXEL_4BC();
-
-      BC_S16_4CH(mlib_filters_table_s16_4);
-      FADD_4BC_S16();
-
-      BC_S16_4CH(mlib_filters_table_s16_4);
-
-#pragma pipeloop(0)
-
-      for (; i < cols-4; i++) {
-        *dstPixelPtr++ = res;
-
-        FADD_4BC_S16();
-        BC_S16_4CH(mlib_filters_table_s16_4);
-      }
-
-      *dstPixelPtr++ = res;
-
-      FADD_4BC_S16();
-      *dstPixelPtr++ = res;
-
-      RESULT_4BC_S16_1PIXEL();
-      *dstPixelPtr++ = res;
-
-      LOAD_BC_S16_4CH_1PIXEL(mlib_filters_table_s16_4);
-      RESULT_4BC_S16_1PIXEL();
-      *dstPixelPtr++ = res;
-      i += 4;
-    }
-
-#pragma pipeloop(0)
-    for (; i < cols; i++) {
-      NEXT_PIXEL_4BC();
-      LOAD_BC_S16_4CH_1PIXEL(mlib_filters_table_s16_4);
-      RESULT_4BC_S16_1PIXEL();
-      *dstPixelPtr++ = res;
-    }
-
-    mlib_ImageColorTrue2IndexLine_S16_U8_3_in_4((mlib_s16 *)dstRowPtr,
-                                                dstIndexPtr,
-                                                xRight - xLeft + 1,
-                                                colormap);
-  }
-
-  if (dstRowPtr != dstRowData) mlib_free(dstRowPtr);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  FILTER_SHIFT
-#define FILTER_SHIFT  5
-#undef  FILTER_MASK
-#define FILTER_MASK   (((1 << 8) - 1) << 3)
-
-/***************************************************************/
-mlib_status mlib_ImageAffineIndex_U8_U8_4CH_BC(mlib_affine_param *param,
-                                               const void        *colormap)
-{
-  DECLAREVAR();
-  DECLAREVAR_U8();
-  mlib_f32  *flut   = (mlib_f32 *)mlib_ImageGetLutNormalTable(colormap) -
-  mlib_ImageGetLutOffset(colormap);
-  mlib_d64  dstRowData[MLIB_LIMIT/2];
-  mlib_d64  *dstRowPtr = dstRowData;
-  const mlib_s16 *mlib_filters_table_u8, *mlib_filters_table_u8_4;
-
-  if (filter == MLIB_BICUBIC) {
-    mlib_filters_table_u8   = mlib_filters_u8_bc;
-    mlib_filters_table_u8_4 = mlib_filters_u8_bc_4;
-  } else {
-    mlib_filters_table_u8   = mlib_filters_u8_bc2;
-    mlib_filters_table_u8_4 = mlib_filters_u8_bc2_4;
-  }
-
-  if (max_xsize > MLIB_LIMIT) {
-    dstRowPtr = mlib_malloc(sizeof(mlib_d64) * ((max_xsize + 1) >> 1));
-
-    if (dstRowPtr == NULL) return MLIB_FAILURE;
-  }
-
-  vis_write_gsr(3 << 3);
-
-  for (j = yStart; j <= yFinish; j++) {
-
-    CLIP();
-
-    cols = xRight - xLeft + 1;
-
-    i = 0;
-
-    if (i <= cols - 6) {
-
-      NEXT_PIXEL_4BC();
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-
-      NEXT_PIXEL_4BC();
-
-      BC_U8_4CH(0, mlib_filters_table_u8, mlib_filters_table_u8_4);
-      BC_U8_4CH(1, mlib_filters_table_u8, mlib_filters_table_u8_4);
-      FADD_4BC_U8();
-
-      BC_U8_4CH(0, mlib_filters_table_u8, mlib_filters_table_u8_4);
-      BC_U8_4CH(1, mlib_filters_table_u8, mlib_filters_table_u8_4);
-
-#pragma pipeloop(0)
-      for (; i <= cols-8; i += 2) {
-        *dstPixelPtr++ = res;
-
-        FADD_4BC_U8();
-        BC_U8_4CH(0, mlib_filters_table_u8, mlib_filters_table_u8_4);
-        BC_U8_4CH(1, mlib_filters_table_u8, mlib_filters_table_u8_4);
-      }
-
-      *dstPixelPtr++ = res;
-
-      FADD_4BC_U8();
-      *dstPixelPtr++ = res;
-
-      RESULT_4BC_U8_1PIXEL(0);
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-      RESULT_4BC_U8_1PIXEL(1);
-      FADD_4BC_U8();
-
-      *dstPixelPtr++ = res;
-      i += 6;
-    }
-
-    if (i <= cols-4) {
-      NEXT_PIXEL_4BC();
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-
-      NEXT_PIXEL_4BC();
-
-      BC_U8_4CH(0, mlib_filters_table_u8, mlib_filters_table_u8_4);
-      BC_U8_4CH(1, mlib_filters_table_u8, mlib_filters_table_u8_4);
-      FADD_4BC_U8();
-      *dstPixelPtr++ = res;
-
-      RESULT_4BC_U8_1PIXEL(0);
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-      RESULT_4BC_U8_1PIXEL(1);
-      FADD_4BC_U8();
-
-      *dstPixelPtr++ = res;
-      i += 4;
-    }
-
-    if (i <= cols-2) {
-      NEXT_PIXEL_4BC();
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-      RESULT_4BC_U8_1PIXEL(0);
-
-      NEXT_PIXEL_4BC();
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-      RESULT_4BC_U8_1PIXEL(1);
-      FADD_4BC_U8();
-
-      *dstPixelPtr++ = res;
-      i += 2;
-    }
-
-    if (i < cols) {
-      NEXT_PIXEL_4BC();
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-      RESULT_4BC_U8_1PIXEL(0);
-
-      d0 = vis_fpadd16(d00, d10);
-      d1 = vis_fpadd16(d20, d30);
-      d0 = vis_fpadd16(d0, d1);
-      res = vis_fpack16_pair(d0, d0);
-      *dstPixelPtr++ = res;
-    }
-
-    mlib_ImageColorTrue2IndexLine_U8_U8_4((mlib_u8 *)dstRowPtr,
-                                          dstIndexPtr,
-                                          xRight - xLeft + 1,
-                                          colormap);
-  }
-
-  if (dstRowPtr != dstRowData) mlib_free(dstRowPtr);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  FILTER_SHIFT
-#define FILTER_SHIFT  4
-#undef  FILTER_MASK
-#define FILTER_MASK   (((1 << 9) - 1) << 3)
-
-/***************************************************************/
-mlib_status mlib_ImageAffineIndex_U8_S16_4CH_BC(mlib_affine_param *param,
-                                                const void        *colormap)
-{
-  DECLAREVAR();
-  DECLAREVAR_S16();
-  mlib_d64 *flut   = (mlib_d64 *)mlib_ImageGetLutNormalTable(colormap) -
-  mlib_ImageGetLutOffset(colormap);
-  mlib_d64 dstRowData[MLIB_LIMIT];
-  mlib_d64 *dstRowPtr = dstRowData;
-  const mlib_s16 *mlib_filters_table_s16_4;
-
-  if (filter == MLIB_BICUBIC) {
-    mlib_filters_table_s16_4 = mlib_filters_s16_bc_4;
-  } else {
-    mlib_filters_table_s16_4 = mlib_filters_s16_bc2_4;
-  }
-
-  if (max_xsize > MLIB_LIMIT) {
-    dstRowPtr = mlib_malloc(sizeof(mlib_d64) * max_xsize);
-
-    if (dstRowPtr == NULL) return MLIB_FAILURE;
-  }
-
-  for (j = yStart; j <= yFinish; j++) {
-
-    CLIP();
-
-    vis_write_gsr(10 << 3);
-
-    cols = xRight - xLeft + 1;
-    i = 0;
-
-    if (i <= cols - 4) {
-
-      NEXT_PIXEL_4BC();
-      LOAD_BC_S16_4CH_1PIXEL(mlib_filters_table_s16_4);
-
-      NEXT_PIXEL_4BC();
-
-      BC_S16_4CH(mlib_filters_table_s16_4);
-      FADD_4BC_S16();
-
-      BC_S16_4CH(mlib_filters_table_s16_4);
-
-#pragma pipeloop(0)
-
-      for (; i < cols-4; i++) {
-        *dstPixelPtr++ = res;
-
-        FADD_4BC_S16();
-        BC_S16_4CH(mlib_filters_table_s16_4);
-      }
-
-      *dstPixelPtr++ = res;
-
-      FADD_4BC_S16();
-      *dstPixelPtr++ = res;
-
-      RESULT_4BC_S16_1PIXEL();
-      *dstPixelPtr++ = res;
-
-      LOAD_BC_S16_4CH_1PIXEL(mlib_filters_table_s16_4);
-      RESULT_4BC_S16_1PIXEL();
-      *dstPixelPtr++ = res;
-      i += 4;
-    }
-
-#pragma pipeloop(0)
-    for (; i < cols; i++) {
-      NEXT_PIXEL_4BC();
-      LOAD_BC_S16_4CH_1PIXEL(mlib_filters_table_s16_4);
-      RESULT_4BC_S16_1PIXEL();
-      *dstPixelPtr++ = res;
-    }
-
-    mlib_ImageColorTrue2IndexLine_S16_U8_4((mlib_s16 *)dstRowPtr,
-                                           dstIndexPtr,
-                                           xRight - xLeft + 1,
-                                           colormap);
-  }
-
-  if (dstRowPtr != dstRowData) mlib_free(dstRowPtr);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  MLIB_TYPE
-#define MLIB_TYPE mlib_s16
-
-/***************************************************************/
-#undef  FILTER_SHIFT
-#define FILTER_SHIFT  5
-#undef  FILTER_MASK
-#define FILTER_MASK   (((1 << 8) - 1) << 3)
-
-/***************************************************************/
-mlib_status mlib_ImageAffineIndex_S16_U8_3CH_BC(mlib_affine_param *param,
-                                                const void        *colormap)
-{
-  DECLAREVAR();
-  DECLAREVAR_U8();
-  mlib_f32  *flut   = (mlib_f32 *)mlib_ImageGetLutNormalTable(colormap) -
-  mlib_ImageGetLutOffset(colormap);
-  mlib_d64  dstRowData[MLIB_LIMIT/2];
-  mlib_d64  *dstRowPtr = dstRowData;
-  const mlib_s16 *mlib_filters_table_u8, *mlib_filters_table_u8_4;
-
-  if (filter == MLIB_BICUBIC) {
-    mlib_filters_table_u8   = mlib_filters_u8_bc;
-    mlib_filters_table_u8_4 = mlib_filters_u8_bc_4;
-  } else {
-    mlib_filters_table_u8   = mlib_filters_u8_bc2;
-    mlib_filters_table_u8_4 = mlib_filters_u8_bc2_4;
-  }
-
-  srcYStride >>= 1;
-
-  if (max_xsize > MLIB_LIMIT) {
-    dstRowPtr = mlib_malloc(sizeof(mlib_d64) * ((max_xsize + 1) >> 1));
-
-    if (dstRowPtr == NULL) return MLIB_FAILURE;
-  }
-
-  vis_write_gsr(3 << 3);
-
-  for (j = yStart; j <= yFinish; j++) {
-
-    CLIP();
-
-    cols = xRight - xLeft + 1;
-
-    i = 0;
-
-    if (i <= cols - 6) {
-
-      NEXT_PIXEL_4BC();
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-
-      NEXT_PIXEL_4BC();
-
-      BC_U8_4CH(0, mlib_filters_table_u8, mlib_filters_table_u8_4);
-      BC_U8_4CH(1, mlib_filters_table_u8, mlib_filters_table_u8_4);
-      FADD_4BC_U8();
-
-      BC_U8_4CH(0, mlib_filters_table_u8, mlib_filters_table_u8_4);
-      BC_U8_4CH(1, mlib_filters_table_u8, mlib_filters_table_u8_4);
-
-#pragma pipeloop(0)
-      for (; i <= cols-8; i += 2) {
-        *dstPixelPtr++ = res;
-
-        FADD_4BC_U8();
-        BC_U8_4CH(0, mlib_filters_table_u8, mlib_filters_table_u8_4);
-        BC_U8_4CH(1, mlib_filters_table_u8, mlib_filters_table_u8_4);
-      }
-
-      *dstPixelPtr++ = res;
-
-      FADD_4BC_U8();
-      *dstPixelPtr++ = res;
-
-      RESULT_4BC_U8_1PIXEL(0);
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-      RESULT_4BC_U8_1PIXEL(1);
-      FADD_4BC_U8();
-
-      *dstPixelPtr++ = res;
-      i += 6;
-    }
-
-    if (i <= cols-4) {
-      NEXT_PIXEL_4BC();
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-
-      NEXT_PIXEL_4BC();
-
-      BC_U8_4CH(0, mlib_filters_table_u8, mlib_filters_table_u8_4);
-      BC_U8_4CH(1, mlib_filters_table_u8, mlib_filters_table_u8_4);
-      FADD_4BC_U8();
-      *dstPixelPtr++ = res;
-
-      RESULT_4BC_U8_1PIXEL(0);
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-      RESULT_4BC_U8_1PIXEL(1);
-      FADD_4BC_U8();
-
-      *dstPixelPtr++ = res;
-      i += 4;
-    }
-
-    if (i <= cols-2) {
-      NEXT_PIXEL_4BC();
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-      RESULT_4BC_U8_1PIXEL(0);
-
-      NEXT_PIXEL_4BC();
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-      RESULT_4BC_U8_1PIXEL(1);
-      FADD_4BC_U8();
-
-      *dstPixelPtr++ = res;
-      i += 2;
-    }
-
-    if (i < cols) {
-      NEXT_PIXEL_4BC();
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-      RESULT_4BC_U8_1PIXEL(0);
-
-      d0 = vis_fpadd16(d00, d10);
-      d1 = vis_fpadd16(d20, d30);
-      d0 = vis_fpadd16(d0, d1);
-      res = vis_fpack16_pair(d0, d0);
-      *dstPixelPtr++ = res;
-    }
-
-    mlib_ImageColorTrue2IndexLine_U8_S16_3_in_4((mlib_u8 *)dstRowPtr,
-                                                dstIndexPtr,
-                                                xRight - xLeft + 1,
-                                                colormap);
-  }
-
-  if (dstRowPtr != dstRowData) mlib_free(dstRowPtr);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  FILTER_SHIFT
-#define FILTER_SHIFT  4
-#undef  FILTER_MASK
-#define FILTER_MASK   (((1 << 9) - 1) << 3)
-
-/***************************************************************/
-mlib_status mlib_ImageAffineIndex_S16_S16_3CH_BC(mlib_affine_param *param,
-                                                 const void        *colormap)
-{
-  DECLAREVAR();
-  DECLAREVAR_S16();
-  mlib_d64 *flut   = (mlib_d64 *)mlib_ImageGetLutNormalTable(colormap) -
-  mlib_ImageGetLutOffset(colormap);
-  mlib_d64 dstRowData[MLIB_LIMIT];
-  mlib_d64 *dstRowPtr = dstRowData;
-  const mlib_s16 *mlib_filters_table_s16_4;
-
-  if (filter == MLIB_BICUBIC) {
-    mlib_filters_table_s16_4 = mlib_filters_s16_bc_4;
-  } else {
-    mlib_filters_table_s16_4 = mlib_filters_s16_bc2_4;
-  }
-
-  srcYStride >>= 1;
-
-  if (max_xsize > MLIB_LIMIT) {
-    dstRowPtr = mlib_malloc(sizeof(mlib_d64) * max_xsize);
-
-    if (dstRowPtr == NULL) return MLIB_FAILURE;
-  }
-
-  for (j = yStart; j <= yFinish; j++) {
-
-    CLIP();
-
-    vis_write_gsr(10 << 3);
-
-    cols = xRight - xLeft + 1;
-    i = 0;
-
-    if (i <= cols - 4) {
-
-      NEXT_PIXEL_4BC();
-      LOAD_BC_S16_4CH_1PIXEL(mlib_filters_table_s16_4);
-
-      NEXT_PIXEL_4BC();
-
-      BC_S16_4CH(mlib_filters_table_s16_4);
-      FADD_4BC_S16();
-
-      BC_S16_4CH(mlib_filters_table_s16_4);
-
-#pragma pipeloop(0)
-
-      for (; i < cols-4; i++) {
-        *dstPixelPtr++ = res;
-
-        FADD_4BC_S16();
-        BC_S16_4CH(mlib_filters_table_s16_4);
-      }
-
-      *dstPixelPtr++ = res;
-
-      FADD_4BC_S16();
-      *dstPixelPtr++ = res;
-
-      RESULT_4BC_S16_1PIXEL();
-      *dstPixelPtr++ = res;
-
-      LOAD_BC_S16_4CH_1PIXEL(mlib_filters_table_s16_4);
-      RESULT_4BC_S16_1PIXEL();
-      *dstPixelPtr++ = res;
-      i += 4;
-    }
-
-#pragma pipeloop(0)
-    for (; i < cols; i++) {
-      NEXT_PIXEL_4BC();
-      LOAD_BC_S16_4CH_1PIXEL(mlib_filters_table_s16_4);
-      RESULT_4BC_S16_1PIXEL();
-      *dstPixelPtr++ = res;
-    }
-
-    mlib_ImageColorTrue2IndexLine_S16_S16_3_in_4((mlib_s16 *)dstRowPtr,
-                                                 dstIndexPtr,
-                                                 xRight - xLeft + 1,
-                                                 colormap);
-  }
-
-  if (dstRowPtr != dstRowData) mlib_free(dstRowPtr);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  FILTER_SHIFT
-#define FILTER_SHIFT  5
-#undef  FILTER_MASK
-#define FILTER_MASK   (((1 << 8) - 1) << 3)
-
-/***************************************************************/
-mlib_status mlib_ImageAffineIndex_S16_U8_4CH_BC(mlib_affine_param *param,
-                                                const void        *colormap)
-{
-  DECLAREVAR();
-  DECLAREVAR_U8();
-  mlib_f32  *flut   = (mlib_f32 *)mlib_ImageGetLutNormalTable(colormap) -
-  mlib_ImageGetLutOffset(colormap);
-  mlib_d64  dstRowData[MLIB_LIMIT/2];
-  mlib_d64  *dstRowPtr = dstRowData;
-  const mlib_s16 *mlib_filters_table_u8, *mlib_filters_table_u8_4;
-
-  if (filter == MLIB_BICUBIC) {
-    mlib_filters_table_u8   = mlib_filters_u8_bc;
-    mlib_filters_table_u8_4 = mlib_filters_u8_bc_4;
-  } else {
-    mlib_filters_table_u8   = mlib_filters_u8_bc2;
-    mlib_filters_table_u8_4 = mlib_filters_u8_bc2_4;
-  }
-
-  srcYStride >>= 1;
-
-  if (max_xsize > MLIB_LIMIT) {
-    dstRowPtr = mlib_malloc(sizeof(mlib_d64) * ((max_xsize + 1) >> 1));
-
-    if (dstRowPtr == NULL) return MLIB_FAILURE;
-  }
-
-  vis_write_gsr(3 << 3);
-
-  for (j = yStart; j <= yFinish; j++) {
-
-    CLIP();
-
-    cols = xRight - xLeft + 1;
-
-    i = 0;
-
-    if (i <= cols - 6) {
-
-      NEXT_PIXEL_4BC();
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-
-      NEXT_PIXEL_4BC();
-
-      BC_U8_4CH(0, mlib_filters_table_u8, mlib_filters_table_u8_4);
-      BC_U8_4CH(1, mlib_filters_table_u8, mlib_filters_table_u8_4);
-      FADD_4BC_U8();
-
-      BC_U8_4CH(0, mlib_filters_table_u8, mlib_filters_table_u8_4);
-      BC_U8_4CH(1, mlib_filters_table_u8, mlib_filters_table_u8_4);
-
-#pragma pipeloop(0)
-      for (; i <= cols-8; i += 2) {
-        *dstPixelPtr++ = res;
-
-        FADD_4BC_U8();
-        BC_U8_4CH(0, mlib_filters_table_u8, mlib_filters_table_u8_4);
-        BC_U8_4CH(1, mlib_filters_table_u8, mlib_filters_table_u8_4);
-      }
-
-      *dstPixelPtr++ = res;
-
-      FADD_4BC_U8();
-      *dstPixelPtr++ = res;
-
-      RESULT_4BC_U8_1PIXEL(0);
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-      RESULT_4BC_U8_1PIXEL(1);
-      FADD_4BC_U8();
-
-      *dstPixelPtr++ = res;
-      i += 6;
-    }
-
-    if (i <= cols-4) {
-      NEXT_PIXEL_4BC();
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-
-      NEXT_PIXEL_4BC();
-
-      BC_U8_4CH(0, mlib_filters_table_u8, mlib_filters_table_u8_4);
-      BC_U8_4CH(1, mlib_filters_table_u8, mlib_filters_table_u8_4);
-      FADD_4BC_U8();
-      *dstPixelPtr++ = res;
-
-      RESULT_4BC_U8_1PIXEL(0);
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-      RESULT_4BC_U8_1PIXEL(1);
-      FADD_4BC_U8();
-
-      *dstPixelPtr++ = res;
-      i += 4;
-    }
-
-    if (i <= cols-2) {
-      NEXT_PIXEL_4BC();
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-      RESULT_4BC_U8_1PIXEL(0);
-
-      NEXT_PIXEL_4BC();
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-      RESULT_4BC_U8_1PIXEL(1);
-      FADD_4BC_U8();
-
-      *dstPixelPtr++ = res;
-      i += 2;
-    }
-
-    if (i < cols) {
-      NEXT_PIXEL_4BC();
-      LOAD_BC_U8_4CH_1PIXEL(mlib_filters_table_u8, mlib_filters_table_u8_4);
-      RESULT_4BC_U8_1PIXEL(0);
-
-      d0 = vis_fpadd16(d00, d10);
-      d1 = vis_fpadd16(d20, d30);
-      d0 = vis_fpadd16(d0, d1);
-      res = vis_fpack16_pair(d0, d0);
-      *dstPixelPtr++ = res;
-    }
-
-    mlib_ImageColorTrue2IndexLine_U8_S16_4((mlib_u8 *)dstRowPtr,
-                                           dstIndexPtr,
-                                           xRight - xLeft + 1,
-                                           colormap);
-  }
-
-  if (dstRowPtr != dstRowData) mlib_free(dstRowPtr);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  FILTER_SHIFT
-#define FILTER_SHIFT  4
-#undef  FILTER_MASK
-#define FILTER_MASK   (((1 << 9) - 1) << 3)
-
-/***************************************************************/
-mlib_status mlib_ImageAffineIndex_S16_S16_4CH_BC(mlib_affine_param *param,
-                                                 const void        *colormap)
-{
-  DECLAREVAR();
-  DECLAREVAR_S16();
-  mlib_d64 *flut   = (mlib_d64 *)mlib_ImageGetLutNormalTable(colormap) -
-  mlib_ImageGetLutOffset(colormap);
-  mlib_d64 dstRowData[MLIB_LIMIT];
-  mlib_d64 *dstRowPtr = dstRowData;
-  const mlib_s16 *mlib_filters_table_s16_4;
-
-  if (filter == MLIB_BICUBIC) {
-    mlib_filters_table_s16_4 = mlib_filters_s16_bc_4;
-  } else {
-    mlib_filters_table_s16_4 = mlib_filters_s16_bc2_4;
-  }
-
-  srcYStride >>= 1;
-
-  if (max_xsize > MLIB_LIMIT) {
-    dstRowPtr = mlib_malloc(sizeof(mlib_d64) * max_xsize);
-
-    if (dstRowPtr == NULL) return MLIB_FAILURE;
-  }
-
-  for (j = yStart; j <= yFinish; j++) {
-
-    CLIP();
-
-    vis_write_gsr(10 << 3);
-
-    cols = xRight - xLeft + 1;
-    i = 0;
-
-    if (i <= cols - 4) {
-
-      NEXT_PIXEL_4BC();
-      LOAD_BC_S16_4CH_1PIXEL(mlib_filters_table_s16_4);
-
-      NEXT_PIXEL_4BC();
-
-      BC_S16_4CH(mlib_filters_table_s16_4);
-      FADD_4BC_S16();
-
-      BC_S16_4CH(mlib_filters_table_s16_4);
-
-#pragma pipeloop(0)
-
-      for (; i < cols-4; i++) {
-        *dstPixelPtr++ = res;
-
-        FADD_4BC_S16();
-        BC_S16_4CH(mlib_filters_table_s16_4);
-      }
-
-      *dstPixelPtr++ = res;
-
-      FADD_4BC_S16();
-      *dstPixelPtr++ = res;
-
-      RESULT_4BC_S16_1PIXEL();
-      *dstPixelPtr++ = res;
-
-      LOAD_BC_S16_4CH_1PIXEL(mlib_filters_table_s16_4);
-      RESULT_4BC_S16_1PIXEL();
-      *dstPixelPtr++ = res;
-      i += 4;
-    }
-
-#pragma pipeloop(0)
-    for (; i < cols; i++) {
-      NEXT_PIXEL_4BC();
-      LOAD_BC_S16_4CH_1PIXEL(mlib_filters_table_s16_4);
-      RESULT_4BC_S16_1PIXEL();
-      *dstPixelPtr++ = res;
-    }
-
-    mlib_ImageColorTrue2IndexLine_S16_S16_4((mlib_s16 *)dstRowPtr,
-                                            dstIndexPtr,
-                                            xRight - xLeft + 1,
-                                            colormap);
-  }
-
-  if (dstRowPtr != dstRowData) mlib_free(dstRowPtr);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL.c
index 6d73ae05c36..f0abee6fa6c 100644
--- a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL.c
+++ b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL.c
@@ -33,7 +33,6 @@
 
 #include "vis_proto.h"
 #include "mlib_image.h"
-#include "mlib_ImageColormap.h"
 #include "mlib_ImageCopy.h"
 #include "mlib_ImageAffine.h"
 #include "mlib_v_ImageFilters.h"
@@ -719,134 +718,3 @@ mlib_status FUN_NAME(4ch_na)(mlib_affine_param *param)
 }
 
 /***************************************************************/
-#define LUT(x)  plut[x]
-
-mlib_status FUN_NAME(u8_i)(mlib_affine_param *param,
-                           const void        *colormap)
-{
-  DECLAREVAR();
-  mlib_s32 nchan   = mlib_ImageGetLutChannels(colormap);
-  mlib_s32 lut_off = mlib_ImageGetLutOffset(colormap);
-  mlib_f32 *plut = (mlib_f32*)mlib_ImageGetLutNormalTable(colormap) - lut_off;
-  mlib_s32 max_xsize = param -> max_xsize;
-  mlib_f32 buff[BUF_SIZE], *pbuff = buff;
-
-  if (max_xsize > BUF_SIZE) {
-    pbuff = mlib_malloc(max_xsize*sizeof(mlib_f32));
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  vis_write_gsr(3 << 3);
-
-  for (j = yStart; j <= yFinish; j++) {
-    mlib_f32 s0, s1, s2, s3;
-    DTYPE    *sp;
-
-    NEW_LINE(1);
-
-#pragma pipeloop(0)
-    for (i = 0; i < size; i++) {
-      GET_FILTER_XY();
-
-      sp = *(DTYPE**)((mlib_u8*)lineAddr + PTR_SHIFT(Y)) + (X >> MLIB_SHIFT);
-      s0 = LUT(sp[0]);
-      s1 = LUT(sp[1]);
-      s2 = LUT(sp[srcYStride]);
-      s3 = LUT(sp[srcYStride + 1]);
-
-      PROCESS_4CH(s0, s1, s2, s3);
-
-      pbuff[i] = vis_fpack16(dd);
-      X += dX;
-      Y += dY;
-    }
-
-    if (nchan == 3) {
-      mlib_ImageColorTrue2IndexLine_U8_U8_3_in_4((void*)pbuff, (void*)dl, size, colormap);
-    } else {
-      mlib_ImageColorTrue2IndexLine_U8_U8_4((void*)pbuff, (void*)dl, size, colormap);
-    }
-  }
-
-  if (pbuff != buff) {
-    mlib_free(pbuff);
-  }
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  DTYPE
-#define DTYPE mlib_s16
-
-mlib_status FUN_NAME(s16_i)(mlib_affine_param *param,
-                            const void        *colormap)
-{
-  DECLAREVAR();
-  mlib_s32 nchan   = mlib_ImageGetLutChannels(colormap);
-  mlib_s32 lut_off = mlib_ImageGetLutOffset(colormap);
-  mlib_f32 *plut = (mlib_f32*)mlib_ImageGetLutNormalTable(colormap) - lut_off;
-  mlib_s32 max_xsize = param -> max_xsize;
-  mlib_f32 buff[BUF_SIZE], *pbuff = buff;
-
-  srcYStride /= sizeof(DTYPE);
-
-  if (max_xsize > BUF_SIZE) {
-    pbuff = mlib_malloc(max_xsize*sizeof(mlib_f32));
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  vis_write_gsr(3 << 3);
-
-  for (j = yStart; j <= yFinish; j++) {
-    mlib_f32 s0, s1, s2, s3;
-    DTYPE    *sp;
-
-    NEW_LINE(1);
-
-#pragma pipeloop(0)
-    for (i = 0; i < size; i++) {
-      GET_FILTER_XY();
-
-      sp = *(DTYPE**)((mlib_u8*)lineAddr + PTR_SHIFT(Y)) + (X >> MLIB_SHIFT);
-      s0 = LUT(sp[0]);
-      s1 = LUT(sp[1]);
-      s2 = LUT(sp[srcYStride]);
-      s3 = LUT(sp[srcYStride + 1]);
-
-      PROCESS_4CH(s0, s1, s2, s3);
-
-      pbuff[i] = vis_fpack16(dd);
-      X += dX;
-      Y += dY;
-    }
-
-    if (nchan == 3) {
-      mlib_ImageColorTrue2IndexLine_U8_S16_3_in_4((void*)pbuff, (void*)dl, size, colormap);
-    } else {
-      mlib_ImageColorTrue2IndexLine_U8_S16_4((void*)pbuff, (void*)dl, size, colormap);
-    }
-  }
-
-  if (pbuff != buff) {
-    mlib_free(pbuff);
-  }
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-const type_affine_i_fun mlib_AffineFunArr_bl_i[] = {
-  mlib_ImageAffine_u8_u8_i_bl,
-  mlib_ImageAffine_u8_u8_i_bl,
-  mlib_ImageAffine_u8_s16_i_bl,
-  mlib_ImageAffine_u8_s16_i_bl,
-  mlib_ImageAffine_s16_u8_i_bl,
-  mlib_ImageAffine_s16_u8_i_bl,
-  mlib_ImageAffine_s16_s16_i_bl,
-  mlib_ImageAffine_s16_s16_i_bl
-};
-
-/***************************************************************/
diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_S16.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_S16.c
index 05e9c6f36a5..c51c3519c43 100644
--- a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_S16.c
+++ b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_S16.c
@@ -33,7 +33,6 @@
 
 #include "vis_proto.h"
 #include "mlib_image.h"
-#include "mlib_ImageColormap.h"
 #include "mlib_ImageCopy.h"
 #include "mlib_ImageAffine.h"
 #include "mlib_v_ImageFilters.h"
@@ -716,128 +715,3 @@ mlib_status FUN_NAME(4ch_na)(mlib_affine_param *param)
 }
 
 /***************************************************************/
-#define LUT(x)  plut[x]
-
-mlib_status FUN_NAME(s16_i)(mlib_affine_param *param,
-                            const void        *colormap)
-{
-  DECLAREVAR();
-  mlib_s32 nchan   = mlib_ImageGetLutChannels(colormap);
-  mlib_s32 lut_off = mlib_ImageGetLutOffset(colormap);
-  mlib_d64 *plut = (mlib_d64*)mlib_ImageGetLutNormalTable(colormap) - lut_off;
-  mlib_s32 max_xsize = param -> max_xsize;
-  mlib_d64 buff[BUF_SIZE], *pbuff = buff;
-
-  srcYStride /= sizeof(DTYPE);
-
-  if (max_xsize > BUF_SIZE) {
-    pbuff = mlib_malloc(max_xsize*sizeof(mlib_d64));
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  dX = (dX - (dX >> 31)) &~ 1; /* rounding towards ZERO */
-  dY = (dY - (dY >> 31)) &~ 1; /* rounding towards ZERO */
-  dx64 = vis_to_double_dup((((dX >> 1) & 0xFFFF) << 16) | ((dX >> 1) & 0xFFFF));
-  dy64 = vis_to_double_dup((((dY >> 1) & 0xFFFF) << 16) | ((dY >> 1) & 0xFFFF));
-
-  for (j = yStart; j <= yFinish; j++) {
-    DTYPE *sp;
-
-    NEW_LINE(1);
-
-    deltax = DOUBLE_4U16(X, X, X, X);
-    deltay = DOUBLE_4U16(Y, Y, Y, Y);
-
-#pragma pipeloop(0)
-    for (i = 0; i < size; i++) {
-      sp = *(DTYPE**)((mlib_u8*)lineAddr + PTR_SHIFT(Y)) + (X >> MLIB_SHIFT);
-      s0 = LUT(sp[0]);
-      s1 = LUT(sp[1]);
-      s2 = LUT(sp[srcYStride]);
-      s3 = LUT(sp[srcYStride + 1]);
-
-      BL_SUM();
-
-      pbuff[i] = dd;
-      X += dX;
-      Y += dY;
-    }
-
-    if (nchan == 3) {
-      mlib_ImageColorTrue2IndexLine_S16_S16_3_in_4((void*)pbuff, (void*)dl, size, colormap);
-    } else {
-      mlib_ImageColorTrue2IndexLine_S16_S16_4((void*)pbuff, (void*)dl, size, colormap);
-    }
-  }
-
-  if (pbuff != buff) {
-    mlib_free(pbuff);
-  }
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  DTYPE
-#define DTYPE mlib_u8
-
-mlib_status FUN_NAME(u8_i)(mlib_affine_param *param,
-                           const void        *colormap)
-{
-  DECLAREVAR();
-  mlib_s32 nchan   = mlib_ImageGetLutChannels(colormap);
-  mlib_s32 lut_off = mlib_ImageGetLutOffset(colormap);
-  mlib_d64 *plut = (mlib_d64*)mlib_ImageGetLutNormalTable(colormap) - lut_off;
-  mlib_s32 max_xsize = param -> max_xsize;
-  mlib_d64 buff[BUF_SIZE], *pbuff = buff;
-
-  if (max_xsize > BUF_SIZE) {
-    pbuff = mlib_malloc(max_xsize*sizeof(mlib_d64));
-
-    if (pbuff == NULL) return MLIB_FAILURE;
-  }
-
-  dX = (dX - (dX >> 31)) &~ 1; /* rounding towards ZERO */
-  dY = (dY - (dY >> 31)) &~ 1; /* rounding towards ZERO */
-  dx64 = vis_to_double_dup((((dX >> 1) & 0xFFFF) << 16) | ((dX >> 1) & 0xFFFF));
-  dy64 = vis_to_double_dup((((dY >> 1) & 0xFFFF) << 16) | ((dY >> 1) & 0xFFFF));
-
-  for (j = yStart; j <= yFinish; j++) {
-    DTYPE *sp;
-
-    NEW_LINE(1);
-
-    deltax = DOUBLE_4U16(X, X, X, X);
-    deltay = DOUBLE_4U16(Y, Y, Y, Y);
-
-#pragma pipeloop(0)
-    for (i = 0; i < size; i++) {
-      sp = *(DTYPE**)((mlib_u8*)lineAddr + PTR_SHIFT(Y)) + (X >> MLIB_SHIFT);
-      s0 = LUT(sp[0]);
-      s1 = LUT(sp[1]);
-      s2 = LUT(sp[srcYStride]);
-      s3 = LUT(sp[srcYStride + 1]);
-
-      BL_SUM();
-
-      pbuff[i] = dd;
-      X += dX;
-      Y += dY;
-    }
-
-    if (nchan == 3) {
-      mlib_ImageColorTrue2IndexLine_S16_U8_3_in_4((void*)pbuff, (void*)dl, size, colormap);
-    } else {
-      mlib_ImageColorTrue2IndexLine_S16_U8_4((void*)pbuff, (void*)dl, size, colormap);
-    }
-  }
-
-  if (pbuff != buff) {
-    mlib_free(pbuff);
-  }
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_U16.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_U16.c
index b9de874c46c..bc2b7e9e087 100644
--- a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_U16.c
+++ b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_U16.c
@@ -33,7 +33,6 @@
 
 #include "vis_proto.h"
 #include "mlib_image.h"
-#include "mlib_ImageColormap.h"
 #include "mlib_ImageCopy.h"
 #include "mlib_ImageAffine.h"
 #include "mlib_v_ImageFilters.h"
diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract.c
deleted file mode 100644
index 6d3d92b1f45..00000000000
--- a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract.c
+++ /dev/null
@@ -1,825 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, 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.
- */
-
-
-/*
- * FUNCTIONS
- *      mlib_ImageChannelExtract  - Copy the selected channels of the source
- *                                  image into the destination image
- *
- * SYNOPSIS
- *      mlib_status mlib_ImageChannelExtract(mlib_image *dst,
- *                                           mlib_image *src,
- *                                           mlib_s32   cmask);
- * ARGUMENT
- *    dst     Pointer to destination image.
- *    src     Pointer to source image.
- *    cmask   Source channel selection mask.
- *    The least significant bit (LSB) is corresponding to the
- *    last channel in the source image data.
- *    The bits with value 1 stand for the channels selected.
- *    If more than N channels are selected, the leftmost N
- *    channels are extracted, where N is the number of channels
- *    in the destination image.
- *
- * RESTRICTION
- *    The src and dst must have the same width, height and data type.
- *    The src and dst can have 1, 2, 3 or 4 channels.
- *    The src and dst can be either MLIB_BYTE, MLIB_SHORT,  MLIB_INT,
- *    MLIB_FLOAT or  MLIB_DOUBLE.
- *
- * DESCRIPTION
- *    Copy the selected channels of the source image into the
- *    destination image
- */
-
-#include <stdlib.h>
-#include "mlib_image.h"
-#include "mlib_ImageCheck.h"
-
-/***************************************************************/
-/* functions defined in mlib_ImageChannelExtract_1.c */
-
-void
-mlib_v_ImageChannelExtract_U8(mlib_u8  *src,   mlib_s32 slb,
-                              mlib_u8  *dst,   mlib_s32 dlb,
-                              mlib_s32 channels, mlib_s32 channeld,
-                              mlib_s32 width,   mlib_s32 height,
-                              mlib_s32 cmask);
-void
-mlib_v_ImageChannelExtract_S16(mlib_u16 *src,    mlib_s32 slb,
-                               mlib_u16 *dst,    mlib_s32 dlb,
-                               mlib_s32 channels, mlib_s32 channeld,
-                               mlib_s32 width,    mlib_s32 height,
-                               mlib_s32 cmask);
-void
-mlib_v_ImageChannelExtract_S32(mlib_s32 *src,    mlib_s32 slb,
-                               mlib_s32 *dst,    mlib_s32 dlb,
-                               mlib_s32 channels, mlib_s32 channeld,
-                               mlib_s32 width,    mlib_s32 height,
-                               mlib_s32 cmask);
-void
-mlib_v_ImageChannelExtract_D64(mlib_d64 *src,    mlib_s32 slb,
-                               mlib_d64 *dst,    mlib_s32 dlb,
-                               mlib_s32 channels, mlib_s32 channeld,
-                               mlib_s32 width,    mlib_s32 height,
-                               mlib_s32 cmask);
-
-/***************************************************************/
-
-void mlib_v_ImageChannelExtract_U8_2_1(mlib_u8  *sl,  mlib_s32 slb,
-                                       mlib_u8 *dl,  mlib_s32 dlb,
-                                       mlib_s32 width,   mlib_s32 height);
-
-void mlib_v_ImageChannelExtract_U8_3_2(mlib_u8  *sl,  mlib_s32 slb,
-                                       mlib_u8 *dl,  mlib_s32 dlb,
-                                       mlib_s32 width,   mlib_s32 height,
-                                       mlib_s32 count1);
-
-void mlib_v_ImageChannelExtract_U8_4_2(mlib_u8  *sl,  mlib_s32 slb,
-                                       mlib_u8  *dl,  mlib_s32 dlb,
-                                       mlib_s32 width,   mlib_s32 height,
-                                       mlib_s32 count1);
-
-void mlib_v_ImageChannelExtract_32_2_1(mlib_f32 *sl,  mlib_s32 slb,
-                                       mlib_f32 *dl,   mlib_s32 dlb,
-                                       mlib_s32 width, mlib_s32 height);
-
-void mlib_v_ImageChannelExtract_32_3_1(mlib_f32 *sl,  mlib_s32 slb,
-                                       mlib_f32 *dl,   mlib_s32 dlb,
-                                       mlib_s32 width, mlib_s32 height);
-
-void mlib_v_ImageChannelExtract_32_3_2(mlib_f32 *sp, mlib_s32 slb,
-                                       mlib_f32 *dp, mlib_s32 dlb,
-                                       mlib_s32 width, mlib_s32 height,
-                                       mlib_s32 deltac1);
-
-void mlib_v_ImageChannelExtract_32_4_1(mlib_f32 *sl,  mlib_s32 slb,
-                                       mlib_f32 *dl,   mlib_s32 dlb,
-                                       mlib_s32 width, mlib_s32 height);
-
-void mlib_v_ImageChannelExtract_32_4_2(mlib_f32 *sp, mlib_s32 slb,
-                                       mlib_f32 *dp, mlib_s32 dlb,
-                                       mlib_s32 width, mlib_s32 height,
-                                       mlib_s32 deltac1);
-
-void mlib_v_ImageChannelExtract_32_4_3(mlib_f32 *sl,  mlib_s32 slb,
-                                       mlib_f32 *dl,   mlib_s32 dlb,
-                                       mlib_s32 width, mlib_s32 height,
-                                       mlib_s32  mask_off);
-
-/***************************************************************/
-
-void
-mlib_v_ImageChannelExtract_U8_21_A8D1X8(mlib_u8  *src,
-                                        mlib_u8  *dst,
-                                        mlib_s32 dsize,
-                                        mlib_s32 cmask);
-void
-mlib_v_ImageChannelExtract_U8_21_A8D2X8(mlib_u8  *src,  mlib_s32 slb,
-                                        mlib_u8  *dst,  mlib_s32 dlb,
-                                        mlib_s32 xsize, mlib_s32 ysize,
-                                        mlib_s32 cmask);
-void
-mlib_v_ImageChannelExtract_U8_21_D1(mlib_u8  *src,
-                                    mlib_u8  *dst,
-                                    mlib_s32 dsize,
-                                    mlib_s32 cmask);
-void
-mlib_v_ImageChannelExtract_U8_21(mlib_u8  *src,  mlib_s32 slb,
-                                 mlib_u8  *dst,  mlib_s32 dlb,
-                                 mlib_s32 xsize, mlib_s32 ysize,
-                                 mlib_s32 cmask);
-void
-mlib_v_ImageChannelExtract_U8_31_A8D1X8(mlib_u8  *src,
-                                        mlib_u8  *dst,
-                                        mlib_s32 dsize,
-                                        mlib_s32 cmask);
-void
-mlib_v_ImageChannelExtract_U8_31_A8D2X8(mlib_u8  *src,  mlib_s32 slb,
-                                        mlib_u8  *dst,  mlib_s32 dlb,
-                                        mlib_s32 xsize, mlib_s32 ysize,
-                                        mlib_s32 cmask);
-void
-mlib_v_ImageChannelExtract_U8_31_D1(mlib_u8  *src,
-                                    mlib_u8  *dst,
-                                    mlib_s32 dsize,
-                                    mlib_s32 cmask);
-void
-mlib_v_ImageChannelExtract_U8_31(mlib_u8  *src,  mlib_s32 slb,
-                                 mlib_u8  *dst,  mlib_s32 dlb,
-                                 mlib_s32 xsize, mlib_s32 ysize,
-                                 mlib_s32 cmask);
-void
-mlib_v_ImageChannelExtract_U8_41_A8D1X8(mlib_u8  *src,
-                                        mlib_u8  *dst,
-                                        mlib_s32 dsize,
-                                        mlib_s32 cmask);
-void
-mlib_v_ImageChannelExtract_U8_41_A8D2X8(mlib_u8  *src,  mlib_s32 slb,
-                                        mlib_u8  *dst,  mlib_s32 dlb,
-                                        mlib_s32 xsize, mlib_s32 ysize,
-                                        mlib_s32 cmask);
-void
-mlib_v_ImageChannelExtract_U8_41_D1(mlib_u8  *src,
-                                    mlib_u8  *dst,
-                                    mlib_s32 dsize,
-                                    mlib_s32 cmask);
-void
-mlib_v_ImageChannelExtract_U8_41(mlib_u8  *src,  mlib_s32 slb,
-                                 mlib_u8  *dst,  mlib_s32 dlb,
-                                 mlib_s32 xsize, mlib_s32 ysize,
-                                 mlib_s32 cmask);
-void
-mlib_v_ImageChannelExtract_S16_11_A8D1X4(mlib_s16 *src, mlib_s16 *dst,
-                                         mlib_s32 dsize);
-void
-mlib_v_ImageChannelExtract_S16_21_A8D1X4(mlib_s16 *src,
-                                         mlib_s16 *dst,
-                                         mlib_s32 dsize,
-                                         mlib_s32 cmask);
-void
-mlib_v_ImageChannelExtract_S16_21_A8D2X4(mlib_s16 *src,  mlib_s32 slb,
-                                         mlib_s16 *dst,  mlib_s32 dlb,
-                                         mlib_s32 xsize, mlib_s32 ysize,
-                                         mlib_s32 cmask);
-void
-mlib_v_ImageChannelExtract_S16_21_D1(mlib_s16 *src,
-                                     mlib_s16 *dst,
-                                     mlib_s32 dsize,
-                                     mlib_s32 cmask);
-void
-mlib_v_ImageChannelExtract_S16_21(mlib_s16 *src,  mlib_s32 slb,
-                                  mlib_s16 *dst,  mlib_s32 dlb,
-                                  mlib_s32 xsize, mlib_s32 ysize,
-                                  mlib_s32 cmask);
-void
-mlib_v_ImageChannelExtract_S16_31_A8D1X4(mlib_s16 *src,
-                                         mlib_s16 *dst,
-                                         mlib_s32 dsize,
-                                         mlib_s32 cmask);
-void
-mlib_v_ImageChannelExtract_S16_31_A8D2X4(mlib_s16 *src,  mlib_s32 slb,
-                                         mlib_s16 *dst,  mlib_s32 dlb,
-                                         mlib_s32 xsize, mlib_s32 ysize,
-                                         mlib_s32 cmask);
-void
-mlib_v_ImageChannelExtract_S16_31_D1(mlib_s16 *src,
-                                     mlib_s16 *dst,
-                                     mlib_s32 dsize,
-                                     mlib_s32 cmask);
-void
-mlib_v_ImageChannelExtract_S16_31(mlib_s16 *src,  mlib_s32 slb,
-                                  mlib_s16 *dst,  mlib_s32 dlb,
-                                  mlib_s32 xsize, mlib_s32 ysize,
-                                  mlib_s32 cmask);
-void
-mlib_v_ImageChannelExtract_S16_41_A8D1X4(mlib_s16 *src,
-                                         mlib_s16 *dst,
-                                         mlib_s32 dsize,
-                                         mlib_s32 cmask);
-void
-mlib_v_ImageChannelExtract_S16_41_A8D2X4(mlib_s16 *src,  mlib_s32 slb,
-                                         mlib_s16 *dst,  mlib_s32 dlb,
-                                         mlib_s32 xsize, mlib_s32 ysize,
-                                         mlib_s32 cmask);
-void
-mlib_v_ImageChannelExtract_S16_41_D1(mlib_s16 *src,
-                                     mlib_s16 *dst,
-                                     mlib_s32 dsize,
-                                     mlib_s32 cmask);
-void
-mlib_v_ImageChannelExtract_S16_41(mlib_s16 *src,  mlib_s32 slb,
-                                  mlib_s16 *dst,  mlib_s32 dlb,
-                                  mlib_s32 xsize, mlib_s32 ysize,
-                                  mlib_s32 cmask);
-
-/***************************************************************/
-/* functions defined in mlib_ImageChannelExtract_43.c */
-
-void
-mlib_v_ImageChannelExtract_U8_43R_A8D1X8(mlib_u8  *src,
-                                         mlib_u8  *dst,
-                                         mlib_s32 dsize);
-void
-mlib_v_ImageChannelExtract_U8_43R_A8D2X8(mlib_u8  *src,  mlib_s32 slb,
-                                         mlib_u8  *dst,  mlib_s32 dlb,
-                                         mlib_s32 xsize, mlib_s32 ysize);
-void
-mlib_v_ImageChannelExtract_U8_43R_D1(mlib_u8  *src,
-                                     mlib_u8  *dst,
-                                     mlib_s32 dsize);
-void
-mlib_v_ImageChannelExtract_U8_43R(mlib_u8  *src,  mlib_s32 slb,
-                                  mlib_u8  *dst,  mlib_s32 dlb,
-                                  mlib_s32 xsize, mlib_s32 ysize);
-void
-mlib_v_ImageChannelExtract_S16_43R_A8D1X4(mlib_s16 *src,
-                                          mlib_s16 *dst,
-                                          mlib_s32 dsize);
-void
-mlib_v_ImageChannelExtract_S16_43R_A8D2X4(mlib_s16 *src,  mlib_s32 slb,
-                                          mlib_s16 *dst,  mlib_s32 dlb,
-                                          mlib_s32 xsize, mlib_s32 ysize);
-void
-mlib_v_ImageChannelExtract_S16_43R_D1(mlib_s16 *src,
-                                      mlib_s16 *dst,
-                                      mlib_s32 dsize);
-void
-mlib_v_ImageChannelExtract_S16_43R(mlib_s16 *src,  mlib_s32 slb,
-                                   mlib_s16 *dst,  mlib_s32 dlb,
-                                   mlib_s32 xsize, mlib_s32 ysize);
-void
-mlib_v_ImageChannelExtract_U8_43L_A8D1X8(mlib_u8  *src,
-                                         mlib_u8  *dst,
-                                         mlib_s32 dsize);
-void
-mlib_v_ImageChannelExtract_U8_43L_A8D2X8(mlib_u8  *src,  mlib_s32 slb,
-                                         mlib_u8  *dst,  mlib_s32 dlb,
-                                         mlib_s32 xsize, mlib_s32 ysize);
-void
-mlib_v_ImageChannelExtract_U8_43L_D1(mlib_u8  *src,
-                                     mlib_u8  *dst,
-                                     mlib_s32 dsize);
-void
-mlib_v_ImageChannelExtract_U8_43L(mlib_u8  *src,  mlib_s32 slb,
-                                  mlib_u8  *dst,  mlib_s32 dlb,
-                                  mlib_s32 xsize, mlib_s32 ysize);
-void
-mlib_v_ImageChannelExtract_S16_43L_A8D1X4(mlib_s16 *src,
-                                          mlib_s16 *dst,
-                                          mlib_s32 dsize);
-void
-mlib_v_ImageChannelExtract_S16_43L_A8D2X4(mlib_s16 *src,  mlib_s32 slb,
-                                          mlib_s16 *dst,  mlib_s32 dlb,
-                                          mlib_s32 xsize, mlib_s32 ysize);
-void
-mlib_v_ImageChannelExtract_S16_43L_D1(mlib_s16 *src,
-                                      mlib_s16 *dst,
-                                      mlib_s32 dsize);
-void
-mlib_v_ImageChannelExtract_S16_43L(mlib_s16 *src,  mlib_s32 slb,
-                                   mlib_s16 *dst,  mlib_s32 dlb,
-                                   mlib_s32 xsize, mlib_s32 ysize);
-
-/***************************************************************/
-
-#ifdef MLIB_TEST
-mlib_status
-mlib_v_ImageChannelExtract(mlib_image *dst,
-                           mlib_image *src,
-                           mlib_s32   cmask)
-#else
-mlib_status
-mlib_ImageChannelExtract(mlib_image *dst,
-                         mlib_image *src,
-                         mlib_s32   cmask)
-#endif
-{
-  const mlib_s32  X8 = 0x7;
-  const mlib_s32  X4 = 0x3;
-  const mlib_s32  X2 = 0x1;
-  const mlib_s32  A8D1   = MLIB_IMAGE_ALIGNED8 | MLIB_IMAGE_ONEDVECTOR;
-  const mlib_s32  A8D2X8 = MLIB_IMAGE_ALIGNED8 | MLIB_IMAGE_STRIDE8X | MLIB_IMAGE_WIDTH8X;
-  const mlib_s32  A8D2X4 = MLIB_IMAGE_ALIGNED8 | MLIB_IMAGE_STRIDE8X | MLIB_IMAGE_WIDTH4X;
-  const mlib_s32  A8D2X2 = MLIB_IMAGE_ALIGNED8 | MLIB_IMAGE_STRIDE8X | MLIB_IMAGE_WIDTH2X;
-  void      *sp;            /* pointer for pixel in src */
-  void      *dp;            /* pointer for pixel in dst */
-  mlib_s32  ncmask = 0;     /* normalized channel mask */
-  mlib_s32  channels;       /* number of channels for src */
-  mlib_s32  channeld;       /* number of channels for dst */
-  mlib_s32  width, height;  /* for src and dst */
-  mlib_s32  strides;        /* strides in bytes for src */
-  mlib_s32  strided;        /* strides in bytes for dst */
-  mlib_s32  flags;
-  mlib_s32  flagd;
-  mlib_s32  dsize;
-  int       delta0 = 0;     /* offset of first selected channel */
-  int       count1 = 0;     /* number of channels in first group */
-  int       i, bit1count = 0;
-
-  MLIB_IMAGE_CHECK(src);
-  MLIB_IMAGE_CHECK(dst);
-  MLIB_IMAGE_TYPE_EQUAL(src, dst);
-  MLIB_IMAGE_SIZE_EQUAL(src, dst);
-
-  channels = mlib_ImageGetChannels(src);
-  channeld = mlib_ImageGetChannels(dst);
-  width    = mlib_ImageGetWidth(src);
-  height   = mlib_ImageGetHeight(src);
-  strides  = mlib_ImageGetStride(src);
-  strided  = mlib_ImageGetStride(dst);
-  sp       = mlib_ImageGetData(src);
-  dp       = mlib_ImageGetData(dst);
-  flags    = mlib_ImageGetFlags(src);
-  flagd    = mlib_ImageGetFlags(dst);
-  dsize    = width * height;
-
-  /* normalize the cmask, and count the number of bit with value 1 */
-  for (i = (channels - 1); i >= 0; i--) {
-    if (((cmask & (1 << i)) != 0) && (bit1count < channeld)) {
-      ncmask += (1 << i);
-      bit1count++;
-    }
-  }
-
-  /* do not support the cases in which the number of selected channels is
-   * less than the nubmber of channels in the destination image */
-  if (bit1count < channeld) {
-    return MLIB_FAILURE;
-  }
-
-  if (channels == channeld) {
-#ifdef MLIB_TEST
-    mlib_v_ImageCopy(dst, src);
-#else
-    mlib_ImageCopy(dst, src);
-#endif
-    return MLIB_SUCCESS;
-  }
-
-  switch (mlib_ImageGetType(src)) {
-    case MLIB_BYTE:
-      if (channeld == 1) {
-        switch (channels) {
-          case 2:
-            if (((flags & A8D1) == 0) &&
-                ((flagd & A8D1) == 0) &&
-                ((dsize & X8)   == 0)) {
-              mlib_v_ImageChannelExtract_U8_21_A8D1X8((mlib_u8 *)sp,
-                                                      (mlib_u8 *)dp,
-                                                      dsize,
-                                                      ncmask);
-            }
-            else if (((flags & A8D2X8) == 0) &&
-                     ((flagd & A8D2X8) == 0)) {
-              mlib_v_ImageChannelExtract_U8_21_A8D2X8((mlib_u8 *)sp, strides,
-                                                      (mlib_u8 *)dp, strided,
-                                                      width, height,
-                                                      ncmask);
-            }
-            else if (((flags & MLIB_IMAGE_ONEDVECTOR) == 0) &&
-                     ((flagd & MLIB_IMAGE_ONEDVECTOR) == 0)) {
-              mlib_v_ImageChannelExtract_U8_21_D1((mlib_u8 *)sp,
-                                                  (mlib_u8 *)dp,
-                                                  dsize,
-                                                  ncmask);
-            }
-            else {
-              mlib_v_ImageChannelExtract_U8_21((mlib_u8 *)sp, strides,
-                                               (mlib_u8 *)dp, strided,
-                                               width, height,
-                                               ncmask);
-            }
-            return MLIB_SUCCESS;
-
-          case 3:
-            if (((flags & A8D1) == 0) &&
-                ((flagd & A8D1) == 0) &&
-                ((dsize & X8)   == 0)) {
-              mlib_v_ImageChannelExtract_U8_31_A8D1X8((mlib_u8 *)sp,
-                                                      (mlib_u8 *)dp,
-                                                      dsize,
-                                                      ncmask);
-            }
-            else if (((flags & A8D2X8) == 0) &&
-                     ((flagd & A8D2X8) == 0)) {
-              mlib_v_ImageChannelExtract_U8_31_A8D2X8((mlib_u8 *)sp, strides,
-                                                      (mlib_u8 *)dp, strided,
-                                                      width, height,
-                                                      ncmask);
-            }
-            else if (((flags & MLIB_IMAGE_ONEDVECTOR) == 0) &&
-                     ((flagd & MLIB_IMAGE_ONEDVECTOR) == 0)) {
-              mlib_v_ImageChannelExtract_U8_31_D1((mlib_u8 *)sp,
-                                                  (mlib_u8 *)dp,
-                                                  dsize,
-                                                  ncmask);
-            }
-            else {
-              mlib_v_ImageChannelExtract_U8_31((mlib_u8 *)sp, strides,
-                                               (mlib_u8 *)dp, strided,
-                                               width, height,
-                                               ncmask);
-            }
-            return MLIB_SUCCESS;
-
-          case 4:
-            if (((flags & A8D1) == 0) &&
-                ((flagd & A8D1) == 0) &&
-                ((dsize & X8)   == 0)) {
-              mlib_v_ImageChannelExtract_U8_41_A8D1X8((mlib_u8 *)sp,
-                                                      (mlib_u8 *)dp,
-                                                      dsize,
-                                                      ncmask);
-            }
-            else if (((flags & A8D2X8) == 0) &&
-                     ((flagd & A8D2X8) == 0)) {
-              mlib_v_ImageChannelExtract_U8_41_A8D2X8((mlib_u8 *)sp, strides,
-                                                      (mlib_u8 *)dp, strided,
-                                                      width, height,
-                                                      ncmask);
-            }
-            else if (((flags & MLIB_IMAGE_ONEDVECTOR) == 0) &&
-                     ((flagd & MLIB_IMAGE_ONEDVECTOR) == 0)) {
-              mlib_v_ImageChannelExtract_U8_41_D1((mlib_u8 *)sp,
-                                                  (mlib_u8 *)dp,
-                                                  dsize,
-                                                  ncmask);
-            }
-            else {
-              mlib_v_ImageChannelExtract_U8_41((mlib_u8 *)sp, strides,
-                                               (mlib_u8 *)dp, strided,
-                                               width, height,
-                                               ncmask);
-            }
-            return MLIB_SUCCESS;
-
-          default:
-            return MLIB_FAILURE;
-        }
-      }
-      else if ((channels == 4) && (channeld == 3) && (ncmask == 7)) {
-        if (((flags & A8D1) == 0) &&
-            ((flagd & A8D1) == 0) &&
-            ((dsize & X8)   == 0)) {
-          mlib_v_ImageChannelExtract_U8_43R_A8D1X8((mlib_u8 *)sp,
-                                                   (mlib_u8 *)dp,
-                                                   dsize);
-        }
-        else if (((flags & A8D2X8) == 0) &&
-                 ((flagd & A8D2X8) == 0)) {
-          mlib_v_ImageChannelExtract_U8_43R_A8D2X8((mlib_u8 *)sp, strides,
-                                                   (mlib_u8 *)dp, strided,
-                                                   width, height);
-        }
-        else if (((flags & MLIB_IMAGE_ONEDVECTOR) == 0) &&
-                 ((flagd & MLIB_IMAGE_ONEDVECTOR) == 0)) {
-          mlib_v_ImageChannelExtract_U8_43R_D1((mlib_u8 *)sp,
-                                               (mlib_u8 *)dp,
-                                               dsize);
-        }
-        else {
-          mlib_v_ImageChannelExtract_U8_43R((mlib_u8 *)sp, strides,
-                                            (mlib_u8 *)dp, strided,
-                                            width, height);
-        }
-        return MLIB_SUCCESS;
-      }
-      else if ((channels == 4) && (channeld == 3) && (ncmask == 14)) {
-        if (((flags & A8D1) == 0) &&
-            ((flagd & A8D1) == 0) &&
-            ((dsize & X8)   == 0)) {
-          mlib_v_ImageChannelExtract_U8_43L_A8D1X8((mlib_u8 *)sp,
-                                                   (mlib_u8 *)dp,
-                                                   dsize);
-        }
-        else if (((flags & A8D2X8) == 0) &&
-                 ((flagd & A8D2X8) == 0)) {
-          mlib_v_ImageChannelExtract_U8_43L_A8D2X8((mlib_u8 *)sp, strides,
-                                                   (mlib_u8 *)dp, strided,
-                                                   width, height);
-        }
-        else if (((flags & MLIB_IMAGE_ONEDVECTOR) == 0) &&
-                 ((flagd & MLIB_IMAGE_ONEDVECTOR) == 0)) {
-          mlib_v_ImageChannelExtract_U8_43L_D1((mlib_u8 *)sp,
-                                               (mlib_u8 *)dp,
-                                               dsize);
-        }
-        else {
-          mlib_v_ImageChannelExtract_U8_43L((mlib_u8 *)sp, strides,
-                                            (mlib_u8 *)dp, strided,
-                                            width, height);
-        }
-        return MLIB_SUCCESS;
-      }
-      break;
-
-    case MLIB_SHORT:
-      if (channeld == 1) {
-        switch (channels) {
-          case 2:
-            if (((flags & A8D1) == 0) &&
-                ((flagd & A8D1) == 0) &&
-                ((dsize & X4)   == 0)) {
-              mlib_v_ImageChannelExtract_S16_21_A8D1X4((mlib_s16 *)sp,
-                                                       (mlib_s16 *)dp,
-                                                       dsize,
-                                                       ncmask);
-            }
-            else if (((flags & A8D2X4) == 0) &&
-                     ((flagd & A8D2X4) == 0)) {
-              mlib_v_ImageChannelExtract_S16_21_A8D2X4((mlib_s16 *)sp, strides,
-                                                       (mlib_s16 *)dp, strided,
-                                                       width, height,
-                                                       ncmask);
-            }
-            else if (((flags & MLIB_IMAGE_ONEDVECTOR) == 0) &&
-                     ((flagd & MLIB_IMAGE_ONEDVECTOR) == 0)) {
-              mlib_v_ImageChannelExtract_S16_21_D1((mlib_s16 *)sp,
-                                                   (mlib_s16 *)dp,
-                                                   dsize,
-                                                   ncmask);
-            }
-            else {
-              mlib_v_ImageChannelExtract_S16_21((mlib_s16 *)sp, strides,
-                                                (mlib_s16 *)dp, strided,
-                                                width, height,
-                                                ncmask);
-            }
-            return MLIB_SUCCESS;
-
-          case 3:
-            if (((flags & A8D1) == 0) &&
-                ((flagd & A8D1) == 0) &&
-                ((dsize & X4)   == 0)) {
-              mlib_v_ImageChannelExtract_S16_31_A8D1X4((mlib_s16 *)sp,
-                                                       (mlib_s16 *)dp,
-                                                       dsize,
-                                                       ncmask);
-            }
-            else if (((flags & A8D2X4) == 0) &&
-                     ((flagd & A8D2X4) == 0)) {
-              mlib_v_ImageChannelExtract_S16_31_A8D2X4((mlib_s16 *)sp, strides,
-                                                       (mlib_s16 *)dp, strided,
-                                                       width, height,
-                                                       ncmask);
-            }
-            else if (((flags & MLIB_IMAGE_ONEDVECTOR) == 0) &&
-                     ((flagd & MLIB_IMAGE_ONEDVECTOR) == 0)) {
-              mlib_v_ImageChannelExtract_S16_31_D1((mlib_s16 *)sp,
-                                                   (mlib_s16 *)dp,
-                                                   dsize,
-                                                   ncmask);
-            }
-            else {
-              mlib_v_ImageChannelExtract_S16_31((mlib_s16 *)sp, strides,
-                                                (mlib_s16 *)dp, strided,
-                                                width, height,
-                                                ncmask);
-            }
-            return MLIB_SUCCESS;
-
-          case 4:
-            if (((flags & A8D1) == 0) &&
-                ((flagd & A8D1) == 0) &&
-                ((dsize & X4)   == 0)) {
-              mlib_v_ImageChannelExtract_S16_41_A8D1X4((mlib_s16 *)sp,
-                                                       (mlib_s16 *)dp,
-                                                       dsize,
-                                                       ncmask);
-            }
-            else if (((flags & A8D2X4) == 0) &&
-                     ((flagd & A8D2X4) == 0)) {
-              mlib_v_ImageChannelExtract_S16_41_A8D2X4((mlib_s16 *)sp, strides,
-                                                       (mlib_s16 *)dp, strided,
-                                                       width, height,
-                                                       ncmask);
-            }
-            else if (((flags & MLIB_IMAGE_ONEDVECTOR) == 0) &&
-                     ((flagd & MLIB_IMAGE_ONEDVECTOR) == 0)) {
-              mlib_v_ImageChannelExtract_S16_41_D1((mlib_s16 *)sp,
-                                                   (mlib_s16 *)dp,
-                                                   dsize,
-                                                   ncmask);
-            }
-            else {
-              mlib_v_ImageChannelExtract_S16_41((mlib_s16 *)sp, strides,
-                                                (mlib_s16 *)dp, strided,
-                                                width, height,
-                                                ncmask);
-            }
-            return MLIB_SUCCESS;
-          default:
-            return MLIB_FAILURE;
-        }
-      }
-      else if ((channels == 4) && (channeld == 3) && (ncmask == 7)) {
-        if (((flags & A8D1) == 0) &&
-            ((flagd & A8D1) == 0) &&
-            ((dsize & X4)   == 0)) {
-          mlib_v_ImageChannelExtract_S16_43R_A8D1X4((mlib_s16 *)sp,
-                                                    (mlib_s16 *)dp,
-                                                    dsize);
-        }
-        else if (((flags & A8D2X4) == 0) &&
-                 ((flagd & A8D2X4) == 0)) {
-          mlib_v_ImageChannelExtract_S16_43R_A8D2X4((mlib_s16 *)sp, strides,
-                                                    (mlib_s16 *)dp, strided,
-                                                    width, height);
-        }
-        else if (((flags & MLIB_IMAGE_ONEDVECTOR) == 0) &&
-                 ((flagd & MLIB_IMAGE_ONEDVECTOR) == 0)) {
-          mlib_v_ImageChannelExtract_S16_43R_D1((mlib_s16 *)sp,
-                                                (mlib_s16 *)dp,
-                                                dsize);
-        }
-        else {
-          mlib_v_ImageChannelExtract_S16_43R((mlib_s16 *)sp, strides,
-                                             (mlib_s16 *)dp, strided,
-                                             width, height);
-        }
-        return MLIB_SUCCESS;
-      }
-      else if ((channels == 4) && (channeld == 3) && (ncmask == 14)) {
-        if (((flags & A8D1) == 0) &&
-            ((flagd & A8D1) == 0) &&
-            ((dsize & X4)   == 0)) {
-          mlib_v_ImageChannelExtract_S16_43L_A8D1X4((mlib_s16 *)sp,
-                                                    (mlib_s16 *)dp,
-                                                    dsize);
-        }
-        else if (((flags & A8D2X4) == 0) &&
-                 ((flagd & A8D2X4) == 0)) {
-          mlib_v_ImageChannelExtract_S16_43L_A8D2X4((mlib_s16 *)sp, strides,
-                                                    (mlib_s16 *)dp, strided,
-                                                    width, height);
-        }
-        else if (((flags & MLIB_IMAGE_ONEDVECTOR) == 0) &&
-                 ((flagd & MLIB_IMAGE_ONEDVECTOR) == 0)) {
-          mlib_v_ImageChannelExtract_S16_43L_D1((mlib_s16 *)sp,
-                                                (mlib_s16 *)dp,
-                                                dsize);
-        }
-        else {
-          mlib_v_ImageChannelExtract_S16_43L((mlib_s16 *)sp, strides,
-                                             (mlib_s16 *)dp, strided,
-                                             width, height);
-        }
-        return MLIB_SUCCESS;
-      }
-      break;
-
-  }
-
-/***************************************************************/
-  /* From C version */
-
-  for (i = (channels - 1); i >= 0; i--) {
-    if (!(ncmask & (1 << i))) delta0++;
-    else break;
-  }
-  for (; i >= 0; i--) {
-    if (ncmask & (1 << i)) count1++;
-    else break;
-  }
-
-  switch (mlib_ImageGetType(src)) {
-    case MLIB_BYTE:
-      {
-        mlib_u8 *sl = (mlib_u8 *)sp + delta0;
-        mlib_u8 *dl = (mlib_u8 *)dp;
-
-        switch (channels*10 + channeld) {
-          case 32:
-            mlib_v_ImageChannelExtract_U8_3_2(sl, strides, dl, strided, width, height, count1);
-            return MLIB_SUCCESS;
-
-          case 42:
-            if (ncmask == 0xA || ncmask == 0x5) { /* mask 1010 or 0101 */
-              mlib_v_ImageChannelExtract_U8_2_1(sl, strides, dl, strided, 2*width, height);
-              return MLIB_SUCCESS;
-            }
-            mlib_v_ImageChannelExtract_U8_4_2(sl, strides, dl, strided, width, height, count1);
-            return MLIB_SUCCESS;
-
-          case 43:
-            mlib_v_ImageChannelExtract_U8((mlib_u8 *)sp, strides,
-                                          (mlib_u8 *)dp, strided,
-                                          channels, channeld,
-                                          width, height,
-                                          ncmask);
-            return MLIB_SUCCESS;
-
-          default: return MLIB_FAILURE;
-        }
-      }
-
-    case MLIB_SHORT:
-      mlib_v_ImageChannelExtract_S16((mlib_u16 *)sp, strides,
-                                     (mlib_u16 *)dp, strided,
-                                     channels,  channeld,
-                                     width, height,
-                                     ncmask);
-      break;
-
-    case MLIB_INT:
-    case MLIB_FLOAT:
-      {
-        mlib_f32 *sl = (mlib_f32 *)sp + delta0;
-        mlib_f32 *dl = (mlib_f32 *)dp;
-        strides /= 4;
-        strided /= 4;
-
-        switch (channels*10 + channeld) {
-          case 21:
-            mlib_v_ImageChannelExtract_32_2_1(sl, strides, dl, strided, width, height);
-            return MLIB_SUCCESS;
-
-          case 31:
-            mlib_v_ImageChannelExtract_32_3_1(sl, strides, dl, strided, width, height);
-            return MLIB_SUCCESS;
-
-          case 32:
-            mlib_v_ImageChannelExtract_32_3_2(sl, strides, dl, strided, width, height, count1);
-            return MLIB_SUCCESS;
-
-          case 41:
-            mlib_v_ImageChannelExtract_32_4_1(sl, strides, dl, strided, width, height);
-            return MLIB_SUCCESS;
-
-          case 42:
-            if (ncmask == 0xA || ncmask == 0x5) { /* mask 1010 or 0101 */
-              mlib_v_ImageChannelExtract_32_2_1(sl, strides, dl, strided, 2*width, height);
-            } else {
-              mlib_v_ImageChannelExtract_32_4_2(sl, strides, dl, strided, width, height, count1);
-            }
-            return MLIB_SUCCESS;
-
-          case 43:
-            mlib_v_ImageChannelExtract_32_4_3(sl, strides, dl, strided, width, height, count1);
-            return MLIB_SUCCESS;
-
-          default:
-            return MLIB_FAILURE;
-        }
-      }
-    case MLIB_DOUBLE:
-      mlib_v_ImageChannelExtract_D64((mlib_d64 *)sp, strides,
-                                     (mlib_d64 *)dp, strided,
-                                     channels,  channeld,
-                                     width, height,
-                                     ncmask);
-      break;
-
-    case MLIB_BIT:
-    default:
-      return MLIB_FAILURE;  /* MLIB_BIT is not supported here */
-  }
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract.h b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract.h
index 6193ec130e3..7c5946423d9 100644
--- a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract.h
+++ b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract.h
@@ -32,348 +32,29 @@
 extern "C" {
 #endif /* __cplusplus */
 
-void mlib_v_ImageChannelExtract_U8_21_A8D1X8(const mlib_u8 *src,
-                                             mlib_u8       *dst,
-                                             mlib_s32      dsize,
-                                             mlib_s32      cmask);
-
-void mlib_v_ImageChannelExtract_U8_21_A8D2X8(const mlib_u8 *src,
-                                             mlib_s32      slb,
-                                             mlib_u8       *dst,
-                                             mlib_s32      dlb,
-                                             mlib_s32      xsize,
-                                             mlib_s32      ysize,
-                                             mlib_s32      cmask);
-
 void mlib_v_ImageChannelExtract_U8_21_D1(const mlib_u8 *src,
                                          mlib_u8       *dst,
                                          mlib_s32      dsize,
                                          mlib_s32      cmask);
 
-void mlib_v_ImageChannelExtract_U8_21(const mlib_u8 *src,
-                                      mlib_s32      slb,
-                                      mlib_u8       *dst,
-                                      mlib_s32      dlb,
-                                      mlib_s32      xsize,
-                                      mlib_s32      ysize,
-                                      mlib_s32      cmask);
-
-void mlib_v_ImageChannelExtract_U8_31_A8D1X8(const mlib_u8 *src,
-                                             mlib_u8       *dst,
-                                             mlib_s32      dsize,
-                                             mlib_s32      cmask);
-
-void mlib_v_ImageChannelExtract_U8_31_A8D2X8(const mlib_u8 *src,
-                                             mlib_s32      slb,
-                                             mlib_u8       *dst,
-                                             mlib_s32      dlb,
-                                             mlib_s32      xsize,
-                                             mlib_s32      ysize,
-                                             mlib_s32      cmask);
-
 void mlib_v_ImageChannelExtract_U8_31_D1(const mlib_u8 *src,
                                          mlib_u8       *dst,
                                          mlib_s32      dsize,
                                          mlib_s32      cmask);
 
-void mlib_v_ImageChannelExtract_U8_31(const mlib_u8 *src,
-                                      mlib_s32      slb,
-                                      mlib_u8       *dst,
-                                      mlib_s32      dlb,
-                                      mlib_s32      xsize,
-                                      mlib_s32      ysize,
-                                      mlib_s32      cmask);
-
-void mlib_v_ImageChannelExtract_U8_41_A8D1X8(const mlib_u8 *src,
-                                             mlib_u8       *dst,
-                                             mlib_s32      dsize,
-                                             mlib_s32      cmask);
-
-void mlib_v_ImageChannelExtract_U8_41_A8D2X8(const mlib_u8 *src,
-                                             mlib_s32      slb,
-                                             mlib_u8       *dst,
-                                             mlib_s32      dlb,
-                                             mlib_s32      xsize,
-                                             mlib_s32      ysize,
-                                             mlib_s32      cmask);
-
 void mlib_v_ImageChannelExtract_U8_41_D1(const mlib_u8 *src,
                                          mlib_u8       *dst,
                                          mlib_s32      dsize,
                                          mlib_s32      cmask);
 
-void mlib_v_ImageChannelExtract_U8_41(const mlib_u8 *src,
-                                      mlib_s32      slb,
-                                      mlib_u8       *dst,
-                                      mlib_s32      dlb,
-                                      mlib_s32      xsize,
-                                      mlib_s32      ysize,
-                                      mlib_s32      cmask);
-
-void mlib_v_ImageChannelExtract_S16_21_A8D1X4(const mlib_s16 *src,
-                                              mlib_s16       *dst,
-                                              mlib_s32       dsize,
-                                              mlib_s32       cmask);
-
-void mlib_v_ImageChannelExtract_S16_21_A8D2X4(const mlib_s16 *src,
-                                              mlib_s32       slb,
-                                              mlib_s16       *dst,
-                                              mlib_s32       dlb,
-                                              mlib_s32       xsize,
-                                              mlib_s32       ysize,
-                                              mlib_s32       cmask);
-
-void mlib_v_ImageChannelExtract_S16_21_D1(const mlib_s16 *src,
-                                          mlib_s16       *dst,
-                                          mlib_s32       dsize,
-                                          mlib_s32       cmask);
-
-void mlib_v_ImageChannelExtract_S16_21(const mlib_s16 *src,
-                                       mlib_s32       slb,
-                                       mlib_s16       *dst,
-                                       mlib_s32       dlb,
-                                       mlib_s32       xsize,
-                                       mlib_s32       ysize,
-                                       mlib_s32       cmask);
-
-void mlib_v_ImageChannelExtract_S16_31_A8D1X4(const mlib_s16 *src,
-                                              mlib_s16       *dst,
-                                              mlib_s32       dsize,
-                                              mlib_s32       cmask);
-
-void mlib_v_ImageChannelExtract_S16_31_A8D2X4(const mlib_s16 *src,
-                                              mlib_s32       slb,
-                                              mlib_s16       *dst,
-                                              mlib_s32       dlb,
-                                              mlib_s32       xsize,
-                                              mlib_s32       ysize,
-                                              mlib_s32       cmask);
-
-void mlib_v_ImageChannelExtract_S16_31_D1(const mlib_s16 *src,
-                                          mlib_s16       *dst,
-                                          mlib_s32       dsize,
-                                          mlib_s32       cmask);
-
-void mlib_v_ImageChannelExtract_S16_31(const mlib_s16 *src,
-                                       mlib_s32       slb,
-                                       mlib_s16       *dst,
-                                       mlib_s32       dlb,
-                                       mlib_s32       xsize,
-                                       mlib_s32       ysize,
-                                       mlib_s32       cmask);
-
-void mlib_v_ImageChannelExtract_S16_41_A8D1X4(const mlib_s16 *src,
-                                              mlib_s16       *dst,
-                                              mlib_s32       dsize,
-                                              mlib_s32       cmask);
-
-void mlib_v_ImageChannelExtract_S16_41_A8D2X4(const mlib_s16 *src,
-                                              mlib_s32       slb,
-                                              mlib_s16       *dst,
-                                              mlib_s32       dlb,
-                                              mlib_s32       xsize,
-                                              mlib_s32       ysize,
-                                              mlib_s32       cmask);
-
-void mlib_v_ImageChannelExtract_S16_41_D1(const mlib_s16 *src,
-                                          mlib_s16       *dst,
-                                          mlib_s32       dsize,
-                                          mlib_s32       cmask);
-
-void mlib_v_ImageChannelExtract_S16_41(const mlib_s16 *src,
-                                       mlib_s32       slb,
-                                       mlib_s16       *dst,
-                                       mlib_s32       dlb,
-                                       mlib_s32       xsize,
-                                       mlib_s32       ysize,
-                                       mlib_s32       cmask);
-
-void mlib_v_ImageChannelExtract_U8_43R_A8D1X8(const mlib_u8 *src,
-                                              mlib_u8       *dst,
-                                              mlib_s32      dsize);
-
-void mlib_v_ImageChannelExtract_U8_43R_A8D2X8(const mlib_u8 *src,
-                                              mlib_s32      slb,
-                                              mlib_u8       *dst,
-                                              mlib_s32      dlb,
-                                              mlib_s32      xsize,
-                                              mlib_s32      ysize);
-
-void mlib_v_ImageChannelExtract_U8_43R_D1(const mlib_u8 *src,
-                                          mlib_u8       *dst,
-                                          mlib_s32      dsize);
-
-void mlib_v_ImageChannelExtract_U8_43R(const mlib_u8 *src,
-                                       mlib_s32      slb,
-                                       mlib_u8       *dst,
-                                       mlib_s32      dlb,
-                                       mlib_s32      xsize,
-                                       mlib_s32      ysize);
-
-void mlib_v_ImageChannelExtract_S16_43R_A8D1X4(const mlib_s16 *src,
-                                               mlib_s16       *dst,
-                                               mlib_s32       dsize);
-
-void mlib_v_ImageChannelExtract_S16_43R_A8D2X4(const mlib_s16 *src,
-                                               mlib_s32       slb,
-                                               mlib_s16       *dst,
-                                               mlib_s32       dlb,
-                                               mlib_s32       xsize,
-                                               mlib_s32       ysize);
-
-void mlib_v_ImageChannelExtract_S16_43R_D1(const mlib_s16 *src,
-                                           mlib_s16       *dst,
-                                           mlib_s32       dsize);
-
-void mlib_v_ImageChannelExtract_S16_43R(const mlib_s16 *src,
-                                        mlib_s32       slb,
-                                        mlib_s16       *dst,
-                                        mlib_s32       dlb,
-                                        mlib_s32       xsize,
-                                        mlib_s32       ysize);
-
-void mlib_v_ImageChannelExtract_U8_43L_A8D1X8(const mlib_u8 *src,
-                                              mlib_u8       *dst,
-                                              mlib_s32      dsize);
-
-void mlib_v_ImageChannelExtract_U8_43L_A8D2X8(const mlib_u8 *src,
-                                              mlib_s32      slb,
-                                              mlib_u8       *dst,
-                                              mlib_s32      dlb,
-                                              mlib_s32      xsize,
-                                              mlib_s32      ysize);
-
 void mlib_v_ImageChannelExtract_U8_43L_D1(const mlib_u8 *src,
                                           mlib_u8       *dst,
                                           mlib_s32      dsize);
 
-void mlib_v_ImageChannelExtract_U8_43L(const mlib_u8 *src,
-                                       mlib_s32      slb,
-                                       mlib_u8       *dst,
-                                       mlib_s32      dlb,
-                                       mlib_s32      xsize,
-                                       mlib_s32      ysize);
-
-void mlib_v_ImageChannelExtract_S16_43L_A8D1X4(const mlib_s16 *src,
-                                               mlib_s16       *dst,
-                                               mlib_s32       dsize);
-
-void mlib_v_ImageChannelExtract_S16_43L_A8D2X4(const mlib_s16 *src,
-                                               mlib_s32       slb,
-                                               mlib_s16       *dst,
-                                               mlib_s32       dlb,
-                                               mlib_s32       xsize,
-                                               mlib_s32       ysize);
-
 void mlib_v_ImageChannelExtract_S16_43L_D1(const mlib_s16 *src,
                                            mlib_s16       *dst,
                                            mlib_s32       dsize);
 
-void mlib_v_ImageChannelExtract_S16_43L(const mlib_s16 *src,
-                                        mlib_s32       slb,
-                                        mlib_s16       *dst,
-                                        mlib_s32       dlb,
-                                        mlib_s32       xsize,
-                                        mlib_s32       ysize);
-
-void mlib_v_ImageChannelExtract_U8_2_1(const mlib_u8 *sl,
-                                       mlib_s32      slb,
-                                       mlib_u8       *dl,
-                                       mlib_s32      dlb,
-                                       mlib_s32      width,
-                                       mlib_s32      height);
-
-void mlib_v_ImageChannelExtract_U8_3_2(const mlib_u8 *sl,
-                                       mlib_s32      slb,
-                                       mlib_u8       *dl,
-                                       mlib_s32      dlb,
-                                       mlib_s32      width,
-                                       mlib_s32      height,
-                                       mlib_s32      count1);
-
-void mlib_v_ImageChannelExtract_U8_4_2(const mlib_u8 *sl,
-                                       mlib_s32      slb,
-                                       mlib_u8       *dl,
-                                       mlib_s32      dlb,
-                                       mlib_s32      width,
-                                       mlib_s32      height,
-                                       mlib_s32      count1);
-
-void mlib_v_ImageChannelExtract_32_2_1(const mlib_f32 *sp,
-                                       mlib_s32       slb,
-                                       mlib_f32       *dp,
-                                       mlib_s32       dlb,
-                                       mlib_s32       width,
-                                       mlib_s32       height);
-
-void mlib_v_ImageChannelExtract_32_3_1(const mlib_f32 *sl,
-                                       mlib_s32       slb,
-                                       mlib_f32       *dl,
-                                       mlib_s32       dlb,
-                                       mlib_s32       width,
-                                       mlib_s32       height);
-
-void mlib_v_ImageChannelExtract_32_3_2(const mlib_f32 *sl,
-                                       mlib_s32       slb,
-                                       mlib_f32       *dl,
-                                       mlib_s32       dlb,
-                                       mlib_s32       width,
-                                       mlib_s32       height,
-                                       mlib_s32       count1);
-
-void mlib_v_ImageChannelExtract_32_4_1(const mlib_f32 *sp,
-                                       mlib_s32       slb,
-                                       mlib_f32       *dp,
-                                       mlib_s32       dlb,
-                                       mlib_s32       width,
-                                       mlib_s32       height);
-
-void mlib_v_ImageChannelExtract_32_4_2(const mlib_f32 *sl,
-                                       mlib_s32       slb,
-                                       mlib_f32       *dl,
-                                       mlib_s32       dlb,
-                                       mlib_s32       width,
-                                       mlib_s32       height,
-                                       mlib_s32       count1);
-
-void mlib_v_ImageChannelExtract_32_4_3(const mlib_f32 *sl,
-                                       mlib_s32       slb,
-                                       mlib_f32       *dl,
-                                       mlib_s32       dlb,
-                                       mlib_s32       width,
-                                       mlib_s32       height,
-                                       mlib_s32       count1);
-
-void mlib_v_ImageChannelExtract_U8(const mlib_u8 *src,
-                                   mlib_s32      slb,
-                                   mlib_u8       *dst,
-                                   mlib_s32      dlb,
-                                   mlib_s32      channels,
-                                   mlib_s32      channeld,
-                                   mlib_s32      width,
-                                   mlib_s32      height,
-                                   mlib_s32      cmask);
-
-void mlib_v_ImageChannelExtract_S16(const mlib_u16 *src,
-                                    mlib_s32       slb,
-                                    mlib_u16       *dst,
-                                    mlib_s32       dlb,
-                                    mlib_s32       channels,
-                                    mlib_s32       channeld,
-                                    mlib_s32       width,
-                                    mlib_s32       height,
-                                    mlib_s32       cmask);
-
-void mlib_v_ImageChannelExtract_D64(const mlib_d64 *src,
-                                    mlib_s32       slb,
-                                    mlib_d64       *dst,
-                                    mlib_s32       dlb,
-                                    mlib_s32       channels,
-                                    mlib_s32       channeld,
-                                    mlib_s32       width,
-                                    mlib_s32       height,
-                                    mlib_s32       cmask);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_1.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_1.c
index 69ae7231737..54f26d5eb77 100644
--- a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_1.c
+++ b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_1.c
@@ -29,30 +29,9 @@
  * FILENAME: mlib_ImageChannelExtract_1.c
  *
  * FUNCTIONS
- *      mlib_v_ImageChannelExtract_U8_21_A8D1X8
- *      mlib_v_ImageChannelExtract_U8_21_A8D2X8
  *      mlib_v_ImageChannelExtract_U8_21_D1
- *      mlib_v_ImageChannelExtract_U8_21
- *      mlib_v_ImageChannelExtract_U8_31_A8D1X8
- *      mlib_v_ImageChannelExtract_U8_31_A8D2X8
  *      mlib_v_ImageChannelExtract_U8_31_D1
- *      mlib_v_ImageChannelExtract_U8_31
- *      mlib_v_ImageChannelExtract_U8_41_A8D1X8
- *      mlib_v_ImageChannelExtract_U8_41_A8D2X8
  *      mlib_v_ImageChannelExtract_U8_41_D1
- *      mlib_v_ImageChannelExtract_U8_41
- *      mlib_v_ImageChannelExtract_S16_21_A8D1X4
- *      mlib_v_ImageChannelExtract_S16_21_A8D2X4
- *      mlib_v_ImageChannelExtract_S16_21_D1
- *      mlib_v_ImageChannelExtract_S16_21
- *      mlib_v_ImageChannelExtract_S16_31_A8D1X4
- *      mlib_v_ImageChannelExtract_S16_31_A8D2X4
- *      mlib_v_ImageChannelExtract_S16_31_D1
- *      mlib_v_ImageChannelExtract_S16_31
- *      mlib_v_ImageChannelExtract_S16_41_A8D1X4
- *      mlib_v_ImageChannelExtract_S16_41_A8D2X4
- *      mlib_v_ImageChannelExtract_S16_41_D1
- *      mlib_v_ImageChannelExtract_S16_41
  *
  * ARGUMENT
  *      src    pointer to source image data
@@ -93,100 +72,6 @@
   sdd = vis_fpmerge(vis_read_lo(sda), vis_read_lo(sdb));        \
   dd  = vis_fpmerge(vis_read_lo(sdc), vis_read_lo(sdd))
 
-/***************************************************************/
-/* extract one channel from a 2-channel image.
- * both source and destination image data are 8-byte aligned.
- * xsize is multiple of 8.
- */
-
-void mlib_v_ImageChannelExtract_U8_21_A8D1X8(const mlib_u8 *src,
-                                             mlib_u8       *dst,
-                                             mlib_s32      dsize,
-                                             mlib_s32      cmask)
-{
-  mlib_d64 *sp, *dp;
-  mlib_d64 sd0, sd1;
-  mlib_d64 sda, sdb, sdc, sdd;
-  mlib_d64 dd;
-  mlib_s32 i;
-
-  sp = (mlib_d64 *) src;
-  dp = (mlib_d64 *) dst;
-
-  if (cmask == 2) {
-#pragma pipeloop(0)
-    for (i = 0; i < dsize / 8; i++) {
-      sd0 = *sp++;
-      sd1 = *sp++;
-      CHANNELEXTRACT_U8_21L(sd0, sd1, dd);
-      *dp++ = dd;
-    }
-  }
-  else {
-#pragma pipeloop(0)
-    for (i = 0; i < dsize / 8; i++) {
-      sd0 = *sp++;
-      sd1 = *sp++;
-      CHANNELEXTRACT_U8_21R(sd0, sd1, dd);
-      *dp++ = dd;
-    }
-  }
-}
-
-/***************************************************************/
-/* extract one channel from a 2-channel image.
- * both source and destination image data are 8-byte aligned.
- * xsize is multiple of 8.
- */
-
-void mlib_v_ImageChannelExtract_U8_21_A8D2X8(const mlib_u8 *src,
-                                             mlib_s32      slb,
-                                             mlib_u8       *dst,
-                                             mlib_s32      dlb,
-                                             mlib_s32      xsize,
-                                             mlib_s32      ysize,
-                                             mlib_s32      cmask)
-{
-  mlib_d64 *sp, *dp;
-  mlib_d64 *sl, *dl;
-  mlib_d64 sd0, sd1;
-  mlib_d64 sda, sdb, sdc, sdd;
-  mlib_d64 dd;
-  mlib_s32 i, j;
-
-  sp = sl = (mlib_d64 *) src;
-  dp = dl = (mlib_d64 *) dst;
-
-  if (cmask == 2) {
-    for (j = 0; j < ysize; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < xsize / 8; i++) {
-        sd0 = *sp++;
-        sd1 = *sp++;
-        CHANNELEXTRACT_U8_21L(sd0, sd1, dd);
-        *dp++ = dd;
-      }
-
-      sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-      dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-    }
-  }
-  else {
-    for (j = 0; j < ysize; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < xsize / 8; i++) {
-        sd0 = *sp++;
-        sd1 = *sp++;
-        CHANNELEXTRACT_U8_21R(sd0, sd1, dd);
-        *dp++ = dd;
-      }
-
-      sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-      dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-    }
-  }
-}
-
 /***************************************************************/
 /* extract one channel from a 2-channel image.
  */
@@ -414,32 +299,6 @@ void mlib_v_ImageChannelExtract_U8_21_D1(const mlib_u8 *src,
   }
 }
 
-/***************************************************************/
-/* extract one channel from a 2-channel image.
- */
-
-void mlib_v_ImageChannelExtract_U8_21(const mlib_u8 *src,
-                                      mlib_s32      slb,
-                                      mlib_u8       *dst,
-                                      mlib_s32      dlb,
-                                      mlib_s32      xsize,
-                                      mlib_s32      ysize,
-                                      mlib_s32      cmask)
-{
-  mlib_u8 *sa, *da;
-  mlib_u8 *sl, *dl;
-  mlib_s32 j;
-
-  sa = sl = (void *)src;
-  da = dl = dst;
-
-  for (j = 0; j < ysize; j++) {
-    mlib_v_ImageChannelExtract_U8_21_D1(sa, da, xsize, cmask);
-    sa = sl += slb;
-    da = dl += dlb;
-  }
-}
-
 /***************************************************************/
 #define CHANNELEXTRACT_U8_31L(sd0, sd1, sd2, dd)                \
   sda = vis_fpmerge(vis_read_hi(sd0), vis_read_lo(sd1));        \
@@ -467,119 +326,6 @@ void mlib_v_ImageChannelExtract_U8_21(const mlib_u8 *src,
   sde = vis_fpmerge(vis_read_hi(sdb), vis_read_lo(sdc));        \
   dd  = vis_fpmerge(vis_read_hi(sdd), vis_read_lo(sde))
 
-/***************************************************************/
-void mlib_v_ImageChannelExtract_U8_31_A8D1X8(const mlib_u8 *src,
-                                             mlib_u8       *dst,
-                                             mlib_s32      dsize,
-                                             mlib_s32      cmask)
-{
-  mlib_d64 *sp, *dp;
-  mlib_d64 sd0, sd1, sd2;
-  mlib_d64 sda, sdb, sdc, sdd, sde;
-  mlib_d64 dd;
-  mlib_s32 i;
-
-  sp = (mlib_d64 *) src;
-  dp = (mlib_d64 *) dst;
-
-  if (cmask == 4) {
-#pragma pipeloop(0)
-    for (i = 0; i < dsize / 8; i++) {
-      sd0 = *sp++;
-      sd1 = *sp++;
-      sd2 = *sp++;
-      CHANNELEXTRACT_U8_31L(sd0, sd1, sd2, dd);
-      *dp++ = dd;
-    }
-  }
-  else if (cmask == 2) {
-#pragma pipeloop(0)
-    for (i = 0; i < dsize / 8; i++) {
-      sd0 = *sp++;
-      sd1 = *sp++;
-      sd2 = *sp++;
-      CHANNELEXTRACT_U8_31M(sd0, sd1, sd2, dd);
-      *dp++ = dd;
-    }
-  }
-  else {
-#pragma pipeloop(0)
-    for (i = 0; i < dsize / 8; i++) {
-      sd0 = *sp++;
-      sd1 = *sp++;
-      sd2 = *sp++;
-      CHANNELEXTRACT_U8_31R(sd0, sd1, sd2, dd);
-      *dp++ = dd;
-    }
-  }
-}
-
-/***************************************************************/
-void mlib_v_ImageChannelExtract_U8_31_A8D2X8(const mlib_u8 *src,
-                                             mlib_s32      slb,
-                                             mlib_u8       *dst,
-                                             mlib_s32      dlb,
-                                             mlib_s32      xsize,
-                                             mlib_s32      ysize,
-                                             mlib_s32      cmask)
-{
-  mlib_d64 *sp, *dp;
-  mlib_d64 *sl, *dl;
-  mlib_d64 sd0, sd1, sd2;
-  mlib_d64 sda, sdb, sdc, sdd, sde;
-  mlib_d64 dd;
-  mlib_s32 i, j;
-
-  sp = sl = (mlib_d64 *) src;
-  dp = dl = (mlib_d64 *) dst;
-
-  if (cmask == 4) {
-    for (j = 0; j < ysize; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < xsize / 8; i++) {
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        CHANNELEXTRACT_U8_31L(sd0, sd1, sd2, dd);
-        *dp++ = dd;
-      }
-
-      sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-      dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-    }
-  }
-  else if (cmask == 2) {
-    for (j = 0; j < ysize; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < xsize / 8; i++) {
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        CHANNELEXTRACT_U8_31M(sd0, sd1, sd2, dd);
-        *dp++ = dd;
-      }
-
-      sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-      dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-    }
-  }
-  else {
-    for (j = 0; j < ysize; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < xsize / 8; i++) {
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        CHANNELEXTRACT_U8_31R(sd0, sd1, sd2, dd);
-        *dp++ = dd;
-      }
-
-      sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-      dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-    }
-  }
-}
-
 /***************************************************************/
 void mlib_v_ImageChannelExtract_U8_31_D1(const mlib_u8 *src,
                                          mlib_u8       *dst,
@@ -931,29 +677,6 @@ void mlib_v_ImageChannelExtract_U8_31_D1(const mlib_u8 *src,
   }
 }
 
-/***************************************************************/
-void mlib_v_ImageChannelExtract_U8_31(const mlib_u8 *src,
-                                      mlib_s32      slb,
-                                      mlib_u8       *dst,
-                                      mlib_s32      dlb,
-                                      mlib_s32      xsize,
-                                      mlib_s32      ysize,
-                                      mlib_s32      cmask)
-{
-  mlib_u8 *sa, *da;
-  mlib_u8 *sl, *dl;
-  mlib_s32 j;
-
-  sa = sl = (void *)src;
-  da = dl = dst;
-
-  for (j = 0; j < ysize; j++) {
-    mlib_v_ImageChannelExtract_U8_31_D1(sa, da, xsize, cmask);
-    sa = sl += slb;
-    da = dl += dlb;
-  }
-}
-
 /***************************************************************/
 #define CHANNELEXTRACT_U8_41L(sd0, sd1, sd2, sd3, dd)           \
   sda = vis_fpmerge(vis_read_hi(sd0), vis_read_hi(sd2));        \
@@ -994,152 +717,6 @@ void mlib_v_ImageChannelExtract_U8_31(const mlib_u8 *src,
   sdf = vis_fpmerge(vis_read_lo(sdb), vis_read_lo(sdd));        \
   dd  = vis_fpmerge(vis_read_lo(sde), vis_read_lo(sdf))
 
-/***************************************************************/
-void mlib_v_ImageChannelExtract_U8_41_A8D1X8(const mlib_u8 *src,
-                                             mlib_u8       *dst,
-                                             mlib_s32      dsize,
-                                             mlib_s32      cmask)
-{
-  mlib_d64 *sp, *dp;
-  mlib_d64 sd0, sd1, sd2, sd3;
-  mlib_d64 sda, sdb, sdc, sdd, sde, sdf;
-  mlib_d64 dd;
-  mlib_s32 i;
-
-  sp = (mlib_d64 *) src;
-  dp = (mlib_d64 *) dst;
-
-  if (cmask == 8) {
-#pragma pipeloop(0)
-    for (i = 0; i < dsize / 8; i++) {
-      sd0 = *sp++;
-      sd1 = *sp++;
-      sd2 = *sp++;
-      sd3 = *sp++;
-      CHANNELEXTRACT_U8_41L(sd0, sd1, sd2, sd3, dd);
-      *dp++ = dd;
-    }
-  }
-  else if (cmask == 4) {
-#pragma pipeloop(0)
-    for (i = 0; i < dsize / 8; i++) {
-      sd0 = *sp++;
-      sd1 = *sp++;
-      sd2 = *sp++;
-      sd3 = *sp++;
-      CHANNELEXTRACT_U8_41ML(sd0, sd1, sd2, sd3, dd);
-      *dp++ = dd;
-    }
-  }
-  else if (cmask == 2) {
-#pragma pipeloop(0)
-    for (i = 0; i < dsize / 8; i++) {
-      sd0 = *sp++;
-      sd1 = *sp++;
-      sd2 = *sp++;
-      sd3 = *sp++;
-      CHANNELEXTRACT_U8_41MR(sd0, sd1, sd2, sd3, dd);
-      *dp++ = dd;
-    }
-  }
-  else {
-#pragma pipeloop(0)
-    for (i = 0; i < dsize / 8; i++) {
-      sd0 = *sp++;
-      sd1 = *sp++;
-      sd2 = *sp++;
-      sd3 = *sp++;
-      CHANNELEXTRACT_U8_41R(sd0, sd1, sd2, sd3, dd);
-      *dp++ = dd;
-    }
-  }
-}
-
-/***************************************************************/
-void mlib_v_ImageChannelExtract_U8_41_A8D2X8(const mlib_u8 *src,
-                                             mlib_s32      slb,
-                                             mlib_u8       *dst,
-                                             mlib_s32      dlb,
-                                             mlib_s32      xsize,
-                                             mlib_s32      ysize,
-                                             mlib_s32      cmask)
-{
-  mlib_d64 *sp, *dp;
-  mlib_d64 *sl, *dl;
-  mlib_d64 sd0, sd1, sd2, sd3;
-  mlib_d64 sda, sdb, sdc, sdd, sde, sdf;
-  mlib_d64 dd;
-  mlib_s32 i, j;
-
-  sp = sl = (mlib_d64 *) src;
-  dp = dl = (mlib_d64 *) dst;
-
-  if (cmask == 8) {
-    for (j = 0; j < ysize; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < xsize / 8; i++) {
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        sd3 = *sp++;
-        CHANNELEXTRACT_U8_41L(sd0, sd1, sd2, sd3, dd);
-        *dp++ = dd;
-      }
-
-      sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-      dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-    }
-  }
-  else if (cmask == 4) {
-    for (j = 0; j < ysize; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < xsize / 8; i++) {
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        sd3 = *sp++;
-        CHANNELEXTRACT_U8_41ML(sd0, sd1, sd2, sd3, dd);
-        *dp++ = dd;
-      }
-
-      sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-      dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-    }
-  }
-  else if (cmask == 2) {
-    for (j = 0; j < ysize; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < xsize / 8; i++) {
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        sd3 = *sp++;
-        CHANNELEXTRACT_U8_41MR(sd0, sd1, sd2, sd3, dd);
-        *dp++ = dd;
-      }
-
-      sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-      dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-    }
-  }
-  else {
-    for (j = 0; j < ysize; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < xsize / 8; i++) {
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        sd3 = *sp++;
-        CHANNELEXTRACT_U8_41R(sd0, sd1, sd2, sd3, dd);
-        *dp++ = dd;
-      }
-
-      sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-      dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-    }
-  }
-}
-
 /***************************************************************/
 void mlib_v_ImageChannelExtract_U8_41_D1(const mlib_u8 *src,
                                          mlib_u8       *dst,
@@ -1632,1560 +1209,3 @@ void mlib_v_ImageChannelExtract_U8_41_D1(const mlib_u8 *src,
 }
 
 /***************************************************************/
-void mlib_v_ImageChannelExtract_U8_41(const mlib_u8 *src,
-                                      mlib_s32      slb,
-                                      mlib_u8       *dst,
-                                      mlib_s32      dlb,
-                                      mlib_s32      xsize,
-                                      mlib_s32      ysize,
-                                      mlib_s32      cmask)
-{
-  mlib_u8 *sa, *da;
-  mlib_u8 *sl, *dl;
-  mlib_s32 j;
-
-  sa = sl = (void *)src;
-  da = dl = dst;
-
-  for (j = 0; j < ysize; j++) {
-    mlib_v_ImageChannelExtract_U8_41_D1(sa, da, xsize, cmask);
-    sa = sl += slb;
-    da = dl += dlb;
-  }
-}
-
-/***************************************************************/
-#define CHANNELEXTRACT_S16_21L(sd0, sd1, dd)                    \
-  sda = vis_fpmerge(vis_read_hi(sd0), vis_read_hi(sd1));        \
-  sdb = vis_fpmerge(vis_read_lo(sd0), vis_read_lo(sd1));        \
-  sdc = vis_fpmerge(vis_read_hi(sda), vis_read_hi(sdb));        \
-  dd  = vis_fpmerge(vis_read_hi(sdc), vis_read_lo(sdc))
-
-/***************************************************************/
-#define CHANNELEXTRACT_S16_21R(sd0, sd1, dd)                    \
-  sda = vis_fpmerge(vis_read_hi(sd0), vis_read_hi(sd1));        \
-  sdb = vis_fpmerge(vis_read_lo(sd0), vis_read_lo(sd1));        \
-  sdc = vis_fpmerge(vis_read_lo(sda), vis_read_lo(sdb));        \
-  dd  = vis_fpmerge(vis_read_hi(sdc), vis_read_lo(sdc))
-
-/***************************************************************/
-/* extract one channel from a 2-channel image.
- * both source and destination image data are 8-byte aligned.
- * dsize is multiple of 4.
- */
-
-void mlib_v_ImageChannelExtract_S16_21_A8D1X4(const mlib_s16 *src,
-                                              mlib_s16       *dst,
-                                              mlib_s32       dsize,
-                                              mlib_s32       cmask)
-{
-  mlib_d64 *sp, *dp;
-  mlib_d64 sd0, sd1;
-  mlib_d64 sda, sdb, sdc;
-  mlib_d64 dd;
-  mlib_s32 i;
-
-  sp = (mlib_d64 *) src;
-  dp = (mlib_d64 *) dst;
-
-  if (cmask == 2) {
-#pragma pipeloop(0)
-    for (i = 0; i < dsize / 4; i++) {
-      sd0 = *sp++;
-      sd1 = *sp++;
-      CHANNELEXTRACT_S16_21L(sd0, sd1, dd);
-      *dp++ = dd;
-    }
-  }
-  else {
-#pragma pipeloop(0)
-    for (i = 0; i < dsize / 4; i++) {
-      sd0 = *sp++;
-      sd1 = *sp++;
-      CHANNELEXTRACT_S16_21R(sd0, sd1, dd);
-      *dp++ = dd;
-    }
-  }
-}
-
-/***************************************************************/
-void mlib_v_ImageChannelExtract_S16_21_A8D2X4(const mlib_s16 *src,
-                                              mlib_s32       slb,
-                                              mlib_s16       *dst,
-                                              mlib_s32       dlb,
-                                              mlib_s32       xsize,
-                                              mlib_s32       ysize,
-                                              mlib_s32       cmask)
-{
-  mlib_d64 *sp, *dp;
-  mlib_d64 *sl, *dl;
-  mlib_d64 sd0, sd1;
-  mlib_d64 sda, sdb, sdc;
-  mlib_d64 dd;
-  mlib_s32 i, j;
-
-  sp = sl = (mlib_d64 *) src;
-  dp = dl = (mlib_d64 *) dst;
-
-  if (cmask == 2) {
-    for (j = 0; j < ysize; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < xsize / 4; i++) {
-        sd0 = *sp++;
-        sd1 = *sp++;
-        CHANNELEXTRACT_S16_21L(sd0, sd1, dd);
-        *dp++ = dd;
-      }
-
-      sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-      dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-    }
-  }
-  else {
-    for (j = 0; j < ysize; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < xsize / 4; i++) {
-        sd0 = *sp++;
-        sd1 = *sp++;
-        CHANNELEXTRACT_S16_21R(sd0, sd1, dd);
-        *dp++ = dd;
-      }
-
-      sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-      dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-    }
-  }
-}
-
-/***************************************************************/
-void mlib_v_ImageChannelExtract_S16_21_D1(const mlib_s16 *src,
-                                          mlib_s16       *dst,
-                                          mlib_s32       dsize,
-                                          mlib_s32       cmask)
-{
-  mlib_s16 *sa, *da;
-  mlib_s16 *dend, *dend2;                             /* end points in dst */
-  mlib_d64 *dp;                                       /* 8-byte aligned start points in dst */
-  mlib_d64 *sp;                                       /* 8-byte aligned start point in src */
-  mlib_d64 sd0, sd1, sd2, sd3;                        /* 8-byte source data */
-  mlib_d64 sda, sdb, sdc;
-  mlib_d64 dd0, dd1;
-  mlib_s32 soff;                                      /* offset of address in src */
-  mlib_s32 doff;                                      /* offset of address in dst */
-  mlib_s32 off;                                       /* offset of dst over src */
-  mlib_s32 emask;                                     /* edge mask */
-  mlib_s32 i, n;
-
-  sa = (void *)src;
-  da = dst;
-
-  /* prepare the source address */
-  sp = (mlib_d64 *) ((mlib_addr) sa & (~7));
-  soff = ((mlib_addr) sa & 7);
-
-  /* prepare the destination addresses */
-  dp = (mlib_d64 *) ((mlib_addr) da & (~7));
-  doff = ((mlib_addr) da & 7);
-  dend = da + dsize - 1;
-  dend2 = dend - 3;
-
-  /* calculate the src's offset over dst */
-  if (cmask == 2) {
-    off = (soff / 4) * 2 - doff;
-  }
-  else {
-    off = ((soff + 3) / 4) * 2 - doff;
-  }
-
-  if (((cmask == 2) && (soff % 4 == 0)) || ((cmask == 1) && (soff % 4 != 0))) { /* extract even words */
-
-    if (off == 0) {                         /* src and dst have same alignment */
-
-      /* generate edge mask for the start point */
-      emask = vis_edge16(da, dend);
-
-      /* load 16 bytes */
-      sd0 = *sp++;
-      sd1 = *sp++;
-
-      /* extract, including some garbage at the start point */
-      CHANNELEXTRACT_S16_21L(sd0, sd1, dd0);
-
-      /* store 8 bytes result */
-      vis_pst_16(dd0, dp++, emask);
-
-      if ((mlib_addr) dp <= (mlib_addr) dend2) {
-        n = ((mlib_u8 *) dend2 - (mlib_u8 *) dp) / 8 + 1;
-
-        /* 8-pixel column loop, emask not needed */
-#pragma pipeloop(0)
-        for (i = 0; i < n; i++) {
-          sd0 = *sp++;
-          sd1 = *sp++;
-          CHANNELEXTRACT_S16_21L(sd0, sd1, dd0);
-          *dp++ = dd0;
-        }
-      }
-
-      /* end point handling */
-      if ((mlib_addr) dp <= (mlib_addr) dend) {
-        emask = vis_edge16(dp, dend);
-        sd0 = *sp++;
-        sd1 = *sp++;
-        CHANNELEXTRACT_S16_21L(sd0, sd1, dd0);
-        vis_pst_16(dd0, dp++, emask);
-      }
-    }
-    else {
-      vis_alignaddr((void *)0, off);
-
-      /* generate edge mask for the start point */
-      emask = vis_edge16(da, dend);
-
-      if (off < 0) {
-        /* load 16 bytes */
-        sd2 = *sp++;
-        sd3 = *sp++;
-
-        /* extract and store 8 bytes */
-        CHANNELEXTRACT_S16_21L(sd2, sd3, dd1);
-        vis_pst_16(vis_faligndata(dd1, dd1), dp++, emask);
-      }
-      else {
-        /* load 32 bytes */
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        sd3 = *sp++;
-
-        /* extract and store 8 bytes */
-        CHANNELEXTRACT_S16_21L(sd0, sd1, dd0);
-        CHANNELEXTRACT_S16_21L(sd2, sd3, dd1);
-        vis_pst_16(vis_faligndata(dd0, dd1), dp++, emask);
-      }
-
-      if ((mlib_addr) dp <= (mlib_addr) dend2) {
-        n = ((mlib_u8 *) dend2 - (mlib_u8 *) dp) / 8 + 1;
-
-        /* 8-pixel column loop, emask not needed */
-#pragma pipeloop(0)
-        for (i = 0; i < n; i++) {
-          dd0 = dd1;
-          sd2 = *sp++;
-          sd3 = *sp++;
-          CHANNELEXTRACT_S16_21L(sd2, sd3, dd1);
-          *dp++ = vis_faligndata(dd0, dd1);
-        }
-      }
-
-      /* end point handling */
-      if ((mlib_addr) dp <= (mlib_addr) dend) {
-        emask = vis_edge16(dp, dend);
-        dd0 = dd1;
-        sd2 = *sp++;
-        sd3 = *sp++;
-        CHANNELEXTRACT_S16_21L(sd2, sd3, dd1);
-        vis_pst_16(vis_faligndata(dd0, dd1), dp++, emask);
-      }
-    }
-  }
-  else {                                    /* extract odd words */
-
-    if (off == 0) {                         /* src and dst have same alignment */
-
-      /* generate edge mask for the start point */
-      emask = vis_edge16(da, dend);
-
-      /* load 16 bytes, don't care the garbage at the start point */
-      sd0 = *sp++;
-      sd1 = *sp++;
-
-      /* extract and store 8 bytes */
-      CHANNELEXTRACT_S16_21R(sd0, sd1, dd0);
-      vis_pst_16(dd0, dp++, emask);
-
-      if ((mlib_addr) dp <= (mlib_addr) dend2) {
-        n = ((mlib_u8 *) dend2 - (mlib_u8 *) dp) / 8 + 1;
-
-        /* 8-pixel column loop, emask not needed */
-#pragma pipeloop(0)
-        for (i = 0; i < n; i++) {
-          sd0 = *sp++;
-          sd1 = *sp++;
-          CHANNELEXTRACT_S16_21R(sd0, sd1, dd0);
-          *dp++ = dd0;
-        }
-      }
-
-      /* end point handling */
-      if ((mlib_addr) dp <= (mlib_addr) dend) {
-        emask = vis_edge16(dp, dend);
-        sd0 = *sp++;
-        sd1 = *sp++;
-        CHANNELEXTRACT_S16_21R(sd0, sd1, dd0);
-        vis_pst_16(dd0, dp++, emask);
-      }
-    }
-    else {
-      vis_alignaddr((void *)0, off);
-
-      /* generate edge mask for the start point */
-      emask = vis_edge16(da, dend);
-
-      if (off < 0) {
-        /* load 16 bytes */
-        sd2 = *sp++;
-        sd3 = *sp++;
-
-        /* extract and store 8 bytes */
-        CHANNELEXTRACT_S16_21R(sd2, sd3, dd1);
-        vis_pst_16(vis_faligndata(dd1, dd1), dp++, emask);
-      }
-      else {
-        /* load 32 bytes */
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        sd3 = *sp++;
-
-        /* extract and store 8 bytes */
-        CHANNELEXTRACT_S16_21R(sd0, sd1, dd0);
-        CHANNELEXTRACT_S16_21R(sd2, sd3, dd1);
-        vis_pst_16(vis_faligndata(dd0, dd1), dp++, emask);
-      }
-
-      if ((mlib_addr) dp <= (mlib_addr) dend2) {
-        n = ((mlib_u8 *) dend2 - (mlib_u8 *) dp) / 8 + 1;
-
-        /* 8-pixel column loop, emask not needed */
-#pragma pipeloop(0)
-        for (i = 0; i < n; i++) {
-          dd0 = dd1;
-          sd2 = *sp++;
-          sd3 = *sp++;
-          CHANNELEXTRACT_S16_21R(sd2, sd3, dd1);
-          *dp++ = vis_faligndata(dd0, dd1);
-        }
-      }
-
-      /* end point handling */
-      if ((mlib_addr) dp <= (mlib_addr) dend) {
-        emask = vis_edge16(dp, dend);
-        dd0 = dd1;
-        sd2 = *sp++;
-        sd3 = *sp++;
-        CHANNELEXTRACT_S16_21R(sd2, sd3, dd1);
-        vis_pst_16(vis_faligndata(dd0, dd1), dp++, emask);
-      }
-    }
-  }
-}
-
-/***************************************************************/
-void mlib_v_ImageChannelExtract_S16_21(const mlib_s16 *src,
-                                       mlib_s32       slb,
-                                       mlib_s16       *dst,
-                                       mlib_s32       dlb,
-                                       mlib_s32       xsize,
-                                       mlib_s32       ysize,
-                                       mlib_s32       cmask)
-{
-  mlib_s16 *sa, *da;
-  mlib_s16 *sl, *dl;
-  mlib_s32 j;
-
-  sa = sl = (void *)src;
-  da = dl = dst;
-
-  for (j = 0; j < ysize; j++) {
-    mlib_v_ImageChannelExtract_S16_21_D1(sa, da, xsize, cmask);
-    sa = sl = (mlib_s16 *) ((mlib_u8 *) sl + slb);
-    da = dl = (mlib_s16 *) ((mlib_u8 *) dl + dlb);
-  }
-}
-
-/***************************************************************/
-#define CHANNELEXTRACT_S16_31L(sd0, sd1, sd2, dd)               \
-  /* extract the left channel */                                \
-  sda = vis_fpmerge(vis_read_hi(sd0), vis_read_lo(sd1));        \
-  sdb = vis_fpmerge(vis_read_lo(sd0), vis_read_hi(sd2));        \
-  sdc = vis_fpmerge(vis_read_hi(sda), vis_read_lo(sdb));        \
-  dd  = vis_fpmerge(vis_read_hi(sdc), vis_read_lo(sdc))
-
-/***************************************************************/
-#define CHANNELEXTRACT_S16_31M(sd0, sd1, sd2, dd)               \
-  /* extract the middle channel */                              \
-  sda = vis_fpmerge(vis_read_hi(sd0), vis_read_lo(sd1));        \
-  sdb = vis_fpmerge(vis_read_hi(sd1), vis_read_lo(sd2));        \
-  sdc = vis_fpmerge(vis_read_lo(sda), vis_read_hi(sdb));        \
-  dd  = vis_fpmerge(vis_read_hi(sdc), vis_read_lo(sdc))
-
-/***************************************************************/
-#define CHANNELEXTRACT_S16_31R(sd0, sd1, sd2, dd)               \
-  /* extract the right channel */                               \
-  sda = vis_fpmerge(vis_read_lo(sd0), vis_read_hi(sd2));        \
-  sdb = vis_fpmerge(vis_read_hi(sd1), vis_read_lo(sd2));        \
-  sdc = vis_fpmerge(vis_read_hi(sda), vis_read_lo(sdb));        \
-  dd  = vis_fpmerge(vis_read_hi(sdc), vis_read_lo(sdc))
-
-/***************************************************************/
-void mlib_v_ImageChannelExtract_S16_31_A8D1X4(const mlib_s16 *src,
-                                              mlib_s16       *dst,
-                                              mlib_s32       dsize,
-                                              mlib_s32       cmask)
-{
-  mlib_d64 *sp, *dp;
-  mlib_d64 sd0, sd1, sd2;
-  mlib_d64 sda, sdb, sdc;
-  mlib_d64 dd;
-  mlib_s32 i;
-
-  sp = (mlib_d64 *) src;
-  dp = (mlib_d64 *) dst;
-
-  if (cmask == 4) {
-#pragma pipeloop(0)
-    for (i = 0; i < dsize / 4; i++) {
-      sd0 = *sp++;
-      sd1 = *sp++;
-      sd2 = *sp++;
-      CHANNELEXTRACT_S16_31L(sd0, sd1, sd2, dd);
-      *dp++ = dd;
-    }
-  }
-  else if (cmask == 2) {
-#pragma pipeloop(0)
-    for (i = 0; i < dsize / 4; i++) {
-      sd0 = *sp++;
-      sd1 = *sp++;
-      sd2 = *sp++;
-      CHANNELEXTRACT_S16_31M(sd0, sd1, sd2, dd);
-      *dp++ = dd;
-    }
-  }
-  else {
-#pragma pipeloop(0)
-    for (i = 0; i < dsize / 4; i++) {
-      sd0 = *sp++;
-      sd1 = *sp++;
-      sd2 = *sp++;
-      CHANNELEXTRACT_S16_31R(sd0, sd1, sd2, dd);
-      *dp++ = dd;
-    }
-  }
-}
-
-/***************************************************************/
-void mlib_v_ImageChannelExtract_S16_31_A8D2X4(const mlib_s16 *src,
-                                              mlib_s32       slb,
-                                              mlib_s16       *dst,
-                                              mlib_s32       dlb,
-                                              mlib_s32       xsize,
-                                              mlib_s32       ysize,
-                                              mlib_s32       cmask)
-{
-  mlib_d64 *sp, *dp;
-  mlib_d64 *sl, *dl;
-  mlib_d64 sd0, sd1, sd2;
-  mlib_d64 sda, sdb, sdc;
-  mlib_d64 dd;
-  mlib_s32 i, j;
-
-  sp = sl = (mlib_d64 *) src;
-  dp = dl = (mlib_d64 *) dst;
-
-  if (cmask == 4) {
-    for (j = 0; j < ysize; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < xsize / 4; i++) {
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        CHANNELEXTRACT_S16_31L(sd0, sd1, sd2, dd);
-        *dp++ = dd;
-      }
-
-      sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-      dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-    }
-  }
-  else if (cmask == 2) {
-    for (j = 0; j < ysize; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < xsize / 4; i++) {
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        CHANNELEXTRACT_S16_31M(sd0, sd1, sd2, dd);
-        *dp++ = dd;
-      }
-
-      sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-      dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-    }
-  }
-  else {
-    for (j = 0; j < ysize; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < xsize / 4; i++) {
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        CHANNELEXTRACT_S16_31R(sd0, sd1, sd2, dd);
-        *dp++ = dd;
-      }
-
-      sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-      dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-    }
-  }
-}
-
-/***************************************************************/
-void mlib_v_ImageChannelExtract_S16_31_D1(const mlib_s16 *src,
-                                          mlib_s16       *dst,
-                                          mlib_s32       dsize,
-                                          mlib_s32       cmask)
-{
-  mlib_s16 *sa, *da;
-  mlib_s16 *dend, *dend2;                             /* end points in dst */
-  mlib_d64 *dp;                                       /* 8-byte aligned start points in dst */
-  mlib_d64 *sp;                                       /* 8-byte aligned start point in src */
-  mlib_d64 sd0, sd1, sd2;                             /* 8-byte source data */
-  mlib_d64 sd3, sd4, sd5;
-  mlib_d64 sda, sdb, sdc;
-  mlib_d64 dd0, dd1;
-  mlib_s32 soff;                                      /* offset of address in src */
-  mlib_s32 doff;                                      /* offset of address in dst */
-  mlib_s32 off;                                       /* offset of src over dst */
-  mlib_s32 emask;                                     /* edge mask */
-  mlib_s32 i, n;
-
-  sa = (void *)src;
-  da = dst;
-
-  /* prepare the source address */
-  sp = (mlib_d64 *) ((mlib_addr) sa & (~7));
-  soff = ((mlib_addr) sa & 7);
-
-  /* prepare the destination addresses */
-  dp = (mlib_d64 *) ((mlib_addr) da & (~7));
-  doff = ((mlib_addr) da & 7);
-  dend = da + dsize - 1;
-  dend2 = dend - 3;
-
-  /* calculate the src's offset over dst */
-  if (cmask == 4) {
-    off = (soff / 6) * 2 - doff;
-  }
-  else if (cmask == 2) {
-    off = ((soff + 2) / 6) * 2 - doff;
-  }
-  else {
-    off = ((soff + 4) / 6) * 2 - doff;
-  }
-
-  if (((cmask == 4) && (soff % 6 == 0)) ||
-      ((cmask == 2) && (soff % 6 == 4)) ||
-      ((cmask == 1) && (soff % 6 == 2))) { /* extract left channel */
-
-    if (off == 0) {                         /* src and dst have same alignment */
-
-      /* generate edge mask for the start point */
-      emask = vis_edge16(da, dend);
-
-      /* load 16 bytes */
-      sd0 = *sp++;
-      sd1 = *sp++;
-      sd2 = *sp++;
-
-      /* extract, including some garbage at the start point */
-      CHANNELEXTRACT_S16_31L(sd0, sd1, sd2, dd0);
-
-      /* store 8 bytes result */
-      vis_pst_16(dd0, dp++, emask);
-
-      if ((mlib_addr) dp <= (mlib_addr) dend2) {
-        n = ((mlib_u8 *) dend2 - (mlib_u8 *) dp) / 8 + 1;
-
-        /* 8-pixel column loop, emask not needed */
-#pragma pipeloop(0)
-        for (i = 0; i < n; i++) {
-          sd0 = *sp++;
-          sd1 = *sp++;
-          sd2 = *sp++;
-          CHANNELEXTRACT_S16_31L(sd0, sd1, sd2, dd0);
-          *dp++ = dd0;
-        }
-      }
-
-      /* end point handling */
-      if ((mlib_addr) dp <= (mlib_addr) dend) {
-        emask = vis_edge16(dp, dend);
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        CHANNELEXTRACT_S16_31L(sd0, sd1, sd2, dd0);
-        vis_pst_16(dd0, dp++, emask);
-      }
-    }
-    else {
-      vis_alignaddr((void *)0, off);
-
-      /* generate edge mask for the start point */
-      emask = vis_edge16(da, dend);
-
-      if (off < 0) {
-        /* load 24 bytes */
-        sd3 = *sp++;
-        sd4 = *sp++;
-        sd5 = *sp++;
-
-        /* extract and store 8 bytes */
-        CHANNELEXTRACT_S16_31L(sd3, sd4, sd5, dd1);
-        vis_pst_16(vis_faligndata(dd1, dd1), dp++, emask);
-      }
-      else {
-        /* load 48 bytes */
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        sd3 = *sp++;
-        sd4 = *sp++;
-        sd5 = *sp++;
-
-        /* extract and store 8 bytes */
-        CHANNELEXTRACT_S16_31L(sd0, sd1, sd2, dd0);
-        CHANNELEXTRACT_S16_31L(sd3, sd4, sd5, dd1);
-        vis_pst_16(vis_faligndata(dd0, dd1), dp++, emask);
-      }
-
-      if ((mlib_addr) dp <= (mlib_addr) dend2) {
-        n = ((mlib_u8 *) dend2 - (mlib_u8 *) dp) / 8 + 1;
-
-        /* 8-pixel column loop, emask not needed */
-#pragma pipeloop(0)
-        for (i = 0; i < n; i++) {
-          dd0 = dd1;
-          sd3 = *sp++;
-          sd4 = *sp++;
-          sd5 = *sp++;
-          CHANNELEXTRACT_S16_31L(sd3, sd4, sd5, dd1);
-          *dp++ = vis_faligndata(dd0, dd1);
-        }
-      }
-
-      /* end point handling */
-      if ((mlib_addr) dp <= (mlib_addr) dend) {
-        emask = vis_edge16(dp, dend);
-        dd0 = dd1;
-        sd3 = *sp++;
-        sd4 = *sp++;
-        sd5 = *sp++;
-        CHANNELEXTRACT_S16_31L(sd3, sd4, sd5, dd1);
-        vis_pst_16(vis_faligndata(dd0, dd1), dp++, emask);
-      }
-    }
-  }
-  else if (((cmask == 4) && (soff % 6 == 2)) ||
-           ((cmask == 2) && (soff % 6 == 0)) ||
-           ((cmask == 1) && (soff % 6 == 4))) {
-    /* extract middle channel */
-
-    if (off == 0) {                         /* src and dst have same alignment */
-
-      /* generate edge mask for the start point */
-      emask = vis_edge16(da, dend);
-
-      /* load 16 bytes */
-      sd0 = *sp++;
-      sd1 = *sp++;
-      sd2 = *sp++;
-
-      /* extract, including some garbage at the start point */
-      CHANNELEXTRACT_S16_31M(sd0, sd1, sd2, dd0);
-
-      /* store 8 bytes result */
-      vis_pst_16(dd0, dp++, emask);
-
-      if ((mlib_addr) dp <= (mlib_addr) dend2) {
-        n = ((mlib_u8 *) dend2 - (mlib_u8 *) dp) / 8 + 1;
-
-        /* 8-pixel column loop, emask not needed */
-#pragma pipeloop(0)
-        for (i = 0; i < n; i++) {
-          sd0 = *sp++;
-          sd1 = *sp++;
-          sd2 = *sp++;
-          CHANNELEXTRACT_S16_31M(sd0, sd1, sd2, dd0);
-          *dp++ = dd0;
-        }
-      }
-
-      /* end point handling */
-      if ((mlib_addr) dp <= (mlib_addr) dend) {
-        emask = vis_edge16(dp, dend);
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        CHANNELEXTRACT_S16_31M(sd0, sd1, sd2, dd0);
-        vis_pst_16(dd0, dp++, emask);
-      }
-    }
-    else {
-      vis_alignaddr((void *)0, off);
-
-      /* generate edge mask for the start point */
-      emask = vis_edge16(da, dend);
-
-      if (off < 0) {
-        /* load 24 bytes */
-        sd3 = *sp++;
-        sd4 = *sp++;
-        sd5 = *sp++;
-
-        /* extract and store 8 bytes */
-        CHANNELEXTRACT_S16_31M(sd3, sd4, sd5, dd1);
-        vis_pst_16(vis_faligndata(dd1, dd1), dp++, emask);
-      }
-      else {
-        /* load 48 bytes */
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        sd3 = *sp++;
-        sd4 = *sp++;
-        sd5 = *sp++;
-
-        /* extract and store 8 bytes */
-        CHANNELEXTRACT_S16_31M(sd0, sd1, sd2, dd0);
-        CHANNELEXTRACT_S16_31M(sd3, sd4, sd5, dd1);
-        vis_pst_16(vis_faligndata(dd0, dd1), dp++, emask);
-      }
-
-      if ((mlib_addr) dp <= (mlib_addr) dend2) {
-        n = ((mlib_u8 *) dend2 - (mlib_u8 *) dp) / 8 + 1;
-
-        /* 8-pixel column loop, emask not needed */
-#pragma pipeloop(0)
-        for (i = 0; i < n; i++) {
-          dd0 = dd1;
-          sd3 = *sp++;
-          sd4 = *sp++;
-          sd5 = *sp++;
-          CHANNELEXTRACT_S16_31M(sd3, sd4, sd5, dd1);
-          *dp++ = vis_faligndata(dd0, dd1);
-        }
-      }
-
-      /* end point handling */
-      if ((mlib_addr) dp <= (mlib_addr) dend) {
-        emask = vis_edge16(dp, dend);
-        dd0 = dd1;
-        sd3 = *sp++;
-        sd4 = *sp++;
-        sd5 = *sp++;
-        CHANNELEXTRACT_S16_31M(sd3, sd4, sd5, dd1);
-        vis_pst_16(vis_faligndata(dd0, dd1), dp++, emask);
-      }
-    }
-  }
-  else {                                    /* extract right channel */
-
-    if (off == 0) {                         /* src and dst have same alignment */
-
-      /* generate edge mask for the start point */
-      emask = vis_edge16(da, dend);
-
-      /* load 16 bytes */
-      sd0 = *sp++;
-      sd1 = *sp++;
-      sd2 = *sp++;
-
-      /* extract, including some garbage at the start point */
-      CHANNELEXTRACT_S16_31R(sd0, sd1, sd2, dd0);
-
-      /* store 8 bytes result */
-      vis_pst_16(dd0, dp++, emask);
-
-      if ((mlib_addr) dp <= (mlib_addr) dend2) {
-        n = ((mlib_u8 *) dend2 - (mlib_u8 *) dp) / 8 + 1;
-
-        /* 8-pixel column loop, emask not needed */
-#pragma pipeloop(0)
-        for (i = 0; i < n; i++) {
-          sd0 = *sp++;
-          sd1 = *sp++;
-          sd2 = *sp++;
-          CHANNELEXTRACT_S16_31R(sd0, sd1, sd2, dd0);
-          *dp++ = dd0;
-        }
-      }
-
-      /* end point handling */
-      if ((mlib_addr) dp <= (mlib_addr) dend) {
-        emask = vis_edge16(dp, dend);
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        CHANNELEXTRACT_S16_31R(sd0, sd1, sd2, dd0);
-        vis_pst_16(dd0, dp++, emask);
-      }
-    }
-    else {
-      vis_alignaddr((void *)0, off);
-
-      /* generate edge mask for the start point */
-      emask = vis_edge16(da, dend);
-
-      if (off < 0) {
-        /* load 24 bytes */
-        sd3 = *sp++;
-        sd4 = *sp++;
-        sd5 = *sp++;
-
-        /* extract and store 8 bytes */
-        CHANNELEXTRACT_S16_31R(sd3, sd4, sd5, dd1);
-        vis_pst_16(vis_faligndata(dd1, dd1), dp++, emask);
-      }
-      else {
-        /* load 48 bytes */
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        sd3 = *sp++;
-        sd4 = *sp++;
-        sd5 = *sp++;
-
-        /* extract and store 8 bytes */
-        CHANNELEXTRACT_S16_31R(sd0, sd1, sd2, dd0);
-        CHANNELEXTRACT_S16_31R(sd3, sd4, sd5, dd1);
-        vis_pst_16(vis_faligndata(dd0, dd1), dp++, emask);
-      }
-
-      if ((mlib_addr) dp <= (mlib_addr) dend2) {
-        n = ((mlib_u8 *) dend2 - (mlib_u8 *) dp) / 8 + 1;
-
-        /* 8-pixel column loop, emask not needed */
-#pragma pipeloop(0)
-        for (i = 0; i < n; i++) {
-          dd0 = dd1;
-          sd3 = *sp++;
-          sd4 = *sp++;
-          sd5 = *sp++;
-          CHANNELEXTRACT_S16_31R(sd3, sd4, sd5, dd1);
-          *dp++ = vis_faligndata(dd0, dd1);
-        }
-      }
-
-      /* end point handling */
-      if ((mlib_addr) dp <= (mlib_addr) dend) {
-        emask = vis_edge16(dp, dend);
-        dd0 = dd1;
-        sd3 = *sp++;
-        sd4 = *sp++;
-        sd5 = *sp++;
-        CHANNELEXTRACT_S16_31R(sd3, sd4, sd5, dd1);
-        vis_pst_16(vis_faligndata(dd0, dd1), dp++, emask);
-      }
-    }
-  }
-}
-
-/***************************************************************/
-void mlib_v_ImageChannelExtract_S16_31(const mlib_s16 *src,
-                                       mlib_s32       slb,
-                                       mlib_s16       *dst,
-                                       mlib_s32       dlb,
-                                       mlib_s32       xsize,
-                                       mlib_s32       ysize,
-                                       mlib_s32       cmask)
-{
-  mlib_s16 *sa, *da;
-  mlib_s16 *sl, *dl;
-  mlib_s32 j;
-
-  sa = sl = (void *)src;
-  da = dl = dst;
-
-  for (j = 0; j < ysize; j++) {
-    mlib_v_ImageChannelExtract_S16_31_D1(sa, da, xsize, cmask);
-    sa = sl = (mlib_s16 *) ((mlib_u8 *) sl + slb);
-    da = dl = (mlib_s16 *) ((mlib_u8 *) dl + dlb);
-  }
-}
-
-/***************************************************************/
-#define CHANNELEXTRACT_S16_41L(sd0, sd1,  sd2, sd3, dd)         \
-  /* extract the left channel */                                \
-  sda = vis_fpmerge(vis_read_hi(sd0), vis_read_hi(sd2));        \
-  sdb = vis_fpmerge(vis_read_hi(sd1), vis_read_hi(sd3));        \
-  sdc = vis_fpmerge(vis_read_hi(sda), vis_read_hi(sdb));        \
-  dd  = vis_fpmerge(vis_read_hi(sdc), vis_read_lo(sdc))
-
-/***************************************************************/
-#define CHANNELEXTRACT_S16_41ML(sd0, sd1, sd2, sd3, dd)         \
-  /* extract the middle left channel */                         \
-  sda = vis_fpmerge(vis_read_hi(sd0), vis_read_hi(sd2));        \
-  sdb = vis_fpmerge(vis_read_hi(sd1), vis_read_hi(sd3));        \
-  sdc = vis_fpmerge(vis_read_lo(sda), vis_read_lo(sdb));        \
-  dd  = vis_fpmerge(vis_read_hi(sdc), vis_read_lo(sdc))
-
-/***************************************************************/
-#define CHANNELEXTRACT_S16_41MR(sd0, sd1, sd2, sd3, dd)         \
-  /* extract the middle right channel */                        \
-  sda = vis_fpmerge(vis_read_lo(sd0), vis_read_lo(sd2));        \
-  sdb = vis_fpmerge(vis_read_lo(sd1), vis_read_lo(sd3));        \
-  sdc = vis_fpmerge(vis_read_hi(sda), vis_read_hi(sdb));        \
-  dd  = vis_fpmerge(vis_read_hi(sdc), vis_read_lo(sdc))
-
-/***************************************************************/
-#define CHANNELEXTRACT_S16_41R(sd0, sd1, sd2, sd3, dd)          \
-  /* extract the right channel */                               \
-  sda = vis_fpmerge(vis_read_lo(sd0), vis_read_lo(sd2));        \
-  sdb = vis_fpmerge(vis_read_lo(sd1), vis_read_lo(sd3));        \
-  sdc = vis_fpmerge(vis_read_lo(sda), vis_read_lo(sdb));        \
-  dd  = vis_fpmerge(vis_read_hi(sdc), vis_read_lo(sdc))
-
-/***************************************************************/
-void mlib_v_ImageChannelExtract_S16_41_A8D1X4(const mlib_s16 *src,
-                                              mlib_s16       *dst,
-                                              mlib_s32       dsize,
-                                              mlib_s32       cmask)
-{
-  mlib_d64 *sp, *dp;
-  mlib_d64 sd0, sd1, sd2, sd3;
-  mlib_d64 sda, sdb, sdc;
-  mlib_d64 dd;
-  mlib_s32 i;
-
-  sp = (mlib_d64 *) src;
-  dp = (mlib_d64 *) dst;
-
-  if (cmask == 8) {
-#pragma pipeloop(0)
-    for (i = 0; i < dsize / 4; i++) {
-      sd0 = *sp++;
-      sd1 = *sp++;
-      sd2 = *sp++;
-      sd3 = *sp++;
-      CHANNELEXTRACT_S16_41L(sd0, sd1, sd2, sd3, dd);
-      *dp++ = dd;
-    }
-  }
-  else if (cmask == 4) {
-#pragma pipeloop(0)
-    for (i = 0; i < dsize / 4; i++) {
-      sd0 = *sp++;
-      sd1 = *sp++;
-      sd2 = *sp++;
-      sd3 = *sp++;
-      CHANNELEXTRACT_S16_41ML(sd0, sd1, sd2, sd3, dd);
-      *dp++ = dd;
-    }
-  }
-  else if (cmask == 2) {
-#pragma pipeloop(0)
-    for (i = 0; i < dsize / 4; i++) {
-      sd0 = *sp++;
-      sd1 = *sp++;
-      sd2 = *sp++;
-      sd3 = *sp++;
-      CHANNELEXTRACT_S16_41MR(sd0, sd1, sd2, sd3, dd);
-      *dp++ = dd;
-    }
-  }
-  else {
-#pragma pipeloop(0)
-    for (i = 0; i < dsize / 4; i++) {
-      sd0 = *sp++;
-      sd1 = *sp++;
-      sd2 = *sp++;
-      sd3 = *sp++;
-      CHANNELEXTRACT_S16_41R(sd0, sd1, sd2, sd3, dd);
-      *dp++ = dd;
-    }
-  }
-}
-
-/***************************************************************/
-void mlib_v_ImageChannelExtract_S16_41_A8D2X4(const mlib_s16 *src,
-                                              mlib_s32       slb,
-                                              mlib_s16       *dst,
-                                              mlib_s32       dlb,
-                                              mlib_s32       xsize,
-                                              mlib_s32       ysize,
-                                              mlib_s32       cmask)
-{
-  mlib_d64 *sp, *dp;
-  mlib_d64 *sl, *dl;
-  mlib_d64 sd0, sd1, sd2, sd3;
-  mlib_d64 sda, sdb, sdc;
-  mlib_d64 dd;
-  mlib_s32 i, j;
-
-  sp = sl = (mlib_d64 *) src;
-  dp = dl = (mlib_d64 *) dst;
-
-  if (cmask == 8) {
-    for (j = 0; j < ysize; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < xsize / 4; i++) {
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        sd3 = *sp++;
-        CHANNELEXTRACT_S16_41L(sd0, sd1, sd2, sd3, dd);
-        *dp++ = dd;
-      }
-
-      sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-      dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-    }
-  }
-  else if (cmask == 4) {
-    for (j = 0; j < ysize; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < xsize / 4; i++) {
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        sd3 = *sp++;
-        CHANNELEXTRACT_S16_41ML(sd0, sd1, sd2, sd3, dd);
-        *dp++ = dd;
-      }
-
-      sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-      dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-    }
-  }
-  else if (cmask == 2) {
-    for (j = 0; j < ysize; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < xsize / 4; i++) {
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        sd3 = *sp++;
-        CHANNELEXTRACT_S16_41MR(sd0, sd1, sd2, sd3, dd);
-        *dp++ = dd;
-      }
-
-      sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-      dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-    }
-  }
-  else {
-    for (j = 0; j < ysize; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < xsize / 4; i++) {
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        sd3 = *sp++;
-        CHANNELEXTRACT_S16_41R(sd0, sd1, sd2, sd3, dd);
-        *dp++ = dd;
-      }
-
-      sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-      dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-    }
-  }
-}
-
-/***************************************************************/
-void mlib_v_ImageChannelExtract_S16_41_D1(const mlib_s16 *src,
-                                          mlib_s16       *dst,
-                                          mlib_s32       dsize,
-                                          mlib_s32       cmask)
-{
-  mlib_s16 *sa, *da;
-  mlib_s16 *dend, *dend2;                             /* end points in dst */
-  mlib_d64 *dp;                                       /* 8-byte aligned start points in dst */
-  mlib_d64 *sp;                                       /* 8-byte aligned start point in src */
-  mlib_d64 sd0, sd1, sd2, sd3;                        /* 8-byte source data */
-  mlib_d64 sd4, sd5, sd6, sd7;
-  mlib_d64 sda, sdb, sdc;
-  mlib_d64 dd0, dd1;
-  mlib_s32 soff;                                      /* offset of address in src */
-  mlib_s32 doff;                                      /* offset of address in dst */
-  mlib_s32 off;                                       /* offset of src over dst */
-  mlib_s32 emask;                                     /* edge mask */
-  mlib_s32 i, n;
-
-  sa = (void *)src;
-  da = dst;
-
-  /* prepare the source address */
-  sp = (mlib_d64 *) ((mlib_addr) sa & (~7));
-  soff = ((mlib_addr) sa & 7);
-
-  /* prepare the destination addresses */
-  dp = (mlib_d64 *) ((mlib_addr) da & (~7));
-  doff = ((mlib_addr) da & 7);
-  dend = da + dsize - 1;
-  dend2 = dend - 3;
-
-  /* calculate the src's offset over dst */
-  if (cmask == 8) {
-    off = (soff / 8) * 2 - doff;
-  }
-  else if (cmask == 4) {
-    off = ((soff + 2) / 8) * 2 - doff;
-  }
-  else if (cmask == 2) {
-    off = ((soff + 4) / 8) * 2 - doff;
-  }
-  else {
-    off = ((soff + 6) / 8) * 2 - doff;
-  }
-
-  if (((cmask == 8) && (soff == 0)) ||
-      ((cmask == 4) && (soff == 6)) ||
-      ((cmask == 2) && (soff == 4)) ||
-      ((cmask == 1) && (soff == 2))) { /* extract left channel */
-
-    if (off == 0) {                         /* src and dst have same alignment */
-
-      /* generate edge mask for the start point */
-      emask = vis_edge16(da, dend);
-
-      /* load 16 bytes */
-      sd0 = *sp++;
-      sd1 = *sp++;
-      sd2 = *sp++;
-      sd3 = *sp++;
-
-      /* extract, including some garbage at the start point */
-      CHANNELEXTRACT_S16_41L(sd0, sd1, sd2, sd3, dd0);
-
-      /* store 8 bytes result */
-      vis_pst_16(dd0, dp++, emask);
-
-      if ((mlib_addr) dp <= (mlib_addr) dend2) {
-        n = ((mlib_u8 *) dend2 - (mlib_u8 *) dp) / 8 + 1;
-
-        /* 8-pixel column loop, emask not needed */
-#pragma pipeloop(0)
-        for (i = 0; i < n; i++) {
-          sd0 = *sp++;
-          sd1 = *sp++;
-          sd2 = *sp++;
-          sd3 = *sp++;
-          CHANNELEXTRACT_S16_41L(sd0, sd1, sd2, sd3, dd0);
-          *dp++ = dd0;
-        }
-      }
-
-      /* end point handling */
-      if ((mlib_addr) dp <= (mlib_addr) dend) {
-        emask = vis_edge16(dp, dend);
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        sd3 = *sp++;
-        CHANNELEXTRACT_S16_41L(sd0, sd1, sd2, sd3, dd0);
-        vis_pst_16(dd0, dp++, emask);
-      }
-    }
-    else {
-      vis_alignaddr((void *)0, off);
-
-      /* generate edge mask for the start point */
-      emask = vis_edge16(da, dend);
-
-      if (off < 0) {
-        /* load 24 bytes */
-        sd4 = *sp++;
-        sd5 = *sp++;
-        sd6 = *sp++;
-        sd7 = *sp++;
-
-        /* extract and store 8 bytes */
-        CHANNELEXTRACT_S16_41L(sd4, sd5, sd6, sd7, dd1);
-        vis_pst_16(vis_faligndata(dd1, dd1), dp++, emask);
-      }
-      else {
-        /* load 48 bytes */
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        sd3 = *sp++;
-        sd4 = *sp++;
-        sd5 = *sp++;
-        sd6 = *sp++;
-        sd7 = *sp++;
-
-        /* extract and store 8 bytes */
-        CHANNELEXTRACT_S16_41L(sd0, sd1, sd2, sd3, dd0);
-        CHANNELEXTRACT_S16_41L(sd4, sd5, sd6, sd7, dd1);
-        vis_pst_16(vis_faligndata(dd0, dd1), dp++, emask);
-      }
-
-      if ((mlib_addr) dp <= (mlib_addr) dend2) {
-        n = ((mlib_u8 *) dend2 - (mlib_u8 *) dp) / 8 + 1;
-
-        /* 8-pixel column loop, emask not needed */
-#pragma pipeloop(0)
-        for (i = 0; i < n; i++) {
-          dd0 = dd1;
-          sd4 = *sp++;
-          sd5 = *sp++;
-          sd6 = *sp++;
-          sd7 = *sp++;
-          CHANNELEXTRACT_S16_41L(sd4, sd5, sd6, sd7, dd1);
-          *dp++ = vis_faligndata(dd0, dd1);
-        }
-      }
-
-      /* end point handling */
-      if ((mlib_addr) dp <= (mlib_addr) dend) {
-        emask = vis_edge16(dp, dend);
-        dd0 = dd1;
-        sd4 = *sp++;
-        sd5 = *sp++;
-        sd6 = *sp++;
-        sd7 = *sp++;
-        CHANNELEXTRACT_S16_41L(sd4, sd5, sd6, sd7, dd1);
-        vis_pst_16(vis_faligndata(dd0, dd1), dp++, emask);
-      }
-    }
-  }
-  else if (((cmask == 8) && (soff == 2)) ||
-           ((cmask == 4) && (soff == 0)) ||
-           ((cmask == 2) && (soff == 6)) ||
-           ((cmask == 1) && (soff == 4))) { /* extract middle left channel */
-
-    if (off == 0) {                         /* src and dst have same alignment */
-
-      /* generate edge mask for the start point */
-      emask = vis_edge16(da, dend);
-
-      /* load 16 bytes */
-      sd0 = *sp++;
-      sd1 = *sp++;
-      sd2 = *sp++;
-      sd3 = *sp++;
-
-      /* extract, including some garbage at the start point */
-      CHANNELEXTRACT_S16_41ML(sd0, sd1, sd2, sd3, dd0);
-
-      /* store 8 bytes result */
-      vis_pst_16(dd0, dp++, emask);
-
-      if ((mlib_addr) dp <= (mlib_addr) dend2) {
-        n = ((mlib_u8 *) dend2 - (mlib_u8 *) dp) / 8 + 1;
-
-        /* 8-pixel column loop, emask not needed */
-#pragma pipeloop(0)
-        for (i = 0; i < n; i++) {
-          sd0 = *sp++;
-          sd1 = *sp++;
-          sd2 = *sp++;
-          sd3 = *sp++;
-          CHANNELEXTRACT_S16_41ML(sd0, sd1, sd2, sd3, dd0);
-          *dp++ = dd0;
-        }
-      }
-
-      /* end point handling */
-      if ((mlib_addr) dp <= (mlib_addr) dend) {
-        emask = vis_edge16(dp, dend);
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        sd3 = *sp++;
-        CHANNELEXTRACT_S16_41ML(sd0, sd1, sd2, sd3, dd0);
-        vis_pst_16(dd0, dp++, emask);
-      }
-    }
-    else {
-      vis_alignaddr((void *)0, off);
-
-      /* generate edge mask for the start point */
-      emask = vis_edge16(da, dend);
-
-      if (off < 0) {
-        /* load 24 bytes */
-        sd4 = *sp++;
-        sd5 = *sp++;
-        sd6 = *sp++;
-        sd7 = *sp++;
-
-        /* extract and store 8 bytes */
-        CHANNELEXTRACT_S16_41ML(sd4, sd5, sd6, sd7, dd1);
-        vis_pst_16(vis_faligndata(dd1, dd1), dp++, emask);
-      }
-      else {
-        /* load 48 bytes */
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        sd3 = *sp++;
-        sd4 = *sp++;
-        sd5 = *sp++;
-        sd6 = *sp++;
-        sd7 = *sp++;
-
-        /* extract and store 8 bytes */
-        CHANNELEXTRACT_S16_41ML(sd0, sd1, sd2, sd3, dd0);
-        CHANNELEXTRACT_S16_41ML(sd4, sd5, sd6, sd7, dd1);
-        vis_pst_16(vis_faligndata(dd0, dd1), dp++, emask);
-      }
-
-      if ((mlib_addr) dp <= (mlib_addr) dend2) {
-        n = ((mlib_u8 *) dend2 - (mlib_u8 *) dp) / 8 + 1;
-
-        /* 8-pixel column loop, emask not needed */
-#pragma pipeloop(0)
-        for (i = 0; i < n; i++) {
-          dd0 = dd1;
-          sd4 = *sp++;
-          sd5 = *sp++;
-          sd6 = *sp++;
-          sd7 = *sp++;
-          CHANNELEXTRACT_S16_41ML(sd4, sd5, sd6, sd7, dd1);
-          *dp++ = vis_faligndata(dd0, dd1);
-        }
-      }
-
-      /* end point handling */
-      if ((mlib_addr) dp <= (mlib_addr) dend) {
-        emask = vis_edge16(dp, dend);
-        dd0 = dd1;
-        sd4 = *sp++;
-        sd5 = *sp++;
-        sd6 = *sp++;
-        sd7 = *sp++;
-        CHANNELEXTRACT_S16_41ML(sd4, sd5, sd6, sd7, dd1);
-        vis_pst_16(vis_faligndata(dd0, dd1), dp++, emask);
-      }
-    }
-  }
-  else if (((cmask == 8) && (soff == 4)) ||
-           ((cmask == 4) && (soff == 2)) ||
-           ((cmask == 2) && (soff == 0)) ||
-           ((cmask == 1) && (soff == 6))) { /* extract middle right channel */
-
-    if (off == 0) {                         /* src and dst have same alignment */
-
-      /* generate edge mask for the start point */
-      emask = vis_edge16(da, dend);
-
-      /* load 16 bytes */
-      sd0 = *sp++;
-      sd1 = *sp++;
-      sd2 = *sp++;
-      sd3 = *sp++;
-
-      /* extract, including some garbage at the start point */
-      CHANNELEXTRACT_S16_41MR(sd0, sd1, sd2, sd3, dd0);
-
-      /* store 8 bytes result */
-      vis_pst_16(dd0, dp++, emask);
-
-      if ((mlib_addr) dp <= (mlib_addr) dend2) {
-        n = ((mlib_u8 *) dend2 - (mlib_u8 *) dp) / 8 + 1;
-
-        /* 8-pixel column loop, emask not needed */
-#pragma pipeloop(0)
-        for (i = 0; i < n; i++) {
-          sd0 = *sp++;
-          sd1 = *sp++;
-          sd2 = *sp++;
-          sd3 = *sp++;
-          CHANNELEXTRACT_S16_41MR(sd0, sd1, sd2, sd3, dd0);
-          *dp++ = dd0;
-        }
-      }
-
-      /* end point handling */
-      if ((mlib_addr) dp <= (mlib_addr) dend) {
-        emask = vis_edge16(dp, dend);
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        sd3 = *sp++;
-        CHANNELEXTRACT_S16_41MR(sd0, sd1, sd2, sd3, dd0);
-        vis_pst_16(dd0, dp++, emask);
-      }
-    }
-    else {
-      vis_alignaddr((void *)0, off);
-
-      /* generate edge mask for the start point */
-      emask = vis_edge16(da, dend);
-
-      if (off < 0) {
-        /* load 24 bytes */
-        sd4 = *sp++;
-        sd5 = *sp++;
-        sd6 = *sp++;
-        sd7 = *sp++;
-
-        /* extract and store 8 bytes */
-        CHANNELEXTRACT_S16_41MR(sd4, sd5, sd6, sd7, dd1);
-        vis_pst_16(vis_faligndata(dd1, dd1), dp++, emask);
-      }
-      else {
-        /* load 48 bytes */
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        sd3 = *sp++;
-        sd4 = *sp++;
-        sd5 = *sp++;
-        sd6 = *sp++;
-        sd7 = *sp++;
-
-        /* extract and store 8 bytes */
-        CHANNELEXTRACT_S16_41MR(sd0, sd1, sd2, sd3, dd0);
-        CHANNELEXTRACT_S16_41MR(sd4, sd5, sd6, sd7, dd1);
-        vis_pst_16(vis_faligndata(dd0, dd1), dp++, emask);
-      }
-
-      if ((mlib_addr) dp <= (mlib_addr) dend2) {
-        n = ((mlib_u8 *) dend2 - (mlib_u8 *) dp) / 8 + 1;
-
-        /* 8-pixel column loop, emask not needed */
-#pragma pipeloop(0)
-        for (i = 0; i < n; i++) {
-          dd0 = dd1;
-          sd4 = *sp++;
-          sd5 = *sp++;
-          sd6 = *sp++;
-          sd7 = *sp++;
-          CHANNELEXTRACT_S16_41MR(sd4, sd5, sd6, sd7, dd1);
-          *dp++ = vis_faligndata(dd0, dd1);
-        }
-      }
-
-      /* end point handling */
-      if ((mlib_addr) dp <= (mlib_addr) dend) {
-        emask = vis_edge16(dp, dend);
-        dd0 = dd1;
-        sd4 = *sp++;
-        sd5 = *sp++;
-        sd6 = *sp++;
-        sd7 = *sp++;
-        CHANNELEXTRACT_S16_41MR(sd4, sd5, sd6, sd7, dd1);
-        vis_pst_16(vis_faligndata(dd0, dd1), dp++, emask);
-      }
-    }
-  }
-  else {                                    /* extract right channel */
-    if (off == 0) {                         /* src and dst have same alignment */
-
-      /* generate edge mask for the start point */
-      emask = vis_edge16(da, dend);
-
-      /* load 16 bytes */
-      sd0 = *sp++;
-      sd1 = *sp++;
-      sd2 = *sp++;
-      sd3 = *sp++;
-
-      /* extract, including some garbage at the start point */
-      CHANNELEXTRACT_S16_41R(sd0, sd1, sd2, sd3, dd0);
-
-      /* store 8 bytes result */
-      vis_pst_16(dd0, dp++, emask);
-
-      if ((mlib_addr) dp <= (mlib_addr) dend2) {
-        n = ((mlib_u8 *) dend2 - (mlib_u8 *) dp) / 8 + 1;
-
-        /* 8-pixel column loop, emask not needed */
-#pragma pipeloop(0)
-        for (i = 0; i < n; i++) {
-          sd0 = *sp++;
-          sd1 = *sp++;
-          sd2 = *sp++;
-          sd3 = *sp++;
-          CHANNELEXTRACT_S16_41R(sd0, sd1, sd2, sd3, dd0);
-          *dp++ = dd0;
-        }
-      }
-
-      /* end point handling */
-      if ((mlib_addr) dp <= (mlib_addr) dend) {
-        emask = vis_edge16(dp, dend);
-        sd0 = *sp++;
-        sd1 = *sp++;
-        sd2 = *sp++;
-        sd3 = *sp++;
-        CHANNELEXTRACT_S16_41R(sd0, sd1, sd2, sd3, dd0);
-        vis_pst_16(dd0, dp++, emask);
-      }
-    }
-    else {
-      vis_alignaddr((void *)0, off);
-
-      /* generate edge mask for the start point */
-      emask = vis_edge16(da, dend);
-
-      if (off < 0) {
-        /* load 24 bytes */
-        sd4 = *sp++;
-        sd5 = *sp++;
-        sd6 = *sp++;
-        sd7 = *sp++;
-
-        /* extract and store 8 bytes */
-        CHANNELEXTRACT_S16_41R(sd4, sd5, sd6, sd7, dd1);
-        vis_pst_16(vis_faligndata(dd1, dd1), dp++, emask);
-      }
-
-      if ((mlib_addr) dp <= (mlib_addr) dend2) {
-        n = ((mlib_u8 *) dend2 - (mlib_u8 *) dp) / 8 + 1;
-
-        /* 8-pixel column loop, emask not needed */
-#pragma pipeloop(0)
-        for (i = 0; i < n; i++) {
-          dd0 = dd1;
-          sd4 = *sp++;
-          sd5 = *sp++;
-          sd6 = *sp++;
-          sd7 = *sp++;
-          CHANNELEXTRACT_S16_41R(sd4, sd5, sd6, sd7, dd1);
-          *dp++ = vis_faligndata(dd0, dd1);
-        }
-      }
-
-      /* end point handling */
-      if ((mlib_addr) dp <= (mlib_addr) dend) {
-        emask = vis_edge16(dp, dend);
-        dd0 = dd1;
-        sd4 = *sp++;
-        sd5 = *sp++;
-        sd6 = *sp++;
-        sd7 = *sp++;
-        CHANNELEXTRACT_S16_41R(sd4, sd5, sd6, sd7, dd1);
-        vis_pst_16(vis_faligndata(dd0, dd1), dp++, emask);
-      }
-    }
-  }
-}
-
-/***************************************************************/
-void mlib_v_ImageChannelExtract_S16_41(const mlib_s16 *src,
-                                       mlib_s32       slb,
-                                       mlib_s16       *dst,
-                                       mlib_s32       dlb,
-                                       mlib_s32       xsize,
-                                       mlib_s32       ysize,
-                                       mlib_s32       cmask)
-{
-  mlib_s16 *sa, *da;
-  mlib_s16 *sl, *dl;
-  mlib_s32 j;
-
-  sa = sl = (void *)src;
-  da = dl = dst;
-  for (j = 0; j < ysize; j++) {
-    mlib_v_ImageChannelExtract_S16_41_D1(sa, da, xsize, cmask);
-    sa = sl = (mlib_s16 *) ((mlib_u8 *) sl + slb);
-    da = dl = (mlib_s16 *) ((mlib_u8 *) dl + dlb);
-  }
-}
-
-/***************************************************************/
diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_43.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_43.c
index cf6ec42372e..9924a29c73c 100644
--- a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_43.c
+++ b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_43.c
@@ -29,22 +29,8 @@
  * FILENAME: mlib_v_ImageChannelExtract_43.c
  *
  * FUNCTIONS
- *      mlib_v_ImageChannelExtract_U8_43R_A8D1X8
- *      mlib_v_ImageChannelExtract_U8_43R_A8D2X8
- *      mlib_v_ImageChannelExtract_U8_43R_D1
- *      mlib_v_ImageChannelExtract_U8_43R
- *      mlib_v_ImageChannelExtract_S16_43R_A8D1X4
- *      mlib_v_ImageChannelExtract_S16_43R_A8D2X4
- *      mlib_v_ImageChannelExtract_S16_43R_D1
- *      mlib_v_ImageChannelExtract_S16_43R
- *      mlib_v_ImageChannelExtract_U8_43L_A8D1X8
- *      mlib_v_ImageChannelExtract_U8_43L_A8D2X8
  *      mlib_v_ImageChannelExtract_U8_43L_D1
- *      mlib_v_ImageChannelExtract_U8_43L
- *      mlib_v_ImageChannelExtract_S16_43L_A8D1X4
- *      mlib_v_ImageChannelExtract_S16_43L_A8D2X4
  *      mlib_v_ImageChannelExtract_S16_43L_D1
- *      mlib_v_ImageChannelExtract_S16_43L
  *
  * SYNOPSIS
  *
@@ -73,705 +59,6 @@
 #include "mlib_image.h"
 #include "mlib_v_ImageChannelExtract.h"
 
-/***************************************************************/
-#define EXTRACT_U8_43R_old          /* shift right */           \
-  dd2 = vis_faligndata(sd3, dd2);    /* r7-------------- */     \
-  sd3 = vis_faligndata(sd3, sd3);                               \
-  dd2 = vis_faligndata(sd3, dd2);    /* g7r7------------ */     \
-  sd3 = vis_faligndata(sd3, sd3);                               \
-  dd2 = vis_faligndata(sd3, dd2);    /* b7g7r7---------- */     \
-  sd3 = vis_faligndata(sd3, sd3);                               \
-  sd3 = vis_faligndata(sd3, sd3);                               \
-  dd2 = vis_faligndata(sd3, dd2);    /* r6b7g7r7-------- */     \
-  sd3 = vis_faligndata(sd3, sd3);                               \
-  dd2 = vis_faligndata(sd3, dd2);    /* g6r6b7g7r7------ */     \
-  sd3 = vis_faligndata(sd3, sd3);                               \
-  dd2 = vis_faligndata(sd3, dd2);    /* b6g6r6b7g7r7---- */     \
-                                                                \
-  dd2 = vis_faligndata(sd2, dd2);    /* r5b6g6r6b7g7r7-- */     \
-  sd2 = vis_faligndata(sd2, sd2);                               \
-  dd2 = vis_faligndata(sd2, dd2);    /* g5r5b6g6r6b7g7r7 */     \
-                                                                \
-  sd2 = vis_faligndata(sd2, sd2);                               \
-  dd1 = vis_faligndata(sd2, dd1);    /* b5-------------- */     \
-  sd2 = vis_faligndata(sd2, sd2);                               \
-  sd2 = vis_faligndata(sd2, sd2);                               \
-  dd1 = vis_faligndata(sd2, dd1);    /* r4b5------------ */     \
-  sd2 = vis_faligndata(sd2, sd2);                               \
-  dd1 = vis_faligndata(sd2, dd1);    /* g4r4b5---------- */     \
-  sd2 = vis_faligndata(sd2, sd2);                               \
-  dd1 = vis_faligndata(sd2, dd1);    /* b4g4r4b5-------- */     \
-                                                                \
-  dd1 = vis_faligndata(sd1, dd1);    /* r3b4g4r4b5------ */     \
-  sd1 = vis_faligndata(sd1, sd1);                               \
-  dd1 = vis_faligndata(sd1, dd1);    /* g3r3b4g4r4b5---- */     \
-  sd1 = vis_faligndata(sd1, sd1);                               \
-  dd1 = vis_faligndata(sd1, dd1);    /* b3g3r3b4g4r4b5-- */     \
-  sd1 = vis_faligndata(sd1, sd1);                               \
-  sd1 = vis_faligndata(sd1, sd1);                               \
-  dd1 = vis_faligndata(sd1, dd1);    /* r2b3g3r3b4g4r4b5 */     \
-                                                                \
-  sd1 = vis_faligndata(sd1, sd1);                               \
-  dd0 = vis_faligndata(sd1, dd0);    /* g2-------------- */     \
-  sd1 = vis_faligndata(sd1, sd1);                               \
-  dd0 = vis_faligndata(sd1, dd0);    /* b2g2------------ */     \
-                                                                \
-  dd0 = vis_faligndata(sd0, dd0);    /* r1b2g2---------- */     \
-  sd0 = vis_faligndata(sd0, sd0);                               \
-  dd0 = vis_faligndata(sd0, dd0);    /* g1r1b2g2-------- */     \
-  sd0 = vis_faligndata(sd0, sd0);                               \
-  dd0 = vis_faligndata(sd0, dd0);    /* b1g1r1b2g2------ */     \
-  sd0 = vis_faligndata(sd0, sd0);                               \
-  sd0 = vis_faligndata(sd0, sd0);                               \
-  dd0 = vis_faligndata(sd0, dd0);    /* r0b1g1r1b2g2---- */     \
-  sd0 = vis_faligndata(sd0, sd0);                               \
-  dd0 = vis_faligndata(sd0, dd0);    /* g0r0b1g1r1b2g2-- */     \
-  sd0 = vis_faligndata(sd0, sd0);                               \
-  dd0 = vis_faligndata(sd0, dd0);           /* b0g0r0b1g1r1b2g2 */
-
-/***************************************************************/
-#define EXTRACT_U8_43R              /* shift right */           \
-  vis_alignaddr((void *)0, 5);                                  \
-  dd2 = vis_faligndata(sd3, dd2);    /* b7g7r7---------- */     \
-  sda = vis_freg_pair(vis_read_hi(sd3), vis_read_hi(sd3));      \
-  dd2 = vis_faligndata(sda, dd2);    /* b6g6r6b7g7r7---- */     \
-                                                                \
-  vis_alignaddr((void *)0, 6);                                  \
-  dd2 = vis_faligndata(sd2, dd2);    /* g5r5b6g6r6b7g7r7 */     \
-                                                                \
-  vis_alignaddr((void *)0, 5);                                  \
-  dd1 = vis_faligndata(sd2, dd1);    /* b5g5r5---------- */     \
-  sda = vis_freg_pair(vis_read_hi(sd2), vis_read_hi(sd2));      \
-  dd1 = vis_faligndata(sda, dd1);    /* b4g4r4b5g5r5---- */     \
-  dd1 = vis_faligndata(sd1, dd1);    /* b3g3r3b4g4r4b5g5 */     \
-  sda = vis_freg_pair(vis_read_hi(sd1), vis_read_hi(sd1));      \
-  vis_alignaddr((void *)0, 7);                                  \
-  dd1 = vis_faligndata(sda, dd1);    /* r2b3g3r3b4g4r4b5 */     \
-                                                                \
-  vis_alignaddr((void *)0, 5);                                  \
-  dd0 = vis_faligndata(sda, dd0);    /* b2g2r2---------- */     \
-  dd0 = vis_faligndata(sd0, dd0);    /* b1g1r1b2g2r2---- */     \
-  sda = vis_freg_pair(vis_read_hi(sd0), vis_read_hi(sd0));      \
-  dd0 = vis_faligndata(sda, dd0);           /* b0g0r0b1g1r1b2g2 */
-
-/***************************************************************/
-#define LOAD_EXTRACT_U8_43R_STORE                               \
-  sd0 = *sp++;          /* --b0g0r0--b1g1r1 */                  \
-  sd1 = *sp++;          /* --b2g2r2--b3g3r3 */                  \
-  sd2 = *sp++;          /* --b4g4r4--b5g5r5 */                  \
-  sd3 = *sp++;          /* --b6g6r6--b7g7r7 */                  \
-  EXTRACT_U8_43R;                                               \
-  *dp++ = dd0;          /* b0g0r0b1g1r1b2g2 */                  \
-  *dp++ = dd1;          /* r2b3g3r3b4g4r4b5 */                  \
-  *dp++ = dd2;                              /* g5r5b6g6r6b7g7r7 */
-
-/***************************************************************/
-#define LOAD_EXTRACT_U8_43R                                     \
-  vis_alignaddr((void *)soff, 0);                               \
-  s0 = s4;                                                      \
-  s1 = sp[1];                                                   \
-  s2 = sp[2];                                                   \
-  s3 = sp[3];                                                   \
-  s4 = sp[4];                                                   \
-  sd0 = vis_faligndata(s0, s1);                                 \
-  sd1 = vis_faligndata(s1, s2);                                 \
-  sd2 = vis_faligndata(s2, s3);                                 \
-  sd3 = vis_faligndata(s3, s4);                                 \
-  sp += 4;                                                      \
-  dd2old = dd2;                                                 \
-  EXTRACT_U8_43R
-
-/***************************************************************/
-/*
- * Both source and destination image data are 1-d vectors and
- * 8-byte aligned. And dsize is multiple of 8.
- */
-
-void mlib_v_ImageChannelExtract_U8_43R_A8D1X8(const mlib_u8 *src,
-                                              mlib_u8       *dst,
-                                              mlib_s32      dsize)
-{
-  mlib_d64 *sp, *dp;
-  mlib_d64 sd0, sd1, sd2, sd3;                        /* source data */
-  mlib_d64 dd0, dd1, dd2;                             /* dst data */
-  mlib_d64 sda;
-  mlib_s32 i;
-
-  sp = (mlib_d64 *) src;
-  dp = (mlib_d64 *) dst;
-
-  /* set GSR.offset for vis_faligndata()  */
-/* vis_alignaddr((void *)0, 7); *//* only for _old */
-
-#pragma pipeloop(0)
-  for (i = 0; i < dsize / 8; i++) {
-    LOAD_EXTRACT_U8_43R_STORE;
-  }
-}
-
-/***************************************************************/
-/*
- * Either source or destination image data are not 1-d vectors, but
- * they are 8-byte aligned. And slb and dlb are multiple of 8.
- * The xsize is multiple of 8.
- */
-
-void mlib_v_ImageChannelExtract_U8_43R_A8D2X8(const mlib_u8 *src,
-                                              mlib_s32      slb,
-                                              mlib_u8       *dst,
-                                              mlib_s32      dlb,
-                                              mlib_s32      xsize,
-                                              mlib_s32      ysize)
-{
-  mlib_d64 *sp, *dp;                                  /* 8-byte aligned pointer for pixel */
-  mlib_d64 *sl, *dl;                                  /* 8-byte aligned pointer for line */
-  mlib_d64 sd0, sd1, sd2, sd3;                        /* source data */
-  mlib_d64 dd0, dd1, dd2;                             /* dst data */
-  mlib_d64 sda;
-  mlib_s32 i, j;                                      /* indices for x, y */
-
-  /* set GSR.offset for vis_faligndata()  */
-/* vis_alignaddr((void *)0, 7); *//* only for _old */
-
-  sp = sl = (mlib_d64 *) src;
-  dp = dl = (mlib_d64 *) dst;
-
-  /* row loop */
-  for (j = 0; j < ysize; j++) {
-    /* 8-byte column loop */
-#pragma pipeloop(0)
-    for (i = 0; i < xsize / 8; i++) {
-      LOAD_EXTRACT_U8_43R_STORE;
-    }
-
-    sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-    dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-  }
-}
-
-/***************************************************************/
-/*
- * Either source or destination data are not 8-byte aligned.
- * And dsize is in pixels.
- */
-
-void mlib_v_ImageChannelExtract_U8_43R_D1(const mlib_u8 *src,
-                                          mlib_u8       *dst,
-                                          mlib_s32      dsize)
-{
-  mlib_u8 *sa, *da;
-  mlib_u8 *dend, *dend2;                              /* end points in dst */
-  mlib_d64 *dp;                                       /* 8-byte aligned start points in dst */
-  mlib_d64 *sp;                                       /* 8-byte aligned start point in src */
-  mlib_d64 s0, s1, s2, s3, s4;                        /* 8-byte source row data */
-  mlib_d64 sd0, sd1, sd2, sd3;                        /* 8-byte source data */
-  mlib_d64 dd0, dd1, dd2;                             /* dst data */
-  mlib_d64 dd2old;                                    /* the last datum of the last step */
-  mlib_d64 sda;
-  mlib_s32 soff;                                      /* offset of address in src */
-  mlib_s32 doff;                                      /* offset of address in dst */
-  mlib_s32 emask;                                     /* edge mask */
-  mlib_s32 i, n;
-
-  sa = (void *)src;
-  da = dst;
-
-  /* prepare the source address */
-  sp = (mlib_d64 *) ((mlib_addr) sa & (~7));
-  soff = ((mlib_addr) sa & 7);
-
-  /* prepare the destination addresses */
-  dp = (mlib_d64 *) ((mlib_addr) da & (~7));
-  dend = da + dsize * 3 - 1;
-  dend2 = dend - 23;
-  doff = 8 - ((mlib_addr) da & 7);
-
-  /* generate edge mask for the start point */
-  emask = vis_edge8(da, dend);
-
-  /* load 32 byte, convert, store 24 bytes */
-  s4 = sp[0];                               /* initial value */
-  LOAD_EXTRACT_U8_43R;
-
-  if (dsize >= 8) {
-    if (doff == 8) {
-      vis_pst_8(dd0, dp++, emask);
-      *dp++ = dd1;
-      *dp++ = dd2;
-    }
-    else {
-      vis_alignaddr((void *)doff, 0);
-      vis_pst_8(vis_faligndata(dd0, dd0), dp++, emask);
-      *dp++ = vis_faligndata(dd0, dd1);
-      *dp++ = vis_faligndata(dd1, dd2);
-    }
-  }
-  else {                                    /* for very small size */
-    if (doff == 8) {
-      vis_pst_8(dd0, dp++, emask);
-      if ((mlib_addr) dp <= (mlib_addr) dend) {
-        emask = vis_edge8(dp, dend);
-        vis_pst_8(dd1, dp++, emask);
-        if ((mlib_addr) dp <= (mlib_addr) dend) {
-          emask = vis_edge8(dp, dend);
-          vis_pst_8(dd2, dp++, emask);
-        }
-      }
-    }
-    else {
-      vis_alignaddr((void *)doff, 0);
-      vis_pst_8(vis_faligndata(dd0, dd0), dp++, emask);
-      if ((mlib_addr) dp <= (mlib_addr) dend) {
-        emask = vis_edge8(dp, dend);
-        vis_pst_8(vis_faligndata(dd0, dd1), dp++, emask);
-        if ((mlib_addr) dp <= (mlib_addr) dend) {
-          emask = vis_edge8(dp, dend);
-          vis_pst_8(vis_faligndata(dd1, dd2), dp++, emask);
-          if ((mlib_addr) dp <= (mlib_addr) dend) {
-            emask = vis_edge8(dp, dend);
-            vis_pst_8(vis_faligndata(dd2, dd2), dp++, emask);
-          }
-        }
-      }
-    }
-  }
-
-  /* no edge handling is needed in the loop */
-  if (doff == 8) {
-    if ((mlib_addr) dp <= (mlib_addr) dend2) {
-      n = ((mlib_u8 *) dend2 - (mlib_u8 *) dp) / 24 + 1;
-#pragma pipeloop(0)
-      for (i = 0; i < n; i++) {
-        LOAD_EXTRACT_U8_43R;
-        *dp++ = dd0;
-        *dp++ = dd1;
-        *dp++ = dd2;
-      }
-    }
-  }
-  else {
-    if ((mlib_addr) dp <= (mlib_addr) dend2) {
-      n = ((mlib_u8 *) dend2 - (mlib_u8 *) dp) / 24 + 1;
-#pragma pipeloop(0)
-      for (i = 0; i < n; i++) {
-        LOAD_EXTRACT_U8_43R;
-        vis_alignaddr((void *)doff, 0);
-        *dp++ = vis_faligndata(dd2old, dd0);
-        *dp++ = vis_faligndata(dd0, dd1);
-        *dp++ = vis_faligndata(dd1, dd2);
-      }
-    }
-  }
-
-  if ((mlib_addr) dp <= (mlib_addr) dend) {
-    LOAD_EXTRACT_U8_43R;
-    emask = vis_edge8(dp, dend);
-    if (doff == 8) {
-      vis_pst_8(dd0, dp++, emask);
-      if ((mlib_addr) dp <= (mlib_addr) dend) {
-        emask = vis_edge8(dp, dend);
-        vis_pst_8(dd1, dp++, emask);
-        if ((mlib_addr) dp <= (mlib_addr) dend) {
-          emask = vis_edge8(dp, dend);
-          vis_pst_8(dd2, dp++, emask);
-        }
-      }
-    }
-    else {
-      vis_alignaddr((void *)doff, 0);
-      vis_pst_8(vis_faligndata(dd2old, dd0), dp++, emask);
-      if ((mlib_addr) dp <= (mlib_addr) dend) {
-        emask = vis_edge8(dp, dend);
-        vis_pst_8(vis_faligndata(dd0, dd1), dp++, emask);
-        if ((mlib_addr) dp <= (mlib_addr) dend) {
-          emask = vis_edge8(dp, dend);
-          vis_pst_8(vis_faligndata(dd1, dd2), dp++, emask);
-        }
-      }
-    }
-  }
-}
-
-/***************************************************************/
-void mlib_v_ImageChannelExtract_U8_43R(const mlib_u8 *src,
-                                       mlib_s32      slb,
-                                       mlib_u8       *dst,
-                                       mlib_s32      dlb,
-                                       mlib_s32      xsize,
-                                       mlib_s32      ysize)
-{
-  mlib_u8 *sa, *da;
-  mlib_u8 *sl, *dl;
-  mlib_s32 j;
-
-  sa = sl = (void *)src;
-  da = dl = dst;
-
-  for (j = 0; j < ysize; j++) {
-    mlib_v_ImageChannelExtract_U8_43R_D1(sa, da, xsize);
-    sa = sl += slb;
-    da = dl += dlb;
-  }
-}
-
-/***************************************************************/
-#define EXTRACT_S16_43R_old      /* shift right */              \
-                                                                \
-  dd2 = vis_faligndata(sd3, dd2);    /* r3------ */             \
-  sd3 = vis_faligndata(sd3, sd3);                               \
-  dd2 = vis_faligndata(sd3, dd2);    /* g3r3---- */             \
-  sd3 = vis_faligndata(sd3, sd3);                               \
-  dd2 = vis_faligndata(sd3, dd2);    /* b3g3r3-- */             \
-                                                                \
-  dd2 = vis_faligndata(sd2, dd2);    /* r2b3g3r3 */             \
-  sd2 = vis_faligndata(sd2, sd2);                               \
-  dd1 = vis_faligndata(sd2, dd1);    /* g2------ */             \
-  sd2 = vis_faligndata(sd2, sd2);                               \
-  dd1 = vis_faligndata(sd2, dd1);    /* b2g2---- */             \
-                                                                \
-  dd1 = vis_faligndata(sd1, dd1);    /* r1b2g2-- */             \
-  sd1 = vis_faligndata(sd1, sd1);                               \
-  dd1 = vis_faligndata(sd1, dd1);    /* g1r1b2g2 */             \
-  sd1 = vis_faligndata(sd1, sd1);                               \
-  dd0 = vis_faligndata(sd1, dd0);    /* b1------ */             \
-                                                                \
-  dd0 = vis_faligndata(sd0, dd0);    /* r0b1---- */             \
-  sd0 = vis_faligndata(sd0, sd0);                               \
-  dd0 = vis_faligndata(sd0, dd0);    /* g0r0b1-- */             \
-  sd0 = vis_faligndata(sd0, sd0);                               \
-  dd0 = vis_faligndata(sd0, dd0);           /* b0g0r0b1 */
-
-/***************************************************************/
-#define EXTRACT_S16_43R        /* shift right */                \
-                                                                \
-  vis_alignaddr((void *)0, 2);                                  \
-  dd2 = vis_faligndata(sd3, dd2);    /* b3g3r3-- */             \
-                                                                \
-  vis_alignaddr((void *)0, 6);                                  \
-  dd2 = vis_faligndata(sd2, dd2);    /* r2b3g3r3 */             \
-  vis_alignaddr((void *)0, 2);                                  \
-  dd1 = vis_faligndata(sd2, dd1);    /* b2g2r2-- */             \
-                                                                \
-  vis_alignaddr((void *)0, 4);                                  \
-  dd1 = vis_faligndata(sd1, dd1);    /* g1r1b2g2 */             \
-  vis_alignaddr((void *)0, 2);                                  \
-  dd0 = vis_faligndata(sd1, dd0);    /* b1g1r1-- */             \
-  dd0 = vis_faligndata(sd0, dd0);           /* b0g0r0b1 */
-
-/***************************************************************/
-#define LOAD_EXTRACT_S16_43R_STORE                              \
-                                                                \
-  sd0 = *sp++;          /* --b0g0r0 */                          \
-  sd1 = *sp++;          /* --b1g1r1 */                          \
-  sd2 = *sp++;          /* --b2g2r2 */                          \
-  sd3 = *sp++;          /* --b3g3r3 */                          \
-                                                                \
-  EXTRACT_S16_43R;                                              \
-                                                                \
-  *dp++ = dd0;          /* b0g0r0b1 */                          \
-  *dp++ = dd1;          /* g1r1b2g2 */                          \
-  *dp++ = dd2;                              /* r2b3g3r3 */
-
-/***************************************************************/
-#define LOAD_EXTRACT_S16_43R                                    \
-                                                                \
-  vis_alignaddr((void *)soff, 0);                               \
-  s0 = s4;                                                      \
-  s1 = sp[1];                                                   \
-  s2 = sp[2];                                                   \
-  s3 = sp[3];                                                   \
-  s4 = sp[4];                                                   \
-  sd0 = vis_faligndata(s0, s1);                                 \
-  sd1 = vis_faligndata(s1, s2);                                 \
-  sd2 = vis_faligndata(s2, s3);                                 \
-  sd3 = vis_faligndata(s3, s4);                                 \
-  sp += 4;                                                      \
-  dd2old = dd2;                                                 \
-  EXTRACT_S16_43R
-
-/***************************************************************/
-/*
- * Both source and destination image data are 1-d vectors and
- * 8-byte aligned. And size is in 4-pixels.
- */
-
-void mlib_v_ImageChannelExtract_S16_43R_A8D1X4(const mlib_s16 *src,
-                                               mlib_s16       *dst,
-                                               mlib_s32       dsize)
-{
-  mlib_d64 *sp, *dp;                                  /* 8-byte aligned pointer for pixel */
-  mlib_d64 sd0, sd1, sd2, sd3;                        /* source data */
-  mlib_d64 dd0, dd1, dd2;                             /* dst data */
-  mlib_s32 i;
-
-  sp = (mlib_d64 *) src;
-  dp = (mlib_d64 *) dst;
-
-  /* set GSR.offset for vis_faligndata()  */
-/* vis_alignaddr((void *)0, 6); *//* only for _old */
-
-#pragma pipeloop(0)
-  for (i = 0; i < dsize / 4; i++) {
-    LOAD_EXTRACT_S16_43R_STORE;
-  }
-}
-
-/***************************************************************/
-/*
- * Either source or destination image data are not 1-d vectors, but
- * they are 8-byte aligned. The xsize is multiple of 8.
- * slb and dlb are multiple of 8.
- */
-
-void mlib_v_ImageChannelExtract_S16_43R_A8D2X4(const mlib_s16 *src,
-                                               mlib_s32       slb,
-                                               mlib_s16       *dst,
-                                               mlib_s32       dlb,
-                                               mlib_s32       xsize,
-                                               mlib_s32       ysize)
-{
-  mlib_d64 *sp, *dp;                                  /* 8-byte aligned pointer for pixel */
-  mlib_d64 *sl, *dl;                                  /* 8-byte aligned pointer for line */
-  mlib_d64 sd0, sd1, sd2, sd3;                        /* source data */
-  mlib_d64 dd0, dd1, dd2;                             /* dst data */
-  mlib_s32 i, j;                                      /* indices for x, y */
-
-  /* set GSR.offset for vis_faligndata()  */
-/* vis_alignaddr((void *)0, 6); *//* only for _old */
-
-  sp = sl = (mlib_d64 *) src;
-  dp = dl = (mlib_d64 *) dst;
-
-  /* row loop */
-  for (j = 0; j < ysize; j++) {
-    /* 4-pixel column loop */
-#pragma pipeloop(0)
-    for (i = 0; i < xsize / 4; i++) {
-      LOAD_EXTRACT_S16_43R_STORE;
-    }
-
-    sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-    dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-  }
-}
-
-/***************************************************************/
-/*
- * Either source or destination data are not 8-byte aligned.
- * And dsize is multiple of 8.
- */
-
-void mlib_v_ImageChannelExtract_S16_43R_D1(const mlib_s16 *src,
-                                           mlib_s16       *dst,
-                                           mlib_s32       dsize)
-{
-  mlib_s16 *sa, *da;                                  /* pointer for pixel */
-  mlib_s16 *dend, *dend2;                             /* end points in dst */
-  mlib_d64 *dp;                                       /* 8-byte aligned start points in dst */
-  mlib_d64 *sp;                                       /* 8-byte aligned start point in src */
-  mlib_d64 s0, s1, s2, s3, s4;                        /* 8-byte source row data */
-  mlib_d64 sd0, sd1, sd2, sd3;                        /* 8-byte source data */
-  mlib_d64 dd0, dd1, dd2;                             /* dst data */
-  mlib_d64 dd2old;                                    /* the last datum of the last step */
-  mlib_s32 soff;                                      /* offset of address in src */
-  mlib_s32 doff;                                      /* offset of address in dst */
-  mlib_s32 emask;                                     /* edge mask */
-  mlib_s32 i, n;
-
-  sa = (void *)src;
-  da = dst;
-
-  /* prepare the source address */
-  sp = (mlib_d64 *) ((mlib_addr) sa & (~7));
-  soff = ((mlib_addr) sa & 7);
-
-  /* prepare the destination addresses */
-  dp = (mlib_d64 *) ((mlib_addr) da & (~7));
-  dend = da + dsize * 3 - 1;
-  dend2 = dend - 11;
-  doff = 8 - ((mlib_addr) da & 7);
-
-  /* generate edge mask for the start point */
-  emask = vis_edge16(da, dend);
-
-  /* load 32 byte, convert, store 24 bytes */
-  s4 = sp[0];                               /* initial value */
-  LOAD_EXTRACT_S16_43R;
-
-  if (dsize >= 4) {
-    if (doff == 8) {
-      vis_pst_16(dd0, dp++, emask);
-      *dp++ = dd1;
-      *dp++ = dd2;
-    }
-    else {
-      vis_alignaddr((void *)doff, 0);
-      vis_pst_16(vis_faligndata(dd0, dd0), dp++, emask);
-      *dp++ = vis_faligndata(dd0, dd1);
-      *dp++ = vis_faligndata(dd1, dd2);
-    }
-  }
-  else {                                    /* for very small size */
-    if (doff == 8) {
-      vis_pst_16(dd0, dp++, emask);
-      if ((mlib_addr) dp <= (mlib_addr) dend) {
-        emask = vis_edge16(dp, dend);
-        vis_pst_16(dd1, dp++, emask);
-        if ((mlib_addr) dp <= (mlib_addr) dend) {
-          emask = vis_edge16(dp, dend);
-          vis_pst_16(dd2, dp++, emask);
-        }
-      }
-    }
-    else {
-      vis_alignaddr((void *)doff, 0);
-      vis_pst_16(vis_faligndata(dd0, dd0), dp++, emask);
-      if ((mlib_addr) dp <= (mlib_addr) dend) {
-        emask = vis_edge16(dp, dend);
-        vis_pst_16(vis_faligndata(dd0, dd1), dp++, emask);
-        if ((mlib_addr) dp <= (mlib_addr) dend) {
-          emask = vis_edge16(dp, dend);
-          vis_pst_16(vis_faligndata(dd1, dd2), dp++, emask);
-        }
-      }
-    }
-  }
-
-  /* no edge handling is needed in the loop */
-  if (doff == 8) {
-    if ((mlib_addr) dp <= (mlib_addr) dend2) {
-      n = ((mlib_u8 *) dend2 - (mlib_u8 *) dp) / 24 + 1;
-#pragma pipeloop(0)
-      for (i = 0; i < n; i++) {
-        LOAD_EXTRACT_S16_43R;
-        *dp++ = dd0;
-        *dp++ = dd1;
-        *dp++ = dd2;
-      }
-    }
-  }
-  else {
-    if ((mlib_addr) dp <= (mlib_addr) dend2) {
-      n = ((mlib_u8 *) dend2 - (mlib_u8 *) dp) / 24 + 1;
-#pragma pipeloop(0)
-      for (i = 0; i < n; i++) {
-        LOAD_EXTRACT_S16_43R;
-        vis_alignaddr((void *)doff, 0);
-        *dp++ = vis_faligndata(dd2old, dd0);
-        *dp++ = vis_faligndata(dd0, dd1);
-        *dp++ = vis_faligndata(dd1, dd2);
-      }
-    }
-  }
-
-  if ((mlib_addr) dp <= (mlib_addr) dend) {
-    LOAD_EXTRACT_S16_43R;
-    emask = vis_edge16(dp, dend);
-    if (doff == 8) {
-      vis_pst_16(dd0, dp++, emask);
-      if ((mlib_addr) dp <= (mlib_addr) dend) {
-        emask = vis_edge16(dp, dend);
-        vis_pst_16(dd1, dp++, emask);
-        if ((mlib_addr) dp <= (mlib_addr) dend) {
-          emask = vis_edge16(dp, dend);
-          vis_pst_16(dd2, dp++, emask);
-        }
-      }
-    }
-    else {
-      vis_alignaddr((void *)doff, 0);
-      vis_pst_16(vis_faligndata(dd2old, dd0), dp++, emask);
-      if ((mlib_addr) dp <= (mlib_addr) dend) {
-        emask = vis_edge16(dp, dend);
-        vis_pst_16(vis_faligndata(dd0, dd1), dp++, emask);
-        if ((mlib_addr) dp <= (mlib_addr) dend) {
-          emask = vis_edge16(dp, dend);
-          vis_pst_16(vis_faligndata(dd1, dd2), dp++, emask);
-        }
-      }
-    }
-  }
-}
-
-/***************************************************************/
-void mlib_v_ImageChannelExtract_S16_43R(const mlib_s16 *src,
-                                        mlib_s32       slb,
-                                        mlib_s16       *dst,
-                                        mlib_s32       dlb,
-                                        mlib_s32       xsize,
-                                        mlib_s32       ysize)
-{
-  mlib_s16 *sa, *da;
-  mlib_s16 *sl, *dl;
-  mlib_s32 j;
-
-  sa = sl = (void *)src;
-  da = dl = dst;
-
-  for (j = 0; j < ysize; j++) {
-    mlib_v_ImageChannelExtract_S16_43R_D1(sa, da, xsize);
-    sa = sl = (mlib_s16 *) ((mlib_u8 *) sl + slb);
-    da = dl = (mlib_s16 *) ((mlib_u8 *) dl + dlb);
-  }
-}
-
-/***************************************************************/
-#define EXTRACT_U8_43L_old      /* shift left */                \
-                                                                \
-  dd0 = vis_faligndata(dd0, sd0);    /* --------------r0 */     \
-  sd0 = vis_faligndata(sd0, sd0);                               \
-  dd0 = vis_faligndata(dd0, sd0);    /* ------------r0g0 */     \
-  sd0 = vis_faligndata(sd0, sd0);                               \
-  dd0 = vis_faligndata(dd0, sd0);    /* ----------r0g0b0 */     \
-  sd0 = vis_faligndata(sd0, sd0);                               \
-  sd0 = vis_faligndata(sd0, sd0);                               \
-  dd0 = vis_faligndata(dd0, sd0);    /* --------r0g0b0r1 */     \
-  sd0 = vis_faligndata(sd0, sd0);                               \
-  dd0 = vis_faligndata(dd0, sd0);    /* ------r0g0b0r1g1 */     \
-  sd0 = vis_faligndata(sd0, sd0);                               \
-  dd0 = vis_faligndata(dd0, sd0);    /* ----r0g0b0r1g1b1 */     \
-                                                                \
-  dd0 = vis_faligndata(dd0, sd1);    /* --r0g0b0r1g1b1r2 */     \
-  sd1 = vis_faligndata(sd1, sd1);                               \
-  dd0 = vis_faligndata(dd0, sd1);    /* r0g0b0r1g1b1r2g2 */     \
-                                                                \
-  sd1 = vis_faligndata(sd1, sd1);                               \
-  dd1 = vis_faligndata(dd1, sd1);    /* --------------b2 */     \
-  sd1 = vis_faligndata(sd1, sd1);                               \
-  sd1 = vis_faligndata(sd1, sd1);                               \
-  dd1 = vis_faligndata(dd1, sd1);    /* ------------b2r3 */     \
-  sd1 = vis_faligndata(sd1, sd1);                               \
-  dd1 = vis_faligndata(dd1, sd1);    /* ----------b2r3g3 */     \
-  sd1 = vis_faligndata(sd1, sd1);                               \
-  dd1 = vis_faligndata(dd1, sd1);    /* --------b2r3g3b3 */     \
-                                                                \
-  dd1 = vis_faligndata(dd1, sd2);    /* ------b2r3g3b3r4 */     \
-  sd2 = vis_faligndata(sd2, sd2);                               \
-  dd1 = vis_faligndata(dd1, sd2);    /* ----b2r3g3b3r4g4 */     \
-  sd2 = vis_faligndata(sd2, sd2);                               \
-  dd1 = vis_faligndata(dd1, sd2);    /* --b2r3g3b3r4g4b4 */     \
-  sd2 = vis_faligndata(sd2, sd2);                               \
-  sd2 = vis_faligndata(sd2, sd2);                               \
-  dd1 = vis_faligndata(dd1, sd2);    /* b2r3g3b3r4g4b4r5 */     \
-                                                                \
-  sd2 = vis_faligndata(sd2, sd2);                               \
-  dd2 = vis_faligndata(dd2, sd2);    /* --------------g5 */     \
-  sd2 = vis_faligndata(sd2, sd2);                               \
-  dd2 = vis_faligndata(dd2, sd2);    /* ------------g5b5 */     \
-                                                                \
-  dd2 = vis_faligndata(dd2, sd3);    /* ----------g5b5r6 */     \
-  sd3 = vis_faligndata(sd3, sd3);                               \
-  dd2 = vis_faligndata(dd2, sd3);    /* --------g5b5r6g6 */     \
-  sd3 = vis_faligndata(sd3, sd3);                               \
-  dd2 = vis_faligndata(dd2, sd3);    /* ------g5b5r6g6b6 */     \
-  sd3 = vis_faligndata(sd3, sd3);                               \
-  sd3 = vis_faligndata(sd3, sd3);                               \
-  dd2 = vis_faligndata(dd2, sd3);    /* ----g5b5r6g6b6r7 */     \
-  sd3 = vis_faligndata(sd3, sd3);                               \
-  dd2 = vis_faligndata(dd2, sd3);    /* --g5b5r6g6b6r7g7 */     \
-  sd3 = vis_faligndata(sd3, sd3);                               \
-  dd2 = vis_faligndata(dd2, sd3);           /* g5b5r6g6b6r7g7b7 */
-
 /***************************************************************/
 #define EXTRACT_U8_43L        /* shift left */                  \
                                                                 \
@@ -800,20 +87,6 @@ void mlib_v_ImageChannelExtract_S16_43R(const mlib_s16 *src,
   sda = vis_freg_pair(vis_read_lo(sd3), vis_read_hi(sd3));      \
   dd2 = vis_faligndata(dd2, sda);           /* g5b5r6g6b6r7g7b7 */
 
-/***************************************************************/
-#define LOAD_EXTRACT_U8_43L_STORE                               \
-                                                                \
-  sd0 = *sp++;          /* r0g0b0--r1g1b1-- */                  \
-  sd1 = *sp++;          /* r2g2b2--r3g3b3-- */                  \
-  sd2 = *sp++;          /* r4g4b4--r5g5b5-- */                  \
-  sd3 = *sp++;          /* r6g6b6--r7g7b7-- */                  \
-                                                                \
-  EXTRACT_U8_43L;                                               \
-                                                                \
-  *dp++ = dd0;          /* r0g0b0r1g1b1r2g2 */                  \
-  *dp++ = dd1;          /* b2r3g3b3r4g4b4r5 */                  \
-  *dp++ = dd2;                              /* g5b5r6g6b6r7g7b7 */
-
 /***************************************************************/
 #define LOAD_EXTRACT_U8_43L                                             \
                                                                         \
@@ -833,74 +106,6 @@ void mlib_v_ImageChannelExtract_S16_43R(const mlib_s16 *src,
   dd2old = dd2;                                                         \
   EXTRACT_U8_43L
 
-/***************************************************************/
-/*
- * Both source and destination image data are 1-d vectors and
- * 8-byte aligned. And dsize is multiple of 8.
- */
-
-void mlib_v_ImageChannelExtract_U8_43L_A8D1X8(const mlib_u8 *src,
-                                              mlib_u8       *dst,
-                                              mlib_s32      dsize)
-{
-  mlib_d64 *sp, *dp;
-  mlib_d64 sd0, sd1, sd2, sd3;                        /* source data */
-  mlib_d64 dd0, dd1, dd2;                             /* dst data */
-  mlib_d64 sda;
-  mlib_s32 i;
-
-  sp = (mlib_d64 *) src;
-  dp = (mlib_d64 *) dst;
-
-  /* set GSR.offset for vis_faligndata()  */
-/* vis_alignaddr((void *)0, 1); *//* for _old only */
-
-#pragma pipeloop(0)
-  for (i = 0; i < dsize / 8; i++) {
-    LOAD_EXTRACT_U8_43L_STORE;
-  }
-}
-
-/***************************************************************/
-/*
- * Either source or destination image data are not 1-d vectors, but
- * they are 8-byte aligned. And slb and dlb are multiple of 8.
- * The xsize is multiple of 8.
- */
-
-void mlib_v_ImageChannelExtract_U8_43L_A8D2X8(const mlib_u8 *src,
-                                              mlib_s32      slb,
-                                              mlib_u8       *dst,
-                                              mlib_s32      dlb,
-                                              mlib_s32      xsize,
-                                              mlib_s32      ysize)
-{
-  mlib_d64 *sp, *dp;                                  /* 8-byte aligned pointer for pixel */
-  mlib_d64 *sl, *dl;                                  /* 8-byte aligned pointer for line */
-  mlib_d64 sd0, sd1, sd2, sd3;                        /* source data */
-  mlib_d64 dd0, dd1, dd2;                             /* dst data */
-  mlib_d64 sda;
-  mlib_s32 i, j;                                      /* indices for x, y */
-
-  /* set GSR.offset for vis_faligndata()  */
-/* vis_alignaddr((void *)0, 1); *//* for _old only */
-
-  sp = sl = (mlib_d64 *) src;
-  dp = dl = (mlib_d64 *) dst;
-
-  /* row loop */
-  for (j = 0; j < ysize; j++) {
-    /* 8-byte column loop */
-#pragma pipeloop(0)
-    for (i = 0; i < xsize / 8; i++) {
-      LOAD_EXTRACT_U8_43L_STORE;
-    }
-
-    sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-    dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-  }
-}
-
 /***************************************************************/
 /*
  * Either source or destination data are not 8-byte aligned.
@@ -1044,28 +249,6 @@ void mlib_v_ImageChannelExtract_U8_43L_D1(const mlib_u8 *src,
   }
 }
 
-/***************************************************************/
-void mlib_v_ImageChannelExtract_U8_43L(const mlib_u8 *src,
-                                       mlib_s32      slb,
-                                       mlib_u8       *dst,
-                                       mlib_s32      dlb,
-                                       mlib_s32      xsize,
-                                       mlib_s32      ysize)
-{
-  mlib_u8 *sa, *da;
-  mlib_u8 *sl, *dl;
-  mlib_s32 j;
-
-  sa = sl = (void *)src;
-  da = dl = dst;
-
-  for (j = 0; j < ysize; j++) {
-    mlib_v_ImageChannelExtract_U8_43L_D1(sa, da, xsize);
-    sa = sl += slb;
-    da = dl += dlb;
-  }
-}
-
 /***************************************************************/
 #define EXTRACT_S16_43L              /* shift left */           \
   vis_alignaddr((void *)0, 6);                                  \
@@ -1082,20 +265,6 @@ void mlib_v_ImageChannelExtract_U8_43L(const mlib_u8 *src,
   dd2 = vis_faligndata(dd2, sd2);    /* --r2g2b2 */             \
   dd2 = vis_faligndata(dd2, sd3);           /* b2r3g3b3 */
 
-/***************************************************************/
-#define LOAD_EXTRACT_S16_43L_STORE                              \
-                                                                \
-  sd0 = *sp++;          /* r0g0b0-- */                          \
-  sd1 = *sp++;          /* r1g1b1-- */                          \
-  sd2 = *sp++;          /* r2g2b2-- */                          \
-  sd3 = *sp++;          /* r3g3b3-- */                          \
-                                                                \
-  EXTRACT_S16_43L;                                              \
-                                                                \
-  *dp++ = dd0;          /* r0g0b0r1 */                          \
-  *dp++ = dd1;          /* g1b1r2g2 */                          \
-  *dp++ = dd2;                              /* b2r3g3b3 */
-
 /***************************************************************/
 #define LOAD_EXTRACT_S16_43L                                    \
                                                                 \
@@ -1113,72 +282,6 @@ void mlib_v_ImageChannelExtract_U8_43L(const mlib_u8 *src,
   dd2old = dd2;                                                 \
   EXTRACT_S16_43L
 
-/***************************************************************/
-/*
- * Both source and destination image data are 1-d vectors and
- * 8-byte aligned. And dsize is multiple of 4.
- */
-
-void mlib_v_ImageChannelExtract_S16_43L_A8D1X4(const mlib_s16 *src,
-                                               mlib_s16       *dst,
-                                               mlib_s32       dsize)
-{
-  mlib_d64 *sp, *dp;                                  /* 8-byte aligned pointer for pixel */
-  mlib_d64 sd0, sd1, sd2, sd3;                        /* source data */
-  mlib_d64 dd0, dd1, dd2;                             /* dst data */
-  mlib_s32 i;
-
-  sp = (mlib_d64 *) src;
-  dp = (mlib_d64 *) dst;
-
-  /* set GSR.offset for vis_faligndata()  */
-/* vis_alignaddr((void *)0, 2); *//* only for _old */
-
-#pragma pipeloop(0)
-  for (i = 0; i < dsize / 4; i++) {
-    LOAD_EXTRACT_S16_43L_STORE;
-  }
-}
-
-/***************************************************************/
-/*
- * Either source or destination image data are not 1-d vectors, but
- * they are 8-byte aligned. The xsize is multiple of 4.
- * And slb and dlb are multiple of 8.
- */
-
-void mlib_v_ImageChannelExtract_S16_43L_A8D2X4(const mlib_s16 *src,
-                                               mlib_s32       slb,
-                                               mlib_s16       *dst,
-                                               mlib_s32       dlb,
-                                               mlib_s32       xsize,
-                                               mlib_s32       ysize)
-{
-  mlib_d64 *sp, *dp;                                  /* 8-byte aligned pointer for pixel */
-  mlib_d64 *sl, *dl;                                  /* 8-byte aligned pointer for line */
-  mlib_d64 sd0, sd1, sd2, sd3;                        /* source data */
-  mlib_d64 dd0, dd1, dd2;                             /* dst data */
-  mlib_s32 i, j;                                      /* indices for x, y */
-
-  /* set GSR.offset for vis_faligndata()  */
-/* vis_alignaddr((void *)0, 2); *//* only for _old */
-
-  sp = sl = (mlib_d64 *) src;
-  dp = dl = (mlib_d64 *) dst;
-
-  /* row loop */
-  for (j = 0; j < ysize; j++) {
-    /* 4-pixel column loop */
-#pragma pipeloop(0)
-    for (i = 0; i < xsize / 4; i++) {
-      LOAD_EXTRACT_S16_43L_STORE;
-    }
-
-    sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-    dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-  }
-}
-
 /***************************************************************/
 /*
  * Either source or destination data are not 8-byte aligned.
@@ -1318,25 +421,3 @@ void mlib_v_ImageChannelExtract_S16_43L_D1(const mlib_s16 *src,
 }
 
 /***************************************************************/
-void mlib_v_ImageChannelExtract_S16_43L(const mlib_s16 *src,
-                                        mlib_s32       slb,
-                                        mlib_s16       *dst,
-                                        mlib_s32       dlb,
-                                        mlib_s32       xsize,
-                                        mlib_s32       ysize)
-{
-  mlib_s16 *sa, *da;
-  mlib_s16 *sl, *dl;
-  mlib_s32 j;
-
-  sa = sl = (void *)src;
-  da = dl = dst;
-
-  for (j = 0; j < ysize; j++) {
-    mlib_v_ImageChannelExtract_S16_43L_D1(sa, da, xsize);
-    sa = sl = (mlib_s16 *) ((mlib_u8 *) sl + slb);
-    da = dl = (mlib_s16 *) ((mlib_u8 *) dl + dlb);
-  }
-}
-
-/***************************************************************/
diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_f.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_f.c
deleted file mode 100644
index da12ebaace7..00000000000
--- a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_f.c
+++ /dev/null
@@ -1,784 +0,0 @@
-/*
- * Copyright (c) 2000, 2003, 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.
- */
-
-
-
-#include <stdlib.h>
-#include "mlib_image.h"
-#include "mlib_ImageCheck.h"
-
-typedef union {
-  double d64;
-  struct {
-    float f0;
-    float f1;
-  } f32s;
-} d64_2_f32;
-
-/***************************************************************/
-
-void mlib_v_ImageChannelExtract_U8_2_1(mlib_u8  *sl,  mlib_s32 slb,
-                                       mlib_u8  *dl, mlib_s32 dlb,
-                                       mlib_s32 width, mlib_s32 height)
-{
-  mlib_u8   *sp = sl;
-  mlib_u8   *dp = dl;
-  int       i, j;
-
-  for (j = 0; j < height; j++) {
-    mlib_u8  *dend = dl + width;
-    mlib_u32 *sp2;
-    while (((mlib_addr)sp & 7) > 1) {
-      *dp++ = *sp;
-      sp += 2;
-      if (dp >= dend) break;
-    }
-    if ((mlib_addr)sp & 7) {
-      sp2 = (mlib_u32 *)(sp - 1);
-#pragma pipeloop(0)
-      for (; dp <= (dend-2); dp += 2) {
-        mlib_u32 s0;
-        s0 = *sp2++;
-        dp[0] = s0 >> 16;
-        dp[1] = s0;
-      }
-      if (dp < dend) {
-        dp[0] = sp2[0] >> 16;
-      }
-    } else {
-      sp2 = (mlib_u32 *)sp;
-#pragma pipeloop(0)
-      for (; dp <= (dend-2); dp += 2) {
-        mlib_u32 s0;
-        s0 = *sp2++;
-        dp[0] = s0 >> 24;
-        dp[1] = s0 >> 8;
-      }
-      if (dp < dend) {
-        dp[0] = sp2[0] >> 24;
-      }
-    }
-    sp = sl += slb;
-    dp = dl += dlb;
-  }
-}
-
-/***************************************************************/
-
-void mlib_v_ImageChannelExtract_U8_3_2(mlib_u8  *sl, mlib_s32 slb,
-                                       mlib_u8 *dl, mlib_s32 dlb,
-                                       mlib_s32 width, mlib_s32 height,
-                                       mlib_s32 count1)
-{
-  mlib_u8   *sp = sl;
-  mlib_u8   *dp = dl;
-  mlib_u32  *sp2;
-  mlib_u16  *dp2;
-  mlib_u16  *d2end;
-  mlib_u32  s0, s1, s2, s3;
-  int       i, j, off, count_off;
-
-  for (j = 0; j < height; j++) {
-    mlib_u8  *dend  = dl + 2*width;
-
-    if (count1 == 1) {
-      if (dp < dend) *dp++ = sp[0];
-      sp += 2;
-    }
-
-    if ((mlib_addr)dp & 1) {
-#pragma pipeloop(0)
-      for (; dp <= (dend-2); dp += 2) {
-        dp[0] = sp[0];
-        dp[1] = sp[1];
-        sp += 3;
-      }
-      if (dp < dend) {
-        dp[0] = sp[0];
-      }
-      sp = sl += slb;
-      dp = dl += dlb;
-      continue;
-    }
-
-    dp2 = (mlib_u16*)dp;
-    d2end = (mlib_u16*)((mlib_addr)dend &~ 1);
-    off = (mlib_addr)sp & 3;
-    sp2 = (mlib_u32 *)(sp - off);
-
-    switch (off) {
-
-      case 0:
-#pragma pipeloop(0)
-        for (; dp2 <= (d2end-4); dp2 += 4) {
-          s0 = sp2[0];
-          s1 = sp2[1];
-          s2 = sp2[2];
-          dp2[0] = s0 >> 16;
-          dp2[1] = (s0 << 8) | (s1 >> 24);
-          dp2[2] = s1;
-          dp2[3] = s2 >>  8;
-          sp2 += 3;
-        }
-        break;
-
-      case 1:
-#pragma pipeloop(0)
-        for (; dp2 <= (d2end-4); dp2 += 4) {
-          s0 = sp2[0];
-          s1 = sp2[1];
-          s2 = sp2[2];
-          dp2[0] = s0 >> 8;
-          dp2[1] = s1 >> 16;
-          dp2[2] = (s1 << 8) | (s2 >> 24);
-          dp2[3] = s2;
-          sp2 += 3;
-        }
-        break;
-
-      case 2:
-#pragma pipeloop(0)
-        s3 = sp2[0];
-        for (; dp2 <= (d2end-4); dp2 += 4) {
-          s0 = s3;
-          s1 = sp2[1];
-          s2 = sp2[2];
-          s3 = sp2[3];
-          dp2[0] = s0;
-          dp2[1] = s1 >> 8;
-          dp2[2] = s2 >> 16;
-          dp2[3] = (s2 << 8) | (s3 >> 24);
-          sp2 += 3;
-        }
-        break;
-
-      case 3:
-#pragma pipeloop(0)
-        s3 = sp2[0];
-        for (; dp2 <= (d2end-4); dp2 += 4) {
-          s0 = s3;
-          s1 = sp2[1];
-          s2 = sp2[2];
-          s3 = sp2[3];
-          dp2[0] = (s0 << 8) | (s1 >> 24);
-          dp2[1] = s1;
-          dp2[2] = s2 >>  8;
-          dp2[3] = s3 >> 16;
-          sp2 += 3;
-        }
-    }
-
-    sp = (mlib_u8 *)sp2 + off;
-    dp = (mlib_u8 *)dp2;
-    while (dp < dend) {
-      *dp++ = sp[0];
-      if (dp < dend) *dp++ = sp[1];
-      sp += 3;
-    }
-
-    sp = sl += slb;
-    dp = dl += dlb;
-  }
-}
-
-/***************************************************************/
-
-void mlib_v_ImageChannelExtract_U8_4_2(mlib_u8  *sl, mlib_s32 slb,
-                                       mlib_u8 *dl, mlib_s32 dlb,
-                                       mlib_s32 width, mlib_s32 height,
-                                       mlib_s32 count1)
-{
-  mlib_u8   *sp = sl;
-  mlib_u8   *dp = dl;
-  mlib_u32  *sp2;
-  mlib_u16  *dp2;
-  mlib_u16  *d2end;
-  mlib_u32  s0, s1, s2, s3;
-  int       i, j, off, count_off;
-
-  for (j = 0; j < height; j++) {
-    mlib_u8  *dend  = dl + 2*width;
-
-    if (count1 == 1) {
-      if (dp < dend) *dp++ = sp[0];
-      sp += 3;
-    }
-
-    off = (mlib_addr)sp & 3;
-
-    if (((mlib_addr)dp & 1) || (off == 3)) {
-#pragma pipeloop(0)
-      for (; dp <= (dend-2); dp += 2) {
-        dp[0] = sp[0];
-        dp[1] = sp[1];
-        sp += 4;
-      }
-      if (dp < dend) {
-        dp[0] = sp[0];
-      }
-      sp = sl += slb;
-      dp = dl += dlb;
-      continue;
-    }
-
-    dp2 = (mlib_u16*)dp;
-    d2end = (mlib_u16*)((mlib_addr)dend &~ 1);
-    sp2 = (mlib_u32 *)(sp - off);
-
-    switch (off) {
-
-      case 0:
-#pragma pipeloop(0)
-        for (; dp2 < d2end; dp2++) {
-          s0 = sp2[0];
-          dp2[0] = s0 >> 16;
-          sp2++;
-        }
-        break;
-
-      case 1:
-#pragma pipeloop(0)
-        for (; dp2 < d2end; dp2++) {
-          s0 = sp2[0];
-          dp2[0] = s0 >> 8;
-          sp2++;
-        }
-        break;
-
-      case 2:
-#pragma pipeloop(0)
-        for (; dp2 < d2end; dp2++) {
-          s0 = sp2[0];
-          dp2[0] = s0;
-          sp2++;
-        }
-        break;
-    }
-
-    sp = (mlib_u8 *)sp2 + off;
-    dp = (mlib_u8 *)dp2;
-    if (dp < dend) {
-      *dp++ = sp[0];
-    }
-
-    sp = sl += slb;
-    dp = dl += dlb;
-  }
-}
-
-/***************************************************************/
-
-void mlib_v_ImageChannelExtract_32_2_1(mlib_f32 *sp, mlib_s32 slb,
-                                       mlib_f32 *dp, mlib_s32 dlb,
-                                       mlib_s32 width, mlib_s32 height)
-{
-  mlib_d64  *sp2;
-  int       i, j, off;
-
-  for (j = 0; j < height; j++) {
-
-    if (((mlib_addr)sp & 7) == 0) {
-      sp2 = (mlib_d64 *)sp;
-#pragma pipeloop(0)
-      for (i = 0; i < width; i++) {
-        d64_2_f32 d;
-        d.d64 = sp2[i];
-        dp[i] = d.f32s.f0;
-      }
-    } else {
-      sp2 = (mlib_d64 *)(sp - 1);
-#pragma pipeloop(0)
-      for (i = 0; i < width; i++) {
-        d64_2_f32 d;
-        d.d64 = sp2[i];
-        dp[i] = d.f32s.f1;
-      }
-    }
-
-    sp += slb;
-    dp += dlb;
-  }
-}
-
-/***************************************************************/
-
-void mlib_v_ImageChannelExtract_32_3_1(mlib_f32 *sl, mlib_s32 slb,
-                                       mlib_f32 *dl, mlib_s32 dlb,
-                                       mlib_s32 width, mlib_s32 height)
-{
-  mlib_f32  *sp = sl;
-  mlib_f32  *dp = dl;
-  mlib_d64  *sp2;
-  d64_2_f32 d0;
-  int       i, j, off;
-
-  for (j = 0; j < height; j++) {
-    mlib_f32 *dend = dl + width;
-
-    if ((mlib_addr)sp & 7) {
-      dp[0] = sp[0];
-      sp += 3;
-      dp ++;
-    }
-
-    sp2 = (mlib_d64 *)sp;
-#pragma pipeloop(0)
-    for (; dp <= (dend-2); dp += 2) {
-      d64_2_f32 d0, d1;
-      d0.d64 = sp2[0];
-      d1.d64 = sp2[1];
-      dp[0] = d0.f32s.f0;
-      dp[1] = d1.f32s.f1;
-      sp2 += 3;
-    }
-
-    if (dp < dend) {
-      d0.d64 = sp2[0];
-      dp[0] = d0.f32s.f0;
-    }
-
-    sp = sl += slb;
-    dp = dl += dlb;
-  }
-}
-
-/***************************************************************/
-
-void mlib_v_ImageChannelExtract_32_3_2(mlib_f32 *sl, mlib_s32 slb,
-                                       mlib_f32 *dl, mlib_s32 dlb,
-                                       mlib_s32 width, mlib_s32 height,
-                                       mlib_s32 count1)
-{
-  mlib_f32  *sp = sl;
-  mlib_f32  *dp = dl;
-  mlib_d64  *sp2;
-  d64_2_f32 d0;
-  int       i, j, off;
-
-  for (j = 0; j < height; j++) {
-    mlib_f32 *dend = dl + 2*width;
-
-    if (count1 == 1) {
-      if (dp < dend) *dp++ = sp[0];
-      sp += 2;
-    }
-
-    if ((mlib_addr)sp & 7) {
-      if (dp < dend) *dp++ = sp[0];
-      if (dp < dend) *dp++ = sp[1];
-      sp += 3;
-    }
-
-    sp2 = (mlib_d64 *)sp;
-#pragma pipeloop(0)
-    for (; dp <= (dend-4); dp += 4) {
-      d64_2_f32 d0, d1, d2;
-      d0.d64 = sp2[0];
-      d1.d64 = sp2[1];
-      d2.d64 = sp2[2];
-      dp[0] = d0.f32s.f0;
-      dp[1] = d0.f32s.f1;
-      dp[2] = d1.f32s.f1;
-      dp[3] = d2.f32s.f0;
-      sp2 += 3;
-    }
-
-    if (dp < dend) {
-      sp = (mlib_f32 *)sp2;
-      *dp++ = sp[0];
-      if (dp < dend) *dp++ = sp[1];
-      if (dp < dend) *dp++ = sp[3];
-    }
-
-    sp = sl += slb;
-    dp = dl += dlb;
-  }
-}
-
-/***************************************************************/
-
-void mlib_v_ImageChannelExtract_32_4_1(mlib_f32 *sp, mlib_s32 slb,
-                                       mlib_f32 *dp, mlib_s32 dlb,
-                                       mlib_s32 width, mlib_s32 height)
-{
-  mlib_d64  *sp2;
-  int       i, j, off;
-
-  for (j = 0; j < height; j++) {
-
-    if (((mlib_addr)sp & 7) == 0) {
-      sp2 = (mlib_d64 *)sp;
-#pragma pipeloop(0)
-      for (i = 0; i < width; i++) {
-        d64_2_f32 d;
-        d.d64 = sp2[2*i];
-        dp[i] = d.f32s.f0;
-      }
-    } else {
-      sp2 = (mlib_d64 *)(sp - 1);
-#pragma pipeloop(0)
-      for (i = 0; i < width; i++) {
-        d64_2_f32 d;
-        d.d64 = sp2[2*i];
-        dp[i] = d.f32s.f1;
-      }
-    }
-
-    sp += slb;
-    dp += dlb;
-  }
-}
-
-/***************************************************************/
-
-void mlib_v_ImageChannelExtract_32_4_2(mlib_f32 *sl, mlib_s32 slb,
-                                       mlib_f32 *dl, mlib_s32 dlb,
-                                       mlib_s32 width, mlib_s32 height,
-                                       mlib_s32 count1)
-{
-  mlib_f32  *sp = sl;
-  mlib_f32  *dp = dl;
-  mlib_d64  *sp2;
-  int       i, j, off;
-  d64_2_f32 d0, d1;
-
-  for (j = 0; j < height; j++) {
-    mlib_f32 *dend = dl + 2*width;
-
-    if (count1 == 1) {
-      dp[0] = sp[0];
-      sp += 3;
-      dp ++;
-    }
-
-    if (((mlib_addr)sp & 7) == 0) {
-      sp2 = (mlib_d64 *)sp;
-#pragma pipeloop(0)
-      for (; dp <= (dend-2); dp += 2) {
-        d64_2_f32 d;
-        d.d64 = sp2[0];
-        dp[0] = d.f32s.f0;
-        dp[1] = d.f32s.f1;
-        sp2 += 2;
-      }
-      if (dp < dend) {
-        d0.d64 = sp2[0];
-        dp[0] = d0.f32s.f0;
-      }
-    } else {
-      sp2 = (mlib_d64 *)(sp - 1);
-#pragma pipeloop(0)
-      for (; dp <= (dend-2); dp += 2) {
-        d64_2_f32 d0, d1;
-        d0.d64 = sp2[0];
-        d1.d64 = sp2[1];
-        dp[0] = d0.f32s.f1;
-        dp[1] = d1.f32s.f0;
-        sp2 += 2;
-      }
-      if (dp < dend) {
-        d0.d64 = sp2[0];
-        dp[0] = d0.f32s.f1;
-      }
-    }
-
-    sp = sl += slb;
-    dp = dl += dlb;
-  }
-}
-
-/***************************************************************/
-
-void mlib_v_ImageChannelExtract_32_4_3(mlib_f32 *sl, mlib_s32 slb,
-                                       mlib_f32 *dl, mlib_s32 dlb,
-                                       mlib_s32 width, mlib_s32 height,
-                                       mlib_s32 count1)
-{
-  mlib_f32  *sp = sl;
-  mlib_f32  *dp = dl;
-  mlib_d64  *sp2;
-  int       i, j, k;
-  d64_2_f32 d0, d1;
-
-  for (j = 0; j < height; j++) {
-    mlib_f32 *dend = dl + 3*width;
-
-    for (k = 0; k < count1; k++) {
-      if (dp < dend) *dp++ = *sp++;
-    }
-    sp++;
-
-    if (((mlib_addr)sp & 7) == 0) {
-      sp2 = (mlib_d64 *)sp;
-#pragma pipeloop(0)
-      for (; dp <= (dend-3); dp += 3) {
-        d64_2_f32 d0, d1;
-        d0.d64 = sp2[0];
-        d1.d64 = sp2[1];
-        dp[0] = d0.f32s.f0;
-        dp[1] = d0.f32s.f1;
-        dp[2] = d1.f32s.f0;
-        sp2 += 2;
-      }
-      if (dp < dend) {
-        d0.d64 = sp2[0];
-        *dp++ = d0.f32s.f0;
-        if (dp < dend) *dp++ = d0.f32s.f1;
-      }
-    } else {
-      sp2 = (mlib_d64 *)(sp - 1);
-#pragma pipeloop(0)
-      for (; dp <= (dend-3); dp += 3) {
-        d64_2_f32 d0, d1;
-        d0.d64 = sp2[0];
-        d1.d64 = sp2[1];
-        dp[0] = d0.f32s.f1;
-        dp[1] = d1.f32s.f0;
-        dp[2] = d1.f32s.f1;
-        sp2 += 2;
-      }
-      if (dp < dend) {
-        d0.d64 = sp2[0];
-        d1.d64 = sp2[1];
-        *dp++ = d0.f32s.f1;
-        if (dp < dend) *dp++ = d1.f32s.f0;
-      }
-    }
-
-    sp = sl += slb;
-    dp = dl += dlb;
-  }
-}
-
-/***************************************************************/
-/* general channel extraction: slower due to the inner loop */
-
-void mlib_v_ImageChannelExtract_U8(mlib_u8  *src, mlib_s32 slb,
-                              mlib_u8  *dst, mlib_s32 dlb,
-                              mlib_s32 channels, mlib_s32 channeld,
-                              mlib_s32 width, mlib_s32 height,
-                              mlib_s32 cmask)
-{
-  mlib_u8   *sp;              /* pointer for pixel in src */
-  mlib_u8   *sl;              /* pointer for line in src  */
-  mlib_u8   *dp;              /* pointer for pixel in dst */
-  mlib_u8   *dl;              /* pointer for line in dst  */
-  int       i, j, k;          /* indices for x, y, channel */
-  int       deltac[5] = { 0, 1, 1, 1, 1 };
-  int       inc0, inc1, inc2, inc3;
-  mlib_u8   s0, s1, s2, s3;
-
-  deltac[channeld] = 1;
-  for (i = (channels - 1), k = 0; i >= 0; i--) {
-    if ((cmask & (1 << i)) == 0)
-      deltac[k]++;
-    else
-      k++;
-  }
-
-  deltac[channeld] = channels;
-  for (i = 1; i < channeld; i++) {
-    deltac[channeld] -= deltac[i];
-  }
-
-  sp = sl = src + deltac[0];
-  dp = dl = dst;
-
-/* Only THREE CHANNEL CASE could be executed here!!! */
-
-  inc0 = deltac[1];
-  inc1 = deltac[2] + inc0;
-  inc2 = deltac[3] + inc1;
-  for (j = 0; j < height; j++) {
-    for (i = 0; i < width; i++) {
-#pragma pipeloop(0)
-      s0 = sp[0]; s1 = sp[inc0]; s2 = sp[inc1];
-      dp[0] = s0;
-      dp[1] = s1;
-      dp[2] = s2;
-      sp   += inc2;
-      dp   += 3;
-    }
-    sp = sl += slb;
-    dp = dl += dlb;
-  }
-}
-
-/***************************************************************/
-/* general channel extraction: slower due to the inner loop */
-
-void mlib_v_ImageChannelExtract_S16(mlib_u16 *src,    mlib_s32 slb,
-                                    mlib_u16 *dst,    mlib_s32 dlb,
-                                    mlib_s32 channels, mlib_s32 channeld,
-                                    mlib_s32 width,    mlib_s32 height,
-                                    mlib_s32 cmask)
-{
-  mlib_u16   *sp;              /* pointer for pixel in src */
-  mlib_u16   *sl;              /* pointer for line in src  */
-  mlib_u16   *dp;              /* pointer for pixel in dst */
-  mlib_u16   *dl;              /* pointer for line in dst  */
-  int       i, j, k;          /* indices for x, y, channel */
-  int       deltac[5] = { 0, 1, 1, 1, 1 };
-  int       inc0, inc1, inc2, inc3;
-  mlib_u16   s0, s1, s2, s3;
-
-  slb >>= 1;
-  dlb >>= 1;
-
-  deltac[channeld] = 1;
-  for (i = (channels - 1), k = 0; i >= 0; i--) {
-    if ((cmask & (1 << i)) == 0)
-      deltac[k]++;
-    else
-      k++;
-  }
-
-  deltac[channeld] = channels;
-  for (i = 1; i < channeld; i++) {
-    deltac[channeld] -= deltac[i];
-  }
-
-  sp = sl = src + deltac[0];
-  dp = dl = dst;
-
-  if (channeld == 2) {
-    inc0 = deltac[1];
-    inc1 = deltac[2] + inc0;
-    for (j = 0; j < height; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < width; i++) {
-        s0 = sp[0]; s1 = sp[inc0];
-        dp[0] = s0;
-        dp[1] = s1;
-        sp   += inc1;
-        dp   += 2;
-      }
-      sp = sl = sl + slb;
-      dp = dl = dl + dlb;
-    }
-  } else
-
-  if (channeld == 3) {
-    inc0 = deltac[1];
-    inc1 = deltac[2] + inc0;
-    inc2 = deltac[3] + inc1;
-    for (j = 0; j < height; j++) {
-      for (i = 0; i < width; i++) {
-#pragma pipeloop(0)
-        s0 = sp[0]; s1 = sp[inc0]; s2 = sp[inc1];
-        dp[0] = s0;
-        dp[1] = s1;
-        dp[2] = s2;
-        sp   += inc2;
-        dp   += 3;
-      }
-      sp = sl = sl + slb;
-      dp = dl = dl + dlb;
-    }
-  }}
-
-/***************************************************************/
-/* general channel extraction: slower due to the inner loop */
-
-void mlib_v_ImageChannelExtract_D64(mlib_d64 *src,    mlib_s32 slb,
-                                    mlib_d64 *dst,    mlib_s32 dlb,
-                                    mlib_s32 channels, mlib_s32 channeld,
-                                    mlib_s32 width,    mlib_s32 height,
-                                    mlib_s32 cmask)
-{
-  mlib_d64   *sp;              /* pointer for pixel in src */
-  mlib_d64   *sl;              /* pointer for line in src  */
-  mlib_d64   *dp;              /* pointer for pixel in dst */
-  mlib_d64   *dl;              /* pointer for line in dst  */
-  int        i, j, k;          /* indices for x, y, channel */
-  int        deltac[5] = { 0, 1, 1, 1, 1 };
-  int        inc0, inc1, inc2, inc3;
-  mlib_d64   s0, s1, s2, s3;
-
-  deltac[channeld] = 1;
-  for (i = (channels - 1), k = 0; i >= 0; i--) {
-    if ((cmask & (1 << i)) == 0)
-      deltac[k]++;
-    else
-      k++;
-  }
-
-  deltac[channeld] = channels;
-  for (i = 1; i < channeld; i++) {
-    deltac[channeld] -= deltac[i];
-  }
-
-  sp = sl = src + deltac[0];
-  dp = dl = dst;
-
-  if (channeld == 1) {
-    for (j = 0; j < height; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < width; i++) {
-        s0 = sp[0];
-        dp[i] = s0;
-        sp   += channels;
-      }
-      sp = sl = (mlib_d64 *)((mlib_u8 *)sl + slb);
-      dp = dl = (mlib_d64 *)((mlib_u8 *)dl + dlb);
-    }
-  } else
-
-  if (channeld == 2) {
-    inc0 = deltac[1];
-    inc1 = deltac[2] + inc0;
-    for (j = 0; j < height; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < width; i++) {
-        s0 = sp[0]; s1 = sp[inc0];
-        dp[0] = s0;
-        dp[1] = s1;
-        sp   += inc1;
-        dp   += 2;
-      }
-      sp = sl = (mlib_d64 *)((mlib_u8 *)sl + slb);
-      dp = dl = (mlib_d64 *)((mlib_u8 *)dl + dlb);
-    }
-  } else
-
-  if (channeld == 3) {
-    inc0 = deltac[1];
-    inc1 = deltac[2] + inc0;
-    inc2 = deltac[3] + inc1;
-    for (j = 0; j < height; j++) {
-      for (i = 0; i < width; i++) {
-#pragma pipeloop(0)
-        s0 = sp[0]; s1 = sp[inc0]; s2 = sp[inc1];
-        dp[0] = s0;
-        dp[1] = s1;
-        dp[2] = s2;
-        sp   += inc2;
-        dp   += 3;
-      }
-      sp = sl = (mlib_d64 *)((mlib_u8 *)sl + slb);
-      dp = dl = (mlib_d64 *)((mlib_u8 *)dl + dlb);
-    }
-  }
-}
diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert.c
deleted file mode 100644
index f9fbf93e677..00000000000
--- a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert.c
+++ /dev/null
@@ -1,715 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, 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.
- */
-
-
-
-
-/*
- * FUNCTIONS
- *      mlib_ImageChannelInsert   - Copy the source image into the selected
- *                                                        channels of the destination image
- *
- * SYNOPSIS
- *      mlib_status mlib_ImageChannelInsert(mlib_image *dst,
- *                                                                        mlib_image *src,
- *                                                                      mlib_s32   cmask);
- *
- * ARGUMENT
- *  dst     Pointer to destination image.
- *  src     Pointer to source image.
- *  cmask   Destination channel selection mask.
- *              The least significant bit (LSB) is corresponding to the
- *              last channel in the destination image data.
- *              The bits with value 1 stand for the channels selected.
- *              If more than N channels are selected, the leftmost N
- *              channels are inserted, where N is the number of channels
- *              in the source image.
- *
- * RESTRICTION
- *              The src and dst must have the same width, height and data type.
- *              The src and dst can have 1, 2, 3 or 4 channels.
- *              The src and dst can be either MLIB_BYTE, MLIB_SHORT, MLIB_INT,
- *          MLIB_FLOAT or MLIB_DOUBLE.
- *
- * DESCRIPTION
- *          Copy the source image into the selected channels of the destination
- *              image
- */
-
-#include <stdlib.h>
-#include "mlib_image.h"
-#include "mlib_ImageCheck.h"
-
-/***************************************************************/
-/* functions defined in mlib_v_ImageChannelInsert_1.c */
-
-void
-mlib_v_ImageChannelInsert_U8(mlib_u8  *src,  mlib_s32 slb,
-                             mlib_u8  *dst,  mlib_s32 dlb,
-                             mlib_s32 channels,
-                             mlib_s32 channeld,
-                             mlib_s32 width,  mlib_s32 height,
-                             mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_D64(mlib_d64  *src,  mlib_s32 slb,
-                              mlib_d64  *dst,  mlib_s32 dlb,
-                              mlib_s32 channels,
-                              mlib_s32 channeld,
-                              mlib_s32 width,  mlib_s32 height,
-                              mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_S16(mlib_s16 *src,  mlib_s32 slb,
-                              mlib_s16 *dst,  mlib_s32 dlb,
-                              mlib_s32 channels,
-                              mlib_s32 channeld,
-                              mlib_s32 width,  mlib_s32 height,
-                              mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_S32(mlib_s32 *src,  mlib_s32 slb,
-                              mlib_s32 *dst,  mlib_s32 dlb,
-                              mlib_s32 channels,
-                              mlib_s32 channeld,
-                              mlib_s32 width,  mlib_s32 height,
-                              mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_U8_12_A8D1X8(mlib_u8  *src,
-                                                               mlib_u8  *dst,
-                                                         mlib_s32 dsize,
-                                                         mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_U8_12_A8D2X8(mlib_u8  *src,  mlib_s32 slb,
-                                                               mlib_u8  *dst,  mlib_s32 dlb,
-                                                       mlib_s32 xsize, mlib_s32 ysize,
-                                                               mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_U8_12_D1(mlib_u8  *src,
-                                                           mlib_u8  *dst,
-                                                   mlib_s32 dsize,
-                                                           mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_U8_12(mlib_u8  *src,  mlib_s32 slb,
-                                                        mlib_u8  *dst,  mlib_s32 dlb,
-                                                mlib_s32 xsize, mlib_s32 ysize,
-                                                        mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_U8_13_A8D1X8(mlib_u8  *src,
-                                                               mlib_u8  *dst,
-                                                       mlib_s32 dsize,
-                                                               mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_U8_13_A8D2X8(mlib_u8  *src,  mlib_s32 slb,
-                                                               mlib_u8  *dst,  mlib_s32 dlb,
-                                                         mlib_s32 xsize, mlib_s32 ysize,
-                                                               mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_U8_13_D1(mlib_u8  *src,
-                                                           mlib_u8  *dst,
-                                                     mlib_s32 dsize,
-                                                           mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_U8_13(mlib_u8  *src,  mlib_s32 slb,
-                                                        mlib_u8  *dst,  mlib_s32 dlb,
-                                                  mlib_s32 xsize, mlib_s32 ysize,
-                                                        mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_U8_14_A8D1X8(mlib_u8  *src,
-                                                               mlib_u8  *dst,
-                                                       mlib_s32 dsize,
-                                                               mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_U8_14_A8D2X8(mlib_u8  *src,  mlib_s32 slb,
-                                                               mlib_u8  *dst,  mlib_s32 dlb,
-                                                       mlib_s32 xsize, mlib_s32 ysize,
-                                                               mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_U8_14_D1(mlib_u8  *src,
-                                                           mlib_u8  *dst,
-                                                   mlib_s32 dsize,
-                                                           mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_U8_14(mlib_u8  *src,  mlib_s32 slb,
-                                                        mlib_u8  *dst,  mlib_s32 dlb,
-                                                mlib_s32 xsize, mlib_s32 ysize,
-                                                        mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_S16_12_A8D1X4(mlib_s16 *src,
-                                                                      mlib_s16 *dst,
-                                                        mlib_s32 dsize,
-                                                                mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_S16_12_A8D2X4(mlib_s16 *src,  mlib_s32 slb,
-                                                                      mlib_s16 *dst,  mlib_s32 dlb,
-                                                        mlib_s32 xsize, mlib_s32 ysize,
-                                                                mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_S16_12_D1(mlib_s16 *src,
-                                                            mlib_s16 *dst,
-                                                    mlib_s32 dsize,
-                                                            mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_S16_12(mlib_s16 *src,  mlib_s32 slb,
-                                                        mlib_s16 *dst,  mlib_s32 dlb,
-                                                  mlib_s32 xsize, mlib_s32 ysize,
-                                                  mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_S16_13_A8D1X4(mlib_s16 *src,
-                                                                      mlib_s16 *dst,
-                                                        mlib_s32 dsize,
-                                                                mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_S16_13_A8D2X4(mlib_s16 *src,  mlib_s32 slb,
-                                                                      mlib_s16 *dst,  mlib_s32 dlb,
-                                                        mlib_s32 xsize, mlib_s32 ysize,
-                                                                mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_S16_13_D1(mlib_s16 *src,
-                                                            mlib_s16 *dst,
-                                                    mlib_s32 dsize,
-                                                            mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_S16_13(mlib_s16 *src,  mlib_s32 slb,
-                                                         mlib_s16 *dst,  mlib_s32 dlb,
-                                                 mlib_s32 xsize, mlib_s32 ysize,
-                                                         mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_S16_14_A8D1X4(mlib_s16 *src,
-                                                                      mlib_s16 *dst,
-                                                          mlib_s32 dsize,
-                                                                      mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_S16_14_A8D2X4(mlib_s16 *src,  mlib_s32 slb,
-                                                                      mlib_s16 *dst,  mlib_s32 dlb,
-                                                          mlib_s32 xsize, mlib_s32 ysize,
-                                                                      mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_S16_14_D1(mlib_s16 *src,
-                                                            mlib_s16 *dst,
-                                                    mlib_s32 dsize,
-                                                            mlib_s32 cmask);
-void
-mlib_v_ImageChannelInsert_S16_14(mlib_s16 *src,  mlib_s32 slb,
-                                                         mlib_s16 *dst,  mlib_s32 dlb,
-                                                 mlib_s32 xsize, mlib_s32 ysize,
-                                                         mlib_s32 cmask);
-
-/***************************************************************/
-/* functions defined in mlib_v_ImageChannelInsert_34.c */
-
-void
-mlib_v_ImageChannelInsert_U8_34R_A8D1X8(mlib_u8  *src,
-                                                                mlib_u8  *dst,
-                                                                mlib_s32 dsize);
-void
-mlib_v_ImageChannelInsert_U8_34R_A8D2X8(mlib_u8  *src,  mlib_s32 slb,
-                                                                mlib_u8  *dst,  mlib_s32 dlb,
-                                                                mlib_s32 xsize, mlib_s32 ysize);
-void
-mlib_v_ImageChannelInsert_U8_34R_D1(mlib_u8  *src,
-                                                            mlib_u8  *dst,
-                                                            mlib_s32 dsize);
-void
-mlib_v_ImageChannelInsert_U8_34R(mlib_u8  *src,  mlib_s32 slb,
-                                                 mlib_u8  *dst,  mlib_s32 dlb,
-                                                         mlib_s32 xsize, mlib_s32 ysize);
-void
-mlib_v_ImageChannelInsert_S16_34R_A8D1X4(mlib_s16 *src,
-                                                                 mlib_s16 *dst,
-                                                                 mlib_s32 dsize);
-void
-mlib_v_ImageChannelInsert_S16_34R_A8D2X4(mlib_s16 *src,  mlib_s32 slb,
-                                                                 mlib_s16 *dst,  mlib_s32 dlb,
-                                                                 mlib_s32 xsize, mlib_s32 ysize);
-void
-mlib_v_ImageChannelInsert_S16_34R_D1(mlib_s16 *src,
-                                                             mlib_s16 *dst,
-                                                             mlib_s32 dsize);
-void
-mlib_v_ImageChannelInsert_S16_34R(mlib_s16 *src,  mlib_s32 slb,
-                                                          mlib_s16 *dst,  mlib_s32 dlb,
-                                                          mlib_s32 xsize, mlib_s32 ysize);
-void
-mlib_v_ImageChannelInsert_U8_34L_A8D1X8(mlib_u8  *src,
-                                                                mlib_u8  *dst,
-                                                                mlib_s32 dsize);
-void
-mlib_v_ImageChannelInsert_U8_34L_A8D2X8(mlib_u8  *src,  mlib_s32 slb,
-                                                                mlib_u8  *dst,  mlib_s32 dlb,
-                                                        mlib_s32 xsize, mlib_s32 ysize);
-void
-mlib_v_ImageChannelInsert_U8_34L_D1(mlib_u8  *src,
-                                                            mlib_u8  *dst,
-                                                            mlib_s32 dsize);
-void
-mlib_v_ImageChannelInsert_U8_34L(mlib_u8  *src,  mlib_s32 slb,
-                                                         mlib_u8  *dst,  mlib_s32 dlb,
-                                                         mlib_s32 xsize, mlib_s32 ysize);
-void
-mlib_v_ImageChannelInsert_S16_34L_A8D1X4(mlib_s16 *src,
-                                                                 mlib_s16 *dst,
-                                                                 mlib_s32 dsize);
-void
-mlib_v_ImageChannelInsert_S16_34L_A8D2X4(mlib_s16 *src,  mlib_s32 slb,
-                                                                 mlib_s16 *dst,  mlib_s32 dlb,
-                                                                 mlib_s32 xsize, mlib_s32 ysize);
-void
-mlib_v_ImageChannelInsert_S16_34L_D1(mlib_s16 *src,
-                                                             mlib_s16 *dst,
-                                                             mlib_s32 dsize);
-void
-mlib_v_ImageChannelInsert_S16_34L(mlib_s16 *src,  mlib_s32 slb,
-                                                          mlib_s16 *dst,  mlib_s32 dlb,
-                                                          mlib_s32 xsize, mlib_s32 ysize);
-
-
-/***************************************************************/
-
-#ifdef MLIB_TEST
-mlib_status
-mlib_v_ImageChannelInsert(mlib_image *dst,
-                                            mlib_image *src,
-                                          mlib_s32   cmask)
-#else
-mlib_status
-mlib_ImageChannelInsert(mlib_image *dst,
-                                        mlib_image *src,
-                                        mlib_s32   cmask)
-#endif
-{
-  const mlib_s32  X8 = 0x7;
-  const mlib_s32  X4 = 0x3;
-  const mlib_s32  X2 = 0x1;
-  const mlib_s32  A8D1   = MLIB_IMAGE_ALIGNED8 | MLIB_IMAGE_ONEDVECTOR;
-  const mlib_s32  A8D2X8 = MLIB_IMAGE_ALIGNED8 | MLIB_IMAGE_STRIDE8X | MLIB_IMAGE_WIDTH8X;
-  const mlib_s32  A8D2X4 = MLIB_IMAGE_ALIGNED8 | MLIB_IMAGE_STRIDE8X | MLIB_IMAGE_WIDTH4X;
-  const mlib_s32  A8D2X2 = MLIB_IMAGE_ALIGNED8 | MLIB_IMAGE_STRIDE8X | MLIB_IMAGE_WIDTH2X;
-
-  void      *sp;                      /* pointer for pixel in src */
-  void      *dp;                      /* pointer for pixel in dst */
-  mlib_s32  ncmask = 0;         /* normalized channel mask */
-  mlib_s32  channels;             /* number of channels for src */
-  mlib_s32  channeld;             /* number of channels for dst */
-  mlib_s32  width, height;/* for src and dst */
-  mlib_s32  strides;              /* strides in bytes for src */
-  mlib_s32  strided;            /* strides in bytes for dst */
-  mlib_s32  flags;
-  mlib_s32  flagd;
-  mlib_s32  dsize;
-  int         i, bit1count = 0;
-
-  MLIB_IMAGE_CHECK(src);
-  MLIB_IMAGE_CHECK(dst);
-  MLIB_IMAGE_TYPE_EQUAL(src,dst);
-  MLIB_IMAGE_SIZE_EQUAL(src,dst);
-
-  channels = mlib_ImageGetChannels(src);
-  channeld = mlib_ImageGetChannels(dst);
-  width    = mlib_ImageGetWidth(src);
-  height   = mlib_ImageGetHeight(src);
-  strides  = mlib_ImageGetStride(src);
-  strided  = mlib_ImageGetStride(dst);
-  sp       = mlib_ImageGetData(src);
-  dp       = mlib_ImageGetData(dst);
-  flags    = mlib_ImageGetFlags(src);
-  flagd    = mlib_ImageGetFlags(dst);
-  dsize    = width * height;
-
-  /* normalize the cmask, and count the number of bit with value 1 */
-  for (i = (channeld - 1); i >= 0; i--) {
-    if (((cmask & (1 << i)) != 0) && (bit1count < channels)) {
-      ncmask += (1 << i);
-      bit1count++;
-    }
-  }
-
-  /* do not support the cases in which the number of selected channels is
-   * less than the nubmber of channels in the source image */
-  if (bit1count < channels) {
-    return MLIB_FAILURE;
-  }
-
-  if (((channels == 1) && (channeld == 1)) ||
-      ((channels == 2) && (channeld == 2)) ||
-      ((channels == 3) && (channeld == 3)) ||
-      ((channels == 4) && (channeld == 4))) {
-      return mlib_ImageCopy(dst, src);
-  }
-
-  switch (mlib_ImageGetType(src)) {
-    case MLIB_BYTE:
-      if (channels == 1) {
-        switch (channeld) {
-          case 2:
-            if (((flags & A8D1) == 0) &&
-                ((flagd & A8D1) == 0) &&
-                ((dsize & X8)   == 0)) {
-                mlib_v_ImageChannelInsert_U8_12_A8D1X8((mlib_u8 *)sp,
-                                                                             (mlib_u8 *)dp,
-                                                                             dsize,
-                                                                                     ncmask);
-            }
-            else if (((flags & A8D2X8) == 0) &&
-              ((flagd & A8D2X8) == 0)) {
-              mlib_v_ImageChannelInsert_U8_12_A8D2X8((mlib_u8 *)sp, strides,
-                                                                             (mlib_u8 *)dp, strided,
-                                                                             width, height,
-                                                                                     ncmask);
-            }
-            else if (((flags & MLIB_IMAGE_ONEDVECTOR) == 0) &&
-               ((flagd & MLIB_IMAGE_ONEDVECTOR) == 0)) {
-                mlib_v_ImageChannelInsert_U8_12_D1((mlib_u8 *)sp,
-                                                                                 (mlib_u8 *)dp,
-                                                                                 dsize,
-                                                                                 ncmask);
-            }
-            else {
-                mlib_v_ImageChannelInsert_U8_12((mlib_u8 *)sp, strides,
-                                                                      (mlib_u8 *)dp, strided,
-                                                                      width, height,
-                                                                              ncmask);
-            }
-            break;
-
-          case 3:
-            if (((flags & A8D1) == 0) &&
-                ((flagd & A8D1) == 0) &&
-                ((dsize & X8)   == 0)) {
-                mlib_v_ImageChannelInsert_U8_13_A8D1X8((mlib_u8 *)sp,
-                                                                                 (mlib_u8 *)dp,
-                                                                               dsize,
-                                                                                           ncmask);
-            }
-            else if (((flags & A8D2X8) == 0) &&
-              ((flagd & A8D2X8) == 0)) {
-                mlib_v_ImageChannelInsert_U8_13_A8D2X8((mlib_u8 *)sp, strides,
-                                                                                     (mlib_u8 *)dp, strided,
-                                                                             width, height,
-                                                                                     ncmask);
-            }
-            else if (((flags & MLIB_IMAGE_ONEDVECTOR) == 0) &&
-               ((flagd & MLIB_IMAGE_ONEDVECTOR) == 0)) {
-                mlib_v_ImageChannelInsert_U8_13_D1((mlib_u8 *)sp,
-                                                                                 (mlib_u8 *)dp,
-                                                                                 dsize,
-                                                                                 ncmask);
-            }
-            else {
-              mlib_v_ImageChannelInsert_U8_13((mlib_u8 *)sp, strides,
-                                                                      (mlib_u8 *)dp, strided,
-                                                                      width, height,
-                                                                      ncmask);
-            }
-            break;
-
-          case 4:
-            if (((flags & A8D1) == 0) &&
-                ((flagd & A8D1) == 0) &&
-                ((dsize & X8)   == 0)) {
-                  mlib_v_ImageChannelInsert_U8_14_A8D1X8((mlib_u8 *)sp,
-                                                                                   (mlib_u8 *)dp,
-                                                                                 dsize,
-                                                                                             ncmask);
-            }
-            else if (((flags & A8D2X8) == 0) &&
-               ((flagd & A8D2X8) == 0)) {
-               mlib_v_ImageChannelInsert_U8_14_A8D2X8((mlib_u8 *)sp, strides,
-                                                                      (mlib_u8 *)dp, strided,
-                                                                              width, height,
-                                                                                          ncmask);
-            }
-            else if (((flags & MLIB_IMAGE_ONEDVECTOR) == 0) &&
-              ((flagd & MLIB_IMAGE_ONEDVECTOR) == 0)) {
-                mlib_v_ImageChannelInsert_U8_14_D1((mlib_u8 *)sp,
-                                                                                 (mlib_u8 *)dp,
-                                                                                 dsize,
-                                                                                 ncmask);
-            }
-            else {
-              mlib_v_ImageChannelInsert_U8_14((mlib_u8 *)sp, strides,
-                                                                      (mlib_u8 *)dp, strided,
-                                                                      width, height,
-                                                                      ncmask);
-            }
-            break;
-
-          default:
-            return MLIB_FAILURE;
-        }
-      }
-      else {
-        if ((channels == 3) && (channeld == 4) && (ncmask == 7)) {
-          if (((flags & A8D1) == 0) &&
-            ((flagd & A8D1) == 0) &&
-            ((dsize & X8)   == 0)) {
-            mlib_v_ImageChannelInsert_U8_34R_A8D1X8((mlib_u8 *)sp,
-                                                                          (mlib_u8 *)dp,
-                                                                          dsize);
-          }
-        else if (((flags & A8D2X8) == 0) &&
-               ((flagd & A8D2X8) == 0)) {
-              mlib_v_ImageChannelInsert_U8_34R_A8D2X8((mlib_u8 *)sp, strides,
-                                                                                    (mlib_u8 *)dp, strided,
-                                                                              width, height);
-        }
-        else if (((flags & MLIB_IMAGE_ONEDVECTOR) == 0) &&
-               ((flagd & MLIB_IMAGE_ONEDVECTOR) == 0)) {
-              mlib_v_ImageChannelInsert_U8_34R_D1((mlib_u8 *)sp,
-                                                                          (mlib_u8 *)dp,
-                                                                          dsize);
-        }
-        else {
-              mlib_v_ImageChannelInsert_U8_34R((mlib_u8 *)sp, strides,
-                                                                      (mlib_u8 *)dp, strided,
-                                                                      width, height);
-        }
-      }
-      else if ((channels == 3) && (channeld == 4) && (ncmask == 14)) {
-        if (((flags & A8D1) == 0) &&
-            ((flagd & A8D1) == 0) &&
-            ((dsize & X8)   == 0)) {
-            mlib_v_ImageChannelInsert_U8_34L_A8D1X8((mlib_u8 *)sp,
-                                                                            (mlib_u8 *)dp,
-                                                                          dsize);
-              }
-        else if (((flags & A8D2X8) == 0) &&
-                 ((flagd & A8D2X8) == 0)) {
-                 mlib_v_ImageChannelInsert_U8_34L_A8D2X8((mlib_u8 *)sp, strides,
-                                                                                  (mlib_u8 *)dp, strided,
-                                                                          width, height);
-        }
-        else if (((flags & MLIB_IMAGE_ONEDVECTOR) == 0) &&
-                 ((flagd & MLIB_IMAGE_ONEDVECTOR) == 0)) {
-                 mlib_v_ImageChannelInsert_U8_34L_D1((mlib_u8 *)sp,
-                                                                      (mlib_u8 *)dp,
-                                                                      dsize);
-        }
-        else mlib_v_ImageChannelInsert_U8_34L((mlib_u8 *)sp, strides,
-                                                                   (mlib_u8 *)dp, strided,
-                                                                   width, height);
-        }
-      else {
-
-      mlib_v_ImageChannelInsert_U8((mlib_u8 *)sp, strides,
-                                                     (mlib_u8 *)dp, strided,
-                                                     channels, channeld,
-                                                     width, height,
-                                                     ncmask);
-      }
-  }
-  break;
-
-    case MLIB_SHORT:
-      if (channels == 1) {
-        switch (channeld) {
-          case 2:
-            if (((flags & A8D1) == 0) &&
-                ((flagd & A8D1) == 0) &&
-                ((dsize & X4)   == 0)) {
-              mlib_v_ImageChannelInsert_S16_12_A8D1X4((mlib_s16 *)sp,
-                                                                                    (mlib_s16 *)dp,
-                                                                                      dsize,
-                                                                                      ncmask);
-            }
-            else if (((flags & A8D2X4) == 0) &&
-               ((flagd & A8D2X4) == 0)) {
-              mlib_v_ImageChannelInsert_S16_12_A8D2X4((mlib_s16 *)sp, strides,
-                                                                              (mlib_s16 *)dp, strided,
-                                                                              width, height,
-                                                                                      ncmask);
-            }
-            else if (((flags & MLIB_IMAGE_ONEDVECTOR) == 0) &&
-               ((flagd & MLIB_IMAGE_ONEDVECTOR) == 0)) {
-             mlib_v_ImageChannelInsert_S16_12_D1((mlib_s16 *)sp,
-                                                                           (mlib_s16 *)dp,
-                                                                          dsize,
-                                                                                  ncmask);
-            }
-            else {
-              mlib_v_ImageChannelInsert_S16_12((mlib_s16 *)sp, strides,
-                                                                       (mlib_s16 *)dp, strided,
-                                                                       width, height,
-                                                                       ncmask);
-            }
-            break;
-
-          case 3:
-            if (((flags & A8D1) == 0) &&
-                ((flagd & A8D1) == 0) &&
-                ((dsize & X4)   == 0)) {
-              mlib_v_ImageChannelInsert_S16_13_A8D1X4((mlib_s16 *)sp,
-                                                                              (mlib_s16 *)dp,
-                                                                                      dsize,
-                                                                                      ncmask);
-            }
-            else if (((flags & A8D2X4) == 0) &&
-               ((flagd & A8D2X4) == 0)) {
-              mlib_v_ImageChannelInsert_S16_13_A8D2X4((mlib_s16 *)sp, strides,
-                                                                              (mlib_s16 *)dp, strided,
-                                                                              width, height,
-                                                                                      ncmask);
-            }
-            else if (((flags & MLIB_IMAGE_ONEDVECTOR) == 0) &&
-               ((flagd & MLIB_IMAGE_ONEDVECTOR) == 0)) {
-                mlib_v_ImageChannelInsert_S16_13_D1((mlib_s16 *)sp,
-                                                                                  (mlib_s16 *)dp,
-                                                                                  dsize,
-                                                                                  ncmask);
-            }
-            else {
-              mlib_v_ImageChannelInsert_S16_13((mlib_s16 *)sp, strides,
-                                                                       (mlib_s16 *)dp, strided,
-                                                                       width, height,
-                                                                       ncmask);
-            }
-            break;
-
-          case 4:
-            if (((flags & A8D1) == 0) &&
-                ((flagd & A8D1) == 0) &&
-                ((dsize & X4)   == 0)) {
-              mlib_v_ImageChannelInsert_S16_14_A8D1X4((mlib_s16 *)sp,
-                                                                                    (mlib_s16 *)dp,
-                                                      dsize,
-                                                      ncmask);
-            }
-            else if (((flags & A8D2X4) == 0) &&
-               ((flagd & A8D2X4) == 0)) {
-              mlib_v_ImageChannelInsert_S16_14_A8D2X4((mlib_s16 *)sp, strides,
-                                                                              (mlib_s16 *)dp, strided,
-                                                                              width, height,
-                                                                                      ncmask);
-            }
-            else if (((flags & MLIB_IMAGE_ONEDVECTOR) == 0) &&
-               ((flagd & MLIB_IMAGE_ONEDVECTOR) == 0)) {
-              mlib_v_ImageChannelInsert_S16_14_D1((mlib_s16 *)sp,
-                                                                          (mlib_s16 *)dp,
-                                                                          dsize,
-                                                                                  ncmask);
-            }
-            else {
-              mlib_v_ImageChannelInsert_S16_14((mlib_s16 *)sp, strides,
-                                                                       (mlib_s16 *)dp, strided,
-                                                                       width, height,
-                                                                       ncmask);
-            }
-            break;
-          default:
-            return MLIB_FAILURE;
-        }
-      }
-      else if ((channels == 3) && (channeld == 4) && (ncmask == 7)) {
-        if (((flags & A8D1) == 0) &&
-            ((flagd & A8D1) == 0) &&
-            ((dsize & X4)   == 0)) {
-          mlib_v_ImageChannelInsert_S16_34R_A8D1X4((mlib_s16 *)sp,
-                                                                           (mlib_s16 *)dp,
-                                                                           dsize);
-        }
-        else if (((flags & A8D2X4) == 0) &&
-           ((flagd & A8D2X4) == 0)) {
-          mlib_v_ImageChannelInsert_S16_34R_A8D2X4((mlib_s16 *)sp, strides,
-                                                                           (mlib_s16 *)dp, strided,
-                                                                           width, height);
-        }
-        else if (((flags & MLIB_IMAGE_ONEDVECTOR) == 0) &&
-           ((flagd & MLIB_IMAGE_ONEDVECTOR) == 0)) {
-          mlib_v_ImageChannelInsert_S16_34R_D1((mlib_s16 *)sp,
-                                                                       (mlib_s16 *)dp,
-                                                                       dsize);
-        }
-        else {
-          mlib_v_ImageChannelInsert_S16_34R((mlib_s16 *)sp, strides,
-                                                                    (mlib_s16 *)dp, strided,
-                                                                     width, height);
-        }
-      }
-      else if ((channels == 3) && (channeld == 4) && (ncmask == 14)) {
-        if (((flags & A8D1) == 0) &&
-            ((flagd & A8D1) == 0) &&
-            ((dsize & X4)   == 0)) {
-          mlib_v_ImageChannelInsert_S16_34L_A8D1X4((mlib_s16 *)sp,
-                                                                           (mlib_s16 *)dp,
-                                                                           dsize);
-        }
-        else if (((flags & A8D2X4) == 0) &&
-           ((flagd & A8D2X4) == 0)) {
-          mlib_v_ImageChannelInsert_S16_34L_A8D2X4((mlib_s16 *)sp, strides,
-                                                                           (mlib_s16 *)dp, strided,
-                                                                           width, height);
-        }
-        else if (((flags & MLIB_IMAGE_ONEDVECTOR) == 0) &&
-           ((flagd & MLIB_IMAGE_ONEDVECTOR) == 0)) {
-          mlib_v_ImageChannelInsert_S16_34L_D1((mlib_s16 *)sp,
-                                                                       (mlib_s16 *)dp,
-                                                                       dsize);
-        }
-        else {
-          mlib_v_ImageChannelInsert_S16_34L((mlib_s16 *)sp, strides,
-                                                                    (mlib_s16 *)dp, strided,
-                                                                    width, height);
-        }
-      }
-      else {
-        mlib_v_ImageChannelInsert_S16((mlib_s16 *)sp, strides,
-                                                              (mlib_s16 *)dp, strided,
-                                                              channels,  channeld,
-                                                              width, height,
-                                                              ncmask);
-      }
-      break;
-
-    case MLIB_INT:
-        mlib_v_ImageChannelInsert_S32((mlib_s32 *)sp, strides,
-                                      (mlib_s32 *)dp, strided,
-                                      channels, channeld,
-                                      width, height,
-                                      ncmask);
-        break;
-
-    case MLIB_FLOAT:
-        mlib_v_ImageChannelInsert_S32((mlib_s32 *)sp, strides,
-                                      (mlib_s32 *)dp, strided,
-                                      channels, channeld,
-                                      width, height,
-                                      ncmask);
-        break;
-
-
-    case MLIB_DOUBLE:
-        mlib_v_ImageChannelInsert_D64((mlib_d64 *)sp, strides,
-                                      (mlib_d64 *)dp, strided,
-                                      channels, channeld,
-                                      width, height,
-                                      ncmask);
-        break;
-
-
-    case MLIB_BIT:
-    default:
-        return MLIB_FAILURE;    /* MLIB_BIT is not supported here */
-  }
-
-  return MLIB_SUCCESS;
-}
-/***************************************************************/
diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert.h b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert.h
index ff3c228548d..e6840157948 100644
--- a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert.h
+++ b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert.h
@@ -32,290 +32,21 @@
 extern "C" {
 #endif /* __cplusplus */
 
-void mlib_v_ImageChannelInsert_U8(const mlib_u8 *src,
-                                  mlib_s32      slb,
-                                  mlib_u8       *dst,
-                                  mlib_s32      dlb,
-                                  mlib_s32      channels,
-                                  mlib_s32      channeld,
-                                  mlib_s32      width,
-                                  mlib_s32      height,
-                                  mlib_s32      cmask);
-
-void mlib_v_ImageChannelInsert_D64(const mlib_d64 *src,
-                                   mlib_s32       slb,
-                                   mlib_d64       *dst,
-                                   mlib_s32       dlb,
-                                   mlib_s32       channels,
-                                   mlib_s32       channeld,
-                                   mlib_s32       width,
-                                   mlib_s32       height,
-                                   mlib_s32       cmask);
-
-void mlib_v_ImageChannelInsert_S16(const mlib_s16 *src,
-                                   mlib_s32       slb,
-                                   mlib_s16       *dst,
-                                   mlib_s32       dlb,
-                                   mlib_s32       channels,
-                                   mlib_s32       channeld,
-                                   mlib_s32       width,
-                                   mlib_s32       height,
-                                   mlib_s32       cmask);
-
-void mlib_v_ImageChannelInsert_S32(const mlib_s32 *src,
-                                   mlib_s32       slb,
-                                   mlib_s32       *dst,
-                                   mlib_s32       dlb,
-                                   mlib_s32       channels,
-                                   mlib_s32       channeld,
-                                   mlib_s32       width,
-                                   mlib_s32       height,
-                                   mlib_s32       cmask);
-
-void mlib_v_ImageChannelInsert_U8_12_A8D1X8(const mlib_u8 *src,
-                                            mlib_u8       *dst,
-                                            mlib_s32      dsize,
-                                            mlib_s32      cmask);
-
-void mlib_v_ImageChannelInsert_U8_12_A8D2X8(const mlib_u8 *src,
-                                            mlib_s32      slb,
-                                            mlib_u8       *dst,
-                                            mlib_s32      dlb,
-                                            mlib_s32      xsize,
-                                            mlib_s32      ysize,
-                                            mlib_s32      cmask);
-
 void mlib_v_ImageChannelInsert_U8_12_D1(const mlib_u8 *src,
                                         mlib_u8       *dst,
                                         mlib_s32      dsize,
                                         mlib_s32      cmask);
 
-void mlib_v_ImageChannelInsert_U8_12(const mlib_u8 *src,
-                                     mlib_s32      slb,
-                                     mlib_u8       *dst,
-                                     mlib_s32      dlb,
-                                     mlib_s32      xsize,
-                                     mlib_s32      ysize,
-                                     mlib_s32      cmask);
-
-void mlib_v_ImageChannelInsert_U8_13_A8D1X8(const mlib_u8 *src,
-                                            mlib_u8       *dst,
-                                            mlib_s32      dsize,
-                                            mlib_s32      cmask);
-
-void mlib_v_ImageChannelInsert_U8_13_A8D2X8(const mlib_u8 *src,
-                                            mlib_s32      slb,
-                                            mlib_u8       *dst,
-                                            mlib_s32      dlb,
-                                            mlib_s32      xsize,
-                                            mlib_s32      ysize,
-                                            mlib_s32      cmask);
-
 void mlib_v_ImageChannelInsert_U8_13_D1(const mlib_u8 *src,
                                         mlib_u8       *dst,
                                         mlib_s32      dsize,
                                         mlib_s32      cmask);
 
-void mlib_v_ImageChannelInsert_U8_13(const mlib_u8 *src,
-                                     mlib_s32      slb,
-                                     mlib_u8       *dst,
-                                     mlib_s32      dlb,
-                                     mlib_s32      xsize,
-                                     mlib_s32      ysize,
-                                     mlib_s32      cmask);
-
-void mlib_v_ImageChannelInsert_U8_14_A8D1X8(const mlib_u8 *src,
-                                            mlib_u8       *dst,
-                                            mlib_s32      dsize,
-                                            mlib_s32      cmask);
-
-void mlib_v_ImageChannelInsert_U8_14_A8D2X8(const mlib_u8 *src,
-                                            mlib_s32      slb,
-                                            mlib_u8       *dst,
-                                            mlib_s32      dlb,
-                                            mlib_s32      xsize,
-                                            mlib_s32      ysize,
-                                            mlib_s32      cmask);
-
 void mlib_v_ImageChannelInsert_U8_14_D1(const mlib_u8 *src,
                                         mlib_u8       *dst,
                                         mlib_s32      dsize,
                                         mlib_s32      cmask);
 
-void mlib_v_ImageChannelInsert_U8_14(const mlib_u8 *src,
-                                     mlib_s32      slb,
-                                     mlib_u8       *dst,
-                                     mlib_s32      dlb,
-                                     mlib_s32      xsize,
-                                     mlib_s32      ysize,
-                                     mlib_s32      cmask);
-
-void mlib_v_ImageChannelInsert_S16_12_A8D1X4(const mlib_s16 *src,
-                                             mlib_s16       *dst,
-                                             mlib_s32       dsize,
-                                             mlib_s32       cmask);
-
-void mlib_v_ImageChannelInsert_S16_12_A8D2X4(const mlib_s16 *src,
-                                             mlib_s32       slb,
-                                             mlib_s16       *dst,
-                                             mlib_s32       dlb,
-                                             mlib_s32       xsize,
-                                             mlib_s32       ysize,
-                                             mlib_s32       cmask);
-
-void mlib_v_ImageChannelInsert_S16_12_D1(const mlib_s16 *src,
-                                         mlib_s16       *dst,
-                                         mlib_s32       dsize,
-                                         mlib_s32       cmask);
-
-void mlib_v_ImageChannelInsert_S16_12(const mlib_s16 *src,
-                                      mlib_s32       slb,
-                                      mlib_s16       *dst,
-                                      mlib_s32       dlb,
-                                      mlib_s32       xsize,
-                                      mlib_s32       ysize,
-                                      mlib_s32       cmask);
-
-void mlib_v_ImageChannelInsert_S16_13_A8D1X4(const mlib_s16 *src,
-                                             mlib_s16       *dst,
-                                             mlib_s32       dsize,
-                                             mlib_s32       cmask);
-
-void mlib_v_ImageChannelInsert_S16_13_A8D2X4(const mlib_s16 *src,
-                                             mlib_s32       slb,
-                                             mlib_s16       *dst,
-                                             mlib_s32       dlb,
-                                             mlib_s32       xsize,
-                                             mlib_s32       ysize,
-                                             mlib_s32       cmask);
-
-void mlib_v_ImageChannelInsert_S16_13_D1(const mlib_s16 *src,
-                                         mlib_s16       *dst,
-                                         mlib_s32       dsize,
-                                         mlib_s32       cmask);
-
-void mlib_v_ImageChannelInsert_S16_13(const mlib_s16 *src,
-                                      mlib_s32       slb,
-                                      mlib_s16       *dst,
-                                      mlib_s32       dlb,
-                                      mlib_s32       xsize,
-                                      mlib_s32       ysize,
-                                      mlib_s32       cmask);
-
-void mlib_v_ImageChannelInsert_S16_14_A8D1X4(const mlib_s16 *src,
-                                             mlib_s16       *dst,
-                                             mlib_s32       dsize,
-                                             mlib_s32       cmask);
-
-void mlib_v_ImageChannelInsert_S16_14_A8D2X4(const mlib_s16 *src,
-                                             mlib_s32       slb,
-                                             mlib_s16       *dst,
-                                             mlib_s32       dlb,
-                                             mlib_s32       xsize,
-                                             mlib_s32       ysize,
-                                             mlib_s32       cmask);
-
-void mlib_v_ImageChannelInsert_S16_14_D1(const mlib_s16 *src,
-                                         mlib_s16       *dst,
-                                         mlib_s32       dsize,
-                                         mlib_s32       cmask);
-
-void mlib_v_ImageChannelInsert_S16_14(const mlib_s16 *src,
-                                      mlib_s32       slb,
-                                      mlib_s16       *dst,
-                                      mlib_s32       dlb,
-                                      mlib_s32       xsize,
-                                      mlib_s32       ysize,
-                                      mlib_s32       cmask);
-
-void mlib_v_ImageChannelInsert_U8_34R_A8D1X8(const mlib_u8 *src,
-                                             mlib_u8       *dst,
-                                             mlib_s32      dsize);
-
-void mlib_v_ImageChannelInsert_U8_34R_A8D2X8(const mlib_u8 *src,
-                                             mlib_s32      slb,
-                                             mlib_u8       *dst,
-                                             mlib_s32      dlb,
-                                             mlib_s32      xsize,
-                                             mlib_s32      ysize);
-
-void mlib_v_ImageChannelInsert_U8_34R_D1(const mlib_u8 *src,
-                                         mlib_u8       *dst,
-                                         mlib_s32      dsize);
-
-void mlib_v_ImageChannelInsert_U8_34R(const mlib_u8 *src,
-                                      mlib_s32      slb,
-                                      mlib_u8       *dst,
-                                      mlib_s32      dlb,
-                                      mlib_s32      xsize,
-                                      mlib_s32      ysize);
-
-void mlib_v_ImageChannelInsert_S16_34R_A8D1X4(const mlib_s16 *src,
-                                              mlib_s16       *dst,
-                                              mlib_s32       dsize);
-
-void mlib_v_ImageChannelInsert_S16_34R_A8D2X4(const mlib_s16 *src,
-                                              mlib_s32       slb,
-                                              mlib_s16       *dst,
-                                              mlib_s32       dlb,
-                                              mlib_s32       xsize,
-                                              mlib_s32       ysize);
-
-void mlib_v_ImageChannelInsert_S16_34R_D1(const mlib_s16 *src,
-                                          mlib_s16       *dst,
-                                          mlib_s32       dsize);
-
-void mlib_v_ImageChannelInsert_S16_34R(const mlib_s16 *src,
-                                       mlib_s32       slb,
-                                       mlib_s16       *dst,
-                                       mlib_s32       dlb,
-                                       mlib_s32       xsize,
-                                       mlib_s32       ysize);
-
-void mlib_v_ImageChannelInsert_U8_34L_A8D1X8(const mlib_u8 *src,
-                                             mlib_u8       *dst,
-                                             mlib_s32      dsize);
-
-void mlib_v_ImageChannelInsert_U8_34L_A8D2X8(const mlib_u8 *src,
-                                             mlib_s32      slb,
-                                             mlib_u8       *dst,
-                                             mlib_s32      dlb,
-                                             mlib_s32      xsize,
-                                             mlib_s32      ysize);
-
-void mlib_v_ImageChannelInsert_U8_34L_D1(const mlib_u8 *src,
-                                         mlib_u8       *dst,
-                                         mlib_s32      dsize);
-
-void mlib_v_ImageChannelInsert_U8_34L(const mlib_u8 *src,
-                                      mlib_s32      slb,
-                                      mlib_u8       *dst,
-                                      mlib_s32      dlb,
-                                      mlib_s32      xsize,
-                                      mlib_s32      ysize);
-
-void mlib_v_ImageChannelInsert_S16_34L_A8D1X4(const mlib_s16 *src,
-                                              mlib_s16       *dst,
-                                              mlib_s32       dsize);
-
-void mlib_v_ImageChannelInsert_S16_34L_A8D2X4(const mlib_s16 *src,
-                                              mlib_s32       slb,
-                                              mlib_s16       *dst,
-                                              mlib_s32       dlb,
-                                              mlib_s32       xsize,
-                                              mlib_s32       ysize);
-
-void mlib_v_ImageChannelInsert_S16_34L_D1(const mlib_s16 *src,
-                                          mlib_s16       *dst,
-                                          mlib_s32       dsize);
-
-void mlib_v_ImageChannelInsert_S16_34L(const mlib_s16 *src,
-                                       mlib_s32       slb,
-                                       mlib_s16       *dst,
-                                       mlib_s32       dlb,
-                                       mlib_s32       xsize,
-                                       mlib_s32       ysize);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert_1.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert_1.c
index ae0abf0dcea..b5dcf5e5cf2 100644
--- a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert_1.c
+++ b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert_1.c
@@ -27,34 +27,9 @@
 
 /*
  * FUNCTIONS
- *      mlib_v_ImageChannelInsert_U8
- *      mlib_v_ImageChannelInsert_U8_12_A8D1X8
- *      mlib_v_ImageChannelInsert_U8_12_A8D2X8
  *      mlib_v_ImageChannelInsert_U8_12_D1
- *      mlib_v_ImageChannelInsert_U8_12
- *      mlib_v_ImageChannelInsert_U8_13_A8D1X8
- *      mlib_v_ImageChannelInsert_U8_13_A8D2X8
  *      mlib_v_ImageChannelInsert_U8_13_D1
- *      mlib_v_ImageChannelInsert_U8_13
- *      mlib_v_ImageChannelInsert_U8_14_A8D1X8
- *      mlib_v_ImageChannelInsert_U8_14_A8D2X8
  *      mlib_v_ImageChannelInsert_U8_14_D1
- *      mlib_v_ImageChannelInsert_U8_14
- *      mlib_v_ImageChannelInsert_S16
- *      mlib_v_ImageChannelInsert_S16_12_A8D1X4
- *      mlib_v_ImageChannelInsert_S16_12_A8D2X4
- *      mlib_v_ImageChannelInsert_S16_12_D1
- *      mlib_v_ImageChannelInsert_S16_12
- *      mlib_v_ImageChannelInsert_S16_13_A8D1X4
- *      mlib_v_ImageChannelInsert_S16_13_A8D2X4
- *      mlib_v_ImageChannelInsert_S16_13_D1
- *      mlib_v_ImageChannelInsert_S16_13
- *      mlib_v_ImageChannelInsert_S16_14_A8D1X4
- *      mlib_v_ImageChannelInsert_S16_14_A8D2X4
- *      mlib_v_ImageChannelInsert_S16_14_D1
- *      mlib_v_ImageChannelInsert_S16_14
- *      mlib_v_ImageChannelInsert_S32
- *      mlib_v_ImageChannelInsert_D64
  *
  * ARGUMENT
  *      src     pointer to source image data
@@ -79,423 +54,11 @@
 #include "mlib_image.h"
 #include "mlib_v_ImageChannelInsert.h"
 
-/***************************************************************/
-/* general channel insertion: slower due to the inner loop */
-void mlib_v_ImageChannelInsert_U8(const mlib_u8 *src,
-                                  mlib_s32      slb,
-                                  mlib_u8       *dst,
-                                  mlib_s32      dlb,
-                                  mlib_s32      channels,
-                                  mlib_s32      channeld,
-                                  mlib_s32      width,
-                                  mlib_s32      height,
-                                  mlib_s32      cmask)
-{
-  mlib_u8 *sp;                                        /* pointer for pixel in src */
-  mlib_u8 *sl;                                        /* pointer for line in src */
-  mlib_u8 *dp;                                        /* pointer for pixel in dst */
-  mlib_u8 *dl;                                        /* pointer for line in dst */
-  mlib_s32 i, j, k;                                   /* indices for x, y, channel */
-  mlib_s32 deltac[5] = { 0, 1, 1, 1, 1 };
-  mlib_s32 inc0, inc1, inc2;
-  mlib_u8 s0, s1, s2;
-
-  deltac[channels] = 1;
-  for (i = (channeld - 1), k = 0; i >= 0; i--) {
-    if ((cmask & (1 << i)) == 0)
-      deltac[k]++;
-    else
-      k++;
-  }
-
-  deltac[channels] = channeld;
-  for (i = 1; i < channels; i++) {
-    deltac[channels] -= deltac[i];
-  }
-
-  sp = sl = (void *)src;
-  dp = dl = dst + deltac[0];
-
-  if (channels == 2) {
-    inc0 = deltac[1];
-    inc1 = deltac[2] + inc0;
-    for (j = 0; j < height; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < width; i++) {
-        s0 = sp[0];
-        s1 = sp[1];
-        dp[0] = s0;
-        dp[inc0] = s1;
-        dp += inc1;
-        sp += 2;
-      }
-
-      sp = sl += slb;
-      dp = dl += dlb;
-    }
-  }
-  else if (channels == 3) {
-    inc0 = deltac[1];
-    inc1 = deltac[2] + inc0;
-    inc2 = deltac[3] + inc1;
-    for (j = 0; j < height; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < width; i++) {
-        s0 = sp[0];
-        s1 = sp[1];
-        s2 = sp[2];
-        dp[0] = s0;
-        dp[inc0] = s1;
-        dp[inc1] = s2;
-        dp += inc2;
-        sp += 3;
-      }
-
-      sp = sl += slb;
-      dp = dl += dlb;
-    }
-  }
-}
-
-/***************************************************************/
-/* general channel insertion: slower due to the inner loop */
-void mlib_v_ImageChannelInsert_D64(const mlib_d64 *src,
-                                   mlib_s32       slb,
-                                   mlib_d64       *dst,
-                                   mlib_s32       dlb,
-                                   mlib_s32       channels,
-                                   mlib_s32       channeld,
-                                   mlib_s32       width,
-                                   mlib_s32       height,
-                                   mlib_s32       cmask)
-{
-  mlib_d64 *sp;                                       /* pointer for pixel in src */
-  mlib_d64 *sl;                                       /* pointer for line in src */
-  mlib_d64 *dp;                                       /* pointer for pixel in dst */
-  mlib_d64 *dl;                                       /* pointer for line in dst */
-  mlib_s32 i, j, k;                                   /* indices for x, y, channel */
-  mlib_s32 deltac[5] = { 0, 1, 1, 1, 1 };
-  mlib_s32 inc0, inc1, inc2;
-  mlib_d64 s0, s1, s2;
-
-  deltac[channels] = 1;
-  for (i = (channeld - 1), k = 0; i >= 0; i--) {
-    if ((cmask & (1 << i)) == 0)
-      deltac[k]++;
-    else
-      k++;
-  }
-
-  deltac[channels] = channeld;
-  for (i = 1; i < channels; i++) {
-    deltac[channels] -= deltac[i];
-  }
-
-  sp = sl = (void *)src;
-  dp = dl = dst + deltac[0];
-
-  if (channels == 1) {
-    for (j = 0; j < height; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < width; i++) {
-        s0 = sp[0];
-        dp[0] = s0;
-        dp += channeld;
-        sp++;
-      }
-
-      sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-      dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-    }
-  }
-  else if (channels == 2) {
-    inc0 = deltac[1];
-    inc1 = deltac[2] + inc0;
-    for (j = 0; j < height; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < width; i++) {
-        s0 = sp[0];
-        s1 = sp[1];
-        dp[0] = s0;
-        dp[inc0] = s1;
-        dp += inc1;
-        sp += 2;
-      }
-
-      sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-      dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-    }
-  }
-  else if (channels == 3) {
-    inc0 = deltac[1];
-    inc1 = deltac[2] + inc0;
-    inc2 = deltac[3] + inc1;
-    for (j = 0; j < height; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < width; i++) {
-        s0 = sp[0];
-        s1 = sp[1];
-        s2 = sp[2];
-        dp[0] = s0;
-        dp[inc0] = s1;
-        dp[inc1] = s2;
-        dp += inc2;
-        sp += 3;
-      }
-
-      sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-      dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-    }
-  }
-}
-
-/***************************************************************/
-/* general channel insertion: slower due to the inner loop */
-void mlib_v_ImageChannelInsert_S16(const mlib_s16 *src,
-                                   mlib_s32       slb,
-                                   mlib_s16       *dst,
-                                   mlib_s32       dlb,
-                                   mlib_s32       channels,
-                                   mlib_s32       channeld,
-                                   mlib_s32       width,
-                                   mlib_s32       height,
-                                   mlib_s32       cmask)
-{
-  mlib_s16 *sp;                                       /* pointer for pixel in src */
-  mlib_s16 *sl;                                       /* pointer for line in src */
-  mlib_s16 *dp;                                       /* pointer for pixel in dst */
-  mlib_s16 *dl;                                       /* pointer for line in dst */
-  mlib_s32 i, j, k;                                   /* indices for x, y, channel */
-  mlib_s32 deltac[5] = { 0, 1, 1, 1, 1 };
-  mlib_s32 inc0, inc1, inc2;
-  mlib_s16 s0, s1, s2;
-
-  deltac[channels] = 1;
-  for (i = (channeld - 1), k = 0; i >= 0; i--) {
-    if ((cmask & (1 << i)) == 0)
-      deltac[k]++;
-    else
-      k++;
-  }
-
-  deltac[channels] = channeld;
-  for (i = 1; i < channels; i++) {
-    deltac[channels] -= deltac[i];
-  }
-
-  sp = sl = (void *)src;
-  dp = dl = dst + deltac[0];
-
-  if (channels == 2) {
-    inc0 = deltac[1];
-    inc1 = deltac[2] + inc0;
-    for (j = 0; j < height; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < width; i++) {
-        s0 = sp[0];
-        s1 = sp[1];
-        dp[0] = s0;
-        dp[inc0] = s1;
-        dp += inc1;
-        sp += 2;
-      }
-
-      sp = sl = (mlib_s16 *) ((mlib_u8 *) sl + slb);
-      dp = dl = (mlib_s16 *) ((mlib_u8 *) dl + dlb);
-    }
-  }
-  else if (channels == 3) {
-    inc0 = deltac[1];
-    inc1 = deltac[2] + inc0;
-    inc2 = deltac[3] + inc1;
-    for (j = 0; j < height; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < width; i++) {
-        s0 = sp[0];
-        s1 = sp[1];
-        s2 = sp[2];
-        dp[0] = s0;
-        dp[inc0] = s1;
-        dp[inc1] = s2;
-        dp += inc2;
-        sp += 3;
-      }
-
-      sp = sl = (mlib_s16 *) ((mlib_u8 *) sl + slb);
-      dp = dl = (mlib_s16 *) ((mlib_u8 *) dl + dlb);
-    }
-  }
-}
-
-/***************************************************************/
-/* general channel insertion: slower due to the inner loop */
-
-void mlib_v_ImageChannelInsert_S32(const mlib_s32 *src,
-                                   mlib_s32       slb,
-                                   mlib_s32       *dst,
-                                   mlib_s32       dlb,
-                                   mlib_s32       channels,
-                                   mlib_s32       channeld,
-                                   mlib_s32       width,
-                                   mlib_s32       height,
-                                   mlib_s32       cmask)
-{
-  mlib_s32 *sp;                                       /* pointer for pixel in src */
-  mlib_s32 *sl;                                       /* pointer for line in src */
-  mlib_s32 *dp;                                       /* pointer for pixel in dst */
-  mlib_s32 *dl;                                       /* pointer for line in dst */
-  mlib_s32 i, j, k;                                   /* indices for x, y, channel */
-  mlib_s32 deltac[5] = { 0, 1, 1, 1, 1 };
-  mlib_s32 inc0, inc1, inc2;
-  mlib_s32 s0, s1, s2;
-
-  deltac[channels] = 1;
-  for (i = (channeld - 1), k = 0; i >= 0; i--) {
-    if ((cmask & (1 << i)) == 0)
-      deltac[k]++;
-    else
-      k++;
-  }
-
-  deltac[channels] = channeld;
-  for (i = 1; i < channels; i++) {
-    deltac[channels] -= deltac[i];
-  }
-
-  sp = sl = (void *)src;
-  dp = dl = dst + deltac[0];
-
-  if (channels == 1) {
-    for (j = 0; j < height; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < width; i++) {
-        s0 = sp[0];
-        dp[0] = s0;
-        dp += channeld;
-        sp++;
-      }
-
-      sp = sl = (mlib_s32 *) ((mlib_u8 *) sl + slb);
-      dp = dl = (mlib_s32 *) ((mlib_u8 *) dl + dlb);
-    }
-  }
-  else if (channels == 2) {
-    inc0 = deltac[1];
-    inc1 = deltac[2] + inc0;
-    for (j = 0; j < height; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < width; i++) {
-        s0 = sp[0];
-        s1 = sp[1];
-        dp[0] = s0;
-        dp[inc0] = s1;
-        dp += inc1;
-        sp += 2;
-      }
-
-      sp = sl = (mlib_s32 *) ((mlib_u8 *) sl + slb);
-      dp = dl = (mlib_s32 *) ((mlib_u8 *) dl + dlb);
-    }
-  }
-  else if (channels == 3) {
-    inc0 = deltac[1];
-    inc1 = deltac[2] + inc0;
-    inc2 = deltac[3] + inc1;
-    for (j = 0; j < height; j++) {
-#pragma pipeloop(0)
-      for (i = 0; i < width; i++) {
-        s0 = sp[0];
-        s1 = sp[1];
-        s2 = sp[2];
-        dp[0] = s0;
-        dp[inc0] = s1;
-        dp[inc1] = s2;
-        dp += inc2;
-        sp += 3;
-      }
-
-      sp = sl = (mlib_s32 *) ((mlib_u8 *) sl + slb);
-      dp = dl = (mlib_s32 *) ((mlib_u8 *) dl + dlb);
-    }
-  }
-}
-
 /***************************************************************/
 #define INSERT_U8_12(sd0, dd0, dd1)     /* channel duplicate */ \
   dd0 = vis_fpmerge(vis_read_hi(sd0), vis_read_hi(sd0));        \
   dd1 = vis_fpmerge(vis_read_lo(sd0), vis_read_lo(sd0))
 
-/***************************************************************/
-/* insert one channel to a 2-channel image.
- * both source and destination image data are 8-byte aligned.
- * dsize is multiple of 8.
- */
-
-void mlib_v_ImageChannelInsert_U8_12_A8D1X8(const mlib_u8 *src,
-                                            mlib_u8       *dst,
-                                            mlib_s32      dsize,
-                                            mlib_s32      cmask)
-{
-  mlib_d64 *sp, *dp;
-  mlib_d64 sd0;
-  mlib_d64 dd0, dd1;
-  mlib_s32 bmask;
-  mlib_s32 i;
-
-  bmask = cmask | (cmask << 2) | (cmask << 4) | (cmask << 6);
-
-  sp = (mlib_d64 *) src;
-  dp = (mlib_d64 *) dst;
-
-#pragma pipeloop(0)
-  for (i = 0; i < dsize / 8; i++) {
-    sd0 = *sp++;
-    INSERT_U8_12(sd0, dd0, dd1);
-    vis_pst_8(dd0, dp++, bmask);
-    vis_pst_8(dd1, dp++, bmask);
-  }
-}
-
-/***************************************************************/
-/* insert one channel to a 2-channel image.
- * both source and destination image data are 8-byte aligned.
- * xsize is multiple of 8.
- */
-
-void mlib_v_ImageChannelInsert_U8_12_A8D2X8(const mlib_u8 *src,
-                                            mlib_s32      slb,
-                                            mlib_u8       *dst,
-                                            mlib_s32      dlb,
-                                            mlib_s32      xsize,
-                                            mlib_s32      ysize,
-                                            mlib_s32      cmask)
-{
-  mlib_d64 *sp, *dp;
-  mlib_d64 *sl, *dl;
-  mlib_d64 sd0;
-  mlib_d64 dd0, dd1;
-  mlib_s32 bmask;
-  mlib_s32 i, j;
-
-  bmask = cmask | (cmask << 2) | (cmask << 4) | (cmask << 6);
-
-  sp = sl = (mlib_d64 *) src;
-  dp = dl = (mlib_d64 *) dst;
-
-  for (j = 0; j < ysize; j++) {
-#pragma pipeloop(0)
-    for (i = 0; i < xsize / 8; i++) {
-      sd0 = *sp++;
-      INSERT_U8_12(sd0, dd0, dd1);
-      vis_pst_8(dd0, dp++, bmask);
-      vis_pst_8(dd1, dp++, bmask);
-    }
-
-    sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-    dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-  }
-}
-
 /***************************************************************/
 /* insert one channel to a 2-channel image.
  */
@@ -723,56 +286,6 @@ void mlib_v_ImageChannelInsert_U8_12_D1(const mlib_u8 *src,
   }
 }
 
-/***************************************************************/
-/* insert one channel to a 2-channel image.
- */
-
-void mlib_v_ImageChannelInsert_U8_12(const mlib_u8 *src,
-                                     mlib_s32      slb,
-                                     mlib_u8       *dst,
-                                     mlib_s32      dlb,
-                                     mlib_s32      xsize,
-                                     mlib_s32      ysize,
-                                     mlib_s32      cmask)
-{
-  mlib_u8 *sa, *da;
-  mlib_u8 *sl, *dl;
-  mlib_s32 j;
-
-  sa = sl = (void *)src;
-  da = dl = dst;
-
-#pragma pipeloop(0)
-  for (j = 0; j < ysize; j++) {
-    mlib_v_ImageChannelInsert_U8_12_D1(sa, da, xsize, cmask);
-    sa = sl += slb;
-    da = dl += dlb;
-  }
-}
-
-/***************************************************************/
-#define INSERT_U8_13(sd0, dd0, dd1, dd2)                        \
-  sda = vis_fpmerge(vis_read_hi(sd0), vis_read_lo(sd0));        \
-  sdb = vis_fpmerge(vis_read_hi(sda), vis_read_lo(sda));        \
-  sdc = vis_fpmerge(vis_read_hi(sdb), vis_read_hi(sdb));        \
-  sdd = vis_fpmerge(vis_read_lo(sdb), vis_read_lo(sdb));        \
-  dd0 = vis_fpmerge(vis_read_hi(sdc), vis_read_hi(sdd));        \
-  sde = vis_fpmerge(vis_read_lo(sdc), vis_read_lo(sdd));        \
-  dd1 = vis_freg_pair(vis_read_lo(dd0), vis_read_hi(sde));      \
-  dd2 = vis_freg_pair(vis_read_lo(sde), vis_read_lo(sde))
-
-/***************************************************************/
-#define LOAD_INSERT_STORE_U8_A8(channeld)                       \
-  sd = *sp++;                                                   \
-  vis_st_u8(sd = vis_faligndata(sd, sd), da); da += channeld;   \
-  vis_st_u8(sd = vis_faligndata(sd, sd), da); da += channeld;   \
-  vis_st_u8(sd = vis_faligndata(sd, sd), da); da += channeld;   \
-  vis_st_u8(sd = vis_faligndata(sd, sd), da); da += channeld;   \
-  vis_st_u8(sd = vis_faligndata(sd, sd), da); da += channeld;   \
-  vis_st_u8(sd = vis_faligndata(sd, sd), da); da += channeld;   \
-  vis_st_u8(sd = vis_faligndata(sd, sd), da); da += channeld;   \
-  vis_st_u8(sd = vis_faligndata(sd, sd), da); da += channeld
-
 /***************************************************************/
 #define LOAD_INSERT_STORE_U8(channeld)                          \
   vis_alignaddr((void *)0, off);                                \
@@ -789,58 +302,6 @@ void mlib_v_ImageChannelInsert_U8_12(const mlib_u8 *src,
   vis_st_u8(sd = vis_faligndata(sd, sd), da); da += channeld;   \
   vis_st_u8(sd = vis_faligndata(sd, sd), da); da += channeld
 
-/***************************************************************/
-void mlib_v_ImageChannelInsert_U8_13_A8D1X8(const mlib_u8 *src,
-                                            mlib_u8       *dst,
-                                            mlib_s32      dsize,
-                                            mlib_s32      cmask)
-{
-  mlib_u8 *da;
-  mlib_d64 *sp;
-  mlib_d64 sd;
-  mlib_s32 i;
-
-  vis_alignaddr((void *)0, 1);              /* for 1-byte left shift */
-
-  sp = (mlib_d64 *) src;
-  da = dst + (2 / cmask);                   /* 4,2,1 -> 0,1,2 */
-
-#pragma pipeloop(0)
-  for (i = 0; i < dsize / 8; i++) {
-    LOAD_INSERT_STORE_U8_A8(3);
-  }
-}
-
-/***************************************************************/
-void mlib_v_ImageChannelInsert_U8_13_A8D2X8(const mlib_u8 *src,
-                                            mlib_s32      slb,
-                                            mlib_u8       *dst,
-                                            mlib_s32      dlb,
-                                            mlib_s32      xsize,
-                                            mlib_s32      ysize,
-                                            mlib_s32      cmask)
-{
-  mlib_u8 *da, *dl;
-  mlib_d64 *sp, *sl;
-  mlib_d64 sd;
-  mlib_s32 i, j;
-
-  vis_alignaddr((void *)0, 1);
-
-  sp = sl = (mlib_d64 *) src;
-  da = dl = dst + (2 / cmask);              /* 4,2,1 -> 0,1,2 */
-
-  for (j = 0; j < ysize; j++) {
-#pragma pipeloop(0)
-    for (i = 0; i < xsize / 8; i++) {
-      LOAD_INSERT_STORE_U8_A8(3);
-    }
-
-    sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-    da = dl = (mlib_u8 *) ((mlib_u8 *) dl + dlb);
-  }
-}
-
 /***************************************************************/
 void mlib_v_ImageChannelInsert_U8_13_D1(const mlib_u8 *src,
                                         mlib_u8       *dst,
@@ -907,30 +368,6 @@ void mlib_v_ImageChannelInsert_U8_13_D1(const mlib_u8 *src,
   }
 }
 
-/***************************************************************/
-void mlib_v_ImageChannelInsert_U8_13(const mlib_u8 *src,
-                                     mlib_s32      slb,
-                                     mlib_u8       *dst,
-                                     mlib_s32      dlb,
-                                     mlib_s32      xsize,
-                                     mlib_s32      ysize,
-                                     mlib_s32      cmask)
-{
-  mlib_u8 *sa, *da;
-  mlib_u8 *sl, *dl;
-  mlib_s32 j;
-
-  sa = sl = (void *)src;
-  da = dl = dst;
-
-#pragma pipeloop(0)
-  for (j = 0; j < ysize; j++) {
-    mlib_v_ImageChannelInsert_U8_13_D1(sa, da, xsize, cmask);
-    sa = sl += slb;
-    da = dl += dlb;
-  }
-}
-
 /***************************************************************/
 #define INSERT_U8_14(sd0, dd0, dd1, dd2, dd3)                   \
   sda = vis_fpmerge(vis_read_hi(sd0), vis_read_hi(sd0));        \
@@ -940,73 +377,6 @@ void mlib_v_ImageChannelInsert_U8_13(const mlib_u8 *src,
   dd2 = vis_fpmerge(vis_read_hi(sdb), vis_read_hi(sdb));        \
   dd3 = vis_fpmerge(vis_read_lo(sdb), vis_read_lo(sdb))
 
-/***************************************************************/
-void mlib_v_ImageChannelInsert_U8_14_A8D1X8(const mlib_u8 *src,
-                                            mlib_u8       *dst,
-                                            mlib_s32      dsize,
-                                            mlib_s32      cmask)
-{
-  mlib_d64 *sp, *dp;
-  mlib_d64 sd0;
-  mlib_d64 sda, sdb;
-  mlib_d64 dd0, dd1, dd2, dd3;
-  mlib_s32 bmask;
-  mlib_s32 i;
-
-  bmask = cmask | (cmask << 4);
-
-  sp = (mlib_d64 *) src;
-  dp = (mlib_d64 *) dst;
-
-#pragma pipeloop(0)
-  for (i = 0; i < dsize / 8; i++) {
-    sd0 = *sp++;
-    INSERT_U8_14(sd0, dd0, dd1, dd2, dd3);
-    vis_pst_8(dd0, dp++, bmask);
-    vis_pst_8(dd1, dp++, bmask);
-    vis_pst_8(dd2, dp++, bmask);
-    vis_pst_8(dd3, dp++, bmask);
-  }
-}
-
-/***************************************************************/
-void mlib_v_ImageChannelInsert_U8_14_A8D2X8(const mlib_u8 *src,
-                                            mlib_s32      slb,
-                                            mlib_u8       *dst,
-                                            mlib_s32      dlb,
-                                            mlib_s32      xsize,
-                                            mlib_s32      ysize,
-                                            mlib_s32      cmask)
-{
-  mlib_d64 *sp, *dp;
-  mlib_d64 *sl, *dl;
-  mlib_d64 sd0;
-  mlib_d64 sda, sdb;
-  mlib_d64 dd0, dd1, dd2, dd3;
-  mlib_s32 bmask;
-  mlib_s32 i, j;
-
-  bmask = cmask | (cmask << 4);
-
-  sp = sl = (mlib_d64 *) src;
-  dp = dl = (mlib_d64 *) dst;
-
-  for (j = 0; j < ysize; j++) {
-#pragma pipeloop(0)
-    for (i = 0; i < xsize / 8; i++) {
-      sd0 = *sp++;
-      INSERT_U8_14(sd0, dd0, dd1, dd2, dd3);
-      vis_pst_8(dd0, dp++, bmask);
-      vis_pst_8(dd1, dp++, bmask);
-      vis_pst_8(dd2, dp++, bmask);
-      vis_pst_8(dd3, dp++, bmask);
-    }
-
-    sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-    dp = dl = (mlib_d64 *) ((mlib_u8 *) dl + dlb);
-  }
-}
-
 /***************************************************************/
 void mlib_v_ImageChannelInsert_U8_14_D1(const mlib_u8 *src,
                                         mlib_u8       *dst,
@@ -1188,445 +558,5 @@ void mlib_v_ImageChannelInsert_U8_14_D1(const mlib_u8 *src,
   }
 }
 
-/***************************************************************/
-void mlib_v_ImageChannelInsert_U8_14(const mlib_u8 *src,
-                                     mlib_s32      slb,
-                                     mlib_u8       *dst,
-                                     mlib_s32      dlb,
-                                     mlib_s32      xsize,
-                                     mlib_s32      ysize,
-                                     mlib_s32      cmask)
-{
-  mlib_u8 *sa, *da;
-  mlib_u8 *sl, *dl;
-  mlib_s32 j;
-
-  sa = sl = (void *)src;
-  da = dl = dst;
-
-#pragma pipeloop(0)
-  for (j = 0; j < ysize; j++) {
-    mlib_v_ImageChannelInsert_U8_14_D1(sa, da, xsize, cmask);
-    sa = sl += slb;
-    da = dl += dlb;
-  }
-}
-
-/***************************************************************/
-#define LOAD_INSERT_STORE_S16_1X_A8(channeld)                   \
-  sd  = *sp++;                                                  \
-  vis_st_u16(sd = vis_faligndata(sd, sd), da); da += channeld;  \
-  vis_st_u16(sd = vis_faligndata(sd, sd), da); da += channeld;  \
-  vis_st_u16(sd = vis_faligndata(sd, sd), da); da += channeld;  \
-  vis_st_u16(sd = vis_faligndata(sd, sd), da); da += channeld
-
-/***************************************************************/
-#define LOAD_INSERT_STORE_S16_1X(channeld)                      \
-  vis_alignaddr((void *)0, off);                                \
-  sd0 = sd1;                                                    \
-  sd1 = *sp++;                                                  \
-  sd  = vis_faligndata(sd0, sd1);                               \
-  vis_alignaddr((void *)0, 2);                                  \
-  vis_st_u16(sd = vis_faligndata(sd, sd), da); da += channeld;  \
-  vis_st_u16(sd = vis_faligndata(sd, sd), da); da += channeld;  \
-  vis_st_u16(sd = vis_faligndata(sd, sd), da); da += channeld;  \
-  vis_st_u16(sd = vis_faligndata(sd, sd), da); da += channeld
-
-/***************************************************************/
-void mlib_v_ImageChannelInsert_S16_12_A8D1X4(const mlib_s16 *src,
-                                             mlib_s16       *dst,
-                                             mlib_s32       dsize,
-                                             mlib_s32       cmask)
-{
-  mlib_s16 *da;
-  mlib_d64 *sp;
-  mlib_d64 sd;
-  mlib_s32 i;
-
-  sp = (mlib_d64 *) src;
-  da = dst + (2 - cmask);                   /* 2,1 -> 0,1 */
-
-  vis_alignaddr((void *)0, 2);
-
-#pragma pipeloop(0)
-  for (i = 0; i < dsize / 4; i++) {
-    LOAD_INSERT_STORE_S16_1X_A8(2);
-  }
-}
-
-/***************************************************************/
-void mlib_v_ImageChannelInsert_S16_12_A8D2X4(const mlib_s16 *src,
-                                             mlib_s32       slb,
-                                             mlib_s16       *dst,
-                                             mlib_s32       dlb,
-                                             mlib_s32       xsize,
-                                             mlib_s32       ysize,
-                                             mlib_s32       cmask)
-{
-  mlib_s16 *da, *dl;
-  mlib_d64 *sp, *sl;
-  mlib_d64 sd;
-  mlib_s32 i, j;
-
-  sp = sl = (mlib_d64 *) src;
-  da = dl = dst + (2 - cmask);              /* 2,1 -> 0,1 */
-
-  vis_alignaddr((void *)0, 2);
-
-  for (j = 0; j < ysize; j++) {
-#pragma pipeloop(0)
-    for (i = 0; i < xsize / 4; i++) {
-      LOAD_INSERT_STORE_S16_1X_A8(2);
-    }
-
-    sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-    da = dl = (mlib_s16 *) ((mlib_u8 *) dl + dlb);
-  }
-}
-
-/***************************************************************/
-void mlib_v_ImageChannelInsert_S16_12_D1(const mlib_s16 *src,
-                                         mlib_s16       *dst,
-                                         mlib_s32       dsize,
-                                         mlib_s32       cmask)
-{
-  mlib_s16 *sa, *da;
-  mlib_s16 *dend;                                     /* end point in destination */
-  mlib_d64 *sp;                                       /* 8-byte aligned start points in src */
-  mlib_d64 sd0, sd1, sd;                              /* 8-byte registers for source data */
-  mlib_s32 off;                                       /* offset of address alignment in src */
-  mlib_s32 i;
-
-  sa = (void *)src;
-  da = dst + (2 - cmask);                   /* 2,1 -> 0,1 */
-
-  /* prepare the src address */
-  sp = (mlib_d64 *) ((mlib_addr) sa & (~7));
-  off = (mlib_addr) sa & 7;
-
-  dend = da + dsize * 2 - 1;
-
-  sd1 = *sp++;
-
-#pragma pipeloop(0)
-  for (i = 0; i < dsize / 4; i++) {
-    LOAD_INSERT_STORE_S16_1X(2);
-  }
-
-  /* right end handling */
-  if ((mlib_addr) da <= (mlib_addr) dend) {
-
-    vis_alignaddr((void *)0, off);
-    sd0 = sd1;
-    sd1 = *sp++;
-    sd = vis_faligndata(sd0, sd1);
-
-    vis_alignaddr((void *)0, 2);
-    vis_st_u16(sd = vis_faligndata(sd, sd), da);
-    da += 2;
-    if ((mlib_addr) da <= (mlib_addr) dend) {
-      vis_st_u16(sd = vis_faligndata(sd, sd), da);
-      da += 2;
-      if ((mlib_addr) da <= (mlib_addr) dend) {
-        vis_st_u16(sd = vis_faligndata(sd, sd), da);
-      }
-    }
-  }
-}
-
-/***************************************************************/
-void mlib_v_ImageChannelInsert_S16_12(const mlib_s16 *src,
-                                      mlib_s32       slb,
-                                      mlib_s16       *dst,
-                                      mlib_s32       dlb,
-                                      mlib_s32       xsize,
-                                      mlib_s32       ysize,
-                                      mlib_s32       cmask)
-{
-  mlib_s16 *sa, *da;
-  mlib_s16 *sl, *dl;
-  mlib_s32 j;
-
-  sa = sl = (void *)src;
-  da = dl = dst;
-
-#pragma pipeloop(0)
-  for (j = 0; j < ysize; j++) {
-    mlib_v_ImageChannelInsert_S16_12_D1(sa, da, xsize, cmask);
-    sa = sl = (mlib_s16 *) ((mlib_u8 *) sl + slb);
-    da = dl = (mlib_s16 *) ((mlib_u8 *) dl + dlb);
-  }
-}
-
-/***************************************************************/
-void mlib_v_ImageChannelInsert_S16_13_A8D1X4(const mlib_s16 *src,
-                                             mlib_s16       *dst,
-                                             mlib_s32       dsize,
-                                             mlib_s32       cmask)
-{
-  mlib_s16 *da;
-  mlib_d64 *sp;
-  mlib_d64 sd;
-  mlib_s32 i;
-
-  sp = (mlib_d64 *) src;
-  da = dst + (2 / cmask);                   /* 4,2,1 -> 0,1,2 */
-
-  vis_alignaddr((void *)0, 2);
-
-#pragma pipeloop(0)
-  for (i = 0; i < dsize / 4; i++) {
-    LOAD_INSERT_STORE_S16_1X_A8(3);
-  }
-}
-
-/***************************************************************/
-void mlib_v_ImageChannelInsert_S16_13_A8D2X4(const mlib_s16 *src,
-                                             mlib_s32       slb,
-                                             mlib_s16       *dst,
-                                             mlib_s32       dlb,
-                                             mlib_s32       xsize,
-                                             mlib_s32       ysize,
-                                             mlib_s32       cmask)
-{
-  mlib_s16 *da, *dl;
-  mlib_d64 *sp, *sl;
-  mlib_d64 sd;
-  mlib_s32 i, j;
-
-  sp = sl = (mlib_d64 *) src;
-  da = dl = dst + (2 / cmask);              /* 4,2,1 -> 0,1,2 */
-
-  vis_alignaddr((void *)0, 2);
-
-  for (j = 0; j < ysize; j++) {
-#pragma pipeloop(0)
-    for (i = 0; i < xsize / 4; i++) {
-      LOAD_INSERT_STORE_S16_1X_A8(3);
-    }
-
-    sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-    da = dl = (mlib_s16 *) ((mlib_u8 *) dl + dlb);
-  }
-}
-
-/***************************************************************/
-void mlib_v_ImageChannelInsert_S16_13_D1(const mlib_s16 *src,
-                                         mlib_s16       *dst,
-                                         mlib_s32       dsize,
-                                         mlib_s32       cmask)
-{
-  mlib_s16 *sa, *da;
-  mlib_s16 *dend;                                     /* end point in destination */
-  mlib_d64 *sp;                                       /* 8-byte aligned start points in src */
-  mlib_d64 sd0, sd1, sd;                              /* 8-byte registers for source data */
-  mlib_s32 off;                                       /* offset of address alignment in src */
-  mlib_s32 i;
-
-  sa = (void *)src;
-  da = dst + (2 / cmask);                   /* 4,2,1 -> 0,1,2 */
-
-  /* prepare the src address */
-  sp = (mlib_d64 *) ((mlib_addr) sa & (~7));
-  off = (mlib_addr) sa & 7;
-
-  dend = da + dsize * 3 - 1;
-
-  sd1 = *sp++;
-
-#pragma pipeloop(0)
-  for (i = 0; i < dsize / 4; i++) {
-    LOAD_INSERT_STORE_S16_1X(3);
-  }
-
-  /* right end handling */
-  if ((mlib_addr) da <= (mlib_addr) dend) {
-
-    vis_alignaddr((void *)0, off);
-    sd0 = sd1;
-    sd1 = *sp++;
-    sd = vis_faligndata(sd0, sd1);
-
-    vis_alignaddr((void *)0, 2);
-    vis_st_u16(sd = vis_faligndata(sd, sd), da);
-    da += 3;
-    if ((mlib_addr) da <= (mlib_addr) dend) {
-      vis_st_u16(sd = vis_faligndata(sd, sd), da);
-      da += 3;
-      if ((mlib_addr) da <= (mlib_addr) dend) {
-        vis_st_u16(sd = vis_faligndata(sd, sd), da);
-      }
-    }
-  }
-}
-
-/***************************************************************/
-void mlib_v_ImageChannelInsert_S16_13(const mlib_s16 *src,
-                                      mlib_s32       slb,
-                                      mlib_s16       *dst,
-                                      mlib_s32       dlb,
-                                      mlib_s32       xsize,
-                                      mlib_s32       ysize,
-                                      mlib_s32       cmask)
-{
-  mlib_s16 *sa, *da;
-  mlib_s16 *sl, *dl;
-  mlib_s32 j;
-
-  sa = sl = (void *)src;
-  da = dl = dst;
-
-#pragma pipeloop(0)
-  for (j = 0; j < ysize; j++) {
-    mlib_v_ImageChannelInsert_S16_13_D1(sa, da, xsize, cmask);
-    sa = sl = (mlib_s16 *) ((mlib_u8 *) sl + slb);
-    da = dl = (mlib_s16 *) ((mlib_u8 *) dl + dlb);
-  }
-}
-
-/***************************************************************/
-#define INSERT_S16_14(sp, dp, bmask)    /* channel duplicate */ \
-  /* obsolete: it is slower than the vis_st_u16() version*/     \
-  sd0 = *sp++;                                                  \
-  sda = vis_fpmerge(vis_read_hi(sd0), vis_read_hi(sd0));        \
-  sdb = vis_fpmerge(vis_read_lo(sd0), vis_read_lo(sd0));        \
-  sdc = vis_fpmerge(vis_read_hi(sda), vis_read_hi(sda));        \
-  sdd = vis_fpmerge(vis_read_lo(sda), vis_read_lo(sda));        \
-  sde = vis_fpmerge(vis_read_hi(sdb), vis_read_hi(sdb));        \
-  sdf = vis_fpmerge(vis_read_lo(sdb), vis_read_lo(sdb));        \
-  dd0 = vis_fpmerge(vis_read_hi(sdc), vis_read_lo(sdc));        \
-  dd1 = vis_fpmerge(vis_read_hi(sdd), vis_read_lo(sdd));        \
-  dd2 = vis_fpmerge(vis_read_hi(sde), vis_read_lo(sde));        \
-  dd3 = vis_fpmerge(vis_read_hi(sdf), vis_read_lo(sdf));        \
-  vis_pst_16(dd0, dp++, bmask);                                 \
-  vis_pst_16(dd1, dp++, bmask);                                 \
-  vis_pst_16(dd2, dp++, bmask);                                 \
-  vis_pst_16(dd3, dp++, bmask)
-
-/***************************************************************/
-void mlib_v_ImageChannelInsert_S16_14_A8D1X4(const mlib_s16 *src,
-                                             mlib_s16       *dst,
-                                             mlib_s32       dsize,
-                                             mlib_s32       cmask)
-{
-  mlib_s16 *da;
-  mlib_d64 *sp;
-  mlib_d64 sd;
-  mlib_s32 i;
-
-  sp = (mlib_d64 *) src;
-  da = dst + (6 / cmask + 1) / 2;           /* 8,4,2,1 -> 0,1,2,3 */
-
-  vis_alignaddr((void *)0, 2);
-
-#pragma pipeloop(0)
-  for (i = 0; i < dsize / 4; i++) {
-    LOAD_INSERT_STORE_S16_1X_A8(4);
-  }
-}
-
-/***************************************************************/
-void mlib_v_ImageChannelInsert_S16_14_A8D2X4(const mlib_s16 *src,
-                                             mlib_s32       slb,
-                                             mlib_s16       *dst,
-                                             mlib_s32       dlb,
-                                             mlib_s32       xsize,
-                                             mlib_s32       ysize,
-                                             mlib_s32       cmask)
-{
-  mlib_s16 *da, *dl;
-  mlib_d64 *sp, *sl;
-  mlib_d64 sd;
-  mlib_s32 i, j;
-
-  sp = sl = (mlib_d64 *) src;
-  da = dl = dst + (6 / cmask + 1) / 2;      /* 8,4,2,1 -> 0,1,2,3 */
-
-  vis_alignaddr((void *)0, 2);
-
-  for (j = 0; j < ysize; j++) {
-#pragma pipeloop(0)
-    for (i = 0; i < xsize / 4; i++) {
-      LOAD_INSERT_STORE_S16_1X_A8(4);
-    }
-
-    sp = sl = (mlib_d64 *) ((mlib_u8 *) sl + slb);
-    da = dl = (mlib_s16 *) ((mlib_u8 *) dl + dlb);
-  }
-}
-
-/***************************************************************/
-void mlib_v_ImageChannelInsert_S16_14_D1(const mlib_s16 *src,
-                                         mlib_s16       *dst,
-                                         mlib_s32       dsize,
-                                         mlib_s32       cmask)
-{
-  mlib_s16 *sa, *da;
-  mlib_s16 *dend;                                     /* end point in destination */
-  mlib_d64 *sp;                                       /* 8-byte aligned start points in src */
-  mlib_d64 sd0, sd1, sd;                              /* 8-byte registers for source data */
-  mlib_s32 off;                                       /* offset of address alignment in src */
-  mlib_s32 i;
-
-  sa = (void *)src;
-  da = dst + (6 / cmask + 1) / 2;           /* 8,4,2,1 -> 0,1,2,3 */
-
-  /* prepare the src address */
-  sp = (mlib_d64 *) ((mlib_addr) sa & (~7));
-  off = (mlib_addr) sa & 7;
-
-  dend = da + dsize * 4 - 1;
-
-  sd1 = *sp++;
-
-#pragma pipeloop(0)
-  for (i = 0; i < dsize / 4; i++) {
-    LOAD_INSERT_STORE_S16_1X(4);
-  }
-
-  /* right end handling */
-  if ((mlib_addr) da <= (mlib_addr) dend) {
-
-    vis_alignaddr((void *)0, off);
-    sd0 = sd1;
-    sd1 = *sp++;
-    sd = vis_faligndata(sd0, sd1);
-
-    vis_alignaddr((void *)0, 2);
-    vis_st_u16(sd = vis_faligndata(sd, sd), da);
-    da += 4;
-    if ((mlib_addr) da <= (mlib_addr) dend) {
-      vis_st_u16(sd = vis_faligndata(sd, sd), da);
-      da += 4;
-      if ((mlib_addr) da <= (mlib_addr) dend) {
-        vis_st_u16(sd = vis_faligndata(sd, sd), da);
-      }
-    }
-  }
-}
-
-/***************************************************************/
-void mlib_v_ImageChannelInsert_S16_14(const mlib_s16 *src,
-                                      mlib_s32       slb,
-                                      mlib_s16       *dst,
-                                      mlib_s32       dlb,
-                                      mlib_s32       xsize,
-                                      mlib_s32       ysize,
-                                      mlib_s32       cmask)
-{
-  mlib_s16 *sa, *da;
-  mlib_s16 *sl, *dl;
-  mlib_s32 j;
-
-  sa = sl = (void *)src;
-  da = dl = dst;
-
-#pragma pipeloop(0)
-  for (j = 0; j < ysize; j++) {
-    mlib_v_ImageChannelInsert_S16_14_D1(sa, da, xsize, cmask);
-    sa = sl = (mlib_s16 *) ((mlib_u8 *) sl + slb);
-    da = dl = (mlib_s16 *) ((mlib_u8 *) dl + dlb);
-  }
-}
 
 /***************************************************************/
diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert_34.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert_34.c
deleted file mode 100644
index 105409a8a56..00000000000
--- a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert_34.c
+++ /dev/null
@@ -1,1225 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, 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.
- */
-
-
-
-/*
- * FILENAME: mlib_v_ImageChannelInsert_34.c
- *
- * FUNCTIONS
- *      mlib_v_ImageChannelInsert_U8_34R_A8D1X8
- *      mlib_v_ImageChannelInsert_U8_34R_A8D2X8
- *      mlib_v_ImageChannelInsert_U8_34R_D1
- *      mlib_v_ImageChannelInsert_U8_34R
- *      mlib_v_ImageChannelInsert_S16_34R_A8D1X4
- *      mlib_v_ImageChannelInsert_S16_34R_A8D2X4
- *      mlib_v_ImageChannelInsert_S16_34R_D1
- *      mlib_v_ImageChannelInsert_S16_34R
- *      mlib_v_ImageChannelInsert_U8_34L_A8D1X8
- *      mlib_v_ImageChannelInsert_U8_34L_A8D2X8
- *      mlib_v_ImageChannelInsert_U8_34L_D1
- *      mlib_v_ImageChannelInsert_U8_34L
- *      mlib_v_ImageChannelInsert_S16_34L_A8D1X4
- *      mlib_v_ImageChannelInsert_S16_34L_A8D2X4
- *      mlib_v_ImageChannelInsert_S16_34L_D1
- *      mlib_v_ImageChannelInsert_S16_34L
- *
- * SYNOPSIS
- *
- * ARGUMENT
- *      src       pointer to source image data
- *      dst       pointer to destination image data
- *          slb   source image line stride in bytes
- *          dlb   destination image line stride in bytes
- *          dsize       image data size in pixels
- *          xsize       image width in pixels
- *          ysize       image height in lines
- *          cmask channel mask
- *
- * DESCRIPTION
- *          Insert a 3-channel image into the right or left 3 channels of
- *          a 4-channel image low level functions.
- *
- *                BGR => ABGR   (34R), or       RGB => RGBA     (34L)
- *
- * NOTE
- *          These functions are separated from mlib_v_ImageChannelInsert.c
- *          for loop unrolling and structure clarity.
- */
-
-#include <stdlib.h>
-#include "vis_proto.h"
-#include "mlib_image.h"
-
-/***************************************************************/
-#define INSERT_U8_34R                                                                         \
-  sda = vis_fpmerge(vis_read_hi(sd0), vis_read_lo(sd1));                    \
-  sdb = vis_fpmerge(vis_read_lo(sd0), vis_read_hi(sd2));                    \
-  sdc = vis_fpmerge(vis_read_hi(sd1), vis_read_lo(sd2));                    \
-  sdd = vis_fpmerge(vis_read_hi(sda), vis_read_lo(sdb));                    \
-  sde = vis_fpmerge(vis_read_lo(sda), vis_read_hi(sdc));                    \
-  sdf = vis_fpmerge(vis_read_hi(sdb), vis_read_lo(sdc));                    \
-  sdg = vis_fpmerge(vis_read_hi(sdd), vis_read_lo(sde));                    \
-  sdh = vis_fpmerge(vis_read_lo(sdd), vis_read_hi(sdf));                    \
-  sdi = vis_fpmerge(vis_read_hi(sde), vis_read_lo(sdf));                    \
-  sdj = vis_fpmerge(vis_read_hi(sdg), vis_read_hi(sdi));                    \
-  sdk = vis_fpmerge(vis_read_lo(sdg), vis_read_lo(sdi));                    \
-  sdl = vis_fpmerge(vis_read_hi(sdh), vis_read_hi(sdh));                    \
-  sdm = vis_fpmerge(vis_read_lo(sdh), vis_read_lo(sdh));                    \
-  dd0 = vis_fpmerge(vis_read_hi(sdl), vis_read_hi(sdj));                    \
-  dd1 = vis_fpmerge(vis_read_lo(sdl), vis_read_lo(sdj));                    \
-  dd2 = vis_fpmerge(vis_read_hi(sdm), vis_read_hi(sdk));                    \
-  dd3 = vis_fpmerge(vis_read_lo(sdm), vis_read_lo(sdk));
-
-/***************************************************************/
-#define LOAD_INSERT_STORE_U8_34R_A8                                                         \
-  sd0 = *sp++;                                  /* b0g0r0b1g1r1b2g2 */                  \
-  sd1 = *sp++;                                  /* r2b3g3r3b4g4r4b5 */                  \
-  sd2 = *sp++;                                  /* g5r5b6g6r6b7g7r7 */                  \
-  INSERT_U8_34R                                                                                           \
-  vis_pst_8(dd0, dp++, bmask);                                                                \
-  vis_pst_8(dd1, dp++, bmask);                                                                \
-  vis_pst_8(dd2, dp++, bmask);                                                                \
-  vis_pst_8(dd3, dp++, bmask);
-
-/***************************************************************/
-#define LOAD_INSERT_U8_34R                                                                      \
-  vis_alignaddr((void *)soff, 0);                                                             \
-  s0 = s3;                                                                                                    \
-  s1 = sp[1];                                                                                               \
-  s2 = sp[2];                                                                                               \
-  s3 = sp[3];                                                                                               \
-  sd0 = vis_faligndata(s0, s1);                                 \
-  sd1 = vis_faligndata(s1, s2);                                                               \
-  sd2 = vis_faligndata(s2, s3);                                                               \
-  sp += 3;                                                                                                    \
-  dd4 = dd3;                                                                  \
-  INSERT_U8_34R
-
-/***************************************************************/
-/*
- * Both source and destination image data are 1-d vectors and
- * 8-byte aligned. And dsize is multiple of 8.
- */
-
-void
-mlib_v_ImageChannelInsert_U8_34R_A8D1X8(mlib_u8  *src,
-                                                                mlib_u8  *dst,
-                                                                mlib_s32 dsize)
-{
-  mlib_d64  *sp, *dp;
-  mlib_d64  sd0, sd1, sd2;          /* source data */
-  mlib_d64  dd0, dd1, dd2, dd3; /* dst data */
-  mlib_d64  sda, sdb, sdc, sdd; /* intermediate variables */
-  mlib_d64  sde, sdf, sdg, sdh;
-  mlib_d64  sdi, sdj, sdk, sdl;
-  mlib_d64  sdm;
-  int       bmask = 0x77;
-  int       i;
-
-  sp = (mlib_d64 *)src;
-  dp = (mlib_d64 *)dst;
-
-#pragma pipeloop(0)
-  for (i = 0; i < dsize / 8; i++) {
-    LOAD_INSERT_STORE_U8_34R_A8;
-  }
-}
-
-/***************************************************************/
-/*
- * Either source or destination image data are not 1-d vectors, but
- * they are 8-byte aligned. And slb and dlb are multiple of 8.
- * The xsize is multiple of 8.
- */
-
-void
-mlib_v_ImageChannelInsert_U8_34R_A8D2X8(mlib_u8  *src,  mlib_s32 slb,
-                                                                mlib_u8  *dst,  mlib_s32 dlb,
-                                                                mlib_s32 xsize, mlib_s32 ysize)
-{
-  mlib_d64  *sp, *dp;             /* 8-byte aligned pointer for pixel */
-  mlib_d64  *sl, *dl;             /* 8-byte aligned pointer for line */
-  mlib_d64  sd0, sd1, sd2;      /* source data */
-  mlib_d64  dd0, dd1, dd2, dd3; /* dst data */
-  mlib_d64  sda, sdb, sdc, sdd; /* intermediate variables */
-  mlib_d64  sde, sdf, sdg, sdh;
-  mlib_d64  sdi, sdj, sdk, sdl;
-  mlib_d64  sdm;
-  int         bmask = 0x77;
-  int       i, j;               /* indices for x, y */
-
-  sp = sl = (mlib_d64 *)src;
-  dp = dl = (mlib_d64 *)dst;
-
-  /* row loop */
-  for (j = 0; j < ysize; j++) {
-    /* 8-byte column loop */
-#pragma pipeloop(0)
-    for (i = 0; i < xsize / 8; i++) {
-      LOAD_INSERT_STORE_U8_34R_A8;
-    }
-    sp = sl = (mlib_d64 *)((mlib_u8 *)sl + slb);
-    dp = dl = (mlib_d64 *)((mlib_u8 *)dl + dlb);
-  }
-}
-
-/***************************************************************/
-/*
- * either source or destination data are not 8-byte aligned.
- */
-
-void
-mlib_v_ImageChannelInsert_U8_34R_D1(mlib_u8  *src,
-                                                            mlib_u8  *dst,
-                                                            mlib_s32 dsize)
-{
-  mlib_u8   *sa, *da;
-  mlib_u8   *dend, *dend2;      /* end points in dst */
-  mlib_d64  *dp;                  /* 8-byte aligned start points in dst */
-  mlib_d64  *sp;                  /* 8-byte aligned start point in src */
-  mlib_d64  s0, s1, s2, s3;     /* 8-byte source raw data */
-  mlib_d64  sd0, sd1, sd2;      /* 8-byte source data */
-  mlib_d64  dd0, dd1, dd2, dd3; /* dst data */
-  mlib_d64  dd4;                  /* the last datum of the last step */
-  mlib_d64  sda, sdb, sdc, sdd; /* intermediate variables */
-  mlib_d64  sde, sdf, sdg, sdh;
-  mlib_d64  sdi, sdj, sdk, sdl;
-  mlib_d64  sdm;
-  int       soff;                 /* offset of address in src */
-  int       doff;                 /* offset of address in dst */
-  int       emask;              /* edge mask */
-  int         bmask;            /* channel mask */
-  int         i, n;
-
-  sa = src;
-  da = dst;
-
-  /* prepare the source address */
-  sp    = (mlib_d64 *) ((mlib_addr) sa & (~7));
-  soff  = ((mlib_addr) sa & 7);
-
-  /* prepare the destination addresses */
-  dp    = (mlib_d64 *)((mlib_addr) da & (~7));
-  dend  = da + dsize * 4 - 1;
-  dend2 = dend - 31;
-  doff  = ((mlib_addr) da & 7);
-
-  /* set band mask for vis_pst_8 to store the bytes needed */
-  bmask = 0xff & (0x7777 >> doff) ;
-
-  /* generate edge mask for the start point */
-  emask = vis_edge8(da, dend);
-
-  /* load 24 bytes, convert to 32 bytes */
-  s3 = sp[0];                                   /* initial value */
-  LOAD_INSERT_U8_34R;
-
-  if (doff == 0) {                              /* dst is 8-byte aligned */
-
-    if (dsize >= 8 ) {
-      vis_pst_8(dd0, dp++, emask & bmask);
-      vis_pst_8(dd1, dp++, bmask);
-      vis_pst_8(dd2, dp++, bmask);
-      vis_pst_8(dd3, dp++, bmask);
-    }
-    else {                                      /* for very small size */
-      vis_pst_8(dd0, dp++, emask & bmask);
-      if ((mlib_addr) dp <= (mlib_addr) dend)  {
-        emask = vis_edge8(dp, dend);
-        vis_pst_8(dd1, dp++, emask & bmask);
-        if ((mlib_addr) dp <= (mlib_addr) dend)  {
-          emask = vis_edge8(dp, dend);
-          vis_pst_8(dd2, dp++, emask & bmask);
-          if ((mlib_addr) dp <= (mlib_addr) dend)  {
-            emask = vis_edge8(dp, dend);
-            vis_pst_8(dd3, dp++, emask & bmask);
-          }
-        }
-      }
-    }
-
-    /* no edge handling is needed in the loop */
-    if ((mlib_addr) dp <= (mlib_addr) dend2)  {
-      n = ((mlib_u8 *)dend2 - (mlib_u8 *)dp) / 32 + 1;
-#pragma pipeloop(0)
-      for (i = 0; i < n; i++) {
-        LOAD_INSERT_U8_34R;
-        vis_pst_8(dd0, dp++, bmask);
-        vis_pst_8(dd1, dp++, bmask);
-        vis_pst_8(dd2, dp++, bmask);
-        vis_pst_8(dd3, dp++, bmask);
-      }
-    }
-
-    if ((mlib_addr) dp <= (mlib_addr) dend)  {
-      LOAD_INSERT_U8_34R;
-      emask = vis_edge8(dp, dend);
-      vis_pst_8(dd0, dp++, emask & bmask);
-      if ((mlib_addr) dp <= (mlib_addr) dend)  {
-        emask = vis_edge8(dp, dend);
-        vis_pst_8(dd1, dp++, emask & bmask);
-        if ((mlib_addr) dp <= (mlib_addr) dend)  {
-          emask = vis_edge8(dp, dend);
-          vis_pst_8(dd2, dp++, emask & bmask);
-          if ((mlib_addr) dp <= (mlib_addr) dend)  {
-            emask = vis_edge8(dp, dend);
-            vis_pst_8(dd3, dp++, emask & bmask);
-          }
-        }
-      }
-    }
-  }
-  else {                                        /* (doff != 0) */
-    vis_alignaddr((void *)0, -doff);
-
-    if (dsize >= 8 ) {
-      vis_pst_8(vis_faligndata(dd0, dd0), dp++, emask & bmask);
-      vis_pst_8(vis_faligndata(dd0, dd1), dp++, bmask);
-      vis_pst_8(vis_faligndata(dd1, dd2), dp++, bmask);
-      vis_pst_8(vis_faligndata(dd2, dd3), dp++, bmask);
-    }
-    else {                                      /* for very small size */
-      vis_pst_8(vis_faligndata(dd0, dd0), dp++, emask & bmask);
-      if ((mlib_addr) dp <= (mlib_addr) dend)  {
-        emask = vis_edge8(dp, dend);
-        vis_pst_8(vis_faligndata(dd0, dd1), dp++, emask & bmask);
-        if ((mlib_addr) dp <= (mlib_addr) dend)  {
-          emask = vis_edge8(dp, dend);
-          vis_pst_8(vis_faligndata(dd1, dd2), dp++, emask & bmask);
-          if ((mlib_addr) dp <= (mlib_addr) dend)  {
-            emask = vis_edge8(dp, dend);
-            vis_pst_8(vis_faligndata(dd2, dd3), dp++, emask & bmask);
-            if ((mlib_addr) dp <= (mlib_addr) dend)  {
-              emask = vis_edge8(dp, dend);
-              vis_pst_8(vis_faligndata(dd3, dd3), dp++, emask & bmask);
-            }
-          }
-        }
-      }
-    }
-
-    /* no edge handling is needed in the loop */
-    if ((mlib_addr) dp <= (mlib_addr) dend2)  {
-      n = ((mlib_u8 *)dend2 - (mlib_u8 *)dp) / 32 + 1;
-#pragma pipeloop(0)
-      for (i = 0; i < n; i++) {
-        LOAD_INSERT_U8_34R;
-        vis_alignaddr((void *)0, -doff);
-        vis_pst_8(vis_faligndata(dd4, dd0), dp++, bmask);
-        vis_pst_8(vis_faligndata(dd0, dd1), dp++, bmask);
-        vis_pst_8(vis_faligndata(dd1, dd2), dp++, bmask);
-        vis_pst_8(vis_faligndata(dd2, dd3), dp++, bmask);
-      }
-    }
-
-    if ((mlib_addr) dp <= (mlib_addr) dend)  {
-      LOAD_INSERT_U8_34R;
-      vis_alignaddr((void *)0, -doff);
-      emask = vis_edge8(dp, dend);
-      vis_pst_8(vis_faligndata(dd4, dd0), dp++, emask & bmask);
-      if ((mlib_addr) dp <= (mlib_addr) dend)  {
-        emask = vis_edge8(dp, dend);
-        vis_pst_8(vis_faligndata(dd0, dd1), dp++, emask & bmask);
-        if ((mlib_addr) dp <= (mlib_addr) dend)  {
-          emask = vis_edge8(dp, dend);
-          vis_pst_8(vis_faligndata(dd1, dd2), dp++, emask & bmask);
-          if ((mlib_addr) dp <= (mlib_addr) dend)  {
-            emask = vis_edge8(dp, dend);
-            vis_pst_8(vis_faligndata(dd2, dd3), dp++, emask & bmask);
-          }
-        }
-      }
-    }
-  }
-}
-
-/***************************************************************/
-
-void
-mlib_v_ImageChannelInsert_U8_34R(mlib_u8  *src,  mlib_s32 slb,
-                                                 mlib_u8  *dst,  mlib_s32 dlb,
-                                                         mlib_s32 xsize, mlib_s32 ysize)
-{
-  mlib_u8   *sa, *da;
-  mlib_u8   *sl, *dl;
-  int         j;
-
-  sa = sl = src;
-  da = dl = dst;
-
-#pragma pipeloop(0)
-  for (j = 0; j < ysize; j++) {
-    mlib_v_ImageChannelInsert_U8_34R_D1(sa, da, xsize);
-    sa = sl += slb;
-    da = dl += dlb;
-  }
-}
-
-/***************************************************************/
-#define INSERT_S16_34R                                                                              \
-  vis_alignaddr((void *)0, 6);                                                                \
-  dd0 = vis_faligndata(sd0, sd0);                 /* b1b0g0r0 */                \
-  vis_alignaddr((void *)0, 4);                                                                \
-  dd1 = vis_faligndata(sd0, sd1);                 /* r0b1gbr1 */                \
-  vis_alignaddr((void *)0, 2);                                                                \
-  dd2 = vis_faligndata(sd1, sd2);                       /* r1b2g2r2 */          \
-  dd3 = sd2;                                                          /* r2b3g3r3 */
-
-/***************************************************************/
-#define LOAD_INSERT_STORE_S16_34R_A8                                                      \
-  sd0 = *sp++;                                          /* b0g0r0b1 */                      \
-  sd1 = *sp++;                                          /* g1r1b2g2 */                      \
-  sd2 = *sp++;                                          /* r2b3g3r3 */                      \
-  INSERT_S16_34R                                                                                          \
-  vis_pst_16(dd0, dp++, bmask);                                                               \
-  vis_pst_16(dd1, dp++, bmask);                                                               \
-  vis_pst_16(dd2, dp++, bmask);                                                               \
-  vis_pst_16(dd3, dp++, bmask);
-
-/***************************************************************/
-#define LOAD_INSERT_S16_34R                                                                       \
-  vis_alignaddr((void *)soff, 0);                                                             \
-  s0 = s3;                                                                                                    \
-  s1 = sp[1];                                                                                               \
-  s2 = sp[2];                                                                                               \
-  s3 = sp[3];                                                                                               \
-  sd0 = vis_faligndata(s0, s1);                                                               \
-  sd1 = vis_faligndata(s1, s2);                                                               \
-  sd2 = vis_faligndata(s2, s3);                                                               \
-  sp += 3;                                                                                                    \
-  dd4 = dd3;                                                                                                \
-  INSERT_S16_34R
-
-/***************************************************************/
-/*
- * both source and destination image data are 1-d vectors and
- * 8-byte aligned.  dsize is multiple of 4.
- */
-
-void
-mlib_v_ImageChannelInsert_S16_34R_A8D1X4(mlib_s16 *src,
-                                                                 mlib_s16 *dst,
-                                                                 mlib_s32 dsize)
-{
-  mlib_d64  *sp, *dp;           /* 8-byte aligned pointer for pixel */
-  mlib_d64  sd0, sd1, sd2;      /* source data */
-  mlib_d64  dd0, dd1, dd2, dd3; /* dst data */
-  int       bmask = 0x07;       /* channel mask */
-  int       i;
-
-  sp = (mlib_d64 *)src;
-  dp = (mlib_d64 *)dst;
-
-  /* set GSR.offset for vis_faligndata()  */
-  /* vis_alignaddr((void *)0, 2); */            /* only for _old */
-
-#pragma pipeloop(0)
-  for (i = 0; i < dsize / 4; i++) {
-    LOAD_INSERT_STORE_S16_34R_A8;
-  }
-}
-
-/***************************************************************/
-/*
- * either source or destination image data are not 1-d vectors, but
- * they are 8-byte aligned.  xsize is multiple of 4.
- */
-
-void
-mlib_v_ImageChannelInsert_S16_34R_A8D2X4(mlib_s16 *src,  mlib_s32 slb,
-                                                                 mlib_s16 *dst,  mlib_s32 dlb,
-                                                                 mlib_s32 xsize, mlib_s32 ysize)
-{
-  mlib_d64  *sp, *dp;           /* 8-byte aligned pointer for pixel */
-  mlib_d64  *sl, *dl;           /* 8-byte aligned pointer for line */
-  mlib_d64  sd0, sd1, sd2;      /* source data */
-  mlib_d64  dd0, dd1, dd2, dd3; /* dst data */
-  int       bmask = 0x07;       /* channel mask */
-  int       i, j;               /* indices for x, y */
-
-  sp = sl = (mlib_d64 *)src;
-  dp = dl = (mlib_d64 *)dst;
-
-  /* row loop */
-  for (j = 0; j < ysize; j++) {
-    /* 4-pixel column loop */
-#pragma pipeloop(0)
-    for (i = 0; i < xsize / 4; i++) {
-      LOAD_INSERT_STORE_S16_34R_A8;
-    }
-    sp = sl = (mlib_d64 *)((mlib_u8 *)sl + slb);
-    dp = dl = (mlib_d64 *)((mlib_u8 *)dl + dlb);
-  }
-}
-
-/***************************************************************/
-/*
- * either source or destination data are not 8-byte aligned.
- */
-
-void
-mlib_v_ImageChannelInsert_S16_34R_D1(mlib_s16 *src,
-                                                             mlib_s16 *dst,
-                                                             mlib_s32 dsize)
-{
-  mlib_s16  *sa, *da;           /* pointer for pixel */
-  mlib_s16  *dend, *dend2;      /* end points in dst */
-  mlib_d64  *dp;                /* 8-byte aligned start points in dst */
-  mlib_d64  *sp;                /* 8-byte aligned start point in src */
-  mlib_d64  s0, s1, s2, s3;     /* 8-byte source raw data */
-  mlib_d64  sd0, sd1, sd2;      /* 8-byte source data */
-  mlib_d64  dd0, dd1, dd2, dd3; /* dst data */
-  mlib_d64  dd4;                /* the last datum of the last step */
-  int soff;             /* offset of address in src */
-  int doff;             /* offset of address in dst */
-  int       emask;              /* edge mask */
-  int       bmask;              /* channel mask */
-  int       i, n;
-
-  sa = src;
-  da = dst;
-
-  /* prepare the source address */
-  sp    = (mlib_d64 *) ((mlib_addr) sa & (~7));
-  soff  = ((mlib_addr) sa & 7);
-
-  /* prepare the destination addresses */
-  dp    = (mlib_d64 *)((mlib_addr) da & (~7));
-  dend  = da + dsize * 4 - 1;
-  dend2 = dend - 15;
-  doff  = ((mlib_addr) da & 7);
-
-  /* set channel mask for vis_pst_16 to store the words needed */
-  bmask = 0xff & (0x77 >> (doff / 2));
-
-  /* generate edge mask for the start point */
-  emask = vis_edge16(da, dend);
-
-  /* load 24 byte, convert, store 32 bytes */
-  s3 = sp[0];                                   /* initial value */
-  LOAD_INSERT_S16_34R;
-
-  if (doff == 0) {                              /* dst is 8-byte aligned */
-
-    if (dsize >= 4 ) {
-      vis_pst_16(dd0, dp++, emask & bmask);
-      vis_pst_16(dd1, dp++, bmask);
-      vis_pst_16(dd2, dp++, bmask);
-      vis_pst_16(dd3, dp++, bmask);
-    }
-    else {                                      /* for very small size */
-      vis_pst_16(dd0, dp++, emask & bmask);
-      if ((mlib_addr) dp <= (mlib_addr) dend)  {
-        emask = vis_edge16(dp, dend);
-        vis_pst_16(dd1, dp++, emask & bmask);
-        if ((mlib_addr) dp <= (mlib_addr) dend)  {
-          emask = vis_edge16(dp, dend);
-          vis_pst_16(dd2, dp++, emask & bmask);
-        }
-      }
-    }
-
-    /* no edge handling is needed in the loop */
-    if ((mlib_addr) dp <= (mlib_addr) dend2)  {
-      n = ((mlib_u8 *)dend2 - (mlib_u8 *)dp) / 32 + 1;
-#pragma pipeloop(0)
-      for (i = 0; i < n; i++) {
-        LOAD_INSERT_S16_34R;
-        vis_pst_16(dd0, dp++, bmask);
-        vis_pst_16(dd1, dp++, bmask);
-        vis_pst_16(dd2, dp++, bmask);
-        vis_pst_16(dd3, dp++, bmask);
-      }
-    }
-
-    if ((mlib_addr) dp <= (mlib_addr) dend)  {
-      LOAD_INSERT_S16_34R;
-      emask = vis_edge16(dp, dend);
-      vis_pst_16(dd0, dp++, emask & bmask);
-      if ((mlib_addr) dp <= (mlib_addr) dend)  {
-        emask = vis_edge16(dp, dend);
-        vis_pst_16(dd1, dp++, emask & bmask);
-        if ((mlib_addr) dp <= (mlib_addr) dend)  {
-          emask = vis_edge16(dp, dend);
-          vis_pst_16(dd2, dp++, emask & bmask);
-        }
-      }
-    }
-  }
-  else {                                        /* (doff != 0) */
-    vis_alignaddr((void *)0, -doff);
-
-    if (dsize >= 4 ) {
-      vis_pst_16(vis_faligndata(dd0, dd0), dp++, emask & bmask);
-      vis_pst_16(vis_faligndata(dd0, dd1), dp++, bmask);
-      vis_pst_16(vis_faligndata(dd1, dd2), dp++, bmask);
-      vis_pst_16(vis_faligndata(dd2, dd3), dp++, bmask);
-    }
-    else {                                      /* for very small size */
-      vis_pst_16(vis_faligndata(dd0, dd0), dp++, emask & bmask);
-      if ((mlib_addr) dp <= (mlib_addr) dend)  {
-        emask = vis_edge16(dp, dend);
-        vis_pst_16(vis_faligndata(dd0, dd1), dp++, emask & bmask);
-        if ((mlib_addr) dp <= (mlib_addr) dend)  {
-          emask = vis_edge16(dp, dend);
-          vis_pst_16(vis_faligndata(dd1, dd2), dp++, emask & bmask);
-          if ((mlib_addr) dp <= (mlib_addr) dend)  {
-            emask = vis_edge16(dp, dend);
-            vis_pst_16(vis_faligndata(dd2, dd3), dp++, emask & bmask);
-          }
-        }
-      }
-    }
-
-    /* no edge handling is needed in the loop */
-    if ((mlib_addr) dp <= (mlib_addr) dend2)  {
-      n = ((mlib_u8 *)dend2 - (mlib_u8 *)dp) / 32 + 1;
-#pragma pipeloop(0)
-      for (i = 0; i < n; i++) {
-        LOAD_INSERT_S16_34R;
-        vis_alignaddr((void *)0, -doff);
-        vis_pst_16(vis_faligndata(dd4, dd0), dp++, bmask);
-        vis_pst_16(vis_faligndata(dd0, dd1), dp++, bmask);
-        vis_pst_16(vis_faligndata(dd1, dd2), dp++, bmask);
-        vis_pst_16(vis_faligndata(dd2, dd3), dp++, bmask);
-      }
-    }
-
-    if ((mlib_addr) dp <= (mlib_addr) dend)  {
-      LOAD_INSERT_S16_34R;
-      vis_alignaddr((void *)0, -doff);
-      emask = vis_edge16(dp, dend);
-      vis_pst_16(vis_faligndata(dd4, dd0), dp++, emask & bmask);
-      if ((mlib_addr) dp <= (mlib_addr) dend)  {
-        emask = vis_edge16(dp, dend);
-        vis_pst_16(vis_faligndata(dd0, dd1), dp++, emask & bmask);
-        if ((mlib_addr) dp <= (mlib_addr) dend)  {
-          emask = vis_edge16(dp, dend);
-          vis_pst_16(vis_faligndata(dd1, dd2), dp++, emask & bmask);
-          if ((mlib_addr) dp <= (mlib_addr) dend)  {
-            emask = vis_edge16(dp, dend);
-            vis_pst_16(vis_faligndata(dd2, dd3), dp++, emask & bmask);
-          }
-        }
-      }
-    }
-  }
-}
-
-/***************************************************************/
-
-void
-mlib_v_ImageChannelInsert_S16_34R(mlib_s16 *src,  mlib_s32 slb,
-                                                          mlib_s16 *dst,  mlib_s32 dlb,
-                                                          mlib_s32 xsize, mlib_s32 ysize)
-{
-  mlib_s16  *sa, *da;
-  mlib_s16  *sl, *dl;
-  int       j;
-
-  sa = sl = src;
-  da = dl = dst;
-
-#pragma pipeloop(0)
-  for (j = 0; j < ysize; j++) {
-    mlib_v_ImageChannelInsert_S16_34R_D1(sa, da, xsize);
-    sa = sl = (mlib_s16 *)((mlib_u8 *)sl + slb);
-    da = dl = (mlib_s16 *)((mlib_u8 *)dl + dlb);
-  }
-}
-
-/***************************************************************/
-#define INSERT_U8_34L                                                                                 \
-  sda = vis_fpmerge(vis_read_hi(sd0), vis_read_lo(sd1));                    \
-  sdb = vis_fpmerge(vis_read_lo(sd0), vis_read_hi(sd2));                    \
-  sdc = vis_fpmerge(vis_read_hi(sd1), vis_read_lo(sd2));                    \
-  sdd = vis_fpmerge(vis_read_hi(sda), vis_read_lo(sdb));                    \
-  sde = vis_fpmerge(vis_read_lo(sda), vis_read_hi(sdc));                    \
-  sdf = vis_fpmerge(vis_read_hi(sdb), vis_read_lo(sdc));                    \
-  sdg = vis_fpmerge(vis_read_hi(sdd), vis_read_lo(sde));                    \
-  sdh = vis_fpmerge(vis_read_lo(sdd), vis_read_hi(sdf));                    \
-  sdi = vis_fpmerge(vis_read_hi(sde), vis_read_lo(sdf));                    \
-  sdj = vis_fpmerge(vis_read_hi(sdg), vis_read_hi(sdi));                    \
-  sdk = vis_fpmerge(vis_read_lo(sdg), vis_read_lo(sdi));                    \
-  sdl = vis_fpmerge(vis_read_hi(sdh), vis_read_hi(sdh));                    \
-  sdm = vis_fpmerge(vis_read_lo(sdh), vis_read_lo(sdh));                    \
-  dd0 = vis_fpmerge(vis_read_hi(sdj), vis_read_hi(sdl));                    \
-  dd1 = vis_fpmerge(vis_read_lo(sdj), vis_read_lo(sdl));                    \
-  dd2 = vis_fpmerge(vis_read_hi(sdk), vis_read_hi(sdm));                    \
-  dd3 = vis_fpmerge(vis_read_lo(sdk), vis_read_lo(sdm));
-
-/***************************************************************/
-#define LOAD_INSERT_STORE_U8_34L_A8                                                         \
-  sd0 = *sp++;                                  /* b0g0r0b1g1r1b2g2 */                  \
-  sd1 = *sp++;                                  /* r2b3g3r3b4g4r4b5 */                  \
-  sd2 = *sp++;                                  /* g5r5b6g6r6b7g7r7 */                  \
-  INSERT_U8_34L                                                                                                       \
-  vis_pst_8(dd0, dp++, bmask);                                                                \
-  vis_pst_8(dd1, dp++, bmask);                                                                \
-  vis_pst_8(dd2, dp++, bmask);                                                                \
-  vis_pst_8(dd3, dp++, bmask);
-
-/***************************************************************/
-#define LOAD_INSERT_U8_34L                                                                        \
-  vis_alignaddr((void *)soff, 0);                                                             \
-  s0 = s3;                                                                                                    \
-  s1 = sp[1];                                                                                               \
-  s2 = sp[2];                                                                                               \
-  s3 = sp[3];                                                                                               \
-  sd0 = vis_faligndata(s0, s1);                                 \
-  sd1 = vis_faligndata(s1, s2);                                                               \
-  sd2 = vis_faligndata(s2, s3);                                                               \
-  sp += 3;                                                                                                    \
-  dd4 = dd3;                                                    \
-  INSERT_U8_34L
-
-/***************************************************************/
-/*
- * Both source and destination image data are 1-d vectors and
- * 8-byte aligned. And dsize is multiple of 8.
- */
-void
-mlib_v_ImageChannelInsert_U8_34L_A8D1X8(mlib_u8  *src,
-                                                                mlib_u8  *dst,
-                                                                mlib_s32 dsize)
-{
-  mlib_d64  *sp, *dp;
-  mlib_d64  sd0, sd1, sd2;          /* source data */
-  mlib_d64  dd0, dd1, dd2, dd3; /* dst data */
-  mlib_d64  sda, sdb, sdc, sdd; /* intermediate variables */
-  mlib_d64  sde, sdf, sdg, sdh;
-  mlib_d64  sdi, sdj, sdk, sdl;
-  mlib_d64  sdm;
-  int         bmask = 0xee;
-  int         i;
-
-  sp = (mlib_d64 *)src;
-  dp = (mlib_d64 *)dst;
-
-#pragma pipeloop(0)
-  for (i = 0; i < dsize / 8; i++) {
-    LOAD_INSERT_STORE_U8_34L_A8;
-  }
-}
-
-/***************************************************************/
-/*
- * Either source or destination image data are not 1-d vectors, but
- * they are 8-byte aligned. And slb and dlb are multiple of 8.
- * The xsize is multiple of 8.
- */
-void
-mlib_v_ImageChannelInsert_U8_34L_A8D2X8(mlib_u8  *src,  mlib_s32 slb,
-                                                                mlib_u8  *dst,  mlib_s32 dlb,
-                                                        mlib_s32 xsize, mlib_s32 ysize)
-{
-  mlib_d64  *sp, *dp;           /* 8-byte aligned pointer for pixel */
-  mlib_d64  *sl, *dl;           /* 8-byte aligned pointer for line */
-  mlib_d64  sd0, sd1, sd2;      /* source data */
-  mlib_d64  dd0, dd1, dd2, dd3; /* dst data */
-  mlib_d64  sda, sdb, sdc, sdd; /* intermediate variables */
-  mlib_d64  sde, sdf, sdg, sdh;
-  mlib_d64  sdi, sdj, sdk, sdl;
-  mlib_d64  sdm;
-  int         bmask = 0xee;
-  int       i, j;               /* indices for x, y */
-
-  sp = sl = (mlib_d64 *)src;
-  dp = dl = (mlib_d64 *)dst;
-
-  /* row loop */
-  for (j = 0; j < ysize; j++) {
-    /* 8-byte column loop */
-#pragma pipeloop(0)
-    for (i = 0; i < xsize / 8; i++) {
-      LOAD_INSERT_STORE_U8_34L_A8;
-    }
-    sp = sl = (mlib_d64 *)((mlib_u8 *)sl + slb);
-    dp = dl = (mlib_d64 *)((mlib_u8 *)dl + dlb);
-  }
-}
-
-/***************************************************************/
-/*
- * either source or destination data are not 8-byte aligned.
- */
-void
-mlib_v_ImageChannelInsert_U8_34L_D1(mlib_u8  *src,
-                                                            mlib_u8  *dst,
-                                                            mlib_s32 dsize)
-{
-  mlib_u8   *sa, *da;
-  mlib_u8   *dend, *dend2;      /* end points in dst */
-  mlib_d64  *dp;                /* 8-byte aligned start points in dst */
-  mlib_d64  *sp;                /* 8-byte aligned start point in src */
-  mlib_d64  s0, s1, s2, s3;     /* 8-byte source raw data */
-  mlib_d64  sd0, sd1, sd2;      /* 8-byte source data */
-  mlib_d64  dd0, dd1, dd2, dd3; /* dst data */
-  mlib_d64  dd4;                /* the last datum of the last step */
-  mlib_d64  sda, sdb, sdc, sdd; /* intermediate variables */
-  mlib_d64  sde, sdf, sdg, sdh;
-  mlib_d64  sdi, sdj, sdk, sdl;
-  mlib_d64  sdm;
-  int       soff;               /* offset of address in src */
-  int       doff;               /* offset of address in dst */
-  int       emask;              /* edge mask */
-  int         bmask;            /* channel mask */
-  int         i, n;
-
-  sa = src;
-  da = dst;
-
-  /* prepare the source address */
-  sp    = (mlib_d64 *) ((mlib_addr) sa & (~7));
-  soff  = ((mlib_addr) sa & 7);
-
-  /* prepare the destination addresses */
-  dp    = (mlib_d64 *)((mlib_addr) da & (~7));
-  dend  = da + dsize * 4 - 1;
-  dend2 = dend - 31;
-  doff  = ((mlib_addr) da & 7);
-
-  /* set band mask for vis_pst_8 to store the bytes needed */
-  bmask = 0xff & (0xeeee >> doff) ;
-
-  /* generate edge mask for the start point */
-  emask = vis_edge8(da, dend);
-
-  /* load 24 bytes, convert to 32 bytes */
-  s3 = sp[0];                                   /* initial value */
-  LOAD_INSERT_U8_34L;
-
-  if (doff == 0) {                              /* dst is 8-byte aligned */
-
-    if (dsize >= 8 ) {
-      vis_pst_8(dd0, dp++, emask & bmask);
-      vis_pst_8(dd1, dp++, bmask);
-      vis_pst_8(dd2, dp++, bmask);
-      vis_pst_8(dd3, dp++, bmask);
-    }
-    else {                                      /* for very small size */
-      vis_pst_8(dd0, dp++, emask & bmask);
-      if ((mlib_addr) dp <= (mlib_addr) dend)  {
-        emask = vis_edge8(dp, dend);
-        vis_pst_8(dd1, dp++, emask & bmask);
-        if ((mlib_addr) dp <= (mlib_addr) dend)  {
-          emask = vis_edge8(dp, dend);
-          vis_pst_8(dd2, dp++, emask & bmask);
-          if ((mlib_addr) dp <= (mlib_addr) dend)  {
-            emask = vis_edge8(dp, dend);
-            vis_pst_8(dd3, dp++, emask & bmask);
-          }
-        }
-      }
-    }
-
-    /* no edge handling is needed in the loop */
-    if ((mlib_addr) dp <= (mlib_addr) dend2)  {
-      n = ((mlib_u8 *)dend2 - (mlib_u8 *)dp) / 32 + 1;
-#pragma pipeloop(0)
-      for (i = 0; i < n; i++) {
-        LOAD_INSERT_U8_34L;
-        vis_pst_8(dd0, dp++, bmask);
-        vis_pst_8(dd1, dp++, bmask);
-        vis_pst_8(dd2, dp++, bmask);
-        vis_pst_8(dd3, dp++, bmask);
-      }
-    }
-
-    if ((mlib_addr) dp <= (mlib_addr) dend)  {
-      LOAD_INSERT_U8_34L;
-      emask = vis_edge8(dp, dend);
-      vis_pst_8(dd0, dp++, emask & bmask);
-      if ((mlib_addr) dp <= (mlib_addr) dend)  {
-        emask = vis_edge8(dp, dend);
-        vis_pst_8(dd1, dp++, emask & bmask);
-        if ((mlib_addr) dp <= (mlib_addr) dend)  {
-          emask = vis_edge8(dp, dend);
-          vis_pst_8(dd2, dp++, emask & bmask);
-          if ((mlib_addr) dp <= (mlib_addr) dend)  {
-            emask = vis_edge8(dp, dend);
-            vis_pst_8(dd3, dp++, emask & bmask);
-          }
-        }
-      }
-    }
-  }
-  else {                                        /* (doff != 0) */
-    vis_alignaddr((void *)0, -doff);
-
-    if (dsize >= 8 ) {
-      vis_pst_8(vis_faligndata(dd0, dd0), dp++, emask & bmask);
-      vis_pst_8(vis_faligndata(dd0, dd1), dp++, bmask);
-      vis_pst_8(vis_faligndata(dd1, dd2), dp++, bmask);
-      vis_pst_8(vis_faligndata(dd2, dd3), dp++, bmask);
-    }
-    else {                                      /* for very small size */
-      vis_pst_8(vis_faligndata(dd0, dd0), dp++, emask & bmask);
-      if ((mlib_addr) dp <= (mlib_addr) dend)  {
-        emask = vis_edge8(dp, dend);
-        vis_pst_8(vis_faligndata(dd0, dd1), dp++, emask & bmask);
-        if ((mlib_addr) dp <= (mlib_addr) dend)  {
-          emask = vis_edge8(dp, dend);
-          vis_pst_8(vis_faligndata(dd1, dd2), dp++, emask & bmask);
-          if ((mlib_addr) dp <= (mlib_addr) dend)  {
-            emask = vis_edge8(dp, dend);
-            vis_pst_8(vis_faligndata(dd2, dd3), dp++, emask & bmask);
-            if ((mlib_addr) dp <= (mlib_addr) dend)  {
-              emask = vis_edge8(dp, dend);
-              vis_pst_8(vis_faligndata(dd3, dd3), dp++, emask & bmask);
-            }
-          }
-        }
-      }
-    }
-
-    /* no edge handling is needed in the loop */
-    if ((mlib_addr) dp <= (mlib_addr) dend2)  {
-      n = ((mlib_u8 *)dend2 - (mlib_u8 *)dp) / 32 + 1;
-#pragma pipeloop(0)
-      for (i = 0; i < n; i++) {
-        LOAD_INSERT_U8_34L;
-        vis_alignaddr((void *)0, -doff);
-        vis_pst_8(vis_faligndata(dd4, dd0), dp++, bmask);
-        vis_pst_8(vis_faligndata(dd0, dd1), dp++, bmask);
-        vis_pst_8(vis_faligndata(dd1, dd2), dp++, bmask);
-        vis_pst_8(vis_faligndata(dd2, dd3), dp++, bmask);
-      }
-    }
-
-    if ((mlib_addr) dp <= (mlib_addr) dend)  {
-      LOAD_INSERT_U8_34L;
-      vis_alignaddr((void *)0, -doff);
-      emask = vis_edge8(dp, dend);
-      vis_pst_8(vis_faligndata(dd4, dd0), dp++, emask & bmask);
-      if ((mlib_addr) dp <= (mlib_addr) dend)  {
-        emask = vis_edge8(dp, dend);
-        vis_pst_8(vis_faligndata(dd0, dd1), dp++, emask & bmask);
-        if ((mlib_addr) dp <= (mlib_addr) dend)  {
-          emask = vis_edge8(dp, dend);
-          vis_pst_8(vis_faligndata(dd1, dd2), dp++, emask & bmask);
-          if ((mlib_addr) dp <= (mlib_addr) dend)  {
-            emask = vis_edge8(dp, dend);
-            vis_pst_8(vis_faligndata(dd2, dd3), dp++, emask & bmask);
-          }
-        }
-      }
-    }
-  }
-}
-
-/***************************************************************/
-void
-mlib_v_ImageChannelInsert_U8_34L(mlib_u8  *src,  mlib_s32 slb,
-                                                         mlib_u8  *dst,  mlib_s32 dlb,
-                                                         mlib_s32 xsize, mlib_s32 ysize)
-{
-  mlib_u8   *sa, *da;
-  mlib_u8   *sl, *dl;
-  int         j;
-
-  sa = sl = src;
-  da = dl = dst;
-
-#pragma pipeloop(0)
-  for (j = 0; j < ysize; j++) {
-    mlib_v_ImageChannelInsert_U8_34L_D1(sa, da, xsize);
-    sa = sl += slb;
-    da = dl += dlb;
-  }
-}
-
-/***************************************************************/
-#define INSERT_S16_34L                                                                              \
-  dd0 = sd0;                                                            /* b0g0r0b1 */        \
-  vis_alignaddr((void *)0, 6);                                                                \
-  dd1 = vis_faligndata(sd0, sd1);                       /* b1gbr1b2 */        \
-  vis_alignaddr((void *)0, 4);                                                                \
-  dd2 = vis_faligndata(sd1, sd2);                         /* b2g2r2b3 */              \
-  vis_alignaddr((void *)0, 2);                                                                \
-  dd3 = vis_faligndata(sd2, sd2);                         /* b3g3r3r2 */
-
-/***************************************************************/
-#define LOAD_INSERT_STORE_S16_34L_A8                                                      \
-  sd0 = *sp++;                                          /* b0g0r0b1 */                          \
-  sd1 = *sp++;                                          /* g1r1b2g2 */                      \
-  sd2 = *sp++;                                          /* r2b3g3r3 */                      \
-  INSERT_S16_34L                                                                                          \
-  vis_pst_16(dd0, dp++, bmask);                                                               \
-  vis_pst_16(dd1, dp++, bmask);                                                               \
-  vis_pst_16(dd2, dp++, bmask);                                                               \
-  vis_pst_16(dd3, dp++, bmask);
-
-/***************************************************************/
-#define LOAD_INSERT_S16_34L                                                                       \
-  vis_alignaddr((void *)soff, 0);                                                             \
-  s0 = s3;                                                                                                    \
-  s1 = sp[1];                                                                                               \
-  s2 = sp[2];                                                                                               \
-  s3 = sp[3];                                                                                               \
-  sd0 = vis_faligndata(s0, s1);                                                               \
-  sd1 = vis_faligndata(s1, s2);                                                               \
-  sd2 = vis_faligndata(s2, s3);                                                               \
-  sp += 3;                                                                                                    \
-  dd4 = dd3;                                                                                                \
-  INSERT_S16_34L
-
-/***************************************************************/
-/*
- * both source and destination image data are 1-d vectors and
- * 8-byte aligned.  dsize is multiple of 4.
- */
-
-void
-mlib_v_ImageChannelInsert_S16_34L_A8D1X4(mlib_s16 *src,
-                                                                 mlib_s16 *dst,
-                                                                 mlib_s32 dsize)
-{
-  mlib_d64  *sp, *dp;           /* 8-byte aligned pointer for pixel */
-  mlib_d64  sd0, sd1, sd2;      /* source data */
-  mlib_d64  dd0, dd1, dd2, dd3; /* dst data */
-  int       bmask = 0x0e;       /* channel mask */
-  int       i;
-
-  sp = (mlib_d64 *)src;
-  dp = (mlib_d64 *)dst;
-
-#pragma pipeloop(0)
-  for (i = 0; i < dsize / 4; i++) {
-    LOAD_INSERT_STORE_S16_34L_A8;
-  }
-}
-
-/***************************************************************/
-/*
- * either source or destination image data are not 1-d vectors, but
- * they are 8-byte aligned.  xsize is multiple of 4.
- */
-
-void
-mlib_v_ImageChannelInsert_S16_34L_A8D2X4(mlib_s16 *src,  mlib_s32 slb,
-                                                                 mlib_s16 *dst,  mlib_s32 dlb,
-                                                                 mlib_s32 xsize, mlib_s32 ysize)
-{
-  mlib_d64  *sp, *dp;           /* 8-byte aligned pointer for pixel */
-  mlib_d64  *sl, *dl;           /* 8-byte aligned pointer for line */
-  mlib_d64  sd0, sd1, sd2;      /* source data */
-  mlib_d64  dd0, dd1, dd2, dd3; /* dst data */
-  int       bmask = 0x0e;       /* channel mask */
-  int       i, j;               /* indices for x, y */
-
-  sp = sl = (mlib_d64 *)src;
-  dp = dl = (mlib_d64 *)dst;
-
-  /* row loop */
-  for (j = 0; j < ysize; j++) {
-    /* 4-pixel column loop */
-#pragma pipeloop(0)
-    for (i = 0; i < xsize / 4; i++) {
-      LOAD_INSERT_STORE_S16_34L_A8;
-    }
-    sp = sl = (mlib_d64 *)((mlib_u8 *)sl + slb);
-    dp = dl = (mlib_d64 *)((mlib_u8 *)dl + dlb);
-  }
-}
-
-/***************************************************************/
-/*
- * either source or destination data are not 8-byte aligned.
- */
-
-void
-mlib_v_ImageChannelInsert_S16_34L_D1(mlib_s16 *src,
-                                                             mlib_s16 *dst,
-                                                             mlib_s32 dsize)
-{
-  mlib_s16  *sa, *da;           /* pointer for pixel */
-  mlib_s16  *dend, *dend2;      /* end points in dst */
-  mlib_d64  *dp;                /* 8-byte aligned start points in dst */
-  mlib_d64  *sp;                /* 8-byte aligned start point in src */
-  mlib_d64  s0, s1, s2, s3;     /* 8-byte source raw data */
-  mlib_d64  sd0, sd1, sd2;      /* 8-byte source data */
-  mlib_d64  dd0, dd1, dd2, dd3; /* dst data */
-  mlib_d64  dd4;                /* the last datum of the last step */
-  int soff;             /* offset of address in src */
-  int doff;             /* offset of address in dst */
-  int       emask;              /* edge mask */
-  int       bmask;              /* channel mask */
-  int       i, n;
-
-  sa = src;
-  da = dst;
-
-  /* prepare the source address */
-  sp    = (mlib_d64 *) ((mlib_addr) sa & (~7));
-  soff  = ((mlib_addr) sa & 7);
-
-  /* prepare the destination addresses */
-  dp    = (mlib_d64 *)((mlib_addr) da & (~7));
-  dend  = da + dsize * 4 - 1;
-  dend2 = dend - 15;
-  doff  = ((mlib_addr) da & 7);
-
-  /* set channel mask for vis_pst_16 to store the words needed */
-  bmask = 0xff & (0xee >> (doff / 2));
-
-  /* generate edge mask for the start point */
-  emask = vis_edge16(da, dend);
-
-  /* load 24 byte, convert, store 32 bytes */
-  s3 = sp[0];                                   /* initial value */
-  LOAD_INSERT_S16_34L;
-
-  if (doff == 0) {                              /* dst is 8-byte aligned */
-
-    if (dsize >= 4 ) {
-      vis_pst_16(dd0, dp++, emask & bmask);
-      vis_pst_16(dd1, dp++, bmask);
-      vis_pst_16(dd2, dp++, bmask);
-      vis_pst_16(dd3, dp++, bmask);
-    }
-    else {                                      /* for very small size */
-      vis_pst_16(dd0, dp++, emask & bmask);
-      if ((mlib_addr) dp <= (mlib_addr) dend)  {
-        emask = vis_edge16(dp, dend);
-        vis_pst_16(dd1, dp++, emask & bmask);
-        if ((mlib_addr) dp <= (mlib_addr) dend)  {
-          emask = vis_edge16(dp, dend);
-          vis_pst_16(dd2, dp++, emask & bmask);
-        }
-      }
-    }
-
-    /* no edge handling is needed in the loop */
-    if ((mlib_addr) dp <= (mlib_addr) dend2)  {
-      n = ((mlib_u8 *)dend2 - (mlib_u8 *)dp) / 32 + 1;
-#pragma pipeloop(0)
-      for (i = 0; i < n; i++) {
-        LOAD_INSERT_S16_34L;
-        vis_pst_16(dd0, dp++, bmask);
-        vis_pst_16(dd1, dp++, bmask);
-        vis_pst_16(dd2, dp++, bmask);
-        vis_pst_16(dd3, dp++, bmask);
-      }
-    }
-
-    if ((mlib_addr) dp <= (mlib_addr) dend)  {
-      LOAD_INSERT_S16_34L;
-      emask = vis_edge16(dp, dend);
-      vis_pst_16(dd0, dp++, emask & bmask);
-      if ((mlib_addr) dp <= (mlib_addr) dend)  {
-        emask = vis_edge16(dp, dend);
-        vis_pst_16(dd1, dp++, emask & bmask);
-        if ((mlib_addr) dp <= (mlib_addr) dend)  {
-          emask = vis_edge16(dp, dend);
-          vis_pst_16(dd2, dp++, emask & bmask);
-        }
-      }
-    }
-  }
-  else {                                        /* (doff != 0) */
-    vis_alignaddr((void *)0, -doff);
-
-    if (dsize >= 4 ) {
-      vis_pst_16(vis_faligndata(dd0, dd0), dp++, emask & bmask);
-      vis_pst_16(vis_faligndata(dd0, dd1), dp++, bmask);
-      vis_pst_16(vis_faligndata(dd1, dd2), dp++, bmask);
-      vis_pst_16(vis_faligndata(dd2, dd3), dp++, bmask);
-    }
-    else {                                      /* for very small size */
-      vis_pst_16(vis_faligndata(dd0, dd0), dp++, emask & bmask);
-      if ((mlib_addr) dp <= (mlib_addr) dend)  {
-        emask = vis_edge16(dp, dend);
-        vis_pst_16(vis_faligndata(dd0, dd1), dp++, emask & bmask);
-        if ((mlib_addr) dp <= (mlib_addr) dend)  {
-          emask = vis_edge16(dp, dend);
-          vis_pst_16(vis_faligndata(dd1, dd2), dp++, emask & bmask);
-          if ((mlib_addr) dp <= (mlib_addr) dend)  {
-            emask = vis_edge16(dp, dend);
-            vis_pst_16(vis_faligndata(dd2, dd3), dp++, emask & bmask);
-          }
-        }
-      }
-    }
-
-    /* no edge handling is needed in the loop */
-    if ((mlib_addr) dp <= (mlib_addr) dend2)  {
-      n = ((mlib_u8 *)dend2 - (mlib_u8 *)dp) / 32 + 1;
-#pragma pipeloop(0)
-      for (i = 0; i < n; i++) {
-        LOAD_INSERT_S16_34L;
-        vis_alignaddr((void *)0, -doff);
-        vis_pst_16(vis_faligndata(dd4, dd0), dp++, bmask);
-        vis_pst_16(vis_faligndata(dd0, dd1), dp++, bmask);
-        vis_pst_16(vis_faligndata(dd1, dd2), dp++, bmask);
-        vis_pst_16(vis_faligndata(dd2, dd3), dp++, bmask);
-      }
-    }
-
-    if ((mlib_addr) dp <= (mlib_addr) dend)  {
-      LOAD_INSERT_S16_34L;
-      vis_alignaddr((void *)0, -doff);
-      emask = vis_edge16(dp, dend);
-      vis_pst_16(vis_faligndata(dd4, dd0), dp++, emask & bmask);
-      if ((mlib_addr) dp <= (mlib_addr) dend)  {
-        emask = vis_edge16(dp, dend);
-        vis_pst_16(vis_faligndata(dd0, dd1), dp++, emask & bmask);
-        if ((mlib_addr) dp <= (mlib_addr) dend)  {
-          emask = vis_edge16(dp, dend);
-          vis_pst_16(vis_faligndata(dd1, dd2), dp++, emask & bmask);
-          if ((mlib_addr) dp <= (mlib_addr) dend)  {
-            emask = vis_edge16(dp, dend);
-            vis_pst_16(vis_faligndata(dd2, dd3), dp++, emask & bmask);
-          }
-        }
-      }
-    }
-  }
-}
-
-/***************************************************************/
-
-void
-mlib_v_ImageChannelInsert_S16_34L(mlib_s16 *src,  mlib_s32 slb,
-                                                          mlib_s16 *dst,  mlib_s32 dlb,
-                                                          mlib_s32 xsize, mlib_s32 ysize)
-{
-  mlib_s16  *sa, *da;
-  mlib_s16  *sl, *dl;
-  int       j;
-
-  sa = sl = src;
-  da = dl = dst;
-
-#pragma pipeloop(0)
-  for (j = 0; j < ysize; j++) {
-    mlib_v_ImageChannelInsert_S16_34L_D1(sa, da, xsize);
-    sa = sl = (mlib_s16 *)((mlib_u8 *)sl + slb);
-    da = dl = (mlib_s16 *)((mlib_u8 *)dl + dlb);
-  }
-}
-
-/***************************************************************/
diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv.h b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv.h
index ea66f6798da..92a5890c5ab 100644
--- a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv.h
+++ b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv.h
@@ -34,18 +34,6 @@ extern "C" {
 
 #if defined ( VIS ) && VIS == 0x200
 
-mlib_status mlib_conv2x2_8nw_f(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_s32   *kern,
-                               mlib_s32         scale,
-                               mlib_s32         cmask);
-
-mlib_status mlib_conv3x3_8nw_f(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_s32   *kern,
-                               mlib_s32         scale,
-                               mlib_s32         cmask);
-
 mlib_status mlib_convMxN_8nw_f(mlib_image       *dst,
                                const mlib_image *src,
                                mlib_s32         m,
@@ -58,16 +46,6 @@ mlib_status mlib_convMxN_8nw_f(mlib_image       *dst,
 
 #else
 
-mlib_status mlib_conv2x2_8nw_f(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_s32   *kern,
-                               mlib_s32         scale);
-
-mlib_status mlib_conv3x3_8nw_f(mlib_image       *dst,
-                               const mlib_image *src,
-                               const mlib_s32   *kern,
-                               mlib_s32         scale);
-
 mlib_status mlib_convMxN_8nw_f(mlib_image       *dst,
                                const mlib_image *src,
                                mlib_s32         m,
diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvIndex3_8_16nw.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvIndex3_8_16nw.c
deleted file mode 100644
index 4127185b9e7..00000000000
--- a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvIndex3_8_16nw.c
+++ /dev/null
@@ -1,1673 +0,0 @@
-/*
- * Copyright (c) 2000, 2003, 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.
- */
-
-
-
-/*
- * FUNCTION
- *      Internal functions for mlib_ImageConv* on U8 type
- *      and MLIB_EDGE_DST_NO_WRITE mask
- *
- */
-
-/***************************************************************/
-
-#include <vis_proto.h>
-#include <mlib_image.h>
-#include <mlib_ImageCheck.h>
-#include <mlib_ImageColormap.h>
-
-/*
-  This defines switches between functions in
-  files: mlib_v_ImageConv_8nw.c,
-         mlib_v_ImageConvIndex3_8_16nw.c,
-         mlib_v_ImageConvIndex4_8_16nw.c,
-         mlib_v_ImageConvIndex3_8_16nw.c,
-         mlib_v_ImageConvIndex4_8_16nw.c
-*/
-
-#define CONV_INDEX
-
-#define DTYPE mlib_s16
-#define LTYPE mlib_u8
-
-/***************************************************************/
-
-#ifdef CONV_INDEX
-
-#define CONV_FUNC(KERN)                                         \
-  mlib_conv##KERN##_Index3_8_16nw(mlib_image *dst,              \
-                                  mlib_image *src,              \
-                                  mlib_s32   *kern,             \
-                                  mlib_s32   scale,             \
-                                  void       *colormap)
-
-#else
-
-#define CONV_FUNC(KERN)                         \
-  mlib_conv##KERN##_8nw_f(mlib_image *dst,      \
-                          mlib_image *src,      \
-                          mlib_s32   *kern,     \
-                          mlib_s32   scale)
-
-#endif
-
-/***************************************************************/
-
-#ifdef CONV_INDEX
-
-#define NCHAN  3
-
-#else
-
-#define NCHAN  nchan
-
-#endif
-
-/***************************************************************/
-
-#define DEF_VARS                                                \
-  DTYPE    *sl, *sp, *dl;                                       \
-  mlib_s32 hgt = mlib_ImageGetHeight(src);                      \
-  mlib_s32 wid = mlib_ImageGetWidth(src);                       \
-  mlib_s32 sll = mlib_ImageGetStride(src) / sizeof(DTYPE);      \
-  mlib_s32 dll = mlib_ImageGetStride(dst) / sizeof(DTYPE);      \
-  DTYPE    *adr_src = (DTYPE *)mlib_ImageGetData(src);          \
-  DTYPE    *adr_dst = (DTYPE *)mlib_ImageGetData(dst);          \
-  mlib_s32 ssize, xsize, dsize, esize, emask, buff_ind = 0;     \
-  mlib_d64 *pbuff, *dp;                                         \
-  mlib_f32 *karr = (mlib_f32 *)kern;                            \
-  mlib_s32 gsr_scale = (31 - scale) << 3;                       \
-  mlib_d64 drnd = vis_to_double_dup(mlib_round_8[31 - scale]);  \
-  mlib_s32 i, j, l
-
-/***************************************************************/
-
-#ifdef CONV_INDEX
-
-#define DEF_EXTRA_VARS                                                  \
-  int    offset = mlib_ImageGetLutOffset(colormap);                     \
-  LTYPE  **lut_table = (LTYPE**)mlib_ImageGetLutData(colormap);         \
-  LTYPE  *ltbl0 = lut_table[0] - offset;                                \
-  LTYPE  *ltbl1 = lut_table[1] - offset;                                \
-  LTYPE  *ltbl2 = lut_table[2] - offset;                                \
-  LTYPE  *ltbl3 = (NCHAN > 3) ? lut_table[3] - offset : ltbl2
-
-#else
-
-#define DEF_EXTRA_VARS                          \
-  mlib_s32 nchan = mlib_ImageGetChannels(dst)
-
-#endif
-
-/***************************************************************/
-
-#if NCHAN == 3
-
-#define LOAD_SRC() {                                            \
-    mlib_s32 s0 = sp[0], s1 = sp[1], s2 = sp[2], s3 = sp[3];    \
-    mlib_s32 s4 = sp[4], s5 = sp[5], s6 = sp[6], s7 = sp[7];    \
-    mlib_d64 t0, t1, t2;                                        \
-                                                                \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl2, s7), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl1, s7), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl0, s7), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl2, s6), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl1, s6), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl0, s6), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl2, s5), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl1, s5), t2);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl0, s5), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl2, s4), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl1, s4), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl0, s4), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl2, s3), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl1, s3), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl0, s3), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl2, s2), t1);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl1, s2), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl0, s2), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl2, s1), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl1, s1), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl0, s1), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl2, s0), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl1, s0), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl0, s0), t0);            \
-                                                                \
-    buffn[i] = t0;                                              \
-    buffn[i + 1] = t1;                                          \
-    buffn[i + 2] = t2;                                          \
-                                                                \
-    sp += 8;                                                    \
-  }
-
-#else
-
-#define LOAD_SRC() {                                            \
-    mlib_s32 s0 = sp[0], s1 = sp[1], s2 = sp[2], s3 = sp[3];    \
-    mlib_s32 s4 = sp[4], s5 = sp[5], s6 = sp[6], s7 = sp[7];    \
-    mlib_d64 t0, t1, t2;                                        \
-                                                                \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl3, s5), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl2, s5), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl1, s5), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl0, s5), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl3, s4), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl2, s4), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl1, s4), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl0, s4), t2);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl3, s3), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl2, s3), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl1, s3), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl0, s3), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl3, s2), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl2, s2), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl1, s2), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl0, s2), t1);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl3, s1), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl2, s1), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl1, s1), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl0, s1), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl3, s0), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl2, s0), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl1, s0), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl0, s0), t0);            \
-                                                                \
-    buffn[i] = t0;                                              \
-    buffn[i + 1] = t1;                                          \
-    buffn[i + 2] = t2;                                          \
-                                                                \
-    sp += 6;                                                    \
-  }
-
-#endif
-
-/***************************************************************/
-
-static mlib_s32 mlib_round_8[16] = { 0x00400040, 0x00200020, 0x00100010, 0x00080008,
-                                    0x00040004, 0x00020002, 0x00010001, 0x00000000,
-                                    0x00000000, 0x00000000, 0x00000000, 0x00000000,
-                                    0x00000000, 0x00000000, 0x00000000, 0x00000000 };
-
-/***************************************************************/
-
-void mlib_ImageCopy_na(mlib_u8 *sa, mlib_u8 *da, int size);
-
-/***************************************************************/
-
-#define KSIZE  2
-
-mlib_status CONV_FUNC(2x2)
-{
-  mlib_d64 *buffs[2*(KSIZE + 1)];
-  mlib_d64 *buff0, *buff1, *buffn, *buffd, *buffe;
-  mlib_d64 s00, s01, s10, s11, s0, s1;
-  mlib_d64 d0, d1, d00, d01, d10, d11;
-  DEF_VARS;
-  DEF_EXTRA_VARS;
-
-  sl = adr_src;
-  dl = adr_dst;
-
-  ssize = NCHAN*wid;
-  dsize = (ssize + 7)/8;
-  esize = dsize + 4;
-  pbuff = mlib_malloc((KSIZE + 4)*esize*sizeof(mlib_d64));
-  if (pbuff == NULL) return MLIB_FAILURE;
-
-  for (i = 0; i < (KSIZE + 1); i++) buffs[i] = pbuff + i*esize;
-  for (i = 0; i < (KSIZE + 1); i++) buffs[(KSIZE + 1) + i] = buffs[i];
-  buffd = buffs[KSIZE] + esize;
-  buffe = buffd + 2*esize;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-  xsize = ssize - NCHAN*(KSIZE - 1);
-  emask = (0xFF00 >> (xsize & 7)) & 0xFF;
-
-  vis_write_gsr(gsr_scale + 7);
-
-  for (l = 0; l < KSIZE; l++) {
-    mlib_d64 *buffn = buffs[l];
-    sp = sl + l*sll;
-
-#ifndef CONV_INDEX
-    if ((mlib_addr)sp & 7) mlib_ImageCopy_na((void*)sp, (void*)buffn, ssize);
-
-#else
-#pragma pipeloop(0)
-    for (i = 0; i < dsize; i += 3) {
-      LOAD_SRC();
-    }
-#endif /* CONV_INDEX */
-  }
-
-  for (j = 0; j < hgt; j++) {
-    mlib_d64 **buffc = buffs + buff_ind;
-    mlib_f32 *pk = karr, k0, k1;
-    sp = sl + KSIZE*sll;
-
-    buff0 = buffc[0];
-    buff1 = buffc[1];
-    buffn = buffc[KSIZE];
-
-#ifndef CONV_INDEX
-    if ((((mlib_addr)(sl      )) & 7) == 0) buff0 = (mlib_d64*)sl;
-    if ((((mlib_addr)(sl + sll)) & 7) == 0) buff1 = (mlib_d64*)(sl + sll);
-    if ((mlib_addr)sp & 7) mlib_ImageCopy_na((void*)sp, (void*)buffn, ssize);
-#endif
-
-    k0 = pk[1];
-    k1 = pk[3];
-    vis_write_gsr(gsr_scale + NCHAN);
-
-    s01 = buff0[0];
-    s11 = buff1[0];
-#pragma pipeloop(0)
-    for (i = 0; i < (xsize + 7)/8; i++) {
-      s00 = s01;
-      s10 = s11;
-      s01 = buff0[i + 1];
-      s11 = buff1[i + 1];
-      s0  = vis_faligndata(s00, s01);
-      s1  = vis_faligndata(s10, s11);
-
-      d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-      d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-      d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-      d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-
-      d0 = vis_fpadd16(d00, d10);
-      d1 = vis_fpadd16(d01, d11);
-      buffd[2*i] = d0;
-      buffd[2*i + 1] = d1;
-    }
-
-    k0 = pk[0];
-    k1 = pk[2];
-#ifndef CONV_INDEX
-    dp = ((mlib_addr)dl & 7) ? buffe : (mlib_d64*)dl;
-
-#pragma pipeloop(0)
-    for (i = 0; i < xsize/8; i++) {
-      s0 = buff0[i];
-      s1 = buff1[i];
-
-      d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-      d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-      d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-      d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-
-      d0 = buffd[2*i];
-      d1 = buffd[2*i + 1];
-      d00 = vis_fpadd16(d00, d10);
-      d0  = vis_fpadd16(d0, drnd);
-      d0  = vis_fpadd16(d0, d00);
-      d01 = vis_fpadd16(d01, d11);
-      d1  = vis_fpadd16(d1, drnd);
-      d1  = vis_fpadd16(d1, d01);
-      dp[i] = vis_fpack16_pair(d0, d1);
-    }
-
-    if (emask) {
-      s0 = buff0[i];
-      s1 = buff1[i];
-
-      d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-      d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-      d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-      d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-
-      d0 = buffd[2*i];
-      d1 = buffd[2*i + 1];
-      d00 = vis_fpadd16(d00, d10);
-      d0  = vis_fpadd16(d0, drnd);
-      d0  = vis_fpadd16(d0, d00);
-      d01 = vis_fpadd16(d01, d11);
-      d1  = vis_fpadd16(d1, drnd);
-      d1  = vis_fpadd16(d1, d01);
-
-      d0 = vis_fpack16_pair(d0, d1);
-      vis_pst_8(d0, dp + i, emask);
-    }
-
-    if ((mlib_u8*)dp != dl) mlib_ImageCopy_na((void*)buffe, dl, xsize);
-
-#else
-    vis_write_gsr(gsr_scale + 7);
-
-#pragma pipeloop(0)
-    for (i = 0; i < dsize; i += 3) {
-      mlib_d64 d00, d01, d02, d03, d04, d05;
-      mlib_d64 d10, d11, d12, d13, d14, d15;
-      mlib_d64 d0, d1, d2, d3, d4, d5;
-      mlib_d64 s00 = buff0[i];
-      mlib_d64 s01 = buff0[i + 1];
-      mlib_d64 s02 = buff0[i + 2];
-      mlib_d64 s10 = buff1[i];
-      mlib_d64 s11 = buff1[i + 1];
-      mlib_d64 s12 = buff1[i + 2];
-
-      d00 = vis_fmul8x16au(vis_read_hi(s00), k0);
-      d01 = vis_fmul8x16au(vis_read_lo(s00), k0);
-      d02 = vis_fmul8x16au(vis_read_hi(s01), k0);
-      d03 = vis_fmul8x16au(vis_read_lo(s01), k0);
-      d04 = vis_fmul8x16au(vis_read_hi(s02), k0);
-      d05 = vis_fmul8x16au(vis_read_lo(s02), k0);
-      d10 = vis_fmul8x16au(vis_read_hi(s10), k1);
-      d11 = vis_fmul8x16au(vis_read_lo(s10), k1);
-      d12 = vis_fmul8x16au(vis_read_hi(s11), k1);
-      d13 = vis_fmul8x16au(vis_read_lo(s11), k1);
-      d14 = vis_fmul8x16au(vis_read_hi(s12), k1);
-      d15 = vis_fmul8x16au(vis_read_lo(s12), k1);
-
-      d0 = buffd[2*i];
-      d1 = buffd[2*i + 1];
-      d2 = buffd[2*i + 2];
-      d3 = buffd[2*i + 3];
-      d4 = buffd[2*i + 4];
-      d5 = buffd[2*i + 5];
-      d00 = vis_fpadd16(d00, d10);
-      d0  = vis_fpadd16(d0, drnd);
-      d0  = vis_fpadd16(d0, d00);
-      d01 = vis_fpadd16(d01, d11);
-      d1  = vis_fpadd16(d1, drnd);
-      d1  = vis_fpadd16(d1, d01);
-      d02 = vis_fpadd16(d02, d12);
-      d2  = vis_fpadd16(d2, drnd);
-      d2  = vis_fpadd16(d2, d02);
-      d03 = vis_fpadd16(d03, d13);
-      d3  = vis_fpadd16(d3, drnd);
-      d3  = vis_fpadd16(d3, d03);
-      d04 = vis_fpadd16(d04, d14);
-      d4  = vis_fpadd16(d4, drnd);
-      d4  = vis_fpadd16(d4, d04);
-      d05 = vis_fpadd16(d05, d15);
-      d5  = vis_fpadd16(d5, drnd);
-      d5  = vis_fpadd16(d5, d05);
-
-      buffe[i    ] = vis_fpack16_pair(d0, d1);
-      buffe[i + 1] = vis_fpack16_pair(d2, d3);
-      buffe[i + 2] = vis_fpack16_pair(d4, d5);
-
-      LOAD_SRC();
-    }
-
-    mlib_ImageColorTrue2IndexLine_U8_S16_3((void*)buffe, dl, wid, colormap);
-#endif /* CONV_INDEX */
-
-    sl += sll;
-    dl += dll;
-
-    buff_ind++;
-    if (buff_ind >= (KSIZE + 1)) buff_ind = 0;
-  }
-
-  mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-
-#undef  KSIZE
-#define KSIZE  3
-
-mlib_status CONV_FUNC(3x3)
-{
-  mlib_d64 *buffs[2*(KSIZE + 1)];
-  mlib_d64 *buff0, *buff1, *buff2, *buffn, *buffd, *buffe;
-  mlib_d64 s00, s01, s10, s11, s20, s21, s0, s1, s2;
-  mlib_d64 dd, d0, d1, d00, d01, d10, d11, d20, d21;
-  mlib_s32 ik, ik_last, off, doff;
-  DEF_VARS;
-  DEF_EXTRA_VARS;
-
-  sl = adr_src;
-#ifdef CONV_INDEX
-  dl = adr_dst + ((KSIZE - 1)/2)*(dll + 1);
-#else
-  dl = adr_dst + ((KSIZE - 1)/2)*(dll + NCHAN);
-#endif
-
-  ssize = NCHAN*wid;
-  dsize = (ssize + 7)/8;
-  esize = dsize + 4;
-  pbuff = mlib_malloc((KSIZE + 4)*esize*sizeof(mlib_d64));
-  if (pbuff == NULL) return MLIB_FAILURE;
-
-  for (i = 0; i < (KSIZE + 1); i++) buffs[i] = pbuff + i*esize;
-  for (i = 0; i < (KSIZE + 1); i++) buffs[(KSIZE + 1) + i] = buffs[i];
-  buffd = buffs[KSIZE] + esize;
-  buffe = buffd + 2*esize;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-  xsize = ssize - NCHAN*(KSIZE - 1);
-  emask = (0xFF00 >> (xsize & 7)) & 0xFF;
-
-  vis_write_gsr(gsr_scale + 7);
-
-  for (l = 0; l < KSIZE; l++) {
-    mlib_d64 *buffn = buffs[l];
-    sp = sl + l*sll;
-
-#ifndef CONV_INDEX
-    if ((mlib_addr)sp & 7) mlib_ImageCopy_na((void*)sp, (void*)buffn, ssize);
-#else
-#pragma pipeloop(0)
-    for (i = 0; i < dsize; i += 3) {
-      LOAD_SRC();
-    }
-#endif /* CONV_INDEX */
-  }
-
-  /* init buffer */
-#pragma pipeloop(0)
-  for (i = 0; i < (xsize + 7)/8; i++) {
-    buffd[2*i    ] = drnd;
-    buffd[2*i + 1] = drnd;
-  }
-
-  for (j = 0; j < hgt; j++) {
-    mlib_d64 **buffc = buffs + buff_ind, *pbuff0, *pbuff1, *pbuff2;
-    mlib_f32 *pk = karr, k0, k1, k2;
-    sp = sl + KSIZE*sll;
-
-    pbuff0 = buffc[0];
-    pbuff1 = buffc[1];
-    pbuff2 = buffc[2];
-    buffn  = buffc[KSIZE];
-
-#ifndef CONV_INDEX
-    if ((((mlib_addr)(sl        )) & 7) == 0) pbuff0 = (mlib_d64*)sl;
-    if ((((mlib_addr)(sl +   sll)) & 7) == 0) pbuff1 = (mlib_d64*)(sl + sll);
-    if ((((mlib_addr)(sl + 2*sll)) & 7) == 0) pbuff2 = (mlib_d64*)(sl + 2*sll);
-
-    if ((mlib_addr)sp & 7) mlib_ImageCopy_na((void*)sp, (void*)buffn, ssize);
-#endif
-
-#ifdef CONV_INDEX
-    ik_last = 0;
-#else
-    ik_last = (KSIZE - 1);
-#endif
-
-    for (ik = 0; ik < KSIZE; ik++) {
-      k0 = pk[ik];
-      k1 = pk[ik + KSIZE];
-      k2 = pk[ik + 2*KSIZE];
-
-      off  = ik*NCHAN;
-      doff = off/8;
-      off &= 7;
-      buff0 = pbuff0 + doff;
-      buff1 = pbuff1 + doff;
-      buff2 = pbuff2 + doff;
-      vis_write_gsr(gsr_scale + off);
-
-      if (ik == ik_last) continue;
-      /*if (!ik_last) {
-        if ((off & 3) || (ik == (KSIZE - 1))) {
-          ik_last = ik;
-          continue;
-        }
-      }*/
-
-      if (off == 0) {
-#pragma pipeloop(0)
-        for (i = 0; i < (xsize + 7)/8; i++) {
-          s0 = buff0[i];
-          s1 = buff1[i];
-          s2 = buff2[i];
-
-          d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-          d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-          d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-          d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-          d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-          d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-
-          d0 = buffd[2*i];
-          d1 = buffd[2*i + 1];
-          d0 = vis_fpadd16(d00, d0);
-          d0 = vis_fpadd16(d10, d0);
-          d0 = vis_fpadd16(d20, d0);
-          d1 = vis_fpadd16(d01, d1);
-          d1 = vis_fpadd16(d11, d1);
-          d1 = vis_fpadd16(d21, d1);
-          buffd[2*i] = d0;
-          buffd[2*i + 1] = d1;
-        }
-
-      } else if (off == 4) {
-        s01 = buff0[0];
-        s11 = buff1[0];
-        s21 = buff2[0];
-#pragma pipeloop(0)
-        for (i = 0; i < (xsize + 7)/8; i++) {
-          s00 = s01;
-          s10 = s11;
-          s20 = s21;
-          s01 = buff0[i + 1];
-          s11 = buff1[i + 1];
-          s21 = buff2[i + 1];
-
-          d00 = vis_fmul8x16au(vis_read_lo(s00), k0);
-          d01 = vis_fmul8x16au(vis_read_hi(s01), k0);
-          d10 = vis_fmul8x16au(vis_read_lo(s10), k1);
-          d11 = vis_fmul8x16au(vis_read_hi(s11), k1);
-          d20 = vis_fmul8x16au(vis_read_lo(s20), k2);
-          d21 = vis_fmul8x16au(vis_read_hi(s21), k2);
-
-          d0 = buffd[2*i];
-          d1 = buffd[2*i + 1];
-          d0 = vis_fpadd16(d00, d0);
-          d0 = vis_fpadd16(d10, d0);
-          d0 = vis_fpadd16(d20, d0);
-          d1 = vis_fpadd16(d01, d1);
-          d1 = vis_fpadd16(d11, d1);
-          d1 = vis_fpadd16(d21, d1);
-          buffd[2*i] = d0;
-          buffd[2*i + 1] = d1;
-        }
-
-      } else {
-        s01 = buff0[0];
-        s11 = buff1[0];
-        s21 = buff2[0];
-#pragma pipeloop(0)
-        for (i = 0; i < (xsize + 7)/8; i++) {
-          s00 = s01;
-          s10 = s11;
-          s20 = s21;
-          s01 = buff0[i + 1];
-          s11 = buff1[i + 1];
-          s21 = buff2[i + 1];
-          s0  = vis_faligndata(s00, s01);
-          s1  = vis_faligndata(s10, s11);
-          s2  = vis_faligndata(s20, s21);
-
-          d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-          d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-          d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-          d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-          d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-          d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-
-          d0 = buffd[2*i];
-          d1 = buffd[2*i + 1];
-          d0 = vis_fpadd16(d00, d0);
-          d0 = vis_fpadd16(d10, d0);
-          d0 = vis_fpadd16(d20, d0);
-          d1 = vis_fpadd16(d01, d1);
-          d1 = vis_fpadd16(d11, d1);
-          d1 = vis_fpadd16(d21, d1);
-          buffd[2*i] = d0;
-          buffd[2*i + 1] = d1;
-        }
-      }
-    }
-
-    k0 = pk[ik_last];
-    k1 = pk[ik_last + KSIZE];
-    k2 = pk[ik_last + 2*KSIZE];
-
-    off  = ik_last*NCHAN;
-    doff = off/8;
-    off &= 7;
-    buff0 = pbuff0 + doff;
-    buff1 = pbuff1 + doff;
-    buff2 = pbuff2 + doff;
-    vis_write_gsr(gsr_scale + off);
-
-#ifndef CONV_INDEX
-    dp = ((mlib_addr)dl & 7) ? buffe : (mlib_d64*)dl;
-
-    s01 = buff0[0];
-    s11 = buff1[0];
-    s21 = buff2[0];
-#pragma pipeloop(0)
-    for (i = 0; i < xsize/8; i++) {
-      s00 = s01;
-      s10 = s11;
-      s20 = s21;
-      s01 = buff0[i + 1];
-      s11 = buff1[i + 1];
-      s21 = buff2[i + 1];
-      s0  = vis_faligndata(s00, s01);
-      s1  = vis_faligndata(s10, s11);
-      s2  = vis_faligndata(s20, s21);
-
-      d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-      d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-      d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-      d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-      d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-      d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-
-      d0 = buffd[2*i];
-      d1 = buffd[2*i + 1];
-      d0 = vis_fpadd16(d0, d00);
-      d0 = vis_fpadd16(d0, d10);
-      d0 = vis_fpadd16(d0, d20);
-      d1 = vis_fpadd16(d1, d01);
-      d1 = vis_fpadd16(d1, d11);
-      d1 = vis_fpadd16(d1, d21);
-
-      dd = vis_fpack16_pair(d0, d1);
-      dp[i] = dd;
-
-      buffd[2*i    ] = drnd;
-      buffd[2*i + 1] = drnd;
-    }
-
-    if (emask) {
-      s00 = s01;
-      s10 = s11;
-      s20 = s21;
-      s01 = buff0[i + 1];
-      s11 = buff1[i + 1];
-      s21 = buff2[i + 1];
-      s0  = vis_faligndata(s00, s01);
-      s1  = vis_faligndata(s10, s11);
-      s2  = vis_faligndata(s20, s21);
-
-      d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-      d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-      d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-      d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-      d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-      d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-
-      d0 = buffd[2*i];
-      d1 = buffd[2*i + 1];
-      d0 = vis_fpadd16(d0, d00);
-      d0 = vis_fpadd16(d0, d10);
-      d0 = vis_fpadd16(d0, d20);
-      d1 = vis_fpadd16(d1, d01);
-      d1 = vis_fpadd16(d1, d11);
-      d1 = vis_fpadd16(d1, d21);
-
-      dd = vis_fpack16_pair(d0, d1);
-      vis_pst_8(dd, dp + i, emask);
-
-      buffd[2*i    ] = drnd;
-      buffd[2*i + 1] = drnd;
-    }
-
-    if ((mlib_u8*)dp != dl) mlib_ImageCopy_na((void*)buffe, dl, xsize);
-
-#else
-    vis_write_gsr(gsr_scale + 7);
-
-#pragma pipeloop(0)
-    for (i = 0; i < dsize; i += 3) {
-      mlib_d64 d00, d01, d02, d03, d04, d05;
-      mlib_d64 d10, d11, d12, d13, d14, d15;
-      mlib_d64 d20, d21, d22, d23, d24, d25;
-      mlib_d64 d0, d1, d2, d3, d4, d5;
-      mlib_d64 s00 = buff0[i];
-      mlib_d64 s01 = buff0[i + 1];
-      mlib_d64 s02 = buff0[i + 2];
-      mlib_d64 s10 = buff1[i];
-      mlib_d64 s11 = buff1[i + 1];
-      mlib_d64 s12 = buff1[i + 2];
-      mlib_d64 s20 = buff2[i];
-      mlib_d64 s21 = buff2[i + 1];
-      mlib_d64 s22 = buff2[i + 2];
-
-      d00 = vis_fmul8x16au(vis_read_hi(s00), k0);
-      d01 = vis_fmul8x16au(vis_read_lo(s00), k0);
-      d02 = vis_fmul8x16au(vis_read_hi(s01), k0);
-      d03 = vis_fmul8x16au(vis_read_lo(s01), k0);
-      d04 = vis_fmul8x16au(vis_read_hi(s02), k0);
-      d05 = vis_fmul8x16au(vis_read_lo(s02), k0);
-      d10 = vis_fmul8x16au(vis_read_hi(s10), k1);
-      d11 = vis_fmul8x16au(vis_read_lo(s10), k1);
-      d12 = vis_fmul8x16au(vis_read_hi(s11), k1);
-      d13 = vis_fmul8x16au(vis_read_lo(s11), k1);
-      d14 = vis_fmul8x16au(vis_read_hi(s12), k1);
-      d15 = vis_fmul8x16au(vis_read_lo(s12), k1);
-      d20 = vis_fmul8x16au(vis_read_hi(s20), k2);
-      d21 = vis_fmul8x16au(vis_read_lo(s20), k2);
-      d22 = vis_fmul8x16au(vis_read_hi(s21), k2);
-      d23 = vis_fmul8x16au(vis_read_lo(s21), k2);
-      d24 = vis_fmul8x16au(vis_read_hi(s22), k2);
-      d25 = vis_fmul8x16au(vis_read_lo(s22), k2);
-
-      d0 = buffd[2*i];
-      d1 = buffd[2*i + 1];
-      d2 = buffd[2*i + 2];
-      d3 = buffd[2*i + 3];
-      d4 = buffd[2*i + 4];
-      d5 = buffd[2*i + 5];
-      d0 = vis_fpadd16(d0, d00);
-      d0 = vis_fpadd16(d0, d10);
-      d0 = vis_fpadd16(d0, d20);
-      d1 = vis_fpadd16(d1, d01);
-      d1 = vis_fpadd16(d1, d11);
-      d1 = vis_fpadd16(d1, d21);
-      d2 = vis_fpadd16(d2, d02);
-      d2 = vis_fpadd16(d2, d12);
-      d2 = vis_fpadd16(d2, d22);
-      d3 = vis_fpadd16(d3, d03);
-      d3 = vis_fpadd16(d3, d13);
-      d3 = vis_fpadd16(d3, d23);
-      d4 = vis_fpadd16(d4, d04);
-      d4 = vis_fpadd16(d4, d14);
-      d4 = vis_fpadd16(d4, d24);
-      d5 = vis_fpadd16(d5, d05);
-      d5 = vis_fpadd16(d5, d15);
-      d5 = vis_fpadd16(d5, d25);
-
-      buffe[i    ] = vis_fpack16_pair(d0, d1);
-      buffe[i + 1] = vis_fpack16_pair(d2, d3);
-      buffe[i + 2] = vis_fpack16_pair(d4, d5);
-
-      buffd[2*i    ] = drnd;
-      buffd[2*i + 1] = drnd;
-      buffd[2*i + 2] = drnd;
-      buffd[2*i + 3] = drnd;
-      buffd[2*i + 4] = drnd;
-      buffd[2*i + 5] = drnd;
-
-      LOAD_SRC();
-    }
-
-    mlib_ImageColorTrue2IndexLine_U8_S16_3((void*)buffe, dl, wid, colormap);
-#endif /* CONV_INDEX */
-
-    sl += sll;
-    dl += dll;
-
-    buff_ind++;
-    if (buff_ind >= (KSIZE + 1)) buff_ind = 0;
-  }
-
-  mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-
-#undef  KSIZE
-#define MAX_N   11
-
-#ifdef CONV_INDEX
-
-mlib_status mlib_convMxN_Index3_8_16nw(mlib_image *dst,
-                                       mlib_image *src,
-                                       mlib_s32   m,
-                                       mlib_s32   n,
-                                       mlib_s32   dm,
-                                       mlib_s32   dn,
-                                       mlib_s32   *kern,
-                                       mlib_s32   scale,
-                                       void       *colormap)
-
-#else
-
-mlib_status mlib_convMxN_8nw_f(mlib_image *dst,
-                               mlib_image *src,
-                               mlib_s32   m,
-                               mlib_s32   n,
-                               mlib_s32   dm,
-                               mlib_s32   dn,
-                               mlib_s32   *kern,
-                               mlib_s32   scale)
-
-#endif
-{
-  mlib_d64 *buffs_local[3*(MAX_N + 1)], **buffs = buffs_local, **buff;
-  mlib_d64 *buff0, *buff1, *buff2, *buff3, *buffn, *buffd, *buffe;
-  mlib_d64 s00, s01, s10, s11, s20, s21, s30, s31, s0, s1, s2, s3;
-  mlib_d64 d00, d01, d10, d11, d20, d21, d30, d31;
-  mlib_d64 dd, d0, d1;
-  mlib_s32 ik, jk, ik_last, jk_size, coff, off, doff;
-  DEF_VARS;
-  DEF_EXTRA_VARS;
-
-  if (n > MAX_N) {
-    buffs = mlib_malloc(3*(n + 1)*sizeof(mlib_d64*));
-    if (buffs == NULL) return MLIB_FAILURE;
-  }
-
-  buff = buffs + 2*(n + 1);
-
-  sl = adr_src;
-#ifdef CONV_INDEX
-  dl = adr_dst + dn*dll + dm;
-#else
-  dl = adr_dst + dn*dll + dm*NCHAN;
-#endif
-
-  ssize = NCHAN*wid;
-  dsize = (ssize + 7)/8;
-  esize = dsize + 4;
-  pbuff = mlib_malloc((n + 4)*esize*sizeof(mlib_d64));
-  if (pbuff == NULL) {
-    if (buffs != buffs_local) mlib_free(buffs);
-    return MLIB_FAILURE;
-  }
-
-  for (i = 0; i < (n + 1); i++) buffs[i] = pbuff + i*esize;
-  for (i = 0; i < (n + 1); i++) buffs[(n + 1) + i] = buffs[i];
-  buffd = buffs[n] + esize;
-  buffe = buffd + 2*esize;
-
-  wid -= (m - 1);
-  hgt -= (n - 1);
-  xsize = ssize - NCHAN*(m - 1);
-  emask = (0xFF00 >> (xsize & 7)) & 0xFF;
-
-  vis_write_gsr(gsr_scale + 7);
-
-  for (l = 0; l < n; l++) {
-    mlib_d64 *buffn = buffs[l];
-    sp = sl + l*sll;
-
-#ifndef CONV_INDEX
-    if ((mlib_addr)sp & 7) mlib_ImageCopy_na((void*)sp, (void*)buffn, ssize);
-#else
-#pragma pipeloop(0)
-    for (i = 0; i < dsize; i += 3) {
-      LOAD_SRC();
-    }
-#endif /* CONV_INDEX */
-  }
-
-  /* init buffer */
-#pragma pipeloop(0)
-  for (i = 0; i < (xsize + 7)/8; i++) {
-    buffd[2*i    ] = drnd;
-    buffd[2*i + 1] = drnd;
-  }
-
-  for (j = 0; j < hgt; j++) {
-    mlib_d64 **buffc = buffs + buff_ind;
-    mlib_f32 *pk = karr, k0, k1, k2, k3;
-    sp = sl + n*sll;
-
-    for (l = 0; l < n; l++) {
-      buff[l] = buffc[l];
-    }
-    buffn  = buffc[n];
-
-#ifndef CONV_INDEX
-    for (l = 0; l < n; l++) {
-      if ((((mlib_addr)(sl + l*sll)) & 7) == 0) buff[l] = (mlib_d64*)(sl + l*sll);
-    }
-    if ((mlib_addr)sp & 7) mlib_ImageCopy_na((void*)sp, (void*)buffn, ssize);
-#endif
-
-#ifdef CONV_INDEX
-    ik_last = 0;
-#else
-    ik_last = (m - 1);
-#endif
-
-    for (jk = 0; jk < n; jk += jk_size) {
-      jk_size = n - jk;
-#ifdef CONV_INDEX
-      if (jk_size >= 5) jk_size = 3;
-      if (jk_size == 4) jk_size = 2;
-#else
-      if (jk_size >= 6) jk_size = 4;
-      if (jk_size == 5) jk_size = 3;
-#endif
-      coff = 0;
-
-      if (jk_size == 2) {
-
-        for (ik = 0; ik < m; ik++, coff += NCHAN) {
-          if (!jk && ik == ik_last) continue;
-
-          k0 = pk[ik];
-          k1 = pk[ik + m];
-
-          doff  = coff/8;
-          buff0 = buff[jk    ] + doff;
-          buff1 = buff[jk + 1] + doff;
-
-          off = coff & 7;
-          vis_write_gsr(gsr_scale + off);
-
-          s01 = buff0[0];
-          s11 = buff1[0];
-#pragma pipeloop(0)
-          for (i = 0; i < (xsize + 7)/8; i++) {
-            s00 = s01;
-            s10 = s11;
-            s01 = buff0[i + 1];
-            s11 = buff1[i + 1];
-            s0  = vis_faligndata(s00, s01);
-            s1  = vis_faligndata(s10, s11);
-
-            d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-            d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-            d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-            d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-
-            d0 = buffd[2*i];
-            d1 = buffd[2*i + 1];
-            d0 = vis_fpadd16(d00, d0);
-            d0 = vis_fpadd16(d10, d0);
-            d1 = vis_fpadd16(d01, d1);
-            d1 = vis_fpadd16(d11, d1);
-            buffd[2*i] = d0;
-            buffd[2*i + 1] = d1;
-          }
-
-        }
-
-        pk += 2*m;
-
-      } else if (jk_size == 3) {
-
-        for (ik = 0; ik < m; ik++, coff += NCHAN) {
-          if (!jk && ik == ik_last) continue;
-
-          k0 = pk[ik];
-          k1 = pk[ik + m];
-          k2 = pk[ik + 2*m];
-
-          doff  = coff/8;
-          buff0 = buff[jk    ] + doff;
-          buff1 = buff[jk + 1] + doff;
-          buff2 = buff[jk + 2] + doff;
-
-          off = coff & 7;
-          vis_write_gsr(gsr_scale + off);
-
-          if (off == 0) {
-#pragma pipeloop(0)
-            for (i = 0; i < (xsize + 7)/8; i++) {
-              d0 = buffd[2*i];
-              d1 = buffd[2*i + 1];
-
-              s0 = buff0[i];
-              s1 = buff1[i];
-              s2 = buff2[i];
-
-              d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-              d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-              d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-              d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-              d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-              d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-
-              d00 = vis_fpadd16(d00, d10);
-              d0  = vis_fpadd16(d20, d0);
-              d0  = vis_fpadd16(d00, d0);
-              d01 = vis_fpadd16(d01, d11);
-              d1  = vis_fpadd16(d21, d1);
-              d1  = vis_fpadd16(d01, d1);
-              buffd[2*i] = d0;
-              buffd[2*i + 1] = d1;
-            }
-
-          } else if (off == 4) {
-            s01 = buff0[0];
-            s11 = buff1[0];
-            s21 = buff2[0];
-#pragma pipeloop(0)
-            for (i = 0; i < (xsize + 7)/8; i++) {
-              d0 = buffd[2*i];
-              d1 = buffd[2*i + 1];
-
-              s00 = s01;
-              s10 = s11;
-              s20 = s21;
-              s01 = buff0[i + 1];
-              s11 = buff1[i + 1];
-              s21 = buff2[i + 1];
-
-              d00 = vis_fmul8x16au(vis_read_lo(s00), k0);
-              d01 = vis_fmul8x16au(vis_read_hi(s01), k0);
-              d10 = vis_fmul8x16au(vis_read_lo(s10), k1);
-              d11 = vis_fmul8x16au(vis_read_hi(s11), k1);
-              d20 = vis_fmul8x16au(vis_read_lo(s20), k2);
-              d21 = vis_fmul8x16au(vis_read_hi(s21), k2);
-
-              d00 = vis_fpadd16(d00, d10);
-              d0  = vis_fpadd16(d20, d0);
-              d0  = vis_fpadd16(d00, d0);
-              d01 = vis_fpadd16(d01, d11);
-              d1  = vis_fpadd16(d21, d1);
-              d1  = vis_fpadd16(d01, d1);
-              buffd[2*i] = d0;
-              buffd[2*i + 1] = d1;
-            }
-
-          } else {
-            s01 = buff0[0];
-            s11 = buff1[0];
-            s21 = buff2[0];
-#pragma pipeloop(0)
-            for (i = 0; i < (xsize + 7)/8; i++) {
-              d0 = buffd[2*i];
-              d1 = buffd[2*i + 1];
-
-              s00 = s01;
-              s10 = s11;
-              s20 = s21;
-              s01 = buff0[i + 1];
-              s11 = buff1[i + 1];
-              s21 = buff2[i + 1];
-              s0  = vis_faligndata(s00, s01);
-              s1  = vis_faligndata(s10, s11);
-              s2  = vis_faligndata(s20, s21);
-
-              d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-              d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-              d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-              d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-              d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-              d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-
-              d00 = vis_fpadd16(d00, d10);
-              d0  = vis_fpadd16(d20, d0);
-              d0  = vis_fpadd16(d00, d0);
-              d01 = vis_fpadd16(d01, d11);
-              d1  = vis_fpadd16(d21, d1);
-              d1  = vis_fpadd16(d01, d1);
-              buffd[2*i] = d0;
-              buffd[2*i + 1] = d1;
-            }
-          }
-        }
-
-        pk += 3*m;
-
-      } else { /* jk_size == 4 */
-
-        for (ik = 0; ik < m; ik++, coff += NCHAN) {
-          if (!jk && ik == ik_last) continue;
-
-          k0 = pk[ik];
-          k1 = pk[ik + m];
-          k2 = pk[ik + 2*m];
-          k3 = pk[ik + 3*m];
-
-          doff  = coff/8;
-          buff0 = buff[jk    ] + doff;
-          buff1 = buff[jk + 1] + doff;
-          buff2 = buff[jk + 2] + doff;
-          buff3 = buff[jk + 3] + doff;
-
-          off = coff & 7;
-          vis_write_gsr(gsr_scale + off);
-
-          if (off == 0) {
-
-#pragma pipeloop(0)
-            for (i = 0; i < (xsize + 7)/8; i++) {
-              d0 = buffd[2*i];
-              d1 = buffd[2*i + 1];
-
-              s0 = buff0[i];
-              s1 = buff1[i];
-              s2 = buff2[i];
-              s3 = buff3[i];
-
-              d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-              d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-              d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-              d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-              d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-              d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-              d30 = vis_fmul8x16au(vis_read_hi(s3), k3);
-              d31 = vis_fmul8x16au(vis_read_lo(s3), k3);
-
-              d00 = vis_fpadd16(d00, d10);
-              d20 = vis_fpadd16(d20, d30);
-              d0  = vis_fpadd16(d0,  d00);
-              d0  = vis_fpadd16(d0,  d20);
-              d01 = vis_fpadd16(d01, d11);
-              d21 = vis_fpadd16(d21, d31);
-              d1  = vis_fpadd16(d1,  d01);
-              d1  = vis_fpadd16(d1,  d21);
-              buffd[2*i] = d0;
-              buffd[2*i + 1] = d1;
-            }
-
-          } else if (off == 4) {
-
-            s01 = buff0[0];
-            s11 = buff1[0];
-            s21 = buff2[0];
-            s31 = buff3[0];
-#pragma pipeloop(0)
-            for (i = 0; i < (xsize + 7)/8; i++) {
-              d0 = buffd[2*i];
-              d1 = buffd[2*i + 1];
-
-              s00 = s01;
-              s10 = s11;
-              s20 = s21;
-              s30 = s31;
-              s01 = buff0[i + 1];
-              s11 = buff1[i + 1];
-              s21 = buff2[i + 1];
-              s31 = buff3[i + 1];
-
-              d00 = vis_fmul8x16au(vis_read_lo(s00), k0);
-              d01 = vis_fmul8x16au(vis_read_hi(s01), k0);
-              d10 = vis_fmul8x16au(vis_read_lo(s10), k1);
-              d11 = vis_fmul8x16au(vis_read_hi(s11), k1);
-              d20 = vis_fmul8x16au(vis_read_lo(s20), k2);
-              d21 = vis_fmul8x16au(vis_read_hi(s21), k2);
-              d30 = vis_fmul8x16au(vis_read_lo(s30), k3);
-              d31 = vis_fmul8x16au(vis_read_hi(s31), k3);
-
-              d00 = vis_fpadd16(d00, d10);
-              d20 = vis_fpadd16(d20, d30);
-              d0  = vis_fpadd16(d0,  d00);
-              d0  = vis_fpadd16(d0,  d20);
-              d01 = vis_fpadd16(d01, d11);
-              d21 = vis_fpadd16(d21, d31);
-              d1  = vis_fpadd16(d1,  d01);
-              d1  = vis_fpadd16(d1,  d21);
-              buffd[2*i] = d0;
-              buffd[2*i + 1] = d1;
-            }
-
-          } else {
-
-            s01 = buff0[0];
-            s11 = buff1[0];
-            s21 = buff2[0];
-            s31 = buff3[0];
-#pragma pipeloop(0)
-            for (i = 0; i < (xsize + 7)/8; i++) {
-              d0 = buffd[2*i];
-              d1 = buffd[2*i + 1];
-
-              s00 = s01;
-              s10 = s11;
-              s20 = s21;
-              s30 = s31;
-              s01 = buff0[i + 1];
-              s11 = buff1[i + 1];
-              s21 = buff2[i + 1];
-              s31 = buff3[i + 1];
-              s0  = vis_faligndata(s00, s01);
-              s1  = vis_faligndata(s10, s11);
-              s2  = vis_faligndata(s20, s21);
-              s3  = vis_faligndata(s30, s31);
-
-              d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-              d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-              d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-              d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-              d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-              d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-              d30 = vis_fmul8x16au(vis_read_hi(s3), k3);
-              d31 = vis_fmul8x16au(vis_read_lo(s3), k3);
-
-              d00 = vis_fpadd16(d00, d10);
-              d20 = vis_fpadd16(d20, d30);
-              d0  = vis_fpadd16(d0,  d00);
-              d0  = vis_fpadd16(d0,  d20);
-              d01 = vis_fpadd16(d01, d11);
-              d21 = vis_fpadd16(d21, d31);
-              d1  = vis_fpadd16(d1,  d01);
-              d1  = vis_fpadd16(d1,  d21);
-              buffd[2*i] = d0;
-              buffd[2*i + 1] = d1;
-            }
-          }
-        }
-
-        pk += 4*m;
-      }
-    }
-
-    /*****************************************
-     *****************************************
-     **          Final iteration            **
-     *****************************************
-     *****************************************/
-
-    jk_size = n;
-#ifdef CONV_INDEX
-    if (jk_size >= 5) jk_size = 3;
-    if (jk_size == 4) jk_size = 2;
-#else
-    if (jk_size >= 6) jk_size = 4;
-    if (jk_size == 5) jk_size = 3;
-#endif
-
-    k0 = karr[ik_last];
-    k1 = karr[ik_last + m];
-    k2 = karr[ik_last + 2*m];
-    k3 = karr[ik_last + 3*m];
-
-    off  = ik_last*NCHAN;
-    doff = off/8;
-    off &= 7;
-    buff0 = buff[0] + doff;
-    buff1 = buff[1] + doff;
-    buff2 = buff[2] + doff;
-    buff3 = buff[3] + doff;
-    vis_write_gsr(gsr_scale + off);
-
-#ifndef CONV_INDEX
-    if (jk_size == 2) {
-      dp = ((mlib_addr)dl & 7) ? buffe : (mlib_d64*)dl;
-
-      s01 = buff0[0];
-      s11 = buff1[0];
-#pragma pipeloop(0)
-      for (i = 0; i < xsize/8; i++) {
-        s00 = s01;
-        s10 = s11;
-        s01 = buff0[i + 1];
-        s11 = buff1[i + 1];
-        s0  = vis_faligndata(s00, s01);
-        s1  = vis_faligndata(s10, s11);
-
-        d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-        d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-        d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-        d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-
-        d0 = buffd[2*i];
-        d1 = buffd[2*i + 1];
-        d0 = vis_fpadd16(d0, d00);
-        d0 = vis_fpadd16(d0, d10);
-        d1 = vis_fpadd16(d1, d01);
-        d1 = vis_fpadd16(d1, d11);
-
-        dd = vis_fpack16_pair(d0, d1);
-        dp[i] = dd;
-
-        buffd[2*i    ] = drnd;
-        buffd[2*i + 1] = drnd;
-      }
-
-      if (emask) {
-        s00 = s01;
-        s10 = s11;
-        s01 = buff0[i + 1];
-        s11 = buff1[i + 1];
-        s0  = vis_faligndata(s00, s01);
-        s1  = vis_faligndata(s10, s11);
-
-        d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-        d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-        d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-        d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-
-        d0 = buffd[2*i];
-        d1 = buffd[2*i + 1];
-        d0 = vis_fpadd16(d0, d00);
-        d0 = vis_fpadd16(d0, d10);
-        d1 = vis_fpadd16(d1, d01);
-        d1 = vis_fpadd16(d1, d11);
-
-        dd = vis_fpack16_pair(d0, d1);
-        vis_pst_8(dd, dp + i, emask);
-
-        buffd[2*i    ] = drnd;
-        buffd[2*i + 1] = drnd;
-      }
-
-      if ((mlib_u8*)dp != dl) mlib_ImageCopy_na((void*)buffe, dl, xsize);
-
-    } else if (jk_size == 3) {
-
-      dp = ((mlib_addr)dl & 7) ? buffe : (mlib_d64*)dl;
-
-      s01 = buff0[0];
-      s11 = buff1[0];
-      s21 = buff2[0];
-#pragma pipeloop(0)
-      for (i = 0; i < xsize/8; i++) {
-        s00 = s01;
-        s10 = s11;
-        s20 = s21;
-        s01 = buff0[i + 1];
-        s11 = buff1[i + 1];
-        s21 = buff2[i + 1];
-        s0  = vis_faligndata(s00, s01);
-        s1  = vis_faligndata(s10, s11);
-        s2  = vis_faligndata(s20, s21);
-
-        d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-        d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-        d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-        d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-        d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-        d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-
-        d0 = buffd[2*i];
-        d1 = buffd[2*i + 1];
-        d0 = vis_fpadd16(d0, d00);
-        d0 = vis_fpadd16(d0, d10);
-        d0 = vis_fpadd16(d0, d20);
-        d1 = vis_fpadd16(d1, d01);
-        d1 = vis_fpadd16(d1, d11);
-        d1 = vis_fpadd16(d1, d21);
-
-        dd = vis_fpack16_pair(d0, d1);
-        dp[i] = dd;
-
-        buffd[2*i    ] = drnd;
-        buffd[2*i + 1] = drnd;
-      }
-
-      if (emask) {
-        s00 = s01;
-        s10 = s11;
-        s20 = s21;
-        s01 = buff0[i + 1];
-        s11 = buff1[i + 1];
-        s21 = buff2[i + 1];
-        s0  = vis_faligndata(s00, s01);
-        s1  = vis_faligndata(s10, s11);
-        s2  = vis_faligndata(s20, s21);
-
-        d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-        d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-        d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-        d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-        d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-        d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-
-        d0 = buffd[2*i];
-        d1 = buffd[2*i + 1];
-        d0 = vis_fpadd16(d0, d00);
-        d0 = vis_fpadd16(d0, d10);
-        d0 = vis_fpadd16(d0, d20);
-        d1 = vis_fpadd16(d1, d01);
-        d1 = vis_fpadd16(d1, d11);
-        d1 = vis_fpadd16(d1, d21);
-
-        dd = vis_fpack16_pair(d0, d1);
-        vis_pst_8(dd, dp + i, emask);
-
-        buffd[2*i    ] = drnd;
-        buffd[2*i + 1] = drnd;
-      }
-
-      if ((mlib_u8*)dp != dl) mlib_ImageCopy_na((void*)buffe, dl, xsize);
-
-    } else /* if (jk_size == 4) */ {
-
-      dp = ((mlib_addr)dl & 7) ? buffe : (mlib_d64*)dl;
-
-      s01 = buff0[0];
-      s11 = buff1[0];
-      s21 = buff2[0];
-      s31 = buff3[0];
-#pragma pipeloop(0)
-      for (i = 0; i < xsize/8; i++) {
-        s00 = s01;
-        s10 = s11;
-        s20 = s21;
-        s30 = s31;
-        s01 = buff0[i + 1];
-        s11 = buff1[i + 1];
-        s21 = buff2[i + 1];
-        s31 = buff3[i + 1];
-        s0  = vis_faligndata(s00, s01);
-        s1  = vis_faligndata(s10, s11);
-        s2  = vis_faligndata(s20, s21);
-        s3  = vis_faligndata(s30, s31);
-
-        d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-        d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-        d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-        d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-        d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-        d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-        d30 = vis_fmul8x16au(vis_read_hi(s3), k3);
-        d31 = vis_fmul8x16au(vis_read_lo(s3), k3);
-
-        d0 = buffd[2*i];
-        d1 = buffd[2*i + 1];
-        d0 = vis_fpadd16(d0, d00);
-        d0 = vis_fpadd16(d0, d10);
-        d0 = vis_fpadd16(d0, d20);
-        d0 = vis_fpadd16(d0, d30);
-        d1 = vis_fpadd16(d1, d01);
-        d1 = vis_fpadd16(d1, d11);
-        d1 = vis_fpadd16(d1, d21);
-        d1 = vis_fpadd16(d1, d31);
-
-        dd = vis_fpack16_pair(d0, d1);
-        dp[i] = dd;
-
-        buffd[2*i    ] = drnd;
-        buffd[2*i + 1] = drnd;
-      }
-
-      if (emask) {
-        s00 = s01;
-        s10 = s11;
-        s20 = s21;
-        s30 = s31;
-        s01 = buff0[i + 1];
-        s11 = buff1[i + 1];
-        s21 = buff2[i + 1];
-        s31 = buff3[i + 1];
-        s0  = vis_faligndata(s00, s01);
-        s1  = vis_faligndata(s10, s11);
-        s2  = vis_faligndata(s20, s21);
-        s3  = vis_faligndata(s30, s31);
-
-        d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-        d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-        d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-        d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-        d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-        d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-        d30 = vis_fmul8x16au(vis_read_hi(s3), k3);
-        d31 = vis_fmul8x16au(vis_read_lo(s3), k3);
-
-        d0 = buffd[2*i];
-        d1 = buffd[2*i + 1];
-        d0 = vis_fpadd16(d0, d00);
-        d0 = vis_fpadd16(d0, d10);
-        d0 = vis_fpadd16(d0, d20);
-        d0 = vis_fpadd16(d0, d30);
-        d1 = vis_fpadd16(d1, d01);
-        d1 = vis_fpadd16(d1, d11);
-        d1 = vis_fpadd16(d1, d21);
-        d1 = vis_fpadd16(d1, d31);
-
-        dd = vis_fpack16_pair(d0, d1);
-        vis_pst_8(dd, dp + i, emask);
-
-        buffd[2*i    ] = drnd;
-        buffd[2*i + 1] = drnd;
-      }
-
-      if ((mlib_u8*)dp != dl) mlib_ImageCopy_na((void*)buffe, dl, xsize);
-    }
-
-#else /* CONV_INDEX */
-
-    if (jk_size == 2) {
-      vis_write_gsr(gsr_scale + 7);
-
-#pragma pipeloop(0)
-      for (i = 0; i < dsize; i += 3) {
-        mlib_d64 d00, d01, d02, d03, d04, d05;
-        mlib_d64 d10, d11, d12, d13, d14, d15;
-        mlib_d64 d0, d1, d2, d3, d4, d5;
-        mlib_d64 s00 = buff0[i];
-        mlib_d64 s01 = buff0[i + 1];
-        mlib_d64 s02 = buff0[i + 2];
-        mlib_d64 s10 = buff1[i];
-        mlib_d64 s11 = buff1[i + 1];
-        mlib_d64 s12 = buff1[i + 2];
-
-        d00 = vis_fmul8x16au(vis_read_hi(s00), k0);
-        d01 = vis_fmul8x16au(vis_read_lo(s00), k0);
-        d02 = vis_fmul8x16au(vis_read_hi(s01), k0);
-        d03 = vis_fmul8x16au(vis_read_lo(s01), k0);
-        d04 = vis_fmul8x16au(vis_read_hi(s02), k0);
-        d05 = vis_fmul8x16au(vis_read_lo(s02), k0);
-        d10 = vis_fmul8x16au(vis_read_hi(s10), k1);
-        d11 = vis_fmul8x16au(vis_read_lo(s10), k1);
-        d12 = vis_fmul8x16au(vis_read_hi(s11), k1);
-        d13 = vis_fmul8x16au(vis_read_lo(s11), k1);
-        d14 = vis_fmul8x16au(vis_read_hi(s12), k1);
-        d15 = vis_fmul8x16au(vis_read_lo(s12), k1);
-
-        d0 = buffd[2*i];
-        d1 = buffd[2*i + 1];
-        d2 = buffd[2*i + 2];
-        d3 = buffd[2*i + 3];
-        d4 = buffd[2*i + 4];
-        d5 = buffd[2*i + 5];
-        d0 = vis_fpadd16(d0, d00);
-        d0 = vis_fpadd16(d0, d10);
-        d1 = vis_fpadd16(d1, d01);
-        d1 = vis_fpadd16(d1, d11);
-        d2 = vis_fpadd16(d2, d02);
-        d2 = vis_fpadd16(d2, d12);
-        d3 = vis_fpadd16(d3, d03);
-        d3 = vis_fpadd16(d3, d13);
-        d4 = vis_fpadd16(d4, d04);
-        d4 = vis_fpadd16(d4, d14);
-        d5 = vis_fpadd16(d5, d05);
-        d5 = vis_fpadd16(d5, d15);
-
-        buffe[i    ] = vis_fpack16_pair(d0, d1);
-        buffe[i + 1] = vis_fpack16_pair(d2, d3);
-        buffe[i + 2] = vis_fpack16_pair(d4, d5);
-
-        buffd[2*i    ] = drnd;
-        buffd[2*i + 1] = drnd;
-        buffd[2*i + 2] = drnd;
-        buffd[2*i + 3] = drnd;
-        buffd[2*i + 4] = drnd;
-        buffd[2*i + 5] = drnd;
-
-        LOAD_SRC();
-      }
-
-    } else /* if (jk_size == 3) */ {
-      vis_write_gsr(gsr_scale + 7);
-
-#pragma pipeloop(0)
-      for (i = 0; i < dsize; i += 3) {
-        mlib_d64 d00, d01, d02, d03, d04, d05;
-        mlib_d64 d10, d11, d12, d13, d14, d15;
-        mlib_d64 d20, d21, d22, d23, d24, d25;
-        mlib_d64 d0, d1, d2, d3, d4, d5;
-        mlib_d64 s00 = buff0[i];
-        mlib_d64 s01 = buff0[i + 1];
-        mlib_d64 s02 = buff0[i + 2];
-        mlib_d64 s10 = buff1[i];
-        mlib_d64 s11 = buff1[i + 1];
-        mlib_d64 s12 = buff1[i + 2];
-        mlib_d64 s20 = buff2[i];
-        mlib_d64 s21 = buff2[i + 1];
-        mlib_d64 s22 = buff2[i + 2];
-
-        d00 = vis_fmul8x16au(vis_read_hi(s00), k0);
-        d01 = vis_fmul8x16au(vis_read_lo(s00), k0);
-        d02 = vis_fmul8x16au(vis_read_hi(s01), k0);
-        d03 = vis_fmul8x16au(vis_read_lo(s01), k0);
-        d04 = vis_fmul8x16au(vis_read_hi(s02), k0);
-        d05 = vis_fmul8x16au(vis_read_lo(s02), k0);
-        d10 = vis_fmul8x16au(vis_read_hi(s10), k1);
-        d11 = vis_fmul8x16au(vis_read_lo(s10), k1);
-        d12 = vis_fmul8x16au(vis_read_hi(s11), k1);
-        d13 = vis_fmul8x16au(vis_read_lo(s11), k1);
-        d14 = vis_fmul8x16au(vis_read_hi(s12), k1);
-        d15 = vis_fmul8x16au(vis_read_lo(s12), k1);
-        d20 = vis_fmul8x16au(vis_read_hi(s20), k2);
-        d21 = vis_fmul8x16au(vis_read_lo(s20), k2);
-        d22 = vis_fmul8x16au(vis_read_hi(s21), k2);
-        d23 = vis_fmul8x16au(vis_read_lo(s21), k2);
-        d24 = vis_fmul8x16au(vis_read_hi(s22), k2);
-        d25 = vis_fmul8x16au(vis_read_lo(s22), k2);
-
-        d0 = buffd[2*i];
-        d1 = buffd[2*i + 1];
-        d2 = buffd[2*i + 2];
-        d3 = buffd[2*i + 3];
-        d4 = buffd[2*i + 4];
-        d5 = buffd[2*i + 5];
-        d0 = vis_fpadd16(d0, d00);
-        d0 = vis_fpadd16(d0, d10);
-        d0 = vis_fpadd16(d0, d20);
-        d1 = vis_fpadd16(d1, d01);
-        d1 = vis_fpadd16(d1, d11);
-        d1 = vis_fpadd16(d1, d21);
-        d2 = vis_fpadd16(d2, d02);
-        d2 = vis_fpadd16(d2, d12);
-        d2 = vis_fpadd16(d2, d22);
-        d3 = vis_fpadd16(d3, d03);
-        d3 = vis_fpadd16(d3, d13);
-        d3 = vis_fpadd16(d3, d23);
-        d4 = vis_fpadd16(d4, d04);
-        d4 = vis_fpadd16(d4, d14);
-        d4 = vis_fpadd16(d4, d24);
-        d5 = vis_fpadd16(d5, d05);
-        d5 = vis_fpadd16(d5, d15);
-        d5 = vis_fpadd16(d5, d25);
-
-        buffe[i    ] = vis_fpack16_pair(d0, d1);
-        buffe[i + 1] = vis_fpack16_pair(d2, d3);
-        buffe[i + 2] = vis_fpack16_pair(d4, d5);
-
-        buffd[2*i    ] = drnd;
-        buffd[2*i + 1] = drnd;
-        buffd[2*i + 2] = drnd;
-        buffd[2*i + 3] = drnd;
-        buffd[2*i + 4] = drnd;
-        buffd[2*i + 5] = drnd;
-
-        LOAD_SRC();
-      }
-    }
-#endif /* CONV_INDEX */
-
-#ifdef CONV_INDEX
-    mlib_ImageColorTrue2IndexLine_U8_S16_3((void*)buffe, dl, wid, colormap);
-#endif /* CONV_INDEX */
-
-    sl += sll;
-    dl += dll;
-
-    buff_ind++;
-    if (buff_ind >= (n + 1)) buff_ind = 0;
-  }
-
-  mlib_free(pbuff);
-  if (buffs != buffs_local) mlib_free(buffs);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvIndex3_8_8nw.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvIndex3_8_8nw.c
deleted file mode 100644
index ada07fe2d89..00000000000
--- a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvIndex3_8_8nw.c
+++ /dev/null
@@ -1,1673 +0,0 @@
-/*
- * Copyright (c) 2000, 2003, 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.
- */
-
-
-
-/*
- * FUNCTION
- *      Internal functions for mlib_ImageConv* on U8 type
- *      and MLIB_EDGE_DST_NO_WRITE mask
- *
- */
-
-/***************************************************************/
-
-#include <vis_proto.h>
-#include <mlib_image.h>
-#include <mlib_ImageCheck.h>
-#include <mlib_ImageColormap.h>
-
-/*
-  This defines switches between functions in
-  files: mlib_v_ImageConv_8nw.c,
-         mlib_v_ImageConvIndex3_8_8nw.c,
-         mlib_v_ImageConvIndex4_8_8nw.c,
-         mlib_v_ImageConvIndex3_8_16nw.c,
-         mlib_v_ImageConvIndex4_8_16nw.c
-*/
-
-#define CONV_INDEX
-
-#define DTYPE mlib_u8
-#define LTYPE mlib_u8
-
-/***************************************************************/
-
-#ifdef CONV_INDEX
-
-#define CONV_FUNC(KERN)                                 \
-  mlib_conv##KERN##_Index3_8_8nw(mlib_image *dst,       \
-                                 mlib_image *src,       \
-                                 mlib_s32   *kern,      \
-                                 mlib_s32   scale,      \
-                                 void       *colormap)
-
-#else
-
-#define CONV_FUNC(KERN)                         \
-  mlib_conv##KERN##_8nw_f(mlib_image *dst,      \
-                          mlib_image *src,      \
-                          mlib_s32   *kern,     \
-                          mlib_s32   scale)
-
-#endif
-
-/***************************************************************/
-
-#ifdef CONV_INDEX
-
-#define NCHAN  3
-
-#else
-
-#define NCHAN  nchan
-
-#endif
-
-/***************************************************************/
-
-#define DEF_VARS                                                \
-  DTYPE    *sl, *sp, *dl;                                       \
-  mlib_s32 hgt = mlib_ImageGetHeight(src);                      \
-  mlib_s32 wid = mlib_ImageGetWidth(src);                       \
-  mlib_s32 sll = mlib_ImageGetStride(src) / sizeof(DTYPE);      \
-  mlib_s32 dll = mlib_ImageGetStride(dst) / sizeof(DTYPE);      \
-  DTYPE    *adr_src = (DTYPE *)mlib_ImageGetData(src);          \
-  DTYPE    *adr_dst = (DTYPE *)mlib_ImageGetData(dst);          \
-  mlib_s32 ssize, xsize, dsize, esize, emask, buff_ind = 0;     \
-  mlib_d64 *pbuff, *dp;                                         \
-  mlib_f32 *karr = (mlib_f32 *)kern;                            \
-  mlib_s32 gsr_scale = (31 - scale) << 3;                       \
-  mlib_d64 drnd = vis_to_double_dup(mlib_round_8[31 - scale]);  \
-  mlib_s32 i, j, l
-
-/***************************************************************/
-
-#ifdef CONV_INDEX
-
-#define DEF_EXTRA_VARS                                                  \
-  int    offset = mlib_ImageGetLutOffset(colormap);                     \
-  LTYPE  **lut_table = (LTYPE**)mlib_ImageGetLutData(colormap);         \
-  LTYPE  *ltbl0 = lut_table[0] - offset;                                \
-  LTYPE  *ltbl1 = lut_table[1] - offset;                                \
-  LTYPE  *ltbl2 = lut_table[2] - offset;                                \
-  LTYPE  *ltbl3 = (NCHAN > 3) ? lut_table[3] - offset : ltbl2
-
-#else
-
-#define DEF_EXTRA_VARS                          \
-  mlib_s32 nchan = mlib_ImageGetChannels(dst)
-
-#endif
-
-/***************************************************************/
-
-#if NCHAN == 3
-
-#define LOAD_SRC() {                                            \
-    mlib_s32 s0 = sp[0], s1 = sp[1], s2 = sp[2], s3 = sp[3];    \
-    mlib_s32 s4 = sp[4], s5 = sp[5], s6 = sp[6], s7 = sp[7];    \
-    mlib_d64 t0, t1, t2;                                        \
-                                                                \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl2, s7), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl1, s7), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl0, s7), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl2, s6), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl1, s6), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl0, s6), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl2, s5), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl1, s5), t2);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl0, s5), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl2, s4), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl1, s4), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl0, s4), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl2, s3), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl1, s3), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl0, s3), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl2, s2), t1);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl1, s2), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl0, s2), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl2, s1), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl1, s1), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl0, s1), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl2, s0), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl1, s0), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl0, s0), t0);            \
-                                                                \
-    buffn[i] = t0;                                              \
-    buffn[i + 1] = t1;                                          \
-    buffn[i + 2] = t2;                                          \
-                                                                \
-    sp += 8;                                                    \
-  }
-
-#else
-
-#define LOAD_SRC() {                                            \
-    mlib_s32 s0 = sp[0], s1 = sp[1], s2 = sp[2], s3 = sp[3];    \
-    mlib_s32 s4 = sp[4], s5 = sp[5], s6 = sp[6], s7 = sp[7];    \
-    mlib_d64 t0, t1, t2;                                        \
-                                                                \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl3, s5), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl2, s5), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl1, s5), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl0, s5), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl3, s4), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl2, s4), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl1, s4), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl0, s4), t2);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl3, s3), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl2, s3), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl1, s3), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl0, s3), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl3, s2), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl2, s2), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl1, s2), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl0, s2), t1);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl3, s1), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl2, s1), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl1, s1), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl0, s1), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl3, s0), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl2, s0), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl1, s0), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl0, s0), t0);            \
-                                                                \
-    buffn[i] = t0;                                              \
-    buffn[i + 1] = t1;                                          \
-    buffn[i + 2] = t2;                                          \
-                                                                \
-    sp += 6;                                                    \
-  }
-
-#endif
-
-/***************************************************************/
-
-static mlib_s32 mlib_round_8[16] = { 0x00400040, 0x00200020, 0x00100010, 0x00080008,
-                                    0x00040004, 0x00020002, 0x00010001, 0x00000000,
-                                    0x00000000, 0x00000000, 0x00000000, 0x00000000,
-                                    0x00000000, 0x00000000, 0x00000000, 0x00000000 };
-
-/***************************************************************/
-
-void mlib_ImageCopy_na(mlib_u8 *sa, mlib_u8 *da, int size);
-
-/***************************************************************/
-
-#define KSIZE  2
-
-mlib_status CONV_FUNC(2x2)
-{
-  mlib_d64 *buffs[2*(KSIZE + 1)];
-  mlib_d64 *buff0, *buff1, *buffn, *buffd, *buffe;
-  mlib_d64 s00, s01, s10, s11, s0, s1;
-  mlib_d64 d0, d1, d00, d01, d10, d11;
-  DEF_VARS;
-  DEF_EXTRA_VARS;
-
-  sl = adr_src;
-  dl = adr_dst;
-
-  ssize = NCHAN*wid;
-  dsize = (ssize + 7)/8;
-  esize = dsize + 4;
-  pbuff = mlib_malloc((KSIZE + 4)*esize*sizeof(mlib_d64));
-  if (pbuff == NULL) return MLIB_FAILURE;
-
-  for (i = 0; i < (KSIZE + 1); i++) buffs[i] = pbuff + i*esize;
-  for (i = 0; i < (KSIZE + 1); i++) buffs[(KSIZE + 1) + i] = buffs[i];
-  buffd = buffs[KSIZE] + esize;
-  buffe = buffd + 2*esize;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-  xsize = ssize - NCHAN*(KSIZE - 1);
-  emask = (0xFF00 >> (xsize & 7)) & 0xFF;
-
-  vis_write_gsr(gsr_scale + 7);
-
-  for (l = 0; l < KSIZE; l++) {
-    mlib_d64 *buffn = buffs[l];
-    sp = sl + l*sll;
-
-#ifndef CONV_INDEX
-    if ((mlib_addr)sp & 7) mlib_ImageCopy_na((void*)sp, (void*)buffn, ssize);
-
-#else
-#pragma pipeloop(0)
-    for (i = 0; i < dsize; i += 3) {
-      LOAD_SRC();
-    }
-#endif /* CONV_INDEX */
-  }
-
-  for (j = 0; j < hgt; j++) {
-    mlib_d64 **buffc = buffs + buff_ind;
-    mlib_f32 *pk = karr, k0, k1;
-    sp = sl + KSIZE*sll;
-
-    buff0 = buffc[0];
-    buff1 = buffc[1];
-    buffn = buffc[KSIZE];
-
-#ifndef CONV_INDEX
-    if ((((mlib_addr)(sl      )) & 7) == 0) buff0 = (mlib_d64*)sl;
-    if ((((mlib_addr)(sl + sll)) & 7) == 0) buff1 = (mlib_d64*)(sl + sll);
-    if ((mlib_addr)sp & 7) mlib_ImageCopy_na((void*)sp, (void*)buffn, ssize);
-#endif
-
-    k0 = pk[1];
-    k1 = pk[3];
-    vis_write_gsr(gsr_scale + NCHAN);
-
-    s01 = buff0[0];
-    s11 = buff1[0];
-#pragma pipeloop(0)
-    for (i = 0; i < (xsize + 7)/8; i++) {
-      s00 = s01;
-      s10 = s11;
-      s01 = buff0[i + 1];
-      s11 = buff1[i + 1];
-      s0  = vis_faligndata(s00, s01);
-      s1  = vis_faligndata(s10, s11);
-
-      d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-      d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-      d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-      d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-
-      d0 = vis_fpadd16(d00, d10);
-      d1 = vis_fpadd16(d01, d11);
-      buffd[2*i] = d0;
-      buffd[2*i + 1] = d1;
-    }
-
-    k0 = pk[0];
-    k1 = pk[2];
-#ifndef CONV_INDEX
-    dp = ((mlib_addr)dl & 7) ? buffe : (mlib_d64*)dl;
-
-#pragma pipeloop(0)
-    for (i = 0; i < xsize/8; i++) {
-      s0 = buff0[i];
-      s1 = buff1[i];
-
-      d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-      d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-      d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-      d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-
-      d0 = buffd[2*i];
-      d1 = buffd[2*i + 1];
-      d00 = vis_fpadd16(d00, d10);
-      d0  = vis_fpadd16(d0, drnd);
-      d0  = vis_fpadd16(d0, d00);
-      d01 = vis_fpadd16(d01, d11);
-      d1  = vis_fpadd16(d1, drnd);
-      d1  = vis_fpadd16(d1, d01);
-      dp[i] = vis_fpack16_pair(d0, d1);
-    }
-
-    if (emask) {
-      s0 = buff0[i];
-      s1 = buff1[i];
-
-      d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-      d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-      d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-      d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-
-      d0 = buffd[2*i];
-      d1 = buffd[2*i + 1];
-      d00 = vis_fpadd16(d00, d10);
-      d0  = vis_fpadd16(d0, drnd);
-      d0  = vis_fpadd16(d0, d00);
-      d01 = vis_fpadd16(d01, d11);
-      d1  = vis_fpadd16(d1, drnd);
-      d1  = vis_fpadd16(d1, d01);
-
-      d0 = vis_fpack16_pair(d0, d1);
-      vis_pst_8(d0, dp + i, emask);
-    }
-
-    if ((mlib_u8*)dp != dl) mlib_ImageCopy_na((void*)buffe, dl, xsize);
-
-#else
-    vis_write_gsr(gsr_scale + 7);
-
-#pragma pipeloop(0)
-    for (i = 0; i < dsize; i += 3) {
-      mlib_d64 d00, d01, d02, d03, d04, d05;
-      mlib_d64 d10, d11, d12, d13, d14, d15;
-      mlib_d64 d0, d1, d2, d3, d4, d5;
-      mlib_d64 s00 = buff0[i];
-      mlib_d64 s01 = buff0[i + 1];
-      mlib_d64 s02 = buff0[i + 2];
-      mlib_d64 s10 = buff1[i];
-      mlib_d64 s11 = buff1[i + 1];
-      mlib_d64 s12 = buff1[i + 2];
-
-      d00 = vis_fmul8x16au(vis_read_hi(s00), k0);
-      d01 = vis_fmul8x16au(vis_read_lo(s00), k0);
-      d02 = vis_fmul8x16au(vis_read_hi(s01), k0);
-      d03 = vis_fmul8x16au(vis_read_lo(s01), k0);
-      d04 = vis_fmul8x16au(vis_read_hi(s02), k0);
-      d05 = vis_fmul8x16au(vis_read_lo(s02), k0);
-      d10 = vis_fmul8x16au(vis_read_hi(s10), k1);
-      d11 = vis_fmul8x16au(vis_read_lo(s10), k1);
-      d12 = vis_fmul8x16au(vis_read_hi(s11), k1);
-      d13 = vis_fmul8x16au(vis_read_lo(s11), k1);
-      d14 = vis_fmul8x16au(vis_read_hi(s12), k1);
-      d15 = vis_fmul8x16au(vis_read_lo(s12), k1);
-
-      d0 = buffd[2*i];
-      d1 = buffd[2*i + 1];
-      d2 = buffd[2*i + 2];
-      d3 = buffd[2*i + 3];
-      d4 = buffd[2*i + 4];
-      d5 = buffd[2*i + 5];
-      d00 = vis_fpadd16(d00, d10);
-      d0  = vis_fpadd16(d0, drnd);
-      d0  = vis_fpadd16(d0, d00);
-      d01 = vis_fpadd16(d01, d11);
-      d1  = vis_fpadd16(d1, drnd);
-      d1  = vis_fpadd16(d1, d01);
-      d02 = vis_fpadd16(d02, d12);
-      d2  = vis_fpadd16(d2, drnd);
-      d2  = vis_fpadd16(d2, d02);
-      d03 = vis_fpadd16(d03, d13);
-      d3  = vis_fpadd16(d3, drnd);
-      d3  = vis_fpadd16(d3, d03);
-      d04 = vis_fpadd16(d04, d14);
-      d4  = vis_fpadd16(d4, drnd);
-      d4  = vis_fpadd16(d4, d04);
-      d05 = vis_fpadd16(d05, d15);
-      d5  = vis_fpadd16(d5, drnd);
-      d5  = vis_fpadd16(d5, d05);
-
-      buffe[i    ] = vis_fpack16_pair(d0, d1);
-      buffe[i + 1] = vis_fpack16_pair(d2, d3);
-      buffe[i + 2] = vis_fpack16_pair(d4, d5);
-
-      LOAD_SRC();
-    }
-
-    mlib_ImageColorTrue2IndexLine_U8_U8_3((void*)buffe, dl, wid, colormap);
-#endif /* CONV_INDEX */
-
-    sl += sll;
-    dl += dll;
-
-    buff_ind++;
-    if (buff_ind >= (KSIZE + 1)) buff_ind = 0;
-  }
-
-  mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-
-#undef  KSIZE
-#define KSIZE  3
-
-mlib_status CONV_FUNC(3x3)
-{
-  mlib_d64 *buffs[2*(KSIZE + 1)];
-  mlib_d64 *buff0, *buff1, *buff2, *buffn, *buffd, *buffe;
-  mlib_d64 s00, s01, s10, s11, s20, s21, s0, s1, s2;
-  mlib_d64 dd, d0, d1, d00, d01, d10, d11, d20, d21;
-  mlib_s32 ik, ik_last, off, doff;
-  DEF_VARS;
-  DEF_EXTRA_VARS;
-
-  sl = adr_src;
-#ifdef CONV_INDEX
-  dl = adr_dst + ((KSIZE - 1)/2)*(dll + 1);
-#else
-  dl = adr_dst + ((KSIZE - 1)/2)*(dll + NCHAN);
-#endif
-
-  ssize = NCHAN*wid;
-  dsize = (ssize + 7)/8;
-  esize = dsize + 4;
-  pbuff = mlib_malloc((KSIZE + 4)*esize*sizeof(mlib_d64));
-  if (pbuff == NULL) return MLIB_FAILURE;
-
-  for (i = 0; i < (KSIZE + 1); i++) buffs[i] = pbuff + i*esize;
-  for (i = 0; i < (KSIZE + 1); i++) buffs[(KSIZE + 1) + i] = buffs[i];
-  buffd = buffs[KSIZE] + esize;
-  buffe = buffd + 2*esize;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-  xsize = ssize - NCHAN*(KSIZE - 1);
-  emask = (0xFF00 >> (xsize & 7)) & 0xFF;
-
-  vis_write_gsr(gsr_scale + 7);
-
-  for (l = 0; l < KSIZE; l++) {
-    mlib_d64 *buffn = buffs[l];
-    sp = sl + l*sll;
-
-#ifndef CONV_INDEX
-    if ((mlib_addr)sp & 7) mlib_ImageCopy_na((void*)sp, (void*)buffn, ssize);
-#else
-#pragma pipeloop(0)
-    for (i = 0; i < dsize; i += 3) {
-      LOAD_SRC();
-    }
-#endif /* CONV_INDEX */
-  }
-
-  /* init buffer */
-#pragma pipeloop(0)
-  for (i = 0; i < (xsize + 7)/8; i++) {
-    buffd[2*i    ] = drnd;
-    buffd[2*i + 1] = drnd;
-  }
-
-  for (j = 0; j < hgt; j++) {
-    mlib_d64 **buffc = buffs + buff_ind, *pbuff0, *pbuff1, *pbuff2;
-    mlib_f32 *pk = karr, k0, k1, k2;
-    sp = sl + KSIZE*sll;
-
-    pbuff0 = buffc[0];
-    pbuff1 = buffc[1];
-    pbuff2 = buffc[2];
-    buffn  = buffc[KSIZE];
-
-#ifndef CONV_INDEX
-    if ((((mlib_addr)(sl        )) & 7) == 0) pbuff0 = (mlib_d64*)sl;
-    if ((((mlib_addr)(sl +   sll)) & 7) == 0) pbuff1 = (mlib_d64*)(sl + sll);
-    if ((((mlib_addr)(sl + 2*sll)) & 7) == 0) pbuff2 = (mlib_d64*)(sl + 2*sll);
-
-    if ((mlib_addr)sp & 7) mlib_ImageCopy_na((void*)sp, (void*)buffn, ssize);
-#endif
-
-#ifdef CONV_INDEX
-    ik_last = 0;
-#else
-    ik_last = (KSIZE - 1);
-#endif
-
-    for (ik = 0; ik < KSIZE; ik++) {
-      k0 = pk[ik];
-      k1 = pk[ik + KSIZE];
-      k2 = pk[ik + 2*KSIZE];
-
-      off  = ik*NCHAN;
-      doff = off/8;
-      off &= 7;
-      buff0 = pbuff0 + doff;
-      buff1 = pbuff1 + doff;
-      buff2 = pbuff2 + doff;
-      vis_write_gsr(gsr_scale + off);
-
-      if (ik == ik_last) continue;
-      /*if (!ik_last) {
-        if ((off & 3) || (ik == (KSIZE - 1))) {
-          ik_last = ik;
-          continue;
-        }
-      }*/
-
-      if (off == 0) {
-#pragma pipeloop(0)
-        for (i = 0; i < (xsize + 7)/8; i++) {
-          s0 = buff0[i];
-          s1 = buff1[i];
-          s2 = buff2[i];
-
-          d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-          d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-          d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-          d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-          d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-          d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-
-          d0 = buffd[2*i];
-          d1 = buffd[2*i + 1];
-          d0 = vis_fpadd16(d00, d0);
-          d0 = vis_fpadd16(d10, d0);
-          d0 = vis_fpadd16(d20, d0);
-          d1 = vis_fpadd16(d01, d1);
-          d1 = vis_fpadd16(d11, d1);
-          d1 = vis_fpadd16(d21, d1);
-          buffd[2*i] = d0;
-          buffd[2*i + 1] = d1;
-        }
-
-      } else if (off == 4) {
-        s01 = buff0[0];
-        s11 = buff1[0];
-        s21 = buff2[0];
-#pragma pipeloop(0)
-        for (i = 0; i < (xsize + 7)/8; i++) {
-          s00 = s01;
-          s10 = s11;
-          s20 = s21;
-          s01 = buff0[i + 1];
-          s11 = buff1[i + 1];
-          s21 = buff2[i + 1];
-
-          d00 = vis_fmul8x16au(vis_read_lo(s00), k0);
-          d01 = vis_fmul8x16au(vis_read_hi(s01), k0);
-          d10 = vis_fmul8x16au(vis_read_lo(s10), k1);
-          d11 = vis_fmul8x16au(vis_read_hi(s11), k1);
-          d20 = vis_fmul8x16au(vis_read_lo(s20), k2);
-          d21 = vis_fmul8x16au(vis_read_hi(s21), k2);
-
-          d0 = buffd[2*i];
-          d1 = buffd[2*i + 1];
-          d0 = vis_fpadd16(d00, d0);
-          d0 = vis_fpadd16(d10, d0);
-          d0 = vis_fpadd16(d20, d0);
-          d1 = vis_fpadd16(d01, d1);
-          d1 = vis_fpadd16(d11, d1);
-          d1 = vis_fpadd16(d21, d1);
-          buffd[2*i] = d0;
-          buffd[2*i + 1] = d1;
-        }
-
-      } else {
-        s01 = buff0[0];
-        s11 = buff1[0];
-        s21 = buff2[0];
-#pragma pipeloop(0)
-        for (i = 0; i < (xsize + 7)/8; i++) {
-          s00 = s01;
-          s10 = s11;
-          s20 = s21;
-          s01 = buff0[i + 1];
-          s11 = buff1[i + 1];
-          s21 = buff2[i + 1];
-          s0  = vis_faligndata(s00, s01);
-          s1  = vis_faligndata(s10, s11);
-          s2  = vis_faligndata(s20, s21);
-
-          d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-          d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-          d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-          d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-          d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-          d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-
-          d0 = buffd[2*i];
-          d1 = buffd[2*i + 1];
-          d0 = vis_fpadd16(d00, d0);
-          d0 = vis_fpadd16(d10, d0);
-          d0 = vis_fpadd16(d20, d0);
-          d1 = vis_fpadd16(d01, d1);
-          d1 = vis_fpadd16(d11, d1);
-          d1 = vis_fpadd16(d21, d1);
-          buffd[2*i] = d0;
-          buffd[2*i + 1] = d1;
-        }
-      }
-    }
-
-    k0 = pk[ik_last];
-    k1 = pk[ik_last + KSIZE];
-    k2 = pk[ik_last + 2*KSIZE];
-
-    off  = ik_last*NCHAN;
-    doff = off/8;
-    off &= 7;
-    buff0 = pbuff0 + doff;
-    buff1 = pbuff1 + doff;
-    buff2 = pbuff2 + doff;
-    vis_write_gsr(gsr_scale + off);
-
-#ifndef CONV_INDEX
-    dp = ((mlib_addr)dl & 7) ? buffe : (mlib_d64*)dl;
-
-    s01 = buff0[0];
-    s11 = buff1[0];
-    s21 = buff2[0];
-#pragma pipeloop(0)
-    for (i = 0; i < xsize/8; i++) {
-      s00 = s01;
-      s10 = s11;
-      s20 = s21;
-      s01 = buff0[i + 1];
-      s11 = buff1[i + 1];
-      s21 = buff2[i + 1];
-      s0  = vis_faligndata(s00, s01);
-      s1  = vis_faligndata(s10, s11);
-      s2  = vis_faligndata(s20, s21);
-
-      d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-      d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-      d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-      d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-      d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-      d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-
-      d0 = buffd[2*i];
-      d1 = buffd[2*i + 1];
-      d0 = vis_fpadd16(d0, d00);
-      d0 = vis_fpadd16(d0, d10);
-      d0 = vis_fpadd16(d0, d20);
-      d1 = vis_fpadd16(d1, d01);
-      d1 = vis_fpadd16(d1, d11);
-      d1 = vis_fpadd16(d1, d21);
-
-      dd = vis_fpack16_pair(d0, d1);
-      dp[i] = dd;
-
-      buffd[2*i    ] = drnd;
-      buffd[2*i + 1] = drnd;
-    }
-
-    if (emask) {
-      s00 = s01;
-      s10 = s11;
-      s20 = s21;
-      s01 = buff0[i + 1];
-      s11 = buff1[i + 1];
-      s21 = buff2[i + 1];
-      s0  = vis_faligndata(s00, s01);
-      s1  = vis_faligndata(s10, s11);
-      s2  = vis_faligndata(s20, s21);
-
-      d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-      d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-      d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-      d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-      d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-      d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-
-      d0 = buffd[2*i];
-      d1 = buffd[2*i + 1];
-      d0 = vis_fpadd16(d0, d00);
-      d0 = vis_fpadd16(d0, d10);
-      d0 = vis_fpadd16(d0, d20);
-      d1 = vis_fpadd16(d1, d01);
-      d1 = vis_fpadd16(d1, d11);
-      d1 = vis_fpadd16(d1, d21);
-
-      dd = vis_fpack16_pair(d0, d1);
-      vis_pst_8(dd, dp + i, emask);
-
-      buffd[2*i    ] = drnd;
-      buffd[2*i + 1] = drnd;
-    }
-
-    if ((mlib_u8*)dp != dl) mlib_ImageCopy_na((void*)buffe, dl, xsize);
-
-#else
-    vis_write_gsr(gsr_scale + 7);
-
-#pragma pipeloop(0)
-    for (i = 0; i < dsize; i += 3) {
-      mlib_d64 d00, d01, d02, d03, d04, d05;
-      mlib_d64 d10, d11, d12, d13, d14, d15;
-      mlib_d64 d20, d21, d22, d23, d24, d25;
-      mlib_d64 d0, d1, d2, d3, d4, d5;
-      mlib_d64 s00 = buff0[i];
-      mlib_d64 s01 = buff0[i + 1];
-      mlib_d64 s02 = buff0[i + 2];
-      mlib_d64 s10 = buff1[i];
-      mlib_d64 s11 = buff1[i + 1];
-      mlib_d64 s12 = buff1[i + 2];
-      mlib_d64 s20 = buff2[i];
-      mlib_d64 s21 = buff2[i + 1];
-      mlib_d64 s22 = buff2[i + 2];
-
-      d00 = vis_fmul8x16au(vis_read_hi(s00), k0);
-      d01 = vis_fmul8x16au(vis_read_lo(s00), k0);
-      d02 = vis_fmul8x16au(vis_read_hi(s01), k0);
-      d03 = vis_fmul8x16au(vis_read_lo(s01), k0);
-      d04 = vis_fmul8x16au(vis_read_hi(s02), k0);
-      d05 = vis_fmul8x16au(vis_read_lo(s02), k0);
-      d10 = vis_fmul8x16au(vis_read_hi(s10), k1);
-      d11 = vis_fmul8x16au(vis_read_lo(s10), k1);
-      d12 = vis_fmul8x16au(vis_read_hi(s11), k1);
-      d13 = vis_fmul8x16au(vis_read_lo(s11), k1);
-      d14 = vis_fmul8x16au(vis_read_hi(s12), k1);
-      d15 = vis_fmul8x16au(vis_read_lo(s12), k1);
-      d20 = vis_fmul8x16au(vis_read_hi(s20), k2);
-      d21 = vis_fmul8x16au(vis_read_lo(s20), k2);
-      d22 = vis_fmul8x16au(vis_read_hi(s21), k2);
-      d23 = vis_fmul8x16au(vis_read_lo(s21), k2);
-      d24 = vis_fmul8x16au(vis_read_hi(s22), k2);
-      d25 = vis_fmul8x16au(vis_read_lo(s22), k2);
-
-      d0 = buffd[2*i];
-      d1 = buffd[2*i + 1];
-      d2 = buffd[2*i + 2];
-      d3 = buffd[2*i + 3];
-      d4 = buffd[2*i + 4];
-      d5 = buffd[2*i + 5];
-      d0 = vis_fpadd16(d0, d00);
-      d0 = vis_fpadd16(d0, d10);
-      d0 = vis_fpadd16(d0, d20);
-      d1 = vis_fpadd16(d1, d01);
-      d1 = vis_fpadd16(d1, d11);
-      d1 = vis_fpadd16(d1, d21);
-      d2 = vis_fpadd16(d2, d02);
-      d2 = vis_fpadd16(d2, d12);
-      d2 = vis_fpadd16(d2, d22);
-      d3 = vis_fpadd16(d3, d03);
-      d3 = vis_fpadd16(d3, d13);
-      d3 = vis_fpadd16(d3, d23);
-      d4 = vis_fpadd16(d4, d04);
-      d4 = vis_fpadd16(d4, d14);
-      d4 = vis_fpadd16(d4, d24);
-      d5 = vis_fpadd16(d5, d05);
-      d5 = vis_fpadd16(d5, d15);
-      d5 = vis_fpadd16(d5, d25);
-
-      buffe[i    ] = vis_fpack16_pair(d0, d1);
-      buffe[i + 1] = vis_fpack16_pair(d2, d3);
-      buffe[i + 2] = vis_fpack16_pair(d4, d5);
-
-      buffd[2*i    ] = drnd;
-      buffd[2*i + 1] = drnd;
-      buffd[2*i + 2] = drnd;
-      buffd[2*i + 3] = drnd;
-      buffd[2*i + 4] = drnd;
-      buffd[2*i + 5] = drnd;
-
-      LOAD_SRC();
-    }
-
-    mlib_ImageColorTrue2IndexLine_U8_U8_3((void*)buffe, dl, wid, colormap);
-#endif /* CONV_INDEX */
-
-    sl += sll;
-    dl += dll;
-
-    buff_ind++;
-    if (buff_ind >= (KSIZE + 1)) buff_ind = 0;
-  }
-
-  mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-
-#undef  KSIZE
-#define MAX_N   11
-
-#ifdef CONV_INDEX
-
-mlib_status mlib_convMxN_Index3_8_8nw(mlib_image *dst,
-                                      mlib_image *src,
-                                      mlib_s32   m,
-                                      mlib_s32   n,
-                                      mlib_s32   dm,
-                                      mlib_s32   dn,
-                                      mlib_s32   *kern,
-                                      mlib_s32   scale,
-                                      void       *colormap)
-
-#else
-
-mlib_status mlib_convMxN_8nw_f(mlib_image *dst,
-                               mlib_image *src,
-                               mlib_s32   m,
-                               mlib_s32   n,
-                               mlib_s32   dm,
-                               mlib_s32   dn,
-                               mlib_s32   *kern,
-                               mlib_s32   scale)
-
-#endif
-{
-  mlib_d64 *buffs_local[3*(MAX_N + 1)], **buffs = buffs_local, **buff;
-  mlib_d64 *buff0, *buff1, *buff2, *buff3, *buffn, *buffd, *buffe;
-  mlib_d64 s00, s01, s10, s11, s20, s21, s30, s31, s0, s1, s2, s3;
-  mlib_d64 d00, d01, d10, d11, d20, d21, d30, d31;
-  mlib_d64 dd, d0, d1;
-  mlib_s32 ik, jk, ik_last, jk_size, coff, off, doff;
-  DEF_VARS;
-  DEF_EXTRA_VARS;
-
-  if (n > MAX_N) {
-    buffs = mlib_malloc(3*(n + 1)*sizeof(mlib_d64*));
-    if (buffs == NULL) return MLIB_FAILURE;
-  }
-
-  buff = buffs + 2*(n + 1);
-
-  sl = adr_src;
-#ifdef CONV_INDEX
-  dl = adr_dst + dn*dll + dm;
-#else
-  dl = adr_dst + dn*dll + dm*NCHAN;
-#endif
-
-  ssize = NCHAN*wid;
-  dsize = (ssize + 7)/8;
-  esize = dsize + 4;
-  pbuff = mlib_malloc((n + 4)*esize*sizeof(mlib_d64));
-  if (pbuff == NULL) {
-    if (buffs != buffs_local) mlib_free(buffs);
-    return MLIB_FAILURE;
-  }
-
-  for (i = 0; i < (n + 1); i++) buffs[i] = pbuff + i*esize;
-  for (i = 0; i < (n + 1); i++) buffs[(n + 1) + i] = buffs[i];
-  buffd = buffs[n] + esize;
-  buffe = buffd + 2*esize;
-
-  wid -= (m - 1);
-  hgt -= (n - 1);
-  xsize = ssize - NCHAN*(m - 1);
-  emask = (0xFF00 >> (xsize & 7)) & 0xFF;
-
-  vis_write_gsr(gsr_scale + 7);
-
-  for (l = 0; l < n; l++) {
-    mlib_d64 *buffn = buffs[l];
-    sp = sl + l*sll;
-
-#ifndef CONV_INDEX
-    if ((mlib_addr)sp & 7) mlib_ImageCopy_na((void*)sp, (void*)buffn, ssize);
-#else
-#pragma pipeloop(0)
-    for (i = 0; i < dsize; i += 3) {
-      LOAD_SRC();
-    }
-#endif /* CONV_INDEX */
-  }
-
-  /* init buffer */
-#pragma pipeloop(0)
-  for (i = 0; i < (xsize + 7)/8; i++) {
-    buffd[2*i    ] = drnd;
-    buffd[2*i + 1] = drnd;
-  }
-
-  for (j = 0; j < hgt; j++) {
-    mlib_d64 **buffc = buffs + buff_ind;
-    mlib_f32 *pk = karr, k0, k1, k2, k3;
-    sp = sl + n*sll;
-
-    for (l = 0; l < n; l++) {
-      buff[l] = buffc[l];
-    }
-    buffn  = buffc[n];
-
-#ifndef CONV_INDEX
-    for (l = 0; l < n; l++) {
-      if ((((mlib_addr)(sl + l*sll)) & 7) == 0) buff[l] = (mlib_d64*)(sl + l*sll);
-    }
-    if ((mlib_addr)sp & 7) mlib_ImageCopy_na((void*)sp, (void*)buffn, ssize);
-#endif
-
-#ifdef CONV_INDEX
-    ik_last = 0;
-#else
-    ik_last = (m - 1);
-#endif
-
-    for (jk = 0; jk < n; jk += jk_size) {
-      jk_size = n - jk;
-#ifdef CONV_INDEX
-      if (jk_size >= 5) jk_size = 3;
-      if (jk_size == 4) jk_size = 2;
-#else
-      if (jk_size >= 6) jk_size = 4;
-      if (jk_size == 5) jk_size = 3;
-#endif
-      coff = 0;
-
-      if (jk_size == 2) {
-
-        for (ik = 0; ik < m; ik++, coff += NCHAN) {
-          if (!jk && ik == ik_last) continue;
-
-          k0 = pk[ik];
-          k1 = pk[ik + m];
-
-          doff  = coff/8;
-          buff0 = buff[jk    ] + doff;
-          buff1 = buff[jk + 1] + doff;
-
-          off = coff & 7;
-          vis_write_gsr(gsr_scale + off);
-
-          s01 = buff0[0];
-          s11 = buff1[0];
-#pragma pipeloop(0)
-          for (i = 0; i < (xsize + 7)/8; i++) {
-            s00 = s01;
-            s10 = s11;
-            s01 = buff0[i + 1];
-            s11 = buff1[i + 1];
-            s0  = vis_faligndata(s00, s01);
-            s1  = vis_faligndata(s10, s11);
-
-            d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-            d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-            d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-            d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-
-            d0 = buffd[2*i];
-            d1 = buffd[2*i + 1];
-            d0 = vis_fpadd16(d00, d0);
-            d0 = vis_fpadd16(d10, d0);
-            d1 = vis_fpadd16(d01, d1);
-            d1 = vis_fpadd16(d11, d1);
-            buffd[2*i] = d0;
-            buffd[2*i + 1] = d1;
-          }
-
-        }
-
-        pk += 2*m;
-
-      } else if (jk_size == 3) {
-
-        for (ik = 0; ik < m; ik++, coff += NCHAN) {
-          if (!jk && ik == ik_last) continue;
-
-          k0 = pk[ik];
-          k1 = pk[ik + m];
-          k2 = pk[ik + 2*m];
-
-          doff  = coff/8;
-          buff0 = buff[jk    ] + doff;
-          buff1 = buff[jk + 1] + doff;
-          buff2 = buff[jk + 2] + doff;
-
-          off = coff & 7;
-          vis_write_gsr(gsr_scale + off);
-
-          if (off == 0) {
-#pragma pipeloop(0)
-            for (i = 0; i < (xsize + 7)/8; i++) {
-              d0 = buffd[2*i];
-              d1 = buffd[2*i + 1];
-
-              s0 = buff0[i];
-              s1 = buff1[i];
-              s2 = buff2[i];
-
-              d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-              d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-              d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-              d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-              d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-              d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-
-              d00 = vis_fpadd16(d00, d10);
-              d0  = vis_fpadd16(d20, d0);
-              d0  = vis_fpadd16(d00, d0);
-              d01 = vis_fpadd16(d01, d11);
-              d1  = vis_fpadd16(d21, d1);
-              d1  = vis_fpadd16(d01, d1);
-              buffd[2*i] = d0;
-              buffd[2*i + 1] = d1;
-            }
-
-          } else if (off == 4) {
-            s01 = buff0[0];
-            s11 = buff1[0];
-            s21 = buff2[0];
-#pragma pipeloop(0)
-            for (i = 0; i < (xsize + 7)/8; i++) {
-              d0 = buffd[2*i];
-              d1 = buffd[2*i + 1];
-
-              s00 = s01;
-              s10 = s11;
-              s20 = s21;
-              s01 = buff0[i + 1];
-              s11 = buff1[i + 1];
-              s21 = buff2[i + 1];
-
-              d00 = vis_fmul8x16au(vis_read_lo(s00), k0);
-              d01 = vis_fmul8x16au(vis_read_hi(s01), k0);
-              d10 = vis_fmul8x16au(vis_read_lo(s10), k1);
-              d11 = vis_fmul8x16au(vis_read_hi(s11), k1);
-              d20 = vis_fmul8x16au(vis_read_lo(s20), k2);
-              d21 = vis_fmul8x16au(vis_read_hi(s21), k2);
-
-              d00 = vis_fpadd16(d00, d10);
-              d0  = vis_fpadd16(d20, d0);
-              d0  = vis_fpadd16(d00, d0);
-              d01 = vis_fpadd16(d01, d11);
-              d1  = vis_fpadd16(d21, d1);
-              d1  = vis_fpadd16(d01, d1);
-              buffd[2*i] = d0;
-              buffd[2*i + 1] = d1;
-            }
-
-          } else {
-            s01 = buff0[0];
-            s11 = buff1[0];
-            s21 = buff2[0];
-#pragma pipeloop(0)
-            for (i = 0; i < (xsize + 7)/8; i++) {
-              d0 = buffd[2*i];
-              d1 = buffd[2*i + 1];
-
-              s00 = s01;
-              s10 = s11;
-              s20 = s21;
-              s01 = buff0[i + 1];
-              s11 = buff1[i + 1];
-              s21 = buff2[i + 1];
-              s0  = vis_faligndata(s00, s01);
-              s1  = vis_faligndata(s10, s11);
-              s2  = vis_faligndata(s20, s21);
-
-              d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-              d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-              d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-              d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-              d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-              d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-
-              d00 = vis_fpadd16(d00, d10);
-              d0  = vis_fpadd16(d20, d0);
-              d0  = vis_fpadd16(d00, d0);
-              d01 = vis_fpadd16(d01, d11);
-              d1  = vis_fpadd16(d21, d1);
-              d1  = vis_fpadd16(d01, d1);
-              buffd[2*i] = d0;
-              buffd[2*i + 1] = d1;
-            }
-          }
-        }
-
-        pk += 3*m;
-
-      } else { /* jk_size == 4 */
-
-        for (ik = 0; ik < m; ik++, coff += NCHAN) {
-          if (!jk && ik == ik_last) continue;
-
-          k0 = pk[ik];
-          k1 = pk[ik + m];
-          k2 = pk[ik + 2*m];
-          k3 = pk[ik + 3*m];
-
-          doff  = coff/8;
-          buff0 = buff[jk    ] + doff;
-          buff1 = buff[jk + 1] + doff;
-          buff2 = buff[jk + 2] + doff;
-          buff3 = buff[jk + 3] + doff;
-
-          off = coff & 7;
-          vis_write_gsr(gsr_scale + off);
-
-          if (off == 0) {
-
-#pragma pipeloop(0)
-            for (i = 0; i < (xsize + 7)/8; i++) {
-              d0 = buffd[2*i];
-              d1 = buffd[2*i + 1];
-
-              s0 = buff0[i];
-              s1 = buff1[i];
-              s2 = buff2[i];
-              s3 = buff3[i];
-
-              d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-              d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-              d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-              d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-              d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-              d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-              d30 = vis_fmul8x16au(vis_read_hi(s3), k3);
-              d31 = vis_fmul8x16au(vis_read_lo(s3), k3);
-
-              d00 = vis_fpadd16(d00, d10);
-              d20 = vis_fpadd16(d20, d30);
-              d0  = vis_fpadd16(d0,  d00);
-              d0  = vis_fpadd16(d0,  d20);
-              d01 = vis_fpadd16(d01, d11);
-              d21 = vis_fpadd16(d21, d31);
-              d1  = vis_fpadd16(d1,  d01);
-              d1  = vis_fpadd16(d1,  d21);
-              buffd[2*i] = d0;
-              buffd[2*i + 1] = d1;
-            }
-
-          } else if (off == 4) {
-
-            s01 = buff0[0];
-            s11 = buff1[0];
-            s21 = buff2[0];
-            s31 = buff3[0];
-#pragma pipeloop(0)
-            for (i = 0; i < (xsize + 7)/8; i++) {
-              d0 = buffd[2*i];
-              d1 = buffd[2*i + 1];
-
-              s00 = s01;
-              s10 = s11;
-              s20 = s21;
-              s30 = s31;
-              s01 = buff0[i + 1];
-              s11 = buff1[i + 1];
-              s21 = buff2[i + 1];
-              s31 = buff3[i + 1];
-
-              d00 = vis_fmul8x16au(vis_read_lo(s00), k0);
-              d01 = vis_fmul8x16au(vis_read_hi(s01), k0);
-              d10 = vis_fmul8x16au(vis_read_lo(s10), k1);
-              d11 = vis_fmul8x16au(vis_read_hi(s11), k1);
-              d20 = vis_fmul8x16au(vis_read_lo(s20), k2);
-              d21 = vis_fmul8x16au(vis_read_hi(s21), k2);
-              d30 = vis_fmul8x16au(vis_read_lo(s30), k3);
-              d31 = vis_fmul8x16au(vis_read_hi(s31), k3);
-
-              d00 = vis_fpadd16(d00, d10);
-              d20 = vis_fpadd16(d20, d30);
-              d0  = vis_fpadd16(d0,  d00);
-              d0  = vis_fpadd16(d0,  d20);
-              d01 = vis_fpadd16(d01, d11);
-              d21 = vis_fpadd16(d21, d31);
-              d1  = vis_fpadd16(d1,  d01);
-              d1  = vis_fpadd16(d1,  d21);
-              buffd[2*i] = d0;
-              buffd[2*i + 1] = d1;
-            }
-
-          } else {
-
-            s01 = buff0[0];
-            s11 = buff1[0];
-            s21 = buff2[0];
-            s31 = buff3[0];
-#pragma pipeloop(0)
-            for (i = 0; i < (xsize + 7)/8; i++) {
-              d0 = buffd[2*i];
-              d1 = buffd[2*i + 1];
-
-              s00 = s01;
-              s10 = s11;
-              s20 = s21;
-              s30 = s31;
-              s01 = buff0[i + 1];
-              s11 = buff1[i + 1];
-              s21 = buff2[i + 1];
-              s31 = buff3[i + 1];
-              s0  = vis_faligndata(s00, s01);
-              s1  = vis_faligndata(s10, s11);
-              s2  = vis_faligndata(s20, s21);
-              s3  = vis_faligndata(s30, s31);
-
-              d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-              d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-              d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-              d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-              d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-              d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-              d30 = vis_fmul8x16au(vis_read_hi(s3), k3);
-              d31 = vis_fmul8x16au(vis_read_lo(s3), k3);
-
-              d00 = vis_fpadd16(d00, d10);
-              d20 = vis_fpadd16(d20, d30);
-              d0  = vis_fpadd16(d0,  d00);
-              d0  = vis_fpadd16(d0,  d20);
-              d01 = vis_fpadd16(d01, d11);
-              d21 = vis_fpadd16(d21, d31);
-              d1  = vis_fpadd16(d1,  d01);
-              d1  = vis_fpadd16(d1,  d21);
-              buffd[2*i] = d0;
-              buffd[2*i + 1] = d1;
-            }
-          }
-        }
-
-        pk += 4*m;
-      }
-    }
-
-    /*****************************************
-     *****************************************
-     **          Final iteration            **
-     *****************************************
-     *****************************************/
-
-    jk_size = n;
-#ifdef CONV_INDEX
-    if (jk_size >= 5) jk_size = 3;
-    if (jk_size == 4) jk_size = 2;
-#else
-    if (jk_size >= 6) jk_size = 4;
-    if (jk_size == 5) jk_size = 3;
-#endif
-
-    k0 = karr[ik_last];
-    k1 = karr[ik_last + m];
-    k2 = karr[ik_last + 2*m];
-    k3 = karr[ik_last + 3*m];
-
-    off  = ik_last*NCHAN;
-    doff = off/8;
-    off &= 7;
-    buff0 = buff[0] + doff;
-    buff1 = buff[1] + doff;
-    buff2 = buff[2] + doff;
-    buff3 = buff[3] + doff;
-    vis_write_gsr(gsr_scale + off);
-
-#ifndef CONV_INDEX
-    if (jk_size == 2) {
-      dp = ((mlib_addr)dl & 7) ? buffe : (mlib_d64*)dl;
-
-      s01 = buff0[0];
-      s11 = buff1[0];
-#pragma pipeloop(0)
-      for (i = 0; i < xsize/8; i++) {
-        s00 = s01;
-        s10 = s11;
-        s01 = buff0[i + 1];
-        s11 = buff1[i + 1];
-        s0  = vis_faligndata(s00, s01);
-        s1  = vis_faligndata(s10, s11);
-
-        d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-        d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-        d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-        d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-
-        d0 = buffd[2*i];
-        d1 = buffd[2*i + 1];
-        d0 = vis_fpadd16(d0, d00);
-        d0 = vis_fpadd16(d0, d10);
-        d1 = vis_fpadd16(d1, d01);
-        d1 = vis_fpadd16(d1, d11);
-
-        dd = vis_fpack16_pair(d0, d1);
-        dp[i] = dd;
-
-        buffd[2*i    ] = drnd;
-        buffd[2*i + 1] = drnd;
-      }
-
-      if (emask) {
-        s00 = s01;
-        s10 = s11;
-        s01 = buff0[i + 1];
-        s11 = buff1[i + 1];
-        s0  = vis_faligndata(s00, s01);
-        s1  = vis_faligndata(s10, s11);
-
-        d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-        d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-        d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-        d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-
-        d0 = buffd[2*i];
-        d1 = buffd[2*i + 1];
-        d0 = vis_fpadd16(d0, d00);
-        d0 = vis_fpadd16(d0, d10);
-        d1 = vis_fpadd16(d1, d01);
-        d1 = vis_fpadd16(d1, d11);
-
-        dd = vis_fpack16_pair(d0, d1);
-        vis_pst_8(dd, dp + i, emask);
-
-        buffd[2*i    ] = drnd;
-        buffd[2*i + 1] = drnd;
-      }
-
-      if ((mlib_u8*)dp != dl) mlib_ImageCopy_na((void*)buffe, dl, xsize);
-
-    } else if (jk_size == 3) {
-
-      dp = ((mlib_addr)dl & 7) ? buffe : (mlib_d64*)dl;
-
-      s01 = buff0[0];
-      s11 = buff1[0];
-      s21 = buff2[0];
-#pragma pipeloop(0)
-      for (i = 0; i < xsize/8; i++) {
-        s00 = s01;
-        s10 = s11;
-        s20 = s21;
-        s01 = buff0[i + 1];
-        s11 = buff1[i + 1];
-        s21 = buff2[i + 1];
-        s0  = vis_faligndata(s00, s01);
-        s1  = vis_faligndata(s10, s11);
-        s2  = vis_faligndata(s20, s21);
-
-        d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-        d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-        d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-        d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-        d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-        d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-
-        d0 = buffd[2*i];
-        d1 = buffd[2*i + 1];
-        d0 = vis_fpadd16(d0, d00);
-        d0 = vis_fpadd16(d0, d10);
-        d0 = vis_fpadd16(d0, d20);
-        d1 = vis_fpadd16(d1, d01);
-        d1 = vis_fpadd16(d1, d11);
-        d1 = vis_fpadd16(d1, d21);
-
-        dd = vis_fpack16_pair(d0, d1);
-        dp[i] = dd;
-
-        buffd[2*i    ] = drnd;
-        buffd[2*i + 1] = drnd;
-      }
-
-      if (emask) {
-        s00 = s01;
-        s10 = s11;
-        s20 = s21;
-        s01 = buff0[i + 1];
-        s11 = buff1[i + 1];
-        s21 = buff2[i + 1];
-        s0  = vis_faligndata(s00, s01);
-        s1  = vis_faligndata(s10, s11);
-        s2  = vis_faligndata(s20, s21);
-
-        d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-        d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-        d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-        d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-        d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-        d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-
-        d0 = buffd[2*i];
-        d1 = buffd[2*i + 1];
-        d0 = vis_fpadd16(d0, d00);
-        d0 = vis_fpadd16(d0, d10);
-        d0 = vis_fpadd16(d0, d20);
-        d1 = vis_fpadd16(d1, d01);
-        d1 = vis_fpadd16(d1, d11);
-        d1 = vis_fpadd16(d1, d21);
-
-        dd = vis_fpack16_pair(d0, d1);
-        vis_pst_8(dd, dp + i, emask);
-
-        buffd[2*i    ] = drnd;
-        buffd[2*i + 1] = drnd;
-      }
-
-      if ((mlib_u8*)dp != dl) mlib_ImageCopy_na((void*)buffe, dl, xsize);
-
-    } else /* if (jk_size == 4) */ {
-
-      dp = ((mlib_addr)dl & 7) ? buffe : (mlib_d64*)dl;
-
-      s01 = buff0[0];
-      s11 = buff1[0];
-      s21 = buff2[0];
-      s31 = buff3[0];
-#pragma pipeloop(0)
-      for (i = 0; i < xsize/8; i++) {
-        s00 = s01;
-        s10 = s11;
-        s20 = s21;
-        s30 = s31;
-        s01 = buff0[i + 1];
-        s11 = buff1[i + 1];
-        s21 = buff2[i + 1];
-        s31 = buff3[i + 1];
-        s0  = vis_faligndata(s00, s01);
-        s1  = vis_faligndata(s10, s11);
-        s2  = vis_faligndata(s20, s21);
-        s3  = vis_faligndata(s30, s31);
-
-        d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-        d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-        d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-        d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-        d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-        d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-        d30 = vis_fmul8x16au(vis_read_hi(s3), k3);
-        d31 = vis_fmul8x16au(vis_read_lo(s3), k3);
-
-        d0 = buffd[2*i];
-        d1 = buffd[2*i + 1];
-        d0 = vis_fpadd16(d0, d00);
-        d0 = vis_fpadd16(d0, d10);
-        d0 = vis_fpadd16(d0, d20);
-        d0 = vis_fpadd16(d0, d30);
-        d1 = vis_fpadd16(d1, d01);
-        d1 = vis_fpadd16(d1, d11);
-        d1 = vis_fpadd16(d1, d21);
-        d1 = vis_fpadd16(d1, d31);
-
-        dd = vis_fpack16_pair(d0, d1);
-        dp[i] = dd;
-
-        buffd[2*i    ] = drnd;
-        buffd[2*i + 1] = drnd;
-      }
-
-      if (emask) {
-        s00 = s01;
-        s10 = s11;
-        s20 = s21;
-        s30 = s31;
-        s01 = buff0[i + 1];
-        s11 = buff1[i + 1];
-        s21 = buff2[i + 1];
-        s31 = buff3[i + 1];
-        s0  = vis_faligndata(s00, s01);
-        s1  = vis_faligndata(s10, s11);
-        s2  = vis_faligndata(s20, s21);
-        s3  = vis_faligndata(s30, s31);
-
-        d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-        d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-        d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-        d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-        d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-        d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-        d30 = vis_fmul8x16au(vis_read_hi(s3), k3);
-        d31 = vis_fmul8x16au(vis_read_lo(s3), k3);
-
-        d0 = buffd[2*i];
-        d1 = buffd[2*i + 1];
-        d0 = vis_fpadd16(d0, d00);
-        d0 = vis_fpadd16(d0, d10);
-        d0 = vis_fpadd16(d0, d20);
-        d0 = vis_fpadd16(d0, d30);
-        d1 = vis_fpadd16(d1, d01);
-        d1 = vis_fpadd16(d1, d11);
-        d1 = vis_fpadd16(d1, d21);
-        d1 = vis_fpadd16(d1, d31);
-
-        dd = vis_fpack16_pair(d0, d1);
-        vis_pst_8(dd, dp + i, emask);
-
-        buffd[2*i    ] = drnd;
-        buffd[2*i + 1] = drnd;
-      }
-
-      if ((mlib_u8*)dp != dl) mlib_ImageCopy_na((void*)buffe, dl, xsize);
-    }
-
-#else /* CONV_INDEX */
-
-    if (jk_size == 2) {
-      vis_write_gsr(gsr_scale + 7);
-
-#pragma pipeloop(0)
-      for (i = 0; i < dsize; i += 3) {
-        mlib_d64 d00, d01, d02, d03, d04, d05;
-        mlib_d64 d10, d11, d12, d13, d14, d15;
-        mlib_d64 d0, d1, d2, d3, d4, d5;
-        mlib_d64 s00 = buff0[i];
-        mlib_d64 s01 = buff0[i + 1];
-        mlib_d64 s02 = buff0[i + 2];
-        mlib_d64 s10 = buff1[i];
-        mlib_d64 s11 = buff1[i + 1];
-        mlib_d64 s12 = buff1[i + 2];
-
-        d00 = vis_fmul8x16au(vis_read_hi(s00), k0);
-        d01 = vis_fmul8x16au(vis_read_lo(s00), k0);
-        d02 = vis_fmul8x16au(vis_read_hi(s01), k0);
-        d03 = vis_fmul8x16au(vis_read_lo(s01), k0);
-        d04 = vis_fmul8x16au(vis_read_hi(s02), k0);
-        d05 = vis_fmul8x16au(vis_read_lo(s02), k0);
-        d10 = vis_fmul8x16au(vis_read_hi(s10), k1);
-        d11 = vis_fmul8x16au(vis_read_lo(s10), k1);
-        d12 = vis_fmul8x16au(vis_read_hi(s11), k1);
-        d13 = vis_fmul8x16au(vis_read_lo(s11), k1);
-        d14 = vis_fmul8x16au(vis_read_hi(s12), k1);
-        d15 = vis_fmul8x16au(vis_read_lo(s12), k1);
-
-        d0 = buffd[2*i];
-        d1 = buffd[2*i + 1];
-        d2 = buffd[2*i + 2];
-        d3 = buffd[2*i + 3];
-        d4 = buffd[2*i + 4];
-        d5 = buffd[2*i + 5];
-        d0 = vis_fpadd16(d0, d00);
-        d0 = vis_fpadd16(d0, d10);
-        d1 = vis_fpadd16(d1, d01);
-        d1 = vis_fpadd16(d1, d11);
-        d2 = vis_fpadd16(d2, d02);
-        d2 = vis_fpadd16(d2, d12);
-        d3 = vis_fpadd16(d3, d03);
-        d3 = vis_fpadd16(d3, d13);
-        d4 = vis_fpadd16(d4, d04);
-        d4 = vis_fpadd16(d4, d14);
-        d5 = vis_fpadd16(d5, d05);
-        d5 = vis_fpadd16(d5, d15);
-
-        buffe[i    ] = vis_fpack16_pair(d0, d1);
-        buffe[i + 1] = vis_fpack16_pair(d2, d3);
-        buffe[i + 2] = vis_fpack16_pair(d4, d5);
-
-        buffd[2*i    ] = drnd;
-        buffd[2*i + 1] = drnd;
-        buffd[2*i + 2] = drnd;
-        buffd[2*i + 3] = drnd;
-        buffd[2*i + 4] = drnd;
-        buffd[2*i + 5] = drnd;
-
-        LOAD_SRC();
-      }
-
-    } else /* if (jk_size == 3) */ {
-      vis_write_gsr(gsr_scale + 7);
-
-#pragma pipeloop(0)
-      for (i = 0; i < dsize; i += 3) {
-        mlib_d64 d00, d01, d02, d03, d04, d05;
-        mlib_d64 d10, d11, d12, d13, d14, d15;
-        mlib_d64 d20, d21, d22, d23, d24, d25;
-        mlib_d64 d0, d1, d2, d3, d4, d5;
-        mlib_d64 s00 = buff0[i];
-        mlib_d64 s01 = buff0[i + 1];
-        mlib_d64 s02 = buff0[i + 2];
-        mlib_d64 s10 = buff1[i];
-        mlib_d64 s11 = buff1[i + 1];
-        mlib_d64 s12 = buff1[i + 2];
-        mlib_d64 s20 = buff2[i];
-        mlib_d64 s21 = buff2[i + 1];
-        mlib_d64 s22 = buff2[i + 2];
-
-        d00 = vis_fmul8x16au(vis_read_hi(s00), k0);
-        d01 = vis_fmul8x16au(vis_read_lo(s00), k0);
-        d02 = vis_fmul8x16au(vis_read_hi(s01), k0);
-        d03 = vis_fmul8x16au(vis_read_lo(s01), k0);
-        d04 = vis_fmul8x16au(vis_read_hi(s02), k0);
-        d05 = vis_fmul8x16au(vis_read_lo(s02), k0);
-        d10 = vis_fmul8x16au(vis_read_hi(s10), k1);
-        d11 = vis_fmul8x16au(vis_read_lo(s10), k1);
-        d12 = vis_fmul8x16au(vis_read_hi(s11), k1);
-        d13 = vis_fmul8x16au(vis_read_lo(s11), k1);
-        d14 = vis_fmul8x16au(vis_read_hi(s12), k1);
-        d15 = vis_fmul8x16au(vis_read_lo(s12), k1);
-        d20 = vis_fmul8x16au(vis_read_hi(s20), k2);
-        d21 = vis_fmul8x16au(vis_read_lo(s20), k2);
-        d22 = vis_fmul8x16au(vis_read_hi(s21), k2);
-        d23 = vis_fmul8x16au(vis_read_lo(s21), k2);
-        d24 = vis_fmul8x16au(vis_read_hi(s22), k2);
-        d25 = vis_fmul8x16au(vis_read_lo(s22), k2);
-
-        d0 = buffd[2*i];
-        d1 = buffd[2*i + 1];
-        d2 = buffd[2*i + 2];
-        d3 = buffd[2*i + 3];
-        d4 = buffd[2*i + 4];
-        d5 = buffd[2*i + 5];
-        d0 = vis_fpadd16(d0, d00);
-        d0 = vis_fpadd16(d0, d10);
-        d0 = vis_fpadd16(d0, d20);
-        d1 = vis_fpadd16(d1, d01);
-        d1 = vis_fpadd16(d1, d11);
-        d1 = vis_fpadd16(d1, d21);
-        d2 = vis_fpadd16(d2, d02);
-        d2 = vis_fpadd16(d2, d12);
-        d2 = vis_fpadd16(d2, d22);
-        d3 = vis_fpadd16(d3, d03);
-        d3 = vis_fpadd16(d3, d13);
-        d3 = vis_fpadd16(d3, d23);
-        d4 = vis_fpadd16(d4, d04);
-        d4 = vis_fpadd16(d4, d14);
-        d4 = vis_fpadd16(d4, d24);
-        d5 = vis_fpadd16(d5, d05);
-        d5 = vis_fpadd16(d5, d15);
-        d5 = vis_fpadd16(d5, d25);
-
-        buffe[i    ] = vis_fpack16_pair(d0, d1);
-        buffe[i + 1] = vis_fpack16_pair(d2, d3);
-        buffe[i + 2] = vis_fpack16_pair(d4, d5);
-
-        buffd[2*i    ] = drnd;
-        buffd[2*i + 1] = drnd;
-        buffd[2*i + 2] = drnd;
-        buffd[2*i + 3] = drnd;
-        buffd[2*i + 4] = drnd;
-        buffd[2*i + 5] = drnd;
-
-        LOAD_SRC();
-      }
-    }
-#endif /* CONV_INDEX */
-
-#ifdef CONV_INDEX
-    mlib_ImageColorTrue2IndexLine_U8_U8_3((void*)buffe, dl, wid, colormap);
-#endif /* CONV_INDEX */
-
-    sl += sll;
-    dl += dll;
-
-    buff_ind++;
-    if (buff_ind >= (n + 1)) buff_ind = 0;
-  }
-
-  mlib_free(pbuff);
-  if (buffs != buffs_local) mlib_free(buffs);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
diff --git a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv_8nw.c b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv_8nw.c
index ac2e5f025a6..0605fa4fa84 100644
--- a/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv_8nw.c
+++ b/jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv_8nw.c
@@ -34,58 +34,16 @@
 #include "vis_proto.h"
 #include "mlib_image.h"
 #include "mlib_ImageCheck.h"
-#include "mlib_ImageColormap.h"
 #include "mlib_ImageCopy.h"
 #include "mlib_ImageConv.h"
 #include "mlib_v_ImageConv.h"
 
-/*
-  This defines switches between functions in
-  files: mlib_v_ImageConvIndex3_8_8nw.c,
-         mlib_v_ImageConvIndex4_8_8nw.c,
-         mlib_v_ImageConvIndex3_8_16nw.c,
-         mlib_v_ImageConvIndex4_8_16nw.c
-*/
-
-/*#define CONV_INDEX*/
-
 /***************************************************************/
 #define DTYPE mlib_u8
-#define LTYPE mlib_u8
 
 /***************************************************************/
-#ifdef CONV_INDEX
-
-#define CONV_FUNC(KERN)                                         \
-  mlib_conv##KERN##_Index3_8_8nw(mlib_image       *dst,         \
-                                 const mlib_image *src,         \
-                                 const mlib_s32   *kern,        \
-                                 mlib_s32         scale,        \
-                                 const void       *colormap)
-
-#else
-
-#define CONV_FUNC(KERN)                                         \
-  mlib_conv##KERN##_8nw_f(mlib_image       *dst,                \
-                          const mlib_image *src,                \
-                          const mlib_s32   *kern,               \
-                          mlib_s32         scale)
-
-#endif /* CONV_INDEX */
-
-#define ColorTrue2IndexLine mlib_ImageColorTrue2IndexLine_U8_U8_3
-
-/***************************************************************/
-#ifdef CONV_INDEX
-
-#define NCHAN  3
-
-#else
-
 #define NCHAN  nchan
 
-#endif /* CONV_INDEX */
-
 /***************************************************************/
 #define DEF_VARS                                                \
   DTYPE    *sl, *sp, *dl;                                       \
@@ -103,104 +61,9 @@
   mlib_s32 i, j, l
 
 /***************************************************************/
-#ifdef CONV_INDEX
-
-#define DEF_EXTRA_VARS                                          \
-  mlib_s32 offset = mlib_ImageGetLutOffset(colormap);           \
-  LTYPE  **lut_table = (LTYPE**)mlib_ImageGetLutData(colormap); \
-  LTYPE  *ltbl0 = lut_table[0] - offset;                        \
-  LTYPE  *ltbl1 = lut_table[1] - offset;                        \
-  LTYPE  *ltbl2 = lut_table[2] - offset;                        \
-  LTYPE  *ltbl3 = (NCHAN > 3) ? lut_table[3] - offset : ltbl2
-
-#else
-
 #define DEF_EXTRA_VARS                                          \
   mlib_s32 nchan = mlib_ImageGetChannels(dst)
 
-#endif /* CONV_INDEX */
-
-/***************************************************************/
-#if NCHAN == 3
-
-#define LOAD_SRC() {                                            \
-    mlib_s32 s0 = sp[0], s1 = sp[1], s2 = sp[2], s3 = sp[3];    \
-    mlib_s32 s4 = sp[4], s5 = sp[5], s6 = sp[6], s7 = sp[7];    \
-    mlib_d64 t0, t1, t2;                                        \
-                                                                \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl2, s7), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl1, s7), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl0, s7), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl2, s6), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl1, s6), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl0, s6), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl2, s5), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl1, s5), t2);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl0, s5), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl2, s4), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl1, s4), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl0, s4), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl2, s3), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl1, s3), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl0, s3), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl2, s2), t1);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl1, s2), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl0, s2), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl2, s1), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl1, s1), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl0, s1), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl2, s0), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl1, s0), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl0, s0), t0);            \
-                                                                \
-    buffn[i] = t0;                                              \
-    buffn[i + 1] = t1;                                          \
-    buffn[i + 2] = t2;                                          \
-                                                                \
-    sp += 8;                                                    \
-  }
-
-#else
-
-#define LOAD_SRC() {                                            \
-    mlib_s32 s0 = sp[0], s1 = sp[1], s2 = sp[2], s3 = sp[3];    \
-    mlib_s32 s4 = sp[4], s5 = sp[5], s6 = sp[6], s7 = sp[7];    \
-    mlib_d64 t0, t1, t2;                                        \
-                                                                \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl3, s5), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl2, s5), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl1, s5), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl0, s5), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl3, s4), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl2, s4), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl1, s4), t2);            \
-    t2 = vis_faligndata(vis_ld_u8_i(ltbl0, s4), t2);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl3, s3), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl2, s3), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl1, s3), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl0, s3), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl3, s2), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl2, s2), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl1, s2), t1);            \
-    t1 = vis_faligndata(vis_ld_u8_i(ltbl0, s2), t1);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl3, s1), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl2, s1), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl1, s1), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl0, s1), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl3, s0), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl2, s0), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl1, s0), t0);            \
-    t0 = vis_faligndata(vis_ld_u8_i(ltbl0, s0), t0);            \
-                                                                \
-    buffn[i] = t0;                                              \
-    buffn[i + 1] = t1;                                          \
-    buffn[i + 2] = t2;                                          \
-                                                                \
-    sp += 6;                                                    \
-  }
-
-#endif /* NCHAN == 3 */
-
 /***************************************************************/
 static const mlib_s32 mlib_round_8[16] = {
   0x00400040, 0x00200020, 0x00100010, 0x00080008,
@@ -210,651 +73,8 @@ static const mlib_s32 mlib_round_8[16] = {
 };
 
 /***************************************************************/
-#define KSIZE  2
-
-mlib_status CONV_FUNC(2x2)
-{
-  mlib_d64 *buffs[2 * (KSIZE + 1)];
-  mlib_d64 *buff0, *buff1, *buffn, *buffd, *buffe;
-  mlib_d64 s00, s01, s10, s11, s0, s1;
-  mlib_d64 d0, d1, d00, d01, d10, d11;
-  DEF_VARS;
-  DEF_EXTRA_VARS;
-
-  sl = adr_src;
-  dl = adr_dst;
-
-  ssize = NCHAN * wid;
-  dsize = (ssize + 7) / 8;
-  esize = dsize + 4;
-  pbuff = mlib_malloc((KSIZE + 4) * esize * sizeof(mlib_d64));
-
-  if (pbuff == NULL)
-    return MLIB_FAILURE;
-
-  for (i = 0; i < (KSIZE + 1); i++)
-    buffs[i] = pbuff + i * esize;
-  for (i = 0; i < (KSIZE + 1); i++)
-    buffs[(KSIZE + 1) + i] = buffs[i];
-  buffd = buffs[KSIZE] + esize;
-  buffe = buffd + 2 * esize;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-  xsize = ssize - NCHAN * (KSIZE - 1);
-  emask = (0xFF00 >> (xsize & 7)) & 0xFF;
-
-  vis_write_gsr(gsr_scale + 7);
-
-  for (l = 0; l < KSIZE; l++) {
-    mlib_d64 *buffn = buffs[l];
-    sp = sl + l * sll;
-
-#ifndef CONV_INDEX
-
-    if ((mlib_addr) sp & 7)
-      mlib_ImageCopy_na((void *)sp, (void *)buffn, ssize);
-
-#else
-#pragma pipeloop(0)
-    for (i = 0; i < dsize; i += 3) {
-      LOAD_SRC();
-    }
-
-#endif /* CONV_INDEX */
-  }
-
-  for (j = 0; j < hgt; j++) {
-    mlib_d64 **buffc = buffs + buff_ind;
-    mlib_f32 *pk = karr, k0, k1;
-    sp = sl + KSIZE * sll;
-
-    buff0 = buffc[0];
-    buff1 = buffc[1];
-    buffn = buffc[KSIZE];
-
-#ifndef CONV_INDEX
-
-    if ((((mlib_addr) (sl)) & 7) == 0)
-      buff0 = (mlib_d64 *) sl;
-
-    if ((((mlib_addr) (sl + sll)) & 7) == 0)
-      buff1 = (mlib_d64 *) (sl + sll);
-
-    if ((mlib_addr) sp & 7)
-      mlib_ImageCopy_na((void *)sp, (void *)buffn, ssize);
-#endif /* CONV_INDEX */
-
-    k0 = pk[1];
-    k1 = pk[3];
-    vis_write_gsr(gsr_scale + NCHAN);
-
-    s01 = buff0[0];
-    s11 = buff1[0];
-#pragma pipeloop(0)
-    for (i = 0; i < (xsize + 7) / 8; i++) {
-      s00 = s01;
-      s10 = s11;
-      s01 = buff0[i + 1];
-      s11 = buff1[i + 1];
-      s0 = vis_faligndata(s00, s01);
-      s1 = vis_faligndata(s10, s11);
-
-      d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-      d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-      d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-      d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-
-      d0 = vis_fpadd16(d00, d10);
-      d1 = vis_fpadd16(d01, d11);
-      buffd[2 * i] = d0;
-      buffd[2 * i + 1] = d1;
-    }
-
-    k0 = pk[0];
-    k1 = pk[2];
-#ifndef CONV_INDEX
-    dp = ((mlib_addr) dl & 7) ? buffe : (mlib_d64 *) dl;
-
-#pragma pipeloop(0)
-    for (i = 0; i < xsize / 8; i++) {
-      s0 = buff0[i];
-      s1 = buff1[i];
-
-      d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-      d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-      d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-      d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-
-      d0 = buffd[2 * i];
-      d1 = buffd[2 * i + 1];
-      d00 = vis_fpadd16(d00, d10);
-      d0 = vis_fpadd16(d0, drnd);
-      d0 = vis_fpadd16(d0, d00);
-      d01 = vis_fpadd16(d01, d11);
-      d1 = vis_fpadd16(d1, drnd);
-      d1 = vis_fpadd16(d1, d01);
-      dp[i] = vis_fpack16_pair(d0, d1);
-    }
-
-    if (emask) {
-      s0 = buff0[i];
-      s1 = buff1[i];
-
-      d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-      d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-      d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-      d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-
-      d0 = buffd[2 * i];
-      d1 = buffd[2 * i + 1];
-      d00 = vis_fpadd16(d00, d10);
-      d0 = vis_fpadd16(d0, drnd);
-      d0 = vis_fpadd16(d0, d00);
-      d01 = vis_fpadd16(d01, d11);
-      d1 = vis_fpadd16(d1, drnd);
-      d1 = vis_fpadd16(d1, d01);
-
-      d0 = vis_fpack16_pair(d0, d1);
-      vis_pst_8(d0, dp + i, emask);
-    }
-
-    if ((mlib_u8 *) dp != dl)
-      mlib_ImageCopy_na((void *)buffe, dl, xsize);
-
-#else
-    vis_write_gsr(gsr_scale + 7);
-
-#pragma pipeloop(0)
-    for (i = 0; i < dsize; i += 3) {
-      mlib_d64 d00, d01, d02, d03, d04, d05;
-      mlib_d64 d10, d11, d12, d13, d14, d15;
-      mlib_d64 d0, d1, d2, d3, d4, d5;
-      mlib_d64 s00 = buff0[i];
-      mlib_d64 s01 = buff0[i + 1];
-      mlib_d64 s02 = buff0[i + 2];
-      mlib_d64 s10 = buff1[i];
-      mlib_d64 s11 = buff1[i + 1];
-      mlib_d64 s12 = buff1[i + 2];
-
-      d00 = vis_fmul8x16au(vis_read_hi(s00), k0);
-      d01 = vis_fmul8x16au(vis_read_lo(s00), k0);
-      d02 = vis_fmul8x16au(vis_read_hi(s01), k0);
-      d03 = vis_fmul8x16au(vis_read_lo(s01), k0);
-      d04 = vis_fmul8x16au(vis_read_hi(s02), k0);
-      d05 = vis_fmul8x16au(vis_read_lo(s02), k0);
-      d10 = vis_fmul8x16au(vis_read_hi(s10), k1);
-      d11 = vis_fmul8x16au(vis_read_lo(s10), k1);
-      d12 = vis_fmul8x16au(vis_read_hi(s11), k1);
-      d13 = vis_fmul8x16au(vis_read_lo(s11), k1);
-      d14 = vis_fmul8x16au(vis_read_hi(s12), k1);
-      d15 = vis_fmul8x16au(vis_read_lo(s12), k1);
-
-      d0 = buffd[2 * i];
-      d1 = buffd[2 * i + 1];
-      d2 = buffd[2 * i + 2];
-      d3 = buffd[2 * i + 3];
-      d4 = buffd[2 * i + 4];
-      d5 = buffd[2 * i + 5];
-      d00 = vis_fpadd16(d00, d10);
-      d0 = vis_fpadd16(d0, drnd);
-      d0 = vis_fpadd16(d0, d00);
-      d01 = vis_fpadd16(d01, d11);
-      d1 = vis_fpadd16(d1, drnd);
-      d1 = vis_fpadd16(d1, d01);
-      d02 = vis_fpadd16(d02, d12);
-      d2 = vis_fpadd16(d2, drnd);
-      d2 = vis_fpadd16(d2, d02);
-      d03 = vis_fpadd16(d03, d13);
-      d3 = vis_fpadd16(d3, drnd);
-      d3 = vis_fpadd16(d3, d03);
-      d04 = vis_fpadd16(d04, d14);
-      d4 = vis_fpadd16(d4, drnd);
-      d4 = vis_fpadd16(d4, d04);
-      d05 = vis_fpadd16(d05, d15);
-      d5 = vis_fpadd16(d5, drnd);
-      d5 = vis_fpadd16(d5, d05);
-
-      buffe[i] = vis_fpack16_pair(d0, d1);
-      buffe[i + 1] = vis_fpack16_pair(d2, d3);
-      buffe[i + 2] = vis_fpack16_pair(d4, d5);
-
-      LOAD_SRC();
-    }
-
-    ColorTrue2IndexLine((void *)buffe, dl, wid, colormap);
-#endif /* CONV_INDEX */
-
-    sl += sll;
-    dl += dll;
-
-    buff_ind++;
-
-    if (buff_ind >= (KSIZE + 1))
-      buff_ind = 0;
-  }
-
-  mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  KSIZE
-#define KSIZE  3
-
-mlib_status CONV_FUNC(3x3)
-{
-  mlib_d64 *buffs[2 * (KSIZE + 1)];
-  mlib_d64 *buff0, *buff1, *buff2, *buffn, *buffd, *buffe;
-  mlib_d64 s00, s01, s10, s11, s20, s21, s0, s1, s2;
-  mlib_d64 dd, d0, d1, d00, d01, d10, d11, d20, d21;
-  mlib_s32 ik, ik_last, off, doff;
-  DEF_VARS;
-  DEF_EXTRA_VARS;
-
-  sl = adr_src;
-#ifdef CONV_INDEX
-  dl = adr_dst + ((KSIZE - 1) / 2) * (dll + 1);
-#else
-  dl = adr_dst + ((KSIZE - 1) / 2) * (dll + NCHAN);
-#endif /* CONV_INDEX */
-
-  ssize = NCHAN * wid;
-  dsize = (ssize + 7) / 8;
-  esize = dsize + 4;
-  pbuff = mlib_malloc((KSIZE + 4) * esize * sizeof(mlib_d64));
-
-  if (pbuff == NULL)
-    return MLIB_FAILURE;
-
-  for (i = 0; i < (KSIZE + 1); i++)
-    buffs[i] = pbuff + i * esize;
-  for (i = 0; i < (KSIZE + 1); i++)
-    buffs[(KSIZE + 1) + i] = buffs[i];
-  buffd = buffs[KSIZE] + esize;
-  buffe = buffd + 2 * esize;
-
-  wid -= (KSIZE - 1);
-  hgt -= (KSIZE - 1);
-  xsize = ssize - NCHAN * (KSIZE - 1);
-  emask = (0xFF00 >> (xsize & 7)) & 0xFF;
-
-  vis_write_gsr(gsr_scale + 7);
-
-  for (l = 0; l < KSIZE; l++) {
-    mlib_d64 *buffn = buffs[l];
-    sp = sl + l * sll;
-
-#ifndef CONV_INDEX
-
-    if ((mlib_addr) sp & 7)
-      mlib_ImageCopy_na((void *)sp, (void *)buffn, ssize);
-#else
-#pragma pipeloop(0)
-    for (i = 0; i < dsize; i += 3) {
-      LOAD_SRC();
-    }
-
-#endif /* CONV_INDEX */
-  }
-
-  /* init buffer */
-#pragma pipeloop(0)
-  for (i = 0; i < (xsize + 7) / 8; i++) {
-    buffd[2 * i] = drnd;
-    buffd[2 * i + 1] = drnd;
-  }
-
-  for (j = 0; j < hgt; j++) {
-    mlib_d64 **buffc = buffs + buff_ind, *pbuff0, *pbuff1, *pbuff2;
-    mlib_f32 *pk = karr, k0, k1, k2;
-    sp = sl + KSIZE * sll;
-
-    pbuff0 = buffc[0];
-    pbuff1 = buffc[1];
-    pbuff2 = buffc[2];
-    buffn = buffc[KSIZE];
-
-#ifndef CONV_INDEX
-
-    if ((((mlib_addr) (sl)) & 7) == 0)
-      pbuff0 = (mlib_d64 *) sl;
-
-    if ((((mlib_addr) (sl + sll)) & 7) == 0)
-      pbuff1 = (mlib_d64 *) (sl + sll);
-
-    if ((((mlib_addr) (sl + 2 * sll)) & 7) == 0)
-      pbuff2 = (mlib_d64 *) (sl + 2 * sll);
-
-    if ((mlib_addr) sp & 7)
-      mlib_ImageCopy_na((void *)sp, (void *)buffn, ssize);
-#endif /* CONV_INDEX */
-
-#ifdef CONV_INDEX
-    ik_last = 0;
-#else
-    ik_last = (KSIZE - 1);
-#endif /* CONV_INDEX */
-
-    for (ik = 0; ik < KSIZE; ik++) {
-      k0 = pk[ik];
-      k1 = pk[ik + KSIZE];
-      k2 = pk[ik + 2 * KSIZE];
-
-      off = ik * NCHAN;
-      doff = off / 8;
-      off &= 7;
-      buff0 = pbuff0 + doff;
-      buff1 = pbuff1 + doff;
-      buff2 = pbuff2 + doff;
-      vis_write_gsr(gsr_scale + off);
-
-      if (ik == ik_last)
-        continue;
-      /*if (!ik_last) {
-       * if ((off & 3) || (ik == (KSIZE - 1))) {
-       * ik_last = ik;
-       * continue;
-       * }
-       * } */
-
-      if (off == 0) {
-#pragma pipeloop(0)
-        for (i = 0; i < (xsize + 7) / 8; i++) {
-          s0 = buff0[i];
-          s1 = buff1[i];
-          s2 = buff2[i];
-
-          d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-          d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-          d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-          d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-          d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-          d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-
-          d0 = buffd[2 * i];
-          d1 = buffd[2 * i + 1];
-          d0 = vis_fpadd16(d00, d0);
-          d0 = vis_fpadd16(d10, d0);
-          d0 = vis_fpadd16(d20, d0);
-          d1 = vis_fpadd16(d01, d1);
-          d1 = vis_fpadd16(d11, d1);
-          d1 = vis_fpadd16(d21, d1);
-          buffd[2 * i] = d0;
-          buffd[2 * i + 1] = d1;
-        }
-      }
-      else if (off == 4) {
-        s01 = buff0[0];
-        s11 = buff1[0];
-        s21 = buff2[0];
-#pragma pipeloop(0)
-        for (i = 0; i < (xsize + 7) / 8; i++) {
-          s00 = s01;
-          s10 = s11;
-          s20 = s21;
-          s01 = buff0[i + 1];
-          s11 = buff1[i + 1];
-          s21 = buff2[i + 1];
-
-          d00 = vis_fmul8x16au(vis_read_lo(s00), k0);
-          d01 = vis_fmul8x16au(vis_read_hi(s01), k0);
-          d10 = vis_fmul8x16au(vis_read_lo(s10), k1);
-          d11 = vis_fmul8x16au(vis_read_hi(s11), k1);
-          d20 = vis_fmul8x16au(vis_read_lo(s20), k2);
-          d21 = vis_fmul8x16au(vis_read_hi(s21), k2);
-
-          d0 = buffd[2 * i];
-          d1 = buffd[2 * i + 1];
-          d0 = vis_fpadd16(d00, d0);
-          d0 = vis_fpadd16(d10, d0);
-          d0 = vis_fpadd16(d20, d0);
-          d1 = vis_fpadd16(d01, d1);
-          d1 = vis_fpadd16(d11, d1);
-          d1 = vis_fpadd16(d21, d1);
-          buffd[2 * i] = d0;
-          buffd[2 * i + 1] = d1;
-        }
-      }
-      else {
-        s01 = buff0[0];
-        s11 = buff1[0];
-        s21 = buff2[0];
-#pragma pipeloop(0)
-        for (i = 0; i < (xsize + 7) / 8; i++) {
-          s00 = s01;
-          s10 = s11;
-          s20 = s21;
-          s01 = buff0[i + 1];
-          s11 = buff1[i + 1];
-          s21 = buff2[i + 1];
-          s0 = vis_faligndata(s00, s01);
-          s1 = vis_faligndata(s10, s11);
-          s2 = vis_faligndata(s20, s21);
-
-          d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-          d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-          d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-          d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-          d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-          d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-
-          d0 = buffd[2 * i];
-          d1 = buffd[2 * i + 1];
-          d0 = vis_fpadd16(d00, d0);
-          d0 = vis_fpadd16(d10, d0);
-          d0 = vis_fpadd16(d20, d0);
-          d1 = vis_fpadd16(d01, d1);
-          d1 = vis_fpadd16(d11, d1);
-          d1 = vis_fpadd16(d21, d1);
-          buffd[2 * i] = d0;
-          buffd[2 * i + 1] = d1;
-        }
-      }
-    }
-
-    k0 = pk[ik_last];
-    k1 = pk[ik_last + KSIZE];
-    k2 = pk[ik_last + 2 * KSIZE];
-
-    off = ik_last * NCHAN;
-    doff = off / 8;
-    off &= 7;
-    buff0 = pbuff0 + doff;
-    buff1 = pbuff1 + doff;
-    buff2 = pbuff2 + doff;
-    vis_write_gsr(gsr_scale + off);
-
-#ifndef CONV_INDEX
-    dp = ((mlib_addr) dl & 7) ? buffe : (mlib_d64 *) dl;
-
-    s01 = buff0[0];
-    s11 = buff1[0];
-    s21 = buff2[0];
-#pragma pipeloop(0)
-    for (i = 0; i < xsize / 8; i++) {
-      s00 = s01;
-      s10 = s11;
-      s20 = s21;
-      s01 = buff0[i + 1];
-      s11 = buff1[i + 1];
-      s21 = buff2[i + 1];
-      s0 = vis_faligndata(s00, s01);
-      s1 = vis_faligndata(s10, s11);
-      s2 = vis_faligndata(s20, s21);
-
-      d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-      d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-      d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-      d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-      d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-      d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-
-      d0 = buffd[2 * i];
-      d1 = buffd[2 * i + 1];
-      d0 = vis_fpadd16(d0, d00);
-      d0 = vis_fpadd16(d0, d10);
-      d0 = vis_fpadd16(d0, d20);
-      d1 = vis_fpadd16(d1, d01);
-      d1 = vis_fpadd16(d1, d11);
-      d1 = vis_fpadd16(d1, d21);
-
-      dd = vis_fpack16_pair(d0, d1);
-      dp[i] = dd;
-
-      buffd[2 * i] = drnd;
-      buffd[2 * i + 1] = drnd;
-    }
-
-    if (emask) {
-      s00 = s01;
-      s10 = s11;
-      s20 = s21;
-      s01 = buff0[i + 1];
-      s11 = buff1[i + 1];
-      s21 = buff2[i + 1];
-      s0 = vis_faligndata(s00, s01);
-      s1 = vis_faligndata(s10, s11);
-      s2 = vis_faligndata(s20, s21);
-
-      d00 = vis_fmul8x16au(vis_read_hi(s0), k0);
-      d01 = vis_fmul8x16au(vis_read_lo(s0), k0);
-      d10 = vis_fmul8x16au(vis_read_hi(s1), k1);
-      d11 = vis_fmul8x16au(vis_read_lo(s1), k1);
-      d20 = vis_fmul8x16au(vis_read_hi(s2), k2);
-      d21 = vis_fmul8x16au(vis_read_lo(s2), k2);
-
-      d0 = buffd[2 * i];
-      d1 = buffd[2 * i + 1];
-      d0 = vis_fpadd16(d0, d00);
-      d0 = vis_fpadd16(d0, d10);
-      d0 = vis_fpadd16(d0, d20);
-      d1 = vis_fpadd16(d1, d01);
-      d1 = vis_fpadd16(d1, d11);
-      d1 = vis_fpadd16(d1, d21);
-
-      dd = vis_fpack16_pair(d0, d1);
-      vis_pst_8(dd, dp + i, emask);
-
-      buffd[2 * i] = drnd;
-      buffd[2 * i + 1] = drnd;
-    }
-
-    if ((mlib_u8 *) dp != dl)
-      mlib_ImageCopy_na((void *)buffe, dl, xsize);
-
-#else
-    vis_write_gsr(gsr_scale + 7);
-
-#pragma pipeloop(0)
-    for (i = 0; i < dsize; i += 3) {
-      mlib_d64 d00, d01, d02, d03, d04, d05;
-      mlib_d64 d10, d11, d12, d13, d14, d15;
-      mlib_d64 d20, d21, d22, d23, d24, d25;
-      mlib_d64 d0, d1, d2, d3, d4, d5;
-      mlib_d64 s00 = buff0[i];
-      mlib_d64 s01 = buff0[i + 1];
-      mlib_d64 s02 = buff0[i + 2];
-      mlib_d64 s10 = buff1[i];
-      mlib_d64 s11 = buff1[i + 1];
-      mlib_d64 s12 = buff1[i + 2];
-      mlib_d64 s20 = buff2[i];
-      mlib_d64 s21 = buff2[i + 1];
-      mlib_d64 s22 = buff2[i + 2];
-
-      d00 = vis_fmul8x16au(vis_read_hi(s00), k0);
-      d01 = vis_fmul8x16au(vis_read_lo(s00), k0);
-      d02 = vis_fmul8x16au(vis_read_hi(s01), k0);
-      d03 = vis_fmul8x16au(vis_read_lo(s01), k0);
-      d04 = vis_fmul8x16au(vis_read_hi(s02), k0);
-      d05 = vis_fmul8x16au(vis_read_lo(s02), k0);
-      d10 = vis_fmul8x16au(vis_read_hi(s10), k1);
-      d11 = vis_fmul8x16au(vis_read_lo(s10), k1);
-      d12 = vis_fmul8x16au(vis_read_hi(s11), k1);
-      d13 = vis_fmul8x16au(vis_read_lo(s11), k1);
-      d14 = vis_fmul8x16au(vis_read_hi(s12), k1);
-      d15 = vis_fmul8x16au(vis_read_lo(s12), k1);
-      d20 = vis_fmul8x16au(vis_read_hi(s20), k2);
-      d21 = vis_fmul8x16au(vis_read_lo(s20), k2);
-      d22 = vis_fmul8x16au(vis_read_hi(s21), k2);
-      d23 = vis_fmul8x16au(vis_read_lo(s21), k2);
-      d24 = vis_fmul8x16au(vis_read_hi(s22), k2);
-      d25 = vis_fmul8x16au(vis_read_lo(s22), k2);
-
-      d0 = buffd[2 * i];
-      d1 = buffd[2 * i + 1];
-      d2 = buffd[2 * i + 2];
-      d3 = buffd[2 * i + 3];
-      d4 = buffd[2 * i + 4];
-      d5 = buffd[2 * i + 5];
-      d0 = vis_fpadd16(d0, d00);
-      d0 = vis_fpadd16(d0, d10);
-      d0 = vis_fpadd16(d0, d20);
-      d1 = vis_fpadd16(d1, d01);
-      d1 = vis_fpadd16(d1, d11);
-      d1 = vis_fpadd16(d1, d21);
-      d2 = vis_fpadd16(d2, d02);
-      d2 = vis_fpadd16(d2, d12);
-      d2 = vis_fpadd16(d2, d22);
-      d3 = vis_fpadd16(d3, d03);
-      d3 = vis_fpadd16(d3, d13);
-      d3 = vis_fpadd16(d3, d23);
-      d4 = vis_fpadd16(d4, d04);
-      d4 = vis_fpadd16(d4, d14);
-      d4 = vis_fpadd16(d4, d24);
-      d5 = vis_fpadd16(d5, d05);
-      d5 = vis_fpadd16(d5, d15);
-      d5 = vis_fpadd16(d5, d25);
-
-      buffe[i] = vis_fpack16_pair(d0, d1);
-      buffe[i + 1] = vis_fpack16_pair(d2, d3);
-      buffe[i + 2] = vis_fpack16_pair(d4, d5);
-
-      buffd[2 * i] = drnd;
-      buffd[2 * i + 1] = drnd;
-      buffd[2 * i + 2] = drnd;
-      buffd[2 * i + 3] = drnd;
-      buffd[2 * i + 4] = drnd;
-      buffd[2 * i + 5] = drnd;
-
-      LOAD_SRC();
-    }
-
-    ColorTrue2IndexLine((void *)buffe, dl, wid, colormap);
-#endif /* CONV_INDEX */
-
-    sl += sll;
-    dl += dll;
-
-    buff_ind++;
-
-    if (buff_ind >= (KSIZE + 1))
-      buff_ind = 0;
-  }
-
-  mlib_free(pbuff);
-
-  return MLIB_SUCCESS;
-}
-
-/***************************************************************/
-#undef  KSIZE
 #define MAX_N   11
 
-#ifdef CONV_INDEX
-
-mlib_status mlib_convMxN_Index3_8_8nw(mlib_image       *dst,
-                                      const mlib_image *src,
-                                      mlib_s32         m,
-                                      mlib_s32         n,
-                                      mlib_s32         dm,
-                                      mlib_s32         dn,
-                                      const mlib_s32   *kern,
-                                      mlib_s32         scale,
-                                      const void       *colormap)
-#else
-
 mlib_status mlib_convMxN_8nw_f(mlib_image       *dst,
                                const mlib_image *src,
                                mlib_s32         m,
@@ -863,7 +83,6 @@ mlib_status mlib_convMxN_8nw_f(mlib_image       *dst,
                                mlib_s32         dn,
                                const mlib_s32   *kern,
                                mlib_s32         scale)
-#endif /* CONV_INDEX */
 {
   mlib_d64 *buffs_local[3 * (MAX_N + 1)], **buffs = buffs_local, **buff;
   mlib_d64 *buff0, *buff1, *buff2, *buff3, *buffn, *buffd, *buffe;
@@ -884,11 +103,7 @@ mlib_status mlib_convMxN_8nw_f(mlib_image       *dst,
   buff = buffs + 2 * (n + 1);
 
   sl = adr_src;
-#ifdef CONV_INDEX
-  dl = adr_dst + dn * dll + dm;
-#else
   dl = adr_dst + dn * dll + dm * NCHAN;
-#endif /* CONV_INDEX */
 
   ssize = NCHAN * wid;
   dsize = (ssize + 7) / 8;
@@ -919,17 +134,8 @@ mlib_status mlib_convMxN_8nw_f(mlib_image       *dst,
     mlib_d64 *buffn = buffs[l];
     sp = sl + l * sll;
 
-#ifndef CONV_INDEX
-
     if ((mlib_addr) sp & 7)
       mlib_ImageCopy_na((void *)sp, (void *)buffn, ssize);
-#else
-#pragma pipeloop(0)
-    for (i = 0; i < dsize; i += 3) {
-      LOAD_SRC();
-    }
-
-#endif /* CONV_INDEX */
   }
 
   /* init buffer */
@@ -950,7 +156,6 @@ mlib_status mlib_convMxN_8nw_f(mlib_image       *dst,
 
     buffn = buffc[n];
 
-#ifndef CONV_INDEX
     for (l = 0; l < n; l++) {
       if ((((mlib_addr) (sl + l * sll)) & 7) == 0)
         buff[l] = (mlib_d64 *) (sl + l * sll);
@@ -958,31 +163,18 @@ mlib_status mlib_convMxN_8nw_f(mlib_image       *dst,
 
     if ((mlib_addr) sp & 7)
       mlib_ImageCopy_na((void *)sp, (void *)buffn, ssize);
-#endif /* CONV_INDEX */
 
-#ifdef CONV_INDEX
-    ik_last = 0;
-#else
     ik_last = (m - 1);
-#endif /* CONV_INDEX */
 
     for (jk = 0; jk < n; jk += jk_size) {
       jk_size = n - jk;
-#ifdef CONV_INDEX
-
-      if (jk_size >= 5)
-        jk_size = 3;
-
-      if (jk_size == 4)
-        jk_size = 2;
-#else
 
       if (jk_size >= 6)
         jk_size = 4;
 
       if (jk_size == 5)
         jk_size = 3;
-#endif /* CONV_INDEX */
+
       coff = 0;
 
       if (jk_size == 1) {
@@ -1335,21 +527,12 @@ mlib_status mlib_convMxN_8nw_f(mlib_image       *dst,
      *****************************************/
 
     jk_size = n;
-#ifdef CONV_INDEX
-
-    if (jk_size >= 5)
-      jk_size = 3;
-
-    if (jk_size == 4)
-      jk_size = 2;
-#else
 
     if (jk_size >= 6)
       jk_size = 4;
 
     if (jk_size == 5)
       jk_size = 3;
-#endif /* CONV_INDEX */
 
     k0 = karr[ik_last];
     k1 = karr[ik_last + m];
@@ -1365,8 +548,6 @@ mlib_status mlib_convMxN_8nw_f(mlib_image       *dst,
     buff3 = buff[3] + doff;
     vis_write_gsr(gsr_scale + off);
 
-#ifndef CONV_INDEX
-
     if (jk_size == 1) {
       dp = ((mlib_addr) dl & 7) ? buffe : (mlib_d64 *) dl;
 
@@ -1652,200 +833,6 @@ mlib_status mlib_convMxN_8nw_f(mlib_image       *dst,
         mlib_ImageCopy_na((void *)buffe, dl, xsize);
     }
 
-#else /* CONV_INDEX */
-
-    if (jk_size == 1) {
-      vis_write_gsr(gsr_scale + 7);
-
-#pragma pipeloop(0)
-      for (i = 0; i < dsize; i += 3) {
-        mlib_d64 d00, d01, d02, d03, d04, d05;
-        mlib_d64 d10, d11, d12, d13, d14, d15;
-        mlib_d64 d0, d1, d2, d3, d4, d5;
-        mlib_d64 s00 = buff0[i];
-        mlib_d64 s01 = buff0[i + 1];
-        mlib_d64 s02 = buff0[i + 2];
-
-        d00 = vis_fmul8x16au(vis_read_hi(s00), k0);
-        d01 = vis_fmul8x16au(vis_read_lo(s00), k0);
-        d02 = vis_fmul8x16au(vis_read_hi(s01), k0);
-        d03 = vis_fmul8x16au(vis_read_lo(s01), k0);
-        d04 = vis_fmul8x16au(vis_read_hi(s02), k0);
-        d05 = vis_fmul8x16au(vis_read_lo(s02), k0);
-
-        d0 = buffd[2 * i];
-        d1 = buffd[2 * i + 1];
-        d2 = buffd[2 * i + 2];
-        d3 = buffd[2 * i + 3];
-        d4 = buffd[2 * i + 4];
-        d5 = buffd[2 * i + 5];
-        d0 = vis_fpadd16(d0, d00);
-        d1 = vis_fpadd16(d1, d01);
-        d2 = vis_fpadd16(d2, d02);
-        d3 = vis_fpadd16(d3, d03);
-        d4 = vis_fpadd16(d4, d04);
-        d5 = vis_fpadd16(d5, d05);
-
-        buffe[i] = vis_fpack16_pair(d0, d1);
-        buffe[i + 1] = vis_fpack16_pair(d2, d3);
-        buffe[i + 2] = vis_fpack16_pair(d4, d5);
-
-        buffd[2 * i] = drnd;
-        buffd[2 * i + 1] = drnd;
-        buffd[2 * i + 2] = drnd;
-        buffd[2 * i + 3] = drnd;
-        buffd[2 * i + 4] = drnd;
-        buffd[2 * i + 5] = drnd;
-
-        LOAD_SRC();
-      }
-    }
-    else if (jk_size == 2) {
-      vis_write_gsr(gsr_scale + 7);
-
-#pragma pipeloop(0)
-      for (i = 0; i < dsize; i += 3) {
-        mlib_d64 d00, d01, d02, d03, d04, d05;
-        mlib_d64 d10, d11, d12, d13, d14, d15;
-        mlib_d64 d0, d1, d2, d3, d4, d5;
-        mlib_d64 s00 = buff0[i];
-        mlib_d64 s01 = buff0[i + 1];
-        mlib_d64 s02 = buff0[i + 2];
-        mlib_d64 s10 = buff1[i];
-        mlib_d64 s11 = buff1[i + 1];
-        mlib_d64 s12 = buff1[i + 2];
-
-        d00 = vis_fmul8x16au(vis_read_hi(s00), k0);
-        d01 = vis_fmul8x16au(vis_read_lo(s00), k0);
-        d02 = vis_fmul8x16au(vis_read_hi(s01), k0);
-        d03 = vis_fmul8x16au(vis_read_lo(s01), k0);
-        d04 = vis_fmul8x16au(vis_read_hi(s02), k0);
-        d05 = vis_fmul8x16au(vis_read_lo(s02), k0);
-        d10 = vis_fmul8x16au(vis_read_hi(s10), k1);
-        d11 = vis_fmul8x16au(vis_read_lo(s10), k1);
-        d12 = vis_fmul8x16au(vis_read_hi(s11), k1);
-        d13 = vis_fmul8x16au(vis_read_lo(s11), k1);
-        d14 = vis_fmul8x16au(vis_read_hi(s12), k1);
-        d15 = vis_fmul8x16au(vis_read_lo(s12), k1);
-
-        d0 = buffd[2 * i];
-        d1 = buffd[2 * i + 1];
-        d2 = buffd[2 * i + 2];
-        d3 = buffd[2 * i + 3];
-        d4 = buffd[2 * i + 4];
-        d5 = buffd[2 * i + 5];
-        d0 = vis_fpadd16(d0, d00);
-        d0 = vis_fpadd16(d0, d10);
-        d1 = vis_fpadd16(d1, d01);
-        d1 = vis_fpadd16(d1, d11);
-        d2 = vis_fpadd16(d2, d02);
-        d2 = vis_fpadd16(d2, d12);
-        d3 = vis_fpadd16(d3, d03);
-        d3 = vis_fpadd16(d3, d13);
-        d4 = vis_fpadd16(d4, d04);
-        d4 = vis_fpadd16(d4, d14);
-        d5 = vis_fpadd16(d5, d05);
-        d5 = vis_fpadd16(d5, d15);
-
-        buffe[i] = vis_fpack16_pair(d0, d1);
-        buffe[i + 1] = vis_fpack16_pair(d2, d3);
-        buffe[i + 2] = vis_fpack16_pair(d4, d5);
-
-        buffd[2 * i] = drnd;
-        buffd[2 * i + 1] = drnd;
-        buffd[2 * i + 2] = drnd;
-        buffd[2 * i + 3] = drnd;
-        buffd[2 * i + 4] = drnd;
-        buffd[2 * i + 5] = drnd;
-
-        LOAD_SRC();
-      }
-    }
-    else {                                  /* if (jk_size == 3) */
-
-      vis_write_gsr(gsr_scale + 7);
-
-#pragma pipeloop(0)
-      for (i = 0; i < dsize; i += 3) {
-        mlib_d64 d00, d01, d02, d03, d04, d05;
-        mlib_d64 d10, d11, d12, d13, d14, d15;
-        mlib_d64 d20, d21, d22, d23, d24, d25;
-        mlib_d64 d0, d1, d2, d3, d4, d5;
-        mlib_d64 s00 = buff0[i];
-        mlib_d64 s01 = buff0[i + 1];
-        mlib_d64 s02 = buff0[i + 2];
-        mlib_d64 s10 = buff1[i];
-        mlib_d64 s11 = buff1[i + 1];
-        mlib_d64 s12 = buff1[i + 2];
-        mlib_d64 s20 = buff2[i];
-        mlib_d64 s21 = buff2[i + 1];
-        mlib_d64 s22 = buff2[i + 2];
-
-        d00 = vis_fmul8x16au(vis_read_hi(s00), k0);
-        d01 = vis_fmul8x16au(vis_read_lo(s00), k0);
-        d02 = vis_fmul8x16au(vis_read_hi(s01), k0);
-        d03 = vis_fmul8x16au(vis_read_lo(s01), k0);
-        d04 = vis_fmul8x16au(vis_read_hi(s02), k0);
-        d05 = vis_fmul8x16au(vis_read_lo(s02), k0);
-        d10 = vis_fmul8x16au(vis_read_hi(s10), k1);
-        d11 = vis_fmul8x16au(vis_read_lo(s10), k1);
-        d12 = vis_fmul8x16au(vis_read_hi(s11), k1);
-        d13 = vis_fmul8x16au(vis_read_lo(s11), k1);
-        d14 = vis_fmul8x16au(vis_read_hi(s12), k1);
-        d15 = vis_fmul8x16au(vis_read_lo(s12), k1);
-        d20 = vis_fmul8x16au(vis_read_hi(s20), k2);
-        d21 = vis_fmul8x16au(vis_read_lo(s20), k2);
-        d22 = vis_fmul8x16au(vis_read_hi(s21), k2);
-        d23 = vis_fmul8x16au(vis_read_lo(s21), k2);
-        d24 = vis_fmul8x16au(vis_read_hi(s22), k2);
-        d25 = vis_fmul8x16au(vis_read_lo(s22), k2);
-
-        d0 = buffd[2 * i];
-        d1 = buffd[2 * i + 1];
-        d2 = buffd[2 * i + 2];
-        d3 = buffd[2 * i + 3];
-        d4 = buffd[2 * i + 4];
-        d5 = buffd[2 * i + 5];
-        d0 = vis_fpadd16(d0, d00);
-        d0 = vis_fpadd16(d0, d10);
-        d0 = vis_fpadd16(d0, d20);
-        d1 = vis_fpadd16(d1, d01);
-        d1 = vis_fpadd16(d1, d11);
-        d1 = vis_fpadd16(d1, d21);
-        d2 = vis_fpadd16(d2, d02);
-        d2 = vis_fpadd16(d2, d12);
-        d2 = vis_fpadd16(d2, d22);
-        d3 = vis_fpadd16(d3, d03);
-        d3 = vis_fpadd16(d3, d13);
-        d3 = vis_fpadd16(d3, d23);
-        d4 = vis_fpadd16(d4, d04);
-        d4 = vis_fpadd16(d4, d14);
-        d4 = vis_fpadd16(d4, d24);
-        d5 = vis_fpadd16(d5, d05);
-        d5 = vis_fpadd16(d5, d15);
-        d5 = vis_fpadd16(d5, d25);
-
-        buffe[i] = vis_fpack16_pair(d0, d1);
-        buffe[i + 1] = vis_fpack16_pair(d2, d3);
-        buffe[i + 2] = vis_fpack16_pair(d4, d5);
-
-        buffd[2 * i] = drnd;
-        buffd[2 * i + 1] = drnd;
-        buffd[2 * i + 2] = drnd;
-        buffd[2 * i + 3] = drnd;
-        buffd[2 * i + 4] = drnd;
-        buffd[2 * i + 5] = drnd;
-
-        LOAD_SRC();
-      }
-    }
-
-#endif /* CONV_INDEX */
-
-#ifdef CONV_INDEX
-    ColorTrue2IndexLine((void *)buffe, dl, wid, colormap);
-#endif /* CONV_INDEX */
-
     sl += sll;
     dl += dll;
 

From 7a40b8d5f7c69da28c5ebbbddfebdc84f08adf65 Mon Sep 17 00:00:00 2001
From: Dmitry Markov <dmarkov@openjdk.org>
Date: Fri, 13 May 2016 12:44:53 +0300
Subject: [PATCH 087/228] 8155001: SystemTray.remove() leaks GDI Objects in
 Windows

Reviewed-by: serb, alexp
---
 .../windows/native/libawt/windows/awt_TrayIcon.cpp          | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.cpp
index 56280a583ac..b7ec441d556 100644
--- a/jdk/src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.cpp
+++ b/jdk/src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.cpp
@@ -93,6 +93,12 @@ AwtTrayIcon::~AwtTrayIcon() {
 
 void AwtTrayIcon::Dispose() {
     SendTrayMessage(NIM_DELETE);
+
+    // Destroy the icon to avoid leak of GDI objects
+    if (m_nid.hIcon != NULL) {
+        ::DestroyIcon(m_nid.hIcon);
+    }
+
     UnlinkObjects();
 
     if (--sm_instCount == 0) {

From cb6496c297a062918c24dcf302ad17ba5604bb26 Mon Sep 17 00:00:00 2001
From: Martin Doerr <mdoerr@openjdk.org>
Date: Fri, 13 May 2016 22:21:54 +0300
Subject: [PATCH 088/228] 8141635: Implement VarHandles/Unsafe intrinsics on
 POWER

Reviewed-by: shade, kvn, simonis
---
 .../src/cpu/ppc/vm/c1_LIRAssembler_ppc.cpp    |  10 +-
 .../src/cpu/ppc/vm/c1_LIRGenerator_ppc.cpp    |   6 +-
 hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp |  26 +-
 hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp |   4 +-
 hotspot/src/cpu/ppc/vm/ppc.ad                 | 349 +++++++++++++++++-
 hotspot/src/share/vm/opto/library_call.cpp    |  10 +-
 6 files changed, 381 insertions(+), 24 deletions(-)

diff --git a/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.cpp b/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.cpp
index ed381b9d631..559f68709bf 100644
--- a/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.cpp
+++ b/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.cpp
@@ -2563,15 +2563,21 @@ void LIR_Assembler::emit_compare_and_swap(LIR_OpCompareAndSwap* op) {
 
   if (is_64bit) {
     __ cmpxchgd(BOOL_RESULT, /*current_value=*/R0, cmp_value, new_value, addr,
-                MacroAssembler::MemBarFenceAfter,
+                MacroAssembler::MemBarNone,
                 MacroAssembler::cmpxchgx_hint_atomic_update(),
                 noreg, NULL, /*check without ldarx first*/true);
   } else {
     __ cmpxchgw(BOOL_RESULT, /*current_value=*/R0, cmp_value, new_value, addr,
-                MacroAssembler::MemBarFenceAfter,
+                MacroAssembler::MemBarNone,
                 MacroAssembler::cmpxchgx_hint_atomic_update(),
                 noreg, /*check without ldarx first*/true);
   }
+
+  if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+    __ isync();
+  } else {
+    __ sync();
+  }
 }
 
 
diff --git a/hotspot/src/cpu/ppc/vm/c1_LIRGenerator_ppc.cpp b/hotspot/src/cpu/ppc/vm/c1_LIRGenerator_ppc.cpp
index c3225419cc8..c8ebff099f9 100644
--- a/hotspot/src/cpu/ppc/vm/c1_LIRGenerator_ppc.cpp
+++ b/hotspot/src/cpu/ppc/vm/c1_LIRGenerator_ppc.cpp
@@ -1353,7 +1353,11 @@ void LIRGenerator::do_UnsafeGetAndSetObject(UnsafeGetAndSetObject* x) {
     }
   }
 
-  __ membar();
+  if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+    __ membar_acquire();
+  } else {
+    __ membar();
+  }
 }
 
 
diff --git a/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp b/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
index a18254f2f5b..b8ad532bc3c 100644
--- a/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
+++ b/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
@@ -1404,7 +1404,7 @@ address MacroAssembler::get_stack_bang_address(int instruction, void *ucontext)
 void MacroAssembler::cmpxchgw(ConditionRegister flag, Register dest_current_value,
                               Register compare_value, Register exchange_value,
                               Register addr_base, int semantics, bool cmpxchgx_hint,
-                              Register int_flag_success, bool contention_hint) {
+                              Register int_flag_success, bool contention_hint, bool weak) {
   Label retry;
   Label failed;
   Label done;
@@ -1414,6 +1414,7 @@ void MacroAssembler::cmpxchgw(ConditionRegister flag, Register dest_current_valu
   bool use_result_reg    = (int_flag_success != noreg);
   bool preset_result_reg = (int_flag_success != dest_current_value && int_flag_success != compare_value &&
                             int_flag_success != exchange_value && int_flag_success != addr_base);
+  assert(!weak || flag == CCR0, "weak only supported with CCR0");
 
   if (use_result_reg && preset_result_reg) {
     li(int_flag_success, 0); // preset (assume cas failed)
@@ -1445,10 +1446,12 @@ void MacroAssembler::cmpxchgw(ConditionRegister flag, Register dest_current_valu
   // fall through    => (flag == eq), (dest_current_value == compare_value)
 
   stwcx_(exchange_value, addr_base);
-  if (UseStaticBranchPredictionInCompareAndSwapPPC64) {
-    bne_predict_not_taken(CCR0, retry); // StXcx_ sets CCR0.
-  } else {
-    bne(                  CCR0, retry); // StXcx_ sets CCR0.
+  if (!weak || use_result_reg) {
+    if (UseStaticBranchPredictionInCompareAndSwapPPC64) {
+      bne_predict_not_taken(CCR0, weak ? failed : retry); // StXcx_ sets CCR0.
+    } else {
+      bne(                  CCR0, weak ? failed : retry); // StXcx_ sets CCR0.
+    }
   }
   // fall through    => (flag == eq), (dest_current_value == compare_value), (swapped)
 
@@ -1498,7 +1501,7 @@ void MacroAssembler::cmpxchgw(ConditionRegister flag, Register dest_current_valu
 void MacroAssembler::cmpxchgd(ConditionRegister flag,
                               Register dest_current_value, RegisterOrConstant compare_value, Register exchange_value,
                               Register addr_base, int semantics, bool cmpxchgx_hint,
-                              Register int_flag_success, Label* failed_ext, bool contention_hint) {
+                              Register int_flag_success, Label* failed_ext, bool contention_hint, bool weak) {
   Label retry;
   Label failed_int;
   Label& failed = (failed_ext != NULL) ? *failed_ext : failed_int;
@@ -1508,6 +1511,7 @@ void MacroAssembler::cmpxchgd(ConditionRegister flag,
   bool use_result_reg    = (int_flag_success!=noreg);
   bool preset_result_reg = (int_flag_success!=dest_current_value && int_flag_success!=compare_value.register_or_noreg() &&
                             int_flag_success!=exchange_value && int_flag_success!=addr_base);
+  assert(!weak || flag == CCR0, "weak only supported with CCR0");
   assert(int_flag_success == noreg || failed_ext == NULL, "cannot have both");
 
   if (use_result_reg && preset_result_reg) {
@@ -1538,10 +1542,12 @@ void MacroAssembler::cmpxchgd(ConditionRegister flag,
   }
 
   stdcx_(exchange_value, addr_base);
-  if (UseStaticBranchPredictionInCompareAndSwapPPC64) {
-    bne_predict_not_taken(CCR0, retry); // stXcx_ sets CCR0
-  } else {
-    bne(                  CCR0, retry); // stXcx_ sets CCR0
+  if (!weak || use_result_reg || failed_ext) {
+    if (UseStaticBranchPredictionInCompareAndSwapPPC64) {
+      bne_predict_not_taken(CCR0, weak ? failed : retry); // stXcx_ sets CCR0
+    } else {
+      bne(                  CCR0, weak ? failed : retry); // stXcx_ sets CCR0
+    }
   }
 
   // result in register (must do this at the end because int_flag_success can be the same register as one above)
diff --git a/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp b/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
index 180a1ddbae9..0f39e4a3003 100644
--- a/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
+++ b/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
@@ -430,11 +430,11 @@ class MacroAssembler: public Assembler {
   void cmpxchgw(ConditionRegister flag,
                 Register dest_current_value, Register compare_value, Register exchange_value, Register addr_base,
                 int semantics, bool cmpxchgx_hint = false,
-                Register int_flag_success = noreg, bool contention_hint = false);
+                Register int_flag_success = noreg, bool contention_hint = false, bool weak = false);
   void cmpxchgd(ConditionRegister flag,
                 Register dest_current_value, RegisterOrConstant compare_value, Register exchange_value,
                 Register addr_base, int semantics, bool cmpxchgx_hint = false,
-                Register int_flag_success = noreg, Label* failed = NULL, bool contention_hint = false);
+                Register int_flag_success = noreg, Label* failed = NULL, bool contention_hint = false, bool weak = false);
 
   // interface method calling
   void lookup_interface_method(Register recv_klass,
diff --git a/hotspot/src/cpu/ppc/vm/ppc.ad b/hotspot/src/cpu/ppc/vm/ppc.ad
index 0dc5a4d2b45..d8c36a34f5d 100644
--- a/hotspot/src/cpu/ppc/vm/ppc.ad
+++ b/hotspot/src/cpu/ppc/vm/ppc.ad
@@ -3083,7 +3083,11 @@ encode %{
       __ bne(                  CCR0, Lretry);
     }
     if (RegCollision) __ subf(Rres, Rsrc, Rtmp);
-    __ fence();
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      __ sync();
+    }
   %}
 
   enc_class enc_GetAndAddL(iRegLdst res, iRegPdst mem_ptr, iRegLsrc src) %{
@@ -3108,7 +3112,11 @@ encode %{
       __ bne(                  CCR0, Lretry);
     }
     if (RegCollision) __ subf(Rres, Rsrc, Rtmp);
-    __ fence();
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      __ sync();
+    }
   %}
 
   enc_class enc_GetAndSetI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src) %{
@@ -3132,7 +3140,11 @@ encode %{
       __ bne(                  CCR0, Lretry);
     }
     if (RegCollision) __ mr(Rres, Rtmp);
-    __ fence();
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      __ sync();
+    }
   %}
 
   enc_class enc_GetAndSetL(iRegLdst res, iRegPdst mem_ptr, iRegLsrc src) %{
@@ -3156,7 +3168,11 @@ encode %{
       __ bne(                  CCR0, Lretry);
     }
     if (RegCollision) __ mr(Rres, Rtmp);
-    __ fence();
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      __ sync();
+    }
   %}
 
   // This enc_class is needed so that scheduler gets proper
@@ -7553,6 +7569,8 @@ instruct loadPLocked(iRegPdst dst, memory mem) %{
 // (CompareAndSwap ...)" or "If (CmpI (CompareAndSwap ..))"  cannot be
 // matched.
 
+// Strong versions:
+
 instruct compareAndSwapI_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
   match(Set res (CompareAndSwapI mem_ptr (Binary src1 src2)));
   effect(TEMP cr0);
@@ -7562,8 +7580,13 @@ instruct compareAndSwapI_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc
     // TODO: PPC port $archOpcode(ppc64Opcode_compound);
     // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
     __ cmpxchgw(CCR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
-                MacroAssembler::MemBarFenceAfter, MacroAssembler::cmpxchgx_hint_atomic_update(),
+                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
                 $res$$Register, true);
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      __ sync();
+    }
   %}
   ins_pipe(pipe_class_default);
 %}
@@ -7577,8 +7600,13 @@ instruct compareAndSwapN_regP_regN_regN(iRegIdst res, iRegPdst mem_ptr, iRegNsrc
     // TODO: PPC port $archOpcode(ppc64Opcode_compound);
     // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
     __ cmpxchgw(CCR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
-                MacroAssembler::MemBarFenceAfter, MacroAssembler::cmpxchgx_hint_atomic_update(),
+                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
                 $res$$Register, true);
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      __ sync();
+    }
   %}
   ins_pipe(pipe_class_default);
 %}
@@ -7592,8 +7620,13 @@ instruct compareAndSwapL_regP_regL_regL(iRegIdst res, iRegPdst mem_ptr, iRegLsrc
     // TODO: PPC port $archOpcode(ppc64Opcode_compound);
     // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
     __ cmpxchgd(CCR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
-                MacroAssembler::MemBarFenceAfter, MacroAssembler::cmpxchgx_hint_atomic_update(),
+                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
                 $res$$Register, NULL, true);
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      __ sync();
+    }
   %}
   ins_pipe(pipe_class_default);
 %}
@@ -7607,12 +7640,312 @@ instruct compareAndSwapP_regP_regP_regP(iRegIdst res, iRegPdst mem_ptr, iRegPsrc
     // TODO: PPC port $archOpcode(ppc64Opcode_compound);
     // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
     __ cmpxchgd(CCR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
-                MacroAssembler::MemBarFenceAfter, MacroAssembler::cmpxchgx_hint_atomic_update(),
+                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
                 $res$$Register, NULL, true);
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      __ sync();
+    }
   %}
   ins_pipe(pipe_class_default);
 %}
 
+// Weak versions:
+
+instruct weakCompareAndSwapI_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (WeakCompareAndSwapI mem_ptr (Binary src1 src2)));
+  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst);
+  effect(TEMP cr0);
+  format %{ "weak CMPXCHGW $res, $mem_ptr, $src1, $src2; as bool" %}
+  // Variable size: instruction count smaller if regs are disjoint.
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgw(CCR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
+                MacroAssembler::MemBarNone,
+                MacroAssembler::cmpxchgx_hint_atomic_update(), $res$$Register, true, /*weak*/ true);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct weakCompareAndSwapI_acq_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (WeakCompareAndSwapI mem_ptr (Binary src1 src2)));
+  predicate(((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst);
+  effect(TEMP cr0);
+  format %{ "weak CMPXCHGW acq $res, $mem_ptr, $src1, $src2; as bool" %}
+  // Variable size: instruction count smaller if regs are disjoint.
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    // Acquire only needed in successful case. Weak node is allowed to report unsuccessful in additional rare cases and
+    // value is never passed to caller.
+    __ cmpxchgw(CCR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
+                support_IRIW_for_not_multiple_copy_atomic_cpu ? MacroAssembler::MemBarAcq : MacroAssembler::MemBarFenceAfter,
+                MacroAssembler::cmpxchgx_hint_atomic_update(), $res$$Register, true, /*weak*/ true);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct weakCompareAndSwapN_regP_regN_regN(iRegIdst res, iRegPdst mem_ptr, iRegNsrc src1, iRegNsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (WeakCompareAndSwapN mem_ptr (Binary src1 src2)));
+  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst);
+  effect(TEMP cr0);
+  format %{ "weak CMPXCHGW $res, $mem_ptr, $src1, $src2; as bool" %}
+  // Variable size: instruction count smaller if regs are disjoint.
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgw(CCR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
+                MacroAssembler::MemBarNone,
+                MacroAssembler::cmpxchgx_hint_atomic_update(), $res$$Register, true, /*weak*/ true);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct weakCompareAndSwapN_acq_regP_regN_regN(iRegIdst res, iRegPdst mem_ptr, iRegNsrc src1, iRegNsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (WeakCompareAndSwapN mem_ptr (Binary src1 src2)));
+  predicate(((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst);
+  effect(TEMP cr0);
+  format %{ "weak CMPXCHGW acq $res, $mem_ptr, $src1, $src2; as bool" %}
+  // Variable size: instruction count smaller if regs are disjoint.
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    // Acquire only needed in successful case. Weak node is allowed to report unsuccessful in additional rare cases and
+    // value is never passed to caller.
+    __ cmpxchgw(CCR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
+                support_IRIW_for_not_multiple_copy_atomic_cpu ? MacroAssembler::MemBarAcq : MacroAssembler::MemBarFenceAfter,
+                MacroAssembler::cmpxchgx_hint_atomic_update(), $res$$Register, true, /*weak*/ true);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct weakCompareAndSwapL_regP_regL_regL(iRegIdst res, iRegPdst mem_ptr, iRegLsrc src1, iRegLsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (WeakCompareAndSwapL mem_ptr (Binary src1 src2)));
+  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst);
+  effect(TEMP cr0);
+  format %{ "weak CMPXCHGD $res, $mem_ptr, $src1, $src2; as bool" %}
+  // Variable size: instruction count smaller if regs are disjoint.
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    // value is never passed to caller.
+    __ cmpxchgd(CCR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
+                MacroAssembler::MemBarNone,
+                MacroAssembler::cmpxchgx_hint_atomic_update(), $res$$Register, NULL, true, /*weak*/ true);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct weakCompareAndSwapL_acq_regP_regL_regL(iRegIdst res, iRegPdst mem_ptr, iRegLsrc src1, iRegLsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (WeakCompareAndSwapL mem_ptr (Binary src1 src2)));
+  predicate(((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst);
+  effect(TEMP cr0);
+  format %{ "weak CMPXCHGD acq $res, $mem_ptr, $src1, $src2; as bool" %}
+  // Variable size: instruction count smaller if regs are disjoint.
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    // Acquire only needed in successful case. Weak node is allowed to report unsuccessful in additional rare cases and
+    // value is never passed to caller.
+    __ cmpxchgd(CCR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
+                support_IRIW_for_not_multiple_copy_atomic_cpu ? MacroAssembler::MemBarAcq : MacroAssembler::MemBarFenceAfter,
+                MacroAssembler::cmpxchgx_hint_atomic_update(), $res$$Register, NULL, true, /*weak*/ true);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct weakCompareAndSwapP_regP_regP_regP(iRegIdst res, iRegPdst mem_ptr, iRegPsrc src1, iRegPsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (WeakCompareAndSwapP mem_ptr (Binary src1 src2)));
+  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst);
+  effect(TEMP cr0);
+  format %{ "weak CMPXCHGD $res, $mem_ptr, $src1, $src2; as bool; ptr" %}
+  // Variable size: instruction count smaller if regs are disjoint.
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgd(CCR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
+                MacroAssembler::MemBarNone,
+                MacroAssembler::cmpxchgx_hint_atomic_update(), $res$$Register, NULL, true, /*weak*/ true);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct weakCompareAndSwapP_acq_regP_regP_regP(iRegIdst res, iRegPdst mem_ptr, iRegPsrc src1, iRegPsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (WeakCompareAndSwapP mem_ptr (Binary src1 src2)));
+  predicate(((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst);
+  effect(TEMP cr0);
+  format %{ "weak CMPXCHGD acq $res, $mem_ptr, $src1, $src2; as bool; ptr" %}
+  // Variable size: instruction count smaller if regs are disjoint.
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    // Acquire only needed in successful case. Weak node is allowed to report unsuccessful in additional rare cases and
+    // value is never passed to caller.
+    __ cmpxchgd(CCR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
+                support_IRIW_for_not_multiple_copy_atomic_cpu ? MacroAssembler::MemBarAcq : MacroAssembler::MemBarFenceAfter,
+                MacroAssembler::cmpxchgx_hint_atomic_update(), $res$$Register, NULL, true, /*weak*/ true);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+// CompareAndExchange
+
+instruct compareAndExchangeI_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (CompareAndExchangeI mem_ptr (Binary src1 src2)));
+  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst);
+  effect(TEMP_DEF res, TEMP cr0);
+  format %{ "CMPXCHGW $res, $mem_ptr, $src1, $src2; as int" %}
+  // Variable size: instruction count smaller if regs are disjoint.
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgw(CCR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
+                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
+                noreg, true);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct compareAndExchangeI_acq_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (CompareAndExchangeI mem_ptr (Binary src1 src2)));
+  predicate(((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst);
+  effect(TEMP_DEF res, TEMP cr0);
+  format %{ "CMPXCHGW acq $res, $mem_ptr, $src1, $src2; as int" %}
+  // Variable size: instruction count smaller if regs are disjoint.
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgw(CCR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
+                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
+                noreg, true);
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      // isync would be sufficient in case of CompareAndExchangeAcquire, but we currently don't optimize for that.
+      __ sync();
+    }
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct compareAndExchangeN_regP_regN_regN(iRegNdst res, iRegPdst mem_ptr, iRegNsrc src1, iRegNsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (CompareAndExchangeN mem_ptr (Binary src1 src2)));
+  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst);
+  effect(TEMP_DEF res, TEMP cr0);
+  format %{ "CMPXCHGW $res, $mem_ptr, $src1, $src2; as narrow oop" %}
+  // Variable size: instruction count smaller if regs are disjoint.
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgw(CCR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
+                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
+                noreg, true);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct compareAndExchangeN_acq_regP_regN_regN(iRegNdst res, iRegPdst mem_ptr, iRegNsrc src1, iRegNsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (CompareAndExchangeN mem_ptr (Binary src1 src2)));
+  predicate(((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst);
+  effect(TEMP_DEF res, TEMP cr0);
+  format %{ "CMPXCHGW acq $res, $mem_ptr, $src1, $src2; as narrow oop" %}
+  // Variable size: instruction count smaller if regs are disjoint.
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgw(CCR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
+                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
+                noreg, true);
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      // isync would be sufficient in case of CompareAndExchangeAcquire, but we currently don't optimize for that.
+      __ sync();
+    }
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct compareAndExchangeL_regP_regL_regL(iRegLdst res, iRegPdst mem_ptr, iRegLsrc src1, iRegLsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (CompareAndExchangeL mem_ptr (Binary src1 src2)));
+  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst);
+  effect(TEMP_DEF res, TEMP cr0);
+  format %{ "CMPXCHGD $res, $mem_ptr, $src1, $src2; as long" %}
+  // Variable size: instruction count smaller if regs are disjoint.
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgd(CCR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
+                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
+                noreg, NULL, true);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct compareAndExchangeL_acq_regP_regL_regL(iRegLdst res, iRegPdst mem_ptr, iRegLsrc src1, iRegLsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (CompareAndExchangeL mem_ptr (Binary src1 src2)));
+  predicate(((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst);
+  effect(TEMP_DEF res, TEMP cr0);
+  format %{ "CMPXCHGD acq $res, $mem_ptr, $src1, $src2; as long" %}
+  // Variable size: instruction count smaller if regs are disjoint.
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgd(CCR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
+                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
+                noreg, NULL, true);
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      // isync would be sufficient in case of CompareAndExchangeAcquire, but we currently don't optimize for that.
+      __ sync();
+    }
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct compareAndExchangeP_regP_regP_regP(iRegPdst res, iRegPdst mem_ptr, iRegPsrc src1, iRegPsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (CompareAndExchangeP mem_ptr (Binary src1 src2)));
+  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst);
+  effect(TEMP_DEF res, TEMP cr0);
+  format %{ "CMPXCHGD $res, $mem_ptr, $src1, $src2; as ptr; ptr" %}
+  // Variable size: instruction count smaller if regs are disjoint.
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgd(CCR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
+                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
+                noreg, NULL, true);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct compareAndExchangeP_acq_regP_regP_regP(iRegPdst res, iRegPdst mem_ptr, iRegPsrc src1, iRegPsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (CompareAndExchangeP mem_ptr (Binary src1 src2)));
+  predicate(((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst);
+  effect(TEMP_DEF res, TEMP cr0);
+  format %{ "CMPXCHGD acq $res, $mem_ptr, $src1, $src2; as ptr; ptr" %}
+  // Variable size: instruction count smaller if regs are disjoint.
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgd(CCR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
+                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
+                noreg, NULL, true);
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      // isync would be sufficient in case of CompareAndExchangeAcquire, but we currently don't optimize for that.
+      __ sync();
+    }
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+// Special RMW
+
 instruct getAndAddI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src, flagsRegCR0 cr0) %{
   match(Set res (GetAndAddI mem_ptr src));
   effect(TEMP cr0);
diff --git a/hotspot/src/share/vm/opto/library_call.cpp b/hotspot/src/share/vm/opto/library_call.cpp
index 5c14d3a7591..87636e8f3a3 100644
--- a/hotspot/src/share/vm/opto/library_call.cpp
+++ b/hotspot/src/share/vm/opto/library_call.cpp
@@ -2697,6 +2697,7 @@ bool LibraryCallKit::inline_unsafe_load_store(const BasicType type, const LoadSt
       assert(sig->type_at(0)->basic_type() == T_OBJECT, "get and set base is object");
       assert(sig->type_at(1)->basic_type() == T_LONG, "get and set offset is long");
       assert(sig->type_at(2)->basic_type() == type, "get and set must take expected type as new value/delta");
+      assert(access_kind == Volatile, "mo is not passed to intrinsic nodes in current implementation");
 #endif // ASSERT
         break;
       }
@@ -2822,9 +2823,15 @@ bool LibraryCallKit::inline_unsafe_load_store(const BasicType type, const LoadSt
     case Acquire:
       break;
     case Release:
-    case Volatile:
       insert_mem_bar(Op_MemBarRelease);
       break;
+    case Volatile:
+      if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+        insert_mem_bar(Op_MemBarVolatile);
+      } else {
+        insert_mem_bar(Op_MemBarRelease);
+      }
+      break;
     default:
       ShouldNotReachHere();
   }
@@ -3035,6 +3042,7 @@ bool LibraryCallKit::inline_unsafe_load_store(const BasicType type, const LoadSt
     case Acquire:
     case Volatile:
       insert_mem_bar(Op_MemBarAcquire);
+      // !support_IRIW_for_not_multiple_copy_atomic_cpu handled in platform code
       break;
     default:
       ShouldNotReachHere();

From 173e8139c034d550e56a31da7ad122375f9c8b2b Mon Sep 17 00:00:00 2001
From: Dmitrij Pochepko <dpochepk@openjdk.org>
Date: Mon, 16 May 2016 16:54:09 +0300
Subject: [PATCH 089/228] 8139703: [TESTBUG]
 compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest fails using -Xcomp

Reviewed-by: kvn
---
 .../MaterializeVirtualObjectTest.java         | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/hotspot/test/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java b/hotspot/test/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java
index 43a7631617b..bba72d8b8d2 100644
--- a/hotspot/test/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java
+++ b/hotspot/test/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java
@@ -33,13 +33,12 @@
  *          jdk.vm.ci/jdk.vm.ci.hotspot
  *          jdk.vm.ci/jdk.vm.ci.code
  *          jdk.vm.ci/jdk.vm.ci.meta
- * @ignore 8139703
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  * @build compiler.jvmci.compilerToVM.MaterializeVirtualObjectTest
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -Xbootclasspath/a:.
+ * @run main/othervm -Xmixed -Xbootclasspath/a:.
  *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
  *                   -XX:CompileCommand=exclude,*::check
@@ -47,7 +46,7 @@
  *                   -Xbatch
  *                   -Dcompiler.jvmci.compilerToVM.MaterializeVirtualObjectTest.invalidate=false
  *                   compiler.jvmci.compilerToVM.MaterializeVirtualObjectTest
- * @run main/othervm -Xbootclasspath/a:.
+ * @run main/othervm -Xmixed -Xbootclasspath/a:.
  *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
  *                   -XX:CompileCommand=exclude,*::check
@@ -67,24 +66,27 @@ import jdk.test.lib.Asserts;
 
 import compiler.jvmci.common.CTVMUtilities;
 import compiler.testlibrary.CompilerUtils;
+import compiler.whitebox.CompilerWhiteBoxTest;
 
 import sun.hotspot.WhiteBox;
 
 public class MaterializeVirtualObjectTest {
-    private static final WhiteBox WB = WhiteBox.getWhiteBox();
+    private static final WhiteBox WB;
     private static final Method METHOD;
     private static final ResolvedJavaMethod RESOLVED_METHOD;
-    private static final boolean INVALIDATE = Boolean.getBoolean(
-            "compiler.jvmci.compilerToVM.MaterializeVirtualObjectTest.invalidate");
+    private static final boolean INVALIDATE;
 
     static {
+        WB = WhiteBox.getWhiteBox();
         try {
             METHOD = MaterializeVirtualObjectTest.class.getDeclaredMethod(
-                    "testFrame", String.class, boolean.class);
+                    "testFrame", String.class, int.class);
         } catch (NoSuchMethodException e) {
             throw new Error("Can't get executable for test method", e);
         }
         RESOLVED_METHOD = CTVMUtilities.getResolvedMethod(METHOD);
+        INVALIDATE = Boolean.getBoolean(
+            "compiler.jvmci.compilerToVM.MaterializeVirtualObjectTest.invalidate");
     }
 
     public static void main(String[] args) {
@@ -106,26 +108,29 @@ public class MaterializeVirtualObjectTest {
         System.out.println(getName());
         Asserts.assertFalse(WB.isMethodCompiled(METHOD), getName()
                 + " : method unexpectedly compiled");
-        /* need to call testFrame at least once to be able to compile it, so
-           calling with materialize=false, because testFrame is not compiled */
-        testFrame("someString", /* materialize= */ false);
-        WB.enqueueMethodForCompilation(METHOD, 4);
+        /* need to trigger compilation by multiple method invocations
+           in order to have method profile data to be gathered */
+        boolean isTiered = WB.getBooleanVMFlag("TieredCompilation");
+        int COMPILE_THRESHOLD = isTiered ? CompilerWhiteBoxTest.THRESHOLD
+                : CompilerWhiteBoxTest.THRESHOLD * 2;
+        for (int i = 0; i < COMPILE_THRESHOLD; i++) {
+            testFrame("someString", i);
+        }
         Asserts.assertTrue(WB.isMethodCompiled(METHOD), getName()
                 + "Method unexpectedly not compiled");
-        // calling with materialize=true to materialize compiled testFrame
-        testFrame("someString", /* materialize= */ true);
+        testFrame("someString", CompilerWhiteBoxTest.THRESHOLD);
     }
 
-    private void testFrame(String str, boolean materialize) {
+    private void testFrame(String str, int iteration) {
         Helper helper = new Helper(str);
-        check(materialize);
+        check(iteration);
         Asserts.assertTrue((helper.string != null) && (this != null)
                 && (helper != null), getName() + " : some locals are null");
     }
 
-    private void check(boolean materialize) {
+    private void check(int iteration) {
         // Materialize virtual objects on last invocation
-        if (materialize) {
+        if (iteration == CompilerWhiteBoxTest.THRESHOLD) {
             HotSpotStackFrameReference hsFrame = CompilerToVMHelper
                     .getNextStackFrame(/* topmost frame */ null,
                             new ResolvedJavaMethod[]{

From 9a48b975a1c1495d5f7b025b5b9be5dd1f050008 Mon Sep 17 00:00:00 2001
From: Dmitrij Pochepko <dpochepk@openjdk.org>
Date: Mon, 16 May 2016 16:58:02 +0300
Subject: [PATCH 090/228] 8152341: JVMCI test task: Unit tests for
 MemoryAccessProvider

Reviewed-by: twisti
---
 .../test/MemoryAccessProviderData.java        | 129 ++++++++++++++++++
 .../test/MemoryAccessProviderTest.java        | 115 ++++++++++++++++
 2 files changed, 244 insertions(+)
 create mode 100644 hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderData.java
 create mode 100644 hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderTest.java

diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderData.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderData.java
new file mode 100644
index 00000000000..e07963f191b
--- /dev/null
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderData.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2016, 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.test;
+
+import java.lang.reflect.Field;
+import jdk.vm.ci.meta.JavaConstant;
+import jdk.vm.ci.meta.JavaKind;
+import jdk.vm.ci.runtime.JVMCI;
+import org.testng.annotations.DataProvider;
+import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider;
+import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider;
+import jdk.vm.ci.hotspot.HotSpotResolvedObjectType;
+import jdk.vm.ci.meta.Constant;
+import jdk.internal.misc.Unsafe;
+
+public class MemoryAccessProviderData {
+    private static final Unsafe UNSAFE = getUnsafe();
+    private static final HotSpotConstantReflectionProvider CONSTANT_REFLECTION = (HotSpotConstantReflectionProvider) JVMCI.getRuntime().getHostJVMCIBackend().getConstantReflection();
+    private static final TestClass TEST_OBJECT = new TestClass();
+    private static final JavaConstant TEST_CONSTANT = CONSTANT_REFLECTION.forObject(TEST_OBJECT);
+    private static final JavaConstant TEST_CLASS_CONSTANT = CONSTANT_REFLECTION.forObject(TestClass.class);
+
+    private static Unsafe getUnsafe() {
+        try {
+            Field f = Unsafe.class.getDeclaredField("theUnsafe");
+            f.setAccessible(true);
+            return (Unsafe) f.get(null);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            throw new RuntimeException("Unable to get Unsafe instance.", e);
+        }
+    }
+
+    @DataProvider(name = "positiveObject")
+    public static Object[][] getPositiveObjectJavaKind() {
+        HotSpotJVMCIRuntimeProvider runtime = (HotSpotJVMCIRuntimeProvider) JVMCI.getRuntime();
+        int offset = runtime.getConfig().classMirrorOffset;
+        Constant wrappedKlassPointer = ((HotSpotResolvedObjectType) runtime.fromClass(TestClass.class)).klass();
+        return new Object[][]{new Object[]{JavaKind.Object, wrappedKlassPointer, (long) offset, TEST_CLASS_CONSTANT, 0}};
+    }
+
+    @DataProvider(name = "positivePrimitive")
+    public static Object[][] getPositivePrimitiveJavaKinds() {
+        Field booleanField;
+        Field byteField;
+        Field shortField;
+        Field intField;
+        Field longField;
+        Field floatField;
+        Field doubleField;
+        Field charField;
+        try {
+            booleanField = MemoryAccessProviderData.TestClass.class.getDeclaredField("booleanField");
+            byteField = MemoryAccessProviderData.TestClass.class.getDeclaredField("byteField");
+            shortField = MemoryAccessProviderData.TestClass.class.getDeclaredField("shortField");
+            intField = MemoryAccessProviderData.TestClass.class.getDeclaredField("intField");
+            longField = MemoryAccessProviderData.TestClass.class.getDeclaredField("longField");
+            floatField = MemoryAccessProviderData.TestClass.class.getDeclaredField("floatField");
+            doubleField = MemoryAccessProviderData.TestClass.class.getDeclaredField("doubleField");
+            charField = MemoryAccessProviderData.TestClass.class.getDeclaredField("charField");
+        } catch (NoSuchFieldException e) {
+            throw new Error("TESTBUG: can't find test field " + e, e);
+        }
+        long booleanFieldOffset = UNSAFE.objectFieldOffset(booleanField);
+        long byteFieldOffset = UNSAFE.objectFieldOffset(byteField);
+        long shortFieldOffset = UNSAFE.objectFieldOffset(shortField);
+        long intFieldOffset = UNSAFE.objectFieldOffset(intField);
+        long longFieldOffset = UNSAFE.objectFieldOffset(longField);
+        long floatFieldOffset = UNSAFE.objectFieldOffset(floatField);
+        long doubleFieldOffset = UNSAFE.objectFieldOffset(doubleField);
+        long charFieldOffset = UNSAFE.objectFieldOffset(charField);
+        return new Object[][]{
+                        new Object[]{JavaKind.Boolean, TEST_CONSTANT, booleanFieldOffset,
+                                        JavaConstant.forBoolean(TEST_OBJECT.booleanField), 8},
+                        new Object[]{JavaKind.Byte, TEST_CONSTANT, byteFieldOffset,
+                                        JavaConstant.forByte(TEST_OBJECT.byteField), 8},
+                        new Object[]{JavaKind.Short, TEST_CONSTANT, shortFieldOffset,
+                                        JavaConstant.forShort(TEST_OBJECT.shortField), 16},
+                        new Object[]{JavaKind.Int, TEST_CONSTANT, intFieldOffset,
+                                        JavaConstant.forInt(TEST_OBJECT.intField), 32},
+                        new Object[]{JavaKind.Long, TEST_CONSTANT, longFieldOffset,
+                                        JavaConstant.forLong(TEST_OBJECT.longField), 64},
+                        new Object[]{JavaKind.Float, TEST_CONSTANT, floatFieldOffset,
+                                        JavaConstant.forFloat(TEST_OBJECT.floatField), 32},
+                        new Object[]{JavaKind.Double, TEST_CONSTANT, doubleFieldOffset,
+                                        JavaConstant.forDouble(TEST_OBJECT.doubleField), 64},
+                        new Object[]{JavaKind.Char, TEST_CONSTANT, charFieldOffset,
+                                        JavaConstant.forChar(TEST_OBJECT.charField), 16}};
+    }
+
+    @DataProvider(name = "negative")
+    public static Object[][] getNegativeJavaKinds() {
+        return new Object[][]{
+                        new Object[]{JavaKind.Void, JavaConstant.NULL_POINTER},
+                        new Object[]{JavaKind.Illegal, JavaConstant.INT_1}};
+    }
+
+    private static class TestClass {
+        public final boolean booleanField = true;
+        public final byte byteField = 2;
+        public final short shortField = 3;
+        public final int intField = 4;
+        public final long longField = 5L;
+        public final double doubleField = 6.0d;
+        public final float floatField = 7.0f;
+        public final char charField = 'a';
+        public final String stringField = "abc";
+    }
+}
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderTest.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderTest.java
new file mode 100644
index 00000000000..ff79b14c9a1
--- /dev/null
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderTest.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2016, 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 8152341
+ * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
+ * @library /testlibrary /test/lib /compiler/jvmci/jdk.vm.ci.hotspot.test/src
+ * @modules jdk.vm.ci/jdk.vm.ci.meta
+ *          jdk.vm.ci/jdk.vm.ci.common
+ *          jdk.vm.ci/jdk.vm.ci.runtime
+ *          jdk.vm.ci/jdk.vm.ci.hotspot
+ *          java.base/jdk.internal.misc
+ * @run testng/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
+ *      jdk.vm.ci.hotspot.test.MemoryAccessProviderTest
+ */
+
+package jdk.vm.ci.hotspot.test;
+
+import jdk.vm.ci.meta.Constant;
+import org.testng.annotations.Test;
+import org.testng.Assert;
+import jdk.vm.ci.meta.JavaConstant;
+import jdk.vm.ci.meta.JavaKind;
+import jdk.vm.ci.meta.MemoryAccessProvider;
+import jdk.vm.ci.runtime.JVMCI;
+
+public class MemoryAccessProviderTest {
+    private static final MemoryAccessProvider PROVIDER = JVMCI.getRuntime().getHostJVMCIBackend().getConstantReflection().getMemoryAccessProvider();
+
+    @Test(dataProvider = "positivePrimitive", dataProviderClass = MemoryAccessProviderData.class)
+    public void testPositiveReadUnsafeConstant(JavaKind kind, JavaConstant base, Long offset, Object expected, int bitsCount) {
+        Assert.assertEquals(PROVIDER.readUnsafeConstant(kind, base, offset), expected, "Failed to read constant");
+    }
+
+    @Test(dataProvider = "positivePrimitive", dataProviderClass = MemoryAccessProviderData.class, expectedExceptions = {IllegalArgumentException.class})
+    public void testReadUnsafeConstantNullBase(JavaKind kind, JavaConstant base, Long offset, Object expected, int bitsCount) {
+        PROVIDER.readUnsafeConstant(kind, null, offset);
+    }
+
+    @Test(dataProvider = "positivePrimitive", dataProviderClass = MemoryAccessProviderData.class, expectedExceptions = {IllegalArgumentException.class})
+    public void testNegativeReadUnsafeConstantNullKind(JavaKind kind, JavaConstant base, Long offset, Object expected, int bitsCount) {
+        Assert.assertNull(PROVIDER.readUnsafeConstant(null, base, offset), "Expected null return");
+    }
+
+    @Test(dataProvider = "negative", dataProviderClass = MemoryAccessProviderData.class, expectedExceptions = {IllegalArgumentException.class})
+    public void testNegativeReadUnsafeConstant(JavaKind kind, JavaConstant base) {
+        PROVIDER.readUnsafeConstant(kind, base, 0L);
+    }
+
+    @Test(dataProvider = "positivePrimitive", dataProviderClass = MemoryAccessProviderData.class)
+    public void testPositiveReadPrimitiveConstant(JavaKind kind, Constant base, Long offset, Object expected, int bitsCount) {
+        Assert.assertEquals(PROVIDER.readPrimitiveConstant(kind, base, offset, bitsCount), expected, "Failed to read constant");
+    }
+
+    @Test(dataProvider = "positivePrimitive", dataProviderClass = MemoryAccessProviderData.class, expectedExceptions = {IllegalArgumentException.class})
+    public void testReadPrimitiveConstantNullBase(JavaKind kind, Constant base, Long offset, Object expected, int bitsCount) {
+        Assert.assertNull(PROVIDER.readPrimitiveConstant(kind, null, offset, bitsCount), "Unexpected value for null base");
+    }
+
+    @Test(dataProvider = "negative", dataProviderClass = MemoryAccessProviderData.class, expectedExceptions = {IllegalArgumentException.class})
+    public void testNegativeReadPrimitiveConstant(JavaKind kind, Constant base) {
+        PROVIDER.readPrimitiveConstant(kind, base, 0L, kind == null ? 0 : kind.getBitCount());
+    }
+
+    @Test(dataProvider = "positiveObject", dataProviderClass = MemoryAccessProviderData.class, expectedExceptions = {IllegalArgumentException.class})
+    public void testObjectReadPrimitiveConstant(JavaKind kind, Constant base, Long offset, Object expected, int bitsCount) {
+        PROVIDER.readPrimitiveConstant(kind, base, 0L, bitsCount);
+    }
+
+    @Test(dataProvider = "positivePrimitive", dataProviderClass = MemoryAccessProviderData.class, expectedExceptions = {IllegalArgumentException.class})
+    public void testReadPrimitiveConstantLessBits(JavaKind kind, Constant base, Long offset, Object expected, int bitsCount) {
+        PROVIDER.readPrimitiveConstant(kind, base, offset, bitsCount - 1);
+    }
+
+    @Test(dataProvider = "positiveObject", dataProviderClass = MemoryAccessProviderData.class)
+    public void testPositiveReadObjectConstant(JavaKind kind, Constant base, Long offset, Object expected, int bitsCount) {
+        Assert.assertEquals(PROVIDER.readObjectConstant(base, offset), expected, "Unexpected result");
+    }
+
+    @Test(dataProvider = "positiveObject", dataProviderClass = MemoryAccessProviderData.class)
+    public void testNegativeReadObjectConstantNullBase(JavaKind kind, Constant base, Long offset, Object expected, int bitsCount) {
+        Assert.assertNull(PROVIDER.readObjectConstant(null, offset), "Unexpected return");
+    }
+
+    @Test(dataProvider = "positiveObject", dataProviderClass = MemoryAccessProviderData.class)
+    public void testNegativeReadObjectConstantWrongOffset(JavaKind kind, Constant base, Long offset, Object expected, int bitsCount) {
+        Assert.assertNull(PROVIDER.readObjectConstant(base, offset + 1), "Expected null");
+    }
+
+    @Test(dataProvider = "positivePrimitive", dataProviderClass = MemoryAccessProviderData.class)
+    public void testNegativeReadObjectConstantPrimitiveBase(JavaKind kind, Constant base, Long offset, Object expected, int bitsCount) {
+        Assert.assertNull(PROVIDER.readObjectConstant(base, offset), "Expected null");
+    }
+}

From 768ffb978f3c4c8537f9d9c4917241f3c4a1d2d5 Mon Sep 17 00:00:00 2001
From: Dmitrij Pochepko <dpochepk@openjdk.org>
Date: Mon, 16 May 2016 17:00:08 +0300
Subject: [PATCH 091/228] 8152342: JVMCI test task: Unit tests for
 MethodHandleAccessProvider

Reviewed-by: kvn
---
 .../test/MethodHandleAccessProviderData.java  | 215 ++++++++++++++++++
 .../test/MethodHandleAccessProviderTest.java  | 134 +++++++++++
 2 files changed, 349 insertions(+)
 create mode 100644 hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderData.java
 create mode 100644 hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderTest.java

diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderData.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderData.java
new file mode 100644
index 00000000000..7cc482292aa
--- /dev/null
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderData.java
@@ -0,0 +1,215 @@
+/*
+ * Copyright (c) 2016, 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.test;
+
+import java.io.File;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.file.Paths;
+import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider;
+import jdk.vm.ci.meta.JavaConstant;
+import jdk.vm.ci.meta.MetaAccessProvider;
+import jdk.vm.ci.meta.MethodHandleAccessProvider;
+import jdk.vm.ci.runtime.JVMCI;
+import org.testng.annotations.DataProvider;
+
+public class MethodHandleAccessProviderData implements TestInterface {
+    private static final MetaAccessProvider META_ACCESS = JVMCI.getRuntime().getHostJVMCIBackend().getMetaAccess();
+    private static final HotSpotConstantReflectionProvider CONSTANT_REFLECTION = (HotSpotConstantReflectionProvider) JVMCI.getRuntime().getHostJVMCIBackend().getConstantReflection();
+    // see DirectMethodHandle.java to check invoke* method names assignment
+    private static final String IVIRTUAL_RESOLVED_NAME = "invokeVirtual";
+    private static final String ISTATIC_RESOLVED_NAME = "invokeStatic";
+    private static final String ISPECIAL_RESOLVED_NAME = "invokeSpecial";
+    private static final String ISTATICINIT_RESOLVED_NAME = "invokeStaticInit";
+    private static final String IINTERFACE_RESOLVED_NAME = "invokeInterface";
+    private static final String INEWSPECIAL_RESOLVED_NAME = "newInvokeSpecial";
+
+    @DataProvider(name = "intrinsicsPositive")
+    public static Object[][] getIntrinsicsDataPositive() {
+        Object[][] result;
+        try {
+            result = new Object[][]{
+                            new Object[]{
+                                            META_ACCESS.lookupJavaMethod(MethodHandle.class.getDeclaredMethod("invokeBasic", Object[].class)),
+                                            MethodHandleAccessProvider.IntrinsicMethod.INVOKE_BASIC},
+                            new Object[]{
+                                            META_ACCESS.lookupJavaMethod(MethodHandle.class.getDeclaredMethod("linkToInterface", Object[].class)),
+                                            MethodHandleAccessProvider.IntrinsicMethod.LINK_TO_INTERFACE},
+                            new Object[]{
+                                            META_ACCESS.lookupJavaMethod(MethodHandle.class.getDeclaredMethod("linkToStatic", Object[].class)),
+                                            MethodHandleAccessProvider.IntrinsicMethod.LINK_TO_STATIC},
+                            new Object[]{
+                                            META_ACCESS.lookupJavaMethod(MethodHandle.class.getDeclaredMethod("linkToVirtual", Object[].class)),
+                                            MethodHandleAccessProvider.IntrinsicMethod.LINK_TO_VIRTUAL},
+                            new Object[]{
+                                            META_ACCESS.lookupJavaMethod(MethodHandle.class.getDeclaredMethod("linkToSpecial", Object[].class)),
+                                            MethodHandleAccessProvider.IntrinsicMethod.LINK_TO_SPECIAL}};
+        } catch (NoSuchMethodException e) {
+            throw new Error("TESTBUG: can't find method: " + e, e);
+        }
+        return result;
+    }
+
+    @DataProvider(name = "intrinsicsNegative")
+    public static Object[][] getIntrinsicsDataNegative() {
+        Object[][] result;
+        try {
+            result = new Object[][]{new Object[]{META_ACCESS.lookupJavaMethod(MethodHandle.class.getDeclaredMethod("invokeWithArguments", Object[].class))}};
+        } catch (NoSuchMethodException e) {
+            throw new Error("TESTBUG: can't find method: " + e, e);
+        }
+        return result;
+    }
+
+    @DataProvider(name = "invokeBasicNegative1")
+    public static Object[][] getInvokeBasicDataNegative1() {
+        Object[][] result;
+        JavaConstant wrongObject = CONSTANT_REFLECTION.forObject("42");
+        // 2nd parameter is force bytecode generation = true/false
+        result = new Object[][]{
+                        new Object[]{wrongObject, true},
+                        new Object[]{wrongObject, false},
+                        new Object[]{JavaConstant.NULL_POINTER, true},
+                        new Object[]{JavaConstant.NULL_POINTER, false}};
+        return result;
+    }
+
+    @DataProvider(name = "invokeBasicNegative2")
+    public static Object[][] getInvokeBasicDataNegative2() {
+        Object[][] result;
+        // 2nd parameter is force bytecode generation = true/false
+        result = new Object[][]{
+                        new Object[]{null, true},
+                        new Object[]{null, false}};
+        return result;
+    }
+
+    @DataProvider(name = "invokeBasicPositive")
+    public static Object[][] getInvokeBasicDataPositive() {
+        Object[][] result;
+        MethodHandle mhIVirtual;
+        MethodHandle mhIStatic;
+        MethodHandle mhISpecial;
+        MethodHandle mhIStaticInit;
+        MethodHandle mhINewSpecial;
+        MethodHandle mhIInterface;
+        MethodHandles.Lookup lookup = MethodHandles.lookup();
+        MethodType voidRet = MethodType.methodType(void.class);
+        Class<?> self = MethodHandleAccessProviderData.class;
+        // let's get a separate, thus, not initialized class
+        ClassLoader current = self.getClassLoader();
+        String[] cpaths = System.getProperty("java.class.path").split(File.pathSeparator);
+        URL[] urls = new URL[cpaths.length];
+        try {
+            for (int i = 0; i < cpaths.length; i++) {
+                urls[i] = Paths.get(cpaths[i]).toUri().toURL();
+            }
+        } catch (MalformedURLException e) {
+            throw new Error("Can't parse classpath url: " + e, e);
+        }
+        Class<?> clone;
+        try {
+            clone = new ParentLastURLClassLoader(urls, current).loadClass(self.getName());
+        } catch (ClassNotFoundException e) {
+            throw new Error("TESTBUG: can't find class: " + e, e);
+        }
+        try {
+            mhIVirtual = lookup.findVirtual(self, "publicMethod", voidRet);
+            mhIStatic = lookup.findStatic(self, "staticMethod", voidRet);
+            mhISpecial = lookup.findSpecial(self, "privateMethod", voidRet, self);
+            mhIStaticInit = lookup.findStatic(clone, "staticMethod", voidRet);
+            mhINewSpecial = lookup.findConstructor(self, voidRet);
+            mhIInterface = lookup.findVirtual(TestInterface.class, "interfaceMethod", voidRet);
+        } catch (NoSuchMethodException | IllegalAccessException e) {
+            throw new Error("TESTBUG: lookup failed: " + e, e);
+        }
+        JavaConstant jcIVirtual = CONSTANT_REFLECTION.forObject(mhIVirtual);
+        JavaConstant jcIStatic = CONSTANT_REFLECTION.forObject(mhIStatic);
+        JavaConstant jcISpecial = CONSTANT_REFLECTION.forObject(mhISpecial);
+        JavaConstant jcIStaticInit = CONSTANT_REFLECTION.forObject(mhIStaticInit);
+        JavaConstant jcINewSpecial = CONSTANT_REFLECTION.forObject(mhINewSpecial);
+        JavaConstant jcIInterface = CONSTANT_REFLECTION.forObject(mhIInterface);
+        // 2nd parameter is force bytecode generation = true/false
+        result = new Object[][]{
+                        new Object[]{jcIVirtual, true, IVIRTUAL_RESOLVED_NAME},
+                        new Object[]{jcIVirtual, false, IVIRTUAL_RESOLVED_NAME},
+                        new Object[]{jcIStatic, true, ISTATIC_RESOLVED_NAME},
+                        new Object[]{jcIStatic, false, ISTATIC_RESOLVED_NAME},
+                        new Object[]{jcISpecial, true, ISPECIAL_RESOLVED_NAME},
+                        new Object[]{jcISpecial, false, ISPECIAL_RESOLVED_NAME},
+                        new Object[]{jcIStaticInit, true, ISTATICINIT_RESOLVED_NAME},
+                        new Object[]{jcIStaticInit, false, ISTATICINIT_RESOLVED_NAME},
+                        new Object[]{jcINewSpecial, false, INEWSPECIAL_RESOLVED_NAME},
+                        new Object[]{jcINewSpecial, true, INEWSPECIAL_RESOLVED_NAME},
+                        new Object[]{jcIInterface, false, IINTERFACE_RESOLVED_NAME},
+                        new Object[]{jcIInterface, true, IINTERFACE_RESOLVED_NAME}};
+        return result;
+    }
+
+    // can't use nested classes for storing these test methods. see JDK-8010319
+    private void privateMethod() {
+        // empty
+    }
+
+    public static void staticMethod() {
+        // empty
+    }
+
+    public void publicMethod() {
+        // empty
+    }
+
+    @Override
+    public void interfaceMethod() {
+        // empty
+    }
+}
+
+interface TestInterface {
+    void interfaceMethod();
+}
+
+class ParentLastURLClassLoader extends URLClassLoader {
+
+    ParentLastURLClassLoader(URL[] urls, ClassLoader parent) {
+        super(urls, parent);
+    }
+
+    @Override
+    public Class<?> loadClass(String name) throws ClassNotFoundException {
+        try {
+            Class<?> c = findClass(name);
+            if (c != null) {
+                return c;
+            }
+        } catch (ClassNotFoundException e) {
+            // ignore
+        }
+        return super.loadClass(name);
+    }
+}
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderTest.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderTest.java
new file mode 100644
index 00000000000..cf928d20356
--- /dev/null
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderTest.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2016, 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 8152343
+ * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
+ * @library /testlibrary /test/lib /compiler/jvmci/jdk.vm.ci.hotspot.test/src
+ * @modules jdk.vm.ci/jdk.vm.ci.meta
+ *          jdk.vm.ci/jdk.vm.ci.runtime
+ *          jdk.vm.ci/jdk.vm.ci.hotspot
+ * @run testng/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
+ *      jdk.vm.ci.hotspot.test.MethodHandleAccessProviderTest
+ */
+
+package jdk.vm.ci.hotspot.test;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Method;
+import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider;
+import jdk.vm.ci.meta.MethodHandleAccessProvider;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.runtime.JVMCI;
+import jdk.vm.ci.meta.JavaConstant;
+import jdk.vm.ci.meta.MetaAccessProvider;
+import jdk.vm.ci.meta.MethodHandleAccessProvider.IntrinsicMethod;
+import org.testng.annotations.Test;
+import org.testng.Assert;
+
+public class MethodHandleAccessProviderTest {
+    private static final HotSpotConstantReflectionProvider CONSTANT_REFLECTION = (HotSpotConstantReflectionProvider) JVMCI.getRuntime().getHostJVMCIBackend().getConstantReflection();
+    private static final MethodHandleAccessProvider PROVIDER = CONSTANT_REFLECTION.getMethodHandleAccess();
+    private static final MetaAccessProvider META_ACCESS = JVMCI.getRuntime().getHostJVMCIBackend().getMetaAccess();
+
+    @Test(dataProvider = "intrinsicsPositive", dataProviderClass = MethodHandleAccessProviderData.class)
+    public void testLookupMethodHandleIntrinsic(ResolvedJavaMethod mtd, IntrinsicMethod expected) {
+        Assert.assertEquals(expected, PROVIDER.lookupMethodHandleIntrinsic(mtd), "Unexpected intrinsic returned for " + mtd);
+    }
+
+    @Test(dataProvider = "intrinsicsNegative", dataProviderClass = MethodHandleAccessProviderData.class)
+    public void testLookupMethodHandleIntrinsicNegative(ResolvedJavaMethod mtd) {
+        Assert.assertNull(PROVIDER.lookupMethodHandleIntrinsic(mtd), "Expected null return for " + mtd);
+    }
+
+    @Test(expectedExceptions = {NullPointerException.class})
+    public void testLookupMethodHandleIntrinsicNull() {
+        PROVIDER.lookupMethodHandleIntrinsic(null);
+    }
+
+    @Test(dataProvider = "invokeBasicPositive", dataProviderClass = MethodHandleAccessProviderData.class)
+    public void testResolveInvokeBasicTarget(JavaConstant javaConstantMethodHandle, boolean force, String expected) {
+        ResolvedJavaMethod mtd = PROVIDER.resolveInvokeBasicTarget(javaConstantMethodHandle, force);
+        Assert.assertTrue(mtd.getName().startsWith(expected), "Unexpected method resolved: " + mtd);
+    }
+
+    @Test(dataProvider = "invokeBasicNegative1", dataProviderClass = MethodHandleAccessProviderData.class)
+    public void testResolveInvokeBasicTargetNegative1(JavaConstant javaConstantMethodHandle, boolean force) {
+        Assert.assertNull(PROVIDER.resolveInvokeBasicTarget(javaConstantMethodHandle, force),
+                        "Expected null return for " + javaConstantMethodHandle + " with force=" + force);
+    }
+
+    @Test(dataProvider = "invokeBasicNegative2", dataProviderClass = MethodHandleAccessProviderData.class, expectedExceptions = {NullPointerException.class})
+    public void testResolveInvokeBasicTargetNegative2(JavaConstant javaConstantMethodHandle, boolean force) {
+        PROVIDER.resolveInvokeBasicTarget(javaConstantMethodHandle, force);
+    }
+
+    @Test
+    public void testResolveLinkToTarget() {
+        Method self;
+        try {
+            self = getClass().getDeclaredMethod("testResolveLinkToTarget");
+        } catch (NoSuchMethodException e) {
+            throw new Error("TESTBUG: can't find method: " + e, e);
+        }
+        MethodHandle mh;
+        try {
+            mh = MethodHandles.lookup().unreflect(self);
+        } catch (IllegalAccessException e) {
+            throw new Error("TESTBUG: can't get MHandle: " + e, e);
+        }
+        Method internalMemberNameMethod;
+        try {
+            internalMemberNameMethod = mh.getClass().getDeclaredMethod("internalMemberName");
+        } catch (NoSuchMethodException e) {
+            throw new Error("TESTBUG: can't find method: " + e, e);
+        }
+        internalMemberNameMethod.setAccessible(true);
+        Object memberName;
+        try {
+            memberName = internalMemberNameMethod.invoke(mh);
+        } catch (ReflectiveOperationException e) {
+            throw new Error("TESTBUG: can't invoke internalMemberName method", e);
+        }
+        JavaConstant jcMemberName = CONSTANT_REFLECTION.forObject(memberName);
+        ResolvedJavaMethod mtd = PROVIDER.resolveLinkToTarget(jcMemberName);
+        Assert.assertEquals(mtd, META_ACCESS.lookupJavaMethod(self), "Got unexpected method: " + mtd);
+    }
+
+    @Test(expectedExceptions = {NullPointerException.class})
+    public void testResolveLinkToTargetNegativeNull() {
+        PROVIDER.resolveLinkToTarget(null);
+    }
+
+    @Test
+    public void testResolveLinkToTargetNegativeNullConstant() {
+        Assert.assertNull(PROVIDER.resolveLinkToTarget(JavaConstant.NULL_POINTER), "Expected null return");
+    }
+
+    @Test(expectedExceptions = {IllegalArgumentException.class})
+    public void testResolveLinkToTargetNegativeWrongConstant() {
+        PROVIDER.resolveLinkToTarget(CONSTANT_REFLECTION.forObject("42"));
+    }
+}

From fd3645227ba671e20c0232bcfcb9fbbba2b10365 Mon Sep 17 00:00:00 2001
From: Dmitrij Pochepko <dpochepk@openjdk.org>
Date: Mon, 16 May 2016 17:01:53 +0300
Subject: [PATCH 092/228] 8152343: JVMCI test tasks: Unit tests for
 MetaAccessProvider

Reviewed-by: twisti
---
 .../runtime/test/TestMetaAccessProvider.java  | 153 ++++++++++++++++++
 1 file changed, 153 insertions(+)

diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestMetaAccessProvider.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestMetaAccessProvider.java
index 904aada9059..8f16a40abb6 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestMetaAccessProvider.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestMetaAccessProvider.java
@@ -37,10 +37,13 @@ package jdk.vm.ci.runtime.test;
 import static jdk.vm.ci.meta.MetaUtil.toInternalName;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import jdk.vm.ci.meta.DeoptimizationAction;
+import jdk.vm.ci.meta.DeoptimizationReason;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
@@ -48,6 +51,7 @@ import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
+import jdk.vm.ci.meta.Signature;
 
 import org.junit.Test;
 
@@ -55,6 +59,16 @@ import org.junit.Test;
  * Tests for {@link MetaAccessProvider}.
  */
 public class TestMetaAccessProvider extends TypeUniverse {
+    private static final DeoptimizationAction DEOPT_ACTION = DeoptimizationAction.InvalidateRecompile;
+    private static final DeoptimizationReason DEOPT_REASON = DeoptimizationReason.Aliasing;
+    private static final int INT_23BITS_SET = 0x7FFFFF;
+    private static final int[] DEBUG_IDS = new int[]{0, 1, 42, INT_23BITS_SET};
+    private static final int[] VALID_ENCODED_VALUES = new int[]{
+                    metaAccess.encodeDeoptActionAndReason(DEOPT_ACTION, DEOPT_REASON, DEBUG_IDS[0]).asInt(),
+                    metaAccess.encodeDeoptActionAndReason(DEOPT_ACTION, DEOPT_REASON, DEBUG_IDS[1]).asInt(),
+                    metaAccess.encodeDeoptActionAndReason(DEOPT_ACTION, DEOPT_REASON, DEBUG_IDS[2]).asInt(),
+                    metaAccess.encodeDeoptActionAndReason(DEOPT_ACTION, DEOPT_REASON, DEBUG_IDS[3]).asInt()
+    };
 
     @Test
     public void lookupJavaTypeTest() {
@@ -70,6 +84,37 @@ public class TestMetaAccessProvider extends TypeUniverse {
         }
     }
 
+    @Test(expected = IllegalArgumentException.class)
+    public void lookupJavaTypeNegativeTest() {
+        metaAccess.lookupJavaType((Class<?>) null);
+    }
+
+    @Test
+    public void lookupJavaTypesTest() {
+        ResolvedJavaType[] result = metaAccess.lookupJavaTypes(classes.toArray(new Class<?>[classes.size()]));
+        int counter = 0;
+        for (Class<?> aClass : classes) {
+            assertEquals("Unexpected javaType: " + result[counter] + " while expecting of class: " + aClass, result[counter].toClassName(), aClass.getName());
+            counter++;
+        }
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void lookupJavaTypesNegative1Test() {
+        assertNull("Expected null", metaAccess.lookupJavaTypes(null));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void lookupJavaTypesNegative2Test() {
+        ResolvedJavaType[] result = metaAccess.lookupJavaTypes(new Class<?>[]{null, null, null});
+        for (ResolvedJavaType aType : result) {
+            assertNull("Expected null javaType", aType);
+        }
+        result = metaAccess.lookupJavaTypes(new Class<?>[]{String.class, String.class});
+        assertEquals("Results not equals", result[0].getClass(), result[1].getClass());
+        assertEquals("Result is not String.class", result[0].getClass(), String.class);
+    }
+
     @Test
     public void lookupJavaMethodTest() {
         for (Class<?> c : classes) {
@@ -81,6 +126,11 @@ public class TestMetaAccessProvider extends TypeUniverse {
         }
     }
 
+    @Test(expected = NullPointerException.class)
+    public void lookupJavaMethodNegativeTest() {
+        metaAccess.lookupJavaMethod(null);
+    }
+
     @Test
     public void lookupJavaFieldTest() {
         for (Class<?> c : classes) {
@@ -106,4 +156,107 @@ public class TestMetaAccessProvider extends TypeUniverse {
             }
         }
     }
+
+    @Test(expected = NullPointerException.class)
+    public void lookupJavaTypeConstantNegativeTest() {
+        metaAccess.lookupJavaType((JavaConstant) null);
+    }
+
+    @Test
+    public void getMemorySizeTest() {
+        for (ConstantValue cv : constants()) {
+            JavaConstant c = cv.value;
+            long memSize = metaAccess.getMemorySize(c);
+            if (c.isNull()) {
+                assertEquals("Expected size = 0 for null", memSize, 0L);
+            } else {
+                assertTrue("Expected size != 0 for " + cv, memSize != 0L);
+            }
+        }
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void getMemorySizeNegativeTest() {
+        metaAccess.getMemorySize(null);
+    }
+
+    @Test
+    public void parseMethodDescriptorTest() {
+        for (String retType : new String[]{"V", "Z", "Ljava/lang/String;"}) {
+            for (String paramTypes : new String[]{"", "B",
+                            "Ljava/lang/String;", "JLjava/lang/String;",
+                            "Ljava/lang/String;F",
+                            "[Ljava/lang/String;ZBCDFIJLS[ILjava/lang/Object;"}) {
+                String signature = "(" + paramTypes + ")" + retType;
+                Signature result = metaAccess.parseMethodDescriptor(signature);
+                assertEquals("Expected signatures to be equal", result.toMethodDescriptor(), signature);
+            }
+        }
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void parseMethodDescriptorNegativeNullTest() {
+        metaAccess.parseMethodDescriptor(null);
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void encodeDeoptActionAndReasonNegative1Test() {
+        metaAccess.encodeDeoptActionAndReason(null, DeoptimizationReason.Aliasing, 0);
+
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void encodeDeoptActionAndReasonNegative2Test() {
+        metaAccess.encodeDeoptActionAndReason(DeoptimizationAction.InvalidateRecompile, null, 0);
+    }
+
+    @Test
+    public void decodeDeoptReasonTest() {
+        for (int encoded : VALID_ENCODED_VALUES) {
+            JavaConstant value = JavaConstant.forInt(encoded);
+            DeoptimizationReason reason = metaAccess.decodeDeoptReason(value);
+            assertEquals("Expected equal reasons", reason, DEOPT_REASON);
+        }
+    }
+
+    @Test
+    public void decodeDeoptReasonNegative1Test() {
+        int encoded = 42;
+        JavaConstant value = JavaConstant.forInt(encoded);
+        metaAccess.decodeDeoptReason(value);
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void decodeDeoptReasonNegative2Test() {
+        metaAccess.decodeDeoptReason(null);
+    }
+
+    @Test
+    public void decodeDeoptActionTest() {
+        for (int encoded : VALID_ENCODED_VALUES) {
+            JavaConstant value = JavaConstant.forInt(encoded);
+            DeoptimizationAction action = metaAccess.decodeDeoptAction(value);
+            assertEquals("Expected equal actions", action, DEOPT_ACTION);
+        }
+    }
+
+    @Test
+    public void decodeDeoptActionNegative1Test() {
+        int encoded = 123456789;
+        JavaConstant value = JavaConstant.forInt(encoded);
+        metaAccess.decodeDeoptAction(value);
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void decodeDeoptActionNegative2Test() {
+        metaAccess.decodeDeoptAction(null);
+    }
+
+    @Test
+    public void decodeDebugIdTest() {
+        for (int i = 0; i < VALID_ENCODED_VALUES.length; i++) {
+            JavaConstant value = JavaConstant.forInt(VALID_ENCODED_VALUES[i]);
+            assertEquals("Unexpected debugId", metaAccess.decodeDebugId(value), DEBUG_IDS[i]);
+        }
+    }
 }

From 5686cc1784d533dad8a528e05d85813abfd99408 Mon Sep 17 00:00:00 2001
From: Roland Schatz <rschatz@openjdk.org>
Date: Wed, 18 May 2016 17:01:01 +0000
Subject: [PATCH 093/228] 8156942: [JVMCI] replace LIRKind with abstract base
 class

Reviewed-by: iveresov
---
 .../src/jdk/vm/ci/code/CodeUtil.java          |   6 +-
 .../src/jdk/vm/ci/code/Register.java          |  11 +-
 .../src/jdk/vm/ci/code/RegisterConfig.java    |   7 +-
 .../src/jdk/vm/ci/code/RegisterValue.java     |  15 +-
 .../src/jdk/vm/ci/code/StackSlot.java         |  16 +-
 .../src/jdk/vm/ci/code/TargetDescription.java |  14 +-
 .../src/jdk/vm/ci/code/ValueKindFactory.java  |  34 ++
 .../AArch64HotSpotJVMCIBackendFactory.java    |   4 +-
 .../aarch64/AArch64HotSpotRegisterConfig.java |  38 +-
 .../AMD64HotSpotJVMCIBackendFactory.java      |   4 +-
 .../amd64/AMD64HotSpotRegisterConfig.java     |  40 +-
 .../SPARCHotSpotJVMCIBackendFactory.java      |   4 +-
 .../sparc/SPARCHotSpotRegisterConfig.java     |  42 +-
 .../ci/hotspot/HotSpotSentinelConstant.java   |   8 +-
 .../src/jdk/vm/ci/meta/AllocatableValue.java  |   6 +-
 .../src/jdk/vm/ci/meta/LIRKind.java           | 460 ------------------
 .../src/jdk/vm/ci/meta/Value.java             |  26 +-
 .../src/jdk/vm/ci/meta/ValueKind.java         |  85 ++++
 .../src/share/vm/jvmci/jvmciCodeInstaller.cpp |   5 +-
 .../src/share/vm/jvmci/jvmciJavaClasses.hpp   |   7 +-
 .../share/vm/jvmci/systemDictionary_jvmci.hpp |   2 +-
 .../src/share/vm/jvmci/vmSymbols_jvmci.hpp    |   2 +-
 .../jvmci/errors/TestInvalidDebugInfo.java    |  22 +-
 .../vm/ci/code/test/SimpleDebugInfoTest.java  |   8 +-
 .../jdk/vm/ci/code/test/TestAssembler.java    |  29 +-
 .../code/test/VirtualObjectDebugInfoTest.java |   4 +-
 .../code/test/amd64/AMD64TestAssembler.java   |  13 +-
 .../code/test/sparc/SPARCTestAssembler.java   |  13 +-
 28 files changed, 304 insertions(+), 621 deletions(-)
 create mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/ValueKindFactory.java
 delete mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LIRKind.java
 create mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ValueKind.java

diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CodeUtil.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CodeUtil.java
index 9cde2e53bee..ec0fbe111ab 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CodeUtil.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CodeUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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,7 +417,7 @@ public class CodeUtil {
     /**
      * Create a calling convention from a {@link ResolvedJavaMethod}.
      */
-    public static CallingConvention getCallingConvention(CodeCacheProvider codeCache, CallingConvention.Type type, ResolvedJavaMethod method) {
+    public static CallingConvention getCallingConvention(CodeCacheProvider codeCache, CallingConvention.Type type, ResolvedJavaMethod method, ValueKindFactory<?> valueKindFactory) {
         Signature sig = method.getSignature();
         JavaType retType = sig.getReturnType(null);
         int sigCount = sig.getParameterCount(false);
@@ -434,6 +434,6 @@ public class CodeUtil {
         }
 
         RegisterConfig registerConfig = codeCache.getRegisterConfig();
-        return registerConfig.getCallingConvention(type, retType, argTypes, codeCache.getTarget());
+        return registerConfig.getCallingConvention(type, retType, argTypes, valueKindFactory);
     }
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Register.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Register.java
index 8820fd5cb89..16d007b555e 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Register.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Register.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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,8 +22,7 @@
  */
 package jdk.vm.ci.code;
 
-import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.meta.LIRKind;
+import jdk.vm.ci.meta.ValueKind;
 
 /**
  * Represents a target machine register.
@@ -144,17 +143,17 @@ public final class Register implements Comparable<Register> {
      * @param kind the specified kind
      * @return the {@link RegisterValue}
      */
-    public RegisterValue asValue(LIRKind kind) {
+    public RegisterValue asValue(ValueKind<?> kind) {
         return new RegisterValue(kind, this);
     }
 
     /**
      * Gets this register as a {@linkplain RegisterValue value} with no particular kind.
      *
-     * @return a {@link RegisterValue} with {@link JavaKind#Illegal} kind.
+     * @return a {@link RegisterValue} with {@link ValueKind#Illegal} kind.
      */
     public RegisterValue asValue() {
-        return asValue(LIRKind.Illegal);
+        return asValue(ValueKind.Illegal);
     }
 
     /**
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterConfig.java
index 4a6d44c4e51..8cbd936dd30 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterConfig.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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 @@ import jdk.vm.ci.code.CallingConvention.Type;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.PlatformKind;
+import jdk.vm.ci.meta.ValueKind;
 
 /**
  * A register configuration binds roles and {@linkplain RegisterAttributes attributes} to physical
@@ -56,9 +57,9 @@ public interface RegisterConfig {
      * @param type the type of calling convention being requested
      * @param returnType the return type (can be null for methods returning {@code void})
      * @param parameterTypes the types of the arguments of the call
-     * @param target the target platform
+     * @param valueKindFactory the factory to create custom {@link ValueKind ValueKinds}
      */
-    CallingConvention getCallingConvention(Type type, JavaType returnType, JavaType[] parameterTypes, TargetDescription target);
+    CallingConvention getCallingConvention(Type type, JavaType returnType, JavaType[] parameterTypes, ValueKindFactory<?> valueKindFactory);
 
     /**
      * Gets the ordered set of registers that are can be used to pass parameters according to a
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterValue.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterValue.java
index 7cea61b4e0a..7104fc0c26d 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterValue.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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,23 +23,16 @@
 package jdk.vm.ci.code;
 
 import jdk.vm.ci.meta.AllocatableValue;
-import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.meta.LIRKind;
+import jdk.vm.ci.meta.ValueKind;
 
 /**
- * Denotes a register that stores a value of a fixed kind. There is exactly one (canonical) instance
- * of {@link RegisterValue} for each ({@link Register}, {@link JavaKind}) pair. Use
- * {@link Register#asValue(LIRKind)} to retrieve the canonical {@link RegisterValue} instance for a
- * given (register,kind) pair.
+ * Denotes a register that stores a value of a fixed kind.
  */
 public final class RegisterValue extends AllocatableValue {
 
     private final Register reg;
 
-    /**
-     * Should only be called from {@link Register#Register} to ensure canonicalization.
-     */
-    protected RegisterValue(LIRKind kind, Register register) {
+    protected RegisterValue(ValueKind<?> kind, Register register) {
         super(kind);
         this.reg = register;
     }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/StackSlot.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/StackSlot.java
index 3ddde182b01..ca4a8b531f0 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/StackSlot.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/StackSlot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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,7 +23,7 @@
 package jdk.vm.ci.code;
 
 import jdk.vm.ci.meta.AllocatableValue;
-import jdk.vm.ci.meta.LIRKind;
+import jdk.vm.ci.meta.ValueKind;
 
 /**
  * Represents a compiler spill slot or an outgoing stack-based argument in a method's frame or an
@@ -43,16 +43,16 @@ public final class StackSlot extends AllocatableValue {
      * @param addFrameSize Specifies if the offset is relative to the stack pointer, or the
      *            beginning of the frame (stack pointer + total frame size).
      */
-    public static StackSlot get(LIRKind kind, int offset, boolean addFrameSize) {
+    public static StackSlot get(ValueKind<?> kind, int offset, boolean addFrameSize) {
         assert addFrameSize || offset >= 0;
         return new StackSlot(kind, offset, addFrameSize);
     }
 
     /**
-     * Private constructor to enforce use of {@link #get(LIRKind, int, boolean)} so that a cache can
-     * be used.
+     * Private constructor to enforce use of {@link #get(ValueKind, int, boolean)} so that a cache
+     * can be used.
      */
-    private StackSlot(LIRKind kind, int offset, boolean addFrameSize) {
+    private StackSlot(ValueKind<?> kind, int offset, boolean addFrameSize) {
         super(kind);
         this.offset = offset;
         this.addFrameSize = addFrameSize;
@@ -99,7 +99,7 @@ public final class StackSlot extends AllocatableValue {
     public StackSlot asOutArg() {
         assert offset >= 0;
         if (addFrameSize) {
-            return get(getLIRKind(), offset, false);
+            return get(getValueKind(), offset, false);
         }
         return this;
     }
@@ -110,7 +110,7 @@ public final class StackSlot extends AllocatableValue {
     public StackSlot asInArg() {
         assert offset >= 0;
         if (!addFrameSize) {
-            return get(getLIRKind(), offset, true);
+            return get(getValueKind(), offset, true);
         }
         return this;
     }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/TargetDescription.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/TargetDescription.java
index d611dce0919..14fa507174a 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/TargetDescription.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/TargetDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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,9 +23,8 @@
 package jdk.vm.ci.code;
 
 import static jdk.vm.ci.meta.MetaUtil.identityHashCodeString;
+
 import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.meta.LIRKind;
-import jdk.vm.ci.meta.PlatformKind;
 
 /**
  * Represents the target machine for a compiler, including the CPU architecture, the size of
@@ -118,13 +117,4 @@ public class TargetDescription {
     public String toString() {
         return identityHashCodeString(this);
     }
-
-    public LIRKind getLIRKind(JavaKind javaKind) {
-        PlatformKind platformKind = arch.getPlatformKind(javaKind);
-        if (javaKind.isObject()) {
-            return LIRKind.reference(platformKind);
-        } else {
-            return LIRKind.value(platformKind);
-        }
-    }
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/ValueKindFactory.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/ValueKindFactory.java
new file mode 100644
index 00000000000..57519afab14
--- /dev/null
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/ValueKindFactory.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2016, 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.code;
+
+import jdk.vm.ci.meta.JavaKind;
+import jdk.vm.ci.meta.ValueKind;
+
+/**
+ * Can be implemented by compilers to create custom {@link ValueKind} subclasses.
+ */
+public interface ValueKindFactory<K extends ValueKind<K>> {
+
+    K getValueKind(JavaKind javaKind);
+}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java
index 4140aef2669..9762b605270 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -68,7 +68,7 @@ public class AArch64HotSpotJVMCIBackendFactory implements HotSpotJVMCIBackendFac
     }
 
     protected RegisterConfig createRegisterConfig(HotSpotJVMCIRuntimeProvider runtime, TargetDescription target) {
-        return new AArch64HotSpotRegisterConfig(target.arch, runtime.getConfig());
+        return new AArch64HotSpotRegisterConfig(target, runtime.getConfig());
     }
 
     protected HotSpotCodeCacheProvider createCodeCache(HotSpotJVMCIRuntimeProvider runtime, TargetDescription target, RegisterConfig regConfig) {
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java
index 629e3967f48..c8d913d3c21 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,19 +64,20 @@ import jdk.vm.ci.code.RegisterAttributes;
 import jdk.vm.ci.code.RegisterConfig;
 import jdk.vm.ci.code.StackSlot;
 import jdk.vm.ci.code.TargetDescription;
+import jdk.vm.ci.code.ValueKindFactory;
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.hotspot.HotSpotCallingConventionType;
 import jdk.vm.ci.hotspot.HotSpotVMConfig;
 import jdk.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
-import jdk.vm.ci.meta.LIRKind;
 import jdk.vm.ci.meta.PlatformKind;
 import jdk.vm.ci.meta.Value;
+import jdk.vm.ci.meta.ValueKind;
 
 public class AArch64HotSpotRegisterConfig implements RegisterConfig {
 
-    private final Architecture architecture;
+    private final TargetDescription target;
 
     private final Register[] allocatable;
 
@@ -104,7 +105,7 @@ public class AArch64HotSpotRegisterConfig implements RegisterConfig {
     public Register[] filterAllocatableRegisters(PlatformKind kind, Register[] registers) {
         ArrayList<Register> list = new ArrayList<>();
         for (Register reg : registers) {
-            if (architecture.canStoreValue(reg.getRegisterCategory(), kind)) {
+            if (target.arch.canStoreValue(reg.getRegisterCategory(), kind)) {
                 list.add(reg);
             }
         }
@@ -159,13 +160,13 @@ public class AArch64HotSpotRegisterConfig implements RegisterConfig {
         return registers;
     }
 
-    public AArch64HotSpotRegisterConfig(Architecture architecture, HotSpotVMConfig config) {
-        this(architecture, config, initAllocatable(architecture, config.useCompressedOops));
+    public AArch64HotSpotRegisterConfig(TargetDescription target, HotSpotVMConfig config) {
+        this(target, config, initAllocatable(target.arch, config.useCompressedOops));
         assert callerSaved.length >= allocatable.length;
     }
 
-    public AArch64HotSpotRegisterConfig(Architecture architecture, HotSpotVMConfig config, Register[] allocatable) {
-        this.architecture = architecture;
+    public AArch64HotSpotRegisterConfig(TargetDescription target, HotSpotVMConfig config, Register[] allocatable) {
+        this.target = target;
         this.maxFrameSize = config.maxFrameSize;
 
         this.allocatable = allocatable.clone();
@@ -200,14 +201,14 @@ public class AArch64HotSpotRegisterConfig implements RegisterConfig {
     }
 
     @Override
-    public CallingConvention getCallingConvention(Type type, JavaType returnType, JavaType[] parameterTypes, TargetDescription target) {
+    public CallingConvention getCallingConvention(Type type, JavaType returnType, JavaType[] parameterTypes, ValueKindFactory<?> valueKindFactory) {
         HotSpotCallingConventionType hotspotType = (HotSpotCallingConventionType) type;
         if (type == HotSpotCallingConventionType.NativeCall) {
-            return callingConvention(nativeGeneralParameterRegisters, returnType, parameterTypes, hotspotType, target);
+            return callingConvention(nativeGeneralParameterRegisters, returnType, parameterTypes, hotspotType, valueKindFactory);
         }
         // On x64, parameter locations are the same whether viewed
         // from the caller or callee perspective
-        return callingConvention(javaGeneralParameterRegisters, returnType, parameterTypes, hotspotType, target);
+        return callingConvention(javaGeneralParameterRegisters, returnType, parameterTypes, hotspotType, valueKindFactory);
     }
 
     @Override
@@ -230,7 +231,8 @@ public class AArch64HotSpotRegisterConfig implements RegisterConfig {
         }
     }
 
-    private CallingConvention callingConvention(Register[] generalParameterRegisters, JavaType returnType, JavaType[] parameterTypes, HotSpotCallingConventionType type, TargetDescription target) {
+    private CallingConvention callingConvention(Register[] generalParameterRegisters, JavaType returnType, JavaType[] parameterTypes, HotSpotCallingConventionType type,
+                    ValueKindFactory<?> valueKindFactory) {
         AllocatableValue[] locations = new AllocatableValue[parameterTypes.length];
 
         int currentGeneral = 0;
@@ -250,14 +252,14 @@ public class AArch64HotSpotRegisterConfig implements RegisterConfig {
                 case Object:
                     if (currentGeneral < generalParameterRegisters.length) {
                         Register register = generalParameterRegisters[currentGeneral++];
-                        locations[i] = register.asValue(target.getLIRKind(kind));
+                        locations[i] = register.asValue(valueKindFactory.getValueKind(kind));
                     }
                     break;
                 case Float:
                 case Double:
                     if (currentSIMD < simdParameterRegisters.length) {
                         Register register = simdParameterRegisters[currentSIMD++];
-                        locations[i] = register.asValue(target.getLIRKind(kind));
+                        locations[i] = register.asValue(valueKindFactory.getValueKind(kind));
                     }
                     break;
                 default:
@@ -265,14 +267,14 @@ public class AArch64HotSpotRegisterConfig implements RegisterConfig {
             }
 
             if (locations[i] == null) {
-                LIRKind lirKind = target.getLIRKind(kind);
-                locations[i] = StackSlot.get(lirKind, currentStackOffset, !type.out);
-                currentStackOffset += Math.max(lirKind.getPlatformKind().getSizeInBytes(), target.wordSize);
+                ValueKind<?> valueKind = valueKindFactory.getValueKind(kind);
+                locations[i] = StackSlot.get(valueKind, currentStackOffset, !type.out);
+                currentStackOffset += Math.max(valueKind.getPlatformKind().getSizeInBytes(), target.wordSize);
             }
         }
 
         JavaKind returnKind = returnType == null ? JavaKind.Void : returnType.getJavaKind();
-        AllocatableValue returnLocation = returnKind == JavaKind.Void ? Value.ILLEGAL : getReturnRegister(returnKind).asValue(target.getLIRKind(returnKind.getStackKind()));
+        AllocatableValue returnLocation = returnKind == JavaKind.Void ? Value.ILLEGAL : getReturnRegister(returnKind).asValue(valueKindFactory.getValueKind(returnKind.getStackKind()));
         return new CallingConvention(currentStackOffset, returnLocation, locations);
     }
 
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java
index 8750700e200..2106b07aeb2 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
@@ -152,7 +152,7 @@ public class AMD64HotSpotJVMCIBackendFactory implements HotSpotJVMCIBackendFacto
     }
 
     protected RegisterConfig createRegisterConfig(HotSpotJVMCIRuntimeProvider runtime, TargetDescription target) {
-        return new AMD64HotSpotRegisterConfig(target.arch, runtime.getConfig());
+        return new AMD64HotSpotRegisterConfig(target, runtime.getConfig());
     }
 
     protected HotSpotCodeCacheProvider createCodeCache(HotSpotJVMCIRuntimeProvider runtime, TargetDescription target, RegisterConfig regConfig) {
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotRegisterConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotRegisterConfig.java
index 77b57b0130e..45a3ad32075 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotRegisterConfig.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotRegisterConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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,19 +56,20 @@ import jdk.vm.ci.code.RegisterAttributes;
 import jdk.vm.ci.code.RegisterConfig;
 import jdk.vm.ci.code.StackSlot;
 import jdk.vm.ci.code.TargetDescription;
+import jdk.vm.ci.code.ValueKindFactory;
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.hotspot.HotSpotCallingConventionType;
 import jdk.vm.ci.hotspot.HotSpotVMConfig;
 import jdk.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
-import jdk.vm.ci.meta.LIRKind;
 import jdk.vm.ci.meta.PlatformKind;
 import jdk.vm.ci.meta.Value;
+import jdk.vm.ci.meta.ValueKind;
 
 public class AMD64HotSpotRegisterConfig implements RegisterConfig {
 
-    private final Architecture architecture;
+    private final TargetDescription target;
 
     private final Register[] allocatable;
 
@@ -96,7 +97,7 @@ public class AMD64HotSpotRegisterConfig implements RegisterConfig {
     public Register[] filterAllocatableRegisters(PlatformKind kind, Register[] registers) {
         ArrayList<Register> list = new ArrayList<>();
         for (Register reg : registers) {
-            if (architecture.canStoreValue(reg.getRegisterCategory(), kind)) {
+            if (target.arch.canStoreValue(reg.getRegisterCategory(), kind)) {
                 list.add(reg);
             }
         }
@@ -145,13 +146,13 @@ public class AMD64HotSpotRegisterConfig implements RegisterConfig {
         return registers;
     }
 
-    public AMD64HotSpotRegisterConfig(Architecture architecture, HotSpotVMConfig config) {
-        this(architecture, config, initAllocatable(architecture, config.useCompressedOops));
+    public AMD64HotSpotRegisterConfig(TargetDescription target, HotSpotVMConfig config) {
+        this(target, config, initAllocatable(target.arch, config.useCompressedOops));
         assert callerSaved.length >= allocatable.length;
     }
 
-    public AMD64HotSpotRegisterConfig(Architecture architecture, HotSpotVMConfig config, Register[] allocatable) {
-        this.architecture = architecture;
+    public AMD64HotSpotRegisterConfig(TargetDescription target, HotSpotVMConfig config, Register[] allocatable) {
+        this.target = target;
         this.maxFrameSize = config.maxFrameSize;
 
         if (config.windowsOs) {
@@ -173,7 +174,7 @@ public class AMD64HotSpotRegisterConfig implements RegisterConfig {
         callerSaved = callerSaveSet.toArray(new Register[callerSaveSet.size()]);
 
         allAllocatableAreCallerSaved = true;
-        attributesMap = RegisterAttributes.createMap(this, architecture.getRegisters());
+        attributesMap = RegisterAttributes.createMap(this, target.arch.getRegisters());
     }
 
     @Override
@@ -197,14 +198,14 @@ public class AMD64HotSpotRegisterConfig implements RegisterConfig {
     }
 
     @Override
-    public CallingConvention getCallingConvention(Type type, JavaType returnType, JavaType[] parameterTypes, TargetDescription target) {
+    public CallingConvention getCallingConvention(Type type, JavaType returnType, JavaType[] parameterTypes, ValueKindFactory<?> valueKindFactory) {
         HotSpotCallingConventionType hotspotType = (HotSpotCallingConventionType) type;
         if (type == HotSpotCallingConventionType.NativeCall) {
-            return callingConvention(nativeGeneralParameterRegisters, returnType, parameterTypes, hotspotType, target);
+            return callingConvention(nativeGeneralParameterRegisters, returnType, parameterTypes, hotspotType, valueKindFactory);
         }
         // On x64, parameter locations are the same whether viewed
         // from the caller or callee perspective
-        return callingConvention(javaGeneralParameterRegisters, returnType, parameterTypes, hotspotType, target);
+        return callingConvention(javaGeneralParameterRegisters, returnType, parameterTypes, hotspotType, valueKindFactory);
     }
 
     @Override
@@ -227,7 +228,8 @@ public class AMD64HotSpotRegisterConfig implements RegisterConfig {
         }
     }
 
-    private CallingConvention callingConvention(Register[] generalParameterRegisters, JavaType returnType, JavaType[] parameterTypes, HotSpotCallingConventionType type, TargetDescription target) {
+    private CallingConvention callingConvention(Register[] generalParameterRegisters, JavaType returnType, JavaType[] parameterTypes, HotSpotCallingConventionType type,
+                    ValueKindFactory<?> valueKindFactory) {
         AllocatableValue[] locations = new AllocatableValue[parameterTypes.length];
 
         int currentGeneral = 0;
@@ -247,14 +249,14 @@ public class AMD64HotSpotRegisterConfig implements RegisterConfig {
                 case Object:
                     if (currentGeneral < generalParameterRegisters.length) {
                         Register register = generalParameterRegisters[currentGeneral++];
-                        locations[i] = register.asValue(target.getLIRKind(kind));
+                        locations[i] = register.asValue(valueKindFactory.getValueKind(kind));
                     }
                     break;
                 case Float:
                 case Double:
                     if (currentXMM < xmmParameterRegisters.length) {
                         Register register = xmmParameterRegisters[currentXMM++];
-                        locations[i] = register.asValue(target.getLIRKind(kind));
+                        locations[i] = register.asValue(valueKindFactory.getValueKind(kind));
                     }
                     break;
                 default:
@@ -262,14 +264,14 @@ public class AMD64HotSpotRegisterConfig implements RegisterConfig {
             }
 
             if (locations[i] == null) {
-                LIRKind lirKind = target.getLIRKind(kind);
-                locations[i] = StackSlot.get(lirKind, currentStackOffset, !type.out);
-                currentStackOffset += Math.max(lirKind.getPlatformKind().getSizeInBytes(), target.wordSize);
+                ValueKind<?> valueKind = valueKindFactory.getValueKind(kind);
+                locations[i] = StackSlot.get(valueKind, currentStackOffset, !type.out);
+                currentStackOffset += Math.max(valueKind.getPlatformKind().getSizeInBytes(), target.wordSize);
             }
         }
 
         JavaKind returnKind = returnType == null ? JavaKind.Void : returnType.getJavaKind();
-        AllocatableValue returnLocation = returnKind == JavaKind.Void ? Value.ILLEGAL : getReturnRegister(returnKind).asValue(target.getLIRKind(returnKind.getStackKind()));
+        AllocatableValue returnLocation = returnKind == JavaKind.Void ? Value.ILLEGAL : getReturnRegister(returnKind).asValue(valueKindFactory.getValueKind(returnKind.getStackKind()));
         return new CallingConvention(currentStackOffset, returnLocation, locations);
     }
 
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotJVMCIBackendFactory.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotJVMCIBackendFactory.java
index 703167d99e3..ca1ffeedfb2 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotJVMCIBackendFactory.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotJVMCIBackendFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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 class SPARCHotSpotJVMCIBackendFactory implements HotSpotJVMCIBackendFacto
         TargetDescription target = createTarget(runtime.getConfig());
 
         HotSpotMetaAccessProvider metaAccess = new HotSpotMetaAccessProvider(runtime);
-        RegisterConfig regConfig = new SPARCHotSpotRegisterConfig(target.arch, runtime.getConfig());
+        RegisterConfig regConfig = new SPARCHotSpotRegisterConfig(target, runtime.getConfig());
         HotSpotCodeCacheProvider codeCache = createCodeCache(runtime, target, regConfig);
         HotSpotConstantReflectionProvider constantReflection = new HotSpotConstantReflectionProvider(runtime);
         StackIntrospection stackIntrospection = new HotSpotStackIntrospection(runtime);
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java
index d94ee128202..db06e44243c 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,19 +78,20 @@ import jdk.vm.ci.code.RegisterAttributes;
 import jdk.vm.ci.code.RegisterConfig;
 import jdk.vm.ci.code.StackSlot;
 import jdk.vm.ci.code.TargetDescription;
+import jdk.vm.ci.code.ValueKindFactory;
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.hotspot.HotSpotCallingConventionType;
 import jdk.vm.ci.hotspot.HotSpotVMConfig;
 import jdk.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
-import jdk.vm.ci.meta.LIRKind;
 import jdk.vm.ci.meta.PlatformKind;
+import jdk.vm.ci.meta.ValueKind;
 import jdk.vm.ci.sparc.SPARC;
 
 public class SPARCHotSpotRegisterConfig implements RegisterConfig {
 
-    private final Architecture architecture;
+    private final TargetDescription target;
 
     private final Register[] allocatable;
 
@@ -110,7 +111,7 @@ public class SPARCHotSpotRegisterConfig implements RegisterConfig {
     public Register[] filterAllocatableRegisters(PlatformKind kind, Register[] registers) {
         ArrayList<Register> list = new ArrayList<>();
         for (Register reg : registers) {
-            if (architecture.canStoreValue(reg.getRegisterCategory(), kind)) {
+            if (target.arch.canStoreValue(reg.getRegisterCategory(), kind)) {
                 list.add(reg);
             }
         }
@@ -166,16 +167,16 @@ public class SPARCHotSpotRegisterConfig implements RegisterConfig {
         return registers;
     }
 
-    public SPARCHotSpotRegisterConfig(Architecture arch, HotSpotVMConfig config) {
-        this(arch, initAllocatable(arch, config.useCompressedOops), config);
+    public SPARCHotSpotRegisterConfig(TargetDescription target, HotSpotVMConfig config) {
+        this(target, initAllocatable(target.arch, config.useCompressedOops), config);
     }
 
-    public SPARCHotSpotRegisterConfig(Architecture arch, Register[] allocatable, HotSpotVMConfig config) {
-        this.architecture = arch;
+    public SPARCHotSpotRegisterConfig(TargetDescription target, Register[] allocatable, HotSpotVMConfig config) {
+        this.target = target;
         this.allocatable = allocatable.clone();
         this.addNativeRegisterArgumentSlots = config.linuxOs;
         HashSet<Register> callerSaveSet = new HashSet<>();
-        Collections.addAll(callerSaveSet, arch.getAvailableValueRegisters());
+        Collections.addAll(callerSaveSet, target.arch.getAvailableValueRegisters());
         for (Register cs : calleeSaveRegisters) {
             callerSaveSet.remove(cs);
         }
@@ -203,13 +204,13 @@ public class SPARCHotSpotRegisterConfig implements RegisterConfig {
     }
 
     @Override
-    public CallingConvention getCallingConvention(Type type, JavaType returnType, JavaType[] parameterTypes, TargetDescription target) {
+    public CallingConvention getCallingConvention(Type type, JavaType returnType, JavaType[] parameterTypes, ValueKindFactory<?> valueKindFactory) {
         HotSpotCallingConventionType hotspotType = (HotSpotCallingConventionType) type;
         if (type == HotSpotCallingConventionType.JavaCall || type == HotSpotCallingConventionType.NativeCall) {
-            return callingConvention(cpuCallerParameterRegisters, returnType, parameterTypes, hotspotType, target);
+            return callingConvention(cpuCallerParameterRegisters, returnType, parameterTypes, hotspotType, valueKindFactory);
         }
         if (type == HotSpotCallingConventionType.JavaCallee) {
-            return callingConvention(cpuCalleeParameterRegisters, returnType, parameterTypes, hotspotType, target);
+            return callingConvention(cpuCalleeParameterRegisters, returnType, parameterTypes, hotspotType, valueKindFactory);
         }
         throw JVMCIError.shouldNotReachHere();
     }
@@ -234,7 +235,8 @@ public class SPARCHotSpotRegisterConfig implements RegisterConfig {
         }
     }
 
-    private CallingConvention callingConvention(Register[] generalParameterRegisters, JavaType returnType, JavaType[] parameterTypes, HotSpotCallingConventionType type, TargetDescription target) {
+    private CallingConvention callingConvention(Register[] generalParameterRegisters, JavaType returnType, JavaType[] parameterTypes, HotSpotCallingConventionType type,
+                    ValueKindFactory<?> valueKindFactory) {
         AllocatableValue[] locations = new AllocatableValue[parameterTypes.length];
 
         int currentGeneral = 0;
@@ -254,7 +256,7 @@ public class SPARCHotSpotRegisterConfig implements RegisterConfig {
                 case Object:
                     if (currentGeneral < generalParameterRegisters.length) {
                         Register register = generalParameterRegisters[currentGeneral++];
-                        locations[i] = register.asValue(target.getLIRKind(kind));
+                        locations[i] = register.asValue(valueKindFactory.getValueKind(kind));
                     }
                     break;
                 case Double:
@@ -265,13 +267,13 @@ public class SPARCHotSpotRegisterConfig implements RegisterConfig {
                         }
                         Register register = fpuDoubleParameterRegisters[currentFloating];
                         currentFloating += 2; // Only every second is a double register
-                        locations[i] = register.asValue(target.getLIRKind(kind));
+                        locations[i] = register.asValue(valueKindFactory.getValueKind(kind));
                     }
                     break;
                 case Float:
                     if (currentFloating < fpuFloatParameterRegisters.length) {
                         Register register = fpuFloatParameterRegisters[currentFloating++];
-                        locations[i] = register.asValue(target.getLIRKind(kind));
+                        locations[i] = register.asValue(valueKindFactory.getValueKind(kind));
                     }
                     break;
                 default:
@@ -279,18 +281,18 @@ public class SPARCHotSpotRegisterConfig implements RegisterConfig {
             }
 
             if (locations[i] == null) {
-                LIRKind lirKind = target.getLIRKind(kind);
+                ValueKind<?> valueKind = valueKindFactory.getValueKind(kind);
                 // Stack slot is always aligned to its size in bytes but minimum wordsize
-                int typeSize = lirKind.getPlatformKind().getSizeInBytes();
+                int typeSize = valueKind.getPlatformKind().getSizeInBytes();
                 currentStackOffset = roundUp(currentStackOffset, typeSize);
                 int slotOffset = currentStackOffset + REGISTER_SAFE_AREA_SIZE;
-                locations[i] = StackSlot.get(lirKind, slotOffset, !type.out);
+                locations[i] = StackSlot.get(valueKind, slotOffset, !type.out);
                 currentStackOffset += typeSize;
             }
         }
 
         JavaKind returnKind = returnType == null ? Void : returnType.getJavaKind();
-        AllocatableValue returnLocation = returnKind == Void ? ILLEGAL : getReturnRegister(returnKind, type).asValue(target.getLIRKind(returnKind.getStackKind()));
+        AllocatableValue returnLocation = returnKind == Void ? ILLEGAL : getReturnRegister(returnKind, type).asValue(valueKindFactory.getValueKind(returnKind.getStackKind()));
 
         int outArgSpillArea;
         if (type == HotSpotCallingConventionType.NativeCall && addNativeRegisterArgumentSlots) {
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSentinelConstant.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSentinelConstant.java
index 76cd07a3979..bf41e273452 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSentinelConstant.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSentinelConstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,7 @@ package jdk.vm.ci.hotspot;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.meta.LIRKind;
+import jdk.vm.ci.meta.ValueKind;
 import jdk.vm.ci.meta.VMConstant;
 import jdk.vm.ci.meta.Value;
 
@@ -32,8 +32,8 @@ public final class HotSpotSentinelConstant extends Value implements JavaConstant
 
     private final JavaKind javaKind;
 
-    public HotSpotSentinelConstant(LIRKind lirKind, JavaKind javaKind) {
-        super(lirKind);
+    public HotSpotSentinelConstant(ValueKind<?> valueKind, JavaKind javaKind) {
+        super(valueKind);
         this.javaKind = javaKind;
     }
 
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/AllocatableValue.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/AllocatableValue.java
index 17fc39b9cfd..23d696523a3 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/AllocatableValue.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/AllocatableValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@ public abstract class AllocatableValue extends Value implements JavaValue {
 
     public static final AllocatableValue[] NONE = {};
 
-    public AllocatableValue(LIRKind lirKind) {
-        super(lirKind);
+    public AllocatableValue(ValueKind<?> kind) {
+        super(kind);
     }
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LIRKind.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LIRKind.java
deleted file mode 100644
index 9ac93d9c944..00000000000
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LIRKind.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/*
- * Copyright (c) 2014, 2015, 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.ArrayList;
-
-/**
- * Represents the type of values in the LIR. It is composed of a {@link PlatformKind} that gives the
- * low level representation of the value, and a {@link #referenceMask} that describes the location
- * of object references in the value, and optionally a {@link #derivedReferenceBase}.
- *
- * <h2>Constructing {@link LIRKind} instances</h2>
- *
- * During LIR generation, every new {@link Value} should get a {@link LIRKind} of the correct
- * {@link PlatformKind} that also contains the correct reference information. {@linkplain LIRKind
- * LIRKinds} should be created as follows:
- *
- * <p>
- * If the result value is created from one or more input values, the {@link LIRKind} should be
- * created with {@link LIRKind#combine}(inputs). If the result has a different {@link PlatformKind}
- * than the inputs, {@link LIRKind#combine}(inputs).{@link #changeType}(resultKind) should be used.
- * <p>
- * If the result is an exact copy of one of the inputs, {@link Value#getLIRKind()} can be used. Note
- * that this is only correct for move-like operations, like conditional move or compare-and-swap.
- * For convert operations, {@link LIRKind#combine} should be used.
- * <p>
- * If it is known that the result will be a reference (e.g. pointer arithmetic where the end result
- * is a valid oop), {@link LIRKind#reference} should be used.
- * <p>
- * If it is known that the result will neither be a reference nor be derived from a reference,
- * {@link LIRKind#value} can be used. If the operation producing this value has inputs, this is very
- * likely wrong, and {@link LIRKind#combine} should be used instead.
- * <p>
- * If it is known that the result is derived from a reference in a way that the garbage collector
- * can not track, {@link LIRKind#unknownReference} can be used. In most cases,
- * {@link LIRKind#combine} should be used instead, since it is able to detect this automatically.
- */
-public final class LIRKind {
-
-    private enum IllegalKind implements PlatformKind {
-        ILLEGAL;
-
-        private final EnumKey<IllegalKind> key = new EnumKey<>(this);
-
-        public Key getKey() {
-            return key;
-        }
-
-        public int getSizeInBytes() {
-            return 0;
-        }
-
-        public int getVectorLength() {
-            return 0;
-        }
-
-        public char getTypeChar() {
-            return '-';
-        }
-    }
-
-    /**
-     * The non-type. This uses {@link #unknownReference}, so it can never be part of an oop map.
-     */
-    public static final LIRKind Illegal = unknownReference(IllegalKind.ILLEGAL);
-
-    private final PlatformKind platformKind;
-    private final int referenceMask;
-
-    private AllocatableValue derivedReferenceBase;
-
-    private static final int UNKNOWN_REFERENCE = -1;
-
-    private LIRKind(PlatformKind platformKind, int referenceMask, AllocatableValue derivedReferenceBase) {
-        this.platformKind = platformKind;
-        this.referenceMask = referenceMask;
-        this.derivedReferenceBase = derivedReferenceBase;
-
-        assert derivedReferenceBase == null || !derivedReferenceBase.getLIRKind().isDerivedReference() : "derived reference can't have another derived reference as base";
-    }
-
-    /**
-     * Create a {@link LIRKind} of type {@code platformKind} that contains a primitive value. Should
-     * be only used when it's guaranteed that the value is not even indirectly derived from a
-     * reference. Otherwise, {@link #combine(Value...)} should be used instead.
-     */
-    public static LIRKind value(PlatformKind platformKind) {
-        return new LIRKind(platformKind, 0, null);
-    }
-
-    /**
-     * Create a {@link LIRKind} of type {@code platformKind} that contains a single tracked oop
-     * reference.
-     */
-    public static LIRKind reference(PlatformKind platformKind) {
-        return derivedReference(platformKind, null);
-    }
-
-    /**
-     * Create a {@link LIRKind} of type {@code platformKind} that contains a derived reference.
-     */
-    public static LIRKind derivedReference(PlatformKind platformKind, AllocatableValue base) {
-        int length = platformKind.getVectorLength();
-        assert 0 < length && length < 32 : "vector of " + length + " references not supported";
-        return new LIRKind(platformKind, (1 << length) - 1, base);
-    }
-
-    /**
-     * Create a {@link LIRKind} of type {@code platformKind} that contains a value that is derived
-     * from a reference in a non-linear way. Values of this {@link LIRKind} can not be live at
-     * safepoints. In most cases, this should not be called directly. {@link #combine} should be
-     * used instead to automatically propagate this information.
-     */
-    public static LIRKind unknownReference(PlatformKind platformKind) {
-        return new LIRKind(platformKind, UNKNOWN_REFERENCE, null);
-    }
-
-    /**
-     * Create a derived reference.
-     *
-     * @param base An {@link AllocatableValue} containing the base pointer of the derived reference.
-     */
-    public LIRKind makeDerivedReference(AllocatableValue base) {
-        assert !isUnknownReference() && derivedReferenceBase == null;
-        if (Value.ILLEGAL.equals(base)) {
-            return makeUnknownReference();
-        } else {
-            if (isValue()) {
-                return derivedReference(platformKind, base);
-            } else {
-                return new LIRKind(platformKind, referenceMask, base);
-            }
-        }
-    }
-
-    /**
-     * Derive a new type from inputs. The result will have the {@link PlatformKind} of one of the
-     * inputs. If all inputs are values, the result is a value. Otherwise, the result is an unknown
-     * reference.
-     *
-     * This method should be used to construct the result {@link LIRKind} of any operation that
-     * modifies values (e.g. arithmetics).
-     */
-    public static LIRKind combine(Value... inputs) {
-        assert inputs.length > 0;
-        for (Value input : inputs) {
-            LIRKind kind = input.getLIRKind();
-            if (kind.isUnknownReference()) {
-                return kind;
-            } else if (!kind.isValue()) {
-                return kind.makeUnknownReference();
-            }
-        }
-
-        // all inputs are values, just return one of them
-        return inputs[0].getLIRKind();
-    }
-
-    /**
-     * Merge the types of the inputs. The result will have the {@link PlatformKind} of one of the
-     * inputs. If all inputs are values (references), the result is a value (reference). Otherwise,
-     * the result is an unknown reference.
-     *
-     * This method should be used to construct the result {@link LIRKind} of merge operation that
-     * does not modify values (e.g. phis).
-     */
-    public static LIRKind merge(Value... inputs) {
-        assert inputs.length > 0;
-        ArrayList<LIRKind> kinds = new ArrayList<>(inputs.length);
-        for (int i = 0; i < inputs.length; i++) {
-            kinds.add(inputs[i].getLIRKind());
-        }
-        return merge(kinds);
-    }
-
-    /**
-     * Helper method to construct derived reference kinds. Returns the base value of a reference or
-     * derived reference. For values it returns {@code null}, and for unknown references it returns
-     * {@link Value#ILLEGAL}.
-     */
-    public static AllocatableValue derivedBaseFromValue(AllocatableValue value) {
-        LIRKind kind = value.getLIRKind();
-        if (kind.isValue()) {
-            return null;
-        } else if (kind.isDerivedReference()) {
-            return kind.getDerivedReferenceBase();
-        } else if (kind.isUnknownReference()) {
-            return Value.ILLEGAL;
-        } else {
-            // kind is a reference
-            return value;
-        }
-    }
-
-    /**
-     * Helper method to construct derived reference kinds. If one of {@code base1} or {@code base2}
-     * are set, it creates a derived reference using it as the base. If both are set, the result is
-     * an unknown reference.
-     */
-    public static LIRKind combineDerived(LIRKind kind, AllocatableValue base1, AllocatableValue base2) {
-        if (base1 == null && base2 == null) {
-            return kind;
-        } else if (base1 == null) {
-            return kind.makeDerivedReference(base2);
-        } else if (base2 == null) {
-            return kind.makeDerivedReference(base1);
-        } else {
-            return kind.makeUnknownReference();
-        }
-    }
-
-    /**
-     * @see #merge(Value...)
-     */
-    public static LIRKind merge(Iterable<LIRKind> kinds) {
-        LIRKind mergeKind = null;
-
-        for (LIRKind kind : kinds) {
-
-            if (kind.isUnknownReference()) {
-                /**
-                 * Kind is an unknown reference, therefore the result can only be also an unknown
-                 * reference.
-                 */
-                mergeKind = kind;
-                break;
-            }
-            if (mergeKind == null) {
-                mergeKind = kind;
-                continue;
-            }
-
-            if (kind.isValue()) {
-                /* Kind is a value. */
-                if (mergeKind.referenceMask != 0) {
-                    /*
-                     * Inputs consists of values and references. Make the result an unknown
-                     * reference.
-                     */
-                    mergeKind = mergeKind.makeUnknownReference();
-                    break;
-                }
-                /* Check that other inputs are also values. */
-            } else {
-                /* Kind is a reference. */
-                if (mergeKind.referenceMask != kind.referenceMask) {
-                    /*
-                     * Reference maps do not match so the result can only be an unknown reference.
-                     */
-                    mergeKind = mergeKind.makeUnknownReference();
-                    break;
-                }
-            }
-
-        }
-        assert mergeKind != null && verifyMerge(mergeKind, kinds);
-
-        // all inputs are values or references, just return one of them
-        return mergeKind;
-    }
-
-    private static boolean verifyMerge(LIRKind mergeKind, Iterable<LIRKind> kinds) {
-        for (LIRKind kind : kinds) {
-            assert mergeKind == null || verifyMoveKinds(mergeKind, kind) : String.format("Input kinds do not match %s vs. %s", mergeKind, kind);
-        }
-        return true;
-    }
-
-    /**
-     * Create a new {@link LIRKind} with the same reference information and a new
-     * {@linkplain #getPlatformKind platform kind}. If the new kind is a longer vector than this,
-     * the new elements are marked as untracked values.
-     */
-    public LIRKind changeType(PlatformKind newPlatformKind) {
-        if (newPlatformKind == platformKind) {
-            return this;
-        } else if (isUnknownReference()) {
-            return unknownReference(newPlatformKind);
-        } else if (referenceMask == 0) {
-            // value type
-            return LIRKind.value(newPlatformKind);
-        } else {
-            // reference type
-            int newLength = Math.min(32, newPlatformKind.getVectorLength());
-            int newReferenceMask = referenceMask & (0xFFFFFFFF >>> (32 - newLength));
-            assert newReferenceMask != UNKNOWN_REFERENCE;
-            return new LIRKind(newPlatformKind, newReferenceMask, derivedReferenceBase);
-        }
-    }
-
-    /**
-     * Create a new {@link LIRKind} with a new {@linkplain #getPlatformKind platform kind}. If the
-     * new kind is longer than this, the reference positions are repeated to fill the vector.
-     */
-    public LIRKind repeat(PlatformKind newPlatformKind) {
-        if (isUnknownReference()) {
-            return unknownReference(newPlatformKind);
-        } else if (referenceMask == 0) {
-            // value type
-            return LIRKind.value(newPlatformKind);
-        } else {
-            // reference type
-            int oldLength = platformKind.getVectorLength();
-            int newLength = newPlatformKind.getVectorLength();
-            assert oldLength <= newLength && newLength < 32 && (newLength % oldLength) == 0;
-
-            // repeat reference mask to fill new kind
-            int newReferenceMask = 0;
-            for (int i = 0; i < newLength; i += platformKind.getVectorLength()) {
-                newReferenceMask |= referenceMask << i;
-            }
-
-            assert newReferenceMask != UNKNOWN_REFERENCE;
-            return new LIRKind(newPlatformKind, newReferenceMask, derivedReferenceBase);
-        }
-    }
-
-    /**
-     * Create a new {@link LIRKind} with the same type, but marked as containing an
-     * {@link LIRKind#unknownReference}.
-     */
-    public LIRKind makeUnknownReference() {
-        return new LIRKind(platformKind, UNKNOWN_REFERENCE, null);
-    }
-
-    /**
-     * Get the low level type that is used in code generation.
-     */
-    public PlatformKind getPlatformKind() {
-        return platformKind;
-    }
-
-    /**
-     * Check whether this value is a derived reference.
-     */
-    public boolean isDerivedReference() {
-        return getDerivedReferenceBase() != null;
-    }
-
-    /**
-     * Get the base value of a derived reference.
-     */
-    public AllocatableValue getDerivedReferenceBase() {
-        return derivedReferenceBase;
-    }
-
-    /**
-     * Change the base value of a derived reference. This must be called on derived references only.
-     */
-    public void setDerivedReferenceBase(AllocatableValue derivedReferenceBase) {
-        assert isDerivedReference();
-        this.derivedReferenceBase = derivedReferenceBase;
-    }
-
-    /**
-     * Check whether this value is derived from a reference in a non-linear way. If this returns
-     * {@code true}, this value must not be live at safepoints.
-     */
-    public boolean isUnknownReference() {
-        return referenceMask == UNKNOWN_REFERENCE;
-    }
-
-    public int getReferenceCount() {
-        assert !isUnknownReference();
-        return Integer.bitCount(referenceMask);
-    }
-
-    /**
-     * Check whether the {@code idx}th part of this value is a reference that must be tracked at
-     * safepoints.
-     *
-     * @param idx The index into the vector if this is a vector kind. Must be 0 if this is a scalar
-     *            kind.
-     */
-    public boolean isReference(int idx) {
-        assert 0 <= idx && idx < platformKind.getVectorLength() : "invalid index " + idx + " in " + this;
-        return !isUnknownReference() && (referenceMask & 1 << idx) != 0;
-    }
-
-    /**
-     * Check whether this kind is a value type that doesn't need to be tracked at safepoints.
-     */
-    public boolean isValue() {
-        return referenceMask == 0;
-    }
-
-    @Override
-    public String toString() {
-        if (isValue()) {
-            return platformKind.name();
-        } else if (isUnknownReference()) {
-            return platformKind.name() + "[*]";
-        } else {
-            StringBuilder ret = new StringBuilder();
-            ret.append(platformKind.name());
-            ret.append('[');
-            for (int i = 0; i < platformKind.getVectorLength(); i++) {
-                if (isReference(i)) {
-                    ret.append('.');
-                } else {
-                    ret.append(' ');
-                }
-            }
-            ret.append(']');
-            return ret.toString();
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((platformKind == null) ? 0 : platformKind.hashCode());
-        result = prime * result + referenceMask;
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (!(obj instanceof LIRKind)) {
-            return false;
-        }
-
-        LIRKind other = (LIRKind) obj;
-        return platformKind == other.platformKind && referenceMask == other.referenceMask;
-    }
-
-    public static boolean verifyMoveKinds(LIRKind dst, LIRKind src) {
-        if (src.equals(dst)) {
-            return true;
-        }
-        if (src.getPlatformKind().equals(dst.getPlatformKind())) {
-            return !src.isUnknownReference() || dst.isUnknownReference();
-        }
-        return false;
-    }
-}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Value.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Value.java
index 1e084abe80a..6d364d72f53 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Value.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Value.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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,7 +33,7 @@ public abstract class Value {
 
     private static final class IllegalValue extends AllocatableValue {
         private IllegalValue() {
-            super(LIRKind.Illegal);
+            super(ValueKind.Illegal);
         }
 
         @Override
@@ -49,15 +49,15 @@ public abstract class Value {
         }
     }
 
-    private final LIRKind lirKind;
+    private final ValueKind<?> valueKind;
 
     /**
      * Initializes a new value of the specified kind.
      *
-     * @param lirKind the kind
+     * @param valueKind the kind
      */
-    protected Value(LIRKind lirKind) {
-        this.lirKind = lirKind;
+    protected Value(ValueKind<?> valueKind) {
+        this.valueKind = valueKind;
     }
 
     /**
@@ -68,27 +68,31 @@ public abstract class Value {
         return "|" + getPlatformKind().getTypeChar();
     }
 
-    public final LIRKind getLIRKind() {
-        return lirKind;
+    public final ValueKind<?> getValueKind() {
+        return valueKind;
+    }
+
+    public final <K extends ValueKind<K>> K getValueKind(Class<K> cls) {
+        return cls.cast(valueKind);
     }
 
     /**
      * Returns the platform specific kind used to store this value.
      */
     public final PlatformKind getPlatformKind() {
-        return lirKind.getPlatformKind();
+        return valueKind.getPlatformKind();
     }
 
     @Override
     public int hashCode() {
-        return 41 + lirKind.hashCode();
+        return 41 + valueKind.hashCode();
     }
 
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof Value) {
             Value that = (Value) obj;
-            return lirKind.equals(that.lirKind);
+            return valueKind.equals(that.valueKind);
         }
         return false;
     }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ValueKind.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ValueKind.java
new file mode 100644
index 00000000000..84a10ababfc
--- /dev/null
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ValueKind.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2016, 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;
+
+/**
+ * Represents the type of {@link Value values}. This class can be extended by compilers to track
+ * additional information about values.
+ */
+public abstract class ValueKind<K extends ValueKind<K>> {
+
+    private enum IllegalKind implements PlatformKind {
+        ILLEGAL;
+
+        private final EnumKey<IllegalKind> key = new EnumKey<>(this);
+
+        public Key getKey() {
+            return key;
+        }
+
+        public int getSizeInBytes() {
+            return 0;
+        }
+
+        public int getVectorLength() {
+            return 0;
+        }
+
+        public char getTypeChar() {
+            return '-';
+        }
+    }
+
+    private static class IllegalValueKind extends ValueKind<IllegalValueKind> {
+
+        IllegalValueKind() {
+            super(IllegalKind.ILLEGAL);
+        }
+
+        @Override
+        public IllegalValueKind changeType(PlatformKind newPlatformKind) {
+            return this;
+        }
+    }
+
+    /**
+     * The non-type.
+     */
+    public static final ValueKind<?> Illegal = new IllegalValueKind();
+
+    private final PlatformKind platformKind;
+
+    public ValueKind(PlatformKind platformKind) {
+        this.platformKind = platformKind;
+    }
+
+    public final PlatformKind getPlatformKind() {
+        return platformKind;
+    }
+
+    /**
+     * Create a new {@link ValueKind} with a different {@link PlatformKind}. Subclasses must
+     * override this to preserve the additional information added by the compiler.
+     */
+    public abstract K changeType(PlatformKind newPlatformKind);
+}
diff --git a/hotspot/src/share/vm/jvmci/jvmciCodeInstaller.cpp b/hotspot/src/share/vm/jvmci/jvmciCodeInstaller.cpp
index 16b64be8c37..fee18f99630 100644
--- a/hotspot/src/share/vm/jvmci/jvmciCodeInstaller.cpp
+++ b/hotspot/src/share/vm/jvmci/jvmciCodeInstaller.cpp
@@ -219,9 +219,8 @@ narrowKlass CodeInstaller::record_narrow_metadata_reference(Handle constant, TRA
 #endif
 
 Location::Type CodeInstaller::get_oop_type(Handle value) {
-  Handle lirKind = Value::lirKind(value);
-  Handle platformKind = LIRKind::platformKind(lirKind);
-  assert(LIRKind::referenceMask(lirKind) == 1, "unexpected referenceMask");
+  Handle valueKind = Value::valueKind(value);
+  Handle platformKind = ValueKind::platformKind(valueKind);
 
   if (platformKind == word_kind()) {
     return Location::oop;
diff --git a/hotspot/src/share/vm/jvmci/jvmciJavaClasses.hpp b/hotspot/src/share/vm/jvmci/jvmciJavaClasses.hpp
index 851b4e4244a..d828f986be3 100644
--- a/hotspot/src/share/vm/jvmci/jvmciJavaClasses.hpp
+++ b/hotspot/src/share/vm/jvmci/jvmciJavaClasses.hpp
@@ -230,12 +230,11 @@ class JVMCIJavaClasses : AllStatic {
     static_oop_field(JavaKind, Int, "Ljdk/vm/ci/meta/JavaKind;");                                                                                              \
     static_oop_field(JavaKind, Long, "Ljdk/vm/ci/meta/JavaKind;");                                                                                             \
   end_class                                                                                                                                                    \
-  start_class(LIRKind)                                                                                                                                         \
-    oop_field(LIRKind, platformKind, "Ljdk/vm/ci/meta/PlatformKind;")                                                                                          \
-    int_field(LIRKind, referenceMask)                                                                                                                          \
+  start_class(ValueKind)                                                                                                                                       \
+    oop_field(ValueKind, platformKind, "Ljdk/vm/ci/meta/PlatformKind;")                                                                                        \
   end_class                                                                                                                                                    \
   start_class(Value)                                                                                                                                           \
-    oop_field(Value, lirKind, "Ljdk/vm/ci/meta/LIRKind;")                                                                                                      \
+    oop_field(Value, valueKind, "Ljdk/vm/ci/meta/ValueKind;")                                                                                                  \
     static_oop_field(Value, ILLEGAL, "Ljdk/vm/ci/meta/AllocatableValue;");                                                                                     \
   end_class                                                                                                                                                    \
   start_class(RegisterValue)                                                                                                                                   \
diff --git a/hotspot/src/share/vm/jvmci/systemDictionary_jvmci.hpp b/hotspot/src/share/vm/jvmci/systemDictionary_jvmci.hpp
index 864539f6654..bd4cdb2afbe 100644
--- a/hotspot/src/share/vm/jvmci/systemDictionary_jvmci.hpp
+++ b/hotspot/src/share/vm/jvmci/systemDictionary_jvmci.hpp
@@ -83,7 +83,7 @@
   do_klass(NullConstant_klass,                           jdk_vm_ci_meta_NullConstant,                           Jvmci) \
   do_klass(ExceptionHandler_klass,                       jdk_vm_ci_meta_ExceptionHandler,                       Jvmci) \
   do_klass(JavaKind_klass,                               jdk_vm_ci_meta_JavaKind,                               Jvmci) \
-  do_klass(LIRKind_klass,                                jdk_vm_ci_meta_LIRKind,                                Jvmci) \
+  do_klass(ValueKind_klass,                              jdk_vm_ci_meta_ValueKind,                              Jvmci) \
   do_klass(Value_klass,                                  jdk_vm_ci_meta_Value,                                  Jvmci)
 #endif
 
diff --git a/hotspot/src/share/vm/jvmci/vmSymbols_jvmci.hpp b/hotspot/src/share/vm/jvmci/vmSymbols_jvmci.hpp
index 58bff72bd7e..f09df794758 100644
--- a/hotspot/src/share/vm/jvmci/vmSymbols_jvmci.hpp
+++ b/hotspot/src/share/vm/jvmci/vmSymbols_jvmci.hpp
@@ -56,7 +56,7 @@
   template(jdk_vm_ci_meta_NullConstant,                           "jdk/vm/ci/meta/NullConstant")                           \
   template(jdk_vm_ci_meta_ExceptionHandler,                       "jdk/vm/ci/meta/ExceptionHandler")                       \
   template(jdk_vm_ci_meta_JavaKind,                               "jdk/vm/ci/meta/JavaKind")                               \
-  template(jdk_vm_ci_meta_LIRKind,                                "jdk/vm/ci/meta/LIRKind")                                \
+  template(jdk_vm_ci_meta_ValueKind,                              "jdk/vm/ci/meta/ValueKind")                              \
   template(jdk_vm_ci_meta_Value,                                  "jdk/vm/ci/meta/Value")                                  \
   template(jdk_vm_ci_meta_Assumptions_ConcreteSubtype,            "jdk/vm/ci/meta/Assumptions$ConcreteSubtype")            \
   template(jdk_vm_ci_meta_Assumptions_LeafType,                   "jdk/vm/ci/meta/Assumptions$LeafType")                   \
diff --git a/hotspot/test/compiler/jvmci/errors/TestInvalidDebugInfo.java b/hotspot/test/compiler/jvmci/errors/TestInvalidDebugInfo.java
index 53db53e7d1d..603b360a480 100644
--- a/hotspot/test/compiler/jvmci/errors/TestInvalidDebugInfo.java
+++ b/hotspot/test/compiler/jvmci/errors/TestInvalidDebugInfo.java
@@ -36,6 +36,7 @@
 
 package compiler.jvmci.errors;
 
+import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.BytecodeFrame;
 import jdk.vm.ci.code.DebugInfo;
 import jdk.vm.ci.code.Location;
@@ -53,9 +54,10 @@ import jdk.vm.ci.meta.Assumptions.Assumption;
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaValue;
-import jdk.vm.ci.meta.LIRKind;
+import jdk.vm.ci.meta.PlatformKind;
 import jdk.vm.ci.meta.ResolvedJavaType;
 import jdk.vm.ci.meta.Value;
+import jdk.vm.ci.meta.ValueKind;
 
 import org.junit.Test;
 
@@ -67,6 +69,22 @@ public class TestInvalidDebugInfo extends CodeInstallerTest {
     private static class UnknownJavaValue implements JavaValue {
     }
 
+    private static class TestValueKind extends ValueKind<TestValueKind> {
+
+        TestValueKind(Architecture arch, JavaKind kind) {
+            this(arch.getPlatformKind(kind));
+        }
+
+        TestValueKind(PlatformKind kind) {
+            super(kind);
+        }
+
+        @Override
+        public TestValueKind changeType(PlatformKind kind) {
+            return new TestValueKind(kind);
+        }
+    }
+
     private void test(JavaValue[] values, JavaKind[] slotKinds, int locals, int stack, int locks) {
         test(null, values, slotKinds, locals, stack, locks);
     }
@@ -146,7 +164,7 @@ public class TestInvalidDebugInfo extends CodeInstallerTest {
 
     @Test(expected = JVMCIError.class)
     public void testUnexpectedTypeOnStack() {
-        LIRKind kind = codeCache.getTarget().getLIRKind(JavaKind.Int);
+        ValueKind<?> kind = new TestValueKind(codeCache.getTarget().arch, JavaKind.Int);
         StackSlot value = StackSlot.get(kind, 8, false);
         test(new JavaValue[]{value}, new JavaKind[]{JavaKind.Illegal}, 1, 0, 0);
     }
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java
index 5b00cb75a3c..13c9d3a9012 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java
@@ -82,7 +82,7 @@ public class SimpleDebugInfoTest extends DebugInfoTest {
     public void testRegInt() {
         DebugInfoCompiler compiler = (asm, values) -> {
             Register reg = asm.emitLoadInt(42);
-            values[0] = reg.asValue(target.getLIRKind(JavaKind.Int));
+            values[0] = reg.asValue(asm.getValueKind(JavaKind.Int));
             return null;
         };
         testIntOnStack(compiler);
@@ -131,7 +131,7 @@ public class SimpleDebugInfoTest extends DebugInfoTest {
     public void testRegFloat() {
         DebugInfoCompiler compiler = (asm, values) -> {
             Register reg = asm.emitLoadFloat(42.0f);
-            values[0] = reg.asValue(target.getLIRKind(JavaKind.Float));
+            values[0] = reg.asValue(asm.getValueKind(JavaKind.Float));
             return null;
         };
         testFloatOnStack(compiler);
@@ -181,7 +181,7 @@ public class SimpleDebugInfoTest extends DebugInfoTest {
     public void testRegLong() {
         DebugInfoCompiler compiler = (asm, values) -> {
             Register reg = asm.emitLoadLong(42);
-            values[0] = reg.asValue(target.getLIRKind(JavaKind.Long));
+            values[0] = reg.asValue(asm.getValueKind(JavaKind.Long));
             values[1] = Value.ILLEGAL;
             return null;
         };
@@ -234,7 +234,7 @@ public class SimpleDebugInfoTest extends DebugInfoTest {
         ResolvedJavaType type = metaAccess.lookupJavaType(objectOnStack());
         DebugInfoCompiler compiler = (asm, values) -> {
             Register reg = asm.emitLoadPointer((HotSpotConstant) constantReflection.asJavaClass(type));
-            values[0] = reg.asValue(target.getLIRKind(JavaKind.Object));
+            values[0] = reg.asValue(asm.getValueKind(JavaKind.Object));
             return null;
         };
         testObjectOnStack(compiler);
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestAssembler.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestAssembler.java
index 9e10e46ae80..a1ca6be48d9 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestAssembler.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestAssembler.java
@@ -48,9 +48,10 @@ import jdk.vm.ci.hotspot.HotSpotConstant;
 import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
 import jdk.vm.ci.meta.Assumptions.Assumption;
 import jdk.vm.ci.meta.InvokeTarget;
-import jdk.vm.ci.meta.LIRKind;
+import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.PlatformKind;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.meta.ValueKind;
 import jdk.vm.ci.meta.VMConstant;
 
 /**
@@ -173,7 +174,7 @@ public abstract class TestAssembler {
      */
     public abstract void emitTrap(DebugInfo info);
 
-    public final LIRKind narrowOopKind;
+    public final ValueKind<?> narrowOopKind;
 
     protected final Buffer code;
     protected final Buffer data;
@@ -191,8 +192,20 @@ public abstract class TestAssembler {
 
     private StackSlot deoptRescue;
 
+    private static class TestValueKind extends ValueKind<TestValueKind> {
+
+        TestValueKind(PlatformKind kind) {
+            super(kind);
+        }
+
+        @Override
+        public TestValueKind changeType(PlatformKind kind) {
+            return new TestValueKind(kind);
+        }
+    }
+
     protected TestAssembler(CodeCacheProvider codeCache, int initialFrameSize, int stackAlignment, PlatformKind narrowOopKind, Register... registers) {
-        this.narrowOopKind = LIRKind.reference(narrowOopKind);
+        this.narrowOopKind = new TestValueKind(narrowOopKind);
 
         this.code = new Buffer();
         this.data = new Buffer();
@@ -209,12 +222,16 @@ public abstract class TestAssembler {
         this.curStackSlot = initialFrameSize;
     }
 
+    public ValueKind<?> getValueKind(JavaKind kind) {
+        return new TestValueKind(codeCache.getTarget().arch.getPlatformKind(kind));
+    }
+
     protected Register newRegister() {
         return registers[nextRegister++];
     }
 
-    protected StackSlot newStackSlot(LIRKind kind) {
-        curStackSlot += kind.getPlatformKind().getSizeInBytes();
+    protected StackSlot newStackSlot(PlatformKind kind) {
+        curStackSlot += kind.getSizeInBytes();
         if (curStackSlot > frameSize) {
             int newFrameSize = curStackSlot;
             if (newFrameSize % stackAlignment != 0) {
@@ -223,7 +240,7 @@ public abstract class TestAssembler {
             emitGrowStack(newFrameSize - frameSize);
             frameSize = newFrameSize;
         }
-        return StackSlot.get(kind, -curStackSlot, true);
+        return StackSlot.get(new TestValueKind(kind), -curStackSlot, true);
     }
 
     protected void setDeoptRescueSlot(StackSlot deoptRescue) {
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectDebugInfoTest.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectDebugInfoTest.java
index 04dd67ccf0d..6c2f5d7ae31 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectDebugInfoTest.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectDebugInfoTest.java
@@ -136,7 +136,7 @@ public class VirtualObjectDebugInfoTest extends DebugInfoTest {
             } else if (template.arrayField[i] instanceof String) {
                 String value = (String) template.arrayField[i];
                 Register reg = asm.emitLoadPointer((HotSpotConstant) constantReflection.forString(value));
-                arrayContent[i] = reg.asValue(target.getLIRKind(JavaKind.Object));
+                arrayContent[i] = reg.asValue(asm.getValueKind(JavaKind.Object));
             } else {
                 Assert.fail("unexpected value");
             }
@@ -159,7 +159,7 @@ public class VirtualObjectDebugInfoTest extends DebugInfoTest {
                     break;
                 case Float: // template.floatField
                     Register fReg = asm.emitLoadFloat(template.floatField);
-                    retContent[i] = fReg.asValue(target.getLIRKind(JavaKind.Float));
+                    retContent[i] = fReg.asValue(asm.getValueKind(JavaKind.Float));
                     break;
                 case Object: // template.arrayField
                     retContent[i] = array;
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java
index 7d249d67b37..61dcbe36444 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java
@@ -37,7 +37,6 @@ import jdk.vm.ci.hotspot.HotSpotConstant;
 import jdk.vm.ci.hotspot.HotSpotForeignCallTarget;
 import jdk.vm.ci.hotspot.HotSpotVMConfig;
 import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.meta.LIRKind;
 import jdk.vm.ci.meta.VMConstant;
 
 public class AMD64TestAssembler extends TestAssembler {
@@ -64,7 +63,7 @@ public class AMD64TestAssembler extends TestAssembler {
         emitFatNop();
         code.emitByte(0x50 | AMD64.rbp.encoding);  // PUSH rbp
         emitMove(true, AMD64.rbp, AMD64.rsp);      // MOV rbp, rsp
-        setDeoptRescueSlot(newStackSlot(LIRKind.value(AMD64Kind.QWORD)));
+        setDeoptRescueSlot(newStackSlot(AMD64Kind.QWORD));
     }
 
     @Override
@@ -193,7 +192,7 @@ public class AMD64TestAssembler extends TestAssembler {
 
     @Override
     public StackSlot emitIntToStack(Register a) {
-        StackSlot ret = newStackSlot(LIRKind.value(AMD64Kind.DWORD));
+        StackSlot ret = newStackSlot(AMD64Kind.DWORD);
         // MOV r/m32,r32
         emitModRMMemory(false, 0x89, a.encoding, AMD64.rbp.encoding, ret.getRawOffset() + 16);
         return ret;
@@ -201,7 +200,7 @@ public class AMD64TestAssembler extends TestAssembler {
 
     @Override
     public StackSlot emitLongToStack(Register a) {
-        StackSlot ret = newStackSlot(LIRKind.value(AMD64Kind.QWORD));
+        StackSlot ret = newStackSlot(AMD64Kind.QWORD);
         // MOV r/m64,r64
         emitModRMMemory(true, 0x89, a.encoding, AMD64.rbp.encoding, ret.getRawOffset() + 16);
         return ret;
@@ -209,7 +208,7 @@ public class AMD64TestAssembler extends TestAssembler {
 
     @Override
     public StackSlot emitFloatToStack(Register a) {
-        StackSlot ret = newStackSlot(LIRKind.value(AMD64Kind.SINGLE));
+        StackSlot ret = newStackSlot(AMD64Kind.SINGLE);
         emitREX(false, a.encoding, 0, 0);
         code.emitByte(0xF3);
         code.emitByte(0x0F);
@@ -221,7 +220,7 @@ public class AMD64TestAssembler extends TestAssembler {
 
     @Override
     public StackSlot emitPointerToStack(Register a) {
-        StackSlot ret = newStackSlot(LIRKind.reference(AMD64Kind.QWORD));
+        StackSlot ret = newStackSlot(AMD64Kind.QWORD);
         // MOV r/m64,r64
         emitModRMMemory(true, 0x89, a.encoding, AMD64.rbp.encoding, ret.getRawOffset() + 16);
         return ret;
@@ -229,7 +228,7 @@ public class AMD64TestAssembler extends TestAssembler {
 
     @Override
     public StackSlot emitNarrowPointerToStack(Register a) {
-        StackSlot ret = newStackSlot(LIRKind.reference(AMD64Kind.DWORD));
+        StackSlot ret = newStackSlot(AMD64Kind.DWORD);
         // MOV r/m32,r32
         emitModRMMemory(false, 0x89, a.encoding, AMD64.rbp.encoding, ret.getRawOffset() + 16);
         return ret;
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/sparc/SPARCTestAssembler.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/sparc/SPARCTestAssembler.java
index 7c7aa7bab92..5ac0592a74e 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/sparc/SPARCTestAssembler.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/sparc/SPARCTestAssembler.java
@@ -37,7 +37,6 @@ import jdk.vm.ci.hotspot.HotSpotForeignCallTarget;
 import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
 import jdk.vm.ci.hotspot.HotSpotVMConfig;
 import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.meta.LIRKind;
 import jdk.vm.ci.meta.VMConstant;
 import jdk.vm.ci.sparc.SPARC;
 import jdk.vm.ci.sparc.SPARCKind;
@@ -70,7 +69,7 @@ public class SPARCTestAssembler extends TestAssembler {
     public void emitPrologue() {
         // SAVE sp, -128, sp
         emitOp3(0b10, SPARC.sp, 0b111100, SPARC.sp, -SPARC.REGISTER_SAFE_AREA_SIZE);
-        setDeoptRescueSlot(newStackSlot(LIRKind.value(SPARCKind.XWORD)));
+        setDeoptRescueSlot(newStackSlot(SPARCKind.XWORD));
     }
 
     @Override
@@ -194,7 +193,7 @@ public class SPARCTestAssembler extends TestAssembler {
 
     @Override
     public StackSlot emitIntToStack(Register a) {
-        StackSlot ret = newStackSlot(LIRKind.value(SPARCKind.WORD));
+        StackSlot ret = newStackSlot(SPARCKind.WORD);
         // STW a, [fp+offset]
         emitOp3(0b11, a, 0b000100, SPARC.fp, ret.getRawOffset() + SPARC.STACK_BIAS);
         return ret;
@@ -202,7 +201,7 @@ public class SPARCTestAssembler extends TestAssembler {
 
     @Override
     public StackSlot emitLongToStack(Register a) {
-        StackSlot ret = newStackSlot(LIRKind.value(SPARCKind.XWORD));
+        StackSlot ret = newStackSlot(SPARCKind.XWORD);
         // STX a, [fp+offset]
         emitOp3(0b11, a, 0b001110, SPARC.fp, ret.getRawOffset() + SPARC.STACK_BIAS);
         return ret;
@@ -210,7 +209,7 @@ public class SPARCTestAssembler extends TestAssembler {
 
     @Override
     public StackSlot emitFloatToStack(Register a) {
-        StackSlot ret = newStackSlot(LIRKind.value(SPARCKind.SINGLE));
+        StackSlot ret = newStackSlot(SPARCKind.SINGLE);
         // STF a, [fp+offset]
         emitOp3(0b11, a, 0b100100, SPARC.fp, ret.getRawOffset() + SPARC.STACK_BIAS);
         return ret;
@@ -218,7 +217,7 @@ public class SPARCTestAssembler extends TestAssembler {
 
     @Override
     public StackSlot emitPointerToStack(Register a) {
-        StackSlot ret = newStackSlot(LIRKind.reference(SPARCKind.XWORD));
+        StackSlot ret = newStackSlot(SPARCKind.XWORD);
         // STX a, [fp+offset]
         emitOp3(0b11, a, 0b001110, SPARC.fp, ret.getRawOffset() + SPARC.STACK_BIAS);
         return ret;
@@ -226,7 +225,7 @@ public class SPARCTestAssembler extends TestAssembler {
 
     @Override
     public StackSlot emitNarrowPointerToStack(Register a) {
-        StackSlot ret = newStackSlot(LIRKind.reference(SPARCKind.WORD));
+        StackSlot ret = newStackSlot(SPARCKind.WORD);
         // STW a, [fp+offset]
         emitOp3(0b11, a, 0b000100, SPARC.fp, ret.getRawOffset() + SPARC.STACK_BIAS);
         return ret;

From ef96f2b85c3b415be8f1fb14fdc7687fb5066902 Mon Sep 17 00:00:00 2001
From: Tatiana Pivovarova <tpivovarova@openjdk.org>
Date: Wed, 18 May 2016 20:19:23 +0300
Subject: [PATCH 094/228] 8141149: [jittester] create Visitor for generating
 bytecode 8149463: [jittester] rarely generates tests with compile error

Co-authored-by: Dmitrij Pochepko <dmitrij.pochepko@oracle.com>
Co-authored-by: Igor Ignatyev <igor.ignatyev@oracle.com>
Co-authored-by: Pavel Punegov <pavel.punegov@oracle.com>
Reviewed-by: iignatyev, iveresov
---
 hotspot/test/testlibrary/jittester/Makefile   |    6 +-
 .../src/jdk/test/lib/jittester/Automatic.java |  276 +--
 .../test/lib/jittester/BinaryOperator.java    |   14 +-
 .../src/jdk/test/lib/jittester/Block.java     |   11 +-
 .../src/jdk/test/lib/jittester/Break.java     |    4 +
 .../jdk/test/lib/jittester/BuiltInType.java   |    6 +-
 .../test/lib/jittester/ByteCodeGenerator.java |   96 +
 .../jdk/test/lib/jittester/CastOperator.java  |   10 +-
 .../jdk/test/lib/jittester/CatchBlock.java    |    1 +
 .../src/jdk/test/lib/jittester/Continue.java  |    4 +
 .../jdk/test/lib/jittester/Declaration.java   |    1 +
 .../src/jdk/test/lib/jittester/IRNode.java    |   45 +-
 .../src/jdk/test/lib/jittester/If.java        |    7 +-
 .../test/lib/jittester/Initialization.java    |   10 +-
 .../test/lib/jittester/JavaCodeGenerator.java |   70 +
 .../src/jdk/test/lib/jittester/Literal.java   |    7 +-
 .../jdk/test/lib/jittester/LocalVariable.java |   11 +-
 .../jdk/test/lib/jittester/LogicOperator.java |   37 -
 .../jittester/NonStaticMemberVariable.java    |   14 +-
 .../src/jdk/test/lib/jittester/Nothing.java   |    4 +
 .../src/jdk/test/lib/jittester/Operator.java  |   24 +-
 .../jdk/test/lib/jittester/OperatorKind.java  |  130 +-
 .../test/lib/jittester/PrintVariables.java    |   13 +-
 .../test/lib/jittester/ProductionParams.java  |   10 +-
 .../src/jdk/test/lib/jittester/Rule.java      |   23 +-
 .../src/jdk/test/lib/jittester/Statement.java |    1 +
 .../lib/jittester/StaticMemberVariable.java   |   12 +-
 .../src/jdk/test/lib/jittester/Switch.java    |    1 +
 .../src/jdk/test/lib/jittester/Symbol.java    |   15 +-
 .../jdk/test/lib/jittester/SymbolTable.java   |   24 +-
 .../test/lib/jittester/TernaryOperator.java   |    7 +-
 .../src/jdk/test/lib/jittester/Throw.java     |    1 +
 .../jdk/test/lib/jittester/TryCatchBlock.java |    1 +
 .../src/jdk/test/lib/jittester/Type.java      |    6 +
 .../src/jdk/test/lib/jittester/TypeList.java  |   44 +-
 .../jdk/test/lib/jittester/TypesParser.java   |   34 +-
 .../jdk/test/lib/jittester/UnaryOperator.java |   12 +-
 .../jdk/test/lib/jittester/VariableBase.java  |   13 +-
 .../lib/jittester/VariableDeclaration.java    |    3 +-
 .../jittester/VariableDeclarationBlock.java   |    8 +-
 .../jdk/test/lib/jittester/VariableInfo.java  |    4 +
 .../lib/jittester/arrays/ArrayCreation.java   |    6 +-
 .../lib/jittester/arrays/ArrayElement.java    |    2 +
 .../lib/jittester/arrays/ArrayExtraction.java |    3 +-
 .../classes/ClassDefinitionBlock.java         |    2 +
 .../test/lib/jittester/classes/Interface.java |    2 +
 .../jdk/test/lib/jittester/classes/Klass.java |   18 +-
 .../test/lib/jittester/classes/MainKlass.java |    5 +
 .../factories/ArgumentDeclarationFactory.java |    2 +-
 .../factories/ArithmeticOperatorFactory.java  |   10 +-
 .../factories/ArrayCreationFactory.java       |   17 +-
 .../factories/ArrayElementFactory.java        |   12 +-
 .../factories/ArrayExtractionFactory.java     |   10 +-
 .../factories/AssignmentOperatorFactory.java  |   13 +-
 .../AssignmentOperatorImplFactory.java        |   15 +-
 .../BinaryArithmeticOperatorFactory.java      |    7 +-
 .../BinaryBitwiseOperatorFactory.java         |    9 +-
 .../BinaryComparisonOperatorFactory.java      |    7 +-
 .../BinaryEqualityOperatorFactory.java        |    7 +-
 .../factories/BinaryLogicOperatorFactory.java |    8 +-
 .../factories/BinaryOperatorFactory.java      |   10 +-
 .../factories/BinaryShiftOperatorFactory.java |   10 +-
 .../factories/BinaryStringPlusFactory.java    |    6 +-
 .../BitwiseInversionOperatorFactory.java      |   11 +-
 .../factories/BitwiseOperatorFactory.java     |   10 +-
 .../lib/jittester/factories/BlockFactory.java |   15 +-
 .../lib/jittester/factories/BreakFactory.java |    5 +-
 .../factories/CastOperatorFactory.java        |   17 +-
 .../ClassDefinitionBlockFactory.java          |   18 +-
 ...ndArithmeticAssignmentOperatorFactory.java |   10 +-
 ...poundBitwiseAssignmentOperatorFactory.java |    4 +-
 ...ompoundShiftAssignmentOperatorFactory.java |    7 +-
 .../ConstructorDefinitionBlockFactory.java    |    4 +-
 .../ConstructorDefinitionFactory.java         |    8 +-
 .../jittester/factories/ContinueFactory.java  |    5 +-
 .../factories/CounterInitializerFactory.java  |   12 +-
 .../factories/CounterManipulatorFactory.java  |    7 +-
 .../factories/DeclarationFactory.java         |   41 +-
 .../jittester/factories/DoWhileFactory.java   |   29 +-
 .../factories/ExpressionFactory.java          |    8 +-
 .../test/lib/jittester/factories/Factory.java |    4 +-
 .../lib/jittester/factories/ForFactory.java   |   44 +-
 .../FunctionDeclarationBlockFactory.java      |    4 +-
 .../factories/FunctionDeclarationFactory.java |    8 +-
 .../FunctionDefinitionBlockFactory.java       |    4 +-
 .../factories/FunctionDefinitionFactory.java  |   15 +-
 .../jittester/factories/FunctionFactory.java  |   10 +-
 .../FunctionRedefinitionBlockFactory.java     |    4 +-
 .../FunctionRedefinitionFactory.java          |   26 +-
 .../jittester/factories/IRNodeBuilder.java    |  191 +-
 .../lib/jittester/factories/IfFactory.java    |   25 +-
 .../factories/IncDecOperatorFactory.java      |    6 +-
 .../jittester/factories/InterfaceFactory.java |    6 +-
 .../lib/jittester/factories/KlassFactory.java |   24 +-
 .../jittester/factories/LiteralFactory.java   |   59 +-
 .../factories/LocalVariableFactory.java       |    6 +-
 .../factories/LogicOperatorFactory.java       |   10 +-
 .../LogicalInversionOperatorFactory.java      |    7 +-
 .../factories/LoopingConditionFactory.java    |   16 +-
 .../jittester/factories/MainKlassFactory.java |   27 +-
 .../NonStaticMemberVariableFactory.java       |    6 +-
 .../jittester/factories/NothingFactory.java   |    2 +-
 .../jittester/factories/OperatorFactory.java  |   12 +-
 .../factories/PrintVariablesFactory.java      |   14 +-
 .../jittester/factories/ReturnFactory.java    |    5 +-
 .../lib/jittester/factories/SafeFactory.java  |    8 +-
 .../jittester/factories/StatementFactory.java |    8 +-
 .../StaticConstructorDefinitionFactory.java   |    8 +-
 .../StaticMemberVariableFactory.java          |    6 +-
 .../jittester/factories/SwitchFactory.java    |   38 +-
 .../factories/TernaryOperatorFactory.java     |   35 +-
 .../lib/jittester/factories/ThrowFactory.java |    8 +-
 .../factories/TryCatchBlockFactory.java       |   13 +-
 .../factories/UnaryOperatorFactory.java       |   12 +-
 .../UnaryPlusMinusOperatorFactory.java        |   13 +-
 .../VariableDeclarationBlockFactory.java      |   11 +-
 .../factories/VariableDeclarationFactory.java |   14 +-
 .../jittester/factories/VariableFactory.java  |   10 +-
 .../VariableInitializationFactory.java        |    6 +-
 .../lib/jittester/factories/WhileFactory.java |   33 +-
 .../functions/ArgumentDeclaration.java        |    3 +-
 .../functions/ConstructorDefinition.java      |    2 +
 .../functions/ConstructorDefinitionBlock.java |    2 +
 .../lib/jittester/functions/Function.java     |    9 +-
 .../functions/FunctionDeclaration.java        |    2 +
 .../functions/FunctionDeclarationBlock.java   |    4 +-
 .../functions/FunctionDefinition.java         |    7 +-
 .../functions/FunctionDefinitionBlock.java    |    8 +-
 .../lib/jittester/functions/FunctionInfo.java |    5 +-
 .../functions/FunctionRedefinition.java       |    9 +-
 .../functions/FunctionRedefinitionBlock.java  |    6 +-
 .../test/lib/jittester/functions/Return.java  |    1 +
 .../StaticConstructorDefinition.java          |    2 +
 .../jdk/test/lib/jittester/jtreg/Printer.java |  165 ++
 .../jittester/loops/CounterManipulator.java   |    4 +-
 .../jdk/test/lib/jittester/loops/DoWhile.java |   12 +-
 .../src/jdk/test/lib/jittester/loops/For.java |   13 +-
 .../jdk/test/lib/jittester/loops/Loop.java    |    7 +-
 .../lib/jittester/loops/LoopingCondition.java |    1 +
 .../jdk/test/lib/jittester/loops/While.java   |   12 +-
 .../test/lib/jittester/types/TypeArray.java   |   25 +-
 .../test/lib/jittester/types/TypeKlass.java   |   86 +-
 .../test/lib/jittester/utils/FixedTrees.java  |  213 ++
 .../lib/jittester/utils/OptionResolver.java   |   13 +-
 .../lib/jittester/utils/PseudoRandom.java     |   38 +-
 .../jittester/visitors/ByteCodeVisitor.java   | 1831 +++++++++++++++++
 .../jittester/visitors/JavaCodeVisitor.java   |  394 ++--
 .../test/lib/jittester/visitors/Visitor.java  |    2 -
 148 files changed, 3700 insertions(+), 1346 deletions(-)
 create mode 100644 hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/ByteCodeGenerator.java
 create mode 100644 hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/JavaCodeGenerator.java
 delete mode 100644 hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/LogicOperator.java
 create mode 100644 hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/jtreg/Printer.java
 create mode 100644 hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/FixedTrees.java
 create mode 100644 hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/ByteCodeVisitor.java

diff --git a/hotspot/test/testlibrary/jittester/Makefile b/hotspot/test/testlibrary/jittester/Makefile
index c4ccd025049..91c996e4b4c 100644
--- a/hotspot/test/testlibrary/jittester/Makefile
+++ b/hotspot/test/testlibrary/jittester/Makefile
@@ -91,10 +91,10 @@ manifest:
 	@echo 'Main-Class: jdk.test.lib.jittester.Automatic' >> $(MANIFEST)
 
 compile_testlib: INIT
-	$(JAVAC) -XDignore.symbol.file -Xlint $(TESTLIBRARY_SRC_FILES) -d $(CLASSES_DIR) -source 1.8
+	$(JAVAC) -XDignore.symbol.file -XaddExports:java.base/jdk.internal.misc=ALL-UNNAMED -XaddExports:java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED -Xlint $(TESTLIBRARY_SRC_FILES) -d $(CLASSES_DIR)
 
 COMPILE: INIT filelist compile_testlib
-	$(JAVAC) -cp $(CLASSES_DIR) -XDignore.symbol.file -Xlint -sourcepath $(SRC_DIR) -d $(CLASSES_DIR) -source 1.8 @filelist
+	$(JAVAC) -cp $(CLASSES_DIR) -XDignore.symbol.file -XaddExports:java.base/jdk.internal.misc=ALL-UNNAMED -XaddExports:java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED -Xlint -sourcepath $(SRC_DIR) -d $(CLASSES_DIR) @filelist
 
 filelist: $(SRC_FILES)
 		@rm -f $@
@@ -104,7 +104,7 @@ INIT: $(DIST_DIR)
 	$(shell if [ ! -d $(CLASSES_DIR) ]; then mkdir -p $(CLASSES_DIR); fi)
 
 install: clean_testbase testgroup testroot copytestlibrary JAR cleantmp
-	$(JAVA) -jar $(DIST_JAR) $(APPLICATION_ARGS)
+	$(JAVA) -XaddExports:java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED -ea -jar $(DIST_JAR) $(APPLICATION_ARGS)
 
 clean_testbase:
 	@rm -rf $(TESTBASE_DIR)
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Automatic.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Automatic.java
index 77e7b23c68f..3842d01f607 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Automatic.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Automatic.java
@@ -23,125 +23,165 @@
 
 package jdk.test.lib.jittester;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import jdk.test.lib.jittester.IRNode;
-import jdk.test.lib.jittester.ProductionParams;
-import jdk.test.lib.jittester.SymbolTable;
-import jdk.test.lib.jittester.TypeList;
+import jdk.test.lib.Pair;
 import jdk.test.lib.jittester.factories.IRNodeBuilder;
-import jdk.test.lib.jittester.TypesParser;
+import jdk.test.lib.jittester.jtreg.Printer;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.visitors.JavaCodeVisitor;
+import jdk.test.lib.jittester.utils.FixedTrees;
 import jdk.test.lib.jittester.utils.OptionResolver;
 import jdk.test.lib.jittester.utils.OptionResolver.Option;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-public class Automatic {
-    public static final int minutesToWait = 3;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.LocalTime;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
-    private static String makeTestCase(String name) {
+public class Automatic {
+    private static final int MINUTES_TO_WAIT = Integer.getInteger("jdk.test.lib.jittester", 3);
+
+    static String getJtregHeader(String mainClass, boolean addCompile) {
+        String synopsis = "seed = '" + ProductionParams.seed.value() + "'"
+                + ", specificSeed = '" + PseudoRandom.getCurrentSeed() + "'";
+        StringBuilder header = new StringBuilder();
+        header.append("/*\n * @test\n * @summary ")
+                .append(synopsis)
+                .append(" \n* @library / ../\n");
+        if (addCompile) {
+            header.append("\n * @compile ")
+                    .append(mainClass)
+                    .append(".java\n");
+        }
+        header.append(" * @run build jdk.test.lib.jittester.jtreg.JitTesterDriver "
+                        + "jdk.test.lib.jittester.jtreg.Printer\n")
+                .append(" * @run driver jdk.test.lib.jittester.jtreg.JitTesterDriver ")
+                .append(mainClass)
+                .append("\n */\n\n");
+        if (ProductionParams.printHierarchy.value()) {
+            header.append("/*\n")
+                .append(Automatic.printHierarchy())
+                .append("*/\n");
+        }
+        return header.toString();
+    }
+
+    private static Pair<IRNode, IRNode> generateIRTree(String name) {
         SymbolTable.removeAll();
         TypeList.removeAll();
-        StringBuilder resultVis = new StringBuilder();
-        StringBuilder headerBuilder = new StringBuilder();
-        try {
-            IRNodeBuilder builder = new IRNodeBuilder()
-                    .setPrefix(name)
-                    .setName(name)
-                    .setLevel(0);
 
-            JavaCodeVisitor vis = new JavaCodeVisitor();
-            String synopsis = "seed = '" + ProductionParams.seed.value() + "'";
-            String pathPrefix = ProductionParams.testbaseDir.value()
-                    .replaceAll("([^/]+)", "..");
-            headerBuilder
-                    .append("/*\n")
-                    .append(" * @test\n")
-                    .append(" * @summary ")
-                        .append(synopsis)
-                        .append("\n")
-                    .append(" * @compile ")
-                        .append(name)
-                        .append(".java\n")
-                    .append(" * @run build jdk.test.lib.jittester.jtreg.JitTesterDriver\n")
-                    .append(" * @run driver jdk.test.lib.jittester.jtreg.JitTesterDriver ")
-                        .append(name)
-                        .append("\n")
-                    .append(" */\n\n");
+        IRNodeBuilder builder = new IRNodeBuilder()
+                .setPrefix(name)
+                .setName(name)
+                .setLevel(0);
 
-
-            if (!ProductionParams.disableClasses.value()) {
-                long comlexityLimit = (long) (ProductionParams.complexityLimit.value()
-                        * PseudoRandom.random());
-                IRNode privateClasses = builder.setComplexityLimit(comlexityLimit)
+        Long complexityLimit = ProductionParams.complexityLimit.value();
+        IRNode privateClasses = null;
+        if (!ProductionParams.disableClasses.value()) {
+            long privateClassComlexity = (long) (complexityLimit * PseudoRandom.random());
+            try {
+                privateClasses = builder.setComplexityLimit(privateClassComlexity)
                         .getClassDefinitionBlockFactory()
                         .produce();
-                if (privateClasses != null) {
-                    resultVis.append(privateClasses.accept(vis));
-                }
+            } catch (ProductionFailedException ex) {
+                ex.printStackTrace(System.out);
             }
-            long mainComplexityLimit = (long) (ProductionParams.complexityLimit.value()
-                    * PseudoRandom.random());
-            IRNode mainClass = builder.setComplexityLimit(mainComplexityLimit)
+        }
+        long mainClassComplexity = (long) (complexityLimit * PseudoRandom.random());
+        IRNode mainClass = null;
+        try {
+            mainClass = builder.setComplexityLimit(mainClassComplexity)
                     .getMainKlassFactory()
                     .produce();
-            resultVis.append(mainClass.accept(vis));
-
-            if (ProductionParams.printHierarchy.value()) {
-                headerBuilder
-                        .append("/*\n")
-                        .append(Automatic.printHierarchy())
-                        .append("*/\n");
-            }
-        } catch (Exception e) {
-            e.printStackTrace(System.out);
+            TypeKlass aClass = new TypeKlass(name);
+            mainClass.getChild(1).addChild(FixedTrees.generateMainOrExecuteMethod(aClass, true));
+            mainClass.getChild(1).addChild(FixedTrees.generateMainOrExecuteMethod(aClass, false));
+        } catch (ProductionFailedException ex) {
+            ex.printStackTrace(System.out);
         }
-        return headerBuilder.append(resultVis).toString();
+        return new Pair<>(mainClass, privateClasses);
     }
 
     private static void initializeTestGenerator(String[] params) {
         OptionResolver parser = new OptionResolver();
-        Option<String> propertyFileOpt = parser.addStringOption('p', "property-file", "",
-                "File to read properties from");
+        Option<String> propertyFileOpt = parser.addStringOption('p', "property-file",
+                "conf/default.properties", "File to read properties from");
         ProductionParams.register(parser);
         parser.parse(params, propertyFileOpt);
-        jdk.test.lib.jittester.utils.PseudoRandom.reset(ProductionParams.seed.value());
-        TypesParser.parseTypesAndMethods(ProductionParams.classesFile.value(), ProductionParams.excludeMethodsFile.value());
+        PseudoRandom.reset(ProductionParams.seed.value());
+        TypesParser.parseTypesAndMethods(ProductionParams.classesFile.value(),
+                ProductionParams.excludeMethodsFile.value());
+        if (ProductionParams.specificSeed.isSet()) {
+            PseudoRandom.setCurrentSeed(ProductionParams.specificSeed.value());
+        }
     }
 
     public static void main(String[] args) {
         initializeTestGenerator(args);
         int counter = 0;
         try {
-            String testbaseDir = ProductionParams.testbaseDir.value();
+            Path testbaseDir = Paths.get(ProductionParams.testbaseDir.value());
+            System.out.printf(" %13s | %8s | %8s | %8s |%n", "start time", "count", "generat",
+                              "running");
+            System.out.printf(" %13s | %8s | %8s | %8s |%n", "---", "---", "---","---");
+            String path = getJavaPath();
+            String javacPath = Paths.get(path, "javac").toString();
+            String javaPath = Paths.get(path, "java").toString();
+
+            // compile Printer class first. A common one for all tests
+            ensureExisting(testbaseDir);
+            ProcessBuilder pbPrinter = new ProcessBuilder(javacPath,
+                    Paths.get(testbaseDir.toString(), "jdk", "test", "lib", "jittester",
+                            "jtreg", "Printer.java").toString());
+            runProcess(pbPrinter, testbaseDir.resolve("Printer").toString());
             do {
                 double start = System.currentTimeMillis();
+                System.out.print("[" + LocalTime.now() + "] |");
                 String name = "Test_" + counter;
-                generateTestFile(name);
+                Pair<IRNode, IRNode> irTree = generateIRTree(name);
+                System.out.printf(" %8d |", counter);
                 double generationTime = System.currentTimeMillis() - start;
-                String path = getJavaPath();
-                ProcessBuilder pb = new ProcessBuilder(path + "javac", testbaseDir + "/" + name + ".java");
-                runProcess(pb, testbaseDir + "/" + name);
+                System.out.printf(" %8.0f |", generationTime);
+                if (!ProductionParams.disableJavacodeGeneration.value()) {
+                    JavaCodeGenerator generator = new JavaCodeGenerator();
+                    String javaFile = generator.apply(irTree.first, irTree.second);
+                    ProcessBuilder pb = new ProcessBuilder(javacPath, "-cp", testbaseDir.toString()
+                            + ":" + generator.getTestbase().toString(), javaFile);
+                    runProcess(pb, generator.getTestbase().resolve(name).toString());
+                    start = System.currentTimeMillis();
+
+                    // Run compiled class files
+                    pb = new ProcessBuilder(javaPath, "-Xint", "-cp", testbaseDir.toString()
+                            + ":" + generator.getTestbase().toString(), name);
+                    String goldFile = name + ".gold";
+                    runProcess(pb, generator.getTestbase().resolve(goldFile).toString());
+                }
+
+                if (!ProductionParams.disableBytecodeGeneration.value()) {
+                    ByteCodeGenerator generator = new ByteCodeGenerator();
+                    generator.apply(irTree.first, irTree.second);
+                    generator.writeJtregBytecodeRunner(name);
+                    // Run generated bytecode
+                    ProcessBuilder pb = new ProcessBuilder(javaPath, "-Xint", "-Xverify", "-cp",
+                            testbaseDir.toString() + ":" + generator.getTestbase().toString(),
+                            name);
+                    String goldFile = name + ".gold";
+                    start = System.currentTimeMillis();
+                    runProcess(pb, generator.getTestbase().resolve(goldFile).toString());
+                }
 
-                start = System.currentTimeMillis();
-                pb = new ProcessBuilder(path + "java", "-Xint", "-cp", testbaseDir, name);
-                name = name + ".gold";
-                runProcess(pb, testbaseDir + "/" + name);
                 double runningTime = System.currentTimeMillis() - start;
-                System.out.printf("%4d : generation time (ms) : %8.0f running time (ms) : %8.0f\n",
-                                  counter, generationTime, runningTime);
-                if (runningTime < TimeUnit.MINUTES.toMillis(minutesToWait))
-                ++counter;
+                System.out.printf(" %8.0f |%n", runningTime);
+                if (runningTime < TimeUnit.MINUTES.toMillis(MINUTES_TO_WAIT)) {
+                    ++counter;
+                }
             } while (counter < ProductionParams.numberOfTests.value());
         } catch (IOException | InterruptedException ex) {
-            Logger.getLogger(Automatic.class.getName()).log(Level.SEVERE, null, ex);
+            ex.printStackTrace();
         }
     }
 
@@ -156,65 +196,47 @@ public class Automatic {
         return "";
     }
 
-    private static void runProcess(ProcessBuilder pb, String name)
+    private static int runProcess(ProcessBuilder pb, String name)
             throws IOException, InterruptedException {
         pb.redirectError(new File(name + ".err"));
         pb.redirectOutput(new File(name + ".out"));
         Process process = pb.start();
-        if (process.waitFor(minutesToWait, TimeUnit.MINUTES)) {
+        if (process.waitFor(MINUTES_TO_WAIT, TimeUnit.MINUTES)) {
             try (FileWriter file = new FileWriter(name + ".exit")) {
                 file.write(Integer.toString(process.exitValue()));
             }
+            return process.exitValue();
         } else {
             process.destroyForcibly();
-        }
-        TimeUnit.MILLISECONDS.sleep(300);
-    }
-
-    private static void generateTestFile(String testName) {
-        String code = makeTestCase(testName);
-        String testbaseDir = ProductionParams.testbaseDir.value();
-        String fileName = testbaseDir + "/" + testName + ".java";
-        try (FileWriter file = new FileWriter(fileName)) {
-            file.write(code);
-            //file.close();
-        } catch (IOException ex) {
-            Logger.getLogger(Automatic.class.getName())
-                  .log(Level.SEVERE, " Cannot write to file " + fileName, ex);
+            return -1;
         }
     }
 
     private static String printHierarchy() {
-        String r = "CLASS HIERARCHY:\n";
-        for (Type t : TypeList.getAll()) {
-            if (t instanceof TypeKlass) {
-                TypeKlass k = (TypeKlass) t;
-                if (k.isAbstract()) {
-                    r += "abstract ";
-                }
-                if (k.isFinal()) {
-                    r += "final ";
-                }
-                if (k.isInterface()) {
-                    r += "interface ";
-                } else {
-                    r += "class ";
-                }
-                r += k.getName() + ": ";
-                HashSet<String> parents = k.getParentsNames();
-                if (parents != null) {
-                    Iterator<String> n = parents.iterator();
-                    int size = parents.size();
-                    for (int i = 0; n.hasNext() && i < size - 1; i++) {
-                        r += n.next() + ", ";
-                    }
-                    if (n.hasNext()) {
-                        r += n.next();
-                    }
-                }
-                r += "\n";
+        return TypeList.getAll().stream()
+                .filter(t -> t instanceof TypeKlass)
+                .map(t -> typeDescription((TypeKlass) t))
+                .collect(Collectors.joining("\n","CLASS HIERARCHY:\n", "\n"));
+    }
+
+    private static String typeDescription(TypeKlass type) {
+        StringBuilder result = new StringBuilder();
+        String parents = type.getParentsNames().stream().collect(Collectors.joining(","));
+        result.append(type.isAbstract() ? "abstract " : "")
+              .append(type.isFinal() ? "final " : "")
+              .append(type.isInterface() ? "interface " : "class ")
+              .append(type.getName())
+              .append(parents.isEmpty() ? "" : ": " + parents);
+        return result.toString();
+    }
+
+    static void ensureExisting(Path path) {
+        if (Files.notExists(path)) {
+            try {
+                Files.createDirectories(path);
+            } catch (IOException ex) {
+                ex.printStackTrace();
             }
         }
-        return r;
     }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/BinaryOperator.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/BinaryOperator.java
index 0d06d0ce5da..e328ac03add 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/BinaryOperator.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/BinaryOperator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, 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,12 +26,8 @@ package jdk.test.lib.jittester;
 import jdk.test.lib.jittester.visitors.Visitor;
 
 public class BinaryOperator extends Operator {
-    protected String operationCode;
-    protected Type resultType;
-
-    public BinaryOperator(OperatorKind opKind, IRNode leftOperand, IRNode rightOperand) {
-        super(opKind.priority);
-        operationCode = opKind.text;
+    public BinaryOperator(OperatorKind opKind, Type resultType, IRNode leftOperand, IRNode rightOperand) {
+        super(opKind, resultType);
         addChild(leftOperand);
         addChild(rightOperand);
     }
@@ -47,10 +43,6 @@ public class BinaryOperator extends Operator {
         }
     }
 
-    public String getOperationCode() {
-        return operationCode;
-    }
-
     @Override
     public<T> T accept(Visitor<T> v) {
         return v.visit(this);
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Block.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Block.java
index 5b5edb85589..7ae51d887a0 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Block.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Block.java
@@ -28,17 +28,12 @@ import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.visitors.Visitor;
 
 public class Block extends IRNode {
-    private final Type returnType;
 
-    public Block(TypeKlass klass, Type returnType, List<IRNode> content, int level) {
-        setKlass(klass);
+    public Block(TypeKlass owner, Type returnType, List<? extends IRNode> content, int level) {
+        super(returnType);
+        setOwner(owner);
         addChildren(content);
         this.level = level;
-        this.returnType = returnType;
-    }
-
-    public Type getReturnType() {
-        return returnType;
     }
 
     protected int size() {
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Break.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Break.java
index f38adf8b454..0c92adf9253 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Break.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Break.java
@@ -27,6 +27,10 @@ import jdk.test.lib.jittester.visitors.Visitor;
 
 public class Break extends IRNode {
 
+    public Break() {
+        super(TypeList.VOID);
+    }
+
     @Override
     public<T> T accept(Visitor<T> v) {
         return v.visit(this);
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/BuiltInType.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/BuiltInType.java
index 59b979a0f13..1a473df3cd3 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/BuiltInType.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/BuiltInType.java
@@ -27,9 +27,9 @@ public abstract class BuiltInType extends Type {
 
     private static class BuiltInTypeCapacityHelper {
 
-        static String builtInTypes[] = {"boolean", "byte", "short", "char", "int", "long", "float", "double"};
+        private static final String builtInTypes[] = {"boolean", "byte", "short", "char", "int", "long", "float", "double"};
 
-        static private int getIndexFor(String typeName) {
+        private static int getIndexFor(String typeName) {
             for (int i = 0; i < builtInTypes.length; i++) {
                 if (typeName.compareTo(builtInTypes[i]) == 0) {
                     return i;
@@ -38,7 +38,7 @@ public abstract class BuiltInType extends Type {
             return -1;
         }
 
-        static public int compare(String typeName1, String typeName2) {
+        public static int compare(String typeName1, String typeName2) {
             int i1 = getIndexFor(typeName1);
             int i2 = getIndexFor(typeName2);
 
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/ByteCodeGenerator.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/ByteCodeGenerator.java
new file mode 100644
index 00000000000..c13b9fbdf9d
--- /dev/null
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/ByteCodeGenerator.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2016, 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.test.lib.jittester;
+
+import jdk.test.lib.jittester.visitors.ByteCodeVisitor;
+
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.function.BiFunction;
+
+/**
+ * Generates class files from bytecode
+ */
+class ByteCodeGenerator implements BiFunction<IRNode, IRNode, String> {
+    private final Path testbase = Paths.get(ProductionParams.testbaseDir.value(),
+            "bytecode_tests");
+
+    public void writeJtregBytecodeRunner(String name) {
+        try (FileWriter file = new FileWriter(testbase.resolve(name + ".java").toFile())) {
+            file.write(Automatic.getJtregHeader(name, false));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public String apply(IRNode mainClass, IRNode privateClasses) {
+        Automatic.ensureExisting(testbase);
+        try {
+            ByteCodeVisitor vis = new ByteCodeVisitor();
+            if (privateClasses != null) {
+                privateClasses.accept(vis);
+            }
+            mainClass.accept(vis);
+
+            Path mainClassPath = testbase.resolve(mainClass.getName() + ".class");
+            writeToClassFile(mainClassPath, vis.getByteCode(mainClass.getName()));
+            if (privateClasses != null) {
+                privateClasses.getChildren().forEach(c -> {
+                    String name = c.getName();
+                    Path classPath = testbase.resolve(name + ".class");
+                    writeToClassFile(classPath, vis.getByteCode(name));
+                });
+            }
+            return mainClassPath.toString();
+        } catch (Throwable t) {
+            Path errFile = testbase.resolve(mainClass.getName() + ".err");
+            try (PrintWriter pw = new PrintWriter(Files.newOutputStream(errFile,
+                    StandardOpenOption.CREATE_NEW))) {
+                t.printStackTrace(pw);
+            } catch (IOException e) {
+                t.printStackTrace();
+                throw new Error("can't write error to error file " + errFile, e);
+            }
+            return null;
+        }
+    }
+
+    public Path getTestbase() {
+        return testbase;
+    }
+
+    private void writeToClassFile(Path path, byte[] bytecode) {
+        try (FileOutputStream file = new FileOutputStream(path.toString())) {
+            file.write(bytecode);
+        } catch (IOException ex) {
+            ex.printStackTrace();
+        }
+    }
+}
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/CastOperator.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/CastOperator.java
index 27e04c795f2..ac796b6148e 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/CastOperator.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/CastOperator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, 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,11 +26,9 @@ package jdk.test.lib.jittester;
 import jdk.test.lib.jittester.visitors.Visitor;
 
 public class CastOperator extends Operator {
-    private final Type resultType;
 
     public CastOperator(Type resultType, IRNode casted) {
-        super(13);
-        this.resultType = resultType;
+        super(null, 13, resultType);
         addChild(casted);
     }
 
@@ -43,8 +41,4 @@ public class CastOperator extends Operator {
     public<T> T accept(Visitor<T> v) {
         return v.visit(this);
     }
-
-    public Type getResultType() {
-        return resultType;
-    }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/CatchBlock.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/CatchBlock.java
index b49a4bfe9b2..83c6344dde9 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/CatchBlock.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/CatchBlock.java
@@ -31,6 +31,7 @@ public class CatchBlock extends IRNode {
     public final List<Type> throwables;
 
     public CatchBlock(IRNode body, List<Type> throwables, int level) {
+        super(body.getResultType());
         this.level = level;
         this.throwables = Collections.unmodifiableList(throwables);
         addChild(body);
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Continue.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Continue.java
index 2caed6b8c8e..fb5ebc833ac 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Continue.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Continue.java
@@ -27,6 +27,10 @@ import jdk.test.lib.jittester.visitors.Visitor;
 
 public class Continue extends IRNode {
 
+    public Continue() {
+        super(TypeList.VOID);
+    }
+
     @Override
     public<T> T accept(Visitor<T> v) {
         return v.visit(this);
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Declaration.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Declaration.java
index 6633c541256..f7a32782b16 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Declaration.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Declaration.java
@@ -27,6 +27,7 @@ import jdk.test.lib.jittester.visitors.Visitor;
 
 public class Declaration extends IRNode {
     public Declaration(IRNode declarationExpr) {
+        super(declarationExpr.getResultType());
         addChild(declarationExpr);
     }
 
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/IRNode.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/IRNode.java
index 7221d086681..3ffa03e8669 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/IRNode.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/IRNode.java
@@ -37,16 +37,26 @@ import jdk.test.lib.jittester.visitors.Visitor;
 public abstract class IRNode {
     private IRNode parent;
     private final List<IRNode> children = new ArrayList<>();
-    protected IRNode klass;
+    protected TypeKlass owner;
     protected int level;
+    private final Type resultType;
+
+    protected IRNode(Type resultType) {
+        this.resultType = resultType;
+    }
+
+    public Type getResultType() {
+        return resultType;
+    }
+
     //TODO
     //private boolean isCFDeviation;
 
     public abstract <T> T accept(Visitor<T> v);
 
-    public void setKlass(TypeKlass klass) {
-        this.klass = klass;
-        if (Objects.isNull(klass)) {
+    public void setOwner(TypeKlass owner) {
+        this.owner = owner;
+        if (Objects.isNull(owner)) {
             System.out.println(getClass().getName() + " null");
             for (StackTraceElement s : Thread.currentThread().getStackTrace()) {
                 System.out.println(s.toString());
@@ -55,20 +65,17 @@ public abstract class IRNode {
     }
 
     public void addChild(IRNode child) {
-        children.add(child);
-        if (!Objects.isNull(child)) {
+        if (Objects.nonNull(child)) {
+            children.add(child);
             child.parent = this;
         }
     }
 
     public void addChildren(List<? extends IRNode> ch) {
-        if (!Objects.isNull(ch)) {
-            children.addAll(ch);
-            for (IRNode c : ch) {
-                if (!Objects.isNull(c)) {
-                    c.parent = this;
-                }
-            }
+        if (Objects.nonNull(ch)) {
+            ch.stream()
+                .filter(c -> c != null)
+                .forEach(this::addChild);
         }
     }
 
@@ -80,8 +87,8 @@ public abstract class IRNode {
         return i < children.size() ? children.get(i) : null;
     }
 
-    public IRNode getKlass() {
-        return klass;
+    public TypeKlass getOwner() {
+        return owner;
     }
 
     public IRNode getParent() {
@@ -90,7 +97,7 @@ public abstract class IRNode {
 
     public void setChild(int index, IRNode child) {
         children.set(index, child);
-        if (!Objects.isNull(child)) {
+        if (Objects.nonNull(child)) {
             child.parent = this;
         }
     }
@@ -145,7 +152,7 @@ public abstract class IRNode {
 
     @Override
     public final String toString() {
-        throw new Error("Should be toJavaCode");
+        return getName();
     }
 
     public String getName() {
@@ -154,7 +161,7 @@ public abstract class IRNode {
 
     public static long countDepth(Collection<IRNode> input) {
         return input.stream()
-                .filter(c -> !Objects.isNull(c))
+                .filter(Objects::nonNull)
                 .mapToLong(IRNode::countDepth)
                 .max().orElse(0L);
     }
@@ -166,7 +173,7 @@ public abstract class IRNode {
     public List<IRNode> getStackableLeaves() {
         List<IRNode> result = new ArrayList<>();
         children.stream()
-                .filter(c -> !Objects.isNull(c))
+                .filter(Objects::nonNull)
                 .forEach(c -> {
                     if (countDepth() == c.level && (c instanceof Block)) {
                         result.add(c);
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/If.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/If.java
index b7637f6d15d..676207e9e2e 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/If.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/If.java
@@ -30,9 +30,10 @@ public class If extends IRNode {
         CONDITION,
         THEN,
         ELSE,
-    };
+    }
 
-    public If(IRNode condition, IRNode thenBlock, IRNode elseBlock, int level) {
+    public If(IRNode condition, Block thenBlock, Block elseBlock, int level) {
+        super(thenBlock.getResultType());
         this.level = level;
         resizeUpChildren(IfPart.values().length);
         setChild(IfPart.CONDITION.ordinal(), condition);
@@ -43,7 +44,7 @@ public class If extends IRNode {
     @Override
     public long complexity() {
         IRNode condition = getChild(IfPart.CONDITION.ordinal());
-        IRNode thenBlock=  getChild(IfPart.THEN.ordinal());
+        IRNode thenBlock = getChild(IfPart.THEN.ordinal());
         IRNode elseBlock = getChild(IfPart.ELSE.ordinal());
         return (condition != null ? condition.complexity() : 0)
             + Math.max(thenBlock != null ? thenBlock.complexity() : 0,
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Initialization.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Initialization.java
index c286641e8fc..7e7a9c69207 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Initialization.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Initialization.java
@@ -26,20 +26,14 @@ package jdk.test.lib.jittester;
 import jdk.test.lib.jittester.visitors.Visitor;
 
 public abstract class Initialization extends IRNode {
-    protected VariableInfo variableInfo = new VariableInfo();
-
-    protected Initialization() {
-    }
+    private final VariableInfo variableInfo;
 
     protected Initialization(VariableInfo varInfo, IRNode initExpr) {
+        super(varInfo.type);
         variableInfo = varInfo;
         addChild(initExpr);
     }
 
-    public VariableInfo get() {
-        return variableInfo;
-    }
-
     @Override
     public long complexity() {
         return getChild(0).complexity() + 1;
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/JavaCodeGenerator.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/JavaCodeGenerator.java
new file mode 100644
index 00000000000..9f9e2a3387f
--- /dev/null
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/JavaCodeGenerator.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2016, 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.test.lib.jittester;
+
+import jdk.test.lib.jittester.visitors.JavaCodeVisitor;
+
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.function.BiFunction;
+
+/**
+ * Generates class files from java source code
+ */
+class JavaCodeGenerator implements BiFunction<IRNode, IRNode, String> {
+    private final Path testbase = Paths.get(ProductionParams.testbaseDir.value(), "java_tests");
+
+    private String generateJavaCode(IRNode mainClass, IRNode privateClasses) {
+        StringBuilder code = new StringBuilder();
+        JavaCodeVisitor vis = new JavaCodeVisitor();
+
+        code.append(Automatic.getJtregHeader(mainClass.getName(), true));
+        if (privateClasses != null) {
+            code.append(privateClasses.accept(vis));
+        }
+        code.append(mainClass.accept(vis));
+
+        return code.toString();
+    }
+
+    public Path getTestbase() {
+        return testbase;
+    }
+
+    @Override
+    public String apply(IRNode mainClass, IRNode privateClasses) {
+        String code = generateJavaCode(mainClass, privateClasses);
+        Automatic.ensureExisting(testbase);
+        Path fileName = testbase.resolve(mainClass.getName() + ".java");
+        try (FileWriter file = new FileWriter(fileName.toFile())) {
+            file.write(code);
+            return fileName.toString();
+        } catch (IOException ex) {
+            ex.printStackTrace();
+        }
+        return "";
+    }
+}
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Literal.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Literal.java
index 598338fbb36..d7065862bc1 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Literal.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Literal.java
@@ -27,11 +27,10 @@ import jdk.test.lib.jittester.visitors.Visitor;
 
 public class Literal extends IRNode {
     public final Object value;
-    protected final Type resultType;
 
     public Literal(Object v, Type t) {
+        super(t);
         value = v;
-        resultType = t;
     }
 
     @Override
@@ -44,10 +43,6 @@ public class Literal extends IRNode {
         return v.visit(this);
     }
 
-    public Type getResultType() {
-        return resultType;
-    }
-
     public Object getValue() {
         return value;
     }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/LocalVariable.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/LocalVariable.java
index 6543f4d7877..fe423136f7b 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/LocalVariable.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/LocalVariable.java
@@ -25,16 +25,9 @@ package jdk.test.lib.jittester;
 
 import jdk.test.lib.jittester.visitors.Visitor;
 
-public class LocalVariable extends IRNode implements VariableBase {
-    private VariableInfo value = new VariableInfo();
-
+public class LocalVariable extends VariableBase {
     public LocalVariable(VariableInfo value) {
-        this.value = value;
-    }
-
-    @Override
-    public VariableInfo get() {
-        return value;
+        super(value);
     }
 
     @Override
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/LogicOperator.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/LogicOperator.java
deleted file mode 100644
index e4b7499da86..00000000000
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/LogicOperator.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2005, 2015, 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.test.lib.jittester;
-
-import jdk.test.lib.jittester.visitors.Visitor;
-
-public class LogicOperator extends IRNode {
-
-    protected LogicOperator() {
-    }
-
-    @Override
-    public<T> T accept(Visitor<T> v) {
-        return v.visit(this);
-    }
-}
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/NonStaticMemberVariable.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/NonStaticMemberVariable.java
index 4615b80924d..3e22027c7b9 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/NonStaticMemberVariable.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/NonStaticMemberVariable.java
@@ -25,19 +25,13 @@ package jdk.test.lib.jittester;
 
 import jdk.test.lib.jittester.visitors.Visitor;
 
-public class NonStaticMemberVariable extends IRNode implements VariableBase {
-    private final VariableInfo value;
+public class NonStaticMemberVariable extends VariableBase {
 
     public NonStaticMemberVariable(IRNode object, VariableInfo value) {
-        this.value = value;
+        super(value);
         addChild(object);
     }
 
-    @Override
-    public VariableInfo get() {
-        return value;
-    }
-
     @Override
     public long complexity() {
         return getChild(0).complexity();
@@ -47,8 +41,4 @@ public class NonStaticMemberVariable extends IRNode implements VariableBase {
     public<T> T accept(Visitor<T> v) {
         return v.visit(this);
     }
-
-    public VariableInfo getValue() {
-        return value;
-    }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Nothing.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Nothing.java
index cbd7b1ad1d0..d58a74b09fa 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Nothing.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Nothing.java
@@ -27,6 +27,10 @@ import jdk.test.lib.jittester.visitors.Visitor;
 
 public class Nothing extends IRNode {
 
+    public Nothing() {
+        super(TypeList.VOID);
+    }
+
     @Override
     public long complexity() {
         return 0;
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Operator.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Operator.java
index 88d38fc0a8e..2cb8b30b4d5 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Operator.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Operator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, 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,18 +24,28 @@
 package jdk.test.lib.jittester;
 
 public abstract class Operator extends IRNode {
-    protected int operatorPriority;
+    protected final OperatorKind opKind;
+    private final int priority;
 
     public int getPriority() {
-        return operatorPriority;
+        return priority;
+    }
+
+    public OperatorKind getOperationKind() {
+        return opKind;
     }
 
     public enum Order {
         LEFT, RIGHT
-    };
+    }
 
-    // This constructor is called to construct an IR-tree node.
-    protected Operator(int operatorPriority) {
-        this.operatorPriority = operatorPriority;
+    protected Operator(OperatorKind opKind, Type resultType) {
+        this(opKind, opKind.priority, resultType);
+    }
+
+    protected Operator(OperatorKind opKind, int operatorPriority, Type resultType) {
+        super(resultType);
+        this.opKind = opKind;
+        this.priority = operatorPriority;
     }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/OperatorKind.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/OperatorKind.java
index d7dbb585c62..25a97bcdb0b 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/OperatorKind.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/OperatorKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,58 +25,96 @@ package jdk.test.lib.jittester;
 
 // all unary and binary operator kinds
 public enum OperatorKind {
-    COMPOUND_ADD("+=",   1),
-    COMPOUND_SUB("-=",   1),
-    COMPOUND_MUL("*=",   1),
-    COMPOUND_DIV("-=",   1),
-    COMPOUND_MOD("%=",   1),
-    COMPOUND_AND("&=",   1),
-    COMPOUND_OR ("|=",   1),
-    COMPOUND_XOR("^=",   1),
-    COMPOUND_SHR(">>=",  1),
-    COMPOUND_SHL("<<=",  1),
-    COMPOUND_SAR(">>>=", 1),
-    ASSIGN      ("=",    1),
-    OR          ("||",   3),
-    BIT_OR      ("|",    5),
-    BIT_XOR     ("^",    6),
-    AND         ("&&",   7),
-    BIT_AND     ("&",    7),
-    EQ          ("==",   8),
-    NE          ("!=",   8),
-    GT          (">",    9),
-    LT          ("<",    9),
-    GE          (">=",   9),
-    LE          ("<=",   9),
-    SHR         (">>",  10),
-    SHL         ("<<",  10),
-    SAR         (">>>", 10),
-    ADD         ("+",   11),
-    STRADD      ("+",   11),
-    SUB         ("-",   11),
-    MUL         ("*",   12),
-    DIV         ("/",   12),
-    MOD         ("%",   12),
-    NOT         ("!",   14),
-    BIT_NOT     ("~",   14),
-    UNARY_PLUS  ("+",   14),
-    UNARY_MINUS ("-",   14),
-    PRE_DEC     ("--",  15, true),
-    POST_DEC    ("--",  15, false),
-    PRE_INC     ("++",  16, true),
-    POST_INC    ("++",  16, false),
+    /** a += b */
+    COMPOUND_ADD(1),
+    /** a -= b */
+    COMPOUND_SUB(1),
+    /** a *= b */
+    COMPOUND_MUL(1),
+    /** a /= b */
+    COMPOUND_DIV(1),
+    /** a %= b */
+    COMPOUND_MOD(1),
+    /** a &= b */
+    COMPOUND_AND(1),
+    /** a |= b */
+    COMPOUND_OR (1),
+    /** a ^= b */
+    COMPOUND_XOR(1),
+    /** a >>= b */
+    COMPOUND_SHR(1),
+    /** a <<= b */
+    COMPOUND_SHL(1),
+    /** a >>>= b */
+    COMPOUND_SAR(1),
+    /** a = b */
+    ASSIGN      (1),
+    /**  a || b */
+    OR          (3),
+    /** a | b */
+    BIT_OR      (5),
+    /** a ^ b */
+    BIT_XOR     (6),
+    /** a && b */
+    AND         (7),
+    /** a & b */
+    BIT_AND     (7),
+    /** a == b */
+    EQ          (8),
+    /** a != b */
+    NE          (8),
+    /** a > b */
+    GT          (9),
+    /** a < b */
+    LT          (9),
+    /** a >= b */
+    GE          (9),
+    /** a <= b */
+    LE          (9),
+    /** a >> b */
+    SHR         (10),
+    /** a << b */
+    SHL         (10),
+    /** a >>> b */
+    SAR         (10),
+    /** a + b */
+    ADD         (11),
+    /** a.toString() + b */
+    STRADD      (11),
+    /** a - b */
+    SUB         (11),
+    /** a * b */
+    MUL         (12),
+    /** a / b */
+    DIV         (12),
+    /** a % b */
+    MOD         (12),
+    /** !a */
+    NOT         (14),
+    /** ~a */
+    BIT_NOT     (14),
+    /** +a */
+    UNARY_PLUS  (14),
+    /** -a */
+    UNARY_MINUS (14),
+    /** --a */
+    PRE_DEC     (15, true),
+    /** a-- */
+    POST_DEC    (15, false),
+    /** ++a */
+    PRE_INC     (16, true),
+    /** a++ */
+    POST_INC    (16, false),
     ;
 
-    public final String text;
     public final int priority;
     public final boolean isPrefix; // used for unary operators
 
-    private OperatorKind(String text, int priority) {
-        this(text, priority, true);
+    private OperatorKind(int priority) {
+        this(priority, true);
     }
 
-    private OperatorKind(String text, int priority, boolean isPrefix) {
-        this.text = text;
+    private OperatorKind(int priority, boolean isPrefix) {
         this.priority = priority;
         this.isPrefix = isPrefix;
     }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/PrintVariables.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/PrintVariables.java
index a593f740eb6..7f5c28a63fd 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/PrintVariables.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/PrintVariables.java
@@ -25,15 +25,16 @@ package jdk.test.lib.jittester;
 
 import java.util.ArrayList;
 import java.util.List;
+import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.visitors.Visitor;
 
 public class PrintVariables extends IRNode {
-    private final String printerName;
     private final ArrayList<Symbol> vars;
 
-    public PrintVariables(String printerName, ArrayList<Symbol> vars, int level) {
-        this.printerName = printerName;
-        this.vars = vars;
+    public PrintVariables(TypeKlass owner, int level) {
+        super(TypeList.VOID);
+        this.owner = owner;
+        this.vars = SymbolTable.getAllCombined(owner, VariableInfo.class);
         this.level = level;
     }
 
@@ -45,8 +46,4 @@ public class PrintVariables extends IRNode {
     public List<Symbol> getVars() {
         return vars;
     }
-
-    public String getPrinterName() {
-        return printerName;
-    }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/ProductionParams.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/ProductionParams.java
index 0fbfbe7f8ff..f3e7a6329fb 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/ProductionParams.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/ProductionParams.java
@@ -68,11 +68,14 @@ public class ProductionParams {
     public static Option<Boolean> disableNestedBlocks = null;
     public static Option<Boolean> disableArrays = null;
     public static Option<Boolean> enableFinalizers = null;
+    public static Option<Boolean> disableBytecodeGeneration = null;
+    public static Option<Boolean> disableJavacodeGeneration = null;
     // workaraound: to reduce chance throwing ArrayIndexOutOfBoundsException
     public static Option<Integer> chanceExpressionIndex = null;
     public static Option<String> testbaseDir = null;
     public static Option<Integer> numberOfTests = null;
     public static Option<String> seed = null;
+    public static Option<Long> specificSeed = null;
     public static Option<String> classesFile = null;
     public static Option<String> excludeMethodsFile = null;
 
@@ -117,11 +120,14 @@ public class ProductionParams {
         disableNestedBlocks = optionResolver.addBooleanOption("disable-nested-blocks", "Disable generation of nested blocks");
         disableArrays = optionResolver.addBooleanOption("disable-arrays", "Disable generation of arrays");
         enableFinalizers = optionResolver.addBooleanOption("enable-finalizers", "Enable finalizers (for stress testing)");
+        disableBytecodeGeneration = optionResolver.addBooleanOption("disable-bytecode-generation", "Disable generation of bytecode output");
+        disableJavacodeGeneration = optionResolver.addBooleanOption("disable-javacode-generation", "Disable generation of java source code output");
         chanceExpressionIndex = optionResolver.addIntegerOption("chance-expression-index", 0, "A non negative decimal integer used to restrict chane of generating expression in array index while creating or accessing by index");
         testbaseDir = optionResolver.addStringOption("testbase-dir", ".", "Testbase dir");
         numberOfTests = optionResolver.addIntegerOption('n', "number-of-tests", 0, "Number of test classes to generate");
         seed = optionResolver.addStringOption("seed", "", "Random seed");
-        classesFile = optionResolver.addStringOption('f', "classes-file", "", "File to read classes from");
-        excludeMethodsFile = optionResolver.addStringOption('r', "exclude-methods-file", "", "File to read excluded methods from");
+        specificSeed = optionResolver.addLongOption('z', "specificSeed", 0L, "A seed to be set for specific test generation(regular seed still needed for initialization)");
+        classesFile = optionResolver.addStringOption('f', "classes-file", "conf/classes.lst", "File to read classes from");
+        excludeMethodsFile = optionResolver.addStringOption('r', "exclude-methods-file", "conf/exclude.methods.lst", "File to read excluded methods from");
     }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Rule.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Rule.java
index b27279c3957..f3e6f4d747e 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Rule.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Rule.java
@@ -32,27 +32,26 @@ import jdk.test.lib.jittester.utils.PseudoRandom;
 /**
  * The Rule. A helper to perform production.
  */
-public class Rule extends Factory implements Comparable<Rule> {
-    private String name;
+public class Rule<T extends IRNode> extends Factory<T> implements Comparable<Rule<T>> {
+    private final String name;
+    private final TreeSet<RuleEntry> variants;
     private Integer limit = -1;
 
     @Override
-    public int compareTo(Rule rule) {
+    public int compareTo(Rule<T> rule) {
         return name.compareTo(rule.name);
     }
 
-    private TreeSet<RuleEntry> variants;
-
     public Rule(String name) {
         this.name = name;
         variants = new TreeSet<>();
     }
 
-    public void add(String ruleName, Factory factory) {
+    public void add(String ruleName, Factory<? extends T> factory) {
         add(ruleName, factory, 1.0);
     }
 
-    public void add(String ruleName, Factory factory, double weight) {
+    public void add(String ruleName, Factory<? extends T> factory, double weight) {
         variants.add(new RuleEntry(ruleName, factory, weight));
     }
 
@@ -61,7 +60,7 @@ public class Rule extends Factory implements Comparable<Rule> {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public T produce() throws ProductionFailedException {
         if (!variants.isEmpty()) {
             // Begin production.
             LinkedList<RuleEntry> rulesList = new LinkedList<>(variants);
@@ -98,19 +97,19 @@ public class Rule extends Factory implements Comparable<Rule> {
         throw new ProductionFailedException();
     }
 
-    private class RuleEntry extends Factory implements Comparable<RuleEntry> {
+    private class RuleEntry extends Factory<T> implements Comparable<RuleEntry> {
         private final double weight;
-        private final Factory factory;
+        private final Factory<? extends T> factory;
         private final String name;
 
-        private RuleEntry(String name, Factory factory, double weight) {
+        private RuleEntry(String name, Factory<? extends T> factory, double weight) {
             this.name = name;
             this.weight = weight;
             this.factory = factory;
         }
 
         @Override
-        public IRNode produce() throws ProductionFailedException {
+        public T produce() throws ProductionFailedException {
             return factory.produce();
         }
 
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Statement.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Statement.java
index 6a324219544..8b28915361c 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Statement.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Statement.java
@@ -29,6 +29,7 @@ public class Statement extends IRNode {
     private final boolean needSemicolon;
 
     public Statement(IRNode statementBody, boolean needSemicolon) {
+        super(statementBody.getResultType());
         this.needSemicolon = needSemicolon;
         addChild(statementBody);
     }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/StaticMemberVariable.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/StaticMemberVariable.java
index e1a9059db33..32f4dc24811 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/StaticMemberVariable.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/StaticMemberVariable.java
@@ -26,17 +26,11 @@ package jdk.test.lib.jittester;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.visitors.Visitor;
 
-public class StaticMemberVariable extends IRNode implements VariableBase {
-    private final VariableInfo varInfo;
+public class StaticMemberVariable extends VariableBase {
 
     public StaticMemberVariable(TypeKlass owner, VariableInfo varInfo) {
-        setKlass(owner);
-        this.varInfo = varInfo;
-    }
-
-    @Override
-    public VariableInfo get() {
-        return varInfo;
+        super(varInfo);
+        setOwner(owner);
     }
 
     @Override
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Switch.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Switch.java
index cc908b91234..5c23555de7e 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Switch.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Switch.java
@@ -30,6 +30,7 @@ public class Switch extends IRNode {
     private final int caseBlockIdx;
 
     public Switch(int level, List<IRNode> chldrn, int caseBlockIdx) {
+        super(chldrn.get(caseBlockIdx).getResultType());
         this.level = level;
         addChildren(chldrn);
         this.caseBlockIdx = caseBlockIdx;
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Symbol.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Symbol.java
index 15f0068045b..d579d2f207b 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Symbol.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Symbol.java
@@ -29,7 +29,7 @@ public class Symbol {
 
     public String name;
     public Type type;
-    public TypeKlass klass;
+    public TypeKlass owner;
     public static final int NONE = 0x00;
     public static final int PRIVATE = 0x01;
     public static final int DEFAULT = 0x02;
@@ -47,16 +47,16 @@ public class Symbol {
         this.name = name;
     }
 
-    public Symbol(String name, TypeKlass klass, Type type, int flags) {
+    public Symbol(String name, TypeKlass owner, Type type, int flags) {
         this.name = name;
-        this.klass = klass;
+        this.owner = owner;
         this.type = type;
         this.flags = flags;
     }
 
     protected Symbol(Symbol value) {
         this.name = value.name;
-        this.klass = value.klass;
+        this.owner = value.owner;
         this.type = value.type;
         this.flags = value.flags;
     }
@@ -71,7 +71,7 @@ public class Symbol {
         }
         try {
             Symbol s = (Symbol) o;
-            return klass.equals(s.klass) && name.equals(s.name);
+            return owner.equals(s.owner) && name.equals(s.name);
         } catch (Exception e) {
             return false;
         }
@@ -110,4 +110,9 @@ public class Symbol {
     public Symbol deepCopy() {
         return new Symbol(this);
     }
+
+
+    public TypeKlass getOwner() {
+        return owner;
+    }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/SymbolTable.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/SymbolTable.java
index 13078380a58..fdf0e90f57d 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/SymbolTable.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/SymbolTable.java
@@ -28,6 +28,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Stack;
+import java.util.stream.Collectors;
 import jdk.test.lib.jittester.types.TypeKlass;
 
 
@@ -42,9 +43,8 @@ public class SymbolTable {
 
         String classList = ProductionParams.addExternalSymbols.value();
         if (classList.equals("all")) {
-            for (Type type : TypeList.getReferenceTypes()) {
-                type.exportSymbols();
-            }
+            TypeList.getReferenceTypes()
+                    .forEach(Type::exportSymbols);
         } else {
             String[] splittedList = classList.split(",");
             for (Type type : TypeList.getReferenceTypes()) {
@@ -96,13 +96,9 @@ public class SymbolTable {
     public static Collection<Symbol> get(Type type, Class<?> classToCheck) {
         HashMap<Type, ArrayList<Symbol>> vars = SYMBOL_STACK.peek();
         if (vars.containsKey(type)) {
-            ArrayList<Symbol> result = new ArrayList<>();
-            for (Symbol symbol : vars.get(type)) {
-                if (classToCheck.isInstance(symbol)) {
-                    result.add(symbol);
-                }
-            }
-            return result;
+            return vars.get(type).stream()
+                .filter(classToCheck::isInstance)
+                .collect(Collectors.toList());
         }
         return new ArrayList<>();
     }
@@ -113,7 +109,7 @@ public class SymbolTable {
         if (vars.containsKey(type)) {
             ArrayList<Symbol> result = new ArrayList<>();
             for (Symbol symbol : vars.get(type)) {
-                if (classToCheck.isInstance(symbol) && typeKlass.equals(symbol.klass)) {
+                if (classToCheck.isInstance(symbol) && typeKlass.equals(symbol.owner)) {
                     result.add(symbol);
                 }
             }
@@ -150,7 +146,7 @@ public class SymbolTable {
         for (Type type : SYMBOL_STACK.peek().keySet()) {
             ArrayList<Symbol> symbolsOfType =  SYMBOL_STACK.peek().get(type);
             for (Symbol symbol : symbolsOfType) {
-                if (classToCheck.isInstance(symbol) && typeKlass.equals(symbol.klass)) {
+                if (classToCheck.isInstance(symbol) && typeKlass.equals(symbol.owner)) {
                     if (!result.containsKey(type)) {
                         result.put(type, new ArrayList<>());
                     }
@@ -193,7 +189,7 @@ public class SymbolTable {
         for (Type type : SYMBOL_STACK.peek().keySet()) {
             ArrayList<Symbol> symbolsOfType = SYMBOL_STACK.peek().get(type);
             for (Symbol symbol : symbolsOfType) {
-                if (classToCheck.isInstance(symbol) && typeKlass.equals(symbol.klass)) {
+                if (classToCheck.isInstance(symbol) && typeKlass.equals(symbol.owner)) {
                     result.add(symbol);
                 }
             }
@@ -207,7 +203,7 @@ public class SymbolTable {
         for (Type t : SYMBOL_STACK.peek().keySet()) {
             ArrayList<Symbol> symbolsOfType = SYMBOL_STACK.peek().get(t);
             for (Symbol symbol : symbolsOfType) {
-                if (typeKlass.equals(symbol.klass)) {
+                if (typeKlass.equals(symbol.owner)) {
                     result.add(symbol);
                 }
             }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TernaryOperator.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TernaryOperator.java
index e07d195c57b..d214db75f89 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TernaryOperator.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TernaryOperator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, 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,12 +30,11 @@ public class TernaryOperator extends Operator {
         CONDITION,
         TRUE,
         FALSE,
-    };
+    }
     //protected Production conditionalExpression, leftExpression, rightExpression;
-    protected Type resultType;
 
     public TernaryOperator(IRNode condition, IRNode trueBranch, IRNode falseBranch) {
-        super(2);
+        super(null, 2, trueBranch.getResultType());
         resizeUpChildren(TernaryPart.values().length);
         setChild(TernaryPart.CONDITION.ordinal(), condition);
         setChild(TernaryPart.TRUE.ordinal(), trueBranch);
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Throw.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Throw.java
index efa58ee42e0..0596c0b5d97 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Throw.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Throw.java
@@ -27,6 +27,7 @@ import jdk.test.lib.jittester.visitors.Visitor;
 
 public class Throw extends IRNode {
     public Throw(IRNode throwable) {
+        super(throwable.getResultType());
         addChild(throwable);
     }
 
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TryCatchBlock.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TryCatchBlock.java
index 075774c80b4..b6203654116 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TryCatchBlock.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TryCatchBlock.java
@@ -29,6 +29,7 @@ import jdk.test.lib.jittester.visitors.Visitor;
 
 public class TryCatchBlock extends IRNode {
     public TryCatchBlock(IRNode body, IRNode finallyBlock, List<CatchBlock> catchBlocks, int level) {
+        super(body.getResultType());
         this.level = level;
         addChild(body);
         addChild(finallyBlock);
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Type.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Type.java
index a355e10e32e..91f08a1df40 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Type.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Type.java
@@ -33,9 +33,15 @@ public abstract class Type extends IRNode implements Comparable<Type> {
     private final String typeName;
 
     protected Type(String typeName) {
+        super(null);
         this.typeName = typeName;
     }
 
+    @Override
+    public Type getResultType() {
+        return this;
+    }
+
     @Override
     public boolean equals(Object t) {
         if (this == t) {
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TypeList.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TypeList.java
index 00eaa7b8d1f..82611bbaf2b 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TypeList.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TypeList.java
@@ -27,19 +27,31 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.function.Predicate;
-import jdk.test.lib.jittester.types.TypeArray;
+
 import jdk.test.lib.jittester.types.TypeBoolean;
 import jdk.test.lib.jittester.types.TypeByte;
 import jdk.test.lib.jittester.types.TypeChar;
 import jdk.test.lib.jittester.types.TypeDouble;
 import jdk.test.lib.jittester.types.TypeFloat;
 import jdk.test.lib.jittester.types.TypeInt;
+import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.types.TypeLong;
 import jdk.test.lib.jittester.types.TypeShort;
 import jdk.test.lib.jittester.types.TypeVoid;
 
 public class TypeList {
-    private static final TypeVoid TYPE_VOID = new TypeVoid();
+    public static final TypeVoid VOID = new TypeVoid();
+    public static final TypeBoolean BOOLEAN = new TypeBoolean();
+    public static final TypeByte BYTE = new TypeByte();
+    public static final TypeChar CHAR = new TypeChar();
+    public static final TypeShort SHORT = new TypeShort();
+    public static final TypeInt INT = new TypeInt();
+    public static final TypeLong LONG = new TypeLong();
+    public static final TypeFloat FLOAT = new TypeFloat();
+    public static final TypeDouble DOUBLE = new TypeDouble();
+    public static final TypeKlass OBJECT = new TypeKlass("java.lang.Object");
+    public static final TypeKlass STRING = new TypeKlass("java.lang.String", TypeKlass.FINAL);
+
     private static final List<Type> TYPES = new ArrayList<>();
     private static final List<Type> BUILTIN_TYPES = new ArrayList<>();
     private static final List<Type> BUILTIN_INT_TYPES = new ArrayList<>();
@@ -47,14 +59,14 @@ public class TypeList {
     private static final List<Type> REFERENCE_TYPES = new ArrayList<>();
 
     static {
-        BUILTIN_INT_TYPES.add(new TypeBoolean());
-        BUILTIN_INT_TYPES.add(new TypeByte());
-        BUILTIN_INT_TYPES.add(new TypeChar());
-        BUILTIN_INT_TYPES.add(new TypeShort());
-        BUILTIN_INT_TYPES.add(new TypeInt());
-        BUILTIN_INT_TYPES.add(new TypeLong());
-        BUILTIN_FP_TYPES.add(new TypeFloat());
-        BUILTIN_FP_TYPES.add(new TypeDouble());
+        BUILTIN_INT_TYPES.add(BOOLEAN);
+        BUILTIN_INT_TYPES.add(BYTE);
+        BUILTIN_INT_TYPES.add(CHAR);
+        BUILTIN_INT_TYPES.add(SHORT);
+        BUILTIN_INT_TYPES.add(INT);
+        BUILTIN_INT_TYPES.add(LONG);
+        BUILTIN_FP_TYPES.add(FLOAT);
+        BUILTIN_FP_TYPES.add(DOUBLE);
 
         BUILTIN_TYPES.addAll(BUILTIN_INT_TYPES);
         BUILTIN_TYPES.addAll(BUILTIN_FP_TYPES);
@@ -62,13 +74,13 @@ public class TypeList {
         TYPES.addAll(BUILTIN_TYPES);
 
         if (!ProductionParams.disableArrays.value()) {
-            REFERENCE_TYPES.add(new TypeArray().produce());
             TYPES.addAll(REFERENCE_TYPES);
         }
-    }
 
-    public static TypeVoid getVoid() {
-        return TYPE_VOID;
+        STRING.addParent(OBJECT.getName());
+        STRING.setParent(OBJECT);
+        add(STRING);
+        add(OBJECT);
     }
 
     public static Collection<Type> getAll() {
@@ -100,14 +112,14 @@ public class TypeList {
     }
 
     public static boolean isBuiltIn(Type t) {
-        return isBuiltInInt(t) || isBuiltInFP(t);
+        return isBuiltInInt(t) || isBuiltInFP(t) || t.equals(VOID);
     }
 
     protected static boolean isIn(Type t) {
         return TYPES.contains(t);
     }
 
-    protected static boolean isReferenceType(Type t) {
+    public static boolean isReferenceType(Type t) {
         return REFERENCE_TYPES.contains(t);
     }
 
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TypesParser.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TypesParser.java
index 79ea14b4293..81d5e290f14 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TypesParser.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TypesParser.java
@@ -42,7 +42,6 @@ import jdk.test.lib.Asserts;
 import jdk.test.lib.jittester.functions.FunctionInfo;
 import jdk.test.lib.jittester.types.TypeArray;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.types.TypeVoid;
 
 /**
  * Class used for parsing included classes file and excluded methods file
@@ -62,7 +61,7 @@ public class TypesParser {
     public static void parseTypesAndMethods(String klassesFileName, String exMethodsFileName) {
         Asserts.assertNotNull(klassesFileName, "Classes input file name is null");
         Asserts.assertFalse(klassesFileName.isEmpty(), "Classes input file name is empty");
-        Set<Class<?>> klasses = parseKlasses(klassesFileName);
+        List<Class<?>> klasses = parseKlasses(klassesFileName);
         Set<Executable> methodsToExclude;
         if (exMethodsFileName != null && !exMethodsFileName.isEmpty()) {
             methodsToExclude = parseMethods(exMethodsFileName);
@@ -119,15 +118,18 @@ public class TypesParser {
         }
         if (klass.isPrimitive()) {
             if (klass.equals(void.class)) {
-                type = new TypeVoid();
+                type = TypeList.VOID;
             } else {
                 type = TypeList.find(klass.getName());
             }
         } else {
             int flags = getKlassFlags(klass);
             if (klass.isArray()) {
-                TypeKlass elementType
-                        = new TypeKlass(klass.getCanonicalName().replaceAll("\\[\\]", ""), flags);
+                Class<?> elementKlass  = klass.getComponentType();
+                while (elementKlass.isArray()) {
+                    elementKlass = elementKlass.getComponentType();
+                }
+                Type elementType = getType(elementKlass);
                 int dim = getArrayClassDimension(klass);
                 type = new TypeArray(elementType, dim);
             } else {
@@ -138,10 +140,14 @@ public class TypesParser {
                 type = new TypeKlass(canonicalName, flags);
             }
             Class<?> parentKlass = klass.getSuperclass();
+            TypeKlass typeKlass = (TypeKlass) type;
             if (parentKlass != null) {
                 TypeKlass parentTypeKlass = (TypeKlass) getType(parentKlass);
-                ((TypeKlass) type).addParent(parentTypeKlass.getName());
-                ((TypeKlass) type).setParent(parentTypeKlass);
+                typeKlass.addParent(parentTypeKlass.getName());
+                typeKlass.setParent(parentTypeKlass);
+            }
+            for (Class<?> iface : klass.getInterfaces()) {
+                typeKlass.addParent(getType(iface).getName());
             }
         }
         TYPE_CACHE.put(klass, type);
@@ -197,10 +203,10 @@ public class TypesParser {
         return flags;
     }
 
-    private static Set<Class<?>> parseKlasses(String klassesFileName) {
+    private static List<Class<?>> parseKlasses(String klassesFileName) {
         Asserts.assertNotNull(klassesFileName, "Classes input file name is null");
         Asserts.assertFalse(klassesFileName.isEmpty(), "Classes input file name is empty");
-        Set<String> klassNamesSet = new HashSet<>();
+        List<String> klassNamesList = new ArrayList<>();
         Path klassesFilePath = (new File(klassesFileName)).toPath();
         try {
             Files.lines(klassesFilePath).forEach(line -> {
@@ -211,20 +217,20 @@ public class TypesParser {
                 String msg = String.format("Format of the classes input file \"%s\" is incorrect,"
                         + " line \"%s\" has wrong format", klassesFileName, line);
                 Asserts.assertTrue(line.matches("\\w[\\w\\.$]*"), msg);
-                klassNamesSet.add(line.replaceAll(";", ""));
+                klassNamesList.add(line.replaceAll(";", ""));
             });
         } catch (IOException ex) {
             throw new Error("Error reading klasses file", ex);
         }
-        Set<Class<?>> klassesSet = new HashSet<>();
-        klassNamesSet.stream().forEach(klassName -> {
+        List<Class<?>> klassesList = new ArrayList<>();
+        klassNamesList.stream().forEach(klassName -> {
             try {
-                klassesSet.add(Class.forName(klassName));
+                klassesList.add(Class.forName(klassName));
             } catch (ClassNotFoundException ex) {
                 throw new Error("Unexpected exception while parsing klasses file", ex);
             }
         });
-        return klassesSet;
+        return klassesList;
     }
 
     private static Set<Executable> parseMethods(String methodsFileName) {
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/UnaryOperator.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/UnaryOperator.java
index d5b24340f55..2b737533889 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/UnaryOperator.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/UnaryOperator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, 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,12 +26,8 @@ package jdk.test.lib.jittester;
 import jdk.test.lib.jittester.visitors.Visitor;
 
 public class UnaryOperator extends Operator {
-    protected OperatorKind opKind;
-    protected Type resultType;
-
     public UnaryOperator(OperatorKind opKind, IRNode expression) {
-        super(opKind.priority);
-        this.opKind = opKind;
+        super(opKind, expression.getResultType());
         addChild(expression);
     }
 
@@ -49,8 +45,4 @@ public class UnaryOperator extends Operator {
     public boolean isPrefix() {
         return opKind.isPrefix;
     }
-
-    public String getOperatorText() {
-        return opKind.text;
-    }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/VariableBase.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/VariableBase.java
index 1b93c272c25..dd2699c6c43 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/VariableBase.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/VariableBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, 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,7 +23,14 @@
 
 package jdk.test.lib.jittester;
 
-public interface VariableBase {
+public abstract class VariableBase extends IRNode {
+    private final VariableInfo variableInfo;
+    protected VariableBase(VariableInfo variableInfo) {
+        super(variableInfo.type);
+        this.variableInfo = variableInfo;
+    }
 
-    VariableInfo get();
+    public VariableInfo getVariableInfo() {
+        return variableInfo;
+    }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/VariableDeclaration.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/VariableDeclaration.java
index 0d74f2a4985..bd94acc4914 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/VariableDeclaration.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/VariableDeclaration.java
@@ -26,9 +26,10 @@ package jdk.test.lib.jittester;
 import jdk.test.lib.jittester.visitors.Visitor;
 
 public class VariableDeclaration extends IRNode {
-    protected final VariableInfo variableInfo;
+    private final VariableInfo variableInfo;
 
     public VariableDeclaration(VariableInfo value) {
+        super(value.type);
         variableInfo = value;
     }
 
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/VariableDeclarationBlock.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/VariableDeclarationBlock.java
index 56dbab64003..a09001c6d47 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/VariableDeclarationBlock.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/VariableDeclarationBlock.java
@@ -24,10 +24,12 @@
 package jdk.test.lib.jittester;
 
 import java.util.ArrayList;
+
 import jdk.test.lib.jittester.visitors.Visitor;
 
 public class VariableDeclarationBlock extends IRNode {
-    public VariableDeclarationBlock(ArrayList<IRNode> content, int level) {
+    public VariableDeclarationBlock(ArrayList<? extends Declaration> content, int level) {
+        super(TypeList.VOID);
         addChildren(content);
         this.level = level;
     }
@@ -40,10 +42,6 @@ public class VariableDeclarationBlock extends IRNode {
                 .sum();
     }
 
-    protected int size() {
-        return getChildren() != null ? getChildren().size() : 0;
-    }
-
     @Override
     public<T> T accept(Visitor<T> v) {
         return v.visit(this);
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/VariableInfo.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/VariableInfo.java
index 610e71761ad..86331e38e86 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/VariableInfo.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/VariableInfo.java
@@ -55,4 +55,8 @@ public class VariableInfo extends Symbol {
     public Symbol deepCopy() {
         return new VariableInfo(this);
     }
+
+    public boolean isLocal() {
+        return (flags & LOCAL) != 0;
+    }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/arrays/ArrayCreation.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/arrays/ArrayCreation.java
index 821b4a389c0..8174575a455 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/arrays/ArrayCreation.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/arrays/ArrayCreation.java
@@ -28,7 +28,6 @@ import java.util.List;
 import java.util.stream.Collectors;
 import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.Literal;
-import jdk.test.lib.jittester.Type;
 import jdk.test.lib.jittester.VariableDeclaration;
 import jdk.test.lib.jittester.types.TypeArray;
 import jdk.test.lib.jittester.visitors.Visitor;
@@ -39,6 +38,7 @@ public class ArrayCreation extends IRNode {
     private final List<Byte> dims;
 
     public ArrayCreation(VariableDeclaration var, TypeArray array, ArrayList<IRNode> dimensionSizeExpressions) {
+        super(array);
         this.variable = var;
         this.array = array;
         addChildren(dimensionSizeExpressions);
@@ -55,8 +55,8 @@ public class ArrayCreation extends IRNode {
         type.setDimentions(dims);
     }
 
-    public Type getArrayType() {
-        return array.type;
+    public TypeArray getArrayType() {
+        return array;
     }
 
     @Override
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/arrays/ArrayElement.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/arrays/ArrayElement.java
index 3c34e16d8f7..9cd1d808858 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/arrays/ArrayElement.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/arrays/ArrayElement.java
@@ -25,10 +25,12 @@ package jdk.test.lib.jittester.arrays;
 
 import java.util.ArrayList;
 import jdk.test.lib.jittester.IRNode;
+import jdk.test.lib.jittester.types.TypeArray;
 import jdk.test.lib.jittester.visitors.Visitor;
 
 public class ArrayElement extends IRNode {
     public ArrayElement(IRNode array, ArrayList<IRNode> dimensionExpressions) {
+        super(((TypeArray) array.getResultType()).type);
         addChild(array);
         addChildren(dimensionExpressions);
     }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/arrays/ArrayExtraction.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/arrays/ArrayExtraction.java
index 30401780b14..a97fac9cbf8 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/arrays/ArrayExtraction.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/arrays/ArrayExtraction.java
@@ -40,6 +40,7 @@ dimentions, where N < M.
 public class ArrayExtraction extends IRNode {
     private final List<Byte> dims;
     public ArrayExtraction(IRNode array, ArrayList<IRNode> dimensionExpressions) {
+        super(array.getResultType());
         addChild(array);
         addChildren(dimensionExpressions);
         if (array instanceof ArrayCreation) {
@@ -56,7 +57,7 @@ public class ArrayExtraction extends IRNode {
             }
         } else if (array instanceof LocalVariable) {
             LocalVariable loc = (LocalVariable) array;
-            TypeArray type = (TypeArray) loc.get().type;
+            TypeArray type = (TypeArray) loc.getVariableInfo().type;
             dims = type.getDims();
             for (int i = dimensionExpressions.size(); i < type.dimensions; ++i) {
                 dims.add(type.getDims().get(i));
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/classes/ClassDefinitionBlock.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/classes/ClassDefinitionBlock.java
index 653e765d0f4..81ca02603f3 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/classes/ClassDefinitionBlock.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/classes/ClassDefinitionBlock.java
@@ -25,10 +25,12 @@ package jdk.test.lib.jittester.classes;
 
 import java.util.ArrayList;
 import jdk.test.lib.jittester.IRNode;
+import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.visitors.Visitor;
 
 public class ClassDefinitionBlock extends IRNode {
     public ClassDefinitionBlock(ArrayList<IRNode> content, int level) {
+        super(TypeList.VOID);
         this.level = level;
         addChildren(content);
     }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/classes/Interface.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/classes/Interface.java
index cabe704d69c..c15b4cf327d 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/classes/Interface.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/classes/Interface.java
@@ -24,6 +24,7 @@
 package jdk.test.lib.jittester.classes;
 
 import jdk.test.lib.jittester.IRNode;
+import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.visitors.Visitor;
 
@@ -32,6 +33,7 @@ public class Interface extends IRNode {
     private TypeKlass parent = null;
 
     public Interface(TypeKlass parent, String name, int level, IRNode functionDeclaraionBlock) {
+        super(TypeList.find(functionDeclaraionBlock.getOwner().getName()));
         this.parent = parent;
         this.name = name;
         this.level = level;
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/classes/Klass.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/classes/Klass.java
index a72dd854f03..16923bddfc0 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/classes/Klass.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/classes/Klass.java
@@ -70,19 +70,21 @@ public class Klass extends IRNode {
             IRNode functionDefinitions, IRNode abstractFunctionRedefinitions,
             IRNode overridenFunctionRedefitions, IRNode functionDeclarations,
             IRNode printVariablesBlock) {
+        super(thisKlass);
         this.thisKlass = thisKlass;
-        klass = thisKlass;
+        owner = thisKlass;
         this.parentKlass = parent;
         this.interfaces = interfaces;
         this.name = name;
         this.level = level;
-        addChild(variableDeclarations);
-        addChild(constructorDefinitions);
-        addChild(abstractFunctionRedefinitions);
-        addChild(overridenFunctionRedefitions);
-        addChild(functionDefinitions);
-        addChild(functionDeclarations);
-        addChild(printVariablesBlock);
+        resizeUpChildren(KlassPart.values().length);
+        setChild(KlassPart.DATA_MEMBERS.ordinal(), variableDeclarations);
+        setChild(KlassPart.CONSTRUCTORS.ordinal(), constructorDefinitions);
+        setChild(KlassPart.REDEFINED_FUNCTIONS.ordinal(), abstractFunctionRedefinitions);
+        setChild(KlassPart.OVERRIDEN_FUNCTIONS.ordinal(), overridenFunctionRedefitions);
+        setChild(KlassPart.MEMBER_FUNCTIONS.ordinal(), functionDefinitions);
+        setChild(KlassPart.MEMBER_FUNCTIONS_DECLARATIONS.ordinal(), functionDeclarations);
+        setChild(KlassPart.PRINT_VARIABLES.ordinal(), printVariablesBlock);
     }
 
     @Override
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/classes/MainKlass.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/classes/MainKlass.java
index 015264d61ef..be7d2dbb439 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/classes/MainKlass.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/classes/MainKlass.java
@@ -40,6 +40,7 @@ public class MainKlass extends IRNode {
 
     public MainKlass(String name, TypeKlass thisKlass, IRNode variableDeclarations,
             IRNode functionDefinitions, IRNode testFunction, IRNode printVariables) {
+        super(thisKlass);
         addChild(variableDeclarations);
         addChild(functionDefinitions);
         addChild(testFunction);
@@ -64,4 +65,8 @@ public class MainKlass extends IRNode {
     public String getName() {
         return name;
     }
+
+    public TypeKlass getThisKlass() {
+        return thisKlass;
+    }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArgumentDeclarationFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArgumentDeclarationFactory.java
index 2a4e8993b44..3bcabc82415 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArgumentDeclarationFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArgumentDeclarationFactory.java
@@ -33,7 +33,7 @@ import jdk.test.lib.jittester.functions.ArgumentDeclaration;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class ArgumentDeclarationFactory extends Factory {
+class ArgumentDeclarationFactory extends Factory<ArgumentDeclaration> {
     private final int argumentNumber;
     private final TypeKlass ownerClass;
 
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArithmeticOperatorFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArithmeticOperatorFactory.java
index 38175cbd9c3..1e8dd92e493 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArithmeticOperatorFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArithmeticOperatorFactory.java
@@ -23,15 +23,15 @@
 
 package jdk.test.lib.jittester.factories;
 
-import jdk.test.lib.jittester.IRNode;
+import jdk.test.lib.jittester.Operator;
 import jdk.test.lib.jittester.OperatorKind;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Rule;
 import jdk.test.lib.jittester.Type;
 import jdk.test.lib.jittester.types.TypeKlass;
 
-class ArithmeticOperatorFactory extends Factory {
-    private final Rule rule;
+class ArithmeticOperatorFactory extends Factory<Operator> {
+    private final Rule<Operator> rule;
 
     ArithmeticOperatorFactory(long complexityLimit, int operatorLimit, TypeKlass ownerClass,
             Type resultType, boolean exceptionSafe, boolean noconsts) throws ProductionFailedException {
@@ -42,7 +42,7 @@ class ArithmeticOperatorFactory extends Factory {
                 .setResultType(resultType)
                 .setExceptionSafe(exceptionSafe)
                 .setNoConsts(noconsts);
-        rule = new Rule("arithmetic");
+        rule = new Rule<>("arithmetic");
         rule.add("add", builder.setOperatorKind(OperatorKind.ADD).getBinaryOperatorFactory());
         rule.add("sub", builder.setOperatorKind(OperatorKind.SUB).getBinaryOperatorFactory());
         rule.add("mul", builder.setOperatorKind(OperatorKind.MUL).getBinaryOperatorFactory());
@@ -55,7 +55,7 @@ class ArithmeticOperatorFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public Operator produce() throws ProductionFailedException {
         return rule.produce();
     }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArrayCreationFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArrayCreationFactory.java
index 7933ba470f2..fa6eaf612c2 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArrayCreationFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArrayCreationFactory.java
@@ -29,15 +29,14 @@ import jdk.test.lib.jittester.Literal;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.ProductionParams;
 import jdk.test.lib.jittester.Type;
+import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.VariableDeclaration;
 import jdk.test.lib.jittester.arrays.ArrayCreation;
 import jdk.test.lib.jittester.types.TypeArray;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.types.TypeByte;
-import jdk.test.lib.jittester.types.TypeVoid;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class ArrayCreationFactory extends SafeFactory {
+class ArrayCreationFactory extends SafeFactory<ArrayCreation> {
     private final long complexityLimit;
     private final int operatorLimit;
     private final Type resultType;
@@ -56,16 +55,16 @@ class ArrayCreationFactory extends SafeFactory {
     }
 
     @Override
-    protected IRNode sproduce() throws ProductionFailedException {
+    protected ArrayCreation sproduce() throws ProductionFailedException {
         if (resultType instanceof TypeArray) {
             TypeArray arrayResultType = (TypeArray) resultType;
-            if (arrayResultType.type.equals(new TypeVoid())) {
+            if (arrayResultType.type.equals(TypeList.VOID)) {
                 arrayResultType = arrayResultType.produce();
             }
             IRNodeBuilder builder = new IRNodeBuilder()
                     .setComplexityLimit(complexityLimit)
                     .setOwnerKlass(ownerClass)
-                    .setResultType(new TypeByte())
+                    .setResultType(TypeList.BYTE)
                     .setExceptionSafe(exceptionSafe)
                     .setNoConsts(noconsts);
             double chanceExpression = ProductionParams.chanceExpressionIndex.value() / 100;
@@ -77,14 +76,14 @@ class ArrayCreationFactory extends SafeFactory {
                             .getExpressionFactory()
                             .produce());
                 } else {
-                    Literal dimension = (Literal)builder.getLiteralFactory().produce();
+                    Literal dimension = builder.getLiteralFactory().produce();
                     while (Integer.valueOf(dimension.getValue().toString()) < 1) {
-                        dimension = (Literal)builder.getLiteralFactory().produce();
+                        dimension = builder.getLiteralFactory().produce();
                     }
                     dims.add(dimension);
                 }
             }
-            VariableDeclaration var =  (VariableDeclaration) builder
+            VariableDeclaration var = builder
                     .setOwnerKlass(ownerClass)
                     .setResultType(arrayResultType)
                     .setIsLocal(true)
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArrayElementFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArrayElementFactory.java
index ab3639972cd..39a25e9b6a4 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArrayElementFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArrayElementFactory.java
@@ -29,15 +29,15 @@ import jdk.test.lib.jittester.Literal;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.ProductionParams;
 import jdk.test.lib.jittester.Type;
+import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.arrays.ArrayCreation;
 import jdk.test.lib.jittester.arrays.ArrayElement;
 import jdk.test.lib.jittester.arrays.ArrayExtraction;
 import jdk.test.lib.jittester.types.TypeArray;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.types.TypeByte;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class ArrayElementFactory extends SafeFactory {
+class ArrayElementFactory extends SafeFactory<ArrayElement> {
     private final long complexityLimit;
     private final int operatorLimit;
     private final Type resultType;
@@ -56,7 +56,7 @@ class ArrayElementFactory extends SafeFactory {
     }
 
     @Override
-    protected IRNode sproduce() throws ProductionFailedException {
+    protected ArrayElement sproduce() throws ProductionFailedException {
         if (resultType instanceof TypeArray) {
             throw new ProductionFailedException();
         }
@@ -76,10 +76,10 @@ class ArrayElementFactory extends SafeFactory {
                 .setResultType(new TypeArray(resultType, dimensionsCount))
                 .getExpressionFactory()
                 .produce();
-        ExpressionFactory expressionFactory = builder
+        Factory<IRNode> expressionFactory = builder
                 .setComplexityLimit(complexityPerDimension)
                 .setOperatorLimit(operatorLimitPerDimension)
-                .setResultType(new TypeByte())
+                .setResultType(TypeList.BYTE)
                 .getExpressionFactory();
         double chanceExpression = ProductionParams.chanceExpressionIndex.value() / 100.;
         ArrayList<IRNode> perDimensionExpressions = new ArrayList<>(dimensionsCount);
@@ -96,7 +96,7 @@ class ArrayElementFactory extends SafeFactory {
                     if (i < arrayExtraction.getDimsNumber())
                         dimLimit = arrayExtraction.getDim(i);
                 }
-                perDimensionExpressions.add(new Literal(PseudoRandom.randomNotNegative(dimLimit), new TypeByte()));
+                perDimensionExpressions.add(new Literal((byte)PseudoRandom.randomNotNegative(dimLimit), TypeList.BYTE));
             }
         }
         return new ArrayElement(arrayReturningExpression, perDimensionExpressions);
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArrayExtractionFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArrayExtractionFactory.java
index de444de76bc..ece7a0a6447 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArrayExtractionFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ArrayExtractionFactory.java
@@ -29,14 +29,14 @@ import jdk.test.lib.jittester.Literal;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.ProductionParams;
 import jdk.test.lib.jittester.Type;
+import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.arrays.ArrayCreation;
 import jdk.test.lib.jittester.arrays.ArrayExtraction;
 import jdk.test.lib.jittester.types.TypeArray;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.types.TypeByte;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class ArrayExtractionFactory extends SafeFactory {
+class ArrayExtractionFactory extends SafeFactory<ArrayExtraction> {
     private final long complexityLimit;
     private final int operatorLimit;
     private final Type resultType;
@@ -55,7 +55,7 @@ class ArrayExtractionFactory extends SafeFactory {
     }
 
     @Override
-    public IRNode sproduce() throws ProductionFailedException {
+    public ArrayExtraction sproduce() throws ProductionFailedException {
         if (resultType instanceof TypeArray) {
             TypeArray arrayType = (TypeArray) resultType;
             int delta = PseudoRandom.randomNotZero(ProductionParams.dimensionsLimit.value()
@@ -79,7 +79,7 @@ class ArrayExtractionFactory extends SafeFactory {
                 double chanceExpression = ProductionParams.chanceExpressionIndex.value() / 100.;
                 for (int i = 0; i < delta; i++) {
                     if (PseudoRandom.randomBoolean(chanceExpression)) {
-                        perDimensionExpression.add(builder.setResultType(new TypeByte())
+                        perDimensionExpression.add(builder.setResultType(TypeList.BYTE)
                                 .setComplexityLimit(dimComplLimit)
                                 .setOperatorLimit(dimOpLimit)
                                 .getExpressionFactory()
@@ -94,7 +94,7 @@ class ArrayExtractionFactory extends SafeFactory {
                             if (i < arrayExtraction.getDimsNumber())
                                 dimLimit = arrayExtraction.getDim(i);
                         }
-                        perDimensionExpression.add(new Literal(PseudoRandom.randomNotNegative(dimLimit), new TypeByte()));
+                        perDimensionExpression.add(new Literal((byte)PseudoRandom.randomNotNegative(dimLimit), TypeList.BYTE));
                     }
                 }
                 return new ArrayExtraction(arrayReturningExpression, perDimensionExpression);
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/AssignmentOperatorFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/AssignmentOperatorFactory.java
index 6563ed857c4..f1534caba28 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/AssignmentOperatorFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/AssignmentOperatorFactory.java
@@ -24,7 +24,8 @@
 package jdk.test.lib.jittester.factories;
 
 import java.util.ArrayList;
-import jdk.test.lib.jittester.IRNode;
+
+import jdk.test.lib.jittester.Operator;
 import jdk.test.lib.jittester.OperatorKind;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Rule;
@@ -34,7 +35,7 @@ import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class AssignmentOperatorFactory extends Factory {
+class AssignmentOperatorFactory extends Factory<Operator> {
     private final int operatorLimit;
     private final long complexityLimit;
     private final Type resultType;
@@ -42,8 +43,8 @@ class AssignmentOperatorFactory extends Factory {
     private final boolean noconsts;
     private final TypeKlass ownerClass;
 
-    private Rule fillRule(Type resultType) throws ProductionFailedException {
-        Rule rule = new Rule("assignment");
+    private Rule<Operator> fillRule(Type resultType) throws ProductionFailedException {
+        Rule<Operator> rule = new Rule<>("assignment");
         IRNodeBuilder builder = new IRNodeBuilder()
                 .setComplexityLimit(complexityLimit)
                 .setOperatorLimit(operatorLimit)
@@ -84,14 +85,14 @@ class AssignmentOperatorFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public Operator produce() throws ProductionFailedException {
         if (resultType == null) { // if no result type is given - choose any.
             ArrayList<Type> allTypes = new ArrayList<>(TypeList.getAll());
             PseudoRandom.shuffle(allTypes);
             for (Type type : allTypes) {
                 SymbolTable.push();
                 try {
-                    IRNode result =  fillRule(type).produce();
+                    Operator result =  fillRule(type).produce();
                     SymbolTable.merge();
                     return result;
                 } catch (ProductionFailedException e) {
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/AssignmentOperatorImplFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/AssignmentOperatorImplFactory.java
index d5ce37986b3..719a1794f5a 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/AssignmentOperatorImplFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/AssignmentOperatorImplFactory.java
@@ -31,8 +31,8 @@ import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Rule;
 import jdk.test.lib.jittester.Type;
 import jdk.test.lib.jittester.TypeList;
-import jdk.test.lib.jittester.utils.TypeUtil;
 import jdk.test.lib.jittester.VariableBase;
+import jdk.test.lib.jittester.utils.TypeUtil;
 import jdk.test.lib.jittester.VariableInfo;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
@@ -49,7 +49,7 @@ class AssignmentOperatorImplFactory extends BinaryOperatorFactory {
     }
 
     @Override
-    protected Pair<Type, Type> generateTypes() throws ProductionFailedException {
+    protected Pair<Type, Type> generateTypes() {
         return new Pair<>(resultType, PseudoRandom.randomElement(
                 TypeUtil.getImplicitlyCastable(TypeList.getAll(), resultType)));
     }
@@ -68,23 +68,22 @@ class AssignmentOperatorImplFactory extends BinaryOperatorFactory {
                 .setOperatorLimit(leftOperatorLimit)
                 .setResultType(leftOperandType)
                 .setIsConstant(false);
-        Rule rule = new Rule("assignment");
+        Rule<VariableBase> rule = new Rule<>("assignment");
         rule.add("initialized_nonconst_var", builder.setIsInitialized(true).getVariableFactory());
         rule.add("uninitialized_nonconst_var", builder.setIsInitialized(false).getVariableFactory());
-        IRNode leftOperandValue = rule.produce();
+        VariableBase leftOperandValue = rule.produce();
         IRNode rightOperandValue = builder.setComplexityLimit(rightComplexityLimit)
                 .setOperatorLimit(rightOperatorLimit)
                 .setResultType(rightOperandType)
                 .getExpressionFactory()
                 .produce();
         try {
-            VariableBase v = (VariableBase) leftOperandValue;
-            if ((v.get().flags & VariableInfo.INITIALIZED) == 0) {
-                v.get().flags |= VariableInfo.INITIALIZED;
+            if ((leftOperandValue.getVariableInfo().flags & VariableInfo.INITIALIZED) == 0) {
+                leftOperandValue.getVariableInfo().flags |= VariableInfo.INITIALIZED;
             }
         } catch (Exception e) {
             throw new ProductionFailedException(e.getMessage());
         }
-        return new BinaryOperator(opKind, leftOperandValue, rightOperandValue);
+        return new BinaryOperator(opKind, resultType, leftOperandValue, rightOperandValue);
     }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryArithmeticOperatorFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryArithmeticOperatorFactory.java
index b51cec7cf5b..a6d12a83daa 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryArithmeticOperatorFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryArithmeticOperatorFactory.java
@@ -30,7 +30,6 @@ import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Type;
 import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.utils.TypeUtil;
-import jdk.test.lib.jittester.types.TypeInt;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
@@ -47,18 +46,18 @@ class BinaryArithmeticOperatorFactory extends BinaryOperatorFactory {
         // arithmetic for built-in types less capacious than "int" is not supported.
         if (TypeList.isBuiltIn(resultType)) {
             BuiltInType builtInType = (BuiltInType) resultType;
-            return builtInType.equals(new TypeInt()) || builtInType.isMoreCapaciousThan(new TypeInt());
+            return builtInType.equals(TypeList.INT) || builtInType.isMoreCapaciousThan(TypeList.INT);
         } else {
             return false;
         }
     }
 
     @Override
-    protected Pair<Type, Type> generateTypes() throws ProductionFailedException {
+    protected Pair<Type, Type> generateTypes() {
         Collection<Type> castableFromResultType = TypeUtil.getImplicitlyCastable(TypeList.getBuiltIn(), resultType);
         // built-in types less capacious than int are automatically casted to int in arithmetic.
         final Type leftType = PseudoRandom.randomElement(castableFromResultType);
-        final Type rightType = resultType.equals(new TypeInt()) ?
+        final Type rightType = resultType.equals(TypeList.INT) ?
                 PseudoRandom.randomElement(castableFromResultType) : resultType;
         //TODO: is there sense to swap them randomly as it was done in original code?
         return PseudoRandom.randomBoolean() ? new Pair<>(leftType, rightType) : new Pair<>(rightType, leftType);
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryBitwiseOperatorFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryBitwiseOperatorFactory.java
index 6479644db7c..3925db13ae9 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryBitwiseOperatorFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryBitwiseOperatorFactory.java
@@ -29,10 +29,7 @@ import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Type;
 import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.utils.TypeUtil;
-import jdk.test.lib.jittester.types.TypeBoolean;
-import jdk.test.lib.jittester.types.TypeInt;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.types.TypeLong;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
 import java.util.Collection;
@@ -45,15 +42,15 @@ class BinaryBitwiseOperatorFactory extends BinaryOperatorFactory {
 
     @Override
     protected boolean isApplicable(Type resultType) {
-        return resultType.equals(new TypeInt()) || resultType.equals(new TypeLong()) || resultType.equals(new TypeBoolean());
+        return resultType.equals(TypeList.INT) || resultType.equals(TypeList.LONG) || resultType.equals(TypeList.BOOLEAN);
     }
 
     @Override
-    protected Pair<Type, Type> generateTypes() throws ProductionFailedException {
+    protected Pair<Type, Type> generateTypes() {
         Collection<Type> castableFromResult = TypeUtil.getImplicitlyCastable(TypeList.getBuiltIn(), resultType);
         // built-in types less capacious than int are automatically casted to int in arithmetic.
         final Type leftType = PseudoRandom.randomElement(castableFromResult);
-        final Type rightType = resultType.equals(new TypeInt()) ? PseudoRandom.randomElement(castableFromResult) : resultType;
+        final Type rightType = resultType.equals(TypeList.INT) ? PseudoRandom.randomElement(castableFromResult) : resultType;
         //TODO: is there sense to swap them randomly as it was done in original code?
         return PseudoRandom.randomBoolean() ? new Pair<>(leftType, rightType) : new Pair<>(rightType, leftType);
     }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryComparisonOperatorFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryComparisonOperatorFactory.java
index 4f5150e86f4..d7250bd620e 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryComparisonOperatorFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryComparisonOperatorFactory.java
@@ -28,7 +28,6 @@ import jdk.test.lib.jittester.OperatorKind;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Type;
 import jdk.test.lib.jittester.TypeList;
-import jdk.test.lib.jittester.types.TypeBoolean;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
@@ -43,13 +42,13 @@ class BinaryComparisonOperatorFactory extends BinaryOperatorFactory {
 
     @Override
     protected boolean isApplicable(Type resultType) {
-        return resultType.equals(new TypeBoolean());
+        return resultType.equals(TypeList.BOOLEAN);
     }
 
     @Override
-    protected Pair<Type, Type> generateTypes() throws ProductionFailedException {
+    protected Pair<Type, Type> generateTypes() {
         final List<Type> builtInExceptBoolean = new ArrayList<>(TypeList.getBuiltIn());
-        builtInExceptBoolean.remove(new TypeBoolean());
+        builtInExceptBoolean.remove(TypeList.BOOLEAN);
         return new Pair<>(PseudoRandom.randomElement(builtInExceptBoolean),
                 PseudoRandom.randomElement(builtInExceptBoolean));
     }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryEqualityOperatorFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryEqualityOperatorFactory.java
index e3458c3463e..2ad173533d7 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryEqualityOperatorFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryEqualityOperatorFactory.java
@@ -28,7 +28,6 @@ import jdk.test.lib.jittester.OperatorKind;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Type;
 import jdk.test.lib.jittester.TypeList;
-import jdk.test.lib.jittester.types.TypeBoolean;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
@@ -43,13 +42,13 @@ class BinaryEqualityOperatorFactory extends BinaryOperatorFactory {
 
     @Override
     protected boolean isApplicable(Type resultType) {
-        return resultType.equals(new TypeBoolean());
+        return resultType.equals(TypeList.BOOLEAN);
     }
 
     @Override
-    protected Pair<Type, Type> generateTypes() throws ProductionFailedException {
+    protected Pair<Type, Type> generateTypes() {
         final List<Type> builtInExceptBoolean = new ArrayList<>(TypeList.getBuiltIn());
-        builtInExceptBoolean.remove(new TypeBoolean());
+        builtInExceptBoolean.remove(TypeList.BOOLEAN);
         return new Pair<>(PseudoRandom.randomElement(builtInExceptBoolean), PseudoRandom.randomElement(builtInExceptBoolean));
     }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryLogicOperatorFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryLogicOperatorFactory.java
index 2ccf715edff..cb6477f6839 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryLogicOperatorFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryLogicOperatorFactory.java
@@ -30,7 +30,7 @@ import jdk.test.lib.jittester.OperatorKind;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.SymbolTable;
 import jdk.test.lib.jittester.Type;
-import jdk.test.lib.jittester.types.TypeBoolean;
+import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
@@ -42,11 +42,11 @@ public class BinaryLogicOperatorFactory extends BinaryOperatorFactory {
 
     @Override
     protected boolean isApplicable(Type resultType) {
-        return resultType.equals(new TypeBoolean());
+        return resultType.equals(TypeList.BOOLEAN);
     }
 
     @Override
-    protected Pair<Type, Type> generateTypes() throws ProductionFailedException {
+    protected Pair<Type, Type> generateTypes() {
         return new Pair<>(resultType, resultType);
     }
 
@@ -81,6 +81,6 @@ public class BinaryLogicOperatorFactory extends BinaryOperatorFactory {
         } finally {
             SymbolTable.pop();
         }
-        return new BinaryOperator(opKind, leftOperand, rightOperand);
+        return new BinaryOperator(opKind, resultType, leftOperand, rightOperand);
     }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryOperatorFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryOperatorFactory.java
index 1f519d920e8..73f0e41ca78 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryOperatorFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryOperatorFactory.java
@@ -33,7 +33,7 @@ import jdk.test.lib.jittester.Type;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-abstract class BinaryOperatorFactory extends OperatorFactory {
+abstract class BinaryOperatorFactory extends OperatorFactory<BinaryOperator> {
     protected final OperatorKind opKind;
     protected final Type resultType;
     protected final Type ownerClass;
@@ -48,7 +48,7 @@ abstract class BinaryOperatorFactory extends OperatorFactory {
 
     protected abstract boolean isApplicable(Type resultType);
 
-    protected abstract Pair<Type, Type> generateTypes() throws ProductionFailedException;
+    protected abstract Pair<Type, Type> generateTypes();
 
     protected BinaryOperator generateProduction(Type leftType, Type rightType) throws ProductionFailedException {
         int leftOpLimit = (int) (PseudoRandom.random() * (operatorLimit - 1));
@@ -72,11 +72,11 @@ abstract class BinaryOperatorFactory extends OperatorFactory {
                 .setResultType(rightType)
                 .getExpressionFactory()
                 .produce();
-        return new BinaryOperator(opKind, leftExpr, rightExpr);
+        return new BinaryOperator(opKind, resultType, leftExpr, rightExpr);
     }
 
     @Override
-    public final IRNode produce() throws ProductionFailedException {
+    public final BinaryOperator produce() throws ProductionFailedException {
         if (!isApplicable(resultType)) {
             //avoid implicit use of resultType.toString()
             throw new ProductionFailedException("Type " + resultType.getName() + " is not applicable by " + getClass().getName());
@@ -91,7 +91,7 @@ abstract class BinaryOperatorFactory extends OperatorFactory {
 
         try {
             SymbolTable.push();
-            IRNode p = generateProduction(types.first, types.second);
+            BinaryOperator p = generateProduction(types.first, types.second);
             SymbolTable.merge();
             return p;
         } catch (ProductionFailedException e) {
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryShiftOperatorFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryShiftOperatorFactory.java
index d5c74e2c976..5f185003df2 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryShiftOperatorFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryShiftOperatorFactory.java
@@ -28,9 +28,7 @@ import jdk.test.lib.jittester.OperatorKind;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Type;
 import jdk.test.lib.jittester.TypeList;
-import jdk.test.lib.jittester.types.TypeInt;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.types.TypeLong;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 import jdk.test.lib.jittester.utils.TypeUtil;
 
@@ -42,13 +40,13 @@ class BinaryShiftOperatorFactory extends BinaryOperatorFactory {
 
     @Override
     protected boolean isApplicable(Type resultType) {
-        return resultType.equals(new TypeInt()) || resultType.equals(new TypeLong());
+        return resultType.equals(TypeList.INT) || resultType.equals(TypeList.LONG);
     }
 
     @Override
-    protected Pair<Type, Type> generateTypes() throws ProductionFailedException {
-        Type leftType = resultType.equals(new TypeInt()) ? PseudoRandom.randomElement(TypeUtil.getImplicitlyCastable(TypeList.getBuiltInInt(), resultType)) : resultType;
-        Type rightType = PseudoRandom.randomElement(TypeUtil.getImplicitlyCastable(TypeList.getBuiltInInt(), new TypeLong()));
+    protected Pair<Type, Type> generateTypes() {
+        Type leftType = resultType.equals(TypeList.INT) ? PseudoRandom.randomElement(TypeUtil.getImplicitlyCastable(TypeList.getBuiltInInt(), resultType)) : resultType;
+        Type rightType = PseudoRandom.randomElement(TypeUtil.getImplicitlyCastable(TypeList.getBuiltInInt(), TypeList.LONG));
         return new Pair<>(leftType, rightType);
     }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryStringPlusFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryStringPlusFactory.java
index 99de01cde91..b7a5808aec7 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryStringPlusFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryStringPlusFactory.java
@@ -38,11 +38,11 @@ class BinaryStringPlusFactory extends BinaryOperatorFactory {
 
     @Override
     protected boolean isApplicable(Type resultType) {
-        return resultType.equals(TypeList.find("java.lang.String"));
-        }
+        return resultType.equals(TypeList.STRING);
+    }
 
     @Override
-    protected Pair<Type, Type> generateTypes() throws ProductionFailedException {
+    protected Pair<Type, Type> generateTypes() {
         return new Pair<>(resultType, resultType);
     }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BitwiseInversionOperatorFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BitwiseInversionOperatorFactory.java
index bad0bab3a8a..f84d8ab0984 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BitwiseInversionOperatorFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BitwiseInversionOperatorFactory.java
@@ -23,7 +23,6 @@
 
 package jdk.test.lib.jittester.factories;
 
-import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.OperatorKind;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Type;
@@ -31,8 +30,6 @@ import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.utils.TypeUtil;
 import jdk.test.lib.jittester.UnaryOperator;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.types.TypeInt;
-import jdk.test.lib.jittester.types.TypeLong;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
 class BitwiseInversionOperatorFactory extends UnaryOperatorFactory {
@@ -43,12 +40,12 @@ class BitwiseInversionOperatorFactory extends UnaryOperatorFactory {
 
     @Override
     protected boolean isApplicable(Type resultType) {
-        return resultType.equals(new TypeInt()) || resultType.equals(new TypeLong());
+        return resultType.equals(TypeList.INT) || resultType.equals(TypeList.LONG);
     }
 
     @Override
-    protected Type generateType() throws ProductionFailedException {
-        if (resultType.equals(new TypeInt())) {
+    protected Type generateType() {
+        if (resultType.equals(TypeList.INT)) {
             return PseudoRandom.randomElement(TypeUtil.getImplicitlyCastable(TypeList.getBuiltIn(), resultType));
         } else {
             return resultType;
@@ -56,7 +53,7 @@ class BitwiseInversionOperatorFactory extends UnaryOperatorFactory {
     }
 
     @Override
-    protected IRNode generateProduction(Type resultType) throws ProductionFailedException {
+    protected UnaryOperator generateProduction(Type resultType) throws ProductionFailedException {
         return new UnaryOperator(opKind, new IRNodeBuilder().setComplexityLimit(complexityLimit - 1)
                 .setOperatorLimit(operatorLimit - 1)
                 .setOwnerKlass((TypeKlass) ownerClass)
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BitwiseOperatorFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BitwiseOperatorFactory.java
index bc9acdc1dc5..d0408bfdd73 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BitwiseOperatorFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BitwiseOperatorFactory.java
@@ -23,15 +23,15 @@
 
 package jdk.test.lib.jittester.factories;
 
-import jdk.test.lib.jittester.IRNode;
+import jdk.test.lib.jittester.Operator;
 import jdk.test.lib.jittester.OperatorKind;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Rule;
 import jdk.test.lib.jittester.Type;
 import jdk.test.lib.jittester.types.TypeKlass;
 
-class BitwiseOperatorFactory extends Factory {
-    private final Rule rule;
+class BitwiseOperatorFactory extends Factory<Operator> {
+    private final Rule<Operator> rule;
 
     BitwiseOperatorFactory(long complexityLimit, int operatorLimit, TypeKlass ownerClass,
             Type resultType, boolean exceptionSafe, boolean noconsts) throws ProductionFailedException {
@@ -42,7 +42,7 @@ class BitwiseOperatorFactory extends Factory {
                 .setResultType(resultType)
                 .setExceptionSafe(exceptionSafe)
                 .setNoConsts(noconsts);
-        rule = new Rule("bitwise");
+        rule = new Rule<>("bitwise");
         rule.add("and", builder.setOperatorKind(OperatorKind.BIT_AND).getBinaryOperatorFactory());
         rule.add("or", builder.setOperatorKind(OperatorKind.BIT_OR).getBinaryOperatorFactory());
         rule.add("xor", builder.setOperatorKind(OperatorKind.BIT_XOR).getBinaryOperatorFactory());
@@ -53,7 +53,7 @@ class BitwiseOperatorFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public Operator produce() throws ProductionFailedException {
         return rule.produce();
     }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BlockFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BlockFactory.java
index 37b6072e123..298a8f67b83 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BlockFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BlockFactory.java
@@ -38,13 +38,12 @@ import jdk.test.lib.jittester.loops.DoWhile;
 import jdk.test.lib.jittester.loops.For;
 import jdk.test.lib.jittester.loops.While;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.types.TypeVoid;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
 import java.util.ArrayList;
 import java.util.List;
 
-class BlockFactory extends Factory {
+class BlockFactory extends Factory<Block> {
     private final Type returnType;
     private final long complexityLimit;
     private final int statementLimit;
@@ -74,7 +73,7 @@ class BlockFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public Block produce() throws ProductionFailedException {
         if (statementLimit > 0 && complexityLimit > 0) {
             List<IRNode> content = new ArrayList<>();
             int slimit = PseudoRandom.randomNotZero(statementLimit);
@@ -89,12 +88,12 @@ class BlockFactory extends Factory {
                     .setCanHaveContinues(canHaveContinues)
                     .setExceptionSafe(false)
                     .setNoConsts(false);
-            Rule rule;
+            Rule<IRNode> rule;
             SymbolTable.push();
             for (int i = 0; i < slimit && climit > 0; ) {
                 int subLimit = (int) (PseudoRandom.random() * (slimit - i - 1));
                 builder.setComplexityLimit((long) (PseudoRandom.random() * climit));
-                rule = new Rule("block");
+                rule = new Rule<>("block");
                 rule.add("statement", builder.getStatementFactory(), 5);
                 if (!ProductionParams.disableVarsInBlock.value()) {
                     rule.add("decl", builder.setIsLocal(true).getDeclarationFactory());
@@ -131,14 +130,14 @@ class BlockFactory extends Factory {
                 }
             }
             // Ok, if the block can end with break and continue. Generate the appropriate productions.
-            rule = new Rule("block_ending");
+            rule = new Rule<>("block_ending");
             if (canHaveBreaks && !subBlock) {
                 rule.add("break", builder.getBreakFactory());
             }
             if (canHaveContinues && !subBlock) {
                 rule.add("continue", builder.getContinueFactory());
             }
-            if (canHaveReturn && !subBlock && !returnType.equals(new TypeVoid())) {
+            if (canHaveReturn && !subBlock && !returnType.equals(TypeList.VOID)) {
                 rule.add("return", builder.setComplexityLimit(climit).getReturnFactory());
             }
             if (canHaveThrow && !subBlock) {
@@ -166,7 +165,7 @@ class BlockFactory extends Factory {
         throw new ProductionFailedException();
     }
 
-    private void addControlFlowDeviation(Rule rule, IRNodeBuilder builder) {
+    private void addControlFlowDeviation(Rule<IRNode> rule, IRNodeBuilder builder) {
         if (!ProductionParams.disableIf.value()) {
             rule.add("if", builder.getIfFactory());
         }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BreakFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BreakFactory.java
index a03874e3612..2e561f43335 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BreakFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BreakFactory.java
@@ -24,12 +24,11 @@
 package jdk.test.lib.jittester.factories;
 
 import jdk.test.lib.jittester.Break;
-import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.ProductionFailedException;
 
-class BreakFactory extends Factory {
+class BreakFactory extends Factory<Break> {
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public Break produce() throws ProductionFailedException {
         return new Break();
     }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CastOperatorFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CastOperatorFactory.java
index 7935eb697aa..fa7400b604a 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CastOperatorFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CastOperatorFactory.java
@@ -33,7 +33,7 @@ import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class CastOperatorFactory extends OperatorFactory {
+class CastOperatorFactory extends OperatorFactory<CastOperator> {
     private final Type resultType;
     private final Type ownerClass;
 
@@ -45,12 +45,12 @@ class CastOperatorFactory extends OperatorFactory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public CastOperator produce() throws ProductionFailedException {
         ArrayList<Type> argType = new ArrayList<>(TypeList.getAll());
         PseudoRandom.shuffle(argType);
         for (Type type : argType) {
             try {
-                ExpressionFactory expressionFactory = new IRNodeBuilder()
+                Factory<IRNode> expressionFactory = new IRNodeBuilder()
                         .setComplexityLimit(complexityLimit - 1)
                         .setOperatorLimit(operatorLimit - 1)
                         .setOwnerKlass((TypeKlass) ownerClass)
@@ -59,14 +59,11 @@ class CastOperatorFactory extends OperatorFactory {
                         .setResultType(type)
                         .getExpressionFactory();
                 SymbolTable.push();
-                if (type.equals(resultType)) {
-                    IRNode expr = expressionFactory.produce();
-                    SymbolTable.merge();
-                    return expr;
-                } else if ((!exceptionSafe || exceptionSafe && !(type instanceof TypeKlass))
-                        && type.canExplicitlyCastTo(resultType)) {
+                if (type.equals(resultType) ||
+                        ((!exceptionSafe || exceptionSafe && !(type instanceof TypeKlass))
+                            && type.canExplicitlyCastTo(resultType))) {
                     // In safe mode we cannot explicitly cast an object, because it may throw.
-                    IRNode castOperator = new CastOperator(resultType, expressionFactory.produce());
+                    CastOperator castOperator = new CastOperator(resultType, expressionFactory.produce());
                     SymbolTable.merge();
                     return castOperator;
                 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ClassDefinitionBlockFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ClassDefinitionBlockFactory.java
index 28586eb67cd..822c99fada8 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ClassDefinitionBlockFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ClassDefinitionBlockFactory.java
@@ -38,7 +38,7 @@ import jdk.test.lib.jittester.classes.Klass;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class ClassDefinitionBlockFactory extends Factory {
+class ClassDefinitionBlockFactory extends Factory<ClassDefinitionBlock> {
     private final String prefix;
     private final long complexityLimit;
     private final int classesLimit;
@@ -62,7 +62,7 @@ class ClassDefinitionBlockFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public ClassDefinitionBlock produce() throws ProductionFailedException {
         ArrayList<IRNode> content = new ArrayList<>();
         int limit = (int) Math.ceil(PseudoRandom.random() * classesLimit);
         if (limit > 0) {
@@ -74,9 +74,8 @@ class ClassDefinitionBlockFactory extends Factory {
                     .setComplexityLimit(classCompl);
             for (int i = 0; i < limit; i++) {
                 try {
-                    Rule rule = new Rule("class");
+                    Rule<IRNode> rule = new Rule<>("class");
                     rule.add("basic_class", builder.setName(prefix + "_Class_" + i)
-                            .setPrinterName(prefix + ".Printer")
                             .setMemberFunctionsLimit(memberFunctionsLimit)
                             .getKlassFactory());
                     if (!ProductionParams.disableInterfaces.value()) {
@@ -110,13 +109,12 @@ class ClassDefinitionBlockFactory extends Factory {
             IRNode randomChild = childs.get(0);
             List<IRNode> leaves = randomChild.getStackableLeaves();
             if (!leaves.isEmpty()) {
-                PseudoRandom.shuffle(leaves);
-                Block randomLeaf = (Block) leaves.get(0);
-                TypeKlass klass = (TypeKlass) randomChild.getKlass();
+                Block randomLeaf = (Block) leaves.get(PseudoRandom.randomNotNegative(leaves.size()));
+                TypeKlass owner = randomChild.getOwner();
                 int newLevel = randomLeaf.getLevel() + 1;
-                Type retType = randomLeaf.getReturnType();
+                Type retType = randomLeaf.getResultType();
                 IRNodeBuilder b = new IRNodeBuilder()
-                        .setOwnerKlass(klass)
+                        .setOwnerKlass(owner)
                         .setResultType(retType)
                         .setComplexityLimit(complexityLimit)
                         .setStatementLimit(statementLimit)
@@ -137,7 +135,7 @@ class ClassDefinitionBlockFactory extends Factory {
                 .filter(c -> c instanceof Klass && c.countDepth() > maxDepth)
                 .collect(Collectors.toList());
         for (IRNode ch : childs) {
-            List<IRNode> leaves = null;
+            List<IRNode> leaves;
             do {
                 long depth = Math.max(ch.countDepth(), maxDepth + 1);
                 leaves = ch.getDeviantBlocks(depth);
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundArithmeticAssignmentOperatorFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundArithmeticAssignmentOperatorFactory.java
index e170ff5c2e6..f8e00582d6c 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundArithmeticAssignmentOperatorFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundArithmeticAssignmentOperatorFactory.java
@@ -30,8 +30,8 @@ import jdk.test.lib.jittester.OperatorKind;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Type;
 import jdk.test.lib.jittester.TypeList;
+import jdk.test.lib.jittester.VariableBase;
 import jdk.test.lib.jittester.utils.TypeUtil;
-import jdk.test.lib.jittester.types.TypeBoolean;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
@@ -43,11 +43,11 @@ class CompoundArithmeticAssignmentOperatorFactory extends BinaryOperatorFactory
 
     @Override
     protected boolean isApplicable(Type resultType) {
-        return TypeList.isBuiltIn(resultType) && !resultType.equals(new TypeBoolean());
+        return TypeList.isBuiltIn(resultType) && !resultType.equals(TypeList.BOOLEAN);
     }
 
     @Override
-    protected Pair<Type, Type> generateTypes() throws ProductionFailedException {
+    protected Pair<Type, Type> generateTypes() {
         return new Pair<>(resultType, PseudoRandom.randomElement(
                 TypeUtil.getExplicitlyCastable(TypeList.getBuiltIn(), resultType)));
     }
@@ -66,13 +66,13 @@ class CompoundArithmeticAssignmentOperatorFactory extends BinaryOperatorFactory
                 .setResultType(rightType)
                 .getExpressionFactory()
                 .produce();
-        IRNode leftExpr = builder.setComplexityLimit(leftComplexityLimit)
+        VariableBase leftExpr = builder.setComplexityLimit(leftComplexityLimit)
                 .setOperatorLimit(leftOperatorLimit)
                 .setResultType(leftType)
                 .setIsConstant(false)
                 .setIsInitialized(true)
                 .getVariableFactory()
                 .produce();
-        return new BinaryOperator(opKind, leftExpr, rightExpr);
+        return new BinaryOperator(opKind, resultType, leftExpr, rightExpr);
     }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundBitwiseAssignmentOperatorFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundBitwiseAssignmentOperatorFactory.java
index b61d23f9519..f87b495970f 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundBitwiseAssignmentOperatorFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundBitwiseAssignmentOperatorFactory.java
@@ -46,7 +46,7 @@ class CompoundBitwiseAssignmentOperatorFactory extends BinaryOperatorFactory {
     }
 
     @Override
-    protected Pair<Type, Type> generateTypes() throws ProductionFailedException {
+    protected Pair<Type, Type> generateTypes() {
         return new Pair<>(resultType, PseudoRandom.randomElement(TypeUtil.getExplicitlyCastable(TypeList.getBuiltInInt(), resultType)));
     }
 
@@ -71,6 +71,6 @@ class CompoundBitwiseAssignmentOperatorFactory extends BinaryOperatorFactory {
                 .setResultType(rightType)
                 .getExpressionFactory()
                 .produce();
-        return new BinaryOperator(opKind, leftExpr, rightExpr);
+        return new BinaryOperator(opKind, resultType, leftExpr, rightExpr);
     }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundShiftAssignmentOperatorFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundShiftAssignmentOperatorFactory.java
index 901bf438a4f..f534df8d2c3 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundShiftAssignmentOperatorFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundShiftAssignmentOperatorFactory.java
@@ -32,7 +32,6 @@ import jdk.test.lib.jittester.Type;
 import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.utils.TypeUtil;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.types.TypeBoolean;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
 class CompoundShiftAssignmentOperatorFactory extends BinaryOperatorFactory {
@@ -43,11 +42,11 @@ class CompoundShiftAssignmentOperatorFactory extends BinaryOperatorFactory {
 
     @Override
     protected boolean isApplicable(Type resultType) {
-        return TypeList.isBuiltInInt(resultType) && !resultType.equals(new TypeBoolean());
+        return TypeList.isBuiltInInt(resultType) && !resultType.equals(TypeList.BOOLEAN);
     }
 
     @Override
-    protected Pair<Type, Type> generateTypes() throws ProductionFailedException {
+    protected Pair<Type, Type> generateTypes() {
         return new Pair<>(resultType, PseudoRandom.randomElement(
                 TypeUtil.getExplicitlyCastable(TypeList.getBuiltInInt(), resultType)));
     }
@@ -73,6 +72,6 @@ class CompoundShiftAssignmentOperatorFactory extends BinaryOperatorFactory {
                 .setResultType(rightType)
                 .getExpressionFactory()
                 .produce();
-        return new BinaryOperator(opKind, leftExpr, rightExpr);
+        return new BinaryOperator(opKind, resultType, leftExpr, rightExpr);
     }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ConstructorDefinitionBlockFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ConstructorDefinitionBlockFactory.java
index 5da833a74e2..8316370b1be 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ConstructorDefinitionBlockFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ConstructorDefinitionBlockFactory.java
@@ -31,7 +31,7 @@ import jdk.test.lib.jittester.functions.ConstructorDefinitionBlock;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class ConstructorDefinitionBlockFactory extends Factory {
+class ConstructorDefinitionBlockFactory extends Factory<ConstructorDefinitionBlock> {
     private final long complexityLimit;
     private final int statementLimit;
     private final int operatorLimit;
@@ -53,7 +53,7 @@ class ConstructorDefinitionBlockFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public ConstructorDefinitionBlock produce() throws ProductionFailedException {
         IRNodeBuilder builder = new IRNodeBuilder()
                 .setOwnerKlass(ownerClass)
                 .setStatementLimit(statementLimit)
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ConstructorDefinitionFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ConstructorDefinitionFactory.java
index 1a7852871fa..142ea6f5215 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ConstructorDefinitionFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ConstructorDefinitionFactory.java
@@ -28,15 +28,15 @@ import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Symbol;
 import jdk.test.lib.jittester.SymbolTable;
+import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.VariableInfo;
 import jdk.test.lib.jittester.functions.ArgumentDeclaration;
 import jdk.test.lib.jittester.functions.ConstructorDefinition;
 import jdk.test.lib.jittester.functions.FunctionInfo;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.types.TypeVoid;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class ConstructorDefinitionFactory extends Factory {
+class ConstructorDefinitionFactory extends Factory<ConstructorDefinition> {
     private final long complexityLimit;
     private final int statementLimit;
     private final int operatorLimit;
@@ -55,7 +55,7 @@ class ConstructorDefinitionFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public ConstructorDefinition produce() throws ProductionFailedException {
         int argNumber = (int) (PseudoRandom.random() * memberFunctionsArgLimit);
         ArrayList<VariableInfo> argumentsInfo = new ArrayList<>(argNumber);
         ArrayList<ArgumentDeclaration> argumentsDeclaration = new ArrayList<>(argNumber);
@@ -90,7 +90,7 @@ class ConstructorDefinitionFactory extends Factory {
             }
             long blockComplLimit = (long) (PseudoRandom.random() * complexityLimit);
             try {
-                body = builder.setResultType(new TypeVoid())
+                body = builder.setResultType(TypeList.VOID)
                         .setComplexityLimit(blockComplLimit)
                         .setStatementLimit(statementLimit)
                         .setOperatorLimit(operatorLimit)
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ContinueFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ContinueFactory.java
index a969567b1d2..e4bc1ebfe62 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ContinueFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ContinueFactory.java
@@ -24,12 +24,11 @@
 package jdk.test.lib.jittester.factories;
 
 import jdk.test.lib.jittester.Continue;
-import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.ProductionFailedException;
 
-class ContinueFactory extends Factory {
+class ContinueFactory extends Factory<Continue> {
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public Continue produce() throws ProductionFailedException {
         return new Continue();
     }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CounterInitializerFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CounterInitializerFactory.java
index 9112bc124d7..67fd4f019cd 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CounterInitializerFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CounterInitializerFactory.java
@@ -24,20 +24,20 @@
 package jdk.test.lib.jittester.factories;
 
 import java.util.List;
+
 import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.LiteralInitializer;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.SymbolTable;
 import jdk.test.lib.jittester.Type;
 import jdk.test.lib.jittester.TypeList;
-import jdk.test.lib.jittester.utils.TypeUtil;
 import jdk.test.lib.jittester.VariableInfo;
+import jdk.test.lib.jittester.utils.TypeUtil;
 import jdk.test.lib.jittester.loops.CounterInitializer;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.types.TypeInt;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class CounterInitializerFactory extends SafeFactory {
+class CounterInitializerFactory extends SafeFactory<CounterInitializer> {
     private final int counterValue;
     private final TypeKlass ownerClass;
 
@@ -47,9 +47,9 @@ class CounterInitializerFactory extends SafeFactory {
     }
 
     @Override
-    protected IRNode sproduce() throws ProductionFailedException {
-        List<Type> types = TypeUtil.getMoreCapaciousThan(TypeList.getBuiltIn(), new TypeInt());
-        types.add(new TypeInt());
+    protected CounterInitializer sproduce() throws ProductionFailedException {
+        List<Type> types = TypeUtil.getMoreCapaciousThan(TypeList.getBuiltIn(), TypeList.INT);
+        types.add(TypeList.INT);
         final Type selectedType = PseudoRandom.randomElement(types);
         IRNode init = new LiteralInitializer(counterValue, selectedType);
         String resultName = "var_" + SymbolTable.getNextVariableNumber();
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CounterManipulatorFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CounterManipulatorFactory.java
index a4fc059e8df..c49ebac7585 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CounterManipulatorFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CounterManipulatorFactory.java
@@ -27,10 +27,11 @@ import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.LocalVariable;
 import jdk.test.lib.jittester.OperatorKind;
 import jdk.test.lib.jittester.ProductionFailedException;
+import jdk.test.lib.jittester.Statement;
 import jdk.test.lib.jittester.UnaryOperator;
 import jdk.test.lib.jittester.loops.CounterManipulator;
 
-class CounterManipulatorFactory extends Factory {
+class CounterManipulatorFactory extends Factory<CounterManipulator> {
     private final LocalVariable counter;
 
     CounterManipulatorFactory(LocalVariable counter) {
@@ -38,9 +39,9 @@ class CounterManipulatorFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public CounterManipulator produce() throws ProductionFailedException {
         // We'll keep it simple for the time being..
         IRNode manipulator = new UnaryOperator(OperatorKind.POST_DEC, counter);
-        return new CounterManipulator(manipulator);
+        return new CounterManipulator(new Statement(manipulator, false));
     }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/DeclarationFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/DeclarationFactory.java
index 66aa9ea0d51..c88809090d7 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/DeclarationFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/DeclarationFactory.java
@@ -31,7 +31,7 @@ import jdk.test.lib.jittester.Rule;
 import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.types.TypeKlass;
 
-class DeclarationFactory extends Factory {
+class DeclarationFactory extends Factory<Declaration> {
     private final int operatorLimit;
     private final long complexityLimit;
     private final boolean isLocal;
@@ -48,29 +48,42 @@ class DeclarationFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
-        Rule rule = new Rule("declaration");
+    public Declaration produce() throws ProductionFailedException {
+        Rule<IRNode> rule = new Rule<>("declaration");
         IRNodeBuilder builder = new IRNodeBuilder().setOwnerKlass(ownerClass)
-                .setResultType(TypeList.getVoid())
+                .setResultType(TypeList.VOID)
                 .setIsLocal(isLocal)
                 .setComplexityLimit(complexityLimit)
                 .setOperatorLimit(operatorLimit)
                 .setIsLocal(isLocal)
                 .setExceptionSafe(exceptionSafe);
-        rule.add("decl", builder.setIsStatic(false).getVariableDeclarationFactory());
-        rule.add("decl_and_init", builder.setIsConstant(false)
-                .setIsStatic(false).getVariableInitializationFactory());
+        rule.add("decl", builder
+                .setIsStatic(false)
+                .getVariableDeclarationFactory());
+        rule.add("decl_and_init", builder
+                .setIsConstant(false)
+                .setIsStatic(false)
+                .getVariableInitializationFactory());
         if (!ProductionParams.disableFinalVariables.value()) {
-            rule.add("const_decl_and_init", builder.setIsConstant(true)
-                    .setIsStatic(false).getVariableInitializationFactory());
+            rule.add("const_decl_and_init", builder
+                    .setIsConstant(true)
+                    .setIsStatic(false)
+                    .getVariableInitializationFactory());
         }
         if (!isLocal && !ProductionParams.disableStatic.value()) {
-            rule.add("static_decl", builder.setIsStatic(true).getVariableDeclarationFactory());
-            rule.add("static_decl_and_init", builder.setIsConstant(false)
-                    .setIsStatic(true).getVariableInitializationFactory());
+            rule.add("static_decl", builder
+                    .setIsConstant(false)
+                    .setIsStatic(true)
+                    .getVariableDeclarationFactory());
+            rule.add("static_decl_and_init", builder
+                    .setIsConstant(false)
+                    .setIsStatic(true)
+                    .getVariableInitializationFactory());
             if (!ProductionParams.disableFinalVariables.value()) {
-                rule.add("static_const_decl_and_init", builder.setIsConstant(true)
-                        .setIsStatic(true).getVariableInitializationFactory());
+                rule.add("static_const_decl_and_init", builder
+                        .setIsConstant(true)
+                        .setIsStatic(true)
+                        .getVariableInitializationFactory());
             }
         }
         return new Declaration(rule.produce());
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/DoWhileFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/DoWhileFactory.java
index 71fda5b08b6..e87c7ab9fb6 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/DoWhileFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/DoWhileFactory.java
@@ -23,21 +23,21 @@
 
 package jdk.test.lib.jittester.factories;
 
-import jdk.test.lib.jittester.IRNode;
-import jdk.test.lib.jittester.Initialization;
+import jdk.test.lib.jittester.Block;
 import jdk.test.lib.jittester.Literal;
 import jdk.test.lib.jittester.LocalVariable;
-import jdk.test.lib.jittester.Nothing;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.SymbolTable;
 import jdk.test.lib.jittester.Type;
+import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.loops.DoWhile;
 import jdk.test.lib.jittester.loops.Loop;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.types.TypeInt;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class DoWhileFactory extends SafeFactory {
+import java.util.LinkedList;
+
+class DoWhileFactory extends SafeFactory<DoWhile> {
     private final Loop loop;
     private final long complexityLimit;
     private final int statementLimit;
@@ -62,7 +62,8 @@ class DoWhileFactory extends SafeFactory {
     }
 
     @Override
-    protected IRNode sproduce() throws ProductionFailedException {
+    protected DoWhile sproduce() throws ProductionFailedException {
+        Block emptyBlock = new Block(ownerClass, returnType, new LinkedList<>(), level - 1);
         if (statementLimit > 0 && complexityLimit > 0) {
             long complexity = complexityLimit;
             // Loop header parameters
@@ -89,7 +90,7 @@ class DoWhileFactory extends SafeFactory {
                     .setResultType(returnType)
                     .setOperatorLimit(operatorLimit);
             loop.initialization = builder.getCounterInitializerFactory(0).produce();
-            IRNode header;
+            Block header;
             try {
                 header = builder.setComplexityLimit(headerComplLimit)
                         .setStatementLimit(headerStatementLimit)
@@ -101,17 +102,17 @@ class DoWhileFactory extends SafeFactory {
                         .getBlockFactory()
                         .produce();
             } catch (ProductionFailedException e) {
-                header = new Nothing();
+                header = emptyBlock;
             }
             // getChildren().set(DoWhile.DoWhilePart.HEADER.ordinal(), header);
-            LocalVariable counter = new LocalVariable(((Initialization) loop.initialization).get());
-            Literal limiter = new Literal(Integer.valueOf((int) thisLoopIterLimit), new TypeInt());
+            LocalVariable counter = new LocalVariable(loop.initialization.getVariableInfo());
+            Literal limiter = new Literal((int) thisLoopIterLimit, TypeList.INT);
             loop.condition = builder.setComplexityLimit(condComplLimit)
                     .setLocalVariable(counter)
                     .getLoopingConditionFactory(limiter)
                     .produce();
             SymbolTable.push();
-            IRNode body1;
+            Block body1;
             try {
                 body1 = builder.setComplexityLimit(body1ComplLimit)
                         .setStatementLimit(body1StatementLimit)
@@ -123,11 +124,11 @@ class DoWhileFactory extends SafeFactory {
                         .getBlockFactory()
                         .produce();
             } catch (ProductionFailedException e) {
-                body1 = new Nothing();
+                body1 = emptyBlock;
             }
             // getChildren().set(DoWhile.DoWhilePart.BODY1.ordinal(), body1);
             loop.manipulator = builder.setLocalVariable(counter).getCounterManipulatorFactory().produce();
-            IRNode body2;
+            Block body2;
             try {
                 body2 = builder.setComplexityLimit(body2ComplLimit)
                         .setStatementLimit(body2StatementLimit)
@@ -139,7 +140,7 @@ class DoWhileFactory extends SafeFactory {
                         .getBlockFactory()
                         .produce();
             } catch (ProductionFailedException e) {
-                body2 = new Nothing();
+                body2 = emptyBlock;
             }
             // getChildren().set(DoWhile.DoWhilePart.BODY2.ordinal(), body2);
             SymbolTable.pop();
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ExpressionFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ExpressionFactory.java
index 06b1071464a..5da0aaac092 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ExpressionFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ExpressionFactory.java
@@ -29,11 +29,11 @@ import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.ProductionLimiter;
 import jdk.test.lib.jittester.ProductionParams;
 import jdk.test.lib.jittester.Rule;
-import jdk.test.lib.jittester.Type;;
+import jdk.test.lib.jittester.Type;
 import jdk.test.lib.jittester.types.TypeKlass;
 
-class ExpressionFactory extends SafeFactory {
-    private final Rule rule;
+class ExpressionFactory extends SafeFactory<IRNode> {
+    private final Rule<IRNode> rule;
 
     ExpressionFactory(long complexityLimit, int operatorLimit, TypeKlass ownerClass, Type resultType,
             boolean exceptionSafe, boolean noconsts) throws ProductionFailedException {
@@ -44,7 +44,7 @@ class ExpressionFactory extends SafeFactory {
                 .setResultType(resultType)
                 .setExceptionSafe(exceptionSafe)
                 .setNoConsts(noconsts);
-        rule = new Rule("expression");
+        rule = new Rule<>("expression");
         if (!noconsts) {
             rule.add("literal", builder.getLiteralFactory());
             rule.add("constant", builder.setIsConstant(true)
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/Factory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/Factory.java
index 1929ee9c82d..ac113f66050 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/Factory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/Factory.java
@@ -26,6 +26,6 @@ package jdk.test.lib.jittester.factories;
 import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.ProductionFailedException;
 
-public abstract class Factory {
-    public abstract IRNode produce() throws ProductionFailedException;
+public abstract class Factory<T extends IRNode> {
+    public abstract T produce() throws ProductionFailedException;
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ForFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ForFactory.java
index ffb881b8670..8a4aa84d677 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ForFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ForFactory.java
@@ -23,22 +23,25 @@
 
 package jdk.test.lib.jittester.factories;
 
+import jdk.test.lib.jittester.Block;
 import jdk.test.lib.jittester.IRNode;
-import jdk.test.lib.jittester.Initialization;
 import jdk.test.lib.jittester.Literal;
 import jdk.test.lib.jittester.LocalVariable;
 import jdk.test.lib.jittester.Nothing;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Rule;
+import jdk.test.lib.jittester.Statement;
 import jdk.test.lib.jittester.SymbolTable;
 import jdk.test.lib.jittester.Type;
+import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.loops.For;
 import jdk.test.lib.jittester.loops.Loop;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.types.TypeInt;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class ForFactory extends SafeFactory {
+import java.util.LinkedList;
+
+class ForFactory extends SafeFactory<For> {
     private final Loop loop;
     private final long complexityLimit;
     private final int statementLimit;
@@ -46,7 +49,6 @@ class ForFactory extends SafeFactory {
     private final TypeKlass ownerClass;
     private final Type returnType;
     private final int level;
-    private long thisLoopIterLimit = 0;
     private final boolean canHaveReturn;
 
     ForFactory(TypeKlass ownerClass, Type returnType, long complexityLimit, int statementLimit,
@@ -62,7 +64,8 @@ class ForFactory extends SafeFactory {
     }
 
     @Override
-    protected IRNode sproduce() throws ProductionFailedException {
+    protected For sproduce() throws ProductionFailedException {
+        Block emptyBlock = new Block(ownerClass, returnType, new LinkedList<>(), level - 1);
         if (statementLimit <= 0 || complexityLimit <= 0) {
             throw new ProductionFailedException();
         }
@@ -81,7 +84,7 @@ class ForFactory extends SafeFactory {
         long statement1ComplLimit = (long) (0.005 * complexity * PseudoRandom.random());
         complexity -= statement1ComplLimit;
         // Loop body parameters
-        thisLoopIterLimit = (long) (0.0001 * complexity * PseudoRandom.random());
+        long thisLoopIterLimit = (long) (0.0001 * complexity * PseudoRandom.random());
         if (thisLoopIterLimit > Integer.MAX_VALUE || thisLoopIterLimit == 0) {
             throw new ProductionFailedException();
         }
@@ -100,7 +103,7 @@ class ForFactory extends SafeFactory {
         int body3StatementLimit = PseudoRandom.randomNotZero((int) (statementLimit / 4.0));
         // Production
         loop.initialization = builder.getCounterInitializerFactory(0).produce();
-        IRNode header;
+        Block header;
         try {
             header = builder.setComplexityLimit(headerComplLimit)
                     .setStatementLimit(headerStatementLimit)
@@ -112,12 +115,12 @@ class ForFactory extends SafeFactory {
                     .getBlockFactory()
                     .produce();
         } catch (ProductionFailedException e) {
-            header = new Nothing();
+            header = emptyBlock;
         }
         SymbolTable.push();
         IRNode statement1;
         try {
-            Rule rule = new Rule("statement1");
+            Rule<IRNode> rule = new Rule<>("statement1");
             builder.setComplexityLimit(statement1ComplLimit);
             rule.add("assignment", builder.getAssignmentOperatorFactory());
             rule.add("function", builder.getFunctionFactory(), 0.1);
@@ -129,20 +132,20 @@ class ForFactory extends SafeFactory {
         } catch (ProductionFailedException e) {
             statement1 = new Nothing();
         }
-        LocalVariable counter = new LocalVariable(((Initialization) loop.initialization).get());
-        Literal limiter = new Literal(Integer.valueOf((int) thisLoopIterLimit), new TypeInt());
+        LocalVariable counter = new LocalVariable(loop.initialization.getVariableInfo());
+        Literal limiter = new Literal((int) thisLoopIterLimit, TypeList.INT);
         loop.condition = builder.setComplexityLimit(condComplLimit)
                 .setLocalVariable(counter)
                 .getLoopingConditionFactory(limiter)
                 .produce();
         IRNode statement2;
         try {
-            statement2 =  builder.setComplexityLimit(statement2ComplLimit)
+            statement2 = builder.setComplexityLimit(statement2ComplLimit)
                     .getAssignmentOperatorFactory().produce();
         } catch (ProductionFailedException e) {
             statement2 = new Nothing();
         }
-        IRNode body1;
+        Block body1;
         try {
             body1 = builder.setComplexityLimit(body1ComplLimit)
                     .setStatementLimit(body1StatementLimit)
@@ -154,10 +157,10 @@ class ForFactory extends SafeFactory {
                     .getBlockFactory()
                     .produce();
         } catch (ProductionFailedException e) {
-            body1 = new Nothing();
+            body1 = emptyBlock;
         }
         loop.manipulator = builder.setLocalVariable(counter).getCounterManipulatorFactory().produce();
-        IRNode body2;
+        Block body2;
         try {
             body2 = builder.setComplexityLimit(body2ComplLimit)
                     .setStatementLimit(body2StatementLimit)
@@ -169,9 +172,9 @@ class ForFactory extends SafeFactory {
                     .getBlockFactory()
                     .produce();
         } catch (ProductionFailedException e) {
-            body2 = new Nothing();
+            body2 = emptyBlock;
         }
-        IRNode body3;
+        Block body3;
         try {
             body3 = builder.setComplexityLimit(body3ComplLimit)
                     .setStatementLimit(body3StatementLimit)
@@ -183,10 +186,13 @@ class ForFactory extends SafeFactory {
                     .getBlockFactory()
                     .produce();
         } catch (ProductionFailedException e) {
-            body3 = new Nothing();
+            body3 = emptyBlock;
         }
         SymbolTable.pop();
-        return new For(level, loop, thisLoopIterLimit, header, statement1, statement2, body1,
+        return new For(level, loop, thisLoopIterLimit, header,
+                new Statement(statement1, false),
+                new Statement(statement2, false),
+                body1,
                 body2, body3);
     }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDeclarationBlockFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDeclarationBlockFactory.java
index 269b6d634c1..7dbb869d6b6 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDeclarationBlockFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDeclarationBlockFactory.java
@@ -31,7 +31,7 @@ import jdk.test.lib.jittester.functions.FunctionInfo;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class FunctionDeclarationBlockFactory extends Factory {
+class FunctionDeclarationBlockFactory extends Factory<FunctionDeclarationBlock> {
     private final int memberFunctionsLimit;
     private final int memberFunctionsArgLimit;
     private final int level;
@@ -46,7 +46,7 @@ class FunctionDeclarationBlockFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public FunctionDeclarationBlock produce() throws ProductionFailedException {
         ArrayList<IRNode> content = new ArrayList<>();
         int memFunLimit = (int) (PseudoRandom.random() * memberFunctionsLimit);
         if (memFunLimit > 0) {
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDeclarationFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDeclarationFactory.java
index 99226f3d034..0bdcd091698 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDeclarationFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDeclarationFactory.java
@@ -27,7 +27,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Symbol;
 import jdk.test.lib.jittester.SymbolTable;
@@ -39,10 +38,9 @@ import jdk.test.lib.jittester.functions.FunctionDeclaration;
 import jdk.test.lib.jittester.functions.FunctionDefinition;
 import jdk.test.lib.jittester.functions.FunctionInfo;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.types.TypeVoid;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class FunctionDeclarationFactory extends Factory {
+class FunctionDeclarationFactory extends Factory<FunctionDeclaration> {
     private final Type resultType;
     private final TypeKlass ownerClass;
     private final String name;
@@ -59,11 +57,11 @@ class FunctionDeclarationFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public FunctionDeclaration produce() throws ProductionFailedException {
         Type resType = resultType;
         if (resType == null) {
             List<Type> types = new ArrayList<>(TypeList.getAll());
-            types.add(new TypeVoid());
+            types.add(TypeList.VOID);
             resType = PseudoRandom.randomElement(types);
         }
         int argNumber = (int) (PseudoRandom.random() * memberFunctionsArgLimit);
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDefinitionBlockFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDefinitionBlockFactory.java
index da3481ddb8d..541d7a48290 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDefinitionBlockFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDefinitionBlockFactory.java
@@ -35,7 +35,7 @@ import jdk.test.lib.jittester.functions.FunctionInfo;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class FunctionDefinitionBlockFactory extends Factory {
+class FunctionDefinitionBlockFactory extends Factory<FunctionDefinitionBlock> {
     private final long complexityLimit;
     private final int statementLimit;
     private final int operatorLimit;
@@ -59,7 +59,7 @@ class FunctionDefinitionBlockFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public FunctionDefinitionBlock produce() throws ProductionFailedException {
         ArrayList<IRNode> content = new ArrayList<>();
         int memFunLimit = (int) (PseudoRandom.random() * memberFunctionsLimit);
         if (memFunLimit > 0) {
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDefinitionFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDefinitionFactory.java
index 76ea7374749..5e95b4e614f 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDefinitionFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionDefinitionFactory.java
@@ -28,6 +28,7 @@ import java.util.Collection;
 import java.util.List;
 
 import jdk.test.lib.jittester.IRNode;
+import jdk.test.lib.jittester.Nothing;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Symbol;
 import jdk.test.lib.jittester.SymbolTable;
@@ -37,11 +38,11 @@ import jdk.test.lib.jittester.VariableInfo;
 import jdk.test.lib.jittester.functions.ArgumentDeclaration;
 import jdk.test.lib.jittester.functions.FunctionDefinition;
 import jdk.test.lib.jittester.functions.FunctionInfo;
+import jdk.test.lib.jittester.functions.Return;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.types.TypeVoid;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class FunctionDefinitionFactory extends Factory {
+class FunctionDefinitionFactory extends Factory<FunctionDefinition> {
     private final Type resultType;
     private final String name;
     private final long complexityLimit;
@@ -67,11 +68,11 @@ class FunctionDefinitionFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public FunctionDefinition produce() throws ProductionFailedException {
         Type resType = resultType;
         if (resType == null) {
             List<Type> types = new ArrayList<>(TypeList.getAll());
-            types.add(new TypeVoid());
+            types.add(TypeList.VOID);
             resType = PseudoRandom.randomElement(types);
         }
         int argNumber = (int) (PseudoRandom.random() * memberFunctionsArgLimit);
@@ -86,7 +87,7 @@ class FunctionDefinitionFactory extends Factory {
         ArrayList<ArgumentDeclaration> argumentsDeclaration = new ArrayList<>(argNumber);
         SymbolTable.push();
         IRNode body;
-        IRNode returnNode;
+        Return returnNode;
         FunctionInfo functionInfo;
         try {
             IRNodeBuilder builder = new IRNodeBuilder().setArgumentType(ownerClass);
@@ -127,13 +128,13 @@ class FunctionDefinitionFactory extends Factory {
                     .setCanHaveReturn(true)
                     .getBlockFactory()
                     .produce();
-            if (!resType.equals(new TypeVoid())) {
+            if (!resType.equals(TypeList.VOID)) {
                 returnNode = builder.setComplexityLimit(complexityLimit - blockComplLimit)
                         .setExceptionSafe(false)
                         .getReturnFactory()
                         .produce();
             } else {
-                returnNode = null;
+                returnNode = new Return(new Nothing());
             }
         } finally {
             SymbolTable.pop();
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionFactory.java
index 419388fc0f7..aad72ce600c 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionFactory.java
@@ -37,7 +37,7 @@ import jdk.test.lib.jittester.functions.FunctionInfo;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class FunctionFactory extends SafeFactory {
+class FunctionFactory extends SafeFactory<Function> {
     private final FunctionInfo functionInfo;
     private final int operatorLimit;
     private final long complexityLimit;
@@ -55,7 +55,7 @@ class FunctionFactory extends SafeFactory {
     }
 
     @Override
-    protected IRNode sproduce() throws ProductionFailedException {
+    protected Function sproduce() throws ProductionFailedException {
         // Currently no function is exception-safe
         if (exceptionSafe) {
             throw new ProductionFailedException();
@@ -72,7 +72,7 @@ class FunctionFactory extends SafeFactory {
             for (Symbol function : allFunctions) {
                 FunctionInfo functionInfo = (FunctionInfo) function;
                 // Don't try to construct abstract classes.
-                if (functionInfo.isConstructor() && functionInfo.klass.isAbstract()) {
+                if (functionInfo.isConstructor() && functionInfo.owner.isAbstract()) {
                     continue;
                 }
                 // We don't call methods from the same class which are not final, because if we
@@ -94,7 +94,7 @@ class FunctionFactory extends SafeFactory {
 
                 // If it's a local call.. or it's a call using some variable to some object of some type in our hierarchy
                 boolean inHierarchy = false;
-                if (ownerClass.equals(functionInfo.klass) || (inHierarchy = klassHierarchy.contains(functionInfo.klass))) {
+                if (ownerClass.equals(functionInfo.owner) || (inHierarchy = klassHierarchy.contains(functionInfo.owner))) {
                     if ((functionInfo.flags & FunctionInfo.FINAL) == 0 && (functionInfo.flags & FunctionInfo.STATIC) == 0
                             && (functionInfo.flags & FunctionInfo.NONRECURSIVE) == 0) {
                         continue;
@@ -121,7 +121,7 @@ class FunctionFactory extends SafeFactory {
                             // If there are function with a same name and same number of args,
                             // then disable usage of foldable expressions in the args.
                             boolean noconsts = false;
-                            Collection<Symbol> allFuncsInKlass = SymbolTable.getAllCombined(functionInfo.klass,
+                            Collection<Symbol> allFuncsInKlass = SymbolTable.getAllCombined(functionInfo.owner,
                                     FunctionInfo.class);
                             for (Symbol s2 : allFuncsInKlass) {
                                 FunctionInfo i2 = (FunctionInfo) function;
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionRedefinitionBlockFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionRedefinitionBlockFactory.java
index 1bf8bde68e6..6df15de50e5 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionRedefinitionBlockFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionRedefinitionBlockFactory.java
@@ -34,7 +34,7 @@ import jdk.test.lib.jittester.functions.FunctionInfo;
 import jdk.test.lib.jittester.functions.FunctionRedefinitionBlock;
 import jdk.test.lib.jittester.types.TypeKlass;
 
-class FunctionRedefinitionBlockFactory extends Factory {
+class FunctionRedefinitionBlockFactory extends Factory<FunctionRedefinitionBlock> {
     private final int statementLimit;
     private final int operatorLimit;
     private final long complexityLimit;
@@ -53,7 +53,7 @@ class FunctionRedefinitionBlockFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public FunctionRedefinitionBlock produce() throws ProductionFailedException {
         ArrayList<IRNode> content = new ArrayList<>();
         if (functionSet.size() > 0) {
             long funcComplexity = complexityLimit / functionSet.size();
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionRedefinitionFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionRedefinitionFactory.java
index 3a74da66c33..a1daa759611 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionRedefinitionFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/FunctionRedefinitionFactory.java
@@ -25,17 +25,19 @@ package jdk.test.lib.jittester.factories;
 
 import java.util.ArrayList;
 import jdk.test.lib.jittester.IRNode;
+import jdk.test.lib.jittester.Nothing;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.SymbolTable;
+import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.VariableInfo;
 import jdk.test.lib.jittester.functions.ArgumentDeclaration;
-import jdk.test.lib.jittester.functions.FunctionDefinition;
 import jdk.test.lib.jittester.functions.FunctionInfo;
+import jdk.test.lib.jittester.functions.FunctionRedefinition;
+import jdk.test.lib.jittester.functions.Return;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.types.TypeVoid;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class FunctionRedefinitionFactory extends Factory {
+class FunctionRedefinitionFactory extends Factory<FunctionRedefinition> {
     private final long complexityLimit;
     private final int statementLimit;
     private final int operatorLimit;
@@ -47,14 +49,14 @@ class FunctionRedefinitionFactory extends Factory {
             long complexityLimit, int statementLimit, int operatorLimit, int level, int flags) {
         this.ownerClass = ownerClass;
         this.functionInfo = new FunctionInfo(functionInfo); // do deep coping
-        functionInfo.klass = ownerClass; // important! fix klass!
+        functionInfo.owner = ownerClass; // important! fix klass!
         if ((functionInfo.flags & FunctionInfo.STATIC) == 0) {
             functionInfo.argTypes.get(0).type = ownerClass; // redefine type of this
         }
         functionInfo.flags = flags; // apply new flags.
         // fix the type of class where the args would be declared
         for (VariableInfo varInfo : functionInfo.argTypes) {
-            varInfo.klass = ownerClass;
+            varInfo.owner = ownerClass;
         }
         this.complexityLimit = complexityLimit;
         this.statementLimit = statementLimit;
@@ -63,14 +65,14 @@ class FunctionRedefinitionFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public FunctionRedefinition produce() throws ProductionFailedException {
         ArrayList<VariableInfo> argumentsInfo = functionInfo.argTypes;
         SymbolTable.push();
         IRNode body;
-        IRNode returnNode;
+        Return returnNode;
         ArrayList<ArgumentDeclaration> argumentsDeclaration;
         try {
-            if ((functionInfo.flags & FunctionInfo.STATIC) > 0) {
+            if (functionInfo.isStatic()) {
                 argumentsDeclaration = new ArrayList<>(argumentsInfo.size());
                 for (VariableInfo varInfo : argumentsInfo) {
                     argumentsDeclaration.add(new ArgumentDeclaration(varInfo));
@@ -98,13 +100,13 @@ class FunctionRedefinitionFactory extends Factory {
                     .setCanHaveReturn(true)
                     .getBlockFactory()
                     .produce();
-            if (!functionInfo.type.equals(new TypeVoid())) {
+            if (!functionInfo.type.equals(TypeList.VOID)) {
                 returnNode = builder.setComplexityLimit(complexityLimit - blockComplLimit)
                         .setExceptionSafe(false)
                         .getReturnFactory()
                         .produce();
             } else {
-                returnNode = null;
+                returnNode = new Return(new Nothing());
             }
         } catch (ProductionFailedException e) {
             SymbolTable.pop();
@@ -112,12 +114,12 @@ class FunctionRedefinitionFactory extends Factory {
             throw e;
         }
         SymbolTable.pop();
-        if ((functionInfo.flags & FunctionInfo.STATIC) == 0) {
+        if (!functionInfo.isStatic()) {
             functionInfo.flags &= ~FunctionInfo.ABSTRACT;
         }
         // If it's all ok, add the function to the symbol table.
         SymbolTable.add(functionInfo);
-        return new FunctionDefinition(functionInfo, argumentsDeclaration, body, returnNode);
+        return new FunctionRedefinition(functionInfo, argumentsDeclaration, body, returnNode);
     }
 
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/IRNodeBuilder.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/IRNodeBuilder.java
index a57a840a41b..17f877ec6be 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/IRNodeBuilder.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/IRNodeBuilder.java
@@ -25,14 +25,64 @@ package jdk.test.lib.jittester.factories;
 
 import java.util.Collection;
 import java.util.Optional;
+
+import jdk.test.lib.jittester.BinaryOperator;
+import jdk.test.lib.jittester.Block;
+import jdk.test.lib.jittester.Break;
+import jdk.test.lib.jittester.CastOperator;
+import jdk.test.lib.jittester.Continue;
+import jdk.test.lib.jittester.Declaration;
+import jdk.test.lib.jittester.IRNode;
+import jdk.test.lib.jittester.If;
 import jdk.test.lib.jittester.Literal;
 import jdk.test.lib.jittester.LocalVariable;
+import jdk.test.lib.jittester.NonStaticMemberVariable;
+import jdk.test.lib.jittester.Nothing;
+import jdk.test.lib.jittester.Operator;
 import jdk.test.lib.jittester.OperatorKind;
+import jdk.test.lib.jittester.PrintVariables;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.ProductionParams;
+import jdk.test.lib.jittester.Statement;
+import jdk.test.lib.jittester.StaticMemberVariable;
+import jdk.test.lib.jittester.Switch;
 import jdk.test.lib.jittester.Symbol;
+import jdk.test.lib.jittester.TernaryOperator;
+import jdk.test.lib.jittester.Throw;
+import jdk.test.lib.jittester.TryCatchBlock;
 import jdk.test.lib.jittester.Type;
+import jdk.test.lib.jittester.TypeList;
+import jdk.test.lib.jittester.UnaryOperator;
+import jdk.test.lib.jittester.VariableBase;
+import jdk.test.lib.jittester.VariableDeclaration;
+import jdk.test.lib.jittester.VariableDeclarationBlock;
+import jdk.test.lib.jittester.VariableInitialization;
+import jdk.test.lib.jittester.arrays.ArrayCreation;
+import jdk.test.lib.jittester.arrays.ArrayElement;
+import jdk.test.lib.jittester.arrays.ArrayExtraction;
+import jdk.test.lib.jittester.classes.ClassDefinitionBlock;
+import jdk.test.lib.jittester.classes.Interface;
+import jdk.test.lib.jittester.classes.Klass;
+import jdk.test.lib.jittester.classes.MainKlass;
+import jdk.test.lib.jittester.functions.ArgumentDeclaration;
+import jdk.test.lib.jittester.functions.ConstructorDefinition;
+import jdk.test.lib.jittester.functions.ConstructorDefinitionBlock;
+import jdk.test.lib.jittester.functions.Function;
+import jdk.test.lib.jittester.functions.FunctionDeclaration;
+import jdk.test.lib.jittester.functions.FunctionDeclarationBlock;
+import jdk.test.lib.jittester.functions.FunctionDefinition;
+import jdk.test.lib.jittester.functions.FunctionDefinitionBlock;
 import jdk.test.lib.jittester.functions.FunctionInfo;
+import jdk.test.lib.jittester.functions.FunctionRedefinition;
+import jdk.test.lib.jittester.functions.FunctionRedefinitionBlock;
+import jdk.test.lib.jittester.functions.Return;
+import jdk.test.lib.jittester.functions.StaticConstructorDefinition;
+import jdk.test.lib.jittester.loops.CounterInitializer;
+import jdk.test.lib.jittester.loops.CounterManipulator;
+import jdk.test.lib.jittester.loops.DoWhile;
+import jdk.test.lib.jittester.loops.For;
+import jdk.test.lib.jittester.loops.LoopingCondition;
+import jdk.test.lib.jittester.loops.While;
 import jdk.test.lib.jittester.types.TypeKlass;
 
 public class IRNodeBuilder {
@@ -63,41 +113,40 @@ public class IRNodeBuilder {
     private Optional<Boolean> isConstant = Optional.empty();
     private Optional<Boolean> isInitialized = Optional.empty();
     private Optional<String> name = Optional.empty();
-    private Optional<String> printerName = Optional.empty();
     private Optional<Integer> flags = Optional.empty();
     private Optional<FunctionInfo> functionInfo = Optional.empty();
     private Optional<Boolean> semicolon = Optional.empty();
 
-    public ArgumentDeclarationFactory getArgumentDeclarationFactory() {
+    public Factory<ArgumentDeclaration> getArgumentDeclarationFactory() {
         return new ArgumentDeclarationFactory(getArgumentType(), getVariableNumber());
     }
 
-    public Factory getArithmeticOperatorFactory() throws ProductionFailedException {
+    public Factory<Operator> getArithmeticOperatorFactory() throws ProductionFailedException {
         return new ArithmeticOperatorFactory(getComplexityLimit(), getOperatorLimit(),
                 getOwnerClass(), getResultType(), getExceptionSafe(), getNoConsts());
     }
 
-    public ArrayCreationFactory getArrayCreationFactory() {
+    public Factory<ArrayCreation> getArrayCreationFactory() {
         return new ArrayCreationFactory(getComplexityLimit(), getOperatorLimit(), getOwnerClass(),
                 getResultType(), getExceptionSafe(), getNoConsts());
     }
 
-    public ArrayElementFactory getArrayElementFactory() {
+    public Factory<ArrayElement> getArrayElementFactory() {
         return new ArrayElementFactory(getComplexityLimit(), getOperatorLimit(), getOwnerClass(),
                 getResultType(), getExceptionSafe(), getNoConsts());
     }
 
-    public ArrayExtractionFactory getArrayExtractionFactory() {
+    public Factory<ArrayExtraction> getArrayExtractionFactory() {
         return new ArrayExtractionFactory(getComplexityLimit(), getOperatorLimit(), getOwnerClass(),
                 getResultType(), getExceptionSafe(), getNoConsts());
     }
 
-    public AssignmentOperatorFactory getAssignmentOperatorFactory() {
+    public Factory<Operator> getAssignmentOperatorFactory() {
         return new AssignmentOperatorFactory(getComplexityLimit(), getOperatorLimit(),
                 getOwnerClass(), resultType.orElse(null), getExceptionSafe(), getNoConsts());
     }
 
-    public BinaryOperatorFactory getBinaryOperatorFactory() throws ProductionFailedException {
+    public Factory<BinaryOperator> getBinaryOperatorFactory() throws ProductionFailedException {
         OperatorKind o = getOperatorKind();
         switch (o) {
             case ASSIGN:
@@ -166,7 +215,7 @@ public class IRNodeBuilder {
         }
     }
 
-    public UnaryOperatorFactory getUnaryOperatorFactory() throws ProductionFailedException {
+    public Factory<UnaryOperator> getUnaryOperatorFactory() throws ProductionFailedException {
         OperatorKind o = getOperatorKind();
         switch (o) {
             case NOT:
@@ -193,24 +242,24 @@ public class IRNodeBuilder {
         }
     }
 
-    public BlockFactory getBlockFactory() throws ProductionFailedException {
+    public Factory<Block> getBlockFactory() {
         return new BlockFactory(getOwnerClass(), getResultType(), getComplexityLimit(),
-            getStatementLimit(), getOperatorLimit(), getLevel(), subBlock.orElse(false),
-            canHaveBreaks.orElse(false), canHaveContinues.orElse(false),
+                getStatementLimit(), getOperatorLimit(), getLevel(), subBlock.orElse(false),
+                canHaveBreaks.orElse(false), canHaveContinues.orElse(false),
                 canHaveReturn.orElse(false), canHaveReturn.orElse(false));
-                //now 'throw' can be placed only in the same positions as 'return'
+        //now 'throw' can be placed only in the same positions as 'return'
     }
 
-    public BreakFactory getBreakFactory() {
+    public Factory<Break> getBreakFactory() {
         return new BreakFactory();
     }
 
-    public CastOperatorFactory getCastOperatorFactory() {
+    public Factory<CastOperator> getCastOperatorFactory() {
         return new CastOperatorFactory(getComplexityLimit(), getOperatorLimit(), getOwnerClass(),
                 getResultType(), getExceptionSafe(), getNoConsts());
     }
 
-    public Factory getClassDefinitionBlockFactory() {
+    public Factory<ClassDefinitionBlock> getClassDefinitionBlockFactory() {
         return new ClassDefinitionBlockFactory(getPrefix(),
                 ProductionParams.classesLimit.value(),
                 ProductionParams.memberFunctionsLimit.value(),
@@ -221,7 +270,7 @@ public class IRNodeBuilder {
                 getLevel());
     }
 
-    public Factory getMainKlassFactory() {
+    public Factory<MainKlass> getMainKlassFactory() {
         return new MainKlassFactory(getName(), getComplexityLimit(),
                 ProductionParams.memberFunctionsLimit.value(),
                 ProductionParams.memberFunctionsArgLimit.value(),
@@ -230,200 +279,200 @@ public class IRNodeBuilder {
                 ProductionParams.operatorLimit.value());
     }
 
-    public ConstructorDefinitionBlockFactory getConstructorDefinitionBlockFactory() {
+    public Factory<ConstructorDefinitionBlock> getConstructorDefinitionBlockFactory() {
         return new ConstructorDefinitionBlockFactory(getOwnerClass(), getMemberFunctionsLimit(),
                 ProductionParams.memberFunctionsArgLimit.value(), getComplexityLimit(),
                 getStatementLimit(), getOperatorLimit(), getLevel());
     }
 
-    public ConstructorDefinitionFactory getConstructorDefinitionFactory() {
+    public Factory<ConstructorDefinition> getConstructorDefinitionFactory() {
         return new ConstructorDefinitionFactory(getOwnerClass(), getComplexityLimit(),
                 getStatementLimit(), getOperatorLimit(),
                 getMemberFunctionsArgLimit(), getLevel());
     }
 
-    public ContinueFactory getContinueFactory() {
+    public Factory<Continue> getContinueFactory() {
         return new ContinueFactory();
     }
 
-    public CounterInitializerFactory getCounterInitializerFactory(int counterValue) {
+    public Factory<CounterInitializer> getCounterInitializerFactory(int counterValue) {
         return new CounterInitializerFactory(getOwnerClass(), counterValue);
     }
 
-    public CounterManipulatorFactory getCounterManipulatorFactory() {
+    public Factory<CounterManipulator> getCounterManipulatorFactory() {
         return new CounterManipulatorFactory(getLocalVariable());
     }
 
-    public DeclarationFactory getDeclarationFactory() {
+    public Factory<Declaration> getDeclarationFactory() {
         return new DeclarationFactory(getOwnerClass(), getComplexityLimit(), getOperatorLimit(),
-            getIsLocal(), getExceptionSafe());
+                getIsLocal(), getExceptionSafe());
     }
 
-    public DoWhileFactory getDoWhileFactory() {
+    public Factory<DoWhile> getDoWhileFactory() {
         return new DoWhileFactory(getOwnerClass(), getResultType(), getComplexityLimit(),
                 getStatementLimit(), getOperatorLimit(), getLevel(), getCanHaveReturn());
     }
 
-    public WhileFactory getWhileFactory() {
+    public Factory<While> getWhileFactory() {
         return new WhileFactory(getOwnerClass(), getResultType(), getComplexityLimit(),
                 getStatementLimit(), getOperatorLimit(), getLevel(), getCanHaveReturn());
     }
 
-    public IfFactory getIfFactory() {
+    public Factory<If> getIfFactory() {
         return new IfFactory(getOwnerClass(), getResultType(), getComplexityLimit(),
-        getStatementLimit(), getOperatorLimit(), getLevel(), getCanHaveBreaks(),
+                getStatementLimit(), getOperatorLimit(), getLevel(), getCanHaveBreaks(),
                 getCanHaveContinues(), getCanHaveReturn());
     }
 
-    public ForFactory getForFactory() {
+    public Factory<For> getForFactory() {
         return new ForFactory(getOwnerClass(), getResultType(), getComplexityLimit(),
                 getStatementLimit(), getOperatorLimit(), getLevel(), getCanHaveReturn());
     }
 
-    public SwitchFactory getSwitchFactory() { // TODO: switch is not used now
+    public Factory<Switch> getSwitchFactory() { // TODO: switch is not used now
         return new SwitchFactory(getOwnerClass(), getComplexityLimit(), getStatementLimit(),
                 getOperatorLimit(), getLevel(), getCanHaveReturn());
     }
 
-    public ExpressionFactory getExpressionFactory() throws ProductionFailedException {
+    public Factory<IRNode> getExpressionFactory() throws ProductionFailedException {
         return new ExpressionFactory(getComplexityLimit(), getOperatorLimit(), getOwnerClass(),
                 getResultType(), getExceptionSafe(), getNoConsts());
     }
 
-    public FunctionDeclarationBlockFactory getFunctionDeclarationBlockFactory() {
+    public Factory<FunctionDeclarationBlock> getFunctionDeclarationBlockFactory() {
         return new FunctionDeclarationBlockFactory(getOwnerClass(), getMemberFunctionsLimit(),
                 getMemberFunctionsArgLimit(), getLevel());
     }
 
-    public FunctionDeclarationFactory getFunctionDeclarationFactory() {
-        return new FunctionDeclarationFactory(getName(), getOwnerClass(),resultType.orElse(null),
+    public Factory<FunctionDeclaration> getFunctionDeclarationFactory() {
+        return new FunctionDeclarationFactory(getName(), getOwnerClass(),resultType.orElse(TypeList.VOID),
                 getMemberFunctionsArgLimit(), getFlags());
     }
 
-    public FunctionDefinitionBlockFactory getFunctionDefinitionBlockFactory() {
+    public Factory<FunctionDefinitionBlock> getFunctionDefinitionBlockFactory() {
         return new FunctionDefinitionBlockFactory(getOwnerClass(), getMemberFunctionsLimit(),
                 getMemberFunctionsArgLimit(), getComplexityLimit(), getStatementLimit(),
                 getOperatorLimit(), getLevel(), getFlags());
     }
 
-    public FunctionDefinitionFactory getFunctionDefinitionFactory() {
-        return new FunctionDefinitionFactory(getName(), getOwnerClass(), resultType.orElse(null),
+    public Factory<FunctionDefinition> getFunctionDefinitionFactory() {
+        return new FunctionDefinitionFactory(getName(), getOwnerClass(), resultType.orElse(TypeList.VOID),
                 getComplexityLimit(), getStatementLimit(), getOperatorLimit(),
                 getMemberFunctionsArgLimit(), getLevel(), getFlags());
     }
 
-    public FunctionFactory getFunctionFactory() {
+    public Factory<Function> getFunctionFactory() {
         return new FunctionFactory(getComplexityLimit(), getOperatorLimit(), getOwnerClass(),
                 resultType.orElse(null), getExceptionSafe());
     }
 
-    public FunctionRedefinitionBlockFactory getFunctionRedefinitionBlockFactory(Collection<Symbol>
-            functionSet) {
+    public Factory<FunctionRedefinitionBlock> getFunctionRedefinitionBlockFactory(Collection<Symbol>
+                                                                                        functionSet) {
         return new FunctionRedefinitionBlockFactory(functionSet, getOwnerClass(),
                 getComplexityLimit(), getStatementLimit(), getOperatorLimit(), getLevel());
     }
 
-    public FunctionRedefinitionFactory getFunctionRedefinitionFactory() {
+    public Factory<FunctionRedefinition> getFunctionRedefinitionFactory() {
         return new FunctionRedefinitionFactory(getFunctionInfo(), getOwnerClass(),
                 getComplexityLimit(), getStatementLimit(), getOperatorLimit(), getLevel(),
                 getFlags());
     }
 
-    public InterfaceFactory getInterfaceFactory() {
+    public Factory<Interface> getInterfaceFactory() {
         return new InterfaceFactory(getName(), getMemberFunctionsLimit(),
                 getMemberFunctionsArgLimit(), getLevel());
     }
 
-    public KlassFactory getKlassFactory() {
-        return new KlassFactory(getName(), getPrinterName(), getComplexityLimit(),
+    public Factory<Klass> getKlassFactory() {
+        return new KlassFactory(getName(), getComplexityLimit(),
                 getMemberFunctionsLimit(), getMemberFunctionsArgLimit(), getStatementLimit(),
                 getOperatorLimit(), getLevel());
     }
 
-    public LimitedExpressionFactory getLimitedExpressionFactory() throws ProductionFailedException {
+    public Factory<IRNode> getLimitedExpressionFactory() throws ProductionFailedException {
         return new LimitedExpressionFactory(getComplexityLimit(), getOperatorLimit(),
                 getOwnerClass(), getResultType(), getExceptionSafe(), getNoConsts());
     }
 
-    public LiteralFactory getLiteralFactory() {
+    public Factory<Literal> getLiteralFactory() {
         return new LiteralFactory(getResultType());
     }
 
-    public LocalVariableFactory getLocalVariableFactory() {
+    public Factory<LocalVariable> getLocalVariableFactory() {
         return new LocalVariableFactory(/*getVariableType()*/getResultType(), getFlags());
     }
 
-    public LogicOperatorFactory getLogicOperatorFactory() throws ProductionFailedException {
+    public Factory<Operator> getLogicOperatorFactory() throws ProductionFailedException {
         return new LogicOperatorFactory(getComplexityLimit(), getOperatorLimit(), getOwnerClass(),
                 getResultType(), getExceptionSafe(), getNoConsts());
     }
 
-    public LoopingConditionFactory getLoopingConditionFactory(Literal _limiter) {
+    public Factory<LoopingCondition> getLoopingConditionFactory(Literal _limiter) {
         return new LoopingConditionFactory(getComplexityLimit(), getOperatorLimit(), getOwnerClass(),
                 getLocalVariable(), _limiter);
     }
 
-    public NonStaticMemberVariableFactory getNonStaticMemberVariableFactory() {
+    public Factory<NonStaticMemberVariable> getNonStaticMemberVariableFactory() {
         return new NonStaticMemberVariableFactory(getComplexityLimit(), getOperatorLimit(),
                 getOwnerClass(), /*getVariableType()*/getResultType(), getFlags(), getExceptionSafe());
     }
 
-    public NothingFactory getNothingFactory() {
+    public Factory<Nothing> getNothingFactory() {
         return new NothingFactory();
     }
 
-    public PrintVariablesFactory getPrintVariablesFactory() {
-        return new PrintVariablesFactory(getPrinterName(), getOwnerClass(), getLevel());
+    public Factory<PrintVariables> getPrintVariablesFactory() {
+        return new PrintVariablesFactory(getOwnerClass(), getLevel());
     }
 
-    public ReturnFactory getReturnFactory() {
+    public Factory<Return> getReturnFactory() {
         return new ReturnFactory(getComplexityLimit(), getOperatorLimit(), getOwnerClass(),
                 getResultType(), getExceptionSafe());
     }
 
-    public ThrowFactory getThrowFactory() {
+    public Factory<Throw> getThrowFactory() {
         return new ThrowFactory(getComplexityLimit(), getOperatorLimit(), getOwnerClass(), getResultType(), getExceptionSafe());
     }
 
-    public StatementFactory getStatementFactory() {
+    public Factory<Statement> getStatementFactory() {
         return new StatementFactory(getComplexityLimit(), getOperatorLimit(), getOwnerClass(),
                 getExceptionSafe(), getNoConsts(), semicolon.orElse(true));
     }
 
-    public StaticConstructorDefinitionFactory getStaticConstructorDefinitionFactory() {
+    public Factory<StaticConstructorDefinition> getStaticConstructorDefinitionFactory() {
         return new StaticConstructorDefinitionFactory(getOwnerClass(), getComplexityLimit(),
                 getStatementLimit(), getOperatorLimit(), getLevel());
     }
 
-    public StaticMemberVariableFactory getStaticMemberVariableFactory() {
+    public Factory<StaticMemberVariable> getStaticMemberVariableFactory() {
         return new StaticMemberVariableFactory(getOwnerClass(), /*getVariableType()*/getResultType(), getFlags());
     }
 
-    public TernaryOperatorFactory getTernaryOperatorFactory() {
+    public Factory<TernaryOperator> getTernaryOperatorFactory() {
         return new TernaryOperatorFactory(getComplexityLimit(), getOperatorLimit(), getOwnerClass(),
                 getResultType(), getExceptionSafe(), getNoConsts());
     }
 
-    public VariableDeclarationBlockFactory getVariableDeclarationBlockFactory() {
+    public Factory<VariableDeclarationBlock> getVariableDeclarationBlockFactory() {
         return new VariableDeclarationBlockFactory(getOwnerClass(), getComplexityLimit(),
                 getOperatorLimit(), getLevel(), getExceptionSafe());
     }
 
-    public VariableDeclarationFactory getVariableDeclarationFactory() {
+    public Factory<VariableDeclaration> getVariableDeclarationFactory() {
         return new VariableDeclarationFactory(getOwnerClass(), getIsStatic(), getIsLocal(), getResultType());
     }
 
-    public VariableFactory getVariableFactory() {
+    public Factory<VariableBase> getVariableFactory() {
         return new VariableFactory(getComplexityLimit(), getOperatorLimit(), getOwnerClass(),
                 /*getVariableType()*/getResultType(), getIsConstant(), getIsInitialized(), getExceptionSafe(), getNoConsts());
     }
 
-    public VariableInitializationFactory getVariableInitializationFactory() {
-            return new VariableInitializationFactory(getOwnerClass(), getIsConstant(), getIsStatic(),
-                    getIsLocal(), getComplexityLimit(), getOperatorLimit(), getExceptionSafe());
+    public Factory<VariableInitialization> getVariableInitializationFactory() {
+        return new VariableInitializationFactory(getOwnerClass(), getIsConstant(), getIsStatic(),
+                getIsLocal(), getComplexityLimit(), getOperatorLimit(), getExceptionSafe());
     }
 
-    public TryCatchBlockFactory getTryCatchBlockFactory() {
+    public Factory<TryCatchBlock> getTryCatchBlockFactory() {
         return new TryCatchBlockFactory(getOwnerClass(), getResultType(),
                 getComplexityLimit(), getStatementLimit(), getOperatorLimit(),
                 getLevel(), subBlock.orElse(false), getCanHaveBreaks(),
@@ -570,11 +619,6 @@ public class IRNodeBuilder {
         return this;
     }
 
-    public IRNodeBuilder setPrinterName(String value) {
-        printerName = Optional.of(value);
-        return this;
-    }
-
     public IRNodeBuilder setSemicolon(boolean value) {
         semicolon = Optional.of(value);
         return this;
@@ -698,9 +742,4 @@ public class IRNodeBuilder {
         return functionInfo.orElseThrow(() -> new IllegalArgumentException(
                 "FunctionInfo wasn't set"));
     }
-
-    private String getPrinterName() {
-        return printerName.orElseThrow(() -> new IllegalArgumentException(
-                "printerName wasn't set"));
-    }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/IfFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/IfFactory.java
index b069767facc..42cb37e4122 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/IfFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/IfFactory.java
@@ -23,21 +23,22 @@
 
 package jdk.test.lib.jittester.factories;
 
+import jdk.test.lib.jittester.Block;
 import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.If;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Type;
+import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.types.TypeBoolean;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class IfFactory extends SafeFactory {
-    protected long complexityLimit;
-    protected int statementLimit;
-    protected int operatorLimit;
-    protected boolean canHaveBreaks;
-    protected boolean canHaveContinues;
-    protected boolean canHaveReturn;
+class IfFactory extends SafeFactory<If> {
+    protected final long complexityLimit;
+    protected final int statementLimit;
+    protected final int operatorLimit;
+    protected final boolean canHaveBreaks;
+    protected final boolean canHaveContinues;
+    protected final boolean canHaveReturn;
     protected final TypeKlass ownerClass;
     protected final Type returnType;
     protected final int level;
@@ -57,7 +58,7 @@ class IfFactory extends SafeFactory {
     }
 
     @Override
-    public IRNode sproduce() throws ProductionFailedException {
+    public If sproduce() throws ProductionFailedException {
         // resizeUpChildren(If.IfPart.values().length);
         if (statementLimit > 0 && complexityLimit > 0) {
             long conditionComplLimit = (long) (0.01 * PseudoRandom.random() * (complexityLimit - 1));
@@ -65,7 +66,7 @@ class IfFactory extends SafeFactory {
                     .setOwnerKlass(ownerClass)
                     .setOperatorLimit(operatorLimit);
             IRNode condition = builder.setComplexityLimit(conditionComplLimit)
-                    .setResultType(new TypeBoolean())
+                    .setResultType(TypeList.BOOLEAN)
                     .setExceptionSafe(false)
                     .setNoConsts(false)
                     .getLimitedExpressionFactory()
@@ -83,7 +84,7 @@ class IfFactory extends SafeFactory {
                 controlDeviation = PseudoRandom.randomBoolean() ? If.IfPart.THEN : If.IfPart.ELSE;
             }
             if (ifBlockLimit > 0 && ifBlockComplLimit > 0) {
-                IRNode thenBlock = null;
+                Block thenBlock;
                 builder.setResultType(returnType)
                         .setLevel(level)
                         .setComplexityLimit(ifBlockComplLimit)
@@ -104,7 +105,7 @@ class IfFactory extends SafeFactory {
                             .produce();
                 }
                 // setChild(If.IfPart.THEN.ordinal(), thenBlock);
-                IRNode elseBlock = null;
+                Block elseBlock = null;
                 if (elseBlockLimit > 0 && elseBlockComplLimit > 0) {
                     builder.setComplexityLimit(elseBlockComplLimit)
                             .setStatementLimit(elseBlockLimit);
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/IncDecOperatorFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/IncDecOperatorFactory.java
index 08e7c031613..4fc10cb02d2 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/IncDecOperatorFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/IncDecOperatorFactory.java
@@ -23,14 +23,12 @@
 
 package jdk.test.lib.jittester.factories;
 
-import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.OperatorKind;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Type;
 import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.UnaryOperator;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.types.TypeBoolean;
 
 class IncDecOperatorFactory extends UnaryOperatorFactory {
     IncDecOperatorFactory(OperatorKind opKind, long complexityLimit, int operatorLimit,
@@ -40,11 +38,11 @@ class IncDecOperatorFactory extends UnaryOperatorFactory {
 
     @Override
     protected boolean isApplicable(Type resultType) {
-        return TypeList.isBuiltInInt(resultType) && !resultType.equals(new TypeBoolean());
+        return TypeList.isBuiltInInt(resultType) && !resultType.equals(TypeList.BOOLEAN);
     }
 
     @Override
-    protected IRNode generateProduction(Type l) throws ProductionFailedException {
+    protected UnaryOperator generateProduction(Type l) throws ProductionFailedException {
         return new UnaryOperator(opKind, new IRNodeBuilder().setComplexityLimit(complexityLimit - 1)
                 .setOperatorLimit(operatorLimit - 1)
                 .setOwnerKlass((TypeKlass) ownerClass)
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/InterfaceFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/InterfaceFactory.java
index db2c53ed8f9..08e4a146c20 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/InterfaceFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/InterfaceFactory.java
@@ -37,7 +37,7 @@ import jdk.test.lib.jittester.functions.FunctionInfo;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class InterfaceFactory extends Factory {
+class InterfaceFactory extends Factory<Interface> {
     private final String name;
     private final int memberFunctionsLimit;
     private final int memberFunctionsArgLimit;
@@ -52,7 +52,7 @@ class InterfaceFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public Interface produce() throws ProductionFailedException {
         TypeKlass thisKlass;
         // Do we want to inherit something?
         if (!ProductionParams.disableInheritance.value()) {
@@ -76,7 +76,7 @@ class InterfaceFactory extends Factory {
             parent.addChild(name);
             for (Symbol symbol : SymbolTable.getAllCombined(parent, FunctionInfo.class)) {
                 FunctionInfo functionInfo = (FunctionInfo) symbol.deepCopy();
-                functionInfo.klass = thisKlass;
+                functionInfo.owner = thisKlass;
                 functionInfo.argTypes.get(0).type = thisKlass;
                 SymbolTable.add(functionInfo);
             }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/KlassFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/KlassFactory.java
index 964fa236bbc..abd3aa283b6 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/KlassFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/KlassFactory.java
@@ -42,9 +42,8 @@ import jdk.test.lib.jittester.functions.FunctionInfo;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class KlassFactory extends Factory {
+class KlassFactory extends Factory<Klass> {
     private final String name;
-    private final String printerName;
     private final long complexityLimit;
     private final int statementsInFunctionLimit;
     private final int operatorLimit;
@@ -55,11 +54,10 @@ class KlassFactory extends Factory {
     private TypeKlass parent;
     private int memberFunctionsLimit;
 
-    KlassFactory(String name, String printerName, long complexityLimit,
+    KlassFactory(String name, long complexityLimit,
             int memberFunctionsLimit, int memberFunctionsArgLimit, int statementsInFunctionLimit,
             int operatorLimit, int level) {
         this.name = name;
-        this.printerName = printerName;
         this.complexityLimit = complexityLimit;
         this.memberFunctionsLimit = memberFunctionsLimit;
         this.memberFunctionsArgLimit = memberFunctionsArgLimit;
@@ -70,7 +68,7 @@ class KlassFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public Klass produce() throws ProductionFailedException {
         HashSet<Symbol> abstractSet = new HashSet<>();
         HashSet<Symbol> overrideSet = new HashSet<>();
         thisKlass = new TypeKlass(name);
@@ -135,15 +133,11 @@ class KlassFactory extends Factory {
                 SymbolTable.remove(symbol);
             }
         } else {
-            parent = (TypeKlass) TypeList.find("java.lang.Object");
+            parent = TypeList.OBJECT;
             thisKlass.addParent(parent.getName());
             thisKlass.setParent(parent);
             parent.addChild(name);
         }
-        // Just don't print it. It's assumed that we at least are inherited from Object.
-        if (parent.getName().equals("java.lang.Object")) {
-            parent = null;
-        }
         SymbolTable.add(new VariableInfo("this", thisKlass, thisKlass,
                 VariableInfo.FINAL | VariableInfo.LOCAL | VariableInfo.INITIALIZED));
         IRNode variableDeclarations = null;
@@ -152,8 +146,7 @@ class KlassFactory extends Factory {
         IRNode functionDeclarations = null;
         IRNode abstractFunctionsRedefinitions = null;
         IRNode overridenFunctionsRedefinitions = null;
-        IRNodeBuilder builder = new IRNodeBuilder().setPrinterName(printerName)
-                .setOwnerKlass(thisKlass)
+        IRNodeBuilder builder = new IRNodeBuilder().setOwnerKlass(thisKlass)
                 .setExceptionSafe(true);
         try {
             builder.setLevel(level + 1)
@@ -227,7 +220,7 @@ class KlassFactory extends Factory {
             }
         }
         if (probableParents.isEmpty()) {
-            parent = (TypeKlass) TypeList.find("java.lang.Object");
+            parent = TypeList.OBJECT;
         } else {
             parent = (TypeKlass) PseudoRandom.randomElement(probableParents);
         }
@@ -246,7 +239,7 @@ class KlassFactory extends Factory {
                         functionInfo.argTypes.get(0).type = thisKlass;
                     }
                 }
-                symbolCopy.klass = thisKlass;
+                symbolCopy.owner = thisKlass;
                 SymbolTable.add(symbolCopy);
             }
         }
@@ -276,10 +269,9 @@ class KlassFactory extends Factory {
             interfaces.add(iface);
             iface.addChild(name);
             thisKlass.addParent(iface.getName());
-            thisKlass.setParent(iface);
             for (Symbol symbol : SymbolTable.getAllCombined(iface, FunctionInfo.class)) {
                 FunctionInfo functionInfo = (FunctionInfo) symbol.deepCopy();
-                functionInfo.klass = thisKlass;
+                functionInfo.owner = thisKlass;
                 functionInfo.argTypes.get(0).type = thisKlass;
                 SymbolTable.add(functionInfo);
             }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LiteralFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LiteralFactory.java
index 6fb8fc91714..8bdd2c4e38a 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LiteralFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LiteralFactory.java
@@ -23,23 +23,16 @@
 
 package jdk.test.lib.jittester.factories;
 
-import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.Literal;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.ProductionParams;
 import jdk.test.lib.jittester.Type;
 import jdk.test.lib.jittester.TypeList;
-import jdk.test.lib.jittester.types.TypeBoolean;
-import jdk.test.lib.jittester.types.TypeByte;
-import jdk.test.lib.jittester.types.TypeChar;
-import jdk.test.lib.jittester.types.TypeDouble;
-import jdk.test.lib.jittester.types.TypeFloat;
-import jdk.test.lib.jittester.types.TypeInt;
-import jdk.test.lib.jittester.types.TypeLong;
-import jdk.test.lib.jittester.types.TypeShort;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class LiteralFactory extends Factory {
+import java.util.Locale;
+
+class LiteralFactory extends Factory<Literal> {
     protected final Type resultType;
 
     LiteralFactory(Type resultType) {
@@ -47,31 +40,39 @@ class LiteralFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public Literal produce() throws ProductionFailedException {
         Literal literal;
-        if (resultType.equals(new TypeBoolean())) {
-            literal = new Literal(PseudoRandom.randomBoolean(), new TypeBoolean());
-        } else if (resultType.equals(new TypeChar())) {
-            literal = new Literal((char) ((char) (PseudoRandom.random() * ('z' - 'A')) + 'A'), new TypeChar());
-        } else if (resultType.equals(new TypeInt())) {
-            literal = new Literal((int) (PseudoRandom.random() * Integer.MAX_VALUE), new TypeInt());
-        } else if (resultType.equals(new TypeLong())) {
-            literal = new Literal((long) (PseudoRandom.random() * Long.MAX_VALUE), new TypeLong());
-        } else if (resultType.equals(new TypeFloat())) {
-            literal = new Literal((float) (PseudoRandom.random() * Float.MAX_VALUE), new TypeFloat());
-        } else if (resultType.equals(new TypeDouble())) {
-            literal = new Literal(PseudoRandom.random() * Double.MAX_VALUE, new TypeDouble());
-        } else if (resultType.equals(new TypeByte())) {
-            literal = new Literal((byte)(PseudoRandom.random() * Byte.MAX_VALUE),new TypeByte());
-        } else if (resultType.equals(new TypeShort())) {
-            literal = new Literal((short)(PseudoRandom.random() * Short.MAX_VALUE), new TypeShort());
-        } else if (resultType.equals(TypeList.find("java.lang.String"))) {
+        if (resultType.equals(TypeList.BOOLEAN)) {
+            literal = new Literal(PseudoRandom.randomBoolean(), TypeList.BOOLEAN);
+        } else if (resultType.equals(TypeList.CHAR)) {
+            literal = new Literal((char) ((char) (PseudoRandom.random() * ('z' - 'A')) + 'A'), TypeList.CHAR);
+        } else if (resultType.equals(TypeList.INT)) {
+            literal = new Literal((int) (PseudoRandom.random() * Integer.MAX_VALUE), TypeList.INT);
+        } else if (resultType.equals(TypeList.LONG)) {
+            literal = new Literal((long) (PseudoRandom.random() * Long.MAX_VALUE), TypeList.LONG);
+        } else if (resultType.equals(TypeList.FLOAT)) {
+            literal = new Literal(new Float(String.format(
+                    (Locale) null,
+                    "%." + ProductionParams.floatingPointPrecision.value() + "EF",
+                    (float) PseudoRandom.random() * Float.MAX_VALUE)),
+                    TypeList.FLOAT);
+        } else if (resultType.equals(TypeList.DOUBLE)) {
+            literal = new Literal(new Double(String.format(
+                    (Locale) null,
+                    "%." + 2 * ProductionParams.floatingPointPrecision.value() + "E",
+                    PseudoRandom.random() * Double.MAX_VALUE)),
+                    TypeList.DOUBLE);
+        } else if (resultType.equals(TypeList.BYTE)) {
+            literal = new Literal((byte)(PseudoRandom.random() * Byte.MAX_VALUE), TypeList.BYTE);
+        } else if (resultType.equals(TypeList.SHORT)) {
+            literal = new Literal((short)(PseudoRandom.random() * Short.MAX_VALUE), TypeList.SHORT);
+        } else if (resultType.equals(TypeList.STRING)) {
             int size = (int) (PseudoRandom.random() * ProductionParams.stringLiteralSizeLimit.value());
             byte[] str = new byte[size];
             for (int i = 0; i < size; i++) {
                 str[i] = (byte) ((int) (('z' - 'a') * PseudoRandom.random()) + 'a');
             }
-            literal = new Literal("\"" + new String(str) + "\"", TypeList.find("java.lang.String"));
+            literal = new Literal(new String(str), TypeList.STRING);
         } else {
             throw new ProductionFailedException();
         }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LocalVariableFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LocalVariableFactory.java
index ea99b180257..f924bd251eb 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LocalVariableFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LocalVariableFactory.java
@@ -24,7 +24,7 @@
 package jdk.test.lib.jittester.factories;
 
 import java.util.ArrayList;
-import jdk.test.lib.jittester.IRNode;
+
 import jdk.test.lib.jittester.LocalVariable;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Symbol;
@@ -33,7 +33,7 @@ import jdk.test.lib.jittester.Type;
 import jdk.test.lib.jittester.VariableInfo;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class LocalVariableFactory extends Factory {
+class LocalVariableFactory extends Factory<LocalVariable> {
     private final Type type;
     private final int flags;
 
@@ -43,7 +43,7 @@ class LocalVariableFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public LocalVariable produce() throws ProductionFailedException {
         // Get the variables of the requested type from SymbolTable
         ArrayList<Symbol> allVariables = new ArrayList<>(SymbolTable.get(type, VariableInfo.class));
         if (!allVariables.isEmpty()) {
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LogicOperatorFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LogicOperatorFactory.java
index 180ad34f43d..d9a582f42e0 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LogicOperatorFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LogicOperatorFactory.java
@@ -23,15 +23,15 @@
 
 package jdk.test.lib.jittester.factories;
 
-import jdk.test.lib.jittester.IRNode;
+import jdk.test.lib.jittester.Operator;
 import jdk.test.lib.jittester.OperatorKind;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Rule;
 import jdk.test.lib.jittester.Type;
 import jdk.test.lib.jittester.types.TypeKlass;
 
-class LogicOperatorFactory extends Factory {
-    private final Rule rule;
+class LogicOperatorFactory extends Factory<Operator> {
+    private final Rule<Operator> rule;
 
     LogicOperatorFactory(long complexityLimit, int operatorLimit, TypeKlass ownerClass, Type resultType,
             boolean exceptionSafe, boolean noconsts) throws ProductionFailedException {
@@ -42,7 +42,7 @@ class LogicOperatorFactory extends Factory {
                 .setResultType(resultType)
                 .setExceptionSafe(exceptionSafe)
                 .setNoConsts(noconsts);
-        rule = new Rule("arithmetic");
+        rule = new Rule<>("arithmetic");
         rule.add("land", builder.setOperatorKind(OperatorKind.AND).getBinaryOperatorFactory());
         rule.add("lor", builder.setOperatorKind(OperatorKind.OR).getBinaryOperatorFactory());
         rule.add("greater", builder.setOperatorKind(OperatorKind.GT).getBinaryOperatorFactory());
@@ -55,7 +55,7 @@ class LogicOperatorFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public Operator produce() throws ProductionFailedException {
         return rule.produce();
     }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LogicalInversionOperatorFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LogicalInversionOperatorFactory.java
index 567a0aa73b3..05a1f95071b 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LogicalInversionOperatorFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LogicalInversionOperatorFactory.java
@@ -23,12 +23,11 @@
 
 package jdk.test.lib.jittester.factories;
 
-import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.OperatorKind;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Type;
+import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.UnaryOperator;
-import jdk.test.lib.jittester.types.TypeBoolean;
 import jdk.test.lib.jittester.types.TypeKlass;
 
 class LogicalInversionOperatorFactory extends UnaryOperatorFactory {
@@ -39,11 +38,11 @@ class LogicalInversionOperatorFactory extends UnaryOperatorFactory {
 
     @Override
     protected boolean isApplicable(Type resultType) {
-        return resultType.equals(new TypeBoolean());
+        return resultType.equals(TypeList.BOOLEAN);
     }
 
     @Override
-    protected IRNode generateProduction(Type resultType) throws ProductionFailedException {
+    protected UnaryOperator generateProduction(Type resultType) throws ProductionFailedException {
         return new UnaryOperator(opKind, new ExpressionFactory(complexityLimit - 1,
                 operatorLimit - 1, (TypeKlass) ownerClass, resultType, exceptionSafe, noconsts).produce());
     }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LoopingConditionFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LoopingConditionFactory.java
index b9e3ac7969b..83c89754349 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LoopingConditionFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/LoopingConditionFactory.java
@@ -29,12 +29,12 @@ import jdk.test.lib.jittester.Literal;
 import jdk.test.lib.jittester.LocalVariable;
 import jdk.test.lib.jittester.OperatorKind;
 import jdk.test.lib.jittester.ProductionFailedException;
+import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.loops.LoopingCondition;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.types.TypeBoolean;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class LoopingConditionFactory extends Factory {
+class LoopingConditionFactory extends Factory<LoopingCondition> {
     private final LocalVariable counter;
     private final Literal limiter;
     private final int operatorLimit;
@@ -51,11 +51,11 @@ class LoopingConditionFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public LoopingCondition produce() throws ProductionFailedException {
         IRNode leftExpression = null;
         IRNode rightExpression = null;
-        LimitedExpressionFactory exprFactory = new IRNodeBuilder()
-                .setResultType(new TypeBoolean())
+        Factory<IRNode> exprFactory = new IRNodeBuilder()
+                .setResultType(TypeList.BOOLEAN)
                 .setComplexityLimit((complexityLimit - 1) / 2)
                 .setOperatorLimit((operatorLimit - 1) / 2)
                 .setOwnerKlass(ownerClass)
@@ -75,10 +75,10 @@ class LoopingConditionFactory extends Factory {
         // Just as a temporary solution we'll assume that the counter is monotonically increasing.
         // And use counter < n condition to limit the loop.
         // In future we may introduce other equivalent relations as well.
-        IRNode condition = new BinaryOperator(OperatorKind.LT, counter, limiter);
-        condition = (rightExpression != null) ? new BinaryOperator(OperatorKind.AND, condition,
+        BinaryOperator condition = new BinaryOperator(OperatorKind.LT, TypeList.BOOLEAN, counter, limiter);
+        condition = (rightExpression != null) ? new BinaryOperator(OperatorKind.AND, TypeList.BOOLEAN, condition,
                 rightExpression) : condition;
-        condition = (leftExpression != null) ? new BinaryOperator(OperatorKind.AND, leftExpression,
+        condition = (leftExpression != null) ? new BinaryOperator(OperatorKind.AND, TypeList.BOOLEAN, leftExpression,
                 condition) : condition;
         return new LoopingCondition(condition);
     }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/MainKlassFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/MainKlassFactory.java
index 1deee728177..81a19675ca9 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/MainKlassFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/MainKlassFactory.java
@@ -38,10 +38,9 @@ import jdk.test.lib.jittester.VariableInfo;
 import jdk.test.lib.jittester.classes.MainKlass;
 import jdk.test.lib.jittester.functions.FunctionInfo;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.types.TypeVoid;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class MainKlassFactory extends Factory {
+class MainKlassFactory extends Factory<MainKlass> {
     private final String name;
     private final long complexityLimit;
     private final int statementsInTestFunctionLimit;
@@ -64,8 +63,8 @@ class MainKlassFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
-        TypeKlass parent = (TypeKlass) TypeList.find("java.lang.Object");
+    public MainKlass produce() throws ProductionFailedException {
+        TypeKlass parent = TypeList.OBJECT;
         thisKlass = new TypeKlass(name);
         thisKlass.addParent(parent.getName());
         thisKlass.setParent(parent);
@@ -80,8 +79,7 @@ class MainKlassFactory extends Factory {
                 .setMemberFunctionsArgLimit(memberFunctionsArgLimit)
                 .setStatementLimit(statementsInFunctionLimit)
                 .setLevel(1)
-                .setExceptionSafe(true)
-                .setPrinterName("Printer");
+                .setExceptionSafe(true);
         IRNode variableDeclarations = builder
                 .setComplexityLimit((long) (complexityLimit * 0.05))
                 .getVariableDeclarationBlockFactory().produce();
@@ -93,7 +91,7 @@ class MainKlassFactory extends Factory {
                     .getFunctionDefinitionBlockFactory()
                     .produce();
         }
-        IRNode testFunction = builder.setResultType(new TypeVoid())
+        IRNode testFunction = builder.setResultType(TypeList.VOID)
                 .setComplexityLimit(complexityLimit)
                 .setStatementLimit(statementsInTestFunctionLimit)
                 .getBlockFactory()
@@ -109,6 +107,7 @@ class MainKlassFactory extends Factory {
         childs.add(printVariables);
         ensureMinDepth(childs, builder);
         ensureMaxDepth(childs);
+        TypeList.add(thisKlass);
         return new MainKlass(name, thisKlass, variableDeclarations,
                 functionDefinitions, testFunction, printVariables);
     }
@@ -119,7 +118,7 @@ class MainKlassFactory extends Factory {
             .filter(c -> c.isCFDeviation() && c.countDepth() > maxDepth)
             .collect(Collectors.toList());
         for (IRNode child : filtered) {
-            List<IRNode> leaves = null;
+            List<IRNode> leaves;
             do {
                 long depth = Math.max(child.countDepth(), maxDepth + 1);
                 leaves = child.getDeviantBlocks(depth);
@@ -138,16 +137,14 @@ class MainKlassFactory extends Factory {
     private void addMoreChildren(List<IRNode> childs, int minDepth, IRNodeBuilder builder)
             throws ProductionFailedException {
         while (!childs.isEmpty() && IRNode.countDepth(childs) < minDepth) {
-            PseudoRandom.shuffle(childs);
-            IRNode randomChild = childs.get(0);
+            IRNode randomChild = childs.get(PseudoRandom.randomNotNegative(childs.size()));
             List<IRNode> leaves = randomChild.getStackableLeaves();
             if (!leaves.isEmpty()) {
-                PseudoRandom.shuffle(leaves);
-                Block randomLeaf = (Block) leaves.get(0);
-                TypeKlass klass = (TypeKlass) randomChild.getKlass();
+                Block randomLeaf = (Block) leaves.get(PseudoRandom.randomNotNegative(leaves.size()));
+                TypeKlass owner = randomChild.getOwner();
                 int newLevel = randomLeaf.getLevel() + 1;
-                Type retType = randomLeaf.getReturnType();
-                IRNode newBlock = builder.setOwnerKlass(klass)
+                Type retType = randomLeaf.getResultType();
+                IRNode newBlock = builder.setOwnerKlass(owner)
                         .setResultType(retType)
                         .setComplexityLimit(complexityLimit)
                         .setStatementLimit(statementsInFunctionLimit)
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/NonStaticMemberVariableFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/NonStaticMemberVariableFactory.java
index 102c3c77ac4..9910bace030 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/NonStaticMemberVariableFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/NonStaticMemberVariableFactory.java
@@ -34,7 +34,7 @@ import jdk.test.lib.jittester.VariableInfo;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class NonStaticMemberVariableFactory extends Factory {
+class NonStaticMemberVariableFactory extends Factory<NonStaticMemberVariable> {
     private final Type type;
     private final int flags;
     private final long complexityLimit;
@@ -53,7 +53,7 @@ class NonStaticMemberVariableFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public NonStaticMemberVariable produce() throws ProductionFailedException {
         // Get the variables of the requested type from SymbolTable
         ArrayList<Symbol> variables = new ArrayList<>(SymbolTable.get(type, VariableInfo.class));
         if (!variables.isEmpty()) {
@@ -70,7 +70,7 @@ class NonStaticMemberVariableFactory extends Factory {
                         && (varInfo.flags & VariableInfo.STATIC) == 0
                         && (varInfo.flags & VariableInfo.LOCAL) == 0) {
                     try {
-                        IRNode object = builder.setResultType(varInfo.klass)
+                        IRNode object = builder.setResultType(varInfo.owner)
                                 .getExpressionFactory().produce();
                         return new NonStaticMemberVariable(object, varInfo);
                     } catch (ProductionFailedException e) {
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/NothingFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/NothingFactory.java
index a05d21700f2..1510bbd6dfc 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/NothingFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/NothingFactory.java
@@ -26,7 +26,7 @@ package jdk.test.lib.jittester.factories;
 import jdk.test.lib.jittester.Nothing;
 import jdk.test.lib.jittester.ProductionFailedException;
 
-public class NothingFactory extends Factory {
+public class NothingFactory extends Factory<Nothing> {
     @Override
     public Nothing produce() throws ProductionFailedException {
         return new Nothing();
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/OperatorFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/OperatorFactory.java
index 2c2eecf4054..ef808c4dccd 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/OperatorFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/OperatorFactory.java
@@ -23,12 +23,14 @@
 
 package jdk.test.lib.jittester.factories;
 
-public abstract class OperatorFactory extends Factory {
-    protected long complexityLimit;
-    protected boolean exceptionSafe;
-    protected boolean noconsts;
+import jdk.test.lib.jittester.Operator;
+
+public abstract class OperatorFactory<T extends Operator> extends Factory<T> {
+    protected final long complexityLimit;
+    protected final boolean exceptionSafe;
+    protected final boolean noconsts;
+    protected final int operatorPriority;
     protected int operatorLimit;
-    protected int operatorPriority;
 
     protected OperatorFactory(int operatorPriority, long complexityLimit, int operatorLimit,
             boolean exceptionSafe, boolean noconsts) {
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/PrintVariablesFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/PrintVariablesFactory.java
index 481e088d5f3..8fab69d96d5 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/PrintVariablesFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/PrintVariablesFactory.java
@@ -23,27 +23,21 @@
 
 package jdk.test.lib.jittester.factories;
 
-import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.PrintVariables;
 import jdk.test.lib.jittester.ProductionFailedException;
-import jdk.test.lib.jittester.SymbolTable;
-import jdk.test.lib.jittester.VariableInfo;
 import jdk.test.lib.jittester.types.TypeKlass;
 
-class PrintVariablesFactory extends Factory {
-    private final String printerName;
+class PrintVariablesFactory extends Factory<PrintVariables> {
     private final TypeKlass ownerClass;
     private final int level;
 
-    PrintVariablesFactory(String printerName, TypeKlass ownerClass, int level) {
-        this.printerName = printerName;
+    PrintVariablesFactory(TypeKlass ownerClass, int level) {
         this.ownerClass = ownerClass;
         this.level = level;
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
-        return new PrintVariables(printerName, SymbolTable.getAllCombined(ownerClass,
-                VariableInfo.class), level);
+    public PrintVariables produce() throws ProductionFailedException {
+        return new PrintVariables(ownerClass, level);
     }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ReturnFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ReturnFactory.java
index 9a86a339f42..7353135749b 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ReturnFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ReturnFactory.java
@@ -23,13 +23,12 @@
 
 package jdk.test.lib.jittester.factories;
 
-import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Type;
 import jdk.test.lib.jittester.functions.Return;
 import jdk.test.lib.jittester.types.TypeKlass;
 
-class ReturnFactory extends SafeFactory {
+class ReturnFactory extends SafeFactory<Return> {
     private final long complexityLimit;
     private final int operatorLimit;
     private final Type resultType;
@@ -46,7 +45,7 @@ class ReturnFactory extends SafeFactory {
     }
 
     @Override
-    protected IRNode sproduce() throws ProductionFailedException {
+    protected Return sproduce() throws ProductionFailedException {
         return new Return(new IRNodeBuilder().setComplexityLimit(complexityLimit - 1)
                 .setOperatorLimit(operatorLimit - 1)
                 .setOwnerKlass(ownerClass)
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/SafeFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/SafeFactory.java
index 4cada2a906f..074cacdddd2 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/SafeFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/SafeFactory.java
@@ -27,14 +27,14 @@ import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.SymbolTable;
 
-public abstract class SafeFactory extends Factory {
-    protected abstract IRNode sproduce() throws ProductionFailedException;
+public abstract class SafeFactory<T extends IRNode> extends Factory<T> {
+    protected abstract T sproduce() throws ProductionFailedException;
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public T produce() throws ProductionFailedException {
         try {
             SymbolTable.push();
-            IRNode p = sproduce();
+            T p = sproduce();
             SymbolTable.merge();
             return p;
         } catch (ProductionFailedException e) {
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/StatementFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/StatementFactory.java
index d3f45f74546..661954f142d 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/StatementFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/StatementFactory.java
@@ -32,15 +32,15 @@ import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class StatementFactory extends Factory {
-    private final Rule rule;
+class StatementFactory extends Factory<Statement> {
+    private final Rule<IRNode> rule;
     private final boolean needSemicolon;
 
     StatementFactory(long complexityLimit, int operatorLimit,
             TypeKlass ownerClass, boolean exceptionSafe,
             boolean noconsts, boolean needSemicolon ){
         this.needSemicolon = needSemicolon;
-        rule = new Rule("statement");
+        rule = new Rule<>("statement");
         IRNodeBuilder builder = new IRNodeBuilder()
                 .setComplexityLimit(complexityLimit)
                 .setOperatorLimit(operatorLimit)
@@ -54,7 +54,7 @@ class StatementFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public Statement produce() throws ProductionFailedException {
         ProductionLimiter.setLimit();
         try {
             return new Statement(rule.produce(), needSemicolon);
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/StaticConstructorDefinitionFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/StaticConstructorDefinitionFactory.java
index b0eccda93ea..0a77fbb7d2c 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/StaticConstructorDefinitionFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/StaticConstructorDefinitionFactory.java
@@ -26,13 +26,13 @@ package jdk.test.lib.jittester.factories;
 import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.SymbolTable;
+import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.VariableInfo;
 import jdk.test.lib.jittester.functions.StaticConstructorDefinition;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.types.TypeVoid;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class StaticConstructorDefinitionFactory extends Factory {
+class StaticConstructorDefinitionFactory extends Factory<StaticConstructorDefinition> {
     private final long complexityLimit;
     private final int statementLimit;
     private final int operatorLimit;
@@ -49,7 +49,7 @@ class StaticConstructorDefinitionFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public StaticConstructorDefinition produce() throws ProductionFailedException {
         SymbolTable.push();
         IRNode body;
         try {
@@ -57,7 +57,7 @@ class StaticConstructorDefinitionFactory extends Factory {
             long complLimit = (long) (PseudoRandom.random() * complexityLimit);
             body = new IRNodeBuilder()
                     .setOwnerKlass(ownerClass)
-                    .setResultType(new TypeVoid())
+                    .setResultType(TypeList.VOID)
                     .setComplexityLimit(complLimit)
                     .setStatementLimit(statementLimit)
                     .setOperatorLimit(operatorLimit)
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/StaticMemberVariableFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/StaticMemberVariableFactory.java
index 83e1a3b29d9..87746333d41 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/StaticMemberVariableFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/StaticMemberVariableFactory.java
@@ -24,7 +24,7 @@
 package jdk.test.lib.jittester.factories;
 
 import java.util.ArrayList;
-import jdk.test.lib.jittester.IRNode;
+
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.StaticMemberVariable;
 import jdk.test.lib.jittester.Symbol;
@@ -34,7 +34,7 @@ import jdk.test.lib.jittester.VariableInfo;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class StaticMemberVariableFactory extends Factory {
+class StaticMemberVariableFactory extends Factory<StaticMemberVariable> {
     private final Type type;
     private final int flags;
     private final Type ownerClass;
@@ -46,7 +46,7 @@ class StaticMemberVariableFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public StaticMemberVariable produce() throws ProductionFailedException {
         // Get the variables of the requested type from SymbolTable
         ArrayList<Symbol> variables = new ArrayList<>(SymbolTable.get(type, VariableInfo.class));
         if (!variables.isEmpty()) {
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/SwitchFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/SwitchFactory.java
index a1052ced09c..c2795cdfd7d 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/SwitchFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/SwitchFactory.java
@@ -26,6 +26,7 @@ package jdk.test.lib.jittester.factories;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+
 import jdk.test.lib.jittester.BuiltInType;
 import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.Literal;
@@ -34,21 +35,18 @@ import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Rule;
 import jdk.test.lib.jittester.Switch;
 import jdk.test.lib.jittester.Type;
+import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.utils.TypeUtil;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.types.TypeByte;
-import jdk.test.lib.jittester.types.TypeChar;
-import jdk.test.lib.jittester.types.TypeInt;
-import jdk.test.lib.jittester.types.TypeShort;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class SwitchFactory extends SafeFactory {
-    private int caseBlockIdx;
-    protected long complexityLimit;
-    protected int statementLimit, operatorLimit;
-    private boolean canHaveReturn = false;
+class SwitchFactory extends SafeFactory<Switch> {
+    private final int statementLimit;
+    private final int operatorLimit;
+    private final boolean canHaveReturn;
     private final TypeKlass ownerClass;
     private final int level;
+    private final long complexityLimit;
 
     SwitchFactory(TypeKlass ownerClass, long complexityLimit, int statementLimit,
             int operatorLimit, int level, boolean canHaveReturn) {
@@ -61,13 +59,13 @@ class SwitchFactory extends SafeFactory {
     }
 
     @Override
-    protected IRNode sproduce() throws ProductionFailedException {
+    protected Switch sproduce() throws ProductionFailedException {
         if (statementLimit > 0 && complexityLimit > 0) {
             List<Type> switchTypes = new ArrayList<>();
-            switchTypes.add(new TypeChar());
-            switchTypes.add(new TypeByte());
-            switchTypes.add(new TypeShort());
-            switchTypes.add(new TypeInt());
+            switchTypes.add(TypeList.CHAR);
+            switchTypes.add(TypeList.BYTE);
+            switchTypes.add(TypeList.SHORT);
+            switchTypes.add(TypeList.INT);
             PseudoRandom.shuffle(switchTypes);
             IRNodeBuilder builder = new IRNodeBuilder()
                     .setOwnerKlass(ownerClass)
@@ -95,8 +93,8 @@ class SwitchFactory extends SafeFactory {
                             .produce();
                     accumulatedComplexity += currentComplexityLimit;
                     List<Type> caseTypes = new ArrayList<>();
-                    caseTypes.add(new TypeByte());
-                    caseTypes.add(new TypeChar());
+                    caseTypes.add(TypeList.BYTE);
+                    caseTypes.add(TypeList.CHAR);
                     caseTypes = new ArrayList<>(TypeUtil.getLessCapaciousOrEqualThan(caseTypes,
                             (BuiltInType) type));
                     if (PseudoRandom.randomBoolean()) { // "default"
@@ -104,7 +102,7 @@ class SwitchFactory extends SafeFactory {
                                 * (statementLimit - accumulatedStatements));
                         currentComplexityLimit = (long) (PseudoRandom.random()
                                 * (complexityLimit - accumulatedComplexity));
-                        caseConsts.add(null);
+                        caseConsts.add(new Nothing());
                         caseBlocks.add(builder.setComplexityLimit(currentComplexityLimit)
                                 .setStatementLimit(currentStatementsLimit)
                                 .setLevel(level + 1)
@@ -128,7 +126,7 @@ class SwitchFactory extends SafeFactory {
                             if (tryCount >= 10) {
                                 continue MAIN_LOOP;
                             }
-                            Literal literal = (Literal) builder.setResultType(caseTypes.get(0))
+                            Literal literal = builder.setResultType(caseTypes.get(0))
                                     .getLiteralFactory().produce();
                             int value = 0;
                             if (literal.value instanceof Integer) {
@@ -149,7 +147,7 @@ class SwitchFactory extends SafeFactory {
                                 break;
                             }
                         }
-                        Rule rule = new Rule("case_block");
+                        Rule<IRNode> rule = new Rule<>("case_block");
                         rule.add("block", builder.setComplexityLimit(currentComplexityLimit)
                                 .setStatementLimit(currentStatementsLimit)
                                 .setLevel(level)
@@ -170,7 +168,7 @@ class SwitchFactory extends SafeFactory {
                     }
                     PseudoRandom.shuffle(caseConsts);
                     List<IRNode> accum = new ArrayList<>();
-                    caseBlockIdx = 1 + caseConsts.size();
+                    int caseBlockIdx = 1 + caseConsts.size();
                     accum.add(switchExp);
                     for (int i = 1; i < caseBlockIdx; ++i) {
                         accum.add(caseConsts.get(i - 1));
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/TernaryOperatorFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/TernaryOperatorFactory.java
index 24e05e40d2e..733503a8235 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/TernaryOperatorFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/TernaryOperatorFactory.java
@@ -23,21 +23,18 @@
 
 package jdk.test.lib.jittester.factories;
 
-import jdk.test.lib.Pair;
 import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.SymbolTable;
 import jdk.test.lib.jittester.TernaryOperator;
 import jdk.test.lib.jittester.Type;
 import jdk.test.lib.jittester.TypeList;
-import jdk.test.lib.jittester.utils.TypeUtil;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.types.TypeBoolean;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class TernaryOperatorFactory extends OperatorFactory {
-    protected final Type resultType;
-    protected final TypeKlass ownerClass;
+class TernaryOperatorFactory extends OperatorFactory<TernaryOperator> {
+    private final Type resultType;
+    private final TypeKlass ownerClass;
 
     TernaryOperatorFactory(long complexityLimit, int operatorLimit, TypeKlass ownerClass,
             Type resultType, boolean exceptionSafe, boolean noconsts) {
@@ -46,15 +43,7 @@ class TernaryOperatorFactory extends OperatorFactory {
         this.ownerClass = ownerClass;
     }
 
-    private Pair<Type, Type> generateTypes() {
-        Pair<Type, Type> types = new Pair<>(resultType, PseudoRandom.randomElement(
-                TypeUtil.getImplicitlyCastable(TypeList.getAll(), resultType)));
-        if (PseudoRandom.randomBoolean())
-            types = new Pair<>(types.second, types.first);
-        return types;
-    }
-
-    private IRNode generateProduction(Type conditionType, Type leftType, Type rightType) throws ProductionFailedException {
+    private TernaryOperator generateProduction() throws ProductionFailedException {
         int leftOpLimit = (int) (PseudoRandom.random() * 0.3 * (operatorLimit - 1));
         int rightOpLimit = (int) (PseudoRandom.random() * 0.3 * (operatorLimit - 1));
         int condOpLimit = operatorLimit - 1 - leftOpLimit - rightOpLimit;
@@ -69,7 +58,7 @@ class TernaryOperatorFactory extends OperatorFactory {
                 .setExceptionSafe(exceptionSafe);
         IRNode conditionalExp = builder.setComplexityLimit(condComplLimit)
                 .setOperatorLimit(condOpLimit)
-                .setResultType(conditionType)
+                .setResultType(TypeList.BOOLEAN)
                 .setNoConsts(noconsts)
                 .getExpressionFactory()
                 .produce();
@@ -79,7 +68,7 @@ class TernaryOperatorFactory extends OperatorFactory {
         try {
             leftExp = builder.setComplexityLimit(leftComplLimit)
                     .setOperatorLimit(leftOpLimit)
-                    .setResultType(leftType)
+                    .setResultType(resultType)
                     .setNoConsts(false)
                     .getExpressionFactory()
                     .produce();
@@ -91,7 +80,7 @@ class TernaryOperatorFactory extends OperatorFactory {
         try {
             rightExp = builder.setComplexityLimit(rightComplLimit)
                     .setOperatorLimit(rightOpLimit)
-                    .setResultType(rightType)
+                    .setResultType(resultType)
                     .setNoConsts(false)
                     .getExpressionFactory()
                     .produce();
@@ -102,16 +91,10 @@ class TernaryOperatorFactory extends OperatorFactory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
-        Pair<Type, Type> types;
-        try {
-            types = generateTypes();
-        } catch (RuntimeException ex) {
-            throw new ProductionFailedException(ex.getMessage());
-        }
+    public TernaryOperator produce() throws ProductionFailedException {
         try {
             SymbolTable.push();
-            IRNode result = generateProduction(new TypeBoolean(), types.first, types.second);
+            TernaryOperator result = generateProduction();
             SymbolTable.merge();
             return result;
         } catch (ProductionFailedException e) {
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ThrowFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ThrowFactory.java
index 00e30f06b83..59827bc094b 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ThrowFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ThrowFactory.java
@@ -30,8 +30,8 @@ import jdk.test.lib.jittester.Throw;
 import jdk.test.lib.jittester.Type;
 import jdk.test.lib.jittester.types.TypeKlass;
 
-class ThrowFactory extends SafeFactory {
-    private final Rule rule;
+class ThrowFactory extends SafeFactory<Throw> {
+    private final Rule<IRNode> rule;
 
     ThrowFactory(long complexityLimit, int operatorLimit, TypeKlass ownerClass,
             Type resultType, boolean exceptionSafe) {
@@ -42,7 +42,7 @@ class ThrowFactory extends SafeFactory {
                 .setResultType(resultType)
                 .setExceptionSafe(exceptionSafe)
                 .setNoConsts(false);
-        rule = new Rule("throw");
+        rule = new Rule<>("throw");
         rule.add("constant", b.setIsConstant(true).setIsInitialized(true).getVariableFactory());
         rule.add("variable", b.setIsConstant(false).setIsInitialized(true).getVariableFactory());
 
@@ -51,7 +51,7 @@ class ThrowFactory extends SafeFactory {
     }
 
     @Override
-    protected IRNode sproduce() throws ProductionFailedException {
+    protected Throw sproduce() throws ProductionFailedException {
         return new Throw(rule.produce());
     }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/TryCatchBlockFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/TryCatchBlockFactory.java
index 523bfb5d0c4..cfbec4aabe9 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/TryCatchBlockFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/TryCatchBlockFactory.java
@@ -25,8 +25,9 @@ package jdk.test.lib.jittester.factories;
 
 import java.util.ArrayList;
 import java.util.List;
+
+import jdk.test.lib.jittester.Block;
 import jdk.test.lib.jittester.CatchBlock;
-import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.TryCatchBlock;
 import jdk.test.lib.jittester.Type;
@@ -35,7 +36,7 @@ import jdk.test.lib.jittester.utils.TypeUtil;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class TryCatchBlockFactory extends Factory {
+class TryCatchBlockFactory extends Factory<TryCatchBlock> {
     private final static double CATCH_SELECTION_COEF = 0.1d;
     private final Type returnType;
     private final long complexityLimit;
@@ -64,7 +65,7 @@ class TryCatchBlockFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public TryCatchBlock produce() throws ProductionFailedException {
         if (complexityLimit < 1 || statementLimit < 1) {
             throw new ProductionFailedException();
         }
@@ -77,7 +78,7 @@ class TryCatchBlockFactory extends Factory {
                 .setCanHaveReturn(canHaveReturn)
                 .setCanHaveContinues(canHaveContinues)
                 .setCanHaveBreaks(canHaveBreaks);
-        IRNode body = getBlock(builder, 0.6);
+        Block body = getBlock(builder, 0.6);
         int catchBlocksCount = (int) (CATCH_SELECTION_COEF
                 * PseudoRandom.random() * uncheckedThrowables.size());
         List<CatchBlock> catchBlocks = new ArrayList<>();
@@ -92,7 +93,7 @@ class TryCatchBlockFactory extends Factory {
             catchBlocks.add(new CatchBlock(getBlock(builder, 0.3/catchBlocksCount),
                     whatToCatch, level));
         }
-        IRNode finallyBody = PseudoRandom.randomBoolean() || catchBlocksCount == 0 ? getBlock(builder, 0.1) : null;
+        Block finallyBody = PseudoRandom.randomBoolean() || catchBlocksCount == 0 ? getBlock(builder, 0.1) : null;
         return new TryCatchBlock(body, finallyBody, catchBlocks, level);
     }
 
@@ -106,7 +107,7 @@ class TryCatchBlockFactory extends Factory {
         return selected;
     }
 
-    private IRNode getBlock(IRNodeBuilder builder, double weight)
+    private Block getBlock(IRNodeBuilder builder, double weight)
             throws ProductionFailedException {
         long actualComplexityLim = (long) (weight * PseudoRandom.random()
                 * complexityLimit);
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/UnaryOperatorFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/UnaryOperatorFactory.java
index 7e4149f2f9a..1b2ab66d521 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/UnaryOperatorFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/UnaryOperatorFactory.java
@@ -23,13 +23,13 @@
 
 package jdk.test.lib.jittester.factories;
 
-import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.OperatorKind;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.SymbolTable;
 import jdk.test.lib.jittester.Type;
+import jdk.test.lib.jittester.UnaryOperator;
 
-public abstract class UnaryOperatorFactory extends OperatorFactory {
+public abstract class UnaryOperatorFactory extends OperatorFactory<UnaryOperator> {
     protected final OperatorKind opKind;
     protected final Type resultType;
     protected final Type ownerClass;
@@ -42,16 +42,16 @@ public abstract class UnaryOperatorFactory extends OperatorFactory {
         this.ownerClass = ownerClass;
     }
 
-    protected Type generateType() throws ProductionFailedException {
+    protected Type generateType() {
         return resultType;
     }
 
-    protected abstract IRNode generateProduction(Type type) throws ProductionFailedException;
+    protected abstract UnaryOperator generateProduction(Type type) throws ProductionFailedException;
 
     protected abstract boolean isApplicable(Type resultType);
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public UnaryOperator produce() throws ProductionFailedException {
         if (!isApplicable(resultType)) {
             //avoid implicit use of resultType.toString()
             throw new ProductionFailedException("Type " + resultType.getName()
@@ -65,7 +65,7 @@ public abstract class UnaryOperatorFactory extends OperatorFactory {
         }
         try {
             SymbolTable.push();
-            IRNode result = generateProduction(type);
+            UnaryOperator result = generateProduction(type);
             SymbolTable.merge();
             return result;
         } catch (ProductionFailedException e) {
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/UnaryPlusMinusOperatorFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/UnaryPlusMinusOperatorFactory.java
index 12e5e982b2c..beda351e99f 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/UnaryPlusMinusOperatorFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/UnaryPlusMinusOperatorFactory.java
@@ -24,15 +24,12 @@
 package jdk.test.lib.jittester.factories;
 
 import jdk.test.lib.jittester.BuiltInType;
-import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.OperatorKind;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Type;
 import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.utils.TypeUtil;
 import jdk.test.lib.jittester.UnaryOperator;
-import jdk.test.lib.jittester.types.TypeBoolean;
-import jdk.test.lib.jittester.types.TypeInt;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
@@ -44,16 +41,16 @@ class UnaryPlusMinusOperatorFactory extends UnaryOperatorFactory {
 
     @Override
     protected boolean isApplicable(Type resultType) {
-        if (!TypeList.isBuiltIn(resultType) || resultType.equals(new TypeBoolean())) {
+        if (!TypeList.isBuiltIn(resultType) || resultType.equals(TypeList.BOOLEAN)) {
             return false;
         }
         BuiltInType resType = (BuiltInType) resultType;
-        return resType.equals(new TypeInt()) || resType.isMoreCapaciousThan(new TypeInt());
+        return resType.equals(TypeList.INT) || resType.isMoreCapaciousThan(TypeList.INT);
     }
 
     @Override
-    protected Type generateType() throws ProductionFailedException {
-        if (resultType.equals(new TypeInt())) {
+    protected Type generateType() {
+        if (resultType.equals(TypeList.INT)) {
             return PseudoRandom.randomElement(TypeUtil.getImplicitlyCastable(TypeList.getBuiltIn(), resultType));
         } else {
             return resultType;
@@ -61,7 +58,7 @@ class UnaryPlusMinusOperatorFactory extends UnaryOperatorFactory {
     }
 
     @Override
-    protected IRNode generateProduction(Type type) throws ProductionFailedException {
+    protected UnaryOperator generateProduction(Type type) throws ProductionFailedException {
         return new UnaryOperator(opKind, new IRNodeBuilder()
                 .setComplexityLimit(complexityLimit)
                 .setOperatorLimit(operatorLimit)
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableDeclarationBlockFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableDeclarationBlockFactory.java
index 3fe9d644d96..a92de15b2ba 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableDeclarationBlockFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableDeclarationBlockFactory.java
@@ -24,14 +24,15 @@
 package jdk.test.lib.jittester.factories;
 
 import java.util.ArrayList;
-import jdk.test.lib.jittester.IRNode;
+
+import jdk.test.lib.jittester.Declaration;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.ProductionParams;
 import jdk.test.lib.jittester.VariableDeclarationBlock;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class VariableDeclarationBlockFactory extends Factory {
+class VariableDeclarationBlockFactory extends Factory<VariableDeclarationBlock> {
     private final long complexityLimit;
     private final int operatorLimit;
     private final boolean exceptionSafe;
@@ -48,10 +49,10 @@ class VariableDeclarationBlockFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
-        ArrayList<IRNode> content = new ArrayList<>();
+    public VariableDeclarationBlock produce() throws ProductionFailedException {
+        ArrayList<Declaration> content = new ArrayList<>();
         int limit = (int) Math.ceil(PseudoRandom.random() * ProductionParams.dataMemberLimit.value());
-        DeclarationFactory declFactory = new IRNodeBuilder()
+        Factory<Declaration> declFactory = new IRNodeBuilder()
                 .setOwnerKlass(ownerClass)
                 .setComplexityLimit(complexityLimit)
                 .setOperatorLimit(operatorLimit)
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableDeclarationFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableDeclarationFactory.java
index 284a9afbc89..004dffb060e 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableDeclarationFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableDeclarationFactory.java
@@ -24,7 +24,7 @@
 package jdk.test.lib.jittester.factories;
 
 import java.util.LinkedList;
-import jdk.test.lib.jittester.IRNode;
+
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.SymbolTable;
 import jdk.test.lib.jittester.Type;
@@ -34,10 +34,10 @@ import jdk.test.lib.jittester.VariableInfo;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class VariableDeclarationFactory extends Factory {
-    protected final boolean isStatic;
-    protected final boolean isLocal;
-    protected final TypeKlass ownerClass;
+class VariableDeclarationFactory extends Factory<VariableDeclaration> {
+    private final boolean isStatic;
+    private final boolean isLocal;
+    private final TypeKlass ownerClass;
     private Type resultType;
 
     VariableDeclarationFactory(TypeKlass ownerClass, boolean isStatic, boolean isLocal, Type resultType) {
@@ -48,8 +48,8 @@ class VariableDeclarationFactory extends Factory {
     }
 
     @Override
-    public  IRNode produce() throws ProductionFailedException {
-        if (resultType == TypeList.getVoid()) {
+    public VariableDeclaration produce() throws ProductionFailedException {
+        if (resultType.equals(TypeList.VOID)) {
             LinkedList<Type> types = new LinkedList<>(TypeList.getAll());
             PseudoRandom.shuffle(types);
             if (types.isEmpty()) {
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableFactory.java
index 7868953e9af..495e4a6d93a 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableFactory.java
@@ -23,15 +23,15 @@
 
 package jdk.test.lib.jittester.factories;
 
-import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Rule;
 import jdk.test.lib.jittester.Type;
+import jdk.test.lib.jittester.VariableBase;
 import jdk.test.lib.jittester.VariableInfo;
 import jdk.test.lib.jittester.types.TypeKlass;
 
-class VariableFactory extends Factory {
-    private final Rule rule;
+class VariableFactory extends Factory<VariableBase> {
+    private final Rule<VariableBase> rule;
 
     VariableFactory(long complexityLimit, int operatorLimit, TypeKlass ownerClass, Type resultType,
             boolean constant, boolean initialized, boolean exceptionSafe, boolean noconsts) {
@@ -42,7 +42,7 @@ class VariableFactory extends Factory {
         if (initialized) {
             flags |= VariableInfo.INITIALIZED;
         }
-        rule = new Rule("variable");
+        rule = new Rule<>("variable");
         IRNodeBuilder b = new IRNodeBuilder().setResultType(resultType)
                 .setFlags(flags)
                 .setComplexityLimit(complexityLimit)
@@ -55,7 +55,7 @@ class VariableFactory extends Factory {
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public VariableBase produce() throws ProductionFailedException {
         return rule.produce();
     }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableInitializationFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableInitializationFactory.java
index f2d45d3bc6d..3c737ce9242 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableInitializationFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableInitializationFactory.java
@@ -37,7 +37,7 @@ import jdk.test.lib.jittester.VariableInitialization;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class VariableInitializationFactory extends SafeFactory {
+class VariableInitializationFactory extends SafeFactory<VariableInitialization> {
     private final int operatorLimit;
     private final long complexityLimit;
     private final boolean constant;
@@ -58,7 +58,7 @@ class VariableInitializationFactory extends SafeFactory {
     }
 
     @Override
-    protected IRNode sproduce() throws ProductionFailedException {
+    protected VariableInitialization sproduce() throws ProductionFailedException {
         LinkedList<Type> types = new LinkedList<>(TypeList.getAll());
         PseudoRandom.shuffle(types);
         if (types.isEmpty()) {
@@ -71,7 +71,7 @@ class VariableInitializationFactory extends SafeFactory {
                 .setResultType(resultType)
                 .setExceptionSafe(exceptionSafe)
                 .setNoConsts(false);
-        Rule rule = new Rule("initializer");
+        Rule<IRNode> rule = new Rule<>("initializer");
         rule.add("literal_initializer", b.getLiteralFactory());
         if (!ProductionParams.disableExprInInit.value()) {
             rule.add("expression", b.getLimitedExpressionFactory());
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/WhileFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/WhileFactory.java
index 598a32d801d..b63e8c0e578 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/WhileFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/WhileFactory.java
@@ -23,21 +23,21 @@
 
 package jdk.test.lib.jittester.factories;
 
-import jdk.test.lib.jittester.IRNode;
-import jdk.test.lib.jittester.Initialization;
+import jdk.test.lib.jittester.Block;
 import jdk.test.lib.jittester.Literal;
 import jdk.test.lib.jittester.LocalVariable;
-import jdk.test.lib.jittester.Nothing;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.SymbolTable;
 import jdk.test.lib.jittester.Type;
+import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.loops.Loop;
 import jdk.test.lib.jittester.loops.While;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.types.TypeInt;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class WhileFactory extends SafeFactory {
+import java.util.LinkedList;
+
+class WhileFactory extends SafeFactory<While> {
     private final Loop loop;
     private final long complexityLimit;
     private final int statementLimit;
@@ -61,7 +61,8 @@ class WhileFactory extends SafeFactory {
     }
 
     @Override
-    protected IRNode sproduce() throws ProductionFailedException {
+    protected While sproduce() throws ProductionFailedException {
+        Block emptyBlock = new Block(ownerClass, returnType, new LinkedList<>(), level - 1);
         if (statementLimit <= 0 || complexityLimit <= 0) {
             throw new ProductionFailedException();
         }
@@ -91,7 +92,7 @@ class WhileFactory extends SafeFactory {
                 .setResultType(returnType)
                 .setOperatorLimit(operatorLimit);
         loop.initialization = builder.getCounterInitializerFactory(0).produce();
-        IRNode header;
+        Block header;
         try {
             header = builder.setComplexityLimit(headerComplLimit)
                     .setStatementLimit(headerStatementLimit)
@@ -103,15 +104,15 @@ class WhileFactory extends SafeFactory {
                     .getBlockFactory()
                     .produce();
         } catch (ProductionFailedException e) {
-            header = new Nothing();
+            header = emptyBlock;
         }
-        LocalVariable counter = new LocalVariable(((Initialization) loop.initialization).get());
-        Literal limiter = new Literal(Integer.valueOf((int) thisLoopIterLimit), new TypeInt());
+        LocalVariable counter = new LocalVariable(loop.initialization.getVariableInfo());
+        Literal limiter = new Literal((int) thisLoopIterLimit, TypeList.INT);
         loop.condition = builder.setComplexityLimit(condComplLimit)
                 .setLocalVariable(counter)
                 .getLoopingConditionFactory(limiter)
                 .produce();
-        IRNode body1;
+        Block body1;
         SymbolTable.push();
         try {
             body1 = builder.setComplexityLimit(body1ComplLimit)
@@ -124,10 +125,10 @@ class WhileFactory extends SafeFactory {
                     .getBlockFactory()
                     .produce();
         } catch (ProductionFailedException e) {
-            body1 = new Nothing();
+            body1 = emptyBlock;
         }
         loop.manipulator = builder.setLocalVariable(counter).getCounterManipulatorFactory().produce();
-        IRNode body2;
+        Block body2;
         try {
             body2 = builder.setComplexityLimit(body2ComplLimit)
                     .setStatementLimit(body2StatementLimit)
@@ -139,9 +140,9 @@ class WhileFactory extends SafeFactory {
                     .getBlockFactory()
                     .produce();
         } catch (ProductionFailedException e) {
-            body2 = new Nothing();
+            body2 = emptyBlock;
         }
-        IRNode body3;
+        Block body3;
         try {
             body3 = builder.setComplexityLimit(body3ComplLimit)
                     .setStatementLimit(body3StatementLimit)
@@ -153,7 +154,7 @@ class WhileFactory extends SafeFactory {
                     .getBlockFactory()
                     .produce();
         } catch (ProductionFailedException e) {
-            body3 = new Nothing();
+            body3 = emptyBlock;
         }
         SymbolTable.pop();
         return new While(level, loop, thisLoopIterLimit, header, body1, body2, body3);
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/ArgumentDeclaration.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/ArgumentDeclaration.java
index 8173f14c58f..d1191fc4fe9 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/ArgumentDeclaration.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/ArgumentDeclaration.java
@@ -28,9 +28,10 @@ import jdk.test.lib.jittester.VariableInfo;
 import jdk.test.lib.jittester.visitors.Visitor;
 
 public class ArgumentDeclaration extends IRNode {
-    public VariableInfo variableInfo;
+    public final VariableInfo variableInfo;
 
     public ArgumentDeclaration(VariableInfo variableInfo) {
+        super(variableInfo.type);
         this.variableInfo = variableInfo;
     }
 
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/ConstructorDefinition.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/ConstructorDefinition.java
index f6c2c210f31..fcda2ef0062 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/ConstructorDefinition.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/ConstructorDefinition.java
@@ -32,7 +32,9 @@ public class ConstructorDefinition extends IRNode {
 
     public ConstructorDefinition(FunctionInfo functionInfo,
             ArrayList<ArgumentDeclaration> argumentsDeclaration, IRNode body) {
+        super(functionInfo.type);
         this.functionInfo = functionInfo;
+        this.owner = functionInfo.owner;
         addChild(body);
         addChildren(argumentsDeclaration);
     }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/ConstructorDefinitionBlock.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/ConstructorDefinitionBlock.java
index a30bf7acc72..5d9cf322ccd 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/ConstructorDefinitionBlock.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/ConstructorDefinitionBlock.java
@@ -25,10 +25,12 @@ package jdk.test.lib.jittester.functions;
 
 import java.util.ArrayList;
 import jdk.test.lib.jittester.IRNode;
+import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.visitors.Visitor;
 
 public class ConstructorDefinitionBlock extends IRNode {
     public ConstructorDefinitionBlock(ArrayList<IRNode> content, int level) {
+        super(TypeList.VOID);
         this.level = level;
         addChildren(content);
     }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/Function.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/Function.java
index 0f3872360bf..d3769211584 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/Function.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/Function.java
@@ -36,7 +36,8 @@ public class Function extends IRNode {
     private FunctionInfo functionInfo = new FunctionInfo();
 
     public Function(TypeKlass ownerClass, FunctionInfo functionInfo, List<IRNode> args) {
-        setKlass(ownerClass);
+        super(functionInfo.type);
+        setOwner(ownerClass);
         this.functionInfo = functionInfo;
         addChildren(args);
     }
@@ -48,14 +49,14 @@ public class Function extends IRNode {
             argsComplexity += child.complexity();
         }
         long funcComplexity = functionInfo.complexity;
-        TypeKlass typeKlass = (TypeKlass) this.klass;
+        TypeKlass typeKlass = this.owner;
         if (functionInfo.isConstructor()) {
             // Sum complexities of all default constructors of parent classes
             for (TypeKlass parent : typeKlass.getAllParents()) {
                 Collection<Symbol> parentFuncs = SymbolTable.getAllCombined(parent, FunctionInfo.class);
                 for (Symbol f : parentFuncs) {
                     FunctionInfo c = (FunctionInfo) f;
-                    if (c.name.equals(c.klass.getName()) && c.argTypes.isEmpty()) {
+                    if (c.name.equals(c.owner.getName()) && c.argTypes.isEmpty()) {
                         funcComplexity += c.complexity;
                     }
                 }
@@ -66,7 +67,7 @@ public class Function extends IRNode {
             for (TypeKlass child : typeKlass.getAllChildren()) {
                 Collection<Symbol> childFuncs = SymbolTable.getAllCombined(child, FunctionInfo.class);
                 for (Symbol childFunc : childFuncs) {
-                    if (((FunctionInfo) childFunc).equals(functionInfo)) {
+                    if (childFunc.equals(functionInfo)) {
                         funcComplexity = Math.max(funcComplexity, ((FunctionInfo) childFunc).complexity);
                     }
                 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDeclaration.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDeclaration.java
index 025dc46ec6f..dd18249390b 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDeclaration.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDeclaration.java
@@ -32,7 +32,9 @@ public class FunctionDeclaration extends IRNode {
 
     public FunctionDeclaration(FunctionInfo functionInfo,
             ArrayList<ArgumentDeclaration> argumentsDeclaration) {
+        super(functionInfo.type);
         this.functionInfo = functionInfo;
+        this.owner = functionInfo.owner;
         addChildren(argumentsDeclaration);
     }
 
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDeclarationBlock.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDeclarationBlock.java
index bc7070b7afc..4741dafd250 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDeclarationBlock.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDeclarationBlock.java
@@ -25,12 +25,14 @@ package jdk.test.lib.jittester.functions;
 
 import java.util.ArrayList;
 import jdk.test.lib.jittester.IRNode;
+import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.visitors.Visitor;
 
 public class FunctionDeclarationBlock extends IRNode {
     public FunctionDeclarationBlock(TypeKlass ownerClass, ArrayList<IRNode> content, int level) {
-        setKlass(ownerClass);
+        super(TypeList.VOID);
+        setOwner(ownerClass);
         this.level = level;
         addChildren(content);
     }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDefinition.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDefinition.java
index d68ffde58db..cf6b662012e 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDefinition.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDefinition.java
@@ -23,9 +23,10 @@
 
 package jdk.test.lib.jittester.functions;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedList;
+import java.util.List;
+
 import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.Symbol;
 import jdk.test.lib.jittester.SymbolTable;
@@ -36,8 +37,10 @@ public class FunctionDefinition extends IRNode {
     private final FunctionInfo functionInfo;
 
     public FunctionDefinition(FunctionInfo functionInfo,
-            ArrayList<ArgumentDeclaration> argumentsDeclaration, IRNode body, IRNode ret) {
+                              List<? extends ArgumentDeclaration> argumentsDeclaration, IRNode body, Return ret) {
+        super(functionInfo.type);
         this.functionInfo = functionInfo;
+        this.owner = functionInfo.owner;
         addChild(body);
         addChild(ret);
         addChildren(argumentsDeclaration);
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDefinitionBlock.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDefinitionBlock.java
index c9954524e77..c6562cc2504 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDefinitionBlock.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionDefinitionBlock.java
@@ -25,12 +25,14 @@ package jdk.test.lib.jittester.functions;
 
 import java.util.ArrayList;
 import jdk.test.lib.jittester.IRNode;
+import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.visitors.Visitor;
 
 public class FunctionDefinitionBlock extends IRNode {
     public FunctionDefinitionBlock(ArrayList<IRNode> content, int level, TypeKlass ownerClass) {
-        setKlass(ownerClass);
+        super(TypeList.VOID);
+        setOwner(ownerClass);
         addChildren(content);
         this.level = level;
     }
@@ -44,10 +46,6 @@ public class FunctionDefinitionBlock extends IRNode {
         return complexity;
     }
 
-    protected int size() {
-        return getChildren() != null ? getChildren().size() : 0;
-    }
-
     @Override
     public<T> T accept(Visitor<T> v) {
         return v.visit(this);
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionInfo.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionInfo.java
index 55da565ead7..a0220fc0e9f 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionInfo.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionInfo.java
@@ -25,6 +25,7 @@ package jdk.test.lib.jittester.functions;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+
 import jdk.test.lib.jittester.Symbol;
 import jdk.test.lib.jittester.Type;
 import jdk.test.lib.jittester.VariableInfo;
@@ -89,7 +90,7 @@ public class FunctionInfo extends Symbol {
 
         try {
             FunctionInfo f = (FunctionInfo) o;
-            return klass.equals(f.klass) && hasEqualSignature(o);
+            return owner.equals(f.owner) && hasEqualSignature(o);
         } catch (Exception e) {
         }
         return false;
@@ -117,7 +118,7 @@ public class FunctionInfo extends Symbol {
     }
 
     public boolean isConstructor() {
-        return name.equals(klass.getName());
+        return name.equals(owner.getName());
     }
 
     @Override
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionRedefinition.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionRedefinition.java
index 5ed6d15216d..1f3e3e98afb 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionRedefinition.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionRedefinition.java
@@ -23,16 +23,19 @@
 
 package jdk.test.lib.jittester.functions;
 
-import java.util.ArrayList;
+import java.util.List;
+
 import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.visitors.Visitor;
 
 public class FunctionRedefinition extends IRNode {
     private final FunctionInfo functionInfo;
 
-    protected FunctionRedefinition(FunctionInfo functionInfo,
-            ArrayList<ArgumentDeclaration> argumentsDeclaration, IRNode body, IRNode ret) {
+    public FunctionRedefinition(FunctionInfo functionInfo,
+                                   List<? extends ArgumentDeclaration> argumentsDeclaration, IRNode body, Return ret) {
+        super(functionInfo.type);
         this.functionInfo = functionInfo;
+        this.owner = functionInfo.owner;
         addChild(body);
         addChild(ret);
         addChildren(argumentsDeclaration);
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionRedefinitionBlock.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionRedefinitionBlock.java
index 79a8e4edd23..5157f8ed817 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionRedefinitionBlock.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/FunctionRedefinitionBlock.java
@@ -25,10 +25,12 @@ package jdk.test.lib.jittester.functions;
 
 import java.util.ArrayList;
 import jdk.test.lib.jittester.IRNode;
+import jdk.test.lib.jittester.TypeList;
 import jdk.test.lib.jittester.visitors.Visitor;
 
 public class FunctionRedefinitionBlock extends IRNode {
     public FunctionRedefinitionBlock(ArrayList<IRNode> content, int level) {
+        super(TypeList.VOID);
         this.level = level;
         addChildren(content);
     }
@@ -42,10 +44,6 @@ public class FunctionRedefinitionBlock extends IRNode {
         return complexity;
     }
 
-    protected int size() {
-        return getChildren() != null ? getChildren().size() : 0;
-    }
-
     @Override
     public<T> T accept(Visitor<T> v) {
         return v.visit(this);
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/Return.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/Return.java
index c974b702d4e..6244e00e0c3 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/Return.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/Return.java
@@ -30,6 +30,7 @@ public class Return extends IRNode {
     private final IRNode returnExpression;
 
     public Return(IRNode returnExpression) {
+        super(returnExpression.getResultType());
         this.returnExpression = returnExpression;
         addChild(returnExpression);
     }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/StaticConstructorDefinition.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/StaticConstructorDefinition.java
index 095068ffc9c..e3a5b32c1f6 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/StaticConstructorDefinition.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/functions/StaticConstructorDefinition.java
@@ -28,6 +28,8 @@ import jdk.test.lib.jittester.visitors.Visitor;
 
 public class StaticConstructorDefinition extends IRNode {
     public StaticConstructorDefinition(IRNode body) {
+        super(body.getResultType());
+        this.owner = body.getOwner();
         addChild(body);
     }
 
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/jtreg/Printer.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/jtreg/Printer.java
new file mode 100644
index 00000000000..c21acd3e0ee
--- /dev/null
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/jtreg/Printer.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2016, 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.test.lib.jittester.jtreg;
+
+import java.util.Stack;
+
+public class Printer {
+
+    public static String print(boolean arg) {
+        return String.valueOf(arg);
+    }
+
+    public static String print(byte arg) {
+        return String.valueOf(arg);
+    }
+
+    public static String print(short arg) {
+        return String.valueOf(arg);
+    }
+
+    public static String print(char arg) {
+        return String.valueOf((int) arg);
+    }
+
+    public static String print(int arg) {
+        return String.valueOf(arg);
+    }
+
+    public static String print(long arg) {
+        return String.valueOf(arg);
+    }
+
+    public static String print(float arg) {
+        return String.valueOf(arg);
+    }
+
+    public static String print(double arg) {
+        return String.valueOf(arg);
+    }
+
+    public static String print(Object arg) {
+        return print_r(new Stack<>(), arg);
+    }
+
+    private static String print_r(Stack<Object> visitedObjects, Object arg) {
+        String result = "";
+        if (arg == null) {
+            result += "null";
+        } else if (arg.getClass().isArray()) {
+            for (int i = 0; i < visitedObjects.size(); i++) {
+                if (visitedObjects.elementAt(i) == arg) {
+                    return "<recursive>";
+                }
+            }
+
+            visitedObjects.push(arg);
+
+            final String delimiter = ", ";
+            result += "[";
+
+            if (arg instanceof Object[]) {
+                Object[] array = (Object[]) arg;
+                for (int i = 0; i < array.length; i++) {
+                    result += print_r(visitedObjects, array[i]);
+                    if (i < array.length - 1) {
+                        result += delimiter;
+                    }
+                }
+            } else if (arg instanceof boolean[]) {
+                boolean[] array = (boolean[]) arg;
+                for (int i = 0; i < array.length; i++) {
+                    result += print(array[i]);
+                    if (i < array.length - 1) {
+                        result += delimiter;
+                    }
+                }
+            } else if (arg instanceof byte[]) {
+                byte[] array = (byte[]) arg;
+                for (int i = 0; i < array.length; i++) {
+                    result += print(array[i]);
+                    if (i < array.length - 1) {
+                        result += delimiter;
+                    }
+                }
+            } else if (arg instanceof short[]) {
+                short[] array = (short[]) arg;
+                for (int i = 0; i < array.length; i++) {
+                    result += print(array[i]);
+                    if (i < array.length - 1) {
+                        result += delimiter;
+                    }
+                }
+            } else if (arg instanceof char[]) {
+                char[] array = (char[]) arg;
+                for (int i = 0; i < array.length; i++) {
+                    result += print(array[i]);
+                    if (i < array.length - 1) {
+                        result += delimiter;
+                    }
+                }
+            } else if (arg instanceof int[]) {
+                int[] array = (int[]) arg;
+                for (int i = 0; i < array.length; i++) {
+                    result += print(array[i]);
+                    if (i < array.length - 1) {
+                        result += delimiter;
+                    }
+                }
+            } else if (arg instanceof long[]) {
+                long[] array = (long[]) arg;
+                for (int i = 0; i < array.length; i++) {
+                    result += print(array[i]);
+                    if (i < array.length - 1) {
+                        result += delimiter;
+                    }
+                }
+            } else if (arg instanceof float[]) {
+                float[] array = (float[]) arg;
+                for (int i = 0; i < array.length; i++) {
+                    result += print(array[i]);
+                    if (i < array.length - 1) {
+                        result += delimiter;
+                    }
+                }
+            } else if (arg instanceof double[]) {
+                double[] array = (double[]) arg;
+                for (int i = 0; i < array.length; i++) {
+                    result += print(array[i]);
+                    if (i < array.length - 1) {
+                        result += delimiter;
+                    }
+                }
+            }
+
+            result += "]";
+            visitedObjects.pop();
+
+        } else {
+            result += arg.toString();
+        }
+
+        return result;
+    }
+}
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/CounterManipulator.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/CounterManipulator.java
index f27feeea88d..e2842274fb3 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/CounterManipulator.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/CounterManipulator.java
@@ -25,6 +25,7 @@ package jdk.test.lib.jittester.loops;
 
 import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.LocalVariable;
+import jdk.test.lib.jittester.Statement;
 import jdk.test.lib.jittester.visitors.Visitor;
 
 /*
@@ -36,7 +37,8 @@ import jdk.test.lib.jittester.visitors.Visitor;
 public class CounterManipulator extends IRNode {
     LocalVariable counter;
 
-    public CounterManipulator(IRNode manipulator) {
+    public CounterManipulator(Statement manipulator) {
+        super(manipulator.getResultType());
         addChild(manipulator);
     }
 
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/DoWhile.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/DoWhile.java
index b8830e120db..cd1d6fbadeb 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/DoWhile.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/DoWhile.java
@@ -42,7 +42,7 @@ public class DoWhile extends IRNode {
         HEADER,
         BODY1,
         BODY2,
-    };
+    }
     private final Loop loop;
     // header;                  [subblock]
     // do {
@@ -52,8 +52,9 @@ public class DoWhile extends IRNode {
     // } while(condition);
     private long thisLoopIterLimit = 0;
 
-    public DoWhile(int level, Loop loop, long thisLoopIterLimit, IRNode header,
-            IRNode body1, IRNode body2) {
+    public DoWhile(int level, Loop loop, long thisLoopIterLimit, Block header,
+                   Block body1, Block body2) {
+        super(body1.getResultType());
         this.level = level;
         this.loop = loop;
         this.thisLoopIterLimit = thisLoopIterLimit;
@@ -85,13 +86,12 @@ public class DoWhile extends IRNode {
         IRNode header = getChildren().get(DoWhilePart.HEADER.ordinal());
         List<IRNode> siblings = getParent().getChildren();
         int index = siblings.indexOf(this);
+        siblings.set(index++, loop.initialization);
         if (header instanceof Block) {
-            siblings.remove(this);
             siblings.addAll(index, header.getChildren());
         } else {
-            siblings.set(index, header);
+            siblings.add(index, header);
         }
-        siblings.add(index + header.getChildren().size(), loop.initialization);
         return true;
     }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/For.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/For.java
index 3c1ab06e103..c03795a5d05 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/For.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/For.java
@@ -26,6 +26,7 @@ package jdk.test.lib.jittester.loops;
 import java.util.List;
 import jdk.test.lib.jittester.Block;
 import jdk.test.lib.jittester.IRNode;
+import jdk.test.lib.jittester.Statement;
 import jdk.test.lib.jittester.visitors.Visitor;
 
 public class For extends IRNode {
@@ -45,7 +46,7 @@ public class For extends IRNode {
         BODY1,
         BODY2,
         BODY3,
-    };
+    }
 
     private final Loop loop;
     // header;                       // [subblock]
@@ -57,8 +58,9 @@ public class For extends IRNode {
     // }
     private long thisLoopIterLimit = 0;
     public For(int level, Loop loop, long thisLoopIterLimit,
-            IRNode header, IRNode statement1,
-            IRNode statement2, IRNode body1, IRNode body2, IRNode body3) {
+               Block header, Statement statement1,
+               Statement statement2, Block body1, Block body2, Block body3) {
+        super(body1.getResultType());
         this.level = level;
         this.loop = loop;
         this.thisLoopIterLimit = thisLoopIterLimit;
@@ -100,13 +102,12 @@ public class For extends IRNode {
         IRNode header = getChildren().get(ForPart.HEADER.ordinal());
         List<IRNode> siblings = getParent().getChildren();
         int index = siblings.indexOf(this);
+        siblings.set(index++, loop.initialization);
         if (header instanceof Block) {
-            siblings.remove(this);
             siblings.addAll(index, header.getChildren());
         } else {
-            siblings.set(index, header);
+            siblings.add(index, header);
         }
-        siblings.add(index + header.getChildren().size(), loop.initialization);
         return true;
     }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/Loop.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/Loop.java
index dc81f8756d7..07dc7c7cae5 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/Loop.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/Loop.java
@@ -23,11 +23,10 @@
 
 package jdk.test.lib.jittester.loops;
 
-import jdk.test.lib.jittester.IRNode;
 
 // Just a structure to hold the values needed to handle basic loop production
 public class Loop {
-    public IRNode initialization;
-    public IRNode condition;
-    public IRNode manipulator;
+    public CounterInitializer initialization;
+    public LoopingCondition condition;
+    public CounterManipulator manipulator;
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/LoopingCondition.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/LoopingCondition.java
index 48bc0228f6c..d2c101c237b 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/LoopingCondition.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/LoopingCondition.java
@@ -30,6 +30,7 @@ public class LoopingCondition extends IRNode {
     private final IRNode condition;
 
     public LoopingCondition(IRNode condition) {
+        super(condition.getResultType());
         this.condition = condition;
         addChild(condition);
     }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/While.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/While.java
index 9b8c780611d..71854c43cb0 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/While.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/loops/While.java
@@ -38,7 +38,7 @@ public class While extends IRNode {
         BODY1,
         BODY2,
         BODY3,
-    };
+    }
 
     private final Loop loop;
     // int counter = x;
@@ -51,8 +51,9 @@ public class While extends IRNode {
     // }
     private final long thisLoopIterLimit;
 
-    public While(int level, Loop loop, long thisLoopIterLimit, IRNode header,
-            IRNode body1, IRNode body2, IRNode body3) {
+    public While(int level, Loop loop, long thisLoopIterLimit, Block header,
+                 Block body1, Block body2, Block body3) {
+        super(body1.getResultType());
         this.loop = loop;
         this.level = level;
         this.thisLoopIterLimit = thisLoopIterLimit;
@@ -88,13 +89,12 @@ public class While extends IRNode {
         IRNode header = getChildren().get(WhilePart.HEADER.ordinal());
         List<IRNode> siblings = getParent().getChildren();
         int index = siblings.indexOf(this);
+        siblings.set(index++, loop.initialization);
         if (header instanceof Block) {
-            siblings.remove(this);
             siblings.addAll(index, header.getChildren());
         } else {
-            siblings.set(index, header);
+            siblings.add(index, header);
         }
-        siblings.add(index + header.getChildren().size(), loop.initialization);
         return true;
     }
 
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeArray.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeArray.java
index c39f470e37f..d29be1b676b 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeArray.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeArray.java
@@ -26,6 +26,9 @@ package jdk.test.lib.jittester.types;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 import jdk.test.lib.jittester.ProductionParams;
 import jdk.test.lib.jittester.SymbolTable;
 import jdk.test.lib.jittester.Type;
@@ -47,26 +50,29 @@ public class TypeArray extends TypeKlass {
     public final int dimensions;
     private List<Byte> dims = new ArrayList<>();
 
-    public TypeArray() {
-        this(new TypeVoid(), 0);
-    }
-
     public TypeArray(Type type, int dimensions) {
         super("Array", TypeKlass.FINAL);
-        addParent("java.lang.Object");
-        setParent((TypeKlass) TypeList.find("java.lang.Object"));
+        addParent(TypeList.OBJECT.getName());
+        setParent(TypeList.OBJECT);
         this.type = type;
         this.dimensions = dimensions;
     }
 
+    public String getName() {
+        String dimString = Stream.generate(() -> "[]")
+                .limit(dimensions)
+                .collect(Collectors.joining());
+        return type.getName() + dimString;
+    }
+
     @Override
     protected void exportSymbols() {
-        SymbolTable.add(new VariableInfo("length", this, new TypeInt(), VariableInfo.PUBLIC | VariableInfo.FINAL));
+        SymbolTable.add(new VariableInfo("length", this, TypeList.INT, VariableInfo.PUBLIC | VariableInfo.FINAL));
     }
 
     @Override
     public boolean equals(Object t) {
-                if (this == t) {
+        if (this == t) {
             return true;
         }
         if (t == null || !(t instanceof TypeArray)) {
@@ -95,8 +101,7 @@ public class TypeArray extends TypeKlass {
 
     @Override
     public int compareTo(Type t) {
-        int r = 0;
-        r = super.compareTo(t);
+        int r = super.compareTo(t);
         if (r == 0) {
             try {
                 TypeArray a = (TypeArray) t;
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeKlass.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeKlass.java
index 47e4444d749..3135524cbaa 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeKlass.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeKlass.java
@@ -33,24 +33,27 @@ import jdk.test.lib.jittester.Type;
 import jdk.test.lib.jittester.TypeList;
 
 public class TypeKlass extends Type {
-
-    private TypeKlass parent;
-    private HashSet<String> parentsList;
-    private HashSet<String> childrenList;
+    private TypeKlass parentKlass;
+    private final HashSet<String> parentsList;
+    private final HashSet<String> childrenList;
     private final HashSet<Symbol> symbolsSet;
+    private int flags;
+
     public static final int NONE = 0x00;
     public static final int FINAL = 0x01;
     public static final int INTERFACE = 0x02;
     public static final int ABSTRACT = 0x04;
-    private int flags = NONE;
+
 
     public TypeKlass(String name) {
-        this(name, 0);
+        this(name, NONE);
     }
 
     public TypeKlass(String name, int flags) {
         super(name);
         this.flags = flags;
+        parentsList = new HashSet<>();
+        childrenList = new HashSet<>();
         symbolsSet = new HashSet<>();
     }
 
@@ -76,39 +79,27 @@ public class TypeKlass extends Type {
 
     @Override
     protected void exportSymbols() {
-        symbolsSet.stream().forEach(symbol -> {
-            SymbolTable.add(symbol);
-        });
+        symbolsSet.stream().forEach(SymbolTable::add);
     }
 
     public void setParent(TypeKlass p) {
-        parent = p;
+        parentKlass = p;
     }
 
     public void addParent(String p) {
-        if (parentsList == null) {
-            parentsList = new HashSet<>();
-        }
         parentsList.add(p);
     }
 
     public void addChild(String c) {
-        if (childrenList == null) {
-            childrenList = new HashSet<>();
-        }
         childrenList.add(c);
     }
 
     protected void removeParent(String p) {
-        if (parentsList != null) {
-            parentsList.remove(p);
-        }
+        parentsList.remove(p);
     }
 
     protected void removeChild(String c) {
-        if (childrenList != null) {
-            childrenList.remove(c);
-        }
+        childrenList.remove(c);
     }
 
     public HashSet<String> getParentsNames() {
@@ -131,37 +122,27 @@ public class TypeKlass extends Type {
 
     public TreeSet<TypeKlass> getAllParents() {
         TreeSet<TypeKlass> result = new TreeSet<>();
-        if (parentsList != null) {
-            for (String parentName : parentsList) {
-                Type _parentKlass = TypeList.find(new TypeKlass(parentName));
-                if (_parentKlass != null) {
-                    try {
-                        TypeKlass parentKlass = (TypeKlass) _parentKlass;
-                        result.add(parentKlass);
-                        result.addAll(parentKlass.getAllParents());
-                    } catch (Exception e) {
-                    }
-                }
-            }
-        }
+        parentsList.stream()
+                .map(TypeList::find)
+                .filter(parentKlass -> parentKlass != null)
+                .map(parentKlass -> (TypeKlass) parentKlass)
+                .forEach(parentKlass -> {
+                    result.add(parentKlass);
+                    result.addAll(parentKlass.getAllParents());
+        });
         return result;
     }
 
     public TreeSet<TypeKlass> getAllChildren() {
         TreeSet<TypeKlass> r = new TreeSet<>();
-        if (childrenList != null) {
-            for (String childName : childrenList) {
-                Type _childKlass = TypeList.find(new TypeKlass(childName));
-                if (_childKlass != null) {
-                    try {
-                        TypeKlass childKlass = (TypeKlass) _childKlass;
-                        r.add(childKlass);
-                        r.addAll(childKlass.getAllChildren());
-                    } catch (Exception e) {
-                    }
-                }
-            }
-        }
+        childrenList.stream()
+                .map(TypeList::find)
+                .filter(childKlass -> childKlass != null)
+                .map(childKlass -> (TypeKlass) childKlass)
+                .forEach(childKlass -> {
+                    r.add(childKlass);
+                    r.addAll(childKlass.getAllChildren());
+        });
         return r;
     }
 
@@ -179,8 +160,11 @@ public class TypeKlass extends Type {
     // we cannot guarantee that no exception will occur.
     @Override
     public boolean canExplicitlyCastTo(Type t) {
+        if (equals(t)) {
+            return true;
+        }
         if (t instanceof TypeKlass && !ProductionParams.disableDowncasts.value()) {
-            return equals(t) || getAllChildren().contains(t);
+            return getAllChildren().contains(t);
         }
 
         return false;
@@ -205,4 +189,8 @@ public class TypeKlass extends Type {
     public boolean isInterface() {
         return (flags & INTERFACE) > 0;
     }
+
+    public TypeKlass getParent() {
+        return parentKlass;
+    }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/FixedTrees.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/FixedTrees.java
new file mode 100644
index 00000000000..d23b80450b4
--- /dev/null
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/FixedTrees.java
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 2016, 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.test.lib.jittester.utils;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import jdk.test.lib.jittester.BinaryOperator;
+import jdk.test.lib.jittester.Block;
+import jdk.test.lib.jittester.CatchBlock;
+import jdk.test.lib.jittester.IRNode;
+import jdk.test.lib.jittester.Literal;
+import jdk.test.lib.jittester.LocalVariable;
+import jdk.test.lib.jittester.NonStaticMemberVariable;
+import jdk.test.lib.jittester.Nothing;
+import jdk.test.lib.jittester.Operator;
+import jdk.test.lib.jittester.OperatorKind;
+import jdk.test.lib.jittester.PrintVariables;
+import jdk.test.lib.jittester.ProductionFailedException;
+import jdk.test.lib.jittester.Statement;
+import jdk.test.lib.jittester.StaticMemberVariable;
+import jdk.test.lib.jittester.Symbol;
+import jdk.test.lib.jittester.TryCatchBlock;
+import jdk.test.lib.jittester.Type;
+import jdk.test.lib.jittester.TypeList;
+import jdk.test.lib.jittester.VariableInfo;
+import jdk.test.lib.jittester.VariableInitialization;
+import jdk.test.lib.jittester.functions.ArgumentDeclaration;
+import jdk.test.lib.jittester.functions.Function;
+import jdk.test.lib.jittester.functions.FunctionDefinition;
+import jdk.test.lib.jittester.functions.FunctionInfo;
+import jdk.test.lib.jittester.functions.Return;
+import jdk.test.lib.jittester.jtreg.Printer;
+import jdk.test.lib.jittester.loops.CounterInitializer;
+import jdk.test.lib.jittester.loops.CounterManipulator;
+import jdk.test.lib.jittester.loops.For;
+import jdk.test.lib.jittester.loops.Loop;
+import jdk.test.lib.jittester.loops.LoopingCondition;
+import jdk.test.lib.jittester.types.TypeArray;
+import jdk.test.lib.jittester.types.TypeKlass;
+
+public class FixedTrees {
+    public static FunctionDefinition printVariablesAsFunction(PrintVariables node) {
+        TypeKlass owner = node.getOwner();
+
+        ArrayList<IRNode> nodes = new ArrayList<>();
+
+        VariableInfo resultInfo = new VariableInfo("result", node.getOwner(), TypeList.STRING, VariableInfo.LOCAL);
+        nodes.add(new Statement(new VariableInitialization(resultInfo, new Literal("[", TypeList.STRING)), true));
+        LocalVariable resultVar = new LocalVariable(resultInfo);
+
+        List<Symbol> vars = node.getVars();
+
+        TypeKlass printerKlass = new TypeKlass(Printer.class.getName());
+        Literal EOL = new Literal("\n", TypeList.STRING);
+        VariableInfo thisInfo = new VariableInfo("this", node.getOwner(),
+                node.getOwner(), VariableInfo.LOCAL | VariableInfo.INITIALIZED);
+
+        LocalVariable thisVar = new LocalVariable(thisInfo);
+
+        for (int i = 0; i < vars.size(); i++) {
+            Symbol v = vars.get(i);
+            nodes.add(new Statement(new BinaryOperator(OperatorKind.COMPOUND_ADD, TypeList.STRING, resultVar,
+                    new Literal(v.owner.getName() + "." + v.name + " = ", TypeList.STRING)), true));
+            VariableInfo argInfo = new VariableInfo("arg", printerKlass,
+                    v.type instanceof TypeKlass ? TypeList.OBJECT : v.type,
+                    VariableInfo.LOCAL | VariableInfo.INITIALIZED);
+            FunctionInfo printInfo = new FunctionInfo("print", printerKlass,
+                    TypeList.STRING, 0,  FunctionInfo.PUBLIC | FunctionInfo.STATIC, argInfo);
+            Function call = new Function(owner, printInfo, null);
+            VariableInfo varInfo = new VariableInfo(v.name, v.owner, v.type, v.flags);
+            if (v.isStatic()) {
+                call.addChild(new StaticMemberVariable(v.owner, varInfo));
+            } else {
+                call.addChild(new NonStaticMemberVariable(thisVar, varInfo));
+            }
+            nodes.add(new Statement(new BinaryOperator(OperatorKind.COMPOUND_ADD, TypeList.STRING, resultVar,
+                    call), true));
+            if (i < vars.size() - 1) {
+                nodes.add(new Statement(new BinaryOperator(OperatorKind.COMPOUND_ADD, TypeList.STRING, resultVar,
+                        EOL), true));
+            }
+        }
+        nodes.add(new Statement(
+                new BinaryOperator(OperatorKind.COMPOUND_ADD, TypeList.STRING, resultVar, new Literal("]\n", TypeList.STRING)),
+                true));
+
+        Block block = new Block(node.getOwner(), TypeList.STRING, nodes, 1);
+        FunctionInfo toStringInfo = new FunctionInfo("toString", owner, TypeList.STRING, 0L, FunctionInfo.PUBLIC, thisInfo);
+        return new FunctionDefinition(toStringInfo, new ArrayList<>(), block, new Return(resultVar));
+    }
+    public static FunctionDefinition generateMainOrExecuteMethod(TypeKlass owner, boolean isMain) {
+        Nothing nothing = new Nothing();
+        ArrayList<IRNode> testCallNodeContent = new ArrayList<>();
+        VariableInfo tInfo = new VariableInfo("t", owner, owner, VariableInfo.LOCAL);
+        LocalVariable tVar = new LocalVariable(tInfo);
+        Function testCallNode = new Function(owner, new FunctionInfo("test", owner, TypeList.VOID,
+                0L, FunctionInfo.PRIVATE, tInfo), null);
+        testCallNode.addChild(tVar);
+        testCallNodeContent.add(new Statement(testCallNode, true));
+        // { t.test(); }
+        Block testCallNodeBlock = new Block(owner, TypeList.VOID, testCallNodeContent, 4);
+
+        IRNode tryNode = testCallNodeBlock;
+        if (isMain) {
+            VariableInfo iInfo = new VariableInfo("i", owner, TypeList.INT, VariableInfo.LOCAL);
+            LocalVariable iVar = new LocalVariable(iInfo);
+            Operator increaseCounter = new BinaryOperator(OperatorKind.ASSIGN, TypeList.INT,
+                    iVar,
+                    new BinaryOperator(OperatorKind.ADD, TypeList.INT,
+                            iVar, new Literal(1, TypeList.INT)));
+            Loop loop = new Loop();
+            Block emptyBlock = new Block(owner, TypeList.VOID, new LinkedList<>(), 3);
+            loop.initialization = new CounterInitializer(iInfo, new Literal(0, TypeList.INT));
+            loop.manipulator = new CounterManipulator(new Statement(increaseCounter, false));
+            loop.condition = new LoopingCondition(new BinaryOperator(OperatorKind.LT, TypeList.BOOLEAN, iVar,
+                    new Literal(150000, TypeList.INT)));
+            For forNode = new For(4, loop, 150000, emptyBlock, new Statement(nothing, false),
+                    new Statement(nothing, false), testCallNodeBlock, emptyBlock, emptyBlock);
+            tryNode = forNode;
+        }
+
+        FunctionInfo constrInfo = new FunctionInfo(owner.getName(), owner, owner, 0, FunctionInfo.PUBLIC);
+        Function testConstructor = new Function(owner, constrInfo, null);
+        // Test t = new Test()
+        VariableInitialization testInit = new VariableInitialization(tInfo, testConstructor);
+
+        TypeKlass throwableKlass = new TypeKlass("java.lang.Throwable");
+        List<Type> throwables = new ArrayList<>();
+        throwables.add(throwableKlass);
+
+        VariableInfo exInfo = new VariableInfo("ex", owner, throwableKlass,
+                VariableInfo.LOCAL | VariableInfo.INITIALIZED);
+        FunctionInfo printStackTraceInfo = new FunctionInfo("printStackTrace", throwableKlass,
+                TypeList.VOID, 0, FunctionInfo.PUBLIC, exInfo);
+        Function printStackTraceCall = new Function(throwableKlass, printStackTraceInfo, null);
+        printStackTraceCall.addChild(new LocalVariable(exInfo));
+        ArrayList<IRNode> printStackTraceCallBlockContent = new ArrayList<>();
+        // { ex.printStackTrace(); }
+        printStackTraceCallBlockContent.add(new Statement(printStackTraceCall, true));
+
+        Block printStackTraceCallBlock = new Block(owner, TypeList.VOID, printStackTraceCallBlockContent, 3);
+        List<CatchBlock> catchBlocks1 = new ArrayList<>();
+        catchBlocks1.add(new CatchBlock(printStackTraceCallBlock, throwables, 3));
+        List<CatchBlock> catchBlocks2 = new ArrayList<>();
+        catchBlocks2.add(new CatchBlock(printStackTraceCallBlock, throwables, 3));
+        List<CatchBlock> catchBlocks3 = new ArrayList<>();
+        catchBlocks3.add(new CatchBlock(printStackTraceCallBlock, throwables, 2));
+
+        TryCatchBlock tryCatch1 = new TryCatchBlock(tryNode, nothing, catchBlocks1, 3);
+        TypeKlass printStreamKlass = new TypeKlass("java.io.PrintStream");
+        TypeKlass systemKlass = new TypeKlass("java.lang.System");
+        FunctionInfo systemOutPrintlnInfo = new FunctionInfo("println", printStreamKlass,
+                TypeList.VOID, 0, FunctionInfo.PUBLIC,
+                new VariableInfo("this", owner, printStreamKlass, VariableInfo.LOCAL | VariableInfo.INITIALIZED),
+                new VariableInfo("t", owner, TypeList.OBJECT,
+                        VariableInfo.LOCAL  | VariableInfo.INITIALIZED));
+        List<IRNode> printlnArgs = new ArrayList<>();
+        VariableInfo systemOutInfo = new VariableInfo("out", systemKlass, printStreamKlass,
+                VariableInfo.STATIC | VariableInfo.PUBLIC);
+        StaticMemberVariable systemOutVar = new StaticMemberVariable(owner, systemOutInfo);
+        printlnArgs.add(systemOutVar);
+        printlnArgs.add(tVar);
+        Function println = new Function(printStreamKlass, systemOutPrintlnInfo, printlnArgs);
+        ArrayList<IRNode> printlnBlockContent = new ArrayList<>();
+        printlnBlockContent.add(new Statement(println, true));
+        Block printlnBlock = new Block(owner, TypeList.VOID, printlnBlockContent, 3);
+        TryCatchBlock tryCatch2 = new TryCatchBlock(printlnBlock, nothing, catchBlocks2, 3);
+
+        List<IRNode> mainTryCatchBlockContent = new ArrayList<>();
+        mainTryCatchBlockContent.add(new Statement(testInit, true));
+        mainTryCatchBlockContent.add(tryCatch1);
+        mainTryCatchBlockContent.add(tryCatch2);
+        Block mainTryCatchBlock = new Block(owner, TypeList.VOID, mainTryCatchBlockContent, 2);
+        TryCatchBlock mainTryCatch = new TryCatchBlock(mainTryCatchBlock, nothing, catchBlocks3, 2);
+        ArrayList<IRNode> bodyContent = new ArrayList<>();
+        bodyContent.add(mainTryCatch);
+        Block funcBody = new Block(owner, TypeList.VOID, bodyContent, 1);
+
+        // static main(String[] args)V or static execute()V
+        VariableInfo mainArgs = new VariableInfo("args", owner,
+                new TypeArray(TypeList.STRING, 1), VariableInfo.LOCAL);
+        FunctionInfo fInfo = isMain
+                ? new FunctionInfo("main", owner, TypeList.VOID, 0, FunctionInfo.PUBLIC | FunctionInfo.STATIC, mainArgs)
+                : new FunctionInfo("execute", owner, TypeList.VOID, 0, FunctionInfo.PUBLIC | FunctionInfo.STATIC);
+        ArrayList<ArgumentDeclaration> argDecl = new ArrayList<>();
+        if (isMain) {
+            argDecl.add(new ArgumentDeclaration(mainArgs));
+        }
+        return new FunctionDefinition(fInfo, argDecl, funcBody, new Return(nothing));
+    }
+}
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/OptionResolver.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/OptionResolver.java
index 4366684c14d..8b6f8a88ace 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/OptionResolver.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/OptionResolver.java
@@ -166,11 +166,10 @@ public class OptionResolver {
     }
 
     public abstract class Option<T> {
-
-        Character shortName;
-        String longName;
-        protected T defaultValue;
-        protected String description;
+        protected final Character shortName;
+        protected final String longName;
+        protected final T defaultValue;
+        protected final String description;
 
         public Option(Character shortName, String longName, T defaultValue, String description) {
             this.shortName = shortName;
@@ -200,6 +199,10 @@ public class OptionResolver {
             return (T) values.getOrDefault(this, defaultValue);
         }
 
+        public boolean isSet() {
+            return values.containsKey(this);
+        }
+
         public boolean isFlag() {
             return false;
         }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/PseudoRandom.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/PseudoRandom.java
index 891d5495c27..cb6a8aed80e 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/PseudoRandom.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/PseudoRandom.java
@@ -23,18 +23,31 @@
 
 package jdk.test.lib.jittester.utils;
 
+import java.lang.reflect.Field;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicLong;
 
 /**
  * This class is used for any random generation operations.
  */
 public class PseudoRandom {
 
-    private static java.util.Random random = null;
+    private static Random random = null;
+    private static final Field SEED_FIELD;
+
+    static {
+        try {
+            SEED_FIELD = Random.class.getDeclaredField("seed");
+            SEED_FIELD.setAccessible(true);
+        } catch (ReflectiveOperationException roe) {
+            throw new Error("Can't get seed field: " + roe, roe);
+        }
+    }
 
     public static void reset(String seed) {
         if (seed == null || seed.length() == 0) {
@@ -71,9 +84,9 @@ public class PseudoRandom {
         Collections.shuffle(list, random);
     }
 
-    public static byte randomNotNegative(byte limit) {
-        byte result = (byte) (limit * random.nextDouble());
-        return (byte)Math.abs(result);
+    public static int randomNotNegative(int limit) {
+        int result = (int) (limit * random.nextDouble());
+        return Math.abs(result);
     }
 
     public static <T> T randomElement(Collection<T> collection) {
@@ -103,4 +116,21 @@ public class PseudoRandom {
             throw new NoSuchElementException("Empty, no element can be randomly selected");
         return array[random.nextInt(array.length)];
     }
+
+    public static long getCurrentSeed() {
+        try {
+            return ((AtomicLong)SEED_FIELD.get(random)).get();
+        } catch (ReflectiveOperationException roe) {
+            throw new Error("Can't get seed: " + roe, roe);
+        }
+    }
+
+    public static void setCurrentSeed(long seed) {
+        try {
+            AtomicLong seedObject = (AtomicLong)SEED_FIELD.get(random);
+            seedObject.set(seed);
+        } catch (ReflectiveOperationException roe) {
+            throw new Error("Can't set seed: " + roe, roe);
+        }
+    }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/ByteCodeVisitor.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/ByteCodeVisitor.java
new file mode 100644
index 00000000000..8d5b11d1da9
--- /dev/null
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/ByteCodeVisitor.java
@@ -0,0 +1,1831 @@
+/*
+ * Copyright (c) 2016, 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.test.lib.jittester.visitors;
+
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.FieldVisitor;
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.test.lib.Pair;
+import jdk.test.lib.jittester.BinaryOperator;
+import jdk.test.lib.jittester.Block;
+import jdk.test.lib.jittester.BuiltInType;
+import jdk.test.lib.jittester.Break;
+import jdk.test.lib.jittester.CastOperator;
+import jdk.test.lib.jittester.CatchBlock;
+import jdk.test.lib.jittester.Continue;
+import jdk.test.lib.jittester.Declaration;
+import jdk.test.lib.jittester.IRNode;
+import jdk.test.lib.jittester.If;
+import jdk.test.lib.jittester.Initialization;
+import jdk.test.lib.jittester.Literal;
+import jdk.test.lib.jittester.LocalVariable;
+import jdk.test.lib.jittester.NonStaticMemberVariable;
+import jdk.test.lib.jittester.Nothing;
+import jdk.test.lib.jittester.Operator;
+import jdk.test.lib.jittester.OperatorKind;
+import jdk.test.lib.jittester.PrintVariables;
+import jdk.test.lib.jittester.ProductionParams;
+import jdk.test.lib.jittester.Statement;
+import jdk.test.lib.jittester.StaticMemberVariable;
+import jdk.test.lib.jittester.Switch;
+import jdk.test.lib.jittester.Symbol;
+import jdk.test.lib.jittester.TernaryOperator;
+import jdk.test.lib.jittester.Throw;
+import jdk.test.lib.jittester.TryCatchBlock;
+import jdk.test.lib.jittester.Type;
+import jdk.test.lib.jittester.TypeList;
+import jdk.test.lib.jittester.UnaryOperator;
+import jdk.test.lib.jittester.VariableBase;
+import jdk.test.lib.jittester.VariableDeclaration;
+import jdk.test.lib.jittester.VariableDeclarationBlock;
+import jdk.test.lib.jittester.VariableInfo;
+import jdk.test.lib.jittester.VariableInitialization;
+import jdk.test.lib.jittester.arrays.ArrayCreation;
+import jdk.test.lib.jittester.arrays.ArrayElement;
+import jdk.test.lib.jittester.arrays.ArrayExtraction;
+import jdk.test.lib.jittester.classes.ClassDefinitionBlock;
+import jdk.test.lib.jittester.classes.Interface;
+import jdk.test.lib.jittester.classes.Klass;
+import jdk.test.lib.jittester.classes.MainKlass;
+import jdk.test.lib.jittester.functions.ArgumentDeclaration;
+import jdk.test.lib.jittester.functions.ConstructorDefinition;
+import jdk.test.lib.jittester.functions.ConstructorDefinitionBlock;
+import jdk.test.lib.jittester.functions.Function;
+import jdk.test.lib.jittester.functions.FunctionDeclaration;
+import jdk.test.lib.jittester.functions.FunctionDeclarationBlock;
+import jdk.test.lib.jittester.functions.FunctionDefinition;
+import jdk.test.lib.jittester.functions.FunctionDefinitionBlock;
+import jdk.test.lib.jittester.functions.FunctionInfo;
+import jdk.test.lib.jittester.functions.FunctionRedefinition;
+import jdk.test.lib.jittester.functions.FunctionRedefinitionBlock;
+import jdk.test.lib.jittester.functions.Return;
+import jdk.test.lib.jittester.functions.StaticConstructorDefinition;
+import jdk.test.lib.jittester.loops.CounterInitializer;
+import jdk.test.lib.jittester.loops.CounterManipulator;
+import jdk.test.lib.jittester.loops.DoWhile;
+import jdk.test.lib.jittester.loops.For;
+import jdk.test.lib.jittester.loops.Loop;
+import jdk.test.lib.jittester.loops.LoopingCondition;
+import jdk.test.lib.jittester.loops.While;
+import jdk.test.lib.jittester.types.TypeArray;
+import jdk.test.lib.jittester.types.TypeKlass;
+import jdk.test.lib.jittester.utils.FixedTrees;
+import jdk.test.lib.jittester.utils.PseudoRandom;
+
+public class ByteCodeVisitor implements Visitor<byte[]> {
+    private final GeneratedClassesContext context = new GeneratedClassesContext();
+    private final byte[] EMPTY_BYTE_ARRAY = new byte[0];
+    private final int CLASS_WRITER_FLAGS = ContextDependedClassWriter.COMPUTE_MAXS | ContextDependedClassWriter.COMPUTE_FRAMES;
+    private final HashMap<String, ContextDependedClassWriter> classWriters = new HashMap<>();
+    private MethodVisitor currentMV;
+    private TypeKlass currentClass;
+    private final LocalVariablesTable locals = new LocalVariablesTable();
+    private final Deque<Label> endLabels = new ArrayDeque<>();
+    private final Deque<Label> beginLabels = new ArrayDeque<>();
+
+    @Override
+    public byte[] visit(ArgumentDeclaration node) {
+        /* handled by FunctionDefinition for ByteCodeVisitor */
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(ArrayCreation node) {
+        int dimensions = node.getDimensionsCount();
+        TypeArray arrayType = node.getArrayType();
+        Type basicType = arrayType.type;
+        for (IRNode child : node.getChildren()) {
+            child.accept(this);
+        }
+        if (dimensions == 1) {
+            if (basicType.equals(TypeList.BOOLEAN)) {
+                currentMV.visitIntInsn(Opcodes.NEWARRAY, Opcodes.T_BOOLEAN);
+            } else if (basicType.equals(TypeList.BYTE)) {
+                currentMV.visitIntInsn(Opcodes.NEWARRAY, Opcodes.T_BYTE);
+            } else if (basicType.equals(TypeList.CHAR)) {
+                currentMV.visitIntInsn(Opcodes.NEWARRAY, Opcodes.T_CHAR);
+            } else if (basicType.equals(TypeList.SHORT)) {
+                currentMV.visitIntInsn(Opcodes.NEWARRAY, Opcodes.T_SHORT);
+            } else if (basicType.equals(TypeList.INT)) {
+                currentMV.visitIntInsn(Opcodes.NEWARRAY, Opcodes.T_INT);
+            } else if (basicType.equals(TypeList.LONG)) {
+                currentMV.visitIntInsn(Opcodes.NEWARRAY, Opcodes.T_LONG);
+            } else if (basicType.equals(TypeList.FLOAT)) {
+                currentMV.visitIntInsn(Opcodes.NEWARRAY, Opcodes.T_FLOAT);
+            } else if (basicType.equals(TypeList.DOUBLE)) {
+                currentMV.visitIntInsn(Opcodes.NEWARRAY, Opcodes.T_DOUBLE);
+            } else {
+                currentMV.visitTypeInsn(Opcodes.ANEWARRAY, asInternalName(basicType.getName()));
+            }
+        } else {
+            currentMV.visitMultiANewArrayInsn(new String(arrayType.accept(this)), dimensions);
+        }
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(ArrayElement node) {
+        node.getChild(0).accept(this);
+        int dimensions = node.getChildren().size() - 1;
+        Type resultType = node.getResultType();
+        for (int i = 1; i < dimensions; i++) {
+            node.getChild(i).accept(this);
+            currentMV.visitInsn(Opcodes.AALOAD);
+        }
+        node.getChild(dimensions).accept(this);
+        if (resultType.equals(TypeList.BOOLEAN) || resultType.equals(TypeList.BYTE)) {
+            currentMV.visitInsn(Opcodes.BALOAD);
+        } else if (resultType.equals(TypeList.CHAR)) {
+            currentMV.visitInsn(Opcodes.CALOAD);
+        } else if (resultType.equals(TypeList.SHORT)) {
+            currentMV.visitInsn(Opcodes.SALOAD);
+        } else if (resultType.equals(TypeList.INT)) {
+            currentMV.visitInsn(Opcodes.IALOAD);
+        } else if (resultType.equals(TypeList.LONG)) {
+            currentMV.visitInsn(Opcodes.LALOAD);
+        } else if (resultType.equals(TypeList.FLOAT)) {
+            currentMV.visitInsn(Opcodes.FALOAD);
+        } else if (resultType.equals(TypeList.DOUBLE)) {
+            currentMV.visitInsn(Opcodes.DALOAD);
+        } else {
+            currentMV.visitInsn(Opcodes.AALOAD);
+        }
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(ArrayExtraction node) {
+        node.getChild(0).accept(this);
+        int dimensions = node.getChildren().size() - 1;
+        Type resultType = node.getResultType();
+        for (int i = 1; i < dimensions; i++) {
+            node.getChild(i).accept(this);
+            currentMV.visitInsn(Opcodes.AALOAD);
+        }
+        node.getChild(dimensions).accept(this);
+        if (resultType.equals(TypeList.BOOLEAN) || resultType.equals(TypeList.BYTE)) {
+            currentMV.visitInsn(Opcodes.BALOAD);
+        } else if (resultType.equals(TypeList.CHAR)) {
+            currentMV.visitInsn(Opcodes.CALOAD);
+        } else if (resultType.equals(TypeList.SHORT)) {
+            currentMV.visitInsn(Opcodes.SALOAD);
+        } else if (resultType.equals(TypeList.INT)) {
+            currentMV.visitInsn(Opcodes.IALOAD);
+        } else if (resultType.equals(TypeList.LONG)) {
+            currentMV.visitInsn(Opcodes.LALOAD);
+        } else if (resultType.equals(TypeList.FLOAT)) {
+            currentMV.visitInsn(Opcodes.FALOAD);
+        } else if (resultType.equals(TypeList.DOUBLE)) {
+            currentMV.visitInsn(Opcodes.DALOAD);
+        } else {
+            currentMV.visitInsn(Opcodes.AALOAD);
+        }
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(BinaryOperator node) {
+        OperatorKind kind = node.getOperationKind();
+        IRNode left = node.getChild(Operator.Order.LEFT.ordinal());
+        IRNode right = node.getChild(Operator.Order.RIGHT.ordinal());
+        Type resultType = node.getResultType();
+        if (left == null || right == null) {
+            return EMPTY_BYTE_ARRAY;
+        }
+        boolean needTypeConversion = false;
+        boolean convertRightArg = false;
+        Type leftType = left.getResultType();
+        Type rightType = right.getResultType();
+        if (!leftType.equals(rightType) && leftType instanceof BuiltInType
+                && rightType instanceof BuiltInType
+                && kind != OperatorKind.SAR && kind != OperatorKind.SHL
+                && kind != OperatorKind.SHR && kind != OperatorKind.ASSIGN
+                && kind != OperatorKind.AND && kind != OperatorKind.OR) {
+            needTypeConversion = true;
+            BuiltInType leftBuiltIn = (BuiltInType) leftType;
+            BuiltInType rightBuiltIn = (BuiltInType) rightType;
+            convertRightArg = leftBuiltIn.isMoreCapaciousThan(rightBuiltIn);
+        }
+        Type mostCapacious = convertRightArg ? leftType : rightType;
+        if (!rightType.equals(TypeList.INT)
+                && (kind == OperatorKind.SHL || kind == OperatorKind.SHR
+                || kind == OperatorKind.SAR)) {
+            left.accept(this);
+            right.accept(this);
+            convertTopType(rightType, TypeList.INT);
+        } else if (kind != OperatorKind.ASSIGN && kind != OperatorKind.OR
+                && kind != OperatorKind.AND && kind != OperatorKind.COMPOUND_ADD
+                && kind != OperatorKind.COMPOUND_AND && kind != OperatorKind.COMPOUND_DIV
+                && kind != OperatorKind.COMPOUND_MOD && kind != OperatorKind.COMPOUND_MUL
+                && kind != OperatorKind.COMPOUND_OR && kind != OperatorKind.COMPOUND_SAR
+                && kind != OperatorKind.COMPOUND_SHL && kind != OperatorKind.COMPOUND_SHR
+                && kind != OperatorKind.COMPOUND_SUB && kind != OperatorKind.COMPOUND_XOR
+                && kind != OperatorKind.STRADD) {
+                /* "assign", "and", "or", concat and all compound operators are
+                    handled differently and shouldn't just place left and right
+                    operands on stack */
+            left.accept(this);
+            if (needTypeConversion && !convertRightArg) {
+                convertTopType(leftType, rightType);
+            }
+            right.accept(this);
+            if (needTypeConversion && convertRightArg) {
+                convertTopType(rightType, leftType);
+            }
+        }
+        switch (kind) {
+            case ASSIGN:
+                VariableInfo vi = ((VariableBase)left).getVariableInfo();
+                Type varType = vi.type;
+                if (left instanceof LocalVariable) {
+                    right.accept(this);
+                    convertTopType(rightType, leftType);
+                    int index = locals.getLocalIndex(vi);
+                    if (varType.equals(TypeList.LONG)) {
+                        currentMV.visitVarInsn(Opcodes.LSTORE, index);
+                        currentMV.visitVarInsn(Opcodes.LLOAD, index);
+                    } else if (varType.equals(TypeList.DOUBLE)) {
+                        currentMV.visitVarInsn(Opcodes.DSTORE, index);
+                        currentMV.visitVarInsn(Opcodes.DLOAD, index);
+                    } else if (varType.equals(TypeList.FLOAT)) {
+                        currentMV.visitVarInsn(Opcodes.FSTORE, index);
+                        currentMV.visitVarInsn(Opcodes.FLOAD, index);
+                    } else if (varType instanceof TypeKlass) {
+                        currentMV.visitVarInsn(Opcodes.ASTORE, index);
+                        currentMV.visitVarInsn(Opcodes.ALOAD, index);
+                    } else {
+                        currentMV.visitVarInsn(Opcodes.ISTORE, index);
+                        currentMV.visitVarInsn(Opcodes.ILOAD, index);
+                    }
+                } else if (left instanceof StaticMemberVariable) {
+                    right.accept(this);
+                    convertTopType(rightType, leftType);
+                    String typeDescr = new String(vi.type.accept(this));
+                    String ownerName = asInternalName(vi.getOwner().getName());
+                    currentMV.visitFieldInsn(Opcodes.PUTSTATIC, ownerName,
+                            vi.name, typeDescr);
+                    currentMV.visitFieldInsn(Opcodes.GETSTATIC, ownerName,
+                            vi.name, typeDescr);
+                } else if (left instanceof NonStaticMemberVariable) {
+                    // put object to stack for putfield
+                    left.getChild(0).accept(this);
+                    // put object to stack for getfield
+                    currentMV.visitInsn(Opcodes.DUP);
+                    right.accept(this);
+                    convertTopType(rightType, leftType);
+                    String typeDescr = new String(vi.type.accept(this));
+                    String ownerName = asInternalName(vi.getOwner().getName());
+                    currentMV.visitFieldInsn(Opcodes.PUTFIELD, ownerName,
+                            vi.name, typeDescr);
+                    currentMV.visitFieldInsn(Opcodes.GETFIELD, ownerName,
+                            vi.name, typeDescr);
+                } else {
+                    throw new IllegalArgumentException("illegal left operand : "
+                            + left + "("+left.getClass()+")");
+                }
+                break;
+            case OR:
+                generateBasicLogicOperator(Opcodes.IFNE, false, left, right);
+                break;
+            case AND:
+                generateBasicLogicOperator(Opcodes.IFEQ, true,  left, right);
+                break;
+            case BIT_OR:
+                if (mostCapacious.equals(TypeList.LONG)) {
+                    currentMV.visitInsn(Opcodes.LOR);
+                } else {
+                    currentMV.visitInsn(Opcodes.IOR);
+                }
+                break;
+            case BIT_XOR:
+                if (mostCapacious.equals(TypeList.LONG)) {
+                    currentMV.visitInsn(Opcodes.LXOR);
+                } else {
+                    currentMV.visitInsn(Opcodes.IXOR);
+                }
+                break;
+            case BIT_AND:
+                if (mostCapacious.equals(TypeList.LONG)) {
+                    currentMV.visitInsn(Opcodes.LAND);
+                } else {
+                    currentMV.visitInsn(Opcodes.IAND);
+                }
+                break;
+            case EQ:
+                generateCmpBasedCode(mostCapacious, Opcodes.IFEQ, Opcodes.IF_ICMPEQ);
+                break;
+            case NE:
+                generateCmpBasedCode(mostCapacious, Opcodes.IFNE, Opcodes.IF_ICMPNE);
+                break;
+            case GT:
+                generateCmpBasedCode(mostCapacious, Opcodes.IFGT, Opcodes.IF_ICMPGT);
+                break;
+            case LT:
+                generateCmpBasedCode(mostCapacious, Opcodes.IFLT, Opcodes.IF_ICMPLT);
+                break;
+            case GE:
+                generateCmpBasedCode(mostCapacious, Opcodes.IFGE, Opcodes.IF_ICMPGE);
+                break;
+            case LE:
+                generateCmpBasedCode(mostCapacious, Opcodes.IFLE, Opcodes.IF_ICMPLE);
+                break;
+            case SHR:
+                if (leftType.equals(TypeList.LONG)) {
+                    currentMV.visitInsn(Opcodes.LSHR);
+                } else {
+                    currentMV.visitInsn(Opcodes.ISHR);
+                }
+                break;
+            case SHL:
+                if (leftType.equals(TypeList.LONG)) {
+                    currentMV.visitInsn(Opcodes.LSHL);
+                } else {
+                    currentMV.visitInsn(Opcodes.ISHL);
+                }
+                break;
+            case SAR:
+                if (leftType.equals(TypeList.LONG)) {
+                    currentMV.visitInsn(Opcodes.LUSHR);
+                } else {
+                    currentMV.visitInsn(Opcodes.IUSHR);
+                }
+                break;
+            case STRADD:
+                // we use String::valueOf to change null to "null"
+                left.accept(this);
+                currentMV.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/String", "valueOf",
+                        "(Ljava/lang/Object;)Ljava/lang/String;", false /* not interface */);
+                right.accept(this);
+                currentMV.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/String", "valueOf",
+                        "(Ljava/lang/Object;)Ljava/lang/String;", false /* not interface */);
+                currentMV.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/String", "concat",
+                        "(Ljava/lang/String;)Ljava/lang/String;", false /* not interface */);
+                break;
+            case ADD:
+                if (mostCapacious.equals(TypeList.LONG)) {
+                    currentMV.visitInsn(Opcodes.LADD);
+                } else if (mostCapacious.equals(TypeList.DOUBLE)) {
+                    currentMV.visitInsn(Opcodes.DADD);
+                } else if (mostCapacious.equals(TypeList.FLOAT)) {
+                    currentMV.visitInsn(Opcodes.FADD);
+                } else {
+                    currentMV.visitInsn(Opcodes.IADD);
+                }
+                break;
+            case SUB:
+                if (mostCapacious.equals(TypeList.LONG)) {
+                    currentMV.visitInsn(Opcodes.LSUB);
+                } else if (mostCapacious.equals(TypeList.DOUBLE)) {
+                    currentMV.visitInsn(Opcodes.DSUB);
+                } else if (mostCapacious.equals(TypeList.FLOAT)) {
+                    currentMV.visitInsn(Opcodes.FSUB);
+                } else {
+                    currentMV.visitInsn(Opcodes.ISUB);
+                }
+                break;
+            case MUL:
+                if (mostCapacious.equals(TypeList.LONG)) {
+                    currentMV.visitInsn(Opcodes.LMUL);
+                } else if (mostCapacious.equals(TypeList.DOUBLE)) {
+                    currentMV.visitInsn(Opcodes.DMUL);
+                } else if (mostCapacious.equals(TypeList.FLOAT)) {
+                    currentMV.visitInsn(Opcodes.FMUL);
+                } else {
+                    currentMV.visitInsn(Opcodes.IMUL);
+                }
+                break;
+            case DIV:
+                if (mostCapacious.equals(TypeList.LONG)) {
+                    currentMV.visitInsn(Opcodes.LDIV);
+                } else if (mostCapacious.equals(TypeList.DOUBLE)) {
+                    currentMV.visitInsn(Opcodes.DDIV);
+                } else if (mostCapacious.equals(TypeList.FLOAT)) {
+                    currentMV.visitInsn(Opcodes.FDIV);
+                } else {
+                    currentMV.visitInsn(Opcodes.IDIV);
+                }
+                break;
+            case MOD:
+                if (mostCapacious.equals(TypeList.LONG)) {
+                    currentMV.visitInsn(Opcodes.LREM);
+                } else if (mostCapacious.equals(TypeList.DOUBLE)) {
+                    currentMV.visitInsn(Opcodes.DREM);
+                } else if (mostCapacious.equals(TypeList.FLOAT)) {
+                    currentMV.visitInsn(Opcodes.FREM);
+                } else {
+                    currentMV.visitInsn(Opcodes.IREM);
+                }
+                break;
+            case COMPOUND_ADD:
+                lowerCompoundBinaryOperator("java.lang.String".equals(leftType.getName())
+                        ? OperatorKind.STRADD : OperatorKind.ADD, node);
+                break;
+            case COMPOUND_SUB:
+                lowerCompoundBinaryOperator(OperatorKind.SUB, node);
+                break;
+            case COMPOUND_MUL:
+                lowerCompoundBinaryOperator(OperatorKind.MUL, node);
+                break;
+            case COMPOUND_DIV:
+                lowerCompoundBinaryOperator(OperatorKind.DIV, node);
+                break;
+            case COMPOUND_MOD:
+                lowerCompoundBinaryOperator(OperatorKind.MOD, node);
+                break;
+            case COMPOUND_AND:
+                lowerCompoundBinaryOperator(leftType.equals(TypeList.BOOLEAN)
+                        ? OperatorKind.AND : OperatorKind.BIT_AND, node);
+                break;
+            case COMPOUND_OR:
+                lowerCompoundBinaryOperator(leftType.equals(TypeList.BOOLEAN)
+                        ? OperatorKind.OR : OperatorKind.BIT_OR, node);
+                break;
+            case COMPOUND_XOR:
+                lowerCompoundBinaryOperator(OperatorKind.BIT_XOR, node);
+                break;
+            case COMPOUND_SHR:
+                lowerCompoundBinaryOperator(OperatorKind.SHR, node);
+                break;
+            case COMPOUND_SHL:
+                lowerCompoundBinaryOperator(OperatorKind.SHL, node);
+                break;
+            case COMPOUND_SAR:
+                lowerCompoundBinaryOperator(OperatorKind.SAR, node);
+                break;
+            default:
+                throw new Error("Unsupported binary operator");
+        }
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    private static int tmpObject;
+    private void lowerCompoundBinaryOperator(OperatorKind kind, IRNode node) {
+        IRNode left = node.getChild(Operator.Order.LEFT.ordinal());
+        IRNode right = node.getChild(Operator.Order.RIGHT.ordinal());
+
+        if (left instanceof NonStaticMemberVariable) {
+            NonStaticMemberVariable var = (NonStaticMemberVariable) left;
+            IRNode holder = var.getChild(0);
+            Type type = holder.getResultType();
+            VariableInfo tmpInfo = new VariableInfo("tmpObject_" + tmpObject++,
+                    currentClass, type, VariableInfo.LOCAL);
+            new Statement(new VariableInitialization(tmpInfo, holder), true).accept(this);
+            left = new NonStaticMemberVariable(new LocalVariable(tmpInfo), var.getVariableInfo());
+        }
+        Type leftType = left.getResultType();
+        Type rightType = right.getResultType();
+        Type resultType = leftType;
+        if (leftType instanceof BuiltInType && rightType instanceof BuiltInType) {
+            if (kind != OperatorKind.SHL && kind != OperatorKind.SHR && kind != OperatorKind.SAR
+                    && ((BuiltInType) rightType).isMoreCapaciousThan((BuiltInType) leftType)) {
+                resultType = rightType;
+            }
+        }
+        IRNode result = new CastOperator(leftType,
+                new BinaryOperator(kind, resultType, left, right));
+        new BinaryOperator(OperatorKind.ASSIGN, leftType, left, result).accept(this);
+    }
+
+    private void generateBasicLogicOperator(int ifOpcode, boolean retTrueFirst, IRNode left,
+            IRNode right) {
+        Label secondCase = new Label();
+        Label endLabel = new Label();
+        left.accept(this);
+        currentMV.visitJumpInsn(ifOpcode, secondCase);
+        right.accept(this);
+        currentMV.visitJumpInsn(ifOpcode, secondCase);
+        currentMV.visitInsn(retTrueFirst ? Opcodes.ICONST_1 : Opcodes.ICONST_0);
+        currentMV.visitJumpInsn(Opcodes.GOTO, endLabel);
+        currentMV.visitLabel(secondCase);
+        currentMV.visitInsn(retTrueFirst ? Opcodes.ICONST_0 : Opcodes.ICONST_1);
+        currentMV.visitLabel(endLabel);
+    }
+
+    private void generateCmpBasedCode(Type type, int nonIntOpcode, int intOpcode) {
+        boolean useNonIntOpcode = false;
+        if (type.equals(TypeList.LONG) || type.equals(TypeList.FLOAT)
+                || type.equals(TypeList.DOUBLE)) {
+            if (type.equals(TypeList.LONG)) {
+                currentMV.visitInsn(Opcodes.LCMP);
+            } else if (type.equals(TypeList.FLOAT)) {
+                currentMV.visitInsn(Opcodes.FCMPL);
+            } else {
+                currentMV.visitInsn(Opcodes.DCMPL);
+            }
+            useNonIntOpcode = true;
+        }
+        int opcodeToUse;
+        if (!useNonIntOpcode) {
+            if (type instanceof TypeKlass) {
+                if (intOpcode == Opcodes.IF_ICMPEQ) {
+                    opcodeToUse = Opcodes.IF_ACMPEQ;
+                } else if (intOpcode == Opcodes.IF_ICMPNE) {
+                    opcodeToUse = Opcodes.IF_ACMPNE;
+                } else {
+                    throw new Error("Can't compare references");
+                }
+            } else {
+                opcodeToUse = intOpcode;
+            }
+        } else {
+            opcodeToUse = nonIntOpcode;
+        }
+        Label retTrue = new Label();
+        Label end = new Label();
+        currentMV.visitJumpInsn(opcodeToUse, retTrue);
+        currentMV.visitInsn(Opcodes.ICONST_0);
+        currentMV.visitJumpInsn(Opcodes.GOTO, end);
+        currentMV.visitLabel(retTrue);
+        currentMV.visitInsn(Opcodes.ICONST_1);
+        currentMV.visitLabel(end);
+    }
+
+    /*
+     * Converts top-stack element from one builtin type to another
+     */
+    private void convertTopType(Type from, Type to) {
+        if (!(from instanceof BuiltInType) || !(to instanceof BuiltInType) || from.equals(to)) {
+            return; // skip
+        }
+        boolean castedToInt = false;
+        if (from.equals(TypeList.FLOAT)) {
+            if (to.equals(TypeList.DOUBLE)) {
+                currentMV.visitInsn(Opcodes.F2D);
+            } else if (to.equals(TypeList.LONG)) {
+                currentMV.visitInsn(Opcodes.F2L);
+            } else {
+                currentMV.visitInsn(Opcodes.F2I);
+                castedToInt = true;
+            }
+        } else if (from.equals(TypeList.DOUBLE)) {
+            if (to.equals(TypeList.FLOAT)) {
+                currentMV.visitInsn(Opcodes.D2F);
+            } else if (to.equals(TypeList.LONG)) {
+                currentMV.visitInsn(Opcodes.D2L);
+            } else {
+                currentMV.visitInsn(Opcodes.D2I);
+                castedToInt = true;
+            }
+        } else if (from.equals(TypeList.LONG)) {
+            if (to.equals(TypeList.DOUBLE)) {
+                currentMV.visitInsn(Opcodes.L2D);
+            } else if (to.equals(TypeList.FLOAT)) {
+                currentMV.visitInsn(Opcodes.L2F);
+            } else {
+                currentMV.visitInsn(Opcodes.L2I);
+                castedToInt = true;
+            }
+        } else {
+            if (to.equals(TypeList.BYTE)) {
+                currentMV.visitInsn(Opcodes.I2B);
+            } else if (to.equals(TypeList.CHAR)) {
+                currentMV.visitInsn(Opcodes.I2C);
+            } else if (to.equals(TypeList.SHORT)) {
+                currentMV.visitInsn(Opcodes.I2S);
+            } else if (to.equals(TypeList.LONG)) {
+                currentMV.visitInsn(Opcodes.I2L);
+            } else if (to.equals(TypeList.FLOAT)) {
+                currentMV.visitInsn(Opcodes.I2F);
+            } else if (to.equals(TypeList.DOUBLE)) {
+                currentMV.visitInsn(Opcodes.I2D);
+            }
+        }
+        if (castedToInt) {
+            if (to.equals(TypeList.BYTE)) {
+                currentMV.visitInsn(Opcodes.I2B);
+            } else if (to.equals(TypeList.CHAR)) {
+                currentMV.visitInsn(Opcodes.I2C);
+            } else if (to.equals(TypeList.SHORT)) {
+                currentMV.visitInsn(Opcodes.I2S);
+            }
+        }
+    }
+
+    @Override
+    public byte[] visit(Block node) {
+        return iterateBlock(node);
+    }
+
+    @Override
+    public byte[] visit(Break node) {
+        Label label = endLabels.peek();
+        if (label != null) {
+            currentMV.visitJumpInsn(Opcodes.GOTO, label);
+        }
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(CastOperator node) {
+        IRNode expression = node.getChild(0);
+        expression.accept(this);
+        Type to = node.getResultType();
+        Type from = expression.getResultType();
+        // TODO boxing/unboxing
+        if (!TypeList.isBuiltIn(to) || !TypeList.isBuiltIn(from)) {
+            // class cast
+            currentMV.visitTypeInsn(Opcodes.CHECKCAST, asInternalName(to.getName()));
+        } else {
+            convertTopType(from, to);
+        }
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(CatchBlock node) {
+        Type type = node.throwables.get(0);
+        VariableInfo exInfo = new VariableInfo("ex", currentClass,
+                type, VariableInfo.LOCAL);
+        int index = locals.getLocalIndex(exInfo);
+        currentMV.visitVarInsn(Opcodes.ASTORE, index);
+        node.getChild(0).accept(this);
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(ClassDefinitionBlock node) {
+        return iterateBlock(node);
+    }
+
+    @Override
+    public byte[] visit(ConstructorDefinition node) {
+        FunctionInfo info = node.getFunctionInfo();
+        String ownerName = node.getOwner().getName();
+        TypeKlass parentClass = currentClass.getParent();
+        ContextDependedClassWriter cw = classWriters.get(ownerName);
+
+        String descriptor = getDescriptor(node, 1, "V");
+        currentMV = cw.visitMethod(asAccessFlags(info), "<init>", descriptor, null, null);
+        currentMV.visitVarInsn(Opcodes.ALOAD, 0);
+        currentMV.visitMethodInsn(Opcodes.INVOKESPECIAL,
+                parentClass != null ? asInternalName(parentClass.getName()) : "java/lang/Object",
+                "<init>", "()V", false);
+        locals.initConstructorArguments(node.getOwner(), info);
+        // TODO: add datamemebers as child to all ctors
+        generateDataMembers(node.getParent().getParent().getChild(Klass.KlassPart.DATA_MEMBERS.ordinal()));
+        IRNode body = node.getChild(0);
+        body.accept(this);
+        currentMV.visitInsn(Opcodes.RETURN);
+        currentMV.visitMaxs(0, 0);
+        currentMV.visitEnd();
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    private void generateDataMembers(IRNode node) {
+        // TODO shouldn't we skip declaration?
+        if (node != null) {
+            node.accept(this);
+        }
+    }
+
+    @Override
+    public byte[] visit(ConstructorDefinitionBlock node) {
+        return iterateBlock(node);
+    }
+
+    @Override
+    public byte[] visit(Continue node) {
+        Label label = beginLabels.peek();
+        if (label != null) {
+            currentMV.visitJumpInsn(Opcodes.GOTO, label);
+        }
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(CounterInitializer node) {
+        visitLocalVar(node);
+        emitPop(node.getVariableInfo().type);
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    private byte[] visitLocalVar(Initialization node) {
+        VariableInfo vi = node.getVariableInfo();
+        int index = locals.addLocal(vi);
+        int store;
+        node.getChild(0).accept(this); // place initialization expression on stack
+        emitDup(vi.type);
+        if (vi.type instanceof TypeKlass) {
+            store = Opcodes.ASTORE;
+        } else if (vi.type.equals(TypeList.DOUBLE)) {
+            store = Opcodes.DSTORE;
+        } else if (vi.type.equals(TypeList.LONG)) {
+            store = Opcodes.LSTORE;
+        } else if (vi.type.equals(TypeList.FLOAT)) {
+            store = Opcodes.FSTORE;
+        } else {
+            store = Opcodes.ISTORE;
+        }
+        currentMV.visitVarInsn(store, index);
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(CounterManipulator node) {
+        return node.getChild(0).accept(this);
+    }
+
+    @Override
+    public byte[] visit(Declaration node) {
+        IRNode child = node.getChild(0);
+        child.accept(this);
+        if (child instanceof Initialization) {
+            emitPop(((Initialization) child).getVariableInfo().type);
+        }
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(DoWhile node) {
+        Loop loop = node.getLoop();
+        loop.initialization.accept(this);
+        node.getChild(DoWhile.DoWhilePart.HEADER.ordinal()).accept(this);
+        Label currentLoopBegin = new Label();
+        beginLabels.push(currentLoopBegin);
+        Label currentLoopEnd = new Label();
+        endLabels.push(currentLoopEnd);
+        currentMV.visitLabel(currentLoopBegin);
+        node.getChild(DoWhile.DoWhilePart.BODY1.ordinal()).accept(this);
+        loop.manipulator.accept(this);
+        node.getChild(DoWhile.DoWhilePart.BODY2.ordinal()).accept(this);
+        loop.condition.accept(this);
+        assert loop.condition.getResultType() == TypeList.BOOLEAN;
+        currentMV.visitJumpInsn(Opcodes.IFEQ, currentLoopBegin);
+        currentMV.visitLabel(currentLoopEnd);
+        Label a = beginLabels.pop();
+        assert currentLoopBegin == a;
+        a = endLabels.pop();
+        assert currentLoopEnd == a;
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(For node) {
+        Loop loop = node.getLoop();
+        loop.initialization.accept(this);
+        node.getChild(For.ForPart.HEADER.ordinal()).accept(this);
+        node.getChild(For.ForPart.STATEMENT1.ordinal()).accept(this);
+        Label currentLoopBegin = new Label();
+        beginLabels.push(currentLoopBegin);
+        currentMV.visitLabel(currentLoopBegin);
+        loop.condition.accept(this);
+        assert loop.condition.getResultType() == TypeList.BOOLEAN;
+        Label currentLoopEnd = new Label();
+        endLabels.push(currentLoopEnd);
+        currentMV.visitJumpInsn(Opcodes.IFEQ, currentLoopEnd);
+        node.getChild(For.ForPart.STATEMENT2.ordinal()).accept(this);
+        node.getChild(For.ForPart.BODY1.ordinal()).accept(this);
+        loop.manipulator.accept(this);
+        node.getChild(For.ForPart.BODY2.ordinal()).accept(this);
+        node.getChild(For.ForPart.BODY3.ordinal()).accept(this);
+        currentMV.visitJumpInsn(Opcodes.GOTO, currentLoopBegin);
+        currentMV.visitLabel(currentLoopEnd);
+        Label a = beginLabels.pop();
+        assert currentLoopBegin == a;
+        a = endLabels.pop();
+        assert currentLoopEnd == a;
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(Function node) {
+        FunctionInfo info = node.getValue();
+        boolean needInstance = !info.isStatic() && !info.isConstructor();
+        if (needInstance) {
+            node.getChild(0).accept(this); // placing instance on stack
+        }
+        // call itself with specific invoke*
+        String signature = info.argTypes.stream()
+                .skip(!needInstance ? 0 : 1)
+                .map(vi -> new String(vi.type.accept(this)))
+                .collect(Collectors.joining("", "(", ")"))
+                + (info.isConstructor() ? "V" : new String(node.getResultType().accept(this)));
+        int invokeCode = Opcodes.INVOKEVIRTUAL;
+        if (info.isStatic()) {
+            invokeCode = Opcodes.INVOKESTATIC;
+        } else if (info.isConstructor() || info.isPrivate()) {
+            // TODO : superclass method invocation?
+            invokeCode = Opcodes.INVOKESPECIAL;
+        } else {
+            if (info.owner.isInterface()) {
+                invokeCode = Opcodes.INVOKEINTERFACE;
+            }
+        }
+        if (info.isConstructor()) {
+            currentMV.visitTypeInsn(Opcodes.NEW, asInternalName(info.owner.getName()));
+            currentMV.visitInsn(Opcodes.DUP);
+        }
+        // calculating parameters
+        node.getChildren().stream()
+                .skip(!needInstance ? 0 : 1)
+                .forEachOrdered(c -> c.accept(this));
+        currentMV.visitMethodInsn(invokeCode, asInternalName(info.owner.getName()),
+                info.isConstructor() ? "<init>" : info.name, signature,
+                invokeCode == Opcodes.INVOKEINTERFACE);
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(FunctionDeclaration node) {
+        FunctionInfo info = node.getFunctionInfo();
+        String ownerName = node.getOwner().getName();
+        ContextDependedClassWriter cw = classWriters.get(ownerName);
+        String returnType = new String(info.type.accept(this));
+
+        String descriptor = getDescriptor(node, 0, returnType);
+        currentMV = cw.visitMethod(asAccessFlags(info) + Opcodes.ACC_ABSTRACT,
+                info.name, descriptor, null, null);
+        currentMV.visitEnd();
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(FunctionDeclarationBlock node) {
+        return iterateBlock(node);
+    }
+
+    @Override
+    public byte[] visit(FunctionDefinition node) {
+        FunctionInfo info = node.getFunctionInfo();
+        String ownerName = node.getOwner().getName();
+        ContextDependedClassWriter cw = classWriters.get(ownerName);
+        String returnType = new String(info.type.accept(this));
+
+        String descriptor = getDescriptor(node, 2, returnType);
+        currentMV = cw.visitMethod(asAccessFlags(info), info.name, descriptor, null, null);
+        locals.initFunctionArguments(info);
+        IRNode body = node.getChild(0);
+        body.accept(this);
+        IRNode ret = node.getChild(1);
+        ret.accept(this);
+        currentMV.visitMaxs(0, 0);
+        currentMV.visitEnd();
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(FunctionDefinitionBlock node) {
+        return iterateBlock(node);
+    }
+
+    @Override
+    public byte[] visit(FunctionRedefinition node) {
+        FunctionInfo info = node.getFunctionInfo();
+        String ownerName = node.getOwner().getName();
+        ContextDependedClassWriter cw = classWriters.get(ownerName);
+        String returnType = new String(info.type.accept(this));
+        String descriptor = getDescriptor(node, 2, returnType);
+        currentMV = cw.visitMethod(asAccessFlags(info), info.name, descriptor, null, null);
+        locals.initFunctionArguments(info);
+        IRNode body = node.getChild(0);
+        body.accept(this);
+        IRNode ret = node.getChild(1);
+        ret.accept(this);
+        currentMV.visitMaxs(0, 0);
+        currentMV.visitEnd();
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(FunctionRedefinitionBlock node) {
+        return iterateBlock(node);
+    }
+
+    @Override
+    public byte[] visit(If node) {
+        IRNode conditionBlock = node.getChild(If.IfPart.CONDITION.ordinal());
+        // get the condition type to emit correct if
+        conditionBlock.accept(this);
+        generateIf(Opcodes.IFEQ, node.getChild(If.IfPart.THEN.ordinal()),
+                node.getChild(If.IfPart.ELSE.ordinal()));
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    /*
+     * Generates if block with then and else blocks for the given IF opcode
+     */
+    private void generateIf(int ifOpcode, IRNode thenBlock, IRNode elseBlock) {
+        Label elseLabel = new Label();
+        // if the opposite condition is met then go to the else statement
+        currentMV.visitJumpInsn(ifOpcode, elseLabel);
+        // write THEN block
+        thenBlock.accept(this);
+        if (elseBlock != null) {
+            // goto the end after THEN
+            Label endLabel = new Label();
+            currentMV.visitJumpInsn(Opcodes.GOTO, endLabel);
+            // ELSE block
+            currentMV.visitLabel(elseLabel);
+            elseBlock.accept(this);
+            currentMV.visitLabel(endLabel);
+        } else {
+            currentMV.visitLabel(elseLabel);
+        }
+    }
+
+    @Override
+    public byte[] visit(Initialization node) {
+        VariableInfo vi = node.getVariableInfo();
+        if (vi.isLocal()) {
+            return visitLocalVar(node);
+        }
+        String ownerName = vi.getOwner().getName();
+        ContextDependedClassWriter cw = classWriters.get(ownerName);
+        String typeName = new String(vi.type.accept(this));
+        // constant value used only for final static fields
+        FieldVisitor fw = cw.visitField(asAccessFlags(vi), vi.name,
+                typeName,
+                null /* Generic */,
+                null /* Constant value */);
+        fw.visitEnd(); // doesn't need visitAnnotation and visitAttribute
+        if (vi.isStatic()) {
+            node.getChild(0).accept(this); // put value to stack
+            emitDup(vi.type);
+            currentMV.visitFieldInsn(Opcodes.PUTSTATIC,
+                    asInternalName(vi.getOwner().getName()),
+                    vi.name,
+                    new String(vi.type.accept(this)));
+        } else {
+            // TODO : can it be another object?
+            currentMV.visitVarInsn(Opcodes.ALOAD, 0); // put this to stack
+            node.getChild(0).accept(this); // put value to stack
+            emitDupX1(vi.type);
+            currentMV.visitFieldInsn(Opcodes.PUTFIELD,
+                    asInternalName(vi.getOwner().getName()),
+                    vi.name,
+                    new String(vi.type.accept(this)));
+        }
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    private void emitDupX1(Type type) {
+        if (TypeList.DOUBLE.equals(type) || TypeList.LONG.equals(type)) {
+            currentMV.visitInsn(Opcodes.DUP2_X1);
+        } else if (!TypeList.VOID.equals(type)){
+            currentMV.visitInsn(Opcodes.DUP_X1);
+        }
+    }
+
+    private void emitDup(Type type) {
+        if (TypeList.DOUBLE.equals(type) || TypeList.LONG.equals(type)) {
+            currentMV.visitInsn(Opcodes.DUP2);
+        } else if (!TypeList.VOID.equals(type)){
+            currentMV.visitInsn(Opcodes.DUP);
+        }
+    }
+
+    @Override
+    public byte[] visit(Interface node) {
+        String name = node.getName();
+        ContextDependedClassWriter classWriter = new ContextDependedClassWriter(context, CLASS_WRITER_FLAGS);
+        classWriters.put(name, classWriter);
+        TypeKlass parentKlass = node.getParentKlass();
+        classWriter.visit(Opcodes.V1_8,
+                          Opcodes.ACC_ABSTRACT | Opcodes.ACC_INTERFACE,
+                          asInternalName(name),
+                          null /* Generic */,
+                          "java/lang/Object",
+                          parentKlass == null ? null : new String[] {
+                                  asInternalName(parentKlass.getName())});
+        if (node.getChildren().size() > 0) {
+            node.getChild(0).accept(this);
+        }
+
+        classWriter.visitEnd();
+        byte[] byteCode = classWriter.toByteArray();
+        context.register(name, byteCode);
+        return byteCode;
+    }
+
+    @Override
+    public byte[] visit(Klass node) {
+        String name = node.getName();
+        TypeKlass prevClass = currentClass;
+        currentClass = node.getThisKlass();
+        ContextDependedClassWriter classWriter = new ContextDependedClassWriter(context, CLASS_WRITER_FLAGS);
+        classWriters.put(name, classWriter);
+        TypeKlass thisClass = node.getThisKlass();
+        TypeKlass parentClass = node.getParentKlass();
+        String[] interfaces = node.getInterfaces().stream()
+                .map(IRNode::getName)
+                .map(ByteCodeVisitor::asInternalName)
+                .toArray(String[]::new);
+        classWriter.visit(Opcodes.V1_8, asAccessFlags(thisClass),
+                asInternalName(name),
+                null /* Generic */,
+                parentClass != null ? asInternalName(parentClass.getName()) : "java/lang/Object",
+                interfaces);
+
+        IRNode constructors = node.getChild(Klass.KlassPart.CONSTRUCTORS.ordinal());
+        if (constructors != null) {
+            constructors.accept(this);
+        } else {
+            // generate default ctor
+            currentMV = classWriter.visitMethod(Opcodes.ACC_PUBLIC, "<init>", "()V", null, null);
+            currentMV.visitVarInsn(Opcodes.ALOAD, 0);
+            currentMV.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
+            locals.clear();
+            locals.addLocal(new VariableInfo("this", thisClass, thisClass, VariableInfo.NONE));
+            generateDataMembers(node.getChild(Klass.KlassPart.DATA_MEMBERS.ordinal()));
+            currentMV.visitInsn(Opcodes.RETURN);
+            currentMV.visitMaxs(0, 0);
+            currentMV.visitEnd();
+        }
+        IRNode redefinedFunctions = node.getChild(Klass.KlassPart.REDEFINED_FUNCTIONS.ordinal());
+        if (redefinedFunctions != null) {
+            redefinedFunctions.accept(this);
+        }
+        IRNode overridenFunctions = node.getChild(Klass.KlassPart.OVERRIDEN_FUNCTIONS.ordinal());
+        if (overridenFunctions != null) {
+            overridenFunctions.accept(this);
+        }
+        IRNode memberFunctions = node.getChild(Klass.KlassPart.MEMBER_FUNCTIONS.ordinal());
+        if (memberFunctions != null) {
+            memberFunctions.accept(this);
+        }
+        IRNode memberFunctionDecls = node.getChild(Klass.KlassPart.MEMBER_FUNCTIONS_DECLARATIONS.ordinal());
+        if (memberFunctionDecls != null) {
+            memberFunctionDecls.accept(this);
+        }
+        IRNode printVariables = node.getChild(Klass.KlassPart.PRINT_VARIABLES.ordinal());
+        if (printVariables != null) {
+            printVariables.accept(this);
+        }
+        classWriter.visitEnd();
+        byte[] byteCode = classWriter.toByteArray();
+        context.register(name, byteCode);
+        currentClass = prevClass;
+        return byteCode;
+    }
+
+    private void visitLiteral(boolean value) {
+        double chance = PseudoRandom.random();
+        if (chance < CONSTANT_INST_CHANCE) {
+            currentMV.visitInsn(value ? Opcodes.ICONST_1 : Opcodes.ICONST_0);
+        } else {
+            currentMV.visitIntInsn(Opcodes.BIPUSH, value ? 1 : 0);
+        }
+    }
+
+    private void visitLiteral(byte value) {
+        double chance = PseudoRandom.random();
+        if (chance < CONSTANT_INST_CHANCE && value > -2 && value < 6) {
+            currentMV.visitInsn(Opcodes.ICONST_0 + value);
+        } else {
+            currentMV.visitIntInsn(Opcodes.BIPUSH, value);
+        }
+    }
+
+    private void visitLiteral(short value) {
+        double chance = PseudoRandom.random();
+        if (chance < CONSTANT_INST_CHANCE && value > -2 && value < 6) {
+            currentMV.visitInsn(Opcodes.ICONST_0 + value);
+        } else {
+            currentMV.visitIntInsn(Opcodes.SIPUSH, value);
+        }
+    }
+
+    private void visitLiteral(char value) {
+        double chance = PseudoRandom.random();
+        if (chance < CONSTANT_INST_CHANCE && value < 6) {
+            currentMV.visitInsn(Opcodes.ICONST_0 + value);
+        } else {
+            // TODO : check for widechar/unicode
+            currentMV.visitIntInsn(Opcodes.BIPUSH, value);
+        }
+    }
+
+    private void visitLiteral(int value) {
+        double chance = PseudoRandom.random();
+        if (chance < CONSTANT_INST_CHANCE && value > -2 && value < 6) {
+            currentMV.visitInsn(Opcodes.ICONST_0 + value);
+        } else {
+            currentMV.visitLdcInsn(value);
+        }
+    }
+
+    private void visitLiteral(long value) {
+        double chance = PseudoRandom.random();
+        if (chance < CONSTANT_INST_CHANCE && value > -1 && value < 2) {
+            currentMV.visitInsn(Opcodes.LCONST_0 + (int)value);
+        } else {
+            currentMV.visitLdcInsn(value);
+        }
+    }
+
+    private void visitLiteral(float value) {
+        double chance = PseudoRandom.random();
+        if (chance < CONSTANT_INST_CHANCE && (value == 0.0f || value == 1.0f || value == 2.0f)) {
+            currentMV.visitInsn(Opcodes.FCONST_0 + (int)value);
+        } else {
+            currentMV.visitLdcInsn(value);
+        }
+    }
+
+    private void visitLiteral(double value) {
+        double chance = PseudoRandom.random();
+        if (chance < CONSTANT_INST_CHANCE && (value == 0.0 || value == 1.0)) {
+            currentMV.visitInsn(Opcodes.DCONST_0 + (int)value);
+        } else {
+            currentMV.visitLdcInsn(value);
+        }
+    }
+
+    @Override
+    public byte[] visit(Literal node) {
+        /*
+            ICONST_n (−1 ≤ n ≤ 5) <==> BIPUSH <n>
+            LCONST_n (0 ≤ n ≤ 1)
+            FCONST_n (0 ≤ n ≤ 2)
+            DCONST_n (0 ≤ n ≤ 1)
+            ACONST_NULL
+
+            BIPUSH b, −128 ≤ b < 127
+            SIPUSH s, −32768 ≤ s < 32767
+            LDC cst (int, float, long, double, String or Type)
+        */
+        Type type = node.getResultType();
+        double chance = PseudoRandom.random();
+        if (type.equals(TypeList.BOOLEAN)) {
+            visitLiteral(Boolean.valueOf(node.getValue().toString()));
+        } else if (type.equals(TypeList.BYTE)) {
+            visitLiteral(Byte.valueOf(node.getValue().toString()));
+        } else if (type.equals(TypeList.SHORT)) {
+            visitLiteral(Short.valueOf(node.getValue().toString()));
+        } else if (type.equals(TypeList.CHAR)) {
+            visitLiteral(node.getValue().toString().charAt(0));
+        } else if (type.equals(TypeList.INT)) {
+            visitLiteral(Integer.valueOf(node.getValue().toString()));
+        } else if (type.equals(TypeList.LONG)) {
+            visitLiteral(Long.valueOf(node.getValue().toString()));
+        } else if (type.equals(TypeList.FLOAT)) {
+            visitLiteral(Float.valueOf(node.getValue().toString()));
+        } else if (type.equals(TypeList.DOUBLE)) {
+            visitLiteral(Double.valueOf(node.getValue().toString()));
+        } else {
+            currentMV.visitLdcInsn(node.getValue());
+        }
+        return EMPTY_BYTE_ARRAY;
+    }
+    private static final double CONSTANT_INST_CHANCE = 0.5;
+
+    @Override
+    public byte[] visit(LocalVariable node) {
+        // This node is for "reading" only. Writing is handled in BinaryOperator visit(see ASSIGN)
+        VariableInfo vi = node.getVariableInfo();
+        Type varType = vi.type;
+        int index = locals.getLocalIndex(vi);
+        if (varType.equals(TypeList.LONG)) {
+            currentMV.visitVarInsn(Opcodes.LLOAD, index);
+        } else if (varType.equals(TypeList.DOUBLE)) {
+            currentMV.visitVarInsn(Opcodes.DLOAD, index);
+        } else if (varType.equals(TypeList.FLOAT)) {
+            currentMV.visitVarInsn(Opcodes.FLOAD, index);
+        } else if (varType instanceof TypeKlass) {
+            currentMV.visitVarInsn(Opcodes.ALOAD, index);
+        } else {
+            currentMV.visitVarInsn(Opcodes.ILOAD, index);
+        }
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(LoopingCondition node) {
+        return node.getCondition().accept(this);
+    }
+
+    @Override
+    public byte[] visit(MainKlass node) {
+        TypeKlass prevClass = currentClass;
+        currentClass = node.getThisKlass();
+        String name = node.getName();
+        ContextDependedClassWriter mainClassWriter = new ContextDependedClassWriter(context, CLASS_WRITER_FLAGS);
+        classWriters.put(name, mainClassWriter);
+
+        TypeKlass thisClass = node.getThisKlass();
+        mainClassWriter.visit(Opcodes.V1_8, Opcodes.ACC_PUBLIC,
+                asInternalName(name),
+                null /* Generic */,
+                "java/lang/Object",
+                null /* interfaces */);
+        // TODO: constructor for main class
+        currentMV = mainClassWriter.visitMethod(Opcodes.ACC_PUBLIC, "<init>", "()V", null, null);
+        currentMV.visitVarInsn(Opcodes.ALOAD, 0);
+        currentMV.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
+        locals.clear();
+        locals.addLocal(new VariableInfo("this", thisClass, thisClass, VariableInfo.NONE));
+        generateDataMembers(node.getChild(MainKlass.MainKlassPart.DATA_MEMBERS.ordinal()));
+        currentMV.visitInsn(Opcodes.RETURN);
+        currentMV.visitMaxs(0, 0);
+        currentMV.visitEnd();
+
+        IRNode memberFunctions = node.getChild(MainKlass.MainKlassPart.MEMBER_FUNCTIONS.ordinal());
+        if (memberFunctions != null) {
+            memberFunctions.accept(this);
+        }
+        IRNode testFunction = node.getChild(MainKlass.MainKlassPart.TEST_FUNCTION.ordinal());
+        if (testFunction != null) {
+            currentMV = mainClassWriter.visitMethod(
+                    Opcodes.ACC_PRIVATE,
+                    "test",
+                    "()V",
+                    null,
+                    null);
+            locals.clear();
+            locals.addLocal(new VariableInfo("this", thisClass, thisClass, VariableInfo.NONE));
+            testFunction.accept(this);
+            currentMV.visitInsn(Opcodes.RETURN);
+            currentMV.visitMaxs(0, 0);
+            currentMV.visitEnd();
+        }
+        IRNode printVariables = node.getChild(MainKlass.MainKlassPart.PRINT_VARIABLES.ordinal());
+        if (printVariables != null) {
+            printVariables.accept(this);
+        }
+
+        mainClassWriter.visitEnd();
+
+        byte[] byteCode = mainClassWriter.toByteArray();
+        context.register(name, byteCode);
+        currentClass = prevClass;
+        return byteCode;
+    }
+
+    @Override
+    public byte[] visit(NonStaticMemberVariable node) {
+        // This node is for "reading" only. Writing is handled in BinaryOperator visit(see ASSIGN)
+        VariableInfo vi = node.getVariableInfo();
+        // put object to stack
+        node.getChild(0).accept(this);
+        currentMV.visitFieldInsn(Opcodes.GETFIELD, asInternalName(vi.getOwner().getName()), vi.name,
+                new String(vi.type.accept(this)));
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(Nothing node) {
+        // TODO : add randomness
+        currentMV.visitInsn(Opcodes.NOP);
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(PrintVariables node) {
+        return FixedTrees.printVariablesAsFunction(node).accept(this);
+    }
+
+    @Override
+    public byte[] visit(Return node) {
+        node.getExpression().accept(this);
+        Type result = node.getResultType();
+        if (result instanceof TypeKlass) {
+            currentMV.visitInsn(Opcodes.ARETURN);
+        } else if (result.equals(TypeList.VOID)) {
+            currentMV.visitInsn(Opcodes.RETURN);
+        } else if (result.equals(TypeList.DOUBLE)) {
+            currentMV.visitInsn(Opcodes.DRETURN);
+        } else if (result.equals(TypeList.FLOAT)) {
+            currentMV.visitInsn(Opcodes.FRETURN);
+        } else if (result.equals(TypeList.LONG)) {
+            currentMV.visitInsn(Opcodes.LRETURN);
+        } else {
+            currentMV.visitInsn(Opcodes.IRETURN);
+        }
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(Statement node) {
+        IRNode child = node.getChild(0);
+        child.accept(this);
+        Type resultType = child.getResultType();
+        emitPop(resultType);
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    private void emitPop(Type resultType) {
+        if (resultType.equals(TypeList.LONG) || resultType.equals(TypeList.DOUBLE)) {
+            currentMV.visitInsn(Opcodes.POP2);
+        } else if (!resultType.equals(TypeList.VOID)) {
+            currentMV.visitInsn(Opcodes.POP);
+        }
+    }
+
+    @Override
+    public byte[] visit(StaticConstructorDefinition node) {
+        String ownerName = node.getOwner().getName();
+        ContextDependedClassWriter cw = classWriters.get(ownerName);
+        String descriptor = getDescriptor(node, 1, "V");
+        currentMV = cw.visitMethod(Opcodes.ACC_STATIC, "<clinit>", descriptor, null, null);
+        locals.clear();
+        IRNode body = node.getChild(0);
+        body.accept(this);
+        currentMV.visitInsn(Opcodes.RETURN);
+        currentMV.visitMaxs(0, 0);
+        currentMV.visitEnd();
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(StaticMemberVariable node) {
+        // This node is for "reading" only. Writing is handled in BinaryOperator visit(see ASSIGN)
+        VariableInfo vi = node.getVariableInfo();
+        currentMV.visitFieldInsn(Opcodes.GETSTATIC,
+                asInternalName(vi.getOwner().getName()),
+                vi.name,
+                new String(vi.type.accept(this)));
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(Switch node) {
+        node.getChild(0).accept(this);
+        int caseBlockIdx = node.getCaseBlockIndex();
+        Label defaultCase = new Label();
+        IRNode defaultBlock = null;
+        SortedMap<Integer, Pair<Label, IRNode>> cases = new TreeMap<>();
+        for (int i = 0; i < caseBlockIdx - 1; ++i) {
+            if (node.getChild(i + 1) instanceof Nothing) {
+                defaultBlock = node.getChild(i + caseBlockIdx);
+            } else {
+                Literal literal = (Literal) node.getChild(i + 1);
+                int value = 0;
+                if (literal.value instanceof Integer) {
+                    value = (Integer) literal.value;
+                } else if (literal.value instanceof Short) {
+                    value = (Short) literal.value;
+                } else if (literal.value instanceof Byte) {
+                    value = (Byte) literal.value;
+                } else if (literal.value instanceof Character) {
+                    value = (Character) literal.value;
+                }
+                cases.put(value, new Pair<>(new Label(), node.getChild(i + caseBlockIdx)));
+            }
+        }
+        Label breakLabel = new Label();
+        endLabels.push(breakLabel);
+        currentMV.visitLookupSwitchInsn(defaultCase,
+                cases.keySet().stream()
+                        .mapToInt(Integer::intValue)
+                        .toArray(),
+                cases.values().stream()
+                        .map(p -> p.first)
+                        .toArray(Label[]::new));
+        for (Pair<Label, IRNode> p : cases.values()) {
+            currentMV.visitLabel(p.first);
+            p.second.accept(this);
+        }
+        currentMV.visitLabel(defaultCase);
+        if (defaultBlock != null) {
+            defaultBlock.accept(this);
+        }
+        Label a = endLabels.pop();
+        assert breakLabel == a;
+        currentMV.visitLabel(breakLabel);
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(TernaryOperator node) {
+        IRNode conditionBlock = node.getChild(TernaryOperator.TernaryPart.CONDITION.ordinal());
+        // get the condition type to emit correct if
+        conditionBlock.accept(this);
+        generateIf(Opcodes.IFEQ, node.getChild(TernaryOperator.TernaryPart.TRUE.ordinal()),
+                node.getChild(TernaryOperator.TernaryPart.FALSE.ordinal()));
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(Throw node) {
+        node.getThowable().accept(this);
+        currentMV.visitInsn(Opcodes.ATHROW);
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(TryCatchBlock node) {
+        List<? extends IRNode> children = node.getChildren();
+        IRNode tryBlock = children.get(0);
+        IRNode finallyBlock = children.get(1);
+        Label tryStart = new Label();
+        Label tryEnd = new Label();
+        Label finallyStart = new Label();
+        Label finallyEnd = new Label();
+
+        currentMV.visitLabel(tryStart);
+        tryBlock.accept(this);
+        currentMV.visitLabel(tryEnd);
+        finallyBlock.accept(this);
+        currentMV.visitJumpInsn(Opcodes.GOTO, finallyEnd);
+        VariableInfo exInfo = new VariableInfo("ex", currentClass,
+                new TypeKlass("java.lang.Throwable"), VariableInfo.LOCAL);
+        int index = locals.addLocal(exInfo);
+        for (int i = 2; i < children.size(); ++i) {
+            Label handlerBegin = new Label();
+            Label handlerEnd = new Label();
+            CatchBlock catchBlock = (CatchBlock) children.get(i);
+            for (Type t : catchBlock.throwables) {
+                currentMV.visitTryCatchBlock(tryStart, tryEnd, handlerBegin, asInternalName(t.getName()));
+            }
+            currentMV.visitLabel(handlerBegin);
+            catchBlock.accept(this);
+            currentMV.visitLabel(handlerEnd);
+            finallyBlock.accept(this);
+            currentMV.visitJumpInsn(Opcodes.GOTO, finallyEnd);
+            currentMV.visitTryCatchBlock(handlerBegin, handlerEnd, finallyStart, null);
+        }
+
+        currentMV.visitTryCatchBlock(tryStart, tryEnd, finallyStart, null);
+        currentMV.visitLabel(finallyStart);
+        currentMV.visitVarInsn(Opcodes.ASTORE, index);
+        finallyBlock.accept(this);
+        currentMV.visitVarInsn(Opcodes.ALOAD, index);
+        currentMV.visitInsn(Opcodes.ATHROW);
+        currentMV.visitLabel(finallyEnd);
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(Type node) {
+        String name;
+        if (TypeList.isBuiltIn(node)) {
+            switch (node.getName()) {
+                case "void":
+                    name = "V";
+                    break;
+                case "boolean":
+                    name = "Z";
+                    break;
+                case "byte":
+                    name = "B";
+                    break;
+                case "char":
+                    name = "C";
+                    break;
+                case "short":
+                    name = "S";
+                    break;
+                case "int":
+                    name = "I";
+                    break;
+                case "long":
+                    name = "J";
+                    break;
+                case "float":
+                    name = "F";
+                    break;
+                case "double":
+                    name = "D";
+                    break;
+                default:
+                    throw new IllegalArgumentException("Unknown type '" + node.getName());
+            }
+        } else {
+            name = "L" + asInternalName(node.getName()) + ";";
+        }
+        return name.getBytes();
+    }
+
+    @Override
+    public byte[] visit(TypeArray node) {
+        String name;
+        String prefix = Stream.generate(() -> "[")
+                .limit(node.dimensions)
+                .collect(Collectors.joining());
+        name = prefix + new String(node.getType().accept(this));
+        return name.getBytes();
+    }
+
+    @Override
+    public byte[] visit(UnaryOperator node) {
+        OperatorKind opKind = node.getOperationKind();
+        IRNode exp = node.getChild(0);
+        // argument expression is handled separately for inc and dec operators
+        if (opKind != OperatorKind.POST_DEC && opKind != OperatorKind.POST_INC
+                && opKind != OperatorKind.PRE_DEC && opKind != OperatorKind.PRE_INC) {
+            exp.accept(this);
+        }
+        Type resultType = exp.getResultType();
+        switch (opKind) {
+            case NOT:
+                Label retTrueForNot = new Label();
+                Label endForNot = new Label();
+                currentMV.visitJumpInsn(Opcodes.IFEQ, retTrueForNot);
+                currentMV.visitInsn(Opcodes.ICONST_0);
+                currentMV.visitJumpInsn(Opcodes.GOTO, endForNot);
+                currentMV.visitLabel(retTrueForNot);
+                currentMV.visitInsn(Opcodes.ICONST_1);
+                currentMV.visitLabel(endForNot);
+                break;
+            case BIT_NOT:
+                if (resultType.equals(TypeList.LONG)) {
+                    currentMV.visitLdcInsn(-1L);
+                    currentMV.visitInsn(Opcodes.LXOR);
+                } else {
+                    currentMV.visitInsn(Opcodes.ICONST_M1);
+                    currentMV.visitInsn(Opcodes.IXOR);
+                }
+                break;
+            case UNARY_MINUS:
+                if (resultType.equals(TypeList.LONG)) {
+                    currentMV.visitInsn(Opcodes.LNEG);
+                } else if (resultType.equals(TypeList.FLOAT)) {
+                    currentMV.visitInsn(Opcodes.FNEG);
+                } else if (resultType.equals(TypeList.DOUBLE)) {
+                    currentMV.visitInsn(Opcodes.DNEG);
+                } else {
+                    currentMV.visitInsn(Opcodes.INEG);
+                }
+                break;
+            case UNARY_PLUS:
+                break;
+            case PRE_DEC:
+                lowerIncDecUnaryOperator(OperatorKind.SUB, true, node);
+                break;
+            case POST_DEC:
+                lowerIncDecUnaryOperator(OperatorKind.SUB, false, node);
+                break;
+            case PRE_INC:
+                lowerIncDecUnaryOperator(OperatorKind.ADD, true, node);
+                break;
+            case POST_INC:
+                lowerIncDecUnaryOperator(OperatorKind.ADD, false, node);
+                break;
+            default:
+                throw new RuntimeException("Incorrect unary operator: " + opKind);
+        }
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    private void lowerIncDecUnaryOperator(OperatorKind kind, boolean isPrefix, IRNode node) {
+        IRNode var = node.getChild(0);
+        Literal one;
+        Type resultType = node.getResultType();
+        if (resultType.equals(TypeList.LONG)) {
+            one = new Literal(1L, TypeList.LONG);
+        } else if (resultType.equals(TypeList.INT)) {
+            one = new Literal(1, TypeList.INT);
+        } else if (resultType.equals(TypeList.SHORT)) {
+            one = new Literal((short) 1, TypeList.SHORT);
+        } else {
+            one = new Literal((byte) 1, TypeList.BYTE);
+        }
+        if (var instanceof NonStaticMemberVariable) {
+            IRNode holder = var.getChild(0);
+            Type type = holder.getResultType();
+            VariableInfo tmpInfo = new VariableInfo("tmpObject_" + tmpObject++,
+                    currentClass, type, VariableInfo.LOCAL);
+            new Statement(new VariableInitialization(tmpInfo, holder), true).accept(this);
+            var = new NonStaticMemberVariable(new LocalVariable(tmpInfo),
+                    ((NonStaticMemberVariable) var).getVariableInfo());
+        }
+        BinaryOperator calculation = new BinaryOperator(kind, resultType, var, one);
+        BinaryOperator changeValue = new BinaryOperator(OperatorKind.ASSIGN, resultType, var, calculation);
+        Statement finalChangeStatement = new Statement(changeValue, true);
+        if (isPrefix) {
+            finalChangeStatement.accept(this);
+            var.accept(this);
+        } else {
+            var.accept(this);
+            finalChangeStatement.accept(this);
+        }
+    }
+
+    @Override
+    public byte[] visit(VariableDeclaration node) {
+        VariableInfo vi = node.getVariableInfo();
+        String ownerName = vi.getOwner().getName();
+        ContextDependedClassWriter cw = classWriters.get(ownerName);
+        String typeName = new String(vi.type.accept(this));
+        if (vi.isLocal()) {
+            locals.addLocal(vi);
+        } else {
+            FieldVisitor fv = cw.visitField(asAccessFlags(vi),
+                    vi.name,
+                    typeName,
+                    null /* Generic */,
+                    null /* Constant value */);
+            fv.visitEnd(); // doesn't need visitAnnotation and visitAttribute
+        }
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    @Override
+    public byte[] visit(VariableDeclarationBlock node) {
+        return iterateBlock(node);
+    }
+
+    @Override
+    public byte[] visit(While node) {
+        Loop loop = node.getLoop();
+        loop.initialization.accept(this);
+        node.getChild(While.WhilePart.HEADER.ordinal()).accept(this);
+        Label currentLoopBegin = new Label();
+        beginLabels.push(currentLoopBegin);
+        currentMV.visitLabel(currentLoopBegin);
+        loop.condition.accept(this);
+        assert loop.condition.getResultType() == TypeList.BOOLEAN;
+        Label currentLoopEnd = new Label();
+        endLabels.push(currentLoopEnd);
+        currentMV.visitJumpInsn(Opcodes.IFEQ, currentLoopEnd);
+        node.getChild(While.WhilePart.BODY1.ordinal()).accept(this);
+        loop.manipulator.accept(this);
+        node.getChild(While.WhilePart.BODY2.ordinal()).accept(this);
+        node.getChild(While.WhilePart.BODY3.ordinal()).accept(this);
+        currentMV.visitJumpInsn(Opcodes.GOTO, currentLoopBegin);
+        currentMV.visitLabel(currentLoopEnd);
+        Label a = beginLabels.pop();
+        assert currentLoopBegin == a;
+        a = endLabels.pop();
+        assert currentLoopEnd == a;
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    public byte[] getByteCode(String name) {
+        return context.get(name);
+    }
+
+    private static byte[] concat(byte[] a, byte[] b) {
+        byte[] r = new byte[a.length + b.length];
+        System.arraycopy(a, 0, r, 0, a.length);
+        System.arraycopy(b, 0, r, a.length, b.length);
+        return r;
+    }
+
+    private String argTypeToString(ArgumentDeclaration declarations) {
+        return new String(declarations.variableInfo.type.accept(this));
+    }
+
+    private byte[] iterateBlock(IRNode node) {
+        return node.getChildren().stream()
+                .map(ch -> ch.accept(this))
+                .reduce(new byte[0], ByteCodeVisitor::concat);
+    }
+
+    private String getDescriptor(IRNode node, int skipChilds, String returnType) {
+        return node.getChildren().stream()
+                .skip(skipChilds)
+                .map(c -> argTypeToString((ArgumentDeclaration)c))
+                .collect(Collectors.joining("", "(", ")" + returnType));
+    }
+
+    private static String asInternalName(String type) {
+        return type.replace('.', '/');
+    }
+
+    private static int asAccessFlags(TypeKlass klass) {
+        int attr = Opcodes.ACC_SUPER;
+        attr |= klass.isFinal() ? Opcodes.ACC_FINAL : 0;
+        attr |= klass.isAbstract() ? Opcodes.ACC_ABSTRACT : 0;
+        attr |= klass.isInterface() ? Opcodes.ACC_INTERFACE : 0;
+
+        return attr;
+    }
+
+    private static int asAccessFlags(FunctionInfo fi) {
+        int result = asAccessFlags((Symbol) fi);
+        result |= ProductionParams.enableStrictFP.value() ? Opcodes.ACC_STRICT : 0;
+        result |= fi.isSynchronized() ? Opcodes.ACC_SYNCHRONIZED : 0;
+        return result;
+    }
+
+    private static int asAccessFlags(Symbol s) {
+        int attr = 0;
+        attr |= s.isPublic() ? Opcodes.ACC_PUBLIC : 0;
+        attr |= s.isPrivate() ? Opcodes.ACC_PRIVATE : 0;
+        attr |= s.isProtected() ? Opcodes.ACC_PROTECTED : 0;
+        attr |= s.isStatic() ? Opcodes.ACC_STATIC : 0;
+        attr |= s.isFinal() ? Opcodes.ACC_FINAL : 0;
+
+        return attr;
+    }
+
+    private static class LocalVariablesTable {
+        private int nextLocalIndex = 0;
+        // a map keeping local variable table index for a local variable
+        private final HashMap<String, Integer> locals = new HashMap<>();
+
+        public int addLocal(VariableInfo vi) {
+            int indexToReturn = nextLocalIndex;
+            locals.put(vi.name, nextLocalIndex++);
+            if (vi.type.equals(TypeList.DOUBLE) || vi.type.equals(TypeList.LONG)) {
+                nextLocalIndex++;
+            }
+            return indexToReturn;
+        }
+
+        public int getLocalIndex(VariableInfo vi) {
+            if (!locals.containsKey(vi.name)) {
+                throw new NoSuchElementException(vi.name);
+            }
+            return locals.get(vi.name);
+        }
+
+        public void clear() {
+            locals.clear();
+            nextLocalIndex = 0;
+        }
+
+        public void initFunctionArguments(FunctionInfo info) {
+            initArguments(null, info);
+        }
+
+        public void initConstructorArguments(TypeKlass owner, FunctionInfo info) {
+            Objects.requireNonNull(owner, "owner is null");
+            initArguments(owner, info);
+        }
+
+        private void initArguments(TypeKlass owner, FunctionInfo info) {
+            clear();
+            if (owner != null) {
+                addLocal(new VariableInfo("this", owner, owner, VariableInfo.LOCAL | VariableInfo.INITIALIZED));
+            }
+            for (VariableInfo vi : info.argTypes) {
+                addLocal(vi);
+            }
+        }
+    }
+
+    private static class GeneratedClassesContext extends java.lang.ClassLoader {
+        private final HashMap<String, byte[]> byteCodes = new HashMap<>();
+
+        public void register(String name, byte[] bytecode) {
+            defineClass(name, bytecode, 0, bytecode.length);
+            byteCodes.put(name, bytecode);
+        }
+
+        public byte[] get(String name) {
+            return byteCodes.get(name);
+        }
+    }
+
+
+    private static class ContextDependedClassWriter extends ClassWriter {
+        private final GeneratedClassesContext context;
+
+        public ContextDependedClassWriter(GeneratedClassesContext context, int flags) {
+            super(flags);
+            this.context = context;
+        }
+
+        protected String getCommonSuperClass(String className1, String className2) {
+            Class<?> klass1;
+            Class<?> klass2;
+            try {
+                klass1 = Class.forName(className1.replace('/', '.'), false, context);
+                klass2 = Class.forName(className2.replace('/', '.'), false, context);
+            } catch (ClassNotFoundException e) {
+                throw new Error("can not get common supper for " + className1
+                                + " and " + className2, e);
+            }
+
+            if (klass1.isAssignableFrom(klass2)) {
+                return className1;
+            } else if (klass2.isAssignableFrom(klass1)) {
+                return className2;
+            } else if (!klass1.isInterface() && !klass2.isInterface()) {
+                do {
+                    klass1 = klass1.getSuperclass();
+                } while (!klass1.isAssignableFrom(klass2));
+
+                return asInternalName(className1);
+            } else {
+                return "java/lang/Object";
+            }
+        }
+    }
+}
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/JavaCodeVisitor.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/JavaCodeVisitor.java
index 97a045cccfc..206f5752415 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/JavaCodeVisitor.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/JavaCodeVisitor.java
@@ -23,8 +23,6 @@
 
 package jdk.test.lib.jittester.visitors;
 
-import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
@@ -41,10 +39,10 @@ import jdk.test.lib.jittester.If;
 import jdk.test.lib.jittester.Initialization;
 import jdk.test.lib.jittester.Literal;
 import jdk.test.lib.jittester.LocalVariable;
-import jdk.test.lib.jittester.LogicOperator;
 import jdk.test.lib.jittester.NonStaticMemberVariable;
 import jdk.test.lib.jittester.Nothing;
 import jdk.test.lib.jittester.Operator;
+import jdk.test.lib.jittester.OperatorKind;
 import jdk.test.lib.jittester.PrintVariables;
 import jdk.test.lib.jittester.ProductionParams;
 import jdk.test.lib.jittester.Statement;
@@ -89,13 +87,8 @@ import jdk.test.lib.jittester.loops.Loop;
 import jdk.test.lib.jittester.loops.LoopingCondition;
 import jdk.test.lib.jittester.loops.While;
 import jdk.test.lib.jittester.types.TypeArray;
-import jdk.test.lib.jittester.types.TypeByte;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.types.TypeChar;
-import jdk.test.lib.jittester.types.TypeDouble;
-import jdk.test.lib.jittester.types.TypeFloat;
-import jdk.test.lib.jittester.types.TypeLong;
-import jdk.test.lib.jittester.types.TypeShort;
+import jdk.test.lib.jittester.utils.FixedTrees;
 import jdk.test.lib.jittester.utils.PrintingUtils;
 
 public class JavaCodeVisitor implements Visitor<String> {
@@ -128,7 +121,91 @@ public class JavaCodeVisitor implements Visitor<String> {
         return attrs;
     }
 
-    public String expressionToJavaCode(Operator t, IRNode p, Operator.Order o) {
+    private String operatorToJaveCode(OperatorKind operationKind) {
+       switch (operationKind) {
+           case COMPOUND_ADD:
+               return  "+=";
+           case COMPOUND_SUB:
+               return "-=";
+           case COMPOUND_MUL:
+               return "*=";
+           case COMPOUND_DIV:
+               return "/=";
+           case COMPOUND_MOD:
+               return "%=";
+           case COMPOUND_AND:
+               return "&=";
+           case COMPOUND_OR:
+               return "|=";
+           case COMPOUND_XOR:
+               return "^=";
+           case COMPOUND_SHR:
+               return ">>=";
+           case COMPOUND_SHL:
+               return "<<=";
+           case COMPOUND_SAR:
+               return ">>>=";
+           case ASSIGN:
+               return "=";
+           case OR:
+               return "||";
+           case BIT_OR:
+               return "|";
+           case BIT_XOR:
+               return "^";
+           case AND:
+               return "&&";
+           case BIT_AND:
+               return "&";
+           case EQ:
+               return "==";
+           case NE:
+               return "!=";
+           case GT:
+               return ">";
+           case LT:
+               return "<";
+           case GE:
+               return ">=";
+           case LE:
+               return "<=";
+           case SHR:
+               return ">>";
+           case SHL:
+               return "<<";
+           case SAR:
+               return ">>>";
+           case ADD:
+           case STRADD:
+               return "+";
+           case SUB:
+               return "-";
+           case MUL:
+               return "*";
+           case DIV:
+               return "/";
+           case MOD:
+               return "%";
+           case NOT:
+               return "!";
+           case BIT_NOT:
+               return "~";
+           case UNARY_PLUS:
+               return "+";
+           case UNARY_MINUS:
+               return "-";
+           case PRE_DEC:
+           case POST_DEC:
+               return "--";
+           case PRE_INC:
+           case POST_INC:
+               return "++";
+           default:
+               throw new IllegalArgumentException("Unkown operator kind " + operationKind);
+       }
+    }
+
+    private String expressionToJavaCode(Operator t, IRNode p, Operator.Order o) {
         String result;
         try {
             if ((o == Operator.Order.LEFT && ((Operator) p).getPriority() < t.getPriority())
@@ -151,8 +228,8 @@ public class JavaCodeVisitor implements Visitor<String> {
 
     @Override
     public String visit(ArrayCreation node) {
-        Type arrayType = node.getArrayType();
-        String type = arrayType.accept(this);
+        Type arrayElemType = node.getArrayType().type;
+        String type = arrayElemType.accept(this);
         String name = node.getVariable().getName();
         StringBuilder code = new StringBuilder()
                 .append(node.getVariable().accept(this))
@@ -165,7 +242,7 @@ public class JavaCodeVisitor implements Visitor<String> {
                 .map(p -> p.accept(this))
                 .collect(Collectors.joining("][", "[", "]")));
         code.append(";\n");
-        if (!TypeList.isBuiltIn(arrayType)) {
+        if (!TypeList.isBuiltIn(arrayElemType)) {
             code.append(PrintingUtils.align(node.getParent().getLevel()))
                 .append("java.util.Arrays.fill(")
                 .append(name)
@@ -220,7 +297,7 @@ public class JavaCodeVisitor implements Visitor<String> {
             return "null";
         }
         return expressionToJavaCode(node, left, Operator.Order.LEFT)
-               + " " + node.getOperationCode() + " "
+               + " " + operatorToJaveCode(node.getOperationKind()) + " "
                + expressionToJavaCode(node, right, Operator.Order.RIGHT);
     }
 
@@ -320,7 +397,7 @@ public class JavaCodeVisitor implements Visitor<String> {
 
     @Override
     public String visit(CounterInitializer node) {
-        VariableInfo vi = node.get();
+        VariableInfo vi = node.getVariableInfo();
         return vi.type.accept(this) + " " + vi.name + " = " + node.getChild(0).accept(this)+ ";";
     }
 
@@ -407,8 +484,8 @@ public class JavaCodeVisitor implements Visitor<String> {
                 + ")";
         String prefix = "";
         if (value.isStatic()) {
-            if(!node.getKlass().equals(value.klass)) {
-                prefix = value.klass.getName() + ".";
+            if(!node.getOwner().equals(value.owner)) {
+                prefix = value.owner.getName() + ".";
             }
         } else if (value.isConstructor()) {
             prefix = "new ";
@@ -434,7 +511,7 @@ public class JavaCodeVisitor implements Visitor<String> {
                 .collect(Collectors.joining(", "));
 
         FunctionInfo functionInfo = node.getFunctionInfo();
-        return (functionInfo.klass.isInterface() ? "" : "abstract ")
+        return (functionInfo.owner.isInterface() ? "" : "abstract ")
                 + funcAttributes(functionInfo) + functionInfo.type.accept(this)+ " "
                 + functionInfo.name + "(" + args + ");";
     }
@@ -464,7 +541,7 @@ public class JavaCodeVisitor implements Visitor<String> {
                 + PrintingUtils.align(node.getLevel() + 1) + "{\n"
                 + body.accept(this)
                 + (ret != null ? PrintingUtils.align(node.getLevel() + 2) + ret.accept(this) + "\n" : "")
-                + PrintingUtils.align(node.getLevel() + 1) + "}";
+                + PrintingUtils.align(node.getLevel() + 1) + "}\n";
     }
 
     @Override
@@ -483,6 +560,7 @@ public class JavaCodeVisitor implements Visitor<String> {
     @Override
     public String visit(FunctionRedefinition node) {
         String args = node.getChildren().stream()
+                .skip(2)
                 .map(c -> c.accept(this))
                 .collect(Collectors.joining(", "));
 
@@ -490,10 +568,10 @@ public class JavaCodeVisitor implements Visitor<String> {
         IRNode ret = node.getChild(1);
         int level = node.getLevel();
         FunctionInfo functionInfo = node.getFunctionInfo();
-        return funcAttributes(functionInfo) + functionInfo.type + " " + functionInfo.name + "(" + args + ")" + "\n"
+        return funcAttributes(functionInfo) + functionInfo.type.accept(this) + " " + functionInfo.name + "(" + args + ")" + "\n"
                 + PrintingUtils.align(level + 1) + "{\n"
-                + body
-                + (ret != null ? PrintingUtils.align(level + 2) + ret + "\n" : "")
+                + body.accept(this)
+                + (ret != null ? PrintingUtils.align(level + 2) + ret.accept(this) + "\n" : "")
                 + PrintingUtils.align(level + 1) + "}";
     }
 
@@ -551,10 +629,11 @@ public class JavaCodeVisitor implements Visitor<String> {
                 + (thisKlass.isFinal() ? "final " : "")
                 + (thisKlass.isAbstract() ? "abstract " : "")
                 + "class " + node.getName()
-                + (node.getParentKlass()!= null ? " extends " + node.getParentKlass().getName() : "");
+                + (node.getParentKlass() != null && !node.getParentKlass().equals(TypeList.OBJECT)
+                ? " extends " + node.getParentKlass().getName() : "");
         List<TypeKlass> interfaces = node.getInterfaces();
         r += interfaces.stream()
-                .map(c -> c.getName())
+                .map(Type::getName)
                 .collect(Collectors.joining(", ", (interfaces.isEmpty() ? "" : " implements "), ""));
         IRNode dataMembers = node.getChild(Klass.KlassPart.DATA_MEMBERS.ordinal());
         IRNode constructors = node.getChild(Klass.KlassPart.CONSTRUCTORS.ordinal());
@@ -570,10 +649,7 @@ public class JavaCodeVisitor implements Visitor<String> {
              + (overridenFunctions != null ? (overridenFunctions.accept(this)+ "\n") : "")
              + (memberFunctionDecls != null ? (memberFunctionDecls.accept(this)+ "\n") : "")
              + (memberFunctions != null ? (memberFunctions.accept(this)+ "\n") : "")
-             + "    public String toString()\n"
-             + "    {\n"
              + printVariables.accept(this)
-             + "    }\n"
              + "}\n";
         return r;
     }
@@ -582,43 +658,42 @@ public class JavaCodeVisitor implements Visitor<String> {
     public String visit(Literal node) {
         Type resultType = node.getResultType();
         Object value = node.getValue();
-        if (resultType.equals(new TypeLong())) {
+        if (resultType.equals(TypeList.LONG)) {
             return value.toString() + "L";
         }
-        if (resultType.equals(new TypeFloat())) {
+        if (resultType.equals(TypeList.FLOAT)) {
             return String.format((Locale) null,
-                "%." + ProductionParams.floatingPointPrecision.value() + "EF",
+                "%EF",
                 Double.parseDouble(value.toString()));
         }
-        if (resultType.equals(new TypeDouble())) {
+        if (resultType.equals(TypeList.DOUBLE)) {
             return String.format((Locale) null,
-                "%." + 2 * ProductionParams.floatingPointPrecision.value() + "E",
+                "%E",
                 Double.parseDouble(value.toString()));
         }
-        if (resultType.equals(new TypeChar())) {
-            if (((Character) value).charValue() == '\\') {
+        if (resultType.equals(TypeList.CHAR)) {
+            if ((Character) value == '\\') {
                 return "\'" + "\\\\" + "\'";
             } else {
                 return "\'" + value.toString() + "\'";
             }
         }
-        if (resultType.equals(new TypeShort())) {
+        if (resultType.equals(TypeList.SHORT)) {
             return "(short) " + value.toString();
         }
-        if (resultType.equals(new TypeByte())) {
+        if (resultType.equals(TypeList.BYTE)) {
             return "(byte) " + value.toString();
         }
+        if (resultType.equals(TypeList.STRING)) {
+            // TOOD handle other non-printable
+            return "\"" + value.toString().replace("\n", "\\n") + "\"";
+        }
         return value.toString();
     }
 
     @Override
     public String visit(LocalVariable node) {
-        return node.get().name;
-    }
-
-    @Override
-    public String visit(LogicOperator node) {
-        throw new UnsupportedOperationException("Not supported yet.");
+        return node.getVariableInfo().name;
     }
 
     @Override
@@ -633,182 +708,16 @@ public class JavaCodeVisitor implements Visitor<String> {
         IRNode memberFunctions = node.getChild(MainKlass.MainKlassPart.MEMBER_FUNCTIONS.ordinal());
         IRNode testFunction = node.getChild(MainKlass.MainKlassPart.TEST_FUNCTION.ordinal());
         IRNode printVariables = node.getChild(MainKlass.MainKlassPart.PRINT_VARIABLES.ordinal());
-        String executeFunction = "    public static String execute()\n"
-                + "    {\n"
-                + "        try {\n"
-                + "            " + name + " t = new " + name + "();\n"
-                + "            try { t.test(); }\n"
-                + "            catch(Throwable e) { }\n"
-                + "            try { return t.toString(); }\n"
-                + "            catch (Throwable e) { return \"Error during result conversion to String\"; }\n"
-                + "        } catch (Throwable e) { return \"Error during test execution\"; }\n"
-                + "    }\n";
-        String mainFunction = "    public static void main(String[] args)\n"
-                + "    {\n"
-                + "        try {\n"
-                + "            " + name + " t = new " + name + "();\n"
-                + "            try {\n"
-                + "                for (int i = 0; i < 150000; ++i) {\n"
-                + "                    t.test();\n"
-                + "                }\n"
-                + "            }\n"
-                + "            catch(Throwable e) { e.printStackTrace(); }\n"
-                + "            try { System.out.println(t); }\n"
-                + "            catch(Throwable e) { e.printStackTrace();}\n"
-                + "        } catch (Throwable e) { e.printStackTrace(); }\n"
-                + "    }\n";
-        String printerClass = "    static class Printer\n"
-                + "    {\n"
-                + "        public static String print(boolean arg) { return String.valueOf(arg); }\n"
-                + "        public static String print(byte arg)    { return String.valueOf(arg); }\n"
-                + "        public static String print(short arg)   { return String.valueOf(arg); }\n"
-                + "        public static String print(char arg)    { return String.valueOf((int)arg); }\n"
-                + "        public static String print(int arg)     { return String.valueOf(arg); }\n"
-                + "        public static String print(long arg)    { return String.valueOf(arg); }\n"
-                + "        public static String print(float arg)   { return String.valueOf(arg); }\n"
-                + "        public static String print(double arg)  { return String.valueOf(arg); }\n"
-                + "\n"
-                + "\n"
-                + "        public static String print(Object arg)\n"
-                + "        {\n"
-                + "            return print_r(new java.util.Stack(), arg);\n"
-                + "        }\n"
-                + "\n"
-                + "        private static String print_r(java.util.Stack visitedObjects, Object arg)\n"
-                + "        {\n"
-                + "            String result = \"\";\n"
-                + "            if (arg == null)\n"
-                + "                result += \"null\";\n"
-                + "            else\n"
-                + "            if (arg.getClass().isArray())\n"
-                + "            {\n"
-                + "                for (int i = 0; i < visitedObjects.size(); i++)\n"
-                + "                    if (visitedObjects.elementAt(i) == arg) return \"<recursive>\";\n"
-                + "\n"
-                + "                visitedObjects.push(arg);\n"
-                + "\n"
-                + "                final String delimiter = \", \";\n"
-                + "                result += \"[\";\n"
-                + "\n"
-                + "                if (arg instanceof Object[])\n"
-                + "                {\n"
-                + "                    Object[] array = (Object[]) arg;\n"
-                + "                    for (int i = 0; i < array.length; i++)\n"
-                + "                    {\n"
-                + "                        result += print_r(visitedObjects, array[i]);\n"
-                + "                        if (i < array.length - 1) result += delimiter;\n"
-                + "                    }\n"
-                + "                }\n"
-                + "                else\n"
-                + "                if (arg instanceof boolean[])\n"
-                + "                {\n"
-                + "                    boolean[] array = (boolean[]) arg;\n"
-                + "                    for (int i = 0; i < array.length; i++)\n"
-                + "                    {\n"
-                + "                        result += print(array[i]);\n"
-                + "                        if (i < array.length - 1) result += delimiter;\n"
-                + "                    }\n"
-                + "                }\n"
-                + "                else\n"
-                + "                if (arg instanceof byte[])\n"
-                + "                {\n"
-                + "                    byte[] array = (byte[]) arg;\n"
-                + "                    for (int i = 0; i < array.length; i++)\n"
-                + "                    {\n"
-                + "                        result += print(array[i]);\n"
-                + "                        if (i < array.length - 1) result += delimiter;\n"
-                + "                    }\n"
-                + "                }\n"
-                + "                else\n"
-                + "                if (arg instanceof short[])\n"
-                + "                {\n"
-                + "                    short[] array = (short[]) arg;\n"
-                + "                    for (int i = 0; i < array.length; i++)\n"
-                + "                    {\n"
-                + "                        result += print(array[i]);\n"
-                + "                        if (i < array.length - 1) result += delimiter;\n"
-                + "                    }\n"
-                + "                }\n"
-                + "                else\n"
-                + "                if (arg instanceof char[])\n"
-                + "                {\n"
-                + "                    char[] array = (char[]) arg;\n"
-                + "                    for (int i = 0; i < array.length; i++)\n"
-                + "                    {\n"
-                + "                        result += print(array[i]);\n"
-                + "                        if (i < array.length - 1) result += delimiter;\n"
-                + "                    }\n"
-                + "                }\n"
-                + "                else\n"
-                + "                if (arg instanceof int[])\n"
-                + "                {\n"
-                + "                     int[] array = (int[]) arg;\n"
-                + "                     for (int i = 0; i < array.length; i++)\n"
-                + "                     {\n"
-                + "                        result += print(array[i]);\n"
-                + "                        if (i < array.length - 1) result += delimiter;\n"
-                + "                     }\n"
-                + "                }\n"
-                + "                else\n"
-                + "                if (arg instanceof long[])\n"
-                + "                {\n"
-                + "                    long[] array = (long[]) arg;\n"
-                + "                    for (int i = 0; i < array.length; i++)\n"
-                + "                    {\n"
-                + "                        result += print(array[i]);\n"
-                + "                        if (i < array.length - 1) result += delimiter;\n"
-                + "                    }\n"
-                + "                }\n"
-                + "                else\n"
-                + "                if (arg instanceof float[])\n"
-                + "                {\n"
-                + "                    float[] array = (float[]) arg;\n"
-                + "                    for (int i = 0; i < array.length; i++)\n"
-                + "                    {\n"
-                + "                        result += print(array[i]);\n"
-                + "                        if (i < array.length - 1) result += delimiter;\n"
-                + "                    }\n"
-                + "                }\n"
-                + "                else\n"
-                + "                if (arg instanceof double[])\n"
-                + "                {\n"
-                + "                    double[] array = (double[]) arg;\n"
-                + "                    for (int i = 0; i < array.length; i++)\n"
-                + "                    {\n"
-                + "                        result += print(array[i]);\n"
-                + "                        if (i < array.length - 1) result += delimiter;\n"
-                + "                    }\n"
-                + "                }\n"
-                + "\n"
-                + "                result += \"]\";\n"
-                + "                visitedObjects.pop();\n"
-                + "\n"
-                + "            } else\n"
-                + "            {\n"
-                + "                result += arg.toString();\n"
-                + "            }\n"
-                + "\n"
-                + "            return result;\n"
-                + "        }\n"
-                + "    }\n";
 
         return (ProductionParams.enableStrictFP.value() ? "strictfp " : "")
                 + "public class " + name + " {\n"
                 + dataMembers.accept(this)+ "\n"
                 + (memberFunctions != null ? memberFunctions.accept(this): "") + "\n"
-                + executeFunction
-                + "\n"
-                + mainFunction
-                + "\n"
                 + "    private void test()\n"
                 + "    {\n"
                 + testFunction.accept(this)
                 + "    }" + addComplexityInfo(testFunction) + "\n"
-                + "    public String toString()\n"
-                + "    {\n"
                 + printVariables.accept(this)
-                + "    }\n"
-                + printerClass
                 + "}\n\n";
     }
 
@@ -816,7 +725,7 @@ public class JavaCodeVisitor implements Visitor<String> {
     public String visit(NonStaticMemberVariable node) {
         IRNode object = node.getChild(0);
         String objectString = object.accept(this);
-        VariableInfo value = node.getValue();
+        VariableInfo value = node.getVariableInfo();
         if (objectString.equals("this")) {
             return value.name;
         } else {
@@ -835,38 +744,7 @@ public class JavaCodeVisitor implements Visitor<String> {
 
     @Override
     public String visit(PrintVariables node) {
-        int level = node.getLevel();
-        List<Symbol> vars = node.getVars();
-        StringBuilder result = new StringBuilder()
-                .append(PrintingUtils.align(level))
-                .append("String result =  \"[\\n\";\n");
-        if (!vars.isEmpty()) {
-            for (int i = 0; i < vars.size(); i++) {
-                Symbol v = vars.get(i);
-                result.append(PrintingUtils.align(level))
-                        .append("result += \"").append(v.klass.getName())
-                        .append(".")
-                        .append(v.name)
-                        .append(" = \"; ")
-                        .append("result += ")
-                        .append(node.getPrinterName())
-                        .append(".print(")
-                        .append(v.name)
-                        .append(");\n")
-                        .append(PrintingUtils.align(level));
-                if (i < vars.size() - 1) {
-                    result.append("result += \"\\n\";");
-                } else {
-                    result.append("result += \"\";");
-                }
-                result.append("\n");
-            }
-        }
-        result.append(PrintingUtils.align(level))
-                .append("result += \"\\n]\";\n")
-                .append(PrintingUtils.align(level))
-                .append("return result;\n");
-        return result.toString();
+        return FixedTrees.printVariablesAsFunction(node).accept(this);
     }
 
     @Override
@@ -894,12 +772,12 @@ public class JavaCodeVisitor implements Visitor<String> {
 
     @Override
     public String visit(StaticMemberVariable node) {
-        IRNode klass = node.getKlass();
-        VariableInfo value = node.get();
-        if (klass.equals(value.klass)) {
-            return value.name;
+        IRNode owner = node.getOwner();
+        VariableInfo info = node.getVariableInfo();
+        if (owner.equals(info.owner)) {
+            return info.name;
         } else {
-            return value.klass.getName() + "." + value.name;
+            return info.owner.getName() + "." + info.name;
         }
     }
 
@@ -910,10 +788,10 @@ public class JavaCodeVisitor implements Visitor<String> {
         String cases = "";
         for (int i = 0; i < caseBlockIdx - 1; ++i) {
             cases += PrintingUtils.align(level + 1);
-            if (node.getChild(i + 1) != null) {
-                cases += "case " + node.getChild(i + 1).accept(this)+ ":\n";
-            } else {
+            if (node.getChild(i + 1) instanceof Nothing) {
                 cases += "default:\n";
+            } else {
+                cases += "case " + node.getChild(i + 1).accept(this)+ ":\n";
             }
 
             cases += node.getChild(i + caseBlockIdx).accept(this)+ "\n";
@@ -955,11 +833,13 @@ public class JavaCodeVisitor implements Visitor<String> {
     public String visit(UnaryOperator node) {
         IRNode exp = node.getChild(0);
         if (node.isPrefix()) {
-            return node.getOperatorText() + (exp instanceof Operator ? " " : "")
+            return operatorToJaveCode(node.getOperationKind())
+                    + (exp instanceof Operator ? " " : "")
                     + expressionToJavaCode(node, exp, Operator.Order.LEFT);
         } else {
             return expressionToJavaCode(node, exp, Operator.Order.RIGHT)
-                    + (exp instanceof Operator ? " " : "") + node.getOperatorText();
+                    + (exp instanceof Operator ? " " : "")
+                    + operatorToJaveCode(node.getOperationKind());
         }
     }
 
@@ -1024,14 +904,18 @@ public class JavaCodeVisitor implements Visitor<String> {
         int level = node.getLevel();
         result.append("try {\n")
                 .append(body.accept(this)).append("\n")
-                .append(PrintingUtils.align(level)).append("}\n");
+                .append(PrintingUtils.align(level))
+                .append("}\n");
         for (int i = 2; i < childs.size(); i++) {
             result.append(childs.get(i).accept(this));
         }
         if (finallyBody != null) {
-            result.append(PrintingUtils.align(level)).append("finally {\n")
-                    .append(finallyBody.accept(this)).append("\n")
-                    .append(PrintingUtils.align(level)).append("}\n");
+            String finallyContent = finallyBody.accept(this);
+            if (!finallyContent.isEmpty()) {
+                result.append(PrintingUtils.align(level)).append("finally {\n")
+                        .append(finallyContent).append("\n")
+                        .append(PrintingUtils.align(level)).append("}\n");
+            }
         }
         return result.toString();
     }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/Visitor.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/Visitor.java
index 9502d89a4ac..600108437b0 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/Visitor.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/Visitor.java
@@ -34,7 +34,6 @@ import jdk.test.lib.jittester.If;
 import jdk.test.lib.jittester.Initialization;
 import jdk.test.lib.jittester.Literal;
 import jdk.test.lib.jittester.LocalVariable;
-import jdk.test.lib.jittester.LogicOperator;
 import jdk.test.lib.jittester.NonStaticMemberVariable;
 import jdk.test.lib.jittester.Nothing;
 import jdk.test.lib.jittester.PrintVariables;
@@ -106,7 +105,6 @@ public interface Visitor<T> {
     T visit(Klass node);
     T visit(Literal node);
     T visit(LocalVariable node);
-    T visit(LogicOperator node);
     T visit(LoopingCondition node);
     T visit(MainKlass node);
     T visit(NonStaticMemberVariable node);

From 64001ce527d5bbab3be29ac45565e43555fbba79 Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Wed, 18 May 2016 21:50:27 +0000
Subject: [PATCH 095/228] 8156835: [JVMCI] clean up and minimize JVMCI

Reviewed-by: iveresov, kvn
---
 hotspot/.mx.jvmci/mx_jvmci.py                 | 115 +------------
 hotspot/.mx.jvmci/suite.py                    |  82 +++------
 .../src/jdk/vm/ci/aarch64/AArch64Kind.java    |  24 +--
 .../src/jdk/vm/ci/code/BytecodeFrame.java     |   5 +
 .../vm/ci/code/CompilationRequestResult.java  |  48 +-----
 .../src/jdk/vm/ci/code/CompiledCode.java      |   4 +-
 .../src/jdk/vm/ci/code/ReferenceMap.java      |   5 +
 .../src/jdk/vm/ci/code/Register.java          |  42 +----
 .../src/jdk/vm/ci/code/RegisterConfig.java    |  11 +-
 .../src/jdk/vm/ci/code/SourceStackTrace.java  |  50 ------
 .../src/jdk/vm/ci/code/ValueUtil.java         |  72 --------
 .../vm/ci/code/site/ConstantReference.java    |   4 +
 .../src/jdk/vm/ci/code/site/DataPatch.java    |   4 +-
 .../vm/ci/code/site/DataSectionReference.java |   4 +
 .../jdk/vm/ci/code/site/InfopointReason.java  |   1 -
 .../src/jdk/vm/ci/code/site/Mark.java         |  18 +-
 .../jdk/vm/ci/code/stack/InspectedFrame.java  |   9 +-
 .../src/jdk/vm/ci/common}/InitTimer.java      |   2 +-
 .../src/jdk/vm/ci/common/JVMCIError.java      |  31 ----
 .../jdk/vm/ci/common}/SuppressFBWarnings.java |   4 +-
 .../src/jdk/vm/ci/common/UnsafeUtil.java      |  81 ---------
 .../AArch64HotSpotJVMCIBackendFactory.java    |   4 +-
 .../aarch64/AArch64HotSpotRegisterConfig.java |   5 -
 .../AMD64HotSpotJVMCIBackendFactory.java      |   4 +-
 .../amd64/AMD64HotSpotRegisterConfig.java     |   5 -
 .../SPARCHotSpotJVMCIBackendFactory.java      |   4 +-
 .../sparc/SPARCHotSpotRegisterConfig.java     |   5 -
 .../src/jdk/vm/ci/hotspot/CompilerToVM.java   |  26 ++-
 .../HotSpotCompilationRequestResult.java      |  96 +++++++++++
 .../vm/ci/hotspot/HotSpotCompiledNmethod.java |   1 -
 .../vm/ci/hotspot/HotSpotConstantPool.java    |   2 +-
 .../HotSpotConstantReflectionProvider.java    |   2 +-
 .../vm/ci/hotspot/HotSpotInstalledCode.java   |   4 +-
 .../hotspot/HotSpotJVMCICompilerConfig.java   |   3 +-
 .../HotSpotJVMCIMetaAccessContext.java        |   9 +-
 .../vm/ci/hotspot/HotSpotJVMCIRuntime.java    |  48 +++---
 .../hotspot/HotSpotJVMCIRuntimeProvider.java  |   7 +-
 .../HotSpotMemoryAccessProviderImpl.java      |   2 +-
 .../ci/hotspot/HotSpotMetaAccessProvider.java |   3 +-
 .../jdk/vm/ci/hotspot/HotSpotMetaData.java    |   5 +-
 .../hotspot/HotSpotMetaspaceConstantImpl.java |   2 +-
 .../src/jdk/vm/ci/hotspot/HotSpotMethod.java  |   2 +-
 .../HotSpotMethodHandleAccessProvider.java    |   2 +-
 .../ci/hotspot/HotSpotObjectConstantImpl.java |   3 +-
 .../src/jdk/vm/ci/hotspot/HotSpotOopMap.java  |  43 -----
 .../vm/ci/hotspot/HotSpotProfilingInfo.java   |   6 +-
 .../vm/ci/hotspot/HotSpotReferenceMap.java    |   2 +-
 .../hotspot/HotSpotResolvedJavaFieldImpl.java |   2 +-
 .../HotSpotResolvedJavaMethodImpl.java        |  11 +-
 .../ci/hotspot/HotSpotResolvedObjectType.java |   2 -
 .../HotSpotResolvedObjectTypeImpl.java        |  11 +-
 .../hotspot/HotSpotResolvedPrimitiveType.java |   9 +-
 .../jdk/vm/ci/hotspot/HotSpotVMConfig.java    |  26 ++-
 ...Proxified.java => SuppressFBWarnings.java} |  15 +-
 .../services/HotSpotVMEventListener.java      |  18 +-
 .../vm/ci/meta/JVMCIMetaAccessContext.java    |  38 -----
 .../src/jdk/vm/ci/meta/JavaConstant.java      | 102 -----------
 .../src/jdk/vm/ci/meta/JavaKind.java          |  46 +++--
 .../src/jdk/vm/ci/meta/JavaType.java          |   9 +
 .../src/jdk/vm/ci/meta/LineNumberTable.java   |  27 ++-
 .../jdk/vm/ci/meta/LineNumberTableImpl.java   |  54 ------
 .../src/jdk/vm/ci/meta/Local.java             |  55 +++++-
 .../src/jdk/vm/ci/meta/LocalImpl.java         |  84 ----------
 .../jdk/vm/ci/meta/LocalVariableTable.java    |  39 ++++-
 .../vm/ci/meta/LocalVariableTableImpl.java    |  67 --------
 .../jdk/vm/ci/meta/MemoryAccessProvider.java  |   8 +-
 .../src/jdk/vm/ci/meta/MetaUtil.java          | 158 ++----------------
 .../src/jdk/vm/ci/meta/PlatformKind.java      |   2 +-
 .../src/jdk/vm/ci/meta/ResolvedJavaType.java  |  15 --
 .../src/jdk/vm/ci/meta/VMConstant.java        |   3 +
 .../src/share/vm/jvmci/jvmciCodeInstaller.cpp |   2 +-
 hotspot/src/share/vm/jvmci/jvmciCompiler.cpp  |   6 +-
 .../src/share/vm/jvmci/jvmciCompilerToVM.cpp  |   4 +-
 .../src/share/vm/jvmci/jvmciJavaClasses.hpp   |  13 +-
 hotspot/src/share/vm/jvmci/jvmciRuntime.cpp   |  34 ++--
 .../share/vm/jvmci/systemDictionary_jvmci.hpp |   3 +-
 .../src/share/vm/jvmci/vmSymbols_jvmci.hpp    |   5 +-
 .../compiler/jvmci/common/JVMCIHelpers.java   |   8 +-
 .../JvmciCreateMetaAccessContextTest.java     | 113 -------------
 .../test/BoxPrimitiveDataProvider.java        |  12 +-
 .../test/UnboxPrimitiveDataProvider.java      |   4 +-
 .../jdk/vm/ci/runtime/test/ConstantTest.java  |  31 +---
 .../ci/runtime/test/TestResolvedJavaType.java |  28 ----
 .../jdk/vm/ci/runtime/test/TypeUniverse.java  |   2 -
 84 files changed, 506 insertions(+), 1471 deletions(-)
 delete mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/SourceStackTrace.java
 rename hotspot/src/jdk.vm.ci/share/classes/{jdk.vm.ci.inittimer/src/jdk/vm/ci/inittimer => jdk.vm.ci.common/src/jdk/vm/ci/common}/InitTimer.java (99%)
 rename hotspot/src/jdk.vm.ci/share/classes/{jdk.vm.ci.inittimer/src/jdk/vm/ci/inittimer => jdk.vm.ci.common/src/jdk/vm/ci/common}/SuppressFBWarnings.java (95%)
 delete mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/UnsafeUtil.java
 create mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompilationRequestResult.java
 delete mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotOopMap.java
 rename hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/{HotSpotProxified.java => SuppressFBWarnings.java} (70%)
 delete mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JVMCIMetaAccessContext.java
 delete mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LineNumberTableImpl.java
 delete mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LocalImpl.java
 delete mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LocalVariableTableImpl.java
 delete mode 100644 hotspot/test/compiler/jvmci/events/JvmciCreateMetaAccessContextTest.java

diff --git a/hotspot/.mx.jvmci/mx_jvmci.py b/hotspot/.mx.jvmci/mx_jvmci.py
index 7e5a2d43510..b359dcf7f95 100644
--- a/hotspot/.mx.jvmci/mx_jvmci.py
+++ b/hotspot/.mx.jvmci/mx_jvmci.py
@@ -144,42 +144,6 @@ def isJVMCIEnabled(vm):
     assert vm in _jdkJvmVariants
     return True
 
-class JvmciJDKDeployedDist(object):
-    def __init__(self, name, compilers=False):
-        self._name = name
-        self._compilers = compilers
-
-    def dist(self):
-        return mx.distribution(self._name)
-
-    def deploy(self, jdkDir):
-        mx.nyi('deploy', self)
-
-    def post_parse_cmd_line(self):
-        self.set_archiveparticipant()
-
-    def set_archiveparticipant(self):
-        dist = self.dist()
-        dist.set_archiveparticipant(JVMCIArchiveParticipant(dist))
-
-class ExtJDKDeployedDist(JvmciJDKDeployedDist):
-    def __init__(self, name):
-        JvmciJDKDeployedDist.__init__(self, name)
-
-"""
-The monolithic JVMCI distribution is deployed through use of -Xbootclasspath/p
-so that it's not necessary to run JDK make after editing JVMCI sources.
-The latter causes all JDK Java sources to be rebuilt since JVMCI is
-(currently) in java.base.
-"""
-_monolithicJvmci = JvmciJDKDeployedDist('JVMCI')
-
-"""
-List of distributions that are deployed on the boot class path.
-Note: In jvmci-8, they were deployed directly into the JDK directory.
-"""
-jdkDeployedDists = [_monolithicJvmci]
-
 def _makehelp():
     return subprocess.check_output([mx.gmake_cmd(), 'help'], cwd=_jdkSourceRoot)
 
@@ -217,7 +181,10 @@ To build hotspot and import it into the JDK: "mx make hotspot import-hotspot"
 
         # The OpenJDK build creates an empty cacerts file so copy one from
         # the default JDK (which is assumed to be an OracleJDK)
-        srcCerts = join(mx.get_jdk(tag='default').home, 'jre', 'lib', 'security', 'cacerts')
+        srcCerts = join(mx.get_jdk(tag='default').home, 'lib', 'security', 'cacerts')
+        if not exists(srcCerts):
+            # Might be building with JDK8 which has cacerts under jre/
+            srcCerts = join(mx.get_jdk(tag='default').home, 'jre', 'lib', 'security', 'cacerts')
         dstCerts = join(jdkImageDir, 'lib', 'security', 'cacerts')
         shutil.copyfile(srcCerts, dstCerts)
 
@@ -673,24 +640,6 @@ def jol(args):
 
     run_vm(['-javaagent:' + joljar, '-cp', os.pathsep.join([mx.classpath(), joljar]), "org.openjdk.jol.MainObjectInternals"] + candidates)
 
-class JVMCIArchiveParticipant:
-    def __init__(self, dist):
-        self.dist = dist
-
-    def __opened__(self, arc, srcArc, services):
-        self.services = services
-        self.jvmciServices = services
-        self.arc = arc
-
-    def __add__(self, arcname, contents):
-        return False
-
-    def __addsrc__(self, arcname, contents):
-        return False
-
-    def __closing__(self):
-        pass
-
 def _get_openjdk_os():
     # See: common/autoconf/platform.m4
     os = mx.get_os()
@@ -744,10 +693,6 @@ def _get_hotspot_build_dir(jvmVariant=None, debugLevel=None):
     name = '{}_{}_{}'.format(os, arch, buildname)
     return join(_get_jdk_build_dir(debugLevel=debugLevel), 'hotspot', name)
 
-def add_bootclasspath_prepend(dep):
-    assert isinstance(dep, mx.ClasspathDependency)
-    _jvmci_bootclasspath_prepends.append(dep)
-
 class JVMCI9JDKConfig(mx.JDKConfig):
     def __init__(self, debugLevel):
         self.debugLevel = debugLevel
@@ -771,20 +716,6 @@ class JVMCI9JDKConfig(mx.JDKConfig):
             cp = os.pathsep.join([e for e in cp.split(os.pathsep) if e not in excluded])
             args[cpIndex] = cp
 
-        jvmciModeArgs = _jvmciModes[_vm.jvmciMode]
-        if jvmciModeArgs:
-            bcpDeps = [jdkDist.dist() for jdkDist in jdkDeployedDists]
-            if bcpDeps:
-                args = ['-Xbootclasspath/p:' + os.pathsep.join([d.classpath_repr() for d in bcpDeps])] + args
-
-        # Set the default JVMCI compiler
-        for jdkDist in reversed(jdkDeployedDists):
-            assert isinstance(jdkDist, JvmciJDKDeployedDist), jdkDist
-            if jdkDist._compilers:
-                jvmciCompiler = jdkDist._compilers[-1]
-                args = ['-Djvmci.compiler=' + jvmciCompiler] + args
-                break
-
         if '-version' in args:
             ignoredArgs = args[args.index('-version') + 1:]
             if  len(ignoredArgs) > 0:
@@ -877,41 +808,3 @@ def mx_post_parse_cmd_line(opts):
             mx.warn('Ignoring "--jvmci-mode" option as "--jdk" tag is not "' + _JVMCI_JDK_TAG + '"')
 
     _vm.update(jvmVariant, debugLevel, jvmciMode)
-
-    for jdkDist in jdkDeployedDists:
-        jdkDist.post_parse_cmd_line()
-
-def _update_JDK9_STUBS_library():
-    """
-    Sets the "path" and "sha1" attributes of the "JDK9_STUBS" library.
-    """
-    jdk9InternalLib = _suite.suiteDict['libraries']['JDK9_STUBS']
-    jarInputDir = join(_suite.get_output_root(), 'jdk9-stubs')
-    jarPath = join(_suite.get_output_root(), 'jdk9-stubs.jar')
-
-    stubs = [
-        ('jdk.internal.misc', 'VM', """package jdk.internal.misc;
-public class VM {
-    public static String getSavedProperty(String key) {
-        throw new InternalError("should not reach here");
-    }
-}
-""")
-    ]
-
-    if not exists(jarPath):
-        sourceFiles = []
-        for (package, className, source) in stubs:
-            sourceFile = join(jarInputDir, package.replace('.', os.sep), className + '.java')
-            mx.ensure_dir_exists(os.path.dirname(sourceFile))
-            with open(sourceFile, 'w') as fp:
-                fp.write(source)
-            sourceFiles.append(sourceFile)
-        jdk = mx.get_jdk(tag='default')
-        mx.run([jdk.javac, '-d', jarInputDir] + sourceFiles)
-        mx.run([jdk.jar, 'cf', jarPath, '.'], cwd=jarInputDir)
-
-    jdk9InternalLib['path'] = jarPath
-    jdk9InternalLib['sha1'] = mx.sha1OfFile(jarPath)
-
-_update_JDK9_STUBS_library()
diff --git a/hotspot/.mx.jvmci/suite.py b/hotspot/.mx.jvmci/suite.py
index 63e00ca4c48..9ca4c8cb77e 100644
--- a/hotspot/.mx.jvmci/suite.py
+++ b/hotspot/.mx.jvmci/suite.py
@@ -1,5 +1,5 @@
 suite = {
-  "mxversion" : "5.6.16",
+  "mxversion" : "5.23.1",
   "name" : "jvmci",
   "url" : "http://openjdk.java.net/projects/graal",
   "developer" : {
@@ -36,13 +36,6 @@ suite = {
       "urls" : ["http://central.maven.org/maven2/org/testng/testng/6.9.10/testng-6.9.10.jar"],
       "sha1" : "6feb3e964aeb7097aff30c372aac3ec0f8d87ede",
     },
-
-    # Stubs for classes introduced in JDK9 that allow compilation with a JDK8 javac and Eclipse.
-    # The "path" and "sha1" attributes are added when mx_jvmci is loaded
-    # (see mx_jvmci._update_JDK9_STUBS_library()).
-    "JDK9_STUBS" : {
-        "license" : "GPLv2-CPE",
-     },
   },
 
   "projects" : {
@@ -52,7 +45,7 @@ suite = {
     "jdk.vm.ci.services" : {
       "subDir" : "src/jdk.vm.ci/share/classes",
       "sourceDirs" : ["src"],
-      "javaCompliance" : "1.8",
+      "javaCompliance" : "9",
       "workingSets" : "API,JVMCI",
     },
 
@@ -62,7 +55,7 @@ suite = {
       "subDir" : "src/jdk.vm.ci/share/classes",
       "sourceDirs" : ["src"],
       "checkstyle" : "jdk.vm.ci.services",
-      "javaCompliance" : "1.8",
+      "javaCompliance" : "9",
       "workingSets" : "API,JVMCI",
     },
 
@@ -70,7 +63,7 @@ suite = {
       "subDir" : "src/jdk.vm.ci/share/classes",
       "sourceDirs" : ["src"],
       "checkstyle" : "jdk.vm.ci.services",
-      "javaCompliance" : "1.8",
+      "javaCompliance" : "9",
       "workingSets" : "API,JVMCI",
     },
 
@@ -79,7 +72,7 @@ suite = {
       "sourceDirs" : ["src"],
       "dependencies" : ["jdk.vm.ci.meta"],
       "checkstyle" : "jdk.vm.ci.services",
-      "javaCompliance" : "1.8",
+      "javaCompliance" : "9",
       "workingSets" : "API,JVMCI",
     },
 
@@ -94,7 +87,7 @@ suite = {
         "jdk.vm.ci.hotspot",
       ],
       "checkstyle" : "jdk.vm.ci.services",
-      "javaCompliance" : "1.8",
+      "javaCompliance" : "9",
       "workingSets" : "API,JVMCI",
     },
 
@@ -106,7 +99,7 @@ suite = {
         "jdk.vm.ci.services",
       ],
       "checkstyle" : "jdk.vm.ci.services",
-      "javaCompliance" : "1.8",
+      "javaCompliance" : "9",
       "workingSets" : "API,JVMCI",
     },
 
@@ -119,18 +112,10 @@ suite = {
         "jdk.vm.ci.runtime",
       ],
       "checkstyle" : "jdk.vm.ci.services",
-      "javaCompliance" : "1.8",
+      "javaCompliance" : "9",
       "workingSets" : "API,JVMCI",
     },
 
-    "jdk.vm.ci.inittimer" : {
-      "subDir" : "src/jdk.vm.ci/share/classes",
-      "sourceDirs" : ["src"],
-      "checkstyle" : "jdk.vm.ci.services",
-      "javaCompliance" : "1.8",
-      "workingSets" : "JVMCI",
-    },
-
     # ------------- JVMCI:HotSpot -------------
 
     "jdk.vm.ci.aarch64" : {
@@ -138,7 +123,7 @@ suite = {
       "sourceDirs" : ["src"],
       "dependencies" : ["jdk.vm.ci.code"],
       "checkstyle" : "jdk.vm.ci.services",
-      "javaCompliance" : "1.8",
+      "javaCompliance" : "9",
       "workingSets" : "JVMCI,AArch64",
     },
 
@@ -147,7 +132,7 @@ suite = {
       "sourceDirs" : ["src"],
       "dependencies" : ["jdk.vm.ci.code"],
       "checkstyle" : "jdk.vm.ci.services",
-      "javaCompliance" : "1.8",
+      "javaCompliance" : "9",
       "workingSets" : "JVMCI,AMD64",
     },
 
@@ -156,7 +141,7 @@ suite = {
       "sourceDirs" : ["src"],
       "dependencies" : ["jdk.vm.ci.code"],
       "checkstyle" : "jdk.vm.ci.services",
-      "javaCompliance" : "1.8",
+      "javaCompliance" : "9",
       "workingSets" : "JVMCI,SPARC",
     },
 
@@ -166,13 +151,15 @@ suite = {
       "dependencies" : [
         "jdk.vm.ci.hotspotvmconfig",
         "jdk.vm.ci.common",
-        "jdk.vm.ci.inittimer",
         "jdk.vm.ci.runtime",
         "jdk.vm.ci.services",
-        "JDK9_STUBS",
+      ],
+      "imports" : [
+        "jdk.internal.misc",
+        "jdk.internal.org.objectweb.asm",
       ],
       "checkstyle" : "jdk.vm.ci.services",
-      "javaCompliance" : "1.8",
+      "javaCompliance" : "9",
       "workingSets" : "JVMCI",
     },
 
@@ -184,7 +171,7 @@ suite = {
         "jdk.vm.ci.hotspot",
       ],
       "checkstyle" : "jdk.vm.ci.services",
-      "javaCompliance" : "1.8",
+      "javaCompliance" : "9",
       "workingSets" : "API,JVMCI",
     },
 
@@ -192,7 +179,7 @@ suite = {
       "subDir" : "src/jdk.vm.ci/share/classes",
       "sourceDirs" : ["src"],
       "checkstyle" : "jdk.vm.ci.services",
-      "javaCompliance" : "1.8",
+      "javaCompliance" : "9",
       "workingSets" : "JVMCI,HotSpot",
     },
 
@@ -204,7 +191,7 @@ suite = {
         "jdk.vm.ci.hotspot",
       ],
       "checkstyle" : "jdk.vm.ci.services",
-      "javaCompliance" : "1.8",
+      "javaCompliance" : "9",
       "workingSets" : "JVMCI,HotSpot,AArch64",
     },
 
@@ -216,7 +203,7 @@ suite = {
         "jdk.vm.ci.hotspot",
       ],
       "checkstyle" : "jdk.vm.ci.services",
-      "javaCompliance" : "1.8",
+      "javaCompliance" : "9",
       "workingSets" : "JVMCI,HotSpot,AMD64",
     },
 
@@ -228,7 +215,7 @@ suite = {
         "jdk.vm.ci.hotspot",
       ],
       "checkstyle" : "jdk.vm.ci.services",
-      "javaCompliance" : "1.8",
+      "javaCompliance" : "9",
       "workingSets" : "JVMCI,HotSpot,SPARC",
     },
 
@@ -250,7 +237,6 @@ suite = {
     "JVMCI_API" : {
       "subDir" : "src/jdk.vm.ci/share/classes",
       "dependencies" : [
-        "jdk.vm.ci.inittimer",
         "jdk.vm.ci.runtime",
         "jdk.vm.ci.common",
         "jdk.vm.ci.aarch64",
@@ -293,31 +279,5 @@ suite = {
       ],
       "exclude" : ["mx:JUNIT"],
     },
-
-    # This exists to have a monolithic jvmci.jar file which simplifies
-    # using the -Xoverride option in JDK9.
-    "JVMCI" : {
-      "subDir" : "src/jdk.vm.ci/share/classes",
-      "overlaps" : [
-        "JVMCI_API",
-        "JVMCI_SERVICES",
-        "JVMCI_HOTSPOT",
-        "JVMCI_HOTSPOTVMCONFIG",
-      ],
-      "dependencies" : [
-        "jdk.vm.ci.services",
-        "jdk.vm.ci.inittimer",
-        "jdk.vm.ci.runtime",
-        "jdk.vm.ci.common",
-        "jdk.vm.ci.aarch64",
-        "jdk.vm.ci.amd64",
-        "jdk.vm.ci.sparc",
-        "jdk.vm.ci.hotspotvmconfig",
-        "jdk.vm.ci.hotspot.aarch64",
-        "jdk.vm.ci.hotspot.amd64",
-        "jdk.vm.ci.hotspot.sparc",
-      ],
-      "exclude" : ["JDK9_STUBS"]
-    },
   },
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64Kind.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64Kind.java
index c996fdb9f2d..3e0d8bde066 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64Kind.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64Kind.java
@@ -45,12 +45,7 @@ public enum AArch64Kind implements PlatformKind {
     V128_DWORD(16, DWORD),
     V128_QWORD(16, QWORD),
     V128_SINGLE(16, SINGLE),
-    V128_DOUBLE(16, DOUBLE),
-
-    MASK8(1),
-    MASK16(2),
-    MASK32(4),
-    MASK64(8);
+    V128_DOUBLE(16, DOUBLE);
 
     private final int size;
     private final int vectorLength;
@@ -121,18 +116,6 @@ public enum AArch64Kind implements PlatformKind {
         }
     }
 
-    public boolean isMask() {
-        switch (this) {
-            case MASK8:
-            case MASK16:
-            case MASK32:
-            case MASK64:
-                return true;
-            default:
-                return false;
-        }
-    }
-
     public char getTypeChar() {
         switch (this) {
             case BYTE:
@@ -159,11 +142,6 @@ public enum AArch64Kind implements PlatformKind {
             case V128_SINGLE:
             case V128_DOUBLE:
                 return 'v';
-            case MASK8:
-            case MASK16:
-            case MASK32:
-            case MASK64:
-                return 'k';
             default:
                 return '-';
         }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/BytecodeFrame.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/BytecodeFrame.java
index 409601866d6..d7aa4af0133 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/BytecodeFrame.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/BytecodeFrame.java
@@ -98,6 +98,11 @@ public class BytecodeFrame extends BytecodePosition {
      */
     public final boolean rethrowException;
 
+    /**
+     * Specifies if this object represents a frame state in the middle of executing a call. If
+     * true, the arguments to the call have been popped from the stack and the return value (for a
+     * non-void call) has not yet been pushed.
+     */
     public final boolean duringCall;
 
     /**
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CompilationRequestResult.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CompilationRequestResult.java
index fcde020b7d9..1189e563a72 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CompilationRequestResult.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CompilationRequestResult.java
@@ -23,49 +23,15 @@
 package jdk.vm.ci.code;
 
 /**
- * Simple class to provide information about the result of a compile request.
+ * Provides information about the result of a {@link CompilationRequest}.
  */
-public final class CompilationRequestResult {
+public interface CompilationRequestResult {
 
     /**
-     * A user readable description of the failure.
+     * Determines if the compilation was successful.
+     *
+     * @return a non-null object whose {@link Object#toString()} describes the failure or null if
+     *         compilation was successful
      */
-    private final String failureMessage;
-
-    /**
-     * Whether this is a transient failure where retrying would help.
-     */
-    private final boolean retry;
-
-    /**
-     * Number of bytecodes inlined into the compilation, exclusive of the bytecodes in the root
-     * method.
-     */
-    private final int inlinedBytecodes;
-
-    private CompilationRequestResult(String failureMessage, boolean retry, int inlinedBytecodes) {
-        this.failureMessage = failureMessage;
-        this.retry = retry;
-        this.inlinedBytecodes = inlinedBytecodes;
-    }
-
-    public static CompilationRequestResult success(int inlinedBytecodes) {
-        return new CompilationRequestResult(null, true, inlinedBytecodes);
-    }
-
-    public static CompilationRequestResult failure(String failureMessage, boolean retry) {
-        return new CompilationRequestResult(failureMessage, retry, 0);
-    }
-
-    public String getFailureMessage() {
-        return failureMessage;
-    }
-
-    public boolean getRetry() {
-        return retry;
-    }
-
-    public int getInlinedBytecodes() {
-        return inlinedBytecodes;
-    }
+    Object getFailure();
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CompiledCode.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CompiledCode.java
index 214bcbfaafe..75a5429ac09 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CompiledCode.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CompiledCode.java
@@ -23,7 +23,9 @@
 package jdk.vm.ci.code;
 
 /**
- * The output from compiling a method.
+ * Marker type for an object containing the output of a compiler in a form suitable for installing
+ * into a managed code heap. Since the details of a code heap are specific to each runtime, this
+ * interface does not specify any methods.
  */
 public interface CompiledCode {
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/ReferenceMap.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/ReferenceMap.java
index 1d1491de252..305c503105a 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/ReferenceMap.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/ReferenceMap.java
@@ -22,5 +22,10 @@
  */
 package jdk.vm.ci.code;
 
+/**
+ * Marker type for an object containing information about where the object references are in machine
+ * state (e.g., registers or stack locations). This is typically associated with an execution point
+ * in compiled code.
+ */
 public abstract class ReferenceMap {
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Register.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Register.java
index 16d007b555e..f271053db1e 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Register.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Register.java
@@ -36,17 +36,9 @@ public final class Register implements Comparable<Register> {
      */
     public static final Register None = new Register(-1, -1, "noreg", SPECIAL);
 
-    /**
-     * Frame pointer of the current method. All spill slots and outgoing stack-based arguments are
-     * addressed relative to this register.
-     */
-    public static final Register Frame = new Register(-2, -2, "framereg", SPECIAL);
-
-    public static final Register CallerFrame = new Register(-3, -3, "callerframereg", SPECIAL);
-
     /**
      * The identifier for this register that is unique across all the registers in a
-     * {@link Architecture}. A valid register has {@code number > 0}.
+     * {@link Architecture}. A valid register has {@code number >= 0}.
      */
     public final int number;
 
@@ -165,38 +157,6 @@ public final class Register implements Comparable<Register> {
         return number >= 0;
     }
 
-    /**
-     * Gets the maximum register {@linkplain #number number} in a given set of registers.
-     *
-     * @param registers the set of registers to process
-     * @return the maximum register number for any register in {@code registers}
-     */
-    public static int maxRegisterNumber(Register[] registers) {
-        int max = Integer.MIN_VALUE;
-        for (Register r : registers) {
-            if (r.number > max) {
-                max = r.number;
-            }
-        }
-        return max;
-    }
-
-    /**
-     * Gets the maximum register {@linkplain #encoding encoding} in a given set of registers.
-     *
-     * @param registers the set of registers to process
-     * @return the maximum register encoding for any register in {@code registers}
-     */
-    public static int maxRegisterEncoding(Register[] registers) {
-        int max = Integer.MIN_VALUE;
-        for (Register r : registers) {
-            if (r.encoding > max) {
-                max = r.encoding;
-            }
-        }
-        return max;
-    }
-
     @Override
     public String toString() {
         return name;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterConfig.java
index 8cbd936dd30..d2b83496af9 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterConfig.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterConfig.java
@@ -47,7 +47,8 @@ public interface RegisterConfig {
     }
 
     /**
-     * Gets the register to which {@link Register#Frame} and {@link Register#CallerFrame} are bound.
+     * Gets the register used as the frame pointer. Spill slots and outgoing stack-based arguments
+     * are addressed relative to this register.
      */
     Register getFrameRegister();
 
@@ -106,14 +107,6 @@ public interface RegisterConfig {
      */
     RegisterAttributes[] getAttributesMap();
 
-    /**
-     * Gets the register corresponding to a runtime-defined role.
-     *
-     * @param id the identifier of a runtime-defined register role
-     * @return the register playing the role specified by {@code id}
-     */
-    Register getRegisterForRole(int id);
-
     /**
      * Determines if all {@link #getAllocatableRegisters() allocatable} registers are
      * {@link #getCallerSaveRegisters() caller saved}.
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/SourceStackTrace.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/SourceStackTrace.java
deleted file mode 100644
index 33f875483d1..00000000000
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/SourceStackTrace.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2015, 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.code;
-
-/**
- * Class representing an exception with a stack trace of the currently processed position in the
- * compiled Java program instead of the stack trace of the compiler. The exception of the compiler
- * is saved as the cause of this exception.
- */
-public abstract class SourceStackTrace extends BailoutException {
-    private static final long serialVersionUID = 2144811793442316776L;
-
-    public static SourceStackTrace create(Throwable cause, String format, StackTraceElement[] elements) {
-        return new SourceStackTrace(cause, format) {
-
-            private static final long serialVersionUID = 6279381376051787907L;
-
-            @Override
-            public synchronized Throwable fillInStackTrace() {
-                assert elements != null;
-                setStackTrace(elements);
-                return this;
-            }
-        };
-    }
-
-    private SourceStackTrace(Throwable cause, String format) {
-        super(cause, format);
-    }
-}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/ValueUtil.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/ValueUtil.java
index 20bde745829..8b019a9df0a 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/ValueUtil.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/ValueUtil.java
@@ -22,9 +22,6 @@
  */
 package jdk.vm.ci.code;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import jdk.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaValue;
@@ -111,73 +108,4 @@ public final class ValueUtil {
             return asRegister(value);
         }
     }
-
-    public static boolean sameRegister(Value v1, Value v2) {
-        return isRegister(v1) && isRegister(v2) && asRegister(v1).equals(asRegister(v2));
-    }
-
-    public static boolean sameRegister(Value v1, Value v2, Value v3) {
-        return sameRegister(v1, v2) && sameRegister(v1, v3);
-    }
-
-    /**
-     * Checks if all the provided values are different physical registers. The parameters can be
-     * either {@link Register registers}, {@link Value values} or arrays of them. All values that
-     * are not {@link RegisterValue registers} are ignored.
-     */
-    public static boolean differentRegisters(Object... values) {
-        List<Register> registers = collectRegisters(values, new ArrayList<Register>());
-        for (int i = 1; i < registers.size(); i++) {
-            Register r1 = registers.get(i);
-            for (int j = 0; j < i; j++) {
-                Register r2 = registers.get(j);
-                if (r1.equals(r2)) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    private static List<Register> collectRegisters(Object[] values, List<Register> registers) {
-        for (Object o : values) {
-            if (o instanceof Register) {
-                registers.add((Register) o);
-            } else if (o instanceof Value) {
-                if (isRegister((Value) o)) {
-                    registers.add(asRegister((Value) o));
-                }
-            } else if (o instanceof Object[]) {
-                collectRegisters((Object[]) o, registers);
-            } else {
-                throw new IllegalArgumentException("Not a Register or Value: " + o);
-            }
-        }
-        return registers;
-    }
-
-    /**
-     * Subtract sets of registers (x - y).
-     *
-     * @param x a set of register to subtract from.
-     * @param y a set of registers to subtract.
-     * @return resulting set of registers (x - y).
-     */
-    public static Value[] subtractRegisters(Value[] x, Value[] y) {
-        ArrayList<Value> result = new ArrayList<>(x.length);
-        for (Value i : x) {
-            boolean append = true;
-            for (Value j : y) {
-                if (ValueUtil.sameRegister(i, j)) {
-                    append = false;
-                    break;
-                }
-            }
-            if (append) {
-                result.add(i);
-            }
-        }
-        Value[] resultArray = new Value[result.size()];
-        return result.toArray(resultArray);
-    }
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/ConstantReference.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/ConstantReference.java
index 59f0a1e6a55..232bc477de6 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/ConstantReference.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/ConstantReference.java
@@ -26,6 +26,10 @@ import java.util.Objects;
 
 import jdk.vm.ci.meta.VMConstant;
 
+/**
+ * Represents an embedded {@link VMConstant} in the code or data section that needs to be
+ * {@link DataPatch patched} by the VM (e.g. an embedded pointer to a Java object).
+ */
 public final class ConstantReference extends Reference {
 
     private final VMConstant constant;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/DataPatch.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/DataPatch.java
index 45941aac9a0..df67033d8e9 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/DataPatch.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/DataPatch.java
@@ -24,12 +24,12 @@ package jdk.vm.ci.code.site;
 
 import java.util.Objects;
 
-import jdk.vm.ci.meta.JavaConstant;
+import jdk.vm.ci.meta.VMConstant;
 
 /**
  * Represents a code site that references some data. The associated data can be either a
  * {@link DataSectionReference reference} to the data section, or it may be an inlined
- * {@link JavaConstant} that needs to be patched.
+ * {@link VMConstant} that needs to be patched.
  */
 public final class DataPatch extends Site {
 
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/DataSectionReference.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/DataSectionReference.java
index 5602c99d4cb..364141e2c2a 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/DataSectionReference.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/DataSectionReference.java
@@ -22,6 +22,10 @@
  */
 package jdk.vm.ci.code.site;
 
+/**
+ * Represents a pointer to some location in the data section that should be {@link DataPatch
+ * patched} into the code.
+ */
 public final class DataSectionReference extends Reference {
 
     private boolean initialized;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/InfopointReason.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/InfopointReason.java
index 6509dbdf69d..ae890bde4ca 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/InfopointReason.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/InfopointReason.java
@@ -30,7 +30,6 @@ public enum InfopointReason {
     SAFEPOINT,
     CALL,
     IMPLICIT_EXCEPTION,
-    METASPACE_ACCESS,
     METHOD_START,
     METHOD_END,
     BYTECODE_POSITION;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Mark.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Mark.java
index 29de0c01334..ed2dc336dbb 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Mark.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/site/Mark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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,23 @@ package jdk.vm.ci.code.site;
 import java.util.Objects;
 
 /**
- * Represents a mark in the machine code that can be used by the runtime for its own purposes. A
- * mark can reference other marks.
+ * Associates arbitrary information with a position in machine code. For example, HotSpot specific
+ * code in a compiler backend may use this to denote the position of a safepoint, exception handler
+ * entry point, verified entry point etc.
  */
 public final class Mark extends Site {
 
+    /**
+     * An object denoting extra semantic information about the machine code position of this mark.
+     */
     public final Object id;
 
+    /**
+     * Creates a mark that associates {@code id} with the machine code position {@code pcOffset}.
+     *
+     * @param pcOffset
+     * @param id
+     */
     public Mark(int pcOffset, Object id) {
         super(pcOffset);
         this.id = id;
@@ -40,7 +50,7 @@ public final class Mark extends Site {
     @Override
     public String toString() {
         if (id == null) {
-            return String.format("%d[<mar>]", pcOffset);
+            return String.format("%d[<mark>]", pcOffset);
         } else if (id instanceof Integer) {
             return String.format("%d[<mark with id %s>]", pcOffset, Integer.toHexString((Integer) id));
         } else {
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/stack/InspectedFrame.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/stack/InspectedFrame.java
index 7453b69fd92..eeb8ffb8400 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/stack/InspectedFrame.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/stack/InspectedFrame.java
@@ -24,16 +24,19 @@ package jdk.vm.ci.code.stack;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
+/**
+ * Access to the object variables in a stack frame.
+ */
 public interface InspectedFrame {
 
     /**
-     * Returns the value of the local at the given index. Currently only works for object values.
-     * This value is a copy iff {@link #isVirtual(int)} is true.
+     * Returns the value of the object local at {@code index}. This value is a copy iff
+     * {@link #isVirtual(int)} is true.
      */
     Object getLocal(int index);
 
     /**
-     * Returns whether the local at the given index is a virtual object, and therefore the object
+     * Returns whether the local at {@code index} is a virtual object, and therefore the object
      * returned by {@link #getLocal(int)} is a copy.
      */
     boolean isVirtual(int index);
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.inittimer/src/jdk/vm/ci/inittimer/InitTimer.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/InitTimer.java
similarity index 99%
rename from hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.inittimer/src/jdk/vm/ci/inittimer/InitTimer.java
rename to hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/InitTimer.java
index 01fad3d82be..85eb72e49ac 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.inittimer/src/jdk/vm/ci/inittimer/InitTimer.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/InitTimer.java
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.vm.ci.inittimer;
+package jdk.vm.ci.common;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/JVMCIError.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/JVMCIError.java
index 485d2c65a3a..e5b4180b1d9 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/JVMCIError.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/JVMCIError.java
@@ -31,7 +31,6 @@ import java.util.Locale;
 public class JVMCIError extends Error {
 
     private static final long serialVersionUID = 531632331813456233L;
-    private final ArrayList<String> context = new ArrayList<>();
 
     public static RuntimeException unimplemented() {
         throw new JVMCIError("unimplemented");
@@ -101,27 +100,6 @@ public class JVMCIError extends Error {
         super(cause);
     }
 
-    /**
-     * This constructor creates a {@link JVMCIError} and adds all the
-     * {@linkplain #addContext(String) context} of another {@link JVMCIError}.
-     *
-     * @param e the original {@link JVMCIError}
-     */
-    public JVMCIError(JVMCIError e) {
-        super(e);
-        context.addAll(e.context);
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder str = new StringBuilder();
-        str.append(super.toString());
-        for (String s : context) {
-            str.append("\n\tat ").append(s);
-        }
-        return str.toString();
-    }
-
     private static String format(String msg, Object... args) {
         if (args != null) {
             // expand Iterable parameters into a list representation
@@ -137,13 +115,4 @@ public class JVMCIError extends Error {
         }
         return String.format(Locale.ENGLISH, msg, args);
     }
-
-    public JVMCIError addContext(String newContext) {
-        this.context.add(newContext);
-        return this;
-    }
-
-    public JVMCIError addContext(String name, Object obj) {
-        return addContext(format("%s: %s", name, obj));
-    }
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.inittimer/src/jdk/vm/ci/inittimer/SuppressFBWarnings.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/SuppressFBWarnings.java
similarity index 95%
rename from hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.inittimer/src/jdk/vm/ci/inittimer/SuppressFBWarnings.java
rename to hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/SuppressFBWarnings.java
index 0a0a7c3aae4..870693c8e9c 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.inittimer/src/jdk/vm/ci/inittimer/SuppressFBWarnings.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/SuppressFBWarnings.java
@@ -20,12 +20,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.vm.ci.inittimer;
+package jdk.vm.ci.common;
 
 /**
  * Used to suppress <a href="http://findbugs.sourceforge.net">FindBugs</a> warnings.
  */
-public @interface SuppressFBWarnings {
+@interface SuppressFBWarnings {
     /**
      * The set of FindBugs
      * <a href="http://findbugs.sourceforge.net/bugDescriptions.html">warnings</a> that are to be
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/UnsafeUtil.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/UnsafeUtil.java
deleted file mode 100644
index 9b8f75511c4..00000000000
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/UnsafeUtil.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2012, 2012, 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.common;
-
-import jdk.internal.misc.Unsafe;
-
-/**
- * Utilities for operating on raw memory with {@link Unsafe}.
- */
-public class UnsafeUtil {
-
-    /**
-     * Copies the contents of a {@link String} to a native memory buffer as a {@code '\0'}
-     * terminated C string. The native memory buffer is allocated via
-     * {@link Unsafe#allocateMemory(long)}. The caller is responsible for releasing the buffer when
-     * it is no longer needed via {@link Unsafe#freeMemory(long)}.
-     *
-     * @return the native memory pointer of the C string created from {@code s}
-     */
-    public static long createCString(Unsafe unsafe, String s) {
-        return writeCString(unsafe, s, unsafe.allocateMemory(s.length() + 1));
-    }
-
-    /**
-     * Reads a {@code '\0'} terminated C string from native memory and converts it to a
-     * {@link String}.
-     *
-     * @return a Java string
-     */
-    public static String readCString(Unsafe unsafe, long address) {
-        if (address == 0) {
-            return null;
-        }
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0;; i++) {
-            char c = (char) unsafe.getByte(address + i);
-            if (c == 0) {
-                break;
-            }
-            sb.append(c);
-        }
-        return sb.toString();
-    }
-
-    /**
-     * Writes the contents of a {@link String} to a native memory buffer as a {@code '\0'}
-     * terminated C string. The caller is responsible for ensuring the buffer is at least
-     * {@code s.length() + 1} bytes long. The caller is also responsible for releasing the buffer
-     * when it is no longer.
-     *
-     * @return the value of {@code buf}
-     */
-    public static long writeCString(Unsafe unsafe, String s, long buf) {
-        int size = s.length();
-        for (int i = 0; i < size; i++) {
-            unsafe.putByte(buf + i, (byte) s.charAt(i));
-        }
-        unsafe.putByte(buf + size, (byte) '\0');
-        return buf;
-    }
-}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java
index 9762b605270..86ab33b915e 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java
@@ -22,7 +22,7 @@
  */
 package jdk.vm.ci.hotspot.aarch64;
 
-import static jdk.vm.ci.inittimer.InitTimer.timer;
+import static jdk.vm.ci.common.InitTimer.timer;
 
 import java.util.EnumSet;
 
@@ -31,6 +31,7 @@ import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.RegisterConfig;
 import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.code.stack.StackIntrospection;
+import jdk.vm.ci.common.InitTimer;
 import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider;
 import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider;
 import jdk.vm.ci.hotspot.HotSpotJVMCIBackendFactory;
@@ -38,7 +39,6 @@ import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider;
 import jdk.vm.ci.hotspot.HotSpotMetaAccessProvider;
 import jdk.vm.ci.hotspot.HotSpotStackIntrospection;
 import jdk.vm.ci.hotspot.HotSpotVMConfig;
-import jdk.vm.ci.inittimer.InitTimer;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.runtime.JVMCIBackend;
 
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java
index c8d913d3c21..41a85806197 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java
@@ -195,11 +195,6 @@ public class AArch64HotSpotRegisterConfig implements RegisterConfig {
         return allAllocatableAreCallerSaved;
     }
 
-    @Override
-    public Register getRegisterForRole(int index) {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public CallingConvention getCallingConvention(Type type, JavaType returnType, JavaType[] parameterTypes, ValueKindFactory<?> valueKindFactory) {
         HotSpotCallingConventionType hotspotType = (HotSpotCallingConventionType) type;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java
index 2106b07aeb2..474153c707e 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java
@@ -22,7 +22,7 @@
  */
 package jdk.vm.ci.hotspot.amd64;
 
-import static jdk.vm.ci.inittimer.InitTimer.timer;
+import static jdk.vm.ci.common.InitTimer.timer;
 
 import java.util.EnumSet;
 
@@ -31,6 +31,7 @@ import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.RegisterConfig;
 import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.code.stack.StackIntrospection;
+import jdk.vm.ci.common.InitTimer;
 import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider;
 import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider;
 import jdk.vm.ci.hotspot.HotSpotJVMCIBackendFactory;
@@ -38,7 +39,6 @@ import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider;
 import jdk.vm.ci.hotspot.HotSpotMetaAccessProvider;
 import jdk.vm.ci.hotspot.HotSpotStackIntrospection;
 import jdk.vm.ci.hotspot.HotSpotVMConfig;
-import jdk.vm.ci.inittimer.InitTimer;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.runtime.JVMCIBackend;
 
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotRegisterConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotRegisterConfig.java
index 45a3ad32075..0424d3aa0e7 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotRegisterConfig.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotRegisterConfig.java
@@ -192,11 +192,6 @@ public class AMD64HotSpotRegisterConfig implements RegisterConfig {
         return allAllocatableAreCallerSaved;
     }
 
-    @Override
-    public Register getRegisterForRole(int index) {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public CallingConvention getCallingConvention(Type type, JavaType returnType, JavaType[] parameterTypes, ValueKindFactory<?> valueKindFactory) {
         HotSpotCallingConventionType hotspotType = (HotSpotCallingConventionType) type;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotJVMCIBackendFactory.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotJVMCIBackendFactory.java
index ca1ffeedfb2..724266baf8a 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotJVMCIBackendFactory.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotJVMCIBackendFactory.java
@@ -22,7 +22,7 @@
  */
 package jdk.vm.ci.hotspot.sparc;
 
-import static jdk.vm.ci.inittimer.InitTimer.timer;
+import static jdk.vm.ci.common.InitTimer.timer;
 
 import java.util.EnumSet;
 
@@ -30,6 +30,7 @@ import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.RegisterConfig;
 import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.code.stack.StackIntrospection;
+import jdk.vm.ci.common.InitTimer;
 import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider;
 import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider;
 import jdk.vm.ci.hotspot.HotSpotJVMCIBackendFactory;
@@ -37,7 +38,6 @@ import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider;
 import jdk.vm.ci.hotspot.HotSpotMetaAccessProvider;
 import jdk.vm.ci.hotspot.HotSpotStackIntrospection;
 import jdk.vm.ci.hotspot.HotSpotVMConfig;
-import jdk.vm.ci.inittimer.InitTimer;
 import jdk.vm.ci.runtime.JVMCIBackend;
 import jdk.vm.ci.sparc.SPARC;
 import jdk.vm.ci.sparc.SPARC.CPUFeature;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java
index db06e44243c..af1b0ef591a 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java
@@ -198,11 +198,6 @@ public class SPARCHotSpotRegisterConfig implements RegisterConfig {
         return false;
     }
 
-    @Override
-    public Register getRegisterForRole(int index) {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public CallingConvention getCallingConvention(Type type, JavaType returnType, JavaType[] parameterTypes, ValueKindFactory<?> valueKindFactory) {
         HotSpotCallingConventionType hotspotType = (HotSpotCallingConventionType) type;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
index ed3b38fc096..760a4e64d49 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
@@ -23,8 +23,8 @@
 
 package jdk.vm.ci.hotspot;
 
+import static jdk.vm.ci.common.InitTimer.timer;
 import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
-import static jdk.vm.ci.inittimer.InitTimer.timer;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
@@ -33,9 +33,9 @@ import jdk.vm.ci.code.BytecodeFrame;
 import jdk.vm.ci.code.InstalledCode;
 import jdk.vm.ci.code.InvalidInstalledCodeException;
 import jdk.vm.ci.code.TargetDescription;
+import jdk.vm.ci.common.InitTimer;
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.hotspotvmconfig.HotSpotVMField;
-import jdk.vm.ci.inittimer.InitTimer;
 import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
@@ -79,7 +79,7 @@ final class CompilerToVM {
     native byte[] getBytecode(HotSpotResolvedJavaMethodImpl method);
 
     /**
-     * Gets the number of entries in {@code method}'s exception handler table or 0 if it has not
+     * Gets the number of entries in {@code method}'s exception handler table or 0 if it has no
      * exception handler table.
      */
     native int getExceptionTableLength(HotSpotResolvedJavaMethodImpl method);
@@ -315,6 +315,21 @@ final class CompilerToVM {
      */
     native int installCode(TargetDescription target, HotSpotCompiledCode compiledCode, InstalledCode code, HotSpotSpeculationLog speculationLog);
 
+    /**
+     * Generates the VM metadata for some compiled code and copies them into {@code metaData}. This
+     * method does not install anything into the code cache.
+     *
+     * @param target the target where this code would be installed
+     * @param compiledCode the result of a compilation
+     * @param metaData the metadata is written to this object
+     * @return the outcome of the installation which will be one of
+     *         {@link HotSpotVMConfig#codeInstallResultOk},
+     *         {@link HotSpotVMConfig#codeInstallResultCacheFull},
+     *         {@link HotSpotVMConfig#codeInstallResultCodeTooLarge},
+     *         {@link HotSpotVMConfig#codeInstallResultDependenciesFailed} or
+     *         {@link HotSpotVMConfig#codeInstallResultDependenciesInvalid}.
+     * @throws JVMCIError if there is something wrong with the compiled code or the metadata
+     */
     public native int getMetadata(TargetDescription target, HotSpotCompiledCode compiledCode, HotSpotMetaData metaData);
 
     /**
@@ -475,10 +490,10 @@ final class CompilerToVM {
     native HotSpotStackFrameReference getNextStackFrame(HotSpotStackFrameReference frame, ResolvedJavaMethod[] methods, int initialSkip);
 
     /**
-     * Materializes all virtual objects within {@code stackFrame} updates its locals.
+     * Materializes all virtual objects within {@code stackFrame} and updates its locals.
      *
      * @param invalidate if {@code true}, the compiled method for the stack frame will be
-     *            invalidated.
+     *            invalidated
      */
     native void materializeVirtualObjects(HotSpotStackFrameReference stackFrame, boolean invalidate);
 
@@ -495,7 +510,6 @@ final class CompilerToVM {
     /**
      * Determines if debug info should also be emitted at non-safepoint locations.
      */
-
     native boolean shouldDebugNonSafepoints();
 
     /**
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompilationRequestResult.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompilationRequestResult.java
new file mode 100644
index 00000000000..1b40fdb033c
--- /dev/null
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompilationRequestResult.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2015, 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;
+
+import jdk.vm.ci.code.CompilationRequest;
+import jdk.vm.ci.code.CompilationRequestResult;
+
+/**
+ * HotSpot specific information about the result of a {@link CompilationRequest}.
+ */
+public final class HotSpotCompilationRequestResult implements CompilationRequestResult {
+
+    /**
+     * A user readable description of the failure.
+     *
+     * This field is read by the VM.
+     */
+    private final String failureMessage;
+
+    /**
+     * Whether this is a transient failure where retrying would help.
+     *
+     * This field is read by the VM.
+     */
+    private final boolean retry;
+
+    /**
+     * Number of bytecodes inlined into the compilation, exclusive of the bytecodes in the root
+     * method.
+     *
+     * This field is read by the VM.
+     */
+    private final int inlinedBytecodes;
+
+    private HotSpotCompilationRequestResult(String failureMessage, boolean retry, int inlinedBytecodes) {
+        this.failureMessage = failureMessage;
+        this.retry = retry;
+        this.inlinedBytecodes = inlinedBytecodes;
+    }
+
+    public Object getFailure() {
+        return failureMessage;
+    }
+
+    /**
+     * Creates a result representing a successful compilation.
+     *
+     * @param inlinedBytecodes number of bytecodes inlined into the compilation, exclusive of the
+     *            bytecodes in the root method
+     */
+    public static HotSpotCompilationRequestResult success(int inlinedBytecodes) {
+        return new HotSpotCompilationRequestResult(null, true, inlinedBytecodes);
+    }
+
+    /**
+     * Creates a result representing a failed compilation.
+     *
+     * @param failureMessage a description of the failure
+     * @param retry whether this is a transient failure where retrying may succeed
+     */
+    public static HotSpotCompilationRequestResult failure(String failureMessage, boolean retry) {
+        return new HotSpotCompilationRequestResult(failureMessage, retry, 0);
+    }
+
+    public String getFailureMessage() {
+        return failureMessage;
+    }
+
+    public boolean getRetry() {
+        return retry;
+    }
+
+    public int getInlinedBytecodes() {
+        return inlinedBytecodes;
+    }
+}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompiledNmethod.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompiledNmethod.java
index 4255a5f41f3..be0a98d24e3 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompiledNmethod.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompiledNmethod.java
@@ -25,7 +25,6 @@ package jdk.vm.ci.hotspot;
 import jdk.vm.ci.code.StackSlot;
 import jdk.vm.ci.code.site.DataPatch;
 import jdk.vm.ci.code.site.Site;
-import jdk.vm.ci.inittimer.SuppressFBWarnings;
 import jdk.vm.ci.meta.Assumptions.Assumption;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java
index 6cfa01289f1..4143d1babed 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java
@@ -42,7 +42,7 @@ import jdk.vm.ci.meta.Signature;
 /**
  * Implementation of {@link ConstantPool} for HotSpot.
  */
-final class HotSpotConstantPool implements ConstantPool, HotSpotProxified, MetaspaceWrapperObject {
+final class HotSpotConstantPool implements ConstantPool, MetaspaceWrapperObject {
 
     /**
      * Subset of JVM bytecode opcodes used by {@link HotSpotConstantPool}.
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java
index 9734223e129..9538dbcfbb8 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java
@@ -39,7 +39,7 @@ import jdk.vm.ci.meta.ResolvedJavaType;
 /**
  * HotSpot implementation of {@link ConstantReflectionProvider}.
  */
-public class HotSpotConstantReflectionProvider implements ConstantReflectionProvider, HotSpotProxified {
+public class HotSpotConstantReflectionProvider implements ConstantReflectionProvider {
 
     protected final HotSpotJVMCIRuntimeProvider runtime;
     protected final HotSpotMethodHandleAccessProvider methodHandleAccess;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotInstalledCode.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotInstalledCode.java
index 98fa1816065..91d149fc894 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotInstalledCode.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotInstalledCode.java
@@ -23,9 +23,9 @@
 package jdk.vm.ci.hotspot;
 
 import static jdk.vm.ci.hotspot.UnsafeAccess.UNSAFE;
-import jdk.vm.ci.code.InstalledCode;
-import jdk.vm.ci.inittimer.SuppressFBWarnings;
+
 import jdk.internal.misc.Unsafe;
+import jdk.vm.ci.code.InstalledCode;
 
 /**
  * Implementation of {@link InstalledCode} for HotSpot.
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java
index 2a1c225f07d..a3db464894a 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java
@@ -25,7 +25,6 @@ package jdk.vm.ci.hotspot;
 import java.lang.reflect.Module;
 
 import jdk.vm.ci.code.CompilationRequest;
-import jdk.vm.ci.code.CompilationRequestResult;
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.Option;
 import jdk.vm.ci.runtime.JVMCICompiler;
@@ -37,7 +36,7 @@ final class HotSpotJVMCICompilerConfig {
 
     private static class DummyCompilerFactory extends JVMCICompilerFactory implements JVMCICompiler {
 
-        public CompilationRequestResult compileMethod(CompilationRequest request) {
+        public HotSpotCompilationRequestResult compileMethod(CompilationRequest request) {
             throw new JVMCIError("no JVMCI compiler selected");
         }
 
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIMetaAccessContext.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIMetaAccessContext.java
index 59299ea8516..c0de936bd4d 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIMetaAccessContext.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIMetaAccessContext.java
@@ -30,7 +30,6 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import jdk.vm.ci.meta.JVMCIMetaAccessContext;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
@@ -47,7 +46,7 @@ import jdk.vm.ci.meta.ResolvedJavaType;
  * longer used.
  *
  */
-public class HotSpotJVMCIMetaAccessContext implements JVMCIMetaAccessContext {
+public class HotSpotJVMCIMetaAccessContext {
 
     /**
      * The set of currently live contexts used for tracking of live metadata. Examined from the VM
@@ -149,7 +148,11 @@ public class HotSpotJVMCIMetaAccessContext implements JVMCIMetaAccessContext {
 
     private final Map<Class<?>, WeakReference<ResolvedJavaType>> typeMap = new WeakHashMap<>();
 
-    @Override
+    /**
+     * Gets the JVMCI mirror for a {@link Class} object.
+     *
+     * @return the {@link ResolvedJavaType} corresponding to {@code javaClass}
+     */
     public synchronized ResolvedJavaType fromClass(Class<?> javaClass) {
         WeakReference<ResolvedJavaType> typeRef = typeMap.get(javaClass);
         ResolvedJavaType type = typeRef != null ? typeRef.get() : null;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
index 2a7254a00a4..5cf038e0bf8 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
@@ -22,7 +22,7 @@
  */
 package jdk.vm.ci.hotspot;
 
-import static jdk.vm.ci.inittimer.InitTimer.timer;
+import static jdk.vm.ci.common.InitTimer.timer;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -37,16 +37,15 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.TreeMap;
 
+import jdk.internal.misc.VM;
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.CompilationRequestResult;
 import jdk.vm.ci.code.CompiledCode;
 import jdk.vm.ci.code.InstalledCode;
+import jdk.vm.ci.common.InitTimer;
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.hotspot.services.HotSpotJVMCICompilerFactory;
 import jdk.vm.ci.hotspot.services.HotSpotVMEventListener;
-import jdk.vm.ci.inittimer.InitTimer;
-import jdk.vm.ci.inittimer.SuppressFBWarnings;
-import jdk.vm.ci.meta.JVMCIMetaAccessContext;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.ResolvedJavaType;
@@ -55,9 +54,6 @@ import jdk.vm.ci.runtime.JVMCIBackend;
 import jdk.vm.ci.runtime.JVMCICompiler;
 import jdk.vm.ci.runtime.services.JVMCICompilerFactory;
 import jdk.vm.ci.services.Services;
-import jdk.internal.misc.VM;
-
-//JaCoCo Exclude
 
 /**
  * HotSpot implementation of a JVMCI runtime.
@@ -69,7 +65,7 @@ import jdk.internal.misc.VM;
  * {@link #runtime()}. This allows the initialization to funnel back through
  * {@link JVMCI#initialize()} without deadlocking.
  */
-public final class HotSpotJVMCIRuntime implements HotSpotJVMCIRuntimeProvider, HotSpotProxified {
+public final class HotSpotJVMCIRuntime implements HotSpotJVMCIRuntimeProvider {
 
     @SuppressWarnings("try")
     static class DelayedInit {
@@ -207,7 +203,7 @@ public final class HotSpotJVMCIRuntime implements HotSpotJVMCIRuntimeProvider, H
     private final JVMCICompilerFactory compilerFactory;
     private final HotSpotJVMCICompilerFactory hsCompilerFactory;
     private volatile JVMCICompiler compiler;
-    protected final JVMCIMetaAccessContext metaAccessContext;
+    protected final HotSpotJVMCIMetaAccessContext metaAccessContext;
 
     /**
      * Stores the result of {@link HotSpotJVMCICompilerFactory#getCompilationLevelAdjustment} so
@@ -246,17 +242,7 @@ public final class HotSpotJVMCIRuntime implements HotSpotJVMCIRuntimeProvider, H
 
         vmEventListeners = Services.load(HotSpotVMEventListener.class);
 
-        JVMCIMetaAccessContext context = null;
-        for (HotSpotVMEventListener vmEventListener : vmEventListeners) {
-            context = vmEventListener.createMetaAccessContext(this);
-            if (context != null) {
-                break;
-            }
-        }
-        if (context == null) {
-            context = new HotSpotJVMCIMetaAccessContext();
-        }
-        metaAccessContext = context;
+        metaAccessContext = new HotSpotJVMCIMetaAccessContext();
 
         boolean printFlags = Option.PrintFlags.getBoolean();
         boolean showFlags = Option.ShowFlags.getBoolean();
@@ -302,10 +288,6 @@ public final class HotSpotJVMCIRuntime implements HotSpotJVMCIRuntimeProvider, H
         return compilerToVm;
     }
 
-    public JVMCIMetaAccessContext getMetaAccessContext() {
-        return metaAccessContext;
-    }
-
     public JVMCICompiler getCompiler() {
         if (compiler == null) {
             synchronized (this) {
@@ -361,10 +343,24 @@ public final class HotSpotJVMCIRuntime implements HotSpotJVMCIRuntimeProvider, H
      * Called from the VM.
      */
     @SuppressWarnings({"unused"})
-    private CompilationRequestResult compileMethod(HotSpotResolvedJavaMethod method, int entryBCI, long jvmciEnv, int id) {
+    private HotSpotCompilationRequestResult compileMethod(HotSpotResolvedJavaMethod method, int entryBCI, long jvmciEnv, int id) {
         CompilationRequestResult result = getCompiler().compileMethod(new HotSpotCompilationRequest(method, entryBCI, jvmciEnv, id));
         assert result != null : "compileMethod must always return something";
-        return result;
+        HotSpotCompilationRequestResult hsResult;
+        if (result instanceof HotSpotCompilationRequestResult) {
+            hsResult = (HotSpotCompilationRequestResult) result;
+        } else {
+            Object failure = result.getFailure();
+            if (failure != null) {
+                boolean retry = false; // Be conservative with unknown compiler
+                hsResult = HotSpotCompilationRequestResult.failure(failure.toString(), retry);
+            } else {
+                int inlinedBytecodes = -1;
+                hsResult = HotSpotCompilationRequestResult.success(inlinedBytecodes);
+            }
+        }
+
+        return hsResult;
     }
 
     /**
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntimeProvider.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntimeProvider.java
index 7d6b4b287ae..6ad27247907 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntimeProvider.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntimeProvider.java
@@ -24,15 +24,12 @@ package jdk.vm.ci.hotspot;
 
 import java.io.OutputStream;
 
+import jdk.internal.misc.Unsafe;
 import jdk.vm.ci.common.JVMCIError;
-import jdk.vm.ci.meta.JVMCIMetaAccessContext;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.ResolvedJavaType;
 import jdk.vm.ci.runtime.JVMCIRuntime;
-import jdk.internal.misc.Unsafe;
-
-//JaCoCo Exclude
 
 /**
  * Configuration information for the HotSpot JVMCI runtime.
@@ -70,8 +67,6 @@ public interface HotSpotJVMCIRuntimeProvider extends JVMCIRuntime {
      */
     ResolvedJavaType fromClass(Class<?> clazz);
 
-    JVMCIMetaAccessContext getMetaAccessContext();
-
     /**
      * The offset from the origin of an array to the first element.
      *
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java
index 76c48451eed..bcdd5d2d125 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java
@@ -33,7 +33,7 @@ import jdk.vm.ci.meta.PrimitiveConstant;
 /**
  * HotSpot implementation of {@link MemoryAccessProvider}.
  */
-class HotSpotMemoryAccessProviderImpl implements HotSpotMemoryAccessProvider, HotSpotProxified {
+class HotSpotMemoryAccessProviderImpl implements HotSpotMemoryAccessProvider {
 
     protected final HotSpotJVMCIRuntimeProvider runtime;
 
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaAccessProvider.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaAccessProvider.java
index bea84c25cd8..464237ada43 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaAccessProvider.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaAccessProvider.java
@@ -52,7 +52,7 @@ import jdk.vm.ci.meta.Signature;
 /**
  * HotSpot implementation of {@link MetaAccessProvider}.
  */
-public class HotSpotMetaAccessProvider implements MetaAccessProvider, HotSpotProxified {
+public class HotSpotMetaAccessProvider implements MetaAccessProvider {
 
     protected final HotSpotJVMCIRuntimeProvider runtime;
 
@@ -308,7 +308,6 @@ public class HotSpotMetaAccessProvider implements MetaAccessProvider, HotSpotPro
                 return 0;
             } else {
                 if (lookupJavaType.isArray()) {
-                    // TODO(tw): Add compressed pointer support.
                     int length = Array.getLength(((HotSpotObjectConstantImpl) constant).object());
                     ResolvedJavaType elementType = lookupJavaType.getComponentType();
                     JavaKind elementKind = elementType.getJavaKind();
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaData.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaData.java
index 95a9670f311..300e57b7168 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaData.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaData.java
@@ -22,8 +22,9 @@
  */
 package jdk.vm.ci.hotspot;
 
-import jdk.vm.ci.inittimer.SuppressFBWarnings;
-
+/**
+ * Encapsulates the VM metadata generated by {@link CompilerToVM#getMetadata}.
+ */
 public class HotSpotMetaData {
     @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", justification = "field is set by the native part") private byte[] pcDescBytes;
     @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", justification = "field is set by the native part") private byte[] scopesDescBytes;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstantImpl.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstantImpl.java
index e85f3b0c26e..5d5ced19582 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstantImpl.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaspaceConstantImpl.java
@@ -27,7 +27,7 @@ import java.util.Objects;
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.VMConstant;
 
-final class HotSpotMetaspaceConstantImpl implements HotSpotMetaspaceConstant, VMConstant, HotSpotProxified {
+final class HotSpotMetaspaceConstantImpl implements HotSpotMetaspaceConstant, VMConstant {
 
     static HotSpotMetaspaceConstantImpl forMetaspaceObject(MetaspaceWrapperObject metaspaceObject, boolean compressed) {
         return new HotSpotMetaspaceConstantImpl(metaspaceObject, compressed);
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethod.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethod.java
index 8370ac4ae27..da04107bc1a 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethod.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethod.java
@@ -32,7 +32,7 @@ import java.util.Formatter;
 import jdk.vm.ci.meta.JavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
-abstract class HotSpotMethod implements JavaMethod, Formattable /* , JavaMethodContex */ {
+abstract class HotSpotMethod implements JavaMethod, Formattable {
 
     public static String applyFormattingFlagsAndWidth(String s, int flags, int width) {
         if (flags == 0 && width < 0) {
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java
index 1293a1083d7..821f3da899e 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java
@@ -33,7 +33,7 @@ import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
-public class HotSpotMethodHandleAccessProvider implements MethodHandleAccessProvider, HotSpotProxified {
+public class HotSpotMethodHandleAccessProvider implements MethodHandleAccessProvider {
 
     private final ConstantReflectionProvider constantReflection;
 
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotObjectConstantImpl.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotObjectConstantImpl.java
index 5a13bae8d31..ac884676d52 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotObjectConstantImpl.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotObjectConstantImpl.java
@@ -28,7 +28,6 @@ import java.lang.invoke.CallSite;
 import java.lang.invoke.ConstantCallSite;
 import java.lang.invoke.MethodHandle;
 
-import jdk.vm.ci.inittimer.SuppressFBWarnings;
 import jdk.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.JavaConstant;
@@ -39,7 +38,7 @@ import jdk.vm.ci.meta.ResolvedJavaType;
  * Represents a constant non-{@code null} object reference, within the compiler and across the
  * compiler/runtime interface.
  */
-final class HotSpotObjectConstantImpl implements HotSpotObjectConstant, HotSpotProxified {
+final class HotSpotObjectConstantImpl implements HotSpotObjectConstant {
 
     static JavaConstant forObject(Object object) {
         return forObject(object, false);
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotOopMap.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotOopMap.java
deleted file mode 100644
index 06f2983c645..00000000000
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotOopMap.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2015, 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;
-
-import jdk.vm.ci.inittimer.SuppressFBWarnings;
-
-public class HotSpotOopMap {
-    @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", justification = "field is set by the native part") private int offset;
-    @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", justification = "field is set by the native part") private int count;
-    @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", justification = "field is set by the native part") private byte[] data;
-
-    public byte[] data() {
-        return data;
-    }
-
-    public int count() {
-        return count;
-    }
-
-    public int offset() {
-        return offset;
-    }
-}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotProfilingInfo.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotProfilingInfo.java
index 020343e164c..0e71f74bf8a 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotProfilingInfo.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotProfilingInfo.java
@@ -28,10 +28,7 @@ import jdk.vm.ci.meta.JavaTypeProfile;
 import jdk.vm.ci.meta.ProfilingInfo;
 import jdk.vm.ci.meta.TriState;
 
-public final class HotSpotProfilingInfo implements ProfilingInfo, HotSpotProxified {
-
-    // private static final DebugMetric metricInsufficentSpace =
-    // Debug.metric("InsufficientSpaceForProfilingData");
+public final class HotSpotProfilingInfo implements ProfilingInfo {
 
     private final HotSpotMethodData methodData;
     private final HotSpotResolvedJavaMethod method;
@@ -162,7 +159,6 @@ public final class HotSpotProfilingInfo implements ProfilingInfo, HotSpotProxifi
 
             if (!methodData.isWithin(currentPosition)) {
                 exceptionPossiblyNotRecorded = true;
-                // metricInsufficentSpace.increment();
             }
         }
 
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotReferenceMap.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotReferenceMap.java
index 5bb7c66cf45..8d88147688b 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotReferenceMap.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotReferenceMap.java
@@ -53,7 +53,7 @@ public final class HotSpotReferenceMap extends ReferenceMap {
         }
         if (obj instanceof HotSpotReferenceMap) {
             HotSpotReferenceMap that = (HotSpotReferenceMap) obj;
-            if (Arrays.equals(objects, that.objects)) {
+            if (sizeInBytes == that.sizeInBytes && maxRegisterSize == that.maxRegisterSize && Arrays.equals(objects, that.objects) && Arrays.equals(derivedBase, that.derivedBase)) {
                 return true;
             }
         }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java
index 7991b600fef..e8544775ec0 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java
@@ -39,7 +39,7 @@ import jdk.vm.ci.meta.ResolvedJavaType;
 /**
  * Represents a field in a HotSpot type.
  */
-class HotSpotResolvedJavaFieldImpl implements HotSpotResolvedJavaField, HotSpotProxified {
+class HotSpotResolvedJavaFieldImpl implements HotSpotResolvedJavaField {
 
     private final HotSpotResolvedObjectTypeImpl holder;
     private final String name;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
index 432d5f19edd..b861b2cec99 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
@@ -46,11 +46,8 @@ import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaMethod;
 import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.LineNumberTable;
-import jdk.vm.ci.meta.LineNumberTableImpl;
 import jdk.vm.ci.meta.Local;
-import jdk.vm.ci.meta.LocalImpl;
 import jdk.vm.ci.meta.LocalVariableTable;
-import jdk.vm.ci.meta.LocalVariableTableImpl;
 import jdk.vm.ci.meta.ModifiersProvider;
 import jdk.vm.ci.meta.ProfilingInfo;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
@@ -62,7 +59,7 @@ import jdk.vm.ci.meta.TriState;
 /**
  * Implementation of {@link JavaMethod} for resolved HotSpot methods.
  */
-final class HotSpotResolvedJavaMethodImpl extends HotSpotMethod implements HotSpotResolvedJavaMethod, HotSpotProxified, MetaspaceWrapperObject {
+final class HotSpotResolvedJavaMethodImpl extends HotSpotMethod implements HotSpotResolvedJavaMethod, MetaspaceWrapperObject {
 
     /**
      * Reference to metaspace Method object.
@@ -571,7 +568,7 @@ final class HotSpotResolvedJavaMethodImpl extends HotSpotMethod implements HotSp
             line[i] = (int) values[i * 2 + 1];
         }
 
-        return new LineNumberTableImpl(line, bci);
+        return new LineNumberTable(line, bci);
     }
 
     @Override
@@ -596,13 +593,13 @@ final class HotSpotResolvedJavaMethodImpl extends HotSpotMethod implements HotSp
             String localName = getConstantPool().lookupUtf8(nameCpIndex);
             String localType = getConstantPool().lookupUtf8(typeCpIndex);
 
-            locals[i] = new LocalImpl(localName, runtime().lookupType(localType, holder, false), startBci, endBci, slot);
+            locals[i] = new Local(localName, runtime().lookupType(localType, holder, false), startBci, endBci, slot);
 
             // Go to the next LocalVariableTableElement
             localVariableTableElement += config.localVariableTableElementSize;
         }
 
-        return new LocalVariableTableImpl(locals);
+        return new LocalVariableTable(locals);
     }
 
     /**
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectType.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectType.java
index b207f9c32de..4ee2991a981 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectType.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectType.java
@@ -59,8 +59,6 @@ public interface HotSpotResolvedObjectType extends ResolvedJavaType {
 
     HotSpotResolvedObjectType findLeastCommonAncestor(ResolvedJavaType otherType);
 
-    HotSpotResolvedObjectType asExactType();
-
     default boolean isPrimitive() {
         return false;
     }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
index 925e92b1490..f180891829e 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
@@ -56,7 +56,7 @@ import jdk.vm.ci.meta.ResolvedJavaType;
 /**
  * Implementation of {@link JavaType} for resolved non-primitive HotSpot classes.
  */
-final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implements HotSpotResolvedObjectType, HotSpotProxified, MetaspaceWrapperObject {
+final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implements HotSpotResolvedObjectType, MetaspaceWrapperObject {
 
     /**
      * The Java class this type represents.
@@ -127,9 +127,9 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
      */
     long getMetaspaceKlass() {
         if (HotSpotJVMCIRuntime.getHostWordKind() == JavaKind.Long) {
-            return UNSAFE.getLong(javaClass, (long) config().klassOffset);
+            return UNSAFE.getLong(javaClass, config().klassOffset);
         }
-        return UNSAFE.getInt(javaClass, (long) config().klassOffset) & 0xFFFFFFFFL;
+        return UNSAFE.getInt(javaClass, config().klassOffset) & 0xFFFFFFFFL;
     }
 
     public long getMetaspacePointer() {
@@ -318,11 +318,6 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
         }
     }
 
-    @Override
-    public HotSpotResolvedObjectType asExactType() {
-        return isLeaf() ? this : null;
-    }
-
     @Override
     public AssumptionResult<Boolean> hasFinalizableSubclass() {
         assert !isArray();
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java
index c98f130f4b9..9c32e8d0894 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java
@@ -40,7 +40,7 @@ import jdk.vm.ci.meta.ResolvedJavaType;
 /**
  * Implementation of {@link JavaType} for primitive HotSpot types.
  */
-public final class HotSpotResolvedPrimitiveType extends HotSpotResolvedJavaType implements HotSpotProxified {
+public final class HotSpotResolvedPrimitiveType extends HotSpotResolvedJavaType {
 
     private final JavaKind kind;
 
@@ -55,7 +55,7 @@ public final class HotSpotResolvedPrimitiveType extends HotSpotResolvedJavaType
      * @param kind the Kind to create the mirror for
      */
     public HotSpotResolvedPrimitiveType(JavaKind kind) {
-        super(String.valueOf(Character.toUpperCase(kind.getTypeChar())));
+        super(String.valueOf(kind.getTypeChar()));
         this.kind = kind;
         assert mirror().isPrimitive() : mirror() + " not a primitive type";
     }
@@ -83,11 +83,6 @@ public final class HotSpotResolvedPrimitiveType extends HotSpotResolvedJavaType
         return null;
     }
 
-    @Override
-    public ResolvedJavaType asExactType() {
-        return this;
-    }
-
     @Override
     public ResolvedJavaType getSuperclass() {
         return null;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java
index b610b8f699c..b20da3d535b 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java
@@ -22,7 +22,6 @@
  */
 package jdk.vm.ci.hotspot;
 
-import static jdk.vm.ci.common.UnsafeUtil.readCString;
 import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
 import static jdk.vm.ci.hotspot.UnsafeAccess.UNSAFE;
 
@@ -31,6 +30,7 @@ import java.lang.reflect.Modifier;
 import java.util.HashMap;
 import java.util.Iterator;
 
+import jdk.internal.misc.Unsafe;
 import jdk.internal.vm.annotation.Stable;
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.hotspotvmconfig.HotSpotVMAddress;
@@ -39,9 +39,6 @@ import jdk.vm.ci.hotspotvmconfig.HotSpotVMData;
 import jdk.vm.ci.hotspotvmconfig.HotSpotVMField;
 import jdk.vm.ci.hotspotvmconfig.HotSpotVMFlag;
 import jdk.vm.ci.hotspotvmconfig.HotSpotVMType;
-import jdk.internal.misc.Unsafe;
-
-//JaCoCo Exclude
 
 /**
  * Used to access native configuration details.
@@ -109,6 +106,27 @@ public class HotSpotVMConfig {
         return getClass().getSimpleName();
     }
 
+    /**
+     * Reads a {@code '\0'} terminated C string from native memory and converts it to a
+     * {@link String}.
+     *
+     * @return a Java string
+     */
+    private static String readCString(Unsafe unsafe, long address) {
+        if (address == 0) {
+            return null;
+        }
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0;; i++) {
+            char c = (char) unsafe.getByte(address + i);
+            if (c == 0) {
+                break;
+            }
+            sb.append(c);
+        }
+        return sb.toString();
+    }
+
     /**
      * Initialize fields by reading their values from vmStructs.
      */
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotProxified.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/SuppressFBWarnings.java
similarity index 70%
rename from hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotProxified.java
rename to hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/SuppressFBWarnings.java
index 90a8ece45bb..8d5f73681cf 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotProxified.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/SuppressFBWarnings.java
@@ -23,7 +23,18 @@
 package jdk.vm.ci.hotspot;
 
 /**
- * Marker interface for classes whose values are proxied during replay compilation capture.
+ * Used to suppress <a href="http://findbugs.sourceforge.net">FindBugs</a> warnings.
  */
-public interface HotSpotProxified {
+@interface SuppressFBWarnings {
+    /**
+     * The set of FindBugs
+     * <a href="http://findbugs.sourceforge.net/bugDescriptions.html">warnings</a> that are to be
+     * suppressed in annotated element. The value can be a bug category, kind or pattern.
+     */
+    String[] value();
+
+    /**
+     * Reason why the warning is suppressed.
+     */
+    String justification();
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/services/HotSpotVMEventListener.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/services/HotSpotVMEventListener.java
index 39759fc357d..e59b42c91bf 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/services/HotSpotVMEventListener.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/services/HotSpotVMEventListener.java
@@ -25,14 +25,10 @@ package jdk.vm.ci.hotspot.services;
 import jdk.vm.ci.code.CompiledCode;
 import jdk.vm.ci.code.InstalledCode;
 import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider;
-import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
-import jdk.vm.ci.meta.JVMCIMetaAccessContext;
-import jdk.vm.ci.meta.ResolvedJavaType;
 import jdk.vm.ci.services.JVMCIPermission;
 
 /**
- * Service-provider class for responding to VM events and for creating
- * {@link JVMCIMetaAccessContext}s.
+ * Service-provider class for responding to VM events.
  */
 public abstract class HotSpotVMEventListener {
 
@@ -79,16 +75,4 @@ public abstract class HotSpotVMEventListener {
      */
     public void notifyBootstrapFinished() {
     }
-
-    /**
-     * Create a custom {@link JVMCIMetaAccessContext} to be used for managing the lifetime of loaded
-     * metadata. It a custom one isn't created then the default implementation will be a single
-     * context with globally shared instances of {@link ResolvedJavaType} that are never released.
-     *
-     * @param runtime the runtime instance that will use the returned context
-     * @return a custom context or null
-     */
-    public JVMCIMetaAccessContext createMetaAccessContext(HotSpotJVMCIRuntime runtime) {
-        return null;
-    }
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JVMCIMetaAccessContext.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JVMCIMetaAccessContext.java
deleted file mode 100644
index f44c061f764..00000000000
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JVMCIMetaAccessContext.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2015, 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;
-
-/**
- * A context in which the results looking up the {@link ResolvedJavaType} for a {@link Class} are
- * cached.
- */
-public interface JVMCIMetaAccessContext {
-
-    /**
-     * Gets the JVMCI mirror for a {@link Class} object.
-     *
-     * @return the {@link ResolvedJavaType} corresponding to {@code javaClass}
-     */
-
-    ResolvedJavaType fromClass(Class<?> clazz);
-}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaConstant.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaConstant.java
index fee7e3218b3..300453bd4a7 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaConstant.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaConstant.java
@@ -357,106 +357,4 @@ public interface JavaConstant extends Constant, JavaValue {
                 throw new IllegalArgumentException(kind.toString());
         }
     }
-
-    /**
-     * Returns the zero value for a given numeric kind.
-     */
-    static JavaConstant zero(JavaKind kind) {
-        switch (kind) {
-            case Boolean:
-                return FALSE;
-            case Byte:
-                return forByte((byte) 0);
-            case Char:
-                return forChar((char) 0);
-            case Double:
-                return DOUBLE_0;
-            case Float:
-                return FLOAT_0;
-            case Int:
-                return INT_0;
-            case Long:
-                return LONG_0;
-            case Short:
-                return forShort((short) 0);
-            default:
-                throw new IllegalArgumentException(kind.toString());
-        }
-    }
-
-    /**
-     * Returns the one value for a given numeric kind.
-     */
-    static JavaConstant one(JavaKind kind) {
-        switch (kind) {
-            case Boolean:
-                return TRUE;
-            case Byte:
-                return forByte((byte) 1);
-            case Char:
-                return forChar((char) 1);
-            case Double:
-                return DOUBLE_1;
-            case Float:
-                return FLOAT_1;
-            case Int:
-                return INT_1;
-            case Long:
-                return LONG_1;
-            case Short:
-                return forShort((short) 1);
-            default:
-                throw new IllegalArgumentException(kind.toString());
-        }
-    }
-
-    /**
-     * Adds two numeric constants.
-     */
-    static JavaConstant add(JavaConstant x, JavaConstant y) {
-        assert x.getJavaKind() == y.getJavaKind();
-        switch (x.getJavaKind()) {
-            case Byte:
-                return forByte((byte) (x.asInt() + y.asInt()));
-            case Char:
-                return forChar((char) (x.asInt() + y.asInt()));
-            case Double:
-                return forDouble(x.asDouble() + y.asDouble());
-            case Float:
-                return forFloat(x.asFloat() + y.asFloat());
-            case Int:
-                return forInt(x.asInt() + y.asInt());
-            case Long:
-                return forLong(x.asLong() + y.asLong());
-            case Short:
-                return forShort((short) (x.asInt() + y.asInt()));
-            default:
-                throw new IllegalArgumentException(x.getJavaKind().toString());
-        }
-    }
-
-    /**
-     * Multiplies two numeric constants.
-     */
-    static PrimitiveConstant mul(JavaConstant x, JavaConstant y) {
-        assert x.getJavaKind() == y.getJavaKind();
-        switch (x.getJavaKind()) {
-            case Byte:
-                return forByte((byte) (x.asInt() * y.asInt()));
-            case Char:
-                return forChar((char) (x.asInt() * y.asInt()));
-            case Double:
-                return forDouble(x.asDouble() * y.asDouble());
-            case Float:
-                return forFloat(x.asFloat() * y.asFloat());
-            case Int:
-                return forInt(x.asInt() * y.asInt());
-            case Long:
-                return forLong(x.asLong() * y.asLong());
-            case Short:
-                return forShort((short) (x.asInt() * y.asInt()));
-            default:
-                throw new IllegalArgumentException(x.getJavaKind().toString());
-        }
-    }
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaKind.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaKind.java
index 69fefbfb4ee..fe657723a83 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaKind.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaKind.java
@@ -33,34 +33,34 @@ import java.lang.reflect.Array;
  */
 public enum JavaKind {
     /** The primitive boolean kind, represented as an int on the stack. */
-    Boolean('z', "boolean", 1, true, java.lang.Boolean.TYPE, java.lang.Boolean.class),
+    Boolean('Z', "boolean", 1, true, java.lang.Boolean.TYPE, java.lang.Boolean.class),
 
     /** The primitive byte kind, represented as an int on the stack. */
-    Byte('b', "byte", 1, true, java.lang.Byte.TYPE, java.lang.Byte.class),
+    Byte('B', "byte", 1, true, java.lang.Byte.TYPE, java.lang.Byte.class),
 
     /** The primitive short kind, represented as an int on the stack. */
-    Short('s', "short", 1, true, java.lang.Short.TYPE, java.lang.Short.class),
+    Short('S', "short", 1, true, java.lang.Short.TYPE, java.lang.Short.class),
 
     /** The primitive char kind, represented as an int on the stack. */
-    Char('c', "char", 1, true, java.lang.Character.TYPE, java.lang.Character.class),
+    Char('C', "char", 1, true, java.lang.Character.TYPE, java.lang.Character.class),
 
     /** The primitive int kind, represented as an int on the stack. */
-    Int('i', "int", 1, true, java.lang.Integer.TYPE, java.lang.Integer.class),
+    Int('I', "int", 1, true, java.lang.Integer.TYPE, java.lang.Integer.class),
 
     /** The primitive float kind. */
-    Float('f', "float", 1, false, java.lang.Float.TYPE, java.lang.Float.class),
+    Float('F', "float", 1, false, java.lang.Float.TYPE, java.lang.Float.class),
 
     /** The primitive long kind. */
-    Long('j', "long", 2, false, java.lang.Long.TYPE, java.lang.Long.class),
+    Long('J', "long", 2, false, java.lang.Long.TYPE, java.lang.Long.class),
 
     /** The primitive double kind. */
-    Double('d', "double", 2, false, java.lang.Double.TYPE, java.lang.Double.class),
+    Double('D', "double", 2, false, java.lang.Double.TYPE, java.lang.Double.class),
 
     /** The Object kind, also used for arrays. */
-    Object('a', "Object", 1, false, null, null),
+    Object('A', "Object", 1, false, null, null),
 
-    /** The void float kind. */
-    Void('v', "void", 0, false, java.lang.Void.TYPE, java.lang.Void.class),
+    /** The void kind. */
+    Void('V', "void", 0, false, java.lang.Void.TYPE, java.lang.Void.class),
 
     /** The non-type. */
     Illegal('-', "illegal", 0, false, null, null);
@@ -98,7 +98,11 @@ public enum JavaKind {
     }
 
     /**
-     * Returns the name of the kind as a single character.
+     * Returns the name of the kind as a single upper case character. For the void and primitive
+     * kinds, this is the <i>FieldType</i> term in
+     * <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.3.2-200">
+     * table 4.3-A</a> of the JVM Specification. For {@link #Object}, the character {@code 'A'} is
+     * returned and for {@link #Illegal}, {@code '-'} is returned.
      */
     public char getTypeChar() {
         return typeChar;
@@ -204,7 +208,7 @@ public enum JavaKind {
     /**
      * Returns the kind from the character describing a primitive or void.
      *
-     * @param ch the character
+     * @param ch the character for a void or primitive kind as returned by {@link #getTypeChar()}
      * @return the kind
      */
     public static JavaKind fromPrimitiveOrVoidTypeChar(char ch) {
@@ -369,9 +373,9 @@ public enum JavaKind {
     }
 
     /**
-     * The minimum value that can be represented as a value of this kind.
+     * Gets the minimum value that can be represented as a value of this kind.
      *
-     * @return the minimum value
+     * @return the minimum value represented as a {@code long}
      */
     public long getMinValue() {
         switch (this) {
@@ -387,15 +391,19 @@ public enum JavaKind {
                 return java.lang.Integer.MIN_VALUE;
             case Long:
                 return java.lang.Long.MIN_VALUE;
+            case Float:
+                return java.lang.Float.floatToRawIntBits(java.lang.Float.MIN_VALUE);
+            case Double:
+                return java.lang.Double.doubleToRawLongBits(java.lang.Double.MIN_VALUE);
             default:
                 throw new IllegalArgumentException("illegal call to minValue on " + this);
         }
     }
 
     /**
-     * The maximum value that can be represented as a value of this kind.
+     * Gets the maximum value that can be represented as a value of this kind.
      *
-     * @return the maximum value
+     * @return the maximum value represented as a {@code long}
      */
     public long getMaxValue() {
         switch (this) {
@@ -411,6 +419,10 @@ public enum JavaKind {
                 return java.lang.Integer.MAX_VALUE;
             case Long:
                 return java.lang.Long.MAX_VALUE;
+            case Float:
+                return java.lang.Float.floatToRawIntBits(java.lang.Float.MAX_VALUE);
+            case Double:
+                return java.lang.Double.doubleToRawLongBits(java.lang.Double.MAX_VALUE);
             default:
                 throw new IllegalArgumentException("illegal call to maxValue on " + this);
         }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaType.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaType.java
index c010a2b510a..6d76cf93680 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaType.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaType.java
@@ -61,6 +61,15 @@ public interface JavaType {
         return name;
     }
 
+    /**
+     * Checks whether this type is an array class.
+     *
+     * @return {@code true} if this type is an array class
+     */
+    default boolean isArray() {
+        return getComponentType() != null;
+    }
+
     /**
      * For array types, gets the type of the components, or {@code null} if this is not an array
      * type. This method is analogous to {@link Class#getComponentType()}.
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LineNumberTable.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LineNumberTable.java
index 13a0d0a466d..d3b87f7d390 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LineNumberTable.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LineNumberTable.java
@@ -22,11 +22,30 @@
  */
 package jdk.vm.ci.meta;
 
-public interface LineNumberTable {
+public class LineNumberTable {
 
-    int[] getLineNumberEntries();
+    private final int[] lineNumbers;
+    private final int[] bci;
 
-    int[] getBciEntries();
+    public LineNumberTable(int[] lineNumbers, int[] bci) {
+        this.lineNumbers = lineNumbers;
+        this.bci = bci;
+    }
 
-    int getLineNumber(int bci);
+    public int[] getLineNumberEntries() {
+        return lineNumbers;
+    }
+
+    public int[] getBciEntries() {
+        return bci;
+    }
+
+    public int getLineNumber(int atBci) {
+        for (int i = 0; i < this.bci.length - 1; i++) {
+            if (this.bci[i] <= atBci && atBci < this.bci[i + 1]) {
+                return lineNumbers[i];
+            }
+        }
+        return lineNumbers[lineNumbers.length - 1];
+    }
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LineNumberTableImpl.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LineNumberTableImpl.java
deleted file mode 100644
index 699a11faa7b..00000000000
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LineNumberTableImpl.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2011, 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;
-
-public class LineNumberTableImpl implements LineNumberTable {
-
-    private final int[] lineNumbers;
-    private final int[] bci;
-
-    public LineNumberTableImpl(int[] lineNumbers, int[] bci) {
-        this.lineNumbers = lineNumbers;
-        this.bci = bci;
-    }
-
-    @Override
-    public int[] getLineNumberEntries() {
-        return lineNumbers;
-    }
-
-    @Override
-    public int[] getBciEntries() {
-        return bci;
-    }
-
-    @Override
-    public int getLineNumber(@SuppressWarnings("hiding") int bci) {
-        for (int i = 0; i < this.bci.length - 1; i++) {
-            if (this.bci[i] <= bci && bci < this.bci[i + 1]) {
-                return lineNumbers[i];
-            }
-        }
-        return lineNumbers[lineNumbers.length - 1];
-    }
-}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Local.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Local.java
index ea0ac16acda..285fdd72a0e 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Local.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Local.java
@@ -22,15 +22,58 @@
  */
 package jdk.vm.ci.meta;
 
-public interface Local {
+public class Local {
 
-    int getStartBCI();
+    private final String name;
+    private final int startBci;
+    private final int endBci;
+    private final int slot;
+    private final JavaType type;
 
-    int getEndBCI();
+    public Local(String name, JavaType type, int startBci, int endBci, int slot) {
+        this.name = name;
+        this.startBci = startBci;
+        this.endBci = endBci;
+        this.slot = slot;
+        this.type = type;
+    }
 
-    int getSlot();
+    public int getStartBCI() {
+        return startBci;
+    }
 
-    String getName();
+    public int getEndBCI() {
+        return endBci;
+    }
 
-    JavaType getType();
+    public String getName() {
+        return name;
+    }
+
+    public JavaType getType() {
+        return type;
+    }
+
+    public int getSlot() {
+        return slot;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof Local)) {
+            return false;
+        }
+        Local that = (Local) obj;
+        return this.name.equals(that.name) && this.startBci == that.startBci && this.endBci == that.endBci && this.slot == that.slot && this.type.equals(that.type);
+    }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return "LocalImpl<name=" + name + ", type=" + type + ", startBci=" + startBci + ", endBci=" + endBci + ", slot=" + slot + ">";
+    }
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LocalImpl.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LocalImpl.java
deleted file mode 100644
index 06e8fba0865..00000000000
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LocalImpl.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2011, 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;
-
-public class LocalImpl implements Local {
-
-    private final String name;
-    private final int startBci;
-    private final int endBci;
-    private final int slot;
-    private final JavaType type;
-
-    public LocalImpl(String name, JavaType type, int startBci, int endBci, int slot) {
-        this.name = name;
-        this.startBci = startBci;
-        this.endBci = endBci;
-        this.slot = slot;
-        this.type = type;
-    }
-
-    @Override
-    public int getStartBCI() {
-        return startBci;
-    }
-
-    @Override
-    public int getEndBCI() {
-        return endBci;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public JavaType getType() {
-        return type;
-    }
-
-    @Override
-    public int getSlot() {
-        return slot;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (!(obj instanceof LocalImpl)) {
-            return false;
-        }
-        LocalImpl that = (LocalImpl) obj;
-        return this.name.equals(that.name) && this.startBci == that.startBci && this.endBci == that.endBci && this.slot == that.slot && this.type.equals(that.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return super.hashCode();
-    }
-
-    @Override
-    public String toString() {
-        return "LocalImpl<name=" + name + ", type=" + type + ", startBci=" + startBci + ", endBci=" + endBci + ", slot=" + slot + ">";
-    }
-}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LocalVariableTable.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LocalVariableTable.java
index ce140106396..f8bf703bc38 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LocalVariableTable.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LocalVariableTable.java
@@ -22,11 +22,42 @@
  */
 package jdk.vm.ci.meta;
 
-public interface LocalVariableTable {
+import java.util.ArrayList;
+import java.util.List;
 
-    Local[] getLocals();
+public class LocalVariableTable {
 
-    Local[] getLocalsAt(int bci);
+    private final Local[] locals;
 
-    Local getLocal(int slot, int bci);
+    public LocalVariableTable(Local[] locals) {
+        this.locals = locals;
+    }
+
+    public Local getLocal(int slot, int bci) {
+        Local result = null;
+        for (Local local : locals) {
+            if (local.getSlot() == slot && local.getStartBCI() <= bci && local.getEndBCI() >= bci) {
+                if (result == null) {
+                    result = local;
+                } else {
+                    throw new IllegalStateException("Locals overlap!");
+                }
+            }
+        }
+        return result;
+    }
+
+    public Local[] getLocals() {
+        return locals;
+    }
+
+    public Local[] getLocalsAt(int bci) {
+        List<Local> result = new ArrayList<>();
+        for (Local l : locals) {
+            if (l.getStartBCI() <= bci && bci <= l.getEndBCI()) {
+                result.add(l);
+            }
+        }
+        return result.toArray(new Local[result.size()]);
+    }
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LocalVariableTableImpl.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LocalVariableTableImpl.java
deleted file mode 100644
index 7cafe042a2a..00000000000
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LocalVariableTableImpl.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2011, 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.ArrayList;
-import java.util.List;
-
-public class LocalVariableTableImpl implements LocalVariableTable {
-
-    private final Local[] locals;
-
-    public LocalVariableTableImpl(Local[] locals) {
-        this.locals = locals;
-    }
-
-    @Override
-    public Local getLocal(int slot, int bci) {
-        Local result = null;
-        for (Local local : locals) {
-            if (local.getSlot() == slot && local.getStartBCI() <= bci && local.getEndBCI() >= bci) {
-                if (result == null) {
-                    result = local;
-                } else {
-                    throw new IllegalStateException("Locals overlap!");
-                }
-            }
-        }
-        return result;
-    }
-
-    @Override
-    public Local[] getLocals() {
-        return locals;
-    }
-
-    @Override
-    public Local[] getLocalsAt(int bci) {
-        List<Local> result = new ArrayList<>();
-        for (Local l : locals) {
-            if (l.getStartBCI() <= bci && bci <= l.getEndBCI()) {
-                result.add(l);
-            }
-        }
-        return result.toArray(new Local[result.size()]);
-    }
-
-}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MemoryAccessProvider.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MemoryAccessProvider.java
index f98461d45e8..aa9cade9ba9 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MemoryAccessProvider.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MemoryAccessProvider.java
@@ -35,8 +35,8 @@ public interface MemoryAccessProvider {
      * @param displacement the displacement within the object in bytes
      * @return the read value encapsulated in a {@link JavaConstant} object, or {@code null} if the
      *         value cannot be read.
-     * @throws IllegalArgumentException if {@code kind} is {@code null}, {@link JavaKind#Void} or
-     *             not {@linkplain JavaKind#isPrimitive() primitive} kind
+     * @throws IllegalArgumentException if {@code kind} is {@code null}, {@link JavaKind#Void}, not
+     *             {@link JavaKind#Object} or not {@linkplain JavaKind#isPrimitive() primitive} kind
      */
     JavaConstant readUnsafeConstant(JavaKind kind, JavaConstant base, long displacement) throws IllegalArgumentException;
 
@@ -59,7 +59,9 @@ public interface MemoryAccessProvider {
      *
      * @param base the base address from which the value is read
      * @param displacement the displacement within the object in bytes
-     * @return the read value encapsulated in a {@link Constant} object
+     * @return the read value encapsulated in a {@link Constant} object or {@code null} if the
+     *         address computed from {@code base} and {@code displacement} does not denote a
+     *         location holding an {@code Object} value
      */
     JavaConstant readObjectConstant(Constant base, long displacement);
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MetaUtil.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MetaUtil.java
index c2df8929fbe..fc5d260960f 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MetaUtil.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MetaUtil.java
@@ -22,132 +22,14 @@
  */
 package jdk.vm.ci.meta;
 
-import java.io.PrintStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
 
 /**
  * Miscellaneous collection of utility methods used by {@code jdk.vm.ci.meta} and its clients.
  */
 public class MetaUtil {
 
-    private static class ClassInfo {
-        public long totalSize;
-        public long instanceCount;
-
-        @Override
-        public String toString() {
-            return "totalSize=" + totalSize + ", instanceCount=" + instanceCount;
-        }
-    }
-
-    /**
-     * Returns the number of bytes occupied by this constant value or constant object and
-     * recursively all values reachable from this value.
-     *
-     * @param constant the constant whose bytes should be measured
-     * @param printTopN print total size and instance count of the top n classes is desired
-     * @return the number of bytes occupied by this constant
-     */
-    public static long getMemorySizeRecursive(MetaAccessProvider access, ConstantReflectionProvider constantReflection, JavaConstant constant, PrintStream out, int printTopN) {
-        Set<JavaConstant> marked = new HashSet<>();
-        Deque<JavaConstant> stack = new ArrayDeque<>();
-        if (constant.getJavaKind() == JavaKind.Object && constant.isNonNull()) {
-            marked.add(constant);
-        }
-        final HashMap<ResolvedJavaType, ClassInfo> histogram = new HashMap<>();
-        stack.push(constant);
-        long sum = 0;
-        while (!stack.isEmpty()) {
-            JavaConstant c = stack.pop();
-            long memorySize = access.getMemorySize(constant);
-            sum += memorySize;
-            if (c.getJavaKind() == JavaKind.Object && c.isNonNull()) {
-                ResolvedJavaType clazz = access.lookupJavaType(c);
-                if (!histogram.containsKey(clazz)) {
-                    histogram.put(clazz, new ClassInfo());
-                }
-                ClassInfo info = histogram.get(clazz);
-                info.instanceCount++;
-                info.totalSize += memorySize;
-                ResolvedJavaType type = access.lookupJavaType(c);
-                if (type.isArray()) {
-                    if (!type.getComponentType().isPrimitive()) {
-                        int length = constantReflection.readArrayLength(c);
-                        for (int i = 0; i < length; i++) {
-                            JavaConstant value = constantReflection.readArrayElement(c, i);
-                            pushConstant(marked, stack, value);
-                        }
-                    }
-                } else {
-                    ResolvedJavaField[] instanceFields = type.getInstanceFields(true);
-                    for (ResolvedJavaField f : instanceFields) {
-                        if (f.getJavaKind() == JavaKind.Object) {
-                            JavaConstant value = constantReflection.readFieldValue(f, c);
-                            pushConstant(marked, stack, value);
-                        }
-                    }
-                }
-            }
-        }
-        ArrayList<ResolvedJavaType> clazzes = new ArrayList<>();
-        clazzes.addAll(histogram.keySet());
-        Collections.sort(clazzes, new Comparator<ResolvedJavaType>() {
-
-            @Override
-            public int compare(ResolvedJavaType o1, ResolvedJavaType o2) {
-                long l1 = histogram.get(o1).totalSize;
-                long l2 = histogram.get(o2).totalSize;
-                if (l1 > l2) {
-                    return -1;
-                } else if (l1 == l2) {
-                    return 0;
-                } else {
-                    return 1;
-                }
-            }
-        });
-
-        int z = 0;
-        for (ResolvedJavaType c : clazzes) {
-            if (z > printTopN) {
-                break;
-            }
-            out.println("Class " + c + ", " + histogram.get(c));
-            ++z;
-        }
-
-        return sum;
-    }
-
-    private static void pushConstant(Set<JavaConstant> marked, Deque<JavaConstant> stack, JavaConstant value) {
-        if (value.isNonNull()) {
-            if (!marked.contains(value)) {
-                marked.add(value);
-                stack.push(value);
-            }
-        }
-    }
-
-    /**
-     * Calls {@link JavaType#resolve(ResolvedJavaType)} on an array of types.
-     */
-    public static ResolvedJavaType[] resolveJavaTypes(JavaType[] types, ResolvedJavaType accessingClass) {
-        ResolvedJavaType[] result = new ResolvedJavaType[types.length];
-        for (int i = 0; i < result.length; i++) {
-            result[i] = types[i].resolve(accessingClass);
-        }
-        return result;
-    }
-
     /**
      * Extends the functionality of {@link Class#getSimpleName()} to include a non-empty string for
      * anonymous and local classes.
@@ -184,7 +66,17 @@ public class MetaUtil {
         return name.substring(index + 1);
     }
 
-    static String internalNameToJava(String name, boolean qualified, boolean classForNameCompatible) {
+    /**
+     * Converts a type name in internal form to an external form.
+     *
+     * @param name the internal name to convert
+     * @param qualified whether the returned name should be qualified with the package name
+     * @param classForNameCompatible specifies if the returned name for array types should be in
+     *            {@link Class#forName(String)} format (e.g., {@code "[Ljava.lang.Object;"},
+     *            {@code "[[I"}) or in Java source code format (e.g., {@code "java.lang.Object[]"},
+     *            {@code "int[][]"} ).
+     */
+    public static String internalNameToJava(String name, boolean qualified, boolean classForNameCompatible) {
         switch (name.charAt(0)) {
             case 'L': {
                 String result = name.substring(1, name.length() - 1).replace('/', '.');
@@ -206,19 +98,6 @@ public class MetaUtil {
         }
     }
 
-    /**
-     * Turns an class name in internal format into a resolved Java type.
-     */
-    public static ResolvedJavaType classForName(String internal, MetaAccessProvider metaAccess, ClassLoader cl) {
-        JavaKind k = JavaKind.fromTypeString(internal);
-        try {
-            String n = internalNameToJava(internal, true, true);
-            return metaAccess.lookupJavaType(k.isPrimitive() ? k.toJavaClass() : Class.forName(n, true, cl));
-        } catch (ClassNotFoundException cnfe) {
-            throw new IllegalArgumentException("could not instantiate class described by " + internal, cnfe);
-        }
-    }
-
     /**
      * Convenient shortcut for calling
      * {@link #appendLocation(StringBuilder, ResolvedJavaMethod, int)} without having to supply a
@@ -336,21 +215,6 @@ public class MetaUtil {
         return result.toString();
     }
 
-    /**
-     * Prepends the String {@code indentation} to every line in String {@code lines}, including a
-     * possibly non-empty line following the final newline.
-     */
-    public static String indent(String lines, String indentation) {
-        if (lines.length() == 0) {
-            return lines;
-        }
-        final String newLine = "\n";
-        if (lines.endsWith(newLine)) {
-            return indentation + (lines.substring(0, lines.length() - 1)).replace(newLine, newLine + indentation) + newLine;
-        }
-        return indentation + lines.replace(newLine, newLine + indentation);
-    }
-
     /**
      * Gets a string representation of an object based soley on its class and its
      * {@linkplain System#identityHashCode(Object) identity hash code}. This avoids and calls to
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/PlatformKind.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/PlatformKind.java
index 07a60c2aeba..0d01d209a98 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/PlatformKind.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/PlatformKind.java
@@ -42,7 +42,7 @@ public interface PlatformKind {
 
         @Override
         public int hashCode() {
-            return e.ordinal() ^ e.name().hashCode();
+            return e.ordinal();
         }
 
         @Override
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java
index a62f26fa854..4928ef4b572 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java
@@ -61,13 +61,6 @@ public interface ResolvedJavaType extends JavaType, ModifiersProvider, Annotated
      */
     boolean isInstanceClass();
 
-    /**
-     * Checks whether this type is an array class.
-     *
-     * @return {@code true} if this type is an array class
-     */
-    boolean isArray();
-
     /**
      * Checks whether this type is primitive.
      *
@@ -136,14 +129,6 @@ public interface ResolvedJavaType extends JavaType, ModifiersProvider, Annotated
      */
     boolean isInstance(JavaConstant obj);
 
-    /**
-     * Returns this type if it is an exact type otherwise returns null. This type is exact if it is
-     * void, primitive, final, or an array of a final or primitive type.
-     *
-     * @return this type if it is exact; {@code null} otherwise
-     */
-    ResolvedJavaType asExactType();
-
     /**
      * Gets the super class of this type. If this type represents either the {@code Object} class,
      * an interface, a primitive type, or void, then null is returned. If this object represents an
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/VMConstant.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/VMConstant.java
index 4b7cd4afa07..e7b0484dbd3 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/VMConstant.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/VMConstant.java
@@ -22,5 +22,8 @@
  */
 package jdk.vm.ci.meta;
 
+/**
+ * Represents a constant that needs to be patched at runtime by the VM.
+ */
 public interface VMConstant extends Constant {
 }
diff --git a/hotspot/src/share/vm/jvmci/jvmciCodeInstaller.cpp b/hotspot/src/share/vm/jvmci/jvmciCodeInstaller.cpp
index fee18f99630..8e2111ea0fd 100644
--- a/hotspot/src/share/vm/jvmci/jvmciCodeInstaller.cpp
+++ b/hotspot/src/share/vm/jvmci/jvmciCodeInstaller.cpp
@@ -495,7 +495,7 @@ JVMCIEnv::CodeInstallResult CodeInstaller::gather_metadata(Handle target, Handle
     return result;
   }
 
-  _debug_recorder->pcs_size(); // ehm, create the sentinel record
+  _debug_recorder->pcs_size(); // create the sentinel record
 
   assert(_debug_recorder->pcs_length() >= 2, "must be at least 2");
 
diff --git a/hotspot/src/share/vm/jvmci/jvmciCompiler.cpp b/hotspot/src/share/vm/jvmci/jvmciCompiler.cpp
index 8e1e3ef4900..3fcf7bc5f71 100644
--- a/hotspot/src/share/vm/jvmci/jvmciCompiler.cpp
+++ b/hotspot/src/share/vm/jvmci/jvmciCompiler.cpp
@@ -172,15 +172,15 @@ void JVMCICompiler::compile_method(const methodHandle& method, int entry_bci, JV
   } else {
     oop result_object = (oop) result.get_jobject();
     if (result_object != NULL) {
-      oop failure_message = CompilationRequestResult::failureMessage(result_object);
+      oop failure_message = HotSpotCompilationRequestResult::failureMessage(result_object);
       if (failure_message != NULL) {
         const char* failure_reason = java_lang_String::as_utf8_string(failure_message);
-        env->set_failure(failure_reason, CompilationRequestResult::retry(result_object) != 0);
+        env->set_failure(failure_reason, HotSpotCompilationRequestResult::retry(result_object) != 0);
       } else {
         if (env->task()->code() == NULL) {
           env->set_failure("no nmethod produced", true);
         } else {
-          env->task()->set_num_inlined_bytecodes(CompilationRequestResult::inlinedBytecodes(result_object));
+          env->task()->set_num_inlined_bytecodes(HotSpotCompilationRequestResult::inlinedBytecodes(result_object));
           Atomic::inc(&_methods_compiled);
         }
       }
diff --git a/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp b/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
index 39207b30ca7..bc56b370358 100644
--- a/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
+++ b/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
@@ -781,13 +781,11 @@ C2V_VMENTRY(jint, getMetadata, (JNIEnv *jniEnv, jobject, jobject target, jobject
   Handle compiled_code_handle = JNIHandles::resolve(compiled_code);
   Handle metadata_handle = JNIHandles::resolve(metadata);
 
-  HotSpotOopMap::klass()->initialize(thread);
-
   CodeMetadata code_metadata;
   CodeBlob *cb = NULL;
   CodeInstaller installer;
 
-  JVMCIEnv::CodeInstallResult result = installer.gather_metadata(target_handle, compiled_code_handle, code_metadata, CHECK_0); //cb, pc_descs, nr_pc_descs, scopes_descs, scopes_size, reloc_buffer);
+  JVMCIEnv::CodeInstallResult result = installer.gather_metadata(target_handle, compiled_code_handle, code_metadata, CHECK_0);
   if (result != JVMCIEnv::ok) {
     return result;
   }
diff --git a/hotspot/src/share/vm/jvmci/jvmciJavaClasses.hpp b/hotspot/src/share/vm/jvmci/jvmciJavaClasses.hpp
index d828f986be3..312ae64b952 100644
--- a/hotspot/src/share/vm/jvmci/jvmciJavaClasses.hpp
+++ b/hotspot/src/share/vm/jvmci/jvmciJavaClasses.hpp
@@ -162,10 +162,10 @@ class JVMCIJavaClasses : AllStatic {
   start_class(site_Mark)                                                                                                                                       \
     oop_field(site_Mark, id, "Ljava/lang/Object;")                                                                                                             \
   end_class                                                                                                                                                    \
-  start_class(CompilationRequestResult)                                                                                                                        \
-    oop_field(CompilationRequestResult, failureMessage, "Ljava/lang/String;")                                                                                  \
-    boolean_field(CompilationRequestResult, retry)                                                                                                             \
-    int_field(CompilationRequestResult, inlinedBytecodes)                                                                                                      \
+  start_class(HotSpotCompilationRequestResult)                                                                                                                 \
+    oop_field(HotSpotCompilationRequestResult, failureMessage, "Ljava/lang/String;")                                                                           \
+    boolean_field(HotSpotCompilationRequestResult, retry)                                                                                                      \
+    int_field(HotSpotCompilationRequestResult, inlinedBytecodes)                                                                                               \
   end_class                                                                                                                                                    \
   start_class(DebugInfo)                                                                                                                                       \
     oop_field(DebugInfo, bytecodePosition, "Ljdk/vm/ci/code/BytecodePosition;")                                                                                \
@@ -283,11 +283,6 @@ class JVMCIJavaClasses : AllStatic {
     typeArrayOop_field(HotSpotMetaData, oopMaps, "[B")                                                                                                         \
     objArrayOop_field(HotSpotMetaData, metadata, "[Ljava/lang/String;")                                                                                        \
   end_class                                                                                                                                                    \
-  start_class(HotSpotOopMap)                                                                                                                                   \
-    int_field(HotSpotOopMap, offset)                                                                                                                           \
-    int_field(HotSpotOopMap, count)                                                                                                                            \
-    typeArrayOop_field(HotSpotOopMap, data, "[B")                                                                                                              \
-  end_class                                                                                                                                                    \
   start_class(HotSpotConstantPool)                                                                                                                             \
     long_field(HotSpotConstantPool, metaspaceConstantPool)                                                                                                     \
   end_class                                                                                                                                                    \
diff --git a/hotspot/src/share/vm/jvmci/jvmciRuntime.cpp b/hotspot/src/share/vm/jvmci/jvmciRuntime.cpp
index cbd75e37ad1..6bb862ecf24 100644
--- a/hotspot/src/share/vm/jvmci/jvmciRuntime.cpp
+++ b/hotspot/src/share/vm/jvmci/jvmciRuntime.cpp
@@ -63,15 +63,15 @@ BasicType JVMCIRuntime::kindToBasicType(Handle kind, TRAPS) {
   }
   jchar ch = JavaKind::typeChar(kind);
   switch(ch) {
-    case 'z': return T_BOOLEAN;
-    case 'b': return T_BYTE;
-    case 's': return T_SHORT;
-    case 'c': return T_CHAR;
-    case 'i': return T_INT;
-    case 'f': return T_FLOAT;
-    case 'j': return T_LONG;
-    case 'd': return T_DOUBLE;
-    case 'a': return T_OBJECT;
+    case 'Z': return T_BOOLEAN;
+    case 'B': return T_BYTE;
+    case 'S': return T_SHORT;
+    case 'C': return T_CHAR;
+    case 'I': return T_INT;
+    case 'F': return T_FLOAT;
+    case 'J': return T_LONG;
+    case 'D': return T_DOUBLE;
+    case 'A': return T_OBJECT;
     case '-': return T_ILLEGAL;
     default:
       JVMCI_ERROR_(T_ILLEGAL, "unexpected Kind: %c", ch);
@@ -574,14 +574,14 @@ JRT_LEAF(void, JVMCIRuntime::log_primitive(JavaThread* thread, jchar typeChar, j
   } uu;
   uu.l = value;
   switch (typeChar) {
-    case 'z': tty->print(value == 0 ? "false" : "true"); break;
-    case 'b': tty->print("%d", (jbyte) value); break;
-    case 'c': tty->print("%c", (jchar) value); break;
-    case 's': tty->print("%d", (jshort) value); break;
-    case 'i': tty->print("%d", (jint) value); break;
-    case 'f': tty->print("%f", uu.f); break;
-    case 'j': tty->print(JLONG_FORMAT, value); break;
-    case 'd': tty->print("%lf", uu.d); break;
+    case 'Z': tty->print(value == 0 ? "false" : "true"); break;
+    case 'B': tty->print("%d", (jbyte) value); break;
+    case 'C': tty->print("%c", (jchar) value); break;
+    case 'S': tty->print("%d", (jshort) value); break;
+    case 'I': tty->print("%d", (jint) value); break;
+    case 'F': tty->print("%f", uu.f); break;
+    case 'J': tty->print(JLONG_FORMAT, value); break;
+    case 'D': tty->print("%lf", uu.d); break;
     default: assert(false, "unknown typeChar"); break;
   }
   if (newline) {
diff --git a/hotspot/src/share/vm/jvmci/systemDictionary_jvmci.hpp b/hotspot/src/share/vm/jvmci/systemDictionary_jvmci.hpp
index bd4cdb2afbe..ae905169ef1 100644
--- a/hotspot/src/share/vm/jvmci/systemDictionary_jvmci.hpp
+++ b/hotspot/src/share/vm/jvmci/systemDictionary_jvmci.hpp
@@ -44,11 +44,11 @@
   do_klass(HotSpotSentinelConstant_klass,                jdk_vm_ci_hotspot_HotSpotSentinelConstant,             Jvmci) \
   do_klass(HotSpotStackFrameReference_klass,             jdk_vm_ci_hotspot_HotSpotStackFrameReference,          Jvmci) \
   do_klass(HotSpotMetaData_klass,                        jdk_vm_ci_hotspot_HotSpotMetaData,                     Jvmci) \
-  do_klass(HotSpotOopMap_klass,                          jdk_vm_ci_hotspot_HotSpotOopMap,                       Jvmci) \
   do_klass(HotSpotConstantPool_klass,                    jdk_vm_ci_hotspot_HotSpotConstantPool,                 Jvmci) \
   do_klass(HotSpotJVMCIMetaAccessContext_klass,          jdk_vm_ci_hotspot_HotSpotJVMCIMetaAccessContext,       Jvmci) \
   do_klass(HotSpotJVMCIRuntime_klass,                    jdk_vm_ci_hotspot_HotSpotJVMCIRuntime,                 Jvmci) \
   do_klass(HotSpotSpeculationLog_klass,                  jdk_vm_ci_hotspot_HotSpotSpeculationLog,               Jvmci) \
+  do_klass(HotSpotCompilationRequestResult_klass,        jdk_vm_ci_hotspot_HotSpotCompilationRequestResult,     Jvmci) \
   do_klass(Assumptions_ConcreteMethod_klass,             jdk_vm_ci_meta_Assumptions_ConcreteMethod,             Jvmci) \
   do_klass(Assumptions_NoFinalizableSubclass_klass,      jdk_vm_ci_meta_Assumptions_NoFinalizableSubclass,      Jvmci) \
   do_klass(Assumptions_ConcreteSubtype_klass,            jdk_vm_ci_meta_Assumptions_ConcreteSubtype,            Jvmci) \
@@ -60,7 +60,6 @@
   do_klass(DebugInfo_klass,                              jdk_vm_ci_code_DebugInfo,                              Jvmci) \
   do_klass(RegisterSaveLayout_klass,                     jdk_vm_ci_code_RegisterSaveLayout,                     Jvmci) \
   do_klass(BytecodeFrame_klass,                          jdk_vm_ci_code_BytecodeFrame,                          Jvmci) \
-  do_klass(CompilationRequestResult_klass,               jdk_vm_ci_code_CompilationRequestResult,               Jvmci) \
   do_klass(InstalledCode_klass,                          jdk_vm_ci_code_InstalledCode,                          Jvmci) \
   do_klass(code_Location_klass,                          jdk_vm_ci_code_Location,                               Jvmci) \
   do_klass(code_Register_klass,                          jdk_vm_ci_code_Register,                               Jvmci) \
diff --git a/hotspot/src/share/vm/jvmci/vmSymbols_jvmci.hpp b/hotspot/src/share/vm/jvmci/vmSymbols_jvmci.hpp
index f09df794758..fe853aa9e91 100644
--- a/hotspot/src/share/vm/jvmci/vmSymbols_jvmci.hpp
+++ b/hotspot/src/share/vm/jvmci/vmSymbols_jvmci.hpp
@@ -45,11 +45,11 @@
   template(jdk_vm_ci_hotspot_HotSpotSentinelConstant,             "jdk/vm/ci/hotspot/HotSpotSentinelConstant")             \
   template(jdk_vm_ci_hotspot_HotSpotStackFrameReference,          "jdk/vm/ci/hotspot/HotSpotStackFrameReference")          \
   template(jdk_vm_ci_hotspot_HotSpotMetaData,                     "jdk/vm/ci/hotspot/HotSpotMetaData")                     \
-  template(jdk_vm_ci_hotspot_HotSpotOopMap,                       "jdk/vm/ci/hotspot/HotSpotOopMap")                       \
   template(jdk_vm_ci_hotspot_HotSpotConstantPool,                 "jdk/vm/ci/hotspot/HotSpotConstantPool")                 \
   template(jdk_vm_ci_hotspot_HotSpotJVMCIMetaAccessContext,       "jdk/vm/ci/hotspot/HotSpotJVMCIMetaAccessContext")       \
   template(jdk_vm_ci_hotspot_HotSpotJVMCIRuntime,                 "jdk/vm/ci/hotspot/HotSpotJVMCIRuntime")                 \
   template(jdk_vm_ci_hotspot_HotSpotSpeculationLog,               "jdk/vm/ci/hotspot/HotSpotSpeculationLog")               \
+  template(jdk_vm_ci_hotspot_HotSpotCompilationRequestResult,     "jdk/vm/ci/hotspot/HotSpotCompilationRequestResult")     \
   template(jdk_vm_ci_meta_JavaConstant,                           "jdk/vm/ci/meta/JavaConstant")                           \
   template(jdk_vm_ci_meta_PrimitiveConstant,                      "jdk/vm/ci/meta/PrimitiveConstant")                      \
   template(jdk_vm_ci_meta_RawConstant,                            "jdk/vm/ci/meta/RawConstant")                            \
@@ -66,7 +66,6 @@
   template(jdk_vm_ci_code_Architecture,                           "jdk/vm/ci/code/Architecture")                           \
   template(jdk_vm_ci_code_BytecodeFrame,                          "jdk/vm/ci/code/BytecodeFrame")                          \
   template(jdk_vm_ci_code_BytecodePosition,                       "jdk/vm/ci/code/BytecodePosition")                       \
-  template(jdk_vm_ci_code_CompilationRequestResult,               "jdk/vm/ci/code/CompilationRequestResult")               \
   template(jdk_vm_ci_code_DebugInfo,                              "jdk/vm/ci/code/DebugInfo")                              \
   template(jdk_vm_ci_code_InstalledCode,                          "jdk/vm/ci/code/InstalledCode")                          \
   template(jdk_vm_ci_code_Location,                               "jdk/vm/ci/code/Location")                               \
@@ -91,7 +90,7 @@
   template(adjustCompilationLevel_name,                           "adjustCompilationLevel")                                \
   template(adjustCompilationLevel_signature,                      "(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;ZI)I") \
   template(compileMethod_name,                                    "compileMethod")                                         \
-  template(compileMethod_signature,                               "(Ljdk/vm/ci/hotspot/HotSpotResolvedJavaMethod;IJI)Ljdk/vm/ci/code/CompilationRequestResult;") \
+  template(compileMethod_signature,                               "(Ljdk/vm/ci/hotspot/HotSpotResolvedJavaMethod;IJI)Ljdk/vm/ci/hotspot/HotSpotCompilationRequestResult;") \
   template(fromMetaspace_name,                                    "fromMetaspace")                                         \
   template(method_fromMetaspace_signature,                        "(J)Ljdk/vm/ci/hotspot/HotSpotResolvedJavaMethod;")      \
   template(constantPool_fromMetaspace_signature,                  "(J)Ljdk/vm/ci/hotspot/HotSpotConstantPool;")            \
diff --git a/hotspot/test/compiler/jvmci/common/JVMCIHelpers.java b/hotspot/test/compiler/jvmci/common/JVMCIHelpers.java
index f206eb069dd..7d9abd409dd 100644
--- a/hotspot/test/compiler/jvmci/common/JVMCIHelpers.java
+++ b/hotspot/test/compiler/jvmci/common/JVMCIHelpers.java
@@ -41,12 +41,18 @@ public class JVMCIHelpers {
         // just empty, using default interface methods
     }
 
+    public static class EmptyCompilationRequestResult implements CompilationRequestResult {
+        @Override
+        public Object getFailure() {
+            return "no compiler configured";
+        }
+    }
     public static class EmptyHotspotCompiler implements JVMCICompiler {
 
         @Override
         public CompilationRequestResult compileMethod(CompilationRequest request) {
             // do nothing
-            return CompilationRequestResult.failure("no compiler configured", true);
+            return new EmptyCompilationRequestResult();
         }
     }
 
diff --git a/hotspot/test/compiler/jvmci/events/JvmciCreateMetaAccessContextTest.java b/hotspot/test/compiler/jvmci/events/JvmciCreateMetaAccessContextTest.java
deleted file mode 100644
index 0eeba44b2e0..00000000000
--- a/hotspot/test/compiler/jvmci/events/JvmciCreateMetaAccessContextTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2015, 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 8136421
- * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
- * @library / /testlibrary
- * @library ../common/patches
- * @modules java.base/jdk.internal.misc
- * @modules jdk.vm.ci/jdk.vm.ci.hotspot
- *          jdk.vm.ci/jdk.vm.ci.code
- *          jdk.vm.ci/jdk.vm.ci.meta
- *          jdk.vm.ci/jdk.vm.ci.runtime
- * @build jdk.vm.ci/jdk.vm.ci.hotspot.MetaAccessWrapper
- * @build compiler.jvmci.common.JVMCIHelpers
- *     compiler.jvmci.events.JvmciCreateMetaAccessContextTest
- * @run main jdk.test.lib.FileInstaller ../common/services/ ./META-INF/services/
- * @run main jdk.test.lib.FileInstaller
- *     ./JvmciCreateMetaAccessContextTest.config
- *     ./META-INF/services/jdk.vm.ci.hotspot.services.HotSpotVMEventListener
- * @run main ClassFileInstaller
- *     compiler.jvmci.common.JVMCIHelpers$EmptyHotspotCompiler
- *     compiler.jvmci.common.JVMCIHelpers$EmptyCompilerFactory
- *     compiler.jvmci.events.JvmciCreateMetaAccessContextTest
- *     jdk.test.lib.Asserts
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- *     -Xbootclasspath/a:.
- *     -Dcompiler.jvmci.events.JvmciCreateMetaAccessContextTest.providenull=true
- *     compiler.jvmci.events.JvmciCreateMetaAccessContextTest
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- *     -Xbootclasspath/a:.
- *     -Dcompiler.jvmci.events.JvmciCreateMetaAccessContextTest.providenull=false
- *     compiler.jvmci.events.JvmciCreateMetaAccessContextTest
- */
-
-package compiler.jvmci.events;
-
-import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
-import jdk.vm.ci.hotspot.services.HotSpotVMEventListener;
-import jdk.vm.ci.hotspot.MetaAccessWrapper;
-import jdk.vm.ci.meta.JVMCIMetaAccessContext;
-import jdk.test.lib.Asserts;
-
-public class JvmciCreateMetaAccessContextTest
-        extends HotSpotVMEventListener {
-    private static final boolean PROVIDE_NULL_CONTEXT = Boolean.getBoolean(
-            "compiler.jvmci.events.JvmciCreateMetaAccessContextTest"
-                    + ".providenull");
-    private static volatile int createMetaAccessContextCount = 0;
-    private static volatile String errorMessage = "";
-
-    public static void main(String args[]) {
-        if (createMetaAccessContextCount != 0) {
-            throw new Error("Unexpected createMetaAccessContextevents count"
-                    + " at test start");
-        }
-        JVMCIMetaAccessContext context;
-        context = HotSpotJVMCIRuntime.runtime().getMetaAccessContext();
-        Asserts.assertNotNull(context,
-                "JVMCIMetaAccessContext is null after 1st request");
-        Asserts.assertEQ(createMetaAccessContextCount, 1,
-                "Unexpected createMetaAccessContext events count after 1st"
-                        + " JVMCI runtime request");
-        context = HotSpotJVMCIRuntime.runtime().getMetaAccessContext();
-        Asserts.assertNotNull(context,
-                "JVMCIMetaAccessContext is null after 2nd request");
-        Asserts.assertEQ(createMetaAccessContextCount, 1,
-                "Unexpected createMetaAccessContext events count after 2nd"
-                        + " JVMCI runtime request");
-        Asserts.assertTrue(errorMessage.isEmpty(), errorMessage);
-        if (PROVIDE_NULL_CONTEXT) {
-            Asserts.assertFalse(context instanceof MetaAccessWrapper,
-                    "Got unexpected context: " + context.getClass());
-        } else {
-            Asserts.assertTrue(context instanceof MetaAccessWrapper,
-                    "Got unexpected context: " + context.getClass());
-        }
-    }
-
-    @Override
-    public JVMCIMetaAccessContext createMetaAccessContext(HotSpotJVMCIRuntime
-            hotSpotJVMCIRuntime) {
-        createMetaAccessContextCount++;
-        if (hotSpotJVMCIRuntime == null) {
-            errorMessage += " HotSpotJVMCIRuntime is null.";
-        }
-        if (PROVIDE_NULL_CONTEXT) {
-            return null;
-        }
-        return new MetaAccessWrapper();
-    }
-}
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/BoxPrimitiveDataProvider.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/BoxPrimitiveDataProvider.java
index d6516e40432..cb57b457c6d 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/BoxPrimitiveDataProvider.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/BoxPrimitiveDataProvider.java
@@ -37,12 +37,12 @@ public class BoxPrimitiveDataProvider {
         LinkedList<Object[]> cfgSet = new LinkedList<>();
         // Boolean testing
         cfgSet.add(
-                        new Object[]{JavaConstant.forBoolean(true), CONSTANT_REFLECTION_PROVIDER.forObject((Boolean) true)});
+                        new Object[]{JavaConstant.forBoolean(true), CONSTANT_REFLECTION_PROVIDER.forObject(true)});
         cfgSet.add(new Object[]{JavaConstant.forBoolean(false),
-                        CONSTANT_REFLECTION_PROVIDER.forObject((Boolean) false)});
+                        CONSTANT_REFLECTION_PROVIDER.forObject(false)});
         // Boxed boolean testing (returns null)
-        cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject((Boolean) true), null});
-        cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject((Boolean) false), null});
+        cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(true), null});
+        cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(false), null});
         for (byte number : new byte[]{-128, 0, 1, 127}) {
             // Integer primitives testing
             cfgSet.add(new Object[]{JavaConstant.forByte(number),
@@ -59,8 +59,8 @@ public class BoxPrimitiveDataProvider {
             }
             // Float and Double variables are not cached,
             // so the tested method returns "null" on them
-            cfgSet.add(new Object[]{JavaConstant.forFloat((float) number), null});
-            cfgSet.add(new Object[]{JavaConstant.forDouble((double) number), null});
+            cfgSet.add(new Object[]{JavaConstant.forFloat(number), null});
+            cfgSet.add(new Object[]{JavaConstant.forDouble(number), null});
             // Boxed primitives testing (return null)
             cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(Byte.valueOf(number)), null});
             cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(Short.valueOf(number)), null});
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/UnboxPrimitiveDataProvider.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/UnboxPrimitiveDataProvider.java
index b203bcc8346..ed8ad67d26e 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/UnboxPrimitiveDataProvider.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/UnboxPrimitiveDataProvider.java
@@ -38,9 +38,9 @@ public class UnboxPrimitiveDataProvider {
         LinkedList<Object[]> cfgSet = new LinkedList<>();
         // Testing boolean
         cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(
-                        (Boolean) true), JavaConstant.forBoolean(true)});
+                        true), JavaConstant.forBoolean(true)});
         cfgSet.add(new Object[]{JavaConstant.forBoolean(true), null});
-        cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject((Boolean) false),
+        cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(false),
                         JavaConstant.forBoolean(false)});
         cfgSet.add(new Object[]{JavaConstant.forBoolean(false), null});
         for (byte number : new byte[]{-128, 0, 1, 127}) {
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ConstantTest.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ConstantTest.java
index dfa217abf84..c14a69bf724 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ConstantTest.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ConstantTest.java
@@ -34,12 +34,11 @@
 // * @compile ConstantTest.java FieldUniverse.java TypeUniverse.java TestMetaAccessProvider.java
 package jdk.vm.ci.runtime.test;
 
-import jdk.vm.ci.meta.JavaConstant;
-import jdk.vm.ci.meta.JavaKind;
-
 import org.junit.Assert;
 import org.junit.Test;
 
+import jdk.vm.ci.meta.JavaConstant;
+
 public class ConstantTest extends FieldUniverse {
 
     @Test
@@ -52,30 +51,4 @@ public class ConstantTest extends FieldUniverse {
     public void testNullIsNull() {
         Assert.assertTrue(JavaConstant.NULL_POINTER.isNull());
     }
-
-    @Test
-    public void testOne() {
-        for (JavaKind kind : JavaKind.values()) {
-            if (kind.isNumericInteger() || kind.isNumericFloat()) {
-                Assert.assertTrue(JavaConstant.one(kind).getJavaKind() == kind);
-            }
-        }
-        Assert.assertEquals(1, JavaConstant.one(JavaKind.Int).asInt());
-        Assert.assertEquals(1L, JavaConstant.one(JavaKind.Long).asLong());
-        Assert.assertEquals(1, JavaConstant.one(JavaKind.Byte).asInt());
-        Assert.assertEquals(1, JavaConstant.one(JavaKind.Short).asInt());
-        Assert.assertEquals(1, JavaConstant.one(JavaKind.Char).asInt());
-        Assert.assertTrue(1F == JavaConstant.one(JavaKind.Float).asFloat());
-        Assert.assertTrue(1D == JavaConstant.one(JavaKind.Double).asDouble());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testIllegalOne() {
-        JavaConstant.one(JavaKind.Illegal);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testVoidOne() {
-        JavaConstant.one(JavaKind.Void);
-    }
 }
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java
index 774e0ca78bf..4b06b4b9b29 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java
@@ -183,34 +183,6 @@ public class TestResolvedJavaType extends TypeUniverse {
         }
     }
 
-    private static Class<?> asExactClass(Class<?> c) {
-        if (c.isArray()) {
-            if (asExactClass(c.getComponentType()) != null) {
-                return c;
-            }
-        } else {
-            if (c.isPrimitive() || Modifier.isFinal(c.getModifiers())) {
-                return c;
-            }
-        }
-        return null;
-    }
-
-    @Test
-    public void asExactTypeTest() {
-        for (Class<?> c : classes) {
-            ResolvedJavaType type = metaAccess.lookupJavaType(c);
-            ResolvedJavaType exactType = type.asExactType();
-            Class<?> expected = asExactClass(c);
-            if (expected == null) {
-                assertTrue("exact(" + c.getName() + ") != null", exactType == null);
-            } else {
-                assertNotNull(exactType);
-                assertTrue(exactType.equals(metaAccess.lookupJavaType(expected)));
-            }
-        }
-    }
-
     @Test
     public void getSuperclassTest() {
         for (Class<?> c : classes) {
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TypeUniverse.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TypeUniverse.java
index 50fc963b832..2aae14cb6b9 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TypeUniverse.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TypeUniverse.java
@@ -58,8 +58,6 @@ import org.junit.Test;
 
 import jdk.internal.misc.Unsafe;
 
-//JaCoCo Exclude
-
 /**
  * Context for type related tests.
  */

From 1af289e8c3cde3399eb12c5f4ec091a7e8bb4933 Mon Sep 17 00:00:00 2001
From: Nils Eliasson <neliasso@openjdk.org>
Date: Thu, 19 May 2016 10:40:19 +0200
Subject: [PATCH 096/228] 8155108: CompilerControl: tests incorrectly set
 states for excluded methods

Remove redundant code that was not properly updated

Reviewed-by: kvn
---
 .../share/vm/compiler/compilerDirectives.cpp  |  2 +-
 .../share/vm/compiler/compilerDirectives.hpp  |  6 +--
 .../share/vm/compiler/directivesParser.cpp    | 42 +------------------
 3 files changed, 5 insertions(+), 45 deletions(-)

diff --git a/hotspot/src/share/vm/compiler/compilerDirectives.cpp b/hotspot/src/share/vm/compiler/compilerDirectives.cpp
index 3ac14accad3..ed224cea90f 100644
--- a/hotspot/src/share/vm/compiler/compilerDirectives.cpp
+++ b/hotspot/src/share/vm/compiler/compilerDirectives.cpp
@@ -204,7 +204,7 @@ DirectiveSet::DirectiveSet(CompilerDirectives* d) :_inlinematchers(NULL), _direc
   compilerdirectives_common_flags(init_defaults_definition)
   compilerdirectives_c2_flags(init_defaults_definition)
   compilerdirectives_c1_flags(init_defaults_definition)
-  memset(_modified, 0, sizeof _modified);
+  memset(_modified, 0, sizeof(_modified));
 
   // Canonicalize DisableIntrinsic to contain only ',' as a separator.
   this->DisableIntrinsicOption = canonicalize_disableintrinsic(DisableIntrinsic);
diff --git a/hotspot/src/share/vm/compiler/compilerDirectives.hpp b/hotspot/src/share/vm/compiler/compilerDirectives.hpp
index 0432d87068f..f09680b9c76 100644
--- a/hotspot/src/share/vm/compiler/compilerDirectives.hpp
+++ b/hotspot/src/share/vm/compiler/compilerDirectives.hpp
@@ -127,7 +127,7 @@ public:
     number_of_flags
   } flags;
 
-  bool _modified[number_of_flags];
+  bool _modified[number_of_flags]; // Records what options where set by a directive
 
 #define flag_store_definition(name, type, dvalue, cc_flag) type name##Option;
   compilerdirectives_common_flags(flag_store_definition)
@@ -135,7 +135,7 @@ public:
   compilerdirectives_c1_flags(flag_store_definition)
 
 // Casting to get the same function signature for all setters. Used from parser.
-#define set_function_definition(name, type, dvalue, cc_flag) void set_##name(void* value) { type val = *(type*)value; name##Option = val; _modified[name##Index] = 1; }
+#define set_function_definition(name, type, dvalue, cc_flag) void set_##name(void* value) { type val = *(type*)value; name##Option = val; _modified[name##Index] = true; }
   compilerdirectives_common_flags(set_function_definition)
   compilerdirectives_c2_flags(set_function_definition)
   compilerdirectives_c1_flags(set_function_definition)
@@ -149,7 +149,7 @@ public:
 void print(outputStream* st) {
     print_inline(st);
     st->print("  ");
-#define print_function_definition(name, type, dvalue, cc_flag) print_##type(st, #name, this->name##Option, true);//(bool)_modified[name##Index]);
+#define print_function_definition(name, type, dvalue, cc_flag) print_##type(st, #name, this->name##Option, true);
     compilerdirectives_common_flags(print_function_definition)
     compilerdirectives_c2_flags(print_function_definition)
     compilerdirectives_c1_flags(print_function_definition)
diff --git a/hotspot/src/share/vm/compiler/directivesParser.cpp b/hotspot/src/share/vm/compiler/directivesParser.cpp
index 036357fc7f7..2d09a56119d 100644
--- a/hotspot/src/share/vm/compiler/directivesParser.cpp
+++ b/hotspot/src/share/vm/compiler/directivesParser.cpp
@@ -151,8 +151,6 @@ const DirectivesParser::key DirectivesParser::keys[] = {
     { "c2",     type_c2,     0, mask(type_directives), NULL, UnknownFlagType },
     { "match",  type_match,  1, mask(type_directives), NULL, UnknownFlagType },
     { "inline", type_inline, 1, mask(type_directives) | mask(type_c1) | mask(type_c2), NULL, UnknownFlagType },
-    { "enable", type_enable, 1, mask(type_directives) | mask(type_c1) | mask(type_c2), NULL, UnknownFlagType },
-    { "preset", type_preset, 0, mask(type_c1) | mask(type_c2), NULL, UnknownFlagType },
 
     // Global flags
     #define common_flag_key(name, type, dvalue, compiler) \
@@ -353,7 +351,7 @@ bool DirectivesParser::set_option(JSON_TYPE t, JSON_VAL* v) {
       if (!set_option_flag(t, v, option_key, current_directive->_c1_store)) {
         return false;
       }
-      if(!set_option_flag(t, v, option_key, current_directive->_c2_store)) {
+      if (!set_option_flag(t, v, option_key, current_directive->_c2_store)) {
         return false;
       }
     } else {
@@ -436,31 +434,6 @@ bool DirectivesParser::set_option(JSON_TYPE t, JSON_VAL* v) {
     }
     break;
 
-  case type_enable:
-    switch (enclosing_key->type) {
-    case type_c1:
-    case type_c2:
-    {
-      if (t != JSON_TRUE && t != JSON_FALSE) {
-        error(VALUE_ERROR, "Key of type %s enclosed in a %s key needs a true or false value", option_key->name, enclosing_key->name);
-        return false;
-      }
-      int val = (t == JSON_TRUE);
-      current_directiveset->set_Enable(&val);
-      break;
-    }
-
-    case type_directives:
-      error(VALUE_ERROR, "Enable keyword not available for generic directive");
-      return false;
-
-    default:
-      error(INTERNAL_ERROR, "Unexpected enclosing type for key %s: %s", option_key->name, enclosing_key->name);
-      ShouldNotReachHere();
-      return false;
-    }
-    break;
-
   default:
     break;
   }
@@ -730,19 +703,6 @@ void DirectivesParser::test() {
     DirectivesParser::test(
       "[{c1:{c1:{c1:{c1:{c1:{c1:{c1:{}}}}}}}}]", false);
 
-  DirectivesParser::test(
-    "[" "\n"
-    "  {" "\n"
-    "    c1: true," "\n"
-    "    c2: true," "\n"
-    "    match: true," "\n"
-    "    inline: true," "\n"
-    "    enable: true," "\n"
-    "    c1: {" "\n"
-    "      preset: true," "\n"
-    "    }" "\n"
-    "  }" "\n"
-    "]" "\n", false);
 }
 
 void DirectivesParser_test() {

From 6dfcf1dd8111a5fc9303f55c03429fddf50dd5c8 Mon Sep 17 00:00:00 2001
From: Vladimir Ivanov <vlivanov@openjdk.org>
Date: Fri, 20 May 2016 18:27:03 +0300
Subject: [PATCH 097/228] 8154831: CastII/ConvI2L for a range check is
 prematurely eliminated

Reviewed-by: kvn, thartmann
---
 hotspot/src/share/vm/opto/subnode.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hotspot/src/share/vm/opto/subnode.cpp b/hotspot/src/share/vm/opto/subnode.cpp
index 022f28cb8af..2e2597f6076 100644
--- a/hotspot/src/share/vm/opto/subnode.cpp
+++ b/hotspot/src/share/vm/opto/subnode.cpp
@@ -578,8 +578,12 @@ const Type *CmpUNode::sub( const Type *t1, const Type *t2 ) const {
     // All unsigned values are LE -1 and GE 0.
     if (lo0 == 0 && hi0 == 0) {
       return TypeInt::CC_LE;            //   0 <= bot
+    } else if ((jint)lo0 == -1 && (jint)hi0 == -1) {
+      return TypeInt::CC_GE;            // -1 >= bot
     } else if (lo1 == 0 && hi1 == 0) {
       return TypeInt::CC_GE;            // bot >= 0
+    } else if ((jint)lo1 == -1 && (jint)hi1 == -1) {
+      return TypeInt::CC_LE;            // bot <= -1
     }
   } else {
     // We can use ranges of the form [lo..hi] if signs are the same.

From 489b38091e797ac1d7409b473f866640a9ca3b6b Mon Sep 17 00:00:00 2001
From: Vivek Deshpande <vdeshpande@openjdk.org>
Date: Fri, 20 May 2016 14:17:55 -0700
Subject: [PATCH 098/228] 8154473: Update for CompilerDirectives to control
 stub generation and intrinsics

Use -XX:DisableIntrinsic flag to control intrinsics usage in Interpreter.

Reviewed-by: twisti, neliasso, kvn, simonis
---
 hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp | 234 +-----------------
 hotspot/src/cpu/x86/vm/macroAssembler_x86.hpp |  13 +-
 .../src/cpu/x86/vm/stubGenerator_x86_32.cpp   |  55 ++--
 .../src/cpu/x86/vm/stubGenerator_x86_64.cpp   |  60 +++--
 .../templateInterpreterGenerator_x86_32.cpp   |  14 +-
 .../templateInterpreterGenerator_x86_64.cpp   |  25 +-
 hotspot/src/share/vm/classfile/vmSymbols.cpp  |  35 +++
 hotspot/src/share/vm/classfile/vmSymbols.hpp  |   3 +
 .../share/vm/compiler/compilerDirectives.hpp  |   3 +-
 9 files changed, 144 insertions(+), 298 deletions(-)

diff --git a/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp b/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp
index 1a18af590f6..e3425c400ca 100644
--- a/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp
@@ -2584,6 +2584,11 @@ void MacroAssembler::call_VM_helper(Register oop_result, address entry_point, in
 
 }
 
+// Use this method when MacroAssembler version of call_VM_leaf_base() should be called from Interpreter.
+void MacroAssembler::call_VM_leaf0(address entry_point) {
+  MacroAssembler::call_VM_leaf_base(entry_point, 0);
+}
+
 void MacroAssembler::call_VM_leaf(address entry_point, int number_of_arguments) {
   call_VM_leaf_base(entry_point, number_of_arguments);
 }
@@ -5629,235 +5634,6 @@ void MacroAssembler::incr_allocated_bytes(Register thread,
 #endif
 }
 
-void MacroAssembler::fp_runtime_fallback(address runtime_entry, int nb_args, int num_fpu_regs_in_use) {
-  pusha();
-
-  // if we are coming from c1, xmm registers may be live
-  int num_xmm_regs = LP64_ONLY(16) NOT_LP64(8);
-  if (UseAVX > 2) {
-    num_xmm_regs = LP64_ONLY(32) NOT_LP64(8);
-  }
-
-  if (UseSSE == 1)  {
-    subptr(rsp, sizeof(jdouble)*8);
-    for (int n = 0; n < 8; n++) {
-      movflt(Address(rsp, n*sizeof(jdouble)), as_XMMRegister(n));
-    }
-  } else if (UseSSE >= 2)  {
-    if (UseAVX > 2) {
-      push(rbx);
-      movl(rbx, 0xffff);
-      kmovwl(k1, rbx);
-      pop(rbx);
-    }
-#ifdef COMPILER2
-    if (MaxVectorSize > 16) {
-      if(UseAVX > 2) {
-        // Save upper half of ZMM registers
-        subptr(rsp, 32*num_xmm_regs);
-        for (int n = 0; n < num_xmm_regs; n++) {
-          vextractf64x4_high(Address(rsp, n*32), as_XMMRegister(n));
-        }
-      }
-      assert(UseAVX > 0, "256 bit vectors are supported only with AVX");
-      // Save upper half of YMM registers
-      subptr(rsp, 16*num_xmm_regs);
-      for (int n = 0; n < num_xmm_regs; n++) {
-        vextractf128_high(Address(rsp, n*16), as_XMMRegister(n));
-      }
-    }
-#endif
-    // Save whole 128bit (16 bytes) XMM registers
-    subptr(rsp, 16*num_xmm_regs);
-#ifdef _LP64
-    if (VM_Version::supports_evex()) {
-      for (int n = 0; n < num_xmm_regs; n++) {
-        vextractf32x4(Address(rsp, n*16), as_XMMRegister(n), 0);
-      }
-    } else {
-      for (int n = 0; n < num_xmm_regs; n++) {
-        movdqu(Address(rsp, n*16), as_XMMRegister(n));
-      }
-    }
-#else
-    for (int n = 0; n < num_xmm_regs; n++) {
-      movdqu(Address(rsp, n*16), as_XMMRegister(n));
-    }
-#endif
-  }
-
-  // Preserve registers across runtime call
-  int incoming_argument_and_return_value_offset = -1;
-  if (num_fpu_regs_in_use > 1) {
-    // Must preserve all other FPU regs (could alternatively convert
-    // SharedRuntime::dsin, dcos etc. into assembly routines known not to trash
-    // FPU state, but can not trust C compiler)
-    NEEDS_CLEANUP;
-    // NOTE that in this case we also push the incoming argument(s) to
-    // the stack and restore it later; we also use this stack slot to
-    // hold the return value from dsin, dcos etc.
-    for (int i = 0; i < num_fpu_regs_in_use; i++) {
-      subptr(rsp, sizeof(jdouble));
-      fstp_d(Address(rsp, 0));
-    }
-    incoming_argument_and_return_value_offset = sizeof(jdouble)*(num_fpu_regs_in_use-1);
-    for (int i = nb_args-1; i >= 0; i--) {
-      fld_d(Address(rsp, incoming_argument_and_return_value_offset-i*sizeof(jdouble)));
-    }
-  }
-
-  subptr(rsp, nb_args*sizeof(jdouble));
-  for (int i = 0; i < nb_args; i++) {
-    fstp_d(Address(rsp, i*sizeof(jdouble)));
-  }
-
-#ifdef _LP64
-  if (nb_args > 0) {
-    movdbl(xmm0, Address(rsp, 0));
-  }
-  if (nb_args > 1) {
-    movdbl(xmm1, Address(rsp, sizeof(jdouble)));
-  }
-  assert(nb_args <= 2, "unsupported number of args");
-#endif // _LP64
-
-  // NOTE: we must not use call_VM_leaf here because that requires a
-  // complete interpreter frame in debug mode -- same bug as 4387334
-  // MacroAssembler::call_VM_leaf_base is perfectly safe and will
-  // do proper 64bit abi
-
-  NEEDS_CLEANUP;
-  // Need to add stack banging before this runtime call if it needs to
-  // be taken; however, there is no generic stack banging routine at
-  // the MacroAssembler level
-
-  MacroAssembler::call_VM_leaf_base(runtime_entry, 0);
-
-#ifdef _LP64
-  movsd(Address(rsp, 0), xmm0);
-  fld_d(Address(rsp, 0));
-#endif // _LP64
-  addptr(rsp, sizeof(jdouble)*nb_args);
-  if (num_fpu_regs_in_use > 1) {
-    // Must save return value to stack and then restore entire FPU
-    // stack except incoming arguments
-    fstp_d(Address(rsp, incoming_argument_and_return_value_offset));
-    for (int i = 0; i < num_fpu_regs_in_use - nb_args; i++) {
-      fld_d(Address(rsp, 0));
-      addptr(rsp, sizeof(jdouble));
-    }
-    fld_d(Address(rsp, (nb_args-1)*sizeof(jdouble)));
-    addptr(rsp, sizeof(jdouble)*nb_args);
-  }
-
-  if (UseSSE == 1)  {
-    for (int n = 0; n < 8; n++) {
-      movflt(as_XMMRegister(n), Address(rsp, n*sizeof(jdouble)));
-    }
-    addptr(rsp, sizeof(jdouble)*8);
-  } else if (UseSSE >= 2)  {
-    // Restore whole 128bit (16 bytes) XMM registers
-#ifdef _LP64
-  if (VM_Version::supports_evex()) {
-    for (int n = 0; n < num_xmm_regs; n++) {
-      vinsertf32x4(as_XMMRegister(n), as_XMMRegister(n), Address(rsp, n*16), 0);
-    }
-  } else {
-    for (int n = 0; n < num_xmm_regs; n++) {
-      movdqu(as_XMMRegister(n), Address(rsp, n*16));
-    }
-  }
-#else
-  for (int n = 0; n < num_xmm_regs; n++) {
-    movdqu(as_XMMRegister(n), Address(rsp, n*16));
-  }
-#endif
-    addptr(rsp, 16*num_xmm_regs);
-
-#ifdef COMPILER2
-    if (MaxVectorSize > 16) {
-      // Restore upper half of YMM registers.
-      for (int n = 0; n < num_xmm_regs; n++) {
-        vinsertf128_high(as_XMMRegister(n), Address(rsp, n*16));
-      }
-      addptr(rsp, 16*num_xmm_regs);
-      if(UseAVX > 2) {
-        for (int n = 0; n < num_xmm_regs; n++) {
-          vinsertf64x4_high(as_XMMRegister(n), Address(rsp, n*32));
-        }
-        addptr(rsp, 32*num_xmm_regs);
-      }
-    }
-#endif
-  }
-  popa();
-}
-
-static const double     pi_4 =  0.7853981633974483;
-
-void MacroAssembler::trigfunc(char trig, int num_fpu_regs_in_use) {
-  // A hand-coded argument reduction for values in fabs(pi/4, pi/2)
-  // was attempted in this code; unfortunately it appears that the
-  // switch to 80-bit precision and back causes this to be
-  // unprofitable compared with simply performing a runtime call if
-  // the argument is out of the (-pi/4, pi/4) range.
-
-  Register tmp = noreg;
-  if (!VM_Version::supports_cmov()) {
-    // fcmp needs a temporary so preserve rbx,
-    tmp = rbx;
-    push(tmp);
-  }
-
-  Label slow_case, done;
-  if (trig == 't') {
-    ExternalAddress pi4_adr = (address)&pi_4;
-    if (reachable(pi4_adr)) {
-      // x ?<= pi/4
-      fld_d(pi4_adr);
-      fld_s(1);                // Stack:  X  PI/4  X
-      fabs();                  // Stack: |X| PI/4  X
-      fcmp(tmp);
-      jcc(Assembler::above, slow_case);
-
-      // fastest case: -pi/4 <= x <= pi/4
-      ftan();
-
-      jmp(done);
-    }
-  }
-  // slow case: runtime call
-  bind(slow_case);
-
-  switch(trig) {
-  case 's':
-    {
-      fp_runtime_fallback(CAST_FROM_FN_PTR(address, SharedRuntime::dsin), 1, num_fpu_regs_in_use);
-    }
-    break;
-  case 'c':
-    {
-      fp_runtime_fallback(CAST_FROM_FN_PTR(address, SharedRuntime::dcos), 1, num_fpu_regs_in_use);
-    }
-    break;
-  case 't':
-    {
-      fp_runtime_fallback(CAST_FROM_FN_PTR(address, SharedRuntime::dtan), 1, num_fpu_regs_in_use);
-    }
-    break;
-  default:
-    assert(false, "bad intrinsic");
-    break;
-  }
-
-  // Come here with result in F-TOS
-  bind(done);
-
-  if (tmp != noreg) {
-    pop(tmp);
-  }
-}
-
 // Look up the method for a megamorphic invokeinterface call.
 // The target method is determined by <intf_klass, itable_index>.
 // The receiver klass is in recv_klass.
diff --git a/hotspot/src/cpu/x86/vm/macroAssembler_x86.hpp b/hotspot/src/cpu/x86/vm/macroAssembler_x86.hpp
index 48975683350..2098c05891e 100644
--- a/hotspot/src/cpu/x86/vm/macroAssembler_x86.hpp
+++ b/hotspot/src/cpu/x86/vm/macroAssembler_x86.hpp
@@ -259,6 +259,7 @@ class MacroAssembler: public Assembler {
   void super_call_VM(Register oop_result, Register last_java_sp, address entry_point, Register arg_1, Register arg_2, Register arg_3, bool check_exceptions = true);
   void super_call_VM(Register oop_result, Register last_java_sp, address entry_point, Register arg_1, Register arg_2, Register arg_3, Register arg_4, bool check_exceptions = true);
 
+  void call_VM_leaf0(address entry_point);
   void call_VM_leaf(address entry_point,
                     int number_of_arguments = 0);
   void call_VM_leaf(address entry_point,
@@ -453,15 +454,6 @@ class MacroAssembler: public Assembler {
   void cmpss2int(XMMRegister opr1, XMMRegister opr2, Register dst, bool unordered_is_less);
   void cmpsd2int(XMMRegister opr1, XMMRegister opr2, Register dst, bool unordered_is_less);
 
-  // Inlined sin/cos generator for Java; must not use CPU instruction
-  // directly on Intel as it does not have high enough precision
-  // outside of the range [-pi/4, pi/4]. Extra argument indicate the
-  // number of FPU stack slots in use; all but the topmost will
-  // require saving if a slow case is necessary. Assumes argument is
-  // on FP TOS; result is on FP TOS.  No cpu registers are changed by
-  // this code.
-  void trigfunc(char trig, int num_fpu_regs_in_use = 1);
-
   // branch to L if FPU flag C2 is set/not set
   // tmp is a temporary register, if none is available use noreg
   void jC2 (Register tmp, Label& L);
@@ -1036,9 +1028,6 @@ class MacroAssembler: public Assembler {
 
 private:
 
-  // call runtime as a fallback for trig functions and pow/exp.
-  void fp_runtime_fallback(address runtime_entry, int nb_args, int num_fpu_regs_in_use);
-
   // these are private because users should be doing movflt/movdbl
 
   void movss(Address dst, XMMRegister src)     { Assembler::movss(dst, src); }
diff --git a/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp b/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp
index adcfe63b39f..60485a6a1d8 100644
--- a/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp
+++ b/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp
@@ -3858,21 +3858,46 @@ class StubGenerator: public StubCodeGenerator {
       StubRoutines::_updateBytesCRC32C = generate_updateBytesCRC32C(supports_clmul);
     }
     if (VM_Version::supports_sse2() && UseLibmIntrinsic) {
-      StubRoutines::x86::_L_2il0floatpacket_0_adr = (address)StubRoutines::x86::_L_2il0floatpacket_0;
-      StubRoutines::x86::_Pi4Inv_adr = (address)StubRoutines::x86::_Pi4Inv;
-      StubRoutines::x86::_Pi4x3_adr = (address)StubRoutines::x86::_Pi4x3;
-      StubRoutines::x86::_Pi4x4_adr = (address)StubRoutines::x86::_Pi4x4;
-      StubRoutines::x86::_ones_adr = (address)StubRoutines::x86::_ones;
-      StubRoutines::_dexp = generate_libmExp();
-      StubRoutines::_dlog = generate_libmLog();
-      StubRoutines::_dlog10 = generate_libmLog10();
-      StubRoutines::_dpow = generate_libmPow();
-      StubRoutines::_dlibm_reduce_pi04l = generate_libm_reduce_pi04l();
-      StubRoutines::_dlibm_sin_cos_huge = generate_libm_sin_cos_huge();
-      StubRoutines::_dsin = generate_libmSin();
-      StubRoutines::_dcos = generate_libmCos();
-      StubRoutines::_dlibm_tan_cot_huge = generate_libm_tan_cot_huge();
-      StubRoutines::_dtan = generate_libmTan();
+      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dsin) ||
+          vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dcos) ||
+          vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dtan)) {
+        StubRoutines::x86::_L_2il0floatpacket_0_adr = (address)StubRoutines::x86::_L_2il0floatpacket_0;
+        StubRoutines::x86::_Pi4Inv_adr = (address)StubRoutines::x86::_Pi4Inv;
+        StubRoutines::x86::_Pi4x3_adr = (address)StubRoutines::x86::_Pi4x3;
+        StubRoutines::x86::_Pi4x4_adr = (address)StubRoutines::x86::_Pi4x4;
+        StubRoutines::x86::_ones_adr = (address)StubRoutines::x86::_ones;
+      }
+      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dexp)) {
+        StubRoutines::_dexp = generate_libmExp();
+      }
+      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dlog)) {
+        StubRoutines::_dlog = generate_libmLog();
+      }
+      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dlog10)) {
+        StubRoutines::_dlog10 = generate_libmLog10();
+      }
+      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dpow)) {
+        StubRoutines::_dpow = generate_libmPow();
+      }
+      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dsin) ||
+        vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dcos) ||
+        vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dtan)) {
+        StubRoutines::_dlibm_reduce_pi04l = generate_libm_reduce_pi04l();
+      }
+      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dsin) ||
+        vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dcos)) {
+        StubRoutines::_dlibm_sin_cos_huge = generate_libm_sin_cos_huge();
+      }
+      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dsin)) {
+        StubRoutines::_dsin = generate_libmSin();
+      }
+      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dcos)) {
+        StubRoutines::_dcos = generate_libmCos();
+      }
+      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dtan)) {
+        StubRoutines::_dlibm_tan_cot_huge = generate_libm_tan_cot_huge();
+        StubRoutines::_dtan = generate_libmTan();
+      }
     }
   }
 
diff --git a/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp b/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp
index 768cff7c635..02e46bd02aa 100644
--- a/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp
+++ b/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp
@@ -5128,27 +5128,45 @@ class StubGenerator: public StubCodeGenerator {
       StubRoutines::_updateBytesCRC32C = generate_updateBytesCRC32C(supports_clmul);
     }
     if (VM_Version::supports_sse2() && UseLibmIntrinsic) {
-      StubRoutines::x86::_ONEHALF_adr = (address)StubRoutines::x86::_ONEHALF;
-      StubRoutines::x86::_P_2_adr = (address)StubRoutines::x86::_P_2;
-      StubRoutines::x86::_SC_4_adr = (address)StubRoutines::x86::_SC_4;
-      StubRoutines::x86::_Ctable_adr = (address)StubRoutines::x86::_Ctable;
-      StubRoutines::x86::_SC_2_adr = (address)StubRoutines::x86::_SC_2;
-      StubRoutines::x86::_SC_3_adr = (address)StubRoutines::x86::_SC_3;
-      StubRoutines::x86::_SC_1_adr = (address)StubRoutines::x86::_SC_1;
-      StubRoutines::x86::_PI_INV_TABLE_adr = (address)StubRoutines::x86::_PI_INV_TABLE;
-      StubRoutines::x86::_PI_4_adr = (address)StubRoutines::x86::_PI_4;
-      StubRoutines::x86::_PI32INV_adr = (address)StubRoutines::x86::_PI32INV;
-      StubRoutines::x86::_SIGN_MASK_adr = (address)StubRoutines::x86::_SIGN_MASK;
-      StubRoutines::x86::_P_1_adr = (address)StubRoutines::x86::_P_1;
-      StubRoutines::x86::_P_3_adr = (address)StubRoutines::x86::_P_3;
-      StubRoutines::x86::_NEG_ZERO_adr = (address)StubRoutines::x86::_NEG_ZERO;
-      StubRoutines::_dexp = generate_libmExp();
-      StubRoutines::_dlog = generate_libmLog();
-      StubRoutines::_dlog10 = generate_libmLog10();
-      StubRoutines::_dpow = generate_libmPow();
-      StubRoutines::_dtan = generate_libmTan();
-      StubRoutines::_dsin = generate_libmSin();
-      StubRoutines::_dcos = generate_libmCos();
+      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dsin) ||
+          vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dcos) ||
+          vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dtan)) {
+        StubRoutines::x86::_ONEHALF_adr = (address)StubRoutines::x86::_ONEHALF;
+        StubRoutines::x86::_P_2_adr = (address)StubRoutines::x86::_P_2;
+        StubRoutines::x86::_SC_4_adr = (address)StubRoutines::x86::_SC_4;
+        StubRoutines::x86::_Ctable_adr = (address)StubRoutines::x86::_Ctable;
+        StubRoutines::x86::_SC_2_adr = (address)StubRoutines::x86::_SC_2;
+        StubRoutines::x86::_SC_3_adr = (address)StubRoutines::x86::_SC_3;
+        StubRoutines::x86::_SC_1_adr = (address)StubRoutines::x86::_SC_1;
+        StubRoutines::x86::_PI_INV_TABLE_adr = (address)StubRoutines::x86::_PI_INV_TABLE;
+        StubRoutines::x86::_PI_4_adr = (address)StubRoutines::x86::_PI_4;
+        StubRoutines::x86::_PI32INV_adr = (address)StubRoutines::x86::_PI32INV;
+        StubRoutines::x86::_SIGN_MASK_adr = (address)StubRoutines::x86::_SIGN_MASK;
+        StubRoutines::x86::_P_1_adr = (address)StubRoutines::x86::_P_1;
+        StubRoutines::x86::_P_3_adr = (address)StubRoutines::x86::_P_3;
+        StubRoutines::x86::_NEG_ZERO_adr = (address)StubRoutines::x86::_NEG_ZERO;
+      }
+      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dexp)) {
+        StubRoutines::_dexp = generate_libmExp();
+      }
+      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dlog)) {
+        StubRoutines::_dlog = generate_libmLog();
+      }
+      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dlog10)) {
+        StubRoutines::_dlog10 = generate_libmLog10();
+      }
+      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dpow)) {
+        StubRoutines::_dpow = generate_libmPow();
+      }
+      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dsin)) {
+        StubRoutines::_dsin = generate_libmSin();
+      }
+      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dcos)) {
+        StubRoutines::_dcos = generate_libmCos();
+      }
+      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dtan)) {
+        StubRoutines::_dtan = generate_libmTan();
+      }
     }
   }
 
diff --git a/hotspot/src/cpu/x86/vm/templateInterpreterGenerator_x86_32.cpp b/hotspot/src/cpu/x86/vm/templateInterpreterGenerator_x86_32.cpp
index 1339b1e065e..77cd5249d84 100644
--- a/hotspot/src/cpu/x86/vm/templateInterpreterGenerator_x86_32.cpp
+++ b/hotspot/src/cpu/x86/vm/templateInterpreterGenerator_x86_32.cpp
@@ -350,7 +350,7 @@ address TemplateInterpreterGenerator::generate_math_entry(AbstractInterpreter::M
         if (VM_Version::supports_sse2() && StubRoutines::dsin() != NULL) {
           __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dsin())));
         } else {
-          __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dsin)));
+          __ call_VM_leaf0(CAST_FROM_FN_PTR(address, SharedRuntime::dsin));
         }
         __ addptr(rsp, 2 * wordSize);
         break;
@@ -360,7 +360,7 @@ address TemplateInterpreterGenerator::generate_math_entry(AbstractInterpreter::M
         if (VM_Version::supports_sse2() && StubRoutines::dcos() != NULL) {
           __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dcos())));
         } else {
-          __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dcos)));
+          __ call_VM_leaf0(CAST_FROM_FN_PTR(address, SharedRuntime::dcos));
         }
         __ addptr(rsp, 2 * wordSize);
         break;
@@ -370,7 +370,7 @@ address TemplateInterpreterGenerator::generate_math_entry(AbstractInterpreter::M
         if (StubRoutines::dtan() != NULL) {
           __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dtan())));
         } else {
-          __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dtan)));
+          __ call_VM_leaf0(CAST_FROM_FN_PTR(address, SharedRuntime::dtan));
         }
         __ addptr(rsp, 2 * wordSize);
         break;
@@ -386,7 +386,7 @@ address TemplateInterpreterGenerator::generate_math_entry(AbstractInterpreter::M
         if (StubRoutines::dlog() != NULL) {
           __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dlog())));
         } else {
-          __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dlog)));
+          __ call_VM_leaf0(CAST_FROM_FN_PTR(address, SharedRuntime::dlog));
         }
         __ addptr(rsp, 2 * wordSize);
         break;
@@ -396,7 +396,7 @@ address TemplateInterpreterGenerator::generate_math_entry(AbstractInterpreter::M
         if (StubRoutines::dlog10() != NULL) {
           __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dlog10())));
         } else {
-          __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dlog10)));
+          __ call_VM_leaf0(CAST_FROM_FN_PTR(address, SharedRuntime::dlog10));
         }
         __ addptr(rsp, 2 * wordSize);
         break;
@@ -408,7 +408,7 @@ address TemplateInterpreterGenerator::generate_math_entry(AbstractInterpreter::M
       if (StubRoutines::dpow() != NULL) {
         __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dpow())));
       } else {
-        __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dpow)));
+        __ call_VM_leaf0(CAST_FROM_FN_PTR(address, SharedRuntime::dpow));
       }
       __ addptr(rsp, 4 * wordSize);
       break;
@@ -418,7 +418,7 @@ address TemplateInterpreterGenerator::generate_math_entry(AbstractInterpreter::M
       if (StubRoutines::dexp() != NULL) {
         __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dexp())));
       } else {
-        __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dexp)));
+        __ call_VM_leaf0(CAST_FROM_FN_PTR(address, SharedRuntime::dexp));
       }
       __ addptr(rsp, 2*wordSize);
     break;
diff --git a/hotspot/src/cpu/x86/vm/templateInterpreterGenerator_x86_64.cpp b/hotspot/src/cpu/x86/vm/templateInterpreterGenerator_x86_64.cpp
index a9cb7962fb1..ed412203a4a 100644
--- a/hotspot/src/cpu/x86/vm/templateInterpreterGenerator_x86_64.cpp
+++ b/hotspot/src/cpu/x86/vm/templateInterpreterGenerator_x86_64.cpp
@@ -377,35 +377,35 @@ address TemplateInterpreterGenerator::generate_math_entry(AbstractInterpreter::M
     if (StubRoutines::dexp() != NULL) {
       __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dexp())));
     } else {
-      __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dexp)));
+      __ call_VM_leaf0(CAST_FROM_FN_PTR(address, SharedRuntime::dexp));
     }
   } else if (kind == Interpreter::java_lang_math_log) {
     __ movdbl(xmm0, Address(rsp, wordSize));
     if (StubRoutines::dlog() != NULL) {
       __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dlog())));
     } else {
-      __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dlog)));
+      __ call_VM_leaf0(CAST_FROM_FN_PTR(address, SharedRuntime::dlog));
     }
   } else if (kind == Interpreter::java_lang_math_log10) {
     __ movdbl(xmm0, Address(rsp, wordSize));
     if (StubRoutines::dlog10() != NULL) {
       __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dlog10())));
     } else {
-      __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dlog10)));
+      __ call_VM_leaf0(CAST_FROM_FN_PTR(address, SharedRuntime::dlog10));
     }
   } else if (kind == Interpreter::java_lang_math_sin) {
     __ movdbl(xmm0, Address(rsp, wordSize));
     if (StubRoutines::dsin() != NULL) {
       __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dsin())));
     } else {
-      __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dsin)));
+      __ call_VM_leaf0(CAST_FROM_FN_PTR(address, SharedRuntime::dsin));
     }
   } else if (kind == Interpreter::java_lang_math_cos) {
     __ movdbl(xmm0, Address(rsp, wordSize));
     if (StubRoutines::dcos() != NULL) {
       __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dcos())));
     } else {
-      __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dcos)));
+      __ call_VM_leaf0(CAST_FROM_FN_PTR(address, SharedRuntime::dcos));
     }
   } else if (kind == Interpreter::java_lang_math_pow) {
     __ movdbl(xmm1, Address(rsp, wordSize));
@@ -413,23 +413,23 @@ address TemplateInterpreterGenerator::generate_math_entry(AbstractInterpreter::M
     if (StubRoutines::dpow() != NULL) {
       __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dpow())));
     } else {
-      __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dpow)));
+      __ call_VM_leaf0(CAST_FROM_FN_PTR(address, SharedRuntime::dpow));
     }
   } else if (kind == Interpreter::java_lang_math_tan) {
     __ movdbl(xmm0, Address(rsp, wordSize));
     if (StubRoutines::dtan() != NULL) {
       __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dtan())));
     } else {
-      __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dtan)));
+      __ call_VM_leaf0(CAST_FROM_FN_PTR(address, SharedRuntime::dtan));
     }
   } else {
     __ fld_d(Address(rsp, wordSize));
     switch (kind) {
-      case Interpreter::java_lang_math_abs:
-          __ fabs();
-          break;
-      default                              :
-          ShouldNotReachHere();
+    case Interpreter::java_lang_math_abs:
+      __ fabs();
+      break;
+    default:
+      ShouldNotReachHere();
     }
 
     // return double result in xmm0 for interpreter and compilers.
@@ -447,3 +447,4 @@ address TemplateInterpreterGenerator::generate_math_entry(AbstractInterpreter::M
 
   return entry_point;
 }
+
diff --git a/hotspot/src/share/vm/classfile/vmSymbols.cpp b/hotspot/src/share/vm/classfile/vmSymbols.cpp
index 95fa81712f1..a52570c17c5 100644
--- a/hotspot/src/share/vm/classfile/vmSymbols.cpp
+++ b/hotspot/src/share/vm/classfile/vmSymbols.cpp
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "classfile/vmSymbols.hpp"
+#include "compiler/compilerDirectives.hpp"
 #include "memory/oopFactory.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
@@ -418,9 +419,43 @@ int vmIntrinsics::predicates_needed(vmIntrinsics::ID id) {
   }
 }
 
+bool vmIntrinsics::is_intrinsic_available(vmIntrinsics::ID id) {
+  return !vmIntrinsics::is_intrinsic_disabled(id) &&
+    !vmIntrinsics::is_disabled_by_flags(id);
+}
+
+bool vmIntrinsics::is_intrinsic_disabled(vmIntrinsics::ID id) {
+  assert(id != vmIntrinsics::_none, "must be a VM intrinsic");
+
+  // Canonicalize DisableIntrinsic to contain only ',' as a separator.
+  // Note, DirectiveSet may not be created at this point yet since this code
+  // is called from initial stub geenration code.
+  char* local_list = (char*)DirectiveSet::canonicalize_disableintrinsic(DisableIntrinsic);
+
+  bool found = false;
+  char* token = strtok(local_list, ",");
+  while (token != NULL) {
+    if (strcmp(token, vmIntrinsics::name_at(id)) == 0) {
+      found = true;
+      break;
+    } else {
+      token = strtok(NULL, ",");
+    }
+  }
+
+  FREE_C_HEAP_ARRAY(char, local_list);
+  return found;
+}
+
+
 bool vmIntrinsics::is_disabled_by_flags(const methodHandle& method) {
   vmIntrinsics::ID id = method->intrinsic_id();
   assert(id != vmIntrinsics::_none, "must be a VM intrinsic");
+  return is_disabled_by_flags(id);
+}
+
+bool vmIntrinsics::is_disabled_by_flags(vmIntrinsics::ID id) {
+  assert(id != vmIntrinsics::_none, "must be a VM intrinsic");
 
   // -XX:-InlineNatives disables nearly all intrinsics except the ones listed in
   // the following switch statement.
diff --git a/hotspot/src/share/vm/classfile/vmSymbols.hpp b/hotspot/src/share/vm/classfile/vmSymbols.hpp
index 4214f7e65ac..585c8b5382e 100644
--- a/hotspot/src/share/vm/classfile/vmSymbols.hpp
+++ b/hotspot/src/share/vm/classfile/vmSymbols.hpp
@@ -1583,6 +1583,9 @@ public:
   // Returns true if a compiler intrinsic is disabled by command-line flags
   // and false otherwise.
   static bool is_disabled_by_flags(const methodHandle& method);
+  static bool is_disabled_by_flags(vmIntrinsics::ID id);
+  static bool is_intrinsic_disabled(vmIntrinsics::ID id);
+  static bool is_intrinsic_available(vmIntrinsics::ID id);
 };
 
 #endif // SHARE_VM_CLASSFILE_VMSYMBOLS_HPP
diff --git a/hotspot/src/share/vm/compiler/compilerDirectives.hpp b/hotspot/src/share/vm/compiler/compilerDirectives.hpp
index f09680b9c76..a4909b554ae 100644
--- a/hotspot/src/share/vm/compiler/compilerDirectives.hpp
+++ b/hotspot/src/share/vm/compiler/compilerDirectives.hpp
@@ -101,8 +101,6 @@ private:
   InlineMatcher* _inlinematchers;
   CompilerDirectives* _directive;
 
-  static ccstrlist canonicalize_disableintrinsic(ccstrlist option_value);
-
 public:
   DirectiveSet(CompilerDirectives* directive);
   ~DirectiveSet();
@@ -117,6 +115,7 @@ public:
   bool matches_inline(methodHandle method, int inline_action);
   static DirectiveSet* clone(DirectiveSet const* src);
   bool is_intrinsic_disabled(methodHandle method);
+  static ccstrlist canonicalize_disableintrinsic(ccstrlist option_value);
   void finalize(outputStream* st);
 
   typedef enum {

From 34c101efc6cc4ad2db29d9c5f986095511ba645c Mon Sep 17 00:00:00 2001
From: Dmitrij Pochepko <dpochepk@openjdk.org>
Date: Mon, 23 May 2016 17:33:39 +0300
Subject: [PATCH 099/228] 8157438: JVMCI: MaterializeVirtualObjectTest fails w/
 "CASE: invalidate=true: has no virtual object before"

Reviewed-by: kvn
---
 .../compilerToVM/MaterializeVirtualObjectTest.java  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/hotspot/test/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java b/hotspot/test/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java
index bba72d8b8d2..de107e0d220 100644
--- a/hotspot/test/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java
+++ b/hotspot/test/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java
@@ -75,6 +75,7 @@ public class MaterializeVirtualObjectTest {
     private static final Method METHOD;
     private static final ResolvedJavaMethod RESOLVED_METHOD;
     private static final boolean INVALIDATE;
+    private static final int COMPILE_THRESHOLD;
 
     static {
         WB = WhiteBox.getWhiteBox();
@@ -86,7 +87,10 @@ public class MaterializeVirtualObjectTest {
         }
         RESOLVED_METHOD = CTVMUtilities.getResolvedMethod(METHOD);
         INVALIDATE = Boolean.getBoolean(
-            "compiler.jvmci.compilerToVM.MaterializeVirtualObjectTest.invalidate");
+                "compiler.jvmci.compilerToVM.MaterializeVirtualObjectTest.invalidate");
+        COMPILE_THRESHOLD = WB.getBooleanVMFlag("TieredCompilation")
+                ? CompilerWhiteBoxTest.THRESHOLD
+                : CompilerWhiteBoxTest.THRESHOLD * 2;
     }
 
     public static void main(String[] args) {
@@ -110,15 +114,12 @@ public class MaterializeVirtualObjectTest {
                 + " : method unexpectedly compiled");
         /* need to trigger compilation by multiple method invocations
            in order to have method profile data to be gathered */
-        boolean isTiered = WB.getBooleanVMFlag("TieredCompilation");
-        int COMPILE_THRESHOLD = isTiered ? CompilerWhiteBoxTest.THRESHOLD
-                : CompilerWhiteBoxTest.THRESHOLD * 2;
         for (int i = 0; i < COMPILE_THRESHOLD; i++) {
             testFrame("someString", i);
         }
         Asserts.assertTrue(WB.isMethodCompiled(METHOD), getName()
                 + "Method unexpectedly not compiled");
-        testFrame("someString", CompilerWhiteBoxTest.THRESHOLD);
+        testFrame("someString", COMPILE_THRESHOLD);
     }
 
     private void testFrame(String str, int iteration) {
@@ -130,7 +131,7 @@ public class MaterializeVirtualObjectTest {
 
     private void check(int iteration) {
         // Materialize virtual objects on last invocation
-        if (iteration == CompilerWhiteBoxTest.THRESHOLD) {
+        if (iteration == COMPILE_THRESHOLD) {
             HotSpotStackFrameReference hsFrame = CompilerToVMHelper
                     .getNextStackFrame(/* topmost frame */ null,
                             new ResolvedJavaMethod[]{

From 50c5fb834b62344ff91ea278fafd178eb5fb4dd4 Mon Sep 17 00:00:00 2001
From: Zoltan Majo <zmajo@openjdk.org>
Date: Tue, 24 May 2016 09:07:22 +0200
Subject: [PATCH 100/228] 8157560: Reserve space for allocation prefetch only
 in builds that support allocation prefetching

Create the reserved area only in C2-enabled builds.

Reviewed-by: kvn, thartmann
---
 .../src/share/vm/gc/shared/threadLocalAllocBuffer.cpp    | 9 +++++++--
 .../OptionsValidation/TestOptionsWithRanges.java         | 8 --------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/hotspot/src/share/vm/gc/shared/threadLocalAllocBuffer.cpp b/hotspot/src/share/vm/gc/shared/threadLocalAllocBuffer.cpp
index a9fb53f48bb..0df1ba020a2 100644
--- a/hotspot/src/share/vm/gc/shared/threadLocalAllocBuffer.cpp
+++ b/hotspot/src/share/vm/gc/shared/threadLocalAllocBuffer.cpp
@@ -216,8 +216,10 @@ void ThreadLocalAllocBuffer::startup_initialization() {
 
   _global_stats = new GlobalTLABStats();
 
-  // Need extra space at the end of TLAB, otherwise prefetching
-  // instructions will fault (due to accessing memory outside of heap).
+#ifdef COMPILER2
+  // If the C2 compiler is present, extra space is needed at the end of
+  // TLABs, otherwise prefetching instructions generated by the C2
+  // compiler will fault (due to accessing memory outside of heap).
   // The amount of space is the max of the number of lines to
   // prefetch for array and for instance allocations. (Extra space must be
   // reserved to accommodate both types of allocations.)
@@ -227,11 +229,14 @@ void ThreadLocalAllocBuffer::startup_initialization() {
   // AllocatePrefetchInstr==1). To be on the safe side, however,
   // extra space is reserved for all combinations of
   // AllocatePrefetchStyle and AllocatePrefetchInstr.
+  //
+  // If the C2 compiler is not present, no space is reserved.
 
   // +1 for rounding up to next cache line, +1 to be safe
   int lines =  MAX2(AllocatePrefetchLines, AllocateInstancePrefetchLines) + 2;
   _reserve_for_allocation_prefetch = (AllocatePrefetchDistance + AllocatePrefetchStepSize * lines) /
                                      (int)HeapWordSize;
+#endif
 
   // During jvm startup, the main (primordial) thread is initialized
   // before the heap is initialized.  So reinitialize it now.
diff --git a/hotspot/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java b/hotspot/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java
index 7da0e14c225..890ac26463d 100644
--- a/hotspot/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java
+++ b/hotspot/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java
@@ -89,14 +89,6 @@ public class TestOptionsWithRanges {
          */
         excludeTestMaxRange("CICompilerCount");
 
-        /*
-         * JDK-8156679
-         * Temporarily exclude from range testing as the range is not
-         * valid for all platforms
-         */
-        excludeTestRange("AllocatePrefetchLines");
-        excludeTestRange("AllocateInstancePrefetchLines");
-
         /*
          * JDK-8136766
          * Temporarily remove ThreadStackSize from testing because Windows can set it to 0

From 1f60d4b0c31dfc0da6a33026b21a048a0b969598 Mon Sep 17 00:00:00 2001
From: Stefan Johansson <sjohanss@openjdk.org>
Date: Tue, 24 May 2016 10:05:03 +0200
Subject: [PATCH 101/228] 8156028: G1YoungGenSizer _adaptive_size not correct
 when setting NewSize and MaxNewSize to the same value

Reviewed-by: jmasa, sangheki, drwhite
---
 hotspot/src/share/vm/gc/g1/g1YoungGenSizer.cpp | 2 +-
 hotspot/src/share/vm/gc/g1/g1YoungGenSizer.hpp | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/hotspot/src/share/vm/gc/g1/g1YoungGenSizer.cpp b/hotspot/src/share/vm/gc/g1/g1YoungGenSizer.cpp
index c5058739df5..d06d712d6be 100644
--- a/hotspot/src/share/vm/gc/g1/g1YoungGenSizer.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1YoungGenSizer.cpp
@@ -56,7 +56,7 @@ G1YoungGenSizer::G1YoungGenSizer() : _sizer_kind(SizerDefaults), _adaptive_size(
                              MAX2((uint) (MaxNewSize / HeapRegion::GrainBytes),
                                   1U);
       _sizer_kind = SizerMaxAndNewSize;
-      _adaptive_size = _min_desired_young_length == _max_desired_young_length;
+      _adaptive_size = _min_desired_young_length != _max_desired_young_length;
     } else {
       _sizer_kind = SizerNewSizeOnly;
     }
diff --git a/hotspot/src/share/vm/gc/g1/g1YoungGenSizer.hpp b/hotspot/src/share/vm/gc/g1/g1YoungGenSizer.hpp
index 895cf6eb227..d292b4cd9b4 100644
--- a/hotspot/src/share/vm/gc/g1/g1YoungGenSizer.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1YoungGenSizer.hpp
@@ -75,7 +75,11 @@ private:
   SizerKind _sizer_kind;
   uint _min_desired_young_length;
   uint _max_desired_young_length;
+
+  // False when using a fixed young generation size due to command-line options,
+  // true otherwise.
   bool _adaptive_size;
+
   uint calculate_default_min_length(uint new_number_of_heap_regions);
   uint calculate_default_max_length(uint new_number_of_heap_regions);
 

From 6e4ea797f3012ead4d2bb1c8278d0dcc6ceaef74 Mon Sep 17 00:00:00 2001
From: Dmitry Samersoff <dsamersoff@openjdk.org>
Date: Tue, 24 May 2016 12:56:41 +0300
Subject: [PATCH 102/228] 8155957: java.lang.IllegalAccessError: class <foo>
 (in unnamed module XXX) cannot access class jdk.internal.misc.Unsafe

Added missed exports

Reviewed-by: sspitsyn
---
 hotspot/test/gc/g1/TestShrinkAuxiliaryData00.java | 3 +--
 hotspot/test/gc/g1/TestShrinkAuxiliaryData05.java | 3 +--
 hotspot/test/gc/g1/TestShrinkAuxiliaryData10.java | 3 +--
 hotspot/test/gc/g1/TestShrinkAuxiliaryData15.java | 3 +--
 hotspot/test/gc/g1/TestShrinkAuxiliaryData20.java | 3 +--
 hotspot/test/gc/g1/TestShrinkAuxiliaryData25.java | 3 +--
 hotspot/test/gc/g1/TestShrinkAuxiliaryData30.java | 3 +--
 7 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/hotspot/test/gc/g1/TestShrinkAuxiliaryData00.java b/hotspot/test/gc/g1/TestShrinkAuxiliaryData00.java
index ae12f5c83d3..c013c903121 100644
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData00.java
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData00.java
@@ -25,7 +25,6 @@
  * @test TestShrinkAuxiliaryData00
  * @bug 8038423 8061715
  * @summary Checks that decommitment occurs for JVM with different
- * @ignore 8155957
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
@@ -36,7 +35,7 @@
  *        TestShrinkAuxiliaryData TestShrinkAuxiliaryData00
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run driver/timeout=720 TestShrinkAuxiliaryData00
+ * @run main/timeout=720 TestShrinkAuxiliaryData00
  */
 public class TestShrinkAuxiliaryData00 {
 
diff --git a/hotspot/test/gc/g1/TestShrinkAuxiliaryData05.java b/hotspot/test/gc/g1/TestShrinkAuxiliaryData05.java
index 0e00ffee174..d12dc31769a 100644
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData05.java
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData05.java
@@ -26,7 +26,6 @@
  * @bug 8038423 8061715 8078405
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
- * @ignore 8155957
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
@@ -36,7 +35,7 @@
  *        TestShrinkAuxiliaryData TestShrinkAuxiliaryData05
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run driver/timeout=720 TestShrinkAuxiliaryData05
+ * @run main/timeout=720 TestShrinkAuxiliaryData05
  */
 public class TestShrinkAuxiliaryData05 {
 
diff --git a/hotspot/test/gc/g1/TestShrinkAuxiliaryData10.java b/hotspot/test/gc/g1/TestShrinkAuxiliaryData10.java
index afad2ca15e7..e530a73186a 100644
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData10.java
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData10.java
@@ -26,7 +26,6 @@
  * @bug 8038423 8061715 8078405
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
- * @ignore 8155957
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
@@ -36,7 +35,7 @@
  * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData10
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run driver/timeout=720 TestShrinkAuxiliaryData10
+ * @run main/timeout=720 TestShrinkAuxiliaryData10
  */
 public class TestShrinkAuxiliaryData10 {
 
diff --git a/hotspot/test/gc/g1/TestShrinkAuxiliaryData15.java b/hotspot/test/gc/g1/TestShrinkAuxiliaryData15.java
index 598caaaa63a..bae6d66da80 100644
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData15.java
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData15.java
@@ -26,7 +26,6 @@
  * @bug 8038423 8061715 8078405
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
- * @ignore 8155957
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
@@ -36,7 +35,7 @@
  * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData15
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run driver/timeout=720 TestShrinkAuxiliaryData15
+ * @run main/timeout=720 TestShrinkAuxiliaryData15
  */
 public class TestShrinkAuxiliaryData15 {
 
diff --git a/hotspot/test/gc/g1/TestShrinkAuxiliaryData20.java b/hotspot/test/gc/g1/TestShrinkAuxiliaryData20.java
index 13ad25d305e..b9f6834a271 100644
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData20.java
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData20.java
@@ -26,7 +26,6 @@
  * @bug 8038423 8061715 8078405
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
- * @ignore 8155957
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
@@ -36,7 +35,7 @@
  * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData20
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run driver/timeout=720 TestShrinkAuxiliaryData20
+ * @run main/timeout=720 TestShrinkAuxiliaryData20
  */
 public class TestShrinkAuxiliaryData20 {
 
diff --git a/hotspot/test/gc/g1/TestShrinkAuxiliaryData25.java b/hotspot/test/gc/g1/TestShrinkAuxiliaryData25.java
index 8e8f84f2ba9..3b5382af5c8 100644
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData25.java
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData25.java
@@ -26,7 +26,6 @@
  * @bug 8038423 8061715 8078405
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
- * @ignore 8155957
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
@@ -36,7 +35,7 @@
  * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData25
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run driver/timeout=720 TestShrinkAuxiliaryData25
+ * @run main/timeout=720 TestShrinkAuxiliaryData25
  */
 public class TestShrinkAuxiliaryData25 {
 
diff --git a/hotspot/test/gc/g1/TestShrinkAuxiliaryData30.java b/hotspot/test/gc/g1/TestShrinkAuxiliaryData30.java
index 249a7216d42..9007d909c0d 100644
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData30.java
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData30.java
@@ -26,7 +26,6 @@
  * @bug 8038423 8061715 8078405
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
- * @ignore 8155957
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
@@ -36,7 +35,7 @@
  * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData30
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run driver/timeout=720 TestShrinkAuxiliaryData30
+ * @run main/timeout=720 TestShrinkAuxiliaryData30
  */
 public class TestShrinkAuxiliaryData30 {
 

From f1c490f5fa570070cbcb9f547b7bcd1aff951b6f Mon Sep 17 00:00:00 2001
From: Gerard Ziemski <gziemski@openjdk.org>
Date: Tue, 24 May 2016 12:42:43 -0500
Subject: [PATCH 103/228] 8152856: Xcode 7.3 -Wshift-negative-value compile
 failure on Mac OS X

Implement _lh_array_tag_type_value as const, not enum.

Reviewed-by: vlivanov, minqi
---
 hotspot/src/share/vm/oops/klass.hpp        | 3 ++-
 hotspot/src/share/vm/opto/library_call.cpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/hotspot/src/share/vm/oops/klass.hpp b/hotspot/src/share/vm/oops/klass.hpp
index b6181d4b877..c0482b12dda 100644
--- a/hotspot/src/share/vm/oops/klass.hpp
+++ b/hotspot/src/share/vm/oops/klass.hpp
@@ -309,10 +309,11 @@ protected:
     _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_type_value    = ~0x00,  // 0xC0000000 >> 30
     _lh_array_tag_obj_value     = ~0x01   // 0x80000000 >> 30
   };
 
+  static const unsigned int _lh_array_tag_type_value = 0Xffffffff; // ~0x00,  // 0xC0000000 >> 30
+
   static int layout_helper_size_in_bytes(jint lh) {
     assert(lh > (jint)_lh_neutral_value, "must be instance");
     return (int) lh & ~_lh_instance_slow_path_bit;
diff --git a/hotspot/src/share/vm/opto/library_call.cpp b/hotspot/src/share/vm/opto/library_call.cpp
index 87636e8f3a3..12c59133a7d 100644
--- a/hotspot/src/share/vm/opto/library_call.cpp
+++ b/hotspot/src/share/vm/opto/library_call.cpp
@@ -3740,7 +3740,7 @@ Node* LibraryCallKit::generate_array_guard_common(Node* kls, RegionNode* region,
   }
   // Now test the correct condition.
   jint  nval = (obj_array
-                ? ((jint)Klass::_lh_array_tag_type_value
+                ? (jint)(Klass::_lh_array_tag_type_value
                    <<    Klass::_lh_array_tag_shift)
                 : Klass::_lh_neutral_value);
   Node* cmp = _gvn.transform(new CmpINode(layout_val, intcon(nval)));

From e54a25914e9dfde90cd20acb006df87712635545 Mon Sep 17 00:00:00 2001
From: Paul Sandoz <psandoz@openjdk.org>
Date: Wed, 25 May 2016 10:46:21 +0200
Subject: [PATCH 104/228] 8157683: Thread.onSpinWait intrinsification doesn't
 have sufficient test coverage

Reviewed-by: kvn
---
 .../TestOnSpinWaitEnableDisable.java          | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 hotspot/test/compiler/onSpinWait/TestOnSpinWaitEnableDisable.java

diff --git a/hotspot/test/compiler/onSpinWait/TestOnSpinWaitEnableDisable.java b/hotspot/test/compiler/onSpinWait/TestOnSpinWaitEnableDisable.java
new file mode 100644
index 00000000000..97a7dd7be14
--- /dev/null
+++ b/hotspot/test/compiler/onSpinWait/TestOnSpinWaitEnableDisable.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2016 Azul Systems, 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.
+ */
+
+/**
+ * @test TestOnSpinWaitEnableDisable
+ * @summary Test to ensure basic functioning of java.lang.Thread.onSpinWait
+ * @bug 8157683
+ * @run main TestOnSpinWaitEnableDisable
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:DisableIntrinsic=_onSpinWait TestOnSpinWaitEnableDisable
+ */
+
+public class TestOnSpinWaitEnableDisable {
+    public static void main(String[] args) {
+        for (int i = 0; i < 50_000; i++) {
+            java.lang.Thread.onSpinWait();
+        }
+    }
+}

From fdf9e5a63e15d952bf76fbce807fcfcf9fedcffc Mon Sep 17 00:00:00 2001
From: Dmitrij Pochepko <dpochepk@openjdk.org>
Date: Wed, 25 May 2016 16:20:02 +0300
Subject: [PATCH 105/228] 8156585: Cosmetic: AARCH64 defines in
 c1_LIRAssembler_aarch64.hpp

Reviewed-by: kvn
---
 hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.hpp b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.hpp
index 6d7e27e617b..f12fa864a2f 100644
--- a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.hpp
+++ b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.hpp
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_C1_LIRASSEMBLER_X86_HPP
-#define CPU_X86_VM_C1_LIRASSEMBLER_X86_HPP
+#ifndef CPU_AARCH64_VM_C1_LIRASSEMBLER_AARCH64_HPP
+#define CPU_AARCH64_VM_C1_LIRASSEMBLER_AARCH64_HPP
 
 // ArrayCopyStub needs access to bailout
 friend class ArrayCopyStub;
@@ -78,4 +78,4 @@ enum { call_stub_size = 12 * NativeInstruction::instruction_size,
        exception_handler_size = DEBUG_ONLY(1*K) NOT_DEBUG(175),
        deopt_handler_size = 7 * NativeInstruction::instruction_size };
 
-#endif // CPU_X86_VM_C1_LIRASSEMBLER_X86_HPP
+#endif // CPU_AARCH64_VM_C1_LIRASSEMBLER_AARCH64_HPP

From ac5718b3064dadd7730b511b8cf6639fba877fe1 Mon Sep 17 00:00:00 2001
From: Dmitrij Pochepko <dpochepk@openjdk.org>
Date: Wed, 25 May 2016 16:22:31 +0300
Subject: [PATCH 106/228] 8156470: [JITtester] EOL on Windows

Reviewed-by: kvn
---
 .../lib/jittester/jtreg/JitTesterDriver.java  |  9 ++++++---
 .../test/lib/jittester/utils/FixedTrees.java  | 19 +++++++++----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/jtreg/JitTesterDriver.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/jtreg/JitTesterDriver.java
index 0494f82d515..ca04131baed 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/jtreg/JitTesterDriver.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/jtreg/JitTesterDriver.java
@@ -33,6 +33,7 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.function.Predicate;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -52,14 +53,16 @@ public class JitTesterDriver {
             throw new Error("Unexpected exception on test jvm start :" + e, e);
         }
 
+        Pattern splitOut = Pattern.compile("\\n"); // tests use \n only in stdout
+        Pattern splitErr = Pattern.compile("\\r?\\n"); // can handle both \r\n and \n
         Path testDir = Paths.get(Utils.TEST_SRC);
         String goldOut = formatOutput(streamGoldFile(testDir, args[0], "out"), s -> true);
-        Asserts.assertEQ(oa.getStdout(), goldOut, "Actual stdout isn't equal to golden one");
-
+        String anlzOut = formatOutput(Arrays.stream(splitOut.split(oa.getStdout())), s -> true);
+        Asserts.assertEQ(anlzOut, goldOut, "Actual stdout isn't equal to golden one");
         // TODO: add a comment why we skip such lines
         Predicate<String> notStartWhitespaces = s -> !(s.startsWith("\t") || s.startsWith(" "));
         String goldErr = formatOutput(streamGoldFile(testDir, args[0], "err"), notStartWhitespaces);
-        String anlzErr = formatOutput(Arrays.stream(oa.getStderr().split(Utils.NEW_LINE)),
+        String anlzErr = formatOutput(Arrays.stream(splitErr.split(oa.getStderr())),
                                       notStartWhitespaces);
         Asserts.assertEQ(anlzErr, goldErr, "Actual stderr isn't equal to golden one");
 
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/FixedTrees.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/FixedTrees.java
index d23b80450b4..a2c656c75d2 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/FixedTrees.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/utils/FixedTrees.java
@@ -37,7 +37,6 @@ import jdk.test.lib.jittester.Nothing;
 import jdk.test.lib.jittester.Operator;
 import jdk.test.lib.jittester.OperatorKind;
 import jdk.test.lib.jittester.PrintVariables;
-import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Statement;
 import jdk.test.lib.jittester.StaticMemberVariable;
 import jdk.test.lib.jittester.Symbol;
@@ -171,22 +170,22 @@ public class FixedTrees {
         TryCatchBlock tryCatch1 = new TryCatchBlock(tryNode, nothing, catchBlocks1, 3);
         TypeKlass printStreamKlass = new TypeKlass("java.io.PrintStream");
         TypeKlass systemKlass = new TypeKlass("java.lang.System");
-        FunctionInfo systemOutPrintlnInfo = new FunctionInfo("println", printStreamKlass,
+        FunctionInfo systemOutPrintInfo = new FunctionInfo("print", printStreamKlass,
                 TypeList.VOID, 0, FunctionInfo.PUBLIC,
                 new VariableInfo("this", owner, printStreamKlass, VariableInfo.LOCAL | VariableInfo.INITIALIZED),
                 new VariableInfo("t", owner, TypeList.OBJECT,
                         VariableInfo.LOCAL  | VariableInfo.INITIALIZED));
-        List<IRNode> printlnArgs = new ArrayList<>();
+        List<IRNode> printArgs = new ArrayList<>();
         VariableInfo systemOutInfo = new VariableInfo("out", systemKlass, printStreamKlass,
                 VariableInfo.STATIC | VariableInfo.PUBLIC);
         StaticMemberVariable systemOutVar = new StaticMemberVariable(owner, systemOutInfo);
-        printlnArgs.add(systemOutVar);
-        printlnArgs.add(tVar);
-        Function println = new Function(printStreamKlass, systemOutPrintlnInfo, printlnArgs);
-        ArrayList<IRNode> printlnBlockContent = new ArrayList<>();
-        printlnBlockContent.add(new Statement(println, true));
-        Block printlnBlock = new Block(owner, TypeList.VOID, printlnBlockContent, 3);
-        TryCatchBlock tryCatch2 = new TryCatchBlock(printlnBlock, nothing, catchBlocks2, 3);
+        printArgs.add(systemOutVar);
+        printArgs.add(tVar);
+        Function print = new Function(printStreamKlass, systemOutPrintInfo, printArgs);
+        ArrayList<IRNode> printBlockContent = new ArrayList<>();
+        printBlockContent.add(new Statement(print, true));
+        Block printBlock = new Block(owner, TypeList.VOID, printBlockContent, 3);
+        TryCatchBlock tryCatch2 = new TryCatchBlock(printBlock, nothing, catchBlocks2, 3);
 
         List<IRNode> mainTryCatchBlockContent = new ArrayList<>();
         mainTryCatchBlockContent.add(new Statement(testInit, true));

From 7694596568e480ec0f3818de108f3cc333eb1e0d Mon Sep 17 00:00:00 2001
From: Ed Nevill <enevill@openjdk.org>
Date: Wed, 25 May 2016 15:05:26 +0000
Subject: [PATCH 107/228] 8157834: aarch64: Hello World crashes with fastdebug
 build

Support LL, UL and LU encodings of StrIndexOf

Reviewed-by: aph
---
 hotspot/src/cpu/aarch64/vm/aarch64.ad         | 133 ++++++++++++++-
 .../cpu/aarch64/vm/macroAssembler_aarch64.cpp | 153 ++++++++++--------
 .../cpu/aarch64/vm/macroAssembler_aarch64.hpp |   2 +-
 3 files changed, 212 insertions(+), 76 deletions(-)

diff --git a/hotspot/src/cpu/aarch64/vm/aarch64.ad b/hotspot/src/cpu/aarch64/vm/aarch64.ad
index 5359f30f29c..c2f2d7767d5 100644
--- a/hotspot/src/cpu/aarch64/vm/aarch64.ad
+++ b/hotspot/src/cpu/aarch64/vm/aarch64.ad
@@ -3331,7 +3331,6 @@ const bool Matcher::match_rule_supported(int opcode) {
 
   switch (opcode) {
   case Op_StrComp:
-  case Op_StrIndexOf:
     if (CompactStrings)  return false;
     break;
   default:
@@ -14953,26 +14952,83 @@ instruct string_compareU(iRegP_R1 str1, iRegI_R2 cnt1, iRegP_R3 str2, iRegI_R4 c
   ins_pipe(pipe_class_memory);
 %}
 
-instruct string_indexof(iRegP_R1 str1, iRegI_R4 cnt1, iRegP_R3 str2, iRegI_R2 cnt2,
+instruct string_indexofUU(iRegP_R1 str1, iRegI_R4 cnt1, iRegP_R3 str2, iRegI_R2 cnt2,
        iRegI_R0 result, iRegI tmp1, iRegI tmp2, iRegI tmp3, iRegI tmp4, rFlagsReg cr)
 %{
   predicate(((StrIndexOfNode*)n)->encoding() == StrIntrinsicNode::UU);
   match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 cnt2)));
   effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2,
          TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, KILL cr);
-  format %{ "String IndexOf $str1,$cnt1,$str2,$cnt2 -> $result" %}
+  format %{ "String IndexOf $str1,$cnt1,$str2,$cnt2 -> $result (UU)" %}
 
   ins_encode %{
     __ string_indexof($str1$$Register, $str2$$Register,
                       $cnt1$$Register, $cnt2$$Register,
                       $tmp1$$Register, $tmp2$$Register,
                       $tmp3$$Register, $tmp4$$Register,
-                      -1, $result$$Register);
+                      -1, $result$$Register, StrIntrinsicNode::UU);
   %}
   ins_pipe(pipe_class_memory);
 %}
 
-instruct string_indexof_con(iRegP_R1 str1, iRegI_R4 cnt1, iRegP_R3 str2,
+instruct string_indexofLL(iRegP_R1 str1, iRegI_R4 cnt1, iRegP_R3 str2, iRegI_R2 cnt2,
+       iRegI_R0 result, iRegI tmp1, iRegI tmp2, iRegI tmp3, iRegI tmp4, rFlagsReg cr)
+%{
+  predicate(((StrIndexOfNode*)n)->encoding() == StrIntrinsicNode::LL);
+  match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 cnt2)));
+  effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2,
+         TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, KILL cr);
+  format %{ "String IndexOf $str1,$cnt1,$str2,$cnt2 -> $result (LL)" %}
+
+  ins_encode %{
+    __ string_indexof($str1$$Register, $str2$$Register,
+                      $cnt1$$Register, $cnt2$$Register,
+                      $tmp1$$Register, $tmp2$$Register,
+                      $tmp3$$Register, $tmp4$$Register,
+                      -1, $result$$Register, StrIntrinsicNode::LL);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct string_indexofUL(iRegP_R1 str1, iRegI_R4 cnt1, iRegP_R3 str2, iRegI_R2 cnt2,
+       iRegI_R0 result, iRegI tmp1, iRegI tmp2, iRegI tmp3, iRegI tmp4, rFlagsReg cr)
+%{
+  predicate(((StrIndexOfNode*)n)->encoding() == StrIntrinsicNode::UL);
+  match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 cnt2)));
+  effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2,
+         TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, KILL cr);
+  format %{ "String IndexOf $str1,$cnt1,$str2,$cnt2 -> $result (UL)" %}
+
+  ins_encode %{
+    __ string_indexof($str1$$Register, $str2$$Register,
+                      $cnt1$$Register, $cnt2$$Register,
+                      $tmp1$$Register, $tmp2$$Register,
+                      $tmp3$$Register, $tmp4$$Register,
+                      -1, $result$$Register, StrIntrinsicNode::UL);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct string_indexofLU(iRegP_R1 str1, iRegI_R4 cnt1, iRegP_R3 str2, iRegI_R2 cnt2,
+       iRegI_R0 result, iRegI tmp1, iRegI tmp2, iRegI tmp3, iRegI tmp4, rFlagsReg cr)
+%{
+  predicate(((StrIndexOfNode*)n)->encoding() == StrIntrinsicNode::LU);
+  match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 cnt2)));
+  effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2,
+         TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, KILL cr);
+  format %{ "String IndexOf $str1,$cnt1,$str2,$cnt2 -> $result (LU)" %}
+
+  ins_encode %{
+    __ string_indexof($str1$$Register, $str2$$Register,
+                      $cnt1$$Register, $cnt2$$Register,
+                      $tmp1$$Register, $tmp2$$Register,
+                      $tmp3$$Register, $tmp4$$Register,
+                      -1, $result$$Register, StrIntrinsicNode::LU);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct string_indexof_conUU(iRegP_R1 str1, iRegI_R4 cnt1, iRegP_R3 str2,
                  immI_le_4 int_cnt2, iRegI_R0 result, iRegI tmp1, iRegI tmp2,
                  iRegI tmp3, iRegI tmp4, rFlagsReg cr)
 %{
@@ -14980,7 +15036,7 @@ instruct string_indexof_con(iRegP_R1 str1, iRegI_R4 cnt1, iRegP_R3 str2,
   match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 int_cnt2)));
   effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt1,
          TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, KILL cr);
-  format %{ "String IndexOf $str1,$cnt1,$str2,$int_cnt2 -> $result" %}
+  format %{ "String IndexOf $str1,$cnt1,$str2,$int_cnt2 -> $result (UU)" %}
 
   ins_encode %{
     int icnt2 = (int)$int_cnt2$$constant;
@@ -14988,7 +15044,70 @@ instruct string_indexof_con(iRegP_R1 str1, iRegI_R4 cnt1, iRegP_R3 str2,
                       $cnt1$$Register, zr,
                       $tmp1$$Register, $tmp2$$Register,
                       $tmp3$$Register, $tmp4$$Register,
-                      icnt2, $result$$Register);
+                      icnt2, $result$$Register, StrIntrinsicNode::UU);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct string_indexof_conLL(iRegP_R1 str1, iRegI_R4 cnt1, iRegP_R3 str2,
+                 immI_le_4 int_cnt2, iRegI_R0 result, iRegI tmp1, iRegI tmp2,
+                 iRegI tmp3, iRegI tmp4, rFlagsReg cr)
+%{
+  predicate(((StrIndexOfNode*)n)->encoding() == StrIntrinsicNode::LL);
+  match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 int_cnt2)));
+  effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt1,
+         TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, KILL cr);
+  format %{ "String IndexOf $str1,$cnt1,$str2,$int_cnt2 -> $result (LL)" %}
+
+  ins_encode %{
+    int icnt2 = (int)$int_cnt2$$constant;
+    __ string_indexof($str1$$Register, $str2$$Register,
+                      $cnt1$$Register, zr,
+                      $tmp1$$Register, $tmp2$$Register,
+                      $tmp3$$Register, $tmp4$$Register,
+                      icnt2, $result$$Register, StrIntrinsicNode::LL);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct string_indexof_conUL(iRegP_R1 str1, iRegI_R4 cnt1, iRegP_R3 str2,
+                 immI_1 int_cnt2, iRegI_R0 result, iRegI tmp1, iRegI tmp2,
+                 iRegI tmp3, iRegI tmp4, rFlagsReg cr)
+%{
+  predicate(((StrIndexOfNode*)n)->encoding() == StrIntrinsicNode::UL);
+  match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 int_cnt2)));
+  effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt1,
+         TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, KILL cr);
+  format %{ "String IndexOf $str1,$cnt1,$str2,$int_cnt2 -> $result (UL)" %}
+
+  ins_encode %{
+    int icnt2 = (int)$int_cnt2$$constant;
+    __ string_indexof($str1$$Register, $str2$$Register,
+                      $cnt1$$Register, zr,
+                      $tmp1$$Register, $tmp2$$Register,
+                      $tmp3$$Register, $tmp4$$Register,
+                      icnt2, $result$$Register, StrIntrinsicNode::UL);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct string_indexof_conLU(iRegP_R1 str1, iRegI_R4 cnt1, iRegP_R3 str2,
+                 immI_1 int_cnt2, iRegI_R0 result, iRegI tmp1, iRegI tmp2,
+                 iRegI tmp3, iRegI tmp4, rFlagsReg cr)
+%{
+  predicate(((StrIndexOfNode*)n)->encoding() == StrIntrinsicNode::LU);
+  match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 int_cnt2)));
+  effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt1,
+         TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, KILL cr);
+  format %{ "String IndexOf $str1,$cnt1,$str2,$int_cnt2 -> $result (LU)" %}
+
+  ins_encode %{
+    int icnt2 = (int)$int_cnt2$$constant;
+    __ string_indexof($str1$$Register, $str2$$Register,
+                      $cnt1$$Register, zr,
+                      $tmp1$$Register, $tmp2$$Register,
+                      $tmp3$$Register, $tmp4$$Register,
+                      icnt2, $result$$Register, StrIntrinsicNode::LU);
   %}
   ins_pipe(pipe_class_memory);
 %}
diff --git a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
index a271ba92ede..a07106048cd 100644
--- a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
+++ b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
@@ -4136,13 +4136,14 @@ void MacroAssembler::remove_frame(int framesize) {
   }
 }
 
+typedef void (MacroAssembler::* chr_insn)(Register Rt, const Address &adr);
 
 // Search for str1 in str2 and return index or -1
 void MacroAssembler::string_indexof(Register str2, Register str1,
                                     Register cnt2, Register cnt1,
                                     Register tmp1, Register tmp2,
                                     Register tmp3, Register tmp4,
-                                    int icnt1, Register result) {
+                                    int icnt1, Register result, int ae) {
   Label BM, LINEARSEARCH, DONE, NOMATCH, MATCH;
 
   Register ch1 = rscratch1;
@@ -4153,6 +4154,21 @@ void MacroAssembler::string_indexof(Register str2, Register str1,
   Register cnt2_neg = cnt2;
   Register result_tmp = tmp4;
 
+  bool isL = ae == StrIntrinsicNode::LL;
+
+  bool str1_isL = ae == StrIntrinsicNode::LL || ae == StrIntrinsicNode::UL;
+  bool str2_isL = ae == StrIntrinsicNode::LL || ae == StrIntrinsicNode::LU;
+  int str1_chr_shift = str1_isL ? 0:1;
+  int str2_chr_shift = str2_isL ? 0:1;
+  int str1_chr_size = str1_isL ? 1:2;
+  int str2_chr_size = str2_isL ? 1:2;
+  chr_insn str1_load_1chr = str1_isL ? (chr_insn)&MacroAssembler::ldrb :
+                                      (chr_insn)&MacroAssembler::ldrh;
+  chr_insn str2_load_1chr = str2_isL ? (chr_insn)&MacroAssembler::ldrb :
+                                      (chr_insn)&MacroAssembler::ldrh;
+  chr_insn load_2chr = isL ? (chr_insn)&MacroAssembler::ldrh : (chr_insn)&MacroAssembler::ldrw;
+  chr_insn load_4chr = isL ? (chr_insn)&MacroAssembler::ldrw : (chr_insn)&MacroAssembler::ldr;
+
   // Note, inline_string_indexOf() generates checks:
   // if (substr.count > string.count) return -1;
   // if (substr.count == 0) return 0;
@@ -4242,7 +4258,7 @@ void MacroAssembler::string_indexof(Register str2, Register str1,
       mov(cnt1tmp, 0);
       sub(cnt1end, cnt1, 1);
     BIND(BCLOOP);
-      ldrh(ch1, Address(str1, cnt1tmp, Address::lsl(1)));
+      (this->*str1_load_1chr)(ch1, Address(str1, cnt1tmp, Address::lsl(str1_chr_shift)));
       cmp(ch1, 128);
       add(cnt1tmp, cnt1tmp, 1);
       br(HS, BCSKIP);
@@ -4254,36 +4270,36 @@ void MacroAssembler::string_indexof(Register str2, Register str1,
       mov(result_tmp, str2);
 
       sub(cnt2, cnt2, cnt1);
-      add(str2end, str2, cnt2, LSL, 1);
+      add(str2end, str2, cnt2, LSL, str2_chr_shift);
     BIND(BMLOOPSTR2);
       sub(cnt1tmp, cnt1, 1);
-      ldrh(ch1, Address(str1, cnt1tmp, Address::lsl(1)));
-      ldrh(skipch, Address(str2, cnt1tmp, Address::lsl(1)));
+      (this->*str1_load_1chr)(ch1, Address(str1, cnt1tmp, Address::lsl(str1_chr_shift)));
+      (this->*str2_load_1chr)(skipch, Address(str2, cnt1tmp, Address::lsl(str2_chr_shift)));
       cmp(ch1, skipch);
       br(NE, BMSKIP);
       subs(cnt1tmp, cnt1tmp, 1);
       br(LT, BMMATCH);
     BIND(BMLOOPSTR1);
-      ldrh(ch1, Address(str1, cnt1tmp, Address::lsl(1)));
-      ldrh(ch2, Address(str2, cnt1tmp, Address::lsl(1)));
+      (this->*str1_load_1chr)(ch1, Address(str1, cnt1tmp, Address::lsl(str1_chr_shift)));
+      (this->*str2_load_1chr)(ch2, Address(str2, cnt1tmp, Address::lsl(str2_chr_shift)));
       cmp(ch1, ch2);
       br(NE, BMSKIP);
       subs(cnt1tmp, cnt1tmp, 1);
       br(GE, BMLOOPSTR1);
     BIND(BMMATCH);
-      sub(result_tmp, str2, result_tmp);
-      lsr(result, result_tmp, 1);
+      sub(result, str2, result_tmp);
+      if (!str2_isL) lsr(result, result, 1);
       add(sp, sp, 128);
       b(DONE);
     BIND(BMADV);
-      add(str2, str2, 2);
+      add(str2, str2, str2_chr_size);
       b(BMCHECKEND);
     BIND(BMSKIP);
       cmp(skipch, 128);
       br(HS, BMADV);
       ldrb(ch2, Address(sp, skipch));
-      add(str2, str2, cnt1, LSL, 1);
-      sub(str2, str2, ch2, LSL, 1);
+      add(str2, str2, cnt1, LSL, str2_chr_shift);
+      sub(str2, str2, ch2, LSL, str2_chr_shift);
     BIND(BMCHECKEND);
       cmp(str2, str2end);
       br(LE, BMLOOPSTR2);
@@ -4300,119 +4316,113 @@ void MacroAssembler::string_indexof(Register str2, Register str1,
 
     if (icnt1 == -1)
     {
-        Label DOSHORT, FIRST_LOOP, STR2_NEXT, STR1_LOOP, STR1_NEXT, LAST_WORD;
+        Label DOSHORT, FIRST_LOOP, STR2_NEXT, STR1_LOOP, STR1_NEXT;
 
-        cmp(cnt1, 4);
+        cmp(cnt1, str1_isL == str2_isL ? 4 : 2);
         br(LT, DOSHORT);
 
         sub(cnt2, cnt2, cnt1);
-        sub(cnt1, cnt1, 4);
         mov(result_tmp, cnt2);
 
-        lea(str1, Address(str1, cnt1, Address::uxtw(1)));
-        lea(str2, Address(str2, cnt2, Address::uxtw(1)));
-        sub(cnt1_neg, zr, cnt1, LSL, 1);
-        sub(cnt2_neg, zr, cnt2, LSL, 1);
-        ldr(first, Address(str1, cnt1_neg));
+        lea(str1, Address(str1, cnt1, Address::lsl(str1_chr_shift)));
+        lea(str2, Address(str2, cnt2, Address::lsl(str2_chr_shift)));
+        sub(cnt1_neg, zr, cnt1, LSL, str1_chr_shift);
+        sub(cnt2_neg, zr, cnt2, LSL, str2_chr_shift);
+        (this->*str1_load_1chr)(first, Address(str1, cnt1_neg));
 
       BIND(FIRST_LOOP);
-        ldr(ch2, Address(str2, cnt2_neg));
+        (this->*str2_load_1chr)(ch2, Address(str2, cnt2_neg));
         cmp(first, ch2);
         br(EQ, STR1_LOOP);
       BIND(STR2_NEXT);
-        adds(cnt2_neg, cnt2_neg, 2);
+        adds(cnt2_neg, cnt2_neg, str2_chr_size);
         br(LE, FIRST_LOOP);
         b(NOMATCH);
 
       BIND(STR1_LOOP);
-        adds(cnt1tmp, cnt1_neg, 8);
-        add(cnt2tmp, cnt2_neg, 8);
-        br(GE, LAST_WORD);
+        adds(cnt1tmp, cnt1_neg, str1_chr_size);
+        add(cnt2tmp, cnt2_neg, str2_chr_size);
+        br(GE, MATCH);
 
       BIND(STR1_NEXT);
-        ldr(ch1, Address(str1, cnt1tmp));
-        ldr(ch2, Address(str2, cnt2tmp));
+        (this->*str1_load_1chr)(ch1, Address(str1, cnt1tmp));
+        (this->*str2_load_1chr)(ch2, Address(str2, cnt2tmp));
         cmp(ch1, ch2);
         br(NE, STR2_NEXT);
-        adds(cnt1tmp, cnt1tmp, 8);
-        add(cnt2tmp, cnt2tmp, 8);
+        adds(cnt1tmp, cnt1tmp, str1_chr_size);
+        add(cnt2tmp, cnt2tmp, str2_chr_size);
         br(LT, STR1_NEXT);
-
-      BIND(LAST_WORD);
-        ldr(ch1, Address(str1));
-        sub(str2tmp, str2, cnt1_neg);         // adjust to corresponding
-        ldr(ch2, Address(str2tmp, cnt2_neg)); // word in str2
-        cmp(ch1, ch2);
-        br(NE, STR2_NEXT);
         b(MATCH);
 
       BIND(DOSHORT);
+      if (str1_isL == str2_isL) {
         cmp(cnt1, 2);
         br(LT, DO1);
         br(GT, DO3);
+      }
     }
 
     if (icnt1 == 4) {
       Label CH1_LOOP;
 
-        ldr(ch1, str1);
+        (this->*load_4chr)(ch1, str1);
         sub(cnt2, cnt2, 4);
         mov(result_tmp, cnt2);
-        lea(str2, Address(str2, cnt2, Address::uxtw(1)));
-        sub(cnt2_neg, zr, cnt2, LSL, 1);
+        lea(str2, Address(str2, cnt2, Address::lsl(str2_chr_shift)));
+        sub(cnt2_neg, zr, cnt2, LSL, str2_chr_shift);
 
       BIND(CH1_LOOP);
-        ldr(ch2, Address(str2, cnt2_neg));
+        (this->*load_4chr)(ch2, Address(str2, cnt2_neg));
         cmp(ch1, ch2);
         br(EQ, MATCH);
-        adds(cnt2_neg, cnt2_neg, 2);
+        adds(cnt2_neg, cnt2_neg, str2_chr_size);
         br(LE, CH1_LOOP);
         b(NOMATCH);
     }
 
-    if (icnt1 == -1 || icnt1 == 2) {
+    if ((icnt1 == -1 && str1_isL == str2_isL) || icnt1 == 2) {
       Label CH1_LOOP;
 
       BIND(DO2);
-        ldrw(ch1, str1);
+        (this->*load_2chr)(ch1, str1);
         sub(cnt2, cnt2, 2);
         mov(result_tmp, cnt2);
-        lea(str2, Address(str2, cnt2, Address::uxtw(1)));
-        sub(cnt2_neg, zr, cnt2, LSL, 1);
+        lea(str2, Address(str2, cnt2, Address::lsl(str2_chr_shift)));
+        sub(cnt2_neg, zr, cnt2, LSL, str2_chr_shift);
 
       BIND(CH1_LOOP);
-        ldrw(ch2, Address(str2, cnt2_neg));
+        (this->*load_2chr)(ch2, Address(str2, cnt2_neg));
         cmp(ch1, ch2);
         br(EQ, MATCH);
-        adds(cnt2_neg, cnt2_neg, 2);
+        adds(cnt2_neg, cnt2_neg, str2_chr_size);
         br(LE, CH1_LOOP);
         b(NOMATCH);
     }
 
-    if (icnt1 == -1 || icnt1 == 3) {
+    if ((icnt1 == -1 && str1_isL == str2_isL) || icnt1 == 3) {
       Label FIRST_LOOP, STR2_NEXT, STR1_LOOP;
 
       BIND(DO3);
-        ldrw(first, str1);
-        ldrh(ch1, Address(str1, 4));
+        (this->*load_2chr)(first, str1);
+        (this->*str1_load_1chr)(ch1, Address(str1, 2*str1_chr_size));
 
         sub(cnt2, cnt2, 3);
         mov(result_tmp, cnt2);
-        lea(str2, Address(str2, cnt2, Address::uxtw(1)));
-        sub(cnt2_neg, zr, cnt2, LSL, 1);
+        lea(str2, Address(str2, cnt2, Address::lsl(str2_chr_shift)));
+        sub(cnt2_neg, zr, cnt2, LSL, str2_chr_shift);
 
       BIND(FIRST_LOOP);
-        ldrw(ch2, Address(str2, cnt2_neg));
+        (this->*load_2chr)(ch2, Address(str2, cnt2_neg));
         cmpw(first, ch2);
         br(EQ, STR1_LOOP);
       BIND(STR2_NEXT);
-        adds(cnt2_neg, cnt2_neg, 2);
+        adds(cnt2_neg, cnt2_neg, str2_chr_size);
         br(LE, FIRST_LOOP);
         b(NOMATCH);
 
       BIND(STR1_LOOP);
-        add(cnt2tmp, cnt2_neg, 4);
-        ldrh(ch2, Address(str2, cnt2tmp));
+        add(cnt2tmp, cnt2_neg, 2*str2_chr_size);
+        (this->*str2_load_1chr)(ch2, Address(str2, cnt2tmp));
         cmp(ch1, ch2);
         br(NE, STR2_NEXT);
         b(MATCH);
@@ -4423,24 +4433,31 @@ void MacroAssembler::string_indexof(Register str2, Register str1,
       Label DO1_SHORT, DO1_LOOP;
 
       BIND(DO1);
-        ldrh(ch1, str1);
-        cmp(cnt2, 4);
+        (this->*str1_load_1chr)(ch1, str1);
+        cmp(cnt2, 8);
         br(LT, DO1_SHORT);
 
+        if (str2_isL) {
+          if (!str1_isL) {
+            tst(ch1, 0xff00);
+            br(NE, NOMATCH);
+          }
+          orr(ch1, ch1, ch1, LSL, 8);
+        }
         orr(ch1, ch1, ch1, LSL, 16);
         orr(ch1, ch1, ch1, LSL, 32);
 
-        sub(cnt2, cnt2, 4);
+        sub(cnt2, cnt2, 8/str2_chr_size);
         mov(result_tmp, cnt2);
-        lea(str2, Address(str2, cnt2, Address::uxtw(1)));
-        sub(cnt2_neg, zr, cnt2, LSL, 1);
+        lea(str2, Address(str2, cnt2, Address::lsl(str2_chr_shift)));
+        sub(cnt2_neg, zr, cnt2, LSL, str2_chr_shift);
 
-        mov(tmp3, 0x0001000100010001);
+        mov(tmp3, str2_isL ? 0x0101010101010101 : 0x0001000100010001);
       BIND(CH1_LOOP);
         ldr(ch2, Address(str2, cnt2_neg));
         eor(ch2, ch1, ch2);
         sub(tmp1, ch2, tmp3);
-        orr(tmp2, ch2, 0x7fff7fff7fff7fff);
+        orr(tmp2, ch2, str2_isL ? 0x7f7f7f7f7f7f7f7f : 0x7fff7fff7fff7fff);
         bics(tmp1, tmp1, tmp2);
         br(NE, HAS_ZERO);
         adds(cnt2_neg, cnt2_neg, 8);
@@ -4459,13 +4476,13 @@ void MacroAssembler::string_indexof(Register str2, Register str1,
 
       BIND(DO1_SHORT);
         mov(result_tmp, cnt2);
-        lea(str2, Address(str2, cnt2, Address::uxtw(1)));
-        sub(cnt2_neg, zr, cnt2, LSL, 1);
+        lea(str2, Address(str2, cnt2, Address::lsl(str2_chr_shift)));
+        sub(cnt2_neg, zr, cnt2, LSL, str2_chr_shift);
       BIND(DO1_LOOP);
-        ldrh(ch2, Address(str2, cnt2_neg));
+        (this->*str2_load_1chr)(ch2, Address(str2, cnt2_neg));
         cmpw(ch1, ch2);
         br(EQ, MATCH);
-        adds(cnt2_neg, cnt2_neg, 2);
+        adds(cnt2_neg, cnt2_neg, str2_chr_size);
         br(LT, DO1_LOOP);
     }
   }
@@ -4473,7 +4490,7 @@ void MacroAssembler::string_indexof(Register str2, Register str1,
     mov(result, -1);
     b(DONE);
   BIND(MATCH);
-    add(result, result_tmp, cnt2_neg, ASR, 1);
+    add(result, result_tmp, cnt2_neg, ASR, str2_chr_shift);
   BIND(DONE);
 }
 
diff --git a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.hpp b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.hpp
index 0db161d5303..5aed95b772f 100644
--- a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.hpp
+++ b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.hpp
@@ -1217,7 +1217,7 @@ public:
                       Register cnt1, Register cnt2,
                       Register tmp1, Register tmp2,
                       Register tmp3, Register tmp4,
-                      int int_cnt1, Register result);
+                      int int_cnt1, Register result, int ae);
 private:
   void add2_with_carry(Register final_dest_hi, Register dest_hi, Register dest_lo,
                        Register src1, Register src2);

From 75909b48f34226e785cdc923e922d21e0d50a348 Mon Sep 17 00:00:00 2001
From: Ed Nevill <enevill@openjdk.org>
Date: Wed, 25 May 2016 13:30:07 +0000
Subject: [PATCH 108/228] 8157841: aarch64: prefetch ignores cache line size

Fix prefetch to take account of cache line size

Co-authored-by: Stuart Monteith <stuart.monteith@linaro.org>
Reviewed-by: aph
---
 hotspot/src/cpu/aarch64/vm/aarch64.ad         |  9 +++++---
 .../cpu/aarch64/vm/macroAssembler_aarch64.cpp | 18 ++++++++++-----
 .../cpu/aarch64/vm/macroAssembler_aarch64.hpp |  9 ++++++++
 .../src/cpu/aarch64/vm/vm_version_aarch64.cpp | 22 +++++++++++++------
 .../src/cpu/aarch64/vm/vm_version_aarch64.hpp |  9 ++++++++
 5 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/hotspot/src/cpu/aarch64/vm/aarch64.ad b/hotspot/src/cpu/aarch64/vm/aarch64.ad
index c2f2d7767d5..6db1772b432 100644
--- a/hotspot/src/cpu/aarch64/vm/aarch64.ad
+++ b/hotspot/src/cpu/aarch64/vm/aarch64.ad
@@ -4743,7 +4743,8 @@ encode %{
       __ br(Assembler::EQ, cont);
     } else {
       Label retry_load;
-      __ prfm(Address(oop), PSTL1STRM);
+      if ((VM_Version::features() & VM_Version::CPU_STXR_PREFETCH))
+        __ prfm(Address(oop), PSTL1STRM);
       __ bind(retry_load);
       __ ldaxr(tmp, oop);
       __ cmp(tmp, disp_hdr);
@@ -4798,7 +4799,8 @@ encode %{
         __ cmp(rscratch1, disp_hdr);
       } else {
         Label retry_load, fail;
-        __ prfm(Address(tmp), PSTL1STRM);
+        if ((VM_Version::features() & VM_Version::CPU_STXR_PREFETCH))
+          __ prfm(Address(tmp), PSTL1STRM);
         __ bind(retry_load);
         __ ldaxr(rscratch1, tmp);
         __ cmp(disp_hdr, rscratch1);
@@ -4892,7 +4894,8 @@ encode %{
         __ cmp(tmp, box);
       } else {
         Label retry_load;
-        __ prfm(Address(oop), PSTL1STRM);
+        if ((VM_Version::features() & VM_Version::CPU_STXR_PREFETCH))
+          __ prfm(Address(oop), PSTL1STRM);
         __ bind(retry_load);
         __ ldxr(tmp, oop);
         __ cmp(box, tmp);
diff --git a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
index a07106048cd..f8e4c851600 100644
--- a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
+++ b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
@@ -1643,7 +1643,8 @@ void MacroAssembler::atomic_incw(Register counter_addr, Register tmp, Register t
     return;
   }
   Label retry_load;
-  prfm(Address(counter_addr), PSTL1STRM);
+  if ((VM_Version::features() & VM_Version::CPU_STXR_PREFETCH))
+    prfm(Address(counter_addr), PSTL1STRM);
   bind(retry_load);
   // flush and load exclusive from the memory location
   ldxrw(tmp, counter_addr);
@@ -2084,7 +2085,8 @@ void MacroAssembler::cmpxchgptr(Register oldv, Register newv, Register addr, Reg
     membar(AnyAny);
   } else {
     Label retry_load, nope;
-    prfm(Address(addr), PSTL1STRM);
+    if ((VM_Version::features() & VM_Version::CPU_STXR_PREFETCH))
+      prfm(Address(addr), PSTL1STRM);
     bind(retry_load);
     // flush and load exclusive from the memory location
     // and fail if it is not what we expect
@@ -2120,7 +2122,8 @@ void MacroAssembler::cmpxchgw(Register oldv, Register newv, Register addr, Regis
     membar(AnyAny);
   } else {
     Label retry_load, nope;
-    prfm(Address(addr), PSTL1STRM);
+    if ((VM_Version::features() & VM_Version::CPU_STXR_PREFETCH))
+      prfm(Address(addr), PSTL1STRM);
     bind(retry_load);
     // flush and load exclusive from the memory location
     // and fail if it is not what we expect
@@ -2155,7 +2158,8 @@ void MacroAssembler::cmpxchg(Register addr, Register expected,
   } else {
     BLOCK_COMMENT("cmpxchg {");
     Label retry_load, done;
-    prfm(Address(addr), PSTL1STRM);
+    if ((VM_Version::features() & VM_Version::CPU_STXR_PREFETCH))
+      prfm(Address(addr), PSTL1STRM);
     bind(retry_load);
     load_exclusive(tmp, addr, size, acquire);
     if (size == xword)
@@ -2194,7 +2198,8 @@ void MacroAssembler::atomic_##NAME(Register prev, RegisterOrConstant incr, Regis
     result = different(prev, incr, addr) ? prev : rscratch2;            \
                                                                         \
   Label retry_load;                                                     \
-  prfm(Address(addr), PSTL1STRM);                                       \
+  if ((VM_Version::features() & VM_Version::CPU_STXR_PREFETCH))         \
+    prfm(Address(addr), PSTL1STRM);                                     \
   bind(retry_load);                                                     \
   LDXR(result, addr);                                                   \
   OP(rscratch1, result, incr);                                          \
@@ -2224,7 +2229,8 @@ void MacroAssembler::atomic_##OP(Register prev, Register newv, Register addr) {
     result = different(prev, newv, addr) ? prev : rscratch2;            \
                                                                         \
   Label retry_load;                                                     \
-  prfm(Address(addr), PSTL1STRM);                                       \
+  if ((VM_Version::features() & VM_Version::CPU_STXR_PREFETCH))         \
+    prfm(Address(addr), PSTL1STRM);                                     \
   bind(retry_load);                                                     \
   LDXR(result, addr);                                                   \
   STXR(rscratch1, newv, addr);                                          \
diff --git a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.hpp b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.hpp
index 5aed95b772f..2a9d0a90251 100644
--- a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.hpp
+++ b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.hpp
@@ -545,6 +545,15 @@ public:
     mrs(0b011, 0b0000, 0b0000, 0b111, reg);
   }
 
+  // CTR_EL0:   op1 == 011
+  //            CRn == 0000
+  //            CRm == 0000
+  //            op2 == 001
+  inline void get_ctr_el0(Register reg)
+  {
+    mrs(0b011, 0b0000, 0b0000, 0b001, reg);
+  }
+
   // idiv variant which deals with MINLONG as dividend and -1 as divisor
   int corrected_idivl(Register result, Register ra, Register rb,
                       bool want_remainder, Register tmp = rscratch1);
diff --git a/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp
index bf96f24d621..070fcbd219c 100644
--- a/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp
+++ b/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp
@@ -105,6 +105,9 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
     __ get_dczid_el0(rscratch1);
     __ strw(rscratch1, Address(c_rarg0, in_bytes(VM_Version::dczid_el0_offset())));
 
+    __ get_ctr_el0(rscratch1);
+    __ strw(rscratch1, Address(c_rarg0, in_bytes(VM_Version::ctr_el0_offset())));
+
     __ leave();
     __ ret(lr);
 
@@ -124,16 +127,20 @@ void VM_Version::get_processor_features() {
 
   getPsrInfo_stub(&_psr_info);
 
+  int dcache_line = VM_Version::dcache_line_size();
+
   if (FLAG_IS_DEFAULT(AllocatePrefetchDistance))
-    FLAG_SET_DEFAULT(AllocatePrefetchDistance, 256);
+    FLAG_SET_DEFAULT(AllocatePrefetchDistance, 3*dcache_line);
   if (FLAG_IS_DEFAULT(AllocatePrefetchStepSize))
-    FLAG_SET_DEFAULT(AllocatePrefetchStepSize, 64);
-  FLAG_SET_DEFAULT(PrefetchScanIntervalInBytes, 256);
-  FLAG_SET_DEFAULT(PrefetchFieldsAhead, 256);
+    FLAG_SET_DEFAULT(AllocatePrefetchStepSize, dcache_line);
+  if (FLAG_IS_DEFAULT(PrefetchScanIntervalInBytes))
+    FLAG_SET_DEFAULT(PrefetchScanIntervalInBytes, 3*dcache_line);
   if (FLAG_IS_DEFAULT(PrefetchCopyIntervalInBytes))
-    FLAG_SET_DEFAULT(PrefetchCopyIntervalInBytes, 256);
-  if ((PrefetchCopyIntervalInBytes & 7) || (PrefetchCopyIntervalInBytes >= 32768)) {
-    warning("PrefetchCopyIntervalInBytes must be a multiple of 8 and < 32768");
+    FLAG_SET_DEFAULT(PrefetchCopyIntervalInBytes, 3*dcache_line);
+
+  if (PrefetchCopyIntervalInBytes != -1 &&
+       ((PrefetchCopyIntervalInBytes & 7) || (PrefetchCopyIntervalInBytes >= 32768))) {
+    warning("PrefetchCopyIntervalInBytes must be -1, or a multiple of 8 and < 32768");
     PrefetchCopyIntervalInBytes &= ~7;
     if (PrefetchCopyIntervalInBytes >= 32768)
       PrefetchCopyIntervalInBytes = 32760;
@@ -170,6 +177,7 @@ void VM_Version::get_processor_features() {
   // Enable vendor specific features
   if (_cpu == CPU_CAVIUM && _variant == 0) _features |= CPU_DMB_ATOMICS;
   if (_cpu == CPU_ARM && (_model == 0xd03 || _model2 == 0xd03)) _features |= CPU_A53MAC;
+  if (_cpu == CPU_ARM && (_model == 0xd07 || _model2 == 0xd07)) _features |= CPU_STXR_PREFETCH;
   // If an olde style /proc/cpuinfo (cpu_lines == 1) then if _model is an A57 (0xd07)
   // we assume the worst and assume we could be on a big little system and have
   // undisclosed A53 cores which we could be swapped to at any stage
diff --git a/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.hpp b/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.hpp
index 25f5b929b3b..bab62cd4f86 100644
--- a/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.hpp
+++ b/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.hpp
@@ -42,6 +42,7 @@ protected:
 
   struct PsrInfo {
     uint32_t dczid_el0;
+    uint32_t ctr_el0;
   };
   static PsrInfo _psr_info;
   static void get_processor_features();
@@ -78,6 +79,7 @@ public:
     CPU_SHA2         = (1<<6),
     CPU_CRC32        = (1<<7),
     CPU_LSE          = (1<<8),
+    CPU_STXR_PREFETCH= (1 << 29),
     CPU_A53MAC       = (1 << 30),
     CPU_DMB_ATOMICS  = (1 << 31),
   };
@@ -88,6 +90,7 @@ public:
   static int cpu_variant()                    { return _variant; }
   static int cpu_revision()                   { return _revision; }
   static ByteSize dczid_el0_offset() { return byte_offset_of(PsrInfo, dczid_el0); }
+  static ByteSize ctr_el0_offset()   { return byte_offset_of(PsrInfo, ctr_el0); }
   static bool is_zva_enabled() {
     // Check the DZP bit (bit 4) of dczid_el0 is zero
     // and block size (bit 0~3) is not zero.
@@ -98,6 +101,12 @@ public:
     assert(is_zva_enabled(), "ZVA not available");
     return 4 << (_psr_info.dczid_el0 & 0xf);
   }
+  static int icache_line_size() {
+    return (1 << (_psr_info.ctr_el0 & 0x0f)) * 4;
+  }
+  static int dcache_line_size() {
+    return (1 << ((_psr_info.ctr_el0 >> 16) & 0x0f)) * 4;
+  }
 };
 
 #endif // CPU_AARCH64_VM_VM_VERSION_AARCH64_HPP

From 83dbb0fabaf4641fcde3788b8d147c3a1648bb82 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Wed, 25 May 2016 13:46:05 -0400
Subject: [PATCH 109/228] 8156548: gc/gctests/StringInternSyncWithGC2 fails
 with Test level exit status: 151

Avoid repeated verification.

Reviewed-by: jmasa, drwhite
---
 .../gc/cms/concurrentMarkSweepGeneration.cpp  | 30 +++++++++++--------
 .../gc/cms/concurrentMarkSweepGeneration.hpp  |  8 +++--
 hotspot/src/share/vm/opto/macroArrayCopy.cpp  |  3 +-
 hotspot/src/share/vm/prims/jni.cpp            |  2 --
 hotspot/src/share/vm/utilities/macros.hpp     |  3 ++
 5 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp b/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp
index d5553e032df..bf11ad86915 100644
--- a/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp
+++ b/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp
@@ -6096,19 +6096,23 @@ size_t ScanMarkedObjectsAgainCarefullyClosure::do_object_careful_m(
           size = CompactibleFreeListSpace::adjustObjectSize(
                    p->oop_iterate_size(_scanningClosure));
         }
-        #ifdef ASSERT
-          size_t direct_size =
-            CompactibleFreeListSpace::adjustObjectSize(p->size());
-          assert(size == direct_size, "Inconsistency in size");
-          assert(size >= 3, "Necessary for Printezis marks to work");
-          if (!_bitMap->isMarked(addr+1)) {
-            _bitMap->verifyNoOneBitsInRange(addr+2, addr+size);
-          } else {
-            _bitMap->verifyNoOneBitsInRange(addr+2, addr+size-1);
-            assert(_bitMap->isMarked(addr+size-1),
-                   "inconsistent Printezis mark");
-          }
-        #endif // ASSERT
+      #ifdef ASSERT
+        size_t direct_size =
+          CompactibleFreeListSpace::adjustObjectSize(p->size());
+        assert(size == direct_size, "Inconsistency in size");
+        assert(size >= 3, "Necessary for Printezis marks to work");
+        HeapWord* start_pbit = addr + 1;
+        HeapWord* end_pbit = addr + size - 1;
+        assert(_bitMap->isMarked(start_pbit) == _bitMap->isMarked(end_pbit),
+               "inconsistent Printezis mark");
+        // Verify inner mark bits (between Printezis bits) are clear,
+        // but don't repeat if there are multiple dirty regions for
+        // the same object, to avoid potential O(N^2) performance.
+        if (addr != _last_scanned_object) {
+          _bitMap->verifyNoOneBitsInRange(start_pbit + 1, end_pbit);
+          _last_scanned_object = addr;
+        }
+      #endif // ASSERT
     } else {
       // An uninitialized object.
       assert(_bitMap->isMarked(addr+1), "missing Printezis mark?");
diff --git a/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.hpp b/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.hpp
index cedd3e431d4..414aaa7a9c9 100644
--- a/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.hpp
+++ b/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2016, 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
@@ -1501,6 +1501,7 @@ class ScanMarkedObjectsAgainCarefullyClosure: public ObjectClosureCareful {
   CMSBitMap*                     _bitMap;
   CMSMarkStack*                  _markStack;
   MarkRefsIntoAndScanClosure*    _scanningClosure;
+  DEBUG_ONLY(HeapWord*           _last_scanned_object;)
 
  public:
   ScanMarkedObjectsAgainCarefullyClosure(CMSCollector* collector,
@@ -1514,8 +1515,9 @@ class ScanMarkedObjectsAgainCarefullyClosure: public ObjectClosureCareful {
     _yield(should_yield),
     _bitMap(bitMap),
     _markStack(markStack),
-    _scanningClosure(cl) {
-  }
+    _scanningClosure(cl)
+    DEBUG_ONLY(COMMA _last_scanned_object(NULL))
+  { }
 
   void do_object(oop p) {
     guarantee(false, "call do_object_careful instead");
diff --git a/hotspot/src/share/vm/opto/macroArrayCopy.cpp b/hotspot/src/share/vm/opto/macroArrayCopy.cpp
index 3ed742e3bba..07b298ddbe7 100644
--- a/hotspot/src/share/vm/opto/macroArrayCopy.cpp
+++ b/hotspot/src/share/vm/opto/macroArrayCopy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
@@ -235,7 +235,6 @@ address PhaseMacroExpand::basictype2arraycopy(BasicType t,
   return StubRoutines::select_arraycopy_function(t, aligned, disjoint, name, dest_uninitialized);
 }
 
-#define COMMA ,
 #define XTOP LP64_ONLY(COMMA top())
 
 // Generate an optimized call to arraycopy.
diff --git a/hotspot/src/share/vm/prims/jni.cpp b/hotspot/src/share/vm/prims/jni.cpp
index 438efc02e7b..878bd6623a5 100644
--- a/hotspot/src/share/vm/prims/jni.cpp
+++ b/hotspot/src/share/vm/prims/jni.cpp
@@ -163,8 +163,6 @@ extern LONG WINAPI topLevelExceptionFilter(_EXCEPTION_POINTERS* );
 #define FP_SELECT(TypeName, intcode, fpcode) \
   FP_SELECT_##TypeName(intcode, fpcode)
 
-#define COMMA ,
-
 // Choose DT_RETURN_MARK macros  based on the type: float/double -> void
 // (dtrace doesn't do FP yet)
 #define DT_RETURN_MARK_DECL_FOR(TypeName, name, type, probe)    \
diff --git a/hotspot/src/share/vm/utilities/macros.hpp b/hotspot/src/share/vm/utilities/macros.hpp
index 40e92c7a64a..62b117e944d 100644
--- a/hotspot/src/share/vm/utilities/macros.hpp
+++ b/hotspot/src/share/vm/utilities/macros.hpp
@@ -34,6 +34,9 @@
 // Makes a string of the macro expansion of a
 #define XSTR(a) STR(a)
 
+// Allow commas in macro arguments.
+#define COMMA ,
+
 // Apply pre-processor token pasting to the expansions of x and y.
 // The token pasting operator (##) prevents its arguments from being
 // expanded.  This macro allows expansion of its arguments before the

From 15def391b5d5d3e3791c0e5e8e53beb803471820 Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Wed, 25 May 2016 16:23:15 -0400
Subject: [PATCH 110/228] 8157175: GetNanoTimeAdjustment.java fails with
 excessive adjustment error

Reviewed-by: dcubed, gziemski
---
 hotspot/src/os/solaris/vm/os_solaris.cpp | 26 +++++++-----------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/hotspot/src/os/solaris/vm/os_solaris.cpp b/hotspot/src/os/solaris/vm/os_solaris.cpp
index 8dc9f845655..169937db642 100644
--- a/hotspot/src/os/solaris/vm/os_solaris.cpp
+++ b/hotspot/src/os/solaris/vm/os_solaris.cpp
@@ -1355,29 +1355,20 @@ double os::elapsedVTime() {
   return (double)gethrvtime() / (double)hrtime_hz;
 }
 
-// in-memory timestamp support - has update accuracy of 1ms
-typedef void (*_get_nsec_fromepoch_func_t)(hrtime_t*);
-static _get_nsec_fromepoch_func_t _get_nsec_fromepoch = NULL;
-
 // Must return millis since Jan 1 1970 for JVM_CurrentTimeMillis
 jlong os::javaTimeMillis() {
-  if (_get_nsec_fromepoch != NULL) {
-    hrtime_t now;
-    _get_nsec_fromepoch(&now);
-    return now / NANOSECS_PER_MILLISEC;
-  }
-  else {
-    timeval t;
-    if (gettimeofday(&t, NULL) == -1) {
-      fatal("os::javaTimeMillis: gettimeofday (%s)", os::strerror(errno));
-    }
-    return jlong(t.tv_sec) * 1000  +  jlong(t.tv_usec) / 1000;
+  timeval t;
+  if (gettimeofday(&t, NULL) == -1) {
+    fatal("os::javaTimeMillis: gettimeofday (%s)", os::strerror(errno));
   }
+  return jlong(t.tv_sec) * 1000  +  jlong(t.tv_usec) / 1000;
 }
 
+// Must return seconds+nanos since Jan 1 1970. This must use the same
+// time source as javaTimeMillis and can't use get_nsec_fromepoch as
+// we need better than 1ms accuracy
 void os::javaTimeSystemUTC(jlong &seconds, jlong &nanos) {
   timeval t;
-  // can't use get_nsec_fromepoch here as we need better accuracy than 1ms
   if (gettimeofday(&t, NULL) == -1) {
     fatal("os::javaTimeSystemUTC: gettimeofday (%s)", os::strerror(errno));
   }
@@ -4447,9 +4438,6 @@ void os::init(void) {
   if (handle != NULL) {
     Solaris::_pthread_setname_np =  // from 11.3
         (Solaris::pthread_setname_np_func_t)dlsym(handle, "pthread_setname_np");
-
-    _get_nsec_fromepoch =           // from 11.3.6
-        (_get_nsec_fromepoch_func_t) dlsym(handle, "get_nsec_fromepoch");
   }
 }
 

From 24805477dffde243a287eb2b5af9c22129c49d61 Mon Sep 17 00:00:00 2001
From: Nils Eliasson <neliasso@openjdk.org>
Date: Thu, 26 May 2016 14:17:49 +0200
Subject: [PATCH 111/228] 8157717: MultiCommand breaks directives amount limit

Increase directives amount for these tests

Reviewed-by: kvn, ppunegov
---
 hotspot/test/compiler/compilercontrol/share/MultiCommand.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hotspot/test/compiler/compilercontrol/share/MultiCommand.java b/hotspot/test/compiler/compilercontrol/share/MultiCommand.java
index f85591da663..c5bfa5347f6 100644
--- a/hotspot/test/compiler/compilercontrol/share/MultiCommand.java
+++ b/hotspot/test/compiler/compilercontrol/share/MultiCommand.java
@@ -73,6 +73,7 @@ public class MultiCommand extends AbstractTestBase {
     public void test() {
         Scenario.Builder builder = Scenario.getBuilder();
         builder.addFlag("-Xmixed");
+        builder.addFlag("-XX:CompilerDirectivesLimit=101");
         for (CompileCommand cc : testCases) {
             cc.print();
             builder.add(cc);

From d5b029d48d85fe3e5dc5be67f147ca0faf44ffdc Mon Sep 17 00:00:00 2001
From: Nils Eliasson <neliasso@openjdk.org>
Date: Thu, 26 May 2016 14:17:50 +0200
Subject: [PATCH 112/228] 8153352: Crash with assert(pd != 0L) failed: PcDesc
 must not be NULL

Simplify look_for_reserved_stack_annotated_method

Reviewed-by: kvn
---
 .../src/share/vm/runtime/sharedRuntime.cpp    | 49 ++++++-------------
 1 file changed, 15 insertions(+), 34 deletions(-)

diff --git a/hotspot/src/share/vm/runtime/sharedRuntime.cpp b/hotspot/src/share/vm/runtime/sharedRuntime.cpp
index eba1d72ff3a..11e7f834dba 100644
--- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp
+++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp
@@ -3084,49 +3084,25 @@ JRT_END
 
 frame SharedRuntime::look_for_reserved_stack_annotated_method(JavaThread* thread, frame fr) {
   frame activation;
-  int decode_offset = 0;
-  nmethod* nm = NULL;
-  frame prv_fr = fr;
+  CompiledMethod* nm = NULL;
   int count = 1;
 
   assert(fr.is_java_frame(), "Must start on Java frame");
 
-  while (!fr.is_first_frame()) {
+  while (true) {
     Method* method = NULL;
-    // Compiled java method case.
-    if (decode_offset != 0) {
-      DebugInfoReadStream stream(nm, decode_offset);
-      decode_offset = stream.read_int();
-      method = (Method*)nm->metadata_at(stream.read_int());
+    if (fr.is_interpreted_frame()) {
+      method = fr.interpreter_frame_method();
     } else {
-      if (fr.is_first_java_frame()) break;
-      address pc = fr.pc();
-      prv_fr = fr;
-      if (fr.is_interpreted_frame()) {
-        method = fr.interpreter_frame_method();
-        fr = fr.java_sender();
-      } else {
-        CodeBlob* cb = fr.cb();
-        fr = fr.java_sender();
-        if (cb == NULL || !cb->is_nmethod()) {
-          continue;
-        }
-        nm = (nmethod*)cb;
-        if (nm->method()->is_native()) {
-          method = nm->method();
-        } else {
-          PcDesc* pd = nm->pc_desc_at(pc);
-          assert(pd != NULL, "PcDesc must not be NULL");
-          decode_offset = pd->scope_decode_offset();
-          // if decode_offset is not equal to 0, it will execute the
-          // "compiled java method case" at the beginning of the loop.
-          continue;
-        }
+      CodeBlob* cb = fr.cb();
+      if (cb != NULL && cb->is_compiled()) {
+        nm = cb->as_compiled_method();
+        method = nm->method();
       }
     }
-    if (method->has_reserved_stack_access()) {
+    if ((method != NULL) && method->has_reserved_stack_access()) {
       ResourceMark rm(thread);
-      activation = prv_fr;
+      activation = fr;
       warning("Potentially dangerous stack overflow in "
               "ReservedStackAccess annotated method %s [%d]",
               method->name_and_sig_as_C_string(), count++);
@@ -3136,6 +3112,11 @@ frame SharedRuntime::look_for_reserved_stack_annotated_method(JavaThread* thread
         event.commit();
       }
     }
+    if (fr.is_first_java_frame()) {
+      break;
+    } else {
+      fr = fr.java_sender();
+    }
   }
   return activation;
 }

From 6253b1d25113a7f66c4f71785a350bbe75e993b7 Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Thu, 26 May 2016 20:43:13 -0400
Subject: [PATCH 113/228] 8154589: assert(k != NULL) failed: preloaded klass
 not initialized

Reviewed-by: sspitsyn, hseigel
---
 .../share/vm/classfile/systemDictionary.hpp   |  4 +--
 .../src/share/vm/runtime/vm_operations.cpp    | 30 +++++++++++--------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/hotspot/src/share/vm/classfile/systemDictionary.hpp b/hotspot/src/share/vm/classfile/systemDictionary.hpp
index ca637011c4d..3626d881736 100644
--- a/hotspot/src/share/vm/classfile/systemDictionary.hpp
+++ b/hotspot/src/share/vm/classfile/systemDictionary.hpp
@@ -420,9 +420,9 @@ public:
   // Initialization
   static void initialize(TRAPS);
 
-  // Fast access to commonly used classes (preloaded)
+  // Checked fast access to commonly used classes - mostly preloaded
   static InstanceKlass* check_klass(InstanceKlass* k) {
-    assert(k != NULL, "preloaded klass not initialized");
+    assert(k != NULL, "klass not loaded");
     return k;
   }
 
diff --git a/hotspot/src/share/vm/runtime/vm_operations.cpp b/hotspot/src/share/vm/runtime/vm_operations.cpp
index 3ac2816775a..26a8cbe647b 100644
--- a/hotspot/src/share/vm/runtime/vm_operations.cpp
+++ b/hotspot/src/share/vm/runtime/vm_operations.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -201,10 +201,12 @@ void VM_Verify::doit() {
 }
 
 bool VM_PrintThreads::doit_prologue() {
-  assert(Thread::current()->is_Java_thread(), "just checking");
-
   // Make sure AbstractOwnableSynchronizer is loaded
-  java_util_concurrent_locks_AbstractOwnableSynchronizer::initialize(JavaThread::current());
+  JavaThread* jt = JavaThread::current();
+  java_util_concurrent_locks_AbstractOwnableSynchronizer::initialize(jt);
+  if (jt->has_pending_exception()) {
+    return false;
+  }
 
   // Get Heap_lock if concurrent locks will be dumped
   if (_print_concurrent_locks) {
@@ -240,11 +242,13 @@ VM_FindDeadlocks::~VM_FindDeadlocks() {
 }
 
 bool VM_FindDeadlocks::doit_prologue() {
-  assert(Thread::current()->is_Java_thread(), "just checking");
-
-  // Load AbstractOwnableSynchronizer class
   if (_concurrent_locks) {
-    java_util_concurrent_locks_AbstractOwnableSynchronizer::initialize(JavaThread::current());
+    // Make sure AbstractOwnableSynchronizer is loaded
+    JavaThread* jt = JavaThread::current();
+    java_util_concurrent_locks_AbstractOwnableSynchronizer::initialize(jt);
+    if (jt->has_pending_exception()) {
+      return false;
+    }
   }
 
   return true;
@@ -298,10 +302,12 @@ VM_ThreadDump::VM_ThreadDump(ThreadDumpResult* result,
 }
 
 bool VM_ThreadDump::doit_prologue() {
-  assert(Thread::current()->is_Java_thread(), "just checking");
-
-  // Load AbstractOwnableSynchronizer class before taking thread snapshots
-  java_util_concurrent_locks_AbstractOwnableSynchronizer::initialize(JavaThread::current());
+  // Make sure AbstractOwnableSynchronizer is loaded
+  JavaThread* jt = JavaThread::current();
+  java_util_concurrent_locks_AbstractOwnableSynchronizer::initialize(jt);
+  if (jt->has_pending_exception()) {
+    return false;
+  }
 
   if (_with_locked_synchronizers) {
     // Acquire Heap_lock to dump concurrent locks

From 84d9673da4ac6b0259069d325680db91bef3833c Mon Sep 17 00:00:00 2001
From: Stefan Johansson <sjohanss@openjdk.org>
Date: Fri, 27 May 2016 12:57:38 +0200
Subject: [PATCH 114/228] 8157153: TestStressRSetCoarsening fails with OOM

Reviewed-by: mgerdin, dfazunen
---
 .../gc/stress/TestStressRSetCoarsening.java   | 59 ++++++++++++++++---
 1 file changed, 51 insertions(+), 8 deletions(-)

diff --git a/hotspot/test/gc/stress/TestStressRSetCoarsening.java b/hotspot/test/gc/stress/TestStressRSetCoarsening.java
index 7ab74a4d2d1..554531b8ae4 100644
--- a/hotspot/test/gc/stress/TestStressRSetCoarsening.java
+++ b/hotspot/test/gc/stress/TestStressRSetCoarsening.java
@@ -102,7 +102,7 @@ public class TestStressRSetCoarsening {
 
     private static final WhiteBox WB = WhiteBox.getWhiteBox();
 
-    public final Object[][] storage;
+    public final ObjStorage storage;
 
     /**
      * Number of objects per region. This is a test parameter.
@@ -161,6 +161,8 @@ public class TestStressRSetCoarsening {
         long totalFree = rt.maxMemory() - used;
         regionCount = (int) ((totalFree / regionSize) * heapFractionToAllocate);
         long toAllocate = regionCount * regionSize;
+        long freeMemoryLimit = totalFree - toAllocate;
+
         System.out.println("%% Test parameters");
         System.out.println("%%   Objects per region              : " + K);
         System.out.println("%%   Heap fraction to allocate       : " + (int) (heapFractionToAllocate * 100) + "%");
@@ -212,9 +214,15 @@ public class TestStressRSetCoarsening {
                 "  (sizeOf(new Object[" + N + "])");
         System.out.println("%%   Reference size        : " + refSize);
 
-        storage = new Object[regionCount * K][];
-        for (int i = 0; i < storage.length; i++) {
-            storage[i] = new Object[N];
+        // Maximum number of objects to allocate is regionCount * K.
+        storage = new ObjStorage(regionCount * K);
+
+        // Add objects as long as there is space in the storage
+        // and we haven't used more memory than planned.
+        while (!storage.isFull() && (rt.maxMemory() - used) > freeMemoryLimit) {
+            storage.addArray(new Object[N]);
+            // Update used memory
+            used = rt.totalMemory() - rt.freeMemory();
         }
     }
 
@@ -255,7 +263,7 @@ public class TestStressRSetCoarsening {
                     // The celebrity will be referred from all other regions.
                     // If the number of references after should be less than they
                     // were before, select NULL.
-                    Object celebrity = cur > pre ? storage[to * K] : null;
+                    Object celebrity = cur > pre ? storage.getArrayAt(to * K) : null;
                     for (int from = 0; from < regionCount; from++) {
                         if (to == from) {
                             continue; // no need to refer to itself
@@ -263,7 +271,8 @@ public class TestStressRSetCoarsening {
 
                         int step = cur > pre ? +1 : -1;
                         for (int rn = pre; rn != cur; rn += step) {
-                            storage[getY(to, from, rn)][getX(to, from, rn)] = celebrity;
+                            Object[] rnArray = storage.getArrayAt(getY(to, from, rn));
+                            rnArray[getX(to, from, rn)] = celebrity;
                             if (System.currentTimeMillis() > finishAt) {
                                 throw new TimeoutException();
                             }
@@ -290,14 +299,15 @@ public class TestStressRSetCoarsening {
                             continue; // no need to refer to itself
                         }
                         for (int rn = 0; rn <= cur; rn++) {
-                            storage[getY(to, from, rn)][getX(to, from, rn)] = null;
+                            Object[] rnArray = storage.getArrayAt(getY(to, from, rn));
+                            rnArray[getX(to, from, rn)] = null;
                         }
                     }
                     // 'Refresh' storage elements for the region 'to'
                     // After that loop all 'old' objects in the region 'to'
                     // should become unreachable.
                     for (int k = 0; k < K; k++) {
-                        storage[(to * K + k) % storage.length] = new Object[N];
+                        storage.setArrayAt(to * K + k, new Object[N]);
                     }
                 }
             }
@@ -340,3 +350,36 @@ public class TestStressRSetCoarsening {
     }
 }
 
+//Helper class to encapsulate the object array storage.
+class ObjStorage {
+    public final Object[][] storage;
+    public int usedCount;
+
+    ObjStorage(int size) {
+        storage  = new Object[size][];
+        usedCount = 0;
+    }
+
+    public boolean isFull() {
+        return usedCount >= storage.length;
+    }
+
+    public void addArray(Object[] objects) {
+        if (isFull()) {
+            throw new IllegalStateException("Storage full maximum number of allowed elements: " + usedCount);
+        }
+        storage[usedCount++] = objects;
+    }
+
+    // Limit by usedCount since memory limits can cause the storage
+    // to have unused slots in the end.
+    public void setArrayAt(int i, Object[] objects) {
+        storage[i % usedCount] = objects;
+    }
+
+    // Limit by usedCount since memory limits can cause the storage
+    // to have unused slots in the end.
+    public Object[] getArrayAt(int i) {
+        return storage[i % usedCount];
+    }
+}

From e5e41a2375a21005421ba7481c19d2e35dad896f Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Fri, 27 May 2016 05:49:24 -0700
Subject: [PATCH 115/228] 8145247: incorrect comment in
 SystemDictionary::load_shared_class

Reviewed-by: jiangli, ccheung, gtriantafill
---
 hotspot/src/share/vm/classfile/systemDictionary.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/hotspot/src/share/vm/classfile/systemDictionary.cpp b/hotspot/src/share/vm/classfile/systemDictionary.cpp
index 7dcd740f8a5..28b79768fa5 100644
--- a/hotspot/src/share/vm/classfile/systemDictionary.cpp
+++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp
@@ -1336,9 +1336,12 @@ instanceKlassHandle SystemDictionary::load_shared_class(instanceKlassHandle ik,
       return nh;
     }
 
-    // Found the class, now load the superclass and interfaces.  If they
-    // are shared, add them to the main system dictionary and reset
-    // their hierarchy references (supers, subs, and interfaces).
+    // Resolve the superclass and interfaces. They must be the same
+    // as in dump time, because the layout of <ik> depends on
+    // the specific layout of ik->super() and ik->local_interfaces().
+    //
+    // If unexpected superclass or interfaces are found, we cannot
+    // load <ik> from the shared archive.
 
     if (ik->super() != NULL) {
       Symbol*  cn = ik->super()->name();
@@ -1348,6 +1351,8 @@ instanceKlassHandle SystemDictionary::load_shared_class(instanceKlassHandle ik,
         // The dynamically resolved super class is not the same as the one we used during dump time,
         // so we cannot use ik.
         return nh;
+      } else {
+        assert(s->is_shared(), "must be");
       }
     }
 
@@ -1366,6 +1371,8 @@ instanceKlassHandle SystemDictionary::load_shared_class(instanceKlassHandle ik,
         // The dynamically resolved interface class is not the same as the one we used during dump time,
         // so we cannot use ik.
         return nh;
+      } else {
+        assert(i->is_shared(), "must be");
       }
     }
 

From c36295e947397cf70ccc1e976a0f866a94b3ab2b Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Fri, 27 May 2016 10:52:39 -0400
Subject: [PATCH 116/228] 8145148: InterfaceMethod CP entry pointing to a class
 should cause ICCE

Pass tag in LinkInfo and check that resolved method type matches tag, fix tests.

Reviewed-by: sspitsyn, minqi
---
 hotspot/src/share/vm/ci/ciEnv.cpp             |   9 +-
 hotspot/src/share/vm/ci/ciEnv.hpp             |   5 +-
 hotspot/src/share/vm/ci/ciMethod.cpp          |   3 +-
 .../src/share/vm/interpreter/linkResolver.cpp |  50 ++--
 .../src/share/vm/interpreter/linkResolver.hpp |  25 +-
 .../src/share/vm/jvmci/jvmciCompilerToVM.cpp  |   3 +-
 hotspot/src/share/vm/jvmci/jvmciEnv.cpp       |   8 +-
 hotspot/src/share/vm/jvmci/jvmciEnv.hpp       |   5 +-
 hotspot/src/share/vm/oops/constantPool.cpp    |  23 ++
 hotspot/src/share/vm/oops/constantPool.hpp    |   3 +
 hotspot/src/share/vm/prims/methodHandles.cpp  |  10 +-
 hotspot/src/share/vm/runtime/javaCalls.cpp    |   6 +-
 hotspot/src/share/vm/runtime/reflection.cpp   |   2 +-
 .../ConstantPool/BadMethodHandles.java        | 254 ++++++++++++++++++
 .../test/runtime/ConstantPool/IntfMethod.java | 160 +++++++++++
 .../classes/selectionresolution/Clazz.java    |   2 +-
 .../classes/selectionresolution/Method.java   |  32 +--
 .../selectionresolution/TestBuilder.java      |   5 +-
 18 files changed, 543 insertions(+), 62 deletions(-)
 create mode 100644 hotspot/test/runtime/ConstantPool/BadMethodHandles.java
 create mode 100644 hotspot/test/runtime/ConstantPool/IntfMethod.java

diff --git a/hotspot/src/share/vm/ci/ciEnv.cpp b/hotspot/src/share/vm/ci/ciEnv.cpp
index 001c7fd13ea..7bb8f759ffe 100644
--- a/hotspot/src/share/vm/ci/ciEnv.cpp
+++ b/hotspot/src/share/vm/ci/ciEnv.cpp
@@ -704,13 +704,14 @@ Method* ciEnv::lookup_method(InstanceKlass*  accessor,
                                InstanceKlass*  holder,
                                Symbol*       name,
                                Symbol*       sig,
-                               Bytecodes::Code bc) {
+                               Bytecodes::Code bc,
+                               constantTag    tag) {
   EXCEPTION_CONTEXT;
   KlassHandle h_accessor(THREAD, accessor);
   KlassHandle h_holder(THREAD, holder);
   LinkResolver::check_klass_accessability(h_accessor, h_holder, KILL_COMPILE_ON_FATAL_(NULL));
   methodHandle dest_method;
-  LinkInfo link_info(h_holder, name, sig, h_accessor, /*check_access*/true);
+  LinkInfo link_info(h_holder, name, sig, h_accessor, LinkInfo::needs_access_check, tag);
   switch (bc) {
   case Bytecodes::_invokestatic:
     dest_method =
@@ -796,7 +797,9 @@ ciMethod* ciEnv::get_method_by_index_impl(const constantPoolHandle& cpool,
 
     if (holder_is_accessible) {  // Our declared holder is loaded.
       InstanceKlass* lookup = declared_holder->get_instanceKlass();
-      Method* m = lookup_method(accessor->get_instanceKlass(), lookup, name_sym, sig_sym, bc);
+      constantTag tag = cpool->tag_ref_at(index);
+      assert(accessor->get_instanceKlass() == cpool->pool_holder(), "not the pool holder?");
+      Method* m = lookup_method(accessor->get_instanceKlass(), lookup, name_sym, sig_sym, bc, tag);
       if (m != NULL &&
           (bc == Bytecodes::_invokestatic
            ?  m->method_holder()->is_not_initialized()
diff --git a/hotspot/src/share/vm/ci/ciEnv.hpp b/hotspot/src/share/vm/ci/ciEnv.hpp
index cd7138d33b2..e5a99e1a96a 100644
--- a/hotspot/src/share/vm/ci/ciEnv.hpp
+++ b/hotspot/src/share/vm/ci/ciEnv.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2016, 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
@@ -156,7 +156,8 @@ private:
                            InstanceKlass*  holder,
                            Symbol*         name,
                            Symbol*         sig,
-                           Bytecodes::Code bc);
+                           Bytecodes::Code bc,
+                           constantTag     tag);
 
   // Get a ciObject from the object factory.  Ensures uniqueness
   // of ciObjects.
diff --git a/hotspot/src/share/vm/ci/ciMethod.cpp b/hotspot/src/share/vm/ci/ciMethod.cpp
index 8294024ac9e..2a4484850bb 100644
--- a/hotspot/src/share/vm/ci/ciMethod.cpp
+++ b/hotspot/src/share/vm/ci/ciMethod.cpp
@@ -789,7 +789,8 @@ ciMethod* ciMethod::resolve_invoke(ciKlass* caller, ciKlass* exact_receiver, boo
    Symbol* h_name      = name()->get_symbol();
    Symbol* h_signature = signature()->get_symbol();
 
-   LinkInfo link_info(h_resolved, h_name, h_signature, caller_klass, check_access);
+   LinkInfo link_info(h_resolved, h_name, h_signature, caller_klass,
+                      check_access ? LinkInfo::needs_access_check : LinkInfo::skip_access_check);
    methodHandle m;
    // Only do exact lookup if receiver klass has been linked.  Otherwise,
    // the vtable has not been setup, and the LinkResolver will fail.
diff --git a/hotspot/src/share/vm/interpreter/linkResolver.cpp b/hotspot/src/share/vm/interpreter/linkResolver.cpp
index 0544e1ca476..808f94a7c54 100644
--- a/hotspot/src/share/vm/interpreter/linkResolver.cpp
+++ b/hotspot/src/share/vm/interpreter/linkResolver.cpp
@@ -231,6 +231,7 @@ LinkInfo::LinkInfo(const constantPoolHandle& pool, int index, TRAPS) {
   // Get name, signature, and static klass
   _name          = pool->name_ref_at(index);
   _signature     = pool->signature_ref_at(index);
+  _tag           = pool->tag_ref_at(index);
   _current_klass = KlassHandle(THREAD, pool->pool_holder());
 
   // Coming from the constant pool always checks access
@@ -573,7 +574,7 @@ methodHandle LinkResolver::resolve_method_statically(Bytecodes::Code code,
     Symbol* method_signature = pool->signature_ref_at(index);
     KlassHandle  current_klass(THREAD, pool->pool_holder());
     LinkInfo link_info(resolved_klass, method_name, method_signature, current_klass);
-    return resolve_method(link_info, /*require_methodref*/false, THREAD);
+    return resolve_method(link_info, code, THREAD);
   }
 
   LinkInfo link_info(pool, index, CHECK_NULL);
@@ -591,9 +592,9 @@ methodHandle LinkResolver::resolve_method_statically(Bytecodes::Code code,
   if (code == Bytecodes::_invokeinterface) {
     return resolve_interface_method(link_info, code, THREAD);
   } else if (code == Bytecodes::_invokevirtual) {
-    return resolve_method(link_info, /*require_methodref*/true, THREAD);
+    return resolve_method(link_info, code, THREAD);
   } else if (!resolved_klass->is_interface()) {
-    return resolve_method(link_info, /*require_methodref*/false, THREAD);
+    return resolve_method(link_info, code, THREAD);
   } else {
     return resolve_interface_method(link_info, code, THREAD);
   }
@@ -663,13 +664,13 @@ void LinkResolver::check_field_loader_constraints(Symbol* field, Symbol* sig,
 }
 
 methodHandle LinkResolver::resolve_method(const LinkInfo& link_info,
-                                          bool require_methodref, TRAPS) {
+                                          Bytecodes::Code code, TRAPS) {
 
   Handle nested_exception;
   KlassHandle resolved_klass = link_info.resolved_klass();
 
-  // 1. check if methodref required, that resolved_klass is not interfacemethodref
-  if (require_methodref && resolved_klass->is_interface()) {
+  // 1. For invokevirtual, cannot call an interface method
+  if (code == Bytecodes::_invokevirtual && resolved_klass->is_interface()) {
     ResourceMark rm(THREAD);
     char buf[200];
     jio_snprintf(buf, sizeof(buf), "Found interface %s, but class was expected",
@@ -677,11 +678,20 @@ methodHandle LinkResolver::resolve_method(const LinkInfo& link_info,
     THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf);
   }
 
-  // 2. lookup method in resolved klass and its super klasses
+  // 2. check constant pool tag for called method - must be JVM_CONSTANT_Methodref
+  if (!link_info.tag().is_invalid() && !link_info.tag().is_method()) {
+    ResourceMark rm(THREAD);
+    char buf[200];
+    jio_snprintf(buf, sizeof(buf), "Method %s must be Methodref constant", link_info.method_string());
+    THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf);
+  }
+
+
+  // 3. lookup method in resolved klass and its super klasses
   methodHandle resolved_method = lookup_method_in_klasses(link_info, true, false, CHECK_NULL);
 
+  // 4. lookup method in all the interfaces implemented by the resolved klass
   if (resolved_method.is_null() && !resolved_klass->is_array_klass()) { // not found in the class hierarchy
-    // 3. lookup method in all the interfaces implemented by the resolved klass
     resolved_method = lookup_method_in_interfaces(link_info, CHECK_NULL);
 
     if (resolved_method.is_null()) {
@@ -694,8 +704,8 @@ methodHandle LinkResolver::resolve_method(const LinkInfo& link_info,
     }
   }
 
+  // 5. method lookup failed
   if (resolved_method.is_null()) {
-    // 4. method lookup failed
     ResourceMark rm(THREAD);
     THROW_MSG_CAUSE_(vmSymbols::java_lang_NoSuchMethodError(),
                     Method::name_and_sig_as_C_string(resolved_klass(),
@@ -704,7 +714,7 @@ methodHandle LinkResolver::resolve_method(const LinkInfo& link_info,
                     nested_exception, NULL);
   }
 
-  // 5. access checks, access checking may be turned off when calling from within the VM.
+  // 6. access checks, access checking may be turned off when calling from within the VM.
   KlassHandle current_klass = link_info.current_klass();
   if (link_info.check_access()) {
     assert(current_klass.not_null() , "current_klass should not be null");
@@ -766,6 +776,14 @@ methodHandle LinkResolver::resolve_interface_method(const LinkInfo& link_info, B
     THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf);
   }
 
+  // check constant pool tag for called method - must be JVM_CONSTANT_InterfaceMethodref
+  if (!link_info.tag().is_invalid() && !link_info.tag().is_interface_method()) {
+    ResourceMark rm(THREAD);
+    char buf[200];
+    jio_snprintf(buf, sizeof(buf), "Method %s must be InterfaceMethodref constant", link_info.method_string());
+    THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf);
+  }
+
   // lookup method in this interface or its super, java.lang.Object
   // JDK8: also look for static methods
   methodHandle resolved_method = lookup_method_in_klasses(link_info, false, true, CHECK_NULL);
@@ -956,7 +974,8 @@ void LinkResolver::resolve_static_call(CallInfo& result,
     resolved_klass->initialize(CHECK);
     // Use updated LinkInfo (to reresolve with resolved_klass as method_holder?)
     LinkInfo new_info(resolved_klass, link_info.name(), link_info.signature(),
-                      link_info.current_klass(), link_info.check_access());
+                      link_info.current_klass(),
+                      link_info.check_access() ? LinkInfo::needs_access_check : LinkInfo::skip_access_check);
     resolved_method = linktime_resolve_static_method(new_info, CHECK);
   }
 
@@ -971,7 +990,7 @@ methodHandle LinkResolver::linktime_resolve_static_method(const LinkInfo& link_i
   KlassHandle resolved_klass = link_info.resolved_klass();
   methodHandle resolved_method;
   if (!resolved_klass->is_interface()) {
-    resolved_method = resolve_method(link_info, /*require_methodref*/false, CHECK_NULL);
+    resolved_method = resolve_method(link_info, Bytecodes::_invokestatic, CHECK_NULL);
   } else {
     resolved_method = resolve_interface_method(link_info, Bytecodes::_invokestatic, CHECK_NULL);
   }
@@ -1014,7 +1033,7 @@ methodHandle LinkResolver::linktime_resolve_special_method(const LinkInfo& link_
   methodHandle resolved_method;
 
   if (!resolved_klass->is_interface()) {
-    resolved_method = resolve_method(link_info, /*require_methodref*/false, CHECK_NULL);
+    resolved_method = resolve_method(link_info, Bytecodes::_invokespecial, CHECK_NULL);
   } else {
     resolved_method = resolve_interface_method(link_info, Bytecodes::_invokespecial, CHECK_NULL);
   }
@@ -1164,7 +1183,7 @@ void LinkResolver::resolve_virtual_call(CallInfo& result, Handle recv, KlassHand
 methodHandle LinkResolver::linktime_resolve_virtual_method(const LinkInfo& link_info,
                                                            TRAPS) {
   // normal method resolution
-  methodHandle resolved_method = resolve_method(link_info, /*require_methodref*/true, CHECK_NULL);
+  methodHandle resolved_method = resolve_method(link_info, Bytecodes::_invokevirtual, CHECK_NULL);
 
   assert(resolved_method->name() != vmSymbols::object_initializer_name(), "should have been checked in verifier");
   assert(resolved_method->name() != vmSymbols::class_initializer_name (), "should have been checked in verifier");
@@ -1173,6 +1192,7 @@ methodHandle LinkResolver::linktime_resolve_virtual_method(const LinkInfo& link_
   KlassHandle resolved_klass = link_info.resolved_klass();
   KlassHandle current_klass = link_info.current_klass();
 
+  // This is impossible, if resolve_klass is an interface, we've thrown icce in resolve_method
   if (resolved_klass->is_interface() && resolved_method->is_private()) {
     ResourceMark rm(THREAD);
     char buf[200];
@@ -1482,7 +1502,7 @@ void LinkResolver::resolve_invoke(CallInfo& result, Handle& recv,
   KlassHandle defc = attached_method->method_holder();
   Symbol* name = attached_method->name();
   Symbol* type = attached_method->signature();
-  LinkInfo link_info(defc, name, type, KlassHandle(), /*check_access=*/false);
+  LinkInfo link_info(defc, name, type);
   switch(byte) {
     case Bytecodes::_invokevirtual:
       resolve_virtual_call(result, recv, recv->klass(), link_info,
diff --git a/hotspot/src/share/vm/interpreter/linkResolver.hpp b/hotspot/src/share/vm/interpreter/linkResolver.hpp
index b319be9b3b6..263365b56bf 100644
--- a/hotspot/src/share/vm/interpreter/linkResolver.hpp
+++ b/hotspot/src/share/vm/interpreter/linkResolver.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -137,20 +137,35 @@ class LinkInfo : public StackObj {
   KlassHandle _resolved_klass;  // class that the constant pool entry points to
   KlassHandle _current_klass;   // class that owns the constant pool
   bool        _check_access;
+  constantTag _tag;
  public:
+  enum AccessCheck {
+     needs_access_check,
+     skip_access_check
+  };
+
   LinkInfo(const constantPoolHandle& pool, int index, TRAPS);
+
   // Condensed information from other call sites within the vm.
-  LinkInfo(KlassHandle resolved_klass, Symbol* name, Symbol* signature,
-           KlassHandle current_klass, bool check_access = true) :
+  LinkInfo(KlassHandle resolved_klass, Symbol* name, Symbol* signature, KlassHandle current_klass,
+           AccessCheck check_access = needs_access_check,
+           constantTag tag = JVM_CONSTANT_Invalid) :
     _resolved_klass(resolved_klass),
     _name(name), _signature(signature), _current_klass(current_klass),
-    _check_access(check_access) {}
+    _check_access(check_access == needs_access_check), _tag(tag) {}
+
+  // Case where we just find the method and don't check access against the current class
+  LinkInfo(KlassHandle resolved_klass, Symbol*name, Symbol* signature) :
+    _resolved_klass(resolved_klass),
+    _name(name), _signature(signature), _current_klass(NULL),
+    _check_access(false), _tag(JVM_CONSTANT_Invalid) {}
 
   // accessors
   Symbol* name() const               { return _name; }
   Symbol* signature() const          { return _signature; }
   KlassHandle resolved_klass() const { return _resolved_klass; }
   KlassHandle current_klass() const  { return _current_klass; }
+  constantTag tag() const            { return _tag; }
   bool check_access() const          { return _check_access; }
   char* method_string() const;
 
@@ -192,7 +207,7 @@ class LinkResolver: AllStatic {
                                              KlassHandle sel_klass, TRAPS);
 
   static methodHandle resolve_interface_method(const LinkInfo& link_info, Bytecodes::Code code, TRAPS);
-  static methodHandle resolve_method          (const LinkInfo& link_info, bool require_methodref, TRAPS);
+  static methodHandle resolve_method          (const LinkInfo& link_info, Bytecodes::Code code, TRAPS);
 
   static methodHandle linktime_resolve_static_method    (const LinkInfo& link_info, TRAPS);
   static methodHandle linktime_resolve_special_method   (const LinkInfo& link_info, TRAPS);
diff --git a/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp b/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
index bc56b370358..63387feb6fb 100644
--- a/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
+++ b/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
@@ -661,8 +661,7 @@ C2V_VMENTRY(jobject, resolveMethod, (JNIEnv *, jobject, jobject receiver_jvmci_t
   Symbol* h_name      = method->name();
   Symbol* h_signature = method->signature();
 
-  bool check_access = true;
-  LinkInfo link_info(h_resolved, h_name, h_signature, caller_klass, check_access);
+  LinkInfo link_info(h_resolved, h_name, h_signature, caller_klass);
   methodHandle m;
   // Only do exact lookup if receiver klass has been linked.  Otherwise,
   // the vtable has not been setup, and the LinkResolver will fail.
diff --git a/hotspot/src/share/vm/jvmci/jvmciEnv.cpp b/hotspot/src/share/vm/jvmci/jvmciEnv.cpp
index 502b2f7c011..994220ff006 100644
--- a/hotspot/src/share/vm/jvmci/jvmciEnv.cpp
+++ b/hotspot/src/share/vm/jvmci/jvmciEnv.cpp
@@ -286,11 +286,12 @@ methodHandle JVMCIEnv::lookup_method(instanceKlassHandle h_accessor,
                                instanceKlassHandle h_holder,
                                Symbol*       name,
                                Symbol*       sig,
-                               Bytecodes::Code bc) {
+                               Bytecodes::Code bc,
+                               constantTag   tag) {
   JVMCI_EXCEPTION_CONTEXT;
   LinkResolver::check_klass_accessability(h_accessor, h_holder, KILL_COMPILE_ON_FATAL_(NULL));
   methodHandle dest_method;
-  LinkInfo link_info(h_holder, name, sig, h_accessor, /*check_access*/true);
+  LinkInfo link_info(h_holder, name, sig, h_accessor, LinkInfo::needs_access_check, tag);
   switch (bc) {
   case Bytecodes::_invokestatic:
     dest_method =
@@ -363,7 +364,8 @@ methodHandle JVMCIEnv::get_method_by_index_impl(const constantPoolHandle& cpool,
 
   if (holder_is_accessible) { // Our declared holder is loaded.
     instanceKlassHandle lookup = get_instance_klass_for_declared_method_holder(holder);
-    methodHandle m = lookup_method(accessor, lookup, name_sym, sig_sym, bc);
+    constantTag tag = cpool->tag_ref_at(index);
+    methodHandle m = lookup_method(accessor, lookup, name_sym, sig_sym, bc, tag);
     if (!m.is_null() &&
         (bc == Bytecodes::_invokestatic
          ?  InstanceKlass::cast(m->method_holder())->is_not_initialized()
diff --git a/hotspot/src/share/vm/jvmci/jvmciEnv.hpp b/hotspot/src/share/vm/jvmci/jvmciEnv.hpp
index 833074326bf..2c884494db8 100644
--- a/hotspot/src/share/vm/jvmci/jvmciEnv.hpp
+++ b/hotspot/src/share/vm/jvmci/jvmciEnv.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2016, 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,8 @@ private:
                            instanceKlassHandle  holder,
                            Symbol*         name,
                            Symbol*         sig,
-                           Bytecodes::Code bc);
+                           Bytecodes::Code bc,
+                           constantTag     tag);
 
   private:
 
diff --git a/hotspot/src/share/vm/oops/constantPool.cpp b/hotspot/src/share/vm/oops/constantPool.cpp
index a291dc5d3f8..29110089d3b 100644
--- a/hotspot/src/share/vm/oops/constantPool.cpp
+++ b/hotspot/src/share/vm/oops/constantPool.cpp
@@ -417,6 +417,19 @@ int ConstantPool::impl_name_and_type_ref_index_at(int which, bool uncached) {
   return extract_high_short_from_int(ref_index);
 }
 
+constantTag ConstantPool::impl_tag_ref_at(int which, bool uncached) {
+  int pool_index = which;
+  if (!uncached && cache() != NULL) {
+    if (ConstantPool::is_invokedynamic_index(which)) {
+      // Invokedynamic index is index into resolved_references
+      pool_index = invokedynamic_cp_cache_entry_at(which)->constant_pool_index();
+    } else {
+      // change byte-ordering and go via cache
+      pool_index = remap_instruction_operand_from_cache(which);
+    }
+  }
+  return tag_at(pool_index);
+}
 
 int ConstantPool::impl_klass_ref_index_at(int which, bool uncached) {
   guarantee(!ConstantPool::is_invokedynamic_index(which),
@@ -672,6 +685,7 @@ oop ConstantPool::resolve_constant_at_impl(const constantPoolHandle& this_cp, in
       int callee_index             = this_cp->method_handle_klass_index_at(index);
       Symbol*  name =      this_cp->method_handle_name_ref_at(index);
       Symbol*  signature = this_cp->method_handle_signature_ref_at(index);
+      constantTag m_tag  = this_cp->tag_at(this_cp->method_handle_index_at(index));
       { ResourceMark rm(THREAD);
         log_debug(class, resolve)("resolve JVM_CONSTANT_MethodHandle:%d [%d/%d/%d] %s.%s",
                               ref_kind, index, this_cp->method_handle_index_at(index),
@@ -681,6 +695,15 @@ oop ConstantPool::resolve_constant_at_impl(const constantPoolHandle& this_cp, in
       { Klass* k = klass_at_impl(this_cp, callee_index, true, CHECK_NULL);
         callee = KlassHandle(THREAD, k);
       }
+      if ((callee->is_interface() && m_tag.is_method()) ||
+          (!callee->is_interface() && m_tag.is_interface_method())) {
+        ResourceMark rm(THREAD);
+        char buf[200];
+        jio_snprintf(buf, sizeof(buf), "Inconsistent constant data for %s.%s%s at index %d",
+          callee->name()->as_C_string(), name->as_C_string(), signature->as_C_string(), index);
+        THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf);
+      }
+
       KlassHandle klass(THREAD, this_cp->pool_holder());
       Handle value = SystemDictionary::link_method_handle_constant(klass, ref_kind,
                                                                    callee, name, signature,
diff --git a/hotspot/src/share/vm/oops/constantPool.hpp b/hotspot/src/share/vm/oops/constantPool.hpp
index 75bca62917b..38a71f525d2 100644
--- a/hotspot/src/share/vm/oops/constantPool.hpp
+++ b/hotspot/src/share/vm/oops/constantPool.hpp
@@ -643,6 +643,8 @@ class ConstantPool : public Metadata {
 
   int remap_instruction_operand_from_cache(int operand);  // operand must be biased by CPCACHE_INDEX_TAG
 
+  constantTag tag_ref_at(int cp_cache_index)      { return impl_tag_ref_at(cp_cache_index, false); }
+
   // Lookup for entries consisting of (name_index, signature_index)
   int name_ref_index_at(int which_nt);            // ==  low-order jshort of name_and_type_at(which_nt)
   int signature_ref_index_at(int which_nt);       // == high-order jshort of name_and_type_at(which_nt)
@@ -763,6 +765,7 @@ class ConstantPool : public Metadata {
   Symbol* impl_signature_ref_at(int which, bool uncached);
   int       impl_klass_ref_index_at(int which, bool uncached);
   int       impl_name_and_type_ref_index_at(int which, bool uncached);
+  constantTag impl_tag_ref_at(int which, bool uncached);
 
   // Used while constructing constant pool (only by ClassFileParser)
   jint klass_index_at(int which) {
diff --git a/hotspot/src/share/vm/prims/methodHandles.cpp b/hotspot/src/share/vm/prims/methodHandles.cpp
index 7b1782a2904..d21c0fa30e4 100644
--- a/hotspot/src/share/vm/prims/methodHandles.cpp
+++ b/hotspot/src/share/vm/prims/methodHandles.cpp
@@ -713,12 +713,16 @@ Handle MethodHandles::resolve_MemberName(Handle mname, KlassHandle caller, TRAPS
   TempNewSymbol type = lookup_signature(type_str(), (mh_invoke_id != vmIntrinsics::_none), CHECK_(empty));
   if (type == NULL)  return empty;  // no such signature exists in the VM
 
+  LinkInfo::AccessCheck access_check = caller.not_null() ?
+                                              LinkInfo::needs_access_check :
+                                              LinkInfo::skip_access_check;
+
   // Time to do the lookup.
   switch (flags & ALL_KINDS) {
   case IS_METHOD:
     {
       CallInfo result;
-      LinkInfo link_info(defc, name, type, caller, caller.not_null());
+      LinkInfo link_info(defc, name, type, caller, access_check);
       {
         assert(!HAS_PENDING_EXCEPTION, "");
         if (ref_kind == JVM_REF_invokeStatic) {
@@ -755,7 +759,7 @@ Handle MethodHandles::resolve_MemberName(Handle mname, KlassHandle caller, TRAPS
   case IS_CONSTRUCTOR:
     {
       CallInfo result;
-      LinkInfo link_info(defc, name, type, caller, caller.not_null());
+      LinkInfo link_info(defc, name, type, caller, access_check);
       {
         assert(!HAS_PENDING_EXCEPTION, "");
         if (name == vmSymbols::object_initializer_name()) {
@@ -776,7 +780,7 @@ Handle MethodHandles::resolve_MemberName(Handle mname, KlassHandle caller, TRAPS
       fieldDescriptor result; // find_field initializes fd if found
       {
         assert(!HAS_PENDING_EXCEPTION, "");
-        LinkInfo link_info(defc, name, type, caller, /*check_access*/false);
+        LinkInfo link_info(defc, name, type, caller, LinkInfo::skip_access_check);
         LinkResolver::resolve_field(result, link_info, Bytecodes::_nop, false, THREAD);
         if (HAS_PENDING_EXCEPTION) {
           return empty;
diff --git a/hotspot/src/share/vm/runtime/javaCalls.cpp b/hotspot/src/share/vm/runtime/javaCalls.cpp
index 686a2c566ab..34a0787eaac 100644
--- a/hotspot/src/share/vm/runtime/javaCalls.cpp
+++ b/hotspot/src/share/vm/runtime/javaCalls.cpp
@@ -183,7 +183,7 @@ void JavaCalls::call_virtual(JavaValue* result, KlassHandle spec_klass, Symbol*
   CallInfo callinfo;
   Handle receiver = args->receiver();
   KlassHandle recvrKlass(THREAD, receiver.is_null() ? (Klass*)NULL : receiver->klass());
-  LinkInfo link_info(spec_klass, name, signature, KlassHandle(), /*check_access*/false);
+  LinkInfo link_info(spec_klass, name, signature);
   LinkResolver::resolve_virtual_call(
           callinfo, receiver, recvrKlass, link_info, true, CHECK);
   methodHandle method = callinfo.selected_method();
@@ -220,7 +220,7 @@ void JavaCalls::call_virtual(JavaValue* result, Handle receiver, KlassHandle spe
 
 void JavaCalls::call_special(JavaValue* result, KlassHandle klass, Symbol* name, Symbol* signature, JavaCallArguments* args, TRAPS) {
   CallInfo callinfo;
-  LinkInfo link_info(klass, name, signature, KlassHandle(), /*check_access*/false);
+  LinkInfo link_info(klass, name, signature);
   LinkResolver::resolve_special_call(callinfo, link_info, CHECK);
   methodHandle method = callinfo.selected_method();
   assert(method.not_null(), "should have thrown exception");
@@ -255,7 +255,7 @@ void JavaCalls::call_special(JavaValue* result, Handle receiver, KlassHandle kla
 
 void JavaCalls::call_static(JavaValue* result, KlassHandle klass, Symbol* name, Symbol* signature, JavaCallArguments* args, TRAPS) {
   CallInfo callinfo;
-  LinkInfo link_info(klass, name, signature, KlassHandle(), /*check_access*/false);
+  LinkInfo link_info(klass, name, signature);
   LinkResolver::resolve_static_call(callinfo, link_info, true, CHECK);
   methodHandle method = callinfo.selected_method();
   assert(method.not_null(), "should have thrown exception");
diff --git a/hotspot/src/share/vm/runtime/reflection.cpp b/hotspot/src/share/vm/runtime/reflection.cpp
index f81deb6a374..867c831a165 100644
--- a/hotspot/src/share/vm/runtime/reflection.cpp
+++ b/hotspot/src/share/vm/runtime/reflection.cpp
@@ -998,7 +998,7 @@ static methodHandle resolve_interface_call(instanceKlassHandle klass,
   Symbol*  signature  = method->signature();
   Symbol*  name       = method->name();
   LinkResolver::resolve_interface_call(info, receiver, recv_klass,
-                                       LinkInfo(klass, name, signature, KlassHandle(), false),
+                                       LinkInfo(klass, name, signature),
                                        true,
                                        CHECK_(methodHandle()));
   return info.selected_method();
diff --git a/hotspot/test/runtime/ConstantPool/BadMethodHandles.java b/hotspot/test/runtime/ConstantPool/BadMethodHandles.java
new file mode 100644
index 00000000000..6345166e022
--- /dev/null
+++ b/hotspot/test/runtime/ConstantPool/BadMethodHandles.java
@@ -0,0 +1,254 @@
+/*
+ * Copyright (c) 2016, 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 8087223
+ * @summary Adding constantTag to keep method call consistent with it.
+ * @library /testlibrary
+ * @modules java.base/jdk.internal.org.objectweb.asm
+ *          java.base/jdk.internal.misc
+ *          java.management
+ * @compile -XDignore.symbol.file BadMethodHandles.java
+ * @run main/othervm BadMethodHandles
+ */
+
+import jdk.internal.org.objectweb.asm.*;
+import java.io.FileOutputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import static jdk.internal.org.objectweb.asm.Opcodes.*;
+
+public class BadMethodHandles {
+
+    static byte[] dumpBadInterfaceMethodref() {
+        ClassWriter cw = new ClassWriter(0);
+        cw.visit(52, ACC_PUBLIC | ACC_SUPER, "BadInterfaceMethodref", null, "java/lang/Object", null);
+        Handle handle1 =
+            new Handle(Opcodes.H_INVOKEINTERFACE, "BadInterfaceMethodref", "m", "()V");
+        Handle handle2 =
+            new Handle(Opcodes.H_INVOKEINTERFACE, "BadInterfaceMethodref", "staticM", "()V");
+
+        {
+            MethodVisitor mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
+            mv.visitCode();
+            mv.visitVarInsn(ALOAD, 0);
+            mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
+            mv.visitInsn(RETURN);
+            mv.visitMaxs(1, 1);
+            mv.visitEnd();
+        }
+        {
+            MethodVisitor mv = cw.visitMethod(ACC_PUBLIC, "m", "()V", null, null);
+            mv.visitCode();
+            mv.visitFieldInsn(GETSTATIC, "java/lang/System", "out", "Ljava/io/PrintStream;");
+            mv.visitLdcInsn("hello from m");
+            mv.visitMethodInsn(INVOKEVIRTUAL, "java/io/PrintStream", "println", "(Ljava/lang/String;)V", false/*intf*/);
+            mv.visitInsn(RETURN);
+            mv.visitMaxs(3, 1);
+            mv.visitEnd();
+        }
+        {
+            MethodVisitor mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "staticM", "()V", null, null);
+            mv.visitCode();
+            mv.visitFieldInsn(GETSTATIC, "java/lang/System", "out", "Ljava/io/PrintStream;");
+            mv.visitLdcInsn("hello from staticM");
+            mv.visitMethodInsn(INVOKEVIRTUAL, "java/io/PrintStream", "println", "(Ljava/lang/String;)V", false/*intf*/);
+            mv.visitInsn(RETURN);
+            mv.visitMaxs(3, 1);
+            mv.visitEnd();
+        }
+
+        {
+            MethodVisitor mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "runm", "()V", null, null);
+            mv.visitCode();
+            // REF_invokeStatic
+            mv.visitLdcInsn(handle1);
+            mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/invoke/MethodHandle", "invoke", "()V", false);
+            mv.visitInsn(RETURN);
+            mv.visitMaxs(1, 1);
+            mv.visitEnd();
+        }
+
+        {
+            MethodVisitor mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "runStaticM", "()V", null, null);
+            mv.visitCode();
+            // REF_invokeStatic
+            mv.visitLdcInsn(handle2);
+            mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/invoke/MethodHandle", "invoke", "()V", false);
+            mv.visitInsn(RETURN);
+            mv.visitMaxs(1, 1);
+            mv.visitEnd();
+        }
+
+        cw.visitEnd();
+        return cw.toByteArray();
+    }
+
+    static byte[] dumpIBad() {
+        ClassWriter cw = new ClassWriter(0);
+        cw.visit(52, ACC_PUBLIC | ACC_ABSTRACT | ACC_INTERFACE, "IBad", null, "java/lang/Object", null);
+        {
+            MethodVisitor mv = cw.visitMethod(ACC_PUBLIC, "m", "()V", null, null);
+            mv.visitCode();
+            mv.visitFieldInsn(GETSTATIC, "java/lang/System", "out", "Ljava/io/PrintStream;");
+            mv.visitLdcInsn("hello from m");
+            mv.visitMethodInsn(INVOKEVIRTUAL, "java/io/PrintStream", "println", "(Ljava/lang/String;)V", false/*intf*/);
+            mv.visitInsn(RETURN);
+            mv.visitMaxs(3, 1);
+            mv.visitEnd();
+        }
+        {
+            MethodVisitor mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "staticM", "()V", null, null);
+            mv.visitCode();
+            mv.visitFieldInsn(GETSTATIC, "java/lang/System", "out", "Ljava/io/PrintStream;");
+            mv.visitLdcInsn("hello from staticM");
+            mv.visitMethodInsn(INVOKEVIRTUAL, "java/io/PrintStream", "println", "(Ljava/lang/String;)V", false/*intf*/);
+            mv.visitInsn(RETURN);
+            mv.visitMaxs(3, 1);
+            mv.visitEnd();
+        }
+        cw.visitEnd();
+        return cw.toByteArray();
+    }
+
+    static byte[] dumpBadMethodref() {
+        ClassWriter cw = new ClassWriter(0);
+        cw.visit(52, ACC_PUBLIC | ACC_SUPER,  "BadMethodref", null, "java/lang/Object", new String[]{"IBad"});
+        Handle handle1 =
+            new Handle(Opcodes.H_INVOKEINTERFACE, "BadMethodref", "m", "()V");
+        Handle handle2 =
+            new Handle(Opcodes.H_INVOKEINTERFACE, "BadMethodref", "staticM", "()V");
+
+        {
+            MethodVisitor mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
+            mv.visitCode();
+            mv.visitVarInsn(ALOAD, 0);
+            mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
+            mv.visitInsn(RETURN);
+            mv.visitMaxs(1, 1);
+            mv.visitEnd();
+        }
+
+        {
+            MethodVisitor mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "runm", "()V", null, null);
+            mv.visitCode();
+            // REF_invokeStatic
+            mv.visitLdcInsn(handle1);
+            mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/invoke/MethodHandle", "invoke", "()V", false);
+            mv.visitInsn(RETURN);
+            mv.visitMaxs(1, 1);
+            mv.visitEnd();
+        }
+
+        {
+            MethodVisitor mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "runStaticM", "()V", null, null);
+            mv.visitCode();
+            // REF_invokeStatic
+            mv.visitLdcInsn(handle2);
+            mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/invoke/MethodHandle", "invoke", "()V", false);
+            mv.visitInsn(RETURN);
+            mv.visitMaxs(1, 1);
+            mv.visitEnd();
+        }
+
+        cw.visitEnd();
+        return cw.toByteArray();
+    }
+    static class CL extends ClassLoader {
+        @Override
+        protected Class<?> findClass(String name) throws ClassNotFoundException {
+            byte[] classBytes = null;
+            switch (name) {
+            case "BadInterfaceMethodref": classBytes = dumpBadInterfaceMethodref(); break;
+            case "BadMethodref"         : classBytes = dumpBadMethodref(); break;
+            case "IBad"                 : classBytes = dumpIBad(); break;
+            default                     : throw new ClassNotFoundException(name);
+            }
+            return defineClass(name, classBytes, 0, classBytes.length);
+        }
+    }
+
+    public static void main(String[] args) throws Throwable {
+        try (FileOutputStream fos = new FileOutputStream("BadInterfaceMethodref.class")) {
+          fos.write(dumpBadInterfaceMethodref());
+        }
+        try (FileOutputStream fos = new FileOutputStream("IBad.class")) {
+          fos.write(dumpIBad());
+        }
+        try (FileOutputStream fos = new FileOutputStream("BadMethodref.class")) {
+          fos.write(dumpBadMethodref());
+        }
+
+        Class<?> cls = (new CL()).loadClass("BadInterfaceMethodref");
+        String[] methods = {"runm", "runStaticM"};
+        System.out.println("Test BadInterfaceMethodref:");
+        int success = 0;
+        for (String name : methods) {
+            try {
+                System.out.printf("invoke %s: \n", name);
+                cls.getMethod(name).invoke(cls.newInstance());
+                System.out.println("FAILED - ICCE should be thrown");
+            } catch (Throwable e) {
+                if (e instanceof InvocationTargetException && e.getCause() != null &&
+                    e.getCause() instanceof IncompatibleClassChangeError) {
+                    System.out.println("PASSED - expected ICCE thrown");
+                    success++;
+                    continue;
+                } else {
+                    System.out.println("FAILED with wrong exception" + e);
+                    throw e;
+                }
+            }
+        }
+        if (success != methods.length) {
+           throw new Exception("BadInterfaceMethodRef Failed to catch IncompatibleClassChangeError");
+        }
+        System.out.println("Test BadMethodref:");
+        cls = (new CL()).loadClass("BadMethodref");
+        success = 0;
+        for (String name : methods) {
+            try {
+                System.out.printf("invoke %s: \n", name);
+                cls.getMethod(name).invoke(cls.newInstance());
+                System.out.println("FAILED - ICCE should be thrown");
+            } catch (Throwable e) {
+                if (e instanceof InvocationTargetException && e.getCause() != null &&
+                    e.getCause() instanceof IncompatibleClassChangeError) {
+                    System.out.println("PASSED - expected ICCE thrown");
+                    success++;
+                    continue;
+                } else {
+                    System.out.println("FAILED with wrong exception" + e);
+                    throw e;
+                }
+            }
+         }
+         if (success != methods.length) {
+            throw new Exception("BadMethodRef Failed to catch IncompatibleClassChangeError");
+         }
+
+    }
+}
diff --git a/hotspot/test/runtime/ConstantPool/IntfMethod.java b/hotspot/test/runtime/ConstantPool/IntfMethod.java
new file mode 100644
index 00000000000..9602ff59979
--- /dev/null
+++ b/hotspot/test/runtime/ConstantPool/IntfMethod.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2016, 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 8087223
+ * @summary Adding constantTag to keep method call consistent with it.
+ * @library /testlibrary
+ * @modules java.base/jdk.internal.org.objectweb.asm
+ *          java.base/jdk.internal.misc
+ *          java.management
+ * @compile -XDignore.symbol.file IntfMethod.java
+ * @run main/othervm IntfMethod
+ * @run main/othervm -Xint IntfMethod
+ * @run main/othervm -Xcomp IntfMethod
+ */
+
+
+import jdk.internal.org.objectweb.asm.*;
+import java.io.FileOutputStream;
+import java.lang.reflect.InvocationTargetException;
+import static jdk.internal.org.objectweb.asm.Opcodes.*;
+
+public class IntfMethod {
+    static byte[] dumpC() {
+        ClassWriter cw = new ClassWriter(0);
+        cw.visit(52, ACC_PUBLIC | ACC_SUPER, "C", null, "java/lang/Object", new String[]{"I"});
+        {
+            MethodVisitor mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
+            mv.visitCode();
+            mv.visitVarInsn(ALOAD, 0);
+            mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
+            mv.visitInsn(RETURN);
+            mv.visitMaxs(1, 1);
+            mv.visitEnd();
+        }
+        {
+            MethodVisitor mv = cw.visitMethod(ACC_PUBLIC, "testSpecialIntf", "()V", null, null);
+            mv.visitCode();
+            mv.visitVarInsn(ALOAD, 0);
+            mv.visitMethodInsn(INVOKESPECIAL, "I", "f1", "()V", /*itf=*/false);
+            mv.visitInsn(RETURN);
+            mv.visitMaxs(1, 1);
+            mv.visitEnd();
+        }
+        {
+            MethodVisitor mv = cw.visitMethod(ACC_PUBLIC, "testStaticIntf", "()V", null, null);
+            mv.visitCode();
+            mv.visitMethodInsn(INVOKESTATIC, "I", "f2", "()V", /*itf=*/false);
+            mv.visitInsn(RETURN);
+            mv.visitMaxs(1, 1);
+            mv.visitEnd();
+        }
+        {
+            MethodVisitor mv = cw.visitMethod(ACC_PUBLIC, "testSpecialClass", "()V", null, null);
+            mv.visitCode();
+            mv.visitVarInsn(ALOAD, 0);
+            mv.visitMethodInsn(INVOKESPECIAL, "C", "f1", "()V", /*itf=*/true);
+            mv.visitInsn(RETURN);
+            mv.visitMaxs(1, 1);
+            mv.visitEnd();
+        }
+
+        {
+            MethodVisitor mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "f2", "()V", null, null);
+            mv.visitCode();
+            mv.visitInsn(RETURN);
+            mv.visitMaxs(0, 1);
+            mv.visitEnd();
+        }
+        {
+            MethodVisitor mv = cw.visitMethod(ACC_PUBLIC, "testStaticClass", "()V", null, null);
+            mv.visitCode();
+            mv.visitMethodInsn(INVOKESTATIC, "C", "f2", "()V", /*itf=*/true);
+            mv.visitInsn(RETURN);
+            mv.visitMaxs(1, 1);
+            mv.visitEnd();
+        }
+        cw.visitEnd();
+        return cw.toByteArray();
+    }
+
+    static byte[] dumpI() {
+        ClassWriter cw = new ClassWriter(0);
+        cw.visit(52, ACC_PUBLIC | ACC_ABSTRACT | ACC_INTERFACE, "I", null, "java/lang/Object", null);
+        {
+            MethodVisitor mv = cw.visitMethod(ACC_PUBLIC, "f1", "()V", null, null);
+            mv.visitCode();
+            mv.visitInsn(RETURN);
+            mv.visitMaxs(0, 1);
+            mv.visitEnd();
+        }
+        {
+            MethodVisitor mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "f2", "()V", null, null);
+            mv.visitCode();
+            mv.visitInsn(RETURN);
+            mv.visitMaxs(0, 1);
+            mv.visitEnd();
+        }
+        cw.visitEnd();
+        return cw.toByteArray();
+    }
+
+    static class CL extends ClassLoader {
+        @Override
+        protected Class<?> findClass(String name) throws ClassNotFoundException {
+            byte[] classFile;
+            switch (name) {
+                case "I": classFile = dumpI(); break;
+                case "C": classFile = dumpC(); break;
+                default:
+                    throw new ClassNotFoundException(name);
+            }
+            return defineClass(name, classFile, 0, classFile.length);
+        }
+    }
+
+    public static void main(String[] args) throws Throwable {
+        Class<?> cls = (new CL()).loadClass("C");
+        try (FileOutputStream fos = new FileOutputStream("I.class")) { fos.write(dumpI()); }
+        try (FileOutputStream fos = new FileOutputStream("C.class")) { fos.write(dumpC()); }
+
+        int success = 0;
+        for (String name : new String[] { "testSpecialIntf", "testStaticIntf", "testSpecialClass", "testStaticClass"}) {
+            System.out.printf("%s: ", name);
+            try {
+                cls.getMethod(name).invoke(cls.newInstance());
+                System.out.println("FAILED - ICCE not thrown");
+            } catch (Throwable e) {
+                if (e instanceof InvocationTargetException &&
+                    e.getCause() != null && e.getCause() instanceof IncompatibleClassChangeError) {
+                    System.out.println("PASSED - expected ICCE thrown");
+                    success++;
+                    continue;
+                }
+            }
+        }
+        if (success != 4) throw new Exception("Failed to catch ICCE");
+    }
+}
diff --git a/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/Clazz.java b/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/Clazz.java
index 42b96b6b0d4..1b6e8afc803 100644
--- a/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/Clazz.java
+++ b/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/Clazz.java
@@ -72,6 +72,6 @@ class Clazz extends ClassConstruct {
     public Clazz(String name, String extending, int access, int classFileVersion, int index, String... implementing) {
         super(name, extending == null ? "java/lang/Object" : extending, access + ACC_SUPER, classFileVersion, index, implementing);
         // Add the default constructor
-        addMethod("<init>", "()V", ACC_PUBLIC).makeConstructor(extending);
+        addMethod("<init>", "()V", ACC_PUBLIC).makeConstructor(extending, false);
     }
 }
diff --git a/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/Method.java b/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/Method.java
index c09ce0fcc7d..428475dfd8a 100644
--- a/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/Method.java
+++ b/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/Method.java
@@ -59,14 +59,12 @@ class Method {
     private final String ownerClassName;
     private final ClassVisitor cv;
     private final MethodVisitor mv;
-    private final boolean isInterface;
     private final ClassBuilder.ExecutionMode execMode;
 
     public Method(ClassConstruct ownerClass, ClassVisitor cv, String name, String descriptor, int access,
                   ClassBuilder.ExecutionMode execMode) {
         this.ownerClassName = ownerClass.getName();
         this.ownerClass = ownerClass;
-        this.isInterface = ownerClass.isInterface();
         this.execMode = execMode;
         this.cv = cv;
         mv = cv.visitMethod(access, name, descriptor, null, null);
@@ -91,12 +89,12 @@ class Method {
 
     public void makeSuperCallMethod(int invokeInstruction, String className) {
         mv.visitVarInsn(ALOAD, 0);
-        makeCall(invokeInstruction, className);
+        makeCall(invokeInstruction, className, false);
         mv.visitInsn(POP);
         done();
     }
 
-    public void defaultInvoke(int instr, String className, String objectRef) {
+    public void defaultInvoke(int instr, String className, String objectRef, boolean isInterface) {
         switch (instr) {
             case INVOKEVIRTUAL:
                 defaultInvokeVirtual(className, objectRef);
@@ -105,10 +103,10 @@ class Method {
                 defaultInvokeInterface(className, objectRef);
                 break;
             case INVOKESTATIC:
-                defaultInvokeStatic(className);
+                defaultInvokeStatic(className, isInterface);
                 break;
             case INVOKESPECIAL:
-                defaultInvokeSpecial(className, objectRef);
+                defaultInvokeSpecial(className, objectRef, isInterface);
                 break;
             default:
                 break;
@@ -118,30 +116,26 @@ class Method {
         mv.visitEnd();
     }
 
-    public void defaultInvokeVirtual(String className, String objectRef) {
+    private void defaultInvokeVirtual(String className, String objectRef) {
         String objectRefPackageName = objectRef.substring(0, objectRef.lastIndexOf("/"));
         makeNewObject(objectRef, objectRefPackageName);
         makeCall(INVOKEVIRTUAL, className, false);
     }
 
-    public void defaultInvokeInterface(String className, String objectRef) {
+    private void defaultInvokeInterface(String className, String objectRef) {
         String objectRefPackageName = objectRef.substring(0, objectRef.lastIndexOf("/"));
         makeNewObject(objectRef, objectRefPackageName);
         makeCall(INVOKEINTERFACE, className, true);
     }
 
-    public void defaultInvokeSpecial(String className, String objectRef) {
+    private void defaultInvokeSpecial(String className, String objectRef, boolean isInterface) {
         String objectRefPackageName = objectRef.substring(0, objectRef.lastIndexOf("/"));
         makeNewObject(objectRef, objectRefPackageName);
-        makeCall(INVOKESPECIAL, className, false);
+        makeCall(INVOKESPECIAL, className, isInterface);
     }
 
-    public void defaultInvokeStatic(String className) {
-        makeCall(INVOKESTATIC, className);
-    }
-
-    private Method makeCall(int invokeInstruction, String className) {
-        return makeCall(invokeInstruction, className, isInterface);
+    private void defaultInvokeStatic(String className, boolean isInterface) {
+        makeCall(INVOKESTATIC, className, isInterface);
     }
 
     private Method makeCall(int invokeInstruction, String className, boolean isInterface) {
@@ -219,7 +213,7 @@ class Method {
         String className = objectRef.substring(objectRef.lastIndexOf("/") + 1);
         makeStaticCall( objectRefPackageName + "/Helper",
                         "get" + className,
-                        "()L" + objectRef + ";");
+                        "()L" + objectRef + ";", false);
         mv.visitVarInsn(ASTORE, 1);
         mv.visitVarInsn(ALOAD, 1);
     }
@@ -236,12 +230,12 @@ class Method {
         mv.visitEnd();
     }
 
-    public Method makeStaticCall(String classname, String method, String descriptor) {
+    public Method makeStaticCall(String classname, String method, String descriptor, boolean isInterface) {
         mv.visitMethodInsn(INVOKESTATIC, classname, method, descriptor, isInterface);
         return this;
     }
 
-    public void makeConstructor(String extending) {
+    public void makeConstructor(String extending, boolean isInterface) {
         mv.visitVarInsn(ALOAD, 0);
         mv.visitMethodInsn(INVOKESPECIAL, extending == null ? "java/lang/Object" : extending, "<init>", "()V", isInterface);
         mv.visitInsn(RETURN);
diff --git a/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/TestBuilder.java b/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/TestBuilder.java
index a24a91fe0a2..894d053e0cc 100644
--- a/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/TestBuilder.java
+++ b/hotspot/test/runtime/SelectionResolution/classes/selectionresolution/TestBuilder.java
@@ -53,9 +53,10 @@ class TestBuilder extends Builder {
         Method m = clazz.addMethod("test", "()Ljava/lang/Integer;", ACC_PUBLIC + ACC_STATIC, execMode);
         m.defaultInvoke(getInvokeInstruction(testcase.invoke),
                     getName(testcase.methodref),
-                    getName(testcase.objectref));
+                    getName(testcase.objectref),
+                    testcase.hier.isInterface(testcase.methodref));
 
-        mainMethod.makeStaticCall(clazz.getName(), "test", "()Ljava/lang/Integer;").done();
+        mainMethod.makeStaticCall(clazz.getName(), "test", "()Ljava/lang/Integer;", false).done();
     }
 
     private static int getInvokeInstruction(SelectionResolutionTestCase.InvokeInstruction instr) {

From 68c8a74fbe25918ec50711ce10eff65afcc73b93 Mon Sep 17 00:00:00 2001
From: Artem Smotrakov <asmotrak@openjdk.org>
Date: Fri, 27 May 2016 09:25:49 -0700
Subject: [PATCH 117/228] 8152207: Perform array bound checks while getting a
 length of bytecode instructions

Reviewed-by: hseigel
---
 hotspot/src/share/vm/interpreter/bytecodes.hpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/hotspot/src/share/vm/interpreter/bytecodes.hpp b/hotspot/src/share/vm/interpreter/bytecodes.hpp
index 86e88d4b516..11290f2bf76 100644
--- a/hotspot/src/share/vm/interpreter/bytecodes.hpp
+++ b/hotspot/src/share/vm/interpreter/bytecodes.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -386,15 +386,16 @@ class Bytecodes: AllStatic {
   static Code       non_breakpoint_code_at(const Method* method, address bcp);
 
   // Bytecode attributes
-  static bool        is_defined     (int  code)    { return 0 <= code && code < number_of_codes && flags(code, false) != 0; }
+  static bool        is_valid       (int  code)    { return 0 <= code && code < number_of_codes; }
+  static bool        is_defined     (int  code)    { return is_valid(code) && flags(code, false) != 0; }
   static bool        wide_is_defined(int  code)    { return is_defined(code) && flags(code, true) != 0; }
   static const char* name           (Code code)    { check(code);      return _name          [code]; }
   static BasicType   result_type    (Code code)    { check(code);      return _result_type   [code]; }
   static int         depth          (Code code)    { check(code);      return _depth         [code]; }
   // Note: Length functions must return <=0 for invalid bytecodes.
   // Calling check(code) in length functions would throw an unwanted assert.
-  static int         length_for     (Code code)    { /*no check*/      return _lengths       [code] & 0xF; }
-  static int         wide_length_for(Code code)    { /*no check*/      return _lengths       [code] >> 4; }
+  static int         length_for     (Code code)    { return is_valid(code) ? _lengths[code] & 0xF : -1; }
+  static int         wide_length_for(Code code)    { return is_valid(code) ? _lengths[code]  >> 4 : -1; }
   static bool        can_trap       (Code code)    { check(code);      return has_all_flags(code, _bc_can_trap, false); }
   static Code        java_code      (Code code)    { check(code);      return _java_code     [code]; }
   static bool        can_rewrite    (Code code)    { check(code);      return has_all_flags(code, _bc_can_rewrite, false); }

From 0cf2e90d174aae96e4b030faca0bd4474c510b31 Mon Sep 17 00:00:00 2001
From: Dmitry Samersoff <dsamersoff@openjdk.org>
Date: Fri, 27 May 2016 19:31:17 +0300
Subject: [PATCH 118/228] 8152950: BasicLauncherTest.java fails due to type
 error

Better handle js engine initialization error

Reviewed-by: jbachorik
---
 .../sun/jvm/hotspot/CommandProcessor.java     | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java b/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java
index 5374a5a40e6..916cb445387 100644
--- a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java
+++ b/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java
@@ -1712,7 +1712,8 @@ public class CommandProcessor {
     // called after debuggee attach
     private void postAttach() {
         // create JavaScript engine and start it
-        jsengine = new JSJavaScriptEngine() {
+        try {
+            jsengine = new JSJavaScriptEngine() {
                         private ObjectReader reader = new ObjectReader();
                         private JSJavaFactory factory = new JSJavaFactoryImpl();
                         public ObjectReader getObjectReader() {
@@ -1735,17 +1736,24 @@ public class CommandProcessor {
                             return err;
                         }
                    };
-        try {
-            jsengine.defineFunction(this,
+            try {
+                jsengine.defineFunction(this,
                      this.getClass().getMethod("registerCommand",
                                 new Class[] {
                                      String.class, String.class, String.class
                                 }));
-        } catch (NoSuchMethodException exp) {
-            // should not happen, see below...!!
-            exp.printStackTrace();
+            } catch (NoSuchMethodException exp) {
+                  // should not happen, see below...!!
+                  exp.printStackTrace();
+            }
+            jsengine.start();
+        }
+        catch (Exception ex) {
+            System.out.println("Warning! JS Engine can't start, some commands will not be available.");
+            if (verboseExceptions) {
+                ex.printStackTrace(out);
+            }
         }
-        jsengine.start();
     }
 
     public void registerCommand(String cmd, String usage, final String func) {

From 286b9675744a79c1c2cfd42d256b1a9dfbecdca9 Mon Sep 17 00:00:00 2001
From: Michail Chernov <mchernov@openjdk.org>
Date: Fri, 27 May 2016 17:48:56 +0300
Subject: [PATCH 119/228] 8157452: [TESTBUG] PLAB tests don't handle unexpected
 GC

Reviewed-by: dfazunen, tschatzl
---
 hotspot/test/gc/g1/plab/TestPLABPromotion.java |  5 +----
 hotspot/test/gc/g1/plab/TestPLABResize.java    | 10 ++++++----
 hotspot/test/gc/g1/plab/lib/LogParser.java     |  7 ++++++-
 hotspot/test/gc/g1/plab/lib/PLABUtils.java     | 17 ++++++++++++++++-
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/hotspot/test/gc/g1/plab/TestPLABPromotion.java b/hotspot/test/gc/g1/plab/TestPLABPromotion.java
index 3664897ea83..cefff072c32 100644
--- a/hotspot/test/gc/g1/plab/TestPLABPromotion.java
+++ b/hotspot/test/gc/g1/plab/TestPLABPromotion.java
@@ -122,10 +122,7 @@ public class TestPLABPromotion {
             List<String> options = PLABUtils.prepareOptions(testCase.toOptions());
             options.add(AppPLABPromotion.class.getName());
             OutputAnalyzer out = ProcessTools.executeTestJvm(options.toArray(new String[options.size()]));
-            if (out.getExitValue() != 0) {
-                System.out.println(out.getOutput());
-                throw new RuntimeException("Expect exit code 0.");
-            }
+            PLABUtils.commonCheck(out);
             output = out.getOutput();
             checkResults(testCase);
         }
diff --git a/hotspot/test/gc/g1/plab/TestPLABResize.java b/hotspot/test/gc/g1/plab/TestPLABResize.java
index f3ac2aad802..039ef53e8ed 100644
--- a/hotspot/test/gc/g1/plab/TestPLABResize.java
+++ b/hotspot/test/gc/g1/plab/TestPLABResize.java
@@ -94,10 +94,7 @@ public class TestPLABResize {
             List<String> options = PLABUtils.prepareOptions(testCase.toOptions());
             options.add(AppPLABResize.class.getName());
             OutputAnalyzer out = ProcessTools.executeTestJvm(options.toArray(new String[options.size()]));
-            if (out.getExitValue() != 0) {
-                System.out.println(out.getOutput());
-                throw new RuntimeException("Exit code is not 0");
-            }
+            PLABUtils.commonCheck(out);
             checkResults(out.getOutput(), testCase);
         }
     }
@@ -124,6 +121,11 @@ public class TestPLABResize {
         // The test case does 3 rounds of allocations.  The second round of N allocations and GC's
         // has a decreasing size of allocations so that iterations N to 2*N -1 will be of decreasing size.
         // The third round with iterations 2*N to 3*N -1 has increasing sizes of allocation.
+        if ( plabSizes.size() != testCase.iterations * 3 ) {
+            System.out.println(output);
+            throw new RuntimeException ("Expects for " + testCase.iterations * 3 + " PLAB entries in log, found " + plabSizes.size());
+        }
+
         long startDesiredPLABSize = plabSizes.get(testCase.getIterations());
         long endDesiredPLABSize = plabSizes.get(testCase.getIterations() * 2 - 1);
 
diff --git a/hotspot/test/gc/g1/plab/lib/LogParser.java b/hotspot/test/gc/g1/plab/lib/LogParser.java
index 8b70c20573f..f4e9735e63b 100644
--- a/hotspot/test/gc/g1/plab/lib/LogParser.java
+++ b/hotspot/test/gc/g1/plab/lib/LogParser.java
@@ -169,7 +169,12 @@ final public class LogParser {
      * @return
      **/
     public PlabInfo getSpecifiedStats(long specifiedGcId, LogParser.ReportType type, List<String> fieldsName) {
-        return getSpecifiedStats(Arrays.asList(specifiedGcId), type, fieldsName, true).get(specifiedGcId);
+        PlabInfo info = getSpecifiedStats(Arrays.asList(specifiedGcId), type, fieldsName, true).get(specifiedGcId);
+        if (info == null) {
+            System.out.println(log);
+            throw new RuntimeException("Cannot find PLAB statistics in log ( GC_ID=" + specifiedGcId + " type=" + type + " )");
+        }
+        return info;
     }
 
     /**
diff --git a/hotspot/test/gc/g1/plab/lib/PLABUtils.java b/hotspot/test/gc/g1/plab/lib/PLABUtils.java
index ee13f0a2fa2..096441c14cb 100644
--- a/hotspot/test/gc/g1/plab/lib/PLABUtils.java
+++ b/hotspot/test/gc/g1/plab/lib/PLABUtils.java
@@ -26,6 +26,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import jdk.test.lib.OutputAnalyzer;
 import jdk.test.lib.Utils;
 
 /**
@@ -50,7 +51,7 @@ public class PLABUtils {
      * GC logging options list.
      */
     private final static String G1_PLAB_LOGGING_OPTIONS[] = {
-        "-Xlog:gc=debug,gc+plab=debug"
+        "-Xlog:gc=debug,gc+plab=debug,gc+heap=debug"
     };
 
     /**
@@ -81,4 +82,18 @@ public class PLABUtils {
         executionOtions.addAll(options);
         return executionOtions;
     }
+
+    /**
+     * Common check for test PLAB application's results.
+     * @param out OutputAnalyzer for checking
+     * @throws RuntimeException
+     */
+    public static void commonCheck(OutputAnalyzer out) throws RuntimeException {
+        if (out.getExitValue() != 0) {
+            System.out.println(out.getOutput());
+            throw new RuntimeException("Exit code is not 0");
+        }
+        // Test expects only WhiteBox initiated GC.
+        out.shouldNotContain("Pause Young (G1 Evacuation Pause)");
+    }
 }

From acc40d57ab41b68857af70e57a5fce2552459494 Mon Sep 17 00:00:00 2001
From: Dmitry Fazunenko <dfazunen@openjdk.org>
Date: Mon, 30 May 2016 19:56:27 +0400
Subject: [PATCH 120/228] 8154096: Extend WhiteBox API with methods which
 retrieve from VM information about available GC

Reviewed-by: iignatyev, kbarrett
---
 hotspot/src/share/vm/prims/whitebox.cpp | 48 ++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/hotspot/src/share/vm/prims/whitebox.cpp b/hotspot/src/share/vm/prims/whitebox.cpp
index dc354b40ffb..a55fd6340c6 100644
--- a/hotspot/src/share/vm/prims/whitebox.cpp
+++ b/hotspot/src/share/vm/prims/whitebox.cpp
@@ -278,6 +278,49 @@ WB_ENTRY(jint, WB_StressVirtualSpaceResize(JNIEnv* env, jobject o,
                                         (size_t) magnitude, (size_t) iterations);
 WB_END
 
+static const jint serial_code   = 1;
+static const jint parallel_code = 2;
+static const jint cms_code      = 4;
+static const jint g1_code       = 8;
+
+WB_ENTRY(jint, WB_CurrentGC(JNIEnv* env, jobject o, jobject obj))
+  if (UseSerialGC) {
+    return serial_code;
+  } else if (UseParallelGC || UseParallelOldGC) {
+    return parallel_code;
+  } if (UseConcMarkSweepGC) {
+    return cms_code;
+  } else if (UseG1GC) {
+    return g1_code;
+  }
+  ShouldNotReachHere();
+  return 0;
+WB_END
+
+WB_ENTRY(jint, WB_AllSupportedGC(JNIEnv* env, jobject o, jobject obj))
+#if INCLUDE_ALL_GCS
+  return serial_code | parallel_code | cms_code | g1_code;
+#else
+  return serial_code;
+#endif // INCLUDE_ALL_GCS
+WB_END
+
+WB_ENTRY(jboolean, WB_GCSelectedByErgo(JNIEnv* env, jobject o, jobject obj))
+  if (UseSerialGC) {
+    return FLAG_IS_ERGO(UseSerialGC);
+  } else if (UseParallelGC) {
+    return FLAG_IS_ERGO(UseParallelGC);
+  } else if (UseParallelOldGC) {
+    return FLAG_IS_ERGO(UseParallelOldGC);
+  } else if (UseConcMarkSweepGC) {
+    return FLAG_IS_ERGO(UseConcMarkSweepGC);
+  } else if (UseG1GC) {
+    return FLAG_IS_ERGO(UseG1GC);
+  }
+  ShouldNotReachHere();
+  return false;
+WB_END
+
 WB_ENTRY(jboolean, WB_isObjectInOldGen(JNIEnv* env, jobject o, jobject obj))
   oop p = JNIHandles::resolve(obj);
 #if INCLUDE_ALL_GCS
@@ -1833,7 +1876,10 @@ static JNINativeMethod methods[] = {
   {CC"clearInlineCaches0",  CC"(Z)V",                 (void*)&WB_ClearInlineCaches },
   {CC"addCompilerDirective",    CC"(Ljava/lang/String;)I",
                                                       (void*)&WB_AddCompilerDirective },
-  {CC"removeCompilerDirective", CC"(I)V",             (void*)&WB_RemoveCompilerDirective },
+  {CC"removeCompilerDirective",   CC"(I)V",             (void*)&WB_RemoveCompilerDirective },
+  {CC"currentGC",                 CC"()I",            (void*)&WB_CurrentGC},
+  {CC"allSupportedGC",            CC"()I",            (void*)&WB_AllSupportedGC},
+  {CC"gcSelectedByErgo",          CC"()Z",            (void*)&WB_GCSelectedByErgo},
 };
 
 #undef CC

From e456d998a8cda3efbe92e2b102bfee0feada999b Mon Sep 17 00:00:00 2001
From: Robbin Ehn <rehn@openjdk.org>
Date: Tue, 31 May 2016 12:40:42 +0200
Subject: [PATCH 121/228] 8158150: LogConfiguration::describe output can get
 truncated

Reviewed-by: dholmes, kbarrett
---
 hotspot/src/share/vm/logging/logConfiguration.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hotspot/src/share/vm/logging/logConfiguration.cpp b/hotspot/src/share/vm/logging/logConfiguration.cpp
index f09b3b56596..922d4b53c06 100644
--- a/hotspot/src/share/vm/logging/logConfiguration.cpp
+++ b/hotspot/src/share/vm/logging/logConfiguration.cpp
@@ -415,7 +415,9 @@ void LogConfiguration::describe_available(outputStream* out){
 void LogConfiguration::describe_current_configuration(outputStream* out){
   out->print_cr("Log output configuration:");
   for (size_t i = 0; i < _n_outputs; i++) {
-    out->print("#" SIZE_FORMAT ": %s %s ", i, _outputs[i]->name(), _outputs[i]->config_string());
+    out->print("#" SIZE_FORMAT ": %s ", i, _outputs[i]->name());
+    out->print_raw(_outputs[i]->config_string());
+    out->print(" ");
     char delimiter[2] = {0};
     for (size_t d = 0; d < LogDecorators::Count; d++) {
       LogDecorators::Decorator decorator = static_cast<LogDecorators::Decorator>(d);

From 9d801b98a7f04fd760956cc334cf6785ad4d9247 Mon Sep 17 00:00:00 2001
From: Christian Tornqvist <ctornqvi@openjdk.org>
Date: Tue, 31 May 2016 15:21:56 -0400
Subject: [PATCH 122/228] 8158106: native/GTestWrapper.java gets SIGABR

Reviewed-by: lfoltan, gtriantafill
---
 hotspot/test/native/GTestWrapper.java | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/hotspot/test/native/GTestWrapper.java b/hotspot/test/native/GTestWrapper.java
index 9ba93995618..cedf63e4aa4 100644
--- a/hotspot/test/native/GTestWrapper.java
+++ b/hotspot/test/native/GTestWrapper.java
@@ -61,14 +61,11 @@ public class GTestWrapper {
             throw new Error("TESTBUG: the library has not been found in " + nativePath);
         }
         path = path.resolve("gtestLauncher" + (Platform.isWindows() ? ".exe" : ""));
-        Stream<String> launcherArgs = Stream.of(path.toString(), "-jdk",
-                System.getProperty("test.jdk"));
-        // JVM accepts only -X and -D flags
-        Stream<String> vmFLags = Arrays.stream(Utils.getTestJavaOpts())
-                                       .filter(s -> s.startsWith("-X") || s.startsWith("-D"));
-        String[] cmds = Stream.concat(launcherArgs, vmFLags)
-                              .toArray(String[]::new);
-        ProcessTools.executeCommand(cmds).shouldHaveExitValue(0);
+        ProcessTools.executeCommand(new String[] {
+                path.toString(),
+                "-jdk",
+                System.getProperty("test.jdk")
+        }).shouldHaveExitValue(0);
     }
 
     private static String getJVMVariantSubDir() {

From 737a2a59468fc8017260999ebdfe40ac719e805b Mon Sep 17 00:00:00 2001
From: Harold Seigel <hseigel@openjdk.org>
Date: Wed, 1 Jun 2016 07:44:43 -0400
Subject: [PATCH 123/228] 8158060: BasicLayerTest causes fatal error: Thread
 holding lock at safepoint that vm can block on: Module_lock

Move the exception throw outside of the block containing the lock

Reviewed-by: dholmes, kbarrett, lfoltan
---
 hotspot/src/share/vm/classfile/modules.cpp | 47 ++++++++++++----------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/hotspot/src/share/vm/classfile/modules.cpp b/hotspot/src/share/vm/classfile/modules.cpp
index 7c510bc9315..7a09f60d488 100644
--- a/hotspot/src/share/vm/classfile/modules.cpp
+++ b/hotspot/src/share/vm/classfile/modules.cpp
@@ -237,35 +237,40 @@ static void define_javabase_module(jobject module, jstring version,
   // Ensure java.base's ModuleEntry has been created
   assert(ModuleEntryTable::javabase_module() != NULL, "No ModuleEntry for java.base");
 
+  bool duplicate_javabase = false;
   {
     MutexLocker m1(Module_lock, THREAD);
 
     if (ModuleEntryTable::javabase_defined()) {
-      THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
-                "Module java.base is already defined");
-    }
+      duplicate_javabase = true;
+    } else {
 
-    // Verify that all java.base packages created during bootstrapping are in
-    // pkg_list.  If any are not in pkg_list, than a non-java.base class was
-    // loaded erroneously pre java.base module definition.
-    package_table->verify_javabase_packages(pkg_list);
+      // Verify that all java.base packages created during bootstrapping are in
+      // pkg_list.  If any are not in pkg_list, than a non-java.base class was
+      // loaded erroneously pre java.base module definition.
+      package_table->verify_javabase_packages(pkg_list);
 
-    // loop through and add any new packages for java.base
-    PackageEntry* pkg;
-    for (int x = 0; x < pkg_list->length(); x++) {
-      // Some of java.base's packages were added early in bootstrapping, ignore duplicates.
-      if (package_table->lookup_only(pkg_list->at(x)) == NULL) {
-        pkg = package_table->locked_create_entry_or_null(pkg_list->at(x), ModuleEntryTable::javabase_module());
-        assert(pkg != NULL, "Unable to create a java.base package entry");
+      // loop through and add any new packages for java.base
+      PackageEntry* pkg;
+      for (int x = 0; x < pkg_list->length(); x++) {
+        // Some of java.base's packages were added early in bootstrapping, ignore duplicates.
+        if (package_table->lookup_only(pkg_list->at(x)) == NULL) {
+          pkg = package_table->locked_create_entry_or_null(pkg_list->at(x), ModuleEntryTable::javabase_module());
+          assert(pkg != NULL, "Unable to create a java.base package entry");
+        }
+        // Unable to have a GrowableArray of TempNewSymbol.  Must decrement the refcount of
+        // the Symbol* that was created above for each package. The refcount was incremented
+        // by SymbolTable::new_symbol and as well by the PackageEntry creation.
+        pkg_list->at(x)->decrement_refcount();
       }
-      // Unable to have a GrowableArray of TempNewSymbol.  Must decrement the refcount of
-      // the Symbol* that was created above for each package. The refcount was incremented
-      // by SymbolTable::new_symbol and as well by the PackageEntry creation.
-      pkg_list->at(x)->decrement_refcount();
-    }
 
-    // Finish defining java.base's ModuleEntry
-    ModuleEntryTable::finalize_javabase(module_handle, version_symbol, location_symbol);
+      // Finish defining java.base's ModuleEntry
+      ModuleEntryTable::finalize_javabase(module_handle, version_symbol, location_symbol);
+    }
+  }
+  if (duplicate_javabase) {
+    THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
+              "Module java.base is already defined");
   }
 
   log_debug(modules)("define_javabase_module(): Definition of module: java.base,"

From 1fae073d9c29f32375d64f1f9c2e8124a702cc5b Mon Sep 17 00:00:00 2001
From: Harold Seigel <hseigel@openjdk.org>
Date: Wed, 1 Jun 2016 11:14:58 -0400
Subject: [PATCH 124/228] 8156156: Add module specific NMT MemoryType

Change NMT tag for allocations for modules support to mtModule

Reviewed-by: coleenp, lfoltan, gtriantafill
---
 hotspot/src/share/vm/classfile/classLoader.cpp   |  6 +++---
 hotspot/src/share/vm/classfile/javaClasses.cpp   |  2 +-
 hotspot/src/share/vm/classfile/moduleEntry.cpp   |  8 ++++----
 hotspot/src/share/vm/classfile/moduleEntry.hpp   | 14 +++++++-------
 hotspot/src/share/vm/classfile/modules.cpp       |  2 +-
 hotspot/src/share/vm/classfile/packageEntry.cpp  |  8 ++++----
 hotspot/src/share/vm/classfile/packageEntry.hpp  | 14 +++++++-------
 hotspot/src/share/vm/memory/allocation.hpp       |  7 ++++---
 hotspot/src/share/vm/services/nmtCommon.cpp      |  3 ++-
 hotspot/src/share/vm/utilities/hashtable.cpp     |  1 +
 hotspot/test/runtime/NMT/PrintNMTStatistics.java |  5 ++++-
 11 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/hotspot/src/share/vm/classfile/classLoader.cpp b/hotspot/src/share/vm/classfile/classLoader.cpp
index d77aef277eb..12858cccf28 100644
--- a/hotspot/src/share/vm/classfile/classLoader.cpp
+++ b/hotspot/src/share/vm/classfile/classLoader.cpp
@@ -657,7 +657,7 @@ void ClassLoader::setup_xpatch_entries() {
   int num_of_entries = xpatch_args->length();
 
   // Set up the boot loader's xpatch_entries list
-  _xpatch_entries = new (ResourceObj::C_HEAP, mtInternal) GrowableArray<ModuleClassPathList*>(num_of_entries, true);
+  _xpatch_entries = new (ResourceObj::C_HEAP, mtModule) GrowableArray<ModuleClassPathList*>(num_of_entries, true);
 
   for (int i = 0; i < num_of_entries; i++) {
     const char* module_name = (xpatch_args->at(i))->module_name();
@@ -1069,9 +1069,9 @@ void ClassLoader::initialize_module_loader_map(JImageFile* jimage) {
   char* begin_ptr = char_buf;
   char* end_ptr = strchr(begin_ptr, '\n');
   bool process_boot_modules = false;
-  _boot_modules_array = new (ResourceObj::C_HEAP, mtInternal)
+  _boot_modules_array = new (ResourceObj::C_HEAP, mtModule)
     GrowableArray<char*>(INITIAL_BOOT_MODULES_ARRAY_SIZE, true);
-  _platform_modules_array = new (ResourceObj::C_HEAP, mtInternal)
+  _platform_modules_array = new (ResourceObj::C_HEAP, mtModule)
     GrowableArray<char*>(INITIAL_PLATFORM_MODULES_ARRAY_SIZE, true);
   while (end_ptr != NULL && (end_ptr - char_buf) < buflen) {
     // Allocate a buffer from the C heap to be appended to the _boot_modules_array
diff --git a/hotspot/src/share/vm/classfile/javaClasses.cpp b/hotspot/src/share/vm/classfile/javaClasses.cpp
index b99c918996d..4c24c7349c0 100644
--- a/hotspot/src/share/vm/classfile/javaClasses.cpp
+++ b/hotspot/src/share/vm/classfile/javaClasses.cpp
@@ -848,7 +848,7 @@ void java_lang_Class::create_mirror(KlassHandle k, Handle class_loader,
     if (!ModuleEntryTable::javabase_defined()) {
       if (fixup_module_field_list() == NULL) {
         GrowableArray<Klass*>* list =
-          new (ResourceObj::C_HEAP, mtClass) GrowableArray<Klass*>(500, true);
+          new (ResourceObj::C_HEAP, mtModule) GrowableArray<Klass*>(500, true);
         set_fixup_module_field_list(list);
       }
       k->class_loader_data()->inc_keep_alive();
diff --git a/hotspot/src/share/vm/classfile/moduleEntry.cpp b/hotspot/src/share/vm/classfile/moduleEntry.cpp
index f26b95ab690..6d31b8210b6 100644
--- a/hotspot/src/share/vm/classfile/moduleEntry.cpp
+++ b/hotspot/src/share/vm/classfile/moduleEntry.cpp
@@ -113,7 +113,7 @@ void ModuleEntry::add_read(ModuleEntry* m) {
   } else {
     if (_reads == NULL) {
       // Lazily create a module's reads list
-      _reads = new (ResourceObj::C_HEAP, mtClass)GrowableArray<ModuleEntry*>(MODULE_READS_SIZE, true);
+      _reads = new (ResourceObj::C_HEAP, mtModule)GrowableArray<ModuleEntry*>(MODULE_READS_SIZE, true);
     }
     _reads->append_if_missing(m);
   }
@@ -159,7 +159,7 @@ void ModuleEntry::delete_reads() {
 }
 
 ModuleEntryTable::ModuleEntryTable(int table_size)
-  : Hashtable<Symbol*, mtClass>(table_size, sizeof(ModuleEntry)), _unnamed_module(NULL)
+  : Hashtable<Symbol*, mtModule>(table_size, sizeof(ModuleEntry)), _unnamed_module(NULL)
 {
 }
 
@@ -228,7 +228,7 @@ ModuleEntry* ModuleEntryTable::new_entry(unsigned int hash, Handle module_handle
                                          Symbol* version, Symbol* location,
                                          ClassLoaderData* loader_data) {
   assert_locked_or_safepoint(Module_lock);
-  ModuleEntry* entry = (ModuleEntry*) NEW_C_HEAP_ARRAY(char, entry_size(), mtClass);
+  ModuleEntry* entry = (ModuleEntry*) NEW_C_HEAP_ARRAY(char, entry_size(), mtModule);
 
   // Initialize everything BasicHashtable would
   entry->set_next(NULL);
@@ -259,7 +259,7 @@ ModuleEntry* ModuleEntryTable::new_entry(unsigned int hash, Handle module_handle
 
 void ModuleEntryTable::add_entry(int index, ModuleEntry* new_entry) {
   assert_locked_or_safepoint(Module_lock);
-  Hashtable<Symbol*, mtClass>::add_entry(index, (HashtableEntry<Symbol*, mtClass>*)new_entry);
+  Hashtable<Symbol*, mtModule>::add_entry(index, (HashtableEntry<Symbol*, mtModule>*)new_entry);
 }
 
 ModuleEntry* ModuleEntryTable::locked_create_entry_or_null(Handle module_handle,
diff --git a/hotspot/src/share/vm/classfile/moduleEntry.hpp b/hotspot/src/share/vm/classfile/moduleEntry.hpp
index 87accbeab41..9b68c01d424 100644
--- a/hotspot/src/share/vm/classfile/moduleEntry.hpp
+++ b/hotspot/src/share/vm/classfile/moduleEntry.hpp
@@ -49,7 +49,7 @@ class ModuleClosure;
 //
 // The Mutex Module_lock is shared between ModuleEntry and PackageEntry, to lock either
 // data structure.
-class ModuleEntry : public HashtableEntry<Symbol*, mtClass> {
+class ModuleEntry : public HashtableEntry<Symbol*, mtModule> {
 private:
   jobject _module;                     // java.lang.reflect.Module
   jobject _pd;                         // java.security.ProtectionDomain, cached
@@ -127,10 +127,10 @@ public:
   }
 
   ModuleEntry* next() const {
-    return (ModuleEntry*)HashtableEntry<Symbol*, mtClass>::next();
+    return (ModuleEntry*)HashtableEntry<Symbol*, mtModule>::next();
   }
   ModuleEntry** next_addr() {
-    return (ModuleEntry**)HashtableEntry<Symbol*, mtClass>::next_addr();
+    return (ModuleEntry**)HashtableEntry<Symbol*, mtModule>::next_addr();
   }
 
   // iteration support for readability
@@ -166,7 +166,7 @@ class ModuleClosure: public StackObj {
 //
 // The ModuleEntryTable's lookup is lock free.
 //
-class ModuleEntryTable : public Hashtable<Symbol*, mtClass> {
+class ModuleEntryTable : public Hashtable<Symbol*, mtModule> {
   friend class VMStructs;
 public:
   enum Constants {
@@ -181,10 +181,10 @@ private:
                          Symbol* location, ClassLoaderData* class_loader);
   void add_entry(int index, ModuleEntry* new_entry);
 
-  int entry_size() const { return BasicHashtable<mtClass>::entry_size(); }
+  int entry_size() const { return BasicHashtable<mtModule>::entry_size(); }
 
   ModuleEntry** bucket_addr(int i) {
-    return (ModuleEntry**)Hashtable<Symbol*, mtClass>::bucket_addr(i);
+    return (ModuleEntry**)Hashtable<Symbol*, mtModule>::bucket_addr(i);
   }
 
   static unsigned int compute_hash(Symbol* name) { return ((name == NULL) ? 0 : (unsigned int)(name->identity_hash())); }
@@ -195,7 +195,7 @@ public:
   ~ModuleEntryTable();
 
   ModuleEntry* bucket(int i) {
-    return (ModuleEntry*)Hashtable<Symbol*, mtClass>::bucket(i);
+    return (ModuleEntry*)Hashtable<Symbol*, mtModule>::bucket(i);
   }
 
   // Create module in loader's module entry table, if already exists then
diff --git a/hotspot/src/share/vm/classfile/modules.cpp b/hotspot/src/share/vm/classfile/modules.cpp
index 7a09f60d488..313310047b3 100644
--- a/hotspot/src/share/vm/classfile/modules.cpp
+++ b/hotspot/src/share/vm/classfile/modules.cpp
@@ -145,7 +145,7 @@ static void add_to_exploded_build_list(char *module_name, TRAPS) {
 
   const char* home = Arguments::get_java_home();
   size_t len = strlen(home) + module_len + 32;
-  char* path = NEW_C_HEAP_ARRAY(char, len, mtInternal);
+  char* path = NEW_C_HEAP_ARRAY(char, len, mtModule);
   jio_snprintf(path, len, "%s%cmodules%c%s", home, file_sep, file_sep, module_name);
   struct stat st;
   // See if exploded module path exists
diff --git a/hotspot/src/share/vm/classfile/packageEntry.cpp b/hotspot/src/share/vm/classfile/packageEntry.cpp
index ec6d4d08428..e6257ded3e6 100644
--- a/hotspot/src/share/vm/classfile/packageEntry.cpp
+++ b/hotspot/src/share/vm/classfile/packageEntry.cpp
@@ -57,7 +57,7 @@ void PackageEntry::add_qexport(ModuleEntry* m) {
     // Lazily create a package's qualified exports list.
     // Initial size is small, do not anticipate export lists to be large.
     _qualified_exports =
-      new (ResourceObj::C_HEAP, mtClass) GrowableArray<ModuleEntry*>(QUAL_EXP_SIZE, true);
+      new (ResourceObj::C_HEAP, mtModule) GrowableArray<ModuleEntry*>(QUAL_EXP_SIZE, true);
   }
   _qualified_exports->append_if_missing(m);
 }
@@ -124,7 +124,7 @@ void PackageEntry::delete_qualified_exports() {
 }
 
 PackageEntryTable::PackageEntryTable(int table_size)
-  : Hashtable<Symbol*, mtClass>(table_size, sizeof(PackageEntry))
+  : Hashtable<Symbol*, mtModule>(table_size, sizeof(PackageEntry))
 {
 }
 
@@ -155,7 +155,7 @@ PackageEntryTable::~PackageEntryTable() {
 
 PackageEntry* PackageEntryTable::new_entry(unsigned int hash, Symbol* name, ModuleEntry* module) {
   assert_locked_or_safepoint(Module_lock);
-  PackageEntry* entry = (PackageEntry*) NEW_C_HEAP_ARRAY(char, entry_size(), mtClass);
+  PackageEntry* entry = (PackageEntry*) NEW_C_HEAP_ARRAY(char, entry_size(), mtModule);
 
   // Initialize everything BasicHashtable would
   entry->set_next(NULL);
@@ -178,7 +178,7 @@ PackageEntry* PackageEntryTable::new_entry(unsigned int hash, Symbol* name, Modu
 
 void PackageEntryTable::add_entry(int index, PackageEntry* new_entry) {
   assert_locked_or_safepoint(Module_lock);
-  Hashtable<Symbol*, mtClass>::add_entry(index, (HashtableEntry<Symbol*, mtClass>*)new_entry);
+  Hashtable<Symbol*, mtModule>::add_entry(index, (HashtableEntry<Symbol*, mtModule>*)new_entry);
 }
 
 // Create package in loader's package entry table and return the entry.
diff --git a/hotspot/src/share/vm/classfile/packageEntry.hpp b/hotspot/src/share/vm/classfile/packageEntry.hpp
index 00b7b9d160f..1d98baff8cb 100644
--- a/hotspot/src/share/vm/classfile/packageEntry.hpp
+++ b/hotspot/src/share/vm/classfile/packageEntry.hpp
@@ -47,7 +47,7 @@
 //
 // The Mutex Module_lock is shared between ModuleEntry and PackageEntry, to lock either
 // data structure.
-class PackageEntry : public HashtableEntry<Symbol*, mtClass> {
+class PackageEntry : public HashtableEntry<Symbol*, mtModule> {
 private:
   ModuleEntry* _module;
   // Used to indicate for packages with classes loaded by the boot loader that
@@ -129,11 +129,11 @@ public:
   void add_qexport(ModuleEntry* m);
 
   PackageEntry* next() const {
-    return (PackageEntry*)HashtableEntry<Symbol*, mtClass>::next();
+    return (PackageEntry*)HashtableEntry<Symbol*, mtModule>::next();
   }
 
   PackageEntry** next_addr() {
-    return (PackageEntry**)HashtableEntry<Symbol*, mtClass>::next_addr();
+    return (PackageEntry**)HashtableEntry<Symbol*, mtModule>::next_addr();
   }
 
   // iteration of qualified exports
@@ -153,7 +153,7 @@ public:
 // by a particular class loader.  Each package is represented as a PackageEntry node.
 // The PackageEntryTable's lookup is lock free.
 //
-class PackageEntryTable : public Hashtable<Symbol*, mtClass> {
+class PackageEntryTable : public Hashtable<Symbol*, mtModule> {
   friend class VMStructs;
 public:
   enum Constants {
@@ -164,10 +164,10 @@ private:
   PackageEntry* new_entry(unsigned int hash, Symbol* name, ModuleEntry* module);
   void add_entry(int index, PackageEntry* new_entry);
 
-  int entry_size() const { return BasicHashtable<mtClass>::entry_size(); }
+  int entry_size() const { return BasicHashtable<mtModule>::entry_size(); }
 
   PackageEntry** bucket_addr(int i) {
-    return (PackageEntry**)Hashtable<Symbol*, mtClass>::bucket_addr(i);
+    return (PackageEntry**)Hashtable<Symbol*, mtModule>::bucket_addr(i);
   }
 
   static unsigned int compute_hash(Symbol* name) { return (unsigned int)(name->identity_hash()); }
@@ -178,7 +178,7 @@ public:
   ~PackageEntryTable();
 
   PackageEntry* bucket(int i) {
-    return (PackageEntry*)Hashtable<Symbol*, mtClass>::bucket(i);
+    return (PackageEntry*)Hashtable<Symbol*, mtModule>::bucket(i);
   }
 
   // Create package in loader's package entry table and return the entry.
diff --git a/hotspot/src/share/vm/memory/allocation.hpp b/hotspot/src/share/vm/memory/allocation.hpp
index ec0e53977d6..5d9e7c830f6 100644
--- a/hotspot/src/share/vm/memory/allocation.hpp
+++ b/hotspot/src/share/vm/memory/allocation.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -144,8 +144,9 @@ enum MemoryType {
   mtTracing           = 0x0E,  // memory used for Tracing
   mtLogging           = 0x0F,  // memory for logging
   mtArguments         = 0x10,  // memory for argument processing
-  mtNone              = 0x11,  // undefined
-  mt_number_of_types  = 0x12   // number of memory types (mtDontTrack
+  mtModule            = 0x11,  // memory for module processing
+  mtNone              = 0x12,  // undefined
+  mt_number_of_types  = 0x13   // number of memory types (mtDontTrack
                                  // is not included as validate type)
 };
 
diff --git a/hotspot/src/share/vm/services/nmtCommon.cpp b/hotspot/src/share/vm/services/nmtCommon.cpp
index 8633bbe301e..c1ec5c6971e 100644
--- a/hotspot/src/share/vm/services/nmtCommon.cpp
+++ b/hotspot/src/share/vm/services/nmtCommon.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@ const char* NMTUtil::_memory_type_names[] = {
   "Tracing",
   "Logging",
   "Arguments",
+  "Module",
   "Unknown"
 };
 
diff --git a/hotspot/src/share/vm/utilities/hashtable.cpp b/hotspot/src/share/vm/utilities/hashtable.cpp
index 8af6156ed45..2d4bd0b83e4 100644
--- a/hotspot/src/share/vm/utilities/hashtable.cpp
+++ b/hotspot/src/share/vm/utilities/hashtable.cpp
@@ -383,6 +383,7 @@ template class BasicHashtable<mtClassShared>;
 template class BasicHashtable<mtSymbol>;
 template class BasicHashtable<mtCode>;
 template class BasicHashtable<mtInternal>;
+template class BasicHashtable<mtModule>;
 #if INCLUDE_TRACE
 template class Hashtable<Symbol*, mtTracing>;
 template class HashtableEntry<Symbol*, mtTracing>;
diff --git a/hotspot/test/runtime/NMT/PrintNMTStatistics.java b/hotspot/test/runtime/NMT/PrintNMTStatistics.java
index 413ade55e80..11138ec0d48 100644
--- a/hotspot/test/runtime/NMT/PrintNMTStatistics.java
+++ b/hotspot/test/runtime/NMT/PrintNMTStatistics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,6 +48,9 @@ public class PrintNMTStatistics {
     output_detail.shouldNotContain("error");
     output_detail.shouldHaveExitValue(0);
 
+    // Make sure memory reserved for Module processing is recorded.
+    output_detail.shouldContain(" Module (reserved=");
+
     ProcessBuilder pb1 = ProcessTools.createJavaProcessBuilder(
       "-XX:+UnlockDiagnosticVMOptions",
       "-XX:+PrintNMTStatistics",

From 618f5131e695fb9d9ec208e311dc941b0ea9f3ee Mon Sep 17 00:00:00 2001
From: Goetz Lindenmaier <goetz@openjdk.org>
Date: Fri, 13 May 2016 15:20:06 +0200
Subject: [PATCH 125/228] 8156922: [ppc] Implement template interpreter stack
 overflow checks as on x86/sparc

Reviewed-by: dlong, dholmes, simonis, coleenp
---
 .../vm/templateInterpreterGenerator_ppc.cpp   | 53 ++++++++++++++++---
 hotspot/src/share/vm/runtime/os.cpp           |  8 ++-
 hotspot/src/share/vm/runtime/thread.hpp       |  9 ++--
 3 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/hotspot/src/cpu/ppc/vm/templateInterpreterGenerator_ppc.cpp b/hotspot/src/cpu/ppc/vm/templateInterpreterGenerator_ppc.cpp
index 386990690a7..11690a1ddf7 100644
--- a/hotspot/src/cpu/ppc/vm/templateInterpreterGenerator_ppc.cpp
+++ b/hotspot/src/cpu/ppc/vm/templateInterpreterGenerator_ppc.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2015 SAP SE. All rights reserved.
+ * Copyright (c) 2015, 2016 SAP SE. 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
@@ -562,10 +562,16 @@ address TemplateInterpreterGenerator::generate_Reference_get_entry(void) {
   return NULL;
 }
 
-// Actually we should never reach here since we do stack overflow checks before pushing any frame.
 address TemplateInterpreterGenerator::generate_StackOverflowError_handler() {
   address entry = __ pc();
-  __ unimplemented("generate_StackOverflowError_handler");
+
+  // Expression stack must be empty before entering the VM if an
+  // exception happened.
+  __ empty_expression_stack();
+  // Throw exception.
+  __ call_VM(noreg,
+             CAST_FROM_FN_PTR(address,
+                              InterpreterRuntime::throw_StackOverflowError));
   return entry;
 }
 
@@ -944,7 +950,7 @@ void TemplateInterpreterGenerator::lock_method(Register Rflags, Register Rscratc
 // The top most frame needs an abi space of 112 bytes. This space is needed,
 // since we call to c. The c function may spill their arguments to the caller
 // frame. When we call to java, we don't need these spill slots. In order to save
-// space on the stack, we resize the caller. However, java local reside in
+// space on the stack, we resize the caller. However, java locals reside in
 // the caller frame and the frame has to be increased. The frame_size for the
 // current frame was calculated based on max_stack as size for the expression
 // stack. At the call, just a part of the expression stack might be used.
@@ -1007,7 +1013,7 @@ void TemplateInterpreterGenerator::generate_fixed_frame(bool native_call, Regist
   // parent_frame_resize = (locals-parameters) - (ESP-SP-ABI48) Rounded to frame alignment size.
   // Enlarge by locals-parameters (not in case of native_call), shrink by ESP-SP-ABI48.
 
-  {
+  if (!native_call) {
     // --------------------------------------------------------------------------
     // Stack overflow check
 
@@ -1047,7 +1053,7 @@ void TemplateInterpreterGenerator::generate_fixed_frame(bool native_call, Regist
   __ addi(R26_monitor, R1_SP, - frame::ijava_state_size);
   __ addi(R15_esp, R26_monitor, - Interpreter::stackElementSize);
 
-  // Get mirror and store it in the frame as GC root for this Method*
+  // Get mirror and store it in the frame as GC root for this Method*.
   __ load_mirror(R12_scratch2, R19_method);
 
   // Store values.
@@ -1133,6 +1139,29 @@ address TemplateInterpreterGenerator::generate_math_entry(AbstractInterpreter::M
   return entry;
 }
 
+void TemplateInterpreterGenerator::bang_stack_shadow_pages(bool native_call) {
+  // Quick & dirty stack overflow checking: bang the stack & handle trap.
+  // Note that we do the banging after the frame is setup, since the exception
+  // handling code expects to find a valid interpreter frame on the stack.
+  // Doing the banging earlier fails if the caller frame is not an interpreter
+  // frame.
+  // (Also, the exception throwing code expects to unlock any synchronized
+  // method receiever, so do the banging after locking the receiver.)
+
+  // Bang each page in the shadow zone. We can't assume it's been done for
+  // an interpreter frame with greater than a page of locals, so each page
+  // needs to be checked.  Only true for non-native.
+  if (UseStackBanging) {
+    const int page_size = os::vm_page_size();
+    const int n_shadow_pages = ((int)JavaThread::stack_shadow_zone_size()) / page_size;
+    const int start_page = native_call ? n_shadow_pages : 1;
+    BLOCK_COMMENT("bang_stack_shadow_pages:");
+    for (int pages = start_page; pages <= n_shadow_pages; pages++) {
+      __ bang_stack_with_offset(pages*page_size);
+    }
+  }
+}
+
 // Interpreter stub for calling a native method. (asm interpreter)
 // This sets up a somewhat different looking stack for calling the
 // native method than the typical interpreter frame setup.
@@ -1156,7 +1185,7 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   // This is not a full-blown interpreter frame, but in particular, the
   // following registers are valid after this:
   // - R19_method
-  // - R18_local (points to start of argumuments to native function)
+  // - R18_local (points to start of arguments to native function)
   //
   //   abstract stack (grows up)
   //     [  IJava (caller of JNI callee)  ]  <-- ASP
@@ -1207,6 +1236,11 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
     generate_counter_incr(&invocation_counter_overflow, NULL, NULL);
 
     BIND(continue_after_compile);
+  }
+
+  bang_stack_shadow_pages(true);
+
+  if (inc_counter) {
     // Reset the _do_not_unlock_if_synchronized flag.
     if (synchronized) {
       __ li(R0, 0);
@@ -1595,6 +1629,7 @@ address TemplateInterpreterGenerator::generate_normal_entry(bool synchronized) {
   Register Rsize_of_parameters = R4_ARG2, // Written by generate_fixed_frame.
            Rsize_of_locals     = R5_ARG3; // Written by generate_fixed_frame.
 
+  // Does also a stack check to assure this frame fits on the stack.
   generate_fixed_frame(false, Rsize_of_parameters, Rsize_of_locals);
 
   // --------------------------------------------------------------------------
@@ -1651,7 +1686,11 @@ address TemplateInterpreterGenerator::generate_normal_entry(bool synchronized) {
     }
 
     __ bind(profile_method_continue);
+  }
 
+  bang_stack_shadow_pages(false);
+
+  if (inc_counter || ProfileInterpreter) {
     // Reset the _do_not_unlock_if_synchronized flag.
     if (synchronized) {
       __ li(R0, 0);
diff --git a/hotspot/src/share/vm/runtime/os.cpp b/hotspot/src/share/vm/runtime/os.cpp
index ec103436269..8acc60b24b2 100644
--- a/hotspot/src/share/vm/runtime/os.cpp
+++ b/hotspot/src/share/vm/runtime/os.cpp
@@ -1336,12 +1336,10 @@ bool os::stack_shadow_pages_available(Thread *thread, const methodHandle& method
   const int framesize_in_bytes =
     Interpreter::size_top_interpreter_activation(method()) * wordSize;
 
-  assert((thread->stack_base() - thread->stack_size()) +
-         (JavaThread::stack_guard_zone_size() +
-          JavaThread::stack_shadow_zone_size() + framesize_in_bytes) ==
-         ((JavaThread*)thread)->stack_overflow_limit() + framesize_in_bytes, "sanity");
+  address limit = ((JavaThread*)thread)->stack_end() +
+                  (JavaThread::stack_guard_zone_size() + JavaThread::stack_shadow_zone_size());
 
-  return (sp > ((JavaThread*)thread)->stack_overflow_limit() + framesize_in_bytes);
+  return sp > (limit + framesize_in_bytes);
 }
 
 size_t os::page_size_for_region(size_t region_size, size_t min_pages, bool must_be_aligned) {
diff --git a/hotspot/src/share/vm/runtime/thread.hpp b/hotspot/src/share/vm/runtime/thread.hpp
index a2e5a6e848b..46828d4cab2 100644
--- a/hotspot/src/share/vm/runtime/thread.hpp
+++ b/hotspot/src/share/vm/runtime/thread.hpp
@@ -1371,10 +1371,10 @@ class JavaThread: public Thread {
   //  |  reserved pages                      |
   //  |                                      |
   //  --  <-- stack_reserved_zone_base()    ---      ---
-  //                                                 /|\  shadow
+  //                                                 /|\  shadow     <--  stack_overflow_limit() (somewhere in here)
   //                                                  |   zone
   //                                                 \|/  size
-  //  some untouched memory                          ---         <--  stack_overflow_limit()
+  //  some untouched memory                          ---
   //
   //
   //  --
@@ -1522,9 +1522,8 @@ class JavaThread: public Thread {
 
   address stack_overflow_limit() { return _stack_overflow_limit; }
   void set_stack_overflow_limit() {
-    _stack_overflow_limit = stack_end() +
-                            (JavaThread::stack_guard_zone_size() +
-                             JavaThread::stack_shadow_zone_size());
+    _stack_overflow_limit =
+      stack_end() + MAX2(JavaThread::stack_guard_zone_size(), JavaThread::stack_shadow_zone_size());
   }
 
   // Misc. accessors/mutators

From 33bb9220fc7d003d9fdaa4c9b216406f5ea9f163 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 17 May 2016 22:28:00 +0300
Subject: [PATCH 126/228] 8157171: Hook up Unsafe.weakCompareAndSetVolatile to
 VarHandles

Reviewed-by: psandoz, redestad
---
 .../lang/invoke/X-VarHandle.java.template     |  9 +--
 .../X-VarHandleByteArrayView.java.template    |  6 +-
 .../VarHandles/VarHandleTestAccessInt.java    | 53 ++++++++++---
 .../VarHandles/VarHandleTestAccessLong.java   | 53 ++++++++++---
 .../VarHandles/VarHandleTestAccessString.java | 53 ++++++++++---
 .../VarHandleTestMethodHandleAccessInt.java   | 48 +++++++++---
 .../VarHandleTestMethodHandleAccessLong.java  | 48 +++++++++---
 ...VarHandleTestMethodHandleAccessString.java | 48 +++++++++---
 .../X-VarHandleTestAccess.java.template       | 74 ++++++++++++++++---
 ...HandleTestMethodHandleAccess.java.template | 48 +++++++++---
 10 files changed, 358 insertions(+), 82 deletions(-)

diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template b/jdk/src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template
index 17858a35c94..ebb6dd31b79 100644
--- a/jdk/src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template
@@ -165,8 +165,7 @@ final class VarHandle$Type$s {
 
         @ForceInline
         static boolean weakCompareAndSetVolatile(FieldInstanceReadWrite handle, Object holder, $type$ expected, $type$ value) {
-            // TODO defer to strong form until new Unsafe method is added
-            return UNSAFE.compareAndSwap$Type$(Objects.requireNonNull(handle.receiverType.cast(holder)),
+            return UNSAFE.weakCompareAndSwap$Type$Volatile(Objects.requireNonNull(handle.receiverType.cast(holder)),
                                                handle.fieldOffset,
                                                {#if[Object]?handle.fieldType.cast(expected):expected},
                                                {#if[Object]?handle.fieldType.cast(value):value});
@@ -347,8 +346,7 @@ final class VarHandle$Type$s {
 
         @ForceInline
         static boolean weakCompareAndSetVolatile(FieldStaticReadWrite handle, $type$ expected, $type$ value) {
-            // TODO defer to strong form until new Unsafe method is added
-            return UNSAFE.compareAndSwap$Type$(handle.base,
+            return UNSAFE.weakCompareAndSwap$Type$Volatile(handle.base,
                                                handle.fieldOffset,
                                                {#if[Object]?handle.fieldType.cast(expected):expected},
                                                {#if[Object]?handle.fieldType.cast(value):value});
@@ -583,8 +581,7 @@ final class VarHandle$Type$s {
 #else[Object]
             $type$[] array = ($type$[]) oarray;
 #end[Object]
-            // TODO defer to strong form until new Unsafe method is added
-            return UNSAFE.compareAndSwap$Type$(array,
+            return UNSAFE.weakCompareAndSwap$Type$Volatile(array,
                     (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
                     {#if[Object]?handle.componentType.cast(expected):expected},
                     {#if[Object]?handle.componentType.cast(value):value});
diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template b/jdk/src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template
index e3051a5cde8..a24e6c82186 100644
--- a/jdk/src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template
@@ -234,8 +234,7 @@ final class VarHandleByteArrayAs$Type$s extends VarHandleByteArrayBase {
         @ForceInline
         static boolean weakCompareAndSetVolatile(ArrayHandle handle, Object oba, int index, $type$ expected, $type$ value) {
             byte[] ba = (byte[]) oba;
-            // TODO defer to strong form until new Unsafe method is added
-            return UNSAFE.compareAndSwap$RawType$(
+            return UNSAFE.weakCompareAndSwap$RawType$Volatile(
                     ba,
                     address(ba, index(ba, index)),
                     convEndian(handle.be, expected), convEndian(handle.be, value));
@@ -467,8 +466,7 @@ final class VarHandleByteArrayAs$Type$s extends VarHandleByteArrayBase {
         @ForceInline
         static boolean weakCompareAndSetVolatile(ByteBufferHandle handle, Object obb, int index, $type$ expected, $type$ value) {
             ByteBuffer bb = (ByteBuffer) obb;
-            // TODO defer to strong form until new Unsafe method is added
-            return UNSAFE.compareAndSwap$RawType$(
+            return UNSAFE.weakCompareAndSwap$RawType$Volatile(
                     UNSAFE.getObject(bb, BYTE_BUFFER_HB),
                     address(bb, indexRO(bb, index)),
                     convEndian(handle.be, expected), convEndian(handle.be, value));
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java
index 8f58d08ec35..3adb9b83fa7 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java
@@ -105,6 +105,7 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.COMPARE_AND_EXCHANGE_ACQUIRE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.COMPARE_AND_EXCHANGE_RELEASE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET));
+        assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_VOLATILE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_ACQUIRE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_SET));
@@ -431,12 +432,22 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
             assertEquals(x, 2, "weakCompareAndSetRelease int");
         }
 
+        {
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSetVolatile(recv, 2, 1);
+            }
+            assertEquals(success, true, "weakCompareAndSetVolatile int");
+            int x = (int) vh.get(recv);
+            assertEquals(x, 1, "weakCompareAndSetVolatile int value");
+        }
+
         // Compare set and get
         {
-            int o = (int) vh.getAndSet(recv, 1);
-            assertEquals(o, 2, "getAndSet int");
+            int o = (int) vh.getAndSet(recv, 2);
+            assertEquals(o, 1, "getAndSet int");
             int x = (int) vh.get(recv);
-            assertEquals(x, 1, "getAndSet int value");
+            assertEquals(x, 2, "getAndSet int value");
         }
 
         vh.set(recv, 1);
@@ -574,12 +585,22 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
             assertEquals(x, 2, "weakCompareAndSetRelease int");
         }
 
+        {
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSetRelease(2, 1);
+            }
+            assertEquals(success, true, "weakCompareAndSetVolatile int");
+            int x = (int) vh.get();
+            assertEquals(x, 1, "weakCompareAndSetVolatile int");
+        }
+
         // Compare set and get
         {
-            int o = (int) vh.getAndSet( 1);
-            assertEquals(o, 2, "getAndSet int");
+            int o = (int) vh.getAndSet(2);
+            assertEquals(o, 1, "getAndSet int");
             int x = (int) vh.get();
-            assertEquals(x, 1, "getAndSet int value");
+            assertEquals(x, 2, "getAndSet int value");
         }
 
         vh.set(1);
@@ -720,12 +741,22 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
                 assertEquals(x, 2, "weakCompareAndSetRelease int");
             }
 
+            {
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = vh.weakCompareAndSetVolatile(array, i, 2, 1);
+                }
+                assertEquals(success, true, "weakCompareAndSetVolatile int");
+                int x = (int) vh.get(array, i);
+                assertEquals(x, 1, "weakCompareAndSetVolatile int");
+            }
+
             // Compare set and get
             {
-                int o = (int) vh.getAndSet(array, i, 1);
-                assertEquals(o, 2, "getAndSet int");
+                int o = (int) vh.getAndSet(array, i, 2);
+                assertEquals(o, 1, "getAndSet int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, 1, "getAndSet int value");
+                assertEquals(x, 2, "getAndSet int value");
             }
 
             vh.set(array, i, 1);
@@ -805,6 +836,10 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
                 boolean r = vh.weakCompareAndSet(array, ci, 1, 2);
             });
 
+            checkIOOBE(() -> {
+                boolean r = vh.weakCompareAndSetVolatile(array, ci, 1, 2);
+            });
+
             checkIOOBE(() -> {
                 boolean r = vh.weakCompareAndSetAcquire(array, ci, 1, 2);
             });
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java
index 5643a0d6def..9afb2de8320 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java
@@ -105,6 +105,7 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.COMPARE_AND_EXCHANGE_ACQUIRE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.COMPARE_AND_EXCHANGE_RELEASE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET));
+        assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_VOLATILE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_ACQUIRE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_SET));
@@ -431,12 +432,22 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
             assertEquals(x, 2L, "weakCompareAndSetRelease long");
         }
 
+        {
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSetVolatile(recv, 2L, 1L);
+            }
+            assertEquals(success, true, "weakCompareAndSetVolatile long");
+            long x = (long) vh.get(recv);
+            assertEquals(x, 1L, "weakCompareAndSetVolatile long value");
+        }
+
         // Compare set and get
         {
-            long o = (long) vh.getAndSet(recv, 1L);
-            assertEquals(o, 2L, "getAndSet long");
+            long o = (long) vh.getAndSet(recv, 2L);
+            assertEquals(o, 1L, "getAndSet long");
             long x = (long) vh.get(recv);
-            assertEquals(x, 1L, "getAndSet long value");
+            assertEquals(x, 2L, "getAndSet long value");
         }
 
         vh.set(recv, 1L);
@@ -574,12 +585,22 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
             assertEquals(x, 2L, "weakCompareAndSetRelease long");
         }
 
+        {
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSetRelease(2L, 1L);
+            }
+            assertEquals(success, true, "weakCompareAndSetVolatile long");
+            long x = (long) vh.get();
+            assertEquals(x, 1L, "weakCompareAndSetVolatile long");
+        }
+
         // Compare set and get
         {
-            long o = (long) vh.getAndSet( 1L);
-            assertEquals(o, 2L, "getAndSet long");
+            long o = (long) vh.getAndSet(2L);
+            assertEquals(o, 1L, "getAndSet long");
             long x = (long) vh.get();
-            assertEquals(x, 1L, "getAndSet long value");
+            assertEquals(x, 2L, "getAndSet long value");
         }
 
         vh.set(1L);
@@ -720,12 +741,22 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
                 assertEquals(x, 2L, "weakCompareAndSetRelease long");
             }
 
+            {
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = vh.weakCompareAndSetVolatile(array, i, 2L, 1L);
+                }
+                assertEquals(success, true, "weakCompareAndSetVolatile long");
+                long x = (long) vh.get(array, i);
+                assertEquals(x, 1L, "weakCompareAndSetVolatile long");
+            }
+
             // Compare set and get
             {
-                long o = (long) vh.getAndSet(array, i, 1L);
-                assertEquals(o, 2L, "getAndSet long");
+                long o = (long) vh.getAndSet(array, i, 2L);
+                assertEquals(o, 1L, "getAndSet long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, 1L, "getAndSet long value");
+                assertEquals(x, 2L, "getAndSet long value");
             }
 
             vh.set(array, i, 1L);
@@ -805,6 +836,10 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
                 boolean r = vh.weakCompareAndSet(array, ci, 1L, 2L);
             });
 
+            checkIOOBE(() -> {
+                boolean r = vh.weakCompareAndSetVolatile(array, ci, 1L, 2L);
+            });
+
             checkIOOBE(() -> {
                 boolean r = vh.weakCompareAndSetAcquire(array, ci, 1L, 2L);
             });
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessString.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessString.java
index b16c9340519..74f08bda535 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessString.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessString.java
@@ -105,6 +105,7 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.COMPARE_AND_EXCHANGE_ACQUIRE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.COMPARE_AND_EXCHANGE_RELEASE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET));
+        assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_VOLATILE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_ACQUIRE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_SET));
@@ -445,12 +446,22 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
             assertEquals(x, "bar", "weakCompareAndSetRelease String");
         }
 
+        {
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSetVolatile(recv, "bar", "foo");
+            }
+            assertEquals(success, true, "weakCompareAndSetVolatile String");
+            String x = (String) vh.get(recv);
+            assertEquals(x, "foo", "weakCompareAndSetVolatile String value");
+        }
+
         // Compare set and get
         {
-            String o = (String) vh.getAndSet(recv, "foo");
-            assertEquals(o, "bar", "getAndSet String");
+            String o = (String) vh.getAndSet(recv, "bar");
+            assertEquals(o, "foo", "getAndSet String");
             String x = (String) vh.get(recv);
-            assertEquals(x, "foo", "getAndSet String value");
+            assertEquals(x, "bar", "getAndSet String value");
         }
 
     }
@@ -586,12 +597,22 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
             assertEquals(x, "bar", "weakCompareAndSetRelease String");
         }
 
+        {
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSetRelease("bar", "foo");
+            }
+            assertEquals(success, true, "weakCompareAndSetVolatile String");
+            String x = (String) vh.get();
+            assertEquals(x, "foo", "weakCompareAndSetVolatile String");
+        }
+
         // Compare set and get
         {
-            String o = (String) vh.getAndSet( "foo");
-            assertEquals(o, "bar", "getAndSet String");
+            String o = (String) vh.getAndSet("bar");
+            assertEquals(o, "foo", "getAndSet String");
             String x = (String) vh.get();
-            assertEquals(x, "foo", "getAndSet String value");
+            assertEquals(x, "bar", "getAndSet String value");
         }
 
     }
@@ -730,12 +751,22 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
                 assertEquals(x, "bar", "weakCompareAndSetRelease String");
             }
 
+            {
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = vh.weakCompareAndSetVolatile(array, i, "bar", "foo");
+                }
+                assertEquals(success, true, "weakCompareAndSetVolatile String");
+                String x = (String) vh.get(array, i);
+                assertEquals(x, "foo", "weakCompareAndSetVolatile String");
+            }
+
             // Compare set and get
             {
-                String o = (String) vh.getAndSet(array, i, "foo");
-                assertEquals(o, "bar", "getAndSet String");
+                String o = (String) vh.getAndSet(array, i, "bar");
+                assertEquals(o, "foo", "getAndSet String");
                 String x = (String) vh.get(array, i);
-                assertEquals(x, "foo", "getAndSet String value");
+                assertEquals(x, "bar", "getAndSet String value");
             }
 
         }
@@ -813,6 +844,10 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
                 boolean r = vh.weakCompareAndSet(array, ci, "foo", "bar");
             });
 
+            checkIOOBE(() -> {
+                boolean r = vh.weakCompareAndSetVolatile(array, ci, "foo", "bar");
+            });
+
             checkIOOBE(() -> {
                 boolean r = vh.weakCompareAndSetAcquire(array, ci, "foo", "bar");
             });
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java
index 98d5be5ef71..fc0e8f214f9 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java
@@ -238,12 +238,22 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             assertEquals(x, 2, "weakCompareAndSetRelease int");
         }
 
+        {
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_VOLATILE).invokeExact(recv, 2, 1);
+            }
+            assertEquals(success, true, "weakCompareAndSetVolatile int");
+            int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
+            assertEquals(x, 1, "weakCompareAndSetVolatile int");
+        }
+
         // Compare set and get
         {
-            int o = (int) hs.get(TestAccessMode.GET_AND_SET).invokeExact(recv, 1);
-            assertEquals(o, 2, "getAndSet int");
+            int o = (int) hs.get(TestAccessMode.GET_AND_SET).invokeExact(recv, 2);
+            assertEquals(o, 1, "getAndSet int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 1, "getAndSet int value");
+            assertEquals(x, 2, "getAndSet int value");
         }
 
         hs.get(TestAccessMode.SET).invokeExact(recv, 1);
@@ -381,12 +391,22 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             assertEquals(x, 2, "weakCompareAndSetRelease int");
         }
 
+        {
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_VOLATILE).invokeExact(2, 1);
+            }
+            assertEquals(success, true, "weakCompareAndSetVolatile int");
+            int x = (int) hs.get(TestAccessMode.GET).invokeExact();
+            assertEquals(x, 1, "weakCompareAndSetVolatile int");
+        }
+
         // Compare set and get
         {
-            int o = (int) hs.get(TestAccessMode.GET_AND_SET).invokeExact( 1);
-            assertEquals(o, 2, "getAndSet int");
+            int o = (int) hs.get(TestAccessMode.GET_AND_SET).invokeExact( 2);
+            assertEquals(o, 1, "getAndSet int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 1, "getAndSet int value");
+            assertEquals(x, 2, "getAndSet int value");
         }
 
         hs.get(TestAccessMode.SET).invokeExact(1);
@@ -527,12 +547,22 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
                 assertEquals(x, 2, "weakCompareAndSetRelease int");
             }
 
+            {
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_VOLATILE).invokeExact(array, i, 2, 1);
+                }
+                assertEquals(success, true, "weakCompareAndSetVolatile int");
+                int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
+                assertEquals(x, 1, "weakCompareAndSetVolatile int");
+            }
+
             // Compare set and get
             {
-                int o = (int) hs.get(TestAccessMode.GET_AND_SET).invokeExact(array, i, 1);
-                assertEquals(o, 2, "getAndSet int");
+                int o = (int) hs.get(TestAccessMode.GET_AND_SET).invokeExact(array, i, 2);
+                assertEquals(o, 1, "getAndSet int");
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 1, "getAndSet int value");
+                assertEquals(x, 2, "getAndSet int value");
             }
 
             hs.get(TestAccessMode.SET).invokeExact(array, i, 1);
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java
index 3ee73eb8d07..0f265da3f2e 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java
@@ -238,12 +238,22 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             assertEquals(x, 2L, "weakCompareAndSetRelease long");
         }
 
+        {
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_VOLATILE).invokeExact(recv, 2L, 1L);
+            }
+            assertEquals(success, true, "weakCompareAndSetVolatile long");
+            long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
+            assertEquals(x, 1L, "weakCompareAndSetVolatile long");
+        }
+
         // Compare set and get
         {
-            long o = (long) hs.get(TestAccessMode.GET_AND_SET).invokeExact(recv, 1L);
-            assertEquals(o, 2L, "getAndSet long");
+            long o = (long) hs.get(TestAccessMode.GET_AND_SET).invokeExact(recv, 2L);
+            assertEquals(o, 1L, "getAndSet long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 1L, "getAndSet long value");
+            assertEquals(x, 2L, "getAndSet long value");
         }
 
         hs.get(TestAccessMode.SET).invokeExact(recv, 1L);
@@ -381,12 +391,22 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             assertEquals(x, 2L, "weakCompareAndSetRelease long");
         }
 
+        {
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_VOLATILE).invokeExact(2L, 1L);
+            }
+            assertEquals(success, true, "weakCompareAndSetVolatile long");
+            long x = (long) hs.get(TestAccessMode.GET).invokeExact();
+            assertEquals(x, 1L, "weakCompareAndSetVolatile long");
+        }
+
         // Compare set and get
         {
-            long o = (long) hs.get(TestAccessMode.GET_AND_SET).invokeExact( 1L);
-            assertEquals(o, 2L, "getAndSet long");
+            long o = (long) hs.get(TestAccessMode.GET_AND_SET).invokeExact( 2L);
+            assertEquals(o, 1L, "getAndSet long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 1L, "getAndSet long value");
+            assertEquals(x, 2L, "getAndSet long value");
         }
 
         hs.get(TestAccessMode.SET).invokeExact(1L);
@@ -527,12 +547,22 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
                 assertEquals(x, 2L, "weakCompareAndSetRelease long");
             }
 
+            {
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_VOLATILE).invokeExact(array, i, 2L, 1L);
+                }
+                assertEquals(success, true, "weakCompareAndSetVolatile long");
+                long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
+                assertEquals(x, 1L, "weakCompareAndSetVolatile long");
+            }
+
             // Compare set and get
             {
-                long o = (long) hs.get(TestAccessMode.GET_AND_SET).invokeExact(array, i, 1L);
-                assertEquals(o, 2L, "getAndSet long");
+                long o = (long) hs.get(TestAccessMode.GET_AND_SET).invokeExact(array, i, 2L);
+                assertEquals(o, 1L, "getAndSet long");
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 1L, "getAndSet long value");
+                assertEquals(x, 2L, "getAndSet long value");
             }
 
             hs.get(TestAccessMode.SET).invokeExact(array, i, 1L);
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java
index 9453484c603..ce5167a0b91 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java
@@ -238,12 +238,22 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
             assertEquals(x, "bar", "weakCompareAndSetRelease String");
         }
 
+        {
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_VOLATILE).invokeExact(recv, "bar", "foo");
+            }
+            assertEquals(success, true, "weakCompareAndSetVolatile String");
+            String x = (String) hs.get(TestAccessMode.GET).invokeExact(recv);
+            assertEquals(x, "foo", "weakCompareAndSetVolatile String");
+        }
+
         // Compare set and get
         {
-            String o = (String) hs.get(TestAccessMode.GET_AND_SET).invokeExact(recv, "foo");
-            assertEquals(o, "bar", "getAndSet String");
+            String o = (String) hs.get(TestAccessMode.GET_AND_SET).invokeExact(recv, "bar");
+            assertEquals(o, "foo", "getAndSet String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, "foo", "getAndSet String value");
+            assertEquals(x, "bar", "getAndSet String value");
         }
 
     }
@@ -377,12 +387,22 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
             assertEquals(x, "bar", "weakCompareAndSetRelease String");
         }
 
+        {
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_VOLATILE).invokeExact("bar", "foo");
+            }
+            assertEquals(success, true, "weakCompareAndSetVolatile String");
+            String x = (String) hs.get(TestAccessMode.GET).invokeExact();
+            assertEquals(x, "foo", "weakCompareAndSetVolatile String");
+        }
+
         // Compare set and get
         {
-            String o = (String) hs.get(TestAccessMode.GET_AND_SET).invokeExact( "foo");
-            assertEquals(o, "bar", "getAndSet String");
+            String o = (String) hs.get(TestAccessMode.GET_AND_SET).invokeExact( "bar");
+            assertEquals(o, "foo", "getAndSet String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, "foo", "getAndSet String value");
+            assertEquals(x, "bar", "getAndSet String value");
         }
 
     }
@@ -519,12 +539,22 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
                 assertEquals(x, "bar", "weakCompareAndSetRelease String");
             }
 
+            {
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_VOLATILE).invokeExact(array, i, "bar", "foo");
+                }
+                assertEquals(success, true, "weakCompareAndSetVolatile String");
+                String x = (String) hs.get(TestAccessMode.GET).invokeExact(array, i);
+                assertEquals(x, "foo", "weakCompareAndSetVolatile String");
+            }
+
             // Compare set and get
             {
-                String o = (String) hs.get(TestAccessMode.GET_AND_SET).invokeExact(array, i, "foo");
-                assertEquals(o, "bar", "getAndSet String");
+                String o = (String) hs.get(TestAccessMode.GET_AND_SET).invokeExact(array, i, "bar");
+                assertEquals(o, "foo", "getAndSet String");
                 String x = (String) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, "foo", "getAndSet String value");
+                assertEquals(x, "bar", "getAndSet String value");
             }
 
         }
diff --git a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template b/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template
index 1f21e430a83..cb33f8ff070 100644
--- a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template
+++ b/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template
@@ -106,6 +106,7 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.COMPARE_AND_EXCHANGE_ACQUIRE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.COMPARE_AND_EXCHANGE_RELEASE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET));
+        assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_VOLATILE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_ACQUIRE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_SET));
@@ -115,6 +116,7 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.COMPARE_AND_EXCHANGE_ACQUIRE));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.COMPARE_AND_EXCHANGE_RELEASE));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET));
+        assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_VOLATILE));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_ACQUIRE));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.WEAK_COMPARE_AND_SET_RELEASE));
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_SET));
@@ -297,6 +299,10 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSet(recv, $value1$, $value2$);
         });
 
+        checkUOE(() -> {
+            boolean r = vh.weakCompareAndSetVolatile(recv, $value1$, $value2$);
+        });
+
         checkUOE(() -> {
             boolean r = vh.weakCompareAndSetAcquire(recv, $value1$, $value2$);
         });
@@ -387,6 +393,10 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSet($value1$, $value2$);
         });
 
+        checkUOE(() -> {
+            boolean r = vh.weakCompareAndSetVolatile($value1$, $value2$);
+        });
+
         checkUOE(() -> {
             boolean r = vh.weakCompareAndSetAcquire($value1$, $value2$);
         });
@@ -532,12 +542,22 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             assertEquals(x, $value2$, "weakCompareAndSetRelease $type$");
         }
 
+        {
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSetVolatile(recv, $value2$, $value1$);
+            }
+            assertEquals(success, true, "weakCompareAndSetVolatile $type$");
+            $type$ x = ($type$) vh.get(recv);
+            assertEquals(x, $value1$, "weakCompareAndSetVolatile $type$ value");
+        }
+
         // Compare set and get
         {
-            $type$ o = ($type$) vh.getAndSet(recv, $value1$);
-            assertEquals(o, $value2$, "getAndSet $type$");
+            $type$ o = ($type$) vh.getAndSet(recv, $value2$);
+            assertEquals(o, $value1$, "getAndSet $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, $value1$, "getAndSet $type$ value");
+            assertEquals(x, $value2$, "getAndSet $type$ value");
         }
 #end[CAS]
 
@@ -576,6 +596,10 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSet(recv, $value1$, $value2$);
         });
 
+        checkUOE(() -> {
+            boolean r = vh.weakCompareAndSetVolatile(recv, $value1$, $value2$);
+        });
+
         checkUOE(() -> {
             boolean r = vh.weakCompareAndSetAcquire(recv, $value1$, $value2$);
         });
@@ -721,12 +745,22 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             assertEquals(x, $value2$, "weakCompareAndSetRelease $type$");
         }
 
+        {
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = vh.weakCompareAndSetRelease($value2$, $value1$);
+            }
+            assertEquals(success, true, "weakCompareAndSetVolatile $type$");
+            $type$ x = ($type$) vh.get();
+            assertEquals(x, $value1$, "weakCompareAndSetVolatile $type$");
+        }
+
         // Compare set and get
         {
-            $type$ o = ($type$) vh.getAndSet( $value1$);
-            assertEquals(o, $value2$, "getAndSet $type$");
+            $type$ o = ($type$) vh.getAndSet($value2$);
+            assertEquals(o, $value1$, "getAndSet $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, $value1$, "getAndSet $type$ value");
+            assertEquals(x, $value2$, "getAndSet $type$ value");
         }
 #end[CAS]
 
@@ -765,6 +799,10 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSet($value1$, $value2$);
         });
 
+        checkUOE(() -> {
+            boolean r = vh.weakCompareAndSetVolatile($value1$, $value2$);
+        });
+
         checkUOE(() -> {
             boolean r = vh.weakCompareAndSetAcquire($value1$, $value2$);
         });
@@ -913,12 +951,22 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
                 assertEquals(x, $value2$, "weakCompareAndSetRelease $type$");
             }
 
+            {
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = vh.weakCompareAndSetVolatile(array, i, $value2$, $value1$);
+                }
+                assertEquals(success, true, "weakCompareAndSetVolatile $type$");
+                $type$ x = ($type$) vh.get(array, i);
+                assertEquals(x, $value1$, "weakCompareAndSetVolatile $type$");
+            }
+
             // Compare set and get
             {
-                $type$ o = ($type$) vh.getAndSet(array, i, $value1$);
-                assertEquals(o, $value2$, "getAndSet $type$");
+                $type$ o = ($type$) vh.getAndSet(array, i, $value2$);
+                assertEquals(o, $value1$, "getAndSet $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, $value1$, "getAndSet $type$ value");
+                assertEquals(x, $value2$, "getAndSet $type$ value");
             }
 #end[CAS]
 
@@ -961,6 +1009,10 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             boolean r = vh.weakCompareAndSet(array, i, $value1$, $value2$);
         });
 
+        checkUOE(() -> {
+            boolean r = vh.weakCompareAndSetVolatile(array, i, $value1$, $value2$);
+        });
+
         checkUOE(() -> {
             boolean r = vh.weakCompareAndSetAcquire(array, i, $value1$, $value2$);
         });
@@ -1044,6 +1096,10 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
                 boolean r = vh.weakCompareAndSet(array, ci, $value1$, $value2$);
             });
 
+            checkIOOBE(() -> {
+                boolean r = vh.weakCompareAndSetVolatile(array, ci, $value1$, $value2$);
+            });
+
             checkIOOBE(() -> {
                 boolean r = vh.weakCompareAndSetAcquire(array, ci, $value1$, $value2$);
             });
diff --git a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template b/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template
index 1b3e4cfc370..f943bf2611b 100644
--- a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template
+++ b/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template
@@ -239,12 +239,22 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             assertEquals(x, $value2$, "weakCompareAndSetRelease $type$");
         }
 
+        {
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_VOLATILE).invokeExact(recv, $value2$, $value1$);
+            }
+            assertEquals(success, true, "weakCompareAndSetVolatile $type$");
+            $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
+            assertEquals(x, $value1$, "weakCompareAndSetVolatile $type$");
+        }
+
         // Compare set and get
         {
-            $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_SET).invokeExact(recv, $value1$);
-            assertEquals(o, $value2$, "getAndSet $type$");
+            $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_SET).invokeExact(recv, $value2$);
+            assertEquals(o, $value1$, "getAndSet $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, $value1$, "getAndSet $type$ value");
+            assertEquals(x, $value2$, "getAndSet $type$ value");
         }
 #end[CAS]
 
@@ -412,12 +422,22 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             assertEquals(x, $value2$, "weakCompareAndSetRelease $type$");
         }
 
+        {
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_VOLATILE).invokeExact($value2$, $value1$);
+            }
+            assertEquals(success, true, "weakCompareAndSetVolatile $type$");
+            $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
+            assertEquals(x, $value1$, "weakCompareAndSetVolatile $type$");
+        }
+
         // Compare set and get
         {
-            $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_SET).invokeExact( $value1$);
-            assertEquals(o, $value2$, "getAndSet $type$");
+            $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_SET).invokeExact( $value2$);
+            assertEquals(o, $value1$, "getAndSet $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, $value1$, "getAndSet $type$ value");
+            assertEquals(x, $value2$, "getAndSet $type$ value");
         }
 #end[CAS]
 
@@ -588,12 +608,22 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
                 assertEquals(x, $value2$, "weakCompareAndSetRelease $type$");
             }
 
+            {
+                boolean success = false;
+                for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                    success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_VOLATILE).invokeExact(array, i, $value2$, $value1$);
+                }
+                assertEquals(success, true, "weakCompareAndSetVolatile $type$");
+                $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
+                assertEquals(x, $value1$, "weakCompareAndSetVolatile $type$");
+            }
+
             // Compare set and get
             {
-                $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_SET).invokeExact(array, i, $value1$);
-                assertEquals(o, $value2$, "getAndSet $type$");
+                $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_SET).invokeExact(array, i, $value2$);
+                assertEquals(o, $value1$, "getAndSet $type$");
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, $value1$, "getAndSet $type$ value");
+                assertEquals(x, $value2$, "getAndSet $type$ value");
             }
 #end[CAS]
 

From 9cdeece6b6a4e0785c3247e90edad3ed73ce2bc6 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Tue, 17 May 2016 16:04:53 -0700
Subject: [PATCH 127/228] 8130679: Writer/StringWriter.write methods do not
 specify index out bounds

Add throws tag indicating IndexOutOfBoundsExcepion to write() methods which have an index parameter.

Reviewed-by: chegar, prappo, rriggs
---
 .../share/classes/java/io/BufferedWriter.java | 30 +++++++++++++------
 .../classes/java/io/CharArrayWriter.java      | 12 +++++++-
 .../share/classes/java/io/FilterWriter.java   | 16 ++++++++--
 .../classes/java/io/OutputStreamWriter.java   | 16 ++++++++--
 .../share/classes/java/io/PipedWriter.java    | 18 +++++++----
 .../share/classes/java/io/PrintWriter.java    | 12 +++++++-
 .../share/classes/java/io/StringWriter.java   | 12 +++++++-
 .../share/classes/java/io/Writer.java         | 21 +++++++++----
 8 files changed, 108 insertions(+), 29 deletions(-)

diff --git a/jdk/src/java.base/share/classes/java/io/BufferedWriter.java b/jdk/src/java.base/share/classes/java/io/BufferedWriter.java
index 28e170fe800..3d8e1ee1b19 100644
--- a/jdk/src/java.base/share/classes/java/io/BufferedWriter.java
+++ b/jdk/src/java.base/share/classes/java/io/BufferedWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2016, 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
@@ -153,13 +153,18 @@ public class BufferedWriter extends Writer {
      * needed.  If the requested length is at least as large as the buffer,
      * however, then this method will flush the buffer and write the characters
      * directly to the underlying stream.  Thus redundant
-     * <code>BufferedWriter</code>s will not copy data unnecessarily.
+     * {@code BufferedWriter}s will not copy data unnecessarily.
      *
      * @param  cbuf  A character array
      * @param  off   Offset from which to start reading characters
      * @param  len   Number of characters to write
      *
-     * @exception  IOException  If an I/O error occurs
+     * @throws  IndexOutOfBoundsException
+     *          If {@code off} is negative, or {@code len} is negative,
+     *          or {@code off + len} is negative or greater than the length
+     *          of the given array
+     *
+     * @throws  IOException  If an I/O error occurs
      */
     public void write(char cbuf[], int off, int len) throws IOException {
         synchronized (lock) {
@@ -195,17 +200,24 @@ public class BufferedWriter extends Writer {
     /**
      * Writes a portion of a String.
      *
-     * <p> If the value of the {@code len} parameter is negative then no
-     * characters are written.  This is contrary to the specification of this
-     * method in the {@linkplain java.io.Writer#write(java.lang.String,int,int)
-     * superclass}, which requires that an {@link IndexOutOfBoundsException} be
-     * thrown.
+     * @implSpec
+     * While the specification of this method in the
+     * {@linkplain java.io.Writer#write(java.lang.String,int,int) superclass}
+     * recommends that an {@link IndexOutOfBoundsException} be thrown
+     * if {@code len} is negative or {@code off + len} is negative,
+     * the implementation in this class does not throw such an exception in
+     * these cases but instead simply writes no characters.
      *
      * @param  s     String to be written
      * @param  off   Offset from which to start reading characters
      * @param  len   Number of characters to be written
      *
-     * @exception  IOException  If an I/O error occurs
+     * @throws  IndexOutOfBoundsException
+     *          If {@code off} is negative,
+     *          or {@code off + len} is greater than the length
+     *          of the given string
+     *
+     * @throws  IOException  If an I/O error occurs
      */
     public void write(String s, int off, int len) throws IOException {
         synchronized (lock) {
diff --git a/jdk/src/java.base/share/classes/java/io/CharArrayWriter.java b/jdk/src/java.base/share/classes/java/io/CharArrayWriter.java
index ed27bbae314..773b59614d9 100644
--- a/jdk/src/java.base/share/classes/java/io/CharArrayWriter.java
+++ b/jdk/src/java.base/share/classes/java/io/CharArrayWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2016, 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
@@ -91,6 +91,11 @@ class CharArrayWriter extends Writer {
      * @param c the data to be written
      * @param off       the start offset in the data
      * @param len       the number of chars that are written
+     *
+     * @throws  IndexOutOfBoundsException
+     *          If {@code off} is negative, or {@code len} is negative,
+     *          or {@code off + len} is negative or greater than the length
+     *          of the given array
      */
     public void write(char c[], int off, int len) {
         if ((off < 0) || (off > c.length) || (len < 0) ||
@@ -114,6 +119,11 @@ class CharArrayWriter extends Writer {
      * @param  str  String to be written from
      * @param  off  Offset from which to start reading characters
      * @param  len  Number of characters to be written
+     *
+     * @throws  IndexOutOfBoundsException
+     *          If {@code off} is negative, or {@code len} is negative,
+     *          or {@code off + len} is negative or greater than the length
+     *          of the given string
      */
     public void write(String str, int off, int len) {
         synchronized (lock) {
diff --git a/jdk/src/java.base/share/classes/java/io/FilterWriter.java b/jdk/src/java.base/share/classes/java/io/FilterWriter.java
index 303c674e0c0..8272b3cc8bf 100644
--- a/jdk/src/java.base/share/classes/java/io/FilterWriter.java
+++ b/jdk/src/java.base/share/classes/java/io/FilterWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2016, 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,12 @@ public abstract class FilterWriter extends Writer {
      * @param  off   Offset from which to start reading characters
      * @param  len   Number of characters to be written
      *
-     * @exception  IOException  If an I/O error occurs
+     * @throws  IndexOutOfBoundsException
+     *          If the values of the {@code off} and {@code len} parameters
+     *          cause the corresponding method of the underlying {@code Writer}
+     *          to throw an {@code IndexOutOfBoundsException}
+     *
+     * @throws  IOException  If an I/O error occurs
      */
     public void write(char cbuf[], int off, int len) throws IOException {
         out.write(cbuf, off, len);
@@ -85,7 +90,12 @@ public abstract class FilterWriter extends Writer {
      * @param  off  Offset from which to start reading characters
      * @param  len  Number of characters to be written
      *
-     * @exception  IOException  If an I/O error occurs
+     * @throws  IndexOutOfBoundsException
+     *          If the values of the {@code off} and {@code len} parameters
+     *          cause the corresponding method of the underlying {@code Writer}
+     *          to throw an {@code IndexOutOfBoundsException}
+     *
+     * @throws  IOException  If an I/O error occurs
      */
     public void write(String str, int off, int len) throws IOException {
         out.write(str, off, len);
diff --git a/jdk/src/java.base/share/classes/java/io/OutputStreamWriter.java b/jdk/src/java.base/share/classes/java/io/OutputStreamWriter.java
index 0d597e6bef4..4fdb148baaf 100644
--- a/jdk/src/java.base/share/classes/java/io/OutputStreamWriter.java
+++ b/jdk/src/java.base/share/classes/java/io/OutputStreamWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2016, 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
@@ -202,7 +202,12 @@ public class OutputStreamWriter extends Writer {
      * @param  off   Offset from which to start writing characters
      * @param  len   Number of characters to write
      *
-     * @exception  IOException  If an I/O error occurs
+     * @throws  IndexOutOfBoundsException
+     *          If {@code off} is negative, or {@code len} is negative,
+     *          or {@code off + len} is negative or greater than the length
+     *          of the given array
+     *
+     * @throws  IOException  If an I/O error occurs
      */
     public void write(char cbuf[], int off, int len) throws IOException {
         se.write(cbuf, off, len);
@@ -215,7 +220,12 @@ public class OutputStreamWriter extends Writer {
      * @param  off  Offset from which to start writing characters
      * @param  len  Number of characters to write
      *
-     * @exception  IOException  If an I/O error occurs
+     * @throws  IndexOutOfBoundsException
+     *          If {@code off} is negative, or {@code len} is negative,
+     *          or {@code off + len} is negative or greater than the length
+     *          of the given string
+     *
+     * @throws  IOException  If an I/O error occurs
      */
     public void write(String str, int off, int len) throws IOException {
         se.write(str, off, len);
diff --git a/jdk/src/java.base/share/classes/java/io/PipedWriter.java b/jdk/src/java.base/share/classes/java/io/PipedWriter.java
index 02201fbec1a..a4534b8604c 100644
--- a/jdk/src/java.base/share/classes/java/io/PipedWriter.java
+++ b/jdk/src/java.base/share/classes/java/io/PipedWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2016, 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
@@ -125,19 +125,25 @@ public class PipedWriter extends Writer {
     }
 
     /**
-     * Writes <code>len</code> characters from the specified character array
-     * starting at offset <code>off</code> to this piped output stream.
+     * Writes {@code len} characters from the specified character array
+     * starting at offset {@code off} to this piped output stream.
      * This method blocks until all the characters are written to the output
      * stream.
      * If a thread was reading data characters from the connected piped input
      * stream, but the thread is no longer alive, then an
-     * <code>IOException</code> is thrown.
+     * {@code IOException} is thrown.
      *
      * @param      cbuf  the data.
      * @param      off   the start offset in the data.
      * @param      len   the number of characters to write.
-     * @exception  IOException  if the pipe is
-     *          <a href=PipedOutputStream.html#BROKEN> <code>broken</code></a>,
+     *
+     * @throws  IndexOutOfBoundsException
+     *          If {@code off} is negative, or {@code len} is negative,
+     *          or {@code off + len} is negative or greater than the length
+     *          of the given array
+     *
+     * @throws  IOException  if the pipe is
+     *          <a href=PipedOutputStream.html#BROKEN><code>broken</code></a>,
      *          {@link #connect(java.io.PipedReader) unconnected}, closed
      *          or an I/O error occurs.
      */
diff --git a/jdk/src/java.base/share/classes/java/io/PrintWriter.java b/jdk/src/java.base/share/classes/java/io/PrintWriter.java
index 662f930ef90..d516b8ef404 100644
--- a/jdk/src/java.base/share/classes/java/io/PrintWriter.java
+++ b/jdk/src/java.base/share/classes/java/io/PrintWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2016, 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
@@ -410,6 +410,11 @@ public class PrintWriter extends Writer {
      * @param buf Array of characters
      * @param off Offset from which to start writing characters
      * @param len Number of characters to write
+     *
+     * @throws  IndexOutOfBoundsException
+     *          If the values of the {@code off} and {@code len} parameters
+     *          cause the corresponding method of the underlying {@code Writer}
+     *          to throw an {@code IndexOutOfBoundsException}
      */
     public void write(char buf[], int off, int len) {
         try {
@@ -440,6 +445,11 @@ public class PrintWriter extends Writer {
      * @param s A String
      * @param off Offset from which to start writing characters
      * @param len Number of characters to write
+     *
+     * @throws  IndexOutOfBoundsException
+     *          If the values of the {@code off} and {@code len} parameters
+     *          cause the corresponding method of the underlying {@code Writer}
+     *          to throw an {@code IndexOutOfBoundsException}
      */
     public void write(String s, int off, int len) {
         try {
diff --git a/jdk/src/java.base/share/classes/java/io/StringWriter.java b/jdk/src/java.base/share/classes/java/io/StringWriter.java
index 5d1babc3127..15022b353a8 100644
--- a/jdk/src/java.base/share/classes/java/io/StringWriter.java
+++ b/jdk/src/java.base/share/classes/java/io/StringWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2016, 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
@@ -83,6 +83,11 @@ public class StringWriter extends Writer {
      * @param  cbuf  Array of characters
      * @param  off   Offset from which to start writing characters
      * @param  len   Number of characters to write
+     *
+     * @throws  IndexOutOfBoundsException
+     *          If {@code off} is negative, or {@code len} is negative,
+     *          or {@code off + len} is negative or greater than the length
+     *          of the given array
      */
     public void write(char cbuf[], int off, int len) {
         if ((off < 0) || (off > cbuf.length) || (len < 0) ||
@@ -107,6 +112,11 @@ public class StringWriter extends Writer {
      * @param  str  String to be written
      * @param  off  Offset from which to start writing characters
      * @param  len  Number of characters to write
+     *
+     * @throws  IndexOutOfBoundsException
+     *          If {@code off} is negative, or {@code len} is negative,
+     *          or {@code off + len} is negative or greater than the length
+     *          of the given string
      */
     public void write(String str, int off, int len)  {
         buf.append(str, off, off + len);
diff --git a/jdk/src/java.base/share/classes/java/io/Writer.java b/jdk/src/java.base/share/classes/java/io/Writer.java
index 5ad5e554fb3..17e8de3ef8a 100644
--- a/jdk/src/java.base/share/classes/java/io/Writer.java
+++ b/jdk/src/java.base/share/classes/java/io/Writer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2016, 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,12 +32,11 @@ package java.io;
  * Most subclasses, however, will override some of the methods defined here in
  * order to provide higher efficiency, additional functionality, or both.
  *
- * @see Writer
  * @see   BufferedWriter
  * @see   CharArrayWriter
  * @see   FilterWriter
  * @see   OutputStreamWriter
- * @see     FileWriter
+ * @see   FileWriter
  * @see   PipedWriter
  * @see   PrintWriter
  * @see   StringWriter
@@ -139,6 +138,12 @@ public abstract class Writer implements Appendable, Closeable, Flushable {
      * @param  len
      *         Number of characters to write
      *
+     * @throws  IndexOutOfBoundsException
+     *          Implementations should throw this exception
+     *          if {@code off} is negative, or {@code len} is negative,
+     *          or {@code off + len} is negative or greater than the length
+     *          of the given array
+     *
      * @throws  IOException
      *          If an I/O error occurs
      */
@@ -160,6 +165,11 @@ public abstract class Writer implements Appendable, Closeable, Flushable {
     /**
      * Writes a portion of a string.
      *
+     * @implSpec
+     * The implementation in this class throws an
+     * {@code IndexOutOfBoundsException} for the indicated conditions;
+     * overriding methods may choose to do otherwise.
+     *
      * @param  str
      *         A String
      *
@@ -170,8 +180,9 @@ public abstract class Writer implements Appendable, Closeable, Flushable {
      *         Number of characters to write
      *
      * @throws  IndexOutOfBoundsException
-     *          If {@code off} is negative, or {@code len} is negative,
-     *          or {@code off+len} is negative or greater than the length
+     *          Implementations should throw this exception
+     *          if {@code off} is negative, or {@code len} is negative,
+     *          or {@code off + len} is negative or greater than the length
      *          of the given string
      *
      * @throws  IOException

From 1244c2f423f05ff90c7de7358ef10c6c953193dc Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Tue, 17 May 2016 19:20:05 -0700
Subject: [PATCH 128/228] 8157011: Problem list tools/pack200/TestNormal.java
 and java/io/pathNames/GeneralWin32.java

Reviewed-by: darcy
---
 jdk/test/ProblemList.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 67dd85fcd17..3766c76ec25 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -145,6 +145,12 @@ java/lang/management/MemoryMXBean/LowMemoryTest.java            8130339 generic-
 
 ############################################################################
 
+# jdk_io
+
+java/io/pathNames/GeneralWin32.java                             8156595 windows-all
+
+############################################################################
+
 # jdk_jmx
 
 com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java 8030957 aix-all
@@ -329,6 +335,8 @@ tools/launcher/FXLauncherTest.java                              8068049 linux-al
 
 tools/pack200/Pack200Props.java                                 8155857 generic-all
 
+tools/pack200/TestNormal.java                                   8156807 windows-all
+
 ############################################################################
 
 # jdk_jdi

From 2bb441c404b042d9fc79d2d777ff5ae5b7282737 Mon Sep 17 00:00:00 2001
From: Martin Buchholz <martin@openjdk.org>
Date: Mon, 16 May 2016 11:42:31 -0700
Subject: [PATCH 129/228] 8157069: Assorted ZipFile improvements

Reviewed-by: sherman
---
 .../share/classes/java/util/zip/ZipFile.java  | 102 +++++++++---------
 .../security/util/SignatureFileVerifier.java  |   9 +-
 2 files changed, 56 insertions(+), 55 deletions(-)

diff --git a/jdk/src/java.base/share/classes/java/util/zip/ZipFile.java b/jdk/src/java.base/share/classes/java/util/zip/ZipFile.java
index 1cba038d6e5..b97d0cf68c6 100644
--- a/jdk/src/java.base/share/classes/java/util/zip/ZipFile.java
+++ b/jdk/src/java.base/share/classes/java/util/zip/ZipFile.java
@@ -462,9 +462,13 @@ class ZipFile implements ZipConstants, Closeable {
 
     private class ZipEntryIterator implements Enumeration<ZipEntry>, Iterator<ZipEntry> {
         private int i = 0;
+        private final int entryCount;
 
         public ZipEntryIterator() {
-            ensureOpen();
+            synchronized (ZipFile.this) {
+                ensureOpen();
+                this.entryCount = zsrc.total;
+            }
         }
 
         public boolean hasMoreElements() {
@@ -472,10 +476,7 @@ class ZipFile implements ZipConstants, Closeable {
         }
 
         public boolean hasNext() {
-            synchronized (ZipFile.this) {
-                ensureOpen();
-                return i < zsrc.total;
-            }
+            return i < entryCount;
         }
 
         public ZipEntry nextElement() {
@@ -485,7 +486,7 @@ class ZipFile implements ZipConstants, Closeable {
         public ZipEntry next() {
             synchronized (ZipFile.this) {
                 ensureOpen();
-                if (i >= zsrc.total) {
+                if (!hasNext()) {
                     throw new NoSuchElementException();
                 }
                 // each "entry" has 3 ints in table entries
@@ -526,34 +527,34 @@ class ZipFile implements ZipConstants, Closeable {
     /* Checks ensureOpen() before invoke this method */
     private ZipEntry getZipEntry(String name, int pos) {
         byte[] cen = zsrc.cen;
-        ZipEntry e = new ZipEntry();
         int nlen = CENNAM(cen, pos);
         int elen = CENEXT(cen, pos);
         int clen = CENCOM(cen, pos);
-        e.flag = CENFLG(cen, pos);  // get the flag first
-        if (name != null) {
-            e.name = name;
-        } else {
-            if (!zc.isUTF8() && (e.flag & EFS) != 0) {
-                e.name = zc.toStringUTF8(cen, pos + CENHDR, nlen);
+        int flag = CENFLG(cen, pos);
+        if (name == null) {
+            if (!zc.isUTF8() && (flag & EFS) != 0) {
+                name = zc.toStringUTF8(cen, pos + CENHDR, nlen);
             } else {
-                e.name = zc.toString(cen, pos + CENHDR, nlen);
+                name = zc.toString(cen, pos + CENHDR, nlen);
             }
         }
+        ZipEntry e = new ZipEntry(name);
+        e.flag = flag;
         e.xdostime = CENTIM(cen, pos);
         e.crc = CENCRC(cen, pos);
         e.size = CENLEN(cen, pos);
         e.csize = CENSIZ(cen, pos);
         e.method = CENHOW(cen, pos);
         if (elen != 0) {
-            e.setExtra0(Arrays.copyOfRange(cen, pos + CENHDR + nlen,
-                                           pos + CENHDR + nlen + elen), true);
+            int start = pos + CENHDR + nlen;
+            e.setExtra0(Arrays.copyOfRange(cen, start, start + elen), true);
         }
         if (clen != 0) {
-            if (!zc.isUTF8() && (e.flag & EFS) != 0) {
-                e.comment = zc.toStringUTF8(cen, pos + CENHDR + nlen + elen, clen);
+            int start = pos + CENHDR + nlen + elen;
+            if (!zc.isUTF8() && (flag & EFS) != 0) {
+                e.comment = zc.toStringUTF8(cen, start, clen);
             } else {
-                e.comment = zc.toString(cen, pos + CENHDR + nlen + elen, clen);
+                e.comment = zc.toString(cen, start, clen);
             }
         }
         return e;
@@ -817,7 +818,7 @@ class ZipFile implements ZipConstants, Closeable {
         );
     }
 
-    /*
+    /**
      * Returns an array of strings representing the names of all entries
      * that begin with "META-INF/" (case ignored). This method is used
      * in JarFile, via SharedSecrets, as an optimization when looking up
@@ -827,14 +828,14 @@ class ZipFile implements ZipConstants, Closeable {
     private String[] getMetaInfEntryNames() {
         synchronized (this) {
             ensureOpen();
-            if (zsrc.metanames.size() == 0) {
+            if (zsrc.metanames == null) {
                 return null;
             }
-            String[] names = new String[zsrc.metanames.size()];
+            String[] names = new String[zsrc.metanames.length];
             byte[] cen = zsrc.cen;
             for (int i = 0; i < names.length; i++) {
-                int pos = zsrc.metanames.get(i);
-                names[i] = new String(cen, pos + CENHDR,  CENNAM(cen, pos),
+                int pos = zsrc.metanames[i];
+                names[i] = new String(cen, pos + CENHDR, CENNAM(cen, pos),
                                       StandardCharsets.UTF_8);
             }
             return names;
@@ -850,7 +851,7 @@ class ZipFile implements ZipConstants, Closeable {
         private long locpos;                 // position of first LOC header (usually 0)
         private byte[] comment;              // zip file comment
                                              // list of meta entries in META-INF dir
-        private ArrayList<Integer> metanames = new ArrayList<>();
+        private int[] metanames;
         private final boolean startsWithLoc; // true, if zip file starts with LOCSIG (usually true)
 
         // A Hashmap for all entries.
@@ -1159,7 +1160,7 @@ class ZipFile implements ZipConstants, Closeable {
             int next = -1;
 
             // list for all meta entries
-            metanames = new ArrayList<>();
+            ArrayList<Integer> metanamesList = null;
 
             // Iterate through the entries in the central directory
             int i = 0;
@@ -1194,13 +1195,21 @@ class ZipFile implements ZipConstants, Closeable {
                 idx = addEntry(idx, hash, next, pos);
                 // Adds name to metanames.
                 if (isMetaName(cen, pos + CENHDR, nlen)) {
-                    metanames.add(pos);
+                    if (metanamesList == null)
+                        metanamesList = new ArrayList<>(4);
+                    metanamesList.add(pos);
                 }
                 // skip ext and comment
                 pos += (CENHDR + nlen + elen + clen);
                 i++;
             }
             total = i;
+            if (metanamesList != null) {
+                metanames = new int[metanamesList.size()];
+                for (int j = 0, len = metanames.length; j < len; j++) {
+                    metanames[j] = metanamesList.get(j);
+                }
+            }
             if (pos + ENDHDR != cen.length) {
                 zerror("invalid CEN header (bad header size)");
             }
@@ -1265,30 +1274,23 @@ class ZipFile implements ZipConstants, Closeable {
             }
         }
 
-        private static byte[] metainf = new byte[] {
-            'M', 'E', 'T', 'A', '-', 'I' , 'N', 'F', '/',
-        };
-
-        /*
-         * Returns true if the specified entry's name begins with the string
-         * "META-INF/" irrespective of case.
+        /**
+         * Returns true if the bytes represent a non-directory name
+         * beginning with "META-INF/", disregarding ASCII case.
          */
-        private static boolean isMetaName(byte[] name,  int off, int len) {
-            if (len < 9 || (name[off] != 'M' && name[off] != 'm')) {  //  sizeof("META-INF/") - 1
-                return false;
-            }
-            off++;
-            for (int i = 1; i < metainf.length; i++) {
-                byte c = name[off++];
-                // Avoid toupper; it's locale-dependent
-                if (c >= 'a' && c <= 'z') {
-                    c += 'A' - 'a';
-                }
-                if (metainf[i] != c) {
-                    return false;
-                }
-            }
-            return true;
+        private static boolean isMetaName(byte[] name, int off, int len) {
+            // Use the "oldest ASCII trick in the book"
+            return len > 9                     // "META-INF/".length()
+                && name[off + len - 1] != '/'  // non-directory
+                && (name[off++] | 0x20) == 'm'
+                && (name[off++] | 0x20) == 'e'
+                && (name[off++] | 0x20) == 't'
+                && (name[off++] | 0x20) == 'a'
+                && (name[off++]       ) == '-'
+                && (name[off++] | 0x20) == 'i'
+                && (name[off++] | 0x20) == 'n'
+                && (name[off++] | 0x20) == 'f'
+                && (name[off]         ) == '/';
         }
 
         /*
diff --git a/jdk/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java b/jdk/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
index 20e66d561fb..0bf5fcbe1fc 100644
--- a/jdk/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
+++ b/jdk/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
@@ -145,11 +145,10 @@ public class SignatureFileVerifier {
      */
     public static boolean isBlockOrSF(String s) {
         // we currently only support DSA and RSA PKCS7 blocks
-        if (s.endsWith(".SF") || s.endsWith(".DSA") ||
-                s.endsWith(".RSA") || s.endsWith(".EC")) {
-            return true;
-        }
-        return false;
+        return s.endsWith(".SF")
+            || s.endsWith(".DSA")
+            || s.endsWith(".RSA")
+            || s.endsWith(".EC");
     }
 
     /**

From c4976196f5938a53ad30e4cde3132a7e238c6bba Mon Sep 17 00:00:00 2001
From: Michael Haupt <mhaupt@openjdk.org>
Date: Wed, 18 May 2016 10:42:29 +0200
Subject: [PATCH 130/228] 8156915: introduce MethodHandle factory for array
 length

Reviewed-by: sundar
---
 .../lang/invoke/InvokerBytecodeGenerator.java |  12 +-
 .../java/lang/invoke/MethodHandleImpl.java    | 119 ++++++++++++++----
 .../java/lang/invoke/MethodHandles.java       |  18 ++-
 .../java/lang/invoke/ArrayLengthTest.java     |  81 ++++++++++++
 4 files changed, 197 insertions(+), 33 deletions(-)
 create mode 100644 jdk/test/java/lang/invoke/ArrayLengthTest.java

diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java b/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
index 08e38987bf2..da1700ffdb1 100644
--- a/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
@@ -706,6 +706,9 @@ class InvokerBytecodeGenerator {
                 case ARRAY_STORE:
                     emitArrayStore(name);
                     continue;
+                case ARRAY_LENGTH:
+                    emitArrayLength(name);
+                    continue;
                 case IDENTITY:
                     assert(name.arguments.length == 1);
                     emitPushArguments(name);
@@ -740,15 +743,16 @@ class InvokerBytecodeGenerator {
         return classFile;
     }
 
-    void emitArrayLoad(Name name)  { emitArrayOp(name, Opcodes.AALOAD);  }
-    void emitArrayStore(Name name) { emitArrayOp(name, Opcodes.AASTORE); }
+    void emitArrayLoad(Name name)   { emitArrayOp(name, Opcodes.AALOAD);      }
+    void emitArrayStore(Name name)  { emitArrayOp(name, Opcodes.AASTORE);     }
+    void emitArrayLength(Name name) { emitArrayOp(name, Opcodes.ARRAYLENGTH); }
 
     void emitArrayOp(Name name, int arrayOpcode) {
-        assert arrayOpcode == Opcodes.AALOAD || arrayOpcode == Opcodes.AASTORE;
+        assert arrayOpcode == Opcodes.AALOAD || arrayOpcode == Opcodes.AASTORE || arrayOpcode == Opcodes.ARRAYLENGTH;
         Class<?> elementType = name.function.methodType().parameterType(0).getComponentType();
         assert elementType != null;
         emitPushArguments(name);
-        if (elementType.isPrimitive()) {
+        if (arrayOpcode != Opcodes.ARRAYLENGTH && elementType.isPrimitive()) {
             Wrapper w = Wrapper.forPrimitiveType(elementType);
             arrayOpcode = arrayInsnOpcode(arrayTypeCode(w), arrayOpcode);
         }
diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
index 782eff613ae..6f2f35b8773 100644
--- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
@@ -66,25 +66,28 @@ import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
 
     /// Factory methods to create method handles:
 
-    static MethodHandle makeArrayElementAccessor(Class<?> arrayClass, boolean isSetter) {
-        if (arrayClass == Object[].class)
-            return (isSetter ? ArrayAccessor.OBJECT_ARRAY_SETTER : ArrayAccessor.OBJECT_ARRAY_GETTER);
+    static MethodHandle makeArrayElementAccessor(Class<?> arrayClass, ArrayAccess access) {
+        if (arrayClass == Object[].class) {
+            return ArrayAccess.objectAccessor(access);
+        }
         if (!arrayClass.isArray())
             throw newIllegalArgumentException("not an array: "+arrayClass);
         MethodHandle[] cache = ArrayAccessor.TYPED_ACCESSORS.get(arrayClass);
-        int cacheIndex = (isSetter ? ArrayAccessor.SETTER_INDEX : ArrayAccessor.GETTER_INDEX);
+        int cacheIndex = ArrayAccess.cacheIndex(access);
         MethodHandle mh = cache[cacheIndex];
         if (mh != null)  return mh;
-        mh = ArrayAccessor.getAccessor(arrayClass, isSetter);
-        MethodType correctType = ArrayAccessor.correctType(arrayClass, isSetter);
+        mh = ArrayAccessor.getAccessor(arrayClass, access);
+        MethodType correctType = ArrayAccessor.correctType(arrayClass, access);
         if (mh.type() != correctType) {
             assert(mh.type().parameterType(0) == Object[].class);
-            assert((isSetter ? mh.type().parameterType(2) : mh.type().returnType()) == Object.class);
-            assert(isSetter || correctType.parameterType(0).getComponentType() == correctType.returnType());
+            /* if access == SET */ assert(access != ArrayAccess.SET || mh.type().parameterType(2) == Object.class);
+            /* if access == GET */ assert(access != ArrayAccess.GET ||
+                    (mh.type().returnType() == Object.class &&
+                     correctType.parameterType(0).getComponentType() == correctType.returnType()));
             // safe to view non-strictly, because element type follows from array type
             mh = mh.viewAsType(correctType, false);
         }
-        mh = makeIntrinsic(mh, (isSetter ? Intrinsic.ARRAY_STORE : Intrinsic.ARRAY_LOAD));
+        mh = makeIntrinsic(mh, ArrayAccess.intrinsic(access));
         // Atomically update accessor cache.
         synchronized(cache) {
             if (cache[cacheIndex] == null) {
@@ -97,9 +100,52 @@ import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
         return mh;
     }
 
+    enum ArrayAccess {
+        GET, SET, LENGTH;
+
+        // As ArrayAccess and ArrayAccessor have a circular dependency, the ArrayAccess properties cannot be stored in
+        // final fields.
+
+        static String opName(ArrayAccess a) {
+            switch (a) {
+                case GET: return "getElement";
+                case SET: return "setElement";
+                case LENGTH: return "length";
+            }
+            throw new AssertionError();
+        }
+
+        static MethodHandle objectAccessor(ArrayAccess a) {
+            switch (a) {
+                case GET: return ArrayAccessor.OBJECT_ARRAY_GETTER;
+                case SET: return ArrayAccessor.OBJECT_ARRAY_SETTER;
+                case LENGTH: return ArrayAccessor.OBJECT_ARRAY_LENGTH;
+            }
+            throw new AssertionError();
+        }
+
+        static int cacheIndex(ArrayAccess a) {
+            switch (a) {
+                case GET: return ArrayAccessor.GETTER_INDEX;
+                case SET: return ArrayAccessor.SETTER_INDEX;
+                case LENGTH: return ArrayAccessor.LENGTH_INDEX;
+            }
+            throw new AssertionError();
+        }
+
+        static Intrinsic intrinsic(ArrayAccess a) {
+            switch (a) {
+                case GET: return Intrinsic.ARRAY_LOAD;
+                case SET: return Intrinsic.ARRAY_STORE;
+                case LENGTH: return Intrinsic.ARRAY_LENGTH;
+            }
+            throw new AssertionError();
+        }
+    }
+
     static final class ArrayAccessor {
-        /// Support for array element access
-        static final int GETTER_INDEX = 0, SETTER_INDEX = 1, INDEX_LIMIT = 2;
+        /// Support for array element and length access
+        static final int GETTER_INDEX = 0, SETTER_INDEX = 1, LENGTH_INDEX = 2, INDEX_LIMIT = 3;
         static final ClassValue<MethodHandle[]> TYPED_ACCESSORS
                 = new ClassValue<MethodHandle[]>() {
                     @Override
@@ -107,14 +153,16 @@ import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
                         return new MethodHandle[INDEX_LIMIT];
                     }
                 };
-        static final MethodHandle OBJECT_ARRAY_GETTER, OBJECT_ARRAY_SETTER;
+        static final MethodHandle OBJECT_ARRAY_GETTER, OBJECT_ARRAY_SETTER, OBJECT_ARRAY_LENGTH;
         static {
             MethodHandle[] cache = TYPED_ACCESSORS.get(Object[].class);
-            cache[GETTER_INDEX] = OBJECT_ARRAY_GETTER = makeIntrinsic(getAccessor(Object[].class, false), Intrinsic.ARRAY_LOAD);
-            cache[SETTER_INDEX] = OBJECT_ARRAY_SETTER = makeIntrinsic(getAccessor(Object[].class, true),  Intrinsic.ARRAY_STORE);
+            cache[GETTER_INDEX] = OBJECT_ARRAY_GETTER = makeIntrinsic(getAccessor(Object[].class, ArrayAccess.GET),    Intrinsic.ARRAY_LOAD);
+            cache[SETTER_INDEX] = OBJECT_ARRAY_SETTER = makeIntrinsic(getAccessor(Object[].class, ArrayAccess.SET),    Intrinsic.ARRAY_STORE);
+            cache[LENGTH_INDEX] = OBJECT_ARRAY_LENGTH = makeIntrinsic(getAccessor(Object[].class, ArrayAccess.LENGTH), Intrinsic.ARRAY_LENGTH);
 
             assert(InvokerBytecodeGenerator.isStaticallyInvocable(ArrayAccessor.OBJECT_ARRAY_GETTER.internalMemberName()));
             assert(InvokerBytecodeGenerator.isStaticallyInvocable(ArrayAccessor.OBJECT_ARRAY_SETTER.internalMemberName()));
+            assert(InvokerBytecodeGenerator.isStaticallyInvocable(ArrayAccessor.OBJECT_ARRAY_LENGTH.internalMemberName()));
         }
 
         static int     getElementI(int[]     a, int i)            { return              a[i]; }
@@ -137,31 +185,47 @@ import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
         static void    setElementC(char[]    a, int i, char    x) {              a[i] = x; }
         static void    setElementL(Object[]  a, int i, Object  x) {              a[i] = x; }
 
-        static String name(Class<?> arrayClass, boolean isSetter) {
+        static int     lengthI(int[]     a)                       { return a.length; }
+        static int     lengthJ(long[]    a)                       { return a.length; }
+        static int     lengthF(float[]   a)                       { return a.length; }
+        static int     lengthD(double[]  a)                       { return a.length; }
+        static int     lengthZ(boolean[] a)                       { return a.length; }
+        static int     lengthB(byte[]    a)                       { return a.length; }
+        static int     lengthS(short[]   a)                       { return a.length; }
+        static int     lengthC(char[]    a)                       { return a.length; }
+        static int     lengthL(Object[]  a)                       { return a.length; }
+
+        static String name(Class<?> arrayClass, ArrayAccess access) {
             Class<?> elemClass = arrayClass.getComponentType();
             if (elemClass == null)  throw newIllegalArgumentException("not an array", arrayClass);
-            return (!isSetter ? "getElement" : "setElement") + Wrapper.basicTypeChar(elemClass);
+            return ArrayAccess.opName(access) + Wrapper.basicTypeChar(elemClass);
         }
-        static MethodType type(Class<?> arrayClass, boolean isSetter) {
+        static MethodType type(Class<?> arrayClass, ArrayAccess access) {
             Class<?> elemClass = arrayClass.getComponentType();
             Class<?> arrayArgClass = arrayClass;
             if (!elemClass.isPrimitive()) {
                 arrayArgClass = Object[].class;
                 elemClass = Object.class;
             }
-            return !isSetter ?
-                    MethodType.methodType(elemClass,  arrayArgClass, int.class) :
-                    MethodType.methodType(void.class, arrayArgClass, int.class, elemClass);
+            switch (access) {
+                case GET:    return MethodType.methodType(elemClass,  arrayArgClass, int.class);
+                case SET:    return MethodType.methodType(void.class, arrayArgClass, int.class, elemClass);
+                case LENGTH: return MethodType.methodType(int.class,  arrayArgClass);
+            }
+            throw new IllegalStateException("should not reach here");
         }
-        static MethodType correctType(Class<?> arrayClass, boolean isSetter) {
+        static MethodType correctType(Class<?> arrayClass, ArrayAccess access) {
             Class<?> elemClass = arrayClass.getComponentType();
-            return !isSetter ?
-                    MethodType.methodType(elemClass,  arrayClass, int.class) :
-                    MethodType.methodType(void.class, arrayClass, int.class, elemClass);
+            switch (access) {
+                case GET:    return MethodType.methodType(elemClass,  arrayClass, int.class);
+                case SET:    return MethodType.methodType(void.class, arrayClass, int.class, elemClass);
+                case LENGTH: return MethodType.methodType(int.class,  arrayClass);
+            }
+            throw new IllegalStateException("should not reach here");
         }
-        static MethodHandle getAccessor(Class<?> arrayClass, boolean isSetter) {
-            String     name = name(arrayClass, isSetter);
-            MethodType type = type(arrayClass, isSetter);
+        static MethodHandle getAccessor(Class<?> arrayClass, ArrayAccess access) {
+            String     name = name(arrayClass, access);
+            MethodType type = type(arrayClass, access);
             try {
                 return IMPL_LOOKUP.findStatic(ArrayAccessor.class, name, type);
             } catch (ReflectiveOperationException ex) {
@@ -1282,6 +1346,7 @@ import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
         NEW_ARRAY,
         ARRAY_LOAD,
         ARRAY_STORE,
+        ARRAY_LENGTH,
         IDENTITY,
         ZERO,
         NONE // no intrinsic associated
diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
index c3a97a178a3..2be727ffb0f 100644
--- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -2244,6 +2244,20 @@ return mh1;
         return ani.asType(ani.type().changeReturnType(arrayClass));
     }
 
+    /**
+     * Produces a method handle returning the length of an array.
+     * The type of the method handle will have {@code int} as return type,
+     * and its sole argument will be the array type.
+     * @param arrayClass an array type
+     * @return a method handle which can retrieve the length of an array of the given array type
+     * @throws NullPointerException if the argument is {@code null}
+     * @throws IllegalArgumentException if arrayClass is not an array type
+     */
+    public static
+    MethodHandle arrayLength(Class<?> arrayClass) throws IllegalArgumentException {
+        return MethodHandleImpl.makeArrayElementAccessor(arrayClass, MethodHandleImpl.ArrayAccess.LENGTH);
+    }
+
     /**
      * Produces a method handle giving read access to elements of an array.
      * The type of the method handle will have a return type of the array's
@@ -2256,7 +2270,7 @@ return mh1;
      */
     public static
     MethodHandle arrayElementGetter(Class<?> arrayClass) throws IllegalArgumentException {
-        return MethodHandleImpl.makeArrayElementAccessor(arrayClass, false);
+        return MethodHandleImpl.makeArrayElementAccessor(arrayClass, MethodHandleImpl.ArrayAccess.GET);
     }
 
     /**
@@ -2271,7 +2285,7 @@ return mh1;
      */
     public static
     MethodHandle arrayElementSetter(Class<?> arrayClass) throws IllegalArgumentException {
-        return MethodHandleImpl.makeArrayElementAccessor(arrayClass, true);
+        return MethodHandleImpl.makeArrayElementAccessor(arrayClass, MethodHandleImpl.ArrayAccess.SET);
     }
 
     /**
diff --git a/jdk/test/java/lang/invoke/ArrayLengthTest.java b/jdk/test/java/lang/invoke/ArrayLengthTest.java
new file mode 100644
index 00000000000..3eabf9789c2
--- /dev/null
+++ b/jdk/test/java/lang/invoke/ArrayLengthTest.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2016, 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.
+ */
+
+/* @test
+ * @run testng/othervm -ea -esa test.java.lang.invoke.ArrayLengthTest
+ */
+package test.java.lang.invoke;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+
+import static org.testng.AssertJUnit.*;
+
+import org.testng.annotations.*;
+
+public class ArrayLengthTest {
+
+    @DataProvider
+    Object[][] arrayClasses() {
+        return new Object[][] {
+                {int[].class},
+                {long[].class},
+                {float[].class},
+                {double[].class},
+                {boolean[].class},
+                {byte[].class},
+                {short[].class},
+                {char[].class},
+                {Object[].class},
+                {StringBuffer[].class}
+        };
+    }
+
+    @Test(dataProvider = "arrayClasses")
+    public void testArrayLength(Class<?> arrayClass) throws Throwable {
+        MethodHandle arrayLength = MethodHandles.arrayLength(arrayClass);
+        assertEquals(int.class, arrayLength.type().returnType());
+        assertEquals(arrayClass, arrayLength.type().parameterType(0));
+        Object array = MethodHandles.arrayConstructor(arrayClass).invoke(10);
+        assertEquals(10, arrayLength.invoke(array));
+    }
+
+    @Test(dataProvider = "arrayClasses", expectedExceptions = NullPointerException.class)
+    public void testArrayLengthInvokeNPE(Class<?> arrayClass) throws Throwable {
+        MethodHandle arrayLength = MethodHandles.arrayLength(arrayClass);
+        arrayLength.invoke(null);
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class)
+    public void testArrayLengthNoArray() {
+        MethodHandles.arrayLength(String.class);
+    }
+
+    @Test(expectedExceptions = NullPointerException.class)
+    public void testArrayLengthNPE() {
+        MethodHandles.arrayLength(null);
+    }
+
+}

From 807e2b367c0ea126d382d05ab5c3590882728135 Mon Sep 17 00:00:00 2001
From: Claes Redestad <redestad@openjdk.org>
Date: Wed, 18 May 2016 16:28:42 +0200
Subject: [PATCH 131/228] 8157090: SharedArchiveFile/SpaceUtilizationCheck.java
 fails as space utilization is below 30 percent

Reviewed-by: iklam, mseledtsov
---
 hotspot/src/share/vm/memory/metaspaceShared.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hotspot/src/share/vm/memory/metaspaceShared.hpp b/hotspot/src/share/vm/memory/metaspaceShared.hpp
index be7b1bacb97..34d12eb3794 100644
--- a/hotspot/src/share/vm/memory/metaspaceShared.hpp
+++ b/hotspot/src/share/vm/memory/metaspaceShared.hpp
@@ -43,11 +43,11 @@
 // for the x64 platform
 #define DEFAULT_VTBL_COMMON_CODE_SIZE   (1*K) // conservative size of the "common_code" for the x64 platform
 
-#define DEFAULT_SHARED_READ_WRITE_SIZE  (NOT_LP64(9*M) LP64_ONLY(10*M))
-#define MIN_SHARED_READ_WRITE_SIZE      (NOT_LP64(7*M) LP64_ONLY(10*M))
+#define DEFAULT_SHARED_READ_WRITE_SIZE  (NOT_LP64(6*M) LP64_ONLY(10*M))
+#define MIN_SHARED_READ_WRITE_SIZE      (NOT_LP64(6*M) LP64_ONLY(10*M))
 
-#define DEFAULT_SHARED_READ_ONLY_SIZE   (NOT_LP64(9*M) LP64_ONLY(10*M))
-#define MIN_SHARED_READ_ONLY_SIZE       (NOT_LP64(9*M) LP64_ONLY(10*M))
+#define DEFAULT_SHARED_READ_ONLY_SIZE   (NOT_LP64(6*M) LP64_ONLY(10*M))
+#define MIN_SHARED_READ_ONLY_SIZE       (NOT_LP64(6*M) LP64_ONLY(10*M))
 
 // the MIN_SHARED_MISC_DATA_SIZE and MIN_SHARED_MISC_CODE_SIZE estimates are based on
 // the sizes required for dumping the archive using the default classlist. The sizes

From 46627989d5358eafd15beeba8a6b08dad312f622 Mon Sep 17 00:00:00 2001
From: Andreas Eriksson <aeriksso@openjdk.org>
Date: Wed, 18 May 2016 11:06:00 +0200
Subject: [PATCH 132/228] 8135322: ConstantPool::release_C_heap_structures not
 run in some circumstances

Reviewed-by: coleenp, sspitsyn
---
 hotspot/src/share/vm/classfile/classLoaderData.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hotspot/src/share/vm/classfile/classLoaderData.cpp b/hotspot/src/share/vm/classfile/classLoaderData.cpp
index 3ca97efb7a0..a9829a0393e 100644
--- a/hotspot/src/share/vm/classfile/classLoaderData.cpp
+++ b/hotspot/src/share/vm/classfile/classLoaderData.cpp
@@ -382,6 +382,10 @@ void ClassLoaderData::unload() {
     }
     log->cr();
   }
+
+  // In some rare cases items added to this list will not be freed elsewhere.
+  // To keep it simple, just free everything in it here.
+  free_deallocate_list();
 }
 
 PackageEntryTable* ClassLoaderData::packages() {

From ea55d0b71be5ef90920e385a52f29a54abc7a413 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Wed, 18 May 2016 15:03:39 +0530
Subject: [PATCH 133/228] 8154192: Deprivilege java.scripting module

Reviewed-by: jlaskey, alanb
---
 jdk/src/java.base/share/conf/security/java.policy |  4 ++++
 jdk/test/javax/script/ProviderTest.sh             | 12 +++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/jdk/src/java.base/share/conf/security/java.policy b/jdk/src/java.base/share/conf/security/java.policy
index 0400ebfd546..32d31472394 100644
--- a/jdk/src/java.base/share/conf/security/java.policy
+++ b/jdk/src/java.base/share/conf/security/java.policy
@@ -80,6 +80,10 @@ grant codeBase "jrt:/jdk.naming.dns" {
         permission java.security.AllPermission;
 };
 
+grant codeBase "jrt:/java.scripting" {
+        permission java.security.AllPermission;
+};
+
 grant codeBase "jrt:/jdk.scripting.nashorn" {
         permission java.security.AllPermission;
 };
diff --git a/jdk/test/javax/script/ProviderTest.sh b/jdk/test/javax/script/ProviderTest.sh
index 1db161dfcf6..24b4120912c 100644
--- a/jdk/test/javax/script/ProviderTest.sh
+++ b/jdk/test/javax/script/ProviderTest.sh
@@ -43,8 +43,18 @@ $JAR ${TESTTOOLVMOPTS} -cf ${TESTCLASSES}/dummy.jar \
     -C ${TESTCLASSES} DummyScriptEngineFactory.class \
     -C "${TESTSRC}" META-INF/services/javax.script.ScriptEngineFactory
 
-echo "Running test ..."
+echo "Running test with security manager ..."
+$JAVA ${TESTVMOPTS} -Djava.security.manager -classpath \
+  "${TESTCLASSES}${PS}${TESTCLASSES}/dummy.jar" \
+  ProviderTest
 
+ret=$?
+if [ $ret -ne 0 ]
+then
+  exit $ret
+fi
+
+echo "Running test without security manager ..."
 $JAVA ${TESTVMOPTS} -classpath \
   "${TESTCLASSES}${PS}${TESTCLASSES}/dummy.jar" \
   ProviderTest

From b67da697dfc392ce9b6c3c646d3a8317bd5e42ca Mon Sep 17 00:00:00 2001
From: Alexandre Iline <alexandre.iline@oracle.com>
Date: Wed, 18 May 2016 11:56:24 +0100
Subject: [PATCH 134/228] 8156972:
 java/lang/reflect/Layer/LayerAndLoadersTest.java test requires jdk.compiler

Reviewed-by: alanb
---
 .../lang/reflect/Layer/LayerAndLoadersTest.java    |  1 +
 jdk/test/lib/testlibrary/CompilerUtils.java        | 14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/jdk/test/java/lang/reflect/Layer/LayerAndLoadersTest.java b/jdk/test/java/lang/reflect/Layer/LayerAndLoadersTest.java
index b37813fd290..6a0cd78a241 100644
--- a/jdk/test/java/lang/reflect/Layer/LayerAndLoadersTest.java
+++ b/jdk/test/java/lang/reflect/Layer/LayerAndLoadersTest.java
@@ -24,6 +24,7 @@
 /**
  * @test
  * @library /lib/testlibrary
+ * @modules jdk.compiler
  * @build LayerAndLoadersTest CompilerUtils ModuleUtils
  * @run testng LayerAndLoadersTest
  * @summary Tests for java.lang.reflect.Layer@createWithXXX methods
diff --git a/jdk/test/lib/testlibrary/CompilerUtils.java b/jdk/test/lib/testlibrary/CompilerUtils.java
index 91ca9181340..261c2c8f930 100644
--- a/jdk/test/lib/testlibrary/CompilerUtils.java
+++ b/jdk/test/lib/testlibrary/CompilerUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,13 +50,21 @@ public final class CompilerUtils {
      *
      * @return true if the compilation is successful
      *
-     * @throws IOException if there is an I/O error scanning the source tree or
-     *                     creating the destination directory
+     * @throws IOException
+     *         if there is an I/O error scanning the source tree or
+     *         creating the destination directory
+     * @throws UnsupportedOperationException
+     *         if there is no system java compiler
      */
     public static boolean compile(Path source, Path destination, String ... options)
         throws IOException
     {
         JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+        if (compiler == null) {
+            // no compiler available
+            throw new UnsupportedOperationException("Unable to get system java compiler. " +
+                "Perhaps, jdk.compiler module is not available.");
+        }
         StandardJavaFileManager jfm = compiler.getStandardFileManager(null, null, null);
 
         List<Path> sources

From 65713ca08e5fde04a22b25314976ca364916d409 Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Wed, 18 May 2016 16:58:10 +0300
Subject: [PATCH 135/228] 8156581: Cleanup of ProblemList.txt

Reviewed-by: prr, alexsch
---
 jdk/test/ProblemList.txt | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 3766c76ec25..6e1cd7385d4 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -116,10 +116,8 @@
 
 # jdk_beans
 
-java/beans/XMLEncoder/Test4903007.java                          8060027 generic-all
-java/beans/XMLEncoder/java_awt_GridBagLayout.java               8060027 generic-all
-java/beans/XMLDecoder/8028054/TestConstructorFinder.java        8060027 generic-all
-java/beans/XMLDecoder/8028054/TestMethodFinder.java             8060027 generic-all
+java/beans/XMLDecoder/8028054/TestConstructorFinder.java        8156579 generic-all
+java/beans/XMLDecoder/8028054/TestMethodFinder.java             8156579 generic-all
 
 java/beans/Introspector/8132566/OverridePropertyInfoTest.java   8132565 generic-all
 java/beans/Introspector/8132566/OverrideUserDefPropertyInfoTest.java 8132565 generic-all
@@ -300,7 +298,6 @@ sun/security/x509/URICertStore/ExtensionsWithLDAP.java          8134577 generic-
 
 # jdk_sound
 
-javax/sound/midi/Gervill/SoftProvider/GetDevice.java            8059743 generic-all
 javax/sound/sampled/DirectAudio/bug6400879.java                 8148915 linux-all
 
 ############################################################################

From f3c9c10b7e1faf8d8c4987e82c682182ea84acb9 Mon Sep 17 00:00:00 2001
From: Xue-Lei Andrew Fan <xuelei@openjdk.org>
Date: Wed, 18 May 2016 14:47:28 +0000
Subject: [PATCH 136/228] 8157035: Use stronger algorithms and keys for JSSE
 testing

Reviewed-by: weijun, jnimeh
---
 jdk/test/javax/net/ssl/etc/README     |  94 ++++++++++++++++++++++++++
 jdk/test/javax/net/ssl/etc/keystore   | Bin 4605 -> 4038 bytes
 jdk/test/javax/net/ssl/etc/truststore | Bin 2489 -> 2207 bytes
 3 files changed, 94 insertions(+)
 create mode 100644 jdk/test/javax/net/ssl/etc/README

diff --git a/jdk/test/javax/net/ssl/etc/README b/jdk/test/javax/net/ssl/etc/README
new file mode 100644
index 00000000000..0ac6a844a86
--- /dev/null
+++ b/jdk/test/javax/net/ssl/etc/README
@@ -0,0 +1,94 @@
+Keystores used for the JSSE regression test suite.
+
+keystore
+truststore
+==========
+
+These are the primary two keystores and contain entries for testing most
+of the JSSE regression test files.  There are three entries, one RSA-based,
+one DSA-based and one EC-based.  If they expire, simply recreate them
+using keytool and most of the test cases should work.
+
+The password on both files is:
+
+    passphrase
+
+There are no individual key entry passwords at this time.
+
+
+keystore entries
+================
+
+Alias name: dummy
+-----------------
+Creation date: May 16, 2016
+Entry type: PrivateKeyEntry
+Certificate chain length: 1
+Certificate[1]:
+Owner: CN=dummy.example.com, OU=Dummy, O=Dummy, L=Cupertino, ST=CA, C=US
+Issuer: CN=dummy.example.com, OU=Dummy, O=Dummy, L=Cupertino, ST=CA, C=US
+Serial number: 57399b87
+Valid from: Mon May 16 10:06:38 UTC 2016 until: Sat May 16 10:06:38 UTC 2026
+Signature algorithm name: SHA256withRSA
+Version: 1
+
+This can be generated using hacked (update the keytool source code so that
+it can be used for version 1 X.509 certificate) keytool command:
+% keytool -genkeypair -alias dummy -keyalg RSA -keysize 2048 \
+  -sigalg SHA256withRSA \
+  -dname "CN=dummy.example.com, OU=Dummy, O=Dummy, L=Cupertino, ST=CA, C=US" \
+  -validity 3652 -keypass passphrase -keystore keystore -storepass passphrase
+
+
+Alias name: dummyecdsa
+----------------------
+Creation date: May 16, 2016
+Entry type: PrivateKeyEntry
+Certificate chain length: 1
+Certificate[1]:
+Owner: CN=dummy.example.com, OU=Dummy, O=Dummy, L=Cupertino, ST=CA, C=US
+Issuer: CN=dummy.example.com, OU=Dummy, O=Dummy, L=Cupertino, ST=CA, C=US
+Serial number: 57399c1d
+Valid from: Mon May 16 10:09:01 UTC 2016 until: Sat May 16 10:09:01 UTC 2026
+Signature algorithm name: SHA256withECDSA
+Version: 1
+
+This can be generated using hacked (update the keytool source code so that
+it can be used for version 1 X.509 certificate) keytool command:
+% keytool -genkeypair -alias dummy -keyalg EC -keysize 256 \
+  -sigalg SHA256withECDSA \
+  -dname "CN=dummy.example.com, OU=Dummy, O=Dummy, L=Cupertino, ST=CA, C=US" \
+  -validity 3652 -keypass passphrase -keystore keystore -storepass passphrase
+
+Alias name: dummydsa
+--------------------
+Creation date: Mar 11, 2007
+Entry type: PrivateKeyEntry
+Certificate chain length: 1
+Certificate[1]:
+Owner: CN=dummy.example.com, OU=Dummy, O=Dummy, L=Cupertino, ST=CA, C=US
+Issuer: CN=dummy.example.com, OU=Dummy, O=Dummy, L=Cupertino, ST=CA, C=US
+Serial number: 45f3a314
+Valid from: Sun Mar 11 06:35:00 UTC 2007 until: Wed Mar 08 06:35:00 UTC 2017
+Certificate fingerprints:
+Signature algorithm name: SHA1withDSA
+Version: 1
+
+This can be generated using hacked (update the keytool source code so that
+it can be used for version 1 X.509 certificate) keytool command:
+% keytool -genkeypair -alias dummy -keyalg DSA -keysize 1024 \
+  -sigalg SHA1withDSA \
+  -dname "CN=dummy.example.com, OU=Dummy, O=Dummy, L=Cupertino, ST=CA, C=US" \
+  -validity 3652 -keypass passphrase -keystore keystore -storepass passphrase
+
+
+truststore entries
+==================
+This key store contains only trusted certificate entries.  The same
+certificates are used in both keystore and truststore.
+
+
+unknown_keystore
+================
+A keystore you can use when you don't want things to be verified.
+Use this with keystore/truststore, and you'll never get a match.
diff --git a/jdk/test/javax/net/ssl/etc/keystore b/jdk/test/javax/net/ssl/etc/keystore
index 2eb1993f3aff3d996d7970001765fc3e8fb8d1f7..4062e1798c56b1bbd8840466fb04c4b6d46dfae6 100644
GIT binary patch
delta 2691
zcmcImc{J4h8lT_Hm>K(;Wvm(GCH%%PV~~g}DO<cIR3uq4_9Zk8LkLj_QIRFGg=9CP
zo2*44>nO|MEnBE$d-dM)p3}YO+&}I)_x|ym^L)O~_k5q{`8?nA{d{*Y?UEe3i@S>u
z2n4!suu6^*IMupdgy_1Du7aT;7lKU@0l)zTC@%o8K;UkaSeYxXtCNGy{IVWPa<dXL
zi4V^x_N_ESI-8qg8jyQ8u5gBk2w0R0;)wwS%g77`r@Oj63@f?Ccksk0{1)GW0&VDO
zR7N`(Y8GpC)^H#(Yr5E1Pqbw^C=MOZSEcRDt>Rz19Q&ewzW@NjLQ+--iThqFNCTSp
z?E(~TOS~rzvLR3k(Z;Wjz+upo4}dTi2UK4V%LnoxU^Z|hM+(5sf0~2EAdpNB!E%8d
zKUdlR#%NIZCx&tGUi=wXcDdq2_VIL4cJ?NN5<;9<JgAPvV?mGzV(o-DRey#5Ar<xS
zqyL*!zwZ}|{Hq5jfM8LKfJ4||#~^Scn3UG$sG(m}(1WoSf6n}-inT<^84ILZ%CvUg
zGnxl-V>VD07+1N8jL^{I#+yil72T%_bTo*%J*jlt=zdH8l^U1{1T=&mgxr24NmZ3H
z8UNty30AR&wY??@Mhpyj$eHUNBnXMk6zp%g)AbDZP7f?GFQ`eQKx2lI&98=cM>I6T
z;hXE$%^unR9LHab?T^E{Uidf#0%3uHH25A!{r6i!gMW%!vs)XJ==1S2-@LPmb=Vs?
z;gWTGGuvB(A(|cfy2vqF<tYPWmSq3s+UOy1ao_a~OT$dYvmxu_1&5vd1j;WI;udOV
zFPv;+rYD%^>%v{8g9&0>BNaLtBx$j=WsL(jT;t5u+25GmwPDmyGh*I6h>p1*{v~sY
z_nLXbc9I+KcHPqR?SYRKf=~CNT>S{WC}x=av~2I2=caj0+o(}k=|mDTShL?zw(bSf
zw~PD0jKqA4((9snW><ku4r|Zm*&jVpm_hx99eqiZyFtK}VPV|&$l5~~MGmzSMT3k|
zrTqG|Bh}cVHuYk8Y8%`512Uu0m}nU$KbvywLk^21PW2VVNcb>|Z#@Zik8oN1%+-t_
z#~hIj4-ngjbWO`*R<IGJB?@$Um3EP)p_M4^>^=;pb3`}5bJMP07Yn-dZPlhLqRJbL
z?2d0ddwi?sBQ-wmgk6wtENwa}!k=@B&R#t5jqfvEOn#nPT1U`|on?r9hBJ~cq4NZe
zG5j5P`{~=bC+|~#uPHnlo;n87wQz+dUpxNb=FZ>alYW~VSfX@ewA&yln2?us;_E+B
z>Lp$}T6B#`%o6(2u+l)^)HwG<WhJVGBt!E=`p2!_Co9b>2fT973>qznhjJjUdu41?
z>(l2~Dl@57C4oIrRuQM;+P#{2JHfhY(F-BnDwQRj_HcOk$~Gms9Wt;+&;OzS3g$ff
zIy&e4gZdqp7c)&eV~uZOC70!fZYA`#9PTNt2Rj{&Y(qNC<iZ0lmF2Qbvv6yT+xZ!!
zAkUbd?k{z&wQ(R*<x384e4lZ87;<PDlLg5!<$_YjMOa5j=-D(GdXTL1jK~wtJDc{`
zaAhG7IicJ#X@M`2l4l=^H&3Seet>F+Cyi?EBrR}OZI4#XiL?fRNcZ@<`gx&~i5Tim
zh_sGFo)DSG*cKnS=9Zq2&zfvpK0K%)&MnmDwY^$};%2GGpw=nNS-09fRLZKdG(t;8
z-cxgZom5zHbHiOkn{$$BtD}>{8Ix=l9TVDXI=A=uUoPu=Qlwq2iw9K}O119kuC=2I
zf{p-o8f7)Eq%Pd_`gMjaN{j3#-n3F|gwKw5ns&O}&UYEs{Rdl$@_Kfwt~B}Z;=8z`
z2fg(M(Kp$B>lLh+*5_J@%U7p5x|x?gAEaiE^q*Y#1V6=I`$*@!zAamxeyLuxGt+H~
z0ksQ#!%D$szimYAww{0RV}_28)a1RLEpR!DnH1ASG6?8c5EUK@gK<oJ?C`5w>H5g`
zyp@6P{r<phkT=5L<GUI?RsCgAwV@S{&$&@{a)ZE%D*Yua6du_VSYeCqx8j)_F{QdX
zL66DUtjetaq4UyYm-hqaGPpjs8)hFW@58>CU{IV=Z7US_p2Sp85NQoK711sKC6P<M
zy<^pQX#R@7Zj;hY_a&+7mOjOdLAe%0@!WDUU)oefnmjK}cgaP}m&?K1r(dFOso&g3
zKw049y%0bxuA=5)c$X#Dv3S9gAKy`JcEtqIKAzLxZcgL|B>ABym?7nhIpyc(8YZ|d
zU3~P|cS^V*(&o1+xY+6qHcC`WhPK11qtqI)(Ocsw5f#FeKr5M*HEaj#b6*jByvVcG
z&9;bnGCZ;FdBSMj@$?FP>&WO<TN~Ug+K{=?8gaYH>Ts%5ZB9T|=2t}S&Z~E-<+8WG
zC+qOt`WMZDnS(T#DM*9jeri@$49JOK-GA?+zi|QpdkO<U|35?vkJI>7w0^?>rD)Lr
z>0jH}{}I4w05@b`nAxB-0DyFg>gw2cc&%n*(rgK_t&K+3-yUsOxi|phq<gq8X<^LD
zi2HZLYuF3Vnp5c=>mwKEg->Ok{E>gK)S<@JVrqB8KibCKhpG3%S}*nH=g}EqcNa3^
zZJFA!;WNIX*SBqCEIgT3%u1RU<@ZwT(c1H%f#DR~@*F`{HJLf)lYHIL>A(+p&5k5v
z60GKuhUAx-Q+lHA@s+;`^(*kRWj%~YkR>h2G{+$t$6irQwsKCZ0gvUQ-ea!mZ3b`A
zQ^)+7UfyHfBj0d7@)k`OM?(5CA*5RM3${iZ{Gp%r=<k~n?vpB8-=0v)@7uk|Ks9Us
z_9Sczqg>$?^Wpoa!WQHfm<NRc5a3si*#F`PfSfsyd!u@C!%+85=<dkf2$1@M3xCVZ
zGCwPfulH#lI!YwZw;v>O7tHa9+a}oXXu_fw<p$Ct&nqXNOJrWq$ET0AH0mrKSM=h;
z=sc^4bnmpcU)|K5bB|4+G)QXt7z2;Yuog?+Cb=DZW626Y{>eU;a_w61)C#3nEcouC
z=_~XaTGa0%aYIhTyFd5sGIf|RUXnN9BdofuWpSx+vbp@4Q*O&V(K6;v(^rr|$c(zn
zCoLJu(oA&Aw97>l@u$-x5QRpSgaxN)k3*QN6OK{=iQRa;8@2paf{*XWsLd0)7L407
zf)B*M+<bntS=}WUU2iS^qC#Qr7O|Lo>QQ<~=H;l0$;fi(_SZ;?3E~Yv-ee#B6M`;;
ARsaA1

delta 2575
zcmah~do)yQAD+Eu&oG6MF*C;~xg_PX8KNSmjE1gKQ7X6G7AB&RORc$7M7hpLHzt%L
zMxuriNo6#`iInIFN#q)GH+)-P-&be#UH*92+Q0Sw-nF0K`#jJ4h?Yw<Wab9u22dyz
zh%Bf;rWs;tuPW&CLaKb2Er8{)i`HNP2v`j&000IBu`e@v2}`HYrDa9=SCSOHoSqm*
z*<*$^ryC6n!FZZ5Ej%kR`Ze_tj<!8?Urp?EeOQ`9jYfrHq4!uBsm%M#nbxl?Hm}&?
zVD4FhVocP4CC}{r6K;N5MPjvnOz8=}ILV7r23wFTcBHIg-Hp#5;jS2@*x3%y6|QEL
zXU9t=zP73J=yW^wY8(h9sdP=$)|HFAtO9lgbGYje%m50rU*7~qK7lNl17slU0Ek0%
z@SI&zJB$Wl99C*|q)nX#1aRAdK(ZkWQ($9woe6AW;zW?87{W$|M&C=MfzGsrmwrD1
z0$Ay9N6`R)HbOxU+FzVWxbv)OTwKK*_LLA+I%d>k&%QU`KxO*I33K&i_jSM3;osB_
zA_p>L6`RL@`Zd}N1)G2*RMl1;@Q6iZpJE4lRI|KZF2AePb2y>*14zWys(Zw))|+E8
zf{kjKHe$y{*#X&#7kw`O9MOY8r-vaUDp(2?sR(r?Fb6F9g(?o1(S2v{(97f;D}gVq
z4vzj5aC3hT`?y251PX12*9LtWSsJoepvG+@6(^Qc7?LOxo@GZw(6v`&zsl3VEgM2L
zGmE>erL`M9bBMlkZTWdx&qEUSwAdtk?oi=r;Nr?QUdT$}lW9Ts(}`)UdzDtHe#@-$
z{YB64G@}v2&7Y!Km|a#DNzy&H>dpN^4`;opEx>LfzsSpWJY~C=`8j1j57ymCoO*QE
zU^vI__rb$E%LwLAqn=+koOch;J%+uflgnI}&9(YN@bFmi<pU%4S_auoykn$R|8?d#
zeI?$KW(Vtcnx7utNIE@99Nk!?W53(I18+F|dN@YZ>{cff2%Z@fH64WL>J0Ww`=*E#
z1?!00L4p+`zwy5$%swbECSRqGrdK6vGi8;cwY0|shpBJiTS-m&(qkfHEeH+x2BwzY
zd{K>gS!bm}f#TsCNtdb4cqaq0;37ZmE|+k{y7QInoNhzQ&9rliE7kObEAdf+LDTut
zdWn?^o_6a^!xb{MnpNn-O7+VQ7)m@3v5zIwPpDlJUD#Z5K}E)1J6s`qNZ#T@`p(<n
z{i>j8XM&zK=Z+>hqtH!T(lyVGXZjBkN7rDbL*%#f;cWbo+3^FXZc81RxzV2>bd2~i
zsh|D<K3=GQTP%G^^!_<GopqD(E;PQ^va$D}Zp;2>W;@6wbFziywetLI0^l~f<BNVV
zM)~vDo;(cE!rzZ%W6Hm9?@xE4@fOBg>%ozZ`1F9rdz`qL_JUS+T}=$Rlu3GVcG0SM
z1<_+$y+3zU6W*9uOVwMMEwu>jo3SqzdR(`y>Pg)qZNn<Y1njGfDDW5JG!vF_o_d~(
zN^dNSxOBb-7qux(iZHVN)~Q`HVa-pI#17}XQ^||+{4%2QRIr=ai~t=q%HNC&Zbj6*
z1u<?u2q{>PW-7z7SRCTK$O%~hfVl60Qwm0iR}D=O>zcu9DJHOy(>JfO`9F6ej}@97
zi-OtFAe)U!t@K&4r&8PIl{Jsn)-_R-wMSa)>N4&4Jm!98w5G^RB&2KApWK-9D9dZJ
zkU>1)o#W%}cO}a8@ZO26o7E{!7ar}*^p|_N;eOp%W`@&tY3$w4b}<gGGVLP8QmcS3
z0agY#nAEIfRle##%z*|Gq5iXS7s{|?++NZe_n^5u+5kiYDBx#&&;mX-YVYGOv9Y+=
zD&<B(+pf(?_^7n9E%o)sSX<kBq>VeW+j65ZO|FH16j-EN)`-p?OxdmF?Rb*-rX`2A
z3@}h^f8|1@#RW!naXj3ZXy8*_@-8QyYCqm7IGS!89fxN-oRu=wf4QMDLHFeRSL6Nt
z^KJ7AoN>Z)+dYCA9@ew4$>-bM%Y1uLJdb$z1O>Yx4~w=gZD<17`7aT0digedCaO^H
z>T@5rk;-jeZIKM!4kjxio5nfV^8E0_eJJ<0i=$^tCuMPRBu95u4V|K~6Iu<O_DxJ0
zUZS<?<LfnAuP0IKhtixcjb1QyQl=(0fjGgaFeo$oBYehfkdZ-l9Sf#V93D5stoU@F
zwVO;XziREu+r#jzxSAUz^T?>n`~fHDaBG8e9@j=mS*iPw`MS$IljAZ7Xz<?|03JuA
z6o^Qv`8pZ|KoEmU$gLgvnFS061@Gjpz$$Ym0W&pt8KSF&NI*12LBar$nbA5!BoV%s
z|0fbcI&#$I4HD;TOQh1xN#x|CBkCldeEvz%{@rHTyD?Avufp=id0H&=v#Ij_HNl>l
zY#z)`gcoDc`&5@e5E?}Hz^V&{9Ha~>t;zOh<k4$PFMSQXM~wBb?QC@-!bh-j$i4=2
z2zE-hzhU<SJCg&+|2o@(!aS9z^_@_T_vN&^w)pL$d|>lYJB=iza%zWM-w9|67ABUR
zuRRwibbj|R{;XO;ny>Z1K+=GQUg~d$hPq8$d$$MnNiJ?PXnwCFd7m^!Nr+A_T^+un
z%SG~$3(m||tk+<1HD6Gv#{Gm*U9V11XOY5NpvX;k-1uJ2M%IT$-;y76C?a&oA#|Jo
z{}b3B!>Ip_2qW0+U)fASh*&6pv@+rUW&8RX54%<|THrz`E;*AP<{CZ{Kvpj*r?ajF
zY4o;*#fd);Fb;ZEz{#N56pv|mDO2fl(z0rI*N-*SCwad8GxD|*b+>#fS9SH1S2HeK
zMH1fv_BJXmm@Aw?%J0i=0uFM_F^`H{LrQKJd|TaGlUv?K{3SDVi9l+PunSHSox%NL
zdqi*xq{voQMTC+(XMrW7ywf%*Rlfmbr9;ay;)3sp3)R22R=6GAxYR5?bcf7%#g?gj
zcUXh^W%p{`OjjT^jI~^El7Fq#xytg<gVgG6m;=FJGm-qxD|ps1^!nogXfpI}-ODc1
zS-$rQ$)Iw7z5sd<BA?T2B~AK>-kM+0=H4qVF1PT6I!=aY7wI)Y4}vBuReI#+6O8@=
D$u>QV

diff --git a/jdk/test/javax/net/ssl/etc/truststore b/jdk/test/javax/net/ssl/etc/truststore
index 65a140d773206daf836779d70a5df75b51a5cd91..12da39e66a5d19aefdaa23c0810aa2dcb673c381 100644
GIT binary patch
delta 1276
zcmdlfJYSIK-`jt085kItfS7r+8<QimR>)4dW4jnwBlJuSEEyOW4;nNv?gio`CYEr^
zIkE;^Y#dr`9_MUXn3*O!vPn4cFgZIK3K<BnF^96S^Kd$s7Ni!HWai}?@)_`e#JG4^
zT}pFvD`9+Y7+=aj0wmAOGnt=FT*}PA)X>b(z`)YLFiM=)2#Gt{flacWa$5vbK(5eB
ztw_u*$Vt^p&d)Un1G<_W>=`CTHdgIM76vY6Ck7UGW(Dh?x7><a%I4kPU(CB?&xX(S
zeezEN*i9xswpqNjDU1E<(^6H&JNmusjTVmlW}b4@E9Q!v*d?8@eq+Yh)0g%khY_<U
zgMk~9BE!UG^7Tdvo_8K3=NN3_tUh!uLag!1wJbG%2SsynnI}tuN~WILYJAzzV733!
zZPRL*+OJLWuW2~lxNA2H%TK#6A$zmtgX4)6><?hX0OQFf3La0){sv9V-Udxf#-Mnb
z-EP3k#tHOV+jm|@M()WCOj6X2C^KUV<cI=tX%|sVj7rG<VPs`sZerwT0H#VVrY1&4
zhLh3`cF`yDKF(LJpB8T3ad5YL$oFM`Hl@Ze-ierF{ApVCvyF{&XEto(ULNbe@5Gmz
zDK8{^XZieEqPQkzTYA8we_xB+LNg1VIUWvioYMQ|))R@$)LgbpYfYSPL>5Z7{s~nH
z$axm@Y-3YiZP*$^`|a@tE^d!l0^`h8jV3+2T`;LNAyM>~hSiCFkBEBaZD|(rpPu+S
zN@sR&)D*v{CCoK@VPlVK#5<L}U2MB=ANTydAlQU)rAEtj<vPco<-hk$xn2A$FaP%G
zo8OHKGy?Xd+^oDXiy>mWX;QfRSK+GH|My+r(=#_><H1W_x=SwnOS#9f*G6-F^>1ap
z4SDSke!O13pZ&MNVkTxr21Z~Q)gvMu97v1|k)n$_x7`2g<}kJD-_4ng28a2~Cin#|
znO!Y(cJpGX7Rkkh7Y!`=mp&Je4etpRuwrg|t9E62bG+W9xV~pe&SukZ@850r)>S)C
zNZD@dhUUzZ(a|4&Iy}$p=&9W$Z&l#IxXjNm;9b7wq7(mbPtsznU*dCtb)C(21K$s|
zXJyJ~zV$vX^;t@~D8=%tnq>aPMVH>+Fu${U@s$Dzqd(RGY0K~LU00X5X#We#!1k$o
zz8TyzpVcx`NJ+kmb+2W{tf)n7D}<--Yh+vQzR~<;Vq2EFa?RZYg_6G0W{#cPg@eRa
zPE|2^VSehR$FUjZqTNS-9<W#6Ynr-9YG;V-;SE~PCs?k^^<6goSmXX13X?uFZ(vf2
O*gIj>mXoK~c>@5ADaWw@

delta 1084
zcmbO)xKlXz-`jt085kItfS3hL^QV;N=2jLJC#K~Wr6#9jFfcHx>-dB$V_=QYGc~XT
zDitzlV&XGsVk~E35m<fpy#X&9r&gOs+jm|@Mpjk^1HXx0eo6*%;=G0i2F3=a21dq4
z1{P7`yvBwGMux^vE?8B)LF0U6-HfaZ%#FPa292Fejg1T!&!hz0J;}T#UVQtmmW7oG
zRiE-@l(y~9ZJ1M}{OW#X-^rJ6OQX{c8cb!f_&KHCaK>Vhmy_g9B_%vL<8o+i)|=k~
zp5M={%s8s?^o@*G=}hM~i5rYT9@6owvzp!+JIF0%4CAZ+nsRXEdy&MRth<SKr{20z
zeTV1$3~|W^)d9tmj<s+yF*7nSBD)XhJ7%E6c#j^hu8>Uq!^r=6O0&oG<5G+=A~AA{
z`ieK4+@$p7?!m-7J7J536}~**4!ZqZpJbry@*z-5XK@1K+{y-d-5>Mk?1?*Wzi;Q<
zQ|7FZ#Y{IPWNxPw{|T>HaNsS=kBZIbE<82=Ge2GN?>n(K>({XCEE8CD)0so^3A5Mw
zgZGnOo!q|Pb|a4?v!1%fcF+0nNMT$CjF3e@9LdDV@Ni08{M?5|?+iHE*nu%~&X$F7
zqDO%YI6h1aEKLneO=0n21m#Zj$gTG@5QeH}Vr1h0Yh-3*WHw@8+4<mf%Y+R_u75ju
zy#8bAUkT}lzm<Ah@7Y+p)Mxc=U9HO-`uv9G{H5weG6ki)LN~u5S<Gy~U|`B5$#C3D
zlPTG@?X}Ru#?LDIFY>K_x+nGHgjbK4B-qX>rSxj){_`v?Hac7HaWec0?_1u3r(ef|
zlOroQIRX=*p#4@88@PX&ynu<&4d~zXOf0US7mFcB6U#)mT0tYA4-L(M3DCm8%ovym
zqd-2ym)zza&EO9{s_t>wb&C7_r{A|N3+6bP5dSOuMAweRohrvHj&03Vy;x(nYTvRn
zr>&(Dk?E^4(z9o^C&Y$)U$*qr^r)VFev5PXE?Dn4_jU22C?5{C%`XGG!Y(fkXgkTS
z!T2HHS$|2r%d)Am^JU+5MP524e(|N)QwGCb--7<$?b~_td8a-`a$|ucw~zxLdV4v0
zkBeOqzwhrfNwj_5Ubl-E3md#1yx=f-xZ?imPS)!Qo0f01U1)#iSZnn3K-Ki{8i{MS
zR=LYD>I*%%9Pi@ZSJ3{nDJ9X1neo}Vss2$@WZ#HJ6?f*EboPlhhPASr>s_!uIzgxA
y{}+>pH~;Vd7i{__e!??&&F?8}shh56l-%-&uzHgjaO}>Vju$K~JdUgH-UI+TS*uI{


From 5cf7ba5687666ba098913f3c4437846b6555c9d8 Mon Sep 17 00:00:00 2001
From: Artem Smotrakov <artem.smotrakov@oracle.com>
Date: Wed, 18 May 2016 16:39:08 +0100
Subject: [PATCH 137/228] 8157107: HTTP/2 client may fail with NPE if
 additional logging enabled

Reviewed-by: michaelm
---
 .../java/net/http/AsyncSSLDelegate.java       |  25 +-
 .../share/classes/java/net/http/Log.java      |   2 +-
 .../net/httpclient/http2/TLSConnection.java   | 247 ++++++++++++++++++
 .../java/net/http/Http2TestServer.java        |   7 +-
 4 files changed, 272 insertions(+), 9 deletions(-)
 create mode 100644 jdk/test/java/net/httpclient/http2/TLSConnection.java

diff --git a/jdk/src/java.httpclient/share/classes/java/net/http/AsyncSSLDelegate.java b/jdk/src/java.httpclient/share/classes/java/net/http/AsyncSSLDelegate.java
index b3ff5c311e4..ae0d19c6cde 100644
--- a/jdk/src/java.httpclient/share/classes/java/net/http/AsyncSSLDelegate.java
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/AsyncSSLDelegate.java
@@ -26,7 +26,6 @@ package java.net.http;
 import java.io.Closeable;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.concurrent.ExecutorService;
 import java.util.function.Consumer;
@@ -557,25 +556,37 @@ public class AsyncSSLDelegate implements Closeable, AsyncConnection {
     }
 
     static void logParams(SSLParameters p) {
-        if (!Log.ssl())
+        if (!Log.ssl()) {
             return;
+        }
+
         Log.logSSL("SSLParameters:");
         if (p == null) {
             Log.logSSL("Null params");
             return;
         }
-        for (String cipher : p.getCipherSuites()) {
-            Log.logSSL("cipher: {0}\n", cipher);
+
+        if (p.getCipherSuites() != null) {
+            for (String cipher : p.getCipherSuites()) {
+                Log.logSSL("cipher: {0}\n", cipher);
+            }
         }
+
+        // SSLParameters.getApplicationProtocols() can't return null
         for (String approto : p.getApplicationProtocols()) {
             Log.logSSL("application protocol: {0}\n", approto);
         }
-        for (String protocol : p.getProtocols()) {
-            Log.logSSL("protocol: {0}\n", protocol);
+
+        if (p.getProtocols() != null) {
+            for (String protocol : p.getProtocols()) {
+                Log.logSSL("protocol: {0}\n", protocol);
+            }
         }
-        if (p.getServerNames() != null)
+
+        if (p.getServerNames() != null) {
             for (SNIServerName sname : p.getServerNames()) {
                 Log.logSSL("server name: {0}\n", sname.toString());
+            }
         }
     }
 
diff --git a/jdk/src/java.httpclient/share/classes/java/net/http/Log.java b/jdk/src/java.httpclient/share/classes/java/net/http/Log.java
index 991edfefa6c..51e5ce9633e 100644
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Log.java
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Log.java
@@ -88,7 +88,7 @@ abstract class Log implements System.Logger {
                         logging |= TRACE;
                         break;
                     case "all":
-                        logging |= CONTENT|HEADERS|REQUESTS|FRAMES|ERRORS|TRACE;
+                        logging |= CONTENT|HEADERS|REQUESTS|FRAMES|ERRORS|TRACE|SSL;
                         break;
                 }
                 if (val.startsWith("frames")) {
diff --git a/jdk/test/java/net/httpclient/http2/TLSConnection.java b/jdk/test/java/net/httpclient/http2/TLSConnection.java
new file mode 100644
index 00000000000..f2721eb268e
--- /dev/null
+++ b/jdk/test/java/net/httpclient/http2/TLSConnection.java
@@ -0,0 +1,247 @@
+/*
+ * Copyright (c) 2016, 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 java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.http.Http2Handler;
+import java.net.http.Http2TestExchange;
+import java.net.http.Http2TestServer;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import javax.net.ssl.SSLParameters;
+import javax.net.ssl.SSLSession;
+
+/*
+ * @test
+ * @bug 8150769 8157107
+ * @summary Checks that SSL parameters can be set for HTTP/2 connection
+ * @modules java.httpclient
+ * @compile/module=java.httpclient java/net/http/Http2Handler.java
+ * @compile/module=java.httpclient java/net/http/Http2TestExchange.java
+ * @compile/module=java.httpclient java/net/http/Http2TestServer.java
+ * @run main/othervm TLSConnection
+ */
+public class TLSConnection {
+
+    private static final String KEYSTORE = System.getProperty("test.src")
+            + File.separator + "keystore.p12";
+   private static final String PASSWORD = "password";
+
+    public static void main(String[] args) throws Exception {
+
+        // enable all logging
+        System.setProperty("java.net.http.HttpClient.log", "all,frames:all");
+
+        // initialize JSSE
+        System.setProperty("javax.net.ssl.keyStore", KEYSTORE);
+        System.setProperty("javax.net.ssl.keyStorePassword", PASSWORD);
+        System.setProperty("javax.net.ssl.trustStore", KEYSTORE);
+        System.setProperty("javax.net.ssl.trustStorePassword", PASSWORD);
+
+        Handler handler = new Handler();
+
+        try (Http2TestServer server = new Http2TestServer(true, 0, handler)) {
+            server.start();
+
+            int port = server.getAddress().getPort();
+            String uriString = "https://127.0.0.1:" + Integer.toString(port);
+
+            // run test cases
+            boolean success = true;
+
+            SSLParameters parameters = null;
+            success &= expectFailure(
+                    "Test #1: SSL parameters is null, expect NPE",
+                    () -> connect(uriString, parameters),
+                    NullPointerException.class);
+
+            success &= expectSuccess(
+                    "Test #2: default SSL parameters, "
+                            + "expect successful connection",
+                    () -> connect(uriString, new SSLParameters()));
+            success &= checkProtocol(handler.getSSLSession(), "TLSv1.2");
+
+            // set SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA cipher suite
+            // which has less priority in default cipher suite list
+            success &= expectSuccess(
+                    "Test #3: SSL parameters with "
+                            + "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA cipher suite, "
+                            + "expect successful connection",
+                    () -> connect(uriString, new SSLParameters(
+                            new String[] { "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA" })));
+            success &= checkProtocol(handler.getSSLSession(), "TLSv1.2");
+            success &= checkCipherSuite(handler.getSSLSession(),
+                    "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA");
+
+            // set TLS_RSA_WITH_AES_128_CBC_SHA cipher suite
+            // which has less priority in default cipher suite list
+            // also set TLSv11 protocol
+            success &= expectSuccess(
+                    "Test #4: SSL parameters with "
+                            + "TLS_RSA_WITH_AES_128_CBC_SHA cipher suite,"
+                            + " expect successful connection",
+                    () -> connect(uriString, new SSLParameters(
+                            new String[] { "TLS_RSA_WITH_AES_128_CBC_SHA" },
+                            new String[] { "TLSv1.1" })));
+            success &= checkProtocol(handler.getSSLSession(), "TLSv1.1");
+            success &= checkCipherSuite(handler.getSSLSession(),
+                    "TLS_RSA_WITH_AES_128_CBC_SHA");
+
+            if (success) {
+                System.out.println("Test passed");
+            } else {
+                throw new RuntimeException("At least one test case failed");
+            }
+        }
+    }
+
+    private static interface Test {
+
+        public void run() throws Exception;
+    }
+
+    private static class Handler implements Http2Handler {
+
+        private static final byte[] BODY = "Test response".getBytes();
+
+        private volatile SSLSession sslSession;
+
+        @Override
+        public void handle(Http2TestExchange t) throws IOException {
+            System.out.println("Handler: received request to "
+                    + t.getRequestURI());
+
+            try (InputStream is = t.getRequestBody()) {
+                byte[] body = is.readAllBytes();
+                System.out.println("Handler: read " + body.length
+                        + " bytes of body: ");
+                System.out.println(new String(body));
+            }
+
+            try (OutputStream os = t.getResponseBody()) {
+                t.sendResponseHeaders(200, BODY.length);
+                os.write(BODY);
+            }
+
+            sslSession = t.getSSLSession();
+        }
+
+        SSLSession getSSLSession() {
+            return sslSession;
+        }
+    }
+
+    private static void connect(String uriString, SSLParameters sslParameters)
+            throws URISyntaxException, IOException, InterruptedException {
+
+        String body = HttpClient.create()
+                .sslParameters(sslParameters)
+                .version(HttpClient.Version.HTTP_2)
+                .build()
+                .request(new URI(uriString))
+                .body(HttpRequest.fromString("body"))
+                .GET()
+                .response()
+                .body(HttpResponse.asString());
+
+        System.out.println("Response: " + body);
+    }
+
+    private static boolean checkProtocol(SSLSession session, String protocol) {
+        if (session == null) {
+            System.out.println("Check protocol: no session provided");
+            return false;
+        }
+
+        System.out.println("Check protocol: negotiated protocol: "
+                + session.getProtocol());
+        System.out.println("Check protocol: expected protocol: "
+                + protocol);
+        if (!protocol.equals(session.getProtocol())) {
+            System.out.println("Check protocol: unexpected negotiated protocol");
+            return false;
+        }
+
+        return true;
+    }
+
+    private static boolean checkCipherSuite(SSLSession session, String ciphersuite) {
+        if (session == null) {
+            System.out.println("Check protocol: no session provided");
+            return false;
+        }
+
+        System.out.println("Check protocol: negotiated ciphersuite: "
+                + session.getCipherSuite());
+        System.out.println("Check protocol: expected ciphersuite: "
+                + ciphersuite);
+        if (!ciphersuite.equals(session.getCipherSuite())) {
+            System.out.println("Check protocol: unexpected negotiated ciphersuite");
+            return false;
+        }
+
+        return true;
+    }
+
+    private static boolean expectSuccess(String message, Test test) {
+        System.out.println(message);
+        try {
+            test.run();
+            System.out.println("Passed");
+            return true;
+        } catch (Exception e) {
+            System.out.println("Failed: unexpected exception:");
+            e.printStackTrace(System.out);
+            return false;
+        }
+    }
+
+    private static boolean expectFailure(String message, Test test,
+            Class<? extends Throwable> expectedException) {
+
+        System.out.println(message);
+        try {
+            test.run();
+            System.out.println("Failed: unexpected successful connection");
+            return false;
+        } catch (Exception e) {
+            System.out.println("Got an exception:");
+            e.printStackTrace(System.out);
+            if (expectedException != null
+                    && !expectedException.isAssignableFrom(e.getClass())) {
+                System.out.printf("Failed: expected %s, but got %s%n",
+                        expectedException.getName(),
+                        e.getClass().getName());
+                return false;
+            }
+            System.out.println("Passed: expected exception");
+            return true;
+        }
+    }
+
+}
diff --git a/jdk/test/java/net/httpclient/http2/java.httpclient/java/net/http/Http2TestServer.java b/jdk/test/java/net/httpclient/http2/java.httpclient/java/net/http/Http2TestServer.java
index 667a1d6ec55..3baefe142bb 100644
--- a/jdk/test/java/net/httpclient/http2/java.httpclient/java/net/http/Http2TestServer.java
+++ b/jdk/test/java/net/httpclient/http2/java.httpclient/java/net/http/Http2TestServer.java
@@ -42,7 +42,7 @@ import javax.net.ssl.SSLServerSocketFactory;
  * Http2Handler on additional threads. All threads
  * obtained from the supplied ExecutorService.
  */
-public class Http2TestServer {
+public class Http2TestServer implements AutoCloseable {
     final ServerSocket server;
     boolean secure;
     SettingsFrame serverSettings, clientSettings;
@@ -156,4 +156,9 @@ public class Http2TestServer {
         });
     }
 
+    @Override
+    public void close() throws Exception {
+        stop();
+    }
+
 }

From 0bad445941832843531331d8b0204eaa5e3243b1 Mon Sep 17 00:00:00 2001
From: Paul Sandoz <psandoz@openjdk.org>
Date: Wed, 18 May 2016 18:46:14 +0200
Subject: [PATCH 138/228] 8157152: Atomic add for VarHandle byte[]/ByteBuffer
 views is incorrect for endian conversion

Reviewed-by: fyuan, shade, vlivanov
---
 .../X-VarHandleByteArrayView.java.template    | 72 ++++++++++++-------
 .../VarHandleTestByteArrayAsChar.java         |  2 +-
 .../VarHandleTestByteArrayAsDouble.java       |  2 +-
 .../VarHandleTestByteArrayAsFloat.java        |  2 +-
 .../VarHandleTestByteArrayAsInt.java          |  2 +-
 .../VarHandleTestByteArrayAsLong.java         |  2 +-
 .../VarHandleTestByteArrayAsShort.java        |  2 +-
 .../invoke/VarHandles/generate-vh-tests.sh    | 16 +++--
 8 files changed, 63 insertions(+), 37 deletions(-)

diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template b/jdk/src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template
index a24e6c82186..66bf267476e 100644
--- a/jdk/src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template
@@ -271,22 +271,33 @@ final class VarHandleByteArrayAs$Type$s extends VarHandleByteArrayBase {
 #if[AtomicAdd]
 
         @ForceInline
-        static $type$ getAndAdd(ArrayHandle handle, Object oba, int index, $type$ value) {
+        static $type$ getAndAdd(ArrayHandle handle, Object oba, int index, $type$ delta) {
             byte[] ba = (byte[]) oba;
-            return convEndian(handle.be,
-                              UNSAFE.getAndAdd$RawType$(
-                                      ba,
-                                      address(ba, index(ba, index)),
-                                      convEndian(handle.be, value)));
+            if (handle.be == BE) {
+                return UNSAFE.getAndAdd$RawType$(
+                        ba,
+                        address(ba, index(ba, index)),
+                        delta);
+            } else {
+                return getAndAddConvEndianWithCAS(ba, index, delta);
+            }
         }
 
         @ForceInline
-        static $type$ addAndGet(ArrayHandle handle, Object oba, int index, $type$ value) {
-            byte[] ba = (byte[]) oba;
-            return convEndian(handle.be, UNSAFE.getAndAdd$RawType$(
-                    ba,
-                    address(ba, index(ba, index)),
-                    convEndian(handle.be, value))) + value;
+        static $type$ getAndAddConvEndianWithCAS(byte[] ba, int index, $type$ delta) {
+            $type$ nativeExpectedValue, expectedValue;
+            long offset = address(ba, index(ba, index));
+            do {
+                nativeExpectedValue = UNSAFE.get$RawType$Volatile(ba, offset);
+                expectedValue = $RawBoxType$.reverseBytes(nativeExpectedValue);
+            } while (!UNSAFE.weakCompareAndSwap$RawType$Volatile(ba, offset,
+                    nativeExpectedValue, $RawBoxType$.reverseBytes(expectedValue + delta)));
+            return expectedValue;
+        }
+
+        @ForceInline
+        static $type$ addAndGet(ArrayHandle handle, Object oba, int index, $type$ delta) {
+            return getAndAdd(handle, oba, index, delta) + delta;
         }
 #end[AtomicAdd]
 
@@ -503,23 +514,34 @@ final class VarHandleByteArrayAs$Type$s extends VarHandleByteArrayBase {
 #if[AtomicAdd]
 
         @ForceInline
-        static $type$ getAndAdd(ByteBufferHandle handle, Object obb, int index, $type$ value) {
+        static $type$ getAndAdd(ByteBufferHandle handle, Object obb, int index, $type$ delta) {
             ByteBuffer bb = (ByteBuffer) obb;
-            return convEndian(handle.be,
-                              UNSAFE.getAndAdd$RawType$(
-                                      UNSAFE.getObject(bb, BYTE_BUFFER_HB),
-                                      address(bb, indexRO(bb, index)),
-                                      convEndian(handle.be, value)));
+            if (handle.be == BE) {
+                return UNSAFE.getAndAdd$RawType$(
+                        UNSAFE.getObject(bb, BYTE_BUFFER_HB),
+                        address(bb, indexRO(bb, index)),
+                        delta);
+            } else {
+                return getAndAddConvEndianWithCAS(bb, index, delta);
+            }
         }
 
         @ForceInline
-        static $type$ addAndGet(ByteBufferHandle handle, Object obb, int index, $type$ value) {
-            ByteBuffer bb = (ByteBuffer) obb;
-            return convEndian(handle.be,
-                              UNSAFE.getAndAdd$RawType$(
-                                      UNSAFE.getObject(bb, BYTE_BUFFER_HB),
-                                      address(bb, indexRO(bb, index)),
-                                      convEndian(handle.be, value))) + value;
+        static $type$ getAndAddConvEndianWithCAS(ByteBuffer bb, int index, $type$ delta) {
+            $type$ nativeExpectedValue, expectedValue;
+            Object base = UNSAFE.getObject(bb, BYTE_BUFFER_HB);
+            long offset = address(bb, indexRO(bb, index));
+            do {
+                nativeExpectedValue = UNSAFE.get$RawType$Volatile(base, offset);
+                expectedValue = $RawBoxType$.reverseBytes(nativeExpectedValue);
+            } while (!UNSAFE.weakCompareAndSwap$RawType$Volatile(base, offset,
+                    nativeExpectedValue, $RawBoxType$.reverseBytes(expectedValue + delta)));
+            return expectedValue;
+        }
+
+        @ForceInline
+        static $type$ addAndGet(ByteBufferHandle handle, Object obb, int index, $type$ delta) {
+            return getAndAdd(handle, obb, index, delta) + delta;
         }
 #end[AtomicAdd]
 
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java
index 806dd1ce4f8..a2221b50a20 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java
@@ -51,7 +51,7 @@ public class VarHandleTestByteArrayAsChar extends VarHandleBaseByteArrayTest {
 
     static final char VALUE_2 = (char)0x1112;
 
-    static final char VALUE_3 = (char)0x2122;
+    static final char VALUE_3 = (char)0xFFFE;
 
 
     @Override
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java
index ccb0028c472..79305710ce2 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java
@@ -51,7 +51,7 @@ public class VarHandleTestByteArrayAsDouble extends VarHandleBaseByteArrayTest {
 
     static final double VALUE_2 = 0x1112131415161718L;
 
-    static final double VALUE_3 = 0x2122232425262728L;
+    static final double VALUE_3 = 0xFFFEFDFCFBFAF9F8L;
 
 
     @Override
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java
index 2ff6427aec7..b3545b4f69c 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java
@@ -51,7 +51,7 @@ public class VarHandleTestByteArrayAsFloat extends VarHandleBaseByteArrayTest {
 
     static final float VALUE_2 = 0x11121314;
 
-    static final float VALUE_3 = 0x21222324;
+    static final float VALUE_3 = 0xFFFEFDFC;
 
 
     @Override
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java
index 3087a14f049..b733bb34054 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java
@@ -51,7 +51,7 @@ public class VarHandleTestByteArrayAsInt extends VarHandleBaseByteArrayTest {
 
     static final int VALUE_2 = 0x11121314;
 
-    static final int VALUE_3 = 0x21222324;
+    static final int VALUE_3 = 0xFFFEFDFC;
 
 
     @Override
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java
index 8388a9cdd6c..88bf198272b 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java
@@ -51,7 +51,7 @@ public class VarHandleTestByteArrayAsLong extends VarHandleBaseByteArrayTest {
 
     static final long VALUE_2 = 0x1112131415161718L;
 
-    static final long VALUE_3 = 0x2122232425262728L;
+    static final long VALUE_3 = 0xFFFEFDFCFBFAF9F8L;
 
 
     @Override
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java
index b13bce1e1da..5ed9d6099f7 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java
@@ -51,7 +51,7 @@ public class VarHandleTestByteArrayAsShort extends VarHandleBaseByteArrayTest {
 
     static final short VALUE_2 = (short)0x1112;
 
-    static final short VALUE_3 = (short)0x2122;
+    static final short VALUE_3 = (short)0xFFFE;
 
 
     @Override
diff --git a/jdk/test/java/lang/invoke/VarHandles/generate-vh-tests.sh b/jdk/test/java/lang/invoke/VarHandles/generate-vh-tests.sh
index 7d6afc7b206..436d2d371d9 100644
--- a/jdk/test/java/lang/invoke/VarHandles/generate-vh-tests.sh
+++ b/jdk/test/java/lang/invoke/VarHandles/generate-vh-tests.sh
@@ -113,36 +113,40 @@ do
       ;;
   esac
 
+  # The value of `value3` is chosen such that when added to `value1` or `value2`
+  # it will result in carrying of bits over to the next byte, thereby detecting
+  # possible errors in endianness conversion e.g. if say for atomic addition the
+  # augend is incorrectly processed
   case $type in
     short)
       value1=(short)0x0102
       value2=(short)0x1112
-      value3=(short)0x2122
+      value3=(short)0xFFFE
       ;;
     char)
       value1=(char)0x0102
       value2=(char)0x1112
-      value3=(char)0x2122
+      value3=(char)0xFFFE
       ;;
     int)
       value1=0x01020304
       value2=0x11121314
-      value3=0x21222324
+      value3=0xFFFEFDFC
       ;;
     long)
       value1=0x0102030405060708L
       value2=0x1112131415161718L
-      value3=0x2122232425262728L
+      value3=0xFFFEFDFCFBFAF9F8L
       ;;
     float)
       value1=0x01020304
       value2=0x11121314
-      value3=0x21222324
+      value3=0xFFFEFDFC
       ;;
     double)
       value1=0x0102030405060708L
       value2=0x1112131415161718L
-      value3=0x2122232425262728L
+      value3=0xFFFEFDFCFBFAF9F8L
       ;;
   esac
 

From a865c6ef6bff6e6c9d149354479448c9b8175cbd Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Wed, 18 May 2016 21:00:33 +0200
Subject: [PATCH 139/228] 8133549: Generalize jshell's EditingHistory

Adding a generic EditingHistory to jdk.internal.le, for use by both jjs and jshell

Reviewed-by: sundar
---
 .../internal/jline/console/ConsoleReader.java |   6 +
 .../internal/jline/extra/EditingHistory.java  | 418 ++++++++++++++++++
 .../share/classes/module-info.java            |   5 +-
 .../jdk/internal/jline/extra/HistoryTest.java | 177 ++++++++
 4 files changed, 605 insertions(+), 1 deletion(-)
 create mode 100644 jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/extra/EditingHistory.java
 create mode 100644 jdk/test/jdk/internal/jline/extra/HistoryTest.java

diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/ConsoleReader.java b/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/ConsoleReader.java
index 2c9337d6404..9b7edac4d33 100644
--- a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/ConsoleReader.java
+++ b/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/ConsoleReader.java
@@ -2498,6 +2498,12 @@ public class ConsoleReader
                     //ignore
                 }
 
+                if (o instanceof Runnable) {
+                    ((Runnable) o).run();
+                    sb.setLength(0);
+                    continue;
+                }
+
                 // Search mode.
                 //
                 // Note that we have to do this first, because if there is a command
diff --git a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/extra/EditingHistory.java b/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/extra/EditingHistory.java
new file mode 100644
index 00000000000..7e4bbbff6a4
--- /dev/null
+++ b/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/extra/EditingHistory.java
@@ -0,0 +1,418 @@
+/*
+ * Copyright (c) 2015, 2016, 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.jline.extra;
+
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.function.Supplier;
+
+import jdk.internal.jline.console.ConsoleReader;
+import jdk.internal.jline.console.KeyMap;
+import jdk.internal.jline.console.history.History;
+import jdk.internal.jline.console.history.History.Entry;
+import jdk.internal.jline.console.history.MemoryHistory;
+
+/*Public for tests (HistoryTest).
+ */
+public abstract class EditingHistory implements History {
+
+    private final History fullHistory;
+    private History currentDelegate;
+
+    protected EditingHistory(ConsoleReader in, Iterable<? extends String> originalHistory) {
+        this.fullHistory = new MemoryHistory();
+        this.currentDelegate = fullHistory;
+        bind(in, CTRL_UP,
+             (Runnable) () -> moveHistoryToSnippet(in, ((EditingHistory) in.getHistory())::previousSnippet));
+        bind(in, CTRL_DOWN,
+             (Runnable) () -> moveHistoryToSnippet(in, ((EditingHistory) in.getHistory())::nextSnippet));
+        load(originalHistory);
+    }
+
+    private void moveHistoryToSnippet(ConsoleReader in, Supplier<Boolean> action) {
+        if (!action.get()) {
+            try {
+                in.beep();
+            } catch (IOException ex) {
+                throw new IllegalStateException(ex);
+            }
+        } else {
+            try {
+                //could use:
+                //in.resetPromptLine(in.getPrompt(), in.getHistory().current().toString(), -1);
+                //but that would mean more re-writing on the screen, (and prints an additional
+                //empty line), so using setBuffer directly:
+                Method setBuffer = in.getClass().getDeclaredMethod("setBuffer", String.class);
+
+                setBuffer.setAccessible(true);
+                setBuffer.invoke(in, in.getHistory().current().toString());
+                in.flush();
+            } catch (ReflectiveOperationException | IOException ex) {
+                throw new IllegalStateException(ex);
+            }
+        }
+    }
+
+    private void bind(ConsoleReader in, String shortcut, Object action) {
+        KeyMap km = in.getKeys();
+        for (int i = 0; i < shortcut.length(); i++) {
+            Object value = km.getBound(Character.toString(shortcut.charAt(i)));
+            if (value instanceof KeyMap) {
+                km = (KeyMap) value;
+            } else {
+                km.bind(shortcut.substring(i), action);
+            }
+        }
+    }
+
+    private static final String CTRL_UP = "\033\133\061\073\065\101"; //Ctrl-UP
+    private static final String CTRL_DOWN = "\033\133\061\073\065\102"; //Ctrl-DOWN
+
+    @Override
+    public int size() {
+        return currentDelegate.size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return currentDelegate.isEmpty();
+    }
+
+    @Override
+    public int index() {
+        return currentDelegate.index();
+    }
+
+    @Override
+    public void clear() {
+        if (currentDelegate != fullHistory)
+            throw new IllegalStateException("narrowed");
+        currentDelegate.clear();
+    }
+
+    @Override
+    public CharSequence get(int index) {
+        return currentDelegate.get(index);
+    }
+
+    @Override
+    public void add(CharSequence line) {
+        NarrowingHistoryLine currentLine = null;
+        int origIndex = fullHistory.index();
+        int fullSize;
+        try {
+            fullHistory.moveToEnd();
+            fullSize = fullHistory.index();
+            if (currentDelegate == fullHistory) {
+                if (origIndex < fullHistory.index()) {
+                    for (Entry entry : fullHistory) {
+                        if (!(entry.value() instanceof NarrowingHistoryLine))
+                            continue;
+                        int[] cluster = ((NarrowingHistoryLine) entry.value()).span;
+                        if (cluster[0] == origIndex && cluster[1] > cluster[0]) {
+                            currentDelegate = new MemoryHistory();
+                            for (int i = cluster[0]; i <= cluster[1]; i++) {
+                                currentDelegate.add(fullHistory.get(i));
+                            }
+                        }
+                    }
+                }
+            }
+            fullHistory.moveToEnd();
+            while (fullHistory.previous()) {
+                CharSequence c = fullHistory.current();
+                if (c instanceof NarrowingHistoryLine) {
+                    currentLine = (NarrowingHistoryLine) c;
+                    break;
+                }
+            }
+        } finally {
+            fullHistory.moveTo(origIndex);
+        }
+        if (currentLine == null || currentLine.span[1] != (-1)) {
+            line = currentLine = new NarrowingHistoryLine(line, fullSize);
+        }
+        StringBuilder complete = new StringBuilder();
+        for (int i = currentLine.span[0]; i < fullSize; i++) {
+            complete.append(fullHistory.get(i));
+        }
+        complete.append(line);
+        if (isComplete(complete)) {
+            currentLine.span[1] = fullSize; //TODO: +1?
+            currentDelegate = fullHistory;
+        }
+        fullHistory.add(line);
+    }
+
+    protected abstract boolean isComplete(CharSequence input);
+
+    @Override
+    public void set(int index, CharSequence item) {
+        if (currentDelegate != fullHistory)
+            throw new IllegalStateException("narrowed");
+        currentDelegate.set(index, item);
+    }
+
+    @Override
+    public CharSequence remove(int i) {
+        if (currentDelegate != fullHistory)
+            throw new IllegalStateException("narrowed");
+        return currentDelegate.remove(i);
+    }
+
+    @Override
+    public CharSequence removeFirst() {
+        if (currentDelegate != fullHistory)
+            throw new IllegalStateException("narrowed");
+        return currentDelegate.removeFirst();
+    }
+
+    @Override
+    public CharSequence removeLast() {
+        if (currentDelegate != fullHistory)
+            throw new IllegalStateException("narrowed");
+        return currentDelegate.removeLast();
+    }
+
+    @Override
+    public void replace(CharSequence item) {
+        if (currentDelegate != fullHistory)
+            throw new IllegalStateException("narrowed");
+        currentDelegate.replace(item);
+    }
+
+    @Override
+    public ListIterator<Entry> entries(int index) {
+        return currentDelegate.entries(index);
+    }
+
+    @Override
+    public ListIterator<Entry> entries() {
+        return currentDelegate.entries();
+    }
+
+    @Override
+    public Iterator<Entry> iterator() {
+        return currentDelegate.iterator();
+    }
+
+    @Override
+    public CharSequence current() {
+        return currentDelegate.current();
+    }
+
+    @Override
+    public boolean previous() {
+        return currentDelegate.previous();
+    }
+
+    @Override
+    public boolean next() {
+        return currentDelegate.next();
+    }
+
+    @Override
+    public boolean moveToFirst() {
+        return currentDelegate.moveToFirst();
+    }
+
+    @Override
+    public boolean moveToLast() {
+        return currentDelegate.moveToLast();
+    }
+
+    @Override
+    public boolean moveTo(int index) {
+        return currentDelegate.moveTo(index);
+    }
+
+    @Override
+    public void moveToEnd() {
+        currentDelegate.moveToEnd();
+    }
+
+    public boolean previousSnippet() {
+        for (int i = index() - 1; i >= 0; i--) {
+            if (get(i) instanceof NarrowingHistoryLine) {
+                moveTo(i);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public boolean nextSnippet() {
+        for (int i = index() + 1; i < size(); i++) {
+            if (get(i) instanceof NarrowingHistoryLine) {
+                moveTo(i);
+                return true;
+            }
+        }
+
+        if (index() < size()) {
+            moveToEnd();
+            return true;
+        }
+
+        return false;
+    }
+
+    public final void load(Iterable<? extends String> originalHistory) {
+        NarrowingHistoryLine currentHistoryLine = null;
+        boolean start = true;
+        int currentLine = 0;
+        for (String historyItem : originalHistory) {
+            StringBuilder line = new StringBuilder(historyItem);
+            int trailingBackSlashes = countTrailintBackslashes(line);
+            boolean continuation = trailingBackSlashes % 2 != 0;
+            line.delete(line.length() - trailingBackSlashes / 2 - (continuation ? 1 : 0), line.length());
+            if (start) {
+                class PersistentNarrowingHistoryLine extends NarrowingHistoryLine implements PersistentEntryMarker {
+                    public PersistentNarrowingHistoryLine(CharSequence delegate, int start) {
+                        super(delegate, start);
+                    }
+                }
+                fullHistory.add(currentHistoryLine = new PersistentNarrowingHistoryLine(line, currentLine));
+            } else {
+                class PersistentLine implements CharSequence, PersistentEntryMarker {
+                    private final CharSequence delegate;
+                    public PersistentLine(CharSequence delegate) {
+                        this.delegate = delegate;
+                    }
+                    @Override public int length() {
+                        return delegate.length();
+                    }
+                    @Override public char charAt(int index) {
+                        return delegate.charAt(index);
+                    }
+                    @Override public CharSequence subSequence(int start, int end) {
+                        return delegate.subSequence(start, end);
+                    }
+                    @Override public String toString() {
+                        return delegate.toString();
+                    }
+                }
+                fullHistory.add(new PersistentLine(line));
+            }
+            start = !continuation;
+            currentHistoryLine.span[1] = currentLine;
+            currentLine++;
+        }
+    }
+
+    public Collection<? extends String> save() {
+        Collection<String> result = new ArrayList<>();
+        Iterator<Entry> entries = fullHistory.iterator();
+
+        if (entries.hasNext()) {
+            Entry entry = entries.next();
+            while (entry != null) {
+                StringBuilder historyLine = new StringBuilder(entry.value());
+                int trailingBackSlashes = countTrailintBackslashes(historyLine);
+                for (int i = 0; i < trailingBackSlashes; i++) {
+                    historyLine.append("\\");
+                }
+                entry = entries.hasNext() ? entries.next() : null;
+                if (entry != null && !(entry.value() instanceof NarrowingHistoryLine)) {
+                    historyLine.append("\\");
+                }
+                result.add(historyLine.toString());
+            }
+        }
+
+        return result;
+    }
+
+    private int countTrailintBackslashes(CharSequence text) {
+        int count = 0;
+
+        for (int i = text.length() - 1; i >= 0; i--) {
+            if (text.charAt(i) == '\\') {
+                count++;
+            } else {
+                break;
+            }
+        }
+
+        return count;
+    }
+
+    public List<String> currentSessionEntries() {
+        List<String> result = new ArrayList<>();
+
+        for (Entry e : fullHistory) {
+            if (!(e.value() instanceof PersistentEntryMarker)) {
+                result.add(e.value().toString());
+            }
+        }
+
+        return result;
+    }
+
+    public void fullHistoryReplace(String source) {
+        fullHistory.replace(source);
+    }
+
+    private class NarrowingHistoryLine implements CharSequence {
+        private final CharSequence delegate;
+        private final int[] span;
+
+        public NarrowingHistoryLine(CharSequence delegate, int start) {
+            this.delegate = delegate;
+            this.span = new int[] {start, -1};
+        }
+
+        @Override
+        public int length() {
+            return delegate.length();
+        }
+
+        @Override
+        public char charAt(int index) {
+            return delegate.charAt(index);
+        }
+
+        @Override
+        public CharSequence subSequence(int start, int end) {
+            return delegate.subSequence(start, end);
+        }
+
+        @Override
+        public String toString() {
+            return delegate.toString();
+        }
+
+    }
+
+    private interface PersistentEntryMarker {}
+}
+
diff --git a/jdk/src/jdk.internal.le/share/classes/module-info.java b/jdk/src/jdk.internal.le/share/classes/module-info.java
index b4ae508ac6e..d52b3b5f98d 100644
--- a/jdk/src/jdk.internal.le/share/classes/module-info.java
+++ b/jdk/src/jdk.internal.le/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,6 +36,9 @@ module jdk.internal.le {
     exports jdk.internal.jline.console.history to
         jdk.scripting.nashorn.shell,
         jdk.jshell;
+    exports jdk.internal.jline.extra to
+        jdk.scripting.nashorn.shell,
+        jdk.jshell;
     exports jdk.internal.jline.internal to
         jdk.scripting.nashorn.shell,
         jdk.jshell;
diff --git a/jdk/test/jdk/internal/jline/extra/HistoryTest.java b/jdk/test/jdk/internal/jline/extra/HistoryTest.java
new file mode 100644
index 00000000000..f8d3084b767
--- /dev/null
+++ b/jdk/test/jdk/internal/jline/extra/HistoryTest.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2015, 2016, 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
+ * @summary Test Completion
+ * @modules jdk.internal.le/jdk.internal.jline
+ *          jdk.internal.le/jdk.internal.jline.console
+ *          jdk.internal.le/jdk.internal.jline.console.history
+ *          jdk.internal.le/jdk.internal.jline.extra
+ * @build HistoryTest
+ * @run testng HistoryTest
+ */
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import jdk.internal.jline.UnsupportedTerminal;
+import jdk.internal.jline.console.ConsoleReader;
+import jdk.internal.jline.console.history.MemoryHistory;
+import jdk.internal.jline.extra.EditingHistory;
+
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.*;
+
+@Test
+public class HistoryTest {
+
+    public void testHistory() throws IOException {
+        ConsoleReader in = new ConsoleReader(new ByteArrayInputStream(new byte[0]), new ByteArrayOutputStream(), new UnsupportedTerminal());
+        AtomicBoolean complete = new AtomicBoolean();
+        EditingHistory history = new EditingHistory(in, Collections.emptyList()) {
+            @Override
+            protected boolean isComplete(CharSequence input) {
+                return complete.get();
+            }
+        };
+        complete.set(false); history.add("void test() {");
+        complete.set(false); history.add("    System.err.println(1);");
+        complete.set(true);  history.add("}");
+        complete.set(true);  history.add("/exit");
+
+        previousAndAssert(history, "/exit");
+
+        history.previous(); history.previous(); history.previous();
+
+        complete.set(false); history.add("void test() { /*changed*/");
+
+        complete.set(true);
+        previousAndAssert(history, "}");
+        previousAndAssert(history, "    System.err.println(1);");
+        previousAndAssert(history, "void test() {");
+
+        assertFalse(history.previous());
+
+        nextAndAssert(history, "    System.err.println(1);");
+        nextAndAssert(history, "}");
+        nextAndAssert(history, "");
+
+        complete.set(false); history.add("    System.err.println(2);");
+        complete.set(true);  history.add("} /*changed*/");
+
+        assertEquals(history.size(), 7);
+
+        Collection<? extends String> persistentHistory = history.save();
+
+        history = new EditingHistory(in, persistentHistory) {
+            @Override
+            protected boolean isComplete(CharSequence input) {
+                return complete.get();
+            }
+        };
+
+        previousSnippetAndAssert(history, "void test() { /*changed*/");
+        previousSnippetAndAssert(history, "/exit");
+        previousSnippetAndAssert(history, "void test() {");
+
+        assertFalse(history.previousSnippet());
+
+        nextSnippetAndAssert(history, "/exit");
+        nextSnippetAndAssert(history, "void test() { /*changed*/");
+        nextSnippetAndAssert(history, "");
+
+        assertFalse(history.nextSnippet());
+
+        complete.set(false); history.add("{");
+        complete.set(true);  history.add("}");
+
+        persistentHistory = history.save();
+
+        history = new EditingHistory(in, persistentHistory) {
+            @Override
+            protected boolean isComplete(CharSequence input) {
+                return complete.get();
+            }
+        };
+
+        previousSnippetAndAssert(history, "{");
+        previousSnippetAndAssert(history, "void test() { /*changed*/");
+        previousSnippetAndAssert(history, "/exit");
+        previousSnippetAndAssert(history, "void test() {");
+
+        while (history.next());
+
+        complete.set(true);  history.add("/*current1*/");
+        complete.set(true);  history.add("/*current2*/");
+        complete.set(true);  history.add("/*current3*/");
+
+        assertEquals(history.currentSessionEntries(), Arrays.asList("/*current1*/", "/*current2*/", "/*current3*/"));
+
+        history.remove(0);
+
+        assertEquals(history.currentSessionEntries(), Arrays.asList("/*current1*/", "/*current2*/", "/*current3*/"));
+
+        while (history.size() > 2)
+            history.remove(0);
+
+        assertEquals(history.currentSessionEntries(), Arrays.asList("/*current2*/", "/*current3*/"));
+
+        for (int i = 0; i < MemoryHistory.DEFAULT_MAX_SIZE * 2; i++) {
+            complete.set(true);  history.add("/exit");
+        }
+
+        complete.set(false); history.add("void test() { /*after full*/");
+        complete.set(false); history.add("    System.err.println(1);");
+        complete.set(true);  history.add("}");
+
+        previousSnippetAndAssert(history, "void test() { /*after full*/");
+    }
+
+    private void previousAndAssert(EditingHistory history, String expected) {
+        assertTrue(history.previous());
+        assertEquals(history.current().toString(), expected);
+    }
+
+    private void nextAndAssert(EditingHistory history, String expected) {
+        assertTrue(history.next());
+        assertEquals(history.current().toString(), expected);
+    }
+
+    private void previousSnippetAndAssert(EditingHistory history, String expected) {
+        assertTrue(history.previousSnippet());
+        assertEquals(history.current().toString(), expected);
+    }
+
+    private void nextSnippetAndAssert(EditingHistory history, String expected) {
+        assertTrue(history.nextSnippet());
+        assertEquals(history.current().toString(), expected);
+    }
+
+}

From 918a949448dd149d9317b6cb261429b267f5e301 Mon Sep 17 00:00:00 2001
From: Xue-Lei Andrew Fan <xuelei@openjdk.org>
Date: Wed, 18 May 2016 22:55:35 +0000
Subject: [PATCH 140/228] 8151856: Note that disabledAlgorithms override the
 same algorithms of legacyAlgorithms

Reviewed-by: mullan, weijun
---
 jdk/src/java.base/share/conf/security/java.security | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/jdk/src/java.base/share/conf/security/java.security b/jdk/src/java.base/share/conf/security/java.security
index 6fa0d301d33..72c381b9747 100644
--- a/jdk/src/java.base/share/conf/security/java.security
+++ b/jdk/src/java.base/share/conf/security/java.security
@@ -713,6 +713,12 @@ jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 1024
 # See SSL/TLS specifications and "Java Cryptography Architecture Standard
 # Algorithm Name Documentation" for information about the algorithm names.
 #
+# Note: If a legacy algorithm is also restricted through the
+# jdk.tls.disabledAlgorithms property or the
+# java.security.AlgorithmConstraints API (See
+# javax.net.ssl.SSLParameters.setAlgorithmConstraints()),
+# then the algorithm is completely disabled and will not be negotiated.
+#
 # Note: This property is currently used by Oracle's JSSE implementation.
 # It is not guaranteed to be examined and used by other implementations.
 # There is no guarantee the property will continue to exist or be of the

From 4dcf9fd923a8f63e592a9bf833ab3265efefbc71 Mon Sep 17 00:00:00 2001
From: Rajan Halade <rhalade@openjdk.org>
Date: Wed, 18 May 2016 16:36:52 -0700
Subject: [PATCH 141/228] 8156035: Remove intermittent key from
 sun/security/rsa/SpecTest.java

Reviewed-by: mullan
---
 jdk/test/sun/security/rsa/SpecTest.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jdk/test/sun/security/rsa/SpecTest.java b/jdk/test/sun/security/rsa/SpecTest.java
index 24cddfe3591..7b3c52e5d1f 100644
--- a/jdk/test/sun/security/rsa/SpecTest.java
+++ b/jdk/test/sun/security/rsa/SpecTest.java
@@ -24,7 +24,6 @@
 /**
  * @test
  * @bug 8044199 8137231
- * @key intermittent
  * @summary Check same KeyPair's private key and public key have same modulus.
  * also check public key's public exponent equals to given spec's public
  * exponent. Only key size 1024 is tested with RSAKeyGenParameterSpec.F0 (3).

From ca98819c49f84d0dc5363a5babdd158a374553fb Mon Sep 17 00:00:00 2001
From: Kumar Srinivasan <ksrini@openjdk.org>
Date: Wed, 18 May 2016 11:31:23 -0700
Subject: [PATCH 142/228] 8156807: Pack200 must support v53.0 class files

Reviewed-by: mchung, shade
---
 .../com/sun/java/util/jar/pack/Constants.java | 14 ++--
 .../share/native/common-unpack/constants.h    | 24 +-----
 jdk/test/ProblemList.txt                      |  2 -
 jdk/test/tools/pack200/TestNormal.java        | 84 ++++---------------
 jdk/test/tools/pack200/Utils.java             |  7 +-
 5 files changed, 35 insertions(+), 96 deletions(-)

diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java
index fee0b800f2d..50dc8020b25 100644
--- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java
+++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2016, 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
@@ -43,9 +43,10 @@ class Constants {
         1.0 to 1.3.X 45,3
         1.4 to 1.4.X 46,0
         1.5 to 1.5.X 49,0
-        1.6 to 1.5.x 50,0
-        1.7 to 1.6.x 51,0
-        1.8 to 1.7.x 52,0
+        1.6 to 1.6.X 50,0
+        1.7 to 1.7.X 51,0
+        1.8 to 1.8.X 52,0
+        1.9 to 1.9.X 53,0
     */
 
     public static final Package.Version JAVA_MIN_CLASS_VERSION =
@@ -63,6 +64,9 @@ class Constants {
     public static final Package.Version JAVA8_MAX_CLASS_VERSION =
             Package.Version.of(52, 00);
 
+    public static final Package.Version JAVA9_MAX_CLASS_VERSION =
+            Package.Version.of(53, 00);
+
     public static final int JAVA_PACKAGE_MAGIC = 0xCAFED00D;
 
     public static final Package.Version JAVA5_PACKAGE_VERSION =
@@ -79,7 +83,7 @@ class Constants {
 
     // upper limit, should point to the latest class version
     public static final Package.Version JAVA_MAX_CLASS_VERSION =
-            JAVA8_MAX_CLASS_VERSION;
+            JAVA9_MAX_CLASS_VERSION;
 
     // upper limit should point to the latest package version, for version info!.
     public static final Package.Version MAX_PACKAGE_VERSION =
diff --git a/jdk/src/jdk.pack200/share/native/common-unpack/constants.h b/jdk/src/jdk.pack200/share/native/common-unpack/constants.h
index f1a1f73edff..8d8376dd23a 100644
--- a/jdk/src/jdk.pack200/share/native/common-unpack/constants.h
+++ b/jdk/src/jdk.pack200/share/native/common-unpack/constants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2016, 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,30 +23,10 @@
  * questions.
  */
 
-/*
-  Java Class Version numbers history
-  1.0 to 1.3.X 45,3
-  1.4 to 1.4.X 46,0
-  1.5 to 1.5.X 49,0
-  1.6 to 1.5.x 50,0 NOTE Assumed for now
-*/
-
 // classfile constants
 #define JAVA_MAGIC 0xCAFEBABE
-#define JAVA_MIN_MAJOR_VERSION 45
-#define JAVA_MIN_MINOR_VERSION 3
 
-#define JAVA5_MAX_MAJOR_VERSION 49
-#define JAVA5_MAX_MINOR_VERSION 0
-
-#define JAVA6_MAX_MAJOR_VERSION 50
-#define JAVA6_MAX_MINOR_VERSION 0
-
-#define JAVA7_MAX_MAJOR_VERSION 51
-#define JAVA7_MAX_MINOR_VERSION 0
-
-#define JAVA8_MAX_MAJOR_VERSION 52
-#define JAVA8_MAX_MINOR_VERSION 0
+// Class version history, refer to Constants.java
 
 // package file constants
 #define JAVA_PACKAGE_MAGIC 0xCAFED00D
diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 6e1cd7385d4..a3c3a99ded4 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -332,8 +332,6 @@ tools/launcher/FXLauncherTest.java                              8068049 linux-al
 
 tools/pack200/Pack200Props.java                                 8155857 generic-all
 
-tools/pack200/TestNormal.java                                   8156807 windows-all
-
 ############################################################################
 
 # jdk_jdi
diff --git a/jdk/test/tools/pack200/TestNormal.java b/jdk/test/tools/pack200/TestNormal.java
index 0172a5e65b6..a85a9d4040f 100644
--- a/jdk/test/tools/pack200/TestNormal.java
+++ b/jdk/test/tools/pack200/TestNormal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,85 +25,37 @@
 /*
  * @test
  * @run main/timeout=600 TestNormal
- * @bug 8020802
+ * @bug 8020802 8156807
  * @summary Need an ability to create jar files that are invariant to the pack200 packing/unpacking
  * @author Alexander Zuev
  */
 
 import java.io.*;
-import java.util.Collections;
-import java.util.Properties;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
 
 public class TestNormal {
     private static String FS = File.separator;
 
     public static void main(String args[]) throws Exception {
-        Properties p = System.getProperties();
-        String java_home = p.getProperty("test.jdk");
         String testdir = Utils.TEST_CLS_DIR.getAbsolutePath();
 
         try {
-            execJavaCommand(java_home, "jar cnf normalized.jar -C " + testdir + " .");
-            execJavaCommand(java_home, "jar cf original.jar -C " + testdir + " .");
-            execJavaCommand(java_home, "pack200 -r repacked.jar original.jar");
-            compareJars(new JarFile("normalized.jar"), new JarFile("repacked.jar"));
+            String jarCmd = Utils.getJarCmd();
+            String packCmd = Utils.getPack200Cmd();
+
+            // create the original jar
+            Utils.runExec(jarCmd, "cf", "original.jar", "-C", testdir, ".");
+
+            // create the reference jar
+            Utils.runExec(packCmd, "-r", "repacked.jar", "original.jar");
+
+            // create the normalized jar using jar(1)
+            Utils.runExec(jarCmd, "cnf", "normalized.jar", "-C", testdir, ".");
+
+            // compare archive contents bit wise, these should be identical!
+            Utils.doCompareBitWise(new File("repacked.jar"),
+                    new File("normalized.jar"));
         } finally {
-            String[] cleanupList = {"normalized.jar", "original.jar", "repacked.jar"};
-            for (String s : cleanupList) {
-                delete(new File(s));
-            }
-        }
-    }
-
-    public static void execJavaCommand(String java_home, String cmd) throws Exception {
-        Process proc = Runtime.getRuntime().exec(java_home + FS + "bin" + FS + cmd);
-        String s;
-        BufferedReader stdInput =
-                new BufferedReader(new InputStreamReader(proc.getInputStream()));
-        BufferedReader stdError =
-                new BufferedReader(new InputStreamReader(proc.getErrorStream()));
-        while ((s = stdInput.readLine()) != null) {
-            System.out.println(s);
-        }
-        while ((s = stdError.readLine()) != null) {
-            System.err.println(s);
-        }
-    }
-
-    public static void compareJars(JarFile jf1, JarFile jf2) throws Exception {
-        try {
-            if (jf1.size() != jf2.size()) {
-                throw new Exception("Jars " + jf1.getName() + " and " + jf2.getName()
-                        + " have different number of entries");
-            }
-            for (JarEntry elem1 : Collections.list(jf1.entries())) {
-                JarEntry elem2 = jf2.getJarEntry(elem1.getName());
-                if (elem2 == null) {
-                    throw new Exception("Element " + elem1.getName() + " is missing from " + jf2.getName());
-                }
-                if (!elem1.isDirectory() && elem1.getCrc() != elem2.getCrc()) {
-                    throw new Exception("The crc of " + elem1.getName() + " is different.");
-                }
-            }
-        } finally {
-            jf1.close();
-            jf2.close();
-        }
-    }
-
-    static void delete(File f) throws IOException {
-        if (!f.exists()) {
-            return;
-        }
-        if (f.isDirectory()) {
-            for (File c : f.listFiles()) {
-                delete(c);
-            }
-        }
-        if (!f.delete()) {
-            throw new FileNotFoundException("Failed to delete file: " + f);
+           Utils.cleanup();
         }
     }
 }
diff --git a/jdk/test/tools/pack200/Utils.java b/jdk/test/tools/pack200/Utils.java
index f4641987e73..45e09c37abc 100644
--- a/jdk/test/tools/pack200/Utils.java
+++ b/jdk/test/tools/pack200/Utils.java
@@ -33,7 +33,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
 import java.net.URI;
-import java.net.URL;
 import java.nio.charset.Charset;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.nio.file.FileSystem;
@@ -483,9 +482,15 @@ class Utils {
         }
         return out;
     }
+
+    static List<String> runExec(String... cmds) {
+        return runExec(Arrays.asList(cmds));
+    }
+
     static List<String> runExec(List<String> cmdsList) {
         return runExec(cmdsList, null);
     }
+
     static List<String> runExec(List<String> cmdsList, Map<String, String> penv) {
         ArrayList<String> alist = new ArrayList<String>();
         ProcessBuilder pb =

From f75ffd33263c635f3f08df886474b2b8b66d655d Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Thu, 19 May 2016 03:49:41 -0400
Subject: [PATCH 143/228] 8157188: 2 test failures in demo/jvmti due to
 unexpected class file version 53

Reviewed-by: dsamersoff, alanb
---
 jdk/src/java.base/share/native/include/classfile_constants.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jdk/src/java.base/share/native/include/classfile_constants.h b/jdk/src/java.base/share/native/include/classfile_constants.h
index 1fa6e3c6d01..94b97f75f2e 100644
--- a/jdk/src/java.base/share/native/include/classfile_constants.h
+++ b/jdk/src/java.base/share/native/include/classfile_constants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2016, 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,7 @@ extern "C" {
 #endif
 
 /* Classfile version number for this information */
-#define JVM_CLASSFILE_MAJOR_VERSION 52
+#define JVM_CLASSFILE_MAJOR_VERSION 53
 #define JVM_CLASSFILE_MINOR_VERSION 0
 
 /* Flags */

From 8aff72ba655e0d45ff87dd3a270197c498ce3c1d Mon Sep 17 00:00:00 2001
From: Shilpi Rastogi <srastogi@openjdk.org>
Date: Thu, 19 May 2016 11:13:52 +0200
Subject: [PATCH 144/228] 8149574: Fix java/lang/invoke/MethodHandleImpl's use
 of Unsafe.defineAnonymousClass()

Reviewed-by: vlivanov, psandoz, sundar, mhaupt
---
 .../java/lang/invoke/MethodHandleImpl.java    | 131 +++++++++---------
 1 file changed, 68 insertions(+), 63 deletions(-)

diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
index 6f2f35b8773..cc7e1e3fecc 100644
--- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
@@ -41,9 +41,15 @@ import sun.invoke.empty.Empty;
 import sun.invoke.util.ValueConversions;
 import sun.invoke.util.VerifyType;
 import sun.invoke.util.Wrapper;
+
+import jdk.internal.org.objectweb.asm.AnnotationVisitor;
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+
 import static java.lang.invoke.LambdaForm.*;
 import static java.lang.invoke.MethodHandleStatics.*;
 import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
+import static jdk.internal.org.objectweb.asm.Opcodes.*;
 
 /**
  * Trusted implementation code for MethodHandle.
@@ -1155,6 +1161,8 @@ import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
     // Put the whole mess into its own nested class.
     // That way we can lazily load the code and set up the constants.
     private static class BindCaller {
+        private static MethodType INVOKER_MT = MethodType.methodType(Object.class, MethodHandle.class, Object[].class);
+
         static
         MethodHandle bindCaller(MethodHandle mh, Class<?> hostClass) {
             // Do not use this function to inject calls into system classes.
@@ -1173,38 +1181,15 @@ import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
         }
 
         private static MethodHandle makeInjectedInvoker(Class<?> hostClass) {
-            Class<?> bcc = UNSAFE.defineAnonymousClass(hostClass, T_BYTES, null);
-            if (hostClass.getClassLoader() != bcc.getClassLoader())
-                throw new InternalError(hostClass.getName()+" (CL)");
             try {
-                if (hostClass.getProtectionDomain() != bcc.getProtectionDomain())
-                    throw new InternalError(hostClass.getName()+" (PD)");
-            } catch (SecurityException ex) {
-                // Self-check was blocked by security manager.  This is OK.
-                // In fact the whole try body could be turned into an assertion.
-            }
-            try {
-                MethodHandle init = IMPL_LOOKUP.findStatic(bcc, "init", MethodType.methodType(void.class));
-                init.invokeExact();  // force initialization of the class
-            } catch (Throwable ex) {
-                throw uncaughtException(ex);
-            }
-            MethodHandle bccInvoker;
-            try {
-                MethodType invokerMT = MethodType.methodType(Object.class, MethodHandle.class, Object[].class);
-                bccInvoker = IMPL_LOOKUP.findStatic(bcc, "invoke_V", invokerMT);
+                Class<?> invokerClass = UNSAFE.defineAnonymousClass(hostClass, INJECTED_INVOKER_TEMPLATE, null);
+                assert checkInjectedInvoker(hostClass, invokerClass);
+                return IMPL_LOOKUP.findStatic(invokerClass, "invoke_V", INVOKER_MT);
             } catch (ReflectiveOperationException ex) {
                 throw uncaughtException(ex);
             }
-            // Test the invoker, to ensure that it really injects into the right place.
-            try {
-                MethodHandle vamh = prepareForInvoker(MH_checkCallerClass);
-                Object ok = bccInvoker.invokeExact(vamh, new Object[]{hostClass, bcc});
-            } catch (Throwable ex) {
-                throw new InternalError(ex);
-            }
-            return bccInvoker;
         }
+
         private static ClassValue<MethodHandle> CV_makeInjectedInvoker = new ClassValue<MethodHandle>() {
             @Override protected MethodHandle computeValue(Class<?> hostClass) {
                 return makeInjectedInvoker(hostClass);
@@ -1235,62 +1220,82 @@ import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
             return mh;
         }
 
+        private static boolean checkInjectedInvoker(Class<?> hostClass, Class<?> invokerClass) {
+            assert (hostClass.getClassLoader() == invokerClass.getClassLoader()) : hostClass.getName()+" (CL)";
+            try {
+                assert (hostClass.getProtectionDomain() == invokerClass.getProtectionDomain()) : hostClass.getName()+" (PD)";
+            } catch (SecurityException ex) {
+                // Self-check was blocked by security manager. This is OK.
+            }
+            try {
+                // Test the invoker to ensure that it really injects into the right place.
+                MethodHandle invoker = IMPL_LOOKUP.findStatic(invokerClass, "invoke_V", INVOKER_MT);
+                MethodHandle vamh = prepareForInvoker(MH_checkCallerClass);
+                return (boolean)invoker.invoke(vamh, new Object[]{ invokerClass });
+            } catch (Throwable ex) {
+                throw new InternalError(ex);
+            }
+        }
+
         private static final MethodHandle MH_checkCallerClass;
         static {
             final Class<?> THIS_CLASS = BindCaller.class;
-            assert(checkCallerClass(THIS_CLASS, THIS_CLASS));
+            assert(checkCallerClass(THIS_CLASS));
             try {
                 MH_checkCallerClass = IMPL_LOOKUP
                     .findStatic(THIS_CLASS, "checkCallerClass",
-                                MethodType.methodType(boolean.class, Class.class, Class.class));
-                assert((boolean) MH_checkCallerClass.invokeExact(THIS_CLASS, THIS_CLASS));
+                                MethodType.methodType(boolean.class, Class.class));
+                assert((boolean) MH_checkCallerClass.invokeExact(THIS_CLASS));
             } catch (Throwable ex) {
                 throw new InternalError(ex);
             }
         }
 
         @CallerSensitive
-        private static boolean checkCallerClass(Class<?> expected, Class<?> expected2) {
-            // This method is called via MH_checkCallerClass and so it's
-            // correct to ask for the immediate caller here.
+        private static boolean checkCallerClass(Class<?> expected) {
+            // This method is called via MH_checkCallerClass and so it's correct to ask for the immediate caller here.
             Class<?> actual = Reflection.getCallerClass();
-            if (actual != expected && actual != expected2)
-                throw new InternalError("found "+actual.getName()+", expected "+expected.getName()
-                                        +(expected == expected2 ? "" : ", or else "+expected2.getName()));
+            if (actual != expected)
+                throw new InternalError("found " + actual.getName() + ", expected " + expected.getName());
             return true;
         }
 
-        private static final byte[] T_BYTES;
-        static {
-            final Object[] values = {null};
-            AccessController.doPrivileged(new PrivilegedAction<>() {
-                    public Void run() {
-                        try {
-                            Class<T> tClass = T.class;
-                            String tName = tClass.getName();
-                            String tResource = tName.substring(tName.lastIndexOf('.')+1)+".class";
-                            try (java.io.InputStream in = tClass.getResourceAsStream(tResource)) {
-                                values[0] = in.readAllBytes();
-                            }
-                        } catch (java.io.IOException ex) {
-                            throw new InternalError(ex);
-                        }
-                        return null;
-                    }
-                });
-            T_BYTES = (byte[]) values[0];
-        }
+        private static final byte[] INJECTED_INVOKER_TEMPLATE = generateInvokerTemplate();
 
-        // The following class is used as a template for Unsafe.defineAnonymousClass:
-        private static class T {
-            static void init() { }  // side effect: initializes this class
-            static Object invoke_V(MethodHandle vamh, Object[] args) throws Throwable {
-                return vamh.invokeExact(args);
-            }
+        /** Produces byte code for a class that is used as an injected invoker. */
+        private static byte[] generateInvokerTemplate() {
+            ClassWriter cw = new ClassWriter(0);
+
+            // private static class InjectedInvoker {
+            //     @Hidden
+            //     static Object invoke_V(MethodHandle vamh, Object[] args) throws Throwable {
+            //        return vamh.invokeExact(args);
+            //     }
+            // }
+            cw.visit(52, ACC_PRIVATE | ACC_SUPER, "InjectedInvoker", null, "java/lang/Object", null);
+
+            MethodVisitor mv = cw.visitMethod(ACC_STATIC, "invoke_V",
+                          "(Ljava/lang/invoke/MethodHandle;[Ljava/lang/Object;)Ljava/lang/Object;",
+                          null, null);
+
+            // Suppress invoker method in stack traces.
+            AnnotationVisitor av0 = mv.visitAnnotation("Ljava/lang/invoke/LambdaForm$Hidden;", true);
+            av0.visitEnd();
+
+            mv.visitCode();
+            mv.visitVarInsn(ALOAD, 0);
+            mv.visitVarInsn(ALOAD, 1);
+            mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/invoke/MethodHandle", "invokeExact",
+                               "([Ljava/lang/Object;)Ljava/lang/Object;", false);
+            mv.visitInsn(ARETURN);
+            mv.visitMaxs(2, 2);
+            mv.visitEnd();
+
+            cw.visitEnd();
+            return cw.toByteArray();
         }
     }
 
-
     /** This subclass allows a wrapped method handle to be re-associated with an arbitrary member name. */
     private static final class WrappedMember extends DelegatingMethodHandle {
         private final MethodHandle target;

From 2f4c6f1b0573b88235c1ecc6b70233f23f43603f Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erik.joelsson@oracle.com>
Date: Thu, 19 May 2016 11:43:21 +0200
Subject: [PATCH 145/228] 8157325: gtest tests are not excluded for minimal
 builds

Reviewed-by: erikj, jwilhelm
---
 hotspot/make/lib/CompileGtest.gmk | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/hotspot/make/lib/CompileGtest.gmk b/hotspot/make/lib/CompileGtest.gmk
index 9cf1d891255..2fd3f966704 100644
--- a/hotspot/make/lib/CompileGtest.gmk
+++ b/hotspot/make/lib/CompileGtest.gmk
@@ -36,9 +36,6 @@ endif
 
 ################################################################################
 
-GTEST_TEST_SRC_FILES := $(shell $(FIND) $(HOTSPOT_TOPDIR)/test/native -name \
-    "test*.cpp" -type f)
-
 ifeq ($(OPENJDK_TARGET_OS), windows)
   GTEST_JVM_MAPFILE := $(JVM_MAPFILE)
 else
@@ -58,10 +55,12 @@ $(eval $(call SetupNativeCompilation, BUILD_GTEST_LIBJVM, \
     TOOLCHAIN := $(JVM_TOOLCHAIN), \
     LIBRARY := jvm, \
     OUTPUT_DIR := $(JVM_OUTPUTDIR)/gtest, \
-    EXTRA_FILES := $(GTEST_TEST_SRC_FILES) \
-        $(GTEST_FRAMEWORK_SRC)/src/gtest-all.cc \
-        $(GTEST_TEST_SRC)/gtestMain.cpp, \
     OBJECT_DIR := $(JVM_OUTPUTDIR)/gtest/objs, \
+    SRC := $(GTEST_TEST_SRC), \
+    EXCLUDES := $(JVM_EXCLUDES), \
+    EXCLUDE_FILES := gtestLauncher.cpp, \
+    EXCLUDE_PATTERNS := $(JVM_EXCLUDE_PATTERNS), \
+    EXTRA_FILES := $(GTEST_FRAMEWORK_SRC)/src/gtest-all.cc, \
     EXTRA_OBJECT_FILES := $(filter-out %/operator_new$(OBJ_SUFFIX), \
         $(BUILD_LIBJVM_ALL_OBJS)), \
     CFLAGS := $(JVM_CFLAGS) -I$(GTEST_FRAMEWORK_SRC) \

From 19c7dcc0120f5c3fafa6d0f4ee037a509c354cd5 Mon Sep 17 00:00:00 2001
From: Sibabrata Sahoo <ssahoo@openjdk.org>
Date: Thu, 19 May 2016 04:20:08 -0700
Subject: [PATCH 146/228] 8141039: Test Task: Develop new tests for JEP 273:
 DRBG-Based SecureRandom Implementations

Reviewed-by: weijun
---
 .../java/security/SecureRandom/ApiTest.java   | 365 ++++++++++++++++++
 .../security/SecureRandom/EnoughSeedTest.java | 100 +++++
 .../security/SecureRandom/GetAlgorithm.java   |  64 +--
 .../SecureRandom/GetInstanceTest.java         | 312 +++++++++++++++
 .../SecureRandom/MultiThreadTest.java         | 182 +++++++++
 .../SecureRandom/SerializedSeedTest.java      | 214 ++++++++++
 .../SecureRandom/StrongSecureRandom.java      |  98 +++--
 .../SeedGenerator/SeedGeneratorChoice.java    |  23 +-
 8 files changed, 1297 insertions(+), 61 deletions(-)
 create mode 100644 jdk/test/java/security/SecureRandom/ApiTest.java
 create mode 100644 jdk/test/java/security/SecureRandom/EnoughSeedTest.java
 create mode 100644 jdk/test/java/security/SecureRandom/GetInstanceTest.java
 create mode 100644 jdk/test/java/security/SecureRandom/MultiThreadTest.java
 create mode 100644 jdk/test/java/security/SecureRandom/SerializedSeedTest.java

diff --git a/jdk/test/java/security/SecureRandom/ApiTest.java b/jdk/test/java/security/SecureRandom/ApiTest.java
new file mode 100644
index 00000000000..bf3c8374122
--- /dev/null
+++ b/jdk/test/java/security/SecureRandom/ApiTest.java
@@ -0,0 +1,365 @@
+/*
+ * Copyright (c) 2016, 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 8141039
+ * @library /lib/testlibrary
+ * @summary This test do API coverage for SecureRandom. It covers most of
+ *          supported operations along with possible positive and negative
+ *          parameters for DRBG mechanism.
+ * @run main ApiTest Hash_DRBG
+ * @run main ApiTest HMAC_DRBG
+ * @run main ApiTest CTR_DRBG
+ * @run main ApiTest SHA1PRNG
+ * @run main ApiTest NATIVE
+ */
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.security.Security;
+import java.security.SecureRandomParameters;
+import java.security.DrbgParameters;
+import java.security.DrbgParameters.Instantiation;
+import java.security.DrbgParameters.Capability;
+import javax.crypto.Cipher;
+
+public class ApiTest {
+
+    private static final boolean SHOULD_PASS = true;
+    private static final long SEED = 1l;
+    private static final String INVALID_ALGO = "INVALID";
+    private static final String DRBG_CONFIG = "securerandom.drbg.config";
+    private static final String DRBG_CONFIG_VALUE
+            = Security.getProperty(DRBG_CONFIG);
+
+    public static void main(String[] args) throws Exception {
+
+        if (args == null || args.length < 1) {
+            throw new RuntimeException("No mechanism available to run test.");
+        }
+        String mech
+                = "NATIVE".equals(args[0]) ? supportedNativeAlgo() : args[0];
+        String[] algs = null;
+        boolean success = true;
+
+        try {
+            if (!isDRBG(mech)) {
+                SecureRandom random = SecureRandom.getInstance(mech);
+                verifyAPI(random, mech);
+                return;
+            } else if (mech.equals("CTR_DRBG")) {
+                algs = new String[]{"AES-128", "AES-192", "AES-256",
+                    INVALID_ALGO};
+            } else if (mech.equals("Hash_DRBG") || mech.equals("HMAC_DRBG")) {
+                algs = new String[]{"SHA-224", "SHA-256", "SHA-512/224",
+                    "SHA-512/256", "SHA-384", "SHA-512", INVALID_ALGO};
+            } else {
+                throw new RuntimeException(
+                        String.format("Not a valid mechanism '%s'", mech));
+            }
+            runForEachMech(mech, algs);
+        } catch (Exception e) {
+            e.printStackTrace(System.out);
+            success = false;
+        }
+
+        if (!success) {
+            throw new RuntimeException("At least one test failed.");
+        }
+    }
+
+    /**
+     * Run the test for a DRBG mechanism with a possible set of parameter
+     * combination.
+     * @param mech DRBG mechanism name
+     * @param algs Algorithm supported by each mechanism
+     * @throws Exception
+     */
+    private static void runForEachMech(String mech, String[] algs)
+            throws Exception {
+        for (String alg : algs) {
+            runForEachAlg(mech, alg);
+        }
+    }
+
+    private static void runForEachAlg(String mech, String alg)
+            throws Exception {
+        for (int strength : new int[]{Integer.MIN_VALUE, -1, 0, 1, 223, 224,
+            192, 255, 256}) {
+            for (Capability cp : Capability.values()) {
+                for (byte[] pr : new byte[][]{null, new byte[]{},
+                    "personal".getBytes()}) {
+                    SecureRandomParameters param
+                            = DrbgParameters.instantiation(strength, cp, pr);
+                    runForEachParam(mech, alg, param);
+                }
+            }
+        }
+    }
+
+    private static void runForEachParam(String mech, String alg,
+            SecureRandomParameters param) throws Exception {
+
+        for (boolean df : new Boolean[]{true, false}) {
+            try {
+                Security.setProperty(DRBG_CONFIG, mech + "," + alg + ","
+                        + (df ? "use_df" : "no_df"));
+                System.out.printf("%nParameter for SecureRandom "
+                        + "mechanism: %s is (param:%s, algo:%s, df:%s)",
+                        mech, param, alg, df);
+                SecureRandom sr = SecureRandom.getInstance("DRBG", param);
+                verifyAPI(sr, mech);
+            } catch (NoSuchAlgorithmException e) {
+                // Verify exception status for current test.
+                checkException(getDefaultAlg(mech, alg), param, e);
+            } finally {
+                Security.setProperty(DRBG_CONFIG, DRBG_CONFIG_VALUE);
+            }
+        }
+    }
+
+    /**
+     * Returns the algorithm supported for input mechanism.
+     * @param mech Mechanism name
+     * @param alg Algorithm name
+     * @return Algorithm name
+     */
+    private static String getDefaultAlg(String mech, String alg)
+            throws NoSuchAlgorithmException {
+        if (alg == null) {
+            switch (mech) {
+                case "Hash_DRBG":
+                case "HMAC_DRBG":
+                    return "SHA-256";
+                case "CTR_DRBG":
+                    return (Cipher.getMaxAllowedKeyLength("AES") < 256)
+                            ? "AES-128" : "AES-256";
+                default:
+                    throw new RuntimeException("Mechanism not supported");
+            }
+        }
+        return alg;
+    }
+
+    /**
+     * Verify the exception type either it is expected to occur or not.
+     * @param alg Algorithm name
+     * @param param DRBG parameter
+     * @param e Exception to verify
+     * @throws NoSuchAlgorithmException
+     */
+    private static void checkException(String alg, SecureRandomParameters param,
+            NoSuchAlgorithmException e) throws NoSuchAlgorithmException {
+
+        int strength = ((Instantiation) param).getStrength();
+        boolean error = true;
+        switch (alg) {
+            case INVALID_ALGO:
+                error = false;
+                break;
+            case "SHA-224":
+            case "SHA-512/224":
+                if (strength > 192) {
+                    error = false;
+                }
+                break;
+            case "SHA-256":
+            case "SHA-512/256":
+            case "SHA-384":
+            case "SHA-512":
+                if (strength > 256) {
+                    error = false;
+                }
+                break;
+            case "AES-128":
+            case "AES-192":
+            case "AES-256":
+                int algoStrength = Integer.parseInt(alg.replaceAll("AES-", ""));
+                int maxStrengthSupported = Cipher.getMaxAllowedKeyLength("AES");
+                if (strength > maxStrengthSupported
+                        || algoStrength > maxStrengthSupported) {
+                    error = false;
+                }
+                break;
+        }
+        if (error) {
+            throw new RuntimeException("Unknown :", e);
+        }
+    }
+
+    /**
+     * Find if the mechanism is a DRBG mechanism.
+     * @param mech Mechanism name
+     * @return True for DRBG mechanism else False
+     */
+    private static boolean isDRBG(String mech) {
+        return mech.contains("_DRBG");
+    }
+
+    /**
+     * Find the name of supported native mechanism name for current platform.
+     */
+    private static String supportedNativeAlgo() {
+        String nativeSr = "Windows-PRNG";
+        try {
+            SecureRandom.getInstance(nativeSr);
+        } catch (NoSuchAlgorithmException e) {
+            nativeSr = "NativePRNG";
+        }
+        return nativeSr;
+    }
+
+    /**
+     * Test a possible set of SecureRandom API for a SecureRandom instance.
+     * @param random SecureRandom instance
+     * @param mech Mechanism used to create SecureRandom instance
+     */
+    private static void verifyAPI(SecureRandom random, String mech)
+            throws Exception {
+
+        System.out.printf("%nTest SecureRandom mechanism: %s for provider: %s",
+                mech, random.getProvider().getName());
+        byte[] output = new byte[2];
+
+        // Generate random number.
+        random.nextBytes(output);
+
+        // Seed the SecureRandom with a generated seed value of lesser size.
+        byte[] seed = random.generateSeed(1);
+        random.setSeed(seed);
+        random.nextBytes(output);
+
+        // Seed the SecureRandom with a fixed seed value.
+        random.setSeed(SEED);
+        random.nextBytes(output);
+
+        // Seed the SecureRandom with a larger seed value.
+        seed = random.generateSeed(128);
+        random.setSeed(seed);
+        random.nextBytes(output);
+
+        // Additional operation only supported for DRBG based SecureRandom.
+        // Execute the code block and expect to pass for DRBG. If it will fail
+        // then it should fail with specified exception type. Else the case
+        // will be considered as a test case failure.
+        matchExc(() -> {
+            random.reseed();
+            random.nextBytes(output);
+        },
+                isDRBG(mech),
+                UnsupportedOperationException.class,
+                String.format("PASS - Unsupported reseed() method for "
+                        + "SecureRandom Algorithm %s ", mech));
+
+        matchExc(() -> {
+            random.reseed(DrbgParameters.reseed(false, new byte[]{}));
+            random.nextBytes(output);
+        },
+                isDRBG(mech),
+                UnsupportedOperationException.class,
+                String.format("PASS - Unsupported reseed(param) method for "
+                        + "SecureRandom Algorithm %s ", mech));
+
+        matchExc(() -> {
+            random.reseed(DrbgParameters.reseed(true, new byte[]{}));
+            random.nextBytes(output);
+        },
+                isDRBG(mech),
+                !isSupportPR(mech, random) ? IllegalArgumentException.class
+                        : UnsupportedOperationException.class,
+                String.format("PASS - Unsupported or illegal reseed(param) "
+                        + "method for SecureRandom Algorithm %s ", mech));
+
+        matchExc(() -> random.nextBytes(output,
+                DrbgParameters.nextBytes(-1, false, new byte[]{})),
+                isDRBG(mech),
+                UnsupportedOperationException.class,
+                String.format("PASS - Unsupported nextBytes(out, nextByteParam)"
+                        + " method for SecureRandom Algorithm %s ", mech));
+
+        matchExc(() -> random.nextBytes(output,
+                DrbgParameters.nextBytes(-1, true, new byte[]{})),
+                isDRBG(mech),
+                !isSupportPR(mech, random) ? IllegalArgumentException.class
+                        : UnsupportedOperationException.class,
+                String.format("PASS - Unsupported or illegal "
+                        + "nextBytes(out, nextByteParam) method for "
+                        + "SecureRandom Algorithm %s ", mech));
+
+        matchExc(() -> {
+            random.reseed(null);
+            random.nextBytes(output);
+        },
+                !SHOULD_PASS,
+                IllegalArgumentException.class,
+                "PASS - Test is expected to fail when parameter for reseed() "
+                + "is null");
+
+        matchExc(() -> random.nextBytes(output, null),
+                !SHOULD_PASS,
+                IllegalArgumentException.class,
+                "PASS - Test is expected to fail when parameter for nextBytes()"
+                + " is null");
+
+    }
+
+    private static boolean isSupportPR(String mech, SecureRandom random) {
+        return (isDRBG(mech) && ((Instantiation) random.getParameters())
+                .getCapability()
+                .supportsPredictionResistance());
+    }
+
+    private interface RunnableCode {
+
+        void run() throws Exception;
+    }
+
+    /**
+     * Execute a given code block and verify, if the exception type is expected.
+     * @param r Code block to run
+     * @param ex Expected exception type
+     * @param shouldPass If the code execution expected to pass without failure
+     * @param msg Message to log in case of expected failure
+     */
+    private static void matchExc(RunnableCode r, boolean shouldPass, Class ex,
+            String msg) {
+        try {
+            r.run();
+            if (!shouldPass) {
+                throw new RuntimeException("Excecution should fail here.");
+            }
+        } catch (Exception e) {
+            System.out.printf("%nOccured exception: %s - Expected exception: "
+                    + "%s : ", e.getClass(), ex.getCanonicalName());
+            if (ex.isAssignableFrom(e.getClass())) {
+                System.out.printf("%n%s : Expected Exception occured: %s : ",
+                        e.getClass(), msg);
+            } else if (shouldPass) {
+                throw new RuntimeException(e);
+            } else {
+                System.out.printf("Ignore the following exception: %s%n",
+                        e.getMessage());
+            }
+        }
+    }
+}
diff --git a/jdk/test/java/security/SecureRandom/EnoughSeedTest.java b/jdk/test/java/security/SecureRandom/EnoughSeedTest.java
new file mode 100644
index 00000000000..82c51c04fb4
--- /dev/null
+++ b/jdk/test/java/security/SecureRandom/EnoughSeedTest.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2016, 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 8141039
+ * @library /lib/testlibrary
+ * @summary Check SecureRandom generate expected seed counts what the caller
+ *          asked for.
+ * @run main EnoughSeedTest
+ */
+import java.security.SecureRandom;
+import java.security.Security;
+import static java.lang.Math.*;
+
+public class EnoughSeedTest {
+
+    private static final String DRBG_CONFIG = "securerandom.drbg.config";
+    private static final String DRBG_CONFIG_VALUE
+            = Security.getProperty(DRBG_CONFIG);
+
+    public static void main(String[] args) {
+
+        boolean success = true;
+        for (String mech : new String[]{
+            "SHA1PRNG", "Hash_DRBG", "HMAC_DRBG", "CTR_DRBG"}) {
+            System.out.printf("%nTest for SecureRandom algorithm: '%s'", mech);
+            try {
+                SecureRandom sr = null;
+                if (!mech.contains("_DRBG")) {
+                    sr = SecureRandom.getInstance(mech);
+                } else {
+                    Security.setProperty(DRBG_CONFIG, mech);
+                    sr = SecureRandom.getInstance("DRBG");
+                }
+
+                success &= forEachSeedBytes(sr);
+                System.out.printf("%nCompleted test for SecureRandom "
+                        + "mechanism: '%s'", mech);
+            } catch (Exception e) {
+                success &= false;
+                e.printStackTrace(System.out);
+            } finally {
+                Security.setProperty(DRBG_CONFIG, DRBG_CONFIG_VALUE);
+            }
+        }
+        if (!success) {
+            throw new RuntimeException("At least one test failed.");
+        }
+    }
+
+    /**
+     * Generates fixed number of seed bytes through a SecureRandom instance
+     * to verify it's seed generation status.
+     * @param sr SecureRandom instance
+     * @return The test success indicator
+     */
+    private static boolean forEachSeedBytes(SecureRandom sr) {
+        boolean success = true;
+        sr.setSeed(1l);
+        for (int seedByte : new int[]{Integer.MIN_VALUE, -1, 0, 1, 256, 1024,
+            Short.MAX_VALUE, (int) pow(2, 20)}) {
+            try {
+                byte[] seed = sr.generateSeed(seedByte);
+                if (seed.length != seedByte) {
+                    throw new RuntimeException("Not able to produce expected "
+                            + "seed size.");
+                }
+            } catch (IllegalArgumentException e) {
+                if (seedByte >= 0) {
+                    throw new RuntimeException("Unknown Exception occured.", e);
+                }
+                System.out.printf("%nPASS - Exception expected when required "
+                        + "seed size requested is negative: %s", seedByte);
+            }
+        }
+        return success;
+    }
+
+}
diff --git a/jdk/test/java/security/SecureRandom/GetAlgorithm.java b/jdk/test/java/security/SecureRandom/GetAlgorithm.java
index b1947ef1db8..1ec3fd25ce2 100644
--- a/jdk/test/java/security/SecureRandom/GetAlgorithm.java
+++ b/jdk/test/java/security/SecureRandom/GetAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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,49 +23,54 @@
 
 /**
  * @test
- * @bug 4915392
+ * @bug 4915392 8141039
  * @summary test that the getAlgorithm() method works correctly
  * @author Andreas Sterbenz
+ * @run main GetAlgorithm
  */
-
 import java.io.*;
-
 import java.security.*;
+import java.util.Arrays;
+import java.util.List;
 
 public class GetAlgorithm {
 
-    private final static String BASE = System.getProperty("test.src", ".");
+    private static final String BASE = System.getProperty("test.src", ".");
+    private static final String DRBG_CONFIG = "securerandom.drbg.config";
+    private static final String DRBG_CONFIG_VALUE
+            = Security.getProperty(DRBG_CONFIG);
 
     public static void main(String[] args) throws Exception {
-        SecureRandom sr;
-
-        sr = new SecureRandom();
+        SecureRandom sr = new SecureRandom();
         if (sr.getAlgorithm().equals("unknown")) {
             throw new Exception("Unknown: " + sr.getAlgorithm());
         }
 
-        sr = SecureRandom.getInstance("SHA1PRNG");
-        check("SHA1PRNG", sr);
+        for (String mech : new String[]{supportedNativeAlgo(), "SHA1PRNG",
+            "Hash_DRBG", "HMAC_DRBG", "CTR_DRBG"}) {
+            if (!mech.contains("_DRBG")) {
+                check(mech, SecureRandom.getInstance(mech));
+            } else {
+                try {
+                    Security.setProperty(DRBG_CONFIG, mech);
+                    check("DRBG", SecureRandom.getInstance("DRBG"));
+                } finally {
+                    Security.setProperty(DRBG_CONFIG, DRBG_CONFIG_VALUE);
+                }
+            }
+        }
+        check("unknown", new MySecureRandom());
 
-//      OutputStream out = new FileOutputStream("sha1prng.bin");
-//      ObjectOutputStream oout = new ObjectOutputStream(out);
-//      sr.nextInt();
-//      oout.writeObject(sr);
-//      oout.flush();
-//      oout.close();
-
-        sr = new MySecureRandom();
-        check("unknown", sr);
-
-        InputStream in = new FileInputStream(new File(BASE, "sha1prng-old.bin"));
+        InputStream in = new FileInputStream(
+                new File(BASE, "sha1prng-old.bin"));
         ObjectInputStream oin = new ObjectInputStream(in);
-        sr = (SecureRandom)oin.readObject();
+        sr = (SecureRandom) oin.readObject();
         oin.close();
         check("unknown", sr);
 
         in = new FileInputStream(new File(BASE, "sha1prng-new.bin"));
         oin = new ObjectInputStream(in);
-        sr = (SecureRandom)oin.readObject();
+        sr = (SecureRandom) oin.readObject();
         oin.close();
         check("SHA1PRNG", sr);
 
@@ -83,4 +88,17 @@ public class GetAlgorithm {
 
     }
 
+    /**
+     * Find the name of supported native mechanism name for current platform.
+     */
+    private static String supportedNativeAlgo() {
+        String nativeSr = "Windows-PRNG";
+        try {
+            SecureRandom.getInstance(nativeSr);
+        } catch (NoSuchAlgorithmException e) {
+            nativeSr = "NativePRNG";
+        }
+        return nativeSr;
+    }
+
 }
diff --git a/jdk/test/java/security/SecureRandom/GetInstanceTest.java b/jdk/test/java/security/SecureRandom/GetInstanceTest.java
new file mode 100644
index 00000000000..511188a7709
--- /dev/null
+++ b/jdk/test/java/security/SecureRandom/GetInstanceTest.java
@@ -0,0 +1,312 @@
+/*
+ * Copyright (c) 2016, 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 8141039
+ * @library /lib/testlibrary
+ * @summary SecureRandom supports multiple getInstance method including
+ *          getInstanceStrong() method. This test verifies a set of possible
+ *          cases for getInstance with different SecureRandom mechanism
+ *          supported in Java.
+ * @run main GetInstanceTest
+ */
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.SecureRandom;
+import java.security.SecureRandomParameters;
+import java.security.DrbgParameters;
+
+import static java.security.DrbgParameters.Capability.*;
+
+import java.security.Security;
+import java.util.Arrays;
+
+import jdk.testlibrary.Asserts;
+
+public class GetInstanceTest {
+
+    private static final boolean PASS = true;
+    private static final String INVALID_ALGO = "INVALID";
+    private static final String SUN_PROVIDER = "SUN";
+    private static final String INVALID_PROVIDER = "INVALID";
+    private static final String STRONG_ALG_SEC_PROP
+            = "securerandom.strongAlgorithms";
+    private static final String DRBG_CONFIG = "securerandom.drbg.config";
+    private static final String DRBG_CONFIG_VALUE
+            = Security.getProperty(DRBG_CONFIG);
+
+    public static void main(String[] args) throws Exception {
+
+        boolean success = true;
+        // Only accepted failure is NoSuchAlgorithmException.
+        // For any other failure the test case will fail here.
+        SecureRandom sr = matchExc(() -> SecureRandom.getInstanceStrong(),
+                PASS, NoSuchAlgorithmException.class,
+                "PASS - Undefined security Property "
+                + "'securerandom.strongAlgorithms'");
+        System.out.format("Current platform supports mechanism: '%s' through "
+                + "provider: '%s' for the method getInstanceStrong().",
+                sr.getAlgorithm(), sr.getProvider().getName());
+
+        // DRBG name should appear with "securerandom.strongAlgorithms"
+        // security property.
+        String origDRBGConfig = Security.getProperty(STRONG_ALG_SEC_PROP);
+        if (!origDRBGConfig.contains("DRBG")) {
+            throw new RuntimeException("DRBG is not associated with default "
+                    + "strong algorithm through security Property: "
+                    + "'securerandom.strongAlgorithms'.");
+        }
+        Security.setProperty(STRONG_ALG_SEC_PROP, "DRBG:SUN");
+        sr = matchExc(() -> SecureRandom.getInstanceStrong(),
+                PASS, NoSuchAlgorithmException.class,
+                "PASS - Undefined security Property "
+                + "'securerandom.strongAlgorithms'");
+        checkAttributes(sr, "DRBG");
+        Security.setProperty(STRONG_ALG_SEC_PROP, origDRBGConfig);
+
+        for (String mech : new String[]{
+            "SHA1PRNG", "Hash_DRBG", "HMAC_DRBG", "CTR_DRBG", INVALID_ALGO,}) {
+            System.out.printf("%nTest SecureRandom mechanism: '%s'", mech);
+            try {
+                if (isDRBG(mech)) {
+                    Security.setProperty(DRBG_CONFIG, mech);
+                }
+                verifyInstance(mech);
+            } catch (Exception e) {
+                e.printStackTrace(System.out);
+                success = false;
+            } finally {
+                Security.setProperty(DRBG_CONFIG, DRBG_CONFIG_VALUE);
+            }
+        }
+        if (!success) {
+            throw new RuntimeException("At least one test failed.");
+        }
+    }
+
+    private static void verifyInstance(String mech) throws Exception {
+
+        String srAlgo = isDRBG(mech) ? "DRBG" : mech;
+
+        // Test for getInstance(algorithm) method.
+        // It should pass for all case other than invalid algorithm name.
+        // If it fails then the expected exception type should be
+        // NoSuchAlgorithmException. Any other Exception type occured will be
+        // treated as failure.
+        checkAttributes(
+                matchExc(() -> SecureRandom.getInstance(srAlgo), !(nsa(mech)),
+                        NoSuchAlgorithmException.class,
+                        String.format("PASS - It is expected to fail for"
+                                + " getInstance(algorithm) when algorithm: '%s'"
+                                + " is null or invalid.", mech)), mech);
+        // Test for getInstance(algorithm, provider) method.
+        checkAttributes(
+                matchExc(() -> SecureRandom.getInstance(srAlgo,
+                                Security.getProvider(SUN_PROVIDER)),
+                        !(nsa(mech)),
+                        NoSuchAlgorithmException.class,
+                        String.format("PASS - It is expected to fail for"
+                                + " getInstance(algorithm, provider) when"
+                                + " algorithm:'%s' is null or invalid.", mech)),
+                mech);
+        // Test for getInstance(algorithm, providerName) method.
+        checkAttributes(
+                matchExc(() -> SecureRandom.getInstance(srAlgo, SUN_PROVIDER),
+                        !(nsa(mech)), NoSuchAlgorithmException.class,
+                        String.format("PASS - It is expected to fail for "
+                                + "getInstance(algorithm, providerName) when "
+                                + "algorithm: '%s' is null or invalid.", mech)),
+                mech);
+        // Test for getInstance(algorithm, providerName) method.
+        checkAttributes(
+                matchExc(() -> SecureRandom.getInstance(
+                                srAlgo, INVALID_PROVIDER),
+                        !PASS, NoSuchProviderException.class,
+                        String.format("PASS - It is expected to fail for "
+                                + "getInstance(algorithm, providerName) when "
+                                + "provider name: '%s' is invalid and "
+                                + "algorithm: '%s'", INVALID_PROVIDER, mech)),
+                mech);
+
+        // Run the test for a set of SecureRandomParameters
+        for (SecureRandomParameters param : Arrays.asList(null,
+                DrbgParameters.instantiation(-1, NONE, null))) {
+
+            System.out.printf("%nRunning DRBG param getInstance() methods "
+                    + "for algorithm: %s and DRBG param type: %s", mech,
+                    (param != null) ? param.getClass().getName() : param);
+
+            // Following Test are applicable for new DRBG methods only.
+            // Test for getInstance(algorithm, params) method.
+            // Tests are expected to pass for DRBG type with valid parameter
+            // If it fails the expected exception type is derived from
+            // getExcType(mech, param) method. If exception type is not
+            // expected then the test will be considered as failure.
+            checkAttributes(
+                    matchExc(() -> SecureRandom.getInstance(srAlgo, param),
+                            (isDRBG(mech)) && (isValidDRBGParam(param)),
+                            getExcType(mech, param),
+                            String.format("PASS - It is expected to fail "
+                                    + "for getInstance(algorithm, params) "
+                                    + "for algorithm: %s and parameter: %s",
+                                    mech, param)),
+                    mech);
+            // Test for getInstance(algorithm, params, provider) method.
+            checkAttributes(
+                    matchExc(() -> SecureRandom.getInstance(srAlgo, param,
+                                    Security.getProvider(SUN_PROVIDER)),
+                            (isDRBG(mech)) && (isValidDRBGParam(param)),
+                            getExcType(mech, param),
+                            String.format("PASS - It is expected to fail "
+                                    + "for getInstance(algorithm, params, "
+                                    + "provider) for algorithm: %s and "
+                                    + "parameter: %s", mech, param)),
+                    mech);
+            // Test for getInstance(algorithm, params, providerName) method.
+            checkAttributes(
+                    matchExc(() -> SecureRandom.getInstance(srAlgo, param,
+                                    SUN_PROVIDER),
+                            (isDRBG(mech)) && (isValidDRBGParam(param)),
+                            getExcType(mech, param),
+                            String.format("PASS - It is expected to fail "
+                                    + "for getInstance(algorithm, params, "
+                                    + "providerName) for algorithm: %s and "
+                                    + "parameter: %s", mech, param)), mech);
+            // getInstance(algorithm, params, providerName) when
+            // providerName is invalid
+            checkAttributes(
+                    matchExc(() -> SecureRandom.getInstance(srAlgo, param,
+                                    INVALID_PROVIDER),
+                            !PASS, ((param == null)
+                                    ? IllegalArgumentException.class
+                                    : NoSuchProviderException.class),
+                            String.format("PASS - It is expected to fail "
+                                    + "for getInstance(algorithm, params, "
+                                    + "providerName) when param is null or"
+                                    + " provider: %s is invalid for "
+                                    + "algorithm: '%s'", INVALID_PROVIDER,
+                                    mech)), mech);
+            // getInstance(algorithm, params, provider) when provider=null
+            checkAttributes(
+                    matchExc(() -> SecureRandom.getInstance(srAlgo, param,
+                                    (String) null),
+                            !PASS, IllegalArgumentException.class,
+                            String.format("PASS - It is expected to fail "
+                                    + "for getInstance(algorithm, params, "
+                                    + "providerName) when provider name "
+                                    + "is null")), mech);
+            // getInstance(algorithm, params, providerName) when
+            // providerName is empty.
+            checkAttributes(
+                    matchExc(() -> SecureRandom.getInstance(
+                                    srAlgo, param, ""),
+                            !PASS, IllegalArgumentException.class,
+                            String.format("PASS - It is expected to fail "
+                                    + "for getInstance(algorithm, params, "
+                                    + "providerName) when provider name "
+                                    + "is empty")), mech);
+        }
+    }
+
+    private static boolean isValidDRBGParam(SecureRandomParameters param) {
+        return (param instanceof DrbgParameters.Instantiation);
+    }
+
+    /**
+     * If the mechanism should occur NoSuchAlgorithmException.
+     */
+    private static boolean nsa(String mech) {
+        return mech.equals(INVALID_ALGO);
+    }
+
+    /**
+     * Verify if the mechanism is DRBG type.
+     * @param mech Mechanism name
+     * @return True if the mechanism name is DRBG type else False.
+     */
+    private static boolean isDRBG(String mech) {
+        return mech.contains("_DRBG");
+    }
+
+    /**
+     * Type of exception expected for a SecureRandom instance when exception
+     * occurred while calling getInstance method with a fixed set of parameter.
+     * @param mech Mechanism used to create a SecureRandom instance
+     * @param param Parameter to getInstance() method
+     * @return Exception type expected
+     */
+    private static Class getExcType(String mech, SecureRandomParameters param) {
+        return ((isDRBG(mech) && !isValidDRBGParam(param)) || param == null)
+                ? IllegalArgumentException.class
+                : NoSuchAlgorithmException.class;
+    }
+
+    private interface RunnableCode {
+
+        SecureRandom run() throws Exception;
+    }
+
+    /**
+     * Execute a given code block and verify, if the exception type is expected.
+     * @param r Code block to run
+     * @param ex Expected exception type
+     * @param shouldPass If the code execution expected to pass without failure
+     * @param msg Message to log in case of expected failure
+     */
+    private static SecureRandom matchExc(RunnableCode r, boolean shouldPass,
+            Class ex, String msg) {
+        SecureRandom sr = null;
+        try {
+            sr = r.run();
+            if (!shouldPass) {
+                throw new RuntimeException("Excecution should fail here.");
+            }
+        } catch (Exception e) {
+            System.out.printf("%nOccured exception: %s - Expected exception: %s"
+                    + " : ", e.getClass(), ex.getCanonicalName());
+            if (ex.isAssignableFrom(e.getClass())) {
+                System.out.printf("%n%s : Expected Exception: %s : ",
+                        e.getClass(), msg);
+            } else if (shouldPass) {
+                throw new RuntimeException(e);
+            } else {
+                System.out.printf("%nIgnore the following exception: %s%n",
+                        e.getMessage());
+            }
+        }
+        return sr;
+    }
+
+    /**
+     * Check specific attributes of a SecureRandom instance.
+     */
+    private static void checkAttributes(SecureRandom sr, String mech) {
+        if (sr == null) {
+            return;
+        }
+        Asserts.assertEquals(sr.getAlgorithm(), (isDRBG(mech) ? "DRBG" : mech));
+        Asserts.assertEquals(sr.getProvider().getName(), SUN_PROVIDER);
+    }
+
+}
diff --git a/jdk/test/java/security/SecureRandom/MultiThreadTest.java b/jdk/test/java/security/SecureRandom/MultiThreadTest.java
new file mode 100644
index 00000000000..17ae3377377
--- /dev/null
+++ b/jdk/test/java/security/SecureRandom/MultiThreadTest.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2016, 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 java.math.BigInteger;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.security.Security;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CompletionService;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorCompletionService;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import static java.lang.Math.*;
+
+/*
+ * @test
+ * @bug 8141039
+ * @library /lib/testlibrary
+ * @summary Test behavior of a shared SecureRandom object when it is operated
+ *          by multiple threads concurrently.
+ * @run main MultiThreadTest
+ */
+public class MultiThreadTest {
+
+    private static final byte[] GEN_RND_BYTES = {1};
+    private static final String DRBG_CONFIG = "securerandom.drbg.config";
+    private static final String DRBG_CONFIG_VALUE
+            = Security.getProperty(DRBG_CONFIG);
+
+    private enum SEED {
+
+        NONE, RESEED, SETSEED
+    }
+
+    public static void main(String[] args) {
+
+        boolean success = true;
+        for (int byteLen : GEN_RND_BYTES) {
+            for (SEED reSeed : SEED.values()) {
+                for (String mech : new String[]{
+                    "SHA1PRNG", "Hash_DRBG", "HMAC_DRBG", "CTR_DRBG"}) {
+                    try {
+                        forEachMech(mech, byteLen, reSeed);
+                    } catch (Exception e) {
+                        success = false;
+                        e.printStackTrace(System.out);
+                    } finally {
+                        Security.setProperty(DRBG_CONFIG, DRBG_CONFIG_VALUE);
+                    }
+                }
+            }
+        }
+
+        if (!success) {
+            throw new RuntimeException("At least one test failed.");
+        }
+    }
+
+    /**
+     * Generate a number of threads to fetch random numbers of certain bits
+     * generated through a shared SecureRandom instance.
+     * @param mech Mechanism name
+     * @param byteLen Number of bytes of random number to produce
+     * @param reSeed Call reseed() before generating random numbers
+     * @throws NoSuchAlgorithmException
+     * @throws InterruptedException
+     * @throws ExecutionException
+     */
+    private static void forEachMech(String mech, int byteLen, SEED reSeed)
+            throws NoSuchAlgorithmException, InterruptedException,
+            ExecutionException {
+
+        if ("SHA1PRNG".equals(mech) && SEED.RESEED.equals(reSeed)) {
+            System.out.printf(
+                    "%nreseed() api is not supported for '%s'", mech);
+            return;
+        }
+        System.out.printf("%nTest SecureRandom mechanism: '%s' with support of"
+                + " reseed: '%s'", mech, reSeed);
+        int threadCount = (int) pow(2, 8 * byteLen);
+        System.out.printf("%nCreating %s number of threads to generate secure "
+                + "random numbers concurrently.", threadCount);
+
+        ExecutorService executor
+                = Executors.newCachedThreadPool(new ThreadFactory() {
+                    @Override
+                    public Thread newThread(Runnable r) {
+                        Thread t = Executors.defaultThreadFactory()
+                        .newThread(r);
+                        t.setDaemon(true);
+                        return t;
+                    }
+                });
+        CompletionService<Integer> completionService
+                = new ExecutorCompletionService<Integer>(executor);
+
+        CountDownLatch latch = new CountDownLatch(1);
+        SecureRandom rnd = null;
+        if (!mech.contains("_DRBG")) {
+            rnd = SecureRandom.getInstance(mech);
+        } else {
+            Security.setProperty(DRBG_CONFIG, mech);
+            rnd = SecureRandom.getInstance("DRBG");
+        }
+        try {
+            for (int i = 0; i < threadCount; i++) {
+                completionService.submit(new Task(rnd, latch, byteLen, reSeed));
+            }
+            latch.countDown();
+
+            for (int i = 0; i < threadCount; i++) {
+                completionService.take();
+            }
+        } finally {
+            executor.shutdown();
+        }
+        System.out.printf("%nCompleted Test for algorithm '%s' with thread "
+                + "counts to '%s' using reseeding '%s'",
+                mech, threadCount, reSeed);
+
+    }
+
+    /**
+     * Define a Task to be executed by multiple thread to produce random numbers
+     * from a shared SecureRandom instance.
+     */
+    private static class Task implements Callable<Integer> {
+
+        private final SecureRandom random;
+        private final CountDownLatch latch;
+        private final SEED reSeed;
+        private final int byteSize;
+
+        public Task(SecureRandom random, CountDownLatch latch, int byteSize,
+                SEED reSeed) {
+            this.random = random;
+            this.latch = latch;
+            this.byteSize = byteSize;
+            this.reSeed = reSeed;
+        }
+
+        @Override
+        public Integer call() throws Exception {
+            latch.await();
+            switch (this.reSeed) {
+                case RESEED:
+                    this.random.reseed();
+                    break;
+                case SETSEED:
+                    this.random.setSeed(1l);
+                    break;
+            }
+            byte[] bytes = new byte[byteSize];
+            random.nextBytes(bytes);
+            return new BigInteger(bytes).intValue();
+        }
+    }
+
+}
diff --git a/jdk/test/java/security/SecureRandom/SerializedSeedTest.java b/jdk/test/java/security/SecureRandom/SerializedSeedTest.java
new file mode 100644
index 00000000000..ba4289ce4c7
--- /dev/null
+++ b/jdk/test/java/security/SecureRandom/SerializedSeedTest.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright (c) 2016, 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 8141039
+ * @library /lib/testlibrary
+ * @summary When random number is generated through the a SecureRandom instance
+ *          as well from it's serialized instance in the same time then the
+ *          generated random numbers should be different when one or both are
+ *          reseeded.
+ * @run main SerializedSeedTest
+ */
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ByteArrayInputStream;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.security.Security;
+import jdk.testlibrary.Asserts;
+
+public class SerializedSeedTest {
+
+    private static final byte[] SEED = "seed".getBytes();
+    private static final String DRBG_CONFIG = "securerandom.drbg.config";
+    private static final String DRBG_CONFIG_VALUE
+            = Security.getProperty(DRBG_CONFIG);
+
+    public static void main(String[] args) {
+        boolean success = true;
+
+        for (String mech : new String[]{
+            "SHA1PRNG", "Hash_DRBG", "HMAC_DRBG", "CTR_DRBG"}) {
+            System.out.printf(
+                    "%nRunning test for SecureRandom mechanism: '%s'", mech);
+            try {
+                // Serialize without seed and compare generated random numbers
+                // produced through original and serialized instances.
+                SecureRandom orig = getSRInstance(mech);
+                SecureRandom copy = deserializedCopy(orig);
+                System.out.printf("%nSerialize without seed. Generated random"
+                        + " numbers should be different.");
+                check(orig, copy, false, mech);
+
+                // Serialize after default seed and compare generated random
+                // numbers produced through original and serialized instances.
+                orig = getSRInstance(mech);
+                orig.nextInt(); // Default seeded
+                copy = deserializedCopy(orig);
+                System.out.printf("%nSerialize after default seed. Generated"
+                        + " random numbers should be same till 20-bytes.");
+                check(orig, copy, !isDRBG(mech), mech);
+
+                // Serialize after explicit seed and compare generated random
+                // numbers produced through original and serialized instances.
+                orig = getSRInstance(mech);
+                orig.setSeed(SEED); // Explicitly seeded
+                copy = deserializedCopy(orig);
+                System.out.printf("%nSerialize after explicit seed. Generated "
+                        + "random numbers should be same till 20-bytes.");
+                check(orig, copy, !isDRBG(mech), mech);
+
+                // Serialize without seed but original is explicitly seeded
+                // before generating any random number. Then compare generated
+                // random numbers produced through original and serialized
+                // instances.
+                orig = getSRInstance(mech);
+                copy = deserializedCopy(orig);
+                orig.setSeed(SEED); // Explicitly seeded
+                System.out.printf("%nSerialize without seed. When original is "
+                        + "explicitly seeded before generating random numbers,"
+                        + " Generated random numbers should be different.");
+                check(orig, copy, false, mech);
+
+                // Serialize after default seed but original is explicitly
+                // seeded before generating any random number. Then compare
+                // generated random numbers produced through original and
+                // serialized instances.
+                orig = getSRInstance(mech);
+                orig.nextInt(); // Default seeded
+                copy = deserializedCopy(orig);
+                orig.setSeed(SEED); // Explicitly seeded
+                System.out.printf("%nSerialize after default seed but original "
+                        + "is explicitly seeded before generating random number"
+                        + ". Generated random numbers should be different.");
+                check(orig, copy, false, mech);
+
+                // Serialize after explicit seed but original is explicitly
+                // seeded again before generating random number. Then compare
+                // generated random numbers produced through original and
+                // serialized instances.
+                orig = getSRInstance(mech);
+                orig.setSeed(SEED); // Explicitly seeded
+                copy = deserializedCopy(orig);
+                orig.setSeed(SEED); // Explicitly seeded
+                System.out.printf("%nSerialize after explicit seed but "
+                        + "original is explicitly seeded again before "
+                        + "generating random number. Generated random "
+                        + "numbers should be different.");
+                check(orig, copy, false, mech);
+
+            } catch (Exception e) {
+                e.printStackTrace(System.out);
+                success = false;
+            } finally {
+                Security.setProperty(DRBG_CONFIG, DRBG_CONFIG_VALUE);
+            }
+            System.out.printf("%n------Completed Test for %s------", mech);
+        }
+
+        if (!success) {
+            throw new RuntimeException("At least one test failed.");
+        }
+    }
+
+    /**
+     * Find if the mechanism is a DRBG mechanism.
+     * @param mech Mechanism name
+     * @return True for DRBG mechanism else False
+     */
+    private static boolean isDRBG(String mech) {
+        return mech.contains("_DRBG");
+    }
+
+    /**
+     * Verify the similarity of random numbers generated though both original
+     * as well as deserialized instance.
+     */
+    private static void check(SecureRandom orig, SecureRandom copy,
+            boolean equal, String mech) {
+        int o = orig.nextInt();
+        int c = copy.nextInt();
+        System.out.printf("%nRandom number generated for mechanism: '%s' "
+                + "from original instance as: '%s' and from serialized "
+                + "instance as: '%s'", mech, o, c);
+        if (equal) {
+            Asserts.assertEquals(o, c, mech);
+        } else {
+            Asserts.assertNotEquals(o, c, mech);
+        }
+    }
+
+    /**
+     * Get a copy of SecureRandom instance through deserialization.
+     * @param orig Original SecureRandom instance
+     * @return Deserialized SecureRandom instance
+     * @throws IOException
+     * @throws ClassNotFoundException
+     */
+    private static SecureRandom deserializedCopy(SecureRandom orig)
+            throws IOException, ClassNotFoundException {
+        return deserialize(serialize(orig));
+    }
+
+    /**
+     * Deserialize the SecureRandom object.
+     */
+    private static SecureRandom deserialize(byte[] serialized)
+            throws IOException, ClassNotFoundException {
+        SecureRandom sr = null;
+        try (ByteArrayInputStream bis = new ByteArrayInputStream(serialized);
+                ObjectInputStream ois = new ObjectInputStream(bis)) {
+            sr = (SecureRandom) ois.readObject();
+        }
+        return sr;
+    }
+
+    /**
+     * Serialize the given SecureRandom object.
+     */
+    private static byte[] serialize(SecureRandom sr) throws IOException {
+        try (ByteArrayOutputStream bos = new ByteArrayOutputStream();
+                ObjectOutputStream oos = new ObjectOutputStream(bos)) {
+            oos.writeObject(sr);
+            return bos.toByteArray();
+        }
+    }
+
+    /**
+     * Create a SecureRandom instance for a given mechanism.
+     */
+    private static SecureRandom getSRInstance(String mech)
+            throws NoSuchAlgorithmException {
+        if (!isDRBG(mech)) {
+            return SecureRandom.getInstance(mech);
+        } else {
+            Security.setProperty(DRBG_CONFIG, mech);
+            return SecureRandom.getInstance("DRBG");
+        }
+    }
+
+}
diff --git a/jdk/test/sun/security/provider/SecureRandom/StrongSecureRandom.java b/jdk/test/sun/security/provider/SecureRandom/StrongSecureRandom.java
index 2a45522cad8..fd0b20cfdb2 100644
--- a/jdk/test/sun/security/provider/SecureRandom/StrongSecureRandom.java
+++ b/jdk/test/sun/security/provider/SecureRandom/StrongSecureRandom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
@@ -21,11 +21,11 @@
  * questions.
  */
 
-/**
+/*
  * @test
- * @bug 6425477
+ * @bug 6425477 8141039
  * @summary Better support for generation of high entropy random numbers
- * @run main/othervm StrongSecureRandom
+ * @run main StrongSecureRandom
  */
 import java.security.*;
 import java.util.*;
@@ -35,7 +35,10 @@ import java.util.*;
  */
 public class StrongSecureRandom {
 
-    private static String os = System.getProperty("os.name", "unknown");
+    private static final String os = System.getProperty("os.name", "unknown");
+    private static final String DRBG_CONFIG = "securerandom.drbg.config";
+    private static final String DRBG_CONFIG_VALUE
+            = Security.getProperty(DRBG_CONFIG);
 
     private static void testDefaultEgd() throws Exception {
         // No SecurityManager installed.
@@ -47,31 +50,53 @@ public class StrongSecureRandom {
         }
     }
 
-    private static void testSHA1PRNGImpl() throws Exception {
-        SecureRandom sr;
+    /**
+     * Verify if the mechanism is DRBG type.
+     * @param mech Mechanism name
+     * @return True if the mechanism name is DRBG type else False.
+     */
+    private static boolean isDRBG(String mech) {
+        return mech.contains("_DRBG");
+    }
+
+    private static void testSecureRandomImpl(String algo, boolean drbg)
+            throws Exception {
+
         byte[] ba;
+        final String secureRandomSource
+                = Security.getProperty("securerandom.source");
+        try {
+            String urandom = "file:/dev/urandom";
 
-        String urandom = "file:/dev/urandom";
+            System.out.println("Testing new SeedGenerator and EGD");
 
-        System.out.println("Testing new SeedGenerator and EGD");
+            Security.setProperty("securerandom.source", urandom);
+            if (!Security.getProperty("securerandom.source").equals(urandom)) {
+                throw new Exception("Couldn't set securerandom.source");
+            }
 
-        Security.setProperty("securerandom.source", urandom);
-        if (!Security.getProperty("securerandom.source").equals(urandom)) {
-            throw new Exception("Couldn't set securerandom.source");
+            /*
+             * Take out a large number of bytes in hopes of blocking.
+             * Don't expect this to happen, unless something is broken on Linux
+             */
+            SecureRandom sr = null;
+            if (drbg) {
+                Security.setProperty(DRBG_CONFIG, algo);
+                sr = SecureRandom.getInstance("DRBG");
+            } else {
+                sr = SecureRandom.getInstance(algo);
+            }
+            if (!sr.getAlgorithm().equals(isDRBG(algo) ? "DRBG" : algo)) {
+                throw new Exception("sr.getAlgorithm(): " + sr.getAlgorithm());
+            }
+
+            ba = sr.generateSeed(4096);
+            sr.nextBytes(ba);
+            sr.setSeed(ba);
+        } finally {
+            Security.setProperty("securerandom.source", secureRandomSource);
+            Security.setProperty(DRBG_CONFIG, DRBG_CONFIG_VALUE);
         }
-
-        /*
-         * Take out a large number of bytes in hopes of blocking.
-         * Don't expect this to happen, unless something is broken on Linux
-         */
-        sr = SecureRandom.getInstance("SHA1PRNG");
-        if (!sr.getAlgorithm().equals("SHA1PRNG")) {
-            throw new Exception("sr.getAlgorithm(): " + sr.getAlgorithm());
-        }
-
-        ba = sr.generateSeed(4096);
-        sr.nextBytes(ba);
-        sr.setSeed(ba);
     }
 
     private static void testNativePRNGImpls() throws Exception {
@@ -85,7 +110,7 @@ public class StrongSecureRandom {
             return;
         }
 
-        System.out.println("    Testing regular");
+        System.out.println("Testing regular");
         sr = SecureRandom.getInstance("NativePRNG");
         if (!sr.getAlgorithm().equals("NativePRNG")) {
             throw new Exception("sr.getAlgorithm(): " + sr.getAlgorithm());
@@ -94,7 +119,7 @@ public class StrongSecureRandom {
         sr.nextBytes(ba);
         sr.setSeed(ba);
 
-        System.out.println("    Testing NonBlocking");
+        System.out.println("Testing NonBlocking");
         sr = SecureRandom.getInstance("NativePRNGNonBlocking");
         if (!sr.getAlgorithm().equals("NativePRNGNonBlocking")) {
             throw new Exception("sr.getAlgorithm(): " + sr.getAlgorithm());
@@ -108,7 +133,7 @@ public class StrongSecureRandom {
             return;
         }
 
-        System.out.println("    Testing Blocking");
+        System.out.println("Testing Blocking");
         sr = SecureRandom.getInstance("NativePRNGBlocking");
         if (!sr.getAlgorithm().equals("NativePRNGBlocking")) {
             throw new Exception("sr.getAlgorithm(): " + sr.getAlgorithm());
@@ -141,9 +166,15 @@ public class StrongSecureRandom {
             throws Exception {
 
         System.out.println("Testing: '" + property + "' " + expected);
-
-        Security.setProperty("securerandom.strongAlgorithms", property);
-        testStrongInstance(expected);
+        final String origStrongAlgoProp
+                = Security.getProperty("securerandom.strongAlgorithms");
+        try {
+            Security.setProperty("securerandom.strongAlgorithms", property);
+            testStrongInstance(expected);
+        } finally {
+            Security.setProperty(
+                    "securerandom.strongAlgorithms", origStrongAlgoProp);
+        }
     }
 
     private static void testProperties() throws Exception {
@@ -228,7 +259,10 @@ public class StrongSecureRandom {
 
     public static void main(String args[]) throws Exception {
         testDefaultEgd();
-        testSHA1PRNGImpl();
+        for (String algo : new String[]{
+            "SHA1PRNG", "Hash_DRBG", "HMAC_DRBG", "CTR_DRBG"}) {
+            testSecureRandomImpl(algo, isDRBG(algo));
+        }
         testNativePRNGImpls();
         testAllImpls();
 
diff --git a/jdk/test/sun/security/provider/SeedGenerator/SeedGeneratorChoice.java b/jdk/test/sun/security/provider/SeedGenerator/SeedGeneratorChoice.java
index d91ce78db4b..e6da6be10a1 100644
--- a/jdk/test/sun/security/provider/SeedGenerator/SeedGeneratorChoice.java
+++ b/jdk/test/sun/security/provider/SeedGenerator/SeedGeneratorChoice.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2011, 2016, 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,7 +24,7 @@
 
 /*
  * @test
- * @bug 6998583
+ * @bug 6998583 8141039
  * @summary NativeSeedGenerator is making 8192 byte read requests from
  *             entropy pool on each init.
  * @run main SeedGeneratorChoice
@@ -39,14 +40,24 @@
  * We should always fall back to the ThreadedSeedGenerator if exceptions
  * are encountered with user defined source of entropy.
  */
-
 import java.security.SecureRandom;
+import java.security.Security;
 
 public class SeedGeneratorChoice {
 
     public static void main(String... arguments) throws Exception {
-        byte[] bytes;
-        SecureRandom prng = SecureRandom.getInstance("SHA1PRNG");
-        bytes = prng.generateSeed(1);
+        for (String mech : new String[]{"SHA1PRNG", "Hash_DRBG", "HMAC_DRBG",
+            "CTR_DRBG"}) {
+
+            SecureRandom prng = null;
+            if (!mech.contains("_DRBG")) {
+                prng = SecureRandom.getInstance(mech);
+            } else {
+                Security.setProperty("securerandom.drbg.config", mech);
+                prng = SecureRandom.getInstance("DRBG");
+            }
+            prng.generateSeed(1);
+        }
     }
+
 }

From 958506d2cbdbe84026189dd5e0b20aa41056e4ce Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Thu, 19 May 2016 13:08:36 +0100
Subject: [PATCH 147/228] 8157290:
 jdk/modules/scenarios/overlappingpackages/OverlappingPackagesTest.java
 failing

Reviewed-by: chegar
---
 .../overlappingpackages/OverlappingPackagesTest.java   | 10 ++--------
 .../src/misc/{sun => jdk/internal}/misc/Unsafe.java    |  2 +-
 .../overlappingpackages/src/misc/module-info.java      |  2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)
 rename jdk/test/jdk/modules/scenarios/overlappingpackages/src/misc/{sun => jdk/internal}/misc/Unsafe.java (97%)

diff --git a/jdk/test/jdk/modules/scenarios/overlappingpackages/OverlappingPackagesTest.java b/jdk/test/jdk/modules/scenarios/overlappingpackages/OverlappingPackagesTest.java
index 826e282326a..529996e8e7d 100644
--- a/jdk/test/jdk/modules/scenarios/overlappingpackages/OverlappingPackagesTest.java
+++ b/jdk/test/jdk/modules/scenarios/overlappingpackages/OverlappingPackagesTest.java
@@ -66,13 +66,7 @@ public class OverlappingPackagesTest {
         }
         Path srcMisc = SRC_DIR.resolve("misc");
         Path modsMisc = MODS_DIR.resolve("misc");
-        assertTrue(CompilerUtils.compile(srcMisc.resolve("sun")
-                                                .resolve("misc")
-                                                .resolve("Unsafe.java"),
-                                         modsMisc,
-                                         "-Xmodule:java.base"));
-        assertTrue(CompilerUtils.compile(srcMisc.resolve("module-info.java"),
-                                         modsMisc));
+        assertTrue(CompilerUtils.compile(srcMisc, modsMisc));
     }
 
     /**
@@ -92,7 +86,7 @@ public class OverlappingPackagesTest {
 
     /**
      * Run the test with "-addmods misc", the misc module has package
-     * sun.misc and so should overlap with the base module.
+     * jdk.internal.misc and so should overlap with the base module.
      */
     public void testOverlapWithBaseModule() throws Exception {
         int exitValue
diff --git a/jdk/test/jdk/modules/scenarios/overlappingpackages/src/misc/sun/misc/Unsafe.java b/jdk/test/jdk/modules/scenarios/overlappingpackages/src/misc/jdk/internal/misc/Unsafe.java
similarity index 97%
rename from jdk/test/jdk/modules/scenarios/overlappingpackages/src/misc/sun/misc/Unsafe.java
rename to jdk/test/jdk/modules/scenarios/overlappingpackages/src/misc/jdk/internal/misc/Unsafe.java
index 135652ea9b7..0b4aa917ccd 100644
--- a/jdk/test/jdk/modules/scenarios/overlappingpackages/src/misc/sun/misc/Unsafe.java
+++ b/jdk/test/jdk/modules/scenarios/overlappingpackages/src/misc/jdk/internal/misc/Unsafe.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package sun.misc;
+package jdk.internal.misc;
 
 public class Unsafe {
     private Unsafe() { }
diff --git a/jdk/test/jdk/modules/scenarios/overlappingpackages/src/misc/module-info.java b/jdk/test/jdk/modules/scenarios/overlappingpackages/src/misc/module-info.java
index 65cc15d749b..d4f3bd98b69 100644
--- a/jdk/test/jdk/modules/scenarios/overlappingpackages/src/misc/module-info.java
+++ b/jdk/test/jdk/modules/scenarios/overlappingpackages/src/misc/module-info.java
@@ -22,6 +22,6 @@
  */
 
 module misc {
-    exports sun.misc;
+    exports jdk.internal.misc;
 }
 

From bed9953556c8d5694a4fbbadb19ed52dc96c3022 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Thu, 19 May 2016 13:10:08 +0100
Subject: [PATCH 148/228] 8148834: Update module-info reader/writer to 53.0

Reviewed-by: sundar, chegar
---
 .../java.base/share/classes/java/lang/module/ModuleInfo.java    | 2 +-
 .../share/classes/jdk/internal/module/ModuleInfoWriter.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jdk/src/java.base/share/classes/java/lang/module/ModuleInfo.java b/jdk/src/java.base/share/classes/java/lang/module/ModuleInfo.java
index efc8c37b8a2..7bf9342ca88 100644
--- a/jdk/src/java.base/share/classes/java/lang/module/ModuleInfo.java
+++ b/jdk/src/java.base/share/classes/java/lang/module/ModuleInfo.java
@@ -154,7 +154,7 @@ final class ModuleInfo {
         int minor_version = in.readUnsignedShort();
         int major_version = in.readUnsignedShort();
         if (major_version < 53) {
-            // throw invalidModuleDescriptor"Must be >= 53.0");
+            throw invalidModuleDescriptor("Must be >= 53.0");
         }
 
         ConstantPool cpool = new ConstantPool(in);
diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoWriter.java b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoWriter.java
index 1fb433b9f7c..c86416e1dab 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoWriter.java
+++ b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoWriter.java
@@ -54,7 +54,7 @@ public final class ModuleInfoWriter {
         ClassWriter cw = new ClassWriter(0);
 
         String name = md.name().replace('.', '/') + "/module-info";
-        cw.visit(Opcodes.V1_8, ACC_MODULE, name, null, null, null);
+        cw.visit(Opcodes.V1_9, ACC_MODULE, name, null, null, null);
 
         cw.visitAttribute(new ModuleAttribute(md));
         cw.visitAttribute(new ConcealedPackagesAttribute(md.conceals()));

From 0516c0ca0cc1ceb0fa39e2cd6323888d7de1357e Mon Sep 17 00:00:00 2001
From: Aleksei Efimov <aefimov@openjdk.org>
Date: Thu, 19 May 2016 15:58:44 +0300
Subject: [PATCH 149/228] 8157096: [TEST_BUG]
 test/javax/xml/bind/xjc/8145039/JaxbMarshallTest.java is skipped by jtreg

Reviewed-by: shade, joehw
---
 jdk/test/javax/xml/bind/xjc/8145039/JaxbMarshallTest.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/jdk/test/javax/xml/bind/xjc/8145039/JaxbMarshallTest.java b/jdk/test/javax/xml/bind/xjc/8145039/JaxbMarshallTest.java
index 37b817d0b4d..cc1be256343 100644
--- a/jdk/test/javax/xml/bind/xjc/8145039/JaxbMarshallTest.java
+++ b/jdk/test/javax/xml/bind/xjc/8145039/JaxbMarshallTest.java
@@ -23,10 +23,10 @@
 
 /*
  * @test
- * @bug 8145039
+ * @bug 8145039 8157096
  * @summary Check that marshalling of xjc generated class doesn't throw
  *          ClassCast exception.
- * @modules javax.xml.bind
+ * @modules java.xml.bind
  * @library /lib/testlibrary
  * @run testng/othervm JaxbMarshallTest
  */
@@ -127,6 +127,8 @@ public class JaxbMarshallTest {
     // Compile java classes with javac tool
     void compileXjcGeneratedClasses() throws Exception {
         JDKToolLauncher javacLauncher = JDKToolLauncher.createUsingTestJDK("javac");
+        javacLauncher.addToolArg("-addmods");
+        javacLauncher.addToolArg("java.xml.bind");
         javacLauncher.addToolArg(xjcResultDir.resolve("ObjectFactory.java").toString());
         javacLauncher.addToolArg(xjcResultDir.resolve("TypesLongList.java").toString());
         javacLauncher.addToolArg(xjcResultDir.resolve("package-info.java").toString());

From 4417a1f36fb6448366dc3231175df874f354fee6 Mon Sep 17 00:00:00 2001
From: Aleksei Efimov <aefimov@openjdk.org>
Date: Thu, 19 May 2016 16:08:39 +0300
Subject: [PATCH 150/228] 8072579: XjcOptionalPropertyTest.java creates files
 in test.src

Reviewed-by: joehw
---
 .../xjc/8032884/XjcOptionalPropertyTest.java  | 104 ++++++++++++++----
 .../xml/bind/xjc/8032884/compile-schema.sh    |  39 -------
 2 files changed, 82 insertions(+), 61 deletions(-)
 delete mode 100644 jdk/test/javax/xml/bind/xjc/8032884/compile-schema.sh

diff --git a/jdk/test/javax/xml/bind/xjc/8032884/XjcOptionalPropertyTest.java b/jdk/test/javax/xml/bind/xjc/8032884/XjcOptionalPropertyTest.java
index 4a556efce13..9cc57cfcdae 100644
--- a/jdk/test/javax/xml/bind/xjc/8032884/XjcOptionalPropertyTest.java
+++ b/jdk/test/javax/xml/bind/xjc/8032884/XjcOptionalPropertyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,47 +23,107 @@
 
 /*
  * @test
- * @bug 8032884
+ * @bug 8032884 8072579
  * @summary Globalbindings optionalProperty="primitive" does not work when minOccurs=0
- * @run shell compile-schema.sh
- * @compile -addmods java.xml.bind XjcOptionalPropertyTest.java
- * @run main/othervm XjcOptionalPropertyTest
+ * @library /lib/testlibrary
+ * @modules java.xml.bind
+ * @run testng/othervm XjcOptionalPropertyTest
  */
 
 import java.io.IOException;
 import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+import java.util.Arrays;
+import jdk.testlibrary.JDKToolLauncher;
+import org.testng.Assert;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
 
 public class XjcOptionalPropertyTest {
 
-    public static void main(String[] args) throws IOException {
-
-        generated.Foo foo = new generated.Foo();
-        log("foo = " + foo);
+    @Test
+    public void optionalPropertyTest() throws Exception {
+        runXjc();
+        compileXjcGeneratedClasses();
+        URLClassLoader testClassLoader;
+        testClassLoader = URLClassLoader.newInstance(new URL[]{testWorkDirUrl});
+        Class fooClass = testClassLoader.loadClass(CLASS_TO_TEST);
+        Object foo = fooClass.newInstance();
         Method[] methods = foo.getClass().getMethods();
-        log("Found [" + methods.length + "] methods");
+        System.out.println("Found [" + methods.length + "] methods");
         for (int i = 0; i < methods.length; i++) {
             Method method = methods[i];
             if (method.getName().equals("setFoo")) {
-                log("Checking method [" + method.getName() + "]");
+                System.out.println("Checking method [" + method.getName() + "]");
                 Class[] parameterTypes = method.getParameterTypes();
-                if (parameterTypes.length != 1)
-                    fail("more than 1 parameter");
-                if (!parameterTypes[0].isPrimitive()) {
-                    fail("Found [" + parameterTypes[0].getName() + "], but expected primitive!");
-                }
+                Assert.assertEquals(parameterTypes.length, 1);
+                Assert.assertTrue(parameterTypes[0].isPrimitive());
                 break;
             }
         }
-        log("TEST PASSED.");
-
     }
 
-    private static void fail(String message) {
-        throw new RuntimeException(message);
+    @BeforeTest
+    public void setUp() throws IOException {
+        // Create test directory inside scratch
+        testWorkDir = Paths.get(System.getProperty("user.dir", "."));
+        // Save its URL
+        testWorkDirUrl = testWorkDir.toUri().toURL();
+        // Get test source directory path
+        testSrcDir = Paths.get(System.getProperty("test.src", "."));
+        // Get path of xjc result folder
+        xjcResultDir = testWorkDir.resolve(TEST_PACKAGE);
+        // Copy schema document file to scratch directory
+        Files.copy(testSrcDir.resolve(XSD_FILENAME), testWorkDir.resolve(XSD_FILENAME), REPLACE_EXISTING);
     }
 
-    private static void log(String msg) {
-        System.out.println(msg);
+    // Compile schema file into java classes definitions
+    void runXjc() throws Exception {
+        // Prepare process builder to run schemagen tool and save its output
+        JDKToolLauncher xjcLauncher = JDKToolLauncher.createUsingTestJDK("xjc");
+        xjcLauncher.addToolArg(XSD_FILENAME);
+        System.out.println("Executing xjc command: " + Arrays.asList(xjcLauncher.getCommand()));
+        ProcessBuilder pb = new ProcessBuilder(xjcLauncher.getCommand());
+        // Set xjc work directory with the input java file
+        pb.directory(testWorkDir.toFile());
+        pb.inheritIO();
+        Process p = pb.start();
+        p.waitFor();
+        p.destroy();
     }
 
+    // Compile java classes with javac tool
+    void compileXjcGeneratedClasses() throws Exception {
+        JDKToolLauncher javacLauncher = JDKToolLauncher.createUsingTestJDK("javac");
+        javacLauncher.addToolArg("-addmods");
+        javacLauncher.addToolArg("java.xml.bind");
+        javacLauncher.addToolArg(xjcResultDir.resolve("Foo.java").toString());
+        System.out.println("Compiling xjc generated class: " + Arrays.asList(javacLauncher.getCommand()));
+        ProcessBuilder pb = new ProcessBuilder(javacLauncher.getCommand());
+        pb.inheritIO();
+        pb.directory(testWorkDir.toFile());
+        Process p = pb.start();
+        p.waitFor();
+        p.destroy();
+    }
+
+    // Test schema filename
+    static final String XSD_FILENAME = "optional-property-schema.xsd";
+    // Test package with generated class
+    static final String TEST_PACKAGE = "anamespace";
+    // Name of generated java class
+    static final String CLASS_TO_TEST = TEST_PACKAGE+".Foo";
+    // Test working directory
+    Path testWorkDir;
+    // Test working directory URL
+    URL testWorkDirUrl;
+    // Directory with test src
+    Path testSrcDir;
+    // Directory with java files generated by xjc
+    Path xjcResultDir;
 }
diff --git a/jdk/test/javax/xml/bind/xjc/8032884/compile-schema.sh b/jdk/test/javax/xml/bind/xjc/8032884/compile-schema.sh
deleted file mode 100644
index 8051abf438a..00000000000
--- a/jdk/test/javax/xml/bind/xjc/8032884/compile-schema.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2014, 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.
-#
-
-#
-
-if [ "x$TESTJAVA" = x ]; then
-  TESTJAVA=$1; shift
-  TESTCLASSES=.
-fi
-
-echo "cleaning generated files ..."
-rm -rfv ${TESTSRC}/generated
-
-echo "compiling [optional-property-schema.xsd] schema ..."
-$TESTJAVA/bin/xjc -p generated -d ${TESTSRC} ${TESTSRC}/optional-property-schema.xsd
-
-echo "Schema compiled. Verification of generated files can be done now."

From 55889705b0a971e57a45290f691cce2b1569953f Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Thu, 19 May 2016 16:59:31 +0300
Subject: [PATCH 151/228] 8148604: JEP 280, Switch to more optimal
 concatenation strategy

Reviewed-by: psandoz, redestad
---
 .../share/classes/java/lang/invoke/StringConcatFactory.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java b/jdk/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
index 0d965ed5a54..7da455097b8 100644
--- a/jdk/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
@@ -128,7 +128,7 @@ public final class StringConcatFactory {
     /**
      * Default strategy to use for concatenation.
      */
-    private static final Strategy DEFAULT_STRATEGY = Strategy.BC_SB;
+    private static final Strategy DEFAULT_STRATEGY = Strategy.MH_INLINE_SIZED_EXACT;
 
     private enum Strategy {
         /**

From 4b1159ce768d7a1ee3a768bf7c7c4abba270f108 Mon Sep 17 00:00:00 2001
From: Paul Sandoz <psandoz@openjdk.org>
Date: Thu, 19 May 2016 16:08:40 +0200
Subject: [PATCH 152/228] 8157239: java/lang/invoke/VarHandles/ tests fail by
 timeout with -Xcomp with lambda form linkage

Reviewed-by: vlivanov
---
 .../java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java  | 1 -
 .../java/lang/invoke/VarHandles/VarHandleTestAccessByte.java     | 1 -
 .../java/lang/invoke/VarHandles/VarHandleTestAccessChar.java     | 1 -
 .../java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java   | 1 -
 .../java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java    | 1 -
 jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java | 1 -
 .../java/lang/invoke/VarHandles/VarHandleTestAccessLong.java     | 1 -
 .../java/lang/invoke/VarHandles/VarHandleTestAccessShort.java    | 1 -
 .../java/lang/invoke/VarHandles/VarHandleTestAccessString.java   | 1 -
 .../lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java     | 1 -
 .../lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java   | 1 -
 .../lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java    | 1 -
 .../java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java | 1 -
 .../lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java     | 1 -
 .../lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java    | 1 -
 .../VarHandles/VarHandleTestMethodHandleAccessBoolean.java       | 1 -
 .../invoke/VarHandles/VarHandleTestMethodHandleAccessByte.java   | 1 -
 .../invoke/VarHandles/VarHandleTestMethodHandleAccessChar.java   | 1 -
 .../invoke/VarHandles/VarHandleTestMethodHandleAccessDouble.java | 1 -
 .../invoke/VarHandles/VarHandleTestMethodHandleAccessFloat.java  | 1 -
 .../invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java    | 1 -
 .../invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java   | 1 -
 .../invoke/VarHandles/VarHandleTestMethodHandleAccessShort.java  | 1 -
 .../invoke/VarHandles/VarHandleTestMethodHandleAccessString.java | 1 -
 .../lang/invoke/VarHandles/X-VarHandleTestAccess.java.template   | 1 -
 .../invoke/VarHandles/X-VarHandleTestByteArrayView.java.template | 1 -
 .../VarHandles/X-VarHandleTestMethodHandleAccess.java.template   | 1 -
 27 files changed, 27 deletions(-)

diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java
index 06d2a65b1dd..9a02753d945 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java
@@ -27,7 +27,6 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestAccessBoolean
  * @run testng/othervm -Diters=20000                         VarHandleTestAccessBoolean
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestAccessBoolean
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestAccessBoolean
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java
index 2ba0afbef2d..17544907e8d 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java
@@ -27,7 +27,6 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestAccessByte
  * @run testng/othervm -Diters=20000                         VarHandleTestAccessByte
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestAccessByte
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestAccessByte
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java
index bcc42a3c335..88bad8475cb 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java
@@ -27,7 +27,6 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestAccessChar
  * @run testng/othervm -Diters=20000                         VarHandleTestAccessChar
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestAccessChar
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestAccessChar
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java
index 74f0765f709..1861e5919dc 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java
@@ -27,7 +27,6 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestAccessDouble
  * @run testng/othervm -Diters=20000                         VarHandleTestAccessDouble
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestAccessDouble
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestAccessDouble
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java
index 241e0897414..dce87f72755 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java
@@ -27,7 +27,6 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestAccessFloat
  * @run testng/othervm -Diters=20000                         VarHandleTestAccessFloat
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestAccessFloat
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestAccessFloat
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java
index 3adb9b83fa7..1897821dc06 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java
@@ -27,7 +27,6 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestAccessInt
  * @run testng/othervm -Diters=20000                         VarHandleTestAccessInt
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestAccessInt
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestAccessInt
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java
index 9afb2de8320..adea5ed82a1 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java
@@ -27,7 +27,6 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestAccessLong
  * @run testng/othervm -Diters=20000                         VarHandleTestAccessLong
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestAccessLong
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestAccessLong
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java
index a64ed990cb9..a8091a838cb 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java
@@ -27,7 +27,6 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestAccessShort
  * @run testng/othervm -Diters=20000                         VarHandleTestAccessShort
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestAccessShort
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestAccessShort
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessString.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessString.java
index 74f08bda535..405206ef22c 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessString.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestAccessString.java
@@ -27,7 +27,6 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestAccessString
  * @run testng/othervm -Diters=20000                         VarHandleTestAccessString
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestAccessString
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestAccessString
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java
index a2221b50a20..8038315e391 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java
@@ -27,7 +27,6 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAsChar
  * @run testng/othervm -Diters=20000                         VarHandleTestByteArrayAsChar
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestByteArrayAsChar
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestByteArrayAsChar
  */
 
 import org.testng.annotations.DataProvider;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java
index 79305710ce2..53db9cd239b 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java
@@ -27,7 +27,6 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAsDouble
  * @run testng/othervm -Diters=20000                         VarHandleTestByteArrayAsDouble
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestByteArrayAsDouble
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestByteArrayAsDouble
  */
 
 import org.testng.annotations.DataProvider;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java
index b3545b4f69c..d2688cf925a 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java
@@ -27,7 +27,6 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAsFloat
  * @run testng/othervm -Diters=20000                         VarHandleTestByteArrayAsFloat
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestByteArrayAsFloat
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestByteArrayAsFloat
  */
 
 import org.testng.annotations.DataProvider;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java
index b733bb34054..9e47532c20b 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java
@@ -27,7 +27,6 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAsInt
  * @run testng/othervm -Diters=20000                         VarHandleTestByteArrayAsInt
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestByteArrayAsInt
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestByteArrayAsInt
  */
 
 import org.testng.annotations.DataProvider;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java
index 88bf198272b..f9ed92f0e07 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java
@@ -27,7 +27,6 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAsLong
  * @run testng/othervm -Diters=20000                         VarHandleTestByteArrayAsLong
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestByteArrayAsLong
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestByteArrayAsLong
  */
 
 import org.testng.annotations.DataProvider;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java
index 5ed9d6099f7..0a9aa6e871c 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java
@@ -27,7 +27,6 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAsShort
  * @run testng/othervm -Diters=20000                         VarHandleTestByteArrayAsShort
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestByteArrayAsShort
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestByteArrayAsShort
  */
 
 import org.testng.annotations.DataProvider;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessBoolean.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessBoolean.java
index f43fcc1b82c..32761fe0e3f 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessBoolean.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessBoolean.java
@@ -24,7 +24,6 @@
 /*
  * @test
  * @run testng/othervm -Diters=20000 VarHandleTestMethodHandleAccessBoolean
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodHandleAccessBoolean
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessByte.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessByte.java
index 3d5c27e8bfd..8c36eb861c5 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessByte.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessByte.java
@@ -24,7 +24,6 @@
 /*
  * @test
  * @run testng/othervm -Diters=20000 VarHandleTestMethodHandleAccessByte
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodHandleAccessByte
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessChar.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessChar.java
index bde76a69c05..fb1f3877342 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessChar.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessChar.java
@@ -24,7 +24,6 @@
 /*
  * @test
  * @run testng/othervm -Diters=20000 VarHandleTestMethodHandleAccessChar
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodHandleAccessChar
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessDouble.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessDouble.java
index de683ce6997..cd2c15d04d3 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessDouble.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessDouble.java
@@ -24,7 +24,6 @@
 /*
  * @test
  * @run testng/othervm -Diters=20000 VarHandleTestMethodHandleAccessDouble
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodHandleAccessDouble
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessFloat.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessFloat.java
index 99309e5081f..58d9e295298 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessFloat.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessFloat.java
@@ -24,7 +24,6 @@
 /*
  * @test
  * @run testng/othervm -Diters=20000 VarHandleTestMethodHandleAccessFloat
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodHandleAccessFloat
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java
index fc0e8f214f9..00f78a57159 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java
@@ -24,7 +24,6 @@
 /*
  * @test
  * @run testng/othervm -Diters=20000 VarHandleTestMethodHandleAccessInt
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodHandleAccessInt
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java
index 0f265da3f2e..2bb8b9a1ee8 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java
@@ -24,7 +24,6 @@
 /*
  * @test
  * @run testng/othervm -Diters=20000 VarHandleTestMethodHandleAccessLong
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodHandleAccessLong
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessShort.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessShort.java
index 51b51e73747..6edc9b19b68 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessShort.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessShort.java
@@ -24,7 +24,6 @@
 /*
  * @test
  * @run testng/othervm -Diters=20000 VarHandleTestMethodHandleAccessShort
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodHandleAccessShort
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java
index ce5167a0b91..dc6f8ec1861 100644
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java
@@ -24,7 +24,6 @@
 /*
  * @test
  * @run testng/othervm -Diters=20000 VarHandleTestMethodHandleAccessString
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodHandleAccessString
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template b/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template
index cb33f8ff070..5dfd82f6cd7 100644
--- a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template
+++ b/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template
@@ -27,7 +27,6 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestAccess$Type$
  * @run testng/othervm -Diters=20000                         VarHandleTestAccess$Type$
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestAccess$Type$
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestAccess$Type$
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template b/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template
index 1cb19b7893e..615bb528e06 100644
--- a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template
+++ b/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template
@@ -27,7 +27,6 @@
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAs$Type$
  * @run testng/othervm -Diters=20000                         VarHandleTestByteArrayAs$Type$
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestByteArrayAs$Type$
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestByteArrayAs$Type$
  */
 
 import org.testng.annotations.DataProvider;
diff --git a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template b/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template
index f943bf2611b..e4bd78e8f45 100644
--- a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template
+++ b/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template
@@ -24,7 +24,6 @@
 /*
  * @test
  * @run testng/othervm -Diters=20000 VarHandleTestMethodHandleAccess$Type$
- * @run testng/othervm -Diters=20000 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false VarHandleTestMethodHandleAccess$Type$
  */
 
 import org.testng.annotations.BeforeClass;

From 5648deddee2ddd7a1df4e2307e066a2a9d4daf71 Mon Sep 17 00:00:00 2001
From: Joseph Provino <jprovino@openjdk.org>
Date: Thu, 19 May 2016 10:48:28 -0400
Subject: [PATCH 153/228] 8153582: Logging of ConcGCThreads is done too early

ConcGCThreads is logged as 0 because it hasn't been initialized yet.

Reviewed-by: tschatzl, dfazunen
---
 hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp | 2 ++
 hotspot/src/share/vm/gc/g1/g1ConcurrentMark.cpp               | 2 ++
 hotspot/src/share/vm/runtime/arguments.cpp                    | 2 --
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp b/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp
index af5e47dc2d7..d5553e032df 100644
--- a/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp
+++ b/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp
@@ -545,6 +545,8 @@ CMSCollector::CMSCollector(ConcurrentMarkSweepGeneration* cmsGen,
   }
   assert((_conc_workers != NULL) == (ConcGCThreads > 1),
          "Inconsistency");
+  log_debug(gc)("ConcGCThreads: %u", ConcGCThreads);
+  log_debug(gc)("ParallelGCThreads: %u", ParallelGCThreads);
 
   // Parallel task queues; these are shared for the
   // concurrent and stop-world phases of CMS, but
diff --git a/hotspot/src/share/vm/gc/g1/g1ConcurrentMark.cpp b/hotspot/src/share/vm/gc/g1/g1ConcurrentMark.cpp
index a409304b8cf..e61175a4205 100644
--- a/hotspot/src/share/vm/gc/g1/g1ConcurrentMark.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1ConcurrentMark.cpp
@@ -438,6 +438,8 @@ G1ConcurrentMark::G1ConcurrentMark(G1CollectedHeap* g1h, G1RegionToSpaceMapper*
   }
 
   assert(ConcGCThreads > 0, "Should have been set");
+  log_debug(gc)("ConcGCThreads: %u", ConcGCThreads);
+  log_debug(gc)("ParallelGCThreads: %u", ParallelGCThreads);
   _parallel_marking_threads = ConcGCThreads;
   _max_parallel_marking_threads = _parallel_marking_threads;
 
diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp
index 9395a5ccc49..4b29b2830ca 100644
--- a/hotspot/src/share/vm/runtime/arguments.cpp
+++ b/hotspot/src/share/vm/runtime/arguments.cpp
@@ -1641,7 +1641,6 @@ void Arguments::set_cms_and_parnew_gc_flags() {
   }
 
   log_trace(gc)("MarkStackSize: %uk  MarkStackSizeMax: %uk", (unsigned int) (MarkStackSize / K), (uint) (MarkStackSizeMax / K));
-  log_trace(gc)("ConcGCThreads: %u", ConcGCThreads);
 }
 #endif // INCLUDE_ALL_GCS
 
@@ -1949,7 +1948,6 @@ void Arguments::set_g1_gc_flags() {
   }
 
   log_trace(gc)("MarkStackSize: %uk  MarkStackSizeMax: %uk", (unsigned int) (MarkStackSize / K), (uint) (MarkStackSizeMax / K));
-  log_trace(gc)("ConcGCThreads: %u", ConcGCThreads);
 }
 
 void Arguments::set_gc_specific_flags() {

From 2100b2e6c212c4abe078484b0f7bb78a09e255b1 Mon Sep 17 00:00:00 2001
From: Artem Smotrakov <asmotrak@openjdk.org>
Date: Thu, 19 May 2016 09:16:59 -0700
Subject: [PATCH 154/228] 8134267: javax/net/ssl/TLS/TestJSSE.java fails
 intermittently with BindException: Address already in use

Reviewed-by: chegar
---
 .../javax/net/ssl/TLS/CipherTestUtils.java    | 52 +++++++++++++------
 jdk/test/javax/net/ssl/TLS/JSSEServer.java    |  6 ++-
 jdk/test/javax/net/ssl/TLS/TestJSSE.java      | 35 ++++++-------
 3 files changed, 56 insertions(+), 37 deletions(-)

diff --git a/jdk/test/javax/net/ssl/TLS/CipherTestUtils.java b/jdk/test/javax/net/ssl/TLS/CipherTestUtils.java
index a86b10abd26..04020bc6f03 100644
--- a/jdk/test/javax/net/ssl/TLS/CipherTestUtils.java
+++ b/jdk/test/javax/net/ssl/TLS/CipherTestUtils.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
@@ -202,6 +202,8 @@ public class CipherTestUtils {
         @Override
         public abstract void run();
 
+        abstract int getPort();
+
         void handleRequest(InputStream in, OutputStream out)
                 throws IOException {
             boolean newline = false;
@@ -528,9 +530,9 @@ public class CipherTestUtils {
         return ks;
     }
 
-    public static void main(PeerFactory peerFactory, String mode,
-            String expectedException)
-            throws Exception {
+    public static int mainServer(PeerFactory peerFactory,
+            String expectedException) throws Exception {
+
         long time = System.currentTimeMillis();
         setTestedArguments(peerFactory.getTestedProtocol(),
                 peerFactory.getTestedCipher());
@@ -540,33 +542,49 @@ public class CipherTestUtils {
         secureRandom.nextInt();
 
         CipherTestUtils cipherTest = CipherTestUtils.getInstance();
-        if (mode.equalsIgnoreCase("Server")) {  // server mode
-            Thread serverThread = new Thread(peerFactory.newServer(cipherTest),
-                    "Server");
-            serverThread.start();
-        } else if (mode.equalsIgnoreCase("Client")) {
-            peerFactory.newClient(cipherTest).run();
-            cipherTest.checkResult(expectedException);
-            JSSEServer.closeServer = true;
-        } else {
-            throw new RuntimeException("unsupported mode");
-        }
+        Server server = peerFactory.newServer(cipherTest, PeerFactory.FREE_PORT);
+        Thread serverThread = new Thread(server, "Server");
+        serverThread.start();
+
         time = System.currentTimeMillis() - time;
         System.out.println("Elapsed time " + time);
 
+        return server.getPort();
+    }
+
+    public static void mainClient(PeerFactory peerFactory, int port,
+            String expectedException) throws Exception {
+
+        long time = System.currentTimeMillis();
+        setTestedArguments(peerFactory.getTestedProtocol(),
+                peerFactory.getTestedCipher());
+
+        System.out.print(
+                " Initializing test '" + peerFactory.getName() + "'...");
+        secureRandom.nextInt();
+
+        CipherTestUtils cipherTest = CipherTestUtils.getInstance();
+        peerFactory.newClient(cipherTest, port).run();
+        cipherTest.checkResult(expectedException);
+        JSSEServer.closeServer = true;
+
+        time = System.currentTimeMillis() - time;
+        System.out.println("Elapsed time " + time);
     }
 
     public static abstract class PeerFactory {
 
+        public static final int FREE_PORT = 0;
+
         abstract String getName();
 
         abstract String getTestedProtocol();
 
         abstract String getTestedCipher();
 
-        abstract Client newClient(CipherTestUtils cipherTest) throws Exception;
+        abstract Client newClient(CipherTestUtils cipherTest, int testPort) throws Exception;
 
-        abstract Server newServer(CipherTestUtils cipherTest) throws Exception;
+        abstract Server newServer(CipherTestUtils cipherTest, int testPort) throws Exception;
 
         boolean isSupported(String cipherSuite) {
             return true;
diff --git a/jdk/test/javax/net/ssl/TLS/JSSEServer.java b/jdk/test/javax/net/ssl/TLS/JSSEServer.java
index f6e55a31706..1ece6f0f8b8 100644
--- a/jdk/test/javax/net/ssl/TLS/JSSEServer.java
+++ b/jdk/test/javax/net/ssl/TLS/JSSEServer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
@@ -77,4 +77,8 @@ public class JSSEServer extends CipherTestUtils.Server {
             }
         }
     }
+
+    int getPort() {
+        return serverSocket.getLocalPort();
+    }
 }
diff --git a/jdk/test/javax/net/ssl/TLS/TestJSSE.java b/jdk/test/javax/net/ssl/TLS/TestJSSE.java
index d4c41480c0b..d477e4facdf 100644
--- a/jdk/test/javax/net/ssl/TLS/TestJSSE.java
+++ b/jdk/test/javax/net/ssl/TLS/TestJSSE.java
@@ -27,10 +27,8 @@ import java.security.Security;
 /**
  * @test
  * @bug 8049429
- * @library ../../../../lib/testlibrary/
  * @modules java.management
  *          jdk.crypto.ec/sun.security.ec
- * @build jdk.testlibrary.Utils
  * @compile CipherTestUtils.java JSSEClient.java JSSEServer.java
  * @summary Test that all cipher suites work in all versions and all client
  * authentication types. The way this is setup the server is stateless and
@@ -86,7 +84,6 @@ public class TestJSSE {
 
         String serverProtocol = System.getProperty("SERVER_PROTOCOL");
         String clientProtocol = System.getProperty("CLIENT_PROTOCOL");
-        int port = jdk.testlibrary.Utils.getFreePort();
         String cipher = System.getProperty("CIPHER");
         if (serverProtocol == null
                 || clientProtocol == null
@@ -97,7 +94,7 @@ public class TestJSSE {
         out.println("ServerProtocol =" + serverProtocol);
         out.println("ClientProtocol =" + clientProtocol);
         out.println("Cipher         =" + cipher);
-        server(serverProtocol, cipher, port, args);
+        int port = server(serverProtocol, cipher, args);
         client(port, clientProtocol, cipher, args);
 
     }
@@ -112,28 +109,30 @@ public class TestJSSE {
         out.println(" Testing - Protocol : " + testProtocols);
         out.println(" Testing - Cipher : " + testCipher);
         try {
-            CipherTestUtils.main(new JSSEFactory(LOCAL_IP,
-                    testPort, testProtocols,
-                    testCipher, "client JSSE"),
-                    "client", expectedException);
+            CipherTestUtils.mainClient(new JSSEFactory(LOCAL_IP, testProtocols,
+                        testCipher, "Client JSSE"),
+                    testPort, expectedException);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
     }
 
-    public static void server(String testProtocol, String testCipher,
-            int testPort,
+    public static int server(String testProtocol, String testCipher,
             String... exception) throws Exception {
+
         String expectedException = exception.length >= 1
                 ? exception[0] : null;
         out.println(" This is Server");
         out.println(" Testing Protocol: " + testProtocol);
         out.println(" Testing Cipher: " + testCipher);
-        out.println(" Testing Port: " + testPort);
+
         try {
-            CipherTestUtils.main(new JSSEFactory(null, testPort,
-                    testProtocol, testCipher, "Server JSSE"),
-                    "Server", expectedException);
+            int port = CipherTestUtils.mainServer(new JSSEFactory(
+                        null, testProtocol, testCipher, "Server JSSE"),
+                    expectedException);
+
+            out.println(" Testing Port: " + port);
+            return port;
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -142,15 +141,13 @@ public class TestJSSE {
     private static class JSSEFactory extends CipherTestUtils.PeerFactory {
 
         final String testedCipherSuite, testedProtocol, testHost;
-        final int testPort;
         final String name;
 
-        JSSEFactory(String testHost, int testPort, String testedProtocol,
+        JSSEFactory(String testHost, String testedProtocol,
                 String testedCipherSuite, String name) {
             this.testedCipherSuite = testedCipherSuite;
             this.testedProtocol = testedProtocol;
             this.testHost = testHost;
-            this.testPort = testPort;
             this.name = name;
         }
 
@@ -170,14 +167,14 @@ public class TestJSSE {
         }
 
         @Override
-        CipherTestUtils.Client newClient(CipherTestUtils cipherTest)
+        CipherTestUtils.Client newClient(CipherTestUtils cipherTest, int testPort)
                 throws Exception {
             return new JSSEClient(cipherTest, testHost, testPort,
                     testedProtocol, testedCipherSuite);
         }
 
         @Override
-        CipherTestUtils.Server newServer(CipherTestUtils cipherTest)
+        CipherTestUtils.Server newServer(CipherTestUtils cipherTest, int testPort)
                 throws Exception {
             return new JSSEServer(cipherTest, testPort,
                     testedProtocol, testedCipherSuite);

From 16c12980fa42611662992f7591b23082b8812803 Mon Sep 17 00:00:00 2001
From: Lana Steuck <lana@openjdk.org>
Date: Thu, 19 May 2016 17:48:02 +0000
Subject: [PATCH 155/228] Added tag jdk-9+119 for changeset 3cc95b690353

---
 jdk/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jdk/.hgtags b/jdk/.hgtags
index 2b6d80debed..b7e36c324d5 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -361,3 +361,4 @@ bb8379287f3736f38c52b2d1418784e2592461d1 jdk-9+114
 baeb5edb38939cdb78ae0ac6f4fd368465cbf188 jdk-9+116
 4da0f73ce03aaf245b92cc040cc0ab0e3fa54dc2 jdk-9+117
 e1eba5cfa5cc8c66d524396a05323dc93568730a jdk-9+118
+bad3f8a33db271a6143ba6eac0c8bd5bbd942417 jdk-9+119

From ab6efe7a7d33414a96aabc519487a687ffe4a54c Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Thu, 19 May 2016 11:17:35 -0700
Subject: [PATCH 156/228] 8157068: ExceptionInInitializerError if images build
 patched to use exploded version of jdk.internal.module.SystemModules

Reviewed-by: alanb
---
 .../java/lang/module/SystemModuleFinder.java  | 157 ++++++++----
 .../jdk/internal/jimage/ImageReader.java      |  11 +
 .../jdk/internal/module/SystemModules.java    |   6 +-
 .../modules/patch/{ => basic}/PatchTest.java  |   0
 .../{ => basic}/src/test/jdk/test/Main.java   |   0
 .../{ => basic}/src/test/module-info.java     |   0
 .../src1/java.base/java/text/Annotation.java  |   0
 .../java.base/java/text/AnnotationBuddy.java  |   0
 .../com/sun/tools/javac/Main.java             |   0
 .../com/sun/tools/javac/MainBuddy.java        |   0
 .../com/sun/jndi/dns/DnsClient.java           |   0
 .../com/sun/jndi/dns/DnsClientBuddy.java      |   0
 .../src2/java.base/java/lang2/Object.java     |   0
 .../com/sun/tools/javac2/Main.java            |   0
 .../com/sun/jndi/dns2/Zone.java               |   0
 .../systemmodules/PatchSystemModules.java     | 225 ++++++++++++++++++
 .../systemmodules/src/m1/module-info.java     |  26 ++
 .../patch/systemmodules/src/m1/p1/Main.java   |  34 +++
 .../systemmodules/src/m2/module-info.java     |  26 ++
 .../patch/systemmodules/src/m2/p2/Lib.java    |  30 +++
 .../jdk/internal/modules/SystemModules.java   |  32 +++
 .../patch/systemmodules/src1/m2/p2/Lib.java   |  30 +++
 22 files changed, 528 insertions(+), 49 deletions(-)
 rename jdk/test/tools/launcher/modules/patch/{ => basic}/PatchTest.java (100%)
 rename jdk/test/tools/launcher/modules/patch/{ => basic}/src/test/jdk/test/Main.java (100%)
 rename jdk/test/tools/launcher/modules/patch/{ => basic}/src/test/module-info.java (100%)
 rename jdk/test/tools/launcher/modules/patch/{ => basic}/src1/java.base/java/text/Annotation.java (100%)
 rename jdk/test/tools/launcher/modules/patch/{ => basic}/src1/java.base/java/text/AnnotationBuddy.java (100%)
 rename jdk/test/tools/launcher/modules/patch/{ => basic}/src1/jdk.compiler/com/sun/tools/javac/Main.java (100%)
 rename jdk/test/tools/launcher/modules/patch/{ => basic}/src1/jdk.compiler/com/sun/tools/javac/MainBuddy.java (100%)
 rename jdk/test/tools/launcher/modules/patch/{ => basic}/src1/jdk.naming.dns/com/sun/jndi/dns/DnsClient.java (100%)
 rename jdk/test/tools/launcher/modules/patch/{ => basic}/src1/jdk.naming.dns/com/sun/jndi/dns/DnsClientBuddy.java (100%)
 rename jdk/test/tools/launcher/modules/patch/{ => basic}/src2/java.base/java/lang2/Object.java (100%)
 rename jdk/test/tools/launcher/modules/patch/{ => basic}/src2/jdk.compiler/com/sun/tools/javac2/Main.java (100%)
 rename jdk/test/tools/launcher/modules/patch/{ => basic}/src2/jdk.naming.dns/com/sun/jndi/dns2/Zone.java (100%)
 create mode 100644 jdk/test/tools/launcher/modules/patch/systemmodules/PatchSystemModules.java
 create mode 100644 jdk/test/tools/launcher/modules/patch/systemmodules/src/m1/module-info.java
 create mode 100644 jdk/test/tools/launcher/modules/patch/systemmodules/src/m1/p1/Main.java
 create mode 100644 jdk/test/tools/launcher/modules/patch/systemmodules/src/m2/module-info.java
 create mode 100644 jdk/test/tools/launcher/modules/patch/systemmodules/src/m2/p2/Lib.java
 create mode 100644 jdk/test/tools/launcher/modules/patch/systemmodules/src1/java.base/jdk/internal/modules/SystemModules.java
 create mode 100644 jdk/test/tools/launcher/modules/patch/systemmodules/src1/m2/p2/Lib.java

diff --git a/jdk/src/java.base/share/classes/java/lang/module/SystemModuleFinder.java b/jdk/src/java.base/share/classes/java/lang/module/SystemModuleFinder.java
index d14ee8d60e4..77d5392821a 100644
--- a/jdk/src/java.base/share/classes/java/lang/module/SystemModuleFinder.java
+++ b/jdk/src/java.base/share/classes/java/lang/module/SystemModuleFinder.java
@@ -45,6 +45,7 @@ import jdk.internal.jimage.ImageLocation;
 import jdk.internal.jimage.ImageReader;
 import jdk.internal.jimage.ImageReaderFactory;
 import jdk.internal.module.ModuleHashes;
+import jdk.internal.module.ModuleHashes.HashSupplier;
 import jdk.internal.module.SystemModules;
 import jdk.internal.module.ModulePatcher;
 import jdk.internal.perf.PerfCounter;
@@ -84,57 +85,23 @@ class SystemModuleFinder implements ModuleFinder {
         long t0 = System.nanoTime();
         imageReader = ImageReaderFactory.getImageReader();
 
-        String[] moduleNames = SystemModules.MODULE_NAMES;
-        ModuleDescriptor[] descriptors = null;
+        String[] names = moduleNames();
+        ModuleDescriptor[] descriptors = descriptors(names);
 
-        boolean fastLoad = System.getProperty("jdk.installed.modules.disable") == null;
-        if (fastLoad) {
-            // fast loading of ModuleDescriptor of installed modules
-            descriptors = SystemModules.modules();
-        }
-
-        int n = moduleNames.length;
+        int n = names.length;
         moduleCount.add(n);
 
         Set<ModuleReference> mods = new HashSet<>(n);
         Map<String, ModuleReference> map = new HashMap<>(n);
 
         for (int i = 0; i < n; i++) {
-            String mn = moduleNames[i];
-            ModuleDescriptor md;
-            String hash;
-            if (fastLoad) {
-                md = descriptors[i];
-                hash = SystemModules.MODULES_TO_HASH[i];
-            } else {
-                // fallback to read module-info.class
-                // if fast loading of ModuleDescriptors is disabled
-                ImageLocation location = imageReader.findLocation(mn, "module-info.class");
-                md = ModuleDescriptor.read(imageReader.getResourceBuffer(location));
-                hash = null;
-            }
-            if (!md.name().equals(mn))
-                throw new InternalError();
+            ModuleDescriptor md = descriptors[i];
 
             // create the ModuleReference
-
-            URI uri = URI.create("jrt:/" + mn);
-
-            Supplier<ModuleReader> readerSupplier = new Supplier<>() {
-                @Override
-                public ModuleReader get() {
-                    return new ImageModuleReader(mn, uri);
-                }
-            };
-
-            ModuleReference mref =
-                new ModuleReference(md, uri, readerSupplier, hashSupplier(hash));
-
-            // may need a reference to a patched module if -Xpatch specified
-            mref = ModulePatcher.interposeIfNeeded(mref);
+            ModuleReference mref = toModuleReference(md, hashSupplier(i, names[i]));
 
             mods.add(mref);
-            map.put(mn, mref);
+            map.put(names[i], mref);
 
             // counters
             packageCount.add(md.packages().size());
@@ -147,16 +114,114 @@ class SystemModuleFinder implements ModuleFinder {
         initTime.addElapsedTimeFrom(t0);
     }
 
-    private static ModuleHashes.HashSupplier hashSupplier(String hash) {
-        if (hash == null)
-            return null;
+    /*
+     * Returns an array of ModuleDescriptor of the given module names.
+     *
+     * This obtains ModuleDescriptors from SystemModules class that is generated
+     * from the jlink system-modules plugin.  ModuleDescriptors have already
+     * been validated at link time.
+     *
+     * If java.base is patched, or fastpath is disabled for troubleshooting
+     * purpose, it will fall back to find system modules via jrt file system.
+     */
+    private static ModuleDescriptor[] descriptors(String[] names) {
+        // fastpath is enabled by default.
+        // It can be disabled for troubleshooting purpose.
+        boolean disabled =
+            System.getProperty("jdk.system.module.finder.disabledFastPath") != null;
 
-        return new ModuleHashes.HashSupplier() {
+        // fast loading of ModuleDescriptor of system modules
+        if (isFastPathSupported() && !disabled)
+            return SystemModules.modules();
+
+        // if fast loading of ModuleDescriptors is disabled
+        // fallback to read module-info.class
+        ModuleDescriptor[] descriptors = new ModuleDescriptor[names.length];
+        for (int i = 0; i < names.length; i++) {
+            String mn = names[i];
+            ImageLocation loc = imageReader.findLocation(mn, "module-info.class");
+            descriptors[i] = ModuleDescriptor.read(imageReader.getResourceBuffer(loc));
+
+            // add the recorded hashes of tied modules
+            Hashes.add(descriptors[i]);
+        }
+        return descriptors;
+    }
+
+    private static boolean isFastPathSupported() {
+       return SystemModules.MODULE_NAMES.length > 0;
+    }
+
+    private static String[] moduleNames() {
+        if (isFastPathSupported())
+            // module names recorded at link time
+            return SystemModules.MODULE_NAMES;
+
+        // this happens when java.base is patched with java.base
+        // from an exploded image
+        return imageReader.getModuleNames();
+    }
+
+    private static ModuleReference toModuleReference(ModuleDescriptor md,
+                                                     HashSupplier hash)
+    {
+        String mn = md.name();
+        URI uri = URI.create("jrt:/" + mn);
+
+        Supplier<ModuleReader> readerSupplier = new Supplier<>() {
             @Override
-            public String generate(String algorithm) {
-                return hash;
+            public ModuleReader get() {
+                return new ImageModuleReader(mn, uri);
             }
         };
+
+        ModuleReference mref =
+            new ModuleReference(md, uri, readerSupplier, hash);
+
+        // may need a reference to a patched module if -Xpatch specified
+        mref = ModulePatcher.interposeIfNeeded(mref);
+
+        return mref;
+    }
+
+    private static HashSupplier hashSupplier(int index, String name) {
+        if (isFastPathSupported()) {
+            return new HashSupplier() {
+                @Override
+                public String generate(String algorithm) {
+                    return SystemModules.MODULES_TO_HASH[index];
+                }
+            };
+        } else {
+            return Hashes.hashFor(name);
+        }
+    }
+
+    /*
+     * This helper class is only used when SystemModules is patched.
+     * It will get the recorded hashes from module-info.class.
+     */
+    private static class Hashes {
+        static Map<String, String> hashes = new HashMap<>();
+
+        static void add(ModuleDescriptor descriptor) {
+            Optional<ModuleHashes> ohashes = descriptor.hashes();
+            if (ohashes.isPresent()) {
+                hashes.putAll(ohashes.get().hashes());
+            }
+        }
+
+        static HashSupplier hashFor(String name) {
+            if (!hashes.containsKey(name))
+                return null;
+
+            return new HashSupplier() {
+                @Override
+                public String generate(String algorithm) {
+                    return hashes.get(name);
+                }
+            };
+        }
     }
 
     SystemModuleFinder() { }
diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageReader.java b/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageReader.java
index 2c78ea9e5d5..a747ea8aa7b 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageReader.java
+++ b/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageReader.java
@@ -149,6 +149,17 @@ public final class ImageReader implements AutoCloseable {
         return reader.getEntryNames();
     }
 
+    public String[] getModuleNames() {
+        Objects.requireNonNull(reader, "image file closed");
+        int off = "/modules/".length();
+        return reader.findNode("/modules")
+                     .getChildren()
+                     .stream()
+                     .map(Node::getNameString)
+                     .map(s -> s.substring(off, s.length()))
+                     .toArray(String[]::new);
+    }
+
     public long[] getAttributes(int offset) {
         Objects.requireNonNull(reader, "image file closed");
         return reader.getAttributes(offset);
diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/SystemModules.java b/jdk/src/java.base/share/classes/jdk/internal/module/SystemModules.java
index 43de2cda9f7..78619f09f4d 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/module/SystemModules.java
+++ b/jdk/src/java.base/share/classes/jdk/internal/module/SystemModules.java
@@ -46,12 +46,12 @@ public final class SystemModules {
      * and read module-info.class from the run-time image instead of
      * the fastpath.
      */
-    public static final String[] MODULE_NAMES = new String[1];
+    public static final String[] MODULE_NAMES = new String[0];
 
     /**
      * Hash of system modules.
      */
-    public static String[] MODULES_TO_HASH = new String[1];
+    public static String[] MODULES_TO_HASH = new String[0];
 
     /**
      * Number of packages in the boot layer from the installed modules.
@@ -67,7 +67,7 @@ public final class SystemModules {
      * When running an exploded image it returns an empty array.
      */
     public static ModuleDescriptor[] modules() {
-        return new ModuleDescriptor[0];
+        throw new InternalError("should not reach here");
     }
 
 }
diff --git a/jdk/test/tools/launcher/modules/patch/PatchTest.java b/jdk/test/tools/launcher/modules/patch/basic/PatchTest.java
similarity index 100%
rename from jdk/test/tools/launcher/modules/patch/PatchTest.java
rename to jdk/test/tools/launcher/modules/patch/basic/PatchTest.java
diff --git a/jdk/test/tools/launcher/modules/patch/src/test/jdk/test/Main.java b/jdk/test/tools/launcher/modules/patch/basic/src/test/jdk/test/Main.java
similarity index 100%
rename from jdk/test/tools/launcher/modules/patch/src/test/jdk/test/Main.java
rename to jdk/test/tools/launcher/modules/patch/basic/src/test/jdk/test/Main.java
diff --git a/jdk/test/tools/launcher/modules/patch/src/test/module-info.java b/jdk/test/tools/launcher/modules/patch/basic/src/test/module-info.java
similarity index 100%
rename from jdk/test/tools/launcher/modules/patch/src/test/module-info.java
rename to jdk/test/tools/launcher/modules/patch/basic/src/test/module-info.java
diff --git a/jdk/test/tools/launcher/modules/patch/src1/java.base/java/text/Annotation.java b/jdk/test/tools/launcher/modules/patch/basic/src1/java.base/java/text/Annotation.java
similarity index 100%
rename from jdk/test/tools/launcher/modules/patch/src1/java.base/java/text/Annotation.java
rename to jdk/test/tools/launcher/modules/patch/basic/src1/java.base/java/text/Annotation.java
diff --git a/jdk/test/tools/launcher/modules/patch/src1/java.base/java/text/AnnotationBuddy.java b/jdk/test/tools/launcher/modules/patch/basic/src1/java.base/java/text/AnnotationBuddy.java
similarity index 100%
rename from jdk/test/tools/launcher/modules/patch/src1/java.base/java/text/AnnotationBuddy.java
rename to jdk/test/tools/launcher/modules/patch/basic/src1/java.base/java/text/AnnotationBuddy.java
diff --git a/jdk/test/tools/launcher/modules/patch/src1/jdk.compiler/com/sun/tools/javac/Main.java b/jdk/test/tools/launcher/modules/patch/basic/src1/jdk.compiler/com/sun/tools/javac/Main.java
similarity index 100%
rename from jdk/test/tools/launcher/modules/patch/src1/jdk.compiler/com/sun/tools/javac/Main.java
rename to jdk/test/tools/launcher/modules/patch/basic/src1/jdk.compiler/com/sun/tools/javac/Main.java
diff --git a/jdk/test/tools/launcher/modules/patch/src1/jdk.compiler/com/sun/tools/javac/MainBuddy.java b/jdk/test/tools/launcher/modules/patch/basic/src1/jdk.compiler/com/sun/tools/javac/MainBuddy.java
similarity index 100%
rename from jdk/test/tools/launcher/modules/patch/src1/jdk.compiler/com/sun/tools/javac/MainBuddy.java
rename to jdk/test/tools/launcher/modules/patch/basic/src1/jdk.compiler/com/sun/tools/javac/MainBuddy.java
diff --git a/jdk/test/tools/launcher/modules/patch/src1/jdk.naming.dns/com/sun/jndi/dns/DnsClient.java b/jdk/test/tools/launcher/modules/patch/basic/src1/jdk.naming.dns/com/sun/jndi/dns/DnsClient.java
similarity index 100%
rename from jdk/test/tools/launcher/modules/patch/src1/jdk.naming.dns/com/sun/jndi/dns/DnsClient.java
rename to jdk/test/tools/launcher/modules/patch/basic/src1/jdk.naming.dns/com/sun/jndi/dns/DnsClient.java
diff --git a/jdk/test/tools/launcher/modules/patch/src1/jdk.naming.dns/com/sun/jndi/dns/DnsClientBuddy.java b/jdk/test/tools/launcher/modules/patch/basic/src1/jdk.naming.dns/com/sun/jndi/dns/DnsClientBuddy.java
similarity index 100%
rename from jdk/test/tools/launcher/modules/patch/src1/jdk.naming.dns/com/sun/jndi/dns/DnsClientBuddy.java
rename to jdk/test/tools/launcher/modules/patch/basic/src1/jdk.naming.dns/com/sun/jndi/dns/DnsClientBuddy.java
diff --git a/jdk/test/tools/launcher/modules/patch/src2/java.base/java/lang2/Object.java b/jdk/test/tools/launcher/modules/patch/basic/src2/java.base/java/lang2/Object.java
similarity index 100%
rename from jdk/test/tools/launcher/modules/patch/src2/java.base/java/lang2/Object.java
rename to jdk/test/tools/launcher/modules/patch/basic/src2/java.base/java/lang2/Object.java
diff --git a/jdk/test/tools/launcher/modules/patch/src2/jdk.compiler/com/sun/tools/javac2/Main.java b/jdk/test/tools/launcher/modules/patch/basic/src2/jdk.compiler/com/sun/tools/javac2/Main.java
similarity index 100%
rename from jdk/test/tools/launcher/modules/patch/src2/jdk.compiler/com/sun/tools/javac2/Main.java
rename to jdk/test/tools/launcher/modules/patch/basic/src2/jdk.compiler/com/sun/tools/javac2/Main.java
diff --git a/jdk/test/tools/launcher/modules/patch/src2/jdk.naming.dns/com/sun/jndi/dns2/Zone.java b/jdk/test/tools/launcher/modules/patch/basic/src2/jdk.naming.dns/com/sun/jndi/dns2/Zone.java
similarity index 100%
rename from jdk/test/tools/launcher/modules/patch/src2/jdk.naming.dns/com/sun/jndi/dns2/Zone.java
rename to jdk/test/tools/launcher/modules/patch/basic/src2/jdk.naming.dns/com/sun/jndi/dns2/Zone.java
diff --git a/jdk/test/tools/launcher/modules/patch/systemmodules/PatchSystemModules.java b/jdk/test/tools/launcher/modules/patch/systemmodules/PatchSystemModules.java
new file mode 100644
index 00000000000..0e5345aefb3
--- /dev/null
+++ b/jdk/test/tools/launcher/modules/patch/systemmodules/PatchSystemModules.java
@@ -0,0 +1,225 @@
+/**
+ * Copyright (c) 2016, 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 8157068
+ * @summary Patch java.base and user module with Hashes attribute tied with
+ *          other module.
+ * @library /lib/testlibrary
+ * @modules jdk.compiler
+ * @build CompilerUtils
+ * @run testng PatchSystemModules
+ */
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
+
+import jdk.testlibrary.FileUtils;
+import jdk.testlibrary.JDKToolFinder;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import static jdk.testlibrary.ProcessTools.executeCommand;
+import static org.testng.Assert.*;
+
+public class PatchSystemModules {
+    private static final String JAVA_HOME = System.getProperty("java.home");
+
+    private static final Path TEST_SRC = Paths.get(System.getProperty("test.src"));
+    private static final Path PATCH_SRC_DIR = TEST_SRC.resolve("src1");
+
+    private static final Path JMODS = Paths.get(JAVA_HOME, "jmods");
+    private static final Path MODS_DIR = Paths.get("mods");
+    private static final Path JARS_DIR = Paths.get("jars");
+    private static final Path PATCH_DIR = Paths.get("patches");
+    private static final Path IMAGE = Paths.get("image");
+
+    private static final String JAVA_BASE = "java.base";
+    private final String[] modules = new String[] { "m1", "m2" };
+
+    @BeforeTest
+    private void setup() throws Throwable {
+        Path src = TEST_SRC.resolve("src");
+        for (String name : modules) {
+            assertTrue(CompilerUtils.compile(src.resolve(name),
+                                             MODS_DIR,
+                                             "-modulesourcepath", src.toString()));
+        }
+
+        // compile patched source
+        assertTrue(CompilerUtils.compile(PATCH_SRC_DIR.resolve(JAVA_BASE),
+                                         PATCH_DIR.resolve(JAVA_BASE),
+                                         "-Xmodule:java.base"));
+        assertTrue(CompilerUtils.compile(PATCH_SRC_DIR.resolve("m2"),
+                                         PATCH_DIR.resolve("m2")));
+
+        // create an image with only m1 and m2
+        if (Files.exists(JMODS)) {
+            // create an image with m1,m2
+            createImage();
+        }
+    }
+
+    @Test
+    public void test() throws Throwable {
+        Path patchedJavaBase = PATCH_DIR.resolve(JAVA_BASE);
+        Path patchedM2 = PATCH_DIR.resolve("m2");
+
+        Path home = Paths.get(JAVA_HOME);
+        runTest(home,
+                "-mp", MODS_DIR.toString(),
+                "-m", "m1/p1.Main", "1");
+        runTest(home,
+                "-Xpatch:java.base=" + patchedJavaBase.toString(),
+                "-mp", MODS_DIR.toString(),
+                "-m", "m1/p1.Main", "1");
+
+        runTest(home,
+                "-Xpatch:m2=" + patchedM2.toString(),
+                "-mp", MODS_DIR.toString(),
+                "-m", "m1/p1.Main", "2");
+    }
+
+    @Test
+    public void testImage() throws Throwable {
+        if (Files.notExists(JMODS))
+            return;
+
+        Path patchedJavaBase = PATCH_DIR.resolve(JAVA_BASE);
+        Path patchedM2 = PATCH_DIR.resolve("m2");
+
+        runTest(IMAGE,
+                "-m", "m1/p1.Main", "1");
+        runTest(IMAGE,
+                "-Xpatch:java.base=" + patchedJavaBase.toString(),
+                "-m", "m1/p1.Main", "1");
+        runTest(IMAGE,
+                "-Xpatch:m2=" + patchedM2.toString(),
+                "-m", "m1/p1.Main", "2");
+    }
+
+    @Test
+    public void upgradeTiedModule() throws Throwable {
+        if (Files.notExists(JMODS))
+            return;
+
+        Path m1 = MODS_DIR.resolve("m1.jar");
+
+        // create another m1.jar
+        jar("--create",
+            "--file=" + m1.toString(),
+            "-C", MODS_DIR.resolve("m1").toString(), ".");
+
+        // Fail to upgrade m1.jar with mismatched hash
+        runTestWithExitCode(getJava(IMAGE),
+                "-upgrademodulepath", m1.toString(),
+                "-m", "m1/p1.Main");
+
+        runTestWithExitCode(getJava(IMAGE),
+                "-Xpatch:java.base=" + PATCH_DIR.resolve(JAVA_BASE).toString(),
+                "-upgrademodulepath", m1.toString(),
+                "-m", "m1/p1.Main", "1");
+    }
+
+    private void runTestWithExitCode(String... options) throws Throwable {
+        assertTrue(executeCommand(options)
+                        .outputTo(System.out)
+                        .errorTo(System.out)
+                        .shouldContain("differs to expected hash")
+                        .getExitValue() != 0);
+    }
+
+    private void runTest(Path image, String... opts) throws Throwable {
+        String[] options =
+            Stream.concat(Stream.of(getJava(image)),
+                          Stream.of(opts))
+                  .toArray(String[]::new);
+
+        ProcessBuilder pb = new ProcessBuilder(options);
+        int exitValue =  executeCommand(pb)
+                            .outputTo(System.out)
+                            .errorTo(System.out)
+                            .getExitValue();
+
+        assertTrue(exitValue == 0);
+    }
+
+    static void createImage() throws Throwable {
+        FileUtils.deleteFileTreeUnchecked(JARS_DIR);
+        FileUtils.deleteFileTreeUnchecked(IMAGE);
+
+        Files.createDirectories(JARS_DIR);
+        Path m1 = JARS_DIR.resolve("m1.jar");
+        Path m2 = JARS_DIR.resolve("m2.jar");
+
+        // hash m1 in m2's Hashes attribute
+        jar("--create",
+            "--file=" + m1.toString(),
+            "-C", MODS_DIR.resolve("m1").toString(), ".");
+
+        jar("--create",
+            "--file=" + m2.toString(),
+            "--modulepath", JARS_DIR.toString(),
+            "--hash-modules", "m1",
+            "-C", MODS_DIR.resolve("m2").toString(), ".");
+
+
+        String mpath = JARS_DIR.toString() + File.pathSeparator + JMODS.toString();
+        execTool("jlink", "--modulepath", mpath,
+                 "--addmods", "m1",
+                 "--output", IMAGE.toString());
+    }
+
+    static void jar(String... args) throws Throwable {
+        execTool("jar", args);
+    }
+
+    static void execTool(String tool, String... args) throws Throwable {
+        String path = JDKToolFinder.getJDKTool(tool);
+        List<String> commands = new ArrayList<>();
+        commands.add(path);
+        Stream.of(args).forEach(commands::add);
+        ProcessBuilder pb = new ProcessBuilder(commands);
+        int exitValue =  executeCommand(pb)
+            .outputTo(System.out)
+            .errorTo(System.out)
+            .shouldNotContain("no module is recorded in hash")
+            .getExitValue();
+
+        assertTrue(exitValue == 0);
+    }
+
+    static String getJava(Path image) {
+        boolean isWindows = System.getProperty("os.name").toLowerCase().startsWith("win");
+        Path java = image.resolve("bin").resolve(isWindows ? "java.exe" : "java");
+        if (Files.notExists(java))
+            throw new RuntimeException(java + " not found");
+        return java.toAbsolutePath().toString();
+    }
+}
diff --git a/jdk/test/tools/launcher/modules/patch/systemmodules/src/m1/module-info.java b/jdk/test/tools/launcher/modules/patch/systemmodules/src/m1/module-info.java
new file mode 100644
index 00000000000..d23aeb1669b
--- /dev/null
+++ b/jdk/test/tools/launcher/modules/patch/systemmodules/src/m1/module-info.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2016, 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.
+ */
+
+module m1 {
+    requires m2;
+}
diff --git a/jdk/test/tools/launcher/modules/patch/systemmodules/src/m1/p1/Main.java b/jdk/test/tools/launcher/modules/patch/systemmodules/src/m1/p1/Main.java
new file mode 100644
index 00000000000..2329905a0f0
--- /dev/null
+++ b/jdk/test/tools/launcher/modules/patch/systemmodules/src/m1/p1/Main.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2016, 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 p1;
+
+public class Main {
+    public static void main(String[] args) throws Exception {
+        int version = p2.Lib.version();
+        int expected = args.length == 0 ? 1 : Integer.parseInt(args[0]);
+
+        if (version != expected)
+            throw new RuntimeException(version + " != " + expected + " (expected)");
+    }
+}
diff --git a/jdk/test/tools/launcher/modules/patch/systemmodules/src/m2/module-info.java b/jdk/test/tools/launcher/modules/patch/systemmodules/src/m2/module-info.java
new file mode 100644
index 00000000000..bc0f12b2204
--- /dev/null
+++ b/jdk/test/tools/launcher/modules/patch/systemmodules/src/m2/module-info.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2016, 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.
+ */
+
+module m2 {
+    exports p2;
+}
diff --git a/jdk/test/tools/launcher/modules/patch/systemmodules/src/m2/p2/Lib.java b/jdk/test/tools/launcher/modules/patch/systemmodules/src/m2/p2/Lib.java
new file mode 100644
index 00000000000..1d43aedc718
--- /dev/null
+++ b/jdk/test/tools/launcher/modules/patch/systemmodules/src/m2/p2/Lib.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2016, 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 p2;
+
+public class Lib {
+    public static int version() {
+        return 1;
+    }
+}
diff --git a/jdk/test/tools/launcher/modules/patch/systemmodules/src1/java.base/jdk/internal/modules/SystemModules.java b/jdk/test/tools/launcher/modules/patch/systemmodules/src1/java.base/jdk/internal/modules/SystemModules.java
new file mode 100644
index 00000000000..e30761204e1
--- /dev/null
+++ b/jdk/test/tools/launcher/modules/patch/systemmodules/src1/java.base/jdk/internal/modules/SystemModules.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2016, 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.internal.module;
+
+/*
+ * Test -Xpatch:java.base=jdk/modules/java.base to override
+ * java.base with an exploded image
+ */
+public final class SystemModules {
+    public static final String[] MODULE_NAMES = new String[0];
+}
diff --git a/jdk/test/tools/launcher/modules/patch/systemmodules/src1/m2/p2/Lib.java b/jdk/test/tools/launcher/modules/patch/systemmodules/src1/m2/p2/Lib.java
new file mode 100644
index 00000000000..5313c7e7aed
--- /dev/null
+++ b/jdk/test/tools/launcher/modules/patch/systemmodules/src1/m2/p2/Lib.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2016, 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 p2;
+
+public class Lib {
+    public static int version() {
+        return 2;
+    }
+}

From a950576f78001fa51a5d499613549177133dfe1b Mon Sep 17 00:00:00 2001
From: Iris Clark <iris@openjdk.org>
Date: Thu, 19 May 2016 12:04:54 -0700
Subject: [PATCH 157/228] 8144062: Move jdk.Version to
 java.lang.Runtime.Version

Reviewed-by: abuckley, alanb, forax, jjg, mchung, psandoz
---
 .../share/classes/java/lang/Runtime.java      | 603 +++++++++++++++++-
 .../share/classes/java/lang/System.java       |  12 +-
 .../share/classes/java/util/jar/JarFile.java  |   6 +-
 .../java.base/share/classes/jdk/Version.java  | 603 ------------------
 .../java.base/share/classes/module-info.java  |   3 -
 .../sun/tools/jconsole/AboutDialog.java       |   4 +-
 .../classes/jdk/nio/zipfs/JarFileSystem.java  |   6 +-
 .../lang/Runtime}/Version/Basic.java          |  23 +-
 .../jar/JarFile/mrjar/MultiReleaseJarAPI.java |   7 +-
 .../mrjar/MultiReleaseJarIterators.java       |   7 +-
 .../mrjar/MultiReleaseJarProperties.java      |   7 +-
 .../mrjar/MultiReleaseJarSecurity.java        |   7 +-
 .../jdk/nio/zipfs/MultiReleaseJarTest.java    |   8 +-
 .../jar/MultiReleaseJarURLConnection.java     |  14 +-
 14 files changed, 652 insertions(+), 658 deletions(-)
 delete mode 100644 jdk/src/java.base/share/classes/jdk/Version.java
 rename jdk/test/{jdk => java/lang/Runtime}/Version/Basic.java (96%)

diff --git a/jdk/src/java.base/share/classes/java/lang/Runtime.java b/jdk/src/java.base/share/classes/java/lang/Runtime.java
index 3c73d5b61a3..1533130017b 100644
--- a/jdk/src/java.base/share/classes/java/lang/Runtime.java
+++ b/jdk/src/java.base/share/classes/java/lang/Runtime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2016, 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,9 +26,21 @@
 package java.lang;
 
 import java.io.*;
+import java.math.BigInteger;
+import java.util.AbstractList;
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.RandomAccess;
 import java.util.StringTokenizer;
 import jdk.internal.reflect.CallerSensitive;
 import jdk.internal.reflect.Reflection;
+import sun.security.action.GetPropertyAction;
 
 /**
  * Every Java application has a single instance of class
@@ -46,6 +58,8 @@ import jdk.internal.reflect.Reflection;
 public class Runtime {
     private static final Runtime currentRuntime = new Runtime();
 
+    private static Version version;
+
     /**
      * Returns the runtime object associated with the current Java application.
      * Most of the methods of class {@code Runtime} are instance
@@ -917,4 +931,591 @@ public class Runtime {
         return out;
     }
 
+    /**
+     * Returns the version of the Java Runtime Environment as a {@link
+     * Runtime.Version}.
+     *
+     * @return  the {@link Runtime.Version} of the Java Runtime Environment
+     *
+     * @since  9
+     */
+    public static Version version() {
+        if (version == null) {
+            version = Version.parse(
+                GetPropertyAction.privilegedGetProperty("java.runtime.version"));
+        }
+        return version;
+    }
+
+    /**
+     * A representation of a version string for an implemenation of the
+     * Java&nbsp;SE Platform.  A version string contains a version number
+     * optionally followed by pre-release and build information.
+     *
+     * <h2><a name="verNum">Version numbers</a></h2>
+     *
+     * <p> A <em>version number</em>, {@code $VNUM}, is a non-empty sequence
+     * of elements separated by period characters (U+002E).  An element is
+     * either zero, or a unsigned integer numeral without leading zeros.  The
+     * final element in a version number must not be zero.  The format is:
+     * </p>
+     *
+     * <blockquote><pre>
+     *     ^[1-9][0-9]*(((\.0)*\.[1-9][0-9]*)*)*$
+     * </pre></blockquote>
+     *
+     * <p> The sequence may be of arbitrary length but the first three
+     * elements are assigned specific meanings, as follows:</p>
+     *
+     * <blockquote><pre>
+     *     $MAJOR.$MINOR.$SECURITY
+     * </pre></blockquote>
+     *
+     * <ul>
+     *
+     * <li><p> <a name="major">{@code $MAJOR}</a> --- The major version
+     * number, incremented for a major release that contains significant new
+     * features as specified in a new edition of the Java&#160;SE Platform
+     * Specification, <em>e.g.</em>, <a
+     * href="https://jcp.org/en/jsr/detail?id=337">JSR 337</a> for
+     * Java&#160;SE&#160;8.  Features may be removed in a major release, given
+     * advance notice at least one major release ahead of time, and
+     * incompatible changes may be made when justified. The {@code $MAJOR}
+     * version number of JDK&#160;8 is {@code 8}; the {@code $MAJOR} version
+     * number of JDK&#160;9 is {@code 9}.  When {@code $MAJOR} is incremented,
+     * all subsequent elements are removed. </p></li>
+     *
+     * <li><p> <a name="minor">{@code $MINOR}</a> --- The minor version
+     * number, incremented for a minor update release that may contain
+     * compatible bug fixes, revisions to standard APIs mandated by a
+     * <a href="https://jcp.org/en/procedures/jcp2#5.3">Maintenance Release</a>
+     * of the relevant Platform Specification, and implementation features
+     * outside the scope of that Specification such as new JDK-specific APIs,
+     * additional service providers, new garbage collectors, and ports to new
+     * hardware architectures. </p></li>
+     *
+     * <li><p> <a name="security">{@code $SECURITY}</a> --- The security
+     * level, incremented for a security update release that contains critical
+     * fixes including those necessary to improve security.  {@code $SECURITY}
+     * is <strong>not</strong> reset when {@code $MINOR} is incremented.  A
+     * higher value of {@code $SECURITY} for a given {@code $MAJOR} value,
+     * therefore, always indicates a more secure release, regardless of the
+     * value of {@code $MINOR}. </p></li>
+     *
+     * </ul>
+     *
+     * <p> The fourth and later elements of a version number are free for use
+     * by downstream consumers of this code base.  Such a consumer may,
+     * <em>e.g.</em>, use the fourth element to identify patch releases which
+     * contain a small number of critical non-security fixes in addition to
+     * the security fixes in the corresponding security release. </p>
+     *
+     * <p> The version number does not include trailing zero elements;
+     * <em>i.e.</em>, {@code $SECURITY} is omitted if it has the value zero,
+     * and {@code $MINOR} is omitted if both {@code $MINOR} and {@code
+     * $SECURITY} have the value zero. </p>
+     *
+     * <p> The sequence of numerals in a version number is compared to another
+     * such sequence in numerical, pointwise fashion; <em>e.g.</em>, {@code
+     * 9.9.1} is less than {@code 9.10.3}. If one sequence is shorter than
+     * another then the missing elements of the shorter sequence are
+     * considered to be less than the corresponding elements of the longer
+     * sequence; <em>e.g.</em>, {@code 9.1.2} is less than {@code 9.1.2.1}.
+     * </p>
+     *
+     * <h2><a name="verStr">Version strings</a></h2>
+     *
+     * <p> A <em>version string</em>, {@code $VSTR}, consists of a version
+     * number {@code $VNUM}, as described above, optionally followed by
+     * pre-release and build information, in the format </p>
+     *
+     * <blockquote><pre>
+     *     $VNUM(-$PRE)?(\+($BUILD)?(-$OPT)?)?
+     * </pre></blockquote>
+     *
+     * <p> where: </p>
+     *
+     * <ul>
+     *
+     * <li><p> <a name="pre">{@code $PRE}</a>, matching {@code ([a-zA-Z0-9]+)}
+     * --- A pre-release identifier.  Typically {@code ea}, for a
+     * potentially unstable early-access release under active development,
+     * or {@code internal}, for an internal developer build.
+     *
+     * <li><p> <a name="build">{@code $BUILD}</a>, matching {@code
+     * (0|[1-9][0-9]*)} --- The build number, incremented for each promoted
+     * build.  {@code $BUILD} is reset to {@code 1} when any portion of {@code
+     * $VNUM} is incremented. </p>
+     *
+     * <li><p> <a name="opt">{@code $OPT}</a>, matching {@code
+     * ([-a-zA-Z0-9\.]+)} --- Additional build information, if desired.  In
+     * the case of an {@code internal} build this will often contain the date
+     * and time of the build. </p>
+     *
+     * </ul>
+     *
+     * <p> A version number {@code 10-ea} matches {@code $VNUM = "10"} and
+     * {@code $PRE = "ea"}.  The version number {@code 10+-ea} matches
+     * {@code $VNUM = "10"} and {@code $OPT = "ea"}. </p>
+     *
+     * <p> When comparing two version strings, the value of {@code $OPT}, if
+     * present, may or may not be significant depending on the chosen
+     * comparison method.  The comparison methods {@link #compareTo(Version)
+     * compareTo()} and {@link #compareToIgnoreOpt(Version)
+     * compareToIgnoreOpt()} should be used consistently with the
+     * corresponding methods {@link #equals(Object) equals()} and {@link
+     * #equalsIgnoreOpt(Object) equalsIgnoreOpt()}.  </p>
+     *
+     * <p> A <em>short version string</em>, {@code $SVSTR}, often useful in
+     * less formal contexts, is a version number optionally followed by a
+     * pre-release identifier:
+     *
+     * <blockquote><pre>
+     *     $VNUM(-$PRE)?
+     * </pre></blockquote>
+     *
+     * @since  9
+     */
+    public static class Version
+        implements Comparable<Version>
+    {
+        private final List<Integer>     version;
+        private final Optional<String>  pre;
+        private final Optional<Integer> build;
+        private final Optional<String>  optional;
+
+
+        // $VNUM(-$PRE)?(\+($BUILD)?(\-$OPT)?)?
+        // RE limits the format of version strings
+        // ([1-9][0-9]*(?:(?:\.0)*\.[1-9][0-9]*)*)(?:-([a-zA-Z0-9]+))?(?:(\+)(0|[1-9][0-9]*)?)?(?:-([-a-zA-Z0-9.]+))?
+
+        private static final String VNUM
+            = "(?<VNUM>[1-9][0-9]*(?:(?:\\.0)*\\.[1-9][0-9]*)*)";
+        private static final String VNUM_GROUP  = "VNUM";
+
+        private static final String PRE      = "(?:-(?<PRE>[a-zA-Z0-9]+))?";
+        private static final String PRE_GROUP   = "PRE";
+
+        private static final String BUILD
+            = "(?:(?<PLUS>\\+)(?<BUILD>0|[1-9][0-9]*)?)?";
+        private static final String PLUS_GROUP  = "PLUS";
+        private static final String BUILD_GROUP = "BUILD";
+
+        private static final String OPT      = "(?:-(?<OPT>[-a-zA-Z0-9.]+))?";
+        private static final String OPT_GROUP   = "OPT";
+
+        private static final String VSTR_FORMAT
+            = "^" + VNUM + PRE + BUILD + OPT + "$";
+        private static final Pattern VSTR_PATTERN = Pattern.compile(VSTR_FORMAT);
+
+        /**
+         * Constructs a valid <a href="verStr">version string</a> containing
+         * a <a href="#verNum">version number</a> followed by pre-release and
+         * build information.
+         *
+         * @param  s
+         *         A string to be interpreted as a version
+         *
+         * @throws  IllegalArgumentException
+         *          If the given string cannot be interpreted as a valid
+         *          version
+         *
+         * @throws  NullPointerException
+         *          If {@code s} is {@code null}
+         *
+         * @throws  NumberFormatException
+         *          If an element of the version number or the build number
+         *          cannot be represented as an {@link Integer}
+         */
+        private Version(String s) {
+            if (s == null)
+                throw new NullPointerException();
+
+            Matcher m = VSTR_PATTERN.matcher(s);
+            if (!m.matches())
+                throw new IllegalArgumentException("Invalid version string: '"
+                                                   + s + "'");
+
+            // $VNUM is a dot-separated list of integers of arbitrary length
+            List<Integer> list = new ArrayList<>();
+            for (String i : m.group(VNUM_GROUP).split("\\."))
+                list.add(Integer.parseInt(i));
+            version = Collections.unmodifiableList(list);
+
+            pre = Optional.ofNullable(m.group(PRE_GROUP));
+
+            String b = m.group(BUILD_GROUP);
+            // $BUILD is an integer
+            build = (b == null)
+                ? Optional.<Integer>empty()
+                : Optional.ofNullable(Integer.parseInt(b));
+
+            optional = Optional.ofNullable(m.group(OPT_GROUP));
+
+            // empty '+'
+            if ((m.group(PLUS_GROUP) != null) && !build.isPresent()) {
+                if (optional.isPresent()) {
+                    if (pre.isPresent())
+                        throw new IllegalArgumentException("'+' found with"
+                            + " pre-release and optional components:'" + s
+                            + "'");
+                } else {
+                    throw new IllegalArgumentException("'+' found with neither"
+                        + " build or optional components: '" + s + "'");
+                }
+            }
+        }
+
+        /**
+         * Parses the given string as a valid
+         * <a href="#verStr">version string</a> containing a
+         * <a href="#verNum">version number</a> followed by pre-release and
+         * build information.
+         *
+         * @param  s
+         *         A string to interpret as a version
+         *
+         * @throws  IllegalArgumentException
+         *          If the given string cannot be interpreted as a valid
+         *          version
+         *
+         * @throws  NullPointerException
+         *          If the given string is {@code null}
+         *
+         * @throws  NumberFormatException
+         *          If an element of the version number or the build number
+         *          cannot be represented as an {@link Integer}
+         *
+         * @return  The Version of the given string
+         */
+        public static Version parse(String s) {
+            return new Version(s);
+        }
+
+        /**
+         * Returns the <a href="#major">major</a> version number.
+         *
+         * @return  The major version number
+         */
+        public int major() {
+            return version.get(0);
+        }
+
+        /**
+         * Returns the <a href="#minor">minor</a> version number or zero if it
+         * was not set.
+         *
+         * @return  The minor version number or zero if it was not set
+         */
+        public int minor() {
+            return (version.size() > 1 ? version.get(1) : 0);
+        }
+
+        /**
+         * Returns the <a href="#security">security</a> version number or zero
+         * if it was not set.
+         *
+         * @return  The security version number or zero if it was not set
+         */
+        public int security() {
+            return (version.size() > 2 ? version.get(2) : 0);
+        }
+
+        /**
+         * Returns an unmodifiable {@link java.util.List List} of the
+         * integer numerals contained in the <a href="#verNum">version
+         * number</a>.  The {@code List} always contains at least one
+         * element corresponding to the <a href="#major">major version
+         * number</a>.
+         *
+         * @return  An unmodifiable list of the integer numerals
+         *          contained in the version number
+         */
+        public List<Integer> version() {
+            return version;
+        }
+
+        /**
+         * Returns the optional <a href="#pre">pre-release</a> information.
+         *
+         * @return  The optional pre-release information as a String
+         */
+        public Optional<String> pre() {
+            return pre;
+        }
+
+        /**
+         * Returns the <a href="#build">build number</a>.
+         *
+         * @return  The optional build number.
+         */
+        public Optional<Integer> build() {
+            return build;
+        }
+
+        /**
+         * Returns <a href="#opt">optional</a> additional identifying build
+         * information.
+         *
+         * @return  Additional build information as a String
+         */
+        public Optional<String> optional() {
+            return optional;
+        }
+
+        /**
+         * Compares this version to another.
+         *
+         * <p> Each of the components in the <a href="#verStr">version</a> is
+         * compared in the follow order of precedence: version numbers,
+         * pre-release identifiers, build numbers, optional build information.
+         * </p>
+         *
+         * <p> Comparison begins by examining the sequence of version numbers.
+         * If one sequence is shorter than another, then the missing elements
+         * of the shorter sequence are considered to be less than the
+         * corresponding elements of the longer sequence. </p>
+         *
+         * <p> A version with a pre-release identifier is always considered to
+         * be less than a version without one.  Pre-release identifiers are
+         * compared numerically when they consist only of digits, and
+         * lexicographically otherwise.  Numeric identifiers are considered to
+         * be less than non-numeric identifiers.  </p>
+         *
+         * <p> A version without a build number is always less than one with a
+         * build number; otherwise build numbers are compared numerically. </p>
+         *
+         * <p> The optional build information is compared lexicographically.
+         * During this comparison, a version with optional build information is
+         * considered to be greater than a version without one. </p>
+         *
+         * <p> A version is not comparable to any other type of object.
+         *
+         * @param  ob
+         *         The object to be compared
+         *
+         * @return  A negative integer, zero, or a positive integer if this
+         *          {@code Version} is less than, equal to, or greater than the
+         *          given {@code Version}
+         *
+         * @throws  NullPointerException
+         *          If the given object is {@code null}
+         */
+        @Override
+        public int compareTo(Version ob) {
+            return compare(ob, false);
+        }
+
+        /**
+         * Compares this version to another disregarding optional build
+         * information.
+         *
+         * <p> Two versions are compared by examining the version string as
+         * described in {@link #compareTo(Version)} with the exception that the
+         * optional build information is always ignored. </p>
+         *
+         * <p> A version is not comparable to any other type of object.
+         *
+         * @param  ob
+         *         The object to be compared
+         *
+         * @return  A negative integer, zero, or a positive integer if this
+         *          {@code Version} is less than, equal to, or greater than the
+         *          given {@code Version}
+         *
+         * @throws  NullPointerException
+         *          If the given object is {@code null}
+         */
+        public int compareToIgnoreOpt(Version ob) {
+            return compare(ob, true);
+        }
+
+        private int compare(Version ob, boolean ignoreOpt) {
+            if (ob == null)
+                throw new NullPointerException("Invalid argument");
+
+            int ret = compareVersion(ob);
+            if (ret != 0)
+                return ret;
+
+            ret = comparePre(ob);
+            if (ret != 0)
+                return ret;
+
+            ret = compareBuild(ob);
+            if (ret != 0)
+                return ret;
+
+            if (!ignoreOpt)
+                return compareOpt(ob);
+
+            return 0;
+        }
+
+        private int compareVersion(Version ob) {
+            int size = version.size();
+            int oSize = ob.version().size();
+            int min = Math.min(size, oSize);
+            for (int i = 0; i < min; i++) {
+                Integer val = version.get(i);
+                Integer oVal = ob.version().get(i);
+                if (val != oVal)
+                    return val - oVal;
+            }
+            if (size != oSize)
+                return size - oSize;
+            return 0;
+        }
+
+        private int comparePre(Version ob) {
+            Optional<String> oPre = ob.pre();
+            if (!pre.isPresent()) {
+                if (oPre.isPresent())
+                    return 1;
+            } else {
+                if (!oPre.isPresent())
+                    return -1;
+                String val = pre.get();
+                String oVal = oPre.get();
+                if (val.matches("\\d+")) {
+                    return (oVal.matches("\\d+")
+                        ? (new BigInteger(val)).compareTo(new BigInteger(oVal))
+                        : -1);
+                } else {
+                    return (oVal.matches("\\d+")
+                        ? 1
+                        : val.compareTo(oVal));
+                }
+            }
+            return 0;
+        }
+
+        private int compareBuild(Version ob) {
+            Optional<Integer> oBuild = ob.build();
+            if (oBuild.isPresent()) {
+                return (build.isPresent()
+                        ? build.get().compareTo(oBuild.get())
+                        : 1);
+            } else if (build.isPresent()) {
+                return -1;
+            }
+            return 0;
+        }
+
+        private int compareOpt(Version ob) {
+            Optional<String> oOpt = ob.optional();
+            if (!optional.isPresent()) {
+                if (oOpt.isPresent())
+                    return -1;
+            } else {
+                if (!oOpt.isPresent())
+                    return 1;
+                return optional.get().compareTo(oOpt.get());
+            }
+            return 0;
+        }
+
+        /**
+         * Returns a string representation of this version.
+         *
+         * @return  The version string
+         */
+        @Override
+        public String toString() {
+            StringBuilder sb
+                = new StringBuilder(version.stream()
+                    .map(Object::toString)
+                    .collect(Collectors.joining(".")));
+
+            pre.ifPresent(v -> sb.append("-").append(v));
+
+            if (build.isPresent()) {
+                sb.append("+").append(build.get());
+                if (optional.isPresent())
+                    sb.append("-").append(optional.get());
+            } else {
+                if (optional.isPresent()) {
+                    sb.append(pre.isPresent() ? "-" : "+-");
+                    sb.append(optional.get());
+                }
+            }
+
+            return sb.toString();
+        }
+
+        /**
+         * Determines whether this {@code Version} is equal to another object.
+         *
+         * <p> Two {@code Version}s are equal if and only if they represent the
+         * same version string.
+         *
+         * <p> This method satisfies the general contract of the {@link
+         * Object#equals(Object) Object.equals} method. </p>
+         *
+         * @param  ob
+         *         The object to which this {@code Version} is to be compared
+         *
+         * @return  {@code true} if, and only if, the given object is a {@code
+         *          Version} that is identical to this {@code Version}
+         *
+         */
+        @Override
+        public boolean equals(Object ob) {
+            boolean ret = equalsIgnoreOpt(ob);
+            if (!ret)
+                return false;
+
+            Version that = (Version)ob;
+            return (this.optional().equals(that.optional()));
+        }
+
+        /**
+         * Determines whether this {@code Version} is equal to another
+         * disregarding optional build information.
+         *
+         * <p> Two {@code Version}s are equal if and only if they represent the
+         * same version string disregarding the optional build information.
+         *
+         * @param  ob
+         *         The object to which this {@code Version} is to be compared
+         *
+         * @return  {@code true} if, and only if, the given object is a {@code
+         *          Version} that is identical to this {@code Version}
+         *          ignoring the optinal build information
+         *
+         */
+        public boolean equalsIgnoreOpt(Object ob) {
+            if (this == ob)
+                return true;
+            if (!(ob instanceof Version))
+                return false;
+
+            Version that = (Version)ob;
+            return (this.version().equals(that.version())
+                && this.pre().equals(that.pre())
+                && this.build().equals(that.build()));
+        }
+
+        /**
+         * Returns the hash code of this version.
+         *
+         * <p> This method satisfies the general contract of the {@link
+         * Object#hashCode Object.hashCode} method.
+         *
+         * @return  The hashcode of this version
+         */
+        @Override
+        public int hashCode() {
+            int h = 1;
+            int p = 17;
+
+            h = p * h + version.hashCode();
+            h = p * h + pre.hashCode();
+            h = p * h + build.hashCode();
+            h = p * h + optional.hashCode();
+
+            return h;
+        }
+    }
+
 }
diff --git a/jdk/src/java.base/share/classes/java/lang/System.java b/jdk/src/java.base/share/classes/java/lang/System.java
index ab7bb02c1f7..7ac564d959a 100644
--- a/jdk/src/java.base/share/classes/java/lang/System.java
+++ b/jdk/src/java.base/share/classes/java/lang/System.java
@@ -576,7 +576,8 @@ public final class System {
      * <tr><th>Key</th>
      *     <th>Description of Associated Value</th></tr>
      * <tr><td><code>java.version</code></td>
-     *     <td>Java Runtime Environment version</td></tr>
+     *     <td>Java Runtime Environment version which may be interpreted
+     *     as a {@link Runtime.Version}</td></tr>
      * <tr><td><code>java.vendor</code></td>
      *     <td>Java Runtime Environment vendor</td></tr>
      * <tr><td><code>java.vendor.url</code></td>
@@ -584,19 +585,22 @@ public final class System {
      * <tr><td><code>java.home</code></td>
      *     <td>Java installation directory</td></tr>
      * <tr><td><code>java.vm.specification.version</code></td>
-     *     <td>Java Virtual Machine specification version</td></tr>
+     *     <td>Java Virtual Machine specification version which may be
+     *     interpreted as a {@link Runtime.Version}</td></tr>
      * <tr><td><code>java.vm.specification.vendor</code></td>
      *     <td>Java Virtual Machine specification vendor</td></tr>
      * <tr><td><code>java.vm.specification.name</code></td>
      *     <td>Java Virtual Machine specification name</td></tr>
      * <tr><td><code>java.vm.version</code></td>
-     *     <td>Java Virtual Machine implementation version</td></tr>
+     *     <td>Java Virtual Machine implementation version which may be
+     *     interpreted as a {@link Runtime.Version}</td></tr>
      * <tr><td><code>java.vm.vendor</code></td>
      *     <td>Java Virtual Machine implementation vendor</td></tr>
      * <tr><td><code>java.vm.name</code></td>
      *     <td>Java Virtual Machine implementation name</td></tr>
      * <tr><td><code>java.specification.version</code></td>
-     *     <td>Java Runtime Environment specification  version</td></tr>
+     *     <td>Java Runtime Environment specification version which may be
+     *     interpreted as a {@link Runtime.Version}</td></tr>
      * <tr><td><code>java.specification.vendor</code></td>
      *     <td>Java Runtime Environment specification  vendor</td></tr>
      * <tr><td><code>java.specification.name</code></td>
diff --git a/jdk/src/java.base/share/classes/java/util/jar/JarFile.java b/jdk/src/java.base/share/classes/java/util/jar/JarFile.java
index 5f08db7b1c4..aab2474fd66 100644
--- a/jdk/src/java.base/share/classes/java/util/jar/JarFile.java
+++ b/jdk/src/java.base/share/classes/java/util/jar/JarFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -153,7 +153,7 @@ class JarFile extends ZipFile {
         SharedSecrets.setJavaUtilJarAccess(new JavaUtilJarAccessImpl());
 
         BASE_VERSION = 8;  // one less than lowest version for versioned entries
-        int runtimeVersion = jdk.Version.current().major();
+        int runtimeVersion = Runtime.version().major();
         String jarVersion =
                 GetPropertyAction.privilegedGetProperty("jdk.util.jar.version");
         if (jarVersion != null) {
@@ -357,7 +357,7 @@ class JarFile extends ZipFile {
     }
 
     private boolean runtimeVersionExists() {
-        int version = jdk.Version.current().major();
+        int version = Runtime.version().major();
         try {
             Release.valueOf(version);
             return true;
diff --git a/jdk/src/java.base/share/classes/jdk/Version.java b/jdk/src/java.base/share/classes/jdk/Version.java
deleted file mode 100644
index 8afccfba6a8..00000000000
--- a/jdk/src/java.base/share/classes/jdk/Version.java
+++ /dev/null
@@ -1,603 +0,0 @@
-/*
- * Copyright (c) 2015, 2016, 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;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import sun.security.action.GetPropertyAction;
-
-/**
- * A representation of the JDK version-string which contains a version
- * number optionally followed by pre-release and build information.
- *
- * <h2><a name="verNum">Version numbers</a></h2>
- *
- * A <em>version number</em>, {@code $VNUM}, is a non-empty sequence of
- * non-negative integer numerals, without leading or trailing zeroes,
- * separated by period characters (U+002E); i.e., it matches the regular
- * expression {@code ^[1-9][0-9]*(((\.0)*\.[1-9][0-9]*)*)*$}. The sequence may
- * be of arbitrary length but the first three elements are assigned specific
- * meanings, as follows:
- *
- * <blockquote><pre>
- *     $MAJOR.$MINOR.$SECURITY
- * </pre></blockquote>
- *
- * <ul>
- *
- * <li><p> <a name="major">{@code $MAJOR}</a> --- The major version number,
- * incremented for a major release that contains significant new features as
- * specified in a new edition of the Java&#160;SE Platform Specification,
- * <em>e.g.</em>, <a href="https://jcp.org/en/jsr/detail?id=337">JSR 337</a>
- * for Java&#160;SE&#160;8. Features may be removed in a major release, given
- * advance notice at least one major release ahead of time, and incompatible
- * changes may be made when justified. The {@code $MAJOR} version number of
- * JDK&#160;8 was {@code 8}; the {@code $MAJOR} version number of JDK&#160;9
- * is {@code 9}. </p></li>
- *
- * <li><p> <a name="minor">{@code $MINOR}</a> --- The minor version number,
- * incremented for a minor update release that may contain compatible bug
- * fixes, revisions to standard APIs mandated by a <a
- * href="https://jcp.org/en/procedures/jcp2#5.3">Maintenance Release</a> of
- * the relevant Platform Specification, and implementation features outside
- * the scope of that Specification such as new JDK-specific APIs, additional
- * service providers, new garbage collectors, and ports to new hardware
- * architectures. {@code $MINOR} is reset to zero when {@code $MAJOR} is
- * incremented. </p></li>
- *
- * <li><p> <a name="security">{@code $SECURITY}</a> --- The security level,
- * incremented for a security-update release that contains critical fixes
- * including those necessary to improve security. {@code $SECURITY} is reset
- * to zero <strong>only</strong> when {@code $MAJOR} is incremented. A higher
- * value of {@code $SECURITY} for a given {@code $MAJOR} value, therefore,
- * always indicates a more secure release, regardless of the value of {@code
- * $MINOR}. </p></li>
- *
- * </ul>
- *
- * <p> The fourth and later elements of a version number are free for use by
- * downstream consumers of the JDK code base.  Such a consumer may,
- * <em>e.g.</em>, use the fourth element to identify patch releases which
- * contain a small number of critical non-security fixes in addition to the
- * security fixes in the corresponding security release. </p>
- *
- * <p> The version number does not include trailing zero elements;
- * <em>i.e.</em>, {@code $SECURITY} is omitted if it has the value zero, and
- * {@code $MINOR} is omitted if both {@code $MINOR} and {@code $SECURITY} have
- * the value zero. </p>
- *
- * <p> The sequence of numerals in a version number is compared to another
- * such sequence in numerical, pointwise fashion; <em>e.g.</em>, {@code 9.9.1}
- * is less than {@code 9.10.0}. If one sequence is shorter than another then
- * the missing elements of the shorter sequence are considered to be zero;
- * <em>e.g.</em>, {@code 9.1.2} is equal to {@code 9.1.2.0} but less than
- * {@code 9.1.2.1}. </p>
- *
- * <h2><a name="verStr">Version strings</a></h2>
- *
- * <p> A <em>version string</em> {@code $VSTR} consists of a version number
- * {@code $VNUM}, as described above, optionally followed by pre-release and
- * build information, in the format </p>
- *
- * <blockquote><pre>
- *     $VNUM(-$PRE)?(\+($BUILD)?(-$OPT)?)?
- * </pre></blockquote>
- *
- * <p> where: </p>
- *
- * <ul>
- *
- * <li><p> <a name="pre">{@code $PRE}</a>, matching {@code ([a-zA-Z0-9]+)} ---
- * A pre-release identifier.  Typically {@code ea}, for an early-access
- * release that's under active development and potentially unstable, or {@code
- * internal}, for an internal developer build.
- *
- * <li><p> <a name="build">{@code $BUILD}</a>, matching {@code
- * (0|[1-9][0-9]*)} --- The build number, incremented for each promoted build.
- * {@code $BUILD} is reset to {@code 1} when any portion of {@code $VNUM} is
- * incremented. </p>
- *
- * <li><p> <a name="opt">{@code $OPT}</a>, matching {@code ([-a-zA-Z0-9\.]+)}
- * --- Additional build information, if desired.  In the case of an {@code
- * internal} build this will often contain the date and time of the
- * build. </p>
- *
- * </ul>
- *
- * <p> When comparing two version strings the value of {@code $OPT}, if
- * present, may or may not be significant depending on the chosen comparison
- * method.  The comparison methods {@link #compareTo(Version) compareTo()} and
- * {@link #compareToIgnoreOpt(Version) compareToIgnoreOpt{}} should be used
- * consistently with the corresponding methods {@link #equals(Object) equals()}
- * and {@link #equalsIgnoreOpt(Object) equalsIgnoreOpt()}.  </p>
- *
- * <p> A <em>short version string</em> ({@code $SVSTR}), often useful in less
- * formal contexts, is simply {@code $VNUM} optionally ended with {@code
- * -$PRE}. </p>
- *
- * @since  9
- */
-public final class Version
-    implements Comparable<Version>
-{
-    private final List<Integer>     version;
-    private final Optional<String>  pre;
-    private final Optional<Integer> build;
-    private final Optional<String>  optional;
-
-    private static Version current;
-
-    // $VNUM(-$PRE)?(\+($BUILD)?(\-$OPT)?)?
-    // RE limits the format of version strings
-    // ([1-9][0-9]*(?:(?:\.0)*\.[1-9][0-9]*)*)(?:-([a-zA-Z0-9]+))?(?:(\+)(0|[1-9][0-9]*)?)?(?:-([-a-zA-Z0-9.]+))?
-
-    private static final String VNUM
-        = "(?<VNUM>[1-9][0-9]*(?:(?:\\.0)*\\.[1-9][0-9]*)*)";
-    private static final String VNUM_GROUP  = "VNUM";
-
-    private static final String PRE      = "(?:-(?<PRE>[a-zA-Z0-9]+))?";
-    private static final String PRE_GROUP   = "PRE";
-
-    private static final String BUILD
-        = "(?:(?<PLUS>\\+)(?<BUILD>0|[1-9][0-9]*)?)?";
-    private static final String PLUS_GROUP  = "PLUS";
-    private static final String BUILD_GROUP = "BUILD";
-
-    private static final String OPT      = "(?:-(?<OPT>[-a-zA-Z0-9.]+))?";
-    private static final String OPT_GROUP   = "OPT";
-
-    private static final String VSTR_FORMAT
-        = "^" + VNUM + PRE + BUILD + OPT + "$";
-    private static final Pattern VSTR_PATTERN = Pattern.compile(VSTR_FORMAT);
-
-    /**
-     * Constructs a valid JDK <a href="verStr">version string</a> containing a
-     * <a href="#verNum">version number</a> followed by pre-release and build
-     * information.
-     *
-     * @param  s
-     *         A string to be interpreted as a version
-     *
-     * @throws  IllegalArgumentException
-     *          If the given string cannot be interpreted a valid version
-     *
-     * @throws  NullPointerException
-     *          If {@code s} is {@code null}
-     *
-     * @throws  NumberFormatException
-     *          If an element of the version number or the build number cannot
-     *          be represented as an {@link Integer}
-     */
-    private Version(String s) {
-        if (s == null)
-            throw new NullPointerException();
-
-        Matcher m = VSTR_PATTERN.matcher(s);
-        if (!m.matches())
-            throw new IllegalArgumentException("Invalid version string: '"
-                                               + s + "'");
-
-        // $VNUM is a dot-separated list of integers of arbitrary length
-        List<Integer> list = new ArrayList<>();
-        for (String i : m.group(VNUM_GROUP).split("\\."))
-            list.add(Integer.parseInt(i));
-        version = Collections.unmodifiableList(list);
-
-        pre = Optional.ofNullable(m.group(PRE_GROUP));
-
-        String b = m.group(BUILD_GROUP);
-        // $BUILD is an integer
-        build = (b == null)
-             ? Optional.<Integer>empty()
-             : Optional.ofNullable(Integer.parseInt(b));
-
-        optional = Optional.ofNullable(m.group(OPT_GROUP));
-
-        // empty '+'
-        if ((m.group(PLUS_GROUP) != null) && !build.isPresent()) {
-            if (optional.isPresent()) {
-                if (pre.isPresent())
-                    throw new IllegalArgumentException("'+' found with"
-                        + " pre-release and optional components:'" + s + "'");
-            } else {
-                throw new IllegalArgumentException("'+' found with neither"
-                    + " build or optional components: '" + s + "'");
-            }
-        }
-    }
-
-    /**
-     * Parses the given string as a valid JDK <a
-     * href="#verStr">version string</a> containing a <a
-     * href="#verNum">version number</a> followed by pre-release and
-     * build information.
-     *
-     * @param  s
-     *         A string to interpret as a version
-     *
-     * @throws  IllegalArgumentException
-     *          If the given string cannot be interpreted a valid version
-     *
-     * @throws  NullPointerException
-     *          If the given string is {@code null}
-     *
-     * @throws  NumberFormatException
-     *          If an element of the version number or the build number cannot
-     *          be represented as an {@link Integer}
-     *
-     * @return  This version
-     */
-    public static Version parse(String s) {
-        return new Version(s);
-    }
-
-    /**
-     * Returns {@code System.getProperty("java.version")} as a Version.
-     *
-     * @throws  SecurityException
-     *          If a security manager exists and its {@link
-     *          SecurityManager#checkPropertyAccess(String)
-     *          checkPropertyAccess} method does not allow access to the
-     *          system property "java.version"
-     *
-     * @return  {@code System.getProperty("java.version")} as a Version
-     */
-    public static Version current() {
-        if (current == null) {
-            current = parse(
-                    GetPropertyAction.privilegedGetProperty("java.version"));
-        }
-        return current;
-    }
-
-    /**
-     * Returns the <a href="#major">major</a> version number.
-     *
-     * @return  The major version number
-     */
-    public int major() {
-        return version.get(0);
-    }
-
-    /**
-     * Returns the <a href="#minor">minor</a> version number or zero if it was
-     * not set.
-     *
-     * @return  The minor version number or zero if it was not set
-     */
-    public int minor() {
-        return (version.size() > 1 ? version.get(1) : 0);
-    }
-
-    /**
-     * Returns the <a href="#security">security</a> version number or zero if
-     * it was not set.
-     *
-     * @return  The security version number or zero if it was not set
-     */
-    public int security() {
-        return (version.size() > 2 ? version.get(2) : 0);
-    }
-
-    /**
-     * Returns an unmodifiable {@link java.util.List List} of the
-     * integer numerals contained in the <a href="#verNum">version
-     * number</a>.  The {@code List} always contains at least one
-     * element corresponding to the <a href="#major">major version
-     * number</a>.
-     *
-     * @return  An unmodifiable list of the integer numerals
-     *          contained in the version number
-     */
-    public List<Integer> version() {
-        return version;
-    }
-
-    /**
-     * Returns the optional <a href="#pre">pre-release</a> information.
-     *
-     * @return  The optional pre-release information as a String
-     */
-    public Optional<String> pre() {
-        return pre;
-    }
-
-    /**
-     * Returns the <a href="#build">build number</a>.
-     *
-     * @return The optional build number.
-     */
-    public Optional<Integer> build() {
-        return build;
-    }
-
-    /**
-     * Returns <a href="#opt">optional</a> additional identifying build
-     * information.
-     *
-     * @return  Additional build information as a String
-     */
-    public Optional<String> optional() {
-        return optional;
-    }
-
-    /**
-     * Compares this version to another.
-     *
-     * <p> Each of the components in the <a href="#verStr">version</a> is
-     * compared in the follow order of precedence: version numbers,
-     * pre-release identifiers, build numbers, optional build information. </p>
-     *
-     * <p> Comparison begins by examining the sequence of version numbers.  If
-     * one sequence is shorter than another, then the missing elements of the
-     * shorter sequence are considered to be zero. </p>
-     *
-     * <p> A version with a pre-release identifier is always considered to be
-     * less than a version without one.  Pre-release identifiers are compared
-     * numerically when they consist only of digits, and lexicographically
-     * otherwise.  Numeric identifiers are considered to be less than
-     * non-numeric identifiers.  </p>
-     *
-     * <p> A version without a build number is always less than one with a
-     * build number; otherwise build numbers are compared numerically. </p>
-     *
-     * <p> The optional build information is compared lexicographically.
-     * During this comparison, a version with optional build information is
-     * considered to be greater than a version without one. </p>
-     *
-     * <p> A version is not comparable to any other type of object.
-     *
-     * @param  ob
-     *         The object to be compared
-     *
-     * @return  A negative integer, zero, or a positive integer if this
-     *          {@code Version} is less than, equal to, or greater than the
-     *          given {@code Version}
-     *
-     * @throws  NullPointerException
-     *          If the given object is {@code null}
-     */
-    @Override
-    public int compareTo(Version ob) {
-        return compare(ob, false);
-    }
-
-    /**
-     * Compares this version to another disregarding optional build
-     * information.
-     *
-     * <p> Two versions are compared by examining the version string as
-     * described in {@link #compareTo(Version)} with the exception that the
-     * optional build information is always ignored. </p>
-     *
-     * <p> A version is not comparable to any other type of object.
-     *
-     * @param  ob
-     *         The object to be compared
-     *
-     * @return  A negative integer, zero, or a positive integer if this
-     *          {@code Version} is less than, equal to, or greater than the
-     *          given {@code Version}
-     *
-     * @throws  NullPointerException
-     *          If the given object is {@code null}
-     */
-    public int compareToIgnoreOpt(Version ob) {
-        return compare(ob, true);
-    }
-
-    private int compare(Version ob, boolean ignoreOpt) {
-        if (ob == null)
-            throw new NullPointerException("Invalid argument");
-
-        int ret = compareVersion(ob);
-        if (ret != 0)
-            return ret;
-
-        ret = comparePre(ob);
-        if (ret != 0)
-            return ret;
-
-        ret = compareBuild(ob);
-        if (ret != 0)
-            return ret;
-
-        if (!ignoreOpt)
-            return compareOpt(ob);
-
-        return 0;
-    }
-
-    private int compareVersion(Version ob) {
-        int size = version.size();
-        int oSize = ob.version().size();
-        int min = Math.min(size, oSize);
-        for (int i = 0; i < min; i++) {
-            Integer val = version.get(i);
-            Integer oVal = ob.version().get(i);
-            if (val != oVal)
-                return val - oVal;
-        }
-        if (size != oSize)
-            return size - oSize;
-        return 0;
-    }
-
-    private int comparePre(Version ob) {
-        Optional<String> oPre = ob.pre();
-        if (!pre.isPresent()) {
-            if (oPre.isPresent())
-                return 1;
-        } else {
-            if (!oPre.isPresent())
-                return -1;
-            String val = pre.get();
-            String oVal = oPre.get();
-            if (val.matches("\\d+")) {
-                return (oVal.matches("\\d+")
-                        ? (new BigInteger(val)).compareTo(new BigInteger(oVal))
-                        : -1);
-            } else {
-                return (oVal.matches("\\d+")
-                        ? 1
-                        : val.compareTo(oVal));
-            }
-        }
-        return 0;
-    }
-
-    private int compareBuild(Version ob) {
-        Optional<Integer> oBuild = ob.build();
-        if (oBuild.isPresent()) {
-            return (build.isPresent()
-                   ? build.get().compareTo(oBuild.get())
-                   : 1);
-        } else if (build.isPresent()) {
-            return -1;
-        }
-        return 0;
-    }
-
-    private int compareOpt(Version ob) {
-        Optional<String> oOpt = ob.optional();
-        if (!optional.isPresent()) {
-            if (oOpt.isPresent())
-                return -1;
-        } else {
-            if (!oOpt.isPresent())
-                return 1;
-            return optional.get().compareTo(oOpt.get());
-        }
-        return 0;
-    }
-
-    /**
-     * Returns a string representation of this version.
-     *
-     * @return  The version string
-     */
-    @Override
-    public String toString() {
-        StringBuilder sb
-            = new StringBuilder(version.stream()
-                                .map(Object::toString)
-                                .collect(Collectors.joining(".")));
-        pre.ifPresent(v -> sb.append("-").append(v));
-
-        if (build.isPresent()) {
-            sb.append("+").append(build.get());
-            if (optional.isPresent())
-                sb.append("-").append(optional.get());
-        } else {
-            if (optional.isPresent()) {
-                sb.append(pre.isPresent() ? "-" : "+-");
-                sb.append(optional.get());
-            }
-        }
-
-        return sb.toString();
-    }
-
-    /**
-     * Determines whether this {@code Version} is equal to another object.
-     *
-     * <p> Two {@code Version}s are equal if and only if they represent the
-     * same version string.
-     *
-     * <p> This method satisfies the general contract of the {@link
-     * Object#equals(Object) Object.equals} method. </p>
-     *
-     * @param  ob
-     *         The object to which this {@code Version} is to be compared
-     *
-     * @return  {@code true} if, and only if, the given object is a {@code
-     *          Version} that is identical to this {@code Version}
-     *
-     */
-    @Override
-    public boolean equals(Object ob) {
-        boolean ret = equalsIgnoreOpt(ob);
-        if (!ret)
-            return false;
-
-        Version that = (Version)ob;
-        return (this.optional().equals(that.optional()));
-    }
-
-    /**
-     * Determines whether this {@code Version} is equal to another
-     * disregarding optional build information.
-     *
-     * <p> Two {@code Version}s are equal if and only if they represent the
-     * same version string disregarding the optional build information.
-     *
-     * @param  ob
-     *         The object to which this {@code Version} is to be compared
-     *
-     * @return  {@code true} if, and only if, the given object is a {@code
-     *          Version} that is identical to this {@code Version}
-     *          ignoring the optinal build information
-     *
-     */
-    public boolean equalsIgnoreOpt(Object ob) {
-        if (this == ob)
-            return true;
-        if (!(ob instanceof Version))
-            return false;
-
-        Version that = (Version)ob;
-        return (this.version().equals(that.version())
-                && this.pre().equals(that.pre())
-                && this.build().equals(that.build()));
-    }
-
-    /**
-     * Returns the hash code of this version.
-     *
-     * <p> This method satisfies the general contract of the {@link
-     * Object#hashCode Object.hashCode} method.
-     *
-     * @return  The hashcode of this version
-     */
-    @Override
-    public int hashCode() {
-        int h = 1;
-        int p = 17;
-
-        h = p * h + version.hashCode();
-        h = p * h + pre.hashCode();
-        h = p * h + build.hashCode();
-        h = p * h + optional.hashCode();
-
-        return h;
-    }
-}
diff --git a/jdk/src/java.base/share/classes/module-info.java b/jdk/src/java.base/share/classes/module-info.java
index 9d9fe8ec11f..a1b13336fa2 100644
--- a/jdk/src/java.base/share/classes/module-info.java
+++ b/jdk/src/java.base/share/classes/module-info.java
@@ -81,9 +81,6 @@ module java.base {
     exports javax.security.auth.x500;
     exports javax.security.cert;
 
-    // see JDK-8144062
-    exports jdk;
-
 
     // the service types defined by the APIs in this module
 
diff --git a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/AboutDialog.java b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/AboutDialog.java
index 8e54a707142..b4d4d11d150 100644
--- a/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/AboutDialog.java
+++ b/jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole/AboutDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2016, 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
@@ -181,7 +181,7 @@ public class AboutDialog extends InternalDialog {
     }
 
     private static String getOnlineDocUrl() {
-        String version = Integer.toString(jdk.Version.current().major());
+        String version = Integer.toString(Runtime.version().major());
         return Resources.format(Messages.HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL,
                                 version);
     }
diff --git a/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java b/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java
index 4ddeaff4c78..1e05e84e40f 100644
--- a/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java
+++ b/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,7 @@ package jdk.nio.zipfs;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.Runtime.Version;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -36,7 +37,6 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
-import jdk.Version;
 
 /**
  * Adds aliasing to ZipFileSystem to support multi-release jar files.  An alias map
@@ -69,7 +69,7 @@ class JarFileSystem extends ZipFileSystem {
             if (o instanceof String) {
                 String s = (String)o;
                 if (s.equals("runtime")) {
-                    version = jdk.Version.current().major();
+                    version = Runtime.version().major();
                 } else {
                     version = Integer.parseInt(s);
                 }
diff --git a/jdk/test/jdk/Version/Basic.java b/jdk/test/java/lang/Runtime/Version/Basic.java
similarity index 96%
rename from jdk/test/jdk/Version/Basic.java
rename to jdk/test/java/lang/Runtime/Version/Basic.java
index b94180c8daf..0a60ad256d6 100644
--- a/jdk/test/jdk/Version/Basic.java
+++ b/jdk/test/java/lang/Runtime/Version/Basic.java
@@ -23,12 +23,13 @@
 
 /*
  * @test
- * @summary Unit test for jdk.Version.
- * @bug 8072379
+ * @summary Unit test for java.lang.Runtime.Version.
+ * @bug 8072379 8144062
  */
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.lang.Runtime.Version;
 import java.math.BigInteger;
 import java.util.stream.Collectors;
 import java.util.Arrays;
@@ -36,7 +37,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
-import jdk.Version;
 import static java.lang.System.out;
 
 public class Basic {
@@ -116,8 +116,8 @@ public class Basic {
         tryCatch("1.4142+-",   IAE);
         tryCatch("2.9979+-%",  IAE);
 
-        //// Test for current()
-        testCurrent();
+        //// Test for Runtime.version()
+        testVersion();
 
         //// Test for equals{IgnoreOpt}?(), hashCode(), compareTo{IgnoreOpt}?()
         // compare: after "<" == -1, equal == 0, before ">" == 1
@@ -219,18 +219,19 @@ public class Basic {
             pass();
     }
 
-    private static void testCurrent() {
-        Version current = Version.current();
-        String javaVer = System.getProperty("java.version");
+    private static void testVersion() {
+        Version current = Runtime.version();
+        String javaVer = System.getProperty("java.runtime.version");
 
-        // java.version == $VNUM(\-$PRE)
-        String [] ver = javaVer.split("-");
+        // java.runtime.version == $VNUM(\-$PRE)?(\+$BUILD)?(-$OPT)?
+        String [] jv  = javaVer.split("\\+");
+        String [] ver = jv[0].split("-");
         List<Integer> javaVerVNum
             = Arrays.stream(ver[0].split("\\."))
             .map(v -> Integer.parseInt(v))
             .collect(Collectors.toList());
         if (!javaVerVNum.equals(current.version())) {
-            fail("testCurrent() version()", javaVerVNum.toString(),
+            fail("Runtime.version()", javaVerVNum.toString(),
                  current.version().toString());
         } else {
             pass();
diff --git a/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java b/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java
index e6dd04c23af..54b889f9427 100644
--- a/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java
+++ b/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,7 +23,7 @@
 
 /*
  * @test
- * @bug 8132734
+ * @bug 8132734 8144062
  * @summary Test the extended API and the aliasing additions in JarFile that
  *          support multi-release jar files
  * @library /lib/testlibrary/java/util/jar
@@ -39,7 +39,6 @@ import java.util.Arrays;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
-import jdk.Version;
 
 import static java.util.jar.JarFile.Release;
 
@@ -51,7 +50,7 @@ import org.testng.annotations.Test;
 
 public class MultiReleaseJarAPI {
 
-    static final int MAJOR_VERSION = Version.current().major();
+    static final int MAJOR_VERSION = Runtime.version().major();
 
     String userdir = System.getProperty("user.dir",".");
     CreateMultiReleaseTestJars creator =  new CreateMultiReleaseTestJars();
diff --git a/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarIterators.java b/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarIterators.java
index 59900cf3f7a..60d5063ba71 100644
--- a/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarIterators.java
+++ b/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarIterators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,7 +23,7 @@
 
 /*
  * @test
- * @bug 8132734
+ * @bug 8132734 8144062
  * @summary Test the extended API and the aliasing additions in JarFile that
  *          support multi-release jar files
  * @library /lib/testlibrary/java/util/jar
@@ -42,7 +42,6 @@ import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.stream.Collectors;
 import java.util.zip.ZipFile;
-import jdk.Version;
 
 import static java.util.jar.JarFile.Release;
 
@@ -54,7 +53,7 @@ import org.testng.annotations.Test;
 
 public class MultiReleaseJarIterators {
 
-    static final int MAJOR_VERSION = Version.current().major();
+    static final int MAJOR_VERSION = Runtime.version().major();
 
     String userdir = System.getProperty("user.dir", ".");
     File unversioned = new File(userdir, "unversioned.jar");
diff --git a/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarProperties.java b/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarProperties.java
index 6bf059fb8ea..d729c438a66 100644
--- a/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarProperties.java
+++ b/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,7 +23,7 @@
 
 /*
  * @test
- * @bug 8132734
+ * @bug 8132734 8144062
  * @summary Test the System properties for JarFile that support multi-release jar files
  * @library /lib/testlibrary/java/util/jar
  * @build Compiler JarBuilder CreateMultiReleaseTestJars
@@ -54,7 +54,6 @@ import java.net.URLClassLoader;
 import java.nio.file.Files;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
-import jdk.Version;
 
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
@@ -63,7 +62,7 @@ import org.testng.annotations.Test;
 
 public class MultiReleaseJarProperties {
 
-    static final int MAJOR_VERSION = Version.current().major();
+    static final int MAJOR_VERSION = Runtime.version().major();
 
     final static int ROOTVERSION = 8; // magic number from knowledge of internals
     final static String userdir = System.getProperty("user.dir", ".");
diff --git a/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarSecurity.java b/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarSecurity.java
index 348194a3be3..538742ce192 100644
--- a/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarSecurity.java
+++ b/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarSecurity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,7 +23,7 @@
 
 /*
  * @test
- * @bug 8132734
+ * @bug 8132734 8144062
  * @summary Test potential security related issues
  * @library /lib/testlibrary/java/util/jar
  * @build Compiler JarBuilder CreateMultiReleaseTestJars
@@ -40,7 +40,6 @@ import java.util.Arrays;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.zip.ZipFile;
-import jdk.Version;
 
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
@@ -49,7 +48,7 @@ import org.testng.annotations.Test;
 
 public class MultiReleaseJarSecurity {
 
-    static final int MAJOR_VERSION = Version.current().major();
+    static final int MAJOR_VERSION = Runtime.version().major();
 
     String userdir = System.getProperty("user.dir",".");
     File multirelease = new File(userdir, "multi-release.jar");
diff --git a/jdk/test/jdk/nio/zipfs/MultiReleaseJarTest.java b/jdk/test/jdk/nio/zipfs/MultiReleaseJarTest.java
index 6f87dc68813..7f5f37b44fa 100644
--- a/jdk/test/jdk/nio/zipfs/MultiReleaseJarTest.java
+++ b/jdk/test/jdk/nio/zipfs/MultiReleaseJarTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,7 +23,7 @@
 
 /*
  * @test
- * @bug 8144355
+ * @bug 8144355 8144062
  * @summary Test aliasing additions to ZipFileSystem for multi-release jar files
  * @library /lib/testlibrary/java/util/jar
  * @build Compiler JarBuilder CreateMultiReleaseTestJars
@@ -34,17 +34,17 @@ import java.io.IOException;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
+import java.lang.Runtime.Version;
 import java.net.URI;
 import java.nio.file.*;
 import java.util.HashMap;
 import java.util.Map;
-import jdk.Version;
 
 import org.testng.Assert;
 import org.testng.annotations.*;
 
 public class MultiReleaseJarTest {
-    final private int MAJOR_VERSION = Version.current().major();
+    final private int MAJOR_VERSION = Runtime.version().major();
 
     final private String userdir = System.getProperty("user.dir",".");
     final private Map<String,String> stringEnv = new HashMap<>();
diff --git a/jdk/test/sun/net/www/protocol/jar/MultiReleaseJarURLConnection.java b/jdk/test/sun/net/www/protocol/jar/MultiReleaseJarURLConnection.java
index 0f5545707a4..f6b01a08d40 100644
--- a/jdk/test/sun/net/www/protocol/jar/MultiReleaseJarURLConnection.java
+++ b/jdk/test/sun/net/www/protocol/jar/MultiReleaseJarURLConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,7 +23,7 @@
 
 /*
  * @test
- * @bug 8132734
+ * @bug 8132734 8144062
  * @summary Test that URL connections to multi-release jars can be runtime versioned
  * @library /lib/testlibrary/java/util/jar
  * @build Compiler JarBuilder CreateMultiReleaseTestJars SimpleHttpServer
@@ -43,8 +43,6 @@ import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.jar.JarFile;
 
-import jdk.Version;
-
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -94,7 +92,7 @@ public class MultiReleaseJarURLConnection {
     public void testRuntimeVersioning(String style, String file) throws Exception {
         String urlFile = "jar:file:" + file + "!/";
         String baseUrlEntry = urlFile + "version/Version.java";
-        String rtreturn = "return " + Version.current().major();
+        String rtreturn = "return " + Runtime.version().major();
 
         Assert.assertTrue(readAndCompare(new URL(baseUrlEntry), "return 8"));
         // #runtime is "magic" for a multi-release jar, but not for unversioned jar
@@ -109,7 +107,7 @@ public class MultiReleaseJarURLConnection {
         if (style.equals("unversioned")) return;
 
         // direct access to versioned entry
-        String versUrlEntry = urlFile + "META-INF/versions/" + Version.current().major()
+        String versUrlEntry = urlFile + "META-INF/versions/" + Runtime.version().major()
                 + "/version/Version.java";
         Assert.assertTrue(readAndCompare(new URL(versUrlEntry), rtreturn));
         // adding any fragment does not change things
@@ -187,7 +185,7 @@ public class MultiReleaseJarURLConnection {
         MethodType mt = MethodType.methodType(int.class);
         MethodHandle mh = MethodHandles.lookup().findVirtual(vcls, "getVersion", mt);
         Assert.assertEquals((int)mh.invoke(vcls.newInstance()),
-                style.equals("unversioned") ? 8 : Version.current().major());
+                style.equals("unversioned") ? 8 : Runtime.version().major());
 
         // now get a resource and verify that we don't have a fragment attached
         URL vclsUrl = vcls.getResource("/version/Version.class");
@@ -206,7 +204,7 @@ public class MultiReleaseJarURLConnection {
         if (style.equals("unversioned")) {
             suffix = ".jar!/version/Version.class";
         } else {
-            suffix = ".jar!/META-INF/versions/" + Version.current().major()
+            suffix = ".jar!/META-INF/versions/" + Runtime.version().major()
                     + "/version/Version.class";
         }
         Assert.assertTrue(rep.endsWith(suffix));

From 6f2785f74116747efbb319fc6e26d408f71da7b8 Mon Sep 17 00:00:00 2001
From: Anthony Scarpino <ascarpino@openjdk.org>
Date: Thu, 19 May 2016 16:05:33 -0700
Subject: [PATCH 158/228] 8155847: SHA groups needed for
 jdk.security.provider.preferred

Reviewed-by: valeriep, mullan
---
 .../sun/security/jca/ProviderList.java        | 93 +++++++++++++++----
 .../share/conf/security/java.security         | 37 +++++---
 .../security/jca/PreferredProviderTest.java   | 77 ++++++++++++++-
 3 files changed, 171 insertions(+), 36 deletions(-)

diff --git a/jdk/src/java.base/share/classes/sun/security/jca/ProviderList.java b/jdk/src/java.base/share/classes/sun/security/jca/ProviderList.java
index 9082670609e..971c4930b7e 100644
--- a/jdk/src/java.base/share/classes/sun/security/jca/ProviderList.java
+++ b/jdk/src/java.base/share/classes/sun/security/jca/ProviderList.java
@@ -650,12 +650,29 @@ public final class ProviderList {
         }
     }
 
+    /* Defined Groups for jdk.security.provider.preferred */
+    private static final String SHA2Group[] = { "SHA-224", "SHA-256",
+            "SHA-384", "SHA-512", "SHA-512/224", "SHA-512/256" };
+    private static final String HmacSHA2Group[] = { "HmacSHA224",
+            "HmacSHA256", "HmacSHA384", "HmacSHA512"};
+    private static final String SHA2RSAGroup[] = { "SHA224withRSA",
+            "SHA256withRSA", "SHA384withRSA", "SHA512withRSA"};
+    private static final String SHA2DSAGroup[] = { "SHA224withDSA",
+            "SHA256withDSA", "SHA384withDSA", "SHA512withDSA"};
+    private static final String SHA2ECDSAGroup[] = { "SHA224withECDSA",
+            "SHA256withECDSA", "SHA384withECDSA", "SHA512withECDSA"};
+    private static final String SHA3Group[] = { "SHA3-224", "SHA3-256",
+            "SHA3-384", "SHA3-512" };
+    private static final String HmacSHA3Group[] = { "HmacSHA3-224",
+            "HmacSHA3-256", "HmacSHA3-384", "HmacSHA3-512"};
+
     // Individual preferred property entry from jdk.security.provider.preferred
-    private class PreferredEntry {
-        String type = null;
-        String algorithm;
-        String provider;
-        String alternateName = null;
+    private static class PreferredEntry {
+        private String type = null;
+        private String algorithm;
+        private String provider;
+        private String alternateNames[] = null;
+        private boolean group = false;
 
         PreferredEntry(String t, String p) {
             int i = t.indexOf('.');
@@ -667,47 +684,83 @@ public final class ProviderList {
             }
 
             provider = p;
-            if (algorithm.compareToIgnoreCase("SHA1") == 0) {
-                alternateName = "SHA-1";
+            // Group definitions
+            if (type != null && type.compareToIgnoreCase("Group") == 0) {
+                // Currently intrinsic algorithm groups
+                if (algorithm.compareToIgnoreCase("SHA2") == 0) {
+                    alternateNames = SHA2Group;
+                } else if (algorithm.compareToIgnoreCase("HmacSHA2") == 0) {
+                    alternateNames = HmacSHA2Group;
+                } else if (algorithm.compareToIgnoreCase("SHA2RSA") == 0) {
+                    alternateNames = SHA2RSAGroup;
+                } else if (algorithm.compareToIgnoreCase("SHA2DSA") == 0) {
+                    alternateNames = SHA2DSAGroup;
+                } else if (algorithm.compareToIgnoreCase("SHA2ECDSA") == 0) {
+                    alternateNames = SHA2ECDSAGroup;
+                } else if (algorithm.compareToIgnoreCase("SHA3") == 0) {
+                    alternateNames = SHA3Group;
+                } else if (algorithm.compareToIgnoreCase("HmacSHA3") == 0) {
+                    alternateNames = HmacSHA3Group;
+                }
+                if (alternateNames != null) {
+                    group = true;
+                }
+
+            // If the algorithm name given is SHA1
+            } else if (algorithm.compareToIgnoreCase("SHA1") == 0) {
+                alternateNames = new String[] { "SHA-1" };
             } else if (algorithm.compareToIgnoreCase("SHA-1") == 0) {
-                alternateName = "SHA1";
+                alternateNames = new String[] { "SHA1" };
             }
         }
 
         boolean match(String t, String a) {
             if (debug != null) {
-                debug.println("Config match:  " + toString() + " == [" + t +
-                        ", " + a + "]");
+                debug.println("Config check:  " + toString() + " == " +
+                        print(t, a, null));
             }
 
             // Compare service type if configured
-            if (type != null && type.compareToIgnoreCase(t) != 0) {
+            if (type != null && !group && type.compareToIgnoreCase(t) != 0) {
                 return false;
             }
 
             // Compare the algorithm string.
-            if (a.compareToIgnoreCase(algorithm) == 0) {
+            if (!group && a.compareToIgnoreCase(algorithm) == 0) {
                 if (debug != null) {
-                    debug.println("Config entry found:  " + toString());
+                    debug.println("Config entry matched:  " + toString());
                 }
                 return true;
             }
 
-            if (alternateName != null &&
-                    a.compareToIgnoreCase(alternateName) == 0) {
-                if (debug != null) {
-                    debug.println("Config entry found (alternateName):  " +
-                            toString());
+            if (alternateNames != null) {
+                for (String alt : alternateNames) {
+                    if (debug != null) {
+                        debug.println("AltName check:  " + print(type, alt,
+                                provider));
+                    }
+                    if (a.compareToIgnoreCase(alt) == 0) {
+                        if (debug != null) {
+                            debug.println("AltName entry matched:  " +
+                                    provider);
+                        }
+                        return true;
+                    }
                 }
-                return true;
             }
 
             // No match
             return false;
         }
 
+        // Print debugging output of PreferredEntry
+        private String print(String t, String a, String p) {
+            return "[" + ((t != null) ? t : "" ) + ", " + a +
+                    ((p != null) ? " : " + p : "" ) + "] ";
+        }
+
         public String toString() {
-            return "[" + type + ", " + algorithm + " : " + provider + "] ";
+            return print(type, algorithm, provider);
         }
     }
 
diff --git a/jdk/src/java.base/share/conf/security/java.security b/jdk/src/java.base/share/conf/security/java.security
index 72c381b9747..caf94448f25 100644
--- a/jdk/src/java.base/share/conf/security/java.security
+++ b/jdk/src/java.base/share/conf/security/java.security
@@ -105,15 +105,30 @@ security.provider.tbd=SunPKCS11
 # The provider is the name of the provider. Any provider that does not
 # also appear in the registered list will be ignored.
 #
+# There is a special serviceType for this property only to group a set of
+# algorithms together. The type is "Group" and is followed by an algorithm
+# keyword. Groups are to simplify and lessen the entries on the property
+# line. Current groups are:
+#   Group.SHA2 = SHA-224, SHA-256, SHA-384, SHA-512, SHA-512/224, SHA-512/256
+#   Group.HmacSHA2 = HmacSHA224, HmacSHA256, HmacSHA384, HmacSHA512
+#   Group.SHA2RSA = SHA224withRSA, SHA256withRSA, SHA384withRSA, SHA512withRSA
+#   Group.SHA2DSA = SHA224withDSA, SHA256withDSA, SHA384withDSA, SHA512withDSA
+#   Group.SHA2ECDSA = SHA224withECDSA, SHA256withECDSA, SHA384withECDSA, \
+#                     SHA512withECDSA
+#   Group.SHA3 = SHA3-224, SHA3-256, SHA3-384, SHA3-512
+#   Group.HmacSHA3 = HmacSHA3-224, HmacSHA3-256, HmacSHA3-384, HmacSHA3-512
+#
 # Example:
 #   jdk.security.provider.preferred=AES/GCM/NoPadding:SunJCE, \
-#         MessageDigest.SHA-256:SUN
+#         MessageDigest.SHA-256:SUN, Group.HmacSHA2:SunJCE
 #ifdef solaris-sparc
-jdk.security.provider.preferred=AES:SunJCE, SHA1:SUN, SHA-224:SUN, \
-      SHA-256:SUN, SHA-384:SUN, SHA-512:SUN
+jdk.security.provider.preferred=AES:SunJCE, SHA1:SUN, Group.SHA2:SUN, \
+      HmacSHA1:SunJCE, Group.HmacSHA2:SunJCE
 #endif
 #ifdef solaris-x86
-jdk.security.provider.preferred=AES:SunJCE, RSA:SunRsaSign
+jdk.security.provider.preferred=AES:SunJCE, SHA1:SUN, Group.SHA2:SUN, \
+      HmacSHA1:SunJCE, Group.HmacSHA2:SunJCE, RSA:SunRsaSign, \
+      SHA1withRSA:SunRsaSign, Group.SHA2RSA:SunRsaSign
 #endif
 
 
@@ -613,14 +628,14 @@ krb5.kdc.bad.policy = tryLast
 # "CertConstraint" specifies additional constraints for
 # certificates that contain algorithms that are restricted:
 #
-#   "jdkCA" prohibits the specified algorithm only if the algorithm is used
-#     in a certificate chain that terminates at a marked trust anchor in the
-#     lib/security/cacerts keystore.  All other chains are not affected.
-#     If the jdkCA constraint is not set, then all chains using the
-#     specified algorithm are restricted.  jdkCA may only be used once in
+#   "jdkCA" prohibits the specified algorithm only if the algorithm is used
+#     in a certificate chain that terminates at a marked trust anchor in the
+#     lib/security/cacerts keystore.  All other chains are not affected.
+#     If the jdkCA constraint is not set, then all chains using the
+#     specified algorithm are restricted.  jdkCA may only be used once in
 #     a DisabledAlgorithm expression.
-#     Example:  To apply this constraint to SHA-1 certificates, include
-#     the following:  "SHA1 jdkCA"
+#     Example:  To apply this constraint to SHA-1 certificates, include
+#     the following:  "SHA1 jdkCA"
 #
 # When an algorithm must satisfy more than one constraint, it must be
 # delimited by an ampersand '&'.  For example, to restrict certificates in a
diff --git a/jdk/test/sun/security/jca/PreferredProviderTest.java b/jdk/test/sun/security/jca/PreferredProviderTest.java
index 56aa4a0210e..72026222fee 100644
--- a/jdk/test/sun/security/jca/PreferredProviderTest.java
+++ b/jdk/test/sun/security/jca/PreferredProviderTest.java
@@ -25,15 +25,17 @@ import java.security.MessageDigest;
 import java.security.KeyFactory;
 import java.security.NoSuchAlgorithmException;
 import java.security.Security;
+import java.security.Signature;
 import java.security.Provider;
 import java.util.Arrays;
 import java.util.List;
 import javax.crypto.Cipher;
+import javax.crypto.Mac;
 import javax.crypto.NoSuchPaddingException;
 
 /**
  * @test
- * @bug 8076359 8133151 8145344 8150512
+ * @bug 8076359 8133151 8145344 8150512 8155847
  * @summary Test the value for new jdk.security.provider.preferred
  *          security property
  */
@@ -61,8 +63,8 @@ public class PreferredProviderTest {
             //java.security file which will be verified.
             switch (type) {
                 case "sparcv9":
-                    preferredProp = "AES:SunJCE, SHA1:SUN, SHA-224:SUN,"
-                            + " SHA-256:SUN, SHA-384:SUN, SHA-512:SUN";
+                    preferredProp = "AES:SunJCE, SHA1:SUN, Group.SHA2:SUN, " +
+                            "HmacSHA1:SunJCE, Group.HmacSHA2:SunJCE";
                     verifyPreferredProviderProperty(os, type, preferredProp);
 
                     verifyDigestProvider(os, type, Arrays.asList(
@@ -71,14 +73,51 @@ public class PreferredProviderTest {
                             new DataTuple("SHA-224", "SUN"),
                             new DataTuple("SHA-256", "SUN"),
                             new DataTuple("SHA-384", "SUN"),
-                            new DataTuple("SHA-512", "SUN")));
+                            new DataTuple("SHA-512", "SUN"),
+                            new DataTuple("SHA-512/224", "SUN"),
+                            new DataTuple("SHA-512/256", "SUN")));
+
+                    verifyMacProvider(os, type, Arrays.asList(
+                            new DataTuple("HmacSHA1", "SunJCE"),
+                            new DataTuple("HmacSHA224", "SunJCE"),
+                            new DataTuple("HmacSHA256", "SunJCE"),
+                            new DataTuple("HmacSHA384", "SunJCE"),
+                            new DataTuple("HmacSHA512", "SunJCE")));
                     break;
                 case "amd64":
-                    preferredProp = "AES:SunJCE, RSA:SunRsaSign";
+                    preferredProp = "AES:SunJCE, SHA1:SUN, Group.SHA2:SUN, " +
+                            "HmacSHA1:SunJCE, Group.HmacSHA2:SunJCE, " +
+                            "RSA:SunRsaSign, SHA1withRSA:SunRsaSign, " +
+                            "Group.SHA2RSA:SunRsaSign";
+
                     verifyPreferredProviderProperty(os, type, preferredProp);
 
                     verifyKeyFactoryProvider(os, type, Arrays.asList(
                             new DataTuple("RSA", "SunRsaSign")));
+
+                    verifyDigestProvider(os, type, Arrays.asList(
+                            new DataTuple("SHA1", "SUN"),
+                            new DataTuple("SHA-1", "SUN"),
+                            new DataTuple("SHA-224", "SUN"),
+                            new DataTuple("SHA-256", "SUN"),
+                            new DataTuple("SHA-384", "SUN"),
+                            new DataTuple("SHA-512", "SUN"),
+                            new DataTuple("SHA-512/224", "SUN"),
+                            new DataTuple("SHA-512/256", "SUN")));
+
+                    verifyMacProvider(os, type, Arrays.asList(
+                            new DataTuple("HmacSHA1", "SunJCE"),
+                            new DataTuple("HmacSHA224", "SunJCE"),
+                            new DataTuple("HmacSHA256", "SunJCE"),
+                            new DataTuple("HmacSHA384", "SunJCE"),
+                            new DataTuple("HmacSHA512", "SunJCE")));
+
+                    verifySignatureProvider(os, type, Arrays.asList(
+                            new DataTuple("SHA1withRSA", "SunRsaSign"),
+                            new DataTuple("SHA224withRSA", "SunRsaSign"),
+                            new DataTuple("SHA256withRSA", "SunRsaSign"),
+                            new DataTuple("SHA384withRSA", "SunRsaSign"),
+                            new DataTuple("SHA512withRSA", "SunRsaSign")));
                     break;
             }
             verifyDigestProvider(os, type, Arrays.asList(
@@ -99,6 +138,8 @@ public class PreferredProviderTest {
         String preferredProvider
                 = Security.getProperty("jdk.security.provider.preferred");
         if (!preferredProvider.equals(preferred)) {
+            System.out.println("Expected: " + preferred + "\nResult: " +
+                    preferredProvider);
             throw new RuntimeException(String.format(
                     "Test Failed: wrong jdk.security.provider.preferred value "
                     + "on %s-%s", os, arch));
@@ -120,6 +161,19 @@ public class PreferredProviderTest {
                 "Preferred MessageDigest algorithm verification successful.");
     }
 
+    private static void verifyMacProvider(String os, String arch,
+            List<DataTuple> algoProviders) throws NoSuchAlgorithmException {
+        for (DataTuple dataTuple : algoProviders) {
+            System.out.printf(
+                    "Verifying Mac for '%s'%n", dataTuple.algorithm);
+            Mac mac = Mac.getInstance(dataTuple.algorithm);
+            matchProvider(mac.getProvider(), dataTuple.provider,
+                    dataTuple.algorithm, os, arch);
+        }
+        System.out.println(
+                "Preferred Mac algorithm verification successful.");
+    }
+
     private static void verifyKeyFactoryProvider(String os, String arch,
             List<DataTuple> algoProviders) throws NoSuchAlgorithmException {
         for (DataTuple dataTuple : algoProviders) {
@@ -133,6 +187,19 @@ public class PreferredProviderTest {
                 "Preferred KeyFactory algorithm verification successful.");
     }
 
+    private static void verifySignatureProvider(String os, String arch,
+            List<DataTuple> algoProviders) throws NoSuchAlgorithmException {
+        for (DataTuple dataTuple : algoProviders) {
+            System.out.printf(
+                    "Verifying Signature for '%s'%n", dataTuple.algorithm);
+            Signature si = Signature.getInstance(dataTuple.algorithm);
+            matchProvider(si.getProvider(), dataTuple.provider,
+                    dataTuple.algorithm, os, arch);
+        }
+        System.out.println(
+                "Preferred Signature algorithm verification successful.");
+    }
+
     private static void matchProvider(Provider provider, String expected,
             String algo, String os, String arch) {
         if (!provider.getName().equals(expected)) {

From 0260528ef92c4cdfd14198639b78e8e6d0c81613 Mon Sep 17 00:00:00 2001
From: Brent Christian <bchristi@openjdk.org>
Date: Thu, 19 May 2016 16:25:35 -0700
Subject: [PATCH 159/228] 8029891: Deadlock detected in
 java/lang/ClassLoader/deadlock/GetResource.java

Properties now stores values in an internal ConcurrentHashMap

Reviewed-by: mchung, dholmes, plevart
---
 .../share/classes/java/util/Hashtable.java    |  68 +++-
 .../share/classes/java/util/Properties.java   | 357 ++++++++++++++++--
 jdk/test/ProblemList.txt                      |   2 -
 .../ClassLoader/deadlock/GetResource.java     |   8 +-
 .../java/util/Properties/CheckOverrides.java  | 106 ++++++
 .../util/Properties/CheckUnsynchronized.java  |  61 +++
 .../Properties/PropertiesSerialization.java   | 148 ++++++++
 7 files changed, 702 insertions(+), 48 deletions(-)
 create mode 100644 jdk/test/java/util/Properties/CheckOverrides.java
 create mode 100644 jdk/test/java/util/Properties/CheckUnsynchronized.java
 create mode 100644 jdk/test/java/util/Properties/PropertiesSerialization.java

diff --git a/jdk/src/java.base/share/classes/java/util/Hashtable.java b/jdk/src/java.base/share/classes/java/util/Hashtable.java
index 6ad2f3a933c..b541ca12a06 100644
--- a/jdk/src/java.base/share/classes/java/util/Hashtable.java
+++ b/jdk/src/java.base/share/classes/java/util/Hashtable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2016, 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
@@ -229,6 +229,14 @@ public class Hashtable<K,V>
         putAll(t);
     }
 
+    /**
+     * A constructor chained from {@link Properties} keeps Hashtable fields
+     * uninitialized since they are not used.
+     *
+     * @param dummy a dummy parameter
+     */
+    Hashtable(Void dummy) {}
+
     /**
      * Returns the number of keys in this hashtable.
      *
@@ -549,18 +557,23 @@ public class Hashtable<K,V>
      * @return  a clone of the hashtable
      */
     public synchronized Object clone() {
+        Hashtable<?,?> t = cloneHashtable();
+        t.table = new Entry<?,?>[table.length];
+        for (int i = table.length ; i-- > 0 ; ) {
+            t.table[i] = (table[i] != null)
+                ? (Entry<?,?>) table[i].clone() : null;
+        }
+        t.keySet = null;
+        t.entrySet = null;
+        t.values = null;
+        t.modCount = 0;
+        return t;
+    }
+
+    /** Calls super.clone() */
+    final Hashtable<?,?> cloneHashtable() {
         try {
-            Hashtable<?,?> t = (Hashtable<?,?>)super.clone();
-            t.table = new Entry<?,?>[table.length];
-            for (int i = table.length ; i-- > 0 ; ) {
-                t.table[i] = (table[i] != null)
-                    ? (Entry<?,?>) table[i].clone() : null;
-            }
-            t.keySet = null;
-            t.entrySet = null;
-            t.values = null;
-            t.modCount = 0;
-            return t;
+            return (Hashtable<?,?>)super.clone();
         } catch (CloneNotSupportedException e) {
             // this shouldn't happen, since we are Cloneable
             throw new InternalError(e);
@@ -1189,6 +1202,15 @@ public class Hashtable<K,V>
      */
     private void writeObject(java.io.ObjectOutputStream s)
             throws IOException {
+        writeHashtable(s);
+    }
+
+    /**
+     * Perform serialization of the Hashtable to an ObjectOutputStream.
+     * The Properties class overrides this method.
+     */
+    void writeHashtable(java.io.ObjectOutputStream s)
+            throws IOException {
         Entry<Object, Object> entryStack = null;
 
         synchronized (this) {
@@ -1218,12 +1240,30 @@ public class Hashtable<K,V>
         }
     }
 
+    /**
+     * Called by Properties to write out a simulated threshold and loadfactor.
+     */
+    final void defaultWriteHashtable(java.io.ObjectOutputStream s, int length,
+            float loadFactor) throws IOException {
+        this.threshold = (int)Math.min(length * loadFactor, MAX_ARRAY_SIZE + 1);
+        this.loadFactor = loadFactor;
+        s.defaultWriteObject();
+    }
+
     /**
      * Reconstitute the Hashtable from a stream (i.e., deserialize it).
      */
     private void readObject(java.io.ObjectInputStream s)
-         throws IOException, ClassNotFoundException
-    {
+            throws IOException, ClassNotFoundException {
+        readHashtable(s);
+    }
+
+    /**
+     * Perform deserialization of the Hashtable from an ObjectInputStream.
+     * The Properties class overrides this method.
+     */
+    void readHashtable(java.io.ObjectInputStream s)
+            throws IOException, ClassNotFoundException {
         // Read in the threshold and loadFactor
         s.defaultReadObject();
 
diff --git a/jdk/src/java.base/share/classes/java/util/Properties.java b/jdk/src/java.base/share/classes/java/util/Properties.java
index 1eddbab3740..c2b93d250bf 100644
--- a/jdk/src/java.base/share/classes/java/util/Properties.java
+++ b/jdk/src/java.base/share/classes/java/util/Properties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2016, 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,6 +34,13 @@ import java.io.Reader;
 import java.io.Writer;
 import java.io.OutputStreamWriter;
 import java.io.BufferedWriter;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.StreamCorruptedException;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+import java.util.function.Function;
 
 import jdk.internal.util.xml.PropertiesDefaultHandler;
 
@@ -60,6 +67,13 @@ import jdk.internal.util.xml.PropertiesDefaultHandler;
  * object that contains a non-{@code String} key.
  *
  * <p>
+ * The iterators returned by the {@code iterator} method of this class's
+ * "collection views" (that is, {@code entrySet()}, {@code keySet()}, and
+ * {@code values()}) may not fail-fast (unlike the Hashtable implementation).
+ * These iterators are guaranteed to traverse elements as they existed upon
+ * construction exactly once, and may (but are not guaranteed to) reflect any
+ * modifications subsequent to construction.
+ * <p>
  * The {@link #load(java.io.Reader) load(Reader)} {@code /}
  * {@link #store(java.io.Writer, java.lang.String) store(Writer, String)}
  * methods load and store properties from and to a character based stream
@@ -127,6 +141,15 @@ class Properties extends Hashtable<Object,Object> {
      */
     protected Properties defaults;
 
+    /**
+     * Properties does not store values in its inherited Hashtable, but instead
+     * in an internal ConcurrentHashMap.  Synchronization is omitted from
+     * simple read operations.  Writes and bulk operations remain synchronized,
+     * as in Hashtable.
+     */
+    private transient ConcurrentHashMap<Object, Object> map =
+            new ConcurrentHashMap<>(8);
+
     /**
      * Creates an empty property list with no default values.
      */
@@ -140,6 +163,9 @@ class Properties extends Hashtable<Object,Object> {
      * @param   defaults   the defaults.
      */
     public Properties(Properties defaults) {
+        // use package-private constructor to
+        // initialize unused fields with dummy values
+        super((Void) null);
         this.defaults = defaults;
     }
 
@@ -826,9 +852,9 @@ class Properties extends Hashtable<Object,Object> {
         bw.write("#" + new Date().toString());
         bw.newLine();
         synchronized (this) {
-            for (Enumeration<?> e = keys(); e.hasMoreElements();) {
-                String key = (String)e.nextElement();
-                String val = (String)get(key);
+            for (Map.Entry<Object, Object> e : entrySet()) {
+                String key = (String)e.getKey();
+                String val = (String)e.getValue();
                 key = saveConvert(key, true, escUnicode);
                 /* No need to escape embedded and trailing spaces for value, hence
                  * pass false to flag.
@@ -967,7 +993,7 @@ class Properties extends Hashtable<Object,Object> {
      * @see     #defaults
      */
     public String getProperty(String key) {
-        Object oval = super.get(key);
+        Object oval = map.get(key);
         String sval = (oval instanceof String) ? (String)oval : null;
         return ((sval == null) && (defaults != null)) ? defaults.getProperty(key) : sval;
     }
@@ -1029,7 +1055,7 @@ class Properties extends Hashtable<Object,Object> {
      * @since   1.6
      */
     public Set<String> stringPropertyNames() {
-        Hashtable<String, String> h = new Hashtable<>();
+        Map<String, String> h = new HashMap<>();
         enumerateStringProperties(h);
         return h.keySet();
     }
@@ -1044,11 +1070,11 @@ class Properties extends Hashtable<Object,Object> {
      */
     public void list(PrintStream out) {
         out.println("-- listing properties --");
-        Hashtable<String,Object> h = new Hashtable<>();
+        Map<String, Object> h = new HashMap<>();
         enumerate(h);
-        for (Enumeration<String> e = h.keys() ; e.hasMoreElements() ;) {
-            String key = e.nextElement();
-            String val = (String)h.get(key);
+        for (Map.Entry<String, Object> e : h.entrySet()) {
+            String key = e.getKey();
+            String val = (String)e.getValue();
             if (val.length() > 40) {
                 val = val.substring(0, 37) + "...";
             }
@@ -1072,11 +1098,11 @@ class Properties extends Hashtable<Object,Object> {
      */
     public void list(PrintWriter out) {
         out.println("-- listing properties --");
-        Hashtable<String,Object> h = new Hashtable<>();
+        Map<String, Object> h = new HashMap<>();
         enumerate(h);
-        for (Enumeration<String> e = h.keys() ; e.hasMoreElements() ;) {
-            String key = e.nextElement();
-            String val = (String)h.get(key);
+        for (Map.Entry<String, Object> e : h.entrySet()) {
+            String key = e.getKey();
+            String val = (String)e.getValue();
             if (val.length() > 40) {
                 val = val.substring(0, 37) + "...";
             }
@@ -1085,33 +1111,33 @@ class Properties extends Hashtable<Object,Object> {
     }
 
     /**
-     * Enumerates all key/value pairs in the specified hashtable.
-     * @param h the hashtable
+     * Enumerates all key/value pairs into the specified Map.
+     * @param h the Map
      * @throws ClassCastException if any of the property keys
      *         is not of String type.
      */
-    private synchronized void enumerate(Hashtable<String,Object> h) {
+    private void enumerate(Map<String, Object> h) {
         if (defaults != null) {
             defaults.enumerate(h);
         }
-        for (Enumeration<?> e = keys() ; e.hasMoreElements() ;) {
-            String key = (String)e.nextElement();
-            h.put(key, get(key));
+        for (Map.Entry<Object, Object> e : entrySet()) {
+            String key = (String)e.getKey();
+            h.put(key, e.getValue());
         }
     }
 
     /**
-     * Enumerates all key/value pairs in the specified hashtable
+     * Enumerates all key/value pairs into the specified Map
      * and omits the property if the key or value is not a string.
-     * @param h the hashtable
+     * @param h the Map
      */
-    private synchronized void enumerateStringProperties(Hashtable<String, String> h) {
+    private void enumerateStringProperties(Map<String, String> h) {
         if (defaults != null) {
             defaults.enumerateStringProperties(h);
         }
-        for (Enumeration<?> e = keys() ; e.hasMoreElements() ;) {
-            Object k = e.nextElement();
-            Object v = get(k);
+        for (Map.Entry<Object, Object> e : entrySet()) {
+            Object k = e.getKey();
+            Object v = e.getValue();
             if (k instanceof String && v instanceof String) {
                 h.put((String) k, (String) v);
             }
@@ -1130,4 +1156,283 @@ class Properties extends Hashtable<Object,Object> {
     private static final char[] hexDigit = {
         '0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'
     };
+
+    //
+    // Hashtable methods overridden and delegated to a ConcurrentHashMap instance
+
+    @Override
+    public int size() {
+        return map.size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return map.isEmpty();
+    }
+
+    @Override
+    public Enumeration<Object> keys() {
+        // CHM.keys() returns Iterator w/ remove() - instead wrap keySet()
+        return Collections.enumeration(map.keySet());
+    }
+
+    @Override
+    public Enumeration<Object> elements() {
+        // CHM.elements() returns Iterator w/ remove() - instead wrap values()
+        return Collections.enumeration(map.values());
+    }
+
+    @Override
+    public boolean contains(Object value) {
+        return map.contains(value);
+    }
+
+    @Override
+    public boolean containsValue(Object value) {
+        return map.containsValue(value);
+    }
+
+    @Override
+    public boolean containsKey(Object key) {
+        return map.containsKey(key);
+    }
+
+    @Override
+    public Object get(Object key) {
+        return map.get(key);
+    }
+
+    @Override
+    public synchronized Object put(Object key, Object value) {
+        return map.put(key, value);
+    }
+
+    @Override
+    public synchronized Object remove(Object key) {
+        return map.remove(key);
+    }
+
+    @Override
+    public synchronized void putAll(Map<?, ?> t) {
+        map.putAll(t);
+    }
+
+    @Override
+    public synchronized void clear() {
+        map.clear();
+    }
+
+    @Override
+    public synchronized String toString() {
+        return map.toString();
+    }
+
+    @Override
+    public Set<Object> keySet() {
+        return Collections.synchronizedSet(map.keySet(), this);
+    }
+
+    @Override
+    public Collection<Object> values() {
+        return Collections.synchronizedCollection(map.values(), this);
+    }
+
+    @Override
+    public Set<Map.Entry<Object, Object>> entrySet() {
+        return Collections.synchronizedSet(new EntrySet(map.entrySet()), this);
+    }
+
+    /*
+     * Properties.entrySet() should not support add/addAll, however
+     * ConcurrentHashMap.entrySet() provides add/addAll.  This class wraps the
+     * Set returned from CHM, changing add/addAll to throw UOE.
+     */
+    private static class EntrySet implements Set<Map.Entry<Object, Object>> {
+        private Set<Map.Entry<Object,Object>> entrySet;
+
+        private EntrySet(Set<Map.Entry<Object, Object>> entrySet) {
+            this.entrySet = entrySet;
+        }
+
+        @Override public int size() { return entrySet.size(); }
+        @Override public boolean isEmpty() { return entrySet.isEmpty(); }
+        @Override public boolean contains(Object o) { return entrySet.contains(o); }
+        @Override public Object[] toArray() { return entrySet.toArray(); }
+        @Override public <T> T[] toArray(T[] a) { return entrySet.toArray(a); }
+        @Override public void clear() { entrySet.clear(); }
+        @Override public boolean remove(Object o) { return entrySet.remove(o); }
+
+        @Override
+        public boolean add(Map.Entry<Object, Object> e) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean addAll(Collection<? extends Map.Entry<Object, Object>> c) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean containsAll(Collection<?> c) {
+            return entrySet.containsAll(c);
+        }
+
+        @Override
+        public boolean removeAll(Collection<?> c) {
+            return entrySet.removeAll(c);
+        }
+
+        @Override
+        public boolean retainAll(Collection<?> c) {
+            return entrySet.retainAll(c);
+        }
+
+        @Override
+        public Iterator<Map.Entry<Object, Object>> iterator() {
+            return entrySet.iterator();
+        }
+    }
+
+    @Override
+    public synchronized boolean equals(Object o) {
+        return map.equals(o);
+    }
+
+    @Override
+    public synchronized int hashCode() {
+        return map.hashCode();
+    }
+
+    @Override
+    public Object getOrDefault(Object key, Object defaultValue) {
+        return map.getOrDefault(key, defaultValue);
+    }
+
+    @Override
+    public synchronized void forEach(BiConsumer<? super Object, ? super Object> action) {
+        map.forEach(action);
+    }
+
+    @Override
+    public synchronized void replaceAll(BiFunction<? super Object, ? super Object, ?> function) {
+        map.replaceAll(function);
+    }
+
+    @Override
+    public synchronized Object putIfAbsent(Object key, Object value) {
+        return map.putIfAbsent(key, value);
+    }
+
+    @Override
+    public synchronized boolean remove(Object key, Object value) {
+        return map.remove(key, value);
+    }
+
+    /** @hidden */
+    @Override
+    public synchronized boolean replace(Object key, Object oldValue, Object newValue) {
+        return map.replace(key, oldValue, newValue);
+    }
+
+    @Override
+    public synchronized Object replace(Object key, Object value) {
+        return map.replace(key, value);
+    }
+
+    @Override
+    public synchronized Object computeIfAbsent(Object key,
+            Function<? super Object, ?> mappingFunction) {
+        return map.computeIfAbsent(key, mappingFunction);
+    }
+
+    @Override
+    public synchronized Object computeIfPresent(Object key,
+            BiFunction<? super Object, ? super Object, ?> remappingFunction) {
+        return map.computeIfPresent(key, remappingFunction);
+    }
+
+    @Override
+    public synchronized Object compute(Object key,
+            BiFunction<? super Object, ? super Object, ?> remappingFunction) {
+        return map.compute(key, remappingFunction);
+    }
+
+    @Override
+    public synchronized Object merge(Object key, Object value,
+            BiFunction<? super Object, ? super Object, ?> remappingFunction) {
+        return map.merge(key, value, remappingFunction);
+    }
+
+    //
+    // Special Hashtable methods
+
+    @Override
+    protected void rehash() { /* no-op */ }
+
+    @Override
+    public synchronized Object clone() {
+        Properties clone = (Properties) cloneHashtable();
+        clone.map = new ConcurrentHashMap<>(map);
+        return clone;
+    }
+
+    //
+    // Hashtable serialization overrides
+    // (these should emit and consume Hashtable-compatible stream)
+
+    @Override
+    void writeHashtable(ObjectOutputStream s) throws IOException {
+        List<Object> entryStack = new ArrayList<>(map.size() * 2); // an estimate
+
+        for (Map.Entry<Object, Object> entry : map.entrySet()) {
+            entryStack.add(entry.getValue());
+            entryStack.add(entry.getKey());
+        }
+
+        // Write out the simulated threshold, loadfactor
+        float loadFactor = 0.75f;
+        int count = entryStack.size() / 2;
+        int length = (int)(count / loadFactor) + (count / 20) + 3;
+        if (length > count && (length & 1) == 0) {
+            length--;
+        }
+        synchronized (map) { // in case of multiple concurrent serializations
+            defaultWriteHashtable(s, length, loadFactor);
+        }
+
+        // Write out simulated length and real count of elements
+        s.writeInt(length);
+        s.writeInt(count);
+
+        // Write out the key/value objects from the stacked entries
+        for (int i = entryStack.size() - 1; i >= 0; i--) {
+            s.writeObject(entryStack.get(i));
+        }
+    }
+
+    @Override
+    void readHashtable(ObjectInputStream s) throws IOException,
+            ClassNotFoundException {
+        // Read in the threshold and loadfactor
+        s.defaultReadObject();
+
+        // Read the original length of the array and number of elements
+        int origlength = s.readInt();
+        int elements = s.readInt();
+
+        // Validate # of elements
+        if (elements < 0) {
+            throw new StreamCorruptedException("Illegal # of Elements: " + elements);
+        }
+
+        // create CHM of appropriate capacity
+        map = new ConcurrentHashMap<>(elements);
+
+        // Read all the key/value objects
+        for (; elements > 0; elements--) {
+            Object key = s.readObject();
+            Object value = s.readObject();
+            map.put(key, value);
+        }
+    }
 }
diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index a3c3a99ded4..2e080ae84fe 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -126,8 +126,6 @@ java/beans/Introspector/8132566/OverrideUserDefPropertyInfoTest.java 8132565 gen
 
 # jdk_lang
 
-java/lang/ClassLoader/deadlock/GetResource.java                 8029891 generic-all
-
 java/lang/StringCoding/CheckEncodings.sh                        7008363 generic-all
 
 ############################################################################
diff --git a/jdk/test/java/lang/ClassLoader/deadlock/GetResource.java b/jdk/test/java/lang/ClassLoader/deadlock/GetResource.java
index a1a1b4e1730..26fbe3dd586 100644
--- a/jdk/test/java/lang/ClassLoader/deadlock/GetResource.java
+++ b/jdk/test/java/lang/ClassLoader/deadlock/GetResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016 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,7 @@ import java.io.IOException;
 import java.net.URL;
 
 /* @test
- * @bug 6977738
+ * @bug 6977738 8029891
  * @summary Test ClassLoader.getResource() that should not deadlock
  #          if another thread is holding the system properties object
  *
@@ -70,10 +70,6 @@ public class GetResource {
                     go.await();  // wait until t1 holds the lock of the system properties
 
                     URL u1 = Thread.currentThread().getContextClassLoader().getResource("unknownresource");
-                    URL u2 = Thread.currentThread().getContextClassLoader().getResource("sun/util/resources/CalendarData.class");
-                    if (u2 == null) {
-                        throw new RuntimeException("Test failed: resource not found");
-                    }
                     done.await();
                 } catch (InterruptedException e) {
                     throw new RuntimeException(e);
diff --git a/jdk/test/java/util/Properties/CheckOverrides.java b/jdk/test/java/util/Properties/CheckOverrides.java
new file mode 100644
index 00000000000..327143a66cb
--- /dev/null
+++ b/jdk/test/java/util/Properties/CheckOverrides.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2016, 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 java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/*
+ * @test
+ * @bug 8029891
+ * @summary Test that the Properties class overrides all public+protected
+ *          methods of all ancestor classes and interfaces
+ * @run main CheckOverrides
+ */
+public class CheckOverrides {
+
+    public static void main(String[] args) {
+        Set<MethodSignature> pMethodSignatures =
+            Stream.of(Properties.class.getDeclaredMethods())
+                .filter(CheckOverrides::isMethodOfInterest)
+                .map(MethodSignature::new)
+                .collect(Collectors.toSet());
+
+        Map<MethodSignature, Method> unoverriddenMethods = new HashMap<>();
+        for (Class<?> superclass = Properties.class.getSuperclass();
+             superclass != Object.class;
+             superclass = superclass.getSuperclass()) {
+            Stream.of(superclass.getDeclaredMethods())
+                .filter(CheckOverrides::isMethodOfInterest)
+                .forEach(m -> unoverriddenMethods.putIfAbsent(new MethodSignature(m), m));
+        }
+        unoverriddenMethods.keySet().removeAll(pMethodSignatures);
+
+        if (!unoverriddenMethods.isEmpty()) {
+            throw new RuntimeException(
+                "The following methods should be overridden by Properties class:\n" +
+                    unoverriddenMethods.values().stream()
+                        .map(Method::toString)
+                        .collect(Collectors.joining("\n  ", "  ", "\n"))
+            );
+        }
+    }
+
+    static boolean isMethodOfInterest(Method method) {
+        int mods = method.getModifiers();
+        return !Modifier.isStatic(mods) &&
+            (Modifier.isPublic(mods) || Modifier.isProtected(mods));
+    }
+
+    static class MethodSignature {
+        final Class<?> returnType;
+        final String name;
+        final Class<?>[] parameterTypes;
+
+        MethodSignature(Method method) {
+            this(method.getReturnType(), method.getName(), method.getParameterTypes());
+        }
+
+        private MethodSignature(Class<?> returnType, String name, Class<?>[] parameterTypes) {
+            this.returnType = returnType;
+            this.name = name;
+            this.parameterTypes = parameterTypes;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            MethodSignature that = (MethodSignature) o;
+            if (!returnType.equals(that.returnType)) return false;
+            if (!name.equals(that.name)) return false;
+            return Arrays.equals(parameterTypes, that.parameterTypes);
+        }
+
+        @Override
+        public int hashCode() {
+            int result = returnType.hashCode();
+            result = 31 * result + name.hashCode();
+            result = 31 * result + Arrays.hashCode(parameterTypes);
+            return result;
+        }
+    }
+}
+
diff --git a/jdk/test/java/util/Properties/CheckUnsynchronized.java b/jdk/test/java/util/Properties/CheckUnsynchronized.java
new file mode 100644
index 00000000000..1b32cca0827
--- /dev/null
+++ b/jdk/test/java/util/Properties/CheckUnsynchronized.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2016, 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 java.util.Enumeration;
+import java.util.Properties;
+import java.util.concurrent.CompletableFuture;
+
+/*
+ * @test
+ * @bug 8029891
+ * @summary Test Properties methods that do not synchronize any more
+ * @run main CheckUnsynchronized
+ */
+public class CheckUnsynchronized {
+    public static void main(String[] args) {
+        Properties props = new Properties();
+        synchronized (props) {
+            props.setProperty("key", "value");
+            System.out.println("contains(value)? " +
+                    CompletableFuture.supplyAsync(() -> props.contains("value")).join());
+            System.out.println("containsKey(key)? " +
+                    CompletableFuture.supplyAsync(() -> props.containsKey("key")).join());
+            System.out.println("containsValue(value)? " +
+                    CompletableFuture.supplyAsync(() -> props.containsValue("value")).join());
+            Enumeration<Object> elems =
+                    CompletableFuture.supplyAsync(() -> props.elements()).join();
+            System.out.println("first value from elements(): " + elems.nextElement());
+            System.out.println("value from get(): " +
+                    CompletableFuture.supplyAsync(() -> props.getProperty("key")).join());
+            System.out.println("getOrDefault(\"missing\"): " +
+                    CompletableFuture.supplyAsync(() -> props.getOrDefault("missing", "default")).join());
+            System.out.println("isEmpty()? " +
+                    CompletableFuture.supplyAsync(() -> props.isEmpty()).join());
+            Enumeration<Object> keys =
+                    CompletableFuture.supplyAsync(() -> props.keys()).join();
+            System.out.println("first key from keys(): " + keys.nextElement());
+            System.out.println("size(): " +
+                    CompletableFuture.supplyAsync(() -> props.size()).join());
+        }
+    }
+}
diff --git a/jdk/test/java/util/Properties/PropertiesSerialization.java b/jdk/test/java/util/Properties/PropertiesSerialization.java
new file mode 100644
index 00000000000..2fcf1dc810a
--- /dev/null
+++ b/jdk/test/java/util/Properties/PropertiesSerialization.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2016, 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 java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Base64;
+import java.util.Properties;
+
+/**
+ * @test
+ * @bug 8029891
+ * @summary tests the compatibility of Properties serial form
+ * @run main PropertiesSerialization read
+ *
+ * To update this test in case the serial form of Properties changes, run this
+ * test with the 'write' flag, and copy the resulting output back into this
+ * file, replacing the existing String declaration(s).
+ */
+public class PropertiesSerialization {
+    private static final Properties TEST_PROPS;
+    static {
+        TEST_PROPS = new Properties();
+        TEST_PROPS.setProperty("one", "two");
+        TEST_PROPS.setProperty("buckle", "shoe");
+        TEST_PROPS.setProperty("three", "four");
+        TEST_PROPS.setProperty("shut", "door");
+    }
+
+    /**
+     * Base64 encoded string for Properties object
+     * Java version: 1.8.0
+     **/
+    private static final String TEST_SER_BASE64 =
+         "rO0ABXNyABRqYXZhLnV0aWwuUHJvcGVydGllczkS0HpwNj6YAgABTAAIZGVmYXVs"
+       + "dHN0ABZMamF2YS91dGlsL1Byb3BlcnRpZXM7eHIAE2phdmEudXRpbC5IYXNodGFi"
+       + "bGUTuw8lIUrkuAMAAkYACmxvYWRGYWN0b3JJAAl0aHJlc2hvbGR4cD9AAAAAAAAI"
+       + "dwgAAAALAAAABHQAA29uZXQAA3R3b3QABHNodXR0AARkb29ydAAGYnVja2xldAAE"
+       + "c2hvZXQABXRocmVldAAEZm91cnhw";
+
+    public static void main(String[] args) throws IOException,
+            ClassNotFoundException {
+        if (args.length == 0) {
+            System.err.println("Run with 'read' or 'write'");
+            System.err.println("  read mode:  normal test mode.");
+            System.err.println("              Confirms that serial stream can");
+            System.err.println("              be deserialized as expected.");
+            System.err.println("  write mode: meant for updating the test,");
+            System.err.println("              should the serial form change.");
+            System.err.println("              Test output should be pasted");
+            System.err.println("              back into the test source.");
+            return;
+        }
+
+        Properties deserializedObject;
+        if ("read".equals(args[0])) {
+            ByteArrayInputStream bais = new
+              ByteArrayInputStream(Base64.getDecoder().decode(TEST_SER_BASE64));
+            try (ObjectInputStream ois = new ObjectInputStream(bais)) {
+                deserializedObject = (Properties) ois.readObject();
+            }
+            if (!TEST_PROPS.equals(deserializedObject)) {
+                throw new RuntimeException("deserializedObject not equals()");
+            }
+            System.out.println("Test passed");
+        } else if ("write".equals(args[0])) {
+            System.out.println("\nTo update the test, paste the following back "
+                    + "into the test code:\n");
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            ObjectOutputStream oos = new ObjectOutputStream(baos);
+            oos.writeObject(TEST_PROPS);
+            oos.flush();
+            oos.close();
+
+            byte[] byteArray = baos.toByteArray();
+            // Check that the Properties deserializes correctly
+            ByteArrayInputStream bais = new ByteArrayInputStream(byteArray);
+            ObjectInputStream ois = new ObjectInputStream(bais);
+            Properties deser = (Properties)ois.readObject();
+            if (!TEST_PROPS.equals(deser)) {
+                throw new RuntimeException("write: Deserialized != original");
+            }
+
+            // Now get a Base64 string representation of the serialized bytes.
+            final String base64 = Base64.getEncoder().encodeToString(byteArray);
+            // Check that we can deserialize the Base64 string we just computed.
+            ByteArrayInputStream bais2 =
+              new ByteArrayInputStream(Base64.getDecoder().decode(base64));
+            ObjectInputStream ois2 = new ObjectInputStream(bais2);
+            Properties deser2 = (Properties)ois2.readObject();
+            if (!TEST_PROPS.equals(deser2)) {
+                throw new RuntimeException("write: Deserialized base64 != "
+                        + "original");
+            }
+            System.out.println(dumpBase64SerialStream(base64));
+        }
+    }
+
+    private static final String INDENT = "   ";
+    /* Based on:
+     * java/util/logging/HigherResolutionTimeStamps/SerializeLogRecored.java
+     */
+    private static String dumpBase64SerialStream(String base64) {
+        // Generates the Java Pseudo code that can be cut & pasted into
+        // this test (see Jdk8SerializedLog and Jdk9SerializedLog below)
+        final StringBuilder sb = new StringBuilder();
+        sb.append(INDENT).append(" /**").append('\n');
+        sb.append(INDENT).append("  * Base64 encoded string for Properties object\n");
+        sb.append(INDENT).append("  * Java version: ")
+                .append(System.getProperty("java.version")).append('\n');
+        sb.append(INDENT).append("  **/").append('\n');
+        sb.append(INDENT).append(" private static final String TEST_SER_BASE64 = ")
+                .append("\n").append(INDENT).append("      ");
+        final int last = base64.length() - 1;
+        for (int i=0; i<base64.length();i++) {
+            if (i%64 == 0) sb.append("\"");
+            sb.append(base64.charAt(i));
+            if (i%64 == 63 || i == last) {
+                sb.append("\"");
+                if (i == last) sb.append(";\n");
+                else sb.append("\n").append(INDENT).append("    + ");
+            }
+        }
+        return sb.toString();
+    }
+}

From d54e7309f532d59aaed13fa074ee1e3f5b1d6734 Mon Sep 17 00:00:00 2001
From: Artem Smotrakov <asmotrak@openjdk.org>
Date: Thu, 19 May 2016 19:45:04 -0700
Subject: [PATCH 160/228] 8157344: Multiple test timeouts after push for
 JDK-8141039 8156606: java/security/SecureRandom/Serialize.java gets time out
 in Linux

Reviewed-by: weijun
---
 jdk/test/ProblemList.txt                              |  2 ++
 jdk/test/java/security/SecureRandom/ApiTest.java      | 11 ++++++-----
 .../java/security/SecureRandom/EnoughSeedTest.java    |  3 ++-
 jdk/test/java/security/SecureRandom/Serialize.java    |  3 +++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 2e080ae84fe..5d2113b99b1 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -292,6 +292,8 @@ sun/security/provider/NSASuiteB/TestDSAGenParameterSpec.java    8137255 generic-
 
 sun/security/x509/URICertStore/ExtensionsWithLDAP.java          8134577 generic-all
 
+sun/security/provider/SecureRandom/StrongSecureRandom.java      8157387 linux-all
+
 ############################################################################
 
 # jdk_sound
diff --git a/jdk/test/java/security/SecureRandom/ApiTest.java b/jdk/test/java/security/SecureRandom/ApiTest.java
index bf3c8374122..e48ee4a90de 100644
--- a/jdk/test/java/security/SecureRandom/ApiTest.java
+++ b/jdk/test/java/security/SecureRandom/ApiTest.java
@@ -28,11 +28,11 @@
  * @summary This test do API coverage for SecureRandom. It covers most of
  *          supported operations along with possible positive and negative
  *          parameters for DRBG mechanism.
- * @run main ApiTest Hash_DRBG
- * @run main ApiTest HMAC_DRBG
- * @run main ApiTest CTR_DRBG
- * @run main ApiTest SHA1PRNG
- * @run main ApiTest NATIVE
+ * @run main/othervm ApiTest Hash_DRBG
+ * @run main/othervm ApiTest HMAC_DRBG
+ * @run main/othervm ApiTest CTR_DRBG
+ * @run main/othervm ApiTest SHA1PRNG
+ * @run main/othervm ApiTest NATIVE
  */
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
@@ -53,6 +53,7 @@ public class ApiTest {
             = Security.getProperty(DRBG_CONFIG);
 
     public static void main(String[] args) throws Exception {
+        System.setProperty("java.security.egd", "file:/dev/urandom");
 
         if (args == null || args.length < 1) {
             throw new RuntimeException("No mechanism available to run test.");
diff --git a/jdk/test/java/security/SecureRandom/EnoughSeedTest.java b/jdk/test/java/security/SecureRandom/EnoughSeedTest.java
index 82c51c04fb4..a42807d0530 100644
--- a/jdk/test/java/security/SecureRandom/EnoughSeedTest.java
+++ b/jdk/test/java/security/SecureRandom/EnoughSeedTest.java
@@ -27,7 +27,7 @@
  * @library /lib/testlibrary
  * @summary Check SecureRandom generate expected seed counts what the caller
  *          asked for.
- * @run main EnoughSeedTest
+ * @run main/othervm EnoughSeedTest
  */
 import java.security.SecureRandom;
 import java.security.Security;
@@ -40,6 +40,7 @@ public class EnoughSeedTest {
             = Security.getProperty(DRBG_CONFIG);
 
     public static void main(String[] args) {
+        System.setProperty("java.security.egd", "file:/dev/urandom");
 
         boolean success = true;
         for (String mech : new String[]{
diff --git a/jdk/test/java/security/SecureRandom/Serialize.java b/jdk/test/java/security/SecureRandom/Serialize.java
index 799f1bfa428..2e364878c80 100644
--- a/jdk/test/java/security/SecureRandom/Serialize.java
+++ b/jdk/test/java/security/SecureRandom/Serialize.java
@@ -24,6 +24,7 @@
 /* @test
  * @bug 4102896
  * @summary Make sure that a SecureRandom object can be serialized
+ * @run main/othervm Serialize
  */
 
 import java.security.*;
@@ -32,6 +33,8 @@ import java.io.*;
 public class Serialize {
 
     public static void main(String args[]) throws Exception {
+        System.setProperty("java.security.egd", "file:/dev/urandom");
+
         for (String alg: new String[]{
                 "SHA1PRNG", "DRBG", "Hash_DRBG", "HMAC_DRBG", "CTR_DRBG",
                 "Hash_DRBG,SHA-512,192,pr_and_reseed"}) {

From efd36db57d81ceac3bdb3ce87e023e5fb1edbc8e Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Fri, 20 May 2016 11:15:05 +0800
Subject: [PATCH 161/228] 8149521: automatic discovery of LDAP servers with
 Kerberos authentication

Reviewed-by: vinnie
---
 .../share/classes/sun/security/krb5/PrincipalName.java      | 3 +++
 jdk/test/sun/security/krb5/canonicalize/Test.java           | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/PrincipalName.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/PrincipalName.java
index e60507fe443..b3a0e8bea38 100644
--- a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/PrincipalName.java
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/PrincipalName.java
@@ -424,6 +424,9 @@ public class PrincipalName implements Cloneable {
                 } catch (UnknownHostException | SecurityException e) {
                     // not canonicalized or no permission to do so, use old
                 }
+                if (hostName.endsWith(".")) {
+                    hostName = hostName.substring(0, hostName.length() - 1);
+                }
                 nameParts[1] = hostName.toLowerCase(Locale.ENGLISH);
             }
             nameStrings = nameParts;
diff --git a/jdk/test/sun/security/krb5/canonicalize/Test.java b/jdk/test/sun/security/krb5/canonicalize/Test.java
index 8d21a50727f..62c44de9984 100644
--- a/jdk/test/sun/security/krb5/canonicalize/Test.java
+++ b/jdk/test/sun/security/krb5/canonicalize/Test.java
@@ -22,7 +22,7 @@
  */
 /*
  * @test
- * @bug 6682516
+ * @bug 6682516 8149521
  * @summary SPNEGO_HTTP_AUTH/WWW_KRB and SPNEGO_HTTP_AUTH/WWW_SPNEGO failed on all non-windows platforms
  * @modules java.security.jgss/sun.security.krb5
  * @run main/othervm  -Djava.security.krb5.conf=krb5.conf Test
@@ -44,9 +44,11 @@ public class Test {
         check("c1", "c1.this.domain");
         check("c1.this", "c1.this.domain");
         check("c1.this.domain", "c1.this.domain");
+        check("c1.this.domain.", "c1.this.domain");
 
         // canonicalized name goes IP, reject
         check("c2", "c2");
+        check("c2.", "c2");
 
         // canonicalized name goes strange, reject
         check("c3", "c3");
@@ -63,4 +65,4 @@ public class Test {
             throw new Exception("Output is " + pn);
         }
     }
-            }
+}

From 06fe4b9a0bbd59817f0ac0b6896bd38e538857bc Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Fri, 20 May 2016 11:20:49 +0800
Subject: [PATCH 162/228] 8138766: New default -sigalg for keytool

Reviewed-by: mullan
---
 .../security/tools/keytool/CertAndKeyGen.java | 18 ++++-
 .../sun/security/tools/keytool/Main.java      | 24 +++---
 .../keytool/DefaultSignatureAlgorithm.java    | 80 +++++++++++++++++++
 3 files changed, 104 insertions(+), 18 deletions(-)
 create mode 100644 jdk/test/sun/security/tools/keytool/DefaultSignatureAlgorithm.java

diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/CertAndKeyGen.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/CertAndKeyGen.java
index e2b4cfbb823..85037622c1b 100644
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/CertAndKeyGen.java
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/CertAndKeyGen.java
@@ -67,7 +67,9 @@ public final class CertAndKeyGen {
      *
      * @param keyType type of key, e.g. "RSA", "DSA"
      * @param sigAlg name of the signature algorithm, e.g. "MD5WithRSA",
-     *          "MD2WithRSA", "SHAwithDSA".
+     *          "MD2WithRSA", "SHAwithDSA". If set to null, a default
+     *          algorithm matching the private key will be chosen after
+     *          the first keypair is generated.
      * @exception NoSuchAlgorithmException on unrecognized algorithms.
      */
     public CertAndKeyGen (String keyType, String sigAlg)
@@ -83,7 +85,9 @@ public final class CertAndKeyGen {
      *
      * @param keyType type of key, e.g. "RSA", "DSA"
      * @param sigAlg name of the signature algorithm, e.g. "MD5WithRSA",
-     *          "MD2WithRSA", "SHAwithDSA".
+     *          "MD2WithRSA", "SHAwithDSA". If set to null, a default
+     *          algorithm matching the private key will be chosen after
+     *          the first keypair is generated.
      * @param providerName name of the provider
      * @exception NoSuchAlgorithmException on unrecognized algorithms.
      * @exception NoSuchProviderException on unrecognized providers.
@@ -161,8 +165,16 @@ public final class CertAndKeyGen {
             throw new IllegalArgumentException("Public key format is "
                 + publicKey.getFormat() + ", must be X.509");
         }
-    }
 
+        if (sigAlg == null) {
+            sigAlg = AlgorithmId.getDefaultSigAlgForKey(privateKey);
+            if (sigAlg == null) {
+                throw new IllegalArgumentException(
+                        "Cannot derive signature algorithm from "
+                                + privateKey.getAlgorithm());
+            }
+        }
+    }
 
     /**
      * Returns the public key of the generated key pair if it is of type
diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java
index 94969b84196..3a3d5cfe91d 100644
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java
@@ -54,7 +54,6 @@ import java.text.MessageFormat;
 import java.util.*;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
-import java.lang.reflect.Constructor;
 import java.math.BigInteger;
 import java.net.URI;
 import java.net.URL;
@@ -1238,7 +1237,7 @@ public final class Main {
         PrivateKey privateKey =
                 (PrivateKey)recoverKey(alias, storePass, keyPass).fst;
         if (sigAlgName == null) {
-            sigAlgName = getCompatibleSigAlgName(privateKey.getAlgorithm());
+            sigAlgName = getCompatibleSigAlgName(privateKey);
         }
         Signature signature = Signature.getInstance(sigAlgName);
         signature.initSign(privateKey);
@@ -1328,7 +1327,7 @@ public final class Main {
         PrivateKey privateKey =
                 (PrivateKey)recoverKey(alias, storePass, keyPass).fst;
         if (sigAlgName == null) {
-            sigAlgName = getCompatibleSigAlgName(privateKey.getAlgorithm());
+            sigAlgName = getCompatibleSigAlgName(privateKey);
         }
 
         X509CRLEntry[] badCerts = new X509CRLEntry[ids.size()];
@@ -1387,7 +1386,7 @@ public final class Main {
 
         // Construct a Signature object, so that we can sign the request
         if (sigAlgName == null) {
-            sigAlgName = getCompatibleSigAlgName(privKey.getAlgorithm());
+            sigAlgName = getCompatibleSigAlgName(privKey);
         }
 
         Signature signature = Signature.getInstance(sigAlgName);
@@ -1619,19 +1618,17 @@ public final class Main {
      * If no signature algorithm was specified at the command line,
      * we choose one that is compatible with the selected private key
      */
-    private static String getCompatibleSigAlgName(String keyAlgName)
+    private static String getCompatibleSigAlgName(PrivateKey key)
             throws Exception {
-        if ("DSA".equalsIgnoreCase(keyAlgName)) {
-            return "SHA256WithDSA";
-        } else if ("RSA".equalsIgnoreCase(keyAlgName)) {
-            return "SHA256WithRSA";
-        } else if ("EC".equalsIgnoreCase(keyAlgName)) {
-            return "SHA256withECDSA";
+        String result = AlgorithmId.getDefaultSigAlgForKey(key);
+        if (result != null) {
+            return result;
         } else {
             throw new Exception(rb.getString
                     ("Cannot.derive.signature.algorithm"));
         }
     }
+
     /**
      * Creates a new key pair and self-signed certificate.
      */
@@ -1658,9 +1655,6 @@ public final class Main {
             throw new Exception(form.format(source));
         }
 
-        if (sigAlgName == null) {
-            sigAlgName = getCompatibleSigAlgName(keyAlgName);
-        }
         CertAndKeyGen keypair =
                 new CertAndKeyGen(keyAlgName, sigAlgName, providerName);
 
@@ -2526,7 +2520,7 @@ public final class Main {
 
         // Determine the signature algorithm
         if (sigAlgName == null) {
-            sigAlgName = getCompatibleSigAlgName(privKey.getAlgorithm());
+            sigAlgName = getCompatibleSigAlgName(privKey);
         }
 
         // Get the old certificate
diff --git a/jdk/test/sun/security/tools/keytool/DefaultSignatureAlgorithm.java b/jdk/test/sun/security/tools/keytool/DefaultSignatureAlgorithm.java
new file mode 100644
index 00000000000..ad6297f2b21
--- /dev/null
+++ b/jdk/test/sun/security/tools/keytool/DefaultSignatureAlgorithm.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2016, 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 8138766
+ * @summary New default -sigalg for keytool
+ * @modules java.base/sun.security.tools.keytool
+ */
+
+import sun.security.tools.keytool.Main;
+
+import java.io.File;
+import java.security.KeyStore;
+import java.security.cert.X509Certificate;
+
+public class DefaultSignatureAlgorithm {
+
+    private static int counter = 0;
+
+    public static void main(String[] args) throws Exception {
+
+        // Calculating large RSA keys are too slow.
+        run("RSA", 1024, null, "SHA256withRSA");
+        run("RSA", 3072, null, "SHA256withRSA");
+        run("RSA", 3073, null, "SHA384withRSA");
+
+        run("DSA", 1024, null, "SHA256withDSA");
+        run("DSA", 3072, null, "SHA256withDSA");
+
+        run("EC", 192, null, "SHA256withECDSA");
+        run("EC", 384, null, "SHA384withECDSA");
+        run("EC", 571, null, "SHA512withECDSA");
+
+        // If you specify one, it will be used.
+        run("EC", 571, "SHA256withECDSA", "SHA256withECDSA");
+    }
+
+    private static void run(String keyAlg, int keySize,
+                    String sigAlg, String expectedSigAlg) throws Exception {
+        String alias = keyAlg + keySize + (counter++);
+        String cmd = "-keystore ks -storepass changeit" +
+                " -keypass changeit -alias " + alias +
+                " -keyalg " + keyAlg + " -keysize " + keySize +
+                " -genkeypair -dname CN=" + alias + " -debug";
+        if (sigAlg != null) {
+            cmd += " -sigalg " + sigAlg;
+        }
+        Main.main(cmd.split(" "));
+
+        KeyStore ks = KeyStore.getInstance(
+                new File("ks"), "changeit".toCharArray());
+        X509Certificate cert = (X509Certificate)ks.getCertificate(alias);
+        String actualSigAlg = cert.getSigAlgName();
+        if (!actualSigAlg.equals(expectedSigAlg)) {
+            throw new Exception("Failure at " + alias + ": expected "
+                    + expectedSigAlg + ", actually " + actualSigAlg);
+        }
+    }
+}

From 93f4f6c1b50c17bf713a2cfa806e64a8d73d6770 Mon Sep 17 00:00:00 2001
From: Nishit Jain <nishjain@openjdk.org>
Date: Fri, 20 May 2016 13:48:58 +0900
Subject: [PATCH 163/228] 7102969: currency.properties supercede not working
 correctly 8149452:
 j.t.SimpleDateFormat.getDateFormatSymbols().getZoneStrings() returns
 incorrect result for some time zones 8157138: Error while fetching currency
 instance by Currency.getInstance(currencycode)

Reviewed-by: naoto, okutsu, peytoia
---
 .../data/currency/CurrencyData.properties     |   5 +-
 .../tools/cldrconverter/CLDRConverter.java    |   6 +-
 .../GenerateCurrencyData.java                 |  49 +--
 .../share/classes/java/util/Currency.java     | 326 +++++++++++++-----
 .../java/util/Currency/PropertiesTest.java    |  76 +++-
 jdk/test/java/util/Currency/PropertiesTest.sh |  13 +-
 .../java/util/Currency/currency.properties    |   2 +-
 jdk/test/java/util/Currency/tablea1.txt       |   2 +-
 jdk/test/java/util/TimeZone/Bug8149452.java   |  58 ++++
 9 files changed, 423 insertions(+), 114 deletions(-)
 create mode 100644 jdk/test/java/util/TimeZone/Bug8149452.java

diff --git a/jdk/make/data/currency/CurrencyData.properties b/jdk/make/data/currency/CurrencyData.properties
index 808d01d6958..0288b04390b 100644
--- a/jdk/make/data/currency/CurrencyData.properties
+++ b/jdk/make/data/currency/CurrencyData.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2016, 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,8 @@
 # Version of the currency data format.
 #   1: initial
 #   2: Change in minor unit (allowing 4-9 digits)
-formatVersion=2
+#   3: Change in the order of special case and other currency entries
+formatVersion=3
 
 # Version of the currency code information in this class.
 # It is a serial number that accompanies with each amendment.
diff --git a/jdk/make/src/classes/build/tools/cldrconverter/CLDRConverter.java b/jdk/make/src/classes/build/tools/cldrconverter/CLDRConverter.java
index f15834202b0..b72ac9225b1 100644
--- a/jdk/make/src/classes/build/tools/cldrconverter/CLDRConverter.java
+++ b/jdk/make/src/classes/build/tools/cldrconverter/CLDRConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
@@ -584,7 +584,9 @@ public class CLDRConverter {
                 String[] data = (String[])e[1];
 
                 if (map.get(TIMEZONE_ID_PREFIX + tzid) == null &&
-                    handlerMetaZones.get(tzid) == null) {
+                    handlerMetaZones.get(tzid) == null ||
+                    handlerMetaZones.get(tzid) != null &&
+                    map.get(METAZONE_ID_PREFIX + handlerMetaZones.get(tzid)) == null) {
                     // First, check the CLDR meta key
                     Optional<Map.Entry<String, String>> cldrMeta =
                         handlerMetaZones.getData().entrySet().stream()
diff --git a/jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java b/jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java
index cc125638c96..ae861c5abe5 100644
--- a/jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java
+++ b/jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2016, 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 class GenerateCurrencyData {
 
     private static final int maxOtherCurrencies = 128;
     private static int otherCurrenciesCount = 0;
-    private static StringBuffer otherCurrencies = new StringBuffer();
+    private static String[] otherCurrencies = new String[maxOtherCurrencies];
     private static int[] otherCurrenciesDefaultFractionDigits = new int[maxOtherCurrencies];
     private static int[] otherCurrenciesNumericCode= new int[maxOtherCurrencies];
 
@@ -318,10 +318,7 @@ public class GenerateCurrencyData {
                 if (otherCurrenciesCount == maxOtherCurrencies) {
                     throw new RuntimeException("too many other currencies");
                 }
-                if (otherCurrencies.length() > 0) {
-                    otherCurrencies.append('-');
-                }
-                otherCurrencies.append(currencyCode);
+                otherCurrencies[otherCurrenciesCount] = currencyCode;
                 otherCurrenciesDefaultFractionDigits[otherCurrenciesCount] = getDefaultFractionDigits(currencyCode);
                 otherCurrenciesNumericCode[otherCurrenciesCount] = getNumericCode(currencyCode);
                 otherCurrenciesCount++;
@@ -350,35 +347,41 @@ public class GenerateCurrencyData {
         out.writeInt(Integer.parseInt(dataVersion));
         writeIntArray(mainTable, mainTable.length);
         out.writeInt(specialCaseCount);
-        writeLongArray(specialCaseCutOverTimes, specialCaseCount);
-        writeStringArray(specialCaseOldCurrencies, specialCaseCount);
-        writeStringArray(specialCaseNewCurrencies, specialCaseCount);
-        writeIntArray(specialCaseOldCurrenciesDefaultFractionDigits, specialCaseCount);
-        writeIntArray(specialCaseNewCurrenciesDefaultFractionDigits, specialCaseCount);
-        writeIntArray(specialCaseOldCurrenciesNumericCode, specialCaseCount);
-        writeIntArray(specialCaseNewCurrenciesNumericCode, specialCaseCount);
+        writeSpecialCaseEntries();
         out.writeInt(otherCurrenciesCount);
-        out.writeUTF(otherCurrencies.toString());
-        writeIntArray(otherCurrenciesDefaultFractionDigits, otherCurrenciesCount);
-        writeIntArray(otherCurrenciesNumericCode, otherCurrenciesCount);
+        writeOtherCurrencies();
     }
 
     private static void writeIntArray(int[] ia, int count) throws IOException {
-        for (int i = 0; i < count; i ++) {
+        for (int i = 0; i < count; i++) {
             out.writeInt(ia[i]);
         }
     }
 
-    private static void writeLongArray(long[] la, int count) throws IOException  {
-        for (int i = 0; i < count; i ++) {
-            out.writeLong(la[i]);
+    private static void writeSpecialCaseEntries() throws IOException {
+        for (int index = 0; index < specialCaseCount; index++) {
+            out.writeLong(specialCaseCutOverTimes[index]);
+            String str = (specialCaseOldCurrencies[index] != null)
+                    ? specialCaseOldCurrencies[index] : "";
+            out.writeUTF(str);
+            str = (specialCaseNewCurrencies[index] != null)
+                    ? specialCaseNewCurrencies[index] : "";
+            out.writeUTF(str);
+            out.writeInt(specialCaseOldCurrenciesDefaultFractionDigits[index]);
+            out.writeInt(specialCaseNewCurrenciesDefaultFractionDigits[index]);
+            out.writeInt(specialCaseOldCurrenciesNumericCode[index]);
+            out.writeInt(specialCaseNewCurrenciesNumericCode[index]);
         }
     }
 
-    private static void writeStringArray(String[] sa, int count) throws IOException  {
-        for (int i = 0; i < count; i ++) {
-            String str = (sa[i] != null) ? sa[i] : "";
+    private static void writeOtherCurrencies() throws IOException {
+        for (int index = 0; index < otherCurrenciesCount; index++) {
+            String str = (otherCurrencies[index] != null)
+                    ? otherCurrencies[index] : "";
             out.writeUTF(str);
+            out.writeInt(otherCurrenciesDefaultFractionDigits[index]);
+            out.writeInt(otherCurrenciesNumericCode[index]);
         }
     }
+
 }
diff --git a/jdk/src/java.base/share/classes/java/util/Currency.java b/jdk/src/java.base/share/classes/java/util/Currency.java
index cea4cdc4f3c..6c9bbb62654 100644
--- a/jdk/src/java.base/share/classes/java/util/Currency.java
+++ b/jdk/src/java.base/share/classes/java/util/Currency.java
@@ -153,33 +153,13 @@ public final class Currency implements Serializable {
     //   - bits 0-4: final char for currency code for simple country, or ID of special case
     // - special case IDs:
     //   - 0: country has no currency
-    //   - other: index into sc* arrays + 1
-    // - scCutOverTimes: cut-over time in millis as returned by
-    //   System.currentTimeMillis for special case countries that are changing
-    //   currencies; Long.MAX_VALUE for countries that are not changing currencies
-    // - scOldCurrencies: old currencies for special case countries
-    // - scNewCurrencies: new currencies for special case countries that are
-    //   changing currencies; null for others
-    // - scOldCurrenciesDFD: default fraction digits for old currencies
-    // - scNewCurrenciesDFD: default fraction digits for new currencies, 0 for
-    //   countries that are not changing currencies
-    // - otherCurrencies: concatenation of all currency codes that are not the
-    //   main currency of a simple country, separated by "-"
-    // - otherCurrenciesDFD: decimal format digits for currencies in otherCurrencies, same order
+    //   - other: index into specialCasesList
 
     static int formatVersion;
     static int dataVersion;
     static int[] mainTable;
-    static long[] scCutOverTimes;
-    static String[] scOldCurrencies;
-    static String[] scNewCurrencies;
-    static int[] scOldCurrenciesDFD;
-    static int[] scNewCurrenciesDFD;
-    static int[] scOldCurrenciesNumericCode;
-    static int[] scNewCurrenciesNumericCode;
-    static String otherCurrencies;
-    static int[] otherCurrenciesDFD;
-    static int[] otherCurrenciesNumericCode;
+    static List<SpecialCaseEntry> specialCasesList;
+    static List<OtherCurrencyEntry> otherCurrenciesList;
 
     // handy constants - must match definitions in GenerateCurrencyData
     // magic number
@@ -214,7 +194,7 @@ public final class Currency implements Serializable {
     private static final int NUMERIC_CODE_SHIFT = 10;
 
     // Currency data format version
-    private static final int VALID_FORMAT_VERSION = 2;
+    private static final int VALID_FORMAT_VERSION = 3;
 
     static {
         AccessController.doPrivileged(new PrivilegedAction<>() {
@@ -236,17 +216,9 @@ public final class Currency implements Serializable {
                         dataVersion = dis.readInt();
                         mainTable = readIntArray(dis, A_TO_Z * A_TO_Z);
                         int scCount = dis.readInt();
-                        scCutOverTimes = readLongArray(dis, scCount);
-                        scOldCurrencies = readStringArray(dis, scCount);
-                        scNewCurrencies = readStringArray(dis, scCount);
-                        scOldCurrenciesDFD = readIntArray(dis, scCount);
-                        scNewCurrenciesDFD = readIntArray(dis, scCount);
-                        scOldCurrenciesNumericCode = readIntArray(dis, scCount);
-                        scNewCurrenciesNumericCode = readIntArray(dis, scCount);
+                        specialCasesList = readSpecialCases(dis, scCount);
                         int ocCount = dis.readInt();
-                        otherCurrencies = dis.readUTF();
-                        otherCurrenciesDFD = readIntArray(dis, ocCount);
-                        otherCurrenciesNumericCode = readIntArray(dis, ocCount);
+                        otherCurrenciesList = readOtherCurrencies(dis, ocCount);
                     }
                 } catch (IOException e) {
                     throw new InternalError(e);
@@ -329,6 +301,7 @@ public final class Currency implements Serializable {
             // Currency code not internally generated, need to verify first
             // A currency code must have 3 characters and exist in the main table
             // or in the list of other currencies.
+            boolean found = false;
             if (currencyCode.length() != 3) {
                 throw new IllegalArgumentException();
             }
@@ -340,17 +313,23 @@ public final class Currency implements Serializable {
                     && currencyCode.charAt(2) - 'A' == (tableEntry & SIMPLE_CASE_COUNTRY_FINAL_CHAR_MASK)) {
                 defaultFractionDigits = (tableEntry & SIMPLE_CASE_COUNTRY_DEFAULT_DIGITS_MASK) >> SIMPLE_CASE_COUNTRY_DEFAULT_DIGITS_SHIFT;
                 numericCode = (tableEntry & NUMERIC_CODE_MASK) >> NUMERIC_CODE_SHIFT;
-            } else {
-                // Check for '-' separately so we don't get false hits in the table.
-                if (currencyCode.charAt(2) == '-') {
+                found = true;
+            } else { //special case
+                int[] fractionAndNumericCode = SpecialCaseEntry.findEntry(currencyCode);
+                if (fractionAndNumericCode != null) {
+                    defaultFractionDigits = fractionAndNumericCode[0];
+                    numericCode = fractionAndNumericCode[1];
+                    found = true;
+                }
+            }
+
+            if (!found) {
+                OtherCurrencyEntry ocEntry = OtherCurrencyEntry.findEntry(currencyCode);
+                if (ocEntry == null) {
                     throw new IllegalArgumentException();
                 }
-                int index = otherCurrencies.indexOf(currencyCode);
-                if (index == -1) {
-                    throw new IllegalArgumentException();
-                }
-                defaultFractionDigits = otherCurrenciesDFD[index / 4];
-                numericCode = otherCurrenciesNumericCode[index / 4];
+                defaultFractionDigits = ocEntry.fraction;
+                numericCode = ocEntry.numericCode;
             }
         }
 
@@ -410,13 +389,17 @@ public final class Currency implements Serializable {
             if (tableEntry == COUNTRY_WITHOUT_CURRENCY_ENTRY) {
                 return null;
             } else {
-                int index = (tableEntry & SPECIAL_CASE_COUNTRY_INDEX_MASK) - SPECIAL_CASE_COUNTRY_INDEX_DELTA;
-                if (scCutOverTimes[index] == Long.MAX_VALUE || System.currentTimeMillis() < scCutOverTimes[index]) {
-                    return getInstance(scOldCurrencies[index], scOldCurrenciesDFD[index],
-                        scOldCurrenciesNumericCode[index]);
+                int index = SpecialCaseEntry.toIndex(tableEntry);
+                SpecialCaseEntry scEntry = specialCasesList.get(index);
+                if (scEntry.cutOverTime == Long.MAX_VALUE
+                        || System.currentTimeMillis() < scEntry.cutOverTime) {
+                    return getInstance(scEntry.oldCurrency,
+                            scEntry.oldCurrencyFraction,
+                            scEntry.oldCurrencyNumericCode);
                 } else {
-                    return getInstance(scNewCurrencies[index], scNewCurrenciesDFD[index],
-                        scNewCurrenciesNumericCode[index]);
+                    return getInstance(scEntry.newCurrency,
+                            scEntry.newCurrencyFraction,
+                            scEntry.newCurrencyNumericCode);
                 }
             }
         }
@@ -451,14 +434,29 @@ public final class Currency implements Serializable {
                             sb.append(c2);
                             sb.append(finalChar);
                             available.add(getInstance(sb.toString(), defaultFractionDigits, numericCode));
+                        } else if ((tableEntry & COUNTRY_TYPE_MASK) == SPECIAL_CASE_COUNTRY_MASK
+                                && tableEntry != INVALID_COUNTRY_ENTRY
+                                && tableEntry != COUNTRY_WITHOUT_CURRENCY_ENTRY) {
+                            int index = SpecialCaseEntry.toIndex(tableEntry);
+                            SpecialCaseEntry scEntry = specialCasesList.get(index);
+
+                            if (scEntry.cutOverTime == Long.MAX_VALUE
+                                    || System.currentTimeMillis() < scEntry.cutOverTime) {
+                                available.add(getInstance(scEntry.oldCurrency,
+                                        scEntry.oldCurrencyFraction,
+                                        scEntry.oldCurrencyNumericCode));
+                            } else {
+                                available.add(getInstance(scEntry.newCurrency,
+                                        scEntry.newCurrencyFraction,
+                                        scEntry.newCurrencyNumericCode));
+                            }
                         }
                     }
                 }
 
                 // Now add other currencies
-                StringTokenizer st = new StringTokenizer(otherCurrencies, "-");
-                while (st.hasMoreElements()) {
-                    available.add(getInstance((String)st.nextElement()));
+                for (OtherCurrencyEntry entry : otherCurrenciesList) {
+                    available.add(getInstance(entry.currencyCode));
                 }
             }
         }
@@ -521,15 +519,15 @@ public final class Currency implements Serializable {
     }
 
     /**
-    * Gets the default number of fraction digits used with this currency.
-    * Note that the number of fraction digits is the same as ISO 4217's
-    * minor unit for the currency.
-    * For example, the default number of fraction digits for the Euro is 2,
-    * while for the Japanese Yen it's 0.
-    * In the case of pseudo-currencies, such as IMF Special Drawing Rights,
-    * -1 is returned.
-    *
-    * @return the default number of fraction digits used with this currency
+     * Gets the default number of fraction digits used with this currency.
+     * Note that the number of fraction digits is the same as ISO 4217's
+     * minor unit for the currency.
+     * For example, the default number of fraction digits for the Euro is 2,
+     * while for the Japanese Yen it's 0.
+     * In the case of pseudo-currencies, such as IMF Special Drawing Rights,
+     * -1 is returned.
+     *
+     * @return the default number of fraction digits used with this currency
     */
     public int getDefaultFractionDigits() {
         return defaultFractionDigits;
@@ -693,22 +691,55 @@ public final class Currency implements Serializable {
         return ret;
     }
 
-    private static long[] readLongArray(DataInputStream dis, int count) throws IOException {
-        long[] ret = new long[count];
-        for (int i = 0; i < count; i++) {
-            ret[i] = dis.readLong();
-        }
+    private static List<SpecialCaseEntry> readSpecialCases(DataInputStream dis,
+            int count)
+            throws IOException {
 
-        return ret;
+        List<SpecialCaseEntry> list = new ArrayList<>(count);
+        long cutOverTime;
+        String oldCurrency;
+        String newCurrency;
+        int oldCurrencyFraction;
+        int newCurrencyFraction;
+        int oldCurrencyNumericCode;
+        int newCurrencyNumericCode;
+
+        for (int i = 0; i < count; i++) {
+            cutOverTime = dis.readLong();
+            oldCurrency = dis.readUTF();
+            newCurrency = dis.readUTF();
+            oldCurrencyFraction = dis.readInt();
+            newCurrencyFraction = dis.readInt();
+            oldCurrencyNumericCode = dis.readInt();
+            newCurrencyNumericCode = dis.readInt();
+            SpecialCaseEntry sc = new SpecialCaseEntry(cutOverTime,
+                    oldCurrency, newCurrency,
+                    oldCurrencyFraction, newCurrencyFraction,
+                    oldCurrencyNumericCode, newCurrencyNumericCode);
+            list.add(sc);
+        }
+        return list;
     }
 
-    private static String[] readStringArray(DataInputStream dis, int count) throws IOException {
-        String[] ret = new String[count];
-        for (int i = 0; i < count; i++) {
-            ret[i] = dis.readUTF();
-        }
+    private static List<OtherCurrencyEntry> readOtherCurrencies(DataInputStream dis,
+            int count)
+            throws IOException {
 
-        return ret;
+        List<OtherCurrencyEntry> list = new ArrayList<>(count);
+        String currencyCode;
+        int fraction;
+        int numericCode;
+
+        for (int i = 0; i < count; i++) {
+            currencyCode = dis.readUTF();
+            fraction = dis.readInt();
+            numericCode = dis.readInt();
+            OtherCurrencyEntry oc = new OtherCurrencyEntry(currencyCode,
+                    fraction,
+                    numericCode);
+            list.add(oc);
+        }
+        return list;
     }
 
     /**
@@ -766,21 +797,27 @@ public final class Currency implements Serializable {
             return;
         }
 
-        int index;
-        for (index = 0; index < scOldCurrencies.length; index++) {
-            if (scOldCurrencies[index].equals(code)) {
-                break;
-            }
+        int index = SpecialCaseEntry.indexOf(code, fraction, numeric);
+
+        /* if a country switches from simple case to special case or
+         * one special case to other special case which is not present
+         * in the sc arrays then insert the new entry in special case arrays
+         */
+        if (index == -1 && (ctry.charAt(0) != code.charAt(0)
+                || ctry.charAt(1) != code.charAt(1))) {
+
+            specialCasesList.add(new SpecialCaseEntry(code, fraction, numeric));
+            index = specialCasesList.size() - 1;
         }
 
-        if (index == scOldCurrencies.length) {
+        if (index == -1) {
             // simple case
-            entry |= (fraction << SIMPLE_CASE_COUNTRY_DEFAULT_DIGITS_SHIFT) |
-                     (code.charAt(2) - 'A');
+            entry |= (fraction << SIMPLE_CASE_COUNTRY_DEFAULT_DIGITS_SHIFT)
+                    | (code.charAt(2) - 'A');
         } else {
             // special case
-            entry |= SPECIAL_CASE_COUNTRY_MASK |
-                     (index + SPECIAL_CASE_COUNTRY_INDEX_DELTA);
+            entry = SPECIAL_CASE_COUNTRY_MASK
+                    | (index + SPECIAL_CASE_COUNTRY_INDEX_DELTA);
         }
         setMainTableEntry(ctry.charAt(0), ctry.charAt(1), entry);
     }
@@ -814,5 +851,128 @@ public final class Currency implements Serializable {
             }
         }
     }
+
+    /* Used to represent a special case currency entry
+     * - cutOverTime: cut-over time in millis as returned by
+     *   System.currentTimeMillis for special case countries that are changing
+     *   currencies; Long.MAX_VALUE for countries that are not changing currencies
+     * - oldCurrency: old currencies for special case countries
+     * - newCurrency: new currencies for special case countries that are
+     *   changing currencies; null for others
+     * - oldCurrencyFraction: default fraction digits for old currencies
+     * - newCurrencyFraction: default fraction digits for new currencies, 0 for
+     *   countries that are not changing currencies
+     * - oldCurrencyNumericCode: numeric code for old currencies
+     * - newCurrencyNumericCode: numeric code for new currencies, 0 for countries
+     *   that are not changing currencies
+    */
+    private static class SpecialCaseEntry {
+
+        final private long cutOverTime;
+        final private String oldCurrency;
+        final private String newCurrency;
+        final private int oldCurrencyFraction;
+        final private int newCurrencyFraction;
+        final private int oldCurrencyNumericCode;
+        final private int newCurrencyNumericCode;
+
+        private SpecialCaseEntry(long cutOverTime, String oldCurrency, String newCurrency,
+                int oldCurrencyFraction, int newCurrencyFraction,
+                int oldCurrencyNumericCode, int newCurrencyNumericCode) {
+            this.cutOverTime = cutOverTime;
+            this.oldCurrency = oldCurrency;
+            this.newCurrency = newCurrency;
+            this.oldCurrencyFraction = oldCurrencyFraction;
+            this.newCurrencyFraction = newCurrencyFraction;
+            this.oldCurrencyNumericCode = oldCurrencyNumericCode;
+            this.newCurrencyNumericCode = newCurrencyNumericCode;
+        }
+
+        private SpecialCaseEntry(String currencyCode, int fraction,
+                int numericCode) {
+            this(Long.MAX_VALUE, currencyCode, "", fraction, 0, numericCode, 0);
+        }
+
+        //get the index of the special case entry
+        private static int indexOf(String code, int fraction, int numeric) {
+            int size = specialCasesList.size();
+            for (int index = 0; index < size; index++) {
+                SpecialCaseEntry scEntry = specialCasesList.get(index);
+                if (scEntry.oldCurrency.equals(code)
+                        && scEntry.oldCurrencyFraction == fraction
+                        && scEntry.oldCurrencyNumericCode == numeric
+                        && scEntry.cutOverTime == Long.MAX_VALUE) {
+                    return index;
+                }
+            }
+            return -1;
+        }
+
+        // get the fraction and numericCode of the sc currencycode
+        private static int[] findEntry(String code) {
+            int[] fractionAndNumericCode = null;
+            int size = specialCasesList.size();
+            for (int index = 0; index < size; index++) {
+                SpecialCaseEntry scEntry = specialCasesList.get(index);
+                if (scEntry.oldCurrency.equals(code) && (scEntry.cutOverTime == Long.MAX_VALUE
+                        || System.currentTimeMillis() < scEntry.cutOverTime)) {
+                    //consider only when there is no new currency or cutover time is not passed
+                    fractionAndNumericCode = new int[2];
+                    fractionAndNumericCode[0] = scEntry.oldCurrencyFraction;
+                    fractionAndNumericCode[1] = scEntry.oldCurrencyNumericCode;
+                    break;
+                } else if (scEntry.newCurrency.equals(code)
+                        && System.currentTimeMillis() >= scEntry.cutOverTime) {
+                    //consider only if the cutover time is passed
+                    fractionAndNumericCode = new int[2];
+                    fractionAndNumericCode[0] = scEntry.newCurrencyFraction;
+                    fractionAndNumericCode[1] = scEntry.newCurrencyNumericCode;
+                    break;
+                }
+            }
+            return fractionAndNumericCode;
+        }
+
+        // convert the special case entry to sc arrays index
+        private static int toIndex(int tableEntry) {
+            return (tableEntry & SPECIAL_CASE_COUNTRY_INDEX_MASK) - SPECIAL_CASE_COUNTRY_INDEX_DELTA;
+        }
+
+    }
+
+    /* Used to represent Other currencies
+     * - currencyCode: currency codes that are not the main currency
+     *   of a simple country
+     * - otherCurrenciesDFD: decimal format digits for other currencies
+     * - otherCurrenciesNumericCode: numeric code for other currencies
+     */
+    private static class OtherCurrencyEntry {
+
+        final private String currencyCode;
+        final private int fraction;
+        final private int numericCode;
+
+        private OtherCurrencyEntry(String currencyCode, int fraction,
+                int numericCode) {
+            this.currencyCode = currencyCode;
+            this.fraction = fraction;
+            this.numericCode = numericCode;
+        }
+
+        //get the instance of the other currency code
+        private static OtherCurrencyEntry findEntry(String code) {
+            int size = otherCurrenciesList.size();
+            for (int index = 0; index < size; index++) {
+                OtherCurrencyEntry ocEntry = otherCurrenciesList.get(index);
+                if (ocEntry.currencyCode.equalsIgnoreCase(code)) {
+                    return ocEntry;
+                }
+            }
+            return null;
+        }
+
+    }
+
 }
 
+
diff --git a/jdk/test/java/util/Currency/PropertiesTest.java b/jdk/test/java/util/Currency/PropertiesTest.java
index 96127bf19fe..fe35f2e6161 100644
--- a/jdk/test/java/util/Currency/PropertiesTest.java
+++ b/jdk/test/java/util/Currency/PropertiesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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,6 +25,7 @@ import java.io.*;
 import java.text.*;
 import java.util.*;
 import java.util.regex.*;
+import java.util.stream.Collectors;
 
 public class PropertiesTest {
     public static void main(String[] args) throws Exception {
@@ -32,9 +33,14 @@ public class PropertiesTest {
             dump(args[1]);
         } else if (args.length == 4 && args[0].equals("-c")) {
             compare(args[1], args[2], args[3]);
+        } else if (args.length == 1 && args[0].equals("bug7102969")) {
+            bug7102969();
+        } else if (args.length == 1 && args[0].equals("bug8157138")) {
+            bug8157138();
         } else {
             System.err.println("Usage:  java PropertiesTest -d <dumpfile>");
             System.err.println("        java PropertiesTest -c <beforedump> <afterdump> <propsfile>");
+            System.err.println("        java PropertiesTest bug[JBS bug id number] e.g. bug7102969");
             System.exit(-1);
         }
     }
@@ -174,6 +180,74 @@ public class PropertiesTest {
         }
     }
 
+    private static void bug7102969() {
+
+        // check the correct overriding of special case entries
+        Currency cur = Currency.getInstance(new Locale("", "JP"));
+        if (!cur.getCurrencyCode().equals("ABC")) {
+            throw new RuntimeException("[Expected: ABC as currency code of JP, found: "
+                    + cur.getCurrencyCode() + "]");
+        }
+
+        /* check if the currency instance is returned by
+         * getAvailableCurrencies() method
+         */
+        if (!Currency.getAvailableCurrencies().contains(cur)) {
+            throw new RuntimeException("[The Currency instance ["
+                    + cur.getCurrencyCode() + ", "
+                    + cur.getNumericCode() + ", "
+                    + cur.getDefaultFractionDigits()
+                    + "] is not available in the currencies list]");
+        }
+
+    }
+
+    private static void bug8157138() {
+
+        /* check the currencies which exist only as a special case are
+         * accessible i.e. it should not throw IllegalArgumentException
+         */
+        try {
+            Currency.getInstance("MAD");
+        } catch (IllegalArgumentException ex) {
+            throw new RuntimeException("Test Failed: "
+                    + "special case currency instance MAD not found"
+                    + " via Currency.getInstance(\"MAD\")");
+        }
+
+        try {
+            Currency.getInstance("ABC");
+        } catch (IllegalArgumentException ex) {
+            throw new RuntimeException("Test Failed: "
+                    + "special case currency instance ABC not found"
+                    + " via Currency.getInstance(\"ABC\")");
+        }
+
+        /* check the currency value is returned by getAvailableCurrencies()
+         * method
+        */
+        List<Currency> list = Currency.getAvailableCurrencies().stream()
+                .filter(cur -> cur.getCurrencyCode().equals("MAD"))
+                .collect(Collectors.toList());
+
+        if (list.isEmpty()) {
+            throw new RuntimeException("Test Failed: "
+                    + "special case currency instance MAD not found"
+                    + " in Currency.getAvailableCurrencies() list");
+        }
+
+        list = Currency.getAvailableCurrencies().stream()
+                .filter(cur -> cur.getCurrencyCode().equals("ABC"))
+                .collect(Collectors.toList());
+
+        if (list.isEmpty()) {
+            throw new RuntimeException("Test Failed: "
+                    + "special case currency instance ABC not found"
+                    + " in Currency.getAvailableCurrencies() list");
+        }
+
+    }
+
     private static boolean isPastCutoverDate(String s)
             throws IndexOutOfBoundsException, NullPointerException, ParseException {
         String dateString = s.substring(s.lastIndexOf(',')+1, s.length()).trim();
diff --git a/jdk/test/java/util/Currency/PropertiesTest.sh b/jdk/test/java/util/Currency/PropertiesTest.sh
index a6f8a76d189..215be9229ae 100644
--- a/jdk/test/java/util/Currency/PropertiesTest.sh
+++ b/jdk/test/java/util/Currency/PropertiesTest.sh
@@ -23,7 +23,8 @@
 #
 
 # @test
-# @bug 6332666 6863624 7180362 8003846 8074350 8074351 8130246 8149735
+# @bug 6332666 6863624 7180362 8003846 8074350 8074351 8130246 8149735 7102969
+#      8157138
 # @summary tests the capability of replacing the currency data with user
 #     specified currency properties file
 # @build PropertiesTest
@@ -113,6 +114,16 @@ ${WRITABLEJDK}${FS}bin${FS}java ${TESTVMOPTS} -cp ${TESTCLASSES} PropertiesTest
 if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
 if [ ! -f dump3 ]; then  echo "file dump3 not created. Test cannot execute.  Failed."; exit 1; fi
 
+# run bug7102969 test
+echo ''
+${WRITABLEJDK}${FS}bin${FS}java ${TESTVMOPTS} -cp ${TESTCLASSES} PropertiesTest bug7102969
+if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
+
+# run bug8157138 test
+echo ''
+${WRITABLEJDK}${FS}bin${FS}java ${TESTVMOPTS} -cp ${TESTCLASSES} PropertiesTest bug8157138
+if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
+
 # Cleanup
 rm -rf $WRITABLEJDK
 
diff --git a/jdk/test/java/util/Currency/currency.properties b/jdk/test/java/util/Currency/currency.properties
index d8e874d819a..57b293542b8 100644
--- a/jdk/test/java/util/Currency/currency.properties
+++ b/jdk/test/java/util/Currency/currency.properties
@@ -6,7 +6,7 @@
 CL=CLF,990,4
 CM=IED,111,2, 2004-01-01T00:70:00
 ES=ESD,877,2
-JP=JPZ,123,2
+JP=ABC,999,0
 MA=MAA,555,5
 MC=MCC,555,6
 MD=MDD,555,7
diff --git a/jdk/test/java/util/Currency/tablea1.txt b/jdk/test/java/util/Currency/tablea1.txt
index 92e43adf2be..dacc0fb5210 100644
--- a/jdk/test/java/util/Currency/tablea1.txt
+++ b/jdk/test/java/util/Currency/tablea1.txt
@@ -5,7 +5,7 @@
 #
 
 # Version
-FILEVERSION=2
+FILEVERSION=3
 DATAVERSION=160
 
 # ISO 4217 currency data
diff --git a/jdk/test/java/util/TimeZone/Bug8149452.java b/jdk/test/java/util/TimeZone/Bug8149452.java
new file mode 100644
index 00000000000..eb4c0bced15
--- /dev/null
+++ b/jdk/test/java/util/TimeZone/Bug8149452.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2016, 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 8149452
+ * @summary Check the missing time zone names.
+ */
+import java.text.DateFormatSymbols;
+import java.util.ArrayList;
+import java.util.TimeZone;
+import java.util.Arrays;
+import java.util.List;
+
+public class Bug8149452 {
+
+    public static void main(String[] args) {
+
+        List<String> listNotFound = new ArrayList<>();
+        String[][] zoneStrings = DateFormatSymbols.getInstance()
+                .getZoneStrings();
+        for (String tzID : TimeZone.getAvailableIDs()) {
+            if (!Arrays.stream(zoneStrings)
+                    .anyMatch(zone -> tzID.equalsIgnoreCase(zone[0]))) {
+                // to ignore names for Etc/GMT[+-][0-9]+ which are not supported
+                if (!tzID.startsWith("Etc/GMT") && !tzID.startsWith("GMT")) {
+                    listNotFound.add(tzID);
+                }
+            }
+        }
+
+        if (!listNotFound.isEmpty()) {
+            throw new RuntimeException("Test Failed: Time Zone Strings for "
+                    + listNotFound + " not found");
+        }
+
+    }
+
+}

From e9883313311666c9f00d047aead7c4a720840274 Mon Sep 17 00:00:00 2001
From: Henry Jen <henryjen@openjdk.org>
Date: Thu, 19 May 2016 21:59:35 -0700
Subject: [PATCH 164/228] 8156478: 3 Buffer overrun defect groups in jexec.c

Reviewed-by: ksrini
---
 jdk/src/java.base/unix/native/launcher/jexec.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jdk/src/java.base/unix/native/launcher/jexec.c b/jdk/src/java.base/unix/native/launcher/jexec.c
index 179ae4f893c..d2888234674 100644
--- a/jdk/src/java.base/unix/native/launcher/jexec.c
+++ b/jdk/src/java.base/unix/native/launcher/jexec.c
@@ -331,6 +331,7 @@ const char * isJar(const char * path) {
                 off_t end   = start  + xlen;
 
                 if (end <= count) {
+                    end -= 4; // make sure there are 4 bytes to read at start
                     while (start < end) {
                         off_t xhid  = SH(buf, start);
                         off_t xdlen = SH(buf, start + 2);

From 81a0fa24dd96ddda17be72e03401220d70f82026 Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Fri, 20 May 2016 01:47:32 -0400
Subject: [PATCH 165/228] 8149901: [Solaris] Use of -XX:+UseThreadPriorities
 crashes fastdebug

Reviewed-by: gziemski, sspitsyn
---
 hotspot/src/os/solaris/vm/os_solaris.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/hotspot/src/os/solaris/vm/os_solaris.cpp b/hotspot/src/os/solaris/vm/os_solaris.cpp
index 1b02694822e..8dc9f845655 100644
--- a/hotspot/src/os/solaris/vm/os_solaris.cpp
+++ b/hotspot/src/os/solaris/vm/os_solaris.cpp
@@ -756,15 +756,9 @@ extern "C" void* thread_native_entry(void* thread_addr) {
     }
   }
 
-  // If the creator called set priority before we started,
-  // we need to call set_native_priority now that we have an lwp.
-  // We used to get the priority from thr_getprio (we called
-  // thr_setprio way back in create_thread) and pass it to
-  // set_native_priority, but Solaris scales the priority
-  // in java_to_os_priority, so when we read it back here,
-  // we pass trash to set_native_priority instead of what's
-  // in java_to_os_priority. So we save the native priority
-  // in the osThread and recall it here.
+  // Our priority was set when we were created, and stored in the
+  // osthread, but couldn't be passed through to our LWP until now.
+  // So read back the priority and set it again.
 
   if (osthr->thread_id() != -1) {
     if (UseThreadPriorities) {
@@ -1044,6 +1038,10 @@ bool os::create_thread(Thread* thread, ThreadType thr_type,
   // Remember that we created this thread so we can set priority on it
   osthread->set_vm_created();
 
+  // Most thread types will set an explicit priority before starting the thread,
+  // but for those that don't we need a valid value to read back in thread_native_entry.
+  osthread->set_native_priority(NormPriority);
+
   // Initial thread state is INITIALIZED, not SUSPENDED
   osthread->set_state(INITIALIZED);
 

From 53ef4fecbfcc3a38c9ded5211e7e3bbcfe5ba760 Mon Sep 17 00:00:00 2001
From: Paul Sandoz <psandoz@openjdk.org>
Date: Fri, 20 May 2016 11:47:39 +0200
Subject: [PATCH 166/228] 8130023: API java.util.stream: explicitly specify
 guaranteed execution of the pipeline

Reviewed-by: briangoetz, redestad
---
 .../java/util/stream/DoubleStream.java        |  5 +++
 .../classes/java/util/stream/IntStream.java   |  5 +++
 .../classes/java/util/stream/LongStream.java  |  5 +++
 .../classes/java/util/stream/Stream.java      | 18 ++++++++++
 .../java/util/stream/package-info.java        | 33 ++++++++++++++-----
 5 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/jdk/src/java.base/share/classes/java/util/stream/DoubleStream.java b/jdk/src/java.base/share/classes/java/util/stream/DoubleStream.java
index 9d25d902bb4..d25aabfbc4d 100644
--- a/jdk/src/java.base/share/classes/java/util/stream/DoubleStream.java
+++ b/jdk/src/java.base/share/classes/java/util/stream/DoubleStream.java
@@ -211,6 +211,11 @@ public interface DoubleStream extends BaseStream<Double, DoubleStream> {
      *         .sum();
      * }</pre>
      *
+     * <p>In cases where stream implementation is able to optimize away the
+     * production of some or all the elements (such as with short-circuiting
+     * operations like {@code findFirst}, or in the example described in
+     * {@link #count}), the action will not be invoked for those elements.
+     *
      * @param action a <a href="package-summary.html#NonInterference">
      *               non-interfering</a> action to perform on the elements as
      *               they are consumed from the stream
diff --git a/jdk/src/java.base/share/classes/java/util/stream/IntStream.java b/jdk/src/java.base/share/classes/java/util/stream/IntStream.java
index 115a782937f..2586de45240 100644
--- a/jdk/src/java.base/share/classes/java/util/stream/IntStream.java
+++ b/jdk/src/java.base/share/classes/java/util/stream/IntStream.java
@@ -209,6 +209,11 @@ public interface IntStream extends BaseStream<Integer, IntStream> {
      *         .sum();
      * }</pre>
      *
+     * <p>In cases where stream implementation is able to optimize away the
+     * production of some or all the elements (such as with short-circuiting
+     * operations like {@code findFirst}, or in the example described in
+     * {@link #count}), the action will not be invoked for those elements.
+     *
      * @param action a <a href="package-summary.html#NonInterference">
      *               non-interfering</a> action to perform on the elements as
      *               they are consumed from the stream
diff --git a/jdk/src/java.base/share/classes/java/util/stream/LongStream.java b/jdk/src/java.base/share/classes/java/util/stream/LongStream.java
index f987820c5a8..d01b79ae507 100644
--- a/jdk/src/java.base/share/classes/java/util/stream/LongStream.java
+++ b/jdk/src/java.base/share/classes/java/util/stream/LongStream.java
@@ -209,6 +209,11 @@ public interface LongStream extends BaseStream<Long, LongStream> {
      *         .sum();
      * }</pre>
      *
+     * <p>In cases where stream implementation is able to optimize away the
+     * production of some or all the elements (such as with short-circuiting
+     * operations like {@code findFirst}, or in the example described in
+     * {@link #count}), the action will not be invoked for those elements.
+     *
      * @param action a <a href="package-summary.html#NonInterference">
      *               non-interfering</a> action to perform on the elements as
      *               they are consumed from the stream
diff --git a/jdk/src/java.base/share/classes/java/util/stream/Stream.java b/jdk/src/java.base/share/classes/java/util/stream/Stream.java
index 1dd1d43f91d..ac610dd6199 100644
--- a/jdk/src/java.base/share/classes/java/util/stream/Stream.java
+++ b/jdk/src/java.base/share/classes/java/util/stream/Stream.java
@@ -82,6 +82,19 @@ import java.util.function.UnaryOperator;
  * terminal operation is initiated, and source elements are consumed only
  * as needed.
  *
+ * <p>A stream implementation is permitted significant latitude in optimizing
+ * the computation of the result.  For example, a stream implementation is free
+ * to elide operations (or entire stages) from a stream pipeline -- and
+ * therefore elide invocation of behavioral parameters -- if it can prove that
+ * it would not affect the result of the computation.  This means that
+ * side-effects of behavioral parameters may not always be executed and should
+ * not be relied upon, unless otherwise specified (such as by the terminal
+ * operations {@code forEach} and {@code forEachOrdered}). (For a specific
+ * example of such an optimization, see the API note documented on the
+ * {@link #count} operation.  For more detail, see the
+ * <a href="package-summary.html#SideEffects">side-effects</a> section of the
+ * strean package documentation.)
+ *
  * <p>Collections and streams, while bearing some superficial similarities,
  * have different goals.  Collections are primarily concerned with the efficient
  * management of, and access to, their elements.  By contrast, streams do not
@@ -415,6 +428,11 @@ public interface Stream<T> extends BaseStream<T, Stream<T>> {
      *         .collect(Collectors.toList());
      * }</pre>
      *
+     * <p>In cases where stream implementation is able to optimize away the
+     * production of some or all the elements (such as with short-circuiting
+     * operations like {@code findFirst}, or in the example described in
+     * {@link #count}), the action will not be invoked for those elements.
+     *
      * @param action a <a href="package-summary.html#NonInterference">
      *                 non-interfering</a> action to perform on the elements as
      *                 they are consumed from the stream
diff --git a/jdk/src/java.base/share/classes/java/util/stream/package-info.java b/jdk/src/java.base/share/classes/java/util/stream/package-info.java
index 2850e21bbbd..f580d8fb372 100644
--- a/jdk/src/java.base/share/classes/java/util/stream/package-info.java
+++ b/jdk/src/java.base/share/classes/java/util/stream/package-info.java
@@ -287,18 +287,35 @@
  * statelessness requirement, as well as other thread-safety hazards.
  *
  * <p>If the behavioral parameters do have side-effects, unless explicitly
- * stated, there are no guarantees as to the
- * <a href="../concurrent/package-summary.html#MemoryVisibility"><i>visibility</i></a>
- * of those side-effects to other threads, nor are there any guarantees that
- * different operations on the "same" element within the same stream pipeline
- * are executed in the same thread.  Further, the ordering of those effects
- * may be surprising.  Even when a pipeline is constrained to produce a
- * <em>result</em> that is consistent with the encounter order of the stream
- * source (for example, {@code IntStream.range(0,5).parallel().map(x -> x*2).toArray()}
+ * stated, there are no guarantees as to:
+ * <ul>
+ *    <li>the <a href="../concurrent/package-summary.html#MemoryVisibility">
+ *    <i>visibility</i></a> of those side-effects to other threads;</li>
+ *    <li>that different operations on the "same" element within the same stream
+ *    pipeline are executed in the same thread; and</li>
+ *    <li>that behavioral parameters are always invoked, since a stream
+ *    implementation is free to elide operations (or entire stages) from a
+ *    stream pipeline if it can prove that it would not affect the result of the
+ *    computation.
+ *    </li>
+ * </ul>
+ * <p>The ordering of side-effects may be surprising.  Even when a pipeline is
+ * constrained to produce a <em>result</em> that is consistent with the
+ * encounter order of the stream source (for example,
+ * {@code IntStream.range(0,5).parallel().map(x -> x*2).toArray()}
  * must produce {@code [0, 2, 4, 6, 8]}), no guarantees are made as to the order
  * in which the mapper function is applied to individual elements, or in what
  * thread any behavioral parameter is executed for a given element.
  *
+ * <p>The eliding of side-effects may also be surprising.  With the exception of
+ * terminal operations {@link java.util.stream.Stream#forEach forEach} and
+ * {@link java.util.stream.Stream#forEachOrdered forEachOrdered}, side-effects
+ * of behavioral parameters may not always be executed when the stream
+ * implementation can optimize away the execution of behavioral parameters
+ * without affecting the result of the computation.  (For a specific example
+ * see the API note documented on the {@link java.util.stream.Stream#count count}
+ * operation.)
+ *
  * <p>Many computations where one might be tempted to use side effects can be more
  * safely and efficiently expressed without side-effects, such as using
  * <a href="package-summary.html#Reduction">reduction</a> instead of mutable

From 524ec2f1de43ae20591b74148b23ff13fe7eab58 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Fri, 20 May 2016 03:33:57 -0700
Subject: [PATCH 167/228] 8157211: Mark tools/launcher/FXLauncherTest.java as
 intermittently failing

Reviewed-by: psandoz
---
 jdk/test/tools/launcher/FXLauncherTest.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jdk/test/tools/launcher/FXLauncherTest.java b/jdk/test/tools/launcher/FXLauncherTest.java
index 0ee9d981cda..7fec8d59d36 100644
--- a/jdk/test/tools/launcher/FXLauncherTest.java
+++ b/jdk/test/tools/launcher/FXLauncherTest.java
@@ -29,6 +29,7 @@
  * jfx app class, a main-class for the manifest, a bogus one and none.
  * All should execute except the incorrect fx app class entries.
  * @run main/othervm FXLauncherTest
+ * @key intermittent
  */
 import java.io.File;
 import java.io.IOException;

From 1570c8ce43b4271094f2c19bb85b78120639d41f Mon Sep 17 00:00:00 2001
From: Michail Chernov <mchernov@openjdk.org>
Date: Fri, 20 May 2016 14:53:13 +0300
Subject: [PATCH 168/228] 8154787: gc/g1/Test2GbHeap.java fails with
 java.lang.RuntimeException

Reviewed-by: jprovino, dfazunen, jmasa, drwhite
---
 hotspot/test/gc/g1/Test2GbHeap.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hotspot/test/gc/g1/Test2GbHeap.java b/hotspot/test/gc/g1/Test2GbHeap.java
index 9ef0f1a7544..c81f69e4bd8 100644
--- a/hotspot/test/gc/g1/Test2GbHeap.java
+++ b/hotspot/test/gc/g1/Test2GbHeap.java
@@ -25,9 +25,9 @@
  * @test Test2GbHeap
  * @bug 8031686
  * @summary Regression test to ensure we can start G1 with 2gb heap.
- * Skip test on 32 bit Windows: it typically does not support the many and large virtual memory reservations needed.
+ * Skip test on 32 bit system: it typically does not support the many and large virtual memory reservations needed.
  * @requires (vm.gc == "G1" | vm.gc == "null")
- * @requires !((sun.arch.data.model == "32") & (os.family == "windows"))
+ * @requires vm.bits != "32"
  * @key gc
  * @key regression
  * @library /testlibrary

From 65a33061cefd9650b06d85d8c7220a2a260996eb Mon Sep 17 00:00:00 2001
From: Paul Sandoz <psandoz@openjdk.org>
Date: Fri, 20 May 2016 14:07:21 +0200
Subject: [PATCH 169/228] 8157437: Typos in Stream JavaDoc

Reviewed-by: shade, alanb, lancea
---
 .../share/classes/java/util/stream/AbstractTask.java          | 2 +-
 .../share/classes/java/util/stream/DoubleStream.java          | 2 +-
 .../java.base/share/classes/java/util/stream/IntStream.java   | 2 +-
 .../java.base/share/classes/java/util/stream/LongStream.java  | 2 +-
 jdk/src/java.base/share/classes/java/util/stream/Stream.java  | 4 ++--
 .../share/classes/java/util/stream/StreamSpliterators.java    | 3 +--
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/jdk/src/java.base/share/classes/java/util/stream/AbstractTask.java b/jdk/src/java.base/share/classes/java/util/stream/AbstractTask.java
index 33de7d5c52a..f6bd8f5fc00 100644
--- a/jdk/src/java.base/share/classes/java/util/stream/AbstractTask.java
+++ b/jdk/src/java.base/share/classes/java/util/stream/AbstractTask.java
@@ -106,7 +106,7 @@ abstract class AbstractTask<P_IN, P_OUT, R,
     protected Spliterator<P_IN> spliterator;
 
     /** Target leaf size, common to all tasks in a computation */
-    protected long targetSize; // may be laziliy initialized
+    protected long targetSize; // may be lazily initialized
 
     /**
      * The left child.
diff --git a/jdk/src/java.base/share/classes/java/util/stream/DoubleStream.java b/jdk/src/java.base/share/classes/java/util/stream/DoubleStream.java
index d25aabfbc4d..ad250753673 100644
--- a/jdk/src/java.base/share/classes/java/util/stream/DoubleStream.java
+++ b/jdk/src/java.base/share/classes/java/util/stream/DoubleStream.java
@@ -211,7 +211,7 @@ public interface DoubleStream extends BaseStream<Double, DoubleStream> {
      *         .sum();
      * }</pre>
      *
-     * <p>In cases where stream implementation is able to optimize away the
+     * <p>In cases where the stream implementation is able to optimize away the
      * production of some or all the elements (such as with short-circuiting
      * operations like {@code findFirst}, or in the example described in
      * {@link #count}), the action will not be invoked for those elements.
diff --git a/jdk/src/java.base/share/classes/java/util/stream/IntStream.java b/jdk/src/java.base/share/classes/java/util/stream/IntStream.java
index 2586de45240..9c729772c0c 100644
--- a/jdk/src/java.base/share/classes/java/util/stream/IntStream.java
+++ b/jdk/src/java.base/share/classes/java/util/stream/IntStream.java
@@ -209,7 +209,7 @@ public interface IntStream extends BaseStream<Integer, IntStream> {
      *         .sum();
      * }</pre>
      *
-     * <p>In cases where stream implementation is able to optimize away the
+     * <p>In cases where the stream implementation is able to optimize away the
      * production of some or all the elements (such as with short-circuiting
      * operations like {@code findFirst}, or in the example described in
      * {@link #count}), the action will not be invoked for those elements.
diff --git a/jdk/src/java.base/share/classes/java/util/stream/LongStream.java b/jdk/src/java.base/share/classes/java/util/stream/LongStream.java
index d01b79ae507..7965bfd06a6 100644
--- a/jdk/src/java.base/share/classes/java/util/stream/LongStream.java
+++ b/jdk/src/java.base/share/classes/java/util/stream/LongStream.java
@@ -209,7 +209,7 @@ public interface LongStream extends BaseStream<Long, LongStream> {
      *         .sum();
      * }</pre>
      *
-     * <p>In cases where stream implementation is able to optimize away the
+     * <p>In cases where the stream implementation is able to optimize away the
      * production of some or all the elements (such as with short-circuiting
      * operations like {@code findFirst}, or in the example described in
      * {@link #count}), the action will not be invoked for those elements.
diff --git a/jdk/src/java.base/share/classes/java/util/stream/Stream.java b/jdk/src/java.base/share/classes/java/util/stream/Stream.java
index ac610dd6199..7ab71a50aee 100644
--- a/jdk/src/java.base/share/classes/java/util/stream/Stream.java
+++ b/jdk/src/java.base/share/classes/java/util/stream/Stream.java
@@ -93,7 +93,7 @@ import java.util.function.UnaryOperator;
  * example of such an optimization, see the API note documented on the
  * {@link #count} operation.  For more detail, see the
  * <a href="package-summary.html#SideEffects">side-effects</a> section of the
- * strean package documentation.)
+ * stream package documentation.)
  *
  * <p>Collections and streams, while bearing some superficial similarities,
  * have different goals.  Collections are primarily concerned with the efficient
@@ -428,7 +428,7 @@ public interface Stream<T> extends BaseStream<T, Stream<T>> {
      *         .collect(Collectors.toList());
      * }</pre>
      *
-     * <p>In cases where stream implementation is able to optimize away the
+     * <p>In cases where the stream implementation is able to optimize away the
      * production of some or all the elements (such as with short-circuiting
      * operations like {@code findFirst}, or in the example described in
      * {@link #count}), the action will not be invoked for those elements.
diff --git a/jdk/src/java.base/share/classes/java/util/stream/StreamSpliterators.java b/jdk/src/java.base/share/classes/java/util/stream/StreamSpliterators.java
index cb92b2ebfad..8236255d5ef 100644
--- a/jdk/src/java.base/share/classes/java/util/stream/StreamSpliterators.java
+++ b/jdk/src/java.base/share/classes/java/util/stream/StreamSpliterators.java
@@ -28,7 +28,6 @@ import java.util.Comparator;
 import java.util.Objects;
 import java.util.Spliterator;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
@@ -104,7 +103,7 @@ class StreamSpliterators {
         T_BUFFER buffer;
 
         /**
-         * True if full traversal has occurred (with possible cancelation).
+         * True if full traversal has occurred (with possible cancellation).
          * If doing a partial traversal, there may be still elements in buffer.
          */
         boolean finished;

From 3648a0f15f2c71fc871d10bd5b71d99d5737dcff Mon Sep 17 00:00:00 2001
From: Jim Laskey <jlaskey@openjdk.org>
Date: Fri, 20 May 2016 11:41:29 -0300
Subject: [PATCH 170/228] 8156602: javac crashes again on Windows 32-bit with
 ClosedChannelException

Reviewed-by: alanb
---
 .../jdk/internal/jimage/BasicImageReader.java | 32 ++++++-
 .../classes/sun/nio/ch/FileChannelImpl.java   | 14 ++-
 jdk/test/TEST.groups                          |  3 +-
 .../jdk/internal/jimage/JImageOpenTest.java   | 95 +++++++++++++++++++
 4 files changed, 138 insertions(+), 6 deletions(-)
 create mode 100644 jdk/test/jdk/internal/jimage/JImageOpenTest.java

diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java b/jdk/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java
index 9b21fb6c1be..68b076784f5 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java
+++ b/jdk/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java
@@ -27,6 +27,8 @@ package jdk.internal.jimage;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.IntBuffer;
@@ -98,8 +100,34 @@ public class BasicImageReader implements AutoCloseable {
         }
 
         // Open the file only if no memory map yet or is 32 bit jvm
-        channel = map != null && MAP_ALL ? null :
-                  FileChannel.open(imagePath, StandardOpenOption.READ);
+        if (map != null && MAP_ALL) {
+            channel = null;
+        } else {
+            channel = FileChannel.open(imagePath, StandardOpenOption.READ);
+            // No lambdas during bootstrap
+            AccessController.doPrivileged(new PrivilegedAction<Void>() {
+                @Override
+                public Void run() {
+                    if (BasicImageReader.class.getClassLoader() == null) {
+                        try {
+                            Class<?> fileChannelImpl =
+                                Class.forName("sun.nio.ch.FileChannelImpl");
+                            Method setUninterruptible =
+                                    fileChannelImpl.getMethod("setUninterruptible");
+                            setUninterruptible.invoke(channel);
+                        } catch (ClassNotFoundException |
+                                 NoSuchMethodException |
+                                 IllegalAccessException |
+                                 InvocationTargetException ex) {
+                            // fall thru - will only happen on JDK-8 systems where this code
+                            // is only used by tools using jrt-fs (non-critical.)
+                        }
+                    }
+
+                    return null;
+                }
+            });
+        }
 
         // If no memory map yet and 64 bit jvm then memory map entire file
         if (MAP_ALL && map == null) {
diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java b/jdk/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java
index deefc8529f9..df9364a11d8 100644
--- a/jdk/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java
+++ b/jdk/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java
@@ -40,7 +40,6 @@ import java.nio.channels.OverlappingFileLockException;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.SelectableChannel;
 import java.nio.channels.WritableByteChannel;
-import java.security.AccessController;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -83,6 +82,9 @@ public class FileChannelImpl
     // Lock for operations involving position and size
     private final Object positionLock = new Object();
 
+    // Positional-read is not interruptible
+    private volatile boolean uninterruptible;
+
     private FileChannelImpl(FileDescriptor fd, String path, boolean readable,
                             boolean writable, Object parent)
     {
@@ -108,6 +110,10 @@ public class FileChannelImpl
             throw new ClosedChannelException();
     }
 
+    public void setUninterruptible() {
+        uninterruptible = true;
+    }
+
     // -- Standard channel operations --
 
     protected void implCloseChannel() throws IOException {
@@ -733,8 +739,10 @@ public class FileChannelImpl
         assert !nd.needsPositionLock() || Thread.holdsLock(positionLock);
         int n = 0;
         int ti = -1;
+
+        boolean interruptible = !uninterruptible;
         try {
-            begin();
+            if (interruptible) begin();
             ti = threads.add();
             if (!isOpen())
                 return -1;
@@ -744,7 +752,7 @@ public class FileChannelImpl
             return IOStatus.normalize(n);
         } finally {
             threads.remove(ti);
-            end(n > 0);
+            if (interruptible) end(n > 0);
             assert IOStatus.check(n);
         }
     }
diff --git a/jdk/test/TEST.groups b/jdk/test/TEST.groups
index 3f5461582e5..2e82e3b2585 100644
--- a/jdk/test/TEST.groups
+++ b/jdk/test/TEST.groups
@@ -76,6 +76,7 @@ jdk_lang = \
     jdk/lambda \
     jdk/internal/misc \
     jdk/internal/ref \
+    jdk/internal/jimage \
     jdk/modules \
     vm
 
@@ -352,7 +353,7 @@ jdk_desktop = \
 # SwingSet3 tests.
 jdk_client_sanity = \
     sanity/client/SwingSet
-    
+
 ###############################################################################
 #
 # Serviceability sanity groups
diff --git a/jdk/test/jdk/internal/jimage/JImageOpenTest.java b/jdk/test/jdk/internal/jimage/JImageOpenTest.java
new file mode 100644
index 00000000000..06c19937a41
--- /dev/null
+++ b/jdk/test/jdk/internal/jimage/JImageOpenTest.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2015, 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 java.lang.reflect.Layer;
+import java.net.URI;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/*
+ * jimage shared open testing.
+ * @test
+ * @summary Test to see if thread interrupt handling interferes with other threads.
+ * @build JImageOpenTest.java
+ * @run main/othervm -Djdk.image.map.all=false JImageOpenTest
+ */
+public class JImageOpenTest {
+    private static final int NTHREADS = 10;
+
+    public static void main(String[] args) throws Exception {
+
+        final FileSystem fs = FileSystems.getFileSystem(URI.create("jrt:/"));
+        final Path root = fs.getPath("/modules");
+
+        final List<String> names = Files.walk(root)
+                .filter(p -> p.getNameCount() > 2)
+                .filter(p -> Layer.boot().findModule(p.getName(1).toString()).isPresent())
+                .map(p -> p.subpath(2, p.getNameCount()))
+                .map(p -> p.toString())
+                .filter(s -> s.endsWith(".class") && !s.endsWith("module-info.class"))
+                .collect(Collectors.toList());
+
+        Runnable r = new Runnable() {
+            @Override
+            public void run() {
+                names.forEach(name -> {
+                    String cn = name.substring(0, name.length() - 6).replace('/', '.');
+                    try {
+                        Class.forName(cn, false, ClassLoader.getSystemClassLoader());
+                    } catch (Exception ex) {
+                        System.err.println(Thread.currentThread() + " " + ex.getClass());
+                    }
+                });
+            }
+        };
+
+        Thread[] threads = new Thread[NTHREADS];
+
+        for (int i = 0; i < NTHREADS; i++) {
+            Thread thread =  new Thread(r);
+            threads[i] = thread;
+            thread.start();
+        }
+
+        Thread.sleep(1);
+
+        for (int i = 0; i < NTHREADS; i++) {
+            Thread thread = threads[i];
+
+            if (thread.isAlive()) {
+                thread.interrupt();
+                break;
+            }
+        }
+
+        for (int i = 0; i < NTHREADS; i++) {
+            Thread thread = threads[i];
+            thread.join();
+        }
+    }
+}

From 4880e22424934702a13e39aad880af6130d77f50 Mon Sep 17 00:00:00 2001
From: Artem Smotrakov <asmotrak@openjdk.org>
Date: Fri, 20 May 2016 09:40:29 -0700
Subject: [PATCH 171/228] 8129389: javax/net/ssl/DTLS tests fail intermittently

Reviewed-by: xuelei
---
 .../javax/net/ssl/DTLS/DTLSOverDatagram.java  | 323 +++++++++++-------
 jdk/test/javax/net/ssl/DTLS/Reordered.java    |  13 +-
 .../javax/net/ssl/DTLS/Retransmission.java    |  18 +-
 3 files changed, 220 insertions(+), 134 deletions(-)

diff --git a/jdk/test/javax/net/ssl/DTLS/DTLSOverDatagram.java b/jdk/test/javax/net/ssl/DTLS/DTLSOverDatagram.java
index 6592555706d..35f35a5c410 100644
--- a/jdk/test/javax/net/ssl/DTLS/DTLSOverDatagram.java
+++ b/jdk/test/javax/net/ssl/DTLS/DTLSOverDatagram.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,8 +47,16 @@ import sun.security.util.HexDumpEncoder;
  * An example to show the way to use SSLEngine in datagram connections.
  */
 public class DTLSOverDatagram {
+
+    static {
+        System.setProperty("javax.net.debug", "ssl");
+    }
+
     private static int MAX_HANDSHAKE_LOOPS = 200;
     private static int MAX_APP_READ_LOOPS = 60;
+    private static int SOCKET_TIMEOUT = 10 * 1000; // in millis
+    private static int BUFFER_SIZE = 1024;
+    private static int MAXIMUM_PACKET_SIZE = 1024;
 
     /*
      * The following is to set up the keystores.
@@ -84,37 +92,33 @@ public class DTLSOverDatagram {
     /*
      * Define the server side of the test.
      */
-    void doServerSide() throws Exception {
-        DatagramSocket socket = serverDatagramSocket;
-        socket.setSoTimeout(10000);   // 10 second
+    void doServerSide(DatagramSocket socket, InetSocketAddress clientSocketAddr)
+            throws Exception {
 
         // create SSLEngine
         SSLEngine engine = createSSLEngine(false);
 
         // handshaking
-        handshake(engine, socket, clientSocketAddr);
+        handshake(engine, socket, clientSocketAddr, "Server");
 
         // read client application data
         receiveAppData(engine, socket, clientApp);
 
         // write server application data
         deliverAppData(engine, socket, serverApp, clientSocketAddr);
-
-        socket.close();
     }
 
     /*
      * Define the client side of the test.
      */
-    void doClientSide() throws Exception {
-        DatagramSocket socket = clientDatagramSocket;
-        socket.setSoTimeout(1000);     // 1 second read timeout
+    void doClientSide(DatagramSocket socket, InetSocketAddress serverSocketAddr)
+            throws Exception {
 
         // create SSLEngine
         SSLEngine engine = createSSLEngine(true);
 
         // handshaking
-        handshake(engine, socket, serverSocketAddr);
+        handshake(engine, socket, serverSocketAddr, "Client");
 
         // write client application data
         deliverAppData(engine, socket, clientApp, serverSocketAddr);
@@ -132,7 +136,7 @@ public class DTLSOverDatagram {
         SSLEngine engine = context.createSSLEngine();
 
         SSLParameters paras = engine.getSSLParameters();
-        paras.setMaximumPacketSize(1024);
+        paras.setMaximumPacketSize(MAXIMUM_PACKET_SIZE);
 
         engine.setUseClientMode(isClient);
         engine.setSSLParameters(paras);
@@ -142,7 +146,7 @@ public class DTLSOverDatagram {
 
     // handshake
     void handshake(SSLEngine engine, DatagramSocket socket,
-            SocketAddress peerAddr) throws Exception {
+            SocketAddress peerAddr, String side) throws Exception {
 
         boolean endLoops = false;
         int loops = MAX_HANDSHAKE_LOOPS;
@@ -159,39 +163,60 @@ public class DTLSOverDatagram {
             if (hs == SSLEngineResult.HandshakeStatus.NEED_UNWRAP ||
                 hs == SSLEngineResult.HandshakeStatus.NEED_UNWRAP_AGAIN) {
 
+                log(side, "Receive DTLS records, handshake status is " + hs);
+
                 ByteBuffer iNet;
                 ByteBuffer iApp;
                 if (hs == SSLEngineResult.HandshakeStatus.NEED_UNWRAP) {
-                    // receive ClientHello request and other SSL/TLS records
-                    byte[] buf = new byte[1024];
+                    byte[] buf = new byte[BUFFER_SIZE];
                     DatagramPacket packet = new DatagramPacket(buf, buf.length);
                     try {
                         socket.receive(packet);
                     } catch (SocketTimeoutException ste) {
-                        List<DatagramPacket> packets =
-                                onReceiveTimeout(engine, peerAddr);
+                        log(side, "Warning: " + ste);
+
+                        List<DatagramPacket> packets = new ArrayList<>();
+                        boolean finished = onReceiveTimeout(
+                                engine, peerAddr, side, packets);
+
                         for (DatagramPacket p : packets) {
                             socket.send(p);
                         }
 
+                        if (finished) {
+                            log(side, "Handshake status is FINISHED "
+                                    + "after calling onReceiveTimeout(), "
+                                    + "finish the loop");
+                            endLoops = true;
+                        }
+
+                        log(side, "New handshake status is "
+                                + engine.getHandshakeStatus());
+
                         continue;
                     }
 
                     iNet = ByteBuffer.wrap(buf, 0, packet.getLength());
-                    iApp = ByteBuffer.allocate(1024);
+                    iApp = ByteBuffer.allocate(BUFFER_SIZE);
                 } else {
                     iNet = ByteBuffer.allocate(0);
-                    iApp = ByteBuffer.allocate(1024);
+                    iApp = ByteBuffer.allocate(BUFFER_SIZE);
                 }
 
                 SSLEngineResult r = engine.unwrap(iNet, iApp);
                 SSLEngineResult.Status rs = r.getStatus();
                 hs = r.getHandshakeStatus();
-                if (rs == SSLEngineResult.Status.BUFFER_OVERFLOW) {
+                if (rs == SSLEngineResult.Status.OK) {
+                    // OK
+                } else if (rs == SSLEngineResult.Status.BUFFER_OVERFLOW) {
+                    log(side, "BUFFER_OVERFLOW, handshake status is " + hs);
+
                     // the client maximum fragment size config does not work?
                     throw new Exception("Buffer overflow: " +
                         "incorrect client maximum fragment size");
                 } else if (rs == SSLEngineResult.Status.BUFFER_UNDERFLOW) {
+                    log(side, "BUFFER_UNDERFLOW, handshake status is " + hs);
+
                     // bad packet, or the client maximum fragment size
                     // config does not work?
                     if (hs != SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING) {
@@ -199,31 +224,64 @@ public class DTLSOverDatagram {
                             "incorrect client maximum fragment size");
                     } // otherwise, ignore this packet
                 } else if (rs == SSLEngineResult.Status.CLOSED) {
-                    endLoops = true;
-                }   // otherwise, SSLEngineResult.Status.OK:
+                    throw new Exception(
+                            "SSL engine closed, handshake status is " + hs);
+                } else {
+                    throw new Exception("Can't reach here, result is " + rs);
+                }
 
-                if (rs != SSLEngineResult.Status.OK) {
-                    continue;
+                if (hs == SSLEngineResult.HandshakeStatus.FINISHED) {
+                    log(side, "Handshake status is FINISHED, finish the loop");
+                    endLoops = true;
                 }
             } else if (hs == SSLEngineResult.HandshakeStatus.NEED_WRAP) {
-                List<DatagramPacket> packets =
-                        produceHandshakePackets(engine, peerAddr);
+                List<DatagramPacket> packets = new ArrayList<>();
+                boolean finished = produceHandshakePackets(
+                    engine, peerAddr, side, packets);
+
                 for (DatagramPacket p : packets) {
                     socket.send(p);
                 }
+
+                if (finished) {
+                    log(side, "Handshake status is FINISHED "
+                            + "after producing handshake packets, "
+                            + "finish the loop");
+                    endLoops = true;
+                }
             } else if (hs == SSLEngineResult.HandshakeStatus.NEED_TASK) {
                 runDelegatedTasks(engine);
             } else if (hs == SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING) {
-                // OK, time to do application data exchange.
+                log(side, "Handshake status is NOT_HANDSHAKING, finish the loop");
                 endLoops = true;
             } else if (hs == SSLEngineResult.HandshakeStatus.FINISHED) {
-                endLoops = true;
+                throw new Exception(
+                        "Unexpected status, SSLEngine.getHandshakeStatus() "
+                                + "shouldn't return FINISHED");
+            } else {
+                throw new Exception("Can't reach here, handshake status is " + hs);
             }
         }
 
         SSLEngineResult.HandshakeStatus hs = engine.getHandshakeStatus();
+        log(side, "Handshake finished, status is " + hs);
+
+        if (engine.getHandshakeSession() != null) {
+            throw new Exception(
+                    "Handshake finished, but handshake session is not null");
+        }
+
+        SSLSession session = engine.getSession();
+        if (session == null) {
+            throw new Exception("Handshake finished, but session is null");
+        }
+        log(side, "Negotiated protocol is " + session.getProtocol());
+        log(side, "Negotiated cipher suite is " + session.getCipherSuite());
+
+        // handshake status should be NOT_HANDSHAKING
+        // according to the spec, SSLEngine.getHandshakeStatus() can't return FINISHED
         if (hs != SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING) {
-            throw new Exception("Not ready for application data yet");
+            throw new Exception("Unexpected handshake status " + hs);
         }
     }
 
@@ -251,11 +309,11 @@ public class DTLSOverDatagram {
                         "Too much loops to receive application data");
             }
 
-            byte[] buf = new byte[1024];
+            byte[] buf = new byte[BUFFER_SIZE];
             DatagramPacket packet = new DatagramPacket(buf, buf.length);
             socket.receive(packet);
             ByteBuffer netBuffer = ByteBuffer.wrap(buf, 0, packet.getLength());
-            ByteBuffer recBuffer = ByteBuffer.allocate(1024);
+            ByteBuffer recBuffer = ByteBuffer.allocate(BUFFER_SIZE);
             SSLEngineResult rs = engine.unwrap(netBuffer, recBuffer);
             recBuffer.flip();
             if (recBuffer.remaining() != 0) {
@@ -270,10 +328,9 @@ public class DTLSOverDatagram {
     }
 
     // produce handshake packets
-    List<DatagramPacket> produceHandshakePackets(
-            SSLEngine engine, SocketAddress socketAddr) throws Exception {
+    boolean produceHandshakePackets(SSLEngine engine, SocketAddress socketAddr,
+            String side, List<DatagramPacket> packets) throws Exception {
 
-        List<DatagramPacket> packets = new ArrayList<>();
         boolean endLoops = false;
         int loops = MAX_HANDSHAKE_LOOPS;
         while (!endLoops &&
@@ -296,6 +353,8 @@ public class DTLSOverDatagram {
                 throw new Exception("Buffer overflow: " +
                             "incorrect server maximum fragment size");
             } else if (rs == SSLEngineResult.Status.BUFFER_UNDERFLOW) {
+                log(side, "Produce handshake packets: BUFFER_UNDERFLOW occured");
+                log(side, "Produce handshake packets: Handshake status: " + hs);
                 // bad packet, or the client maximum fragment size
                 // config does not work?
                 if (hs != SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING) {
@@ -304,7 +363,11 @@ public class DTLSOverDatagram {
                 } // otherwise, ignore this packet
             } else if (rs == SSLEngineResult.Status.CLOSED) {
                 throw new Exception("SSLEngine has closed");
-            }   // otherwise, SSLEngineResult.Status.OK
+            } else if (rs == SSLEngineResult.Status.OK) {
+                // OK
+            } else {
+                throw new Exception("Can't reach here, result is " + rs);
+            }
 
             // SSLEngineResult.Status.OK:
             if (oNet.hasRemaining()) {
@@ -313,25 +376,39 @@ public class DTLSOverDatagram {
                 DatagramPacket packet = createHandshakePacket(ba, socketAddr);
                 packets.add(packet);
             }
+
+            if (hs == SSLEngineResult.HandshakeStatus.FINISHED) {
+                log(side, "Produce handshake packets: "
+                            + "Handshake status is FINISHED, finish the loop");
+                return true;
+            }
+
             boolean endInnerLoop = false;
             SSLEngineResult.HandshakeStatus nhs = hs;
             while (!endInnerLoop) {
                 if (nhs == SSLEngineResult.HandshakeStatus.NEED_TASK) {
                     runDelegatedTasks(engine);
-                    nhs = engine.getHandshakeStatus();
-                } else if ((nhs == SSLEngineResult.HandshakeStatus.FINISHED) ||
-                    (nhs == SSLEngineResult.HandshakeStatus.NEED_UNWRAP) ||
-                    (nhs == SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING)) {
+                } else if (nhs == SSLEngineResult.HandshakeStatus.NEED_UNWRAP ||
+                    nhs == SSLEngineResult.HandshakeStatus.NEED_UNWRAP_AGAIN ||
+                    nhs == SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING) {
 
                     endInnerLoop = true;
                     endLoops = true;
                 } else if (nhs == SSLEngineResult.HandshakeStatus.NEED_WRAP) {
                     endInnerLoop = true;
+                } else if (nhs == SSLEngineResult.HandshakeStatus.FINISHED) {
+                    throw new Exception(
+                            "Unexpected status, SSLEngine.getHandshakeStatus() "
+                                    + "shouldn't return FINISHED");
+                } else {
+                    throw new Exception("Can't reach here, handshake status is "
+                            + nhs);
                 }
+                nhs = engine.getHandshakeStatus();
             }
         }
 
-        return packets;
+        return false;
     }
 
     DatagramPacket createHandshakePacket(byte[] ba, SocketAddress socketAddr) {
@@ -358,7 +435,11 @@ public class DTLSOverDatagram {
             throw new Exception("Buffer underflow during wraping");
         } else if (rs == SSLEngineResult.Status.CLOSED) {
                 throw new Exception("SSLEngine has closed");
-        }   // otherwise, SSLEngineResult.Status.OK
+        } else if (rs == SSLEngineResult.Status.OK) {
+            // OK
+        } else {
+            throw new Exception("Can't reach here, result is " + rs);
+        }
 
         // SSLEngineResult.Status.OK:
         if (appNet.hasRemaining()) {
@@ -386,15 +467,15 @@ public class DTLSOverDatagram {
     }
 
     // retransmission if timeout
-    List<DatagramPacket> onReceiveTimeout(
-            SSLEngine engine, SocketAddress socketAddr) throws Exception {
+    boolean onReceiveTimeout(SSLEngine engine, SocketAddress socketAddr,
+            String side, List<DatagramPacket> packets) throws Exception {
 
         SSLEngineResult.HandshakeStatus hs = engine.getHandshakeStatus();
         if (hs == SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING) {
-            return new ArrayList<DatagramPacket>();
+            return false;
         } else {
             // retransmission of handshake messages
-            return produceHandshakePackets(engine, socketAddr);
+            return produceHandshakePackets(engine, socketAddr, side, packets);
         }
     }
 
@@ -405,8 +486,13 @@ public class DTLSOverDatagram {
 
         char[] passphrase = "passphrase".toCharArray();
 
-        ks.load(new FileInputStream(keyFilename), passphrase);
-        ts.load(new FileInputStream(trustFilename), passphrase);
+        try (FileInputStream fis = new FileInputStream(keyFilename)) {
+            ks.load(fis, passphrase);
+        }
+
+        try (FileInputStream fis = new FileInputStream(trustFilename)) {
+            ts.load(fis, passphrase);
+        }
 
         KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
         kmf.init(ks, passphrase);
@@ -427,94 +513,84 @@ public class DTLSOverDatagram {
      * The remainder is support stuff to kickstart the testing.
      */
 
-    // the server side SocketAddress
-    volatile static SocketAddress serverSocketAddr = null;
-
-    // the client side SocketAddress
-    volatile static SocketAddress clientSocketAddr = null;
-
-    // the server side DatagramSocket instance
-    volatile static DatagramSocket serverDatagramSocket = null;
-
-    // the server side DatagramSocket instance
-    volatile static DatagramSocket clientDatagramSocket = null;
-
-    // get server side SocketAddress object
-    public SocketAddress getServerSocketAddress() {
-        return serverSocketAddr;
-    }
-
-    // get client side SocketAddress object
-    public SocketAddress getClientSocketAddress() {
-        return clientSocketAddr;
-    }
-
-    // get server side DatagramSocket object
-    public DatagramSocket getServerDatagramSocket() {
-        return serverDatagramSocket;
-    }
-
-    // get client side DatagramSocket object
-    public DatagramSocket getClientDatagramSocket() {
-        return clientDatagramSocket;
-    }
-
     // Will the handshaking and application data exchange succeed?
     public boolean isGoodJob() {
         return true;
     }
 
     public final void runTest(DTLSOverDatagram testCase) throws Exception {
-        serverDatagramSocket = new DatagramSocket();
-        serverSocketAddr = new InetSocketAddress(
-            InetAddress.getLocalHost(), serverDatagramSocket.getLocalPort());
+        try (DatagramSocket serverSocket = new DatagramSocket();
+                DatagramSocket clientSocket = new DatagramSocket()) {
 
-        clientDatagramSocket = new DatagramSocket();
-        clientSocketAddr = new InetSocketAddress(
-            InetAddress.getLocalHost(), clientDatagramSocket.getLocalPort());
+            serverSocket.setSoTimeout(SOCKET_TIMEOUT);
+            clientSocket.setSoTimeout(SOCKET_TIMEOUT);
 
-        ExecutorService pool = Executors.newFixedThreadPool(2);
-        List<Future<String>> list = new ArrayList<Future<String>>();
+            InetSocketAddress serverSocketAddr = new InetSocketAddress(
+                    InetAddress.getLocalHost(), serverSocket.getLocalPort());
 
-        try {
-            list.add(pool.submit(new ServerCallable(testCase)));  // server task
-            list.add(pool.submit(new ClientCallable(testCase)));  // client task
-        } finally {
-            pool.shutdown();
-        }
+            InetSocketAddress clientSocketAddr = new InetSocketAddress(
+                    InetAddress.getLocalHost(), clientSocket.getLocalPort());
+
+            ExecutorService pool = Executors.newFixedThreadPool(2);
+            Future<String> server, client;
 
-        Exception reserved = null;
-        for (Future<String> fut : list) {
             try {
-                System.out.println(fut.get());
-            } catch (CancellationException |
-                    InterruptedException | ExecutionException cie) {
-                if (reserved != null) {
-                    cie.addSuppressed(reserved);
-                    reserved = cie;
-                } else {
-                    reserved = cie;
-                }
+                server = pool.submit(new ServerCallable(
+                        testCase, serverSocket, clientSocketAddr));
+                client = pool.submit(new ClientCallable(
+                        testCase, clientSocket, serverSocketAddr));
+            } finally {
+                pool.shutdown();
             }
-        }
 
-        if (reserved != null) {
-            throw reserved;
+            boolean failed = false;
+
+            // wait for client to finish
+            try {
+                System.out.println("Client finished: " + client.get());
+            } catch (CancellationException | InterruptedException
+                        | ExecutionException e) {
+                System.out.println("Exception on client side: ");
+                e.printStackTrace(System.out);
+                failed = true;
+            }
+
+            // wait for server to finish
+            try {
+                System.out.println("Client finished: " + server.get());
+            } catch (CancellationException | InterruptedException
+                        | ExecutionException e) {
+                System.out.println("Exception on server side: ");
+                e.printStackTrace(System.out);
+                failed = true;
+            }
+
+            if (failed) {
+                throw new RuntimeException("Test failed");
+            }
         }
     }
 
     final static class ServerCallable implements Callable<String> {
-        DTLSOverDatagram testCase;
 
-        ServerCallable(DTLSOverDatagram testCase) {
+        private final DTLSOverDatagram testCase;
+        private final DatagramSocket socket;
+        private final InetSocketAddress clientSocketAddr;
+
+        ServerCallable(DTLSOverDatagram testCase, DatagramSocket socket,
+                InetSocketAddress clientSocketAddr) {
+
             this.testCase = testCase;
+            this.socket = socket;
+            this.clientSocketAddr = clientSocketAddr;
         }
 
         @Override
         public String call() throws Exception {
             try {
-                testCase.doServerSide();
+                testCase.doServerSide(socket, clientSocketAddr);
             } catch (Exception e) {
+                System.out.println("Exception in  ServerCallable.call():");
                 e.printStackTrace(System.out);
                 serverException = e;
 
@@ -523,10 +599,6 @@ public class DTLSOverDatagram {
                 } else {
                     return "Well done, server!";
                 }
-            } finally {
-                if (serverDatagramSocket != null) {
-                    serverDatagramSocket.close();
-                }
             }
 
             if (testCase.isGoodJob()) {
@@ -538,28 +610,33 @@ public class DTLSOverDatagram {
     }
 
     final static class ClientCallable implements Callable<String> {
-        DTLSOverDatagram testCase;
 
-        ClientCallable(DTLSOverDatagram testCase) {
+        private final DTLSOverDatagram testCase;
+        private final DatagramSocket socket;
+        private final InetSocketAddress serverSocketAddr;
+
+        ClientCallable(DTLSOverDatagram testCase, DatagramSocket socket,
+                InetSocketAddress serverSocketAddr) {
+
             this.testCase = testCase;
+            this.socket = socket;
+            this.serverSocketAddr = serverSocketAddr;
         }
 
         @Override
         public String call() throws Exception {
             try {
-                testCase.doClientSide();
+                testCase.doClientSide(socket, serverSocketAddr);
             } catch (Exception e) {
+                System.out.println("Exception in ClientCallable.call():");
                 e.printStackTrace(System.out);
                 clientException = e;
+
                 if (testCase.isGoodJob()) {
                     throw e;
                 } else {
                     return "Well done, client!";
                 }
-            } finally {
-                if (clientDatagramSocket != null) {
-                    clientDatagramSocket.close();
-                }
             }
 
             if (testCase.isGoodJob()) {
@@ -600,4 +677,8 @@ public class DTLSOverDatagram {
             System.out.flush();
         }
     }
+
+    static void log(String side, String message) {
+        System.out.println(side + ": " + message);
+    }
 }
diff --git a/jdk/test/javax/net/ssl/DTLS/Reordered.java b/jdk/test/javax/net/ssl/DTLS/Reordered.java
index 9e91979a909..25053d221bb 100644
--- a/jdk/test/javax/net/ssl/DTLS/Reordered.java
+++ b/jdk/test/javax/net/ssl/DTLS/Reordered.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -51,16 +51,17 @@ public class Reordered extends DTLSOverDatagram {
     }
 
     @Override
-    List<DatagramPacket> produceHandshakePackets(
-            SSLEngine engine, SocketAddress socketAddr) throws Exception {
-        List<DatagramPacket> packets =
-                super.produceHandshakePackets(engine, socketAddr);
+    boolean produceHandshakePackets(SSLEngine engine, SocketAddress socketAddr,
+            String side, List<DatagramPacket> packets) throws Exception {
+
+        boolean finished = super.produceHandshakePackets(
+                engine, socketAddr, side, packets);
 
         if (needPacketReorder && (!engine.getUseClientMode())) {
             needPacketReorder = false;
             Collections.reverse(packets);
         }
 
-        return packets;
+        return finished;
     }
 }
diff --git a/jdk/test/javax/net/ssl/DTLS/Retransmission.java b/jdk/test/javax/net/ssl/DTLS/Retransmission.java
index 75aecab22fb..840b08a7d7d 100644
--- a/jdk/test/javax/net/ssl/DTLS/Retransmission.java
+++ b/jdk/test/javax/net/ssl/DTLS/Retransmission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,13 +52,14 @@ public class Retransmission extends DTLSOverDatagram {
     }
 
     @Override
-    List<DatagramPacket> produceHandshakePackets(
-            SSLEngine engine, SocketAddress socketAddr) throws Exception {
-        List<DatagramPacket> packets =
-                super.produceHandshakePackets(engine, socketAddr);
+    boolean produceHandshakePackets(SSLEngine engine, SocketAddress socketAddr,
+            String side, List<DatagramPacket> packets) throws Exception {
+
+        boolean finished = super.produceHandshakePackets(
+                engine, socketAddr, side, packets);
 
         if (!needPacketLoss || (!engine.getUseClientMode())) {
-            return packets;
+            return finished;
         }
 
         List<DatagramPacket> parts = new ArrayList<>();
@@ -75,6 +76,9 @@ public class Retransmission extends DTLSOverDatagram {
             parts.add(packet);
         }
 
-        return parts;
+        packets.clear();
+        packets.addAll(parts);
+
+        return finished;
     }
 }

From ea82a852dd3122d66948c85456b7d5e41b656f18 Mon Sep 17 00:00:00 2001
From: Sibabrata Sahoo <ssahoo@openjdk.org>
Date: Fri, 20 May 2016 09:57:01 -0700
Subject: [PATCH 172/228] 8157417: Some of SecureRandom test might get timed
 out in linux

Reviewed-by: weijun
---
 .../SecureRandom/GetInstanceTest.java         | 20 +++++++++----------
 .../SecureRandom/MultiThreadTest.java         |  2 +-
 .../SecureRandom/SerializedSeedTest.java      |  2 +-
 .../SeedGenerator/SeedGeneratorChoice.java    |  1 -
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/jdk/test/java/security/SecureRandom/GetInstanceTest.java b/jdk/test/java/security/SecureRandom/GetInstanceTest.java
index 511188a7709..08477da847e 100644
--- a/jdk/test/java/security/SecureRandom/GetInstanceTest.java
+++ b/jdk/test/java/security/SecureRandom/GetInstanceTest.java
@@ -36,12 +36,9 @@ import java.security.NoSuchProviderException;
 import java.security.SecureRandom;
 import java.security.SecureRandomParameters;
 import java.security.DrbgParameters;
-
 import static java.security.DrbgParameters.Capability.*;
-
 import java.security.Security;
 import java.util.Arrays;
-
 import jdk.testlibrary.Asserts;
 
 public class GetInstanceTest {
@@ -77,13 +74,16 @@ public class GetInstanceTest {
                     + "strong algorithm through security Property: "
                     + "'securerandom.strongAlgorithms'.");
         }
-        Security.setProperty(STRONG_ALG_SEC_PROP, "DRBG:SUN");
-        sr = matchExc(() -> SecureRandom.getInstanceStrong(),
-                PASS, NoSuchAlgorithmException.class,
-                "PASS - Undefined security Property "
-                + "'securerandom.strongAlgorithms'");
-        checkAttributes(sr, "DRBG");
-        Security.setProperty(STRONG_ALG_SEC_PROP, origDRBGConfig);
+        try {
+            Security.setProperty(STRONG_ALG_SEC_PROP, "DRBG:SUN");
+            sr = matchExc(() -> SecureRandom.getInstanceStrong(),
+                    PASS, NoSuchAlgorithmException.class,
+                    "PASS - Undefined security Property "
+                    + "'securerandom.strongAlgorithms'");
+            checkAttributes(sr, "DRBG");
+        } finally {
+            Security.setProperty(STRONG_ALG_SEC_PROP, origDRBGConfig);
+        }
 
         for (String mech : new String[]{
             "SHA1PRNG", "Hash_DRBG", "HMAC_DRBG", "CTR_DRBG", INVALID_ALGO,}) {
diff --git a/jdk/test/java/security/SecureRandom/MultiThreadTest.java b/jdk/test/java/security/SecureRandom/MultiThreadTest.java
index 17ae3377377..82c6d68dd94 100644
--- a/jdk/test/java/security/SecureRandom/MultiThreadTest.java
+++ b/jdk/test/java/security/SecureRandom/MultiThreadTest.java
@@ -41,7 +41,7 @@ import static java.lang.Math.*;
  * @library /lib/testlibrary
  * @summary Test behavior of a shared SecureRandom object when it is operated
  *          by multiple threads concurrently.
- * @run main MultiThreadTest
+ * @run main/othervm -Djava.security.egd=file:/dev/urandom MultiThreadTest
  */
 public class MultiThreadTest {
 
diff --git a/jdk/test/java/security/SecureRandom/SerializedSeedTest.java b/jdk/test/java/security/SecureRandom/SerializedSeedTest.java
index ba4289ce4c7..9af7296c4ab 100644
--- a/jdk/test/java/security/SecureRandom/SerializedSeedTest.java
+++ b/jdk/test/java/security/SecureRandom/SerializedSeedTest.java
@@ -29,7 +29,7 @@
  *          as well from it's serialized instance in the same time then the
  *          generated random numbers should be different when one or both are
  *          reseeded.
- * @run main SerializedSeedTest
+ * @run main/othervm -Djava.security.egd=file:/dev/urandom SerializedSeedTest
  */
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/jdk/test/sun/security/provider/SeedGenerator/SeedGeneratorChoice.java b/jdk/test/sun/security/provider/SeedGenerator/SeedGeneratorChoice.java
index e6da6be10a1..93889729058 100644
--- a/jdk/test/sun/security/provider/SeedGenerator/SeedGeneratorChoice.java
+++ b/jdk/test/sun/security/provider/SeedGenerator/SeedGeneratorChoice.java
@@ -27,7 +27,6 @@
  * @bug 6998583 8141039
  * @summary NativeSeedGenerator is making 8192 byte read requests from
  *             entropy pool on each init.
- * @run main SeedGeneratorChoice
  * @run main/othervm -Djava.security.egd=file:/dev/random SeedGeneratorChoice
  * @run main/othervm -Djava.security.egd=file:filename  SeedGeneratorChoice
  */

From 2096e37c4e93f5ef10898e8022e947885a41413c Mon Sep 17 00:00:00 2001
From: Robbin Ehn <rehn@openjdk.org>
Date: Mon, 23 May 2016 08:02:04 +0200
Subject: [PATCH 173/228] 8153723: Change the default logging output for errors
 and warnings from stderr to stdout

Reviewed-by: mlarsson, sla
---
 hotspot/src/share/vm/logging/log.cpp          |  5 ---
 .../share/vm/logging/logFileStreamOutput.hpp  |  4 +-
 hotspot/src/share/vm/logging/logTagSet.cpp    |  2 +-
 .../logging/TestDefaultLogOutput.java         | 43 +++++++++++++++++++
 4 files changed, 46 insertions(+), 8 deletions(-)
 create mode 100644 hotspot/test/serviceability/logging/TestDefaultLogOutput.java

diff --git a/hotspot/src/share/vm/logging/log.cpp b/hotspot/src/share/vm/logging/log.cpp
index 59de3ef3289..8796c1794e4 100644
--- a/hotspot/src/share/vm/logging/log.cpp
+++ b/hotspot/src/share/vm/logging/log.cpp
@@ -578,11 +578,6 @@ void Test_logconfiguration_subscribe() {
 
   LogConfiguration::disable_logging();
   assert(Test_logconfiguration_subscribe_triggered == 3, "subscription not triggered (3)");
-
-  // We need to renable stderr error logging since "disable_logging" disable it all.
-  // TestLogSavedConfig log_cfg will only renable stdout for us.
-  LogConfiguration::parse_log_arguments("stderr", "all=warning", NULL, NULL, log.error_stream());
-  assert(Test_logconfiguration_subscribe_triggered == 4, "subscription not triggered (3)");
 }
 
 #define LOG_PREFIX_STR "THE_PREFIX "
diff --git a/hotspot/src/share/vm/logging/logFileStreamOutput.hpp b/hotspot/src/share/vm/logging/logFileStreamOutput.hpp
index 3a5c1b5b0fc..3b460dab0f7 100644
--- a/hotspot/src/share/vm/logging/logFileStreamOutput.hpp
+++ b/hotspot/src/share/vm/logging/logFileStreamOutput.hpp
@@ -54,7 +54,7 @@ class LogStdoutOutput : public LogFileStreamOutput {
  private:
   static LogStdoutOutput _instance;
   LogStdoutOutput() : LogFileStreamOutput(stdout) {
-    set_config_string("all=off");
+    set_config_string("all=warning");
   }
   virtual bool initialize(const char* options, outputStream* errstream) {
     return false;
@@ -70,7 +70,7 @@ class LogStderrOutput : public LogFileStreamOutput {
  private:
   static LogStderrOutput _instance;
   LogStderrOutput() : LogFileStreamOutput(stderr) {
-    set_config_string("all=warning");
+    set_config_string("all=off");
   }
   virtual bool initialize(const char* options, outputStream* errstream) {
     return false;
diff --git a/hotspot/src/share/vm/logging/logTagSet.cpp b/hotspot/src/share/vm/logging/logTagSet.cpp
index 446c2b46dc0..bab0e5aedbf 100644
--- a/hotspot/src/share/vm/logging/logTagSet.cpp
+++ b/hotspot/src/share/vm/logging/logTagSet.cpp
@@ -50,7 +50,7 @@ LogTagSet::LogTagSet(PrefixWriter prefix_writer, LogTagType t0, LogTagType t1, L
   _ntagsets++;
 
   // Set the default output to warning and error level for all new tagsets.
-  _output_list.set_output_level(LogOutput::Stderr, LogLevel::Default);
+  _output_list.set_output_level(LogOutput::Stdout, LogLevel::Default);
 }
 
 void LogTagSet::update_decorators(const LogDecorators& decorator) {
diff --git a/hotspot/test/serviceability/logging/TestDefaultLogOutput.java b/hotspot/test/serviceability/logging/TestDefaultLogOutput.java
new file mode 100644
index 00000000000..cd55cc608d7
--- /dev/null
+++ b/hotspot/test/serviceability/logging/TestDefaultLogOutput.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2016, 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 TestDefaultLogOutput
+ * @summary Ensure logging is default on stdout.
+ * @modules java.base/jdk.internal.misc
+ * @library /testlibrary
+ */
+
+import jdk.test.lib.ProcessTools;
+import jdk.test.lib.OutputAnalyzer;
+
+public class TestDefaultLogOutput {
+
+    public static void main(String[] args) throws Exception {
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xlog:badTag");
+        OutputAnalyzer output = new OutputAnalyzer(pb.start());
+        output.stdoutShouldMatch("\\[error *\\]\\[logging *\\]");
+        output.shouldHaveExitValue(1);
+    }
+}
+

From 4154a35318443ac8e0424088c48118710e5a888a Mon Sep 17 00:00:00 2001
From: Robbin Ehn <rehn@openjdk.org>
Date: Mon, 23 May 2016 09:57:17 +0200
Subject: [PATCH 174/228] 8157097: OptionsValidation/TestOptionsWithRanges.java
 crashes at CompactHashtableWriter::add during StringTable::copy_shared_string

Reviewed-by: dholmes, jiangli
---
 hotspot/src/share/vm/classfile/compactHashtable.cpp | 1 +
 hotspot/src/share/vm/classfile/stringTable.cpp      | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/hotspot/src/share/vm/classfile/compactHashtable.cpp b/hotspot/src/share/vm/classfile/compactHashtable.cpp
index c64a166fa1c..f2feec3c810 100644
--- a/hotspot/src/share/vm/classfile/compactHashtable.cpp
+++ b/hotspot/src/share/vm/classfile/compactHashtable.cpp
@@ -38,6 +38,7 @@
 CompactHashtableWriter::CompactHashtableWriter(int num_buckets,
                                                CompactHashtableStats* stats) {
   assert(DumpSharedSpaces, "dump-time only");
+  assert(num_buckets > 0, "no buckets");
   _num_buckets = num_buckets;
   _num_entries = 0;
   _buckets = NEW_C_HEAP_ARRAY(GrowableArray<Entry>*, _num_buckets, mtSymbol);
diff --git a/hotspot/src/share/vm/classfile/stringTable.cpp b/hotspot/src/share/vm/classfile/stringTable.cpp
index 5031a9c0d70..abf662cb403 100644
--- a/hotspot/src/share/vm/classfile/stringTable.cpp
+++ b/hotspot/src/share/vm/classfile/stringTable.cpp
@@ -740,7 +740,8 @@ void StringTable::serialize(SerializeClosure* soc, GrowableArray<MemRegion> *str
     } else {
       int num_buckets = the_table()->number_of_entries() /
                              SharedSymbolTableBucketSize;
-      CompactStringTableWriter writer(num_buckets,
+      // calculation of num_buckets can result in zero buckets, we need at least one
+      CompactStringTableWriter writer(num_buckets > 1 ? num_buckets : 1,
                                       &MetaspaceShared::stats()->string);
 
       // Copy the interned strings into the "string space" within the java heap

From 847a2d2de1d89266501ae2ea64e31259ea05c6ba Mon Sep 17 00:00:00 2001
From: Staffan Larsen <sla@openjdk.org>
Date: Tue, 24 May 2016 08:53:54 +0200
Subject: [PATCH 175/228] 8157555: com/sun/jdi/RedefineClearBreakpoint.sh times
 out due to Indify String Concat being slow in debug mode

Reviewed-by: sspitsyn
---
 jdk/test/com/sun/jdi/ShellScaffold.sh | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/jdk/test/com/sun/jdi/ShellScaffold.sh b/jdk/test/com/sun/jdi/ShellScaffold.sh
index eb7e6b45351..7727a8f762d 100644
--- a/jdk/test/com/sun/jdi/ShellScaffold.sh
+++ b/jdk/test/com/sun/jdi/ShellScaffold.sh
@@ -131,11 +131,13 @@ killcmd=kill
 
 # This can be increased if timing seems to be an issue.
 sleep_seconds=1
-if [ -n "$TIMEOUT_FACTOR" ] ; then
-  sleep_seconds=$(echo $TIMEOUT_FACTOR $sleep_seconds | awk '{printf "%d\n", int($1 * $2)}')
+timeout_factor=1
+if [ -n "$TESTTIMEOUTFACTOR" ] ; then
+  # convert float value to int
+  timeout_factor=$(echo $TESTTIMEOUTFACTOR | awk '{printf "%d\n", int($1)}')
 fi
 
-echo "ShellScaffold.sh: Version" >& 2
+echo "ShellScaffold.sh: Running with timeout_factor = $timeout_factor" >& 2
 topPid=$$
 
 # Be careful to echo to >& in these general functions.
@@ -664,6 +666,7 @@ cmd()
     count=0
     desiredFileSize=`expr $fileSize + 4`
     msg1=`echo At start: cmd/size/waiting : $command / $fileSize / \`date\``
+    timeLimit=`expr 60 * $timeout_factor`
     while [ 1 = 1 ] ; do
         newFileSize=`wc -c $jdbOutFile | awk '{ print $1 } '`
         #echo jj: desired = $desiredFileSize, new = $newFileSize >& 2
@@ -673,20 +676,17 @@ cmd()
             break
         fi
         sleep ${sleep_seconds}
-        count=`expr $count + 1`
-        if [ $count = 30 -o $count = 60 ] ; then
+        count=`expr $count + ${sleep_seconds}`        
+        if [ $count -gt $timeLimit ] ; then
             # record some debug info.
-            echo "--DEBUG: jdb $$ didn't responded to command in $count secs: $command" >& 2
+            echo "--DEBUG: jdb $$ didn't respond to command in $count secs: $command" >& 2
             echo "--DEBUG:" $msg1 >& 2
             echo "--DEBUG: "done size/waiting : / $newFileSize  / `date` >& 2
             echo "-- $jdbOutFile follows-------------------------------" >& 2
             cat $jdbOutFile >& 2
             echo "------------------------------------------" >& 2
             dojstack
-            #$psCmd | sed -e '/com.sun.javatest/d' -e '/nsk/d' >& 2
-            if [ $count = 60 ] ; then
-                dofail "jdb never responded to command: $command"
-            fi
+            dofail "jdb never responded to command: $command"
         fi
     done
     # Note that this assumes just these chars in thread names.
@@ -734,7 +734,8 @@ waitForJdbMsg()
     nlines=$2
     allowExit="$3"
     myCount=0
-    timeLimit=40  # wait a max of this many secs for a response from a jdb command
+    timeLimit=`expr 40 * $timeout_factor`  # wait a max of this many secs for a response from a jdb command
+
     while [ 1 = 1 ] ; do 
         if [  -r $jdbOutFile ] ; then
             # Something here causes jdb to complain about Unrecognized cmd on x86.
@@ -772,7 +773,7 @@ waitForJdbMsg()
 
         myCount=`expr $myCount + ${sleep_seconds}`
         if [ $myCount -gt $timeLimit ] ; then
-            echo "--Fail: waitForJdbMsg timed out after $timeLimit seconds, looking for /$1/, in $nlines lines; exitting" >> $failFile
+            echo "--Fail: waitForJdbMsg timed out after $timeLimit seconds, looking for /$1/, in $nlines lines; exiting" >> $failFile
             echo "vv jdbOutFile  vvvvvvvvvvvvvvvvvvvvvvvvvvvv" >& 2
             cat $jdbOutFile >& 2
             echo "^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" >& 2

From 10f79f95df679bf0996924225d838b6a7f4f932b Mon Sep 17 00:00:00 2001
From: Alan Bateman <alan.bateman@oracle.com>
Date: Wed, 25 May 2016 17:29:47 -0400
Subject: [PATCH 176/228] 8157716:
 jdk.internal.loader.ClassLoaders.addURLToUCP() should return converted real
 path URL

Rename jdk.internal.loader.ClassLoaders.addURLToUCP() to toFileURL(), which returns the converted URL.

Reviewed-by: martin, mchung
---
 .../jdk/internal/loader/ClassLoaders.java     | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/jdk/src/java.base/share/classes/jdk/internal/loader/ClassLoaders.java b/jdk/src/java.base/share/classes/jdk/internal/loader/ClassLoaders.java
index bc2396f10c3..deaf34c41c2 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/loader/ClassLoaders.java
+++ b/jdk/src/java.base/share/classes/jdk/internal/loader/ClassLoaders.java
@@ -237,24 +237,29 @@ public class ClassLoaders {
         int off = 0;
         int next;
         while ((next = cp.indexOf(File.pathSeparator, off)) != -1) {
-            addURLToUCP(cp.substring(off, next), ucp);
+            URL url = toFileURL(cp.substring(off, next));
+            if (url != null)
+                ucp.addURL(url);
             off = next + 1;
         }
 
         // remaining
-        addURLToUCP(cp.substring(off), ucp);
+        URL url = toFileURL(cp.substring(off));
+        if (url != null)
+            ucp.addURL(url);
     }
 
     /**
-     * Attempts to convert to the given string to a file URL and adds it
-     * to the given URLClassPath.
+     * Attempts to convert the given string to a file URL.
+     *
+     * @apiNote This is called by the VM
      */
-    private static void addURLToUCP(String s, URLClassPath ucp) {
+    private static URL toFileURL(String s) {
         try {
-            URL url = Paths.get(s).toRealPath().toUri().toURL();
-            ucp.addURL(url);
+            return Paths.get(s).toRealPath().toUri().toURL();
         } catch (InvalidPathException | IOException ignore) {
             // malformed path string or class path element does not exist
+            return null;
         }
     }
 

From df511d0dccf41965b65bd5c2f6e17f33f226fa61 Mon Sep 17 00:00:00 2001
From: Dmitry Samersoff <dsamersoff@openjdk.org>
Date: Fri, 27 May 2016 19:31:41 +0300
Subject: [PATCH 177/228] 8152950: BasicLauncherTest.java fails due to type
 error

Better handle js engine initialization error

Reviewed-by: jbachorik
---
 .../sun/tools/jhsdb/BasicLauncherTest.java    | 34 +++++++++++++------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/jdk/test/sun/tools/jhsdb/BasicLauncherTest.java b/jdk/test/sun/tools/jhsdb/BasicLauncherTest.java
index b0f3b8d4f73..6d8d59dd455 100644
--- a/jdk/test/sun/tools/jhsdb/BasicLauncherTest.java
+++ b/jdk/test/sun/tools/jhsdb/BasicLauncherTest.java
@@ -49,14 +49,26 @@ import jdk.testlibrary.Platform;
 
 public class BasicLauncherTest {
 
-    private final static String toolName = "jhsdb";
     private static LingeredApp theApp = null;
+    private static boolean useJavaLauncher = false;
 
-    /**
-     *
-     * @return exit code of tool
-     */
-    public static int launchCLHSDB()
+    private static JDKToolLauncher createSALauncher() {
+        JDKToolLauncher launcher = null;
+        if (useJavaLauncher) {
+            // Use java launcher if we need to pass additional parameters to VM
+            // for debugging purpose
+            // e.g. -Xlog:class+load=info:file=/tmp/BasicLauncherTest.log
+            launcher = JDKToolLauncher.createUsingTestJDK("java");
+            launcher.addToolArg("sun.jvm.hotspot.SALauncher");
+        }
+        else {
+            launcher = JDKToolLauncher.createUsingTestJDK("jhsdb");
+        }
+
+        return launcher;
+    }
+
+    public static void launchCLHSDB()
         throws IOException {
 
         System.out.println("Starting LingeredApp");
@@ -64,7 +76,7 @@ public class BasicLauncherTest {
             theApp = LingeredApp.startApp();
 
             System.out.println("Starting clhsdb against " + theApp.getPid());
-            JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK(toolName);
+            JDKToolLauncher launcher = createSALauncher();
             launcher.addToolArg("clhsdb");
             launcher.addToolArg("--pid=" + Long.toString(theApp.getPid()));
 
@@ -84,7 +96,9 @@ public class BasicLauncherTest {
 
             toolProcess.waitFor();
 
-            return toolProcess.exitValue();
+            if (toolProcess.exitValue() != 0) {
+                throw new RuntimeException("FAILED CLHSDB terminated with non-zero exit code " + toolProcess.exitValue());
+            }
         } catch (Exception ex) {
             throw new RuntimeException("Test ERROR " + ex, ex);
         } finally {
@@ -104,8 +118,8 @@ public class BasicLauncherTest {
         try {
             theApp = LingeredApp.startApp(Arrays.asList("-Xmx256m"));
 
-            System.out.println("Starting " + toolName + " " + toolArgs.get(0) + " against " + theApp.getPid());
-            JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK(toolName);
+            System.out.println("Starting " + toolArgs.get(0) + " against " + theApp.getPid());
+            JDKToolLauncher launcher = createSALauncher();
 
             for (String cmd : toolArgs) {
                 launcher.addToolArg(cmd);

From 2f8dcbe90fd839fc32f3834383aa3462151b6897 Mon Sep 17 00:00:00 2001
From: Nishit Jain <nishjain@openjdk.org>
Date: Mon, 30 May 2016 15:28:48 +0900
Subject: [PATCH 178/228] 8158025: Typo in java.util.Locale

Reviewed-by: okutsu, peytoia
---
 jdk/src/java.base/share/classes/java/util/Locale.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jdk/src/java.base/share/classes/java/util/Locale.java b/jdk/src/java.base/share/classes/java/util/Locale.java
index dfe71769d11..23417394030 100644
--- a/jdk/src/java.base/share/classes/java/util/Locale.java
+++ b/jdk/src/java.base/share/classes/java/util/Locale.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2016, 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
@@ -198,7 +198,7 @@ import sun.util.locale.provider.LocaleServiceProviderPool;
  *
  * <p>The keywords are mapped to a BCP 47 extension value using the
  * extension key 'u' ({@link #UNICODE_LOCALE_EXTENSION}).  The above
- * example, "nu-thai", becomes the extension "u-nu-thai".code
+ * example, "nu-thai", becomes the extension "u-nu-thai".
  *
  * <p>Thus, when a <code>Locale</code> object contains Unicode locale
  * attributes and keywords,

From d3f2498ed72089301a49ddf0bc7bd2df54368033 Mon Sep 17 00:00:00 2001
From: Dalibor Topic <robilad@openjdk.org>
Date: Mon, 30 May 2016 16:17:11 +0200
Subject: [PATCH 179/228] 8154469: Update FSF address

Updated Free Software Foundation's mailing address in LICENSE

Reviewed-by: rriggs, shade
---
 LICENSE | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/LICENSE b/LICENSE
index b40a0f457d7..8b400c7ab81 100644
--- a/LICENSE
+++ b/LICENSE
@@ -3,7 +3,7 @@ The GNU General Public License (GPL)
 Version 2, June 1991
 
 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
@@ -287,8 +287,8 @@ pointer to where the full notice is found.
     more details.
 
     You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc., 59
-    Temple Place, Suite 330, Boston, MA 02111-1307 USA
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 

From e8e7199667283dc9b7aa178ce5453cea944ed03f Mon Sep 17 00:00:00 2001
From: Dalibor Topic <robilad@openjdk.org>
Date: Mon, 30 May 2016 16:23:54 +0200
Subject: [PATCH 180/228] 8154469: Update FSF address

Updated Free Software Foundation's mailing address in LICENSE

Reviewed-by: rriggs, shade
---
 corba/LICENSE | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/corba/LICENSE b/corba/LICENSE
index b40a0f457d7..8b400c7ab81 100644
--- a/corba/LICENSE
+++ b/corba/LICENSE
@@ -3,7 +3,7 @@ The GNU General Public License (GPL)
 Version 2, June 1991
 
 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
@@ -287,8 +287,8 @@ pointer to where the full notice is found.
     more details.
 
     You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc., 59
-    Temple Place, Suite 330, Boston, MA 02111-1307 USA
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 

From 586c79588215db2e964762cc0698548b96ad1c7a Mon Sep 17 00:00:00 2001
From: Dalibor Topic <robilad@openjdk.org>
Date: Mon, 30 May 2016 16:25:38 +0200
Subject: [PATCH 181/228] 8154469: Update FSF address

Updated Free Software Foundation's mailing address in LICENSE

Reviewed-by: rriggs, shade
---
 hotspot/LICENSE | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hotspot/LICENSE b/hotspot/LICENSE
index b40a0f457d7..8b400c7ab81 100644
--- a/hotspot/LICENSE
+++ b/hotspot/LICENSE
@@ -3,7 +3,7 @@ The GNU General Public License (GPL)
 Version 2, June 1991
 
 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
@@ -287,8 +287,8 @@ pointer to where the full notice is found.
     more details.
 
     You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc., 59
-    Temple Place, Suite 330, Boston, MA 02111-1307 USA
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 

From 69910d6463ef0d84913d15304cca2b851602418f Mon Sep 17 00:00:00 2001
From: Dalibor Topic <robilad@openjdk.org>
Date: Mon, 30 May 2016 16:33:17 +0200
Subject: [PATCH 182/228] 8154469: Update FSF address

Updated Free Software Foundation's mailing address in LICENSE

Reviewed-by: rriggs, shade
---
 jdk/LICENSE | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jdk/LICENSE b/jdk/LICENSE
index b40a0f457d7..8b400c7ab81 100644
--- a/jdk/LICENSE
+++ b/jdk/LICENSE
@@ -3,7 +3,7 @@ The GNU General Public License (GPL)
 Version 2, June 1991
 
 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
@@ -287,8 +287,8 @@ pointer to where the full notice is found.
     more details.
 
     You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc., 59
-    Temple Place, Suite 330, Boston, MA 02111-1307 USA
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 

From f4fdc1991ee81a74f98606028f9b41c855a08d04 Mon Sep 17 00:00:00 2001
From: Dmitry Fazunenko <dfazunen@openjdk.org>
Date: Mon, 30 May 2016 19:39:09 +0400
Subject: [PATCH 183/228] 8154096: Extend WhiteBox API with methods which
 retrieve from VM information about available GC

Reviewed-by: kbarrett, iignatyev
---
 test/lib/sun/hotspot/WhiteBox.java |   6 ++
 test/lib/sun/hotspot/gc/GC.java    | 104 +++++++++++++++++++++++++++++
 2 files changed, 110 insertions(+)
 create mode 100644 test/lib/sun/hotspot/gc/GC.java

diff --git a/test/lib/sun/hotspot/WhiteBox.java b/test/lib/sun/hotspot/WhiteBox.java
index 690b07af0bd..903bc644e80 100644
--- a/test/lib/sun/hotspot/WhiteBox.java
+++ b/test/lib/sun/hotspot/WhiteBox.java
@@ -377,6 +377,12 @@ public class WhiteBox {
   public native long incMetaspaceCapacityUntilGC(long increment);
   public native long metaspaceCapacityUntilGC();
 
+  // Don't use these methods directly
+  // Use sun.hotspot.gc.GC class instead.
+  public native int currentGC();
+  public native int allSupportedGC();
+  public native boolean gcSelectedByErgo();
+
   // Force Young GC
   public native void youngGC();
 
diff --git a/test/lib/sun/hotspot/gc/GC.java b/test/lib/sun/hotspot/gc/GC.java
new file mode 100644
index 00000000000..83495b6aab1
--- /dev/null
+++ b/test/lib/sun/hotspot/gc/GC.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2016, 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 sun.hotspot.gc;
+
+import java.util.ArrayList;
+import java.util.List;
+import sun.hotspot.WhiteBox;
+
+/**
+ * API to obtain information about selected and supported Garbage Collectors
+ * retrieved from the VM with the WhiteBox API.
+ */
+public enum GC {
+    Serial(1),
+    Parallel(2),
+    ConcMarkSweep(4),
+    G1(8);
+
+    private static final GC CURRENT_GC;
+    private static final int ALL_GC_CODES;
+    private static final boolean IS_BY_ERGO;
+    static {
+        WhiteBox WB = WhiteBox.getWhiteBox();
+        ALL_GC_CODES = WB.allSupportedGC();
+        IS_BY_ERGO = WB.gcSelectedByErgo();
+
+        int currentCode = WB.currentGC();
+        GC tmp = null;
+        for (GC gc: GC.values()) {
+            if (gc.code == currentCode) {
+                tmp = gc;
+                break;
+            }
+        }
+        if (tmp == null) {
+            throw new Error("Unknown current GC code " + currentCode);
+        }
+        CURRENT_GC = tmp;
+    }
+
+    private final int code;
+    private GC(int code) {
+        this.code = code;
+    }
+
+    /**
+     * @return true if the collector is supported by the VM, false otherwise.
+     */
+    public boolean isSupported() {
+        return (ALL_GC_CODES & code) != 0;
+    }
+
+
+    /**
+     * @return the current collector used by VM.
+     */
+    public static GC current() {
+        return CURRENT_GC;
+    }
+
+    /**
+     * @return true if GC was selected by ergonomic, false if specified
+     * explicitly by the command line flag.
+     */
+    public static boolean currentSetByErgo() {
+        return IS_BY_ERGO;
+    }
+
+    /**
+     * @return List of collectors supported by the VM.
+     */
+    public static List<GC> allSupported() {
+        List<GC> list = new ArrayList<>();
+        for (GC gc: GC.values()) {
+            if (gc.isSupported()) {
+                list.add(gc);
+            }
+        }
+        return list;
+    }
+}
+

From 6c8b5e04acfeb0b20f4e2ff4a74eab238ad7003f Mon Sep 17 00:00:00 2001
From: Ivan Gerasimov <igerasim@openjdk.org>
Date: Mon, 30 May 2016 18:39:43 +0300
Subject: [PATCH 184/228] 8158111: Make handling of 3rd party providers more
 stable

Reviewed-by: xuelei
---
 .../security/ssl/RSAClientKeyExchange.java    | 34 +++++++++++++++++--
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java b/jdk/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java
index 38a942d03b7..6cb2b650de5 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java
@@ -90,6 +90,30 @@ final class RSAClientKeyExchange extends HandshakeMessage {
         }
     }
 
+    /*
+     * Retrieving the cipher's provider name for the debug purposes
+     * can throw an exception by itself.
+     */
+    private static String safeProviderName(Cipher cipher) {
+        try {
+            return cipher.getProvider().toString();
+        } catch (Exception e) {
+            if (debug != null && Debug.isOn("handshake")) {
+                System.out.println("Retrieving The Cipher provider name" +
+                        " caused exception " + e.getMessage());
+            }
+        }
+        try {
+            return cipher.toString() + " (provider name not available)";
+        } catch (Exception e) {
+            if (debug != null && Debug.isOn("handshake")) {
+                System.out.println("Retrieving The Cipher name" +
+                        " caused exception " + e.getMessage());
+            }
+        }
+        return "(cipher/provider names not available)";
+    }
+
     /*
      * Server gets the PKCS #1 (block format 02) data, decrypts
      * it with its private key.
@@ -132,15 +156,19 @@ final class RSAClientKeyExchange extends HandshakeMessage {
                         cipher.getProvider().getName());
             } catch (InvalidKeyException | UnsupportedOperationException iue) {
                 if (debug != null && Debug.isOn("handshake")) {
-                    System.out.println("The Cipher provider " +
-                        cipher.getProvider().getName() +
-                        " caused exception: " + iue.getMessage());
+                    System.out.println("The Cipher provider "
+                            + safeProviderName(cipher)
+                            + " caused exception: " + iue.getMessage());
                 }
 
                 needFailover = true;
             }
 
             if (needFailover) {
+                // The cipher might be spoiled by unsuccessful call to init(),
+                // so request a fresh instance
+                cipher = JsseJce.getCipher(JsseJce.CIPHER_RSA_PKCS1);
+
                 // Use DECRYPT_MODE and dispose the previous initialization.
                 cipher.init(Cipher.DECRYPT_MODE, privateKey);
                 boolean failed = false;

From a5e146583111e87b7482d08effa6d160d1923eb3 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Mon, 30 May 2016 17:38:05 +0100
Subject: [PATCH 185/228] 8066258: Re-examine com.sun.nio.file to see if it
 should be a supported API

Reviewed-by: chegar
---
 .../classes/sun/nio/fs/LinuxWatchService.java |  10 +-
 .../java.base/share/classes/module-info.java  |   2 +
 .../classes/sun/nio/fs/ExtendedOptions.java   | 143 ++++++++++++++++++
 .../sun/nio/fs/PollingWatchService.java       |  63 +++++---
 .../sun/nio/fs/SolarisWatchService.java       |   8 +-
 .../unix/classes/sun/nio/fs/UnixCopyFile.java |  13 +-
 .../sun/nio/fs/WindowsChannelFactory.java     |  25 +--
 .../classes/sun/nio/fs/WindowsFileCopy.java   |   5 +-
 .../classes/sun/nio/fs/WindowsPath.java       |   6 +-
 .../sun/nio/fs/WindowsWatchService.java       |  13 +-
 .../com/sun/nio/file/ExtendedCopyOption.java  |   9 +-
 .../com/sun/nio/file/ExtendedOpenOption.java  |  13 +-
 .../nio/file/ExtendedWatchEventModifier.java  |   9 +-
 .../file/SensitivityWatchEventModifier.java   |  13 +-
 .../share/classes/module-info.java            |   1 +
 .../java/nio/file/Files/InterruptCopy.java    |   4 +-
 jdk/test/java/nio/file/Files/SBC.java         |   4 +-
 .../file/WatchService/FileTreeModifier.java   |   6 +-
 .../WatchService/SensitivityModifier.java     |   6 +-
 .../WatchService/WithSecurityManager.java     |   4 +-
 20 files changed, 274 insertions(+), 83 deletions(-)
 create mode 100644 jdk/src/java.base/share/classes/sun/nio/fs/ExtendedOptions.java
 rename jdk/src/{java.base => jdk.unsupported}/share/classes/com/sun/nio/file/ExtendedCopyOption.java (85%)
 rename jdk/src/{java.base => jdk.unsupported}/share/classes/com/sun/nio/file/ExtendedOpenOption.java (82%)
 rename jdk/src/{java.base => jdk.unsupported}/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java (85%)
 rename jdk/src/{java.base => jdk.unsupported}/share/classes/com/sun/nio/file/SensitivityWatchEventModifier.java (80%)

diff --git a/jdk/src/java.base/linux/classes/sun/nio/fs/LinuxWatchService.java b/jdk/src/java.base/linux/classes/sun/nio/fs/LinuxWatchService.java
index 47dbc156250..1e93b3203e5 100644
--- a/jdk/src/java.base/linux/classes/sun/nio/fs/LinuxWatchService.java
+++ b/jdk/src/java.base/linux/classes/sun/nio/fs/LinuxWatchService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, 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
@@ -232,9 +232,11 @@ class LinuxWatchService
                 for (WatchEvent.Modifier modifier: modifiers) {
                     if (modifier == null)
                         return new NullPointerException();
-                    if (modifier instanceof com.sun.nio.file.SensitivityWatchEventModifier)
-                        continue; // ignore
-                    return new UnsupportedOperationException("Modifier not supported");
+                    if (!ExtendedOptions.SENSITIVITY_HIGH.matches(modifier) &&
+                            !ExtendedOptions.SENSITIVITY_MEDIUM.matches(modifier) &&
+                            !ExtendedOptions.SENSITIVITY_LOW.matches(modifier)) {
+                        return new UnsupportedOperationException("Modifier not supported");
+                    }
                 }
             }
 
diff --git a/jdk/src/java.base/share/classes/module-info.java b/jdk/src/java.base/share/classes/module-info.java
index d21c881ee30..67220c9474f 100644
--- a/jdk/src/java.base/share/classes/module-info.java
+++ b/jdk/src/java.base/share/classes/module-info.java
@@ -216,6 +216,8 @@ module java.base {
     exports sun.nio.cs to
         java.desktop,
         jdk.charsets;
+    exports sun.nio.fs to
+        jdk.unsupported;
     exports sun.reflect.annotation to
         jdk.compiler;
     exports sun.reflect.generics.reflectiveObjects to
diff --git a/jdk/src/java.base/share/classes/sun/nio/fs/ExtendedOptions.java b/jdk/src/java.base/share/classes/sun/nio/fs/ExtendedOptions.java
new file mode 100644
index 00000000000..71ebffc8320
--- /dev/null
+++ b/jdk/src/java.base/share/classes/sun/nio/fs/ExtendedOptions.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2016, 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 sun.nio.fs;
+
+import java.nio.file.CopyOption;
+import java.nio.file.OpenOption;
+import java.nio.file.WatchEvent;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Provides support for handling JDK-specific OpenOption, CopyOption and
+ * WatchEvent.Modifier types.
+ */
+
+public final class ExtendedOptions {
+
+    // maps InternalOption to ExternalOption
+    private static final Map<InternalOption<?>, Wrapper<?>> internalToExternal
+        = new ConcurrentHashMap<>();
+
+    /**
+     * Wraps an option or modifier.
+     */
+    private static final class Wrapper<T> {
+        private final Object option;
+        private final T param;
+
+        Wrapper(Object option, T param) {
+            this.option = option;
+            this.param = param;
+        }
+
+        T parameter() {
+            return param;
+        }
+    }
+
+    /**
+     * The internal version of a JDK-specific OpenOption, CopyOption or
+     * WatchEvent.Modifier.
+     */
+    public static final class InternalOption<T> {
+
+        InternalOption() { }
+
+        private void registerInternal(Object option, T param) {
+            Wrapper<T> wrapper = new Wrapper<T>(option, param);
+            internalToExternal.put(this, wrapper);
+        }
+
+        /**
+         * Register this internal option as a OpenOption.
+         */
+        public void register(OpenOption option) {
+            registerInternal(option, null);
+        }
+
+        /**
+         * Register this internal option as a CopyOption.
+         */
+        public void register(CopyOption option) {
+            registerInternal(option, null);
+        }
+
+        /**
+         * Register this internal option as a WatchEvent.Modifier.
+         */
+        public void register(WatchEvent.Modifier option) {
+            registerInternal(option, null);
+        }
+
+        /**
+         * Register this internal option as a WatchEvent.Modifier with the
+         * given parameter.
+         */
+        public void register(WatchEvent.Modifier option, T param) {
+            registerInternal(option, param);
+        }
+
+        /**
+         * Returns true if the given option (or modifier) maps to this internal
+         * option.
+         */
+        public boolean matches(Object option) {
+            Wrapper <?> wrapper = internalToExternal.get(this);
+            if (wrapper == null)
+                return false;
+            else
+                return option == wrapper.option;
+        }
+
+        /**
+         * Returns the parameter object associated with this internal option.
+         */
+        @SuppressWarnings("unchecked")
+        public T parameter() {
+            Wrapper<?> wrapper = internalToExternal.get(this);
+            if (wrapper == null)
+                return null;
+            else
+                return (T) wrapper.parameter();
+        }
+    }
+
+    // Internal equivalents of the options and modifiers defined in
+    // package com.sun.nio.file
+
+    public static final InternalOption<Void> INTERRUPTIBLE = new InternalOption<>();
+
+    public static final InternalOption<Void> NOSHARE_READ = new InternalOption<>();
+    public static final InternalOption<Void> NOSHARE_WRITE = new InternalOption<>();
+    public static final InternalOption<Void> NOSHARE_DELETE = new InternalOption<>();
+
+    public static final InternalOption<Void> FILE_TREE = new InternalOption<>();
+
+    public static final InternalOption<Integer> SENSITIVITY_HIGH = new InternalOption<>();
+    public static final InternalOption<Integer> SENSITIVITY_MEDIUM = new InternalOption<>();
+    public static final InternalOption<Integer> SENSITIVITY_LOW = new InternalOption<>();
+}
diff --git a/jdk/src/java.base/share/classes/sun/nio/fs/PollingWatchService.java b/jdk/src/java.base/share/classes/sun/nio/fs/PollingWatchService.java
index 536bfa7accf..13c365894c4 100644
--- a/jdk/src/java.base/share/classes/sun/nio/fs/PollingWatchService.java
+++ b/jdk/src/java.base/share/classes/sun/nio/fs/PollingWatchService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, 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,16 +25,32 @@
 
 package sun.nio.fs;
 
-import java.nio.file.*;
-import java.nio.file.attribute.*;
+import java.nio.file.ClosedWatchServiceException;
+import java.nio.file.DirectoryIteratorException;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.LinkOption;
+import java.nio.file.NotDirectoryException;
+import java.nio.file.Path;
+import java.nio.file.StandardWatchEventKinds;
+import java.nio.file.WatchEvent;
+import java.nio.file.WatchKey;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.security.PrivilegedExceptionAction;
 import java.security.PrivilegedActionException;
 import java.io.IOException;
-import java.util.*;
-import java.util.concurrent.*;
-import com.sun.nio.file.SensitivityWatchEventModifier;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Simple WatchService implementation that uses periodic tasks to poll
@@ -46,8 +62,7 @@ class PollingWatchService
     extends AbstractWatchService
 {
     // map of registrations
-    private final Map<Object,PollingWatchKey> map =
-        new HashMap<Object,PollingWatchKey>();
+    private final Map<Object, PollingWatchKey> map = new HashMap<>();
 
     // used to execute the periodic tasks that poll for changes
     private final ScheduledExecutorService scheduledExecutor;
@@ -58,7 +73,7 @@ class PollingWatchService
             .newSingleThreadScheduledExecutor(new ThreadFactory() {
                  @Override
                  public Thread newThread(Runnable r) {
-                     Thread t = new Thread(null, r, "FileSystemWatchService", 0, false);
+                     Thread t = new Thread(null, r, "FileSystemWatcher", 0, false);
                      t.setDaemon(true);
                      return t;
                  }});
@@ -74,8 +89,7 @@ class PollingWatchService
          throws IOException
     {
         // check events - CCE will be thrown if there are invalid elements
-        final Set<WatchEvent.Kind<?>> eventSet =
-            new HashSet<WatchEvent.Kind<?>>(events.length);
+        final Set<WatchEvent.Kind<?>> eventSet = new HashSet<>(events.length);
         for (WatchEvent.Kind<?> event: events) {
             // standard events
             if (event == StandardWatchEventKinds.ENTRY_CREATE ||
@@ -99,17 +113,22 @@ class PollingWatchService
         if (eventSet.isEmpty())
             throw new IllegalArgumentException("No events to register");
 
-        // A modifier may be used to specify the sensitivity level
-        SensitivityWatchEventModifier sensivity = SensitivityWatchEventModifier.MEDIUM;
+        // Extended modifiers may be used to specify the sensitivity level
+        int sensitivity = 10;
         if (modifiers.length > 0) {
             for (WatchEvent.Modifier modifier: modifiers) {
                 if (modifier == null)
                     throw new NullPointerException();
-                if (modifier instanceof SensitivityWatchEventModifier) {
-                    sensivity = (SensitivityWatchEventModifier)modifier;
-                    continue;
+
+                if (ExtendedOptions.SENSITIVITY_HIGH.matches(modifier)) {
+                    sensitivity = ExtendedOptions.SENSITIVITY_HIGH.parameter();
+                } else if (ExtendedOptions.SENSITIVITY_MEDIUM.matches(modifier)) {
+                    sensitivity = ExtendedOptions.SENSITIVITY_MEDIUM.parameter();
+                } else if (ExtendedOptions.SENSITIVITY_LOW.matches(modifier)) {
+                    sensitivity = ExtendedOptions.SENSITIVITY_LOW.parameter();
+                } else {
+                    throw new UnsupportedOperationException("Modifier not supported");
                 }
-                throw new UnsupportedOperationException("Modifier not supported");
             }
         }
 
@@ -120,12 +139,12 @@ class PollingWatchService
         // registration is done in privileged block as it requires the
         // attributes of the entries in the directory.
         try {
-            final SensitivityWatchEventModifier s = sensivity;
+            int value = sensitivity;
             return AccessController.doPrivileged(
                 new PrivilegedExceptionAction<PollingWatchKey>() {
                     @Override
                     public PollingWatchKey run() throws IOException {
-                        return doPrivilegedRegister(path, eventSet, s);
+                        return doPrivilegedRegister(path, eventSet, value);
                     }
                 });
         } catch (PrivilegedActionException pae) {
@@ -140,7 +159,7 @@ class PollingWatchService
     // existing key if already registered
     private PollingWatchKey doPrivilegedRegister(Path path,
                                                  Set<? extends WatchEvent.Kind<?>> events,
-                                                 SensitivityWatchEventModifier sensivity)
+                                                 int sensitivityInSeconds)
         throws IOException
     {
         // check file is a directory and get its file key if possible
@@ -169,7 +188,7 @@ class PollingWatchService
                     watchKey.disable();
                 }
             }
-            watchKey.enable(events, sensivity.sensitivityValueInSeconds());
+            watchKey.enable(events, sensitivityInSeconds);
             return watchKey;
         }
 
@@ -178,7 +197,7 @@ class PollingWatchService
     @Override
     void implClose() throws IOException {
         synchronized (map) {
-            for (Map.Entry<Object,PollingWatchKey> entry: map.entrySet()) {
+            for (Map.Entry<Object, PollingWatchKey> entry: map.entrySet()) {
                 PollingWatchKey watchKey = entry.getValue();
                 watchKey.disable();
                 watchKey.invalidate();
diff --git a/jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisWatchService.java b/jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisWatchService.java
index 7a31d13b3a6..cc077cb8b0f 100644
--- a/jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisWatchService.java
+++ b/jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisWatchService.java
@@ -272,9 +272,11 @@ class SolarisWatchService
                 for (WatchEvent.Modifier modifier: modifiers) {
                     if (modifier == null)
                         return new NullPointerException();
-                    if (modifier instanceof com.sun.nio.file.SensitivityWatchEventModifier)
-                        continue; // ignore
-                    return new UnsupportedOperationException("Modifier not supported");
+                    if (!ExtendedOptions.SENSITIVITY_HIGH.matches(modifier) &&
+                            !ExtendedOptions.SENSITIVITY_MEDIUM.matches(modifier) &&
+                            !ExtendedOptions.SENSITIVITY_LOW.matches(modifier)) {
+                        return new UnsupportedOperationException("Modifier not supported");
+                    }
                 }
             }
 
diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixCopyFile.java b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixCopyFile.java
index 7a31ab186a6..34fe5d24526 100644
--- a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixCopyFile.java
+++ b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixCopyFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, 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,18 @@
 
 package sun.nio.fs;
 
-import java.nio.file.*;
 import java.io.IOException;
+import java.nio.file.AtomicMoveNotSupportedException;
+import java.nio.file.CopyOption;
+import java.nio.file.DirectoryNotEmptyException;
+import java.nio.file.FileAlreadyExistsException;
+import java.nio.file.LinkOption;
+import java.nio.file.LinkPermission;
+import java.nio.file.StandardCopyOption;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
-import com.sun.nio.file.ExtendedCopyOption;
 
 import static sun.nio.fs.UnixNativeDispatcher.*;
 import static sun.nio.fs.UnixConstants.*;
@@ -82,7 +87,7 @@ class UnixCopyFile {
                     flags.failIfUnableToCopyBasic = true;
                     continue;
                 }
-                if (option == ExtendedCopyOption.INTERRUPTIBLE) {
+                if (ExtendedOptions.INTERRUPTIBLE.matches(option)) {
                     flags.interruptible = true;
                     continue;
                 }
diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java
index 4a1139a2a73..7af7132bfee 100644
--- a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java
+++ b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, 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,8 +34,6 @@ import java.nio.file.OpenOption;
 import java.nio.file.StandardOpenOption;
 import java.util.Set;
 
-import com.sun.nio.file.ExtendedOpenOption;
-
 import jdk.internal.misc.JavaIOFileDescriptorAccess;
 import jdk.internal.misc.SharedSecrets;
 import sun.nio.ch.FileChannelImpl;
@@ -103,15 +101,6 @@ class WindowsChannelFactory {
                     }
                     continue;
                 }
-                if (option instanceof ExtendedOpenOption) {
-                    switch ((ExtendedOpenOption)option) {
-                        case NOSHARE_READ : flags.shareRead = false; break;
-                        case NOSHARE_WRITE : flags.shareWrite = false; break;
-                        case NOSHARE_DELETE : flags.shareDelete = false; break;
-                        default: throw new UnsupportedOperationException();
-                    }
-                    continue;
-                }
                 if (option == LinkOption.NOFOLLOW_LINKS) {
                     flags.noFollowLinks = true;
                     continue;
@@ -120,6 +109,18 @@ class WindowsChannelFactory {
                     flags.openReparsePoint = true;
                     continue;
                 }
+                if (ExtendedOptions.NOSHARE_READ.matches(option)) {
+                    flags.shareRead = false;
+                    continue;
+                }
+                if (ExtendedOptions.NOSHARE_WRITE.matches(option)) {
+                    flags.shareWrite = false;
+                    continue;
+                }
+                if (ExtendedOptions.NOSHARE_DELETE.matches(option)) {
+                    flags.shareDelete = false;
+                    continue;
+                }
                 if (option == null)
                     throw new NullPointerException();
                 throw new UnsupportedOperationException();
diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileCopy.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileCopy.java
index 001f1ba5fb5..c96a699370f 100644
--- a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileCopy.java
+++ b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileCopy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, 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 sun.nio.fs;
 import java.nio.file.*;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
-import com.sun.nio.file.ExtendedCopyOption;
 
 import static sun.nio.fs.WindowsNativeDispatcher.*;
 import static sun.nio.fs.WindowsConstants.*;
@@ -67,7 +66,7 @@ class WindowsFileCopy {
                 copyAttributes = true;
                 continue;
             }
-            if (option == ExtendedCopyOption.INTERRUPTIBLE) {
+            if (ExtendedOptions.INTERRUPTIBLE.matches(option)) {
                 interruptible = true;
                 continue;
             }
diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsPath.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsPath.java
index 539bad62190..763f10e6929 100644
--- a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsPath.java
+++ b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, 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,8 +32,6 @@ import java.net.URI;
 import java.util.*;
 import java.lang.ref.WeakReference;
 
-import com.sun.nio.file.ExtendedWatchEventModifier;
-
 import static sun.nio.fs.WindowsNativeDispatcher.*;
 import static sun.nio.fs.WindowsConstants.*;
 
@@ -864,7 +862,7 @@ class WindowsPath implements Path {
                 modifiers = Arrays.copyOf(modifiers, ml);
                 int i=0;
                 while (i < ml) {
-                    if (modifiers[i++] == ExtendedWatchEventModifier.FILE_TREE) {
+                    if (ExtendedOptions.FILE_TREE.matches(modifiers[i++])) {
                         watchSubtree = true;
                         break;
                     }
diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java
index 00e68fb785b..d5b82285075 100644
--- a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java
+++ b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, 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,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import com.sun.nio.file.ExtendedWatchEventModifier;
 import jdk.internal.misc.Unsafe;
 
 import static sun.nio.fs.WindowsNativeDispatcher.*;
@@ -342,14 +341,16 @@ class WindowsWatchService
 
             // FILE_TREE modifier allowed
             for (WatchEvent.Modifier modifier: modifiers) {
-                if (modifier == ExtendedWatchEventModifier.FILE_TREE) {
+                if (ExtendedOptions.FILE_TREE.matches(modifier)) {
                     watchSubtree = true;
                 } else {
                     if (modifier == null)
                         return new NullPointerException();
-                    if (modifier instanceof com.sun.nio.file.SensitivityWatchEventModifier)
-                        continue; // ignore
-                    return new UnsupportedOperationException("Modifier not supported");
+                    if (!ExtendedOptions.SENSITIVITY_HIGH.matches(modifier) &&
+                            !ExtendedOptions.SENSITIVITY_MEDIUM.matches(modifier) &&
+                            !ExtendedOptions.SENSITIVITY_LOW.matches(modifier)) {
+                        return new UnsupportedOperationException("Modifier not supported");
+                    }
                 }
             }
 
diff --git a/jdk/src/java.base/share/classes/com/sun/nio/file/ExtendedCopyOption.java b/jdk/src/jdk.unsupported/share/classes/com/sun/nio/file/ExtendedCopyOption.java
similarity index 85%
rename from jdk/src/java.base/share/classes/com/sun/nio/file/ExtendedCopyOption.java
rename to jdk/src/jdk.unsupported/share/classes/com/sun/nio/file/ExtendedCopyOption.java
index 5c49d16151b..56b6dc36bf7 100644
--- a/jdk/src/java.base/share/classes/com/sun/nio/file/ExtendedCopyOption.java
+++ b/jdk/src/jdk.unsupported/share/classes/com/sun/nio/file/ExtendedCopyOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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 @@
 package com.sun.nio.file;
 
 import java.nio.file.CopyOption;
+import sun.nio.fs.ExtendedOptions;
 
 /**
  * Defines <em>extended</em> copy options supported on some platforms
@@ -39,5 +40,9 @@ public enum ExtendedCopyOption implements CopyOption {
      * The copy may be interrupted by the {@link Thread#interrupt interrupt}
      * method.
      */
-    INTERRUPTIBLE,
+    INTERRUPTIBLE(ExtendedOptions.INTERRUPTIBLE);
+
+    ExtendedCopyOption(ExtendedOptions.InternalOption<Void> option) {
+        option.register(this);
+    }
 }
diff --git a/jdk/src/java.base/share/classes/com/sun/nio/file/ExtendedOpenOption.java b/jdk/src/jdk.unsupported/share/classes/com/sun/nio/file/ExtendedOpenOption.java
similarity index 82%
rename from jdk/src/java.base/share/classes/com/sun/nio/file/ExtendedOpenOption.java
rename to jdk/src/jdk.unsupported/share/classes/com/sun/nio/file/ExtendedOpenOption.java
index 28cef93d8bf..74e7ad185b2 100644
--- a/jdk/src/java.base/share/classes/com/sun/nio/file/ExtendedOpenOption.java
+++ b/jdk/src/jdk.unsupported/share/classes/com/sun/nio/file/ExtendedOpenOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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 @@
 package com.sun.nio.file;
 
 import java.nio.file.OpenOption;
+import sun.nio.fs.ExtendedOptions;
 
 /**
  * Defines <em>extended</em> open options supported on some platforms
@@ -38,13 +39,17 @@ public enum ExtendedOpenOption implements OpenOption {
     /**
      * Prevent operations on the file that request read access.
      */
-    NOSHARE_READ,
+    NOSHARE_READ(ExtendedOptions.NOSHARE_READ),
     /**
      * Prevent operations on the file that request write access.
      */
-    NOSHARE_WRITE,
+    NOSHARE_WRITE(ExtendedOptions.NOSHARE_WRITE),
     /**
      * Prevent operations on the file that request delete access.
      */
-    NOSHARE_DELETE;
+    NOSHARE_DELETE(ExtendedOptions.NOSHARE_DELETE);
+
+    ExtendedOpenOption(ExtendedOptions.InternalOption<Void> option) {
+        option.register(this);
+    }
 }
diff --git a/jdk/src/java.base/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java b/jdk/src/jdk.unsupported/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java
similarity index 85%
rename from jdk/src/java.base/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java
rename to jdk/src/jdk.unsupported/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java
index 805386dd1ce..e810ba0a2d7 100644
--- a/jdk/src/java.base/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java
+++ b/jdk/src/jdk.unsupported/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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 @@
 package com.sun.nio.file;
 
 import java.nio.file.WatchEvent.Modifier;
+import sun.nio.fs.ExtendedOptions;
 
 /**
  * Defines <em>extended</em> watch event modifiers supported on some platforms
@@ -39,5 +40,9 @@ public enum ExtendedWatchEventModifier implements Modifier {
     /**
      * Register a file tree instead of a single directory.
      */
-    FILE_TREE,
+    FILE_TREE(ExtendedOptions.FILE_TREE);
+
+    ExtendedWatchEventModifier(ExtendedOptions.InternalOption<Void> option) {
+        option.register(this);
+    }
 }
diff --git a/jdk/src/java.base/share/classes/com/sun/nio/file/SensitivityWatchEventModifier.java b/jdk/src/jdk.unsupported/share/classes/com/sun/nio/file/SensitivityWatchEventModifier.java
similarity index 80%
rename from jdk/src/java.base/share/classes/com/sun/nio/file/SensitivityWatchEventModifier.java
rename to jdk/src/jdk.unsupported/share/classes/com/sun/nio/file/SensitivityWatchEventModifier.java
index cc5066697a8..e7561d90d25 100644
--- a/jdk/src/java.base/share/classes/com/sun/nio/file/SensitivityWatchEventModifier.java
+++ b/jdk/src/jdk.unsupported/share/classes/com/sun/nio/file/SensitivityWatchEventModifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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 @@
 package com.sun.nio.file;
 
 import java.nio.file.WatchEvent.Modifier;
+import sun.nio.fs.ExtendedOptions;
 
 /**
  * Defines the <em>sensitivity levels</em> when registering objects with a
@@ -38,15 +39,15 @@ public enum SensitivityWatchEventModifier implements Modifier {
     /**
      * High sensitivity.
      */
-    HIGH(2),
+    HIGH(ExtendedOptions.SENSITIVITY_HIGH, 2),
     /**
      * Medium sensitivity.
      */
-    MEDIUM(10),
+    MEDIUM(ExtendedOptions.SENSITIVITY_MEDIUM, 10),
     /**
      * Low sensitivity.
      */
-    LOW(30);
+    LOW(ExtendedOptions.SENSITIVITY_LOW, 30);
 
     /**
      * Returns the sensitivity in seconds.
@@ -56,7 +57,9 @@ public enum SensitivityWatchEventModifier implements Modifier {
     }
 
     private final int sensitivity;
-    private SensitivityWatchEventModifier(int sensitivity) {
+    private SensitivityWatchEventModifier(ExtendedOptions.InternalOption<Integer> option,
+                                          int sensitivity) {
         this.sensitivity = sensitivity;
+        option.register(this, sensitivity);
     }
 }
diff --git a/jdk/src/jdk.unsupported/share/classes/module-info.java b/jdk/src/jdk.unsupported/share/classes/module-info.java
index a13d3428022..5ad248766ae 100644
--- a/jdk/src/jdk.unsupported/share/classes/module-info.java
+++ b/jdk/src/jdk.unsupported/share/classes/module-info.java
@@ -26,5 +26,6 @@
 module jdk.unsupported {
     exports sun.misc;
     exports sun.reflect;
+    exports com.sun.nio.file;
 }
 
diff --git a/jdk/test/java/nio/file/Files/InterruptCopy.java b/jdk/test/java/nio/file/Files/InterruptCopy.java
index 34ffa0585e8..05bdb4d37c1 100644
--- a/jdk/test/java/nio/file/Files/InterruptCopy.java
+++ b/jdk/test/java/nio/file/Files/InterruptCopy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, 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,7 @@
 /* @test
  * @bug 4313887 6993267
  * @summary Unit test for Sun-specific ExtendedCopyOption.INTERRUPTIBLE option
- * @modules java.base/com.sun.nio.file
+ * @modules jdk.unsupported
  * @library ..
  */
 
diff --git a/jdk/test/java/nio/file/Files/SBC.java b/jdk/test/java/nio/file/Files/SBC.java
index 584a370f658..8f470b8d9ed 100644
--- a/jdk/test/java/nio/file/Files/SBC.java
+++ b/jdk/test/java/nio/file/Files/SBC.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, 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 @@
  * @bug 4313887
  * @summary Unit test for java.nio.file.Files.newByteChannel
  * @library ..
- * @modules java.base/com.sun.nio.file
+ * @modules jdk.unsupported
  */
 
 import java.nio.ByteBuffer;
diff --git a/jdk/test/java/nio/file/WatchService/FileTreeModifier.java b/jdk/test/java/nio/file/WatchService/FileTreeModifier.java
index ff26a5f5f1e..1648df003a6 100644
--- a/jdk/test/java/nio/file/WatchService/FileTreeModifier.java
+++ b/jdk/test/java/nio/file/WatchService/FileTreeModifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, 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,9 +23,9 @@
 
 /* @test
  * @bug 4313887 6838333
- * @summary Sanity test for Sun-specific FILE_TREE watch event modifier
+ * @summary Sanity test for JDK-specific FILE_TREE watch event modifier
  * @library ..
- * @modules java.base/com.sun.nio.file
+ * @modules jdk.unsupported
  */
 
 import java.nio.file.*;
diff --git a/jdk/test/java/nio/file/WatchService/SensitivityModifier.java b/jdk/test/java/nio/file/WatchService/SensitivityModifier.java
index 6a9f30e8629..f01704a9ba8 100644
--- a/jdk/test/java/nio/file/WatchService/SensitivityModifier.java
+++ b/jdk/test/java/nio/file/WatchService/SensitivityModifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, 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,8 +23,8 @@
 
 /* @test
  * @bug 4313887
- * @summary Sanity test for Sun-specific sensitivity level watch event modifier
- * @modules java.base/com.sun.nio.file
+ * @summary Sanity test for JDK-specific sensitivity level watch event modifier
+ * @modules jdk.unsupported
  * @library ..
  * @run main/timeout=240 SensitivityModifier
  * @key randomness
diff --git a/jdk/test/java/nio/file/WatchService/WithSecurityManager.java b/jdk/test/java/nio/file/WatchService/WithSecurityManager.java
index 997144d49a3..e165da54fb4 100644
--- a/jdk/test/java/nio/file/WatchService/WithSecurityManager.java
+++ b/jdk/test/java/nio/file/WatchService/WithSecurityManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, 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,7 @@
 /* @test
  * @bug 4313887
  * @summary Unit test for Watchable#register's permission checks
- * @modules java.base/com.sun.nio.file
+ * @modules jdk.unsupported
  * @build WithSecurityManager
  * @run main/othervm WithSecurityManager denyAll.policy - fail
  * @run main/othervm WithSecurityManager denyAll.policy tree fail

From 8d6c2508aba83acc6d0596569d081945f8edc221 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Mon, 30 May 2016 16:03:48 -0700
Subject: [PATCH 186/228] 8158044: Add test that checks uri of upgradeable
 modules

Reviewed-by: alanb, mchung
---
 .../src/test/jdk/test/Main.java               | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/jdk/test/tools/launcher/modules/upgrademodulepath/src/test/jdk/test/Main.java b/jdk/test/tools/launcher/modules/upgrademodulepath/src/test/jdk/test/Main.java
index 9f87f53a0b7..e5540aded8b 100644
--- a/jdk/test/tools/launcher/modules/upgrademodulepath/src/test/jdk/test/Main.java
+++ b/jdk/test/tools/launcher/modules/upgrademodulepath/src/test/jdk/test/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,8 +23,12 @@
 
 package jdk.test;
 
-import javax.transaction.Transaction;
+import java.lang.module.ModuleReference;
+import java.lang.reflect.Layer;
+import java.net.URI;
+
 import javax.enterprise.context.Scope;
+import javax.transaction.Transaction;
 
 /**
  * Uses an upgraded version of module java.transaction.
@@ -34,6 +38,7 @@ public class Main {
 
     public static void main(String[] args) {
 
+        String TRANSACTION_MODULE = "java.transaction";
         ClassLoader scl = ClassLoader.getSystemClassLoader();
         ClassLoader pcl = ClassLoader.getPlatformClassLoader();
         assertTrue(pcl.getParent() == null);
@@ -43,9 +48,17 @@ public class Main {
 
         // javax.transaction.Transaction should be in module java.transaction
         // and defined by the platform class loader
-        assertTrue(Transaction.class.getModule().getName().equals("java.transaction"));
+        assertTrue(Transaction.class.getModule().getName().equals(TRANSACTION_MODULE));
         assertTrue(Transaction.class.getClassLoader() == pcl);
 
+        // javax.transaction should be found in boot layer.
+        ModuleReference ref =
+                Layer.boot().configuration().findModule(TRANSACTION_MODULE).get().reference();
+        // check uri of java.transaction found on the upgrade module path.
+        URI uri = ref.location().get();
+        System.out.println("uri: " + uri);
+        assertTrue(uri.getScheme().equalsIgnoreCase("file"));
+
         // javax.enterprise.context.Scope should be in module java.enterprise
         // and defined by the application class loader
         assertTrue(Scope.class.getModule().getName().equals("java.enterprise"));

From 991c9b059385e6750fab9ca109aa5925933cc13b Mon Sep 17 00:00:00 2001
From: Felix Yang <felix.yang@oracle.com>
Date: Mon, 30 May 2016 17:49:04 -0700
Subject: [PATCH 187/228] 8157816: Mark 4 httpclient tests as intermittently
 failing

Reviewed-by: chegar
---
 jdk/test/java/net/httpclient/SplitResponse.java       | 1 +
 jdk/test/java/net/httpclient/http2/BasicTest.java     | 1 +
 jdk/test/java/net/httpclient/http2/ErrorTest.java     | 1 +
 jdk/test/java/net/httpclient/http2/TLSConnection.java | 1 +
 4 files changed, 4 insertions(+)

diff --git a/jdk/test/java/net/httpclient/SplitResponse.java b/jdk/test/java/net/httpclient/SplitResponse.java
index a26ee01e159..dc67961af86 100644
--- a/jdk/test/java/net/httpclient/SplitResponse.java
+++ b/jdk/test/java/net/httpclient/SplitResponse.java
@@ -33,6 +33,7 @@ import java.util.concurrent.CompletableFuture;
 /**
  * @test
  * @bug 8087112
+ * @key intermittent
  * @build Server
  * @run main/othervm -Djava.net.HttpClient.log=all SplitResponse
  */
diff --git a/jdk/test/java/net/httpclient/http2/BasicTest.java b/jdk/test/java/net/httpclient/http2/BasicTest.java
index 3a07e652730..0503ba4ddfb 100644
--- a/jdk/test/java/net/httpclient/http2/BasicTest.java
+++ b/jdk/test/java/net/httpclient/http2/BasicTest.java
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 8087112
+ * @key intermittent
  * @library /lib/testlibrary
  * @build jdk.testlibrary.SimpleSSLContext
  * @modules java.httpclient
diff --git a/jdk/test/java/net/httpclient/http2/ErrorTest.java b/jdk/test/java/net/httpclient/http2/ErrorTest.java
index 578dc4df797..3dee42103d3 100644
--- a/jdk/test/java/net/httpclient/http2/ErrorTest.java
+++ b/jdk/test/java/net/httpclient/http2/ErrorTest.java
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 8157105
+ * @key intermittent
  * @library /lib/testlibrary
  * @build jdk.testlibrary.SimpleSSLContext
  * @modules java.httpclient
diff --git a/jdk/test/java/net/httpclient/http2/TLSConnection.java b/jdk/test/java/net/httpclient/http2/TLSConnection.java
index f2721eb268e..038e774f5b1 100644
--- a/jdk/test/java/net/httpclient/http2/TLSConnection.java
+++ b/jdk/test/java/net/httpclient/http2/TLSConnection.java
@@ -39,6 +39,7 @@ import javax.net.ssl.SSLSession;
 /*
  * @test
  * @bug 8150769 8157107
+ * @key intermittent
  * @summary Checks that SSL parameters can be set for HTTP/2 connection
  * @modules java.httpclient
  * @compile/module=java.httpclient java/net/http/Http2Handler.java

From e94656ce652708bbb037faab15c9790068773528 Mon Sep 17 00:00:00 2001
From: Amy Lu <amlu@openjdk.org>
Date: Tue, 31 May 2016 10:09:34 +0800
Subject: [PATCH 188/228] 8154980: Remove intermittent key from test
 BandIntegrity.java

Reviewed-by: shade
---
 jdk/test/tools/pack200/BandIntegrity.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jdk/test/tools/pack200/BandIntegrity.java b/jdk/test/tools/pack200/BandIntegrity.java
index 3aa65ff07f4..46a10592e11 100644
--- a/jdk/test/tools/pack200/BandIntegrity.java
+++ b/jdk/test/tools/pack200/BandIntegrity.java
@@ -26,7 +26,6 @@
  * @summary test ensures the proper sequencing of bands, dump bands as well.
  * @compile -XDignore.symbol.file Utils.java BandIntegrity.java
  * @run main BandIntegrity
- * @key intermittent
  * @author ksrini
  */
 import java.io.File;

From 48873ebc3f00c2ba3ea19c248c27547d1fd757ed Mon Sep 17 00:00:00 2001
From: Rachna Goel <rgoel@openjdk.org>
Date: Tue, 31 May 2016 13:00:48 +0900
Subject: [PATCH 189/228] 8145136: Upgrade CLDR locale data

Reviewed-by: naoto, okutsu, peytoia
---
 jdk/make/gensrc/GensrcCLDR.gmk                |     6 +-
 .../build/tools/cldrconverter/Bundle.java     |     3 +-
 .../tools/cldrconverter/CLDRConverter.java    |    49 +-
 .../tools/cldrconverter/LDMLParseHandler.java |    14 +-
 .../LikelySubtagsParseHandler.java            |    71 +
 .../text/resources/JavaTimeSupplementary.java |    80 +-
 .../resources/JavaTimeSupplementary_en.java   |    57 +-
 .../ext/JavaTimeSupplementary_ar.java         |    16 +-
 .../ext/JavaTimeSupplementary_be.java         |    58 +-
 .../ext/JavaTimeSupplementary_bg.java         |    32 +-
 .../ext/JavaTimeSupplementary_ca.java         |    38 +-
 .../ext/JavaTimeSupplementary_cs.java         |    44 +-
 .../ext/JavaTimeSupplementary_da.java         |    46 +-
 .../ext/JavaTimeSupplementary_de.java         |    16 +-
 .../ext/JavaTimeSupplementary_el.java         |    42 +-
 .../ext/JavaTimeSupplementary_en_AU.java      |   132 +-
 .../ext/JavaTimeSupplementary_en_GB.java      |    38 +-
 .../ext/JavaTimeSupplementary_en_IE.java      |    20 +-
 .../ext/JavaTimeSupplementary_en_MT.java      |    18 +-
 .../ext/JavaTimeSupplementary_es.java         |    70 +-
 .../ext/JavaTimeSupplementary_es_CL.java      |    28 +-
 .../ext/JavaTimeSupplementary_es_CO.java      |    42 +-
 .../ext/JavaTimeSupplementary_es_DO.java      |   172 +
 .../ext/JavaTimeSupplementary_es_MX.java      |    20 +-
 .../ext/JavaTimeSupplementary_es_PA.java      |    52 +-
 .../ext/JavaTimeSupplementary_es_PR.java      |    20 +-
 .../ext/JavaTimeSupplementary_es_US.java      |   124 +
 .../ext/JavaTimeSupplementary_es_VE.java      |   126 +
 .../ext/JavaTimeSupplementary_et.java         |    32 +-
 .../ext/JavaTimeSupplementary_fi.java         |    16 +-
 .../ext/JavaTimeSupplementary_fr.java         |    28 +-
 .../ext/JavaTimeSupplementary_fr_CA.java      |    16 +-
 .../ext/JavaTimeSupplementary_ga.java         |    28 +-
 .../ext/JavaTimeSupplementary_hi_IN.java      |    16 +-
 .../ext/JavaTimeSupplementary_hr.java         |    58 +-
 .../ext/JavaTimeSupplementary_hu.java         |    20 +-
 .../ext/JavaTimeSupplementary_in.java         |   495 +
 .../ext/JavaTimeSupplementary_is.java         |    16 +-
 .../ext/JavaTimeSupplementary_it.java         |    40 +-
 .../ext/JavaTimeSupplementary_it_CH.java      |    16 +-
 .../ext/JavaTimeSupplementary_iw.java         |   374 +-
 .../ext/JavaTimeSupplementary_iw_IL.java      |   167 -
 .../ext/JavaTimeSupplementary_ja.java         |    16 +-
 .../ext/JavaTimeSupplementary_ko.java         |    29 +-
 .../ext/JavaTimeSupplementary_lt.java         |    40 +-
 .../ext/JavaTimeSupplementary_lv.java         |    32 +-
 .../ext/JavaTimeSupplementary_mk.java         |    34 +-
 .../ext/JavaTimeSupplementary_ms.java         |    28 +-
 .../ext/JavaTimeSupplementary_mt.java         |    16 +-
 .../ext/JavaTimeSupplementary_nl.java         |    58 +-
 .../ext/JavaTimeSupplementary_no.java         |   128 +-
 .../ext/JavaTimeSupplementary_pl.java         |    28 +-
 .../ext/JavaTimeSupplementary_pt.java         |    50 +-
 .../ext/JavaTimeSupplementary_pt_PT.java      |    56 +-
 .../ext/JavaTimeSupplementary_ro.java         |    44 +-
 .../ext/JavaTimeSupplementary_ru.java         |    66 +-
 .../ext/JavaTimeSupplementary_sk.java         |    84 +-
 .../ext/JavaTimeSupplementary_sl.java         |    60 +-
 .../ext/JavaTimeSupplementary_sq.java         |    50 +-
 .../ext/JavaTimeSupplementary_sr.java         |    58 +-
 .../ext/JavaTimeSupplementary_sr_Latn.java    |    46 +-
 .../ext/JavaTimeSupplementary_sv.java         |    60 +-
 .../ext/JavaTimeSupplementary_th.java         |    36 +-
 .../ext/JavaTimeSupplementary_tr.java         |    16 +-
 .../ext/JavaTimeSupplementary_uk.java         |    98 +-
 .../ext/JavaTimeSupplementary_vi.java         |    20 +-
 .../ext/JavaTimeSupplementary_zh.java         |    24 +-
 .../ext/JavaTimeSupplementary_zh_TW.java      |     8 +-
 .../cldr/resources/27_0_0/common/dtd/ldml.dtd |  1538 ---
 .../27_0_0/common/dtd/ldmlSupplemental.dtd    |   553 -
 .../resources/27_0_0/common/main/ar_IL.xml    |    14 -
 .../resources/27_0_0/common/main/ar_KM.xml    |    14 -
 .../cldr/resources/27_0_0/common/main/ast.xml |  5946 ---------
 .../cldr/resources/27_0_0/common/main/be.xml  |  1347 --
 .../cldr/resources/27_0_0/common/main/cy.xml  |  6122 ---------
 .../resources/27_0_0/common/main/da_GL.xml    |    14 -
 .../resources/27_0_0/common/main/ee_TG.xml    |    14 -
 .../resources/27_0_0/common/main/en_150.xml   |   101 -
 .../resources/27_0_0/common/main/en_AU.xml    |   264 -
 .../resources/27_0_0/common/main/en_CC.xml    |    21 -
 .../resources/27_0_0/common/main/en_CK.xml    |    21 -
 .../resources/27_0_0/common/main/en_CX.xml    |    21 -
 .../resources/27_0_0/common/main/en_DG.xml    |    14 -
 .../resources/27_0_0/common/main/en_FK.xml    |    24 -
 .../resources/27_0_0/common/main/en_GB.xml    |   115 -
 .../resources/27_0_0/common/main/en_GG.xml    |    14 -
 .../resources/27_0_0/common/main/en_GI.xml    |    25 -
 .../resources/27_0_0/common/main/en_IM.xml    |    14 -
 .../resources/27_0_0/common/main/en_IO.xml    |    14 -
 .../resources/27_0_0/common/main/en_JE.xml    |    14 -
 .../resources/27_0_0/common/main/en_MS.xml    |    21 -
 .../resources/27_0_0/common/main/en_NF.xml    |    21 -
 .../resources/27_0_0/common/main/en_NR.xml    |    21 -
 .../resources/27_0_0/common/main/en_NU.xml    |    21 -
 .../resources/27_0_0/common/main/en_PN.xml    |    21 -
 .../resources/27_0_0/common/main/en_SC.xml    |    21 -
 .../resources/27_0_0/common/main/en_SH.xml    |    24 -
 .../resources/27_0_0/common/main/en_SX.xml    |    21 -
 .../resources/27_0_0/common/main/en_TK.xml    |    21 -
 .../resources/27_0_0/common/main/en_TV.xml    |    21 -
 .../resources/27_0_0/common/main/es_419.xml   |   289 -
 .../resources/27_0_0/common/main/es_AR.xml    |   184 -
 .../resources/27_0_0/common/main/es_CO.xml    |   206 -
 .../resources/27_0_0/common/main/es_DO.xml    |    24 -
 .../resources/27_0_0/common/main/es_GT.xml    |   187 -
 .../resources/27_0_0/common/main/es_PA.xml    |   201 -
 .../resources/27_0_0/common/main/ff_MR.xml    |    21 -
 .../cldr/resources/27_0_0/common/main/fo.xml  |  1733 ---
 .../resources/27_0_0/common/main/fr_DJ.xml    |    21 -
 .../resources/27_0_0/common/main/fr_DZ.xml    |    21 -
 .../resources/27_0_0/common/main/fr_GF.xml    |    14 -
 .../resources/27_0_0/common/main/fr_HT.xml    |    21 -
 .../resources/27_0_0/common/main/fr_MA.xml    |    14 -
 .../resources/27_0_0/common/main/fr_MR.xml    |    21 -
 .../resources/27_0_0/common/main/fr_SY.xml    |    21 -
 .../resources/27_0_0/common/main/fr_TD.xml    |    14 -
 .../resources/27_0_0/common/main/fr_TN.xml    |    21 -
 .../resources/27_0_0/common/main/fr_VU.xml    |    21 -
 .../27_0_0/common/main/ha_Latn_NE.xml         |    15 -
 .../resources/27_0_0/common/main/kk_Cyrl.xml  |    14 -
 .../resources/27_0_0/common/main/ks_Arab.xml  |    14 -
 .../resources/27_0_0/common/main/ky_Cyrl.xml  |    14 -
 .../resources/27_0_0/common/main/mn_Cyrl.xml  |    14 -
 .../resources/27_0_0/common/main/ms_Latn.xml  |    14 -
 .../resources/27_0_0/common/main/om_KE.xml    |    21 -
 .../resources/27_0_0/common/main/ro_MD.xml    |    21 -
 .../resources/27_0_0/common/main/so_KE.xml    |    21 -
 .../resources/27_0_0/common/main/sq_MK.xml    |    21 -
 .../resources/27_0_0/common/main/sq_XK.xml    |    14 -
 .../resources/27_0_0/common/main/ta_LK.xml    |    22 -
 .../resources/27_0_0/common/main/tzm_Latn.xml |    14 -
 .../resources/27_0_0/common/main/ug_Arab.xml  |    14 -
 .../27_0_0/common/main/zh_Hant_HK.xml         |  1719 ---
 .../27_0_0/common/supplemental/dayPeriods.xml |   660 -
 .../common/supplemental/postalCodeData.xml    |   176 -
 .../supplemental/supplementalMetadata.xml     |  1963 ---
 .../util/cldr/resources/common/dtd/ldml.dtd   |  2798 ++++
 .../resources/common/dtd/ldmlSupplemental.dtd |   945 ++
 .../resources/{27_0_0 => }/common/main/af.xml |  2047 +--
 .../{27_0_0 => }/common/main/af_NA.xml        |    49 +-
 .../{27_0_0 => }/common/main/af_ZA.xml        |     6 +-
 .../{27_0_0 => }/common/main/agq.xml          |    27 +-
 .../{27_0_0 => }/common/main/agq_CM.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/ak.xml |    46 +-
 .../{27_0_0 => }/common/main/ak_GH.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/am.xml |  2421 ++--
 .../{27_0_0 => }/common/main/am_ET.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/ar.xml |  7251 ++++++-----
 .../cldr/resources/common/main/ar_001.xml     |    14 +
 .../{27_0_0 => }/common/main/ar_AE.xml        |     7 +-
 .../{27_0_0 => }/common/main/ar_BH.xml        |     6 +-
 .../{27_0_0 => }/common/main/ar_DJ.xml        |     6 +-
 .../{27_0_0 => }/common/main/ar_DZ.xml        |     5 +-
 .../{27_0_0 => }/common/main/ar_EG.xml        |    10 +-
 .../{27_0_0 => }/common/main/ar_EH.xml        |     6 +-
 .../{27_0_0 => }/common/main/ar_ER.xml        |     6 +-
 .../util/cldr/resources/common/main/ar_IL.xml |    42 +
 .../{27_0_0 => }/common/main/ar_IQ.xml        |     6 +-
 .../{27_0_0 => }/common/main/ar_JO.xml        |     6 +-
 .../util/cldr/resources/common/main/ar_KM.xml |    42 +
 .../{27_0_0 => }/common/main/ar_KW.xml        |     6 +-
 .../{27_0_0 => }/common/main/ar_LB.xml        |     8 +-
 .../{27_0_0 => }/common/main/ar_LY.xml        |     6 +-
 .../{27_0_0 => }/common/main/ar_MA.xml        |    27 +-
 .../{27_0_0 => }/common/main/ar_MR.xml        |    26 +-
 .../{27_0_0 => }/common/main/ar_OM.xml        |     6 +-
 .../{27_0_0 => }/common/main/ar_PS.xml        |     5 +-
 .../{27_0_0 => }/common/main/ar_QA.xml        |     6 +-
 .../{27_0_0 => }/common/main/ar_SA.xml        |     6 +-
 .../{27_0_0 => }/common/main/ar_SD.xml        |     6 +-
 .../{27_0_0 => }/common/main/ar_SO.xml        |     6 +-
 .../{27_0_0 => }/common/main/ar_SS.xml        |     6 +-
 .../{27_0_0 => }/common/main/ar_SY.xml        |     5 +-
 .../{27_0_0 => }/common/main/ar_TD.xml        |     6 +-
 .../{27_0_0 => }/common/main/ar_TN.xml        |     5 +-
 .../{27_0_0 => }/common/main/ar_YE.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/as.xml |    75 +-
 .../{27_0_0 => }/common/main/as_IN.xml        |     6 +-
 .../{27_0_0 => }/common/main/asa.xml          |    47 +-
 .../{27_0_0 => }/common/main/asa_TZ.xml       |     6 +-
 .../util/cldr/resources/common/main/ast.xml   | 10293 +++++++++++++++
 .../{27_0_0 => }/common/main/ast_ES.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/az.xml |  2152 ++--
 .../{27_0_0 => }/common/main/az_Cyrl.xml      |    58 +-
 .../{27_0_0 => }/common/main/az_Cyrl_AZ.xml   |     6 +-
 .../{27_0_0 => }/common/main/az_Latn.xml      |     6 +-
 .../{27_0_0 => }/common/main/az_Latn_AZ.xml   |     6 +-
 .../{27_0_0 => }/common/main/bas.xml          |    27 +-
 .../{27_0_0 => }/common/main/bas_CM.xml       |     6 +-
 .../util/cldr/resources/common/main/be.xml    |  7600 +++++++++++
 .../{27_0_0 => }/common/main/be_BY.xml        |     6 +-
 .../{27_0_0 => }/common/main/bem.xml          |    40 +-
 .../{27_0_0 => }/common/main/bem_ZM.xml       |     6 +-
 .../{27_0_0 => }/common/main/bez.xml          |    46 +-
 .../{27_0_0 => }/common/main/bez_TZ.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/bg.xml |  1858 +--
 .../{27_0_0 => }/common/main/bg_BG.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/bm.xml |    23 +-
 .../bm_Latn_ML.xml => common/main/bm_ML.xml}  |     7 +-
 .../resources/{27_0_0 => }/common/main/bn.xml |  1956 +--
 .../{27_0_0 => }/common/main/bn_BD.xml        |     6 +-
 .../{27_0_0 => }/common/main/bn_IN.xml        |     5 +-
 .../resources/{27_0_0 => }/common/main/bo.xml |   193 +-
 .../{27_0_0 => }/common/main/bo_CN.xml        |     6 +-
 .../{27_0_0 => }/common/main/bo_IN.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/br.xml |  4894 +++++--
 .../{27_0_0 => }/common/main/br_FR.xml        |     6 +-
 .../{27_0_0 => }/common/main/brx.xml          |   126 +-
 .../{27_0_0 => }/common/main/brx_IN.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/bs.xml |  2110 +--
 .../{27_0_0 => }/common/main/bs_Cyrl.xml      |   671 +-
 .../{27_0_0 => }/common/main/bs_Cyrl_BA.xml   |     6 +-
 .../{27_0_0 => }/common/main/bs_Latn.xml      |     6 +-
 .../{27_0_0 => }/common/main/bs_Latn_BA.xml   |     6 +-
 .../resources/{27_0_0 => }/common/main/ca.xml |  2196 ++--
 .../{27_0_0 => }/common/main/ca_AD.xml        |     6 +-
 .../{27_0_0 => }/common/main/ca_ES.xml        |     6 +-
 .../common/main/ca_ES_VALENCIA.xml            |    13 +-
 .../{27_0_0 => }/common/main/ca_FR.xml        |     6 +-
 .../{27_0_0 => }/common/main/ca_IT.xml        |     6 +-
 .../util/cldr/resources/common/main/ce.xml    |  4672 +++++++
 .../main/ru_RU.xml => common/main/ce_RU.xml}  |     5 +-
 .../{27_0_0 => }/common/main/cgg.xml          |    42 +-
 .../{27_0_0 => }/common/main/cgg_UG.xml       |     6 +-
 .../{27_0_0 => }/common/main/chr.xml          |   122 +-
 .../{27_0_0 => }/common/main/chr_US.xml       |     6 +-
 .../util/cldr/resources/common/main/ckb.xml   |   983 ++
 .../bm_Latn.xml => common/main/ckb_IQ.xml}    |     7 +-
 .../cldr/resources/common/main/ckb_IR.xml     |    41 +
 .../resources/{27_0_0 => }/common/main/cs.xml |  3254 ++---
 .../{27_0_0 => }/common/main/cs_CZ.xml        |     6 +-
 .../util/cldr/resources/common/main/cu.xml    |   997 ++
 .../main/sah_RU.xml => common/main/cu_RU.xml} |     5 +-
 .../util/cldr/resources/common/main/cy.xml    | 10558 ++++++++++++++++
 .../{27_0_0 => }/common/main/cy_GB.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/da.xml |  2100 +--
 .../{27_0_0 => }/common/main/da_DK.xml        |     6 +-
 .../util/cldr/resources/common/main/da_GL.xml |    42 +
 .../{27_0_0 => }/common/main/dav.xml          |    35 +-
 .../{27_0_0 => }/common/main/dav_KE.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/de.xml |  2468 ++--
 .../{27_0_0 => }/common/main/de_AT.xml        |     8 +-
 .../{27_0_0 => }/common/main/de_BE.xml        |     6 +-
 .../{27_0_0 => }/common/main/de_CH.xml        |    27 +-
 .../{27_0_0 => }/common/main/de_DE.xml        |     6 +-
 .../util/cldr/resources/common/main/de_LI.xml |    53 +
 .../{27_0_0 => }/common/main/de_LU.xml        |     6 +-
 .../{27_0_0 => }/common/main/dje.xml          |    27 +-
 .../{27_0_0 => }/common/main/dje_NE.xml       |     6 +-
 .../{27_0_0 => }/common/main/dsb.xml          |  1949 +--
 .../{27_0_0 => }/common/main/dsb_DE.xml       |     6 +-
 .../{27_0_0 => }/common/main/dua.xml          |    26 +-
 .../{27_0_0 => }/common/main/dua_CM.xml       |     6 +-
 .../{27_0_0 => }/common/main/dyo.xml          |    22 +-
 .../{27_0_0 => }/common/main/dyo_SN.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/dz.xml |   146 +-
 .../{27_0_0 => }/common/main/dz_BT.xml        |     6 +-
 .../{27_0_0 => }/common/main/ebu.xml          |    35 +-
 .../{27_0_0 => }/common/main/ebu_KE.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/ee.xml |   847 +-
 .../{27_0_0 => }/common/main/ee_GH.xml        |     6 +-
 .../util/cldr/resources/common/main/ee_TG.xml |    42 +
 .../resources/{27_0_0 => }/common/main/el.xml |  1956 +--
 .../{27_0_0 => }/common/main/el_CY.xml        |     6 +-
 .../{27_0_0 => }/common/main/el_GR.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/en.xml |  2465 ++--
 .../{27_0_0 => }/common/main/en_001.xml       |   271 +-
 .../cldr/resources/common/main/en_150.xml     |    63 +
 .../{27_0_0 => }/common/main/en_AG.xml        |     6 +-
 .../util/cldr/resources/common/main/en_AI.xml |    49 +
 .../{27_0_0 => }/common/main/en_AS.xml        |     6 +-
 .../util/cldr/resources/common/main/en_AT.xml |    36 +
 .../util/cldr/resources/common/main/en_AU.xml |   760 ++
 .../{27_0_0 => }/common/main/en_BB.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_BE.xml        |    22 +-
 .../main/en_AI.xml => common/main/en_BI.xml}  |    12 +-
 .../{27_0_0 => }/common/main/en_BM.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_BS.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_BW.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_BZ.xml        |     5 +-
 .../{27_0_0 => }/common/main/en_CA.xml        |   199 +-
 .../util/cldr/resources/common/main/en_CC.xml |    49 +
 .../main/de_LI.xml => common/main/en_CH.xml}  |    18 +-
 .../util/cldr/resources/common/main/en_CK.xml |    49 +
 .../{27_0_0 => }/common/main/en_CM.xml        |    32 +-
 .../util/cldr/resources/common/main/en_CX.xml |    49 +
 .../main/tr_CY.xml => common/main/en_CY.xml}  |     8 +-
 .../util/cldr/resources/common/main/en_DE.xml |    26 +
 .../util/cldr/resources/common/main/en_DG.xml |    42 +
 .../util/cldr/resources/common/main/en_DK.xml |    95 +
 .../{27_0_0 => }/common/main/en_DM.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_ER.xml        |     6 +-
 .../util/cldr/resources/common/main/en_FI.xml |    91 +
 .../{27_0_0 => }/common/main/en_FJ.xml        |     6 +-
 .../util/cldr/resources/common/main/en_FK.xml |    52 +
 .../{27_0_0 => }/common/main/en_FM.xml        |     6 +-
 .../util/cldr/resources/common/main/en_GB.xml |   303 +
 .../{27_0_0 => }/common/main/en_GD.xml        |     6 +-
 .../util/cldr/resources/common/main/en_GG.xml |    51 +
 .../{27_0_0 => }/common/main/en_GH.xml        |     6 +-
 .../util/cldr/resources/common/main/en_GI.xml |    52 +
 .../{27_0_0 => }/common/main/en_GM.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_GU.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_GY.xml        |    15 +-
 .../{27_0_0 => }/common/main/en_HK.xml        |     5 +-
 .../{27_0_0 => }/common/main/en_IE.xml        |    41 +-
 .../util/cldr/resources/common/main/en_IL.xml |    62 +
 .../util/cldr/resources/common/main/en_IM.xml |    51 +
 .../{27_0_0 => }/common/main/en_IN.xml        |     5 +-
 .../util/cldr/resources/common/main/en_IO.xml |    42 +
 .../util/cldr/resources/common/main/en_JE.xml |    51 +
 .../{27_0_0 => }/common/main/en_JM.xml        |     5 +-
 .../{27_0_0 => }/common/main/en_KE.xml        |    32 +-
 .../{27_0_0 => }/common/main/en_KI.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_KN.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_KY.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_LC.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_LR.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_LS.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_MG.xml        |    32 +-
 .../{27_0_0 => }/common/main/en_MH.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_MO.xml        |     5 +-
 .../{27_0_0 => }/common/main/en_MP.xml        |     6 +-
 .../util/cldr/resources/common/main/en_MS.xml |    49 +
 .../{27_0_0 => }/common/main/en_MT.xml        |    27 +-
 .../{27_0_0 => }/common/main/en_MU.xml        |    32 +-
 .../{27_0_0 => }/common/main/en_MW.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_MY.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_NA.xml        |     6 +-
 .../util/cldr/resources/common/main/en_NF.xml |    49 +
 .../{27_0_0 => }/common/main/en_NG.xml        |     6 +-
 .../main/es_PY.xml => common/main/en_NL.xml}  |    22 +-
 .../util/cldr/resources/common/main/en_NR.xml |    49 +
 .../util/cldr/resources/common/main/en_NU.xml |    49 +
 .../{27_0_0 => }/common/main/en_NZ.xml        |    10 +-
 .../{27_0_0 => }/common/main/en_PG.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_PH.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_PK.xml        |     5 +-
 .../util/cldr/resources/common/main/en_PN.xml |    49 +
 .../{27_0_0 => }/common/main/en_PR.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_PW.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_RW.xml        |    32 +-
 .../{27_0_0 => }/common/main/en_SB.xml        |     6 +-
 .../util/cldr/resources/common/main/en_SC.xml |    49 +
 .../{27_0_0 => }/common/main/en_SD.xml        |     6 +-
 .../util/cldr/resources/common/main/en_SE.xml |    68 +
 .../{27_0_0 => }/common/main/en_SG.xml        |     5 +-
 .../util/cldr/resources/common/main/en_SH.xml |    52 +
 .../main/es_VE.xml => common/main/en_SI.xml}  |    22 +-
 .../{27_0_0 => }/common/main/en_SL.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_SS.xml        |     6 +-
 .../util/cldr/resources/common/main/en_SX.xml |    49 +
 .../{27_0_0 => }/common/main/en_SZ.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_TC.xml        |     6 +-
 .../util/cldr/resources/common/main/en_TK.xml |    49 +
 .../{27_0_0 => }/common/main/en_TO.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_TT.xml        |     6 +-
 .../util/cldr/resources/common/main/en_TV.xml |    49 +
 .../{27_0_0 => }/common/main/en_TZ.xml        |    32 +-
 .../{27_0_0 => }/common/main/en_UG.xml        |    32 +-
 .../{27_0_0 => }/common/main/en_UM.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_US.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_US_POSIX.xml  |     6 +-
 .../{27_0_0 => }/common/main/en_VC.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_VG.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_VI.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_VU.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_WS.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_ZA.xml        |     5 +-
 .../{27_0_0 => }/common/main/en_ZM.xml        |     6 +-
 .../{27_0_0 => }/common/main/en_ZW.xml        |     5 +-
 .../resources/{27_0_0 => }/common/main/eo.xml |   564 +-
 .../cldr/resources/common/main/eo_001.xml     |    14 +
 .../resources/{27_0_0 => }/common/main/es.xml |  2059 +--
 .../cldr/resources/common/main/es_419.xml     |   597 +
 .../util/cldr/resources/common/main/es_AR.xml |   350 +
 .../{27_0_0 => }/common/main/es_BO.xml        |    15 +-
 .../main/es_PH.xml => common/main/es_BR.xml}  |    12 +-
 .../{27_0_0 => }/common/main/es_CL.xml        |   198 +-
 .../util/cldr/resources/common/main/es_CO.xml |   439 +
 .../{27_0_0 => }/common/main/es_CR.xml        |    11 +-
 .../{27_0_0 => }/common/main/es_CU.xml        |     6 +-
 .../util/cldr/resources/common/main/es_DO.xml |   205 +
 .../{27_0_0 => }/common/main/es_EA.xml        |     6 +-
 .../{27_0_0 => }/common/main/es_EC.xml        |    12 +-
 .../{27_0_0 => }/common/main/es_ES.xml        |     6 +-
 .../{27_0_0 => }/common/main/es_GQ.xml        |     6 +-
 .../util/cldr/resources/common/main/es_GT.xml |   290 +
 .../{27_0_0 => }/common/main/es_HN.xml        |     9 +-
 .../{27_0_0 => }/common/main/es_IC.xml        |     6 +-
 .../{27_0_0 => }/common/main/es_MX.xml        |   313 +-
 .../{27_0_0 => }/common/main/es_NI.xml        |     9 +-
 .../util/cldr/resources/common/main/es_PA.xml |   242 +
 .../{27_0_0 => }/common/main/es_PE.xml        |    14 +-
 .../util/cldr/resources/common/main/es_PH.xml |    49 +
 .../{27_0_0 => }/common/main/es_PR.xml        |    27 +-
 .../util/cldr/resources/common/main/es_PY.xml |   266 +
 .../{27_0_0 => }/common/main/es_SV.xml        |     9 +-
 .../{27_0_0 => }/common/main/es_US.xml        |    28 +-
 .../{27_0_0 => }/common/main/es_UY.xml        |    15 +-
 .../util/cldr/resources/common/main/es_VE.xml |   213 +
 .../resources/{27_0_0 => }/common/main/et.xml |  3077 +++--
 .../{27_0_0 => }/common/main/et_EE.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/eu.xml |  1482 +--
 .../{27_0_0 => }/common/main/eu_ES.xml        |     6 +-
 .../{27_0_0 => }/common/main/ewo.xml          |    27 +-
 .../{27_0_0 => }/common/main/ewo_CM.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/fa.xml |  2758 ++--
 .../{27_0_0 => }/common/main/fa_AF.xml        |    18 +-
 .../{27_0_0 => }/common/main/fa_IR.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/ff.xml |    38 +-
 .../{27_0_0 => }/common/main/ff_CM.xml        |     6 +-
 .../{27_0_0 => }/common/main/ff_GN.xml        |     6 +-
 .../util/cldr/resources/common/main/ff_MR.xml |    49 +
 .../{27_0_0 => }/common/main/ff_SN.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/fi.xml |  3083 +++--
 .../{27_0_0 => }/common/main/fi_FI.xml        |     6 +-
 .../{27_0_0 => }/common/main/fil.xml          |  2863 +++--
 .../{27_0_0 => }/common/main/fil_PH.xml       |     6 +-
 .../util/cldr/resources/common/main/fo.xml    |  6625 ++++++++++
 .../util/cldr/resources/common/main/fo_DK.xml |    21 +
 .../{27_0_0 => }/common/main/fo_FO.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/fr.xml |  3543 ++++--
 .../{27_0_0 => }/common/main/fr_BE.xml        |     8 +-
 .../{27_0_0 => }/common/main/fr_BF.xml        |     6 +-
 .../{27_0_0 => }/common/main/fr_BI.xml        |     6 +-
 .../{27_0_0 => }/common/main/fr_BJ.xml        |     6 +-
 .../{27_0_0 => }/common/main/fr_BL.xml        |     6 +-
 .../{27_0_0 => }/common/main/fr_CA.xml        |   865 +-
 .../{27_0_0 => }/common/main/fr_CD.xml        |     6 +-
 .../{27_0_0 => }/common/main/fr_CF.xml        |     6 +-
 .../{27_0_0 => }/common/main/fr_CG.xml        |     6 +-
 .../{27_0_0 => }/common/main/fr_CH.xml        |    15 +-
 .../{27_0_0 => }/common/main/fr_CI.xml        |     6 +-
 .../{27_0_0 => }/common/main/fr_CM.xml        |     6 +-
 .../util/cldr/resources/common/main/fr_DJ.xml |    49 +
 .../util/cldr/resources/common/main/fr_DZ.xml |    49 +
 .../{27_0_0 => }/common/main/fr_FR.xml        |     6 +-
 .../{27_0_0 => }/common/main/fr_GA.xml        |     6 +-
 .../main/ne_IN.xml => common/main/fr_GF.xml}  |    11 +-
 .../{27_0_0 => }/common/main/fr_GN.xml        |     6 +-
 .../{27_0_0 => }/common/main/fr_GP.xml        |     6 +-
 .../{27_0_0 => }/common/main/fr_GQ.xml        |     6 +-
 .../util/cldr/resources/common/main/fr_HT.xml |   115 +
 .../{27_0_0 => }/common/main/fr_KM.xml        |     6 +-
 .../{27_0_0 => }/common/main/fr_LU.xml        |     6 +-
 .../util/cldr/resources/common/main/fr_MA.xml |    67 +
 .../{27_0_0 => }/common/main/fr_MC.xml        |     6 +-
 .../{27_0_0 => }/common/main/fr_MF.xml        |     6 +-
 .../{27_0_0 => }/common/main/fr_MG.xml        |     6 +-
 .../{27_0_0 => }/common/main/fr_ML.xml        |     6 +-
 .../{27_0_0 => }/common/main/fr_MQ.xml        |     6 +-
 .../util/cldr/resources/common/main/fr_MR.xml |    49 +
 .../{27_0_0 => }/common/main/fr_MU.xml        |     6 +-
 .../{27_0_0 => }/common/main/fr_NC.xml        |     6 +-
 .../{27_0_0 => }/common/main/fr_NE.xml        |     6 +-
 .../{27_0_0 => }/common/main/fr_PF.xml        |     6 +-
 .../{27_0_0 => }/common/main/fr_PM.xml        |     6 +-
 .../{27_0_0 => }/common/main/fr_RE.xml        |     6 +-
 .../{27_0_0 => }/common/main/fr_RW.xml        |     6 +-
 .../{27_0_0 => }/common/main/fr_SC.xml        |     6 +-
 .../{27_0_0 => }/common/main/fr_SN.xml        |     6 +-
 .../util/cldr/resources/common/main/fr_SY.xml |    49 +
 .../util/cldr/resources/common/main/fr_TD.xml |    42 +
 .../{27_0_0 => }/common/main/fr_TG.xml        |     6 +-
 .../util/cldr/resources/common/main/fr_TN.xml |    49 +
 .../util/cldr/resources/common/main/fr_VU.xml |    49 +
 .../{27_0_0 => }/common/main/fr_WF.xml        |     6 +-
 .../{27_0_0 => }/common/main/fr_YT.xml        |     6 +-
 .../{27_0_0 => }/common/main/fur.xml          |   122 +-
 .../{27_0_0 => }/common/main/fur_IT.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/fy.xml |   772 +-
 .../{27_0_0 => }/common/main/fy_NL.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/ga.xml |  3287 ++---
 .../{27_0_0 => }/common/main/ga_IE.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/gd.xml |  4569 ++++---
 .../{27_0_0 => }/common/main/gd_GB.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/gl.xml |  1853 +--
 .../{27_0_0 => }/common/main/gl_ES.xml        |     6 +-
 .../{27_0_0 => }/common/main/gsw.xml          |   454 +-
 .../{27_0_0 => }/common/main/gsw_CH.xml       |     6 +-
 .../{27_0_0 => }/common/main/gsw_FR.xml       |     6 +-
 .../{27_0_0 => }/common/main/gsw_LI.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/gu.xml |  2000 +--
 .../{27_0_0 => }/common/main/gu_IN.xml        |     6 +-
 .../{27_0_0 => }/common/main/guz.xml          |    38 +-
 .../{27_0_0 => }/common/main/guz_KE.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/gv.xml |    78 +-
 .../{27_0_0 => }/common/main/gv_IM.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/ha.xml |    42 +-
 .../ha_Latn_GH.xml => common/main/ha_GH.xml}  |     7 +-
 .../util/cldr/resources/common/main/ha_NE.xml |    42 +
 .../ha_Latn_NG.xml => common/main/ha_NG.xml}  |     7 +-
 .../{27_0_0 => }/common/main/haw.xml          |    82 +-
 .../{27_0_0 => }/common/main/haw_US.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/he.xml |  3358 ++---
 .../{27_0_0 => }/common/main/he_IL.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/hi.xml |  1807 +--
 .../{27_0_0 => }/common/main/hi_IN.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/hr.xml |  2703 ++--
 .../{27_0_0 => }/common/main/hr_BA.xml        |     6 +-
 .../{27_0_0 => }/common/main/hr_HR.xml        |     6 +-
 .../{27_0_0 => }/common/main/hsb.xml          |  1949 +--
 .../{27_0_0 => }/common/main/hsb_DE.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/hu.xml |  1871 +--
 .../{27_0_0 => }/common/main/hu_HU.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/hy.xml |  2082 +--
 .../{27_0_0 => }/common/main/hy_AM.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/id.xml |  1874 ++-
 .../{27_0_0 => }/common/main/id_ID.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/ig.xml |    25 +-
 .../{27_0_0 => }/common/main/ig_NG.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/ii.xml |    54 +-
 .../{27_0_0 => }/common/main/ii_CN.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/is.xml |  2225 ++--
 .../{27_0_0 => }/common/main/is_IS.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/it.xml |  2233 ++--
 .../{27_0_0 => }/common/main/it_CH.xml        |    27 +-
 .../{27_0_0 => }/common/main/it_IT.xml        |     6 +-
 .../{27_0_0 => }/common/main/it_SM.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/ja.xml |  2000 +--
 .../{27_0_0 => }/common/main/ja_JP.xml        |     6 +-
 .../{27_0_0 => }/common/main/jgo.xml          |    81 +-
 .../{27_0_0 => }/common/main/jgo_CM.xml       |     6 +-
 .../{27_0_0 => }/common/main/jmc.xml          |    47 +-
 .../{27_0_0 => }/common/main/jmc_TZ.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/ka.xml |  1795 +--
 .../{27_0_0 => }/common/main/ka_GE.xml        |     6 +-
 .../{27_0_0 => }/common/main/kab.xml          |    47 +-
 .../{27_0_0 => }/common/main/kab_DZ.xml       |     6 +-
 .../{27_0_0 => }/common/main/kam.xml          |    35 +-
 .../{27_0_0 => }/common/main/kam_KE.xml       |     6 +-
 .../{27_0_0 => }/common/main/kde.xml          |    34 +-
 .../{27_0_0 => }/common/main/kde_TZ.xml       |     6 +-
 .../{27_0_0 => }/common/main/kea.xml          |   930 +-
 .../{27_0_0 => }/common/main/kea_CV.xml       |     6 +-
 .../{27_0_0 => }/common/main/khq.xml          |    27 +-
 .../{27_0_0 => }/common/main/khq_ML.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/ki.xml |    35 +-
 .../{27_0_0 => }/common/main/ki_KE.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/kk.xml |  3260 ++---
 .../kk_Cyrl_KZ.xml => common/main/kk_KZ.xml}  |     7 +-
 .../{27_0_0 => }/common/main/kkj.xml          |    36 +-
 .../{27_0_0 => }/common/main/kkj_CM.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/kl.xml |   658 +-
 .../{27_0_0 => }/common/main/kl_GL.xml        |     6 +-
 .../{27_0_0 => }/common/main/kln.xml          |    32 +-
 .../{27_0_0 => }/common/main/kln_KE.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/km.xml |  2089 +--
 .../{27_0_0 => }/common/main/km_KH.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/kn.xml |  1913 +--
 .../{27_0_0 => }/common/main/kn_IN.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/ko.xml |  2009 +--
 .../{27_0_0 => }/common/main/ko_KP.xml        |     6 +-
 .../{27_0_0 => }/common/main/ko_KR.xml        |     6 +-
 .../{27_0_0 => }/common/main/kok.xml          |    26 +-
 .../{27_0_0 => }/common/main/kok_IN.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/ks.xml |   110 +-
 .../ks_Arab_IN.xml => common/main/ks_IN.xml}  |     7 +-
 .../{27_0_0 => }/common/main/ksb.xml          |    46 +-
 .../{27_0_0 => }/common/main/ksb_TZ.xml       |     6 +-
 .../{27_0_0 => }/common/main/ksf.xml          |    27 +-
 .../{27_0_0 => }/common/main/ksf_CM.xml       |     6 +-
 .../{27_0_0 => }/common/main/ksh.xml          |   594 +-
 .../{27_0_0 => }/common/main/ksh_DE.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/kw.xml |    52 +-
 .../{27_0_0 => }/common/main/kw_GB.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/ky.xml |  2091 +--
 .../ky_Cyrl_KG.xml => common/main/ky_KG.xml}  |     7 +-
 .../{27_0_0 => }/common/main/lag.xml          |    61 +-
 .../{27_0_0 => }/common/main/lag_TZ.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/lb.xml |  1690 +--
 .../{27_0_0 => }/common/main/lb_LU.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/lg.xml |    42 +-
 .../{27_0_0 => }/common/main/lg_UG.xml        |     6 +-
 .../{27_0_0 => }/common/main/lkt.xml          |   134 +-
 .../{27_0_0 => }/common/main/lkt_US.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/ln.xml |    40 +-
 .../{27_0_0 => }/common/main/ln_AO.xml        |     6 +-
 .../{27_0_0 => }/common/main/ln_CD.xml        |     6 +-
 .../{27_0_0 => }/common/main/ln_CF.xml        |     6 +-
 .../{27_0_0 => }/common/main/ln_CG.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/lo.xml |  1689 ++-
 .../{27_0_0 => }/common/main/lo_LA.xml        |     6 +-
 .../util/cldr/resources/common/main/lrc.xml   |   855 ++
 .../cldr/resources/common/main/lrc_IQ.xml     |    41 +
 .../cldr/resources/common/main/lrc_IR.xml     |    13 +
 .../resources/{27_0_0 => }/common/main/lt.xml |  2735 ++--
 .../{27_0_0 => }/common/main/lt_LT.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/lu.xml |    27 +-
 .../{27_0_0 => }/common/main/lu_CD.xml        |     6 +-
 .../{27_0_0 => }/common/main/luo.xml          |    34 +-
 .../{27_0_0 => }/common/main/luo_KE.xml       |     6 +-
 .../{27_0_0 => }/common/main/luy.xml          |    35 +-
 .../{27_0_0 => }/common/main/luy_KE.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/lv.xml |  2074 +--
 .../{27_0_0 => }/common/main/lv_LV.xml        |     6 +-
 .../{27_0_0 => }/common/main/mas.xml          |    46 +-
 .../{27_0_0 => }/common/main/mas_KE.xml       |     6 +-
 .../{27_0_0 => }/common/main/mas_TZ.xml       |     6 +-
 .../{27_0_0 => }/common/main/mer.xml          |    35 +-
 .../{27_0_0 => }/common/main/mer_KE.xml       |     6 +-
 .../{27_0_0 => }/common/main/mfe.xml          |    24 +-
 .../{27_0_0 => }/common/main/mfe_MU.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/mg.xml |    34 +-
 .../{27_0_0 => }/common/main/mg_MG.xml        |     6 +-
 .../{27_0_0 => }/common/main/mgh.xml          |    35 +-
 .../{27_0_0 => }/common/main/mgh_MZ.xml       |     6 +-
 .../{27_0_0 => }/common/main/mgo.xml          |    58 +-
 .../{27_0_0 => }/common/main/mgo_CM.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/mk.xml |  2310 ++--
 .../{27_0_0 => }/common/main/mk_MK.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/ml.xml |  2071 +--
 .../{27_0_0 => }/common/main/ml_IN.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/mn.xml |  1425 ++-
 .../mn_Cyrl_MN.xml => common/main/mn_MN.xml}  |     7 +-
 .../resources/{27_0_0 => }/common/main/mr.xml |  2102 +--
 .../{27_0_0 => }/common/main/mr_IN.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/ms.xml |  1514 ++-
 .../ms_Latn_BN.xml => common/main/ms_BN.xml}  |     7 +-
 .../ms_Latn_MY.xml => common/main/ms_MY.xml}  |     7 +-
 .../ms_Latn_SG.xml => common/main/ms_SG.xml}  |     7 +-
 .../resources/{27_0_0 => }/common/main/mt.xml |   217 +-
 .../{27_0_0 => }/common/main/mt_MT.xml        |     6 +-
 .../{27_0_0 => }/common/main/mua.xml          |    26 +-
 .../{27_0_0 => }/common/main/mua_CM.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/my.xml |  1639 ++-
 .../{27_0_0 => }/common/main/my_MM.xml        |     6 +-
 .../util/cldr/resources/common/main/mzn.xml   |  2789 ++++
 .../cldr/resources/common/main/mzn_IR.xml     |    13 +
 .../{27_0_0 => }/common/main/naq.xml          |    53 +-
 .../{27_0_0 => }/common/main/naq_NA.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/nb.xml |  3979 ++++--
 .../{27_0_0 => }/common/main/nb_NO.xml        |     6 +-
 .../{27_0_0 => }/common/main/nb_SJ.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/nd.xml |    35 +-
 .../{27_0_0 => }/common/main/nd_ZW.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/ne.xml |  2375 ++--
 .../util/cldr/resources/common/main/ne_IN.xml |    49 +
 .../{27_0_0 => }/common/main/ne_NP.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/nl.xml |  4990 ++++----
 .../{27_0_0 => }/common/main/nl_AW.xml        |     6 +-
 .../{27_0_0 => }/common/main/nl_BE.xml        |     5 +-
 .../{27_0_0 => }/common/main/nl_BQ.xml        |     6 +-
 .../{27_0_0 => }/common/main/nl_CW.xml        |     6 +-
 .../{27_0_0 => }/common/main/nl_NL.xml        |     6 +-
 .../{27_0_0 => }/common/main/nl_SR.xml        |    15 +-
 .../{27_0_0 => }/common/main/nl_SX.xml        |     6 +-
 .../{27_0_0 => }/common/main/nmg.xml          |    26 +-
 .../{27_0_0 => }/common/main/nmg_CM.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/nn.xml |   664 +-
 .../{27_0_0 => }/common/main/nn_NO.xml        |     6 +-
 .../{27_0_0 => }/common/main/nnh.xml          |    50 +-
 .../{27_0_0 => }/common/main/nnh_CM.xml       |     6 +-
 .../{27_0_0 => }/common/main/nus.xml          |    34 +-
 .../nus_SD.xml => common/main/nus_SS.xml}     |     8 +-
 .../{27_0_0 => }/common/main/nyn.xml          |    42 +-
 .../{27_0_0 => }/common/main/nyn_UG.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/om.xml |    38 +-
 .../{27_0_0 => }/common/main/om_ET.xml        |     6 +-
 .../util/cldr/resources/common/main/om_KE.xml |    49 +
 .../resources/{27_0_0 => }/common/main/or.xml |    39 +-
 .../{27_0_0 => }/common/main/or_IN.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/os.xml |    98 +-
 .../{27_0_0 => }/common/main/os_GE.xml        |     6 +-
 .../{27_0_0 => }/common/main/os_RU.xml        |    11 +-
 .../resources/{27_0_0 => }/common/main/pa.xml |  2181 ++--
 .../{27_0_0 => }/common/main/pa_Arab.xml      |    42 +-
 .../{27_0_0 => }/common/main/pa_Arab_PK.xml   |     6 +-
 .../{27_0_0 => }/common/main/pa_Guru.xml      |     6 +-
 .../{27_0_0 => }/common/main/pa_Guru_IN.xml   |     6 +-
 .../resources/{27_0_0 => }/common/main/pl.xml |  2472 ++--
 .../{27_0_0 => }/common/main/pl_PL.xml        |     6 +-
 .../util/cldr/resources/common/main/prg.xml   |   958 ++
 .../eo_001.xml => common/main/prg_001.xml}    |     5 +-
 .../resources/{27_0_0 => }/common/main/ps.xml |    66 +-
 .../{27_0_0 => }/common/main/ps_AF.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/pt.xml |  1994 +--
 .../{27_0_0 => }/common/main/pt_AO.xml        |     6 +-
 .../{27_0_0 => }/common/main/pt_BR.xml        |     6 +-
 .../util/cldr/resources/common/main/pt_CH.xml |    14 +
 .../{27_0_0 => }/common/main/pt_CV.xml        |     6 +-
 .../util/cldr/resources/common/main/pt_GQ.xml |    14 +
 .../{27_0_0 => }/common/main/pt_GW.xml        |     6 +-
 .../util/cldr/resources/common/main/pt_LU.xml |    21 +
 .../{27_0_0 => }/common/main/pt_MO.xml        |    32 +-
 .../{27_0_0 => }/common/main/pt_MZ.xml        |     6 +-
 .../{27_0_0 => }/common/main/pt_PT.xml        |   547 +-
 .../{27_0_0 => }/common/main/pt_ST.xml        |     6 +-
 .../{27_0_0 => }/common/main/pt_TL.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/qu.xml |    65 +-
 .../{27_0_0 => }/common/main/qu_BO.xml        |    22 +-
 .../{27_0_0 => }/common/main/qu_EC.xml        |    22 +-
 .../{27_0_0 => }/common/main/qu_PE.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/rm.xml |   264 +-
 .../{27_0_0 => }/common/main/rm_CH.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/rn.xml |    26 +-
 .../{27_0_0 => }/common/main/rn_BI.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/ro.xml |  2228 ++--
 .../util/cldr/resources/common/main/ro_MD.xml |   184 +
 .../{27_0_0 => }/common/main/ro_RO.xml        |     6 +-
 .../{27_0_0 => }/common/main/rof.xml          |    46 +-
 .../{27_0_0 => }/common/main/rof_TZ.xml       |     6 +-
 .../{27_0_0 => }/common/main/root.xml         |  1565 +--
 .../resources/{27_0_0 => }/common/main/ru.xml |  3093 +++--
 .../{27_0_0 => }/common/main/ru_BY.xml        |     6 +-
 .../{27_0_0 => }/common/main/ru_KG.xml        |     6 +-
 .../{27_0_0 => }/common/main/ru_KZ.xml        |     6 +-
 .../{27_0_0 => }/common/main/ru_MD.xml        |     6 +-
 .../util/cldr/resources/common/main/ru_RU.xml |    14 +
 .../{27_0_0 => }/common/main/ru_UA.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/rw.xml |    23 +-
 .../{27_0_0 => }/common/main/rw_RW.xml        |     6 +-
 .../{27_0_0 => }/common/main/rwk.xml          |    47 +-
 .../{27_0_0 => }/common/main/rwk_TZ.xml       |     6 +-
 .../{27_0_0 => }/common/main/sah.xml          |    73 +-
 .../cldr/resources/common/main/sah_RU.xml     |    14 +
 .../{27_0_0 => }/common/main/saq.xml          |    46 +-
 .../{27_0_0 => }/common/main/saq_KE.xml       |     6 +-
 .../{27_0_0 => }/common/main/sbp.xml          |    34 +-
 .../{27_0_0 => }/common/main/sbp_TZ.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/se.xml |   586 +-
 .../{27_0_0 => }/common/main/se_FI.xml        |    21 +-
 .../{27_0_0 => }/common/main/se_NO.xml        |     6 +-
 .../{27_0_0 => }/common/main/se_SE.xml        |     6 +-
 .../{27_0_0 => }/common/main/seh.xml          |    35 +-
 .../{27_0_0 => }/common/main/seh_MZ.xml       |     6 +-
 .../{27_0_0 => }/common/main/ses.xml          |    27 +-
 .../{27_0_0 => }/common/main/ses_ML.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/sg.xml |    35 +-
 .../{27_0_0 => }/common/main/sg_CF.xml        |     6 +-
 .../{27_0_0 => }/common/main/shi.xml          |    75 +-
 .../{27_0_0 => }/common/main/shi_Latn.xml     |   163 +-
 .../{27_0_0 => }/common/main/shi_Latn_MA.xml  |     6 +-
 .../{27_0_0 => }/common/main/shi_Tfng.xml     |     6 +-
 .../{27_0_0 => }/common/main/shi_Tfng_MA.xml  |     6 +-
 .../resources/{27_0_0 => }/common/main/si.xml |  1930 +--
 .../{27_0_0 => }/common/main/si_LK.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/sk.xml |  4360 ++++---
 .../{27_0_0 => }/common/main/sk_SK.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/sl.xml |  3983 +++---
 .../{27_0_0 => }/common/main/sl_SI.xml        |     6 +-
 .../{27_0_0 => }/common/main/smn.xml          |    92 +-
 .../{27_0_0 => }/common/main/smn_FI.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/sn.xml |    35 +-
 .../{27_0_0 => }/common/main/sn_ZW.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/so.xml |    45 +-
 .../{27_0_0 => }/common/main/so_DJ.xml        |     6 +-
 .../{27_0_0 => }/common/main/so_ET.xml        |     6 +-
 .../util/cldr/resources/common/main/so_KE.xml |    49 +
 .../{27_0_0 => }/common/main/so_SO.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/sq.xml |  2229 ++--
 .../{27_0_0 => }/common/main/sq_AL.xml        |     6 +-
 .../util/cldr/resources/common/main/sq_MK.xml |    49 +
 .../util/cldr/resources/common/main/sq_XK.xml |    42 +
 .../resources/{27_0_0 => }/common/main/sr.xml |  2916 +++--
 .../{27_0_0 => }/common/main/sr_Cyrl.xml      |     6 +-
 .../{27_0_0 => }/common/main/sr_Cyrl_BA.xml   |     5 +-
 .../main/sr_Cyrl_ME.xml}                      |     6 +-
 .../{27_0_0 => }/common/main/sr_Cyrl_RS.xml   |     6 +-
 .../main/sr_Cyrl_XK.xml}                      |     6 +-
 .../{27_0_0 => }/common/main/sr_Latn.xml      |  2920 +++--
 .../{27_0_0 => }/common/main/sr_Latn_BA.xml   |     5 +-
 .../main/sr_Latn_ME.xml}                      |     7 +-
 .../{27_0_0 => }/common/main/sr_Latn_RS.xml   |     6 +-
 .../main/sr_Latn_XK.xml}                      |     7 +-
 .../resources/{27_0_0 => }/common/main/sv.xml |  2931 +++--
 .../{27_0_0 => }/common/main/sv_AX.xml        |     5 +-
 .../{27_0_0 => }/common/main/sv_FI.xml        |    15 +-
 .../{27_0_0 => }/common/main/sv_SE.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/sw.xml |  2257 ++--
 .../{27_0_0 => }/common/main/sw_CD.xml        |    29 +-
 .../{27_0_0 => }/common/main/sw_KE.xml        |     6 +-
 .../{27_0_0 => }/common/main/sw_TZ.xml        |     6 +-
 .../{27_0_0 => }/common/main/sw_UG.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/ta.xml |  2614 ++--
 .../{27_0_0 => }/common/main/ta_IN.xml        |     6 +-
 .../util/cldr/resources/common/main/ta_LK.xml |    49 +
 .../{27_0_0 => }/common/main/ta_MY.xml        |     6 +-
 .../{27_0_0 => }/common/main/ta_SG.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/te.xml |  1838 +--
 .../{27_0_0 => }/common/main/te_IN.xml        |     6 +-
 .../{27_0_0 => }/common/main/teo.xml          |    46 +-
 .../{27_0_0 => }/common/main/teo_KE.xml       |     6 +-
 .../{27_0_0 => }/common/main/teo_UG.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/th.xml |  2005 +--
 .../{27_0_0 => }/common/main/th_TH.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/ti.xml |    39 +-
 .../{27_0_0 => }/common/main/ti_ER.xml        |     5 +-
 .../{27_0_0 => }/common/main/ti_ET.xml        |     6 +-
 .../util/cldr/resources/common/main/tk.xml    |  5626 ++++++++
 .../ha_Latn.xml => common/main/tk_TM.xml}     |     7 +-
 .../resources/{27_0_0 => }/common/main/to.xml |  2021 +--
 .../{27_0_0 => }/common/main/to_TO.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/tr.xml |  2336 ++--
 .../util/cldr/resources/common/main/tr_CY.xml |    42 +
 .../{27_0_0 => }/common/main/tr_TR.xml        |     6 +-
 .../{27_0_0 => }/common/main/twq.xml          |    27 +-
 .../{27_0_0 => }/common/main/twq_NE.xml       |     6 +-
 .../{27_0_0 => }/common/main/tzm.xml          |    63 +-
 .../main/tzm_MA.xml}                          |     7 +-
 .../resources/{27_0_0 => }/common/main/ug.xml |   623 +-
 .../ug_Arab_CN.xml => common/main/ug_CN.xml}  |     7 +-
 .../resources/{27_0_0 => }/common/main/uk.xml |  3240 +++--
 .../{27_0_0 => }/common/main/uk_UA.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/ur.xml |  1913 +--
 .../{27_0_0 => }/common/main/ur_IN.xml        |    41 +-
 .../{27_0_0 => }/common/main/ur_PK.xml        |     6 +-
 .../resources/{27_0_0 => }/common/main/uz.xml |  4517 ++++---
 .../{27_0_0 => }/common/main/uz_Arab.xml      |    36 +-
 .../{27_0_0 => }/common/main/uz_Arab_AF.xml   |     6 +-
 .../{27_0_0 => }/common/main/uz_Cyrl.xml      |   541 +-
 .../{27_0_0 => }/common/main/uz_Cyrl_UZ.xml   |     6 +-
 .../{27_0_0 => }/common/main/uz_Latn.xml      |     6 +-
 .../{27_0_0 => }/common/main/uz_Latn_UZ.xml   |     6 +-
 .../{27_0_0 => }/common/main/vai.xml          |    22 +-
 .../{27_0_0 => }/common/main/vai_Latn.xml     |    23 +-
 .../{27_0_0 => }/common/main/vai_Latn_LR.xml  |     6 +-
 .../{27_0_0 => }/common/main/vai_Vaii.xml     |     6 +-
 .../{27_0_0 => }/common/main/vai_Vaii_LR.xml  |     6 +-
 .../resources/{27_0_0 => }/common/main/vi.xml |  2066 +--
 .../{27_0_0 => }/common/main/vi_VN.xml        |     6 +-
 .../util/cldr/resources/common/main/vo.xml    |   388 +
 .../ar_001.xml => common/main/vo_001.xml}     |     5 +-
 .../{27_0_0 => }/common/main/vun.xml          |    47 +-
 .../{27_0_0 => }/common/main/vun_TZ.xml       |     6 +-
 .../{27_0_0 => }/common/main/wae.xml          |    91 +-
 .../{27_0_0 => }/common/main/wae_CH.xml       |     6 +-
 .../{27_0_0 => }/common/main/xog.xml          |    46 +-
 .../{27_0_0 => }/common/main/xog_UG.xml       |     6 +-
 .../{27_0_0 => }/common/main/yav.xml          |    27 +-
 .../{27_0_0 => }/common/main/yav_CM.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/yi.xml |   171 +-
 .../{27_0_0 => }/common/main/yi_001.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/yo.xml |    29 +-
 .../{27_0_0 => }/common/main/yo_BJ.xml        |   276 +-
 .../{27_0_0 => }/common/main/yo_NG.xml        |     6 +-
 .../util/cldr/resources/common/main/yue.xml   |  9556 ++++++++++++++
 .../cldr/resources/common/main/yue_HK.xml     |    14 +
 .../{27_0_0 => }/common/main/zgh.xml          |    56 +-
 .../{27_0_0 => }/common/main/zgh_MA.xml       |     6 +-
 .../resources/{27_0_0 => }/common/main/zh.xml |  1576 ++-
 .../{27_0_0 => }/common/main/zh_Hans.xml      |     6 +-
 .../{27_0_0 => }/common/main/zh_Hans_CN.xml   |     6 +-
 .../{27_0_0 => }/common/main/zh_Hans_HK.xml   |    56 +-
 .../{27_0_0 => }/common/main/zh_Hans_MO.xml   |    62 +-
 .../{27_0_0 => }/common/main/zh_Hans_SG.xml   |    61 +-
 .../{27_0_0 => }/common/main/zh_Hant.xml      |  2048 +--
 .../cldr/resources/common/main/zh_Hant_HK.xml |  2391 ++++
 .../{27_0_0 => }/common/main/zh_Hant_MO.xml   |     5 +-
 .../{27_0_0 => }/common/main/zh_Hant_TW.xml   |     6 +-
 .../resources/{27_0_0 => }/common/main/zu.xml |  3941 ++++--
 .../{27_0_0 => }/common/main/zu_ZA.xml        |     6 +-
 .../supplemental/attributeValueValidity.xml   |   433 +
 .../common/supplemental/characters.xml        |     6 +-
 .../common/supplemental/coverageLevels.xml    |   196 +-
 .../common/supplemental/dayPeriods.xml        |  1144 ++
 .../common/supplemental/genderList.xml        |     3 +-
 .../common/supplemental/languageInfo.xml      |   311 +-
 .../common/supplemental/likelySubtags.xml     |   119 +-
 .../common/supplemental/metaZones.xml         |    17 +-
 .../common/supplemental/numberingSystems.xml  |    30 +-
 .../common/supplemental/ordinals.xml          |    11 +-
 .../common/supplemental/pluralRanges.xml      |     3 +-
 .../common/supplemental/plurals.xml           |     8 +-
 .../resources/common/supplemental/rgScope.xml |    28 +
 .../common/supplemental/subdivisions.xml      |   428 +
 .../common/supplemental/supplementalData.xml  |  1340 +-
 .../supplemental/supplementalMetadata.xml     |  1244 ++
 .../common/supplemental/telephoneCodeData.xml |     3 +-
 .../common/supplemental/windowsZones.xml      |    39 +-
 .../{27_0_0 => }/unicode-license.txt          |     2 +-
 .../format/TestDateTimeFormatterBuilder.java  |    10 +-
 .../java/time/format/TestNonIsoFormatter.java |     4 +-
 .../java/time/temporal/TestChronoField.java   |     6 +-
 .../util/Calendar/CldrFormatNamesTest.java    |     4 +-
 jdk/test/java/util/Locale/ThaiGov.java        |     1 +
 .../sun/text/resources/Format/Bug4762201.java |     3 +-
 jdk/test/sun/text/resources/LocaleData.cldr   |   272 +-
 .../sun/text/resources/LocaleDataTest.java    |     3 +-
 .../sun/util/resources/cldr/Bug8145136.java   |   151 +
 .../plugins/IncludeLocalesPluginTest.java     |     2 +-
 882 files changed, 214994 insertions(+), 118028 deletions(-)
 create mode 100644 jdk/make/src/classes/build/tools/cldrconverter/LikelySubtagsParseHandler.java
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_DO.java
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_US.java
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_VE.java
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_in.java
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_iw_IL.java
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/dtd/ldml.dtd
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/dtd/ldmlSupplemental.dtd
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_IL.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_KM.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ast.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/be.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/cy.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/da_GL.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ee_TG.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_150.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_AU.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_CC.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_CK.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_CX.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_DG.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_FK.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GB.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GG.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GI.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_IM.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_IO.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_JE.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MS.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_NF.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_NR.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_NU.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_PN.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SC.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SH.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SX.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_TK.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_TV.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_419.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_AR.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_CO.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_DO.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_GT.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_PA.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ff_MR.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fo.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_DJ.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_DZ.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_GF.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_HT.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_MA.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_MR.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_SY.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_TD.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_TN.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_VU.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ha_Latn_NE.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kk_Cyrl.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ks_Arab.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ky_Cyrl.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mn_Cyrl.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ms_Latn.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/om_KE.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ro_MD.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/so_KE.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sq_MK.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sq_XK.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ta_LK.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/tzm_Latn.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ug_Arab.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hant_HK.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/dayPeriods.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/postalCodeData.xml
 delete mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/supplementalMetadata.xml
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/dtd/ldml.dtd
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/dtd/ldmlSupplemental.dtd
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/af.xml (89%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/af_NA.xml (52%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/af_ZA.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/agq.xml (95%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/agq_CM.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ak.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ak_GH.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/am.xml (84%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/am_ET.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ar.xml (56%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_001.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ar_AE.xml (83%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ar_BH.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ar_DJ.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ar_DZ.xml (96%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ar_EG.xml (62%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ar_EH.xml (72%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ar_ER.xml (74%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_IL.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ar_IQ.xml (96%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ar_JO.xml (96%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_KM.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ar_KW.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ar_LB.xml (96%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ar_LY.xml (76%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ar_MA.xml (85%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ar_MR.xml (80%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ar_OM.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ar_PS.xml (96%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ar_QA.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ar_SA.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ar_SD.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ar_SO.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ar_SS.xml (76%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ar_SY.xml (96%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ar_TD.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ar_TN.xml (96%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ar_YE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/as.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/as_IN.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/asa.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/asa_TZ.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ast.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ast_ES.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/az.xml (90%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/az_Cyrl.xml (73%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/az_Cyrl_AZ.xml (69%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/az_Latn.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/az_Latn_AZ.xml (69%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/bas.xml (95%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/bas_CM.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/be.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/be_BY.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/bem.xml (82%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/bem_ZM.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/bez.xml (92%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/bez_TZ.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/bg.xml (92%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/bg_BG.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/bm.xml (95%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/bm_Latn_ML.xml => common/main/bm_ML.xml} (65%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/bn.xml (90%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/bn_BD.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/bn_IN.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/bo.xml (80%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/bo_CN.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/bo_IN.xml (79%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/br.xml (64%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/br_FR.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/brx.xml (97%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/brx_IN.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/bs.xml (93%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/bs_Cyrl.xml (93%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/bs_Cyrl_BA.xml (69%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/bs_Latn.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/bs_Latn_BA.xml (69%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ca.xml (89%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ca_AD.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ca_ES.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ca_ES_VALENCIA.xml (97%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ca_FR.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ca_IT.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ce.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/ru_RU.xml => common/main/ce_RU.xml} (71%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/cgg.xml (92%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/cgg_UG.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/chr.xml (89%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/chr_US.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ckb.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/bm_Latn.xml => common/main/ckb_IQ.xml} (67%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ckb_IR.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/cs.xml (93%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/cs_CZ.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cu.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/sah_RU.xml => common/main/cu_RU.xml} (71%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cy.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/cy_GB.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/da.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/da_DK.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/da_GL.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/dav.xml (94%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/dav_KE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/de.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/de_AT.xml (95%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/de_BE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/de_CH.xml (80%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/de_DE.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_LI.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/de_LU.xml (76%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/dje.xml (95%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/dje_NE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/dsb.xml (97%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/dsb_DE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/dua.xml (88%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/dua_CM.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/dyo.xml (93%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/dyo_SN.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/dz.xml (97%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/dz_BT.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ebu.xml (94%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ebu_KE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ee.xml (89%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ee_GH.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ee_TG.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/el.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/el_CY.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/el_GR.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_001.xml (74%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_150.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_AG.xml (74%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AI.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_AS.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AT.xml
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AU.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_BB.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_BE.xml (86%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/en_AI.xml => common/main/en_BI.xml} (62%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_BM.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_BS.xml (83%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_BW.xml (96%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_BZ.xml (98%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_CA.xml (59%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CC.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/de_LI.xml => common/main/en_CH.xml} (60%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CK.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_CM.xml (54%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CX.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/tr_CY.xml => common/main/en_CY.xml} (63%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DE.xml
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DG.xml
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DK.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_DM.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_ER.xml (86%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FI.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_FJ.xml (74%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FK.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_FM.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GB.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_GD.xml (74%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GG.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_GH.xml (86%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GI.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_GM.xml (86%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_GU.xml (75%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_GY.xml (66%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_HK.xml (97%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_IE.xml (80%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IL.xml
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IM.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_IN.xml (96%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IO.xml
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_JE.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_JM.xml (96%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_KE.xml (57%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_KI.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_KN.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_KY.xml (83%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_LC.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_LR.xml (86%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_LS.xml (86%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_MG.xml (57%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_MH.xml (92%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_MO.xml (83%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_MP.xml (92%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MS.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_MT.xml (88%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_MU.xml (57%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_MW.xml (86%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_MY.xml (79%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_NA.xml (86%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NF.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_NG.xml (86%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/es_PY.xml => common/main/en_NL.xml} (58%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NR.xml
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NU.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_NZ.xml (96%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_PG.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_PH.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_PK.xml (97%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PN.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_PR.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_PW.xml (81%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_RW.xml (57%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_SB.xml (74%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SC.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_SD.xml (84%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SE.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_SG.xml (96%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SH.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/es_VE.xml => common/main/en_SI.xml} (53%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_SL.xml (86%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_SS.xml (87%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SX.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_SZ.xml (86%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_TC.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TK.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_TO.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_TT.xml (74%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TV.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_TZ.xml (57%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_UG.xml (57%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_UM.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_US.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_US_POSIX.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_VC.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_VG.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_VI.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_VU.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_WS.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_ZA.xml (98%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_ZM.xml (86%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/en_ZW.xml (98%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/eo.xml (97%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eo_001.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/es.xml (90%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_419.xml
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_AR.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/es_BO.xml (69%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/es_PH.xml => common/main/es_BR.xml} (62%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/es_CL.xml (53%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CO.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/es_CR.xml (70%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/es_CU.xml (76%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_DO.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/es_EA.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/es_EC.xml (97%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/es_ES.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/es_GQ.xml (81%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_GT.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/es_HN.xml (97%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/es_IC.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/es_MX.xml (93%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/es_NI.xml (69%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PA.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/es_PE.xml (97%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PH.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/es_PR.xml (93%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PY.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/es_SV.xml (69%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/es_US.xml (79%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/es_UY.xml (93%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_VE.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/et.xml (77%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/et_EE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/eu.xml (96%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/eu_ES.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ewo.xml (95%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ewo_CM.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fa.xml (79%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fa_AF.xml (94%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fa_IR.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ff.xml (92%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ff_CM.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ff_GN.xml (74%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_MR.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ff_SN.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fi.xml (88%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fi_FI.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fil.xml (79%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fil_PH.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fo.xml
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fo_DK.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fo_FO.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr.xml (80%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_BE.xml (96%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_BF.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_BI.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_BJ.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_BL.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_CA.xml (56%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_CD.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_CF.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_CG.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_CH.xml (96%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_CI.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_CM.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_DJ.xml
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_DZ.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_FR.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_GA.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/ne_IN.xml => common/main/fr_GF.xml} (66%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_GN.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_GP.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_GQ.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_HT.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_KM.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_LU.xml (78%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MA.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_MC.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_MF.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_MG.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_ML.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_MQ.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MR.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_MU.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_NC.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_NE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_PF.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_PM.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_RE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_RW.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_SC.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_SN.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_SY.xml
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_TD.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_TG.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_TN.xml
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_VU.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_WF.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fr_YT.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fur.xml (96%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fur_IT.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fy.xml (95%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/fy_NL.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ga.xml (93%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ga_IE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/gd.xml (83%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/gd_GB.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/gl.xml (90%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/gl_ES.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/gsw.xml (97%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/gsw_CH.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/gsw_FR.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/gsw_LI.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/gu.xml (90%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/gu_IN.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/guz.xml (94%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/guz_KE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/gv.xml (53%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/gv_IM.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ha.xml (93%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/ha_Latn_GH.xml => common/main/ha_GH.xml} (71%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha_NE.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/ha_Latn_NG.xml => common/main/ha_NG.xml} (65%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/haw.xml (85%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/haw_US.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/he.xml (80%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/he_IL.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/hi.xml (92%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/hi_IN.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/hr.xml (93%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/hr_BA.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/hr_HR.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/hsb.xml (97%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/hsb_DE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/hu.xml (92%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/hu_HU.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/hy.xml (87%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/hy_AM.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/id.xml (87%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/id_ID.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ig.xml (89%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ig_NG.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ii.xml (78%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ii_CN.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/is.xml (88%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/is_IS.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/it.xml (88%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/it_CH.xml (89%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/it_IT.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/it_SM.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ja.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ja_JP.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/jgo.xml (89%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/jgo_CM.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/jmc.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/jmc_TZ.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ka.xml (93%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ka_GE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/kab.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/kab_DZ.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/kam.xml (94%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/kam_KE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/kde.xml (94%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/kde_TZ.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/kea.xml (95%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/kea_CV.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/khq.xml (95%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/khq_ML.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ki.xml (94%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ki_KE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/kk.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/kk_Cyrl_KZ.xml => common/main/kk_KZ.xml} (65%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/kkj.xml (82%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/kkj_CM.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/kl.xml (88%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/kl_GL.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/kln.xml (95%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/kln_KE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/km.xml (83%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/km_KH.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/kn.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/kn_IN.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ko.xml (88%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ko_KP.xml (78%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ko_KR.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/kok.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/kok_IN.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ks.xml (98%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/ks_Arab_IN.xml => common/main/ks_IN.xml} (65%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ksb.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ksb_TZ.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ksf.xml (95%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ksf_CM.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ksh.xml (95%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ksh_DE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/kw.xml (73%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/kw_GB.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ky.xml (86%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/ky_Cyrl_KG.xml => common/main/ky_KG.xml} (65%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/lag.xml (88%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/lag_TZ.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/lb.xml (97%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/lb_LU.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/lg.xml (92%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/lg_UG.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/lkt.xml (94%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/lkt_US.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ln.xml (94%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ln_AO.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ln_CD.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ln_CF.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ln_CG.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/lo.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/lo_LA.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc.xml
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc_IQ.xml
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc_IR.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/lt.xml (93%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/lt_LT.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/lu.xml (95%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/lu_CD.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/luo.xml (94%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/luo_KE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/luy.xml (94%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/luy_KE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/lv.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/lv_LV.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/mas.xml (92%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/mas_KE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/mas_TZ.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/mer.xml (94%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/mer_KE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/mfe.xml (95%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/mfe_MU.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/mg.xml (92%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/mg_MG.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/mgh.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/mgh_MZ.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/mgo.xml (88%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/mgo_CM.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/mk.xml (90%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/mk_MK.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ml.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ml_IN.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/mn.xml (97%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/mn_Cyrl_MN.xml => common/main/mn_MN.xml} (65%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/mr.xml (89%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/mr_IN.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ms.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/ms_Latn_BN.xml => common/main/ms_BN.xml} (87%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/ms_Latn_MY.xml => common/main/ms_MY.xml} (65%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/ms_Latn_SG.xml => common/main/ms_SG.xml} (71%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/mt.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/mt_MT.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/mua.xml (95%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/mua_CM.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/my.xml (89%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/my_MM.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mzn.xml
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mzn_IR.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/naq.xml (89%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/naq_NA.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/nb.xml (72%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/nb_NO.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/nb_SJ.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/nd.xml (92%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/nd_ZW.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ne.xml (84%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ne_IN.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ne_NP.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/nl.xml (76%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/nl_AW.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/nl_BE.xml (96%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/nl_BQ.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/nl_CW.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/nl_NL.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/nl_SR.xml (65%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/nl_SX.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/nmg.xml (95%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/nmg_CM.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/nn.xml (94%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/nn_NO.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/nnh.xml (81%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/nnh_CM.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/nus.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/nus_SD.xml => common/main/nus_SS.xml} (63%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/nyn.xml (92%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/nyn_UG.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/om.xml (84%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/om_ET.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/om_KE.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/or.xml (96%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/or_IN.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/os.xml (94%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/os_GE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/os_RU.xml (70%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/pa.xml (92%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/pa_Arab.xml (73%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/pa_Arab_PK.xml (69%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/pa_Guru.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/pa_Guru_IN.xml (69%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/pl.xml (92%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/pl_PL.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/prg.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/eo_001.xml => common/main/prg_001.xml} (72%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ps.xml (85%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ps_AF.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/pt.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/pt_AO.xml (88%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/pt_BR.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_CH.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/pt_CV.xml (89%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_GQ.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/pt_GW.xml (87%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_LU.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/pt_MO.xml (62%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/pt_MZ.xml (88%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/pt_PT.xml (83%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/pt_ST.xml (88%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/pt_TL.xml (87%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/qu.xml (89%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/qu_BO.xml (60%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/qu_EC.xml (56%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/qu_PE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/rm.xml (97%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/rm_CH.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/rn.xml (95%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/rn_BI.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ro.xml (92%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ro_MD.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ro_RO.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/rof.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/rof_TZ.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/root.xml (83%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ru.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ru_BY.xml (76%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ru_KG.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ru_KZ.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ru_MD.xml (74%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_RU.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ru_UA.xml (96%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/rw.xml (89%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/rw_RW.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/rwk.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/rwk_TZ.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sah.xml (93%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sah_RU.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/saq.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/saq_KE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sbp.xml (94%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sbp_TZ.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/se.xml (95%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/se_FI.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/se_NO.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/se_SE.xml (76%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/seh.xml (92%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/seh_MZ.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ses.xml (95%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ses_ML.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sg.xml (94%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sg_CF.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/shi.xml (90%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/shi_Latn.xml (82%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/shi_Latn_MA.xml (69%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/shi_Tfng.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/shi_Tfng_MA.xml (69%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/si.xml (90%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/si_LK.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sk.xml (80%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sk_SK.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sl.xml (80%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sl_SI.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/smn.xml (77%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/smn_FI.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sn.xml (92%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sn_ZW.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/so.xml (94%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/so_DJ.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/so_ET.xml (74%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_KE.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/so_SO.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sq.xml (86%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sq_AL.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq_MK.xml
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq_XK.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sr.xml (88%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sr_Cyrl.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sr_Cyrl_BA.xml (96%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/sr_Latn_ME.xml => common/main/sr_Cyrl_ME.xml} (73%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sr_Cyrl_RS.xml (69%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/sr_Latn_XK.xml => common/main/sr_Cyrl_XK.xml} (73%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sr_Latn.xml (87%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sr_Latn_BA.xml (96%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/sr_Cyrl_ME.xml => common/main/sr_Latn_ME.xml} (65%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sr_Latn_RS.xml (69%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/sr_Cyrl_XK.xml => common/main/sr_Latn_XK.xml} (65%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sv.xml (87%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sv_AX.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sv_FI.xml (78%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sv_SE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sw.xml (84%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sw_CD.xml (90%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sw_KE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sw_TZ.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/sw_UG.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ta.xml (84%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ta_IN.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_LK.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ta_MY.xml (90%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ta_SG.xml (90%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/te.xml (92%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/te_IN.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/teo.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/teo_KE.xml (74%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/teo_UG.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/th.xml (90%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/th_TH.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ti.xml (93%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ti_ER.xml (98%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ti_ET.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tk.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/ha_Latn.xml => common/main/tk_TM.xml} (67%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/to.xml (89%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/to_TO.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/tr.xml (91%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tr_CY.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/tr_TR.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/twq.xml (95%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/twq_NE.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/tzm.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/tzm_Latn_MA.xml => common/main/tzm_MA.xml} (65%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ug.xml (97%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/ug_Arab_CN.xml => common/main/ug_CN.xml} (65%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/uk.xml (87%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/uk_UA.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ur.xml (90%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ur_IN.xml (96%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/ur_PK.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/uz.xml (61%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/uz_Arab.xml (78%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/uz_Arab_AF.xml (72%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/uz_Cyrl.xml (96%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/uz_Cyrl_UZ.xml (69%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/uz_Latn.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/uz_Latn_UZ.xml (69%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/vai.xml (95%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/vai_Latn.xml (95%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/vai_Latn_LR.xml (69%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/vai_Vaii.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/vai_Vaii_LR.xml (69%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/vi.xml (87%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/vi_VN.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vo.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0/common/main/ar_001.xml => common/main/vo_001.xml} (72%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/vun.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/vun_TZ.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/wae.xml (96%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/wae_CH.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/xog.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/xog_UG.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/yav.xml (94%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/yav_CM.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/yi.xml (90%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/yi_001.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/yo.xml (95%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/yo_BJ.xml (69%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/yo_NG.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yue.xml
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yue_HK.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/zgh.xml (95%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/zgh_MA.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/zh.xml (93%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/zh_Hans.xml (68%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/zh_Hans_CN.xml (69%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/zh_Hans_HK.xml (92%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/zh_Hans_MO.xml (89%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/zh_Hans_SG.xml (91%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/zh_Hant.xml (92%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant_HK.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/zh_Hant_MO.xml (75%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/zh_Hant_TW.xml (69%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/zu.xml (62%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/main/zu_ZA.xml (68%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/attributeValueValidity.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/supplemental/characters.xml (99%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/supplemental/coverageLevels.xml (84%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/dayPeriods.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/supplemental/genderList.xml (88%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/supplemental/languageInfo.xml (57%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/supplemental/likelySubtags.xml (95%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/supplemental/metaZones.xml (99%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/supplemental/numberingSystems.xml (62%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/supplemental/ordinals.xml (94%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/supplemental/pluralRanges.xml (98%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/supplemental/plurals.xml (98%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/rgScope.xml
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/subdivisions.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/supplemental/supplementalData.xml (83%)
 create mode 100644 jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/supplementalMetadata.xml
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/supplemental/telephoneCodeData.xml (99%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/common/supplemental/windowsZones.xml (97%)
 rename jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/{27_0_0 => }/unicode-license.txt (97%)
 create mode 100644 jdk/test/sun/util/resources/cldr/Bug8145136.java

diff --git a/jdk/make/gensrc/GensrcCLDR.gmk b/jdk/make/gensrc/GensrcCLDR.gmk
index 230dc3eb709..63487b00c0d 100644
--- a/jdk/make/gensrc/GensrcCLDR.gmk
+++ b/jdk/make/gensrc/GensrcCLDR.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, 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,8 +23,8 @@
 # questions.
 #
 
-CLDRVERSION := 27.0.0
-CLDRSRCDIR := $(JDK_TOPDIR)/src/jdk.localedata/share/classes/sun/util/cldr/resources/$(subst .,_,$(CLDRVERSION))
+CLDRVERSION := 29.0.0
+CLDRSRCDIR := $(JDK_TOPDIR)/src/jdk.localedata/share/classes/sun/util/cldr/resources/common
 
 GENSRC_BASEDIR := $(SUPPORT_OUTPUTDIR)/gensrc/java.base
 GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata
diff --git a/jdk/make/src/classes/build/tools/cldrconverter/Bundle.java b/jdk/make/src/classes/build/tools/cldrconverter/Bundle.java
index 7ee33deedae..4188159653b 100644
--- a/jdk/make/src/classes/build/tools/cldrconverter/Bundle.java
+++ b/jdk/make/src/classes/build/tools/cldrconverter/Bundle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
@@ -284,6 +284,7 @@ class Bundle {
             handleMultipleInheritance(myMap, parentsMap, calendarPrefix + "DayNarrows");
             handleMultipleInheritance(myMap, parentsMap, calendarPrefix + "AmPmMarkers");
             handleMultipleInheritance(myMap, parentsMap, calendarPrefix + "narrow.AmPmMarkers");
+            handleMultipleInheritance(myMap, parentsMap, calendarPrefix + "abbreviated.AmPmMarkers");
             handleMultipleInheritance(myMap, parentsMap, calendarPrefix + "QuarterNames");
             handleMultipleInheritance(myMap, parentsMap, calendarPrefix + "QuarterAbbreviations");
             handleMultipleInheritance(myMap, parentsMap, calendarPrefix + "QuarterNarrows");
diff --git a/jdk/make/src/classes/build/tools/cldrconverter/CLDRConverter.java b/jdk/make/src/classes/build/tools/cldrconverter/CLDRConverter.java
index b72ac9225b1..f1c1b7dfa64 100644
--- a/jdk/make/src/classes/build/tools/cldrconverter/CLDRConverter.java
+++ b/jdk/make/src/classes/build/tools/cldrconverter/CLDRConverter.java
@@ -59,6 +59,7 @@ public class CLDRConverter {
     private static String SPPL_SOURCE_FILE;
     private static String NUMBERING_SOURCE_FILE;
     private static String METAZONES_SOURCE_FILE;
+    private static String LIKELYSUBTAGS_SOURCE_FILE;
     static String DESTINATION_DIR = "build/gensrc";
 
     static final String LOCALE_NAME_PREFIX = "locale.displayname.";
@@ -71,6 +72,7 @@ public class CLDRConverter {
     static final String PARENT_LOCALE_PREFIX = "parentLocale.";
 
     private static SupplementDataParseHandler handlerSuppl;
+    private static LikelySubtagsParseHandler handlerLikelySubtags;
     static NumberingSystemsParseHandler handlerNumbering;
     static MetaZonesParseHandler handlerMetaZones;
     private static BundleGenerator bundleGenerator;
@@ -196,12 +198,13 @@ public class CLDRConverter {
         }
 
         // Set up path names
-        LOCAL_LDML_DTD = CLDR_BASE + "common/dtd/ldml.dtd";
-        LOCAL_SPPL_LDML_DTD = CLDR_BASE + "common/dtd/ldmlSupplemental.dtd";
-        SOURCE_FILE_DIR = CLDR_BASE + "common/main";
-        SPPL_SOURCE_FILE = CLDR_BASE + "common/supplemental/supplementalData.xml";
-        NUMBERING_SOURCE_FILE = CLDR_BASE + "common/supplemental/numberingSystems.xml";
-        METAZONES_SOURCE_FILE = CLDR_BASE + "common/supplemental/metaZones.xml";
+        LOCAL_LDML_DTD = CLDR_BASE + "/dtd/ldml.dtd";
+        LOCAL_SPPL_LDML_DTD = CLDR_BASE + "/dtd/ldmlSupplemental.dtd";
+        SOURCE_FILE_DIR = CLDR_BASE + "/main";
+        SPPL_SOURCE_FILE = CLDR_BASE + "/supplemental/supplementalData.xml";
+        LIKELYSUBTAGS_SOURCE_FILE = CLDR_BASE + "/supplemental/likelySubtags.xml";
+        NUMBERING_SOURCE_FILE = CLDR_BASE + "/supplemental/numberingSystems.xml";
+        METAZONES_SOURCE_FILE = CLDR_BASE + "/supplemental/metaZones.xml";
 
         if (BASE_LOCALES.isEmpty()) {
             setupBaseLocales("en-US");
@@ -220,8 +223,8 @@ public class CLDRConverter {
         errout("Usage: java CLDRConverter [options]%n"
                 + "\t-help          output this usage message and exit%n"
                 + "\t-verbose       output information%n"
-                + "\t-draft [approved | provisional | unconfirmed]%n"
-                + "\t\t       draft level for using data (default: approved)%n"
+                + "\t-draft [contributed | approved | provisional | unconfirmed]%n"
+                + "\t\t       draft level for using data (default: contributed)%n"
                 + "\t-base dir      base directory for CLDR input files%n"
                 + "\t-basemodule    generates bundles that go into java.base module%n"
                 + "\t-baselocales loc(,loc)*      locales that go into the base module%n"
@@ -379,7 +382,6 @@ public class CLDRConverter {
             });
 
         // Parse numberingSystems to get digit zero character information.
-        info("..... Parsing numberingSystem.xml .....");
         SAXParserFactory numberingParser = SAXParserFactory.newInstance();
         numberingParser.setValidating(true);
         SAXParser parserNumbering = numberingParser.newSAXParser();
@@ -396,7 +398,17 @@ public class CLDRConverter {
         enableFileAccess(parserMetaZones);
         handlerMetaZones = new MetaZonesParseHandler();
         File fileMetaZones = new File(METAZONES_SOURCE_FILE);
-        parserNumbering.parse(fileMetaZones, handlerMetaZones);
+        parserMetaZones.parse(fileMetaZones, handlerMetaZones);
+
+        // Parse likelySubtags
+        info("..... Parsing likelySubtags.xml .....");
+        SAXParserFactory likelySubtagsParser = SAXParserFactory.newInstance();
+        likelySubtagsParser.setValidating(true);
+        SAXParser parserLikelySubtags = likelySubtagsParser.newSAXParser();
+        enableFileAccess(parserLikelySubtags);
+        handlerLikelySubtags = new LikelySubtagsParseHandler();
+        File fileLikelySubtags = new File(LIKELYSUBTAGS_SOURCE_FILE);
+        parserLikelySubtags.parse(fileLikelySubtags, handlerLikelySubtags);
     }
 
     private static void convertBundles(List<Bundle> bundles) throws Exception {
@@ -434,6 +446,7 @@ public class CLDRConverter {
                 Map<String, Object> localeNamesMap = extractLocaleNames(targetMap, bundle.getID());
                 if (!localeNamesMap.isEmpty() || bundle.isRoot()) {
                     metaInfo.get("LocaleNames").add(toLanguageTag(bundle.getID()));
+                    addLikelySubtags(metaInfo, "LocaleNames", bundle.getID());
                     bundleGenerator.generateBundle("util", "LocaleNames", bundle.getJavaID(), true, localeNamesMap, BundleType.OPEN);
                 }
             }
@@ -441,6 +454,7 @@ public class CLDRConverter {
                 Map<String, Object> currencyNamesMap = extractCurrencyNames(targetMap, bundle.getID(), bundle.getCurrencies());
                 if (!currencyNamesMap.isEmpty() || bundle.isRoot()) {
                     metaInfo.get("CurrencyNames").add(toLanguageTag(bundle.getID()));
+                    addLikelySubtags(metaInfo, "CurrencyNames", bundle.getID());
                     bundleGenerator.generateBundle("util", "CurrencyNames", bundle.getJavaID(), true, currencyNamesMap, BundleType.OPEN);
                 }
             }
@@ -448,6 +462,7 @@ public class CLDRConverter {
                 Map<String, Object> zoneNamesMap = extractZoneNames(targetMap, bundle.getID());
                 if (!zoneNamesMap.isEmpty() || bundle.isRoot()) {
                     metaInfo.get("TimeZoneNames").add(toLanguageTag(bundle.getID()));
+                    addLikelySubtags(metaInfo, "TimeZoneNames", bundle.getID());
                     bundleGenerator.generateBundle("util", "TimeZoneNames", bundle.getJavaID(), true, zoneNamesMap, BundleType.TIMEZONE);
                 }
             }
@@ -455,6 +470,7 @@ public class CLDRConverter {
                 Map<String, Object> calendarDataMap = extractCalendarData(targetMap, bundle.getID());
                 if (!calendarDataMap.isEmpty() || bundle.isRoot()) {
                     metaInfo.get("CalendarData").add(toLanguageTag(bundle.getID()));
+                    addLikelySubtags(metaInfo, "CalendarData", bundle.getID());
                     bundleGenerator.generateBundle("util", "CalendarData", bundle.getJavaID(), true, calendarDataMap, BundleType.PLAIN);
                 }
             }
@@ -462,12 +478,14 @@ public class CLDRConverter {
                 Map<String, Object> formatDataMap = extractFormatData(targetMap, bundle.getID());
                 if (!formatDataMap.isEmpty() || bundle.isRoot()) {
                     metaInfo.get("FormatData").add(toLanguageTag(bundle.getID()));
+                    addLikelySubtags(metaInfo, "FormatData", bundle.getID());
                     bundleGenerator.generateBundle("text", "FormatData", bundle.getJavaID(), true, formatDataMap, BundleType.PLAIN);
                 }
             }
 
             // For AvailableLocales
             metaInfo.get("AvailableLocales").add(toLanguageTag(bundle.getID()));
+            addLikelySubtags(metaInfo, "AvailableLocales", bundle.getID());
         }
 
         bundleGenerator.generateMetaInfo(metaInfo);
@@ -664,6 +682,7 @@ public class CLDRConverter {
         "standalone.QuarterNarrows",
         "AmPmMarkers",
         "narrow.AmPmMarkers",
+        "abbreviated.AmPmMarkers",
         "long.Eras",
         "Eras",
         "narrow.Eras",
@@ -817,6 +836,14 @@ public class CLDRConverter {
         return loc.toLanguageTag();
     }
 
+    private static void addLikelySubtags(Map<String, SortedSet<String>> metaInfo, String category, String id) {
+        String likelySubtag = handlerLikelySubtags.get(id);
+        if (likelySubtag != null) {
+            // Remove Script for now
+            metaInfo.get(category).add(toLanguageTag(likelySubtag).replaceFirst("-[A-Z][a-z]{3}", ""));
+        }
+    }
+
     private static String toLocaleName(String tag) {
         if (tag.indexOf('-') == -1) {
             return tag;
@@ -830,7 +857,7 @@ public class CLDRConverter {
             .map(l -> Control.getControl(Control.FORMAT_DEFAULT)
                              .getCandidateLocales("", l))
             .forEach(BASE_LOCALES::addAll);
-}
+    }
 
     // applying parent locale rules to the passed candidates list
     // This has to match with the one in sun.util.cldr.CLDRLocaleProviderAdapter
diff --git a/jdk/make/src/classes/build/tools/cldrconverter/LDMLParseHandler.java b/jdk/make/src/classes/build/tools/cldrconverter/LDMLParseHandler.java
index c95c730c860..720f5e3c088 100644
--- a/jdk/make/src/classes/build/tools/cldrconverter/LDMLParseHandler.java
+++ b/jdk/make/src/classes/build/tools/cldrconverter/LDMLParseHandler.java
@@ -290,6 +290,9 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
             case "narrow":
                 pushStringArrayEntry(qName, attributes, "narrow.AmPmMarkers/" + getContainerKey(), 2);
                 break;
+            case "abbreviated":
+                pushStringArrayEntry(qName, attributes, "abbreviated.AmPmMarkers/" + getContainerKey(), 2);
+                break;
             default:
                 pushIgnoredContainer(qName);
                 break;
@@ -460,6 +463,15 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
                 pushIgnoredContainer(qName);
             }
             break;
+        case "currencyFormatLength":
+            if (attributes.getValue("type") == null) {
+                // skipping type="short" data
+                // for FormatData
+                pushContainer(qName, attributes);
+            } else {
+                pushIgnoredContainer(qName);
+            }
+            break;
         case "currencyFormat":
             // for FormatData
             // copy string for later assembly into NumberPatterns
@@ -750,7 +762,7 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
                 keyName = "narrow.AmPmMarkers/" + context;
                 break;
             case "abbreviated":
-                keyName = "";
+                keyName = "abbreviated.AmPmMarkers/" + context;
                 break;
             }
             break;
diff --git a/jdk/make/src/classes/build/tools/cldrconverter/LikelySubtagsParseHandler.java b/jdk/make/src/classes/build/tools/cldrconverter/LikelySubtagsParseHandler.java
new file mode 100644
index 00000000000..8a15b3977cb
--- /dev/null
+++ b/jdk/make/src/classes/build/tools/cldrconverter/LikelySubtagsParseHandler.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2016, 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.cldrconverter;
+
+import java.io.File;
+import java.io.IOException;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+/**
+ * Handles parsing of files in Locale Data Markup Language for likelySubtags.xml
+ * and produces a map that uses the keys and values of JRE locale data.
+ */
+
+class LikelySubtagsParseHandler extends AbstractLDMLHandler<String> {
+
+    LikelySubtagsParseHandler() {
+    }
+
+    @Override
+    public InputSource resolveEntity(String publicID, String systemID) throws IOException, SAXException {
+        // avoid HTTP traffic to unicode.org
+        if (systemID.startsWith(CLDRConverter.SPPL_LDML_DTD_SYSTEM_ID)) {
+            return new InputSource((new File(CLDRConverter.LOCAL_SPPL_LDML_DTD)).toURI().toString());
+        }
+        return null;
+    }
+
+    @Override
+    public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+        switch (qName) {
+        case "likelySubtag":
+            // eg, <likelySubtag from="aa" to="aa_Latn_ET"/>
+            String from = attributes.getValue("from");
+            if (!from.startsWith("und")) {
+                // Ignore the "undefined" language for now
+                put(from, attributes.getValue("to"));
+            }
+            pushIgnoredContainer(qName);
+            break;
+        default:
+            // treat anything else as a container
+            pushContainer(qName, attributes);
+            break;
+        }
+    }
+}
diff --git a/jdk/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary.java b/jdk/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary.java
index 50bf1f2eac8..7d62fa52030 100644
--- a/jdk/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary.java
+++ b/jdk/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -132,12 +132,6 @@ public class JavaTimeSupplementary extends OpenListResourceBundle {
                 "Year" },
             { "field.zone",
                 "Zone" },
-            { "islamic.AmPmMarkers",
-                new String[] {
-                    "AM",
-                    "PM",
-                }
-            },
             { "islamic.DatePatterns",
                 new String[] {
                     "GGGG y MMMM d, EEEE",
@@ -245,18 +239,18 @@ public class JavaTimeSupplementary extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
             { "islamic.long.Eras",
                 new String[] {
                     "",
                     "AH",
                 }
             },
-            { "islamic.narrow.AmPmMarkers",
-                new String[] {
-                    "a",
-                    "p",
-                }
-            },
             { "islamic.narrow.Eras",
                 new String[] {
                     "",
@@ -387,35 +381,35 @@ public class JavaTimeSupplementary extends OpenListResourceBundle {
             },
             { "roc.MonthAbbreviations",
                 new String[] {
-                    "M01",
-                    "M02",
-                    "M03",
-                    "M04",
-                    "M05",
-                    "M06",
-                    "M07",
-                    "M08",
-                    "M09",
-                    "M10",
-                    "M11",
-                    "M12",
+                    "Jan",
+                    "Feb",
+                    "Mar",
+                    "Apr",
+                    "May",
+                    "Jun",
+                    "Jul",
+                    "Aug",
+                    "Sep",
+                    "Oct",
+                    "Nov",
+                    "Dec",
                     "",
                 }
             },
             { "roc.MonthNames",
                 new String[] {
-                    "M01",
-                    "M02",
-                    "M03",
-                    "M04",
-                    "M05",
-                    "M06",
-                    "M07",
-                    "M08",
-                    "M09",
-                    "M10",
-                    "M11",
-                    "M12",
+                    "Jan",
+                    "Feb",
+                    "Mar",
+                    "Apr",
+                    "May",
+                    "Jun",
+                    "Jul",
+                    "Aug",
+                    "Sep",
+                    "Oct",
+                    "Nov",
+                    "Dec",
                     "",
                 }
             },
@@ -445,6 +439,12 @@ public class JavaTimeSupplementary extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
             { "roc.long.Eras",
                 new String[] {
                     "Before R.O.C.",
@@ -453,8 +453,8 @@ public class JavaTimeSupplementary extends OpenListResourceBundle {
             },
             { "roc.narrow.AmPmMarkers",
                 new String[] {
-                    "a",
-                    "p",
+                    "AM",
+                    "PM",
                 }
             },
             { "roc.narrow.Eras",
diff --git a/jdk/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary_en.java b/jdk/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary_en.java
index 62e66074c86..9ba3f94304b 100644
--- a/jdk/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary_en.java
+++ b/jdk/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary_en.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -99,8 +99,30 @@ public class JavaTimeSupplementary_en extends OpenListResourceBundle {
                 "Minguo Calendar" },
             { "field.dayperiod",
                 "AM/PM" },
+            { "field.era",
+                "era" },
+            { "field.hour",
+                "hour" },
+            { "field.minute",
+                "minute" },
+            { "field.month",
+                "month" },
+            { "field.second",
+                "second" },
+            { "field.week",
+                "week" },
+            { "field.weekday",
+                "day of the week" },
+            { "field.year",
+                "year" },
             { "field.zone",
-                "Time Zone" },
+                "time zone" },
+            { "islamic.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
             { "islamic.DatePatterns",
                 new String[] {
                     "EEEE, MMMM d, y GGGG",
@@ -144,6 +166,12 @@ public class JavaTimeSupplementary_en extends OpenListResourceBundle {
                     "h:mm a",
                 }
             },
+            { "islamic.narrow.AmPmMarkers",
+                new String[] {
+                    "a",
+                    "p",
+                }
+            },
             { "java.time.buddhist.DatePatterns",
                 new String[] {
                     "EEEE, MMMM d, y G",
@@ -224,23 +252,6 @@ public class JavaTimeSupplementary_en extends OpenListResourceBundle {
                     "Minguo",
                 }
             },
-            { "roc.MonthAbbreviations",
-                new String[] {
-                    "Jan",
-                    "Feb",
-                    "Mar",
-                    "Apr",
-                    "May",
-                    "Jun",
-                    "Jul",
-                    "Aug",
-                    "Sep",
-                    "Oct",
-                    "Nov",
-                    "Dec",
-                    "",
-                }
-            },
             { "roc.MonthNames",
                 new String[] {
                     "January",
@@ -305,6 +316,12 @@ public class JavaTimeSupplementary_en extends OpenListResourceBundle {
                     "Minguo",
                 }
             },
+            { "roc.narrow.AmPmMarkers",
+                new String[] {
+                    "a",
+                    "p",
+                }
+            },
             { "roc.narrow.Eras",
                 new String[] {
                     "Before R.O.C.",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar.java
index 9055855c5f3..7d2382b0f37 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -273,6 +273,12 @@ public class JavaTimeSupplementary_ar extends OpenListResourceBundle {
                     "h:mm a",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u0635",
+                    "\u0645",
+                }
+            },
             { "islamic.long.Eras",
                 new String[] {
                     "",
@@ -499,6 +505,12 @@ public class JavaTimeSupplementary_ar extends OpenListResourceBundle {
                     "h:mm a",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u0635",
+                    "\u0645",
+                }
+            },
             { "roc.long.Eras",
                 new String[] {
                     "Before R.O.C.",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_be.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_be.java
index e2dcb10ef2f..35890522c82 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_be.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_be.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -90,17 +90,19 @@ public class JavaTimeSupplementary_be extends OpenListResourceBundle {
                 }
             },
             { "calendarname.buddhist",
-                "\u0431\u0443\u0434\u044b\u0441\u0446\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
+                "\u0431\u0443\u0434\u044b\u0439\u0441\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
             { "calendarname.gregorian",
-                "\u0433\u0440\u044d\u0433\u0430\u0440\u044b\u044f\u043d\u0441\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
+                "\u0433\u0440\u044b\u0433\u0430\u0440\u044b\u044f\u043d\u0441\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
             { "calendarname.gregory",
-                "\u0433\u0440\u044d\u0433\u0430\u0440\u044b\u044f\u043d\u0441\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
+                "\u0433\u0440\u044b\u0433\u0430\u0440\u044b\u044f\u043d\u0441\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
             { "calendarname.islamic",
                 "\u043c\u0443\u0441\u0443\u043b\u044c\u043c\u0430\u043d\u0441\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
             { "calendarname.islamic-civil",
                 "\u043c\u0443\u0441\u0443\u043b\u044c\u043c\u0430\u043d\u0441\u043a\u0456 \u0441\u0432\u0435\u0446\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
             { "calendarname.japanese",
                 "\u044f\u043f\u043e\u043d\u0441\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
+            { "calendarname.roc",
+                "\u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440 \u041c\u0456\u043d\u044c\u0433\u043e" },
             { "field.dayperiod",
                 "\u0414\u041f/\u041f\u041f" },
             { "field.era",
@@ -119,10 +121,12 @@ public class JavaTimeSupplementary_be extends OpenListResourceBundle {
                 "\u0434\u0437\u0435\u043d\u044c \u0442\u044b\u0434\u043d\u044f" },
             { "field.year",
                 "\u0433\u043e\u0434" },
+            { "field.zone",
+                "\u0447\u0430\u0441\u0430\u0432\u044b \u043f\u043e\u044f\u0441" },
             { "islamic.AmPmMarkers",
                 new String[] {
-                    "\u0434\u0430 \u043f\u0430\u043b\u0443\u0434\u043d\u044f",
-                    "\u043f\u0430\u0441\u043b\u044f \u043f\u0430\u043b\u0443\u0434\u043d\u044f",
+                    "\u0434\u0430 \u043f\u0430\u045e\u0434\u043d\u044f",
+                    "\u043f\u0430\u0441\u043b\u044f \u043f\u0430\u045e\u0434\u043d\u044f",
                 }
             },
             { "islamic.DatePatterns",
@@ -182,6 +186,14 @@ public class JavaTimeSupplementary_be extends OpenListResourceBundle {
                     "4-\u0442\u044b \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
                 }
             },
+            { "islamic.QuarterNarrows",
+                new String[] {
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                }
+            },
             { "islamic.TimePatterns",
                 new String[] {
                     "HH.mm.ss zzzz",
@@ -190,6 +202,18 @@ public class JavaTimeSupplementary_be extends OpenListResourceBundle {
                     "HH.mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u0440\u0430\u043d\u0456\u0446\u044b",
+                    "\u0432\u0435\u0447\u0430\u0440\u0430",
+                }
+            },
+            { "islamic.narrow.AmPmMarkers",
+                new String[] {
+                    "\u0440\u0430\u043d.",
+                    "\u0432\u0435\u0447.",
+                }
+            },
             { "java.time.buddhist.DatePatterns",
                 new String[] {
                     "EEEE, d MMMM y G",
@@ -216,8 +240,8 @@ public class JavaTimeSupplementary_be extends OpenListResourceBundle {
             },
             { "java.time.long.Eras",
                 new String[] {
-                    "\u0434\u0430 \u043d.\u044d.",
-                    "\u043d.\u044d.",
+                    "\u0434\u0430 \u043d\u0430\u0448\u0430\u0439 \u044d\u0440\u044b",
+                    "\u043d\u0430\u0448\u0430\u0439 \u044d\u0440\u044b",
                 }
             },
             { "java.time.roc.DatePatterns",
@@ -236,8 +260,8 @@ public class JavaTimeSupplementary_be extends OpenListResourceBundle {
             },
             { "roc.AmPmMarkers",
                 new String[] {
-                    "\u0434\u0430 \u043f\u0430\u043b\u0443\u0434\u043d\u044f",
-                    "\u043f\u0430\u0441\u043b\u044f \u043f\u0430\u043b\u0443\u0434\u043d\u044f",
+                    "\u0434\u0430 \u043f\u0430\u045e\u0434\u043d\u044f",
+                    "\u043f\u0430\u0441\u043b\u044f \u043f\u0430\u045e\u0434\u043d\u044f",
                 }
             },
             { "roc.DatePatterns",
@@ -356,6 +380,18 @@ public class JavaTimeSupplementary_be extends OpenListResourceBundle {
                     "HH.mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u0440\u0430\u043d\u0456\u0446\u044b",
+                    "\u0432\u0435\u0447\u0430\u0440\u0430",
+                }
+            },
+            { "roc.narrow.AmPmMarkers",
+                new String[] {
+                    "\u0440\u0430\u043d.",
+                    "\u0432\u0435\u0447.",
+                }
+            },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_bg.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_bg.java
index 3901f112e19..6d6c53bb0ad 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_bg.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_bg.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -219,6 +219,12 @@ public class JavaTimeSupplementary_bg extends OpenListResourceBundle {
                     "H:mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u043f\u0440.\u043e\u0431.",
+                    "\u0441\u043b.\u043e\u0431.",
+                }
+            },
             { "islamic.narrow.AmPmMarkers",
                 new String[] {
                     "\u043f\u0440.\u043e\u0431.",
@@ -318,18 +324,18 @@ public class JavaTimeSupplementary_bg extends OpenListResourceBundle {
             },
             { "roc.MonthAbbreviations",
                 new String[] {
-                    "\u044f\u043d.",
-                    "\u0444\u0435\u0432\u0440.",
+                    "\u044f\u043d\u0443",
+                    "\u0444\u0435\u0432",
                     "\u043c\u0430\u0440\u0442",
-                    "\u0430\u043f\u0440.",
+                    "\u0430\u043f\u0440",
                     "\u043c\u0430\u0439",
                     "\u044e\u043d\u0438",
                     "\u044e\u043b\u0438",
-                    "\u0430\u0432\u0433.",
-                    "\u0441\u0435\u043f\u0442.",
-                    "\u043e\u043a\u0442.",
-                    "\u043d\u043e\u0435\u043c.",
-                    "\u0434\u0435\u043a.",
+                    "\u0430\u0432\u0433",
+                    "\u0441\u0435\u043f",
+                    "\u043e\u043a\u0442",
+                    "\u043d\u043e\u0435",
+                    "\u0434\u0435\u043a",
                     "",
                 }
             },
@@ -391,6 +397,12 @@ public class JavaTimeSupplementary_bg extends OpenListResourceBundle {
                     "H:mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u043f\u0440.\u043e\u0431.",
+                    "\u0441\u043b.\u043e\u0431.",
+                }
+            },
             { "roc.narrow.AmPmMarkers",
                 new String[] {
                     "\u043f\u0440.\u043e\u0431.",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ca.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ca.java
index 61e82a03823..8a4064cb006 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ca.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ca.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -122,7 +122,7 @@ public class JavaTimeSupplementary_ca extends OpenListResourceBundle {
             { "field.year",
                 "any" },
             { "field.zone",
-                "zona" },
+                "fus horari" },
             { "islamic.AmPmMarkers",
                 new String[] {
                     "a. m.",
@@ -133,8 +133,8 @@ public class JavaTimeSupplementary_ca extends OpenListResourceBundle {
                 new String[] {
                     "EEEE d MMMM 'de' y GGGG",
                     "d MMMM 'de' y GGGG",
-                    "dd/MM/y GGGG",
-                    "dd/MM/yy G",
+                    "d/M/y GGGG",
+                    "d/M/yy G",
                 }
             },
             { "islamic.DayAbbreviations",
@@ -202,10 +202,16 @@ public class JavaTimeSupplementary_ca extends OpenListResourceBundle {
                     "H:mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "a. m.",
+                    "p. m.",
+                }
+            },
             { "islamic.narrow.AmPmMarkers",
                 new String[] {
-                    "a.m.",
-                    "p.m.",
+                    "a. m.",
+                    "p. m.",
                 }
             },
             { "java.time.buddhist.DatePatterns",
@@ -232,16 +238,16 @@ public class JavaTimeSupplementary_ca extends OpenListResourceBundle {
                 new String[] {
                     "EEEE d MMMM 'de' y G",
                     "d MMMM 'de' y G",
-                    "dd/MM/y G",
-                    "dd/MM/yy GGGGG",
+                    "d/M/y G",
+                    "d/M/yy GGGGG",
                 }
             },
             { "java.time.japanese.DatePatterns",
                 new String[] {
                     "EEEE d MMMM 'de' y G",
                     "d MMMM 'de' y G",
-                    "dd/MM/y G",
-                    "dd/MM/yy GGGGG",
+                    "d/M/y G",
+                    "d/M/yy GGGGG",
                 }
             },
             { "java.time.long.Eras",
@@ -386,10 +392,16 @@ public class JavaTimeSupplementary_ca extends OpenListResourceBundle {
                     "H:mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "a. m.",
+                    "p. m.",
+                }
+            },
             { "roc.narrow.AmPmMarkers",
                 new String[] {
-                    "a.m.",
-                    "p.m.",
+                    "a. m.",
+                    "p. m.",
                 }
             },
         };
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_cs.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_cs.java
index 0e2fb2a979b..c6b46b60cfe 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_cs.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_cs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -96,29 +96,29 @@ public class JavaTimeSupplementary_cs extends OpenListResourceBundle {
             { "calendarname.roc",
                 "Kalend\u00e1\u0159 \u010c\u00ednsk\u00e9 republiky" },
             { "field.dayperiod",
-                "dop./odp." },
+                "\u010d\u00e1st dne" },
             { "field.era",
-                "Letopo\u010det" },
+                "letopo\u010det" },
             { "field.hour",
-                "Hodina" },
+                "hodina" },
             { "field.minute",
-                "Minuta" },
+                "minuta" },
             { "field.month",
-                "M\u011bs\u00edc" },
+                "m\u011bs\u00edc" },
             { "field.second",
-                "Sekunda" },
+                "sekunda" },
             { "field.week",
-                "T\u00fdden" },
+                "t\u00fdden" },
             { "field.weekday",
-                "Den v t\u00fddnu" },
+                "den v t\u00fddnu" },
             { "field.year",
-                "Rok" },
+                "rok" },
             { "field.zone",
-                "\u010casov\u00e9 p\u00e1smo" },
+                "\u010dasov\u00e9 p\u00e1smo" },
             { "islamic.AmPmMarkers",
                 new String[] {
-                    "dopoledne",
-                    "odpoledne",
+                    "dop.",
+                    "odp.",
                 }
             },
             { "islamic.DatePatterns",
@@ -200,6 +200,12 @@ public class JavaTimeSupplementary_cs extends OpenListResourceBundle {
                     "H:mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "dop.",
+                    "odp.",
+                }
+            },
             { "islamic.long.Eras",
                 new String[] {
                     "",
@@ -282,8 +288,8 @@ public class JavaTimeSupplementary_cs extends OpenListResourceBundle {
             },
             { "roc.AmPmMarkers",
                 new String[] {
-                    "dopoledne",
-                    "odpoledne",
+                    "dop.",
+                    "odp.",
                 }
             },
             { "roc.DatePatterns",
@@ -408,6 +414,12 @@ public class JavaTimeSupplementary_cs extends OpenListResourceBundle {
                     "H:mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "dop.",
+                    "odp.",
+                }
+            },
             { "roc.long.Eras",
                 new String[] {
                     "P\u0159ed R. O. C.",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_da.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_da.java
index 0e901c9d651..9cc683a9972 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_da.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_da.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -112,23 +112,29 @@ public class JavaTimeSupplementary_da extends OpenListResourceBundle {
             { "field.dayperiod",
                 "AM/PM" },
             { "field.era",
-                "\u00c6ra" },
+                "\u00e6ra" },
             { "field.hour",
-                "Time" },
+                "time" },
             { "field.minute",
-                "Minut" },
+                "minut" },
             { "field.month",
-                "M\u00e5ned" },
+                "m\u00e5ned" },
             { "field.second",
-                "Sekund" },
+                "sekund" },
             { "field.week",
-                "Uge" },
+                "uge" },
             { "field.weekday",
-                "Ugedag" },
+                "ugedag" },
             { "field.year",
-                "\u00c5r" },
+                "\u00e5r" },
             { "field.zone",
-                "Tidszone" },
+                "tidszone" },
+            { "islamic.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
             { "islamic.DatePatterns",
                 new String[] {
                     "EEEE d. MMMM y GGGG",
@@ -214,6 +220,12 @@ public class JavaTimeSupplementary_da extends OpenListResourceBundle {
                     "AH",
                 }
             },
+            { "islamic.narrow.AmPmMarkers",
+                new String[] {
+                    "a",
+                    "p",
+                }
+            },
             { "islamic.narrow.Eras",
                 new String[] {
                     "",
@@ -274,6 +286,12 @@ public class JavaTimeSupplementary_da extends OpenListResourceBundle {
             },
             { "java.time.short.Eras",
                 javatimelongEras },
+            { "roc.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
             { "roc.DatePatterns",
                 new String[] {
                     "EEEE d. MMMM y GGGG",
@@ -402,6 +420,12 @@ public class JavaTimeSupplementary_da extends OpenListResourceBundle {
                     "Minguo",
                 }
             },
+            { "roc.narrow.AmPmMarkers",
+                new String[] {
+                    "a",
+                    "p",
+                }
+            },
             { "roc.narrow.Eras",
                 new String[] {
                     "Before R.O.C.",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_de.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_de.java
index b3a443dd3b8..e4854bb6c02 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_de.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_de.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -204,6 +204,12 @@ public class JavaTimeSupplementary_de extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "vorm.",
+                    "nachm.",
+                }
+            },
             { "islamic.long.Eras",
                 new String[] {
                     "",
@@ -404,6 +410,12 @@ public class JavaTimeSupplementary_de extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "vorm.",
+                    "nachm.",
+                }
+            },
             { "roc.long.Eras",
                 new String[] {
                     "Before R.O.C.",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_el.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_el.java
index 6d84753086a..1a699b83c2e 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_el.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_el.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -106,23 +106,23 @@ public class JavaTimeSupplementary_el extends OpenListResourceBundle {
             { "field.dayperiod",
                 "\u03c0.\u03bc./\u03bc.\u03bc." },
             { "field.era",
-                "\u03a0\u03b5\u03c1\u03af\u03bf\u03b4\u03bf\u03c2" },
+                "\u03c0\u03b5\u03c1\u03af\u03bf\u03b4\u03bf\u03c2" },
             { "field.hour",
-                "\u038f\u03c1\u03b1" },
+                "\u03ce\u03c1\u03b1" },
             { "field.minute",
-                "\u039b\u03b5\u03c0\u03c4\u03cc" },
+                "\u03bb\u03b5\u03c0\u03c4\u03cc" },
             { "field.month",
-                "\u039c\u03ae\u03bd\u03b1\u03c2" },
+                "\u03bc\u03ae\u03bd\u03b1\u03c2" },
             { "field.second",
-                "\u0394\u03b5\u03c5\u03c4\u03b5\u03c1\u03cc\u03bb\u03b5\u03c0\u03c4\u03bf" },
+                "\u03b4\u03b5\u03c5\u03c4\u03b5\u03c1\u03cc\u03bb\u03b5\u03c0\u03c4\u03bf" },
             { "field.week",
-                "\u0395\u03b2\u03b4\u03bf\u03bc\u03ac\u03b4\u03b1" },
+                "\u03b5\u03b2\u03b4\u03bf\u03bc\u03ac\u03b4\u03b1" },
             { "field.weekday",
-                "\u0397\u03bc\u03ad\u03c1\u03b1 \u03b5\u03b2\u03b4\u03bf\u03bc\u03ac\u03b4\u03b1\u03c2" },
+                "\u03ba\u03b1\u03b8\u03b7\u03bc\u03b5\u03c1\u03b9\u03bd\u03ae" },
             { "field.year",
-                "\u0388\u03c4\u03bf\u03c2" },
+                "\u03ad\u03c4\u03bf\u03c2" },
             { "field.zone",
-                "\u0396\u03ce\u03bd\u03b7 \u03ce\u03c1\u03b1\u03c2" },
+                "\u03b6\u03ce\u03bd\u03b7 \u03ce\u03c1\u03b1\u03c2" },
             { "islamic.AmPmMarkers",
                 new String[] {
                     "\u03c0.\u03bc.",
@@ -202,10 +202,16 @@ public class JavaTimeSupplementary_el extends OpenListResourceBundle {
                     "h:mm a",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u03c0.\u03bc.",
+                    "\u03bc.\u03bc.",
+                }
+            },
             { "islamic.narrow.AmPmMarkers",
                 new String[] {
-                    "\u03c0",
-                    "\u03bc",
+                    "\u03c0\u03bc",
+                    "\u03bc\u03bc",
                 }
             },
             { "java.time.buddhist.DatePatterns",
@@ -392,6 +398,12 @@ public class JavaTimeSupplementary_el extends OpenListResourceBundle {
                     "h:mm a",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u03c0.\u03bc.",
+                    "\u03bc.\u03bc.",
+                }
+            },
             { "roc.long.Eras",
                 new String[] {
                     "\u03a0\u03c1\u03b9\u03bd R.O.C.",
@@ -400,8 +412,8 @@ public class JavaTimeSupplementary_el extends OpenListResourceBundle {
             },
             { "roc.narrow.AmPmMarkers",
                 new String[] {
-                    "\u03c0",
-                    "\u03bc",
+                    "\u03c0\u03bc",
+                    "\u03bc\u03bc",
                 }
             },
             { "roc.narrow.Eras",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_AU.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_AU.java
index 4ba17c167ff..f848483c897 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_AU.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_AU.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -73,52 +73,120 @@ public class JavaTimeSupplementary_en_AU extends OpenListResourceBundle {
     @Override
     protected final Object[][] getContents() {
         return new Object[][] {
-            { "islamic.DatePatterns",
+            { "field.dayperiod",
+                "am/pm" },
+            { "islamic.AmPmMarkers",
                 new String[] {
-                    "GGGG y MMMM d, EEEE",
-                    "GGGG y MMMM d",
-                    "GGGG y MMM d",
-                    "d/MM/y G",
+                    "am",
+                    "pm",
                 }
             },
-            { "java.time.buddhist.DatePatterns",
+            { "islamic.DayAbbreviations",
                 new String[] {
-                    "G y MMMM d, EEEE",
-                    "G y MMMM d",
-                    "G y MMM d",
-                    "d/MM/y GGGGG",
+                    "Sun.",
+                    "Mon.",
+                    "Tue.",
+                    "Wed.",
+                    "Thu.",
+                    "Fri.",
+                    "Sat.",
                 }
             },
-            { "java.time.islamic.DatePatterns",
+            { "islamic.DayNarrows",
                 new String[] {
-                    "G y MMMM d, EEEE",
-                    "G y MMMM d",
-                    "G y MMM d",
-                    "d/MM/y GGGGG",
+                    "Su.",
+                    "M.",
+                    "Tu.",
+                    "W.",
+                    "Th.",
+                    "F.",
+                    "Sa.",
                 }
             },
-            { "java.time.japanese.DatePatterns",
+            { "islamic.abbreviated.AmPmMarkers",
                 new String[] {
-                    "EEEE, MMMM d, y G",
-                    "MMMM d, y G",
-                    "MMM d, y G",
-                    "d/MM/y GGGGG",
+                    "am",
+                    "pm",
                 }
             },
-            { "java.time.roc.DatePatterns",
+            { "islamic.narrow.AmPmMarkers",
                 new String[] {
-                    "G y MMMM d, EEEE",
-                    "G y MMMM d",
-                    "G y MMM d",
-                    "d/MM/y GGGGG",
+                    "am",
+                    "pm",
                 }
             },
-            { "roc.DatePatterns",
+            { "roc.AmPmMarkers",
                 new String[] {
-                    "GGGG y MMMM d, EEEE",
-                    "GGGG y MMMM d",
-                    "GGGG y MMM d",
-                    "d/MM/y G",
+                    "am",
+                    "pm",
+                }
+            },
+            { "roc.DayAbbreviations",
+                new String[] {
+                    "Sun.",
+                    "Mon.",
+                    "Tue.",
+                    "Wed.",
+                    "Thu.",
+                    "Fri.",
+                    "Sat.",
+                }
+            },
+            { "roc.DayNarrows",
+                new String[] {
+                    "Su.",
+                    "M.",
+                    "Tu.",
+                    "W.",
+                    "Th.",
+                    "F.",
+                    "Sa.",
+                }
+            },
+            { "roc.MonthAbbreviations",
+                new String[] {
+                    "Jan.",
+                    "Feb.",
+                    "Mar.",
+                    "Apr.",
+                    "May",
+                    "Jun.",
+                    "Jul.",
+                    "Aug.",
+                    "Sep.",
+                    "Oct.",
+                    "Nov.",
+                    "Dec.",
+                    "",
+                }
+            },
+            { "roc.MonthNarrows",
+                new String[] {
+                    "Jan.",
+                    "Feb.",
+                    "Mar.",
+                    "Apr.",
+                    "May",
+                    "Jun.",
+                    "Jul.",
+                    "Aug.",
+                    "Sep.",
+                    "Oct.",
+                    "Nov.",
+                    "Dec.",
+                    "",
+                }
+            },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "am",
+                    "pm",
+                }
+            },
+            { "roc.narrow.AmPmMarkers",
+                new String[] {
+                    "am",
+                    "pm",
                 }
             },
         };
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_GB.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_GB.java
index bd4dc5120a9..ae5224f7873 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_GB.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_GB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -74,11 +74,11 @@ public class JavaTimeSupplementary_en_GB extends OpenListResourceBundle {
     protected final Object[][] getContents() {
         return new Object[][] {
             { "field.dayperiod",
-                "a.m./p.m." },
+                "am/pm" },
             { "islamic.AmPmMarkers",
                 new String[] {
-                    "a.m.",
-                    "p.m.",
+                    "am",
+                    "pm",
                 }
             },
             { "islamic.TimePatterns",
@@ -89,10 +89,22 @@ public class JavaTimeSupplementary_en_GB extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "am",
+                    "pm",
+                }
+            },
+            { "islamic.narrow.AmPmMarkers",
+                new String[] {
+                    "a",
+                    "p",
+                }
+            },
             { "roc.AmPmMarkers",
                 new String[] {
-                    "a.m.",
-                    "p.m.",
+                    "am",
+                    "pm",
                 }
             },
             { "roc.TimePatterns",
@@ -103,6 +115,18 @@ public class JavaTimeSupplementary_en_GB extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "am",
+                    "pm",
+                }
+            },
+            { "roc.narrow.AmPmMarkers",
+                new String[] {
+                    "a",
+                    "p",
+                }
+            },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_IE.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_IE.java
index 6afa8736120..f199240fe7c 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_IE.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_IE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -87,6 +87,14 @@ public class JavaTimeSupplementary_en_IE extends OpenListResourceBundle {
                     "G y-MM-dd",
                 }
             },
+            { "islamic.TimePatterns",
+                new String[] {
+                    "HH:mm:ss zzzz",
+                    "HH:mm:ss z",
+                    "HH:mm:ss",
+                    "HH:mm",
+                }
+            },
             { "java.time.buddhist.DatePatterns",
                 new String[] {
                     "EEEE d MMMM y G",
@@ -133,6 +141,14 @@ public class JavaTimeSupplementary_en_IE extends OpenListResourceBundle {
                     "G y-MM-dd",
                 }
             },
+            { "roc.TimePatterns",
+                new String[] {
+                    "HH:mm:ss zzzz",
+                    "HH:mm:ss z",
+                    "HH:mm:ss",
+                    "HH:mm",
+                }
+            },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_MT.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_MT.java
index aca5cea5d00..22c721ec69c 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_MT.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_en_MT.java
@@ -26,7 +26,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -81,6 +81,14 @@ public class JavaTimeSupplementary_en_MT extends OpenListResourceBundle {
                     "G y-MM-dd",
                 }
             },
+            { "islamic.TimePatterns",
+                new String[] {
+                    "HH:mm:ss zzzz",
+                    "HH:mm:ss z",
+                    "HH:mm:ss",
+                    "HH:mm",
+                }
+            },
             { "java.time.buddhist.DatePatterns",
                 new String[] {
                     "G y MMMM d, EEEE",
@@ -121,6 +129,14 @@ public class JavaTimeSupplementary_en_MT extends OpenListResourceBundle {
                     "G y-MM-dd",
                 }
             },
+            { "roc.TimePatterns",
+                new String[] {
+                    "HH:mm:ss zzzz",
+                    "HH:mm:ss z",
+                    "HH:mm:ss",
+                    "HH:mm",
+                }
+            },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es.java
index 461be83a264..7b288a31722 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -105,22 +105,24 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
                 "calendario de la Rep\u00fablica de China" },
             { "field.dayperiod",
                 "a. m./p. m." },
+            { "field.era",
+                "era" },
             { "field.hour",
-                "Hora" },
+                "hora" },
             { "field.minute",
-                "Minuto" },
+                "minuto" },
             { "field.month",
-                "Mes" },
+                "mes" },
             { "field.second",
-                "Segundo" },
+                "segundo" },
             { "field.week",
-                "Semana" },
+                "semana" },
             { "field.weekday",
-                "D\u00eda de la semana" },
+                "d\u00eda de la semana" },
             { "field.year",
-                "A\u00f1o" },
+                "a\u00f1o" },
             { "field.zone",
-                "Zona horaria" },
+                "zona horaria" },
             { "islamic.AmPmMarkers",
                 new String[] {
                     "a. m.",
@@ -131,8 +133,8 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
                 new String[] {
                     "EEEE, d 'de' MMMM 'de' y GGGG",
                     "d 'de' MMMM 'de' y GGGG",
-                    "dd/MM/y GGGG",
-                    "dd/MM/yy G",
+                    "d/M/y GGGG",
+                    "d/M/yy GGGG",
                 }
             },
             { "islamic.DayAbbreviations",
@@ -190,6 +192,14 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
                     "4.\u00ba trimestre",
                 }
             },
+            { "islamic.QuarterNarrows",
+                new String[] {
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                }
+            },
             { "islamic.TimePatterns",
                 new String[] {
                     "H:mm:ss (zzzz)",
@@ -198,6 +208,12 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
                     "H:mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "a. m.",
+                    "p. m.",
+                }
+            },
             { "islamic.long.Eras",
                 new String[] {
                     "",
@@ -206,8 +222,8 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
             },
             { "islamic.narrow.AmPmMarkers",
                 new String[] {
-                    "a.m.",
-                    "p.m.",
+                    "a. m.",
+                    "p. m.",
                 }
             },
             { "islamic.narrow.Eras",
@@ -226,8 +242,8 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
                 new String[] {
                     "EEEE, d 'de' MMMM 'de' y G",
                     "d 'de' MMMM 'de' y G",
-                    "dd/MM/y G",
-                    "dd/MM/yy GGGGG",
+                    "d/M/y G",
+                    "d/M/yy G",
                 }
             },
             { "java.time.buddhist.long.Eras",
@@ -246,8 +262,8 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
                 new String[] {
                     "EEEE, d 'de' MMMM 'de' y G",
                     "d 'de' MMMM 'de' y G",
-                    "dd/MM/y G",
-                    "dd/MM/yy GGGGG",
+                    "d/M/y G",
+                    "d/M/yy G",
                 }
             },
             { "java.time.japanese.DatePatterns",
@@ -268,8 +284,8 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
                 new String[] {
                     "EEEE, d 'de' MMMM 'de' y G",
                     "d 'de' MMMM 'de' y G",
-                    "dd/MM/y G",
-                    "dd/MM/yy GGGGG",
+                    "d/M/y G",
+                    "d/M/yy G",
                 }
             },
             { "java.time.short.Eras",
@@ -288,8 +304,8 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
                 new String[] {
                     "EEEE, d 'de' MMMM 'de' y GGGG",
                     "d 'de' MMMM 'de' y GGGG",
-                    "dd/MM/y GGGG",
-                    "dd/MM/yy G",
+                    "d/M/y GGGG",
+                    "d/M/yy GGGG",
                 }
             },
             { "roc.DayAbbreviations",
@@ -406,6 +422,12 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
                     "H:mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "a. m.",
+                    "p. m.",
+                }
+            },
             { "roc.long.Eras",
                 new String[] {
                     "antes de R.O.C.",
@@ -414,8 +436,8 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
             },
             { "roc.narrow.AmPmMarkers",
                 new String[] {
-                    "a.m.",
-                    "p.m.",
+                    "a. m.",
+                    "p. m.",
                 }
             },
             { "roc.narrow.Eras",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CL.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CL.java
index 6390b1b1eeb..3e4213605db 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CL.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -73,6 +73,14 @@ public class JavaTimeSupplementary_es_CL extends OpenListResourceBundle {
     @Override
     protected final Object[][] getContents() {
         return new Object[][] {
+            { "QuarterNames",
+                new String[] {
+                    "1.\u00b0 trimestre",
+                    "2.\u00b0 trimestre",
+                    "3.\u00b0 trimestre",
+                    "4.\u00ba trimestre",
+                }
+            },
             { "islamic.DatePatterns",
                 new String[] {
                     "GGGG y MMMM d, EEEE",
@@ -81,6 +89,14 @@ public class JavaTimeSupplementary_es_CL extends OpenListResourceBundle {
                     "dd-MM-y G",
                 }
             },
+            { "islamic.QuarterNames",
+                new String[] {
+                    "1.\u00b0 trimestre",
+                    "2.\u00b0 trimestre",
+                    "3.\u00b0 trimestre",
+                    "4.\u00ba trimestre",
+                }
+            },
             { "java.time.buddhist.DatePatterns",
                 new String[] {
                     "G y MMMM d, EEEE",
@@ -121,6 +137,14 @@ public class JavaTimeSupplementary_es_CL extends OpenListResourceBundle {
                     "dd-MM-y G",
                 }
             },
+            { "roc.QuarterNames",
+                new String[] {
+                    "1.\u00b0 trimestre",
+                    "2.\u00b0 trimestre",
+                    "3.\u00b0 trimestre",
+                    "4.\u00ba trimestre",
+                }
+            },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CO.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CO.java
index 788e47e5231..d7d08bf676d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CO.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_CO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -81,10 +81,23 @@ public class JavaTimeSupplementary_es_CO extends OpenListResourceBundle {
                     "d/MM/yy G",
                 }
             },
-            { "islamic.narrow.AmPmMarkers",
+            { "islamic.DayNarrows",
                 new String[] {
-                    "a. m.",
-                    "p. m.",
+                    "d",
+                    "l",
+                    "m",
+                    "m",
+                    "j",
+                    "v",
+                    "s",
+                }
+            },
+            { "islamic.TimePatterns",
+                new String[] {
+                    "h:mm:ss a zzzz",
+                    "h:mm:ss a z",
+                    "h:mm:ss a",
+                    "h:mm a",
                 }
             },
             { "java.time.buddhist.DatePatterns",
@@ -127,10 +140,23 @@ public class JavaTimeSupplementary_es_CO extends OpenListResourceBundle {
                     "d/MM/yy G",
                 }
             },
-            { "roc.narrow.AmPmMarkers",
+            { "roc.DayNarrows",
                 new String[] {
-                    "a. m.",
-                    "p. m.",
+                    "d",
+                    "l",
+                    "m",
+                    "m",
+                    "j",
+                    "v",
+                    "s",
+                }
+            },
+            { "roc.TimePatterns",
+                new String[] {
+                    "h:mm:ss a zzzz",
+                    "h:mm:ss a z",
+                    "h:mm:ss a",
+                    "h:mm a",
                 }
             },
         };
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_DO.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_DO.java
new file mode 100644
index 00000000000..aa86aeed53b
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_DO.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2016, 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.
+ */
+
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
+ * Distributed under the Terms of Use in
+ * http://www.unicode.org/copyright.html.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of the Unicode data files and any associated documentation
+ * (the "Data Files") or Unicode software and any associated documentation
+ * (the "Software") to deal in the Data Files or Software
+ * without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, and/or sell copies of
+ * the Data Files or Software, and to permit persons to whom the Data Files
+ * or Software are furnished to do so, provided that
+ * (a) this copyright and permission notice appear with all copies
+ * of the Data Files or Software,
+ * (b) this copyright and permission notice appear in associated
+ * documentation, and
+ * (c) there is clear notice in each modified Data File or in the Software
+ * as well as in the documentation associated with the Data File(s) or
+ * Software that the data or software has been modified.
+ *
+ * THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ * ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+ * NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+ * DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+ *
+ * Except as contained in this notice, the name of a copyright holder
+ * shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in these Data Files or Software without prior
+ * written authorization of the copyright holder.
+ */
+
+//  Note: this file has been generated by a tool.
+
+package sun.text.resources.ext;
+
+import sun.util.resources.OpenListResourceBundle;
+
+public class JavaTimeSupplementary_es_DO extends OpenListResourceBundle {
+    @Override
+    protected final Object[][] getContents() {
+        return new Object[][] {
+            { "QuarterAbbreviations",
+                new String[] {
+                    "Q1",
+                    "Q2",
+                    "Q3",
+                    "Q4",
+                }
+            },
+            { "field.era",
+                "Era" },
+            { "field.minute",
+                "Minuto" },
+            { "field.month",
+                "Mes" },
+            { "field.second",
+                "Segundo" },
+            { "field.week",
+                "Semana" },
+            { "field.weekday",
+                "D\u00eda de la semana" },
+            { "field.year",
+                "A\u00f1o" },
+            { "islamic.DatePatterns",
+                new String[] {
+                    "GGGG y MMMM d, EEEE",
+                    "GGGG y MMMM d",
+                    "dd/MM/y GGGG",
+                    "G y-MM-dd",
+                }
+            },
+            { "islamic.QuarterAbbreviations",
+                new String[] {
+                    "Q1",
+                    "Q2",
+                    "Q3",
+                    "Q4",
+                }
+            },
+            { "islamic.TimePatterns",
+                new String[] {
+                    "h:mm:ss a zzzz",
+                    "h:mm:ss a z",
+                    "h:mm:ss a",
+                    "h:mm a",
+                }
+            },
+            { "java.time.buddhist.DatePatterns",
+                new String[] {
+                    "G y MMMM d, EEEE",
+                    "G y MMMM d",
+                    "dd/MM/y G",
+                    "GGGGG y-MM-dd",
+                }
+            },
+            { "java.time.islamic.DatePatterns",
+                new String[] {
+                    "G y MMMM d, EEEE",
+                    "G y MMMM d",
+                    "dd/MM/y G",
+                    "GGGGG y-MM-dd",
+                }
+            },
+            { "java.time.roc.DatePatterns",
+                new String[] {
+                    "G y MMMM d, EEEE",
+                    "G y MMMM d",
+                    "dd/MM/y G",
+                    "GGGGG y-MM-dd",
+                }
+            },
+            { "roc.DatePatterns",
+                new String[] {
+                    "GGGG y MMMM d, EEEE",
+                    "GGGG y MMMM d",
+                    "dd/MM/y GGGG",
+                    "G y-MM-dd",
+                }
+            },
+            { "roc.QuarterAbbreviations",
+                new String[] {
+                    "Q1",
+                    "Q2",
+                    "Q3",
+                    "Q4",
+                }
+            },
+            { "roc.TimePatterns",
+                new String[] {
+                    "h:mm:ss a zzzz",
+                    "h:mm:ss a z",
+                    "h:mm:ss a",
+                    "h:mm a",
+                }
+            },
+        };
+    }
+}
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_MX.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_MX.java
index f1b021733f1..07ca85c298e 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_MX.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_MX.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -103,16 +103,6 @@ public class JavaTimeSupplementary_es_MX extends OpenListResourceBundle {
                 "Calendario gregoriano" },
             { "calendarname.roc",
                 "calendario minguo" },
-            { "field.dayperiod",
-                "a.m./p.m." },
-            { "field.era",
-                "era" },
-            { "islamic.AmPmMarkers",
-                new String[] {
-                    "a.m.",
-                    "p.m.",
-                }
-            },
             { "islamic.DatePatterns",
                 new String[] {
                     "GGGG y MMMM d, EEEE",
@@ -188,12 +178,6 @@ public class JavaTimeSupplementary_es_MX extends OpenListResourceBundle {
                     "GGGGG y-MM-dd",
                 }
             },
-            { "roc.AmPmMarkers",
-                new String[] {
-                    "a.m.",
-                    "p.m.",
-                }
-            },
             { "roc.DatePatterns",
                 new String[] {
                     "GGGG y MMMM d, EEEE",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PA.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PA.java
index ae6c273d3e1..320f4436c0a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PA.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -73,6 +73,22 @@ public class JavaTimeSupplementary_es_PA extends OpenListResourceBundle {
     @Override
     protected final Object[][] getContents() {
         return new Object[][] {
+            { "QuarterAbbreviations",
+                new String[] {
+                    "1er. trimestre",
+                    "2do. trimestre",
+                    "3er. trimestre",
+                    "4.\u00ba trimestre",
+                }
+            },
+            { "QuarterNames",
+                new String[] {
+                    "1er. trimestre",
+                    "2do. trimestre",
+                    "3er. trimestre",
+                    "4.\u00ba trimestre",
+                }
+            },
             { "islamic.DatePatterns",
                 new String[] {
                     "GGGG y MMMM d, EEEE",
@@ -81,6 +97,22 @@ public class JavaTimeSupplementary_es_PA extends OpenListResourceBundle {
                     "MM/dd/yy G",
                 }
             },
+            { "islamic.QuarterNames",
+                new String[] {
+                    "1er. trimestre",
+                    "2do. trimestre",
+                    "3er. trimestre",
+                    "4.\u00ba trimestre",
+                }
+            },
+            { "islamic.TimePatterns",
+                new String[] {
+                    "h:mm:ss a zzzz",
+                    "h:mm:ss a z",
+                    "h:mm:ss a",
+                    "h:mm a",
+                }
+            },
             { "java.time.buddhist.DatePatterns",
                 new String[] {
                     "G y MMMM d, EEEE",
@@ -121,6 +153,22 @@ public class JavaTimeSupplementary_es_PA extends OpenListResourceBundle {
                     "MM/dd/yy G",
                 }
             },
+            { "roc.QuarterNames",
+                new String[] {
+                    "1er. trimestre",
+                    "2do. trimestre",
+                    "3er. trimestre",
+                    "4.\u00ba trimestre",
+                }
+            },
+            { "roc.TimePatterns",
+                new String[] {
+                    "h:mm:ss a zzzz",
+                    "h:mm:ss a z",
+                    "h:mm:ss a",
+                    "h:mm a",
+                }
+            },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PR.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PR.java
index 0d1792716c3..ef45f9665ef 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PR.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_PR.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -81,6 +81,14 @@ public class JavaTimeSupplementary_es_PR extends OpenListResourceBundle {
                     "MM/dd/yy G",
                 }
             },
+            { "islamic.TimePatterns",
+                new String[] {
+                    "h:mm:ss a zzzz",
+                    "h:mm:ss a z",
+                    "h:mm:ss a",
+                    "h:mm a",
+                }
+            },
             { "java.time.buddhist.DatePatterns",
                 new String[] {
                     "G y MMMM d, EEEE",
@@ -121,6 +129,14 @@ public class JavaTimeSupplementary_es_PR extends OpenListResourceBundle {
                     "MM/dd/yy G",
                 }
             },
+            { "roc.TimePatterns",
+                new String[] {
+                    "h:mm:ss a zzzz",
+                    "h:mm:ss a z",
+                    "h:mm:ss a",
+                    "h:mm a",
+                }
+            },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_US.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_US.java
new file mode 100644
index 00000000000..6cf5be45e24
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_US.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2016, 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.
+ */
+
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
+ * Distributed under the Terms of Use in
+ * http://www.unicode.org/copyright.html.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of the Unicode data files and any associated documentation
+ * (the "Data Files") or Unicode software and any associated documentation
+ * (the "Software") to deal in the Data Files or Software
+ * without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, and/or sell copies of
+ * the Data Files or Software, and to permit persons to whom the Data Files
+ * or Software are furnished to do so, provided that
+ * (a) this copyright and permission notice appear with all copies
+ * of the Data Files or Software,
+ * (b) this copyright and permission notice appear in associated
+ * documentation, and
+ * (c) there is clear notice in each modified Data File or in the Software
+ * as well as in the documentation associated with the Data File(s) or
+ * Software that the data or software has been modified.
+ *
+ * THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ * ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+ * NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+ * DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+ *
+ * Except as contained in this notice, the name of a copyright holder
+ * shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in these Data Files or Software without prior
+ * written authorization of the copyright holder.
+ */
+
+//  Note: this file has been generated by a tool.
+
+package sun.text.resources.ext;
+
+import sun.util.resources.OpenListResourceBundle;
+
+public class JavaTimeSupplementary_es_US extends OpenListResourceBundle {
+    @Override
+    protected final Object[][] getContents() {
+        return new Object[][] {
+            { "islamic.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
+            { "islamic.TimePatterns",
+                new String[] {
+                    "h:mm:ss a zzzz",
+                    "h:mm:ss a z",
+                    "h:mm:ss a",
+                    "h:mm a",
+                }
+            },
+            { "islamic.narrow.AmPmMarkers",
+                new String[] {
+                    "a",
+                    "p",
+                }
+            },
+            { "java.time.short.Eras",
+                new String[] {
+                    "a.C.",
+                    "d.C.",
+                }
+            },
+            { "roc.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
+            { "roc.TimePatterns",
+                new String[] {
+                    "h:mm:ss a zzzz",
+                    "h:mm:ss a z",
+                    "h:mm:ss a",
+                    "h:mm a",
+                }
+            },
+            { "roc.narrow.AmPmMarkers",
+                new String[] {
+                    "a",
+                    "p",
+                }
+            },
+        };
+    }
+}
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_VE.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_VE.java
new file mode 100644
index 00000000000..2b093429cfe
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_es_VE.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2016, 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.
+ */
+
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
+ * Distributed under the Terms of Use in
+ * http://www.unicode.org/copyright.html.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of the Unicode data files and any associated documentation
+ * (the "Data Files") or Unicode software and any associated documentation
+ * (the "Software") to deal in the Data Files or Software
+ * without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, and/or sell copies of
+ * the Data Files or Software, and to permit persons to whom the Data Files
+ * or Software are furnished to do so, provided that
+ * (a) this copyright and permission notice appear with all copies
+ * of the Data Files or Software,
+ * (b) this copyright and permission notice appear in associated
+ * documentation, and
+ * (c) there is clear notice in each modified Data File or in the Software
+ * as well as in the documentation associated with the Data File(s) or
+ * Software that the data or software has been modified.
+ *
+ * THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ * ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+ * NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+ * DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+ *
+ * Except as contained in this notice, the name of a copyright holder
+ * shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in these Data Files or Software without prior
+ * written authorization of the copyright holder.
+ */
+
+//  Note: this file has been generated by a tool.
+
+package sun.text.resources.ext;
+
+import sun.util.resources.OpenListResourceBundle;
+
+public class JavaTimeSupplementary_es_VE extends OpenListResourceBundle {
+    @Override
+    protected final Object[][] getContents() {
+        return new Object[][] {
+            { "QuarterAbbreviations",
+                new String[] {
+                    "1er trimestre",
+                    "2do trimestre",
+                    "3er trimestre",
+                    "4to trimestre",
+                }
+            },
+            { "QuarterNames",
+                new String[] {
+                    "1er trimestre",
+                    "2do trimestre",
+                    "3er trimestre",
+                    "4to trimestre",
+                }
+            },
+            { "islamic.QuarterNames",
+                new String[] {
+                    "1er trimestre",
+                    "2do trimestre",
+                    "3er trimestre",
+                    "4to trimestre",
+                }
+            },
+            { "islamic.TimePatterns",
+                new String[] {
+                    "h:mm:ss a zzzz",
+                    "h:mm:ss a z",
+                    "h:mm:ss a",
+                    "h:mm a",
+                }
+            },
+            { "roc.QuarterNames",
+                new String[] {
+                    "1er trimestre",
+                    "2do trimestre",
+                    "3er trimestre",
+                    "4to trimestre",
+                }
+            },
+            { "roc.TimePatterns",
+                new String[] {
+                    "h:mm:ss a zzzz",
+                    "h:mm:ss a z",
+                    "h:mm:ss a",
+                    "h:mm a",
+                }
+            },
+        };
+    }
+}
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_et.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_et.java
index 5fd763b178c..7424a3ce3b4 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_et.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_et.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -123,6 +123,12 @@ public class JavaTimeSupplementary_et extends OpenListResourceBundle {
                 "aasta" },
             { "field.zone",
                 "ajav\u00f6\u00f6nd" },
+            { "islamic.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
             { "islamic.DatePatterns",
                 new String[] {
                     "EEEE, d. MMMM y GGGG",
@@ -196,6 +202,12 @@ public class JavaTimeSupplementary_et extends OpenListResourceBundle {
                     "H:mm",
                 }
             },
+            { "islamic.narrow.AmPmMarkers",
+                new String[] {
+                    "a",
+                    "p",
+                }
+            },
             { "java.time.buddhist.DatePatterns",
                 new String[] {
                     "EEEE, d. MMMM y G",
@@ -222,8 +234,8 @@ public class JavaTimeSupplementary_et extends OpenListResourceBundle {
             },
             { "java.time.long.Eras",
                 new String[] {
-                    "enne meie aega",
-                    "meie aja j\u00e4rgi",
+                    "enne Kristust",
+                    "p\u00e4rast Kristust",
                 }
             },
             { "java.time.roc.DatePatterns",
@@ -240,6 +252,12 @@ public class JavaTimeSupplementary_et extends OpenListResourceBundle {
                     "m.a.j.",
                 }
             },
+            { "roc.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
             { "roc.DatePatterns",
                 new String[] {
                     "EEEE, d. MMMM y GGGG",
@@ -356,6 +374,12 @@ public class JavaTimeSupplementary_et extends OpenListResourceBundle {
                     "H:mm",
                 }
             },
+            { "roc.narrow.AmPmMarkers",
+                new String[] {
+                    "a",
+                    "p",
+                }
+            },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fi.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fi.java
index c30940aafa3..520af848837 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fi.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -221,6 +221,12 @@ public class JavaTimeSupplementary_fi extends OpenListResourceBundle {
                     "H.mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "ap.",
+                    "ip.",
+                }
+            },
             { "islamic.narrow.AmPmMarkers",
                 new String[] {
                     "ap.",
@@ -419,6 +425,12 @@ public class JavaTimeSupplementary_fi extends OpenListResourceBundle {
                     "H.mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "ap.",
+                    "ip.",
+                }
+            },
             { "roc.long.Eras",
                 new String[] {
                     "Before R.O.C.",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr.java
index 02673f46f00..e89746efede 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -127,6 +127,12 @@ public class JavaTimeSupplementary_fr extends OpenListResourceBundle {
                 "ann\u00e9e" },
             { "field.zone",
                 "fuseau horaire" },
+            { "islamic.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
             { "islamic.DatePatterns",
                 new String[] {
                     "EEEE d MMMM y GGGG",
@@ -246,6 +252,12 @@ public class JavaTimeSupplementary_fr extends OpenListResourceBundle {
                     "AH",
                 }
             },
+            { "islamic.narrow.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
             { "islamic.narrow.Eras",
                 new String[] {
                     "",
@@ -306,6 +318,12 @@ public class JavaTimeSupplementary_fr extends OpenListResourceBundle {
                     "ap. J.-C.",
                 }
             },
+            { "roc.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
             { "roc.DatePatterns",
                 new String[] {
                     "EEEE d MMMM y GGGG",
@@ -434,6 +452,12 @@ public class JavaTimeSupplementary_fr extends OpenListResourceBundle {
                     "RdC",
                 }
             },
+            { "roc.narrow.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
             { "roc.narrow.Eras",
                 new String[] {
                     "avant RdC",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_CA.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_CA.java
index 0281c7efbff..14bca283e02 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_CA.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr_CA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -81,6 +81,12 @@ public class JavaTimeSupplementary_fr_CA extends OpenListResourceBundle {
                     "y-MM-dd G",
                 }
             },
+            { "islamic.narrow.AmPmMarkers",
+                new String[] {
+                    "a",
+                    "p",
+                }
+            },
             { "java.time.buddhist.DatePatterns",
                 new String[] {
                     "EEEE d MMMM y G",
@@ -121,6 +127,12 @@ public class JavaTimeSupplementary_fr_CA extends OpenListResourceBundle {
                     "yy-MM-dd G",
                 }
             },
+            { "roc.narrow.AmPmMarkers",
+                new String[] {
+                    "a",
+                    "p",
+                }
+            },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ga.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ga.java
index e9546991007..ed2df7530e1 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ga.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ga.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -200,6 +200,18 @@ public class JavaTimeSupplementary_ga extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "a.m.",
+                    "p.m.",
+                }
+            },
+            { "islamic.narrow.AmPmMarkers",
+                new String[] {
+                    "a",
+                    "p",
+                }
+            },
             { "java.time.buddhist.DatePatterns",
                 new String[] {
                     "EEEE d MMMM y G",
@@ -366,6 +378,18 @@ public class JavaTimeSupplementary_ga extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "a.m.",
+                    "p.m.",
+                }
+            },
+            { "roc.narrow.AmPmMarkers",
+                new String[] {
+                    "a",
+                    "p",
+                }
+            },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hi_IN.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hi_IN.java
index 6f75f337a13..50eff49e004 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hi_IN.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hi_IN.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -219,6 +219,12 @@ public class JavaTimeSupplementary_hi_IN extends OpenListResourceBundle {
                     "h:mm a",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u092a\u0942\u0930\u094d\u0935",
+                    "\u0905\u092a\u0930",
+                }
+            },
             { "islamic.narrow.AmPmMarkers",
                 new String[] {
                     "\u092a\u0942",
@@ -409,6 +415,12 @@ public class JavaTimeSupplementary_hi_IN extends OpenListResourceBundle {
                     "h:mm a",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u092a\u0942\u0930\u094d\u0935",
+                    "\u0905\u092a\u0930",
+                }
+            },
             { "roc.narrow.AmPmMarkers",
                 new String[] {
                     "\u092a\u0942",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hr.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hr.java
index 0ec012f2bad..e9531142fa7 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hr.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -72,10 +72,6 @@ import sun.util.resources.OpenListResourceBundle;
 public class JavaTimeSupplementary_hr extends OpenListResourceBundle {
     @Override
     protected final Object[][] getContents() {
-        final String[] javatimelongEras = {
-            "Prije Krista",
-            "Poslije Krista",
-        };
         return new Object[][] {
             { "QuarterAbbreviations",
                 new String[] {
@@ -117,22 +113,30 @@ public class JavaTimeSupplementary_hr extends OpenListResourceBundle {
                 "kalendar Republike Kine" },
             { "field.dayperiod",
                 "AM/PM" },
+            { "field.era",
+                "era" },
             { "field.hour",
-                "Sat" },
+                "sat" },
             { "field.minute",
-                "Minuta" },
+                "minuta" },
             { "field.month",
-                "Mjesec" },
+                "mjesec" },
             { "field.second",
-                "Sekunda" },
+                "sekunda" },
             { "field.week",
-                "Tjedan" },
+                "tjedan" },
             { "field.weekday",
-                "Dan u tjednu" },
+                "dan u tjednu" },
             { "field.year",
-                "Godina" },
+                "godina" },
             { "field.zone",
-                "Vremenska zona" },
+                "vremenska zona" },
+            { "islamic.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
             { "islamic.DatePatterns",
                 new String[] {
                     "EEEE, d. MMMM y. GGGG",
@@ -240,7 +244,7 @@ public class JavaTimeSupplementary_hr extends OpenListResourceBundle {
                 new String[] {
                     "EEEE, d. MMMM y. G",
                     "d. MMMM y. G",
-                    "d. M. y. G",
+                    "d. MMM y. G",
                     "dd.MM.y. GGGGG",
                 }
             },
@@ -274,7 +278,7 @@ public class JavaTimeSupplementary_hr extends OpenListResourceBundle {
             },
             { "java.time.japanese.long.Eras",
                 new String[] {
-                    "Poslije Krista",
+                    "poslije Krista",
                     "Meiji",
                     "Taish\u014d",
                     "Sh\u014dwa",
@@ -291,22 +295,36 @@ public class JavaTimeSupplementary_hr extends OpenListResourceBundle {
                 }
             },
             { "java.time.long.Eras",
-                javatimelongEras },
+                new String[] {
+                    "prije Krista",
+                    "poslije Krista",
+                }
+            },
             { "java.time.roc.DatePatterns",
                 new String[] {
                     "EEEE, d. MMMM y. G",
                     "d. MMMM y. G",
-                    "d. M. y. G",
+                    "d. MMM y. G",
                     "dd.MM.y. GGGGG",
                 }
             },
             { "java.time.short.Eras",
-                javatimelongEras },
+                new String[] {
+                    "Prije Krista",
+                    "Poslije Krista",
+                }
+            },
+            { "roc.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
             { "roc.DatePatterns",
                 new String[] {
                     "EEEE, d. MMMM y. GGGG",
                     "d. MMMM y. GGGG",
-                    "d. M. y. GGGG",
+                    "d. MMM y. GGGG",
                     "dd.MM.y. G",
                 }
             },
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hu.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hu.java
index b8c81448c84..18c629c4f7c 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hu.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hu.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -192,8 +192,8 @@ public class JavaTimeSupplementary_hu extends OpenListResourceBundle {
                 new String[] {
                     "Moh.",
                     "Saf.",
-                    "R\u00e9bi I",
-                    "R\u00e9bi II",
+                    "R\u00e9b. 1",
+                    "R\u00e9b. 2",
                     "Dsem. I",
                     "Dsem. II",
                     "Red.",
@@ -254,6 +254,12 @@ public class JavaTimeSupplementary_hu extends OpenListResourceBundle {
                     "H:mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "de.",
+                    "du.",
+                }
+            },
             { "islamic.long.Eras",
                 new String[] {
                     "",
@@ -462,6 +468,12 @@ public class JavaTimeSupplementary_hu extends OpenListResourceBundle {
                     "H:mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "de.",
+                    "du.",
+                }
+            },
             { "roc.long.Eras",
                 new String[] {
                     "R.O.C. el\u0151tt",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_in.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_in.java
new file mode 100644
index 00000000000..3325f5e8cb9
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_in.java
@@ -0,0 +1,495 @@
+/*
+ * Copyright (c) 2016, 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.
+ */
+
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
+ * Distributed under the Terms of Use in
+ * http://www.unicode.org/copyright.html.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of the Unicode data files and any associated documentation
+ * (the "Data Files") or Unicode software and any associated documentation
+ * (the "Software") to deal in the Data Files or Software
+ * without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, and/or sell copies of
+ * the Data Files or Software, and to permit persons to whom the Data Files
+ * or Software are furnished to do so, provided that
+ * (a) this copyright and permission notice appear with all copies
+ * of the Data Files or Software,
+ * (b) this copyright and permission notice appear in associated
+ * documentation, and
+ * (c) there is clear notice in each modified Data File or in the Software
+ * as well as in the documentation associated with the Data File(s) or
+ * Software that the data or software has been modified.
+ *
+ * THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ * ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+ * NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+ * DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+ *
+ * Except as contained in this notice, the name of a copyright holder
+ * shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in these Data Files or Software without prior
+ * written authorization of the copyright holder.
+ */
+
+//  Note: this file has been generated by a tool.
+
+package sun.text.resources.ext;
+
+import sun.util.resources.OpenListResourceBundle;
+
+public class JavaTimeSupplementary_in extends OpenListResourceBundle {
+    @Override
+    protected final Object[][] getContents() {
+        return new Object[][] {
+            { "QuarterAbbreviations",
+                new String[] {
+                    "K1",
+                    "K2",
+                    "K3",
+                    "K4",
+                }
+            },
+            { "QuarterNames",
+                new String[] {
+                    "Kuartal ke-1",
+                    "Kuartal ke-2",
+                    "Kuartal ke-3",
+                    "Kuartal ke-4",
+                }
+            },
+            { "calendarname.buddhist",
+                "Kalender Buddha" },
+            { "calendarname.gregorian",
+                "Kalender Gregorian" },
+            { "calendarname.gregory",
+                "Kalender Gregorian" },
+            { "calendarname.islamic",
+                "Kalender Islam" },
+            { "calendarname.islamic-civil",
+                "Kalender Sipil Islam" },
+            { "calendarname.japanese",
+                "Kalender Jepang" },
+            { "calendarname.roc",
+                "Kalendar Minguo" },
+            { "field.dayperiod",
+                "AM/PM" },
+            { "field.hour",
+                "Jam" },
+            { "field.minute",
+                "Menit" },
+            { "field.month",
+                "Bulan" },
+            { "field.second",
+                "Detik" },
+            { "field.week",
+                "Minggu" },
+            { "field.weekday",
+                "Hari dalam Seminggu" },
+            { "field.year",
+                "Tahun" },
+            { "field.zone",
+                "Zona Waktu" },
+            { "islamic.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
+            { "islamic.DatePatterns",
+                new String[] {
+                    "EEEE, dd MMMM y GGGG",
+                    "d MMMM y GGGG",
+                    "d MMM y GGGG",
+                    "d/M/y G",
+                }
+            },
+            { "islamic.DayAbbreviations",
+                new String[] {
+                    "Min",
+                    "Sen",
+                    "Sel",
+                    "Rab",
+                    "Kam",
+                    "Jum",
+                    "Sab",
+                }
+            },
+            { "islamic.DayNames",
+                new String[] {
+                    "Minggu",
+                    "Senin",
+                    "Selasa",
+                    "Rabu",
+                    "Kamis",
+                    "Jumat",
+                    "Sabtu",
+                }
+            },
+            { "islamic.DayNarrows",
+                new String[] {
+                    "M",
+                    "S",
+                    "S",
+                    "R",
+                    "K",
+                    "J",
+                    "S",
+                }
+            },
+            { "islamic.Eras",
+                new String[] {
+                    "",
+                    "AH",
+                }
+            },
+            { "islamic.MonthAbbreviations",
+                new String[] {
+                    "Muh.",
+                    "Saf.",
+                    "Rab. I",
+                    "Rab. II",
+                    "Jum. I",
+                    "Jum. II",
+                    "Raj.",
+                    "Sha.",
+                    "Ram.",
+                    "Syaw.",
+                    "Dhu\u02bbl-Q.",
+                    "Dhu\u02bbl-H.",
+                    "",
+                }
+            },
+            { "islamic.MonthNames",
+                new String[] {
+                    "Muharram",
+                    "Safar",
+                    "Rabi\u02bb I",
+                    "Rabi\u02bb II",
+                    "Jumada I",
+                    "Jumada II",
+                    "Rajab",
+                    "Sya\u2019ban",
+                    "Ramadhan",
+                    "Syawal",
+                    "Dhu\u02bbl-Qi\u02bbdah",
+                    "Dhu\u02bbl-Hijjah",
+                    "",
+                }
+            },
+            { "islamic.QuarterAbbreviations",
+                new String[] {
+                    "K1",
+                    "K2",
+                    "K3",
+                    "K4",
+                }
+            },
+            { "islamic.QuarterNames",
+                new String[] {
+                    "Kuartal ke-1",
+                    "Kuartal ke-2",
+                    "Kuartal ke-3",
+                    "Kuartal ke-4",
+                }
+            },
+            { "islamic.QuarterNarrows",
+                new String[] {
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                }
+            },
+            { "islamic.TimePatterns",
+                new String[] {
+                    "HH.mm.ss zzzz",
+                    "HH.mm.ss z",
+                    "HH.mm.ss",
+                    "HH.mm",
+                }
+            },
+            { "islamic.long.Eras",
+                new String[] {
+                    "",
+                    "AH",
+                }
+            },
+            { "islamic.narrow.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
+            { "islamic.narrow.Eras",
+                new String[] {
+                    "",
+                    "AH",
+                }
+            },
+            { "islamic.short.Eras",
+                new String[] {
+                    "",
+                    "AH",
+                }
+            },
+            { "java.time.buddhist.DatePatterns",
+                new String[] {
+                    "EEEE, dd MMMM y G",
+                    "d MMMM y G",
+                    "d MMM y G",
+                    "d/M/y GGGGG",
+                }
+            },
+            { "java.time.buddhist.long.Eras",
+                new String[] {
+                    "BC",
+                    "BE",
+                }
+            },
+            { "java.time.buddhist.short.Eras",
+                new String[] {
+                    "BC",
+                    "BE",
+                }
+            },
+            { "java.time.islamic.DatePatterns",
+                new String[] {
+                    "EEEE, dd MMMM y G",
+                    "d MMMM y G",
+                    "d MMM y G",
+                    "d/M/y GGGGG",
+                }
+            },
+            { "java.time.japanese.DatePatterns",
+                new String[] {
+                    "EEEE, dd MMMM y G",
+                    "d MMMM y G",
+                    "d MMM y G",
+                    "d/M/y GGGGG",
+                }
+            },
+            { "java.time.japanese.long.Eras",
+                new String[] {
+                    "M",
+                    "Meiji",
+                    "Taish\u014d",
+                    "Sh\u014dwa",
+                    "Heisei",
+                }
+            },
+            { "java.time.japanese.short.Eras",
+                new String[] {
+                    "M",
+                    "Meiji",
+                    "Taish\u014d",
+                    "Sh\u014dwa",
+                    "Heisei",
+                }
+            },
+            { "java.time.long.Eras",
+                new String[] {
+                    "Sebelum Masehi",
+                    "M",
+                }
+            },
+            { "java.time.roc.DatePatterns",
+                new String[] {
+                    "EEEE, dd MMMM y G",
+                    "d MMMM y G",
+                    "d MMM y G",
+                    "d/M/y GGGGG",
+                }
+            },
+            { "java.time.short.Eras",
+                new String[] {
+                    "BCE",
+                    "CE",
+                }
+            },
+            { "roc.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
+            { "roc.DatePatterns",
+                new String[] {
+                    "EEEE, dd MMMM y GGGG",
+                    "d MMMM y GGGG",
+                    "d MMM y GGGG",
+                    "d/M/y G",
+                }
+            },
+            { "roc.DayAbbreviations",
+                new String[] {
+                    "Min",
+                    "Sen",
+                    "Sel",
+                    "Rab",
+                    "Kam",
+                    "Jum",
+                    "Sab",
+                }
+            },
+            { "roc.DayNames",
+                new String[] {
+                    "Minggu",
+                    "Senin",
+                    "Selasa",
+                    "Rabu",
+                    "Kamis",
+                    "Jumat",
+                    "Sabtu",
+                }
+            },
+            { "roc.DayNarrows",
+                new String[] {
+                    "M",
+                    "S",
+                    "S",
+                    "R",
+                    "K",
+                    "J",
+                    "S",
+                }
+            },
+            { "roc.Eras",
+                new String[] {
+                    "Sebelum R.O.C.",
+                    "R.O.C.",
+                }
+            },
+            { "roc.MonthAbbreviations",
+                new String[] {
+                    "Jan",
+                    "Feb",
+                    "Mar",
+                    "Apr",
+                    "Mei",
+                    "Jun",
+                    "Jul",
+                    "Agt",
+                    "Sep",
+                    "Okt",
+                    "Nov",
+                    "Des",
+                    "",
+                }
+            },
+            { "roc.MonthNames",
+                new String[] {
+                    "Januari",
+                    "Februari",
+                    "Maret",
+                    "April",
+                    "Mei",
+                    "Juni",
+                    "Juli",
+                    "Agustus",
+                    "September",
+                    "Oktober",
+                    "November",
+                    "Desember",
+                    "",
+                }
+            },
+            { "roc.MonthNarrows",
+                new String[] {
+                    "J",
+                    "F",
+                    "M",
+                    "A",
+                    "M",
+                    "J",
+                    "J",
+                    "A",
+                    "S",
+                    "O",
+                    "N",
+                    "D",
+                    "",
+                }
+            },
+            { "roc.QuarterAbbreviations",
+                new String[] {
+                    "K1",
+                    "K2",
+                    "K3",
+                    "K4",
+                }
+            },
+            { "roc.QuarterNames",
+                new String[] {
+                    "Kuartal ke-1",
+                    "Kuartal ke-2",
+                    "Kuartal ke-3",
+                    "Kuartal ke-4",
+                }
+            },
+            { "roc.TimePatterns",
+                new String[] {
+                    "HH.mm.ss zzzz",
+                    "HH.mm.ss z",
+                    "HH.mm.ss",
+                    "HH.mm",
+                }
+            },
+            { "roc.long.Eras",
+                new String[] {
+                    "Sebelum R.O.C.",
+                    "R.O.C.",
+                }
+            },
+            { "roc.narrow.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
+            { "roc.narrow.Eras",
+                new String[] {
+                    "Sebelum R.O.C.",
+                    "R.O.C.",
+                }
+            },
+            { "roc.short.Eras",
+                new String[] {
+                    "Sebelum R.O.C.",
+                    "R.O.C.",
+                }
+            },
+        };
+    }
+}
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_is.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_is.java
index fec108a3b9d..7cf4a8bf1a4 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_is.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_is.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -202,6 +202,12 @@ public class JavaTimeSupplementary_is extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "f.h.",
+                    "e.h.",
+                }
+            },
             { "islamic.narrow.AmPmMarkers",
                 new String[] {
                     "f.",
@@ -374,6 +380,12 @@ public class JavaTimeSupplementary_is extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "f.h.",
+                    "e.h.",
+                }
+            },
             { "roc.narrow.AmPmMarkers",
                 new String[] {
                     "f.",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_it.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_it.java
index 50f4ba1774a..3a3d52e7747 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_it.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_it.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -107,22 +107,30 @@ public class JavaTimeSupplementary_it extends OpenListResourceBundle {
                 "Calendario Minguo" },
             { "field.dayperiod",
                 "AM/PM" },
+            { "field.era",
+                "era" },
             { "field.hour",
-                "Ora" },
+                "ora" },
             { "field.minute",
-                "Minuto" },
+                "minuto" },
             { "field.month",
-                "Mese" },
+                "mese" },
             { "field.second",
                 "Secondo" },
             { "field.week",
-                "Settimana" },
+                "settimana" },
             { "field.weekday",
-                "Giorno della settimana" },
+                "giorno della settimana" },
             { "field.year",
-                "Anno" },
+                "anno" },
             { "field.zone",
-                "Fuso orario" },
+                "fuso orario" },
+            { "islamic.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
             { "islamic.DatePatterns",
                 new String[] {
                     "EEEE d MMMM y GGGG",
@@ -282,6 +290,12 @@ public class JavaTimeSupplementary_it extends OpenListResourceBundle {
                     "dopo Cristo",
                 }
             },
+            { "roc.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
             { "roc.DatePatterns",
                 new String[] {
                     "EEEE d MMMM y GGGG",
@@ -325,7 +339,7 @@ public class JavaTimeSupplementary_it extends OpenListResourceBundle {
             },
             { "roc.Eras",
                 new String[] {
-                    "Prima della R.O.C.",
+                    "Prima di R.O.C.",
                     "Minguo",
                 }
             },
@@ -406,7 +420,7 @@ public class JavaTimeSupplementary_it extends OpenListResourceBundle {
             },
             { "roc.long.Eras",
                 new String[] {
-                    "Prima della R.O.C.",
+                    "Prima di R.O.C.",
                     "Minguo",
                 }
             },
@@ -418,13 +432,13 @@ public class JavaTimeSupplementary_it extends OpenListResourceBundle {
             },
             { "roc.narrow.Eras",
                 new String[] {
-                    "Prima della R.O.C.",
+                    "Prima di R.O.C.",
                     "Minguo",
                 }
             },
             { "roc.short.Eras",
                 new String[] {
-                    "Prima della R.O.C.",
+                    "Prima di R.O.C.",
                     "Minguo",
                 }
             },
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_it_CH.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_it_CH.java
index 7fa4bd2dd8f..96f1bb420ab 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_it_CH.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_it_CH.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -77,7 +77,7 @@ public class JavaTimeSupplementary_it_CH extends OpenListResourceBundle {
                 new String[] {
                     "EEEE, d MMMM y GGGG",
                     "d MMMM y GGGG",
-                    "d-MMM-y GGGG",
+                    "d MMM y GGGG",
                     "dd.MM.yy G",
                 }
             },
@@ -85,7 +85,7 @@ public class JavaTimeSupplementary_it_CH extends OpenListResourceBundle {
                 new String[] {
                     "EEEE, d MMMM y G",
                     "d MMMM y G",
-                    "d-MMM-y G",
+                    "d MMM y G",
                     "dd.MM.yy GGGGG",
                 }
             },
@@ -93,7 +93,7 @@ public class JavaTimeSupplementary_it_CH extends OpenListResourceBundle {
                 new String[] {
                     "EEEE, d MMMM y G",
                     "d MMMM y G",
-                    "d-MMM-y G",
+                    "d MMM y G",
                     "dd.MM.yy GGGGG",
                 }
             },
@@ -101,7 +101,7 @@ public class JavaTimeSupplementary_it_CH extends OpenListResourceBundle {
                 new String[] {
                     "EEEE, d MMMM y G",
                     "d MMMM y G",
-                    "d-MMM-y G",
+                    "d MMM y G",
                     "dd.MM.yy GGGGG",
                 }
             },
@@ -109,7 +109,7 @@ public class JavaTimeSupplementary_it_CH extends OpenListResourceBundle {
                 new String[] {
                     "EEEE, d MMMM y G",
                     "d MMMM y G",
-                    "d-MMM-y G",
+                    "d MMM y G",
                     "dd.MM.yy GGGGG",
                 }
             },
@@ -117,7 +117,7 @@ public class JavaTimeSupplementary_it_CH extends OpenListResourceBundle {
                 new String[] {
                     "EEEE, d MMMM y GGGG",
                     "d MMMM y GGGG",
-                    "d-MMM-y GGGG",
+                    "d MMM y GGGG",
                     "dd.MM.yy G",
                 }
             },
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_iw.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_iw.java
index 7061f072321..e933a2015c6 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_iw.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_iw.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,37 +26,41 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
- * the Terms of Use in http://www.unicode.org/copyright.html.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
+ * Distributed under the Terms of Use in
+ * http://www.unicode.org/copyright.html.
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of the Unicode data files and any associated documentation (the "Data
- * Files") or Unicode software and any associated documentation (the
- * "Software") to deal in the Data Files or Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Data Files or Software, and
- * to permit persons to whom the Data Files or Software are furnished to do so,
- * provided that (a) the above copyright notice(s) and this permission notice
- * appear with all copies of the Data Files or Software, (b) both the above
- * copyright notice(s) and this permission notice appear in associated
- * documentation, and (c) there is clear notice in each modified Data File or
- * in the Software as well as in the documentation associated with the Data
- * File(s) or Software that the data or software has been modified.
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of the Unicode data files and any associated documentation
+ * (the "Data Files") or Unicode software and any associated documentation
+ * (the "Software") to deal in the Data Files or Software
+ * without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, and/or sell copies of
+ * the Data Files or Software, and to permit persons to whom the Data Files
+ * or Software are furnished to do so, provided that
+ * (a) this copyright and permission notice appear with all copies
+ * of the Data Files or Software,
+ * (b) this copyright and permission notice appear in associated
+ * documentation, and
+ * (c) there is clear notice in each modified Data File or in the Software
+ * as well as in the documentation associated with the Data File(s) or
+ * Software that the data or software has been modified.
  *
- * THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
- * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
- * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
- * CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * 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.
+ * 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.
+ * 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.
  */
 
 //  Note: this file has been generated by a tool.
@@ -69,7 +73,7 @@ public class JavaTimeSupplementary_iw extends OpenListResourceBundle {
     @Override
     protected final Object[][] getContents() {
         return new Object[][] {
-            { "QuarterNames",
+            { "QuarterAbbreviations",
                 new String[] {
                     "\u05e8\u05d1\u05e2\u05d5\u05df 1",
                     "\u05e8\u05d1\u05e2\u05d5\u05df 2",
@@ -77,12 +81,12 @@ public class JavaTimeSupplementary_iw extends OpenListResourceBundle {
                     "\u05e8\u05d1\u05e2\u05d5\u05df 4",
                 }
             },
-            { "QuarterNarrows",
+            { "QuarterNames",
                 new String[] {
-                    "1",
-                    "2",
-                    "3",
-                    "4",
+                    "\u05e8\u05d1\u05e2\u05d5\u05df 1",
+                    "\u05e8\u05d1\u05e2\u05d5\u05df 2",
+                    "\u05e8\u05d1\u05e2\u05d5\u05df 3",
+                    "\u05e8\u05d1\u05e2\u05d5\u05df 4",
                 }
             },
             { "calendarname.buddhist",
@@ -95,14 +99,12 @@ public class JavaTimeSupplementary_iw extends OpenListResourceBundle {
                 "\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05de\u05d5\u05e1\u05dc\u05de\u05d9" },
             { "calendarname.islamic-civil",
                 "\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05de\u05d5\u05e1\u05dc\u05de\u05d9-\u05d0\u05d6\u05e8\u05d7\u05d9" },
-            { "calendarname.islamicc",
-                "\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05de\u05d5\u05e1\u05dc\u05de\u05d9-\u05d0\u05d6\u05e8\u05d7\u05d9" },
             { "calendarname.japanese",
                 "\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05d9\u05e4\u05e0\u05d9" },
             { "calendarname.roc",
                 "\u05dc\u05d5\u05d7 \u05d4\u05e9\u05e0\u05d4 \u05d4\u05e1\u05d9\u05e0\u05d9 Minguo" },
             { "field.dayperiod",
-                "\u05dc\u05e4\u05d4\u05f4\u05e6/\u05d0\u05d7\u05d4\u05f4\u05e6" },
+                "\u05dc\u05e4\u05e0\u05d4\u05f4\u05e6/\u05d0\u05d7\u05d4\u05f4\u05e6" },
             { "field.era",
                 "\u05ea\u05e7\u05d5\u05e4\u05d4" },
             { "field.hour",
@@ -121,47 +123,327 @@ public class JavaTimeSupplementary_iw extends OpenListResourceBundle {
                 "\u05e9\u05e0\u05d4" },
             { "field.zone",
                 "\u05d0\u05d6\u05d5\u05e8" },
+            { "islamic.AmPmMarkers",
+                new String[] {
+                    "\u05dc\u05e4\u05e0\u05d4\u05f4\u05e6",
+                    "\u05d0\u05d7\u05d4\u05f4\u05e6",
+                }
+            },
+            { "islamic.DatePatterns",
+                new String[] {
+                    "EEEE, d \u05d1MMMM y GGGG",
+                    "d \u05d1MMMM y GGGG",
+                    "d \u05d1MMM y GGGG",
+                    "dd/MM/yy G",
+                }
+            },
+            { "islamic.DayAbbreviations",
+                new String[] {
+                    "\u05d9\u05d5\u05dd \u05d0\u05f3",
+                    "\u05d9\u05d5\u05dd \u05d1\u05f3",
+                    "\u05d9\u05d5\u05dd \u05d2\u05f3",
+                    "\u05d9\u05d5\u05dd \u05d3\u05f3",
+                    "\u05d9\u05d5\u05dd \u05d4\u05f3",
+                    "\u05d9\u05d5\u05dd \u05d5\u05f3",
+                    "\u05e9\u05d1\u05ea",
+                }
+            },
+            { "islamic.DayNames",
+                new String[] {
+                    "\u05d9\u05d5\u05dd \u05e8\u05d0\u05e9\u05d5\u05df",
+                    "\u05d9\u05d5\u05dd \u05e9\u05e0\u05d9",
+                    "\u05d9\u05d5\u05dd \u05e9\u05dc\u05d9\u05e9\u05d9",
+                    "\u05d9\u05d5\u05dd \u05e8\u05d1\u05d9\u05e2\u05d9",
+                    "\u05d9\u05d5\u05dd \u05d7\u05de\u05d9\u05e9\u05d9",
+                    "\u05d9\u05d5\u05dd \u05e9\u05d9\u05e9\u05d9",
+                    "\u05d9\u05d5\u05dd \u05e9\u05d1\u05ea",
+                }
+            },
+            { "islamic.DayNarrows",
+                new String[] {
+                    "\u05d0\u05f3",
+                    "\u05d1\u05f3",
+                    "\u05d2\u05f3",
+                    "\u05d3\u05f3",
+                    "\u05d4\u05f3",
+                    "\u05d5\u05f3",
+                    "\u05e9\u05f3",
+                }
+            },
             { "islamic.Eras",
                 new String[] {
                     "",
                     "\u05e9\u05e0\u05ea \u05d4\u05d9\u05d2\u05f3\u05e8\u05d4",
                 }
             },
+            { "islamic.MonthAbbreviations",
+                new String[] {
+                    "\u05de\u05d5\u05d7\u05e8\u05dd",
+                    "\u05e6\u05e4\u05e8",
+                    "\u05e8\u05d1\u05d9\u05e2 \u05d0\u05f3",
+                    "\u05e8\u05d1\u05d9\u05e2 \u05d1\u05f3",
+                    "\u05d2\u05f3\u05d5\u05de\u05d0\u05d3\u05d0 \u05d0\u05f3",
+                    "\u05d2\u05f3\u05d5\u05de\u05d0\u05d3\u05d0 \u05d1\u05f3",
+                    "\u05e8\u05d2\u05f3\u05d1",
+                    "\u05e9\u05e2\u05d1\u05d0\u05df",
+                    "\u05e8\u05de\u05d3\u05d0\u05df",
+                    "\u05e9\u05d5\u05d5\u05d0\u05dc",
+                    "\u05d3\u05f3\u05d5 \u05d0\u05dc\u05be\u05e7\u05e2\u05d3\u05d4",
+                    "\u05d3\u05f3\u05d5 \u05d0\u05dc\u05be\u05d7\u05d9\u05d2\u05f3\u05d4",
+                    "",
+                }
+            },
             { "islamic.MonthNames",
                 new String[] {
                     "\u05de\u05d5\u05d7\u05e8\u05dd",
-                    "\u05e1\u05e4\u05e8",
-                    "\u05e8\u05d1\u05d9\u05e2 \u05d0\u05dc-\u05d0\u05d5\u05d5\u05d0\u05dc",
-                    "\u05e8\u05d1\u05d9\u05e2 \u05d0\u05dc-\u05ea\u05e0\u05d9",
-                    "\u05d2\u05f3\u05d5\u05de\u05d3\u05d4 \u05d0\u05dc-\u05d0\u05d5\u05d5\u05d0\u05dc",
-                    "\u05d2\u05f3\u05d5\u05de\u05d3\u05d4 \u05d0\u05dc-\u05ea\u05e0\u05d9",
-                    "\u05e8\u05d2\u05f3\u05d0\u05d1",
+                    "\u05e6\u05e4\u05e8",
+                    "\u05e8\u05d1\u05d9\u05e2 \u05d0\u05dc-\u05d0\u05d5\u05d5\u05dc",
+                    "\u05e8\u05d1\u05d9\u05e2 \u05d0-\u05ea\u05f3\u05d0\u05e0\u05d9",
+                    "\u05d2\u05f3\u05d5\u05de\u05d0\u05d3\u05d0 \u05d0\u05dc-\u05d0\u05d5\u05dc\u05d0",
+                    "\u05d2\u05f3\u05d5\u05de\u05d0\u05d3\u05d0 \u05d0-\u05ea\u05f3\u05d0\u05e0\u05d9\u05d4",
+                    "\u05e8\u05d2\u05f3\u05d1",
                     "\u05e9\u05e2\u05d1\u05d0\u05df",
-                    "\u05e8\u05d0\u05de\u05d3\u05df",
+                    "\u05e8\u05de\u05d3\u05d0\u05df",
                     "\u05e9\u05d5\u05d5\u05d0\u05dc",
-                    "\u05d6\u05d5 \u05d0\u05dc-QI'DAH",
-                    "\u05d6\u05d5 \u05d0\u05dc-\u05d7\u05d9\u05d2\u05f3\u05d4",
+                    "\u05d3\u05f3\u05d5 \u05d0\u05dc\u05be\u05e7\u05e2\u05d3\u05d4",
+                    "\u05d3\u05f3\u05d5 \u05d0\u05dc\u05be\u05d7\u05d9\u05d2\u05f3\u05d4",
                     "",
                 }
             },
+            { "islamic.QuarterAbbreviations",
+                new String[] {
+                    "\u05e8\u05d1\u05e2\u05d5\u05df 1",
+                    "\u05e8\u05d1\u05e2\u05d5\u05df 2",
+                    "\u05e8\u05d1\u05e2\u05d5\u05df 3",
+                    "\u05e8\u05d1\u05e2\u05d5\u05df 4",
+                }
+            },
+            { "islamic.QuarterNames",
+                new String[] {
+                    "\u05e8\u05d1\u05e2\u05d5\u05df 1",
+                    "\u05e8\u05d1\u05e2\u05d5\u05df 2",
+                    "\u05e8\u05d1\u05e2\u05d5\u05df 3",
+                    "\u05e8\u05d1\u05e2\u05d5\u05df 4",
+                }
+            },
+            { "islamic.QuarterNarrows",
+                new String[] {
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                }
+            },
+            { "islamic.TimePatterns",
+                new String[] {
+                    "H:mm:ss zzzz",
+                    "H:mm:ss z",
+                    "H:mm:ss",
+                    "H:mm",
+                }
+            },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u05dc\u05e4\u05e0\u05d4\u05f4\u05e6",
+                    "\u05d0\u05d7\u05d4\u05f4\u05e6",
+                }
+            },
+            { "islamic.long.Eras",
+                new String[] {
+                    "",
+                    "\u05e9\u05e0\u05ea \u05d4\u05d9\u05d2\u05f3\u05e8\u05d4",
+                }
+            },
+            { "islamic.narrow.Eras",
+                new String[] {
+                    "",
+                    "\u05e9\u05e0\u05ea \u05d4\u05d9\u05d2\u05f3\u05e8\u05d4",
+                }
+            },
             { "islamic.short.Eras",
                 new String[] {
                     "",
                     "\u05e9\u05e0\u05ea \u05d4\u05d9\u05d2\u05f3\u05e8\u05d4",
                 }
             },
+            { "java.time.buddhist.DatePatterns",
+                new String[] {
+                    "EEEE, d \u05d1MMMM y G",
+                    "d \u05d1MMMM y G",
+                    "d \u05d1MMM y G",
+                    "d.M.y GGGGG",
+                }
+            },
+            { "java.time.islamic.DatePatterns",
+                new String[] {
+                    "EEEE, d \u05d1MMMM y G",
+                    "d \u05d1MMMM y G",
+                    "d \u05d1MMM y G",
+                    "dd/MM/yy GGGGG",
+                }
+            },
+            { "java.time.japanese.DatePatterns",
+                new String[] {
+                    "EEEE, d \u05d1MMMM y G",
+                    "d \u05d1MMMM y G",
+                    "d \u05d1MMM y G",
+                    "d.M.y GGGGG",
+                }
+            },
             { "java.time.long.Eras",
                 new String[] {
                     "\u05dc\u05e4\u05e0\u05d9 \u05d4\u05e1\u05e4\u05d9\u05e8\u05d4",
                     "\u05dc\u05e1\u05e4\u05d9\u05e8\u05d4",
                 }
             },
+            { "java.time.roc.DatePatterns",
+                new String[] {
+                    "EEEE, d \u05d1MMMM y G",
+                    "d \u05d1MMMM y G",
+                    "d \u05d1MMM y G",
+                    "d.M.y GGGGG",
+                }
+            },
             { "java.time.short.Eras",
                 new String[] {
                     "\u05dc\u05e1\u05d4\"\u05e0",
                     "\u05dc\u05e4\u05e1\u05d4\"\u05e0",
                 }
             },
+            { "roc.AmPmMarkers",
+                new String[] {
+                    "\u05dc\u05e4\u05e0\u05d4\u05f4\u05e6",
+                    "\u05d0\u05d7\u05d4\u05f4\u05e6",
+                }
+            },
+            { "roc.DatePatterns",
+                new String[] {
+                    "EEEE, d \u05d1MMMM y GGGG",
+                    "d \u05d1MMMM y GGGG",
+                    "d \u05d1MMM y GGGG",
+                    "d.M.y G",
+                }
+            },
+            { "roc.DayAbbreviations",
+                new String[] {
+                    "\u05d9\u05d5\u05dd \u05d0\u05f3",
+                    "\u05d9\u05d5\u05dd \u05d1\u05f3",
+                    "\u05d9\u05d5\u05dd \u05d2\u05f3",
+                    "\u05d9\u05d5\u05dd \u05d3\u05f3",
+                    "\u05d9\u05d5\u05dd \u05d4\u05f3",
+                    "\u05d9\u05d5\u05dd \u05d5\u05f3",
+                    "\u05e9\u05d1\u05ea",
+                }
+            },
+            { "roc.DayNames",
+                new String[] {
+                    "\u05d9\u05d5\u05dd \u05e8\u05d0\u05e9\u05d5\u05df",
+                    "\u05d9\u05d5\u05dd \u05e9\u05e0\u05d9",
+                    "\u05d9\u05d5\u05dd \u05e9\u05dc\u05d9\u05e9\u05d9",
+                    "\u05d9\u05d5\u05dd \u05e8\u05d1\u05d9\u05e2\u05d9",
+                    "\u05d9\u05d5\u05dd \u05d7\u05de\u05d9\u05e9\u05d9",
+                    "\u05d9\u05d5\u05dd \u05e9\u05d9\u05e9\u05d9",
+                    "\u05d9\u05d5\u05dd \u05e9\u05d1\u05ea",
+                }
+            },
+            { "roc.DayNarrows",
+                new String[] {
+                    "\u05d0\u05f3",
+                    "\u05d1\u05f3",
+                    "\u05d2\u05f3",
+                    "\u05d3\u05f3",
+                    "\u05d4\u05f3",
+                    "\u05d5\u05f3",
+                    "\u05e9\u05f3",
+                }
+            },
+            { "roc.MonthAbbreviations",
+                new String[] {
+                    "\u05d9\u05e0\u05d5\u05f3",
+                    "\u05e4\u05d1\u05e8\u05f3",
+                    "\u05de\u05e8\u05e5",
+                    "\u05d0\u05e4\u05e8\u05f3",
+                    "\u05de\u05d0\u05d9",
+                    "\u05d9\u05d5\u05e0\u05d9",
+                    "\u05d9\u05d5\u05dc\u05d9",
+                    "\u05d0\u05d5\u05d2\u05f3",
+                    "\u05e1\u05e4\u05d8\u05f3",
+                    "\u05d0\u05d5\u05e7\u05f3",
+                    "\u05e0\u05d5\u05d1\u05f3",
+                    "\u05d3\u05e6\u05de\u05f3",
+                    "",
+                }
+            },
+            { "roc.MonthNames",
+                new String[] {
+                    "\u05d9\u05e0\u05d5\u05d0\u05e8",
+                    "\u05e4\u05d1\u05e8\u05d5\u05d0\u05e8",
+                    "\u05de\u05e8\u05e5",
+                    "\u05d0\u05e4\u05e8\u05d9\u05dc",
+                    "\u05de\u05d0\u05d9",
+                    "\u05d9\u05d5\u05e0\u05d9",
+                    "\u05d9\u05d5\u05dc\u05d9",
+                    "\u05d0\u05d5\u05d2\u05d5\u05e1\u05d8",
+                    "\u05e1\u05e4\u05d8\u05de\u05d1\u05e8",
+                    "\u05d0\u05d5\u05e7\u05d8\u05d5\u05d1\u05e8",
+                    "\u05e0\u05d5\u05d1\u05de\u05d1\u05e8",
+                    "\u05d3\u05e6\u05de\u05d1\u05e8",
+                    "",
+                }
+            },
+            { "roc.MonthNarrows",
+                new String[] {
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5",
+                    "6",
+                    "7",
+                    "8",
+                    "9",
+                    "10",
+                    "11",
+                    "12",
+                    "",
+                }
+            },
+            { "roc.QuarterAbbreviations",
+                new String[] {
+                    "\u05e8\u05d1\u05e2\u05d5\u05df 1",
+                    "\u05e8\u05d1\u05e2\u05d5\u05df 2",
+                    "\u05e8\u05d1\u05e2\u05d5\u05df 3",
+                    "\u05e8\u05d1\u05e2\u05d5\u05df 4",
+                }
+            },
+            { "roc.QuarterNames",
+                new String[] {
+                    "\u05e8\u05d1\u05e2\u05d5\u05df 1",
+                    "\u05e8\u05d1\u05e2\u05d5\u05df 2",
+                    "\u05e8\u05d1\u05e2\u05d5\u05df 3",
+                    "\u05e8\u05d1\u05e2\u05d5\u05df 4",
+                }
+            },
+            { "roc.TimePatterns",
+                new String[] {
+                    "H:mm:ss zzzz",
+                    "H:mm:ss z",
+                    "H:mm:ss",
+                    "H:mm",
+                }
+            },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u05dc\u05e4\u05e0\u05d4\u05f4\u05e6",
+                    "\u05d0\u05d7\u05d4\u05f4\u05e6",
+                }
+            },
+            { "roc.narrow.AmPmMarkers",
+                new String[] {
+                    "\u05dc\u05e4\u05e0\u05d4\u05f4\u05e6",
+                    "\u05d0\u05d7\u05d4\u05f4\u05e6",
+                }
+            },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_iw_IL.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_iw_IL.java
deleted file mode 100644
index 736517c3b47..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_iw_IL.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-/*
- * COPYRIGHT AND PERMISSION NOTICE
- *
- * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
- * the Terms of Use in http://www.unicode.org/copyright.html.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of the Unicode data files and any associated documentation (the "Data
- * Files") or Unicode software and any associated documentation (the
- * "Software") to deal in the Data Files or Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Data Files or Software, and
- * to permit persons to whom the Data Files or Software are furnished to do so,
- * provided that (a) the above copyright notice(s) and this permission notice
- * appear with all copies of the Data Files or Software, (b) both the above
- * copyright notice(s) and this permission notice appear in associated
- * documentation, and (c) there is clear notice in each modified Data File or
- * in the Software as well as in the documentation associated with the Data
- * File(s) or Software that the data or software has been modified.
- *
- * THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
- * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
- * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
- * CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THE DATA FILES OR SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder shall not
- * be used in advertising or otherwise to promote the sale, use or other
- * dealings in these Data Files or Software without prior written authorization
- * of the copyright holder.
- */
-
-//  Note: this file has been generated by a tool.
-
-package sun.text.resources.ext;
-
-import sun.util.resources.OpenListResourceBundle;
-
-public class JavaTimeSupplementary_iw_IL extends OpenListResourceBundle {
-    @Override
-    protected final Object[][] getContents() {
-        return new Object[][] {
-            { "QuarterNames",
-                new String[] {
-                    "\u05e8\u05d1\u05e2\u05d5\u05df 1",
-                    "\u05e8\u05d1\u05e2\u05d5\u05df 2",
-                    "\u05e8\u05d1\u05e2\u05d5\u05df 3",
-                    "\u05e8\u05d1\u05e2\u05d5\u05df 4",
-                }
-            },
-            { "QuarterNarrows",
-                new String[] {
-                    "1",
-                    "2",
-                    "3",
-                    "4",
-                }
-            },
-            { "calendarname.buddhist",
-                "\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05d1\u05d5\u05d3\u05d4\u05d9\u05e1\u05d8\u05d9" },
-            { "calendarname.gregorian",
-                "\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05d2\u05e8\u05d2\u05d5\u05e8\u05d9\u05d0\u05e0\u05d9" },
-            { "calendarname.gregory",
-                "\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05d2\u05e8\u05d2\u05d5\u05e8\u05d9\u05d0\u05e0\u05d9" },
-            { "calendarname.islamic",
-                "\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05de\u05d5\u05e1\u05dc\u05de\u05d9" },
-            { "calendarname.islamic-civil",
-                "\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05de\u05d5\u05e1\u05dc\u05de\u05d9-\u05d0\u05d6\u05e8\u05d7\u05d9" },
-            { "calendarname.islamicc",
-                "\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05de\u05d5\u05e1\u05dc\u05de\u05d9-\u05d0\u05d6\u05e8\u05d7\u05d9" },
-            { "calendarname.japanese",
-                "\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05d9\u05e4\u05e0\u05d9" },
-            { "calendarname.roc",
-                "\u05dc\u05d5\u05d7 \u05d4\u05e9\u05e0\u05d4 \u05d4\u05e1\u05d9\u05e0\u05d9 Minguo" },
-            { "field.dayperiod",
-                "\u05dc\u05e4\u05d4\u05f4\u05e6/\u05d0\u05d7\u05d4\u05f4\u05e6" },
-            { "field.era",
-                "\u05ea\u05e7\u05d5\u05e4\u05d4" },
-            { "field.hour",
-                "\u05e9\u05e2\u05d4" },
-            { "field.minute",
-                "\u05d3\u05e7\u05d4" },
-            { "field.month",
-                "\u05d7\u05d5\u05d3\u05e9" },
-            { "field.second",
-                "\u05e9\u05e0\u05d9\u05d9\u05d4" },
-            { "field.week",
-                "\u05e9\u05d1\u05d5\u05e2" },
-            { "field.weekday",
-                "\u05d9\u05d5\u05dd \u05d1\u05e9\u05d1\u05d5\u05e2" },
-            { "field.year",
-                "\u05e9\u05e0\u05d4" },
-            { "field.zone",
-                "\u05d0\u05d6\u05d5\u05e8" },
-            { "islamic.Eras",
-                new String[] {
-                    "",
-                    "\u05e9\u05e0\u05ea \u05d4\u05d9\u05d2\u05f3\u05e8\u05d4",
-                }
-            },
-            { "islamic.MonthNames",
-                new String[] {
-                    "\u05de\u05d5\u05d7\u05e8\u05dd",
-                    "\u05e1\u05e4\u05e8",
-                    "\u05e8\u05d1\u05d9\u05e2 \u05d0\u05dc-\u05d0\u05d5\u05d5\u05d0\u05dc",
-                    "\u05e8\u05d1\u05d9\u05e2 \u05d0\u05dc-\u05ea\u05e0\u05d9",
-                    "\u05d2\u05f3\u05d5\u05de\u05d3\u05d4 \u05d0\u05dc-\u05d0\u05d5\u05d5\u05d0\u05dc",
-                    "\u05d2\u05f3\u05d5\u05de\u05d3\u05d4 \u05d0\u05dc-\u05ea\u05e0\u05d9",
-                    "\u05e8\u05d2\u05f3\u05d0\u05d1",
-                    "\u05e9\u05e2\u05d1\u05d0\u05df",
-                    "\u05e8\u05d0\u05de\u05d3\u05df",
-                    "\u05e9\u05d5\u05d5\u05d0\u05dc",
-                    "\u05d6\u05d5 \u05d0\u05dc-QI'DAH",
-                    "\u05d6\u05d5 \u05d0\u05dc-\u05d7\u05d9\u05d2\u05f3\u05d4",
-                    "",
-                }
-            },
-            { "islamic.short.Eras",
-                new String[] {
-                    "",
-                    "\u05e9\u05e0\u05ea \u05d4\u05d9\u05d2\u05f3\u05e8\u05d4",
-                }
-            },
-            { "java.time.long.Eras",
-                new String[] {
-                    "\u05dc\u05e4\u05e0\u05d9 \u05d4\u05e1\u05e4\u05d9\u05e8\u05d4",
-                    "\u05dc\u05e1\u05e4\u05d9\u05e8\u05d4",
-                }
-            },
-            { "java.time.short.Eras",
-                new String[] {
-                    "\u05dc\u05e4\u05e0\u05d4\u05f4\u05e1",
-                    "\u05dc\u05e1\u05d4\u05f4\u05e0",
-                }
-            },
-        };
-    }
-}
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ja.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ja.java
index b2e62a7abda..82778f5e75e 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ja.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ja.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -240,6 +240,12 @@ public class JavaTimeSupplementary_ja extends OpenListResourceBundle {
                     "H:mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u5348\u524d",
+                    "\u5348\u5f8c",
+                }
+            },
             { "islamic.long.Eras",
                 new String[] {
                     "",
@@ -458,6 +464,12 @@ public class JavaTimeSupplementary_ja extends OpenListResourceBundle {
                     "H:mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u5348\u524d",
+                    "\u5348\u5f8c",
+                }
+            },
             { "roc.long.Eras",
                 new String[] {
                     "\u6c11\u56fd\u524d",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ko.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ko.java
index c5a038fa1c4..4257fba3582 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ko.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ko.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -184,6 +184,23 @@ public class JavaTimeSupplementary_ko extends OpenListResourceBundle {
                     "AH",
                 }
             },
+            { "islamic.MonthNames",
+                new String[] {
+                    "\ubb34\ud558\ub78c",
+                    "\uc0ac\ud30c\ub974",
+                    "\ub77c\ube44 \uc54c \uc544\uc648",
+                    "\ub77c\ube44 \uc54c \uc384\ub2c8",
+                    "\uc8fc\ub9c8\ub2e4 \uc54c \uc544\uc648",
+                    "\uc8fc\ub9c8\ub2e4 \uc54c \uc384\ub2c8",
+                    "\ub77c\uc7a1",
+                    "\uc250\uc544\ubc18",
+                    "\ub77c\ub9c8\ub2e8",
+                    "\uc250\uc648",
+                    "\ub4c0 \uc54c \uae4c\ub2e4",
+                    "\ub4c0 \uc54c \ud788\uc790",
+                    "",
+                }
+            },
             { "islamic.QuarterAbbreviations",
                 new String[] {
                     "1\ubd84\uae30",
@@ -224,8 +241,8 @@ public class JavaTimeSupplementary_ko extends OpenListResourceBundle {
             },
             { "islamic.narrow.AmPmMarkers",
                 new String[] {
-                    "\uc624\uc804",
-                    "\uc624\ud6c4",
+                    "AM",
+                    "PM",
                 }
             },
             { "islamic.narrow.Eras",
@@ -434,8 +451,8 @@ public class JavaTimeSupplementary_ko extends OpenListResourceBundle {
             },
             { "roc.narrow.AmPmMarkers",
                 new String[] {
-                    "\uc624\uc804",
-                    "\uc624\ud6c4",
+                    "AM",
+                    "PM",
                 }
             },
             { "roc.narrow.Eras",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lt.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lt.java
index d8fdbe5d8a9..715beb1317f 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lt.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -106,23 +106,25 @@ public class JavaTimeSupplementary_lt extends OpenListResourceBundle {
             { "calendarname.roc",
                 "Kinijos Respublikos kalendorius" },
             { "field.dayperiod",
-                "Iki piet\u0173 / po piet\u0173" },
+                "iki piet\u0173 / po piet\u0173" },
+            { "field.era",
+                "era" },
             { "field.hour",
-                "Valanda" },
+                "valanda" },
             { "field.minute",
-                "Minut\u0117" },
+                "minut\u0117" },
             { "field.month",
-                "M\u0117nuo" },
+                "m\u0117nuo" },
             { "field.second",
-                "Sekund\u0117" },
+                "sekund\u0117" },
             { "field.week",
-                "Savait\u0117" },
+                "savait\u0117" },
             { "field.weekday",
-                "Savait\u0117s diena" },
+                "savait\u0117s diena" },
             { "field.year",
-                "Metai" },
+                "metai" },
             { "field.zone",
-                "Laiko juosta" },
+                "laiko juosta" },
             { "islamic.AmPmMarkers",
                 new String[] {
                     "prie\u0161piet",
@@ -208,6 +210,12 @@ public class JavaTimeSupplementary_lt extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "prie\u0161piet",
+                    "popiet",
+                }
+            },
             { "islamic.long.Eras",
                 new String[] {
                     "",
@@ -216,7 +224,7 @@ public class JavaTimeSupplementary_lt extends OpenListResourceBundle {
             },
             { "islamic.narrow.AmPmMarkers",
                 new String[] {
-                    "pr.p.",
+                    "pr. p.",
                     "pop.",
                 }
             },
@@ -434,6 +442,12 @@ public class JavaTimeSupplementary_lt extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "prie\u0161piet",
+                    "popiet",
+                }
+            },
             { "roc.long.Eras",
                 new String[] {
                     "Prie\u0161 R.O.C.",
@@ -442,7 +456,7 @@ public class JavaTimeSupplementary_lt extends OpenListResourceBundle {
             },
             { "roc.narrow.AmPmMarkers",
                 new String[] {
-                    "pr.p.",
+                    "pr. p.",
                     "pop.",
                 }
             },
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lv.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lv.java
index 0ebd5fc2b9f..c1563a0d0e0 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lv.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lv.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -112,25 +112,25 @@ public class JavaTimeSupplementary_lv extends OpenListResourceBundle {
             { "calendarname.roc",
                 "\u0136\u012bnas Republikas kalend\u0101rs" },
             { "field.dayperiod",
-                "Priek\u0161pusdien\u0101/p\u0113cpusdien\u0101" },
+                "priek\u0161pusdien\u0101/p\u0113cpusdien\u0101" },
             { "field.era",
-                "\u0112ra" },
+                "\u0113ra" },
             { "field.hour",
-                "Stundas" },
+                "stundas" },
             { "field.minute",
-                "Min\u016btes" },
+                "min\u016btes" },
             { "field.month",
-                "M\u0113nesis" },
+                "m\u0113nesis" },
             { "field.second",
-                "Sekundes" },
+                "sekundes" },
             { "field.week",
                 "ned\u0113\u013ca" },
             { "field.weekday",
                 "ned\u0113\u013cas diena" },
             { "field.year",
-                "Gads" },
+                "gads" },
             { "field.zone",
-                "Laika josla" },
+                "laika josla" },
             { "islamic.AmPmMarkers",
                 new String[] {
                     "priek\u0161pusdien\u0101",
@@ -227,6 +227,12 @@ public class JavaTimeSupplementary_lv extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "priek\u0161p.",
+                    "p\u0113cp.",
+                }
+            },
             { "islamic.narrow.AmPmMarkers",
                 new String[] {
                     "priek\u0161p.",
@@ -407,6 +413,12 @@ public class JavaTimeSupplementary_lv extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "priek\u0161p.",
+                    "p\u0113cp.",
+                }
+            },
             { "roc.narrow.AmPmMarkers",
                 new String[] {
                     "priek\u0161p.",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_mk.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_mk.java
index 1e0308452fc..7c58129b0a1 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_mk.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_mk.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -102,27 +102,27 @@ public class JavaTimeSupplementary_mk extends OpenListResourceBundle {
             { "calendarname.japanese",
                 "\u0408\u0430\u043f\u043e\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
             { "calendarname.roc",
-                "\u041a\u0430\u043b\u0435\u043d\u0434\u0430\u0440 \u043d\u0430 \u0420\u0435\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u0438\u043d\u0430" },
+                "\u041c\u0438\u043d\u0433\u0443\u043e-\u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
             { "field.dayperiod",
                 "\u043f\u0440\u0435\u0442\u043f\u043b\u0430\u0434\u043d\u0435/\u043f\u043e\u043f\u043b\u0430\u0434\u043d\u0435" },
             { "field.era",
-                "\u0415\u0440\u0430" },
+                "\u0435\u0440\u0430" },
             { "field.hour",
-                "\u0427\u0430\u0441" },
+                "\u0447\u0430\u0441" },
             { "field.minute",
-                "\u041c\u0438\u043d\u0443\u0442\u0430" },
+                "\u043c\u0438\u043d\u0443\u0442\u0430" },
             { "field.month",
-                "\u041c\u0435\u0441\u0435\u0446" },
+                "\u043c\u0435\u0441\u0435\u0446" },
             { "field.second",
-                "\u0421\u0435\u043a\u0443\u043d\u0434\u0430" },
+                "\u0441\u0435\u043a\u0443\u043d\u0434\u0430" },
             { "field.week",
-                "\u041d\u0435\u0434\u0435\u043b\u0430" },
+                "\u043d\u0435\u0434\u0435\u043b\u0430" },
             { "field.weekday",
-                "\u0414\u0435\u043d \u0432\u043e \u043d\u0435\u0434\u0435\u043b\u0430\u0442\u0430" },
+                "\u0434\u0435\u043d \u0432\u043e \u043d\u0435\u0434\u0435\u043b\u0430\u0442\u0430" },
             { "field.year",
                 "\u0433\u043e\u0434\u0438\u043d\u0430" },
             { "field.zone",
-                "\u0437\u043e\u043d\u0430" },
+                "\u0432\u0440\u0435\u043c\u0435\u043d\u0441\u043a\u0430 \u0437\u043e\u043d\u0430" },
             { "islamic.AmPmMarkers",
                 new String[] {
                     "\u043f\u0440\u0435\u0442\u043f\u043b\u0430\u0434\u043d\u0435",
@@ -202,6 +202,12 @@ public class JavaTimeSupplementary_mk extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u043f\u0440\u0435\u0442\u043f\u043b\u0430\u0434\u043d\u0435",
+                    "\u043f\u043e\u043f\u043b\u0430\u0434\u043d\u0435",
+                }
+            },
             { "islamic.narrow.AmPmMarkers",
                 new String[] {
                     "\u043f\u0440\u0435\u0442.",
@@ -374,6 +380,12 @@ public class JavaTimeSupplementary_mk extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u043f\u0440\u0435\u0442\u043f\u043b\u0430\u0434\u043d\u0435",
+                    "\u043f\u043e\u043f\u043b\u0430\u0434\u043d\u0435",
+                }
+            },
             { "roc.narrow.AmPmMarkers",
                 new String[] {
                     "\u043f\u0440\u0435\u0442.",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ms.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ms.java
index d672c1db720..8c4d4fe05c9 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ms.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ms.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -206,12 +206,24 @@ public class JavaTimeSupplementary_ms extends OpenListResourceBundle {
                     "h:mm a",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "PG",
+                    "PTG",
+                }
+            },
             { "islamic.long.Eras",
                 new String[] {
                     "",
                     "AH",
                 }
             },
+            { "islamic.narrow.AmPmMarkers",
+                new String[] {
+                    "a",
+                    "p",
+                }
+            },
             { "islamic.narrow.Eras",
                 new String[] {
                     "",
@@ -402,6 +414,18 @@ public class JavaTimeSupplementary_ms extends OpenListResourceBundle {
                     "h:mm a",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "PG",
+                    "PTG",
+                }
+            },
+            { "roc.narrow.AmPmMarkers",
+                new String[] {
+                    "a",
+                    "p",
+                }
+            },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_mt.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_mt.java
index 5f1fafc114b..d345b43d15f 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_mt.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_mt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -119,6 +119,12 @@ public class JavaTimeSupplementary_mt extends OpenListResourceBundle {
                 "Sena" },
             { "field.zone",
                 "\u017bona" },
+            { "islamic.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
             { "islamic.DatePatterns",
                 new String[] {
                     "EEEE, d 'ta'\u2019 MMMM y GGGG",
@@ -228,6 +234,12 @@ public class JavaTimeSupplementary_mt extends OpenListResourceBundle {
                     "WK",
                 }
             },
+            { "roc.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
             { "roc.DatePatterns",
                 new String[] {
                     "EEEE, d 'ta'\u2019 MMMM y GGGG",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_nl.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_nl.java
index 252d1d4600f..37de600827e 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_nl.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_nl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -108,19 +108,23 @@ public class JavaTimeSupplementary_nl extends OpenListResourceBundle {
             { "field.dayperiod",
                 "a.m./p.m." },
             { "field.era",
-                "Tijdperk" },
+                "tijdperk" },
             { "field.hour",
                 "Uur" },
             { "field.minute",
-                "Minuut" },
+                "minuut" },
             { "field.month",
-                "Maand" },
+                "maand" },
             { "field.second",
-                "Seconde" },
+                "seconde" },
+            { "field.week",
+                "week" },
             { "field.weekday",
-                "Dag van de week" },
+                "dag van de week" },
             { "field.year",
-                "Jaar" },
+                "jaar" },
+            { "field.zone",
+                "tijdzone" },
             { "islamic.AmPmMarkers",
                 new String[] {
                     "a.m.",
@@ -240,6 +244,12 @@ public class JavaTimeSupplementary_nl extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "a.m.",
+                    "p.m.",
+                }
+            },
             { "islamic.long.Eras",
                 new String[] {
                     "",
@@ -300,6 +310,24 @@ public class JavaTimeSupplementary_nl extends OpenListResourceBundle {
                     "dd-MM-yy GGGGG",
                 }
             },
+            { "java.time.japanese.long.Eras",
+                new String[] {
+                    "na Christus",
+                    "Meiji",
+                    "Taish\u014d",
+                    "Sh\u014dwa",
+                    "Heisei",
+                }
+            },
+            { "java.time.japanese.short.Eras",
+                new String[] {
+                    "n.Chr.",
+                    "Meiji",
+                    "Taish\u014d",
+                    "Sh\u014dwa",
+                    "Heisei",
+                }
+            },
             { "java.time.long.Eras",
                 new String[] {
                     "voor Christus",
@@ -369,7 +397,7 @@ public class JavaTimeSupplementary_nl extends OpenListResourceBundle {
             },
             { "roc.Eras",
                 new String[] {
-                    "Before R.O.C.",
+                    "voor R.O.C.",
                     "Minguo",
                 }
             },
@@ -448,9 +476,15 @@ public class JavaTimeSupplementary_nl extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "a.m.",
+                    "p.m.",
+                }
+            },
             { "roc.long.Eras",
                 new String[] {
-                    "Before R.O.C.",
+                    "voor R.O.C.",
                     "Minguo",
                 }
             },
@@ -462,13 +496,13 @@ public class JavaTimeSupplementary_nl extends OpenListResourceBundle {
             },
             { "roc.narrow.Eras",
                 new String[] {
-                    "Before R.O.C.",
+                    "voor R.O.C.",
                     "Minguo",
                 }
             },
             { "roc.short.Eras",
                 new String[] {
-                    "Before R.O.C.",
+                    "voor R.O.C.",
                     "Minguo",
                 }
             },
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_no.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_no.java
index 7f80e373735..8b11d758775 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_no.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_no.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -89,6 +89,14 @@ public class JavaTimeSupplementary_no extends OpenListResourceBundle {
                     "4. kvartal",
                 }
             },
+            { "QuarterNarrows",
+                new String[] {
+                    "1.",
+                    "2.",
+                    "3.",
+                    "4.",
+                }
+            },
             { "calendarname.buddhist",
                 "buddhistisk kalender" },
             { "calendarname.gregorian",
@@ -98,7 +106,7 @@ public class JavaTimeSupplementary_no extends OpenListResourceBundle {
             { "calendarname.islamic",
                 "islamsk kalender" },
             { "calendarname.islamic-civil",
-                "islamsk sivil kalender" },
+                "islamsk kalender (tabell, sivil)" },
             { "calendarname.islamic-umalqura",
                 "islamsk kalender (Umm al-Qura)" },
             { "calendarname.japanese",
@@ -108,23 +116,23 @@ public class JavaTimeSupplementary_no extends OpenListResourceBundle {
             { "field.dayperiod",
                 "AM/PM" },
             { "field.era",
-                "Tidsalder" },
+                "tidsalder" },
             { "field.hour",
-                "Time" },
+                "time" },
             { "field.minute",
-                "Minutt" },
+                "minutt" },
             { "field.month",
-                "M\u00e5ned" },
+                "m\u00e5ned" },
             { "field.second",
-                "Sekund" },
+                "sekund" },
             { "field.week",
-                "Uke" },
+                "uke" },
             { "field.weekday",
-                "Ukedag" },
+                "ukedag" },
             { "field.year",
-                "\u00c5r" },
+                "\u00e5r" },
             { "field.zone",
-                "Tidssone" },
+                "tidssone" },
             { "islamic.AmPmMarkers",
                 new String[] {
                     "a.m.",
@@ -178,6 +186,40 @@ public class JavaTimeSupplementary_no extends OpenListResourceBundle {
                     "AH",
                 }
             },
+            { "islamic.MonthAbbreviations",
+                new String[] {
+                    "muh.",
+                    "saf.",
+                    "rab. I",
+                    "rab. II",
+                    "jum. I",
+                    "jum. II",
+                    "raj.",
+                    "sha.",
+                    "ram.",
+                    "shaw.",
+                    "dhu\u02bbl-q.",
+                    "dhu\u02bbl-h.",
+                    "",
+                }
+            },
+            { "islamic.MonthNames",
+                new String[] {
+                    "muharram",
+                    "safar",
+                    "rabi\u02bb I",
+                    "rabi\u02bb II",
+                    "jumada I",
+                    "jumada II",
+                    "rajab",
+                    "sha\u02bbban",
+                    "ramadan",
+                    "shawwal",
+                    "dhu\u02bbl-qi\u02bbdah",
+                    "dhu\u02bbl-hijjah",
+                    "",
+                }
+            },
             { "islamic.QuarterAbbreviations",
                 new String[] {
                     "K1",
@@ -196,10 +238,10 @@ public class JavaTimeSupplementary_no extends OpenListResourceBundle {
             },
             { "islamic.QuarterNarrows",
                 new String[] {
-                    "1",
-                    "2",
-                    "3",
-                    "4",
+                    "1.",
+                    "2.",
+                    "3.",
+                    "4.",
                 }
             },
             { "islamic.TimePatterns",
@@ -210,12 +252,24 @@ public class JavaTimeSupplementary_no extends OpenListResourceBundle {
                     "HH.mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "a.m.",
+                    "p.m.",
+                }
+            },
             { "islamic.long.Eras",
                 new String[] {
                     "",
                     "AH",
                 }
             },
+            { "islamic.narrow.AmPmMarkers",
+                new String[] {
+                    "a",
+                    "p",
+                }
+            },
             { "islamic.narrow.Eras",
                 new String[] {
                     "",
@@ -264,10 +318,28 @@ public class JavaTimeSupplementary_no extends OpenListResourceBundle {
                     "d.M y G",
                 }
             },
+            { "java.time.japanese.long.Eras",
+                new String[] {
+                    "etter Kristus",
+                    "Meiji",
+                    "Taish\u014d",
+                    "Sh\u014dwa",
+                    "Heisei",
+                }
+            },
+            { "java.time.japanese.short.Eras",
+                new String[] {
+                    "e.Kr.",
+                    "M",
+                    "T",
+                    "S",
+                    "H",
+                }
+            },
             { "java.time.long.Eras",
                 new String[] {
-                    "f.Kr.",
-                    "e.Kr.",
+                    "f\u00f8r Kristus",
+                    "etter Kristus",
                 }
             },
             { "java.time.roc.DatePatterns",
@@ -404,6 +476,14 @@ public class JavaTimeSupplementary_no extends OpenListResourceBundle {
                     "4. kvartal",
                 }
             },
+            { "roc.QuarterNarrows",
+                new String[] {
+                    "1.",
+                    "2.",
+                    "3.",
+                    "4.",
+                }
+            },
             { "roc.TimePatterns",
                 new String[] {
                     "HH.mm.ss zzzz",
@@ -412,12 +492,24 @@ public class JavaTimeSupplementary_no extends OpenListResourceBundle {
                     "HH.mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "a.m.",
+                    "p.m.",
+                }
+            },
             { "roc.long.Eras",
                 new String[] {
                     "Before R.O.C.",
                     "Minguo",
                 }
             },
+            { "roc.narrow.AmPmMarkers",
+                new String[] {
+                    "a",
+                    "p",
+                }
+            },
             { "roc.narrow.Eras",
                 new String[] {
                     "Before R.O.C.",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pl.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pl.java
index a66682b9c9c..db8728fa0fc 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pl.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -129,6 +129,12 @@ public class JavaTimeSupplementary_pl extends OpenListResourceBundle {
                 "rok" },
             { "field.zone",
                 "strefa czasowa" },
+            { "islamic.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
             { "islamic.DatePatterns",
                 new String[] {
                     "EEEE, d MMMM y GGGG",
@@ -236,6 +242,12 @@ public class JavaTimeSupplementary_pl extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "islamic.narrow.AmPmMarkers",
+                new String[] {
+                    "a",
+                    "p",
+                }
+            },
             { "java.time.buddhist.DatePatterns",
                 new String[] {
                     "EEEE, d MMMM y G",
@@ -284,6 +296,12 @@ public class JavaTimeSupplementary_pl extends OpenListResourceBundle {
             },
             { "java.time.short.Eras",
                 javatimelongEras },
+            { "roc.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
             { "roc.DatePatterns",
                 new String[] {
                     "EEEE, d MMMM y GGGG",
@@ -412,6 +430,12 @@ public class JavaTimeSupplementary_pl extends OpenListResourceBundle {
                     "ROC",
                 }
             },
+            { "roc.narrow.AmPmMarkers",
+                new String[] {
+                    "a",
+                    "p",
+                }
+            },
             { "roc.narrow.Eras",
                 new String[] {
                     "Przed ROC",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pt.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pt.java
index 9b36698caa4..b1ae4982b19 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pt.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -105,22 +105,30 @@ public class JavaTimeSupplementary_pt extends OpenListResourceBundle {
                 "Calend\u00e1rio da Rep\u00fablica da China" },
             { "field.dayperiod",
                 "AM/PM" },
+            { "field.era",
+                "era" },
             { "field.hour",
-                "Hora" },
+                "hora" },
             { "field.minute",
-                "Minuto" },
+                "minuto" },
             { "field.month",
-                "M\u00eas" },
+                "m\u00eas" },
             { "field.second",
-                "Segundo" },
+                "segundo" },
             { "field.week",
-                "Semana" },
+                "semana" },
             { "field.weekday",
-                "Dia da semana" },
+                "dia da semana" },
             { "field.year",
-                "Ano" },
+                "ano" },
             { "field.zone",
-                "Fuso hor\u00e1rio" },
+                "fuso hor\u00e1rio" },
+            { "islamic.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
             { "islamic.DatePatterns",
                 new String[] {
                     "EEEE, d 'de' MMMM 'de' y GGGG",
@@ -206,6 +214,12 @@ public class JavaTimeSupplementary_pt extends OpenListResourceBundle {
                     "AH",
                 }
             },
+            { "islamic.narrow.AmPmMarkers",
+                new String[] {
+                    "a",
+                    "p",
+                }
+            },
             { "islamic.narrow.Eras",
                 new String[] {
                     "",
@@ -256,8 +270,8 @@ public class JavaTimeSupplementary_pt extends OpenListResourceBundle {
             },
             { "java.time.long.Eras",
                 new String[] {
-                    "Antes de Cristo",
-                    "Ano do Senhor",
+                    "antes de Cristo",
+                    "depois de Cristo",
                 }
             },
             { "java.time.roc.DatePatterns",
@@ -274,6 +288,12 @@ public class JavaTimeSupplementary_pt extends OpenListResourceBundle {
                     "d.C.",
                 }
             },
+            { "roc.AmPmMarkers",
+                new String[] {
+                    "AM",
+                    "PM",
+                }
+            },
             { "roc.DatePatterns",
                 new String[] {
                     "EEEE, d 'de' MMMM 'de' y GGGG",
@@ -402,6 +422,12 @@ public class JavaTimeSupplementary_pt extends OpenListResourceBundle {
                     "R.O.C.",
                 }
             },
+            { "roc.narrow.AmPmMarkers",
+                new String[] {
+                    "a",
+                    "p",
+                }
+            },
             { "roc.narrow.Eras",
                 new String[] {
                     "Antes de R.O.C.",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pt_PT.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pt_PT.java
index 2063efc3a07..c9c118b4943 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pt_PT.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_pt_PT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -109,10 +109,21 @@ public class JavaTimeSupplementary_pt_PT extends OpenListResourceBundle {
                 new String[] {
                     "GGGG y MMMM d, EEEE",
                     "GGGG y MMMM d",
-                    "d 'de' MMM, y GGGG",
+                    "GGGG y MMM d",
                     "d/M/y GGGG",
                 }
             },
+            { "islamic.DayAbbreviations",
+                new String[] {
+                    "domingo",
+                    "segunda",
+                    "ter\u00e7a",
+                    "quarta",
+                    "quinta",
+                    "sexta",
+                    "s\u00e1bado",
+                }
+            },
             { "islamic.QuarterNames",
                 new String[] {
                     "1.\u00ba trimestre",
@@ -121,6 +132,12 @@ public class JavaTimeSupplementary_pt_PT extends OpenListResourceBundle {
                     "4.\u00ba trimestre",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "a.m.",
+                    "p.m.",
+                }
+            },
             { "islamic.narrow.AmPmMarkers",
                 new String[] {
                     "a.m.",
@@ -131,7 +148,7 @@ public class JavaTimeSupplementary_pt_PT extends OpenListResourceBundle {
                 new String[] {
                     "G y MMMM d, EEEE",
                     "G y MMMM d",
-                    "d 'de' MMM, y G",
+                    "G y MMM d",
                     "d/M/y G",
                 }
             },
@@ -139,7 +156,7 @@ public class JavaTimeSupplementary_pt_PT extends OpenListResourceBundle {
                 new String[] {
                     "G y MMMM d, EEEE",
                     "G y MMMM d",
-                    "d 'de' MMM, y G",
+                    "G y MMM d",
                     "d/M/y G",
                 }
             },
@@ -147,21 +164,15 @@ public class JavaTimeSupplementary_pt_PT extends OpenListResourceBundle {
                 new String[] {
                     "EEEE, d 'de' MMMM 'de' y G",
                     "d 'de' MMMM 'de' y G",
-                    "d 'de' MMM, y G",
+                    "dd/MM/y G",
                     "d/M/y G",
                 }
             },
-            { "java.time.long.Eras",
-                new String[] {
-                    "antes de Cristo",
-                    "depois de Cristo",
-                }
-            },
             { "java.time.roc.DatePatterns",
                 new String[] {
                     "G y MMMM d, EEEE",
                     "G y MMMM d",
-                    "d 'de' MMM, y G",
+                    "G y MMM d",
                     "d/M/y G",
                 }
             },
@@ -175,10 +186,21 @@ public class JavaTimeSupplementary_pt_PT extends OpenListResourceBundle {
                 new String[] {
                     "GGGG y MMMM d, EEEE",
                     "GGGG y MMMM d",
-                    "d 'de' MMM, y GGGG",
+                    "GGGG y MMM d",
                     "d/M/y GGGG",
                 }
             },
+            { "roc.DayAbbreviations",
+                new String[] {
+                    "domingo",
+                    "segunda",
+                    "ter\u00e7a",
+                    "quarta",
+                    "quinta",
+                    "sexta",
+                    "s\u00e1bado",
+                }
+            },
             { "roc.QuarterNames",
                 new String[] {
                     "1.\u00ba trimestre",
@@ -187,6 +209,12 @@ public class JavaTimeSupplementary_pt_PT extends OpenListResourceBundle {
                     "4.\u00ba trimestre",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "a.m.",
+                    "p.m.",
+                }
+            },
             { "roc.narrow.AmPmMarkers",
                 new String[] {
                     "a.m.",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ro.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ro.java
index 5c6ea289612..d12ac5b7b06 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ro.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ro.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -139,13 +139,13 @@ public class JavaTimeSupplementary_ro extends OpenListResourceBundle {
             },
             { "islamic.DayAbbreviations",
                 new String[] {
-                    "Dum",
-                    "Lun",
-                    "Mar",
-                    "Mie",
-                    "Joi",
-                    "Vin",
-                    "S\u00e2m",
+                    "dum.",
+                    "lun.",
+                    "mar.",
+                    "mie.",
+                    "joi",
+                    "vin.",
+                    "s\u00e2m.",
                 }
             },
             { "islamic.DayNames",
@@ -208,6 +208,12 @@ public class JavaTimeSupplementary_ro extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "a.m.",
+                    "p.m.",
+                }
+            },
             { "islamic.long.Eras",
                 new String[] {
                     "",
@@ -304,13 +310,13 @@ public class JavaTimeSupplementary_ro extends OpenListResourceBundle {
             },
             { "roc.DayAbbreviations",
                 new String[] {
-                    "Dum",
-                    "Lun",
-                    "Mar",
-                    "Mie",
-                    "Joi",
-                    "Vin",
-                    "S\u00e2m",
+                    "dum.",
+                    "lun.",
+                    "mar.",
+                    "mie.",
+                    "joi",
+                    "vin.",
+                    "s\u00e2m.",
                 }
             },
             { "roc.DayNames",
@@ -410,6 +416,12 @@ public class JavaTimeSupplementary_ro extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "a.m.",
+                    "p.m.",
+                }
+            },
             { "roc.narrow.AmPmMarkers",
                 new String[] {
                     "a.m.",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ru.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ru.java
index 5cc7887c1e0..977e1b784a3 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ru.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ru.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -108,23 +108,29 @@ public class JavaTimeSupplementary_ru extends OpenListResourceBundle {
             { "field.dayperiod",
                 "\u0414\u041f/\u041f\u041f" },
             { "field.era",
-                "\u042d\u0440\u0430" },
+                "\u044d\u0440\u0430" },
             { "field.hour",
-                "\u0427\u0430\u0441" },
+                "\u0447\u0430\u0441" },
             { "field.minute",
-                "\u041c\u0438\u043d\u0443\u0442\u0430" },
+                "\u043c\u0438\u043d\u0443\u0442\u0430" },
             { "field.month",
-                "\u041c\u0435\u0441\u044f\u0446" },
+                "\u043c\u0435\u0441\u044f\u0446" },
             { "field.second",
-                "\u0421\u0435\u043a\u0443\u043d\u0434\u0430" },
+                "\u0441\u0435\u043a\u0443\u043d\u0434\u0430" },
             { "field.week",
-                "\u041d\u0435\u0434\u0435\u043b\u044f" },
+                "\u043d\u0435\u0434\u0435\u043b\u044f" },
             { "field.weekday",
-                "\u0414\u0435\u043d\u044c \u043d\u0435\u0434\u0435\u043b\u0438" },
+                "\u0434\u0435\u043d\u044c \u043d\u0435\u0434\u0435\u043b\u0438" },
             { "field.year",
-                "\u0413\u043e\u0434" },
+                "\u0433\u043e\u0434" },
             { "field.zone",
-                "\u0427\u0430\u0441\u043e\u0432\u043e\u0439 \u043f\u043e\u044f\u0441" },
+                "\u0447\u0430\u0441\u043e\u0432\u043e\u0439 \u043f\u043e\u044f\u0441" },
+            { "islamic.AmPmMarkers",
+                new String[] {
+                    "\u0414\u041f",
+                    "\u041f\u041f",
+                }
+            },
             { "islamic.DatePatterns",
                 new String[] {
                     "EEEE, d MMMM y '\u0433'. GGGG",
@@ -232,10 +238,16 @@ public class JavaTimeSupplementary_ru extends OpenListResourceBundle {
                     "H:mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u0414\u041f",
+                    "\u041f\u041f",
+                }
+            },
             { "islamic.narrow.AmPmMarkers",
                 new String[] {
-                    "AM",
-                    "PM",
+                    "\u0414\u041f",
+                    "\u041f\u041f",
                 }
             },
             { "java.time.buddhist.DatePatterns",
@@ -276,7 +288,7 @@ public class JavaTimeSupplementary_ru extends OpenListResourceBundle {
             },
             { "java.time.japanese.long.Eras",
                 new String[] {
-                    "\u043d. \u044d.",
+                    "\u043e\u0442 \u0420\u043e\u0436\u0434\u0435\u0441\u0442\u0432\u0430 \u0425\u0440\u0438\u0441\u0442\u043e\u0432\u0430",
                     "\u042d\u043f\u043e\u0445\u0430 \u041c\u044d\u0439\u0434\u0437\u0438",
                     "\u042d\u043f\u043e\u0445\u0430 \u0422\u0430\u0439\u0441\u044c\u043e",
                     "\u0421\u044c\u043e\u0432\u0430",
@@ -294,8 +306,8 @@ public class JavaTimeSupplementary_ru extends OpenListResourceBundle {
             },
             { "java.time.long.Eras",
                 new String[] {
-                    "\u0434\u043e \u043d. \u044d.",
-                    "\u043d. \u044d.",
+                    "\u0434\u043e \u0420\u043e\u0436\u0434\u0435\u0441\u0442\u0432\u0430 \u0425\u0440\u0438\u0441\u0442\u043e\u0432\u0430",
+                    "\u043e\u0442 \u0420\u043e\u0436\u0434\u0435\u0441\u0442\u0432\u0430 \u0425\u0440\u0438\u0441\u0442\u043e\u0432\u0430",
                 }
             },
             { "java.time.roc.DatePatterns",
@@ -312,6 +324,12 @@ public class JavaTimeSupplementary_ru extends OpenListResourceBundle {
                     "\u043d.\u044d.",
                 }
             },
+            { "roc.AmPmMarkers",
+                new String[] {
+                    "\u0414\u041f",
+                    "\u041f\u041f",
+                }
+            },
             { "roc.DatePatterns",
                 new String[] {
                     "EEEE, d MMMM y '\u0433'. GGGG",
@@ -363,11 +381,11 @@ public class JavaTimeSupplementary_ru extends OpenListResourceBundle {
                 new String[] {
                     "\u044f\u043d\u0432.",
                     "\u0444\u0435\u0432\u0440.",
-                    "\u043c\u0430\u0440\u0442\u0430",
+                    "\u043c\u0430\u0440.",
                     "\u0430\u043f\u0440.",
                     "\u043c\u0430\u044f",
-                    "\u0438\u044e\u043d\u044f",
-                    "\u0438\u044e\u043b\u044f",
+                    "\u0438\u044e\u043d.",
+                    "\u0438\u044e\u043b.",
                     "\u0430\u0432\u0433.",
                     "\u0441\u0435\u043d\u0442.",
                     "\u043e\u043a\u0442.",
@@ -434,6 +452,12 @@ public class JavaTimeSupplementary_ru extends OpenListResourceBundle {
                     "H:mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u0414\u041f",
+                    "\u041f\u041f",
+                }
+            },
             { "roc.long.Eras",
                 new String[] {
                     "Before R.O.C.",
@@ -442,8 +466,8 @@ public class JavaTimeSupplementary_ru extends OpenListResourceBundle {
             },
             { "roc.narrow.AmPmMarkers",
                 new String[] {
-                    "AM",
-                    "PM",
+                    "\u0414\u041f",
+                    "\u041f\u041f",
                 }
             },
             { "roc.narrow.Eras",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sk.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sk.java
index a3accc1992c..5da8b943720 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sk.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sk.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -117,15 +117,15 @@ public class JavaTimeSupplementary_sk extends OpenListResourceBundle {
                 "\u010dasov\u00e9 p\u00e1smo" },
             { "islamic.AmPmMarkers",
                 new String[] {
-                    "dopoludnia",
-                    "odpoludnia",
+                    "AM",
+                    "PM",
                 }
             },
             { "islamic.DatePatterns",
                 new String[] {
-                    "EEEE, d. MMMM y GGGG",
-                    "d. MMMM y GGGG",
-                    "d.M.y GGGG",
+                    "EEEE, d. M. y GGGG",
+                    "d. M. y GGGG",
+                    "d. M. y GGGG",
                     "d.M.y G",
                 }
             },
@@ -153,13 +153,13 @@ public class JavaTimeSupplementary_sk extends OpenListResourceBundle {
             },
             { "islamic.DayNarrows",
                 new String[] {
-                    "N",
-                    "P",
-                    "U",
-                    "S",
-                    "\u0160",
-                    "P",
-                    "S",
+                    "n",
+                    "p",
+                    "u",
+                    "s",
+                    "\u0161",
+                    "p",
+                    "s",
                 }
             },
             { "islamic.QuarterAbbreviations",
@@ -196,31 +196,31 @@ public class JavaTimeSupplementary_sk extends OpenListResourceBundle {
             },
             { "islamic.narrow.AmPmMarkers",
                 new String[] {
-                    "dop.",
-                    "odp.",
+                    "AM",
+                    "PM",
                 }
             },
             { "java.time.buddhist.DatePatterns",
                 new String[] {
-                    "EEEE, d. MMMM y G",
-                    "d. MMMM y G",
-                    "d.M.y G",
+                    "EEEE, d. M. y G",
+                    "d. M. y G",
+                    "d. M. y G",
                     "d.M.y GGGGG",
                 }
             },
             { "java.time.islamic.DatePatterns",
                 new String[] {
-                    "EEEE, d. MMMM y G",
-                    "d. MMMM y G",
-                    "d.M.y G",
+                    "EEEE, d. M. y G",
+                    "d. M. y G",
+                    "d. M. y G",
                     "d.M.y GGGGG",
                 }
             },
             { "java.time.japanese.DatePatterns",
                 new String[] {
-                    "EEEE, d. MMMM y G",
-                    "d. MMMM y G",
-                    "d.M.y G",
+                    "EEEE, d. M. y G",
+                    "d. M. y G",
+                    "d. M. y G",
                     "d.M.y GGGGG",
                 }
             },
@@ -232,9 +232,9 @@ public class JavaTimeSupplementary_sk extends OpenListResourceBundle {
             },
             { "java.time.roc.DatePatterns",
                 new String[] {
-                    "EEEE, d. MMMM y G",
-                    "d. MMMM y G",
-                    "d.M.y G",
+                    "EEEE, d. M. y G",
+                    "d. M. y G",
+                    "d. M. y G",
                     "d.M.y GGGGG",
                 }
             },
@@ -246,15 +246,15 @@ public class JavaTimeSupplementary_sk extends OpenListResourceBundle {
             },
             { "roc.AmPmMarkers",
                 new String[] {
-                    "dopoludnia",
-                    "odpoludnia",
+                    "AM",
+                    "PM",
                 }
             },
             { "roc.DatePatterns",
                 new String[] {
-                    "EEEE, d. MMMM y GGGG",
-                    "d. MMMM y GGGG",
-                    "d.M.y GGGG",
+                    "EEEE, d. M. y GGGG",
+                    "d. M. y GGGG",
+                    "d. M. y GGGG",
                     "d.M.y G",
                 }
             },
@@ -282,13 +282,13 @@ public class JavaTimeSupplementary_sk extends OpenListResourceBundle {
             },
             { "roc.DayNarrows",
                 new String[] {
-                    "N",
-                    "P",
-                    "U",
-                    "S",
-                    "\u0160",
-                    "P",
-                    "S",
+                    "n",
+                    "p",
+                    "u",
+                    "s",
+                    "\u0161",
+                    "p",
+                    "s",
                 }
             },
             { "roc.MonthAbbreviations",
@@ -368,8 +368,8 @@ public class JavaTimeSupplementary_sk extends OpenListResourceBundle {
             },
             { "roc.narrow.AmPmMarkers",
                 new String[] {
-                    "dop.",
-                    "odp.",
+                    "AM",
+                    "PM",
                 }
             },
         };
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sl.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sl.java
index 64e3d9dbbcf..0ae069b6fe0 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sl.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -73,6 +73,14 @@ public class JavaTimeSupplementary_sl extends OpenListResourceBundle {
     @Override
     protected final Object[][] getContents() {
         return new Object[][] {
+            { "QuarterAbbreviations",
+                new String[] {
+                    "1. \u010det.",
+                    "2. \u010det.",
+                    "3. \u010det.",
+                    "4. \u010det.",
+                }
+            },
             { "QuarterNames",
                 new String[] {
                     "1. \u010detrtletje",
@@ -98,23 +106,23 @@ public class JavaTimeSupplementary_sl extends OpenListResourceBundle {
             { "field.dayperiod",
                 "\u010cas dneva" },
             { "field.era",
-                "Doba" },
+                "doba" },
             { "field.hour",
-                "Ura" },
+                "ura" },
             { "field.minute",
-                "Minuta" },
+                "minuta" },
             { "field.month",
-                "Mesec" },
+                "mesec" },
             { "field.second",
-                "Sekunda" },
+                "sekunda" },
             { "field.week",
-                "Teden" },
+                "teden" },
             { "field.weekday",
-                "Dan v tednu" },
+                "dan v tednu" },
             { "field.year",
-                "Leto" },
+                "leto" },
             { "field.zone",
-                "\u010casovni pas" },
+                "\u010dasovni pas" },
             { "islamic.AmPmMarkers",
                 new String[] {
                     "dop.",
@@ -164,10 +172,10 @@ public class JavaTimeSupplementary_sl extends OpenListResourceBundle {
             },
             { "islamic.QuarterAbbreviations",
                 new String[] {
-                    "Q1",
-                    "Q2",
-                    "Q3",
-                    "Q4",
+                    "1. \u010det.",
+                    "2. \u010det.",
+                    "3. \u010det.",
+                    "4. \u010det.",
                 }
             },
             { "islamic.QuarterNames",
@@ -194,6 +202,12 @@ public class JavaTimeSupplementary_sl extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "dop.",
+                    "pop.",
+                }
+            },
             { "islamic.narrow.AmPmMarkers",
                 new String[] {
                     "d",
@@ -226,7 +240,7 @@ public class JavaTimeSupplementary_sl extends OpenListResourceBundle {
             },
             { "java.time.long.Eras",
                 new String[] {
-                    "pred na\u0161im \u0161tetjem",
+                    "pred Kristusom",
                     "na\u0161e \u0161tetje",
                 }
             },
@@ -344,10 +358,10 @@ public class JavaTimeSupplementary_sl extends OpenListResourceBundle {
             },
             { "roc.QuarterAbbreviations",
                 new String[] {
-                    "Q1",
-                    "Q2",
-                    "Q3",
-                    "Q4",
+                    "1. \u010det.",
+                    "2. \u010det.",
+                    "3. \u010det.",
+                    "4. \u010det.",
                 }
             },
             { "roc.QuarterNames",
@@ -366,6 +380,12 @@ public class JavaTimeSupplementary_sl extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "dop.",
+                    "pop.",
+                }
+            },
             { "roc.narrow.AmPmMarkers",
                 new String[] {
                     "d",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sq.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sq.java
index 2b567b9c9d6..96ef053f261 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sq.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sq.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -106,7 +106,7 @@ public class JavaTimeSupplementary_sq extends OpenListResourceBundle {
             { "calendarname.roc",
                 "kalendar minguo (kinez)" },
             { "field.dayperiod",
-                "periudh\u00eb e dit\u00ebs" },
+                "paradite/pasdite" },
             { "field.era",
                 "er\u00eb" },
             { "field.hour",
@@ -127,8 +127,8 @@ public class JavaTimeSupplementary_sq extends OpenListResourceBundle {
                 "brezi orar" },
             { "islamic.AmPmMarkers",
                 new String[] {
-                    "paradite",
-                    "pasdite",
+                    "e paradites",
+                    "e pasdites",
                 }
             },
             { "islamic.DatePatterns",
@@ -198,16 +198,22 @@ public class JavaTimeSupplementary_sq extends OpenListResourceBundle {
             },
             { "islamic.TimePatterns",
                 new String[] {
-                    "HH:mm:ss zzzz",
-                    "HH:mm:ss z",
-                    "HH:mm:ss",
-                    "HH:mm",
+                    "h:mm:ss a, zzzz",
+                    "h:mm:ss a, z",
+                    "h:mm:ss a",
+                    "h:mm a",
+                }
+            },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "e paradites",
+                    "e pasdites",
                 }
             },
             { "islamic.narrow.AmPmMarkers",
                 new String[] {
-                    "AM",
-                    "PM",
+                    "e paradites",
+                    "e pasdites",
                 }
             },
             { "java.time.buddhist.DatePatterns",
@@ -256,8 +262,8 @@ public class JavaTimeSupplementary_sq extends OpenListResourceBundle {
             },
             { "roc.AmPmMarkers",
                 new String[] {
-                    "paradite",
-                    "pasdite",
+                    "e paradites",
+                    "e pasdites",
                 }
             },
             { "roc.DatePatterns",
@@ -370,16 +376,22 @@ public class JavaTimeSupplementary_sq extends OpenListResourceBundle {
             },
             { "roc.TimePatterns",
                 new String[] {
-                    "HH:mm:ss zzzz",
-                    "HH:mm:ss z",
-                    "HH:mm:ss",
-                    "HH:mm",
+                    "h:mm:ss a, zzzz",
+                    "h:mm:ss a, z",
+                    "h:mm:ss a",
+                    "h:mm a",
+                }
+            },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "e paradites",
+                    "e pasdites",
                 }
             },
             { "roc.narrow.AmPmMarkers",
                 new String[] {
-                    "AM",
-                    "PM",
+                    "e paradites",
+                    "e pasdites",
                 }
             },
         };
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr.java
index d5d0f0f5f8a..840d8c48661 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -83,10 +83,10 @@ public class JavaTimeSupplementary_sr extends OpenListResourceBundle {
             },
             { "QuarterNames",
                 new String[] {
-                    "\u041f\u0440\u0432\u043e \u0442\u0440\u043e\u043c\u0435\u0441\u0435\u0447\u0458\u0435",
-                    "\u0414\u0440\u0443\u0433\u043e \u0442\u0440\u043e\u043c\u0435\u0441\u0435\u0447\u0458\u0435",
-                    "\u0422\u0440\u0435\u045b\u0435 \u0442\u0440\u043e\u043c\u0435\u0441\u0435\u0447\u0458\u0435",
-                    "\u0427\u0435\u0442\u0432\u0440\u0442\u043e \u0442\u0440\u043e\u043c\u0435\u0441\u0435\u0447\u0458\u0435",
+                    "\u043f\u0440\u0432\u0438 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
+                    "\u0434\u0440\u0443\u0433\u0438 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
+                    "\u0442\u0440\u0435\u045b\u0438 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
+                    "\u0447\u0435\u0442\u0432\u0440\u0442\u0438 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
                 }
             },
             { "QuarterNarrows",
@@ -211,10 +211,10 @@ public class JavaTimeSupplementary_sr extends OpenListResourceBundle {
             },
             { "islamic.QuarterNames",
                 new String[] {
-                    "\u041f\u0440\u0432\u043e \u0442\u0440\u043e\u043c\u0435\u0441\u0435\u0447\u0458\u0435",
-                    "\u0414\u0440\u0443\u0433\u043e \u0442\u0440\u043e\u043c\u0435\u0441\u0435\u0447\u0458\u0435",
-                    "\u0422\u0440\u0435\u045b\u0435 \u0442\u0440\u043e\u043c\u0435\u0441\u0435\u0447\u0458\u0435",
-                    "\u0427\u0435\u0442\u0432\u0440\u0442\u043e \u0442\u0440\u043e\u043c\u0435\u0441\u0435\u0447\u0458\u0435",
+                    "\u043f\u0440\u0432\u0438 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
+                    "\u0434\u0440\u0443\u0433\u0438 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
+                    "\u0442\u0440\u0435\u045b\u0438 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
+                    "\u0447\u0435\u0442\u0432\u0440\u0442\u0438 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
                 }
             },
             { "islamic.QuarterNarrows",
@@ -233,12 +233,24 @@ public class JavaTimeSupplementary_sr extends OpenListResourceBundle {
                     "HH.mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u043f\u0440\u0435 \u043f\u043e\u0434\u043d\u0435",
+                    "\u043f\u043e \u043f\u043e\u0434\u043d\u0435",
+                }
+            },
             { "islamic.long.Eras",
                 new String[] {
                     "",
                     "\u0410\u0425",
                 }
             },
+            { "islamic.narrow.AmPmMarkers",
+                new String[] {
+                    "a",
+                    "p",
+                }
+            },
             { "islamic.narrow.Eras",
                 new String[] {
                     "",
@@ -289,7 +301,7 @@ public class JavaTimeSupplementary_sr extends OpenListResourceBundle {
             },
             { "java.time.japanese.long.Eras",
                 new String[] {
-                    "\u041d\u043e\u0432\u0435 \u0435\u0440\u0435",
+                    "\u043d\u043e\u0432\u0435 \u0435\u0440\u0435",
                     "\u041c\u0435\u0438\u0452\u0438",
                     "\u0422\u0430\u0438\u0448\u043e",
                     "\u0428\u043e\u0432\u0430",
@@ -307,8 +319,8 @@ public class JavaTimeSupplementary_sr extends OpenListResourceBundle {
             },
             { "java.time.long.Eras",
                 new String[] {
-                    "\u041f\u0440\u0435 \u043d\u043e\u0432\u0435 \u0435\u0440\u0435",
-                    "\u041d\u043e\u0432\u0435 \u0435\u0440\u0435",
+                    "\u043f\u0440\u0435 \u043d\u043e\u0432\u0435 \u0435\u0440\u0435",
+                    "\u043d\u043e\u0432\u0435 \u0435\u0440\u0435",
                 }
             },
             { "java.time.roc.DatePatterns",
@@ -439,10 +451,10 @@ public class JavaTimeSupplementary_sr extends OpenListResourceBundle {
             },
             { "roc.QuarterNames",
                 new String[] {
-                    "\u041f\u0440\u0432\u043e \u0442\u0440\u043e\u043c\u0435\u0441\u0435\u0447\u0458\u0435",
-                    "\u0414\u0440\u0443\u0433\u043e \u0442\u0440\u043e\u043c\u0435\u0441\u0435\u0447\u0458\u0435",
-                    "\u0422\u0440\u0435\u045b\u0435 \u0442\u0440\u043e\u043c\u0435\u0441\u0435\u0447\u0458\u0435",
-                    "\u0427\u0435\u0442\u0432\u0440\u0442\u043e \u0442\u0440\u043e\u043c\u0435\u0441\u0435\u0447\u0458\u0435",
+                    "\u043f\u0440\u0432\u0438 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
+                    "\u0434\u0440\u0443\u0433\u0438 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
+                    "\u0442\u0440\u0435\u045b\u0438 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
+                    "\u0447\u0435\u0442\u0432\u0440\u0442\u0438 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
                 }
             },
             { "roc.QuarterNarrows",
@@ -461,12 +473,24 @@ public class JavaTimeSupplementary_sr extends OpenListResourceBundle {
                     "HH.mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u043f\u0440\u0435 \u043f\u043e\u0434\u043d\u0435",
+                    "\u043f\u043e \u043f\u043e\u0434\u043d\u0435",
+                }
+            },
             { "roc.long.Eras",
                 new String[] {
                     "\u041f\u0440\u0435 \u0420\u041a",
                     "\u0420\u041a",
                 }
             },
+            { "roc.narrow.AmPmMarkers",
+                new String[] {
+                    "a",
+                    "p",
+                }
+            },
             { "roc.narrow.Eras",
                 new String[] {
                     "\u041f\u0440\u0435 \u0420\u041a",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr_Latn.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr_Latn.java
index 8957debc838..584cd695b7d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr_Latn.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr_Latn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -83,10 +83,10 @@ public class JavaTimeSupplementary_sr_Latn extends OpenListResourceBundle {
             },
             { "QuarterNames",
                 new String[] {
-                    "Prvo tromese\u010dje",
-                    "Drugo tromese\u010dje",
-                    "Tre\u0107e tromese\u010dje",
-                    "\u010cetvrto tromese\u010dje",
+                    "prvi kvartal",
+                    "drugi kvartal",
+                    "tre\u0107i kvartal",
+                    "\u010detvrti kvartal",
                 }
             },
             { "calendarname.buddhist",
@@ -195,10 +195,16 @@ public class JavaTimeSupplementary_sr_Latn extends OpenListResourceBundle {
             },
             { "islamic.QuarterNames",
                 new String[] {
-                    "Prvo tromese\u010dje",
-                    "Drugo tromese\u010dje",
-                    "Tre\u0107e tromese\u010dje",
-                    "\u010cetvrto tromese\u010dje",
+                    "prvi kvartal",
+                    "drugi kvartal",
+                    "tre\u0107i kvartal",
+                    "\u010detvrti kvartal",
+                }
+            },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "pre podne",
+                    "po podne",
                 }
             },
             { "islamic.long.Eras",
@@ -233,7 +239,7 @@ public class JavaTimeSupplementary_sr_Latn extends OpenListResourceBundle {
             },
             { "java.time.japanese.long.Eras",
                 new String[] {
-                    "Nove ere",
+                    "nove ere",
                     "Mei\u0111i",
                     "Tai\u0161o",
                     "\u0160ova",
@@ -251,8 +257,8 @@ public class JavaTimeSupplementary_sr_Latn extends OpenListResourceBundle {
             },
             { "java.time.long.Eras",
                 new String[] {
-                    "Pre nove ere",
-                    "Nove ere",
+                    "pre nove ere",
+                    "nove ere",
                 }
             },
             { "java.time.short.Eras",
@@ -367,10 +373,16 @@ public class JavaTimeSupplementary_sr_Latn extends OpenListResourceBundle {
             },
             { "roc.QuarterNames",
                 new String[] {
-                    "Prvo tromese\u010dje",
-                    "Drugo tromese\u010dje",
-                    "Tre\u0107e tromese\u010dje",
-                    "\u010cetvrto tromese\u010dje",
+                    "prvi kvartal",
+                    "drugi kvartal",
+                    "tre\u0107i kvartal",
+                    "\u010detvrti kvartal",
+                }
+            },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "pre podne",
+                    "po podne",
                 }
             },
             { "roc.long.Eras",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sv.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sv.java
index d6ad85ba50c..76632da7020 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sv.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sv.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -111,22 +111,24 @@ public class JavaTimeSupplementary_sv extends OpenListResourceBundle {
                 "kinesiska republikens kalender" },
             { "field.dayperiod",
                 "fm/em" },
+            { "field.era",
+                "era" },
             { "field.hour",
-                "Timme" },
+                "timme" },
             { "field.minute",
-                "Minut" },
+                "minut" },
             { "field.month",
-                "M\u00e5nad" },
+                "m\u00e5nad" },
             { "field.second",
-                "Sekund" },
+                "sekund" },
             { "field.week",
-                "Vecka" },
+                "vecka" },
             { "field.weekday",
-                "Veckodag" },
+                "veckodag" },
             { "field.year",
-                "\u00c5r" },
+                "\u00e5r" },
             { "field.zone",
-                "Tidszon" },
+                "tidszon" },
             { "islamic.AmPmMarkers",
                 new String[] {
                     "fm",
@@ -229,6 +231,12 @@ public class JavaTimeSupplementary_sv extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "fm",
+                    "em",
+                }
+            },
             { "islamic.long.Eras",
                 new String[] {
                     "",
@@ -237,8 +245,8 @@ public class JavaTimeSupplementary_sv extends OpenListResourceBundle {
             },
             { "islamic.narrow.AmPmMarkers",
                 new String[] {
-                    "f",
-                    "e",
+                    "fm",
+                    "em",
                 }
             },
             { "islamic.narrow.Eras",
@@ -289,6 +297,24 @@ public class JavaTimeSupplementary_sv extends OpenListResourceBundle {
                     "G y-MM-dd",
                 }
             },
+            { "java.time.japanese.long.Eras",
+                new String[] {
+                    "efter Kristus",
+                    "Meiji",
+                    "Taish\u014d",
+                    "Sh\u014dwa",
+                    "Heisei",
+                }
+            },
+            { "java.time.japanese.short.Eras",
+                new String[] {
+                    "e.Kr.",
+                    "Meiji",
+                    "Taish\u014d",
+                    "Sh\u014dwa",
+                    "Heisei",
+                }
+            },
             { "java.time.long.Eras",
                 javatimelongEras },
             { "java.time.roc.DatePatterns",
@@ -429,6 +455,12 @@ public class JavaTimeSupplementary_sv extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "fm",
+                    "em",
+                }
+            },
             { "roc.long.Eras",
                 new String[] {
                     "f\u00f6re R.K.",
@@ -437,8 +469,8 @@ public class JavaTimeSupplementary_sv extends OpenListResourceBundle {
             },
             { "roc.narrow.AmPmMarkers",
                 new String[] {
-                    "f",
-                    "e",
+                    "fm",
+                    "em",
                 }
             },
             { "roc.narrow.Eras",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_th.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_th.java
index 2a4ddb9e711..bb5169858db 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_th.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_th.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -182,10 +182,10 @@ public class JavaTimeSupplementary_th extends OpenListResourceBundle {
                 new String[] {
                     "\u0e21\u0e38\u0e2e\u0e31\u0e23.",
                     "\u0e40\u0e28\u0e32\u0e30.",
-                    "\u0e23\u0e2d\u0e1a\u0e35 1",
-                    "\u0e23\u0e2d\u0e1a\u0e35 2",
-                    "\u0e0d\u0e38\u0e21\u0e32 1",
-                    "\u0e0d\u0e38\u0e21\u0e32 2",
+                    "\u0e23\u0e2d\u0e1a\u0e35 I",
+                    "\u0e23\u0e2d\u0e1a\u0e35 II",
+                    "\u0e08\u0e38\u0e21\u0e32\u0e14\u0e32 I",
+                    "\u0e08\u0e38\u0e21\u0e32\u0e14\u0e32 II",
                     "\u0e40\u0e23\u0e32\u0e30.",
                     "\u0e0a\u0e30\u0e2d\u0e4c.",
                     "\u0e40\u0e23\u0e32\u0e30\u0e21\u0e30.",
@@ -244,12 +244,24 @@ public class JavaTimeSupplementary_th extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u0e01\u0e48\u0e2d\u0e19\u0e40\u0e17\u0e35\u0e48\u0e22\u0e07",
+                    "\u0e2b\u0e25\u0e31\u0e07\u0e40\u0e17\u0e35\u0e48\u0e22\u0e07",
+                }
+            },
             { "islamic.long.Eras",
                 new String[] {
                     "",
                     "\u0e2e\u0e34\u0e08\u0e40\u0e23\u0e32\u0e30\u0e2b\u0e4c\u0e28\u0e31\u0e01\u0e23\u0e32\u0e0a",
                 }
             },
+            { "islamic.narrow.AmPmMarkers",
+                new String[] {
+                    "a",
+                    "p",
+                }
+            },
             { "islamic.narrow.Eras",
                 new String[] {
                     "",
@@ -464,12 +476,24 @@ public class JavaTimeSupplementary_th extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u0e01\u0e48\u0e2d\u0e19\u0e40\u0e17\u0e35\u0e48\u0e22\u0e07",
+                    "\u0e2b\u0e25\u0e31\u0e07\u0e40\u0e17\u0e35\u0e48\u0e22\u0e07",
+                }
+            },
             { "roc.long.Eras",
                 new String[] {
                     "\u0e1b\u0e35\u0e01\u0e48\u0e2d\u0e19\u0e44\u0e15\u0e49\u0e2b\u0e27\u0e31\u0e19",
                     "\u0e44\u0e15\u0e49\u0e2b\u0e27\u0e31\u0e19",
                 }
             },
+            { "roc.narrow.AmPmMarkers",
+                new String[] {
+                    "a",
+                    "p",
+                }
+            },
             { "roc.narrow.Eras",
                 new String[] {
                     "\u0e1b\u0e35\u0e01\u0e48\u0e2d\u0e19\u0e44\u0e15\u0e49\u0e2b\u0e27\u0e31\u0e19",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_tr.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_tr.java
index e5b6f8590fd..3868b04864f 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_tr.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_tr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -252,6 +252,12 @@ public class JavaTimeSupplementary_tr extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u00d6\u00d6",
+                    "\u00d6S",
+                }
+            },
             { "islamic.long.Eras",
                 new String[] {
                     "",
@@ -468,6 +474,12 @@ public class JavaTimeSupplementary_tr extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u00d6\u00d6",
+                    "\u00d6S",
+                }
+            },
             { "roc.long.Eras",
                 new String[] {
                     "Before R.O.C.",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_uk.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_uk.java
index e3976dafb1d..feb55bdb6de 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_uk.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_uk.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -75,54 +75,54 @@ public class JavaTimeSupplementary_uk extends OpenListResourceBundle {
         return new Object[][] {
             { "QuarterAbbreviations",
                 new String[] {
-                    "I \u043a\u0432.",
-                    "II \u043a\u0432.",
-                    "III \u043a\u0432.",
-                    "IV \u043a\u0432.",
+                    "1-\u0439 \u043a\u0432.",
+                    "2-\u0439 \u043a\u0432.",
+                    "3-\u0439 \u043a\u0432.",
+                    "4-\u0439 \u043a\u0432.",
                 }
             },
             { "QuarterNames",
                 new String[] {
-                    "I \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
-                    "II \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
-                    "III \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
-                    "IV \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
+                    "1-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
+                    "2-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
+                    "3-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
+                    "4-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
                 }
             },
             { "calendarname.buddhist",
-                "\u0411\u0443\u0434\u0434\u0456\u0439\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+                "\u0431\u0443\u0434\u0434\u0456\u0439\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
             { "calendarname.gregorian",
-                "\u0413\u0440\u0438\u0433\u043e\u0440\u0456\u0430\u043d\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+                "\u0433\u0440\u0438\u0433\u043e\u0440\u0456\u0430\u043d\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
             { "calendarname.gregory",
-                "\u0413\u0440\u0438\u0433\u043e\u0440\u0456\u0430\u043d\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+                "\u0433\u0440\u0438\u0433\u043e\u0440\u0456\u0430\u043d\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
             { "calendarname.islamic",
-                "\u041c\u0443\u0441\u0443\u043b\u044c\u043c\u0430\u043d\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+                "\u043c\u0443\u0441\u0443\u043b\u044c\u043c\u0430\u043d\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
             { "calendarname.islamic-civil",
-                "\u041c\u0443\u0441\u0443\u043b\u044c\u043c\u0430\u043d\u0441\u044c\u043a\u0438\u0439 \u0441\u0432\u0456\u0442\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+                "\u043c\u0443\u0441\u0443\u043b\u044c\u043c\u0430\u043d\u0441\u044c\u043a\u0438\u0439 \u0441\u0432\u0456\u0442\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
             { "calendarname.japanese",
-                "\u042f\u043f\u043e\u043d\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+                "\u044f\u043f\u043e\u043d\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
             { "calendarname.roc",
-                "\u041a\u0438\u0442\u0430\u0439\u0441\u044c\u043a\u0438\u0439 \u0433\u0440\u0438\u0433\u043e\u0440\u0456\u0430\u043d\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+                "\u043a\u0438\u0442\u0430\u0439\u0441\u044c\u043a\u0438\u0439 \u0433\u0440\u0438\u0433\u043e\u0440\u0456\u0430\u043d\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
             { "field.dayperiod",
-                "\u0427\u0430\u0441\u0442\u0438\u043d\u0430 \u0434\u043e\u0431\u0438" },
+                "\u0447\u0430\u0441\u0442\u0438\u043d\u0430 \u0434\u043e\u0431\u0438" },
             { "field.era",
-                "\u0415\u0440\u0430" },
+                "\u0435\u0440\u0430" },
             { "field.hour",
-                "\u0413\u043e\u0434\u0438\u043d\u0430" },
+                "\u0433\u043e\u0434\u0438\u043d\u0430" },
             { "field.minute",
-                "\u0425\u0432\u0438\u043b\u0438\u043d\u0430" },
+                "\u0445\u0432\u0438\u043b\u0438\u043d\u0430" },
             { "field.month",
-                "\u041c\u0456\u0441\u044f\u0446\u044c" },
+                "\u043c\u0456\u0441\u044f\u0446\u044c" },
             { "field.second",
-                "\u0421\u0435\u043a\u0443\u043d\u0434\u0430" },
+                "\u0441\u0435\u043a\u0443\u043d\u0434\u0430" },
             { "field.week",
-                "\u0422\u0438\u0436\u0434\u0435\u043d\u044c" },
+                "\u0442\u0438\u0436\u0434\u0435\u043d\u044c" },
             { "field.weekday",
-                "\u0414\u0435\u043d\u044c \u0442\u0438\u0436\u043d\u044f" },
+                "\u0434\u0435\u043d\u044c \u0442\u0438\u0436\u043d\u044f" },
             { "field.year",
-                "\u0420\u0456\u043a" },
+                "\u0440\u0456\u043a" },
             { "field.zone",
-                "\u0427\u0430\u0441\u043e\u0432\u0438\u0439 \u043f\u043e\u044f\u0441" },
+                "\u0447\u0430\u0441\u043e\u0432\u0438\u0439 \u043f\u043e\u044f\u0441" },
             { "islamic.AmPmMarkers",
                 new String[] {
                     "\u0434\u043f",
@@ -189,18 +189,18 @@ public class JavaTimeSupplementary_uk extends OpenListResourceBundle {
             },
             { "islamic.QuarterAbbreviations",
                 new String[] {
-                    "I \u043a\u0432.",
-                    "II \u043a\u0432.",
-                    "III \u043a\u0432.",
-                    "IV \u043a\u0432.",
+                    "1-\u0439 \u043a\u0432.",
+                    "2-\u0439 \u043a\u0432.",
+                    "3-\u0439 \u043a\u0432.",
+                    "4-\u0439 \u043a\u0432.",
                 }
             },
             { "islamic.QuarterNames",
                 new String[] {
-                    "I \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
-                    "II \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
-                    "III \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
-                    "IV \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
+                    "1-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
+                    "2-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
+                    "3-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
+                    "4-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
                 }
             },
             { "islamic.QuarterNarrows",
@@ -219,6 +219,12 @@ public class JavaTimeSupplementary_uk extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u0434\u043f",
+                    "\u043f\u043f",
+                }
+            },
             { "islamic.narrow.AmPmMarkers",
                 new String[] {
                     "\u0434\u043f",
@@ -369,18 +375,18 @@ public class JavaTimeSupplementary_uk extends OpenListResourceBundle {
             },
             { "roc.QuarterAbbreviations",
                 new String[] {
-                    "I \u043a\u0432.",
-                    "II \u043a\u0432.",
-                    "III \u043a\u0432.",
-                    "IV \u043a\u0432.",
+                    "1-\u0439 \u043a\u0432.",
+                    "2-\u0439 \u043a\u0432.",
+                    "3-\u0439 \u043a\u0432.",
+                    "4-\u0439 \u043a\u0432.",
                 }
             },
             { "roc.QuarterNames",
                 new String[] {
-                    "I \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
-                    "II \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
-                    "III \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
-                    "IV \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
+                    "1-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
+                    "2-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
+                    "3-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
+                    "4-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
                 }
             },
             { "roc.TimePatterns",
@@ -391,6 +397,12 @@ public class JavaTimeSupplementary_uk extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u0434\u043f",
+                    "\u043f\u043f",
+                }
+            },
             { "roc.narrow.AmPmMarkers",
                 new String[] {
                     "\u0434\u043f",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_vi.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_vi.java
index 88b270f09b6..f023d9312dc 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_vi.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_vi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -129,7 +129,7 @@ public class JavaTimeSupplementary_vi extends OpenListResourceBundle {
             },
             { "islamic.DatePatterns",
                 new String[] {
-                    "EEEE, 'ng\u00e0y' dd MMMM 'n\u0103m' y GGGG",
+                    "EEEE, 'ng\u00e0y' dd 'th\u00e1ng' MM 'n\u0103m' y GGGG",
                     "'Ng\u00e0y' dd 'th\u00e1ng' M 'n\u0103m' y GGGG",
                     "dd-MM-y GGGG",
                     "dd/MM/y G",
@@ -206,6 +206,12 @@ public class JavaTimeSupplementary_vi extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "SA",
+                    "CH",
+                }
+            },
             { "islamic.long.Eras",
                 new String[] {
                     "",
@@ -252,7 +258,7 @@ public class JavaTimeSupplementary_vi extends OpenListResourceBundle {
             },
             { "java.time.islamic.DatePatterns",
                 new String[] {
-                    "EEEE, 'ng\u00e0y' dd MMMM 'n\u0103m' y G",
+                    "EEEE, 'ng\u00e0y' dd 'th\u00e1ng' MM 'n\u0103m' y G",
                     "'Ng\u00e0y' dd 'th\u00e1ng' M 'n\u0103m' y G",
                     "dd-MM-y G",
                     "dd/MM/y GGGGG",
@@ -406,6 +412,12 @@ public class JavaTimeSupplementary_vi extends OpenListResourceBundle {
                     "HH:mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "SA",
+                    "CH",
+                }
+            },
             { "roc.long.Eras",
                 new String[] {
                     "Tr\u01b0\u1edbc R.O.C",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh.java
index 4d1f8bb4eaa..e1e19af2a14 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -211,7 +211,7 @@ public class JavaTimeSupplementary_zh extends OpenListResourceBundle {
             { "islamic.Eras",
                 new String[] {
                     "",
-                    "\u56de\u5386",
+                    "\u4f0a\u65af\u5170\u5386",
                 }
             },
             { "islamic.MonthAbbreviations",
@@ -250,10 +250,16 @@ public class JavaTimeSupplementary_zh extends OpenListResourceBundle {
                     "ah:mm",
                 }
             },
+            { "islamic.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u4e0a\u5348",
+                    "\u4e0b\u5348",
+                }
+            },
             { "islamic.long.Eras",
                 new String[] {
                     "",
-                    "\u56de\u5386",
+                    "\u4f0a\u65af\u5170\u5386",
                 }
             },
             { "islamic.narrow.AmPmMarkers",
@@ -265,13 +271,13 @@ public class JavaTimeSupplementary_zh extends OpenListResourceBundle {
             { "islamic.narrow.Eras",
                 new String[] {
                     "",
-                    "\u56de\u5386",
+                    "\u4f0a\u65af\u5170\u5386",
                 }
             },
             { "islamic.short.Eras",
                 new String[] {
                     "",
-                    "\u56de\u5386",
+                    "\u4f0a\u65af\u5170\u5386",
                 }
             },
             { "java.time.buddhist.DatePatterns",
@@ -430,6 +436,12 @@ public class JavaTimeSupplementary_zh extends OpenListResourceBundle {
                     "ah:mm",
                 }
             },
+            { "roc.abbreviated.AmPmMarkers",
+                new String[] {
+                    "\u4e0a\u5348",
+                    "\u4e0b\u5348",
+                }
+            },
             { "roc.long.Eras",
                 new String[] {
                     "\u6c11\u56fd\u524d",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_TW.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_TW.java
index 591b0e42455..c612ff70ecb 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_TW.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_zh_TW.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 @@
 /*
  * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
+ * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
  * Distributed under the Terms of Use in
  * http://www.unicode.org/copyright.html.
  *
@@ -266,7 +266,7 @@ public class JavaTimeSupplementary_zh_TW extends OpenListResourceBundle {
                 javatimelongEras },
             { "java.time.roc.DatePatterns",
                 new String[] {
-                    "Gy\u5e74M\u6708d\u65e5EEEE",
+                    "Gy\u5e74M\u6708d\u65e5 EEEE",
                     "Gy\u5e74M\u6708d\u65e5",
                     "Gy\u5e74M\u6708d\u65e5",
                     "Gy/M/d",
@@ -276,7 +276,7 @@ public class JavaTimeSupplementary_zh_TW extends OpenListResourceBundle {
                 javatimelongEras },
             { "roc.DatePatterns",
                 new String[] {
-                    "GGGGy\u5e74M\u6708d\u65e5EEEE",
+                    "GGGGy\u5e74M\u6708d\u65e5 EEEE",
                     "GGGGy\u5e74M\u6708d\u65e5",
                     "GGGGy\u5e74M\u6708d\u65e5",
                     "GGGGy/M/d",
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/dtd/ldml.dtd b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/dtd/ldml.dtd
deleted file mode 100644
index 70e76f3d382..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/dtd/ldml.dtd
+++ /dev/null
@@ -1,1538 +0,0 @@
-<!--
-Copyright © 2003-2015 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.
-
-THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
-$Revision: 11412 $
-$Date: 2015-03-16 11:54:03 -0500 (Mon, 16 Mar 2015) $
--->
-
-<!ELEMENT ldml (identity, (alias | (fallback*, localeDisplayNames?, layout?, contextTransforms?, characters?, delimiters?, measurement?, dates?, numbers?, units?, listPatterns?, collations?, posix?, segmentations?, rbnf?, annotations?, metadata?, references?, special*))) >
-<!ATTLIST ldml draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!-- ######################################################### -->
-
-<!ELEMENT identity (alias | (version, generation?, language, script?, territory?, variant?, special*) ) >
-
-<!ELEMENT version EMPTY >
-<!ATTLIST version number CDATA #REQUIRED >
-<!ATTLIST version cldrVersion CDATA #FIXED "27" >
-
-<!ELEMENT generation EMPTY >
-<!ATTLIST generation date CDATA #REQUIRED >
-
-<!ELEMENT language ( #PCDATA ) >
-<!ATTLIST language type NMTOKEN #REQUIRED >
-<!ATTLIST language alt NMTOKENS #IMPLIED >
-<!ATTLIST language draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST language references CDATA #IMPLIED >
-
-
-<!ELEMENT script ( #PCDATA ) >
-<!ATTLIST script type NMTOKEN #REQUIRED >
-<!ATTLIST script alt NMTOKENS #IMPLIED >
-<!ATTLIST script draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST script references CDATA #IMPLIED >
-
-
-<!ELEMENT territory ( #PCDATA ) >
-<!ATTLIST territory type NMTOKEN #REQUIRED >
-<!ATTLIST territory alt NMTOKENS #IMPLIED >
-<!ATTLIST territory draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST territory references CDATA #IMPLIED >
-
-
-<!ELEMENT variant ( #PCDATA ) >
-<!ATTLIST variant type NMTOKEN #REQUIRED >
-<!ATTLIST variant alt NMTOKENS #IMPLIED >
-<!ATTLIST variant draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST variant references CDATA #IMPLIED >
-
-
-<!-- ######################################################### -->
-
-<!-- These elements are common to almost all elements defined  -->
-<!-- ######################################################### -->
-
-<!ELEMENT alias  (special*) >
-<!ATTLIST alias source NMTOKEN #REQUIRED >
-<!ATTLIST alias path CDATA #IMPLIED>
-<!ATTLIST alias alt NMTOKENS #IMPLIED >
-<!ATTLIST alias draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT default (special*) > <!-- deprecated -->
-<!ATTLIST default type NMTOKEN #IMPLIED >
-<!ATTLIST default choice NMTOKEN #IMPLIED >
-<!ATTLIST default alt NMTOKENS #IMPLIED >
-<!ATTLIST default draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST default references CDATA #IMPLIED >
-
-<!ELEMENT special ANY >
-
-<!-- This element can occur anywhere there may be localizable data -->
-<!ELEMENT cp (special*) >
-<!ATTLIST cp hex NMTOKEN #REQUIRED >
-
-<!-- ######################################################### -->
-
-<!ELEMENT fallback (#PCDATA) > <!-- deprecated -->
-<!ATTLIST fallback alt NMTOKENS #IMPLIED >
-<!ATTLIST fallback draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED  >
-<!ATTLIST fallback references CDATA #IMPLIED >
-
-<!ELEMENT localeDisplayNames (alias | (localeDisplayPattern?, languages?, scripts?, territories?, variants?, keys?, types?, transformNames?, measurementSystemNames?, codePatterns?, special*)) >
-<!ATTLIST localeDisplayNames draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!-- Either 1 alias OR any specials, any order, zero or more language -->
-<!ELEMENT languages ( alias | (language | special)* ) >
-<!ATTLIST languages draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED  > <!-- true and false are deprecated. -->
-<!ATTLIST languages standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST languages references CDATA #IMPLIED >
-<!ATTLIST languages validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!-- Either 1 alias OR any specials, any order, zero or more script -->
-<!ELEMENT scripts (alias |(script | special)* ) >
-<!ATTLIST scripts draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST scripts standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST scripts references CDATA #IMPLIED >
-<!ATTLIST scripts validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!-- Either 1 alias OR any specials, any order, zero or more territory -->
-<!ELEMENT territories ( alias | (territory | special)*) >
-<!ATTLIST territories draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST territories standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST territories references CDATA #IMPLIED >
-<!ATTLIST territories validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!-- Either 1 alias OR any specials, any order, zero or more variant -->
-<!ELEMENT variants ( alias |(variant | special)*  ) >
-<!ATTLIST variants draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST variants standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST variants references CDATA #IMPLIED >
-<!ATTLIST variants validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!-- Either 1 alias OR any specials, any order, zero or more key -->
-<!ELEMENT keys ( alias | (key | special)*) >
-<!ATTLIST keys draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST keys standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST keys references CDATA #IMPLIED >
-<!ATTLIST keys validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT key ( #PCDATA ) >
-<!ATTLIST key type NMTOKEN #REQUIRED >
-<!ATTLIST key alt NMTOKENS #IMPLIED >
-<!ATTLIST key draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST key references CDATA #IMPLIED >
-
-
-<!-- Either 1 alias OR any specials, any order, zero or more type -->
-<!ELEMENT types ( alias | (type | special)* ) >
-<!ATTLIST types draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST types standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST types references CDATA #IMPLIED >
-<!ATTLIST types validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT type ( #PCDATA ) >
-<!ATTLIST type type NMTOKEN #REQUIRED >
-<!ATTLIST type key NMTOKEN #IMPLIED >
-<!ATTLIST type alt NMTOKENS #IMPLIED >
-<!ATTLIST type draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST type references CDATA #IMPLIED >
-
-<!ELEMENT transformNames ( alias | (transformName | special)* ) >
-<!ATTLIST transformNames draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST transformNames references CDATA #IMPLIED >
-
-<!ELEMENT transformName ( #PCDATA ) >
-<!ATTLIST transformName type NMTOKEN #REQUIRED >
-<!ATTLIST transformName alt NMTOKENS #IMPLIED >
-<!ATTLIST transformName draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST transformName references CDATA #IMPLIED >
-
-
-<!ELEMENT codePatterns ( alias | (codePattern | special)* ) >
-<!ELEMENT codePattern ( #PCDATA ) >
-<!ATTLIST codePattern type NMTOKEN #REQUIRED >
-<!ATTLIST codePattern alt NMTOKENS #IMPLIED >
-<!ATTLIST codePattern draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST codePattern references CDATA #IMPLIED >
-
-<!-- Either 1 alias OR any specials, any order, zero or more measurementSystemName -->
-<!ELEMENT measurementSystemNames ( alias | (measurementSystemName | special)* ) >
-<!ATTLIST measurementSystemNames draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST measurementSystemNames references CDATA #IMPLIED >
-<!ATTLIST measurementSystemNames validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT measurementSystemName ( #PCDATA ) >
-<!ATTLIST measurementSystemName type ( US | metric | UK ) #REQUIRED >
-<!ATTLIST measurementSystemName alt NMTOKENS #IMPLIED >
-<!ATTLIST measurementSystemName draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST measurementSystemName references CDATA #IMPLIED >
-
-<!ELEMENT localeDisplayPattern ( alias | (localePattern*, localeSeparator*, localeKeyTypePattern*, special*) ) >
-<!ATTLIST localeDisplayPattern alt NMTOKENS #IMPLIED >
-<!ATTLIST localeDisplayPattern draft ( approved | contributed | provisional | unconfirmed) #IMPLIED >
-<!ATTLIST localeDisplayPattern references CDATA #IMPLIED >
-
-<!ELEMENT localePattern ( #PCDATA ) >
-<!ATTLIST localePattern alt NMTOKENS #IMPLIED >
-<!ATTLIST localePattern draft ( approved | contributed | provisional | unconfirmed) #IMPLIED >
-<!ATTLIST localePattern references CDATA #IMPLIED >
-
-<!ELEMENT localeSeparator ( #PCDATA ) >
-<!ATTLIST localeSeparator alt NMTOKENS #IMPLIED >
-<!ATTLIST localeSeparator draft ( approved | contributed | provisional | unconfirmed) #IMPLIED >
-<!ATTLIST localeSeparator references CDATA #IMPLIED >
-
-<!ELEMENT localeKeyTypePattern ( #PCDATA ) >
-<!ATTLIST localeKeyTypePattern alt NMTOKENS #IMPLIED >
-<!ATTLIST localeKeyTypePattern draft ( approved | contributed | provisional | unconfirmed) #IMPLIED >
-<!ATTLIST localeKeyTypePattern references CDATA #IMPLIED >
-
-<!-- ######################################################### -->
-
-
-<!-- ######################################################### -->
-<!-- layout and orientation are script specific, so validSublocales attribute is not required -->
-<!ELEMENT layout ( alias | (orientation*, inList*, inText*, special*) ) >
-<!ATTLIST layout draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST layout references CDATA #IMPLIED >
-
-<!ELEMENT orientation ( characterOrder*, lineOrder*, special* ) >
-<!ATTLIST orientation characters ( left-to-right | right-to-left | top-to-bottom | bottom-to-top ) #IMPLIED > <!-- deprecated -->
-<!ATTLIST orientation lines ( left-to-right | right-to-left | top-to-bottom | bottom-to-top ) #IMPLIED > <!-- deprecated -->
-<!ATTLIST orientation alt NMTOKENS #IMPLIED >
-<!ATTLIST orientation draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST orientation standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST orientation references CDATA #IMPLIED >
-
-<!ELEMENT characterOrder ( #PCDATA ) >
-<!ELEMENT lineOrder ( #PCDATA ) >
-
-<!ELEMENT inList ( #PCDATA ) > <!-- deprecated, use contextTransforms -->
-<!ATTLIST inList casing ( titlecase-words | titlecase-firstword | lowercase-words | mixed ) #IMPLIED > <!-- deprecated -->
-<!ATTLIST inList alt NMTOKENS #IMPLIED >
-<!ATTLIST inList draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST inList references CDATA #IMPLIED >
-
-<!ELEMENT inText ( #PCDATA ) > <!-- deprecated, use contextTransforms -->
-<!ATTLIST inText type ( languages | scripts | territories | variants | keys | types | measurementSystemNames | monthWidth | dayWidth | quarterWidth | long | fields | currency ) #IMPLIED >
-<!ATTLIST inText alt NMTOKENS #IMPLIED >
-<!ATTLIST inText draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > 
-<!ATTLIST inText references CDATA #IMPLIED >
-
-<!-- ######################################################### -->
-
-<!ELEMENT contextTransforms ( alias | (contextTransformUsage*, special*)) >
-<!ATTLIST contextTransforms alt NMTOKENS #IMPLIED >
-<!ATTLIST contextTransforms draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST contextTransforms references CDATA #IMPLIED >
-<!ATTLIST contextTransforms validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT contextTransformUsage ( alias | (contextTransform*, special*)) >
-<!ATTLIST contextTransformUsage type CDATA #REQUIRED >
-<!ATTLIST contextTransformUsage alt NMTOKENS #IMPLIED >
-<!ATTLIST contextTransformUsage draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST contextTransformUsage references CDATA #IMPLIED >
-<!ATTLIST contextTransformUsage validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT contextTransform ( #PCDATA ) >
-<!ATTLIST contextTransform type ( uiListOrMenu | stand-alone ) #REQUIRED >
-<!ATTLIST contextTransform alt NMTOKENS #IMPLIED >
-<!ATTLIST contextTransform draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST contextTransform references CDATA #IMPLIED >
-
-<!-- ######################################################### -->
-
-<!ELEMENT characters (alias | (exemplarCharacters*, ellipsis*, moreInformation*, stopwords*, indexLabels*, mapping*, special*))  >
-<!ATTLIST characters draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT exemplarCharacters ( #PCDATA | cp )* >
-<!ATTLIST exemplarCharacters type ( auxiliary | standard | punctuation | currencySymbol | index ) #IMPLIED > <!-- currencySymbol is deprecated. -->
-<!ATTLIST exemplarCharacters alt NMTOKENS #IMPLIED >
-<!ATTLIST exemplarCharacters draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST exemplarCharacters standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST exemplarCharacters references CDATA #IMPLIED >
-<!ATTLIST exemplarCharacters validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT ellipsis ( #PCDATA ) >
-<!ATTLIST ellipsis type ( initial | medial | final | word-initial | word-medial | word-final ) #IMPLIED >
-<!ATTLIST ellipsis alt NMTOKENS #IMPLIED >
-<!ATTLIST ellipsis draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST ellipsis references CDATA #IMPLIED >
-
-<!ELEMENT moreInformation ( #PCDATA ) >
-<!ATTLIST moreInformation alt NMTOKENS #IMPLIED >
-<!ATTLIST moreInformation draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST moreInformation references CDATA #IMPLIED >
-
-<!ELEMENT stopwords ( stopwordList* ) > <!-- stopwords are deprecated. -->
-<!ELEMENT stopwordList ( #PCDATA ) > <!-- stopwords are deprecated. -->
-<!ATTLIST stopwordList type NMTOKEN #REQUIRED > <!-- stopwords are deprecated. -->
-<!ATTLIST stopwordList alt NMTOKENS #IMPLIED > <!-- stopwords are deprecated. -->
-<!ATTLIST stopwordList draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > <!-- stopwords are deprecated. -->
-<!ATTLIST stopwordList references CDATA #IMPLIED > <!-- stopwords are deprecated. -->
-
-
-<!ELEMENT indexLabels (indexSeparator*, compressedIndexSeparator*, indexRangePattern*, indexLabelBefore*, indexLabelAfter*, indexLabel*) >
-
-<!ELEMENT indexSeparator ( #PCDATA ) >
-<!ATTLIST indexSeparator alt NMTOKENS #IMPLIED >
-<!ATTLIST indexSeparator draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST indexSeparator references CDATA #IMPLIED >
-
-<!ELEMENT compressedIndexSeparator ( #PCDATA ) >
-<!ATTLIST compressedIndexSeparator alt NMTOKENS #IMPLIED >
-<!ATTLIST compressedIndexSeparator draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST compressedIndexSeparator references CDATA #IMPLIED >
-
-<!ELEMENT indexRangePattern ( #PCDATA ) >
-<!ATTLIST indexRangePattern alt NMTOKENS #IMPLIED >
-<!ATTLIST indexRangePattern draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST indexRangePattern references CDATA #IMPLIED >
-
-<!ELEMENT indexLabelBefore ( #PCDATA ) >
-<!ATTLIST indexLabelBefore alt NMTOKENS #IMPLIED >
-<!ATTLIST indexLabelBefore draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST indexLabelBefore references CDATA #IMPLIED >
-
-<!ELEMENT indexLabelAfter ( #PCDATA ) >
-<!ATTLIST indexLabelAfter alt NMTOKENS #IMPLIED >
-<!ATTLIST indexLabelAfter draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST indexLabelAfter references CDATA #IMPLIED >
-
-<!ELEMENT indexLabel ( #PCDATA ) >
-<!ATTLIST indexLabel indexSource CDATA #IMPLIED >
-<!ATTLIST indexLabel priority ( 1 | 2 | 3 ) #IMPLIED >
-<!ATTLIST indexLabel alt NMTOKENS #IMPLIED >
-<!ATTLIST indexLabel draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST indexLabel references CDATA #IMPLIED >
-
-<!ELEMENT mapping (special*) >
-<!ATTLIST mapping registry NMTOKEN #REQUIRED >
-<!ATTLIST mapping type NMTOKEN #IMPLIED > <!-- deprecated in favor of choice -->
-<!ATTLIST mapping choice NMTOKEN #IMPLIED >
-<!ATTLIST mapping alt NMTOKENS #IMPLIED >
-<!ATTLIST mapping draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST mapping standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST mapping references CDATA #IMPLIED >
-<!ATTLIST mapping validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!-- ######################################################### -->
-
-
-<!-- ######################################################### -->
-
-<!ELEMENT delimiters (alias | (quotationStart*, quotationEnd*, alternateQuotationStart*, alternateQuotationEnd*, special*)) >
-<!ATTLIST delimiters alt NMTOKENS #IMPLIED >
-<!ATTLIST delimiters draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST delimiters standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST delimiters references CDATA #IMPLIED >
-<!ATTLIST delimiters validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT quotationStart ( #PCDATA | cp )* >
-<!ATTLIST quotationStart alt NMTOKENS #IMPLIED >
-<!ATTLIST quotationStart draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST quotationStart references CDATA #IMPLIED >
-
-<!ELEMENT quotationEnd ( #PCDATA | cp )* >
-<!ATTLIST quotationEnd alt NMTOKENS #IMPLIED >
-<!ATTLIST quotationEnd draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST quotationEnd references CDATA #IMPLIED >
- 
-<!ELEMENT alternateQuotationStart ( #PCDATA | cp )* >
-<!ATTLIST alternateQuotationStart alt NMTOKENS #IMPLIED >
-<!ATTLIST alternateQuotationStart draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST alternateQuotationStart references CDATA #IMPLIED >
-
-<!ELEMENT alternateQuotationEnd ( #PCDATA | cp )* >
-<!ATTLIST alternateQuotationEnd alt NMTOKENS #IMPLIED >
-<!ATTLIST alternateQuotationEnd draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST alternateQuotationEnd references CDATA #IMPLIED >
-
-<!-- ######################################################### -->
-
-
-<!-- ######################################################### -->
-
-<!ELEMENT measurement (alias | (measurementSystem*, paperSize*, special*)) > <!-- deprecated, use measurementData in supplemental instead -->
-<!ATTLIST measurement alt NMTOKENS #IMPLIED >
-<!ATTLIST measurement draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST measurement standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST measurement references CDATA #IMPLIED >
-<!ATTLIST measurement validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT paperSize (alias | (height*, width*, special*)) > <!-- deprecated, use paperSize in supplemental instead -->
-<!ATTLIST paperSize alt NMTOKENS #IMPLIED >
-<!ATTLIST paperSize draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST paperSize standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST paperSize references CDATA #IMPLIED >
-<!ATTLIST paperSize validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT height ( #PCDATA ) > <!-- deprecated -->
-<!ATTLIST height alt NMTOKENS #IMPLIED >
-<!ATTLIST height draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST height references CDATA #IMPLIED >
-
-<!ELEMENT width ( #PCDATA ) > <!-- deprecated -->
-<!ATTLIST width alt NMTOKENS #IMPLIED >
-<!ATTLIST width draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST width references CDATA #IMPLIED >
-
-<!ELEMENT measurementSystem (special*) > <!-- deprecated, use measurementSystem in supplemental instead -->
-<!ATTLIST measurementSystem type ( metric | US | UK ) #REQUIRED > <!-- deprecated in favor of choice -->
-<!ATTLIST measurementSystem choice ( metric | US | UK ) #IMPLIED > <!-- really required, but needs to be optional to support type also -->
-<!ATTLIST measurementSystem alt NMTOKENS #IMPLIED >
-<!ATTLIST measurementSystem draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST measurementSystem standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST measurementSystem references CDATA #IMPLIED >
-<!ATTLIST measurementSystem validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!-- ######################################################### -->
-
-
-<!-- ######################################################### -->
-
-<!ELEMENT dates (alias | (localizedPatternChars*, dateRangePattern*, calendars?, fields?, timeZoneNames?, special*)) >
-<!ATTLIST dates alt NMTOKENS #IMPLIED >
-<!ATTLIST dates draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST dates standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST dates references CDATA #IMPLIED >
-<!ATTLIST dates validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT localizedPatternChars ( #PCDATA | cp )* > <!-- deprecated. -->
-<!ATTLIST localizedPatternChars alt NMTOKENS #IMPLIED >
-<!ATTLIST localizedPatternChars draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST localizedPatternChars standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST localizedPatternChars references CDATA #IMPLIED >
-<!ATTLIST localizedPatternChars validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT dateRangePattern ( #PCDATA ) > <!-- deprecated, use intervalFormats. -->
-<!ATTLIST dateRangePattern alt NMTOKENS #IMPLIED >
-<!ATTLIST dateRangePattern draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST dateRangePattern standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST dateRangePattern references CDATA #IMPLIED >
-<!ATTLIST dateRangePattern validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT calendars (alias | (default*, calendar*, special*)) > <!-- use of a default element for calendars is deprecated, use calendarPreferenceData instead -->
-<!ATTLIST calendars draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST calendars validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT calendar (alias | (months?, monthNames?, monthAbbr?, monthPatterns?, days?, dayNames?, dayAbbr?, quarters?, week?, am*, pm*, dayPeriods?, eras?, cyclicNameSets?, dateFormats?, timeFormats?, dateTimeFormats?, fields*, special*))> <!-- fields is deprecated here -->
-<!ATTLIST calendar type NMTOKEN #REQUIRED >
-<!ATTLIST calendar alt NMTOKENS #IMPLIED >
-<!ATTLIST calendar draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST calendar standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST calendar references CDATA #IMPLIED >
-<!ATTLIST calendar validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT months ( alias | (default*, monthContext*, special*)) > <!-- default element is deprecated -->
-<!ATTLIST months alt NMTOKENS #IMPLIED >
-<!ATTLIST months draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST months standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST months references CDATA #IMPLIED >
-<!ATTLIST months validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT monthContext ( alias | (default*, monthWidth*, special*)) > <!-- default element is deprecated -->
-<!ATTLIST monthContext type ( format | stand-alone ) #REQUIRED >
-<!ATTLIST monthContext alt NMTOKENS #IMPLIED >
-<!ATTLIST monthContext draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST monthContext standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST monthContext references CDATA #IMPLIED >
-<!ATTLIST monthContext validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT monthWidth ( alias | (month*, special*)) >
-<!ATTLIST monthWidth type ( abbreviated| narrow | wide) #REQUIRED >
-<!ATTLIST monthWidth alt NMTOKENS #IMPLIED >
-<!ATTLIST monthWidth draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST monthWidth standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST monthWidth references CDATA #IMPLIED >
-<!ATTLIST monthWidth validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT month ( #PCDATA | cp )* >
-<!ATTLIST month type ( 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 ) #REQUIRED >
-<!ATTLIST month yeartype ( standard | leap ) #IMPLIED >
-<!ATTLIST month alt NMTOKENS #IMPLIED >
-<!ATTLIST month draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST month references CDATA #IMPLIED >
-
-<!ELEMENT monthPatterns ( alias | (monthPatternContext*, special*)) >
-<!ATTLIST monthPatterns alt NMTOKENS #IMPLIED >
-<!ATTLIST monthPatterns draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST monthPatterns references CDATA #IMPLIED >
-<!ATTLIST monthPatterns validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT monthPatternContext ( alias | (monthPatternWidth*, special*)) >
-<!ATTLIST monthPatternContext type ( format | stand-alone | numeric ) #REQUIRED >
-<!ATTLIST monthPatternContext alt NMTOKENS #IMPLIED >
-<!ATTLIST monthPatternContext draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST monthPatternContext references CDATA #IMPLIED >
-<!ATTLIST monthPatternContext validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT monthPatternWidth ( alias | (monthPattern*, special*)) >
-<!ATTLIST monthPatternWidth type ( abbreviated| narrow | wide | all ) #REQUIRED >
-<!ATTLIST monthPatternWidth alt NMTOKENS #IMPLIED >
-<!ATTLIST monthPatternWidth draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST monthPatternWidth references CDATA #IMPLIED >
-<!ATTLIST monthPatternWidth validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT monthPattern ( #PCDATA ) >
-<!ATTLIST monthPattern type ( leap | standardAfterLeap | combined ) #REQUIRED >
-<!ATTLIST monthPattern alt NMTOKENS #IMPLIED >
-<!ATTLIST monthPattern draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST monthPattern references CDATA #IMPLIED >
-
-
-<!-- START_DEPRECATED -->
-<!ELEMENT monthNames ( alias | (month*, special*)) > <!-- deprecated -->
-<!ATTLIST monthNames draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT monthAbbr ( alias | (month*, special*)) > <!-- deprecated -->
-<!ATTLIST monthAbbr draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!-- END_DEPRECATED-->
-
-<!ELEMENT days ( alias | (default*, dayContext*, special*)) > <!-- default element is deprecated -->
-<!ATTLIST days alt NMTOKENS #IMPLIED >
-<!ATTLIST days draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED ><!-- true and false are deprecated. -->
-<!ATTLIST days standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST days references CDATA #IMPLIED >
-<!ATTLIST days validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT dayContext ( alias | (default*, dayWidth*, special*)) > <!-- default element is deprecated -->
-<!ATTLIST dayContext type ( format | stand-alone ) #REQUIRED >
-<!ATTLIST dayContext alt NMTOKENS #IMPLIED >
-<!ATTLIST dayContext draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST dayContext standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST dayContext references CDATA #IMPLIED >
-<!ATTLIST dayContext validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT dayWidth ( alias | (day*, special*)) >
-<!ATTLIST dayWidth type ( abbreviated| narrow | short | wide ) #REQUIRED >
-<!ATTLIST dayWidth alt NMTOKENS #IMPLIED >
-<!ATTLIST dayWidth draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST dayWidth standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST dayWidth references CDATA #IMPLIED >
-<!ATTLIST dayWidth validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT day ( #PCDATA ) >
-<!ATTLIST day type ( sun | mon | tue | wed | thu | fri | sat ) #REQUIRED >
-<!ATTLIST day alt NMTOKENS #IMPLIED >
-<!ATTLIST day draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST day references CDATA #IMPLIED >
-
-
-<!ELEMENT quarters ( alias | (default*, quarterContext*, special*)) > <!-- default element is deprecated -->
-<!ATTLIST quarters alt NMTOKENS #IMPLIED >
-<!ATTLIST quarters draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST quarters references CDATA #IMPLIED >
-<!ATTLIST quarters validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT quarterContext ( alias | (default*, quarterWidth*, special*)) > <!-- default element is deprecated -->
-<!ATTLIST quarterContext type ( format | stand-alone ) #REQUIRED >
-<!ATTLIST quarterContext alt NMTOKENS #IMPLIED >
-<!ATTLIST quarterContext draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST quarterContext references CDATA #IMPLIED >
-<!ATTLIST quarterContext validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT quarterWidth ( alias | (quarter*, special*)) >
-<!ATTLIST quarterWidth type ( abbreviated| narrow | wide ) #REQUIRED >
-<!ATTLIST quarterWidth alt NMTOKENS #IMPLIED >
-<!ATTLIST quarterWidth draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST quarterWidth references CDATA #IMPLIED >
-<!ATTLIST quarterWidth validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT quarter ( #PCDATA ) >
-<!ATTLIST quarter type ( 1 | 2 | 3 | 4 ) #REQUIRED >
-<!ATTLIST quarter alt NMTOKENS #IMPLIED >
-<!ATTLIST quarter draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST quarter references CDATA #IMPLIED >
-
-
-<!-- START_DEPRECATED-->
-
-<!ELEMENT dayAbbr ( alias | (day*, special*)) > <!-- deprecated -->
-<!ATTLIST dayAbbr draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT dayNames ( alias | (day*, special*)) > <!-- deprecated -->
-<!ATTLIST dayNames draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-
-<!ELEMENT week (alias | (minDays*, firstDay*, weekendStart*, weekendEnd*, special*)) > <!-- deprecated, use supplemental weekData -->
-<!ATTLIST week alt NMTOKENS #IMPLIED >
-<!ATTLIST week draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST week standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST week references CDATA #IMPLIED >
-<!ATTLIST week validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT minDays (special*) > <!-- deprecated in ldml, use supplemental -->
-<!ATTLIST minDays count ( 1 | 2 | 3 | 4 | 5 | 6 | 7 ) #REQUIRED >
-<!ATTLIST minDays alt NMTOKENS #IMPLIED >
-<!ATTLIST minDays draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST minDays references CDATA #IMPLIED >
-
-<!ELEMENT firstDay (special*) > <!-- deprecated in ldml, use supplemental -->
-<!ATTLIST firstDay day ( sun | mon | tue | wed | thu | fri | sat ) #REQUIRED >
-<!ATTLIST firstDay alt NMTOKENS #IMPLIED >
-<!ATTLIST firstDay draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST firstDay references CDATA #IMPLIED >
-
-<!ELEMENT weekendStart (special*) > <!-- deprecated in ldml, use supplemental -->
-<!ATTLIST weekendStart day ( sun | mon | tue | wed | thu | fri | sat ) #REQUIRED >
-<!ATTLIST weekendStart time CDATA "00:00" > <!-- the "time" attribute is deprecated everywhere. -->
-<!ATTLIST weekendStart alt NMTOKENS #IMPLIED >
-<!ATTLIST weekendStart draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST weekendStart references CDATA #IMPLIED >
-
-<!ELEMENT weekendEnd (special*) > <!-- deprecated in ldml, use supplemental -->
-<!ATTLIST weekendEnd day ( sun | mon | tue | wed | thu | fri | sat ) #REQUIRED >
-<!ATTLIST weekendEnd time CDATA "24:00" > <!-- the "time" attribute is deprecated everywhere. -->
-<!ATTLIST weekendEnd alt NMTOKENS #IMPLIED >
-<!ATTLIST weekendEnd draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST weekendEnd references CDATA #IMPLIED >
-
-<!-- END_DEPRECATED-->
-
-<!ELEMENT dayPeriods ( alias | (dayPeriodContext*) ) >
-<!ATTLIST dayPeriods draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > 
-<!ATTLIST dayPeriods references CDATA #IMPLIED >
-
-<!ELEMENT dayPeriodContext (alias | dayPeriodWidth*) >
-<!ATTLIST dayPeriodContext type NMTOKEN #REQUIRED >
-<!ATTLIST dayPeriodContext draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > 
-<!ATTLIST dayPeriodContext references CDATA #IMPLIED >
-
-<!ELEMENT dayPeriodWidth (alias | dayPeriod*) >
-<!ATTLIST dayPeriodWidth type ( abbreviated| narrow | wide ) #REQUIRED >
-<!ATTLIST dayPeriodWidth draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > 
-<!ATTLIST dayPeriodWidth references CDATA #IMPLIED >
-
-<!ELEMENT dayPeriod ( #PCDATA ) >
-<!ATTLIST dayPeriod type NMTOKEN #REQUIRED >
-<!ATTLIST dayPeriod alt NMTOKENS #IMPLIED >
-<!ATTLIST dayPeriod draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST dayPeriod references CDATA #IMPLIED > 
-
-<!ELEMENT am ( #PCDATA ) > <!-- deprecated, use dayPeriods -->
-<!ATTLIST am alt NMTOKENS #IMPLIED >
-<!ATTLIST am draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST am references CDATA #IMPLIED >
-<!ATTLIST am validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT pm ( #PCDATA ) > <!-- deprecated, use dayPeriods -->
-<!ATTLIST pm alt NMTOKENS #IMPLIED >
-<!ATTLIST pm draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST pm references CDATA #IMPLIED >
-<!ATTLIST pm validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT eras   (alias | (eraNames?, eraAbbr?, eraNarrow?, special*)) >
-<!ATTLIST eras alt NMTOKENS #IMPLIED >
-<!ATTLIST eras draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST eras standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST eras references CDATA #IMPLIED >
-<!ATTLIST eras validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT eraNames ( alias | (era*, special*) ) >
-<!ATTLIST eraNames alt NMTOKENS #IMPLIED >
-<!ATTLIST eraNames draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST eraNames references CDATA #IMPLIED >
-<!ATTLIST eraNames validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT eraAbbr ( alias | (era*, special*) ) >
-<!ATTLIST eraAbbr alt NMTOKENS #IMPLIED >
-<!ATTLIST eraAbbr draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST eraAbbr references CDATA #IMPLIED >
-<!ATTLIST eraAbbr validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT eraNarrow ( alias | (era*, special*) ) >
-<!ATTLIST eraNarrow alt NMTOKENS #IMPLIED >
-<!ATTLIST eraNarrow draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST eraNarrow references CDATA #IMPLIED >
-<!ATTLIST eraNarrow validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT era (#PCDATA) >
-<!ATTLIST era type NMTOKEN #REQUIRED >
-<!ATTLIST era alt NMTOKENS #IMPLIED >
-<!ATTLIST era draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST era references CDATA #IMPLIED >
-
-<!ELEMENT cyclicNameSets ( alias | (cyclicNameSet*, special*)) >
-<!ATTLIST cyclicNameSets alt NMTOKENS #IMPLIED >
-<!ATTLIST cyclicNameSets draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST cyclicNameSets references CDATA #IMPLIED >
-<!ATTLIST cyclicNameSets validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT cyclicNameSet ( alias | (cyclicNameContext*, special*)) >
-<!ATTLIST cyclicNameSet type ( years | months | days | dayParts | zodiacs | solarTerms ) #REQUIRED >
-<!ATTLIST cyclicNameSet alt NMTOKENS #IMPLIED >
-<!ATTLIST cyclicNameSet draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST cyclicNameSet references CDATA #IMPLIED >
-<!ATTLIST cyclicNameSet validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT cyclicNameContext ( alias | (cyclicNameWidth*, special*)) >
-<!ATTLIST cyclicNameContext type ( format | stand-alone ) #REQUIRED >
-<!ATTLIST cyclicNameContext alt NMTOKENS #IMPLIED >
-<!ATTLIST cyclicNameContext draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST cyclicNameContext references CDATA #IMPLIED >
-<!ATTLIST cyclicNameContext validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT cyclicNameWidth ( alias | (cyclicName*, special*)) >
-<!ATTLIST cyclicNameWidth type ( abbreviated | narrow | wide ) #REQUIRED >
-<!ATTLIST cyclicNameWidth alt NMTOKENS #IMPLIED >
-<!ATTLIST cyclicNameWidth draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST cyclicNameWidth references CDATA #IMPLIED >
-<!ATTLIST cyclicNameWidth validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT cyclicName ( #PCDATA ) >
-<!ATTLIST cyclicName type NMTOKEN #REQUIRED >
-<!ATTLIST cyclicName alt NMTOKENS #IMPLIED >
-<!ATTLIST cyclicName draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST cyclicName references CDATA #IMPLIED >
-
-<!ELEMENT dateFormats (alias | (default*, dateFormatLength*, special*)) > <!-- default element is deprecated -->
-<!ATTLIST dateFormats draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST dateFormats validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT dateFormatLength (alias | (default*, dateFormat*, special*)) > <!-- default element is deprecated -->
-<!ATTLIST dateFormatLength type ( full | long | medium | short ) #REQUIRED >
-<!ATTLIST dateFormatLength alt NMTOKENS #IMPLIED >
-<!ATTLIST dateFormatLength draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST dateFormatLength standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST dateFormatLength references CDATA #IMPLIED >
-<!ATTLIST dateFormatLength validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT dateFormat (alias | (pattern*, displayName*, special*))  >
-<!ATTLIST dateFormat type NMTOKEN "standard">
-<!ATTLIST dateFormat alt NMTOKENS #IMPLIED >
-<!ATTLIST dateFormat draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST dateFormat standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST dateFormat references CDATA #IMPLIED >
-<!ATTLIST dateFormat validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT displayName ( #PCDATA ) >
-<!ATTLIST displayName count (0 | 1 | zero | one | two | few | many | other) #IMPLIED> <!-- only for currencies -->
-<!ATTLIST displayName alt NMTOKENS #IMPLIED >
-<!ATTLIST displayName draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST displayName references CDATA #IMPLIED >
-
-<!ELEMENT timeFormats (alias | (default*, timeFormatLength*, special*)) > <!-- default element is deprecated -->
-<!ATTLIST timeFormats draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST timeFormats validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT timeFormatLength (alias | (default*, timeFormat*, special*)) > <!-- default element is deprecated -->
-<!ATTLIST timeFormatLength type ( full | long | medium | short ) #REQUIRED >
-<!ATTLIST timeFormatLength alt NMTOKENS #IMPLIED >
-<!ATTLIST timeFormatLength draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST timeFormatLength standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST timeFormatLength references CDATA #IMPLIED >
-<!ATTLIST timeFormatLength validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT timeFormat (alias | (pattern*, displayName*, special*)) >
-<!ATTLIST timeFormat type NMTOKEN "standard" >
-<!ATTLIST timeFormat alt NMTOKENS #IMPLIED >
-<!ATTLIST timeFormat draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST timeFormat standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST timeFormat references CDATA #IMPLIED >
-<!ATTLIST timeFormat validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT dateTimeFormats (alias | (default*, dateTimeFormatLength*, availableFormats*, appendItems*, intervalFormats*, special*)) > <!-- default element is deprecated -->
-<!ATTLIST dateTimeFormats draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST dateTimeFormats validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT dateTimeFormatLength (alias | (default*, dateTimeFormat*, special*)) > <!-- default element is deprecated -->
-<!ATTLIST dateTimeFormatLength type ( full | long | medium | short ) #IMPLIED >
-<!ATTLIST dateTimeFormatLength alt NMTOKENS #IMPLIED >
-<!ATTLIST dateTimeFormatLength draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST dateTimeFormatLength standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST dateTimeFormatLength references CDATA #IMPLIED >
-<!ATTLIST dateTimeFormatLength validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT dateTimeFormat (alias | (pattern*, displayName*, special*)) >
-<!ATTLIST dateTimeFormat type NMTOKEN "standard"  >
-<!ATTLIST dateTimeFormat alt NMTOKENS #IMPLIED >
-<!ATTLIST dateTimeFormat draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST dateTimeFormat standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST dateTimeFormat references CDATA #IMPLIED >
-<!ATTLIST dateTimeFormat validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT availableFormats (alias | (dateFormatItem*, special*)) >
-<!ATTLIST availableFormats alt NMTOKENS #IMPLIED >
-<!ATTLIST availableFormats draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST availableFormats references CDATA #IMPLIED >
-<!ATTLIST availableFormats validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT appendItems (alias | (appendItem*, special*)) >
-<!ATTLIST appendItems alt NMTOKENS #IMPLIED >
-<!ATTLIST appendItems draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST appendItems references CDATA #IMPLIED >
-<!ATTLIST appendItems validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT dateFormatItem ( #PCDATA ) >
-<!ATTLIST dateFormatItem id CDATA #REQUIRED >
-<!ATTLIST dateFormatItem alt NMTOKENS #IMPLIED >
-<!ATTLIST dateFormatItem draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST dateFormatItem references CDATA #IMPLIED >
-
-<!ELEMENT appendItem ( #PCDATA ) >
-<!ATTLIST appendItem request CDATA #REQUIRED >
-<!ATTLIST appendItem alt NMTOKENS #IMPLIED >
-<!ATTLIST appendItem draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST appendItem references CDATA #IMPLIED >
-
-<!ELEMENT intervalFormats (alias | (intervalFormatFallback*, intervalFormatItem*, special*)) >
-<!ATTLIST intervalFormats alt NMTOKENS #IMPLIED >
-<!ATTLIST intervalFormats draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST intervalFormats references CDATA #IMPLIED >
-<!ATTLIST intervalFormats validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT intervalFormatFallback ( #PCDATA ) >
-<!ATTLIST intervalFormatFallback alt NMTOKENS #IMPLIED >
-<!ATTLIST intervalFormatFallback draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST intervalFormatFallback references CDATA #IMPLIED >
-<!ATTLIST intervalFormatFallback validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT intervalFormatItem (alias | (greatestDifference*, special*)) >
-<!ATTLIST intervalFormatItem id NMTOKEN #REQUIRED >
-<!ATTLIST intervalFormatItem alt NMTOKENS #IMPLIED >
-<!ATTLIST intervalFormatItem draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST intervalFormatItem references CDATA #IMPLIED >
-<!ATTLIST intervalFormatItem validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT greatestDifference ( #PCDATA ) >
-<!ATTLIST greatestDifference id NMTOKEN #REQUIRED >
-<!ATTLIST greatestDifference alt NMTOKENS #IMPLIED >
-<!ATTLIST greatestDifference draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST greatestDifference references CDATA #IMPLIED >
-<!ATTLIST greatestDifference validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-
-<!ELEMENT timeZoneNames (alias | (hourFormat*, hoursFormat*, gmtFormat*, gmtZeroFormat*, regionFormat*, fallbackFormat*, fallbackRegionFormat*, abbreviationFallback*, preferenceOrdering*, singleCountries*, default*, zone*, metazone*, special*)) > <!-- default element is deprecated -->
-<!ATTLIST timeZoneNames draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST timeZoneNames validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT hourFormat ( #PCDATA ) >
-<!ATTLIST hourFormat alt NMTOKENS #IMPLIED >
-<!ATTLIST hourFormat draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST hourFormat references CDATA #IMPLIED >
-
-<!ELEMENT hoursFormat ( #PCDATA ) > <!-- deprecated. -->
-<!ATTLIST hoursFormat alt NMTOKENS #IMPLIED >
-<!ATTLIST hoursFormat draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST hoursFormat references CDATA #IMPLIED >
-
-<!ELEMENT gmtFormat ( #PCDATA ) >
-<!ATTLIST gmtFormat alt NMTOKENS #IMPLIED >
-<!ATTLIST gmtFormat draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST gmtFormat references CDATA #IMPLIED >
-
-<!ELEMENT gmtZeroFormat ( #PCDATA ) >
-<!ATTLIST gmtZeroFormat alt NMTOKENS #IMPLIED >
-<!ATTLIST gmtZeroFormat draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST gmtZeroFormat references CDATA #IMPLIED >
-
-<!ELEMENT regionFormat ( #PCDATA ) >
-<!ATTLIST regionFormat type ( standard | daylight ) #IMPLIED >
-<!ATTLIST regionFormat alt NMTOKENS #IMPLIED >
-<!ATTLIST regionFormat draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST regionFormat references CDATA #IMPLIED >
-
-<!ELEMENT fallbackFormat ( #PCDATA ) >
-<!ATTLIST fallbackFormat alt NMTOKENS #IMPLIED >
-<!ATTLIST fallbackFormat draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST fallbackFormat references CDATA #IMPLIED >
-
-<!ELEMENT fallbackRegionFormat ( #PCDATA ) > <!-- deprecated -->
-<!ATTLIST fallbackRegionFormat alt NMTOKENS #IMPLIED >
-<!ATTLIST fallbackRegionFormat draft ( approved | contributed | provisional | unconfirmed) #IMPLIED >
-<!ATTLIST fallbackRegionFormat references CDATA #IMPLIED >
-
-<!ELEMENT abbreviationFallback EMPTY > <!-- deprecated. -->
-<!ATTLIST abbreviationFallback type ( GMT | standard ) #IMPLIED > <!-- deprecated in favor of choice -->
-<!ATTLIST abbreviationFallback choice ( GMT | standard ) #IMPLIED > <!-- really required, but needs to be optional to support type also -->
-<!ATTLIST abbreviationFallback alt NMTOKENS #IMPLIED >
-<!ATTLIST abbreviationFallback draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST abbreviationFallback references CDATA #IMPLIED >
-
-<!ELEMENT preferenceOrdering EMPTY > <!-- deprecated, use metazones instead -->
-<!ATTLIST preferenceOrdering type CDATA #IMPLIED > <!-- deprecated in favor of choice -->
-<!ATTLIST preferenceOrdering choice CDATA #IMPLIED > <!-- really required, but needs to be optional to support type also -->
-<!ATTLIST preferenceOrdering alt NMTOKENS #IMPLIED >
-<!ATTLIST preferenceOrdering draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST preferenceOrdering references CDATA #IMPLIED >
-
-<!ELEMENT singleCountries EMPTY > <!-- deprecated -->
-<!ATTLIST singleCountries list CDATA #REQUIRED >
-<!ATTLIST singleCountries alt NMTOKENS #IMPLIED >
-<!ATTLIST singleCountries draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST singleCountries references CDATA #IMPLIED >
-
-<!ELEMENT zone (alias | ( long*, short*, commonlyUsed*, exemplarCity*, special*)) >
-<!ATTLIST zone type CDATA #REQUIRED >
-<!ATTLIST zone alt NMTOKENS #IMPLIED >
-<!ATTLIST zone draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST zone standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST zone references CDATA #IMPLIED >
-<!ATTLIST zone validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT metazone (alias | ( long*, short*, commonlyUsed*, special*)) >
-<!ATTLIST metazone type CDATA #REQUIRED >
-<!ATTLIST metazone alt NMTOKENS #IMPLIED >
-<!ATTLIST metazone draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST metazone standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST metazone references CDATA #IMPLIED >
-<!ATTLIST metazone validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT long (alias | (generic*, standard*, daylight*, special*)) >
-<!ATTLIST long alt NMTOKENS #IMPLIED >
-<!ATTLIST long draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST long references CDATA #IMPLIED >
-<!ATTLIST long validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT short (alias | (generic*, standard*, daylight*, special*)) >
-<!ATTLIST short alt NMTOKENS #IMPLIED >
-<!ATTLIST short draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST short references CDATA #IMPLIED >
-<!ATTLIST short validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT generic ( #PCDATA ) >
-<!ATTLIST generic alt NMTOKENS #IMPLIED >
-<!ATTLIST generic draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST generic references CDATA #IMPLIED >
-
-
-<!ELEMENT standard ( #PCDATA ) >
-<!ATTLIST standard alt NMTOKENS #IMPLIED >
-<!ATTLIST standard draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST standard references CDATA #IMPLIED >
-
-
-<!ELEMENT daylight ( #PCDATA ) >
-<!ATTLIST daylight alt NMTOKENS #IMPLIED >
-<!ATTLIST daylight draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST daylight references CDATA #IMPLIED >
-
-
-<!ELEMENT commonlyUsed ( #PCDATA ) > <!-- deprecated -->
-<!ATTLIST commonlyUsed used ( true | false ) #IMPLIED >
-<!ATTLIST commonlyUsed alt NMTOKENS #IMPLIED >
-<!ATTLIST commonlyUsed draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST commonlyUsed references CDATA #IMPLIED >
-
-
-<!ELEMENT exemplarCity ( #PCDATA ) >
-<!ATTLIST exemplarCity alt NMTOKENS #IMPLIED >
-<!ATTLIST exemplarCity draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST exemplarCity references CDATA #IMPLIED >
-
-<!ELEMENT usesMetazone EMPTY >
-<!ATTLIST usesMetazone mzone NMTOKEN #REQUIRED >
-<!ATTLIST usesMetazone from CDATA #IMPLIED >
-<!ATTLIST usesMetazone to CDATA #IMPLIED >
-<!ATTLIST usesMetazone alt NMTOKENS #IMPLIED >
-<!ATTLIST usesMetazone draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST usesMetazone references CDATA #IMPLIED >
-
-
-<!ELEMENT fields ( alias | (field*, special*)) >
-<!ATTLIST fields alt NMTOKENS #IMPLIED >
-<!ATTLIST fields draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST fields standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST fields references CDATA #IMPLIED >
-<!ATTLIST fields validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT field ( alias | (displayName*, relative*, relativeTime*, special*)) >
-<!ATTLIST field type ( era | year | year-short | year-narrow | quarter | quarter-short | quarter-narrow | month | month-short | month-narrow | week | week-short | week-narrow | day | day-short | day-narrow | weekday | sun | sun-short | sun-narrow | mon | mon-short | mon-narrow | tue | tue-short | tue-narrow | wed | wed-short | wed-narrow | thu | thu-short | thu-narrow | fri | fri-short | fri-narrow | sat | sat-short | sat-narrow | dayperiod | hour | hour-short | hour-narrow | minute | minute-short | minute-narrow | second | second-short | second-narrow | zone ) #IMPLIED >
-<!ATTLIST field alt NMTOKENS #IMPLIED >
-<!ATTLIST field draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST field standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST field references CDATA #IMPLIED >
-<!ATTLIST field validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-
-<!ELEMENT relative (#PCDATA) >
-<!ATTLIST relative type NMTOKEN #IMPLIED >
-<!ATTLIST relative alt NMTOKENS #IMPLIED >
-<!ATTLIST relative draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST relative references CDATA #IMPLIED >
-<!ATTLIST relative validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT relativeTime ( alias | (relativeTimePattern*, special*)) >
-<!ATTLIST relativeTime type NMTOKEN #REQUIRED >
-<!ATTLIST relativeTime alt NMTOKENS #IMPLIED >
-<!ATTLIST relativeTime draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST relativeTime references CDATA #IMPLIED >
-<!ATTLIST relativeTime validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT relativeTimePattern ( #PCDATA ) >
-<!ATTLIST relativeTimePattern count ( zero | one | two | few | many | other ) #REQUIRED >
-<!ATTLIST relativeTimePattern alt NMTOKENS #IMPLIED >
-<!ATTLIST relativeTimePattern draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST relativeTimePattern references CDATA #IMPLIED >
-<!ATTLIST relativeTimePattern validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!-- ######################################################### -->
-
-
-<!-- ######################################################### -->
-
-<!ELEMENT numbers (alias | (defaultNumberingSystem*, otherNumberingSystems*, minimumGroupingDigits*, symbols*, decimalFormats*, scientificFormats*, percentFormats*, currencyFormats*, currencies?, miscPatterns*, special*)) >
-<!ATTLIST numbers alt NMTOKENS #IMPLIED >
-<!ATTLIST numbers draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST numbers standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST numbers references CDATA #IMPLIED >
-<!ATTLIST numbers validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT defaultNumberingSystem ( #PCDATA ) >
-<!ATTLIST defaultNumberingSystem alt NMTOKENS #IMPLIED >
-<!ATTLIST defaultNumberingSystem draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST defaultNumberingSystem references CDATA #IMPLIED >
-
-<!ELEMENT otherNumberingSystems ( alias | ( native*, traditional*, finance*)) >
-<!ATTLIST otherNumberingSystems alt NMTOKENS #IMPLIED >
-<!ATTLIST otherNumberingSystems draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT native ( #PCDATA ) >
-<!ATTLIST native alt NMTOKENS #IMPLIED >
-<!ATTLIST native draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT traditional ( #PCDATA ) >
-<!ATTLIST traditional alt NMTOKENS #IMPLIED >
-<!ATTLIST traditional draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT finance ( #PCDATA ) >
-<!ATTLIST finance alt NMTOKENS #IMPLIED >
-<!ATTLIST finance draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT symbols (alias | (decimal*, group*, list*, percentSign*, nativeZeroDigit*, patternDigit*, plusSign*, minusSign*, exponential*, superscriptingExponent*, perMille*, infinity*, nan*, currencyDecimal*, currencyGroup*, timeSeparator*, special*)) >
-<!ATTLIST symbols alt NMTOKENS #IMPLIED >
-<!ATTLIST symbols draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST symbols standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST symbols references CDATA #IMPLIED >
-<!ATTLIST symbols validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-<!ATTLIST symbols numberSystem CDATA #IMPLIED >
-
-<!ELEMENT decimal ( #PCDATA ) >
-<!ATTLIST decimal alt NMTOKENS #IMPLIED >
-<!ATTLIST decimal draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST decimal references CDATA #IMPLIED >
-<!ATTLIST decimal numberSystem CDATA #IMPLIED > <!-- deprecated -->
-
-<!ELEMENT group ( #PCDATA ) >
-<!ATTLIST group alt NMTOKENS #IMPLIED >
-<!ATTLIST group draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST group references CDATA #IMPLIED >
-<!ATTLIST group numberSystem CDATA #IMPLIED > <!-- deprecated -->
-
-<!ELEMENT list ( #PCDATA ) >
-<!ATTLIST list alt NMTOKENS #IMPLIED >
-<!ATTLIST list draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST list references CDATA #IMPLIED >
-<!ATTLIST list numberSystem CDATA #IMPLIED > <!-- deprecated -->
-
-<!ELEMENT percentSign ( #PCDATA ) >
-<!ATTLIST percentSign alt NMTOKENS #IMPLIED >
-<!ATTLIST percentSign draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST percentSign references CDATA #IMPLIED >
-<!ATTLIST percentSign numberSystem CDATA #IMPLIED > <!-- deprecated -->
-
-<!ELEMENT nativeZeroDigit ( #PCDATA ) >
-<!ATTLIST nativeZeroDigit alt NMTOKENS #IMPLIED >
-<!ATTLIST nativeZeroDigit draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST nativeZeroDigit references CDATA #IMPLIED >
-<!ATTLIST nativeZeroDigit numberSystem CDATA #IMPLIED > <!-- deprecated -->
-
-<!ELEMENT patternDigit ( #PCDATA ) >
-<!ATTLIST patternDigit alt NMTOKENS #IMPLIED >
-<!ATTLIST patternDigit draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST patternDigit references CDATA #IMPLIED >
-<!ATTLIST patternDigit numberSystem CDATA #IMPLIED > <!-- deprecated -->
-
-<!ELEMENT plusSign ( #PCDATA ) >
-<!ATTLIST plusSign alt NMTOKENS #IMPLIED >
-<!ATTLIST plusSign draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST plusSign references CDATA #IMPLIED >
-<!ATTLIST plusSign numberSystem CDATA #IMPLIED > <!-- deprecated -->
-
-<!ELEMENT minusSign ( #PCDATA ) >
-<!ATTLIST minusSign alt NMTOKENS #IMPLIED >
-<!ATTLIST minusSign draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST minusSign references CDATA #IMPLIED >
-<!ATTLIST minusSign numberSystem CDATA #IMPLIED > <!-- deprecated -->
-
-<!ELEMENT exponential ( #PCDATA ) >
-<!ATTLIST exponential alt NMTOKENS #IMPLIED >
-<!ATTLIST exponential draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST exponential references CDATA #IMPLIED >
-<!ATTLIST exponential numberSystem CDATA #IMPLIED > <!-- deprecated -->
-
-<!ELEMENT superscriptingExponent ( #PCDATA ) >
-<!ATTLIST superscriptingExponent alt NMTOKENS #IMPLIED >
-<!ATTLIST superscriptingExponent draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST superscriptingExponent references CDATA #IMPLIED >
-
-<!ELEMENT perMille ( #PCDATA ) >
-<!ATTLIST perMille alt NMTOKENS #IMPLIED >
-<!ATTLIST perMille draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST perMille references CDATA #IMPLIED >
-<!ATTLIST perMille numberSystem CDATA #IMPLIED > <!-- deprecated -->
-
-<!ELEMENT infinity ( #PCDATA ) >
-<!ATTLIST infinity alt NMTOKENS #IMPLIED >
-<!ATTLIST infinity draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST infinity references CDATA #IMPLIED >
-<!ATTLIST infinity numberSystem CDATA #IMPLIED > <!-- deprecated -->
-
-<!ELEMENT nan ( #PCDATA ) >
-<!ATTLIST nan alt NMTOKENS #IMPLIED >
-<!ATTLIST nan draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST nan references CDATA #IMPLIED >
-<!ATTLIST nan numberSystem CDATA #IMPLIED > <!-- deprecated -->
-
-<!ELEMENT timeSeparator ( #PCDATA ) >
-<!ATTLIST timeSeparator alt NMTOKENS #IMPLIED >
-<!ATTLIST timeSeparator draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > 
-<!ATTLIST timeSeparator references CDATA #IMPLIED >
-
-<!ELEMENT minimumGroupingDigits ( #PCDATA ) >
-<!ATTLIST minimumGroupingDigits alt NMTOKENS #IMPLIED >
-<!ATTLIST minimumGroupingDigits draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > 
-<!ATTLIST minimumGroupingDigits references CDATA #IMPLIED >
-
-<!ELEMENT currencyDecimal ( #PCDATA ) >
-<!ATTLIST currencyDecimal alt NMTOKENS #IMPLIED >
-<!ATTLIST currencyDecimal draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST currencyDecimal references CDATA #IMPLIED >
-<!ATTLIST currencyDecimal numberSystem CDATA #IMPLIED > <!-- deprecated -->
-
-<!ELEMENT currencyGroup ( #PCDATA ) >
-<!ATTLIST currencyGroup alt NMTOKENS #IMPLIED >
-<!ATTLIST currencyGroup draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST currencyGroup references CDATA #IMPLIED >
-<!ATTLIST currencyGroup numberSystem CDATA #IMPLIED > <!-- deprecated -->
-
-<!ELEMENT pattern ( #PCDATA ) >
-<!ATTLIST pattern type NMTOKEN "standard" >
-<!ATTLIST pattern numbers CDATA #IMPLIED >
-<!ATTLIST pattern count (0 | 1 | zero | one | two | few | many | other) #IMPLIED > <!-- Only used for decimalFormats type="1000..." -->
-<!ATTLIST pattern alt NMTOKENS #IMPLIED >
-<!ATTLIST pattern draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST pattern references CDATA #IMPLIED >
-
-<!ELEMENT decimalFormats (alias | (default*, decimalFormatLength*, special*)) > <!-- default element is deprecated -->
-<!ATTLIST decimalFormats draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST decimalFormats validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-<!ATTLIST decimalFormats numberSystem CDATA #IMPLIED >
-
-<!ELEMENT decimalFormatLength (alias | (default*, decimalFormat*, special*)) > <!-- default element is deprecated -->
-<!ATTLIST decimalFormatLength type ( full | long | medium | short ) #IMPLIED >
-<!ATTLIST decimalFormatLength alt NMTOKENS #IMPLIED >
-<!ATTLIST decimalFormatLength draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST decimalFormatLength standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST decimalFormatLength references CDATA #IMPLIED >
-<!ATTLIST decimalFormatLength validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT decimalFormat (alias | (pattern*, special*)) >
-<!ATTLIST decimalFormat type NMTOKEN "standard" >
-<!ATTLIST decimalFormat alt NMTOKENS #IMPLIED >
-<!ATTLIST decimalFormat draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST decimalFormat standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST decimalFormat references CDATA #IMPLIED >
-<!ATTLIST decimalFormat validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT scientificFormats (alias | (default*, scientificFormatLength*, special*)) > <!-- default element is deprecated -->
-<!ATTLIST scientificFormats draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST scientificFormats validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-<!ATTLIST scientificFormats numberSystem CDATA #IMPLIED >
-
-<!ELEMENT scientificFormatLength (alias | (default*, scientificFormat*, special*)) > <!-- default element is deprecated -->
-<!ATTLIST scientificFormatLength type ( full | long | medium | short ) #IMPLIED >
-<!ATTLIST scientificFormatLength alt NMTOKENS #IMPLIED >
-<!ATTLIST scientificFormatLength draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST scientificFormatLength standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST scientificFormatLength references CDATA #IMPLIED >
-<!ATTLIST scientificFormatLength validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT scientificFormat (alias | (pattern*, special*)) >
-<!ATTLIST scientificFormat type NMTOKEN "standard" >
-<!ATTLIST scientificFormat alt NMTOKENS #IMPLIED >
-<!ATTLIST scientificFormat draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST scientificFormat standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST scientificFormat references CDATA #IMPLIED >
-<!ATTLIST scientificFormat validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT percentFormats (alias | (default*, percentFormatLength*, special*)) > <!-- default element is deprecated -->
-<!ATTLIST percentFormats draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST percentFormats validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-<!ATTLIST percentFormats numberSystem CDATA #IMPLIED >
-
-<!ELEMENT percentFormatLength (alias | (default*, percentFormat*, special*)) > <!-- default element is deprecated -->
-<!ATTLIST percentFormatLength type ( full | long | medium | short ) #IMPLIED >
-<!ATTLIST percentFormatLength alt NMTOKENS #IMPLIED >
-<!ATTLIST percentFormatLength draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST percentFormatLength standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST percentFormatLength references CDATA #IMPLIED >
-<!ATTLIST percentFormatLength validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT percentFormat (alias | (pattern*, special*)) >
-<!ATTLIST percentFormat type NMTOKEN "standard" >
-<!ATTLIST percentFormat alt NMTOKENS #IMPLIED >
-<!ATTLIST percentFormat draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST percentFormat standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST percentFormat references CDATA #IMPLIED >
-<!ATTLIST percentFormat validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT currencyFormats (alias | (default*, currencySpacing*, currencyFormatLength*, unitPattern*, special*)) > <!-- default element is deprecated -->
-<!ATTLIST currencyFormats draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST currencyFormats validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-<!ATTLIST currencyFormats numberSystem CDATA #IMPLIED >
-
-<!ELEMENT currencySpacing (alias | (beforeCurrency*, afterCurrency*, special*)) >
-<!ELEMENT beforeCurrency (alias | (currencyMatch*, surroundingMatch*, insertBetween*)) >
-<!ELEMENT afterCurrency (alias | (currencyMatch*, surroundingMatch*, insertBetween*)) >
-
-<!ELEMENT surroundingMatch ( #PCDATA ) >
-<!ATTLIST surroundingMatch alt NMTOKENS #IMPLIED >
-<!ATTLIST surroundingMatch draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST surroundingMatch references CDATA #IMPLIED >
-
-<!ELEMENT currencyMatch ( #PCDATA ) >
-<!ATTLIST currencyMatch alt NMTOKENS #IMPLIED >
-<!ATTLIST currencyMatch draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST currencyMatch references CDATA #IMPLIED >
-
-<!ELEMENT insertBetween ( #PCDATA ) >
-<!ATTLIST insertBetween alt NMTOKENS #IMPLIED >
-<!ATTLIST insertBetween draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST insertBetween references CDATA #IMPLIED >
-
-<!ELEMENT currencyFormatLength (alias | (default*, currencyFormat*, special*)) > <!-- default element is deprecated -->
-<!ATTLIST currencyFormatLength type ( full | long | medium | short ) #IMPLIED >
-<!ATTLIST currencyFormatLength alt NMTOKENS #IMPLIED >
-<!ATTLIST currencyFormatLength draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST currencyFormatLength standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST currencyFormatLength references CDATA #IMPLIED >
-<!ATTLIST currencyFormatLength validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT currencyFormat (alias | (pattern*, special*)) >
-<!ATTLIST currencyFormat type NMTOKEN "standard" >
-<!ATTLIST currencyFormat alt NMTOKENS #IMPLIED >
-<!ATTLIST currencyFormat draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST currencyFormat standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST currencyFormat references CDATA #IMPLIED >
-<!ATTLIST currencyFormat validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT currencies (alias | (default?, currency*, special*)) > <!-- default element is deprecated -->
-<!ATTLIST currencies draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST currencies validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT currency (alias | (((pattern+, displayName*, symbol*) | (displayName+, symbol*, pattern*) | (symbol+, pattern*))?, decimal*, group*, special*)) >
-<!-- warning: pattern appears twice in the above. The first is for consistency with all other cases of
-    pattern + displayName; the second is for backwards compatibility -->
-<!ATTLIST currency type NMTOKEN "standard" >
-<!ATTLIST currency alt NMTOKENS #IMPLIED >
-<!ATTLIST currency draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST currency references CDATA #IMPLIED >
-<!ATTLIST currency validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT symbol ( #PCDATA ) >
-<!ATTLIST symbol choice ( true | false ) #IMPLIED > <!-- deprecated -->
-<!ATTLIST symbol alt NMTOKENS #IMPLIED >
-<!ATTLIST symbol draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST symbol references CDATA #IMPLIED >
-
-<!ELEMENT miscPatterns (alias | (default*, pattern*, special*)) > <!-- default element is deprecated -->
-<!ATTLIST miscPatterns draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST miscPatterns numberSystem CDATA #IMPLIED >
-
-<!-- ######################################################### -->
-
-<!ELEMENT units (alias | (unit*, unitLength*, durationUnit*, special*)) >
-<!ATTLIST units alt NMTOKENS #IMPLIED >
-<!ATTLIST units draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST units references CDATA #IMPLIED >
-<!ATTLIST units validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT unitLength (alias | (compoundUnit*, unit*, special*)) >
-<!ATTLIST unitLength type ( long | short | narrow ) #REQUIRED >
-<!ATTLIST unitLength alt NMTOKENS #IMPLIED >
-<!ATTLIST unitLength draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST unitLength references CDATA #IMPLIED >
-<!ATTLIST unitLength validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT compoundUnit (alias | (compoundUnitPattern*, special*)) >
-<!ATTLIST compoundUnit type NMTOKEN #REQUIRED >
-<!ATTLIST compoundUnit alt NMTOKENS #IMPLIED >
-<!ATTLIST compoundUnit draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST compoundUnit references CDATA #IMPLIED >
-<!ATTLIST compoundUnit validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT unit (alias | (displayName*, unitPattern*, perUnitPattern*, special*)) >
-<!ATTLIST unit type NMTOKEN #REQUIRED >
-<!ATTLIST unit alt NMTOKENS #IMPLIED >
-<!ATTLIST unit draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST unit references CDATA #IMPLIED >
-<!ATTLIST unit validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT durationUnit (alias | (durationUnitPattern*, special*)) >
-<!ATTLIST durationUnit type NMTOKEN #REQUIRED >
-<!ATTLIST durationUnit alt NMTOKENS #IMPLIED >
-<!ATTLIST durationUnit draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST durationUnit references CDATA #IMPLIED >
-
-<!ELEMENT unitPattern ( #PCDATA ) >
-<!ATTLIST unitPattern count (0 | 1 | zero | one | two | few | many | other) #REQUIRED >
-<!ATTLIST unitPattern alt NMTOKENS #IMPLIED >
-<!ATTLIST unitPattern draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST unitPattern references CDATA #IMPLIED >
-<!ATTLIST unitPattern validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT perUnitPattern ( #PCDATA ) >
-<!ATTLIST perUnitPattern alt NMTOKENS #IMPLIED >
-<!ATTLIST perUnitPattern draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST perUnitPattern references CDATA #IMPLIED >
-
-<!ELEMENT compoundUnitPattern ( #PCDATA ) >
-<!ATTLIST compoundUnitPattern alt NMTOKENS #IMPLIED >
-<!ATTLIST compoundUnitPattern draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST compoundUnitPattern references CDATA #IMPLIED >
-<!ATTLIST compoundUnitPattern validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT durationUnitPattern ( #PCDATA ) >
-<!ATTLIST durationUnitPattern alt NMTOKENS #IMPLIED >
-<!ATTLIST durationUnitPattern draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST durationUnitPattern references CDATA #IMPLIED >
-<!ATTLIST durationUnitPattern validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT listPatterns (alias | (listPattern*, special*)) >
-<!ATTLIST listPatterns alt NMTOKENS #IMPLIED >
-<!ATTLIST listPatterns draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST listPatterns references CDATA #IMPLIED >
-<!ATTLIST listPatterns validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT listPattern (alias | (listPatternPart*, special*)) >
-<!ATTLIST listPattern type NMTOKEN #IMPLIED >
-<!ATTLIST listPattern alt NMTOKENS #IMPLIED >
-<!ATTLIST listPattern draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST listPattern references CDATA #IMPLIED >
-<!ATTLIST listPattern validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT listPatternPart ( #PCDATA ) >
-<!ATTLIST listPatternPart type (start | middle | end | 2 | 3) #REQUIRED >
-<!ATTLIST listPatternPart alt NMTOKENS #IMPLIED >
-<!ATTLIST listPatternPart draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST listPatternPart references CDATA #IMPLIED >
-<!ATTLIST listPatternPart validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!-- ######################################################### -->
-
-<!ELEMENT collations (alias | (defaultCollation?, default*, collation*, special*)) > <!-- default element is deprecated -->
-<!ATTLIST collations version NMTOKEN #IMPLIED >
-<!ATTLIST collations draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST collations validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT defaultCollation ( #PCDATA ) >
-
-<!ELEMENT collation (alias | (base?, import*, settings?, suppress_contractions?, optimize?, (cr* | rules?), special*)) >
-<!ATTLIST collation type NMTOKEN "standard" >
-<!ATTLIST collation visibility ( internal | external ) "external" >  <!-- deprecated -->
-<!ATTLIST collation alt NMTOKENS #IMPLIED >
-<!ATTLIST collation draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST collation standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. -->
-<!ATTLIST collation references CDATA #IMPLIED >
-<!ATTLIST collation validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT base (alias|special) > <!-- deprecated collations/collation/base, see CLDR ticket #6332 -->
-
-<!ELEMENT import EMPTY >
-<!ATTLIST import source CDATA #REQUIRED > <!-- value "locale" is deprecated -->
-<!ATTLIST import type CDATA #IMPLIED >
-
-<!ELEMENT settings (special*) >
-<!ATTLIST settings strength             ( primary | secondary | tertiary | quaternary | identical ) #IMPLIED >
-<!ATTLIST settings alternate            ( non-ignorable | shifted ) #IMPLIED >
-<!ATTLIST settings backwards            ( on | off)  #IMPLIED >
-<!ATTLIST settings normalization        ( on | off ) #IMPLIED >
-<!ATTLIST settings caseLevel            ( on | off ) #IMPLIED >
-<!ATTLIST settings caseFirst            ( upper | lower | off ) #IMPLIED >
-<!ATTLIST settings hiraganaQuarternary  ( on | off ) #IMPLIED > <!-- deprecated -->
-<!ATTLIST settings hiraganaQuaternary   ( on | off ) #IMPLIED > <!-- deprecated -->
-<!ATTLIST settings maxVariable          ( space | punct | symbol | currency ) #IMPLIED >
-<!ATTLIST settings numeric              ( on | off ) #IMPLIED >
-<!ATTLIST settings private              ( true | false ) #IMPLIED > <!-- deprecated -->
-<!ATTLIST settings variableTop          CDATA #IMPLIED > <!-- deprecated -->
-<!ATTLIST settings reorder              NMTOKENS #IMPLIED >
-
-<!ELEMENT suppress_contractions (  #PCDATA | cp )* >
-
-<!ELEMENT optimize ( #PCDATA | cp )* >
-
-<!ELEMENT cr ( #PCDATA )>
-
-<!-- The rules element and all of its sub-elements are deprecated. Use the cr element instead, with ICU syntax. -->
-
-<!ELEMENT rules (alias | ( ( reset | import ), ( reset | import | p | pc |  s | sc | t | tc | q | qc | i | ic | x)* )) > <!-- deprecated -->
-
-<!ELEMENT reset ( #PCDATA | cp  | first_variable| last_variable | first_tertiary_ignorable | last_tertiary_ignorable | first_secondary_ignorable | last_secondary_ignorable | first_primary_ignorable | last_primary_ignorable | first_non_ignorable | last_non_ignorable | first_trailing | last_trailing )* > <!-- deprecated -->
-<!ATTLIST reset before NMTOKEN #IMPLIED >
-
-<!ELEMENT p  ( #PCDATA  | cp | last_variable )* > <!-- deprecated -->
-
-<!ELEMENT pc ( #PCDATA  | cp | last_variable )* > <!-- deprecated -->
-
-<!ELEMENT s  ( #PCDATA  | cp | last_variable )* > <!-- deprecated -->
-
-<!ELEMENT sc ( #PCDATA  | cp | last_variable )* > <!-- deprecated -->
-
-<!ELEMENT t  ( #PCDATA  | cp | last_variable )* > <!-- deprecated -->
-
-<!ELEMENT tc ( #PCDATA  | cp | last_variable )* > <!-- deprecated -->
-
-<!ELEMENT q  ( #PCDATA  | cp | last_variable )* > <!-- deprecated -->
-
-<!ELEMENT qc ( #PCDATA  | cp | last_variable )* > <!-- deprecated -->
-
-<!ELEMENT i  ( #PCDATA  | cp | last_variable )* > <!-- deprecated -->
-
-<!ELEMENT ic ( #PCDATA  | cp | last_variable )* > <!-- deprecated -->
-
-<!ELEMENT x (context?, (  p | pc |  s | sc | t | tc | q | qc | i | ic )*, extend? )  > <!-- deprecated -->
-
-<!ELEMENT extend ( #PCDATA | cp )* > <!-- deprecated -->
-
-<!ELEMENT context (  #PCDATA | cp )* > <!-- deprecated -->
-
-<!ELEMENT first_variable EMPTY > <!-- deprecated -->
-<!ELEMENT last_variable EMPTY > <!-- deprecated -->
-<!ELEMENT first_tertiary_ignorable EMPTY > <!-- deprecated -->
-<!ELEMENT last_tertiary_ignorable EMPTY > <!-- deprecated -->
-<!ELEMENT first_secondary_ignorable EMPTY > <!-- deprecated -->
-<!ELEMENT last_secondary_ignorable EMPTY > <!-- deprecated -->
-<!ELEMENT first_primary_ignorable EMPTY > <!-- deprecated -->
-<!ELEMENT last_primary_ignorable EMPTY > <!-- deprecated -->
-<!ELEMENT first_non_ignorable EMPTY > <!-- deprecated -->
-<!ELEMENT last_non_ignorable EMPTY > <!-- deprecated -->
-<!ELEMENT first_trailing EMPTY > <!-- deprecated -->
-<!ELEMENT last_trailing EMPTY > <!-- deprecated -->
-
-<!-- ######################################################### -->
-
-<!ELEMENT posix (alias | (messages*, special*)) >
-<!ATTLIST posix draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST posix references CDATA #IMPLIED >
-<!ATTLIST posix validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT messages (alias | ( yesstr*, nostr*, yesexpr*, noexpr*)) >
-<!ATTLIST messages alt NMTOKENS #IMPLIED >
-<!ATTLIST messages draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST messages references CDATA #IMPLIED >
-<!ATTLIST messages validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT yesstr ( #PCDATA ) >
-<!ATTLIST yesstr alt NMTOKENS #IMPLIED >
-<!ATTLIST yesstr draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST yesstr references CDATA #IMPLIED >
-
-<!ELEMENT nostr ( #PCDATA ) >
-<!ATTLIST nostr alt NMTOKENS #IMPLIED >
-<!ATTLIST nostr draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST nostr references CDATA #IMPLIED >
-
-<!-- START_DEPRECATED -->
-<!ELEMENT yesexpr ( #PCDATA ) > <!-- deprecated. -->
-<!ATTLIST yesexpr alt NMTOKENS #IMPLIED >
-<!ATTLIST yesexpr draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST yesexpr references CDATA #IMPLIED >
-
-<!ELEMENT noexpr ( #PCDATA ) > <!-- deprecated. -->
-<!ATTLIST noexpr alt NMTOKENS #IMPLIED >
-<!ATTLIST noexpr draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST noexpr references CDATA #IMPLIED >
-<!-- END_DEPRECATED -->
-
-<!ELEMENT segmentations ( alias | segmentation*) >
-<!ATTLIST segmentations alt NMTOKENS #IMPLIED >
-<!ATTLIST segmentations draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED ><!-- true and false are deprecated. -->
-<!ATTLIST segmentations references CDATA #IMPLIED >
-<!ATTLIST segmentations validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT segmentation ( alias | (variables?, segmentRules?, exceptions?, suppressions?) | special*) >
-<!ATTLIST segmentation type NMTOKEN #REQUIRED >
-<!ATTLIST segmentation alt NMTOKENS #IMPLIED >
-<!ATTLIST segmentation draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED ><!-- true and false are deprecated. -->
-<!ATTLIST segmentation references CDATA #IMPLIED >
-<!ATTLIST segmentation validSubLocales CDATA #IMPLIED > <!-- validSubLocales is deprecated -->
-
-<!ELEMENT variables ( alias | variable*) >
-
-<!ELEMENT variable ( #PCDATA ) >
-<!ATTLIST variable id CDATA #REQUIRED >
-<!ATTLIST variable alt NMTOKENS #IMPLIED >
-<!ATTLIST variable draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED ><!-- true and false are deprecated. -->
-<!ATTLIST variable references CDATA #IMPLIED >
-
-<!ELEMENT segmentRules ( alias | rule*) >
-
-<!ELEMENT rule ( #PCDATA ) >
-<!ATTLIST rule id NMTOKEN #REQUIRED >
-<!ATTLIST rule alt NMTOKENS #IMPLIED >
-<!ATTLIST rule draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED ><!-- true and false are deprecated. -->
-<!ATTLIST rule references CDATA #IMPLIED >
-
-<!ELEMENT exceptions ( exception* ) > <!-- deprecated, use suppressions instead -->
-
-<!ELEMENT exception ( #PCDATA ) > <!-- deprecated -->
-<!ATTLIST exception draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > <!-- deprecated -->
-
-<!ELEMENT suppressions ( suppression* ) >
-<!ATTLIST suppressions type NMTOKEN "standard" >
-<!ATTLIST suppressions draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-
-<!ELEMENT suppression ( #PCDATA ) > <!-- deprecated -->
-
-<!ELEMENT rbnf ( alias | rulesetGrouping*) >
-
-<!ELEMENT rulesetGrouping ( alias | ruleset*) >
-<!ATTLIST rulesetGrouping type NMTOKEN #REQUIRED>
-<!ATTLIST rulesetGrouping draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED ><!-- true and false are deprecated. -->
-
-<!ELEMENT ruleset ( alias | rbnfrule*) >
-<!ATTLIST ruleset type NMTOKEN #REQUIRED>
-<!ATTLIST ruleset access ( public | private ) #IMPLIED >
-<!ATTLIST ruleset allowsParsing ( true | false ) #IMPLIED >
-<!ATTLIST ruleset draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED ><!-- true and false are deprecated. -->
-
-<!ELEMENT rbnfrule ( #PCDATA ) >
-<!ATTLIST rbnfrule value CDATA #REQUIRED >
-<!ATTLIST rbnfrule radix CDATA #IMPLIED >
-<!ATTLIST rbnfrule decexp CDATA #IMPLIED >
-<!ATTLIST rbnfrule draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED ><!-- true and false are deprecated. -->
-
-<!ELEMENT annotations ( annotation* ) >
-
-<!ELEMENT annotation ( #PCDATA ) >
-<!ATTLIST annotation cp CDATA #REQUIRED >
-<!ATTLIST annotation tts CDATA #IMPLIED >
-<!ATTLIST annotation alt NMTOKENS #IMPLIED >
-<!ATTLIST annotation draft ( approved | contributed | provisional | unconfirmed) #IMPLIED >
-
-<!ELEMENT references ( reference* ) > <!-- deprecated. -->
-<!ELEMENT reference ( #PCDATA ) >
-<!ATTLIST reference type NMTOKEN #REQUIRED>
-<!ATTLIST reference uri CDATA #IMPLIED >
-<!ATTLIST reference alt NMTOKENS #IMPLIED >
-<!ATTLIST reference draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST reference standard ( true | false ) #IMPLIED >
-
-<!-- ######################################################### -->
-
-<!-- This element contains metadata for Survey Tool internal use (optimization, etc). -->
-
-<!ELEMENT metadata (casingData?)>
-
-<!ELEMENT casingData (casingItem*)>
-
-<!ELEMENT casingItem (#PCDATA) >
-<!ATTLIST casingItem type CDATA #REQUIRED >
-<!ATTLIST casingItem override (true | false) #IMPLIED >
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/dtd/ldmlSupplemental.dtd b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/dtd/ldmlSupplemental.dtd
deleted file mode 100644
index a33f0585d80..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/dtd/ldmlSupplemental.dtd
+++ /dev/null
@@ -1,553 +0,0 @@
-<!--
-Copyright © 2003-2015 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.
-
-THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
-
-    $Revision: 11344 $
-    $Date: 2015-03-05 00:02:16 -0600 (Thu, 05 Mar 2015) $
--->
-
-<!ELEMENT supplementalData ( version, generation?, cldrVersion?, currencyData?, territoryContainment?, languageData?, territoryInfo?, postalCodeData?, calendarData?, calendarPreferenceData?, weekData?, timeData?, measurementData?, timezoneData?, characters?, transforms?, metadata?, codeMappings?, parentLocales?, likelySubtags?, metazoneInfo?, plurals?, telephoneCodeData?, numberingSystems?, bcp47KeywordMappings?,  gender?, references?, languageMatching?, dayPeriodRuleSet*, metaZones?, primaryZones?, windowsZones?, coverageLevels?) > <!-- metazoneInfo is deprecated here -->
-
-<!ELEMENT version EMPTY >
-<!ATTLIST version number CDATA #REQUIRED >
-<!ATTLIST version cldrVersion CDATA #FIXED "27" >
-<!ATTLIST version unicodeVersion CDATA #FIXED "7.0.0" >
-
-<!ELEMENT generation EMPTY >
-<!ATTLIST generation date CDATA #REQUIRED >
-
-<!ELEMENT cldrVersion EMPTY> <!-- deprecated -->
-<!ATTLIST cldrVersion version CDATA #REQUIRED>
-
-<!ELEMENT currencyData ( fractions*, region+ ) >
-<!ATTLIST currencyData draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT fractions ( info+ ) >
-<!ATTLIST fractions draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT info EMPTY >
-<!ATTLIST info iso4217 NMTOKEN #REQUIRED >
-<!ATTLIST info digits NMTOKEN #IMPLIED >
-<!ATTLIST info rounding NMTOKEN #IMPLIED >
-<!ATTLIST info cashDigits NMTOKEN #IMPLIED >
-<!ATTLIST info cashRounding NMTOKEN #IMPLIED >
-<!ATTLIST info draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST info references CDATA #IMPLIED >
-
-<!ELEMENT region ( currency* ) >
-<!ATTLIST region iso3166 NMTOKEN #REQUIRED >
-<!ATTLIST region draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT currency ( alternate* ) >
-<!ATTLIST currency before NMTOKEN #IMPLIED > <!-- This usage is deprecated. Use from and to. -->
-<!ATTLIST currency from NMTOKEN #IMPLIED >
-<!ATTLIST currency to NMTOKEN #IMPLIED >
-<!ATTLIST currency iso4217 NMTOKEN #REQUIRED >
-<!ATTLIST currency digits NMTOKEN #IMPLIED >
-<!ATTLIST currency rounding NMTOKEN #IMPLIED >
-<!ATTLIST currency cashRounding NMTOKEN #IMPLIED >
-<!ATTLIST currency tender ( true | false ) #IMPLIED >
-<!ATTLIST currency draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST currency references CDATA #IMPLIED >
-
-<!ELEMENT alternate EMPTY > <!-- This usage is deprecated. Use from and to. -->
-<!ATTLIST alternate iso4217 NMTOKEN #REQUIRED >
-
-<!ELEMENT territoryContainment ( group* ) >
-<!ELEMENT group EMPTY >
-<!ATTLIST group type NMTOKEN #REQUIRED >
-<!ATTLIST group contains NMTOKENS #IMPLIED >
-<!ATTLIST group grouping ( true | false )  #IMPLIED >
-<!ATTLIST group status ( deprecated | grouping ) #IMPLIED >
-<!ATTLIST group draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST group references CDATA #IMPLIED >
-
-<!ELEMENT languageData ( language* ) >
-<!ELEMENT language EMPTY >
-<!ATTLIST language type NMTOKEN #REQUIRED >
-<!ATTLIST language scripts NMTOKENS #IMPLIED >
-<!ATTLIST language territories NMTOKENS #IMPLIED >
-<!ATTLIST language variants NMTOKENS #IMPLIED >
-<!ATTLIST language draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST language references CDATA #IMPLIED >
-<!ATTLIST language alt NMTOKENS #IMPLIED >
-
-<!ELEMENT territoryInfo ( territory* ) >
-<!ATTLIST territoryInfo draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST territoryInfo references CDATA #IMPLIED >
-<!ATTLIST territoryInfo alt NMTOKENS #IMPLIED >
-
-<!ELEMENT territory ( languagePopulation* ) >
-<!ATTLIST territory type NMTOKEN #REQUIRED >
-<!ATTLIST territory gdp NMTOKEN #REQUIRED >
-<!ATTLIST territory literacyPercent NMTOKEN #REQUIRED >
-<!ATTLIST territory population NMTOKEN #REQUIRED >
-<!ATTLIST territory draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST territory references CDATA #IMPLIED >
-<!ATTLIST territory alt NMTOKENS #IMPLIED >
-
-<!ELEMENT postalCodeData (postCodeRegex*) > <!-- deprecated -->
-<!ELEMENT postCodeRegex (#PCDATA) > <!-- deprecated -->
-<!ATTLIST postCodeRegex territoryId NMTOKEN #REQUIRED>
-<!ATTLIST postCodeRegex draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT languagePopulation EMPTY >
-<!ATTLIST languagePopulation type NMTOKEN #REQUIRED >
-<!ATTLIST languagePopulation writingPercent NMTOKEN #IMPLIED >
-<!ATTLIST languagePopulation populationPercent NMTOKEN #REQUIRED >
-<!ATTLIST languagePopulation officialStatus (de_facto_official | official | official_regional | official_minority)  #IMPLIED >
-<!ATTLIST languagePopulation draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST languagePopulation references CDATA #IMPLIED >
-<!ATTLIST languagePopulation alt NMTOKENS #IMPLIED >
-
-<!ELEMENT calendarData ( calendar* ) >
-
-<!ELEMENT calendar ( calendarSystem?, eras? ) >
-<!ATTLIST calendar type NMTOKEN #REQUIRED >
-<!ATTLIST calendar territories NMTOKENS #IMPLIED > <!-- territories are deprecated.  use ordering attribute in calendarPreference element instead. -->
-<!ATTLIST calendar draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST calendar references CDATA #IMPLIED >
-<!ATTLIST calendar alt NMTOKENS #IMPLIED >
-
-<!ELEMENT calendarSystem EMPTY >
-<!ATTLIST calendarSystem type (solar | lunar | lunisolar | other) #REQUIRED >
-<!ATTLIST calendarSystem references CDATA #IMPLIED >
-
-<!ELEMENT eras ( era* ) >
-<!ATTLIST eras references CDATA #IMPLIED >
-
-<!ELEMENT era EMPTY >
-<!ATTLIST era type NMTOKEN #REQUIRED >
-<!ATTLIST era start CDATA #IMPLIED >
-<!ATTLIST era end CDATA #IMPLIED >
-
-<!ELEMENT calendarPreferenceData ( calendarPreference* ) >
-<!ELEMENT calendarPreference EMPTY >
-<!ATTLIST calendarPreference territories NMTOKENS #REQUIRED >
-<!ATTLIST calendarPreference ordering NMTOKENS #REQUIRED >
-
-<!ELEMENT weekData ( minDays*, firstDay*, weekendStart*, weekendEnd* ) >
-
-<!ELEMENT minDays EMPTY >
-<!ATTLIST minDays count (1 | 2 | 3 | 4 | 5 | 6 | 7) #REQUIRED >
-<!ATTLIST minDays territories NMTOKENS #REQUIRED >
-<!ATTLIST minDays draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST minDays references CDATA #IMPLIED >
-<!ATTLIST minDays alt NMTOKENS #IMPLIED >
-
-<!ELEMENT firstDay EMPTY >
-<!ATTLIST firstDay day (sun | mon | tue | wed | thu | fri | sat) #REQUIRED >
-<!ATTLIST firstDay territories NMTOKENS #REQUIRED >
-<!ATTLIST firstDay draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST firstDay references CDATA #IMPLIED >
-<!ATTLIST firstDay alt NMTOKENS #IMPLIED >
-
-<!ELEMENT weekendStart EMPTY >
-<!ATTLIST weekendStart day (sun | mon | tue | wed | thu | fri | sat) #REQUIRED >
-<!ATTLIST weekendStart territories NMTOKENS #REQUIRED >
-<!ATTLIST weekendStart draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST weekendStart references CDATA #IMPLIED >
-<!ATTLIST weekendStart alt NMTOKENS #IMPLIED >
-
-<!ELEMENT weekendEnd EMPTY >
-<!ATTLIST weekendEnd day (sun | mon | tue | wed | thu | fri | sat) #REQUIRED >
-<!ATTLIST weekendEnd territories NMTOKENS #REQUIRED >
-<!ATTLIST weekendEnd draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST weekendEnd references CDATA #IMPLIED >
-<!ATTLIST weekendEnd alt NMTOKENS #IMPLIED >
-
-<!ELEMENT timeData ( hours* ) >
-<!ELEMENT hours EMPTY >
-<!ATTLIST hours allowed NMTOKENS #REQUIRED >
-<!ATTLIST hours preferred NMTOKEN #REQUIRED >
-<!ATTLIST hours regions NMTOKENS #REQUIRED >
-<!ATTLIST hours draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST hours references CDATA #IMPLIED >
-
-<!ELEMENT measurementData ( measurementSystem*, paperSize* ) >
-
-<!ELEMENT measurementSystem EMPTY >
-<!ATTLIST measurementSystem type ( metric | US | UK ) #REQUIRED >
-<!ATTLIST measurementSystem category ( temperature ) #IMPLIED >
-<!ATTLIST measurementSystem territories NMTOKENS #REQUIRED >
-<!ATTLIST measurementSystem draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST measurementSystem references CDATA #IMPLIED >
-<!ATTLIST measurementSystem alt NMTOKENS #IMPLIED >
-
-<!ELEMENT paperSize EMPTY >
-<!ATTLIST paperSize type ( A4 | US-Letter ) #REQUIRED >
-<!ATTLIST paperSize territories NMTOKENS #REQUIRED >
-<!ATTLIST paperSize draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST paperSize references CDATA #IMPLIED >
-<!ATTLIST paperSize alt NMTOKENS #IMPLIED >
-
-<!ELEMENT characters ( character-fallback*) >
-<!ATTLIST characters draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT character-fallback ( character* ) >
-
-<!ELEMENT character (substitute*) >
-<!ATTLIST character value CDATA #REQUIRED >
-<!ATTLIST character draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST character standard CDATA #IMPLIED >
-<!ATTLIST character references CDATA #IMPLIED >
-<!ATTLIST character alt NMTOKENS #IMPLIED >
-
-<!ELEMENT substitute (#PCDATA) >
-<!ATTLIST substitute draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST substitute standard CDATA #IMPLIED >
-<!ATTLIST substitute references CDATA #IMPLIED >
-<!ATTLIST substitute alt NMTOKENS #IMPLIED >
-
-<!ELEMENT transforms ( transform*) >
-
-<!ELEMENT transform ((comment | tRule)*) >
-<!ATTLIST transform source CDATA #IMPLIED >
-<!ATTLIST transform target CDATA #IMPLIED >
-<!ATTLIST transform variant CDATA #IMPLIED >
-<!ATTLIST transform direction ( forward | backward | both ) "both" >
-<!ATTLIST transform visibility ( internal | external ) "external" >
-<!ATTLIST transform draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST transform references CDATA #IMPLIED >
-<!ATTLIST transform alt NMTOKENS #IMPLIED >
-
-<!ELEMENT comment (#PCDATA) >
-
-<!ELEMENT tRule (#PCDATA) >
-
-<!ELEMENT metadata ( attributeOrder?, elementOrder?, serialElements?, suppress?, validity?, alias?, deprecated?, distinguishing?, blocking?, coverageAdditions?, skipDefaultLocale?, defaultContent?) >
-<!ATTLIST metadata draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT attributeOrder ( #PCDATA ) >
-<!ATTLIST attributeOrder draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT elementOrder ( #PCDATA ) >
-<!ATTLIST elementOrder draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT serialElements ( #PCDATA ) >
-<!ATTLIST serialElements draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT suppress (  attributes*  ) >
-<!ATTLIST suppress draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT attributes EMPTY >
-<!ATTLIST attributes element NMTOKENS #IMPLIED >
-<!ATTLIST attributes attribute NMTOKENS #IMPLIED >
-<!ATTLIST attributes attributeValue CDATA #IMPLIED >
-<!ATTLIST attributes draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT validity (  variable*,  attributeValues* ) >
-<!ATTLIST validity draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT variable ( #PCDATA ) >
-<!ATTLIST variable type NMTOKEN #IMPLIED >
-<!ATTLIST variable id CDATA #REQUIRED >
-<!ATTLIST variable draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT attributeValues (  #PCDATA ) >
-<!ATTLIST attributeValues type NMTOKEN #IMPLIED >
-<!ATTLIST attributeValues elements NMTOKENS #IMPLIED >
-<!ATTLIST attributeValues attributes NMTOKENS #IMPLIED >
-<!ATTLIST attributeValues order NMTOKEN #IMPLIED >
-<!ATTLIST attributeValues draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT alias ( languageAlias*,  scriptAlias*, territoryAlias*, variantAlias*, zoneAlias* ) >
-<!ATTLIST alias draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED ><!-- true and false are deprecated. -->
-
-<!ELEMENT languageAlias EMPTY >
-<!ATTLIST languageAlias type NMTOKEN #REQUIRED >
-<!ATTLIST languageAlias replacement NMTOKEN #REQUIRED >
-<!ATTLIST languageAlias reason ( deprecated | overlong | macrolanguage | legacy | bibliographic ) #IMPLIED >
-
-<!ELEMENT scriptAlias EMPTY >
-<!ATTLIST scriptAlias type NMTOKEN #REQUIRED >
-<!ATTLIST scriptAlias replacement NMTOKEN #REQUIRED >
-<!ATTLIST scriptAlias reason ( deprecated | overlong ) #IMPLIED >
-
-<!ELEMENT territoryAlias EMPTY >
-<!ATTLIST territoryAlias type NMTOKEN #REQUIRED >
-<!ATTLIST territoryAlias replacement NMTOKENS #REQUIRED >
-<!ATTLIST territoryAlias reason ( deprecated | overlong ) #IMPLIED >
-
-<!ELEMENT variantAlias EMPTY >
-<!ATTLIST variantAlias type NMTOKEN #REQUIRED >
-<!ATTLIST variantAlias replacement NMTOKEN #REQUIRED >
-<!ATTLIST variantAlias reason ( deprecated | overlong ) #IMPLIED >
-
-<!ELEMENT zoneAlias EMPTY >
-<!ATTLIST zoneAlias type CDATA #REQUIRED >
-<!ATTLIST zoneAlias replacement CDATA #REQUIRED >
-<!ATTLIST zoneAlias reason ( deprecated | overlong ) #IMPLIED >
-
-<!ELEMENT deprecated ( deprecatedItems* ) >
-<!ATTLIST deprecated draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT deprecatedItems EMPTY >
-<!ATTLIST deprecatedItems type ( standard | supplemental | ldml | supplementalData | ldmlBCP47 ) #IMPLIED > <!-- standard | supplemental are deprecated -->
-<!ATTLIST deprecatedItems elements NMTOKENS #IMPLIED >
-<!ATTLIST deprecatedItems attributes NMTOKENS #IMPLIED >
-<!ATTLIST deprecatedItems values CDATA #IMPLIED >
-<!ATTLIST deprecatedItems draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT distinguishing ( distinguishingItems* ) >
-<!ATTLIST distinguishing draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-
-<!ELEMENT distinguishingItems EMPTY >
-<!ATTLIST distinguishingItems exclude ( true | false ) #IMPLIED >
-<!ATTLIST distinguishingItems elements NMTOKENS #IMPLIED >
-<!ATTLIST distinguishingItems attributes NMTOKENS #IMPLIED >
-<!ATTLIST distinguishingItems draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-
-<!ELEMENT blocking ( blockingItems* ) >
-<!ATTLIST blocking draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-
-<!ELEMENT blockingItems EMPTY >
-<!ATTLIST blockingItems elements NMTOKENS #IMPLIED >
-<!ATTLIST blockingItems draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-
-<!ELEMENT coverageAdditions (  languageCoverage*,  scriptCoverage*, territoryCoverage*, currencyCoverage*, timezoneCoverage* ) ><!-- deprecated. -->
-<!ATTLIST coverageAdditions draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT languageCoverage EMPTY ><!-- deprecated. -->
-<!ATTLIST languageCoverage type NMTOKEN #IMPLIED >
-<!ATTLIST languageCoverage values NMTOKENS #IMPLIED >
-<!ATTLIST languageCoverage draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT scriptCoverage EMPTY ><!-- deprecated. -->
-<!ATTLIST scriptCoverage type NMTOKEN #IMPLIED >
-<!ATTLIST scriptCoverage values NMTOKENS #IMPLIED >
-<!ATTLIST scriptCoverage draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT territoryCoverage EMPTY ><!-- deprecated. -->
-<!ATTLIST territoryCoverage type NMTOKEN #IMPLIED >
-<!ATTLIST territoryCoverage values NMTOKENS #IMPLIED >
-<!ATTLIST territoryCoverage draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT currencyCoverage EMPTY ><!-- deprecated. -->
-<!ATTLIST currencyCoverage type NMTOKEN #IMPLIED >
-<!ATTLIST currencyCoverage values NMTOKENS #IMPLIED >
-<!ATTLIST currencyCoverage draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT timezoneCoverage EMPTY ><!-- deprecated. -->
-<!ATTLIST timezoneCoverage type NMTOKEN #IMPLIED >
-<!ATTLIST timezoneCoverage values CDATA #IMPLIED > <!-- would be NMTOKENS, but needs to allow / -->
-<!ATTLIST timezoneCoverage draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-
-<!ELEMENT defaultContent EMPTY >
-<!ATTLIST defaultContent locales NMTOKENS #IMPLIED >
-
-<!ELEMENT skipDefaultLocale EMPTY >
-<!ATTLIST skipDefaultLocale services NMTOKENS #IMPLIED >
-
-<!ELEMENT codeMappings (languageCodes*, territoryCodes*, currencyCodes*) >
-
-<!ELEMENT languageCodes EMPTY >
-<!ATTLIST languageCodes type NMTOKEN #REQUIRED>
-<!ATTLIST languageCodes alpha3 NMTOKEN #REQUIRED>
-
-<!ELEMENT territoryCodes EMPTY >
-<!ATTLIST territoryCodes type NMTOKEN #REQUIRED>
-<!ATTLIST territoryCodes numeric NMTOKEN #IMPLIED>
-<!ATTLIST territoryCodes alpha3 NMTOKEN #IMPLIED>
-<!ATTLIST territoryCodes fips10 NMTOKEN #IMPLIED>
-<!ATTLIST territoryCodes internet NMTOKENS #IMPLIED>
-
-<!ELEMENT currencyCodes EMPTY >
-<!ATTLIST currencyCodes type NMTOKEN #REQUIRED>
-<!ATTLIST currencyCodes numeric NMTOKEN #REQUIRED>
-<!ELEMENT likelySubtags (likelySubtag*) >
-<!ELEMENT likelySubtag EMPTY >
-<!ATTLIST likelySubtag from NMTOKEN #REQUIRED>
-<!ATTLIST likelySubtag to NMTOKEN #REQUIRED>
-
-<!ELEMENT plurals (pluralRules*, pluralRanges*) >
-<!ATTLIST plurals type ( ordinal | cardinal ) #IMPLIED > <!-- default is cardinal -->
-<!ATTLIST plurals draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > 
-<!ATTLIST plurals references CDATA #IMPLIED >
-
-<!ELEMENT pluralRules (pluralRule*) >
-<!ATTLIST pluralRules locales NMTOKENS #REQUIRED >
-<!ATTLIST pluralRules draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > 
-<!ATTLIST pluralRules references CDATA #IMPLIED >
-
-<!ELEMENT pluralRule ( #PCDATA ) >
-<!ATTLIST pluralRule count (zero | one | two | few | many | other) #REQUIRED > <!-- 'other' is implicitly everything else -->
-<!ATTLIST pluralRule draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST pluralRule references CDATA #IMPLIED >
-
-<!ELEMENT pluralRanges (pluralRange*) >
-<!ATTLIST pluralRanges locales NMTOKENS #REQUIRED >
-<!ATTLIST pluralRanges draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > 
-<!ATTLIST pluralRanges references CDATA #IMPLIED >
-
-<!ELEMENT pluralRange ( #PCDATA ) >
-<!ATTLIST pluralRange start (zero | one | two | few | many | other) #IMPLIED > <!-- if missing, means *all* -->
-<!ATTLIST pluralRange end (zero | one | two | few | many | other) #IMPLIED > <!-- if missing, means *all* -->
-<!ATTLIST pluralRange result (zero | one | two | few | many | other) #REQUIRED > <!-- if a whole rule is missing, means *other* -->
-<!ATTLIST pluralRange draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST pluralRange references CDATA #IMPLIED >
-
-
-<!ELEMENT telephoneCodeData ( codesByTerritory* ) >
-
-<!ELEMENT codesByTerritory ( telephoneCountryCode+ ) >
-<!ATTLIST codesByTerritory territory NMTOKEN #REQUIRED >
-<!ATTLIST codesByTerritory draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST codesByTerritory references CDATA #IMPLIED >
-
-<!ELEMENT telephoneCountryCode EMPTY >
-<!ATTLIST telephoneCountryCode code NMTOKEN #REQUIRED >
-<!ATTLIST telephoneCountryCode from NMTOKEN #IMPLIED >
-<!ATTLIST telephoneCountryCode to NMTOKEN #IMPLIED >
-<!ATTLIST telephoneCountryCode draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST telephoneCountryCode references CDATA #IMPLIED >
-<!ATTLIST telephoneCountryCode alt NMTOKENS #IMPLIED >
-
-<!ELEMENT numberingSystems ( numberingSystem* ) >
-<!ELEMENT numberingSystem EMPTY >
-<!ATTLIST numberingSystem type ( numeric | algorithmic ) #REQUIRED >
-<!ATTLIST numberingSystem id NMTOKEN #REQUIRED >
-<!ATTLIST numberingSystem radix NMTOKEN #IMPLIED >
-<!ATTLIST numberingSystem digits CDATA #IMPLIED >
-<!ATTLIST numberingSystem rules CDATA #IMPLIED >
-<!ATTLIST numberingSystem draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > 
-
-<!ELEMENT references ( reference* ) >
-<!ELEMENT reference ( #PCDATA ) >
-<!ATTLIST reference type NMTOKEN #REQUIRED>
-<!ATTLIST reference uri CDATA #IMPLIED >
-<!ATTLIST reference draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. -->
-<!ATTLIST reference standard ( true | false ) #IMPLIED >
-<!ATTLIST reference alt NMTOKENS #IMPLIED >
-
-<!ELEMENT bcp47KeywordMappings ( mapKeys?, mapTypes* ) > <!-- deprecated. -->
-
-<!ELEMENT mapKeys ( keyMap* ) > <!-- deprecated. -->
-
-<!ELEMENT keyMap EMPTY > <!-- deprecated. -->
-<!ATTLIST keyMap type NMTOKEN #REQUIRED >
-<!ATTLIST keyMap bcp47 NMTOKEN #REQUIRED >
-
-<!ELEMENT mapTypes ( typeMap* ) > <!-- deprecated. -->
-<!ATTLIST mapTypes type NMTOKEN #REQUIRED >
-
-<!ELEMENT typeMap EMPTY > <!-- deprecated. -->
-<!ATTLIST typeMap type CDATA #REQUIRED >
-<!ATTLIST typeMap bcp47 NMTOKEN #REQUIRED >
-
-<!ELEMENT languageMatching ( languageMatches* ) >
-
-<!ELEMENT languageMatches ( languageMatch* ) >
-<!ATTLIST languageMatches type NMTOKEN #REQUIRED >
-
-<!ELEMENT languageMatch EMPTY >
-<!ATTLIST languageMatch desired CDATA #REQUIRED >
-<!ATTLIST languageMatch oneway ( true | false ) #IMPLIED >
-<!ATTLIST languageMatch percent NMTOKEN #REQUIRED >
-<!ATTLIST languageMatch supported CDATA #REQUIRED >
-
-<!-- Day Periods -->
-<!ELEMENT dayPeriodRuleSet ( dayPeriodRules* ) >
-<!ATTLIST dayPeriodRuleSet type NMTOKEN #IMPLIED >
-<!ATTLIST dayPeriodRuleSet draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > 
-<!ATTLIST dayPeriodRuleSet references CDATA #IMPLIED >
-
-<!ELEMENT dayPeriodRules (dayPeriodRule*) >
-<!ATTLIST dayPeriodRules locales NMTOKENS #REQUIRED >
-<!ATTLIST dayPeriodRules draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > 
-<!ATTLIST dayPeriodRules references CDATA #IMPLIED >
-
-<!ELEMENT dayPeriodRule EMPTY >
-<!ATTLIST dayPeriodRule type NMTOKEN #REQUIRED >
-<!ATTLIST dayPeriodRule at NMTOKEN #IMPLIED >
-<!ATTLIST dayPeriodRule after NMTOKEN #IMPLIED >
-<!ATTLIST dayPeriodRule before NMTOKEN #IMPLIED >
-<!ATTLIST dayPeriodRule from NMTOKEN #IMPLIED >
-<!ATTLIST dayPeriodRule to NMTOKEN #IMPLIED >
-<!ATTLIST dayPeriodRule draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED >
-<!ATTLIST dayPeriodRule references CDATA #IMPLIED > 
-
-<!-- Time Zones -->
-
-<!ELEMENT windowsZones (mapTimezones?) >
-<!ELEMENT metaZones (metazoneInfo?, mapTimezones?) >
-
-<!ELEMENT metazoneInfo (timezone*) >
-
-<!ELEMENT timezone (usesMetazone*) >
-<!ATTLIST timezone type CDATA #REQUIRED >
-
-<!ELEMENT usesMetazone EMPTY >
-<!ATTLIST usesMetazone from CDATA #IMPLIED >
-<!ATTLIST usesMetazone to CDATA #IMPLIED >
-<!ATTLIST usesMetazone mzone NMTOKEN #REQUIRED >
-
-<!ELEMENT mapTimezones ( mapZone* ) >
-<!ATTLIST mapTimezones type NMTOKEN #IMPLIED >
-<!ATTLIST mapTimezones otherVersion CDATA #IMPLIED >
-<!ATTLIST mapTimezones typeVersion CDATA #IMPLIED >
-<!ATTLIST mapTimezones references CDATA #IMPLIED >
-
-<!ELEMENT mapZone EMPTY >
-<!ATTLIST mapZone type CDATA #REQUIRED >
-<!ATTLIST mapZone other CDATA #REQUIRED >
-<!ATTLIST mapZone territory CDATA #IMPLIED >
-<!ATTLIST mapZone references CDATA #IMPLIED >
-
-
-<!ELEMENT timezoneData ( mapTimezones*, zoneFormatting* ) > <!-- deprecated. -->
-
-<!ELEMENT zoneFormatting ( zoneItem* ) > <!-- deprecated. -->
-<!ATTLIST zoneFormatting multizone NMTOKENS #REQUIRED >
-<!ATTLIST zoneFormatting tzidVersion CDATA #IMPLIED >
-<!ATTLIST zoneFormatting references CDATA #IMPLIED >
-
-<!ELEMENT zoneItem EMPTY > <!-- deprecated. -->
-<!ATTLIST zoneItem type CDATA #REQUIRED >
-<!ATTLIST zoneItem territory NMTOKEN #REQUIRED >
-<!ATTLIST zoneItem aliases CDATA #IMPLIED >
-<!ATTLIST zoneItem references CDATA #IMPLIED >
-
-<!ELEMENT primaryZones ( primaryZone* ) >
-<!ELEMENT primaryZone ( #PCDATA ) >
-<!ATTLIST primaryZone iso3166 NMTOKEN #REQUIRED >
-
-<!-- Coverage levels -->
-<!ELEMENT coverageLevels ( approvalRequirements, coverageVariable*, coverageLevel* ) >
-
-<!ELEMENT approvalRequirements ( approvalRequirement* ) >
-<!ELEMENT approvalRequirement EMPTY >
-
-<!ATTLIST approvalRequirement votes CDATA #REQUIRED>
-<!ATTLIST approvalRequirement locales CDATA #REQUIRED>
-<!ATTLIST approvalRequirement paths CDATA #REQUIRED>
-
-<!ELEMENT coverageVariable EMPTY >
-<!ATTLIST coverageVariable key CDATA #REQUIRED >
-<!ATTLIST coverageVariable value CDATA #REQUIRED >
-
-<!ELEMENT coverageLevel EMPTY >
-<!ATTLIST coverageLevel inLanguage CDATA #IMPLIED >
-<!ATTLIST coverageLevel inScript CDATA #IMPLIED >
-<!ATTLIST coverageLevel inTerritory CDATA #IMPLIED >
-<!ATTLIST coverageLevel value CDATA #REQUIRED >
-<!ATTLIST coverageLevel match CDATA #REQUIRED >
-
-<!-- Parent locales -->
-<!ELEMENT parentLocales ( parentLocale* ) >
-
-<!ELEMENT parentLocale EMPTY >
-<!ATTLIST parentLocale parent CDATA #REQUIRED >
-<!ATTLIST parentLocale locales CDATA #REQUIRED >
-
-<!-- Gender List support -->
-<!ELEMENT gender ( personList+ ) >
-<!ELEMENT personList EMPTY >
-<!ATTLIST personList type ( neutral | mixedNeutral | maleTaints ) #REQUIRED >
-<!ATTLIST personList locales NMTOKENS #REQUIRED >
-
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_IL.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_IL.xml
deleted file mode 100644
index 5573c1618d8..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_IL.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="ar"/>
-		<territory type="IL"/>
-	</identity>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_KM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_KM.xml
deleted file mode 100644
index 164d328f38c..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_KM.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="ar"/>
-		<territory type="KM"/>
-	</identity>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ast.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ast.xml
deleted file mode 100644
index 9cf57b6775f..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ast.xml
+++ /dev/null
@@ -1,5946 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
-		<language type="ast"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>{0}, {1}</localeSeparator>
-			<localeKeyTypePattern>{0}: {1}</localeKeyTypePattern>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">afar</language>
-			<language type="ab">abkhazianu</language>
-			<language type="ace">achinés</language>
-			<language type="ach">acoli</language>
-			<language type="ada">adangme</language>
-			<language type="ady">adyghe</language>
-			<language type="ae">avestanín</language>
-			<language type="aeb">árabe de Túnez</language>
-			<language type="af">afrikaans</language>
-			<language type="afh">afrihili</language>
-			<language type="agq">aghem</language>
-			<language type="ain">ainu</language>
-			<language type="ak">ak</language>
-			<language type="akk">acadianu</language>
-			<language type="akz">alabama</language>
-			<language type="ale">aleut</language>
-			<language type="aln">gheg d’Albania</language>
-			<language type="alt">altai del sur</language>
-			<language type="am">amharicu</language>
-			<language type="an">aragonés</language>
-			<language type="ang">inglés antiguu</language>
-			<language type="anp">angika</language>
-			<language type="ar">árabe</language>
-			<language type="ar_001">árabe estándar modernu</language>
-			<language type="arc">araméu</language>
-			<language type="arn">mapuche</language>
-			<language type="aro">araona</language>
-			<language type="arp">arapaho</language>
-			<language type="arq">árabe d’Arxelia</language>
-			<language type="arw">arawak</language>
-			<language type="ary">árabe de Marruecos</language>
-			<language type="arz">árabe d’Exiptu</language>
-			<language type="as">asamés</language>
-			<language type="asa">asu</language>
-			<language type="ase">llingua de signos americana</language>
-			<language type="ast">asturianu</language>
-			<language type="av">aváricu</language>
-			<language type="avk">kotava</language>
-			<language type="awa">awadhi</language>
-			<language type="ay">aymara</language>
-			<language type="az">azerbaixanu</language>
-			<language type="azb">azerbaixanu del sur</language>
-			<language type="ba">bashkir</language>
-			<language type="bal">baluchi</language>
-			<language type="ban">balinés</language>
-			<language type="bar">bávaru</language>
-			<language type="bas">basaa</language>
-			<language type="bax">bamun</language>
-			<language type="bbc">batak toba</language>
-			<language type="bbj">ghomala</language>
-			<language type="be">bielorrusu</language>
-			<language type="bej">beja</language>
-			<language type="bem">bemba</language>
-			<language type="bew">betawi</language>
-			<language type="bez">bena</language>
-			<language type="bfd">bafut</language>
-			<language type="bfq">badaga</language>
-			<language type="bg">búlgaru</language>
-			<language type="bho">bhojpuri</language>
-			<language type="bi">bislama</language>
-			<language type="bik">bikol</language>
-			<language type="bin">bini</language>
-			<language type="bjn">banjar</language>
-			<language type="bkm">kom</language>
-			<language type="bla">siksika</language>
-			<language type="bm">bambara</language>
-			<language type="bn">bengalín</language>
-			<language type="bo">tibetanu</language>
-			<language type="bpy">bishnupriya</language>
-			<language type="bqi">bakhtiari</language>
-			<language type="br">bretón</language>
-			<language type="bra">braj</language>
-			<language type="brh">brahui</language>
-			<language type="brx">bodo</language>
-			<language type="bs">bosniu</language>
-			<language type="bss">akoose</language>
-			<language type="bua">buriat</language>
-			<language type="bug">buginés</language>
-			<language type="bum">bulu</language>
-			<language type="byn">blin</language>
-			<language type="byv">medumba</language>
-			<language type="ca">catalán</language>
-			<language type="cad">caddo</language>
-			<language type="car">caribe</language>
-			<language type="cay">cayuga</language>
-			<language type="cch">atsam</language>
-			<language type="ce">chechenu</language>
-			<language type="ceb">cebuanu</language>
-			<language type="cgg">chiga</language>
-			<language type="ch">chamorro</language>
-			<language type="chb">chibcha</language>
-			<language type="chg">chagatai</language>
-			<language type="chk">chuukés</language>
-			<language type="chm">mari</language>
-			<language type="chn">xíriga chinook</language>
-			<language type="cho">choctaw</language>
-			<language type="chp">chipewyanu</language>
-			<language type="chr">cheroqui</language>
-			<language type="chy">cheyenne</language>
-			<language type="ckb">kurdu sorani</language>
-			<language type="co">corsu</language>
-			<language type="cop">coptu</language>
-			<language type="cps">capiznon</language>
-			<language type="cr">cree</language>
-			<language type="crh">turcu de Crimea</language>
-			<language type="cs">checu</language>
-			<language type="csb">kashubianu</language>
-			<language type="cu">eslávicu eclesiásticu</language>
-			<language type="cv">chuvash</language>
-			<language type="cy">galés</language>
-			<language type="da">danés</language>
-			<language type="dak">dakota</language>
-			<language type="dar">dargwa</language>
-			<language type="dav">taita</language>
-			<language type="de">alemán</language>
-			<language type="de_CH">altualemán de Suiza</language>
-			<language type="del">delaware</language>
-			<language type="den">slave</language>
-			<language type="dgr">dogrib</language>
-			<language type="din">dinka</language>
-			<language type="dje">zarma</language>
-			<language type="doi">dogri</language>
-			<language type="dsb">baxu sorbiu</language>
-			<language type="dtp">dusun central</language>
-			<language type="dua">duala</language>
-			<language type="dum">neerlandés mediu</language>
-			<language type="dv">divehi</language>
-			<language type="dyo">jola-fonyi</language>
-			<language type="dyu">dyula</language>
-			<language type="dz">dzongkha</language>
-			<language type="dzg">dazaga</language>
-			<language type="ebu">embú</language>
-			<language type="ee">ewe</language>
-			<language type="efi">efik</language>
-			<language type="egl">emilianu</language>
-			<language type="egy">exipciu antiguu</language>
-			<language type="eka">ekajuk</language>
-			<language type="el">griegu</language>
-			<language type="elx">elamita</language>
-			<language type="en">inglés</language>
-			<language type="en_CA">inglés de Canadá</language>
-			<language type="en_GB">inglés de Gran Bretaña</language>
-			<language type="en_GB" alt="short">inglés del R.X.</language>
-			<language type="en_US">inglés americanu</language>
-			<language type="en_US" alt="short">inglés d’EE.XX.</language>
-			<language type="enm">inglés mediu</language>
-			<language type="eo">esperanto</language>
-			<language type="es">español</language>
-			<language type="es_MX">español de México</language>
-			<language type="esu">yupik central</language>
-			<language type="et">estoniu</language>
-			<language type="eu">vascu</language>
-			<language type="ewo">ewondo</language>
-			<language type="ext">estremeñu</language>
-			<language type="fa">persa</language>
-			<language type="fan">fang</language>
-			<language type="fat">fanti</language>
-			<language type="ff">fulah</language>
-			<language type="fi">finlandés</language>
-			<language type="fil">filipín</language>
-			<language type="fit">finlandés de Tornedalen</language>
-			<language type="fj">fixanu</language>
-			<language type="fo">feroés</language>
-			<language type="fon">fon</language>
-			<language type="fr">francés</language>
-			<language type="fr_CA">francés de Canadá</language>
-			<language type="fr_CH">francés de Suiza</language>
-			<language type="frc">francés cajun</language>
-			<language type="frm">francés mediu</language>
-			<language type="fro">francés antiguu</language>
-			<language type="frp">arpitanu</language>
-			<language type="frr">frisón del norte</language>
-			<language type="frs">frisón oriental</language>
-			<language type="fur">friulianu</language>
-			<language type="fy">frisón occidental</language>
-			<language type="ga">irlandés</language>
-			<language type="gaa">ga</language>
-			<language type="gag">gagauz</language>
-			<language type="gan">chinu gan</language>
-			<language type="gay">gayo</language>
-			<language type="gba">gbaya</language>
-			<language type="gbz">dari zoroastrianu</language>
-			<language type="gd">gaélicu escocés</language>
-			<language type="gez">geez</language>
-			<language type="gil">gilbertés</language>
-			<language type="gl">gallegu</language>
-			<language type="glk">gilaki</language>
-			<language type="gmh">altualemán mediu</language>
-			<language type="gn">guaraní</language>
-			<language type="goh">altualemán antiguu</language>
-			<language type="gom">goan konkani</language>
-			<language type="gon">gondi</language>
-			<language type="gor">gorontalo</language>
-			<language type="got">góticu</language>
-			<language type="grb">grebo</language>
-			<language type="grc">griegu antiguu</language>
-			<language type="gsw">alemán de Suiza</language>
-			<language type="gu">guyaratí</language>
-			<language type="guc">wayuu</language>
-			<language type="gur">frafra</language>
-			<language type="guz">gusii</language>
-			<language type="gv">manés</language>
-			<language type="gwi">gwichʼin</language>
-			<language type="ha">ḥausa</language>
-			<language type="hai">haida</language>
-			<language type="hak">chinu hakka</language>
-			<language type="haw">hawaianu</language>
-			<language type="he">hebréu</language>
-			<language type="hi">hindi</language>
-			<language type="hif">hindi de Fiji</language>
-			<language type="hil">hiligaynon</language>
-			<language type="hit">hitita</language>
-			<language type="hmn">hmong</language>
-			<language type="ho">hiri motu</language>
-			<language type="hr">croata</language>
-			<language type="hsb">altu sorbiu</language>
-			<language type="hsn">chinu xiang</language>
-			<language type="ht">haitianu</language>
-			<language type="hu">húngaru</language>
-			<language type="hup">hupa</language>
-			<language type="hy">armeniu</language>
-			<language type="hz">herero</language>
-			<language type="ia">interlingua</language>
-			<language type="iba">iban</language>
-			<language type="ibb">ibibio</language>
-			<language type="id">indonesiu</language>
-			<language type="ie">interlingue</language>
-			<language type="ig">igbo</language>
-			<language type="ii">yi de Sichuan</language>
-			<language type="ik">inupiaq</language>
-			<language type="ilo">iloko</language>
-			<language type="inh">ingush</language>
-			<language type="io">ido</language>
-			<language type="is">islandés</language>
-			<language type="it">italianu</language>
-			<language type="iu">inuktitut</language>
-			<language type="izh">ingrianu</language>
-			<language type="ja">xaponés</language>
-			<language type="jam">inglés criollu xamaicanu</language>
-			<language type="jbo">lojban</language>
-			<language type="jgo">ngomba</language>
-			<language type="jmc">machame</language>
-			<language type="jpr">xudeo-persa</language>
-			<language type="jrb">xudeo-árabe</language>
-			<language type="jut">jutlandés</language>
-			<language type="jv">xavanés</language>
-			<language type="ka">xeorxanu</language>
-			<language type="kaa">kara-kalpak</language>
-			<language type="kab">kabileñu</language>
-			<language type="kac">kachin</language>
-			<language type="kaj">jju</language>
-			<language type="kam">kamba</language>
-			<language type="kaw">kawi</language>
-			<language type="kbd">kabardianu</language>
-			<language type="kbl">kanembu</language>
-			<language type="kcg">tyap</language>
-			<language type="kde">makonde</language>
-			<language type="kea">cabuverdianu</language>
-			<language type="ken">kenyang</language>
-			<language type="kfo">koro</language>
-			<language type="kg">kongo</language>
-			<language type="kgp">kaingang</language>
-			<language type="kha">khasi</language>
-			<language type="kho">khotanés</language>
-			<language type="khq">koyra chiini</language>
-			<language type="khw">khowar</language>
-			<language type="ki">kikuyu</language>
-			<language type="kiu">kirmanjki</language>
-			<language type="kj">kuanyama</language>
-			<language type="kk">kazaquistanín</language>
-			<language type="kkj">kako</language>
-			<language type="kl">kalaallisut</language>
-			<language type="kln">kln</language>
-			<language type="km">khmer</language>
-			<language type="kmb">kimbundu</language>
-			<language type="kn">canarés</language>
-			<language type="ko">coreanu</language>
-			<language type="koi">komi-permyak</language>
-			<language type="kok">konkani</language>
-			<language type="kos">kosraeanu</language>
-			<language type="kpe">kpelle</language>
-			<language type="kr">kanuri</language>
-			<language type="krc">karachay-balkar</language>
-			<language type="kri">krio</language>
-			<language type="krj">kinaray-a</language>
-			<language type="krl">karelianu</language>
-			<language type="kru">kurukh</language>
-			<language type="ks">cachemirés</language>
-			<language type="ksb">shambala</language>
-			<language type="ksf">bafia</language>
-			<language type="ksh">colonianu</language>
-			<language type="ku">curdu</language>
-			<language type="kum">kumyk</language>
-			<language type="kut">kutenai</language>
-			<language type="kv">komi</language>
-			<language type="kw">córnicu</language>
-			<language type="ky">kirguistanín</language>
-			<language type="la">llatín</language>
-			<language type="lad">ladino</language>
-			<language type="lag">langi</language>
-			<language type="lah">lahnda</language>
-			<language type="lam">lamba</language>
-			<language type="lb">luxemburgués</language>
-			<language type="lez">lezghianu</language>
-			<language type="lfn">lingua franca nova</language>
-			<language type="lg">ganda</language>
-			<language type="li">limburgués</language>
-			<language type="lij">ligurianu</language>
-			<language type="liv">livonianu</language>
-			<language type="lkt">lakota</language>
-			<language type="lmo">lombardu</language>
-			<language type="ln">lingala</language>
-			<language type="lo">laosianu</language>
-			<language type="lol">mongo</language>
-			<language type="loz">lozi</language>
-			<language type="lt">lituanu</language>
-			<language type="ltg">latgalianu</language>
-			<language type="lu">luba-katanga</language>
-			<language type="lua">luba-lulua</language>
-			<language type="lui">luiseno</language>
-			<language type="lun">lunda</language>
-			<language type="luo">luo</language>
-			<language type="lus">mizo</language>
-			<language type="luy">luyia</language>
-			<language type="lv">letón</language>
-			<language type="lzh">chinu lliterariu</language>
-			<language type="lzz">laz</language>
-			<language type="mad">madurés</language>
-			<language type="maf">mafa</language>
-			<language type="mag">magahi</language>
-			<language type="mai">maithili</language>
-			<language type="mak">makasar</language>
-			<language type="man">mandingo</language>
-			<language type="mas">masai</language>
-			<language type="mde">maba</language>
-			<language type="mdf">moksha</language>
-			<language type="mdr">mandar</language>
-			<language type="men">mende</language>
-			<language type="mer">meru</language>
-			<language type="mfe">morisyen</language>
-			<language type="mg">malgaxe</language>
-			<language type="mga">írlandés mediu</language>
-			<language type="mgh">makhuwa-meetto</language>
-			<language type="mgo">meta’</language>
-			<language type="mh">marshallés</language>
-			<language type="mi">maorí</language>
-			<language type="mic">micmac</language>
-			<language type="min">minangkabau</language>
-			<language type="mk">macedoniu</language>
-			<language type="ml">malayalam</language>
-			<language type="mn">mongol</language>
-			<language type="mnc">manchú</language>
-			<language type="mni">manipuri</language>
-			<language type="moh">mohawk</language>
-			<language type="mos">mossi</language>
-			<language type="mr">marathi</language>
-			<language type="mrj">mari occidental</language>
-			<language type="ms">malayu</language>
-			<language type="mt">maltés</language>
-			<language type="mua">mundang</language>
-			<language type="mul">múltiples llingües</language>
-			<language type="mus">creek</language>
-			<language type="mwl">mirandés</language>
-			<language type="mwr">marwari</language>
-			<language type="mwv">mentawai</language>
-			<language type="my">birmanu</language>
-			<language type="mye">myene</language>
-			<language type="myv">erzya</language>
-			<language type="mzn">mazanderani</language>
-			<language type="na">nauru</language>
-			<language type="nan">chinu min nan</language>
-			<language type="nap">napolitanu</language>
-			<language type="naq">nama</language>
-			<language type="nb">noruegu Bokmål</language>
-			<language type="nd">ndebele del norte</language>
-			<language type="nds">baxu alemán</language>
-			<language type="ne">nepalés</language>
-			<language type="new">newari</language>
-			<language type="ng">ndonga</language>
-			<language type="nia">nias</language>
-			<language type="niu">niueanu</language>
-			<language type="njo">ao naga</language>
-			<language type="nl">neerlandés</language>
-			<language type="nl_BE">flamencu</language>
-			<language type="nmg">kwasio</language>
-			<language type="nn">noruegu Nynorsk</language>
-			<language type="nnh">ngiemboon</language>
-			<language type="no">noruegu</language>
-			<language type="nog">nogai</language>
-			<language type="non">noruegu antiguu</language>
-			<language type="nov">novial</language>
-			<language type="nqo">n’ko</language>
-			<language type="nr">ndebele del sur</language>
-			<language type="nso">sotho del norte</language>
-			<language type="nus">nuer</language>
-			<language type="nv">navajo</language>
-			<language type="nwc">newari clásicu</language>
-			<language type="ny">nyanja</language>
-			<language type="nym">nyamwezi</language>
-			<language type="nyn">nyankole</language>
-			<language type="nyo">nyoro</language>
-			<language type="nzi">nzima</language>
-			<language type="oc">occitanu</language>
-			<language type="oj">ojibwa</language>
-			<language type="om">oromo</language>
-			<language type="or">oriya</language>
-			<language type="os">oséticu</language>
-			<language type="ota">turcu otomanu</language>
-			<language type="pa">punyabí</language>
-			<language type="pag">pangasinan</language>
-			<language type="pam">pampanga</language>
-			<language type="pap">papiamento</language>
-			<language type="pau">palauanu</language>
-			<language type="pcd">pícaru</language>
-			<language type="pdc">alemán de Pennsylvania</language>
-			<language type="peo">persa antiguu</language>
-			<language type="pfl">alemán palatinu</language>
-			<language type="phn">feniciu</language>
-			<language type="pl">polacu</language>
-			<language type="pms">piamontés</language>
-			<language type="pon">pohnpeianu</language>
-			<language type="prg">prusianu</language>
-			<language type="pro">provenzal antiguu</language>
-			<language type="ps">pashtu</language>
-			<language type="pt">portugués</language>
-			<language type="pt_BR">portugués del Brasil</language>
-			<language type="qu">quechua</language>
-			<language type="quc">kʼicheʼ</language>
-			<language type="raj">rajasthanín</language>
-			<language type="rgn">romañol</language>
-			<language type="rif">rifianu</language>
-			<language type="rm">romanche</language>
-			<language type="rn">rundi</language>
-			<language type="ro">rumanu</language>
-			<language type="ro_MD">moldavu</language>
-			<language type="rof">rombo</language>
-			<language type="rom">romaní</language>
-			<language type="root">root</language>
-			<language type="rtm">rotumanu</language>
-			<language type="ru">rusu</language>
-			<language type="rue">rusyn</language>
-			<language type="rw">rw</language>
-			<language type="rwk">rwa</language>
-			<language type="sa">sánscritu</language>
-			<language type="sah">sakha</language>
-			<language type="sam">araméu samaritanu</language>
-			<language type="saq">samburu</language>
-			<language type="sas">sasak</language>
-			<language type="sat">santali</language>
-			<language type="saz">saurashtra</language>
-			<language type="sbp">sangu</language>
-			<language type="sc">sardu</language>
-			<language type="scn">sicilianu</language>
-			<language type="sco">scots</language>
-			<language type="sd">sindhi</language>
-			<language type="sdc">sardu sassarés</language>
-			<language type="se">sami del norte</language>
-			<language type="see">séneca</language>
-			<language type="seh">sena</language>
-			<language type="ses">koyraboro senni</language>
-			<language type="sg">sango</language>
-			<language type="sga">irlandés antiguu</language>
-			<language type="sh">serbo-croata</language>
-			<language type="shi">tachelhit</language>
-			<language type="shn">shan</language>
-			<language type="si">cingalés</language>
-			<language type="sid">sidamo</language>
-			<language type="sk">eslovacu</language>
-			<language type="sl">eslovenu</language>
-			<language type="sm">samoanu</language>
-			<language type="sma">sami del sur</language>
-			<language type="smj">lule sami</language>
-			<language type="smn">inari sami</language>
-			<language type="sms">skolt sami</language>
-			<language type="sn">shona</language>
-			<language type="snk">soninke</language>
-			<language type="so">somalín</language>
-			<language type="sq">albanu</language>
-			<language type="sr">serbiu</language>
-			<language type="srn">sranan tongo</language>
-			<language type="srr">serer</language>
-			<language type="ss">swati</language>
-			<language type="ssy">saho</language>
-			<language type="st">sotho del sur</language>
-			<language type="stq">frisón de Saterland</language>
-			<language type="su">sondanés</language>
-			<language type="suk">sukuma</language>
-			<language type="sus">susu</language>
-			<language type="sux">sumeriu</language>
-			<language type="sv">suecu</language>
-			<language type="sw">suaḥili</language>
-			<language type="swb">comorianu</language>
-			<language type="swc">swahili del Congo</language>
-			<language type="syc">siriacu clásicu</language>
-			<language type="syr">siriacu</language>
-			<language type="szl">silesianu</language>
-			<language type="ta">tamil</language>
-			<language type="tcy">tulu</language>
-			<language type="te">telugu</language>
-			<language type="tem">timne</language>
-			<language type="teo">teso</language>
-			<language type="tet">tetum</language>
-			<language type="tg">taxiquistanín</language>
-			<language type="th">tailandés</language>
-			<language type="ti">tigrinya</language>
-			<language type="tig">tigre</language>
-			<language type="tiv">tiv</language>
-			<language type="tk">turcomanu</language>
-			<language type="tkl">tokelau</language>
-			<language type="tl">tagalog</language>
-			<language type="tlh">klingon</language>
-			<language type="tmh">tamashek</language>
-			<language type="tn">tswana</language>
-			<language type="to">tonganu</language>
-			<language type="tpi">tok pisin</language>
-			<language type="tr">turcu</language>
-			<language type="trv">taroko</language>
-			<language type="ts">tsonga</language>
-			<language type="tt">tártaru</language>
-			<language type="tum">tumbuka</language>
-			<language type="tvl">tuvalu</language>
-			<language type="twq">tasawaq</language>
-			<language type="ty">tahitianu</language>
-			<language type="tyv">tuvinianu</language>
-			<language type="tzm">tamazight del Atlas central</language>
-			<language type="udm">udmurt</language>
-			<language type="ug">uigur</language>
-			<language type="uga">ugaríticu</language>
-			<language type="uk">ucraín</language>
-			<language type="umb">umbundu</language>
-			<language type="und">llingua desconocida</language>
-			<language type="ur">ur</language>
-			<language type="uz">uzbequistanín</language>
-			<language type="vai">vai</language>
-			<language type="ve">venda</language>
-			<language type="vec">venecianu</language>
-			<language type="vi">vietnamín</language>
-			<language type="vls">flamencu occidental</language>
-			<language type="vun">vunjo</language>
-			<language type="wa">valón</language>
-			<language type="wal">wolaytta</language>
-			<language type="war">waray</language>
-			<language type="wo">wolof</language>
-			<language type="wuu">chinu wu</language>
-			<language type="xh">xhosa</language>
-			<language type="xog">soga</language>
-			<language type="yao">yao</language>
-			<language type="yap">yapés</language>
-			<language type="yav">yangben</language>
-			<language type="ybb">yemba</language>
-			<language type="yi">yiddish</language>
-			<language type="yo">yoruba</language>
-			<language type="yue">cantonés</language>
-			<language type="za">zhuang</language>
-			<language type="zap">zapoteca</language>
-			<language type="zea">zeelandés</language>
-			<language type="zgh">tamazight estándar de Marruecos</language>
-			<language type="zh">chinu</language>
-			<language type="zh_Hans">chinu simplificáu</language>
-			<language type="zh_Hant">chinu tradicional</language>
-			<language type="zu">zulú</language>
-			<language type="zxx">ensin conteníu llingüísticu</language>
-		</languages>
-		<scripts>
-			<script type="Arab">árabe</script>
-			<script type="Armn">armeniu</script>
-			<script type="Beng">bengalín</script>
-			<script type="Bopo">Bopo</script>
-			<script type="Brai">braille</script>
-			<script type="Cyrl">cirílicu</script>
-			<script type="Deva">devanagari</script>
-			<script type="Egyd">Egyd</script>
-			<script type="Ethi">etíope</script>
-			<script type="Geor">xeorxanu</script>
-			<script type="Grek">griegu</script>
-			<script type="Gujr">guyarati</script>
-			<script type="Guru">gurmukhi</script>
-			<script type="Hang">hangul</script>
-			<script type="Hani">escritura china</script>
-			<script type="Hans">chinu simplificáu</script>
-			<script type="Hans" alt="stand-alone">Hans</script>
-			<script type="Hant">chinu tradicional</script>
-			<script type="Hant" alt="stand-alone">Hant</script>
-			<script type="Hebr">hebréu</script>
-			<script type="Hira">ḥiragana</script>
-			<script type="Jpan">xaponés</script>
-			<script type="Kana">katakana</script>
-			<script type="Khmr">Khmr</script>
-			<script type="Knda">canarés</script>
-			<script type="Kore">coreanu</script>
-			<script type="Laoo">laosianu</script>
-			<script type="Latn">llatín</script>
-			<script type="Mlym">malayalam</script>
-			<script type="Mong">mongol</script>
-			<script type="Mymr">birmanu</script>
-			<script type="Orya">oriya</script>
-			<script type="Sinh">cingalés</script>
-			<script type="Taml">tamil</script>
-			<script type="Telu">telugu</script>
-			<script type="Thaa">thaana</script>
-			<script type="Thai">tailandés</script>
-			<script type="Tibt">tibetanu</script>
-			<script type="Zsym">símbolos</script>
-			<script type="Zxxx">non escritu</script>
-			<script type="Zyyy">común</script>
-			<script type="Zzzz">escritura desconocida</script>
-		</scripts>
-		<territories>
-			<territory type="001">Mundu</territory>
-			<territory type="002">África</territory>
-			<territory type="003">Norteamérica</territory>
-			<territory type="005">América del Sur</territory>
-			<territory type="009">Oceanía</territory>
-			<territory type="011">África Occidental</territory>
-			<territory type="013">América Central</territory>
-			<territory type="014">África Oriental</territory>
-			<territory type="015">África del Norte</territory>
-			<territory type="017">África Central</territory>
-			<territory type="018">África del Sur</territory>
-			<territory type="019">América</territory>
-			<territory type="021">América del Norte</territory>
-			<territory type="029">Caribe</territory>
-			<territory type="030">Asia Oriental</territory>
-			<territory type="034">Asia del Sur</territory>
-			<territory type="035">Sureste Asiáticu</territory>
-			<territory type="039">Europa del Sur</territory>
-			<territory type="053">Australasia</territory>
-			<territory type="054">Melanesia</territory>
-			<territory type="057">Rexón de Micronesia</territory>
-			<territory type="061">Polinesia</territory>
-			<territory type="142">Asia</territory>
-			<territory type="143">Asia Central</territory>
-			<territory type="145">Asia Occidental</territory>
-			<territory type="150">Europa</territory>
-			<territory type="151">Europa Oriental</territory>
-			<territory type="154">Europa del Norte</territory>
-			<territory type="155">Europa Occidental</territory>
-			<territory type="419">América Llatina</territory>
-			<territory type="AC">Islla Ascensión</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Emiratos Árabes Xuníos</territory>
-			<territory type="AF">Afganistán</territory>
-			<territory type="AG">Antigua y Barbuda</territory>
-			<territory type="AI">Anguila</territory>
-			<territory type="AL">Albania</territory>
-			<territory type="AM">Armenia</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ" draft="unconfirmed">L’Antártida</territory>
-			<territory type="AR">Arxentina</territory>
-			<territory type="AS">Samoa Americana</territory>
-			<territory type="AT">Austria</territory>
-			<territory type="AU">Australia</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Islles Aland</territory>
-			<territory type="AZ">Azerbaixán</territory>
-			<territory type="BA">Bosnia y Herzegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladex</territory>
-			<territory type="BE">Bélxica</territory>
-			<territory type="BF">BF</territory>
-			<territory type="BG">Bulgaria</territory>
-			<territory type="BH">Baḥréin</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benín</territory>
-			<territory type="BL">San Bartolomé</territory>
-			<territory type="BM">Les Bermudes</territory>
-			<territory type="BN">Brunéi</territory>
-			<territory type="BO">Bolivia</territory>
-			<territory type="BQ">Caribe neerlandés</territory>
-			<territory type="BR">Brasil</territory>
-			<territory type="BS">Les Bahames</territory>
-			<territory type="BT">Bután</territory>
-			<territory type="BV">Islla Bouvet</territory>
-			<territory type="BW">Botsuana</territory>
-			<territory type="BY">Bielorrusia</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Canadá</territory>
-			<territory type="CC">Islles Cocos (Keeling)</territory>
-			<territory type="CD">CD</territory>
-			<territory type="CF">República Centroafricana</territory>
-			<territory type="CG">CG</territory>
-			<territory type="CH">Suiza</territory>
-			<territory type="CI">Costa de Marfil</territory>
-			<territory type="CI" alt="variant">CI</territory>
-			<territory type="CK">Islles Cook</territory>
-			<territory type="CL">Chile</territory>
-			<territory type="CM">Camerún</territory>
-			<territory type="CN">China</territory>
-			<territory type="CO">Colombia</territory>
-			<territory type="CP">Islla Clipperton</territory>
-			<territory type="CR">Costa Rica</territory>
-			<territory type="CU">Cuba</territory>
-			<territory type="CV">Cabu Verde</territory>
-			<territory type="CW">Curaçao</territory>
-			<territory type="CX">Islla Christmas</territory>
-			<territory type="CY">Xipre</territory>
-			<territory type="CZ">Chequia</territory>
-			<territory type="DE">Alemania</territory>
-			<territory type="DG">Diego Garcia</territory>
-			<territory type="DJ">DJ</territory>
-			<territory type="DK">Dinamarca</territory>
-			<territory type="DM">Dominica</territory>
-			<territory type="DO">República Dominicana</territory>
-			<territory type="DZ">Arxelia</territory>
-			<territory type="EA">Ceuta y Melilla</territory>
-			<territory type="EC">Ecuador</territory>
-			<territory type="EE">Estonia</territory>
-			<territory type="EG">Exiptu</territory>
-			<territory type="EH">Sáḥara Occidental</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">España</territory>
-			<territory type="ET">Etiopía</territory>
-			<territory type="EU">Xunión Européa</territory>
-			<territory type="FI">Finlandia</territory>
-			<territory type="FJ">Islles Fixi</territory>
-			<territory type="FK">Falkland Islands</territory>
-			<territory type="FK" alt="variant">Islles Malvines (Falkland Islands)</territory>
-			<territory type="FM">Micronesia</territory>
-			<territory type="FO">Islles Feroe</territory>
-			<territory type="FR">Francia</territory>
-			<territory type="GA">Gabón</territory>
-			<territory type="GB">Reinu Xuníu</territory>
-			<territory type="GB" alt="short">GB</territory>
-			<territory type="GD">Granada</territory>
-			<territory type="GE">Xeorxa</territory>
-			<territory type="GF">Guyana Francesa</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Xibraltar</territory>
-			<territory type="GL">Groenlandia</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Guinea</territory>
-			<territory type="GP">Guadalupe</territory>
-			<territory type="GQ">Guinea Ecuatorial</territory>
-			<territory type="GR">Grecia</territory>
-			<territory type="GS">Islles Xeorxa del Sur y Sandwich del Sur</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinea-Bisáu</territory>
-			<territory type="GY">Guyana</territory>
-			<territory type="HK">ARE China de Ḥong Kong</territory>
-			<territory type="HK" alt="short">Ḥong Kong</territory>
-			<territory type="HM">Islles Heard y McDonald</territory>
-			<territory type="HN">Hondures</territory>
-			<territory type="HR">Croacia</territory>
-			<territory type="HT">Haití</territory>
-			<territory type="HU">Hungría</territory>
-			<territory type="IC">Islles Canaries</territory>
-			<territory type="ID">Indonesia</territory>
-			<territory type="IE">Irlanda</territory>
-			<territory type="IL">Israel</territory>
-			<territory type="IM">Islla de Man</territory>
-			<territory type="IN">India</territory>
-			<territory type="IO">Territoriu Británicu del Océanu Índicu</territory>
-			<territory type="IQ">Iraq</territory>
-			<territory type="IR">Irán</territory>
-			<territory type="IS">Islandia</territory>
-			<territory type="IT">Italia</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Xamaica</territory>
-			<territory type="JO">Xordania</territory>
-			<territory type="JP">Xapón</territory>
-			<territory type="KE">Kenia</territory>
-			<territory type="KG">Kirguistán</territory>
-			<territory type="KH">Camboya</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Les Comores</territory>
-			<territory type="KN">Saint Kitts y Nevis</territory>
-			<territory type="KP">Corea del Norte</territory>
-			<territory type="KR">Corea del Sur</territory>
-			<territory type="KW">Kuwait</territory>
-			<territory type="KY">Islles Caimán</territory>
-			<territory type="KZ">Kazakstán</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Líbanu</territory>
-			<territory type="LC">Santa Llucía</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberia</territory>
-			<territory type="LS">LS</territory>
-			<territory type="LT">Lituania</territory>
-			<territory type="LU">Luxemburgu</territory>
-			<territory type="LV">Letonia</territory>
-			<territory type="LY">Libia</territory>
-			<territory type="MA">Marruecos</territory>
-			<territory type="MC">Mónacu</territory>
-			<territory type="MD">Moldavia</territory>
-			<territory type="ME">Montenegru</territory>
-			<territory type="MF">Saint Martin</territory>
-			<territory type="MG">Madagascar</territory>
-			<territory type="MH">Islles Marshall</territory>
-			<territory type="MK">Macedonia</territory>
-			<territory type="MK" alt="variant">Macedonia (ARYDM)</territory>
-			<territory type="ML">Malí</territory>
-			<territory type="MM">Myanmar (Birmania)</territory>
-			<territory type="MN">Mongolia</territory>
-			<territory type="MO">ARE China de Macáu</territory>
-			<territory type="MO" alt="short">Macáu</territory>
-			<territory type="MP">Islles Marianes del Norte</territory>
-			<territory type="MQ">La Martinica</territory>
-			<territory type="MR">Mauritania</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauriciu</territory>
-			<territory type="MV">Les Maldives</territory>
-			<territory type="MW">Malaui</territory>
-			<territory type="MX">MX</territory>
-			<territory type="MY">Malasia</territory>
-			<territory type="MZ">Mozambique</territory>
-			<territory type="NA">Namibia</territory>
-			<territory type="NC">Nueva Caledonia</territory>
-			<territory type="NE">El Níxer</territory>
-			<territory type="NF">Islla Norfolk</territory>
-			<territory type="NG">Nixeria</territory>
-			<territory type="NI">Nicaragua</territory>
-			<territory type="NL">Países Baxos</territory>
-			<territory type="NO">Noruega</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Nueva Zelanda</territory>
-			<territory type="OM">Omán</territory>
-			<territory type="PA">Panamá</territory>
-			<territory type="PE">Perú</territory>
-			<territory type="PF">Polinesia Francesa</territory>
-			<territory type="PG">Papúa Nueva Guinea</territory>
-			<territory type="PH">Filipines</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Polonia</territory>
-			<territory type="PM">Saint Pierre y Miquelon</territory>
-			<territory type="PN">Islles Pitcairn</territory>
-			<territory type="PR">Puertu Ricu</territory>
-			<territory type="PS">PS</territory>
-			<territory type="PS" alt="short">PS</territory>
-			<territory type="PT">Portugal</territory>
-			<territory type="PW">Paláu</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="QA">Qatar</territory>
-			<territory type="QO">Oceanía esterior</territory>
-			<territory type="RE">Reunión</territory>
-			<territory type="RO">Rumanía</territory>
-			<territory type="RS">Serbia</territory>
-			<territory type="RU">Rusia</territory>
-			<territory type="RW">Ruanda</territory>
-			<territory type="SA">Arabia Saudita</territory>
-			<territory type="SB">Islles Salomón</territory>
-			<territory type="SC">SC</territory>
-			<territory type="SD">Sudán</territory>
-			<territory type="SE">Suecia</territory>
-			<territory type="SG">Singapur</territory>
-			<territory type="SH">SH</territory>
-			<territory type="SI">Eslovenia</territory>
-			<territory type="SJ">Svalbard ya Islla Jan Mayen</territory>
-			<territory type="SK">Eslovaquia</territory>
-			<territory type="SL">SL</territory>
-			<territory type="SM">San Marín</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalia</territory>
-			<territory type="SR">Surinam</territory>
-			<territory type="SS">Sudán del Sur</territory>
-			<territory type="ST">Santu Tomé y Príncipe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SX">Sint Maarten</territory>
-			<territory type="SY">Siria</territory>
-			<territory type="SZ">Suazilandia</territory>
-			<territory type="TA">Tristán da Cunha</territory>
-			<territory type="TC">Islles Turques y Caicos</territory>
-			<territory type="TD">Chad</territory>
-			<territory type="TF">Tierres Australes Franceses</territory>
-			<territory type="TG">TG</territory>
-			<territory type="TH">Tailandia</territory>
-			<territory type="TJ">Taxiquistán</territory>
-			<territory type="TK">Tokeláu</territory>
-			<territory type="TL">Timor Oriental</territory>
-			<territory type="TL" alt="variant">Timor Este</territory>
-			<territory type="TM">Turkmenistán</territory>
-			<territory type="TN">Tunicia</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turquía</territory>
-			<territory type="TT">Trinidá y Tobagu</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwán</territory>
-			<territory type="TZ">Tanzania</territory>
-			<territory type="UA">Ucraína</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">Islles Perifériques Menores de los EE.XX.</territory>
-			<territory type="US">Estaos Xuníos</territory>
-			<territory type="US" alt="short">US</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Uzbequistán</territory>
-			<territory type="VA">Ciudá del Vaticanu</territory>
-			<territory type="VC">San Vicente y Granadines</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">Islles Vírxenes Britániques</territory>
-			<territory type="VI">Islles Vírxenes Americanes</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis y Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="XK">XK</territory>
-			<territory type="YE">Yemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">Sudáfrica</territory>
-			<territory type="ZM">Zambia</territory>
-			<territory type="ZW">Zimbabue</territory>
-			<territory type="ZZ">Rexón desconocida</territory>
-		</territories>
-		<keys>
-			<key type="calendar">calendariu</key>
-			<key type="collation">orde de clasificación</key>
-			<key type="currency">moneda</key>
-			<key type="numbers">númberos</key>
-		</keys>
-		<types>
-			<type type="arab" key="numbers">númberos arábico-índicos</type>
-			<type type="arabext" key="numbers">númberos arábico-índicos estendíos</type>
-			<type type="armn" key="numbers">númberos armenios</type>
-			<type type="armnlow" key="numbers">númberos armenios en minúscules</type>
-			<type type="beng" key="numbers">númberos bengalinos</type>
-			<type type="buddhist" key="calendar">calendariu budista</type>
-			<type type="chinese" key="calendar">calendariu chinu</type>
-			<type type="dangi" key="calendar">calendariu dangi</type>
-			<type type="deva" key="numbers">númberos devanagari</type>
-			<type type="ducet" key="collation">orde de clasificación Unicode predetermináu</type>
-			<type type="ethi" key="numbers">númberos etíopes</type>
-			<type type="ethiopic" key="calendar">calendariu etíope</type>
-			<type type="fullwide" key="numbers">númberos n’anchu completu</type>
-			<type type="geor" key="numbers">númberos xeorxanos</type>
-			<type type="gregorian" key="calendar">calendariu gregorianu</type>
-			<type type="grek" key="numbers">númberos griegos</type>
-			<type type="greklow" key="numbers">númberos griegos en minúscules</type>
-			<type type="gujr" key="numbers">númberos gujarati</type>
-			<type type="guru" key="numbers">númberos gurmukhi</type>
-			<type type="hanidec" key="numbers">númberos decimales chinos</type>
-			<type type="hans" key="numbers">númberos chinos simplificaos</type>
-			<type type="hansfin" key="numbers">númberos chinos financieros simplificaos</type>
-			<type type="hant" key="numbers">númberos chinos tradicionales</type>
-			<type type="hantfin" key="numbers">númberos chinos financieros tradicionales</type>
-			<type type="hebr" key="numbers">númberos hebreos</type>
-			<type type="hebrew" key="calendar">calendariu hebréu</type>
-			<type type="islamic" key="calendar">calendariu islámicu</type>
-			<type type="iso8601" key="calendar">calendariu ISO-8601</type>
-			<type type="japanese" key="calendar">calendariu xaponés</type>
-			<type type="jpan" key="numbers">númberos xaponeses</type>
-			<type type="jpanfin" key="numbers">númberos financieros xaponeses</type>
-			<type type="khmr" key="numbers">numberación khmer</type>
-			<type type="knda" key="numbers">numberación kannada</type>
-			<type type="laoo" key="numbers">númberos laosianos</type>
-			<type type="latn" key="numbers">númberos occidentales</type>
-			<type type="mlym" key="numbers">númberos malayalam</type>
-			<type type="mymr" key="numbers">númberos myanmar</type>
-			<type type="orya" key="numbers">númberos oriya</type>
-			<type type="persian" key="calendar">calendariu persa</type>
-			<type type="roc" key="calendar">calendariu republicanu chinu</type>
-			<type type="roman" key="numbers">númberos romanos</type>
-			<type type="romanlow" key="numbers">númberos romanos en minúscules</type>
-			<type type="search" key="collation">gueta xeneral</type>
-			<type type="standard" key="collation">orde de clasificación estándar</type>
-			<type type="taml" key="numbers">númberos tamil tradicionales</type>
-			<type type="tamldec" key="numbers">númberos tamil</type>
-			<type type="telu" key="numbers">númberos telugu</type>
-			<type type="thai" key="numbers">númberos tailandeses</type>
-			<type type="tibt" key="numbers">númberos tibetanos</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Métricu</measurementSystemName>
-			<measurementSystemName type="UK">Reinu Xuníu</measurementSystemName>
-			<measurementSystemName type="US">EE.XX.</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Llingua: {0}</codePattern>
-			<codePattern type="script">Alfabetu: {0}</codePattern>
-			<codePattern type="territory">Rexón: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a á b c d e é f g h ḥ i í l ḷ m n ñ o ó p q r s t u ú ü v x y z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[ª à ă â å ä ã ā æ ç è ĕ ê ë ē ì ĭ î ï ī j k º ò ŏ ô ö ø ō œ ù ŭ û ū w ÿ]</exemplarCharacters>
-		<exemplarCharacters type="index">[A B C D E F G H I L M N Ñ O P Q R S T U V X Y Z]</exemplarCharacters>
-		<exemplarCharacters type="punctuation">[\- ‐ – — , ; \: ! ¡ ? ¿ . … ' ‘ ’ &quot; “ ” « » ( ) \[ \] § @ * / \\ \&amp; # † ‡ ′ ″]</exemplarCharacters>
-		<ellipsis type="final">{0}…</ellipsis>
-		<ellipsis type="initial">… {0}</ellipsis>
-		<ellipsis type="medial">{0}… {1}</ellipsis>
-		<ellipsis type="word-final">{0} …</ellipsis>
-		<ellipsis type="word-initial">… {0}</ellipsis>
-		<ellipsis type="word-medial">{0} … {1}</ellipsis>
-		<moreInformation>?</moreInformation>
-	</characters>
-	<delimiters>
-		<quotationStart>«</quotationStart>
-		<quotationEnd>»</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>”</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="ethiopic">
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d – d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M – M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL – LLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y – y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">LLL – LLL y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d – d MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M" draft="unconfirmed">LLLL – LLLL y G</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="generic">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, dd MMMM 'de' y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM 'de' y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/M/yy GGGGG</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<dateTimeFormatLength type="full">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="long">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="Ed">E d</dateFormatItem>
-						<dateFormatItem id="h" draft="unconfirmed">h a</dateFormatItem>
-						<dateFormatItem id="H" draft="unconfirmed">HH</dateFormatItem>
-						<dateFormatItem id="hm" draft="unconfirmed">h:mm a</dateFormatItem>
-						<dateFormatItem id="Hm" draft="unconfirmed">HH:mm</dateFormatItem>
-						<dateFormatItem id="hms" draft="unconfirmed">h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Hms" draft="unconfirmed">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
-						<dateFormatItem id="ms" draft="unconfirmed">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M/y</dateFormatItem>
-						<dateFormatItem id="yMd">d/M/y</dateFormatItem>
-						<dateFormatItem id="yMEd">E, d/M/y</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">E, d MMM y</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d – d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a" draft="unconfirmed">h a – h a</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h–h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="H">
-							<greatestDifference id="H" draft="unconfirmed">HH–HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hm">
-							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a" draft="unconfirmed">h a – h a v</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h–h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hv">
-							<greatestDifference id="H" draft="unconfirmed">HH–HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M – M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd – dd/MM</greatestDifference>
-							<greatestDifference id="M">dd/MM – dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd – E, dd/MM</greatestDifference>
-							<greatestDifference id="M">E, dd/MM – E, dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL – LLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d – d MMM</greatestDifference>
-							<greatestDifference id="M">d/MM – d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
-							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y – y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM – MM/y</greatestDifference>
-							<greatestDifference id="y">MM/y – MM/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d/M/y – d/M/y</greatestDifference>
-							<greatestDifference id="M">d/M/y – d/M/y</greatestDifference>
-							<greatestDifference id="y">d/M/y – d/M/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, d/M/y – E, d/M/y</greatestDifference>
-							<greatestDifference id="M">E, d/M/y – E, d/M/y</greatestDifference>
-							<greatestDifference id="y">E, d/M/y – E, d/M/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">LLL – LLL y G</greatestDifference>
-							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d – d MMM 'de' y G</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM y – d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d MMM – E, d MMM y</greatestDifference>
-							<greatestDifference id="M">E, d MMM – E, d MMM y</greatestDifference>
-							<greatestDifference id="y">E, d MMM y – E, d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">LLLL – LLLL 'de' y G</greatestDifference>
-							<greatestDifference id="y">LLLL y – LLLL y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">xin</month>
-							<month type="2">feb</month>
-							<month type="3">mar</month>
-							<month type="4">abr</month>
-							<month type="5">may</month>
-							<month type="6">xun</month>
-							<month type="7">xnt</month>
-							<month type="8">ago</month>
-							<month type="9">set</month>
-							<month type="10">och</month>
-							<month type="11">pay</month>
-							<month type="12">avi</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">X</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">X</month>
-							<month type="7">X</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">P</month>
-							<month type="12">A</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">de xineru</month>
-							<month type="2">de febreru</month>
-							<month type="3">de marzu</month>
-							<month type="4">d’abril</month>
-							<month type="5">de mayu</month>
-							<month type="6">de xunu</month>
-							<month type="7">de xunetu</month>
-							<month type="8">d’agostu</month>
-							<month type="9">de setiembre</month>
-							<month type="10">d’ochobre</month>
-							<month type="11">de payares</month>
-							<month type="12">d’avientu</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">Xin</month>
-							<month type="2">Feb</month>
-							<month type="3">Mar</month>
-							<month type="4">Abr</month>
-							<month type="5">May</month>
-							<month type="6">Xun</month>
-							<month type="7">Xnt</month>
-							<month type="8">Ago</month>
-							<month type="9">Set</month>
-							<month type="10">Och</month>
-							<month type="11">Pay</month>
-							<month type="12">Avi</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">X</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">X</month>
-							<month type="7">X</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">P</month>
-							<month type="12">A</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">xineru</month>
-							<month type="2">febreru</month>
-							<month type="3">marzu</month>
-							<month type="4">abril</month>
-							<month type="5">mayu</month>
-							<month type="6">xunu</month>
-							<month type="7">xunetu</month>
-							<month type="8">agostu</month>
-							<month type="9">setiembre</month>
-							<month type="10">ochobre</month>
-							<month type="11">payares</month>
-							<month type="12">avientu</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">dom</day>
-							<day type="mon">llu</day>
-							<day type="tue">mar</day>
-							<day type="wed">mie</day>
-							<day type="thu">xue</day>
-							<day type="fri">vie</day>
-							<day type="sat">sab</day>
-						</dayWidth>
-						<dayWidth type="narrow">
-							<day type="sun">D</day>
-							<day type="mon">L</day>
-							<day type="tue">M</day>
-							<day type="wed">M</day>
-							<day type="thu">X</day>
-							<day type="fri">V</day>
-							<day type="sat">S</day>
-						</dayWidth>
-						<dayWidth type="short">
-							<day type="sun">do</day>
-							<day type="mon">ll</day>
-							<day type="tue">ma</day>
-							<day type="wed">mi</day>
-							<day type="thu">xu</day>
-							<day type="fri">vi</day>
-							<day type="sat">sa</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">domingu</day>
-							<day type="mon">llunes</day>
-							<day type="tue">martes</day>
-							<day type="wed">miércoles</day>
-							<day type="thu">xueves</day>
-							<day type="fri">vienres</day>
-							<day type="sat">sábadu</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="abbreviated">
-							<day type="sun">dom</day>
-							<day type="mon">llu</day>
-							<day type="tue">mar</day>
-							<day type="wed">mie</day>
-							<day type="thu">xue</day>
-							<day type="fri">vie</day>
-							<day type="sat">sab</day>
-						</dayWidth>
-						<dayWidth type="narrow">
-							<day type="sun">D</day>
-							<day type="mon">L</day>
-							<day type="tue">M</day>
-							<day type="wed">M</day>
-							<day type="thu">X</day>
-							<day type="fri">V</day>
-							<day type="sat">S</day>
-						</dayWidth>
-						<dayWidth type="short">
-							<day type="sun">do</day>
-							<day type="mon">ll</day>
-							<day type="tue">ma</day>
-							<day type="wed">mi</day>
-							<day type="thu">xu</day>
-							<day type="fri">vi</day>
-							<day type="sat">sa</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">domingu</day>
-							<day type="mon">llunes</day>
-							<day type="tue">martes</day>
-							<day type="wed">miércoles</day>
-							<day type="thu">xueves</day>
-							<day type="fri">vienres</day>
-							<day type="sat">sábadu</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">1T</quarter>
-							<quarter type="2">2T</quarter>
-							<quarter type="3">3T</quarter>
-							<quarter type="4">4T</quarter>
-						</quarterWidth>
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1er trimestre</quarter>
-							<quarter type="2">2u trimestre</quarter>
-							<quarter type="3">3er trimestre</quarter>
-							<quarter type="4">4u trimestre</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">1T</quarter>
-							<quarter type="2">2T</quarter>
-							<quarter type="3">3T</quarter>
-							<quarter type="4">4T</quarter>
-						</quarterWidth>
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1er trimestre</quarter>
-							<quarter type="2">2u trimestre</quarter>
-							<quarter type="3">3er trimestre</quarter>
-							<quarter type="4">4u trimestre</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<dayPeriods>
-					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">a</dayPeriod>
-							<dayPeriod type="pm">p</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="pm">PM</dayPeriod>
-						</dayPeriodWidth>
-					</dayPeriodContext>
-				</dayPeriods>
-				<eras>
-					<eraNames>
-						<era type="0">a.C.</era>
-						<era type="0" alt="variant">edC</era>
-						<era type="1">d.C.</era>
-						<era type="1" alt="variant">ddC</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">a.C.</era>
-						<era type="0" alt="variant">edC</era>
-						<era type="1">d.C.</era>
-						<era type="1" alt="variant">ddC</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0">a.C.</era>
-						<era type="0" alt="variant">edC</era>
-						<era type="1">d.C.</era>
-						<era type="1" alt="variant">ddC</era>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM 'de' y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM 'de' y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/M/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<dateTimeFormatLength type="full">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="long">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="E">ccc</dateFormatItem>
-						<dateFormatItem id="Ed">E d</dateFormatItem>
-						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
-						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
-						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
-						<dateFormatItem id="H">HH</dateFormatItem>
-						<dateFormatItem id="hm">h:mm a</dateFormatItem>
-						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
-						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M/y</dateFormatItem>
-						<dateFormatItem id="yMd">d/M/y</dateFormatItem>
-						<dateFormatItem id="yMEd">E, d/M/y</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">E, d MMM y</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
-					</availableFormats>
-					<appendItems>
-						<appendItem request="Timezone">{0} {1}</appendItem>
-					</appendItems>
-					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d – d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h – h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="H">
-							<greatestDifference id="H">HH – HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm – h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm – h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hm">
-							<greatestDifference id="H">HH:mm – HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm – HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm – h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm – h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H">HH:mm – HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm – HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h – h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hv">
-							<greatestDifference id="H">HH – HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M – M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd – dd/MM</greatestDifference>
-							<greatestDifference id="M">dd/MM – dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd – E, dd/MM</greatestDifference>
-							<greatestDifference id="M">E, dd/MM – E, dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL – LLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d – d MMM</greatestDifference>
-							<greatestDifference id="M">d/MM – d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
-							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y – y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM – MM/y</greatestDifference>
-							<greatestDifference id="y">MM/y – MM/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d/M/y – d/M/y</greatestDifference>
-							<greatestDifference id="M">d/M/y – d/M/y</greatestDifference>
-							<greatestDifference id="y">d/M/y – d/M/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, d/M/y – E, d/M/y</greatestDifference>
-							<greatestDifference id="M">E, d/M/y – E, d/M/y</greatestDifference>
-							<greatestDifference id="y">E, d/M/y – E, d/M/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM – MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d – d MMM 'de' y</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM y – d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d MMM – E, d MMM y</greatestDifference>
-							<greatestDifference id="M">E, d MMM – E, d MMM y</greatestDifference>
-							<greatestDifference id="y">E, d MMM y – E, d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">LLLL – LLLL y</greatestDifference>
-							<greatestDifference id="y">LLLL y – LLLL y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="japanese">
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d – d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M – M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL – LLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y – y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">LLL – LLL y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d – d MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M" draft="unconfirmed">LLLL – LLLL y G</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="persian">
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d – d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M – M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL – LLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y – y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">LLL – LLL y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d – d MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="roc">
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d – d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M – M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL – LLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y – y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">LLL – LLL y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d – d MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<fields>
-			<field type="era">
-				<displayName>era</displayName>
-			</field>
-			<field type="year">
-				<displayName>añu</displayName>
-				<relative type="-1">l’añu pasáu</relative>
-				<relative type="0">esti añu</relative>
-				<relative type="1">l’añu viniente</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">En {0} añu</relativeTimePattern>
-					<relativeTimePattern count="other">En {0} años</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Hai {0} añu</relativeTimePattern>
-					<relativeTimePattern count="other">Hai {0} años</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="year-short">
-				<displayName>añu</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">en {0} añu</relativeTimePattern>
-					<relativeTimePattern count="other">en {0} años</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">hai {0} añu</relativeTimePattern>
-					<relativeTimePattern count="other">hai {0} años</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="year-narrow">
-				<displayName>añu</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">en {0} a.</relativeTimePattern>
-					<relativeTimePattern count="other">en {0} a.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">hai {0} a.</relativeTimePattern>
-					<relativeTimePattern count="other">hai {0} a.</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="quarter">
-				<displayName>Trimestre</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">en {0} trimestre</relativeTimePattern>
-					<relativeTimePattern count="other">en {0} trimestres</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">hai {0} trimestre</relativeTimePattern>
-					<relativeTimePattern count="other">hai {0} trimestres</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="quarter-short">
-				<displayName draft="unconfirmed">Trimestre</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">en {0} trim.</relativeTimePattern>
-					<relativeTimePattern count="other">en {0} trim.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">hai {0} trim.</relativeTimePattern>
-					<relativeTimePattern count="other">hai {0} trim.</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="quarter-narrow">
-				<displayName draft="unconfirmed">Trimestre</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">en {0} tr.</relativeTimePattern>
-					<relativeTimePattern count="other">en {0} tr.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">hai {0} tr.</relativeTimePattern>
-					<relativeTimePattern count="other">hai {0} tr.</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="month">
-				<displayName>mes</displayName>
-				<relative type="-1">el mes pasáu</relative>
-				<relative type="0">esti mes</relative>
-				<relative type="1">el mes viniente</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">En {0} mes</relativeTimePattern>
-					<relativeTimePattern count="other">En {0} meses</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Hai {0} mes</relativeTimePattern>
-					<relativeTimePattern count="other">Hai {0} meses</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="month-short">
-				<displayName>mes</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">en {0} mes</relativeTimePattern>
-					<relativeTimePattern count="other">en {0} meses</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">hai {0} mes</relativeTimePattern>
-					<relativeTimePattern count="other">hai {0} meses</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="month-narrow">
-				<displayName>mes</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">en {0} m.</relativeTimePattern>
-					<relativeTimePattern count="other">en {0} m.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">hai {0} m.</relativeTimePattern>
-					<relativeTimePattern count="other">hai {0} m.</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="week">
-				<displayName>selmana</displayName>
-				<relative type="-1">la selmana pasada</relative>
-				<relative type="0">esta selmana</relative>
-				<relative type="1">la selmana viniente</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">En {0} selmana</relativeTimePattern>
-					<relativeTimePattern count="other">En {0} selmanes</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Hai {0} selmana</relativeTimePattern>
-					<relativeTimePattern count="other">Hai {0} selmanes</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="week-short">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">en {0} selm.</relativeTimePattern>
-					<relativeTimePattern count="other">en {0} selm.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">hai {0} selm.</relativeTimePattern>
-					<relativeTimePattern count="other">hai {0} selm.</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="week-narrow">
-				<displayName draft="unconfirmed">selmana</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">en {0} se.</relativeTimePattern>
-					<relativeTimePattern count="other">en {0} se.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">hai {0} se.</relativeTimePattern>
-					<relativeTimePattern count="other">hai {0} se.</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="day">
-				<displayName>día</displayName>
-				<relative type="-2">antayeri</relative>
-				<relative type="-1">ayeri</relative>
-				<relative type="0">güei</relative>
-				<relative type="1">mañana</relative>
-				<relative type="2">pasao mañana</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">En {0} dia</relativeTimePattern>
-					<relativeTimePattern count="other">En {0} díes</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Hai {0} dia</relativeTimePattern>
-					<relativeTimePattern count="other">Hai {0} díes</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="day-short">
-				<displayName>día</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">en {0} día</relativeTimePattern>
-					<relativeTimePattern count="other">en {0} díes</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">hai {0} día</relativeTimePattern>
-					<relativeTimePattern count="other">hai {0} díes</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="day-narrow">
-				<displayName>día</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">en {0} d.</relativeTimePattern>
-					<relativeTimePattern count="other">en {0} d.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">hai {0} d.</relativeTimePattern>
-					<relativeTimePattern count="other">hai {0} d.</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="weekday">
-				<displayName>día de la selmana</displayName>
-			</field>
-			<field type="sun">
-				<relative type="-1">el domingu pasáu</relative>
-				<relative type="0">esti domingu</relative>
-				<relative type="1">el domingu viniente</relative>
-			</field>
-			<field type="mon">
-				<relative type="-1">el llunes pasáu</relative>
-				<relative type="0">esti llunes</relative>
-				<relative type="1">el llunes viniente</relative>
-			</field>
-			<field type="tue">
-				<relative type="-1">el martes pasáu</relative>
-				<relative type="0">esti martes</relative>
-				<relative type="1">el martes viniente</relative>
-			</field>
-			<field type="wed">
-				<relative type="-1">el miércoles pasáu</relative>
-				<relative type="0">esti miércoles</relative>
-				<relative type="1">el miércoles viniente</relative>
-			</field>
-			<field type="thu">
-				<relative type="-1">el xueves pasáu</relative>
-				<relative type="0">esti xueves</relative>
-				<relative type="1">el xueves viniente</relative>
-			</field>
-			<field type="fri">
-				<relative type="-1">el vienres pasáu</relative>
-				<relative type="0">esti vienres</relative>
-				<relative type="1">el vienres viniente</relative>
-			</field>
-			<field type="sat">
-				<relative type="-1">el sábadu pasáu</relative>
-				<relative type="0">esti sábadu</relative>
-				<relative type="1">el sábadu viniente</relative>
-			</field>
-			<field type="dayperiod">
-				<displayName>periodu del día</displayName>
-			</field>
-			<field type="hour">
-				<displayName>hora</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">En {0} hora</relativeTimePattern>
-					<relativeTimePattern count="other">En {0} hores</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Hai {0} hora</relativeTimePattern>
-					<relativeTimePattern count="other">Hai {0} hores</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="hour-short">
-				<displayName draft="unconfirmed">hora</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">en {0} h.</relativeTimePattern>
-					<relativeTimePattern count="other">en {0} h.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">hai {0} h.</relativeTimePattern>
-					<relativeTimePattern count="other">hai {0} h.</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="hour-narrow">
-				<displayName draft="unconfirmed">hora</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">en {0} h.</relativeTimePattern>
-					<relativeTimePattern count="other">en {0} h.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">hai {0} h.</relativeTimePattern>
-					<relativeTimePattern count="other">hai {0} h.</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="minute">
-				<displayName>minutu</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">En {0} minutu</relativeTimePattern>
-					<relativeTimePattern count="other">En {0} minutos</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Hai {0} minutu</relativeTimePattern>
-					<relativeTimePattern count="other">Hai {0} minutos</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="minute-short">
-				<displayName draft="unconfirmed">minutu</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">en {0} min.</relativeTimePattern>
-					<relativeTimePattern count="other">en {0} min.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">hai {0} min.</relativeTimePattern>
-					<relativeTimePattern count="other">hai {0} min.</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="minute-narrow">
-				<displayName draft="unconfirmed">minutu</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">en {0} min.</relativeTimePattern>
-					<relativeTimePattern count="other">en {0} min.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">hai {0} min.</relativeTimePattern>
-					<relativeTimePattern count="other">hai {0} min.</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="second">
-				<displayName>segundu</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">En {0} segundu</relativeTimePattern>
-					<relativeTimePattern count="other">En {0} segundos</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Hai {0} segundu</relativeTimePattern>
-					<relativeTimePattern count="other">Hai {0} segundos</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="second-short">
-				<displayName draft="unconfirmed">segundu</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">en {0} seg.</relativeTimePattern>
-					<relativeTimePattern count="other">en {0} seg.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">hai {0} seg.</relativeTimePattern>
-					<relativeTimePattern count="other">hai {0} seg.</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="second-narrow">
-				<displayName draft="unconfirmed">segundu</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">en {0} s.</relativeTimePattern>
-					<relativeTimePattern count="other">en {0} s.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">hai {0} s.</relativeTimePattern>
-					<relativeTimePattern count="other">hai {0} s.</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="zone">
-				<displayName>zona horaria</displayName>
-			</field>
-		</fields>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<gmtZeroFormat>GMT</gmtZeroFormat>
-			<regionFormat>Hora de {0}</regionFormat>
-			<regionFormat type="daylight">{0} (+1)</regionFormat>
-			<regionFormat type="standard">{0} (+0)</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Ciudá desconocida</exemplarCity>
-			</zone>
-			<zone type="Europe/Andorra">
-				<exemplarCity>Andorra</exemplarCity>
-			</zone>
-			<zone type="Asia/Dubai">
-				<exemplarCity>Dubai</exemplarCity>
-			</zone>
-			<zone type="Asia/Kabul">
-				<exemplarCity>Kabul</exemplarCity>
-			</zone>
-			<zone type="America/Antigua">
-				<exemplarCity>Antigua</exemplarCity>
-			</zone>
-			<zone type="America/Anguilla">
-				<exemplarCity>Anguila</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>Yerevan</exemplarCity>
-			</zone>
-			<zone type="Africa/Luanda">
-				<exemplarCity>Luanda</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Rothera">
-				<exemplarCity>Rothera</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Palmer">
-				<exemplarCity>Palmer</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Troll">
-				<exemplarCity>Troll</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>Syowa</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Mawson">
-				<exemplarCity>Mawson</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Davis">
-				<exemplarCity>Davis</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>Vostok</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Casey">
-				<exemplarCity>Casey</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont d’Urville</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity>McMurdo</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Rio Gallegos</exemplarCity>
-			</zone>
-			<zone type="America/Mendoza">
-				<exemplarCity>Mendoza</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>San Juan</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>Ushuaia</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity>La Rioja</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Luis">
-				<exemplarCity>San Luis</exemplarCity>
-			</zone>
-			<zone type="America/Catamarca">
-				<exemplarCity>Catamarca</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Salta">
-				<exemplarCity>Salta</exemplarCity>
-			</zone>
-			<zone type="America/Jujuy">
-				<exemplarCity>Jujuy</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tucuman</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Cordoba</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>Buenos Aires</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pago_Pago">
-				<exemplarCity>Pago Pago</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Viena</exemplarCity>
-			</zone>
-			<zone type="Australia/Perth">
-				<exemplarCity>Perth</exemplarCity>
-			</zone>
-			<zone type="Australia/Eucla">
-				<exemplarCity>Eucla</exemplarCity>
-			</zone>
-			<zone type="Australia/Darwin">
-				<exemplarCity>Darwin</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>Adelaide</exemplarCity>
-			</zone>
-			<zone type="Australia/Broken_Hill">
-				<exemplarCity>Broken Hill</exemplarCity>
-			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
-			<zone type="Australia/Melbourne">
-				<exemplarCity>Melbourne</exemplarCity>
-			</zone>
-			<zone type="Australia/Hobart">
-				<exemplarCity>Hobart</exemplarCity>
-			</zone>
-			<zone type="Australia/Lindeman">
-				<exemplarCity>Lindeman</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>Sydney</exemplarCity>
-			</zone>
-			<zone type="Australia/Brisbane">
-				<exemplarCity>Brisbane</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Macquarie">
-				<exemplarCity>Macquarie</exemplarCity>
-			</zone>
-			<zone type="Australia/Lord_Howe">
-				<exemplarCity>Lord Howe</exemplarCity>
-			</zone>
-			<zone type="America/Aruba">
-				<exemplarCity>Aruba</exemplarCity>
-			</zone>
-			<zone type="Europe/Mariehamn">
-				<exemplarCity>Mariehamn</exemplarCity>
-			</zone>
-			<zone type="Asia/Baku">
-				<exemplarCity>Baku</exemplarCity>
-			</zone>
-			<zone type="Europe/Sarajevo">
-				<exemplarCity>Sarajevo</exemplarCity>
-			</zone>
-			<zone type="America/Barbados">
-				<exemplarCity>Barbados</exemplarCity>
-			</zone>
-			<zone type="Asia/Dhaka">
-				<exemplarCity>Dhaka</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Bruxeles</exemplarCity>
-			</zone>
-			<zone type="Africa/Ouagadougou">
-				<exemplarCity>Ouagadougou</exemplarCity>
-			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>Sofía</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>Bahrain</exemplarCity>
-			</zone>
-			<zone type="Africa/Bujumbura">
-				<exemplarCity>Bujumbura</exemplarCity>
-			</zone>
-			<zone type="Africa/Porto-Novo">
-				<exemplarCity>Porto-Novo</exemplarCity>
-			</zone>
-			<zone type="America/St_Barthelemy">
-				<exemplarCity>St. Barthelemy</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>Bermuda</exemplarCity>
-			</zone>
-			<zone type="Asia/Brunei">
-				<exemplarCity>Brunei</exemplarCity>
-			</zone>
-			<zone type="America/La_Paz">
-				<exemplarCity>La Paz</exemplarCity>
-			</zone>
-			<zone type="America/Kralendijk">
-				<exemplarCity>Kralendijk</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Eirunepe</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>Rio Branco</exemplarCity>
-			</zone>
-			<zone type="America/Porto_Velho">
-				<exemplarCity>Porto Velho</exemplarCity>
-			</zone>
-			<zone type="America/Boa_Vista">
-				<exemplarCity>Boa Vista</exemplarCity>
-			</zone>
-			<zone type="America/Manaus">
-				<exemplarCity>Manaus</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiaba</exemplarCity>
-			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>Santarem</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>Campo Grande</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belem</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>Araguaina</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>Sao Paulo</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>Bahia</exemplarCity>
-			</zone>
-			<zone type="America/Fortaleza">
-				<exemplarCity>Fortaleza</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceio</exemplarCity>
-			</zone>
-			<zone type="America/Recife">
-				<exemplarCity>Recife</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>Noronha</exemplarCity>
-			</zone>
-			<zone type="America/Nassau">
-				<exemplarCity>Nassau</exemplarCity>
-			</zone>
-			<zone type="Asia/Thimphu">
-				<exemplarCity>Thimphu</exemplarCity>
-			</zone>
-			<zone type="Africa/Gaborone">
-				<exemplarCity>Gaborone</exemplarCity>
-			</zone>
-			<zone type="Europe/Minsk">
-				<exemplarCity>Minsk</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity>Belize</exemplarCity>
-			</zone>
-			<zone type="America/Dawson">
-				<exemplarCity>Dawson</exemplarCity>
-			</zone>
-			<zone type="America/Whitehorse">
-				<exemplarCity>Whitehorse</exemplarCity>
-			</zone>
-			<zone type="America/Inuvik">
-				<exemplarCity>Inuvik</exemplarCity>
-			</zone>
-			<zone type="America/Vancouver">
-				<exemplarCity>Vancouver</exemplarCity>
-			</zone>
-			<zone type="America/Dawson_Creek">
-				<exemplarCity>Dawson Creek</exemplarCity>
-			</zone>
-			<zone type="America/Creston">
-				<exemplarCity>Creston</exemplarCity>
-			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Yellowknife</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity>Edmonton</exemplarCity>
-			</zone>
-			<zone type="America/Swift_Current">
-				<exemplarCity>Swift Current</exemplarCity>
-			</zone>
-			<zone type="America/Cambridge_Bay">
-				<exemplarCity>Cambridge Bay</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>Regina</exemplarCity>
-			</zone>
-			<zone type="America/Winnipeg">
-				<exemplarCity>Winnipeg</exemplarCity>
-			</zone>
-			<zone type="America/Resolute">
-				<exemplarCity>Resolute</exemplarCity>
-			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Rainy River</exemplarCity>
-			</zone>
-			<zone type="America/Rankin_Inlet">
-				<exemplarCity>Rankin Inlet</exemplarCity>
-			</zone>
-			<zone type="America/Coral_Harbour">
-				<exemplarCity>Atikokan</exemplarCity>
-			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Thunder Bay</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Nipigon</exemplarCity>
-			</zone>
-			<zone type="America/Toronto">
-				<exemplarCity>Toronto</exemplarCity>
-			</zone>
-			<zone type="America/Iqaluit">
-				<exemplarCity>Iqaluit</exemplarCity>
-			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Pangnirtung</exemplarCity>
-			</zone>
-			<zone type="America/Moncton">
-				<exemplarCity>Moncton</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity>Halifax</exemplarCity>
-			</zone>
-			<zone type="America/Goose_Bay">
-				<exemplarCity>Goose Bay</exemplarCity>
-			</zone>
-			<zone type="America/Glace_Bay">
-				<exemplarCity>Glace Bay</exemplarCity>
-			</zone>
-			<zone type="America/Blanc-Sablon">
-				<exemplarCity>Blanc-Sablon</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>St. John’s</exemplarCity>
-			</zone>
-			<zone type="Indian/Cocos">
-				<exemplarCity>Cocos</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>Kinshasa</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>Lubumbashi</exemplarCity>
-			</zone>
-			<zone type="Africa/Bangui">
-				<exemplarCity>Bangui</exemplarCity>
-			</zone>
-			<zone type="Africa/Brazzaville">
-				<exemplarCity>Brazzaville</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>Zurich</exemplarCity>
-			</zone>
-			<zone type="Africa/Abidjan">
-				<exemplarCity>Abidjan</exemplarCity>
-			</zone>
-			<zone type="Pacific/Rarotonga">
-				<exemplarCity>Rarotonga</exemplarCity>
-			</zone>
-			<zone type="America/Santiago">
-				<exemplarCity>Santiago</exemplarCity>
-			</zone>
-			<zone type="Africa/Douala">
-				<exemplarCity>Douala</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Urumqi</exemplarCity>
-			</zone>
-			<zone type="Asia/Shanghai">
-				<exemplarCity>Shanghai</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Bogota</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>Costa Rica</exemplarCity>
-			</zone>
-			<zone type="America/Havana">
-				<exemplarCity>La Habana</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>Christmas</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>Nicosia</exemplarCity>
-			</zone>
-			<zone type="Europe/Prague">
-				<exemplarCity>Praga</exemplarCity>
-			</zone>
-			<zone type="Europe/Busingen">
-				<exemplarCity>Busingen</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>Berlín</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>Djibouti</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Copenhague</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>Dominica</exemplarCity>
-			</zone>
-			<zone type="America/Santo_Domingo">
-				<exemplarCity>Santo Domingo</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Galapagos</exemplarCity>
-			</zone>
-			<zone type="America/Guayaquil">
-				<exemplarCity>Guayaquil</exemplarCity>
-			</zone>
-			<zone type="Europe/Tallinn">
-				<exemplarCity>Tallinn</exemplarCity>
-			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>El Aaiun</exemplarCity>
-			</zone>
-			<zone type="Africa/Asmera">
-				<exemplarCity>Asmara</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Canaries</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>Ceuta</exemplarCity>
-			</zone>
-			<zone type="Europe/Madrid">
-				<exemplarCity>Madrid</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>Addis Ababa</exemplarCity>
-			</zone>
-			<zone type="Europe/Helsinki">
-				<exemplarCity>Helsinki</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>Fiji</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Stanley">
-				<exemplarCity>Stanley</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>Chuuk</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>Pohnpei</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kosrae">
-				<exemplarCity>Kosrae</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Islles Feroe</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>París</exemplarCity>
-			</zone>
-			<zone type="Africa/Libreville">
-				<exemplarCity>Libreville</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>Londres</exemplarCity>
-			</zone>
-			<zone type="America/Grenada">
-				<exemplarCity>Granada</exemplarCity>
-			</zone>
-			<zone type="Asia/Tbilisi">
-				<exemplarCity>Tbilisi</exemplarCity>
-			</zone>
-			<zone type="America/Cayenne">
-				<exemplarCity>Cayenne</exemplarCity>
-			</zone>
-			<zone type="Europe/Guernsey">
-				<exemplarCity>Guernsey</exemplarCity>
-			</zone>
-			<zone type="Africa/Accra">
-				<exemplarCity>Accra</exemplarCity>
-			</zone>
-			<zone type="Europe/Gibraltar">
-				<exemplarCity>Xibraltar</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>Thule</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>Nuuk</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>Ittoqqortoormiit</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>Danmarkshavn</exemplarCity>
-			</zone>
-			<zone type="Africa/Banjul">
-				<exemplarCity>Banjul</exemplarCity>
-			</zone>
-			<zone type="Africa/Conakry">
-				<exemplarCity>Conakry</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>Guadalupe</exemplarCity>
-			</zone>
-			<zone type="Africa/Malabo">
-				<exemplarCity>Malabo</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>Atenes</exemplarCity>
-			</zone>
-			<zone type="America/Guatemala">
-				<exemplarCity>Guatemala</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guam">
-				<exemplarCity>Guam</exemplarCity>
-			</zone>
-			<zone type="Africa/Bissau">
-				<exemplarCity>Bissau</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>Guyana</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Hong Kong</exemplarCity>
-			</zone>
-			<zone type="America/Tegucigalpa">
-				<exemplarCity>Tegucigalpa</exemplarCity>
-			</zone>
-			<zone type="Europe/Zagreb">
-				<exemplarCity>Zagreb</exemplarCity>
-			</zone>
-			<zone type="America/Port-au-Prince">
-				<exemplarCity>Port-au-Prince</exemplarCity>
-			</zone>
-			<zone type="Europe/Budapest">
-				<exemplarCity>Budapest</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>Jakarta</exemplarCity>
-			</zone>
-			<zone type="Asia/Pontianak">
-				<exemplarCity>Pontianak</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>Makassar</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>Jayapura</exemplarCity>
-			</zone>
-			<zone type="Europe/Dublin">
-				<exemplarCity>Dublín</exemplarCity>
-			</zone>
-			<zone type="Europe/Isle_of_Man">
-				<exemplarCity>Islla de Man</exemplarCity>
-			</zone>
-			<zone type="Indian/Chagos">
-				<exemplarCity>Chagos</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>Baghdad</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Tehran</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Reykjavik">
-				<exemplarCity>Reikiavik</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Roma</exemplarCity>
-			</zone>
-			<zone type="Europe/Jersey">
-				<exemplarCity>Jersey</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>Xamaica</exemplarCity>
-			</zone>
-			<zone type="Asia/Amman">
-				<exemplarCity>Amman</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>Tokyo</exemplarCity>
-			</zone>
-			<zone type="Africa/Nairobi">
-				<exemplarCity>Nairobi</exemplarCity>
-			</zone>
-			<zone type="Asia/Bishkek">
-				<exemplarCity>Bishkek</exemplarCity>
-			</zone>
-			<zone type="Asia/Phnom_Penh">
-				<exemplarCity>Phnom Penh</exemplarCity>
-			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kiritimati">
-				<exemplarCity>Kiritimati</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tarawa">
-				<exemplarCity>Tarawa</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>Comoro</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>St. Kitts</exemplarCity>
-			</zone>
-			<zone type="Asia/Pyongyang">
-				<exemplarCity>Pyongyang</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>Kuwait</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>Caimán</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>Aqtau</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>Oral</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>Aqtobe</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>Qyzylorda</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>Almaty</exemplarCity>
-			</zone>
-			<zone type="Asia/Vientiane">
-				<exemplarCity>Vientiane</exemplarCity>
-			</zone>
-			<zone type="Asia/Beirut">
-				<exemplarCity>Beirut</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>St. Lucia</exemplarCity>
-			</zone>
-			<zone type="Europe/Vaduz">
-				<exemplarCity>Vaduz</exemplarCity>
-			</zone>
-			<zone type="Asia/Colombo">
-				<exemplarCity>Colombo</exemplarCity>
-			</zone>
-			<zone type="Africa/Monrovia">
-				<exemplarCity>Monrovia</exemplarCity>
-			</zone>
-			<zone type="Africa/Maseru">
-				<exemplarCity>Maseru</exemplarCity>
-			</zone>
-			<zone type="Europe/Vilnius">
-				<exemplarCity>Vilnius</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Luxemburgu</exemplarCity>
-			</zone>
-			<zone type="Europe/Riga">
-				<exemplarCity>Riga</exemplarCity>
-			</zone>
-			<zone type="Africa/Tripoli">
-				<exemplarCity>Tripoli</exemplarCity>
-			</zone>
-			<zone type="Africa/Casablanca">
-				<exemplarCity>Casablanca</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>Monaco</exemplarCity>
-			</zone>
-			<zone type="Europe/Chisinau">
-				<exemplarCity>Chisinau</exemplarCity>
-			</zone>
-			<zone type="Europe/Podgorica">
-				<exemplarCity>Podgorica</exemplarCity>
-			</zone>
-			<zone type="America/Marigot">
-				<exemplarCity>Marigot</exemplarCity>
-			</zone>
-			<zone type="Indian/Antananarivo">
-				<exemplarCity>Antananarivo</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kwajalein">
-				<exemplarCity>Kwajalein</exemplarCity>
-			</zone>
-			<zone type="Pacific/Majuro">
-				<exemplarCity>Majuro</exemplarCity>
-			</zone>
-			<zone type="Europe/Skopje">
-				<exemplarCity>Skopje</exemplarCity>
-			</zone>
-			<zone type="Africa/Bamako">
-				<exemplarCity>Bamako</exemplarCity>
-			</zone>
-			<zone type="Asia/Rangoon">
-				<exemplarCity>Rangoon</exemplarCity>
-			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>Hovd</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>Choibalsan</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>Macau</exemplarCity>
-			</zone>
-			<zone type="Pacific/Saipan">
-				<exemplarCity>Saipan</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>La Martinica</exemplarCity>
-			</zone>
-			<zone type="Africa/Nouakchott">
-				<exemplarCity>Nouakchott</exemplarCity>
-			</zone>
-			<zone type="America/Montserrat">
-				<exemplarCity>Montserrat</exemplarCity>
-			</zone>
-			<zone type="Europe/Malta">
-				<exemplarCity>Malta</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>Mauritius</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Maldives</exemplarCity>
-			</zone>
-			<zone type="Africa/Blantyre">
-				<exemplarCity>Blantyre</exemplarCity>
-			</zone>
-			<zone type="America/Tijuana">
-				<exemplarCity>Tijuana</exemplarCity>
-			</zone>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
-			<zone type="America/Hermosillo">
-				<exemplarCity>Hermosillo</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Mazatlan</exemplarCity>
-			</zone>
-			<zone type="America/Chihuahua">
-				<exemplarCity>Chihuahua</exemplarCity>
-			</zone>
-			<zone type="America/Bahia_Banderas">
-				<exemplarCity>Bahia Banderas</exemplarCity>
-			</zone>
-			<zone type="America/Ojinaga">
-				<exemplarCity>Ojinaga</exemplarCity>
-			</zone>
-			<zone type="America/Monterrey">
-				<exemplarCity>Monterrey</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity draft="unconfirmed">Ciudá de Méxicu</exemplarCity>
-			</zone>
-			<zone type="America/Matamoros">
-				<exemplarCity>Matamoros</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>Mérida</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>Cancún</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuala_Lumpur">
-				<exemplarCity>Kuala Lumpur</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuching">
-				<exemplarCity>Kuching</exemplarCity>
-			</zone>
-			<zone type="Africa/Maputo">
-				<exemplarCity>Maputo</exemplarCity>
-			</zone>
-			<zone type="Africa/Windhoek">
-				<exemplarCity>Windhoek</exemplarCity>
-			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>Noumea</exemplarCity>
-			</zone>
-			<zone type="Africa/Niamey">
-				<exemplarCity>Niamey</exemplarCity>
-			</zone>
-			<zone type="Pacific/Norfolk">
-				<exemplarCity>Norfolk</exemplarCity>
-			</zone>
-			<zone type="Africa/Lagos">
-				<exemplarCity>Lagos</exemplarCity>
-			</zone>
-			<zone type="America/Managua">
-				<exemplarCity>Managua</exemplarCity>
-			</zone>
-			<zone type="Europe/Amsterdam">
-				<exemplarCity>Amsterdam</exemplarCity>
-			</zone>
-			<zone type="Europe/Oslo">
-				<exemplarCity>Oslo</exemplarCity>
-			</zone>
-			<zone type="Asia/Katmandu">
-				<exemplarCity>Kathmandu</exemplarCity>
-			</zone>
-			<zone type="Pacific/Nauru">
-				<exemplarCity>Nauru</exemplarCity>
-			</zone>
-			<zone type="Pacific/Niue">
-				<exemplarCity>Niue</exemplarCity>
-			</zone>
-			<zone type="Pacific/Chatham">
-				<exemplarCity>Chatham</exemplarCity>
-			</zone>
-			<zone type="Pacific/Auckland">
-				<exemplarCity>Auckland</exemplarCity>
-			</zone>
-			<zone type="America/Panama">
-				<exemplarCity>Panamá</exemplarCity>
-			</zone>
-			<zone type="America/Lima">
-				<exemplarCity>Lima</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tahiti">
-				<exemplarCity>Tahiti</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>Marquesas</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity>Gambier</exemplarCity>
-			</zone>
-			<zone type="Pacific/Port_Moresby">
-				<exemplarCity>Port Moresby</exemplarCity>
-			</zone>
-			<zone type="Asia/Manila">
-				<exemplarCity>Manila</exemplarCity>
-			</zone>
-			<zone type="Asia/Karachi">
-				<exemplarCity>Karachi</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Varsovia</exemplarCity>
-			</zone>
-			<zone type="America/Miquelon">
-				<exemplarCity>Miquelon</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity>Pitcairn</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>Puerto Rico</exemplarCity>
-			</zone>
-			<zone type="Asia/Gaza">
-				<exemplarCity>Gaza</exemplarCity>
-			</zone>
-			<zone type="Asia/Hebron">
-				<exemplarCity>Hebron</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Les Azores</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Madeira">
-				<exemplarCity>Madeira</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lisboa</exemplarCity>
-			</zone>
-			<zone type="Pacific/Palau">
-				<exemplarCity>Palau</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>Asuncion</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>Qatar</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>Reunion</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Bucarest</exemplarCity>
-			</zone>
-			<zone type="Europe/Belgrade">
-				<exemplarCity>Belgráu</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>Kaliningrad</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>Simferopol</exemplarCity>
-			</zone>
-			<zone type="Europe/Samara">
-				<exemplarCity>Samara</exemplarCity>
-			</zone>
-			<zone type="Asia/Omsk">
-				<exemplarCity>Omsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>Novosibirsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Novokuznetsk">
-				<exemplarCity>Novokuznetsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Krasnoyarsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>Irkutsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>Yakutsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>Vladivostok</exemplarCity>
-			</zone>
-			<zone type="Asia/Khandyga">
-				<exemplarCity>Khandyga</exemplarCity>
-			</zone>
-			<zone type="Asia/Ust-Nera">
-				<exemplarCity>Ust-Nera</exemplarCity>
-			</zone>
-			<zone type="Asia/Magadan">
-				<exemplarCity>Magadan</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Kamchatka</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>Anadyr</exemplarCity>
-			</zone>
-			<zone type="Africa/Kigali">
-				<exemplarCity>Kigali</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>Riyadh</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guadalcanal">
-				<exemplarCity>Guadalcanal</exemplarCity>
-			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>Mahe</exemplarCity>
-			</zone>
-			<zone type="Europe/Stockholm">
-				<exemplarCity>Estocolmu</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>St. Helena</exemplarCity>
-			</zone>
-			<zone type="Europe/Ljubljana">
-				<exemplarCity>Liubliana</exemplarCity>
-			</zone>
-			<zone type="Arctic/Longyearbyen">
-				<exemplarCity>Longyearbyen</exemplarCity>
-			</zone>
-			<zone type="Europe/Bratislava">
-				<exemplarCity>Bratislava</exemplarCity>
-			</zone>
-			<zone type="Africa/Freetown">
-				<exemplarCity>Freetown</exemplarCity>
-			</zone>
-			<zone type="Europe/San_Marino">
-				<exemplarCity>San Marino</exemplarCity>
-			</zone>
-			<zone type="Africa/Dakar">
-				<exemplarCity>Dakar</exemplarCity>
-			</zone>
-			<zone type="Africa/Mogadishu">
-				<exemplarCity>Mogadishu</exemplarCity>
-			</zone>
-			<zone type="America/Paramaribo">
-				<exemplarCity>Paramaribo</exemplarCity>
-			</zone>
-			<zone type="Africa/Juba">
-				<exemplarCity>Juba</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>Sao Tome</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>El Salvador</exemplarCity>
-			</zone>
-			<zone type="America/Lower_Princes">
-				<exemplarCity>Lower Prince’s Quarter</exemplarCity>
-			</zone>
-			<zone type="Africa/Mbabane">
-				<exemplarCity>Mbabane</exemplarCity>
-			</zone>
-			<zone type="America/Grand_Turk">
-				<exemplarCity>Grand Turk</exemplarCity>
-			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>Ndjamena</exemplarCity>
-			</zone>
-			<zone type="Indian/Kerguelen">
-				<exemplarCity>Kerguelen</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Lome</exemplarCity>
-			</zone>
-			<zone type="Asia/Bangkok">
-				<exemplarCity>Bangkok</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>Dushanbe</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fakaofo">
-				<exemplarCity>Fakaofo</exemplarCity>
-			</zone>
-			<zone type="Asia/Dili">
-				<exemplarCity>Dili</exemplarCity>
-			</zone>
-			<zone type="Asia/Ashgabat">
-				<exemplarCity>Ashgabat</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tongatapu">
-				<exemplarCity>Tongatapu</exemplarCity>
-			</zone>
-			<zone type="Europe/Istanbul">
-				<exemplarCity>Istanbul</exemplarCity>
-			</zone>
-			<zone type="America/Port_of_Spain">
-				<exemplarCity>Port of Spain</exemplarCity>
-			</zone>
-			<zone type="Pacific/Funafuti">
-				<exemplarCity>Funafuti</exemplarCity>
-			</zone>
-			<zone type="Asia/Taipei">
-				<exemplarCity>Taipei</exemplarCity>
-			</zone>
-			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity>Dar es Salaam</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uzhgorod</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>Kiev</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporozhye</exemplarCity>
-			</zone>
-			<zone type="Africa/Kampala">
-				<exemplarCity>Kampala</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>Midway</exemplarCity>
-			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Johnston</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>Wake</exemplarCity>
-			</zone>
-			<zone type="America/Adak">
-				<exemplarCity>Adak</exemplarCity>
-			</zone>
-			<zone type="America/Nome">
-				<exemplarCity>Nome</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>Honolulu</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>Anchorage</exemplarCity>
-			</zone>
-			<zone type="America/Yakutat">
-				<exemplarCity>Yakutat</exemplarCity>
-			</zone>
-			<zone type="America/Sitka">
-				<exemplarCity>Sitka</exemplarCity>
-			</zone>
-			<zone type="America/Juneau">
-				<exemplarCity>Juneau</exemplarCity>
-			</zone>
-			<zone type="America/Metlakatla">
-				<exemplarCity>Metlakatla</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>Los Angeles</exemplarCity>
-			</zone>
-			<zone type="America/Boise">
-				<exemplarCity>Boise</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>Phoenix</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>Denver</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Beulah">
-				<exemplarCity>Beulah, Dakota del Norte</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>Nueva Salem, Dakota del Norte</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Center, Dakota del Norte</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>Chicago</exemplarCity>
-			</zone>
-			<zone type="America/Menominee">
-				<exemplarCity>Menominee</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>Vincennes, Indiana</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>Petersburg, Indiana</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Tell_City">
-				<exemplarCity>Tell City, Indiana</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>Knox, Indiana</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>Winamac, Indiana</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>Marengo, Indiana</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>Indianapolis</exemplarCity>
-			</zone>
-			<zone type="America/Louisville">
-				<exemplarCity>Louisville</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>Vevay, Indiana</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>Monticello, Kentucky</exemplarCity>
-			</zone>
-			<zone type="America/Detroit">
-				<exemplarCity>Detroit</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>Nueva York</exemplarCity>
-			</zone>
-			<zone type="America/Montevideo">
-				<exemplarCity>Montevideo</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>Samarkand</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>Tashkent</exemplarCity>
-			</zone>
-			<zone type="Europe/Vatican">
-				<exemplarCity>El Vaticanu</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>St. Vincent</exemplarCity>
-			</zone>
-			<zone type="America/Caracas">
-				<exemplarCity>Caracas</exemplarCity>
-			</zone>
-			<zone type="America/Tortola">
-				<exemplarCity>Tortola</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>St. Thomas</exemplarCity>
-			</zone>
-			<zone type="Asia/Saigon">
-				<exemplarCity>Ho Chi Minh</exemplarCity>
-			</zone>
-			<zone type="Pacific/Efate">
-				<exemplarCity>Efate</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wallis">
-				<exemplarCity>Wallis</exemplarCity>
-			</zone>
-			<zone type="Pacific/Apia">
-				<exemplarCity>Apia</exemplarCity>
-			</zone>
-			<zone type="Asia/Aden">
-				<exemplarCity>Aden</exemplarCity>
-			</zone>
-			<zone type="Indian/Mayotte">
-				<exemplarCity>Mayotte</exemplarCity>
-			</zone>
-			<zone type="Africa/Lusaka">
-				<exemplarCity>Lusaka</exemplarCity>
-			</zone>
-			<zone type="Africa/Harare">
-				<exemplarCity>Harare</exemplarCity>
-			</zone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard draft="unconfirmed">Hora d’África central</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard draft="unconfirmed">Hora d’África oriental</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<standard>Hora de Sudáfrica</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<generic draft="unconfirmed">Hora d’África occidental</generic>
-					<standard draft="unconfirmed">Hora estándar d’África occidental</standard>
-					<daylight draft="unconfirmed">Hora de branu d’África occidental</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<generic draft="unconfirmed">Hora d’Alaska</generic>
-					<standard draft="unconfirmed">Hora estándar d’Alaska</standard>
-					<daylight draft="unconfirmed">Hora de branu d’Alaska</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>Hora central norteamericana</generic>
-					<standard>Hora estándar central norteamericana</standard>
-					<daylight>Hora de branu central norteamericana</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>Hora del este norteamericanu</generic>
-					<standard>Hora estándar del este norteamericanu</standard>
-					<daylight>Hora de branu del este norteamericanu</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>Hora de les montañes norteamericanes</generic>
-					<standard>Hora estándar de les montañes norteamericanes</standard>
-					<daylight>Hora de branu de les montañes norteamericanes</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>Hora del Pacíficu norteamericanu</generic>
-					<standard>Hora estándar del Pacíficu norteamericanu</standard>
-					<daylight>Hora de branu del Pacíficu norteamericanu</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azores">
-				<long>
-					<generic>Hora de les Azores</generic>
-					<standard>Hora estándar de les Azores</standard>
-					<daylight>Hora de branu de les Azores</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cape_Verde">
-				<long>
-					<generic>Hora de Cabu Verde</generic>
-					<standard>Hora estándar de Cabu Verde</standard>
-					<daylight>Hora de branu de Cabu Verde</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<generic draft="unconfirmed">Hora d’Europa Central</generic>
-					<standard draft="unconfirmed">Hora estándar d’Europa Central</standard>
-					<daylight draft="unconfirmed">Hora de branu d’Europa Central</daylight>
-				</long>
-				<short>
-					<generic draft="unconfirmed">CET</generic>
-					<standard draft="unconfirmed">CET</standard>
-					<daylight draft="unconfirmed">CEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<generic draft="unconfirmed">Hora d’Europa del Este</generic>
-					<standard draft="unconfirmed">Hora estándar d’Europa del Este</standard>
-					<daylight draft="unconfirmed">Hora de branu d’Europa del Este</daylight>
-				</long>
-				<short>
-					<generic draft="unconfirmed">EET</generic>
-					<standard draft="unconfirmed">EET</standard>
-					<daylight draft="unconfirmed">EEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<generic draft="unconfirmed">Hora d’Europa Occidental</generic>
-					<standard draft="unconfirmed">Hora estándar d’Europa Occidental</standard>
-					<daylight draft="unconfirmed">Hora de branu d’Europa Occidental</daylight>
-				</long>
-				<short>
-					<generic draft="unconfirmed">WET</generic>
-					<standard draft="unconfirmed">WET</standard>
-					<daylight draft="unconfirmed">WEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>Hora media de Greenwich</standard>
-				</long>
-				<short>
-					<standard draft="unconfirmed">GMT</standard>
-				</short>
-			</metazone>
-			<metazone type="Irkutsk">
-				<long>
-					<generic draft="unconfirmed">Hora d’Irkutsk</generic>
-					<standard draft="unconfirmed">Hora estándar d’Irkutsk</standard>
-					<daylight draft="unconfirmed">Hora de branu d’Irkutsk</daylight>
-				</long>
-			</metazone>
-			<metazone type="Krasnoyarsk">
-				<long>
-					<generic>Hora de Krasnoyarsk</generic>
-					<standard>Hora estándar de Krasnoyarsk</standard>
-					<daylight>Hora de branu de Krasnoyarsk</daylight>
-				</long>
-			</metazone>
-			<metazone type="Magadan">
-				<long>
-					<generic>Hora de Magadán</generic>
-					<standard>Hora estándar de Magadán</standard>
-					<daylight>Hora de branu de Magadán</daylight>
-				</long>
-			</metazone>
-			<metazone type="Mauritius">
-				<long>
-					<generic>Hora de Mauriciu</generic>
-					<standard>Hora estándar de Mauriciu</standard>
-					<daylight>Hora de branu de Mauriciu</daylight>
-				</long>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>Hora de Moscú</generic>
-					<standard>Hora estándar de Moscú</standard>
-					<daylight>Hora de branu de Moscú</daylight>
-				</long>
-			</metazone>
-			<metazone type="Novosibirsk">
-				<long>
-					<generic>Hora de Novosibirsk</generic>
-					<standard>Hora estándar de Novosibirsk</standard>
-					<daylight>Hora de branu de Novosibirsk</daylight>
-				</long>
-			</metazone>
-			<metazone type="Omsk">
-				<long>
-					<generic draft="unconfirmed">Hora d’Omsk</generic>
-					<standard draft="unconfirmed">Hora estándar d’Omsk</standard>
-					<daylight draft="unconfirmed">Hora de branu d’Omsk</daylight>
-				</long>
-			</metazone>
-			<metazone type="Reunion">
-				<long>
-					<standard>Hora de Reunión</standard>
-				</long>
-			</metazone>
-			<metazone type="Sakhalin">
-				<long>
-					<generic draft="unconfirmed">Hora de Saxalín</generic>
-					<standard draft="unconfirmed">Hora estándar de Saxalín</standard>
-					<daylight draft="unconfirmed">Hora de branu de Saxalín</daylight>
-				</long>
-			</metazone>
-			<metazone type="Seychelles">
-				<long>
-					<standard draft="unconfirmed">Hora de Les Seixeles</standard>
-				</long>
-			</metazone>
-			<metazone type="Vladivostok">
-				<long>
-					<generic>Hora de Vladivostok</generic>
-					<standard>Hora estándar de Vladivostok</standard>
-					<daylight>Hora de branu de Vladivostok</daylight>
-				</long>
-			</metazone>
-			<metazone type="Volgograd">
-				<long>
-					<generic draft="unconfirmed">Hora de Volgográu</generic>
-					<standard draft="unconfirmed">Hora estándar de Volgográu</standard>
-					<daylight draft="unconfirmed">Hora de branu de Volgográu</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yakutsk">
-				<long>
-					<generic>Hora de Yakutsk</generic>
-					<standard>Hora estándar de Yakutsk</standard>
-					<daylight>Hora de branu de Yakutsk</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yekaterinburg">
-				<long>
-					<generic>Hora de Yekaterimburgu</generic>
-					<standard>Hora estándar de Yekaterimburgu</standard>
-					<daylight>Hora de branu de Yekaterimburgu</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<defaultNumberingSystem draft="contributed">latn</defaultNumberingSystem>
-		<otherNumberingSystems>
-			<native draft="contributed">latn</native>
-		</otherNumberingSystems>
-		<minimumGroupingDigits draft="contributed">1</minimumGroupingDigits>
-		<symbols numberSystem="latn">
-			<decimal>,</decimal>
-			<group>.</group>
-			<list draft="unconfirmed">;</list>
-			<percentSign>%</percentSign>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<superscriptingExponent>×</superscriptingExponent>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan draft="unconfirmed">NaN</nan>
-			<timeSeparator draft="contributed">:</timeSeparator>
-		</symbols>
-		<decimalFormats numberSystem="latn">
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-			<decimalFormatLength type="long">
-				<decimalFormat>
-					<pattern type="1000" count="one">0K</pattern>
-					<pattern type="1000" count="other">0K</pattern>
-					<pattern type="10000" count="one">00K</pattern>
-					<pattern type="10000" count="other">00K</pattern>
-					<pattern type="100000" count="one">000K</pattern>
-					<pattern type="100000" count="other">000K</pattern>
-					<pattern type="1000000" count="one">0M</pattern>
-					<pattern type="1000000" count="other">0M</pattern>
-					<pattern type="10000000" count="one">00M</pattern>
-					<pattern type="10000000" count="other">00M</pattern>
-					<pattern type="100000000" count="one">000M</pattern>
-					<pattern type="100000000" count="other">000M</pattern>
-					<pattern type="1000000000" count="one">0G</pattern>
-					<pattern type="1000000000" count="other">0G</pattern>
-					<pattern type="10000000000" count="one">00G</pattern>
-					<pattern type="10000000000" count="other">00G</pattern>
-					<pattern type="100000000000" count="one">000G</pattern>
-					<pattern type="100000000000" count="other">000G</pattern>
-					<pattern type="1000000000000" count="one">0T</pattern>
-					<pattern type="1000000000000" count="other">0T</pattern>
-					<pattern type="10000000000000" count="one">00T</pattern>
-					<pattern type="10000000000000" count="other">00T</pattern>
-					<pattern type="100000000000000" count="one">000T</pattern>
-					<pattern type="100000000000000" count="other">000T</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-			<decimalFormatLength type="short">
-				<decimalFormat>
-					<pattern type="1000" count="one">0K</pattern>
-					<pattern type="1000" count="other">0K</pattern>
-					<pattern type="10000" count="one">00K</pattern>
-					<pattern type="10000" count="other">00K</pattern>
-					<pattern type="100000" count="one">000K</pattern>
-					<pattern type="100000" count="other">000K</pattern>
-					<pattern type="1000000" count="one">0M</pattern>
-					<pattern type="1000000" count="other">0M</pattern>
-					<pattern type="10000000" count="one">00M</pattern>
-					<pattern type="10000000" count="other">00M</pattern>
-					<pattern type="100000000" count="one">000M</pattern>
-					<pattern type="100000000" count="other">000M</pattern>
-					<pattern type="1000000000" count="one">0G</pattern>
-					<pattern type="1000000000" count="other">0G</pattern>
-					<pattern type="10000000000" count="one">00G</pattern>
-					<pattern type="10000000000" count="other">00G</pattern>
-					<pattern type="100000000000" count="one">000G</pattern>
-					<pattern type="100000000000" count="other">000G</pattern>
-					<pattern type="1000000000000" count="one">0T</pattern>
-					<pattern type="1000000000000" count="other">0T</pattern>
-					<pattern type="10000000000000" count="one">00T</pattern>
-					<pattern type="10000000000000" count="other">00T</pattern>
-					<pattern type="100000000000000" count="one">000T</pattern>
-					<pattern type="100000000000000" count="other">000T</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats numberSystem="latn">
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats numberSystem="latn">
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats numberSystem="latn">
-			<currencyFormatLength>
-				<currencyFormat type="standard">
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-				<currencyFormat type="accounting">
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="AED">
-				<displayName>dirḥam de los Emiratos Árabes Xuníos</displayName>
-				<displayName count="one">dirḥam EAX</displayName>
-				<displayName count="other">dirḥams EAX</displayName>
-				<symbol>AED</symbol>
-			</currency>
-			<currency type="AFN">
-				<displayName>afganí afganistanu</displayName>
-				<displayName count="one">afganí afganistanu</displayName>
-				<displayName count="other">afganís afganistanos</displayName>
-				<symbol>AFN</symbol>
-			</currency>
-			<currency type="ALL">
-				<displayName draft="unconfirmed">lek</displayName>
-				<displayName count="one" draft="unconfirmed">lek</displayName>
-				<displayName count="other" draft="unconfirmed">leks</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>dram armeniu</displayName>
-				<displayName count="one">dram armeniu</displayName>
-				<displayName count="other">drams armenios</displayName>
-				<symbol>AMD</symbol>
-			</currency>
-			<currency type="ANG">
-				<displayName>guilder de les Antilles Neerlandeses</displayName>
-				<displayName count="one">guilder de les Antilles Neerlandeses</displayName>
-				<displayName count="other">guilders de les Antilles Neerlandeses</displayName>
-				<symbol>ANG</symbol>
-			</currency>
-			<currency type="AOA">
-				<displayName>kwanza angolanu</displayName>
-				<displayName count="one">kwanza angolanu</displayName>
-				<displayName count="other">kwanzas angolanos</displayName>
-				<symbol>AOA</symbol>
-			</currency>
-			<currency type="ARS">
-				<displayName>pesu arxentín</displayName>
-				<displayName count="one">pesu arxentín</displayName>
-				<displayName count="other">pesos arxentinos</displayName>
-				<symbol>ARS</symbol>
-			</currency>
-			<currency type="AUD">
-				<displayName>dólar australianu</displayName>
-				<displayName count="one">dólar australianu</displayName>
-				<displayName count="other">dólares australianos</displayName>
-				<symbol>A$</symbol>
-			</currency>
-			<currency type="AWG">
-				<displayName>florín arubanu</displayName>
-				<displayName count="one">florín arubanu</displayName>
-				<displayName count="other">florines arubanos</displayName>
-				<symbol>AWG</symbol>
-			</currency>
-			<currency type="AZN">
-				<displayName draft="unconfirmed">manat azerbaixanu</displayName>
-				<displayName count="one" draft="unconfirmed">manat azerbaixanu</displayName>
-				<displayName count="other" draft="unconfirmed">manats azerbaixanos</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>marcu convertible de Bosnia-Herzegovina</displayName>
-				<displayName count="one">marcu convertible de Bosnia-Herzegovina</displayName>
-				<displayName count="other">marcos convertibles de Bosnia-Herzegovina</displayName>
-				<symbol>BAM</symbol>
-			</currency>
-			<currency type="BBD">
-				<displayName>dólar barbadianu</displayName>
-				<displayName count="one">dólar barbadianu</displayName>
-				<displayName count="other">dólares barbadianos</displayName>
-				<symbol>BBD</symbol>
-			</currency>
-			<currency type="BDT">
-				<displayName>taka bangladexí</displayName>
-				<displayName count="one">taka bangladexí</displayName>
-				<displayName count="other">takas bangladexinos</displayName>
-				<symbol>BDT</symbol>
-			</currency>
-			<currency type="BGN">
-				<displayName draft="unconfirmed">lev</displayName>
-				<displayName count="one" draft="unconfirmed">lev</displayName>
-				<displayName count="other" draft="unconfirmed">lev</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName draft="unconfirmed">dinar baḥreiní</displayName>
-				<displayName count="one" draft="unconfirmed">dinar baḥreiní</displayName>
-				<displayName count="other" draft="unconfirmed">dinares baḥreininos</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>francu burundianu</displayName>
-				<displayName count="one">francu burundianu</displayName>
-				<displayName count="other">francos burundianos</displayName>
-				<symbol>BIF</symbol>
-			</currency>
-			<currency type="BMD">
-				<displayName>dólar bermudianu</displayName>
-				<displayName count="one">dólar bermudianu</displayName>
-				<displayName count="other">dólares bermudianos</displayName>
-				<symbol>BMD</symbol>
-			</currency>
-			<currency type="BND">
-				<displayName>dólar bruneyanu</displayName>
-				<displayName count="one">dólar bruneyanu</displayName>
-				<displayName count="other">dólares bruneyanos</displayName>
-				<symbol>BND</symbol>
-			</currency>
-			<currency type="BOB">
-				<displayName draft="unconfirmed">bolivianu</displayName>
-				<displayName count="one" draft="unconfirmed">bolivianu</displayName>
-				<displayName count="other" draft="unconfirmed">bolivianos</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>real brasilanu</displayName>
-				<displayName count="one">real brasilanu</displayName>
-				<displayName count="other">reales brasilanos</displayName>
-				<symbol>R$</symbol>
-			</currency>
-			<currency type="BSD">
-				<displayName>dólar bahamés</displayName>
-				<displayName count="one">dólar bahamés</displayName>
-				<displayName count="other">dólares bahameses</displayName>
-				<symbol>BSD</symbol>
-			</currency>
-			<currency type="BTN">
-				<displayName>ngultrum butanés</displayName>
-				<displayName count="one">ngultrum butanés</displayName>
-				<displayName count="other">ngultrums butaneses</displayName>
-				<symbol>BTN</symbol>
-			</currency>
-			<currency type="BWP">
-				<displayName>pula botsuaniana</displayName>
-				<displayName count="one">pula botsuaniana</displayName>
-				<displayName count="other">pulas botsuanianes</displayName>
-				<symbol>BWP</symbol>
-			</currency>
-			<currency type="BYR">
-				<displayName>rublu bielorrusu</displayName>
-				<displayName count="one">rublu bielorrusu</displayName>
-				<displayName count="other">rublos bielorrusos</displayName>
-				<symbol>BYR</symbol>
-			</currency>
-			<currency type="BZD">
-				<displayName>dólar belizianu</displayName>
-				<displayName count="one">dólar belizianu</displayName>
-				<displayName count="other">dólares belizianos</displayName>
-				<symbol>BZD</symbol>
-			</currency>
-			<currency type="CAD">
-				<displayName>dólar canadiense</displayName>
-				<displayName count="one">dólar canadiense</displayName>
-				<displayName count="other">dólares canadienses</displayName>
-				<symbol>CA$</symbol>
-			</currency>
-			<currency type="CDF">
-				<displayName>francu congolés</displayName>
-				<displayName count="one">francu congolés</displayName>
-				<displayName count="other">francos congoleses</displayName>
-				<symbol>CDF</symbol>
-			</currency>
-			<currency type="CHF">
-				<displayName>francu suizu</displayName>
-				<displayName count="one">francu suizu</displayName>
-				<displayName count="other">francos suizos</displayName>
-				<symbol>CHF</symbol>
-			</currency>
-			<currency type="CLP">
-				<displayName>pesu chilenu</displayName>
-				<displayName count="one">pesu chilenu</displayName>
-				<displayName count="other">pesos chilenos</displayName>
-				<symbol>CLP</symbol>
-			</currency>
-			<currency type="CNY">
-				<displayName>yuan chinu</displayName>
-				<displayName count="one">yuan chinu</displayName>
-				<displayName count="other">yuanes chinos</displayName>
-				<symbol>CN¥</symbol>
-				<symbol alt="narrow" draft="contributed">¥</symbol>
-			</currency>
-			<currency type="COP">
-				<displayName>pesu colombianu</displayName>
-				<displayName count="one">pesu colombianu</displayName>
-				<displayName count="other">pesos colombianos</displayName>
-				<symbol>COP</symbol>
-			</currency>
-			<currency type="CRC">
-				<displayName>colón costarricanu</displayName>
-				<displayName count="one">colón costarricanu</displayName>
-				<displayName count="other">colones costarricanos</displayName>
-				<symbol>CRC</symbol>
-			</currency>
-			<currency type="CUC">
-				<displayName>pesu convertible cubanu</displayName>
-				<displayName count="one">pesu convertible cubanu</displayName>
-				<displayName count="other">pesos convertibles cubanos</displayName>
-				<symbol>CUC</symbol>
-			</currency>
-			<currency type="CUP">
-				<displayName>pesu cubanu</displayName>
-				<displayName count="one">pesu cubanu</displayName>
-				<displayName count="other">pesos cubanos</displayName>
-				<symbol>CUP</symbol>
-			</currency>
-			<currency type="CVE">
-				<displayName>escudu cabuverdianu</displayName>
-				<displayName count="one">escudu cabuverdianu</displayName>
-				<displayName count="other">escudos cabuverdianos</displayName>
-				<symbol>CVE</symbol>
-			</currency>
-			<currency type="CZK">
-				<displayName>corona checa</displayName>
-				<displayName count="one">corona checa</displayName>
-				<displayName count="other">corones cheques</displayName>
-				<symbol>CZK</symbol>
-			</currency>
-			<currency type="DJF">
-				<displayName draft="unconfirmed">francu xibutianu</displayName>
-				<displayName count="one" draft="unconfirmed">francu xibutianu</displayName>
-				<displayName count="other" draft="unconfirmed">francos xibutianos</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>corona danesa</displayName>
-				<displayName count="one">corona danesa</displayName>
-				<displayName count="other">corones daneses</displayName>
-				<symbol>DKK</symbol>
-			</currency>
-			<currency type="DOP">
-				<displayName>pesu dominicanu</displayName>
-				<displayName count="one">pesu dominicanu</displayName>
-				<displayName count="other">pesos dominicanos</displayName>
-				<symbol>DOP</symbol>
-			</currency>
-			<currency type="DZD">
-				<displayName>dinar arxelín</displayName>
-				<displayName count="one">dinar arxelín</displayName>
-				<displayName count="other">dinares arxelinos</displayName>
-				<symbol>DZD</symbol>
-			</currency>
-			<currency type="EGP">
-				<displayName>llibra exipciana</displayName>
-				<displayName count="one">llibra exipciana</displayName>
-				<displayName count="other">llibres exipcianes</displayName>
-				<symbol>EGP</symbol>
-			</currency>
-			<currency type="ERN">
-				<displayName>nakfa eritréu</displayName>
-				<displayName count="one">nakfa eritréu</displayName>
-				<displayName count="other">nafkas eritreos</displayName>
-				<symbol>ERN</symbol>
-			</currency>
-			<currency type="ETB">
-				<displayName>birr etíope</displayName>
-				<displayName count="one">birr etíope</displayName>
-				<displayName count="other">birrs etíopes</displayName>
-				<symbol>ETB</symbol>
-			</currency>
-			<currency type="EUR">
-				<displayName>euro</displayName>
-				<displayName count="one">euro</displayName>
-				<displayName count="other">euros</displayName>
-				<symbol>€</symbol>
-				<symbol alt="narrow" draft="contributed">€</symbol>
-			</currency>
-			<currency type="FJD">
-				<displayName draft="unconfirmed">dólar fixanu</displayName>
-				<displayName count="one" draft="unconfirmed">dólar fixanu</displayName>
-				<displayName count="other" draft="unconfirmed">dólares fixanos</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>llibra malviniana</displayName>
-				<displayName count="one">llibra malviniana</displayName>
-				<displayName count="other">llibres malvinianes</displayName>
-				<symbol>FKP</symbol>
-			</currency>
-			<currency type="GBP">
-				<displayName>llibra esterlina</displayName>
-				<displayName count="one">llibra esterlina</displayName>
-				<displayName count="other">llibres esterlines</displayName>
-				<symbol>£</symbol>
-				<symbol alt="narrow" draft="contributed">£</symbol>
-			</currency>
-			<currency type="GEL">
-				<displayName>lari xeorxanu</displayName>
-				<displayName count="one">lari xeorxanu</displayName>
-				<displayName count="other">laris xeorxanos</displayName>
-				<symbol>GEL</symbol>
-			</currency>
-			<currency type="GHS">
-				<displayName>cedi ghanianu</displayName>
-				<displayName count="one">cedi ghanianu</displayName>
-				<displayName count="other">cedis ghanianos</displayName>
-				<symbol>GHS</symbol>
-			</currency>
-			<currency type="GIP">
-				<displayName>llibra de Xibraltar</displayName>
-				<displayName count="one">llibra de Xibraltar</displayName>
-				<displayName count="other">llibres de Xibraltar</displayName>
-				<symbol>GIP</symbol>
-				<symbol alt="narrow" draft="contributed">£</symbol>
-			</currency>
-			<currency type="GMD">
-				<displayName>dalasi gambianu</displayName>
-				<displayName count="one">dalasi gambianu</displayName>
-				<displayName count="other">dalasis gambianos</displayName>
-				<symbol>GMD</symbol>
-			</currency>
-			<currency type="GNF">
-				<displayName>francu guineanu</displayName>
-				<displayName count="one">francu guineanu</displayName>
-				<displayName count="other">francos guineanos</displayName>
-				<symbol>GNF</symbol>
-			</currency>
-			<currency type="GNS">
-				<displayName>syli guineanu</displayName>
-				<displayName count="one">syli guineanu</displayName>
-				<displayName count="other">sylis guineanos</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>quetzal de Guatemala</displayName>
-				<displayName count="one">quetzal de Guatemala</displayName>
-				<displayName count="other">quetzales de Guatemala</displayName>
-				<symbol>GTQ</symbol>
-			</currency>
-			<currency type="GYD">
-				<displayName>dólar guyanés</displayName>
-				<displayName count="one">dólar guyanés</displayName>
-				<displayName count="other">dólares guyaneses</displayName>
-				<symbol>GYD</symbol>
-			</currency>
-			<currency type="HKD">
-				<displayName>dólar hongkonés</displayName>
-				<displayName count="one">dólar hongkonés</displayName>
-				<displayName count="other">dólares ḥongkoneses</displayName>
-				<symbol>HK$</symbol>
-			</currency>
-			<currency type="HNL">
-				<displayName>lempira hondurana</displayName>
-				<displayName count="one">lempira hondurana</displayName>
-				<displayName count="other">lempires honduranes</displayName>
-				<symbol>HNL</symbol>
-			</currency>
-			<currency type="HRK">
-				<displayName draft="unconfirmed">kuna</displayName>
-				<displayName count="one" draft="unconfirmed">kuna</displayName>
-				<displayName count="other" draft="unconfirmed">kunes</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>gourde haitianu</displayName>
-				<displayName count="one">gourde haitianu</displayName>
-				<displayName count="other">gourde haitianos</displayName>
-				<symbol>HTG</symbol>
-			</currency>
-			<currency type="HUF">
-				<displayName draft="unconfirmed">forint</displayName>
-				<displayName count="one" draft="unconfirmed">forint</displayName>
-				<displayName count="other" draft="unconfirmed">forints</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>rupiah indonesia</displayName>
-				<displayName count="one">rupiah indonesia</displayName>
-				<displayName count="other">rupiahs indonesies</displayName>
-				<symbol>IDR</symbol>
-			</currency>
-			<currency type="ILS">
-				<displayName draft="unconfirmed">xequel nuevu</displayName>
-				<displayName count="one" draft="unconfirmed">xequel nuevu</displayName>
-				<displayName count="other" draft="unconfirmed">xequels nuevos</displayName>
-				<symbol draft="unconfirmed">₪</symbol>
-			</currency>
-			<currency type="INR">
-				<displayName>rupia india</displayName>
-				<displayName count="one">rupia india</displayName>
-				<displayName count="other">rupies indies</displayName>
-				<symbol>₹</symbol>
-				<symbol alt="narrow" draft="contributed">₹</symbol>
-			</currency>
-			<currency type="IQD">
-				<displayName>dinar iraquín</displayName>
-				<displayName count="one">dinar iraquín</displayName>
-				<displayName count="other">dinares iraquinos</displayName>
-				<symbol>IQD</symbol>
-			</currency>
-			<currency type="IRR">
-				<displayName>rial iranín</displayName>
-				<displayName count="one">rial iranín</displayName>
-				<displayName count="other">riales iraninos</displayName>
-				<symbol>IRR</symbol>
-			</currency>
-			<currency type="ISK">
-				<displayName>corona islandesa</displayName>
-				<displayName count="one">corona islandesa</displayName>
-				<displayName count="other">corones islandeses</displayName>
-				<symbol>ISK</symbol>
-			</currency>
-			<currency type="JMD">
-				<displayName>dólar xamaicanu</displayName>
-				<displayName count="one">dólar xamaicanu</displayName>
-				<displayName count="other">dólares xamaicanos</displayName>
-				<symbol>JMD</symbol>
-			</currency>
-			<currency type="JOD">
-				<displayName>dinar xordanu</displayName>
-				<displayName count="one">dinar xordanu</displayName>
-				<displayName count="other">dinares xordanos</displayName>
-				<symbol>JOD</symbol>
-			</currency>
-			<currency type="JPY">
-				<displayName>yen xaponés</displayName>
-				<displayName count="one">yen xaponés</displayName>
-				<displayName count="other">yenes xaponeses</displayName>
-				<symbol>¥</symbol>
-				<symbol alt="narrow" draft="contributed">¥</symbol>
-			</currency>
-			<currency type="KES">
-				<displayName>shilling kenianu</displayName>
-				<displayName count="one">shilling kenianu</displayName>
-				<displayName count="other">shillings kenianos</displayName>
-				<symbol>KES</symbol>
-			</currency>
-			<currency type="KGS">
-				<displayName>som kirguistanín</displayName>
-				<displayName count="one">som kirguistanín</displayName>
-				<displayName count="other">soms kirguistaninos</displayName>
-				<symbol>KGS</symbol>
-			</currency>
-			<currency type="KHR">
-				<displayName>riel camboyanu</displayName>
-				<displayName count="one">riel camboyanu</displayName>
-				<displayName count="other">riels camboyanos</displayName>
-				<symbol>KHR</symbol>
-			</currency>
-			<currency type="KMF">
-				<displayName>francu comoranu</displayName>
-				<displayName count="one">francu comoranu</displayName>
-				<displayName count="other">francos comoranos</displayName>
-				<symbol>KMF</symbol>
-			</currency>
-			<currency type="KPW">
-				<displayName>won norcoreanu</displayName>
-				<displayName count="one">won norcoreanu</displayName>
-				<displayName count="other">wons norcoreanos</displayName>
-				<symbol>KPW</symbol>
-			</currency>
-			<currency type="KRW">
-				<displayName>won surcoreanu</displayName>
-				<displayName count="one">won surcoreanu</displayName>
-				<displayName count="other">wons surcoreanos</displayName>
-				<symbol>₩</symbol>
-				<symbol alt="narrow" draft="contributed">₩</symbol>
-			</currency>
-			<currency type="KWD">
-				<displayName>dinar kuwaitianu</displayName>
-				<displayName count="one">dinar kuwaitianu</displayName>
-				<displayName count="other">dinares kuwaitianos</displayName>
-				<symbol>KWD</symbol>
-			</currency>
-			<currency type="KYD">
-				<displayName>dólar caimanés</displayName>
-				<displayName count="one">dólar caimanés</displayName>
-				<displayName count="other">dólares caimaneses</displayName>
-				<symbol>KYD</symbol>
-			</currency>
-			<currency type="KZT">
-				<displayName>tenge kazaquistanín</displayName>
-				<displayName count="one">tenge kazaquistanín</displayName>
-				<displayName count="other">tenges kazaquistaninos</displayName>
-				<symbol>KZT</symbol>
-			</currency>
-			<currency type="LAK">
-				<displayName>kip laosianu</displayName>
-				<displayName count="one">kip laosianu</displayName>
-				<displayName count="other">kips laosianos</displayName>
-				<symbol>LAK</symbol>
-			</currency>
-			<currency type="LBP">
-				<displayName>llibra libanesa</displayName>
-				<displayName count="one">llibra libanesa</displayName>
-				<displayName count="other">llibres libaneses</displayName>
-				<symbol>LBP</symbol>
-			</currency>
-			<currency type="LKR">
-				<displayName>rupia de Sri Lanka</displayName>
-				<displayName count="one">rupia de Sri Lanka</displayName>
-				<displayName count="other">rupies de Sri Lanka</displayName>
-				<symbol>LKR</symbol>
-			</currency>
-			<currency type="LRD">
-				<displayName>dólar liberianu</displayName>
-				<displayName count="one">dólar liberianu</displayName>
-				<displayName count="other">dólares liberianos</displayName>
-				<symbol>LRD</symbol>
-			</currency>
-			<currency type="LTL">
-				<displayName draft="unconfirmed">litas</displayName>
-				<displayName count="one" draft="unconfirmed">litas</displayName>
-				<displayName count="other" draft="unconfirmed">litas</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName draft="unconfirmed">lats</displayName>
-				<displayName count="one" draft="unconfirmed">lats</displayName>
-				<displayName count="other" draft="unconfirmed">lats</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>dinar libiu</displayName>
-				<displayName count="one">dinar libiu</displayName>
-				<displayName count="other">dinares libios</displayName>
-				<symbol>LYD</symbol>
-			</currency>
-			<currency type="MAD">
-				<displayName>dirḥam marroquín</displayName>
-				<displayName count="one">dirḥam marroquín</displayName>
-				<displayName count="other">dirḥams marroquinos</displayName>
-				<symbol>MAD</symbol>
-			</currency>
-			<currency type="MAF">
-				<displayName>francu marroquín</displayName>
-				<displayName count="one">francu marroquín</displayName>
-				<displayName count="other">francos marroquinos</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>leu moldavu</displayName>
-				<displayName count="one">leu moldavu</displayName>
-				<displayName count="other">leus moldavos</displayName>
-				<symbol>MDL</symbol>
-			</currency>
-			<currency type="MGA">
-				<displayName draft="unconfirmed">ariary malgaxe</displayName>
-				<displayName count="one" draft="unconfirmed">ariary malgaxe</displayName>
-				<displayName count="other" draft="unconfirmed">ariarys malgaxes</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName draft="unconfirmed">denar</displayName>
-				<displayName count="one" draft="unconfirmed">denar</displayName>
-				<displayName count="other" draft="unconfirmed">denares</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>kyat de Myanmar</displayName>
-				<displayName count="one">kyat de Myanmar</displayName>
-				<displayName count="other">kyats de Myanmar</displayName>
-				<symbol>MMK</symbol>
-			</currency>
-			<currency type="MNT">
-				<displayName>tugrik mongol</displayName>
-				<displayName count="one">tugrik mongol</displayName>
-				<displayName count="other">tugriks mongoles</displayName>
-				<symbol>MNT</symbol>
-			</currency>
-			<currency type="MOP">
-				<displayName>pataca de Macáu</displayName>
-				<displayName count="one">pataca de Macáu</displayName>
-				<displayName count="other">pataques de Macáu</displayName>
-				<symbol>MOP</symbol>
-			</currency>
-			<currency type="MRO">
-				<displayName>ouguiya mauritanu</displayName>
-				<displayName count="one">ouguiya mauritanu</displayName>
-				<displayName count="other">ouguiyas mauritanos</displayName>
-				<symbol>MRO</symbol>
-			</currency>
-			<currency type="MUR">
-				<displayName>rupia mauriciana</displayName>
-				<displayName count="one">rupia mauriciana</displayName>
-				<displayName count="other">rupies mauricianes</displayName>
-				<symbol>MUR</symbol>
-			</currency>
-			<currency type="MVR">
-				<displayName>rufiyaa maldiviana</displayName>
-				<displayName count="one">rufiyaa maldiviana</displayName>
-				<displayName count="other">rufiyaas maldivianas</displayName>
-				<symbol>MVR</symbol>
-			</currency>
-			<currency type="MWK">
-				<displayName draft="unconfirmed">kwacha malauianu</displayName>
-				<displayName count="one" draft="unconfirmed">kwacha malauianu</displayName>
-				<displayName count="other" draft="unconfirmed">kwachas malauianos</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>pesu mexicanu</displayName>
-				<displayName count="one">pesu mexicanu</displayName>
-				<displayName count="other">pesos mexicanos</displayName>
-				<symbol>MX$</symbol>
-			</currency>
-			<currency type="MYR">
-				<displayName>ringgit malasiu</displayName>
-				<displayName count="one">ringgit malasiu</displayName>
-				<displayName count="other">ringgits malasios</displayName>
-				<symbol>MYR</symbol>
-			</currency>
-			<currency type="MZN">
-				<displayName>metical mozambicanu</displayName>
-				<displayName count="one">metical mozambicanu</displayName>
-				<displayName count="other">meticales mozambicanos</displayName>
-				<symbol>MZN</symbol>
-			</currency>
-			<currency type="NAD">
-				<displayName>dólar namibianu</displayName>
-				<displayName count="one">dólar namibianu</displayName>
-				<displayName count="other">dólares namibianos</displayName>
-				<symbol>NAD</symbol>
-			</currency>
-			<currency type="NGN">
-				<displayName>naira nixeriana</displayName>
-				<displayName count="one">naira nixeriana</displayName>
-				<displayName count="other">nairas nixerianes</displayName>
-				<symbol>NGN</symbol>
-			</currency>
-			<currency type="NIO">
-				<displayName>córdoba nicaraguanu</displayName>
-				<displayName count="one">córdoba nicaraguanu</displayName>
-				<displayName count="other">córdobes nicaraguanos</displayName>
-				<symbol>NIO</symbol>
-			</currency>
-			<currency type="NOK">
-				<displayName>corona noruega</displayName>
-				<displayName count="one">corona noruega</displayName>
-				<displayName count="other">corones noruegues</displayName>
-				<symbol>NOK</symbol>
-			</currency>
-			<currency type="NPR">
-				<displayName>rupia nepalesa</displayName>
-				<displayName count="one">rupia nepalesa</displayName>
-				<displayName count="other">rupies nepaleses</displayName>
-				<symbol>NPR</symbol>
-			</currency>
-			<currency type="NZD">
-				<displayName>dólar neozelandés</displayName>
-				<displayName count="one">dólar neozelandés</displayName>
-				<displayName count="other">dólares neozelandeses</displayName>
-				<symbol>NZ$</symbol>
-			</currency>
-			<currency type="OMR">
-				<displayName>rial omanianu</displayName>
-				<displayName count="one">rial omanianu</displayName>
-				<displayName count="other">riales omanianos</displayName>
-				<symbol>OMR</symbol>
-			</currency>
-			<currency type="PAB">
-				<displayName>balboa panamiegu</displayName>
-				<displayName count="one">balboa panamiegu</displayName>
-				<displayName count="other">balboes panamiegos</displayName>
-				<symbol>PAB</symbol>
-			</currency>
-			<currency type="PEN">
-				<displayName>sol nuevu peruanu</displayName>
-				<displayName count="one">sol nuevu peruanu</displayName>
-				<displayName count="other">soles nuevos peruanos</displayName>
-				<symbol>PEN</symbol>
-			</currency>
-			<currency type="PGK">
-				<displayName draft="unconfirmed">kina papuana</displayName>
-				<displayName count="one" draft="unconfirmed">kina papuana</displayName>
-				<displayName count="other" draft="unconfirmed">kines papuanes</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>pesu filipín</displayName>
-				<displayName count="one">pesu filipín</displayName>
-				<displayName count="other">pesos filipinos</displayName>
-				<symbol>PHP</symbol>
-			</currency>
-			<currency type="PKR">
-				<displayName>rupia paquistanina</displayName>
-				<displayName count="one">rupia paquistanina</displayName>
-				<displayName count="other">rupies paquistanines</displayName>
-				<symbol>PKR</symbol>
-			</currency>
-			<currency type="PLN">
-				<displayName draft="unconfirmed">zloty</displayName>
-				<displayName count="one" draft="unconfirmed">zloty</displayName>
-				<displayName count="other" draft="unconfirmed">zlotys</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>guaraní paraguayu</displayName>
-				<displayName count="one">guaraní paraguayu</displayName>
-				<displayName count="other">guaranís paraguayos</displayName>
-				<symbol>PYG</symbol>
-			</currency>
-			<currency type="QAR">
-				<displayName>rial qatarín</displayName>
-				<displayName count="one">rial qatarín</displayName>
-				<displayName count="other">riales qatarinos</displayName>
-				<symbol>QAR</symbol>
-			</currency>
-			<currency type="RON">
-				<displayName>leu rumanu</displayName>
-				<displayName count="one">leu rumanu</displayName>
-				<displayName count="other">leus rumanos</displayName>
-				<symbol>RON</symbol>
-			</currency>
-			<currency type="RSD">
-				<displayName>dinar serbiu</displayName>
-				<displayName count="one">dinar serbiu</displayName>
-				<displayName count="other">dinares serbios</displayName>
-				<symbol>RSD</symbol>
-			</currency>
-			<currency type="RUB">
-				<displayName>rublu rusu</displayName>
-				<displayName count="one">rublu rusu</displayName>
-				<displayName count="other">rublos rusos</displayName>
-				<symbol>RUB</symbol>
-				<symbol alt="variant">₽</symbol>
-			</currency>
-			<currency type="RWF">
-				<displayName>francu ruandés</displayName>
-				<displayName count="one">francu ruandés</displayName>
-				<displayName count="other">francos ruandeses</displayName>
-				<symbol>RWF</symbol>
-			</currency>
-			<currency type="SAR">
-				<displayName>riyal saudita</displayName>
-				<displayName count="one">riyal saudita</displayName>
-				<displayName count="other">riyales saudites</displayName>
-				<symbol>SAR</symbol>
-			</currency>
-			<currency type="SBD">
-				<displayName>dólar salomonés</displayName>
-				<displayName count="one">dólar salomonés</displayName>
-				<displayName count="other">dólares salomoneses</displayName>
-				<symbol>SBD</symbol>
-			</currency>
-			<currency type="SCR">
-				<displayName draft="unconfirmed">rupia seixelesa</displayName>
-				<displayName count="one" draft="unconfirmed">rupia seixelesa</displayName>
-				<displayName count="other" draft="unconfirmed">rupies seixeleses</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>dinar sudanés (1992–2007)</displayName>
-				<displayName count="one">dinar sudanés (1992–2007)</displayName>
-				<displayName count="other">dinares sudaneses (1992–2007)</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>llibra sudanesa</displayName>
-				<displayName count="one">llibra sudanesa</displayName>
-				<displayName count="other">llibres sudaneses</displayName>
-				<symbol>SDG</symbol>
-			</currency>
-			<currency type="SDP">
-				<displayName>llibra sudanesa (1957–1998)</displayName>
-				<displayName count="one">llibra sudanesa (1957–1998)</displayName>
-				<displayName count="other">llibres sudaneses (1957–1998)</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>corona sueca</displayName>
-				<displayName count="one">corona sueca</displayName>
-				<displayName count="other">corones sueques</displayName>
-				<symbol>SEK</symbol>
-			</currency>
-			<currency type="SGD">
-				<displayName>dólar singapuranu</displayName>
-				<displayName count="one">dólar singapuranu</displayName>
-				<displayName count="other">dólares singapuranos</displayName>
-				<symbol>SGD</symbol>
-			</currency>
-			<currency type="SHP">
-				<displayName draft="unconfirmed">llibra de Santa Lena</displayName>
-				<displayName count="one" draft="unconfirmed">llibra de Santa Lena</displayName>
-				<displayName count="other" draft="unconfirmed">llibres de Santa Lena</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>leone sierralleonés</displayName>
-				<displayName count="one">leone sierralleonés</displayName>
-				<displayName count="other">leones sierralleoneses</displayName>
-				<symbol>SLL</symbol>
-			</currency>
-			<currency type="SOS">
-				<displayName>shilling somalín</displayName>
-				<displayName count="one">shilling somalín</displayName>
-				<displayName count="other">shillings somalinos</displayName>
-				<symbol>SOS</symbol>
-			</currency>
-			<currency type="SRD">
-				<displayName>dólar surinamés</displayName>
-				<displayName count="one">dólar surinamés</displayName>
-				<displayName count="other">dólares surinameses</displayName>
-				<symbol>SRD</symbol>
-			</currency>
-			<currency type="SSP">
-				<displayName>llibra sursudanesa</displayName>
-				<displayName count="one">llibra sursudanesa</displayName>
-				<displayName count="other">llibres sursudaneses</displayName>
-				<symbol>SSP</symbol>
-			</currency>
-			<currency type="STD">
-				<displayName>dobra de Santu Tomé y Príncipe</displayName>
-				<displayName count="one">dobra de Santu Tomé y Príncipe</displayName>
-				<displayName count="other">dobras de Santu Tomé y Príncipe</displayName>
-				<symbol>STD</symbol>
-			</currency>
-			<currency type="SYP">
-				<displayName>llibra siria</displayName>
-				<displayName count="one">llibra siria</displayName>
-				<displayName count="other">llibres siries</displayName>
-				<symbol>SYP</symbol>
-			</currency>
-			<currency type="SZL">
-				<displayName>lilangeni suazilandés</displayName>
-				<displayName count="one">lilangeni suazilandés</displayName>
-				<displayName count="other">lilangenis suazilandeses</displayName>
-				<symbol>SZL</symbol>
-			</currency>
-			<currency type="THB">
-				<displayName>baht tailandés</displayName>
-				<displayName count="one">baht tailandés</displayName>
-				<displayName count="other">bahts tailandeses</displayName>
-				<symbol>฿</symbol>
-			</currency>
-			<currency type="TJS">
-				<displayName draft="unconfirmed">somoni taxiquistanín</displayName>
-				<displayName count="one" draft="unconfirmed">somoni taxiquistanín</displayName>
-				<displayName count="other" draft="unconfirmed">somonis taxiquistaninos</displayName>
-			</currency>
-			<currency type="TMT">
-				<displayName draft="unconfirmed">manat turcomanu</displayName>
-				<displayName count="one" draft="unconfirmed">manat turcomanu</displayName>
-				<displayName count="other" draft="unconfirmed">manats turcomanos</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>dinar tunecín</displayName>
-				<displayName count="one">dinar tunecín</displayName>
-				<displayName count="other">dinares tunecinos</displayName>
-				<symbol>TND</symbol>
-			</currency>
-			<currency type="TOP">
-				<displayName>paʻanga tonganu</displayName>
-				<displayName count="one">paʻanga tonganu</displayName>
-				<displayName count="other">paʻangas tonganos</displayName>
-				<symbol>TOP</symbol>
-			</currency>
-			<currency type="TRY">
-				<displayName draft="unconfirmed">llira turca</displayName>
-				<displayName count="one" draft="unconfirmed">llira turca</displayName>
-				<displayName count="other" draft="unconfirmed">llires turques</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName draft="unconfirmed">dólar de Trinidá y Tobagu</displayName>
-				<displayName count="one" draft="unconfirmed">dólar de Trinidá y Tobagu</displayName>
-				<displayName count="other" draft="unconfirmed">dólares de Trinidá y Tobagu</displayName>
-				<symbol>TTD</symbol>
-			</currency>
-			<currency type="TWD">
-				<displayName>dólar nuevu taiwanés</displayName>
-				<displayName count="one">dólar nuevu taiwanés</displayName>
-				<displayName count="other">dólares nuevos taiwaneses</displayName>
-				<symbol>NT$</symbol>
-				<symbol alt="narrow" draft="contributed">NT$</symbol>
-			</currency>
-			<currency type="TZS">
-				<displayName>shilling tanzanianu</displayName>
-				<displayName count="one">shilling tanzanianu</displayName>
-				<displayName count="other">shillings tanzanianos</displayName>
-				<symbol>TZS</symbol>
-			</currency>
-			<currency type="UAH">
-				<displayName draft="unconfirmed">grivna</displayName>
-				<displayName count="one" draft="unconfirmed">grivna</displayName>
-				<displayName count="other" draft="unconfirmed">grivnas</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>shilling ugandés</displayName>
-				<displayName count="one">shilling ugandés</displayName>
-				<displayName count="other">shillings ugandeses</displayName>
-				<symbol>UGX</symbol>
-			</currency>
-			<currency type="USD">
-				<displayName>dólar de los Estaos Xuníos</displayName>
-				<displayName count="one">dólar de los Estaos Xuníos</displayName>
-				<displayName count="other">dólares de los Estaos Xuníos</displayName>
-				<symbol>$</symbol>
-				<symbol alt="narrow" draft="contributed">$</symbol>
-			</currency>
-			<currency type="UYU">
-				<displayName>pesu uruguayu</displayName>
-				<displayName count="one">pesu uruguayu</displayName>
-				<displayName count="other">pesos uruguayos</displayName>
-				<symbol>UYU</symbol>
-			</currency>
-			<currency type="UZS">
-				<displayName>som uzbequistanín</displayName>
-				<displayName count="one">som uzbequistanín</displayName>
-				<displayName count="other">soms uzbequistaninos</displayName>
-				<symbol>UZS</symbol>
-			</currency>
-			<currency type="VEF">
-				<displayName>bolívar venezolanu</displayName>
-				<displayName count="one">bolívar venezolanu</displayName>
-				<displayName count="other">bolívares venezolanos</displayName>
-				<symbol>VEF</symbol>
-			</currency>
-			<currency type="VND">
-				<displayName>dong vietnamín</displayName>
-				<displayName count="one">dong vietnamín</displayName>
-				<displayName count="other">dongs vietnaminos</displayName>
-				<symbol>₫</symbol>
-			</currency>
-			<currency type="VUV">
-				<displayName>vatu vanuatuanu</displayName>
-				<displayName count="one">vatu vanuatuanu</displayName>
-				<displayName count="other">vatus vanuatuanos</displayName>
-				<symbol>VUV</symbol>
-			</currency>
-			<currency type="WST">
-				<displayName>tala samoanu</displayName>
-				<displayName count="one">tala samoanu</displayName>
-				<displayName count="other">talas samoanos</displayName>
-				<symbol>WST</symbol>
-			</currency>
-			<currency type="XAF">
-				<displayName>francu CFA BEAC</displayName>
-				<displayName count="one">francu CFA BEAC</displayName>
-				<displayName count="other">francos CFA BEAC</displayName>
-				<symbol>FCFA</symbol>
-			</currency>
-			<currency type="XAG">
-				<displayName>plata</displayName>
-				<displayName count="one">onza troy de plata</displayName>
-				<displayName count="other">onces troy de plata</displayName>
-				<symbol draft="unconfirmed">XAG</symbol>
-			</currency>
-			<currency type="XAU">
-				<displayName>oru</displayName>
-				<displayName count="one">onza troy d’oru</displayName>
-				<displayName count="other">onces troy d’oru</displayName>
-				<symbol draft="unconfirmed">XAU</symbol>
-			</currency>
-			<currency type="XBA">
-				<displayName>unidá compuesta européa</displayName>
-				<displayName count="one">unidá compuesta européa</displayName>
-				<displayName count="other">unidaes compuestes europées</displayName>
-				<symbol draft="unconfirmed">XBA</symbol>
-			</currency>
-			<currency type="XBB">
-				<displayName>unida monetaria européa</displayName>
-				<displayName count="one">unida monetaria européa</displayName>
-				<displayName count="other">unidaes monetaries europées</displayName>
-				<symbol draft="unconfirmed">XBB</symbol>
-			</currency>
-			<currency type="XBC">
-				<displayName>unidá de cuenta européa (XBC)</displayName>
-				<displayName count="one">unidá de cuenta européa (XBC)</displayName>
-				<displayName count="other">unidaes de cuenta europées (XBC)</displayName>
-				<symbol draft="unconfirmed">XBC</symbol>
-			</currency>
-			<currency type="XBD">
-				<displayName>unidá de cuenta européa (XBD)</displayName>
-				<displayName count="one">unidá de cuenta européa (XBD)</displayName>
-				<displayName count="other">unidaes de cuenta europées (XBD)</displayName>
-				<symbol draft="unconfirmed">XBD</symbol>
-			</currency>
-			<currency type="XCD">
-				<displayName>dólar del Caribe Oriental</displayName>
-				<displayName count="one">dólar del Caribe Oriental</displayName>
-				<displayName count="other">dólares del Caribe Oriental</displayName>
-				<symbol>EC$</symbol>
-			</currency>
-			<currency type="XDR">
-				<displayName>drechos especiales de xiru</displayName>
-				<displayName count="one">drechos especiales de xiru</displayName>
-				<displayName count="other">drechos especiales de xiru</displayName>
-				<symbol draft="unconfirmed">XDR</symbol>
-			</currency>
-			<currency type="XFO">
-				<displayName>Francu oru francés</displayName>
-				<displayName count="one">francu oru francés</displayName>
-				<displayName count="other">francos oru franceses</displayName>
-				<symbol draft="unconfirmed">XFO</symbol>
-			</currency>
-			<currency type="XFU">
-				<displayName>Francu UIC francés</displayName>
-				<displayName count="one">francu UIC francés</displayName>
-				<displayName count="other">francos UIC franceses</displayName>
-				<symbol draft="unconfirmed">XFU</symbol>
-			</currency>
-			<currency type="XOF">
-				<displayName>francu CFA BCEAO</displayName>
-				<displayName count="one">francu CFA BCEAO</displayName>
-				<displayName count="other">francos CFA BCEAO</displayName>
-				<symbol>CFA</symbol>
-			</currency>
-			<currency type="XPD">
-				<displayName count="one">onza troy de paladiu</displayName>
-				<displayName count="other">onces troy de paladiu</displayName>
-				<symbol draft="unconfirmed">XPD</symbol>
-			</currency>
-			<currency type="XPF">
-				<displayName>francu CFP</displayName>
-				<displayName count="one">francu CFP</displayName>
-				<displayName count="other">francos CFP</displayName>
-				<symbol>CFPF</symbol>
-			</currency>
-			<currency type="XPT">
-				<displayName>platín</displayName>
-				<displayName count="one">onza troy de platín</displayName>
-				<displayName count="other">onces troy de platín</displayName>
-				<symbol draft="unconfirmed">XPT</symbol>
-			</currency>
-			<currency type="XRE">
-				<displayName>fondos RINET</displayName>
-				<displayName count="one">unidá de fondos RINET</displayName>
-				<displayName count="other">unidaes de fondos RINET</displayName>
-				<symbol draft="unconfirmed">XRE</symbol>
-			</currency>
-			<currency type="XSU">
-				<displayName>Sucre</displayName>
-				<displayName count="one">sucre</displayName>
-				<displayName count="other">sucres</displayName>
-				<symbol draft="unconfirmed">XSU</symbol>
-			</currency>
-			<currency type="XTS">
-				<displayName>códigu monetariu de prueba</displayName>
-				<displayName count="one">códigu monetariu de prueba</displayName>
-				<displayName count="other">códigos monetarios de prueba</displayName>
-				<symbol draft="unconfirmed">XTS</symbol>
-			</currency>
-			<currency type="XUA">
-				<displayName>Unidá de cuenta ADB</displayName>
-				<displayName count="one">unidá de cuenta ADB</displayName>
-				<displayName count="other">unidaes de cuenta ADB</displayName>
-				<symbol draft="unconfirmed">XUA</symbol>
-			</currency>
-			<currency type="XXX">
-				<displayName>Divisa desconocida</displayName>
-				<displayName count="one">divisa desconocida</displayName>
-				<displayName count="other">divises desconocíes</displayName>
-				<symbol draft="unconfirmed">XXX</symbol>
-			</currency>
-			<currency type="YER">
-				<displayName>rial yemenín</displayName>
-				<displayName count="one">rial yemenín</displayName>
-				<displayName count="other">riales yemeninos</displayName>
-				<symbol>YER</symbol>
-			</currency>
-			<currency type="ZAR">
-				<displayName>rand sudafricanu</displayName>
-				<displayName count="one">rand sudafricanu</displayName>
-				<displayName count="other">rands sudafricanos</displayName>
-				<symbol>ZAR</symbol>
-			</currency>
-			<currency type="ZMK">
-				<displayName draft="unconfirmed">kwacha zambianu (1968–2012)</displayName>
-				<displayName count="one" draft="unconfirmed">kwacha zambianu (1968–2012)</displayName>
-				<displayName count="other" draft="unconfirmed">kwachas zambianos (1968–2012)</displayName>
-			</currency>
-			<currency type="ZMW">
-				<displayName>kwacha zambianu</displayName>
-				<displayName count="one">kwacha zambianu</displayName>
-				<displayName count="other">kwachas zambianos</displayName>
-				<symbol>ZMW</symbol>
-			</currency>
-		</currencies>
-		<miscPatterns numberSystem="latn">
-			<pattern type="atLeast">⩾{0}</pattern>
-			<pattern type="range">{0}–{1}</pattern>
-		</miscPatterns>
-	</numbers>
-	<units>
-		<unitLength type="long">
-			<unit type="acceleration-g-force">
-				<displayName>g-fuerza</displayName>
-				<unitPattern count="one">{0} g-fuerza</unitPattern>
-				<unitPattern count="other">{0} g-fuerza</unitPattern>
-			</unit>
-			<unit type="acceleration-meter-per-second-squared">
-				<unitPattern count="one">{0} metru por segundu al cuadráu</unitPattern>
-				<unitPattern count="other">{0} metros por segundu al cuadráu</unitPattern>
-			</unit>
-			<unit type="angle-arc-minute">
-				<unitPattern count="one">{0} minutu d'arcu</unitPattern>
-				<unitPattern count="other">{0} minutos d'arcu</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<unitPattern count="one">{0} segundu d'arcu</unitPattern>
-				<unitPattern count="other">{0} segundos d'arcu</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0} grau</unitPattern>
-				<unitPattern count="other">{0} graos</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<unitPattern count="one">{0} radián</unitPattern>
-				<unitPattern count="other">{0} radianes</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>acre</displayName>
-				<unitPattern count="one">{0} acre</unitPattern>
-				<unitPattern count="other">{0} acres</unitPattern>
-			</unit>
-			<unit type="area-hectare">
-				<unitPattern count="one">{0} hectarea</unitPattern>
-				<unitPattern count="other">{0} hectarees</unitPattern>
-			</unit>
-			<unit type="area-square-centimeter">
-				<displayName>centímetros cuadraos</displayName>
-				<unitPattern count="one">{0} centímetru cuadráu</unitPattern>
-				<unitPattern count="other">{0} centímetros cuadraos</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} pie cuadráu</unitPattern>
-				<unitPattern count="other">{0} pies cuadraos</unitPattern>
-			</unit>
-			<unit type="area-square-inch">
-				<unitPattern count="one">{0} pulgada cuadrada</unitPattern>
-				<unitPattern count="other">{0} pulgaes cuadraes</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kilómetros cuadraos</displayName>
-				<unitPattern count="one">{0} kilómetru cuadráu</unitPattern>
-				<unitPattern count="other">{0} kilómetros cuadraos</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<unitPattern count="one">{0} metru cuadráu</unitPattern>
-				<unitPattern count="other">{0} metros cuadraos</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<unitPattern count="one">{0} milla cuadrada</unitPattern>
-				<unitPattern count="other">{0} milles cuadraes</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<unitPattern count="one">{0} yarda cuadrada</unitPattern>
-				<unitPattern count="other">{0} yardes cuadraes</unitPattern>
-			</unit>
-			<unit type="consumption-liter-per-kilometer">
-				<unitPattern count="one">{0} litru por kilómetru</unitPattern>
-				<unitPattern count="other">{0} litros por kilómetru</unitPattern>
-			</unit>
-			<unit type="consumption-mile-per-gallon">
-				<unitPattern count="one">{0} milla por galón</unitPattern>
-				<unitPattern count="other">{0} milles por galón</unitPattern>
-			</unit>
-			<unit type="digital-bit">
-				<displayName>bits</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bits</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bytes</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} bytes</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="other">{0} gigabits</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<unitPattern count="one">{0} gigabyte</unitPattern>
-				<unitPattern count="other">{0} gigabytes</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="other">{0} kilobits</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<unitPattern count="one">{0} kilobyte</unitPattern>
-				<unitPattern count="other">{0} kilobytes</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<unitPattern count="one">{0} megabit</unitPattern>
-				<unitPattern count="other">{0} megabits</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<unitPattern count="one">{0} megabyte</unitPattern>
-				<unitPattern count="other">{0} megabytes</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<unitPattern count="one">{0} terabit</unitPattern>
-				<unitPattern count="other">{0} terabits</unitPattern>
-			</unit>
-			<unit type="digital-terabyte">
-				<unitPattern count="one">{0} terabyte</unitPattern>
-				<unitPattern count="other">{0} terabytes</unitPattern>
-			</unit>
-			<unit type="duration-day">
-				<displayName>díes</displayName>
-				<unitPattern count="one">{0} dia</unitPattern>
-				<unitPattern count="other">{0} díes</unitPattern>
-			</unit>
-			<unit type="duration-hour">
-				<displayName>hores</displayName>
-				<unitPattern count="one">{0} hora</unitPattern>
-				<unitPattern count="other">{0} hores</unitPattern>
-			</unit>
-			<unit type="duration-microsecond">
-				<unitPattern count="one">{0} microsegundu</unitPattern>
-				<unitPattern count="other">{0} microsegundos</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<unitPattern count="one">{0} milisegundu</unitPattern>
-				<unitPattern count="other">{0} milisegundos</unitPattern>
-			</unit>
-			<unit type="duration-minute">
-				<displayName>minutos</displayName>
-				<unitPattern count="one">{0} minutu</unitPattern>
-				<unitPattern count="other">{0} minutos</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>meses</displayName>
-				<unitPattern count="one">{0} mes</unitPattern>
-				<unitPattern count="other">{0} meses</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<unitPattern count="one">{0} nanosegundu</unitPattern>
-				<unitPattern count="other">{0} nanosegundos</unitPattern>
-			</unit>
-			<unit type="duration-second">
-				<displayName>segundos</displayName>
-				<unitPattern count="one">{0} segundu</unitPattern>
-				<unitPattern count="other">{0} segundos</unitPattern>
-				<perUnitPattern>{0}/s</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>selmanes</displayName>
-				<unitPattern count="one">{0} selmana</unitPattern>
-				<unitPattern count="other">{0} selmanes</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>años</displayName>
-				<unitPattern count="one">{0} añu</unitPattern>
-				<unitPattern count="other">{0} años</unitPattern>
-			</unit>
-			<unit type="electric-ampere">
-				<unitPattern count="one">{0} amperiu</unitPattern>
-				<unitPattern count="other">{0} amperios</unitPattern>
-			</unit>
-			<unit type="electric-milliampere">
-				<unitPattern count="one">{0} milliamperiu</unitPattern>
-				<unitPattern count="other">{0} milliamperios</unitPattern>
-			</unit>
-			<unit type="electric-ohm">
-				<unitPattern count="one">{0} ohmiu</unitPattern>
-				<unitPattern count="other">{0} ohmios</unitPattern>
-			</unit>
-			<unit type="electric-volt">
-				<unitPattern count="one">{0} voltiu</unitPattern>
-				<unitPattern count="other">{0} voltios</unitPattern>
-			</unit>
-			<unit type="energy-calorie">
-				<unitPattern count="one">{0} caloría</unitPattern>
-				<unitPattern count="other">{0} caloríes</unitPattern>
-			</unit>
-			<unit type="energy-foodcalorie">
-				<unitPattern count="one">{0} Caloría</unitPattern>
-				<unitPattern count="other">{0} Caloríes</unitPattern>
-			</unit>
-			<unit type="energy-joule">
-				<unitPattern count="one">{0} xuliu</unitPattern>
-				<unitPattern count="other">{0} xulios</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<unitPattern count="one">{0} kilocaloría</unitPattern>
-				<unitPattern count="other">{0} kilocaloríes</unitPattern>
-			</unit>
-			<unit type="energy-kilojoule">
-				<unitPattern count="one">{0} kiloxuliu</unitPattern>
-				<unitPattern count="other">{0} kiloxulios</unitPattern>
-			</unit>
-			<unit type="energy-kilowatt-hour">
-				<unitPattern count="one">{0} kilovatiu hora</unitPattern>
-				<unitPattern count="other">{0} kilovatios hora</unitPattern>
-			</unit>
-			<unit type="frequency-gigahertz">
-				<displayName>gigahercios</displayName>
-				<unitPattern count="one">{0} gigaherciu</unitPattern>
-				<unitPattern count="other">{0} gigahercios</unitPattern>
-			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hercios</displayName>
-				<unitPattern count="one">{0} herciu</unitPattern>
-				<unitPattern count="other">{0} hercios</unitPattern>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<displayName>kilohercios</displayName>
-				<unitPattern count="one">{0} kiloherciu</unitPattern>
-				<unitPattern count="other">{0} kilohercios</unitPattern>
-			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megahercios</displayName>
-				<unitPattern count="one">{0} megaherciu</unitPattern>
-				<unitPattern count="other">{0} megahercios</unitPattern>
-			</unit>
-			<unit type="length-astronomical-unit">
-				<unitPattern count="one">{0} unidá astronómica</unitPattern>
-				<unitPattern count="other">{0} unidaes astronómiques</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>centímetros</displayName>
-				<unitPattern count="one">{0} centímetru</unitPattern>
-				<unitPattern count="other">{0} centímetros</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<displayName>decímetros</displayName>
-				<unitPattern count="one">{0} decímetru</unitPattern>
-				<unitPattern count="other">{0} decímetros</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0} pie</unitPattern>
-				<unitPattern count="other">{0} pies</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0} pulgada</unitPattern>
-				<unitPattern count="other">{0} pulgaes</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilómetros</displayName>
-				<unitPattern count="one">{0} kilómetru</unitPattern>
-				<unitPattern count="other">{0} kilómetros</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} añu lluz</unitPattern>
-				<unitPattern count="other">{0} años lluz</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<unitPattern count="one">{0} metru</unitPattern>
-				<unitPattern count="other">{0} metros</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<unitPattern count="one">{0} micrómetru</unitPattern>
-				<unitPattern count="other">{0} micrómetros</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} milla</unitPattern>
-				<unitPattern count="other">{0} milles</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>milímetros</displayName>
-				<unitPattern count="one">{0} milímetru</unitPattern>
-				<unitPattern count="other">{0} milímetros</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<displayName>nanómetros</displayName>
-				<unitPattern count="one">{0} nanómetru</unitPattern>
-				<unitPattern count="other">{0} nanómetros</unitPattern>
-			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>milles náutiques</displayName>
-				<unitPattern count="one">{0} milla náutica</unitPattern>
-				<unitPattern count="other">{0} milles náutiques</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<unitPattern count="one">{0} parsec</unitPattern>
-				<unitPattern count="other">{0} parsecs</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName>picómetros</displayName>
-				<unitPattern count="one">{0} picómetru</unitPattern>
-				<unitPattern count="other">{0} picómetros</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<unitPattern count="one">{0} yarda</unitPattern>
-				<unitPattern count="other">{0} yardes</unitPattern>
-			</unit>
-			<unit type="light-lux">
-				<unitPattern count="one">{0} lux</unitPattern>
-				<unitPattern count="other">{0} lux</unitPattern>
-			</unit>
-			<unit type="mass-carat">
-				<unitPattern count="one">{0} quilate</unitPattern>
-				<unitPattern count="other">{0} quilates</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName draft="unconfirmed">gram</displayName>
-				<unitPattern count="one">{0} gramu</unitPattern>
-				<unitPattern count="other">{0} gramos</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogramos</displayName>
-				<unitPattern count="one">{0} kilogramu</unitPattern>
-				<unitPattern count="other">{0} kilogramos</unitPattern>
-			</unit>
-			<unit type="mass-metric-ton">
-				<displayName>tonelaes métriques</displayName>
-				<unitPattern count="one">{0} tonelada métrica</unitPattern>
-				<unitPattern count="other">{0} tonelaes métriques</unitPattern>
-			</unit>
-			<unit type="mass-microgram">
-				<displayName>microgramos</displayName>
-				<unitPattern count="one">{0} microgramu</unitPattern>
-				<unitPattern count="other">{0} microgramos</unitPattern>
-			</unit>
-			<unit type="mass-milligram">
-				<displayName>miligramos</displayName>
-				<unitPattern count="one">{0} miligramu</unitPattern>
-				<unitPattern count="other">{0} miligramos</unitPattern>
-			</unit>
-			<unit type="mass-ounce">
-				<displayName>onces</displayName>
-				<unitPattern count="one">{0} onza</unitPattern>
-				<unitPattern count="other">{0} onces</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<unitPattern count="one">{0} onza troy</unitPattern>
-				<unitPattern count="other">{0} onces troy</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<unitPattern count="one">{0} llibra</unitPattern>
-				<unitPattern count="other">{0} llibres</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<unitPattern count="one">{0} tonelada</unitPattern>
-				<unitPattern count="other">{0} tonelaes</unitPattern>
-			</unit>
-			<unit type="power-gigawatt">
-				<displayName>gigavatios</displayName>
-				<unitPattern count="one">{0} gigavatiu</unitPattern>
-				<unitPattern count="other">{0} gigavatios</unitPattern>
-			</unit>
-			<unit type="power-horsepower">
-				<displayName>caballos de fuerza</displayName>
-				<unitPattern count="one">{0} caballu de fuerza</unitPattern>
-				<unitPattern count="other">{0} caballos de fuerza</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilovatios</displayName>
-				<unitPattern count="one">{0} kilovatiu</unitPattern>
-				<unitPattern count="other">{0} kilovatios</unitPattern>
-			</unit>
-			<unit type="power-megawatt">
-				<displayName>megavatios</displayName>
-				<unitPattern count="one">{0} megavatiu</unitPattern>
-				<unitPattern count="other">{0} megavatios</unitPattern>
-			</unit>
-			<unit type="power-milliwatt">
-				<displayName>millivatios</displayName>
-				<unitPattern count="one">{0} millivatiu</unitPattern>
-				<unitPattern count="other">{0} millivatios</unitPattern>
-			</unit>
-			<unit type="power-watt">
-				<unitPattern count="one">{0} vatiu</unitPattern>
-				<unitPattern count="other">{0} vatios</unitPattern>
-			</unit>
-			<unit type="pressure-hectopascal">
-				<displayName>hectopascales</displayName>
-				<unitPattern count="one">{0} hectopascal</unitPattern>
-				<unitPattern count="other">{0} hectopascales</unitPattern>
-			</unit>
-			<unit type="pressure-inch-hg">
-				<unitPattern count="one">{0} pulgada de mercuriu</unitPattern>
-				<unitPattern count="other">{0} pulgaes de mercuriu</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>milibares</displayName>
-				<unitPattern count="one">{0} milibar</unitPattern>
-				<unitPattern count="other">{0} milibares</unitPattern>
-			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<displayName>milímetros de mercuriu</displayName>
-				<unitPattern count="one">{0} milímetru de mercuriu</unitPattern>
-				<unitPattern count="other">{0} milímetros de mercuriu</unitPattern>
-			</unit>
-			<unit type="pressure-pound-per-square-inch">
-				<displayName>llibres por pulgada cuadrada</displayName>
-				<unitPattern count="one">{0} llibra por pulgada cuadrada</unitPattern>
-				<unitPattern count="other">{0} llibres por pulgada cuadrada</unitPattern>
-			</unit>
-			<unit type="proportion-karat">
-				<unitPattern count="one">{0} quilate</unitPattern>
-				<unitPattern count="other">{0} quilates</unitPattern>
-			</unit>
-			<unit type="speed-kilometer-per-hour">
-				<displayName draft="unconfirmed">km/h</displayName>
-				<unitPattern count="one">{0} kilómetru por hora</unitPattern>
-				<unitPattern count="other">{0} kilómetros por hora</unitPattern>
-			</unit>
-			<unit type="speed-meter-per-second">
-				<unitPattern count="one">{0} metru por segundu</unitPattern>
-				<unitPattern count="other">{0} metros por segundu</unitPattern>
-			</unit>
-			<unit type="speed-mile-per-hour">
-				<unitPattern count="one">{0} milla por hora</unitPattern>
-				<unitPattern count="other">{0} milles por hora</unitPattern>
-			</unit>
-			<unit type="temperature-celsius">
-				<unitPattern count="one">{0} grau Celsius</unitPattern>
-				<unitPattern count="other">{0} graos Celsius</unitPattern>
-			</unit>
-			<unit type="temperature-fahrenheit">
-				<unitPattern count="one">{0} grau Fahrenheit</unitPattern>
-				<unitPattern count="other">{0} graos Fahrenheit</unitPattern>
-			</unit>
-			<unit type="temperature-kelvin">
-				<displayName>graos kelvin</displayName>
-				<unitPattern count="one">{0} grau kelvin</unitPattern>
-				<unitPattern count="other">{0} graos kelvin</unitPattern>
-			</unit>
-			<unit type="volume-acre-foot">
-				<unitPattern count="one">{0} acre-pie</unitPattern>
-				<unitPattern count="other">{0} acre-pies</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>centillitros</displayName>
-				<unitPattern count="one">{0} centillitru</unitPattern>
-				<unitPattern count="other">{0} centillitros</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>centímetros cúbicos</displayName>
-				<unitPattern count="one">{0} centímetru cúbicu</unitPattern>
-				<unitPattern count="other">{0} centímetros cúbicos</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<unitPattern count="one">{0} pie cúbicu</unitPattern>
-				<unitPattern count="other">{0} pies cúbicos</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<unitPattern count="one">{0} pulgada cúbica</unitPattern>
-				<unitPattern count="other">{0} pulgaes cúbiques</unitPattern>
-			</unit>
-			<unit type="volume-cubic-kilometer">
-				<displayName>kilómetros cúbicos</displayName>
-				<unitPattern count="one">{0} kilómetru cúbicu</unitPattern>
-				<unitPattern count="other">{0} kilómetros cúbicos</unitPattern>
-			</unit>
-			<unit type="volume-cubic-meter">
-				<displayName>metros cúbicos</displayName>
-				<unitPattern count="one">{0} metru cúbicu</unitPattern>
-				<unitPattern count="other">{0} metros cúbicos</unitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<displayName>milles cúbiques</displayName>
-				<unitPattern count="one">{0} milla cúbica</unitPattern>
-				<unitPattern count="other">{0} milles cúbiques</unitPattern>
-			</unit>
-			<unit type="volume-cubic-yard">
-				<unitPattern count="one">{0} yarda cúbica</unitPattern>
-				<unitPattern count="other">{0} yardes cúbiques</unitPattern>
-			</unit>
-			<unit type="volume-cup">
-				<unitPattern count="one">{0} taza</unitPattern>
-				<unitPattern count="other">{0} taces</unitPattern>
-			</unit>
-			<unit type="volume-deciliter">
-				<displayName>decillitros</displayName>
-				<unitPattern count="one">{0} decillitru</unitPattern>
-				<unitPattern count="other">{0} decillitros</unitPattern>
-			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>onces de fluidos</displayName>
-				<unitPattern count="one">{0} onza de fluidos</unitPattern>
-				<unitPattern count="other">{0} onces de fluidos</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>galones</displayName>
-				<unitPattern count="one">{0} galón</unitPattern>
-				<unitPattern count="other">{0} galones</unitPattern>
-			</unit>
-			<unit type="volume-hectoliter">
-				<displayName>hectollitros</displayName>
-				<unitPattern count="one">{0} hectollitru</unitPattern>
-				<unitPattern count="other">{0} hectollitros</unitPattern>
-			</unit>
-			<unit type="volume-liter">
-				<displayName draft="unconfirmed">liter</displayName>
-				<unitPattern count="one">{0} l</unitPattern>
-				<unitPattern count="other">{0} l</unitPattern>
-			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megallitros</displayName>
-				<unitPattern count="one">{0} megallitru</unitPattern>
-				<unitPattern count="other">{0} megallitros</unitPattern>
-			</unit>
-			<unit type="volume-milliliter">
-				<displayName>milillitros</displayName>
-				<unitPattern count="one">{0} milillitru</unitPattern>
-				<unitPattern count="other">{0} milillitros</unitPattern>
-			</unit>
-			<unit type="volume-pint">
-				<unitPattern count="one">{0} pinta</unitPattern>
-				<unitPattern count="other">{0} pintes</unitPattern>
-			</unit>
-			<unit type="volume-quart">
-				<unitPattern count="one">{0} cuartu</unitPattern>
-				<unitPattern count="other">{0} cuartos</unitPattern>
-			</unit>
-			<unit type="volume-tablespoon">
-				<displayName>cuyares</displayName>
-				<unitPattern count="one">{0} cuyar</unitPattern>
-				<unitPattern count="other">{0} cuyares</unitPattern>
-			</unit>
-			<unit type="volume-teaspoon">
-				<displayName>cuyarines</displayName>
-				<unitPattern count="one">{0} cuyarina</unitPattern>
-				<unitPattern count="other">{0} cuyarines</unitPattern>
-			</unit>
-		</unitLength>
-		<unitLength type="short">
-			<unit type="acceleration-g-force">
-				<displayName>g-fuerza</displayName>
-				<unitPattern count="one">{0} G</unitPattern>
-				<unitPattern count="other">{0} G</unitPattern>
-			</unit>
-			<unit type="acceleration-meter-per-second-squared">
-				<displayName>m/s²</displayName>
-				<unitPattern count="one">{0} m/s²</unitPattern>
-				<unitPattern count="other">{0} m/s²</unitPattern>
-			</unit>
-			<unit type="angle-arc-minute">
-				<unitPattern count="one">{0}′</unitPattern>
-				<unitPattern count="other">{0}′</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<unitPattern count="one">{0}″</unitPattern>
-				<unitPattern count="other">{0}″</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one" draft="unconfirmed">{0}°</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>acre</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
-			</unit>
-			<unit type="area-hectare">
-				<unitPattern count="one">{0} ha</unitPattern>
-				<unitPattern count="other">{0} ha</unitPattern>
-			</unit>
-			<unit type="area-square-centimeter">
-				<displayName>cm²</displayName>
-				<unitPattern count="one">{0} cm²</unitPattern>
-				<unitPattern count="other">{0} cm²</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<displayName>ft²</displayName>
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-inch">
-				<displayName>in²</displayName>
-				<unitPattern count="one">{0} in²</unitPattern>
-				<unitPattern count="other">{0} in²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
-			</unit>
-			<unit type="consumption-liter-per-kilometer">
-				<displayName>L/km</displayName>
-				<unitPattern count="one">{0} L/km</unitPattern>
-				<unitPattern count="other">{0} L/km</unitPattern>
-			</unit>
-			<unit type="consumption-mile-per-gallon">
-				<displayName>mpg</displayName>
-				<unitPattern count="one">{0} mpg</unitPattern>
-				<unitPattern count="other">{0} mpg</unitPattern>
-			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} bytes</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
-			<unit type="digital-terabyte">
-				<displayName>TB</displayName>
-				<unitPattern count="one">{0} TB</unitPattern>
-				<unitPattern count="other">{0} TB</unitPattern>
-			</unit>
-			<unit type="duration-day">
-				<displayName>díes</displayName>
-				<unitPattern count="one">{0} d</unitPattern>
-				<unitPattern count="other">{0} d</unitPattern>
-			</unit>
-			<unit type="duration-hour">
-				<displayName>hores</displayName>
-				<unitPattern count="one">{0} h</unitPattern>
-				<unitPattern count="other">{0} h</unitPattern>
-				<perUnitPattern>{0}/h</perUnitPattern>
-			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
-			<unit type="duration-minute">
-				<displayName draft="provisional">minutos</displayName>
-				<unitPattern count="one">{0} min</unitPattern>
-				<unitPattern count="other">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>meses</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
-			</unit>
-			<unit type="duration-second">
-				<displayName draft="provisional">segundos</displayName>
-				<unitPattern count="one">{0} s</unitPattern>
-				<unitPattern count="other">{0} s</unitPattern>
-				<perUnitPattern>{0}/s</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>selmanes</displayName>
-				<unitPattern count="one">{0} sel</unitPattern>
-				<unitPattern count="other">{0} sel</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>años</displayName>
-				<unitPattern count="one">{0} a</unitPattern>
-				<unitPattern count="other">{0} a</unitPattern>
-			</unit>
-			<unit type="electric-ampere">
-				<displayName>amp</displayName>
-				<unitPattern count="one">{0} A</unitPattern>
-				<unitPattern count="other">{0} A</unitPattern>
-			</unit>
-			<unit type="electric-milliampere">
-				<displayName>mA</displayName>
-				<unitPattern count="one">{0} mA</unitPattern>
-				<unitPattern count="other">{0} mA</unitPattern>
-			</unit>
-			<unit type="electric-ohm">
-				<displayName>ohm</displayName>
-				<unitPattern count="one">{0} Ω</unitPattern>
-				<unitPattern count="other">{0} Ω</unitPattern>
-			</unit>
-			<unit type="electric-volt">
-				<displayName>volt</displayName>
-				<unitPattern count="one">{0} V</unitPattern>
-				<unitPattern count="other">{0} V</unitPattern>
-			</unit>
-			<unit type="energy-calorie">
-				<displayName>cal</displayName>
-				<unitPattern count="one">{0} cal</unitPattern>
-				<unitPattern count="other">{0} cal</unitPattern>
-			</unit>
-			<unit type="energy-foodcalorie">
-				<displayName>Cal</displayName>
-				<unitPattern count="one">{0} Cal</unitPattern>
-				<unitPattern count="other">{0} Cal</unitPattern>
-			</unit>
-			<unit type="energy-joule">
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
-			<unit type="energy-kilojoule">
-				<displayName>kJ</displayName>
-				<unitPattern count="one">{0} kJ</unitPattern>
-				<unitPattern count="other">{0} kJ</unitPattern>
-			</unit>
-			<unit type="energy-kilowatt-hour">
-				<displayName>kWh</displayName>
-				<unitPattern count="one">{0} kWh</unitPattern>
-				<unitPattern count="other">{0} kWh</unitPattern>
-			</unit>
-			<unit type="frequency-gigahertz">
-				<displayName>GHz</displayName>
-				<unitPattern count="one">{0} GHz</unitPattern>
-				<unitPattern count="other">{0} GHz</unitPattern>
-			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<displayName>kHz</displayName>
-				<unitPattern count="one">{0} kHz</unitPattern>
-				<unitPattern count="other">{0} kHz</unitPattern>
-			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
-			</unit>
-			<unit type="length-astronomical-unit">
-				<unitPattern count="one">{0} ua</unitPattern>
-				<unitPattern count="other">{0} ua</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<displayName>dm</displayName>
-				<unitPattern count="one">{0} dm</unitPattern>
-				<unitPattern count="other">{0} dm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>ft</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>in</displayName>
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>mm</displayName>
-				<unitPattern count="one">{0} mm</unitPattern>
-				<unitPattern count="other">{0} mm</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<displayName>nm</displayName>
-				<unitPattern count="one">{0} nm</unitPattern>
-				<unitPattern count="other">{0} nm</unitPattern>
-			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName>pm</displayName>
-				<unitPattern count="one">{0} pm</unitPattern>
-				<unitPattern count="other">{0} pm</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<displayName>yd</displayName>
-				<unitPattern count="one">{0} yd</unitPattern>
-				<unitPattern count="other">{0} yd</unitPattern>
-			</unit>
-			<unit type="light-lux">
-				<displayName>lx</displayName>
-				<unitPattern count="one">{0} lx</unitPattern>
-				<unitPattern count="other">{0} lx</unitPattern>
-			</unit>
-			<unit type="mass-carat">
-				<displayName>CD</displayName>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName draft="unconfirmed">gram</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
-			<unit type="mass-metric-ton">
-				<displayName>tm</displayName>
-				<unitPattern count="one">{0} tm</unitPattern>
-				<unitPattern count="other">{0} tm</unitPattern>
-			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
-			</unit>
-			<unit type="mass-milligram">
-				<displayName>mg</displayName>
-				<unitPattern count="one">{0} mg</unitPattern>
-				<unitPattern count="other">{0} mg</unitPattern>
-			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<displayName>tn</displayName>
-				<unitPattern count="one">{0} tn</unitPattern>
-				<unitPattern count="other">{0} tn</unitPattern>
-			</unit>
-			<unit type="power-gigawatt">
-				<displayName>GW</displayName>
-				<unitPattern count="one">{0} GW</unitPattern>
-				<unitPattern count="other">{0} GW</unitPattern>
-			</unit>
-			<unit type="power-horsepower">
-				<displayName>hp</displayName>
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
-			<unit type="power-megawatt">
-				<displayName>MW</displayName>
-				<unitPattern count="one">{0} MW</unitPattern>
-				<unitPattern count="other">{0} MW</unitPattern>
-			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
-			</unit>
-			<unit type="power-watt">
-				<unitPattern count="one">{0} W</unitPattern>
-				<unitPattern count="other">{0} W</unitPattern>
-			</unit>
-			<unit type="pressure-hectopascal">
-				<displayName>hPa</displayName>
-				<unitPattern count="one">{0} hPa</unitPattern>
-				<unitPattern count="other">{0} hPa</unitPattern>
-			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<displayName>mm Hg</displayName>
-				<unitPattern count="one">{0} mm Hg</unitPattern>
-				<unitPattern count="other">{0} mm Hg</unitPattern>
-			</unit>
-			<unit type="pressure-pound-per-square-inch">
-				<displayName>psi</displayName>
-				<unitPattern count="one">{0} psi</unitPattern>
-				<unitPattern count="other">{0} psi</unitPattern>
-			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
-			</unit>
-			<unit type="speed-kilometer-per-hour">
-				<displayName>km/h</displayName>
-				<unitPattern count="one">{0} km/h</unitPattern>
-				<unitPattern count="other">{0} km/h</unitPattern>
-			</unit>
-			<unit type="speed-meter-per-second">
-				<displayName>m/s</displayName>
-				<unitPattern count="one">{0} m/s</unitPattern>
-				<unitPattern count="other">{0} m/s</unitPattern>
-			</unit>
-			<unit type="speed-mile-per-hour">
-				<displayName>mi/h</displayName>
-				<unitPattern count="one">{0} mi/h</unitPattern>
-				<unitPattern count="other">{0} mi/h</unitPattern>
-			</unit>
-			<unit type="temperature-celsius">
-				<displayName>°C</displayName>
-				<unitPattern count="one">{0}°C</unitPattern>
-				<unitPattern count="other">{0}°C</unitPattern>
-			</unit>
-			<unit type="temperature-fahrenheit">
-				<displayName>°F</displayName>
-				<unitPattern count="one">{0}°F</unitPattern>
-				<unitPattern count="other">{0}°F</unitPattern>
-			</unit>
-			<unit type="temperature-kelvin">
-				<displayName>K</displayName>
-				<unitPattern count="one">{0} K</unitPattern>
-				<unitPattern count="other">{0} K</unitPattern>
-			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cL</displayName>
-				<unitPattern count="one">{0} cL</unitPattern>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-kilometer">
-				<displayName>km³</displayName>
-				<unitPattern count="one">{0} km³</unitPattern>
-				<unitPattern count="other">{0} km³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-meter">
-				<displayName>m³</displayName>
-				<unitPattern count="one">{0} m³</unitPattern>
-				<unitPattern count="other">{0} m³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<displayName>mi³</displayName>
-				<unitPattern count="one">{0} mi³</unitPattern>
-				<unitPattern count="other">{0} mi³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-yard">
-				<displayName>yd³</displayName>
-				<unitPattern count="one">{0} yd³</unitPattern>
-				<unitPattern count="other">{0} yd³</unitPattern>
-			</unit>
-			<unit type="volume-cup">
-				<unitPattern count="one">{0} tz</unitPattern>
-				<unitPattern count="other">{0} tz</unitPattern>
-			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="one">{0} dL</unitPattern>
-				<unitPattern count="other">{0} dL</unitPattern>
-			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
-			</unit>
-			<unit type="volume-hectoliter">
-				<displayName>hectollitros</displayName>
-				<unitPattern count="one">{0} hL</unitPattern>
-				<unitPattern count="other">{0} hL</unitPattern>
-			</unit>
-			<unit type="volume-liter">
-				<displayName draft="unconfirmed">liter</displayName>
-				<unitPattern count="one">{0} l</unitPattern>
-				<unitPattern count="other">{0} l</unitPattern>
-			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="one">{0} ML</unitPattern>
-				<unitPattern count="other">{0} ML</unitPattern>
-			</unit>
-			<unit type="volume-milliliter">
-				<displayName>mL</displayName>
-				<unitPattern count="one">{0} mL</unitPattern>
-				<unitPattern count="other">{0} mL</unitPattern>
-			</unit>
-			<unit type="volume-pint">
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
-			</unit>
-			<unit type="volume-quart">
-				<unitPattern count="one">{0} qt</unitPattern>
-				<unitPattern count="other">{0} qt</unitPattern>
-			</unit>
-			<unit type="volume-tablespoon">
-				<displayName>cuyar</displayName>
-				<unitPattern count="one">{0} cuyar</unitPattern>
-				<unitPattern count="other">{0} cuyar</unitPattern>
-			</unit>
-			<unit type="volume-teaspoon">
-				<displayName>cuyrn</displayName>
-				<unitPattern count="one">{0} cuyrn</unitPattern>
-				<unitPattern count="other">{0} cuyrn</unitPattern>
-			</unit>
-		</unitLength>
-		<unitLength type="narrow">
-			<unit type="area-square-meter">
-				<displayName draft="unconfirmed">m²</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} m²</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">{0}mi²</unitPattern>
-				<unitPattern count="other">{0}mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}yd²</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}yd²</unitPattern>
-			</unit>
-			<unit type="duration-day">
-				<unitPattern count="one">{0}d</unitPattern>
-				<unitPattern count="other">{0}d</unitPattern>
-			</unit>
-			<unit type="duration-hour">
-				<unitPattern count="one">{0}h</unitPattern>
-				<unitPattern count="other">{0}h</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/h</perUnitPattern>
-			</unit>
-			<unit type="duration-microsecond">
-				<displayName draft="unconfirmed">μs</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}μs</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0}ms</unitPattern>
-				<unitPattern count="other">{0}ms</unitPattern>
-			</unit>
-			<unit type="duration-minute">
-				<unitPattern count="one">{0}m</unitPattern>
-				<unitPattern count="other">{0}m</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<unitPattern count="one">{0}m</unitPattern>
-				<unitPattern count="other">{0}m</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}ns</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}ns</unitPattern>
-			</unit>
-			<unit type="duration-second">
-				<unitPattern count="one">{0}s</unitPattern>
-				<unitPattern count="other">{0}s</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/s</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<unitPattern count="one">{0}sel</unitPattern>
-				<unitPattern count="other">{0}sel</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>años</displayName>
-				<unitPattern count="one">{0}a</unitPattern>
-				<unitPattern count="other">{0}a</unitPattern>
-			</unit>
-			<unit type="electric-ampere">
-				<displayName>amp</displayName>
-			</unit>
-			<unit type="electric-milliampere">
-				<displayName>mA</displayName>
-			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName draft="unconfirmed">ua</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}ua</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}ua</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0}cm</unitPattern>
-				<unitPattern count="other">{0}cm</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<displayName>dm</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}dm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}dm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>ft</displayName>
-				<unitPattern count="one">{0}′</unitPattern>
-				<unitPattern count="other">{0}′</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>in</displayName>
-				<unitPattern count="one">{0}″</unitPattern>
-				<unitPattern count="other">{0}″</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0}km</unitPattern>
-				<unitPattern count="other">{0}km</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metru</displayName>
-				<unitPattern count="one">{0}m</unitPattern>
-				<unitPattern count="other">{0}m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}µm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mi</displayName>
-				<unitPattern count="one">{0}mi</unitPattern>
-				<unitPattern count="other">{0}mi</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>mm</displayName>
-				<unitPattern count="one">{0}mm</unitPattern>
-				<unitPattern count="other">{0}mm</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<displayName>nm</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}nm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}nm</unitPattern>
-			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}nmi</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName draft="unconfirmed">pc</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}pc</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}pc</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName>pm</displayName>
-				<unitPattern count="one">{0}pm</unitPattern>
-				<unitPattern count="other">{0}pm</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<displayName>yd</displayName>
-				<unitPattern count="one">{0}yd</unitPattern>
-				<unitPattern count="other">{0}yd</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gramu</displayName>
-				<unitPattern count="one">{0}g</unitPattern>
-				<unitPattern count="other">{0}g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0}kg</unitPattern>
-				<unitPattern count="other">{0}kg</unitPattern>
-			</unit>
-			<unit type="pressure-hectopascal">
-				<displayName>hPa</displayName>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<displayName>mm Hg</displayName>
-				<unitPattern count="one">{0}mm Hg</unitPattern>
-				<unitPattern count="other">{0}mm Hg</unitPattern>
-			</unit>
-			<unit type="pressure-pound-per-square-inch">
-				<displayName>psi</displayName>
-			</unit>
-			<unit type="speed-kilometer-per-hour">
-				<displayName>km/h</displayName>
-				<unitPattern count="one">{0} km/h</unitPattern>
-				<unitPattern count="other">{0} km/h</unitPattern>
-			</unit>
-			<unit type="temperature-celsius">
-				<displayName>°C</displayName>
-				<unitPattern count="one">{0}°C</unitPattern>
-				<unitPattern count="other">{0}°C</unitPattern>
-			</unit>
-			<unit type="temperature-fahrenheit">
-				<displayName>°F</displayName>
-			</unit>
-			<unit type="temperature-kelvin">
-				<displayName>K</displayName>
-			</unit>
-			<unit type="volume-liter">
-				<displayName>llitru</displayName>
-				<unitPattern count="one">{0}l</unitPattern>
-				<unitPattern count="other">{0}l</unitPattern>
-			</unit>
-		</unitLength>
-		<durationUnit type="hm">
-			<durationUnitPattern>h:mm</durationUnitPattern>
-		</durationUnit>
-		<durationUnit type="hms">
-			<durationUnitPattern>h:mm:ss</durationUnitPattern>
-		</durationUnit>
-		<durationUnit type="ms">
-			<durationUnitPattern>m:ss</durationUnitPattern>
-		</durationUnit>
-	</units>
-	<listPatterns>
-		<listPattern>
-			<listPatternPart type="start">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle">{0}, {1}</listPatternPart>
-			<listPatternPart type="end">{0} y {1}</listPatternPart>
-			<listPatternPart type="2">{0} y {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="unit">
-			<listPatternPart type="start">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle">{0}, {1}</listPatternPart>
-			<listPatternPart type="end">{0} y {1}</listPatternPart>
-			<listPatternPart type="2">{0} y {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="unit-narrow">
-			<listPatternPart type="start">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle">{0}, {1}</listPatternPart>
-			<listPatternPart type="end">{0} y {1}</listPatternPart>
-			<listPatternPart type="2">{0} y {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="unit-short">
-			<listPatternPart type="start">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle">{0}, {1}</listPatternPart>
-			<listPatternPart type="end">{0} y {1}</listPatternPart>
-			<listPatternPart type="2">{0} y {1}</listPatternPart>
-		</listPattern>
-	</listPatterns>
-	<posix>
-		<messages>
-			<yesstr>sí:s</yesstr>
-			<nostr>non:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/be.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/be.xml
deleted file mode 100644
index 44d0ce9b1a1..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/be.xml
+++ /dev/null
@@ -1,1347 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 11093 $"/>
-		<generation date="$Date: 2015-01-02 21:36:02 -0600 (Fri, 02 Jan 2015) $"/>
-		<language type="be"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern draft="contributed">{0} ({1})</localePattern>
-			<localeSeparator draft="contributed">{0}, {1}</localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="ab">абхазская</language>
-			<language type="ady" draft="contributed">адыгейская</language>
-			<language type="af">афрыкаанс</language>
-			<language type="akk" draft="contributed">акадзкая</language>
-			<language type="ale" draft="contributed">алеуцкая</language>
-			<language type="am">амхарская</language>
-			<language type="an" draft="contributed">арагонская</language>
-			<language type="ang">стараанглійская</language>
-			<language type="ar">арабская</language>
-			<language type="arc" draft="contributed">арамейская</language>
-			<language type="as">асамская</language>
-			<language type="ast" draft="contributed">астурыйская</language>
-			<language type="av" draft="contributed">аварская</language>
-			<language type="ay" draft="contributed">аймара</language>
-			<language type="az">азербайджанская</language>
-			<language type="ba">башкірская</language>
-			<language type="be">беларуская</language>
-			<language type="bg">балгарская</language>
-			<language type="bn">бенгальская</language>
-			<language type="br">брэтонская</language>
-			<language type="bs">баснійская</language>
-			<language type="bua" draft="contributed">бурацкая</language>
-			<language type="ca">каталонская</language>
-			<language type="ce">чачэнская</language>
-			<language type="chb" draft="unconfirmed">чыбча</language>
-			<language type="cop">копцкая</language>
-			<language type="cs">чэшская</language>
-			<language type="cv" draft="contributed">чувашская</language>
-			<language type="cy">валійская</language>
-			<language type="da">дацкая</language>
-			<language type="de">нямецкая</language>
-			<language type="de_AT">нямецкая (аўстр.)</language>
-			<language type="de_CH">нямецкая (швейц.)</language>
-			<language type="egy" draft="contributed">стараэгіпецкая</language>
-			<language type="el">грэцкая</language>
-			<language type="en">англійская</language>
-			<language type="en_AU">англійская (аўстрал.)</language>
-			<language type="en_CA">англійская (канад.)</language>
-			<language type="en_US">англійская (ЗША)</language>
-			<language type="eo">эсперанта</language>
-			<language type="es">іспанская</language>
-			<language type="es_419">іспанская (лацінаамер.)</language>
-			<language type="et">эстонская</language>
-			<language type="eu">баскская</language>
-			<language type="fa">фарсі</language>
-			<language type="fi">фінская</language>
-			<language type="fil">тагальская</language>
-			<language type="fo">фарэрская</language>
-			<language type="fr">французская</language>
-			<language type="fr_CA">французская (канад.)</language>
-			<language type="fr_CH">французская (швейц.)</language>
-			<language type="fro">старафранцузская</language>
-			<language type="fy">фрызская</language>
-			<language type="ga">ірландская</language>
-			<language type="gd">шатландская гэльская</language>
-			<language type="gl">галісійская</language>
-			<language type="gn">гуарані</language>
-			<language type="grc" draft="contributed">старагрэцкая</language>
-			<language type="gu">гуяраці</language>
-			<language type="he">іўрыт</language>
-			<language type="hi">хіндзі</language>
-			<language type="hr">харвацкая</language>
-			<language type="hu">венгерская</language>
-			<language type="hy">армянская</language>
-			<language type="ia">інтэрлінгва</language>
-			<language type="id">інданезійская</language>
-			<language type="ie">інтэрлінгве</language>
-			<language type="is">ісландская</language>
-			<language type="it">італьянская</language>
-			<language type="ja">японская</language>
-			<language type="jv">яванская</language>
-			<language type="ka">грузінская</language>
-			<language type="kk">казахская</language>
-			<language type="kn">каннада</language>
-			<language type="ko">карэйская</language>
-			<language type="ku">курдская</language>
-			<language type="la">лацінская</language>
-			<language type="ln">лінгала</language>
-			<language type="lo">лаоская</language>
-			<language type="lol" draft="unconfirmed">монга</language>
-			<language type="lt">літоўская</language>
-			<language type="luo" draft="unconfirmed">луо</language>
-			<language type="lv">латышская</language>
-			<language type="man" draft="unconfirmed">мандынга</language>
-			<language type="mas" draft="unconfirmed">масаі</language>
-			<language type="men" draft="unconfirmed">мендэ</language>
-			<language type="mg" draft="unconfirmed">мальгашская</language>
-			<language type="mk">македонская</language>
-			<language type="ml">малаяламская</language>
-			<language type="mn">мангольская</language>
-			<language type="mos" draft="unconfirmed">мосі</language>
-			<language type="mr">маратхі</language>
-			<language type="ms">малайская</language>
-			<language type="mt">мальтыйская</language>
-			<language type="nb" draft="contributed">нарвэская букмал</language>
-			<language type="ne">непальская</language>
-			<language type="nl">галандская</language>
-			<language type="nl_BE">фламандская</language>
-			<language type="nn">нарвежская (нюнорск)</language>
-			<language type="no">нарвежская</language>
-			<language type="nog" draft="unconfirmed">нагайская</language>
-			<language type="non" draft="unconfirmed">старанарвежская</language>
-			<language type="oc">правансальская</language>
-			<language type="oj" draft="unconfirmed">аджыбве</language>
-			<language type="or" draft="unconfirmed">орыя</language>
-			<language type="os" draft="unconfirmed">асецінская</language>
-			<language type="pa">панджабі</language>
-			<language type="peo" draft="unconfirmed">стараперсідская</language>
-			<language type="phn" draft="unconfirmed">фінікійская</language>
-			<language type="pl">польская</language>
-			<language type="pro" draft="unconfirmed">стараправансальская</language>
-			<language type="ps">пушту</language>
-			<language type="pt">партугальская</language>
-			<language type="pt_BR">партугальская (бразіл.)</language>
-			<language type="qu" draft="unconfirmed">кечуа</language>
-			<language type="raj" draft="unconfirmed">раджастханская</language>
-			<language type="rm" draft="unconfirmed">рэта-раманская</language>
-			<language type="ro">румынская</language>
-			<language type="ro_MD">малдаўская</language>
-			<language type="ru">руская</language>
-			<language type="sa">санскрыт</language>
-			<language type="sah">якуцкая</language>
-			<language type="sd">сіндхі</language>
-			<language type="sga" draft="unconfirmed">стараірландская</language>
-			<language type="sh">сербска-харвацкая</language>
-			<language type="si">сінгальская</language>
-			<language type="sk">славацкая</language>
-			<language type="sl">славенская</language>
-			<language type="so">самалійская</language>
-			<language type="sq">албанская</language>
-			<language type="sr">сербская</language>
-			<language type="su">суданская</language>
-			<language type="sux" draft="unconfirmed">шумерская</language>
-			<language type="sv">шведская</language>
-			<language type="sw">суахілі</language>
-			<language type="ta">тамільская</language>
-			<language type="te">тэлугу</language>
-			<language type="tg" draft="unconfirmed">таджыкская</language>
-			<language type="th">тайская</language>
-			<language type="ti">тыгрынья</language>
-			<language type="tk">туркменская</language>
-			<language type="tlh">клінгон</language>
-			<language type="tr">турэцкая</language>
-			<language type="tt">татарская</language>
-			<language type="tyv" draft="unconfirmed">тувінская</language>
-			<language type="ug">уйгурская</language>
-			<language type="uk">украінская</language>
-			<language type="und">невядомая мова</language>
-			<language type="ur">урду</language>
-			<language type="uz">узбекская</language>
-			<language type="vi">в’етнамская</language>
-			<language type="vo" draft="unconfirmed">валапюк</language>
-			<language type="xh">хоса</language>
-			<language type="yi" draft="contributed">ідыш</language>
-			<language type="zap" draft="unconfirmed">сапатэкаў</language>
-			<language type="zh">кітайская</language>
-			<language type="zh_Hans">спрошчаная кітайская</language>
-			<language type="zh_Hant">традыцыйная кітайская</language>
-			<language type="zu">зулу</language>
-		</languages>
-		<scripts>
-			<script type="Arab" draft="contributed">арабскае</script>
-			<script type="Armn" draft="contributed">армянскае</script>
-			<script type="Cyrl">кірылічны</script>
-			<script type="Geor" draft="contributed">грузінскае</script>
-			<script type="Hans" draft="contributed">спрошчанае кітайскае</script>
-			<script type="Hant" draft="contributed">традыцыйнае кітайскае</script>
-			<script type="Hebr" draft="contributed">габрэйскае</script>
-			<script type="Jpan" draft="contributed">японскае</script>
-			<script type="Latn">лацінскі</script>
-			<script type="Zxxx">чысты</script>
-			<script type="Zzzz">невядомы або недапушчальны пераклад</script>
-		</scripts>
-		<territories>
-			<territory type="001">Свет</territory>
-			<territory type="002">Афрыка</territory>
-			<territory type="003">Паўночная Амэрыка</territory>
-			<territory type="005">Паўднёвая Амэрыка</territory>
-			<territory type="009">Акіянія</territory>
-			<territory type="011">Заходняя Афрыка</territory>
-			<territory type="013">Цэнтральная Амэрыка</territory>
-			<territory type="014">Усходняя Афрыка</territory>
-			<territory type="015">Паўночная Афрыка</territory>
-			<territory type="017">Цэнтральная Афрыка</territory>
-			<territory type="018">Паўднёвая Афрыка</territory>
-			<territory type="019">Паўночная і Паўднёвая Амерыкі</territory>
-			<territory type="021">ЗША і Канада</territory>
-			<territory type="029">Карыбскія астравы</territory>
-			<territory type="030">Усходняя Азія</territory>
-			<territory type="034">Паўднёвая Азія</territory>
-			<territory type="035">Паўднёва-Усходняя Азія</territory>
-			<territory type="039">Паўднёвая Еўропа</territory>
-			<territory type="053">Аўстралія і Новая Зэландыя</territory>
-			<territory type="061">Палінезія</territory>
-			<territory type="142">Азія</territory>
-			<territory type="143">Цэнтральная Азія</territory>
-			<territory type="145">Заходняя Азія</territory>
-			<territory type="150">Еўропа</territory>
-			<territory type="151">Усходняя Еўропа</territory>
-			<territory type="154">Паўночная Еўропа</territory>
-			<territory type="155">Заходняя Еўропа</territory>
-			<territory type="AD">Андора</territory>
-			<territory type="AE">Аб’яднаныя Арабскія Эміраты</territory>
-			<territory type="AF">Афганістан</territory>
-			<territory type="AG">Антыгуа і Барбуда</territory>
-			<territory type="AI">Ангілья</territory>
-			<territory type="AL">Албанія</territory>
-			<territory type="AM">Арменія</territory>
-			<territory type="AN">Нідэрландскія Антылы</territory>
-			<territory type="AO">Ангола</territory>
-			<territory type="AQ">Антарктыка</territory>
-			<territory type="AR">Аргенціна</territory>
-			<territory type="AS">Амерыканскае Самоа</territory>
-			<territory type="AT">Аўстрыя</territory>
-			<territory type="AU">Аўстралія</territory>
-			<territory type="AW">Аруба</territory>
-			<territory type="AX">Аландскія астравы</territory>
-			<territory type="AZ">Азербайджан</territory>
-			<territory type="BA">Боснія і Герцагавіна</territory>
-			<territory type="BB">Барбадас</territory>
-			<territory type="BD">Бангладэш</territory>
-			<territory type="BE">Бельгія</territory>
-			<territory type="BF">Буркіна-Фасо</territory>
-			<territory type="BG">Балгарыя</territory>
-			<territory type="BH">Бахрэйн</territory>
-			<territory type="BI">Бурундзі</territory>
-			<territory type="BJ">Бенін</territory>
-			<territory type="BL">Сен-Бартэльмі</territory>
-			<territory type="BM">Бермудскія астравы</territory>
-			<territory type="BN">Бруней</territory>
-			<territory type="BO">Балівія</territory>
-			<territory type="BR">Бразілія</territory>
-			<territory type="BS">Багамы</territory>
-			<territory type="BT">Бутан</territory>
-			<territory type="BV">Бувэ востраў</territory>
-			<territory type="BW">Батсвана</territory>
-			<territory type="BY">Беларусь</territory>
-			<territory type="BZ">Беліз</territory>
-			<territory type="CA">Канада</territory>
-			<territory type="CC">Какосавыя астравы</territory>
-			<territory type="CD">Конга, Дэмакратычная Рэспубліка</territory>
-			<territory type="CD" alt="variant">Дэмакратычная Рэспубліка Конга</territory>
-			<territory type="CF">Цэнтральна-Афрыканская Рэспубліка</territory>
-			<territory type="CG">Конга</territory>
-			<territory type="CG" alt="variant">Рэспубліка Конга</territory>
-			<territory type="CH">Швейцарыя</territory>
-			<territory type="CI">Кот-д’Івуар</territory>
-			<territory type="CK">Астравы Кука</territory>
-			<territory type="CL">Чылі</territory>
-			<territory type="CM">Камерун</territory>
-			<territory type="CN">Кітай</territory>
-			<territory type="CO">Калумбія</territory>
-			<territory type="CR">Коста-Рыка</territory>
-			<territory type="CU">Куба</territory>
-			<territory type="CV">Каба-Вердэ</territory>
-			<territory type="CW">Востраў Кюрасаа</territory>
-			<territory type="CX">Востраў Ражства</territory>
-			<territory type="CY">Кіпр</territory>
-			<territory type="CZ">Чэхія</territory>
-			<territory type="DE">Германія</territory>
-			<territory type="DJ">Джыбуці</territory>
-			<territory type="DK">Данія</territory>
-			<territory type="DM">Дамініка</territory>
-			<territory type="DO">Дамініканская Рэспубліка</territory>
-			<territory type="DZ">Алжыр</territory>
-			<territory type="EC">Эквадор</territory>
-			<territory type="EE">Эстонія</territory>
-			<territory type="EG">Егіпет</territory>
-			<territory type="EH">Заходняя Сахара</territory>
-			<territory type="ER">Эрытрэя</territory>
-			<territory type="ES">Іспанія</territory>
-			<territory type="ET">Эфіопія</territory>
-			<territory type="EU">Еўрапейскі Звяз</territory>
-			<territory type="FI">Фінляндыя</territory>
-			<territory type="FJ">Фіджы</territory>
-			<territory type="FK">Фолклэндскія астравы</territory>
-			<territory type="FM">Мікранезія</territory>
-			<territory type="FO">Фарэрскія астравы</territory>
-			<territory type="FR">Францыя</territory>
-			<territory type="GA">Габон</territory>
-			<territory type="GB">Вялікабрытанія</territory>
-			<territory type="GD">Грэнада</territory>
-			<territory type="GE">Грузія</territory>
-			<territory type="GF">Французская Гвіяна</territory>
-			<territory type="GG">Востраў Гернсі</territory>
-			<territory type="GH">Гана</territory>
-			<territory type="GI">Гібралтар</territory>
-			<territory type="GL">Грэнландыя</territory>
-			<territory type="GM">Гамбія</territory>
-			<territory type="GN">Гвінея</territory>
-			<territory type="GP">Гвадэлупа</territory>
-			<territory type="GQ">Экватарыяльная Гвінея</territory>
-			<territory type="GR">Грэцыя</territory>
-			<territory type="GS">Паўднёвая Джорджыя і Паўднёвыя Сандвічавы астравы</territory>
-			<territory type="GT">Гватэмала</territory>
-			<territory type="GU">Гуам</territory>
-			<territory type="GW">Гвінея-Бісау</territory>
-			<territory type="GY">Гаяна</territory>
-			<territory type="HK">Гон-Конг, Кітай (САР)</territory>
-			<territory type="HK" alt="short">Ганконг</territory>
-			<territory type="HM">Востраў Херд і Астравы Макдоналд</territory>
-			<territory type="HN">Гандурас</territory>
-			<territory type="HR">Харватыя</territory>
-			<territory type="HT">Гаіці</territory>
-			<territory type="HU">Венгрыя</territory>
-			<territory type="ID">Інданезія</territory>
-			<territory type="IE">Ірландыя</territory>
-			<territory type="IL">Ізраіль</territory>
-			<territory type="IM">Востраў Мэн</territory>
-			<territory type="IN">Індыя</territory>
-			<territory type="IO">Брытанская тэрыторыя ў Індыйскім акіяне</territory>
-			<territory type="IQ">Ірак</territory>
-			<territory type="IR">Іран</territory>
-			<territory type="IS">Ісландыя</territory>
-			<territory type="IT">Італія</territory>
-			<territory type="JE">Востраў Джэрсі</territory>
-			<territory type="JM">Ямайка</territory>
-			<territory type="JO">Іарданія</territory>
-			<territory type="JP">Японія</territory>
-			<territory type="KE">Кенія</territory>
-			<territory type="KG">Кыргызстан</territory>
-			<territory type="KH">Камбоджа</territory>
-			<territory type="KI">Кірыбаці</territory>
-			<territory type="KM">Каморскія Астравы</territory>
-			<territory type="KN">Сент-Кітс і Невіс</territory>
-			<territory type="KP">Паўночная Карэя</territory>
-			<territory type="KR">Паўднёвая Карэя</territory>
-			<territory type="KW">Кувейт</territory>
-			<territory type="KY">Кайманавы астравы</territory>
-			<territory type="KZ">Казахстан</territory>
-			<territory type="LA">Лаос</territory>
-			<territory type="LB">Ліван</territory>
-			<territory type="LC">Сент-Люсія</territory>
-			<territory type="LI">Ліхтэнштэйн</territory>
-			<territory type="LK">Шры-Ланка</territory>
-			<territory type="LR">Ліберыя</territory>
-			<territory type="LS">Лесота</territory>
-			<territory type="LT">Літва</territory>
-			<territory type="LU">Люксембург</territory>
-			<territory type="LV">Латвія</territory>
-			<territory type="LY">Лівія</territory>
-			<territory type="MA">Марока</territory>
-			<territory type="MC">Манака</territory>
-			<territory type="MD">Малдова</territory>
-			<territory type="ME">Чарнагорыя</territory>
-			<territory type="MG">Мадагаскар</territory>
-			<territory type="MH">Маршалавы Астравы</territory>
-			<territory type="MK">Македонія, БЮР</territory>
-			<territory type="MK" alt="variant">Рэспубліка Македонія</territory>
-			<territory type="ML">Малі</territory>
-			<territory type="MM">М’янма</territory>
-			<territory type="MN">Манголія</territory>
-			<territory type="MO">Макао, Кітай (САР)</territory>
-			<territory type="MO" alt="short">Макаа</territory>
-			<territory type="MP">Паўночныя Марыянскія астравы</territory>
-			<territory type="MQ">Марцініка</territory>
-			<territory type="MR">Маўрытанія</territory>
-			<territory type="MS">Мантсерат</territory>
-			<territory type="MT">Мальта</territory>
-			<territory type="MU">Маўрыкій</territory>
-			<territory type="MV">Мальдывы</territory>
-			<territory type="MW">Малаві</territory>
-			<territory type="MX">Мексіка</territory>
-			<territory type="MY">Малайзія</territory>
-			<territory type="MZ">Мазамбік</territory>
-			<territory type="NA">Намібія</territory>
-			<territory type="NC">Новая Каледонія</territory>
-			<territory type="NE">Нігер</territory>
-			<territory type="NF">Востраў Норфалк</territory>
-			<territory type="NG">Нігерыя</territory>
-			<territory type="NI">Нікарагуа</territory>
-			<territory type="NL">Нідэрланды</territory>
-			<territory type="NO">Нарвегія</territory>
-			<territory type="NP">Непал</territory>
-			<territory type="NR">Науру</territory>
-			<territory type="NU">Ніуэ</territory>
-			<territory type="NZ">Новая Зеландыя</territory>
-			<territory type="OM">Аман</territory>
-			<territory type="PA">Панама</territory>
-			<territory type="PE">Перу</territory>
-			<territory type="PF">Французская Палінезія</territory>
-			<territory type="PG">Папуа — Новая Гвінея</territory>
-			<territory type="PH">Філіпіны</territory>
-			<territory type="PK">Пакістан</territory>
-			<territory type="PL">Польшча</territory>
-			<territory type="PM">Сен-П’ер і Мікелон</territory>
-			<territory type="PN">Астравы Піткэрн</territory>
-			<territory type="PR">Пуэрта-Рыка</territory>
-			<territory type="PS">Палестынскія тэрыторыі</territory>
-			<territory type="PT">Партугалія</territory>
-			<territory type="PW">Палау</territory>
-			<territory type="PY">Парагвай</territory>
-			<territory type="QA">Катар</territory>
-			<territory type="QO">Вонкавая Акіянія</territory>
-			<territory type="RE">Рэюньён</territory>
-			<territory type="RO">Румынія</territory>
-			<territory type="RS">Сербія</territory>
-			<territory type="RU">Расія</territory>
-			<territory type="RW">Руанда</territory>
-			<territory type="SA">Саудаўская Аравія</territory>
-			<territory type="SB">Саламонавы Астравы</territory>
-			<territory type="SC">Сейшэльскія Астравы</territory>
-			<territory type="SD">Судан</territory>
-			<territory type="SE">Швецыя</territory>
-			<territory type="SG">Сінгапур</territory>
-			<territory type="SH">Святой Алены, Востраў</territory>
-			<territory type="SI">Славенія</territory>
-			<territory type="SJ">Свальбард (Паўночна-Усходняя Зямля) і Ян-Маен</territory>
-			<territory type="SK">Славакія</territory>
-			<territory type="SL">Сьера-Леонэ</territory>
-			<territory type="SM">Сан-Марына</territory>
-			<territory type="SN">Сенегал</territory>
-			<territory type="SO">Самалі</territory>
-			<territory type="SR">Сурынам</territory>
-			<territory type="SS" draft="provisional">Паўднёвы Судан</territory>
-			<territory type="ST">Сан-Тамэ і Прынсіпі</territory>
-			<territory type="SV">Сальвадор</territory>
-			<territory type="SY">Сірыя</territory>
-			<territory type="SZ">Свазіленд</territory>
-			<territory type="TC">Цёркс і Кайкас</territory>
-			<territory type="TD">Чад</territory>
-			<territory type="TF">Французскія Паўднёвыя тэрыторыі</territory>
-			<territory type="TG">Тога</territory>
-			<territory type="TH">Тайланд</territory>
-			<territory type="TJ">Таджыкістан</territory>
-			<territory type="TK">Такелау</territory>
-			<territory type="TL">Усходні Тымор</territory>
-			<territory type="TM">Туркменістан</territory>
-			<territory type="TN">Туніс</territory>
-			<territory type="TO">Тонга</territory>
-			<territory type="TR">Турцыя</territory>
-			<territory type="TT">Трынідад і Табага</territory>
-			<territory type="TV">Тувалу</territory>
-			<territory type="TW">Тайвань</territory>
-			<territory type="TZ">Танзанія</territory>
-			<territory type="UA">Украіна</territory>
-			<territory type="UG">Уганда</territory>
-			<territory type="US">Злучаныя Штаты Амерыкі</territory>
-			<territory type="UY">Уругвай</territory>
-			<territory type="UZ">Узбекістан</territory>
-			<territory type="VA">Ватыкан</territory>
-			<territory type="VC">Сент-Вінсент і Грэнадзіны</territory>
-			<territory type="VE">Венесуэла</territory>
-			<territory type="VG">Брытанскія Віргінскія астравы</territory>
-			<territory type="VI">Амерыканскія Віргінскія астравы</territory>
-			<territory type="VN">В’етнам</territory>
-			<territory type="VU">Вануату</territory>
-			<territory type="WF">Уоліс і Футуна</territory>
-			<territory type="WS">Самоа</territory>
-			<territory type="YE">Емен</territory>
-			<territory type="YT">Востраў Маёта</territory>
-			<territory type="ZA">Паўднёва-Афрыканская Рэспубліка</territory>
-			<territory type="ZM">Замбія</territory>
-			<territory type="ZW">Зімбабвэ</territory>
-			<territory type="ZZ">Невядомы рэгіён</territory>
-		</territories>
-		<keys>
-			<key type="calendar">каляндар</key>
-			<key type="collation">параўнаньне тэксту</key>
-			<key type="currency">валюта</key>
-			<key type="numbers">лічбы</key>
-		</keys>
-		<types>
-			<type type="buddhist" key="calendar">будысцкі каляндар</type>
-			<type type="chinese" key="calendar">кітайскі каляндар</type>
-			<type type="ducet" key="collation">стандартнае сартаванне Unicode</type>
-			<type type="gregorian" key="calendar">грэгарыянскі каляндар</type>
-			<type type="hebrew" key="calendar">іудэйскі каляндар</type>
-			<type type="islamic" key="calendar">мусульманскі каляндар</type>
-			<type type="islamic-civil" key="calendar">мусульманскі свецкі каляндар</type>
-			<type type="japanese" key="calendar">японскі каляндар</type>
-			<type type="search" key="collation">пошук</type>
-			<type type="standard" key="collation">стандартнае сартаванне</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">метрычная</measurementSystemName>
-			<measurementSystemName type="UK">брытанская</measurementSystemName>
-			<measurementSystemName type="US">ЗША</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language" draft="contributed">Мова: {0}</codePattern>
-			<codePattern type="script" draft="contributed">Пісьмо: {0}</codePattern>
-			<codePattern type="territory" draft="contributed">Рэгіён: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[а б в г д {дж} {дз} е ё ж з і й к л м н о п р с т у ў ф х ц ч ш ы ь э ю я]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[{а\u0301} {е\u0301} {ё\u0301} {і\u0301} {о\u0301} {у\u0301} {ы\u0301} {э\u0301} {ю\u0301} {я\u0301}]</exemplarCharacters>
-		<exemplarCharacters type="index" draft="contributed">[А Б В Г Д Е Ж З І Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Ы Э Ю Я]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart draft="contributed">«</quotationStart>
-		<quotationEnd draft="contributed">»</quotationEnd>
-		<alternateQuotationStart draft="contributed">‹</alternateQuotationStart>
-		<alternateQuotationEnd draft="contributed">›</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="buddhist">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d.M.yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="Ed">E, d</dateFormatItem>
-						<dateFormatItem id="Gy">G y</dateFormatItem>
-						<dateFormatItem id="hm">h.mm a</dateFormatItem>
-						<dateFormatItem id="Hm">HH.mm</dateFormatItem>
-						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
-						<dateFormatItem id="Hms">HH.mm.ss</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d.M</dateFormatItem>
-						<dateFormatItem id="MEd">E, d.M</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
-						<dateFormatItem id="y">G y</dateFormatItem>
-						<dateFormatItem id="yM">M.y</dateFormatItem>
-						<dateFormatItem id="yMd">d.M.y</dateFormatItem>
-						<dateFormatItem id="yMEd">E, d.M.y</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y G</dateFormatItem>
-						<dateFormatItem id="yMMMd">d MMM y G</dateFormatItem>
-						<dateFormatItem id="yMMMEd">E, d MMM y G</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="generic">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d.M.y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d.M.y GGGGG</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d" draft="contributed">d</dateFormatItem>
-						<dateFormatItem id="Ed">E, d</dateFormatItem>
-						<dateFormatItem id="Gy">y G</dateFormatItem>
-						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
-						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd" draft="contributed">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="hm">h.mm a</dateFormatItem>
-						<dateFormatItem id="Hm">HH.mm</dateFormatItem>
-						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
-						<dateFormatItem id="Hms">HH.mm.ss</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d.M</dateFormatItem>
-						<dateFormatItem id="MEd">E, d.M</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
-						<dateFormatItem id="ms" draft="contributed">mm.ss</dateFormatItem>
-						<dateFormatItem id="y">y G</dateFormatItem>
-						<dateFormatItem id="yyyy">y G</dateFormatItem>
-						<dateFormatItem id="yyyyM">M.y G</dateFormatItem>
-						<dateFormatItem id="yyyyMd">d.M.y G</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">E, d.M.y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMM">LLL y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMd">d MMM y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMEd" draft="contributed">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">LLLL y G</dateFormatItem>
-						<dateFormatItem id="yyyyQQQ" draft="contributed">QQQ y G</dateFormatItem>
-						<dateFormatItem id="yyyyQQQQ" draft="contributed">QQQQ y G</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback draft="unconfirmed">{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d" draft="unconfirmed">d–d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h" draft="unconfirmed">h–h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="H">
-							<greatestDifference id="H" draft="unconfirmed">HH–HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h" draft="unconfirmed">h.mm–h.mm a</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h.mm–h.mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hm">
-							<greatestDifference id="H" draft="unconfirmed">HH.mm–HH.mm</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">HH.mm–HH.mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h" draft="unconfirmed">h.mm–h.mm a v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h.mm–h.mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H" draft="unconfirmed">HH.mm–HH.mm v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">HH.mm–HH.mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h" draft="unconfirmed">h–h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hv">
-							<greatestDifference id="H" draft="unconfirmed">HH–HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M" draft="unconfirmed">M–M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="unconfirmed">d.M – d.M</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d.M – d.M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="unconfirmed">E, d.M – E, d.M</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E, d.M – E, d.M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL–LLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d" draft="unconfirmed">d–d MMM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E, d – E, d MMM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E, d MMM – E, d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y" draft="unconfirmed">y–y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="unconfirmed">M.y – M.y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">M.y – M.y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="unconfirmed">d.M.y – d.M.y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d.M.y – d.M.y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d.M.y – d.M.y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="unconfirmed">E, d.M.y – E, d.M.y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E, d.M.y – E, d.M.y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E, d.M.y – E, d.M.y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">LLL–LLL y G</greatestDifference>
-							<greatestDifference id="y">LLL y – LLL y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d" draft="unconfirmed">d–d MMM y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d MMM y – d MMM y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E, d – E, d MMM y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E, d MMM – E, d MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E, d MMM y – E, d MMM y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">LLLL–LLLL y G</greatestDifference>
-							<greatestDifference id="y">LLLL y – LLLL y G</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">сту</month>
-							<month type="2">лют</month>
-							<month type="3">сак</month>
-							<month type="4">кра</month>
-							<month type="5">мая</month>
-							<month type="6">чэр</month>
-							<month type="7">ліп</month>
-							<month type="8">жні</month>
-							<month type="9">вер</month>
-							<month type="10">кас</month>
-							<month type="11">ліс</month>
-							<month type="12">сне</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">с</month>
-							<month type="2">л</month>
-							<month type="3">с</month>
-							<month type="4">к</month>
-							<month type="5">м</month>
-							<month type="6">ч</month>
-							<month type="7">л</month>
-							<month type="8">ж</month>
-							<month type="9">в</month>
-							<month type="10">к</month>
-							<month type="11">л</month>
-							<month type="12">с</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">студзеня</month>
-							<month type="2">лютага</month>
-							<month type="3">сакавіка</month>
-							<month type="4">красавіка</month>
-							<month type="5">мая</month>
-							<month type="6">чэрвеня</month>
-							<month type="7">ліпеня</month>
-							<month type="8">жніўня</month>
-							<month type="9">верасня</month>
-							<month type="10">кастрычніка</month>
-							<month type="11">лістапада</month>
-							<month type="12">снежня</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">сту</month>
-							<month type="2">лют</month>
-							<month type="3">сак</month>
-							<month type="4">кра</month>
-							<month type="5">май</month>
-							<month type="6">чэр</month>
-							<month type="7">ліп</month>
-							<month type="8">жні</month>
-							<month type="9">вер</month>
-							<month type="10">кас</month>
-							<month type="11">ліс</month>
-							<month type="12">сне</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">с</month>
-							<month type="2">л</month>
-							<month type="3">с</month>
-							<month type="4">к</month>
-							<month type="5">м</month>
-							<month type="6">ч</month>
-							<month type="7">л</month>
-							<month type="8">ж</month>
-							<month type="9">в</month>
-							<month type="10">к</month>
-							<month type="11">л</month>
-							<month type="12">с</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">студзень</month>
-							<month type="2">люты</month>
-							<month type="3">сакавік</month>
-							<month type="4">красавік</month>
-							<month type="5">май</month>
-							<month type="6">чэрвень</month>
-							<month type="7">ліпень</month>
-							<month type="8">жнівень</month>
-							<month type="9">верасень</month>
-							<month type="10">кастрычнік</month>
-							<month type="11">лістапад</month>
-							<month type="12">снежань</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">нд</day>
-							<day type="mon">пн</day>
-							<day type="tue">аў</day>
-							<day type="wed">ср</day>
-							<day type="thu">чц</day>
-							<day type="fri">пт</day>
-							<day type="sat">сб</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">нядзеля</day>
-							<day type="mon">панядзелак</day>
-							<day type="tue">аўторак</day>
-							<day type="wed">серада</day>
-							<day type="thu">чацвер</day>
-							<day type="fri">пятніца</day>
-							<day type="sat">субота</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">н</day>
-							<day type="mon">п</day>
-							<day type="tue">а</day>
-							<day type="wed">с</day>
-							<day type="thu">ч</day>
-							<day type="fri">п</day>
-							<day type="sat">с</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">1-шы кв.</quarter>
-							<quarter type="2">2-гі кв.</quarter>
-							<quarter type="3">3-ці кв.</quarter>
-							<quarter type="4">4-ты кв.</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1-шы квартал</quarter>
-							<quarter type="2">2-гі квартал</quarter>
-							<quarter type="3">3-ці квартал</quarter>
-							<quarter type="4">4-ты квартал</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<dayPeriods>
-					<dayPeriodContext type="format">
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">да палудня</dayPeriod>
-							<dayPeriod type="pm">пасля палудня</dayPeriod>
-						</dayPeriodWidth>
-					</dayPeriodContext>
-					<dayPeriodContext type="stand-alone">
-						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am">раніцы</dayPeriod>
-							<dayPeriod type="pm">вечара</dayPeriod>
-						</dayPeriodWidth>
-					</dayPeriodContext>
-				</dayPeriods>
-				<eras>
-					<eraAbbr>
-						<era type="0">да н.э.</era>
-						<era type="1">н.э.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d.M.y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d.M.yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH.mm.ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH.mm.ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH.mm.ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH.mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d" draft="contributed">d</dateFormatItem>
-						<dateFormatItem id="Gy">y G</dateFormatItem>
-						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
-						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd" draft="contributed">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="hm">h.mm a</dateFormatItem>
-						<dateFormatItem id="Hm">HH.mm</dateFormatItem>
-						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
-						<dateFormatItem id="Hms">HH.mm.ss</dateFormatItem>
-						<dateFormatItem id="M" draft="contributed">L</dateFormatItem>
-						<dateFormatItem id="Md">d.M</dateFormatItem>
-						<dateFormatItem id="MEd">E, d.M</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd" draft="contributed">E, d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E, d MMMM</dateFormatItem>
-						<dateFormatItem id="ms" draft="contributed">mm.ss</dateFormatItem>
-						<dateFormatItem id="y" draft="contributed">y</dateFormatItem>
-						<dateFormatItem id="yM">M.y</dateFormatItem>
-						<dateFormatItem id="yMd">d.M.y</dateFormatItem>
-						<dateFormatItem id="yMEd">E, d.M.y</dateFormatItem>
-						<dateFormatItem id="yMMM">LLL y</dateFormatItem>
-						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd" draft="contributed">E, d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">LLLL y</dateFormatItem>
-						<dateFormatItem id="yQQQ" draft="contributed">QQQ y</dateFormatItem>
-						<dateFormatItem id="yQQQQ" draft="contributed">QQQQ y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback draft="unconfirmed">{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d" draft="unconfirmed">d–d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h" draft="unconfirmed">h–h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="H">
-							<greatestDifference id="H" draft="unconfirmed">HH–HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h" draft="unconfirmed">h.mm–h.mm a</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h.mm–h.mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hm">
-							<greatestDifference id="H" draft="unconfirmed">HH.mm–HH.mm</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">HH.mm–HH.mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h" draft="unconfirmed">h.mm–h.mm a v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h.mm–h.mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H" draft="unconfirmed">HH.mm–HH.mm v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">HH.mm–HH.mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h" draft="unconfirmed">h–h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hv">
-							<greatestDifference id="H" draft="unconfirmed">HH–HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M" draft="unconfirmed">M–M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="unconfirmed">d.M – d.M</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d.M – d.M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="unconfirmed">E, d.M – E, d.M</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E, d.M – E, d.M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL–LLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d" draft="unconfirmed">d–d MMM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E, d – E, d MMM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E, d MMM – E, d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y" draft="unconfirmed">y–y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="unconfirmed">M.y – M.y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">M.y – M.y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="unconfirmed">d.M.y – d.M.y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d.M.y – d.M.y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d.M.y – d.M.y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="unconfirmed">E, d.M.y – E, d.M.y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E, d.M.y – E, d.M.y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E, d.M.y – E, d.M.y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">LLL–LLL y</greatestDifference>
-							<greatestDifference id="y">LLL y – LLL y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d" draft="unconfirmed">d–d MMM y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d MMM y – d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E, d – E, d MMM y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E, d MMM – E, d MMM y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E, d MMM y – E, d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">LLLL–LLLL y</greatestDifference>
-							<greatestDifference id="y">LLLL y – LLLL y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<fields>
-			<field type="era">
-				<displayName>эра</displayName>
-			</field>
-			<field type="year">
-				<displayName>год</displayName>
-			</field>
-			<field type="month">
-				<displayName>месяц</displayName>
-			</field>
-			<field type="week">
-				<displayName>тыдзень</displayName>
-			</field>
-			<field type="day">
-				<displayName>дзень</displayName>
-				<relative type="-2">пазаўчора</relative>
-				<relative type="-1">учора</relative>
-				<relative type="0">сёння</relative>
-				<relative type="1">заўтра</relative>
-				<relative type="2">паслязаўтра</relative>
-			</field>
-			<field type="weekday">
-				<displayName>дзень тыдня</displayName>
-			</field>
-			<field type="dayperiod">
-				<displayName draft="contributed">ДП/ПП</displayName>
-			</field>
-			<field type="hour">
-				<displayName>гадзіна</displayName>
-			</field>
-			<field type="minute">
-				<displayName>хвіліна</displayName>
-			</field>
-			<field type="second">
-				<displayName>секунда</displayName>
-			</field>
-			<field type="zone">
-				<displayName draft="contributed">Zone</displayName>
-			</field>
-		</fields>
-		<timeZoneNames>
-			<hourFormat draft="contributed">+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat draft="contributed">Час: {0}</regionFormat>
-			<fallbackFormat draft="contributed">{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Невядомы</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity draft="contributed">Рыё Бранка</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity draft="contributed">Кампа Грандэ</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity draft="contributed">Сан-Паўлу</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity draft="contributed">Ганалулу</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity draft="contributed">Анкорыдж</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity draft="contributed">Лос-Анджэлас</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity draft="contributed">Фэнікс</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity draft="contributed">Дэнвэр</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity draft="contributed">Чыкага</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity draft="contributed">Індыянапаліс</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity draft="contributed">Нью-Ёрк</exemplarCity>
-			</zone>
-			<metazone type="America_Central">
-				<long>
-					<generic draft="contributed">Паўночнаамэрыканскі цэнтральны час</generic>
-					<standard draft="contributed">Паўночнаамэрыканскі цэнтральны стандартны час</standard>
-					<daylight draft="contributed">Паўночнаамэрыканскі цэнтральны летні час</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic draft="contributed">Паўночнаамэрыканскі усходні час</generic>
-					<standard draft="contributed">Паўночнаамэрыканскі усходні стандартны час</standard>
-					<daylight draft="contributed">Паўночнаамэрыканскі усходні летні час</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic draft="contributed">Паўночнаамэрыканскі горны час</generic>
-					<standard draft="contributed">Паўночнаамэрыканскі горны стандартны час</standard>
-					<daylight draft="contributed">Паўночнаамэрыканскі горны летні час</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic draft="contributed">Ціхаакіянскі час</generic>
-					<standard draft="contributed">Ціхаакіянскі стандартны час</standard>
-					<daylight draft="contributed">Ціхаакіянскі летні час</daylight>
-				</long>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic draft="contributed">Атлянтычны час</generic>
-					<standard draft="contributed">Атлянтычны стандартны час</standard>
-					<daylight draft="contributed">Атлянтычны летні час</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<generic>Цэнтральнаэўрапейскі час</generic>
-					<standard>Цэнтральнаэўрапейскі стандартны час</standard>
-					<daylight>Цэнтральнаэўрапейскі летні час</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<generic>Усходнеэўрапейскі час</generic>
-					<standard>Усходнеэўрапейскі стандартны час</standard>
-					<daylight>Усходнеэўрапейскі летні час</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<generic>Заходнеэўрапейскі час</generic>
-					<standard>Заходнеэўрапейскі стандартны час</standard>
-					<daylight>Заходнеэўрапейскі летні час</daylight>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard draft="contributed">Грынвічскі час</standard>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols numberSystem="latn">
-			<decimal>,</decimal>
-			<group> </group>
-		</symbols>
-		<decimalFormats numberSystem="latn">
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern draft="contributed">#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats numberSystem="latn">
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern draft="contributed">#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats numberSystem="latn">
-			<percentFormatLength>
-				<percentFormat>
-					<pattern draft="contributed">#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats numberSystem="latn">
-			<currencyFormatLength>
-				<currencyFormat type="standard">
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="AUD">
-				<displayName draft="contributed">аўстралійскі даляр</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>бразільскі рэал</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>беларускі рубель</displayName>
-				<symbol>р.</symbol>
-			</currency>
-			<currency type="CNY">
-				<displayName>кітайскі юань</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName draft="contributed">эрытрэйская накфа</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>еўра</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>англійскі фунт</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>індыйская рупія</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>японская іена</displayName>
-				<symbol draft="contributed">¥</symbol>
-			</currency>
-			<currency type="NOK">
-				<displayName draft="contributed">нарвэская крона</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>рускі рубель</displayName>
-				<symbol draft="contributed">рас. руб.</symbol>
-			</currency>
-			<currency type="USD">
-				<displayName>долар ЗША</displayName>
-				<symbol draft="contributed">$</symbol>
-			</currency>
-			<currency type="XXX">
-				<displayName>невядомая або недапушчальная валюта</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unitLength type="long">
-			<unit type="duration-day">
-				<displayName draft="provisional">дня</displayName>
-				<unitPattern count="one">{0} дзень</unitPattern>
-				<unitPattern count="few">{0} дні</unitPattern>
-				<unitPattern count="many">{0} дзён</unitPattern>
-				<unitPattern count="other">{0} дня</unitPattern>
-			</unit>
-			<unit type="duration-hour">
-				<displayName draft="provisional">гадзіны</displayName>
-				<unitPattern count="one">{0} гадзіна</unitPattern>
-				<unitPattern count="few">{0} гадзіны</unitPattern>
-				<unitPattern count="many">{0} гадзін</unitPattern>
-				<unitPattern count="other">{0} гадзіны</unitPattern>
-			</unit>
-			<unit type="duration-minute">
-				<displayName draft="provisional">хвіліны</displayName>
-				<unitPattern count="one">{0} хвіліна</unitPattern>
-				<unitPattern count="few">{0} хвіліны</unitPattern>
-				<unitPattern count="many">{0} хвілін</unitPattern>
-				<unitPattern count="other">{0} хвіліны</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">месяца</displayName>
-				<unitPattern count="one">{0} месяц</unitPattern>
-				<unitPattern count="few">{0} месяца</unitPattern>
-				<unitPattern count="many">{0} месяцаў</unitPattern>
-				<unitPattern count="other">{0} месяца</unitPattern>
-			</unit>
-			<unit type="duration-second">
-				<displayName draft="provisional">сэкунды</displayName>
-				<unitPattern count="one">{0} сэкунда</unitPattern>
-				<unitPattern count="few">{0} сэкунды</unitPattern>
-				<unitPattern count="many">{0} сэкунд</unitPattern>
-				<unitPattern count="other">{0} сэкунды</unitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">тыдня</displayName>
-				<unitPattern count="one">{0} тыдзень</unitPattern>
-				<unitPattern count="few">{0} тыдні</unitPattern>
-				<unitPattern count="many">{0} тыдняў</unitPattern>
-				<unitPattern count="other">{0} тыдня</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">году</displayName>
-				<unitPattern count="one">{0} год</unitPattern>
-				<unitPattern count="few">{0} гады</unitPattern>
-				<unitPattern count="many">{0} гадоў</unitPattern>
-				<unitPattern count="other">{0} году</unitPattern>
-			</unit>
-		</unitLength>
-		<unitLength type="short">
-			<unit type="duration-day">
-				<displayName draft="provisional">дня</displayName>
-			</unit>
-			<unit type="duration-hour">
-				<displayName draft="provisional">гадзіны</displayName>
-			</unit>
-			<unit type="duration-minute">
-				<displayName draft="provisional">хвіліны</displayName>
-			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">месяца</displayName>
-			</unit>
-			<unit type="duration-second">
-				<displayName draft="provisional">сэкунды</displayName>
-			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">тыдня</displayName>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">году</displayName>
-			</unit>
-		</unitLength>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>так:т</yesstr>
-			<nostr>не:н</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/cy.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/cy.xml
deleted file mode 100644
index 647d97661b9..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/cy.xml
+++ /dev/null
@@ -1,6122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 11093 $"/>
-		<generation date="$Date: 2015-01-02 21:36:02 -0600 (Fri, 02 Jan 2015) $"/>
-		<language type="cy"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>{0}, {1}</localeSeparator>
-			<localeKeyTypePattern>{0}: {1}</localeKeyTypePattern>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">Affareg</language>
-			<language type="ab">Abchaseg</language>
-			<language type="ace">Acehneg</language>
-			<language type="ach">Acoli</language>
-			<language type="ada">Adangmeg</language>
-			<language type="ady">Circaseg Gorllewinol</language>
-			<language type="ae">Afestaneg</language>
-			<language type="aeb">Arabeg Tunisia</language>
-			<language type="af">Affricâneg</language>
-			<language type="afh">Affrihili</language>
-			<language type="agq">Aghemeg</language>
-			<language type="ain">Ainŵeg</language>
-			<language type="ak">Acaneg</language>
-			<language type="akk">Acadeg</language>
-			<language type="akz">Alabamäeg</language>
-			<language type="ale">Alewteg</language>
-			<language type="aln">Ghegeg Albania</language>
-			<language type="alt">Altäeg Deheuol</language>
-			<language type="am">Amhareg</language>
-			<language type="an">Aragoneg</language>
-			<language type="ang">Hen Saesneg</language>
-			<language type="ar">Arabeg</language>
-			<language type="ar_001">Arabeg Modern Safonol</language>
-			<language type="arc">Aramaeg</language>
-			<language type="arn">Arawcaneg</language>
-			<language type="aro">Araonaeg</language>
-			<language type="arp">Arapaho</language>
-			<language type="arq">Arabeg Algeria</language>
-			<language type="arw">Arawaceg</language>
-			<language type="ary">Arabeg Moroco</language>
-			<language type="arz">Arabeg yr Aifft</language>
-			<language type="as">Asameg</language>
-			<language type="ase">Iaith Arwyddion America</language>
-			<language type="av">Afareg</language>
-			<language type="az">Aserbaijaneg</language>
-			<language type="azb">Aserbaijaneg Deheuol</language>
-			<language type="ba">Bashcorteg</language>
-			<language type="bal">Balwtsi</language>
-			<language type="ban">Balïeg</language>
-			<language type="bas">Basâeg</language>
-			<language type="bax">Bamwmeg</language>
-			<language type="be">Belarwseg</language>
-			<language type="bej">Bejäeg</language>
-			<language type="bem">Bembeg</language>
-			<language type="bez">Bena</language>
-			<language type="bg">Bwlgareg</language>
-			<language type="bi">Bislama</language>
-			<language type="bkm">Comeg</language>
-			<language type="bm">Bambareg</language>
-			<language type="bn">Bengaleg</language>
-			<language type="bo">Tibeteg</language>
-			<language type="br">Llydaweg</language>
-			<language type="brh">Brahui</language>
-			<language type="bs">Bosnieg</language>
-			<language type="bua">Bwriateg</language>
-			<language type="bum">Bwlw</language>
-			<language type="ca">Catalaneg</language>
-			<language type="cad">Cado</language>
-			<language type="car">Caribeg</language>
-			<language type="cch">Atsameg</language>
-			<language type="ce">Tsietsieneg</language>
-			<language type="ch">Tsiamorro</language>
-			<language type="chm">Marieg</language>
-			<language type="cho">Siocto</language>
-			<language type="chr">Tsierocî</language>
-			<language type="chy">Cheyenne</language>
-			<language type="ckb">Cwrdeg Sorani</language>
-			<language type="co">Corseg</language>
-			<language type="cop">Copteg</language>
-			<language type="cr">Cri</language>
-			<language type="crh">Tyrceg y Crimea</language>
-			<language type="cs">Tsieceg</language>
-			<language type="cu">Hen Slafoneg</language>
-			<language type="cy">Cymraeg</language>
-			<language type="da">Daneg</language>
-			<language type="dak">Dacotaeg</language>
-			<language type="dar">Dargwa</language>
-			<language type="de">Almaeneg</language>
-			<language type="de_AT">Almaeneg Awstria</language>
-			<language type="de_CH">Almaeneg Safonol y Swistir</language>
-			<language type="din">Dinca</language>
-			<language type="dje">Zarmaeg</language>
-			<language type="doi">Dogri</language>
-			<language type="dsb">Sorbeg Isaf</language>
-			<language type="dum">Iseldireg Canol</language>
-			<language type="dv">Difehi</language>
-			<language type="ebu">Embw</language>
-			<language type="ee">Ewe</language>
-			<language type="egy">Hen Eiffteg</language>
-			<language type="el">Groeg</language>
-			<language type="elx">Elameg</language>
-			<language type="en">Saesneg</language>
-			<language type="en_AU">Saesneg Awstralia</language>
-			<language type="en_CA">Saesneg Canada</language>
-			<language type="en_GB">Saesneg Prydain</language>
-			<language type="en_GB" alt="short">Saesneg (DU)</language>
-			<language type="en_US">Saesneg America</language>
-			<language type="en_US" alt="short">Saesneg (UDA)</language>
-			<language type="enm">Saesneg Canol</language>
-			<language type="eo">Esperanto</language>
-			<language type="es">Sbaeneg</language>
-			<language type="es_419">Sbaeneg America Ladin</language>
-			<language type="es_ES">Sbaeneg Ewrop</language>
-			<language type="es_MX">Sbaeneg Mecsico</language>
-			<language type="et">Estoneg</language>
-			<language type="eu">Basgeg</language>
-			<language type="ewo">Ewondo</language>
-			<language type="ext">Extremadureg</language>
-			<language type="fa">Perseg</language>
-			<language type="fat">Ffanti</language>
-			<language type="ff">Ffwla</language>
-			<language type="fi">Ffinneg</language>
-			<language type="fil">Ffilipineg</language>
-			<language type="fit">Ffinneg Tornedal</language>
-			<language type="fj">Ffijïeg</language>
-			<language type="fo">Ffaröeg</language>
-			<language type="fr">Ffrangeg</language>
-			<language type="fr_CA">Ffrangeg Canada</language>
-			<language type="fr_CH">Ffrangeg y Swistir</language>
-			<language type="frc">Ffrangeg Cajwn</language>
-			<language type="frm">Ffrangeg Canol</language>
-			<language type="fro">Hen Ffrangeg</language>
-			<language type="frr">Ffriseg y Gogledd</language>
-			<language type="frs">Ffriseg y Dwyrain</language>
-			<language type="fur">Ffriwleg</language>
-			<language type="fy">Ffriseg y Gorllewin</language>
-			<language type="ga">Gwyddeleg</language>
-			<language type="gay">Gaio</language>
-			<language type="gba">Gbaia</language>
-			<language type="gbz">Dareg y Zoroastriaid</language>
-			<language type="gd">Gaeleg yr Alban</language>
-			<language type="gil">Gilberteg</language>
-			<language type="gl">Galisieg</language>
-			<language type="gmh">Uchel Almaeneg Canol</language>
-			<language type="gn">Guaraní</language>
-			<language type="goh">Hen Uchel Almaeneg</language>
-			<language type="got">Gotheg</language>
-			<language type="grc">Hen Roeg</language>
-			<language type="gsw">Almaeneg y Swistir</language>
-			<language type="gu">Gwjarati</language>
-			<language type="gv">Manaweg</language>
-			<language type="ha">Hawsa</language>
-			<language type="hai">Haida</language>
-			<language type="haw">Hawäieg</language>
-			<language type="he">Hebraeg</language>
-			<language type="hi">Hindi</language>
-			<language type="hit">Hetheg</language>
-			<language type="hmn">Hmongeg</language>
-			<language type="hr">Croateg</language>
-			<language type="hsb">Sorbeg Uchaf</language>
-			<language type="ht">Creol Haiti</language>
-			<language type="hu">Hwngareg</language>
-			<language type="hy">Armeneg</language>
-			<language type="hz">Herero</language>
-			<language type="ia" draft="contributed">Interlingua</language>
-			<language type="iba">Ibaneg</language>
-			<language type="ibb">Ibibio</language>
-			<language type="id">Indoneseg</language>
-			<language type="ie" draft="contributed">Interlingue</language>
-			<language type="ig">Igbo</language>
-			<language type="ii">Nwosw</language>
-			<language type="ik">Inwpiaceg</language>
-			<language type="ilo">Ilocaneg</language>
-			<language type="inh">Ingwsieg</language>
-			<language type="is">Islandeg</language>
-			<language type="it">Eidaleg</language>
-			<language type="iu">Inwctitwt</language>
-			<language type="ja">Japaneeg</language>
-			<language type="jmc">Matsiame</language>
-			<language type="jpr">Iddew-Bersieg</language>
-			<language type="jrb">Iddew-Arabeg</language>
-			<language type="jv">Jafanaeg</language>
-			<language type="ka">Georgeg</language>
-			<language type="kaa">Cara-Calpaceg</language>
-			<language type="kab">Cabileg</language>
-			<language type="kam">Camba</language>
-			<language type="kbd">Circaseg Dwyreiniol</language>
-			<language type="kde">Macondeg</language>
-			<language type="kea">Caboferdianeg</language>
-			<language type="kg">Congo</language>
-			<language type="kha">Càseg</language>
-			<language type="ki">ki</language>
-			<language type="kk">Casacheg</language>
-			<language type="km">Chmereg</language>
-			<language type="kn">Kannada</language>
-			<language type="ko">Coreeg</language>
-			<language type="kok">Concani</language>
-			<language type="kr">Canwri</language>
-			<language type="krl">Careleg</language>
-			<language type="ks">Cashmireg</language>
-			<language type="ksf">Baffia</language>
-			<language type="ksh">Cwleneg</language>
-			<language type="ku">Cwrdeg</language>
-			<language type="kum">Cwmiceg</language>
-			<language type="kv">Comi</language>
-			<language type="kw">Cernyweg</language>
-			<language type="ky">Cirgiseg</language>
-			<language type="la">Lladin</language>
-			<language type="lad">Iddew-Sbaeneg</language>
-			<language type="lag">Langi</language>
-			<language type="lah">Lahnda</language>
-			<language type="lam">Lamba</language>
-			<language type="lb">Lwcsembwrgeg</language>
-			<language type="lez">Lezgheg</language>
-			<language type="lg">Ganda</language>
-			<language type="li">Limbwrgeg</language>
-			<language type="lmo">Lombardeg</language>
-			<language type="ln">Lingala</language>
-			<language type="lo">Laoeg</language>
-			<language type="lol">Mongo</language>
-			<language type="loz">Lozi</language>
-			<language type="lt">Lithwaneg</language>
-			<language type="ltg">Latgalieg</language>
-			<language type="lun">Lwnda</language>
-			<language type="luo">Lŵo</language>
-			<language type="lus">Lwshaieg</language>
-			<language type="luy">Lwyia</language>
-			<language type="lv">Latfieg</language>
-			<language type="mad">Madwreg</language>
-			<language type="mag">Magahi</language>
-			<language type="mai">Maithili</language>
-			<language type="mak">Macasareg</language>
-			<language type="man">Mandingo</language>
-			<language type="mas">Masai</language>
-			<language type="mdf">Mocsia</language>
-			<language type="mdr">Mandareg</language>
-			<language type="men">Mendeg</language>
-			<language type="mer">Mêrw</language>
-			<language type="mg">Malagaseg</language>
-			<language type="mga">Gwyddeleg Canol</language>
-			<language type="mh">Marsialeg</language>
-			<language type="mi">Maori</language>
-			<language type="mic">Micmaceg</language>
-			<language type="mk">Macedoneg</language>
-			<language type="ml">Malayalam</language>
-			<language type="mn" draft="contributed">Mongoleg</language>
-			<language type="mnc">Manshw</language>
-			<language type="mni">Manipwri</language>
-			<language type="moh">Mohoceg</language>
-			<language type="mos">Mosi</language>
-			<language type="mr">Marathi</language>
-			<language type="ms">Maleieg</language>
-			<language type="mt">Malteg</language>
-			<language type="mua">Mas</language>
-			<language type="mul">mwy nag un iaith</language>
-			<language type="mwl">Mirandeg</language>
-			<language type="mwr">Marwari</language>
-			<language type="my">Byrmaneg</language>
-			<language type="na">Nawrŵeg</language>
-			<language type="nap">Naplieg</language>
-			<language type="nb">Norwyeg Bokmål</language>
-			<language type="nd">Ndebele Gogleddol</language>
-			<language type="nds">Isel Almaeneg</language>
-			<language type="ne">Nepaleg</language>
-			<language type="new">Newaeg</language>
-			<language type="ng">Ndonga</language>
-			<language type="nl">Iseldireg</language>
-			<language type="nl_BE">Fflemeg</language>
-			<language type="nn">Norwyeg Nynorsk</language>
-			<language type="no">Norwyeg</language>
-			<language type="non">Hen Norseg</language>
-			<language type="nr">Ndebele Deheuol</language>
-			<language type="nso">Sotho Gogleddol</language>
-			<language type="nus">Nŵereg</language>
-			<language type="nv">Nafaho</language>
-			<language type="nwc">Hen Newari</language>
-			<language type="ny">Nianja</language>
-			<language type="nym">Niamwezi</language>
-			<language type="nyn">Niancole</language>
-			<language type="nyo">Nioro</language>
-			<language type="nzi">Nzimeg</language>
-			<language type="oc">Ocsitaneg</language>
-			<language type="oj">Ojibwa</language>
-			<language type="om">Oromo</language>
-			<language type="or">Oriya</language>
-			<language type="os">Oseteg</language>
-			<language type="osa">Osageg</language>
-			<language type="ota">Tyrceg Otoman</language>
-			<language type="pa">Pwnjabeg</language>
-			<language type="pag">Pangasineg</language>
-			<language type="pal">Pahlafi</language>
-			<language type="pam">Pampanga</language>
-			<language type="pcd">Picardeg</language>
-			<language type="pdc">Almaeneg Pensylfania</language>
-			<language type="peo">Hen Bersieg</language>
-			<language type="pfl">Almaeneg Palatin</language>
-			<language type="phn">Phoeniceg</language>
-			<language type="pi">Pali</language>
-			<language type="pl">Pwyleg</language>
-			<language type="pms">Piedmonteg</language>
-			<language type="pon">Pohnpeianeg</language>
-			<language type="prg">Prwseg</language>
-			<language type="pro">Hen Brofensaleg</language>
-			<language type="ps">Pashto</language>
-			<language type="pt">Portiwgeeg</language>
-			<language type="pt_BR">Portiwgeeg Brasil</language>
-			<language type="pt_PT">Portiwgeeg Ewrop</language>
-			<language type="qu">Quechua</language>
-			<language type="quc">K’iche’</language>
-			<language type="raj">Rajasthaneg</language>
-			<language type="rap">Rapanŵi</language>
-			<language type="rar">Raratongeg</language>
-			<language type="rm">Romaunsch</language>
-			<language type="rn">Rwndi</language>
-			<language type="ro">Rwmaneg</language>
-			<language type="ro_MD">Moldofeg</language>
-			<language type="rof">Rombo</language>
-			<language type="rom">Romani</language>
-			<language type="root">y Gwraidd</language>
-			<language type="rtm">Rotumaneg</language>
-			<language type="ru">Rwseg</language>
-			<language type="rup">Aromaneg</language>
-			<language type="rw">Ciniarŵandeg</language>
-			<language type="rwk">Rwa</language>
-			<language type="sa">Sansgrit</language>
-			<language type="sad">Sandäweg</language>
-			<language type="sah" draft="unconfirmed">Iacwteg</language>
-			<language type="sam">Aramaeg Samaria</language>
-			<language type="saq">Sambŵrw</language>
-			<language type="sas">Sasaceg</language>
-			<language type="sat">Santali</language>
-			<language type="sba">Ngambeieg</language>
-			<language type="sbp">Sangw</language>
-			<language type="sc">Sardeg</language>
-			<language type="scn">Sisileg</language>
-			<language type="sco">Sgoteg</language>
-			<language type="sd">Sindhi</language>
-			<language type="sdc">Sasareseg Sardinia</language>
-			<language type="se">Sami Gogleddol</language>
-			<language type="see">Seneca</language>
-			<language type="sel">Selcypeg</language>
-			<language type="sg">Sango</language>
-			<language type="sga">Hen Wyddeleg</language>
-			<language type="sh">Serbo-Croateg</language>
-			<language type="shu">Arabeg Chad</language>
-			<language type="si">Sinhaleg</language>
-			<language type="sid">Sidamo</language>
-			<language type="sk">Slofaceg</language>
-			<language type="sl">Slofeneg</language>
-			<language type="sli">Is-silesieg</language>
-			<language type="sm">Samöeg</language>
-			<language type="sma">Sami Deheuol</language>
-			<language type="smj">Sami Lwle</language>
-			<language type="smn">Sami Inari</language>
-			<language type="sms">Sami Scolt</language>
-			<language type="snk">Soninceg</language>
-			<language type="so">Somaleg</language>
-			<language type="sog">Sogdeg</language>
-			<language type="sq">Albaneg</language>
-			<language type="sr">Serbeg</language>
-			<language type="st" draft="contributed">Sesotheg</language>
-			<language type="su">Swndaneg</language>
-			<language type="suk">Swcwma</language>
-			<language type="sus">Swsŵeg</language>
-			<language type="sux">Swmereg</language>
-			<language type="sv">Swedeg</language>
-			<language type="sw">Swahili</language>
-			<language type="swb">Comoreg</language>
-			<language type="swc">Swahili’r Congo</language>
-			<language type="syc">Hen Syrieg</language>
-			<language type="syr">Syrieg</language>
-			<language type="szl">Silesieg</language>
-			<language type="ta">Tamileg</language>
-			<language type="tcy">Tulu</language>
-			<language type="te">Telugu</language>
-			<language type="tem">Timneg</language>
-			<language type="tet">Tetumeg</language>
-			<language type="tg">Tajiceg</language>
-			<language type="th">Thai</language>
-			<language type="ti">Tigrinya</language>
-			<language type="tk">Twrcmeneg</language>
-			<language type="tl">Tagalog</language>
-			<language type="tlh">Klingon</language>
-			<language type="tmh">Tamasheceg</language>
-			<language type="tn">Tswana</language>
-			<language type="to">Tongeg</language>
-			<language type="tr">Tyrceg</language>
-			<language type="ts">Tsongaeg</language>
-			<language type="tt">Tatareg</language>
-			<language type="tvl">Twfalweg</language>
-			<language type="tw" draft="unconfirmed">Twi</language>
-			<language type="ty" draft="unconfirmed">Tahitïeg</language>
-			<language type="udm">Fotiaceg</language>
-			<language type="ug">Uighur</language>
-			<language type="uga">Wgariteg</language>
-			<language type="uk">Wcreineg</language>
-			<language type="umb">Umbundu</language>
-			<language type="und">Iaith Anhysbys</language>
-			<language type="ur">Wrdw</language>
-			<language type="uz">Wsbeceg</language>
-			<language type="vai">Faieg</language>
-			<language type="ve">Fendeg</language>
-			<language type="vec">Feniseg</language>
-			<language type="vi">Fietnameg</language>
-			<language type="vls">Fflemeg Gorllewinol</language>
-			<language type="wa">Walwneg</language>
-			<language type="wal">Walamo</language>
-			<language type="wo">Woloff</language>
-			<language type="xal">Calmyceg</language>
-			<language type="xh">Xhosa</language>
-			<language type="ybb">Iembaeg</language>
-			<language type="yi">Iddew-Almaeneg</language>
-			<language type="yo">Iorwba</language>
-			<language type="yue">Cantoneeg</language>
-			<language type="zap">Zapoteceg</language>
-			<language type="zbl">Blisssymbols</language>
-			<language type="zea">Zêlandeg</language>
-			<language type="zgh">Tamazight Safonol Moroco</language>
-			<language type="zh">Tsieineeg</language>
-			<language type="zh_Hans">Tsieineeg Symledig</language>
-			<language type="zh_Hant">Tsieineeg Traddodiadol</language>
-			<language type="zu">Swlw</language>
-			<language type="zun">Zuni</language>
-			<language type="zxx">Dim cynnwys ieithyddol</language>
-			<language type="zza">Zazäeg</language>
-		</languages>
-		<scripts>
-			<script type="Arab">Arabaidd</script>
-			<script type="Armn">Armenaidd</script>
-			<script type="Beng">Bengalaidd</script>
-			<script type="Bopo">Bopomofo</script>
-			<script type="Brai">Braille</script>
-			<script type="Cyrl">Cyrilig</script>
-			<script type="Deva">Devanāgarī</script>
-			<script type="Ethi">Ethiopig</script>
-			<script type="Geor">Georgaidd</script>
-			<script type="Grek">Groegaidd</script>
-			<script type="Gujr">Gujarataidd</script>
-			<script type="Guru">Gwrmwci</script>
-			<script type="Hang">Hangul</script>
-			<script type="Hani">Han</script>
-			<script type="Hans">Symledig</script>
-			<script type="Hans" alt="stand-alone">Han symledig</script>
-			<script type="Hant">Traddodiadol</script>
-			<script type="Hant" alt="stand-alone">Han traddodiadol</script>
-			<script type="Hebr">Hebreig</script>
-			<script type="Hira">Hiragana</script>
-			<script type="Jpan">Japaneaidd</script>
-			<script type="Kana">Catacana</script>
-			<script type="Khmr">Chmeraidd</script>
-			<script type="Knda">Canaraidd</script>
-			<script type="Kore">Coreaidd</script>
-			<script type="Laoo">Laoaidd</script>
-			<script type="Latn">Lladin</script>
-			<script type="Mlym">Malayalamaidd</script>
-			<script type="Mong">Mongolaidd</script>
-			<script type="Mymr">Myanmaraidd</script>
-			<script type="Ogam">Ogam</script>
-			<script type="Orya">Orïaidd</script>
-			<script type="Sinh">Sinhanaidd</script>
-			<script type="Taml">Tamilaidd</script>
-			<script type="Telu">Telugu</script>
-			<script type="Thaa">Thaa</script>
-			<script type="Thai">Thai</script>
-			<script type="Tibt">Tibetaidd</script>
-			<script type="Zsym">Symbolau</script>
-			<script type="Zxxx">Anysgrifenedig</script>
-			<script type="Zyyy">Cyffredin</script>
-			<script type="Zzzz">Sgript anhysbys</script>
-		</scripts>
-		<territories>
-			<territory type="001">Y Byd</territory>
-			<territory type="002">Affrica</territory>
-			<territory type="003">Gogledd America</territory>
-			<territory type="005">De America</territory>
-			<territory type="009">Oceania</territory>
-			<territory type="011">Gorllewin Affrica</territory>
-			<territory type="013">Canolbarth America</territory>
-			<territory type="014">Dwyrain Affrica</territory>
-			<territory type="015">Gogledd Affrica</territory>
-			<territory type="017">Canol Affrica</territory>
-			<territory type="018">Deheudir Affrica</territory>
-			<territory type="019">Yr Amerig</territory>
-			<territory type="021">America i’r Gogledd o Mecsico</territory>
-			<territory type="029">Y Caribî</territory>
-			<territory type="030">Dwyrain Asia</territory>
-			<territory type="034">De Asia</territory>
-			<territory type="035">De-Ddwyrain Asia</territory>
-			<territory type="039">De Ewrop</territory>
-			<territory type="053">Awstralasia</territory>
-			<territory type="054">Melanesia</territory>
-			<territory type="057">Rhanbarth Micronesia</territory>
-			<territory type="061">Polynesia</territory>
-			<territory type="142">Asia</territory>
-			<territory type="143">Canol Asia</territory>
-			<territory type="145">Gorllewin Asia</territory>
-			<territory type="150">Ewrop</territory>
-			<territory type="151">Dwyrain Ewrop</territory>
-			<territory type="154">Gogledd Ewrop</territory>
-			<territory type="155">Gorllewin Ewrop</territory>
-			<territory type="419">America Ladin</territory>
-			<territory type="AC">Ynys Ascension</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Emiradau Arabaidd Unedig</territory>
-			<territory type="AF">Afghanistan</territory>
-			<territory type="AG">Antigua a Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albania</territory>
-			<territory type="AM">Armenia</territory>
-			<territory type="AN">Ynysoedd Caribî yr Iseldiroedd</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarctica</territory>
-			<territory type="AR">Yr Ariannin</territory>
-			<territory type="AS">Samoa America</territory>
-			<territory type="AT">Awstria</territory>
-			<territory type="AU">Awstralia</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Ynysoedd Åland</territory>
-			<territory type="AZ">Azerbaijan</territory>
-			<territory type="BA">Bosnia a Hercegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladesh</territory>
-			<territory type="BE">Gwlad Belg</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bwlgaria</territory>
-			<territory type="BH">Bahrain</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">Saint Barthélemy</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">Brunei</territory>
-			<territory type="BO">Bolifia</territory>
-			<territory type="BQ">Antilles yr Iseldiroedd</territory>
-			<territory type="BR">Brasil</territory>
-			<territory type="BS">Y Bahamas</territory>
-			<territory type="BT">Bhutan</territory>
-			<territory type="BV">Ynys Bouvet</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Belarws</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Canada</territory>
-			<territory type="CC">Ynysoedd Cocos (Keeling)</territory>
-			<territory type="CD">Y Congo - Kinshasa</territory>
-			<territory type="CD" alt="variant">y Congo (G.Dd.C.)</territory>
-			<territory type="CF">Gweriniaeth Canolbarth Affrica</territory>
-			<territory type="CG">Y Congo - Brazzaville</territory>
-			<territory type="CG" alt="variant">Y Congo (Gweriniaeth)</territory>
-			<territory type="CH">Y Swistir</territory>
-			<territory type="CI">Côte d’Ivoire</territory>
-			<territory type="CK">Ynysoedd Cook</territory>
-			<territory type="CL">Chile</territory>
-			<territory type="CM">Camerŵn</territory>
-			<territory type="CN">Tsieina</territory>
-			<territory type="CO">Colombia</territory>
-			<territory type="CP">Ynys Clipperton</territory>
-			<territory type="CR">Costa Rica</territory>
-			<territory type="CU">Ciwba</territory>
-			<territory type="CV">Cabo Verde</territory>
-			<territory type="CW">Curaçao</territory>
-			<territory type="CX">Ynys y Nadolig</territory>
-			<territory type="CY">Cyprus</territory>
-			<territory type="CZ">Gweriniaeth Tsiec</territory>
-			<territory type="DE">Yr Almaen</territory>
-			<territory type="DG">Diego Garcia</territory>
-			<territory type="DJ">Djibouti</territory>
-			<territory type="DK">Denmarc</territory>
-			<territory type="DM">Dominica</territory>
-			<territory type="DO">Gweriniaeth Dominica</territory>
-			<territory type="DZ">Algeria</territory>
-			<territory type="EA">Ceuta a Melilla</territory>
-			<territory type="EC">Ecuador</territory>
-			<territory type="EE">Estonia</territory>
-			<territory type="EG">Yr Aifft</territory>
-			<territory type="EH">Gorllewin Sahara</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">Sbaen</territory>
-			<territory type="ET">Ethiopia</territory>
-			<territory type="EU">Yr Undeb Ewropeaidd</territory>
-			<territory type="FI">Y Ffindir</territory>
-			<territory type="FJ">Fiji</territory>
-			<territory type="FK">Ynysoedd y Falkland/Malvinas</territory>
-			<territory type="FK" alt="variant">Ynysoedd y Falkland (Ynysoedd y Malfinas)</territory>
-			<territory type="FM">Micronesia</territory>
-			<territory type="FO">Føroyar</territory>
-			<territory type="FR">Ffrainc</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Y Deyrnas Unedig</territory>
-			<territory type="GB" alt="short">DU</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Georgia</territory>
-			<territory type="GF">Guyane Ffrengig</territory>
-			<territory type="GG">Ynys y Garn</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Yr Ynys Las</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Guinée</territory>
-			<territory type="GP">Guadeloupe</territory>
-			<territory type="GQ">Guinea Gyhydeddol</territory>
-			<territory type="GR">Gwlad Groeg</territory>
-			<territory type="GS">De Georgia ac Ynysoedd Sandwich y De</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guiné-Bissau</territory>
-			<territory type="GY">Guyana</territory>
-			<territory type="HK">Hong Kong RhGA Tsieina</territory>
-			<territory type="HK" alt="short">Hong Kong</territory>
-			<territory type="HM">Ynys Heard ac Ynysoedd McDonald</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Croatia</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Hwngari</territory>
-			<territory type="IC">Yr Ynysoedd Dedwydd</territory>
-			<territory type="ID">Indonesia</territory>
-			<territory type="IE">Iwerddon</territory>
-			<territory type="IL">Israel</territory>
-			<territory type="IM">Ynys Manaw</territory>
-			<territory type="IN">India</territory>
-			<territory type="IO">Tiriogaeth Brydeinig Cefnfor India</territory>
-			<territory type="IQ">Irac</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Gwlad yr Iâ</territory>
-			<territory type="IT">Yr Eidal</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jamaica</territory>
-			<territory type="JO">Gwlad Iorddonen</territory>
-			<territory type="JP">Japan</territory>
-			<territory type="KE">Kenya</territory>
-			<territory type="KG">Kyrgyzstan</territory>
-			<territory type="KH">Cambodia</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Comoros</territory>
-			<territory type="KN">Saint Kitts a Nevis</territory>
-			<territory type="KP">Gogledd Korea</territory>
-			<territory type="KR">De Korea</territory>
-			<territory type="KW">Kuwait</territory>
-			<territory type="KY">Ynysoedd Cayman</territory>
-			<territory type="KZ">Kazakstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Libanus</territory>
-			<territory type="LC">Saint Lucia</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberia</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Lithuania</territory>
-			<territory type="LU">Lwcsembwrg</territory>
-			<territory type="LV">Latfia</territory>
-			<territory type="LY">Libya</territory>
-			<territory type="MA">Moroco</territory>
-			<territory type="MC">Monaco</territory>
-			<territory type="MD">Moldofa</territory>
-			<territory type="ME">Montenegro</territory>
-			<territory type="MF">Saint Martin</territory>
-			<territory type="MG">Madagascar</territory>
-			<territory type="MH">Ynysoedd Marshall</territory>
-			<territory type="MK">Macedonia</territory>
-			<territory type="MK" alt="variant">Macedonia (CWIM)</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Myanmar (Burma)</territory>
-			<territory type="MN">Mongolia</territory>
-			<territory type="MO">Macau RhGA Tsieina</territory>
-			<territory type="MO" alt="short">Macau</territory>
-			<territory type="MP">Ynysoedd Gogledd Mariana</territory>
-			<territory type="MQ">Martinique</territory>
-			<territory type="MR">Mauritania</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauritius</territory>
-			<territory type="MV">Y Maldives</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Mecsico</territory>
-			<territory type="MY">Malaysia</territory>
-			<territory type="MZ">Mozambique</territory>
-			<territory type="NA">Namibia</territory>
-			<territory type="NC">Caledonia Newydd</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Ynys Norfolk</territory>
-			<territory type="NG">Nigeria</territory>
-			<territory type="NI">Nicaragua</territory>
-			<territory type="NL">Yr Iseldiroedd</territory>
-			<territory type="NO">Norwy</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Seland Newydd</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Periw</territory>
-			<territory type="PF">Polynesia Ffrengig</territory>
-			<territory type="PG">Papua Guinea Newydd</territory>
-			<territory type="PH">Pilipinas</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Gwlad Pwyl</territory>
-			<territory type="PM">Saint-Pierre-et-Miquelon</territory>
-			<territory type="PN">Ynysoedd Pitcairn</territory>
-			<territory type="PR">Puerto Rico</territory>
-			<territory type="PS">Tiriogaethau Palesteinaidd</territory>
-			<territory type="PS" alt="short">Palesteina</territory>
-			<territory type="PT">Portiwgal</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="QA">Qatar</territory>
-			<territory type="QO">Oceania Bellennig</territory>
-			<territory type="RE">Réunion</territory>
-			<territory type="RO">Rwmania</territory>
-			<territory type="RS">Serbia</territory>
-			<territory type="RU">Rwsia</territory>
-			<territory type="RW">Rwanda</territory>
-			<territory type="SA">Saudi Arabia</territory>
-			<territory type="SB">Ynysoedd Solomon</territory>
-			<territory type="SC">Seychelles</territory>
-			<territory type="SD">Swdan</territory>
-			<territory type="SE">Sweden</territory>
-			<territory type="SG">Singapore</territory>
-			<territory type="SH">Saint Helena</territory>
-			<territory type="SI">Slofenia</territory>
-			<territory type="SJ">Svalbard a Jan Mayen</territory>
-			<territory type="SK">Slofacia</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Sénégal</territory>
-			<territory type="SO">Somalia</territory>
-			<territory type="SR">Suriname</territory>
-			<territory type="SS">De Swdan</territory>
-			<territory type="ST">São Tomé a Príncipe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SX">Sint Maarten</territory>
-			<territory type="SY">Syria</territory>
-			<territory type="SZ">Gwlad Swazi</territory>
-			<territory type="TA">Tristan da Cunha</territory>
-			<territory type="TC">Ynysoedd Turks a Caicos</territory>
-			<territory type="TD">Tchad</territory>
-			<territory type="TF">Tiroedd Deheuol ac Antarctig Ffrainc</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Gwlad Thai</territory>
-			<territory type="TJ">Tajikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Timor-Leste</territory>
-			<territory type="TL" alt="variant">Dwyrain Timor</territory>
-			<territory type="TM">Turkmenistan</territory>
-			<territory type="TN">Tunisia</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Twrci</territory>
-			<territory type="TT">Trinidad a Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwan</territory>
-			<territory type="TZ">Tanzania</territory>
-			<territory type="UA">Wcráin</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">Ynysoedd Pellennig UDA</territory>
-			<territory type="US">Yr Unol Daleithiau</territory>
-			<territory type="US" alt="short">UDA</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Uzbekistan</territory>
-			<territory type="VA">Y Fatican</territory>
-			<territory type="VC">Saint Vincent a’r Grenadines</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">Ynysoedd Gwyryf Prydain</territory>
-			<territory type="VI">Ynysoedd Gwyryf yr Unol Daleithiau</territory>
-			<territory type="VN">Fietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis a Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="XK">Kosovo</territory>
-			<territory type="YE">Yemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">De Affrica</territory>
-			<territory type="ZM">Zambia</territory>
-			<territory type="ZW">Zimbabwe</territory>
-			<territory type="ZZ">Rhanbarth Anhysbys</territory>
-		</territories>
-		<keys>
-			<key type="calendar">Calendr</key>
-			<key type="collation">Trefn</key>
-			<key type="currency">Arian Breiniol</key>
-			<key type="numbers">Rhifau</key>
-		</keys>
-		<types>
-			<type type="arab" key="numbers">Digidau Arabig-Indig</type>
-			<type type="arabext" key="numbers">Digidau Arabig-Indig Estynedig</type>
-			<type type="armn" key="numbers">Rhifolion Armenaidd</type>
-			<type type="armnlow" key="numbers">Rhifolion Armenaidd mewn Llythrennau Bychain</type>
-			<type type="beng" key="numbers">Digidau Bengalaidd</type>
-			<type type="big5han" key="collation">Trefn Traddodiadol Tsieina - Big5</type>
-			<type type="buddhist" key="calendar">Calendr y Bwdiaid</type>
-			<type type="chinese" key="calendar">Calendr Tseina</type>
-			<type type="coptic" key="calendar">Calendr y Coptiaid</type>
-			<type type="dangi" key="calendar">Calendr Dangi</type>
-			<type type="deva" key="numbers">Digidau Devanāgarīg</type>
-			<type type="dictionary" key="collation">Trefn Geiriadur</type>
-			<type type="ducet" key="collation">Trefn Rhagosodedig Unicode</type>
-			<type type="eor" key="collation">Rheolau trefnu Ewropeaidd</type>
-			<type type="ethi" key="numbers">Rhifolion Ethiopig</type>
-			<type type="ethiopic" key="calendar">Calendr Ethiopia</type>
-			<type type="ethiopic-amete-alem" key="calendar">Calendr Amete Alem Ethiopia</type>
-			<type type="fullwide" key="numbers">Digidau Lled Llawn</type>
-			<type type="gb2312han" key="collation">Trefn Symledig Tsieina - GB2312</type>
-			<type type="geor" key="numbers">Rhifolion Georgaidd</type>
-			<type type="gregorian" key="calendar">Calendr Gregori</type>
-			<type type="grek" key="numbers">Rhifolion Groegaidd</type>
-			<type type="greklow" key="numbers">Rhifolion Groegaidd mewn Llythrennau Bychain</type>
-			<type type="gujr" key="numbers">Digidau Gujarataidd</type>
-			<type type="guru" key="numbers">Digidau Gwrmwcaidd</type>
-			<type type="hanidec" key="numbers">Rhifolion Degol Tsieineaidd</type>
-			<type type="hans" key="numbers">Rhifolion Tsieineaidd Symledig</type>
-			<type type="hansfin" key="numbers">Rhifolion Ariannol Tsieineaidd Symledig</type>
-			<type type="hant" key="numbers">Rhifolion Tsieineaidd Traddodiadol</type>
-			<type type="hantfin" key="numbers">Rhifolion Ariannol Tsieineaidd Traddodiadol</type>
-			<type type="hebr" key="numbers">Rhifolion Hebreig</type>
-			<type type="hebrew" key="calendar">Calendr yr Hebraed</type>
-			<type type="indian" key="calendar">Calendr Cenedlaethol India</type>
-			<type type="islamic" key="calendar">Calendr Islam</type>
-			<type type="islamic-umalqura" key="calendar" draft="unconfirmed">Calendr Islam (Umm al-Qura)</type>
-			<type type="iso8601" key="calendar">Calendr ISO-8601</type>
-			<type type="japanese" key="calendar">Calendr Japan</type>
-			<type type="jpan" key="numbers">Rhifolion Japaneaidd</type>
-			<type type="jpanfin" key="numbers">Rhifolion Ariannol Japaneaidd</type>
-			<type type="khmr" key="numbers">Digidau Chmeraidd</type>
-			<type type="knda" key="numbers">Digidau Canaraidd</type>
-			<type type="laoo" key="numbers">Digidau Laoaidd</type>
-			<type type="latn" key="numbers">Digidau Gorllewinol</type>
-			<type type="mlym" key="numbers">Digidau Malayalamaidd</type>
-			<type type="mong" key="numbers">Digidau Mongolia</type>
-			<type type="mymr" key="numbers">Digidau Myanmar</type>
-			<type type="orya" key="numbers">Digidau Orïaidd</type>
-			<type type="persian" key="calendar">Calendr Persia</type>
-			<type type="phonebook" key="collation">Trefn Llyfr Ffôn</type>
-			<type type="pinyin" key="collation">Trefn Pinyin</type>
-			<type type="reformed" key="collation">Trefn Diwygiedig</type>
-			<type type="roman" key="numbers">Rhifolion Rhufeinig</type>
-			<type type="romanlow" key="numbers">Rhifolion Rhufeinig mewn Llythrennau Bychain</type>
-			<type type="search" key="collation">Chwilio at Ddibenion Cyffredinol</type>
-			<type type="standard" key="collation">Trefn Safonol</type>
-			<type type="taml" key="numbers">Rhifolion Tamilaidd Traddodiadol</type>
-			<type type="tamldec" key="numbers">Digidau Tamilaidd</type>
-			<type type="telu" key="numbers">Digidau Telugu</type>
-			<type type="thai" key="numbers">Digidau Thai</type>
-			<type type="tibt" key="numbers">Digidau Tibetaidd</type>
-			<type type="traditional" key="collation">Trefn Traddodiadol</type>
-			<type type="zhuyin" key="collation">Trefn Zhuyin</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Metrig</measurementSystemName>
-			<measurementSystemName type="UK">DU</measurementSystemName>
-			<measurementSystemName type="US">UDA</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Iaith: {0}</codePattern>
-			<codePattern type="script">Sgript: {0}</codePattern>
-			<codePattern type="territory">Rhanbarth: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[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 ý ỳ ŷ ÿ]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[ă å ã ā æ ç ĕ ē ĭ ī k ñ ŏ ø ō œ q ŭ ū v x z]</exemplarCharacters>
-		<exemplarCharacters type="index">[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]</exemplarCharacters>
-		<exemplarCharacters type="punctuation">[\- ‐ – — , ; \: ! ? . … ' ‘ ’ &quot; “ ” ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
-		<ellipsis type="final">{0}…</ellipsis>
-		<ellipsis type="initial">…{0}</ellipsis>
-		<ellipsis type="medial">{0}…{1}</ellipsis>
-		<ellipsis type="word-final">{0} …</ellipsis>
-		<ellipsis type="word-initial">… {0}</ellipsis>
-		<ellipsis type="word-medial">{0} … {1}</ellipsis>
-		<moreInformation>?</moreInformation>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>”</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="generic">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/y GGGGG</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<dateTimeFormatLength type="full">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="long">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="Ed">E, d</dateFormatItem>
-						<dateFormatItem id="Gy">y G</dateFormatItem>
-						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
-						<dateFormatItem id="H">HH</dateFormatItem>
-						<dateFormatItem id="hm">h:mm a</dateFormatItem>
-						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
-						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yyyy">y G</dateFormatItem>
-						<dateFormatItem id="yyyyM">M/y G</dateFormatItem>
-						<dateFormatItem id="yyyyMd">d/M/y G</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">E, d/M/y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMd">d MMM y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMEd">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="yyyyQ" draft="unconfirmed">Q y G</dateFormatItem>
-						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
-						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d – d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="H">
-							<greatestDifference id="H">HH–HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hm">
-							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H">HH:mm–HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hv">
-							<greatestDifference id="H">HH–HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M – M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d/M – d/M</greatestDifference>
-							<greatestDifference id="M">d/M – d/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, d/M – E, d/M</greatestDifference>
-							<greatestDifference id="M">E, d/M – E, d/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM–MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d–d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
-							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL–LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y–y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M/y – M/y GGGGG</greatestDifference>
-							<greatestDifference id="y">M/y – M/y GGGGG</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d/M/y – d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="M">d/M/y – d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="y">d/M/y – d/M/y GGGGG</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="M">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="y">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM – MMM y G</greatestDifference>
-							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d–d MMM y G</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
-							<greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d MMM – E, d MMM y G</greatestDifference>
-							<greatestDifference id="M">E, d MMM – E, d MMM y G</greatestDifference>
-							<greatestDifference id="y">E, d MMM, y – E, d MMM y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MMMM–MMMM y G</greatestDifference>
-							<greatestDifference id="y">MMMM y – MMMM y G</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Ion</month>
-							<month type="2">Chwef</month>
-							<month type="3">Mawrth</month>
-							<month type="4">Ebrill</month>
-							<month type="5">Mai</month>
-							<month type="6">Meh</month>
-							<month type="7">Gorff</month>
-							<month type="8">Awst</month>
-							<month type="9">Medi</month>
-							<month type="10">Hyd</month>
-							<month type="11">Tach</month>
-							<month type="12">Rhag</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">I</month>
-							<month type="2">Ch</month>
-							<month type="3">M</month>
-							<month type="4">E</month>
-							<month type="5">M</month>
-							<month type="6">M</month>
-							<month type="7">G</month>
-							<month type="8">A</month>
-							<month type="9">M</month>
-							<month type="10">H</month>
-							<month type="11">T</month>
-							<month type="12">Rh</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Ionawr</month>
-							<month type="2">Chwefror</month>
-							<month type="3">Mawrth</month>
-							<month type="4">Ebrill</month>
-							<month type="5">Mai</month>
-							<month type="6">Mehefin</month>
-							<month type="7">Gorffennaf</month>
-							<month type="8">Awst</month>
-							<month type="9">Medi</month>
-							<month type="10">Hydref</month>
-							<month type="11">Tachwedd</month>
-							<month type="12">Rhagfyr</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">Ion</month>
-							<month type="2">Chw</month>
-							<month type="3">Maw</month>
-							<month type="4">Ebr</month>
-							<month type="5">Mai</month>
-							<month type="6">Meh</month>
-							<month type="7">Gor</month>
-							<month type="8">Awst</month>
-							<month type="9">Medi</month>
-							<month type="10">Hyd</month>
-							<month type="11">Tach</month>
-							<month type="12">Rhag</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">I</month>
-							<month type="2">Ch</month>
-							<month type="3">M</month>
-							<month type="4">E</month>
-							<month type="5">M</month>
-							<month type="6">M</month>
-							<month type="7">G</month>
-							<month type="8">A</month>
-							<month type="9">M</month>
-							<month type="10">H</month>
-							<month type="11">T</month>
-							<month type="12">Rh</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Ionawr</month>
-							<month type="2">Chwefror</month>
-							<month type="3">Mawrth</month>
-							<month type="4">Ebrill</month>
-							<month type="5">Mai</month>
-							<month type="6">Mehefin</month>
-							<month type="7">Gorffennaf</month>
-							<month type="8">Awst</month>
-							<month type="9">Medi</month>
-							<month type="10">Hydref</month>
-							<month type="11">Tachwedd</month>
-							<month type="12">Rhagfyr</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Sul</day>
-							<day type="mon">Llun</day>
-							<day type="tue">Maw</day>
-							<day type="wed">Mer</day>
-							<day type="thu">Iau</day>
-							<day type="fri">Gwen</day>
-							<day type="sat">Sad</day>
-						</dayWidth>
-						<dayWidth type="narrow">
-							<day type="sun">S</day>
-							<day type="mon">Ll</day>
-							<day type="tue">M</day>
-							<day type="wed">M</day>
-							<day type="thu">I</day>
-							<day type="fri">G</day>
-							<day type="sat">S</day>
-						</dayWidth>
-						<dayWidth type="short">
-							<day type="sun">Su</day>
-							<day type="mon">Ll</day>
-							<day type="tue">Ma</day>
-							<day type="wed">Me</day>
-							<day type="thu">Ia</day>
-							<day type="fri">Gw</day>
-							<day type="sat">Sa</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Dydd Sul</day>
-							<day type="mon">Dydd Llun</day>
-							<day type="tue">Dydd Mawrth</day>
-							<day type="wed">Dydd Mercher</day>
-							<day type="thu">Dydd Iau</day>
-							<day type="fri">Dydd Gwener</day>
-							<day type="sat">Dydd Sadwrn</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="abbreviated">
-							<day type="sun">Sul</day>
-							<day type="mon">Llun</day>
-							<day type="tue">Maw</day>
-							<day type="wed">Mer</day>
-							<day type="thu">Iau</day>
-							<day type="fri">Gwe</day>
-							<day type="sat">Sad</day>
-						</dayWidth>
-						<dayWidth type="narrow">
-							<day type="sun">S</day>
-							<day type="mon">Ll</day>
-							<day type="tue">M</day>
-							<day type="wed">M</day>
-							<day type="thu">I</day>
-							<day type="fri">G</day>
-							<day type="sat">S</day>
-						</dayWidth>
-						<dayWidth type="short">
-							<day type="sun">Su</day>
-							<day type="mon">Ll</day>
-							<day type="tue">Ma</day>
-							<day type="wed">Me</day>
-							<day type="thu">Ia</day>
-							<day type="fri">Gw</day>
-							<day type="sat">Sa</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Dydd Sul</day>
-							<day type="mon">Dydd Llun</day>
-							<day type="tue">Dydd Mawrth</day>
-							<day type="wed">Dydd Mercher</day>
-							<day type="thu">Dydd Iau</day>
-							<day type="fri">Dydd Gwener</day>
-							<day type="sat">Dydd Sadwrn</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Ch1</quarter>
-							<quarter type="2">Ch2</quarter>
-							<quarter type="3">Ch3</quarter>
-							<quarter type="4">Ch4</quarter>
-						</quarterWidth>
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Chwarter 1af</quarter>
-							<quarter type="2">2il chwarter</quarter>
-							<quarter type="3">3ydd chwarter</quarter>
-							<quarter type="4">4ydd chwarter</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Ch1</quarter>
-							<quarter type="2">Ch2</quarter>
-							<quarter type="3">Ch3</quarter>
-							<quarter type="4">Ch4</quarter>
-						</quarterWidth>
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">chwarter 1af</quarter>
-							<quarter type="2">2il chwarter</quarter>
-							<quarter type="3">3ydd chwarter</quarter>
-							<quarter type="4">4ydd chwarter</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<dayPeriods>
-					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="pm">PM</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="noon">hanner dydd</dayPeriod>
-							<dayPeriod type="pm">PM</dayPeriod>
-						</dayPeriodWidth>
-					</dayPeriodContext>
-				</dayPeriods>
-				<eras>
-					<eraNames>
-						<era type="0">Cyn Crist</era>
-						<era type="1">Oed Crist</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">CC</era>
-						<era type="1">OC</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0">C</era>
-						<era type="1">O</era>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<dateTimeFormatLength type="full">
-						<dateTimeFormat>
-							<pattern>{1} 'am' {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="long">
-						<dateTimeFormat>
-							<pattern>{1} 'am' {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="Ed">E, d</dateFormatItem>
-						<dateFormatItem id="Ehm">E, h.mm a</dateFormatItem>
-						<dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
-						<dateFormatItem id="Ehms">E, h.mm.ss a</dateFormatItem>
-						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Gy">y G</dateFormatItem>
-						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
-						<dateFormatItem id="H">HH</dateFormatItem>
-						<dateFormatItem id="hm">h.mm a</dateFormatItem>
-						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
-						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M/y</dateFormatItem>
-						<dateFormatItem id="yMd">d/M/y</dateFormatItem>
-						<dateFormatItem id="yMEd">E, d/M/y</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">E, d MMM y</dateFormatItem>
-						<dateFormatItem id="yQ">Q y</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
-					</availableFormats>
-					<appendItems>
-						<appendItem request="Timezone">{0} {1}</appendItem>
-					</appendItems>
-					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d–d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="H">
-							<greatestDifference id="H">HH–HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm – h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hm">
-							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm – h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H">HH:mm–HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hv">
-							<greatestDifference id="H">HH–HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M–M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d/M – d/M</greatestDifference>
-							<greatestDifference id="M">d/M – d/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, d/M – E, d/M</greatestDifference>
-							<greatestDifference id="M">E, d/M – E, d/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM–MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d–d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
-							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL–LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y–y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M/y – M/y</greatestDifference>
-							<greatestDifference id="y">M/y – M/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d/M/y – d/M/y</greatestDifference>
-							<greatestDifference id="M">d/M/y – d/M/y</greatestDifference>
-							<greatestDifference id="y">d/M/y – d/M/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, d/M/y – E, d/M/y</greatestDifference>
-							<greatestDifference id="M">E, d/M/y – E, d/M/y</greatestDifference>
-							<greatestDifference id="y">E, d/M/y – E, d/M/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM – MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d–d MMM y</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM, y – d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d MMM – E, d MMM y</greatestDifference>
-							<greatestDifference id="M">E, d MMM – E, d MMM y</greatestDifference>
-							<greatestDifference id="y">E, d MMM, y – E, d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MMMM–MMMM y</greatestDifference>
-							<greatestDifference id="y">MMMM y – MMMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<fields>
-			<field type="era">
-				<displayName>Oes</displayName>
-			</field>
-			<field type="year">
-				<displayName>Blwyddyn</displayName>
-				<relative type="-1">llynedd</relative>
-				<relative type="0">eleni</relative>
-				<relative type="1">blwyddyn nesaf</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="zero">Ymhen {0} mlynedd</relativeTimePattern>
-					<relativeTimePattern count="one">Ymhen blwyddyn</relativeTimePattern>
-					<relativeTimePattern count="two">Ymhen {0} flynedd</relativeTimePattern>
-					<relativeTimePattern count="few">Ymhen {0} blynedd</relativeTimePattern>
-					<relativeTimePattern count="many">Ymhen {0} blynedd</relativeTimePattern>
-					<relativeTimePattern count="other">Ymhen {0} mlynedd</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="zero">{0} o flynyddoedd yn ôl</relativeTimePattern>
-					<relativeTimePattern count="one">blwyddyn yn ôl</relativeTimePattern>
-					<relativeTimePattern count="two">{0} flynedd yn ôl</relativeTimePattern>
-					<relativeTimePattern count="few">{0} blynedd yn ôl</relativeTimePattern>
-					<relativeTimePattern count="many">{0} blynedd yn ôl</relativeTimePattern>
-					<relativeTimePattern count="other">{0} o flynyddoedd yn ôl</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="month">
-				<displayName>Mis</displayName>
-				<relative type="-1">mis diwethaf</relative>
-				<relative type="0">y mis hwn</relative>
-				<relative type="1">mis nesaf</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="zero">Ymhen {0} mis</relativeTimePattern>
-					<relativeTimePattern count="one">Ymhen mis</relativeTimePattern>
-					<relativeTimePattern count="two">Ymhen deufis</relativeTimePattern>
-					<relativeTimePattern count="few">Ymhen {0} mis</relativeTimePattern>
-					<relativeTimePattern count="many">Ymhen {0} mis</relativeTimePattern>
-					<relativeTimePattern count="other">Ymhen {0} mis</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="zero">{0} mis yn ôl</relativeTimePattern>
-					<relativeTimePattern count="one">{0} mis yn ôl</relativeTimePattern>
-					<relativeTimePattern count="two">{0} fis yn ôl</relativeTimePattern>
-					<relativeTimePattern count="few">{0} mis yn ôl</relativeTimePattern>
-					<relativeTimePattern count="many">{0} mis yn ôl</relativeTimePattern>
-					<relativeTimePattern count="other">{0} mis yn ôl</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="month-short">
-				<relativeTime type="past">
-					<relativeTimePattern count="zero">{0} mis yn ôl</relativeTimePattern>
-					<relativeTimePattern count="one">{0} mis yn ôl</relativeTimePattern>
-					<relativeTimePattern count="two">{0} mis yn ôl</relativeTimePattern>
-					<relativeTimePattern count="few">{0} mis yn ôl</relativeTimePattern>
-					<relativeTimePattern count="many">{0} mis yn ôl</relativeTimePattern>
-					<relativeTimePattern count="other">{0} mis yn ôl</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="month-narrow">
-				<relativeTime type="past">
-					<relativeTimePattern count="zero">{0} mis yn ôl</relativeTimePattern>
-					<relativeTimePattern count="one">{0} mis yn ôl</relativeTimePattern>
-					<relativeTimePattern count="two">{0} mis yn ôl</relativeTimePattern>
-					<relativeTimePattern count="few">{0} mis yn ôl</relativeTimePattern>
-					<relativeTimePattern count="many">{0} mis yn ôl</relativeTimePattern>
-					<relativeTimePattern count="other">{0} mis yn ôl</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="week">
-				<displayName>Wythnos</displayName>
-				<relative type="-1">wythnos ddiwethaf</relative>
-				<relative type="0">yr wythnos hon</relative>
-				<relative type="1">wythnos nesaf</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="zero">Ymhen {0} wythnos</relativeTimePattern>
-					<relativeTimePattern count="one">Ymhen wythnos</relativeTimePattern>
-					<relativeTimePattern count="two">Ymhen pythefnos</relativeTimePattern>
-					<relativeTimePattern count="few">Ymhen {0} wythnos</relativeTimePattern>
-					<relativeTimePattern count="many">Ymhen {0} wythnos</relativeTimePattern>
-					<relativeTimePattern count="other">Ymhen {0} wythnos</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="zero">{0} wythnos yn ôl</relativeTimePattern>
-					<relativeTimePattern count="one">{0} wythnos yn ôl</relativeTimePattern>
-					<relativeTimePattern count="two">{0} wythnos yn ôl</relativeTimePattern>
-					<relativeTimePattern count="few">{0} wythnos yn ôl</relativeTimePattern>
-					<relativeTimePattern count="many">{0} wythnos yn ôl</relativeTimePattern>
-					<relativeTimePattern count="other">{0} wythnos yn ôl</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="day">
-				<displayName>Dydd</displayName>
-				<relative type="-2">echdoe</relative>
-				<relative type="-1">ddoe</relative>
-				<relative type="0">heddiw</relative>
-				<relative type="1">yfory</relative>
-				<relative type="2">drennydd</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="zero">Ymhen {0} diwrnod</relativeTimePattern>
-					<relativeTimePattern count="one">Ymhen diwrnod</relativeTimePattern>
-					<relativeTimePattern count="two">Ymhen deuddydd</relativeTimePattern>
-					<relativeTimePattern count="few">Ymhen tridiau</relativeTimePattern>
-					<relativeTimePattern count="many">Ymhen {0} diwrnod</relativeTimePattern>
-					<relativeTimePattern count="other">Ymhen {0} diwrnod</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="zero">{0} diwrnod yn ôl</relativeTimePattern>
-					<relativeTimePattern count="one">{0} diwrnod yn ôl</relativeTimePattern>
-					<relativeTimePattern count="two">{0} ddiwrnod yn ôl</relativeTimePattern>
-					<relativeTimePattern count="few">{0} diwrnod yn ôl</relativeTimePattern>
-					<relativeTimePattern count="many">{0} diwrnod yn ôl</relativeTimePattern>
-					<relativeTimePattern count="other">{0} diwrnod yn ôl</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="day-short">
-				<relativeTime type="past">
-					<relativeTimePattern count="zero">{0} diwrnod yn ôl</relativeTimePattern>
-					<relativeTimePattern count="one">{0} diwrnod yn ôl</relativeTimePattern>
-					<relativeTimePattern count="two">{0} diwrnod yn ôl</relativeTimePattern>
-					<relativeTimePattern count="few">{0} diwrnod yn ôl</relativeTimePattern>
-					<relativeTimePattern count="many">{0} diwrnod yn ôl</relativeTimePattern>
-					<relativeTimePattern count="other">{0} diwrnod yn ôl</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="weekday">
-				<displayName>Dydd o’r Wythnos</displayName>
-			</field>
-			<field type="sun">
-				<relative type="-1">dydd Sul diwethaf</relative>
-				<relative type="0">dydd Sul yma</relative>
-				<relative type="1">dydd Sul nesaf</relative>
-			</field>
-			<field type="mon">
-				<relative type="-1">dydd Llun diwethaf</relative>
-				<relative type="0">dydd Llun yma</relative>
-				<relative type="1">dydd Llun nesaf</relative>
-			</field>
-			<field type="tue">
-				<relative type="-1">dydd Mawrth diwethaf</relative>
-				<relative type="0">dydd Mawrth yma</relative>
-				<relative type="1">dydd Mawrth nesaf</relative>
-			</field>
-			<field type="wed">
-				<relative type="-1">dydd Mercher diwethaf</relative>
-				<relative type="0">dydd Mercher yma</relative>
-				<relative type="1">dydd Mercher nesaf</relative>
-			</field>
-			<field type="thu">
-				<relative type="-1">dydd Iau diwethaf</relative>
-				<relative type="0">dydd Iau yma</relative>
-				<relative type="1">dydd Iau nesaf</relative>
-			</field>
-			<field type="fri">
-				<relative type="-1">dydd Gwener diwethaf</relative>
-				<relative type="0">dydd Gwener yma</relative>
-				<relative type="1">dydd Gwener nesaf</relative>
-			</field>
-			<field type="sat">
-				<relative type="-1">dydd Sadwrn diwethaf</relative>
-				<relative type="0">dydd Sadwrn yma</relative>
-				<relative type="1">dydd Sadwrn nesaf</relative>
-			</field>
-			<field type="dayperiod">
-				<displayName>AM/PM</displayName>
-			</field>
-			<field type="hour">
-				<displayName>Awr</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="zero">Ymhen {0} awr</relativeTimePattern>
-					<relativeTimePattern count="one">Ymhen {0} awr</relativeTimePattern>
-					<relativeTimePattern count="two">Ymhen {0} awr</relativeTimePattern>
-					<relativeTimePattern count="few">Ymhen {0} awr</relativeTimePattern>
-					<relativeTimePattern count="many">Ymhen {0} awr</relativeTimePattern>
-					<relativeTimePattern count="other">Ymhen {0} awr</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="zero">{0} awr yn ôl</relativeTimePattern>
-					<relativeTimePattern count="one">awr yn ôl</relativeTimePattern>
-					<relativeTimePattern count="two">{0} awr yn ôl</relativeTimePattern>
-					<relativeTimePattern count="few">{0} awr yn ôl</relativeTimePattern>
-					<relativeTimePattern count="many">{0} awr yn ôl</relativeTimePattern>
-					<relativeTimePattern count="other">{0} awr yn ôl</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="minute">
-				<displayName>Munud</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="zero">Ymhen {0} munud</relativeTimePattern>
-					<relativeTimePattern count="one">Ymhen munud</relativeTimePattern>
-					<relativeTimePattern count="two">Ymhen {0} funud</relativeTimePattern>
-					<relativeTimePattern count="few">Ymhen {0} munud</relativeTimePattern>
-					<relativeTimePattern count="many">Ymhen {0} munud</relativeTimePattern>
-					<relativeTimePattern count="other">Ymhen {0} munud</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="zero">{0} munud yn ôl</relativeTimePattern>
-					<relativeTimePattern count="one">{0} munud yn ôl</relativeTimePattern>
-					<relativeTimePattern count="two">{0} funud yn ôl</relativeTimePattern>
-					<relativeTimePattern count="few">{0} munud yn ôl</relativeTimePattern>
-					<relativeTimePattern count="many">{0} munud yn ôl</relativeTimePattern>
-					<relativeTimePattern count="other">{0} munud yn ôl</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="second">
-				<displayName>Eiliad</displayName>
-				<relative type="0">nawr</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="zero">Ymhen {0} eiliad</relativeTimePattern>
-					<relativeTimePattern count="one">Ymhen eiliad</relativeTimePattern>
-					<relativeTimePattern count="two">Ymhen {0} eiliad</relativeTimePattern>
-					<relativeTimePattern count="few">Ymhen {0} eiliad</relativeTimePattern>
-					<relativeTimePattern count="many">Ymhen {0} eiliad</relativeTimePattern>
-					<relativeTimePattern count="other">Ymhen {0} eiliad</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="zero">{0} eiliad yn ôl</relativeTimePattern>
-					<relativeTimePattern count="one">eiliad yn ôl</relativeTimePattern>
-					<relativeTimePattern count="two">{0} eiliad yn ôl</relativeTimePattern>
-					<relativeTimePattern count="few">{0} eiliad yn ôl</relativeTimePattern>
-					<relativeTimePattern count="many">{0} eiliad yn ôl</relativeTimePattern>
-					<relativeTimePattern count="other">{0} eiliad yn ôl</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="zone">
-				<displayName>Cylchfa Amser</displayName>
-			</field>
-		</fields>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<gmtZeroFormat>GMT</gmtZeroFormat>
-			<regionFormat>Amser {0}</regionFormat>
-			<regionFormat type="daylight">Amser Haf {0}</regionFormat>
-			<regionFormat type="standard">Amser Safonol {0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Dinas Anhysbys</exemplarCity>
-			</zone>
-			<zone type="Asia/Dubai">
-				<exemplarCity>Dubai</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tiranë</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>Yerevan</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont d’Urville</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tucumán</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Wien</exemplarCity>
-			</zone>
-			<zone type="Asia/Baku">
-				<exemplarCity>Baku</exemplarCity>
-			</zone>
-			<zone type="Europe/Sarajevo">
-				<exemplarCity>Sarajevo</exemplarCity>
-			</zone>
-			<zone type="Asia/Dhaka">
-				<exemplarCity>Dacca</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Brwsel</exemplarCity>
-			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>Sofiya</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>Bahrain</exemplarCity>
-			</zone>
-			<zone type="America/St_Barthelemy">
-				<exemplarCity>St. Barthélemy</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Eirunepé</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>Santarém</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceió</exemplarCity>
-			</zone>
-			<zone type="Asia/Thimphu">
-				<exemplarCity>Thimbu</exemplarCity>
-			</zone>
-			<zone type="Europe/Minsk">
-				<exemplarCity>Minsk</exemplarCity>
-			</zone>
-			<zone type="America/Coral_Harbour">
-				<exemplarCity>Atikokan</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>St. John’s</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>Zürich</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Ynys y Pasg</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Ürümqi</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Bogotá</exemplarCity>
-			</zone>
-			<zone type="America/Havana">
-				<exemplarCity>La Habana</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Cabo Verde</exemplarCity>
-			</zone>
-			<zone type="America/Curacao">
-				<exemplarCity>Curaçao</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>Ynys y Nadolig</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>Nicosia</exemplarCity>
-			</zone>
-			<zone type="Europe/Prague">
-				<exemplarCity>Praha</exemplarCity>
-			</zone>
-			<zone type="Europe/Busingen">
-				<exemplarCity>Büsingen</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>Berlin</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>København</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>Alger</exemplarCity>
-			</zone>
-			<zone type="Europe/Tallinn">
-				<exemplarCity>Tallinn</exemplarCity>
-			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>El Aaiún</exemplarCity>
-			</zone>
-			<zone type="Africa/Asmera">
-				<exemplarCity>Asmera</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>yr Ynysoedd Dedwydd</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>Ceuta</exemplarCity>
-			</zone>
-			<zone type="Europe/Madrid">
-				<exemplarCity>Madrid</exemplarCity>
-			</zone>
-			<zone type="Europe/Helsinki">
-				<exemplarCity>Helsinki</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>Chuuk</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>Pohnpei</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Føroyar</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>Paris</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<long>
-					<daylight>Amser Haf Prydain</daylight>
-				</long>
-				<exemplarCity>Llundain</exemplarCity>
-			</zone>
-			<zone type="Asia/Tbilisi">
-				<exemplarCity>Tiflis</exemplarCity>
-			</zone>
-			<zone type="Europe/Guernsey">
-				<exemplarCity>Ynys y Garn</exemplarCity>
-			</zone>
-			<zone type="Europe/Gibraltar">
-				<exemplarCity>Gibraltar</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>Nuuk</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>Ittoqqortoormiit</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>Athen</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>De Georgia</exemplarCity>
-			</zone>
-			<zone type="Europe/Zagreb">
-				<exemplarCity>Zagreb</exemplarCity>
-			</zone>
-			<zone type="Europe/Budapest">
-				<exemplarCity>Budapest</exemplarCity>
-			</zone>
-			<zone type="Europe/Dublin">
-				<long>
-					<daylight>Amser Haf Iwerddon</daylight>
-				</long>
-				<exemplarCity>Dulyn</exemplarCity>
-			</zone>
-			<zone type="Asia/Jerusalem">
-				<exemplarCity>Jerwsalem</exemplarCity>
-			</zone>
-			<zone type="Europe/Isle_of_Man">
-				<exemplarCity>Ynys Manaw</exemplarCity>
-			</zone>
-			<zone type="Asia/Calcutta">
-				<exemplarCity>Calcutta</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>Baghdad</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Reykjavik">
-				<exemplarCity>Reykjavík</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Rhufain</exemplarCity>
-			</zone>
-			<zone type="Europe/Jersey">
-				<exemplarCity>Jersey</exemplarCity>
-			</zone>
-			<zone type="Asia/Amman">
-				<exemplarCity>Amman</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>Tōkyō</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>Saint Kitts</exemplarCity>
-			</zone>
-			<zone type="Asia/Pyongyang">
-				<exemplarCity>P’yŏngyang</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>Sǒul</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>Kuwait</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>Aktau</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>Aqtöbe</exemplarCity>
-			</zone>
-			<zone type="Asia/Beirut">
-				<exemplarCity>Beirut</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>Saint Lucia</exemplarCity>
-			</zone>
-			<zone type="Europe/Riga">
-				<exemplarCity>Riga</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>Monaco</exemplarCity>
-			</zone>
-			<zone type="Europe/Chisinau">
-				<exemplarCity>Chişinău</exemplarCity>
-			</zone>
-			<zone type="Europe/Skopje">
-				<exemplarCity>Skopje</exemplarCity>
-			</zone>
-			<zone type="Asia/Rangoon">
-				<exemplarCity>Yangon</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Ulan Bator</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>Choybalsan</exemplarCity>
-			</zone>
-			<zone type="Europe/Malta">
-				<exemplarCity>Malta</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Mazatlán</exemplarCity>
-			</zone>
-			<zone type="America/Bahia_Banderas">
-				<exemplarCity>Bae Banderas</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Dinas México</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>Cancún</exemplarCity>
-			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>Nouméa</exemplarCity>
-			</zone>
-			<zone type="Europe/Amsterdam">
-				<exemplarCity>Amsterdam</exemplarCity>
-			</zone>
-			<zone type="Europe/Oslo">
-				<exemplarCity>Oslo</exemplarCity>
-			</zone>
-			<zone type="Asia/Katmandu">
-				<exemplarCity>Kathmandu</exemplarCity>
-			</zone>
-			<zone type="Asia/Muscat">
-				<exemplarCity>Muscat</exemplarCity>
-			</zone>
-			<zone type="America/Panama">
-				<exemplarCity>Panamá</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>Marquises</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Warszawa</exemplarCity>
-			</zone>
-			<zone type="Asia/Gaza">
-				<exemplarCity>Gasa</exemplarCity>
-			</zone>
-			<zone type="Asia/Hebron">
-				<exemplarCity>Hebron</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lisboa</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>Asunción</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>Qatar</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>Réunion</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Bucureşti</exemplarCity>
-			</zone>
-			<zone type="Europe/Belgrade">
-				<exemplarCity>Beograd</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>Kaliningrad</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>Simferopol</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moskva</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>Volgograd</exemplarCity>
-			</zone>
-			<zone type="Europe/Samara">
-				<exemplarCity>Samara</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Yekaterinburg</exemplarCity>
-			</zone>
-			<zone type="Asia/Omsk">
-				<exemplarCity>Omsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>Novosibirsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Krasnoyarsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>Irkutsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>Yakutsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>Vladivostok</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>Sachalin</exemplarCity>
-			</zone>
-			<zone type="Asia/Magadan">
-				<exemplarCity>Magadan</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Kamchatka</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>Anadyr</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>Riyadh</exemplarCity>
-			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>Mahé</exemplarCity>
-			</zone>
-			<zone type="Europe/Stockholm">
-				<exemplarCity>Stockholm</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>Saint Helena</exemplarCity>
-			</zone>
-			<zone type="Arctic/Longyearbyen">
-				<exemplarCity>Longyearbyen</exemplarCity>
-			</zone>
-			<zone type="Europe/Bratislava">
-				<exemplarCity>Bratislava</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>São Tomé</exemplarCity>
-			</zone>
-			<zone type="America/Lower_Princes">
-				<exemplarCity>Lower Prince’s Quarter/Beneden Prinsen Kwartier</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Damascus</exemplarCity>
-			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>N’Djamena</exemplarCity>
-			</zone>
-			<zone type="Indian/Kerguelen">
-				<exemplarCity>Kerguélen</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Lomé</exemplarCity>
-			</zone>
-			<zone type="Asia/Ashgabat">
-				<exemplarCity>Ashkabad</exemplarCity>
-			</zone>
-			<zone type="Asia/Taipei">
-				<exemplarCity>Taibei</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uzhgorod</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>Kiev</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporizhzhya</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Beulah">
-				<exemplarCity>Beulah, Gogledd Dakota</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>New Salem, Gogledd Dakota</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Center, Gogledd Dakota</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>Vincennes, Indiana</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>Petersburg, Indiana</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Tell_City">
-				<exemplarCity>Dinas Tell, Indiana</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>Knox, Indiana</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>Winamac, Indiana</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>Marengo, Indiana</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>Vevay, Indiana</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>Monticello, Kentucky</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>Efrog Newydd</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>Samarcand</exemplarCity>
-			</zone>
-			<zone type="Europe/Vatican">
-				<exemplarCity>y Fatican</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>Saint Vincent</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>Saint Thomas</exemplarCity>
-			</zone>
-			<zone type="Asia/Saigon">
-				<exemplarCity>Dinas Hô Chi Minh</exemplarCity>
-			</zone>
-			<zone type="Pacific/Efate">
-				<exemplarCity>Éfaté</exemplarCity>
-			</zone>
-			<zone type="Asia/Aden">
-				<exemplarCity>Aden</exemplarCity>
-			</zone>
-			<metazone type="Afghanistan">
-				<long>
-					<standard>Amser Afghanistan</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>Amser Canolbarth Affrica</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>Amser Dwyrain Affrica</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<standard>Amser De Affrica</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<generic>Amser Gorllewin Affrica</generic>
-					<standard>Amser Safonol Gorllewin Affrica</standard>
-					<daylight>Amser Haf Gorllewin Affrica</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<generic>Amser Alaska</generic>
-					<standard>Amser Safonol Alaska</standard>
-					<daylight>Amser Haf Alaska</daylight>
-				</long>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<generic>Amser Amazonas</generic>
-					<standard>Amser Safonol Amazonas</standard>
-					<daylight>Amser Haf Amazonas</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>Amser Canolbarth Gogledd America</generic>
-					<standard>Amser Safonol Canolbarth Gogledd America</standard>
-					<daylight>Amser Haf Canolbarth Gogledd America</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>Amser Dwyrain Gogledd America</generic>
-					<standard>Amser Safonol Dwyrain Gogledd America</standard>
-					<daylight>Amser Haf Dwyrain Gogledd America</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>Amser Mynyddoedd Gogledd America</generic>
-					<standard>Amser Safonol Mynyddoedd Gogledd America</standard>
-					<daylight>Amser Haf Mynyddoedd Gogledd America</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>Amser Cefnfor Tawel Gogledd America</generic>
-					<standard>Amser Safonol Cefnfor Tawel Gogledd America</standard>
-					<daylight>Amser Haf Cefnfor Tawel Gogledd America</daylight>
-				</long>
-			</metazone>
-			<metazone type="Arabian">
-				<long>
-					<generic>Amser Arabaidd</generic>
-					<standard>Amser Safonol Arabaidd</standard>
-					<daylight>Amser Haf Arabaidd</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina">
-				<long>
-					<generic>Amser yr Ariannin</generic>
-					<standard>Amser Safonol Ariannin</standard>
-					<daylight>Amser Haf Ariannin</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina_Western">
-				<long>
-					<generic>Amser Gorllewin Ariannin</generic>
-					<standard>Amser Safonol Gorllewin Ariannin</standard>
-					<daylight>Amser Haf Gorllewin Ariannin</daylight>
-				</long>
-			</metazone>
-			<metazone type="Armenia">
-				<long>
-					<generic>Amser Armenia</generic>
-					<standard>Amser Safonol Armenia</standard>
-					<daylight>Amser Haf Armenia</daylight>
-				</long>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>Amser Cefnfor yr Iwerydd</generic>
-					<standard>Amser Safonol Cefnfor yr Iwerydd</standard>
-					<daylight>Amser Haf Cefnfor yr Iwerydd</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Central">
-				<long>
-					<generic>Amser Canolbarth Awstralia</generic>
-					<standard>Amser Safonol Canolbarth Awstralia</standard>
-					<daylight>Amser Haf Canolbarth Awstralia</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<long>
-					<generic>Amser Canolbarth Gorllewin Awstralia</generic>
-					<standard>Amser Safonol Canolbarth Gorllewin Awstralia</standard>
-					<daylight>Amser Haf Canolbarth Gorllewin Awstralia</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<long>
-					<generic>Amser Dwyrain Awstralia</generic>
-					<standard>Amser Safonol Dwyrain Awstralia</standard>
-					<daylight>Amser Haf Dwyrain Awstralia</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Western">
-				<long>
-					<generic>Amser Gorllewin Awstralia</generic>
-					<standard>Amser Safonol Gorllewin Awstralia</standard>
-					<daylight>Amser Haf Gorllewin Awstralia</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azerbaijan">
-				<long>
-					<generic>Amser Azerbaijan</generic>
-					<standard>Amser Safonol Azerbaijan</standard>
-					<daylight>Amser Haf Azerbaijan</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azores">
-				<long>
-					<generic>Amser Azores</generic>
-					<standard>Amser Safonol Azores</standard>
-					<daylight>Amser Haf Azores</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bangladesh">
-				<long>
-					<generic>Amser Bangladesh</generic>
-					<standard>Amser Safonol Bangladesh</standard>
-					<daylight>Amser Haf Bangladesh</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bhutan">
-				<long>
-					<standard>Amser Bhutan</standard>
-				</long>
-			</metazone>
-			<metazone type="Bolivia">
-				<long>
-					<standard>Amser Bolivia</standard>
-				</long>
-			</metazone>
-			<metazone type="Brasilia">
-				<long>
-					<generic>Amser Brasília</generic>
-					<standard>Amser Safonol Brasília</standard>
-					<daylight>Amser Haf Brasília</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brunei">
-				<long>
-					<standard>Amser Brunei Darussalam</standard>
-				</long>
-			</metazone>
-			<metazone type="Cape_Verde">
-				<long>
-					<generic>Amser Cabo Verde</generic>
-					<standard>Amser Safonol Cabo Verde</standard>
-					<daylight>Amser Haf Cabo Verde</daylight>
-				</long>
-			</metazone>
-			<metazone type="Chamorro">
-				<long>
-					<standard>Amser Chamorro</standard>
-				</long>
-			</metazone>
-			<metazone type="Chatham">
-				<long>
-					<generic>Amser Chatham</generic>
-					<standard>Amser Safonol Chatham</standard>
-					<daylight>Amser Haf Chatham</daylight>
-				</long>
-			</metazone>
-			<metazone type="Chile">
-				<long>
-					<generic>Amser Chile</generic>
-					<standard>Amser Safonol Chile</standard>
-					<daylight>Amser Haf Chile</daylight>
-				</long>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<generic>Amser Tsieina</generic>
-					<standard>Amser Safonol Tsieina</standard>
-					<daylight>Amser Haf Tsieina</daylight>
-				</long>
-			</metazone>
-			<metazone type="Choibalsan">
-				<long>
-					<generic>Amser Choibalsan</generic>
-					<standard>Amser Safonol Choibalsan</standard>
-					<daylight>Amser Haf Choibalsan</daylight>
-				</long>
-			</metazone>
-			<metazone type="Christmas">
-				<long>
-					<standard>Amser Ynys Christmas</standard>
-				</long>
-			</metazone>
-			<metazone type="Cocos">
-				<long>
-					<standard>Amser Ynysoedd Cocos</standard>
-				</long>
-			</metazone>
-			<metazone type="Colombia">
-				<long>
-					<generic>Amser Colombia</generic>
-					<standard>Amser Safonol Colombia</standard>
-					<daylight>Amser Haf Colombia</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cook">
-				<long>
-					<generic>Amser Ynysoedd Cook</generic>
-					<standard>Amser Safonol Ynysoedd Cook</standard>
-					<daylight>Amser Hanner Haf Ynysoedd Cook</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cuba">
-				<long>
-					<generic>Amser Cuba</generic>
-					<standard>Amser Safonol Cuba</standard>
-					<daylight>Amser Haf Cuba</daylight>
-				</long>
-			</metazone>
-			<metazone type="Davis">
-				<long>
-					<standard>Amser Davis</standard>
-				</long>
-			</metazone>
-			<metazone type="DumontDUrville">
-				<long>
-					<standard>Amser Dumont-d’Urville</standard>
-				</long>
-			</metazone>
-			<metazone type="East_Timor">
-				<long>
-					<standard>Amser Dwyrain Timor</standard>
-				</long>
-			</metazone>
-			<metazone type="Easter">
-				<long>
-					<generic>Amser Ynys y Pasg</generic>
-					<standard>Amser Safonol Ynys y Pasg</standard>
-					<daylight>Amser Haf Ynys y Pasg</daylight>
-				</long>
-			</metazone>
-			<metazone type="Ecuador">
-				<long>
-					<standard>Amser Ecuador</standard>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<generic>Amser Canolbarth Ewrop</generic>
-					<standard>Amser Safonol Canolbarth Ewrop</standard>
-					<daylight>Amser Haf Canolbarth Ewrop</daylight>
-				</long>
-				<short>
-					<generic>CET</generic>
-					<standard>CET</standard>
-					<daylight>CEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<generic>Amser Dwyrain Ewrop</generic>
-					<standard>Amser Safonol Dwyrain Ewrop</standard>
-					<daylight>Amser Haf Dwyrain Ewrop</daylight>
-				</long>
-				<short>
-					<generic>EET</generic>
-					<standard>EET</standard>
-					<daylight>EEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<generic>Amser Gorllewin Ewrop</generic>
-					<standard>Amser Safonol Gorllewin Ewrop</standard>
-					<daylight>Amser Haf Gorllewin Ewrop</daylight>
-				</long>
-				<short>
-					<generic>WET</generic>
-					<standard>WET</standard>
-					<daylight>WEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Falkland">
-				<long>
-					<generic>Amser Ynysoedd Falklands/Malvinas</generic>
-					<standard>Amser Safonol Ynysoedd Falklands/Malvinas</standard>
-					<daylight>Amser Haf Ynysoedd Falklands/Malvinas</daylight>
-				</long>
-			</metazone>
-			<metazone type="Fiji">
-				<long>
-					<generic>Amser Fiji</generic>
-					<standard>Amser Safonol Fiji</standard>
-					<daylight>Amser Haf Fiji</daylight>
-				</long>
-			</metazone>
-			<metazone type="French_Guiana">
-				<long>
-					<standard>Amser Guyane Ffrengig</standard>
-				</long>
-			</metazone>
-			<metazone type="French_Southern">
-				<long>
-					<standard>Amser Deheuol ac Antarctig Frengig</standard>
-				</long>
-			</metazone>
-			<metazone type="Galapagos">
-				<long>
-					<standard>Amser Galapagos</standard>
-				</long>
-			</metazone>
-			<metazone type="Gambier">
-				<long>
-					<standard>Amser Gambier</standard>
-				</long>
-			</metazone>
-			<metazone type="Georgia">
-				<long>
-					<generic>Amser Georgia</generic>
-					<standard>Amser Safonol Georgia</standard>
-					<daylight>Amser Haf Georgia</daylight>
-				</long>
-			</metazone>
-			<metazone type="Gilbert_Islands">
-				<long>
-					<standard>Amser Ynysoedd Gilbert</standard>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>Amser Safonol Greenwich</standard>
-				</long>
-				<short>
-					<standard>GMT</standard>
-				</short>
-			</metazone>
-			<metazone type="Greenland_Eastern">
-				<long>
-					<generic>Amser Dwyrain yr Ynys Las</generic>
-					<standard>Amser Safonol Dwyrain yr Ynys Las</standard>
-					<daylight>Amser Haf Dwyrain yr Ynys Las</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Western">
-				<long>
-					<generic>Amser Gorllewin yr Ynys Las</generic>
-					<standard>Amser Safonol Gorllewin yr Ynys Las</standard>
-					<daylight>Amser Haf Gorllewin yr Ynys Las</daylight>
-				</long>
-			</metazone>
-			<metazone type="Gulf">
-				<long>
-					<standard>Amser y Gwlff</standard>
-				</long>
-			</metazone>
-			<metazone type="Guyana">
-				<long>
-					<standard>Amser Guyana</standard>
-				</long>
-			</metazone>
-			<metazone type="Hawaii_Aleutian">
-				<long>
-					<generic>Amser Hawaii-Aleutian</generic>
-					<standard>Amser Safonol Hawaii-Aleutian</standard>
-					<daylight>Amser Haf Hawaii-Aleutian</daylight>
-				</long>
-			</metazone>
-			<metazone type="Hong_Kong">
-				<long>
-					<generic>Amser Hong Kong</generic>
-					<standard>Amser Safonol Hong Kong</standard>
-					<daylight>Amser Haf Hong Kong</daylight>
-				</long>
-			</metazone>
-			<metazone type="Hovd">
-				<long>
-					<generic>Amser Hovd</generic>
-					<standard>Amser Safonol Hovd</standard>
-					<daylight>Amser Haf Hovd</daylight>
-				</long>
-			</metazone>
-			<metazone type="India">
-				<long>
-					<standard>Amser India</standard>
-				</long>
-			</metazone>
-			<metazone type="Indian_Ocean">
-				<long>
-					<standard>Amser Cefnfor India</standard>
-				</long>
-			</metazone>
-			<metazone type="Indochina">
-				<long>
-					<standard>Amser Indo-Tsieina</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<long>
-					<standard>Amser Canolbarth Indonesia</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<long>
-					<standard>Amser Dwyrain Indonesia</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<long>
-					<standard>Amser Gorllewin Indonesia</standard>
-				</long>
-			</metazone>
-			<metazone type="Iran">
-				<long>
-					<generic>Amser Iran</generic>
-					<standard>Amser Safonol Iran</standard>
-					<daylight>Amser Haf Iran</daylight>
-				</long>
-			</metazone>
-			<metazone type="Irkutsk">
-				<long>
-					<generic>Amser Irkutsk</generic>
-					<standard>Amser Safonol Irkutsk</standard>
-					<daylight>Amser Haf Irkutsk</daylight>
-				</long>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<generic>Amser Israel</generic>
-					<standard>Amser Safonol Israel</standard>
-					<daylight>Amser Haf Israel</daylight>
-				</long>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<generic>Amser Japan</generic>
-					<standard>Amser Safonol Japan</standard>
-					<daylight>Amser Haf Japan</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Eastern">
-				<long>
-					<standard>Amser Dwyrain Kazakstan</standard>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Western">
-				<long>
-					<standard>Amser Gorllewin Kazakstan</standard>
-				</long>
-			</metazone>
-			<metazone type="Korea">
-				<long>
-					<generic>Amser Korea</generic>
-					<standard>Amser Safonol Corea</standard>
-					<daylight>Amser Haf Korea</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kosrae">
-				<long>
-					<standard>Amser Kosrae</standard>
-				</long>
-			</metazone>
-			<metazone type="Krasnoyarsk">
-				<long>
-					<generic>Amser Krasnoyarsk</generic>
-					<standard>Amser Safonol Krasnoyarsk</standard>
-					<daylight>Amser Haf Krasnoyarsk</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kyrgystan">
-				<long>
-					<standard>Amser Kyrgyzstan</standard>
-				</long>
-			</metazone>
-			<metazone type="Line_Islands">
-				<long>
-					<standard>Amser Ynysoedd Line</standard>
-				</long>
-			</metazone>
-			<metazone type="Lord_Howe">
-				<long>
-					<generic>Amser yr Arglwydd Howe</generic>
-					<standard>Amser Safonol yr Arglwydd Howe</standard>
-					<daylight>Amser Haf yr Arglwydd Howe</daylight>
-				</long>
-			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Amser Ynys Macquarie</standard>
-				</long>
-			</metazone>
-			<metazone type="Magadan">
-				<long>
-					<generic>Amser Magadan</generic>
-					<standard>Amser Safonol Magadan</standard>
-					<daylight>Amser Haf Magadan</daylight>
-				</long>
-			</metazone>
-			<metazone type="Malaysia">
-				<long>
-					<standard>Amser Malaysia</standard>
-				</long>
-			</metazone>
-			<metazone type="Maldives">
-				<long>
-					<standard>Amser Y Maldives</standard>
-				</long>
-			</metazone>
-			<metazone type="Marquesas">
-				<long>
-					<standard>Amser Marquises</standard>
-				</long>
-			</metazone>
-			<metazone type="Marshall_Islands">
-				<long>
-					<standard>Amser Ynysoedd Marshall</standard>
-				</long>
-			</metazone>
-			<metazone type="Mauritius">
-				<long>
-					<generic>Amser Mauritius</generic>
-					<standard>Amser Safonol Mauritius</standard>
-					<daylight>Amser Haf Mauritius</daylight>
-				</long>
-			</metazone>
-			<metazone type="Mawson">
-				<long>
-					<standard>Amser Mawson</standard>
-				</long>
-			</metazone>
-			<metazone type="Mongolia">
-				<long>
-					<generic>Amser Ulan Bator</generic>
-					<standard>Amser Safonol Ulan Bator</standard>
-					<daylight>Amser Haf Ulan Bator</daylight>
-				</long>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>Amser Moskfa</generic>
-					<standard>Amser Safonol Moskfa</standard>
-					<daylight>Amser Haf Moskfa</daylight>
-				</long>
-			</metazone>
-			<metazone type="Myanmar">
-				<long>
-					<standard>Amser Myanmar</standard>
-				</long>
-			</metazone>
-			<metazone type="Nauru">
-				<long>
-					<standard>Amser Nauru</standard>
-				</long>
-			</metazone>
-			<metazone type="Nepal">
-				<long>
-					<standard>Amser Nepal</standard>
-				</long>
-			</metazone>
-			<metazone type="New_Caledonia">
-				<long>
-					<generic>Amser Caledonia Newydd</generic>
-					<standard>Amser Safonol Caledonia Newydd</standard>
-					<daylight>Amser Haf Caledonia Newydd</daylight>
-				</long>
-			</metazone>
-			<metazone type="New_Zealand">
-				<long>
-					<generic>Amser Seland Newydd</generic>
-					<standard>Amser Safonol Seland Newydd</standard>
-					<daylight>Amser Haf Seland Newydd</daylight>
-				</long>
-			</metazone>
-			<metazone type="Newfoundland">
-				<long>
-					<generic>Amser Newfoundland</generic>
-					<standard>Amser Safonol Newfoundland</standard>
-					<daylight>Amser Haf Newfoundland</daylight>
-				</long>
-			</metazone>
-			<metazone type="Niue">
-				<long>
-					<standard>Amser Niue</standard>
-				</long>
-			</metazone>
-			<metazone type="Norfolk">
-				<long>
-					<standard>Amser Ynys Norfolk</standard>
-				</long>
-			</metazone>
-			<metazone type="Noronha">
-				<long>
-					<generic>Amser Fernando de Noronha</generic>
-					<standard>Amser Safonol Fernando de Noronha</standard>
-					<daylight>Amser Haf Fernando de Noronha</daylight>
-				</long>
-			</metazone>
-			<metazone type="Novosibirsk">
-				<long>
-					<generic>Amser Novosibirsk</generic>
-					<standard>Amser Safonol Novosibirsk</standard>
-					<daylight>Amser Haf Novosibirsk</daylight>
-				</long>
-			</metazone>
-			<metazone type="Omsk">
-				<long>
-					<generic>Amser Omsk</generic>
-					<standard>Amser Safonol Omsk</standard>
-					<daylight>Amser Haf Omsk</daylight>
-				</long>
-			</metazone>
-			<metazone type="Pakistan">
-				<long>
-					<generic>Amser Pacistan</generic>
-					<standard>Amser Safonol Pakistan</standard>
-					<daylight>Amser Haf Pakistan</daylight>
-				</long>
-			</metazone>
-			<metazone type="Palau">
-				<long>
-					<standard>Amser Palau</standard>
-				</long>
-			</metazone>
-			<metazone type="Papua_New_Guinea">
-				<long>
-					<standard>Amser Papua Guinea Newydd</standard>
-				</long>
-			</metazone>
-			<metazone type="Paraguay">
-				<long>
-					<generic>Amser Paraguay</generic>
-					<standard>Amser Safonol Paraguay</standard>
-					<daylight>Amser Haf Paraguay</daylight>
-				</long>
-			</metazone>
-			<metazone type="Peru">
-				<long>
-					<generic>Amser Periw</generic>
-					<standard>Amser Safonol Periw</standard>
-					<daylight>Amser Haf Periw</daylight>
-				</long>
-			</metazone>
-			<metazone type="Philippines">
-				<long>
-					<generic>Amser Pilipinas</generic>
-					<standard>Amser Safonol Pilipinas</standard>
-					<daylight>Amser Haf Pilipinas</daylight>
-				</long>
-			</metazone>
-			<metazone type="Phoenix_Islands">
-				<long>
-					<standard>Amser Ynysoedd Phoenix</standard>
-				</long>
-			</metazone>
-			<metazone type="Pierre_Miquelon">
-				<long>
-					<generic>Amser Saint-Pierre-et-Miquelon</generic>
-					<standard>Amser Safonol Saint-Pierre-et-Miquelon</standard>
-					<daylight>Amser Haf Saint-Pierre-et-Miquelon</daylight>
-				</long>
-			</metazone>
-			<metazone type="Pitcairn">
-				<long>
-					<standard>Amser Pitcairn</standard>
-				</long>
-			</metazone>
-			<metazone type="Ponape">
-				<long>
-					<standard>Amser Pohnpei</standard>
-				</long>
-			</metazone>
-			<metazone type="Reunion">
-				<long>
-					<standard>Amser Réunion</standard>
-				</long>
-			</metazone>
-			<metazone type="Rothera">
-				<long>
-					<standard>Amser Rothera</standard>
-				</long>
-			</metazone>
-			<metazone type="Sakhalin">
-				<long>
-					<generic>Amser Sakhalin</generic>
-					<standard>Amser Safonol Sakhalin</standard>
-					<daylight>Amser Haf Sakhalin</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samoa">
-				<long>
-					<generic>Amser Samoa</generic>
-					<standard>Amser Safonol Samoa</standard>
-					<daylight>Amser Haf Samoa</daylight>
-				</long>
-			</metazone>
-			<metazone type="Seychelles">
-				<long>
-					<standard>Amser Seychelles</standard>
-				</long>
-			</metazone>
-			<metazone type="Singapore">
-				<long>
-					<standard>Amser Singapore</standard>
-				</long>
-			</metazone>
-			<metazone type="Solomon">
-				<long>
-					<standard>Amser Ynysoedd Solomon</standard>
-				</long>
-			</metazone>
-			<metazone type="South_Georgia">
-				<long>
-					<standard>Amser De Georgia</standard>
-				</long>
-			</metazone>
-			<metazone type="Suriname">
-				<long>
-					<standard>Amser Suriname</standard>
-				</long>
-			</metazone>
-			<metazone type="Syowa">
-				<long>
-					<standard>Amser Syowa</standard>
-				</long>
-			</metazone>
-			<metazone type="Tahiti">
-				<long>
-					<standard>Amser Tahiti</standard>
-				</long>
-			</metazone>
-			<metazone type="Taipei">
-				<long>
-					<generic>Amser Taibei</generic>
-					<standard>Amser Safonol Taibei</standard>
-					<daylight>Amser Haf Taibei</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tajikistan">
-				<long>
-					<standard>Amser Tajikistan</standard>
-				</long>
-			</metazone>
-			<metazone type="Tokelau">
-				<long>
-					<standard>Amser Tokelau</standard>
-				</long>
-			</metazone>
-			<metazone type="Tonga">
-				<long>
-					<generic>Amser Tonga</generic>
-					<standard>Amser Safonol Tonga</standard>
-					<daylight>Amser Haf Tonga</daylight>
-				</long>
-			</metazone>
-			<metazone type="Truk">
-				<long>
-					<standard>Amser Chuuk</standard>
-				</long>
-			</metazone>
-			<metazone type="Turkmenistan">
-				<long>
-					<generic>Amser Turkmenistan</generic>
-					<standard>Amser Safonol Turkmenistan</standard>
-					<daylight>Amser Haf Turkmenistan</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tuvalu">
-				<long>
-					<standard>Amser Tuvalu</standard>
-				</long>
-			</metazone>
-			<metazone type="Uruguay">
-				<long>
-					<generic>Amser Uruguay</generic>
-					<standard>Amser Safonol Uruguay</standard>
-					<daylight>Amser Haf Uruguay</daylight>
-				</long>
-			</metazone>
-			<metazone type="Uzbekistan">
-				<long>
-					<generic>Amser Uzbekistan</generic>
-					<standard>Amser Safonol Uzbekistan</standard>
-					<daylight>Amser Haf Uzbekistan</daylight>
-				</long>
-			</metazone>
-			<metazone type="Vanuatu">
-				<long>
-					<generic>Amser Vanuatu</generic>
-					<standard>Amser Safonol Vanuatu</standard>
-					<daylight>Amser Haf Vanuatu</daylight>
-				</long>
-			</metazone>
-			<metazone type="Venezuela">
-				<long>
-					<standard>Amser Venezuela</standard>
-				</long>
-			</metazone>
-			<metazone type="Vladivostok">
-				<long>
-					<generic>Amser Vladivostok</generic>
-					<standard>Amser Safonol Vladivostok</standard>
-					<daylight>Amser Haf Vladivostok</daylight>
-				</long>
-			</metazone>
-			<metazone type="Volgograd">
-				<long>
-					<generic>Amser Volgograd</generic>
-					<standard>Amser Safonol Volgograd</standard>
-					<daylight>Amser Haf Volgograd</daylight>
-				</long>
-			</metazone>
-			<metazone type="Vostok">
-				<long>
-					<standard>Amser Vostok</standard>
-				</long>
-			</metazone>
-			<metazone type="Wake">
-				<long>
-					<standard>Amser Ynys Wake</standard>
-				</long>
-			</metazone>
-			<metazone type="Wallis">
-				<long>
-					<standard>Amser Wallis a Futuna</standard>
-				</long>
-			</metazone>
-			<metazone type="Yakutsk">
-				<long>
-					<generic>Amser Yakutsk</generic>
-					<standard>Amser Safonol Yakutsk</standard>
-					<daylight>Amser Haf Yakutsk</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yekaterinburg">
-				<long>
-					<generic>Amser Yekaterinburg</generic>
-					<standard>Amser Safonol Yekaterinburg</standard>
-					<daylight>Amser Haf Yekaterinburg</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<defaultNumberingSystem draft="contributed">latn</defaultNumberingSystem>
-		<otherNumberingSystems>
-			<native draft="contributed">latn</native>
-		</otherNumberingSystems>
-		<symbols numberSystem="latn">
-			<decimal>.</decimal>
-			<group>,</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<superscriptingExponent>x</superscriptingExponent>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats numberSystem="latn">
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-			<decimalFormatLength type="long">
-				<decimalFormat>
-					<pattern type="1000" count="zero">0 mil</pattern>
-					<pattern type="1000" count="one">0 fil</pattern>
-					<pattern type="1000" count="two">0 fil</pattern>
-					<pattern type="1000" count="few">0 mil</pattern>
-					<pattern type="1000" count="many">0 mil</pattern>
-					<pattern type="1000" count="other">0 mil</pattern>
-					<pattern type="10000" count="zero">00 mil</pattern>
-					<pattern type="10000" count="one">00 mil</pattern>
-					<pattern type="10000" count="two">00 mil</pattern>
-					<pattern type="10000" count="few">00 mil</pattern>
-					<pattern type="10000" count="many">00 mil</pattern>
-					<pattern type="10000" count="other">00 mil</pattern>
-					<pattern type="100000" count="zero">000 mil</pattern>
-					<pattern type="100000" count="one">000 mil</pattern>
-					<pattern type="100000" count="two">000 mil</pattern>
-					<pattern type="100000" count="few">000 mil</pattern>
-					<pattern type="100000" count="many">000 mil</pattern>
-					<pattern type="100000" count="other">000 mil</pattern>
-					<pattern type="1000000" count="zero">0 miliwn</pattern>
-					<pattern type="1000000" count="one">0 filiwn</pattern>
-					<pattern type="1000000" count="two">0 filiwn</pattern>
-					<pattern type="1000000" count="few">0 miliwn</pattern>
-					<pattern type="1000000" count="many">0 miliwn</pattern>
-					<pattern type="1000000" count="other">0 miliwn</pattern>
-					<pattern type="10000000" count="zero">00 miliwn</pattern>
-					<pattern type="10000000" count="one">00 miliwn</pattern>
-					<pattern type="10000000" count="two">00 miliwn</pattern>
-					<pattern type="10000000" count="few">00 miliwn</pattern>
-					<pattern type="10000000" count="many">00 miliwn</pattern>
-					<pattern type="10000000" count="other">00 miliwn</pattern>
-					<pattern type="100000000" count="zero">000 miliwn</pattern>
-					<pattern type="100000000" count="one">000 miliwn</pattern>
-					<pattern type="100000000" count="two">000 miliwn</pattern>
-					<pattern type="100000000" count="few">000 miliwn</pattern>
-					<pattern type="100000000" count="many">000 miliwn</pattern>
-					<pattern type="100000000" count="other">000 miliwn</pattern>
-					<pattern type="1000000000" count="zero">0 biliwn</pattern>
-					<pattern type="1000000000" count="one">0 biliwn</pattern>
-					<pattern type="1000000000" count="two">0 biliwn</pattern>
-					<pattern type="1000000000" count="few">0 biliwn</pattern>
-					<pattern type="1000000000" count="many">0 biliwn</pattern>
-					<pattern type="1000000000" count="other">0 biliwn</pattern>
-					<pattern type="10000000000" count="zero">00 biliwn</pattern>
-					<pattern type="10000000000" count="one">00 biliwn</pattern>
-					<pattern type="10000000000" count="two">00 biliwn</pattern>
-					<pattern type="10000000000" count="few">00 biliwn</pattern>
-					<pattern type="10000000000" count="many">00 biliwn</pattern>
-					<pattern type="10000000000" count="other">00 biliwn</pattern>
-					<pattern type="100000000000" count="zero">000 biliwn</pattern>
-					<pattern type="100000000000" count="one">000 biliwn</pattern>
-					<pattern type="100000000000" count="two">000 biliwn</pattern>
-					<pattern type="100000000000" count="few">000 biliwn</pattern>
-					<pattern type="100000000000" count="many">000 biliwn</pattern>
-					<pattern type="100000000000" count="other">000 biliwn</pattern>
-					<pattern type="1000000000000" count="zero">0 triliwn</pattern>
-					<pattern type="1000000000000" count="one">0 triliwn</pattern>
-					<pattern type="1000000000000" count="two">0 driliwn</pattern>
-					<pattern type="1000000000000" count="few">0 thriliwn</pattern>
-					<pattern type="1000000000000" count="many">0 thriliwn</pattern>
-					<pattern type="1000000000000" count="other">0 triliwn</pattern>
-					<pattern type="10000000000000" count="zero">00 triliwn</pattern>
-					<pattern type="10000000000000" count="one">00 triliwn</pattern>
-					<pattern type="10000000000000" count="two">00 triliwn</pattern>
-					<pattern type="10000000000000" count="few">00 triliwn</pattern>
-					<pattern type="10000000000000" count="many">00 triliwn</pattern>
-					<pattern type="10000000000000" count="other">00 triliwn</pattern>
-					<pattern type="100000000000000" count="zero">000 triliwn</pattern>
-					<pattern type="100000000000000" count="one">000 triliwn</pattern>
-					<pattern type="100000000000000" count="two">000 triliwn</pattern>
-					<pattern type="100000000000000" count="few">000 triliwn</pattern>
-					<pattern type="100000000000000" count="many">000 triliwn</pattern>
-					<pattern type="100000000000000" count="other">000 triliwn</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-			<decimalFormatLength type="short">
-				<decimalFormat>
-					<pattern type="1000" count="zero">0K</pattern>
-					<pattern type="1000" count="one">0K</pattern>
-					<pattern type="1000" count="two">0K</pattern>
-					<pattern type="1000" count="few">0K</pattern>
-					<pattern type="1000" count="many">0K</pattern>
-					<pattern type="1000" count="other">0K</pattern>
-					<pattern type="10000" count="zero">00K</pattern>
-					<pattern type="10000" count="one">00K</pattern>
-					<pattern type="10000" count="two">00K</pattern>
-					<pattern type="10000" count="few">00K</pattern>
-					<pattern type="10000" count="many">00K</pattern>
-					<pattern type="10000" count="other">00K</pattern>
-					<pattern type="100000" count="zero">000K</pattern>
-					<pattern type="100000" count="one">000K</pattern>
-					<pattern type="100000" count="two">000K</pattern>
-					<pattern type="100000" count="few">000K</pattern>
-					<pattern type="100000" count="many">000K</pattern>
-					<pattern type="100000" count="other">000K</pattern>
-					<pattern type="1000000" count="zero">0M</pattern>
-					<pattern type="1000000" count="one">0M</pattern>
-					<pattern type="1000000" count="two">0M</pattern>
-					<pattern type="1000000" count="few">0M</pattern>
-					<pattern type="1000000" count="many">0M</pattern>
-					<pattern type="1000000" count="other">0M</pattern>
-					<pattern type="10000000" count="zero">00M</pattern>
-					<pattern type="10000000" count="one">00M</pattern>
-					<pattern type="10000000" count="two">00M</pattern>
-					<pattern type="10000000" count="few">00M</pattern>
-					<pattern type="10000000" count="many">00M</pattern>
-					<pattern type="10000000" count="other">00M</pattern>
-					<pattern type="100000000" count="zero">000M</pattern>
-					<pattern type="100000000" count="one">000M</pattern>
-					<pattern type="100000000" count="two">000M</pattern>
-					<pattern type="100000000" count="few">000M</pattern>
-					<pattern type="100000000" count="many">000M</pattern>
-					<pattern type="100000000" count="other">000M</pattern>
-					<pattern type="1000000000" count="zero">0B</pattern>
-					<pattern type="1000000000" count="one">0B</pattern>
-					<pattern type="1000000000" count="two">0B</pattern>
-					<pattern type="1000000000" count="few">0B</pattern>
-					<pattern type="1000000000" count="many">0B</pattern>
-					<pattern type="1000000000" count="other">0B</pattern>
-					<pattern type="10000000000" count="zero">00B</pattern>
-					<pattern type="10000000000" count="one">00B</pattern>
-					<pattern type="10000000000" count="two">00B</pattern>
-					<pattern type="10000000000" count="few">00B</pattern>
-					<pattern type="10000000000" count="many">00B</pattern>
-					<pattern type="10000000000" count="other">00B</pattern>
-					<pattern type="100000000000" count="zero">000B</pattern>
-					<pattern type="100000000000" count="one">000B</pattern>
-					<pattern type="100000000000" count="two">000B</pattern>
-					<pattern type="100000000000" count="few">000B</pattern>
-					<pattern type="100000000000" count="many">000B</pattern>
-					<pattern type="100000000000" count="other">000B</pattern>
-					<pattern type="1000000000000" count="zero">0T</pattern>
-					<pattern type="1000000000000" count="one">0T</pattern>
-					<pattern type="1000000000000" count="two">0T</pattern>
-					<pattern type="1000000000000" count="few">0T</pattern>
-					<pattern type="1000000000000" count="many">0T</pattern>
-					<pattern type="1000000000000" count="other">0T</pattern>
-					<pattern type="10000000000000" count="zero">00T</pattern>
-					<pattern type="10000000000000" count="one">00T</pattern>
-					<pattern type="10000000000000" count="two">00T</pattern>
-					<pattern type="10000000000000" count="few">00T</pattern>
-					<pattern type="10000000000000" count="many">00T</pattern>
-					<pattern type="10000000000000" count="other">00T</pattern>
-					<pattern type="100000000000000" count="zero">000T</pattern>
-					<pattern type="100000000000000" count="one">000T</pattern>
-					<pattern type="100000000000000" count="two">000T</pattern>
-					<pattern type="100000000000000" count="few">000T</pattern>
-					<pattern type="100000000000000" count="many">000T</pattern>
-					<pattern type="100000000000000" count="other">000T</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats numberSystem="latn">
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats numberSystem="latn">
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats numberSystem="latn">
-			<currencyFormatLength>
-				<currencyFormat type="standard">
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-				<currencyFormat type="accounting">
-					<pattern draft="unconfirmed">¤#,##0.00;(¤#,##0.00)</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="zero">{0} {1}</unitPattern>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="two">{0} {1}</unitPattern>
-			<unitPattern count="few">{0} {1}</unitPattern>
-			<unitPattern count="many">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="AED">
-				<displayName>Dirham Yr Emiradau Arabaidd Unedig</displayName>
-				<displayName count="zero">Dirham Yr Emiradau Arabaidd Unedig</displayName>
-				<displayName count="one">Dirham Yr Emiradau Arabaidd Unedig</displayName>
-				<displayName count="two">Dirham Yr Emiradau Arabaidd Unedig</displayName>
-				<displayName count="few">Dirham Yr Emiradau Arabaidd Unedig</displayName>
-				<displayName count="many">Dirham Yr Emiradau Arabaidd Unedig</displayName>
-				<displayName count="other">Dirham Yr Emiradau Arabaidd Unedig</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>Afghani Afghanistan</displayName>
-				<displayName count="zero">Afghani Afghanistan</displayName>
-				<displayName count="one">Afghani Afghanistan</displayName>
-				<displayName count="two">Afghani Afghanistan</displayName>
-				<displayName count="few">Afghani Afghanistan</displayName>
-				<displayName count="many">Afghani Afghanistan</displayName>
-				<displayName count="other">Afghani Afghanistan</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>Lek Albania</displayName>
-				<displayName count="zero">Lek Albania</displayName>
-				<displayName count="one">Lek Albania</displayName>
-				<displayName count="two">Lek Albania</displayName>
-				<displayName count="few">Lek Albania</displayName>
-				<displayName count="many">Lek Albania</displayName>
-				<displayName count="other">Lek Albania</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>Dram Armenia</displayName>
-				<displayName count="zero">Dram Armenia</displayName>
-				<displayName count="one">Dram Armenia</displayName>
-				<displayName count="two">Dram Armenia</displayName>
-				<displayName count="few">Dram Armenia</displayName>
-				<displayName count="many">Dram Armenia</displayName>
-				<displayName count="other">Dram Armenia</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>Guilder Antilles yr Iseldiroedd</displayName>
-				<displayName count="zero">Guilder Antilles yr Iseldiroedd</displayName>
-				<displayName count="one">Guilder Antilles yr Iseldiroedd</displayName>
-				<displayName count="two">Guilder Antilles yr Iseldiroedd</displayName>
-				<displayName count="few">Guilder Antilles yr Iseldiroedd</displayName>
-				<displayName count="many">Guilder Antilles yr Iseldiroedd</displayName>
-				<displayName count="other">Guilder Antilles yr Iseldiroedd</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>Kwanza Angola</displayName>
-				<displayName count="zero">Kwanza Angola</displayName>
-				<displayName count="one">Kwanza Angola</displayName>
-				<displayName count="two">Kwanza Angola</displayName>
-				<displayName count="few">Kwanza Angola</displayName>
-				<displayName count="many">Kwanza Angola</displayName>
-				<displayName count="other">Kwanza Angola</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>Peso yr Ariannin</displayName>
-				<displayName count="zero">Peso yr Ariannin</displayName>
-				<displayName count="one">Peso yr Ariannin</displayName>
-				<displayName count="two">Peso yr Ariannin</displayName>
-				<displayName count="few">Peso yr Ariannin</displayName>
-				<displayName count="many">Peso yr Ariannin</displayName>
-				<displayName count="other">Peso yr Ariannin</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>Doler Awstralia</displayName>
-				<displayName count="zero">Doler Awstralia</displayName>
-				<displayName count="one">Doler Awstralia</displayName>
-				<displayName count="two">Doler Awstralia</displayName>
-				<displayName count="few">Doler Awstralia</displayName>
-				<displayName count="many">Doler Awstralia</displayName>
-				<displayName count="other">Doler Awstralia</displayName>
-				<symbol>A$</symbol>
-			</currency>
-			<currency type="AWG">
-				<displayName>Fflorin Aruba</displayName>
-				<displayName count="zero">Fflorin Aruba</displayName>
-				<displayName count="one">Fflorin Aruba</displayName>
-				<displayName count="two">Fflorin Aruba</displayName>
-				<displayName count="few">Fflorin Aruba</displayName>
-				<displayName count="many">Fflorin Aruba</displayName>
-				<displayName count="other">Fflorin Aruba</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>Manat Azerbaijan</displayName>
-				<displayName count="zero">Manat Azerbaijan</displayName>
-				<displayName count="one">Manat Azerbaijan</displayName>
-				<displayName count="two">Manat Azerbaijan</displayName>
-				<displayName count="few">Manat Azerbaijan</displayName>
-				<displayName count="many">Manat Azerbaijan</displayName>
-				<displayName count="other">Manat Azerbaijan</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Marc Trosadwy Bosnia a Hercegovina</displayName>
-				<displayName count="zero">Marc Trosadwy Bosnia a Hercegovina</displayName>
-				<displayName count="one">Marc Trosadwy Bosnia a Hercegovina</displayName>
-				<displayName count="two">Marc Trosadwy Bosnia a Hercegovina</displayName>
-				<displayName count="few">Marc Trosadwy Bosnia a Hercegovina</displayName>
-				<displayName count="many">Marc Trosadwy Bosnia a Hercegovina</displayName>
-				<displayName count="other">Marc Trosadwy Bosnia a Hercegovina</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>Doler Barbados</displayName>
-				<displayName count="zero">Doler Barbados</displayName>
-				<displayName count="one">Doler Barbados</displayName>
-				<displayName count="two">Doler Barbados</displayName>
-				<displayName count="few">Doler Barbados</displayName>
-				<displayName count="many">Doler Barbados</displayName>
-				<displayName count="other">Doler Barbados</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>Taka Bangladesh</displayName>
-				<displayName count="zero">Taka Bangladesh</displayName>
-				<displayName count="one">Taka Bangladesh</displayName>
-				<displayName count="two">Taka Bangladesh</displayName>
-				<displayName count="few">Taka Bangladesh</displayName>
-				<displayName count="many">Taka Bangladesh</displayName>
-				<displayName count="other">Taka Bangladesh</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Lev Bwlgaria</displayName>
-				<displayName count="zero">Lev Bwlgaria</displayName>
-				<displayName count="one">Lev Bwlgaria</displayName>
-				<displayName count="two">Lev Bwlgaria</displayName>
-				<displayName count="few">Lev Bwlgaria</displayName>
-				<displayName count="many">Lev Bwlgaria</displayName>
-				<displayName count="other">Lev Bwlgaria</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>Dinar Bahrain</displayName>
-				<displayName count="zero">Dinar Bahrain</displayName>
-				<displayName count="one">Dinar Bahrain</displayName>
-				<displayName count="two">Dinar Bahrain</displayName>
-				<displayName count="few">Dinar Bahrain</displayName>
-				<displayName count="many">Dinar Bahrain</displayName>
-				<displayName count="other">Dinar Bahrain</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>Ffranc Burundi</displayName>
-				<displayName count="zero">Ffranc Burundi</displayName>
-				<displayName count="one">Ffranc Burundi</displayName>
-				<displayName count="two">Ffranc Burundi</displayName>
-				<displayName count="few">Ffranc Burundi</displayName>
-				<displayName count="many">Ffranc Burundi</displayName>
-				<displayName count="other">Ffranc Burundi</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>Doler Bermuda</displayName>
-				<displayName count="zero">Doler Bermuda</displayName>
-				<displayName count="one">Doler Bermuda</displayName>
-				<displayName count="two">Doler Bermuda</displayName>
-				<displayName count="few">Doler Bermuda</displayName>
-				<displayName count="many">Doler Bermuda</displayName>
-				<displayName count="other">Doler Bermuda</displayName>
-				<symbol>BMD</symbol>
-			</currency>
-			<currency type="BND">
-				<displayName>Doler Brunei</displayName>
-				<displayName count="zero">Doler Brunei</displayName>
-				<displayName count="one">Doler Brunei</displayName>
-				<displayName count="two">Doler Brunei</displayName>
-				<displayName count="few">Doler Brunei</displayName>
-				<displayName count="many">Doler Brunei</displayName>
-				<displayName count="other">Doler Brunei</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>Boliviano Bolifia</displayName>
-				<displayName count="zero">Boliviano Bolifia</displayName>
-				<displayName count="one">Boliviano Bolifia</displayName>
-				<displayName count="two">Boliviano Bolifia</displayName>
-				<displayName count="few">Boliviano Bolifia</displayName>
-				<displayName count="many">Boliviano Bolifia</displayName>
-				<displayName count="other">Boliviano Bolifia</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Real Brasil</displayName>
-				<displayName count="zero">Real Brasil</displayName>
-				<displayName count="one">Real Brasil</displayName>
-				<displayName count="two">Real Brasil</displayName>
-				<displayName count="few">Real Brasil</displayName>
-				<displayName count="many">Real Brasil</displayName>
-				<displayName count="other">Real Brasil</displayName>
-				<symbol>R$</symbol>
-			</currency>
-			<currency type="BSD">
-				<displayName>Doler y Bahamas</displayName>
-				<displayName count="zero">Doler y Bahamas</displayName>
-				<displayName count="one">Doler y Bahamas</displayName>
-				<displayName count="two">Doler y Bahamas</displayName>
-				<displayName count="few">Doler y Bahamas</displayName>
-				<displayName count="many">Doler y Bahamas</displayName>
-				<displayName count="other">Doler y Bahamas</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>Ngultrum Bhutan</displayName>
-				<displayName count="zero">Ngultrum Bhutan</displayName>
-				<displayName count="one">Ngultrum Bhutan</displayName>
-				<displayName count="two">Ngultrum Bhutan</displayName>
-				<displayName count="few">Ngultrum Bhutan</displayName>
-				<displayName count="many">Ngultrum Bhutan</displayName>
-				<displayName count="other">Ngultrum Bhutan</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>Pula Botswana</displayName>
-				<displayName count="zero">Pula Botswana</displayName>
-				<displayName count="one">Pula Botswana</displayName>
-				<displayName count="two">Pula Botswana</displayName>
-				<displayName count="few">Pula Botswana</displayName>
-				<displayName count="many">Pula Botswana</displayName>
-				<displayName count="other">Pula Botswana</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>Rwbl Belarws</displayName>
-				<displayName count="zero">Rwbl Belarws</displayName>
-				<displayName count="one">Rwbl Belarws</displayName>
-				<displayName count="two">Rwbl Belarws</displayName>
-				<displayName count="few">Rwbl Belarws</displayName>
-				<displayName count="many">Rwbl Belarws</displayName>
-				<displayName count="other">Rwbl Belarws</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>Doler Belize</displayName>
-				<displayName count="zero">Doler Belize</displayName>
-				<displayName count="one">Doler Belize</displayName>
-				<displayName count="two">Doler Belize</displayName>
-				<displayName count="few">Doler Belize</displayName>
-				<displayName count="many">Doler Belize</displayName>
-				<displayName count="other">Doler Belize</displayName>
-				<symbol>BZD</symbol>
-			</currency>
-			<currency type="CAD">
-				<displayName>Doler Canada</displayName>
-				<displayName count="zero">Doler Canada</displayName>
-				<displayName count="one">Doler Canada</displayName>
-				<displayName count="two">Doler Canada</displayName>
-				<displayName count="few">Doler Canada</displayName>
-				<displayName count="many">Doler Canada</displayName>
-				<displayName count="other">Doler Canada</displayName>
-				<symbol>CA$</symbol>
-			</currency>
-			<currency type="CDF">
-				<displayName>Ffranc Congo</displayName>
-				<displayName count="zero">Ffranc Congo</displayName>
-				<displayName count="one">Ffranc Congo</displayName>
-				<displayName count="two">Ffranc Congo</displayName>
-				<displayName count="few">Ffranc Congo</displayName>
-				<displayName count="many">Ffranc Congo</displayName>
-				<displayName count="other">Ffranc Congo</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Ffranc y Swistir</displayName>
-				<displayName count="zero">Ffranc y Swistir</displayName>
-				<displayName count="one">Ffranc y Swistir</displayName>
-				<displayName count="two">Ffranc y Swistir</displayName>
-				<displayName count="few">Ffranc y Swistir</displayName>
-				<displayName count="many">Ffranc y Swistir</displayName>
-				<displayName count="other">Ffranc y Swistir</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Peso Chile</displayName>
-				<displayName count="zero">Peso Chile</displayName>
-				<displayName count="one">Peso Chile</displayName>
-				<displayName count="two">Peso Chile</displayName>
-				<displayName count="few">Peso Chile</displayName>
-				<displayName count="many">Peso Chile</displayName>
-				<displayName count="other">Peso Chile</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Yuan Tsieina</displayName>
-				<displayName count="zero">Yuan Tsieina</displayName>
-				<displayName count="one">Yuan China</displayName>
-				<displayName count="two">Yuan China</displayName>
-				<displayName count="few">Yuan China</displayName>
-				<displayName count="many">Yuan China</displayName>
-				<displayName count="other">Yuan Tsieina</displayName>
-				<symbol>CN¥</symbol>
-			</currency>
-			<currency type="COP">
-				<displayName>Peso Colombia</displayName>
-				<displayName count="zero">Peso Colombia</displayName>
-				<displayName count="one">Peso Colombia</displayName>
-				<displayName count="two">Peso Colombia</displayName>
-				<displayName count="few">Peso Colombia</displayName>
-				<displayName count="many">Peso Colombia</displayName>
-				<displayName count="other">Peso Colombia</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>Colón Costa Rica</displayName>
-				<displayName count="zero">Colón Costa Rica</displayName>
-				<displayName count="one">Colón Costa Rica</displayName>
-				<displayName count="two">Colón Costa Rica</displayName>
-				<displayName count="few">Colón Costa Rica</displayName>
-				<displayName count="many">Colón Costa Rica</displayName>
-				<displayName count="other">Colón Costa Rica</displayName>
-				<symbol>CRC</symbol>
-			</currency>
-			<currency type="CUC">
-				<displayName>Peso Trosadwy Cuba</displayName>
-				<displayName count="zero">Peso Trosadwy Cuba</displayName>
-				<displayName count="one">Peso Trosadwy Cuba</displayName>
-				<displayName count="two">Peso Trosadwy Cuba</displayName>
-				<displayName count="few">Peso Trosadwy Cuba</displayName>
-				<displayName count="many">Peso Trosadwy Cuba</displayName>
-				<displayName count="other">Peso Trosadwy Cuba</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>Peso Cuba</displayName>
-				<displayName count="zero">Peso Cuba</displayName>
-				<displayName count="one">Peso Cuba</displayName>
-				<displayName count="two">Peso Cuba</displayName>
-				<displayName count="few">Peso Cuba</displayName>
-				<displayName count="many">Peso Cuba</displayName>
-				<displayName count="other">Peso Cuba</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>Esgwdo Cabo Verde</displayName>
-				<displayName count="zero">Esgwdo Cabo Verde</displayName>
-				<displayName count="one">Esgwdo Cabo Verde</displayName>
-				<displayName count="two">Esgwdo Cabo Verde</displayName>
-				<displayName count="few">Esgwdo Cabo Verde</displayName>
-				<displayName count="many">Esgwdo Cabo Verde</displayName>
-				<displayName count="other">Esgwdo Cabo Verde</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>Koruna Tsiec</displayName>
-				<displayName count="zero">Koruna Tsiec</displayName>
-				<displayName count="one">Koruna Tsiec</displayName>
-				<displayName count="two">Koruna Tsiec</displayName>
-				<displayName count="few">Koruna Tsiec</displayName>
-				<displayName count="many">Koruna Tsiec</displayName>
-				<displayName count="other">Koruna Tsiec</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>Ffranc Djibouti</displayName>
-				<displayName count="zero">Ffranc Djibouti</displayName>
-				<displayName count="one">Ffranc Djibouti</displayName>
-				<displayName count="two">Ffranc Djibouti</displayName>
-				<displayName count="few">Ffranc Djibouti</displayName>
-				<displayName count="many">Ffranc Djibouti</displayName>
-				<displayName count="other">Ffranc Djibouti</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Krone Denmarc</displayName>
-				<displayName count="zero">Krone Denmarc</displayName>
-				<displayName count="one">Krone Denmarc</displayName>
-				<displayName count="two">Krone Denmarc</displayName>
-				<displayName count="few">Krone Denmarc</displayName>
-				<displayName count="many">Krone Denmarc</displayName>
-				<displayName count="other">Krone Denmarc</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>Peso Gweriniaeth Dominica</displayName>
-				<displayName count="zero">Peso Gweriniaeth Dominica</displayName>
-				<displayName count="one">Peso Gweriniaeth Dominica</displayName>
-				<displayName count="two">Peso Gweriniaeth Dominica</displayName>
-				<displayName count="few">Peso Gweriniaeth Dominica</displayName>
-				<displayName count="many">Peso Gweriniaeth Dominica</displayName>
-				<displayName count="other">Peso Gweriniaeth Dominica</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>Dinar Algeria</displayName>
-				<displayName count="zero">Dinar Algeria</displayName>
-				<displayName count="one">Dinar Algeria</displayName>
-				<displayName count="two">Dinar Algeria</displayName>
-				<displayName count="few">Dinar Algeria</displayName>
-				<displayName count="many">Dinar Algeria</displayName>
-				<displayName count="other">Dinar Algeria</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>Punt Yr Aifft</displayName>
-				<displayName count="zero">Punt Yr Aifft</displayName>
-				<displayName count="one">Punt Yr Aifft</displayName>
-				<displayName count="two">Punt Yr Aifft</displayName>
-				<displayName count="few">Punt Yr Aifft</displayName>
-				<displayName count="many">Punt Yr Aifft</displayName>
-				<displayName count="other">Punt Yr Aifft</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>Nakfa Eritrea</displayName>
-				<displayName count="zero">Nakfa Eritrea</displayName>
-				<displayName count="one">Nakfa Eritrea</displayName>
-				<displayName count="two">Nakfa Eritrea</displayName>
-				<displayName count="few">Nakfa Eritrea</displayName>
-				<displayName count="many">Nakfa Eritrea</displayName>
-				<displayName count="other">Nakfa Eritrea</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>Birr Ethiopia</displayName>
-				<displayName count="zero">Birr Ethiopia</displayName>
-				<displayName count="one">Birr Ethiopia</displayName>
-				<displayName count="two">Birr Ethiopia</displayName>
-				<displayName count="few">Birr Ethiopia</displayName>
-				<displayName count="many">Birr Ethiopia</displayName>
-				<displayName count="other">Birr Ethiopia</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Ewro</displayName>
-				<displayName count="zero">Ewro</displayName>
-				<displayName count="one">Ewro</displayName>
-				<displayName count="two">Ewro</displayName>
-				<displayName count="few">Ewro</displayName>
-				<displayName count="many">Ewro</displayName>
-				<displayName count="other">Ewro</displayName>
-				<symbol>€</symbol>
-			</currency>
-			<currency type="FJD">
-				<displayName>Doler Ffiji</displayName>
-				<displayName count="zero">Doler Ffiji</displayName>
-				<displayName count="one">Doler Ffiji</displayName>
-				<displayName count="two">Doler Ffiji</displayName>
-				<displayName count="few">Doler Ffiji</displayName>
-				<displayName count="many">Doler Ffiji</displayName>
-				<displayName count="other">Doler Ffiji</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>Punt Ynysoedd Falkland/Malvinas</displayName>
-				<displayName count="zero">Punt Ynysoedd Falkland/Malvinas</displayName>
-				<displayName count="one">Punt Ynysoedd Falkland/Malvinas</displayName>
-				<displayName count="two">Punt Ynysoedd Falkland/Malvinas</displayName>
-				<displayName count="few">Punt Ynysoedd Falkland/Malvinas</displayName>
-				<displayName count="many">Punt Ynysoedd Falkland/Malvinas</displayName>
-				<displayName count="other">Punt Ynysoedd Falkland/Malvinas</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Punt Prydain</displayName>
-				<displayName count="zero">Punt Prydain</displayName>
-				<displayName count="one">Punt Prydain</displayName>
-				<displayName count="two">Punt Prydain</displayName>
-				<displayName count="few">Punt Prydain</displayName>
-				<displayName count="many">Punt Prydain</displayName>
-				<displayName count="other">Punt Prydain</displayName>
-				<symbol>£</symbol>
-			</currency>
-			<currency type="GEL">
-				<displayName>Lari Georgia</displayName>
-				<displayName count="zero">Lari Georgia</displayName>
-				<displayName count="one">Lari Georgia</displayName>
-				<displayName count="two">Lari Georgia</displayName>
-				<displayName count="few">Lari Georgia</displayName>
-				<displayName count="many">Lari Georgia</displayName>
-				<displayName count="other">Lari Georgia</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>Cedi Ghana</displayName>
-				<displayName count="zero">Cedi Ghana</displayName>
-				<displayName count="one">Cedi Ghana</displayName>
-				<displayName count="two">Cedi Ghana</displayName>
-				<displayName count="few">Cedi Ghana</displayName>
-				<displayName count="many">Cedi Ghana</displayName>
-				<displayName count="other">Cedi Ghana</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Punt Gibraltar</displayName>
-				<displayName count="zero">Punt Gibraltar</displayName>
-				<displayName count="one">Punt Gibraltar</displayName>
-				<displayName count="two">Punt Gibraltar</displayName>
-				<displayName count="few">Punt Gibraltar</displayName>
-				<displayName count="many">Punt Gibraltar</displayName>
-				<displayName count="other">Punt Gibraltar</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>Dalasi Gambia</displayName>
-				<displayName count="zero">Dalasi Gambia</displayName>
-				<displayName count="one">Dalasi Gambia</displayName>
-				<displayName count="two">Dalasi Gambia</displayName>
-				<displayName count="few">Dalasi Gambia</displayName>
-				<displayName count="many">Dalasi Gambia</displayName>
-				<displayName count="other">Dalasi Gambia</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Ffranc Guinée</displayName>
-				<displayName count="zero">Ffranc Guinée</displayName>
-				<displayName count="one">Ffranc Guinée</displayName>
-				<displayName count="two">Ffranc Guinée</displayName>
-				<displayName count="few">Ffranc Guinée</displayName>
-				<displayName count="many">Ffranc Guinée</displayName>
-				<displayName count="other">Ffranc Guinée</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Quetzal Guatemala</displayName>
-				<displayName count="zero">Quetzal Guatemala</displayName>
-				<displayName count="one">Quetzal Guatemala</displayName>
-				<displayName count="two">Quetzal Guatemala</displayName>
-				<displayName count="few">Quetzal Guatemala</displayName>
-				<displayName count="many">Quetzal Guatemala</displayName>
-				<displayName count="other">Quetzal Guatemala</displayName>
-				<symbol>GTQ</symbol>
-			</currency>
-			<currency type="GYD">
-				<displayName>Doler Guyana</displayName>
-				<displayName count="zero">Doler Guyana</displayName>
-				<displayName count="one">Doler Guyana</displayName>
-				<displayName count="two">Doler Guyana</displayName>
-				<displayName count="few">Doler Guyana</displayName>
-				<displayName count="many">Doler Guyana</displayName>
-				<displayName count="other">Doler Guyana</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Doler Hong Kong</displayName>
-				<displayName count="zero">Doler Hong Kong</displayName>
-				<displayName count="one">Doler Hong Kong</displayName>
-				<displayName count="two">Doler Hong Kong</displayName>
-				<displayName count="few">Doler Hong Kong</displayName>
-				<displayName count="many">Doler Hong Kong</displayName>
-				<displayName count="other">Doler Hong Kong</displayName>
-				<symbol>HK$</symbol>
-			</currency>
-			<currency type="HNL">
-				<displayName>Lempira Honduras</displayName>
-				<displayName count="zero">Lempira Honduras</displayName>
-				<displayName count="one">Lempira Honduras</displayName>
-				<displayName count="two">Lempira Honduras</displayName>
-				<displayName count="few">Lempira Honduras</displayName>
-				<displayName count="many">Lempira Honduras</displayName>
-				<displayName count="other">Lempira Honduras</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Kuna Croatia</displayName>
-				<displayName count="zero">Kuna Croatia</displayName>
-				<displayName count="one">Kuna Croatia</displayName>
-				<displayName count="two">Kuna Croatia</displayName>
-				<displayName count="few">Kuna Croatia</displayName>
-				<displayName count="many">Kuna Croatia</displayName>
-				<displayName count="other">Kuna Croatia</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>Gourde Haiti</displayName>
-				<displayName count="zero">Gourde Haiti</displayName>
-				<displayName count="one">Gourde Haiti</displayName>
-				<displayName count="two">Gourde Haiti</displayName>
-				<displayName count="few">Gourde Haiti</displayName>
-				<displayName count="many">Gourde Haiti</displayName>
-				<displayName count="other">Gourde Haiti</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Fforint Hwngari</displayName>
-				<displayName count="zero">Fforint Hwngari</displayName>
-				<displayName count="one">Fforint Hwngari</displayName>
-				<displayName count="two">Fforint Hwngari</displayName>
-				<displayName count="few">Fforint Hwngari</displayName>
-				<displayName count="many">Fforint Hwngari</displayName>
-				<displayName count="other">Fforint Hwngari</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Rupiah Indonesia</displayName>
-				<displayName count="zero">Rupiah Indonesia</displayName>
-				<displayName count="one">Rupiah Indonesia</displayName>
-				<displayName count="two">Rupiah Indonesia</displayName>
-				<displayName count="few">Rupiah Indonesia</displayName>
-				<displayName count="many">Rupiah Indonesia</displayName>
-				<displayName count="other">Rupiah Indonesia</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>Punt Iwerddon</displayName>
-				<displayName count="zero">Punt Iwerddon</displayName>
-				<displayName count="one">Punt Iwerddon</displayName>
-				<displayName count="two">Punt Iwerddon</displayName>
-				<displayName count="few">Punt Iwerddon</displayName>
-				<displayName count="many">Punt Iwerddon</displayName>
-				<displayName count="other">Punt Iwerddon</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Shegel Newydd Israel</displayName>
-				<displayName count="zero">Shegel Newydd Israel</displayName>
-				<displayName count="one">Shegel Newydd Israel</displayName>
-				<displayName count="two">Shegel Newydd Israel</displayName>
-				<displayName count="few">Shegel Newydd Israel</displayName>
-				<displayName count="many">Shegel Newydd Israel</displayName>
-				<displayName count="other">Shegel Newydd Israel</displayName>
-				<symbol>₪</symbol>
-			</currency>
-			<currency type="INR">
-				<displayName>Rwpî India</displayName>
-				<displayName count="zero">Rwpî India</displayName>
-				<displayName count="one">Rwpî India</displayName>
-				<displayName count="two">Rwpî India</displayName>
-				<displayName count="few">Rwpî India</displayName>
-				<displayName count="many">Rwpî India</displayName>
-				<displayName count="other">Rwpî India</displayName>
-				<symbol>₹</symbol>
-			</currency>
-			<currency type="IQD">
-				<displayName>Dinar Irac</displayName>
-				<displayName count="zero">Dinar Irac</displayName>
-				<displayName count="one">Dinar Irac</displayName>
-				<displayName count="two">Dinar Irac</displayName>
-				<displayName count="few">Dinar Irac</displayName>
-				<displayName count="many">Dinar Irac</displayName>
-				<displayName count="other">Dinar Irac</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Rial Iran</displayName>
-				<displayName count="zero">Rial Iran</displayName>
-				<displayName count="one">Rial Iran</displayName>
-				<displayName count="two">Rial Iran</displayName>
-				<displayName count="few">Rial Iran</displayName>
-				<displayName count="many">Rial Iran</displayName>
-				<displayName count="other">Rial Iran</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>Króna Gwlad yr Iâ</displayName>
-				<displayName count="zero">Króna Gwlad yr Iâ</displayName>
-				<displayName count="one">Króna Gwlad yr Iâ</displayName>
-				<displayName count="two">Króna Gwlad yr Iâ</displayName>
-				<displayName count="few">Króna Gwlad yr Iâ</displayName>
-				<displayName count="many">Króna Gwlad yr Iâ</displayName>
-				<displayName count="other">Króna Gwlad yr Iâ</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>Doler Jamaica</displayName>
-				<displayName count="zero">Doler Jamaica</displayName>
-				<displayName count="one">Doler Jamaica</displayName>
-				<displayName count="two">Doler Jamaica</displayName>
-				<displayName count="few">Doler Jamaica</displayName>
-				<displayName count="many">Doler Jamaica</displayName>
-				<displayName count="other">Doler Jamaica</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>Dinar Gwlad yr Iorddonen</displayName>
-				<displayName count="zero">Dinar Gwlad yr Iorddonen</displayName>
-				<displayName count="one">Dinar Gwlad yr Iorddonen</displayName>
-				<displayName count="two">Dinar Gwlad yr Iorddonen</displayName>
-				<displayName count="few">Dinar Gwlad yr Iorddonen</displayName>
-				<displayName count="many">Dinar Gwlad yr Iorddonen</displayName>
-				<displayName count="other">Dinar Gwlad yr Iorddonen</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Yen Japan</displayName>
-				<displayName count="zero">Yen Japan</displayName>
-				<displayName count="one">Yen Japan</displayName>
-				<displayName count="two">Yen Japan</displayName>
-				<displayName count="few">Yen Japan</displayName>
-				<displayName count="many">Yen Japan</displayName>
-				<displayName count="other">Yen Japan</displayName>
-				<symbol>JP¥</symbol>
-			</currency>
-			<currency type="KES">
-				<displayName>Swllt Kenya</displayName>
-				<displayName count="zero">Swllt Kenya</displayName>
-				<displayName count="one">Swllt Kenya</displayName>
-				<displayName count="two">Swllt Kenya</displayName>
-				<displayName count="few">Swllt Kenya</displayName>
-				<displayName count="many">Swllt Kenya</displayName>
-				<displayName count="other">Swllt Kenya</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>Som Kyrgyzstan</displayName>
-				<displayName count="zero">Som Kyrgyzstan</displayName>
-				<displayName count="one">Som Kyrgyzstan</displayName>
-				<displayName count="two">Som Kyrgyzstan</displayName>
-				<displayName count="few">Som Kyrgyzstan</displayName>
-				<displayName count="many">Som Kyrgyzstan</displayName>
-				<displayName count="other">Som Kyrgyzstan</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>Riel Cambodia</displayName>
-				<displayName count="zero">Riel Cambodia</displayName>
-				<displayName count="one">Riel Cambodia</displayName>
-				<displayName count="two">Riel Cambodia</displayName>
-				<displayName count="few">Riel Cambodia</displayName>
-				<displayName count="many">Riel Cambodia</displayName>
-				<displayName count="other">Riel Cambodia</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>Ffranc Comoros</displayName>
-				<displayName count="zero">Ffranc Comoros</displayName>
-				<displayName count="one">Ffranc Comoros</displayName>
-				<displayName count="two">Ffranc Comoros</displayName>
-				<displayName count="few">Ffranc Comoros</displayName>
-				<displayName count="many">Ffranc Comoros</displayName>
-				<displayName count="other">Ffranc Comoros</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>Won Gogledd Corea</displayName>
-				<displayName count="zero">Won Gogledd Corea</displayName>
-				<displayName count="one">Won Gogledd Corea</displayName>
-				<displayName count="two">Won Gogledd Corea</displayName>
-				<displayName count="few">Won Gogledd Corea</displayName>
-				<displayName count="many">Won Gogledd Corea</displayName>
-				<displayName count="other">Won Gogledd Corea</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>Won De Korea</displayName>
-				<displayName count="zero">Won De Korea</displayName>
-				<displayName count="one">Won De Korea</displayName>
-				<displayName count="two">Won De Korea</displayName>
-				<displayName count="few">Won De Korea</displayName>
-				<displayName count="many">Won De Korea</displayName>
-				<displayName count="other">Won De Korea</displayName>
-				<symbol>₩</symbol>
-			</currency>
-			<currency type="KWD">
-				<displayName>Dinar Kuwait</displayName>
-				<displayName count="zero">Dinar Kuwait</displayName>
-				<displayName count="one">Dinar Kuwait</displayName>
-				<displayName count="two">Dinar Kuwait</displayName>
-				<displayName count="few">Dinar Kuwait</displayName>
-				<displayName count="many">Dinar Kuwait</displayName>
-				<displayName count="other">Dinar Kuwait</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>Doler Ynysoedd Cayman</displayName>
-				<displayName count="zero">Doler Ynysoedd Cayman</displayName>
-				<displayName count="one">Doler Ynysoedd Cayman</displayName>
-				<displayName count="two">Doler Ynysoedd Cayman</displayName>
-				<displayName count="few">Doler Ynysoedd Cayman</displayName>
-				<displayName count="many">Doler Ynysoedd Cayman</displayName>
-				<displayName count="other">Doler Ynysoedd Cayman</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>Tenge Kazakstan</displayName>
-				<displayName count="zero">Tenge Kazakstan</displayName>
-				<displayName count="one">Tenge Kazakstan</displayName>
-				<displayName count="two">Tenge Kazakstan</displayName>
-				<displayName count="few">Tenge Kazakstan</displayName>
-				<displayName count="many">Tenge Kazakstan</displayName>
-				<displayName count="other">Tenge Kazakstan</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>Kip Laos</displayName>
-				<displayName count="zero">Kip Laos</displayName>
-				<displayName count="one">Kip Laos</displayName>
-				<displayName count="two">Kip Laos</displayName>
-				<displayName count="few">Kip Laos</displayName>
-				<displayName count="many">Kip Laos</displayName>
-				<displayName count="other">Kip Laos</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>Punt Libanus</displayName>
-				<displayName count="zero">Punt Libanus</displayName>
-				<displayName count="one">Punt Libanus</displayName>
-				<displayName count="two">Punt Libanus</displayName>
-				<displayName count="few">Punt Libanus</displayName>
-				<displayName count="many">Punt Libanus</displayName>
-				<displayName count="other">Punt Libanus</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>Rwpî Sri Lanka</displayName>
-				<displayName count="zero">Rwpî Sri Lanka</displayName>
-				<displayName count="one">Rwpî Sri Lanka</displayName>
-				<displayName count="two">Rwpî Sri Lanka</displayName>
-				<displayName count="few">Rwpî Sri Lanka</displayName>
-				<displayName count="many">Rwpî Sri Lanka</displayName>
-				<displayName count="other">Rwpî Sri Lanka</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>Doler Liberia</displayName>
-				<displayName count="zero">Doler Liberia</displayName>
-				<displayName count="one">Doler Liberia</displayName>
-				<displayName count="two">Doler Liberia</displayName>
-				<displayName count="few">Doler Liberia</displayName>
-				<displayName count="many">Doler Liberia</displayName>
-				<displayName count="other">Doler Liberia</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Litas Lithwania</displayName>
-				<displayName count="zero">Litas Lithwania</displayName>
-				<displayName count="one">Litas Lithwania</displayName>
-				<displayName count="two">Litas Lithwania</displayName>
-				<displayName count="few">Litas Lithwania</displayName>
-				<displayName count="many">Litas Lithwania</displayName>
-				<displayName count="other">Litas Lithwania</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Lats Latfia</displayName>
-				<displayName count="zero">Lats Latfia</displayName>
-				<displayName count="one">Lats Latfia</displayName>
-				<displayName count="two">Lats Latfia</displayName>
-				<displayName count="few">Lats Latfia</displayName>
-				<displayName count="many">Lats Latfia</displayName>
-				<displayName count="other">Lats Latfia</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>Dinar Libya</displayName>
-				<displayName count="zero">Dinar Libya</displayName>
-				<displayName count="one">Dinar Libya</displayName>
-				<displayName count="two">Dinar Libya</displayName>
-				<displayName count="few">Dinar Libya</displayName>
-				<displayName count="many">Dinar Libya</displayName>
-				<displayName count="other">Dinar Libya</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Dirham Moroco</displayName>
-				<displayName count="zero">Dirham Moroco</displayName>
-				<displayName count="one">Dirham Moroco</displayName>
-				<displayName count="two">Dirham Moroco</displayName>
-				<displayName count="few">Dirham Moroco</displayName>
-				<displayName count="many">Dirham Moroco</displayName>
-				<displayName count="other">Dirham Moroco</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>Leu Moldofa</displayName>
-				<displayName count="zero">Leu Moldofa</displayName>
-				<displayName count="one">Leu Moldofa</displayName>
-				<displayName count="two">Leu Moldofa</displayName>
-				<displayName count="few">Leu Moldofa</displayName>
-				<displayName count="many">Leu Moldofa</displayName>
-				<displayName count="other">Leu Moldofa</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>Ariary Madagascar</displayName>
-				<displayName count="zero">Ariary Madagascar</displayName>
-				<displayName count="one">Ariary Madagascar</displayName>
-				<displayName count="two">Ariary Madagascar</displayName>
-				<displayName count="few">Ariary Madagascar</displayName>
-				<displayName count="many">Ariary Madagascar</displayName>
-				<displayName count="other">Ariary Madagascar</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>Denar Macedonia</displayName>
-				<displayName count="zero">Denar Macedonia</displayName>
-				<displayName count="one">Denar Macedonia</displayName>
-				<displayName count="two">Denar Macedonia</displayName>
-				<displayName count="few">Denar Macedonia</displayName>
-				<displayName count="many">Denar Macedonia</displayName>
-				<displayName count="other">Denar Macedonia</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>Kyat Myanmar</displayName>
-				<displayName count="zero">Kyat Myanmar</displayName>
-				<displayName count="one">Kyat Myanmar</displayName>
-				<displayName count="two">Kyat Myanmar</displayName>
-				<displayName count="few">Kyat Myanmar</displayName>
-				<displayName count="many">Kyat Myanmar</displayName>
-				<displayName count="other">Kyat Myanmar</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>Tugrik Mongolia</displayName>
-				<displayName count="zero">Tugrik Mongolia</displayName>
-				<displayName count="one">Tugrik Mongolia</displayName>
-				<displayName count="two">Tugrik Mongolia</displayName>
-				<displayName count="few">Tugrik Mongolia</displayName>
-				<displayName count="many">Tugrik Mongolia</displayName>
-				<displayName count="other">Tugrik Mongolia</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>Pataca Macau</displayName>
-				<displayName count="zero">Pataca Macau</displayName>
-				<displayName count="one">Pataca Macau</displayName>
-				<displayName count="two">Pataca Macau</displayName>
-				<displayName count="few">Pataca Macau</displayName>
-				<displayName count="many">Pataca Macau</displayName>
-				<displayName count="other">Pataca Macau</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>Ouguiya Mauritania</displayName>
-				<displayName count="zero">Ouguiya Mauritania</displayName>
-				<displayName count="one">Ouguiya Mauritania</displayName>
-				<displayName count="two">Ouguiya Mauritania</displayName>
-				<displayName count="few">Ouguiya Mauritania</displayName>
-				<displayName count="many">Ouguiya Mauritania</displayName>
-				<displayName count="other">Ouguiya Mauritania</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>Rwpî Mauritius</displayName>
-				<displayName count="zero">Rwpî Mauritius</displayName>
-				<displayName count="one">Rwpî Mauritius</displayName>
-				<displayName count="two">Rwpî Mauritius</displayName>
-				<displayName count="few">Rwpî Mauritius</displayName>
-				<displayName count="many">Rwpî Mauritius</displayName>
-				<displayName count="other">Rwpî Mauritius</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>Rufiyaa’r Maldives</displayName>
-				<displayName count="zero">Rufiyaa’r Maldives</displayName>
-				<displayName count="one">Rufiyaa’r Maldives</displayName>
-				<displayName count="two">Rufiyaa’r Maldives</displayName>
-				<displayName count="few">Rufiyaa’r Maldives</displayName>
-				<displayName count="many">Rufiyaa’r Maldives</displayName>
-				<displayName count="other">Rufiyaa’r Maldives</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>Kwacha Malawi</displayName>
-				<displayName count="zero">Kwacha Malawi</displayName>
-				<displayName count="one">Kwacha Malawi</displayName>
-				<displayName count="two">Kwacha Malawi</displayName>
-				<displayName count="few">Kwacha Malawi</displayName>
-				<displayName count="many">Kwacha Malawi</displayName>
-				<displayName count="other">Kwacha Malawi</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Peso México</displayName>
-				<displayName count="zero">Peso México</displayName>
-				<displayName count="one">Peso México</displayName>
-				<displayName count="two">Peso México</displayName>
-				<displayName count="few">Peso México</displayName>
-				<displayName count="many">Peso México</displayName>
-				<displayName count="other">Peso México</displayName>
-				<symbol>MX$</symbol>
-			</currency>
-			<currency type="MYR">
-				<displayName>Ringgit Malaysia</displayName>
-				<displayName count="zero">Ringgit Malaysia</displayName>
-				<displayName count="one">Ringgit Malaysia</displayName>
-				<displayName count="two">Ringgit Malaysia</displayName>
-				<displayName count="few">Ringgit Malaysia</displayName>
-				<displayName count="many">Ringgit Malaysia</displayName>
-				<displayName count="other">Ringgit Malaysia</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>Metical Mozambique</displayName>
-				<displayName count="zero">Metical Mozambique</displayName>
-				<displayName count="one">Metical Mozambique</displayName>
-				<displayName count="two">Metical Mozambique</displayName>
-				<displayName count="few">Metical Mozambique</displayName>
-				<displayName count="many">Metical Mozambique</displayName>
-				<displayName count="other">Metical Mozambique</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>Doler Namibia</displayName>
-				<displayName count="zero">Doler Namibia</displayName>
-				<displayName count="one">Doler Namibia</displayName>
-				<displayName count="two">Doler Namibia</displayName>
-				<displayName count="few">Doler Namibia</displayName>
-				<displayName count="many">Doler Namibia</displayName>
-				<displayName count="other">Doler Namibia</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>Naira Nigeria</displayName>
-				<displayName count="zero">Naira Nigeria</displayName>
-				<displayName count="one">Naira Nigeria</displayName>
-				<displayName count="two">Naira Nigeria</displayName>
-				<displayName count="few">Naira Nigeria</displayName>
-				<displayName count="many">Naira Nigeria</displayName>
-				<displayName count="other">Naira Nigeria</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>Córdoba Nicaragua</displayName>
-				<displayName count="zero">Córdoba Nicaragua</displayName>
-				<displayName count="one">Córdoba Nicaragua</displayName>
-				<displayName count="two">Córdoba Nicaragua</displayName>
-				<displayName count="few">Córdoba Nicaragua</displayName>
-				<displayName count="many">Córdoba Nicaragua</displayName>
-				<displayName count="other">Córdoba Nicaragua</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>Krone Norwy</displayName>
-				<displayName count="zero">Krone Norwy</displayName>
-				<displayName count="one">Krone Norwy</displayName>
-				<displayName count="two">Krone Norwy</displayName>
-				<displayName count="few">Krone Norwy</displayName>
-				<displayName count="many">Krone Norwy</displayName>
-				<displayName count="other">Krone Norwy</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>Rwpî Nepal</displayName>
-				<displayName count="zero">Rwpî Nepal</displayName>
-				<displayName count="one">Rwpî Nepal</displayName>
-				<displayName count="two">Rwpî Nepal</displayName>
-				<displayName count="few">Rwpî Nepal</displayName>
-				<displayName count="many">Rwpî Nepal</displayName>
-				<displayName count="other">Rwpî Nepal</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>Doler Seland Newydd</displayName>
-				<displayName count="zero">Doler Seland Newydd</displayName>
-				<displayName count="one">Doler Seland Newydd</displayName>
-				<displayName count="two">Doler Seland Newydd</displayName>
-				<displayName count="few">Doler Seland Newydd</displayName>
-				<displayName count="many">Doler Seland Newydd</displayName>
-				<displayName count="other">Doler Seland Newydd</displayName>
-				<symbol>NZ$</symbol>
-			</currency>
-			<currency type="OMR">
-				<displayName>Rial Oman</displayName>
-				<displayName count="zero">Rial Oman</displayName>
-				<displayName count="one">Rial Oman</displayName>
-				<displayName count="two">Rial Oman</displayName>
-				<displayName count="few">Rial Oman</displayName>
-				<displayName count="many">Rial Oman</displayName>
-				<displayName count="other">Rial Oman</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Balboa Panama</displayName>
-				<displayName count="zero">Balboa Panama</displayName>
-				<displayName count="one">Balboa Panama</displayName>
-				<displayName count="two">Balboa Panama</displayName>
-				<displayName count="few">Balboa Panama</displayName>
-				<displayName count="many">Balboa Panama</displayName>
-				<displayName count="other">Balboa Panama</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Nuevo Sol Periw</displayName>
-				<displayName count="zero">Nuevo Sol Periw</displayName>
-				<displayName count="one">Nuevo Sol Periw</displayName>
-				<displayName count="two">Nuevo Sol Periw</displayName>
-				<displayName count="few">Nuevo Sol Periw</displayName>
-				<displayName count="many">Nuevo Sol Periw</displayName>
-				<displayName count="other">Nuevo Sol Periw</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>Kina Papua Guinea Newydd</displayName>
-				<displayName count="zero">Kina Papua Guinea Newydd</displayName>
-				<displayName count="one">Kina Papua Guinea Newydd</displayName>
-				<displayName count="two">Kina Papua Guinea Newydd</displayName>
-				<displayName count="few">Kina Papua Guinea Newydd</displayName>
-				<displayName count="many">Kina Papua Guinea Newydd</displayName>
-				<displayName count="other">Kina Papua Guinea Newydd</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Peso Pilipinas</displayName>
-				<displayName count="zero">Peso Pilipinas</displayName>
-				<displayName count="one">Peso Pilipinas</displayName>
-				<displayName count="two">Peso Pilipinas</displayName>
-				<displayName count="few">Peso Pilipinas</displayName>
-				<displayName count="many">Peso Pilipinas</displayName>
-				<displayName count="other">Peso Pilipinas</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Rwpî Pacistan</displayName>
-				<displayName count="zero">Rwpî Pacistan</displayName>
-				<displayName count="one">Rwpî Pacistan</displayName>
-				<displayName count="two">Rwpî Pacistan</displayName>
-				<displayName count="few">Rwpî Pacistan</displayName>
-				<displayName count="many">Rwpî Pacistan</displayName>
-				<displayName count="other">Rwpî Pacistan</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Zloty Gwlad Pwyl</displayName>
-				<displayName count="zero">Zloty Gwlad Pwyl</displayName>
-				<displayName count="one">Zloty Gwlad Pwyl</displayName>
-				<displayName count="two">Zloty Gwlad Pwyl</displayName>
-				<displayName count="few">Zloty Gwlad Pwyl</displayName>
-				<displayName count="many">Zloty Gwlad Pwyl</displayName>
-				<displayName count="other">Zloty Gwlad Pwyl</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>Guarani Paraguay</displayName>
-				<displayName count="zero">Guarani Paraguay</displayName>
-				<displayName count="one">Guarani Paraguay</displayName>
-				<displayName count="two">Guarani Paraguay</displayName>
-				<displayName count="few">Guarani Paraguay</displayName>
-				<displayName count="many">Guarani Paraguay</displayName>
-				<displayName count="other">Guarani Paraguay</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>Rial Qatar</displayName>
-				<displayName count="zero">Rial Qatar</displayName>
-				<displayName count="one">Rial Qatar</displayName>
-				<displayName count="two">Rial Qatar</displayName>
-				<displayName count="few">Rial Qatar</displayName>
-				<displayName count="many">Rial Qatar</displayName>
-				<displayName count="other">Rial Qatar</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>Leu Rwmania</displayName>
-				<displayName count="zero">Leu Rwmania</displayName>
-				<displayName count="one">Leu Rwmania</displayName>
-				<displayName count="two">Leu Rwmania</displayName>
-				<displayName count="few">Leu Rwmania</displayName>
-				<displayName count="many">Leu Rwmania</displayName>
-				<displayName count="other">Leu Rwmania</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Dinar Serbia</displayName>
-				<displayName count="zero">Dinar Serbia</displayName>
-				<displayName count="one">Dinar Serbia</displayName>
-				<displayName count="two">Dinar Serbia</displayName>
-				<displayName count="few">Dinar Serbia</displayName>
-				<displayName count="many">Dinar Serbia</displayName>
-				<displayName count="other">Dinar Serbia</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Rwbl Rwsia</displayName>
-				<displayName count="zero">Rwbl Rwsia</displayName>
-				<displayName count="one">Rwbl Rwsia</displayName>
-				<displayName count="two">Rwbl Rwsia</displayName>
-				<displayName count="few">Rwbl Rwsia</displayName>
-				<displayName count="many">Rwbl Rwsia</displayName>
-				<displayName count="other">Rwbl Rwsia</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>Ffranc Rwanda</displayName>
-				<displayName count="zero">Ffranc Rwanda</displayName>
-				<displayName count="one">Ffranc Rwanda</displayName>
-				<displayName count="two">Ffranc Rwanda</displayName>
-				<displayName count="few">Ffranc Rwanda</displayName>
-				<displayName count="many">Ffranc Rwanda</displayName>
-				<displayName count="other">Ffranc Rwanda</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Riyal Saudi Arabia</displayName>
-				<displayName count="zero">Riyal Saudi Arabia</displayName>
-				<displayName count="one">Riyal Saudi Arabia</displayName>
-				<displayName count="two">Riyal Saudi Arabia</displayName>
-				<displayName count="few">Riyal Saudi Arabia</displayName>
-				<displayName count="many">Riyal Saudi Arabia</displayName>
-				<displayName count="other">Riyal Saudi Arabia</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>Doler Ynysoedd Solomon</displayName>
-				<displayName count="zero">Doler Ynysoedd Solomon</displayName>
-				<displayName count="one">Doler Ynysoedd Solomon</displayName>
-				<displayName count="two">Doler Ynysoedd Solomon</displayName>
-				<displayName count="few">Doler Ynysoedd Solomon</displayName>
-				<displayName count="many">Doler Ynysoedd Solomon</displayName>
-				<displayName count="other">Doler Ynysoedd Solomon</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>Rwpî Seychelles</displayName>
-				<displayName count="zero">Rwpî Seychelles</displayName>
-				<displayName count="one">Rwpî Seychelles</displayName>
-				<displayName count="two">Rwpî Seychelles</displayName>
-				<displayName count="few">Rwpî Seychelles</displayName>
-				<displayName count="many">Rwpî Seychelles</displayName>
-				<displayName count="other">Rwpî Seychelles</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>Punt Sudan</displayName>
-				<displayName count="zero">Punt Sudan</displayName>
-				<displayName count="one">Punt Sudan</displayName>
-				<displayName count="two">Punt Sudan</displayName>
-				<displayName count="few">Punt Sudan</displayName>
-				<displayName count="many">Punt Sudan</displayName>
-				<displayName count="other">Punt Sudan</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Krona Sweden</displayName>
-				<displayName count="zero">Krona Sweden</displayName>
-				<displayName count="one">Krona Sweden</displayName>
-				<displayName count="two">Krona Sweden</displayName>
-				<displayName count="few">Krona Sweden</displayName>
-				<displayName count="many">Krona Sweden</displayName>
-				<displayName count="other">Krona Sweden</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Doler Singapore</displayName>
-				<displayName count="zero">Doler Singapore</displayName>
-				<displayName count="one">Doler Singapore</displayName>
-				<displayName count="two">Doler Singapore</displayName>
-				<displayName count="few">Doler Singapore</displayName>
-				<displayName count="many">Doler Singapore</displayName>
-				<displayName count="other">Doler Singapore</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>Punt Saint Helena</displayName>
-				<displayName count="zero">Punt Saint Helena</displayName>
-				<displayName count="one">Punt Saint Helena</displayName>
-				<displayName count="two">Punt Saint Helena</displayName>
-				<displayName count="few">Punt Saint Helena</displayName>
-				<displayName count="many">Punt Saint Helena</displayName>
-				<displayName count="other">Punt Saint Helena</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>Leone Sierra Leone</displayName>
-				<displayName count="zero">Leone Sierra Leone</displayName>
-				<displayName count="one">Leone Sierra Leone</displayName>
-				<displayName count="two">Leone Sierra Leone</displayName>
-				<displayName count="few">Leone Sierra Leone</displayName>
-				<displayName count="many">Leone Sierra Leone</displayName>
-				<displayName count="other">Leone Sierra Leone</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>Swllt Somalia</displayName>
-				<displayName count="zero">Swllt Somalia</displayName>
-				<displayName count="one">Swllt Somalia</displayName>
-				<displayName count="two">Swllt Somalia</displayName>
-				<displayName count="few">Swllt Somalia</displayName>
-				<displayName count="many">Swllt Somalia</displayName>
-				<displayName count="other">Swllt Somalia</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>Doler Surinam</displayName>
-				<displayName count="zero">Doler Surinam</displayName>
-				<displayName count="one">Doler Surinam</displayName>
-				<displayName count="two">Doler Surinam</displayName>
-				<displayName count="few">Doler Surinam</displayName>
-				<displayName count="many">Doler Surinam</displayName>
-				<displayName count="other">Doler Surinam</displayName>
-			</currency>
-			<currency type="SSP">
-				<displayName>Punt De Sudan</displayName>
-				<displayName count="zero">Punt De Sudan</displayName>
-				<displayName count="one">Punt De Sudan</displayName>
-				<displayName count="two">Punt De Sudan</displayName>
-				<displayName count="few">Punt De Sudan</displayName>
-				<displayName count="many">Punt De Sudan</displayName>
-				<displayName count="other">Punt De Sudan</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>Dobra São Tomé a Príncipe</displayName>
-				<displayName count="zero">Dobra São Tomé a Príncipe</displayName>
-				<displayName count="one">Dobra São Tomé a Príncipe</displayName>
-				<displayName count="two">Dobra São Tomé a Príncipe</displayName>
-				<displayName count="few">Dobra São Tomé a Príncipe</displayName>
-				<displayName count="many">Dobra São Tomé a Príncipe</displayName>
-				<displayName count="other">Dobra São Tomé a Príncipe</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>Punt Syria</displayName>
-				<displayName count="zero">Punt Syria</displayName>
-				<displayName count="one">Punt Syria</displayName>
-				<displayName count="two">Punt Syria</displayName>
-				<displayName count="few">Punt Syria</displayName>
-				<displayName count="many">Punt Syria</displayName>
-				<displayName count="other">Punt Syria</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>Lilangeni Gwlad Swazi</displayName>
-				<displayName count="zero">Lilangeni Gwlad Swazi</displayName>
-				<displayName count="one">Lilangeni Gwlad Swazi</displayName>
-				<displayName count="two">Lilangeni Gwlad Swazi</displayName>
-				<displayName count="few">Lilangeni Gwlad Swazi</displayName>
-				<displayName count="many">Lilangeni Gwlad Swazi</displayName>
-				<displayName count="other">Lilangeni Gwlad Swazi</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Baht Gwlad Thai</displayName>
-				<displayName count="zero">Baht Gwlad Thai</displayName>
-				<displayName count="one">Baht Gwlad Thai</displayName>
-				<displayName count="two">Baht Gwlad Thai</displayName>
-				<displayName count="few">Baht Gwlad Thai</displayName>
-				<displayName count="many">Baht Gwlad Thai</displayName>
-				<displayName count="other">Baht Gwlad Thai</displayName>
-				<symbol>฿</symbol>
-			</currency>
-			<currency type="TJS">
-				<displayName>Somoni Tajikistan</displayName>
-				<displayName count="zero">Somoni Tajikistan</displayName>
-				<displayName count="one">Somoni Tajikistan</displayName>
-				<displayName count="two">Somoni Tajikistan</displayName>
-				<displayName count="few">Somoni Tajikistan</displayName>
-				<displayName count="many">Somoni Tajikistan</displayName>
-				<displayName count="other">Somoni Tajikistan</displayName>
-			</currency>
-			<currency type="TMT">
-				<displayName>Manat Turkmenistan</displayName>
-				<displayName count="zero">Manat Turkmenistan</displayName>
-				<displayName count="one">Manat Turkmenistan</displayName>
-				<displayName count="two">Manat Turkmenistan</displayName>
-				<displayName count="few">Manat Turkmenistan</displayName>
-				<displayName count="many">Manat Turkmenistan</displayName>
-				<displayName count="other">Manat Turkmenistan</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>Dinar Tunisia</displayName>
-				<displayName count="zero">Dinar Tunisia</displayName>
-				<displayName count="one">Dinar Tunisia</displayName>
-				<displayName count="two">Dinar Tunisia</displayName>
-				<displayName count="few">Dinar Tunisia</displayName>
-				<displayName count="many">Dinar Tunisia</displayName>
-				<displayName count="other">Dinar Tunisia</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>Paʻanga Tonga</displayName>
-				<displayName count="zero">Paʻanga Tonga</displayName>
-				<displayName count="one">Paʻanga Tonga</displayName>
-				<displayName count="two">Paʻanga Tonga</displayName>
-				<displayName count="few">Paʻanga Tonga</displayName>
-				<displayName count="many">Paʻanga Tonga</displayName>
-				<displayName count="other">Paʻanga Tonga</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>Lira Twrci</displayName>
-				<displayName count="zero">Lira Twrci</displayName>
-				<displayName count="one">Lira Twrci</displayName>
-				<displayName count="two">Lira Twrci</displayName>
-				<displayName count="few">Lira Twrci</displayName>
-				<displayName count="many">Lira Twrci</displayName>
-				<displayName count="other">Lira Twrci</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>Doler Trinidad a Tobago</displayName>
-				<displayName count="zero">Doler Trinidad a Tobago</displayName>
-				<displayName count="one">Doler Trinidad a Tobago</displayName>
-				<displayName count="two">Doler Trinidad a Tobago</displayName>
-				<displayName count="few">Doler Trinidad a Tobago</displayName>
-				<displayName count="many">Doler Trinidad a Tobago</displayName>
-				<displayName count="other">Doler Trinidad a Tobago</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>Doler Newydd Taiwan</displayName>
-				<displayName count="zero">Doler Newydd Taiwan</displayName>
-				<displayName count="one">Doler Newydd Taiwan</displayName>
-				<displayName count="two">Doler Newydd Taiwan</displayName>
-				<displayName count="few">Doler Newydd Taiwan</displayName>
-				<displayName count="many">Doler Newydd Taiwan</displayName>
-				<displayName count="other">Doler Newydd Taiwan</displayName>
-				<symbol>NT$</symbol>
-			</currency>
-			<currency type="TZS">
-				<displayName>Swllt Tanzania</displayName>
-				<displayName count="zero">Swllt Tanzania</displayName>
-				<displayName count="one">Swllt Tanzania</displayName>
-				<displayName count="two">Swllt Tanzania</displayName>
-				<displayName count="few">Swllt Tanzania</displayName>
-				<displayName count="many">Swllt Tanzania</displayName>
-				<displayName count="other">Swllt Tanzania</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Hryvnia Wcráin</displayName>
-				<displayName count="zero">Hryvnia Wcráin</displayName>
-				<displayName count="one">Hryvnia Wcráin</displayName>
-				<displayName count="two">Hryvnia Wcráin</displayName>
-				<displayName count="few">Hryvnia Wcráin</displayName>
-				<displayName count="many">Hryvnia Wcráin</displayName>
-				<displayName count="other">Hryvnia Wcráin</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>Swllt Uganda</displayName>
-				<displayName count="zero">Swllt Uganda</displayName>
-				<displayName count="one">Swllt Uganda</displayName>
-				<displayName count="two">Swllt Uganda</displayName>
-				<displayName count="few">Swllt Uganda</displayName>
-				<displayName count="many">Swllt Uganda</displayName>
-				<displayName count="other">Swllt Uganda</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>Doler UDA</displayName>
-				<displayName count="zero">Doler UDA</displayName>
-				<displayName count="one">Doler UDA</displayName>
-				<displayName count="two">Doler UDA</displayName>
-				<displayName count="few">Doler UDA</displayName>
-				<displayName count="many">Doler UDA</displayName>
-				<displayName count="other">Doler UDA</displayName>
-				<symbol>US$</symbol>
-			</currency>
-			<currency type="UYU">
-				<displayName>Peso Uruguay</displayName>
-				<displayName count="zero">Peso Uruguay</displayName>
-				<displayName count="one">Peso Uruguay</displayName>
-				<displayName count="two">Peso Uruguay</displayName>
-				<displayName count="few">Peso Uruguay</displayName>
-				<displayName count="many">Peso Uruguay</displayName>
-				<displayName count="other">Peso Uruguay</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>Som Uzbekistan</displayName>
-				<displayName count="zero">Som Uzbekistan</displayName>
-				<displayName count="one">Som Uzbekistan</displayName>
-				<displayName count="two">Som Uzbekistan</displayName>
-				<displayName count="few">Som Uzbekistan</displayName>
-				<displayName count="many">Som Uzbekistan</displayName>
-				<displayName count="other">Som Uzbekistan</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>Bolívar Venezuela</displayName>
-				<displayName count="zero">Bolívar Venezuela</displayName>
-				<displayName count="one">Bolívar Venezuela</displayName>
-				<displayName count="two">Bolívar Venezuela</displayName>
-				<displayName count="few">Bolívar Venezuela</displayName>
-				<displayName count="many">Bolívar Venezuela</displayName>
-				<displayName count="other">Bolívar Venezuela</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>Dong Fietnam</displayName>
-				<displayName count="zero">Dong Fietnam</displayName>
-				<displayName count="one">Dong Fietnam</displayName>
-				<displayName count="two">Dong Fietnam</displayName>
-				<displayName count="few">Dong Fietnam</displayName>
-				<displayName count="many">Dong Fietnam</displayName>
-				<displayName count="other">Dong Fietnam</displayName>
-				<symbol>₫</symbol>
-			</currency>
-			<currency type="VUV">
-				<displayName>Vatu Vanuatu</displayName>
-				<displayName count="zero">Vatu Vanuatu</displayName>
-				<displayName count="one">Vatu Vanuatu</displayName>
-				<displayName count="two">Vatu Vanuatu</displayName>
-				<displayName count="few">Vatu Vanuatu</displayName>
-				<displayName count="many">Vatu Vanuatu</displayName>
-				<displayName count="other">Vatu Vanuatu</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>Tala Samoa</displayName>
-				<displayName count="zero">Tala Samoa</displayName>
-				<displayName count="one">Tala Samoa</displayName>
-				<displayName count="two">Tala Samoa</displayName>
-				<displayName count="few">Tala Samoa</displayName>
-				<displayName count="many">Tala Samoa</displayName>
-				<displayName count="other">Tala Samoa</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>Ffranc CFA y BEAC</displayName>
-				<displayName count="zero">Ffranc CFA y BEAC</displayName>
-				<displayName count="one">Ffranc CFA y BEAC</displayName>
-				<displayName count="two">Ffranc CFA y BEAC</displayName>
-				<displayName count="few">Ffranc CFA y BEAC</displayName>
-				<displayName count="many">Ffranc CFA y BEAC</displayName>
-				<displayName count="other">Ffranc CFA y BEAC</displayName>
-				<symbol>FCFA</symbol>
-			</currency>
-			<currency type="XCD">
-				<displayName>Doler Dwyrain y Caribî</displayName>
-				<displayName count="zero">Doler Dwyrain y Caribî</displayName>
-				<displayName count="one">Doler Dwyrain y Caribî</displayName>
-				<displayName count="two">Doler Dwyrain y Caribî</displayName>
-				<displayName count="few">Doler Dwyrain y Caribî</displayName>
-				<displayName count="many">Doler Dwyrain y Caribî</displayName>
-				<displayName count="other">Doler Dwyrain y Caribî</displayName>
-				<symbol>EC$</symbol>
-			</currency>
-			<currency type="XOF">
-				<displayName>Ffranc CFA y BCEAO</displayName>
-				<displayName count="zero">Ffranc CFA y BCEAO</displayName>
-				<displayName count="one">Ffranc CFA y BCEAO</displayName>
-				<displayName count="two">Ffranc CFA y BCEAO</displayName>
-				<displayName count="few">Ffranc CFA y BCEAO</displayName>
-				<displayName count="many">Ffranc CFA y BCEAO</displayName>
-				<displayName count="other">Ffranc CFA y BCEAO</displayName>
-				<symbol>CFA</symbol>
-			</currency>
-			<currency type="XPF">
-				<displayName>Ffranc CPF</displayName>
-				<displayName count="zero">Ffranc CPF</displayName>
-				<displayName count="one">Ffranc CPF</displayName>
-				<displayName count="two">Ffranc CPF</displayName>
-				<displayName count="few">Ffranc CPF</displayName>
-				<displayName count="many">Ffranc CPF</displayName>
-				<displayName count="other">Ffranc CPF</displayName>
-				<symbol>CFPF</symbol>
-			</currency>
-			<currency type="XXX">
-				<displayName>Arian Cyfredol Anhysbys</displayName>
-				<displayName count="zero">Arian Cyfredol Anhysbys</displayName>
-				<displayName count="one">Arian Cyfredol Anhysbys</displayName>
-				<displayName count="two">Arian Cyfredol Anhysbys</displayName>
-				<displayName count="few">Arian Cyfredol Anhysbys</displayName>
-				<displayName count="many">Arian Cyfredol Anhysbys</displayName>
-				<displayName count="other">Arian Cyfredol Anhysbys</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>Rial Yemen</displayName>
-				<displayName count="zero">Rial Yemen</displayName>
-				<displayName count="one">Rial Yemen</displayName>
-				<displayName count="two">Rial Yemen</displayName>
-				<displayName count="few">Rial Yemen</displayName>
-				<displayName count="many">Rial Yemen</displayName>
-				<displayName count="other">Rial Yemen</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Rand De Affrica</displayName>
-				<displayName count="zero">Rand De Affrica</displayName>
-				<displayName count="one">Rand De Affrica</displayName>
-				<displayName count="two">Rand De Affrica</displayName>
-				<displayName count="few">Rand De Affrica</displayName>
-				<displayName count="many">Rand De Affrica</displayName>
-				<displayName count="other">Rand De Affrica</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>Kwacha Zambia (1968–2012)</displayName>
-				<displayName count="zero">Kwacha Zambia (1968–2012)</displayName>
-				<displayName count="one">Kwacha Zambia (1968–2012)</displayName>
-				<displayName count="two">Kwacha Zambia (1968–2012)</displayName>
-				<displayName count="few">Kwacha Zambia (1968–2012)</displayName>
-				<displayName count="many">Kwacha Zambia (1968–2012)</displayName>
-				<displayName count="other">Kwacha Zambia (1968–2012)</displayName>
-			</currency>
-			<currency type="ZMW">
-				<displayName>Kwacha Zambia</displayName>
-				<displayName count="zero">Kwacha Zambia</displayName>
-				<displayName count="one">Kwacha Zambia</displayName>
-				<displayName count="two">Kwacha Zambia</displayName>
-				<displayName count="few">Kwacha Zambia</displayName>
-				<displayName count="many">Kwacha Zambia</displayName>
-				<displayName count="other">Kwacha Zambia</displayName>
-			</currency>
-		</currencies>
-		<miscPatterns numberSystem="latn">
-			<pattern type="atLeast">{0}+</pattern>
-			<pattern type="range">{0}-{1}</pattern>
-		</miscPatterns>
-	</numbers>
-	<units>
-		<unitLength type="long">
-			<compoundUnit type="per">
-				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
-			</compoundUnit>
-			<unit type="acceleration-g-force">
-				<displayName draft="provisional">grym disgyrchedd</displayName>
-				<unitPattern count="zero">{0} grym disgyrchedd</unitPattern>
-				<unitPattern count="one">{0} grym disgyrchedd</unitPattern>
-				<unitPattern count="two">{0} rym disgyrchedd</unitPattern>
-				<unitPattern count="few">{0} grym disgyrchedd</unitPattern>
-				<unitPattern count="many">{0} grym disgyrchedd</unitPattern>
-				<unitPattern count="other">{0} grym disgyrchedd</unitPattern>
-			</unit>
-			<unit type="angle-arc-minute">
-				<displayName draft="provisional">munud</displayName>
-				<unitPattern count="zero">{0} munud</unitPattern>
-				<unitPattern count="one">{0} munud</unitPattern>
-				<unitPattern count="two">{0} funud</unitPattern>
-				<unitPattern count="few">{0} munud</unitPattern>
-				<unitPattern count="many">{0} munud</unitPattern>
-				<unitPattern count="other">{0} munud</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName draft="provisional">eiliad</displayName>
-				<unitPattern count="zero">{0} eiliad</unitPattern>
-				<unitPattern count="one">{0} eiliad</unitPattern>
-				<unitPattern count="two">{0} eiliad</unitPattern>
-				<unitPattern count="few">{0} eiliad</unitPattern>
-				<unitPattern count="many">{0} eiliad</unitPattern>
-				<unitPattern count="other">{0} eiliad</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName>gradd</displayName>
-				<unitPattern count="zero">{0} gradd</unitPattern>
-				<unitPattern count="one">{0} radd</unitPattern>
-				<unitPattern count="two">{0} radd</unitPattern>
-				<unitPattern count="few">{0} gradd</unitPattern>
-				<unitPattern count="many">{0} gradd</unitPattern>
-				<unitPattern count="other">{0} gradd</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="provisional">erw</displayName>
-				<unitPattern count="zero">{0} erw</unitPattern>
-				<unitPattern count="one">{0} erw</unitPattern>
-				<unitPattern count="two">{0} erw</unitPattern>
-				<unitPattern count="few">{0} erw</unitPattern>
-				<unitPattern count="many">{0} erw</unitPattern>
-				<unitPattern count="other">{0} erw</unitPattern>
-			</unit>
-			<unit type="area-hectare">
-				<displayName draft="provisional">hectar</displayName>
-				<unitPattern count="zero">{0} hectar</unitPattern>
-				<unitPattern count="one">{0} hectar</unitPattern>
-				<unitPattern count="two">{0} hectar</unitPattern>
-				<unitPattern count="few">{0} hectar</unitPattern>
-				<unitPattern count="many">{0} hectar</unitPattern>
-				<unitPattern count="other">{0} hectar</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<displayName draft="provisional">troedfedd sgwâr</displayName>
-				<unitPattern count="zero">{0} troedfedd sgwâr</unitPattern>
-				<unitPattern count="one">{0} droedfedd sgwâr</unitPattern>
-				<unitPattern count="two">{0} droedfedd sgwâr</unitPattern>
-				<unitPattern count="few">{0} troedfedd sgwâr</unitPattern>
-				<unitPattern count="many">{0} throedfedd sgwâr</unitPattern>
-				<unitPattern count="other">{0} troedfedd sgwâr</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="provisional">cilometr sgwâr</displayName>
-				<unitPattern count="zero">{0} cilometr sgwâr</unitPattern>
-				<unitPattern count="one">{0} cilometr sgwâr</unitPattern>
-				<unitPattern count="two">{0} gilometr sgwâr</unitPattern>
-				<unitPattern count="few">{0} chilometr sgwâr</unitPattern>
-				<unitPattern count="many">{0} chilometr sgwâr</unitPattern>
-				<unitPattern count="other">{0} cilometr sgwâr</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName draft="provisional">metr sgwâr</displayName>
-				<unitPattern count="zero">{0} metr sgwâr</unitPattern>
-				<unitPattern count="one">{0} metr sgwâr</unitPattern>
-				<unitPattern count="two">{0} fetr sgwâr</unitPattern>
-				<unitPattern count="few">{0} metr sgwâr</unitPattern>
-				<unitPattern count="many">{0} metr sgwâr</unitPattern>
-				<unitPattern count="other">{0} metr sgwâr</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName draft="provisional">milltir sgwâr</displayName>
-				<unitPattern count="zero">{0} milltir sgwâr</unitPattern>
-				<unitPattern count="one">{0} filltir sgwâr</unitPattern>
-				<unitPattern count="two">{0} filltir sgwâr</unitPattern>
-				<unitPattern count="few">{0} milltir sgwâr</unitPattern>
-				<unitPattern count="many">{0} milltir sgwâr</unitPattern>
-				<unitPattern count="other">{0} milltir sgwâr</unitPattern>
-			</unit>
-			<unit type="duration-day">
-				<displayName draft="provisional">diwrnod</displayName>
-				<unitPattern count="zero">{0} diwrnod</unitPattern>
-				<unitPattern count="one">{0} diwrnod</unitPattern>
-				<unitPattern count="two">{0} ddiwrnod</unitPattern>
-				<unitPattern count="few">{0} diwrnod</unitPattern>
-				<unitPattern count="many">{0} diwrnod</unitPattern>
-				<unitPattern count="other">{0} diwrnod</unitPattern>
-			</unit>
-			<unit type="duration-hour">
-				<displayName draft="provisional">awr</displayName>
-				<unitPattern count="zero">{0} awr</unitPattern>
-				<unitPattern count="one">{0} awr</unitPattern>
-				<unitPattern count="two">{0} awr</unitPattern>
-				<unitPattern count="few">{0} awr</unitPattern>
-				<unitPattern count="many">{0} awr</unitPattern>
-				<unitPattern count="other">{0} awr</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="provisional">milieiliad</displayName>
-				<unitPattern count="zero">{0} milieiliad</unitPattern>
-				<unitPattern count="one">{0} milieiliad</unitPattern>
-				<unitPattern count="two">{0} filieiliad</unitPattern>
-				<unitPattern count="few">{0} milieiliad</unitPattern>
-				<unitPattern count="many">{0} milieiliad</unitPattern>
-				<unitPattern count="other">{0} milieiliad</unitPattern>
-			</unit>
-			<unit type="duration-minute">
-				<displayName draft="provisional">munud</displayName>
-				<unitPattern count="zero">{0} munud</unitPattern>
-				<unitPattern count="one">{0} munud</unitPattern>
-				<unitPattern count="two">{0} funud</unitPattern>
-				<unitPattern count="few">{0} munud</unitPattern>
-				<unitPattern count="many">{0} munud</unitPattern>
-				<unitPattern count="other">{0} munud</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">mis</displayName>
-				<unitPattern count="zero">{0} mis</unitPattern>
-				<unitPattern count="one">{0} mis</unitPattern>
-				<unitPattern count="two">{0} fis</unitPattern>
-				<unitPattern count="few">{0} mis</unitPattern>
-				<unitPattern count="many">{0} mis</unitPattern>
-				<unitPattern count="other">{0} mis</unitPattern>
-			</unit>
-			<unit type="duration-second">
-				<displayName draft="provisional">eiliad</displayName>
-				<unitPattern count="zero">{0} eiliad</unitPattern>
-				<unitPattern count="one">{0} eiliad</unitPattern>
-				<unitPattern count="two">{0} eiliad</unitPattern>
-				<unitPattern count="few">{0} eiliad</unitPattern>
-				<unitPattern count="many">{0} eiliad</unitPattern>
-				<unitPattern count="other">{0} eiliad</unitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">wythnos</displayName>
-				<unitPattern count="zero">{0} wythnos</unitPattern>
-				<unitPattern count="one">{0} wythnos</unitPattern>
-				<unitPattern count="two">{0} wythnos</unitPattern>
-				<unitPattern count="few">{0} wythnos</unitPattern>
-				<unitPattern count="many">{0} wythnos</unitPattern>
-				<unitPattern count="other">{0} wythnos</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">mlynedd</displayName>
-				<unitPattern count="zero">{0} mlynedd</unitPattern>
-				<unitPattern count="one">{0} flwyddyn</unitPattern>
-				<unitPattern count="two">{0} flynedd</unitPattern>
-				<unitPattern count="few">{0} blynedd</unitPattern>
-				<unitPattern count="many">{0} blynedd</unitPattern>
-				<unitPattern count="other">{0} mlynedd</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="provisional">centimetr</displayName>
-				<unitPattern count="zero">{0} centimetr</unitPattern>
-				<unitPattern count="one">{0} centimetr</unitPattern>
-				<unitPattern count="two">{0} gentimetr</unitPattern>
-				<unitPattern count="few">{0} chentimetr</unitPattern>
-				<unitPattern count="many">{0} chentimetr</unitPattern>
-				<unitPattern count="other">{0} centimetr</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="provisional">troedfedd</displayName>
-				<unitPattern count="zero">{0} troedfedd</unitPattern>
-				<unitPattern count="one">{0} droedfedd</unitPattern>
-				<unitPattern count="two">{0} droedfedd</unitPattern>
-				<unitPattern count="few">{0} troedfedd</unitPattern>
-				<unitPattern count="many">{0} throedfedd</unitPattern>
-				<unitPattern count="other">{0} troedfedd</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="provisional">modfedd</displayName>
-				<unitPattern count="zero">{0} modfedd</unitPattern>
-				<unitPattern count="one">{0} fodfedd</unitPattern>
-				<unitPattern count="two">{0} fodfedd</unitPattern>
-				<unitPattern count="few">{0} modfedd</unitPattern>
-				<unitPattern count="many">{0} modfedd</unitPattern>
-				<unitPattern count="other">{0} modfedd</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName draft="provisional">cilometr</displayName>
-				<unitPattern count="zero">{0} cilometr</unitPattern>
-				<unitPattern count="one">{0} cilometr</unitPattern>
-				<unitPattern count="two">{0} gilometr</unitPattern>
-				<unitPattern count="few">{0} chilometr</unitPattern>
-				<unitPattern count="many">{0} chilometr</unitPattern>
-				<unitPattern count="other">{0} cilometr</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName draft="provisional">blwyddyn golau</displayName>
-				<unitPattern count="zero">{0} blwyddyn golau</unitPattern>
-				<unitPattern count="one">{0} flwyddyn golau</unitPattern>
-				<unitPattern count="two">{0} flwyddyn golau</unitPattern>
-				<unitPattern count="few">{0} blwyddyn golau</unitPattern>
-				<unitPattern count="many">{0} blwyddyn golau</unitPattern>
-				<unitPattern count="other">{0} blwyddyn golau</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName draft="provisional">metr</displayName>
-				<unitPattern count="zero">{0} metr</unitPattern>
-				<unitPattern count="one">{0} metr</unitPattern>
-				<unitPattern count="two">{0} fetr</unitPattern>
-				<unitPattern count="few">{0} metr</unitPattern>
-				<unitPattern count="many">{0} metr</unitPattern>
-				<unitPattern count="other">{0} metr</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName draft="provisional">milltir</displayName>
-				<unitPattern count="zero">{0} milltir</unitPattern>
-				<unitPattern count="one">{0} filltir</unitPattern>
-				<unitPattern count="two">{0} filltir</unitPattern>
-				<unitPattern count="few">{0} milltir</unitPattern>
-				<unitPattern count="many">{0} milltir</unitPattern>
-				<unitPattern count="other">{0} milltir</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName draft="provisional">milimetr</displayName>
-				<unitPattern count="zero">{0} milimetr</unitPattern>
-				<unitPattern count="one">{0} milimetr</unitPattern>
-				<unitPattern count="two">{0} filimetr</unitPattern>
-				<unitPattern count="few">{0} milimetr</unitPattern>
-				<unitPattern count="many">{0} milimetr</unitPattern>
-				<unitPattern count="other">{0} milimetr</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName draft="provisional">picometr</displayName>
-				<unitPattern count="zero">{0} picometr</unitPattern>
-				<unitPattern count="one">{0} picometr</unitPattern>
-				<unitPattern count="two">{0} bicometr</unitPattern>
-				<unitPattern count="few">{0} phicometr</unitPattern>
-				<unitPattern count="many">{0} phicometr</unitPattern>
-				<unitPattern count="other">{0} picometr</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<displayName draft="provisional">llath</displayName>
-				<unitPattern count="zero">{0} llath</unitPattern>
-				<unitPattern count="one">{0} llath</unitPattern>
-				<unitPattern count="two">{0} lath</unitPattern>
-				<unitPattern count="few">{0} llath</unitPattern>
-				<unitPattern count="many">{0} llath</unitPattern>
-				<unitPattern count="other">{0} llath</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName draft="provisional">gram</displayName>
-				<unitPattern count="zero">{0} gram</unitPattern>
-				<unitPattern count="one">{0} gram</unitPattern>
-				<unitPattern count="two">{0} gram</unitPattern>
-				<unitPattern count="few">{0} gram</unitPattern>
-				<unitPattern count="many">{0} gram</unitPattern>
-				<unitPattern count="other">{0} gram</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName draft="provisional">cilogram</displayName>
-				<unitPattern count="zero">{0} cilogram</unitPattern>
-				<unitPattern count="one">{0} cilogram</unitPattern>
-				<unitPattern count="two">{0} gilogram</unitPattern>
-				<unitPattern count="few">{0} chilogram</unitPattern>
-				<unitPattern count="many">{0} chilogram</unitPattern>
-				<unitPattern count="other">{0} cilogram</unitPattern>
-			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="provisional">owns</displayName>
-				<unitPattern count="zero">{0} owns</unitPattern>
-				<unitPattern count="one">{0} owns</unitPattern>
-				<unitPattern count="two">{0} owns</unitPattern>
-				<unitPattern count="few">{0} owns</unitPattern>
-				<unitPattern count="many">{0} owns</unitPattern>
-				<unitPattern count="other">{0} owns</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName draft="provisional">pwys</displayName>
-				<unitPattern count="zero">{0} pwys</unitPattern>
-				<unitPattern count="one">{0} pwys</unitPattern>
-				<unitPattern count="two">{0} bwys</unitPattern>
-				<unitPattern count="few">{0} phwys</unitPattern>
-				<unitPattern count="many">{0} phwys</unitPattern>
-				<unitPattern count="other">{0} pwys</unitPattern>
-			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="provisional">marchnerth</displayName>
-				<unitPattern count="zero">{0} marchnerth</unitPattern>
-				<unitPattern count="one">{0} marchnerth</unitPattern>
-				<unitPattern count="two">{0} farchnerth</unitPattern>
-				<unitPattern count="few">{0} marchnerth</unitPattern>
-				<unitPattern count="many">{0} marchnerth</unitPattern>
-				<unitPattern count="other">{0} marchnerth</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName draft="provisional">cilowat</displayName>
-				<unitPattern count="zero">{0} cilowat</unitPattern>
-				<unitPattern count="one">{0} cilowat</unitPattern>
-				<unitPattern count="two">{0} gilowat</unitPattern>
-				<unitPattern count="few">{0} chilowat</unitPattern>
-				<unitPattern count="many">{0} chilowat</unitPattern>
-				<unitPattern count="other">{0} cilowat</unitPattern>
-			</unit>
-			<unit type="power-watt">
-				<displayName draft="provisional">wat</displayName>
-				<unitPattern count="zero">{0} wat</unitPattern>
-				<unitPattern count="one">{0} wat</unitPattern>
-				<unitPattern count="two">{0} wat</unitPattern>
-				<unitPattern count="few">{0} wat</unitPattern>
-				<unitPattern count="many">{0} wat</unitPattern>
-				<unitPattern count="other">{0} wat</unitPattern>
-			</unit>
-			<unit type="pressure-hectopascal">
-				<displayName>hectopascal</displayName>
-				<unitPattern count="zero">{0} hectopascal</unitPattern>
-				<unitPattern count="one">{0} hectopascal</unitPattern>
-				<unitPattern count="two">{0} hectopascal</unitPattern>
-				<unitPattern count="few">{0} hectopascal</unitPattern>
-				<unitPattern count="many">{0} hectopascal</unitPattern>
-				<unitPattern count="other">{0} hectopascal</unitPattern>
-			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName draft="provisional">modfedd o fercwri</displayName>
-				<unitPattern count="zero">{0} modfedd o fercwri</unitPattern>
-				<unitPattern count="one">{0} fodfedd o fercwri</unitPattern>
-				<unitPattern count="two">{0} fodfedd o fercwri</unitPattern>
-				<unitPattern count="few">{0} modfedd o fercwri</unitPattern>
-				<unitPattern count="many">{0} modfedd o fercwri</unitPattern>
-				<unitPattern count="other">{0} modfedd o fercwri</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>milibar</displayName>
-				<unitPattern count="zero">{0} milibar</unitPattern>
-				<unitPattern count="one">{0} milibar</unitPattern>
-				<unitPattern count="two">{0} filibar</unitPattern>
-				<unitPattern count="few">{0} milibar</unitPattern>
-				<unitPattern count="many">{0} milibar</unitPattern>
-				<unitPattern count="other">{0} milibar</unitPattern>
-			</unit>
-			<unit type="speed-kilometer-per-hour">
-				<displayName draft="provisional">cilometr yr awr</displayName>
-				<unitPattern count="zero">{0} cilometr yr awr</unitPattern>
-				<unitPattern count="one">{0} cilometr yr awr</unitPattern>
-				<unitPattern count="two">{0} gilometr yr awr</unitPattern>
-				<unitPattern count="few">{0} chilometr yr awr</unitPattern>
-				<unitPattern count="many">{0} chilometr yr awr</unitPattern>
-				<unitPattern count="other">{0} cilometr yr awr</unitPattern>
-			</unit>
-			<unit type="speed-meter-per-second">
-				<displayName draft="provisional">metr yr eiliad</displayName>
-				<unitPattern count="zero">{0} metr yr eiliad</unitPattern>
-				<unitPattern count="one">{0} metr yr eiliad</unitPattern>
-				<unitPattern count="two">{0} fetr yr eiliad</unitPattern>
-				<unitPattern count="few">{0} metr yr eiliad</unitPattern>
-				<unitPattern count="many">{0} metr yr eiliad</unitPattern>
-				<unitPattern count="other">{0} metr yr eiliad</unitPattern>
-			</unit>
-			<unit type="speed-mile-per-hour">
-				<displayName draft="provisional">milltir yr awr</displayName>
-				<unitPattern count="zero">{0} milltir yr awr</unitPattern>
-				<unitPattern count="one">{0} filltir yr awr</unitPattern>
-				<unitPattern count="two">{0} filltir yr awr</unitPattern>
-				<unitPattern count="few">{0} milltir yr awr</unitPattern>
-				<unitPattern count="many">{0} milltir yr awr</unitPattern>
-				<unitPattern count="other">{0} milltir yr awr</unitPattern>
-			</unit>
-			<unit type="temperature-celsius">
-				<displayName draft="provisional">gradd Celsius</displayName>
-				<unitPattern count="zero">{0} gradd Celsius</unitPattern>
-				<unitPattern count="one">{0} radd Celsius</unitPattern>
-				<unitPattern count="two">{0} radd Celsius</unitPattern>
-				<unitPattern count="few">{0} gradd Celsius</unitPattern>
-				<unitPattern count="many">{0} gradd Celsius</unitPattern>
-				<unitPattern count="other">{0} gradd Celsius</unitPattern>
-			</unit>
-			<unit type="temperature-fahrenheit">
-				<displayName>gradd Fahrenheit</displayName>
-				<unitPattern count="zero">{0} gradd Fahrenheit</unitPattern>
-				<unitPattern count="one">{0} radd Fahrenheit</unitPattern>
-				<unitPattern count="two">{0} radd Fahrenheit</unitPattern>
-				<unitPattern count="few">{0} gradd Fahrenheit</unitPattern>
-				<unitPattern count="many">{0} gradd Fahrenheit</unitPattern>
-				<unitPattern count="other">{0} gradd Fahrenheit</unitPattern>
-			</unit>
-			<unit type="volume-cubic-kilometer">
-				<displayName draft="provisional">cilometr ciwbig</displayName>
-				<unitPattern count="zero">{0} cilometr ciwbig</unitPattern>
-				<unitPattern count="one">{0} cilometr ciwbig</unitPattern>
-				<unitPattern count="two">{0} gilometr ciwbig</unitPattern>
-				<unitPattern count="few">{0} chilometr ciwbig</unitPattern>
-				<unitPattern count="many">{0} chilometr ciwbig</unitPattern>
-				<unitPattern count="other">{0} cilometr ciwbig</unitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<displayName draft="provisional">milltir giwbig</displayName>
-				<unitPattern count="zero">{0} milltir giwbig</unitPattern>
-				<unitPattern count="one">{0} filltir giwbig</unitPattern>
-				<unitPattern count="two">{0} filltir giwbig</unitPattern>
-				<unitPattern count="few">{0} milltir giwbig</unitPattern>
-				<unitPattern count="many">{0} milltir giwbig</unitPattern>
-				<unitPattern count="other">{0} milltir giwbig</unitPattern>
-			</unit>
-			<unit type="volume-liter">
-				<displayName draft="provisional">litr</displayName>
-				<unitPattern count="zero">{0} litr</unitPattern>
-				<unitPattern count="one">{0} litr</unitPattern>
-				<unitPattern count="two">{0} litr</unitPattern>
-				<unitPattern count="few">{0} litr</unitPattern>
-				<unitPattern count="many">{0} litr</unitPattern>
-				<unitPattern count="other">{0} litr</unitPattern>
-			</unit>
-		</unitLength>
-		<unitLength type="short">
-			<compoundUnit type="per">
-				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
-			</compoundUnit>
-			<unit type="acceleration-g-force">
-				<displayName draft="provisional">grym disgyrchedd</displayName>
-				<unitPattern count="zero">{0} G</unitPattern>
-				<unitPattern count="one">{0} G</unitPattern>
-				<unitPattern count="two">{0} G</unitPattern>
-				<unitPattern count="few">{0} G</unitPattern>
-				<unitPattern count="many">{0} G</unitPattern>
-				<unitPattern count="other">{0} G</unitPattern>
-			</unit>
-			<unit type="angle-arc-minute">
-				<displayName draft="provisional">munud</displayName>
-				<unitPattern count="zero">{0}′</unitPattern>
-				<unitPattern count="one">{0}′</unitPattern>
-				<unitPattern count="two">{0}′</unitPattern>
-				<unitPattern count="few">{0}′</unitPattern>
-				<unitPattern count="many">{0}′</unitPattern>
-				<unitPattern count="other">{0}′</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName draft="provisional">eiliad</displayName>
-				<unitPattern count="zero">{0}″</unitPattern>
-				<unitPattern count="one">{0}″</unitPattern>
-				<unitPattern count="two">{0}″</unitPattern>
-				<unitPattern count="few">{0}″</unitPattern>
-				<unitPattern count="many">{0}″</unitPattern>
-				<unitPattern count="other">{0}″</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName>gradd</displayName>
-				<unitPattern count="zero">{0}°</unitPattern>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="two">{0}°</unitPattern>
-				<unitPattern count="few">{0}°</unitPattern>
-				<unitPattern count="many">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="provisional">erw</displayName>
-				<unitPattern count="zero">{0} erw</unitPattern>
-				<unitPattern count="one">{0} erw</unitPattern>
-				<unitPattern count="two">{0} erw</unitPattern>
-				<unitPattern count="few">{0} erw</unitPattern>
-				<unitPattern count="many">{0} erw</unitPattern>
-				<unitPattern count="other">{0} erw</unitPattern>
-			</unit>
-			<unit type="area-hectare">
-				<displayName draft="provisional">hectar</displayName>
-				<unitPattern count="zero">{0} ha</unitPattern>
-				<unitPattern count="one">{0} ha</unitPattern>
-				<unitPattern count="two">{0} ha</unitPattern>
-				<unitPattern count="few">{0} ha</unitPattern>
-				<unitPattern count="many">{0} ha</unitPattern>
-				<unitPattern count="other">{0} ha</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<displayName draft="provisional">troedfedd sgwâr</displayName>
-				<unitPattern count="zero">{0} troedfedd ²</unitPattern>
-				<unitPattern count="one">{0} droedfedd ²</unitPattern>
-				<unitPattern count="two">{0} droedfedd ²</unitPattern>
-				<unitPattern count="few">{0} troedfedd ²</unitPattern>
-				<unitPattern count="many">{0} throedfedd ²</unitPattern>
-				<unitPattern count="other">{0} troedfedd ²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="provisional">cilometr sgwâr</displayName>
-				<unitPattern count="zero">{0} km²</unitPattern>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="two">{0} km²</unitPattern>
-				<unitPattern count="few">{0} km²</unitPattern>
-				<unitPattern count="many">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName draft="provisional">metr sgwâr</displayName>
-				<unitPattern count="zero">{0} m²</unitPattern>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="two">{0} m²</unitPattern>
-				<unitPattern count="few">{0} m²</unitPattern>
-				<unitPattern count="many">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName draft="provisional">milltir sgwâr</displayName>
-				<unitPattern count="zero">{0} mi²</unitPattern>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="two">{0} mi²</unitPattern>
-				<unitPattern count="few">{0} mi²</unitPattern>
-				<unitPattern count="many">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="consumption-liter-per-kilometer">
-				<displayName>L/km</displayName>
-				<unitPattern count="zero">{0} L/km</unitPattern>
-				<unitPattern count="one">{0} L/km</unitPattern>
-				<unitPattern count="two">{0} L/km</unitPattern>
-				<unitPattern count="few">{0} L/km</unitPattern>
-				<unitPattern count="many">{0} L/km</unitPattern>
-				<unitPattern count="other">{0} L/km</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<unitPattern count="zero">{0} Gb</unitPattern>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="two">{0} Gb</unitPattern>
-				<unitPattern count="few">{0} Gb</unitPattern>
-				<unitPattern count="many">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<unitPattern count="zero">{0} GB</unitPattern>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="two">{0} GB</unitPattern>
-				<unitPattern count="few">{0} GB</unitPattern>
-				<unitPattern count="many">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<unitPattern count="zero">{0} kb</unitPattern>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="two">{0} kb</unitPattern>
-				<unitPattern count="few">{0} kb</unitPattern>
-				<unitPattern count="many">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<unitPattern count="zero">{0} kB</unitPattern>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="two">{0} kB</unitPattern>
-				<unitPattern count="few">{0} kB</unitPattern>
-				<unitPattern count="many">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<unitPattern count="zero">{0} Mb</unitPattern>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="two">{0} Mb</unitPattern>
-				<unitPattern count="few">{0} Mb</unitPattern>
-				<unitPattern count="many">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<unitPattern count="zero">{0} MB</unitPattern>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="two">{0} MB</unitPattern>
-				<unitPattern count="few">{0} MB</unitPattern>
-				<unitPattern count="many">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<unitPattern count="zero">{0} Tb</unitPattern>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="two">{0} Tb</unitPattern>
-				<unitPattern count="few">{0} Tb</unitPattern>
-				<unitPattern count="many">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
-			<unit type="digital-terabyte">
-				<unitPattern count="zero">{0} TB</unitPattern>
-				<unitPattern count="one">{0} TB</unitPattern>
-				<unitPattern count="two">{0} TB</unitPattern>
-				<unitPattern count="few">{0} TB</unitPattern>
-				<unitPattern count="many">{0} TB</unitPattern>
-				<unitPattern count="other">{0} TB</unitPattern>
-			</unit>
-			<unit type="duration-day">
-				<displayName draft="provisional">diwrnod</displayName>
-				<unitPattern count="zero">{0} diwrnod</unitPattern>
-				<unitPattern count="one">{0} diwrnod</unitPattern>
-				<unitPattern count="two">{0} ddiwrnod</unitPattern>
-				<unitPattern count="few">{0} diwrnod</unitPattern>
-				<unitPattern count="many">{0} diwrnod</unitPattern>
-				<unitPattern count="other">{0} diwrnod</unitPattern>
-			</unit>
-			<unit type="duration-hour">
-				<displayName draft="provisional">awr</displayName>
-				<unitPattern count="zero">{0} awr</unitPattern>
-				<unitPattern count="one">{0} awr</unitPattern>
-				<unitPattern count="two">{0} awr</unitPattern>
-				<unitPattern count="few">{0} awr</unitPattern>
-				<unitPattern count="many">{0} awr</unitPattern>
-				<unitPattern count="other">{0} awr</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="provisional">milieiliad</displayName>
-				<unitPattern count="zero">{0} ms</unitPattern>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="two">{0} ms</unitPattern>
-				<unitPattern count="few">{0} ms</unitPattern>
-				<unitPattern count="many">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
-			<unit type="duration-minute">
-				<displayName draft="provisional">munud</displayName>
-				<unitPattern count="zero">{0} mun</unitPattern>
-				<unitPattern count="one">{0} mun</unitPattern>
-				<unitPattern count="two">{0} mun</unitPattern>
-				<unitPattern count="few">{0} mun</unitPattern>
-				<unitPattern count="many">{0} mun</unitPattern>
-				<unitPattern count="other">{0} mun</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">mis</displayName>
-				<unitPattern count="zero">{0} mis</unitPattern>
-				<unitPattern count="one">{0} mis</unitPattern>
-				<unitPattern count="two">{0} fis</unitPattern>
-				<unitPattern count="few">{0} mis</unitPattern>
-				<unitPattern count="many">{0} mis</unitPattern>
-				<unitPattern count="other">{0} mis</unitPattern>
-			</unit>
-			<unit type="duration-second">
-				<displayName draft="provisional">eiliad</displayName>
-				<unitPattern count="zero">{0} eil</unitPattern>
-				<unitPattern count="one">{0} eil</unitPattern>
-				<unitPattern count="two">{0} eil</unitPattern>
-				<unitPattern count="few">{0} eil</unitPattern>
-				<unitPattern count="many">{0} eil</unitPattern>
-				<unitPattern count="other">{0} eil</unitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">wythnos</displayName>
-				<unitPattern count="zero">{0} wythnos</unitPattern>
-				<unitPattern count="one">{0} wythnos</unitPattern>
-				<unitPattern count="two">{0} wythnos</unitPattern>
-				<unitPattern count="few">{0} wythnos</unitPattern>
-				<unitPattern count="many">{0} wythnos</unitPattern>
-				<unitPattern count="other">{0} wythnos</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">mlynedd</displayName>
-				<unitPattern count="zero">{0} bl</unitPattern>
-				<unitPattern count="one">{0} bl</unitPattern>
-				<unitPattern count="two">{0} bl</unitPattern>
-				<unitPattern count="few">{0} bl</unitPattern>
-				<unitPattern count="many">{0} bl</unitPattern>
-				<unitPattern count="other">{0} bl</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="provisional">centimetr</displayName>
-				<unitPattern count="zero">{0} cm</unitPattern>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="two">{0} cm</unitPattern>
-				<unitPattern count="few">{0} cm</unitPattern>
-				<unitPattern count="many">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="provisional">troedfedd</displayName>
-				<unitPattern count="zero">{0}′</unitPattern>
-				<unitPattern count="one">{0}′</unitPattern>
-				<unitPattern count="two">{0}′</unitPattern>
-				<unitPattern count="few">{0}′</unitPattern>
-				<unitPattern count="many">{0}′</unitPattern>
-				<unitPattern count="other">{0}′</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="provisional">modfedd</displayName>
-				<unitPattern count="zero">{0} modfedd</unitPattern>
-				<unitPattern count="one">{0} fodfedd</unitPattern>
-				<unitPattern count="two">{0} fodfedd</unitPattern>
-				<unitPattern count="few">{0} modfedd</unitPattern>
-				<unitPattern count="many">{0} modfedd</unitPattern>
-				<unitPattern count="other">{0} modfedd</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName draft="provisional">cilometr</displayName>
-				<unitPattern count="zero">{0} km</unitPattern>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="two">{0} km</unitPattern>
-				<unitPattern count="few">{0} km</unitPattern>
-				<unitPattern count="many">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName draft="provisional">blwyddyn golau</displayName>
-				<unitPattern count="zero">{0} blwyddyn golau</unitPattern>
-				<unitPattern count="one">{0} flwyddyn golau</unitPattern>
-				<unitPattern count="two">{0} flwyddyn golau</unitPattern>
-				<unitPattern count="few">{0} blwyddyn golau</unitPattern>
-				<unitPattern count="many">{0} blwyddyn golau</unitPattern>
-				<unitPattern count="other">{0} blwyddyn golau</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName draft="provisional">metr</displayName>
-				<unitPattern count="zero">{0} m</unitPattern>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="two">{0} m</unitPattern>
-				<unitPattern count="few">{0} m</unitPattern>
-				<unitPattern count="many">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName draft="provisional">milltir</displayName>
-				<unitPattern count="zero">{0} milltir</unitPattern>
-				<unitPattern count="one">{0} filltir</unitPattern>
-				<unitPattern count="two">{0} filltir</unitPattern>
-				<unitPattern count="few">{0} milltir</unitPattern>
-				<unitPattern count="many">{0} milltir</unitPattern>
-				<unitPattern count="other">{0} milltir</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName draft="provisional">milimetr</displayName>
-				<unitPattern count="zero">{0} mm</unitPattern>
-				<unitPattern count="one">{0} mm</unitPattern>
-				<unitPattern count="two">{0} mm</unitPattern>
-				<unitPattern count="few">{0} mm</unitPattern>
-				<unitPattern count="many">{0} mm</unitPattern>
-				<unitPattern count="other">{0} mm</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName draft="provisional">picometr</displayName>
-				<unitPattern count="zero">{0} pm</unitPattern>
-				<unitPattern count="one">{0} pm</unitPattern>
-				<unitPattern count="two">{0} pm</unitPattern>
-				<unitPattern count="few">{0} pm</unitPattern>
-				<unitPattern count="many">{0} pm</unitPattern>
-				<unitPattern count="other">{0} pm</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<displayName draft="provisional">llath</displayName>
-				<unitPattern count="zero">{0} llath</unitPattern>
-				<unitPattern count="one">{0} llath</unitPattern>
-				<unitPattern count="two">{0} lath</unitPattern>
-				<unitPattern count="few">{0} llath</unitPattern>
-				<unitPattern count="many">{0} llath</unitPattern>
-				<unitPattern count="other">{0} llath</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName draft="provisional">gram</displayName>
-				<unitPattern count="zero">{0} g</unitPattern>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="two">{0} g</unitPattern>
-				<unitPattern count="few">{0} g</unitPattern>
-				<unitPattern count="many">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName draft="provisional">cilogram</displayName>
-				<unitPattern count="zero">{0} kg</unitPattern>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="two">{0} kg</unitPattern>
-				<unitPattern count="few">{0} kg</unitPattern>
-				<unitPattern count="many">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="provisional">owns</displayName>
-				<unitPattern count="zero">{0} owns</unitPattern>
-				<unitPattern count="one">{0} owns</unitPattern>
-				<unitPattern count="two">{0} owns</unitPattern>
-				<unitPattern count="few">{0} owns</unitPattern>
-				<unitPattern count="many">{0} owns</unitPattern>
-				<unitPattern count="other">{0} owns</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName draft="provisional">pwys</displayName>
-				<unitPattern count="zero">{0} pwys</unitPattern>
-				<unitPattern count="one">{0} pwys</unitPattern>
-				<unitPattern count="two">{0} bwys</unitPattern>
-				<unitPattern count="few">{0} phwys</unitPattern>
-				<unitPattern count="many">{0} phwys</unitPattern>
-				<unitPattern count="other">{0} pwys</unitPattern>
-			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="provisional">marchnerth</displayName>
-				<unitPattern count="zero">{0} hp</unitPattern>
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="two">{0} hp</unitPattern>
-				<unitPattern count="few">{0} hp</unitPattern>
-				<unitPattern count="many">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName draft="provisional">cilowat</displayName>
-				<unitPattern count="zero">{0} kW</unitPattern>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="two">{0} kW</unitPattern>
-				<unitPattern count="few">{0} kW</unitPattern>
-				<unitPattern count="many">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
-			<unit type="power-watt">
-				<displayName draft="provisional">wat</displayName>
-				<unitPattern count="zero">{0} W</unitPattern>
-				<unitPattern count="one">{0} W</unitPattern>
-				<unitPattern count="two">{0} W</unitPattern>
-				<unitPattern count="few">{0} W</unitPattern>
-				<unitPattern count="many">{0} W</unitPattern>
-				<unitPattern count="other">{0} W</unitPattern>
-			</unit>
-			<unit type="pressure-hectopascal">
-				<displayName draft="provisional">hectopascal</displayName>
-				<unitPattern count="zero">{0} hPa</unitPattern>
-				<unitPattern count="one">{0} hPa</unitPattern>
-				<unitPattern count="two">{0} hPa</unitPattern>
-				<unitPattern count="few">{0} hPa</unitPattern>
-				<unitPattern count="many">{0} hPa</unitPattern>
-				<unitPattern count="other">{0} hPa</unitPattern>
-			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName draft="provisional">modfedd o fercwri</displayName>
-				<unitPattern count="zero">{0} &quot; Hg</unitPattern>
-				<unitPattern count="one">{0} &quot; Hg</unitPattern>
-				<unitPattern count="two">{0} &quot; Hg</unitPattern>
-				<unitPattern count="few">{0} &quot; Hg</unitPattern>
-				<unitPattern count="many">{0} &quot; Hg</unitPattern>
-				<unitPattern count="other">{0} &quot; Hg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName draft="provisional">milibar</displayName>
-				<unitPattern count="zero">{0} mbar</unitPattern>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="two">{0} mbar</unitPattern>
-				<unitPattern count="few">{0} mbar</unitPattern>
-				<unitPattern count="many">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<displayName>mm Hg</displayName>
-				<unitPattern count="zero">{0} mm Hg</unitPattern>
-				<unitPattern count="one">{0} mm Hg</unitPattern>
-				<unitPattern count="two">{0} mm Hg</unitPattern>
-				<unitPattern count="few">{0} mm Hg</unitPattern>
-				<unitPattern count="many">{0} mm Hg</unitPattern>
-				<unitPattern count="other">{0} mm Hg</unitPattern>
-			</unit>
-			<unit type="pressure-pound-per-square-inch">
-				<displayName>psi</displayName>
-				<unitPattern count="zero">{0} psi</unitPattern>
-				<unitPattern count="one">{0} psi</unitPattern>
-				<unitPattern count="two">{0} psi</unitPattern>
-				<unitPattern count="few">{0} psi</unitPattern>
-				<unitPattern count="many">{0} psi</unitPattern>
-				<unitPattern count="other">{0} psi</unitPattern>
-			</unit>
-			<unit type="speed-kilometer-per-hour">
-				<displayName draft="provisional">cilometr yr awr</displayName>
-				<unitPattern count="zero">{0} km/h</unitPattern>
-				<unitPattern count="one">{0} km/h</unitPattern>
-				<unitPattern count="two">{0} km/h</unitPattern>
-				<unitPattern count="few">{0} km/h</unitPattern>
-				<unitPattern count="many">{0} km/h</unitPattern>
-				<unitPattern count="other">{0} km/h</unitPattern>
-			</unit>
-			<unit type="speed-meter-per-second">
-				<displayName draft="provisional">metr yr eiliad</displayName>
-				<unitPattern count="zero">{0} m/s</unitPattern>
-				<unitPattern count="one">{0} m/s</unitPattern>
-				<unitPattern count="two">{0} m/s</unitPattern>
-				<unitPattern count="few">{0} m/s</unitPattern>
-				<unitPattern count="many">{0} m/s</unitPattern>
-				<unitPattern count="other">{0} m/s</unitPattern>
-			</unit>
-			<unit type="speed-mile-per-hour">
-				<displayName draft="provisional">milltir yr awr</displayName>
-				<unitPattern count="zero">{0} m.y.a.</unitPattern>
-				<unitPattern count="one">{0} m.y.a.</unitPattern>
-				<unitPattern count="two">{0} m.y.a.</unitPattern>
-				<unitPattern count="few">{0} m.y.a.</unitPattern>
-				<unitPattern count="many">{0} m.y.a.</unitPattern>
-				<unitPattern count="other">{0} m.y.a.</unitPattern>
-			</unit>
-			<unit type="temperature-celsius">
-				<displayName draft="provisional">gradd Celsius</displayName>
-				<unitPattern count="zero">{0}°C</unitPattern>
-				<unitPattern count="one">{0}°C</unitPattern>
-				<unitPattern count="two">{0}°C</unitPattern>
-				<unitPattern count="few">{0}°C</unitPattern>
-				<unitPattern count="many">{0}°C</unitPattern>
-				<unitPattern count="other">{0}°C</unitPattern>
-			</unit>
-			<unit type="temperature-fahrenheit">
-				<displayName draft="provisional">gradd Fahrenheit</displayName>
-				<unitPattern count="zero">{0}°F</unitPattern>
-				<unitPattern count="one">{0}°F</unitPattern>
-				<unitPattern count="two">{0}°F</unitPattern>
-				<unitPattern count="few">{0}°F</unitPattern>
-				<unitPattern count="many">{0}°F</unitPattern>
-				<unitPattern count="other">{0}°F</unitPattern>
-			</unit>
-			<unit type="temperature-kelvin">
-				<displayName>K</displayName>
-				<unitPattern count="zero">{0} K</unitPattern>
-				<unitPattern count="one">{0} K</unitPattern>
-				<unitPattern count="two">{0} K</unitPattern>
-				<unitPattern count="few">{0} K</unitPattern>
-				<unitPattern count="many">{0} K</unitPattern>
-				<unitPattern count="other">{0} K</unitPattern>
-			</unit>
-			<unit type="volume-cubic-kilometer">
-				<displayName draft="provisional">cilometr ciwbig</displayName>
-				<unitPattern count="zero">{0} km³</unitPattern>
-				<unitPattern count="one">{0} km³</unitPattern>
-				<unitPattern count="two">{0} km³</unitPattern>
-				<unitPattern count="few">{0} km³</unitPattern>
-				<unitPattern count="many">{0} km³</unitPattern>
-				<unitPattern count="other">{0} km³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<displayName draft="provisional">milltir giwbig</displayName>
-				<unitPattern count="zero">{0} mi³</unitPattern>
-				<unitPattern count="one">{0} mi³</unitPattern>
-				<unitPattern count="two">{0} mi³</unitPattern>
-				<unitPattern count="few">{0} mi³</unitPattern>
-				<unitPattern count="many">{0} mi³</unitPattern>
-				<unitPattern count="other">{0} mi³</unitPattern>
-			</unit>
-			<unit type="volume-liter">
-				<displayName draft="provisional">litr</displayName>
-				<unitPattern count="zero">{0} l</unitPattern>
-				<unitPattern count="one">{0} l</unitPattern>
-				<unitPattern count="two">{0} l</unitPattern>
-				<unitPattern count="few">{0} l</unitPattern>
-				<unitPattern count="many">{0} l</unitPattern>
-				<unitPattern count="other">{0} l</unitPattern>
-			</unit>
-		</unitLength>
-		<unitLength type="narrow">
-			<compoundUnit type="per">
-				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
-			</compoundUnit>
-			<unit type="acceleration-g-force">
-				<unitPattern count="zero">{0}G</unitPattern>
-				<unitPattern count="one">{0}G</unitPattern>
-				<unitPattern count="two">{0}G</unitPattern>
-				<unitPattern count="few">{0}G</unitPattern>
-				<unitPattern count="many">{0}G</unitPattern>
-				<unitPattern count="other">{0}G</unitPattern>
-			</unit>
-			<unit type="angle-arc-minute">
-				<unitPattern count="zero">{0}′</unitPattern>
-				<unitPattern count="one">{0}′</unitPattern>
-				<unitPattern count="two">{0}′</unitPattern>
-				<unitPattern count="few">{0}′</unitPattern>
-				<unitPattern count="many">{0}′</unitPattern>
-				<unitPattern count="other">{0}′</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<unitPattern count="zero">{0}″</unitPattern>
-				<unitPattern count="one">{0}″</unitPattern>
-				<unitPattern count="two">{0}″</unitPattern>
-				<unitPattern count="few">{0}″</unitPattern>
-				<unitPattern count="many">{0}″</unitPattern>
-				<unitPattern count="other">{0}″</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="zero">{0}°</unitPattern>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="two">{0}°</unitPattern>
-				<unitPattern count="few">{0}°</unitPattern>
-				<unitPattern count="many">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="zero">{0}erw</unitPattern>
-				<unitPattern count="one">{0}erw</unitPattern>
-				<unitPattern count="two">{0}erw</unitPattern>
-				<unitPattern count="few">{0}erw</unitPattern>
-				<unitPattern count="many">{0}erw</unitPattern>
-				<unitPattern count="other">{0}erw</unitPattern>
-			</unit>
-			<unit type="area-hectare">
-				<unitPattern count="zero">{0}ha</unitPattern>
-				<unitPattern count="one">{0}ha</unitPattern>
-				<unitPattern count="two">{0}ha</unitPattern>
-				<unitPattern count="few">{0}ha</unitPattern>
-				<unitPattern count="many">{0}ha</unitPattern>
-				<unitPattern count="other">{0}ha</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="zero">{0}ft²</unitPattern>
-				<unitPattern count="one">{0}ft²</unitPattern>
-				<unitPattern count="two">{0}ft²</unitPattern>
-				<unitPattern count="few">{0}ft²</unitPattern>
-				<unitPattern count="many">{0}ft²</unitPattern>
-				<unitPattern count="other">{0}ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="zero">{0}km²</unitPattern>
-				<unitPattern count="one">{0}km²</unitPattern>
-				<unitPattern count="two">{0}km²</unitPattern>
-				<unitPattern count="few">{0}km²</unitPattern>
-				<unitPattern count="many">{0}km²</unitPattern>
-				<unitPattern count="other">{0}km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<unitPattern count="zero">{0}m²</unitPattern>
-				<unitPattern count="one">{0}m²</unitPattern>
-				<unitPattern count="two">{0}m²</unitPattern>
-				<unitPattern count="few">{0}m²</unitPattern>
-				<unitPattern count="many">{0}m²</unitPattern>
-				<unitPattern count="other">{0}m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<unitPattern count="zero">{0}mi²</unitPattern>
-				<unitPattern count="one">{0}mi²</unitPattern>
-				<unitPattern count="two">{0}mi²</unitPattern>
-				<unitPattern count="few">{0}mi²</unitPattern>
-				<unitPattern count="many">{0}mi²</unitPattern>
-				<unitPattern count="other">{0}mi²</unitPattern>
-			</unit>
-			<unit type="consumption-liter-per-kilometer">
-				<displayName>L/km</displayName>
-			</unit>
-			<unit type="duration-day">
-				<unitPattern count="zero">{0}d</unitPattern>
-				<unitPattern count="one">{0}d</unitPattern>
-				<unitPattern count="two">{0}d</unitPattern>
-				<unitPattern count="few">{0}d</unitPattern>
-				<unitPattern count="many">{0}d</unitPattern>
-				<unitPattern count="other">{0}d</unitPattern>
-			</unit>
-			<unit type="duration-hour">
-				<unitPattern count="zero">{0} awr</unitPattern>
-				<unitPattern count="one">{0} awr</unitPattern>
-				<unitPattern count="two">{0} awr</unitPattern>
-				<unitPattern count="few">{0} awr</unitPattern>
-				<unitPattern count="many">{0} awr</unitPattern>
-				<unitPattern count="other">{0} awr</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<unitPattern count="zero">{0}ms</unitPattern>
-				<unitPattern count="one">{0}ms</unitPattern>
-				<unitPattern count="two">{0}ms</unitPattern>
-				<unitPattern count="few">{0}ms</unitPattern>
-				<unitPattern count="many">{0}ms</unitPattern>
-				<unitPattern count="other">{0}ms</unitPattern>
-			</unit>
-			<unit type="duration-minute">
-				<unitPattern count="zero">{0} mun</unitPattern>
-				<unitPattern count="one">{0} mun</unitPattern>
-				<unitPattern count="two">{0} mun</unitPattern>
-				<unitPattern count="few">{0} mun</unitPattern>
-				<unitPattern count="many">{0} mun</unitPattern>
-				<unitPattern count="other">{0} mun</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<unitPattern count="zero">{0}m</unitPattern>
-				<unitPattern count="one">{0}m</unitPattern>
-				<unitPattern count="two">{0}m</unitPattern>
-				<unitPattern count="few">{0}m</unitPattern>
-				<unitPattern count="many">{0}m</unitPattern>
-				<unitPattern count="other">{0}m</unitPattern>
-			</unit>
-			<unit type="duration-second">
-				<unitPattern count="zero">{0} eil</unitPattern>
-				<unitPattern count="one">{0} eil</unitPattern>
-				<unitPattern count="two">{0} eil</unitPattern>
-				<unitPattern count="few">{0} eil</unitPattern>
-				<unitPattern count="many">{0} eil</unitPattern>
-				<unitPattern count="other">{0} eil</unitPattern>
-			</unit>
-			<unit type="duration-week">
-				<unitPattern count="zero">{0}w</unitPattern>
-				<unitPattern count="one">{0}w</unitPattern>
-				<unitPattern count="two">{0}w</unitPattern>
-				<unitPattern count="few">{0}w</unitPattern>
-				<unitPattern count="many">{0}w</unitPattern>
-				<unitPattern count="other">{0}w</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<unitPattern count="zero">{0}bl</unitPattern>
-				<unitPattern count="one">{0}bl</unitPattern>
-				<unitPattern count="two">{0}bl</unitPattern>
-				<unitPattern count="few">{0}bl</unitPattern>
-				<unitPattern count="many">{0}bl</unitPattern>
-				<unitPattern count="other">{0}bl</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<unitPattern count="zero">{0}cm</unitPattern>
-				<unitPattern count="one">{0}cm</unitPattern>
-				<unitPattern count="two">{0}cm</unitPattern>
-				<unitPattern count="few">{0}cm</unitPattern>
-				<unitPattern count="many">{0}cm</unitPattern>
-				<unitPattern count="other">{0}cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="zero">{0}′</unitPattern>
-				<unitPattern count="one">{0}′</unitPattern>
-				<unitPattern count="two">{0}′</unitPattern>
-				<unitPattern count="few">{0}′</unitPattern>
-				<unitPattern count="many">{0}′</unitPattern>
-				<unitPattern count="other">{0}′</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="zero">{0}″</unitPattern>
-				<unitPattern count="one">{0}″</unitPattern>
-				<unitPattern count="two">{0}″</unitPattern>
-				<unitPattern count="few">{0}″</unitPattern>
-				<unitPattern count="many">{0}″</unitPattern>
-				<unitPattern count="other">{0}″</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<unitPattern count="zero">{0}km</unitPattern>
-				<unitPattern count="one">{0}km</unitPattern>
-				<unitPattern count="two">{0}km</unitPattern>
-				<unitPattern count="few">{0}km</unitPattern>
-				<unitPattern count="many">{0}km</unitPattern>
-				<unitPattern count="other">{0}km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="zero">{0}ly</unitPattern>
-				<unitPattern count="one">{0}ly</unitPattern>
-				<unitPattern count="two">{0}ly</unitPattern>
-				<unitPattern count="few">{0}ly</unitPattern>
-				<unitPattern count="many">{0}ly</unitPattern>
-				<unitPattern count="other">{0}ly</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<unitPattern count="zero">{0}m</unitPattern>
-				<unitPattern count="one">{0}m</unitPattern>
-				<unitPattern count="two">{0}m</unitPattern>
-				<unitPattern count="few">{0}m</unitPattern>
-				<unitPattern count="many">{0}m</unitPattern>
-				<unitPattern count="other">{0}m</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<unitPattern count="zero">{0}mi</unitPattern>
-				<unitPattern count="one">{0}mi</unitPattern>
-				<unitPattern count="two">{0}mi</unitPattern>
-				<unitPattern count="few">{0}mi</unitPattern>
-				<unitPattern count="many">{0}mi</unitPattern>
-				<unitPattern count="other">{0}mi</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<unitPattern count="zero">{0}mm</unitPattern>
-				<unitPattern count="one">{0}mm</unitPattern>
-				<unitPattern count="two">{0}mm</unitPattern>
-				<unitPattern count="few">{0}mm</unitPattern>
-				<unitPattern count="many">{0}mm</unitPattern>
-				<unitPattern count="other">{0}mm</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<unitPattern count="zero">{0}pm</unitPattern>
-				<unitPattern count="one">{0}pm</unitPattern>
-				<unitPattern count="two">{0}pm</unitPattern>
-				<unitPattern count="few">{0}pm</unitPattern>
-				<unitPattern count="many">{0}pm</unitPattern>
-				<unitPattern count="other">{0}pm</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<unitPattern count="zero">{0}llath</unitPattern>
-				<unitPattern count="one">{0}llath</unitPattern>
-				<unitPattern count="two">{0}lath</unitPattern>
-				<unitPattern count="few">{0}llath</unitPattern>
-				<unitPattern count="many">{0}llath</unitPattern>
-				<unitPattern count="other">{0}llath</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<unitPattern count="zero">{0}g</unitPattern>
-				<unitPattern count="one">{0}g</unitPattern>
-				<unitPattern count="two">{0}g</unitPattern>
-				<unitPattern count="few">{0}g</unitPattern>
-				<unitPattern count="many">{0}g</unitPattern>
-				<unitPattern count="other">{0}g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<unitPattern count="zero">{0}kg</unitPattern>
-				<unitPattern count="one">{0}kg</unitPattern>
-				<unitPattern count="two">{0}kg</unitPattern>
-				<unitPattern count="few">{0}kg</unitPattern>
-				<unitPattern count="many">{0}kg</unitPattern>
-				<unitPattern count="other">{0}kg</unitPattern>
-			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="zero">{0}owns</unitPattern>
-				<unitPattern count="one">{0}owns</unitPattern>
-				<unitPattern count="two">{0}owns</unitPattern>
-				<unitPattern count="few">{0}owns</unitPattern>
-				<unitPattern count="many">{0}owns</unitPattern>
-				<unitPattern count="other">{0}owns</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<unitPattern count="zero">{0}pwys</unitPattern>
-				<unitPattern count="one">{0}pwys</unitPattern>
-				<unitPattern count="two">{0}bwys</unitPattern>
-				<unitPattern count="few">{0}phwys</unitPattern>
-				<unitPattern count="many">{0}phwys</unitPattern>
-				<unitPattern count="other">{0}pwys</unitPattern>
-			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="zero">{0}hp</unitPattern>
-				<unitPattern count="one">{0}hp</unitPattern>
-				<unitPattern count="two">{0}hp</unitPattern>
-				<unitPattern count="few">{0}hp</unitPattern>
-				<unitPattern count="many">{0}hp</unitPattern>
-				<unitPattern count="other">{0}hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<unitPattern count="zero">{0}kW</unitPattern>
-				<unitPattern count="one">{0}kW</unitPattern>
-				<unitPattern count="two">{0}kW</unitPattern>
-				<unitPattern count="few">{0}kW</unitPattern>
-				<unitPattern count="many">{0}kW</unitPattern>
-				<unitPattern count="other">{0}kW</unitPattern>
-			</unit>
-			<unit type="power-watt">
-				<unitPattern count="zero">{0}W</unitPattern>
-				<unitPattern count="one">{0}W</unitPattern>
-				<unitPattern count="two">{0}W</unitPattern>
-				<unitPattern count="few">{0}W</unitPattern>
-				<unitPattern count="many">{0}W</unitPattern>
-				<unitPattern count="other">{0}W</unitPattern>
-			</unit>
-			<unit type="pressure-hectopascal">
-				<unitPattern count="zero">{0}hPa</unitPattern>
-				<unitPattern count="one">{0}hPa</unitPattern>
-				<unitPattern count="two">{0}hPa</unitPattern>
-				<unitPattern count="few">{0}hPa</unitPattern>
-				<unitPattern count="many">{0}hPa</unitPattern>
-				<unitPattern count="other">{0}hPa</unitPattern>
-			</unit>
-			<unit type="pressure-inch-hg">
-				<unitPattern count="zero">{0}&quot; Hg</unitPattern>
-				<unitPattern count="one">{0}&quot; Hg</unitPattern>
-				<unitPattern count="two">{0}&quot; Hg</unitPattern>
-				<unitPattern count="few">{0}&quot; Hg</unitPattern>
-				<unitPattern count="many">{0}&quot; Hg</unitPattern>
-				<unitPattern count="other">{0}&quot; Hg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<unitPattern count="zero">{0}mb</unitPattern>
-				<unitPattern count="one">{0}mb</unitPattern>
-				<unitPattern count="two">{0}mb</unitPattern>
-				<unitPattern count="few">{0}mb</unitPattern>
-				<unitPattern count="many">{0}mb</unitPattern>
-				<unitPattern count="other">{0}mb</unitPattern>
-			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<displayName>mm Hg</displayName>
-				<unitPattern count="zero">{0}mm Hg</unitPattern>
-				<unitPattern count="one">{0}mm Hg</unitPattern>
-				<unitPattern count="two">{0}mm Hg</unitPattern>
-				<unitPattern count="few">{0}mm Hg</unitPattern>
-				<unitPattern count="many">{0}mm Hg</unitPattern>
-				<unitPattern count="other">{0}mm Hg</unitPattern>
-			</unit>
-			<unit type="pressure-pound-per-square-inch">
-				<displayName>psi</displayName>
-			</unit>
-			<unit type="speed-kilometer-per-hour">
-				<unitPattern count="zero">{0}km/h</unitPattern>
-				<unitPattern count="one">{0}km/h</unitPattern>
-				<unitPattern count="two">{0}km/h</unitPattern>
-				<unitPattern count="few">{0}km/h</unitPattern>
-				<unitPattern count="many">{0}km/h</unitPattern>
-				<unitPattern count="other">{0}km/h</unitPattern>
-			</unit>
-			<unit type="speed-meter-per-second">
-				<unitPattern count="zero">{0}m/s</unitPattern>
-				<unitPattern count="one">{0}m/s</unitPattern>
-				<unitPattern count="two">{0}m/s</unitPattern>
-				<unitPattern count="few">{0}m/s</unitPattern>
-				<unitPattern count="many">{0}m/s</unitPattern>
-				<unitPattern count="other">{0}m/s</unitPattern>
-			</unit>
-			<unit type="speed-mile-per-hour">
-				<unitPattern count="zero">{0}m.y.a.</unitPattern>
-				<unitPattern count="one">{0}m.y.a.</unitPattern>
-				<unitPattern count="two">{0}m.y.a.</unitPattern>
-				<unitPattern count="few">{0}m.y.a.</unitPattern>
-				<unitPattern count="many">{0}m.y.a.</unitPattern>
-				<unitPattern count="other">{0}m.y.a.</unitPattern>
-			</unit>
-			<unit type="temperature-celsius">
-				<unitPattern count="zero">{0}°</unitPattern>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="two">{0}°</unitPattern>
-				<unitPattern count="few">{0}°</unitPattern>
-				<unitPattern count="many">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="temperature-fahrenheit">
-				<unitPattern count="zero">{0}°F</unitPattern>
-				<unitPattern count="one">{0}°F</unitPattern>
-				<unitPattern count="two">{0}°F</unitPattern>
-				<unitPattern count="few">{0}°F</unitPattern>
-				<unitPattern count="many">{0}°F</unitPattern>
-				<unitPattern count="other">{0}°F</unitPattern>
-			</unit>
-			<unit type="temperature-kelvin">
-				<displayName>K</displayName>
-			</unit>
-			<unit type="volume-cubic-kilometer">
-				<unitPattern count="zero">{0}km³</unitPattern>
-				<unitPattern count="one">{0}km³</unitPattern>
-				<unitPattern count="two">{0}km³</unitPattern>
-				<unitPattern count="few">{0}km³</unitPattern>
-				<unitPattern count="many">{0}km³</unitPattern>
-				<unitPattern count="other">{0}km³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<unitPattern count="zero">{0}mi³</unitPattern>
-				<unitPattern count="one">{0}mi³</unitPattern>
-				<unitPattern count="two">{0}mi³</unitPattern>
-				<unitPattern count="few">{0}mi³</unitPattern>
-				<unitPattern count="many">{0}mi³</unitPattern>
-				<unitPattern count="other">{0}mi³</unitPattern>
-			</unit>
-			<unit type="volume-liter">
-				<unitPattern count="zero">{0}l</unitPattern>
-				<unitPattern count="one">{0}l</unitPattern>
-				<unitPattern count="two">{0}l</unitPattern>
-				<unitPattern count="few">{0}l</unitPattern>
-				<unitPattern count="many">{0}l</unitPattern>
-				<unitPattern count="other">{0}l</unitPattern>
-			</unit>
-		</unitLength>
-		<durationUnit type="hm">
-			<durationUnitPattern>h.mm</durationUnitPattern>
-		</durationUnit>
-		<durationUnit type="hms">
-			<durationUnitPattern>h.mm.ss</durationUnitPattern>
-		</durationUnit>
-		<durationUnit type="ms">
-			<durationUnitPattern>m.ss</durationUnitPattern>
-		</durationUnit>
-	</units>
-	<listPatterns>
-		<listPattern>
-			<listPatternPart type="start">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle">{0}, {1}</listPatternPart>
-			<listPatternPart type="end">{0}, {1}</listPatternPart>
-			<listPatternPart type="2">{0}, {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="unit">
-			<listPatternPart type="start">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle">{0}, {1}</listPatternPart>
-			<listPatternPart type="end">{0}, {1}</listPatternPart>
-			<listPatternPart type="2">{0}, {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="unit-short">
-			<listPatternPart type="start">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle">{0}, {1}</listPatternPart>
-			<listPatternPart type="end">{0}, {1}</listPatternPart>
-			<listPatternPart type="2">{0}, {1}</listPatternPart>
-		</listPattern>
-	</listPatterns>
-	<posix>
-		<messages>
-			<yesstr>ie:i</yesstr>
-			<nostr>na:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/da_GL.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/da_GL.xml
deleted file mode 100644
index bbb05408a06..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/da_GL.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="da"/>
-		<territory type="GL"/>
-	</identity>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ee_TG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ee_TG.xml
deleted file mode 100644
index 4aec4aad79a..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ee_TG.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="ee"/>
-		<territory type="TG"/>
-	</identity>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_150.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_150.xml
deleted file mode 100644
index c726df997dd..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_150.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 11150 $"/>
-		<generation date="$Date: 2015-01-23 16:43:31 -0600 (Fri, 23 Jan 2015) $"/>
-		<language type="en"/>
-		<territory type="150"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="generic">
-				<dateFormats>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd MMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
-						<dateFormatItem id="yyyyMd">d/M/y G</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">E, d/M/y G</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="unconfirmed">MM/y – MM/y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MM/y – MM/y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="unconfirmed">dd/MM/y – dd/MM/y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">dd/MM/y – dd/MM/y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">dd/MM/y – dd/MM/y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="unconfirmed">E dd/MM/y – E dd/MM/y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E dd/MM/y – E dd/MM/y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E dd/MM/y – E dd/MM/y G</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH 'h' mm 'min' ss 's' zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
-						<dateFormatItem id="yMd">d/M/y</dateFormatItem>
-						<dateFormatItem id="yMEd">E, d/M/y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="unconfirmed">E dd/MM/y – E dd/MM/y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E dd/MM/y – E dd/MM/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E dd/MM/y – E dd/MM/y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<symbols numberSystem="latn">
-			<decimal>,</decimal>
-			<group>.</group>
-		</symbols>
-		<currencyFormats numberSystem="latn">
-			<currencyFormatLength>
-				<currencyFormat type="standard">
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
-
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_AU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_AU.xml
deleted file mode 100644
index b2033d7f5e1..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_AU.xml
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 11159 $"/>
-		<generation date="$Date: 2015-01-30 13:45:39 -0600 (Fri, 30 Jan 2015) $"/>
-		<language type="en"/>
-		<territory type="AU"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="bax">Bamum</language>
-			<language type="en_US">United States English</language>
-		</languages>
-	</localeDisplayNames>
-	<dates>
-		<calendars>
-			<calendar type="chinese">
-				<dateFormats>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-			</calendar>
-			<calendar type="generic">
-				<dateFormats>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/MM/y GGGGG</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yMd">d/M/y</dateFormatItem>
-						<dateFormatItem id="yMEd">E, d/M/y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, d/MM – E, d/MM</greatestDifference>
-							<greatestDifference id="M">E, d/MM – E, d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d – E, d MMM</greatestDifference>
-							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d/MM/y – d/MM/y GGGGG</greatestDifference>
-							<greatestDifference id="M">d/MM/y – d/MM/y GGGGG</greatestDifference>
-							<greatestDifference id="y">d/MM/y – d/MM/y GGGGG</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, d/MM/y – E, d/MM/y GGGGG</greatestDifference>
-							<greatestDifference id="M">E, d/MM/y – E, d/MM/y GGGGG</greatestDifference>
-							<greatestDifference id="y">E, d/MM/y – E, d/MM/y GGGGG</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/MM/y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Ed">E d</dateFormatItem>
-						<dateFormatItem id="M">LL</dateFormatItem>
-						<dateFormatItem id="yMd">d/M/y</dateFormatItem>
-						<dateFormatItem id="yMEd">E, d/M/y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d/MM – d/MM</greatestDifference>
-							<greatestDifference id="M">d/MM – d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, d/MM – E, d/MM</greatestDifference>
-							<greatestDifference id="M">E, d/MM – E, d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d – E, d MMM</greatestDifference>
-							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d/MM/y – d/MM/y</greatestDifference>
-							<greatestDifference id="M">d/MM/y – d/MM/y</greatestDifference>
-							<greatestDifference id="y">d/MM/y – d/MM/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, d/MM/y – E, d/MM/y</greatestDifference>
-							<greatestDifference id="M">E, d/MM/y – E, d/MM/y</greatestDifference>
-							<greatestDifference id="y">E, d/MM/y – E, d/MM/y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="islamic">
-				<dateFormats>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/MM/y GGGGG</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yMd">d/M/y</dateFormatItem>
-						<dateFormatItem id="yMEd">E, d/M/y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="japanese">
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yMd">d/M/y</dateFormatItem>
-						<dateFormatItem id="yMEd">E, d/M/y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<metazone type="Arabian">
-				<long>
-					<generic>Arabian Time</generic>
-					<standard>Arabian Standard Time</standard>
-					<daylight>Arabian Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Central">
-				<short>
-					<generic>ACT</generic>
-					<standard>ACST</standard>
-					<daylight>ACDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<short>
-					<generic>ACWT</generic>
-					<standard>ACWST</standard>
-					<daylight>ACWDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<short>
-					<generic>AET</generic>
-					<standard>AEST</standard>
-					<daylight>AEDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Australia_Western">
-				<short>
-					<generic>AWT</generic>
-					<standard>AWST</standard>
-					<daylight>AWDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<generic>China Time</generic>
-					<standard>China Standard Time</standard>
-					<daylight>China Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Iran">
-				<long>
-					<generic>Iran Time</generic>
-					<standard>Iran Standard Time</standard>
-					<daylight>Iran Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<generic>Israel Time</generic>
-					<standard>Israel Standard Time</standard>
-					<daylight>Israel Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<generic>Japan Time</generic>
-					<standard>Japan Standard Time</standard>
-					<daylight>Japan Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Korea">
-				<long>
-					<generic>Korean Time</generic>
-					<standard>Korean Standard Time</standard>
-					<daylight>Korean Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Lord_Howe">
-				<short>
-					<generic>LHT</generic>
-					<standard>LHST</standard>
-					<daylight>LHDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="New_Zealand">
-				<short>
-					<generic>NZT</generic>
-					<standard>NZST</standard>
-					<daylight>NZDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Taipei">
-				<long>
-					<generic>Taipei Time</generic>
-					<standard>Taipei Standard Time</standard>
-					<daylight>Taipei Summer Time</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="AUD">
-				<symbol>$</symbol>
-			</currency>
-			<currency type="EUR">
-				<displayName count="one">euro</displayName>
-				<displayName count="other">euro</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName count="one">Malagasy ariary</displayName>
-				<displayName count="other">Malagasy ariarys</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>Seychelles Rupee</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unitLength type="long">
-			<unit type="mass-metric-ton">
-				<displayName>tonnes</displayName>
-				<unitPattern count="one">tonne</unitPattern>
-				<unitPattern count="other">{0} tonnes</unitPattern>
-			</unit>
-		</unitLength>
-		<unitLength type="short">
-			<unit type="length-micrometer">
-				<displayName>µmetres</displayName>
-			</unit>
-		</unitLength>
-		<unitLength type="narrow">
-			<unit type="duration-millisecond">
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
-		</unitLength>
-	</units>
-</ldml>
-
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_CC.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_CC.xml
deleted file mode 100644
index 996ffbfd2dd..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_CC.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="en"/>
-		<territory type="CC"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="AUD">
-				<symbol>$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_CK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_CK.xml
deleted file mode 100644
index 91a8c01c7fc..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_CK.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="en"/>
-		<territory type="CK"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="NZD">
-				<symbol>$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_CX.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_CX.xml
deleted file mode 100644
index b3544075c81..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_CX.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="en"/>
-		<territory type="CX"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="AUD">
-				<symbol>$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_DG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_DG.xml
deleted file mode 100644
index 46ef7e7f36d..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_DG.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="en"/>
-		<territory type="DG"/>
-	</identity>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_FK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_FK.xml
deleted file mode 100644
index 0a8263f96bb..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_FK.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="en"/>
-		<territory type="FK"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="FKP">
-				<symbol>£</symbol>
-			</currency>
-			<currency type="GBP">
-				<symbol>GB£</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GB.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GB.xml
deleted file mode 100644
index 7998c15128b..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GB.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 11159 $"/>
-		<generation date="$Date: 2015-01-30 13:45:39 -0600 (Fri, 30 Jan 2015) $"/>
-		<language type="en"/>
-		<territory type="GB"/>
-	</identity>
-	<localeDisplayNames>
-		<keys>
-			<key type="colNormalization">Normalised Sorting</key>
-		</keys>
-		<types>
-			<type type="no" key="colNormalization">Sort Without Normalisation</type>
-			<type type="yes" key="colNormalization">Sort Unicode Normalised</type>
-		</types>
-	</localeDisplayNames>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dayPeriods>
-					<dayPeriodContext type="format">
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">a.m.</dayPeriod>
-							<dayPeriod type="pm">p.m.</dayPeriod>
-						</dayPeriodWidth>
-					</dayPeriodContext>
-				</dayPeriods>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-			</calendar>
-		</calendars>
-		<fields>
-			<field type="dayperiod">
-				<displayName>a.m./p.m.</displayName>
-			</field>
-		</fields>
-		<timeZoneNames>
-			<zone type="Europe/London">
-				<short>
-					<daylight>BST</daylight>
-				</short>
-			</zone>
-			<metazone type="Europe_Central">
-				<short>
-					<generic>CET</generic>
-					<standard>CET</standard>
-					<daylight>CEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<short>
-					<generic>EET</generic>
-					<standard>EET</standard>
-					<daylight>EEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Western">
-				<short>
-					<generic>WET</generic>
-					<standard>WET</standard>
-					<daylight>WEST</daylight>
-				</short>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="ILR">
-				<displayName>Israeli Shekel (1980–1985)</displayName>
-				<displayName count="one">Israeli shekel (1980–1985)</displayName>
-				<displayName count="other">Israeli shekels (1980–1985)</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Israeli New Shekel</displayName>
-				<displayName count="one">Israeli new shekel</displayName>
-				<displayName count="other">Israeli new shekels</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unitLength type="short">
-			<unit type="volume-liter">
-				<unitPattern count="one">{0} l</unitPattern>
-				<unitPattern count="other">{0} l</unitPattern>
-			</unit>
-		</unitLength>
-	</units>
-</ldml>
-
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GG.xml
deleted file mode 100644
index 2e04e93b094..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GG.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="en"/>
-		<territory type="GG"/>
-	</identity>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GI.xml
deleted file mode 100644
index da13cf35752..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GI.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10819 $"/>
-		<generation date="$Date: 2014-08-14 22:53:08 -0500 (Thu, 14 Aug 2014) $"/>
-		<language type="en"/>
-		<territory type="GI"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="GBP">
-				<symbol>GB£</symbol>
-			</currency>
-			<currency type="GIP">
-				<symbol>£</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_IM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_IM.xml
deleted file mode 100644
index 81feaadf03c..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_IM.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="en"/>
-		<territory type="IM"/>
-	</identity>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_IO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_IO.xml
deleted file mode 100644
index 28cb009af40..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_IO.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="en"/>
-		<territory type="IO"/>
-	</identity>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_JE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_JE.xml
deleted file mode 100644
index 3a60bc5396f..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_JE.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="en"/>
-		<territory type="JE"/>
-	</identity>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MS.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MS.xml
deleted file mode 100644
index a5bc1d502d5..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MS.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10712 $"/>
-		<generation date="$Date: 2014-08-01 12:07:43 -0500 (Fri, 01 Aug 2014) $"/>
-		<language type="en"/>
-		<territory type="MS"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="XCD">
-				<symbol>$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_NF.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_NF.xml
deleted file mode 100644
index f6909a88e46..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_NF.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="en"/>
-		<territory type="NF"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="AUD">
-				<symbol>$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_NR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_NR.xml
deleted file mode 100644
index 7275b76bb64..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_NR.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="en"/>
-		<territory type="NR"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="AUD">
-				<symbol>$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_NU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_NU.xml
deleted file mode 100644
index 136971165c2..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_NU.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="en"/>
-		<territory type="NU"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="NZD">
-				<symbol>$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_PN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_PN.xml
deleted file mode 100644
index 84f52104e4b..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_PN.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="en"/>
-		<territory type="PN"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="NZD">
-				<symbol>$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SC.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SC.xml
deleted file mode 100644
index 3453550fc1f..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SC.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="en"/>
-		<territory type="SC"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="SCR">
-				<symbol>SR</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SH.xml
deleted file mode 100644
index d4bb093ea55..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SH.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="en"/>
-		<territory type="SH"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="GBP">
-				<symbol>GB£</symbol>
-			</currency>
-			<currency type="SHP">
-				<symbol>£</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SX.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SX.xml
deleted file mode 100644
index 22af41c9dd1..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SX.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="en"/>
-		<territory type="SX"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="ANG">
-				<symbol>NAf.</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_TK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_TK.xml
deleted file mode 100644
index 779ea4d5823..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_TK.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="en"/>
-		<territory type="TK"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="NZD">
-				<symbol>$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_TV.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_TV.xml
deleted file mode 100644
index 09cff50fe42..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_TV.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="en"/>
-		<territory type="TV"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="AUD">
-				<symbol>$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_419.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_419.xml
deleted file mode 100644
index 95055302c0f..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_419.xml
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
-		<language type="es"/>
-		<territory type="419"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="en_GB" alt="short">inglés (R. U.)</language>
-		</languages>
-		<territories>
-			<territory type="GB" alt="short">R. U.</territory>
-		</territories>
-	</localeDisplayNames>
-	<dates>
-		<calendars>
-			<calendar type="generic">
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="GyMMM" draft="contributed">MMM 'de' y G</dateFormatItem>
-						<dateFormatItem id="GyMMMd" draft="contributed">d 'de' MMM 'de' y G</dateFormatItem>
-						<dateFormatItem id="MMMd" draft="contributed">d 'de' MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd" draft="contributed">E, d 'de' MMM</dateFormatItem>
-						<dateFormatItem id="yMEd" draft="contributed">E d/M/y G</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="contributed">M/y – M/y GGGGG</greatestDifference>
-							<greatestDifference id="y" draft="contributed">M/y – M/y GGGGG</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="contributed">d/M/y – d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="M" draft="contributed">d/M/y – d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="y" draft="contributed">d/M/y – d/M/y GGGGG</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="contributed">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="M" draft="contributed">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="y" draft="contributed">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<days>
-					<dayContext type="format">
-						<dayWidth type="narrow">
-							<day type="sun">d</day>
-							<day type="mon">l</day>
-							<day type="tue">m</day>
-							<day type="wed">m</day>
-							<day type="thu">j</day>
-							<day type="fri">v</day>
-							<day type="sat">s</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">D</day>
-							<day type="mon">L</day>
-							<day type="tue">M</day>
-							<day type="wed">M</day>
-							<day type="thu">J</day>
-							<day type="fri">V</day>
-							<day type="sat">S</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="EHm" draft="contributed">E, HH:mm</dateFormatItem>
-						<dateFormatItem id="EHms" draft="contributed">E, HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="GyMMMd" draft="contributed">d 'de' MMM 'de' y G</dateFormatItem>
-						<dateFormatItem id="H" draft="contributed">HH</dateFormatItem>
-						<dateFormatItem id="Hm" draft="contributed">HH:mm</dateFormatItem>
-						<dateFormatItem id="Hms" draft="contributed">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="MMMdd" draft="contributed">dd-MMM</dateFormatItem>
-						<dateFormatItem id="yMEd" draft="contributed">E d/M/y</dateFormatItem>
-						<dateFormatItem id="yMMMEd" draft="contributed">E, d 'de' MMM 'de' y</dateFormatItem>
-						<dateFormatItem id="yQQQ" draft="contributed">QQQ 'de' y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatItem id="H">
-							<greatestDifference id="H" draft="contributed">HH – HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hm">
-							<greatestDifference id="H" draft="contributed">HH:mm – HH:mm</greatestDifference>
-							<greatestDifference id="m" draft="contributed">HH:mm – HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H" draft="contributed">HH:mm – HH:mm v</greatestDifference>
-							<greatestDifference id="m" draft="contributed">HH:mm – HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hv">
-							<greatestDifference id="H" draft="contributed">HH – HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d" draft="contributed">d – d 'de' MMM</greatestDifference>
-							<greatestDifference id="M" draft="contributed">d 'de' MMM – d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d" draft="contributed">E, d 'de' MMM – E, d 'de' MMM</greatestDifference>
-							<greatestDifference id="M" draft="contributed">E, d 'de' MMM – E, d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="y" draft="contributed">MMM 'de' y – MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d" draft="contributed">d – d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M" draft="contributed">d 'de' MMM – d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y" draft="contributed">d 'de' MMM 'de' y – d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d" draft="contributed">E, d 'de' MMM – E, d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M" draft="contributed">E, d 'de' MMM – E, d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y" draft="contributed">E, d 'de' MMM 'de' y – E, d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<metazone type="Europe_Central">
-				<short>
-					<generic>∅∅∅</generic>
-					<standard>∅∅∅</standard>
-					<daylight>∅∅∅</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<short>
-					<generic>∅∅∅</generic>
-					<standard>∅∅∅</standard>
-					<daylight>∅∅∅</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Western">
-				<short>
-					<generic>∅∅∅</generic>
-					<standard>∅∅∅</standard>
-					<daylight>∅∅∅</daylight>
-				</short>
-			</metazone>
-			<metazone type="GMT">
-				<short>
-					<standard>∅∅∅</standard>
-				</short>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols numberSystem="latn">
-			<decimal>.</decimal>
-			<group>,</group>
-		</symbols>
-		<decimalFormats numberSystem="latn">
-			<decimalFormatLength type="short">
-				<decimalFormat>
-					<pattern type="1000" count="one" draft="contributed">0</pattern>
-					<pattern type="1000" count="other" draft="contributed">0</pattern>
-					<pattern type="10000" count="one" draft="contributed">00k</pattern>
-					<pattern type="10000" count="other" draft="contributed">00k</pattern>
-					<pattern type="100000" count="one" draft="contributed">000k</pattern>
-					<pattern type="100000" count="other" draft="contributed">000k</pattern>
-					<pattern type="1000000000" count="one" draft="contributed">0k M</pattern>
-					<pattern type="1000000000" count="other" draft="contributed">0k M</pattern>
-					<pattern type="10000000000" count="one" draft="contributed">00k M</pattern>
-					<pattern type="10000000000" count="other" draft="contributed">00k M</pattern>
-					<pattern type="100000000000" count="one" draft="contributed">000k M</pattern>
-					<pattern type="100000000000" count="other" draft="contributed">000k M</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<currencyFormats numberSystem="latn">
-			<currencyFormatLength>
-				<currencyFormat type="standard">
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-				<currencyFormat type="accounting">
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="CAD">
-				<symbol>CAD</symbol>
-			</currency>
-			<currency type="EUR">
-				<symbol>EUR</symbol>
-				<symbol alt="narrow">€</symbol>
-			</currency>
-			<currency type="THB">
-				<symbol>THB</symbol>
-			</currency>
-			<currency type="USD">
-				<symbol>USD</symbol>
-			</currency>
-			<currency type="VND">
-				<symbol>VND</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unitLength type="short">
-			<unit type="duration-day">
-				<displayName draft="contributed">dd.</displayName>
-				<unitPattern count="one" draft="contributed">{0} d.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} dd.</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">mm.</displayName>
-				<unitPattern count="one" draft="contributed">{0} m.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mm.</unitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">sems.</displayName>
-				<unitPattern count="one" draft="contributed">{0} sem.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} sems.</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">aa.</displayName>
-				<unitPattern count="one" draft="contributed">{0} a.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} aa.</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName draft="contributed">aa. l.</displayName>
-				<unitPattern count="one" draft="contributed">{0} a. l.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} aa. l.</unitPattern>
-			</unit>
-			<unit type="length-nautical-mile">
-				<displayName draft="contributed">nmi</displayName>
-				<unitPattern count="one" draft="contributed">{0} nmi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} nmi</unitPattern>
-			</unit>
-		</unitLength>
-		<unitLength type="narrow">
-			<unit type="duration-day">
-				<displayName draft="contributed">d.</displayName>
-				<unitPattern count="one" draft="contributed">{0}d.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}dd.</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">m.</displayName>
-				<unitPattern count="one" draft="contributed">{0}m.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}mm.</unitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">sem.</displayName>
-				<unitPattern count="one" draft="contributed">{0}sem.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}sems.</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">a.</displayName>
-				<unitPattern count="one" draft="contributed">{0}a.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}aa.</unitPattern>
-			</unit>
-		</unitLength>
-	</units>
-</ldml>
-
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_AR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_AR.xml
deleted file mode 100644
index a063fea8f8c..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_AR.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
-		<language type="es"/>
-		<territory type="AR"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="generic">
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MEd" draft="contributed">E d-M</dateFormatItem>
-						<dateFormatItem id="yyyyM" draft="contributed">M-y G</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback draft="unconfirmed">{0} a el {1}</intervalFormatFallback>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hm">
-							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="unconfirmed">dd/MM – dd/MM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">dd/MM – dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="unconfirmed">E dd/MM – E dd/MM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E dd/MM – E dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="M" draft="unconfirmed">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d 'al' E d 'de' MMM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="unconfirmed">MM/y – MM/y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MM/y – MM/y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="unconfirmed">dd/MM/y – dd/MM/y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">dd/MM/y – dd/MM/y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">dd/MM/y – dd/MM/y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="unconfirmed">E dd/MM/y – E dd/MM/y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E dd/MM/y – E dd/MM/y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E dd/MM/y – E dd/MM/y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="y" draft="unconfirmed">MMM 'de' y 'a' MMM 'de' y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="M" draft="unconfirmed">d 'de' MMM 'al' d 'de' MMM 'de' y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d 'al' E d 'de' MMM 'de' y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d 'de' MMM 'al' E d 'de' MMM 'de' y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y G</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MEd" draft="contributed">E d-M</dateFormatItem>
-						<dateFormatItem id="yM" draft="contributed">M-y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback draft="unconfirmed">{0} a el {1}</intervalFormatFallback>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hm">
-							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hv">
-							<greatestDifference id="H" draft="unconfirmed">HH–HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="unconfirmed">dd/MM – dd/MM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">dd/MM – dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="unconfirmed">E dd/MM – E dd/MM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E dd/MM – E dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="M" draft="unconfirmed">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d 'al' E d 'de' MMM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="unconfirmed">MM/y – MM/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MM/y – MM/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="unconfirmed">dd/MM/y – dd/MM/y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">dd/MM/y – dd/MM/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">dd/MM/y – dd/MM/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="unconfirmed">E dd/MM/y – E dd/MM/y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E dd/MM/y – E dd/MM/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E dd/MM/y – E dd/MM/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="y" draft="unconfirmed">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="M" draft="unconfirmed">d 'de' MMM 'al' d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d 'de' MMM 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<metazone type="Argentina">
-				<short>
-					<generic>ART</generic>
-					<standard>ART</standard>
-					<daylight>ARST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Argentina_Western">
-				<short>
-					<generic>WART</generic>
-					<standard>WART</standard>
-					<daylight>WARST</daylight>
-				</short>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols numberSystem="latn">
-			<decimal>,</decimal>
-			<group>.</group>
-		</symbols>
-		<currencies>
-			<currency type="ARS">
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USD">
-				<symbol>US$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_CO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_CO.xml
deleted file mode 100644
index da9cda565ff..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_CO.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
-		<language type="es"/>
-		<territory type="CO"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="generic">
-				<dateFormats>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d/MM/y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/MM/yy GGGGG</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatFallback draft="unconfirmed">{0} a el {1}</intervalFormatFallback>
-						<intervalFormatItem id="H">
-							<greatestDifference id="H" draft="unconfirmed">H–H</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hm">
-							<greatestDifference id="H" draft="unconfirmed">H:mm–H:mm</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">H:mm–H:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H" draft="unconfirmed">H:mm–H:mm v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">H:mm–H:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hv">
-							<greatestDifference id="H" draft="unconfirmed">H–H v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="unconfirmed">d/MM – d/MM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d/MM – d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="unconfirmed">E d/MM – E d/MM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d/MM – E d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="M" draft="unconfirmed">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d 'al' E d 'de' MMM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y" draft="unconfirmed">y–y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="unconfirmed">MM/y – MM/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MM/y – MM/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="unconfirmed">d/MM/y – d/MM/y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d/MM/y – d/MM/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d/MM/y – d/MM/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d/MM/y – E d/MM/y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d/MM/y – E d/MM/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E d/MM/y – E d/MM/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M" draft="unconfirmed">MMM–MMM 'de' y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d" draft="unconfirmed">d–d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d 'de' MMM 'al' d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d 'de' MMM 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<dayPeriods>
-					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am" draft="contributed">a. m.</dayPeriod>
-							<dayPeriod type="pm" draft="contributed">p. m.</dayPeriod>
-						</dayPeriodWidth>
-					</dayPeriodContext>
-				</dayPeriods>
-				<dateFormats>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d/MM/y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatFallback draft="unconfirmed">{0} a el {1}</intervalFormatFallback>
-						<intervalFormatItem id="H">
-							<greatestDifference id="H" draft="unconfirmed">H–H</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hm">
-							<greatestDifference id="H" draft="unconfirmed">H:mm–H:mm</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">H:mm–H:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H" draft="unconfirmed">H:mm–H:mm v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">H:mm–H:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hv">
-							<greatestDifference id="H" draft="unconfirmed">H–H v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="unconfirmed">d/MM – d/MM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d/MM – d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="unconfirmed">E d/MM – E d/MM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d/MM – E d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="M" draft="unconfirmed">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d 'al' E d 'de' MMM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="unconfirmed">MM/y – MM/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MM/y – MM/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="unconfirmed">d/MM/y – d/MM/y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d/MM/y – d/MM/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d/MM/y – d/MM/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d/MM/y – E d/MM/y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d/MM/y – E d/MM/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E d/MM/y – E d/MM/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="y" draft="unconfirmed">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="M" draft="unconfirmed">d 'de' MMM 'al' d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d 'de' MMM 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<symbols numberSystem="latn">
-			<decimal>,</decimal>
-			<group>.</group>
-		</symbols>
-		<currencies>
-			<currency type="COP">
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USD">
-				<symbol>US$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_DO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_DO.xml
deleted file mode 100644
index 2d78e0f0399..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_DO.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="es"/>
-		<territory type="DO"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="DOP">
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USD">
-				<symbol>US$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_GT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_GT.xml
deleted file mode 100644
index 85c38746b80..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_GT.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
-		<language type="es"/>
-		<territory type="GT"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="generic">
-				<dateFormats>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d/MM/y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/MM/yy GGGGG</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatFallback draft="unconfirmed">{0} a el {1}</intervalFormatFallback>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hm">
-							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="unconfirmed">d/MM – d/MM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d/MM – d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="unconfirmed">E d/MM – E d/MM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d/MM – E d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="M" draft="unconfirmed">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d 'al' E d 'de' MMM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y" draft="unconfirmed">y–y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="unconfirmed">MM/y – MM/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MM/y – MM/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="unconfirmed">d/MM/y – d/MM/y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d/MM/y – d/MM/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d/MM/y – d/MM/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d/MM/y – E d/MM/y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d/MM/y – E d/MM/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E d/MM/y – E d/MM/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M" draft="unconfirmed">MMM–MMM 'de' y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d" draft="unconfirmed">d–d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d 'de' MMM 'al' d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d 'de' MMM 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d/MM/y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatFallback draft="unconfirmed">{0} a el {1}</intervalFormatFallback>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hm">
-							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hv">
-							<greatestDifference id="H" draft="unconfirmed">HH–HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="unconfirmed">d/MM – d/MM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d/MM – d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="unconfirmed">E d/MM – E d/MM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d/MM – E d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="M" draft="unconfirmed">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d 'al' E d 'de' MMM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="unconfirmed">MM/y – MM/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MM/y – MM/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="unconfirmed">d/MM/y – d/MM/y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d/MM/y – d/MM/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d/MM/y – d/MM/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d/MM/y – E d/MM/y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d/MM/y – E d/MM/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E d/MM/y – E d/MM/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="y" draft="unconfirmed">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="M" draft="unconfirmed">d 'de' MMM 'al' d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d 'de' MMM 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<fields>
-			<field type="day">
-				<relative type="-2">antier</relative>
-			</field>
-		</fields>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="GTQ">
-				<symbol>Q</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_PA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_PA.xml
deleted file mode 100644
index 89d81567dc7..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_PA.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
-		<language type="es"/>
-		<territory type="PA"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="generic">
-				<dateFormats>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>MM/dd/y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>MM/dd/yy GGGGG</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Md">MM/dd</dateFormatItem>
-						<dateFormatItem id="MEd">E, MM/dd</dateFormatItem>
-						<dateFormatItem id="yM">MM/y</dateFormatItem>
-						<dateFormatItem id="yMd">MM/dd/y</dateFormatItem>
-						<dateFormatItem id="yMEd">E MM/dd/y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback draft="unconfirmed">{0} a el {1}</intervalFormatFallback>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hm">
-							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="unconfirmed">MM/dd – MM/dd</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">MM/dd – MM/dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="unconfirmed">E MM/dd – E MM/dd</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E MM/dd – E MM/dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="M" draft="unconfirmed">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d 'al' E d 'de' MMM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y" draft="unconfirmed">y–y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="unconfirmed">MM/y – MM/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MM/y – MM/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="unconfirmed">MM/dd/y – MM/dd/y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">MM/dd/y – MM/dd/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MM/dd/y – MM/dd/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="unconfirmed">E MM/dd/y – E MM/dd/y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E MM/dd/y – E MM/dd/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E MM/dd/y – E MM/dd/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M" draft="unconfirmed">MMM–MMM 'de' y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d" draft="unconfirmed">d–d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d 'de' MMM 'al' d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d 'de' MMM 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>MM/dd/y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>MM/dd/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Md">MM/dd</dateFormatItem>
-						<dateFormatItem id="MEd">E, MM/dd</dateFormatItem>
-						<dateFormatItem id="yM">MM/y</dateFormatItem>
-						<dateFormatItem id="yMd">MM/dd/y</dateFormatItem>
-						<dateFormatItem id="yMEd">E MM/dd/y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback draft="unconfirmed">{0} a el {1}</intervalFormatFallback>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hm">
-							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hv">
-							<greatestDifference id="H" draft="unconfirmed">HH–HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="unconfirmed">MM/dd – MM/dd</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">MM/dd – MM/dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="unconfirmed">E MM/dd – E MM/dd</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E MM/dd – E MM/dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="M" draft="unconfirmed">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d 'al' E d 'de' MMM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="unconfirmed">MM/y – MM/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MM/y – MM/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="unconfirmed">MM/dd/y – MM/dd/y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">MM/dd/y – MM/dd/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MM/dd/y – MM/dd/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="unconfirmed">E MM/dd/y – E MM/dd/y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E MM/dd/y – E MM/dd/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E MM/dd/y – E MM/dd/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="y" draft="unconfirmed">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="M" draft="unconfirmed">d 'de' MMM 'al' d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d 'de' MMM 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<fields>
-			<field type="day">
-				<relative type="-2">antier</relative>
-			</field>
-		</fields>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="PAB">
-				<symbol>B/.</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ff_MR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ff_MR.xml
deleted file mode 100644
index 212dcabbf2d..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ff_MR.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="ff"/>
-		<territory type="MR"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="MRO">
-				<symbol>UM</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fo.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fo.xml
deleted file mode 100644
index beb80abc3d5..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fo.xml
+++ /dev/null
@@ -1,1733 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 11227 $"/>
-		<generation date="$Date: 2015-02-18 08:46:28 -0600 (Wed, 18 Feb 2015) $"/>
-		<language type="fo"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="ab" draft="contributed">abkhaziskt</language>
-			<language type="af" draft="contributed">afríska</language>
-			<language type="am" draft="contributed">amhariskt</language>
-			<language type="ar" draft="contributed">arabiskt</language>
-			<language type="as" draft="contributed">assamesiskt</language>
-			<language type="asa" draft="contributed">asu (Tanzania)</language>
-			<language type="ay" draft="contributed">aymara</language>
-			<language type="az" draft="contributed">azerbaijaniskt</language>
-			<language type="be" draft="contributed">hvitarussiskt</language>
-			<language type="bem" draft="contributed">bemba</language>
-			<language type="bez" draft="contributed">bena (Tanzania)</language>
-			<language type="bg" draft="contributed">bulgarskt</language>
-			<language type="bm" draft="contributed">bambara</language>
-			<language type="bn" draft="contributed">bengaliskt</language>
-			<language type="bo" draft="contributed">tibetanskt</language>
-			<language type="br" draft="contributed">bretonskt</language>
-			<language type="bs" draft="contributed">bosniskt</language>
-			<language type="bss" draft="contributed">bakossi</language>
-			<language type="ca" draft="contributed">katalanskt</language>
-			<language type="cs" draft="contributed">kekkiskt</language>
-			<language type="cy" draft="contributed">valisiskt</language>
-			<language type="da" draft="contributed">danskt</language>
-			<language type="de" draft="contributed">týskt</language>
-			<language type="dv" draft="contributed">divehi</language>
-			<language type="dz" draft="contributed">dzongkha</language>
-			<language type="ebu" draft="contributed">kiembu</language>
-			<language type="efi" draft="contributed">efik</language>
-			<language type="el" draft="contributed">grikiskt</language>
-			<language type="en" draft="contributed">enskt</language>
-			<language type="eo" draft="contributed">esperanto</language>
-			<language type="es" draft="contributed">spanskt</language>
-			<language type="et" draft="contributed">estlendskt</language>
-			<language type="eu" draft="contributed">baskiskt</language>
-			<language type="fa" draft="contributed">persiskt</language>
-			<language type="fi" draft="contributed">finskt</language>
-			<language type="fil" draft="contributed">filipiniskt</language>
-			<language type="fj" draft="contributed">fidjianskt</language>
-			<language type="fo">føroyskt</language>
-			<language type="fr" draft="contributed">franskt</language>
-			<language type="fy" draft="contributed">vestfrisikt</language>
-			<language type="ga" draft="contributed">írskt</language>
-			<language type="gd" draft="contributed">skotskt gæliskt</language>
-			<language type="gl" draft="contributed">galisiskt</language>
-			<language type="gn" draft="contributed">guarani</language>
-			<language type="gu" draft="contributed">gujariti</language>
-			<language type="ha" draft="contributed">haussa</language>
-			<language type="haw" draft="contributed">hawaiianskt</language>
-			<language type="he" draft="contributed">hebraiskt</language>
-			<language type="hi" draft="contributed">hindi</language>
-			<language type="hr" draft="contributed">kroatiskt</language>
-			<language type="ht" draft="contributed">haitiskt</language>
-			<language type="hu" draft="contributed">ungarskt</language>
-			<language type="hy" draft="contributed">armenskt</language>
-			<language type="ia" draft="contributed">interlingua</language>
-			<language type="id" draft="contributed">indonesiskt</language>
-			<language type="ie" draft="contributed">interlingue</language>
-			<language type="ig" draft="contributed">igbo</language>
-			<language type="is" draft="contributed">íslendskt</language>
-			<language type="it" draft="contributed">italskt</language>
-			<language type="ja" draft="contributed">japanskt</language>
-			<language type="jv" draft="contributed">javanesiskt</language>
-			<language type="ka" draft="contributed">georgiskt</language>
-			<language type="kea" draft="contributed">kapverdiskt</language>
-			<language type="kk" draft="contributed">kazakiskt</language>
-			<language type="km" draft="contributed">kambodjanskt</language>
-			<language type="kn" draft="contributed">kannada</language>
-			<language type="ko" draft="contributed">koreanskt</language>
-			<language type="ks" draft="contributed">kashmiriskt</language>
-			<language type="ku" draft="contributed">kurdiskt</language>
-			<language type="ky" draft="contributed">kirgisikt</language>
-			<language type="la" draft="contributed">latín</language>
-			<language type="lah" draft="contributed">lahnda</language>
-			<language type="lb" draft="contributed">luxemburgiskt</language>
-			<language type="ln" draft="contributed">lingala</language>
-			<language type="lo" draft="contributed">laotiskt</language>
-			<language type="lt" draft="contributed">litavskt</language>
-			<language type="luy" draft="contributed">olulujia</language>
-			<language type="lv" draft="contributed">latviskt</language>
-			<language type="mg" draft="contributed">malagasiskt</language>
-			<language type="mi" draft="contributed">maoriskt</language>
-			<language type="mk" draft="contributed">makedonskt</language>
-			<language type="ml" draft="contributed">malayalam</language>
-			<language type="mn" draft="contributed">mongoliskt</language>
-			<language type="mr" draft="contributed">marathiskt</language>
-			<language type="ms" draft="contributed">malajiskt</language>
-			<language type="mt" draft="contributed">maltesiskt</language>
-			<language type="my" draft="contributed">burmesiskt</language>
-			<language type="nb" draft="contributed">norskt bokmál</language>
-			<language type="ne" draft="contributed">nepalskt</language>
-			<language type="nl" draft="contributed">hollendskt</language>
-			<language type="nn" draft="contributed">nýnorskt</language>
-			<language type="no" draft="contributed">norskt</language>
-			<language type="ny" draft="contributed">nyanja</language>
-			<language type="oc" draft="contributed">occitan</language>
-			<language type="or" draft="contributed">oriya</language>
-			<language type="os" draft="contributed">ossetiskt</language>
-			<language type="pa" draft="contributed">punjabiskt</language>
-			<language type="pl" draft="contributed">polskt</language>
-			<language type="ps" draft="contributed">afghanskt</language>
-			<language type="pt" draft="contributed">portugisiskt</language>
-			<language type="qu" draft="contributed">quechua</language>
-			<language type="rm" draft="contributed">romansh</language>
-			<language type="rn" draft="contributed">rundi</language>
-			<language type="ro" draft="contributed">romanskt</language>
-			<language type="ru" draft="contributed">russiskt</language>
-			<language type="rw" draft="contributed">ruanda</language>
-			<language type="sa" draft="contributed">sanskrit</language>
-			<language type="sd" draft="contributed">sindhi</language>
-			<language type="sg" draft="contributed">sango</language>
-			<language type="sh" draft="contributed">serbokroatiskt</language>
-			<language type="si" draft="contributed">sinhalesiskt</language>
-			<language type="sk" draft="contributed">slovakiskt</language>
-			<language type="sl" draft="contributed">slovenskt</language>
-			<language type="sm" draft="contributed">samoiskt</language>
-			<language type="sn" draft="contributed">shona</language>
-			<language type="so" draft="contributed">somaliskt</language>
-			<language type="sq" draft="contributed">albanskt</language>
-			<language type="sr" draft="contributed">serbiskt</language>
-			<language type="ss" draft="contributed">swatiskt</language>
-			<language type="st" draft="contributed">sesotho</language>
-			<language type="su" draft="contributed">sundanesiskt</language>
-			<language type="sv" draft="contributed">svenskt</language>
-			<language type="sw" draft="contributed">swahili</language>
-			<language type="swb" draft="contributed">shimaoré</language>
-			<language type="ta" draft="contributed">tamilskt</language>
-			<language type="te" draft="contributed">telugiskt</language>
-			<language type="tet" draft="contributed">tetum</language>
-			<language type="tg" draft="contributed">tajikiskt</language>
-			<language type="th" draft="contributed">thailendskt</language>
-			<language type="ti" draft="contributed">tigrinya</language>
-			<language type="tk" draft="contributed">turkmenskt</language>
-			<language type="tl" draft="contributed">tagalog</language>
-			<language type="tlh" draft="contributed">klingonskt</language>
-			<language type="tn" draft="contributed">tswana</language>
-			<language type="to" draft="contributed">tonganskt</language>
-			<language type="tpi" draft="contributed">tok pisin</language>
-			<language type="tr" draft="contributed">turkiskt</language>
-			<language type="ts" draft="contributed">tsonga</language>
-			<language type="tt" draft="contributed">tatariskt</language>
-			<language type="tw" draft="contributed">twi</language>
-			<language type="ty" draft="contributed">tahitiskt</language>
-			<language type="ug" draft="contributed">uighur</language>
-			<language type="uk" draft="contributed">ukrainskt</language>
-			<language type="und" draft="contributed">ukjent mál</language>
-			<language type="ur" draft="contributed">urdu</language>
-			<language type="uz" draft="contributed">uzbekiskt</language>
-			<language type="ve" draft="contributed">venda</language>
-			<language type="vi" draft="contributed">vietnamesiskt</language>
-			<language type="wo" draft="contributed">wolof</language>
-			<language type="xh" draft="contributed">xhosa</language>
-			<language type="yi" draft="contributed">jiddiskt</language>
-			<language type="yo" draft="contributed">yoruba</language>
-			<language type="yue" draft="contributed">kantonesískt</language>
-			<language type="zh" draft="contributed">kinesiskt</language>
-			<language type="zu" draft="contributed">sulu</language>
-		</languages>
-		<scripts>
-			<script type="Latn" draft="contributed">latinske</script>
-		</scripts>
-		<territories>
-			<territory type="001" draft="contributed">heimur</territory>
-			<territory type="002" draft="contributed">Africa</territory>
-			<territory type="003" draft="contributed">Norðuramerika</territory>
-			<territory type="005" draft="contributed">Suðuramerika</territory>
-			<territory type="009" draft="contributed">Kyrrahavsoyggjarnar</territory>
-			<territory type="011" draft="contributed">Vesturafrika</territory>
-			<territory type="013" draft="contributed">Sentralamerika</territory>
-			<territory type="014" draft="contributed">Eysturafrika</territory>
-			<territory type="015" draft="contributed">Norðurafrika</territory>
-			<territory type="017" draft="contributed">Miðafrika</territory>
-			<territory type="018" draft="contributed">Suður Afrika</territory>
-			<territory type="019" draft="contributed">Amerika</territory>
-			<territory type="021" draft="contributed">Amerika norður Meksiko</territory>
-			<territory type="029" draft="contributed">Karibia</territory>
-			<territory type="030" draft="contributed">Eysturasia</territory>
-			<territory type="034" draft="contributed">Suðurasia</territory>
-			<territory type="035" draft="contributed">Suðureysturasia</territory>
-			<territory type="039" draft="contributed">Suðurevropa</territory>
-			<territory type="053" draft="contributed">Avstralia og Nýsæland</territory>
-			<territory type="054" draft="contributed">Melanesia</territory>
-			<territory type="057" draft="contributed">Mikronesiske regionen</territory>
-			<territory type="061" draft="contributed">Polynesia</territory>
-			<territory type="142" draft="contributed">Asia</territory>
-			<territory type="143" draft="contributed">Sentralasia</territory>
-			<territory type="145" draft="contributed">Vesturasia</territory>
-			<territory type="150" draft="contributed">Evropa</territory>
-			<territory type="151" draft="contributed">Eysturevropa</territory>
-			<territory type="154" draft="contributed">Norðurevropa</territory>
-			<territory type="155" draft="contributed">Vesturevropa</territory>
-			<territory type="419" draft="contributed">Latínamerika</territory>
-			<territory type="AC" draft="contributed">Ascensionoyggjin</territory>
-			<territory type="AD" draft="contributed">Andorra</territory>
-			<territory type="AE">Sameindu Emirríkini</territory>
-			<territory type="AF">Afganistan</territory>
-			<territory type="AG">Antigua og Barbuda</territory>
-			<territory type="AI" draft="contributed">Anguilla</territory>
-			<territory type="AL" draft="contributed">Albania</territory>
-			<territory type="AM" draft="contributed">Armenia</territory>
-			<territory type="AN" draft="contributed">Niðurlendsku Antilloyggjarnar</territory>
-			<territory type="AO" draft="contributed">Angola</territory>
-			<territory type="AQ">Antarktis</territory>
-			<territory type="AR" draft="contributed">Argentina</territory>
-			<territory type="AS" draft="contributed">Amerikanska Sámoa</territory>
-			<territory type="AT">Eysturríki</territory>
-			<territory type="AU">Avstralia</territory>
-			<territory type="AW" draft="contributed">Aruba</territory>
-			<territory type="AX" draft="contributed">Áland</territory>
-			<territory type="AZ">Aserbajdsjan</territory>
-			<territory type="BA">Bosnia-Hersegovina</territory>
-			<territory type="BB" draft="contributed">Barbados</territory>
-			<territory type="BD">Bangladesj</territory>
-			<territory type="BE">Belgia</territory>
-			<territory type="BF" draft="contributed">Burkina Faso</territory>
-			<territory type="BG" draft="contributed">Bulgaria</territory>
-			<territory type="BH" draft="contributed">Bahrain</territory>
-			<territory type="BI" draft="contributed">Burundi</territory>
-			<territory type="BJ" draft="contributed">Benin</territory>
-			<territory type="BL" draft="contributed">Saint Barthélemy</territory>
-			<territory type="BM" draft="contributed">Bermuda</territory>
-			<territory type="BN" draft="contributed">Brunei</territory>
-			<territory type="BO" draft="contributed">Bolivia</territory>
-			<territory type="BQ" draft="contributed">Niðurlonds Karibia</territory>
-			<territory type="BR">Brasilia</territory>
-			<territory type="BS" draft="contributed">Bahamas</territory>
-			<territory type="BT">Butan</territory>
-			<territory type="BV" draft="contributed">Bouvetoyggjin</territory>
-			<territory type="BW">Botsvana</territory>
-			<territory type="BY">Hvítarussland</territory>
-			<territory type="BZ">Belis</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CC" draft="contributed">Kokosoyggjarnar</territory>
-			<territory type="CD" draft="contributed">Kongo-Kinshasa</territory>
-			<territory type="CF">Miðafrikalýðveldið</territory>
-			<territory type="CG">Kongo</territory>
-			<territory type="CG" alt="variant" draft="contributed">Kongo-Brazzaville</territory>
-			<territory type="CH">Sveis</territory>
-			<territory type="CI">Fílabeinsstrondin</territory>
-			<territory type="CK" draft="contributed">Cooksoyggjarnar</territory>
-			<territory type="CL">Kili</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">Kina</territory>
-			<territory type="CO">Kolombia</territory>
-			<territory type="CP" draft="contributed">Clippertonoyggjin</territory>
-			<territory type="CR">Kosta Rika</territory>
-			<territory type="CU">Kuba</territory>
-			<territory type="CV">Grønhøvdaoyggjarnar</territory>
-			<territory type="CW" draft="contributed">Curaçao</territory>
-			<territory type="CX" draft="contributed">Jólaoyggjin</territory>
-			<territory type="CY">Kýpros</territory>
-			<territory type="CZ">Kekkia</territory>
-			<territory type="DE">Týskland</territory>
-			<territory type="DG" draft="contributed">Diego Garcia</territory>
-			<territory type="DJ" draft="contributed">Djibouti</territory>
-			<territory type="DK">Danmørk</territory>
-			<territory type="DM">Dominika</territory>
-			<territory type="DO">Domingo lýðveldið</territory>
-			<territory type="DZ" draft="contributed">Algeria</territory>
-			<territory type="EA" draft="contributed">Ceuta og Melilla</territory>
-			<territory type="EC">Ekvador</territory>
-			<territory type="EE">Estland</territory>
-			<territory type="EG">Egyptaland</territory>
-			<territory type="EH" draft="contributed">Vestursahara</territory>
-			<territory type="ER" draft="contributed">Eritrea</territory>
-			<territory type="ES">Spania</territory>
-			<territory type="ET">Etiopia</territory>
-			<territory type="EU" draft="contributed">Evropasamveldið</territory>
-			<territory type="FI">Finnland</territory>
-			<territory type="FJ" draft="contributed">Fiji</territory>
-			<territory type="FK" draft="contributed">Falklandsoyggjarnar</territory>
-			<territory type="FM">Mikronesia</territory>
-			<territory type="FO">Føroyar</territory>
-			<territory type="FR">Frakland</territory>
-			<territory type="GA" draft="contributed">Gabon</territory>
-			<territory type="GB" draft="contributed">Stóra Bretland</territory>
-			<territory type="GB" alt="short" draft="contributed">Stóra Bretland</territory>
-			<territory type="GD" draft="contributed">Grenada</territory>
-			<territory type="GE" draft="contributed">Georgia</territory>
-			<territory type="GF" draft="contributed">Fransk Gujana</territory>
-			<territory type="GG" draft="contributed">Guernsey</territory>
-			<territory type="GH" draft="contributed">Ghana</territory>
-			<territory type="GI" draft="contributed">Gibraltar</territory>
-			<territory type="GL" draft="contributed">Grønland</territory>
-			<territory type="GM" draft="contributed">Gambia</territory>
-			<territory type="GN" draft="contributed">Guinea</territory>
-			<territory type="GP" draft="contributed">Guadeloupe</territory>
-			<territory type="GQ">Ekvator Guinea</territory>
-			<territory type="GR">Grikkaland</territory>
-			<territory type="GS" draft="contributed">Suðurgeorgia</territory>
-			<territory type="GT" draft="contributed">Guatemala</territory>
-			<territory type="GU" draft="contributed">Guam</territory>
-			<territory type="GW">Guinea Bissau</territory>
-			<territory type="GY">Gujana</territory>
-			<territory type="HK" draft="contributed">Hongkong</territory>
-			<territory type="HK" alt="short" draft="contributed">Hongkong</territory>
-			<territory type="HM" draft="contributed">Heard- og McDonald-oyggjarnar</territory>
-			<territory type="HN" draft="contributed">Honduras</territory>
-			<territory type="HR">Kroatia</territory>
-			<territory type="HT" draft="contributed">Haiti</territory>
-			<territory type="HU">Ungarn</territory>
-			<territory type="IC" draft="contributed">Kanaríoyggjarnar</territory>
-			<territory type="ID" draft="contributed">Indonesia</territory>
-			<territory type="IE">Írland</territory>
-			<territory type="IL">Ísrael</territory>
-			<territory type="IM" draft="contributed">Mann</territory>
-			<territory type="IN">India</territory>
-			<territory type="IO" draft="contributed">Bretsku Indiahavsoyggjarnar</territory>
-			<territory type="IQ">Irak</territory>
-			<territory type="IR" draft="contributed">Iran</territory>
-			<territory type="IS">Ísland</territory>
-			<territory type="IT">Italia</territory>
-			<territory type="JE" draft="contributed">Jersey</territory>
-			<territory type="JM">Jameika</territory>
-			<territory type="JO" draft="contributed">Jordania</territory>
-			<territory type="JP">Japan</territory>
-			<territory type="KE">Kenja</territory>
-			<territory type="KG">Kirgisia</territory>
-			<territory type="KH">Kambodja</territory>
-			<territory type="KI" draft="contributed">Kiribati</territory>
-			<territory type="KM">Komorooyggjarnar</territory>
-			<territory type="KN">Saint Kitts og Nevis</territory>
-			<territory type="KP">Norður-Korea</territory>
-			<territory type="KR">Suður-Korea</territory>
-			<territory type="KW">Kuvait</territory>
-			<territory type="KY" draft="contributed">Caymanoyggjarnar</territory>
-			<territory type="KZ">Kasakstan</territory>
-			<territory type="LA" draft="contributed">Laos</territory>
-			<territory type="LB">Libanon</territory>
-			<territory type="LC">Saint Lusia</territory>
-			<territory type="LI">Liktenstein</territory>
-			<territory type="LK" draft="contributed">Sri Lanka</territory>
-			<territory type="LR" draft="contributed">Liberia</territory>
-			<territory type="LS">Lesoto</territory>
-			<territory type="LT">Litava</territory>
-			<territory type="LU">Luksemborg</territory>
-			<territory type="LV">Lettland</territory>
-			<territory type="LY" draft="contributed">Libya</territory>
-			<territory type="MA">Marokko</territory>
-			<territory type="MC">Monako</territory>
-			<territory type="MD" draft="contributed">Moldova</territory>
-			<territory type="ME" draft="contributed">Montenegro</territory>
-			<territory type="MF" draft="contributed">Fransk Saint Martin</territory>
-			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Marshalloyggjarnar</territory>
-			<territory type="MK">Makedónia</territory>
-			<territory type="ML" draft="contributed">Mali</territory>
-			<territory type="MM" draft="contributed">Burma</territory>
-			<territory type="MN" draft="contributed">Mongolia</territory>
-			<territory type="MO" draft="contributed">Makao</territory>
-			<territory type="MO" alt="short" draft="contributed">Makao</territory>
-			<territory type="MP" draft="contributed">Norðurmarianoyggjarnar</territory>
-			<territory type="MQ" draft="contributed">Martinique</territory>
-			<territory type="MR">Móritania</territory>
-			<territory type="MS" draft="contributed">Montserrat</territory>
-			<territory type="MT" draft="contributed">Malta</territory>
-			<territory type="MU">Móritius</territory>
-			<territory type="MV">Maldivuoyggjarnar</territory>
-			<territory type="MW">Malavi</territory>
-			<territory type="MX">Meksiko</territory>
-			<territory type="MY">Maleisia</territory>
-			<territory type="MZ">Mosambik</territory>
-			<territory type="NA" draft="contributed">Namibia</territory>
-			<territory type="NC" draft="contributed">Ný-Kaledonia</territory>
-			<territory type="NE" draft="contributed">Niger</territory>
-			<territory type="NF" draft="contributed">Norfolkoyggjin</territory>
-			<territory type="NG" draft="contributed">Nigeria</territory>
-			<territory type="NI">Nikaragua</territory>
-			<territory type="NL">Niðurlond</territory>
-			<territory type="NO">Noreg</territory>
-			<territory type="NP" draft="contributed">Nepal</territory>
-			<territory type="NR" draft="contributed">Nauru</territory>
-			<territory type="NU" draft="contributed">Niue</territory>
-			<territory type="NZ">Ný Sæland</territory>
-			<territory type="OM" draft="contributed">Oman</territory>
-			<territory type="PA" draft="contributed">Panama</territory>
-			<territory type="PE">Perú</territory>
-			<territory type="PF" draft="contributed">Franska Polynesia</territory>
-			<territory type="PG">Papua Nýguinea</territory>
-			<territory type="PH">Filipsoyggjar</territory>
-			<territory type="PK" draft="contributed">Pakistan</territory>
-			<territory type="PL">Pólland</territory>
-			<territory type="PM" draft="contributed">Saint Pierre og Miquelon</territory>
-			<territory type="PN" draft="contributed">Pitcairn</territory>
-			<territory type="PR" draft="contributed">Puerto Rico</territory>
-			<territory type="PS" draft="contributed">Palestinskt territorium</territory>
-			<territory type="PS" alt="short" draft="contributed">Palestina</territory>
-			<territory type="PT" draft="contributed">Portugal</territory>
-			<territory type="PW" draft="contributed">Palau</territory>
-			<territory type="PY">Paraguei</territory>
-			<territory type="QA">Katar</territory>
-			<territory type="RE" draft="contributed">Réunion</territory>
-			<territory type="RO">Rumenia</territory>
-			<territory type="RS" draft="contributed">Serbia</territory>
-			<territory type="RU">Russland</territory>
-			<territory type="RW">Ruanda</territory>
-			<territory type="SA">Saudi-Arábia</territory>
-			<territory type="SB">Sálomonoyggjarnar</territory>
-			<territory type="SC">Seyskelloyggjarnar</territory>
-			<territory type="SD" draft="contributed">Norðursudan</territory>
-			<territory type="SE">Svøríki</territory>
-			<territory type="SG">Singapor</territory>
-			<territory type="SH" draft="contributed">Saint Helena</territory>
-			<territory type="SI" draft="contributed">Slovenia</territory>
-			<territory type="SJ" draft="contributed">Svalbard og Jan Mayen</territory>
-			<territory type="SK" draft="contributed">Slovakia</territory>
-			<territory type="SL" draft="contributed">Sierra Leone</territory>
-			<territory type="SM" draft="contributed">San Marino</territory>
-			<territory type="SN" draft="contributed">Senegal</territory>
-			<territory type="SO" draft="contributed">Somalia</territory>
-			<territory type="SR">Surinam</territory>
-			<territory type="SS" draft="contributed">Suðursudan</territory>
-			<territory type="ST">Sao Tome og Prinsipi</territory>
-			<territory type="SV" draft="contributed">El Salvador</territory>
-			<territory type="SX" draft="contributed">Niðurlonds Saint Martin</territory>
-			<territory type="SY" draft="contributed">Syria</territory>
-			<territory type="SZ">Svasiland</territory>
-			<territory type="TA" draft="contributed">Tristan da Cunha</territory>
-			<territory type="TC" draft="contributed">Turks- og Caicosoyggjarnar</territory>
-			<territory type="TD">Kjad</territory>
-			<territory type="TG" draft="contributed">Togo</territory>
-			<territory type="TH" draft="contributed">Teiland</territory>
-			<territory type="TJ">Tadsjikistan</territory>
-			<territory type="TK" draft="contributed">Tokelau</territory>
-			<territory type="TL" draft="contributed">Eystur-Timor</territory>
-			<territory type="TM" draft="contributed">Turkmenistan</territory>
-			<territory type="TN">Tunesia</territory>
-			<territory type="TO" draft="contributed">Tonga</territory>
-			<territory type="TR">Turkaland</territory>
-			<territory type="TT">Trinidad og Tobago</territory>
-			<territory type="TV" draft="contributed">Tuvalu</territory>
-			<territory type="TW">Teivan</territory>
-			<territory type="TZ">Tansania</territory>
-			<territory type="UA">Ukreina</territory>
-			<territory type="UG" draft="contributed">Uganda</territory>
-			<territory type="US">Sambandsríki Amerika</territory>
-			<territory type="US" alt="short" draft="contributed">USA</territory>
-			<territory type="UY">Uruguei</territory>
-			<territory type="UZ">Usbekistan</territory>
-			<territory type="VA">Vatikan</territory>
-			<territory type="VC">Saint Vinsent og Grenadinoyggjar</territory>
-			<territory type="VE">Venesuela</territory>
-			<territory type="VG" draft="contributed">Stóra Bretlands Jómfrúoyggjarnar</territory>
-			<territory type="VI" draft="contributed">Sambandsríki Amerikas Jómfrúoyggjarnar</territory>
-			<territory type="VN" draft="contributed">Vietnam</territory>
-			<territory type="VU" draft="contributed">Vanuatu</territory>
-			<territory type="WF" draft="contributed">Wallis og Futuna</territory>
-			<territory type="WS">Sámoa</territory>
-			<territory type="XK" draft="contributed">Kosovo</territory>
-			<territory type="YE">Jemen</territory>
-			<territory type="YT" draft="contributed">Mayotte</territory>
-			<territory type="ZA">Suðurafrikalýðveldið</territory>
-			<territory type="ZM">Sambia</territory>
-			<territory type="ZW">Simbabvi</territory>
-			<territory type="ZZ" draft="contributed">(ukendt område)</territory>
-		</territories>
-		<variants>
-			<variant type="MONOTON" draft="contributed">monotonísk</variant>
-			<variant type="PINYIN" draft="contributed">pinyin</variant>
-			<variant type="POLYTON" draft="contributed">polytonísk</variant>
-			<variant type="WADEGILE" draft="contributed">Wade-Giles</variant>
-		</variants>
-		<types>
-			<type type="eor" key="collation" draft="contributed">röðina fyrir fjöltyngi evrópskum skjölum</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric" draft="contributed">SI-einingar</measurementSystemName>
-			<measurementSystemName type="UK" draft="contributed">GB-einingar</measurementSystemName>
-			<measurementSystemName type="US" draft="contributed">USA-einingar</measurementSystemName>
-		</measurementSystemNames>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a á b d ð e f g h i í j k l m n o ó p r s t u ú v x y ý æ ø]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[c q w z]</exemplarCharacters>
-		<exemplarCharacters type="index" draft="contributed">[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 Æ Ø]</exemplarCharacters>
-		<ellipsis type="final" draft="contributed">{0}…</ellipsis>
-		<ellipsis type="initial" draft="contributed">…{0}</ellipsis>
-		<ellipsis type="medial" draft="contributed">{0}…{1}</ellipsis>
-		<ellipsis type="word-final" draft="contributed">{0} …</ellipsis>
-		<ellipsis type="word-initial" draft="contributed">… {0}</ellipsis>
-		<ellipsis type="word-medial" draft="contributed">{0} … {1}</ellipsis>
-		<moreInformation draft="contributed">?</moreInformation>
-	</characters>
-	<delimiters>
-		<quotationStart draft="contributed">”</quotationStart>
-		<quotationEnd draft="contributed">”</quotationEnd>
-		<alternateQuotationStart draft="contributed">’</alternateQuotationStart>
-		<alternateQuotationEnd draft="contributed">’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="generic">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE dd MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d. MMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd-MM-y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd-MM-yy GGGGG</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<dateTimeFormatLength type="full">
-						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="long">
-						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="d" draft="contributed">d</dateFormatItem>
-						<dateFormatItem id="Ed" draft="contributed">d E</dateFormatItem>
-						<dateFormatItem id="h" draft="contributed">h a</dateFormatItem>
-						<dateFormatItem id="H" draft="contributed">HH</dateFormatItem>
-						<dateFormatItem id="hm" draft="contributed">h:mm a</dateFormatItem>
-						<dateFormatItem id="Hm" draft="contributed">HH:mm</dateFormatItem>
-						<dateFormatItem id="hms" draft="contributed">h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Hms" draft="contributed">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="M" draft="contributed">L</dateFormatItem>
-						<dateFormatItem id="Md" draft="contributed">M-d</dateFormatItem>
-						<dateFormatItem id="MEd" draft="contributed">E, M-d</dateFormatItem>
-						<dateFormatItem id="MMM" draft="contributed">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd" draft="contributed">MMM d</dateFormatItem>
-						<dateFormatItem id="MMMEd" draft="contributed">E MMM d</dateFormatItem>
-						<dateFormatItem id="ms" draft="contributed">mm:ss</dateFormatItem>
-						<dateFormatItem id="y" draft="contributed">y</dateFormatItem>
-						<dateFormatItem id="yM" draft="contributed">y-MM</dateFormatItem>
-						<dateFormatItem id="yMd" draft="contributed">y-MM-dd</dateFormatItem>
-						<dateFormatItem id="yMEd" draft="contributed">E, y-MM-dd</dateFormatItem>
-						<dateFormatItem id="yMMM" draft="contributed">y MMM</dateFormatItem>
-						<dateFormatItem id="yMMMd" draft="contributed">y MMM d</dateFormatItem>
-						<dateFormatItem id="yMMMEd" draft="contributed">E, y MMM d</dateFormatItem>
-						<dateFormatItem id="yQQQ" draft="contributed">y QQQ</dateFormatItem>
-						<dateFormatItem id="yQQQQ" draft="contributed">y QQQQ</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback draft="contributed">{0} – {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d" draft="contributed">d–d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a" draft="contributed">h a – h a</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h–h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="H">
-							<greatestDifference id="H" draft="contributed">HH–HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a" draft="contributed">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m" draft="contributed">h:mm–h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hm">
-							<greatestDifference id="H" draft="contributed">HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="m" draft="contributed">HH:mm–HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a" draft="contributed">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m" draft="contributed">h:mm–h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H" draft="contributed">HH:mm–HH:mm v</greatestDifference>
-							<greatestDifference id="m" draft="contributed">HH:mm–HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a" draft="contributed">h a – h a v</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h–h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hv">
-							<greatestDifference id="H" draft="contributed">HH–HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M" draft="contributed">M–M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="contributed">MM-dd – dd</greatestDifference>
-							<greatestDifference id="M" draft="contributed">MM-dd – MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="contributed">E, MM-dd – E, MM-dd</greatestDifference>
-							<greatestDifference id="M" draft="contributed">E, MM-dd – E, MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M" draft="contributed">LLL–LLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d" draft="contributed">MM-d – d</greatestDifference>
-							<greatestDifference id="M" draft="contributed">MM-d – MM-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d" draft="contributed">E, MM-d – E, MM-d</greatestDifference>
-							<greatestDifference id="M" draft="contributed">E, MM-d – E, MM-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y" draft="contributed">y–y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="contributed">y-MM – MM</greatestDifference>
-							<greatestDifference id="y" draft="contributed">y-MM – y-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="contributed">y-MM-dd – dd</greatestDifference>
-							<greatestDifference id="M" draft="contributed">y-MM-dd – MM-dd</greatestDifference>
-							<greatestDifference id="y" draft="contributed">y-MM-dd – y-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="contributed">E, y-MM-dd – E, y-MM-dd</greatestDifference>
-							<greatestDifference id="M" draft="contributed">E, y-MM-dd – E, y-MM-dd</greatestDifference>
-							<greatestDifference id="y" draft="contributed">E, y-MM-dd – E, y-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M" draft="contributed">y-MM – MM</greatestDifference>
-							<greatestDifference id="y" draft="contributed">y-MM – y-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d" draft="contributed">y-MM-d – d</greatestDifference>
-							<greatestDifference id="M" draft="contributed">y-MM-dd – MM-d</greatestDifference>
-							<greatestDifference id="y" draft="contributed">y-MM-dd – y-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d" draft="contributed">E, y-MM-dd – E, y-MM-dd</greatestDifference>
-							<greatestDifference id="M" draft="contributed">E, y-MM-dd – E, y-MM-dd</greatestDifference>
-							<greatestDifference id="y" draft="contributed">E, y-MM-dd – E, y-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M" draft="contributed">y-MM – MM</greatestDifference>
-							<greatestDifference id="y" draft="contributed">y-MM – y-MM</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">jan</month>
-							<month type="2">feb</month>
-							<month type="3">mar</month>
-							<month type="4">apr</month>
-							<month type="5">mai</month>
-							<month type="6">jun</month>
-							<month type="7">jul</month>
-							<month type="8">aug</month>
-							<month type="9">sep</month>
-							<month type="10">okt</month>
-							<month type="11">nov</month>
-							<month type="12">des</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1" draft="contributed">J</month>
-							<month type="2" draft="contributed">F</month>
-							<month type="3" draft="contributed">M</month>
-							<month type="4" draft="contributed">A</month>
-							<month type="5" draft="contributed">M</month>
-							<month type="6" draft="contributed">J</month>
-							<month type="7" draft="contributed">J</month>
-							<month type="8" draft="contributed">A</month>
-							<month type="9" draft="contributed">S</month>
-							<month type="10" draft="contributed">O</month>
-							<month type="11" draft="contributed">N</month>
-							<month type="12" draft="contributed">D</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">januar</month>
-							<month type="2">februar</month>
-							<month type="3">mars</month>
-							<month type="4">apríl</month>
-							<month type="5">mai</month>
-							<month type="6">juni</month>
-							<month type="7">juli</month>
-							<month type="8">august</month>
-							<month type="9">september</month>
-							<month type="10">oktober</month>
-							<month type="11">november</month>
-							<month type="12">desember</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1" draft="contributed">J</month>
-							<month type="2" draft="contributed">F</month>
-							<month type="3" draft="contributed">M</month>
-							<month type="4" draft="contributed">A</month>
-							<month type="5" draft="contributed">M</month>
-							<month type="6" draft="contributed">J</month>
-							<month type="7" draft="contributed">J</month>
-							<month type="8" draft="contributed">A</month>
-							<month type="9" draft="contributed">S</month>
-							<month type="10" draft="contributed">O</month>
-							<month type="11" draft="contributed">N</month>
-							<month type="12" draft="contributed">D</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">sun</day>
-							<day type="mon">mán</day>
-							<day type="tue">týs</day>
-							<day type="wed">mik</day>
-							<day type="thu">hós</day>
-							<day type="fri">frí</day>
-							<day type="sat">ley</day>
-						</dayWidth>
-						<dayWidth type="short">
-							<day type="sun" draft="contributed">su</day>
-							<day type="mon" draft="contributed">má</day>
-							<day type="tue" draft="contributed">tý</day>
-							<day type="wed" draft="contributed">mi</day>
-							<day type="thu" draft="contributed">hó</day>
-							<day type="fri" draft="contributed">fr</day>
-							<day type="sat" draft="contributed">le</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">sunnudagur</day>
-							<day type="mon">mánadagur</day>
-							<day type="tue">týsdagur</day>
-							<day type="wed">mikudagur</day>
-							<day type="thu">hósdagur</day>
-							<day type="fri">fríggjadagur</day>
-							<day type="sat">leygardagur</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun" draft="contributed">S</day>
-							<day type="mon" draft="contributed">M</day>
-							<day type="tue" draft="contributed">T</day>
-							<day type="wed" draft="contributed">M</day>
-							<day type="thu" draft="contributed">H</day>
-							<day type="fri" draft="contributed">F</day>
-							<day type="sat" draft="contributed">L</day>
-						</dayWidth>
-						<dayWidth type="short">
-							<day type="sun" draft="contributed">su</day>
-							<day type="mon" draft="contributed">má</day>
-							<day type="tue" draft="contributed">tý</day>
-							<day type="wed" draft="contributed">mi</day>
-							<day type="thu" draft="contributed">hó</day>
-							<day type="fri" draft="contributed">fr</day>
-							<day type="sat" draft="contributed">le</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">K1</quarter>
-							<quarter type="2">K2</quarter>
-							<quarter type="3">K3</quarter>
-							<quarter type="4">K4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1. kvartal</quarter>
-							<quarter type="2">2. kvartal</quarter>
-							<quarter type="3">3. kvartal</quarter>
-							<quarter type="4">4. kvartal</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1" draft="contributed">1</quarter>
-							<quarter type="2" draft="contributed">2</quarter>
-							<quarter type="3" draft="contributed">3</quarter>
-							<quarter type="4" draft="contributed">4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1. kvartal</quarter>
-							<quarter type="2">2. kvartal</quarter>
-							<quarter type="3">3. kvartal</quarter>
-							<quarter type="4">4. kvartal</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<dayPeriods>
-					<dayPeriodContext type="format">
-						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am" draft="contributed">f.p.</dayPeriod>
-							<dayPeriod type="pm" draft="contributed">s.p.</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="am" draft="contributed">um fyrrapartur</dayPeriod>
-							<dayPeriod type="pm" draft="contributed">um seinnapartur</dayPeriod>
-						</dayPeriodWidth>
-					</dayPeriodContext>
-					<dayPeriodContext type="stand-alone">
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="am" draft="contributed">fyrrapartur</dayPeriod>
-							<dayPeriod type="pm" draft="contributed">seinnapartur</dayPeriod>
-						</dayPeriodWidth>
-					</dayPeriodContext>
-				</dayPeriods>
-				<eras>
-					<eraNames>
-						<era type="0" draft="contributed">fyrir Krist</era>
-						<era type="0" alt="variant" draft="contributed">fyrir látlaus tímatal</era>
-						<era type="1" draft="contributed">eftir Krist</era>
-						<era type="1" alt="variant" draft="contributed">látlaus tímatal</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0" draft="contributed">f.Kr.</era>
-						<era type="0" alt="variant" draft="contributed">f.l.t.</era>
-						<era type="1" draft="contributed">e.Kr.</era>
-						<era type="1" alt="variant" draft="contributed">l.t.</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0" draft="contributed">fKr</era>
-						<era type="0" alt="variant" draft="contributed">flt</era>
-						<era type="1" draft="contributed">eKr</era>
-						<era type="1" alt="variant" draft="contributed">lt</era>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d. MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd-MM-y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd-MM-yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern draft="contributed">HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern draft="contributed">HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern draft="contributed">HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern draft="contributed">HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<dateTimeFormatLength type="full">
-						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="long">
-						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="d" draft="contributed">d</dateFormatItem>
-						<dateFormatItem id="Ed" draft="contributed">d E</dateFormatItem>
-						<dateFormatItem id="h" draft="contributed">h a</dateFormatItem>
-						<dateFormatItem id="H" draft="contributed">HH</dateFormatItem>
-						<dateFormatItem id="hm" draft="contributed">h:mm a</dateFormatItem>
-						<dateFormatItem id="Hm" draft="contributed">HH:mm</dateFormatItem>
-						<dateFormatItem id="hms" draft="contributed">h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Hms" draft="contributed">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="M" draft="contributed">L</dateFormatItem>
-						<dateFormatItem id="Md" draft="contributed">M-d</dateFormatItem>
-						<dateFormatItem id="MEd" draft="contributed">E, M-d</dateFormatItem>
-						<dateFormatItem id="MMM" draft="contributed">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd" draft="contributed">MMM d</dateFormatItem>
-						<dateFormatItem id="MMMEd" draft="contributed">E MMM d</dateFormatItem>
-						<dateFormatItem id="ms" draft="contributed">mm:ss</dateFormatItem>
-						<dateFormatItem id="y" draft="contributed">y</dateFormatItem>
-						<dateFormatItem id="yM" draft="contributed">y-MM</dateFormatItem>
-						<dateFormatItem id="yMd" draft="contributed">y-MM-dd</dateFormatItem>
-						<dateFormatItem id="yMEd" draft="contributed">E, y-MM-dd</dateFormatItem>
-						<dateFormatItem id="yMMM" draft="contributed">y MMM</dateFormatItem>
-						<dateFormatItem id="yMMMd" draft="contributed">y MMM d</dateFormatItem>
-						<dateFormatItem id="yMMMEd" draft="contributed">E, y MMM d</dateFormatItem>
-						<dateFormatItem id="yQQQ" draft="contributed">y QQQ</dateFormatItem>
-						<dateFormatItem id="yQQQQ" draft="contributed">y QQQQ</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback draft="contributed">{0} – {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d" draft="contributed">d–d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a" draft="contributed">h a – h a</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h–h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="H">
-							<greatestDifference id="H" draft="contributed">HH–HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a" draft="contributed">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m" draft="contributed">h:mm–h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hm">
-							<greatestDifference id="H" draft="contributed">HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="m" draft="contributed">HH:mm–HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a" draft="contributed">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m" draft="contributed">h:mm–h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H" draft="contributed">HH:mm–HH:mm v</greatestDifference>
-							<greatestDifference id="m" draft="contributed">HH:mm–HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a" draft="contributed">h a – h a v</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h–h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hv">
-							<greatestDifference id="H" draft="contributed">HH–HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M" draft="contributed">M–M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="contributed">MM-dd – dd</greatestDifference>
-							<greatestDifference id="M" draft="contributed">MM-dd – MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="contributed">E, MM-dd – E, MM-dd</greatestDifference>
-							<greatestDifference id="M" draft="contributed">E, MM-dd – E, MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M" draft="contributed">LLL–LLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d" draft="contributed">MM-d – d</greatestDifference>
-							<greatestDifference id="M" draft="contributed">MM-d – MM-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d" draft="contributed">E, MM-d – E, MM-d</greatestDifference>
-							<greatestDifference id="M" draft="contributed">E, MM-d – E, MM-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y" draft="contributed">y–y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="contributed">y-MM – MM</greatestDifference>
-							<greatestDifference id="y" draft="contributed">y-MM – y-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="contributed">y-MM-dd – dd</greatestDifference>
-							<greatestDifference id="M" draft="contributed">y-MM-dd – MM-dd</greatestDifference>
-							<greatestDifference id="y" draft="contributed">y-MM-dd – y-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="contributed">E, y-MM-dd – E, y-MM-dd</greatestDifference>
-							<greatestDifference id="M" draft="contributed">E, y-MM-dd – E, y-MM-dd</greatestDifference>
-							<greatestDifference id="y" draft="contributed">E, y-MM-dd – E, y-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M" draft="contributed">y-MM – MM</greatestDifference>
-							<greatestDifference id="y" draft="contributed">y-MM – y-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d" draft="contributed">y-MM-d – d</greatestDifference>
-							<greatestDifference id="M" draft="contributed">y-MM-dd – MM-d</greatestDifference>
-							<greatestDifference id="y" draft="contributed">y-MM-dd – y-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d" draft="contributed">E, y-MM-dd – E, y-MM-dd</greatestDifference>
-							<greatestDifference id="M" draft="contributed">E, y-MM-dd – E, y-MM-dd</greatestDifference>
-							<greatestDifference id="y" draft="contributed">E, y-MM-dd – E, y-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M" draft="contributed">y-MM – MM</greatestDifference>
-							<greatestDifference id="y" draft="contributed">y-MM – y-MM</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<fields>
-			<field type="era">
-				<displayName draft="contributed">tíðarrokning</displayName>
-			</field>
-			<field type="year">
-				<displayName draft="contributed">ár</displayName>
-				<relative type="-1" draft="contributed">í fjør</relative>
-				<relative type="0" draft="contributed">í ár</relative>
-				<relative type="1" draft="contributed">næsta ár</relative>
-			</field>
-			<field type="month">
-				<displayName draft="contributed">mánaður</displayName>
-				<relative type="-1" draft="contributed">seinasta mánað</relative>
-				<relative type="0" draft="contributed">henda mánaðin</relative>
-				<relative type="1" draft="contributed">næsta mánað</relative>
-			</field>
-			<field type="week">
-				<displayName draft="contributed">vika</displayName>
-				<relative type="-1" draft="contributed">seinastu viku</relative>
-				<relative type="0" draft="contributed">hesu viku</relative>
-				<relative type="1" draft="contributed">næstu viku</relative>
-			</field>
-			<field type="day">
-				<displayName draft="contributed">dagur</displayName>
-				<relative type="-2" draft="contributed">fyrradagin</relative>
-				<relative type="-1" draft="contributed">í gjár</relative>
-				<relative type="0" draft="contributed">í dag</relative>
-				<relative type="1" draft="contributed">í morgin</relative>
-				<relative type="2" draft="contributed">í ovurmorgin</relative>
-			</field>
-			<field type="weekday">
-				<displayName draft="contributed">gerandisdagur</displayName>
-			</field>
-			<field type="sun">
-				<relative type="-1" draft="contributed">seinasta sunnudag</relative>
-				<relative type="0" draft="contributed">næsta sunnudag</relative>
-				<relative type="1" draft="contributed">sunnudagin í næstu viku</relative>
-			</field>
-			<field type="mon">
-				<relative type="-1" draft="contributed">seinasta mánadag</relative>
-				<relative type="0" draft="contributed">næsta mánadag</relative>
-				<relative type="1" draft="contributed">mánadagin í næstu viku</relative>
-			</field>
-			<field type="tue">
-				<relative type="-1" draft="contributed">seinasta týsdag</relative>
-				<relative type="0" draft="contributed">næsta týsdag</relative>
-				<relative type="1" draft="contributed">týsdagin í næstu viku</relative>
-			</field>
-			<field type="wed">
-				<relative type="-1" draft="contributed">seinasta mikudag</relative>
-				<relative type="0" draft="contributed">næsta mikudag</relative>
-				<relative type="1" draft="contributed">mikudagin í næstu viku</relative>
-			</field>
-			<field type="thu">
-				<relative type="-1" draft="contributed">seinasta hósdag</relative>
-				<relative type="0" draft="contributed">næsta hósdag</relative>
-				<relative type="1" draft="contributed">hósdagin í næstu viku</relative>
-			</field>
-			<field type="fri">
-				<relative type="-1" draft="contributed">seinasta fríggjadag</relative>
-				<relative type="0" draft="contributed">næsta fríggjadag</relative>
-				<relative type="1" draft="contributed">fríggjadagin í næstu viku</relative>
-			</field>
-			<field type="sat">
-				<relative type="-1" draft="contributed">seinasta leygardag</relative>
-				<relative type="0" draft="contributed">næsta leygardag</relative>
-				<relative type="1" draft="contributed">leygardagin í næstu viku</relative>
-			</field>
-			<field type="dayperiod">
-				<displayName draft="contributed">AM/PM</displayName>
-			</field>
-			<field type="hour">
-				<displayName draft="contributed">tími</displayName>
-			</field>
-			<field type="minute">
-				<displayName draft="contributed">minuttur</displayName>
-			</field>
-			<field type="second">
-				<displayName draft="contributed">sekund</displayName>
-			</field>
-			<field type="zone">
-				<displayName draft="contributed">tíðarøki</displayName>
-			</field>
-		</fields>
-	</dates>
-	<numbers>
-		<symbols numberSystem="latn">
-			<decimal>,</decimal>
-			<group>.</group>
-			<list draft="contributed">;</list>
-			<percentSign draft="contributed">%</percentSign>
-			<plusSign draft="contributed">+</plusSign>
-			<minusSign draft="contributed">−</minusSign>
-			<exponential draft="contributed">×10^</exponential>
-			<perMille draft="contributed">‰</perMille>
-			<infinity draft="contributed">∞</infinity>
-			<nan draft="contributed">¤¤¤</nan>
-		</symbols>
-		<decimalFormats numberSystem="latn">
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern draft="contributed">#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-			<decimalFormatLength type="long">
-				<decimalFormat>
-					<pattern type="1000" count="one" draft="contributed">0 tusind</pattern>
-					<pattern type="1000" count="other" draft="contributed">0 tusind</pattern>
-					<pattern type="10000" count="one" draft="contributed">00 tusind</pattern>
-					<pattern type="10000" count="other" draft="contributed">00 tusind</pattern>
-					<pattern type="100000" count="one" draft="contributed">000 tusind</pattern>
-					<pattern type="100000" count="other" draft="contributed">000 tusind</pattern>
-					<pattern type="1000000" count="one" draft="contributed">0 million</pattern>
-					<pattern type="1000000" count="other" draft="contributed">0 millioner</pattern>
-					<pattern type="10000000" count="one" draft="contributed">00 million</pattern>
-					<pattern type="10000000" count="other" draft="contributed">00 millioner</pattern>
-					<pattern type="100000000" count="one" draft="contributed">000 million</pattern>
-					<pattern type="100000000" count="other" draft="contributed">000 millioner</pattern>
-					<pattern type="1000000000" count="one" draft="contributed">0 milliard</pattern>
-					<pattern type="1000000000" count="other" draft="contributed">0 milliarder</pattern>
-					<pattern type="10000000000" count="one" draft="contributed">00 milliard</pattern>
-					<pattern type="10000000000" count="other" draft="contributed">00 milliarder</pattern>
-					<pattern type="100000000000" count="one" draft="contributed">000 milliard</pattern>
-					<pattern type="100000000000" count="other" draft="contributed">000 milliarder</pattern>
-					<pattern type="1000000000000" count="one" draft="contributed">0 billion</pattern>
-					<pattern type="1000000000000" count="other" draft="contributed">0 billioner</pattern>
-					<pattern type="10000000000000" count="one" draft="contributed">00 billion</pattern>
-					<pattern type="10000000000000" count="other" draft="contributed">00 billioner</pattern>
-					<pattern type="100000000000000" count="one" draft="contributed">000 billion</pattern>
-					<pattern type="100000000000000" count="other" draft="contributed">000 billioner</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-			<decimalFormatLength type="short">
-				<decimalFormat>
-					<pattern type="1000" count="one" draft="contributed">0 td</pattern>
-					<pattern type="1000" count="other" draft="contributed">0 td</pattern>
-					<pattern type="10000" count="one" draft="contributed">00 td</pattern>
-					<pattern type="10000" count="other" draft="contributed">00 td</pattern>
-					<pattern type="100000" count="one" draft="contributed">000 td</pattern>
-					<pattern type="100000" count="other" draft="contributed">000 td</pattern>
-					<pattern type="1000000" count="one" draft="contributed">0 mn</pattern>
-					<pattern type="1000000" count="other" draft="contributed">0 mn</pattern>
-					<pattern type="10000000" count="one" draft="contributed">00 mn</pattern>
-					<pattern type="10000000" count="other" draft="contributed">00 mn</pattern>
-					<pattern type="100000000" count="one" draft="contributed">000 mn</pattern>
-					<pattern type="100000000" count="other" draft="contributed">000 mn</pattern>
-					<pattern type="1000000000" count="one" draft="contributed">0 md</pattern>
-					<pattern type="1000000000" count="other" draft="contributed">0 md</pattern>
-					<pattern type="10000000000" count="one" draft="contributed">00 md</pattern>
-					<pattern type="10000000000" count="other" draft="contributed">00 md</pattern>
-					<pattern type="100000000000" count="one" draft="contributed">000 md</pattern>
-					<pattern type="100000000000" count="other" draft="contributed">000 md</pattern>
-					<pattern type="1000000000000" count="one" draft="contributed">0 bn</pattern>
-					<pattern type="1000000000000" count="other" draft="contributed">0 bn</pattern>
-					<pattern type="10000000000000" count="one" draft="contributed">00 bn</pattern>
-					<pattern type="10000000000000" count="other" draft="contributed">00 bn</pattern>
-					<pattern type="100000000000000" count="one" draft="contributed">000 bn</pattern>
-					<pattern type="100000000000000" count="other" draft="contributed">000 bn</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats numberSystem="latn">
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern draft="contributed">#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats numberSystem="latn">
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0 %</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats numberSystem="latn">
-			<currencyFormatLength>
-				<currencyFormat type="standard">
-					<pattern>¤#,##0.00;¤-#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
-			<unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="DKK">
-				<displayName draft="contributed">donsk króna</displayName>
-				<displayName count="one" draft="contributed">donsk króna</displayName>
-				<displayName count="other" draft="contributed">donska krónur</displayName>
-				<symbol>kr</symbol>
-			</currency>
-			<currency type="EUR">
-				<displayName draft="contributed">euro</displayName>
-				<displayName count="one" draft="contributed">euro</displayName>
-				<displayName count="other" draft="contributed">euro</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName draft="contributed">íslendsk króna</displayName>
-				<displayName count="one" draft="contributed">íslendsk króna</displayName>
-				<displayName count="other" draft="contributed">íslendska krónur</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName draft="contributed">norsk króna</displayName>
-				<displayName count="one" draft="contributed">norsk króna</displayName>
-				<displayName count="other" draft="contributed">norska krónur</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName draft="contributed">svensk króna</displayName>
-				<displayName count="one" draft="contributed">svensk króna</displayName>
-				<displayName count="other" draft="contributed">svenska krónur</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName draft="contributed">unse sølv</displayName>
-				<displayName count="one" draft="contributed">unse sølv</displayName>
-				<displayName count="other" draft="contributed">unse sølv</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName draft="contributed">unse guld</displayName>
-				<displayName count="one" draft="contributed">unse guld</displayName>
-				<displayName count="other" draft="contributed">unse guld</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName draft="contributed">unse palladium</displayName>
-				<displayName count="one" draft="contributed">unse palladium</displayName>
-				<displayName count="other" draft="contributed">unse palladium</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName draft="contributed">unse platin</displayName>
-				<displayName count="one" draft="contributed">unse platin</displayName>
-				<displayName count="other" draft="contributed">unse platin</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unitLength type="long">
-			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0} á {1}</compoundUnitPattern>
-			</compoundUnit>
-			<unit type="acceleration-g-force">
-				<displayName draft="contributed">tyngdakraft Jørðin</displayName>
-				<unitPattern count="one" draft="contributed">{0} tyngdakraft Jørðin</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} tyngdakraft Jørðin</unitPattern>
-			</unit>
-			<unit type="angle-arc-minute">
-				<displayName draft="contributed">bueminuttir</displayName>
-				<unitPattern count="one" draft="contributed">{0} bueminutt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} bueminuttir</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName draft="contributed">buesekundir</displayName>
-				<unitPattern count="one" draft="contributed">{0} buesekund</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} buesekundir</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName draft="contributed">gradir</displayName>
-				<unitPattern count="one" draft="contributed">{0} grad</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} gradir</unitPattern>
-			</unit>
-			<unit type="area-hectare">
-				<displayName draft="contributed">hektar</displayName>
-				<unitPattern count="one" draft="contributed">{0} hektar</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} hektar</unitPattern>
-			</unit>
-			<unit type="duration-day">
-				<displayName draft="contributed">samdøgur</displayName>
-				<unitPattern count="one">{0} samdøgur</unitPattern>
-				<unitPattern count="other">{0} samdøgur</unitPattern>
-			</unit>
-			<unit type="duration-hour">
-				<displayName draft="contributed">tímar</displayName>
-				<unitPattern count="one">{0} tími</unitPattern>
-				<unitPattern count="other">{0} tímar</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="contributed">millissekundir</displayName>
-				<unitPattern count="one" draft="contributed">{0} millisekund</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} millissekundir</unitPattern>
-			</unit>
-			<unit type="duration-minute">
-				<displayName draft="contributed">minuttir</displayName>
-				<unitPattern count="one">{0} minuttur</unitPattern>
-				<unitPattern count="other">{0} minuttir</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">mánaðir</displayName>
-				<unitPattern count="one">{0} mánadur</unitPattern>
-				<unitPattern count="other">{0} mánaðir</unitPattern>
-			</unit>
-			<unit type="duration-second">
-				<displayName draft="contributed">sekundir</displayName>
-				<unitPattern count="one">{0} sekund</unitPattern>
-				<unitPattern count="other">{0} sekundir</unitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">vikur</displayName>
-				<unitPattern count="one">{0} vika</unitPattern>
-				<unitPattern count="other">{0} vikur</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">ára</displayName>
-				<unitPattern count="one" draft="contributed">{0} ár</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ára</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">sentimeter</displayName>
-				<unitPattern count="one" draft="contributed">{0} sentimeter</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} sentimeter</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName draft="contributed">kilometer</displayName>
-				<unitPattern count="one" draft="contributed">{0} kilometer</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kilometer</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName draft="contributed">meter</displayName>
-				<unitPattern count="one" draft="contributed">{0} meter</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} meter</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName draft="contributed">millimeter</displayName>
-				<unitPattern count="one" draft="contributed">{0} millimeter</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} millimeter</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName draft="contributed">pikometer</displayName>
-				<unitPattern count="one" draft="contributed">{0} pikometer</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pikometer</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName draft="contributed">gram</displayName>
-				<unitPattern count="one" draft="contributed">{0} gram</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} gram</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName draft="contributed">kilogram</displayName>
-				<unitPattern count="one" draft="contributed">{0} kilogram</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kilogram</unitPattern>
-			</unit>
-			<unit type="pressure-hectopascal">
-				<displayName draft="contributed">hektopascal</displayName>
-				<unitPattern count="one" draft="contributed">{0} hektopascal</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} hektopascal</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName draft="contributed">millibar</displayName>
-				<unitPattern count="one" draft="contributed">{0} millibar</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} millibar</unitPattern>
-			</unit>
-			<unit type="temperature-celsius">
-				<displayName draft="contributed">gradir Celsius</displayName>
-				<unitPattern count="one" draft="contributed">{0} grad Celsius</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} gradir Celsius</unitPattern>
-			</unit>
-			<unit type="temperature-fahrenheit">
-				<displayName draft="contributed">gradir Fahrenheit</displayName>
-				<unitPattern count="one" draft="contributed">{0} grad Fahrenheit</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} gradir Fahrenheit</unitPattern>
-			</unit>
-		</unitLength>
-		<unitLength type="short">
-			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
-			</compoundUnit>
-			<unit type="acceleration-g-force">
-				<displayName draft="contributed">tyngdakraft Jørðin</displayName>
-				<unitPattern count="one" draft="contributed">{0} G</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} G</unitPattern>
-			</unit>
-			<unit type="angle-arc-minute">
-				<displayName draft="contributed">bueminuttir</displayName>
-				<unitPattern count="one" draft="contributed">{0}′</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}′</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName draft="contributed">buesekundir</displayName>
-				<unitPattern count="one" draft="contributed">{0}″</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName draft="contributed">gradir</displayName>
-				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
-			</unit>
-			<unit type="area-hectare">
-				<displayName draft="contributed">hektar</displayName>
-				<unitPattern count="one" draft="contributed">{0} ha</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ha</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<unitPattern count="one" draft="contributed">{0} m²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} m²</unitPattern>
-			</unit>
-			<unit type="duration-day">
-				<displayName draft="contributed">samdøgur</displayName>
-				<unitPattern count="one" draft="contributed">{0} d</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} d</unitPattern>
-			</unit>
-			<unit type="duration-hour">
-				<displayName draft="contributed">tímar</displayName>
-				<unitPattern count="one" draft="contributed">{0} h</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} h</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="contributed">millissekundir</displayName>
-				<unitPattern count="one" draft="contributed">{0} ms</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ms</unitPattern>
-			</unit>
-			<unit type="duration-minute">
-				<displayName draft="contributed">minuttir</displayName>
-				<unitPattern count="one" draft="contributed">{0} min</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">mánaðir</displayName>
-				<unitPattern count="one" draft="contributed">{0} mán</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mán</unitPattern>
-			</unit>
-			<unit type="duration-second">
-				<displayName draft="contributed">sekundir</displayName>
-				<unitPattern count="one" draft="contributed">{0} s</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} s</unitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">vikur</displayName>
-				<unitPattern count="one" draft="contributed">{0} v</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} v</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">ára</displayName>
-				<unitPattern count="one" draft="contributed">{0} á</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} á</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">sentimeter</displayName>
-				<unitPattern count="one" draft="contributed">{0} cm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName draft="contributed">kilometer</displayName>
-				<unitPattern count="one" draft="contributed">{0} km</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} km</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName draft="contributed">meter</displayName>
-				<unitPattern count="one" draft="contributed">{0} m</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} m</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName draft="contributed">millimeter</displayName>
-				<unitPattern count="one" draft="contributed">{0} mm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mm</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName draft="contributed">pikometer</displayName>
-				<unitPattern count="one" draft="contributed">{0} pm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pm</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName draft="contributed">gram</displayName>
-				<unitPattern count="one" draft="contributed">{0} g</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName draft="contributed">kilogram</displayName>
-				<unitPattern count="one" draft="contributed">{0} kg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kg</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<unitPattern count="one" draft="contributed">{0} kW</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kW</unitPattern>
-			</unit>
-			<unit type="power-watt">
-				<unitPattern count="one" draft="contributed">{0} W</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} W</unitPattern>
-			</unit>
-			<unit type="pressure-hectopascal">
-				<displayName draft="contributed">hektopascal</displayName>
-				<unitPattern count="one" draft="contributed">{0} hPa</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} hPa</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName draft="contributed">millibar</displayName>
-				<unitPattern count="one" draft="contributed">{0} mbar</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mbar</unitPattern>
-			</unit>
-			<unit type="speed-kilometer-per-hour">
-				<unitPattern count="one" draft="contributed">{0} km/h</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} km/h</unitPattern>
-			</unit>
-			<unit type="speed-meter-per-second">
-				<unitPattern count="one" draft="contributed">{0} m/s</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} m/s</unitPattern>
-			</unit>
-			<unit type="temperature-celsius">
-				<displayName draft="contributed">gradir Celsius</displayName>
-				<unitPattern count="one" draft="contributed">{0}°C</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°C</unitPattern>
-			</unit>
-			<unit type="temperature-fahrenheit">
-				<displayName draft="contributed">gradir Fahrenheit</displayName>
-				<unitPattern count="one" draft="contributed">{0}°F</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°F</unitPattern>
-			</unit>
-			<unit type="volume-cubic-kilometer">
-				<unitPattern count="one" draft="contributed">{0} km³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} km³</unitPattern>
-			</unit>
-			<unit type="volume-liter">
-				<unitPattern count="one" draft="contributed">{0} l</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} l</unitPattern>
-			</unit>
-		</unitLength>
-		<unitLength type="narrow">
-			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
-			</compoundUnit>
-			<unit type="acceleration-g-force">
-				<unitPattern count="one" draft="contributed">{0}G</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}G</unitPattern>
-			</unit>
-			<unit type="angle-arc-minute">
-				<unitPattern count="one" draft="contributed">{0}′</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}′</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<unitPattern count="one" draft="contributed">{0}″</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
-			</unit>
-			<unit type="area-hectare">
-				<unitPattern count="one" draft="contributed">{0}ha</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}ha</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one" draft="contributed">{0}km²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<unitPattern count="one" draft="contributed">{0}m²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}m²</unitPattern>
-			</unit>
-			<unit type="duration-day">
-				<unitPattern count="one" draft="contributed">{0}d</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}d</unitPattern>
-			</unit>
-			<unit type="duration-hour">
-				<unitPattern count="one" draft="contributed">{0}h</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}h</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<unitPattern count="one" draft="contributed">{0}ms</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}ms</unitPattern>
-			</unit>
-			<unit type="duration-minute">
-				<unitPattern count="one" draft="contributed">{0}m</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}m</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<unitPattern count="one" draft="contributed">{0}m</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}m</unitPattern>
-			</unit>
-			<unit type="duration-second">
-				<unitPattern count="one" draft="contributed">{0}s</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}s</unitPattern>
-			</unit>
-			<unit type="duration-week">
-				<unitPattern count="one" draft="contributed">{0}v</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}v</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<unitPattern count="one" draft="contributed">{0}á</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}á</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<unitPattern count="one" draft="contributed">{0}cm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}cm</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<unitPattern count="one" draft="contributed">{0}km</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}km</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<unitPattern count="one" draft="contributed">{0}m</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}m</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<unitPattern count="one" draft="contributed">{0}mm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}mm</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<unitPattern count="one" draft="contributed">{0}pm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}pm</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<unitPattern count="one" draft="contributed">{0}g</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<unitPattern count="one" draft="contributed">{0}kg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}kg</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<unitPattern count="one" draft="contributed">{0}kW</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}kW</unitPattern>
-			</unit>
-			<unit type="power-watt">
-				<unitPattern count="one" draft="contributed">{0}W</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}W</unitPattern>
-			</unit>
-			<unit type="pressure-hectopascal">
-				<unitPattern count="one" draft="contributed">{0}hPa</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}hPa</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<unitPattern count="one" draft="contributed">{0}mbar</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}mbar</unitPattern>
-			</unit>
-			<unit type="speed-kilometer-per-hour">
-				<unitPattern count="one" draft="contributed">{0}km/h</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}km/h</unitPattern>
-			</unit>
-			<unit type="speed-meter-per-second">
-				<unitPattern count="one" draft="contributed">{0}m/s</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}m/s</unitPattern>
-			</unit>
-			<unit type="temperature-celsius">
-				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
-			</unit>
-			<unit type="temperature-fahrenheit">
-				<unitPattern count="one" draft="contributed">{0}°F</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°F</unitPattern>
-			</unit>
-			<unit type="volume-cubic-kilometer">
-				<unitPattern count="one" draft="contributed">{0}km³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}km³</unitPattern>
-			</unit>
-			<unit type="volume-liter">
-				<unitPattern count="one" draft="contributed">{0}L</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}L</unitPattern>
-			</unit>
-		</unitLength>
-		<durationUnit type="hm">
-			<durationUnitPattern>h:mm</durationUnitPattern>
-		</durationUnit>
-		<durationUnit type="hms">
-			<durationUnitPattern>h:mm:ss</durationUnitPattern>
-		</durationUnit>
-		<durationUnit type="ms">
-			<durationUnitPattern>m:ss</durationUnitPattern>
-		</durationUnit>
-	</units>
-	<listPatterns>
-		<listPattern>
-			<listPatternPart type="start" draft="contributed">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle" draft="contributed">{0}, {1}</listPatternPart>
-			<listPatternPart type="end" draft="contributed">{0} og {1}</listPatternPart>
-			<listPatternPart type="2" draft="contributed">{0} og {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="unit">
-			<listPatternPart type="start" draft="contributed">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle" draft="contributed">{0}, {1}</listPatternPart>
-			<listPatternPart type="end" draft="contributed">{0}, {1}</listPatternPart>
-			<listPatternPart type="2" draft="contributed">{0}, {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="unit-narrow">
-			<listPatternPart type="start" draft="contributed">{0} {1}</listPatternPart>
-			<listPatternPart type="middle" draft="contributed">{0} {1}</listPatternPart>
-			<listPatternPart type="end" draft="contributed">{0} {1}</listPatternPart>
-			<listPatternPart type="2" draft="contributed">{0} {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="unit-short">
-			<listPatternPart type="start" draft="contributed">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle" draft="contributed">{0}, {1}</listPatternPart>
-			<listPatternPart type="end" draft="contributed">{0}, {1}</listPatternPart>
-			<listPatternPart type="2" draft="contributed">{0}, {1}</listPatternPart>
-		</listPattern>
-	</listPatterns>
-	<posix>
-		<messages>
-			<yesstr draft="contributed">já:j</yesstr>
-			<nostr draft="contributed">nei:n</nostr>
-		</messages>
-	</posix>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_DJ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_DJ.xml
deleted file mode 100644
index 5afe4e1f320..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_DJ.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="fr"/>
-		<territory type="DJ"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="DJF">
-				<symbol>Fdj</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_DZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_DZ.xml
deleted file mode 100644
index c9eb98a4ea0..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_DZ.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="fr"/>
-		<territory type="DZ"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="DZD">
-				<symbol>DA</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_GF.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_GF.xml
deleted file mode 100644
index c2d58407e55..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_GF.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="fr"/>
-		<territory type="GF"/>
-	</identity>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_HT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_HT.xml
deleted file mode 100644
index 762c7397e6e..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_HT.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="fr"/>
-		<territory type="HT"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="HTG">
-				<symbol>G</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_MA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_MA.xml
deleted file mode 100644
index 29283357a21..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_MA.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="fr"/>
-		<territory type="MA"/>
-	</identity>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_MR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_MR.xml
deleted file mode 100644
index 27a4bfdbdb6..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_MR.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="fr"/>
-		<territory type="MR"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="MRO">
-				<symbol>UM</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_SY.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_SY.xml
deleted file mode 100644
index f0573372a9f..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_SY.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="fr"/>
-		<territory type="SY"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="SYP">
-				<symbol>LS</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_TD.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_TD.xml
deleted file mode 100644
index be31f375d3e..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_TD.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="fr"/>
-		<territory type="TD"/>
-	</identity>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_TN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_TN.xml
deleted file mode 100644
index dd30ff8141d..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_TN.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="fr"/>
-		<territory type="TN"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="TND">
-				<symbol>DT</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_VU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_VU.xml
deleted file mode 100644
index 9e5176af806..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_VU.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="fr"/>
-		<territory type="VU"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="VUV">
-				<symbol>VT</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ha_Latn_NE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ha_Latn_NE.xml
deleted file mode 100644
index 1c896cdb9ad..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ha_Latn_NE.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="ha"/>
-		<script type="Latn"/>
-		<territory type="NE"/>
-	</identity>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kk_Cyrl.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kk_Cyrl.xml
deleted file mode 100644
index 61a2b282b09..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kk_Cyrl.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="kk"/>
-		<script type="Cyrl"/>
-	</identity>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ks_Arab.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ks_Arab.xml
deleted file mode 100644
index b6d90f8f6f6..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ks_Arab.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="ks"/>
-		<script type="Arab"/>
-	</identity>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ky_Cyrl.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ky_Cyrl.xml
deleted file mode 100644
index 58eb1e0ffa4..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ky_Cyrl.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="ky"/>
-		<script type="Cyrl"/>
-	</identity>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mn_Cyrl.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mn_Cyrl.xml
deleted file mode 100644
index e3b5acce6c0..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mn_Cyrl.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="mn"/>
-		<script type="Cyrl"/>
-	</identity>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ms_Latn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ms_Latn.xml
deleted file mode 100644
index 56d8e60bbc3..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ms_Latn.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="ms"/>
-		<script type="Latn"/>
-	</identity>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/om_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/om_KE.xml
deleted file mode 100644
index 679d22e7595..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/om_KE.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="om"/>
-		<territory type="KE"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="KES">
-				<symbol>Ksh</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ro_MD.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ro_MD.xml
deleted file mode 100644
index 90b868cd907..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ro_MD.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="ro"/>
-		<territory type="MD"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="MDL">
-				<symbol>L</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/so_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/so_KE.xml
deleted file mode 100644
index 75aa95f73d1..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/so_KE.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="so"/>
-		<territory type="KE"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="KES">
-				<symbol>Ksh</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sq_MK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sq_MK.xml
deleted file mode 100644
index 800fe94cbe0..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sq_MK.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="sq"/>
-		<territory type="MK"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="MKD">
-				<symbol>den</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sq_XK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sq_XK.xml
deleted file mode 100644
index 4dc5c6d524a..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sq_XK.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="sq"/>
-		<territory type="XK"/>
-	</identity>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ta_LK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ta_LK.xml
deleted file mode 100644
index d402c4c6e63..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ta_LK.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10819 $"/>
-		<generation date="$Date: 2014-08-14 22:53:08 -0500 (Thu, 14 Aug 2014) $"/>
-		<language type="ta"/>
-		<territory type="LK"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="LKR">
-				<symbol>Rs.</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/tzm_Latn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/tzm_Latn.xml
deleted file mode 100644
index 74d7a96e9e2..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/tzm_Latn.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="tzm"/>
-		<script type="Latn"/>
-	</identity>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ug_Arab.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ug_Arab.xml
deleted file mode 100644
index d2ff8e13eb7..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ug_Arab.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="ug"/>
-		<script type="Arab"/>
-	</identity>
-</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hant_HK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hant_HK.xml
deleted file mode 100644
index 20ef7778d64..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hant_HK.xml
+++ /dev/null
@@ -1,1719 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml>
-	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
-		<language type="zh"/>
-		<script type="Hant"/>
-		<territory type="HK"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="arn" draft="provisional">阿勞坎文</language>
-			<language type="az" alt="short" draft="contributed">阿澤里</language>
-			<language type="ba" draft="provisional">巴什基爾文</language>
-			<language type="br" draft="unconfirmed">布里多尼文</language>
-			<language type="de_AT" draft="provisional">奧地利德文</language>
-			<language type="de_CH" draft="contributed">瑞士德語</language>
-			<language type="en_AU" draft="provisional">澳洲英文</language>
-			<language type="en_CA" draft="provisional">加拿大英文</language>
-			<language type="en_GB" draft="provisional">英國英文</language>
-			<language type="en_GB" alt="short" draft="provisional">英式英文</language>
-			<language type="en_US" draft="provisional">美國英文</language>
-			<language type="en_US" alt="short" draft="provisional">美式英文</language>
-			<language type="eo" draft="unconfirmed">世界語</language>
-			<language type="es_419" draft="provisional">拉丁美洲西班牙文</language>
-			<language type="es_ES" draft="provisional">歐洲西班牙文</language>
-			<language type="es_MX" draft="provisional">墨西哥西班牙文</language>
-			<language type="gl" draft="unconfirmed">加里西亞文</language>
-			<language type="hr" draft="provisional">克羅地亞文</language>
-			<language type="it">意大利文</language>
-			<language type="kn" draft="provisional">坎納達文</language>
-			<language type="lol" draft="unconfirmed">蒙古語</language>
-			<language type="mg" draft="provisional">馬拉加斯文</language>
-			<language type="nqo" draft="provisional">西非書面語言 (N’ko)</language>
-			<language type="or" draft="provisional">奧里雅文</language>
-			<language type="ps" alt="variant">普什圖語</language>
-			<language type="pt_BR" draft="contributed">巴西葡萄牙語</language>
-			<language type="pt_PT" draft="provisional">歐洲葡萄牙文</language>
-			<language type="ro_MD" draft="provisional">摩爾多瓦羅馬尼亞文</language>
-			<language type="sd" draft="unconfirmed">信德語</language>
-			<language type="sl" draft="provisional">斯洛文尼亞文</language>
-			<language type="sn" draft="provisional">修納文</language>
-			<language type="swc" draft="provisional">剛果史瓦希里文</language>
-			<language type="ug" alt="variant">維吾爾語</language>
-			<language type="ur" draft="provisional">烏爾都文</language>
-			<language type="zgh" draft="unconfirmed">摩洛哥標準塔馬齊格特文</language>
-		</languages>
-		<scripts>
-			<script type="Cyrl" draft="contributed">西里爾文</script>
-			<script type="Deva" draft="contributed">梵文</script>
-			<script type="Ethi" draft="provisional">埃塞俄比亞文</script>
-			<script type="Guru" draft="provisional">古木基文</script>
-			<script type="Hang" draft="unconfirmed">韓文字母</script>
-			<script type="Hans" draft="unconfirmed">簡體字</script>
-			<script type="Hant" draft="unconfirmed">繁體字</script>
-			<script type="Knda" draft="provisional">坎納達文</script>
-			<script type="Latn" draft="unconfirmed">拉丁字母</script>
-			<script type="Orya" draft="provisional">奧里雅文</script>
-			<script type="Sinh" draft="provisional">僧伽羅文</script>
-			<script type="Telu" draft="provisional">泰盧古文</script>
-			<script type="Tibt" draft="provisional">藏文</script>
-		</scripts>
-		<territories>
-			<territory type="013">中美洲</territory>
-			<territory type="029" draft="unconfirmed">加勒比</territory>
-			<territory type="061" draft="provisional">波利尼西亞</territory>
-			<territory type="AE">阿拉伯聯合酋長國</territory>
-			<territory type="AG" draft="unconfirmed">安提瓜及巴布達</territory>
-			<territory type="AW">阿魯巴</territory>
-			<territory type="AZ">阿塞拜疆</territory>
-			<territory type="BA">波斯尼亞和黑塞哥維那</territory>
-			<territory type="BB" draft="unconfirmed">巴巴多斯</territory>
-			<territory type="BI" draft="provisional">布隆迪</territory>
-			<territory type="BJ" draft="unconfirmed">貝寧</territory>
-			<territory type="BL" draft="unconfirmed">聖巴泰勒米</territory>
-			<territory type="BW" draft="contributed">博茨瓦納</territory>
-			<territory type="BZ" draft="provisional">伯利茲</territory>
-			<territory type="CD" draft="contributed">剛果 - 金夏沙</territory>
-			<territory type="CG" draft="contributed">剛果 - 布拉薩</territory>
-			<territory type="CI" draft="unconfirmed">科特迪瓦</territory>
-			<territory type="CI" alt="variant">象牙海岸</territory>
-			<territory type="CR">哥斯達黎加</territory>
-			<territory type="CV" draft="unconfirmed">佛得角</territory>
-			<territory type="CY" draft="contributed">塞浦路斯</territory>
-			<territory type="ER" draft="contributed">厄立特里亞</territory>
-			<territory type="ET">埃塞俄比亞</territory>
-			<territory type="GA" draft="unconfirmed">加蓬</territory>
-			<territory type="GD">格林納達</territory>
-			<territory type="GE">格魯吉亞</territory>
-			<territory type="GH" draft="provisional">加納</territory>
-			<territory type="GM" draft="unconfirmed">岡比亞</territory>
-			<territory type="GS" draft="unconfirmed">南佐治亞島與南桑威奇群島</territory>
-			<territory type="GT">危地馬拉</territory>
-			<territory type="HM" draft="unconfirmed">赫德與麥當勞群島</territory>
-			<territory type="HN" draft="unconfirmed">洪都拉斯</territory>
-			<territory type="HR" draft="provisional">克羅地亞</territory>
-			<territory type="IM" draft="unconfirmed">英屬地曼島</territory>
-			<territory type="IT">意大利</territory>
-			<territory type="KE">肯雅</territory>
-			<territory type="KM" draft="contributed">科摩羅</territory>
-			<territory type="KN" draft="unconfirmed">聖基茨和尼維斯</territory>
-			<territory type="LC" draft="unconfirmed">聖盧西亞</territory>
-			<territory type="LI">列支敦士登</territory>
-			<territory type="LR" draft="unconfirmed">利比里亞</territory>
-			<territory type="LS" draft="contributed">萊索托</territory>
-			<territory type="ME">黑山</territory>
-			<territory type="ML" draft="unconfirmed">馬里</territory>
-			<territory type="MR" draft="unconfirmed">毛里塔尼亞</territory>
-			<territory type="MS" draft="unconfirmed">蒙塞拉特島</territory>
-			<territory type="MU">毛里裘斯</territory>
-			<territory type="MV">馬爾代夫</territory>
-			<territory type="MZ">莫桑比克</territory>
-			<territory type="NE" draft="contributed">尼日爾</territory>
-			<territory type="NG">尼日利亞</territory>
-			<territory type="NR" draft="provisional">瑙魯</territory>
-			<territory type="OM" draft="unconfirmed">阿曼</territory>
-			<territory type="PF" draft="provisional">法屬波利尼西亞</territory>
-			<territory type="PG" draft="contributed">巴布亞新幾內亞</territory>
-			<territory type="PN" draft="contributed">皮特凱恩島</territory>
-			<territory type="QA">卡塔爾</territory>
-			<territory type="RW" draft="contributed">盧旺達</territory>
-			<territory type="SA">沙特阿拉伯</territory>
-			<territory type="SB" draft="contributed">所羅門群島</territory>
-			<territory type="SC" draft="contributed">塞舌爾</territory>
-			<territory type="SI" draft="contributed">斯洛文尼亞</territory>
-			<territory type="SJ" draft="contributed">斯瓦爾巴特群島及揚馬延島</territory>
-			<territory type="SL">塞拉利昂</territory>
-			<territory type="SO" draft="unconfirmed">索馬里</territory>
-			<territory type="SR" draft="unconfirmed">蘇里南</territory>
-			<territory type="SZ">斯威士蘭</territory>
-			<territory type="TC">特克斯和凱科斯群島</territory>
-			<territory type="TD" draft="unconfirmed">乍得</territory>
-			<territory type="TF" draft="contributed">法屬南部地區</territory>
-			<territory type="TO" draft="contributed">湯加</territory>
-			<territory type="TT" draft="unconfirmed">千里達和多巴哥</territory>
-			<territory type="TV">圖瓦盧</territory>
-			<territory type="TZ">坦桑尼亞</territory>
-			<territory type="VA" draft="unconfirmed">梵蒂岡宮城</territory>
-			<territory type="VC" draft="unconfirmed">聖文森特和格林納丁斯</territory>
-			<territory type="VU">瓦努阿圖</territory>
-			<territory type="YE" draft="provisional">也門</territory>
-			<territory type="ZM" draft="contributed">贊比亞</territory>
-			<territory type="ZW" draft="provisional">津巴布韋</territory>
-		</territories>
-		<variants>
-			<variant type="1901" draft="contributed">傳統德國拼字法</variant>
-			<variant type="1996" draft="contributed">1996 德國拼字法</variant>
-			<variant type="BISKE" draft="unconfirmed">San Giorgio/Bila 方言</variant>
-			<variant type="REVISED" draft="contributed">已修訂拼字法</variant>
-			<variant type="SCOTLAND" draft="contributed">蘇格蘭標準英語</variant>
-		</variants>
-		<keys>
-			<key type="calendar" draft="unconfirmed">日曆</key>
-			<key type="x" draft="unconfirmed">專用區</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">繁體中文排序 (Big5)</type>
-			<type type="buddhist" key="calendar" draft="provisional">佛教曆法</type>
-			<type type="deva" key="numbers" draft="unconfirmed">梵文位數</type>
-			<type type="dictionary" key="collation" draft="contributed">詞典排序</type>
-			<type type="ethi" key="numbers">埃塞俄比亞數字</type>
-			<type type="ethiopic" key="calendar" draft="contributed">埃及曆</type>
-			<type type="ethiopic-amete-alem" key="calendar" draft="contributed">埃塞俄比亞阿美德阿萊姆曆</type>
-			<type type="gb2312han" key="collation">簡體中文排序 (GB2312)</type>
-			<type type="geor" key="numbers" draft="contributed">格魯吉亞數字</type>
-			<type type="knda" key="numbers">卡納達數字</type>
-			<type type="laoo" key="numbers">老撾數字</type>
-			<type type="mlym" key="numbers" draft="unconfirmed">馬來亞位數</type>
-			<type type="mong" key="numbers" draft="unconfirmed">蒙古文位數</type>
-			<type type="orya" key="numbers">奧里亞數字</type>
-			<type type="reformed" key="collation" draft="contributed">改革版排序</type>
-			<type type="taml" key="numbers">泰米爾數字</type>
-		</types>
-		<transformNames>
-			<transformName type="Numeric" draft="unconfirmed">數值</transformName>
-			<transformName type="x-Accents" draft="unconfirmed">重音</transformName>
-			<transformName type="x-Jamo" draft="unconfirmed">韓文</transformName>
-		</transformNames>
-	</localeDisplayNames>
-	<dates>
-		<calendars>
-			<calendar type="buddhist">
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Md" draft="contributed">M-d</dateFormatItem>
-						<dateFormatItem id="MEd" draft="contributed">M-d（E）</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="chinese">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">正月</month>
-							<month type="2">二月</month>
-							<month type="3">三月</month>
-							<month type="4">四月</month>
-							<month type="5">五月</month>
-							<month type="6">六月</month>
-							<month type="7">七月</month>
-							<month type="8">八月</month>
-							<month type="9">九月</month>
-							<month type="10">十月</month>
-							<month type="11">十一月</month>
-							<month type="12">十二月</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">正</month>
-							<month type="2">二</month>
-							<month type="3">三</month>
-							<month type="4">四</month>
-							<month type="5">五</month>
-							<month type="6">六</month>
-							<month type="7">七</month>
-							<month type="8">八</month>
-							<month type="9">九</month>
-							<month type="10">十</month>
-							<month type="11">十一</month>
-							<month type="12">十二</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">正月</month>
-							<month type="2">二月</month>
-							<month type="3">三月</month>
-							<month type="4">四月</month>
-							<month type="5">五月</month>
-							<month type="6">六月</month>
-							<month type="7">七月</month>
-							<month type="8">八月</month>
-							<month type="9">九月</month>
-							<month type="10">十月</month>
-							<month type="11">十一月</month>
-							<month type="12">十二月</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">正月</month>
-							<month type="2">二月</month>
-							<month type="3">三月</month>
-							<month type="4">四月</month>
-							<month type="5">五月</month>
-							<month type="6">六月</month>
-							<month type="7">七月</month>
-							<month type="8">八月</month>
-							<month type="9">九月</month>
-							<month type="10">十月</month>
-							<month type="11">十一月</month>
-							<month type="12">十二月</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">正</month>
-							<month type="2">二</month>
-							<month type="3">三</month>
-							<month type="4">四</month>
-							<month type="5">五</month>
-							<month type="6">六</month>
-							<month type="7">七</month>
-							<month type="8">八</month>
-							<month type="9">九</month>
-							<month type="10">十</month>
-							<month type="11">十一</month>
-							<month type="12">十二</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">正月</month>
-							<month type="2">二月</month>
-							<month type="3">三月</month>
-							<month type="4">四月</month>
-							<month type="5">五月</month>
-							<month type="6">六月</month>
-							<month type="7">七月</month>
-							<month type="8">八月</month>
-							<month type="9">九月</month>
-							<month type="10">十月</month>
-							<month type="11">十一月</month>
-							<month type="12">十二月</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern draft="provisional">U年MMMdEEEE</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern draft="provisional">U年MMMd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern draft="provisional">U年MMMd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-			</calendar>
-			<calendar type="generic">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>Gy年M月d日EEEE</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>Gy年M月d日</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>Gy年M月d日</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>Gy/M/d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Ed">d日E</dateFormatItem>
-						<dateFormatItem id="Gy">Gy年</dateFormatItem>
-						<dateFormatItem id="GyMMM">Gy年M月</dateFormatItem>
-						<dateFormatItem id="GyMMMd">Gy年M月d日</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">Gy年M月d日E</dateFormatItem>
-						<dateFormatItem id="Md" draft="contributed">d/M</dateFormatItem>
-						<dateFormatItem id="MEd" draft="contributed">E, d/M</dateFormatItem>
-						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
-						<dateFormatItem id="y">Gy年</dateFormatItem>
-						<dateFormatItem id="yyyy">Gy年</dateFormatItem>
-						<dateFormatItem id="yyyyM">Gy/M</dateFormatItem>
-						<dateFormatItem id="yyyyMd">Gy/M/d</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">Gy/M/dE</dateFormatItem>
-						<dateFormatItem id="yyyyMMM">Gy年M月</dateFormatItem>
-						<dateFormatItem id="yyyyMMMd">Gy年M月d日</dateFormatItem>
-						<dateFormatItem id="yyyyMMMEd">Gy年M月d日E</dateFormatItem>
-						<dateFormatItem id="yyyyQQQ">Gy年QQQ</dateFormatItem>
-						<dateFormatItem id="yyyyQQQQ">Gy年QQQQ</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="contributed">d/M 至 d/M</greatestDifference>
-							<greatestDifference id="M" draft="contributed">d/M 至 d/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="contributed">d/M（E） 至 d/M（E）</greatestDifference>
-							<greatestDifference id="M" draft="contributed">d/M（E） 至 d/M（E）</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">Gy年至y年</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">Gy/M至y/M</greatestDifference>
-							<greatestDifference id="y">Gy/M至y/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">Gy/M/d至y/M/d</greatestDifference>
-							<greatestDifference id="M">Gy/M/d至y/M/d</greatestDifference>
-							<greatestDifference id="y">Gy/M/d至y/M/d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">Gy/M/dE至y/M/dE</greatestDifference>
-							<greatestDifference id="M">Gy/M/dE至y/M/dE</greatestDifference>
-							<greatestDifference id="y">Gy/M/dE至y/M/dE</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">Gy年M月至M月</greatestDifference>
-							<greatestDifference id="y">Gy年M月至y年M月</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">Gy年M月d日至d日</greatestDifference>
-							<greatestDifference id="M">Gy年M月d日至M月d日</greatestDifference>
-							<greatestDifference id="y">Gy年M月d日至y年M月d日</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">Gy年M月d日E至d日E</greatestDifference>
-							<greatestDifference id="M">Gy年M月d日E至M月d日E</greatestDifference>
-							<greatestDifference id="y">Gy年M月d日E至y年M月d日E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">Gy年M月至M月</greatestDifference>
-							<greatestDifference id="y">Gy年M月至y年M月</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<eras>
-					<eraNames>
-						<era type="0" draft="provisional">公元前</era>
-						<era type="1" draft="provisional">公元</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0" draft="provisional">BC</era>
-						<era type="0" alt="variant" draft="provisional">BCE</era>
-						<era type="1" draft="provisional">AD</era>
-						<era type="1" alt="variant" draft="provisional">CE</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>y年M月d日EEEE</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/M/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Ed">d日E</dateFormatItem>
-						<dateFormatItem id="Ehm" draft="provisional">E ah:mm</dateFormatItem>
-						<dateFormatItem id="Ehms" draft="provisional">E ah:mm:ss</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">Gy年M月d日E</dateFormatItem>
-						<dateFormatItem id="Md" draft="contributed">d/M</dateFormatItem>
-						<dateFormatItem id="MEd" draft="contributed">E, d/M</dateFormatItem>
-						<dateFormatItem id="MMdd" draft="contributed">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
-						<dateFormatItem id="yM" draft="contributed">M/y</dateFormatItem>
-						<dateFormatItem id="yMd" draft="contributed">d/M/y</dateFormatItem>
-						<dateFormatItem id="yMEd">y/M/dE</dateFormatItem>
-						<dateFormatItem id="yMM" draft="contributed">MM/y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">y年M月d日E</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="contributed">d/M 至 d/M</greatestDifference>
-							<greatestDifference id="M" draft="contributed">d/M 至 d/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="contributed">d/M（E） 至 d/M（E）</greatestDifference>
-							<greatestDifference id="M" draft="contributed">d/M（E） 至 d/M（E）</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="contributed">M/y 至 M/y</greatestDifference>
-							<greatestDifference id="y" draft="contributed">M/y 至 M/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="contributed">d/M/y 至 d/M/y</greatestDifference>
-							<greatestDifference id="M" draft="contributed">d/M/y 至 d/M/y</greatestDifference>
-							<greatestDifference id="y" draft="contributed">d/M/y 至 d/M/y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="contributed">d/M/y（E） 至 d/M/y（E）</greatestDifference>
-							<greatestDifference id="M" draft="contributed">d/M/y（E） 至 d/M/y（E）</greatestDifference>
-							<greatestDifference id="y" draft="contributed">d/M/y（E） 至 d/M/y（E）</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="roc">
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Ed">d日E</dateFormatItem>
-						<dateFormatItem id="Md" draft="contributed">d-M</dateFormatItem>
-						<dateFormatItem id="MEd" draft="contributed">d-M（E）</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">Gy/M/dE</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<fields>
-			<field type="week">
-				<displayName>星期</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="provisional">{0} 星期後</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="provisional">{0} 星期前</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="week-short">
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="provisional">{0} 星期後</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="provisional">{0} 星期前</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="weekday">
-				<displayName>星期幾</displayName>
-			</field>
-			<field type="sun">
-				<relative type="-1" draft="provisional">上星期日</relative>
-				<relative type="0" draft="provisional">本星期日</relative>
-				<relative type="1" draft="provisional">下星期日</relative>
-			</field>
-			<field type="sun-short">
-				<relative type="-1" draft="provisional">上星期日</relative>
-				<relative type="0" draft="provisional">本星期日</relative>
-				<relative type="1" draft="provisional">下星期日</relative>
-			</field>
-			<field type="mon">
-				<relative type="-1" draft="provisional">上星期一</relative>
-				<relative type="0" draft="provisional">本星期一</relative>
-				<relative type="1" draft="provisional">下星期一</relative>
-			</field>
-			<field type="mon-short">
-				<relative type="-1" draft="provisional">上星期一</relative>
-				<relative type="0" draft="provisional">本星期一</relative>
-				<relative type="1" draft="provisional">下星期一</relative>
-			</field>
-			<field type="tue">
-				<relative type="-1" draft="provisional">上星期二</relative>
-				<relative type="0" draft="provisional">本星期二</relative>
-				<relative type="1" draft="provisional">下星期二</relative>
-			</field>
-			<field type="tue-short">
-				<relative type="-1" draft="provisional">上星期二</relative>
-				<relative type="0" draft="provisional">本星期二</relative>
-				<relative type="1" draft="provisional">下星期二</relative>
-			</field>
-			<field type="wed">
-				<relative type="-1" draft="provisional">上星期三</relative>
-				<relative type="0" draft="provisional">本星期三</relative>
-				<relative type="1" draft="provisional">下星期三</relative>
-			</field>
-			<field type="wed-short">
-				<relative type="-1" draft="provisional">上星期三</relative>
-				<relative type="0" draft="provisional">本星期三</relative>
-				<relative type="1" draft="provisional">下星期三</relative>
-			</field>
-			<field type="thu">
-				<relative type="-1" draft="provisional">上星期四</relative>
-				<relative type="0" draft="provisional">本星期四</relative>
-				<relative type="1" draft="provisional">下星期四</relative>
-			</field>
-			<field type="thu-short">
-				<relative type="-1" draft="provisional">上星期四</relative>
-				<relative type="0" draft="provisional">本星期四</relative>
-				<relative type="1" draft="provisional">下星期四</relative>
-			</field>
-			<field type="fri">
-				<relative type="-1" draft="provisional">上星期五</relative>
-				<relative type="0" draft="provisional">本星期五</relative>
-				<relative type="1" draft="provisional">下星期五</relative>
-			</field>
-			<field type="fri-short">
-				<relative type="-1" draft="provisional">上星期五</relative>
-				<relative type="0" draft="provisional">本星期五</relative>
-				<relative type="1" draft="provisional">下星期五</relative>
-			</field>
-			<field type="sat">
-				<relative type="-1" draft="provisional">上星期六</relative>
-				<relative type="0" draft="provisional">本星期六</relative>
-				<relative type="1" draft="provisional">下星期六</relative>
-			</field>
-			<field type="sat-short">
-				<relative type="-1" draft="provisional">上星期六</relative>
-				<relative type="0" draft="provisional">本星期六</relative>
-				<relative type="1" draft="provisional">下星期六</relative>
-			</field>
-			<field type="hour-narrow">
-				<displayName draft="contributed">時</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="provisional">{0}小時後</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="provisional">{0}小時前</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="minute-narrow">
-				<displayName draft="contributed">分</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="provisional">{0}分後</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="provisional">{0}分前</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="second-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="provisional">{0}秒後</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="provisional">{0}秒前</relativeTimePattern>
-				</relativeTime>
-			</field>
-		</fields>
-		<timeZoneNames>
-			<regionFormat type="daylight">{0}夏令時間</regionFormat>
-			<regionFormat type="standard">{0}標準時間</regionFormat>
-			<zone type="Asia/Yerevan">
-				<exemplarCity draft="contributed">耶烈萬</exemplarCity>
-			</zone>
-			<zone type="Africa/Luanda">
-				<exemplarCity draft="contributed">盧安達</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Palmer">
-				<exemplarCity draft="provisional">帕爾默</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Troll">
-				<exemplarCity draft="provisional">特羅爾站</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity draft="provisional">昭和</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity draft="provisional">杜蒙杜爾維爾</exemplarCity>
-			</zone>
-			<zone type="Australia/Perth">
-				<exemplarCity draft="contributed">珀斯</exemplarCity>
-			</zone>
-			<zone type="Australia/Hobart">
-				<exemplarCity draft="provisional">荷伯特</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity draft="contributed">悉尼</exemplarCity>
-			</zone>
-			<zone type="Australia/Brisbane">
-				<exemplarCity draft="contributed">布里斯本</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Macquarie">
-				<exemplarCity draft="provisional">麥夸里</exemplarCity>
-			</zone>
-			<zone type="America/Aruba">
-				<exemplarCity>阿魯巴</exemplarCity>
-			</zone>
-			<zone type="Europe/Sarajevo">
-				<exemplarCity>薩拉熱窩</exemplarCity>
-			</zone>
-			<zone type="America/Barbados">
-				<exemplarCity draft="provisional">巴巴多斯</exemplarCity>
-			</zone>
-			<zone type="America/St_Barthelemy">
-				<exemplarCity draft="unconfirmed">聖巴夫林米</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity draft="provisional">大坎普</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity draft="provisional">馬塞約</exemplarCity>
-			</zone>
-			<zone type="America/Recife">
-				<exemplarCity draft="provisional">累西腓</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity draft="provisional">伯利茲</exemplarCity>
-			</zone>
-			<zone type="America/Inuvik">
-				<exemplarCity draft="provisional">伊努維克</exemplarCity>
-			</zone>
-			<zone type="America/Dawson_Creek">
-				<exemplarCity draft="provisional">道森灣</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity draft="provisional">愛民頓</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity draft="provisional">哈利法克斯</exemplarCity>
-			</zone>
-			<zone type="America/Glace_Bay">
-				<exemplarCity draft="provisional">格萊斯灣</exemplarCity>
-			</zone>
-			<zone type="Indian/Cocos">
-				<exemplarCity draft="provisional">可可斯群島</exemplarCity>
-			</zone>
-			<zone type="Africa/Abidjan">
-				<exemplarCity draft="contributed">阿比贊</exemplarCity>
-			</zone>
-			<zone type="America/Santiago">
-				<exemplarCity draft="provisional">聖地亞哥</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>哥斯達黎加</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity draft="provisional">佛得角</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity draft="contributed">尼科西亞</exemplarCity>
-			</zone>
-			<zone type="America/Santo_Domingo">
-				<exemplarCity draft="provisional">聖多明各</exemplarCity>
-			</zone>
-			<zone type="Africa/Asmera">
-				<exemplarCity>阿斯馬拉</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Stanley">
-				<exemplarCity draft="unconfirmed">史坦雷</exemplarCity>
-			</zone>
-			<zone type="Africa/Libreville">
-				<exemplarCity draft="contributed">利布維</exemplarCity>
-			</zone>
-			<zone type="America/Grenada">
-				<exemplarCity draft="provisional">格林納達</exemplarCity>
-			</zone>
-			<zone type="America/Cayenne">
-				<exemplarCity draft="unconfirmed">法屬蓋亞那</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity draft="provisional">圖勒</exemplarCity>
-			</zone>
-			<zone type="America/Guatemala">
-				<exemplarCity draft="provisional">危地馬拉</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>圭亞那</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity draft="contributed">香港</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity draft="provisional">錫江</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Reykjavik">
-				<exemplarCity draft="provisional">雷克雅未克</exemplarCity>
-			</zone>
-			<zone type="Africa/Nairobi">
-				<exemplarCity draft="provisional">內羅畢</exemplarCity>
-			</zone>
-			<zone type="Asia/Bishkek">
-				<exemplarCity draft="contributed">比斯凱克</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>科摩羅</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity draft="provisional">聖盧西亞</exemplarCity>
-			</zone>
-			<zone type="Africa/Maseru">
-				<exemplarCity draft="contributed">馬塞魯</exemplarCity>
-			</zone>
-			<zone type="Europe/Chisinau">
-				<exemplarCity>基希訥烏</exemplarCity>
-			</zone>
-			<zone type="Europe/Podgorica">
-				<exemplarCity>波德戈里察</exemplarCity>
-			</zone>
-			<zone type="Pacific/Majuro">
-				<exemplarCity draft="provisional">馬久羅</exemplarCity>
-			</zone>
-			<zone type="Europe/Skopje">
-				<exemplarCity draft="contributed">斯科普里</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity draft="contributed">澳門</exemplarCity>
-			</zone>
-			<zone type="Africa/Nouakchott">
-				<exemplarCity draft="provisional">努瓦克肖特</exemplarCity>
-			</zone>
-			<zone type="America/Montserrat">
-				<exemplarCity draft="provisional">蒙塞拉特島</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity draft="provisional">馬爾代夫</exemplarCity>
-			</zone>
-			<zone type="America/Bahia_Banderas">
-				<exemplarCity draft="provisional">巴伊亞德班德拉斯</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity draft="provisional">墨西哥城</exemplarCity>
-			</zone>
-			<zone type="Africa/Windhoek">
-				<exemplarCity draft="contributed">溫特和克</exemplarCity>
-			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity draft="provisional">努美阿</exemplarCity>
-			</zone>
-			<zone type="Africa/Lagos">
-				<exemplarCity>拉各斯</exemplarCity>
-			</zone>
-			<zone type="America/Managua">
-				<exemplarCity draft="unconfirmed">馬那瓜</exemplarCity>
-			</zone>
-			<zone type="Pacific/Nauru">
-				<exemplarCity draft="provisional">瑙魯</exemplarCity>
-			</zone>
-			<zone type="Pacific/Niue">
-				<exemplarCity draft="provisional">紐埃</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity draft="provisional">馬克薩斯群島</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity draft="provisional">甘比爾</exemplarCity>
-			</zone>
-			<zone type="Asia/Karachi">
-				<exemplarCity>卡拉奇</exemplarCity>
-			</zone>
-			<zone type="America/Miquelon">
-				<exemplarCity draft="provisional">密克隆</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity draft="provisional">匹特開恩群島</exemplarCity>
-			</zone>
-			<zone type="Asia/Gaza">
-				<exemplarCity draft="provisional">加沙</exemplarCity>
-			</zone>
-			<zone type="Asia/Hebron">
-				<exemplarCity draft="provisional">希伯侖</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity draft="provisional">卡塔爾</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity draft="provisional">留尼旺</exemplarCity>
-			</zone>
-			<zone type="Europe/Belgrade">
-				<exemplarCity>貝爾格萊德</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity draft="provisional">阿納德爾</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity draft="provisional">利雅得</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guadalcanal">
-				<exemplarCity>瓜達爾卡納爾島</exemplarCity>
-			</zone>
-			<zone type="Europe/Ljubljana">
-				<exemplarCity>盧布爾雅那</exemplarCity>
-			</zone>
-			<zone type="Arctic/Longyearbyen">
-				<exemplarCity draft="provisional">朗伊爾城</exemplarCity>
-			</zone>
-			<zone type="Europe/Bratislava">
-				<exemplarCity draft="contributed">伯拉第斯拉瓦</exemplarCity>
-			</zone>
-			<zone type="Africa/Mogadishu">
-				<exemplarCity>摩加迪沙</exemplarCity>
-			</zone>
-			<zone type="Indian/Kerguelen">
-				<exemplarCity draft="unconfirmed">凱爾蓋朗</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity draft="contributed">杜尚別</exemplarCity>
-			</zone>
-			<zone type="Asia/Ashgabat">
-				<exemplarCity draft="provisional">阿什哈巴德</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tongatapu">
-				<exemplarCity>湯加塔布島</exemplarCity>
-			</zone>
-			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity>達累斯薩拉姆</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity draft="provisional">烏日哥羅德</exemplarCity>
-			</zone>
-			<zone type="America/Adak">
-				<exemplarCity draft="provisional">埃達克</exemplarCity>
-			</zone>
-			<zone type="America/Yakutat">
-				<exemplarCity draft="provisional">亞庫塔特</exemplarCity>
-			</zone>
-			<zone type="America/Boise">
-				<exemplarCity draft="provisional">博伊西</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Beulah">
-				<exemplarCity>北達科他州比尤拉</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity draft="provisional">北達科他州新薩勒姆</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity draft="unconfirmed">北達科他州申特城</exemplarCity>
-			</zone>
-			<zone type="America/Menominee">
-				<exemplarCity draft="provisional">梅諾米尼</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity draft="provisional">印第安納州溫森斯</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Tell_City">
-				<exemplarCity draft="provisional">印第安納州特爾城</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity draft="provisional">印第安納州諾克斯</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity draft="provisional">印第安納州馬倫哥</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity draft="provisional">印第安納波利斯</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity draft="provisional">印第安納州韋韋</exemplarCity>
-			</zone>
-			<zone type="America/Montevideo">
-				<exemplarCity draft="provisional">蒙得維的亞</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity draft="unconfirmed">聖文森特</exemplarCity>
-			</zone>
-			<zone type="America/Caracas">
-				<exemplarCity draft="provisional">加拉加斯</exemplarCity>
-			</zone>
-			<zone type="Indian/Mayotte">
-				<exemplarCity draft="provisional">馬約特</exemplarCity>
-			</zone>
-			<zone type="Africa/Johannesburg">
-				<exemplarCity draft="provisional">約翰內斯堡</exemplarCity>
-			</zone>
-			<zone type="Africa/Lusaka">
-				<exemplarCity>盧薩卡</exemplarCity>
-			</zone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic draft="provisional">北美東部時間</generic>
-					<standard draft="provisional">北美東部標準時間</standard>
-					<daylight draft="provisional">北美東部夏令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic draft="provisional">北美山區時間</generic>
-					<standard draft="provisional">北美山區標準時間</standard>
-					<daylight draft="provisional">北美山區夏令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic draft="provisional">北美太平洋時間</generic>
-					<standard draft="provisional">北美太平洋標準時間</standard>
-					<daylight draft="provisional">北美太平洋夏令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azerbaijan">
-				<long>
-					<generic draft="contributed">亞塞拜疆時間</generic>
-					<standard draft="contributed">亞塞拜疆標準時間</standard>
-					<daylight draft="contributed">亞塞拜疆夏令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cape_Verde">
-				<long>
-					<generic draft="provisional">佛得角時間</generic>
-					<standard draft="provisional">佛得角標準時間</standard>
-					<daylight draft="provisional">佛得角夏令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cocos">
-				<long>
-					<standard>可可斯群島時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Galapagos">
-				<long>
-					<standard draft="unconfirmed">加拉帕戈群島時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Georgia">
-				<long>
-					<generic draft="contributed">格魯吉亞時間</generic>
-					<standard draft="contributed">格魯吉亞標準時間</standard>
-					<daylight draft="contributed">格魯吉亞夏令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Gulf">
-				<long>
-					<standard draft="provisional">波斯灣海域時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Guyana">
-				<long>
-					<standard draft="provisional">圭亞那時間</standard>
-				</long>
-			</metazone>
-			<metazone type="India">
-				<long>
-					<standard draft="provisional">印度時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard draft="provisional">麥夸里群島時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Maldives">
-				<long>
-					<standard draft="contributed">馬爾代夫時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Marquesas">
-				<long>
-					<standard draft="provisional">馬克沙斯時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Mauritius">
-				<long>
-					<generic draft="contributed">毛里裘斯時間</generic>
-					<standard draft="contributed">毛里裘斯標準時間</standard>
-					<daylight draft="contributed">毛里裘斯夏令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Nauru">
-				<long>
-					<standard draft="provisional">瑙魯時間</standard>
-				</long>
-			</metazone>
-			<metazone type="New_Caledonia">
-				<long>
-					<generic>新喀里多尼亞時間</generic>
-					<standard>新喀里多尼亞標準時間</standard>
-					<daylight>新喀里多尼亞夏令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Papua_New_Guinea">
-				<long>
-					<standard draft="provisional">巴布亞新畿內亞時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Pitcairn">
-				<long>
-					<standard>皮特康時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Singapore">
-				<long>
-					<standard draft="provisional">新加坡時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Solomon">
-				<long>
-					<standard>所羅門群島時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Vanuatu">
-				<long>
-					<generic draft="provisional">瓦努阿圖時間</generic>
-					<standard draft="provisional">瓦努阿圖標準時間</standard>
-					<daylight draft="provisional">瓦努阿圖夏令時間</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<decimalFormats numberSystem="latn">
-			<decimalFormatLength type="long">
-				<decimalFormat>
-					<pattern type="1000" count="other">0千</pattern>
-					<pattern type="10000" count="other">0萬</pattern>
-					<pattern type="100000" count="other">00萬</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<currencies>
-			<currency type="AED">
-				<displayName draft="contributed">阿拉伯聯合酋長國迪爾汗</displayName>
-				<displayName count="other" draft="contributed">阿拉伯聯合酋長國迪爾汗</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName draft="unconfirmed">澳元</displayName>
-				<displayName count="other" draft="unconfirmed">澳元</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>阿魯巴盾</displayName>
-				<displayName count="other">阿魯巴盾</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName draft="contributed">亞塞拜疆馬納特</displayName>
-				<displayName count="other" draft="contributed">亞塞拜疆馬納特</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName draft="contributed">波斯尼亞-赫塞哥維納第納爾</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>波斯尼亞-赫塞哥維納可轉換馬克</displayName>
-				<displayName count="other">波斯尼亞-赫塞哥維納可轉換馬克</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName draft="provisional">巴巴多斯元</displayName>
-				<displayName count="other" draft="provisional">巴巴多斯元</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName draft="provisional">布隆迪法郎</displayName>
-				<displayName count="other" draft="provisional">布隆迪法郎</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName draft="provisional">博茨瓦納普拉</displayName>
-				<displayName count="other" draft="provisional">博茨瓦納普拉</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName draft="provisional">伯利茲元</displayName>
-				<displayName count="other" draft="provisional">伯利茲元</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName draft="unconfirmed">加元</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>哥斯達黎加科郎</displayName>
-				<displayName count="other">哥斯達黎加科郎</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName draft="provisional">佛得角埃斯庫多</displayName>
-				<displayName count="other" draft="provisional">佛得角埃斯庫多</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName count="other" draft="unconfirmed">丹麥克羅納</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName draft="contributed">埃塞俄比亞比爾</displayName>
-				<displayName count="other" draft="contributed">埃塞俄比亞比爾</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName draft="contributed">格魯吉亞拉里</displayName>
-				<displayName count="other" draft="contributed">格魯吉亞拉里</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName draft="provisional">加納塞地</displayName>
-				<displayName count="other" draft="provisional">加納塞地</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName draft="provisional">岡比亞達拉西</displayName>
-				<displayName count="other" draft="provisional">岡比亞達拉西</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName draft="provisional">危地馬拉格查爾</displayName>
-				<displayName count="other" draft="provisional">危地馬拉格查爾</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>港元</displayName>
-				<displayName count="other">港元</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName draft="provisional">克羅地亞庫納</displayName>
-				<displayName count="other">克羅地亞庫納</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName draft="contributed">意大利里拉</displayName>
-			</currency>
-			<currency type="KRW">
-				<symbol draft="contributed">₩</symbol>
-			</currency>
-			<currency type="KYD">
-				<displayName count="other">開曼群島美元</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName draft="contributed">利比利亞元</displayName>
-				<displayName count="other" draft="contributed">利比利亞元</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName count="other" draft="unconfirmed">立陶宛里塔</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName draft="provisional">馬達加斯加艾瑞爾</displayName>
-				<displayName count="other" draft="provisional">馬達加斯加艾瑞爾</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName draft="provisional">毛里塔尼亞烏吉亞</displayName>
-				<displayName count="other" draft="provisional">毛里塔尼亞烏吉亞</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>毛里裘斯盧布</displayName>
-				<displayName count="other">毛里裘斯盧布</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName draft="provisional">馬爾代夫盧非亞</displayName>
-				<displayName count="other" draft="provisional">馬爾代夫盧非亞</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>莫桑比克梅蒂卡爾</displayName>
-				<displayName count="other">莫桑比克梅蒂卡爾</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>尼日利亞奈拉</displayName>
-				<displayName count="other">尼日利亞奈拉</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName count="other" draft="unconfirmed">挪威克羅納</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName draft="unconfirmed">紐西蘭元</displayName>
-				<displayName count="other" draft="unconfirmed">紐西蘭元</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName draft="provisional">巴布亞新畿內亞基那</displayName>
-				<displayName count="other" draft="provisional">巴布亞新畿內亞基那</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName draft="provisional">卡塔爾里亞爾</displayName>
-				<displayName count="other" draft="provisional">卡塔爾里亞爾</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName draft="unconfirmed">塞爾維亞第納爾</displayName>
-				<displayName count="other" draft="unconfirmed">塞爾維亞第納爾</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>盧旺達法郎</displayName>
-				<displayName count="other">盧旺達法郎</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName draft="contributed">沙特阿拉伯里亞爾</displayName>
-				<displayName count="other" draft="contributed">沙特阿拉伯里亞爾</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName draft="provisional">所羅門群島元</displayName>
-				<displayName count="other" draft="provisional">所羅門群島元</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName count="other" draft="unconfirmed">瑞典克羅納</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName draft="unconfirmed">新加坡元</displayName>
-				<displayName count="other" draft="unconfirmed">新加坡元</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName draft="provisional">塞拉利昂利昂</displayName>
-				<displayName count="other" draft="provisional">塞拉利昂利昂</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName draft="provisional">聖多美和普林西比多布拉</displayName>
-				<displayName count="other" draft="provisional">聖多美和普林西比多布拉</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName draft="unconfirmed">新台幣</displayName>
-				<displayName count="other" draft="unconfirmed">新台幣</displayName>
-			</currency>
-			<currency type="USD">
-				<symbol>US$</symbol>
-			</currency>
-			<currency type="VUV">
-				<displayName draft="provisional">瓦努阿圖瓦圖</displayName>
-				<displayName count="other" draft="provisional">瓦努阿圖瓦圖</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>中非法郎</displayName>
-				<displayName count="other">中非法郎</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName draft="provisional">東加勒比元</displayName>
-				<displayName count="other" draft="provisional">東加勒比元</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName draft="contributed">多哥非洲共同體法郎</displayName>
-				<displayName count="other" draft="provisional">多哥非洲共同體法郎</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>太平洋法郎</displayName>
-				<displayName count="other">太平洋法郎</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName draft="provisional">也門里雅</displayName>
-				<displayName count="other" draft="provisional">也門里雅</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unitLength type="long">
-			<unit type="acceleration-meter-per-second-squared">
-				<displayName>米/平方秒</displayName>
-				<unitPattern count="other">{0} 米/平方秒</unitPattern>
-			</unit>
-			<unit type="angle-arc-minute">
-				<displayName>角分</displayName>
-				<unitPattern count="other">{0} 角分</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName>角秒</displayName>
-				<unitPattern count="other">{0} 角秒</unitPattern>
-			</unit>
-			<unit type="area-square-centimeter">
-				<displayName>平方厘米</displayName>
-				<unitPattern count="other">{0} 平方厘米</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<displayName>平方呎</displayName>
-				<unitPattern count="other">{0} 平方呎</unitPattern>
-			</unit>
-			<unit type="area-square-inch">
-				<displayName>平方吋</displayName>
-				<unitPattern count="other">{0} 平方吋</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>平方米</displayName>
-				<unitPattern count="other">{0} 平方米</unitPattern>
-			</unit>
-			<unit type="consumption-liter-per-kilometer">
-				<displayName>公升/公里</displayName>
-				<unitPattern count="other">{0} 公升/公里</unitPattern>
-			</unit>
-			<unit type="consumption-mile-per-gallon">
-				<displayName draft="unconfirmed">英里每加侖</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} 英里每加侖</unitPattern>
-			</unit>
-			<unit type="digital-bit">
-				<displayName>位元</displayName>
-				<unitPattern count="other">{0} 個位元</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>位元組</displayName>
-				<unitPattern count="other">{0} 位元組</unitPattern>
-			</unit>
-			<unit type="duration-day">
-				<displayName draft="unconfirmed">日</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} 日</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>納秒</displayName>
-				<unitPattern count="other">{0} 納秒</unitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName draft="unconfirmed">星期</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0}星期</unitPattern>
-			</unit>
-			<unit type="energy-foodcalorie">
-				<displayName>卡路里</displayName>
-				<unitPattern count="other">{0} 卡路里</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>厘米</displayName>
-				<unitPattern count="other">{0} 厘米</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<displayName>分米</displayName>
-				<unitPattern count="other">{0} 分米</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>米</displayName>
-				<unitPattern count="other">{0} 米</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>毫米</displayName>
-				<unitPattern count="other">{0} 毫米</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<displayName>納米</displayName>
-				<unitPattern count="other">{0} 納米</unitPattern>
-			</unit>
-			<unit type="mass-ounce">
-				<displayName>安士</displayName>
-				<unitPattern count="other">{0} 安士</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>金衡安士</displayName>
-				<unitPattern count="other">{0} 金衡安士</unitPattern>
-			</unit>
-			<unit type="power-megawatt">
-				<displayName>兆瓦</displayName>
-				<unitPattern count="other">{0} 兆瓦</unitPattern>
-			</unit>
-			<unit type="pressure-hectopascal">
-				<displayName>百帕斯卡</displayName>
-				<unitPattern count="other">{0} 百帕斯卡</unitPattern>
-			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName draft="unconfirmed">英吋汞柱</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} 英吋汞柱</unitPattern>
-			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<displayName draft="unconfirmed">毫米汞柱</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} 毫米汞柱</unitPattern>
-			</unit>
-			<unit type="pressure-pound-per-square-inch">
-				<displayName>磅/平方吋</displayName>
-				<unitPattern count="other">{0} 磅/平方吋</unitPattern>
-			</unit>
-			<unit type="speed-kilometer-per-hour">
-				<displayName draft="unconfirmed">公里每小時</displayName>
-				<unitPattern count="other" draft="unconfirmed">每小時 {0} 公里</unitPattern>
-			</unit>
-			<unit type="speed-meter-per-second">
-				<displayName>米/秒</displayName>
-				<unitPattern count="other">{0} 米/秒</unitPattern>
-			</unit>
-			<unit type="speed-mile-per-hour">
-				<displayName draft="unconfirmed">英里每小時</displayName>
-				<unitPattern count="other" draft="unconfirmed">每小時 {0} 英里</unitPattern>
-			</unit>
-			<unit type="temperature-celsius">
-				<displayName draft="unconfirmed">攝氏度</displayName>
-				<unitPattern count="other" draft="unconfirmed">攝氏 {0} 度</unitPattern>
-			</unit>
-			<unit type="temperature-fahrenheit">
-				<displayName draft="unconfirmed">華氏度</displayName>
-				<unitPattern count="other" draft="unconfirmed">華氏 {0} 度</unitPattern>
-			</unit>
-			<unit type="temperature-kelvin">
-				<displayName draft="unconfirmed">開爾文</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} 開爾文</unitPattern>
-			</unit>
-			<unit type="volume-acre-foot">
-				<displayName draft="provisional">英畝 - 英尺</displayName>
-				<unitPattern count="other" draft="provisional">{0} 英畝 - 英尺</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>厘升</displayName>
-				<unitPattern count="other">{0} 厘升</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>立方厘米</displayName>
-				<unitPattern count="other">{0} 立方厘米</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>立方呎</displayName>
-				<unitPattern count="other">{0} 立方呎</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>立方吋</displayName>
-				<unitPattern count="other">{0} 立方吋</unitPattern>
-			</unit>
-			<unit type="volume-cubic-meter">
-				<displayName>立方米</displayName>
-				<unitPattern count="other">{0} 立方米</unitPattern>
-			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>液安士</displayName>
-				<unitPattern count="other">{0} 液安士</unitPattern>
-			</unit>
-		</unitLength>
-		<unitLength type="short">
-			<unit type="acceleration-g-force">
-				<unitPattern count="other">{0} G</unitPattern>
-			</unit>
-			<unit type="acceleration-meter-per-second-squared">
-				<displayName draft="provisional">米/平方秒</displayName>
-				<unitPattern count="other" draft="provisional">{0} 米每平方秒</unitPattern>
-			</unit>
-			<unit type="angle-arc-minute">
-				<displayName>分</displayName>
-				<unitPattern count="other" draft="provisional">{0} 分</unitPattern>
-			</unit>
-			<unit type="area-square-centimeter">
-				<displayName draft="contributed">平方厘米</displayName>
-				<unitPattern count="other" draft="contributed">{0} 平方厘米</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<displayName>平方呎</displayName>
-				<unitPattern count="other" draft="contributed">{0} 平方呎</unitPattern>
-			</unit>
-			<unit type="area-square-inch">
-				<displayName>平方吋</displayName>
-				<unitPattern count="other" draft="contributed">{0} 平方吋</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>平方米</displayName>
-				<unitPattern count="other" draft="contributed">{0} 平方米</unitPattern>
-			</unit>
-			<unit type="consumption-liter-per-kilometer">
-				<unitPattern count="other" draft="provisional">{0} 升每公里</unitPattern>
-			</unit>
-			<unit type="consumption-mile-per-gallon">
-				<unitPattern count="other" draft="provisional">{0} 英里每加侖</unitPattern>
-			</unit>
-			<unit type="duration-day">
-				<displayName draft="unconfirmed">日</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} 日</unitPattern>
-			</unit>
-			<unit type="duration-hour">
-				<perUnitPattern draft="provisional">{0}ph</perUnitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName draft="contributed">納秒</displayName>
-				<unitPattern count="other" draft="contributed">{0} 納秒</unitPattern>
-			</unit>
-			<unit type="duration-second">
-				<perUnitPattern draft="provisional">{0}ps</perUnitPattern>
-			</unit>
-			<unit type="electric-ampere">
-				<displayName draft="unconfirmed">安</displayName>
-			</unit>
-			<unit type="electric-milliampere">
-				<displayName draft="unconfirmed">毫安</displayName>
-			</unit>
-			<unit type="energy-calorie">
-				<displayName draft="provisional">cal</displayName>
-			</unit>
-			<unit type="energy-foodcalorie">
-				<displayName draft="provisional">Cal</displayName>
-				<unitPattern count="other" draft="provisional">{0} 千卡</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName draft="provisional">kcal</displayName>
-			</unit>
-			<unit type="frequency-gigahertz">
-				<displayName draft="provisional">GHz</displayName>
-			</unit>
-			<unit type="frequency-hertz">
-				<displayName draft="provisional">Hz</displayName>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<displayName draft="provisional">kHz</displayName>
-			</unit>
-			<unit type="frequency-megahertz">
-				<displayName draft="provisional">MHz</displayName>
-			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName draft="provisional">au</displayName>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">厘米</displayName>
-				<unitPattern count="other" draft="contributed">{0} 厘米</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<displayName draft="provisional">dm</displayName>
-				<unitPattern count="other" draft="provisional">{0} 分米</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>米</displayName>
-				<unitPattern count="other" draft="contributed">{0} 米</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName draft="unconfirmed">哩</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} 哩</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName draft="contributed">毫米</displayName>
-				<unitPattern count="other" draft="contributed">{0} 毫米</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<displayName draft="provisional">nm</displayName>
-				<unitPattern count="other" draft="provisional">{0} 納米</unitPattern>
-			</unit>
-			<unit type="length-nautical-mile">
-				<displayName draft="unconfirmed">浬</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} 浬</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName draft="provisional">pm</displayName>
-			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="contributed">安士</displayName>
-				<unitPattern count="other" draft="contributed">{0} 安士</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>金衡安士</displayName>
-				<unitPattern count="other" draft="provisional">{0} 金衡安士</unitPattern>
-			</unit>
-			<unit type="power-gigawatt">
-				<displayName draft="provisional">GW</displayName>
-			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="provisional">hp</displayName>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName draft="provisional">kW</displayName>
-			</unit>
-			<unit type="power-megawatt">
-				<displayName draft="provisional">MW</displayName>
-				<unitPattern count="other" draft="provisional">{0} 兆瓦</unitPattern>
-			</unit>
-			<unit type="power-milliwatt">
-				<displayName draft="provisional">mW</displayName>
-			</unit>
-			<unit type="power-watt">
-				<displayName>瓦</displayName>
-				<unitPattern count="other" draft="contributed">{0} 瓦</unitPattern>
-			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName draft="provisional">in Hg</displayName>
-				<unitPattern count="other" draft="provisional">{0} 英吋汞柱</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName draft="provisional">mbar</displayName>
-			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<displayName draft="provisional">mm Hg</displayName>
-				<unitPattern count="other" draft="provisional">{0} 毫米汞柱</unitPattern>
-			</unit>
-			<unit type="pressure-pound-per-square-inch">
-				<displayName draft="provisional">psi</displayName>
-				<unitPattern count="other" draft="provisional">{0} 磅每平方吋</unitPattern>
-			</unit>
-			<unit type="speed-kilometer-per-hour">
-				<displayName draft="provisional">km/h</displayName>
-				<unitPattern count="other" draft="provisional">{0} kph</unitPattern>
-			</unit>
-			<unit type="speed-meter-per-second">
-				<displayName draft="provisional">米/秒</displayName>
-				<unitPattern count="other">{0} 米/秒</unitPattern>
-			</unit>
-			<unit type="speed-mile-per-hour">
-				<unitPattern count="other" draft="provisional">{0} mph</unitPattern>
-			</unit>
-			<unit type="volume-acre-foot">
-				<displayName draft="provisional">英畝呎</displayName>
-				<unitPattern count="other" draft="provisional">{0} 英畝呎</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName draft="provisional">cL</displayName>
-				<unitPattern count="other" draft="provisional">{0} 厘升</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName draft="provisional">cm³</displayName>
-				<unitPattern count="other" draft="provisional">{0} 立方厘米</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>立方呎</displayName>
-				<unitPattern count="other" draft="provisional">{0} 立方呎</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>立方吋</displayName>
-				<unitPattern count="other" draft="provisional">{0} 立方吋</unitPattern>
-			</unit>
-			<unit type="volume-cubic-kilometer">
-				<displayName draft="provisional">km³</displayName>
-			</unit>
-			<unit type="volume-cubic-meter">
-				<displayName draft="provisional">m³</displayName>
-				<unitPattern count="other" draft="provisional">{0} 立方米</unitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<displayName draft="provisional">mi³</displayName>
-			</unit>
-			<unit type="volume-deciliter">
-				<displayName draft="provisional">dL</displayName>
-			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName draft="provisional">fl oz</displayName>
-				<unitPattern count="other" draft="provisional">{0} 液安士</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName draft="provisional">gal</displayName>
-			</unit>
-			<unit type="volume-hectoliter">
-				<displayName draft="provisional">hL</displayName>
-			</unit>
-			<unit type="volume-liter">
-				<displayName draft="unconfirmed">升</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} 升</unitPattern>
-			</unit>
-			<unit type="volume-megaliter">
-				<displayName draft="provisional">ML</displayName>
-			</unit>
-			<unit type="volume-milliliter">
-				<displayName draft="provisional">mL</displayName>
-			</unit>
-			<unit type="volume-quart">
-				<displayName draft="provisional">qts</displayName>
-			</unit>
-			<unit type="volume-tablespoon">
-				<displayName draft="provisional">tbsp</displayName>
-			</unit>
-			<unit type="volume-teaspoon">
-				<displayName draft="provisional">tsp</displayName>
-			</unit>
-		</unitLength>
-		<unitLength type="narrow">
-			<unit type="area-square-foot">
-				<unitPattern count="other">{0}ft²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<unitPattern count="other" draft="contributed">{0}mi²</unitPattern>
-			</unit>
-			<unit type="duration-day">
-				<displayName draft="unconfirmed">日</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0}日</unitPattern>
-			</unit>
-			<unit type="duration-hour">
-				<unitPattern count="other" draft="contributed">{0}小時</unitPattern>
-			</unit>
-			<unit type="duration-minute">
-				<displayName draft="unconfirmed">分</displayName>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">厘米</displayName>
-				<unitPattern count="other" draft="contributed">{0}厘米</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>米</displayName>
-				<unitPattern count="other" draft="contributed">{0}米</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName draft="contributed">毫米</displayName>
-				<unitPattern count="other" draft="contributed">{0}毫米</unitPattern>
-			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="other" draft="contributed">{0} 安士</unitPattern>
-			</unit>
-			<unit type="pressure-inch-hg">
-				<unitPattern count="other" draft="contributed">{0}″ Hg</unitPattern>
-			</unit>
-			<unit type="speed-kilometer-per-hour">
-				<displayName draft="provisional">km/hr</displayName>
-				<unitPattern count="other" draft="contributed">{0}kph</unitPattern>
-			</unit>
-			<unit type="speed-meter-per-second">
-				<unitPattern count="other" draft="contributed">{0}m/s</unitPattern>
-			</unit>
-			<unit type="speed-mile-per-hour">
-				<unitPattern count="other" draft="contributed">{0}mph</unitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<unitPattern count="other" draft="contributed">{0}mi³</unitPattern>
-			</unit>
-			<unit type="volume-liter">
-				<displayName draft="unconfirmed">升</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0}升</unitPattern>
-			</unit>
-		</unitLength>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>是</yesstr>
-			<nostr>否</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/dayPeriods.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/dayPeriods.xml
deleted file mode 100644
index 526abad11fb..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/dayPeriods.xml
+++ /dev/null
@@ -1,660 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc. CLDR data files are interpreted 
-	according to the LDML specification (http://unicode.org/reports/tr35/) For 
-	terms of use, see http://www.unicode.org/copyright.html -->
-<supplementalData>
-	<version number="$Revision: 11086 $" />
-	<generation date="$Date: 2014-12-18 06:03:31 -0600 (Thu, 18 Dec 2014) $" />
-	<dayPeriodRuleSet>
-		<dayPeriodRules locales="root">  <!-- default for any locales not listed under other dayPeriods -->
-			<dayPeriodRule type="morning1" from="0:00" before="12:00" />
-			<dayPeriodRule type="afternoon1" from="12:00" before="24:00" />
-		</dayPeriodRules>
-		<dayPeriodRules locales="en chr">
-			<dayPeriodRule type="morning1" from="0:00" before="12:00" />
-			<dayPeriodRule type="noon" at="12:00" />
-			<dayPeriodRule type="afternoon1" after="12:00" before="24:00" />
-		</dayPeriodRules>
-		<dayPeriodRules locales="de nl hr da"> <!-- hr #2489, da #2474 -->
-			<dayPeriodRule type="morning1" from="0:00" before="9:00" />
-			<dayPeriodRule type="morning2" from="9:00" before="12:00" />
-			<dayPeriodRule type="noon" at="12:00" />
-			<dayPeriodRule type="afternoon1" after="12:00" before="17:00" />
-			<dayPeriodRule type="evening1" from="17:00" before="21:00" />
-			<dayPeriodRule type="night1" from="21:00" before="24:00" />
-		</dayPeriodRules>
-		<dayPeriodRules locales="zh">
-			<dayPeriodRule type="night2" from="00:00" before="4:00" />
-			<dayPeriodRule type="morning1" from="4:00" before="6:00" />
-			<dayPeriodRule type="morning2" from="6:00" before="12:00" />
-			<dayPeriodRule type="afternoon1" from="12:00" before="13:00" />
-			<dayPeriodRule type="afternoon2" from="13:00" before="18:00" />
-			<dayPeriodRule type="night1" from="18:00" before="24:00" />
-		</dayPeriodRules>
-		<dayPeriodRules locales="pt fr"> <!-- 2465 -->
-			<dayPeriodRule type="morning1" from="00:00" before="12:00" />
-			<dayPeriodRule type="noon" at="12:00" />
-			<dayPeriodRule type="afternoon1" after="12:00" before="19:00" />
-			<dayPeriodRule type="night1" from="19:00" before="24:00" />
-		</dayPeriodRules>
-		<dayPeriodRules locales="pl">
-			<dayPeriodRule type="night2" from="3:00" before="5:00" />
-			<dayPeriodRule type="morning1" from="5:00" before="10:00" />
-			<dayPeriodRule type="morning2" from="10:00" before="12:00" />
-			<dayPeriodRule type="noon" at="12:00" />
-			<dayPeriodRule type="afternoon1" after="12:00" before="16:00" />
-			<dayPeriodRule type="evening1" from="16:00" before="22:00" />
-			<dayPeriodRule type="night1" from="22:00" before="3:00" />
-		</dayPeriodRules>
-		<!-- #2468 22:00 ≤ w nocy < 03:00 ≤ nad ranem < 05:00 ≤ rano ≤ 10:00 < 
-			przed południem < 12:00 = w południe < 12:00 ≤ po południu < 16:00 < wieczorem -->
-		<dayPeriodRules locales="te">
-			<dayPeriodRule type="morning1" from="3:00" before="6:00" />
-			<dayPeriodRule type="morning2" from="6:00" before="12:00" />
-			<dayPeriodRule type="noon" at="12:00" />
-			<dayPeriodRule type="afternoon1" after="12:00" before="15:00" />
-			<dayPeriodRule type="evening1" from="15:00" before="18:00" />
-			<dayPeriodRule type="night1" from="18:00" before="3:00" />
-		</dayPeriodRules>
-		<!-- te 2463 3-6 earlyMorning తెల్లవారుఝాము 6-12 morning ఉదయం 12-3 afternoon 
-			మధ్యాహ్నం 3-6 evening సాయంకాలం 6-12 night రాత్రి 12-3 mid-night అర్ధరాత్రి -->
-		<dayPeriodRules locales="ta">
-			<dayPeriodRule type="night2" from="2:00" before="6:00" />
-			<dayPeriodRule type="morning1" from="6:00" before="10:00" />
-			<dayPeriodRule type="morning2" from="10:00" before="14:00" />
-			<dayPeriodRule type="afternoon1" from="14:00" before="18:00" />
-			<dayPeriodRule type="evening1" from="18:00" before="22:00" />
-			<dayPeriodRule type="night1" from="22:00" before="2:00" />
-		</dayPeriodRules>
-		<!-- ta #2485 (2 am to 6 am) - அதிகாலை Morning (6 am to 10 am) - காலை Noon 
-			(10 am to 2 pm) - நண்பகல் Evening (2 pm to 6 pm) - மாலை Night (6 pm to 10 
-			pm) - இரவு Midnight(10 pm to 2 am) - நள்ளிரவு -->
-		<dayPeriodRules locales="bg">
-			<dayPeriodRule type="night1" from="00:00" before="5:00" />
-			<dayPeriodRule type="night2" from="5:00" before="6:00" />
-			<dayPeriodRule type="morning1" from="6:00" before="10:00" />
-			<dayPeriodRule type="morning2" from="10:00" before="12:00" />
-			<dayPeriodRule type="noon" at="12:00" />
-			<dayPeriodRule type="afternoon1" after="12:00" before="15:00" />
-			<dayPeriodRule type="afternoon2" from="15:00" before="18:00" />
-			<dayPeriodRule type="evening1" from="18:00" before="20:00" />
-			<dayPeriodRule type="evening2" from="20:00" before="22:00" />
-			<dayPeriodRule type="night1" from="22:00" before="24:00" />
-		</dayPeriodRules>
-		<!-- #2482 00:00 = полунощ < 05:00 ≤ нощ < 06:00 ≤ разсъмване < 10:00 ≤ 
-			утро < 12:00 ≤ ден = 12:00 = обяд < 15:00 ≤ ранен следобяд < 18:00 ≤ късен 
-			следобяд < 20:00 ≤ вечер < 22:00 ≤ късна вечер < 24:00 ≤ нощ -->
-		<dayPeriodRules locales="id">
-			<dayPeriodRule type="morning1" from="3:00" before="5:00" />
-			<dayPeriodRule type="morning2" from="5:00" before="10:00" />
-			<dayPeriodRule type="afternoon1" from="10:00" before="15:00" />
-			<dayPeriodRule type="afternoon2" from="15:00" before="18:00" />
-			<dayPeriodRule type="night1" from="18:00" before="3:00" />
-		</dayPeriodRules>
-		<!-- id #2475 03:00 ≤ earlyMorning < 05:00 ≤ morning < 10:00 ≤ earlyafternoon 
-			≤ 15:00 < lateAfternoon < 18:00 ≤ night < 03:00 -->
-		<dayPeriodRules locales="uk">
-			<dayPeriodRule type="night1" from="00:00" before="3:00" />
-			<dayPeriodRule type="morning1" from="3:00" before="12:00" />
-			<dayPeriodRule type="afternoon1" from="12:00" before="17:00" />
-			<dayPeriodRule type="evening1" from="17:00" before="24:00" />
-		</dayPeriodRules>
-		<!-- uk # 2479 00:00 ≤ night < 3:00 ≤ morning < 12:00 ≤ afternoon < 17:00 
-			≤ evening < 24:00 -->
-		<dayPeriodRules locales="ee">
-			<dayPeriodRule type="morning1" from="04:00" before="05:00" /><!-- 
-				fɔŋli -->
-			<dayPeriodRule type="morning2" from="05:00" before="12:00" /><!-- 
-				ŋdi -->
-			<dayPeriodRule type="afternoon1" from="12:00"
-				before="14:00" /><!-- ŋdɔ -->
-			<dayPeriodRule type="afternoon2" from="14:00" before="18:00" /><!-- 
-				ɣetrɔ -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00" /><!-- 
-				fiẽ -->
-			<dayPeriodRule type="night1" from="21:00" before="4:00" /><!-- 
-				zã -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="fa">
-			<dayPeriodRule type="night1" from="00:00" before="01:00" /><!-- 
-				نیمه‌شب -->
-			<dayPeriodRule type="morning1" from="01:00" before="06:00" /><!-- 
-				بامداد -->
-			<dayPeriodRule type="morning2" from="06:00" before="12:00" /><!-- 
-				صبح -->
-			<dayPeriodRule type="noon" at="12:00" /><!-- ظهر -->
-			<dayPeriodRule type="afternoon1" after="12:00" before="16:00" /><!-- 
-				بعدازظهر -->
-			<dayPeriodRule type="afternoon2" from="16:00" before="19:00" /><!-- 
-				عصر -->
-			<dayPeriodRule type="night1" from="19:00" before="24:00" /><!-- 
-				شب -->
-		</dayPeriodRules>
-	</dayPeriodRuleSet>
-	<dayPeriodRuleSet type="selection">
-		<dayPeriodRules locales="root">  <!-- default for any locales not listed under other dayPeriods -->
-			<dayPeriodRule type="am" from="0:00" before="12:00" />
-			<dayPeriodRule type="pm" from="12:00" before="24:00" />
-		</dayPeriodRules>
-		<dayPeriodRules locales="en">
-			<dayPeriodRule type="night1" from="0:00" before="6:00"/> <!-- night -->
-			<dayPeriodRule type="morning1" from="6:00" before="12:00"/> <!-- morning -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- afternoon -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/> <!-- evening -->
-			<dayPeriodRule type="night1" from="21:00" before="24:00"/> <!-- night -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="af">
-			<dayPeriodRule type="night1" from="0:00" before="5:00"/> <!-- nag -->
-			<dayPeriodRule type="morning1" from="5:00" before="12:00"/> <!-- oggend -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- middag -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/> <!-- aand -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="nl">
-			<dayPeriodRule type="night1" from="0:00" before="6:00"/> <!-- nacht -->
-			<dayPeriodRule type="morning1" from="6:00" before="12:00"/> <!-- ochtend -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- middag -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/> <!-- avond -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="de">
-			<dayPeriodRule type="night1" from="0:00" before="5:00"/> <!-- Nacht -->
-			<dayPeriodRule type="morning1" from="5:00" before="10:00"/> <!-- Morgen -->
-			<dayPeriodRule type="morning2" from="10:00" before="12:00"/> <!-- Vormittag -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="13:00"/> <!-- Mittag -->
-			<dayPeriodRule type="afternoon2" from="13:00" before="18:00"/> <!-- Nachmittag -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/> <!-- Abend -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="da">
-			<dayPeriodRule type="night1" from="0:00" before="5:00"/> <!-- nat -->
-			<dayPeriodRule type="morning1" from="5:00" before="10:00"/> <!-- morgen -->
-			<dayPeriodRule type="morning2" from="10:00" before="12:00"/> <!-- formiddag -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- eftermiddag -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/> <!-- aften -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="nb">
-			<dayPeriodRule type="night1" from="0:00" before="6:00"/> <!-- natt -->
-			<dayPeriodRule type="morning1" from="6:00" before="10:00"/> <!-- morgen -->
-			<dayPeriodRule type="morning2" from="10:00" before="12:00"/> <!-- formiddag -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- ettermiddag -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/> <!-- kveld -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="sv">
-			<dayPeriodRule type="night1" from="0:00" before="5:00"/> <!-- natt -->
-			<dayPeriodRule type="morning1" from="5:00" before="10:00"/> <!-- morgon -->
-			<dayPeriodRule type="morning2" from="10:00" before="12:00"/> <!-- förmiddag -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- eftermiddag -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/> <!-- kväll -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="is">
-			<dayPeriodRule type="night1" from="0:00" before="6:00"/> <!-- nótt -->
-			<dayPeriodRule type="morning1" from="6:00" before="12:00"/> <!-- morgunn -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- eftir hádegi -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/> <!-- kvöld -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="pt">
-			<dayPeriodRule type="night1" from="0:00" before="6:00"/> <!-- madrugada -->
-			<dayPeriodRule type="morning1" from="6:00" before="12:00"/> <!-- manhã -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="19:00"/> <!-- tarde -->
-			<dayPeriodRule type="evening1" from="19:00" before="24:00"/> <!-- noite -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="gl">
-			<dayPeriodRule type="morning1" from="0:00" before="6:00"/> <!-- madrugada -->
-			<dayPeriodRule type="morning2" from="6:00" before="12:00"/> <!-- mañá -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="13:00"/> <!-- mediodía -->
-			<dayPeriodRule type="evening1" from="13:00" before="21:00"/> <!-- tarde -->
-			<dayPeriodRule type="night1" from="21:00" before="24:00"/> <!-- noite -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="es">
-			<dayPeriodRule type="morning1" from="0:00" before="6:00"/> <!-- madrugada -->
-			<dayPeriodRule type="morning2" from="6:00" before="12:00"/> <!-- mañana -->
-			<dayPeriodRule type="evening1" from="12:00" before="20:00"/> <!-- tarde -->
-			<dayPeriodRule type="night1" from="20:00" before="24:00"/> <!-- noche -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="ca">
-			<dayPeriodRule type="morning1" from="0:00" before="6:00"/> <!-- matinada -->
-			<dayPeriodRule type="morning2" from="6:00" before="12:00"/> <!-- matí -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="13:00"/> <!-- migdia -->
-			<dayPeriodRule type="afternoon2" from="13:00" before="19:00"/> <!-- tarda -->
-			<dayPeriodRule type="evening1" from="19:00" before="21:00"/> <!-- vespre -->
-			<dayPeriodRule type="night1" from="21:00" before="24:00"/> <!-- nit -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="it">
-			<dayPeriodRule type="night1" from="0:00" before="6:00"/> <!-- notte -->
-			<dayPeriodRule type="morning1" from="6:00" before="12:00"/> <!-- mattina -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- pomeriggio -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/> <!-- sera -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="ro">
-			<dayPeriodRule type="night1" from="0:00" before="5:00"/> <!-- noapte -->
-			<dayPeriodRule type="morning1" from="5:00" before="12:00"/> <!-- dimineață -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- după-amiază -->
-			<dayPeriodRule type="evening1" from="18:00" before="22:00"/> <!-- seară -->
-			<dayPeriodRule type="night1" from="22:00" before="24:00"/> <!-- noapte -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="fr">
-			<dayPeriodRule type="night1" from="0:00" before="4:00"/> <!-- nuit -->
-			<dayPeriodRule type="morning1" from="4:00" before="12:00"/> <!-- matin -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- après-midi -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/> <!-- soir -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="hr">
-			<dayPeriodRule type="night1" from="0:00" before="4:00"/> <!-- noć -->
-			<dayPeriodRule type="morning1" from="4:00" before="12:00"/> <!-- jutro -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- popodne -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/> <!-- večer -->
-			<dayPeriodRule type="night1" from="21:00" before="24:00"/> <!-- noć -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="bs">
-			<dayPeriodRule type="night1" from="0:00" before="4:00"/> <!-- noć -->
-			<dayPeriodRule type="morning1" from="4:00" before="12:00"/> <!-- jutro -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- popodne -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/> <!-- veče -->
-			<dayPeriodRule type="night1" from="21:00" before="24:00"/> <!-- noć -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="sr">
-			<dayPeriodRule type="night1" from="0:00" before="6:00"/> <!-- ноћ -->
-			<dayPeriodRule type="morning1" from="6:00" before="12:00"/> <!-- јутро -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- поподне -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/> <!-- вече -->
-			<dayPeriodRule type="night1" from="21:00" before="24:00"/> <!-- ноћ -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="sl">
-			<dayPeriodRule type="night1" from="0:00" before="6:00"/> <!-- noč -->
-			<dayPeriodRule type="morning1" from="6:00" before="10:00"/> <!-- jutro -->
-			<dayPeriodRule type="morning2" from="10:00" before="12:00"/> <!-- dopoldne -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- popoldne -->
-			<dayPeriodRule type="evening1" from="18:00" before="22:00"/> <!-- večer -->
-			<dayPeriodRule type="night1" from="22:00" before="24:00"/> <!-- noč -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="cs">
-			<dayPeriodRule type="night1" from="0:00" before="4:00"/> <!-- noc -->
-			<dayPeriodRule type="morning1" from="4:00" before="9:00"/> <!-- ráno -->
-			<dayPeriodRule type="morning2" from="9:00" before="12:00"/> <!-- dopoledne -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- odpoledne -->
-			<dayPeriodRule type="evening1" from="18:00" before="22:00"/> <!-- večer -->
-			<dayPeriodRule type="night1" from="22:00" before="24:00"/> <!-- noc -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="sk">
-			<dayPeriodRule type="night1" from="0:00" before="4:00"/> <!-- noc -->
-			<dayPeriodRule type="morning1" from="4:00" before="9:00"/> <!-- ráno -->
-			<dayPeriodRule type="morning2" from="9:00" before="12:00"/> <!-- dopoludnie -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- popoludnie -->
-			<dayPeriodRule type="evening1" from="18:00" before="22:00"/> <!-- večer -->
-			<dayPeriodRule type="night1" from="22:00" before="24:00"/> <!-- noc -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="pl">
-			<dayPeriodRule type="night1" from="0:00" before="6:00"/> <!-- noc -->
-			<dayPeriodRule type="morning1" from="6:00" before="10:00"/> <!-- rano -->
-			<dayPeriodRule type="morning2" from="10:00" before="12:00"/> <!-- przedpołudnie -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- popołudnie -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/> <!-- wieczór -->
-			<dayPeriodRule type="night1" from="21:00" before="24:00"/> <!-- noc -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="bg">
-			<dayPeriodRule type="night1" from="0:00" before="4:00"/> <!-- нощ -->
-			<dayPeriodRule type="morning1" from="4:00" before="11:00"/> <!-- сутринта -->
-			<dayPeriodRule type="morning2" from="11:00" before="14:00"/> <!-- на обяд -->
-			<dayPeriodRule type="afternoon1" from="14:00" before="18:00"/> <!-- следобяд -->
-			<dayPeriodRule type="evening1" from="18:00" before="22:00"/> <!-- вечерта -->
-			<dayPeriodRule type="night1" from="22:00" before="24:00"/> <!-- нощ -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="mk">
-			<dayPeriodRule type="night1" from="0:00" before="4:00"/> <!-- по полноќ -->
-			<dayPeriodRule type="morning1" from="4:00" before="10:00"/> <!-- наутро -->
-			<dayPeriodRule type="morning2" from="10:00" before="12:00"/> <!-- претпладне -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- попладне -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/> <!-- навечер -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="ru">
-			<dayPeriodRule type="night1" from="0:00" before="4:00"/> <!-- ночь -->
-			<dayPeriodRule type="morning1" from="4:00" before="12:00"/> <!-- утро -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- день -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/> <!-- вечер -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="uk">
-			<dayPeriodRule type="night1" from="0:00" before="4:00"/> <!-- ніч -->
-			<dayPeriodRule type="morning1" from="4:00" before="12:00"/> <!-- ранок -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- день -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/> <!-- вечір -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="lt">
-			<dayPeriodRule type="night1" from="0:00" before="6:00"/> <!-- naktis -->
-			<dayPeriodRule type="morning1" from="6:00" before="12:00"/> <!-- rytas -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- diena -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/> <!-- vakaras -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="lv">
-			<dayPeriodRule type="night1" from="0:00" before="6:00"/> <!-- nakts -->
-			<dayPeriodRule type="morning1" from="6:00" before="12:00"/> <!-- rīts -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- pēcpusdiena -->
-			<dayPeriodRule type="evening1" from="18:00" before="23:00"/> <!-- vakars -->
-			<dayPeriodRule type="night1" from="23:00" before="24:00"/> <!-- nakts -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="el">
-			<dayPeriodRule type="night1" from="0:00" before="4:00"/> <!-- βράδυ -->
-			<dayPeriodRule type="morning1" from="4:00" before="12:00"/> <!-- πρωί -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="17:00"/> <!-- μεσημέρι -->
-			<dayPeriodRule type="evening1" from="17:00" before="20:00"/> <!-- απόγευμα -->
-			<dayPeriodRule type="night1" from="20:00" before="24:00"/> <!-- βράδυ -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="fa">
-			<dayPeriodRule type="night1" from="0:00" before="4:00"/> <!-- شب -->
-			<dayPeriodRule type="morning1" from="4:00" before="12:00"/> <!-- صبح -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="17:00"/> <!-- بعد از ظهر -->
-			<dayPeriodRule type="evening1" from="17:00" before="19:00"/> <!-- عصر -->
-			<dayPeriodRule type="night1" from="19:00" before="24:00"/> <!-- شب -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="hy">
-			<dayPeriodRule type="night1" from="0:00" before="6:00"/> <!-- գիշեր -->
-			<dayPeriodRule type="morning1" from="6:00" before="12:00"/> <!-- առավոտ -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- ցերեկ -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/> <!-- երեկո -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="ka">
-			<dayPeriodRule type="night1" from="0:00" before="5:00"/> <!-- ღამე -->
-			<dayPeriodRule type="morning1" from="5:00" before="12:00"/> <!-- დილა -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- ნაშუადღევი -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/> <!-- საღამო -->
-			<dayPeriodRule type="night1" from="21:00" before="24:00"/> <!-- ღამე -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="sq">
-			<dayPeriodRule type="night1" from="0:00" before="4:00"/> <!-- natë -->
-			<dayPeriodRule type="morning1" from="4:00" before="9:00"/> <!-- mëngjes -->
-			<dayPeriodRule type="morning2" from="9:00" before="12:00"/> <!-- paradite -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- pasdite -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/> <!-- mbrëmje -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="ur">
-			<dayPeriodRule type="night1" from="0:00" before="4:00"/> <!-- رات -->
-			<dayPeriodRule type="morning1" from="4:00" before="12:00"/> <!-- صبح -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/> <!-- دوپہر -->
-			<dayPeriodRule type="afternoon2" from="16:00" before="18:00"/> <!-- سہ پہر -->
-			<dayPeriodRule type="evening1" from="18:00" before="20:00"/> <!-- شام -->
-			<dayPeriodRule type="night1" from="20:00" before="24:00"/> <!-- رات -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="hi">
-			<dayPeriodRule type="night1" from="0:00" before="4:00"/> <!-- रात -->
-			<dayPeriodRule type="morning1" from="4:00" before="12:00"/> <!-- सुबह -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/> <!-- दोपहर -->
-			<dayPeriodRule type="evening1" from="16:00" before="20:00"/> <!-- शाम -->
-			<dayPeriodRule type="night1" from="20:00" before="24:00"/> <!-- रात -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="bn">
-			<dayPeriodRule type="night1" from="0:00" before="4:00"/> <!-- রাত্রি -->
-			<dayPeriodRule type="morning1" from="4:00" before="6:00"/> <!-- ভোর -->
-			<dayPeriodRule type="morning2" from="6:00" before="12:00"/> <!-- সকাল -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/> <!-- দুপুর -->
-			<dayPeriodRule type="afternoon2" from="16:00" before="18:00"/> <!-- বিকাল -->
-			<dayPeriodRule type="evening1" from="18:00" before="20:00"/> <!-- সন্ধ্যা -->
-			<dayPeriodRule type="night1" from="20:00" before="24:00"/> <!-- রাত্রি -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="gu">
-			<dayPeriodRule type="night1" from="0:00" before="4:00"/> <!-- રાત -->
-			<dayPeriodRule type="morning1" from="4:00" before="12:00"/> <!-- સવાર -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/> <!-- બપોર -->
-			<dayPeriodRule type="evening1" from="16:00" before="20:00"/> <!-- સાંજ -->
-			<dayPeriodRule type="night1" from="20:00" before="24:00"/> <!-- રાત -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="mr">
-			<dayPeriodRule type="night1" from="0:00" before="3:00"/> <!-- रात्री -->
-			<dayPeriodRule type="night2" from="3:00" before="4:00"/> <!-- रात्र -->
-			<dayPeriodRule type="morning1" from="4:00" before="6:00"/> <!-- पहाटे -->
-			<dayPeriodRule type="morning2" from="6:00" before="12:00"/> <!-- सकाळी -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/> <!-- दुपारी -->
-			<dayPeriodRule type="evening1" from="16:00" before="20:00"/> <!-- संध्याकाळी -->
-			<dayPeriodRule type="night1" from="20:00" before="24:00"/> <!-- रात्री -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="ne">
-			<dayPeriodRule type="night1" from="0:00" before="4:00"/> <!-- रात -->
-			<dayPeriodRule type="morning1" from="4:00" before="12:00"/> <!-- विहान -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/> <!-- अपरान्ह -->
-			<dayPeriodRule type="afternoon2" from="16:00" before="19:00"/> <!-- साँझ -->
-			<dayPeriodRule type="evening1" from="19:00" before="22:00"/> <!-- बेलुका -->
-			<dayPeriodRule type="night1" from="22:00" before="24:00"/> <!-- रात -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="pa">
-			<dayPeriodRule type="night1" from="0:00" before="4:00"/> <!-- ਰਾਤ -->
-			<dayPeriodRule type="morning1" from="4:00" before="12:00"/> <!-- ਸਵੇਰ -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/> <!-- ਦੁਪਹਿਰ -->
-			<dayPeriodRule type="evening1" from="16:00" before="21:00"/> <!-- ਸ਼ਾਮ -->
-			<dayPeriodRule type="night1" from="21:00" before="24:00"/> <!-- ਰਾਤ -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="si">
-			<dayPeriodRule type="night2" from="0:00" before="1:00"/> <!-- මැදියමට පසු -->
-			<dayPeriodRule type="morning1" from="1:00" before="6:00"/> <!-- පාන්දර -->
-			<dayPeriodRule type="morning2" from="6:00" before="12:00"/> <!-- උදේ -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="14:00"/> <!-- දවල් -->
-			<dayPeriodRule type="evening1" from="14:00" before="18:00"/> <!-- හවස -->
-			<dayPeriodRule type="night1" from="18:00" before="24:00"/> <!-- රෑ -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="ta">
-			<dayPeriodRule type="night1" from="0:00" before="3:00"/> <!-- இரவு -->
-			<dayPeriodRule type="morning1" from="3:00" before="5:00"/> <!-- அதிகாலை -->
-			<dayPeriodRule type="morning2" from="5:00" before="12:00"/> <!-- காலை -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="14:00"/> <!-- மதியம் -->
-			<dayPeriodRule type="afternoon2" from="14:00" before="16:00"/> <!-- பிற்பகல் -->
-			<dayPeriodRule type="evening1" from="16:00" before="18:00"/> <!-- மாலை -->
-			<dayPeriodRule type="evening2" from="18:00" before="21:00"/> <!-- அந்தி மாலை -->
-			<dayPeriodRule type="night1" from="21:00" before="24:00"/> <!-- இரவு -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="te">
-			<dayPeriodRule type="night1" from="0:00" before="6:00"/> <!-- రాత్రి -->
-			<dayPeriodRule type="morning1" from="6:00" before="12:00"/> <!-- ఉదయం -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- మధ్యాహ్నం -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/> <!-- సాయంత్రం -->
-			<dayPeriodRule type="night1" from="21:00" before="24:00"/> <!-- రాత్రి -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="ml">
-			<dayPeriodRule type="night1" from="0:00" before="3:00"/> <!-- രാത്രി -->
-			<dayPeriodRule type="morning1" from="3:00" before="6:00"/> <!-- പുലർച്ചെ -->
-			<dayPeriodRule type="morning2" from="6:00" before="12:00"/> <!-- രാവിലെ -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="14:00"/> <!-- ഉച്ചയ്ക്ക് -->
-			<dayPeriodRule type="afternoon2" from="14:00" before="15:00"/> <!-- ഉച്ചതിരിഞ്ഞ് -->
-			<dayPeriodRule type="evening1" from="15:00" before="18:00"/> <!-- വൈകുന്നേരം -->
-			<dayPeriodRule type="evening2" from="18:00" before="19:00"/> <!-- സന്ധ്യയ്ക്ക് -->
-			<dayPeriodRule type="night1" from="19:00" before="24:00"/> <!-- രാത്രി -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="kn">
-			<dayPeriodRule type="night1" from="0:00" before="6:00"/> <!-- ರಾತ್ರಿ -->
-			<dayPeriodRule type="morning1" from="6:00" before="12:00"/> <!-- ಬೆಳಗ್ಗೆ -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- ಮಧ್ಯಾಹ್ನ -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/> <!-- ಸಂಜೆ -->
-			<dayPeriodRule type="night1" from="21:00" before="24:00"/> <!-- ರಾತ್ರಿ -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="zh">
-			<dayPeriodRule type="night1" from="0:00" before="5:00"/> <!-- 凌晨 -->
-			<dayPeriodRule type="morning1" from="5:00" before="8:00"/> <!-- 早上 -->
-			<dayPeriodRule type="morning2" from="8:00" before="12:00"/> <!-- 上午 -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="13:00"/> <!-- 中午 -->
-			<dayPeriodRule type="afternoon2" from="13:00" before="19:00"/> <!-- 下午 -->
-			<dayPeriodRule type="evening1" from="19:00" before="24:00"/> <!-- 晚上 -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="ja">
-			<dayPeriodRule type="night2" from="0:00" before="4:00"/> <!-- 夜中 -->
-			<dayPeriodRule type="morning1" from="4:00" before="12:00"/> <!-- 朝 -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/> <!-- 昼 -->
-			<dayPeriodRule type="evening1" from="16:00" before="19:00"/> <!-- 夕方 -->
-			<dayPeriodRule type="night1" from="19:00" before="23:00"/> <!-- 夜 -->
-			<dayPeriodRule type="night2" from="23:00" before="24:00"/> <!-- 夜中 -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="ko">
-			<dayPeriodRule type="night1" from="0:00" before="3:00"/> <!-- 밤 -->
-			<dayPeriodRule type="morning1" from="3:00" before="6:00"/> <!-- 새벽 -->
-			<dayPeriodRule type="morning2" from="6:00" before="12:00"/> <!-- 오전 -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- 오후 -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/> <!-- 저녁 -->
-			<dayPeriodRule type="night1" from="21:00" before="24:00"/> <!-- 밤 -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="tr">
-			<dayPeriodRule type="night1" from="0:00" before="6:00"/> <!-- gece -->
-			<dayPeriodRule type="morning1" from="6:00" before="11:00"/> <!-- sabah -->
-			<dayPeriodRule type="morning2" from="11:00" before="12:00"/> <!-- öğleden önce -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- öğleden sonra -->
-			<dayPeriodRule type="afternoon2" from="18:00" before="19:00"/> <!-- akşamüstü -->
-			<dayPeriodRule type="evening1" from="19:00" before="21:00"/> <!-- akşam -->
-			<dayPeriodRule type="night1" from="21:00" before="24:00"/> <!-- gece -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="az">
-			<dayPeriodRule type="night2" from="0:00" before="4:00"/> <!-- gecə -->
-			<dayPeriodRule type="morning1" from="4:00" before="6:00"/> <!-- sübh -->
-			<dayPeriodRule type="morning2" from="6:00" before="12:00"/> <!-- səhər -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="17:00"/> <!-- gündüz -->
-			<dayPeriodRule type="evening1" from="17:00" before="19:00"/> <!-- axşamüstü -->
-			<dayPeriodRule type="night1" from="19:00" before="24:00"/> <!-- axşam -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="kk">
-			<dayPeriodRule type="night1" from="0:00" before="6:00"/> <!-- түн -->
-			<dayPeriodRule type="morning1" from="6:00" before="12:00"/> <!-- таң -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- түс -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/> <!-- кеш -->
-			<dayPeriodRule type="night1" from="21:00" before="24:00"/> <!-- түн -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="ky">
-			<dayPeriodRule type="night1" from="0:00" before="6:00"/> <!-- түн -->
-			<dayPeriodRule type="morning1" from="6:00" before="12:00"/> <!-- эртең менен -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- түштөн кийин -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/> <!-- кечкурун -->
-			<dayPeriodRule type="night1" from="21:00" before="24:00"/> <!-- түн -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="uz">
-			<dayPeriodRule type="night1" from="0:00" before="6:00"/> <!-- tun -->
-			<dayPeriodRule type="morning1" from="6:00" before="11:00"/> <!-- ertalab -->
-			<dayPeriodRule type="afternoon1" from="11:00" before="18:00"/> <!-- kunduzi -->
-			<dayPeriodRule type="evening1" from="18:00" before="22:00"/> <!-- kechqurun -->
-			<dayPeriodRule type="night1" from="22:00" before="24:00"/> <!-- tun -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="et">
-			<dayPeriodRule type="night1" from="0:00" before="5:00"/> <!-- öö -->
-			<dayPeriodRule type="morning1" from="5:00" before="12:00"/> <!-- hommik -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- pärastlõuna -->
-			<dayPeriodRule type="evening1" from="18:00" before="23:00"/> <!-- õhtu -->
-			<dayPeriodRule type="night1" from="23:00" before="24:00"/> <!-- öö -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="fi">
-			<dayPeriodRule type="night1" from="0:00" before="5:00"/> <!-- yö -->
-			<dayPeriodRule type="morning1" from="5:00" before="10:00"/> <!-- aamu -->
-			<dayPeriodRule type="morning2" from="10:00" before="12:00"/> <!-- aamupäivä -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- iltapäivä -->
-			<dayPeriodRule type="evening1" from="18:00" before="23:00"/> <!-- ilta -->
-			<dayPeriodRule type="night1" from="23:00" before="24:00"/> <!-- yö -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="hu">
-			<dayPeriodRule type="night1" from="0:00" before="4:00"/> <!-- éjjel -->
-			<dayPeriodRule type="night2" from="4:00" before="6:00"/> <!-- hajnal -->
-			<dayPeriodRule type="morning1" from="6:00" before="9:00"/> <!-- reggel -->
-			<dayPeriodRule type="morning2" from="9:00" before="12:00"/> <!-- délelőtt -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- délután -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/> <!-- este -->
-			<dayPeriodRule type="night1" from="21:00" before="24:00"/> <!-- éjjel -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="th">
-			<dayPeriodRule type="night1" from="0:00" before="6:00"/> <!-- กลางคืน -->
-			<dayPeriodRule type="morning1" from="6:00" before="12:00"/> <!-- เช้า -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="13:00"/> <!-- เที่ยง -->
-			<dayPeriodRule type="afternoon2" from="13:00" before="16:00"/> <!-- บ่าย -->
-			<dayPeriodRule type="evening1" from="16:00" before="18:00"/> <!-- เย็น -->
-			<dayPeriodRule type="evening2" from="18:00" before="21:00"/> <!-- ค่ำ -->
-			<dayPeriodRule type="night1" from="21:00" before="24:00"/> <!-- กลางคืน -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="lo">
-			<dayPeriodRule type="night1" from="0:00" before="5:00"/> <!-- ​ກາງ​ຄືນ -->
-			<dayPeriodRule type="morning1" from="5:00" before="12:00"/> <!-- ​ເຊົ້າ -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/> <!-- ສວຍ -->
-			<dayPeriodRule type="evening1" from="16:00" before="17:00"/> <!-- ແລງ -->
-			<dayPeriodRule type="evening2" from="17:00" before="20:00"/> <!-- ​ແລງ -->
-			<dayPeriodRule type="night1" from="20:00" before="24:00"/> <!-- ​ກາງ​ຄືນ -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="ar">
-			<dayPeriodRule type="night1" from="0:00" before="1:00"/> <!-- منتصف الليل -->
-			<dayPeriodRule type="night2" from="1:00" before="3:00"/> <!-- ليلا -->
-			<dayPeriodRule type="morning1" from="3:00" before="6:00"/> <!-- فجرا -->
-			<dayPeriodRule type="morning2" from="6:00" before="12:00"/> <!-- صباحا -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="13:00"/> <!-- ظهرا -->
-			<dayPeriodRule type="afternoon2" from="13:00" before="18:00"/> <!-- بعد الظهر -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/> <!-- مساء -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="he">
-			<dayPeriodRule type="night1" from="0:00" before="5:00"/> <!-- לילה -->
-			<dayPeriodRule type="morning1" from="5:00" before="11:00"/> <!-- בוקר -->
-			<dayPeriodRule type="afternoon1" from="11:00" before="15:00"/> <!-- צהריים -->
-			<dayPeriodRule type="afternoon2" from="15:00" before="18:00"/> <!-- אחר הצהריים -->
-			<dayPeriodRule type="evening1" from="18:00" before="22:00"/> <!-- ערב -->
-			<dayPeriodRule type="night1" from="22:00" before="24:00"/> <!-- לילה -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="id">
-			<dayPeriodRule type="morning1" from="0:00" before="10:00"/> <!-- pagi -->
-			<dayPeriodRule type="afternoon1" from="10:00" before="15:00"/> <!-- siang -->
-			<dayPeriodRule type="evening1" from="15:00" before="18:00"/> <!-- sore -->
-			<dayPeriodRule type="night1" from="18:00" before="24:00"/> <!-- malam -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="ms">
-			<dayPeriodRule type="morning1" from="0:00" before="1:00"/> <!-- tengah malam -->
-			<dayPeriodRule type="morning2" from="1:00" before="12:00"/> <!-- pagi -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="14:00"/> <!-- tengah hari -->
-			<dayPeriodRule type="evening1" from="14:00" before="19:00"/> <!-- petang -->
-			<dayPeriodRule type="night1" from="19:00" before="24:00"/> <!-- malam -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="fil">
-			<dayPeriodRule type="morning1" from="0:00" before="6:00"/> <!-- madaling-araw -->
-			<dayPeriodRule type="morning2" from="6:00" before="12:00"/> <!-- umaga -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/> <!-- tanghali -->
-			<dayPeriodRule type="evening1" from="16:00" before="18:00"/> <!-- hapon -->
-			<dayPeriodRule type="night1" from="18:00" before="24:00"/> <!-- gabi -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="vi">
-			<dayPeriodRule type="night1" from="0:00" before="4:00"/> <!-- đêm -->
-			<dayPeriodRule type="morning1" from="4:00" before="12:00"/> <!-- sáng -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- chiều -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/> <!-- tối -->
-			<dayPeriodRule type="night1" from="21:00" before="24:00"/> <!-- đêm -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="km">
-			<dayPeriodRule type="morning1" from="0:00" before="12:00"/> <!-- ព្រឹក -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- រសៀល -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/> <!-- ល្ងាច -->
-			<dayPeriodRule type="night1" from="21:00" before="24:00"/> <!-- យប់ -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="sw">
-			<dayPeriodRule type="night1" from="0:00" before="4:00"/> <!-- usiku -->
-			<dayPeriodRule type="morning1" from="4:00" before="7:00"/> <!-- alfajiri -->
-			<dayPeriodRule type="morning2" from="7:00" before="12:00"/> <!-- asubuhi -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/> <!-- mchana -->
-			<dayPeriodRule type="evening1" from="16:00" before="19:00"/> <!-- jioni -->
-			<dayPeriodRule type="night1" from="19:00" before="24:00"/> <!-- usiku -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="zu">
-			<dayPeriodRule type="morning1" from="0:00" before="6:00"/> <!-- ntathakusa -->
-			<dayPeriodRule type="morning2" from="6:00" before="10:00"/> <!-- ekuseni -->
-			<dayPeriodRule type="afternoon1" from="10:00" before="13:00"/> <!-- emini -->
-			<dayPeriodRule type="evening1" from="13:00" before="19:00"/> <!-- ntambama -->
-			<dayPeriodRule type="night1" from="19:00" before="24:00"/> <!-- ebusuku -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="am">
-			<dayPeriodRule type="night1" from="0:00" before="6:00"/> <!-- ሌሊት -->
-			<dayPeriodRule type="morning1" from="6:00" before="12:00"/> <!-- ጥዋት -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- ከሰዓት በኋላ -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/> <!-- ማታ -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="eu">
-			<dayPeriodRule type="morning1" from="0:00" before="6:00"/> <!-- goizaldea -->
-			<dayPeriodRule type="morning2" from="6:00" before="12:00"/> <!-- goiza -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="14:00"/> <!-- eguerdia -->
-			<dayPeriodRule type="afternoon2" from="14:00" before="19:00"/> <!-- arratsaldea -->
-			<dayPeriodRule type="evening1" from="19:00" before="21:00"/> <!-- iluntzea -->
-			<dayPeriodRule type="night1" from="21:00" before="24:00"/> <!-- gaua -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="mn">
-			<dayPeriodRule type="night1" from="0:00" before="6:00"/> <!-- шөнө -->
-			<dayPeriodRule type="morning1" from="6:00" before="12:00"/> <!-- өглөө -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- өдөр -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/> <!-- орой -->
-			<dayPeriodRule type="night1" from="21:00" before="24:00"/> <!-- шөнө -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="my">
-			<dayPeriodRule type="morning1" from="0:00" before="12:00"/> <!-- နံနက် -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/> <!-- နေ့လည် -->
-			<dayPeriodRule type="evening1" from="16:00" before="19:00"/> <!-- ညနေ -->
-			<dayPeriodRule type="night1" from="19:00" before="24:00"/> <!-- ည -->
-		</dayPeriodRules>
-	</dayPeriodRuleSet>
-</supplementalData>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/postalCodeData.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/postalCodeData.xml
deleted file mode 100644
index 19b7d1f2f15..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/postalCodeData.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.dtd">
-<!--
-Copyright © 1991-2013 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<supplementalData>
-    <version number="$Revision: 11261 $"/>
-    <generation date="$Date: 2015-02-19 07:40:36 -0600 (Thu, 19 Feb 2015) $"/>
-    		<!-- Deprecated in v27.  Please see other services that are kept up to date, such as:
-    ​			http://i18napis.appspot.com/address/data/US
-​				http://i18napis.appspot.com/address/data/GB
-				...
-			-->
-	      <postalCodeData>
-            <postCodeRegex territoryId="GB" >GIR[ ]?0AA|((AB|AL|B|BA|BB|BD|BH|BL|BN|BR|BS|BT|CA|CB|CF|CH|CM|CO|CR|CT|CV|CW|DA|DD|DE|DG|DH|DL|DN|DT|DY|E|EC|EH|EN|EX|FK|FY|G|GL|GY|GU|HA|HD|HG|HP|HR|HS|HU|HX|IG|IM|IP|IV|JE|KA|KT|KW|KY|L|LA|LD|LE|LL|LN|LS|LU|M|ME|MK|ML|N|NE|NG|NN|NP|NR|NW|OL|OX|PA|PE|PH|PL|PO|PR|RG|RH|RM|S|SA|SE|SG|SK|SL|SM|SN|SO|SP|SR|SS|ST|SW|SY|TA|TD|TF|TN|TQ|TR|TS|TW|UB|W|WA|WC|WD|WF|WN|WR|WS|WV|YO|ZE)(\d[\dA-Z]?[ ]?\d[ABD-HJLN-UW-Z]{2}))|BFPO[ ]?\d{1,4}</postCodeRegex>
-            <postCodeRegex territoryId="JE" >JE\d[\dA-Z]?[ ]?\d[ABD-HJLN-UW-Z]{2}</postCodeRegex>
-            <postCodeRegex territoryId="GG" >GY\d[\dA-Z]?[ ]?\d[ABD-HJLN-UW-Z]{2}</postCodeRegex>
-            <postCodeRegex territoryId="IM" >IM\d[\dA-Z]?[ ]?\d[ABD-HJLN-UW-Z]{2}</postCodeRegex>
-            <postCodeRegex territoryId="US" >\d{5}([ \-]\d{4})?</postCodeRegex>
-            <postCodeRegex territoryId="CA" >[ABCEGHJKLMNPRSTVXY]\d[ABCEGHJ-NPRSTV-Z][ ]?\d[ABCEGHJ-NPRSTV-Z]\d</postCodeRegex>
-            <postCodeRegex territoryId="DE" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="JP" >\d{3}-\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="FR" >\d{2}[ ]?\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="AU" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="IT" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="CH" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="AT" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="ES" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="NL" >\d{4}[ ]?[A-Z]{2}</postCodeRegex>
-            <postCodeRegex territoryId="BE" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="DK" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="SE" >\d{3}[ ]?\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="NO" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="BR" >\d{5}[\-]?\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="PT" >\d{4}([\-]\d{3})?</postCodeRegex>
-            <postCodeRegex territoryId="FI" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="AX" >22\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="KR" >\d{3}[\-]\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="CN" >\d{6}</postCodeRegex>
-            <postCodeRegex territoryId="TW" >\d{3}(\d{2})?</postCodeRegex>
-            <postCodeRegex territoryId="SG" >\d{6}</postCodeRegex>
-            <postCodeRegex territoryId="DZ" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="AD" >AD\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="AR" >([A-HJ-NP-Z])?\d{4}([A-Z]{3})?</postCodeRegex>
-            <postCodeRegex territoryId="AM" >(37)?\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="AZ" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="BH" >((1[0-2]|[2-9])\d{2})?</postCodeRegex>
-            <postCodeRegex territoryId="BD" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="BB" >(BB\d{5})?</postCodeRegex>
-            <postCodeRegex territoryId="BY" >\d{6}</postCodeRegex>
-            <postCodeRegex territoryId="BM" >[A-Z]{2}[ ]?[A-Z0-9]{2}</postCodeRegex>
-            <postCodeRegex territoryId="BA" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="IO" >BBND 1ZZ</postCodeRegex>
-            <postCodeRegex territoryId="BN" >[A-Z]{2}[ ]?\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="BG" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="KH" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="CV" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="CL" >\d{7}</postCodeRegex>
-            <postCodeRegex territoryId="CR" >\d{4,5}|\d{3}-\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="HR" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="CY" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="CZ" >\d{3}[ ]?\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="DO" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="EC" >([A-Z]\d{4}[A-Z]|(?:[A-Z]{2})?\d{6})?</postCodeRegex>
-            <postCodeRegex territoryId="EG" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="EE" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="FO" >\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="GE" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="GR" >\d{3}[ ]?\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="GL" >39\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="GT" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="HT" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="HN" >(?:\d{5})?</postCodeRegex>
-            <postCodeRegex territoryId="HU" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="IS" >\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="IN" >\d{6}</postCodeRegex>
-            <postCodeRegex territoryId="ID" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="IL" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="JO" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="KZ" >\d{6}</postCodeRegex>
-            <postCodeRegex territoryId="KE" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="KW" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="LA" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="LV" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="LB" >(\d{4}([ ]?\d{4})?)?</postCodeRegex>
-            <postCodeRegex territoryId="LI" >(948[5-9])|(949[0-7])</postCodeRegex>
-            <postCodeRegex territoryId="LT" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="LU" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="MK" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="MY" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="MV" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="MT" >[A-Z]{3}[ ]?\d{2,4}</postCodeRegex>
-            <postCodeRegex territoryId="MU" >(\d{3}[A-Z]{2}\d{3})?</postCodeRegex>
-            <postCodeRegex territoryId="MX" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="MD" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="MC" >980\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="MA" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="NP" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="NZ" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="NI" >((\d{4}-)?\d{3}-\d{3}(-\d{1})?)?</postCodeRegex>
-            <postCodeRegex territoryId="NG" >(\d{6})?</postCodeRegex>
-            <postCodeRegex territoryId="OM" >(PC )?\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="PK" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="PY" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="PH" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="PL" >\d{2}-\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="PR" >00[679]\d{2}([ \-]\d{4})?</postCodeRegex>
-            <postCodeRegex territoryId="RO" >\d{6}</postCodeRegex>
-            <postCodeRegex territoryId="RU" >\d{6}</postCodeRegex>
-            <postCodeRegex territoryId="SM" >4789\d</postCodeRegex>
-            <postCodeRegex territoryId="SA" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="SN" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="SK" >\d{3}[ ]?\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="SI" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="ZA" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="LK" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="TJ" >\d{6}</postCodeRegex>
-            <postCodeRegex territoryId="TH" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="TN" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="TR" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="TM" >\d{6}</postCodeRegex>
-            <postCodeRegex territoryId="UA" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="UY" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="UZ" >\d{6}</postCodeRegex>
-            <postCodeRegex territoryId="VA" >00120</postCodeRegex>
-            <postCodeRegex territoryId="VE" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="ZM" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="AS" >96799</postCodeRegex>
-            <postCodeRegex territoryId="CC" >6799</postCodeRegex>
-            <postCodeRegex territoryId="CK" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="RS" >\d{6}</postCodeRegex>
-            <postCodeRegex territoryId="ME" >8\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="CS" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="YU" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="CX" >6798</postCodeRegex>
-            <postCodeRegex territoryId="ET" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="FK" >FIQQ 1ZZ</postCodeRegex>
-            <postCodeRegex territoryId="NF" >2899</postCodeRegex>
-            <postCodeRegex territoryId="FM" >(9694[1-4])([ \-]\d{4})?</postCodeRegex>
-            <postCodeRegex territoryId="GF" >9[78]3\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="GN" >\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="GP" >9[78][01]\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="GS" >SIQQ 1ZZ</postCodeRegex>
-            <postCodeRegex territoryId="GU" >969[123]\d([ \-]\d{4})?</postCodeRegex>
-            <postCodeRegex territoryId="GW" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="HM" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="IQ" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="KG" >\d{6}</postCodeRegex>
-            <postCodeRegex territoryId="LR" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="LS" >\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="MG" >\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="MH" >969[67]\d([ \-]\d{4})?</postCodeRegex>
-            <postCodeRegex territoryId="MN" >\d{6}</postCodeRegex>
-            <postCodeRegex territoryId="MP" >9695[012]([ \-]\d{4})?</postCodeRegex>
-            <postCodeRegex territoryId="MQ" >9[78]2\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="NC" >988\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="NE" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="VI" >008(([0-4]\d)|(5[01]))([ \-]\d{4})?</postCodeRegex>
-            <postCodeRegex territoryId="PF" >987\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="PG" >\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="PM" >9[78]5\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="PN" >PCRN 1ZZ</postCodeRegex>
-            <postCodeRegex territoryId="PW" >96940</postCodeRegex>
-            <postCodeRegex territoryId="RE" >9[78]4\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="SH" >(ASCN|STHL) 1ZZ</postCodeRegex>
-            <postCodeRegex territoryId="SJ" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="SO" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="SZ" >[HLMS]\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="TC" >TKCA 1ZZ</postCodeRegex>
-            <postCodeRegex territoryId="WF" >986\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="XK" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="YT" >976\d{2}</postCodeRegex>
-        </postalCodeData>
-</supplementalData>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/supplementalMetadata.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/supplementalMetadata.xml
deleted file mode 100644
index cbb6287af1a..00000000000
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/supplementalMetadata.xml
+++ /dev/null
@@ -1,1963 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.dtd">
-<!--
-Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-
-<supplementalData>
-    <version number="$Revision: 11344 $"/>
-    <generation date="$Date: 2015-03-05 00:02:16 -0600 (Thu, 05 Mar 2015) $"/>
-    <metadata>
-        <attributeOrder>
-_q type id choice key registry source target path day date version count lines characters before from to iso4217 mzone number time casing list uri digits rounding iso3166 hex request direction alternate backwards caseFirst caseLevel hiraganaQuarternary hiraganaQuaternary maxVariable variableTop normalization numeric strength elements element attributes attribute attributeValue contains multizone order other replacement scripts services territories territory aliases tzidVersion value values variant variants visibility alpha3 code end exclude fips10 gdp internet literacyPercent locales population writingPercent populationPercent officialStatus start used otherVersion typeVersion access after allowsParsing at bcp47 decexp desired indexSource numberSystem numbers oneway ordering percent priority radix rules supported tender territoryId yeartype cldrVersion grouping inLanguage inScript inTerritory match parent private reason reorder status cashDigits cashRounding allowed override preferred regions paths votes validSubLocales standard references alt draft
-        </attributeOrder>
-        <elementOrder>
-ldml alternate approvalRequirement approvalRequirements attributeOrder attributes blockingItems calendarPreference calendarSystem casingData casingItem character character-fallback characterOrder codesByTerritory comment context coverageVariable coverageLevel cp dayPeriodRule dayPeriodRules deprecatedItems distinguishingItems elementOrder exception first_variable fractions hours identity indexSeparator compressedIndexSeparator indexRangePattern indexLabelBefore indexLabelAfter indexLabel info keyMap languageAlias languageCodes languageCoverage languageMatch languageMatches languagePopulation last_variable first_tertiary_ignorable last_tertiary_ignorable first_secondary_ignorable last_secondary_ignorable first_primary_ignorable last_primary_ignorable first_non_ignorable last_non_ignorable first_trailing last_trailing likelySubtag lineOrder mapKeys mapTypes mapZone numberingSystem parentLocale personList pluralRule pluralRules postCodeRegex primaryZone reference region scriptAlias scriptCoverage serialElements stopwordList substitute suppress suppression tRule telephoneCountryCode territoryAlias territoryCodes territoryCoverage currencyCodes  currencyCoverage timezone timezoneCoverage transform typeMap usesMetazone validity alias appendItem base beforeCurrency afterCurrency codePattern compoundUnit compoundUnitPattern contextTransform contextTransformUsage currencyMatch cyclicName cyclicNameContext cyclicNameSet cyclicNameWidth dateFormatItem day dayPeriod dayPeriodContext dayPeriodWidth defaultCollation defaultNumberingSystem deprecated distinguishing blocking coverageAdditions durationUnitPattern era eraNames eraAbbr eraNarrow exemplarCharacters ellipsis fallback field generic greatestDifference height hourFormat hoursFormat gmtFormat gmtZeroFormat intervalFormatFallback intervalFormatItem key listPattern listPatternPart localeDisplayNames layout contextTransforms localeDisplayPattern languages localePattern localeSeparator localeKeyTypePattern localizedPatternChars dateRangePattern calendars long measurementSystem measurementSystemName messages minDays firstDay month monthPattern monthPatternContext monthPatternWidth months monthNames monthAbbr monthPatterns days dayNames dayAbbr moreInformation native orientation inList inText otherNumberingSystems paperSize quarter quarters quotationStart quotationEnd alternateQuotationStart alternateQuotationEnd rbnfrule regionFormat fallbackFormat fallbackRegionFormat abbreviationFallback preferenceOrdering relativeTimePattern reset import p pc rule ruleset rulesetGrouping s sc scripts segmentation settings short commonlyUsed exemplarCity singleCountries default calendar collation currency currencyFormat currencySpacing currencyFormatLength dateFormat dateFormatLength dateTimeFormat dateTimeFormatLength availableFormats appendItems dayContext dayWidth decimalFormat decimalFormatLength intervalFormats monthContext monthWidth pattern displayName percentFormat percentFormatLength quarterContext quarterWidth relative relativeTime scientificFormat scientificFormatLength skipDefaultLocale defaultContent standard daylight stopwords indexLabels mapping suppress_contractions optimize cr rules surroundingMatch insertBetween symbol decimal group list percentSign nativeZeroDigit patternDigit plusSign minusSign exponential superscriptingExponent perMille infinity nan currencyDecimal currencyGroup symbols decimalFormats scientificFormats percentFormats currencyFormats currencies miscPatterns t tc q qc i ic extend territories timeFormat timeFormatLength traditional finance transformName type unit unitLength durationUnit unitPattern variable attributeValues variables segmentRules exceptions suppressions variantAlias variants keys types transformNames measurementSystemNames codePatterns version generation cldrVersion currencyData language script territory territoryContainment languageData territoryInfo postalCodeData calendarData calendarPreferenceData variant week am pm dayPeriods eras cyclicNameSets dateFormats timeFormats dateTimeFormats fields timeZoneNames weekData timeData measurementData timezoneData characters delimiters measurement dates numbers transforms units listPatterns collations posix segmentations rbnf metadata codeMappings parentLocales likelySubtags metazoneInfo mapTimezones plurals telephoneCodeData numberingSystems bcp47KeywordMappings gender references languageMatching dayPeriodRuleSet metaZones primaryZones weekendStart weekendEnd width windowsZones coverageLevels x yesstr nostr yesexpr noexpr zone metazone special zoneAlias zoneFormatting zoneItem supplementalData
-
-        </elementOrder>
-        <serialElements>
-            attributeValues attributes base comment context exception extend i ic languageMatch last_non_ignorable last_secondary_ignorable last_tertiary_ignorable optimize p pc pluralRule rbnfrule reset rules ruleset s sc settings substitute suppress_contractions suppression t tRule tc variable x
-        </serialElements>
-        <suppress>
-            <attributes attribute="_q"/>
-            <attributes element="collation" attribute="type" attributeValue="standard"/>
-            <attributes element="currency" attribute="type" attributeValue="standard"/>
-            <attributes element="dateFormat" attribute="type" attributeValue="standard"/>
-            <attributes element="dateTimeFormat" attribute="type" attributeValue="standard"/>
-            <attributes element="decimalFormat" attribute="type" attributeValue="standard"/>
-            <attributes element="ldml" attribute="version"/>
-            <attributes element="orientation" attribute="characters" attributeValue="left-to-right"/>
-            <attributes element="orientation" attribute="lines" attributeValue="top-to-bottom"/>
-            <attributes element="pattern" attribute="type" attributeValue="standard"/>
-            <attributes element="percentFormat" attribute="type" attributeValue="standard"/>
-            <attributes element="scientificFormat" attribute="type" attributeValue="standard"/>
-            <attributes element="timeFormat" attribute="type" attributeValue="standard"/>
-            <attributes element="weekendEnd" attribute="time" attributeValue="24:00"/>
-            <attributes element="weekendStart" attribute="time" attributeValue="00:00"/>
-        </suppress>
-        <validity>
-            <!-- BCP 47 contains many more language codes than we are interested in maintaining as a part of the CLDR --> 
-            <!-- This list contains ONLY those languages considered to be "of interest" as part of CLDR, --> 
-            <!-- and is maintained manually by the CLDR TC --> 
-            <variable id="$language" type="choice">
-                aa ab ace ach ada ady ae aeb af afh agq ain ak akk akz ale aln alt am an ang anp ar
-                arc arn aro arp arq arw ary arz as asa ase ast av avk awa ay az azb
-                ba bal ban bar bas bax bbc bbj bfd be bej bem bew bez bfq bg bho bi bik bin bjn bkm bla bm bn
-                bo bpy bqi br bra brh brx bs bss bua bug bum byn byv
-                ca cad car cay cch ce ceb cgg ch chb chg chk chm chn cho chp chr chy ckb
-                co cop cps cr crh cs csb cu cv cy
-                da dak dar dav de del den dgr din dje doi dsb dtp dua dum dv dyo dyu dz dzg
-                ebu ee efi egl egy eka el elx en enm eo es esu et eu ewo ext
-                fa fan fat ff fi fil fit fj fo fon fr frc frm fro frp frr frs fur fy
-                ga gaa gag gan gay gba gbz gd gez gil gl glk gmh gn goh gom gon gor got grb grc gsw gu guc gur guz gv gwi
-                ha hai hak haw he hi hif hil hit hmn ho hr hsb hsn ht hu hup hy hz
-                ia iba ibb id ie ig ii ik ilo inh io is it iu izh
-                ja jam jbo jgo jmc jpr jrb jut jv
-                ka kaa kab kac kaj kam kaw kbd kbl kcg kde kea ken kfo kg kgp kha kho khq khw ki kiu kj kk kkj
-                kl kln km kmb kn ko koi kok kos kpe kr krc kri krj krl kru ks ksb ksf ksh ku kum kut kv kw ky
-                la lad lag lah lam lb lez lfn lg li lij liv lkt lmo ln lo lol loz lt ltg lu lua lui lun luo lus luy lv lzh lzz
-                mad maf mag mai mak man mas mde mdf mdr men mer mfe mg mga mgh mgo mh mi mic min mk
-                ml mn mnc mni moh mos mr mrj ms mt mua mul mus mwl mwr mwv my mye myv mzn
-                na nan nap naq nb nd nds ne new ng nia niu njo nl nmg nn nnh no nog non nov nqo nr nso
-                nus nv nwc ny nym nyn nyo nzi
-                oc oj om or os osa ota
-                pa pag pal pam pap pau pcd pdc pdt peo pfl phn pi pl pms pnt pon prg pro ps pt
-                qu quc qug
-                raj rap rar rgn rif rm rn ro rof rom root rtm ru rue rug rup rw rwk
-                sa sad sah sam saq sas sat saz sba sbp sc scn sco sd sdc se see seh sei sel ses sg sga sgs
-                sh shi shn shu si sid sk sl sli sly sm sma smj smn sms sn snk so sog sq
-                sr srn srr ss ssy st stq su suk sus sux sv sw swb swc syc syr szl 
-                ta tcy te tem teo ter tet tg th ti tig tiv tk tkl tkr tl tlh tli tly tmh tn to tog tpi
-                tr tru trv ts tsd tsi tt ttt tum tvl tw twq ty tyv tzm
-                udm ug uga uk umb und ur uz
-                vai ve vec vep vi vls vmf vo vot vro vun
-                wa wae wal war was wo wuu
-                xal xh xmf xog
-                yao yap yav ybb yi yo yrl yue
-                za zap zbl zea zen zgh zh zu zun zxx zza
-            </variable>
-            <!-- start of data generated with CountItems tool per http://sites.google.com/site/cldr/development/updating-codes/update-languagescriptregion-subtags -->
-            <variable id="$grandfathered" type="choice">
-                art-lojban
-                cel-gaulish
-                en-GB-oed
-                i-ami i-bnn i-default i-enochian i-hak i-klingon i-lux i-mingo i-navajo i-pwn
-                i-tao i-tay i-tsu
-                no-bok no-nyn
-                sgn-BE-FR sgn-BE-NL sgn-CH-DE
-                zh-guoyu zh-hakka zh-min zh-min-nan zh-xiang
-            </variable>
-            <variable id="$territory" type="choice">
-                001 002 003 005 009 011 013 014 015 017 018 019 021 029 030 034 035 039 053 054
-                057 061
-                142 143 145 150 151 154 155
-                419
-                AC AD AE AF AG AI AL AM AO AQ AR AS AT AU AW AX AZ
-                BA BB BD BE BF BG BH BI BJ BL BM BN BO BQ BR BS BT BV BW BY BZ
-                CA CC CD CF CG CH CI CK CL CM CN CO CP CR CU CV CW CX CY CZ
-                DE DG DJ DK DM DO DZ
-                EA EC EE EG EH ER ES ET EU
-                FI FJ FK FM FO FR
-                GA GB GD GE GF GG GH GI GL GM GN GP GQ GR GS GT GU GW GY
-                HK HM HN HR HT HU
-                IC ID IE IL IM IN IO IQ IR IS IT
-                JE JM JO JP
-                KE KG KH KI KM KN KP KR KW KY KZ
-                LA LB LC LI LK LR LS LT LU LV LY
-                MA MC MD ME MF MG MH MK ML MM MN MO MP MQ MR MS MT MU MV MW MX MY MZ
-                NA NC NE NF NG NI NL NO NP NR NU NZ
-                OM
-                PA PE PF PG PH PK PL PM PN PR PS PT PW PY
-                QA QO
-                RE RO RS RU RW
-                SA SB SC SD SE SG SH SI SJ SK SL SM SN SO SR SS ST SV SX SY SZ
-                TA TC TD TF TG TH TJ TK TL TM TN TO TR TT TV TW TZ
-                UA UG UM US UY UZ
-                VA VC VE VG VI VN VU
-                WF WS
-                XK
-                YE YT
-                ZA ZM ZW ZZ
-            </variable>
-            <variable id="$script" type="choice">
-                Afak Aghb Arab Armi Armn Avst
-                Bali Bamu Bass Batk Beng Blis Bopo Brah Brai Bugi Buhd
-                Cakm Cans Cari Cham Cher Cirt Copt Cprt Cyrl Cyrs
-                Deva Dsrt Dupl
-                Egyd Egyh Egyp Elba Ethi
-                Geok Geor Glag Goth Gran Grek Gujr Guru
-                Hang Hani Hano Hans Hant Hebr Hira Hluw Hmng Hrkt Hung
-                Inds Ital
-                Java Jpan Jurc
-                Kali Kana Khar Khmr Khoj Knda Kore Kpel Kthi
-                Lana Laoo Latf Latg Latn Lepc Limb Lina Linb Lisu Loma Lyci Lydi
-                Mahj Mand Mani Maya Mend Merc Mero Mlym Modi Mong Moon Mroo Mtei Mymr
-                Narb Nbat Nkgb Nkoo Nshu
-                Ogam Olck Orkh Orya Osma
-                Palm Pauc Perm Phag Phli Phlp Phlv Phnx Plrd Prti
-                Qaaa Qaab Qaac Qaad Qaae Qaaf Qaag Qaah Qaaj Qaak Qaal Qaam Qaan Qaao Qaap Qaaq
-                Qaar Qaas Qaat Qaau Qaav Qaaw Qaax Qaay Qaaz Qaba Qabb Qabc Qabd Qabe Qabf Qabg
-                Qabh Qabi Qabj Qabk Qabl Qabm Qabn Qabo Qabp Qabq Qabr Qabs Qabt Qabu Qabv Qabw
-                Qabx
-                Rjng Roro Runr
-                Samr Sara Sarb Saur Sgnw Shaw Shrd Sidd Sind Sinh Sora Sund Sylo Syrc Syre Syrj
-                Syrn
-                Tagb Takr Tale Talu Taml Tang Tavt Telu Teng Tfng Tglg Thaa Thai Tibt Tirh
-                Ugar
-                Vaii Visp
-                Wara Wole
-                Xpeo Xsux
-                Yiii
-                Zinh Zmth Zsym Zxxx Zyyy Zzzz
-            </variable>
-            <variable id="$variant" type="choice">
-                1606NICT 1694ACAD 1901 1959ACAD 1994 1996
-                ALALC97 ALUKU AREVELA AREVMDA
-                BAKU1926 BALANKA BARLA BAUDDHA BISCAYAN BISKE BOHORIC BOONT
-                DAJNKO
-                EKAVSK EMODENG
-                FONIPA FONUPA FONXSAMP
-                HEPBURN HOGNORSK
-                IJEKAVSK ITIHASA
-                JAUER JYUTPING
-                KKCOR KOCIEWIE KSCOR
-                LAUKIKA LIPAW LUNA1918
-                METELKO MONOTON
-                NDYUKA NEDIS NJIVA NULIK
-                OSOJS
-                PAMAKA PETR1708 PINYIN POLYTON POSIX PUTER
-                REVISED RIGIK ROZAJ RUMGR
-                SAAHO SCOTLAND SCOUSE SOLBA SOTAV SURMIRAN SURSILV SUTSILV
-                TARASK
-                UCCOR UCRCOR ULSTER UNIFON
-                VAIDIKA VALENCIA VALLADER
-                WADEGILE
-            </variable>
-            <variable id="$calendar_XXX" type="choice">
-                buddhist
-                chinese coptic
-                dangi
-                ethioaa ethiopic ethiopic-amete-alem
-                gregorian gregory
-                hebrew
-                indian islamic islamic-civil islamic-rgsa islamic-tbla islamic-umalqura
-                islamicc iso8601
-                japanese
-                persian
-                roc
-            </variable>
-            <variable id="$collation_XXX" type="choice">
-                big5han
-                compat
-                dict dictionary direct ducet
-                emoji eor
-                gb2312 gb2312han
-                phonebk phonebook phonetic pinyin
-                reformed
-                search searchjl standard stroke
-                trad traditional
-                unihan
-                zhuyin
-            </variable>
-            <variable id="$currency_XXX" type="choice">
-                adp aed afa afn alk all amd ang aoa aok aon aor ara arl arm arp ars ats aud awg
-                azm azn
-                bad bam ban bbd bdt bec bef bel bgl bgm bgn bgo bhd bif bmd bnd bob bol bop bov
-                brb brc bre brl brn brr brz bsd btn buk bwp byb byr bzd
-                cad cdf che chf chw cle clf clp cnx cny cop cou crc csd csk cuc cup cve cyp czk
-                ddm dem djf dkk dop dzd
-                ecs ecv eek egp ern esa esb esp etb eur
-                fim fjd fkp frf
-                gbp gek gel ghc ghs gip gmd gnf gns gqe grd gtq gwe gwp gyd
-                hkd hnl hrd hrk htg huf
-                idr iep ilp ilr ils inr iqd irr isj isk itl
-                jmd jod jpy
-                kes kgs khr kmf kpw krh kro krw kwd kyd kzt
-                lak lbp lkr lrd lsl ltl ltt luc luf lul lvl lvr lyd
-                mad maf mcf mdc mdl mga mgf mkd mkn mlf mmk mnt mop mro mtl mtp mur mvp mvr mwk
-                mxn mxp mxv myr mze mzm mzn
-                nad ngn nic nio nlg nok npr nzd
-                omr
-                pab pei pen pes pgk php pkr pln plz pte pyg
-                qar
-                rhd rol ron rsd rub rur rwf
-                sar sbd scr sdd sdg sdp sek sgd shp sit skk sll sos srd srg ssp std sur svc syp
-                szl
-                thb tjr tjs tmm tmt tnd top tpe trl try ttd twd tzs
-                uah uak ugs ugx usd usn uss uyi uyp uyu uzs
-                veb vef vnd vnn vuv
-                wst
-                xaf xag xau xba xbb xbc xbd xcd xdr xeu xfo xfu xof xpd xpf xpt xre xsu xts xua
-                xxx
-                ydd yer yud yum yun yur
-                zal zar zmk zmw zrn zrz zwd zwl zwr
-            </variable>
-            <variable id="$i0_XXX" type="choice">
-                handwrit
-                pinyin
-                und
-                wubi
-            </variable>
-            <variable id="$k0_XXX" type="choice">
-                101key 102key
-                600dpi
-                768dpi
-                android azerty
-                chromeos colemak
-                dvorak dvorakl dvorakr
-                el220 el319 extended
-                googlevk
-                isiri
-                legacy lt1205 lt1582
-                nutaaq
-                osx
-                patta
-                qwerty qwertz
-                ta99
-                und
-                var viqr
-                windows
-            </variable>
-            <variable id="$colAlternate_XXX" type="choice">
-                noignore non-ignorable
-                shifted
-            </variable>
-            <variable id="$colBackwards_XXX" type="choice">
-                false
-                no
-                true
-                yes
-            </variable>
-            <variable id="$colCaseLevel_XXX" type="choice">
-                false
-                no
-                true
-                yes
-            </variable>
-            <variable id="$colCaseFirst_XXX" type="choice">
-                false
-                lower
-                no
-                upper
-            </variable>
-            <variable id="$colHiraganaQuaternary_XXX" type="choice">
-                false
-                no
-                true
-                yes
-            </variable>
-            <variable id="$colNormalization_XXX" type="choice">
-                false
-                no
-                true
-                yes
-            </variable>
-            <variable id="$colNumeric_XXX" type="choice">
-                false
-                no
-                true
-                yes
-            </variable>
-            <variable id="$colReorder_XXX" type="choice">
-                REORDER_CODE
-            </variable>
-            <variable id="$colStrength_XXX" type="choice">
-                identic identical
-                level1 level2 level3 level4
-                primary
-                quarternary quaternary
-                secondary
-                tertiary
-            </variable>
-            <variable id="$kv_XXX" type="choice">
-                currency
-                punct
-                space symbol
-            </variable>
-            <variable id="$lb_XXX" type="choice">
-                loose
-                normal
-                strict
-            </variable>
-            <variable id="$m0_XXX" type="choice">
-                alaloc
-                bgn buckwalt
-                din
-                gost
-                iso
-                mcst
-                satts
-                ungegn
-            </variable>
-            <variable id="$numbers_XXX" type="choice">
-                arab arabext armn armnlow
-                bali beng brah
-                cakm cham
-                deva
-                ethi
-                finance fullwide
-                geor grek greklow gujr guru
-                hanidays hanidec hans hansfin hant hantfin hebr
-                java jpan jpanfin
-                kali khmr knda
-                lana lanatham laoo latn lepc limb
-                mlym mong mtei mymr mymrshan
-                native nkoo
-                olck orya osma
-                roman romanlow
-                saur shrd sora sund
-                takr talu taml tamldec telu thai tibt traditio traditional
-                vaii
-            </variable>
-            <variable id="$t0_XXX" type="choice">
-                und
-            </variable>
-            <variable id="$timezone_XXX" type="choice">
-                adalv aedxb afkbl Africa/Abidjan Africa/Accra Africa/Addis_Ababa Africa/Algiers
-                Africa/Asmara Africa/Asmera Africa/Bamako Africa/Bangui Africa/Banjul
-                Africa/Bissau Africa/Blantyre Africa/Brazzaville Africa/Bujumbura Africa/Cairo
-                Africa/Casablanca Africa/Ceuta Africa/Conakry Africa/Dakar Africa/Dar_es_Salaam
-                Africa/Djibouti Africa/Douala Africa/El_Aaiun Africa/Freetown Africa/Gaborone
-                Africa/Harare Africa/Johannesburg Africa/Juba Africa/Kampala Africa/Khartoum
-                Africa/Kigali Africa/Kinshasa Africa/Lagos Africa/Libreville Africa/Lome
-                Africa/Luanda Africa/Lubumbashi Africa/Lusaka Africa/Malabo Africa/Maputo
-                Africa/Maseru Africa/Mbabane Africa/Mogadishu Africa/Monrovia Africa/Nairobi
-                Africa/Ndjamena Africa/Niamey Africa/Nouakchott Africa/Ouagadougou
-                Africa/Porto-Novo Africa/Sao_Tome Africa/Timbuktu Africa/Tripoli Africa/Tunis
-                Africa/Windhoek aganu aiaxa altia America/Adak America/Anchorage
-                America/Anguilla America/Antigua America/Araguaina
-                America/Argentina/Buenos_Aires America/Argentina/Catamarca
-                America/Argentina/ComodRivadavia America/Argentina/Cordoba
-                America/Argentina/Jujuy America/Argentina/La_Rioja America/Argentina/Mendoza
-                America/Argentina/Rio_Gallegos America/Argentina/Salta
-                America/Argentina/San_Juan America/Argentina/San_Luis America/Argentina/Tucuman
-                America/Argentina/Ushuaia America/Aruba America/Asuncion America/Atikokan
-                America/Atka America/Bahia America/Bahia_Banderas America/Barbados
-                America/Belem America/Belize America/Blanc-Sablon America/Boa_Vista
-                America/Bogota America/Boise America/Buenos_Aires America/Cambridge_Bay
-                America/Campo_Grande America/Cancun America/Caracas America/Catamarca
-                America/Cayenne America/Cayman America/Chicago America/Chihuahua
-                America/Coral_Harbour America/Cordoba America/Costa_Rica America/Creston
-                America/Cuiaba America/Curacao America/Danmarkshavn America/Dawson
-                America/Dawson_Creek America/Denver America/Detroit America/Dominica
-                America/Edmonton America/Eirunepe America/El_Salvador America/Ensenada
-                America/Fort_Wayne America/Fortaleza America/Glace_Bay America/Godthab
-                America/Goose_Bay America/Grand_Turk America/Grenada America/Guadeloupe
-                America/Guatemala America/Guayaquil America/Guyana America/Halifax
-                America/Havana America/Hermosillo America/Indiana/Indianapolis
-                America/Indiana/Knox America/Indiana/Marengo America/Indiana/Petersburg
-                America/Indiana/Tell_City America/Indiana/Vevay America/Indiana/Vincennes
-                America/Indiana/Winamac America/Indianapolis America/Inuvik America/Iqaluit
-                America/Jamaica America/Jujuy America/Juneau America/Kentucky/Louisville
-                America/Kentucky/Monticello America/Knox_IN America/Kralendijk America/La_Paz
-                America/Lima America/Los_Angeles America/Louisville America/Lower_Princes
-                America/Maceio America/Managua America/Manaus America/Marigot
-                America/Martinique America/Matamoros America/Mazatlan America/Mendoza
-                America/Menominee America/Merida America/Metlakatla America/Mexico_City
-                America/Miquelon America/Moncton America/Monterrey America/Montevideo
-                America/Montreal America/Montserrat America/Nassau America/New_York
-                America/Nipigon America/Nome America/Noronha America/North_Dakota/Beulah
-                America/North_Dakota/Center America/North_Dakota/New_Salem America/Ojinaga
-                America/Panama America/Pangnirtung America/Paramaribo America/Phoenix
-                America/Port_of_Spain America/Port-au-Prince America/Porto_Acre
-                America/Porto_Velho America/Puerto_Rico America/Rainy_River
-                America/Rankin_Inlet America/Recife America/Regina America/Resolute
-                America/Rio_Branco America/Rosario America/Santa_Isabel America/Santarem
-                America/Santiago America/Santo_Domingo America/Sao_Paulo America/Scoresbysund
-                America/Shiprock America/Sitka America/St_Barthelemy America/St_Johns
-                America/St_Kitts America/St_Lucia America/St_Thomas America/St_Vincent
-                America/Swift_Current America/Tegucigalpa America/Thule America/Thunder_Bay
-                America/Tijuana America/Toronto America/Tortola America/Vancouver
-                America/Virgin America/Whitehorse America/Winnipeg America/Yakutat
-                America/Yellowknife amevn ancur Antarctica/Casey Antarctica/Davis
-                Antarctica/DumontDUrville Antarctica/Macquarie Antarctica/Mawson
-                Antarctica/McMurdo Antarctica/Palmer Antarctica/Rothera Antarctica/South_Pole
-                Antarctica/Syowa Antarctica/Troll Antarctica/Vostok aolad aqams aqcas aqdav
-                aqddu aqmaw aqmcm aqplm aqrot aqsyw aqtrl aqvos arbue arcor arctc
-                Arctic/Longyearbyen arirj arjuj arluq armdz arrgl arsla artuc aruaq arush
-                Asia/Aden Asia/Almaty Asia/Amman Asia/Anadyr Asia/Aqtau Asia/Aqtobe
-                Asia/Ashgabat Asia/Ashkhabad Asia/Baghdad Asia/Bahrain Asia/Baku Asia/Bangkok
-                Asia/Beirut Asia/Bishkek Asia/Brunei Asia/Calcutta Asia/Chita Asia/Choibalsan
-                Asia/Chongqing Asia/Chungking Asia/Colombo Asia/Dacca Asia/Damascus Asia/Dhaka
-                Asia/Dili Asia/Dubai Asia/Dushanbe Asia/Gaza Asia/Harbin Asia/Hebron
-                Asia/Ho_Chi_Minh Asia/Hong_Kong Asia/Hovd Asia/Irkutsk Asia/Istanbul
-                Asia/Jakarta Asia/Jayapura Asia/Jerusalem Asia/Kabul Asia/Kamchatka
-                Asia/Karachi Asia/Kashgar Asia/Kathmandu Asia/Katmandu Asia/Khandyga
-                Asia/Kolkata Asia/Krasnoyarsk Asia/Kuala_Lumpur Asia/Kuching Asia/Kuwait
-                Asia/Macao Asia/Macau Asia/Magadan Asia/Makassar Asia/Manila Asia/Muscat
-                Asia/Nicosia Asia/Novokuznetsk Asia/Novosibirsk Asia/Omsk Asia/Oral
-                Asia/Phnom_Penh Asia/Pontianak Asia/Pyongyang Asia/Qatar Asia/Qyzylorda
-                Asia/Rangoon Asia/Riyadh Asia/Saigon Asia/Sakhalin Asia/Samarkand Asia/Seoul
-                Asia/Shanghai Asia/Singapore Asia/Srednekolymsk Asia/Taipei Asia/Tashkent
-                Asia/Tbilisi Asia/Tehran Asia/Tel_Aviv Asia/Thimbu Asia/Thimphu Asia/Tokyo
-                Asia/Ujung_Pandang Asia/Ulaanbaatar Asia/Ulan_Bator Asia/Urumqi Asia/Ust-Nera
-                Asia/Vientiane Asia/Vladivostok Asia/Yakutsk Asia/Yekaterinburg Asia/Yerevan
-                asppg Atlantic/Azores Atlantic/Bermuda Atlantic/Canary Atlantic/Cape_Verde
-                Atlantic/Faeroe Atlantic/Faroe Atlantic/Jan_Mayen Atlantic/Madeira
-                Atlantic/Reykjavik Atlantic/South_Georgia Atlantic/St_Helena Atlantic/Stanley
-                atvie auadl aubhq aubne audrw aueuc auhba aukns auldc auldh aumel aumqi auper
-                Australia/ACT Australia/Adelaide Australia/Brisbane Australia/Broken_Hill
-                Australia/Canberra Australia/Currie Australia/Darwin Australia/Eucla
-                Australia/Hobart Australia/LHI Australia/Lindeman Australia/Lord_Howe
-                Australia/Melbourne Australia/North Australia/NSW Australia/Perth
-                Australia/Queensland Australia/South Australia/Sydney Australia/Tasmania
-                Australia/Victoria Australia/West Australia/Yancowinna ausyd awaua azbak
-                basjj bbbgi bddac bebru bfoua bgsof bhbah bibjm bjptn bmbda bnbwn bolpb bqkra
-                braux Brazil/Acre Brazil/DeNoronha Brazil/East Brazil/West brbel brbvb brcgb
-                brcgr brern brfen brfor brmao brmcz brpvh brrbr brrec brsao brssa brstm bsnas
-                btthi bwgbe bymsq bzbze
-                cacfq caedm caffs caglb cagoo cahal caiql camon camtr Canada/Atlantic
-                Canada/Central Canada/East-Saskatchewan Canada/Eastern Canada/Mountain
-                Canada/Newfoundland Canada/Pacific Canada/Saskatchewan Canada/Yukon canpg capnt
-                careb careg casjf cathu cator cavan cawnp caybx caycb cayda caydq cayek cayev
-                cayxy cayyn cayzf cayzs cccck cdfbm cdfih cfbgf cgbzv Chile/Continental
-                Chile/EasterIsland chzrh ciabj ckrar clipc clscl cmdla cnckg cnhrb cnkhg cnsha
-                cnurc cobog crsjo CST6CDT Cuba cuhav cvrai cxxch cynic czprg
-                deber debsngn djjib dkcph dmdom dosdq dzalg
-                ecgps ecgye eetll egcai Egypt eheai Eire erasm esceu eslpa esmad EST EST5EDT
-                etadd Etc/GMT Etc/GMT-0 Etc/GMT-1 Etc/GMT-10 Etc/GMT-11 Etc/GMT-12 Etc/GMT-13
-                Etc/GMT-14 Etc/GMT-2 Etc/GMT-3 Etc/GMT-4 Etc/GMT-5 Etc/GMT-6 Etc/GMT-7
-                Etc/GMT-8 Etc/GMT-9 Etc/GMT+0 Etc/GMT+1 Etc/GMT+10 Etc/GMT+11 Etc/GMT+12
-                Etc/GMT+2 Etc/GMT+3 Etc/GMT+4 Etc/GMT+5 Etc/GMT+6 Etc/GMT+7 Etc/GMT+8 Etc/GMT+9
-                Etc/GMT0 Etc/Greenwich Etc/UCT Etc/Universal Etc/Unknown Etc/UTC Etc/Zulu
-                Europe/Amsterdam Europe/Andorra Europe/Athens Europe/Belfast Europe/Belgrade
-                Europe/Berlin Europe/Bratislava Europe/Brussels Europe/Bucharest
-                Europe/Budapest Europe/Busingen Europe/Chisinau Europe/Copenhagen Europe/Dublin
-                Europe/Gibraltar Europe/Guernsey Europe/Helsinki Europe/Isle_of_Man
-                Europe/Istanbul Europe/Jersey Europe/Kaliningrad Europe/Kiev Europe/Lisbon
-                Europe/Ljubljana Europe/London Europe/Luxembourg Europe/Madrid Europe/Malta
-                Europe/Mariehamn Europe/Minsk Europe/Monaco Europe/Moscow Europe/Nicosia
-                Europe/Oslo Europe/Paris Europe/Podgorica Europe/Prague Europe/Riga Europe/Rome
-                Europe/Samara Europe/San_Marino Europe/Sarajevo Europe/Simferopol Europe/Skopje
-                Europe/Sofia Europe/Stockholm Europe/Tallinn Europe/Tirane Europe/Tiraspol
-                Europe/Uzhgorod Europe/Vaduz Europe/Vatican Europe/Vienna Europe/Vilnius
-                Europe/Volgograd Europe/Warsaw Europe/Zagreb Europe/Zaporozhye Europe/Zurich
-                fihel fimhq fjsuv fkpsy fmksa fmpni fmtkk fotho frpar
-                galbv gaza GB GB-Eire gblon gdgnd getbs gfcay gggci ghacc gigib gldkshvn glgoh
-                globy glthu gmbjl GMT GMT-0 GMT+0 GMT0 gncky gpbbr gpmsb gpsbh gqssg grath
-                Greenwich gsgrv gtgua gugum gwoxb gygeo
-                hebron hkhkg hntgu Hongkong hrzag HST htpap hubud
-                Iceland iddjj idjkt idmak idpnk iedub imdgs inccu Indian/Antananarivo
-                Indian/Chagos Indian/Christmas Indian/Cocos Indian/Comoro Indian/Kerguelen
-                Indian/Mahe Indian/Maldives Indian/Mauritius Indian/Mayotte Indian/Reunion
-                iodga iqbgw Iran irthr Israel isrey itrom
-                Jamaica Japan jeruslm jesth jmkin joamm jptyo
-                kenbo kgfru khpnh kicxi kipho kitrw kmyva knbas kpfnj krsel Kwajalein kwkwi
-                kygec kzaau kzakx kzala kzkzo kzura
-                lavte lbbey lccas Libya livdz lkcmb lrmlw lsmsu ltvno lulux lvrix lytip
-                macas mcmon mdkiv metgd Mexico/BajaNorte Mexico/BajaSur Mexico/General mgtnr
-                mhkwa mhmaj mkskp mlbko mmrgn mncoq mnhvd mnuln momfm mpspn mqfdf mrnkc msmni
-                MST MST7MDT mtmla muplu mvmle mwblz mxchi mxcun mxhmo mxmam mxmex mxmid mxmty
-                mxmzt mxoji mxpvr mxstis mxtij mykch mykul mzmpm
-                Navajo nawdh ncnou nenim nfnlk nglos nimga nlams noosl npktm nrinu nuiue NZ
-                NZ-CHAT nzakl nzcht
-                ommct
-                Pacific/Apia Pacific/Auckland Pacific/Bougainville Pacific/Chatham
-                Pacific/Chuuk Pacific/Easter Pacific/Efate Pacific/Enderbury Pacific/Fakaofo
-                Pacific/Fiji Pacific/Funafuti Pacific/Galapagos Pacific/Gambier
-                Pacific/Guadalcanal Pacific/Guam Pacific/Honolulu Pacific/Johnston
-                Pacific/Kiritimati Pacific/Kosrae Pacific/Kwajalein Pacific/Majuro
-                Pacific/Marquesas Pacific/Midway Pacific/Nauru Pacific/Niue Pacific/Norfolk
-                Pacific/Noumea Pacific/Pago_Pago Pacific/Palau Pacific/Pitcairn Pacific/Pohnpei
-                Pacific/Ponape Pacific/Port_Moresby Pacific/Rarotonga Pacific/Saipan
-                Pacific/Samoa Pacific/Tahiti Pacific/Tarawa Pacific/Tongatapu Pacific/Truk
-                Pacific/Wake Pacific/Wallis Pacific/Yap papty pelim pfgmr pfnhv pfppt pgpom
-                pgraw phmnl pkkhi plwaw pmmqc pnpcn Poland Portugal PRC prsju PST8PDT ptfnc
-                ptlis ptpdl pwror pyasu
-                qadoh
-                rereu robuh ROC ROK rsbeg ruchita rudyr rugdx ruikt rukgd rukhndg rukra rukuf
-                rumow runoz ruoms ruovb rupkc rusred ruunera ruuus ruvog ruvvo ruyek ruyks
-                rwkgl
-                saruh sbhir scmaw sdkrt sesto sgsin shshn silju Singapore sjlyr skbts slfna
-                smsai sndkr somgq srpbm ssjub sttms svsal sxphi sydam szqmn
-                tcgdt tdndj tfpfr tglfw thbkk tjdyu tkfko tldil tmasb tntun totbu trist ttpos
-                Turkey tvfun twtpe tzdar
-                uaiev uaozh uasip uauzh UCT ugkla umawk umjon ummdy Universal unk US/Alaska
-                US/Aleutian US/Arizona US/Central US/East-Indiana US/Eastern US/Hawaii
-                US/Indiana-Starke US/Michigan US/Mountain US/Pacific US/Pacific-New US/Samoa
-                usadk usaeg usanc usboi uschi usden usdet ushnl usind usinvev usjnu usknx uslax
-                uslui usmnm usmoc usmtm usnavajo usndcnt usndnsl usnyc usoea usome usphx ussit
-                ustel uswlz uswsq usxul usyak UTC utce01 utce02 utce03 utce04 utce05 utce06
-                utce07 utce08 utce09 utce10 utce11 utce12 utce13 utce14 utcw01 utcw02 utcw03
-                utcw04 utcw05 utcw06 utcw07 utcw08 utcw09 utcw10 utcw11 utcw12 uymvd uzskd
-                uztas
-                vavat vcsvd veccs vgtov vistt vnsgn vuvli
-                W-SU wfmau wsapw
-                yeade ytmam
-                zajnb zmlun Zulu zwhre
-            </variable>
-            <variable id="$va_XXX" type="choice">
-                posix
-            </variable>
-            <variable id="$variableTop_XXX" type="choice">
-                CODEPOINTS
-            </variable>
-            <!-- end of data generated with CountItems tool per http://sites.google.com/site/cldr/development/updating-codes/update-languagescriptregion-subtags -->
-            <variable id="$tzid" type="choice">
-                Africa/Abidjan Africa/Accra Africa/Addis_Ababa Africa/Algiers Africa/Asmera
-                Africa/Bamako Africa/Bangui Africa/Banjul Africa/Bissau Africa/Blantyre
-                Africa/Brazzaville Africa/Bujumbura
-                Africa/Cairo Africa/Casablanca Africa/Ceuta Africa/Conakry
-                Africa/Dakar Africa/Dar_es_Salaam Africa/Djibouti Africa/Douala
-                Africa/El_Aaiun
-                Africa/Freetown
-                Africa/Gaborone
-                Africa/Harare
-                Africa/Johannesburg Africa/Juba
-                Africa/Kampala Africa/Khartoum Africa/Kigali Africa/Kinshasa
-                Africa/Lagos Africa/Libreville Africa/Lome Africa/Luanda Africa/Lubumbashi
-                Africa/Lusaka
-                Africa/Malabo Africa/Maputo Africa/Maseru Africa/Mbabane Africa/Mogadishu
-                Africa/Monrovia
-                Africa/Nairobi Africa/Ndjamena Africa/Niamey Africa/Nouakchott
-                Africa/Ouagadougou
-                Africa/Porto-Novo
-                Africa/Sao_Tome
-                Africa/Tripoli Africa/Tunis
-                Africa/Windhoek
-                America/Adak America/Anchorage America/Anguilla America/Antigua
-                America/Araguaina
-                America/Argentina/La_Rioja
-                America/Argentina/Rio_Gallegos
-                America/Argentina/Salta America/Argentina/San_Juan America/Argentina/San_Luis
-                America/Argentina/Tucuman
-                America/Argentina/Ushuaia
-                America/Aruba America/Asuncion
-                America/Bahia America/Bahia_Banderas America/Barbados America/Belem
-                America/Belize America/Blanc-Sablon America/Boa_Vista America/Bogota
-                America/Boise America/Buenos_Aires
-                America/Cambridge_Bay America/Campo_Grande America/Cancun America/Caracas
-                America/Catamarca America/Cayenne America/Cayman America/Chicago
-                America/Chihuahua America/Coral_Harbour America/Cordoba America/Costa_Rica
-                America/Creston America/Cuiaba America/Curacao
-                America/Danmarkshavn America/Dawson America/Dawson_Creek America/Denver
-                America/Detroit America/Dominica
-                America/Edmonton America/Eirunepe America/El_Salvador
-                America/Fortaleza
-                America/Glace_Bay America/Godthab America/Goose_Bay America/Grand_Turk
-                America/Grenada America/Guadeloupe America/Guatemala America/Guayaquil
-                America/Guyana
-                America/Halifax America/Havana America/Hermosillo
-                America/Indiana/Knox
-                America/Indiana/Marengo
-                America/Indiana/Petersburg
-                America/Indiana/Tell_City
-                America/Indiana/Vevay America/Indiana/Vincennes
-                America/Indiana/Winamac
-                America/Indianapolis America/Inuvik America/Iqaluit
-                America/Jamaica America/Jujuy America/Juneau
-                America/Kentucky/Monticello
-                America/Kralendijk
-                America/La_Paz America/Lima America/Los_Angeles America/Louisville
-                America/Lower_Princes
-                America/Maceio America/Managua America/Manaus America/Marigot
-                America/Martinique America/Matamoros America/Mazatlan America/Mendoza
-                America/Menominee America/Merida America/Metlakatla America/Mexico_City
-                America/Miquelon America/Moncton America/Monterrey America/Montevideo
-                America/Montserrat
-                America/Nassau America/New_York America/Nipigon America/Nome America/Noronha
-                America/North_Dakota/Beulah
-                America/North_Dakota/Center
-                America/North_Dakota/New_Salem
-                America/Ojinaga
-                America/Panama America/Pangnirtung America/Paramaribo America/Phoenix
-                America/Port-au-Prince America/Port_of_Spain America/Porto_Velho
-                America/Puerto_Rico
-                America/Rainy_River America/Rankin_Inlet America/Recife America/Regina
-                America/Resolute America/Rio_Branco
-                America/Santa_Isabel America/Santarem America/Santiago America/Santo_Domingo
-                America/Sao_Paulo America/Scoresbysund America/Sitka America/St_Barthelemy
-                America/St_Johns America/St_Kitts America/St_Lucia America/St_Thomas
-                America/St_Vincent America/Swift_Current
-                America/Tegucigalpa America/Thule America/Thunder_Bay America/Tijuana
-                America/Toronto America/Tortola
-                America/Vancouver
-                America/Whitehorse America/Winnipeg
-                America/Yakutat America/Yellowknife
-                Antarctica/Casey
-                Antarctica/Davis Antarctica/DumontDUrville
-                Antarctica/Macquarie Antarctica/Mawson Antarctica/McMurdo
-                Antarctica/Palmer
-                Antarctica/Rothera
-                Antarctica/Syowa
-                Antarctica/Troll
-                Antarctica/Vostok
-                Arctic/Longyearbyen
-                Asia/Aden Asia/Almaty Asia/Amman Asia/Anadyr Asia/Aqtau Asia/Aqtobe
-                Asia/Ashgabat
-                Asia/Baghdad Asia/Bahrain Asia/Baku Asia/Bangkok Asia/Beirut Asia/Bishkek
-                Asia/Brunei
-                Asia/Calcutta Asia/Chita Asia/Choibalsan Asia/Colombo
-                Asia/Damascus Asia/Dhaka Asia/Dili Asia/Dubai Asia/Dushanbe
-                Asia/Gaza
-                Asia/Hebron Asia/Hong_Kong Asia/Hovd
-                Asia/Irkutsk
-                Asia/Jakarta Asia/Jayapura Asia/Jerusalem
-                Asia/Kabul Asia/Kamchatka Asia/Karachi Asia/Katmandu Asia/Khandyga
-                Asia/Krasnoyarsk Asia/Kuala_Lumpur Asia/Kuching Asia/Kuwait
-                Asia/Macau Asia/Magadan Asia/Makassar Asia/Manila Asia/Muscat
-                Asia/Nicosia Asia/Novokuznetsk Asia/Novosibirsk
-                Asia/Omsk Asia/Oral
-                Asia/Phnom_Penh Asia/Pontianak Asia/Pyongyang
-                Asia/Qatar Asia/Qyzylorda
-                Asia/Rangoon Asia/Riyadh
-                Asia/Saigon Asia/Sakhalin Asia/Samarkand Asia/Seoul Asia/Shanghai
-                Asia/Singapore Asia/Srednekolymsk
-                Asia/Taipei Asia/Tashkent Asia/Tbilisi Asia/Tehran Asia/Thimphu Asia/Tokyo
-                Asia/Ulaanbaatar Asia/Urumqi Asia/Ust-Nera
-                Asia/Vientiane Asia/Vladivostok
-                Asia/Yakutsk Asia/Yekaterinburg Asia/Yerevan
-                Atlantic/Azores
-                Atlantic/Bermuda
-                Atlantic/Canary Atlantic/Cape_Verde
-                Atlantic/Faeroe
-                Atlantic/Madeira
-                Atlantic/Reykjavik
-                Atlantic/South_Georgia Atlantic/St_Helena Atlantic/Stanley
-                Australia/Adelaide
-                Australia/Brisbane Australia/Broken_Hill
-                Australia/Currie
-                Australia/Darwin
-                Australia/Eucla
-                Australia/Hobart
-                Australia/Lindeman Australia/Lord_Howe
-                Australia/Melbourne
-                Australia/Perth
-                Australia/Sydney
-                CST6CDT EST5EDT Etc/GMT Etc/GMT+1 Etc/GMT+10 Etc/GMT+11 Etc/GMT+12 Etc/GMT+2
-                Etc/GMT+3 Etc/GMT+4 Etc/GMT+5 Etc/GMT+6 Etc/GMT+7 Etc/GMT+8 Etc/GMT+9 Etc/GMT-1
-                Etc/GMT-10 Etc/GMT-11 Etc/GMT-12 Etc/GMT-13 Etc/GMT-14 Etc/GMT-2 Etc/GMT-3
-                Etc/GMT-4 Etc/GMT-5 Etc/GMT-6 Etc/GMT-7 Etc/GMT-8 Etc/GMT-9
-                Etc/Unknown
-                Europe/Amsterdam Europe/Andorra Europe/Athens
-                Europe/Belgrade Europe/Berlin Europe/Bratislava Europe/Brussels
-                Europe/Bucharest Europe/Budapest Europe/Busingen
-                Europe/Chisinau Europe/Copenhagen
-                Europe/Dublin
-                Europe/Gibraltar Europe/Guernsey
-                Europe/Helsinki
-                Europe/Isle_of_Man Europe/Istanbul
-                Europe/Jersey
-                Europe/Kaliningrad Europe/Kiev
-                Europe/Lisbon Europe/Ljubljana Europe/London Europe/Luxembourg
-                Europe/Madrid Europe/Malta Europe/Mariehamn Europe/Minsk Europe/Monaco
-                Europe/Moscow
-                Europe/Oslo
-                Europe/Paris Europe/Podgorica Europe/Prague
-                Europe/Riga Europe/Rome
-                Europe/Samara Europe/San_Marino Europe/Sarajevo Europe/Simferopol Europe/Skopje
-                Europe/Sofia Europe/Stockholm
-                Europe/Tallinn Europe/Tirane
-                Europe/Uzhgorod
-                Europe/Vaduz Europe/Vatican Europe/Vienna Europe/Vilnius Europe/Volgograd
-                Europe/Warsaw
-                Europe/Zagreb Europe/Zaporozhye Europe/Zurich
-                Indian/Antananarivo
-                Indian/Chagos Indian/Christmas Indian/Cocos Indian/Comoro
-                Indian/Kerguelen
-                Indian/Mahe Indian/Maldives Indian/Mauritius Indian/Mayotte
-                Indian/Reunion
-                MST7MDT PST8PDT Pacific/Apia Pacific/Auckland
-                Pacific/Bougainville
-                Pacific/Chatham
-                Pacific/Easter Pacific/Efate Pacific/Enderbury
-                Pacific/Fakaofo Pacific/Fiji Pacific/Funafuti
-                Pacific/Galapagos Pacific/Gambier Pacific/Guadalcanal Pacific/Guam
-                Pacific/Honolulu
-                Pacific/Johnston
-                Pacific/Kiritimati Pacific/Kosrae Pacific/Kwajalein
-                Pacific/Majuro Pacific/Marquesas Pacific/Midway
-                Pacific/Nauru Pacific/Niue Pacific/Norfolk Pacific/Noumea
-                Pacific/Pago_Pago Pacific/Palau Pacific/Pitcairn Pacific/Ponape
-                Pacific/Port_Moresby
-                Pacific/Rarotonga
-                Pacific/Saipan
-                Pacific/Tahiti Pacific/Tarawa Pacific/Tongatapu Pacific/Truk
-                Pacific/Wake Pacific/Wallis
-            </variable>
-            <variable id="$altList" type="choice">
-                stand-alone variant list secondary email www short narrow accounting arab arabext armn armnlow bali beng cham deva ethi fullwide geor grek greklow gujr guru hans hansfin hant hantfin hebr java jpan jpanfin kali knda khmr lana lanatham laoo latn lepc limb mlym mong mtei mymr mymrshan new nkoo olck orya roman romanlow saur sund talu taml telu thai tibt vaii
-            </variable>
-            <!-- specialized lists and types -->
-            <variable id="$tzidList" type="list">$tzid</variable>
-            <variable id="$casing" type="choice">titlecase-words titlecase-firstword lowercase-words mixed</variable>
-    
-            <!-- allow may expand in future to a space separated list i.e. ((newitem)?( )?)?(verbatim)? -->
-            <variable id="$allow" type="regex">(verbatim)</variable>
-            <variable id="$alt" type="regex">((stand-alone|variant|list|secondary|email|www|short|narrow|new|accounting)(-proposed.*)?|(proposed.*))</variable>
-            <variable id="$append" type="choice">Era Year Quarter Month Week Day-Of-Week Day Hour Minute Second Timezone</variable>
-           <!--  Separate date format for currencies; some where introduced long before the 2000s -->
-            <variable id="$currencyDate" type="regex">([12][0-9][0-9][0-9])-((0[0-9])|1[0-2])-([0-2][0-9]|3[01])</variable>
-            <variable id="$date" type="regex">20[0-9][0-9]-([0-9]|1[0-2])-([12][0-9]|3[01])</variable>
-            <variable id="$double" type="regex">[0-9]+(\.[0-9]+)?</variable>
-            <variable id="$integer" type="regex">[0-9]+</variable>
-            <variable id="$format" type="choice">standard</variable>
-            <variable id="$fullTzid" type="notDoneYet"/>
-            <variable id="$genDate" type="regex">\$.*\$</variable>
-            <variable id="$locale" type="locale"/>
-            <variable id="$reference" type="regex">([R|S]|RP)[0-9]+</variable>
-            <variable id="$time" type="regex">([01][0-9]|2[0-4]):[0-6][0-9]</variable>
-            <variable id="$uri" type="notDoneYet"/>
-            <!--  Certain segmentation files need underscores in variable names -->
-            <variable id="$variableID" type="regex">[$][a-zA-Z0-9_]+</variable>
-            <variable id="$version" type="regex">\$.*\$</variable>
-            
-            <attributeValues attributes="alt" type="choice">$alt</attributeValues>
-            <attributeValues attributes="_q" type="choice">$integer</attributeValues>
-            <attributeValues attributes="validSubLocales" type="list">$locale</attributeValues>
-            <attributeValues elements="alias" attributes="path" type="path">notDoneYet</attributeValues>
-            <attributeValues elements="alias" attributes="path" type="path">notDoneYet</attributeValues>
-            <attributeValues elements="alias" attributes="source" type="locale"/>
-            <attributeValues elements="alias" attributes="source" type="choice">locale</attributeValues>
-            <attributeValues elements="alternate" attributes="iso4217" type="bcp47">cu</attributeValues>
-            <attributeValues elements="appendItem" attributes="request">$append</attributeValues>
-            <attributeValues elements="calendar" attributes="type" type="bcp47">ca</attributeValues>
-            <attributeValues elements="character" attributes="value" type="regex">.</attributeValues>
-            <attributeValues elements="collation" attributes="type" type="bcp47">co</attributeValues>
-            <attributeValues elements="collations" attributes="version">$version</attributeValues>
-            <attributeValues elements="contextTransform" attributes="type" type="choice">uiListOrMenu stand-alone</attributeValues>
-            <attributeValues elements="contextTransformUsage" attributes="type" type="regex">[a-zA-Z-]+</attributeValues>
-            <attributeValues elements="cp" attributes="hex" type="regex">[0-9A-Fa-f]{4,6}</attributeValues>
-            <attributeValues elements="currency" attributes="before from to">$currencyDate</attributeValues>
-            <attributeValues elements="currency" attributes="iso4217" type="bcp47">cu</attributeValues>
-            <attributeValues elements="currency" attributes="type" type="bcp47">cu</attributeValues>
-            <attributeValues elements="currencyFormat" attributes="type" type="choice">standard accounting</attributeValues>
-            <attributeValues elements="currencyFormats decimalFormats percentFormats scientificFormats" attributes="numberSystem" type="bcp47">nu</attributeValues>
-            <attributeValues elements="cyclicName" attributes="type" type="regex">[0-9]+</attributeValues>
-            <attributeValues elements="cyclicNameContext" attributes="type" order="given">format stand-alone</attributeValues>
-            <attributeValues elements="cyclicNameSet" attributes="type" type="choice">years months days dayParts zodiacs solarTerms</attributeValues>
-            <attributeValues elements="dateFormat dateTimeFormat decimalFormat percentFormat scientificFormat timeFormat" attributes="type">$format</attributeValues>
-            <attributeValues elements="dateFormatLength timeFormatLength dateTimeFormatLength decimalFormatLength scientificFormatLength percentFormatLength currencyFormatLength" attributes="type" order="given">full long medium short</attributeValues>
-            <attributeValues elements="day" attributes="type" order="given">sun mon tue wed thu fri sat</attributeValues>
-            <attributeValues elements="dayWidth" attributes="type" order="given">abbreviated narrow short wide</attributeValues>
-            <attributeValues elements="default" attributes="type" type="choice">format gregorian long medium pinyin standard stroke wide</attributeValues>
-            <attributeValues elements="era" attributes="type" type="regex">[0-9]+</attributeValues>
-            <attributeValues elements="field" attributes="type" order="given">era year year-short year-narrow quarter quarter-short quarter-narrow month month-short month-narrow week week-short week-narrow day day-short day-narrow weekday dayperiod hour hour-short hour-narrow minute minute-short minute-narrow second second-short second-narrow zone sun sun-short sun-narrow mon mon-short mon-narrow tue tue-short tue-narrow wed wed-short wed-narrow thu thu-short thu-narrow fri fri-short fri-narrow sat sat-short sat-narrow</attributeValues>
-            <attributeValues elements="firstDay weekendEnd weekendStart" attributes="day" order="given">sun mon tue wed thu fri sat</attributeValues>
-            <attributeValues elements="generation" attributes="date">$genDate</attributeValues>
-            <attributeValues elements="group" attributes="contains type">$territory</attributeValues>
-            <attributeValues elements="hours" attributes="allowed" type="regex">[HKhk]( [HKhk])*</attributeValues>
-            <attributeValues elements="hours" attributes="preferred" type="choice">H K h k</attributeValues>
-            <attributeValues elements="hours" attributes="regions" type="list">$territory</attributeValues>
-            <attributeValues elements="info" attributes="digits" type="regex">[0-9]+</attributeValues>
-            <attributeValues elements="info" attributes="iso4217" type="bcp47">cu</attributeValues>
-            <attributeValues elements="info" attributes="rounding" type="regex">[0-9]+</attributeValues>
-            <attributeValues elements="key" attributes="type" type="choice">calendar collation colAlternate colBackwards colCaseFirst colCaseLevel colHiraganaQuaternary colNormalization colNumeric colReorder colStrength currency kv numbers timezone va variableTop x</attributeValues>
-            <attributeValues elements="language" attributes="scripts">$script</attributeValues>
-            <attributeValues elements="language" attributes="territories">$territory</attributeValues>
-            <attributeValues elements="language" attributes="type">$locale</attributeValues>
-            <attributeValues elements="language" attributes="variants">$variant</attributeValues>
-            <attributeValues elements="languageAlias" attributes="replacement type" type="locale"/>
-            <attributeValues elements="ldml" attributes="version">$version</attributeValues>
-            <attributeValues elements="mapTimezones" attributes="type" type="regex">.+</attributeValues>
-            <attributeValues elements="mapZone" attributes="type">$tzid</attributeValues>
-            <attributeValues elements="mapping" attributes="registry" type="choice">iana</attributeValues>
-            <attributeValues elements="mapping" attributes="type" type="choice">utf-8</attributeValues>
-            <attributeValues elements="numberingSystem" attributes="id" type="bcp47">nu</attributeValues>
-            <attributeValues elements="numberingSystem" attributes="type" type="choice">algorithmic numeric</attributeValues>
-            <attributeValues elements="minDays" attributes="count" type="regex">[0-7]</attributeValues>
-            <attributeValues elements="month" attributes="type" type="choice">1 2 3 4 5 6 7 8 9 10 11 12 13</attributeValues>
-            <attributeValues elements="monthPattern" attributes="type" type="choice">leap standardAfterLeap combined</attributeValues>
-            <attributeValues elements="monthPatternContext" attributes="type" order="given">format stand-alone numeric</attributeValues>
-            <attributeValues elements="monthPatternWidth" attributes="type" type="choice">abbreviated narrow wide all</attributeValues>
-            <attributeValues elements="monthWidth quarterWidth cyclicNameWidth" attributes="type" order="given">abbreviated narrow wide</attributeValues>
-            <attributeValues elements="pattern" attributes="type" type="choice">standard atLeast range 1000 10000 100000 1000000 10000000 10000000 100000000 1000000000 10000000000 100000000000 1000000000000 10000000000000 100000000000000</attributeValues>
-            <attributeValues elements="preferenceOrdering" attributes="type">$tzidList</attributeValues>
-            <attributeValues elements="quarter" attributes="type" type="choice">1 2 3 4</attributeValues> <!-- move to DTD? -->
-            <attributeValues elements="reference" attributes="type">$reference</attributeValues>
-            <attributeValues elements="reference" attributes="uri">notDoneYet</attributeValues>
-            <attributeValues elements="region" attributes="iso3166">$territory</attributeValues>
-            <attributeValues elements="relative" attributes="type" type="regex">-?[0-9]+</attributeValues>
-            <attributeValues elements="relativeTime" attributes="type" type="choice">future past</attributeValues>
-            <attributeValues elements="reset" attributes="before" type="choice">primary secondary tertiary</attributeValues> <!-- move to DTD? -->
-            <attributeValues elements="rule" attributes="id">$double</attributeValues>
-            <attributeValues elements="script" attributes="type">$script</attributeValues>
-            <attributeValues elements="scriptAlias" attributes="replacement">$script</attributeValues>
-            <attributeValues elements="scriptAlias" attributes="type">$script</attributeValues>
-            <attributeValues elements="segmentation" attributes="type" type="choice">GraphemeClusterBreak LineBreak SentenceBreak WordBreak</attributeValues>
-            <attributeValues elements="supplementalData" attributes="version">$version</attributeValues>
-            <attributeValues elements="symbols" attributes="numberSystem" type="bcp47">nu</attributeValues>
-            <attributeValues elements="territory" attributes="type">$territory</attributeValues>
-            <attributeValues elements="territoryAlias" attributes="replacement type">$territory</attributeValues>
-            <attributeValues elements="type" attributes="key" type="choice">calendar collation colAlternate colBackwards colCaseFirst colCaseLevel colHiraganaQuaternary colNormalization colNumeric colStrength numbers va</attributeValues> <!-- Exluded: colReorder curerncy timezone x -->
-            <attributeValues elements="type" attributes="type" type="choice">arab arabext armn armnlow bali beng big5han brah buddhist cakm cham chinese coptic dangi deva dictionary ducet eor ethi ethiopic ethiopic-amete-alem finance fullwide gb2312han geor gregorian grek greklow gujr guru hanidays hanidec hans hansfin hant hantfin hebr hebrew identical indian islamic islamic-civil islamic-rgsa islamic-tbla islamic-umalqura iso8601 japanese java jpan jpanfin kali khmr knda lana lanatham laoo latn lepc limb lower mlym mong mtei mymr mymrshan native nkoo no non-ignorable olck orya osma persian phonebook phonetic pinyin posix primary quaternary reformed roc roman romanlow saur search searchjl secondary shifted shrd sora standard stroke sund takr talu taml tamldec telu tertiary thai tibt traditional unihan upper vaii yes zhuyin</attributeValues>
-            <attributeValues elements="unit" attributes="type" type="regex">(acceleration-(g-force|meter-per-second-squared)|angle-(degree|arc-minute|arc-second|radian)|area-(acre|square-(centimeter|inch|foot|kilometer|meter|mile|yard)|hectare)|consumption-(liter-per-kilometer|mile-per-gallon)|digital-(kilo|mega|giga|tera)?(bit|byte)|duration-(nanosecond|microsecond|millisecond|(day|hour|minute|month|second|week|year))|electric-(milli)?(ampere|ohm|volt)|energy-(kilocalorie|calorie|foodcalorie|joule|kilojoule|kilowatt-hour)|frequency-(kilo|mega|giga)?hertz|length-(astronomical-unit|(pico|nano|micro|milli|centi|deci|kilo)?meter|fathom|foot|furlong|inch|light-year|mile|nautical-mile|parsec|yard)|light-lux|mass-(carat|(kilo|milli|micro)?gram|ounce|ounce-troy|pound|metric-ton|stone|ton)|power-(horsepower|(kilo|milli|mega|giga)?watt)|pressure-(hectopascal|inch-hg|millibar|millimeter-of-mercury|pound-per-square-inch)|proportion-karat|speed-((mile|kilometer)-per-hour|meter-per-second)|temperature-(celsius|fahrenheit|kelvin)|volume-(acre-foot|bushel|cup|fluid-ounce|(milli|deci|centi|hecto|mega)?liter|gallon|pint|quart|cubic-(centimeter|kilometer|meter|mile|inch|foot|yard)|tablespoon|teaspoon))</attributeValues>
-            <attributeValues elements="variable" attributes="id">$variableID</attributeValues>
-            <attributeValues elements="variant" attributes="type">$variant</attributeValues>
-            <attributeValues elements="variantAlias" attributes="replacement type">$variant</attributeValues>
-            <attributeValues elements="version" attributes="number" type="choice">$version</attributeValues>
-            <attributeValues elements="weekendEnd weekendStart" attributes="time">$time</attributeValues>
-            <attributeValues elements="zone" attributes="type">$tzid</attributeValues>
-            <attributeValues elements="zoneFormatting" attributes="multizone">$territory</attributeValues>
-            <attributeValues elements="zoneItem" attributes="aliases">$tzidList</attributeValues>
-            <attributeValues elements="zoneItem" attributes="territory">$territory</attributeValues>
-            <attributeValues elements="zoneItem" attributes="type">$tzid</attributeValues>
-        </validity>
-        <alias>
-            <!-- grandfathered BCP47 codes -->
-            <languageAlias type="art_lojban" replacement="jbo" reason="deprecated"/> <!-- Lojban -->
-            <languageAlias type="i_ami" replacement="ami" reason="deprecated"/> <!-- Amis -->
-            <languageAlias type="i_bnn" replacement="bnn" reason="deprecated"/> <!-- Bunun -->
-            <languageAlias type="i_hak" replacement="hak" reason="deprecated"/> <!-- Hakka -->
-            <languageAlias type="i_klingon" replacement="tlh" reason="deprecated"/> <!-- Klingon -->
-            <languageAlias type="i_lux" replacement="lb" reason="deprecated"/> <!-- Luxembourgish -->
-            <languageAlias type="i_navajo" replacement="nv" reason="deprecated"/> <!-- Navajo -->
-            <languageAlias type="i_pwn" replacement="pwn" reason="deprecated"/> <!-- Paiwan -->
-            <languageAlias type="i_tao" replacement="tao" reason="deprecated"/> <!-- Tao -->
-            <languageAlias type="i_tay" replacement="tay" reason="deprecated"/> <!-- Tayal -->
-            <languageAlias type="i_tsu" replacement="tsu" reason="deprecated"/> <!-- Tsou -->
-            <languageAlias type="no_bok" replacement="nb" reason="deprecated"/> <!-- Norwegian Bokmal -->
-            <languageAlias type="no_nyn" replacement="nn" reason="deprecated"/> <!-- Norwegian Nynorsk -->
-            <languageAlias type="sgn_BE_FR" replacement="sfb" reason="deprecated"/> <!-- Belgian-French Sign Language -->
-            <languageAlias type="sgn_BE_NL" replacement="vgt" reason="deprecated"/> <!-- Belgian-Flemish Sign Language -->
-            <languageAlias type="sgn_CH_DE" replacement="sgg" reason="deprecated"/> <!-- Swiss German Sign Language -->
-            <languageAlias type="zh_guoyu" replacement="zh" reason="deprecated"/> <!-- Mandarin or Standard Chinese -->
-            <languageAlias type="zh_hakka" replacement="hak" reason="deprecated"/> <!-- Hakka -->
-            <languageAlias type="zh_min_nan" replacement="nan" reason="deprecated"/> <!-- Minnan, Hokkien, Amoy, Taiwanese, Southern Min, Southern Fujian, Hoklo, Southern Fukien, Ho-lo -->
-            <languageAlias type="zh_xiang" replacement="hsn" reason="deprecated"/> <!-- Xiang or Hunanese -->
-            <!-- deprecated iso codes -->
-            <languageAlias type="in" replacement="id" reason="deprecated"/> <!-- Indonesian -->
-            <languageAlias type="iw" replacement="he" reason="deprecated"/> <!-- Hebrew -->
-            <languageAlias type="ji" replacement="yi" reason="deprecated"/> <!-- Yiddish -->
-            <languageAlias type="jw" replacement="jv" reason="deprecated"/> <!-- Javanese -->
-            <languageAlias type="mo" replacement="ro_MD" reason="deprecated"/> <!-- Moldovan -->
-            <languageAlias type="scc" replacement="sr" reason="deprecated"/> <!-- Serbian --> 
-            <languageAlias type="scr" replacement="hr" reason="deprecated"/> <!-- Croatian -->
-            <!-- miscellaneous deprecated -->
-            <languageAlias type="no_BOKMAL" replacement="nb" reason="deprecated"/>
-            <languageAlias type="no_NYNORSK" replacement="nn" reason="deprecated"/>
-            <languageAlias type="aa_SAAHO" replacement="ssy" reason="deprecated"/>
-            <!-- legacy use -->
-            <languageAlias type="sh" replacement="sr_Latn" reason="legacy"/> <!-- Serbo-Croatian -->
-            <languageAlias type="no" replacement="nb" reason="legacy"/> <!-- Norwegian -->
-            <languageAlias type="tl" replacement="fil" reason="legacy"/> <!-- Tagalog -->
-    		<languageAlias type="az_AZ" replacement="az_Latn_AZ" reason="legacy"/>
-    		<languageAlias type="bs_BA" replacement="bs_Latn_BA"  reason="legacy"/>
-    		<languageAlias type="ha_GH" replacement="ha_Latn_GH" reason="legacy"/>
-    		<languageAlias type="ha_NE" replacement="ha_Latn_NE" reason="legacy"/>
-    		<languageAlias type="ha_NG" replacement="ha_Latn_NG" reason="legacy"/>
-    		<languageAlias type="kk_KZ" replacement="kk_Cyrl_KZ"  reason="legacy"/>
-    		<languageAlias type="ky_KG" replacement="ky_Cyrl_KG"  reason="legacy"/>
-    		<languageAlias type="ks_IN" replacement="ks_Arab_IN"  reason="legacy"/>
-    		<languageAlias type="mn_MN" replacement="mn_Cyrl_MN" reason="legacy"/>
-    		<languageAlias type="ms_BN" replacement="ms_Latn_BN" reason="legacy"/>
-    		<languageAlias type="ms_MY" replacement="ms_Latn_MY" reason="legacy"/>
-    		<languageAlias type="ms_SG" replacement="ms_Latn_SG" reason="legacy"/>
-    		<languageAlias type="pa_IN" replacement="pa_Guru_IN" reason="legacy"/>
-    		<languageAlias type="pa_PK" replacement="pa_Arab_PK" reason="legacy"/>
-    		<languageAlias type="shi_MA" replacement="shi_Tfng_MA" reason="legacy"/>
-    		<languageAlias type="sr_BA" replacement="sr_Cyrl_BA" reason="legacy"/>
-    		<languageAlias type="sr_ME" replacement="sr_Latn_ME" reason="legacy"/>
-    		<languageAlias type="sr_RS" replacement="sr_Cyrl_RS" reason="legacy"/>
-    		<languageAlias type="sr_XK" replacement="sr_Cyrl_XK" reason="legacy"/>
-    		<languageAlias type="tzm_MA" replacement="tzm_Latn_MA" reason="legacy"/>
-    		<languageAlias type="ug_CN" replacement="ug_Arab_CN"  reason="legacy"/>
-    		<languageAlias type="uz_AF" replacement="uz_Arab_AF" reason="legacy"/>
-    		<languageAlias type="uz_UZ" replacement="uz_Latn_UZ" reason="legacy"/>
-    		<languageAlias type="vai_LR" replacement="vai_Vaii_LR" reason="legacy"/>
-    		<languageAlias type="zh_CN" replacement="zh_Hans_CN" reason="legacy"/>
-    		<languageAlias type="zh_HK" replacement="zh_Hant_HK" reason="legacy"/>
-    		<languageAlias type="zh_MO" replacement="zh_Hant_MO" reason="legacy"/>
-    		<languageAlias type="zh_SG" replacement="zh_Hans_SG" reason="legacy"/>
-    		<languageAlias type="zh_TW" replacement="zh_Hant_TW" reason="legacy"/>
-            <!-- macrolanguages -->
-			<languageAlias type="aju" replacement="jrb" reason="macrolanguage"/> <!-- Moroccan Judeo-Arabic ⇒ Judeo-Arabic -->
-			<languageAlias type="als" replacement="sq" reason="macrolanguage"/> <!-- Albanian, Tosk ⇒ Albanian -->
-			<languageAlias type="arb" replacement="ar" reason="macrolanguage"/> <!-- Standard Arabic ⇒ Arabic -->
-			<languageAlias type="ayr" replacement="ay" reason="macrolanguage"/> <!-- Aymara, Central ⇒ Aymara -->
-			<languageAlias type="azj" replacement="az" reason="macrolanguage"/> <!-- Azerbaijani, North ⇒ Azerbaijani -->
-			<languageAlias type="bcc" replacement="bal" reason="macrolanguage"/> <!-- Balochi, Southern ⇒ Baluchi -->
-			<languageAlias type="bcl" replacement="bik" reason="macrolanguage"/> <!-- Bicolano, Central ⇒ Bikol -->
-			<languageAlias type="bxk" replacement="luy" reason="macrolanguage"/> <!-- Lubukusu ⇒ Luyia -->
-			<languageAlias type="bxr" replacement="bua" reason="macrolanguage"/> <!-- Buriat, Russia ⇒ Buriat -->
-			<languageAlias type="cld" replacement="syr" reason="macrolanguage"/> <!-- Chaldean Neo-Aramaic ⇒ Syriac -->
-			<languageAlias type="cmn" replacement="zh" reason="macrolanguage"/> <!-- Mandarin Chinese ⇒ Chinese -->
-			<languageAlias type="cwd" replacement="cr" reason="macrolanguage"/> <!-- Cree, Woods ⇒ Cree -->
-			<languageAlias type="dgo" replacement="doi" reason="macrolanguage"/> <!-- Dogri ⇒ Dogri (macrolanguage) -->
-			<languageAlias type="dhd" replacement="mwr" reason="macrolanguage"/> <!-- Dhundari ⇒ Marwari -->
-			<languageAlias type="dik" replacement="din" reason="macrolanguage"/> <!-- Southwestern Dinka ⇒ Dinka -->
-			<languageAlias type="diq" replacement="zza" reason="macrolanguage"/> <!-- Dimli ⇒ Zaza -->
-			<languageAlias type="lbk" replacement="bnc" reason="macrolanguage"/> <!-- Central Bontok ⇒ Bontok -->
-			<languageAlias type="ekk" replacement="et" reason="macrolanguage"/> <!-- Standard Estonian ⇒ Estonian -->
-			<languageAlias type="emk" replacement="man" reason="macrolanguage"/> <!-- Maninkakan, Eastern ⇒ Mandingo -->
-			<languageAlias type="esk" replacement="ik" reason="macrolanguage"/> <!-- Northwest Alaska Inupiatun ⇒ Inupiaq -->
-			<languageAlias type="fat" replacement="ak" reason="macrolanguage"/> <!-- Fanti ⇒ Akan -->
-			<languageAlias type="fuc" replacement="ff" reason="macrolanguage"/> <!-- Pular ⇒ Fulah -->
-			<languageAlias type="gaz" replacement="om" reason="macrolanguage"/> <!-- Oromo, West Central ⇒ Oromo -->
-			<languageAlias type="gbo" replacement="grb" reason="macrolanguage"/> <!-- Northern Grebo ⇒ Grebo -->
-			<languageAlias type="gno" replacement="gon" reason="macrolanguage"/> <!-- Northern Gondi ⇒ Gondi -->
-			<languageAlias type="gug" replacement="gn" reason="macrolanguage"/> <!-- Paraguayan Guarani ⇒ Guarani -->
-			<languageAlias type="gya" replacement="gba" reason="macrolanguage"/> <!-- Northwest Gbaya ⇒ Gbaya (Central African Republic) -->
-			<languageAlias type="hdn" replacement="hai" reason="macrolanguage"/> <!-- Northern Haida ⇒ Haida -->
-			<languageAlias type="hea" replacement="hmn" reason="macrolanguage"/> <!-- Northern Qiandong Miao ⇒ Hmong -->
-			<languageAlias type="ike" replacement="iu" reason="macrolanguage"/> <!-- Eastern Canadian Inuktitut ⇒ Inuktitut -->
-			<languageAlias type="kmr" replacement="ku" reason="macrolanguage"/> <!-- Northern Kurdish ⇒ Kurdish -->
-			<languageAlias type="knc" replacement="kr" reason="macrolanguage"/> <!-- Central Kanuri ⇒ Kanuri -->
-			<languageAlias type="kng" replacement="kg" reason="macrolanguage"/> <!-- Koongo ⇒ Kongo -->
-			<languageAlias type="knn" replacement="kok" reason="macrolanguage"/> <!-- Konkani (individual language) ⇒ Konkani -->
-			<languageAlias type="kpv" replacement="kv" reason="macrolanguage"/> <!-- Komi-Zyrian ⇒ Komi -->
-			<languageAlias type="lvs" replacement="lv" reason="macrolanguage"/> <!-- Standard Latvian ⇒ Latvian -->
-			<languageAlias type="mhr" replacement="chm" reason="macrolanguage"/> <!-- Mari, Eastern ⇒ Mari (Russia) -->
-			<languageAlias type="mup" replacement="raj" reason="macrolanguage"/> <!-- Malvi ⇒ Rajasthani -->
-			<languageAlias type="khk" replacement="mn" reason="macrolanguage"/> <!-- Halh Mongolian [mainly in Cyrillic] ⇒ Mongolian -->
-			<languageAlias type="npi" replacement="ne" reason="macrolanguage"/> <!-- Nepali (Individual language) ⇒ Nepali -->
-			<languageAlias type="ojg" replacement="oj" reason="macrolanguage"/> <!-- Ojibwa, Eastern ⇒ Ojibwa -->
-			<languageAlias type="ory" replacement="or" reason="macrolanguage"/> <!-- Oriya (Individual language) ⇒ Oriya -->
-			<languageAlias type="pbu" replacement="ps" reason="macrolanguage"/> <!-- Pashto, Northern ⇒ Pushto -->
-			<languageAlias type="pes" replacement="fa" reason="macrolanguage"/> <!-- Western Farsi ⇒ Persian -->
-			<languageAlias type="plt" replacement="mg" reason="macrolanguage"/> <!-- Malagasy, Plateau ⇒ Malagasy -->
-			<languageAlias type="pnb" replacement="lah" reason="macrolanguage"/> <!-- Western Panjabi ⇒ Lahnda -->
-			<languageAlias type="quz" replacement="qu" reason="macrolanguage"/> <!-- Quechua, Cusco ⇒ Quechua -->
-			<languageAlias type="rmy" replacement="rom" reason="macrolanguage"/> <!-- Romani, Vlax ⇒ Romany -->
-			<languageAlias type="spy" replacement="kln" reason="macrolanguage"/> <!-- Sabaot ⇒ Kalenjin -->
-			<languageAlias type="src" replacement="sc" reason="macrolanguage"/> <!-- Sardinian, Logudorese ⇒ Sardinian -->
-			<languageAlias type="swh" replacement="sw" reason="macrolanguage"/> <!-- Swahili (individual language) ⇒ Swahili -->
-			<languageAlias type="ttq" replacement="tmh" reason="macrolanguage"/> <!-- Tamajaq, Tawallammat ⇒ Tamashek -->
-			<languageAlias type="tw" replacement="ak" reason="macrolanguage"/> <!-- Twi ⇒ Akan -->
-			<languageAlias type="umu" replacement="del" reason="macrolanguage"/> <!-- Munsee ⇒ Delaware -->
-			<languageAlias type="uzn" replacement="uz" reason="macrolanguage"/> <!-- Northern Uzbek ⇒ Uzbek -->
-			<languageAlias type="xpe" replacement="kpe" reason="macrolanguage"/> <!-- Kpelle, Liberia ⇒ Kpelle -->
-			<languageAlias type="xsl" replacement="den" reason="macrolanguage"/> <!-- Slavey, South ⇒ Slave (Athapascan) -->
-			<languageAlias type="ydd" replacement="yi" reason="macrolanguage"/> <!-- Yiddish, Eastern ⇒ Yiddish -->
-			<languageAlias type="zai" replacement="zap" reason="macrolanguage"/> <!-- Zapotec, Isthmus ⇒ Zapotec -->
-			<languageAlias type="zsm" replacement="ms" reason="macrolanguage"/> <!-- Standard Malay ⇒ Malay -->
-			<languageAlias type="zyb" replacement="za" reason="macrolanguage"/> <!-- Yongbei Zhuang ⇒ Zhuang -->
-			<languageAlias type="him" replacement="srx" reason="macrolanguage"/> <!-- Himachali ⇒ Sirmauri (= Pahari, Himachali) -->
-			<languageAlias type="mnk" replacement="man" reason="macrolanguage"/> <!-- Mandinka ⇒ Mandingo -->
-			<!-- incorrect three-letter language codes -->
-            <!-- start of data generated with CountItems tool per http://sites.google.com/site/cldr/development/updating-codes/update-languagescriptregion-subtags -->
-            <languageAlias type="aar" replacement="aa" reason="overlong"/> <!-- [Afar] -->
-            <languageAlias type="abk" replacement="ab" reason="overlong"/> <!-- [Abkhazian] -->
-            <languageAlias type="ave" replacement="ae" reason="overlong"/> <!-- [Avestan] -->
-            <languageAlias type="afr" replacement="af" reason="overlong"/> <!-- [Afrikaans] -->
-            <languageAlias type="aka" replacement="ak" reason="overlong"/> <!-- [Akan] -->
-            <languageAlias type="amh" replacement="am" reason="overlong"/> <!-- [Amharic] -->
-            <languageAlias type="arg" replacement="an" reason="overlong"/> <!-- [Aragonese] -->
-            <languageAlias type="ara" replacement="ar" reason="overlong"/> <!-- [Arabic] -->
-            <languageAlias type="asm" replacement="as" reason="overlong"/> <!-- [Assamese] -->
-            <languageAlias type="ava" replacement="av" reason="overlong"/> <!-- [Avaric] -->
-            <languageAlias type="aym" replacement="ay" reason="overlong"/> <!-- [Aymara] -->
-            <languageAlias type="aze" replacement="az" reason="overlong"/> <!-- [Azerbaijani] -->
-            <languageAlias type="bak" replacement="ba" reason="overlong"/> <!-- [Bashkir] -->
-            <languageAlias type="bel" replacement="be" reason="overlong"/> <!-- [Belarusian] -->
-            <languageAlias type="bul" replacement="bg" reason="overlong"/> <!-- [Bulgarian] -->
-            <languageAlias type="bih" replacement="bh" reason="overlong"/> <!-- [Bihari] -->
-            <languageAlias type="bis" replacement="bi" reason="overlong"/> <!-- [Bislama] -->
-            <languageAlias type="bam" replacement="bm" reason="overlong"/> <!-- [Bambara] -->
-            <languageAlias type="ben" replacement="bn" reason="overlong"/> <!-- [Bengali] -->
-            <languageAlias type="bod" replacement="bo" reason="overlong"/> <!-- [Tibetan] -->
-            <languageAlias type="bre" replacement="br" reason="overlong"/> <!-- [Breton] -->
-            <languageAlias type="bos" replacement="bs" reason="overlong"/> <!-- [Bosnian] -->
-            <languageAlias type="cat" replacement="ca" reason="overlong"/> <!-- [Catalan, Valencian] -->
-            <languageAlias type="che" replacement="ce" reason="overlong"/> <!-- [Chechen] -->
-            <languageAlias type="cha" replacement="ch" reason="overlong"/> <!-- [Chamorro] -->
-            <languageAlias type="cos" replacement="co" reason="overlong"/> <!-- [Corsican] -->
-            <languageAlias type="cre" replacement="cr" reason="overlong"/> <!-- [Cree] -->
-            <languageAlias type="ces" replacement="cs" reason="overlong"/> <!-- [Czech] -->
-            <languageAlias type="chu" replacement="cu" reason="overlong"/> <!-- [Church Slavic, Church Slavonic, Old Bulgarian, Old Church Slavonic, Old Slavonic] -->
-            <languageAlias type="chv" replacement="cv" reason="overlong"/> <!-- [Chuvash] -->
-            <languageAlias type="cym" replacement="cy" reason="overlong"/> <!-- [Welsh] -->
-            <languageAlias type="dan" replacement="da" reason="overlong"/> <!-- [Danish] -->
-            <languageAlias type="deu" replacement="de" reason="overlong"/> <!-- [German] -->
-            <languageAlias type="div" replacement="dv" reason="overlong"/> <!-- [Dhivehi, Divehi, Maldivian] -->
-            <languageAlias type="dzo" replacement="dz" reason="overlong"/> <!-- [Dzongkha] -->
-            <languageAlias type="ewe" replacement="ee" reason="overlong"/> <!-- [Ewe] -->
-            <languageAlias type="ell" replacement="el" reason="overlong"/> <!-- [Modern Greek (1453-)] -->
-            <languageAlias type="eng" replacement="en" reason="overlong"/> <!-- [English] -->
-            <languageAlias type="epo" replacement="eo" reason="overlong"/> <!-- [Esperanto] -->
-            <languageAlias type="spa" replacement="es" reason="overlong"/> <!-- [Spanish, Castilian] -->
-            <languageAlias type="est" replacement="et" reason="overlong"/> <!-- [Estonian] -->
-            <languageAlias type="eus" replacement="eu" reason="overlong"/> <!-- [Basque] -->
-            <languageAlias type="fas" replacement="fa" reason="overlong"/> <!-- [Persian] -->
-            <languageAlias type="ful" replacement="ff" reason="overlong"/> <!-- [Fulah] -->
-            <languageAlias type="fin" replacement="fi" reason="overlong"/> <!-- [Finnish] -->
-            <languageAlias type="fij" replacement="fj" reason="overlong"/> <!-- [Fijian] -->
-            <languageAlias type="fao" replacement="fo" reason="overlong"/> <!-- [Faroese] -->
-            <languageAlias type="fra" replacement="fr" reason="overlong"/> <!-- [French] -->
-            <languageAlias type="fry" replacement="fy" reason="overlong"/> <!-- [Western Frisian] -->
-            <languageAlias type="gle" replacement="ga" reason="overlong"/> <!-- [Irish] -->
-            <languageAlias type="gla" replacement="gd" reason="overlong"/> <!-- [Scottish Gaelic, Gaelic] -->
-            <languageAlias type="glg" replacement="gl" reason="overlong"/> <!-- [Galician] -->
-            <languageAlias type="grn" replacement="gn" reason="overlong"/> <!-- [Guarani] -->
-            <languageAlias type="guj" replacement="gu" reason="overlong"/> <!-- [Gujarati] -->
-            <languageAlias type="glv" replacement="gv" reason="overlong"/> <!-- [Manx] -->
-            <languageAlias type="hau" replacement="ha" reason="overlong"/> <!-- [Hausa] -->
-            <languageAlias type="heb" replacement="he" reason="overlong"/> <!-- [Hebrew] -->
-            <languageAlias type="hin" replacement="hi" reason="overlong"/> <!-- [Hindi] -->
-            <languageAlias type="hmo" replacement="ho" reason="overlong"/> <!-- [Hiri Motu] -->
-            <languageAlias type="hrv" replacement="hr" reason="overlong"/> <!-- [Croatian] -->
-            <languageAlias type="hat" replacement="ht" reason="overlong"/> <!-- [Haitian, Haitian Creole] -->
-            <languageAlias type="hun" replacement="hu" reason="overlong"/> <!-- [Hungarian] -->
-            <languageAlias type="hye" replacement="hy" reason="overlong"/> <!-- [Armenian] -->
-            <languageAlias type="her" replacement="hz" reason="overlong"/> <!-- [Herero] -->
-            <languageAlias type="ina" replacement="ia" reason="overlong"/> <!-- [Interlingua (International Auxiliary Language Association)] -->
-            <languageAlias type="ind" replacement="id" reason="overlong"/> <!-- [Indonesian] -->
-            <languageAlias type="ile" replacement="ie" reason="overlong"/> <!-- [Interlingue, Occidental] -->
-            <languageAlias type="ibo" replacement="ig" reason="overlong"/> <!-- [Igbo] -->
-            <languageAlias type="iii" replacement="ii" reason="overlong"/> <!-- [Sichuan Yi, Nuosu] -->
-            <languageAlias type="ipk" replacement="ik" reason="overlong"/> <!-- [Inupiaq] -->
-            <languageAlias type="ido" replacement="io" reason="overlong"/> <!-- [Ido] -->
-            <languageAlias type="isl" replacement="is" reason="overlong"/> <!-- [Icelandic] -->
-            <languageAlias type="ita" replacement="it" reason="overlong"/> <!-- [Italian] -->
-            <languageAlias type="iku" replacement="iu" reason="overlong"/> <!-- [Inuktitut] -->
-            <languageAlias type="jpn" replacement="ja" reason="overlong"/> <!-- [Japanese] -->
-            <languageAlias type="jav" replacement="jv" reason="overlong"/> <!-- [Javanese] -->
-            <languageAlias type="kat" replacement="ka" reason="overlong"/> <!-- [Georgian] -->
-            <languageAlias type="kon" replacement="kg" reason="overlong"/> <!-- [Kongo] -->
-            <languageAlias type="kik" replacement="ki" reason="overlong"/> <!-- [Kikuyu, Gikuyu] -->
-            <languageAlias type="kua" replacement="kj" reason="overlong"/> <!-- [Kuanyama, Kwanyama] -->
-            <languageAlias type="kaz" replacement="kk" reason="overlong"/> <!-- [Kazakh] -->
-            <languageAlias type="kal" replacement="kl" reason="overlong"/> <!-- [Kalaallisut, Greenlandic] -->
-            <languageAlias type="khm" replacement="km" reason="overlong"/> <!-- [Central Khmer] -->
-            <languageAlias type="kan" replacement="kn" reason="overlong"/> <!-- [Kannada] -->
-            <languageAlias type="kor" replacement="ko" reason="overlong"/> <!-- [Korean] -->
-            <languageAlias type="kau" replacement="kr" reason="overlong"/> <!-- [Kanuri] -->
-            <languageAlias type="kas" replacement="ks" reason="overlong"/> <!-- [Kashmiri] -->
-            <languageAlias type="kur" replacement="ku" reason="overlong"/> <!-- [Kurdish] -->
-            <languageAlias type="kom" replacement="kv" reason="overlong"/> <!-- [Komi] -->
-            <languageAlias type="cor" replacement="kw" reason="overlong"/> <!-- [Cornish] -->
-            <languageAlias type="kir" replacement="ky" reason="overlong"/> <!-- [Kirghiz, Kyrgyz] -->
-            <languageAlias type="lat" replacement="la" reason="overlong"/> <!-- [Latin] -->
-            <languageAlias type="ltz" replacement="lb" reason="overlong"/> <!-- [Luxembourgish, Letzeburgesch] -->
-            <languageAlias type="lug" replacement="lg" reason="overlong"/> <!-- [Ganda] -->
-            <languageAlias type="lim" replacement="li" reason="overlong"/> <!-- [Limburgan, Limburger, Limburgish] -->
-            <languageAlias type="lin" replacement="ln" reason="overlong"/> <!-- [Lingala] -->
-            <languageAlias type="lao" replacement="lo" reason="overlong"/> <!-- [Lao] -->
-            <languageAlias type="lit" replacement="lt" reason="overlong"/> <!-- [Lithuanian] -->
-            <languageAlias type="lub" replacement="lu" reason="overlong"/> <!-- [Luba-Katanga] -->
-            <languageAlias type="lav" replacement="lv" reason="overlong"/> <!-- [Latvian] -->
-            <languageAlias type="mlg" replacement="mg" reason="overlong"/> <!-- [Malagasy] -->
-            <languageAlias type="mah" replacement="mh" reason="overlong"/> <!-- [Marshallese] -->
-            <languageAlias type="mri" replacement="mi" reason="overlong"/> <!-- [Maori] -->
-            <languageAlias type="mkd" replacement="mk" reason="overlong"/> <!-- [Macedonian] -->
-            <languageAlias type="mal" replacement="ml" reason="overlong"/> <!-- [Malayalam] -->
-            <languageAlias type="mon" replacement="mn" reason="overlong"/> <!-- [Mongolian] -->
-            <languageAlias type="mol" replacement="ro_MD" reason="overlong"/> <!-- [Moldavian] -->
-            <languageAlias type="mar" replacement="mr" reason="overlong"/> <!-- [Marathi] -->
-            <languageAlias type="msa" replacement="ms" reason="overlong"/> <!-- [Malay (macrolanguage)] -->
-            <languageAlias type="mlt" replacement="mt" reason="overlong"/> <!-- [Maltese] -->
-            <languageAlias type="mya" replacement="my" reason="overlong"/> <!-- [Burmese] -->
-            <languageAlias type="nau" replacement="na" reason="overlong"/> <!-- [Nauru] -->
-            <languageAlias type="nob" replacement="nb" reason="overlong"/> <!-- [Norwegian Bokmål] -->
-            <languageAlias type="nde" replacement="nd" reason="overlong"/> <!-- [North Ndebele] -->
-            <languageAlias type="nep" replacement="ne" reason="overlong"/> <!-- [Nepali (macrolanguage)] -->
-            <languageAlias type="ndo" replacement="ng" reason="overlong"/> <!-- [Ndonga] -->
-            <languageAlias type="nld" replacement="nl" reason="overlong"/> <!-- [Dutch, Flemish] -->
-            <languageAlias type="nno" replacement="nn" reason="overlong"/> <!-- [Norwegian Nynorsk] -->
-            <languageAlias type="nor" replacement="nb" reason="overlong"/> <!-- [Norwegian] -->
-            <languageAlias type="nbl" replacement="nr" reason="overlong"/> <!-- [South Ndebele] -->
-            <languageAlias type="nav" replacement="nv" reason="overlong"/> <!-- [Navajo, Navaho] -->
-            <languageAlias type="nya" replacement="ny" reason="overlong"/> <!-- [Nyanja, Chewa, Chichewa] -->
-            <languageAlias type="oci" replacement="oc" reason="overlong"/> <!-- [Occitan (post 1500)] -->
-            <languageAlias type="oji" replacement="oj" reason="overlong"/> <!-- [Ojibwa] -->
-            <languageAlias type="orm" replacement="om" reason="overlong"/> <!-- [Oromo] -->
-            <languageAlias type="ori" replacement="or" reason="overlong"/> <!-- [Oriya (macrolanguage)] -->
-            <languageAlias type="oss" replacement="os" reason="overlong"/> <!-- [Ossetian, Ossetic] -->
-            <languageAlias type="pan" replacement="pa" reason="overlong"/> <!-- [Panjabi, Punjabi] -->
-            <languageAlias type="pli" replacement="pi" reason="overlong"/> <!-- [Pali] -->
-            <languageAlias type="pol" replacement="pl" reason="overlong"/> <!-- [Polish] -->
-            <languageAlias type="pus" replacement="ps" reason="overlong"/> <!-- [Pushto, Pashto] -->
-            <languageAlias type="por" replacement="pt" reason="overlong"/> <!-- [Portuguese] -->
-            <languageAlias type="que" replacement="qu" reason="overlong"/> <!-- [Quechua] -->
-            <languageAlias type="roh" replacement="rm" reason="overlong"/> <!-- [Romansh] -->
-            <languageAlias type="run" replacement="rn" reason="overlong"/> <!-- [Rundi] -->
-            <languageAlias type="ron" replacement="ro" reason="overlong"/> <!-- [Romanian, Moldavian, Moldovan] -->
-            <languageAlias type="rus" replacement="ru" reason="overlong"/> <!-- [Russian] -->
-            <languageAlias type="kin" replacement="rw" reason="overlong"/> <!-- [Kinyarwanda] -->
-            <languageAlias type="san" replacement="sa" reason="overlong"/> <!-- [Sanskrit] -->
-            <languageAlias type="srd" replacement="sc" reason="overlong"/> <!-- [Sardinian] -->
-            <languageAlias type="snd" replacement="sd" reason="overlong"/> <!-- [Sindhi] -->
-            <languageAlias type="sme" replacement="se" reason="overlong"/> <!-- [Northern Sami] -->
-            <languageAlias type="sag" replacement="sg" reason="overlong"/> <!-- [Sango] -->
-            <languageAlias type="hbs" replacement="sr_Latn" reason="overlong"/> <!-- [Serbo-Croatian] -->
-            <languageAlias type="sin" replacement="si" reason="overlong"/> <!-- [Sinhala, Sinhalese] -->
-            <languageAlias type="slk" replacement="sk" reason="overlong"/> <!-- [Slovak] -->
-            <languageAlias type="slv" replacement="sl" reason="overlong"/> <!-- [Slovenian] -->
-            <languageAlias type="smo" replacement="sm" reason="overlong"/> <!-- [Samoan] -->
-            <languageAlias type="sna" replacement="sn" reason="overlong"/> <!-- [Shona] -->
-            <languageAlias type="som" replacement="so" reason="overlong"/> <!-- [Somali] -->
-            <languageAlias type="sqi" replacement="sq" reason="overlong"/> <!-- [Albanian] -->
-            <languageAlias type="srp" replacement="sr" reason="overlong"/> <!-- [Serbian] -->
-            <languageAlias type="ssw" replacement="ss" reason="overlong"/> <!-- [Swati] -->
-            <languageAlias type="sot" replacement="st" reason="overlong"/> <!-- [Southern Sotho] -->
-            <languageAlias type="sun" replacement="su" reason="overlong"/> <!-- [Sundanese] -->
-            <languageAlias type="swe" replacement="sv" reason="overlong"/> <!-- [Swedish] -->
-            <languageAlias type="swa" replacement="sw" reason="overlong"/> <!-- [Swahili (macrolanguage)] -->
-            <languageAlias type="tam" replacement="ta" reason="overlong"/> <!-- [Tamil] -->
-            <languageAlias type="tel" replacement="te" reason="overlong"/> <!-- [Telugu] -->
-            <languageAlias type="tgk" replacement="tg" reason="overlong"/> <!-- [Tajik] -->
-            <languageAlias type="tha" replacement="th" reason="overlong"/> <!-- [Thai] -->
-            <languageAlias type="tir" replacement="ti" reason="overlong"/> <!-- [Tigrinya] -->
-            <languageAlias type="tuk" replacement="tk" reason="overlong"/> <!-- [Turkmen] -->
-            <languageAlias type="tgl" replacement="fil" reason="overlong"/> <!-- [Tagalog] -->
-            <languageAlias type="tsn" replacement="tn" reason="overlong"/> <!-- [Tswana] -->
-            <languageAlias type="ton" replacement="to" reason="overlong"/> <!-- [Tonga (Tonga Islands)] -->
-            <languageAlias type="tur" replacement="tr" reason="overlong"/> <!-- [Turkish] -->
-            <languageAlias type="tso" replacement="ts" reason="overlong"/> <!-- [Tsonga] -->
-            <languageAlias type="tat" replacement="tt" reason="overlong"/> <!-- [Tatar] -->
-            <languageAlias type="twi" replacement="ak" reason="overlong"/> <!-- [Twi] -->
-            <languageAlias type="tah" replacement="ty" reason="overlong"/> <!-- [Tahitian] -->
-            <languageAlias type="uig" replacement="ug" reason="overlong"/> <!-- [Uighur, Uyghur] -->
-            <languageAlias type="ukr" replacement="uk" reason="overlong"/> <!-- [Ukrainian] -->
-            <languageAlias type="urd" replacement="ur" reason="overlong"/> <!-- [Urdu] -->
-            <languageAlias type="uzb" replacement="uz" reason="overlong"/> <!-- [Uzbek] -->
-            <languageAlias type="ven" replacement="ve" reason="overlong"/> <!-- [Venda] -->
-            <languageAlias type="vie" replacement="vi" reason="overlong"/> <!-- [Vietnamese] -->
-            <languageAlias type="vol" replacement="vo" reason="overlong"/> <!-- [Volapük] -->
-            <languageAlias type="wln" replacement="wa" reason="overlong"/> <!-- [Walloon] -->
-            <languageAlias type="wol" replacement="wo" reason="overlong"/> <!-- [Wolof] -->
-            <languageAlias type="xho" replacement="xh" reason="overlong"/> <!-- [Xhosa] -->
-            <languageAlias type="yid" replacement="yi" reason="overlong"/> <!-- [Yiddish] -->
-            <languageAlias type="yor" replacement="yo" reason="overlong"/> <!-- [Yoruba] -->
-            <languageAlias type="zha" replacement="za" reason="overlong"/> <!-- [Zhuang, Chuang] -->
-            <languageAlias type="zho" replacement="zh" reason="overlong"/> <!-- [Chinese] -->
-            <languageAlias type="zul" replacement="zu" reason="overlong"/> <!-- [Zulu] -->
-            <!-- Bibliographic -->
-            <languageAlias type="alb" replacement="sq" reason="bibliographic"/> <!-- [Albanian] -->
-            <languageAlias type="arm" replacement="hy" reason="bibliographic"/> <!-- [Armenian] -->
-            <languageAlias type="baq" replacement="eu" reason="bibliographic"/> <!-- [Basque] -->
-            <languageAlias type="bur" replacement="my" reason="bibliographic"/> <!-- [Burmese] -->
-            <languageAlias type="chi" replacement="zh" reason="bibliographic"/> <!-- [Chinese] -->
-            <languageAlias type="cze" replacement="cs" reason="bibliographic"/> <!-- [Czech] -->
-            <languageAlias type="dut" replacement="nl" reason="bibliographic"/> <!-- [Dutch, Flemish] -->
-            <languageAlias type="fre" replacement="fr" reason="bibliographic"/> <!-- [French] -->
-            <languageAlias type="geo" replacement="ka" reason="bibliographic"/> <!-- [Georgian] -->
-            <languageAlias type="ger" replacement="de" reason="bibliographic"/> <!-- [German] -->
-            <languageAlias type="gre" replacement="el" reason="bibliographic"/> <!-- [Modern Greek (1453-)] -->
-            <languageAlias type="ice" replacement="is" reason="bibliographic"/> <!-- [Icelandic] -->
-            <languageAlias type="mac" replacement="mk" reason="bibliographic"/> <!-- [Macedonian] -->
-            <languageAlias type="mao" replacement="mi" reason="bibliographic"/> <!-- [Maori] -->
-            <languageAlias type="may" replacement="ms" reason="bibliographic"/> <!-- [Malay (macrolanguage)] -->
-            <languageAlias type="per" replacement="fa" reason="bibliographic"/> <!-- [Persian] -->
-            <languageAlias type="rum" replacement="ro" reason="bibliographic"/> <!-- [Romanian, Moldavian, Moldovan] -->
-            <languageAlias type="slo" replacement="sk" reason="bibliographic"/> <!-- [Slovak] -->
-            <languageAlias type="tib" replacement="bo" reason="bibliographic"/> <!-- [Tibetan] -->
-            <languageAlias type="wel" replacement="cy" reason="bibliographic"/> <!-- [Welsh] -->
-            <!-- end of data generated with CountItems tool per http://sites.google.com/site/cldr/development/updating-codes/update-languagescriptregion-subtags -->
-            <!-- scripts -->
-            <scriptAlias type="Qaai" replacement="Zinh" reason="deprecated"/>
-            <!-- deprecated ISO territories in 3066 + CLDR ones (older deprecated ISO codes -->
-            <territoryAlias type="AN" replacement="CW SX BQ" reason="deprecated"/> <!-- Netherlands Antilles Curaçao largest, then Sint Martin, then BQ -->
-            <territoryAlias type="BU" replacement="MM" reason="deprecated"/> <!-- Burma -->
-            <territoryAlias type="CS" replacement="RS ME" reason="deprecated"/> <!-- Serbia & Montenegro -->
-            <territoryAlias type="CT" replacement="KI" reason="deprecated"/> <!-- CLDR: Canton and Enderbury Islands -->
-            <territoryAlias type="DD" replacement="DE" reason="deprecated"/> <!-- German Democratic Republic -->
-            <territoryAlias type="DY" replacement="BJ" reason="deprecated"/> <!-- CLDR:Benin -->
-            <territoryAlias type="FQ" replacement="AQ TF" reason="deprecated"/> <!-- CLDR: French Southern and Antarctic Territories (now split between AQ and TF) -->
-            <territoryAlias type="FX" replacement="FR" reason="deprecated"/> <!-- Metropolitan France -->
-            <territoryAlias type="HV" replacement="BF" reason="deprecated"/> <!-- CLDR:Burkina Faso -->
-            <territoryAlias type="JT" replacement="UM" reason="deprecated"/> <!-- CLDR: Johnston Island -->
-            <territoryAlias type="MI" replacement="UM" reason="deprecated"/> <!-- CLDR: Midway Islands -->
-            <territoryAlias type="NH" replacement="VU" reason="deprecated"/> <!-- CLDR:Vanuatu -->
-            <territoryAlias type="NQ" replacement="AQ" reason="deprecated"/> <!-- CLDR: Dronning Maud Land -->
-            <territoryAlias type="NT" replacement="SA IQ" reason="deprecated"/> <!-- Neutral Zone -->
-            <territoryAlias type="PC" replacement="FM MH MP PW" reason="deprecated"/> <!-- CLDR: Pacific Islands Trust Territory (divided into FM, MH, MP, and PW) -->
-            <territoryAlias type="PU" replacement="UM" reason="deprecated"/> <!-- CLDR: U.S. Miscellaneous Pacific Islands -->
-            <territoryAlias type="PZ" replacement="PA" reason="deprecated"/> <!-- CLDR: Panama Canal Zone -->
-            <territoryAlias type="QU" replacement="EU" reason="deprecated"/> <!-- CLDR: European Union -->
-            <territoryAlias type="RH" replacement="ZW" reason="deprecated"/> <!-- CLDR:Zimbabwe -->
-            <territoryAlias type="SU" replacement="RU AM AZ BY EE GE KZ KG LV LT MD TJ TM UA UZ" reason="deprecated"/> <!-- Union of Soviet Socialist Republics -->
-            <territoryAlias type="TP" replacement="TL" reason="deprecated"/> <!-- East Timor -->
-            <territoryAlias type="UK" replacement="GB" reason="deprecated"/> <!-- CLDR: Great Britain -->
-            <territoryAlias type="VD" replacement="VN" reason="deprecated"/> <!-- CLDR: North Vietnam -->
-            <territoryAlias type="WK" replacement="UM" reason="deprecated"/> <!-- CLDR: Wake Island -->
-            <territoryAlias type="YD" replacement="YE" reason="deprecated"/> <!-- Yemen, Democratic -->
-            <territoryAlias type="YU" replacement="RS ME" reason="deprecated"/> <!-- Yugoslavia -->
-            <territoryAlias type="ZR" replacement="CD" reason="deprecated"/> <!-- Zaire -->
-            <territoryAlias type="062" replacement="034 143" reason="deprecated"/> <!-- South-Central Asia -->
-            <territoryAlias type="172" replacement="RU AM AZ BY GE KG KZ MD TJ TM UA UZ" reason="deprecated"/> <!-- 172 not part of BCP47 -->
-            <territoryAlias type="200" replacement="CZ SK" reason="deprecated"/> <!-- Czechoslovakia -->
-            <territoryAlias type="230" replacement="ET" reason="deprecated"/> <!-- Ethiopia (pre-1993) -->
-            <territoryAlias type="280" replacement="DE" reason="deprecated"/> <!-- West Germany (pre-1990) -->
-            <territoryAlias type="532" replacement="CW SX BQ" reason="deprecated"/> <!-- Netherlands Antilles (pre-1986) -->
-            <territoryAlias type="582" replacement="FM MH MP PW" reason="deprecated"/> <!-- Pacific Islands (Trust Territory - pre-1991) -->
-            <territoryAlias type="736" replacement="SD" reason="deprecated"/> <!-- Sudan (pre-2011) -->
-            <territoryAlias type="830" replacement="JE GG" reason="deprecated"/> <!-- Channel Islands -->
-            <territoryAlias type="886" replacement="YE" reason="deprecated"/> <!-- Yemen (pre-1990) -->
-            <territoryAlias type="890" replacement="RS ME SI HR MK BA" reason="deprecated"/> <!-- Yugoslavia (pre-1992) -->
-            <!-- 3-letter ISO code values -->
-            <!-- start of data generated with CountItems tool per http://sites.google.com/site/cldr/development/updating-codes/update-languagescriptregion-subtags -->
-            <territoryAlias type="AAA" replacement="AA" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="ASC" replacement="AC" reason="overlong"/> <!-- Ascension Island -->
-            <territoryAlias type="AND" replacement="AD" reason="overlong"/> <!-- Andorra -->
-            <territoryAlias type="ARE" replacement="AE" reason="overlong"/> <!-- United Arab Emirates -->
-            <territoryAlias type="AFG" replacement="AF" reason="overlong"/> <!-- Afghanistan -->
-            <territoryAlias type="ATG" replacement="AG" reason="overlong"/> <!-- Antigua & Barbuda -->
-            <territoryAlias type="AIA" replacement="AI" reason="overlong"/> <!-- Anguilla -->
-            <territoryAlias type="ALB" replacement="AL" reason="overlong"/> <!-- Albania -->
-            <territoryAlias type="ARM" replacement="AM" reason="overlong"/> <!-- Armenia -->
-            <territoryAlias type="ANT" replacement="CW SX BQ" reason="overlong"/> <!-- null -->
-            <territoryAlias type="AGO" replacement="AO" reason="overlong"/> <!-- Angola -->
-            <territoryAlias type="ATA" replacement="AQ" reason="overlong"/> <!-- Antarctica -->
-            <territoryAlias type="ARG" replacement="AR" reason="overlong"/> <!-- Argentina -->
-            <territoryAlias type="ASM" replacement="AS" reason="overlong"/> <!-- American Samoa -->
-            <territoryAlias type="AUT" replacement="AT" reason="overlong"/> <!-- Austria -->
-            <territoryAlias type="AUS" replacement="AU" reason="overlong"/> <!-- Australia -->
-            <territoryAlias type="ABW" replacement="AW" reason="overlong"/> <!-- Aruba -->
-            <territoryAlias type="ALA" replacement="AX" reason="overlong"/> <!-- Åland Islands -->
-            <territoryAlias type="AZE" replacement="AZ" reason="overlong"/> <!-- Azerbaijan -->
-            <territoryAlias type="BIH" replacement="BA" reason="overlong"/> <!-- Bosnia & Herzegovina -->
-            <territoryAlias type="BRB" replacement="BB" reason="overlong"/> <!-- Barbados -->
-            <territoryAlias type="BGD" replacement="BD" reason="overlong"/> <!-- Bangladesh -->
-            <territoryAlias type="BEL" replacement="BE" reason="overlong"/> <!-- Belgium -->
-            <territoryAlias type="BFA" replacement="BF" reason="overlong"/> <!-- Burkina Faso -->
-            <territoryAlias type="BGR" replacement="BG" reason="overlong"/> <!-- Bulgaria -->
-            <territoryAlias type="BHR" replacement="BH" reason="overlong"/> <!-- Bahrain -->
-            <territoryAlias type="BDI" replacement="BI" reason="overlong"/> <!-- Burundi -->
-            <territoryAlias type="BEN" replacement="BJ" reason="overlong"/> <!-- Benin -->
-            <territoryAlias type="BLM" replacement="BL" reason="overlong"/> <!-- St. Barthélemy -->
-            <territoryAlias type="BMU" replacement="BM" reason="overlong"/> <!-- Bermuda -->
-            <territoryAlias type="BRN" replacement="BN" reason="overlong"/> <!-- Brunei -->
-            <territoryAlias type="BOL" replacement="BO" reason="overlong"/> <!-- Bolivia -->
-            <territoryAlias type="BES" replacement="BQ" reason="overlong"/> <!-- Caribbean Netherlands -->
-            <territoryAlias type="BRA" replacement="BR" reason="overlong"/> <!-- Brazil -->
-            <territoryAlias type="BHS" replacement="BS" reason="overlong"/> <!-- Bahamas -->
-            <territoryAlias type="BTN" replacement="BT" reason="overlong"/> <!-- Bhutan -->
-            <territoryAlias type="BUR" replacement="MM" reason="overlong"/> <!-- Myanmar (Burma) -->
-            <territoryAlias type="BVT" replacement="BV" reason="overlong"/> <!-- Bouvet Island -->
-            <territoryAlias type="BWA" replacement="BW" reason="overlong"/> <!-- Botswana -->
-            <territoryAlias type="BLR" replacement="BY" reason="overlong"/> <!-- Belarus -->
-            <territoryAlias type="BLZ" replacement="BZ" reason="overlong"/> <!-- Belize -->
-            <territoryAlias type="CAN" replacement="CA" reason="overlong"/> <!-- Canada -->
-            <territoryAlias type="CCK" replacement="CC" reason="overlong"/> <!-- Cocos (Keeling) Islands -->
-            <territoryAlias type="COD" replacement="CD" reason="overlong"/> <!-- Congo - Kinshasa -->
-            <territoryAlias type="CAF" replacement="CF" reason="overlong"/> <!-- Central African Republic -->
-            <territoryAlias type="COG" replacement="CG" reason="overlong"/> <!-- Congo - Brazzaville -->
-            <territoryAlias type="CHE" replacement="CH" reason="overlong"/> <!-- Switzerland -->
-            <territoryAlias type="CIV" replacement="CI" reason="overlong"/> <!-- Côte d’Ivoire -->
-            <territoryAlias type="COK" replacement="CK" reason="overlong"/> <!-- Cook Islands -->
-            <territoryAlias type="CHL" replacement="CL" reason="overlong"/> <!-- Chile -->
-            <territoryAlias type="CMR" replacement="CM" reason="overlong"/> <!-- Cameroon -->
-            <territoryAlias type="CHN" replacement="CN" reason="overlong"/> <!-- China -->
-            <territoryAlias type="COL" replacement="CO" reason="overlong"/> <!-- Colombia -->
-            <territoryAlias type="CPT" replacement="CP" reason="overlong"/> <!-- Clipperton Island -->
-            <territoryAlias type="CRI" replacement="CR" reason="overlong"/> <!-- Costa Rica -->
-            <territoryAlias type="SCG" replacement="RS ME" reason="overlong"/> <!-- null -->
-            <territoryAlias type="CUB" replacement="CU" reason="overlong"/> <!-- Cuba -->
-            <territoryAlias type="CPV" replacement="CV" reason="overlong"/> <!-- Cape Verde -->
-            <territoryAlias type="CUW" replacement="CW" reason="overlong"/> <!-- Curaçao -->
-            <territoryAlias type="CXR" replacement="CX" reason="overlong"/> <!-- Christmas Island -->
-            <territoryAlias type="CYP" replacement="CY" reason="overlong"/> <!-- Cyprus -->
-            <territoryAlias type="CZE" replacement="CZ" reason="overlong"/> <!-- Czech Republic -->
-            <territoryAlias type="DDR" replacement="DE" reason="overlong"/> <!-- Germany -->
-            <territoryAlias type="DEU" replacement="DE" reason="overlong"/> <!-- Germany -->
-            <territoryAlias type="DGA" replacement="DG" reason="overlong"/> <!-- Diego Garcia -->
-            <territoryAlias type="DJI" replacement="DJ" reason="overlong"/> <!-- Djibouti -->
-            <territoryAlias type="DNK" replacement="DK" reason="overlong"/> <!-- Denmark -->
-            <territoryAlias type="DMA" replacement="DM" reason="overlong"/> <!-- Dominica -->
-            <territoryAlias type="DOM" replacement="DO" reason="overlong"/> <!-- Dominican Republic -->
-            <territoryAlias type="DZA" replacement="DZ" reason="overlong"/> <!-- Algeria -->
-            <territoryAlias type="ECU" replacement="EC" reason="overlong"/> <!-- Ecuador -->
-            <territoryAlias type="EST" replacement="EE" reason="overlong"/> <!-- Estonia -->
-            <territoryAlias type="EGY" replacement="EG" reason="overlong"/> <!-- Egypt -->
-            <territoryAlias type="ESH" replacement="EH" reason="overlong"/> <!-- Western Sahara -->
-            <territoryAlias type="ERI" replacement="ER" reason="overlong"/> <!-- Eritrea -->
-            <territoryAlias type="ESP" replacement="ES" reason="overlong"/> <!-- Spain -->
-            <territoryAlias type="ETH" replacement="ET" reason="overlong"/> <!-- Ethiopia -->
-            <territoryAlias type="FIN" replacement="FI" reason="overlong"/> <!-- Finland -->
-            <territoryAlias type="FJI" replacement="FJ" reason="overlong"/> <!-- Fiji -->
-            <territoryAlias type="FLK" replacement="FK" reason="overlong"/> <!-- Falkland Islands -->
-            <territoryAlias type="FSM" replacement="FM" reason="overlong"/> <!-- Micronesia -->
-            <territoryAlias type="FRO" replacement="FO" reason="overlong"/> <!-- Faroe Islands -->
-            <territoryAlias type="FRA" replacement="FR" reason="overlong"/> <!-- France -->
-            <territoryAlias type="FXX" replacement="FR" reason="overlong"/> <!-- France -->
-            <territoryAlias type="GAB" replacement="GA" reason="overlong"/> <!-- Gabon -->
-            <territoryAlias type="GBR" replacement="GB" reason="overlong"/> <!-- United Kingdom -->
-            <territoryAlias type="GRD" replacement="GD" reason="overlong"/> <!-- Grenada -->
-            <territoryAlias type="GEO" replacement="GE" reason="overlong"/> <!-- Georgia -->
-            <territoryAlias type="GUF" replacement="GF" reason="overlong"/> <!-- French Guiana -->
-            <territoryAlias type="GGY" replacement="GG" reason="overlong"/> <!-- Guernsey -->
-            <territoryAlias type="GHA" replacement="GH" reason="overlong"/> <!-- Ghana -->
-            <territoryAlias type="GIB" replacement="GI" reason="overlong"/> <!-- Gibraltar -->
-            <territoryAlias type="GRL" replacement="GL" reason="overlong"/> <!-- Greenland -->
-            <territoryAlias type="GMB" replacement="GM" reason="overlong"/> <!-- Gambia -->
-            <territoryAlias type="GIN" replacement="GN" reason="overlong"/> <!-- Guinea -->
-            <territoryAlias type="GLP" replacement="GP" reason="overlong"/> <!-- Guadeloupe -->
-            <territoryAlias type="GNQ" replacement="GQ" reason="overlong"/> <!-- Equatorial Guinea -->
-            <territoryAlias type="GRC" replacement="GR" reason="overlong"/> <!-- Greece -->
-            <territoryAlias type="SGS" replacement="GS" reason="overlong"/> <!-- South Georgia & South Sandwich Islands -->
-            <territoryAlias type="GTM" replacement="GT" reason="overlong"/> <!-- Guatemala -->
-            <territoryAlias type="GUM" replacement="GU" reason="overlong"/> <!-- Guam -->
-            <territoryAlias type="GNB" replacement="GW" reason="overlong"/> <!-- Guinea-Bissau -->
-            <territoryAlias type="GUY" replacement="GY" reason="overlong"/> <!-- Guyana -->
-            <territoryAlias type="HKG" replacement="HK" reason="overlong"/> <!-- Hong Kong SAR China -->
-            <territoryAlias type="HMD" replacement="HM" reason="overlong"/> <!-- Heard & McDonald Islands -->
-            <territoryAlias type="HND" replacement="HN" reason="overlong"/> <!-- Honduras -->
-            <territoryAlias type="HRV" replacement="HR" reason="overlong"/> <!-- Croatia -->
-            <territoryAlias type="HTI" replacement="HT" reason="overlong"/> <!-- Haiti -->
-            <territoryAlias type="HUN" replacement="HU" reason="overlong"/> <!-- Hungary -->
-            <territoryAlias type="IDN" replacement="ID" reason="overlong"/> <!-- Indonesia -->
-            <territoryAlias type="IRL" replacement="IE" reason="overlong"/> <!-- Ireland -->
-            <territoryAlias type="ISR" replacement="IL" reason="overlong"/> <!-- Israel -->
-            <territoryAlias type="IMN" replacement="IM" reason="overlong"/> <!-- Isle of Man -->
-            <territoryAlias type="IND" replacement="IN" reason="overlong"/> <!-- India -->
-            <territoryAlias type="IOT" replacement="IO" reason="overlong"/> <!-- British Indian Ocean Territory -->
-            <territoryAlias type="IRQ" replacement="IQ" reason="overlong"/> <!-- Iraq -->
-            <territoryAlias type="IRN" replacement="IR" reason="overlong"/> <!-- Iran -->
-            <territoryAlias type="ISL" replacement="IS" reason="overlong"/> <!-- Iceland -->
-            <territoryAlias type="ITA" replacement="IT" reason="overlong"/> <!-- Italy -->
-            <territoryAlias type="JEY" replacement="JE" reason="overlong"/> <!-- Jersey -->
-            <territoryAlias type="JAM" replacement="JM" reason="overlong"/> <!-- Jamaica -->
-            <territoryAlias type="JOR" replacement="JO" reason="overlong"/> <!-- Jordan -->
-            <territoryAlias type="JPN" replacement="JP" reason="overlong"/> <!-- Japan -->
-            <territoryAlias type="KEN" replacement="KE" reason="overlong"/> <!-- Kenya -->
-            <territoryAlias type="KGZ" replacement="KG" reason="overlong"/> <!-- Kyrgyzstan -->
-            <territoryAlias type="KHM" replacement="KH" reason="overlong"/> <!-- Cambodia -->
-            <territoryAlias type="KIR" replacement="KI" reason="overlong"/> <!-- Kiribati -->
-            <territoryAlias type="COM" replacement="KM" reason="overlong"/> <!-- Comoros -->
-            <territoryAlias type="KNA" replacement="KN" reason="overlong"/> <!-- St. Kitts & Nevis -->
-            <territoryAlias type="PRK" replacement="KP" reason="overlong"/> <!-- North Korea -->
-            <territoryAlias type="KOR" replacement="KR" reason="overlong"/> <!-- South Korea -->
-            <territoryAlias type="KWT" replacement="KW" reason="overlong"/> <!-- Kuwait -->
-            <territoryAlias type="CYM" replacement="KY" reason="overlong"/> <!-- Cayman Islands -->
-            <territoryAlias type="KAZ" replacement="KZ" reason="overlong"/> <!-- Kazakhstan -->
-            <territoryAlias type="LAO" replacement="LA" reason="overlong"/> <!-- Laos -->
-            <territoryAlias type="LBN" replacement="LB" reason="overlong"/> <!-- Lebanon -->
-            <territoryAlias type="LCA" replacement="LC" reason="overlong"/> <!-- St. Lucia -->
-            <territoryAlias type="LIE" replacement="LI" reason="overlong"/> <!-- Liechtenstein -->
-            <territoryAlias type="LKA" replacement="LK" reason="overlong"/> <!-- Sri Lanka -->
-            <territoryAlias type="LBR" replacement="LR" reason="overlong"/> <!-- Liberia -->
-            <territoryAlias type="LSO" replacement="LS" reason="overlong"/> <!-- Lesotho -->
-            <territoryAlias type="LTU" replacement="LT" reason="overlong"/> <!-- Lithuania -->
-            <territoryAlias type="LUX" replacement="LU" reason="overlong"/> <!-- Luxembourg -->
-            <territoryAlias type="LVA" replacement="LV" reason="overlong"/> <!-- Latvia -->
-            <territoryAlias type="LBY" replacement="LY" reason="overlong"/> <!-- Libya -->
-            <territoryAlias type="MAR" replacement="MA" reason="overlong"/> <!-- Morocco -->
-            <territoryAlias type="MCO" replacement="MC" reason="overlong"/> <!-- Monaco -->
-            <territoryAlias type="MDA" replacement="MD" reason="overlong"/> <!-- Moldova -->
-            <territoryAlias type="MNE" replacement="ME" reason="overlong"/> <!-- Montenegro -->
-            <territoryAlias type="MAF" replacement="MF" reason="overlong"/> <!-- St. Martin -->
-            <territoryAlias type="MDG" replacement="MG" reason="overlong"/> <!-- Madagascar -->
-            <territoryAlias type="MHL" replacement="MH" reason="overlong"/> <!-- Marshall Islands -->
-            <territoryAlias type="MKD" replacement="MK" reason="overlong"/> <!-- Macedonia -->
-            <territoryAlias type="MLI" replacement="ML" reason="overlong"/> <!-- Mali -->
-            <territoryAlias type="MMR" replacement="MM" reason="overlong"/> <!-- Myanmar (Burma) -->
-            <territoryAlias type="MNG" replacement="MN" reason="overlong"/> <!-- Mongolia -->
-            <territoryAlias type="MAC" replacement="MO" reason="overlong"/> <!-- Macau SAR China -->
-            <territoryAlias type="MNP" replacement="MP" reason="overlong"/> <!-- Northern Mariana Islands -->
-            <territoryAlias type="MTQ" replacement="MQ" reason="overlong"/> <!-- Martinique -->
-            <territoryAlias type="MRT" replacement="MR" reason="overlong"/> <!-- Mauritania -->
-            <territoryAlias type="MSR" replacement="MS" reason="overlong"/> <!-- Montserrat -->
-            <territoryAlias type="MLT" replacement="MT" reason="overlong"/> <!-- Malta -->
-            <territoryAlias type="MUS" replacement="MU" reason="overlong"/> <!-- Mauritius -->
-            <territoryAlias type="MDV" replacement="MV" reason="overlong"/> <!-- Maldives -->
-            <territoryAlias type="MWI" replacement="MW" reason="overlong"/> <!-- Malawi -->
-            <territoryAlias type="MEX" replacement="MX" reason="overlong"/> <!-- Mexico -->
-            <territoryAlias type="MYS" replacement="MY" reason="overlong"/> <!-- Malaysia -->
-            <territoryAlias type="MOZ" replacement="MZ" reason="overlong"/> <!-- Mozambique -->
-            <territoryAlias type="NAM" replacement="NA" reason="overlong"/> <!-- Namibia -->
-            <territoryAlias type="NCL" replacement="NC" reason="overlong"/> <!-- New Caledonia -->
-            <territoryAlias type="NER" replacement="NE" reason="overlong"/> <!-- Niger -->
-            <territoryAlias type="NFK" replacement="NF" reason="overlong"/> <!-- Norfolk Island -->
-            <territoryAlias type="NGA" replacement="NG" reason="overlong"/> <!-- Nigeria -->
-            <territoryAlias type="NIC" replacement="NI" reason="overlong"/> <!-- Nicaragua -->
-            <territoryAlias type="NLD" replacement="NL" reason="overlong"/> <!-- Netherlands -->
-            <territoryAlias type="NOR" replacement="NO" reason="overlong"/> <!-- Norway -->
-            <territoryAlias type="NPL" replacement="NP" reason="overlong"/> <!-- Nepal -->
-            <territoryAlias type="NRU" replacement="NR" reason="overlong"/> <!-- Nauru -->
-            <territoryAlias type="NTZ" replacement="SA IQ" reason="overlong"/> <!-- null -->
-            <territoryAlias type="NIU" replacement="NU" reason="overlong"/> <!-- Niue -->
-            <territoryAlias type="NZL" replacement="NZ" reason="overlong"/> <!-- New Zealand -->
-            <territoryAlias type="OMN" replacement="OM" reason="overlong"/> <!-- Oman -->
-            <territoryAlias type="PAN" replacement="PA" reason="overlong"/> <!-- Panama -->
-            <territoryAlias type="PER" replacement="PE" reason="overlong"/> <!-- Peru -->
-            <territoryAlias type="PYF" replacement="PF" reason="overlong"/> <!-- French Polynesia -->
-            <territoryAlias type="PNG" replacement="PG" reason="overlong"/> <!-- Papua New Guinea -->
-            <territoryAlias type="PHL" replacement="PH" reason="overlong"/> <!-- Philippines -->
-            <territoryAlias type="PAK" replacement="PK" reason="overlong"/> <!-- Pakistan -->
-            <territoryAlias type="POL" replacement="PL" reason="overlong"/> <!-- Poland -->
-            <territoryAlias type="SPM" replacement="PM" reason="overlong"/> <!-- St. Pierre & Miquelon -->
-            <territoryAlias type="PCN" replacement="PN" reason="overlong"/> <!-- Pitcairn Islands -->
-            <territoryAlias type="PRI" replacement="PR" reason="overlong"/> <!-- Puerto Rico -->
-            <territoryAlias type="PSE" replacement="PS" reason="overlong"/> <!-- Palestinian Territories -->
-            <territoryAlias type="PRT" replacement="PT" reason="overlong"/> <!-- Portugal -->
-            <territoryAlias type="PLW" replacement="PW" reason="overlong"/> <!-- Palau -->
-            <territoryAlias type="PRY" replacement="PY" reason="overlong"/> <!-- Paraguay -->
-            <territoryAlias type="QAT" replacement="QA" reason="overlong"/> <!-- Qatar -->
-            <territoryAlias type="QMM" replacement="QM" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="QNN" replacement="QN" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="QPP" replacement="QP" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="QQQ" replacement="QQ" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="QRR" replacement="QR" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="QSS" replacement="QS" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="QTT" replacement="QT" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="QUU" replacement="EU" reason="overlong"/> <!-- European Union -->
-            <territoryAlias type="QVV" replacement="QV" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="QWW" replacement="QW" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="QXX" replacement="QX" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="QYY" replacement="QY" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="QZZ" replacement="QZ" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="REU" replacement="RE" reason="overlong"/> <!-- Réunion -->
-            <territoryAlias type="ROU" replacement="RO" reason="overlong"/> <!-- Romania -->
-            <territoryAlias type="SRB" replacement="RS" reason="overlong"/> <!-- Serbia -->
-            <territoryAlias type="RUS" replacement="RU" reason="overlong"/> <!-- Russia -->
-            <territoryAlias type="RWA" replacement="RW" reason="overlong"/> <!-- Rwanda -->
-            <territoryAlias type="SAU" replacement="SA" reason="overlong"/> <!-- Saudi Arabia -->
-            <territoryAlias type="SLB" replacement="SB" reason="overlong"/> <!-- Solomon Islands -->
-            <territoryAlias type="SYC" replacement="SC" reason="overlong"/> <!-- Seychelles -->
-            <territoryAlias type="SDN" replacement="SD" reason="overlong"/> <!-- Sudan -->
-            <territoryAlias type="SWE" replacement="SE" reason="overlong"/> <!-- Sweden -->
-            <territoryAlias type="SGP" replacement="SG" reason="overlong"/> <!-- Singapore -->
-            <territoryAlias type="SHN" replacement="SH" reason="overlong"/> <!-- St. Helena -->
-            <territoryAlias type="SVN" replacement="SI" reason="overlong"/> <!-- Slovenia -->
-            <territoryAlias type="SJM" replacement="SJ" reason="overlong"/> <!-- Svalbard & Jan Mayen -->
-            <territoryAlias type="SVK" replacement="SK" reason="overlong"/> <!-- Slovakia -->
-            <territoryAlias type="SLE" replacement="SL" reason="overlong"/> <!-- Sierra Leone -->
-            <territoryAlias type="SMR" replacement="SM" reason="overlong"/> <!-- San Marino -->
-            <territoryAlias type="SEN" replacement="SN" reason="overlong"/> <!-- Senegal -->
-            <territoryAlias type="SOM" replacement="SO" reason="overlong"/> <!-- Somalia -->
-            <territoryAlias type="SUR" replacement="SR" reason="overlong"/> <!-- Suriname -->
-            <territoryAlias type="SSD" replacement="SS" reason="overlong"/> <!-- South Sudan -->
-            <territoryAlias type="STP" replacement="ST" reason="overlong"/> <!-- São Tomé & Príncipe -->
-            <territoryAlias type="SUN" replacement="RU AM AZ BY EE GE KZ KG LV LT MD TJ TM UA UZ" reason="overlong"/> <!-- null -->
-            <territoryAlias type="SLV" replacement="SV" reason="overlong"/> <!-- El Salvador -->
-            <territoryAlias type="SXM" replacement="SX" reason="overlong"/> <!-- Sint Maarten -->
-            <territoryAlias type="SYR" replacement="SY" reason="overlong"/> <!-- Syria -->
-            <territoryAlias type="SWZ" replacement="SZ" reason="overlong"/> <!-- Swaziland -->
-            <territoryAlias type="TAA" replacement="TA" reason="overlong"/> <!-- Tristan da Cunha -->
-            <territoryAlias type="TCA" replacement="TC" reason="overlong"/> <!-- Turks & Caicos Islands -->
-            <territoryAlias type="TCD" replacement="TD" reason="overlong"/> <!-- Chad -->
-            <territoryAlias type="ATF" replacement="TF" reason="overlong"/> <!-- French Southern Territories -->
-            <territoryAlias type="TGO" replacement="TG" reason="overlong"/> <!-- Togo -->
-            <territoryAlias type="THA" replacement="TH" reason="overlong"/> <!-- Thailand -->
-            <territoryAlias type="TJK" replacement="TJ" reason="overlong"/> <!-- Tajikistan -->
-            <territoryAlias type="TKL" replacement="TK" reason="overlong"/> <!-- Tokelau -->
-            <territoryAlias type="TLS" replacement="TL" reason="overlong"/> <!-- Timor-Leste -->
-            <territoryAlias type="TKM" replacement="TM" reason="overlong"/> <!-- Turkmenistan -->
-            <territoryAlias type="TUN" replacement="TN" reason="overlong"/> <!-- Tunisia -->
-            <territoryAlias type="TON" replacement="TO" reason="overlong"/> <!-- Tonga -->
-            <territoryAlias type="TMP" replacement="TL" reason="overlong"/> <!-- Timor-Leste -->
-            <territoryAlias type="TUR" replacement="TR" reason="overlong"/> <!-- Turkey -->
-            <territoryAlias type="TTO" replacement="TT" reason="overlong"/> <!-- Trinidad & Tobago -->
-            <territoryAlias type="TUV" replacement="TV" reason="overlong"/> <!-- Tuvalu -->
-            <territoryAlias type="TWN" replacement="TW" reason="overlong"/> <!-- Taiwan -->
-            <territoryAlias type="TZA" replacement="TZ" reason="overlong"/> <!-- Tanzania -->
-            <territoryAlias type="UKR" replacement="UA" reason="overlong"/> <!-- Ukraine -->
-            <territoryAlias type="UGA" replacement="UG" reason="overlong"/> <!-- Uganda -->
-            <territoryAlias type="UMI" replacement="UM" reason="overlong"/> <!-- U.S. Outlying Islands -->
-            <territoryAlias type="USA" replacement="US" reason="overlong"/> <!-- United States -->
-            <territoryAlias type="URY" replacement="UY" reason="overlong"/> <!-- Uruguay -->
-            <territoryAlias type="UZB" replacement="UZ" reason="overlong"/> <!-- Uzbekistan -->
-            <territoryAlias type="VAT" replacement="VA" reason="overlong"/> <!-- Vatican City -->
-            <territoryAlias type="VCT" replacement="VC" reason="overlong"/> <!-- St. Vincent & Grenadines -->
-            <territoryAlias type="VEN" replacement="VE" reason="overlong"/> <!-- Venezuela -->
-            <territoryAlias type="VGB" replacement="VG" reason="overlong"/> <!-- British Virgin Islands -->
-            <territoryAlias type="VIR" replacement="VI" reason="overlong"/> <!-- U.S. Virgin Islands -->
-            <territoryAlias type="VNM" replacement="VN" reason="overlong"/> <!-- Vietnam -->
-            <territoryAlias type="VUT" replacement="VU" reason="overlong"/> <!-- Vanuatu -->
-            <territoryAlias type="WLF" replacement="WF" reason="overlong"/> <!-- Wallis & Futuna -->
-            <territoryAlias type="WSM" replacement="WS" reason="overlong"/> <!-- Samoa -->
-            <territoryAlias type="XAA" replacement="XA" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="XBB" replacement="XB" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="XCC" replacement="XC" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="XDD" replacement="XD" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="XEE" replacement="XE" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="XFF" replacement="XF" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="XGG" replacement="XG" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="XHH" replacement="XH" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="XII" replacement="XI" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="XJJ" replacement="XJ" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="XKK" replacement="XK" reason="overlong"/> <!-- Kosovo -->
-            <territoryAlias type="XLL" replacement="XL" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="XMM" replacement="XM" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="XNN" replacement="XN" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="XOO" replacement="XO" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="XPP" replacement="XP" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="XQQ" replacement="XQ" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="XRR" replacement="XR" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="XSS" replacement="XS" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="XTT" replacement="XT" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="XUU" replacement="XU" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="XVV" replacement="XV" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="XWW" replacement="XW" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="XXX" replacement="XX" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="XYY" replacement="XY" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="XZZ" replacement="XZ" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="YMD" replacement="YE" reason="overlong"/> <!-- Yemen -->
-            <territoryAlias type="YEM" replacement="YE" reason="overlong"/> <!-- Yemen -->
-            <territoryAlias type="MYT" replacement="YT" reason="overlong"/> <!-- Mayotte -->
-            <territoryAlias type="YUG" replacement="RS ME" reason="overlong"/> <!-- null -->
-            <territoryAlias type="ZAF" replacement="ZA" reason="overlong"/> <!-- South Africa -->
-            <territoryAlias type="ZMB" replacement="ZM" reason="overlong"/> <!-- Zambia -->
-            <territoryAlias type="ZAR" replacement="CD" reason="overlong"/> <!-- Congo - Kinshasa -->
-            <territoryAlias type="ZWE" replacement="ZW" reason="overlong"/> <!-- Zimbabwe -->
-            <territoryAlias type="ZZZ" replacement="ZZ" reason="overlong"/> <!-- Unknown Region -->
-            <territoryAlias type="958" replacement="AA" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="020" replacement="AD" reason="overlong"/> <!-- Andorra -->
-            <territoryAlias type="784" replacement="AE" reason="overlong"/> <!-- United Arab Emirates -->
-            <territoryAlias type="004" replacement="AF" reason="overlong"/> <!-- Afghanistan -->
-            <territoryAlias type="028" replacement="AG" reason="overlong"/> <!-- Antigua & Barbuda -->
-            <territoryAlias type="660" replacement="AI" reason="overlong"/> <!-- Anguilla -->
-            <territoryAlias type="008" replacement="AL" reason="overlong"/> <!-- Albania -->
-            <territoryAlias type="051" replacement="AM" reason="overlong"/> <!-- Armenia -->
-            <territoryAlias type="530" replacement="CW SX BQ" reason="overlong"/> <!-- null -->
-            <territoryAlias type="024" replacement="AO" reason="overlong"/> <!-- Angola -->
-            <territoryAlias type="010" replacement="AQ" reason="overlong"/> <!-- Antarctica -->
-            <territoryAlias type="032" replacement="AR" reason="overlong"/> <!-- Argentina -->
-            <territoryAlias type="016" replacement="AS" reason="overlong"/> <!-- American Samoa -->
-            <territoryAlias type="040" replacement="AT" reason="overlong"/> <!-- Austria -->
-            <territoryAlias type="036" replacement="AU" reason="overlong"/> <!-- Australia -->
-            <territoryAlias type="533" replacement="AW" reason="overlong"/> <!-- Aruba -->
-            <territoryAlias type="248" replacement="AX" reason="overlong"/> <!-- Åland Islands -->
-            <territoryAlias type="031" replacement="AZ" reason="overlong"/> <!-- Azerbaijan -->
-            <territoryAlias type="070" replacement="BA" reason="overlong"/> <!-- Bosnia & Herzegovina -->
-            <territoryAlias type="052" replacement="BB" reason="overlong"/> <!-- Barbados -->
-            <territoryAlias type="050" replacement="BD" reason="overlong"/> <!-- Bangladesh -->
-            <territoryAlias type="056" replacement="BE" reason="overlong"/> <!-- Belgium -->
-            <territoryAlias type="854" replacement="BF" reason="overlong"/> <!-- Burkina Faso -->
-            <territoryAlias type="100" replacement="BG" reason="overlong"/> <!-- Bulgaria -->
-            <territoryAlias type="048" replacement="BH" reason="overlong"/> <!-- Bahrain -->
-            <territoryAlias type="108" replacement="BI" reason="overlong"/> <!-- Burundi -->
-            <territoryAlias type="204" replacement="BJ" reason="overlong"/> <!-- Benin -->
-            <territoryAlias type="652" replacement="BL" reason="overlong"/> <!-- St. Barthélemy -->
-            <territoryAlias type="060" replacement="BM" reason="overlong"/> <!-- Bermuda -->
-            <territoryAlias type="096" replacement="BN" reason="overlong"/> <!-- Brunei -->
-            <territoryAlias type="068" replacement="BO" reason="overlong"/> <!-- Bolivia -->
-            <territoryAlias type="535" replacement="BQ" reason="overlong"/> <!-- Caribbean Netherlands -->
-            <territoryAlias type="076" replacement="BR" reason="overlong"/> <!-- Brazil -->
-            <territoryAlias type="044" replacement="BS" reason="overlong"/> <!-- Bahamas -->
-            <territoryAlias type="064" replacement="BT" reason="overlong"/> <!-- Bhutan -->
-            <territoryAlias type="104" replacement="MM" reason="overlong"/> <!-- Myanmar (Burma) -->
-            <territoryAlias type="074" replacement="BV" reason="overlong"/> <!-- Bouvet Island -->
-            <territoryAlias type="072" replacement="BW" reason="overlong"/> <!-- Botswana -->
-            <territoryAlias type="112" replacement="BY" reason="overlong"/> <!-- Belarus -->
-            <territoryAlias type="084" replacement="BZ" reason="overlong"/> <!-- Belize -->
-            <territoryAlias type="124" replacement="CA" reason="overlong"/> <!-- Canada -->
-            <territoryAlias type="166" replacement="CC" reason="overlong"/> <!-- Cocos (Keeling) Islands -->
-            <territoryAlias type="180" replacement="CD" reason="overlong"/> <!-- Congo - Kinshasa -->
-            <territoryAlias type="140" replacement="CF" reason="overlong"/> <!-- Central African Republic -->
-            <territoryAlias type="178" replacement="CG" reason="overlong"/> <!-- Congo - Brazzaville -->
-            <territoryAlias type="756" replacement="CH" reason="overlong"/> <!-- Switzerland -->
-            <territoryAlias type="384" replacement="CI" reason="overlong"/> <!-- Côte d’Ivoire -->
-            <territoryAlias type="184" replacement="CK" reason="overlong"/> <!-- Cook Islands -->
-            <territoryAlias type="152" replacement="CL" reason="overlong"/> <!-- Chile -->
-            <territoryAlias type="120" replacement="CM" reason="overlong"/> <!-- Cameroon -->
-            <territoryAlias type="156" replacement="CN" reason="overlong"/> <!-- China -->
-            <territoryAlias type="170" replacement="CO" reason="overlong"/> <!-- Colombia -->
-            <territoryAlias type="188" replacement="CR" reason="overlong"/> <!-- Costa Rica -->
-            <territoryAlias type="891" replacement="RS ME" reason="overlong"/> <!-- null -->
-            <territoryAlias type="192" replacement="CU" reason="overlong"/> <!-- Cuba -->
-            <territoryAlias type="132" replacement="CV" reason="overlong"/> <!-- Cape Verde -->
-            <territoryAlias type="531" replacement="CW" reason="overlong"/> <!-- Curaçao -->
-            <territoryAlias type="162" replacement="CX" reason="overlong"/> <!-- Christmas Island -->
-            <territoryAlias type="196" replacement="CY" reason="overlong"/> <!-- Cyprus -->
-            <territoryAlias type="203" replacement="CZ" reason="overlong"/> <!-- Czech Republic -->
-            <territoryAlias type="278" replacement="DE" reason="overlong"/> <!-- Germany -->
-            <territoryAlias type="276" replacement="DE" reason="overlong"/> <!-- Germany -->
-            <territoryAlias type="262" replacement="DJ" reason="overlong"/> <!-- Djibouti -->
-            <territoryAlias type="208" replacement="DK" reason="overlong"/> <!-- Denmark -->
-            <territoryAlias type="212" replacement="DM" reason="overlong"/> <!-- Dominica -->
-            <territoryAlias type="214" replacement="DO" reason="overlong"/> <!-- Dominican Republic -->
-            <territoryAlias type="012" replacement="DZ" reason="overlong"/> <!-- Algeria -->
-            <territoryAlias type="218" replacement="EC" reason="overlong"/> <!-- Ecuador -->
-            <territoryAlias type="233" replacement="EE" reason="overlong"/> <!-- Estonia -->
-            <territoryAlias type="818" replacement="EG" reason="overlong"/> <!-- Egypt -->
-            <territoryAlias type="732" replacement="EH" reason="overlong"/> <!-- Western Sahara -->
-            <territoryAlias type="232" replacement="ER" reason="overlong"/> <!-- Eritrea -->
-            <territoryAlias type="724" replacement="ES" reason="overlong"/> <!-- Spain -->
-            <territoryAlias type="231" replacement="ET" reason="overlong"/> <!-- Ethiopia -->
-            <territoryAlias type="246" replacement="FI" reason="overlong"/> <!-- Finland -->
-            <territoryAlias type="242" replacement="FJ" reason="overlong"/> <!-- Fiji -->
-            <territoryAlias type="238" replacement="FK" reason="overlong"/> <!-- Falkland Islands -->
-            <territoryAlias type="583" replacement="FM" reason="overlong"/> <!-- Micronesia -->
-            <territoryAlias type="234" replacement="FO" reason="overlong"/> <!-- Faroe Islands -->
-            <territoryAlias type="250" replacement="FR" reason="overlong"/> <!-- France -->
-            <territoryAlias type="249" replacement="FR" reason="overlong"/> <!-- France -->
-            <territoryAlias type="266" replacement="GA" reason="overlong"/> <!-- Gabon -->
-            <territoryAlias type="826" replacement="GB" reason="overlong"/> <!-- United Kingdom -->
-            <territoryAlias type="308" replacement="GD" reason="overlong"/> <!-- Grenada -->
-            <territoryAlias type="268" replacement="GE" reason="overlong"/> <!-- Georgia -->
-            <territoryAlias type="254" replacement="GF" reason="overlong"/> <!-- French Guiana -->
-            <territoryAlias type="831" replacement="GG" reason="overlong"/> <!-- Guernsey -->
-            <territoryAlias type="288" replacement="GH" reason="overlong"/> <!-- Ghana -->
-            <territoryAlias type="292" replacement="GI" reason="overlong"/> <!-- Gibraltar -->
-            <territoryAlias type="304" replacement="GL" reason="overlong"/> <!-- Greenland -->
-            <territoryAlias type="270" replacement="GM" reason="overlong"/> <!-- Gambia -->
-            <territoryAlias type="324" replacement="GN" reason="overlong"/> <!-- Guinea -->
-            <territoryAlias type="312" replacement="GP" reason="overlong"/> <!-- Guadeloupe -->
-            <territoryAlias type="226" replacement="GQ" reason="overlong"/> <!-- Equatorial Guinea -->
-            <territoryAlias type="300" replacement="GR" reason="overlong"/> <!-- Greece -->
-            <territoryAlias type="239" replacement="GS" reason="overlong"/> <!-- South Georgia & South Sandwich Islands -->
-            <territoryAlias type="320" replacement="GT" reason="overlong"/> <!-- Guatemala -->
-            <territoryAlias type="316" replacement="GU" reason="overlong"/> <!-- Guam -->
-            <territoryAlias type="624" replacement="GW" reason="overlong"/> <!-- Guinea-Bissau -->
-            <territoryAlias type="328" replacement="GY" reason="overlong"/> <!-- Guyana -->
-            <territoryAlias type="344" replacement="HK" reason="overlong"/> <!-- Hong Kong SAR China -->
-            <territoryAlias type="334" replacement="HM" reason="overlong"/> <!-- Heard & McDonald Islands -->
-            <territoryAlias type="340" replacement="HN" reason="overlong"/> <!-- Honduras -->
-            <territoryAlias type="191" replacement="HR" reason="overlong"/> <!-- Croatia -->
-            <territoryAlias type="332" replacement="HT" reason="overlong"/> <!-- Haiti -->
-            <territoryAlias type="348" replacement="HU" reason="overlong"/> <!-- Hungary -->
-            <territoryAlias type="360" replacement="ID" reason="overlong"/> <!-- Indonesia -->
-            <territoryAlias type="372" replacement="IE" reason="overlong"/> <!-- Ireland -->
-            <territoryAlias type="376" replacement="IL" reason="overlong"/> <!-- Israel -->
-            <territoryAlias type="833" replacement="IM" reason="overlong"/> <!-- Isle of Man -->
-            <territoryAlias type="356" replacement="IN" reason="overlong"/> <!-- India -->
-            <territoryAlias type="086" replacement="IO" reason="overlong"/> <!-- British Indian Ocean Territory -->
-            <territoryAlias type="368" replacement="IQ" reason="overlong"/> <!-- Iraq -->
-            <territoryAlias type="364" replacement="IR" reason="overlong"/> <!-- Iran -->
-            <territoryAlias type="352" replacement="IS" reason="overlong"/> <!-- Iceland -->
-            <territoryAlias type="380" replacement="IT" reason="overlong"/> <!-- Italy -->
-            <territoryAlias type="832" replacement="JE" reason="overlong"/> <!-- Jersey -->
-            <territoryAlias type="388" replacement="JM" reason="overlong"/> <!-- Jamaica -->
-            <territoryAlias type="400" replacement="JO" reason="overlong"/> <!-- Jordan -->
-            <territoryAlias type="392" replacement="JP" reason="overlong"/> <!-- Japan -->
-            <territoryAlias type="404" replacement="KE" reason="overlong"/> <!-- Kenya -->
-            <territoryAlias type="417" replacement="KG" reason="overlong"/> <!-- Kyrgyzstan -->
-            <territoryAlias type="116" replacement="KH" reason="overlong"/> <!-- Cambodia -->
-            <territoryAlias type="296" replacement="KI" reason="overlong"/> <!-- Kiribati -->
-            <territoryAlias type="174" replacement="KM" reason="overlong"/> <!-- Comoros -->
-            <territoryAlias type="659" replacement="KN" reason="overlong"/> <!-- St. Kitts & Nevis -->
-            <territoryAlias type="408" replacement="KP" reason="overlong"/> <!-- North Korea -->
-            <territoryAlias type="410" replacement="KR" reason="overlong"/> <!-- South Korea -->
-            <territoryAlias type="414" replacement="KW" reason="overlong"/> <!-- Kuwait -->
-            <territoryAlias type="136" replacement="KY" reason="overlong"/> <!-- Cayman Islands -->
-            <territoryAlias type="398" replacement="KZ" reason="overlong"/> <!-- Kazakhstan -->
-            <territoryAlias type="418" replacement="LA" reason="overlong"/> <!-- Laos -->
-            <territoryAlias type="422" replacement="LB" reason="overlong"/> <!-- Lebanon -->
-            <territoryAlias type="662" replacement="LC" reason="overlong"/> <!-- St. Lucia -->
-            <territoryAlias type="438" replacement="LI" reason="overlong"/> <!-- Liechtenstein -->
-            <territoryAlias type="144" replacement="LK" reason="overlong"/> <!-- Sri Lanka -->
-            <territoryAlias type="430" replacement="LR" reason="overlong"/> <!-- Liberia -->
-            <territoryAlias type="426" replacement="LS" reason="overlong"/> <!-- Lesotho -->
-            <territoryAlias type="440" replacement="LT" reason="overlong"/> <!-- Lithuania -->
-            <territoryAlias type="442" replacement="LU" reason="overlong"/> <!-- Luxembourg -->
-            <territoryAlias type="428" replacement="LV" reason="overlong"/> <!-- Latvia -->
-            <territoryAlias type="434" replacement="LY" reason="overlong"/> <!-- Libya -->
-            <territoryAlias type="504" replacement="MA" reason="overlong"/> <!-- Morocco -->
-            <territoryAlias type="492" replacement="MC" reason="overlong"/> <!-- Monaco -->
-            <territoryAlias type="498" replacement="MD" reason="overlong"/> <!-- Moldova -->
-            <territoryAlias type="499" replacement="ME" reason="overlong"/> <!-- Montenegro -->
-            <territoryAlias type="663" replacement="MF" reason="overlong"/> <!-- St. Martin -->
-            <territoryAlias type="450" replacement="MG" reason="overlong"/> <!-- Madagascar -->
-            <territoryAlias type="584" replacement="MH" reason="overlong"/> <!-- Marshall Islands -->
-            <territoryAlias type="807" replacement="MK" reason="overlong"/> <!-- Macedonia -->
-            <territoryAlias type="466" replacement="ML" reason="overlong"/> <!-- Mali -->
-            <territoryAlias type="104" replacement="MM" reason="overlong"/> <!-- Myanmar (Burma) -->
-            <territoryAlias type="496" replacement="MN" reason="overlong"/> <!-- Mongolia -->
-            <territoryAlias type="446" replacement="MO" reason="overlong"/> <!-- Macau SAR China -->
-            <territoryAlias type="580" replacement="MP" reason="overlong"/> <!-- Northern Mariana Islands -->
-            <territoryAlias type="474" replacement="MQ" reason="overlong"/> <!-- Martinique -->
-            <territoryAlias type="478" replacement="MR" reason="overlong"/> <!-- Mauritania -->
-            <territoryAlias type="500" replacement="MS" reason="overlong"/> <!-- Montserrat -->
-            <territoryAlias type="470" replacement="MT" reason="overlong"/> <!-- Malta -->
-            <territoryAlias type="480" replacement="MU" reason="overlong"/> <!-- Mauritius -->
-            <territoryAlias type="462" replacement="MV" reason="overlong"/> <!-- Maldives -->
-            <territoryAlias type="454" replacement="MW" reason="overlong"/> <!-- Malawi -->
-            <territoryAlias type="484" replacement="MX" reason="overlong"/> <!-- Mexico -->
-            <territoryAlias type="458" replacement="MY" reason="overlong"/> <!-- Malaysia -->
-            <territoryAlias type="508" replacement="MZ" reason="overlong"/> <!-- Mozambique -->
-            <territoryAlias type="516" replacement="NA" reason="overlong"/> <!-- Namibia -->
-            <territoryAlias type="540" replacement="NC" reason="overlong"/> <!-- New Caledonia -->
-            <territoryAlias type="562" replacement="NE" reason="overlong"/> <!-- Niger -->
-            <territoryAlias type="574" replacement="NF" reason="overlong"/> <!-- Norfolk Island -->
-            <territoryAlias type="566" replacement="NG" reason="overlong"/> <!-- Nigeria -->
-            <territoryAlias type="558" replacement="NI" reason="overlong"/> <!-- Nicaragua -->
-            <territoryAlias type="528" replacement="NL" reason="overlong"/> <!-- Netherlands -->
-            <territoryAlias type="578" replacement="NO" reason="overlong"/> <!-- Norway -->
-            <territoryAlias type="524" replacement="NP" reason="overlong"/> <!-- Nepal -->
-            <territoryAlias type="520" replacement="NR" reason="overlong"/> <!-- Nauru -->
-            <territoryAlias type="536" replacement="SA IQ" reason="overlong"/> <!-- null -->
-            <territoryAlias type="570" replacement="NU" reason="overlong"/> <!-- Niue -->
-            <territoryAlias type="554" replacement="NZ" reason="overlong"/> <!-- New Zealand -->
-            <territoryAlias type="512" replacement="OM" reason="overlong"/> <!-- Oman -->
-            <territoryAlias type="591" replacement="PA" reason="overlong"/> <!-- Panama -->
-            <territoryAlias type="604" replacement="PE" reason="overlong"/> <!-- Peru -->
-            <territoryAlias type="258" replacement="PF" reason="overlong"/> <!-- French Polynesia -->
-            <territoryAlias type="598" replacement="PG" reason="overlong"/> <!-- Papua New Guinea -->
-            <territoryAlias type="608" replacement="PH" reason="overlong"/> <!-- Philippines -->
-            <territoryAlias type="586" replacement="PK" reason="overlong"/> <!-- Pakistan -->
-            <territoryAlias type="616" replacement="PL" reason="overlong"/> <!-- Poland -->
-            <territoryAlias type="666" replacement="PM" reason="overlong"/> <!-- St. Pierre & Miquelon -->
-            <territoryAlias type="612" replacement="PN" reason="overlong"/> <!-- Pitcairn Islands -->
-            <territoryAlias type="630" replacement="PR" reason="overlong"/> <!-- Puerto Rico -->
-            <territoryAlias type="275" replacement="PS" reason="overlong"/> <!-- Palestinian Territories -->
-            <territoryAlias type="620" replacement="PT" reason="overlong"/> <!-- Portugal -->
-            <territoryAlias type="585" replacement="PW" reason="overlong"/> <!-- Palau -->
-            <territoryAlias type="600" replacement="PY" reason="overlong"/> <!-- Paraguay -->
-            <territoryAlias type="634" replacement="QA" reason="overlong"/> <!-- Qatar -->
-            <territoryAlias type="959" replacement="QM" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="960" replacement="QN" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="962" replacement="QP" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="963" replacement="QQ" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="964" replacement="QR" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="965" replacement="QS" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="966" replacement="QT" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="967" replacement="EU" reason="overlong"/> <!-- European Union -->
-            <territoryAlias type="968" replacement="QV" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="969" replacement="QW" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="970" replacement="QX" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="971" replacement="QY" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="972" replacement="QZ" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="638" replacement="RE" reason="overlong"/> <!-- Réunion -->
-            <territoryAlias type="642" replacement="RO" reason="overlong"/> <!-- Romania -->
-            <territoryAlias type="688" replacement="RS" reason="overlong"/> <!-- Serbia -->
-            <territoryAlias type="643" replacement="RU" reason="overlong"/> <!-- Russia -->
-            <territoryAlias type="646" replacement="RW" reason="overlong"/> <!-- Rwanda -->
-            <territoryAlias type="682" replacement="SA" reason="overlong"/> <!-- Saudi Arabia -->
-            <territoryAlias type="090" replacement="SB" reason="overlong"/> <!-- Solomon Islands -->
-            <territoryAlias type="690" replacement="SC" reason="overlong"/> <!-- Seychelles -->
-            <territoryAlias type="729" replacement="SD" reason="overlong"/> <!-- Sudan -->
-            <territoryAlias type="752" replacement="SE" reason="overlong"/> <!-- Sweden -->
-            <territoryAlias type="702" replacement="SG" reason="overlong"/> <!-- Singapore -->
-            <territoryAlias type="654" replacement="SH" reason="overlong"/> <!-- St. Helena -->
-            <territoryAlias type="705" replacement="SI" reason="overlong"/> <!-- Slovenia -->
-            <territoryAlias type="744" replacement="SJ" reason="overlong"/> <!-- Svalbard & Jan Mayen -->
-            <territoryAlias type="703" replacement="SK" reason="overlong"/> <!-- Slovakia -->
-            <territoryAlias type="694" replacement="SL" reason="overlong"/> <!-- Sierra Leone -->
-            <territoryAlias type="674" replacement="SM" reason="overlong"/> <!-- San Marino -->
-            <territoryAlias type="686" replacement="SN" reason="overlong"/> <!-- Senegal -->
-            <territoryAlias type="706" replacement="SO" reason="overlong"/> <!-- Somalia -->
-            <territoryAlias type="740" replacement="SR" reason="overlong"/> <!-- Suriname -->
-            <territoryAlias type="728" replacement="SS" reason="overlong"/> <!-- South Sudan -->
-            <territoryAlias type="678" replacement="ST" reason="overlong"/> <!-- São Tomé & Príncipe -->
-            <territoryAlias type="810" replacement="RU AM AZ BY EE GE KZ KG LV LT MD TJ TM UA UZ" reason="overlong"/> <!-- null -->
-            <territoryAlias type="222" replacement="SV" reason="overlong"/> <!-- El Salvador -->
-            <territoryAlias type="534" replacement="SX" reason="overlong"/> <!-- Sint Maarten -->
-            <territoryAlias type="760" replacement="SY" reason="overlong"/> <!-- Syria -->
-            <territoryAlias type="748" replacement="SZ" reason="overlong"/> <!-- Swaziland -->
-            <territoryAlias type="796" replacement="TC" reason="overlong"/> <!-- Turks & Caicos Islands -->
-            <territoryAlias type="148" replacement="TD" reason="overlong"/> <!-- Chad -->
-            <territoryAlias type="260" replacement="TF" reason="overlong"/> <!-- French Southern Territories -->
-            <territoryAlias type="768" replacement="TG" reason="overlong"/> <!-- Togo -->
-            <territoryAlias type="764" replacement="TH" reason="overlong"/> <!-- Thailand -->
-            <territoryAlias type="762" replacement="TJ" reason="overlong"/> <!-- Tajikistan -->
-            <territoryAlias type="772" replacement="TK" reason="overlong"/> <!-- Tokelau -->
-            <territoryAlias type="626" replacement="TL" reason="overlong"/> <!-- Timor-Leste -->
-            <territoryAlias type="795" replacement="TM" reason="overlong"/> <!-- Turkmenistan -->
-            <territoryAlias type="788" replacement="TN" reason="overlong"/> <!-- Tunisia -->
-            <territoryAlias type="776" replacement="TO" reason="overlong"/> <!-- Tonga -->
-            <territoryAlias type="626" replacement="TL" reason="overlong"/> <!-- Timor-Leste -->
-            <territoryAlias type="792" replacement="TR" reason="overlong"/> <!-- Turkey -->
-            <territoryAlias type="780" replacement="TT" reason="overlong"/> <!-- Trinidad & Tobago -->
-            <territoryAlias type="798" replacement="TV" reason="overlong"/> <!-- Tuvalu -->
-            <territoryAlias type="158" replacement="TW" reason="overlong"/> <!-- Taiwan -->
-            <territoryAlias type="834" replacement="TZ" reason="overlong"/> <!-- Tanzania -->
-            <territoryAlias type="804" replacement="UA" reason="overlong"/> <!-- Ukraine -->
-            <territoryAlias type="800" replacement="UG" reason="overlong"/> <!-- Uganda -->
-            <territoryAlias type="581" replacement="UM" reason="overlong"/> <!-- U.S. Outlying Islands -->
-            <territoryAlias type="840" replacement="US" reason="overlong"/> <!-- United States -->
-            <territoryAlias type="858" replacement="UY" reason="overlong"/> <!-- Uruguay -->
-            <territoryAlias type="860" replacement="UZ" reason="overlong"/> <!-- Uzbekistan -->
-            <territoryAlias type="336" replacement="VA" reason="overlong"/> <!-- Vatican City -->
-            <territoryAlias type="670" replacement="VC" reason="overlong"/> <!-- St. Vincent & Grenadines -->
-            <territoryAlias type="862" replacement="VE" reason="overlong"/> <!-- Venezuela -->
-            <territoryAlias type="092" replacement="VG" reason="overlong"/> <!-- British Virgin Islands -->
-            <territoryAlias type="850" replacement="VI" reason="overlong"/> <!-- U.S. Virgin Islands -->
-            <territoryAlias type="704" replacement="VN" reason="overlong"/> <!-- Vietnam -->
-            <territoryAlias type="548" replacement="VU" reason="overlong"/> <!-- Vanuatu -->
-            <territoryAlias type="876" replacement="WF" reason="overlong"/> <!-- Wallis & Futuna -->
-            <territoryAlias type="882" replacement="WS" reason="overlong"/> <!-- Samoa -->
-            <territoryAlias type="973" replacement="XA" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="974" replacement="XB" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="975" replacement="XC" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="976" replacement="XD" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="977" replacement="XE" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="978" replacement="XF" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="979" replacement="XG" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="980" replacement="XH" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="981" replacement="XI" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="982" replacement="XJ" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="983" replacement="XK" reason="overlong"/> <!-- Kosovo -->
-            <territoryAlias type="984" replacement="XL" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="985" replacement="XM" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="986" replacement="XN" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="987" replacement="XO" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="988" replacement="XP" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="989" replacement="XQ" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="990" replacement="XR" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="991" replacement="XS" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="992" replacement="XT" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="993" replacement="XU" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="994" replacement="XV" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="995" replacement="XW" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="996" replacement="XX" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="997" replacement="XY" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="998" replacement="XZ" reason="overlong"/> <!-- Private use -->
-            <territoryAlias type="720" replacement="YE" reason="overlong"/> <!-- Yemen -->
-            <territoryAlias type="887" replacement="YE" reason="overlong"/> <!-- Yemen -->
-            <territoryAlias type="175" replacement="YT" reason="overlong"/> <!-- Mayotte -->
-            <territoryAlias type="891" replacement="RS ME" reason="overlong"/> <!-- null -->
-            <territoryAlias type="710" replacement="ZA" reason="overlong"/> <!-- South Africa -->
-            <territoryAlias type="894" replacement="ZM" reason="overlong"/> <!-- Zambia -->
-            <territoryAlias type="180" replacement="CD" reason="overlong"/> <!-- Congo - Kinshasa -->
-            <territoryAlias type="716" replacement="ZW" reason="overlong"/> <!-- Zimbabwe -->
-            <territoryAlias type="999" replacement="ZZ" reason="overlong"/> <!-- Unknown Region -->
-            <!-- end of data generated with CountItems tool per http://sites.google.com/site/cldr/development/updating-codes/update-languagescriptregion-subtags -->
-            <!-- variants -->
-            <variantAlias type="AALAND" replacement="AX" reason="deprecated"/>
-            <variantAlias type="POLYTONI" replacement="POLYTON" reason="deprecated"/>
-            <variantAlias type="HEPLOC" replacement="ALALC97" reason="deprecated"/>
-            <zoneAlias type="Africa/Timbuktu" replacement="Africa/Bamako" reason="deprecated"/>          
-            <zoneAlias type="Pacific/Yap" replacement="Pacific/Truk" reason="deprecated"/>          
-            <zoneAlias type="Europe/Belfast" replacement="Europe/London" reason="deprecated"/>
-            <zoneAlias type="SystemV/AST4ADT" replacement="America/Halifax" reason="deprecated"/>
-            <zoneAlias type="SystemV/EST5EDT" replacement="America/New_York" reason="deprecated"/>
-            <zoneAlias type="SystemV/CST6CDT" replacement="America/Chicago" reason="deprecated"/>
-            <zoneAlias type="SystemV/MST7MDT" replacement="America/Denver" reason="deprecated"/>
-            <zoneAlias type="SystemV/PST8PDT" replacement="America/Los_Angeles" reason="deprecated"/>
-            <zoneAlias type="SystemV/YST9YDT" replacement="America/Anchorage" reason="deprecated"/>
-            <zoneAlias type="SystemV/AST4" replacement="America/Puerto_Rico" reason="deprecated"/>
-            <zoneAlias type="SystemV/EST5" replacement="America/Indianapolis" reason="deprecated"/>
-            <zoneAlias type="EST" replacement="America/Indianapolis" reason="deprecated"/>
-            <zoneAlias type="SystemV/CST6" replacement="America/Regina" reason="deprecated"/>
-            <zoneAlias type="SystemV/MST7" replacement="America/Phoenix" reason="deprecated"/>
-            <zoneAlias type="MST" replacement="America/Phoenix" reason="deprecated"/>
-            <zoneAlias type="SystemV/PST8" replacement="Pacific/Pitcairn" reason="deprecated"/>
-            <zoneAlias type="SystemV/YST9" replacement="Pacific/Gambier" reason="deprecated"/>
-            <zoneAlias type="SystemV/HST10" replacement="Pacific/Honolulu" reason="deprecated"/>
-            <zoneAlias type="HST" replacement="Pacific/Honolulu" reason="deprecated"/>       
-            <zoneAlias type="Atlantic/Jan_Mayen" replacement="Europe/Oslo" reason="deprecated"/>
-            <zoneAlias type="America/Shiprock" replacement="America/Denver" reason="deprecated"/>
-            <zoneAlias type="Antarctica/South_Pole" replacement="Pacific/Auckland" reason="deprecated"/>
-            <zoneAlias type="America/Montreal" replacement="America/Toronto" reason="deprecated"/>
-            <zoneAlias type="Asia/Chongqing" replacement="Asia/Shanghai" reason="deprecated"/>
-            <zoneAlias type="Asia/Harbin" replacement="Asia/Shanghai" reason="deprecated"/>
-            <zoneAlias type="Asia/Kashgar" replacement="Asia/Urumqi" reason="deprecated"/>
-        </alias>
-        <deprecated>
-            <!-- items deprecated in ldml.dtd, ldmlSupplemental.dtd -->
-            <deprecatedItems attributes="draft" values="true false"/>
-            <deprecatedItems elements="monthNames monthAbbr dayNames dayAbbr localizedPatternChars week yesexpr noexpr measurement hoursFormat abbreviationFallback preferenceOrdering dateRangePattern"/>
-            <!-- default type="pinyin" (replaced by defaultCollation), see CLDR ticket #5679 -->
-            <deprecatedItems elements="default"/>
-            <deprecatedItems type="ldml" elements="minDays firstDay weekendStart weekendEnd"/>
-            <deprecatedItems attributes="standard time"/> <!-- 'count' was probably in a different dtd -->
-            <deprecatedItems elements="variant" attributes="type" values="BOKMAL NYNORSK AALAND POLYTONI"/>
-            <deprecatedItems elements="abbreviationFallback hoursFormat localizedPatternChars mapping preferenceOrdering" attributes="type"/>
-            <deprecatedItems elements="inList" attributes="casing"/>
-            <deprecatedItems elements="symbol" attributes="choice"/>
-            <deprecatedItems type="supplementalData" elements="alternate"/>
-            <deprecatedItems type="supplementalData" elements="calendar" attributes="territories"/>
-            <deprecatedItems type="supplementalData" elements="currency" attributes="before"/>
-            <deprecatedItems type="supplementalData" elements="bcp47KeywordMappings mapKeys mapTypes keyMap typeMap"/>
-            <deprecatedItems elements="cldrVersion"/>
-            <deprecatedItems elements="calendar" attributes="type" values="civil-arabic thai-buddhist"/>
-            <deprecatedItems elements="exemplarCharacters" attributes="type" values="currencySymbol"/>
-            <deprecatedItems elements="decimal group list percentSign nativeZeroDigit patternDigit plusSign minusSign exponential perMille infinity nan currencyDecimal currencyGroup" attributes="numberSystem"/>
-            <deprecatedItems elements="collation" attributes="visibility" values="internal"/> <!-- collations/collation@visibility, see CLDR ticket #7662, 7910 -->
-            <deprecatedItems elements="import" attributes="source" values="locale"/> <!-- collations/collation/import@source="locale", see CLDR ticket #7663 -->
-            <deprecatedItems elements="base"/> <!-- collations/collation/base, see CLDR ticket #6332 -->
-            <!-- collation rules element (replaced by cr) and its sub-elements, see CLDR ticket #5551 -->
-            <deprecatedItems elements="rules reset p pc s sc t tc q qc i ic x extend context first_variable last_variable first_tertiary_ignorable last_tertiary_ignorable first_secondary_ignorable last_secondary_ignorable first_primary_ignorable last_primary_ignorable first_non_ignorable last_non_ignorable first_trailing last_trailing"/>
-            <deprecatedItems attributes="hiraganaQuarternary hiraganaQuaternary"/> <!-- collations/collation/settings@hiraganaQuaternary, see CLDR ticket #5015 -->
-            <deprecatedItems attributes="variableTop"/> <!-- collations/collation/settings@variableTop, see CLDR ticket #5016 -->
-            <deprecatedItems elements="fallback"/>
-            <deprecatedItems type="ldml" elements="references"/>
-            <deprecatedItems elements="commonlyUsed"/>
-            <deprecatedItems elements="inList inText"/>
-            <deprecatedItems elements="collation" attributes="type" values="direct"/>
-            <deprecatedItems type="ldml" elements="paperSize measurementSystem"/>
-            <deprecatedItems elements="height width"/>
-            <deprecatedItems elements="am pm"/>
-            <deprecatedItems elements="stopwords stopwordList"/>
-            <deprecatedItems type="supplementalData" elements="deprecatedItems" attributes="type" values="standard supplemental"/>
-            <deprecatedItems type="supplementalData" elements="timezoneData zoneFormatting zoneItem"/>
-            <deprecatedItems type="ldml" elements="settings" attributes="private"/>
-            <deprecatedItems type="ldml" elements="orientation" attributes="characters lines"/>
-            <deprecatedItems elements="singleCountries"/>
-            <deprecatedItems type="supplementalData" elements="coverageAdditions languageCoverage scriptCoverage territoryCoverage currencyCoverage timezoneCoverage"/>
-            <deprecatedItems elements="fallbackRegionFormat"/>
-            <deprecatedItems elements="unit" attributes="type" values="day hour minute month second week year day-future day-past hour-future hour-past minute-future minute-past month-future month-past second-future second-past week-future week-past year-future year-past"/>
-            <deprecatedItems type="ldml" elements="compressedIndexSeparator cp currencyGroup indexLabel indexLabelAfter indexLabelBefore indexLabels indexRangePattern indexSeparator mapping nativeZeroDigit patternDigit reference usesMetazone"/>
-            <deprecatedItems type="supplementalData" elements="languageCodes"/>
-            <deprecatedItems type="ldml" attributes="validSubLocales"/>
-            <!-- segments -->
-            <deprecatedItems type="ldml" elements="exceptions exception"/>
-    		<!-- Deprecated in v27.  Please see other services that are kept up to date, such as:
-    ​			http://i18napis.appspot.com/address/data/US
-​				http://i18napis.appspot.com/address/data/GB
-				...
-			-->
-            <deprecatedItems type="supplementalData" elements="postalCodeData postCodeRegex"/>
-        </deprecated>
-        <distinguishing>
-             <distinguishingItems attributes="key request id _q registry alt iso4217 iso3166 mzone from to type numberSystem count"/>
-             <distinguishingItems exclude="true" elements="default measurementSystem mapping abbreviationFallback preferenceOrdering" attributes="type"/>
-         </distinguishing>
-        <blocking>
-             <blockingItems elements="identity supplementalData cldrTest collation transform"/>
-         </blocking>
-        <skipDefaultLocale services="segmentation collation"/>
-		<defaultContent locales="
-			aa_ET af_ZA agq_CM ak_GH am_ET ar_001 arn_CL as_IN asa_TZ ast_ES az_Cyrl_AZ
-			az_Latn az_Latn_AZ
-			ba_RU bas_CM be_BY bem_ZM bez_TZ bg_BG bm_Latn bm_Latn_ML bm_Nkoo_ML bn_BD
-			bo_CN br_FR brx_IN bs_Cyrl_BA bs_Latn bs_Latn_BA bss_CM byn_ER
-			ca_ES cch_NG ce_RU cgg_UG chr_US ckb_IQ co_FR cs_CZ cu_RU cy_GB
-			da_DK dav_KE de_DE dje_NE dsb_DE dua_CM dv_MV dyo_SN dz_BT
-			ebu_KE ee_GH el_GR en_Dsrt_US en_US eo_001 es_ES et_EE eu_ES ewo_CM
-			fa_IR ff_SN fi_FI fil_PH fo_FO fr_FR fur_IT fy_NL
-			ga_IE gaa_GH gd_GB gez_ET gl_ES gn_PY gsw_CH gu_IN guz_KE gv_IM
-			ha_Arab_NG ha_Latn ha_Latn_NG haw_US he_IL hi_IN hr_HR hsb_DE hu_HU hy_AM
-			ia_FR id_ID ig_NG ii_CN is_IS it_IT iu_Cans iu_Cans_CA iu_Latn_CA
-			ja_JP jgo_CM jmc_TZ jv_ID
-			ka_GE kab_DZ kaj_NG kam_KE kcg_NG kde_TZ kea_CV ken_CM khq_ML ki_KE kk_Cyrl
-			kk_Cyrl_KZ kkj_CM kl_GL kln_KE km_KH kn_IN ko_KR kok_IN kpe_LR ks_Arab
-			ks_Arab_IN ksb_TZ ksf_CM ksh_DE ku_Latn ku_Latn_TR kw_GB ky_Cyrl ky_Cyrl_KG
-			lag_TZ lb_LU lg_UG lkt_US ln_CD lo_LA lt_LT lu_CD luo_KE luy_KE lv_LV
-			mas_KE mer_KE mfe_MU mg_MG mgh_MZ mgo_CM mi_NZ mk_MK ml_IN mn_Cyrl mn_Cyrl_MN
-			mn_Mong_CN moh_CA mr_IN ms_Arab_MY ms_Latn ms_Latn_MY mt_MT mua_CM my_MM
-			naq_NA nb_NO nd_ZW nds_DE ne_NP nl_NL nmg_CM nn_NO nnh_CM nqo_GN nr_ZA nso_ZA
-			nus_SD ny_MW nyn_UG
-			oc_FR om_ET or_IN os_GE
-			pa_Arab_PK pa_Guru pa_Guru_IN pl_PL prg_001 ps_AF pt_BR
-			qu_PE quc_GT
-			rm_CH rn_BI ro_RO rof_TZ ru_RU rw_RW rwk_TZ
-			sa_IN sah_RU saq_KE sbp_TZ sd_Arab sd_Arab_PK se_NO seh_MZ ses_ML sg_CF
-			shi_Latn_MA shi_Tfng shi_Tfng_MA si_LK sid_ET sk_SK sl_SI sma_SE smj_SE smn_FI
-			sms_FI sn_ZW so_SO sq_AL sr_Cyrl sr_Cyrl_RS sr_Latn_RS ss_ZA ssy_ER st_ZA sv_SE
-			sw_TZ syr_IQ
-			ta_IN te_IN teo_UG tg_Cyrl tg_Cyrl_TJ th_TH ti_ET tig_ER tk_Latn tk_Latn_TM
-			tn_ZA to_TO tr_TR trv_TW ts_ZA tt_RU twq_NE tzm_Latn tzm_Latn_MA
-			ug_Arab ug_Arab_CN uk_UA ur_PK uz_Arab_AF uz_Cyrl_UZ uz_Latn uz_Latn_UZ
-			vai_Latn_LR vai_Vaii vai_Vaii_LR ve_ZA vi_VN vo_001 vun_TZ
-			wa_BE wae_CH wal_ET wbp_AU wo_Latn wo_Latn_SN
-			xh_ZA xog_UG
-			yav_CM yi_001 yo_NG
-			zgh_MA zh_Hans zh_Hans_CN zh_Hant_TW zu_ZA"
-		/>
-    </metadata>
-</supplementalData>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/dtd/ldml.dtd b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/dtd/ldml.dtd
new file mode 100644
index 00000000000..fcdb15287df
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/dtd/ldml.dtd
@@ -0,0 +1,2798 @@
+<!--
+Copyright © 2003-2015 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
+$Revision: 12436 $
+-->
+
+<!ELEMENT ldml ( identity, ( alias | ( fallback*, localeDisplayNames?, layout?, contextTransforms?, characters?, delimiters?, measurement?, dates?, numbers?, units?, listPatterns?, collations?, posix?, segmentations?, rbnf?, annotations?, metadata?, references?, special* ) ) ) >
+<!ATTLIST ldml version CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST ldml draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!-- ######################################################### -->
+
+<!ELEMENT identity ( alias | ( version, generation?, language, script?, territory?, variant?, special* ) ) >
+<!ATTLIST identity draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!-- ######################################################### -->
+<!-- # These elements are common to almost all elements defined -->
+
+<!ELEMENT alias ( special* ) >
+<!ATTLIST alias source NMTOKEN #REQUIRED >
+    <!--@VALUE-->
+<!ATTLIST alias path CDATA #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST alias alt NMTOKENS #IMPLIED >
+<!ATTLIST alias draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT special ANY >
+
+<!ELEMENT version EMPTY >
+<!ATTLIST version number CDATA #REQUIRED >
+    <!--@METADATA-->
+<!ATTLIST version cldrVersion CDATA #FIXED "29" >
+    <!--@METADATA-->
+<!ATTLIST version draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT generation EMPTY >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST generation date CDATA #REQUIRED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST generation draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT language ( #PCDATA ) >
+<!ATTLIST language type NMTOKEN #REQUIRED >
+<!ATTLIST language alt NMTOKENS #IMPLIED >
+<!ATTLIST language draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST language references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT script ( #PCDATA ) >
+<!ATTLIST script type NMTOKEN #REQUIRED >
+<!ATTLIST script alt NMTOKENS #IMPLIED >
+<!ATTLIST script draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST script references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT territory ( #PCDATA ) >
+<!ATTLIST territory type NMTOKEN #REQUIRED >
+<!ATTLIST territory alt NMTOKENS #IMPLIED >
+<!ATTLIST territory draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST territory references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT variant ( #PCDATA ) >
+<!ATTLIST variant type NMTOKEN #REQUIRED >
+<!ATTLIST variant alt NMTOKENS #IMPLIED >
+<!ATTLIST variant draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST variant references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!-- ######################################################### -->
+
+<!ELEMENT fallback ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST fallback alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST fallback draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST fallback references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT localeDisplayNames ( alias | ( localeDisplayPattern?, languages?, scripts?, territories?, subdivisions?, variants?, keys?, types?, transformNames?, measurementSystemNames?, codePatterns?, special* ) ) >
+<!ATTLIST localeDisplayNames draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT localeDisplayPattern ( alias | ( localePattern*, localeSeparator*, localeKeyTypePattern*, special* ) ) >
+<!ATTLIST localeDisplayPattern alt NMTOKENS #IMPLIED >
+<!ATTLIST localeDisplayPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST localeDisplayPattern references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT localePattern ( #PCDATA ) >
+<!ATTLIST localePattern alt NMTOKENS #IMPLIED >
+<!ATTLIST localePattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST localePattern references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT localeSeparator ( #PCDATA ) >
+<!ATTLIST localeSeparator alt NMTOKENS #IMPLIED >
+<!ATTLIST localeSeparator draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST localeSeparator references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT localeKeyTypePattern ( #PCDATA ) >
+<!ATTLIST localeKeyTypePattern alt NMTOKENS #IMPLIED >
+<!ATTLIST localeKeyTypePattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST localeKeyTypePattern references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!-- # Either 1 alias OR any specials, any order, zero or more language -->
+
+<!ELEMENT languages ( alias | ( language | special )* ) >
+<!ATTLIST languages draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST languages standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST languages references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST languages validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!-- # Either 1 alias OR any specials, any order, zero or more script -->
+
+<!ELEMENT scripts ( alias | ( script | special )* ) >
+<!ATTLIST scripts draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST scripts standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST scripts references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST scripts validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!-- # Either 1 alias OR any specials, any order, zero or more territory -->
+
+<!ELEMENT territories ( alias | ( territory | special )* ) >
+<!ATTLIST territories draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST territories standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST territories references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST territories validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT subdivisions ( alias | ( subdivision | special )* ) >
+<!ATTLIST subdivisions draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST subdivisions references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT subdivision ( #PCDATA ) >
+<!ATTLIST subdivision type NMTOKEN #REQUIRED >
+<!ATTLIST subdivision alt NMTOKENS #IMPLIED >
+<!ATTLIST subdivision draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+
+<!-- # Either 1 alias OR any specials, any order, zero or more variant -->
+
+<!ELEMENT variants ( alias | ( variant | special )* ) >
+<!ATTLIST variants draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST variants standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST variants references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST variants validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!-- # Either 1 alias OR any specials, any order, zero or more key -->
+
+<!ELEMENT keys ( alias | ( key | special )* ) >
+<!ATTLIST keys draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST keys standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST keys references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST keys validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT key ( #PCDATA ) >
+<!ATTLIST key type NMTOKEN #REQUIRED >
+<!ATTLIST key alt NMTOKENS #IMPLIED >
+<!ATTLIST key draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST key references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!-- # Either 1 alias OR any specials, any order, zero or more type -->
+
+<!ELEMENT types ( alias | ( type | special )* ) >
+<!ATTLIST types draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST types standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST types references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST types validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT type ( #PCDATA ) >
+<!ATTLIST type key NMTOKEN #REQUIRED >
+<!ATTLIST type type NMTOKEN #REQUIRED >
+<!ATTLIST type alt NMTOKENS #IMPLIED >
+<!ATTLIST type draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST type references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT transformNames ( alias | ( transformName | special )* ) >
+<!ATTLIST transformNames draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST transformNames references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT transformName ( #PCDATA ) >
+<!ATTLIST transformName type NMTOKEN #REQUIRED >
+<!ATTLIST transformName alt NMTOKENS #IMPLIED >
+<!ATTLIST transformName draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST transformName references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!-- # Either 1 alias OR any specials, any order, zero or more measurementSystemName -->
+
+<!ELEMENT measurementSystemNames ( alias | ( measurementSystemName | special )* ) >
+<!ATTLIST measurementSystemNames draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST measurementSystemNames references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST measurementSystemNames validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT measurementSystemName ( #PCDATA ) >
+<!ATTLIST measurementSystemName type (US | metric | UK) #REQUIRED >
+<!ATTLIST measurementSystemName alt NMTOKENS #IMPLIED >
+<!ATTLIST measurementSystemName draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST measurementSystemName references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT codePatterns ( alias | ( codePattern | special )* ) >
+
+<!ELEMENT codePattern ( #PCDATA ) >
+<!ATTLIST codePattern type NMTOKEN #REQUIRED >
+<!ATTLIST codePattern alt NMTOKENS #IMPLIED >
+<!ATTLIST codePattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST codePattern references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!-- ######################################################### -->
+<!-- # layout and orientation are script specific, so validSublocales attribute is not required -->
+
+<!ELEMENT layout ( alias | ( orientation*, inList*, inText*, special* ) ) >
+<!ATTLIST layout draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST layout references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT orientation ( alias | ( characterOrder*, lineOrder*, special* ) ) >
+<!ATTLIST orientation characters (left-to-right | right-to-left | top-to-bottom | bottom-to-top) #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST orientation lines (left-to-right | right-to-left | top-to-bottom | bottom-to-top) #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST orientation alt NMTOKENS #IMPLIED >
+<!ATTLIST orientation draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST orientation standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST orientation references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT characterOrder ( #PCDATA ) >
+<!ATTLIST characterOrder alt NMTOKENS #IMPLIED >
+<!ATTLIST characterOrder draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT lineOrder ( #PCDATA ) >
+<!ATTLIST lineOrder alt NMTOKENS #IMPLIED >
+<!ATTLIST lineOrder draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT inList ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST inList casing (titlecase-words | titlecase-firstword | lowercase-words | mixed) #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST inList alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST inList draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST inList references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT inText ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST inText type (languages | scripts | territories | variants | keys | types | measurementSystemNames | monthWidth | dayWidth | quarterWidth | long | fields | currency) #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST inText alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST inText draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST inText references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!-- ######################################################### -->
+
+<!ELEMENT contextTransforms ( alias | ( contextTransformUsage*, special* ) ) >
+<!ATTLIST contextTransforms alt NMTOKENS #IMPLIED >
+<!ATTLIST contextTransforms draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST contextTransforms references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST contextTransforms validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT contextTransformUsage ( alias | ( contextTransform*, special* ) ) >
+<!ATTLIST contextTransformUsage type CDATA #REQUIRED >
+<!ATTLIST contextTransformUsage alt NMTOKENS #IMPLIED >
+<!ATTLIST contextTransformUsage draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST contextTransformUsage references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST contextTransformUsage validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT contextTransform ( #PCDATA ) >
+<!ATTLIST contextTransform type (uiListOrMenu | stand-alone) #REQUIRED >
+<!ATTLIST contextTransform alt NMTOKENS #IMPLIED >
+<!ATTLIST contextTransform draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST contextTransform references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!-- ######################################################### -->
+
+<!ELEMENT characters ( alias | ( exemplarCharacters*, ellipsis*, moreInformation*, stopwords*, indexLabels*, mapping*, special* ) ) >
+<!ATTLIST characters draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT exemplarCharacters ( #PCDATA | cp )* >
+<!ATTLIST exemplarCharacters type (auxiliary | standard | punctuation | currencySymbol | index) #IMPLIED >
+    <!--@DEPRECATED:currencySymbol-->
+<!ATTLIST exemplarCharacters alt NMTOKENS #IMPLIED >
+<!ATTLIST exemplarCharacters draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST exemplarCharacters standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST exemplarCharacters references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST exemplarCharacters validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!-- # This element can occur anywhere there may be localizable data -->
+
+<!ELEMENT cp ( special* ) >
+    <!--@DEPRECATED-->
+<!ATTLIST cp hex NMTOKEN #REQUIRED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT ellipsis ( #PCDATA ) >
+<!ATTLIST ellipsis type (initial | medial | final | word-initial | word-medial | word-final) #IMPLIED >
+<!ATTLIST ellipsis alt NMTOKENS #IMPLIED >
+<!ATTLIST ellipsis draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST ellipsis references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT moreInformation ( #PCDATA ) >
+<!ATTLIST moreInformation alt NMTOKENS #IMPLIED >
+<!ATTLIST moreInformation draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST moreInformation references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT stopwords ( stopwordList* ) >
+    <!--@DEPRECATED-->
+
+<!ELEMENT stopwordList ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST stopwordList type NMTOKEN #REQUIRED >
+    <!--@DEPRECATED-->
+<!ATTLIST stopwordList alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST stopwordList draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST stopwordList references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT indexLabels ( indexSeparator*, compressedIndexSeparator*, indexRangePattern*, indexLabelBefore*, indexLabelAfter*, indexLabel* ) >
+    <!--@DEPRECATED-->
+
+<!ELEMENT indexSeparator ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST indexSeparator alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST indexSeparator draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST indexSeparator references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT compressedIndexSeparator ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST compressedIndexSeparator alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST compressedIndexSeparator draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST compressedIndexSeparator references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT indexRangePattern ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST indexRangePattern alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST indexRangePattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST indexRangePattern references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT indexLabelBefore ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST indexLabelBefore alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST indexLabelBefore draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST indexLabelBefore references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT indexLabelAfter ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST indexLabelAfter alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST indexLabelAfter draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST indexLabelAfter references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT indexLabel ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST indexLabel indexSource CDATA #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST indexLabel priority (1 | 2 | 3) #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST indexLabel alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST indexLabel draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST indexLabel references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT mapping ( special* ) >
+    <!--@DEPRECATED-->
+<!ATTLIST mapping registry NMTOKEN #REQUIRED >
+    <!--@DEPRECATED-->
+<!ATTLIST mapping type NMTOKEN #IMPLIED >
+    <!-- use choice instead -->
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST mapping choice NMTOKEN #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST mapping alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST mapping draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST mapping standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST mapping references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST mapping validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!-- ######################################################### -->
+
+<!ELEMENT delimiters ( alias | ( quotationStart*, quotationEnd*, alternateQuotationStart*, alternateQuotationEnd*, special* ) ) >
+<!ATTLIST delimiters alt NMTOKENS #IMPLIED >
+<!ATTLIST delimiters draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST delimiters standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST delimiters references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST delimiters validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT quotationStart ( #PCDATA | cp )* >
+<!ATTLIST quotationStart alt NMTOKENS #IMPLIED >
+<!ATTLIST quotationStart draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST quotationStart references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT quotationEnd ( #PCDATA | cp )* >
+<!ATTLIST quotationEnd alt NMTOKENS #IMPLIED >
+<!ATTLIST quotationEnd draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST quotationEnd references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT alternateQuotationStart ( #PCDATA | cp )* >
+<!ATTLIST alternateQuotationStart alt NMTOKENS #IMPLIED >
+<!ATTLIST alternateQuotationStart draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST alternateQuotationStart references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT alternateQuotationEnd ( #PCDATA | cp )* >
+<!ATTLIST alternateQuotationEnd alt NMTOKENS #IMPLIED >
+<!ATTLIST alternateQuotationEnd draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST alternateQuotationEnd references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!-- ######################################################### -->
+
+<!ELEMENT measurement ( alias | ( measurementSystem*, paperSize*, special* ) ) >
+    <!-- use measurementData in supplemental instead -->
+    <!--@DEPRECATED-->
+<!ATTLIST measurement alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST measurement draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST measurement standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST measurement references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST measurement validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT measurementSystem ( special* ) >
+    <!-- use measurementSystem in supplemental instead -->
+    <!--@DEPRECATED-->
+<!ATTLIST measurementSystem type (metric | US | UK) #REQUIRED >
+    <!-- use choice instead -->
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST measurementSystem choice (metric | US | UK) #IMPLIED >
+    <!-- really required, but needs to be optional to support type also -->
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST measurementSystem alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST measurementSystem draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST measurementSystem standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST measurementSystem references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST measurementSystem validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT paperSize ( alias | ( height*, width*, special* ) ) >
+    <!-- use paperSize in supplemental instead -->
+    <!--@DEPRECATED-->
+<!ATTLIST paperSize alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST paperSize draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST paperSize standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST paperSize references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST paperSize validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT height ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST height alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST height draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST height references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT width ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST width alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST width draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST width references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!-- ######################################################### -->
+
+<!ELEMENT dates ( alias | ( localizedPatternChars*, dateRangePattern*, calendars?, fields?, timeZoneNames?, special* ) ) >
+<!ATTLIST dates alt NMTOKENS #IMPLIED >
+<!ATTLIST dates draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dates standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dates references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST dates validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT localizedPatternChars ( #PCDATA | cp )* >
+    <!--@DEPRECATED-->
+<!ATTLIST localizedPatternChars alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST localizedPatternChars draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST localizedPatternChars standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST localizedPatternChars references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST localizedPatternChars validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT dateRangePattern ( #PCDATA ) >
+    <!-- use intervalFormats. -->
+    <!--@DEPRECATED-->
+<!ATTLIST dateRangePattern alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST dateRangePattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dateRangePattern standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dateRangePattern references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dateRangePattern validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT calendars ( alias | ( default*, calendar*, special* ) ) >
+    <!-- use calendarPreferenceData instead of default element -->
+<!ATTLIST calendars draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST calendars validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT default ( special* ) >
+    <!--@DEPRECATED-->
+<!ATTLIST default type NMTOKEN #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST default choice NMTOKEN #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST default alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST default draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST default references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT calendar ( alias | ( months?, monthNames?, monthAbbr?, monthPatterns?, days?, dayNames?, dayAbbr?, quarters?, week?, am*, pm*, dayPeriods?, eras?, cyclicNameSets?, dateFormats?, timeFormats?, dateTimeFormats?, fields*, special* ) ) >
+    <!-- use of fields is deprecated here -->
+<!ATTLIST calendar type NMTOKEN #REQUIRED >
+<!ATTLIST calendar alt NMTOKENS #IMPLIED >
+<!ATTLIST calendar draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST calendar standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST calendar references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST calendar validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT months ( alias | ( default*, monthContext*, special* ) ) >
+<!ATTLIST months alt NMTOKENS #IMPLIED >
+<!ATTLIST months draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST months standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST months references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST months validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT monthContext ( alias | ( default*, monthWidth*, special* ) ) >
+<!ATTLIST monthContext type (format | stand-alone) #REQUIRED >
+<!ATTLIST monthContext alt NMTOKENS #IMPLIED >
+<!ATTLIST monthContext draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST monthContext standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST monthContext references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST monthContext validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT monthWidth ( alias | ( month*, special* ) ) >
+<!ATTLIST monthWidth type (abbreviated | narrow | wide) #REQUIRED >
+<!ATTLIST monthWidth alt NMTOKENS #IMPLIED >
+<!ATTLIST monthWidth draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST monthWidth standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST monthWidth references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST monthWidth validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT month ( #PCDATA | cp )* >
+<!ATTLIST month type (1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13) #REQUIRED >
+<!ATTLIST month yeartype (standard | leap) #IMPLIED >
+<!ATTLIST month alt NMTOKENS #IMPLIED >
+<!ATTLIST month draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST month references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT monthNames ( alias | ( month*, special* ) ) >
+    <!--@DEPRECATED-->
+<!ATTLIST monthNames draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT monthAbbr ( alias | ( month*, special* ) ) >
+    <!--@DEPRECATED-->
+<!ATTLIST monthAbbr draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT monthPatterns ( alias | ( monthPatternContext*, special* ) ) >
+<!ATTLIST monthPatterns alt NMTOKENS #IMPLIED >
+<!ATTLIST monthPatterns draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST monthPatterns references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST monthPatterns validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT monthPatternContext ( alias | ( monthPatternWidth*, special* ) ) >
+<!ATTLIST monthPatternContext type (format | stand-alone | numeric) #REQUIRED >
+<!ATTLIST monthPatternContext alt NMTOKENS #IMPLIED >
+<!ATTLIST monthPatternContext draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST monthPatternContext references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST monthPatternContext validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT monthPatternWidth ( alias | ( monthPattern*, special* ) ) >
+<!ATTLIST monthPatternWidth type (abbreviated | narrow | wide | all) #REQUIRED >
+<!ATTLIST monthPatternWidth alt NMTOKENS #IMPLIED >
+<!ATTLIST monthPatternWidth draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST monthPatternWidth references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST monthPatternWidth validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT monthPattern ( #PCDATA ) >
+<!ATTLIST monthPattern type (leap | standardAfterLeap | combined) #REQUIRED >
+<!ATTLIST monthPattern alt NMTOKENS #IMPLIED >
+<!ATTLIST monthPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST monthPattern references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT days ( alias | ( default*, dayContext*, special* ) ) >
+<!ATTLIST days alt NMTOKENS #IMPLIED >
+<!ATTLIST days draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST days standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST days references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST days validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT dayContext ( alias | ( default*, dayWidth*, special* ) ) >
+<!ATTLIST dayContext type (format | stand-alone) #REQUIRED >
+<!ATTLIST dayContext alt NMTOKENS #IMPLIED >
+<!ATTLIST dayContext draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dayContext standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dayContext references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST dayContext validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT dayWidth ( alias | ( day*, special* ) ) >
+<!ATTLIST dayWidth type (abbreviated | narrow | short | wide) #REQUIRED >
+<!ATTLIST dayWidth alt NMTOKENS #IMPLIED >
+<!ATTLIST dayWidth draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dayWidth standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dayWidth references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST dayWidth validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT day ( #PCDATA ) >
+<!ATTLIST day type (sun | mon | tue | wed | thu | fri | sat) #REQUIRED >
+<!ATTLIST day alt NMTOKENS #IMPLIED >
+<!ATTLIST day draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST day references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT dayNames ( alias | ( day*, special* ) ) >
+    <!--@DEPRECATED-->
+<!ATTLIST dayNames draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT dayAbbr ( alias | ( day*, special* ) ) >
+    <!--@DEPRECATED-->
+<!ATTLIST dayAbbr draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT quarters ( alias | ( default*, quarterContext*, special* ) ) >
+<!ATTLIST quarters alt NMTOKENS #IMPLIED >
+<!ATTLIST quarters draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST quarters references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST quarters validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT quarterContext ( alias | ( default*, quarterWidth*, special* ) ) >
+<!ATTLIST quarterContext type (format | stand-alone) #REQUIRED >
+<!ATTLIST quarterContext alt NMTOKENS #IMPLIED >
+<!ATTLIST quarterContext draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST quarterContext references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST quarterContext validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT quarterWidth ( alias | ( quarter*, special* ) ) >
+<!ATTLIST quarterWidth type (abbreviated | narrow | wide) #REQUIRED >
+<!ATTLIST quarterWidth alt NMTOKENS #IMPLIED >
+<!ATTLIST quarterWidth draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST quarterWidth references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST quarterWidth validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT quarter ( #PCDATA ) >
+<!ATTLIST quarter type (1 | 2 | 3 | 4) #REQUIRED >
+<!ATTLIST quarter alt NMTOKENS #IMPLIED >
+<!ATTLIST quarter draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST quarter references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT week ( alias | ( minDays*, firstDay*, weekendStart*, weekendEnd*, special* ) ) >
+    <!-- use supplemental weekData -->
+    <!--@DEPRECATED-->
+<!ATTLIST week alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST week draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST week standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST week references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST week validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT minDays ( special* ) >
+    <!--@DEPRECATED-->
+<!ATTLIST minDays count (1 | 2 | 3 | 4 | 5 | 6 | 7) #REQUIRED >
+    <!--@DEPRECATED-->
+<!ATTLIST minDays alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST minDays draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST minDays references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT firstDay ( special* ) >
+    <!-- use supplemental data -->
+    <!--@DEPRECATED-->
+<!ATTLIST firstDay day (sun | mon | tue | wed | thu | fri | sat) #REQUIRED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST firstDay alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST firstDay draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST firstDay references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT weekendStart ( special* ) >
+    <!-- use supplemental data -->
+    <!--@DEPRECATED-->
+<!ATTLIST weekendStart day (sun | mon | tue | wed | thu | fri | sat) #REQUIRED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST weekendStart time CDATA "00:00" >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST weekendStart alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST weekendStart draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST weekendStart references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT weekendEnd ( special* ) >
+    <!-- use supplemental data -->
+    <!--@DEPRECATED-->
+<!ATTLIST weekendEnd day (sun | mon | tue | wed | thu | fri | sat) #REQUIRED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST weekendEnd time CDATA "24:00" >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST weekendEnd alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST weekendEnd draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST weekendEnd references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT am ( #PCDATA ) >
+    <!-- use dayPeriods -->
+    <!--@DEPRECATED-->
+<!ATTLIST am alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST am draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST am references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST am validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT pm ( #PCDATA ) >
+    <!-- use dayPeriods -->
+    <!--@DEPRECATED-->
+<!ATTLIST pm alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST pm draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST pm references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST pm validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT dayPeriods ( alias | ( dayPeriodContext*, special* ) ) >
+<!ATTLIST dayPeriods draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dayPeriods references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT dayPeriodContext ( alias | ( dayPeriodWidth*, special* ) ) >
+<!ATTLIST dayPeriodContext type NMTOKEN #REQUIRED >
+<!ATTLIST dayPeriodContext draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dayPeriodContext references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT dayPeriodWidth ( alias | ( dayPeriod*, special* ) ) >
+<!ATTLIST dayPeriodWidth type (abbreviated | narrow | wide) #REQUIRED >
+<!ATTLIST dayPeriodWidth draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dayPeriodWidth references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT dayPeriod ( #PCDATA ) >
+<!ATTLIST dayPeriod type NMTOKEN #REQUIRED >
+<!ATTLIST dayPeriod alt NMTOKENS #IMPLIED >
+<!ATTLIST dayPeriod draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST dayPeriod references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT eras ( alias | ( eraNames?, eraAbbr?, eraNarrow?, special* ) ) >
+<!ATTLIST eras alt NMTOKENS #IMPLIED >
+<!ATTLIST eras draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST eras standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST eras references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST eras validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT eraNames ( alias | ( era*, special* ) ) >
+<!ATTLIST eraNames alt NMTOKENS #IMPLIED >
+<!ATTLIST eraNames draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST eraNames references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST eraNames validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT era ( #PCDATA ) >
+<!ATTLIST era type NMTOKEN #REQUIRED >
+<!ATTLIST era alt NMTOKENS #IMPLIED >
+<!ATTLIST era draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST era references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT eraAbbr ( alias | ( era*, special* ) ) >
+<!ATTLIST eraAbbr alt NMTOKENS #IMPLIED >
+<!ATTLIST eraAbbr draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST eraAbbr references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST eraAbbr validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT eraNarrow ( alias | ( era*, special* ) ) >
+<!ATTLIST eraNarrow alt NMTOKENS #IMPLIED >
+<!ATTLIST eraNarrow draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST eraNarrow references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST eraNarrow validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT cyclicNameSets ( alias | ( cyclicNameSet*, special* ) ) >
+<!ATTLIST cyclicNameSets alt NMTOKENS #IMPLIED >
+<!ATTLIST cyclicNameSets draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST cyclicNameSets references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST cyclicNameSets validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT cyclicNameSet ( alias | ( cyclicNameContext*, special* ) ) >
+<!ATTLIST cyclicNameSet type (years | months | days | dayParts | zodiacs | solarTerms) #REQUIRED >
+<!ATTLIST cyclicNameSet alt NMTOKENS #IMPLIED >
+<!ATTLIST cyclicNameSet draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST cyclicNameSet references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST cyclicNameSet validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT cyclicNameContext ( alias | ( cyclicNameWidth*, special* ) ) >
+<!ATTLIST cyclicNameContext type (format | stand-alone) #REQUIRED >
+<!ATTLIST cyclicNameContext alt NMTOKENS #IMPLIED >
+<!ATTLIST cyclicNameContext draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST cyclicNameContext references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST cyclicNameContext validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT cyclicNameWidth ( alias | ( cyclicName*, special* ) ) >
+<!ATTLIST cyclicNameWidth type (abbreviated | narrow | wide) #REQUIRED >
+<!ATTLIST cyclicNameWidth alt NMTOKENS #IMPLIED >
+<!ATTLIST cyclicNameWidth draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST cyclicNameWidth references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST cyclicNameWidth validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT cyclicName ( #PCDATA ) >
+<!ATTLIST cyclicName type NMTOKEN #REQUIRED >
+<!ATTLIST cyclicName alt NMTOKENS #IMPLIED >
+<!ATTLIST cyclicName draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST cyclicName references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT dateFormats ( alias | ( default*, dateFormatLength*, special* ) ) >
+<!ATTLIST dateFormats draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dateFormats validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT dateFormatLength ( alias | ( default*, dateFormat*, special* ) ) >
+<!ATTLIST dateFormatLength type (full | long | medium | short) #REQUIRED >
+<!ATTLIST dateFormatLength alt NMTOKENS #IMPLIED >
+<!ATTLIST dateFormatLength draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dateFormatLength standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dateFormatLength references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST dateFormatLength validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT dateFormat ( alias | ( pattern*, displayName*, special* ) ) >
+<!ATTLIST dateFormat type NMTOKEN "standard" >
+<!ATTLIST dateFormat alt NMTOKENS #IMPLIED >
+<!ATTLIST dateFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dateFormat standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dateFormat references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST dateFormat validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT pattern ( #PCDATA ) >
+<!ATTLIST pattern type NMTOKEN "standard" >
+<!ATTLIST pattern numbers CDATA #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST pattern count (0 | 1 | zero | one | two | few | many | other) #IMPLIED >
+    <!-- Only used for decimalFormats type="1000..." -->
+<!ATTLIST pattern alt NMTOKENS #IMPLIED >
+<!ATTLIST pattern draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST pattern references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT displayName ( #PCDATA ) >
+<!ATTLIST displayName count (0 | 1 | zero | one | two | few | many | other) #IMPLIED >
+    <!-- only for currencies -->
+<!ATTLIST displayName alt NMTOKENS #IMPLIED >
+<!ATTLIST displayName draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST displayName references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT timeFormats ( alias | ( default*, timeFormatLength*, special* ) ) >
+<!ATTLIST timeFormats draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST timeFormats validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT timeFormatLength ( alias | ( default*, timeFormat*, special* ) ) >
+<!ATTLIST timeFormatLength type (full | long | medium | short) #REQUIRED >
+<!ATTLIST timeFormatLength alt NMTOKENS #IMPLIED >
+<!ATTLIST timeFormatLength draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST timeFormatLength standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST timeFormatLength references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST timeFormatLength validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT timeFormat ( alias | ( pattern*, displayName*, special* ) ) >
+<!ATTLIST timeFormat type NMTOKEN "standard" >
+<!ATTLIST timeFormat alt NMTOKENS #IMPLIED >
+<!ATTLIST timeFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST timeFormat standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST timeFormat references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST timeFormat validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT dateTimeFormats ( alias | ( default*, dateTimeFormatLength*, availableFormats*, appendItems*, intervalFormats*, special* ) ) >
+<!ATTLIST dateTimeFormats draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dateTimeFormats validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT dateTimeFormatLength ( alias | ( default*, dateTimeFormat*, special* ) ) >
+<!ATTLIST dateTimeFormatLength type (full | long | medium | short) #IMPLIED >
+<!ATTLIST dateTimeFormatLength alt NMTOKENS #IMPLIED >
+<!ATTLIST dateTimeFormatLength draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dateTimeFormatLength standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dateTimeFormatLength references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST dateTimeFormatLength validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT dateTimeFormat ( alias | ( pattern*, displayName*, special* ) ) >
+<!ATTLIST dateTimeFormat type NMTOKEN "standard" >
+<!ATTLIST dateTimeFormat alt NMTOKENS #IMPLIED >
+<!ATTLIST dateTimeFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dateTimeFormat standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dateTimeFormat references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST dateTimeFormat validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT availableFormats ( alias | ( dateFormatItem*, special* ) ) >
+<!ATTLIST availableFormats alt NMTOKENS #IMPLIED >
+<!ATTLIST availableFormats draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST availableFormats references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST availableFormats validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT dateFormatItem ( #PCDATA ) >
+<!ATTLIST dateFormatItem id CDATA #REQUIRED >
+<!ATTLIST dateFormatItem alt NMTOKENS #IMPLIED >
+<!ATTLIST dateFormatItem draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST dateFormatItem references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT appendItems ( alias | ( appendItem*, special* ) ) >
+<!ATTLIST appendItems alt NMTOKENS #IMPLIED >
+<!ATTLIST appendItems draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST appendItems references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST appendItems validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT appendItem ( #PCDATA ) >
+<!ATTLIST appendItem request CDATA #REQUIRED >
+<!ATTLIST appendItem alt NMTOKENS #IMPLIED >
+<!ATTLIST appendItem draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST appendItem references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT intervalFormats ( alias | ( intervalFormatFallback*, intervalFormatItem*, special* ) ) >
+<!ATTLIST intervalFormats alt NMTOKENS #IMPLIED >
+<!ATTLIST intervalFormats draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST intervalFormats references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST intervalFormats validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT intervalFormatFallback ( #PCDATA ) >
+<!ATTLIST intervalFormatFallback alt NMTOKENS #IMPLIED >
+<!ATTLIST intervalFormatFallback draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST intervalFormatFallback references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST intervalFormatFallback validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT intervalFormatItem ( alias | ( greatestDifference*, special* ) ) >
+<!ATTLIST intervalFormatItem id NMTOKEN #REQUIRED >
+<!ATTLIST intervalFormatItem alt NMTOKENS #IMPLIED >
+<!ATTLIST intervalFormatItem draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST intervalFormatItem references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST intervalFormatItem validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT greatestDifference ( #PCDATA ) >
+<!ATTLIST greatestDifference id NMTOKEN #REQUIRED >
+<!ATTLIST greatestDifference alt NMTOKENS #IMPLIED >
+<!ATTLIST greatestDifference draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST greatestDifference references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST greatestDifference validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT fields ( alias | ( field*, special* ) ) >
+<!ATTLIST fields alt NMTOKENS #IMPLIED >
+<!ATTLIST fields draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST fields standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST fields references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST fields validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT field ( alias | ( displayName*, relative*, relativeTime*, special* ) ) >
+<!ATTLIST field type (era | year | year-short | year-narrow | quarter | quarter-short | quarter-narrow | month | month-short | month-narrow | week | week-short | week-narrow | day | day-short | day-narrow | weekday | sun | sun-short | sun-narrow | mon | mon-short | mon-narrow | tue | tue-short | tue-narrow | wed | wed-short | wed-narrow | thu | thu-short | thu-narrow | fri | fri-short | fri-narrow | sat | sat-short | sat-narrow | dayperiod | hour | hour-short | hour-narrow | minute | minute-short | minute-narrow | second | second-short | second-narrow | zone) #IMPLIED >
+<!ATTLIST field alt NMTOKENS #IMPLIED >
+<!ATTLIST field draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST field standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST field references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST field validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT relative ( #PCDATA ) >
+<!ATTLIST relative type NMTOKEN #IMPLIED >
+<!ATTLIST relative alt NMTOKENS #IMPLIED >
+<!ATTLIST relative draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST relative references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST relative validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT relativeTime ( alias | ( relativeTimePattern*, special* ) ) >
+<!ATTLIST relativeTime type NMTOKEN #REQUIRED >
+<!ATTLIST relativeTime alt NMTOKENS #IMPLIED >
+<!ATTLIST relativeTime draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST relativeTime references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST relativeTime validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT relativeTimePattern ( #PCDATA ) >
+<!ATTLIST relativeTimePattern count (zero | one | two | few | many | other) #REQUIRED >
+<!ATTLIST relativeTimePattern alt NMTOKENS #IMPLIED >
+<!ATTLIST relativeTimePattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST relativeTimePattern references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST relativeTimePattern validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT timeZoneNames ( alias | ( hourFormat*, hoursFormat*, gmtFormat*, gmtZeroFormat*, regionFormat*, fallbackFormat*, fallbackRegionFormat*, abbreviationFallback*, preferenceOrdering*, singleCountries*, default*, zone*, metazone*, special* ) ) >
+<!ATTLIST timeZoneNames draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST timeZoneNames validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT hourFormat ( #PCDATA ) >
+<!ATTLIST hourFormat alt NMTOKENS #IMPLIED >
+<!ATTLIST hourFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST hourFormat references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT hoursFormat ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST hoursFormat alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST hoursFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST hoursFormat references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT gmtFormat ( #PCDATA ) >
+<!ATTLIST gmtFormat alt NMTOKENS #IMPLIED >
+<!ATTLIST gmtFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST gmtFormat references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT gmtZeroFormat ( #PCDATA ) >
+<!ATTLIST gmtZeroFormat alt NMTOKENS #IMPLIED >
+<!ATTLIST gmtZeroFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST gmtZeroFormat references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT regionFormat ( #PCDATA ) >
+<!ATTLIST regionFormat type (standard | daylight) #IMPLIED >
+<!ATTLIST regionFormat alt NMTOKENS #IMPLIED >
+<!ATTLIST regionFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST regionFormat references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT fallbackFormat ( #PCDATA ) >
+<!ATTLIST fallbackFormat alt NMTOKENS #IMPLIED >
+<!ATTLIST fallbackFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST fallbackFormat references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT fallbackRegionFormat ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST fallbackRegionFormat alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST fallbackRegionFormat draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST fallbackRegionFormat references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT abbreviationFallback EMPTY >
+    <!--@DEPRECATED-->
+<!ATTLIST abbreviationFallback type (GMT | standard) #IMPLIED >
+    <!-- use choice instead -->
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST abbreviationFallback choice (GMT | standard) #IMPLIED >
+    <!-- really required, but needs to be optional to support type also -->
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST abbreviationFallback alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST abbreviationFallback draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST abbreviationFallback references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT preferenceOrdering EMPTY >
+    <!-- use metazones instead -->
+    <!--@DEPRECATED-->
+<!ATTLIST preferenceOrdering type CDATA #IMPLIED >
+    <!-- use choice instead -->
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST preferenceOrdering choice CDATA #IMPLIED >
+    <!-- really required, but needs to be optional to support type also -->
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST preferenceOrdering alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST preferenceOrdering draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST preferenceOrdering references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT singleCountries EMPTY >
+    <!--@DEPRECATED-->
+<!ATTLIST singleCountries list CDATA #REQUIRED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST singleCountries alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST singleCountries draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST singleCountries references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT zone ( alias | ( long*, short*, commonlyUsed*, exemplarCity*, special* ) ) >
+<!ATTLIST zone type CDATA #REQUIRED >
+<!ATTLIST zone alt NMTOKENS #IMPLIED >
+<!ATTLIST zone draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST zone standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST zone references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST zone validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT long ( alias | ( generic*, standard*, daylight*, special* ) ) >
+<!ATTLIST long alt NMTOKENS #IMPLIED >
+<!ATTLIST long draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST long references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST long validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT generic ( #PCDATA ) >
+<!ATTLIST generic alt NMTOKENS #IMPLIED >
+<!ATTLIST generic draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST generic references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT standard ( #PCDATA ) >
+<!ATTLIST standard alt NMTOKENS #IMPLIED >
+<!ATTLIST standard draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST standard references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT daylight ( #PCDATA ) >
+<!ATTLIST daylight alt NMTOKENS #IMPLIED >
+<!ATTLIST daylight draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST daylight references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT short ( alias | ( generic*, standard*, daylight*, special* ) ) >
+<!ATTLIST short alt NMTOKENS #IMPLIED >
+<!ATTLIST short draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST short references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST short validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT commonlyUsed ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST commonlyUsed used (true | false) #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST commonlyUsed alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST commonlyUsed draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST commonlyUsed references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT exemplarCity ( #PCDATA ) >
+<!ATTLIST exemplarCity alt NMTOKENS #IMPLIED >
+<!ATTLIST exemplarCity draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST exemplarCity references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT metazone ( alias | ( long*, short*, commonlyUsed*, special* ) ) >
+<!ATTLIST metazone type CDATA #REQUIRED >
+<!ATTLIST metazone alt NMTOKENS #IMPLIED >
+<!ATTLIST metazone draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST metazone standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST metazone references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST metazone validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!-- ######################################################### -->
+
+<!ELEMENT numbers ( alias | ( defaultNumberingSystem*, otherNumberingSystems*, minimumGroupingDigits*, symbols*, decimalFormats*, scientificFormats*, percentFormats*, currencyFormats*, currencies?, miscPatterns*, special* ) ) >
+<!ATTLIST numbers alt NMTOKENS #IMPLIED >
+<!ATTLIST numbers draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST numbers standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST numbers references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST numbers validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT defaultNumberingSystem ( #PCDATA ) >
+<!ATTLIST defaultNumberingSystem alt NMTOKENS #IMPLIED >
+<!ATTLIST defaultNumberingSystem draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST defaultNumberingSystem references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT otherNumberingSystems ( alias | ( native*, traditional*, finance*, special* ) ) >
+<!ATTLIST otherNumberingSystems alt NMTOKENS #IMPLIED >
+<!ATTLIST otherNumberingSystems draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT native ( #PCDATA ) >
+<!ATTLIST native alt NMTOKENS #IMPLIED >
+<!ATTLIST native draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+
+<!ELEMENT traditional ( #PCDATA ) >
+<!ATTLIST traditional alt NMTOKENS #IMPLIED >
+<!ATTLIST traditional draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+
+<!ELEMENT finance ( #PCDATA ) >
+<!ATTLIST finance alt NMTOKENS #IMPLIED >
+<!ATTLIST finance draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+
+<!ELEMENT minimumGroupingDigits ( #PCDATA ) >
+<!ATTLIST minimumGroupingDigits alt NMTOKENS #IMPLIED >
+<!ATTLIST minimumGroupingDigits draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST minimumGroupingDigits references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT symbols ( alias | ( decimal*, group*, list*, percentSign*, nativeZeroDigit*, patternDigit*, plusSign*, minusSign*, exponential*, superscriptingExponent*, perMille*, infinity*, nan*, currencyDecimal*, currencyGroup*, timeSeparator*, special* ) ) >
+<!ATTLIST symbols alt NMTOKENS #IMPLIED >
+<!ATTLIST symbols draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST symbols standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST symbols references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST symbols validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST symbols numberSystem CDATA #IMPLIED >
+
+<!ELEMENT decimal ( #PCDATA ) >
+<!ATTLIST decimal alt NMTOKENS #IMPLIED >
+<!ATTLIST decimal draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST decimal references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST decimal numberSystem CDATA #IMPLIED >
+    <!--@DEPRECATED-->
+
+<!ELEMENT group ( #PCDATA ) >
+<!ATTLIST group alt NMTOKENS #IMPLIED >
+<!ATTLIST group draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST group references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST group numberSystem CDATA #IMPLIED >
+    <!--@DEPRECATED-->
+
+<!ELEMENT list ( #PCDATA ) >
+<!ATTLIST list alt NMTOKENS #IMPLIED >
+<!ATTLIST list draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST list references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST list numberSystem CDATA #IMPLIED >
+    <!--@DEPRECATED-->
+
+<!ELEMENT percentSign ( #PCDATA ) >
+<!ATTLIST percentSign alt NMTOKENS #IMPLIED >
+<!ATTLIST percentSign draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST percentSign references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST percentSign numberSystem CDATA #IMPLIED >
+    <!--@DEPRECATED-->
+
+<!ELEMENT nativeZeroDigit ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST nativeZeroDigit alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST nativeZeroDigit draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST nativeZeroDigit references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST nativeZeroDigit numberSystem CDATA #IMPLIED >
+    <!--@DEPRECATED-->
+
+<!ELEMENT patternDigit ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST patternDigit alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST patternDigit draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST patternDigit references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST patternDigit numberSystem CDATA #IMPLIED >
+    <!--@DEPRECATED-->
+
+<!ELEMENT plusSign ( #PCDATA ) >
+<!ATTLIST plusSign alt NMTOKENS #IMPLIED >
+<!ATTLIST plusSign draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST plusSign references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST plusSign numberSystem CDATA #IMPLIED >
+    <!--@DEPRECATED-->
+
+<!ELEMENT minusSign ( #PCDATA ) >
+<!ATTLIST minusSign alt NMTOKENS #IMPLIED >
+<!ATTLIST minusSign draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST minusSign references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST minusSign numberSystem CDATA #IMPLIED >
+    <!--@DEPRECATED-->
+
+<!ELEMENT exponential ( #PCDATA ) >
+<!ATTLIST exponential alt NMTOKENS #IMPLIED >
+<!ATTLIST exponential draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST exponential references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST exponential numberSystem CDATA #IMPLIED >
+    <!--@DEPRECATED-->
+
+<!ELEMENT superscriptingExponent ( #PCDATA ) >
+<!ATTLIST superscriptingExponent alt NMTOKENS #IMPLIED >
+<!ATTLIST superscriptingExponent draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST superscriptingExponent references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT perMille ( #PCDATA ) >
+<!ATTLIST perMille alt NMTOKENS #IMPLIED >
+<!ATTLIST perMille draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST perMille references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST perMille numberSystem CDATA #IMPLIED >
+    <!--@DEPRECATED-->
+
+<!ELEMENT infinity ( #PCDATA ) >
+<!ATTLIST infinity alt NMTOKENS #IMPLIED >
+<!ATTLIST infinity draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST infinity references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST infinity numberSystem CDATA #IMPLIED >
+    <!--@DEPRECATED-->
+
+<!ELEMENT nan ( #PCDATA ) >
+<!ATTLIST nan alt NMTOKENS #IMPLIED >
+<!ATTLIST nan draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST nan references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST nan numberSystem CDATA #IMPLIED >
+    <!--@DEPRECATED-->
+
+<!ELEMENT currencyDecimal ( #PCDATA ) >
+<!ATTLIST currencyDecimal alt NMTOKENS #IMPLIED >
+<!ATTLIST currencyDecimal draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST currencyDecimal references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST currencyDecimal numberSystem CDATA #IMPLIED >
+    <!--@DEPRECATED-->
+
+<!ELEMENT currencyGroup ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST currencyGroup alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST currencyGroup draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST currencyGroup references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST currencyGroup numberSystem CDATA #IMPLIED >
+    <!--@DEPRECATED-->
+
+<!ELEMENT timeSeparator ( #PCDATA ) >
+<!ATTLIST timeSeparator alt NMTOKENS #IMPLIED >
+<!ATTLIST timeSeparator draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST timeSeparator references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT decimalFormats ( alias | ( default*, decimalFormatLength*, special* ) ) >
+<!ATTLIST decimalFormats draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST decimalFormats validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST decimalFormats numberSystem CDATA #IMPLIED >
+
+<!ELEMENT decimalFormatLength ( alias | ( default*, decimalFormat*, special* ) ) >
+<!ATTLIST decimalFormatLength type (full | long | medium | short) #IMPLIED >
+<!ATTLIST decimalFormatLength alt NMTOKENS #IMPLIED >
+<!ATTLIST decimalFormatLength draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST decimalFormatLength standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST decimalFormatLength references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST decimalFormatLength validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT decimalFormat ( alias | ( pattern*, special* ) ) >
+<!ATTLIST decimalFormat type NMTOKEN "standard" >
+<!ATTLIST decimalFormat alt NMTOKENS #IMPLIED >
+<!ATTLIST decimalFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST decimalFormat standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST decimalFormat references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST decimalFormat validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT scientificFormats ( alias | ( default*, scientificFormatLength*, special* ) ) >
+<!ATTLIST scientificFormats draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST scientificFormats validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST scientificFormats numberSystem CDATA #IMPLIED >
+
+<!ELEMENT scientificFormatLength ( alias | ( default*, scientificFormat*, special* ) ) >
+<!ATTLIST scientificFormatLength type (full | long | medium | short) #IMPLIED >
+<!ATTLIST scientificFormatLength alt NMTOKENS #IMPLIED >
+<!ATTLIST scientificFormatLength draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST scientificFormatLength standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST scientificFormatLength references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST scientificFormatLength validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT scientificFormat ( alias | ( pattern*, special* ) ) >
+<!ATTLIST scientificFormat type NMTOKEN "standard" >
+<!ATTLIST scientificFormat alt NMTOKENS #IMPLIED >
+<!ATTLIST scientificFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST scientificFormat standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST scientificFormat references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST scientificFormat validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT percentFormats ( alias | ( default*, percentFormatLength*, special* ) ) >
+<!ATTLIST percentFormats draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST percentFormats validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST percentFormats numberSystem CDATA #IMPLIED >
+
+<!ELEMENT percentFormatLength ( alias | ( default*, percentFormat*, special* ) ) >
+<!ATTLIST percentFormatLength type (full | long | medium | short) #IMPLIED >
+<!ATTLIST percentFormatLength alt NMTOKENS #IMPLIED >
+<!ATTLIST percentFormatLength draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST percentFormatLength standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST percentFormatLength references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST percentFormatLength validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT percentFormat ( alias | ( pattern*, special* ) ) >
+<!ATTLIST percentFormat type NMTOKEN "standard" >
+<!ATTLIST percentFormat alt NMTOKENS #IMPLIED >
+<!ATTLIST percentFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST percentFormat standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST percentFormat references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST percentFormat validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT currencyFormats ( alias | ( default*, currencySpacing*, currencyFormatLength*, unitPattern*, special* ) ) >
+<!ATTLIST currencyFormats draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST currencyFormats validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST currencyFormats numberSystem CDATA #IMPLIED >
+
+<!ELEMENT currencySpacing ( alias | ( beforeCurrency*, afterCurrency*, special* ) ) >
+
+<!ELEMENT beforeCurrency ( alias | ( currencyMatch*, surroundingMatch*, insertBetween*, special* ) ) >
+
+<!ELEMENT currencyMatch ( #PCDATA ) >
+<!ATTLIST currencyMatch alt NMTOKENS #IMPLIED >
+<!ATTLIST currencyMatch draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST currencyMatch references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT surroundingMatch ( #PCDATA ) >
+<!ATTLIST surroundingMatch alt NMTOKENS #IMPLIED >
+<!ATTLIST surroundingMatch draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST surroundingMatch references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT insertBetween ( #PCDATA ) >
+<!ATTLIST insertBetween alt NMTOKENS #IMPLIED >
+<!ATTLIST insertBetween draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST insertBetween references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT afterCurrency ( alias | ( currencyMatch*, surroundingMatch*, insertBetween*, special* ) ) >
+
+<!ELEMENT currencyFormatLength ( alias | ( default*, currencyFormat*, special* ) ) >
+<!ATTLIST currencyFormatLength type (full | long | medium | short) #IMPLIED >
+<!ATTLIST currencyFormatLength alt NMTOKENS #IMPLIED >
+<!ATTLIST currencyFormatLength draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST currencyFormatLength standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST currencyFormatLength references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST currencyFormatLength validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT currencyFormat ( alias | ( pattern*, special* ) ) >
+<!ATTLIST currencyFormat type NMTOKEN "standard" >
+<!ATTLIST currencyFormat alt NMTOKENS #IMPLIED >
+<!ATTLIST currencyFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST currencyFormat standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST currencyFormat references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST currencyFormat validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT unitPattern ( #PCDATA ) >
+<!ATTLIST unitPattern count (0 | 1 | zero | one | two | few | many | other) #REQUIRED >
+<!ATTLIST unitPattern alt NMTOKENS #IMPLIED >
+<!ATTLIST unitPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST unitPattern references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST unitPattern validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT currencies ( alias | ( default?, currency*, special* ) ) >
+<!ATTLIST currencies draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST currencies validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT currency ( alias | ( ( ( pattern+, displayName*, symbol* ) | ( displayName+, symbol*, pattern* ) | ( symbol+, pattern* ) )?, decimal*, group*, special* ) ) >
+
+<!-- # warning: pattern appears twice in the above. The first is for consistency with all other cases of
+    pattern + displayName; the second is for backwards compatibility -->
+<!ATTLIST currency type NMTOKEN "standard" >
+<!ATTLIST currency alt NMTOKENS #IMPLIED >
+<!ATTLIST currency draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST currency references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST currency validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT symbol ( #PCDATA ) >
+<!ATTLIST symbol choice (true | false) #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST symbol alt NMTOKENS #IMPLIED >
+<!ATTLIST symbol draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST symbol references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT miscPatterns ( alias | ( default*, pattern*, special* ) ) >
+<!ATTLIST miscPatterns draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST miscPatterns numberSystem CDATA #IMPLIED >
+
+<!-- ######################################################### -->
+
+<!ELEMENT units ( alias | ( unit*, unitLength*, durationUnit*, special* ) ) >
+<!ATTLIST units alt NMTOKENS #IMPLIED >
+<!ATTLIST units draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST units references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST units validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT unit ( alias | ( displayName*, unitPattern*, perUnitPattern*, special* ) ) >
+<!ATTLIST unit type NMTOKEN #REQUIRED >
+<!ATTLIST unit alt NMTOKENS #IMPLIED >
+<!ATTLIST unit draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST unit references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST unit validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT perUnitPattern ( #PCDATA ) >
+<!ATTLIST perUnitPattern alt NMTOKENS #IMPLIED >
+<!ATTLIST perUnitPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST perUnitPattern references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT unitLength ( alias | ( compoundUnit*, unit*, coordinateUnit*, special* ) ) >
+<!ATTLIST unitLength type (long | short | narrow) #REQUIRED >
+<!ATTLIST unitLength alt NMTOKENS #IMPLIED >
+<!ATTLIST unitLength draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST unitLength references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST unitLength validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT compoundUnit ( alias | ( compoundUnitPattern*, special* ) ) >
+<!ATTLIST compoundUnit type NMTOKEN #REQUIRED >
+<!ATTLIST compoundUnit alt NMTOKENS #IMPLIED >
+<!ATTLIST compoundUnit draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST compoundUnit references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST compoundUnit validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT compoundUnitPattern ( #PCDATA ) >
+<!ATTLIST compoundUnitPattern alt NMTOKENS #IMPLIED >
+<!ATTLIST compoundUnitPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST compoundUnitPattern references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST compoundUnitPattern validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT coordinateUnit ( alias | ( coordinateUnitPattern*, special* ) ) >
+<!ATTLIST coordinateUnit alt NMTOKENS #IMPLIED >
+<!ATTLIST coordinateUnit draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT coordinateUnitPattern ( #PCDATA ) >
+<!ATTLIST coordinateUnitPattern type (north | east | south | west) #REQUIRED >
+<!ATTLIST coordinateUnitPattern alt NMTOKENS #IMPLIED >
+<!ATTLIST coordinateUnitPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT durationUnit ( alias | ( durationUnitPattern*, special* ) ) >
+<!ATTLIST durationUnit type NMTOKEN #REQUIRED >
+<!ATTLIST durationUnit alt NMTOKENS #IMPLIED >
+<!ATTLIST durationUnit draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST durationUnit references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT durationUnitPattern ( #PCDATA ) >
+<!ATTLIST durationUnitPattern alt NMTOKENS #IMPLIED >
+<!ATTLIST durationUnitPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST durationUnitPattern references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST durationUnitPattern validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT listPatterns ( alias | ( listPattern*, special* ) ) >
+<!ATTLIST listPatterns alt NMTOKENS #IMPLIED >
+<!ATTLIST listPatterns draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST listPatterns references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST listPatterns validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT listPattern ( alias | ( listPatternPart*, special* ) ) >
+<!ATTLIST listPattern type NMTOKEN #IMPLIED >
+<!ATTLIST listPattern alt NMTOKENS #IMPLIED >
+<!ATTLIST listPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST listPattern references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST listPattern validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT listPatternPart ( #PCDATA ) >
+<!ATTLIST listPatternPart type (start | middle | end | 2 | 3) #REQUIRED >
+<!ATTLIST listPatternPart alt NMTOKENS #IMPLIED >
+<!ATTLIST listPatternPart draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST listPatternPart references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST listPatternPart validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!-- ######################################################### -->
+
+<!ELEMENT collations ( alias | ( defaultCollation?, default*, collation*, special* ) ) >
+<!ATTLIST collations version NMTOKEN #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST collations draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!-- should be DEPRECATED, but needs some cleanup first -->
+<!ATTLIST collations validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT defaultCollation ( #PCDATA ) >
+<!ATTLIST defaultCollation alt NMTOKENS #IMPLIED >
+<!ATTLIST defaultCollation draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT collation ( alias | ( base?, import*, settings?, suppress_contractions?, optimize?, ( cr* | rules? ), special* ) ) >
+<!ATTLIST collation type NMTOKEN "standard" >
+<!ATTLIST collation visibility (internal | external) "external" >
+    <!--@VALUE-->
+    <!--@DEPRECATED:internal-->
+<!ATTLIST collation alt NMTOKENS #IMPLIED >
+<!ATTLIST collation draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST collation standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST collation references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST collation validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT base ( alias | special ) >
+    <!--@ORDERED-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT import EMPTY >
+    <!-- deprecated, see CLDR ticket #8289 -->
+    <!--@DEPRECATED-->
+<!ATTLIST import source CDATA #REQUIRED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST import type CDATA #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST import draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST import references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT settings ( special* ) >
+    <!-- deprecated, see CLDR ticket #8289 -->
+    <!--@ORDERED-->
+    <!--@DEPRECATED-->
+<!ATTLIST settings strength (primary | secondary | tertiary | quaternary | identical) #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST settings alternate (non-ignorable | shifted) #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST settings backwards (on | off) #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST settings normalization (on | off) #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST settings caseLevel (on | off) #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST settings caseFirst (upper | lower | off) #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST settings hiraganaQuarternary (on | off) #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST settings hiraganaQuaternary (on | off) #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST settings maxVariable (space | punct | symbol | currency) #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST settings numeric (on | off) #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST settings private (true | false) #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST settings variableTop CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST settings reorder NMTOKENS #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT suppress_contractions ( #PCDATA | cp )* >
+    <!-- deprecated, see CLDR ticket #8289 -->
+    <!--@ORDERED-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT optimize ( #PCDATA | cp )* >
+    <!-- deprecated, see CLDR ticket #8289 -->
+    <!--@ORDERED-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT cr ( #PCDATA ) >
+<!ATTLIST cr alt NMTOKENS #IMPLIED >
+<!ATTLIST cr draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST cr references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!-- # Use the cr element instead, with ICU syntax. -->
+
+<!ELEMENT rules ( alias | ( ( reset | import ), ( reset | import | p | pc | s | sc | t | tc | q | qc | i | ic | x )* ) ) >
+    <!--@ORDERED-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT reset ( #PCDATA | cp | first_variable | last_variable | first_tertiary_ignorable | last_tertiary_ignorable | first_secondary_ignorable | last_secondary_ignorable | first_primary_ignorable | last_primary_ignorable | first_non_ignorable | last_non_ignorable | first_trailing | last_trailing )* >
+    <!--@ORDERED-->
+    <!--@DEPRECATED-->
+<!ATTLIST reset before NMTOKEN #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT first_variable EMPTY >
+    <!--@DEPRECATED-->
+
+<!ELEMENT last_variable EMPTY >
+    <!--@DEPRECATED-->
+
+<!ELEMENT first_tertiary_ignorable EMPTY >
+    <!--@DEPRECATED-->
+
+<!ELEMENT last_tertiary_ignorable EMPTY >
+    <!--@ORDERED-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT first_secondary_ignorable EMPTY >
+    <!--@DEPRECATED-->
+
+<!ELEMENT last_secondary_ignorable EMPTY >
+    <!--@ORDERED-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT first_primary_ignorable EMPTY >
+    <!--@DEPRECATED-->
+
+<!ELEMENT last_primary_ignorable EMPTY >
+    <!--@DEPRECATED-->
+
+<!ELEMENT first_non_ignorable EMPTY >
+    <!--@DEPRECATED-->
+
+<!ELEMENT last_non_ignorable EMPTY >
+    <!--@ORDERED-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT first_trailing EMPTY >
+    <!--@DEPRECATED-->
+
+<!ELEMENT last_trailing EMPTY >
+    <!--@DEPRECATED-->
+
+<!ELEMENT p ( #PCDATA | cp | last_variable )* >
+    <!--@ORDERED-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT pc ( #PCDATA | cp | last_variable )* >
+    <!--@ORDERED-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT s ( #PCDATA | cp | last_variable )* >
+    <!--@ORDERED-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT sc ( #PCDATA | cp | last_variable )* >
+    <!--@ORDERED-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT t ( #PCDATA | cp | last_variable )* >
+    <!--@ORDERED-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT tc ( #PCDATA | cp | last_variable )* >
+    <!--@ORDERED-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT q ( #PCDATA | cp | last_variable )* >
+    <!--@DEPRECATED-->
+
+<!ELEMENT qc ( #PCDATA | cp | last_variable )* >
+    <!--@DEPRECATED-->
+
+<!ELEMENT i ( #PCDATA | cp | last_variable )* >
+    <!--@ORDERED-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT ic ( #PCDATA | cp | last_variable )* >
+    <!--@ORDERED-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT x ( context?, ( p | pc | s | sc | t | tc | q | qc | i | ic )*, extend? ) >
+    <!--@ORDERED-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT context ( #PCDATA | cp )* >
+    <!--@ORDERED-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT extend ( #PCDATA | cp )* >
+    <!--@ORDERED-->
+    <!--@DEPRECATED-->
+
+<!-- ######################################################### -->
+
+<!ELEMENT posix ( alias | ( messages*, special* ) ) >
+<!ATTLIST posix draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST posix references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST posix validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT messages ( alias | ( yesstr*, nostr*, yesexpr*, noexpr*, special* ) ) >
+<!ATTLIST messages alt NMTOKENS #IMPLIED >
+<!ATTLIST messages draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST messages references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST messages validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT yesstr ( #PCDATA ) >
+<!ATTLIST yesstr alt NMTOKENS #IMPLIED >
+<!ATTLIST yesstr draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST yesstr references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT nostr ( #PCDATA ) >
+<!ATTLIST nostr alt NMTOKENS #IMPLIED >
+<!ATTLIST nostr draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST nostr references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT yesexpr ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST yesexpr alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST yesexpr draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST yesexpr references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT noexpr ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST noexpr alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST noexpr draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST noexpr references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT segmentations ( alias | ( segmentation*, special* ) ) >
+<!ATTLIST segmentations alt NMTOKENS #IMPLIED >
+<!ATTLIST segmentations draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST segmentations references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST segmentations validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT segmentation ( alias | ( variables?, segmentRules?, exceptions?, suppressions? ) | special* ) >
+<!ATTLIST segmentation type NMTOKEN #REQUIRED >
+<!ATTLIST segmentation alt NMTOKENS #IMPLIED >
+<!ATTLIST segmentation draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST segmentation references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST segmentation validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT variables ( alias | ( variable*, special* ) ) >
+
+<!ELEMENT variable ( #PCDATA ) >
+    <!--@ORDERED-->
+<!ATTLIST variable id CDATA #REQUIRED >
+<!ATTLIST variable alt NMTOKENS #IMPLIED >
+<!ATTLIST variable draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST variable references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT segmentRules ( alias | ( rule*, special* ) ) >
+
+<!ELEMENT rule ( #PCDATA ) >
+<!ATTLIST rule id NMTOKEN #REQUIRED >
+<!ATTLIST rule alt NMTOKENS #IMPLIED >
+<!ATTLIST rule draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST rule references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT exceptions ( exception* ) >
+    <!-- use suppressions instead -->
+    <!--@DEPRECATED-->
+
+<!ELEMENT exception ( #PCDATA ) >
+    <!--@ORDERED-->
+    <!--@DEPRECATED-->
+<!ATTLIST exception draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT suppressions ( alias | ( suppression*, special* ) ) >
+<!ATTLIST suppressions type NMTOKEN "standard" >
+<!ATTLIST suppressions draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT suppression ( #PCDATA ) >
+    <!--@ORDERED-->
+<!ATTLIST suppression alt NMTOKENS #IMPLIED >
+<!ATTLIST suppression draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT rbnf ( alias | ( rulesetGrouping*, special* ) ) >
+
+<!ELEMENT rulesetGrouping ( alias | ( ruleset*, special* ) ) >
+<!ATTLIST rulesetGrouping type NMTOKEN #REQUIRED >
+<!ATTLIST rulesetGrouping draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT ruleset ( alias | ( rbnfrule*, special* ) ) >
+    <!--@ORDERED-->
+<!ATTLIST ruleset type NMTOKEN #REQUIRED >
+<!ATTLIST ruleset access (public | private) #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST ruleset allowsParsing (true | false) #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST ruleset draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT rbnfrule ( #PCDATA ) >
+    <!--@ORDERED-->
+<!ATTLIST rbnfrule value CDATA #REQUIRED >
+    <!--@VALUE-->
+<!ATTLIST rbnfrule radix CDATA #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST rbnfrule decexp CDATA #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST rbnfrule alt NMTOKENS #IMPLIED >
+<!ATTLIST rbnfrule draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+
+<!ELEMENT annotations ( alias | ( annotation*, special* ) ) >
+
+<!ELEMENT annotation ( #PCDATA ) >
+<!ATTLIST annotation cp CDATA #REQUIRED >
+<!ATTLIST annotation tts CDATA #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST annotation alt NMTOKENS #IMPLIED >
+<!ATTLIST annotation draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+
+<!-- ######################################################### -->
+<!-- # This element contains metadata for Survey Tool internal use (optimization, etc). -->
+
+<!ELEMENT metadata ( alias | ( casingData?, special* ) ) >
+    <!--@METADATA-->
+
+<!ELEMENT casingData ( alias | ( casingItem*, special* ) ) >
+    <!--@METADATA-->
+
+<!ELEMENT casingItem ( #PCDATA ) >
+<!ATTLIST casingItem type CDATA #REQUIRED >
+<!ATTLIST casingItem override (true | false) #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST casingItem forceError (true | false) #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST casingItem alt NMTOKENS #IMPLIED >
+<!ATTLIST casingItem draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT references ( reference* ) >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT reference ( #PCDATA ) >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST reference type NMTOKEN #REQUIRED >
+    <!--@DEPRECATED-->
+<!ATTLIST reference uri CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST reference alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST reference draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST reference standard (true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/dtd/ldmlSupplemental.dtd b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/dtd/ldmlSupplemental.dtd
new file mode 100644
index 00000000000..f0fabdf07e1
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/dtd/ldmlSupplemental.dtd
@@ -0,0 +1,945 @@
+<!--
+Copyright © 2003-2015 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
+
+    $Revision: 12436 $
+-->
+
+<!ELEMENT supplementalData ( version, generation?, cldrVersion?, currencyData?, territoryContainment?, subdivisionContainment?, languageData?, territoryInfo?, postalCodeData?, calendarData?, calendarPreferenceData?, weekData?, timeData?, measurementData?, unitPreferenceData?, timezoneData?, characters?, transforms?, metadata?, codeMappings?, parentLocales?, likelySubtags?, metazoneInfo?, plurals?, telephoneCodeData?, numberingSystems?, bcp47KeywordMappings?, gender?, references?, languageMatching?, dayPeriodRuleSet*, metaZones?, primaryZones?, windowsZones?, coverageLevels?, idValidity?, rgScope? ) >
+
+<!ELEMENT version EMPTY >
+    <!--@METADATA-->
+<!ATTLIST version number CDATA #REQUIRED >
+    <!--@METADATA-->
+<!ATTLIST version cldrVersion CDATA #FIXED "29" >
+    <!--@VALUE-->
+<!ATTLIST version unicodeVersion CDATA #FIXED "8.0.0" >
+    <!--@VALUE-->
+
+<!ELEMENT generation EMPTY >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST generation date CDATA #REQUIRED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT cldrVersion EMPTY >
+    <!--@DEPRECATED-->
+<!ATTLIST cldrVersion version CDATA #REQUIRED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT currencyData ( fractions*, region+ ) >
+<!ATTLIST currencyData draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT fractions ( info+ ) >
+<!ATTLIST fractions draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT info EMPTY >
+<!ATTLIST info iso4217 NMTOKEN #REQUIRED >
+<!ATTLIST info digits NMTOKEN #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST info rounding NMTOKEN #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST info cashDigits NMTOKEN #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST info cashRounding NMTOKEN #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST info draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST info references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT region ( currency* ) >
+<!ATTLIST region iso3166 NMTOKEN #REQUIRED >
+<!ATTLIST region draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT currency ( alternate* ) >
+<!ATTLIST currency before NMTOKEN #IMPLIED >
+    <!-- use from and to instead. -->
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST currency from NMTOKEN #IMPLIED >
+<!ATTLIST currency to NMTOKEN #IMPLIED >
+<!ATTLIST currency iso4217 NMTOKEN #REQUIRED >
+<!ATTLIST currency digits NMTOKEN #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST currency rounding NMTOKEN #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST currency cashRounding NMTOKEN #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST currency tender (true | false) #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST currency draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST currency references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT alternate EMPTY >
+    <!-- use from and to instead. -->
+    <!--@DEPRECATED-->
+<!ATTLIST alternate iso4217 NMTOKEN #REQUIRED >
+    <!--@DEPRECATED-->
+
+<!ELEMENT territoryContainment ( group* ) >
+
+<!ELEMENT group EMPTY >
+<!ATTLIST group type NMTOKEN #REQUIRED >
+<!ATTLIST group contains NMTOKENS #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST group grouping (true | false) #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST group status (deprecated | grouping) #IMPLIED >
+<!ATTLIST group draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST group references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT subdivisionContainment ( subgroup* ) >
+
+<!ELEMENT subgroup EMPTY >
+<!ATTLIST subgroup type NMTOKEN #REQUIRED >
+<!ATTLIST subgroup subtype NMTOKEN #IMPLIED >
+<!ATTLIST subgroup contains NMTOKENS #IMPLIED >
+    <!--@VALUE-->
+
+<!ELEMENT languageData ( language* ) >
+
+<!ELEMENT language EMPTY >
+<!ATTLIST language type NMTOKEN #REQUIRED >
+<!ATTLIST language scripts NMTOKENS #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST language territories NMTOKENS #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST language variants NMTOKENS #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST language draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST language references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST language alt NMTOKENS #IMPLIED >
+
+<!ELEMENT territoryInfo ( territory* ) >
+<!ATTLIST territoryInfo draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST territoryInfo references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST territoryInfo alt NMTOKENS #IMPLIED >
+
+<!ELEMENT territory ( languagePopulation* ) >
+<!ATTLIST territory type NMTOKEN #REQUIRED >
+<!ATTLIST territory gdp NMTOKEN #REQUIRED >
+    <!--@VALUE-->
+<!ATTLIST territory literacyPercent NMTOKEN #REQUIRED >
+    <!--@VALUE-->
+<!ATTLIST territory population NMTOKEN #REQUIRED >
+    <!--@VALUE-->
+<!ATTLIST territory draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST territory references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST territory alt NMTOKENS #IMPLIED >
+
+<!ELEMENT languagePopulation EMPTY >
+<!ATTLIST languagePopulation type NMTOKEN #REQUIRED >
+<!ATTLIST languagePopulation writingPercent NMTOKEN #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST languagePopulation populationPercent NMTOKEN #REQUIRED >
+    <!--@VALUE-->
+<!ATTLIST languagePopulation officialStatus (de_facto_official | official | official_regional | official_minority) #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST languagePopulation draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST languagePopulation references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST languagePopulation alt NMTOKENS #IMPLIED >
+
+<!ELEMENT postalCodeData ( postCodeRegex* ) >
+    <!--@DEPRECATED-->
+
+<!ELEMENT postCodeRegex ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST postCodeRegex territoryId NMTOKEN #REQUIRED >
+    <!--@DEPRECATED-->
+<!ATTLIST postCodeRegex draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT calendarData ( calendar* ) >
+
+<!ELEMENT calendar ( calendarSystem?, eras? ) >
+<!ATTLIST calendar type NMTOKEN #REQUIRED >
+<!ATTLIST calendar territories NMTOKENS #IMPLIED >
+    <!-- use ordering attribute in calendarPreference element instead. -->
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST calendar draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST calendar references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST calendar alt NMTOKENS #IMPLIED >
+
+<!ELEMENT calendarSystem EMPTY >
+<!ATTLIST calendarSystem type (solar | lunar | lunisolar | other) #REQUIRED >
+<!ATTLIST calendarSystem references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT eras ( era* ) >
+<!ATTLIST eras references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT era EMPTY >
+<!ATTLIST era type NMTOKEN #REQUIRED >
+<!ATTLIST era start CDATA #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST era end CDATA #IMPLIED >
+    <!--@VALUE-->
+
+<!ELEMENT calendarPreferenceData ( calendarPreference* ) >
+
+<!ELEMENT calendarPreference EMPTY >
+<!ATTLIST calendarPreference territories NMTOKENS #REQUIRED >
+<!ATTLIST calendarPreference ordering NMTOKENS #REQUIRED >
+    <!--@VALUE-->
+
+<!ELEMENT weekData ( minDays*, firstDay*, weekendStart*, weekendEnd* ) >
+
+<!ELEMENT minDays EMPTY >
+<!ATTLIST minDays count (1 | 2 | 3 | 4 | 5 | 6 | 7) #REQUIRED >
+<!ATTLIST minDays territories NMTOKENS #REQUIRED >
+    <!--@VALUE-->
+<!ATTLIST minDays draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST minDays references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST minDays alt NMTOKENS #IMPLIED >
+
+<!ELEMENT firstDay EMPTY >
+<!ATTLIST firstDay day (sun | mon | tue | wed | thu | fri | sat) #REQUIRED >
+<!ATTLIST firstDay territories NMTOKENS #REQUIRED >
+    <!--@VALUE-->
+<!ATTLIST firstDay draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST firstDay references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST firstDay alt NMTOKENS #IMPLIED >
+
+<!ELEMENT weekendStart EMPTY >
+<!ATTLIST weekendStart day (sun | mon | tue | wed | thu | fri | sat) #REQUIRED >
+<!ATTLIST weekendStart territories NMTOKENS #REQUIRED >
+    <!--@VALUE-->
+<!ATTLIST weekendStart draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST weekendStart references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST weekendStart alt NMTOKENS #IMPLIED >
+
+<!ELEMENT weekendEnd EMPTY >
+<!ATTLIST weekendEnd day (sun | mon | tue | wed | thu | fri | sat) #REQUIRED >
+<!ATTLIST weekendEnd territories NMTOKENS #REQUIRED >
+    <!--@VALUE-->
+<!ATTLIST weekendEnd draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST weekendEnd references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST weekendEnd alt NMTOKENS #IMPLIED >
+
+<!ELEMENT timeData ( hours* ) >
+
+<!ELEMENT hours EMPTY >
+<!ATTLIST hours allowed NMTOKENS #REQUIRED >
+<!ATTLIST hours preferred NMTOKEN #REQUIRED >
+<!ATTLIST hours regions NMTOKENS #REQUIRED >
+    <!--@VALUE-->
+<!ATTLIST hours draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST hours references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT measurementData ( measurementSystem*, paperSize* ) >
+
+<!ELEMENT measurementSystem EMPTY >
+<!ATTLIST measurementSystem type (metric | US | UK) #REQUIRED >
+<!ATTLIST measurementSystem category (temperature) #IMPLIED >
+<!ATTLIST measurementSystem territories NMTOKENS #REQUIRED >
+    <!--@VALUE-->
+<!ATTLIST measurementSystem draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST measurementSystem references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST measurementSystem alt NMTOKENS #IMPLIED >
+
+<!ELEMENT paperSize EMPTY >
+<!ATTLIST paperSize type (A4 | US-Letter) #REQUIRED >
+<!ATTLIST paperSize territories NMTOKENS #REQUIRED >
+    <!--@VALUE-->
+<!ATTLIST paperSize draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST paperSize references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST paperSize alt NMTOKENS #IMPLIED >
+
+<!ELEMENT unitPreferenceData ( unitPreferences* ) >
+
+<!ELEMENT unitPreferences ( unitPreference* ) >
+<!ATTLIST unitPreferences category NMTOKEN #REQUIRED >
+<!ATTLIST unitPreferences usage NMTOKENS #REQUIRED >
+<!ATTLIST unitPreferences scope (small) #IMPLIED >
+
+<!ELEMENT unitPreference ( #PCDATA ) >
+<!ATTLIST unitPreference regions NMTOKENS #REQUIRED >
+<!ATTLIST unitPreference draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST unitPreference references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST unitPreference alt NMTOKENS #IMPLIED >
+
+<!ELEMENT timezoneData ( mapTimezones*, zoneFormatting* ) >
+    <!--@DEPRECATED-->
+
+<!ELEMENT mapTimezones ( mapZone* ) >
+<!ATTLIST mapTimezones type NMTOKEN #IMPLIED >
+<!ATTLIST mapTimezones otherVersion CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST mapTimezones typeVersion CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST mapTimezones references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT mapZone EMPTY >
+<!ATTLIST mapZone type CDATA #REQUIRED >
+    <!--@VALUE-->
+<!ATTLIST mapZone other CDATA #REQUIRED >
+<!ATTLIST mapZone territory CDATA #IMPLIED >
+<!ATTLIST mapZone references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT zoneFormatting ( zoneItem* ) >
+    <!--@DEPRECATED-->
+<!ATTLIST zoneFormatting multizone NMTOKENS #REQUIRED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST zoneFormatting tzidVersion CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST zoneFormatting references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT zoneItem EMPTY >
+    <!--@DEPRECATED-->
+<!ATTLIST zoneItem type CDATA #REQUIRED >
+    <!--@DEPRECATED-->
+<!ATTLIST zoneItem territory NMTOKEN #REQUIRED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST zoneItem aliases CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST zoneItem references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT characters ( character-fallback* ) >
+<!ATTLIST characters draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT character-fallback ( character* ) >
+
+<!ELEMENT character ( substitute* ) >
+<!ATTLIST character value CDATA #REQUIRED >
+<!ATTLIST character draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST character standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST character references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST character alt NMTOKENS #IMPLIED >
+
+<!ELEMENT substitute ( #PCDATA ) >
+    <!--@ORDERED-->
+<!ATTLIST substitute draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST substitute standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST substitute references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST substitute alt NMTOKENS #IMPLIED >
+
+<!ELEMENT transforms ( transform* ) >
+
+<!ELEMENT transform ( ( comment | tRule )* ) >
+<!ATTLIST transform source CDATA #IMPLIED >
+<!ATTLIST transform target CDATA #IMPLIED >
+<!ATTLIST transform variant CDATA #IMPLIED >
+<!ATTLIST transform direction (forward | backward | both) "both" >
+<!ATTLIST transform alias CDATA #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST transform backwardAlias CDATA #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST transform visibility (internal | external) "external" >
+    <!--@VALUE-->
+<!ATTLIST transform draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST transform references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST transform alt NMTOKENS #IMPLIED >
+
+<!ELEMENT comment ( #PCDATA ) >
+    <!--@ORDERED-->
+    <!--@METADATA-->
+
+<!ELEMENT tRule ( #PCDATA ) >
+    <!--@ORDERED-->
+
+<!ELEMENT metadata ( attributeOrder?, elementOrder?, serialElements?, suppress?, validity?, alias?, deprecated?, distinguishing?, blocking?, coverageAdditions?, skipDefaultLocale?, defaultContent? ) >
+<!ATTLIST metadata draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT attributeOrder ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST attributeOrder draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT elementOrder ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST elementOrder draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT serialElements ( #PCDATA ) >
+    <!--@METADATA-->
+<!ATTLIST serialElements draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+
+<!ELEMENT suppress ( attributes* ) >
+    <!--@METADATA-->
+<!ATTLIST suppress draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT attributes EMPTY >
+    <!--@ORDERED-->
+<!ATTLIST attributes element NMTOKENS #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST attributes attribute NMTOKENS #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST attributes attributeValue CDATA #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST attributes draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+
+<!ELEMENT validity ( variable*, attributeValues* ) >
+    <!--@METADATA-->
+<!ATTLIST validity draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT variable ( #PCDATA ) >
+    <!--@ORDERED-->
+<!ATTLIST variable type NMTOKEN #IMPLIED >
+<!ATTLIST variable id CDATA #REQUIRED >
+    <!--@VALUE-->
+<!ATTLIST variable draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+
+<!ELEMENT attributeValues ( #PCDATA ) >
+    <!--@ORDERED-->
+<!ATTLIST attributeValues dtds NMTOKEN #IMPLIED >
+<!ATTLIST attributeValues type NMTOKEN #IMPLIED >
+<!ATTLIST attributeValues elements NMTOKENS #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST attributeValues attributes NMTOKENS #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST attributeValues order NMTOKEN #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST attributeValues draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+
+<!ELEMENT alias ( languageAlias*, scriptAlias*, territoryAlias*, subdivisionAlias*, variantAlias*, zoneAlias* ) >
+<!ATTLIST alias draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT languageAlias EMPTY >
+<!ATTLIST languageAlias type NMTOKEN #REQUIRED >
+<!ATTLIST languageAlias replacement NMTOKEN #REQUIRED >
+    <!--@VALUE-->
+<!ATTLIST languageAlias reason (deprecated | overlong | macrolanguage | legacy | bibliographic) #IMPLIED >
+    <!--@VALUE-->
+
+<!ELEMENT scriptAlias EMPTY >
+<!ATTLIST scriptAlias type NMTOKEN #REQUIRED >
+<!ATTLIST scriptAlias replacement NMTOKEN #REQUIRED >
+    <!--@VALUE-->
+<!ATTLIST scriptAlias reason (deprecated | overlong) #IMPLIED >
+    <!--@VALUE-->
+
+<!ELEMENT territoryAlias EMPTY >
+<!ATTLIST territoryAlias type NMTOKEN #REQUIRED >
+<!ATTLIST territoryAlias replacement NMTOKENS #REQUIRED >
+    <!--@VALUE-->
+<!ATTLIST territoryAlias reason (deprecated | overlong) #IMPLIED >
+    <!--@VALUE-->
+
+<!ELEMENT subdivisionAlias EMPTY >
+<!ATTLIST subdivisionAlias type NMTOKEN #REQUIRED >
+<!ATTLIST subdivisionAlias replacement NMTOKENS #REQUIRED >
+    <!--@VALUE-->
+<!ATTLIST subdivisionAlias reason (deprecated | overlong) #IMPLIED >
+    <!--@VALUE-->
+
+<!ELEMENT variantAlias EMPTY >
+<!ATTLIST variantAlias type NMTOKEN #REQUIRED >
+<!ATTLIST variantAlias replacement NMTOKEN #REQUIRED >
+    <!--@VALUE-->
+<!ATTLIST variantAlias reason (deprecated | overlong) #IMPLIED >
+    <!--@VALUE-->
+
+<!ELEMENT zoneAlias EMPTY >
+<!ATTLIST zoneAlias type CDATA #REQUIRED >
+<!ATTLIST zoneAlias replacement CDATA #REQUIRED >
+    <!--@VALUE-->
+<!ATTLIST zoneAlias reason (deprecated | overlong) #IMPLIED >
+    <!--@VALUE-->
+
+<!ELEMENT deprecated ( deprecatedItems* ) >
+<!ATTLIST deprecated draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT deprecatedItems EMPTY >
+<!ATTLIST deprecatedItems type (standard | supplemental | ldml | supplementalData | ldmlBCP47) #IMPLIED >
+    <!--@DEPRECATED:standard, supplemental-->
+<!ATTLIST deprecatedItems elements NMTOKENS #IMPLIED >
+<!ATTLIST deprecatedItems attributes NMTOKENS #IMPLIED >
+<!ATTLIST deprecatedItems values CDATA #IMPLIED >
+<!ATTLIST deprecatedItems draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+
+<!ELEMENT distinguishing ( distinguishingItems* ) >
+    <!--@METADATA-->
+<!ATTLIST distinguishing draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT distinguishingItems EMPTY >
+<!ATTLIST distinguishingItems exclude (true | false) #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST distinguishingItems elements NMTOKENS #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST distinguishingItems attributes NMTOKENS #IMPLIED >
+<!ATTLIST distinguishingItems draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT blocking ( blockingItems* ) >
+    <!--@METADATA-->
+<!ATTLIST blocking draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT blockingItems EMPTY >
+<!ATTLIST blockingItems elements NMTOKENS #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST blockingItems draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT coverageAdditions ( languageCoverage*, scriptCoverage*, territoryCoverage*, currencyCoverage*, timezoneCoverage* ) >
+    <!--@DEPRECATED-->
+<!ATTLIST coverageAdditions draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT languageCoverage EMPTY >
+    <!--@DEPRECATED-->
+<!ATTLIST languageCoverage type NMTOKEN #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST languageCoverage values NMTOKENS #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST languageCoverage draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT scriptCoverage EMPTY >
+    <!--@DEPRECATED-->
+<!ATTLIST scriptCoverage type NMTOKEN #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST scriptCoverage values NMTOKENS #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST scriptCoverage draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT territoryCoverage EMPTY >
+    <!--@DEPRECATED-->
+<!ATTLIST territoryCoverage type NMTOKEN #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST territoryCoverage values NMTOKENS #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST territoryCoverage draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT currencyCoverage EMPTY >
+    <!--@DEPRECATED-->
+<!ATTLIST currencyCoverage type NMTOKEN #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST currencyCoverage values NMTOKENS #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST currencyCoverage draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT timezoneCoverage EMPTY >
+    <!--@DEPRECATED-->
+<!ATTLIST timezoneCoverage type NMTOKEN #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST timezoneCoverage values CDATA #IMPLIED >
+    <!-- would be NMTOKENS, but needs to allow / -->
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST timezoneCoverage draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT skipDefaultLocale EMPTY >
+<!ATTLIST skipDefaultLocale services NMTOKENS #IMPLIED >
+    <!--@VALUE-->
+
+<!ELEMENT defaultContent EMPTY >
+<!ATTLIST defaultContent locales NMTOKENS #IMPLIED >
+    <!--@VALUE-->
+
+<!ELEMENT codeMappings ( languageCodes*, territoryCodes*, currencyCodes* ) >
+
+<!ELEMENT languageCodes EMPTY >
+    <!--@DEPRECATED-->
+<!ATTLIST languageCodes type NMTOKEN #REQUIRED >
+    <!--@DEPRECATED-->
+<!ATTLIST languageCodes alpha3 NMTOKEN #REQUIRED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT territoryCodes EMPTY >
+<!ATTLIST territoryCodes type NMTOKEN #REQUIRED >
+<!ATTLIST territoryCodes numeric NMTOKEN #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST territoryCodes alpha3 NMTOKEN #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST territoryCodes fips10 NMTOKEN #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST territoryCodes internet NMTOKENS #IMPLIED >
+    <!--@VALUE-->
+
+<!ELEMENT currencyCodes EMPTY >
+<!ATTLIST currencyCodes type NMTOKEN #REQUIRED >
+<!ATTLIST currencyCodes numeric NMTOKEN #REQUIRED >
+    <!--@VALUE-->
+
+<!-- # Parent locales -->
+
+<!ELEMENT parentLocales ( parentLocale* ) >
+
+<!ELEMENT parentLocale EMPTY >
+<!ATTLIST parentLocale parent NMTOKEN #REQUIRED >
+<!ATTLIST parentLocale locales NMTOKENS #REQUIRED >
+    <!--@VALUE-->
+
+<!ELEMENT likelySubtags ( likelySubtag* ) >
+
+<!ELEMENT likelySubtag EMPTY >
+<!ATTLIST likelySubtag from NMTOKEN #REQUIRED >
+<!ATTLIST likelySubtag to NMTOKEN #REQUIRED >
+    <!--@VALUE-->
+
+<!ELEMENT metazoneInfo ( timezone* ) >
+
+<!ELEMENT timezone ( usesMetazone* ) >
+<!ATTLIST timezone type CDATA #REQUIRED >
+
+<!ELEMENT usesMetazone EMPTY >
+<!ATTLIST usesMetazone from CDATA #IMPLIED >
+<!ATTLIST usesMetazone to CDATA #IMPLIED >
+<!ATTLIST usesMetazone mzone NMTOKEN #REQUIRED >
+    <!--@VALUE-->
+
+<!ELEMENT plurals ( pluralRules*, pluralRanges* ) >
+<!ATTLIST plurals type (ordinal | cardinal) #IMPLIED >
+    <!-- default is cardinal -->
+<!ATTLIST plurals draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST plurals references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT pluralRules ( pluralRule* ) >
+<!ATTLIST pluralRules locales NMTOKENS #REQUIRED >
+<!ATTLIST pluralRules draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST pluralRules references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT pluralRule ( #PCDATA ) >
+    <!--@ORDERED-->
+<!ATTLIST pluralRule count (zero | one | two | few | many | other) #REQUIRED >
+    <!-- 'other' is implicitly everything else -->
+<!ATTLIST pluralRule draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST pluralRule references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT pluralRanges ( pluralRange* ) >
+<!ATTLIST pluralRanges locales NMTOKENS #REQUIRED >
+<!ATTLIST pluralRanges draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST pluralRanges references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT pluralRange ( #PCDATA ) >
+<!ATTLIST pluralRange start (zero | one | two | few | many | other) #IMPLIED >
+    <!-- if missing, means *all* -->
+<!ATTLIST pluralRange end (zero | one | two | few | many | other) #IMPLIED >
+    <!-- if missing, means *all* -->
+<!ATTLIST pluralRange result (zero | one | two | few | many | other) #REQUIRED >
+    <!-- if a whole rule is missing, means *other* -->
+    <!--@VALUE-->
+<!ATTLIST pluralRange draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST pluralRange references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT telephoneCodeData ( codesByTerritory* ) >
+
+<!ELEMENT codesByTerritory ( telephoneCountryCode+ ) >
+<!ATTLIST codesByTerritory territory NMTOKEN #REQUIRED >
+<!ATTLIST codesByTerritory draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST codesByTerritory references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT telephoneCountryCode EMPTY >
+<!ATTLIST telephoneCountryCode code NMTOKEN #REQUIRED >
+<!ATTLIST telephoneCountryCode from NMTOKEN #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST telephoneCountryCode to NMTOKEN #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST telephoneCountryCode draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST telephoneCountryCode references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST telephoneCountryCode alt NMTOKENS #IMPLIED >
+
+<!ELEMENT numberingSystems ( numberingSystem* ) >
+
+<!ELEMENT numberingSystem EMPTY >
+<!ATTLIST numberingSystem type (numeric | algorithmic) #REQUIRED >
+    <!--@VALUE-->
+<!ATTLIST numberingSystem id NMTOKEN #REQUIRED >
+<!ATTLIST numberingSystem radix NMTOKEN #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST numberingSystem digits CDATA #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST numberingSystem rules CDATA #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST numberingSystem draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT bcp47KeywordMappings ( mapKeys?, mapTypes* ) >
+    <!--@DEPRECATED-->
+
+<!ELEMENT mapKeys ( keyMap* ) >
+    <!--@DEPRECATED-->
+
+<!ELEMENT keyMap EMPTY >
+    <!--@DEPRECATED-->
+<!ATTLIST keyMap type NMTOKEN #REQUIRED >
+    <!--@DEPRECATED-->
+<!ATTLIST keyMap bcp47 NMTOKEN #REQUIRED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT mapTypes ( typeMap* ) >
+    <!--@DEPRECATED-->
+<!ATTLIST mapTypes type NMTOKEN #REQUIRED >
+    <!--@DEPRECATED-->
+
+<!ELEMENT typeMap EMPTY >
+    <!--@DEPRECATED-->
+<!ATTLIST typeMap type CDATA #REQUIRED >
+    <!--@DEPRECATED-->
+<!ATTLIST typeMap bcp47 NMTOKEN #REQUIRED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!-- # Gender List support -->
+
+<!ELEMENT gender ( personList+ ) >
+
+<!ELEMENT personList EMPTY >
+<!ATTLIST personList type (neutral | mixedNeutral | maleTaints) #REQUIRED >
+<!ATTLIST personList locales NMTOKENS #REQUIRED >
+    <!--@VALUE-->
+
+<!ELEMENT references ( reference* ) >
+    <!--@METADATA-->
+
+<!ELEMENT reference ( #PCDATA ) >
+    <!--@METADATA-->
+<!ATTLIST reference type NMTOKEN #REQUIRED >
+<!ATTLIST reference uri CDATA #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST reference draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST reference standard (true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST reference alt NMTOKENS #IMPLIED >
+
+<!ELEMENT languageMatching ( languageMatches* ) >
+
+<!ELEMENT languageMatches ( languageMatch* ) >
+<!ATTLIST languageMatches type NMTOKEN #REQUIRED >
+
+<!ELEMENT languageMatch EMPTY >
+    <!--@ORDERED-->
+<!ATTLIST languageMatch desired CDATA #REQUIRED >
+<!ATTLIST languageMatch oneway (true | false) #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST languageMatch percent NMTOKEN #REQUIRED >
+    <!--@VALUE-->
+<!ATTLIST languageMatch supported CDATA #REQUIRED >
+
+<!-- # Day Periods -->
+
+<!ELEMENT dayPeriodRuleSet ( dayPeriodRules* ) >
+<!ATTLIST dayPeriodRuleSet type NMTOKEN #IMPLIED >
+<!ATTLIST dayPeriodRuleSet draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dayPeriodRuleSet references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT dayPeriodRules ( dayPeriodRule* ) >
+<!ATTLIST dayPeriodRules locales NMTOKENS #REQUIRED >
+<!ATTLIST dayPeriodRules draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dayPeriodRules references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT dayPeriodRule EMPTY >
+<!ATTLIST dayPeriodRule type NMTOKEN #REQUIRED >
+<!ATTLIST dayPeriodRule at NMTOKEN #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST dayPeriodRule after NMTOKEN #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST dayPeriodRule before NMTOKEN #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST dayPeriodRule from NMTOKEN #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST dayPeriodRule to NMTOKEN #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST dayPeriodRule draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST dayPeriodRule references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT metaZones ( metazoneInfo?, mapTimezones? ) >
+
+<!ELEMENT primaryZones ( primaryZone* ) >
+
+<!ELEMENT primaryZone ( #PCDATA ) >
+<!ATTLIST primaryZone iso3166 NMTOKEN #REQUIRED >
+
+<!-- # Time Zones -->
+
+<!ELEMENT windowsZones ( mapTimezones? ) >
+
+<!-- # Coverage levels -->
+
+<!ELEMENT coverageLevels ( approvalRequirements, coverageVariable*, coverageLevel* ) >
+    <!--@METADATA-->
+
+<!ELEMENT approvalRequirements ( approvalRequirement* ) >
+
+<!ELEMENT approvalRequirement EMPTY >
+<!ATTLIST approvalRequirement votes CDATA #REQUIRED >
+    <!--@VALUE-->
+<!ATTLIST approvalRequirement locales CDATA #REQUIRED >
+<!ATTLIST approvalRequirement paths CDATA #REQUIRED >
+
+<!ELEMENT coverageVariable EMPTY >
+    <!--@ORDERED-->
+<!ATTLIST coverageVariable key CDATA #REQUIRED >
+<!ATTLIST coverageVariable value CDATA #REQUIRED >
+    <!--@VALUE-->
+
+<!ELEMENT coverageLevel EMPTY >
+    <!--@ORDERED-->
+<!ATTLIST coverageLevel inLanguage CDATA #IMPLIED >
+<!ATTLIST coverageLevel inScript CDATA #IMPLIED >
+<!ATTLIST coverageLevel inTerritory CDATA #IMPLIED >
+<!ATTLIST coverageLevel value CDATA #REQUIRED >
+    <!--@VALUE-->
+<!ATTLIST coverageLevel match CDATA #REQUIRED >
+
+<!ELEMENT idValidity ( id* ) >
+
+<!ELEMENT id ( #PCDATA ) >
+<!ATTLIST id type NMTOKEN #REQUIRED >
+<!ATTLIST id idStatus NMTOKEN #REQUIRED >
+
+<!ELEMENT rgScope ( rgPath* ) >
+
+<!ELEMENT rgPath EMPTY >
+<!ATTLIST rgPath path CDATA #REQUIRED >
+<!ATTLIST rgPath draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/af.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af.xml
similarity index 89%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/af.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af.xml
index 42efc076558..7ce4e73a8b8 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/af.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="af"/>
 	</identity>
 	<localeDisplayNames>
@@ -33,10 +32,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="az">Azerbeidjans</language>
 			<language type="az" alt="short">Azeri</language>
 			<language type="ba">Baskir</language>
-			<language type="be">Wit-Russies</language>
+			<language type="be">Belo-Russies</language>
 			<language type="bem">Bemba</language>
 			<language type="bez">Bena</language>
 			<language type="bg">Bulgaars</language>
+			<language type="bgn">Wes-Balochi</language>
 			<language type="bm">Bambara</language>
 			<language type="bn">Bengaals</language>
 			<language type="bo">Tibettaans</language>
@@ -44,6 +44,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="brx">Bodo</language>
 			<language type="bs">Bosnies</language>
 			<language type="ca">Katalaans</language>
+			<language type="ce">Tsjetsjen</language>
 			<language type="cgg">Sjiga</language>
 			<language type="chr">Cherokees</language>
 			<language type="ckb">Sorani Koerdies</language>
@@ -51,6 +52,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="cop" draft="unconfirmed">Kopties</language>
 			<language type="cs">Tsjeggies</language>
 			<language type="cu" draft="unconfirmed">Kerkslawies</language>
+			<language type="cv">Chuvash</language>
 			<language type="cy">Wallies</language>
 			<language type="da">Deens</language>
 			<language type="dav">Taita</language>
@@ -147,6 +149,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ln">Lingaals</language>
 			<language type="lo">Lao</language>
 			<language type="loz">Lozi</language>
+			<language type="lrc">Noord-Luri</language>
 			<language type="lt">Litaus</language>
 			<language type="lu">Luba-Katanga</language>
 			<language type="lua">Luba-Lulua</language>
@@ -170,9 +173,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mua">Mundang</language>
 			<language type="mul">Veelvuldige tale</language>
 			<language type="my">Birmaans</language>
+			<language type="mzn">Masanderani</language>
 			<language type="naq">Nama</language>
 			<language type="nb">Noorse Bokmål</language>
 			<language type="nd">Noord-Ndebele</language>
+			<language type="nds">Lae Duits</language>
+			<language type="nds_NL">Nedersaksies</language>
 			<language type="ne">Nepalees</language>
 			<language type="nl">Nederlands</language>
 			<language type="nl_BE">Vlaams</language>
@@ -210,7 +216,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sbp">Sangu</language>
 			<language type="sco" draft="unconfirmed">Skots</language>
 			<language type="sd">Sindhi</language>
-			<language type="se">Noordelike Sami</language>
+			<language type="sdh">Suid-Koerdies</language>
+			<language type="se">Noord-Sami</language>
 			<language type="seh">Sena</language>
 			<language type="ses">Koyraboro Senni</language>
 			<language type="sg">Sango</language>
@@ -233,10 +240,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="su">Sundanees</language>
 			<language type="sv">Sweeds</language>
 			<language type="sw">Swahili</language>
+			<language type="sw_CD">Swahili (Kongo)</language>
 			<language type="swb" draft="unconfirmed">Shimaorees</language>
-			<language type="swc">Swahili (Kongo)</language>
 			<language type="ta">Tamil</language>
-			<language type="te">Telugu</language>
+			<language type="te">Teloegoe</language>
 			<language type="teo">Teso</language>
 			<language type="tet">Tetum</language>
 			<language type="tg">Tadzjieks</language>
@@ -264,6 +271,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ve">Venda</language>
 			<language type="vi">Viëtnamees</language>
 			<language type="vun">Vunjo</language>
+			<language type="wbp">Warlpiri</language>
 			<language type="wo">Wolof</language>
 			<language type="xh">Xhosa</language>
 			<language type="xog">Soga</language>
@@ -315,7 +323,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Phnx" draft="unconfirmed">Fenisieses</script>
 			<script type="Sinh">Sinhala</script>
 			<script type="Taml">Tamil</script>
-			<script type="Telu">Telugu</script>
+			<script type="Telu">Teloegoe</script>
 			<script type="Thaa">Thaana</script>
 			<script type="Thai">Thai</script>
 			<script type="Tibt">Tibettaans</script>
@@ -365,7 +373,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albanië</territory>
 			<territory type="AM">Armenië</territory>
-			<territory type="AN">Nederlands-Antille</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antarktika</territory>
 			<territory type="AR">Argentinië</territory>
@@ -401,8 +408,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CD">Demokratiese Republiek van die Kongo</territory>
 			<territory type="CD" alt="variant">Kongo (DRK)</territory>
 			<territory type="CF">Sentraal-Afrikaanse Republiek</territory>
-			<territory type="CG">Republiek van die Kongo</territory>
-			<territory type="CG" alt="variant">Kongo (Republiek)</territory>
+			<territory type="CG">Kongo - Brazzaville</territory>
+			<territory type="CG" alt="variant">Kongo (Republiek die)</territory>
 			<territory type="CH">Switserland</territory>
 			<territory type="CI">Ivoorkus</territory>
 			<territory type="CK">Cookeilande</territory>
@@ -509,7 +516,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="MC">Monaco</territory>
 			<territory type="MD">Moldowa</territory>
 			<territory type="ME">Montenegro</territory>
-			<territory type="MF">Sint Martin</territory>
+			<territory type="MF">St. Martin</territory>
 			<territory type="MG">Madagaskar</territory>
 			<territory type="MH">Marshalleilande</territory>
 			<territory type="MK">Macedonië</territory>
@@ -646,6 +653,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric">Numeriese sortering</key>
 			<key type="colStrength">Sorteringssterkte</key>
 			<key type="currency">Geldeenheid</key>
+			<key type="hc">Uursiklus (12 vs 24)</key>
+			<key type="lb">Reëlbreek-styl</key>
+			<key type="ms">Meetstelsel</key>
 			<key type="numbers">Syfers</key>
 			<key type="timezone">Tydsone</key>
 			<key type="va">Lokaalvariant</key>
@@ -653,95 +663,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">Privaat gebruik</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Arabies-Indiese syfers</type>
-			<type type="arabext" key="numbers">Uitgebreide Arabies-Indiese syfers</type>
-			<type type="armn" key="numbers">Armeense syfers</type>
-			<type type="armnlow" key="numbers">Armeense kleinletter-syfers</type>
-			<type type="beng" key="numbers">Bengaalse syfers</type>
-			<type type="big5han" key="collation">Tradisionele Chinese sorteervolgorde - Groot5</type>
-			<type type="buddhist" key="calendar">Boeddhistiese kalender</type>
-			<type type="chinese" key="calendar">Sjinese kalender</type>
-			<type type="coptic" key="calendar">Koptiese kalender</type>
-			<type type="dangi" key="calendar">Dangi-kalender</type>
-			<type type="deva" key="numbers">Devanagari-syfers</type>
-			<type type="dictionary" key="collation">Woordeboek-sorteervolgorde</type>
-			<type type="ducet" key="collation">Verstek Unicode-sorteervolgorde</type>
-			<type type="ethi" key="numbers">Ethiopiese syfers</type>
-			<type type="ethiopic" key="calendar">Ethiopiese kalender</type>
-			<type type="ethiopic-amete-alem" key="calendar">Etiopiese Amete Alem-kalender</type>
-			<type type="finance" key="numbers">Finansiële syfers</type>
-			<type type="fullwide" key="numbers">Vollewydte-syfers</type>
-			<type type="gb2312han" key="collation">Vereenvoudigde Chinese sorteervolgorde - GB2312</type>
-			<type type="geor" key="numbers">Georgiese syfers</type>
-			<type type="gregorian" key="calendar">Gregoriese kalender</type>
-			<type type="grek" key="numbers">Griekse syfers</type>
-			<type type="greklow" key="numbers">Griekse kleinletter-syfers</type>
-			<type type="gujr" key="numbers">Goedjarati-syfers</type>
-			<type type="guru" key="numbers">Gurmukhi-syfers</type>
-			<type type="hanidec" key="numbers">Chinese desimale syfers</type>
-			<type type="hans" key="numbers">Vereenvoudigde Chinese syfers</type>
-			<type type="hansfin" key="numbers">Vereenvoudigde Chinese finansiële syfers</type>
-			<type type="hant" key="numbers">Tradisionele Chinese syfers</type>
-			<type type="hantfin" key="numbers">Tradisionele Chinese finansiële syfers</type>
-			<type type="hebr" key="numbers">Hebreeuse syfers</type>
-			<type type="hebrew" key="calendar">Hebreeuse kalender</type>
-			<type type="identical" key="colStrength">Sorteer almal</type>
-			<type type="indian" key="calendar">Indiese nasionale kalender</type>
-			<type type="islamic" key="calendar">Islamitiese kalender</type>
-			<type type="islamic-civil" key="calendar">Islamitiese siviele kalender</type>
-			<type type="iso8601" key="calendar">ISO-8601-kalender</type>
-			<type type="japanese" key="calendar">Japannese kalender</type>
-			<type type="jpan" key="numbers">Japannese syfers</type>
-			<type type="jpanfin" key="numbers">Japannese finansiële syfers</type>
-			<type type="khmr" key="numbers">Khmer-syfers</type>
-			<type type="knda" key="numbers">Kannada-syfers</type>
-			<type type="laoo" key="numbers">Lao-syfers</type>
-			<type type="latn" key="numbers">Westerse syfers</type>
-			<type type="lower" key="colCaseFirst">Sorteer kleinletters veerste</type>
-			<type type="mlym" key="numbers">Malabaarse syfers</type>
-			<type type="mong" key="numbers">Mongoliese syfers</type>
-			<type type="mymr" key="numbers">Mianmar-syfers</type>
-			<type type="native" key="numbers">Inheemse syfers</type>
-			<type type="no" key="colBackwards">Sorteer aksente gewoonweg</type>
-			<type type="no" key="colCaseFirst">Sorteer gewone letterorde</type>
-			<type type="no" key="colCaseLevel">Sorteer nie kassensitief nie</type>
-			<type type="no" key="colHiraganaQuaternary">Sorteer Kana afsonderlik</type>
-			<type type="no" key="colNormalization">Sorteer sonder normalisering</type>
-			<type type="no" key="colNumeric">Sorteer syfers individueel</type>
-			<type type="non-ignorable" key="colAlternate">Sorteer simbole</type>
-			<type type="orya" key="numbers">Oriya-syfers</type>
-			<type type="persian" key="calendar">Persiese kalender</type>
-			<type type="phonebook" key="collation">Foonboek-sorteervolgorde</type>
-			<type type="phonetic" key="collation">Fonetiese sorteerorde</type>
-			<type type="pinyin" key="collation">Pinyin-sorteervolgorde</type>
-			<type type="primary" key="colStrength">Sorteer slegs basisletters</type>
-			<type type="quaternary" key="colStrength">Sorteer aksente/kas/breedte/Kana</type>
-			<type type="reformed" key="collation">Gereformeerde sorteervolgorde</type>
-			<type type="roc" key="calendar">Minguo-kalender</type>
-			<type type="roman" key="numbers">Romeinse syfers</type>
-			<type type="romanlow" key="numbers">Romeinse kleinletter-syfers</type>
-			<type type="search" key="collation">Algemenedoel-soektog</type>
-			<type type="searchjl" key="collation">Soek volgens Hangul-beginkonsonant</type>
-			<type type="secondary" key="colStrength">Sorteer aksente</type>
-			<type type="shifted" key="colAlternate">Sorteer ignoreersimbole</type>
-			<type type="standard" key="collation">Standaard sorteervolgorde</type>
-			<type type="stroke" key="collation">Slag-sorteervolgorde</type>
-			<type type="taml" key="numbers">Tradisionele Tamil-syfers</type>
-			<type type="tamldec" key="numbers">Tamil-syfers</type>
-			<type type="telu" key="numbers">Telugu-syfers</type>
-			<type type="tertiary" key="colStrength">Sorteer aksente/kas/breedte</type>
-			<type type="thai" key="numbers">Thaise syfers</type>
-			<type type="tibt" key="numbers">Tibettaanse syfers</type>
-			<type type="traditional" key="collation">Tradisionele sorteervolgorde</type>
-			<type type="traditional" key="numbers">Tradisionele syfers</type>
-			<type type="unihan" key="collation">Radikale-slag-sorteervolgorde</type>
-			<type type="upper" key="colCaseFirst">Sorteer hoofletters eerste</type>
-			<type type="vaii" key="numbers">Vai-syfers</type>
-			<type type="yes" key="colBackwards">Sorteer aksente omgekeerd</type>
-			<type type="yes" key="colCaseLevel">Sorteer kassensitief</type>
-			<type type="yes" key="colHiraganaQuaternary">Sorteer Kana anders</type>
-			<type type="yes" key="colNormalization">Sorteer Unicode genormaliseer</type>
-			<type type="yes" key="colNumeric">Sorteer syfers numeries</type>
+			<type key="calendar" type="buddhist">Boeddhistiese kalender</type>
+			<type key="calendar" type="chinese">Sjinese kalender</type>
+			<type key="calendar" type="coptic">Koptiese kalender</type>
+			<type key="calendar" type="dangi">Dangi-kalender</type>
+			<type key="calendar" type="ethiopic">Ethiopiese kalender</type>
+			<type key="calendar" type="ethiopic-amete-alem">Etiopiese Amete Alem-kalender</type>
+			<type key="calendar" type="gregorian">Gregoriese kalender</type>
+			<type key="calendar" type="hebrew">Hebreeuse kalender</type>
+			<type key="calendar" type="indian">Indiese nasionale kalender</type>
+			<type key="calendar" type="islamic">Islamitiese kalender</type>
+			<type key="calendar" type="islamic-civil">Islamitiese siviele kalender</type>
+			<type key="calendar" type="iso8601">ISO-8601-kalender</type>
+			<type key="calendar" type="japanese">Japannese kalender</type>
+			<type key="calendar" type="persian">Persiese kalender</type>
+			<type key="calendar" type="roc">Minguo-kalender</type>
+			<type key="colAlternate" type="non-ignorable">Sorteer simbole</type>
+			<type key="colAlternate" type="shifted">Sorteer ignoreersimbole</type>
+			<type key="colBackwards" type="no">Sorteer aksente gewoonweg</type>
+			<type key="colBackwards" type="yes">Sorteer aksente omgekeerd</type>
+			<type key="colCaseFirst" type="lower">Sorteer kleinletters veerste</type>
+			<type key="colCaseFirst" type="no">Sorteer gewone letterorde</type>
+			<type key="colCaseFirst" type="upper">Sorteer hoofletters eerste</type>
+			<type key="colCaseLevel" type="no">Sorteer nie kassensitief nie</type>
+			<type key="colCaseLevel" type="yes">Sorteer kassensitief</type>
+			<type key="colHiraganaQuaternary" type="no">Sorteer Kana afsonderlik</type>
+			<type key="colHiraganaQuaternary" type="yes">Sorteer Kana anders</type>
+			<type key="collation" type="big5han">Tradisionele Chinese sorteervolgorde - Groot5</type>
+			<type key="collation" type="dictionary">Woordeboek-sorteervolgorde</type>
+			<type key="collation" type="ducet">Verstek Unicode-sorteervolgorde</type>
+			<type key="collation" type="gb2312han">Vereenvoudigde Chinese sorteervolgorde - GB2312</type>
+			<type key="collation" type="phonebook">Foonboek-sorteervolgorde</type>
+			<type key="collation" type="phonetic">Fonetiese sorteerorde</type>
+			<type key="collation" type="pinyin">Pinyin-sorteervolgorde</type>
+			<type key="collation" type="reformed">Gereformeerde sorteervolgorde</type>
+			<type key="collation" type="search">Algemenedoel-soektog</type>
+			<type key="collation" type="searchjl">Soek volgens Hangul-beginkonsonant</type>
+			<type key="collation" type="standard">Standaard sorteervolgorde</type>
+			<type key="collation" type="stroke">Slag-sorteervolgorde</type>
+			<type key="collation" type="traditional">Tradisionele sorteervolgorde</type>
+			<type key="collation" type="unihan">Radikale-slag-sorteervolgorde</type>
+			<type key="colNormalization" type="no">Sorteer sonder normalisering</type>
+			<type key="colNormalization" type="yes">Sorteer Unicode genormaliseer</type>
+			<type key="colNumeric" type="no">Sorteer syfers individueel</type>
+			<type key="colNumeric" type="yes">Sorteer syfers numeries</type>
+			<type key="colStrength" type="identical">Sorteer almal</type>
+			<type key="colStrength" type="primary">Sorteer slegs basisletters</type>
+			<type key="colStrength" type="quaternary">Sorteer aksente/kas/breedte/Kana</type>
+			<type key="colStrength" type="secondary">Sorteer aksente</type>
+			<type key="colStrength" type="tertiary">Sorteer aksente/kas/breedte</type>
+			<type key="hc" type="h11">12-uur-stelsel (0-11)</type>
+			<type key="hc" type="h12">112-uur-stelsel (1-12)</type>
+			<type key="hc" type="h23">24-uur-stelsel</type>
+			<type key="hc" type="h24">24-uur-stelsel (1-24)</type>
+			<type key="lb" type="loose">Los reëlbreek-styl</type>
+			<type key="lb" type="normal">Normale reëlbreek-styl</type>
+			<type key="lb" type="strict">Streng reëlbreek-styl</type>
+			<type key="ms" type="metric">Metriese stelsel</type>
+			<type key="ms" type="uksystem">Imperiale meetstelsel</type>
+			<type key="ms" type="ussystem">VS-meetstelsel</type>
+			<type key="numbers" type="arab">Arabies-Indiese syfers</type>
+			<type key="numbers" type="arabext">Uitgebreide Arabies-Indiese syfers</type>
+			<type key="numbers" type="armn">Armeense syfers</type>
+			<type key="numbers" type="armnlow">Armeense kleinletter-syfers</type>
+			<type key="numbers" type="beng">Bengaalse syfers</type>
+			<type key="numbers" type="deva">Devanagari-syfers</type>
+			<type key="numbers" type="ethi">Ethiopiese syfers</type>
+			<type key="numbers" type="finance">Finansiële syfers</type>
+			<type key="numbers" type="fullwide">Vollewydte-syfers</type>
+			<type key="numbers" type="geor">Georgiese syfers</type>
+			<type key="numbers" type="grek">Griekse syfers</type>
+			<type key="numbers" type="greklow">Griekse kleinletter-syfers</type>
+			<type key="numbers" type="gujr">Goedjarati-syfers</type>
+			<type key="numbers" type="guru">Gurmukhi-syfers</type>
+			<type key="numbers" type="hanidec">Chinese desimale syfers</type>
+			<type key="numbers" type="hans">Vereenvoudigde Sjinese syfers</type>
+			<type key="numbers" type="hansfin">Vereenvoudigde Sjinese finansiële syfers</type>
+			<type key="numbers" type="hant">Tradisionele Sjinese syfers</type>
+			<type key="numbers" type="hantfin">Tradisionele Sjinese finansiële syfers</type>
+			<type key="numbers" type="hebr">Hebreeuse syfers</type>
+			<type key="numbers" type="jpan">Japannese syfers</type>
+			<type key="numbers" type="jpanfin">Japannese finansiële syfers</type>
+			<type key="numbers" type="khmr">Khmer-syfers</type>
+			<type key="numbers" type="knda">Kannada-syfers</type>
+			<type key="numbers" type="laoo">Lao-syfers</type>
+			<type key="numbers" type="latn">Westerse syfers</type>
+			<type key="numbers" type="mlym">Malabaarse syfers</type>
+			<type key="numbers" type="mong">Mongoliese syfers</type>
+			<type key="numbers" type="mymr">Mianmar-syfers</type>
+			<type key="numbers" type="native">Inheemse syfers</type>
+			<type key="numbers" type="orya">Oriya-syfers</type>
+			<type key="numbers" type="roman">Romeinse syfers</type>
+			<type key="numbers" type="romanlow">Romeinse kleinletter-syfers</type>
+			<type key="numbers" type="taml">Tradisionele Tamil-syfers</type>
+			<type key="numbers" type="tamldec">Tamil-syfers</type>
+			<type key="numbers" type="telu">Teloegoe-syfers</type>
+			<type key="numbers" type="thai">Thaise syfers</type>
+			<type key="numbers" type="tibt">Tibettaanse syfers</type>
+			<type key="numbers" type="traditional">Tradisionele syfers</type>
+			<type key="numbers" type="vaii">Vai-syfers</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN">BGN</transformName>
@@ -833,6 +853,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -845,19 +866,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">M/d</dateFormatItem>
-						<dateFormatItem id="MEd">E, M/d</dateFormatItem>
+						<dateFormatItem id="Md">d/M</dateFormatItem>
+						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E, MMMM d</dateFormatItem>
+						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMEd">E, d MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
-						<dateFormatItem id="yyyyM">M/y G</dateFormatItem>
-						<dateFormatItem id="yyyyMd">M/d/y G</dateFormatItem>
+						<dateFormatItem id="yyyyM">M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMd">d/M/y GGGGG</dateFormatItem>
 						<dateFormatItem id="yyyyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">d MMM y G</dateFormatItem>
@@ -907,40 +927,40 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">M – M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d">M/d – M/d</greatestDifference>
-							<greatestDifference id="M">M/d – M/d</greatestDifference>
+							<greatestDifference id="d">d/M – d/M</greatestDifference>
+							<greatestDifference id="M">d/M – d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, M/d – E, M/d</greatestDifference>
-							<greatestDifference id="M">E, M/d – E, M/d</greatestDifference>
+							<greatestDifference id="d">E, d/M – E, d/M</greatestDifference>
+							<greatestDifference id="M">E, d/M – E, d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM–MMM</greatestDifference>
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MMM d–d</greatestDifference>
-							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
+							<greatestDifference id="d">d – d MMM</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, MMM d – E, MMM d</greatestDifference>
-							<greatestDifference id="M">E, MMM d – E, MMM d</greatestDifference>
+							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
-							<greatestDifference id="y">y–y G</greatestDifference>
+							<greatestDifference id="y">y – y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M/y – M/y G</greatestDifference>
-							<greatestDifference id="y">M/y – M/y G</greatestDifference>
+							<greatestDifference id="M">M/y – M/y GGGGG</greatestDifference>
+							<greatestDifference id="y">M/y – M/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">M/d/y – M/d/y G</greatestDifference>
-							<greatestDifference id="M">M/d/y – M/d/y G</greatestDifference>
-							<greatestDifference id="y">M/d/y – M/d/y G</greatestDifference>
+							<greatestDifference id="d">d/M/y – d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="M">d/M/y – d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="y">d/M/y – d/M/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, M/d/y – E, M/d/y G</greatestDifference>
-							<greatestDifference id="M">E, M/d/y – E, M/d/y G</greatestDifference>
-							<greatestDifference id="y">E, M/d/y – E, M/d/y G</greatestDifference>
+							<greatestDifference id="d">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="M">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="y">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
 							<greatestDifference id="M">MMM–MMM y G</greatestDifference>
@@ -948,13 +968,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
 							<greatestDifference id="d">d–d MMM, y G</greatestDifference>
-							<greatestDifference id="M">MMM d – MMM d, y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
 							<greatestDifference id="y">d MMM, y – d MMM, y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
 							<greatestDifference id="d">E, d MMM – E, d MMM, y G</greatestDifference>
 							<greatestDifference id="M">E, d MMM – E, d MMM, y G</greatestDifference>
-							<greatestDifference id="y">E, MMM d, y – E, MMM d, y G</greatestDifference>
+							<greatestDifference id="y">E, d MMM y – E, d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
 							<greatestDifference id="M">MMMM–MMMM y G</greatestDifference>
@@ -970,15 +990,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="1">Jan.</month>
 							<month type="2">Feb.</month>
 							<month type="3">Mrt.</month>
-							<month type="4">Apr</month>
+							<month type="4">Apr.</month>
 							<month type="5">Mei</month>
-							<month type="6">Jun</month>
-							<month type="7">Jul</month>
-							<month type="8">Aug</month>
-							<month type="9">Sep</month>
-							<month type="10">Okt</month>
-							<month type="11">Nov</month>
-							<month type="12">Des</month>
+							<month type="6">Jun.</month>
+							<month type="7">Jul.</month>
+							<month type="8">Aug.</month>
+							<month type="9">Sep.</month>
+							<month type="10">Okt.</month>
+							<month type="11">Nov.</month>
+							<month type="12">Des.</month>
 						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">J</month>
@@ -1014,15 +1034,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="1">Jan.</month>
 							<month type="2">Feb.</month>
 							<month type="3">Mrt.</month>
-							<month type="4">Apr</month>
+							<month type="4">Apr.</month>
 							<month type="5">Mei</month>
-							<month type="6">Jun</month>
-							<month type="7">Jul</month>
-							<month type="8">Aug</month>
-							<month type="9">Sep</month>
-							<month type="10">Okt</month>
-							<month type="11">Nov</month>
-							<month type="12">Des</month>
+							<month type="6">Jun.</month>
+							<month type="7">Jul.</month>
+							<month type="8">Aug.</month>
+							<month type="9">Sep.</month>
+							<month type="10">Okt.</month>
+							<month type="11">Nov.</month>
+							<month type="12">Des.</month>
 						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">J</month>
@@ -1057,13 +1077,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<days>
 					<dayContext type="format">
 						<dayWidth type="abbreviated">
-							<day type="sun">So</day>
-							<day type="mon">Ma</day>
-							<day type="tue">Di</day>
-							<day type="wed">Wo</day>
-							<day type="thu">Do</day>
-							<day type="fri">Vr</day>
-							<day type="sat">Sa</day>
+							<day type="sun">So.</day>
+							<day type="mon">Ma.</day>
+							<day type="tue">Di.</day>
+							<day type="wed">Wo.</day>
+							<day type="thu">Do.</day>
+							<day type="fri">Vr.</day>
+							<day type="sat">Sa.</day>
 						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun">S</day>
@@ -1095,13 +1115,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dayContext>
 					<dayContext type="stand-alone">
 						<dayWidth type="abbreviated">
-							<day type="sun">So</day>
-							<day type="mon">Ma</day>
-							<day type="tue">Di</day>
-							<day type="wed">Wo</day>
-							<day type="thu">Do</day>
-							<day type="fri">Vr</day>
-							<day type="sat">Sa</day>
+							<day type="sun">So.</day>
+							<day type="mon">Ma.</day>
+							<day type="tue">Di.</day>
+							<day type="wed">Wo.</day>
+							<day type="thu">Do.</day>
+							<day type="fri">Vr.</day>
+							<day type="sat">Sa.</day>
 						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun">S</day>
@@ -1176,22 +1196,68 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">middernag</dayPeriod>
+							<dayPeriod type="am">vm.</dayPeriod>
+							<dayPeriod type="pm">nm.</dayPeriod>
+							<dayPeriod type="morning1">die oggend</dayPeriod>
+							<dayPeriod type="afternoon1">die middag</dayPeriod>
+							<dayPeriod type="evening1">die aand</dayPeriod>
+							<dayPeriod type="night1">die nag</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">mn</dayPeriod>
 							<dayPeriod type="am">v</dayPeriod>
-							<dayPeriod type="noon">m</dayPeriod>
 							<dayPeriod type="pm">n</dayPeriod>
+							<dayPeriod type="morning1">o</dayPeriod>
+							<dayPeriod type="afternoon1">m</dayPeriod>
+							<dayPeriod type="evening1">a</dayPeriod>
+							<dayPeriod type="night1">n</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">middernag</dayPeriod>
 							<dayPeriod type="am">vm.</dayPeriod>
-							<dayPeriod type="noon">middag</dayPeriod>
 							<dayPeriod type="pm">nm.</dayPeriod>
+							<dayPeriod type="morning1">die oggend</dayPeriod>
+							<dayPeriod type="afternoon1">die middag</dayPeriod>
+							<dayPeriod type="evening1">die aand</dayPeriod>
+							<dayPeriod type="night1">die nag</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">middernag</dayPeriod>
+							<dayPeriod type="am">vm.</dayPeriod>
+							<dayPeriod type="pm">nm.</dayPeriod>
+							<dayPeriod type="morning1">oggend</dayPeriod>
+							<dayPeriod type="afternoon1">middag</dayPeriod>
+							<dayPeriod type="evening1">aand</dayPeriod>
+							<dayPeriod type="night1">nag</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">mn</dayPeriod>
+							<dayPeriod type="am">v</dayPeriod>
+							<dayPeriod type="pm">n</dayPeriod>
+							<dayPeriod type="morning1">o</dayPeriod>
+							<dayPeriod type="afternoon1">m</dayPeriod>
+							<dayPeriod type="evening1">a</dayPeriod>
+							<dayPeriod type="night1">n</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">middernag</dayPeriod>
+							<dayPeriod type="am">vm.</dayPeriod>
+							<dayPeriod type="pm">nm.</dayPeriod>
+							<dayPeriod type="morning1">oggend</dayPeriod>
+							<dayPeriod type="afternoon1">middag</dayPeriod>
+							<dayPeriod type="evening1">aand</dayPeriod>
+							<dayPeriod type="night1">nag</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
 						<era type="0">voor Christus</era>
-						<era type="0" alt="variant">v.g.j.</era>
+						<era type="0" alt="variant">voor die gewone jaartelling</era>
 						<era type="1">na Christus</era>
 						<era type="1" alt="variant">g.j.</era>
 					</eraNames>
@@ -1291,6 +1357,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">dd-MM</dateFormatItem>
 						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
@@ -1298,7 +1368,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
 						<dateFormatItem id="MMMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd MMMM</dateFormatItem>
 						<dateFormatItem id="MMMMEd">E d MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
@@ -1322,15 +1391,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
+							<greatestDifference id="h">h – h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
 							<greatestDifference id="H">HH–HH</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hm">
 							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
@@ -1338,8 +1407,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
 							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm a – h:mm a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hmv">
 							<greatestDifference id="H">HH:mm–HH:mm v</greatestDifference>
@@ -1347,7 +1416,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
+							<greatestDifference id="h">h – h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
 							<greatestDifference id="H">HH–HH v</greatestDifference>
@@ -1356,23 +1425,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">M–M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d">M/d – M/d</greatestDifference>
-							<greatestDifference id="M">M/d – M/d</greatestDifference>
+							<greatestDifference id="d">d/M – d/M</greatestDifference>
+							<greatestDifference id="M">d/M – d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, M/d – E, M/d</greatestDifference>
-							<greatestDifference id="M">E, M/d – E, M/d</greatestDifference>
+							<greatestDifference id="d">E, d/M – E, d/M</greatestDifference>
+							<greatestDifference id="M">E, d/M – E, d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
 							<greatestDifference id="M">MMM–MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MMM d–d</greatestDifference>
-							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
+							<greatestDifference id="d">d–d MMM</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, MMM d – E, MMM d</greatestDifference>
-							<greatestDifference id="M">E, MMM d – E, MMM d</greatestDifference>
+							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
 							<greatestDifference id="y">y–y</greatestDifference>
@@ -1382,31 +1451,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="y">M/y – M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">M/d/y – M/d/y</greatestDifference>
-							<greatestDifference id="M">M/d/y – M/d/y</greatestDifference>
-							<greatestDifference id="y">M/d/y – M/d/y</greatestDifference>
+							<greatestDifference id="d">d/M/y – d/M/y</greatestDifference>
+							<greatestDifference id="M">d/M/y – d/M/y</greatestDifference>
+							<greatestDifference id="y">d/M/y – d/M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, M/d/y – E, M/d/y</greatestDifference>
-							<greatestDifference id="M">E, M/d/y – E, M/d/y</greatestDifference>
-							<greatestDifference id="y">E, M/d/y – E, M/d/y</greatestDifference>
+							<greatestDifference id="d">E, d/M/y – E, d/M/y</greatestDifference>
+							<greatestDifference id="M">E, d/M/y – E, d/M/y</greatestDifference>
+							<greatestDifference id="y">E, d/M/y – E, d/M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
 							<greatestDifference id="M">MMM–MMM y</greatestDifference>
 							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d–d MMM, y</greatestDifference>
-							<greatestDifference id="M">MMM d – MMM d, y</greatestDifference>
-							<greatestDifference id="y">d MMM, y – d MMM, y</greatestDifference>
+							<greatestDifference id="d">d–d MMM y</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d MMM – E, d MMM, y</greatestDifference>
+							<greatestDifference id="d">E, d MMM – E, d MMM y</greatestDifference>
 							<greatestDifference id="M">E, d MMM – E, d MMM, y</greatestDifference>
-							<greatestDifference id="y">E, MMM d, y – E, MMM d, y</greatestDifference>
+							<greatestDifference id="y">E, d MMM y – E, d MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MMMM–MMMM y</greatestDifference>
+							<greatestDifference id="M">MMMM – MMMM y</greatestDifference>
 							<greatestDifference id="y">MMMM y – MMMM y</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
@@ -1415,16 +1484,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</calendars>
 		<fields>
 			<field type="era">
-				<displayName>Era</displayName>
+				<displayName>era</displayName>
 			</field>
 			<field type="year">
-				<displayName>Jaar</displayName>
+				<displayName>jaar</displayName>
 				<relative type="-1">verlede jaar</relative>
 				<relative type="0">hierdie jaar</relative>
 				<relative type="1">volgende jaar</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Oor {0} jaar</relativeTimePattern>
-					<relativeTimePattern count="other">Oor {0} jaar</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} jaar</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} jaar</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} jaar gelede</relativeTimePattern>
@@ -1434,8 +1503,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="year-short">
 				<displayName>j.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Oor {0} jaar</relativeTimePattern>
-					<relativeTimePattern count="other">Oor {0} jaar</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} jaar</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} jaar</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} jaar gelede</relativeTimePattern>
@@ -1445,8 +1514,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="year-narrow">
 				<displayName>j.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Oor {0} jaar</relativeTimePattern>
-					<relativeTimePattern count="other">Oor {0} jaar</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} jaar</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} jaar</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} jaar gelede</relativeTimePattern>
@@ -1454,7 +1523,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="quarter">
-				<displayName>Kwartaal</displayName>
+				<displayName>kwartaal</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">oor {0} kwartaal</relativeTimePattern>
 					<relativeTimePattern count="other">oor {0} kwartale</relativeTimePattern>
@@ -1492,8 +1561,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="0">vandeesmaand</relative>
 				<relative type="1">volgende maand</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Oor {0} maand</relativeTimePattern>
-					<relativeTimePattern count="other">Oor {0} maande</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} minuut</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} minuut</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} maand gelede</relativeTimePattern>
@@ -1528,8 +1597,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="0">vandeesweek</relative>
 				<relative type="1">volgende week</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Oor {0} week</relativeTimePattern>
-					<relativeTimePattern count="other">Oor {0} weke</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} week</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} weke</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} week gelede</relativeTimePattern>
@@ -1566,8 +1635,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">môre</relative>
 				<relative type="2">oormôre</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Oor {0} dag</relativeTimePattern>
-					<relativeTimePattern count="other">Oor {0} dae</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} minuut</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} minuut</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} dag gelede</relativeTimePattern>
@@ -1576,6 +1645,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>d.</displayName>
+				<relative type="-2">eergister</relative>
+				<relative type="-1">gister</relative>
+				<relative type="0">vandag</relative>
+				<relative type="1">môre</relative>
+				<relative type="2">oormôre</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">oor {0} dag</relativeTimePattern>
 					<relativeTimePattern count="other">oor {0} dae</relativeTimePattern>
@@ -1587,6 +1661,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>d.</displayName>
+				<relative type="-2">eergister</relative>
+				<relative type="-1">gister</relative>
+				<relative type="0">vandag</relative>
+				<relative type="1">môre</relative>
+				<relative type="2">oormôre</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">oor {0} dag</relativeTimePattern>
 					<relativeTimePattern count="other">oor {0} dae</relativeTimePattern>
@@ -1597,7 +1676,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="weekday">
-				<displayName>Dag van die Week</displayName>
+				<displayName>dag van die week</displayName>
 			</field>
 			<field type="sun">
 				<relative type="-1">verlede Sondag</relative>
@@ -1681,20 +1760,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="fri-short">
 				<relative type="-1">verlede Vr.</relative>
+				<relative type="0">dié Vr.</relative>
+				<relative type="1">vlg. Vr.</relative>
+			</field>
+			<field type="fri-narrow">
+				<relative type="-1">verlede Vr.</relative>
+				<relative type="0">dié Vr.</relative>
+				<relative type="1">vlg. Vr.</relative>
 			</field>
 			<field type="sat">
 				<relative type="-1">verlede Saterdag</relative>
 				<relative type="0">hierdie Saterdag</relative>
 				<relative type="1">volgende Saterdag</relative>
 			</field>
+			<field type="sat-short">
+				<relative type="-1">verlede Sa.</relative>
+				<relative type="0">dié Sa.</relative>
+				<relative type="1">vlg. Sa.</relative>
+			</field>
+			<field type="sat-narrow">
+				<relative type="-1">verlede Sa.</relative>
+				<relative type="0">dié Sa.</relative>
+				<relative type="1">vlg. Sa.</relative>
+			</field>
 			<field type="dayperiod">
 				<displayName>VM/NM</displayName>
 			</field>
 			<field type="hour">
-				<displayName>Uur</displayName>
+				<displayName>uur</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Oor {0} uur</relativeTimePattern>
-					<relativeTimePattern count="other">Oor {0} uur</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} uur</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} uur</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} uur gelede</relativeTimePattern>
@@ -1724,10 +1820,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="minute">
-				<displayName>Minuut</displayName>
+				<displayName>minuut</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Oor {0} minuut</relativeTimePattern>
-					<relativeTimePattern count="other">Oor {0} minute</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} minuut</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} minuut</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} minuut gelede</relativeTimePattern>
@@ -1757,11 +1853,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="second">
-				<displayName>Sekonde</displayName>
+				<displayName>sekonde</displayName>
 				<relative type="0">nou</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Oor {0} sekonde</relativeTimePattern>
-					<relativeTimePattern count="other">Oor {0} sekondes</relativeTimePattern>
+					<relativeTimePattern count="one">oor {0} sekonde</relativeTimePattern>
+					<relativeTimePattern count="other">oor {0} sekondes</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} sekonde gelede</relativeTimePattern>
@@ -1791,7 +1887,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>Tydsone</displayName>
+				<displayName>tydsone</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
@@ -2082,7 +2178,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Swift Current</exemplarCity>
 			</zone>
 			<zone type="America/Cambridge_Bay">
-				<exemplarCity>Cambridge Bay</exemplarCity>
+				<exemplarCity>Cambridgebaai</exemplarCity>
 			</zone>
 			<zone type="America/Regina">
 				<exemplarCity>Regina</exemplarCity>
@@ -2103,7 +2199,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Atikokan</exemplarCity>
 			</zone>
 			<zone type="America/Thunder_Bay">
-				<exemplarCity>Thunder Bay</exemplarCity>
+				<exemplarCity>Thunderbaai</exemplarCity>
 			</zone>
 			<zone type="America/Nipigon">
 				<exemplarCity>Nipigon</exemplarCity>
@@ -2124,10 +2220,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Halifax</exemplarCity>
 			</zone>
 			<zone type="America/Goose_Bay">
-				<exemplarCity>Goose Bay</exemplarCity>
+				<exemplarCity>Goosebaai</exemplarCity>
 			</zone>
 			<zone type="America/Glace_Bay">
-				<exemplarCity>Glace Bay</exemplarCity>
+				<exemplarCity>Glacebaai</exemplarCity>
 			</zone>
 			<zone type="America/Blanc-Sablon">
 				<exemplarCity>Blanc-Sablon</exemplarCity>
@@ -2433,7 +2529,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Comore</exemplarCity>
 			</zone>
 			<zone type="America/St_Kitts">
-				<exemplarCity>St. Kitts</exemplarCity>
+				<exemplarCity>Sint Kitts</exemplarCity>
 			</zone>
 			<zone type="Asia/Pyongyang">
 				<exemplarCity>Pyongyang</exemplarCity>
@@ -2445,7 +2541,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Koeweit</exemplarCity>
 			</zone>
 			<zone type="America/Cayman">
-				<exemplarCity>Cayman</exemplarCity>
+				<exemplarCity>Kaaiman</exemplarCity>
 			</zone>
 			<zone type="Asia/Aqtau">
 				<exemplarCity>Aqtau</exemplarCity>
@@ -2469,7 +2565,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Beiroet</exemplarCity>
 			</zone>
 			<zone type="America/St_Lucia">
-				<exemplarCity>St. Lucia</exemplarCity>
+				<exemplarCity>Sint Lucia</exemplarCity>
 			</zone>
 			<zone type="Europe/Vaduz">
 				<exemplarCity>Vaduz</exemplarCity>
@@ -2669,6 +2765,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
 			</zone>
@@ -2753,6 +2852,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Chita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Jakoetsk</exemplarCity>
 			</zone>
@@ -2771,6 +2873,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolymsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamchatka</exemplarCity>
 			</zone>
@@ -3012,7 +3117,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Vatikaanstad</exemplarCity>
 			</zone>
 			<zone type="America/St_Vincent">
-				<exemplarCity>St. Vincent</exemplarCity>
+				<exemplarCity>Sint Vincent</exemplarCity>
 			</zone>
 			<zone type="America/Caracas">
 				<exemplarCity>Caracas</exemplarCity>
@@ -3021,7 +3126,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Tortola</exemplarCity>
 			</zone>
 			<zone type="America/St_Thomas">
-				<exemplarCity>St. Thomas</exemplarCity>
+				<exemplarCity>Sint Thomas</exemplarCity>
 			</zone>
 			<zone type="Asia/Saigon">
 				<exemplarCity>Ho Tsji Minhstad</exemplarCity>
@@ -4067,6 +4172,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">¤0K</pattern>
+					<pattern type="1000" count="other">¤0K</pattern>
+					<pattern type="10000" count="one">¤00K</pattern>
+					<pattern type="10000" count="other">¤00K</pattern>
+					<pattern type="100000" count="one">¤ 000K</pattern>
+					<pattern type="100000" count="other">¤ 000K</pattern>
+					<pattern type="1000000" count="one">¤0 m</pattern>
+					<pattern type="1000000" count="other">¤0 m</pattern>
+					<pattern type="10000000" count="one">¤00 m</pattern>
+					<pattern type="10000000" count="other">¤00 m</pattern>
+					<pattern type="100000000" count="one">¤000 m</pattern>
+					<pattern type="100000000" count="other">¤000 m</pattern>
+					<pattern type="1000000000" count="one">¤0 mjd</pattern>
+					<pattern type="1000000000" count="other">¤0 mjd</pattern>
+					<pattern type="10000000000" count="one">¤00 mjd</pattern>
+					<pattern type="10000000000" count="other">¤00 mjd</pattern>
+					<pattern type="100000000000" count="one">¤000 mjd</pattern>
+					<pattern type="100000000000" count="other">¤000 mjd</pattern>
+					<pattern type="1000000000000" count="one">¤0 bn</pattern>
+					<pattern type="1000000000000" count="other">¤0 bn</pattern>
+					<pattern type="10000000000000" count="one">¤00 bn</pattern>
+					<pattern type="10000000000000" count="other">¤00 bn</pattern>
+					<pattern type="100000000000000" count="one">¤000 bn</pattern>
+					<pattern type="100000000000000" count="other">¤000 bn</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4106,6 +4239,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Angolese kwanza</displayName>
 				<displayName count="other">Angolese kwanza</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="ARS">
 				<displayName>Argentynse peso</displayName>
@@ -4138,6 +4272,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Bosnies-Herzegowiniese omskakelbare marka</displayName>
 				<displayName count="other">Bosnies-Herzegowiniese omskakelbare marka</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>Barbados-dollar</displayName>
@@ -4190,6 +4325,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Boliviaanse boliviano</displayName>
 				<displayName count="other">Boliviaanse boliviano</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BRL">
 				<displayName>Brasilliaanse reaal</displayName>
@@ -4216,6 +4352,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Botswana pula</displayName>
 				<displayName count="other">Botswana pula</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYR">
 				<displayName>Belo-Russiese roebel</displayName>
@@ -4283,6 +4420,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Kubaanse omskakelbare peso</displayName>
 				<displayName count="other">Kubaanse omskakelbare peso</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>Kubaanse peso</displayName>
@@ -4302,6 +4440,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Tsjeggiese kroon</displayName>
 				<displayName count="other">Tsjeggiese kroon</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DJF">
 				<displayName>Djiboeti frank</displayName>
@@ -4314,6 +4453,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Deense kroon</displayName>
 				<displayName count="other">Deense kroon</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Dominikaanse peso</displayName>
@@ -4333,6 +4473,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Egiptiese pond</displayName>
 				<displayName count="other">Egiptiese pond</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>Eritrese nakfa</displayName>
@@ -4365,6 +4506,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Falkland-eilande pond</displayName>
 				<displayName count="other">Falkland-eilande pond</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GBP">
 				<displayName>Britse pond</displayName>
@@ -4378,6 +4520,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Georgiese lari</displayName>
 				<displayName count="other">Georgiese lari</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>Ghanese cedi (1979–2007)</displayName>
@@ -4406,6 +4549,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Guinese frank</displayName>
 				<displayName count="other">Guinese frank</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>Guinese syli</displayName>
@@ -4415,6 +4559,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Guatemalaanse quetzal</displayName>
 				<displayName count="other">Guatemalaanse quetzal</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GYD">
 				<displayName>Guyanese dollar</displayName>
@@ -4435,12 +4580,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Hondurese lempira</displayName>
 				<displayName count="other">Hondurese lempira</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRK">
 				<displayName>Kroatiese kuna</displayName>
 				<displayName count="one">Kroatiese kuna</displayName>
 				<displayName count="other">Kroatiese kuna</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>Haïtiaanse gourde</displayName>
@@ -4453,12 +4600,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Hongaarse florint</displayName>
 				<displayName count="other">Hongaarse florint</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>Indonesiese roepia</displayName>
 				<displayName count="one">Indonesiese roepia</displayName>
 				<displayName count="other">Indonesiese roepia</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="ILS">
 				<displayName>Israeliese nuwe sikkel</displayName>
@@ -4491,6 +4640,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Yslandse kroon</displayName>
 				<displayName count="other">Yslandse kroon</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName draft="contributed">Italiaanse lier</displayName>
@@ -4539,12 +4689,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Comoraanse frank</displayName>
 				<displayName count="other">Comoraanse frank</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>Noord-Koreaanse won</displayName>
 				<displayName count="one">Noord-Koreaanse won</displayName>
 				<displayName count="other">Noord-Koreaanse won</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>Suid-Koreaanse won</displayName>
@@ -4585,12 +4737,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Lebanese pond</displayName>
 				<displayName count="other">Lebanese pond</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>Sri Lankaanse roepee</displayName>
 				<displayName count="one">Sri Lankaanse roepee</displayName>
 				<displayName count="other">Sri Lankaanse roepee</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>Liberiese dollar</displayName>
@@ -4634,6 +4788,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Malgassiese ariary</displayName>
 				<displayName count="other">Malgassiese ariary</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MKD">
 				<displayName>Macedoniese denar</displayName>
@@ -4646,6 +4801,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Mianmese kyat</displayName>
 				<displayName count="other">Mianmese kyat</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>Mongoolse toegrik</displayName>
@@ -4671,6 +4827,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Mauritiaanse rupee</displayName>
 				<displayName count="other">Mauritiaanse rupee</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>Malediviese rufia</displayName>
@@ -4696,6 +4853,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Maleisiese ringgit</displayName>
 				<displayName count="other">Maleisiese ringgit</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZM">
 				<displayName>Mosambiekse metical (1980–2006)</displayName>
@@ -4725,18 +4883,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Nicaraguaanse córdoba</displayName>
 				<displayName count="other">Nicaraguaanse córdoba</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NOK">
 				<displayName>Noorse kroon</displayName>
 				<displayName count="one">Noorse kroon</displayName>
 				<displayName count="other">Noorse kroon</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>Nepalese roepee</displayName>
 				<displayName count="one">Nepalese roepee</displayName>
 				<displayName count="other">Nepalese roepee</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>Nieu-Seeland dollar</displayName>
@@ -4781,12 +4942,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Pakistanse roepee</displayName>
 				<displayName count="other">Pakistanse roepee</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>Poolse zloty</displayName>
 				<displayName count="one">Poolse zloty</displayName>
 				<displayName count="other">Poolse zloty</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PYG">
 				<displayName>Paraguaanse guarani</displayName>
@@ -4818,6 +4981,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Russiese roebel</displayName>
 				<displayName count="other">Russiese roebel</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 				<symbol alt="variant">₽</symbol>
 			</currency>
 			<currency type="RWF">
@@ -4825,6 +4989,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Rwandiese frank</displayName>
 				<displayName count="other">Rwandiese frank</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>Saoedi-Arabiese riyal</displayName>
@@ -4859,6 +5024,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Sweedse kroon</displayName>
 				<displayName count="other">Sweedse kroon</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>Singapoer dollar</displayName>
@@ -4872,6 +5038,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Sint Helena pond</displayName>
 				<displayName count="other">Sint Helena pond</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SLL">
 				<displayName>Sierra Leoniese leone</displayName>
@@ -4904,12 +5071,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">São Tomé en Príncipe dobra</displayName>
 				<displayName count="other">São Tomé en Príncipe dobra</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SYP">
 				<displayName>Siriese pond</displayName>
 				<displayName count="one">Siriese pond</displayName>
 				<displayName count="other">Siriese pond</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>Swazilandse lilangeni</displayName>
@@ -4922,6 +5091,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Thaise baht</displayName>
 				<displayName count="other">Thaise baht</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJS">
 				<displayName>Tadjikse roebel</displayName>
@@ -4946,6 +5116,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Tongaanse pa’anga</displayName>
 				<displayName count="other">Tongaanse pa’anga</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TRL">
 				<displayName>Turkse lier (1922–2005)</displayName>
@@ -4956,6 +5127,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">Turkse lier</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Trinidad en Tobago dollar</displayName>
@@ -5015,6 +5187,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Venezolaanse bolivar</displayName>
 				<displayName count="other">Venezolaanse bolivar</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>Viëtnamese dong</displayName>
@@ -5046,6 +5219,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Oos-Karibbiese dollar</displayName>
 				<displayName count="other">Oos-Karibbiese dollar</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XOF">
 				<displayName>CFA frank BCEAO</displayName>
@@ -5075,6 +5249,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Suid-Afrikaanse rand</displayName>
 				<displayName count="other">Suid-Afrikaanse rand</displayName>
 				<symbol>R</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>Zambiese kwacha (1968–2012)</displayName>
@@ -5084,6 +5259,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Zambiese kwacha</displayName>
 				<displayName count="other">Zambiese kwacha</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZWD">
 				<displayName>Zimbabwiese dollar</displayName>
@@ -5109,6 +5285,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rewolusie</displayName>
+				<unitPattern count="one">{0} rewolusie</unitPattern>
+				<unitPattern count="other">{0} rewolusies</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radiale</displayName>
+				<unitPattern count="one">{0} radiaal</unitPattern>
+				<unitPattern count="other">{0} radiale</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>grade</displayName>
+				<unitPattern count="one">{0} graad</unitPattern>
+				<unitPattern count="other">{0} grade</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>boogminute</displayName>
 				<unitPattern count="one">{0} boogminuut</unitPattern>
@@ -5119,30 +5310,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} boogsekonde</unitPattern>
 				<unitPattern count="other">{0} boogsekondes</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>grade</displayName>
-				<unitPattern count="one">{0} graad</unitPattern>
-				<unitPattern count="other">{0} grade</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radiale</displayName>
-				<unitPattern count="one">{0} radiaal</unitPattern>
-				<unitPattern count="other">{0} radiale</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>akker</displayName>
-				<unitPattern count="one">{0} akker</unitPattern>
-				<unitPattern count="other">{0} akker</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>vierkante kilometer</displayName>
+				<unitPattern count="one">{0} vierkante kilometer</unitPattern>
+				<unitPattern count="other">{0} vierkante kilometer</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektaar</displayName>
 				<unitPattern count="one">{0} hektaar</unitPattern>
 				<unitPattern count="other">{0} hektaar</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>vierkante meter</displayName>
+				<unitPattern count="one">{0} vierkante meter</unitPattern>
+				<unitPattern count="other">{0} vierkante meter</unitPattern>
+				<perUnitPattern>{0} per vierkante meter</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>vierkante sentimeter</displayName>
 				<unitPattern count="one">{0} vierkante sentimeter</unitPattern>
 				<unitPattern count="other">{0} vierkante sentimeter</unitPattern>
+				<perUnitPattern>{0} per vierkante sentimeter</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>vierkante myl</displayName>
+				<unitPattern count="one">{0} vierkante myl</unitPattern>
+				<unitPattern count="other">{0} vierkante myl</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>akker</displayName>
+				<unitPattern count="one">{0} akker</unitPattern>
+				<unitPattern count="other">{0} akker</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>vierkante jaart</displayName>
+				<unitPattern count="one">{0} vierkante jaart</unitPattern>
+				<unitPattern count="other">{0} vierkante jaart</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>vierkante voet</displayName>
@@ -5153,91 +5356,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>vierkante duim</displayName>
 				<unitPattern count="one">{0} vierkante duim</unitPattern>
 				<unitPattern count="other">{0} vierkante duim</unitPattern>
+				<perUnitPattern>{0} per vierkante duim</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>vierkante kilometer</displayName>
-				<unitPattern count="one">{0} vierkante kilometer</unitPattern>
-				<unitPattern count="other">{0} vierkante kilometer</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>vierkante meter</displayName>
-				<unitPattern count="one">{0} vierkante meter</unitPattern>
-				<unitPattern count="other">{0} vierkante meter</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>vierkante myl</displayName>
-				<unitPattern count="one">{0} vierkante myl</unitPattern>
-				<unitPattern count="other">{0} vierkante myl</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>vierkante jaart</displayName>
-				<unitPattern count="one">{0} vierkante jaart</unitPattern>
-				<unitPattern count="other">{0} vierkante jaart</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="other">{0} karat</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liter per kilometer</displayName>
 				<unitPattern count="one">{0} liter per kilometer</unitPattern>
 				<unitPattern count="other">{0} liter per kilometer</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>liter per 100 kilometers</displayName>
+				<unitPattern count="one">{0} liter per 100 kilometers</unitPattern>
+				<unitPattern count="other">{0} liter per 100 kilometers</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>myl per gelling</displayName>
 				<unitPattern count="one">{0} myl per gelling</unitPattern>
 				<unitPattern count="other">{0} myl per gelling</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bis</displayName>
-				<unitPattern count="one">{0} bis</unitPattern>
-				<unitPattern count="other">{0} bis</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>grepe</displayName>
-				<unitPattern count="one">{0} greep</unitPattern>
-				<unitPattern count="other">{0} grepe</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>grepe</displayName>
+				<unitPattern count="one">{0} greep</unitPattern>
+				<unitPattern count="other">{0} grepe</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bis</displayName>
+				<unitPattern count="one">{0} bis</unitPattern>
+				<unitPattern count="other">{0} bis</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>eeu</displayName>
+				<unitPattern count="one">{0} eeu</unitPattern>
+				<unitPattern count="other">{0} eeue</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>jaar</displayName>
+				<unitPattern count="one">{0} jaar</unitPattern>
+				<unitPattern count="other">{0} jaar</unitPattern>
+				<perUnitPattern>{0} per jaar</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>maande</displayName>
+				<unitPattern count="one">{0} maand</unitPattern>
+				<unitPattern count="other">{0} maande</unitPattern>
+				<perUnitPattern>{0}/md.</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>weke</displayName>
+				<unitPattern count="one">{0} week</unitPattern>
+				<unitPattern count="other">{0} weke</unitPattern>
+				<perUnitPattern>{0}/w.</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>dae</displayName>
 				<unitPattern count="one">{0} dag</unitPattern>
 				<unitPattern count="other">{0} dae</unitPattern>
+				<perUnitPattern>{0}/d.</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>uur</displayName>
@@ -5245,30 +5463,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} uur</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikrosekondes</displayName>
-				<unitPattern count="one">{0} mikrosekonde</unitPattern>
-				<unitPattern count="other">{0} mikrosekondes</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>millisekondes</displayName>
-				<unitPattern count="one">{0} millisekonde</unitPattern>
-				<unitPattern count="other">{0} millisekondes</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>minute</displayName>
 				<unitPattern count="one">{0} minuut</unitPattern>
 				<unitPattern count="other">{0} minute</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>maande</displayName>
-				<unitPattern count="one">{0} maand</unitPattern>
-				<unitPattern count="other">{0} maande</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanosekondes</displayName>
-				<unitPattern count="one">{0} nanosekonde</unitPattern>
-				<unitPattern count="other">{0} nanosekondes</unitPattern>
+				<perUnitPattern>{0} per minuut</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sekondes</displayName>
@@ -5276,15 +5475,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} sekondes</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>weke</displayName>
-				<unitPattern count="one">{0} week</unitPattern>
-				<unitPattern count="other">{0} weke</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>millisekondes</displayName>
+				<unitPattern count="one">{0} millisekonde</unitPattern>
+				<unitPattern count="other">{0} millisekondes</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>jaar</displayName>
-				<unitPattern count="one">{0} jaar</unitPattern>
-				<unitPattern count="other">{0} jaar</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>mikrosekondes</displayName>
+				<unitPattern count="one">{0} mikrosekonde</unitPattern>
+				<unitPattern count="other">{0} mikrosekondes</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosekondes</displayName>
+				<unitPattern count="one">{0} nanosekonde</unitPattern>
+				<unitPattern count="other">{0} nanosekondes</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ampere</displayName>
@@ -5306,6 +5510,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} volt</unitPattern>
 				<unitPattern count="other">{0} volt</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokalorië</displayName>
+				<unitPattern count="one">{0} kilokalorie</unitPattern>
+				<unitPattern count="other">{0} kilokalorië</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kalorië</displayName>
 				<unitPattern count="one">{0} kalorie</unitPattern>
@@ -5316,21 +5525,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Kalorie</unitPattern>
 				<unitPattern count="other">{0} Kalorië</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="one">{0} joule</unitPattern>
-				<unitPattern count="other">{0} joule</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokalorië</displayName>
-				<unitPattern count="one">{0} kilokalorie</unitPattern>
-				<unitPattern count="other">{0} kilokalorië</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="one">{0} joule</unitPattern>
+				<unitPattern count="other">{0} joule</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -5341,201 +5545,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>astronomiese eenheid</displayName>
-				<unitPattern count="one">{0} astronomiese eenheid</unitPattern>
-				<unitPattern count="other">{0} astronomiese eenheid</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometer</displayName>
+				<unitPattern count="one">{0} kilometer</unitPattern>
+				<unitPattern count="other">{0} kilometer</unitPattern>
+				<perUnitPattern>{0} per kilometer</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>sentimeter</displayName>
-				<unitPattern count="one">{0} sentimeter</unitPattern>
-				<unitPattern count="other">{0} sentimeter</unitPattern>
+			<unit type="length-meter">
+				<displayName>meter</displayName>
+				<unitPattern count="one">{0} meter</unitPattern>
+				<unitPattern count="other">{0} meter</unitPattern>
+				<perUnitPattern>{0} per meter</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>desimeter</displayName>
 				<unitPattern count="one">{0} desimeter</unitPattern>
 				<unitPattern count="other">{0} desimeter</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>voet</displayName>
-				<unitPattern count="one">{0} voet</unitPattern>
-				<unitPattern count="other">{0} voet</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>duim</displayName>
-				<unitPattern count="one">{0} duim</unitPattern>
-				<unitPattern count="other">{0} duim</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometer</displayName>
-				<unitPattern count="one">{0} kilometer</unitPattern>
-				<unitPattern count="other">{0} kilometer</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ligjare</displayName>
-				<unitPattern count="one">{0} ligjare</unitPattern>
-				<unitPattern count="other">{0} ligjare</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>meter</displayName>
-				<unitPattern count="one">{0} meter</unitPattern>
-				<unitPattern count="other">{0} meter</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>mikrometer</displayName>
-				<unitPattern count="one">{0} mikrometer</unitPattern>
-				<unitPattern count="other">{0} mikrometer</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>myl</displayName>
-				<unitPattern count="one">{0} myl</unitPattern>
-				<unitPattern count="other">{0} myl</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>sentimeter</displayName>
+				<unitPattern count="one">{0} sentimeter</unitPattern>
+				<unitPattern count="other">{0} sentimeter</unitPattern>
+				<perUnitPattern>{0} per sentimeter</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>millimeter</displayName>
 				<unitPattern count="one">{0} millimeter</unitPattern>
 				<unitPattern count="other">{0} millimeter</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikrometer</displayName>
+				<unitPattern count="one">{0} mikrometer</unitPattern>
+				<unitPattern count="other">{0} mikrometer</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanometer</displayName>
 				<unitPattern count="one">{0} nanometer</unitPattern>
 				<unitPattern count="other">{0} nanometer</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>seemyl</displayName>
-				<unitPattern count="one">{0} seemyl</unitPattern>
-				<unitPattern count="other">{0} seemyl</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsek</displayName>
-				<unitPattern count="one">{0} parsek</unitPattern>
-				<unitPattern count="other">{0} parsek</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pikometer</displayName>
 				<unitPattern count="one">{0} pikometer</unitPattern>
 				<unitPattern count="other">{0} pikometer</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>myl</displayName>
+				<unitPattern count="one">{0} myl</unitPattern>
+				<unitPattern count="other">{0} myl</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>jaart</displayName>
 				<unitPattern count="one">{0} jaart</unitPattern>
 				<unitPattern count="other">{0} jaart</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>voet</displayName>
+				<unitPattern count="one">{0} voet</unitPattern>
+				<unitPattern count="other">{0} voet</unitPattern>
+				<perUnitPattern>{0} per voet</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>duim</displayName>
+				<unitPattern count="one">{0} duim</unitPattern>
+				<unitPattern count="other">{0} duim</unitPattern>
+				<perUnitPattern>{0} per duim</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsek</displayName>
+				<unitPattern count="one">{0} parsek</unitPattern>
+				<unitPattern count="other">{0} parsek</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ligjare</displayName>
+				<unitPattern count="one">{0} ligjare</unitPattern>
+				<unitPattern count="other">{0} ligjare</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>astronomiese eenheid</displayName>
+				<unitPattern count="one">{0} astronomiese eenheid</unitPattern>
+				<unitPattern count="other">{0} astronomiese eenheid</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>seemyl</displayName>
+				<unitPattern count="one">{0} seemyl</unitPattern>
+				<unitPattern count="other">{0} seemyl</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>skandinawiese myl</displayName>
+				<unitPattern count="one">{0} skandinawiese myl</unitPattern>
+				<unitPattern count="other">{0} skandinawiese myl</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karaat</displayName>
-				<unitPattern count="one">{0} karaat</unitPattern>
-				<unitPattern count="other">{0} karaat</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gram</displayName>
-				<unitPattern count="one">{0} gram</unitPattern>
-				<unitPattern count="other">{0} gram</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogram</displayName>
-				<unitPattern count="one">{0} kilogram</unitPattern>
-				<unitPattern count="other">{0} kilogram</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mikrogram</displayName>
-				<unitPattern count="one">{0} mikrogram</unitPattern>
-				<unitPattern count="other">{0} mikrogram</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogram</displayName>
+				<unitPattern count="one">{0} kilogram</unitPattern>
+				<unitPattern count="other">{0} kilogram</unitPattern>
+				<perUnitPattern>{0} per kilogram</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="one">{0} gram</unitPattern>
+				<unitPattern count="other">{0} gram</unitPattern>
+				<perUnitPattern>{0} per gram</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>milligram</displayName>
 				<unitPattern count="one">{0} milligram</unitPattern>
 				<unitPattern count="other">{0} milligram</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>onse</displayName>
-				<unitPattern count="one">{0} ons</unitPattern>
-				<unitPattern count="other">{0} onse</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>troy-onse</displayName>
-				<unitPattern count="one">{0} troy-ons</unitPattern>
-				<unitPattern count="other">{0} troy-onse</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>pond</displayName>
-				<unitPattern count="one">{0} pond</unitPattern>
-				<unitPattern count="other">{0} pond</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>mikrogram</displayName>
+				<unitPattern count="one">{0} mikrogram</unitPattern>
+				<unitPattern count="other">{0} mikrogram</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>ton</displayName>
 				<unitPattern count="one">{0} ton</unitPattern>
 				<unitPattern count="other">{0} ton</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>pond</displayName>
+				<unitPattern count="one">{0} pond</unitPattern>
+				<unitPattern count="other">{0} pond</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>onse</displayName>
+				<unitPattern count="one">{0} ons</unitPattern>
+				<unitPattern count="other">{0} onse</unitPattern>
+				<perUnitPattern>{0} per ons</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>troy-onse</displayName>
+				<unitPattern count="one">{0} troy-ons</unitPattern>
+				<unitPattern count="other">{0} troy-onse</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karaat</displayName>
+				<unitPattern count="one">{0} karaat</unitPattern>
+				<unitPattern count="other">{0} karaat</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>perdekrag</displayName>
-				<unitPattern count="one">{0} perdekrag</unitPattern>
-				<unitPattern count="other">{0} perdekrag</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilowatt</displayName>
-				<unitPattern count="one">{0} kilowatt</unitPattern>
-				<unitPattern count="other">{0} kilowatt</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilowatt</displayName>
+				<unitPattern count="one">{0} kilowatt</unitPattern>
+				<unitPattern count="other">{0} kilowatt</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watt</displayName>
 				<unitPattern count="one">{0} watt</unitPattern>
 				<unitPattern count="other">{0} watt</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>perdekrag</displayName>
+				<unitPattern count="one">{0} perdekrag</unitPattern>
+				<unitPattern count="other">{0} perdekrag</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hektopascal</displayName>
 				<unitPattern count="one">{0} hektopascal</unitPattern>
 				<unitPattern count="other">{0} hektopascal</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>duim kwik</displayName>
-				<unitPattern count="one">{0} duim kwik</unitPattern>
-				<unitPattern count="other">{0} duim kwik</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>millibar</displayName>
-				<unitPattern count="one">{0} millibar</unitPattern>
-				<unitPattern count="other">{0} millibar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>millimeter kwik</displayName>
 				<unitPattern count="one">{0} millimeter kwik</unitPattern>
@@ -5546,10 +5754,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} pond per vierkante duim</unitPattern>
 				<unitPattern count="other">{0} pond per vierkante duim</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="other">{0} karat</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>duim kwik</displayName>
+				<unitPattern count="one">{0} duim kwik</unitPattern>
+				<unitPattern count="other">{0} duim kwik</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>millibar</displayName>
+				<unitPattern count="one">{0} millibar</unitPattern>
+				<unitPattern count="other">{0} millibar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometer per uur</displayName>
@@ -5566,6 +5779,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} myl per uur</unitPattern>
 				<unitPattern count="other">{0} myl per uur</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>knoop</displayName>
+				<unitPattern count="one">{0} knoop</unitPattern>
+				<unitPattern count="other">{0} knope</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>grade Celsius</displayName>
 				<unitPattern count="one">{0} graad Celsius</unitPattern>
@@ -5581,31 +5804,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>akkervoet</displayName>
-				<unitPattern count="one">{0} akkervoet</unitPattern>
-				<unitPattern count="other">{0} akkervoet</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>sentiliter</displayName>
-				<unitPattern count="one">{0} sentiliter</unitPattern>
-				<unitPattern count="other">{0} sentiliter</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>kubieke sentimeter</displayName>
-				<unitPattern count="one">{0} kubieke sentimeter</unitPattern>
-				<unitPattern count="other">{0} kubieke sentimeter</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>kubieke voet</displayName>
-				<unitPattern count="one">{0} kubieke voet</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>kubieke duim</displayName>
-				<unitPattern count="one">{0} kubieke duim</unitPattern>
-				<unitPattern count="other">{0} kubieke duim</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kubieke kilometer</displayName>
 				<unitPattern count="one">{0} kubieke kilometer</unitPattern>
@@ -5615,6 +5813,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>kubieke meter</displayName>
 				<unitPattern count="one">{0} kubieke meter</unitPattern>
 				<unitPattern count="other">{0} kubieke meter</unitPattern>
+				<perUnitPattern>{0} per kubieke meter</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>kubieke sentimeter</displayName>
+				<unitPattern count="one">{0} kubieke sentimeter</unitPattern>
+				<unitPattern count="other">{0} kubieke sentimeter</unitPattern>
+				<perUnitPattern>{0} per kubieke sentimeter</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>kubieke myl</displayName>
@@ -5626,25 +5831,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kubieke jaart</unitPattern>
 				<unitPattern count="other">{0} kubieke jaart</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>koppies</displayName>
-				<unitPattern count="one">{0} koppie</unitPattern>
-				<unitPattern count="other">{0} koppies</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>kubieke voet</displayName>
+				<unitPattern count="one">{0} kubieke voet</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>desiliter</displayName>
-				<unitPattern count="one">{0} desiliter</unitPattern>
-				<unitPattern count="other">{0} desiliter</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>kubieke duim</displayName>
+				<unitPattern count="one">{0} kubieke duim</unitPattern>
+				<unitPattern count="other">{0} kubieke duim</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>vloeistofonse</displayName>
-				<unitPattern count="one">{0} vloeistofons</unitPattern>
-				<unitPattern count="other">{0} vloeistofonse</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gelling</displayName>
-				<unitPattern count="one">{0} gelling</unitPattern>
-				<unitPattern count="other">{0} gelling</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megaliter</displayName>
+				<unitPattern count="one">{0} megaliter</unitPattern>
+				<unitPattern count="other">{0} megaliter</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hektoliter</displayName>
@@ -5655,27 +5855,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>liter</displayName>
 				<unitPattern count="one">{0} liter</unitPattern>
 				<unitPattern count="other">{0} liter</unitPattern>
+				<perUnitPattern>{0} per liter</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megaliter</displayName>
-				<unitPattern count="one">{0} megaliter</unitPattern>
-				<unitPattern count="other">{0} megaliter</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>desiliter</displayName>
+				<unitPattern count="one">{0} desiliter</unitPattern>
+				<unitPattern count="other">{0} desiliter</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>sentiliter</displayName>
+				<unitPattern count="one">{0} sentiliter</unitPattern>
+				<unitPattern count="other">{0} sentiliter</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>milliliter</displayName>
 				<unitPattern count="one">{0} milliliter</unitPattern>
 				<unitPattern count="other">{0} milliliter</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pinte</displayName>
-				<unitPattern count="one">{0} pint</unitPattern>
-				<unitPattern count="other">{0} pinte</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>metrieke pinte</displayName>
+				<unitPattern count="one">{0} metrieke pint</unitPattern>
+				<unitPattern count="other">{0} metrieke pinte</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>metrieke koppies</displayName>
+				<unitPattern count="one">{0} metrieke koppie</unitPattern>
+				<unitPattern count="other">{0} metrieke koppies</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>akkervoet</displayName>
+				<unitPattern count="one">{0} akkervoet</unitPattern>
+				<unitPattern count="other">{0} akkervoet</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gelling</displayName>
+				<unitPattern count="one">{0} gelling</unitPattern>
+				<unitPattern count="other">{0} gelling</unitPattern>
+				<perUnitPattern>{0} per gelling</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>kwarte</displayName>
 				<unitPattern count="one">{0} kwart</unitPattern>
 				<unitPattern count="other">{0} kwarte</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pinte</displayName>
+				<unitPattern count="one">{0} pint</unitPattern>
+				<unitPattern count="other">{0} pinte</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>koppies</displayName>
+				<unitPattern count="one">{0} koppie</unitPattern>
+				<unitPattern count="other">{0} koppies</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>vloeistofonse</displayName>
+				<unitPattern count="one">{0} vloeistofons</unitPattern>
+				<unitPattern count="other">{0} vloeistofonse</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>eetlepel</displayName>
 				<unitPattern count="one">{0} eetlepel</unitPattern>
@@ -5686,6 +5923,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} teelepel</unitPattern>
 				<unitPattern count="other">{0} teelepels</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}O</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -5701,6 +5944,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rew.</displayName>
+				<unitPattern count="one">{0} rew.</unitPattern>
+				<unitPattern count="other">{0} rew.</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radiale</displayName>
+				<unitPattern count="one">{0} rad.</unitPattern>
+				<unitPattern count="other">{0} rad.</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>grade</displayName>
+				<unitPattern count="one">{0} gr.</unitPattern>
+				<unitPattern count="other">{0} gr.</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>boogminute</displayName>
 				<unitPattern count="one">{0} boogmin.</unitPattern>
@@ -5711,30 +5969,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} boogsek.</unitPattern>
 				<unitPattern count="other">{0} boogsek.</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>grade</displayName>
-				<unitPattern count="one">{0} gr.</unitPattern>
-				<unitPattern count="other">{0} gr.</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radiale</displayName>
-				<unitPattern count="one">{0} rad.</unitPattern>
-				<unitPattern count="other">{0} rad.</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>akker</displayName>
-				<unitPattern count="one">{0} ak</unitPattern>
-				<unitPattern count="other">{0} ak</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektaar</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>myl²</displayName>
+				<unitPattern count="one">{0} myl²</unitPattern>
+				<unitPattern count="other">{0} myl²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>akker</displayName>
+				<unitPattern count="one">{0} ak</unitPattern>
+				<unitPattern count="other">{0} ak</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>jaart²</displayName>
+				<unitPattern count="one">{0} jt.²</unitPattern>
+				<unitPattern count="other">{0} jt.²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>vt.²</displayName>
@@ -5745,91 +6015,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>duim²</displayName>
 				<unitPattern count="one">{0} dm.²</unitPattern>
 				<unitPattern count="other">{0} dm.²</unitPattern>
+				<perUnitPattern>{0}/dm.²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>myl²</displayName>
-				<unitPattern count="one">{0} myl²</unitPattern>
-				<unitPattern count="other">{0} myl²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>jaart²</displayName>
-				<unitPattern count="one">{0} jt.²</unitPattern>
-				<unitPattern count="other">{0} jt.²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} kar.</unitPattern>
+				<unitPattern count="other">{0} kar.</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liter/km</displayName>
 				<unitPattern count="one">{0} ℓ/km</unitPattern>
 				<unitPattern count="other">{0} ℓ/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ℓ/100km</displayName>
+				<unitPattern count="one">{0} ℓ/100km</unitPattern>
+				<unitPattern count="other">{0} ℓ/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>myl/gelling</displayName>
 				<unitPattern count="one">{0} m.p.g.</unitPattern>
 				<unitPattern count="other">{0} m.p.g.</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bis</displayName>
-				<unitPattern count="one">{0} bis</unitPattern>
-				<unitPattern count="other">{0} bis</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>greep</displayName>
-				<unitPattern count="one">{0} greep</unitPattern>
-				<unitPattern count="other">{0} greep</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>greep</displayName>
+				<unitPattern count="one">{0} greep</unitPattern>
+				<unitPattern count="other">{0} greep</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bis</displayName>
+				<unitPattern count="one">{0} bis</unitPattern>
+				<unitPattern count="other">{0} bis</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>e.</displayName>
+				<unitPattern count="one">{0} e.</unitPattern>
+				<unitPattern count="other">{0} e.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>jaar</displayName>
+				<unitPattern count="one">{0} j.</unitPattern>
+				<unitPattern count="other">{0} j.</unitPattern>
+				<perUnitPattern>{0}/j.</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>maande</displayName>
+				<unitPattern count="one">{0} md.</unitPattern>
+				<unitPattern count="other">{0} md.</unitPattern>
+				<perUnitPattern>{0}/md.</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>weke</displayName>
+				<unitPattern count="one">{0} w.</unitPattern>
+				<unitPattern count="other">{0} w.</unitPattern>
+				<perUnitPattern>{0}/w.</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>dae</displayName>
 				<unitPattern count="one">{0} dag</unitPattern>
 				<unitPattern count="other">{0} dae</unitPattern>
+				<perUnitPattern>{0}/d.</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>uur</displayName>
@@ -5837,30 +6122,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} u.</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>millisekondes</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>minute</displayName>
 				<unitPattern count="one">{0} min.</unitPattern>
 				<unitPattern count="other">{0} min.</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>maande</displayName>
-				<unitPattern count="one">{0} md.</unitPattern>
-				<unitPattern count="other">{0} md.</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sekondes</displayName>
@@ -5868,15 +6134,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} sek.</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>weke</displayName>
-				<unitPattern count="one">{0} w.</unitPattern>
-				<unitPattern count="other">{0} w.</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>millisekondes</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>jaar</displayName>
-				<unitPattern count="one">{0} j.</unitPattern>
-				<unitPattern count="other">{0} j.</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ampere</displayName>
@@ -5898,6 +6169,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kkal.</displayName>
+				<unitPattern count="one">{0} kkal.</unitPattern>
+				<unitPattern count="other">{0} kkal.</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kal.</displayName>
 				<unitPattern count="one">{0} kal.</unitPattern>
@@ -5908,21 +6184,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kal.</unitPattern>
 				<unitPattern count="other">{0} kal.</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kkal.</displayName>
-				<unitPattern count="one">{0} kkal.</unitPattern>
-				<unitPattern count="other">{0} kkal.</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -5933,201 +6204,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>AE</displayName>
-				<unitPattern count="one">{0} AE</unitPattern>
-				<unitPattern count="other">{0} AE</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>meter</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>voet</displayName>
-				<unitPattern count="one">{0} vt.</unitPattern>
-				<unitPattern count="other">{0} vt.</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>duim</displayName>
-				<unitPattern count="one">{0} duim</unitPattern>
-				<unitPattern count="other">{0} duim</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ligjare</displayName>
-				<unitPattern count="one">{0} lj.</unitPattern>
-				<unitPattern count="other">{0} lj.</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>meter</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>myl</displayName>
-				<unitPattern count="one">{0} myl</unitPattern>
-				<unitPattern count="other">{0} myl</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="one">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>sm.</displayName>
-				<unitPattern count="one">{0} sm.</unitPattern>
-				<unitPattern count="other">{0} sm.</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsek</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>myl</displayName>
+				<unitPattern count="one">{0} myl</unitPattern>
+				<unitPattern count="other">{0} myl</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>jaart</displayName>
 				<unitPattern count="one">{0} jt.</unitPattern>
 				<unitPattern count="other">{0} jt.</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>voet</displayName>
+				<unitPattern count="one">{0} vt.</unitPattern>
+				<unitPattern count="other">{0} vt.</unitPattern>
+				<perUnitPattern>{0}/vt.</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>duim</displayName>
+				<unitPattern count="one">{0} duim</unitPattern>
+				<unitPattern count="other">{0} duim</unitPattern>
+				<perUnitPattern>{0}/duim</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsek</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ligjare</displayName>
+				<unitPattern count="one">{0} lj.</unitPattern>
+				<unitPattern count="other">{0} lj.</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>AE</displayName>
+				<unitPattern count="one">{0} AE</unitPattern>
+				<unitPattern count="other">{0} AE</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>sm.</displayName>
+				<unitPattern count="one">{0} sm.</unitPattern>
+				<unitPattern count="other">{0} sm.</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karaat</displayName>
-				<unitPattern count="one">{0} kar.</unitPattern>
-				<unitPattern count="other">{0} kar.</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gram</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz.</displayName>
-				<unitPattern count="one">{0} oz.</unitPattern>
-				<unitPattern count="other">{0} oz.</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>troy-ons</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>lb.</displayName>
-				<unitPattern count="one">{0} lb.</unitPattern>
-				<unitPattern count="other">{0} lb.</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>ton</displayName>
 				<unitPattern count="one">{0} tn</unitPattern>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>lb.</displayName>
+				<unitPattern count="one">{0} lb.</unitPattern>
+				<unitPattern count="other">{0} lb.</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz.</displayName>
+				<unitPattern count="one">{0} oz.</unitPattern>
+				<unitPattern count="other">{0} oz.</unitPattern>
+				<perUnitPattern>{0}/oz.</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>troy-ons</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karaat</displayName>
+				<unitPattern count="one">{0} kar.</unitPattern>
+				<unitPattern count="other">{0} kar.</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>perdekrag</displayName>
-				<unitPattern count="one">{0} pk.</unitPattern>
-				<unitPattern count="other">{0} pk.</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilowatt</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilowatt</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watt</displayName>
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>perdekrag</displayName>
+				<unitPattern count="one">{0} pk.</unitPattern>
+				<unitPattern count="other">{0} pk.</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>duim kwik</displayName>
-				<unitPattern count="one">{0} dm.Hg</unitPattern>
-				<unitPattern count="other">{0} dm.Hg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>millibar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -6138,10 +6413,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} pd.vk.dm.</unitPattern>
 				<unitPattern count="other">{0} pd.vk.dm.</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">{0} kar.</unitPattern>
-				<unitPattern count="other">{0} kar.</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>duim kwik</displayName>
+				<unitPattern count="one">{0} dm.Hg</unitPattern>
+				<unitPattern count="other">{0} dm.Hg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>millibar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/uur</displayName>
@@ -6158,6 +6438,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} myl/h</unitPattern>
 				<unitPattern count="other">{0} myl/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn.</displayName>
+				<unitPattern count="one">{0} kn.</unitPattern>
+				<unitPattern count="other">{0} kn.</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>grade Celsius</displayName>
 				<unitPattern count="one">{0} °C</unitPattern>
@@ -6173,31 +6463,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>akkervoet</displayName>
-				<unitPattern count="one">{0} ak.vt.</unitPattern>
-				<unitPattern count="other">{0} ak.vt.</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cℓ</displayName>
-				<unitPattern count="one">{0} cℓ</unitPattern>
-				<unitPattern count="other">{0} cℓ</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>duim³</displayName>
-				<unitPattern count="one">{0} dm.³</unitPattern>
-				<unitPattern count="other">{0} dm.³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -6207,6 +6472,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>myl³</displayName>
@@ -6218,25 +6490,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} jt.³</unitPattern>
 				<unitPattern count="other">{0} jt.³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>koppie</displayName>
-				<unitPattern count="one">{0} kp.</unitPattern>
-				<unitPattern count="other">{0} kp.</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dℓ</displayName>
-				<unitPattern count="one">{0} dℓ</unitPattern>
-				<unitPattern count="other">{0} dℓ</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>duim³</displayName>
+				<unitPattern count="one">{0} dm.³</unitPattern>
+				<unitPattern count="other">{0} dm.³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>vloz.</displayName>
-				<unitPattern count="one">{0} vloz.</unitPattern>
-				<unitPattern count="other">{0} vloz.</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gell.</displayName>
-				<unitPattern count="one">{0} gell.</unitPattern>
-				<unitPattern count="other">{0} gell.</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Mℓ</displayName>
+				<unitPattern count="one">{0} Mℓ</unitPattern>
+				<unitPattern count="other">{0} Mℓ</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hℓ</displayName>
@@ -6247,27 +6514,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>liter</displayName>
 				<unitPattern count="one">{0} ℓ</unitPattern>
 				<unitPattern count="other">{0} ℓ</unitPattern>
+				<perUnitPattern>{0}/ℓ</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Mℓ</displayName>
-				<unitPattern count="one">{0} Mℓ</unitPattern>
-				<unitPattern count="other">{0} Mℓ</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dℓ</displayName>
+				<unitPattern count="one">{0} dℓ</unitPattern>
+				<unitPattern count="other">{0} dℓ</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cℓ</displayName>
+				<unitPattern count="one">{0} cℓ</unitPattern>
+				<unitPattern count="other">{0} cℓ</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mℓ</displayName>
 				<unitPattern count="one">{0} mℓ</unitPattern>
 				<unitPattern count="other">{0} mℓ</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pinte</displayName>
-				<unitPattern count="one">{0} pt.</unitPattern>
-				<unitPattern count="other">{0} pt.</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt.</displayName>
+				<unitPattern count="one">{0} mpt.</unitPattern>
+				<unitPattern count="other">{0} mpt.</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mkp.</displayName>
+				<unitPattern count="one">{0} mkp.</unitPattern>
+				<unitPattern count="other">{0} mkp.</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>akkervoet</displayName>
+				<unitPattern count="one">{0} ak.vt.</unitPattern>
+				<unitPattern count="other">{0} ak.vt.</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gell.</displayName>
+				<unitPattern count="one">{0} gell.</unitPattern>
+				<unitPattern count="other">{0} gell.</unitPattern>
+				<perUnitPattern>{0}/gell.</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>kw.</displayName>
 				<unitPattern count="one">{0} kw.</unitPattern>
 				<unitPattern count="other">{0} kw.</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pinte</displayName>
+				<unitPattern count="one">{0} pt.</unitPattern>
+				<unitPattern count="other">{0} pt.</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>koppie</displayName>
+				<unitPattern count="one">{0} kp.</unitPattern>
+				<unitPattern count="other">{0} kp.</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>vloz.</displayName>
+				<unitPattern count="one">{0} vloz.</unitPattern>
+				<unitPattern count="other">{0} vloz.</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>eetl.</displayName>
 				<unitPattern count="one">{0} e.</unitPattern>
@@ -6278,6 +6582,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} teel.</unitPattern>
 				<unitPattern count="other">{0} teel.</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}O</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -6287,6 +6597,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}G</unitPattern>
 				<unitPattern count="other">{0}G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -6295,26 +6609,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} ak</unitPattern>
-				<unitPattern count="other">{0} ak</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0}ha</unitPattern>
 				<unitPattern count="other">{0}ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} vt.²</unitPattern>
-				<unitPattern count="other">{0} vt.²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} m²</unitPattern>
 				<unitPattern count="other">{0} m²</unitPattern>
@@ -6323,6 +6625,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}myl²</unitPattern>
 				<unitPattern count="other">{0}myl²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} ak</unitPattern>
+				<unitPattern count="other">{0} ak</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} vt.²</unitPattern>
+				<unitPattern count="other">{0} vt.²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ℓ/100km</displayName>
+				<unitPattern count="one">{0} ℓ/100km</unitPattern>
+				<unitPattern count="other">{0} ℓ/100km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>jaar</displayName>
+				<unitPattern count="one">{0} j.</unitPattern>
+				<unitPattern count="other">{0} j.</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>maand</displayName>
+				<unitPattern count="one">{0} md.</unitPattern>
+				<unitPattern count="other">{0} md.</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>w.</displayName>
+				<unitPattern count="one">{0} w.</unitPattern>
+				<unitPattern count="other">{0} w.</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>dag</displayName>
 				<unitPattern count="one">{0} d.</unitPattern>
@@ -6333,66 +6663,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} u.</unitPattern>
 				<unitPattern count="other">{0} u.</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>minute</displayName>
 				<unitPattern count="one">{0} min.</unitPattern>
 				<unitPattern count="other">{0} min.</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>maand</displayName>
-				<unitPattern count="one">{0} md.</unitPattern>
-				<unitPattern count="other">{0} md.</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>sekondes</displayName>
 				<unitPattern count="one">{0} sek.</unitPattern>
 				<unitPattern count="other">{0} sek.</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>w.</displayName>
-				<unitPattern count="one">{0} w.</unitPattern>
-				<unitPattern count="other">{0} w.</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>jaar</displayName>
-				<unitPattern count="one">{0} j.</unitPattern>
-				<unitPattern count="other">{0} j.</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0} vt.</unitPattern>
-				<unitPattern count="other">{0} vt.</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0} duim</unitPattern>
-				<unitPattern count="other">{0} duim</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
 				<unitPattern count="one">{0} km</unitPattern>
 				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} lj</unitPattern>
-				<unitPattern count="other">{0} lj</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>meter</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} myl</unitPattern>
-				<unitPattern count="other">{0} myl</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -6403,31 +6702,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}pm</unitPattern>
 				<unitPattern count="other">{0}pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} myl</unitPattern>
+				<unitPattern count="other">{0} myl</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} jt.</unitPattern>
 				<unitPattern count="other">{0} jt.</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>gram</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} vt.</unitPattern>
+				<unitPattern count="other">{0} vt.</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} duim</unitPattern>
+				<unitPattern count="other">{0} duim</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} lj</unitPattern>
+				<unitPattern count="other">{0} lj</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="one">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} oz.</unitPattern>
-				<unitPattern count="other">{0} oz.</unitPattern>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} lb.</unitPattern>
 				<unitPattern count="other">{0} lb.</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0}pk.</unitPattern>
-				<unitPattern count="other">{0}pk.</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} oz.</unitPattern>
+				<unitPattern count="other">{0} oz.</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0}kW</unitPattern>
@@ -6437,6 +6748,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}W</unitPattern>
 				<unitPattern count="other">{0}W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0}pk.</unitPattern>
+				<unitPattern count="other">{0}pk.</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0}hPa</unitPattern>
 				<unitPattern count="other">{0}hPa</unitPattern>
@@ -6484,6 +6799,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ℓ</unitPattern>
 				<unitPattern count="other">{0} ℓ</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}O</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>hh:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/af_NA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af_NA.xml
similarity index 52%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/af_NA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af_NA.xml
index d7b03bfa354..29cbf1cbd06 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/af_NA.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af_NA.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11168 $"/>
-		<generation date="$Date: 2015-02-06 17:46:28 -0600 (Fri, 06 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="af"/>
 		<territory type="NA"/>
 	</identity>
@@ -31,28 +30,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern draft="unconfirmed">HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern draft="unconfirmed">HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern draft="unconfirmed">HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern draft="unconfirmed">HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
 			</calendar>
 			<calendar type="gregorian">
 				<dateFormats>
@@ -72,28 +49,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern draft="unconfirmed">HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern draft="unconfirmed">HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern draft="unconfirmed">HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern draft="unconfirmed">HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
 			</calendar>
 		</calendars>
 	</dates>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/af_ZA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af_ZA.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/af_ZA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af_ZA.xml
index 878edebfae3..1fb8ac7fc8a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/af_ZA.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af_ZA.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="af"/>
 		<territory type="ZA"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/agq.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/agq.xml
similarity index 95%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/agq.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/agq.xml
index a68fa47434f..84f9e339671 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/agq.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/agq.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11042 $"/>
-		<generation date="$Date: 2014-10-31 12:11:19 -0500 (Fri, 31 Oct 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="agq"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Àŋgwilà</territory>
 			<territory type="AL">Àabɛnìa</territory>
 			<territory type="AM">Àmɛnyìa</territory>
-			<territory type="AN">Nedàlân Antàe</territory>
 			<territory type="AO">Àŋgolà</territory>
 			<territory type="AR">Àdzɛ̀ntinà</territory>
 			<territory type="AS">Àmɛlekan Samwà</territory>
@@ -443,6 +441,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">a.g</dayPeriod>
+							<dayPeriod type="pm">a.k</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">a.g</dayPeriod>
 							<dayPeriod type="pm">a.k</dayPeriod>
@@ -595,6 +597,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">0K¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -771,3 +789,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/agq_CM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/agq_CM.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/agq_CM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/agq_CM.xml
index e9b25905e3d..11b7d1a5687 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/agq_CM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/agq_CM.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="agq"/>
 		<territory type="CM"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ak.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ak.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ak.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ak.xml
index 6d41f672e0a..c2237598a04 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ak.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ak.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="ak"/>
 	</identity>
 	<localeDisplayNames>
@@ -65,7 +64,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguila</territory>
 			<territory type="AL">Albenia</territory>
 			<territory type="AM">Aamenia</territory>
-			<territory type="AN">Nɛdɛland Antelez</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Agyɛntina</territory>
 			<territory type="AS">Amɛrika Samoa</territory>
@@ -416,6 +414,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</days>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">AN</dayPeriod>
+							<dayPeriod type="pm">EW</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">AN</dayPeriod>
 							<dayPeriod type="pm">EW</dayPeriod>
@@ -457,22 +459,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
+							<pattern>h:mm:ss a zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
+							<pattern>h:mm:ss a z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
+							<pattern>h:mm:ss a</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>HH:mm</pattern>
+							<pattern>h:mm a</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -554,6 +556,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ak_GH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ak_GH.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ak_GH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ak_GH.xml
index dbfa78a29c3..36a5db549bd 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ak_GH.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ak_GH.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ak"/>
 		<territory type="GH"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/am.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/am.xml
similarity index 84%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/am.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/am.xml
index 3507a0bcd05..c362b7ffa94 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/am.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/am.xml
@@ -1,71 +1,143 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="am"/>
 	</identity>
 	<localeDisplayNames>
 		<localeDisplayPattern>
 			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>{0},{1}</localeSeparator>
+			<localeSeparator>{0}፣{1}</localeSeparator>
 			<localeKeyTypePattern>{0}: {1}</localeKeyTypePattern>
 		</localeDisplayPattern>
 		<languages>
 			<language type="aa">አፋርኛ</language>
 			<language type="ab">አብሐዚኛ</language>
+			<language type="ace">አቻይንኛ</language>
 			<language type="ach">አኮሊኛ</language>
+			<language type="ada">አዳንግሜ</language>
+			<language type="ady">አድይግሄ</language>
+			<language type="ae">አቬስታን</language>
 			<language type="af">አፍሪካንኛ</language>
+			<language type="afh">አፍሪሂሊ</language>
 			<language type="agq">አገም</language>
+			<language type="ain">አይኑ</language>
 			<language type="ak">አካንኛ</language>
+			<language type="akk">አካዲያን</language>
+			<language type="akz">አላባማ</language>
+			<language type="ale">አልዩት</language>
 			<language type="am">አማርኛ</language>
+			<language type="an">አራጎንስ</language>
+			<language type="anp">አንጊካ</language>
 			<language type="ar">ዓረብኛ</language>
 			<language type="ar_001">ዘመናዊ መደበኛ ዓረብኛ</language>
+			<language type="arc">አራማይክ</language>
 			<language type="arn">ማፑቼ</language>
+			<language type="aro">አራኦና</language>
+			<language type="arp">አራፓሆ</language>
+			<language type="arq">የአልጄሪያ ዓረብኛ</language>
+			<language type="arw">አራዋክ</language>
 			<language type="as">አሳሜዛዊ</language>
 			<language type="asa">አሱ</language>
+			<language type="ase">የአሜሪካ የምልክት ቋንቋ</language>
+			<language type="ast">አውስትሪያን</language>
+			<language type="av">አቫሪክ</language>
+			<language type="awa">አዋድሂ</language>
 			<language type="ay">አያማርኛ</language>
 			<language type="az">አዘርባጃንኛ</language>
 			<language type="az" alt="short">አዜሪ</language>
 			<language type="ba">ባስኪርኛ</language>
+			<language type="bal">ባሉቺ</language>
+			<language type="ban">ባሊኔስ</language>
+			<language type="bar">ባቫሪያን</language>
+			<language type="bas">ባሳ</language>
+			<language type="bax">ባሙን</language>
+			<language type="bbc">ባታካ ቶባ</language>
 			<language type="be">ቤላራሻኛ</language>
+			<language type="bej">ቤጃ</language>
 			<language type="bem">ቤምባ</language>
+			<language type="bew">ቤታዊ</language>
 			<language type="bez">ቤና</language>
+			<language type="bfd">ባፉት</language>
+			<language type="bfq">ባዳጋ</language>
 			<language type="bg">ቡልጋሪኛ</language>
+			<language type="bgn">የምዕራብ ባሎቺ</language>
+			<language type="bho">ቦጁሪ</language>
 			<language type="bi">ቢስላምኛ</language>
+			<language type="bik">ቢኮል</language>
+			<language type="bin">ቢኒ</language>
+			<language type="bjn">ባንጃር</language>
 			<language type="bm">ባምባርኛ</language>
 			<language type="bn">ቤንጋሊኛ</language>
 			<language type="bo">ቲቤታንኛ</language>
+			<language type="bpy">ቢሹንፑሪያ</language>
+			<language type="bqi">ባክህቲያሪ</language>
 			<language type="br">ብሬቶንኛ</language>
+			<language type="bra">ብራጅ</language>
+			<language type="brh">ብራሁዪ</language>
 			<language type="brx">ቦዶ</language>
 			<language type="bs">ቦስኒያንኛ</language>
+			<language type="bss">አኮስ</language>
+			<language type="bua">ቡሪያት</language>
+			<language type="bug">ቡጊኔዝ</language>
+			<language type="bum">ቡሉ</language>
 			<language type="byn">ብሊን</language>
 			<language type="ca">ካታላንኛ</language>
+			<language type="cad">ካዶ</language>
+			<language type="car">ካሪብ</language>
+			<language type="cay">ካዩጋ</language>
+			<language type="cch">አትሳም</language>
+			<language type="ce">ችችን</language>
+			<language type="ceb">ካቡዋኖ</language>
 			<language type="cgg">ቺጋኛ</language>
+			<language type="ch">ቻሞሮ</language>
+			<language type="chb">ቺብቻ</language>
+			<language type="chg">ቻጋታይ</language>
+			<language type="chk">ቹክስ</language>
+			<language type="chn">ቺኑክ ጃርጎን</language>
+			<language type="cho">ቾክታዋ</language>
+			<language type="chp">ቺፔውያን</language>
 			<language type="chr">ቼሮኬኛ</language>
+			<language type="chy">ችዬኔ</language>
 			<language type="ckb">የሶራኒ ኩርድኛ</language>
 			<language type="co">ኮርሲካኛ</language>
+			<language type="cop">ኮፕቲክ</language>
+			<language type="cps">ካፒዝኖን</language>
+			<language type="cr">ክሪ</language>
+			<language type="crh">ክሪሚያን ተርኪሽ</language>
 			<language type="cs">ቼክኛ</language>
+			<language type="cu">ቸርች ስላቪክ</language>
+			<language type="cv">ቹቫሽ</language>
 			<language type="cy">ወልሽ</language>
 			<language type="da">ዴኒሽ</language>
+			<language type="dak">ዳኮታ</language>
+			<language type="dar">ዳርግዋ</language>
 			<language type="dav">ታይታኛ</language>
 			<language type="de">ጀርመን</language>
 			<language type="de_AT">የኦስትሪያ ጀርመን</language>
 			<language type="de_CH">የስዊዝ ከፍተኛ ጀርመንኛ</language>
+			<language type="del">ዳላዌር</language>
+			<language type="dgr">ዶግሪብ</language>
+			<language type="din">ዲንካ</language>
 			<language type="dje">ዛርማኛ</language>
-			<language type="dsb">የታችኛው ሶርቢያንኛ</language>
+			<language type="doi">ዶግሪ</language>
+			<language type="dsb">የታችኛው ሰርቢያንኛ</language>
+			<language type="dtp">ሴንተራል ዱሰን</language>
 			<language type="dua">ዱዋላኛ</language>
 			<language type="dv">ዲቬህ</language>
 			<language type="dyo">ጆላ ፎንያኛ</language>
+			<language type="dyu">ድዩላ</language>
 			<language type="dz">ድዞንግኻኛ</language>
+			<language type="dzg">ዳዛጋ</language>
 			<language type="ebu">ኢቦኛ</language>
 			<language type="ee">ኢዊ</language>
 			<language type="efi">ኤፊክ</language>
+			<language type="egy">የጥንታዊ ግብጽኛ</language>
 			<language type="el">ግሪክኛ</language>
 			<language type="en">እንግሊዝኛ</language>
 			<language type="en_AU">የአውስትራሊያ እንግሊዝኛ</language>
@@ -75,9 +147,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="en_US">የአሜሪካ እንግሊዝኛ</language>
 			<language type="en_US" alt="short">የዩ ኤስ እንግሊዝኛ</language>
 			<language type="eo">ኤስፐራንቶ</language>
-			<language type="es">ስፓኒሽ</language>
+			<language type="es">ስፓንሽኛ</language>
 			<language type="es_419">የላቲን አሜሪካ ስፓኒሽ</language>
-			<language type="es_ES">የአውሮፓ እስፓንኛ</language>
+			<language type="es_ES">የአውሮፓ ስፓንሽኛ</language>
+			<language type="es_MX">የሜክሲኮ ስፓንሽኛ</language>
+			<language type="esu">ሴንተራል ዩፒክ</language>
 			<language type="et">ኢስቶኒያንኛ</language>
 			<language type="eu">ባስክኛ</language>
 			<language type="fa">ፐርሺያኛ</language>
@@ -88,6 +162,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="fr">ፈረንሳይኛ</language>
 			<language type="fr_CA">የካናዳ ፈረንሳይኛ</language>
 			<language type="fr_CH">የስዊዝ ፈረንሳይኛ</language>
+			<language type="frc">ካጁን ፍሬንች</language>
+			<language type="frp">አርፒታን</language>
 			<language type="fy">የምዕራብ ፍሪስኛ</language>
 			<language type="ga">አይሪሽ</language>
 			<language type="gaa">ጋ</language>
@@ -96,6 +172,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="gez">ግዕዝኛ</language>
 			<language type="gl">ጋሊሺያ</language>
 			<language type="gn">ጓራኒኛ</language>
+			<language type="grc">የጥንታዊ ግሪክ</language>
 			<language type="gsw">የስዊዝ ጀርመን</language>
 			<language type="gu">ጉጃርቲኛ</language>
 			<language type="guz">ጉስሊኛ</language>
@@ -141,6 +218,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ks">ካሽሚርኛ</language>
 			<language type="ksb">ሻምባላ</language>
 			<language type="ksf">ባፊያ</language>
+			<language type="ksh">ኮሎኝያን</language>
 			<language type="ku">ኩርድሽኛ</language>
 			<language type="kw">ኮርኒሽ</language>
 			<language type="ky">ኪርጊዝኛ</language>
@@ -152,6 +230,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ln">ሊንጋላኛ</language>
 			<language type="lo">ላውስኛ</language>
 			<language type="loz">ሎዚኛ</language>
+			<language type="lrc">ሰሜናዊ ሉሪ</language>
 			<language type="lt">ሉቴንያንኛ</language>
 			<language type="lu">ሉባ ካታንጋ</language>
 			<language type="lua">ሉባ-ሉሏ</language>
@@ -173,12 +252,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ms">ማላይኛ</language>
 			<language type="mt">ማልቲስኛ</language>
 			<language type="mua">ሙንዳንግ</language>
+			<language type="mus">ክሪክ</language>
 			<language type="my">ቡርማኛ</language>
+			<language type="mzn">ማዛንደራኒ</language>
 			<language type="na">ናኡሩ</language>
 			<language type="naq">ናማ</language>
 			<language type="nb">የኖርዌይ ቦክማል</language>
 			<language type="nd">ሰሜን ንዴብሌ</language>
+			<language type="nds">የታችኛው ጀርመን</language>
+			<language type="nds_NL">የታችኛው ሳክሰን</language>
 			<language type="ne">ኔፓሊኛ</language>
+			<language type="njo">ኦ ናጋ</language>
 			<language type="nl">ደች</language>
 			<language type="nl_BE">ፍሌሚሽ</language>
 			<language type="nmg">ክዋሲዮ</language>
@@ -187,6 +271,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nqo">ንኮ</language>
 			<language type="nso">ሰሜናዊ ሶቶ</language>
 			<language type="nus">ኑዌር</language>
+			<language type="nwc">ክላሲክ ኔዋሪ</language>
 			<language type="ny">ንያንጃ</language>
 			<language type="nyn">ኒያንኮልኛ</language>
 			<language type="oc">ኦኪታንኛ</language>
@@ -202,24 +287,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="pt_PT">የአውሮፓ ፖርቹጋልኛ</language>
 			<language type="qu">ኵቿኛ</language>
 			<language type="quc">ኪቼ</language>
+			<language type="qug">ቺምቦራዞ ሃይላንድ ኩቹዋ</language>
 			<language type="rm">ሮማንሽ</language>
 			<language type="rn">ሩንዲኛ</language>
 			<language type="ro">ሮማኒያን</language>
 			<language type="ro_MD">ሞልዳቫዊና</language>
 			<language type="rof">ሮምቦ</language>
-			<language type="ru">ራሽኛ</language>
+			<language type="ru">ራሽያኛ</language>
+			<language type="rup">አሮማንያን</language>
 			<language type="rw">ኪንያርዋንድኛ</language>
 			<language type="rwk">ርዋ</language>
 			<language type="sa">ሳንስክሪትኛ</language>
 			<language type="saq">ሳምቡሩ</language>
 			<language type="sbp">ሳንጉ</language>
 			<language type="sd">ሲንድሂኛ</language>
+			<language type="sdh">ደቡባዊ ኩዲሽ</language>
 			<language type="se">ሰሜናዊ ሳሚ</language>
 			<language type="seh">ሴና</language>
 			<language type="ses">ኮይራቦሮ ሴኒ</language>
 			<language type="sg">ሳንጎኛ</language>
 			<language type="sh" draft="unconfirmed">ሰርቦ-ክሮኤሽያኛ</language>
 			<language type="shi">ታቼልሂት</language>
+			<language type="shu">ቻዲያን ዓረብኛ</language>
 			<language type="si">ሲንሃልኛ</language>
 			<language type="sid">ሲዳምኛ</language>
 			<language type="sk">ስሎቫክኛ</language>
@@ -238,7 +327,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="su">ሱዳንኛ</language>
 			<language type="sv">ስዊድንኛ</language>
 			<language type="sw">ስዋሂሊኛ</language>
-			<language type="swc">ኮንጎ ስዋሂሊ</language>
+			<language type="sw_CD">ኮንጎ ስዋሂሊ</language>
+			<language type="swb">ኮሞሪያን</language>
+			<language type="syc">ክላሲክ ኔይራ</language>
 			<language type="ta">ታሚልኛ</language>
 			<language type="te">ተሉጉኛ</language>
 			<language type="teo">ቴሶ</language>
@@ -272,12 +363,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="vi">ቪትናምኛ</language>
 			<language type="vo">ቮላፑክኛ</language>
 			<language type="vun">ቩንጆ</language>
+			<language type="wbp">ዋርልፒሪ</language>
 			<language type="wo">ዎሎፍኛ</language>
 			<language type="xh">ዞሳኛ</language>
 			<language type="xog">ሶጋ</language>
 			<language type="yi">ይዲሽኛ</language>
 			<language type="yo">ዮሩባዊኛ</language>
+			<language type="yue">ካንቶኒዝ</language>
 			<language type="za">ዡዋንግኛ</language>
+			<language type="zbl">ብሊስይምቦልስ</language>
 			<language type="zgh">መደበኛ የሞሮኮ ታማዚግት</language>
 			<language type="zh">ቻይንኛ</language>
 			<language type="zh_Hans">ቀለል ያለ ቻይንኛ</language>
@@ -393,7 +487,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">አንጉኢላ</territory>
 			<territory type="AL">አልባኒያ</territory>
 			<territory type="AM">አርሜኒያ</territory>
-			<territory type="AN">ኔዘርላንድስ አንቲልስ</territory>
 			<territory type="AO">አንጐላ</territory>
 			<territory type="AQ">አንታርክቲካ</territory>
 			<territory type="AR">አርጀንቲና</territory>
@@ -566,7 +659,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="NG">ናይጄሪያ</territory>
 			<territory type="NI">ኒካራጓ</territory>
 			<territory type="NL">ኔዘርላንድ</territory>
-			<territory type="NO">ኖርዌ</territory>
+			<territory type="NO">ኖርዌይ</territory>
 			<territory type="NP">ኔፓል</territory>
 			<territory type="NR">ናኡሩ</territory>
 			<territory type="NU">ኒኡይ</territory>
@@ -592,7 +685,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="RE">ሪዩኒየን</territory>
 			<territory type="RO">ሮሜኒያ</territory>
 			<territory type="RS">ሰርብያ</territory>
-			<territory type="RU">ራሺያ</territory>
+			<territory type="RU">ራሽያ</territory>
 			<territory type="RW">ሩዋንዳ</territory>
 			<territory type="SA">ሳውድአረቢያ</territory>
 			<territory type="SB">ሰሎሞን ደሴት</territory>
@@ -669,6 +762,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric">የቁጥር ድርደራ</key>
 			<key type="colStrength">የድርደራ አቅም</key>
 			<key type="currency">ገንዘብ</key>
+			<key type="hc">የሰዓት ዑደት (12 ወይም 24)</key>
+			<key type="lb">መስመር መስበሪያ ቅጥ</key>
+			<key type="ms">የመለኪያ ስርዓት</key>
 			<key type="numbers">ቁጥሮች</key>
 			<key type="timezone">የሰዓት ሰቅ</key>
 			<key type="va">የአካባቢ አይነት</key>
@@ -676,95 +772,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">ለግል ጥቅም</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">የአረቢክ-ኢንዲክ አሃዞች</type>
-			<type type="arabext" key="numbers">የተራዘሙ የአረቢክ-ኢንዲክ አሃዞች</type>
-			<type type="armn" key="numbers">የአርመንኛ ቁጥሮች</type>
-			<type type="armnlow" key="numbers">የአሜሪካን ንዑስ ሆሄ አሃዞች</type>
-			<type type="beng" key="numbers">የቤንጋሊ አሃዞች</type>
-			<type type="big5han" key="collation">የባህላዊ ቻይንኛ የድርድር ቅደም ተከተል - ትልቅ5</type>
-			<type type="buddhist" key="calendar">የቡዲስት ቀን አቆጣጠር</type>
-			<type type="chinese" key="calendar">የቻይና የቀን አቆጣጠር</type>
-			<type type="coptic" key="calendar">የኮፕቲክ የቀን አቆጣጠር</type>
-			<type type="dangi" key="calendar">የዳንጊ የቀን አቆጣጠር</type>
-			<type type="deva" key="numbers">የዴቫንጋሪ አሃዞች</type>
-			<type type="dictionary" key="collation">የመዝገበ ቃላት የድርድር ቅደም ተከተል</type>
-			<type type="ducet" key="collation">የነባሪ ዩኒኮድ የድርድር ቅደም ተከተል</type>
-			<type type="ethi" key="numbers">የኢትዮፒክ ቁጥሮች</type>
-			<type type="ethiopic" key="calendar">የኢትዮጵያ የቀን አቆጣጠር</type>
-			<type type="ethiopic-amete-alem" key="calendar">የኢትዮፒክ አመተ አለም የቀን አቆጣጠር</type>
-			<type type="finance" key="numbers">የፋይናንስ ቁጥሮች</type>
-			<type type="fullwide" key="numbers">የሙሉ ወርድ አሃዞች</type>
-			<type type="gb2312han" key="collation">የቀለለ የቻይንኛ የድርደራ ቅደም ተከተል - GB2312</type>
-			<type type="geor" key="numbers">የጆርጂያን ቁጥሮች</type>
-			<type type="gregorian" key="calendar">የግሪጎሪያን ቀን አቆጣጠር</type>
-			<type type="grek" key="numbers">የግሪክ ቁጥሮች</type>
-			<type type="greklow" key="numbers">የግሪክ ንዑስ ሆሄ ቁጥሮች</type>
-			<type type="gujr" key="numbers">የጉጃራቲ አሃዞች</type>
-			<type type="guru" key="numbers">የጉርሙኪ አሃዞች</type>
-			<type type="hanidec" key="numbers">የቻይንኛ አስርዮሽ ቁጥሮች</type>
-			<type type="hans" key="numbers">ቀለል ያሉ የቻይንኛ ቁጥሮች</type>
-			<type type="hansfin" key="numbers">ቀለል ያሉ የቻይንኛ ገንዘብ ነክ ቁጥሮች</type>
-			<type type="hant" key="numbers">የባህላዊ ቻይንኛ ቁጥሮች</type>
-			<type type="hantfin" key="numbers">የባህላዊ ቻይንኛ የገንዘብ ነክ ቁጥሮች</type>
-			<type type="hebr" key="numbers">የእብራይስጥ ቁጥሮች</type>
-			<type type="hebrew" key="calendar">የእብራዊያን የቀን አቆጣጠር</type>
-			<type type="identical" key="colStrength">ሁሉንም ደርድር</type>
-			<type type="indian" key="calendar">የህንድ ብሔራዊ የቀን አቆጣጠር</type>
-			<type type="islamic" key="calendar">የእስላማዊ የሰዓት አቆጣጠር</type>
-			<type type="islamic-civil" key="calendar">የእስላም ህዝባዊ የቀን አቆጣጠር</type>
-			<type type="iso8601" key="calendar">ISO-8601 የቀን አቆጣጠር</type>
-			<type type="japanese" key="calendar">የጃፓን የቀን አቆጣጠር</type>
-			<type type="jpan" key="numbers">የጃፓንኛ ቁጥሮች</type>
-			<type type="jpanfin" key="numbers">የጃፓንኛ የገንዘብ ነክ ቁጥሮች</type>
-			<type type="khmr" key="numbers">የክህመር አሃዞች</type>
-			<type type="knda" key="numbers">የካንአዳ አሃዞች</type>
-			<type type="laoo" key="numbers">የላኦ አሃዞች</type>
-			<type type="latn" key="numbers">የምስራቃዊ አሃዞች</type>
-			<type type="lower" key="colCaseFirst">ንዑስ ሆሄ መጀመሪያ ደርድር</type>
-			<type type="mlym" key="numbers">የማላያላምኛ አሃዞች</type>
-			<type type="mong" key="numbers">የሞንጎልኛ አሃዞች</type>
-			<type type="mymr" key="numbers">የማያንማር አሃዞች</type>
-			<type type="native" key="numbers">ትውልድ አሃዞች</type>
-			<type type="no" key="colBackwards">የፊደል ጭረቶችን እንደመደበኛ ደርድር</type>
-			<type type="no" key="colCaseFirst">መደበኛ የመልከፊደል አቀማመጥ ደርድር</type>
-			<type type="no" key="colCaseLevel">ያለመልከፊደል ትብ ደርድር</type>
-			<type type="no" key="colHiraganaQuaternary">ካና ለይተህ ደርድር</type>
-			<type type="no" key="colNormalization">ያለመደበኛ ሁኔታ ደርድር</type>
-			<type type="no" key="colNumeric">አሃዞችን በየግል ደርድር</type>
-			<type type="non-ignorable" key="colAlternate">ምልክቶችን ደርድር</type>
-			<type type="orya" key="numbers">የኦሪያኛ አሃዞች</type>
-			<type type="persian" key="calendar">የፐርሽያ የቀን አቆጣጠር</type>
-			<type type="phonebook" key="collation">የስልክ ደብተር ድርድር ቅደም ተከተል</type>
-			<type type="phonetic" key="collation">የፎነቲክ ድርደራ ቅደም ተከተል</type>
-			<type type="pinyin" key="collation">ፒንይን የድርድር ቅደም ተከተል</type>
-			<type type="primary" key="colStrength">የመሠረት ፊደላት ብቻ ደርድር</type>
-			<type type="quaternary" key="colStrength">የፊደል ጭረቶች/መልከፊደል/ስፋት/ካና ደርድር</type>
-			<type type="reformed" key="collation">ዳግም የተፈጠረ የድርድር ቅደም ተከተል</type>
-			<type type="roc" key="calendar">የሚንጉ የቀን አቆጣጠር</type>
-			<type type="roman" key="numbers">የሮማን ቁጥሮች</type>
-			<type type="romanlow" key="numbers">የሮማን ንዑስ ሆሄ ቁጥሮች</type>
-			<type type="search" key="collation">ለጠቅላላ ጉዳይ ፍለጋ</type>
-			<type type="searchjl" key="collation">በሃንጉል የመጀመሪያ ተነባቢ ፈልግ</type>
-			<type type="secondary" key="colStrength">የፊደል ጭረቶችን ደርድር</type>
-			<type type="shifted" key="colAlternate">ችላ ባይ ምልክቶችን ደርድር</type>
-			<type type="standard" key="collation">መደበኛ</type>
-			<type type="stroke" key="collation">የበትር ድርድር ቅደም ተከተል</type>
-			<type type="taml" key="numbers">ባህላዊ የታሚል ቁጥሮች</type>
-			<type type="tamldec" key="numbers">የታሚል አሃዞች</type>
-			<type type="telu" key="numbers">የተልጉ አሃዞች</type>
-			<type type="tertiary" key="colStrength">የፊደል ጭረቶች/መልከፊደል/ስፋት ደርድር</type>
-			<type type="thai" key="numbers">የታይ አሃዞች</type>
-			<type type="tibt" key="numbers">የቲቤታን አሃዞች</type>
-			<type type="traditional" key="collation">ባህላዊ የድርድር ቅደም ተከተል</type>
-			<type type="traditional" key="numbers">ተለምዷዊ ቁጥሮች</type>
-			<type type="unihan" key="collation">የመሰረታዊ በትር ድርድር ቅደም ተከተል</type>
-			<type type="upper" key="colCaseFirst">አቢይ ሆሄ መጀመሪያ ደርድር</type>
-			<type type="vaii" key="numbers">የቫይ አሃዞች</type>
-			<type type="yes" key="colBackwards">የፊደል ጭረቶች በኋሊዮሽ ደርድር</type>
-			<type type="yes" key="colCaseLevel">በመልከፊደል ትብ ደርድር</type>
-			<type type="yes" key="colHiraganaQuaternary">ካና ለይተህ ደርድር</type>
-			<type type="yes" key="colNormalization">ዩኒኮድ በመደበኛ ሁኔታ ደርድር</type>
-			<type type="yes" key="colNumeric">አሃዞች በቁጥር ደርድር</type>
+			<type key="calendar" type="buddhist">የቡዲስት ቀን አቆጣጠር</type>
+			<type key="calendar" type="chinese">የቻይና የቀን አቆጣጠር</type>
+			<type key="calendar" type="coptic">የኮፕቲክ የቀን አቆጣጠር</type>
+			<type key="calendar" type="dangi">የዳንጊ የቀን አቆጣጠር</type>
+			<type key="calendar" type="ethiopic">የኢትዮጵያ የቀን አቆጣጠር</type>
+			<type key="calendar" type="ethiopic-amete-alem">የኢትዮፒክ አመተ አለም የቀን አቆጣጠር</type>
+			<type key="calendar" type="gregorian">የግሪጎሪያን የቀን አቆጣጠር</type>
+			<type key="calendar" type="hebrew">የእብራዊያን የቀን አቆጣጠር</type>
+			<type key="calendar" type="indian">የህንድ ብሔራዊ የቀን አቆጣጠር</type>
+			<type key="calendar" type="islamic">የእስላማዊ የሰዓት አቆጣጠር</type>
+			<type key="calendar" type="islamic-civil">የእስላም ህዝባዊ የቀን አቆጣጠር</type>
+			<type key="calendar" type="iso8601">ISO-8601 የቀን አቆጣጠር</type>
+			<type key="calendar" type="japanese">የጃፓን የቀን አቆጣጠር</type>
+			<type key="calendar" type="persian">የፐርሽያ የቀን አቆጣጠር</type>
+			<type key="calendar" type="roc">የሚንጉ የቀን አቆጣጠር</type>
+			<type key="colAlternate" type="non-ignorable">ምልክቶችን ደርድር</type>
+			<type key="colAlternate" type="shifted">ችላ ባይ ምልክቶችን ደርድር</type>
+			<type key="colBackwards" type="no">የፊደል ጭረቶችን እንደመደበኛ ደርድር</type>
+			<type key="colBackwards" type="yes">የፊደል ጭረቶች በኋሊዮሽ ደርድር</type>
+			<type key="colCaseFirst" type="lower">ንዑስ ሆሄ መጀመሪያ ደርድር</type>
+			<type key="colCaseFirst" type="no">መደበኛ የመልከፊደል አቀማመጥ ደርድር</type>
+			<type key="colCaseFirst" type="upper">አቢይ ሆሄ መጀመሪያ ደርድር</type>
+			<type key="colCaseLevel" type="no">ያለመልከፊደል ትብ ደርድር</type>
+			<type key="colCaseLevel" type="yes">በመልከፊደል ትብ ደርድር</type>
+			<type key="colHiraganaQuaternary" type="no">ካና ለይተህ ደርድር</type>
+			<type key="colHiraganaQuaternary" type="yes">ካና ለይተህ ደርድር</type>
+			<type key="collation" type="big5han">የባህላዊ ቻይንኛ የድርድር ቅደም ተከተል - ትልቅ5</type>
+			<type key="collation" type="dictionary">የመዝገበ ቃላት የድርድር ቅደም ተከተል</type>
+			<type key="collation" type="ducet">የነባሪ ዩኒኮድ የድርድር ቅደም ተከተል</type>
+			<type key="collation" type="gb2312han">የቀለለ የቻይንኛ የድርደራ ቅደም ተከተል - GB2312</type>
+			<type key="collation" type="phonebook">የስልክ ደብተር ድርድር ቅደም ተከተል</type>
+			<type key="collation" type="phonetic">የፎነቲክ ድርደራ ቅደም ተከተል</type>
+			<type key="collation" type="pinyin">ፒንይን የድርድር ቅደም ተከተል</type>
+			<type key="collation" type="reformed">ዳግም የተፈጠረ የድርድር ቅደም ተከተል</type>
+			<type key="collation" type="search">ለጠቅላላ ጉዳይ ፍለጋ</type>
+			<type key="collation" type="searchjl">በሃንጉል የመጀመሪያ ተነባቢ ፈልግ</type>
+			<type key="collation" type="standard">መደበኛ</type>
+			<type key="collation" type="stroke">የበትር ድርድር ቅደም ተከተል</type>
+			<type key="collation" type="traditional">ባህላዊ የድርድር ቅደም ተከተል</type>
+			<type key="collation" type="unihan">የመሰረታዊ በትር ድርድር ቅደም ተከተል</type>
+			<type key="colNormalization" type="no">ያለመደበኛ ሁኔታ ደርድር</type>
+			<type key="colNormalization" type="yes">ዩኒኮድ በመደበኛ ሁኔታ ደርድር</type>
+			<type key="colNumeric" type="no">አሃዞችን በየግል ደርድር</type>
+			<type key="colNumeric" type="yes">አሃዞች በቁጥር ደርድር</type>
+			<type key="colStrength" type="identical">ሁሉንም ደርድር</type>
+			<type key="colStrength" type="primary">የመሠረት ፊደላት ብቻ ደርድር</type>
+			<type key="colStrength" type="quaternary">የፊደል ጭረቶች/መልከፊደል/ስፋት/ካና ደርድር</type>
+			<type key="colStrength" type="secondary">የፊደል ጭረቶችን ደርድር</type>
+			<type key="colStrength" type="tertiary">የፊደል ጭረቶች/መልከፊደል/ስፋት ደርድር</type>
+			<type key="hc" type="h11">የ12 ሰዓት ስርዓት (0–11)</type>
+			<type key="hc" type="h12">የ12 ሰዓት ስርዓት (1–12)</type>
+			<type key="hc" type="h23">የ24 ሰዓት ስርዓት (0–23)</type>
+			<type key="hc" type="h24">የ24 ሰዓት ስርዓት (1–24)</type>
+			<type key="lb" type="loose">ላላ ያለ መስመር መስበሪያ ቅጥ</type>
+			<type key="lb" type="normal">መደበኛ መስመር መስበሪያ ቅጥ</type>
+			<type key="lb" type="strict">ጠበቅ ያለ መስመር መስበሪያ ቅጥ</type>
+			<type key="ms" type="metric">የልኬት ስርዓት</type>
+			<type key="ms" type="uksystem">ኢምፔሪያል የመለኪያ ስርዓት</type>
+			<type key="ms" type="ussystem">የአሜሪካ መለኪያ ስርዓት</type>
+			<type key="numbers" type="arab">የአረቢክ-ኢንዲክ አሃዞች</type>
+			<type key="numbers" type="arabext">የተራዘሙ የአረቢክ-ኢንዲክ አሃዞች</type>
+			<type key="numbers" type="armn">የአርመንኛ ቁጥሮች</type>
+			<type key="numbers" type="armnlow">የአሜሪካን ንዑስ ሆሄ አሃዞች</type>
+			<type key="numbers" type="beng">የቤንጋሊ አሃዞች</type>
+			<type key="numbers" type="deva">የዴቫንጋሪ አሃዞች</type>
+			<type key="numbers" type="ethi">የኢትዮፒክ ቁጥሮች</type>
+			<type key="numbers" type="finance">የፋይናንስ ቁጥሮች</type>
+			<type key="numbers" type="fullwide">የሙሉ ወርድ አሃዞች</type>
+			<type key="numbers" type="geor">የጆርጂያን ቁጥሮች</type>
+			<type key="numbers" type="grek">የግሪክ ቁጥሮች</type>
+			<type key="numbers" type="greklow">የግሪክ ንዑስ ሆሄ ቁጥሮች</type>
+			<type key="numbers" type="gujr">የጉጃራቲ አሃዞች</type>
+			<type key="numbers" type="guru">የጉርሙኪ አሃዞች</type>
+			<type key="numbers" type="hanidec">የቻይንኛ አስርዮሽ ቁጥሮች</type>
+			<type key="numbers" type="hans">ቀለል ያሉ የቻይንኛ ቁጥሮች</type>
+			<type key="numbers" type="hansfin">ቀለል ያሉ የቻይንኛ ገንዘብ ነክ ቁጥሮች</type>
+			<type key="numbers" type="hant">የባህላዊ ቻይንኛ ቁጥሮች</type>
+			<type key="numbers" type="hantfin">የባህላዊ ቻይንኛ የገንዘብ ነክ ቁጥሮች</type>
+			<type key="numbers" type="hebr">የእብራይስጥ ቁጥሮች</type>
+			<type key="numbers" type="jpan">የጃፓንኛ ቁጥሮች</type>
+			<type key="numbers" type="jpanfin">የጃፓንኛ የገንዘብ ነክ ቁጥሮች</type>
+			<type key="numbers" type="khmr">የክህመር አሃዞች</type>
+			<type key="numbers" type="knda">የካንአዳ አሃዞች</type>
+			<type key="numbers" type="laoo">የላኦ አሃዞች</type>
+			<type key="numbers" type="latn">የምስራቃዊ አሃዞች</type>
+			<type key="numbers" type="mlym">የማላያላምኛ አሃዞች</type>
+			<type key="numbers" type="mong">የሞንጎልኛ አሃዞች</type>
+			<type key="numbers" type="mymr">የማያንማር አሃዞች</type>
+			<type key="numbers" type="native">ትውልድ አሃዞች</type>
+			<type key="numbers" type="orya">የኦሪያኛ አሃዞች</type>
+			<type key="numbers" type="roman">የሮማን ቁጥሮች</type>
+			<type key="numbers" type="romanlow">የሮማን ንዑስ ሆሄ ቁጥሮች</type>
+			<type key="numbers" type="taml">ባህላዊ የታሚል ቁጥሮች</type>
+			<type key="numbers" type="tamldec">የታሚል አሃዞች</type>
+			<type key="numbers" type="telu">የተልጉ አሃዞች</type>
+			<type key="numbers" type="thai">የታይ አሃዞች</type>
+			<type key="numbers" type="tibt">የቲቤታን አሃዞች</type>
+			<type key="numbers" type="traditional">ተለምዷዊ ቁጥሮች</type>
+			<type key="numbers" type="vaii">የቫይ አሃዞች</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN">ቢ ጂ ኤን</transformName>
@@ -810,6 +916,194 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</delimiters>
 	<dates>
 		<calendars>
+			<calendar type="buddhist">
+				<eras>
+					<eraNames>
+						<era type="0">BE</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">BE</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0">BE</era>
+					</eraNarrow>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE፣ d MMMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d MMMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>d MMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>dd/MM/y GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
+						<dateFormatItem id="Ed">E d</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM፣ y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">MMM d፣ y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E MMM d፣ y G</dateFormatItem>
+						<dateFormatItem id="M">L</dateFormatItem>
+						<dateFormatItem id="Md">M/d</dateFormatItem>
+						<dateFormatItem id="MEd">E፣ M/d</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
+						<dateFormatItem id="MMMEd">E፣ MMM d</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
+						<dateFormatItem id="MMMMEd">E፣ MMMM d</dateFormatItem>
+						<dateFormatItem id="y">y</dateFormatItem>
+						<dateFormatItem id="yM">M/y</dateFormatItem>
+						<dateFormatItem id="yMd">d/M/y</dateFormatItem>
+						<dateFormatItem id="yMEd">E፣ d/M/y</dateFormatItem>
+						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMEd">E፣ MMM d y</dateFormatItem>
+						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
+						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
+						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
+						<dateFormatItem id="yyyy">G y</dateFormatItem>
+						<dateFormatItem id="yyyyM">GGGGG y-MM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">GGGGG y-MM-dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">GGGGG y-MM-dd, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">G y MMM</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">G y MMM d</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y MMM d, E</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">G y QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">G y QQQQ</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d–d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">h a – h a</greatestDifference>
+							<greatestDifference id="h">h – h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">h a – h a v</greatestDifference>
+							<greatestDifference id="h">h – h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">M–M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">d–d/M</greatestDifference>
+							<greatestDifference id="M">d/M – d/M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">E d/M – E d/M</greatestDifference>
+							<greatestDifference id="M">E፣ d/M – E፣ d/M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">MMM–MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">MMM d–d</greatestDifference>
+							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">E d – E d፣ MMM</greatestDifference>
+							<greatestDifference id="M">E፣ MMM d – E፣ MMM d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">M/y – M/y</greatestDifference>
+							<greatestDifference id="y">M/y – M/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">d/M/y – d/M/y</greatestDifference>
+							<greatestDifference id="M">d/M/y – d/M/y</greatestDifference>
+							<greatestDifference id="y">d/M/y – d/M/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">E፣ d/M/y – E፣ d/M/y</greatestDifference>
+							<greatestDifference id="M">E d/M/ – E d/M፣ y</greatestDifference>
+							<greatestDifference id="y">E፣ d/M/y – E፣ d/M/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">MMM–MMM፣ y</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">MMM d–d፣ y</greatestDifference>
+							<greatestDifference id="M">MMM d – MMM d፣ y</greatestDifference>
+							<greatestDifference id="y">MMM d፣ y – MMM d፣ y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">E MMM d – E MMM d፣ y</greatestDifference>
+							<greatestDifference id="M">E MMM d – E MMM d፣ y</greatestDifference>
+							<greatestDifference id="y">E፣ MMM d፣ y – E፣ MMM d፣ y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">MMMM–MMMM y</greatestDifference>
+							<greatestDifference id="y">MMMM y – MMMM y</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
 			<calendar type="coptic">
 				<eras>
 					<eraAbbr>
@@ -822,19 +1116,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<months>
 					<monthContext type="format">
 						<monthWidth type="abbreviated">
-							<month type="1">መስከ</month>
-							<month type="2">ጥቅም</month>
+							<month type="1">መስከረም</month>
+							<month type="2">ጥቅምት</month>
 							<month type="3">ኅዳር</month>
-							<month type="4">ታኅሣ</month>
+							<month type="4">ታኅሣሥ</month>
 							<month type="5">ጥር</month>
-							<month type="6">የካቲ</month>
-							<month type="7">መጋቢ</month>
-							<month type="8">ሚያዝ</month>
-							<month type="9">ግንቦ</month>
+							<month type="6">የካቲት</month>
+							<month type="7">መጋቢት</month>
+							<month type="8">ሚያዝያ</month>
+							<month type="9">ግንቦት</month>
 							<month type="10">ሰኔ</month>
 							<month type="11">ሐምሌ</month>
 							<month type="12">ነሐሴ</month>
-							<month type="13">ጳጉሜ</month>
+							<month type="13">ጳጉሜን</month>
 						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">1</month>
@@ -869,19 +1163,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</monthContext>
 					<monthContext type="stand-alone">
 						<monthWidth type="abbreviated">
-							<month type="1">መስከ</month>
-							<month type="2">ጥቅም</month>
+							<month type="1">መስከረም</month>
+							<month type="2">ጥቅምት</month>
 							<month type="3">ኅዳር</month>
-							<month type="4">ታኅሣ</month>
+							<month type="4">ታኅሣሥ</month>
 							<month type="5">ጥር</month>
-							<month type="6">የካቲ</month>
-							<month type="7">መጋቢ</month>
-							<month type="8">ሚያዝ</month>
-							<month type="9">ግንቦ</month>
+							<month type="6">የካቲት</month>
+							<month type="7">መጋቢት</month>
+							<month type="8">ሚያዝያ</month>
+							<month type="9">ግንቦት</month>
 							<month type="10">ሰኔ</month>
 							<month type="11">ሐምሌ</month>
 							<month type="12">ነሐሴ</month>
-							<month type="13">ጳጉሜ</month>
+							<month type="13">ጳጉሜን</month>
 						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">1</month>
@@ -915,13 +1209,195 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</monthWidth>
 					</monthContext>
 				</months>
+				<eras>
+					<eraNames>
+						<era type="0">ERA0</era>
+						<era type="1">ERA1</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">ERA0</era>
+						<era type="1">ERA1</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0">ERA0</era>
+						<era type="1">ERA1</era>
+					</eraNarrow>
+				</eras>
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern draft="unconfirmed">EEEE፣ MMMM d ቀን y G</pattern>
+							<pattern>EEEE፣ d MMMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d MMMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>d MMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>dd/MM/y GGGGG</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
+						<dateFormatItem id="Ed">E d</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM፣ y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">MMM d፣ y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E MMM d፣ y G</dateFormatItem>
+						<dateFormatItem id="M">L</dateFormatItem>
+						<dateFormatItem id="Md">M/d</dateFormatItem>
+						<dateFormatItem id="MEd">E፣ M/d</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
+						<dateFormatItem id="MMMEd">E፣ MMM d</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
+						<dateFormatItem id="MMMMEd">E, MMMM d</dateFormatItem>
+						<dateFormatItem id="y">y</dateFormatItem>
+						<dateFormatItem id="yM">M/y</dateFormatItem>
+						<dateFormatItem id="yMd">d/M/y</dateFormatItem>
+						<dateFormatItem id="yMEd">E፣ d/M/y</dateFormatItem>
+						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMEd">E፣ MMM d y</dateFormatItem>
+						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
+						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
+						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
+						<dateFormatItem id="yyyy">G y</dateFormatItem>
+						<dateFormatItem id="yyyyM">GGGGG y-MM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">GGGGG y-MM-dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">GGGGG y-MM-dd, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">G y MMM</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">G y MMM d</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y MMM d, E</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">G y QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">G y QQQQ</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d–d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">h a – h a</greatestDifference>
+							<greatestDifference id="h">h – h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">h a – h a v</greatestDifference>
+							<greatestDifference id="h">h – h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">M–M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">d–d/M</greatestDifference>
+							<greatestDifference id="M">d/M – d/M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">E d/M – E d/M</greatestDifference>
+							<greatestDifference id="M">E፣ d/M – E፣ d/M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">MMM–MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">MMM d–d</greatestDifference>
+							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">E d – E d፣ MMM</greatestDifference>
+							<greatestDifference id="M">E፣ MMM d – E፣ MMM d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">M/y – M/y</greatestDifference>
+							<greatestDifference id="y">M/y – M/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">d/M/y – d/M/y</greatestDifference>
+							<greatestDifference id="M">d/M/y – d/M/y</greatestDifference>
+							<greatestDifference id="y">d/M/y – d/M/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">E፣ d/M/y – E፣ d/M/y</greatestDifference>
+							<greatestDifference id="M">E d/M/ – E d/M፣ y</greatestDifference>
+							<greatestDifference id="y">E፣ d/M/y – E፣ d/M/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">MMM–MMM፣ y</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">MMM d–d፣ y</greatestDifference>
+							<greatestDifference id="M">MMM d – MMM d፣ y</greatestDifference>
+							<greatestDifference id="y">MMM d፣ y – MMM d፣ y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">E MMM d – E MMM d፣ y</greatestDifference>
+							<greatestDifference id="M">E MMM d – E MMM d፣ y</greatestDifference>
+							<greatestDifference id="y">E፣ MMM d፣ y – E፣ MMM d፣ y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">MMMM–MMMM y</greatestDifference>
+							<greatestDifference id="y">MMMM y – MMMM y</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
 			</calendar>
 			<calendar type="generic">
 				<dateFormats>
@@ -969,6 +1445,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM፣ y G</dateFormatItem>
@@ -985,9 +1462,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MEd">E፣ M/d</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
+						<dateFormatItem id="MMMEd">E፣ MMM d</dateFormatItem>
 						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E, MMMM d</dateFormatItem>
+						<dateFormatItem id="MMMMEd">E፣ MMMM d</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">M/y</dateFormatItem>
@@ -1006,6 +1483,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">G y MMM</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">G y MMM d</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">G y MMM d, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">MMMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">G y QQQ</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">G y QQQQ</dateFormatItem>
 					</availableFormats>
@@ -1291,7 +1769,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</quarterWidth>
 						<quarterWidth type="wide">
 							<quarter type="1">1ኛው ሩብ</quarter>
-							<quarter type="2">ሁለተኛው ሩብ</quarter>
+							<quarter type="2">2ኛው ሩብ</quarter>
 							<quarter type="3">3ኛው ሩብ</quarter>
 							<quarter type="4">4ኛው ሩብ</quarter>
 						</quarterWidth>
@@ -1319,15 +1797,67 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">ጠ</dayPeriod>
-							<dayPeriod type="noon">ቀ</dayPeriod>
-							<dayPeriod type="pm">ከ</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">እኩለ ሌሊት</dayPeriod>
 							<dayPeriod type="am">ጥዋት</dayPeriod>
 							<dayPeriod type="noon">ቀትር</dayPeriod>
 							<dayPeriod type="pm">ከሰዓት</dayPeriod>
+							<dayPeriod type="morning1">ጥዋት1</dayPeriod>
+							<dayPeriod type="afternoon1">ከሰዓት1</dayPeriod>
+							<dayPeriod type="evening1">ማታ1</dayPeriod>
+							<dayPeriod type="night1">ሌሊት1</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">እኩለ ሌሊት</dayPeriod>
+							<dayPeriod type="am">ጠ</dayPeriod>
+							<dayPeriod type="noon">ቀ</dayPeriod>
+							<dayPeriod type="pm">ከ</dayPeriod>
+							<dayPeriod type="morning1">ጥዋት1</dayPeriod>
+							<dayPeriod type="afternoon1">ከሰዓት1</dayPeriod>
+							<dayPeriod type="evening1">ማታ1</dayPeriod>
+							<dayPeriod type="night1">ሌሊት1</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">እኩለ ሌሊት</dayPeriod>
+							<dayPeriod type="am">ጥዋት</dayPeriod>
+							<dayPeriod type="noon">ቀትር</dayPeriod>
+							<dayPeriod type="pm">ከሰዓት</dayPeriod>
+							<dayPeriod type="morning1">ጥዋት1</dayPeriod>
+							<dayPeriod type="afternoon1">ከሰዓት1</dayPeriod>
+							<dayPeriod type="evening1">ማታ1</dayPeriod>
+							<dayPeriod type="night1">ሌሊት1</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">እኩለ ሌሊት</dayPeriod>
+							<dayPeriod type="am">ጥዋት</dayPeriod>
+							<dayPeriod type="noon">ቀትር</dayPeriod>
+							<dayPeriod type="pm">ከሰዓት</dayPeriod>
+							<dayPeriod type="morning1">ጥዋት1</dayPeriod>
+							<dayPeriod type="afternoon1">ከሰዓት በኋላ</dayPeriod>
+							<dayPeriod type="evening1">ማታ</dayPeriod>
+							<dayPeriod type="night1">ሌሊት</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">እኩለ ሌሊት</dayPeriod>
+							<dayPeriod type="am">ጠ</dayPeriod>
+							<dayPeriod type="noon">ቀትር</dayPeriod>
+							<dayPeriod type="pm">ከ</dayPeriod>
+							<dayPeriod type="morning1">ጥዋት</dayPeriod>
+							<dayPeriod type="afternoon1">ከሰዓት በኋላ</dayPeriod>
+							<dayPeriod type="evening1">ማታ</dayPeriod>
+							<dayPeriod type="night1">ሌሊት</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">እኩለ ሌሊት</dayPeriod>
+							<dayPeriod type="am">ጥዋት</dayPeriod>
+							<dayPeriod type="noon">ቀትር</dayPeriod>
+							<dayPeriod type="pm">ከሰዓት</dayPeriod>
+							<dayPeriod type="morning1">ጥዋት1</dayPeriod>
+							<dayPeriod type="afternoon1">ከሰዓት በኋላ</dayPeriod>
+							<dayPeriod type="evening1">ማታ</dayPeriod>
+							<dayPeriod type="night1">ሌሊት</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1336,19 +1866,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<era type="0">ዓመተ ዓለም</era>
 						<era type="0" alt="variant">BCE</era>
 						<era type="1">ዓመተ ምሕረት</era>
-						<era type="1" alt="variant">CE</era>
+						<era type="1" alt="variant">ዓ/ም</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">ዓ/ዓ</era>
 						<era type="0" alt="variant">BCE</era>
 						<era type="1">ዓ/ም</era>
-						<era type="1" alt="variant">CE</era>
 					</eraAbbr>
+					<eraNarrow>
+						<era type="0">ዓ/ዓ</era>
+						<era type="1">ዓ/ም</era>
+					</eraNarrow>
 				</eras>
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern>EEEE, d MMMM y</pattern>
+							<pattern>EEEE ፣d MMMM y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
@@ -1428,14 +1961,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
-						<dateFormatItem id="MEd">E, M/d</dateFormatItem>
+						<dateFormatItem id="MEd">E፣ M/d</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
+						<dateFormatItem id="MMMEd">E፣ MMM d</dateFormatItem>
 						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E, MMMM d</dateFormatItem>
+						<dateFormatItem id="MMMMEd">E፣ MMMM d</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">M/y</dateFormatItem>
@@ -1589,6 +2126,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>ዓመት</displayName>
+				<relative type="-1">ያለፈው ዓመት</relative>
+				<relative type="0">በዚህ ዓመት</relative>
+				<relative type="1">የሚቀጥለው ዓመት</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">በ{0} ዓመታት ውስጥ</relativeTimePattern>
 					<relativeTimePattern count="other">በ{0} ዓመታት ውስጥ</relativeTimePattern>
@@ -1600,6 +2140,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>ዓመት</displayName>
+				<relative type="-1">ያለፈው ዓመት</relative>
+				<relative type="0">በዚህ ዓመት</relative>
+				<relative type="1">የሚቀጥለው ዓመት</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">በ{0} ዓመታት ውስጥ</relativeTimePattern>
 					<relativeTimePattern count="other">በ{0} ዓመታት ውስጥ</relativeTimePattern>
@@ -1611,35 +2154,44 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter">
 				<displayName>ሩብ</displayName>
+				<relative type="-1">የመጨረሻው ሩብ</relative>
+				<relative type="0">ይህ ሩብ</relative>
+				<relative type="1">የሚቀጥለው ሩብ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} ሩብ</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} ሩብ</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} Q ሩብ</relativeTimePattern>
-					<relativeTimePattern count="other">-{0} Q ሩብ</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ሩብ በፊት</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ሩብ በፊት</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-short">
 				<displayName>ሩብ</displayName>
+				<relative type="-1">የመጨረሻው ሩብ</relative>
+				<relative type="0">ይህ ሩብ</relative>
+				<relative type="1">የሚቀጥለው ሩብ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} ሩብ</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} ሩብ</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} Q ሩብ</relativeTimePattern>
-					<relativeTimePattern count="other">-{0} Q ሩብ</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ሩብ በፊት</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ሩብ በፊት</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-narrow">
 				<displayName>ሩብ</displayName>
+				<relative type="-1">የመጨረሻው ሩብ</relative>
+				<relative type="0">ይህ ሩብ</relative>
+				<relative type="1">የሚቀጥለው ሩብ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} ሩብ</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} ሩብ</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} Q ሩብ</relativeTimePattern>
-					<relativeTimePattern count="other">-{0} Q ሩብ</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ሩብ በፊት</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ሩብ በፊት</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month">
@@ -1658,6 +2210,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>ወር</displayName>
+				<relative type="-1">ያለፈው ወር</relative>
+				<relative type="0">በዚህ ወር</relative>
+				<relative type="1">የሚቀጥለው ወር</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">በ{0} ወራት ውስጥ</relativeTimePattern>
 					<relativeTimePattern count="other">በ{0} ወራት ውስጥ</relativeTimePattern>
@@ -1669,6 +2224,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>ወር</displayName>
+				<relative type="-1">ያለፈው ወር</relative>
+				<relative type="0">በዚህ ወር</relative>
+				<relative type="1">የሚቀጥለው ወር</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">በ{0} ወራት ውስጥ</relativeTimePattern>
 					<relativeTimePattern count="other">በ{0} ወራት ውስጥ</relativeTimePattern>
@@ -1680,7 +2238,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week">
 				<displayName>ሳምንት</displayName>
-				<relative type="-1">ባለፈው ሳምንት</relative>
+				<relative type="-1">ያለፈው ሳምንት</relative>
 				<relative type="0">በዚህ ሳምንት</relative>
 				<relative type="1">የሚቀጥለው ሳምንት</relative>
 				<relativeTime type="future">
@@ -1694,6 +2252,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>ሳምንት</displayName>
+				<relative type="-1">ባለፈው ሳምንት</relative>
+				<relative type="0">በዚህ ሣምንት</relative>
+				<relative type="1">የሚቀጥለው ሳምንት</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">በ{0} ሳምንታት ውስጥ</relativeTimePattern>
 					<relativeTimePattern count="other">በ{0} ሳምንታት ውስጥ</relativeTimePattern>
@@ -1705,6 +2266,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>ሳምንት</displayName>
+				<relative type="-1">ባለፈው ሳምንት</relative>
+				<relative type="0">በዚህ ሣምንት</relative>
+				<relative type="1">የሚቀጥለው ሳምንት</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">በ{0} ሳምንታት ውስጥ</relativeTimePattern>
 					<relativeTimePattern count="other">በ{0} ሳምንታት ውስጥ</relativeTimePattern>
@@ -1732,6 +2296,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>ቀን</displayName>
+				<relative type="-2">ከትናንት ወዲያ</relative>
+				<relative type="-1">ትላንትና</relative>
+				<relative type="0">ዛሬ</relative>
+				<relative type="1">ነገ</relative>
+				<relative type="2">ከነገ ወዲያ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">በ{0} ቀን ውስጥ</relativeTimePattern>
 					<relativeTimePattern count="other">በ{0} ቀኖች ውስጥ</relativeTimePattern>
@@ -1743,6 +2312,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>ቀን</displayName>
+				<relative type="-2">ከትናንት ወዲያ</relative>
+				<relative type="-1">ትላንትና</relative>
+				<relative type="0">ዛሬ</relative>
+				<relative type="1">ነገ</relative>
+				<relative type="2">ከነገ ወዲያ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">በ{0} ቀን ውስጥ</relativeTimePattern>
 					<relativeTimePattern count="other">በ{0} ቀኖች ውስጥ</relativeTimePattern>
@@ -1943,6 +2517,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="second-short">
 				<displayName>ሰከንድ</displayName>
+				<relative type="0">አሁን</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">በ{0} ሰከንድ ውስጥ</relativeTimePattern>
 					<relativeTimePattern count="other">በ{0} ሰከንዶች ውስጥ</relativeTimePattern>
@@ -1954,6 +2529,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="second-narrow">
 				<displayName>ሰከንድ</displayName>
+				<relative type="0">አሁን</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">በ{0} ሰከንድ ውስጥ</relativeTimePattern>
 					<relativeTimePattern count="other">በ{0} ሰከንዶች ውስጥ</relativeTimePattern>
@@ -2842,6 +3418,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>ፖርት ሞሬስባይ</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>ቦጌይንቪል</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>ማኒላ</exemplarCity>
 			</zone>
@@ -2926,6 +3505,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>ኢርኩትስክ</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>ቺታ</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>ያኩትስክ</exemplarCity>
 			</zone>
@@ -2944,6 +3526,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>ማጋዳን</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>ስሬድኔስኮልምስክ</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>ካምቻትካ</exemplarCity>
 			</zone>
@@ -3266,9 +3851,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="America_Central">
 				<long>
-					<generic>መካከለኛ የሰዓት አቆጣጠር</generic>
-					<standard>የመካከላዊ መደበኛ ሰዓት አቆጣጠር</standard>
-					<daylight>የመካከላዊ የቀን ሰዓት አቆጣጠር</daylight>
+					<generic>የመካከለኛ ሰዓት አቆጣጠር</generic>
+					<standard>የመካከለኛ መደበኛ ሰዓት አቆጣጠር</standard>
+					<daylight>የመካከለኛ የቀን ሰዓት አቆጣጠር</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Eastern">
@@ -3308,9 +3893,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Arabian">
 				<long>
-					<generic>የአረቢያ ሰዓት</generic>
-					<standard>የአረቢያ መደበኛ ሰዓት</standard>
-					<daylight>የአረቢያ የቀን ብርሃን ሰዓት</daylight>
+					<generic>የዓረቢያ ሰዓት</generic>
+					<standard>የዓረቢያ መደበኛ ሰዓት</standard>
+					<daylight>የዓረቢያ የቀን ብርሃን ሰዓት</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina">
@@ -4187,8 +4772,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern type="1000000" count="other">0 ሜትር</pattern>
 					<pattern type="10000000" count="one">00 ሜትር</pattern>
 					<pattern type="10000000" count="other">00 ሜትር</pattern>
-					<pattern type="100000000" count="one">000 ሜትር</pattern>
-					<pattern type="100000000" count="other">000 ሜትር</pattern>
+					<pattern type="100000000" count="one">000ሜ</pattern>
+					<pattern type="100000000" count="other">000ሜ</pattern>
 					<pattern type="1000000000" count="one">0 ቢ</pattern>
 					<pattern type="1000000000" count="other">0 ቢ</pattern>
 					<pattern type="10000000000" count="one">00 ቢ</pattern>
@@ -4227,6 +4812,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">¤0 ሺ</pattern>
+					<pattern type="1000" count="other">¤0 ሺ</pattern>
+					<pattern type="10000" count="one">¤00 ሺ</pattern>
+					<pattern type="10000" count="other">¤00 ሺ</pattern>
+					<pattern type="100000" count="one">¤000 ሺ</pattern>
+					<pattern type="100000" count="other">¤000 ሺ</pattern>
+					<pattern type="1000000" count="one">¤0 ሜትር</pattern>
+					<pattern type="1000000" count="other">¤0 ሜትር</pattern>
+					<pattern type="10000000" count="one">¤00 ሜትር</pattern>
+					<pattern type="10000000" count="other">¤00 ሜትር</pattern>
+					<pattern type="100000000" count="one">¤000 ሜትር</pattern>
+					<pattern type="100000000" count="other">¤000 ሜትር</pattern>
+					<pattern type="1000000000" count="one">¤0 ቢ</pattern>
+					<pattern type="1000000000" count="other">¤0 ቢ</pattern>
+					<pattern type="10000000000" count="one">¤00 ቢ</pattern>
+					<pattern type="10000000000" count="other">¤00 ቢ</pattern>
+					<pattern type="100000000000" count="one">¤000 ቢ</pattern>
+					<pattern type="100000000000" count="other">¤000 ቢ</pattern>
+					<pattern type="1000000000000" count="one">¤0 ት</pattern>
+					<pattern type="1000000000000" count="other">¤0 ት</pattern>
+					<pattern type="10000000000000" count="one">¤00 ት</pattern>
+					<pattern type="10000000000000" count="other">¤00 ት</pattern>
+					<pattern type="100000000000000" count="one">¤000 ት</pattern>
+					<pattern type="100000000000000" count="other">¤000 ት</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4266,6 +4879,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የአንጎላ ኩዋንዛ</displayName>
 				<displayName count="other">የአንጎላ ኩዋንዛ</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="ARS">
 				<displayName>የአርጀንቲና ፔሶ</displayName>
@@ -4298,6 +4912,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የቦስኒያ ሄርዞጎቪና የሚመነዘር ማርክ</displayName>
 				<displayName count="other">የቦስኒያ ሄርዞጎቪና የሚመነዘር ማርክ</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>የባርቤዶስ ዶላር</displayName>
@@ -4350,6 +4965,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የቦሊቪያ ቦሊቪያኖ</displayName>
 				<displayName count="other">የቦሊቪያ ቦሊቪያኖ</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BRL">
 				<displayName>የብራዚል ሪል</displayName>
@@ -4376,6 +4992,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የቦትስዋና ፑላ</displayName>
 				<displayName count="other">የቦትስዋና ፑላ</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYR">
 				<displayName>የቤላሩስያ ሩብል</displayName>
@@ -4443,6 +5060,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የኩባ የሚመነዘር ፔሶ</displayName>
 				<displayName count="other">የኩባ የሚመነዘር ፔሶ</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>የኩባ ፔሶ</displayName>
@@ -4462,6 +5080,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ቼክ ሪፐብሊክ ኮሩና</displayName>
 				<displayName count="other">ቼክ ሪፐብሊክ ኮሮና</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DJF">
 				<displayName>የጅቡቲ ፍራንክ</displayName>
@@ -4474,6 +5093,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የዴንማርክ ክሮን</displayName>
 				<displayName count="other">የዴንማርክ ክሮን</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>የዶሚኒክ ፔሶ</displayName>
@@ -4493,6 +5113,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የግብጽ ፓውንድ</displayName>
 				<displayName count="other">የግብጽ ፓውንድ</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>የኤርትራ ናቅፋ</displayName>
@@ -4525,6 +5146,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የፎክላንድ ደሴቶች ፓውንድ</displayName>
 				<displayName count="other">የፎክላንድ ደሴቶች ፓውንድ</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GBP">
 				<displayName>የእንግሊዝ ፓውንድ ስተርሊንግ</displayName>
@@ -4538,6 +5160,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የጆርጅያ ላሪ</displayName>
 				<displayName count="other">የጆርጅያ ላሪ</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>የጋና ሴዲ</displayName>
@@ -4566,12 +5189,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የጊኒ ፍራንክ</displayName>
 				<displayName count="other">የጊኒ ፍራንክ</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GTQ">
 				<displayName>ጓቲማላን ኩቲዛል</displayName>
 				<displayName count="one">ጓቲማላን ኩቲዛል</displayName>
 				<displayName count="other">ጓቲማላን ኩቲዛል</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GYD">
 				<displayName>የጉየና ዶላር</displayName>
@@ -4592,12 +5217,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የሃንዱራ ሌምፓአይራ</displayName>
 				<displayName count="other">የሃንዱራ ሌምፓአይራ</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRK">
 				<displayName>የክሮሽያ ኩና</displayName>
 				<displayName count="one">የክሮሽያ ኩና</displayName>
 				<displayName count="other">የክሮሽያ ኩና</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>የሃያቲ ጓርዴ</displayName>
@@ -4610,12 +5237,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የሁንጋሪ ፎሪንት</displayName>
 				<displayName count="other">የሃንጋሪያን ፎሪንት</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>የኢንዶኔዥያ ሩፒሃ</displayName>
 				<displayName count="one">የኢንዶኔዥያ ሩፒሃ</displayName>
 				<displayName count="other">የኢንዶኔዥያ ሩፒሃ</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="ILS">
 				<displayName>የእስራኤል አዲስ ሽቅል</displayName>
@@ -4648,6 +5277,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የአይስላንድ ክሮና</displayName>
 				<displayName count="other">የአይስላንድ ክሮና</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="JMD">
 				<displayName>የጃማይካ ዶላር</displayName>
@@ -4693,12 +5323,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የኮሞሮ ፍራንክ</displayName>
 				<displayName count="other">የኮሞሮ ፍራንክ</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>የሰሜን ኮሪያ ዎን</displayName>
 				<displayName count="one">የሰሜን ኮሪያ ዎን</displayName>
 				<displayName count="other">የሰሜን ኮሪያ ዎን</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>የደቡብ ኮሪያ ዎን</displayName>
@@ -4739,12 +5371,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የሊባኖስ ፓውንድ</displayName>
 				<displayName count="other">የሊባኖስ ፓውንድ</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>የሲሪላንካ ሩፒ</displayName>
 				<displayName count="one">የሲሪላንካ ሩፒ</displayName>
 				<displayName count="other">የሲሪላንካ ሩፒ</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>የላይቤሪያ ዶላር</displayName>
@@ -4791,6 +5425,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የማደጋስካር ማላጋስይ አሪያርይ</displayName>
 				<displayName count="other">የማደጋስካር ማላጋስይ አሪያርይ</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MKD">
 				<displayName>የሜቆድንያ ዲናር</displayName>
@@ -4803,6 +5438,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ምያንማ ክያት</displayName>
 				<displayName count="other">ምያንማ ክያት</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>የሞንጎሊያን ቱግሪክ</displayName>
@@ -4828,6 +5464,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የሞሪሸስ ሩፒ</displayName>
 				<displayName count="other">የሞሪሸስ ሩፒ</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>የማልዲቫ ሩፊያ</displayName>
@@ -4853,6 +5490,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የማሌዥያ ሪንጊት</displayName>
 				<displayName count="other">የማሌዥያ ሪንጊት</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZN">
 				<displayName>የሞዛምቢክ ሜቲካል</displayName>
@@ -4879,18 +5517,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የኒካራጓ ኮርዶባ</displayName>
 				<displayName count="other">የኒካራጓ ኮርዶባ</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NOK">
 				<displayName>የኖርዌይ ክሮን</displayName>
 				<displayName count="one">የኖርዌይ ክሮን</displayName>
 				<displayName count="other">የኖርዌይ ክሮን</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>የኔፓል ሩፒ</displayName>
 				<displayName count="one">የኔፓል ሩፒ</displayName>
 				<displayName count="other">የኔፓል ሩፒ</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>የኒውዚላንድ ዶላር</displayName>
@@ -4935,12 +5576,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የፓኪስታን ሩፒ</displayName>
 				<displayName count="other">የፓኪስታን ሩፒ</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>የፖላንድ ዝሎቲ</displayName>
 				<displayName count="one">የፖላንድ ዝሎቲ</displayName>
 				<displayName count="other">የፖላንድ ዝሎቲ</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PYG">
 				<displayName>የፓራጓይ ጉአራኒ</displayName>
@@ -4972,12 +5615,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የሩስያ ሩብል</displayName>
 				<displayName count="other">የሩስያ ሩብል</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RWF">
 				<displayName>የሩዋንዳ ፍራንክ</displayName>
 				<displayName count="one">የሩዋንዳ ፍራንክ</displayName>
 				<displayName count="other">የሩዋንዳ ፍራንክ</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>የሳውዲ ሪያል</displayName>
@@ -5012,6 +5657,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የስዊድን ክሮና</displayName>
 				<displayName count="other">የስዊድን ክሮና</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>የሲንጋፖር ዶላር</displayName>
@@ -5025,6 +5671,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የሴይንት ሔሌና ፓውንድ</displayName>
 				<displayName count="other">የሴይንት ሔሌና ፓውንድ</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SLL">
 				<displayName>የሴራሊዎን ሊዎን</displayName>
@@ -5057,12 +5704,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የሳኦ ቶመ እና ፕሪንሲፐ ዶብራ</displayName>
 				<displayName count="other">የሳኦ ቶመ እና ፕሪንሲፐ ዶብራ</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SYP">
 				<displayName>የሲሪያ ፓውንድ</displayName>
 				<displayName count="one">የሲሪያ ፓውንድ</displayName>
 				<displayName count="other">የሲሪያ ፓውንድ</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>የስዋዚላንድ ሊላንገኒ</displayName>
@@ -5075,6 +5724,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የታይላንድ ባህት</displayName>
 				<displayName count="other">የታይላንድ ባህት</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJS">
 				<displayName>የታጂክስታን ሶሞኒ</displayName>
@@ -5099,6 +5749,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ቶንጋን ፓ’አንጋ</displayName>
 				<displayName count="other">ቶንጋን ፓ’አንጋ</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TRY">
 				<displayName>የቱርክ ሊራ</displayName>
@@ -5106,6 +5757,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">የቱርክ ሊራ</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>የትሪንዳድ እና ቶቤጎዶላር</displayName>
@@ -5165,6 +5817,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የቬንዝዌላ ቦሊቫር</displayName>
 				<displayName count="other">የቬንዝዌላ ቦሊቫር</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>የቭየትናም ዶንግ</displayName>
@@ -5196,6 +5849,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የምዕራብ ካሪብያን ዶላር</displayName>
 				<displayName count="other">የምዕራብ ካሪብያን ዶላር</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XOF">
 				<displayName>ሴኤፍአ ፍራንክ ቤሴእአኦ</displayName>
@@ -5225,6 +5879,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የደቡብ አፍሪካ ራንድ</displayName>
 				<displayName count="other">የደቡብ አፍሪካ ራንድ</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>የዛምቢያ ክዋቻ (1968–2012)</displayName>
@@ -5236,6 +5891,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">የዛምቢያ ክዋቻ</displayName>
 				<displayName count="other">የዛምቢያ ክዋቻ</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZWD">
 				<displayName>የዚምቧቡዌ ዶላር</displayName>
@@ -5257,9 +5913,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ጂ-ኃይል</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
-				<displayName>m/s²</displayName>
-				<unitPattern count="one">{0} m/s²</unitPattern>
-				<unitPattern count="other">{0} m/s²</unitPattern>
+				<displayName>ሜ/ሰ²</displayName>
+				<unitPattern count="one">{0} ሜ/ሰ²</unitPattern>
+				<unitPattern count="other">{0} ሜ/ሰ²</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="one">{0} rev</unitPattern>
+				<unitPattern count="other">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>ዲግሪ</displayName>
+				<unitPattern count="one">{0} ዲግሪ</unitPattern>
+				<unitPattern count="other">{0} ዲግሪ</unitPattern>
 			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>ደቂቃ</displayName>
@@ -5271,30 +5942,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ሰከንድ</unitPattern>
 				<unitPattern count="other">{0} ሰከንድ</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>ዲግሪ</displayName>
-				<unitPattern count="one">{0} ዲግሪ</unitPattern>
-				<unitPattern count="other">{0} ዲግሪ</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ኤክር</displayName>
-				<unitPattern count="one">{0} ኤክር</unitPattern>
-				<unitPattern count="other">{0} ኤክር</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>ካሬ ኪሎሜትር</displayName>
+				<unitPattern count="one">{0} ካሬ ኪሎሜትር</unitPattern>
+				<unitPattern count="other">{0} ካሬ ኪሎሜትር</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ሄክታር</displayName>
 				<unitPattern count="one">{0} ሄክታር</unitPattern>
 				<unitPattern count="other">{0} ሄክታር</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>ካሬ ሜትር</displayName>
+				<unitPattern count="one">{0} ካሬ ሜትር</unitPattern>
+				<unitPattern count="other">{0} ካሬ ሜትር</unitPattern>
+				<perUnitPattern>{0}/ሜ²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
-				<displayName>cm²</displayName>
-				<unitPattern count="one">{0} cm²</unitPattern>
-				<unitPattern count="other">{0} cm²</unitPattern>
+				<displayName>ሴሜ²</displayName>
+				<unitPattern count="one">{0} ሴሜ²</unitPattern>
+				<unitPattern count="other">{0} ሴሜ²</unitPattern>
+				<perUnitPattern>{0}/ሴሜ²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>ካሬ ማይል</displayName>
+				<unitPattern count="one">{0} ካሬ ማይል</unitPattern>
+				<unitPattern count="other">{0} ካሬ ማይል</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ኤክር</displayName>
+				<unitPattern count="one">{0} ኤክር</unitPattern>
+				<unitPattern count="other">{0} ኤክር</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ካሬ ጫማ</displayName>
@@ -5302,94 +5985,109 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ካሬ ጫማ</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
-				<displayName>in²</displayName>
-				<unitPattern count="one">{0} in²</unitPattern>
-				<unitPattern count="other">{0} in²</unitPattern>
+				<displayName>ኢንች²</displayName>
+				<unitPattern count="one">{0} ኢንች²</unitPattern>
+				<unitPattern count="other">{0} ኢንች²</unitPattern>
+				<perUnitPattern>{0}/ኢንች²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>ካሬ ኪሎሜትር</displayName>
-				<unitPattern count="one">{0} ካሬ ኪሎሜትር</unitPattern>
-				<unitPattern count="other">{0} ካሬ ኪሎሜትር</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>ካሬ ሜትር</displayName>
-				<unitPattern count="one">{0} ካሬ ሜትር</unitPattern>
-				<unitPattern count="other">{0} ካሬ ሜትር</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>ካሬ ማይል</displayName>
-				<unitPattern count="one">{0} ካሬ ማይል</unitPattern>
-				<unitPattern count="other">{0} ካሬ ማይል</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>ካራት</displayName>
+				<unitPattern count="one">{0} ካራት</unitPattern>
+				<unitPattern count="other">{0} ካራት</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ሊ/ኪሜ</displayName>
 				<unitPattern count="one">{0} ሊ/ኪሜ</unitPattern>
 				<unitPattern count="other">{0} ሊ/ኪሜ</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ሊትሮች በ100 ኪሎሜትሮች</displayName>
+				<unitPattern count="one">{0} ሊትር በ100 ኪሎሜትሮች</unitPattern>
+				<unitPattern count="other">{0} ሊትሮች በ100 ኪሎሜትሮች</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>ቢት</displayName>
-				<unitPattern count="one">{0} ቢት</unitPattern>
-				<unitPattern count="other">{0} ቢት</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>ባይት</displayName>
-				<unitPattern count="one">{0} ባይት</unitPattern>
-				<unitPattern count="other">{0} ባይት</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>ጊባይት</displayName>
-				<unitPattern count="one">{0} ጊባይት</unitPattern>
-				<unitPattern count="other">{0} ጊባይት</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>ጊባ</displayName>
-				<unitPattern count="one">{0} ጊባ</unitPattern>
-				<unitPattern count="other">{0} ጊባ</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>ኪባይት</displayName>
-				<unitPattern count="one">{0} ኪባይት</unitPattern>
-				<unitPattern count="other">{0} ኪባይት</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>ኪባ</displayName>
-				<unitPattern count="one">{0} ኪባ</unitPattern>
-				<unitPattern count="other">{0} ኪባ</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>ሜባ</displayName>
-				<unitPattern count="one">{0} ሜባ</unitPattern>
-				<unitPattern count="other">{0} ሜባ</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>ሜባይት</displayName>
-				<unitPattern count="one">{0} ሜባይት</unitPattern>
-				<unitPattern count="other">{0} ሜባይት</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>ቴባ</displayName>
-				<unitPattern count="one">{0} ቴባ</unitPattern>
-				<unitPattern count="other">{0} ቴባ</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>ቴባይት</displayName>
 				<unitPattern count="one">{0} ቴባይት</unitPattern>
 				<unitPattern count="other">{0} ቴባይት</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>ቴባ</displayName>
+				<unitPattern count="one">{0} ቴባ</unitPattern>
+				<unitPattern count="other">{0} ቴባ</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>ጊባ</displayName>
+				<unitPattern count="one">{0} ጊባ</unitPattern>
+				<unitPattern count="other">{0} ጊባ</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>ጊባይት</displayName>
+				<unitPattern count="one">{0} ጊባይት</unitPattern>
+				<unitPattern count="other">{0} ጊባይት</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>ሜባይት</displayName>
+				<unitPattern count="one">{0} ሜባይት</unitPattern>
+				<unitPattern count="other">{0} ሜባይት</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>ሜባ</displayName>
+				<unitPattern count="one">{0} ሜባ</unitPattern>
+				<unitPattern count="other">{0} ሜባ</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>ኪባ</displayName>
+				<unitPattern count="one">{0} ኪባ</unitPattern>
+				<unitPattern count="other">{0} ኪባ</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>ኪባይት</displayName>
+				<unitPattern count="one">{0} ኪባይት</unitPattern>
+				<unitPattern count="other">{0} ኪባይት</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>ባይት</displayName>
+				<unitPattern count="one">{0} ባይት</unitPattern>
+				<unitPattern count="other">{0} ባይት</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>ቢት</displayName>
+				<unitPattern count="one">{0} ቢት</unitPattern>
+				<unitPattern count="other">{0} ቢት</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>ምዕተ ዓመት</displayName>
+				<unitPattern count="one">{0} ምዕተ ዓመት</unitPattern>
+				<unitPattern count="other">{0} ምዕተ ዓመት</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ዓመታት</displayName>
+				<unitPattern count="one">{0} ዓመት</unitPattern>
+				<unitPattern count="other">{0} ዓመታት</unitPattern>
+				<perUnitPattern>{0}/ዓ</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ወራት</displayName>
+				<unitPattern count="one">{0} ወር</unitPattern>
+				<unitPattern count="other">{0} ወራት</unitPattern>
+				<perUnitPattern>{0}/ወ</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ሳምንታት</displayName>
+				<unitPattern count="one">{0} ሳምንት</unitPattern>
+				<unitPattern count="other">{0} ሳምንታት</unitPattern>
+				<perUnitPattern>{0}/ሳ</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ቀናት</displayName>
 				<unitPattern count="one">{0} ቀናት</unitPattern>
 				<unitPattern count="other">{0} ቀናት</unitPattern>
+				<perUnitPattern>{0}/ቀ</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>ሰዓቶች</displayName>
@@ -5397,30 +6095,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ሰዓቶች</unitPattern>
 				<perUnitPattern>{0}/ሰ</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>ማይክሮሰከንድ</displayName>
-				<unitPattern count="one">{0} ማይክሮሰከንድ</unitPattern>
-				<unitPattern count="other">{0} ማይክሮሰከንድ</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ሚሊሰከንድ</displayName>
-				<unitPattern count="one">{0} ሚሊሰከንድ</unitPattern>
-				<unitPattern count="other">{0} ሚሊሰከንድ</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>ደቂቃዎች</displayName>
 				<unitPattern count="one">{0} ደቂቃ</unitPattern>
 				<unitPattern count="other">{0} ደቂቃዎች</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>ወራት</displayName>
-				<unitPattern count="one">{0} ወር</unitPattern>
-				<unitPattern count="other">{0} ወራት</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ናኖሰከንድ</displayName>
-				<unitPattern count="one">{0} ናኖሰከንድ</unitPattern>
-				<unitPattern count="other">{0} ናኖሰከንድ</unitPattern>
+				<perUnitPattern>{0}/ደ</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>ሰከንዶች</displayName>
@@ -5428,15 +6107,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ሰከንዶች</unitPattern>
 				<perUnitPattern>{0}/ሰከ</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>ሳምንታት</displayName>
-				<unitPattern count="one">{0} ሳምንት</unitPattern>
-				<unitPattern count="other">{0} ሳምንታት</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ሚሊሰከንድ</displayName>
+				<unitPattern count="one">{0} ሚሊሰከንድ</unitPattern>
+				<unitPattern count="other">{0} ሚሊሰከንድ</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>ዓመታት</displayName>
-				<unitPattern count="one">{0} ዓመታት</unitPattern>
-				<unitPattern count="other">{0} ዓመታት</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>ማይክሮሰከንድ</displayName>
+				<unitPattern count="one">{0} ማይክሮሰከንድ</unitPattern>
+				<unitPattern count="other">{0} ማይክሮሰከንድ</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ናኖሰከንድ</displayName>
+				<unitPattern count="one">{0} ናኖሰከንድ</unitPattern>
+				<unitPattern count="other">{0} ናኖሰከንድ</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amp</displayName>
@@ -5458,6 +6142,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -5468,21 +6157,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Cal</unitPattern>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -5493,201 +6177,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>ኪሎሜትር</displayName>
+				<unitPattern count="one">{0} ኪሎሜትር</unitPattern>
+				<unitPattern count="other">{0} ኪሎሜትር</unitPattern>
+				<perUnitPattern>{0}/ኪሜ</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>ሴንቲሜትር</displayName>
-				<unitPattern count="one">{0} ሴንቲሜትር</unitPattern>
-				<unitPattern count="other">{0} ሴንቲሜትር</unitPattern>
+			<unit type="length-meter">
+				<displayName>ሜትር</displayName>
+				<unitPattern count="one">{0} ሜትር</unitPattern>
+				<unitPattern count="other">{0} ሜትር</unitPattern>
+				<perUnitPattern>{0}/ሜ</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ጫማ</displayName>
-				<unitPattern count="one">{0} ጫማ</unitPattern>
-				<unitPattern count="other">{0} ጫማ</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>ኢንች</displayName>
-				<unitPattern count="one">{0} ኢንች</unitPattern>
-				<unitPattern count="other">{0} ኢንች</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>ኪሎሜትር</displayName>
-				<unitPattern count="one">{0} ኪሎሜትር</unitPattern>
-				<unitPattern count="other">{0} ኪሎሜትር</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>የብርሃን ዓመት</displayName>
-				<unitPattern count="one">{0} የብርሃን ዓመት</unitPattern>
-				<unitPattern count="other">{0} የብርሃን ዓመት</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>ሜትር</displayName>
-				<unitPattern count="one">{0} ሜትር</unitPattern>
-				<unitPattern count="other">{0} ሜትር</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>ማይል</displayName>
-				<unitPattern count="one">{0} ማይል</unitPattern>
-				<unitPattern count="other">{0} ማይል</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>ሴንቲሜትር</displayName>
+				<unitPattern count="one">{0} ሴንቲሜትር</unitPattern>
+				<unitPattern count="other">{0} ሴንቲሜትር</unitPattern>
+				<perUnitPattern>{0}/ሴሜ</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>ሚሊሜትር</displayName>
 				<unitPattern count="one">{0} ሚሊሜትር</unitPattern>
 				<unitPattern count="other">{0} ሚሊሜትር</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>ፒኮሜትር</displayName>
 				<unitPattern count="one">{0} ፒኮሜትር</unitPattern>
 				<unitPattern count="other">{0} ፒኮሜትር</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>ማይል</displayName>
+				<unitPattern count="one">{0} ማይል</unitPattern>
+				<unitPattern count="other">{0} ማይል</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>ያርድ</displayName>
 				<unitPattern count="one">{0} ያርድ</unitPattern>
 				<unitPattern count="other">{0} ያርድ</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ጫማ</displayName>
+				<unitPattern count="one">{0} ጫማ</unitPattern>
+				<unitPattern count="other">{0} ጫማ</unitPattern>
+				<perUnitPattern>{0}/ጫማ</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>ኢንች</displayName>
+				<unitPattern count="one">{0} ኢንች</unitPattern>
+				<unitPattern count="other">{0} ኢንች</unitPattern>
+				<perUnitPattern>{0}/ኢንች</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>የብርሃን ዓመት</displayName>
+				<unitPattern count="one">{0} የብርሃን ዓመት</unitPattern>
+				<unitPattern count="other">{0} የብርሃን ዓመት</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>ስማይል</displayName>
+				<unitPattern count="one">{0} ስማይል</unitPattern>
+				<unitPattern count="other">{0} ስማይል</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>CD</displayName>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>ግራም</displayName>
-				<unitPattern count="one">{0} ግራም</unitPattern>
-				<unitPattern count="other">{0} ግራም</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>ኪሎግራም</displayName>
-				<unitPattern count="one">{0} ኪሎግራም</unitPattern>
-				<unitPattern count="other">{0} ኪሎግራም</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>ኪሎግራም</displayName>
+				<unitPattern count="one">{0} ኪሎግራም</unitPattern>
+				<unitPattern count="other">{0} ኪሎግራም</unitPattern>
+				<perUnitPattern>{0}/ኪሎግራም</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>ግራም</displayName>
+				<unitPattern count="one">{0} ግራም</unitPattern>
+				<unitPattern count="other">{0} ግራም</unitPattern>
+				<perUnitPattern>{0}/ግራም</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>አውንስ</displayName>
-				<unitPattern count="one">{0} አውንስ</unitPattern>
-				<unitPattern count="other">{0} አውንስ</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>ፓውንድ</displayName>
-				<unitPattern count="one">{0} ፓውንድ</unitPattern>
-				<unitPattern count="other">{0} ፓውንድ</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>ቶን</displayName>
 				<unitPattern count="one">{0} ቶን</unitPattern>
 				<unitPattern count="other">{0} ቶን</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>ፓውንድ</displayName>
+				<unitPattern count="one">{0} ፓውንድ</unitPattern>
+				<unitPattern count="other">{0} ፓውንድ</unitPattern>
+				<perUnitPattern>{0}/ፓውንድ</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>አውንስ</displayName>
+				<unitPattern count="one">{0} አውንስ</unitPattern>
+				<unitPattern count="other">{0} አውንስ</unitPattern>
+				<perUnitPattern>{0}/አውንስ</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>CD</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>የፈረስ ጉልበት</displayName>
-				<unitPattern count="one">{0} የፈረስ ጉልበት</unitPattern>
-				<unitPattern count="other">{0} የፈረስ ጉልበት</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>ኪሎዋት</displayName>
-				<unitPattern count="one">{0} ኪሎዋት</unitPattern>
-				<unitPattern count="other">{0} ኪሎዋት</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>ኪሎዋት</displayName>
+				<unitPattern count="one">{0} ኪሎዋት</unitPattern>
+				<unitPattern count="other">{0} ኪሎዋት</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>ዋት</displayName>
 				<unitPattern count="one">{0} ዋት</unitPattern>
 				<unitPattern count="other">{0} ዋት</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>የፈረስ ጉልበት</displayName>
+				<unitPattern count="one">{0} የፈረስ ጉልበት</unitPattern>
+				<unitPattern count="other">{0} የፈረስ ጉልበት</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>ሄክቶፓስካል</displayName>
 				<unitPattern count="one">{0} ሄክቶፓስካል</unitPattern>
 				<unitPattern count="other">{0} ሄክቶፓስካል</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>ኢንች ሜርኩሪ</displayName>
-				<unitPattern count="one">{0} ኢንች ሜርኩሪ</unitPattern>
-				<unitPattern count="other">{0} ኢንች ሜርኩሪ</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>ሚሊባር</displayName>
-				<unitPattern count="one">{0} ሚሊባር</unitPattern>
-				<unitPattern count="other">{0} ሚሊባር</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -5698,10 +6386,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>ካራት</displayName>
-				<unitPattern count="one">{0} ካራት</unitPattern>
-				<unitPattern count="other">{0} ካራት</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>ኢንች ሜርኩሪ</displayName>
+				<unitPattern count="one">{0} ኢንች ሜርኩሪ</unitPattern>
+				<unitPattern count="other">{0} ኢንች ሜርኩሪ</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>ሚሊባር</displayName>
+				<unitPattern count="one">{0} ሚሊባር</unitPattern>
+				<unitPattern count="other">{0} ሚሊባር</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>ኪሎሜትር በሰዓት</displayName>
@@ -5718,6 +6411,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ማይል በሰዓት</unitPattern>
 				<unitPattern count="other">{0} ማይል በሰዓት</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>ዲግሪ ሴልሺየስ</displayName>
 				<unitPattern count="one">{0} ዲግሪ ሴልሺየስ</unitPattern>
@@ -5733,40 +6436,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cL</displayName>
-				<unitPattern count="one">{0} cL</unitPattern>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>ኩቢክ ኪሎሜትር</displayName>
 				<unitPattern count="one">{0} ኩቢክ ኪሎሜትር</unitPattern>
 				<unitPattern count="other">{0} ኩቢክ ኪሎሜትር</unitPattern>
 			</unit>
 			<unit type="volume-cubic-meter">
-				<displayName>m³</displayName>
-				<unitPattern count="one">{0} m³</unitPattern>
-				<unitPattern count="other">{0} m³</unitPattern>
+				<displayName>ሜ³</displayName>
+				<unitPattern count="one">{0} ሜ³</unitPattern>
+				<unitPattern count="other">{0} ሜ³</unitPattern>
+				<perUnitPattern>{0}/ሜ³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>ሴሜ³</displayName>
+				<unitPattern count="one">{0} ሴሜ³</unitPattern>
+				<unitPattern count="other">{0} ሴሜ³</unitPattern>
+				<perUnitPattern>{0}/ሴሜ³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>ኩቢክ ማይል</displayName>
@@ -5778,25 +6463,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>cup</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ጫማ³</displayName>
+				<unitPattern count="one">{0} ጫማ³</unitPattern>
+				<unitPattern count="other">{0} ጫማ³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="one">{0} dL</unitPattern>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>ኢንች³</displayName>
+				<unitPattern count="one">{0} ኢንች³</unitPattern>
+				<unitPattern count="other">{0} ኢንች³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -5807,27 +6487,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ሊትር</displayName>
 				<unitPattern count="one">{0} ሊትር</unitPattern>
 				<unitPattern count="other">{0} ሊትር</unitPattern>
+				<perUnitPattern>{0}/ሊትር</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="one">{0} ML</unitPattern>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0} dL</unitPattern>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>ሴንቲ ሊትር</displayName>
+				<unitPattern count="one">{0} ሴንቲ ሊትር</unitPattern>
+				<unitPattern count="other">{0} ሴንቲ ሊትር</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
 				<unitPattern count="one">{0} mL</unitPattern>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ኤከር ጫማ</displayName>
+				<unitPattern count="one">{0} ኤከር ጫማ</unitPattern>
+				<unitPattern count="other">{0} ኤከር ጫማ</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cup</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>tbsp</displayName>
 				<unitPattern count="one">{0} tbsp</unitPattern>
@@ -5838,6 +6555,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} tsp</unitPattern>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}ምስ</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}ሰ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}ደ</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}ምዕ</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -5849,9 +6572,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ጂ</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
-				<displayName>m/s²</displayName>
-				<unitPattern count="one">{0} m/s²</unitPattern>
-				<unitPattern count="other">{0} m/s²</unitPattern>
+				<displayName>ሜ/ሰ²</displayName>
+				<unitPattern count="one">{0} ሜ/ሰ²</unitPattern>
+				<unitPattern count="other">{0} ሜ/ሰ²</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="one">{0} rev</unitPattern>
+				<unitPattern count="other">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>ዲግሪ</displayName>
+				<unitPattern count="one">{0}°ዲግሪ</unitPattern>
+				<unitPattern count="other">{0}°ዲግሪ</unitPattern>
 			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>ደቂቃ</displayName>
@@ -5863,30 +6601,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ሰከንድ</unitPattern>
 				<unitPattern count="other">{0} ሰከንድ</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>ዲግሪ</displayName>
-				<unitPattern count="one">{0}°ዲግሪ</unitPattern>
-				<unitPattern count="other">{0}°ዲግሪ</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ኤክር</displayName>
-				<unitPattern count="one">{0} ኤክር</unitPattern>
-				<unitPattern count="other">{0} ኤክር</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>ካሬ ኪሎሜትር</displayName>
+				<unitPattern count="one">{0} ኪሜ²</unitPattern>
+				<unitPattern count="other">{0} ኪሜ²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ሄክታር</displayName>
 				<unitPattern count="one">{0} ሄክታር</unitPattern>
 				<unitPattern count="other">{0} ሄክታር</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>ካሬ ሜትር</displayName>
+				<unitPattern count="one">{0} ሜ²</unitPattern>
+				<unitPattern count="other">{0} ሜ²</unitPattern>
+				<perUnitPattern>{0}/ሜ²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
-				<displayName>cm²</displayName>
-				<unitPattern count="one">{0} cm²</unitPattern>
-				<unitPattern count="other">{0} cm²</unitPattern>
+				<displayName>ሴሜ²</displayName>
+				<unitPattern count="one">{0} ሴሜ²</unitPattern>
+				<unitPattern count="other">{0} ሴሜ²</unitPattern>
+				<perUnitPattern>{0}/ሴሜ²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>ካሬ ማይል</displayName>
+				<unitPattern count="one">{0} ካሬ ማይል</unitPattern>
+				<unitPattern count="other">{0} ካሬ ማይል</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ኤክር</displayName>
+				<unitPattern count="one">{0} ኤክር</unitPattern>
+				<unitPattern count="other">{0} ኤክር</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ካሬ ጫማ</displayName>
@@ -5894,94 +6644,109 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ካሬ ጫማ</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
-				<displayName>in²</displayName>
-				<unitPattern count="one">{0} in²</unitPattern>
-				<unitPattern count="other">{0} in²</unitPattern>
+				<displayName>ኢንች²</displayName>
+				<unitPattern count="one">{0} ኢንች²</unitPattern>
+				<unitPattern count="other">{0} ኢንች²</unitPattern>
+				<perUnitPattern>{0}/ኢንች²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>ካሬ ኪሎሜትር</displayName>
-				<unitPattern count="one">{0} ኪሜ²</unitPattern>
-				<unitPattern count="other">{0} ኪሜ²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>ካሬ ሜትር</displayName>
-				<unitPattern count="one">{0} ሜ²</unitPattern>
-				<unitPattern count="other">{0} ሜ²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>ካሬ ማይል</displayName>
-				<unitPattern count="one">{0} ካሬ ማይል</unitPattern>
-				<unitPattern count="other">{0} ካሬ ማይል</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>ካራት</displayName>
+				<unitPattern count="one">{0} ካራት</unitPattern>
+				<unitPattern count="other">{0} ካራት</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ሊ/ኪሜ</displayName>
 				<unitPattern count="one">{0} ሊ/ኪሜ</unitPattern>
 				<unitPattern count="other">{0} ሊ/ኪሜ</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ሊትር በ100 ኪሎሜትሮች</displayName>
+				<unitPattern count="one">{0} ሊ/100ኪሜ</unitPattern>
+				<unitPattern count="other">{0} ሊ/100ኪሜ</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>ቢት</displayName>
-				<unitPattern count="one">{0} ቢት</unitPattern>
-				<unitPattern count="other">{0} ቢት</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>ባይት</displayName>
-				<unitPattern count="one">{0} ባይት</unitPattern>
-				<unitPattern count="other">{0} ባይት</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>ጊባይት</displayName>
-				<unitPattern count="one">{0} ጊባይት</unitPattern>
-				<unitPattern count="other">{0} ጊባይት</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>ጊባ</displayName>
-				<unitPattern count="one">{0} ጊባ</unitPattern>
-				<unitPattern count="other">{0} ጊባ</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>ኪባይት</displayName>
-				<unitPattern count="one">{0} ኪባይት</unitPattern>
-				<unitPattern count="other">{0} ኪባይት</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>ኪባ</displayName>
-				<unitPattern count="one">{0} ኪባ</unitPattern>
-				<unitPattern count="other">{0} ኪባ</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>ሜባ</displayName>
-				<unitPattern count="one">{0} ሜባ</unitPattern>
-				<unitPattern count="other">{0} ሜባ</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>ሜባይት</displayName>
-				<unitPattern count="one">{0} ሜባይት</unitPattern>
-				<unitPattern count="other">{0} ሜባይት</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>ቴባ</displayName>
-				<unitPattern count="one">{0} ቴባ</unitPattern>
-				<unitPattern count="other">{0} ቴባ</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>ቴባይት</displayName>
 				<unitPattern count="one">{0} ቴባይት</unitPattern>
 				<unitPattern count="other">{0} ቴባይት</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>ቴባ</displayName>
+				<unitPattern count="one">{0} ቴባ</unitPattern>
+				<unitPattern count="other">{0} ቴባ</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>ጊባ</displayName>
+				<unitPattern count="one">{0} ጊባ</unitPattern>
+				<unitPattern count="other">{0} ጊባ</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>ጊባይት</displayName>
+				<unitPattern count="one">{0} ጊባይት</unitPattern>
+				<unitPattern count="other">{0} ጊባይት</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>ሜባይት</displayName>
+				<unitPattern count="one">{0} ሜባይት</unitPattern>
+				<unitPattern count="other">{0} ሜባይት</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>ሜባ</displayName>
+				<unitPattern count="one">{0} ሜባ</unitPattern>
+				<unitPattern count="other">{0} ሜባ</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>ኪባ</displayName>
+				<unitPattern count="one">{0} ኪባ</unitPattern>
+				<unitPattern count="other">{0} ኪባ</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>ኪባይት</displayName>
+				<unitPattern count="one">{0} ኪባይት</unitPattern>
+				<unitPattern count="other">{0} ኪባይት</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>ባይት</displayName>
+				<unitPattern count="one">{0} ባይት</unitPattern>
+				<unitPattern count="other">{0} ባይት</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>ቢት</displayName>
+				<unitPattern count="one">{0} ቢት</unitPattern>
+				<unitPattern count="other">{0} ቢት</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>ምዕተ ዓመት</displayName>
+				<unitPattern count="one">{0} ምዕተ ዓመት</unitPattern>
+				<unitPattern count="other">{0} ምዕተ ዓመት</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ዓመታት</displayName>
+				<unitPattern count="one">{0} ዓመት</unitPattern>
+				<unitPattern count="other">{0} ዓመታት</unitPattern>
+				<perUnitPattern>{0}/ዓ</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ወራት</displayName>
+				<unitPattern count="one">{0} ወራት</unitPattern>
+				<unitPattern count="other">{0} ወራት</unitPattern>
+				<perUnitPattern>{0}/ወ</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ሳምንታት</displayName>
+				<unitPattern count="one">{0} ሳምንት</unitPattern>
+				<unitPattern count="other">{0} ሳምንታት</unitPattern>
+				<perUnitPattern>{0}/ሳ</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ቀናት</displayName>
 				<unitPattern count="one">{0} ቀናት</unitPattern>
 				<unitPattern count="other">{0} ቀናት</unitPattern>
+				<perUnitPattern>{0}/ቀ</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>ሰዓቶች</displayName>
@@ -5989,30 +6754,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ሰዓ</unitPattern>
 				<perUnitPattern>{0}/ሰ</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>ማይክሮሰከንድ</displayName>
-				<unitPattern count="one">{0} ማይክሮሰከንድ</unitPattern>
-				<unitPattern count="other">{0} ማይክሮሰከንድ</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ሚሊሰከንድ</displayName>
-				<unitPattern count="one">{0} ሚሴ</unitPattern>
-				<unitPattern count="other">{0} ሚሴ</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>ደቂቃዎች</displayName>
 				<unitPattern count="one">{0} ደቂ</unitPattern>
 				<unitPattern count="other">{0} ደቂቃ</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>ወራት</displayName>
-				<unitPattern count="one">{0} ወራት</unitPattern>
-				<unitPattern count="other">{0} ወራት</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ናኖሰከንድ</displayName>
-				<unitPattern count="one">{0} ናኖሰከንድ</unitPattern>
-				<unitPattern count="other">{0} ናኖሰከንድ</unitPattern>
+				<perUnitPattern>{0}/ደ</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>ሰከንዶች</displayName>
@@ -6020,15 +6766,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ሰከ</unitPattern>
 				<perUnitPattern>{0}/ሰከ</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>ሳምንታት</displayName>
-				<unitPattern count="one">{0} ሳምንት</unitPattern>
-				<unitPattern count="other">{0} ሳምንታት</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ሚሊሰከንድ</displayName>
+				<unitPattern count="one">{0} ሚሴ</unitPattern>
+				<unitPattern count="other">{0} ሚሴ</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>ዓመታት</displayName>
-				<unitPattern count="one">{0} ዓመት</unitPattern>
-				<unitPattern count="other">{0} ዓመታት</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>ማይክሮሰከንድ</displayName>
+				<unitPattern count="one">{0} ማሰ</unitPattern>
+				<unitPattern count="other">{0} ማሰ</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ናኖሰከንድ</displayName>
+				<unitPattern count="one">{0} ናኖሰከንድ</unitPattern>
+				<unitPattern count="other">{0} ናኖሰከንድ</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amp</displayName>
@@ -6050,6 +6801,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -6060,21 +6816,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Cal</unitPattern>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -6085,201 +6836,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>ኪሎሜትር</displayName>
+				<unitPattern count="one">{0} ኪሜ</unitPattern>
+				<unitPattern count="other">{0} ኪሜ</unitPattern>
+				<perUnitPattern>{0}/ኪሜ</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>ሴንቲሜትር</displayName>
-				<unitPattern count="one">{0} ሴሜ</unitPattern>
-				<unitPattern count="other">{0} ሴሜ</unitPattern>
+			<unit type="length-meter">
+				<displayName>ሜትር</displayName>
+				<unitPattern count="one">{0} ሜ</unitPattern>
+				<unitPattern count="other">{0} ሜ</unitPattern>
+				<perUnitPattern>{0}/ሜ</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ጫማ</displayName>
-				<unitPattern count="one">{0} ጫማ</unitPattern>
-				<unitPattern count="other">{0} ጫማ</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>ኢንች</displayName>
-				<unitPattern count="one">{0} ኢንች</unitPattern>
-				<unitPattern count="other">{0} ኢንች</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>ኪሎሜትር</displayName>
-				<unitPattern count="one">{0} ኪሜ</unitPattern>
-				<unitPattern count="other">{0} ኪሜ</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>የብርሃን ዓመት</displayName>
-				<unitPattern count="one">{0} ly</unitPattern>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>ሜትር</displayName>
-				<unitPattern count="one">{0} ሜ</unitPattern>
-				<unitPattern count="other">{0} ሜ</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>ማይል</displayName>
-				<unitPattern count="one">{0} ማይል</unitPattern>
-				<unitPattern count="other">{0} ማይል</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>ሴንቲሜትር</displayName>
+				<unitPattern count="one">{0} ሴሜ</unitPattern>
+				<unitPattern count="other">{0} ሴሜ</unitPattern>
+				<perUnitPattern>{0}/ሴሜ</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>ሚሊሜትር</displayName>
 				<unitPattern count="one">{0} ሚሜ</unitPattern>
 				<unitPattern count="other">{0} ሚሜ</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>ፒኮሜትር</displayName>
 				<unitPattern count="one">{0} ፒሜ</unitPattern>
 				<unitPattern count="other">{0} ፒሜ</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>ማይል</displayName>
+				<unitPattern count="one">{0} ማይል</unitPattern>
+				<unitPattern count="other">{0} ማይል</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>ያርድ</displayName>
 				<unitPattern count="one">{0} ያርድ</unitPattern>
 				<unitPattern count="other">{0} ያርድ</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ጫማ</displayName>
+				<unitPattern count="one">{0} ጫማ</unitPattern>
+				<unitPattern count="other">{0} ጫማ</unitPattern>
+				<perUnitPattern>{0}/ጫማ</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>ኢንች</displayName>
+				<unitPattern count="one">{0} ኢንች</unitPattern>
+				<unitPattern count="other">{0} ኢንች</unitPattern>
+				<perUnitPattern>{0}/ኢንች</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>የብርሃን ዓመት</displayName>
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>ስማይል</displayName>
+				<unitPattern count="one">{0} ስማይል</unitPattern>
+				<unitPattern count="other">{0} ስማይል</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>CD</displayName>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>ግራም</displayName>
-				<unitPattern count="one">{0} ግ</unitPattern>
-				<unitPattern count="other">{0} ግ</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>ኪሎግራም</displayName>
-				<unitPattern count="one">{0} ኪግ</unitPattern>
-				<unitPattern count="other">{0} ኪግ</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>ኪሎግራም</displayName>
+				<unitPattern count="one">{0} ኪግ</unitPattern>
+				<unitPattern count="other">{0} ኪግ</unitPattern>
+				<perUnitPattern>{0}/ኪሎግራም</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>ግራም</displayName>
+				<unitPattern count="one">{0} ግ</unitPattern>
+				<unitPattern count="other">{0} ግ</unitPattern>
+				<perUnitPattern>{0}/ግራም</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>አውንስ</displayName>
-				<unitPattern count="one">{0} አውንስ</unitPattern>
-				<unitPattern count="other">{0} አውንስ</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>ፓውንድ</displayName>
-				<unitPattern count="one">{0} ፓውንድ</unitPattern>
-				<unitPattern count="other">{0} ፓውንድ</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>ቶን</displayName>
 				<unitPattern count="one">{0} ቶን</unitPattern>
 				<unitPattern count="other">{0} ቶን</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>ፓውንድ</displayName>
+				<unitPattern count="one">{0} ፓውንድ</unitPattern>
+				<unitPattern count="other">{0} ፓውንድ</unitPattern>
+				<perUnitPattern>{0}/ፓውንድ</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>አውንስ</displayName>
+				<unitPattern count="one">{0} አውንስ</unitPattern>
+				<unitPattern count="other">{0} አውንስ</unitPattern>
+				<perUnitPattern>{0}/አውንስ</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>CD</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>የፈረስ ጉልበት</displayName>
-				<unitPattern count="one">{0} የፈረስ ጉልበት</unitPattern>
-				<unitPattern count="other">{0} የፈረስ ጉልበት</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>ኪሎዋት</displayName>
-				<unitPattern count="one">{0} ኪዋ</unitPattern>
-				<unitPattern count="other">{0} ኪዋ</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>ኪሎዋት</displayName>
+				<unitPattern count="one">{0} ኪዋ</unitPattern>
+				<unitPattern count="other">{0} ኪዋ</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>ዋት</displayName>
 				<unitPattern count="one">{0} ዋ</unitPattern>
 				<unitPattern count="other">{0} ዋ</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>የፈረስ ጉልበት</displayName>
+				<unitPattern count="one">{0} የፈጉ</unitPattern>
+				<unitPattern count="other">{0} የፈጉ</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>ሄክቶፓስካል</displayName>
 				<unitPattern count="one">{0} ሄክቶፓስካል</unitPattern>
 				<unitPattern count="other">{0} ሄክቶፓስካል</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>ኢንች ሜርኩሪ</displayName>
-				<unitPattern count="one">{0} ኢንች ሜርኩሪ</unitPattern>
-				<unitPattern count="other">{0} ኢንች ሜርኩሪ</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>ሚሊባር</displayName>
-				<unitPattern count="one">{0} ሚባ</unitPattern>
-				<unitPattern count="other">{0} ሚባ</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -6290,10 +7045,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>ካራት</displayName>
-				<unitPattern count="one">{0} ካራት</unitPattern>
-				<unitPattern count="other">{0} ካራት</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>ኢንች ሜርኩሪ</displayName>
+				<unitPattern count="one">{0} ኢሜ</unitPattern>
+				<unitPattern count="other">{0} ኢንሜር</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>ሚሊባር</displayName>
+				<unitPattern count="one">{0} ሚባ</unitPattern>
+				<unitPattern count="other">{0} ሚባ</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>ኪሎሜትር በሰዓት</displayName>
@@ -6310,6 +7070,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ማይል/ሰ</unitPattern>
 				<unitPattern count="other">{0} ማይል/ሰ</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>ዲግሪ ሴልሺየስ</displayName>
 				<unitPattern count="one">{0}°ሴ</unitPattern>
@@ -6325,40 +7095,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cL</displayName>
-				<unitPattern count="one">{0} cL</unitPattern>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>ኩቢክ ኪሎሜትር</displayName>
 				<unitPattern count="one">{0} ኪሜ³</unitPattern>
 				<unitPattern count="other">{0} ኪሜ³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-meter">
-				<displayName>m³</displayName>
-				<unitPattern count="one">{0} m³</unitPattern>
-				<unitPattern count="other">{0} m³</unitPattern>
+				<displayName>ሜ³</displayName>
+				<unitPattern count="one">{0} ሜ³</unitPattern>
+				<unitPattern count="other">{0} ሜ³</unitPattern>
+				<perUnitPattern>{0}/ሜ³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>ሴሜ³</displayName>
+				<unitPattern count="one">{0} ሴሜ³</unitPattern>
+				<unitPattern count="other">{0} ሴሜ³</unitPattern>
+				<perUnitPattern>{0}/ሴሜ³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>ኩቢክ ማይል</displayName>
@@ -6370,25 +7122,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>cup</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ጫማ³</displayName>
+				<unitPattern count="one">{0} ጫማ³</unitPattern>
+				<unitPattern count="other">{0} ጫማ³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="one">{0} dL</unitPattern>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>ኢንች³</displayName>
+				<unitPattern count="one">{0} ኢንች³</unitPattern>
+				<unitPattern count="other">{0} ኢንች³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -6399,27 +7146,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ሊትር</displayName>
 				<unitPattern count="one">{0} ሊ</unitPattern>
 				<unitPattern count="other">{0} ሊ</unitPattern>
+				<perUnitPattern>{0}/ሊትር</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="one">{0} ML</unitPattern>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0} dL</unitPattern>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>ሴንቲ ሊትር</displayName>
+				<unitPattern count="one">{0} ሴንቲ ሊትር</unitPattern>
+				<unitPattern count="other">{0} ሴንቲ ሊትር</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
 				<unitPattern count="one">{0} mL</unitPattern>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ኤከር ጫማ</displayName>
+				<unitPattern count="one">{0} ኤከር ጫማ</unitPattern>
+				<unitPattern count="other">{0} ኤከር ጫማ</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cup</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>tbsp</displayName>
 				<unitPattern count="one">{0} tbsp</unitPattern>
@@ -6430,6 +7214,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} tsp</unitPattern>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}ምስ</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}ሰ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}ደ</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}ምዕ</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -6439,6 +7229,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ጂ</unitPattern>
 				<unitPattern count="other">{0} ጂ</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -6447,26 +7241,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} ኤክር</unitPattern>
-				<unitPattern count="other">{0} ኤክር</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} ኪሜ²</unitPattern>
+				<unitPattern count="other">{0} ኪሜ²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} ሄክታር</unitPattern>
 				<unitPattern count="other">{0} ሄክታር</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} ጫማ²</unitPattern>
-				<unitPattern count="other">{0} ጫማ²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} ኪሜ²</unitPattern>
-				<unitPattern count="other">{0} ኪሜ²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} ሜ²</unitPattern>
 				<unitPattern count="other">{0} ሜ²</unitPattern>
@@ -6475,9 +7257,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ማይል²</unitPattern>
 				<unitPattern count="other">{0} ማይል²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} ኤክር</unitPattern>
+				<unitPattern count="other">{0} ኤክር</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ጫማ²</unitPattern>
+				<unitPattern count="other">{0} ጫማ²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ሊትር በ100 ኪሎሜትሮች</displayName>
+				<unitPattern count="one">{0}ሊበ100ኪሜ</unitPattern>
+				<unitPattern count="other">{0}ሊበ100ኪሜ</unitPattern>
+			</unit>
 			<unit type="digital-terabyte">
 				<displayName>ቴባይት</displayName>
 			</unit>
+			<unit type="duration-year">
+				<displayName>ዓመታት</displayName>
+				<unitPattern count="one">{0} ዓመት</unitPattern>
+				<unitPattern count="other">{0} ዓ</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ወራት</displayName>
+				<unitPattern count="one">{0} ወር</unitPattern>
+				<unitPattern count="other">{0} ወር</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ሳምንታት</displayName>
+				<unitPattern count="one">{0} ሳምንት</unitPattern>
+				<unitPattern count="other">{0} ሳምንት</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ቀናት</displayName>
 				<unitPattern count="one">{0} ቀ</unitPattern>
@@ -6488,66 +7298,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ሰ</unitPattern>
 				<unitPattern count="other">{0} ሰ</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ሚሊሰከንድ</displayName>
-				<unitPattern count="one">{0} ሚሴ</unitPattern>
-				<unitPattern count="other">{0} ሚሴ</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>ደቂቃዎች</displayName>
 				<unitPattern count="one">{0} ደ</unitPattern>
 				<unitPattern count="other">{0} ደ</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>ወራት</displayName>
-				<unitPattern count="one">{0} ወር</unitPattern>
-				<unitPattern count="other">{0} ወር</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>ሰከንድ</displayName>
 				<unitPattern count="one">{0} ሰ</unitPattern>
 				<unitPattern count="other">{0} ሰ</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>ሳምንታት</displayName>
-				<unitPattern count="one">{0} ሳምንት</unitPattern>
-				<unitPattern count="other">{0} ሳምንት</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>ዓመታት</displayName>
-				<unitPattern count="one">{0} ዓመት</unitPattern>
-				<unitPattern count="other">{0} ዓ</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>ሴንቲሜትር</displayName>
-				<unitPattern count="one">{0} ሴሜ</unitPattern>
-				<unitPattern count="other">{0} ሴሜ</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0} ጫማ</unitPattern>
-				<unitPattern count="other">{0} ጫማ</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0} ኢንች</unitPattern>
-				<unitPattern count="other">{0} ኢንች</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ሚሊሰከንድ</displayName>
+				<unitPattern count="one">{0} ሚሴ</unitPattern>
+				<unitPattern count="other">{0} ሚሴ</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>ኪሎሜትር</displayName>
 				<unitPattern count="one">{0} ኪሜ</unitPattern>
 				<unitPattern count="other">{0} ኪሜ</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} ly</unitPattern>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>ሜትር</displayName>
 				<unitPattern count="one">{0} ሜ</unitPattern>
 				<unitPattern count="other">{0} ሜ</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} ማይል</unitPattern>
-				<unitPattern count="other">{0} ማይል</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>ሴንቲሜትር</displayName>
+				<unitPattern count="one">{0} ሴሜ</unitPattern>
+				<unitPattern count="other">{0} ሴሜ</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>ሚሊሜትር</displayName>
@@ -6558,31 +7337,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ፒሜ</unitPattern>
 				<unitPattern count="other">{0} ፒሜ</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} ማይል</unitPattern>
+				<unitPattern count="other">{0} ማይል</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} ያርድ</unitPattern>
 				<unitPattern count="other">{0} ያርድ</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>ግራም</displayName>
-				<unitPattern count="one">{0} ግ</unitPattern>
-				<unitPattern count="other">{0} ግ</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} ጫማ</unitPattern>
+				<unitPattern count="other">{0} ጫማ</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} ኢንች</unitPattern>
+				<unitPattern count="other">{0} ኢንች</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>ኪሎግራም</displayName>
 				<unitPattern count="one">{0} ኪግ</unitPattern>
 				<unitPattern count="other">{0} ኪግ</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} አውንስ</unitPattern>
-				<unitPattern count="other">{0} አውንስ</unitPattern>
+			<unit type="mass-gram">
+				<displayName>ግራም</displayName>
+				<unitPattern count="one">{0} ግ</unitPattern>
+				<unitPattern count="other">{0} ግ</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} ፓውንድ</unitPattern>
 				<unitPattern count="other">{0} ፓውንድ</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} የፈረስ ኃይል</unitPattern>
-				<unitPattern count="other">{0} የፈረስ ኃይል</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} አውንስ</unitPattern>
+				<unitPattern count="other">{0} አውንስ</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} ኪዋ</unitPattern>
@@ -6592,6 +7383,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ዋ</unitPattern>
 				<unitPattern count="other">{0} ዋ</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} የፈረስ ኃይል</unitPattern>
+				<unitPattern count="other">{0} የፈረስ ኃይል</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
@@ -6639,6 +7434,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ሊ</unitPattern>
 				<unitPattern count="other">{0} ሊ</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}ምስ</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}ሰ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}ደ</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}ምዕ</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/am_ET.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/am_ET.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/am_ET.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/am_ET.xml
index b71442f63b7..dd1ec508d13 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/am_ET.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/am_ET.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="am"/>
 		<territory type="ET"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar.xml
similarity index 56%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar.xml
index ab011105f15..88c80ad7deb 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="ar"/>
 	</identity>
 	<localeDisplayNames>
@@ -43,7 +42,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="arp">الأراباهو</language>
 			<language type="arw">الأراواكية</language>
 			<language type="as">الأسامية</language>
-			<language type="asa" draft="contributed">الآسو</language>
+			<language type="asa">الآسو</language>
 			<language type="ast">الأسترية</language>
 			<language type="av" draft="contributed">الأوارية</language>
 			<language type="awa">الأوادية</language>
@@ -56,12 +55,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bas">الباسا</language>
 			<language type="bax" draft="contributed">بامن</language>
 			<language type="bbj" draft="contributed">لغة الغومالا</language>
-			<language type="be" draft="contributed">البيلاروسية</language>
+			<language type="be">البيلاروسية</language>
 			<language type="bej">البيجا</language>
 			<language type="bem">البيمبا</language>
-			<language type="bez" draft="contributed">بينا</language>
+			<language type="bez">بينا</language>
 			<language type="bfd" draft="contributed">لغة البافوت</language>
 			<language type="bg">البلغارية</language>
+			<language type="bgn">البلوشية الغربية</language>
 			<language type="bho" draft="contributed">البهوجبورية</language>
 			<language type="bi">البيسلامية</language>
 			<language type="bik">البيكولية</language>
@@ -73,7 +73,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bo">التبتية</language>
 			<language type="br">البريتونية</language>
 			<language type="bra">البراجية</language>
-			<language type="brx" draft="contributed">البودو</language>
+			<language type="brx">البودو</language>
 			<language type="bs">البوسنية</language>
 			<language type="bss" draft="contributed">أكوس</language>
 			<language type="bua">البرياتية</language>
@@ -88,7 +88,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="cch">الأتسام</language>
 			<language type="ce">الشيشانية</language>
 			<language type="ceb" draft="contributed">السيبونية</language>
-			<language type="cgg" draft="contributed">تشيغا</language>
+			<language type="cgg">تشيغا</language>
 			<language type="ch">التشامورو</language>
 			<language type="chb">التشيبشا</language>
 			<language type="chg">التشاجاتاي</language>
@@ -99,7 +99,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="chp">الشيباوايان</language>
 			<language type="chr">الشيروكي</language>
 			<language type="chy">الشايان</language>
-			<language type="ckb" draft="contributed">السورانية الكردية</language>
+			<language type="ckb">السورانية الكردية</language>
 			<language type="co">الكورسيكية</language>
 			<language type="cop">القبطية</language>
 			<language type="cr">الكرى</language>
@@ -107,7 +107,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="cs">التشيكية</language>
 			<language type="csb">الكاشبايان</language>
 			<language type="cu">سلافية كنسية</language>
-			<language type="cv" draft="contributed">التشوفاشي</language>
+			<language type="cv">التشوفاشي</language>
 			<language type="cy">الولزية</language>
 			<language type="da">الدانماركية</language>
 			<language type="dak">الداكوتا</language>
@@ -142,14 +142,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="en_CA">الإنجليزية الكندية</language>
 			<language type="en_GB">الإنجليزية البريطانية</language>
 			<language type="en_GB" alt="short">الإنجليزية المملكة المتحدة</language>
-			<language type="en_US">الإنجليزية الولايات المتحدة</language>
+			<language type="en_US">الإنجليزية الأمريكية</language>
 			<language type="en_US" alt="short" draft="contributed">الإنجليزية الولايات المتحدة</language>
 			<language type="enm">الإنجليزية الوسطى</language>
 			<language type="eo">الإسبرانتو</language>
 			<language type="es">الإسبانية</language>
 			<language type="es_419" draft="contributed">الإسبانية أمريكا اللاتينية</language>
 			<language type="es_ES">الإسبانية الأوروبية</language>
-			<language type="es_MX" draft="contributed">الإسبانية المكسيكية</language>
+			<language type="es_MX">الإسبانية المكسيكية</language>
 			<language type="et">الإستونية</language>
 			<language type="eu">لغة الباسك</language>
 			<language type="ewo">الإيوندو</language>
@@ -226,7 +226,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ja">اليابانية</language>
 			<language type="jbo">اللوجبان</language>
 			<language type="jgo">نغومبا</language>
-			<language type="jmc" draft="contributed">الماتشامية</language>
+			<language type="jmc">الماتشامية</language>
 			<language type="jpr" draft="contributed">الفارسية اليهودية</language>
 			<language type="jrb" draft="contributed">العربية اليهودية</language>
 			<language type="jv">الجاوية</language>
@@ -251,7 +251,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="kj">الكيونياما</language>
 			<language type="kk">الكازاخستانية</language>
 			<language type="kl">الكالاليست</language>
-			<language type="kln" draft="contributed">كالينجين</language>
+			<language type="kln">كالينجين</language>
 			<language type="km">الخميرية</language>
 			<language type="kmb">الكيمبندو</language>
 			<language type="kn">الكانادا</language>
@@ -266,7 +266,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="kru" draft="contributed">الكوروخ</language>
 			<language type="ks">الكشميرية</language>
 			<language type="ksb">شامبالا</language>
-			<language type="ksf" draft="contributed">لغة البافيا</language>
+			<language type="ksf">لغة البافيا</language>
 			<language type="ksh" draft="contributed">لغة الكولونيان</language>
 			<language type="ku">الكردية</language>
 			<language type="kum" draft="contributed">القموقية</language>
@@ -288,6 +288,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">اللاوية</language>
 			<language type="lol">منغولى</language>
 			<language type="loz">اللوزي</language>
+			<language type="lrc">اللرية الشمالية</language>
 			<language type="lt">اللتوانية</language>
 			<language type="lu">اللبا-كاتانجا</language>
 			<language type="lua">اللبا-لؤلؤ</language>
@@ -295,7 +296,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lun">اللوندا</language>
 			<language type="luo">اللو</language>
 			<language type="lus" draft="contributed">الميزو</language>
-			<language type="luy" draft="contributed">لغة اللويا</language>
+			<language type="luy">لغة اللويا</language>
 			<language type="lv">اللاتفية</language>
 			<language type="mad">المادريز</language>
 			<language type="mag">الماجا</language>
@@ -307,12 +308,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mdf">الموكشا</language>
 			<language type="mdr">الماندار</language>
 			<language type="men">الميند</language>
-			<language type="mer" draft="contributed">الميرو</language>
-			<language type="mfe" draft="contributed">المورسيانية</language>
+			<language type="mer">الميرو</language>
+			<language type="mfe">المورسيانية</language>
 			<language type="mg">المالاجاشية</language>
 			<language type="mga">الأيرلندية الوسطى</language>
-			<language type="mgh" draft="contributed">ماخاوا-ميتو</language>
-			<language type="mgo" draft="contributed">ميتا</language>
+			<language type="mgh">ماخاوا-ميتو</language>
+			<language type="mgo">ميتا</language>
 			<language type="mh">المارشالية</language>
 			<language type="mi">الماورية</language>
 			<language type="mic">الميكماكيونية</language>
@@ -334,19 +335,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mwr" draft="contributed">الماروارية</language>
 			<language type="my">البورمية</language>
 			<language type="myv">الأرزية</language>
+			<language type="mzn">المازندرانية</language>
 			<language type="na">النورو</language>
 			<language type="nap">اللغة النابولية</language>
-			<language type="naq" draft="contributed">لغة الناما</language>
+			<language type="naq">لغة الناما</language>
 			<language type="nb">البوكمالية النرويجية</language>
 			<language type="nd">النديبيل الشمالي</language>
 			<language type="nds">الألمانية السفلى</language>
+			<language type="nds_NL">السكسونية السفلى</language>
 			<language type="ne">النيبالية</language>
 			<language type="new" draft="contributed">النوارية</language>
 			<language type="ng">الندونجا</language>
 			<language type="nia">النياس</language>
 			<language type="niu">النيوي</language>
 			<language type="nl">الهولندية</language>
-			<language type="nl_BE" draft="contributed">الفلمنكية</language>
+			<language type="nl_BE">الفلمنكية</language>
 			<language type="nmg">كواسيو</language>
 			<language type="nn">النينورسك النرويجي</language>
 			<language type="nnh" draft="contributed">لغة النجيمبون</language>
@@ -356,7 +359,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nqo">أنكو</language>
 			<language type="nr">النديبيل الجنوبي</language>
 			<language type="nso">السوتو الشمالية</language>
-			<language type="nus" draft="contributed">النوير</language>
+			<language type="nus">النوير</language>
 			<language type="nv">النافاجو</language>
 			<language type="nwc">النوارية التقليدية</language>
 			<language type="ny">النيانجا</language>
@@ -397,31 +400,32 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="rn">الرندي</language>
 			<language type="ro">الرومانية</language>
 			<language type="ro_MD">المولدوفية</language>
-			<language type="rof" draft="contributed">الرومبو</language>
+			<language type="rof">الرومبو</language>
 			<language type="rom">غجري</language>
 			<language type="root">الجذر</language>
 			<language type="ru">الروسية</language>
 			<language type="rup">الأرومانيان</language>
 			<language type="rw">الكينيارواندا</language>
-			<language type="rwk" draft="contributed">الروا</language>
+			<language type="rwk">الروا</language>
 			<language type="sa">السنسكريتية</language>
 			<language type="sad">السانداوي</language>
 			<language type="sah">الساخية</language>
 			<language type="sam" draft="contributed">الآرامية السامرية</language>
-			<language type="saq" draft="contributed">سامبورو</language>
+			<language type="saq">سامبورو</language>
 			<language type="sas">الساساك</language>
 			<language type="sat">السانتالي</language>
 			<language type="sba">نامبي</language>
-			<language type="sbp" draft="contributed">سانغو</language>
+			<language type="sbp">سانغو</language>
 			<language type="sc">السردينية</language>
 			<language type="scn">الصقلية</language>
 			<language type="sco">الأسكتلندية</language>
 			<language type="sd">السندية</language>
+			<language type="sdh">الكردية الجنوبية</language>
 			<language type="se">السامي الشمالي</language>
 			<language type="see" draft="contributed">السنيكا</language>
-			<language type="seh" draft="contributed">سينا</language>
+			<language type="seh">سينا</language>
 			<language type="sel">السيلكب</language>
-			<language type="ses" draft="contributed">كويرابورو سيني</language>
+			<language type="ses">كويرابورو سيني</language>
 			<language type="sg">السانجو</language>
 			<language type="sga">الأيرلندية القديمة</language>
 			<language type="sh" draft="contributed">صربية-كرواتية</language>
@@ -454,19 +458,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">السومارية</language>
 			<language type="sv">السويدية</language>
 			<language type="sw">السواحلية</language>
+			<language type="sw_CD">الكونغو السواحلية</language>
 			<language type="swb">القمرية</language>
-			<language type="swc" draft="contributed">لغة الكونغو السواحلية</language>
 			<language type="syc">سريانية تقليدية</language>
 			<language type="syr">السريانية</language>
 			<language type="ta">التاميلية</language>
 			<language type="te">التيلجو</language>
 			<language type="tem">التيمن</language>
-			<language type="teo" draft="contributed">تيسو</language>
+			<language type="teo">تيسو</language>
 			<language type="ter">التيرينو</language>
 			<language type="tet">التيتم</language>
 			<language type="tg">الطاجيكية</language>
 			<language type="th">التايلاندية</language>
-			<language type="ti" draft="contributed">التغرينية</language>
+			<language type="ti">التغرينية</language>
 			<language type="tig" draft="contributed">التغرية</language>
 			<language type="tiv">التيف</language>
 			<language type="tk">التركمانية</language>
@@ -487,10 +491,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="tum">التامبوكا</language>
 			<language type="tvl">التوفالو</language>
 			<language type="tw">التوي</language>
-			<language type="twq" draft="contributed">تاساواق</language>
+			<language type="twq">تاساواق</language>
 			<language type="ty">التاهيتية</language>
 			<language type="tyv" draft="contributed">التوفية</language>
-			<language type="tzm" draft="contributed">الأمازيغية وسط الأطلس</language>
+			<language type="tzm">الأمازيغية وسط الأطلس</language>
 			<language type="udm">الأدمرت</language>
 			<language type="ug">الأغورية</language>
 			<language type="ug" alt="variant">الأيغورية</language>
@@ -499,22 +503,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="umb">الأمبندو</language>
 			<language type="und">لغة غير معروفة</language>
 			<language type="ur">الأردية</language>
-			<language type="uz" draft="contributed">الأوزبكية</language>
+			<language type="uz">الأوزبكية</language>
 			<language type="vai">الفاي</language>
 			<language type="ve">الفيندا</language>
 			<language type="vi">الفيتنامية</language>
 			<language type="vo" draft="contributed">لغة الفولابوك</language>
 			<language type="vot">الفوتيك</language>
-			<language type="vun" draft="contributed">الفونجو</language>
+			<language type="vun">الفونجو</language>
 			<language type="wa">الولونية</language>
 			<language type="wae" draft="contributed">الوالسر</language>
 			<language type="wal" draft="contributed">الولاياتا</language>
 			<language type="war">الواراي</language>
 			<language type="was">الواشو</language>
+			<language type="wbp">وارلبيري</language>
 			<language type="wo">الولوف</language>
 			<language type="xal">الكالميك</language>
 			<language type="xh">الخوسا</language>
-			<language type="xog" draft="contributed">السوغا</language>
+			<language type="xog">السوغا</language>
 			<language type="yao">الياو</language>
 			<language type="yap">اليابيز</language>
 			<language type="yav" draft="contributed">يانجبن</language>
@@ -667,7 +672,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="015">شمال أفريقيا</territory>
 			<territory type="017">وسط أفريقيا</territory>
 			<territory type="018">أفريقيا الجنوبية</territory>
-			<territory type="019">الأمريكتين</territory>
+			<territory type="019">الأمريكتان</territory>
 			<territory type="021">شمال أمريكا</territory>
 			<territory type="029">الكاريبي</territory>
 			<territory type="030">شرق آسيا</territory>
@@ -694,14 +699,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">أنغويلا</territory>
 			<territory type="AL">ألبانيا</territory>
 			<territory type="AM">أرمينيا</territory>
-			<territory type="AN">جزر الأنتيل الهولندية</territory>
 			<territory type="AO">أنغولا</territory>
 			<territory type="AQ">أنتاركتيكا</territory>
 			<territory type="AR">الأرجنتين</territory>
 			<territory type="AS">ساموا الأمريكية</territory>
 			<territory type="AT">النمسا</territory>
 			<territory type="AU">أستراليا</territory>
-			<territory type="AW">آروبا</territory>
+			<territory type="AW">أروبا</territory>
 			<territory type="AX">جزر آلاند</territory>
 			<territory type="AZ">أذربيجان</territory>
 			<territory type="BA">البوسنة والهرسك</territory>
@@ -719,14 +723,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BO">بوليفيا</territory>
 			<territory type="BQ">هولندا الكاريبية</territory>
 			<territory type="BR">البرازيل</territory>
-			<territory type="BS">الباهاما</territory>
+			<territory type="BS">البهاما</territory>
 			<territory type="BT">بوتان</territory>
 			<territory type="BV">جزيرة بوفيه</territory>
 			<territory type="BW">بتسوانا</territory>
-			<territory type="BY">روسيا البيضاء</territory>
+			<territory type="BY">بيلاروس</territory>
 			<territory type="BZ">بليز</territory>
 			<territory type="CA">كندا</territory>
-			<territory type="CC">جزر كوكوس</territory>
+			<territory type="CC">جزر كوكوس (كيلينغ)</territory>
 			<territory type="CD">الكونغو - كينشاسا</territory>
 			<territory type="CD" alt="variant">جمهورية الكونغو الديمقراطية</territory>
 			<territory type="CF">جمهورية أفريقيا الوسطى</territory>
@@ -735,7 +739,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CH">سويسرا</territory>
 			<territory type="CI">ساحل العاج</territory>
 			<territory type="CK">جزر كوك</territory>
-			<territory type="CL">شيلي</territory>
+			<territory type="CL">تشيلي</territory>
 			<territory type="CM">الكاميرون</territory>
 			<territory type="CN">الصين</territory>
 			<territory type="CO">كولومبيا</territory>
@@ -756,10 +760,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="DZ">الجزائر</territory>
 			<territory type="EA">سيوتا وميليلا</territory>
 			<territory type="EC">الإكوادور</territory>
-			<territory type="EE">أستونيا</territory>
+			<territory type="EE">إستونيا</territory>
 			<territory type="EG">مصر</territory>
 			<territory type="EH">الصحراء الغربية</territory>
-			<territory type="ER">أريتريا</territory>
+			<territory type="ER">إريتريا</territory>
 			<territory type="ES">إسبانيا</territory>
 			<territory type="ET">إثيوبيا</territory>
 			<territory type="EU">الاتحاد الأوروبي</territory>
@@ -782,7 +786,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GL">غرينلاند</territory>
 			<territory type="GM">غامبيا</territory>
 			<territory type="GN">غينيا</territory>
-			<territory type="GP">جوادلوب</territory>
+			<territory type="GP">غوادلوب</territory>
 			<territory type="GQ">غينيا الإستوائية</territory>
 			<territory type="GR">اليونان</territory>
 			<territory type="GS">جورجيا الجنوبية وجزر ساندويتش الجنوبية</territory>
@@ -798,7 +802,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="HT">هايتي</territory>
 			<territory type="HU">هنغاريا</territory>
 			<territory type="IC">جزر الكناري</territory>
-			<territory type="ID">أندونيسيا</territory>
+			<territory type="ID">إندونيسيا</territory>
 			<territory type="IE">أيرلندا</territory>
 			<territory type="IL">إسرائيل</territory>
 			<territory type="IM">جزيرة مان</territory>
@@ -870,7 +874,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="NP">نيبال</territory>
 			<territory type="NR">ناورو</territory>
 			<territory type="NU">نيوي</territory>
-			<territory type="NZ">نيوزيلاندا</territory>
+			<territory type="NZ">نيوزيلندا</territory>
 			<territory type="OM">عُمان</territory>
 			<territory type="PA">بنما</territory>
 			<territory type="PE">بيرو</territory>
@@ -916,12 +920,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="SY">سوريا</territory>
 			<territory type="SZ">سوازيلاند</territory>
 			<territory type="TA">تريستان دي كونها</territory>
-			<territory type="TC">جزر الترك وجايكوس</territory>
+			<territory type="TC">جزر توركس وكايكوس</territory>
 			<territory type="TD">تشاد</territory>
-			<territory type="TF">المقاطعات الجنوبية الفرنسية</territory>
-			<territory type="TG">توجو</territory>
+			<territory type="TF">الأقاليم الجنوبية الفرنسية</territory>
+			<territory type="TG">توغو</territory>
 			<territory type="TH">تايلاند</territory>
-			<territory type="TJ">طاجكستان</territory>
+			<territory type="TJ">طاجيكستان</territory>
 			<territory type="TK">توكيلو</territory>
 			<territory type="TL">تيمور الشرقية</territory>
 			<territory type="TM">تركمانستان</territory>
@@ -931,7 +935,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="TT">ترينيداد وتوباغو</territory>
 			<territory type="TV">توفالو</territory>
 			<territory type="TW">تايوان</territory>
-			<territory type="TZ">تانزانيا</territory>
+			<territory type="TZ">تنزانيا</territory>
 			<territory type="UA">أوكرانيا</territory>
 			<territory type="UG">أوغندا</territory>
 			<territory type="UM">جزر الولايات المتحدة النائية</territory>
@@ -988,6 +992,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">التصنيف الرقمي</key>
 			<key type="colStrength" draft="contributed">قوة التصنيف</key>
 			<key type="currency">العملة</key>
+			<key type="hc">نظام التوقيت (12 مقابل 24)</key>
+			<key type="lb">نمط فصل السطور</key>
+			<key type="ms">نظام القياس</key>
 			<key type="numbers">الأرقام</key>
 			<key type="timezone" draft="contributed">المنطقة الزمنية</key>
 			<key type="va" draft="contributed">متغيرات اللغة</key>
@@ -995,98 +1002,108 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x" draft="contributed">استخدام خاص</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">الأرقام العربية الهندية</type>
-			<type type="arabext" key="numbers">الأرقام العربية الهندية الممتدة</type>
-			<type type="armn" key="numbers">الأرقام الأرمينية</type>
-			<type type="armnlow" key="numbers">الأرقام الأرمينية الصغيرة</type>
-			<type type="beng" key="numbers">الأرقام البنغالية</type>
-			<type type="big5han" key="collation">ترتيب فرز الصينية التقليدية (Big5)</type>
-			<type type="buddhist" key="calendar">التقويم البوذي</type>
-			<type type="chinese" key="calendar">التقويم الصيني</type>
-			<type type="coptic" key="calendar">التقويم القبطي</type>
-			<type type="dangi" key="calendar">تقويم دانجي</type>
-			<type type="deva" key="numbers">الأرقام الديفانغارية</type>
-			<type type="dictionary" key="collation">ترتيب فرز القاموس</type>
-			<type type="ducet" key="collation">ترتيب فرز Unicode الافتراضي</type>
-			<type type="ethi" key="numbers">الأرقام الإثيوبية</type>
-			<type type="ethiopic" key="calendar">التقويم الإثيوبي</type>
-			<type type="ethiopic-amete-alem" key="calendar">تقويم أميتي أليم الإثيوبي</type>
-			<type type="finance" key="numbers" draft="contributed">الأرقام المالية</type>
-			<type type="fullwide" key="numbers">أرقام كاملة العرض</type>
-			<type type="gb2312han" key="collation">ترتيب فرز الصينية المبسطة (GB2312)</type>
-			<type type="geor" key="numbers">الأرقام الجورجية</type>
-			<type type="gregorian" key="calendar">التقويم الميلادي</type>
-			<type type="grek" key="numbers">الأرقام اليونانية</type>
-			<type type="greklow" key="numbers">الأرقام اليونانية الصغيرة</type>
-			<type type="gujr" key="numbers">الأرقام الغوجاراتية</type>
-			<type type="guru" key="numbers">الأرقام الغورموخية</type>
-			<type type="hanidec" key="numbers">الأرقام العشرية الصينية</type>
-			<type type="hans" key="numbers">الأرقام الصينية المبسطة</type>
-			<type type="hansfin" key="numbers">الأرقام المالية الصينية المبسطة</type>
-			<type type="hant" key="numbers">الأرقام الصينية التقليدية</type>
-			<type type="hantfin" key="numbers">الأرقام المالية الصينية التقليدية</type>
-			<type type="hebr" key="numbers">الأرقام العبرية</type>
-			<type type="hebrew" key="calendar">التقويم العبري</type>
-			<type type="identical" key="colStrength" draft="contributed">تصنيف الكل</type>
-			<type type="indian" key="calendar">التقويم القومي الهندي</type>
-			<type type="islamic" key="calendar">التقويم الهجري</type>
-			<type type="islamic-civil" key="calendar">التقويم الإسلامي المدني</type>
-			<type type="islamic-rgsa" key="calendar" draft="contributed">التقويم الإسلامي (مستخدم بالسعودية)</type>
-			<type type="islamic-tbla" key="calendar">التقويم الإسلامي (مجدول، العصر الفلكي)</type>
-			<type type="islamic-umalqura" key="calendar">التقويم الإسلامي (أم القرى)</type>
-			<type type="iso8601" key="calendar">تقويم ISO-8601</type>
-			<type type="japanese" key="calendar">التقويم الياباني</type>
-			<type type="jpan" key="numbers">الأرقام اليابانية</type>
-			<type type="jpanfin" key="numbers">الأرقام المالية اليابانية</type>
-			<type type="khmr" key="numbers">الأرقام الخيمرية</type>
-			<type type="knda" key="numbers">أرقام الكانادا</type>
-			<type type="laoo" key="numbers">الأرقام اللاوية</type>
-			<type type="latn" key="numbers">الأرقام الغربية</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">تصنيف الأحرف الصغيرة أولاً</type>
-			<type type="mlym" key="numbers">الأرقام الملايلامية</type>
-			<type type="mong" key="numbers">الأرقام المغولية</type>
-			<type type="mymr" key="numbers">أرقام ميانمار</type>
-			<type type="native" key="numbers" draft="contributed">الأرقام الأصلية</type>
-			<type type="no" key="colBackwards" draft="contributed">تصنيف اللكنات بشكل عادي</type>
-			<type type="no" key="colCaseFirst" draft="contributed">ترتيب تصنيف حالة الأحرف الطبيعية</type>
-			<type type="no" key="colCaseLevel" draft="contributed">تصنيف بحسب الأحرف غير الحساسة لحالة الأحرف</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">تصنيف الكانا بشكل منفصل</type>
-			<type type="no" key="colNormalization" draft="contributed">التصفية بدون تسوية</type>
-			<type type="no" key="colNumeric" draft="contributed">تصنيف الأرقام على حدة</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">تصنيف الرموز</type>
-			<type type="orya" key="numbers">أرقام الأوريا</type>
-			<type type="persian" key="calendar">التقويم الفارسي</type>
-			<type type="phonebook" key="collation">ترتيب فرز دليل الهاتف</type>
-			<type type="phonetic" key="collation" draft="contributed">ترتيب الفرز الصوتي</type>
-			<type type="pinyin" key="collation">الترتيب الصيني بنيين المبسط</type>
-			<type type="primary" key="colStrength" draft="contributed">تصنيف الحروف الأساسية فقط</type>
-			<type type="quaternary" key="colStrength" draft="contributed">تصنيف اللكنات/الحالة/العرض/الكانا</type>
-			<type type="reformed" key="collation">ترتيب فرز محسَّن</type>
-			<type type="roc" key="calendar">تقويم مينجو</type>
-			<type type="roman" key="numbers">الأرقام الرومانية</type>
-			<type type="romanlow" key="numbers">الأرقام الرومانية الصغيرة</type>
-			<type type="search" key="collation">بحث لأغراض عامة</type>
-			<type type="searchjl" key="collation" draft="contributed">بحث باستخدام حرف الهانغول الساكن الأول</type>
-			<type type="secondary" key="colStrength" draft="contributed">تصنيف اللكنات</type>
-			<type type="shifted" key="colAlternate" draft="contributed">تصنيف تجاهل الرموز</type>
-			<type type="standard" key="collation">ترتيب الفرز القياسي</type>
-			<type type="stroke" key="collation">الترتيب الصيني بنيين التقليدي</type>
-			<type type="taml" key="numbers">الأرقام التاميلية التقليدية</type>
-			<type type="tamldec" key="numbers">الأرقام التاميلية</type>
-			<type type="telu" key="numbers">الأرقام التيلوغوية</type>
-			<type type="tertiary" key="colStrength" draft="contributed">تصنيف اللكنات/الحالة/العرض</type>
-			<type type="thai" key="numbers">الأرقام التايلاندية</type>
-			<type type="tibt" key="numbers">الأرقام التبتية</type>
-			<type type="traditional" key="collation">ترتيب تقليدي</type>
-			<type type="traditional" key="numbers" draft="contributed">أرقام تقليدية</type>
-			<type type="unihan" key="collation">ترتيب تصنيف الجذر والضغطات</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">تصنيف الأحرف الكبيرة أولاً</type>
-			<type type="vaii" key="numbers" draft="contributed">أرقام فاي</type>
-			<type type="yes" key="colBackwards" draft="contributed">تصنيف اللكنات معكوسة</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">تصنيف بحسب حساسية الأحرف</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">تصنيف الكانا بشكل مختلف</type>
-			<type type="yes" key="colNormalization" draft="contributed">تصنيف Unicode طبيعي</type>
-			<type type="yes" key="colNumeric" draft="contributed">تصنيف الأرقام بالعدد</type>
+			<type key="calendar" type="buddhist">التقويم البوذي</type>
+			<type key="calendar" type="chinese">التقويم الصيني</type>
+			<type key="calendar" type="coptic">التقويم القبطي</type>
+			<type key="calendar" type="dangi">تقويم دانجي</type>
+			<type key="calendar" type="ethiopic">التقويم الإثيوبي</type>
+			<type key="calendar" type="ethiopic-amete-alem">تقويم أميتي أليم الإثيوبي</type>
+			<type key="calendar" type="gregorian">التقويم الميلادي</type>
+			<type key="calendar" type="hebrew">التقويم العبري</type>
+			<type key="calendar" type="indian">التقويم القومي الهندي</type>
+			<type key="calendar" type="islamic">التقويم الهجري</type>
+			<type key="calendar" type="islamic-civil">التقويم الإسلامي المدني</type>
+			<type key="calendar" type="islamic-rgsa">التقويم الإسلامي (مستخدم بالسعودية)</type>
+			<type key="calendar" type="islamic-tbla">التقويم الإسلامي (مجدول، العصر الفلكي)</type>
+			<type key="calendar" type="islamic-umalqura">التقويم الإسلامي (أم القرى)</type>
+			<type key="calendar" type="iso8601">تقويم ISO-8601</type>
+			<type key="calendar" type="japanese">التقويم الياباني</type>
+			<type key="calendar" type="persian">التقويم الفارسي</type>
+			<type key="calendar" type="roc">تقويم مينجو</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">تصنيف الرموز</type>
+			<type key="colAlternate" type="shifted" draft="contributed">تصنيف تجاهل الرموز</type>
+			<type key="colBackwards" type="no" draft="contributed">تصنيف اللكنات بشكل عادي</type>
+			<type key="colBackwards" type="yes" draft="contributed">تصنيف اللكنات معكوسة</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">تصنيف الأحرف الصغيرة أولاً</type>
+			<type key="colCaseFirst" type="no" draft="contributed">ترتيب تصنيف حالة الأحرف الطبيعية</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">تصنيف الأحرف الكبيرة أولاً</type>
+			<type key="colCaseLevel" type="no" draft="contributed">تصنيف بحسب الأحرف غير الحساسة لحالة الأحرف</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">تصنيف بحسب حساسية الأحرف</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">تصنيف الكانا بشكل منفصل</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">تصنيف الكانا بشكل مختلف</type>
+			<type key="collation" type="big5han">ترتيب فرز الصينية التقليدية (Big5)</type>
+			<type key="collation" type="dictionary">ترتيب فرز القاموس</type>
+			<type key="collation" type="ducet">ترتيب فرز Unicode الافتراضي</type>
+			<type key="collation" type="gb2312han">ترتيب فرز الصينية المبسطة (GB2312)</type>
+			<type key="collation" type="phonebook">ترتيب فرز دليل الهاتف</type>
+			<type key="collation" type="phonetic" draft="contributed">ترتيب الفرز الصوتي</type>
+			<type key="collation" type="pinyin">الترتيب الصيني بنيين المبسط</type>
+			<type key="collation" type="reformed">ترتيب فرز محسَّن</type>
+			<type key="collation" type="search">بحث لأغراض عامة</type>
+			<type key="collation" type="searchjl" draft="contributed">بحث باستخدام حرف الهانغول الساكن الأول</type>
+			<type key="collation" type="standard">ترتيب الفرز القياسي</type>
+			<type key="collation" type="stroke">الترتيب الصيني بنيين التقليدي</type>
+			<type key="collation" type="traditional">ترتيب تقليدي</type>
+			<type key="collation" type="unihan">ترتيب تصنيف الجذر والضغطات</type>
+			<type key="colNormalization" type="no" draft="contributed">التصفية بدون تسوية</type>
+			<type key="colNormalization" type="yes" draft="contributed">تصنيف Unicode طبيعي</type>
+			<type key="colNumeric" type="no" draft="contributed">تصنيف الأرقام على حدة</type>
+			<type key="colNumeric" type="yes" draft="contributed">تصنيف الأرقام بالعدد</type>
+			<type key="colStrength" type="identical" draft="contributed">تصنيف الكل</type>
+			<type key="colStrength" type="primary" draft="contributed">تصنيف الحروف الأساسية فقط</type>
+			<type key="colStrength" type="quaternary" draft="contributed">تصنيف اللكنات/الحالة/العرض/الكانا</type>
+			<type key="colStrength" type="secondary" draft="contributed">تصنيف اللكنات</type>
+			<type key="colStrength" type="tertiary" draft="contributed">تصنيف اللكنات/الحالة/العرض</type>
+			<type key="hc" type="h11">نظام 12 ساعة (0–11)</type>
+			<type key="hc" type="h12">نظام 12 ساعة (1–12)</type>
+			<type key="hc" type="h23">نظام 24 ساعة (0–23)</type>
+			<type key="hc" type="h24">نظام 24 ساعة (1–24)</type>
+			<type key="lb" type="loose">نمط فصل السطور: متباعد</type>
+			<type key="lb" type="normal">نمط فصل السطور: عادي</type>
+			<type key="lb" type="strict">نمط فصل السطور: متقارب</type>
+			<type key="ms" type="metric">نظام متري</type>
+			<type key="ms" type="uksystem">نظام المملكة المتحدة</type>
+			<type key="ms" type="ussystem">نظام الولايات المتحدة</type>
+			<type key="numbers" type="arab">الأرقام العربية الهندية</type>
+			<type key="numbers" type="arabext">الأرقام العربية الهندية الممتدة</type>
+			<type key="numbers" type="armn">الأرقام الأرمينية</type>
+			<type key="numbers" type="armnlow">الأرقام الأرمينية الصغيرة</type>
+			<type key="numbers" type="beng">الأرقام البنغالية</type>
+			<type key="numbers" type="deva">الأرقام الديفانغارية</type>
+			<type key="numbers" type="ethi">الأرقام الإثيوبية</type>
+			<type key="numbers" type="finance" draft="contributed">الأرقام المالية</type>
+			<type key="numbers" type="fullwide">أرقام كاملة العرض</type>
+			<type key="numbers" type="geor">الأرقام الجورجية</type>
+			<type key="numbers" type="grek">الأرقام اليونانية</type>
+			<type key="numbers" type="greklow">الأرقام اليونانية الصغيرة</type>
+			<type key="numbers" type="gujr">الأرقام الغوجاراتية</type>
+			<type key="numbers" type="guru">الأرقام الغورموخية</type>
+			<type key="numbers" type="hanidec">الأرقام العشرية الصينية</type>
+			<type key="numbers" type="hans">الأرقام الصينية المبسطة</type>
+			<type key="numbers" type="hansfin">الأرقام المالية الصينية المبسطة</type>
+			<type key="numbers" type="hant">الأرقام الصينية التقليدية</type>
+			<type key="numbers" type="hantfin">الأرقام المالية الصينية التقليدية</type>
+			<type key="numbers" type="hebr">الأرقام العبرية</type>
+			<type key="numbers" type="jpan">الأرقام اليابانية</type>
+			<type key="numbers" type="jpanfin">الأرقام المالية اليابانية</type>
+			<type key="numbers" type="khmr">الأرقام الخيمرية</type>
+			<type key="numbers" type="knda">أرقام الكانادا</type>
+			<type key="numbers" type="laoo">الأرقام اللاوية</type>
+			<type key="numbers" type="latn">الأرقام الغربية</type>
+			<type key="numbers" type="mlym">الأرقام الملايلامية</type>
+			<type key="numbers" type="mong">الأرقام المغولية</type>
+			<type key="numbers" type="mymr">أرقام ميانمار</type>
+			<type key="numbers" type="native" draft="contributed">الأرقام الأصلية</type>
+			<type key="numbers" type="orya">أرقام الأوريا</type>
+			<type key="numbers" type="roman">الأرقام الرومانية</type>
+			<type key="numbers" type="romanlow">الأرقام الرومانية الصغيرة</type>
+			<type key="numbers" type="taml">الأرقام التاميلية التقليدية</type>
+			<type key="numbers" type="tamldec">الأرقام التاميلية</type>
+			<type key="numbers" type="telu">الأرقام التيلوغوية</type>
+			<type key="numbers" type="thai">الأرقام التايلاندية</type>
+			<type key="numbers" type="tibt">الأرقام التبتية</type>
+			<type key="numbers" type="traditional" draft="contributed">أرقام تقليدية</type>
+			<type key="numbers" type="vaii" draft="contributed">أرقام فاي</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">بي جي إن</transformName>
@@ -1121,12 +1138,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<exemplarCharacters type="auxiliary">[\u200C\u200D\u200E\u200F پ چ ژ ڜ ڢ ڤ ڥ ٯ ڧ ڨ ک گ ی]</exemplarCharacters>
 		<exemplarCharacters type="index">[ا ب ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ك ل م ن ه و ي]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‐ – — ، ؛ \: ! ؟ . ' &quot; ( ) \[ \]]</exemplarCharacters>
-		<ellipsis type="final" draft="contributed">{0}…</ellipsis>
-		<ellipsis type="initial" draft="contributed">…{0}</ellipsis>
-		<ellipsis type="medial" draft="contributed">{0}…{1}</ellipsis>
-		<ellipsis type="word-final" draft="contributed">{0} …</ellipsis>
-		<ellipsis type="word-initial" draft="contributed">… {0}</ellipsis>
-		<ellipsis type="word-medial" draft="contributed">{0} … {1}</ellipsis>
+		<ellipsis type="final">{0}…</ellipsis>
+		<ellipsis type="initial">…{0}</ellipsis>
+		<ellipsis type="medial">{0}…{1}</ellipsis>
+		<ellipsis type="word-final">{0} …</ellipsis>
+		<ellipsis type="word-initial">… {0}</ellipsis>
+		<ellipsis type="word-medial">{0} … {1}</ellipsis>
 		<moreInformation>؟</moreInformation>
 	</characters>
 	<delimiters>
@@ -1139,9 +1156,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<calendars>
 			<calendar type="buddhist">
 				<eras>
-					<eraAbbr>
+					<eraNames>
 						<era type="0">التقويم البوذي</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">BE</era>
 					</eraAbbr>
+					<eraNarrow>
+						<era type="0">BE</era>
+					</eraNarrow>
 				</eras>
 			</calendar>
 			<calendar type="coptic">
@@ -1163,19 +1186,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="13">نسيئ</month>
 						</monthWidth>
 						<monthWidth type="narrow">
-							<month type="1" draft="contributed">1</month>
-							<month type="2" draft="contributed">2</month>
-							<month type="3" draft="contributed">3</month>
-							<month type="4" draft="contributed">4</month>
-							<month type="5" draft="contributed">5</month>
-							<month type="6" draft="contributed">6</month>
-							<month type="7" draft="contributed">7</month>
-							<month type="8" draft="contributed">8</month>
-							<month type="9" draft="contributed">9</month>
-							<month type="10" draft="contributed">10</month>
-							<month type="11" draft="contributed">11</month>
-							<month type="12" draft="contributed">12</month>
-							<month type="13" draft="contributed">13</month>
+							<month type="1">١</month>
+							<month type="2">٢</month>
+							<month type="3">٣</month>
+							<month type="4">٤</month>
+							<month type="5">٥</month>
+							<month type="6">٦</month>
+							<month type="7">٧</month>
+							<month type="8">٨</month>
+							<month type="9">٩</month>
+							<month type="10">١٠</month>
+							<month type="11">١١</month>
+							<month type="12">١٢</month>
+							<month type="13">١٣</month>
 						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">توت</month>
@@ -1210,19 +1233,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="13">نسيئ</month>
 						</monthWidth>
 						<monthWidth type="narrow">
-							<month type="1" draft="contributed">1</month>
-							<month type="2" draft="contributed">2</month>
-							<month type="3" draft="contributed">3</month>
-							<month type="4" draft="contributed">4</month>
-							<month type="5" draft="contributed">5</month>
-							<month type="6" draft="contributed">6</month>
-							<month type="7" draft="contributed">7</month>
-							<month type="8" draft="contributed">8</month>
-							<month type="9" draft="contributed">9</month>
-							<month type="10" draft="contributed">10</month>
-							<month type="11" draft="contributed">11</month>
-							<month type="12" draft="contributed">12</month>
-							<month type="13" draft="contributed">13</month>
+							<month type="1">١</month>
+							<month type="2">٢</month>
+							<month type="3">٣</month>
+							<month type="4">٤</month>
+							<month type="5">٥</month>
+							<month type="6">٦</month>
+							<month type="7">٧</month>
+							<month type="8">٨</month>
+							<month type="9">٩</month>
+							<month type="10">١٠</month>
+							<month type="11">١١</month>
+							<month type="12">١٢</month>
+							<month type="13">١٣</month>
 						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">توت</month>
@@ -1308,7 +1331,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="d" draft="contributed">d</dateFormatItem>
+						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E، d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -1320,12 +1344,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm" draft="contributed">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="M" draft="contributed">L</dateFormatItem>
+						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d/‏M</dateFormatItem>
 						<dateFormatItem id="MEd">E، d/M</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E، d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="ms" draft="contributed">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
@@ -1652,15 +1677,73 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">ص</dayPeriod>
+							<dayPeriod type="pm">م</dayPeriod>
+							<dayPeriod type="morning1">فجرا</dayPeriod>
+							<dayPeriod type="morning2">صباحًا</dayPeriod>
+							<dayPeriod type="afternoon1">ظهرًا</dayPeriod>
+							<dayPeriod type="afternoon2">بعد الظهر</dayPeriod>
+							<dayPeriod type="evening1">مساءً</dayPeriod>
+							<dayPeriod type="night1">منتصف الليل</dayPeriod>
+							<dayPeriod type="night2">ليلاً</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am">ص</dayPeriod>
-							<dayPeriod type="noon">ظ</dayPeriod>
 							<dayPeriod type="pm">م</dayPeriod>
+							<dayPeriod type="morning1">فجرا</dayPeriod>
+							<dayPeriod type="morning2">صباحًا</dayPeriod>
+							<dayPeriod type="afternoon1">ظهرًا</dayPeriod>
+							<dayPeriod type="afternoon2">بعد الظهر</dayPeriod>
+							<dayPeriod type="evening1">مساءً</dayPeriod>
+							<dayPeriod type="night1">منتصف الليل</dayPeriod>
+							<dayPeriod type="night2">ليلاً</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">ص</dayPeriod>
-							<dayPeriod type="noon">ظهرا</dayPeriod>
 							<dayPeriod type="pm">م</dayPeriod>
+							<dayPeriod type="morning1">فجرا</dayPeriod>
+							<dayPeriod type="morning2">صباحًا</dayPeriod>
+							<dayPeriod type="afternoon1">ظهرًا</dayPeriod>
+							<dayPeriod type="afternoon2">بعد الظهر</dayPeriod>
+							<dayPeriod type="evening1">مساءً</dayPeriod>
+							<dayPeriod type="night1">منتصف الليل</dayPeriod>
+							<dayPeriod type="night2">ليلاً</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">ص</dayPeriod>
+							<dayPeriod type="pm">م</dayPeriod>
+							<dayPeriod type="morning1">فجرا</dayPeriod>
+							<dayPeriod type="morning2">صباحًا</dayPeriod>
+							<dayPeriod type="afternoon1">ظهرًا</dayPeriod>
+							<dayPeriod type="afternoon2">بعد الظهر</dayPeriod>
+							<dayPeriod type="evening1">مساءً</dayPeriod>
+							<dayPeriod type="night1">منتصف الليل</dayPeriod>
+							<dayPeriod type="night2">ليلاً</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">ص</dayPeriod>
+							<dayPeriod type="pm">م</dayPeriod>
+							<dayPeriod type="morning1">فجرا</dayPeriod>
+							<dayPeriod type="morning2">صباحًا</dayPeriod>
+							<dayPeriod type="afternoon1">ظهرًا</dayPeriod>
+							<dayPeriod type="afternoon2">بعد الظهر</dayPeriod>
+							<dayPeriod type="evening1">مساءً</dayPeriod>
+							<dayPeriod type="night1">منتصف الليل</dayPeriod>
+							<dayPeriod type="night2">ليلاً</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">صباحًا</dayPeriod>
+							<dayPeriod type="pm">مساءً</dayPeriod>
+							<dayPeriod type="morning1">فجرا</dayPeriod>
+							<dayPeriod type="morning2">صباحًا</dayPeriod>
+							<dayPeriod type="afternoon1">ظهرًا</dayPeriod>
+							<dayPeriod type="afternoon2">بعد الظهر</dayPeriod>
+							<dayPeriod type="evening1">مساءً</dayPeriod>
+							<dayPeriod type="night1">منتصف الليل</dayPeriod>
+							<dayPeriod type="night2">ليلاً</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1742,8 +1825,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="d" draft="contributed">d</dateFormatItem>
-						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
+						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E، d</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
@@ -1798,7 +1881,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="h">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
-							<greatestDifference id="H" draft="contributed">HH–HH</greatestDifference>
+							<greatestDifference id="H">HH–HH</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
@@ -1806,8 +1889,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hm">
-							<greatestDifference id="H" draft="contributed">HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="m" draft="contributed">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
 							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
@@ -1815,15 +1898,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H" draft="contributed">HH:mm–HH:mm v</greatestDifference>
-							<greatestDifference id="m" draft="contributed">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="H">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a">h a – h a v</greatestDifference>
 							<greatestDifference id="h">h–h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
-							<greatestDifference id="H" draft="contributed">HH–HH v</greatestDifference>
+							<greatestDifference id="H">HH–HH v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
@@ -2052,7 +2135,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="1">١</month>
 							<month type="2">٢</month>
 							<month type="3">٣</month>
-							<month type="4">4</month>
+							<month type="4">٤</month>
 							<month type="5">٥</month>
 							<month type="6">٦</month>
 							<month type="7">٧</month>
@@ -2107,24 +2190,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</dateFormats>
 				<dateTimeFormats>
 					<availableFormats>
-						<dateFormatItem id="d" draft="contributed">d</dateFormatItem>
+						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E، d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM، y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E، d MMM، y G</dateFormatItem>
-						<dateFormatItem id="M" draft="contributed">L</dateFormatItem>
+						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d/‏M</dateFormatItem>
 						<dateFormatItem id="MEd">E، d/M</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E، d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
 						<dateFormatItem id="yyyyM">M‏/y G</dateFormatItem>
 						<dateFormatItem id="yyyyMd">d‏/M‏/y G</dateFormatItem>
 						<dateFormatItem id="yyyyMEd">E، d/‏M/‏y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMM" draft="contributed">MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">MMM، y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">d MMM، y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E، d MMM، y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMM">MMMM، y G</dateFormatItem>
@@ -2416,239 +2501,248 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year">
 				<displayName>السنة</displayName>
-				<relative type="-1" draft="contributed">السنة الماضية</relative>
+				<relative type="-1">السنة الماضية</relative>
 				<relative type="0">السنة الحالية</relative>
-				<relative type="1" draft="contributed">السنة التالية</relative>
+				<relative type="1">السنة التالية</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="zero">خلال {0} من السنوات</relativeTimePattern>
-					<relativeTimePattern count="one">خلال {0} من السنوات</relativeTimePattern>
+					<relativeTimePattern count="zero">خلال {0} سنة</relativeTimePattern>
+					<relativeTimePattern count="one">خلال سنة واحدة</relativeTimePattern>
 					<relativeTimePattern count="two">خلال سنتين</relativeTimePattern>
 					<relativeTimePattern count="few">خلال {0} سنوات</relativeTimePattern>
 					<relativeTimePattern count="many">خلال {0} سنة</relativeTimePattern>
-					<relativeTimePattern count="other">خلال {0} من السنوات</relativeTimePattern>
+					<relativeTimePattern count="other">خلال {0} سنة</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="zero">قبل {0} من السنوات</relativeTimePattern>
-					<relativeTimePattern count="one">قبل {0} من السنوات</relativeTimePattern>
+					<relativeTimePattern count="zero">قبل {0} سنة</relativeTimePattern>
+					<relativeTimePattern count="one">قبل سنة واحدة</relativeTimePattern>
 					<relativeTimePattern count="two">قبل سنتين</relativeTimePattern>
 					<relativeTimePattern count="few">قبل {0} سنوات</relativeTimePattern>
 					<relativeTimePattern count="many">قبل {0} سنة</relativeTimePattern>
-					<relativeTimePattern count="other">قبل {0} من السنوات</relativeTimePattern>
+					<relativeTimePattern count="other">قبل {0} سنة</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="year-short">
-				<displayName draft="contributed">السنة</displayName>
+				<displayName>السنة</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="zero">خلال {0} من السنوات</relativeTimePattern>
-					<relativeTimePattern count="one">خلال {0} من السنوات</relativeTimePattern>
-					<relativeTimePattern count="two">خلال {0} من السنوات</relativeTimePattern>
-					<relativeTimePattern count="few">خلال {0} من السنوات</relativeTimePattern>
-					<relativeTimePattern count="many">خلال {0} من السنوات</relativeTimePattern>
-					<relativeTimePattern count="other">خلال {0} من السنوات</relativeTimePattern>
+					<relativeTimePattern count="zero">خلال {0} سنة</relativeTimePattern>
+					<relativeTimePattern count="one">خلال سنة واحدة</relativeTimePattern>
+					<relativeTimePattern count="two">خلال سنتين</relativeTimePattern>
+					<relativeTimePattern count="few">خلال {0} سنوات</relativeTimePattern>
+					<relativeTimePattern count="many">خلال {0} سنة</relativeTimePattern>
+					<relativeTimePattern count="other">خلال {0} سنة</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="zero">قبل {0} من السنوات</relativeTimePattern>
-					<relativeTimePattern count="one">قبل {0} من السنوات</relativeTimePattern>
-					<relativeTimePattern count="two">قبل {0} من السنوات</relativeTimePattern>
-					<relativeTimePattern count="few">قبل {0} من السنوات</relativeTimePattern>
-					<relativeTimePattern count="many">قبل {0} من السنوات</relativeTimePattern>
-					<relativeTimePattern count="other">قبل {0} من السنوات</relativeTimePattern>
+					<relativeTimePattern count="zero">قبل {0} سنة</relativeTimePattern>
+					<relativeTimePattern count="one">قبل سنة واحدة</relativeTimePattern>
+					<relativeTimePattern count="two">قبل سنتين</relativeTimePattern>
+					<relativeTimePattern count="few">قبل {0} سنوات</relativeTimePattern>
+					<relativeTimePattern count="many">قبل {0} سنة</relativeTimePattern>
+					<relativeTimePattern count="other">قبل {0} سنة</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="year-narrow">
-				<displayName draft="contributed">السنة</displayName>
+				<displayName>السنة</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="zero">خلال {0} من السنوات</relativeTimePattern>
-					<relativeTimePattern count="one">خلال {0} من السنوات</relativeTimePattern>
-					<relativeTimePattern count="two">خلال {0} من السنوات</relativeTimePattern>
-					<relativeTimePattern count="few">خلال {0} من السنوات</relativeTimePattern>
-					<relativeTimePattern count="many">خلال {0} من السنوات</relativeTimePattern>
-					<relativeTimePattern count="other">خلال {0} من السنوات</relativeTimePattern>
+					<relativeTimePattern count="zero">خلال {0} سنة</relativeTimePattern>
+					<relativeTimePattern count="one">خلال سنة واحدة</relativeTimePattern>
+					<relativeTimePattern count="two">خلال سنتين</relativeTimePattern>
+					<relativeTimePattern count="few">خلال {0} سنوات</relativeTimePattern>
+					<relativeTimePattern count="many">خلال {0} سنة</relativeTimePattern>
+					<relativeTimePattern count="other">خلال {0} سنة</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="zero">قبل {0} من السنوات</relativeTimePattern>
-					<relativeTimePattern count="one">قبل {0} من السنوات</relativeTimePattern>
-					<relativeTimePattern count="two">قبل {0} من السنوات</relativeTimePattern>
-					<relativeTimePattern count="few">قبل {0} من السنوات</relativeTimePattern>
-					<relativeTimePattern count="many">قبل {0} من السنوات</relativeTimePattern>
-					<relativeTimePattern count="other">قبل {0} من السنوات</relativeTimePattern>
+					<relativeTimePattern count="zero">قبل {0} سنة</relativeTimePattern>
+					<relativeTimePattern count="one">قبل سنة واحدة</relativeTimePattern>
+					<relativeTimePattern count="two">قبل سنتين</relativeTimePattern>
+					<relativeTimePattern count="few">قبل {0} سنوات</relativeTimePattern>
+					<relativeTimePattern count="many">قبل {0} سنة</relativeTimePattern>
+					<relativeTimePattern count="other">قبل {0} سنة</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter">
 				<displayName>ربع السنة</displayName>
+				<relative type="-1" draft="contributed">الربع الأخير</relative>
+				<relative type="0" draft="contributed">هذا الربع</relative>
+				<relative type="1" draft="contributed">الربع القادم</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="zero">خلال {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="one">خلال {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="two">خلال {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="few">خلال {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="many">خلال {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="other">خلال {0} من أرباع السنة</relativeTimePattern>
+					<relativeTimePattern count="zero">خلال {0} ربع سنة</relativeTimePattern>
+					<relativeTimePattern count="one">خلال ربع سنة واحد</relativeTimePattern>
+					<relativeTimePattern count="two">خلال ربعي سنة</relativeTimePattern>
+					<relativeTimePattern count="few">خلال {0} أرباع سنة</relativeTimePattern>
+					<relativeTimePattern count="many">خلال {0} ربع سنة</relativeTimePattern>
+					<relativeTimePattern count="other">خلال {0} ربع سنة</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="zero">قبل {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="one">قبل {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="two">قبل {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="few">قبل {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="many">قبل {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="other">قبل {0} من أرباع السنة</relativeTimePattern>
+					<relativeTimePattern count="zero">قبل {0} ربع سنة</relativeTimePattern>
+					<relativeTimePattern count="one">قبل ربع سنة واحد</relativeTimePattern>
+					<relativeTimePattern count="two">قبل ربعي سنة</relativeTimePattern>
+					<relativeTimePattern count="few">قبل {0} أرباع سنة</relativeTimePattern>
+					<relativeTimePattern count="many">قبل {0} ربع سنة</relativeTimePattern>
+					<relativeTimePattern count="other">قبل {0} ربع سنة</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-short">
 				<displayName>ربع السنة</displayName>
+				<relative type="-1" draft="contributed">الربع الأخير</relative>
+				<relative type="0" draft="contributed">هذا الربع</relative>
+				<relative type="1" draft="contributed">الربع القادم</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="zero">خلال {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="one">خلال {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="two">خلال {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="few">خلال {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="many">خلال {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="other">خلال {0} من أرباع السنة</relativeTimePattern>
+					<relativeTimePattern count="zero">خلال {0} ربع سنة</relativeTimePattern>
+					<relativeTimePattern count="one">خلال ربع سنة واحد</relativeTimePattern>
+					<relativeTimePattern count="two">خلال ربعي سنة</relativeTimePattern>
+					<relativeTimePattern count="few">خلال {0} أرباع سنة</relativeTimePattern>
+					<relativeTimePattern count="many">خلال {0} ربع سنة</relativeTimePattern>
+					<relativeTimePattern count="other">خلال {0} ربع سنة</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="zero">قبل {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="one">قبل {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="two">قبل {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="few">قبل {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="many">قبل {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="other">قبل {0} من أرباع السنة</relativeTimePattern>
+					<relativeTimePattern count="zero">قبل {0} ربع سنة</relativeTimePattern>
+					<relativeTimePattern count="one">قبل ربع سنة واحد</relativeTimePattern>
+					<relativeTimePattern count="two">قبل ربعي سنة</relativeTimePattern>
+					<relativeTimePattern count="few">قبل {0} أرباع سنة</relativeTimePattern>
+					<relativeTimePattern count="many">قبل {0} ربع سنة</relativeTimePattern>
+					<relativeTimePattern count="other">قبل {0} ربع سنة</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-narrow">
 				<displayName>ربع السنة</displayName>
+				<relative type="-1" draft="contributed">الربع الأخير</relative>
+				<relative type="0" draft="contributed">هذا الربع</relative>
+				<relative type="1" draft="contributed">الربع القادم</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="zero">خلال {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="one">خلال {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="two">خلال {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="few">خلال {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="many">خلال {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="other">خلال {0} من أرباع السنة</relativeTimePattern>
+					<relativeTimePattern count="zero">خلال {0} ربع سنة</relativeTimePattern>
+					<relativeTimePattern count="one">خلال ربع سنة واحد</relativeTimePattern>
+					<relativeTimePattern count="two">خلال ربعي سنة</relativeTimePattern>
+					<relativeTimePattern count="few">خلال {0} أرباع سنة</relativeTimePattern>
+					<relativeTimePattern count="many">خلال {0} ربع سنة</relativeTimePattern>
+					<relativeTimePattern count="other">خلال {0} ربع سنة</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="zero">قبل {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="one">قبل {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="two">قبل {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="few">قبل {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="many">قبل {0} من أرباع السنة</relativeTimePattern>
-					<relativeTimePattern count="other">قبل {0} من أرباع السنة</relativeTimePattern>
+					<relativeTimePattern count="zero">قبل {0} ربع سنة</relativeTimePattern>
+					<relativeTimePattern count="one">قبل ربع سنة واحد</relativeTimePattern>
+					<relativeTimePattern count="two">قبل ربعي سنة</relativeTimePattern>
+					<relativeTimePattern count="few">قبل {0} أرباع سنة</relativeTimePattern>
+					<relativeTimePattern count="many">قبل {0} ربع سنة</relativeTimePattern>
+					<relativeTimePattern count="other">قبل {0} ربع سنة</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month">
 				<displayName>الشهر</displayName>
-				<relative type="-1" draft="contributed">الشهر الماضي</relative>
-				<relative type="0" draft="contributed">هذا الشهر</relative>
-				<relative type="1" draft="contributed">الشهر التالي</relative>
+				<relative type="-1">الشهر الماضي</relative>
+				<relative type="0">هذا الشهر</relative>
+				<relative type="1">الشهر التالي</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="zero">خلال {0} من الشهور</relativeTimePattern>
-					<relativeTimePattern count="one">خلال {0} من الشهور</relativeTimePattern>
+					<relativeTimePattern count="zero">خلال {0} شهر</relativeTimePattern>
+					<relativeTimePattern count="one">خلال شهر واحد</relativeTimePattern>
 					<relativeTimePattern count="two">خلال شهرين</relativeTimePattern>
-					<relativeTimePattern count="few">خلال {0} شهور</relativeTimePattern>
+					<relativeTimePattern count="few">خلال {0} أشهر</relativeTimePattern>
 					<relativeTimePattern count="many">خلال {0} شهرًا</relativeTimePattern>
-					<relativeTimePattern count="other">خلال {0} من الشهور</relativeTimePattern>
+					<relativeTimePattern count="other">خلال {0} شهر</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="zero">قبل {0} من الشهور</relativeTimePattern>
-					<relativeTimePattern count="one">قبل {0} من الشهور</relativeTimePattern>
+					<relativeTimePattern count="zero">قبل {0} شهر</relativeTimePattern>
+					<relativeTimePattern count="one">قبل شهر واحد</relativeTimePattern>
 					<relativeTimePattern count="two">قبل شهرين</relativeTimePattern>
 					<relativeTimePattern count="few">قبل {0} أشهر</relativeTimePattern>
 					<relativeTimePattern count="many">قبل {0} شهرًا</relativeTimePattern>
-					<relativeTimePattern count="other">قبل {0} من الشهور</relativeTimePattern>
+					<relativeTimePattern count="other">قبل {0} شهر</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month-short">
-				<displayName draft="contributed">الشهر</displayName>
+				<displayName>الشهر</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="zero">خلال {0} من الشهور</relativeTimePattern>
-					<relativeTimePattern count="one">خلال {0} من الشهور</relativeTimePattern>
-					<relativeTimePattern count="two">خلال {0} من الشهور</relativeTimePattern>
-					<relativeTimePattern count="few">خلال {0} من الشهور</relativeTimePattern>
-					<relativeTimePattern count="many">خلال {0} من الشهور</relativeTimePattern>
-					<relativeTimePattern count="other">خلال {0} من الشهور</relativeTimePattern>
+					<relativeTimePattern count="zero">خلال {0} شهر</relativeTimePattern>
+					<relativeTimePattern count="one">خلال شهر واحد</relativeTimePattern>
+					<relativeTimePattern count="two">خلال شهرين</relativeTimePattern>
+					<relativeTimePattern count="few">خلال {0} أشهر</relativeTimePattern>
+					<relativeTimePattern count="many">خلال {0} شهرًا</relativeTimePattern>
+					<relativeTimePattern count="other">خلال {0} شهر</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="zero">قبل {0} من الشهور</relativeTimePattern>
-					<relativeTimePattern count="one">قبل {0} من الشهور</relativeTimePattern>
-					<relativeTimePattern count="two">قبل {0} من الشهور</relativeTimePattern>
-					<relativeTimePattern count="few">قبل {0} من الشهور</relativeTimePattern>
-					<relativeTimePattern count="many">قبل {0} من الشهور</relativeTimePattern>
-					<relativeTimePattern count="other">قبل {0} من الشهور</relativeTimePattern>
+					<relativeTimePattern count="zero">قبل {0} شهر</relativeTimePattern>
+					<relativeTimePattern count="one">قبل شهر واحد</relativeTimePattern>
+					<relativeTimePattern count="two">قبل شهرين</relativeTimePattern>
+					<relativeTimePattern count="few">خلال {0} أشهر</relativeTimePattern>
+					<relativeTimePattern count="many">قبل {0} شهرًا</relativeTimePattern>
+					<relativeTimePattern count="other">قبل {0} شهر</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month-narrow">
-				<displayName draft="contributed">الشهر</displayName>
+				<displayName>الشهر</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="zero">خلال {0} من الشهور</relativeTimePattern>
-					<relativeTimePattern count="one">خلال {0} من الشهور</relativeTimePattern>
-					<relativeTimePattern count="two">خلال {0} من الشهور</relativeTimePattern>
-					<relativeTimePattern count="few">خلال {0} من الشهور</relativeTimePattern>
-					<relativeTimePattern count="many">خلال {0} من الشهور</relativeTimePattern>
-					<relativeTimePattern count="other">خلال {0} من الشهور</relativeTimePattern>
+					<relativeTimePattern count="zero">خلال {0} شهر</relativeTimePattern>
+					<relativeTimePattern count="one">خلال شهر واحد</relativeTimePattern>
+					<relativeTimePattern count="two">خلال شهرين</relativeTimePattern>
+					<relativeTimePattern count="few">خلال {0} أشهر</relativeTimePattern>
+					<relativeTimePattern count="many">خلال {0} شهرًا</relativeTimePattern>
+					<relativeTimePattern count="other">خلال {0} شهر</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="zero">قبل {0} من الشهور</relativeTimePattern>
-					<relativeTimePattern count="one">قبل {0} من الشهور</relativeTimePattern>
-					<relativeTimePattern count="two">قبل {0} من الشهور</relativeTimePattern>
-					<relativeTimePattern count="few">قبل {0} من الشهور</relativeTimePattern>
-					<relativeTimePattern count="many">قبل {0} من الشهور</relativeTimePattern>
-					<relativeTimePattern count="other">قبل {0} من الشهور</relativeTimePattern>
+					<relativeTimePattern count="zero">قبل {0} شهر</relativeTimePattern>
+					<relativeTimePattern count="one">قبل شهر واحد</relativeTimePattern>
+					<relativeTimePattern count="two">قبل شهرين</relativeTimePattern>
+					<relativeTimePattern count="few">قبل {0} أشهر</relativeTimePattern>
+					<relativeTimePattern count="many">قبل {0} شهرًا</relativeTimePattern>
+					<relativeTimePattern count="other">قبل {0} شهر</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week">
 				<displayName>الأسبوع</displayName>
 				<relative type="-1">الأسبوع الماضي</relative>
 				<relative type="0">هذا الأسبوع</relative>
-				<relative type="1" draft="contributed">الأسبوع التالي</relative>
+				<relative type="1">الأسبوع التالي</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="zero">خلال {0} من الأسابيع</relativeTimePattern>
-					<relativeTimePattern count="one">خلال {0} من الأسابيع</relativeTimePattern>
+					<relativeTimePattern count="zero">خلال {0} أسبوع</relativeTimePattern>
+					<relativeTimePattern count="one">خلال أسبوع واحد</relativeTimePattern>
 					<relativeTimePattern count="two">خلال أسبوعين</relativeTimePattern>
 					<relativeTimePattern count="few">خلال {0} أسابيع</relativeTimePattern>
 					<relativeTimePattern count="many">خلال {0} أسبوعًا</relativeTimePattern>
-					<relativeTimePattern count="other">خلال {0} من الأسابيع</relativeTimePattern>
+					<relativeTimePattern count="other">خلال {0} أسبوع</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="zero">قبل {0} من الأسابيع</relativeTimePattern>
-					<relativeTimePattern count="one">قبل {0} من الأسابيع</relativeTimePattern>
+					<relativeTimePattern count="zero">قبل {0} أسبوع</relativeTimePattern>
+					<relativeTimePattern count="one">قبل أسبوع واحد</relativeTimePattern>
 					<relativeTimePattern count="two">قبل أسبوعين</relativeTimePattern>
 					<relativeTimePattern count="few">قبل {0} أسابيع</relativeTimePattern>
 					<relativeTimePattern count="many">قبل {0} أسبوعًا</relativeTimePattern>
-					<relativeTimePattern count="other">قبل {0} من الأسابيع</relativeTimePattern>
+					<relativeTimePattern count="other">قبل {0} أسبوع</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week-short">
-				<displayName draft="contributed">الأسبوع</displayName>
+				<displayName>الأسبوع</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="zero">خلال {0} من الأسابيع</relativeTimePattern>
-					<relativeTimePattern count="one">خلال {0} من الأسابيع</relativeTimePattern>
-					<relativeTimePattern count="two">خلال {0} من الأسابيع</relativeTimePattern>
-					<relativeTimePattern count="few">خلال {0} من الأسابيع</relativeTimePattern>
-					<relativeTimePattern count="many">خلال {0} من الأسابيع</relativeTimePattern>
-					<relativeTimePattern count="other">خلال {0} من الأسابيع</relativeTimePattern>
+					<relativeTimePattern count="zero">خلال {0} أسبوع</relativeTimePattern>
+					<relativeTimePattern count="one">خلال أسبوع واحد</relativeTimePattern>
+					<relativeTimePattern count="two">خلال {0} أسبوعين</relativeTimePattern>
+					<relativeTimePattern count="few">خلال {0} أسابيع</relativeTimePattern>
+					<relativeTimePattern count="many">خلال {0} أسبوعًا</relativeTimePattern>
+					<relativeTimePattern count="other">خلال {0} أسبوع</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="zero">قبل {0} من الأسابيع</relativeTimePattern>
-					<relativeTimePattern count="one">قبل {0} من الأسابيع</relativeTimePattern>
-					<relativeTimePattern count="two">قبل {0} من الأسابيع</relativeTimePattern>
-					<relativeTimePattern count="few">قبل {0} من الأسابيع</relativeTimePattern>
-					<relativeTimePattern count="many">قبل {0} من الأسابيع</relativeTimePattern>
-					<relativeTimePattern count="other">قبل {0} من الأسابيع</relativeTimePattern>
+					<relativeTimePattern count="zero">قبل {0} أسبوع</relativeTimePattern>
+					<relativeTimePattern count="one">قبل أسبوع واحد</relativeTimePattern>
+					<relativeTimePattern count="two">قبل أسبوعين</relativeTimePattern>
+					<relativeTimePattern count="few">قبل {0} أسابيع</relativeTimePattern>
+					<relativeTimePattern count="many">قبل {0} أسبوعًا</relativeTimePattern>
+					<relativeTimePattern count="other">قبل {0} أسبوع</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week-narrow">
-				<displayName draft="contributed">الأسبوع</displayName>
+				<displayName>الأسبوع</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="zero">خلال {0} من الأسابيع</relativeTimePattern>
-					<relativeTimePattern count="one">خلال {0} من الأسابيع</relativeTimePattern>
-					<relativeTimePattern count="two">خلال {0} من الأسابيع</relativeTimePattern>
-					<relativeTimePattern count="few">خلال {0} من الأسابيع</relativeTimePattern>
-					<relativeTimePattern count="many">خلال {0} من الأسابيع</relativeTimePattern>
-					<relativeTimePattern count="other">خلال {0} من الأسابيع</relativeTimePattern>
+					<relativeTimePattern count="zero">خلال {0} أسبوع</relativeTimePattern>
+					<relativeTimePattern count="one">خلال أسبوع واحد</relativeTimePattern>
+					<relativeTimePattern count="two">خلال أسبوعين</relativeTimePattern>
+					<relativeTimePattern count="few">خلال {0} أسابيع</relativeTimePattern>
+					<relativeTimePattern count="many">خلال {0} أسبوعًا</relativeTimePattern>
+					<relativeTimePattern count="other">خلال {0} أسبوع</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="zero">قبل {0} من الأسابيع</relativeTimePattern>
-					<relativeTimePattern count="one">قبل {0} من الأسابيع</relativeTimePattern>
-					<relativeTimePattern count="two">قبل {0} من الأسابيع</relativeTimePattern>
-					<relativeTimePattern count="few">قبل {0} من الأسابيع</relativeTimePattern>
-					<relativeTimePattern count="many">قبل {0} من الأسابيع</relativeTimePattern>
-					<relativeTimePattern count="other">قبل {0} من الأسابيع</relativeTimePattern>
+					<relativeTimePattern count="zero">قبل {0} أسبوع</relativeTimePattern>
+					<relativeTimePattern count="one">قبل أسبوع واحد</relativeTimePattern>
+					<relativeTimePattern count="two">قبل أسبوعين</relativeTimePattern>
+					<relativeTimePattern count="few">قبل {0} أسابيع</relativeTimePattern>
+					<relativeTimePattern count="many">قبل {0} أسبوعًا</relativeTimePattern>
+					<relativeTimePattern count="other">قبل {0} أسبوع</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day">
@@ -2659,58 +2753,58 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">غدًا</relative>
 				<relative type="2">بعد الغد</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="zero">خلال {0} من الأيام</relativeTimePattern>
-					<relativeTimePattern count="one">خلال {0} من الأيام</relativeTimePattern>
+					<relativeTimePattern count="zero">خلال {0} يوم</relativeTimePattern>
+					<relativeTimePattern count="one">خلال يوم واحد</relativeTimePattern>
 					<relativeTimePattern count="two">خلال يومين</relativeTimePattern>
 					<relativeTimePattern count="few">خلال {0} أيام</relativeTimePattern>
 					<relativeTimePattern count="many">خلال {0} يومًا</relativeTimePattern>
-					<relativeTimePattern count="other">خلال {0} من الأيام</relativeTimePattern>
+					<relativeTimePattern count="other">خلال {0} يوم</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="zero">قبل {0} من الأيام</relativeTimePattern>
-					<relativeTimePattern count="one">قبل {0} من الأيام</relativeTimePattern>
+					<relativeTimePattern count="zero">قبل {0} يوم</relativeTimePattern>
+					<relativeTimePattern count="one">قبل يوم واحد</relativeTimePattern>
 					<relativeTimePattern count="two">قبل يومين</relativeTimePattern>
 					<relativeTimePattern count="few">قبل {0} أيام</relativeTimePattern>
 					<relativeTimePattern count="many">قبل {0} يومًا</relativeTimePattern>
-					<relativeTimePattern count="other">قبل {0} من الأيام</relativeTimePattern>
+					<relativeTimePattern count="other">قبل {0} يوم</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day-short">
-				<displayName draft="contributed">يوم</displayName>
+				<displayName>يوم</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="zero">خلال {0} من الأيام</relativeTimePattern>
-					<relativeTimePattern count="one">خلال {0} من الأيام</relativeTimePattern>
-					<relativeTimePattern count="two">خلال {0} من الأيام</relativeTimePattern>
-					<relativeTimePattern count="few">خلال {0} من الأيام</relativeTimePattern>
-					<relativeTimePattern count="many">خلال {0} من الأيام</relativeTimePattern>
-					<relativeTimePattern count="other">خلال {0} من الأيام</relativeTimePattern>
+					<relativeTimePattern count="zero">خلال {0} يوم</relativeTimePattern>
+					<relativeTimePattern count="one">خلال يوم واحد</relativeTimePattern>
+					<relativeTimePattern count="two">خلال يومين</relativeTimePattern>
+					<relativeTimePattern count="few">خلال {0} أيام</relativeTimePattern>
+					<relativeTimePattern count="many">خلال {0} يومًا</relativeTimePattern>
+					<relativeTimePattern count="other">خلال {0} يوم</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="zero">قبل {0} من الأيام</relativeTimePattern>
-					<relativeTimePattern count="one">قبل {0} من الأيام</relativeTimePattern>
-					<relativeTimePattern count="two">قبل {0} من الأيام</relativeTimePattern>
-					<relativeTimePattern count="few">قبل {0} من الأيام</relativeTimePattern>
-					<relativeTimePattern count="many">قبل {0} من الأيام</relativeTimePattern>
-					<relativeTimePattern count="other">قبل {0} من الأيام</relativeTimePattern>
+					<relativeTimePattern count="zero">قبل {0} يوم</relativeTimePattern>
+					<relativeTimePattern count="one">قبل يوم واحد</relativeTimePattern>
+					<relativeTimePattern count="two">قبل يومين</relativeTimePattern>
+					<relativeTimePattern count="few">قبل {0} أيام</relativeTimePattern>
+					<relativeTimePattern count="many">قبل {0} يومًا</relativeTimePattern>
+					<relativeTimePattern count="other">قبل {0} يوم</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day-narrow">
-				<displayName draft="contributed">يوم</displayName>
+				<displayName>يوم</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="zero">خلال {0} من الأيام</relativeTimePattern>
-					<relativeTimePattern count="one">خلال {0} من الأيام</relativeTimePattern>
-					<relativeTimePattern count="two">خلال {0} من الأيام</relativeTimePattern>
-					<relativeTimePattern count="few">خلال {0} من الأيام</relativeTimePattern>
-					<relativeTimePattern count="many">خلال {0} من الأيام</relativeTimePattern>
-					<relativeTimePattern count="other">خلال {0} من الأيام</relativeTimePattern>
+					<relativeTimePattern count="zero">خلال {0} يوم</relativeTimePattern>
+					<relativeTimePattern count="one">خلال يوم واحد</relativeTimePattern>
+					<relativeTimePattern count="two">خلال يومين</relativeTimePattern>
+					<relativeTimePattern count="few">خلال {0} أيام</relativeTimePattern>
+					<relativeTimePattern count="many">خلال {0} يومًا</relativeTimePattern>
+					<relativeTimePattern count="other">خلال {0} يوم</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="zero">قبل {0} من الأيام</relativeTimePattern>
-					<relativeTimePattern count="one">قبل {0} من الأيام</relativeTimePattern>
-					<relativeTimePattern count="two">قبل {0} من الأيام</relativeTimePattern>
-					<relativeTimePattern count="few">قبل {0} من الأيام</relativeTimePattern>
-					<relativeTimePattern count="many">قبل {0} من الأيام</relativeTimePattern>
-					<relativeTimePattern count="other">قبل {0} من الأيام</relativeTimePattern>
+					<relativeTimePattern count="zero">قبل {0} يوم</relativeTimePattern>
+					<relativeTimePattern count="one">قبل يوم واحد</relativeTimePattern>
+					<relativeTimePattern count="two">قبل يومين</relativeTimePattern>
+					<relativeTimePattern count="few">قبل {0} أيام</relativeTimePattern>
+					<relativeTimePattern count="many">قبل {0} يومًا</relativeTimePattern>
+					<relativeTimePattern count="other">قبل {0} يوم</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="weekday">
@@ -2719,105 +2813,107 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="sun">
 				<relative type="-1">الأحد الماضي</relative>
 				<relative type="0">الأحد الحالي</relative>
-				<relative type="1" draft="contributed">الأحد التالي</relative>
+				<relative type="1">الأحد القادم</relative>
 			</field>
 			<field type="sun-short">
-				<relative type="0" draft="contributed">الأحد الحالي</relative>
-				<relative type="1" draft="contributed">الأحد القادم</relative>
+				<relative type="-1">الأحد الماضي</relative>
+				<relative type="0">الأحد الحالي</relative>
+				<relative type="1">الأحد القادم</relative>
 			</field>
 			<field type="sun-narrow">
-				<relative type="-1" draft="contributed">الأحد الماضي</relative>
-				<relative type="0" draft="contributed">الأحد الحالي</relative>
-				<relative type="1" draft="contributed">الأحد القادم</relative>
+				<relative type="-1">الأحد الماضي</relative>
+				<relative type="0">الأحد الحالي</relative>
+				<relative type="1">الأحد القادم</relative>
 			</field>
 			<field type="mon">
-				<relative type="-1" draft="contributed">الاثنين الماضي</relative>
-				<relative type="0" draft="contributed">الاثنين الحالي</relative>
-				<relative type="1" draft="contributed">الاثنين التالي</relative>
+				<relative type="-1">الاثنين الماضي</relative>
+				<relative type="0">الاثنين الحالي</relative>
+				<relative type="1">الاثنين القادم</relative>
 			</field>
 			<field type="mon-short">
-				<relative type="-1" draft="contributed">الاثنين الماضي</relative>
-				<relative type="0" draft="contributed">الاثنين الحالي</relative>
-				<relative type="1" draft="contributed">الاثنين القادم</relative>
+				<relative type="-1">الاثنين الماضي</relative>
+				<relative type="0">الاثنين الحالي</relative>
+				<relative type="1">الاثنين القادم</relative>
 			</field>
 			<field type="mon-narrow">
-				<relative type="-1" draft="contributed">الاثنين الماضي</relative>
-				<relative type="0" draft="contributed">الاثنين الحالي</relative>
-				<relative type="1" draft="contributed">الاثنين القادم</relative>
+				<relative type="-1">الاثنين الماضي</relative>
+				<relative type="0">الاثنين الحالي</relative>
+				<relative type="1">الاثنين القادم</relative>
 			</field>
 			<field type="tue">
-				<relative type="-1" draft="contributed">الثلاثاء الماضي</relative>
-				<relative type="0" draft="contributed">الثلاثاء الحالي</relative>
-				<relative type="1" draft="contributed">الثلاثاء التالي</relative>
+				<relative type="-1">الثلاثاء الماضي</relative>
+				<relative type="0">الثلاثاء الحالي</relative>
+				<relative type="1">الثلاثاء القادم</relative>
 			</field>
 			<field type="tue-short">
-				<relative type="-1" draft="contributed">الثلاثاء الماضي</relative>
-				<relative type="0" draft="contributed">الثلاثاء الحالي</relative>
-				<relative type="1" draft="contributed">الثلاثاء القادم</relative>
+				<relative type="-1">الثلاثاء الماضي</relative>
+				<relative type="0">الثلاثاء الحالي</relative>
+				<relative type="1">الثلاثاء القادم</relative>
 			</field>
 			<field type="tue-narrow">
-				<relative type="-1" draft="contributed">الثلاثاء الماضي</relative>
-				<relative type="0" draft="contributed">الثلاثاء الحالي</relative>
-				<relative type="1" draft="contributed">الثلاثاء القادم</relative>
+				<relative type="-1">الثلاثاء الماضي</relative>
+				<relative type="0">الثلاثاء الحالي</relative>
+				<relative type="1">الثلاثاء القادم</relative>
 			</field>
 			<field type="wed">
-				<relative type="-1" draft="contributed">الأربعاء الماضي</relative>
-				<relative type="0" draft="contributed">الأربعاء الحالي</relative>
-				<relative type="1" draft="contributed">الأربعاء التالي</relative>
+				<relative type="-1">الأربعاء الماضي</relative>
+				<relative type="0">الأربعاء الحالي</relative>
+				<relative type="1">الأربعاء القادم</relative>
 			</field>
 			<field type="wed-short">
-				<relative type="0" draft="contributed">الأربعاء الحالي</relative>
-				<relative type="1" draft="contributed">الأربعاء القادم</relative>
+				<relative type="-1">الأربعاء الماضي</relative>
+				<relative type="0">الأربعاء الحالي</relative>
+				<relative type="1">الأربعاء القادم</relative>
 			</field>
 			<field type="wed-narrow">
-				<relative type="-1" draft="contributed">الأربعاء الماضي</relative>
-				<relative type="0" draft="contributed">الأربعاء الحالي</relative>
-				<relative type="1" draft="contributed">الأربعاء القادم</relative>
+				<relative type="-1">الأربعاء الماضي</relative>
+				<relative type="0">الأربعاء الحالي</relative>
+				<relative type="1">الأربعاء القادم</relative>
 			</field>
 			<field type="thu">
-				<relative type="-1" draft="contributed">الخميس الماضي</relative>
-				<relative type="0" draft="contributed">الخميس الحالي</relative>
-				<relative type="1" draft="contributed">الخميس التالي</relative>
+				<relative type="-1">الخميس الماضي</relative>
+				<relative type="0">الخميس الحالي</relative>
+				<relative type="1">الخميس القادم</relative>
 			</field>
 			<field type="thu-short">
-				<relative type="-1" draft="contributed">الخميس الماضي</relative>
-				<relative type="0" draft="contributed">الخميس الحالي</relative>
-				<relative type="1" draft="contributed">الخميس القادم</relative>
+				<relative type="-1">الخميس الماضي</relative>
+				<relative type="0">الخميس الحالي</relative>
+				<relative type="1">الخميس القادم</relative>
 			</field>
 			<field type="thu-narrow">
-				<relative type="-1" draft="contributed">الخميس الماضي</relative>
-				<relative type="0" draft="contributed">الخميس الحالي</relative>
-				<relative type="1" draft="contributed">الخميس القادم</relative>
+				<relative type="-1">الخميس الماضي</relative>
+				<relative type="0">الخميس الحالي</relative>
+				<relative type="1">الخميس القادم</relative>
 			</field>
 			<field type="fri">
-				<relative type="-1" draft="contributed">الجمعة الماضية</relative>
-				<relative type="0" draft="contributed">الجمعة الحالية</relative>
-				<relative type="1" draft="contributed">الجمعة التالية</relative>
+				<relative type="-1">الجمعة الماضي</relative>
+				<relative type="0">الجمعة الحالي</relative>
+				<relative type="1">الجمعة القادم</relative>
 			</field>
 			<field type="fri-short">
-				<relative type="-1" draft="contributed">الجمعة الماضية</relative>
-				<relative type="0" draft="contributed">الجمعة الحالية</relative>
-				<relative type="1" draft="contributed">الجمعة القادمة</relative>
+				<relative type="-1">الجمعة الماضي</relative>
+				<relative type="0">الجمعة الحالي</relative>
+				<relative type="1">الجمعة القادم</relative>
 			</field>
 			<field type="fri-narrow">
-				<relative type="-1" draft="contributed">الجمعة الماضية</relative>
-				<relative type="0" draft="contributed">الجمعة الحالية</relative>
-				<relative type="1" draft="contributed">الجمعة القادمة</relative>
+				<relative type="-1">الجمعة الماضي</relative>
+				<relative type="0">الجمعة الحالي</relative>
+				<relative type="1">الجمعة القادم</relative>
 			</field>
 			<field type="sat">
-				<relative type="-1" draft="contributed">السبت الماضي</relative>
-				<relative type="0" draft="contributed">السبت الحالي</relative>
-				<relative type="1" draft="contributed">السبت التالي</relative>
+				<relative type="-1">السبت الماضي</relative>
+				<relative type="0">السبت الحالي</relative>
+				<relative type="1">السبت القادم</relative>
 			</field>
 			<field type="sat-short">
-				<relative type="-1" draft="contributed">السبت الماضي</relative>
-				<relative type="0" draft="contributed">السبت الحالي</relative>
-				<relative type="1" draft="contributed">السبت القادم</relative>
+				<relative type="-1">السبت الماضي</relative>
+				<relative type="0">السبت الحالي</relative>
+				<relative type="1">السبت القادم</relative>
 			</field>
 			<field type="sat-narrow">
-				<relative type="-1" draft="contributed">السبت الماضي</relative>
-				<relative type="0" draft="contributed">السبت الحالي</relative>
-				<relative type="1" draft="contributed">السبت القادم</relative>
+				<relative type="-1">السبت الماضي</relative>
+				<relative type="0">السبت الحالي</relative>
+				<relative type="1">السبت القادم</relative>
 			</field>
 			<field type="dayperiod">
 				<displayName>ص/م</displayName>
@@ -2825,173 +2921,173 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="hour">
 				<displayName>الساعات</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="zero">خلال {0} من الساعات</relativeTimePattern>
-					<relativeTimePattern count="one">خلال {0} من الساعات</relativeTimePattern>
+					<relativeTimePattern count="zero">خلال {0} ساعة</relativeTimePattern>
+					<relativeTimePattern count="one">خلال ساعة واحدة</relativeTimePattern>
 					<relativeTimePattern count="two">خلال ساعتين</relativeTimePattern>
 					<relativeTimePattern count="few">خلال {0} ساعات</relativeTimePattern>
 					<relativeTimePattern count="many">خلال {0} ساعة</relativeTimePattern>
-					<relativeTimePattern count="other">خلال {0} من الساعات</relativeTimePattern>
+					<relativeTimePattern count="other">خلال {0} ساعة</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="zero">قبل {0} من الساعات</relativeTimePattern>
-					<relativeTimePattern count="one">قبل {0} من الساعات</relativeTimePattern>
+					<relativeTimePattern count="zero">قبل {0} ساعة</relativeTimePattern>
+					<relativeTimePattern count="one">قبل ساعة واحدة</relativeTimePattern>
 					<relativeTimePattern count="two">قبل ساعتين</relativeTimePattern>
 					<relativeTimePattern count="few">قبل {0} ساعات</relativeTimePattern>
 					<relativeTimePattern count="many">قبل {0} ساعة</relativeTimePattern>
-					<relativeTimePattern count="other">قبل {0} من الساعات</relativeTimePattern>
+					<relativeTimePattern count="other">قبل {0} ساعة</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-short">
-				<displayName draft="contributed">الساعات</displayName>
+				<displayName>الساعات</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="zero">خلال {0} من الساعات</relativeTimePattern>
-					<relativeTimePattern count="one">خلال {0} من الساعات</relativeTimePattern>
-					<relativeTimePattern count="two">خلال {0} من الساعات</relativeTimePattern>
-					<relativeTimePattern count="few">خلال {0} من الساعات</relativeTimePattern>
-					<relativeTimePattern count="many">خلال {0} من الساعات</relativeTimePattern>
-					<relativeTimePattern count="other">خلال {0} من الساعات</relativeTimePattern>
+					<relativeTimePattern count="zero">خلال {0} ساعة</relativeTimePattern>
+					<relativeTimePattern count="one">خلال ساعة واحدة</relativeTimePattern>
+					<relativeTimePattern count="two">خلال ساعتين</relativeTimePattern>
+					<relativeTimePattern count="few">خلال {0} ساعات</relativeTimePattern>
+					<relativeTimePattern count="many">خلال {0} ساعة</relativeTimePattern>
+					<relativeTimePattern count="other">خلال {0} ساعة</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="zero">قبل {0} من الساعات</relativeTimePattern>
-					<relativeTimePattern count="one">قبل {0} من الساعات</relativeTimePattern>
-					<relativeTimePattern count="two">قبل {0} من الساعات</relativeTimePattern>
-					<relativeTimePattern count="few">قبل {0} من الساعات</relativeTimePattern>
-					<relativeTimePattern count="many">قبل {0} من الساعات</relativeTimePattern>
-					<relativeTimePattern count="other">قبل {0} من الساعات</relativeTimePattern>
+					<relativeTimePattern count="zero">قبل {0} ساعة</relativeTimePattern>
+					<relativeTimePattern count="one">قبل ساعة واحدة</relativeTimePattern>
+					<relativeTimePattern count="two">قبل ساعتين</relativeTimePattern>
+					<relativeTimePattern count="few">قبل {0} ساعات</relativeTimePattern>
+					<relativeTimePattern count="many">قبل {0} ساعة</relativeTimePattern>
+					<relativeTimePattern count="other">قبل {0} ساعة</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-narrow">
-				<displayName draft="contributed">الساعات</displayName>
+				<displayName>الساعات</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="zero">خلال {0} من الساعات</relativeTimePattern>
-					<relativeTimePattern count="one">خلال {0} من الساعات</relativeTimePattern>
-					<relativeTimePattern count="two">خلال {0} من الساعات</relativeTimePattern>
-					<relativeTimePattern count="few">خلال {0} من الساعات</relativeTimePattern>
-					<relativeTimePattern count="many">خلال {0} من الساعات</relativeTimePattern>
-					<relativeTimePattern count="other">خلال {0} من الساعات</relativeTimePattern>
+					<relativeTimePattern count="zero">خلال {0} ساعة</relativeTimePattern>
+					<relativeTimePattern count="one">خلال ساعة واحدة</relativeTimePattern>
+					<relativeTimePattern count="two">خلال ساعتين</relativeTimePattern>
+					<relativeTimePattern count="few">خلال {0} ساعات</relativeTimePattern>
+					<relativeTimePattern count="many">خلال {0} ساعة</relativeTimePattern>
+					<relativeTimePattern count="other">خلال {0} ساعة</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="zero">قبل {0} من الساعات</relativeTimePattern>
-					<relativeTimePattern count="one">قبل {0} من الساعات</relativeTimePattern>
-					<relativeTimePattern count="two">قبل {0} من الساعات</relativeTimePattern>
-					<relativeTimePattern count="few">قبل {0} من الساعات</relativeTimePattern>
-					<relativeTimePattern count="many">قبل {0} من الساعات</relativeTimePattern>
-					<relativeTimePattern count="other">قبل {0} من الساعات</relativeTimePattern>
+					<relativeTimePattern count="zero">قبل {0} ساعة</relativeTimePattern>
+					<relativeTimePattern count="one">قبل ساعة واحدة</relativeTimePattern>
+					<relativeTimePattern count="two">قبل ساعتين</relativeTimePattern>
+					<relativeTimePattern count="few">قبل {0} ساعات</relativeTimePattern>
+					<relativeTimePattern count="many">قبل {0} ساعة</relativeTimePattern>
+					<relativeTimePattern count="other">قبل {0} ساعة</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute">
 				<displayName>الدقائق</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="zero">خلال {0} من الدقائق</relativeTimePattern>
-					<relativeTimePattern count="one">خلال {0} من الدقائق</relativeTimePattern>
+					<relativeTimePattern count="zero">خلال {0} دقيقة</relativeTimePattern>
+					<relativeTimePattern count="one">خلال دقيقة واحدة</relativeTimePattern>
 					<relativeTimePattern count="two">خلال دقيقتين</relativeTimePattern>
 					<relativeTimePattern count="few">خلال {0} دقائق</relativeTimePattern>
 					<relativeTimePattern count="many">خلال {0} دقيقة</relativeTimePattern>
-					<relativeTimePattern count="other">خلال {0} من الدقائق</relativeTimePattern>
+					<relativeTimePattern count="other">خلال {0} دقيقة</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="zero">قبل {0} من الدقائق</relativeTimePattern>
-					<relativeTimePattern count="one">قبل {0} من الدقائق</relativeTimePattern>
+					<relativeTimePattern count="zero">قبل {0} دقيقة</relativeTimePattern>
+					<relativeTimePattern count="one">قبل دقيقة واحدة</relativeTimePattern>
 					<relativeTimePattern count="two">قبل دقيقتين</relativeTimePattern>
 					<relativeTimePattern count="few">قبل {0} دقائق</relativeTimePattern>
 					<relativeTimePattern count="many">قبل {0} دقيقة</relativeTimePattern>
-					<relativeTimePattern count="other">قبل {0} من الدقائق</relativeTimePattern>
+					<relativeTimePattern count="other">قبل {0} دقيقة</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute-short">
-				<displayName draft="contributed">الدقائق</displayName>
+				<displayName>الدقائق</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="zero">خلال {0} من الدقائق</relativeTimePattern>
-					<relativeTimePattern count="one">خلال {0} من الدقائق</relativeTimePattern>
-					<relativeTimePattern count="two">خلال {0} من الدقائق</relativeTimePattern>
-					<relativeTimePattern count="few">خلال {0} من الدقائق</relativeTimePattern>
-					<relativeTimePattern count="many">خلال {0} من الدقائق</relativeTimePattern>
-					<relativeTimePattern count="other">خلال {0} من الدقائق</relativeTimePattern>
+					<relativeTimePattern count="zero">خلال {0} دقيقة</relativeTimePattern>
+					<relativeTimePattern count="one">خلال دقيقة واحدة</relativeTimePattern>
+					<relativeTimePattern count="two">خلال دقيقتين</relativeTimePattern>
+					<relativeTimePattern count="few">خلال {0} دقائق</relativeTimePattern>
+					<relativeTimePattern count="many">خلال {0} دقيقة</relativeTimePattern>
+					<relativeTimePattern count="other">خلال {0} دقيقة</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="zero">قبل {0} من الدقائق</relativeTimePattern>
-					<relativeTimePattern count="one">قبل {0} من الدقائق</relativeTimePattern>
-					<relativeTimePattern count="two">قبل {0} من الدقائق</relativeTimePattern>
-					<relativeTimePattern count="few">قبل {0} من الدقائق</relativeTimePattern>
-					<relativeTimePattern count="many">قبل {0} من الدقائق</relativeTimePattern>
-					<relativeTimePattern count="other">قبل {0} من الدقائق</relativeTimePattern>
+					<relativeTimePattern count="zero">قبل {0} دقيقة</relativeTimePattern>
+					<relativeTimePattern count="one">قبل دقيقة واحدة</relativeTimePattern>
+					<relativeTimePattern count="two">قبل دقيقتين</relativeTimePattern>
+					<relativeTimePattern count="few">قبل {0} دقائق</relativeTimePattern>
+					<relativeTimePattern count="many">قبل {0} دقيقة</relativeTimePattern>
+					<relativeTimePattern count="other">قبل {0} دقيقة</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute-narrow">
-				<displayName draft="contributed">الدقائق</displayName>
+				<displayName>الدقائق</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="zero">خلال {0} من الدقائق</relativeTimePattern>
-					<relativeTimePattern count="one">خلال {0} من الدقائق</relativeTimePattern>
-					<relativeTimePattern count="two">خلال {0} من الدقائق</relativeTimePattern>
-					<relativeTimePattern count="few">خلال {0} من الدقائق</relativeTimePattern>
-					<relativeTimePattern count="many">خلال {0} من الدقائق</relativeTimePattern>
-					<relativeTimePattern count="other">خلال {0} من الدقائق</relativeTimePattern>
+					<relativeTimePattern count="zero">خلال {0} دقيقة</relativeTimePattern>
+					<relativeTimePattern count="one">خلال دقيقة واحدة</relativeTimePattern>
+					<relativeTimePattern count="two">خلال دقيقتين</relativeTimePattern>
+					<relativeTimePattern count="few">خلال {0} دقائق</relativeTimePattern>
+					<relativeTimePattern count="many">خلال {0} دقيقة</relativeTimePattern>
+					<relativeTimePattern count="other">خلال {0} دقيقة</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="zero">قبل {0} من الدقائق</relativeTimePattern>
-					<relativeTimePattern count="one">قبل {0} من الدقائق</relativeTimePattern>
-					<relativeTimePattern count="two">قبل {0} من الدقائق</relativeTimePattern>
-					<relativeTimePattern count="few">قبل {0} من الدقائق</relativeTimePattern>
-					<relativeTimePattern count="many">قبل {0} من الدقائق</relativeTimePattern>
-					<relativeTimePattern count="other">قبل {0} من الدقائق</relativeTimePattern>
+					<relativeTimePattern count="zero">قبل {0} دقيقة</relativeTimePattern>
+					<relativeTimePattern count="one">قبل دقيقة واحدة</relativeTimePattern>
+					<relativeTimePattern count="two">قبل دقيقتين</relativeTimePattern>
+					<relativeTimePattern count="few">قبل {0} دقائق</relativeTimePattern>
+					<relativeTimePattern count="many">قبل {0} دقيقة</relativeTimePattern>
+					<relativeTimePattern count="other">قبل {0} دقيقة</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second">
 				<displayName>الثواني</displayName>
 				<relative type="0">الآن</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="zero">خلال {0} من الثواني</relativeTimePattern>
-					<relativeTimePattern count="one">خلال {0} من الثواني</relativeTimePattern>
+					<relativeTimePattern count="zero">خلال {0} ثانية</relativeTimePattern>
+					<relativeTimePattern count="one">خلال ثانية واحدة</relativeTimePattern>
 					<relativeTimePattern count="two">خلال ثانيتين</relativeTimePattern>
 					<relativeTimePattern count="few">خلال {0} ثوانِ</relativeTimePattern>
 					<relativeTimePattern count="many">خلال {0} ثانية</relativeTimePattern>
-					<relativeTimePattern count="other">خلال {0} من الثواني</relativeTimePattern>
+					<relativeTimePattern count="other">خلال {0} ثانية</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="zero">قبل {0} من الثواني</relativeTimePattern>
-					<relativeTimePattern count="one">قبل {0} من الثواني</relativeTimePattern>
+					<relativeTimePattern count="zero">قبل {0} ثانية</relativeTimePattern>
+					<relativeTimePattern count="one">قبل ثانية واحدة</relativeTimePattern>
 					<relativeTimePattern count="two">قبل ثانيتين</relativeTimePattern>
 					<relativeTimePattern count="few">قبل {0} ثوانِ</relativeTimePattern>
 					<relativeTimePattern count="many">قبل {0} ثانية</relativeTimePattern>
-					<relativeTimePattern count="other">قبل {0} من الثواني</relativeTimePattern>
+					<relativeTimePattern count="other">قبل {0} ثانية</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second-short">
-				<displayName draft="contributed">الثواني</displayName>
+				<displayName>الثواني</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="zero">خلال {0} من الثواني</relativeTimePattern>
-					<relativeTimePattern count="one">خلال {0} من الثواني</relativeTimePattern>
-					<relativeTimePattern count="two">خلال {0} من الثواني</relativeTimePattern>
-					<relativeTimePattern count="few">خلال {0} من الثواني</relativeTimePattern>
-					<relativeTimePattern count="many">خلال {0} من الثواني</relativeTimePattern>
-					<relativeTimePattern count="other">خلال {0} من الثواني</relativeTimePattern>
+					<relativeTimePattern count="zero">خلال {0} ثانية</relativeTimePattern>
+					<relativeTimePattern count="one">خلال ثانية واحدة</relativeTimePattern>
+					<relativeTimePattern count="two">خلال ثانيتين</relativeTimePattern>
+					<relativeTimePattern count="few">خلال {0} ثوانٍ</relativeTimePattern>
+					<relativeTimePattern count="many">خلال {0} ثانية</relativeTimePattern>
+					<relativeTimePattern count="other">خلال {0} ثانية</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="zero">قبل {0} من الثواني</relativeTimePattern>
-					<relativeTimePattern count="one">قبل {0} من الثواني</relativeTimePattern>
-					<relativeTimePattern count="two">قبل {0} من الثواني</relativeTimePattern>
-					<relativeTimePattern count="few">قبل {0} من الثواني</relativeTimePattern>
-					<relativeTimePattern count="many">قبل {0} من الثواني</relativeTimePattern>
-					<relativeTimePattern count="other">قبل {0} من الثواني</relativeTimePattern>
+					<relativeTimePattern count="zero">قبل {0} ثانية</relativeTimePattern>
+					<relativeTimePattern count="one">قبل ثانية واحدة</relativeTimePattern>
+					<relativeTimePattern count="two">قبل ثانيتين</relativeTimePattern>
+					<relativeTimePattern count="few">قبل {0} ثوانٍ</relativeTimePattern>
+					<relativeTimePattern count="many">قبل {0} ثانية</relativeTimePattern>
+					<relativeTimePattern count="other">قبل {0} ثانية</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second-narrow">
-				<displayName draft="contributed">الثواني</displayName>
+				<displayName>الثواني</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="zero">خلال {0} من الثواني</relativeTimePattern>
-					<relativeTimePattern count="one">خلال {0} من الثواني</relativeTimePattern>
-					<relativeTimePattern count="two">خلال {0} من الثواني</relativeTimePattern>
-					<relativeTimePattern count="few">خلال {0} من الثواني</relativeTimePattern>
-					<relativeTimePattern count="many">خلال {0} من الثواني</relativeTimePattern>
-					<relativeTimePattern count="other">خلال {0} من الثواني</relativeTimePattern>
+					<relativeTimePattern count="zero">خلال {0} ثانية</relativeTimePattern>
+					<relativeTimePattern count="one">خلال ثانية واحدة</relativeTimePattern>
+					<relativeTimePattern count="two">خلال ثانيتين</relativeTimePattern>
+					<relativeTimePattern count="few">خلال {0} ثوانٍ</relativeTimePattern>
+					<relativeTimePattern count="many">خلال {0} ثانية</relativeTimePattern>
+					<relativeTimePattern count="other">خلال {0} ثانية</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="zero">قبل {0} من الثواني</relativeTimePattern>
-					<relativeTimePattern count="one">قبل {0} من الثواني</relativeTimePattern>
-					<relativeTimePattern count="two">قبل {0} من الثواني</relativeTimePattern>
-					<relativeTimePattern count="few">قبل {0} من الثواني</relativeTimePattern>
-					<relativeTimePattern count="many">قبل {0} من الثواني</relativeTimePattern>
-					<relativeTimePattern count="other">قبل {0} من الثواني</relativeTimePattern>
+					<relativeTimePattern count="zero">قبل {0} ثانية</relativeTimePattern>
+					<relativeTimePattern count="one">قبل ثانية واحدة</relativeTimePattern>
+					<relativeTimePattern count="two">قبل ثانيتين</relativeTimePattern>
+					<relativeTimePattern count="few">قبل {0} ثوانٍ</relativeTimePattern>
+					<relativeTimePattern count="many">قبل {0} ثانية</relativeTimePattern>
+					<relativeTimePattern count="other">قبل {0} ثانية</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="zone">
@@ -3025,10 +3121,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>أنغيلا</exemplarCity>
 			</zone>
 			<zone type="Europe/Tirane">
-				<exemplarCity draft="contributed">تيرانا</exemplarCity>
+				<exemplarCity>تيرانا</exemplarCity>
 			</zone>
 			<zone type="Asia/Yerevan">
-				<exemplarCity draft="contributed">يريفان</exemplarCity>
+				<exemplarCity>يريفان</exemplarCity>
 			</zone>
 			<zone type="Africa/Luanda">
 				<exemplarCity>لواندا</exemplarCity>
@@ -3085,7 +3181,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>كاتاماركا</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Salta">
-				<exemplarCity draft="contributed">سالطا</exemplarCity>
+				<exemplarCity>سالطا</exemplarCity>
 			</zone>
 			<zone type="America/Jujuy">
 				<exemplarCity>جوجو</exemplarCity>
@@ -3100,7 +3196,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>بوينوس أيرس</exemplarCity>
 			</zone>
 			<zone type="Pacific/Pago_Pago">
-				<exemplarCity draft="contributed">باغو باغو</exemplarCity>
+				<exemplarCity>باغو باغو</exemplarCity>
 			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>فيينا</exemplarCity>
@@ -3139,7 +3235,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>برسيبان</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Macquarie">
-				<exemplarCity draft="contributed">ماكواري</exemplarCity>
+				<exemplarCity>ماكواري</exemplarCity>
 			</zone>
 			<zone type="Australia/Lord_Howe">
 				<exemplarCity>لورد هاو</exemplarCity>
@@ -3148,7 +3244,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>أروبا</exemplarCity>
 			</zone>
 			<zone type="Europe/Mariehamn">
-				<exemplarCity draft="contributed">ماريهامن</exemplarCity>
+				<exemplarCity>ماريهامن</exemplarCity>
 			</zone>
 			<zone type="Asia/Baku">
 				<exemplarCity>باكو</exemplarCity>
@@ -3166,7 +3262,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>بروكسل</exemplarCity>
 			</zone>
 			<zone type="Africa/Ouagadougou">
-				<exemplarCity draft="contributed">واغادوغو</exemplarCity>
+				<exemplarCity>واغادوغو</exemplarCity>
 			</zone>
 			<zone type="Europe/Sofia">
 				<exemplarCity>صوفيا</exemplarCity>
@@ -3178,7 +3274,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>بوجومبورا</exemplarCity>
 			</zone>
 			<zone type="Africa/Porto-Novo">
-				<exemplarCity draft="contributed">بورتو نوفو</exemplarCity>
+				<exemplarCity>بورتو نوفو</exemplarCity>
 			</zone>
 			<zone type="America/St_Barthelemy">
 				<exemplarCity>سانت بارتيليمي</exemplarCity>
@@ -3214,7 +3310,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>كيابا</exemplarCity>
 			</zone>
 			<zone type="America/Santarem">
-				<exemplarCity draft="contributed">سانتاريم</exemplarCity>
+				<exemplarCity>سانتاريم</exemplarCity>
 			</zone>
 			<zone type="America/Campo_Grande">
 				<exemplarCity>كومبو جراند</exemplarCity>
@@ -3244,7 +3340,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>نوروناه</exemplarCity>
 			</zone>
 			<zone type="America/Nassau">
-				<exemplarCity draft="contributed">ناسو</exemplarCity>
+				<exemplarCity>ناسو</exemplarCity>
 			</zone>
 			<zone type="Asia/Thimphu">
 				<exemplarCity>تيمفو</exemplarCity>
@@ -3361,13 +3457,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>أبيدجان</exemplarCity>
 			</zone>
 			<zone type="Pacific/Rarotonga">
-				<exemplarCity draft="contributed">راروتونغا</exemplarCity>
+				<exemplarCity>راروتونغا</exemplarCity>
 			</zone>
 			<zone type="Pacific/Easter">
 				<exemplarCity>استر</exemplarCity>
 			</zone>
 			<zone type="America/Santiago">
-				<exemplarCity draft="contributed">سانتياغو</exemplarCity>
+				<exemplarCity>سانتياغو</exemplarCity>
 			</zone>
 			<zone type="Africa/Douala">
 				<exemplarCity>دوالا</exemplarCity>
@@ -3376,7 +3472,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>أرومكي</exemplarCity>
 			</zone>
 			<zone type="Asia/Shanghai">
-				<exemplarCity draft="contributed">شنغهاي</exemplarCity>
+				<exemplarCity>شنغهاي</exemplarCity>
 			</zone>
 			<zone type="America/Bogota">
 				<exemplarCity>بوغوتا</exemplarCity>
@@ -3403,7 +3499,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>براغ</exemplarCity>
 			</zone>
 			<zone type="Europe/Busingen">
-				<exemplarCity draft="contributed">بوسنغن</exemplarCity>
+				<exemplarCity>بوسنغن</exemplarCity>
 			</zone>
 			<zone type="Europe/Berlin">
 				<exemplarCity>برلين</exemplarCity>
@@ -3427,7 +3523,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>جلاباجوس</exemplarCity>
 			</zone>
 			<zone type="America/Guayaquil">
-				<exemplarCity draft="contributed">غواياكويل</exemplarCity>
+				<exemplarCity>غواياكويل</exemplarCity>
 			</zone>
 			<zone type="Europe/Tallinn">
 				<exemplarCity>تالين</exemplarCity>
@@ -3448,7 +3544,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>سيتا</exemplarCity>
 			</zone>
 			<zone type="Europe/Madrid">
-				<exemplarCity draft="contributed">مدريد</exemplarCity>
+				<exemplarCity>مدريد</exemplarCity>
 			</zone>
 			<zone type="Africa/Addis_Ababa">
 				<exemplarCity>أديس أبابا</exemplarCity>
@@ -3460,7 +3556,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>فيجي</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Stanley">
-				<exemplarCity draft="contributed">استانلي</exemplarCity>
+				<exemplarCity>استانلي</exemplarCity>
 			</zone>
 			<zone type="Pacific/Truk">
 				<exemplarCity>ترك</exemplarCity>
@@ -3482,7 +3578,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</zone>
 			<zone type="Europe/London">
 				<long>
-					<daylight draft="contributed">توقيت بريطانيا الصيفي</daylight>
+					<daylight>توقيت بريطانيا الصيفي</daylight>
 				</long>
 				<exemplarCity>لندن</exemplarCity>
 			</zone>
@@ -3496,7 +3592,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>كايين</exemplarCity>
 			</zone>
 			<zone type="Europe/Guernsey">
-				<exemplarCity draft="contributed">غيرنسي</exemplarCity>
+				<exemplarCity>غيرنسي</exemplarCity>
 			</zone>
 			<zone type="Africa/Accra">
 				<exemplarCity>أكرا</exemplarCity>
@@ -3523,7 +3619,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>كوناكري</exemplarCity>
 			</zone>
 			<zone type="America/Guadeloupe">
-				<exemplarCity draft="contributed">غوادلوب</exemplarCity>
+				<exemplarCity>غوادلوب</exemplarCity>
 			</zone>
 			<zone type="Africa/Malabo">
 				<exemplarCity>مالابو</exemplarCity>
@@ -3538,13 +3634,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>غواتيمالا</exemplarCity>
 			</zone>
 			<zone type="Pacific/Guam">
-				<exemplarCity draft="contributed">غوام</exemplarCity>
+				<exemplarCity>غوام</exemplarCity>
 			</zone>
 			<zone type="Africa/Bissau">
 				<exemplarCity>بيساو</exemplarCity>
 			</zone>
 			<zone type="America/Guyana">
-				<exemplarCity draft="contributed">غيانا</exemplarCity>
+				<exemplarCity>غيانا</exemplarCity>
 			</zone>
 			<zone type="Asia/Hong_Kong">
 				<exemplarCity>هونغ كونغ</exemplarCity>
@@ -3553,10 +3649,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>تيغوسيغالبا</exemplarCity>
 			</zone>
 			<zone type="Europe/Zagreb">
-				<exemplarCity draft="contributed">زغرب</exemplarCity>
+				<exemplarCity>زغرب</exemplarCity>
 			</zone>
 			<zone type="America/Port-au-Prince">
-				<exemplarCity draft="contributed">بورت أو برنس</exemplarCity>
+				<exemplarCity>بورت أو برنس</exemplarCity>
 			</zone>
 			<zone type="Europe/Budapest">
 				<exemplarCity>بودابست</exemplarCity>
@@ -3583,7 +3679,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>القدس</exemplarCity>
 			</zone>
 			<zone type="Europe/Isle_of_Man">
-				<exemplarCity draft="contributed">جزيرة مان</exemplarCity>
+				<exemplarCity>جزيرة مان</exemplarCity>
 			</zone>
 			<zone type="Asia/Calcutta">
 				<exemplarCity>كالكتا</exemplarCity>
@@ -3598,7 +3694,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>طهران</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Reykjavik">
-				<exemplarCity draft="contributed">ريكيافيك</exemplarCity>
+				<exemplarCity>ريكيافيك</exemplarCity>
 			</zone>
 			<zone type="Europe/Rome">
 				<exemplarCity>روما</exemplarCity>
@@ -3643,7 +3739,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>بيونغ يانغ</exemplarCity>
 			</zone>
 			<zone type="Asia/Seoul">
-				<exemplarCity draft="contributed">سول</exemplarCity>
+				<exemplarCity>سول</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuwait">
 				<exemplarCity>الكويت</exemplarCity>
@@ -3667,34 +3763,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>ألماتي</exemplarCity>
 			</zone>
 			<zone type="Asia/Vientiane">
-				<exemplarCity draft="contributed">فيانتيان</exemplarCity>
+				<exemplarCity>فيانتيان</exemplarCity>
 			</zone>
 			<zone type="Asia/Beirut">
 				<exemplarCity>بيروت</exemplarCity>
 			</zone>
 			<zone type="America/St_Lucia">
-				<exemplarCity draft="contributed">سانت لوشيا</exemplarCity>
+				<exemplarCity>سانت لوشيا</exemplarCity>
 			</zone>
 			<zone type="Europe/Vaduz">
-				<exemplarCity draft="contributed">فادوز</exemplarCity>
+				<exemplarCity>فادوز</exemplarCity>
 			</zone>
 			<zone type="Asia/Colombo">
 				<exemplarCity>كولومبو</exemplarCity>
 			</zone>
 			<zone type="Africa/Monrovia">
-				<exemplarCity draft="contributed">مونروفيا</exemplarCity>
+				<exemplarCity>مونروفيا</exemplarCity>
 			</zone>
 			<zone type="Africa/Maseru">
-				<exemplarCity draft="contributed">ماسيرو</exemplarCity>
+				<exemplarCity>ماسيرو</exemplarCity>
 			</zone>
 			<zone type="Europe/Vilnius">
-				<exemplarCity draft="contributed">فيلنيوس</exemplarCity>
+				<exemplarCity>فيلنيوس</exemplarCity>
 			</zone>
 			<zone type="Europe/Luxembourg">
 				<exemplarCity>لوكسمبورغ</exemplarCity>
 			</zone>
 			<zone type="Europe/Riga">
-				<exemplarCity draft="contributed">ريغا</exemplarCity>
+				<exemplarCity>ريغا</exemplarCity>
 			</zone>
 			<zone type="Africa/Tripoli">
 				<exemplarCity>طرابلس</exemplarCity>
@@ -3709,10 +3805,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>تشيسيناو</exemplarCity>
 			</zone>
 			<zone type="Europe/Podgorica">
-				<exemplarCity draft="contributed">بودغوريكا</exemplarCity>
+				<exemplarCity>بودغوريكا</exemplarCity>
 			</zone>
 			<zone type="America/Marigot">
-				<exemplarCity draft="contributed">ماريغوت</exemplarCity>
+				<exemplarCity>ماريغوت</exemplarCity>
 			</zone>
 			<zone type="Indian/Antananarivo">
 				<exemplarCity>أنتاناناريفو</exemplarCity>
@@ -3721,16 +3817,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>كواجالين</exemplarCity>
 			</zone>
 			<zone type="Pacific/Majuro">
-				<exemplarCity draft="contributed">ماجورو</exemplarCity>
+				<exemplarCity>ماجورو</exemplarCity>
 			</zone>
 			<zone type="Europe/Skopje">
-				<exemplarCity draft="contributed">سكوبي</exemplarCity>
+				<exemplarCity>سكوبي</exemplarCity>
 			</zone>
 			<zone type="Africa/Bamako">
-				<exemplarCity draft="contributed">باماكو</exemplarCity>
+				<exemplarCity>باماكو</exemplarCity>
 			</zone>
 			<zone type="Asia/Rangoon">
-				<exemplarCity draft="contributed">رانغون</exemplarCity>
+				<exemplarCity>رانغون</exemplarCity>
 			</zone>
 			<zone type="Asia/Hovd">
 				<exemplarCity>هوفد</exemplarCity>
@@ -3745,22 +3841,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>ماكاو</exemplarCity>
 			</zone>
 			<zone type="Pacific/Saipan">
-				<exemplarCity draft="contributed">سايبان</exemplarCity>
+				<exemplarCity>سايبان</exemplarCity>
 			</zone>
 			<zone type="America/Martinique">
-				<exemplarCity draft="contributed">المارتينيك</exemplarCity>
+				<exemplarCity>المارتينيك</exemplarCity>
 			</zone>
 			<zone type="Africa/Nouakchott">
 				<exemplarCity>نواكشوط</exemplarCity>
 			</zone>
 			<zone type="America/Montserrat">
-				<exemplarCity draft="contributed">مونتسيرات</exemplarCity>
+				<exemplarCity>مونتسيرات</exemplarCity>
 			</zone>
 			<zone type="Europe/Malta">
 				<exemplarCity>مالطة</exemplarCity>
 			</zone>
 			<zone type="Indian/Mauritius">
-				<exemplarCity draft="contributed">موريشيوس</exemplarCity>
+				<exemplarCity>موريشيوس</exemplarCity>
 			</zone>
 			<zone type="Indian/Maldives">
 				<exemplarCity>المالديف</exemplarCity>
@@ -3805,19 +3901,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>كانكون</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuala_Lumpur">
-				<exemplarCity draft="contributed">كوالا لامبور</exemplarCity>
+				<exemplarCity>كوالا لامبور</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuching">
 				<exemplarCity>كيشينج</exemplarCity>
 			</zone>
 			<zone type="Africa/Maputo">
-				<exemplarCity draft="contributed">مابوتو</exemplarCity>
+				<exemplarCity>مابوتو</exemplarCity>
 			</zone>
 			<zone type="Africa/Windhoek">
 				<exemplarCity>ويندهوك</exemplarCity>
 			</zone>
 			<zone type="Pacific/Noumea">
-				<exemplarCity draft="contributed">نوميا</exemplarCity>
+				<exemplarCity>نوميا</exemplarCity>
 			</zone>
 			<zone type="Africa/Niamey">
 				<exemplarCity>نيامي</exemplarCity>
@@ -3835,22 +3931,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>أمستردام</exemplarCity>
 			</zone>
 			<zone type="Europe/Oslo">
-				<exemplarCity draft="contributed">أوسلو</exemplarCity>
+				<exemplarCity>أوسلو</exemplarCity>
 			</zone>
 			<zone type="Asia/Katmandu">
-				<exemplarCity draft="contributed">كاتماندو</exemplarCity>
+				<exemplarCity>كاتماندو</exemplarCity>
 			</zone>
 			<zone type="Pacific/Nauru">
-				<exemplarCity draft="contributed">ناورو</exemplarCity>
+				<exemplarCity>ناورو</exemplarCity>
 			</zone>
 			<zone type="Pacific/Niue">
-				<exemplarCity draft="contributed">نيوي</exemplarCity>
+				<exemplarCity>نيوي</exemplarCity>
 			</zone>
 			<zone type="Pacific/Chatham">
 				<exemplarCity>تشاثام</exemplarCity>
 			</zone>
 			<zone type="Pacific/Auckland">
-				<exemplarCity draft="contributed">أوكلاند</exemplarCity>
+				<exemplarCity>أوكلاند</exemplarCity>
 			</zone>
 			<zone type="Asia/Muscat">
 				<exemplarCity>مسقط</exemplarCity>
@@ -3859,10 +3955,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>بنما</exemplarCity>
 			</zone>
 			<zone type="America/Lima">
-				<exemplarCity draft="contributed">ليما</exemplarCity>
+				<exemplarCity>ليما</exemplarCity>
 			</zone>
 			<zone type="Pacific/Tahiti">
-				<exemplarCity draft="contributed">تاهيتي</exemplarCity>
+				<exemplarCity>تاهيتي</exemplarCity>
 			</zone>
 			<zone type="Pacific/Marquesas">
 				<exemplarCity>ماركيساس</exemplarCity>
@@ -3871,7 +3967,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>جامبير</exemplarCity>
 			</zone>
 			<zone type="Pacific/Port_Moresby">
-				<exemplarCity draft="contributed">بور مورسبي</exemplarCity>
+				<exemplarCity>بور مورسبي</exemplarCity>
+			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>بوغانفيل</exemplarCity>
 			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>مانيلا</exemplarCity>
@@ -3886,7 +3985,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>ميكولن</exemplarCity>
 			</zone>
 			<zone type="Pacific/Pitcairn">
-				<exemplarCity draft="contributed">بيتكيرن</exemplarCity>
+				<exemplarCity>بيتكيرن</exemplarCity>
 			</zone>
 			<zone type="America/Puerto_Rico">
 				<exemplarCity>بورتوريكو</exemplarCity>
@@ -3895,7 +3994,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>غزة</exemplarCity>
 			</zone>
 			<zone type="Asia/Hebron">
-				<exemplarCity draft="contributed">هيبرون (مدينة الخليل)</exemplarCity>
+				<exemplarCity>هيبرون (مدينة الخليل)</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Azores">
 				<exemplarCity>أزورس</exemplarCity>
@@ -3904,10 +4003,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>ماديرا</exemplarCity>
 			</zone>
 			<zone type="Europe/Lisbon">
-				<exemplarCity draft="contributed">لشبونة</exemplarCity>
+				<exemplarCity>لشبونة</exemplarCity>
 			</zone>
 			<zone type="Pacific/Palau">
-				<exemplarCity draft="contributed">بالاو</exemplarCity>
+				<exemplarCity>بالاو</exemplarCity>
 			</zone>
 			<zone type="America/Asuncion">
 				<exemplarCity>أسونسيون</exemplarCity>
@@ -3916,7 +4015,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>قطر</exemplarCity>
 			</zone>
 			<zone type="Indian/Reunion">
-				<exemplarCity draft="contributed">ريونيون</exemplarCity>
+				<exemplarCity>ريونيون</exemplarCity>
 			</zone>
 			<zone type="Europe/Bucharest">
 				<exemplarCity>بوخارست</exemplarCity>
@@ -3949,7 +4048,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>نوفوسبيرسك</exemplarCity>
 			</zone>
 			<zone type="Asia/Novokuznetsk">
-				<exemplarCity draft="contributed">نوفوكوزنتسك</exemplarCity>
+				<exemplarCity>نوفوكوزنتسك</exemplarCity>
 			</zone>
 			<zone type="Asia/Krasnoyarsk">
 				<exemplarCity>كراسنويارسك</exemplarCity>
@@ -3957,6 +4056,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>ايركيتسك</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>تشيتا</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>ياكتسك</exemplarCity>
 			</zone>
@@ -3964,17 +4066,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>فلاديفوستك</exemplarCity>
 			</zone>
 			<zone type="Asia/Khandyga">
-				<exemplarCity draft="contributed">خانديجا</exemplarCity>
+				<exemplarCity>خانديجا</exemplarCity>
 			</zone>
 			<zone type="Asia/Sakhalin">
 				<exemplarCity>سكالين</exemplarCity>
 			</zone>
 			<zone type="Asia/Ust-Nera">
-				<exemplarCity draft="contributed">أوست نيرا</exemplarCity>
+				<exemplarCity>أوست نيرا</exemplarCity>
 			</zone>
 			<zone type="Asia/Magadan">
 				<exemplarCity>مجادن</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>سريدنكوليمسك</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>كامتشاتكا</exemplarCity>
 			</zone>
@@ -3991,7 +4096,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>غوادالكانال</exemplarCity>
 			</zone>
 			<zone type="Indian/Mahe">
-				<exemplarCity draft="contributed">ماهي</exemplarCity>
+				<exemplarCity>ماهي</exemplarCity>
 			</zone>
 			<zone type="Africa/Khartoum">
 				<exemplarCity>الخرطوم</exemplarCity>
@@ -4006,10 +4111,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>سانت هيلينا</exemplarCity>
 			</zone>
 			<zone type="Europe/Ljubljana">
-				<exemplarCity draft="contributed">ليوبليانا</exemplarCity>
+				<exemplarCity>ليوبليانا</exemplarCity>
 			</zone>
 			<zone type="Arctic/Longyearbyen">
-				<exemplarCity draft="contributed">لونجيربين</exemplarCity>
+				<exemplarCity>لونجيربين</exemplarCity>
 			</zone>
 			<zone type="Europe/Bratislava">
 				<exemplarCity>براتيسلافا</exemplarCity>
@@ -4018,7 +4123,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>فري تاون</exemplarCity>
 			</zone>
 			<zone type="Europe/San_Marino">
-				<exemplarCity draft="contributed">سان مارينو</exemplarCity>
+				<exemplarCity>سان مارينو</exemplarCity>
 			</zone>
 			<zone type="Africa/Dakar">
 				<exemplarCity>داكار</exemplarCity>
@@ -4030,22 +4135,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>باراماريبو</exemplarCity>
 			</zone>
 			<zone type="Africa/Juba">
-				<exemplarCity draft="contributed">جوبا</exemplarCity>
+				<exemplarCity>جوبا</exemplarCity>
 			</zone>
 			<zone type="Africa/Sao_Tome">
-				<exemplarCity draft="contributed">ساو تومي</exemplarCity>
+				<exemplarCity>ساو تومي</exemplarCity>
 			</zone>
 			<zone type="America/El_Salvador">
 				<exemplarCity>السلفادور</exemplarCity>
 			</zone>
 			<zone type="America/Lower_Princes">
-				<exemplarCity draft="contributed">حي الأمير السفلي</exemplarCity>
+				<exemplarCity>حي الأمير السفلي</exemplarCity>
 			</zone>
 			<zone type="Asia/Damascus">
 				<exemplarCity>دمشق</exemplarCity>
 			</zone>
 			<zone type="Africa/Mbabane">
-				<exemplarCity draft="contributed">مباباني</exemplarCity>
+				<exemplarCity>مباباني</exemplarCity>
 			</zone>
 			<zone type="America/Grand_Turk">
 				<exemplarCity>غراند ترك</exemplarCity>
@@ -4054,10 +4159,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>نجامينا</exemplarCity>
 			</zone>
 			<zone type="Indian/Kerguelen">
-				<exemplarCity draft="contributed">كيرغويلين</exemplarCity>
+				<exemplarCity>كيرغويلين</exemplarCity>
 			</zone>
 			<zone type="Africa/Lome">
-				<exemplarCity draft="contributed">لومي</exemplarCity>
+				<exemplarCity>لومي</exemplarCity>
 			</zone>
 			<zone type="Asia/Bangkok">
 				<exemplarCity>بانكوك</exemplarCity>
@@ -4078,13 +4183,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>تونس</exemplarCity>
 			</zone>
 			<zone type="Pacific/Tongatapu">
-				<exemplarCity draft="contributed">تونغاتابو</exemplarCity>
+				<exemplarCity>تونغاتابو</exemplarCity>
 			</zone>
 			<zone type="Europe/Istanbul">
 				<exemplarCity>إسطنبول</exemplarCity>
 			</zone>
 			<zone type="America/Port_of_Spain">
-				<exemplarCity draft="contributed">بورت أوف سبين</exemplarCity>
+				<exemplarCity>بورت أوف سبين</exemplarCity>
 			</zone>
 			<zone type="Pacific/Funafuti">
 				<exemplarCity>فونافوتي</exemplarCity>
@@ -4099,7 +4204,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>أوزجرود</exemplarCity>
 			</zone>
 			<zone type="Europe/Kiev">
-				<exemplarCity draft="contributed">كييف</exemplarCity>
+				<exemplarCity>كييف</exemplarCity>
 			</zone>
 			<zone type="Europe/Zaporozhye">
 				<exemplarCity>زابوروزي</exemplarCity>
@@ -4174,7 +4279,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>بيترسبرغ</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Tell_City">
-				<exemplarCity draft="contributed">مدينة تل، إنديانا</exemplarCity>
+				<exemplarCity>مدينة تل، إنديانا</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Knox">
 				<exemplarCity>كونكس</exemplarCity>
@@ -4204,28 +4309,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>نيويورك</exemplarCity>
 			</zone>
 			<zone type="America/Montevideo">
-				<exemplarCity draft="contributed">مونتفيديو</exemplarCity>
+				<exemplarCity>مونتفيديو</exemplarCity>
 			</zone>
 			<zone type="Asia/Samarkand">
 				<exemplarCity>سمرقند</exemplarCity>
 			</zone>
 			<zone type="Asia/Tashkent">
-				<exemplarCity draft="contributed">طشقند</exemplarCity>
+				<exemplarCity>طشقند</exemplarCity>
 			</zone>
 			<zone type="Europe/Vatican">
 				<exemplarCity>الفاتيكان</exemplarCity>
 			</zone>
 			<zone type="America/St_Vincent">
-				<exemplarCity draft="contributed">سانت فنسنت</exemplarCity>
+				<exemplarCity>سانت فنسنت</exemplarCity>
 			</zone>
 			<zone type="America/Caracas">
 				<exemplarCity>كاراكاس</exemplarCity>
 			</zone>
 			<zone type="America/Tortola">
-				<exemplarCity draft="contributed">تورتولا</exemplarCity>
+				<exemplarCity>تورتولا</exemplarCity>
 			</zone>
 			<zone type="America/St_Thomas">
-				<exemplarCity draft="contributed">سانت توماس</exemplarCity>
+				<exemplarCity>سانت توماس</exemplarCity>
 			</zone>
 			<zone type="Asia/Saigon">
 				<exemplarCity>مدينة هو تشي منة</exemplarCity>
@@ -4234,7 +4339,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>إيفات</exemplarCity>
 			</zone>
 			<zone type="Pacific/Wallis">
-				<exemplarCity draft="contributed">واليس</exemplarCity>
+				<exemplarCity>واليس</exemplarCity>
 			</zone>
 			<zone type="Pacific/Apia">
 				<exemplarCity>أبيا</exemplarCity>
@@ -4243,16 +4348,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>عدن</exemplarCity>
 			</zone>
 			<zone type="Indian/Mayotte">
-				<exemplarCity draft="contributed">مايوت</exemplarCity>
+				<exemplarCity>مايوت</exemplarCity>
 			</zone>
 			<zone type="Africa/Johannesburg">
 				<exemplarCity>جوهانسبرغ</exemplarCity>
 			</zone>
 			<zone type="Africa/Lusaka">
-				<exemplarCity draft="contributed">لوساكا</exemplarCity>
+				<exemplarCity>لوساكا</exemplarCity>
 			</zone>
 			<zone type="Africa/Harare">
-				<exemplarCity draft="contributed">هراري</exemplarCity>
+				<exemplarCity>هراري</exemplarCity>
 			</zone>
 			<metazone type="Afghanistan">
 				<long>
@@ -4283,9 +4388,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Alaska">
 				<long>
-					<generic draft="contributed">توقيت ألاسكا</generic>
-					<standard draft="contributed">التوقيت الرسمي لألاسكا</standard>
-					<daylight draft="contributed">توقيت ألاسكا الصيفي</daylight>
+					<generic>توقيت ألاسكا</generic>
+					<standard>التوقيت الرسمي لألاسكا</standard>
+					<daylight>توقيت ألاسكا الصيفي</daylight>
 				</long>
 			</metazone>
 			<metazone type="Amazon">
@@ -4367,9 +4472,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Atlantic">
 				<long>
-					<generic draft="contributed">توقيت الأطلسي</generic>
-					<standard draft="contributed">التوقيت الرسمي الأطلسي</standard>
-					<daylight draft="contributed">التوقيت الصيفي الأطلسي</daylight>
+					<generic>توقيت الأطلسي</generic>
+					<standard>التوقيت الرسمي الأطلسي</standard>
+					<daylight>التوقيت الصيفي الأطلسي</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Central">
@@ -4416,9 +4521,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Bangladesh">
 				<long>
-					<generic draft="contributed">توقيت بنجلاديش</generic>
-					<standard draft="contributed">توقيت بنجلاديش الرسمي</standard>
-					<daylight draft="contributed">توقيت بنجلاديش الصيفي</daylight>
+					<generic>توقيت بنجلاديش</generic>
+					<standard>توقيت بنجلاديش الرسمي</standard>
+					<daylight>توقيت بنجلاديش الصيفي</daylight>
 				</long>
 			</metazone>
 			<metazone type="Bhutan">
@@ -4452,7 +4557,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Chamorro">
 				<long>
-					<standard draft="contributed">توقيت تشامورو</standard>
+					<standard>توقيت تشامورو</standard>
 				</long>
 			</metazone>
 			<metazone type="Chatham">
@@ -4485,12 +4590,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Christmas">
 				<long>
-					<standard draft="contributed">توقيت جزر الكريسماس</standard>
+					<standard>توقيت جزر الكريسماس</standard>
 				</long>
 			</metazone>
 			<metazone type="Cocos">
 				<long>
-					<standard draft="contributed">توقيت جزر كوكوس</standard>
+					<standard>توقيت جزر كوكوس</standard>
 				</long>
 			</metazone>
 			<metazone type="Colombia">
@@ -4502,9 +4607,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Cook">
 				<long>
-					<generic draft="contributed">توقيت جزر كووك</generic>
-					<standard draft="contributed">توقيت جزر كووك الرسمي</standard>
-					<daylight draft="contributed">توقيت جزر كووك الصيفي</daylight>
+					<generic>توقيت جزر كووك</generic>
+					<standard>توقيت جزر كووك الرسمي</standard>
+					<daylight>توقيت جزر كووك الصيفي</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cuba">
@@ -4516,12 +4621,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Davis">
 				<long>
-					<standard draft="contributed">توقيت دافيز</standard>
+					<standard>توقيت دافيز</standard>
 				</long>
 			</metazone>
 			<metazone type="DumontDUrville">
 				<long>
-					<standard draft="contributed">توقيت دي مونت دو روفيل</standard>
+					<standard>توقيت دي مونت دو روفيل</standard>
 				</long>
 			</metazone>
 			<metazone type="East_Timor">
@@ -4557,7 +4662,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
 				<long>
-					<standard draft="contributed">التوقيت الأوروبي (أكثر شرقًا)</standard>
+					<standard>التوقيت الأوروبي (أكثر شرقًا)</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
@@ -4583,12 +4688,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="French_Guiana">
 				<long>
-					<standard>توقيت غويانا الفرنسية</standard>
+					<standard>توقيت غايانا الفرنسية</standard>
 				</long>
 			</metazone>
 			<metazone type="French_Southern">
 				<long>
-					<standard draft="contributed">توقيت المقاطعات الفرنسية الجنوبية والأنتارتيكية</standard>
+					<standard>توقيت المقاطعات الفرنسية الجنوبية والأنتارتيكية</standard>
 				</long>
 			</metazone>
 			<metazone type="Galapagos">
@@ -4598,7 +4703,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Gambier">
 				<long>
-					<standard draft="contributed">توقيت جامبير</standard>
+					<standard>توقيت جامبير</standard>
 				</long>
 			</metazone>
 			<metazone type="Georgia">
@@ -4610,7 +4715,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Gilbert_Islands">
 				<long>
-					<standard draft="contributed">توقيت جزر جيلبرت</standard>
+					<standard>توقيت جزر جيلبرت</standard>
 				</long>
 			</metazone>
 			<metazone type="GMT">
@@ -4639,7 +4744,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Gulf">
 				<long>
-					<standard draft="contributed">توقيت الخليج</standard>
+					<standard>توقيت الخليج</standard>
 				</long>
 			</metazone>
 			<metazone type="Guyana">
@@ -4752,7 +4857,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Kosrae">
 				<long>
-					<standard draft="contributed">توقيت كوسرا</standard>
+					<standard>توقيت كوسرا</standard>
 				</long>
 			</metazone>
 			<metazone type="Krasnoyarsk">
@@ -4764,24 +4869,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Kyrgystan">
 				<long>
-					<standard draft="contributed">توقيت قرغيزستان</standard>
+					<standard>توقيت قرغيزستان</standard>
 				</long>
 			</metazone>
 			<metazone type="Line_Islands">
 				<long>
-					<standard draft="contributed">توقيت جزر لاين</standard>
+					<standard>توقيت جزر لاين</standard>
 				</long>
 			</metazone>
 			<metazone type="Lord_Howe">
 				<long>
-					<generic draft="contributed">توقيت لورد هاو</generic>
-					<standard draft="contributed">توقيت لورد هاو الرسمي</standard>
-					<daylight draft="contributed">التوقيت الصيفي للورد هاو</daylight>
+					<generic>توقيت لورد هاو</generic>
+					<standard>توقيت لورد هاو الرسمي</standard>
+					<daylight>التوقيت الصيفي للورد هاو</daylight>
 				</long>
 			</metazone>
 			<metazone type="Macquarie">
 				<long>
-					<standard draft="contributed">توقيت ماكواري</standard>
+					<standard>توقيت ماكواري</standard>
 				</long>
 			</metazone>
 			<metazone type="Magadan">
@@ -4798,12 +4903,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Maldives">
 				<long>
-					<standard draft="contributed">توقيت الـمالديف</standard>
+					<standard>توقيت الـمالديف</standard>
 				</long>
 			</metazone>
 			<metazone type="Marquesas">
 				<long>
-					<standard draft="contributed">توقيت ماركيساس</standard>
+					<standard>توقيت ماركيساس</standard>
 				</long>
 			</metazone>
 			<metazone type="Marshall_Islands">
@@ -4846,9 +4951,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Moscow">
 				<long>
-					<generic draft="contributed">توقيت موسكو</generic>
-					<standard draft="contributed">توقيت موسكو الرسمي</standard>
-					<daylight draft="contributed">توقيت موسكو الصيفي</daylight>
+					<generic>توقيت موسكو</generic>
+					<standard>توقيت موسكو الرسمي</standard>
+					<daylight>توقيت موسكو الصيفي</daylight>
 				</long>
 			</metazone>
 			<metazone type="Myanmar">
@@ -4868,9 +4973,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="New_Caledonia">
 				<long>
-					<generic draft="contributed">توقيت كاليدونيا الجديدة</generic>
-					<standard draft="contributed">توقيت كاليدونيا الجديدة الرسمي</standard>
-					<daylight draft="contributed">توقيت كاليدونيا الجديدة الصيفي</daylight>
+					<generic>توقيت كاليدونيا الجديدة</generic>
+					<standard>توقيت كاليدونيا الجديدة الرسمي</standard>
+					<daylight>توقيت كاليدونيا الجديدة الصيفي</daylight>
 				</long>
 			</metazone>
 			<metazone type="New_Zealand">
@@ -4956,14 +5061,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Philippines">
 				<long>
-					<generic draft="contributed">توقيت الفيلبين</generic>
-					<standard draft="contributed">توقيت الفيلبين الرسمي</standard>
-					<daylight draft="contributed">توقيت الفيلبين الصيفي</daylight>
+					<generic>توقيت الفيلبين</generic>
+					<standard>توقيت الفيلبين الرسمي</standard>
+					<daylight>توقيت الفيلبين الصيفي</daylight>
 				</long>
 			</metazone>
 			<metazone type="Phoenix_Islands">
 				<long>
-					<standard draft="contributed">توقيت جزر فينكس</standard>
+					<standard>توقيت جزر فينكس</standard>
 				</long>
 			</metazone>
 			<metazone type="Pierre_Miquelon">
@@ -4975,7 +5080,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Pitcairn">
 				<long>
-					<standard draft="contributed">توقيت بيتكيرن</standard>
+					<standard>توقيت بيتكيرن</standard>
 				</long>
 			</metazone>
 			<metazone type="Ponape">
@@ -5009,19 +5114,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Samoa">
 				<long>
-					<generic draft="contributed">توقيت ساموا</generic>
-					<standard draft="contributed">توقيت ساموا الرسمي</standard>
-					<daylight draft="contributed">توقيت ساموا الصيفي</daylight>
+					<generic>توقيت ساموا</generic>
+					<standard>توقيت ساموا الرسمي</standard>
+					<daylight>توقيت ساموا الصيفي</daylight>
 				</long>
 			</metazone>
 			<metazone type="Seychelles">
 				<long>
-					<standard draft="contributed">توقيت سيشل</standard>
+					<standard>توقيت سيشل</standard>
 				</long>
 			</metazone>
 			<metazone type="Singapore">
 				<long>
-					<standard draft="contributed">توقيت سنغافورة</standard>
+					<standard>توقيت سنغافورة</standard>
 				</long>
 			</metazone>
 			<metazone type="Solomon">
@@ -5031,7 +5136,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="South_Georgia">
 				<long>
-					<standard draft="contributed">توقيت جنوب جورجيا</standard>
+					<standard>توقيت جنوب جورجيا</standard>
 				</long>
 			</metazone>
 			<metazone type="Suriname">
@@ -5041,7 +5146,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Syowa">
 				<long>
-					<standard draft="contributed">توقيت سايووا</standard>
+					<standard>توقيت سايووا</standard>
 				</long>
 			</metazone>
 			<metazone type="Tahiti">
@@ -5099,9 +5204,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Uzbekistan">
 				<long>
-					<generic draft="contributed">توقيت أوزبكستان</generic>
-					<standard draft="contributed">توقيت أوزبكستان الرسمي</standard>
-					<daylight draft="contributed">توقيت أوزبكستان الصيفي</daylight>
+					<generic>توقيت أوزبكستان</generic>
+					<standard>توقيت أوزبكستان الرسمي</standard>
+					<daylight>توقيت أوزبكستان الصيفي</daylight>
 				</long>
 			</metazone>
 			<metazone type="Vanuatu">
@@ -5142,7 +5247,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Wallis">
 				<long>
-					<standard draft="contributed">توقيت واليس و فوتونا</standard>
+					<standard>توقيت واليس و فوتونا</standard>
 				</long>
 			</metazone>
 			<metazone type="Yakutsk">
@@ -5175,24 +5280,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<plusSign>‏+</plusSign> <!-- includes RLM before sign -->
 			<minusSign>‏-</minusSign> <!-- includes RLM before sign (002D) -->
 			<exponential>اس</exponential>
-			<superscriptingExponent draft="contributed">×</superscriptingExponent>
+			<superscriptingExponent>×</superscriptingExponent>
 			<perMille>؉</perMille>
 			<infinity>∞</infinity>
 			<nan>ليس رقم</nan>
-			<timeSeparator draft="contributed">،</timeSeparator>
+			<timeSeparator draft="contributed">:</timeSeparator>
 		</symbols>
 		<symbols numberSystem="latn">
 			<decimal>.</decimal>
 			<group>,</group>
 			<list>;</list>
-			<percentSign>%</percentSign>
+			<percentSign>٪</percentSign>
 			<plusSign>‎+</plusSign> <!-- includes LRM before sign -->
 			<minusSign>‎-</minusSign> <!-- includes LRM before sign (002D) -->
 			<exponential>E</exponential>
-			<superscriptingExponent draft="contributed">×</superscriptingExponent>
+			<superscriptingExponent>×</superscriptingExponent>
 			<perMille>‰</perMille>
 			<infinity>∞</infinity>
-			<nan>NaN</nan>
+			<nan>ليس رقمًا</nan>
 			<timeSeparator draft="contributed">:</timeSeparator>
 		</symbols>
 		<decimalFormats numberSystem="arab">
@@ -5246,24 +5351,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern type="100000000" count="few">000 مليون</pattern>
 					<pattern type="100000000" count="many">000 مليون</pattern>
 					<pattern type="100000000" count="other">000 مليون</pattern>
-					<pattern type="1000000000" count="zero">0 بليون</pattern>
-					<pattern type="1000000000" count="one">0 بليون</pattern>
-					<pattern type="1000000000" count="two">0 بليون</pattern>
-					<pattern type="1000000000" count="few">0 بلايين</pattern>
-					<pattern type="1000000000" count="many">0 بليون</pattern>
-					<pattern type="1000000000" count="other">0 بليون</pattern>
-					<pattern type="10000000000" count="zero">00 بليون</pattern>
-					<pattern type="10000000000" count="one">00 بليون</pattern>
-					<pattern type="10000000000" count="two">00 بليون</pattern>
-					<pattern type="10000000000" count="few">00 بليون</pattern>
-					<pattern type="10000000000" count="many">00 بليون</pattern>
-					<pattern type="10000000000" count="other">00 بليون</pattern>
-					<pattern type="100000000000" count="zero">000 بليون</pattern>
-					<pattern type="100000000000" count="one">000 بليون</pattern>
-					<pattern type="100000000000" count="two">000 بليون</pattern>
-					<pattern type="100000000000" count="few">000 بليون</pattern>
-					<pattern type="100000000000" count="many">000 بليون</pattern>
-					<pattern type="100000000000" count="other">000 بليون</pattern>
+					<pattern type="1000000000" count="zero">0 مليار</pattern>
+					<pattern type="1000000000" count="one">0 مليار</pattern>
+					<pattern type="1000000000" count="two">0 مليار</pattern>
+					<pattern type="1000000000" count="few">0 مليار</pattern>
+					<pattern type="1000000000" count="many">0 مليار</pattern>
+					<pattern type="1000000000" count="other">0 مليار</pattern>
+					<pattern type="10000000000" count="zero">00 مليار</pattern>
+					<pattern type="10000000000" count="one">00 مليار</pattern>
+					<pattern type="10000000000" count="two">00 مليار</pattern>
+					<pattern type="10000000000" count="few">00 مليار</pattern>
+					<pattern type="10000000000" count="many">00 مليار</pattern>
+					<pattern type="10000000000" count="other">00 مليار</pattern>
+					<pattern type="100000000000" count="zero">000 مليار</pattern>
+					<pattern type="100000000000" count="one">000 مليار</pattern>
+					<pattern type="100000000000" count="two">000 مليار</pattern>
+					<pattern type="100000000000" count="few">000 مليار</pattern>
+					<pattern type="100000000000" count="many">000 مليار</pattern>
+					<pattern type="100000000000" count="other">000 مليار</pattern>
 					<pattern type="1000000000000" count="zero">0 تريليون</pattern>
 					<pattern type="1000000000000" count="one">0 تريليون</pattern>
 					<pattern type="1000000000000" count="two">0 تريليون</pattern>
@@ -5322,24 +5427,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern type="100000000" count="few">000 مليو</pattern>
 					<pattern type="100000000" count="many">000 مليو</pattern>
 					<pattern type="100000000" count="other">000 مليو</pattern>
-					<pattern type="1000000000" count="zero">0 بليو</pattern>
-					<pattern type="1000000000" count="one">0 بليو</pattern>
-					<pattern type="1000000000" count="two">0 بليو</pattern>
-					<pattern type="1000000000" count="few">0 بليو</pattern>
-					<pattern type="1000000000" count="many">0 بليو</pattern>
-					<pattern type="1000000000" count="other">0 بليو</pattern>
-					<pattern type="10000000000" count="zero">00 بليو</pattern>
-					<pattern type="10000000000" count="one">00 بليو</pattern>
-					<pattern type="10000000000" count="two">00 بليو</pattern>
-					<pattern type="10000000000" count="few">00 بليو</pattern>
-					<pattern type="10000000000" count="many">00 بليو</pattern>
-					<pattern type="10000000000" count="other">00 بليو</pattern>
-					<pattern type="100000000000" count="zero">000 بليو</pattern>
-					<pattern type="100000000000" count="one">000 بليو</pattern>
-					<pattern type="100000000000" count="two">000 بليو</pattern>
-					<pattern type="100000000000" count="few">000 بليو</pattern>
-					<pattern type="100000000000" count="many">000 بليو</pattern>
-					<pattern type="100000000000" count="other">000 بليو</pattern>
+					<pattern type="1000000000" count="zero">0 مليا</pattern>
+					<pattern type="1000000000" count="one">0 مليا</pattern>
+					<pattern type="1000000000" count="two">0 مليا</pattern>
+					<pattern type="1000000000" count="few">0 مليا</pattern>
+					<pattern type="1000000000" count="many">0 مليا</pattern>
+					<pattern type="1000000000" count="other">0 مليا</pattern>
+					<pattern type="10000000000" count="zero">00 مليا</pattern>
+					<pattern type="10000000000" count="one">00 مليا</pattern>
+					<pattern type="10000000000" count="two">00 مليا</pattern>
+					<pattern type="10000000000" count="few">00 مليا</pattern>
+					<pattern type="10000000000" count="many">00 مليا</pattern>
+					<pattern type="10000000000" count="other">00 مليا</pattern>
+					<pattern type="100000000000" count="zero">000 مليا</pattern>
+					<pattern type="100000000000" count="one">000 مليا</pattern>
+					<pattern type="100000000000" count="two">000 مليا</pattern>
+					<pattern type="100000000000" count="few">000 مليا</pattern>
+					<pattern type="100000000000" count="many">000 مليا</pattern>
+					<pattern type="100000000000" count="other">000 مليا</pattern>
 					<pattern type="1000000000000" count="zero">0 ترليو</pattern>
 					<pattern type="1000000000000" count="one">0 ترليو</pattern>
 					<pattern type="1000000000000" count="two">0 ترليو</pattern>
@@ -5408,7 +5513,83 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤ #,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern draft="contributed">¤#,##0.00;(¤#,##0.00)</pattern>
+					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="zero">¤ 0 ألف</pattern>
+					<pattern type="1000" count="one">¤ 0 ألف</pattern>
+					<pattern type="1000" count="two">¤ 0 ألف</pattern>
+					<pattern type="1000" count="few">¤ 0 ألف</pattern>
+					<pattern type="1000" count="many">¤ 0 ألف</pattern>
+					<pattern type="1000" count="other">¤ 0 ألف</pattern>
+					<pattern type="10000" count="zero">¤ 00 ألف</pattern>
+					<pattern type="10000" count="one">¤ 00 ألف</pattern>
+					<pattern type="10000" count="two">¤ 00 ألف</pattern>
+					<pattern type="10000" count="few">¤ 00 ألف</pattern>
+					<pattern type="10000" count="many">¤ 00 ألف</pattern>
+					<pattern type="10000" count="other">¤ 00 ألف</pattern>
+					<pattern type="100000" count="zero">¤ 000 ألف</pattern>
+					<pattern type="100000" count="one">¤ 000 ألف</pattern>
+					<pattern type="100000" count="two">¤ 000 ألف</pattern>
+					<pattern type="100000" count="few">¤ 000 ألف</pattern>
+					<pattern type="100000" count="many">¤ 000 ألف</pattern>
+					<pattern type="100000" count="other">¤ 000 ألف</pattern>
+					<pattern type="1000000" count="zero">¤ 0 مليو</pattern>
+					<pattern type="1000000" count="one">¤ 0 مليو</pattern>
+					<pattern type="1000000" count="two">¤ 0 مليو</pattern>
+					<pattern type="1000000" count="few">¤ 0 مليو</pattern>
+					<pattern type="1000000" count="many">¤ 0 مليو</pattern>
+					<pattern type="1000000" count="other">¤ 0 مليو</pattern>
+					<pattern type="10000000" count="zero">¤ 00 مليو</pattern>
+					<pattern type="10000000" count="one">¤ 00 مليو</pattern>
+					<pattern type="10000000" count="two">¤ 00 مليو</pattern>
+					<pattern type="10000000" count="few">¤ 00 مليو</pattern>
+					<pattern type="10000000" count="many">¤ 00 مليو</pattern>
+					<pattern type="10000000" count="other">¤ 00 مليو</pattern>
+					<pattern type="100000000" count="zero">¤ 000 مليو</pattern>
+					<pattern type="100000000" count="one">¤ 000 مليو</pattern>
+					<pattern type="100000000" count="two">¤ 000 مليو</pattern>
+					<pattern type="100000000" count="few">¤ 000 مليو</pattern>
+					<pattern type="100000000" count="many">¤ 000 مليو</pattern>
+					<pattern type="100000000" count="other">¤ 000 مليو</pattern>
+					<pattern type="1000000000" count="zero">¤ 0 مليا</pattern>
+					<pattern type="1000000000" count="one">¤ 0 مليا</pattern>
+					<pattern type="1000000000" count="two">¤ 0 مليا</pattern>
+					<pattern type="1000000000" count="few">¤ 0 مليا</pattern>
+					<pattern type="1000000000" count="many">¤ 0 مليا</pattern>
+					<pattern type="1000000000" count="other">¤ 0 مليا</pattern>
+					<pattern type="10000000000" count="zero">¤ 00 مليا</pattern>
+					<pattern type="10000000000" count="one">¤ 00 مليا</pattern>
+					<pattern type="10000000000" count="two">¤ 00 مليا</pattern>
+					<pattern type="10000000000" count="few">¤ 00 مليا</pattern>
+					<pattern type="10000000000" count="many">¤ 00 مليا</pattern>
+					<pattern type="10000000000" count="other">¤ 00 مليا</pattern>
+					<pattern type="100000000000" count="zero">¤ 000 مليا</pattern>
+					<pattern type="100000000000" count="one">¤ 000 مليا</pattern>
+					<pattern type="100000000000" count="two">¤ 000 مليا</pattern>
+					<pattern type="100000000000" count="few">¤ 000 مليا</pattern>
+					<pattern type="100000000000" count="many">¤ 000 مليا</pattern>
+					<pattern type="100000000000" count="other">¤ 000 مليا</pattern>
+					<pattern type="1000000000000" count="zero">¤ 0 ترليو</pattern>
+					<pattern type="1000000000000" count="one">¤ 0 ترليو</pattern>
+					<pattern type="1000000000000" count="two">¤ 0 ترليو</pattern>
+					<pattern type="1000000000000" count="few">¤ 0 ترليو</pattern>
+					<pattern type="1000000000000" count="many">¤ 0 ترليو</pattern>
+					<pattern type="1000000000000" count="other">¤ 0 ترليو</pattern>
+					<pattern type="10000000000000" count="zero">¤ 00 ترليو</pattern>
+					<pattern type="10000000000000" count="one">¤ 00 ترليو</pattern>
+					<pattern type="10000000000000" count="two">¤ 00 ترليو</pattern>
+					<pattern type="10000000000000" count="few">¤ 00 ترليو</pattern>
+					<pattern type="10000000000000" count="many">¤ 00 ترليو</pattern>
+					<pattern type="10000000000000" count="other">¤ 00 ترليو</pattern>
+					<pattern type="100000000000000" count="zero">¤ 000 ترليو</pattern>
+					<pattern type="100000000000000" count="one">¤ 000 ترليو</pattern>
+					<pattern type="100000000000000" count="two">¤ 000 ترليو</pattern>
+					<pattern type="100000000000000" count="few">¤ 000 ترليو</pattern>
+					<pattern type="100000000000000" count="many">¤ 000 ترليو</pattern>
+					<pattern type="100000000000000" count="other">¤ 000 ترليو</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="zero">{0} {1}</unitPattern>
@@ -5428,12 +5609,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="AED">
 				<displayName>درهم إماراتي</displayName>
-				<displayName count="zero" draft="contributed">درهم إماراتي</displayName>
-				<displayName count="one" draft="contributed">درهم إماراتي</displayName>
-				<displayName count="two" draft="contributed">درهم إماراتي</displayName>
-				<displayName count="few" draft="contributed">درهم إماراتي</displayName>
-				<displayName count="many" draft="contributed">درهم إماراتي</displayName>
-				<displayName count="other" draft="contributed">درهم إماراتي</displayName>
+				<displayName count="zero">درهم إماراتي</displayName>
+				<displayName count="one">درهم إماراتي</displayName>
+				<displayName count="two">درهم إماراتي</displayName>
+				<displayName count="few">دراهم إماراتية</displayName>
+				<displayName count="many">درهمًا إماراتيًا</displayName>
+				<displayName count="other">درهم إماراتي</displayName>
 				<symbol>د.إ.‏</symbol>
 			</currency>
 			<currency type="AFA">
@@ -5451,26 +5632,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="ALL">
 				<displayName>ليك ألباني</displayName>
-				<displayName count="zero" draft="contributed">ليك ألباني</displayName>
-				<displayName count="one" draft="contributed">ليك ألباني</displayName>
-				<displayName count="two" draft="contributed">ليك ألباني</displayName>
-				<displayName count="few" draft="contributed">ليك ألباني</displayName>
-				<displayName count="many" draft="contributed">ليك ألباني</displayName>
-				<displayName count="other" draft="contributed">ليك ألباني</displayName>
+				<displayName count="zero">ليك ألباني</displayName>
+				<displayName count="one">ليك ألباني</displayName>
+				<displayName count="two">ليك ألباني</displayName>
+				<displayName count="few">ليك ألباني</displayName>
+				<displayName count="many">ليك ألباني</displayName>
+				<displayName count="other">ليك ألباني</displayName>
 				<symbol draft="contributed">ALL</symbol>
 			</currency>
 			<currency type="AMD">
 				<displayName>درام أرميني</displayName>
-				<displayName count="zero" draft="contributed">درام أرميني</displayName>
-				<displayName count="one" draft="contributed">درام أرميني</displayName>
-				<displayName count="two" draft="contributed">درام أرميني</displayName>
-				<displayName count="few" draft="contributed">درام أرميني</displayName>
-				<displayName count="many" draft="contributed">درام أرميني</displayName>
-				<displayName count="other" draft="contributed">درام أرميني</displayName>
+				<displayName count="zero">درام أرميني</displayName>
+				<displayName count="one">درام أرميني</displayName>
+				<displayName count="two">درام أرميني</displayName>
+				<displayName count="few">درام أرميني</displayName>
+				<displayName count="many">درامًا أرمينيًا</displayName>
+				<displayName count="other">درام أرميني</displayName>
 				<symbol draft="contributed">AMD</symbol>
 			</currency>
 			<currency type="ANG">
-				<displayName draft="contributed">غيلدر هولندي أنتيلي</displayName>
+				<displayName>غيلدر أنتيلي هولندي</displayName>
 				<displayName count="zero">غيلدر أنتيلي هولندي</displayName>
 				<displayName count="one">غيلدر أنتيلي هولندي</displayName>
 				<displayName count="two">غيلدر أنتيلي هولندي</displayName>
@@ -5481,13 +5662,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="AOA">
 				<displayName>كوانزا أنجولي</displayName>
-				<displayName count="zero" draft="contributed">كوانزا أنجولي</displayName>
-				<displayName count="one" draft="contributed">كوانزا أنجولي</displayName>
-				<displayName count="two" draft="contributed">كوانزا أنجولي</displayName>
-				<displayName count="few" draft="contributed">كوانزا أنجولي</displayName>
-				<displayName count="many" draft="contributed">كوانزا أنجولي</displayName>
-				<displayName count="other" draft="contributed">كوانزا أنجولي</displayName>
+				<displayName count="zero">كوانزا أنجولي</displayName>
+				<displayName count="one">كوانزا أنجولي</displayName>
+				<displayName count="two">كوانزا أنجولي</displayName>
+				<displayName count="few">كوانزا أنجولي</displayName>
+				<displayName count="many">كوانزا أنجولي</displayName>
+				<displayName count="other">كوانزا أنجولي</displayName>
 				<symbol draft="contributed">AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>كوانزا أنجولي - 1977-1990</displayName>
@@ -5512,12 +5694,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="ARS">
 				<displayName>بيزو أرجنتيني</displayName>
-				<displayName count="zero" draft="contributed">بيزو أرجنتيني</displayName>
-				<displayName count="one" draft="contributed">بيزو أرجنتيني</displayName>
-				<displayName count="two" draft="contributed">بيزو أرجنتيني</displayName>
-				<displayName count="few" draft="contributed">بيزو أرجنتيني</displayName>
-				<displayName count="many" draft="contributed">بيزو أرجنتيني</displayName>
-				<displayName count="other" draft="contributed">بيزو أرجنتيني</displayName>
+				<displayName count="zero">بيزو أرجنتيني</displayName>
+				<displayName count="one">بيزو أرجنتيني</displayName>
+				<displayName count="two">بيزو أرجنتيني</displayName>
+				<displayName count="few">بيزو أرجنتيني</displayName>
+				<displayName count="many">بيزو أرجنتيني</displayName>
+				<displayName count="other">بيزو أرجنتيني</displayName>
 				<symbol draft="contributed">ARS</symbol>
 				<symbol alt="narrow" draft="contributed">AR$</symbol>
 			</currency>
@@ -5526,12 +5708,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="AUD">
 				<displayName>دولار أسترالي</displayName>
-				<displayName count="zero" draft="contributed">دولار أسترالي</displayName>
-				<displayName count="one" draft="contributed">دولار أسترالي</displayName>
-				<displayName count="two" draft="contributed">دولار أسترالي</displayName>
-				<displayName count="few" draft="contributed">دولار أسترالي</displayName>
-				<displayName count="many" draft="contributed">دولار أسترالي</displayName>
-				<displayName count="other" draft="contributed">دولار أسترالي</displayName>
+				<displayName count="zero">دولار أسترالي</displayName>
+				<displayName count="one">دولار أسترالي</displayName>
+				<displayName count="two">دولار أسترالي</displayName>
+				<displayName count="few">دولار أسترالي</displayName>
+				<displayName count="many">دولار أسترالي</displayName>
+				<displayName count="other">دولار أسترالي</displayName>
 				<symbol draft="contributed">AU$</symbol>
 				<symbol alt="narrow" draft="contributed">AU$</symbol>
 			</currency>
@@ -5556,6 +5738,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="AZN">
 				<displayName>مانات أذربيجان</displayName>
+				<displayName count="zero">مانت أذربيجاني</displayName>
+				<displayName count="one">مانت أذربيجاني</displayName>
+				<displayName count="two">مانت أذربيجاني</displayName>
+				<displayName count="few">مانت أذربيجاني</displayName>
+				<displayName count="many">مانت أذربيجاني</displayName>
+				<displayName count="other">مانت أذربيجاني</displayName>
 				<symbol draft="contributed">AZN</symbol>
 			</currency>
 			<currency type="BAD">
@@ -5563,13 +5751,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="BAM">
 				<displayName>مارك البوسنة والهرسك قابل للتحويل</displayName>
-				<displayName count="zero" draft="contributed">مارك البوسنة والهرسك قابل للتحويل</displayName>
-				<displayName count="one" draft="contributed">مارك البوسنة والهرسك قابل للتحويل</displayName>
-				<displayName count="two" draft="contributed">مارك البوسنة والهرسك قابل للتحويل</displayName>
-				<displayName count="few" draft="contributed">مارك البوسنة والهرسك قابل للتحويل</displayName>
-				<displayName count="many" draft="contributed">مارك البوسنة والهرسك قابل للتحويل</displayName>
-				<displayName count="other" draft="contributed">مارك البوسنة والهرسك قابل للتحويل</displayName>
+				<displayName count="zero">مارك البوسنة والهرسك قابل للتحويل</displayName>
+				<displayName count="one">مارك البوسنة والهرسك قابل للتحويل</displayName>
+				<displayName count="two">مارك البوسنة والهرسك قابل للتحويل</displayName>
+				<displayName count="few">مارك البوسنة والهرسك قابل للتحويل</displayName>
+				<displayName count="many">مارك البوسنة والهرسك قابل للتحويل</displayName>
+				<displayName count="other">مارك البوسنة والهرسك قابل للتحويل</displayName>
 				<symbol draft="contributed">BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>دولار بربادوسي</displayName>
@@ -5584,12 +5773,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="BDT">
 				<displayName>تاكا بنجلاديشي</displayName>
-				<displayName count="zero" draft="contributed">تاكا بنجلاديشي</displayName>
-				<displayName count="one" draft="contributed">تاكا بنجلاديشي</displayName>
-				<displayName count="two" draft="contributed">تاكا بنجلاديشي</displayName>
-				<displayName count="few" draft="contributed">تاكا بنجلاديشي</displayName>
-				<displayName count="many" draft="contributed">تاكا بنجلاديشي</displayName>
-				<displayName count="other" draft="contributed">تاكا بنجلاديشي</displayName>
+				<displayName count="zero">تاكا بنجلاديشي</displayName>
+				<displayName count="one">تاكا بنجلاديشي</displayName>
+				<displayName count="two">تاكا بنجلاديشي</displayName>
+				<displayName count="few">تاكا بنجلاديشي</displayName>
+				<displayName count="many">تاكا بنجلاديشي</displayName>
+				<displayName count="other">تاكا بنجلاديشي</displayName>
 				<symbol draft="contributed">BDT</symbol>
 				<symbol alt="narrow" draft="contributed">৳</symbol>
 			</currency>
@@ -5620,22 +5809,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="BHD">
 				<displayName>دينار بحريني</displayName>
-				<displayName count="zero" draft="contributed">دينار بحريني</displayName>
-				<displayName count="one" draft="contributed">دينار بحريني</displayName>
-				<displayName count="two" draft="contributed">دينار بحريني</displayName>
-				<displayName count="few" draft="contributed">دينار بحريني</displayName>
-				<displayName count="many" draft="contributed">دينار بحريني</displayName>
-				<displayName count="other" draft="contributed">دينار بحريني</displayName>
+				<displayName count="zero">دينار بحريني</displayName>
+				<displayName count="one">دينار بحريني</displayName>
+				<displayName count="two">دينار بحريني</displayName>
+				<displayName count="few">دينارات بحرينية</displayName>
+				<displayName count="many">دينارًا بحرينيًا</displayName>
+				<displayName count="other">دينار بحريني</displayName>
 				<symbol>د.ب.‏</symbol>
 			</currency>
 			<currency type="BIF">
 				<displayName>فرنك بروندي</displayName>
-				<displayName count="zero" draft="contributed">فرنك بروندي</displayName>
-				<displayName count="one" draft="contributed">فرنك بروندي</displayName>
-				<displayName count="two" draft="contributed">فرنك بروندي</displayName>
-				<displayName count="few" draft="contributed">فرنك بروندي</displayName>
-				<displayName count="many" draft="contributed">فرنك بروندي</displayName>
-				<displayName count="other" draft="contributed">فرنك بروندي</displayName>
+				<displayName count="zero">فرنك بروندي</displayName>
+				<displayName count="one">فرنك بروندي</displayName>
+				<displayName count="two">فرنك بروندي</displayName>
+				<displayName count="few">فرنك بروندي</displayName>
+				<displayName count="many">فرنك بروندي</displayName>
+				<displayName count="other">فرنك بروندي</displayName>
 				<symbol draft="contributed">BIF</symbol>
 			</currency>
 			<currency type="BMD">
@@ -5651,12 +5840,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="BND">
 				<displayName>دولار بروناي</displayName>
-				<displayName count="zero" draft="contributed">دولار بروناي</displayName>
-				<displayName count="one" draft="contributed">دولار بروناي</displayName>
-				<displayName count="two" draft="contributed">دولار بروناي</displayName>
-				<displayName count="few" draft="contributed">دولار بروناي</displayName>
-				<displayName count="many" draft="contributed">دولار بروناي</displayName>
-				<displayName count="other" draft="contributed">دولار بروناي</displayName>
+				<displayName count="zero">دولار بروناي</displayName>
+				<displayName count="one">دولار بروناي</displayName>
+				<displayName count="two">دولار بروناي</displayName>
+				<displayName count="few">دولار بروناي</displayName>
+				<displayName count="many">دولار بروناي</displayName>
+				<displayName count="other">دولار بروناي</displayName>
 				<symbol draft="contributed">BND</symbol>
 				<symbol alt="narrow" draft="contributed">BN$</symbol>
 			</currency>
@@ -5669,6 +5858,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">بوليفيانو بوليفي</displayName>
 				<displayName count="other">بوليفيانو بوليفي</displayName>
 				<symbol draft="contributed">BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOP">
 				<displayName>بيزو بوليفي</displayName>
@@ -5693,34 +5883,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="BRL">
 				<displayName>ريال برازيلي</displayName>
-				<displayName count="zero" draft="contributed">ريال برازيلي</displayName>
-				<displayName count="one" draft="contributed">ريال برازيلي</displayName>
-				<displayName count="two" draft="contributed">ريال برازيلي</displayName>
-				<displayName count="few" draft="contributed">ريال برازيلي</displayName>
-				<displayName count="many" draft="contributed">ريال برازيلي</displayName>
-				<displayName count="other" draft="contributed">ريال برازيلي</displayName>
+				<displayName count="zero">ريال برازيلي</displayName>
+				<displayName count="one">ريال برازيلي</displayName>
+				<displayName count="two">ريال برازيلي</displayName>
+				<displayName count="few">ريال برازيلي</displayName>
+				<displayName count="many">ريال برازيلي</displayName>
+				<displayName count="other">ريال برازيلي</displayName>
 				<symbol>R$</symbol>
 				<symbol alt="narrow" draft="contributed">R$</symbol>
 			</currency>
 			<currency type="BSD">
 				<displayName>دولار باهامي</displayName>
-				<displayName count="zero" draft="contributed">دولار باهامي</displayName>
-				<displayName count="one" draft="contributed">دولار باهامي</displayName>
-				<displayName count="two" draft="contributed">دولار باهامي</displayName>
-				<displayName count="few" draft="contributed">دولار باهامي</displayName>
-				<displayName count="many" draft="contributed">دولار باهامي</displayName>
-				<displayName count="other" draft="contributed">دولار باهامي</displayName>
+				<displayName count="zero">دولار باهامي</displayName>
+				<displayName count="one">دولار باهامي</displayName>
+				<displayName count="two">دولار باهامي</displayName>
+				<displayName count="few">دولار باهامي</displayName>
+				<displayName count="many">دولار باهامي</displayName>
+				<displayName count="other">دولار باهامي</displayName>
 				<symbol draft="contributed">BSD</symbol>
 				<symbol alt="narrow" draft="contributed">BS$</symbol>
 			</currency>
 			<currency type="BTN">
 				<displayName>نولتوم بوتاني</displayName>
-				<displayName count="zero" draft="contributed">نولتوم بوتاني</displayName>
-				<displayName count="one" draft="contributed">نولتوم بوتاني</displayName>
-				<displayName count="two" draft="contributed">نولتوم بوتاني</displayName>
-				<displayName count="few" draft="contributed">نولتوم بوتاني</displayName>
-				<displayName count="many" draft="contributed">نولتوم بوتاني</displayName>
-				<displayName count="other" draft="contributed">نولتوم بوتاني</displayName>
+				<displayName count="zero">نولتوم بوتاني</displayName>
+				<displayName count="one">نولتوم بوتاني</displayName>
+				<displayName count="two">نولتوم بوتاني</displayName>
+				<displayName count="few">نولتوم بوتاني</displayName>
+				<displayName count="many">نولتوم بوتاني</displayName>
+				<displayName count="other">نولتوم بوتاني</displayName>
 				<symbol draft="contributed">BTN</symbol>
 			</currency>
 			<currency type="BUK">
@@ -5728,25 +5918,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="BWP">
 				<displayName>بولا بتسواني</displayName>
-				<displayName count="zero" draft="contributed">بولا بتسواني</displayName>
-				<displayName count="one" draft="contributed">بولا بتسواني</displayName>
-				<displayName count="two" draft="contributed">بولا بتسواني</displayName>
-				<displayName count="few" draft="contributed">بولا بتسواني</displayName>
-				<displayName count="many" draft="contributed">بولا بتسواني</displayName>
-				<displayName count="other" draft="contributed">بولا بتسواني</displayName>
+				<displayName count="zero">بولا بتسواني</displayName>
+				<displayName count="one">بولا بتسواني</displayName>
+				<displayName count="two">بولا بتسواني</displayName>
+				<displayName count="few">بولا بتسواني</displayName>
+				<displayName count="many">بولا بتسواني</displayName>
+				<displayName count="other">بولا بتسواني</displayName>
 				<symbol draft="contributed">BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>روبل بيلاروسي جديد - 1994-1999</displayName>
 			</currency>
 			<currency type="BYR">
 				<displayName>روبل بيلاروسي</displayName>
-				<displayName count="zero" draft="contributed">روبل بيلاروسي</displayName>
-				<displayName count="one" draft="contributed">روبل بيلاروسي</displayName>
-				<displayName count="two" draft="contributed">روبل بيلاروسي</displayName>
-				<displayName count="few" draft="contributed">روبل بيلاروسي</displayName>
-				<displayName count="many" draft="contributed">روبل بيلاروسي</displayName>
-				<displayName count="other" draft="contributed">روبل بيلاروسي</displayName>
+				<displayName count="zero">روبل بيلاروسي</displayName>
+				<displayName count="one">روبل بيلاروسي</displayName>
+				<displayName count="two">روبل بيلاروسي</displayName>
+				<displayName count="few">روبل بيلاروسي</displayName>
+				<displayName count="many">روبل بيلاروسي</displayName>
+				<displayName count="other">روبل بيلاروسي</displayName>
 				<symbol draft="contributed">BYR</symbol>
 				<symbol alt="narrow" draft="contributed">р.</symbol>
 			</currency>
@@ -5754,7 +5945,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>دولار بليزي</displayName>
 				<displayName count="zero">دولار بليزي</displayName>
 				<displayName count="one">دولار بليزي</displayName>
-				<displayName count="two">دولار بليزي</displayName>
+				<displayName count="two">دولاران بليزيان</displayName>
 				<displayName count="few">دولار بليزي</displayName>
 				<displayName count="many">دولار بليزي</displayName>
 				<displayName count="other">دولار بليزي</displayName>
@@ -5784,44 +5975,44 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="CHF">
 				<displayName>فرنك سويسري</displayName>
-				<displayName count="zero" draft="contributed">فرنك سويسري</displayName>
-				<displayName count="one" draft="contributed">فرنك سويسري</displayName>
-				<displayName count="two" draft="contributed">فرنك سويسري</displayName>
-				<displayName count="few" draft="contributed">فرنك سويسري</displayName>
-				<displayName count="many" draft="contributed">فرنك سويسري</displayName>
-				<displayName count="other" draft="contributed">فرنك سويسري</displayName>
+				<displayName count="zero">فرنك سويسري</displayName>
+				<displayName count="one">فرنك سويسري</displayName>
+				<displayName count="two">فرنك سويسري</displayName>
+				<displayName count="few">فرنك سويسري</displayName>
+				<displayName count="many">فرنك سويسري</displayName>
+				<displayName count="other">فرنك سويسري</displayName>
 				<symbol draft="contributed">CHF</symbol>
 			</currency>
 			<currency type="CLP">
 				<displayName>بيزو شيلي</displayName>
-				<displayName count="zero" draft="contributed">بيزو شيلي</displayName>
-				<displayName count="one" draft="contributed">بيزو شيلي</displayName>
-				<displayName count="two" draft="contributed">بيزو شيلي</displayName>
-				<displayName count="few" draft="contributed">بيزو شيلي</displayName>
-				<displayName count="many" draft="contributed">بيزو شيلي</displayName>
-				<displayName count="other" draft="contributed">بيزو شيلي</displayName>
+				<displayName count="zero">بيزو شيلي</displayName>
+				<displayName count="one">بيزو شيلي</displayName>
+				<displayName count="two">بيزو شيلي</displayName>
+				<displayName count="few">بيزو شيلي</displayName>
+				<displayName count="many">بيزو شيلي</displayName>
+				<displayName count="other">بيزو شيلي</displayName>
 				<symbol draft="contributed">CLP</symbol>
 				<symbol alt="narrow" draft="contributed">CL$</symbol>
 			</currency>
 			<currency type="CNY">
 				<displayName>يوان صيني</displayName>
-				<displayName count="zero" draft="contributed">يوان صيني</displayName>
-				<displayName count="one" draft="contributed">يوان صيني</displayName>
-				<displayName count="two" draft="contributed">يوان صيني</displayName>
-				<displayName count="few" draft="contributed">يوان صيني</displayName>
-				<displayName count="many" draft="contributed">يوان صيني</displayName>
-				<displayName count="other" draft="contributed">يوان صيني</displayName>
-				<symbol>ي.ص</symbol>
+				<displayName count="zero">يوان صيني</displayName>
+				<displayName count="one">يوان صيني</displayName>
+				<displayName count="two">يوان صيني</displayName>
+				<displayName count="few">يوان صيني</displayName>
+				<displayName count="many">يوان صيني</displayName>
+				<displayName count="other">يوان صيني</displayName>
+				<symbol>CN¥</symbol>
 				<symbol alt="narrow" draft="contributed">CN¥</symbol>
 			</currency>
 			<currency type="COP">
 				<displayName>بيزو كولومبي</displayName>
-				<displayName count="zero" draft="contributed">بيزو كولومبي</displayName>
-				<displayName count="one" draft="contributed">بيزو كولومبي</displayName>
-				<displayName count="two" draft="contributed">بيزو كولومبي</displayName>
-				<displayName count="few" draft="contributed">بيزو كولومبي</displayName>
-				<displayName count="many" draft="contributed">بيزو كولومبي</displayName>
-				<displayName count="other" draft="contributed">بيزو كولومبي</displayName>
+				<displayName count="zero">بيزو كولومبي</displayName>
+				<displayName count="one">بيزو كولومبي</displayName>
+				<displayName count="two">بيزو كولومبي</displayName>
+				<displayName count="few">بيزو كولومبي</displayName>
+				<displayName count="many">بيزو كولومبي</displayName>
+				<displayName count="other">بيزو كولومبي</displayName>
 				<symbol draft="contributed">COP</symbol>
 				<symbol alt="narrow" draft="contributed">CO$</symbol>
 			</currency>
@@ -5844,7 +6035,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="CUC">
 				<displayName>بيزو كوبي قابل للتحويل</displayName>
+				<displayName count="zero">بيزو كوبي قابل للتحويل</displayName>
+				<displayName count="one">بيزو كوبي قابل للتحويل</displayName>
+				<displayName count="two">بيزو كوبي قابل للتحويل</displayName>
+				<displayName count="few">بيزو كوبي قابل للتحويل</displayName>
+				<displayName count="many">بيزو كوبي قابل للتحويل</displayName>
+				<displayName count="other">بيزو كوبي قابل للتحويل</displayName>
 				<symbol draft="contributed">CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>بيزو كوبي</displayName>
@@ -5859,12 +6057,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="CVE">
 				<displayName>اسكودو الرأس الخضراء</displayName>
-				<displayName count="zero" draft="contributed">اسكودو الرأس الخضراء</displayName>
-				<displayName count="one" draft="contributed">اسكودو الرأس الخضراء</displayName>
-				<displayName count="two" draft="contributed">اسكودو الرأس الخضراء</displayName>
-				<displayName count="few" draft="contributed">اسكودو الرأس الخضراء</displayName>
-				<displayName count="many" draft="contributed">اسكودو الرأس الخضراء</displayName>
-				<displayName count="other" draft="contributed">اسكودو الرأس الخضراء</displayName>
+				<displayName count="zero">اسكودو الرأس الخضراء</displayName>
+				<displayName count="one">اسكودو الرأس الخضراء</displayName>
+				<displayName count="two">اسكودو الرأس الخضراء</displayName>
+				<displayName count="few">اسكودو الرأس الخضراء</displayName>
+				<displayName count="many">اسكودو الرأس الخضراء</displayName>
+				<displayName count="other">اسكودو الرأس الخضراء</displayName>
 				<symbol draft="contributed">CVE</symbol>
 			</currency>
 			<currency type="CYP">
@@ -5878,13 +6076,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="CZK">
 				<displayName>كرونة تشيكية</displayName>
-				<displayName count="zero" draft="contributed">كرونة تشيكية</displayName>
-				<displayName count="one" draft="contributed">كرونة تشيكية</displayName>
-				<displayName count="two" draft="contributed">كرونة تشيكية</displayName>
-				<displayName count="few" draft="contributed">كرونة تشيكية</displayName>
-				<displayName count="many" draft="contributed">كرونة تشيكية</displayName>
-				<displayName count="other" draft="contributed">كرونة تشيكية</displayName>
+				<displayName count="zero">كرونة تشيكية</displayName>
+				<displayName count="one">كرونة تشيكية</displayName>
+				<displayName count="two">كرونة تشيكية</displayName>
+				<displayName count="few">كرونة تشيكية</displayName>
+				<displayName count="many">كرونة تشيكية</displayName>
+				<displayName count="other">كرونة تشيكية</displayName>
 				<symbol draft="contributed">CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>أوستمارك ألماني شرقي</displayName>
@@ -5900,43 +6099,44 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="DJF">
 				<displayName>فرنك جيبوتي</displayName>
-				<displayName count="zero" draft="contributed">فرنك جيبوتي</displayName>
-				<displayName count="one" draft="contributed">فرنك جيبوتي</displayName>
-				<displayName count="two" draft="contributed">فرنك جيبوتي</displayName>
-				<displayName count="few" draft="contributed">فرنك جيبوتي</displayName>
-				<displayName count="many" draft="contributed">فرنك جيبوتي</displayName>
-				<displayName count="other" draft="contributed">فرنك جيبوتي</displayName>
+				<displayName count="zero">فرنك جيبوتي</displayName>
+				<displayName count="one">فرنك جيبوتي</displayName>
+				<displayName count="two">فرنك جيبوتي</displayName>
+				<displayName count="few">فرنك جيبوتي</displayName>
+				<displayName count="many">فرنك جيبوتي</displayName>
+				<displayName count="other">فرنك جيبوتي</displayName>
 				<symbol draft="contributed">DJF</symbol>
 			</currency>
 			<currency type="DKK">
 				<displayName>كرونة دانماركي</displayName>
-				<displayName count="zero" draft="contributed">كرونة دانماركي</displayName>
-				<displayName count="one" draft="contributed">كرونة دانماركي</displayName>
-				<displayName count="two" draft="contributed">كرونة دانماركي</displayName>
-				<displayName count="few" draft="contributed">كرونة دانماركي</displayName>
-				<displayName count="many" draft="contributed">كرونة دانماركي</displayName>
-				<displayName count="other" draft="contributed">كرونة دانماركي</displayName>
+				<displayName count="zero">كرونة دانماركي</displayName>
+				<displayName count="one">كرونة دانماركي</displayName>
+				<displayName count="two">كرونة دانماركي</displayName>
+				<displayName count="few">كرونة دانماركي</displayName>
+				<displayName count="many">كرونة دانماركي</displayName>
+				<displayName count="other">كرونة دانماركي</displayName>
 				<symbol draft="contributed">DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>بيزو الدومنيكان</displayName>
-				<displayName count="zero" draft="contributed">بيزو الدومنيكان</displayName>
-				<displayName count="one" draft="contributed">بيزو الدومنيكان</displayName>
-				<displayName count="two" draft="contributed">بيزو الدومنيكان</displayName>
-				<displayName count="few" draft="contributed">بيزو الدومنيكان</displayName>
-				<displayName count="many" draft="contributed">بيزو الدومنيكان</displayName>
-				<displayName count="other" draft="contributed">بيزو الدومنيكان</displayName>
+				<displayName count="zero">بيزو الدومنيكان</displayName>
+				<displayName count="one">بيزو الدومنيكان</displayName>
+				<displayName count="two">بيزو الدومنيكان</displayName>
+				<displayName count="few">بيزو الدومنيكان</displayName>
+				<displayName count="many">بيزو الدومنيكان</displayName>
+				<displayName count="other">بيزو الدومنيكان</displayName>
 				<symbol draft="contributed">DOP</symbol>
 				<symbol alt="narrow" draft="contributed">DO$</symbol>
 			</currency>
 			<currency type="DZD">
 				<displayName>دينار جزائري</displayName>
-				<displayName count="zero" draft="contributed">دينار جزائري</displayName>
-				<displayName count="one" draft="contributed">دينار جزائري</displayName>
-				<displayName count="two" draft="contributed">دينار جزائري</displayName>
-				<displayName count="few" draft="contributed">دينار جزائري</displayName>
-				<displayName count="many" draft="contributed">دينار جزائري</displayName>
-				<displayName count="other" draft="contributed">دينار جزائري</displayName>
+				<displayName count="zero">دينار جزائري</displayName>
+				<displayName count="one">دينار جزائري</displayName>
+				<displayName count="two">ديناران جزائريان</displayName>
+				<displayName count="few">دينارات جزائرية</displayName>
+				<displayName count="many">دينارًا جزائريًا</displayName>
+				<displayName count="other">دينار جزائري</displayName>
 				<symbol>د.ج.‏</symbol>
 			</currency>
 			<currency type="EEK">
@@ -5952,20 +6152,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>جنيه مصري</displayName>
 				<displayName count="zero">جنيه مصري</displayName>
 				<displayName count="one">جنيه مصري</displayName>
-				<displayName count="two">جنيه مصري</displayName>
-				<displayName count="few">جنيه مصري</displayName>
-				<displayName count="many">جنيه مصري</displayName>
+				<displayName count="two">جنيهان مصريان</displayName>
+				<displayName count="few">جنيهات مصرية</displayName>
+				<displayName count="many">جنيهًا مصريًا</displayName>
 				<displayName count="other">جنيه مصري</displayName>
 				<symbol>ج.م.‏</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>ناكفا أريتري</displayName>
-				<displayName count="zero" draft="contributed">ناكفا أريتري</displayName>
-				<displayName count="one" draft="contributed">ناكفا أريتري</displayName>
-				<displayName count="two" draft="contributed">ناكفا أريتري</displayName>
-				<displayName count="few" draft="contributed">ناكفا أريتري</displayName>
-				<displayName count="many" draft="contributed">ناكفا أريتري</displayName>
-				<displayName count="other" draft="contributed">ناكفا أريتري</displayName>
+				<displayName count="zero">ناكفا أريتري</displayName>
+				<displayName count="one">ناكفا أريتري</displayName>
+				<displayName count="two">ناكفا أريتري</displayName>
+				<displayName count="few">ناكفا أريتري</displayName>
+				<displayName count="many">ناكفا أريتري</displayName>
+				<displayName count="other">ناكفا أريتري</displayName>
 				<symbol draft="contributed">ERN</symbol>
 			</currency>
 			<currency type="ESP">
@@ -5979,22 +6180,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="ETB">
 				<displayName>بير أثيوبي</displayName>
-				<displayName count="zero" draft="contributed">بير أثيوبي</displayName>
-				<displayName count="one" draft="contributed">بير أثيوبي</displayName>
-				<displayName count="two" draft="contributed">بير أثيوبي</displayName>
-				<displayName count="few" draft="contributed">بير أثيوبي</displayName>
-				<displayName count="many" draft="contributed">بير أثيوبي</displayName>
-				<displayName count="other" draft="contributed">بير أثيوبي</displayName>
+				<displayName count="zero">بير أثيوبي</displayName>
+				<displayName count="one">بير أثيوبي</displayName>
+				<displayName count="two">بير أثيوبي</displayName>
+				<displayName count="few">بير أثيوبي</displayName>
+				<displayName count="many">بير أثيوبي</displayName>
+				<displayName count="other">بير أثيوبي</displayName>
 				<symbol draft="contributed">ETB</symbol>
 			</currency>
 			<currency type="EUR">
 				<displayName>يورو</displayName>
-				<displayName count="zero" draft="contributed">يورو</displayName>
-				<displayName count="one" draft="contributed">يورو</displayName>
-				<displayName count="two" draft="contributed">يورو</displayName>
-				<displayName count="few" draft="contributed">يورو</displayName>
-				<displayName count="many" draft="contributed">يورو</displayName>
-				<displayName count="other" draft="contributed">يورو</displayName>
+				<displayName count="zero">يورو</displayName>
+				<displayName count="one">يورو</displayName>
+				<displayName count="two">يورو</displayName>
+				<displayName count="few">يورو</displayName>
+				<displayName count="many">يورو</displayName>
+				<displayName count="other">يورو</displayName>
 				<symbol>€</symbol>
 				<symbol alt="narrow" draft="contributed">€</symbol>
 			</currency>
@@ -6009,24 +6210,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="FJD">
 				<displayName>دولار فيجي</displayName>
-				<displayName count="zero" draft="contributed">دولار فيجي</displayName>
-				<displayName count="one" draft="contributed">دولار فيجي</displayName>
-				<displayName count="two" draft="contributed">دولار فيجي</displayName>
-				<displayName count="few" draft="contributed">دولار فيجي</displayName>
-				<displayName count="many" draft="contributed">دولار فيجي</displayName>
-				<displayName count="other" draft="contributed">دولار فيجي</displayName>
+				<displayName count="zero">دولار فيجي</displayName>
+				<displayName count="one">دولار فيجي</displayName>
+				<displayName count="two">دولار فيجي</displayName>
+				<displayName count="few">دولار فيجي</displayName>
+				<displayName count="many">دولار فيجي</displayName>
+				<displayName count="other">دولار فيجي</displayName>
 				<symbol draft="contributed">FJD</symbol>
 				<symbol alt="narrow" draft="contributed">FJ$</symbol>
 			</currency>
 			<currency type="FKP">
 				<displayName>جنيه جزر فوكلاند</displayName>
-				<displayName count="zero" draft="contributed">جنيه جزر فوكلاند</displayName>
-				<displayName count="one" draft="contributed">جنيه جزر فوكلاند</displayName>
-				<displayName count="two" draft="contributed">جنيه جزر فوكلاند</displayName>
-				<displayName count="few" draft="contributed">جنيه جزر فوكلاند</displayName>
-				<displayName count="many" draft="contributed">جنيه جزر فوكلاند</displayName>
-				<displayName count="other" draft="contributed">جنيه جزر فوكلاند</displayName>
+				<displayName count="zero">جنيه جزر فوكلاند</displayName>
+				<displayName count="one">جنيه جزر فوكلاند</displayName>
+				<displayName count="two">جنيه جزر فوكلاند</displayName>
+				<displayName count="few">جنيه جزر فوكلاند</displayName>
+				<displayName count="many">جنيه جزر فوكلاند</displayName>
+				<displayName count="other">جنيه جزر فوكلاند</displayName>
 				<symbol draft="contributed">FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>فرنك فرنسي</displayName>
@@ -6050,13 +6252,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="GEL">
 				<displayName>لارى جورجي</displayName>
-				<displayName count="zero" draft="contributed">لاري جورجي</displayName>
-				<displayName count="one" draft="contributed">لاري جورجي</displayName>
-				<displayName count="two" draft="contributed">لاري جورجي</displayName>
-				<displayName count="few" draft="contributed">لاري جورجي</displayName>
-				<displayName count="many" draft="contributed">لاري جورجي</displayName>
-				<displayName count="other" draft="contributed">لاري جورجي</displayName>
+				<displayName count="zero">لاري جورجي</displayName>
+				<displayName count="one">لاري جورجي</displayName>
+				<displayName count="two">لاري جورجي</displayName>
+				<displayName count="few">لاري جورجي</displayName>
+				<displayName count="many">لاري جورجي</displayName>
+				<displayName count="other">لاري جورجي</displayName>
 				<symbol draft="contributed">GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>سيدي غاني</displayName>
@@ -6069,38 +6272,45 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="GHS">
 				<displayName>سيدي غانا</displayName>
+				<displayName count="zero">سيدي غانا</displayName>
+				<displayName count="one">سيدي غانا</displayName>
+				<displayName count="two">سيدي غانا</displayName>
+				<displayName count="few">سيدي غانا</displayName>
+				<displayName count="many">سيدي غانا</displayName>
+				<displayName count="other">سيدي غانا</displayName>
 				<symbol draft="contributed">GHS</symbol>
 			</currency>
 			<currency type="GIP">
 				<displayName>جنيه جبل طارق</displayName>
-				<displayName count="zero" draft="contributed">جنيه جبل طارق</displayName>
-				<displayName count="one" draft="contributed">جنيه جبل طارق</displayName>
-				<displayName count="two" draft="contributed">جنيه جبل طارق</displayName>
-				<displayName count="few" draft="contributed">جنيه جبل طارق</displayName>
-				<displayName count="many" draft="contributed">جنيه جبل طارق</displayName>
-				<displayName count="other" draft="contributed">جنيه جبل طارق</displayName>
+				<displayName count="zero">جنيه جبل طارق</displayName>
+				<displayName count="one">جنيه جبل طارق</displayName>
+				<displayName count="two">جنيه جبل طارق</displayName>
+				<displayName count="few">جنيه جبل طارق</displayName>
+				<displayName count="many">جنيه جبل طارق</displayName>
+				<displayName count="other">جنيه جبل طارق</displayName>
 				<symbol draft="contributed">GIP</symbol>
 				<symbol alt="narrow">£</symbol>
 			</currency>
 			<currency type="GMD">
 				<displayName>دلاسي جامبي</displayName>
-				<displayName count="zero" draft="contributed">دلاسي جامبي</displayName>
-				<displayName count="one" draft="contributed">دلاسي جامبي</displayName>
-				<displayName count="two" draft="contributed">دلاسي جامبي</displayName>
-				<displayName count="few" draft="contributed">دلاسي جامبي</displayName>
-				<displayName count="many" draft="contributed">دلاسي جامبي</displayName>
-				<displayName count="other" draft="contributed">دلاسي جامبي</displayName>
+				<displayName count="zero">دلاسي جامبي</displayName>
+				<displayName count="one">دلاسي جامبي</displayName>
+				<displayName count="two">دلاسي جامبي</displayName>
+				<displayName count="few">دلاسي جامبي</displayName>
+				<displayName count="many">دلاسي جامبي</displayName>
+				<displayName count="other">دلاسي جامبي</displayName>
 				<symbol draft="contributed">GMD</symbol>
 			</currency>
 			<currency type="GNF">
 				<displayName>فرنك غينيا</displayName>
-				<displayName count="zero" draft="contributed">فرنك غينيا</displayName>
-				<displayName count="one" draft="contributed">فرنك غينيا</displayName>
-				<displayName count="two" draft="contributed">فرنك غينيا</displayName>
-				<displayName count="few" draft="contributed">فرنك غينيا</displayName>
-				<displayName count="many" draft="contributed">فرنك غينيا</displayName>
-				<displayName count="other" draft="contributed">فرنك غينيا</displayName>
+				<displayName count="zero">فرنك غينيا</displayName>
+				<displayName count="one">فرنك غينيا</displayName>
+				<displayName count="two">فرنك غينيا</displayName>
+				<displayName count="few">فرنك غينيا</displayName>
+				<displayName count="many">فرنك غينيا</displayName>
+				<displayName count="other">فرنك غينيا</displayName>
 				<symbol draft="contributed">GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>سيلي غينيا</displayName>
@@ -6126,6 +6336,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">كوتزال جواتيمالا</displayName>
 				<displayName count="other">كوتزال جواتيمالا</displayName>
 				<symbol draft="contributed">GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>اسكود برتغالي غينيا</displayName>
@@ -6135,23 +6346,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="GYD">
 				<displayName>دولار غيانا</displayName>
-				<displayName count="zero" draft="contributed">دولار غيانا</displayName>
-				<displayName count="one" draft="contributed">دولار غيانا</displayName>
-				<displayName count="two" draft="contributed">دولار غيانا</displayName>
-				<displayName count="few" draft="contributed">دولار غيانا</displayName>
-				<displayName count="many" draft="contributed">دولار غيانا</displayName>
-				<displayName count="other" draft="contributed">دولار غيانا</displayName>
+				<displayName count="zero">دولار غيانا</displayName>
+				<displayName count="one">دولار غيانا</displayName>
+				<displayName count="two">دولار غيانا</displayName>
+				<displayName count="few">دولار غيانا</displayName>
+				<displayName count="many">دولار غيانا</displayName>
+				<displayName count="other">دولار غيانا</displayName>
 				<symbol draft="contributed">GYD</symbol>
 				<symbol alt="narrow" draft="contributed">GY$</symbol>
 			</currency>
 			<currency type="HKD">
-				<displayName>دولار هونج كونج</displayName>
-				<displayName count="zero" draft="contributed">دولار هونج كونج</displayName>
-				<displayName count="one" draft="contributed">دولار هونج كونج</displayName>
-				<displayName count="two" draft="contributed">دولار هونج كونج</displayName>
-				<displayName count="few" draft="contributed">دولار هونج كونج</displayName>
-				<displayName count="many" draft="contributed">دولار هونج كونج</displayName>
-				<displayName count="other" draft="contributed">دولار هونج كونج</displayName>
+				<displayName>دولار هونغ كونغ</displayName>
+				<displayName count="zero">دولار هونغ كونغ</displayName>
+				<displayName count="one">دولار هونغ كونغ</displayName>
+				<displayName count="two">دولار هونغ كونغ</displayName>
+				<displayName count="few">دولار هونغ كونغ</displayName>
+				<displayName count="many">دولار هونغ كونغ</displayName>
+				<displayName count="other">دولار هونغ كونغ</displayName>
 				<symbol draft="contributed">HK$</symbol>
 				<symbol alt="narrow" draft="contributed">HK$</symbol>
 			</currency>
@@ -6164,49 +6375,53 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">ليمبيرا هندوراس</displayName>
 				<displayName count="other">ليمبيرا هندوراس</displayName>
 				<symbol draft="contributed">HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>دينار كرواتي</displayName>
 			</currency>
 			<currency type="HRK">
 				<displayName>كونا كرواتي</displayName>
-				<displayName count="zero" draft="contributed">كونا كرواتي</displayName>
-				<displayName count="one" draft="contributed">كونا كرواتي</displayName>
-				<displayName count="two" draft="contributed">كونا كرواتي</displayName>
-				<displayName count="few" draft="contributed">كونا كرواتي</displayName>
-				<displayName count="many" draft="contributed">كونا كرواتي</displayName>
-				<displayName count="other" draft="contributed">كونا كرواتي</displayName>
+				<displayName count="zero">كونا كرواتي</displayName>
+				<displayName count="one">كونا كرواتي</displayName>
+				<displayName count="two">كونا كرواتي</displayName>
+				<displayName count="few">كونا كرواتي</displayName>
+				<displayName count="many">كونا كرواتي</displayName>
+				<displayName count="other">كونا كرواتي</displayName>
 				<symbol draft="contributed">HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>جوردى هايتي</displayName>
-				<displayName count="zero" draft="contributed">جوردى هايتي</displayName>
-				<displayName count="one" draft="contributed">جوردى هايتي</displayName>
-				<displayName count="two" draft="contributed">جوردى هايتي</displayName>
-				<displayName count="few" draft="contributed">جوردى هايتي</displayName>
-				<displayName count="many" draft="contributed">جوردى هايتي</displayName>
-				<displayName count="other" draft="contributed">جوردى هايتي</displayName>
+				<displayName count="zero">جوردى هايتي</displayName>
+				<displayName count="one">جوردى هايتي</displayName>
+				<displayName count="two">جوردى هايتي</displayName>
+				<displayName count="few">جوردى هايتي</displayName>
+				<displayName count="many">جوردى هايتي</displayName>
+				<displayName count="other">جوردى هايتي</displayName>
 				<symbol draft="contributed">HTG</symbol>
 			</currency>
 			<currency type="HUF">
 				<displayName>فورينت مجري</displayName>
-				<displayName count="zero" draft="contributed">فورينت مجري</displayName>
-				<displayName count="one" draft="contributed">فورينت مجري</displayName>
-				<displayName count="two" draft="contributed">فورينت مجري</displayName>
-				<displayName count="few" draft="contributed">فورينت مجري</displayName>
-				<displayName count="many" draft="contributed">فورينت مجري</displayName>
-				<displayName count="other" draft="contributed">فورينت مجري</displayName>
+				<displayName count="zero">فورينت مجري</displayName>
+				<displayName count="one">فورينت مجري</displayName>
+				<displayName count="two">فورينت مجري</displayName>
+				<displayName count="few">فورينت مجري</displayName>
+				<displayName count="many">فورينت مجري</displayName>
+				<displayName count="other">فورينت مجري</displayName>
 				<symbol draft="contributed">HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>روبية إندونيسية</displayName>
-				<displayName count="zero" draft="contributed">روبيه إندونيسية</displayName>
-				<displayName count="one" draft="contributed">روبيه إندونيسية</displayName>
-				<displayName count="two" draft="contributed">روبيه إندونيسية</displayName>
-				<displayName count="few" draft="contributed">روبيه إندونيسية</displayName>
-				<displayName count="many" draft="contributed">روبيه إندونيسية</displayName>
-				<displayName count="other" draft="contributed">روبيه إندونيسية</displayName>
+				<displayName count="zero">روبيه إندونيسية</displayName>
+				<displayName count="one">روبيه إندونيسية</displayName>
+				<displayName count="two">روبيه إندونيسية</displayName>
+				<displayName count="few">روبيه إندونيسية</displayName>
+				<displayName count="many">روبيه إندونيسية</displayName>
+				<displayName count="other">روبيه إندونيسية</displayName>
 				<symbol draft="contributed">ر.إن.</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>جنيه إيرلندي</displayName>
@@ -6228,55 +6443,56 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="ILS">
 				<displayName>شيكل إسرائيلي جديد</displayName>
-				<displayName count="zero" draft="contributed">شيكل إسرائيلي جديد</displayName>
-				<displayName count="one" draft="contributed">شيكل إسرائيلي جديد</displayName>
-				<displayName count="two" draft="contributed">شيكل إسرائيلي جديد</displayName>
-				<displayName count="few" draft="contributed">شيكل إسرائيلي جديد</displayName>
-				<displayName count="many" draft="contributed">شيكل إسرائيلي جديد</displayName>
-				<displayName count="other" draft="contributed">شيكل إسرائيلي جديد</displayName>
+				<displayName count="zero">شيكل إسرائيلي جديد</displayName>
+				<displayName count="one">شيكل إسرائيلي جديد</displayName>
+				<displayName count="two">شيكل إسرائيلي جديد</displayName>
+				<displayName count="few">شيكل إسرائيلي جديد</displayName>
+				<displayName count="many">شيكل إسرائيلي جديد</displayName>
+				<displayName count="other">شيكل إسرائيلي جديد</displayName>
 				<symbol draft="contributed">₪</symbol>
 				<symbol alt="narrow" draft="contributed">₪</symbol>
 			</currency>
 			<currency type="INR">
 				<displayName>روبيه هندي</displayName>
-				<displayName count="zero" draft="contributed">روبية هندي</displayName>
-				<displayName count="one" draft="contributed">روبية هندي</displayName>
-				<displayName count="two" draft="contributed">روبية هندي</displayName>
-				<displayName count="few" draft="contributed">روبية هندي</displayName>
-				<displayName count="many" draft="contributed">روبية هندي</displayName>
-				<displayName count="other" draft="contributed">روبية هندي</displayName>
-				<symbol>ر.ه.‏</symbol>
+				<displayName count="zero">روبية هندي</displayName>
+				<displayName count="one">روبية هندي</displayName>
+				<displayName count="two">روبية هندي</displayName>
+				<displayName count="few">روبية هندي</displayName>
+				<displayName count="many">روبية هندي</displayName>
+				<displayName count="other">روبية هندي</displayName>
+				<symbol>₹</symbol>
 				<symbol alt="narrow" draft="contributed">₹</symbol>
 			</currency>
 			<currency type="IQD">
 				<displayName>دينار عراقي</displayName>
-				<displayName count="zero" draft="contributed">دينار عراقي</displayName>
-				<displayName count="one" draft="contributed">دينار عراقي</displayName>
-				<displayName count="two" draft="contributed">دينار عراقي</displayName>
-				<displayName count="few" draft="contributed">دينار عراقي</displayName>
-				<displayName count="many" draft="contributed">دينار عراقي</displayName>
-				<displayName count="other" draft="contributed">دينار عراقي</displayName>
+				<displayName count="zero">دينار عراقي</displayName>
+				<displayName count="one">دينار عراقي</displayName>
+				<displayName count="two">دينار عراقي</displayName>
+				<displayName count="few">دينارات عراقية</displayName>
+				<displayName count="many">دينارًا عراقيًا</displayName>
+				<displayName count="other">دينار عراقي</displayName>
 				<symbol>د.ع.‏</symbol>
 			</currency>
 			<currency type="IRR">
 				<displayName>ريال إيراني</displayName>
-				<displayName count="zero" draft="contributed">ريال إيراني</displayName>
-				<displayName count="one" draft="contributed">ريال إيراني</displayName>
-				<displayName count="two" draft="contributed">ريال إيراني</displayName>
-				<displayName count="few" draft="contributed">ريال إيراني</displayName>
-				<displayName count="many" draft="contributed">ريال إيراني</displayName>
-				<displayName count="other" draft="contributed">ريال إيراني</displayName>
+				<displayName count="zero">ريال إيراني</displayName>
+				<displayName count="one">ريال إيراني</displayName>
+				<displayName count="two">ريال إيراني</displayName>
+				<displayName count="few">ريال إيراني</displayName>
+				<displayName count="many">ريال إيراني</displayName>
+				<displayName count="other">ريال إيراني</displayName>
 				<symbol draft="contributed">ر.إ.</symbol>
 			</currency>
 			<currency type="ISK">
 				<displayName>كرونه أيسلندي</displayName>
-				<displayName count="zero" draft="contributed">كرونه أيسلندي</displayName>
-				<displayName count="one" draft="contributed">كرونه أيسلندي</displayName>
-				<displayName count="two" draft="contributed">كرونه أيسلندي</displayName>
-				<displayName count="few" draft="contributed">كرونه أيسلندي</displayName>
-				<displayName count="many" draft="contributed">كرونه أيسلندي</displayName>
-				<displayName count="other" draft="contributed">كرونه أيسلندي</displayName>
+				<displayName count="zero">كرونه أيسلندي</displayName>
+				<displayName count="one">كرونه أيسلندي</displayName>
+				<displayName count="two">كرونه أيسلندي</displayName>
+				<displayName count="few">كرونه أيسلندي</displayName>
+				<displayName count="many">كرونه أيسلندي</displayName>
+				<displayName count="other">كرونه أيسلندي</displayName>
 				<symbol draft="contributed">ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>ليرة إيطالية</displayName>
@@ -6289,169 +6505,173 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="JMD">
 				<displayName>دولار جامايكي</displayName>
-				<displayName count="zero" draft="contributed">دولار جامايكي</displayName>
-				<displayName count="one" draft="contributed">دولار جامايكي</displayName>
-				<displayName count="two" draft="contributed">دولار جامايكي</displayName>
-				<displayName count="few" draft="contributed">دولار جامايكي</displayName>
-				<displayName count="many" draft="contributed">دولار جامايكي</displayName>
-				<displayName count="other" draft="contributed">دولار جامايكي</displayName>
+				<displayName count="zero">دولار جامايكي</displayName>
+				<displayName count="one">دولار جامايكي</displayName>
+				<displayName count="two">دولار جامايكي</displayName>
+				<displayName count="few">دولار جامايكي</displayName>
+				<displayName count="many">دولار جامايكي</displayName>
+				<displayName count="other">دولار جامايكي</displayName>
 				<symbol draft="contributed">JMD</symbol>
 				<symbol alt="narrow" draft="contributed">JM$</symbol>
 			</currency>
 			<currency type="JOD">
 				<displayName>دينار أردني</displayName>
-				<displayName count="zero" draft="contributed">دينار أردني</displayName>
-				<displayName count="one" draft="contributed">دينار أردني</displayName>
-				<displayName count="two" draft="contributed">دينار أردني</displayName>
-				<displayName count="few" draft="contributed">دينار أردني</displayName>
-				<displayName count="many" draft="contributed">دينار أردني</displayName>
-				<displayName count="other" draft="contributed">دينار أردني</displayName>
+				<displayName count="zero">دينار أردني</displayName>
+				<displayName count="one">دينار أردني</displayName>
+				<displayName count="two">دينار أردني</displayName>
+				<displayName count="few">دينارات أردنية</displayName>
+				<displayName count="many">دينارًا أردنيًا</displayName>
+				<displayName count="other">دينار أردني</displayName>
 				<symbol>د.أ.‏</symbol>
 			</currency>
 			<currency type="JPY">
 				<displayName>ين ياباني</displayName>
-				<displayName count="zero" draft="contributed">ين ياباني</displayName>
-				<displayName count="one" draft="contributed">ين ياباني</displayName>
-				<displayName count="two" draft="contributed">ين ياباني</displayName>
-				<displayName count="few" draft="contributed">ين ياباني</displayName>
-				<displayName count="many" draft="contributed">ين ياباني</displayName>
-				<displayName count="other" draft="contributed">ين ياباني</displayName>
+				<displayName count="zero">ين ياباني</displayName>
+				<displayName count="one">ين ياباني</displayName>
+				<displayName count="two">ين ياباني</displayName>
+				<displayName count="few">ين ياباني</displayName>
+				<displayName count="many">ين ياباني</displayName>
+				<displayName count="other">ين ياباني</displayName>
 				<symbol draft="contributed">JP¥</symbol>
 				<symbol alt="narrow" draft="contributed">JP¥</symbol>
 			</currency>
 			<currency type="KES">
 				<displayName>شلن كينيي</displayName>
-				<displayName count="zero" draft="contributed">شلن كينيي</displayName>
-				<displayName count="one" draft="contributed">شلن كينيي</displayName>
-				<displayName count="two" draft="contributed">شلن كينيي</displayName>
-				<displayName count="few" draft="contributed">شلن كينيي</displayName>
-				<displayName count="many" draft="contributed">شلن كينيي</displayName>
-				<displayName count="other" draft="contributed">شلن كينيي</displayName>
+				<displayName count="zero">شلن كينيي</displayName>
+				<displayName count="one">شلن كينيي</displayName>
+				<displayName count="two">شلن كينيي</displayName>
+				<displayName count="few">شلن كينيي</displayName>
+				<displayName count="many">شلن كينيي</displayName>
+				<displayName count="other">شلن كينيي</displayName>
 				<symbol draft="contributed">KES</symbol>
 			</currency>
 			<currency type="KGS">
 				<displayName>سوم قيرغستاني</displayName>
-				<displayName count="zero" draft="contributed">سوم قيرغستاني</displayName>
-				<displayName count="one" draft="contributed">سوم قيرغستاني</displayName>
-				<displayName count="two" draft="contributed">سوم قيرغستاني</displayName>
-				<displayName count="few" draft="contributed">سوم قيرغستاني</displayName>
-				<displayName count="many" draft="contributed">سوم قيرغستاني</displayName>
-				<displayName count="other" draft="contributed">سوم قيرغستاني</displayName>
+				<displayName count="zero">سوم قيرغستاني</displayName>
+				<displayName count="one">سوم قيرغستاني</displayName>
+				<displayName count="two">سوم قيرغستاني</displayName>
+				<displayName count="few">سوم قيرغستاني</displayName>
+				<displayName count="many">سوم قيرغستاني</displayName>
+				<displayName count="other">سوم قيرغستاني</displayName>
 				<symbol draft="contributed">KGS</symbol>
 			</currency>
 			<currency type="KHR">
 				<displayName>رييال كمبودي</displayName>
-				<displayName count="zero" draft="contributed">رييال كمبودي</displayName>
-				<displayName count="one" draft="contributed">رييال كمبودي</displayName>
-				<displayName count="two" draft="contributed">رييال كمبودي</displayName>
-				<displayName count="few" draft="contributed">رييال كمبودي</displayName>
-				<displayName count="many" draft="contributed">رييال كمبودي</displayName>
-				<displayName count="other" draft="contributed">رييال كمبودي</displayName>
+				<displayName count="zero">رييال كمبودي</displayName>
+				<displayName count="one">رييال كمبودي</displayName>
+				<displayName count="two">رييال كمبودي</displayName>
+				<displayName count="few">رييال كمبودي</displayName>
+				<displayName count="many">رييال كمبودي</displayName>
+				<displayName count="other">رييال كمبودي</displayName>
 				<symbol draft="contributed">KHR</symbol>
 				<symbol alt="narrow" draft="contributed">៛</symbol>
 			</currency>
 			<currency type="KMF">
 				<displayName>فرنك جزر القمر</displayName>
-				<displayName count="zero" draft="contributed">فرنك جزر القمر</displayName>
-				<displayName count="one" draft="contributed">فرنك جزر القمر</displayName>
-				<displayName count="two" draft="contributed">فرنك جزر القمر</displayName>
-				<displayName count="few" draft="contributed">فرنك جزر القمر</displayName>
-				<displayName count="many" draft="contributed">فرنك جزر القمر</displayName>
-				<displayName count="other" draft="contributed">فرنك جزر القمر</displayName>
+				<displayName count="zero">فرنك جزر القمر</displayName>
+				<displayName count="one">فرنك جزر القمر</displayName>
+				<displayName count="two">فرنك جزر القمر</displayName>
+				<displayName count="few">فرنك جزر القمر</displayName>
+				<displayName count="many">فرنك جزر القمر</displayName>
+				<displayName count="other">فرنك جزر القمر</displayName>
 				<symbol>ف.ج.ق.‏</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>وون كوريا الشمالية</displayName>
-				<displayName count="zero" draft="contributed">وون كوريا الشمالية</displayName>
-				<displayName count="one" draft="contributed">وون كوريا الشمالية</displayName>
-				<displayName count="two" draft="contributed">وون كوريا الشمالية</displayName>
-				<displayName count="few" draft="contributed">وون كوريا الشمالية</displayName>
-				<displayName count="many" draft="contributed">وون كوريا الشمالية</displayName>
-				<displayName count="other" draft="contributed">وون كوريا الشمالية</displayName>
+				<displayName count="zero">وون كوريا الشمالية</displayName>
+				<displayName count="one">وون كوريا الشمالية</displayName>
+				<displayName count="two">وون كوريا الشمالية</displayName>
+				<displayName count="few">وون كوريا الشمالية</displayName>
+				<displayName count="many">وون كوريا الشمالية</displayName>
+				<displayName count="other">وون كوريا الشمالية</displayName>
 				<symbol draft="contributed">KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>وون كوريا الجنوبية</displayName>
-				<displayName count="zero" draft="contributed">وون كوريا الجنوبية</displayName>
-				<displayName count="one" draft="contributed">وون كوريا الجنوبية</displayName>
-				<displayName count="two" draft="contributed">وون كوريا الجنوبية</displayName>
-				<displayName count="few" draft="contributed">وون كوريا الجنوبية</displayName>
-				<displayName count="many" draft="contributed">وون كوريا الجنوبية</displayName>
-				<displayName count="other" draft="contributed">وون كوريا الجنوبية</displayName>
+				<displayName count="zero">وون كوريا الجنوبية</displayName>
+				<displayName count="one">وون كوريا الجنوبية</displayName>
+				<displayName count="two">وون كوريا الجنوبية</displayName>
+				<displayName count="few">وون كوريا الجنوبية</displayName>
+				<displayName count="many">وون كوريا الجنوبية</displayName>
+				<displayName count="other">وون كوريا الجنوبية</displayName>
 				<symbol draft="contributed">₩</symbol>
 				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KWD">
 				<displayName>دينار كويتي</displayName>
-				<displayName count="zero" draft="contributed">دينار كويتي</displayName>
-				<displayName count="one" draft="contributed">دينار كويتي</displayName>
-				<displayName count="two" draft="contributed">دينار كويتي</displayName>
-				<displayName count="few" draft="contributed">دينار كويتي</displayName>
-				<displayName count="many" draft="contributed">دينار كويتي</displayName>
-				<displayName count="other" draft="contributed">دينار كويتي</displayName>
+				<displayName count="zero">دينار كويتي</displayName>
+				<displayName count="one">دينار كويتي</displayName>
+				<displayName count="two">دينار كويتي</displayName>
+				<displayName count="few">دينارات كويتية</displayName>
+				<displayName count="many">دينارًا كويتيًا</displayName>
+				<displayName count="other">دينار كويتي</displayName>
 				<symbol>د.ك.‏</symbol>
 			</currency>
 			<currency type="KYD">
 				<displayName>دولار جزر كيمن</displayName>
-				<displayName count="zero" draft="contributed">دولار جزر كيمن</displayName>
-				<displayName count="one" draft="contributed">دولار جزر كيمن</displayName>
-				<displayName count="two" draft="contributed">دولار جزر كيمن</displayName>
-				<displayName count="few" draft="contributed">دولار جزر كيمن</displayName>
-				<displayName count="many" draft="contributed">دولار جزر كيمن</displayName>
-				<displayName count="other" draft="contributed">دولار جزر كيمن</displayName>
+				<displayName count="zero">دولار جزر كيمن</displayName>
+				<displayName count="one">دولار جزر كيمن</displayName>
+				<displayName count="two">دولار جزر كيمن</displayName>
+				<displayName count="few">دولار جزر كيمن</displayName>
+				<displayName count="many">دولار جزر كيمن</displayName>
+				<displayName count="other">دولار جزر كيمن</displayName>
 				<symbol draft="contributed">KYD</symbol>
 				<symbol alt="narrow" draft="contributed">KY$</symbol>
 			</currency>
 			<currency type="KZT">
 				<displayName>تينغ كازاخستاني</displayName>
-				<displayName count="zero" draft="contributed">تينغ كازاخستاني</displayName>
-				<displayName count="one" draft="contributed">تينغ كازاخستاني</displayName>
-				<displayName count="two" draft="contributed">تينغ كازاخستاني</displayName>
-				<displayName count="few" draft="contributed">تينغ كازاخستاني</displayName>
-				<displayName count="many" draft="contributed">تينغ كازاخستاني</displayName>
-				<displayName count="other" draft="contributed">تينغ كازاخستاني</displayName>
+				<displayName count="zero">تينغ كازاخستاني</displayName>
+				<displayName count="one">تينغ كازاخستاني</displayName>
+				<displayName count="two">تينغ كازاخستاني</displayName>
+				<displayName count="few">تينغ كازاخستاني</displayName>
+				<displayName count="many">تينغ كازاخستاني</displayName>
+				<displayName count="other">تينغ كازاخستاني</displayName>
 				<symbol draft="contributed">KZT</symbol>
 				<symbol alt="narrow" draft="contributed">₸</symbol>
 			</currency>
 			<currency type="LAK">
 				<displayName>كيب لاوسي</displayName>
-				<displayName count="zero" draft="contributed">كيب لاوسي</displayName>
-				<displayName count="one" draft="contributed">كيب لاوسي</displayName>
-				<displayName count="two" draft="contributed">كيب لاوسي</displayName>
-				<displayName count="few" draft="contributed">كيب لاوسي</displayName>
-				<displayName count="many" draft="contributed">كيب لاوسي</displayName>
-				<displayName count="other" draft="contributed">كيب لاوسي</displayName>
+				<displayName count="zero">كيب لاوسي</displayName>
+				<displayName count="one">كيب لاوسي</displayName>
+				<displayName count="two">كيب لاوسي</displayName>
+				<displayName count="few">كيب لاوسي</displayName>
+				<displayName count="many">كيب لاوسي</displayName>
+				<displayName count="other">كيب لاوسي</displayName>
 				<symbol draft="contributed">LAK</symbol>
 				<symbol alt="narrow" draft="contributed">₭</symbol>
 			</currency>
 			<currency type="LBP">
-				<displayName>جنية لبناني</displayName>
-				<displayName count="zero" draft="contributed">جنية لبناني</displayName>
-				<displayName count="one" draft="contributed">جنية لبناني</displayName>
-				<displayName count="two" draft="contributed">جنية لبناني</displayName>
-				<displayName count="few" draft="contributed">جنية لبناني</displayName>
-				<displayName count="many" draft="contributed">جنية لبناني</displayName>
-				<displayName count="other" draft="contributed">جنية لبناني</displayName>
+				<displayName>جنيه لبناني</displayName>
+				<displayName count="zero">جنيه لبناني</displayName>
+				<displayName count="one">جنيه لبناني</displayName>
+				<displayName count="two">جنيه لبناني</displayName>
+				<displayName count="few">جنية لبناني</displayName>
+				<displayName count="many">جنيه لبناني</displayName>
+				<displayName count="other">جنيه لبناني</displayName>
 				<symbol>ل.ل.‏</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>روبية سريلانكية</displayName>
-				<displayName count="zero" draft="contributed">روبية سريلانكية</displayName>
-				<displayName count="one" draft="contributed">روبية سريلانكية</displayName>
-				<displayName count="two" draft="contributed">روبية سريلانكية</displayName>
-				<displayName count="few" draft="contributed">روبية سريلانكية</displayName>
-				<displayName count="many" draft="contributed">روبية سريلانكية</displayName>
-				<displayName count="other" draft="contributed">روبية سريلانكية</displayName>
+				<displayName count="zero">روبية سريلانكية</displayName>
+				<displayName count="one">روبية سريلانكية</displayName>
+				<displayName count="two">روبية سريلانكية</displayName>
+				<displayName count="few">روبية سريلانكية</displayName>
+				<displayName count="many">روبية سريلانكية</displayName>
+				<displayName count="other">روبية سريلانكية</displayName>
 				<symbol draft="contributed">LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>دولار ليبيري</displayName>
-				<displayName count="zero" draft="contributed">دولار ليبيري</displayName>
-				<displayName count="one" draft="contributed">دولار ليبيري</displayName>
-				<displayName count="two" draft="contributed">دولار ليبيري</displayName>
-				<displayName count="few" draft="contributed">دولار ليبيري</displayName>
-				<displayName count="many" draft="contributed">دولار ليبيري</displayName>
-				<displayName count="other" draft="contributed">دولار ليبيري</displayName>
+				<displayName count="zero">دولار ليبيري</displayName>
+				<displayName count="one">دولار ليبيري</displayName>
+				<displayName count="two">دولاران ليبيريان</displayName>
+				<displayName count="few">دولارات ليبيرية</displayName>
+				<displayName count="many">دولارًا ليبيريًا</displayName>
+				<displayName count="other">دولار ليبيري</displayName>
 				<symbol draft="contributed">LRD</symbol>
 				<symbol alt="narrow">$</symbol>
 			</currency>
@@ -6501,22 +6721,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="LYD">
 				<displayName>دينار ليبي</displayName>
-				<displayName count="zero" draft="contributed">دينار ليبي</displayName>
-				<displayName count="one" draft="contributed">دينار ليبي</displayName>
-				<displayName count="two" draft="contributed">دينار ليبي</displayName>
-				<displayName count="few" draft="contributed">دينار ليبي</displayName>
-				<displayName count="many" draft="contributed">دينار ليبي</displayName>
-				<displayName count="other" draft="contributed">دينار ليبي</displayName>
+				<displayName count="zero">دينار ليبي</displayName>
+				<displayName count="one">دينار ليبي</displayName>
+				<displayName count="two">ديناران ليبيان</displayName>
+				<displayName count="few">دينارات ليبية</displayName>
+				<displayName count="many">دينارًا ليبيًا</displayName>
+				<displayName count="other">دينار ليبي</displayName>
 				<symbol>د.ل.‏</symbol>
 			</currency>
 			<currency type="MAD">
 				<displayName>درهم مغربي</displayName>
-				<displayName count="zero" draft="contributed">درهم مغربي</displayName>
-				<displayName count="one" draft="contributed">درهم مغربي</displayName>
-				<displayName count="two" draft="contributed">درهم مغربي</displayName>
-				<displayName count="few" draft="contributed">درهم مغربي</displayName>
-				<displayName count="many" draft="contributed">درهم مغربي</displayName>
-				<displayName count="other" draft="contributed">درهم مغربي</displayName>
+				<displayName count="zero">درهم مغربي</displayName>
+				<displayName count="one">درهم مغربي</displayName>
+				<displayName count="two">درهمان مغربيان</displayName>
+				<displayName count="few">دراهم مغربية</displayName>
+				<displayName count="many">درهمًا مغربيًا</displayName>
+				<displayName count="other">درهم مغربي</displayName>
 				<symbol>د.م.‏</symbol>
 			</currency>
 			<currency type="MAF">
@@ -6534,25 +6754,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="MGA">
 				<displayName>أرياري مدغشقر</displayName>
-				<displayName count="zero" draft="contributed">أرياري مدغشقر</displayName>
-				<displayName count="one" draft="contributed">أرياري مدغشقر</displayName>
-				<displayName count="two" draft="contributed">أرياري مدغشقر</displayName>
-				<displayName count="few" draft="contributed">أرياري مدغشقر</displayName>
-				<displayName count="many" draft="contributed">أرياري مدغشقر</displayName>
-				<displayName count="other" draft="contributed">أرياري مدغشقر</displayName>
+				<displayName count="zero">أرياري مدغشقر</displayName>
+				<displayName count="one">أرياري مدغشقر</displayName>
+				<displayName count="two">أرياري مدغشقر</displayName>
+				<displayName count="few">أرياري مدغشقر</displayName>
+				<displayName count="many">أرياري مدغشقر</displayName>
+				<displayName count="other">أرياري مدغشقر</displayName>
 				<symbol draft="contributed">MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>فرنك مدغشقر</displayName>
 			</currency>
 			<currency type="MKD">
 				<displayName>دينار مقدوني</displayName>
-				<displayName count="zero" draft="contributed">دينار مقدوني</displayName>
-				<displayName count="one" draft="contributed">دينار مقدوني</displayName>
-				<displayName count="two" draft="contributed">دينار مقدوني</displayName>
-				<displayName count="few" draft="contributed">دينار مقدوني</displayName>
-				<displayName count="many" draft="contributed">دينار مقدوني</displayName>
-				<displayName count="other" draft="contributed">دينار مقدوني</displayName>
+				<displayName count="zero">دينار مقدوني</displayName>
+				<displayName count="one">دينار مقدوني</displayName>
+				<displayName count="two">ديناران مقدونيان</displayName>
+				<displayName count="few">دينارات مقدونية</displayName>
+				<displayName count="many">دينارًا مقدونيًا</displayName>
+				<displayName count="other">دينار مقدوني</displayName>
 				<symbol draft="contributed">MKD</symbol>
 			</currency>
 			<currency type="MLF">
@@ -6560,43 +6781,44 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="MMK">
 				<displayName>كيات ميانمار</displayName>
-				<displayName count="zero" draft="contributed">كيات ميانمار</displayName>
-				<displayName count="one" draft="contributed">كيات ميانمار</displayName>
-				<displayName count="two" draft="contributed">كيات ميانمار</displayName>
-				<displayName count="few" draft="contributed">كيات ميانمار</displayName>
-				<displayName count="many" draft="contributed">كيات ميانمار</displayName>
-				<displayName count="other" draft="contributed">كيات ميانمار</displayName>
+				<displayName count="zero">كيات ميانمار</displayName>
+				<displayName count="one">كيات ميانمار</displayName>
+				<displayName count="two">كيات ميانمار</displayName>
+				<displayName count="few">كيات ميانمار</displayName>
+				<displayName count="many">كيات ميانمار</displayName>
+				<displayName count="other">كيات ميانمار</displayName>
 				<symbol draft="contributed">MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>توغروغ منغولي</displayName>
-				<displayName count="zero" draft="contributed">توغروغ منغولي</displayName>
-				<displayName count="one" draft="contributed">توغروغ منغولي</displayName>
-				<displayName count="two" draft="contributed">توغروغ منغولي</displayName>
-				<displayName count="few" draft="contributed">توغروغ منغولي</displayName>
-				<displayName count="many" draft="contributed">توغروغ منغولي</displayName>
-				<displayName count="other" draft="contributed">توغروغ منغولي</displayName>
+				<displayName count="zero">توغروغ منغولي</displayName>
+				<displayName count="one">توغروغ منغولي</displayName>
+				<displayName count="two">توغروغ منغولي</displayName>
+				<displayName count="few">توغروغ منغولي</displayName>
+				<displayName count="many">توغروغ منغولي</displayName>
+				<displayName count="other">توغروغ منغولي</displayName>
 				<symbol draft="contributed">MNT</symbol>
 				<symbol alt="narrow" draft="contributed">₮</symbol>
 			</currency>
 			<currency type="MOP">
 				<displayName>باتاكا ماكاوي</displayName>
-				<displayName count="zero" draft="contributed">باتاكا ماكاوي</displayName>
-				<displayName count="one" draft="contributed">باتاكا ماكاوي</displayName>
-				<displayName count="two" draft="contributed">باتاكا ماكاوي</displayName>
-				<displayName count="few" draft="contributed">باتاكا ماكاوي</displayName>
-				<displayName count="many" draft="contributed">باتاكا ماكاوي</displayName>
-				<displayName count="other" draft="contributed">باتاكا ماكاوي</displayName>
+				<displayName count="zero">باتاكا ماكاوي</displayName>
+				<displayName count="one">باتاكا ماكاوي</displayName>
+				<displayName count="two">باتاكا ماكاوي</displayName>
+				<displayName count="few">باتاكا ماكاوي</displayName>
+				<displayName count="many">باتاكا ماكاوي</displayName>
+				<displayName count="other">باتاكا ماكاوي</displayName>
 				<symbol draft="contributed">MOP</symbol>
 			</currency>
 			<currency type="MRO">
 				<displayName>أوقية موريتانية</displayName>
-				<displayName count="zero" draft="contributed">أوقية موريتانية</displayName>
-				<displayName count="one" draft="contributed">أوقية موريتانية</displayName>
-				<displayName count="two" draft="contributed">أوقية موريتانية</displayName>
-				<displayName count="few" draft="contributed">أوقية موريتانية</displayName>
-				<displayName count="many" draft="contributed">أوقية موريتانية</displayName>
-				<displayName count="other" draft="contributed">أوقية موريتانية</displayName>
+				<displayName count="zero">أوقية موريتانية</displayName>
+				<displayName count="one">أوقية موريتانية</displayName>
+				<displayName count="two">أوقية موريتانية</displayName>
+				<displayName count="few">أوقية موريتانية</displayName>
+				<displayName count="many">أوقية موريتانية</displayName>
+				<displayName count="other">أوقية موريتانية</displayName>
 				<symbol>أ.م.‏</symbol>
 			</currency>
 			<currency type="MTL">
@@ -6619,32 +6841,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="MUR">
 				<displayName>روبية موريشيوسية</displayName>
-				<displayName count="zero" draft="contributed">روبي موريشي</displayName>
-				<displayName count="one" draft="contributed">روبي موريشي</displayName>
-				<displayName count="two" draft="contributed">روبي موريشي</displayName>
-				<displayName count="few" draft="contributed">روبي موريشي</displayName>
-				<displayName count="many" draft="contributed">روبي موريشي</displayName>
-				<displayName count="other" draft="contributed">روبي موريشي</displayName>
+				<displayName count="zero">روبية موريشيوسية</displayName>
+				<displayName count="one">روبية موريشيوسية</displayName>
+				<displayName count="two">روبية موريشيوسية</displayName>
+				<displayName count="few">روبية موريشيوسية</displayName>
+				<displayName count="many">روبية موريشيوسية</displayName>
+				<displayName count="other">روبية موريشيوسية</displayName>
 				<symbol draft="contributed">MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>روفيه جزر المالديف</displayName>
-				<displayName count="zero" draft="contributed">روفيه جزر المالديف</displayName>
-				<displayName count="one" draft="contributed">روفيه جزر المالديف</displayName>
-				<displayName count="two" draft="contributed">روفيه جزر المالديف</displayName>
-				<displayName count="few" draft="contributed">روفيه جزر المالديف</displayName>
-				<displayName count="many" draft="contributed">روفيه جزر المالديف</displayName>
-				<displayName count="other" draft="contributed">روفيه جزر المالديف</displayName>
+				<displayName count="zero">روفيه جزر المالديف</displayName>
+				<displayName count="one">روفيه جزر المالديف</displayName>
+				<displayName count="two">روفيه جزر المالديف</displayName>
+				<displayName count="few">روفيه جزر المالديف</displayName>
+				<displayName count="many">روفيه جزر المالديف</displayName>
+				<displayName count="other">روفيه جزر المالديف</displayName>
 				<symbol draft="contributed">MVR</symbol>
 			</currency>
 			<currency type="MWK">
 				<displayName>كواشا مالاوي</displayName>
-				<displayName count="zero" draft="contributed">كواشا مالاوي</displayName>
-				<displayName count="one" draft="contributed">كواشا مالاوي</displayName>
-				<displayName count="two" draft="contributed">كواشا مالاوي</displayName>
-				<displayName count="few" draft="contributed">كواشا مالاوي</displayName>
-				<displayName count="many" draft="contributed">كواشا مالاوي</displayName>
-				<displayName count="other" draft="contributed">كواشا مالاوي</displayName>
+				<displayName count="zero">كواشا مالاوي</displayName>
+				<displayName count="one">كواشا مالاوي</displayName>
+				<displayName count="two">كواشا مالاوي</displayName>
+				<displayName count="few">كواشا مالاوي</displayName>
+				<displayName count="many">كواشا مالاوي</displayName>
+				<displayName count="other">كواشا مالاوي</displayName>
 				<symbol draft="contributed">MWK</symbol>
 			</currency>
 			<currency type="MXN">
@@ -6669,13 +6892,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="MYR">
 				<displayName>رينغيت ماليزي</displayName>
-				<displayName count="zero" draft="contributed">رينغيت ماليزي</displayName>
-				<displayName count="one" draft="contributed">رينغيت ماليزي</displayName>
-				<displayName count="two" draft="contributed">رينغيت ماليزي</displayName>
-				<displayName count="few" draft="contributed">رينغيت ماليزي</displayName>
-				<displayName count="many" draft="contributed">رينغيت ماليزي</displayName>
-				<displayName count="other" draft="contributed">رينغيت ماليزي</displayName>
+				<displayName count="zero">رينغيت ماليزي</displayName>
+				<displayName count="one">رينغيت ماليزي</displayName>
+				<displayName count="two">رينغيت ماليزي</displayName>
+				<displayName count="few">رينغيت ماليزي</displayName>
+				<displayName count="many">رينغيت ماليزي</displayName>
+				<displayName count="other">رينغيت ماليزي</displayName>
 				<symbol draft="contributed">MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>اسكود موزمبيقي</displayName>
@@ -6692,23 +6916,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="NAD">
 				<displayName>دولار ناميبي</displayName>
-				<displayName count="zero" draft="contributed">دولار نامبيا</displayName>
-				<displayName count="one" draft="contributed">دولار نامبيا</displayName>
-				<displayName count="two" draft="contributed">دولار نامبيا</displayName>
-				<displayName count="few" draft="contributed">دولار نامبيا</displayName>
-				<displayName count="many" draft="contributed">دولار نامبيا</displayName>
-				<displayName count="other" draft="contributed">دولار نامبيا</displayName>
+				<displayName count="zero">دولار ناميبي</displayName>
+				<displayName count="one">دولار ناميبي</displayName>
+				<displayName count="two">دولار ناميبي</displayName>
+				<displayName count="few">دولار ناميبي</displayName>
+				<displayName count="many">دولار ناميبي</displayName>
+				<displayName count="other">دولار ناميبي</displayName>
 				<symbol draft="contributed">NAD</symbol>
 				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="NGN">
 				<displayName>نايرا نيجيري</displayName>
-				<displayName count="zero" draft="contributed">نايرا نيجيري</displayName>
-				<displayName count="one" draft="contributed">نايرا نيجيري</displayName>
-				<displayName count="two" draft="contributed">نايرا نيجيري</displayName>
-				<displayName count="few" draft="contributed">نايرا نيجيري</displayName>
-				<displayName count="many" draft="contributed">نايرا نيجيري</displayName>
-				<displayName count="other" draft="contributed">نايرا نيجيري</displayName>
+				<displayName count="zero">نايرا نيجيري</displayName>
+				<displayName count="one">نايرا نيجيري</displayName>
+				<displayName count="two">نايرا نيجيري</displayName>
+				<displayName count="few">نايرا نيجيري</displayName>
+				<displayName count="many">نايرا نيجيري</displayName>
+				<displayName count="other">نايرا نيجيري</displayName>
 				<symbol draft="contributed">NGN</symbol>
 				<symbol alt="narrow" draft="contributed">₦</symbol>
 			</currency>
@@ -6724,6 +6948,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">قرطبة نيكاراغوا</displayName>
 				<displayName count="other">قرطبة نيكاراغوا</displayName>
 				<symbol draft="contributed">NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>جلدر هولندي</displayName>
@@ -6736,43 +6961,45 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="NOK">
 				<displayName>كرونة نرويجية</displayName>
-				<displayName count="zero" draft="contributed">كرونة نرويجية</displayName>
-				<displayName count="one" draft="contributed">كرونة نرويجية</displayName>
-				<displayName count="two" draft="contributed">كرونة نرويجية</displayName>
-				<displayName count="few" draft="contributed">كرونة نرويجية</displayName>
-				<displayName count="many" draft="contributed">كرونة نرويجية</displayName>
-				<displayName count="other" draft="contributed">كرونة نرويجية</displayName>
+				<displayName count="zero">كرونة نرويجية</displayName>
+				<displayName count="one">كرونة نرويجية</displayName>
+				<displayName count="two">كرونة نرويجية</displayName>
+				<displayName count="few">كرونة نرويجية</displayName>
+				<displayName count="many">كرونة نرويجية</displayName>
+				<displayName count="other">كرونة نرويجية</displayName>
 				<symbol draft="contributed">NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>روبية نيبالي</displayName>
-				<displayName count="zero" draft="contributed">روبية نيبالي</displayName>
-				<displayName count="one" draft="contributed">روبية نيبالي</displayName>
-				<displayName count="two" draft="contributed">روبية نيبالي</displayName>
-				<displayName count="few" draft="contributed">روبية نيبالي</displayName>
-				<displayName count="many" draft="contributed">روبية نيبالي</displayName>
-				<displayName count="other" draft="contributed">روبية نيبالي</displayName>
+				<displayName count="zero">روبية نيبالي</displayName>
+				<displayName count="one">روبية نيبالي</displayName>
+				<displayName count="two">روبية نيبالي</displayName>
+				<displayName count="few">روبية نيبالي</displayName>
+				<displayName count="many">روبية نيبالي</displayName>
+				<displayName count="other">روبية نيبالي</displayName>
 				<symbol draft="contributed">NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>دولار نيوزيلندي</displayName>
-				<displayName count="zero" draft="contributed">دولار نيوزيلندي</displayName>
-				<displayName count="one" draft="contributed">دولار نيوزيلندي</displayName>
-				<displayName count="two" draft="contributed">دولار نيوزيلندي</displayName>
-				<displayName count="few" draft="contributed">دولار نيوزيلندي</displayName>
-				<displayName count="many" draft="contributed">دولار نيوزيلندي</displayName>
-				<displayName count="other" draft="contributed">دولار نيوزيلندي</displayName>
+				<displayName count="zero">دولار نيوزيلندي</displayName>
+				<displayName count="one">دولار نيوزيلندي</displayName>
+				<displayName count="two">دولار نيوزيلندي</displayName>
+				<displayName count="few">دولار نيوزيلندي</displayName>
+				<displayName count="many">دولار نيوزيلندي</displayName>
+				<displayName count="other">دولار نيوزيلندي</displayName>
 				<symbol draft="contributed">NZ$</symbol>
 				<symbol alt="narrow" draft="contributed">NZ$</symbol>
 			</currency>
 			<currency type="OMR">
 				<displayName>ريال عماني</displayName>
-				<displayName count="zero" draft="contributed">ريال عماني</displayName>
-				<displayName count="one" draft="contributed">ريال عماني</displayName>
-				<displayName count="two" draft="contributed">ريال عماني</displayName>
-				<displayName count="few" draft="contributed">ريال عماني</displayName>
-				<displayName count="many" draft="contributed">ريال عماني</displayName>
-				<displayName count="other" draft="contributed">ريال عماني</displayName>
+				<displayName count="zero">ريال عماني</displayName>
+				<displayName count="one">ريال عماني</displayName>
+				<displayName count="two">ريال عماني</displayName>
+				<displayName count="few">ريالات عمانية</displayName>
+				<displayName count="many">ريالاً عمانيًا</displayName>
+				<displayName count="other">ريال عماني</displayName>
 				<symbol>ر.ع.‏</symbol>
 			</currency>
 			<currency type="PAB">
@@ -6787,48 +7014,56 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="PEN">
 				<displayName>سول جديد البيرو</displayName>
+				<displayName count="zero">سول جديد البيرو</displayName>
+				<displayName count="one">سول جديد البيرو</displayName>
+				<displayName count="two">سول جديد البيرو</displayName>
+				<displayName count="few">سول جديد البيرو</displayName>
+				<displayName count="many">سول جديد البيرو</displayName>
+				<displayName count="other">سول جديد البيرو</displayName>
 				<symbol draft="contributed">PEN</symbol>
 			</currency>
 			<currency type="PGK">
 				<displayName>كينا بابوا غينيا الجديدة</displayName>
-				<displayName count="zero" draft="contributed">كينا بابوا غينيا الجديدة</displayName>
-				<displayName count="one" draft="contributed">كينا بابوا غينيا الجديدة</displayName>
-				<displayName count="two" draft="contributed">كينا بابوا غينيا الجديدة</displayName>
-				<displayName count="few" draft="contributed">كينا بابوا غينيا الجديدة</displayName>
-				<displayName count="many" draft="contributed">كينا بابوا غينيا الجديدة</displayName>
-				<displayName count="other" draft="contributed">كينا بابوا غينيا الجديدة</displayName>
+				<displayName count="zero">كينا بابوا غينيا الجديدة</displayName>
+				<displayName count="one">كينا بابوا غينيا الجديدة</displayName>
+				<displayName count="two">كينا بابوا غينيا الجديدة</displayName>
+				<displayName count="few">كينا بابوا غينيا الجديدة</displayName>
+				<displayName count="many">كينا بابوا غينيا الجديدة</displayName>
+				<displayName count="other">كينا بابوا غينيا الجديدة</displayName>
 				<symbol draft="contributed">PGK</symbol>
 			</currency>
 			<currency type="PHP">
 				<displayName>بيزو فلبيني</displayName>
-				<displayName count="zero" draft="contributed">بيزو فلبيني</displayName>
-				<displayName count="one" draft="contributed">بيزو فلبيني</displayName>
-				<displayName count="two" draft="contributed">بيزو فلبيني</displayName>
-				<displayName count="few" draft="contributed">بيزو فلبيني</displayName>
-				<displayName count="many" draft="contributed">بيزو فلبيني</displayName>
-				<displayName count="other" draft="contributed">بيزو فلبيني</displayName>
+				<displayName count="zero">بيزو فلبيني</displayName>
+				<displayName count="one">بيزو فلبيني</displayName>
+				<displayName count="two">بيزو فلبيني</displayName>
+				<displayName count="few">بيزو فلبيني</displayName>
+				<displayName count="many">بيزو فلبيني</displayName>
+				<displayName count="other">بيزو فلبيني</displayName>
 				<symbol draft="contributed">PHP</symbol>
 				<symbol alt="narrow" draft="contributed">₱</symbol>
 			</currency>
 			<currency type="PKR">
 				<displayName>روبية باكستاني</displayName>
-				<displayName count="zero" draft="contributed">روبية باكستاني</displayName>
-				<displayName count="one" draft="contributed">روبية باكستاني</displayName>
-				<displayName count="two" draft="contributed">روبية باكستاني</displayName>
-				<displayName count="few" draft="contributed">روبية باكستاني</displayName>
-				<displayName count="many" draft="contributed">روبية باكستاني</displayName>
-				<displayName count="other" draft="contributed">روبية باكستاني</displayName>
+				<displayName count="zero">روبية باكستاني</displayName>
+				<displayName count="one">روبية باكستاني</displayName>
+				<displayName count="two">روبية باكستاني</displayName>
+				<displayName count="few">روبية باكستاني</displayName>
+				<displayName count="many">روبية باكستاني</displayName>
+				<displayName count="other">روبية باكستاني</displayName>
 				<symbol draft="contributed">ر.ب.</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>زلوتي بولندي</displayName>
-				<displayName count="zero" draft="contributed">زلوتي بولندي</displayName>
-				<displayName count="one" draft="contributed">زلوتي بولندي</displayName>
-				<displayName count="two" draft="contributed">زلوتي بولندي</displayName>
-				<displayName count="few" draft="contributed">زلوتي بولندي</displayName>
-				<displayName count="many" draft="contributed">زلوتي بولندي</displayName>
-				<displayName count="other" draft="contributed">زلوتي بولندي</displayName>
+				<displayName count="zero">زلوتي بولندي</displayName>
+				<displayName count="one">زلوتي بولندي</displayName>
+				<displayName count="two">زلوتي بولندي</displayName>
+				<displayName count="few">زلوتي بولندي</displayName>
+				<displayName count="many">زلوتي بولندي</displayName>
+				<displayName count="other">زلوتي بولندي</displayName>
 				<symbol draft="contributed">PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>زلوتي بولندي - 1950-1995</displayName>
@@ -6844,23 +7079,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="PYG">
 				<displayName>جواراني باراجواي</displayName>
-				<displayName count="zero" draft="contributed">جواراني باراجواي</displayName>
-				<displayName count="one" draft="contributed">جواراني باراجواي</displayName>
-				<displayName count="two" draft="contributed">جواراني باراجواي</displayName>
-				<displayName count="few" draft="contributed">جواراني باراجواي</displayName>
-				<displayName count="many" draft="contributed">جواراني باراجواي</displayName>
-				<displayName count="other" draft="contributed">جواراني باراجواي</displayName>
+				<displayName count="zero">جواراني باراجواي</displayName>
+				<displayName count="one">جواراني باراجواي</displayName>
+				<displayName count="two">جواراني باراجواي</displayName>
+				<displayName count="few">جواراني باراجواي</displayName>
+				<displayName count="many">جواراني باراجواي</displayName>
+				<displayName count="other">جواراني باراجواي</displayName>
 				<symbol draft="contributed">PYG</symbol>
 				<symbol alt="narrow" draft="contributed">₲</symbol>
 			</currency>
 			<currency type="QAR">
 				<displayName>ريال قطري</displayName>
-				<displayName count="zero" draft="contributed">ريال قطري</displayName>
-				<displayName count="one" draft="contributed">ريال قطري</displayName>
-				<displayName count="two" draft="contributed">ريال قطري</displayName>
-				<displayName count="few" draft="contributed">ريال قطري</displayName>
-				<displayName count="many" draft="contributed">ريال قطري</displayName>
-				<displayName count="other" draft="contributed">ريال قطري</displayName>
+				<displayName count="zero">ريال قطري</displayName>
+				<displayName count="one">ريال قطري</displayName>
+				<displayName count="two">ريال قطري</displayName>
+				<displayName count="few">ريالات قطرية</displayName>
+				<displayName count="many">ريالاً قطريًا</displayName>
+				<displayName count="other">ريال قطري</displayName>
 				<symbol>ر.ق.‏</symbol>
 			</currency>
 			<currency type="RHD">
@@ -6893,60 +7128,68 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="RSD">
 				<displayName>دينار صربي</displayName>
+				<displayName count="zero">دينار صربي</displayName>
+				<displayName count="one">دينار صربي</displayName>
+				<displayName count="two">ديناران صربيان</displayName>
+				<displayName count="few">دينارات صربية</displayName>
+				<displayName count="many">دينارًا صربيًا</displayName>
+				<displayName count="other">دينار صربي</displayName>
 				<symbol draft="contributed">RSD</symbol>
 			</currency>
 			<currency type="RUB">
 				<displayName>روبل روسي</displayName>
-				<displayName count="zero" draft="contributed">روبل روسي</displayName>
-				<displayName count="one" draft="contributed">روبل روسي</displayName>
-				<displayName count="two" draft="contributed">روبل روسي</displayName>
-				<displayName count="few" draft="contributed">روبل روسي</displayName>
-				<displayName count="many" draft="contributed">روبل روسي</displayName>
-				<displayName count="other" draft="contributed">روبل روسي</displayName>
+				<displayName count="zero">روبل روسي</displayName>
+				<displayName count="one">روبل روسي</displayName>
+				<displayName count="two">روبل روسي</displayName>
+				<displayName count="few">روبل روسي</displayName>
+				<displayName count="many">روبل روسي</displayName>
+				<displayName count="other">روبل روسي</displayName>
 				<symbol draft="contributed">RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>روبل روسي - 1991-1998</displayName>
 			</currency>
 			<currency type="RWF">
 				<displayName>فرنك رواندي</displayName>
-				<displayName count="zero" draft="contributed">فرنك رواندي</displayName>
-				<displayName count="one" draft="contributed">فرنك رواندي</displayName>
-				<displayName count="two" draft="contributed">فرنك رواندي</displayName>
-				<displayName count="few" draft="contributed">فرنك رواندي</displayName>
-				<displayName count="many" draft="contributed">فرنك رواندي</displayName>
-				<displayName count="other" draft="contributed">فرنك رواندي</displayName>
+				<displayName count="zero">فرنك رواندي</displayName>
+				<displayName count="one">فرنك رواندي</displayName>
+				<displayName count="two">فرنك رواندي</displayName>
+				<displayName count="few">فرنك رواندي</displayName>
+				<displayName count="many">فرنك رواندي</displayName>
+				<displayName count="other">فرنك رواندي</displayName>
 				<symbol draft="contributed">RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>ريال سعودي</displayName>
-				<displayName count="zero" draft="contributed">ريال سعودي</displayName>
-				<displayName count="one" draft="contributed">ريال سعودي</displayName>
-				<displayName count="two" draft="contributed">ريال سعودي</displayName>
-				<displayName count="few" draft="contributed">ريال سعودي</displayName>
-				<displayName count="many" draft="contributed">ريال سعودي</displayName>
-				<displayName count="other" draft="contributed">ريال سعودي</displayName>
+				<displayName count="zero">ريال سعودي</displayName>
+				<displayName count="one">ريال سعودي</displayName>
+				<displayName count="two">ريال سعودي</displayName>
+				<displayName count="few">ريالات سعودية</displayName>
+				<displayName count="many">ريالاً سعوديًا</displayName>
+				<displayName count="other">ريال سعودي</displayName>
 				<symbol>ر.س.‏</symbol>
 			</currency>
 			<currency type="SBD">
 				<displayName>دولار جزر سليمان</displayName>
-				<displayName count="zero" draft="contributed">دولار جزر سليمان</displayName>
-				<displayName count="one" draft="contributed">دولار جزر سليمان</displayName>
-				<displayName count="two" draft="contributed">دولار جزر سليمان</displayName>
-				<displayName count="few" draft="contributed">دولار جزر سليمان</displayName>
-				<displayName count="many" draft="contributed">دولار جزر سليمان</displayName>
-				<displayName count="other" draft="contributed">دولار جزر سليمان</displayName>
+				<displayName count="zero">دولار جزر سليمان</displayName>
+				<displayName count="one">دولار جزر سليمان</displayName>
+				<displayName count="two">دولار جزر سليمان</displayName>
+				<displayName count="few">دولار جزر سليمان</displayName>
+				<displayName count="many">دولار جزر سليمان</displayName>
+				<displayName count="other">دولار جزر سليمان</displayName>
 				<symbol draft="contributed">SBD</symbol>
 				<symbol alt="narrow" draft="contributed">SB$</symbol>
 			</currency>
 			<currency type="SCR">
 				<displayName>روبية سيشيلية</displayName>
-				<displayName count="zero" draft="contributed">روبية سيشيلية</displayName>
-				<displayName count="one" draft="contributed">روبية سيشيلية</displayName>
-				<displayName count="two" draft="contributed">روبية سيشيلية</displayName>
-				<displayName count="few" draft="contributed">روبية سيشيلية</displayName>
-				<displayName count="many" draft="contributed">روبية سيشيلية</displayName>
-				<displayName count="other" draft="contributed">روبية سيشيلية</displayName>
+				<displayName count="zero">روبية سيشيلية</displayName>
+				<displayName count="one">روبية سيشيلية</displayName>
+				<displayName count="two">روبية سيشيلية</displayName>
+				<displayName count="few">روبية سيشيلية</displayName>
+				<displayName count="many">روبية سيشيلية</displayName>
+				<displayName count="other">روبية سيشيلية</displayName>
 				<symbol draft="contributed">SCR</symbol>
 			</currency>
 			<currency type="SDD">
@@ -6964,8 +7207,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="zero">جنيه سوداني</displayName>
 				<displayName count="one">جنيه سوداني</displayName>
 				<displayName count="two">جنيه سوداني</displayName>
-				<displayName count="few">جنيه سوداني</displayName>
-				<displayName count="many">جنيه سوداني</displayName>
+				<displayName count="few">جنيهات سودانية</displayName>
+				<displayName count="many">جنيهًا سودانيًا</displayName>
 				<displayName count="other">جنيه سوداني</displayName>
 				<symbol draft="contributed">ج.س.</symbol>
 			</currency>
@@ -6980,34 +7223,36 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="SEK">
 				<displayName>كرونة سويدية</displayName>
-				<displayName count="zero" draft="contributed">كرونة سويدية</displayName>
-				<displayName count="one" draft="contributed">كرونة سويدية</displayName>
-				<displayName count="two" draft="contributed">كرونة سويدية</displayName>
-				<displayName count="few" draft="contributed">كرونة سويدية</displayName>
-				<displayName count="many" draft="contributed">كرونة سويدية</displayName>
-				<displayName count="other" draft="contributed">كرونة سويدية</displayName>
+				<displayName count="zero">كرونة سويدية</displayName>
+				<displayName count="one">كرونة سويدية</displayName>
+				<displayName count="two">كرونة سويدية</displayName>
+				<displayName count="few">كرونة سويدية</displayName>
+				<displayName count="many">كرونة سويدية</displayName>
+				<displayName count="other">كرونة سويدية</displayName>
 				<symbol draft="contributed">SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>دولار سنغافوري</displayName>
-				<displayName count="zero" draft="contributed">دولار سنغافوري</displayName>
-				<displayName count="one" draft="contributed">دولار سنغافوري</displayName>
-				<displayName count="two" draft="contributed">دولار سنغافوري</displayName>
-				<displayName count="few" draft="contributed">دولار سنغافوري</displayName>
-				<displayName count="many" draft="contributed">دولار سنغافوري</displayName>
-				<displayName count="other" draft="contributed">دولار سنغافوري</displayName>
+				<displayName count="zero">دولار سنغافوري</displayName>
+				<displayName count="one">دولار سنغافوري</displayName>
+				<displayName count="two">دولار سنغافوري</displayName>
+				<displayName count="few">دولار سنغافوري</displayName>
+				<displayName count="many">دولار سنغافوري</displayName>
+				<displayName count="other">دولار سنغافوري</displayName>
 				<symbol draft="contributed">SGD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SHP">
 				<displayName>جنيه سانت هيلين</displayName>
-				<displayName count="zero" draft="contributed">جنيه سانت هيلين</displayName>
-				<displayName count="one" draft="contributed">جنيه سانت هيلين</displayName>
-				<displayName count="two" draft="contributed">جنيه سانت هيلين</displayName>
-				<displayName count="few" draft="contributed">جنيه سانت هيلين</displayName>
-				<displayName count="many" draft="contributed">جنيه سانت هيلين</displayName>
-				<displayName count="other" draft="contributed">جنيه سانت هيلين</displayName>
+				<displayName count="zero">جنيه سانت هيلين</displayName>
+				<displayName count="one">جنيه سانت هيلين</displayName>
+				<displayName count="two">جنيه سانت هيلين</displayName>
+				<displayName count="few">جنيه سانت هيلين</displayName>
+				<displayName count="many">جنيه سانت هيلين</displayName>
+				<displayName count="other">جنيه سانت هيلين</displayName>
 				<symbol draft="contributed">SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>تولار سلوفيني</displayName>
@@ -7023,32 +7268,32 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="SLL">
 				<displayName>ليون سيراليوني</displayName>
-				<displayName count="zero" draft="contributed">ليون سيراليوني</displayName>
-				<displayName count="one" draft="contributed">ليون سيراليوني</displayName>
-				<displayName count="two" draft="contributed">ليون سيراليوني</displayName>
-				<displayName count="few" draft="contributed">ليون سيراليوني</displayName>
-				<displayName count="many" draft="contributed">ليون سيراليوني</displayName>
-				<displayName count="other" draft="contributed">ليون سيراليوني</displayName>
+				<displayName count="zero">ليون سيراليوني</displayName>
+				<displayName count="one">ليون سيراليوني</displayName>
+				<displayName count="two">ليون سيراليوني</displayName>
+				<displayName count="few">ليون سيراليوني</displayName>
+				<displayName count="many">ليون سيراليوني</displayName>
+				<displayName count="other">ليون سيراليوني</displayName>
 				<symbol draft="contributed">SLL</symbol>
 			</currency>
 			<currency type="SOS">
 				<displayName>شلن صومالي</displayName>
-				<displayName count="zero" draft="contributed">شلن صومالي</displayName>
-				<displayName count="one" draft="contributed">شلن صومالي</displayName>
-				<displayName count="two" draft="contributed">شلن صومالي</displayName>
-				<displayName count="few" draft="contributed">شلن صومالي</displayName>
-				<displayName count="many" draft="contributed">شلن صومالي</displayName>
-				<displayName count="other" draft="contributed">شلن صومالي</displayName>
+				<displayName count="zero">شلن صومالي</displayName>
+				<displayName count="one">شلن صومالي</displayName>
+				<displayName count="two">شلن صومالي</displayName>
+				<displayName count="few">شلن صومالي</displayName>
+				<displayName count="many">شلن صومالي</displayName>
+				<displayName count="other">شلن صومالي</displayName>
 				<symbol draft="contributed">SOS</symbol>
 			</currency>
 			<currency type="SRD">
 				<displayName>دولار سورينامي</displayName>
-				<displayName count="zero" draft="contributed">دولار سورينامي</displayName>
-				<displayName count="one" draft="contributed">دولار سورينامي</displayName>
-				<displayName count="two" draft="contributed">دولار سورينامي</displayName>
-				<displayName count="few" draft="contributed">دولار سورينامي</displayName>
-				<displayName count="many" draft="contributed">دولار سورينامي</displayName>
-				<displayName count="other" draft="contributed">دولار سورينامي</displayName>
+				<displayName count="zero">دولار سورينامي</displayName>
+				<displayName count="one">دولار سورينامي</displayName>
+				<displayName count="two">دولار سورينامي</displayName>
+				<displayName count="few">دولار سورينامي</displayName>
+				<displayName count="many">دولار سورينامي</displayName>
+				<displayName count="other">دولار سورينامي</displayName>
 				<symbol draft="contributed">SRD</symbol>
 				<symbol alt="narrow" draft="contributed">SR$</symbol>
 			</currency>
@@ -7065,22 +7310,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>جنيه جنوب السودان</displayName>
 				<displayName count="zero">جنيه جنوب السودان</displayName>
 				<displayName count="one">جنيه جنوب السودان</displayName>
-				<displayName count="two">جنيه جنوب السودان</displayName>
-				<displayName count="few">جنيه جنوب السودان</displayName>
-				<displayName count="many">جنيه جنوب السودان</displayName>
+				<displayName count="two">جنيهان جنوب السودان</displayName>
+				<displayName count="few">جنيهات جنوب السودان</displayName>
+				<displayName count="many">جنيهًا جنوب السودان</displayName>
 				<displayName count="other">جنيه جنوب السودان</displayName>
 				<symbol draft="contributed">ج.ج.س.</symbol>
 				<symbol alt="narrow" draft="contributed">ج.ج.س.</symbol>
 			</currency>
 			<currency type="STD">
 				<displayName>دوبرا ساو تومي وبرينسيبي</displayName>
-				<displayName count="zero" draft="contributed">دوبرا ساو تومي وبرينسيبي</displayName>
-				<displayName count="one" draft="contributed">دوبرا ساو تومي وبرينسيبي</displayName>
-				<displayName count="two" draft="contributed">دوبرا ساو تومي وبرينسيبي</displayName>
-				<displayName count="few" draft="contributed">دوبرا ساو تومي وبرينسيبي</displayName>
-				<displayName count="many" draft="contributed">دوبرا ساو تومي وبرينسيبي</displayName>
-				<displayName count="other" draft="contributed">دوبرا ساو تومي وبرينسيبي</displayName>
+				<displayName count="zero">دوبرا ساو تومي وبرينسيبي</displayName>
+				<displayName count="one">دوبرا ساو تومي وبرينسيبي</displayName>
+				<displayName count="two">دوبرا ساو تومي وبرينسيبي</displayName>
+				<displayName count="few">دوبرا ساو تومي وبرينسيبي</displayName>
+				<displayName count="many">دوبرا ساو تومي وبرينسيبي</displayName>
+				<displayName count="other">دوبرا ساو تومي وبرينسيبي</displayName>
 				<symbol draft="contributed">STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>روبل سوفيتي</displayName>
@@ -7096,45 +7342,47 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="SYP">
 				<displayName>ليرة سورية</displayName>
-				<displayName count="zero" draft="contributed">ليرة سورية</displayName>
-				<displayName count="one" draft="contributed">ليرة سورية</displayName>
-				<displayName count="two" draft="contributed">ليرة سورية</displayName>
-				<displayName count="few" draft="contributed">ليرة سورية</displayName>
-				<displayName count="many" draft="contributed">ليرة سورية</displayName>
-				<displayName count="other" draft="contributed">ليرة سورية</displayName>
+				<displayName count="zero">ليرة سورية</displayName>
+				<displayName count="one">ليرة سورية</displayName>
+				<displayName count="two">ليرة سورية</displayName>
+				<displayName count="few">ليرات سورية</displayName>
+				<displayName count="many">ليرة سورية</displayName>
+				<displayName count="other">ليرة سورية</displayName>
 				<symbol>ل.س.‏</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>ليلانجيني سوازيلندي</displayName>
-				<displayName count="zero" draft="contributed">ليلانجيني سوازيلندي</displayName>
-				<displayName count="one" draft="contributed">ليلانجيني سوازيلندي</displayName>
-				<displayName count="two" draft="contributed">ليلانجيني سوازيلندي</displayName>
-				<displayName count="few" draft="contributed">ليلانجيني سوازيلندي</displayName>
-				<displayName count="many" draft="contributed">ليلانجيني سوازيلندي</displayName>
-				<displayName count="other" draft="contributed">ليلانجيني سوازيلندي</displayName>
+				<displayName count="zero">ليلانجيني سوازيلندي</displayName>
+				<displayName count="one">ليلانجيني سوازيلندي</displayName>
+				<displayName count="two">ليلانجيني سوازيلندي</displayName>
+				<displayName count="few">ليلانجيني سوازيلندي</displayName>
+				<displayName count="many">ليلانجيني سوازيلندي</displayName>
+				<displayName count="other">ليلانجيني سوازيلندي</displayName>
 				<symbol draft="contributed">SZL</symbol>
 			</currency>
 			<currency type="THB">
 				<displayName>باخت تايلاندي</displayName>
-				<displayName count="zero" draft="contributed">باخت تايلاندي</displayName>
-				<displayName count="one" draft="contributed">باخت تايلاندي</displayName>
-				<displayName count="two" draft="contributed">باخت تايلاندي</displayName>
-				<displayName count="few" draft="contributed">باخت تايلاندي</displayName>
-				<displayName count="many" draft="contributed">باخت تايلاندي</displayName>
-				<displayName count="other" draft="contributed">باخت تايلاندي</displayName>
+				<displayName count="zero">باخت تايلاندي</displayName>
+				<displayName count="one">باخت تايلاندي</displayName>
+				<displayName count="two">باخت تايلاندي</displayName>
+				<displayName count="few">باخت تايلاندي</displayName>
+				<displayName count="many">باخت تايلاندي</displayName>
+				<displayName count="other">باخت تايلاندي</displayName>
 				<symbol draft="contributed">฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>روبل طاجيكستاني</displayName>
 			</currency>
 			<currency type="TJS">
 				<displayName>سوموني طاجيكستاني</displayName>
-				<displayName count="zero" draft="contributed">سوموني طاجيكستاني</displayName>
-				<displayName count="one" draft="contributed">سوموني طاجيكستاني</displayName>
-				<displayName count="two" draft="contributed">سوموني طاجيكستاني</displayName>
-				<displayName count="few" draft="contributed">سوموني طاجيكستاني</displayName>
-				<displayName count="many" draft="contributed">سوموني طاجيكستاني</displayName>
-				<displayName count="other" draft="contributed">سوموني طاجيكستاني</displayName>
+				<displayName count="zero">سوموني طاجيكستاني</displayName>
+				<displayName count="one">سوموني طاجيكستاني</displayName>
+				<displayName count="two">سوموني طاجيكستاني</displayName>
+				<displayName count="few">سوموني طاجيكستاني</displayName>
+				<displayName count="many">سوموني طاجيكستاني</displayName>
+				<displayName count="other">سوموني طاجيكستاني</displayName>
 				<symbol draft="contributed">TJS</symbol>
 			</currency>
 			<currency type="TMM">
@@ -7148,21 +7396,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="TMT">
 				<displayName>مانات تركمانستان</displayName>
+				<displayName count="zero">مانات تركمانستان</displayName>
+				<displayName count="one">مانات تركمانستان</displayName>
+				<displayName count="two">مانات تركمانستان</displayName>
+				<displayName count="few">مانات تركمانستان</displayName>
+				<displayName count="many">مانات تركمانستان</displayName>
+				<displayName count="other">مانات تركمانستان</displayName>
 				<symbol draft="contributed">TMT</symbol>
 			</currency>
 			<currency type="TND">
-				<displayName>دينارتونسي</displayName>
-				<displayName count="zero" draft="contributed">دينارتونسي</displayName>
-				<displayName count="one" draft="contributed">دينارتونسي</displayName>
-				<displayName count="two" draft="contributed">دينارتونسي</displayName>
-				<displayName count="few" draft="contributed">دينارتونسي</displayName>
-				<displayName count="many" draft="contributed">دينارتونسي</displayName>
-				<displayName count="other" draft="contributed">دينارتونسي</displayName>
+				<displayName>دينار تونسي</displayName>
+				<displayName count="zero">دينار تونسي</displayName>
+				<displayName count="one">دينار تونسي</displayName>
+				<displayName count="two">ديناران تونسيان</displayName>
+				<displayName count="few">دينارات تونسية</displayName>
+				<displayName count="many">دينارًا تونسيًا</displayName>
+				<displayName count="other">دينار تونسي</displayName>
 				<symbol>د.ت.‏</symbol>
 			</currency>
 			<currency type="TOP">
 				<displayName>بانغا تونغا</displayName>
+				<displayName count="zero">بانغا تونغا</displayName>
+				<displayName count="one">بانغا تونغا</displayName>
+				<displayName count="two">بانغا تونغا</displayName>
+				<displayName count="few">بانغا تونغا</displayName>
+				<displayName count="many">بانغا تونغا</displayName>
+				<displayName count="other">بانغا تونغا</displayName>
 				<symbol draft="contributed">TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>اسكود تيموري</displayName>
@@ -7178,55 +7439,56 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="TRY">
 				<displayName>ليرة تركية</displayName>
-				<displayName count="zero" draft="contributed">ليرة تركية</displayName>
-				<displayName count="one" draft="contributed">ليرة تركية</displayName>
-				<displayName count="two" draft="contributed">ليرة تركية</displayName>
-				<displayName count="few" draft="contributed">ليرة تركية</displayName>
-				<displayName count="many" draft="contributed">ليرة تركية</displayName>
-				<displayName count="other" draft="contributed">ليرة تركية</displayName>
+				<displayName count="zero">ليرة تركية</displayName>
+				<displayName count="one">ليرة تركية</displayName>
+				<displayName count="two">ليرة تركية</displayName>
+				<displayName count="few">ليرات تركية</displayName>
+				<displayName count="many">ليرة تركية</displayName>
+				<displayName count="other">ليرة تركية</displayName>
 				<symbol draft="contributed">ل.ت.</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>دولار ترينداد وتوباجو</displayName>
-				<displayName count="zero" draft="contributed">دولار ترينداد وتوباجو</displayName>
-				<displayName count="one" draft="contributed">دولار ترينداد وتوباجو</displayName>
-				<displayName count="two" draft="contributed">دولار ترينداد وتوباجو</displayName>
-				<displayName count="few" draft="contributed">دولار ترينداد وتوباجو</displayName>
-				<displayName count="many" draft="contributed">دولار ترينداد وتوباجو</displayName>
-				<displayName count="other" draft="contributed">دولار ترينداد وتوباجو</displayName>
+				<displayName count="zero">دولار ترينداد وتوباجو</displayName>
+				<displayName count="one">دولار ترينداد وتوباجو</displayName>
+				<displayName count="two">دولار ترينداد وتوباجو</displayName>
+				<displayName count="few">دولار ترينداد وتوباجو</displayName>
+				<displayName count="many">دولار ترينداد وتوباجو</displayName>
+				<displayName count="other">دولار ترينداد وتوباجو</displayName>
 				<symbol draft="contributed">TTD</symbol>
 				<symbol alt="narrow" draft="contributed">TT$</symbol>
 			</currency>
 			<currency type="TWD">
 				<displayName>دولار تايواني</displayName>
-				<displayName count="zero" draft="contributed">دولار تايواني</displayName>
-				<displayName count="one" draft="contributed">دولار تايواني</displayName>
-				<displayName count="two" draft="contributed">دولار تايواني</displayName>
-				<displayName count="few" draft="contributed">دولار تايواني</displayName>
-				<displayName count="many" draft="contributed">دولار تايواني</displayName>
-				<displayName count="other" draft="contributed">دولار تايواني</displayName>
+				<displayName count="zero">دولار تايواني</displayName>
+				<displayName count="one">دولار تايواني</displayName>
+				<displayName count="two">دولار تايواني</displayName>
+				<displayName count="few">دولار تايواني</displayName>
+				<displayName count="many">دولار تايواني</displayName>
+				<displayName count="other">دولار تايواني</displayName>
 				<symbol draft="contributed">NT$</symbol>
 				<symbol alt="narrow" draft="contributed">NT$</symbol>
 			</currency>
 			<currency type="TZS">
 				<displayName>شلن تنزاني</displayName>
-				<displayName count="zero" draft="contributed">شلن تنزاني</displayName>
-				<displayName count="one" draft="contributed">شلن تنزاني</displayName>
-				<displayName count="two" draft="contributed">شلن تنزاني</displayName>
-				<displayName count="few" draft="contributed">شلن تنزاني</displayName>
-				<displayName count="many" draft="contributed">شلن تنزاني</displayName>
-				<displayName count="other" draft="contributed">شلن تنزاني</displayName>
+				<displayName count="zero">شلن تنزاني</displayName>
+				<displayName count="one">شلن تنزاني</displayName>
+				<displayName count="two">شلن تنزاني</displayName>
+				<displayName count="few">شلن تنزاني</displayName>
+				<displayName count="many">شلن تنزاني</displayName>
+				<displayName count="other">شلن تنزاني</displayName>
 				<symbol draft="contributed">TZS</symbol>
 			</currency>
 			<currency type="UAH">
 				<displayName>هريفنيا أوكراني</displayName>
-				<displayName count="zero" draft="contributed">هريفنيا أوكراني</displayName>
-				<displayName count="one" draft="contributed">هريفنيا أوكراني</displayName>
-				<displayName count="two" draft="contributed">هريفنيا أوكراني</displayName>
-				<displayName count="few" draft="contributed">هريفنيا أوكراني</displayName>
-				<displayName count="many" draft="contributed">هريفنيا أوكراني</displayName>
-				<displayName count="other" draft="contributed">هريفنيا أوكراني</displayName>
+				<displayName count="zero">هريفنيا أوكراني</displayName>
+				<displayName count="one">هريفنيا أوكراني</displayName>
+				<displayName count="two">هريفنيا أوكراني</displayName>
+				<displayName count="few">هريفنيا أوكراني</displayName>
+				<displayName count="many">هريفنيا أوكراني</displayName>
+				<displayName count="other">هريفنيا أوكراني</displayName>
 				<symbol draft="contributed">UAH</symbol>
 				<symbol alt="narrow" draft="contributed">₴</symbol>
 			</currency>
@@ -7235,12 +7497,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="UGX">
 				<displayName>شلن أوغندي</displayName>
-				<displayName count="zero" draft="contributed">شلن أوغندي</displayName>
-				<displayName count="one" draft="contributed">شلن أوغندي</displayName>
-				<displayName count="two" draft="contributed">شلن أوغندي</displayName>
-				<displayName count="few" draft="contributed">شلن أوغندي</displayName>
-				<displayName count="many" draft="contributed">شلن أوغندي</displayName>
-				<displayName count="other" draft="contributed">شلن أوغندي</displayName>
+				<displayName count="zero">شلن أوغندي</displayName>
+				<displayName count="one">شلن أوغندي</displayName>
+				<displayName count="two">شلن أوغندي</displayName>
+				<displayName count="few">شلن أوغندي</displayName>
+				<displayName count="many">شلن أوغندي</displayName>
+				<displayName count="other">شلن أوغندي</displayName>
 				<symbol draft="contributed">UGX</symbol>
 			</currency>
 			<currency type="USD">
@@ -7265,17 +7527,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="UYU">
 				<displayName>بيزو اوروغواي</displayName>
+				<displayName count="zero">بيزو اوروغواي</displayName>
+				<displayName count="one">بيزو اوروغواي</displayName>
+				<displayName count="two">بيزو اوروغواي</displayName>
+				<displayName count="few">بيزو اوروغواي</displayName>
+				<displayName count="many">بيزو اوروغواي</displayName>
+				<displayName count="other">بيزو اوروغواي</displayName>
 				<symbol draft="contributed">UYU</symbol>
 				<symbol alt="narrow" draft="contributed">UY$</symbol>
 			</currency>
 			<currency type="UZS">
 				<displayName>سوم أوزبكستاني</displayName>
-				<displayName count="zero" draft="contributed">سوم أوزبكستاني</displayName>
-				<displayName count="one" draft="contributed">سوم أوزبكستاني</displayName>
-				<displayName count="two" draft="contributed">سوم أوزبكستاني</displayName>
-				<displayName count="few" draft="contributed">سوم أوزبكستاني</displayName>
-				<displayName count="many" draft="contributed">سوم أوزبكستاني</displayName>
-				<displayName count="other" draft="contributed">سوم أوزبكستاني</displayName>
+				<displayName count="zero">سوم أوزبكستاني</displayName>
+				<displayName count="one">سوم أوزبكستاني</displayName>
+				<displayName count="two">سوم أوزبكستاني</displayName>
+				<displayName count="few">سوم أوزبكستاني</displayName>
+				<displayName count="many">سوم أوزبكستاني</displayName>
+				<displayName count="other">سوم أوزبكستاني</displayName>
 				<symbol draft="contributed">UZS</symbol>
 			</currency>
 			<currency type="VEB">
@@ -7283,35 +7551,54 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="VEF">
 				<displayName>بوليفار فنزويلي</displayName>
+				<displayName count="zero">بوليفار فنزويلي</displayName>
+				<displayName count="one">بوليفار فنزويلي</displayName>
+				<displayName count="two">بوليفار فنزويلي</displayName>
+				<displayName count="few">بوليفار فنزويلي</displayName>
+				<displayName count="many">بوليفار فنزويلي</displayName>
+				<displayName count="other">بوليفار فنزويلي</displayName>
 				<symbol draft="contributed">VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>دونج فيتنامي</displayName>
-				<displayName count="zero" draft="contributed">دونج فيتنامي</displayName>
-				<displayName count="one" draft="contributed">دونج فيتنامي</displayName>
-				<displayName count="two" draft="contributed">دونج فيتنامي</displayName>
-				<displayName count="few" draft="contributed">دونج فيتنامي</displayName>
-				<displayName count="many" draft="contributed">دونج فيتنامي</displayName>
-				<displayName count="other" draft="contributed">دونج فيتنامي</displayName>
+				<displayName count="zero">دونج فيتنامي</displayName>
+				<displayName count="one">دونج فيتنامي</displayName>
+				<displayName count="two">دونج فيتنامي</displayName>
+				<displayName count="few">دونج فيتنامي</displayName>
+				<displayName count="many">دونج فيتنامي</displayName>
+				<displayName count="other">دونج فيتنامي</displayName>
 				<symbol draft="contributed">₫</symbol>
 				<symbol alt="narrow" draft="contributed">₫</symbol>
 			</currency>
 			<currency type="VUV">
 				<displayName>فاتو فانواتو</displayName>
+				<displayName count="zero">فاتو فانواتو</displayName>
+				<displayName count="one">فاتو فانواتو</displayName>
+				<displayName count="two">فاتو فانواتو</displayName>
+				<displayName count="few">فاتو فانواتو</displayName>
+				<displayName count="many">فاتو فانواتو</displayName>
+				<displayName count="other">فاتو فانواتو</displayName>
 				<symbol draft="contributed">VUV</symbol>
 			</currency>
 			<currency type="WST">
 				<displayName>تالا ساموا</displayName>
+				<displayName count="zero">تالا ساموا</displayName>
+				<displayName count="one">تالا ساموا</displayName>
+				<displayName count="two">تالا ساموا</displayName>
+				<displayName count="few">تالا ساموا</displayName>
+				<displayName count="many">تالا ساموا</displayName>
+				<displayName count="other">تالا ساموا</displayName>
 				<symbol draft="contributed">WST</symbol>
 			</currency>
 			<currency type="XAF">
-				<displayName>فرنك أفريقي</displayName>
-				<displayName count="zero" draft="contributed">فرنك أفريقي</displayName>
-				<displayName count="one" draft="contributed">فرنك أفريقي</displayName>
-				<displayName count="two" draft="contributed">فرنك أفريقي</displayName>
-				<displayName count="few" draft="contributed">فرنك أفريقي</displayName>
-				<displayName count="many" draft="contributed">فرنك أفريقي</displayName>
-				<displayName count="other" draft="contributed">فرنك أفريقي</displayName>
+				<displayName>فرنك وسط أفريقي</displayName>
+				<displayName count="zero">فرنك وسط أفريقي</displayName>
+				<displayName count="one">فرنك وسط أفريقي</displayName>
+				<displayName count="two">فرنك وسط أفريقي</displayName>
+				<displayName count="few">فرنك وسط أفريقي</displayName>
+				<displayName count="many">فرنك وسط أفريقي</displayName>
+				<displayName count="other">فرنك وسط أفريقي</displayName>
 				<symbol>FCFA</symbol>
 			</currency>
 			<currency type="XAG">
@@ -7370,13 +7657,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="XCD">
 				<displayName>دولار شرق الكاريبي</displayName>
-				<displayName count="zero" draft="contributed">دولار شرق الكاريبي</displayName>
-				<displayName count="one" draft="contributed">دولار شرق الكاريبي</displayName>
-				<displayName count="two" draft="contributed">دولار شرق الكاريبي</displayName>
-				<displayName count="few" draft="contributed">دولار شرق الكاريبي</displayName>
-				<displayName count="many" draft="contributed">دولار شرق الكاريبي</displayName>
-				<displayName count="other" draft="contributed">دولار شرق الكاريبي</displayName>
+				<displayName count="zero">دولار شرق الكاريبي</displayName>
+				<displayName count="one">دولار شرق الكاريبي</displayName>
+				<displayName count="two">دولار شرق الكاريبي</displayName>
+				<displayName count="few">دولار شرق الكاريبي</displayName>
+				<displayName count="many">دولار شرق الكاريبي</displayName>
+				<displayName count="other">دولار شرق الكاريبي</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>حقوق السحب الخاصة</displayName>
@@ -7409,14 +7697,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other" draft="provisional">(UIC)فرنك فرنسي</displayName>
 			</currency>
 			<currency type="XOF">
-				<displayName draft="contributed">فرنك سي إف إيه غرب إفريقيا</displayName>
+				<displayName>فرنك غرب أفريقي</displayName>
+				<displayName count="zero">فرنك غرب أفريقي</displayName>
+				<displayName count="one">فرنك غرب أفريقي</displayName>
+				<displayName count="two">فرنك غرب أفريقي</displayName>
+				<displayName count="few">فرنك غرب أفريقي</displayName>
+				<displayName count="many">فرنك غرب أفريقي</displayName>
+				<displayName count="other">فرنك غرب أفريقي</displayName>
 				<symbol>CFA</symbol>
 			</currency>
 			<currency type="XPD">
 				<displayName>بالاديوم</displayName>
 			</currency>
 			<currency type="XPF">
-				<displayName draft="contributed">فرنك سي إف بي</displayName>
+				<displayName>فرنك سي إف بي</displayName>
+				<displayName count="zero">فرنك سي إف بي</displayName>
+				<displayName count="one">فرنك سي إف بي</displayName>
+				<displayName count="two">فرنك سي إف بي</displayName>
+				<displayName count="few">فرنك سي إف بي</displayName>
+				<displayName count="many">فرنك سي إف بي</displayName>
+				<displayName count="other">فرنك سي إف بي</displayName>
 				<symbol draft="contributed">CFPF</symbol>
 			</currency>
 			<currency type="XPT">
@@ -7439,12 +7739,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="XXX">
 				<displayName>عملة غير معروفة</displayName>
-				<displayName count="zero">عملة غير معروفة</displayName>
-				<displayName count="one">عملة غير معروفة</displayName>
-				<displayName count="two">عملة غير معروفة</displayName>
-				<displayName count="few">عملة غير معروفة</displayName>
-				<displayName count="many">عملة غير معروفة</displayName>
-				<displayName count="other">عملة غير معروفة</displayName>
+				<displayName count="zero">(عملة غير معروفة)</displayName>
+				<displayName count="one">(عملة غير معروفة)</displayName>
+				<displayName count="two">(عملة غير معروفة)</displayName>
+				<displayName count="few">(عملة غير معروفة)</displayName>
+				<displayName count="many">(عملة غير معروفة)</displayName>
+				<displayName count="other">(عملة غير معروفة)</displayName>
 				<symbol>***</symbol>
 			</currency>
 			<currency type="YDD">
@@ -7452,12 +7752,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="YER">
 				<displayName>ريال يمني</displayName>
-				<displayName count="zero" draft="contributed">ريال يمني</displayName>
-				<displayName count="one" draft="contributed">ريال يمني</displayName>
-				<displayName count="two" draft="contributed">ريال يمني</displayName>
-				<displayName count="few" draft="contributed">ريال يمني</displayName>
-				<displayName count="many" draft="contributed">ريال يمني</displayName>
-				<displayName count="other" draft="contributed">ريال يمني</displayName>
+				<displayName count="zero">ريال يمني</displayName>
+				<displayName count="one">ريال يمني</displayName>
+				<displayName count="two">ريال يمني</displayName>
+				<displayName count="few">ريالات يمنية</displayName>
+				<displayName count="many">ريالاً يمنيًا</displayName>
+				<displayName count="other">ريال يمني</displayName>
 				<symbol>ر.ي.‏</symbol>
 			</currency>
 			<currency type="YUD">
@@ -7471,13 +7771,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="ZAR">
 				<displayName>راند جنوب أفريقيا</displayName>
-				<displayName count="zero" draft="contributed">راند جنوب أفريقيا</displayName>
-				<displayName count="one" draft="contributed">راند جنوب أفريقيا</displayName>
-				<displayName count="two" draft="contributed">راند جنوب أفريقيا</displayName>
-				<displayName count="few" draft="contributed">راند جنوب أفريقيا</displayName>
-				<displayName count="many" draft="contributed">راند جنوب أفريقيا</displayName>
-				<displayName count="other" draft="contributed">راند جنوب أفريقيا</displayName>
+				<displayName count="zero">راند جنوب أفريقيا</displayName>
+				<displayName count="one">راند جنوب أفريقيا</displayName>
+				<displayName count="two">راند جنوب أفريقيا</displayName>
+				<displayName count="few">راند جنوب أفريقيا</displayName>
+				<displayName count="many">راند جنوب أفريقيا</displayName>
+				<displayName count="other">راند جنوب أفريقيا</displayName>
 				<symbol draft="contributed">ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>كواشا زامبي - 1968-2012</displayName>
@@ -7490,13 +7791,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="ZMW">
 				<displayName>كواشا زامبي</displayName>
-				<displayName count="zero" draft="contributed">كواشا زامبي</displayName>
-				<displayName count="one" draft="contributed">كواشا زامبي</displayName>
-				<displayName count="two" draft="contributed">كواشا زامبي</displayName>
-				<displayName count="few" draft="contributed">كواشا زامبي</displayName>
-				<displayName count="many" draft="contributed">كواشا زامبي</displayName>
-				<displayName count="other" draft="contributed">كواشا زامبي</displayName>
+				<displayName count="zero">كواشا زامبي</displayName>
+				<displayName count="one">كواشا زامبي</displayName>
+				<displayName count="two">كواشا زامبي</displayName>
+				<displayName count="few">كواشا زامبي</displayName>
+				<displayName count="many">كواشا زامبي</displayName>
+				<displayName count="other">كواشا زامبي</displayName>
 				<symbol draft="contributed">ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>زائير زائيري جديد</displayName>
@@ -7530,321 +7832,356 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
-			<pattern type="atLeast" draft="contributed">+{0}</pattern>
-			<pattern type="range" draft="contributed">{0}–{1}</pattern>
+			<pattern type="atLeast">+{0}</pattern>
+			<pattern type="range">{0}–{1}</pattern>
 		</miscPatterns>
 	</numbers>
 	<units>
 		<unitLength type="long">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0} كل {1}</compoundUnitPattern>
+				<compoundUnitPattern>{0} لكل {1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
-				<displayName draft="contributed">قوة تسارع</displayName>
-				<unitPattern count="zero" draft="contributed">{0} قوة تسارع</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} قوة تسارع</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} قوة تسارع</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} قوة تسارع</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} قوة تسارع</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} قوة تسارع</unitPattern>
+				<displayName>قوة تسارع</displayName>
+				<unitPattern count="zero">{0} قوة تسارع</unitPattern>
+				<unitPattern count="one">{0} قوة تسارع</unitPattern>
+				<unitPattern count="two">{0} قوة تسارع</unitPattern>
+				<unitPattern count="few">{0} قوة تسارع</unitPattern>
+				<unitPattern count="many">{0} قوة تسارع</unitPattern>
+				<unitPattern count="other">{0} قوة تسارع</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
-				<displayName draft="contributed">متر في الثانية المربعة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} متر في الثانية المربعة</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} متر في الثانية المربعة</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} متر في الثانية المربعة</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} متر في الثانية المربعة</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} متر في الثانية المربعة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} متر في الثانية المربعة</unitPattern>
+				<displayName>متر في الثانية المربعة</displayName>
+				<unitPattern count="zero">{0} متر في الثانية المربعة</unitPattern>
+				<unitPattern count="one">{0} متر في الثانية المربعة</unitPattern>
+				<unitPattern count="two">{0} متر في الثانية المربعة</unitPattern>
+				<unitPattern count="few">{0} متر في الثانية المربعة</unitPattern>
+				<unitPattern count="many">{0} متر في الثانية المربعة</unitPattern>
+				<unitPattern count="other">{0} متر في الثانية المربعة</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName draft="contributed">دقيقة قوسية</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الدقائق</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} دقيقة</unitPattern>
-				<unitPattern count="two" draft="contributed">دقيقتان ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} دقائق</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} دقيقة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الدقائق</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName draft="contributed">ثانية قوسية</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الثواني</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ثانية</unitPattern>
-				<unitPattern count="two" draft="contributed">ثانيتان ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ثوانٍ</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ثانية</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الثواني</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName draft="contributed">درجة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الدرجات</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} درجة</unitPattern>
-				<unitPattern count="two" draft="contributed">درجتان ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} درجات</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} درجة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الدرجات</unitPattern>
+			<unit type="angle-revolution">
+				<displayName>دورة</displayName>
+				<unitPattern count="zero">{0} دورة</unitPattern>
+				<unitPattern count="one">دورة ({0})</unitPattern>
+				<unitPattern count="two">دورتان ({0})</unitPattern>
+				<unitPattern count="few">{0} دورات</unitPattern>
+				<unitPattern count="many">{0} دورة</unitPattern>
+				<unitPattern count="other">{0} دورة</unitPattern>
 			</unit>
 			<unit type="angle-radian">
-				<displayName draft="contributed">راديان</displayName>
-				<unitPattern count="zero" draft="contributed">{0} راديان</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} راديان</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} راديان</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} راديان</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} راديان</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} راديان</unitPattern>
+				<displayName>راديان</displayName>
+				<unitPattern count="zero">{0} راديان</unitPattern>
+				<unitPattern count="one">{0} راديان</unitPattern>
+				<unitPattern count="two">{0} راديان</unitPattern>
+				<unitPattern count="few">{0} راديان</unitPattern>
+				<unitPattern count="many">{0} راديان</unitPattern>
+				<unitPattern count="other">{0} راديان</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName draft="contributed">فدان</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الفدادين</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} فدان</unitPattern>
-				<unitPattern count="two" draft="contributed">فدانان ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} فدادين</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} فدانًا</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الفدادين</unitPattern>
+			<unit type="angle-degree">
+				<displayName>درجة</displayName>
+				<unitPattern count="zero">{0} درجة</unitPattern>
+				<unitPattern count="one">{0} درجة</unitPattern>
+				<unitPattern count="two">درجتان ({0})</unitPattern>
+				<unitPattern count="few">{0} درجات</unitPattern>
+				<unitPattern count="many">{0} درجة</unitPattern>
+				<unitPattern count="other">{0} درجة</unitPattern>
 			</unit>
-			<unit type="area-hectare">
-				<displayName draft="contributed">هكتار</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الهكتارات</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} هكتار</unitPattern>
-				<unitPattern count="two" draft="contributed">هكتاران ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} هكتارات</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} هكتارًا</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الهكتارات</unitPattern>
+			<unit type="angle-arc-minute">
+				<displayName>دقيقة قوسية</displayName>
+				<unitPattern count="zero">{0} دقيقة قوسية</unitPattern>
+				<unitPattern count="one">{0} دقيقة قوسية</unitPattern>
+				<unitPattern count="two">دقيقتان قوسيتان</unitPattern>
+				<unitPattern count="few">{0} دقائق قوسية</unitPattern>
+				<unitPattern count="many">{0} دقيقة قوسية</unitPattern>
+				<unitPattern count="other">{0} دقيقة قوسية</unitPattern>
 			</unit>
-			<unit type="area-square-centimeter">
-				<displayName draft="contributed">سنتيمتر مربع</displayName>
-				<unitPattern count="zero" draft="contributed">{0} سنتيمتر مربع</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} سنتيمتر مربع</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} سنتيمتر مربع</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} سنتيمتر مربع</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} سنتيمتر مربع</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} سنتيمتر مربع</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<displayName draft="contributed">قدم مربعة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الأقدام المربعة</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} قدم مربعة</unitPattern>
-				<unitPattern count="two" draft="contributed">قدمان مربعان ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أقدام مربعة</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} قدمًا مربعًا</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الأقدام المربعة</unitPattern>
-			</unit>
-			<unit type="area-square-inch">
-				<displayName draft="contributed">بوصة مربعة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} بوصة مربعة</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} بوصة مربعة</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} بوصة مربعة</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} بوصة مربعة</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} بوصة مربعة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} بوصة مربعة</unitPattern>
+			<unit type="angle-arc-second">
+				<displayName>ثانية قوسية</displayName>
+				<unitPattern count="zero">{0} ثانية قوسية</unitPattern>
+				<unitPattern count="one">{0} ثانية قوسية</unitPattern>
+				<unitPattern count="two">ثانيتان قوسيتان</unitPattern>
+				<unitPattern count="few">{0} ثوانٍ قوسية</unitPattern>
+				<unitPattern count="many">{0} ثانية قوسية</unitPattern>
+				<unitPattern count="other">{0} ثانية قوسية</unitPattern>
 			</unit>
 			<unit type="area-square-kilometer">
-				<displayName draft="contributed">كيلومتر مربع</displayName>
-				<unitPattern count="zero" draft="contributed">{0} كيلومتر مربع</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كيلومتر مربع</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} كيلومتر مربع</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} كيلومتر مربع</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كيلومتر مربع</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كيلومتر مربع</unitPattern>
+				<displayName>كيلومتر مربع</displayName>
+				<unitPattern count="zero">{0} كيلومتر مربع</unitPattern>
+				<unitPattern count="one">{0} كيلومتر مربع</unitPattern>
+				<unitPattern count="two">{0} كيلومتر مربع</unitPattern>
+				<unitPattern count="few">{0} كيلومتر مربع</unitPattern>
+				<unitPattern count="many">{0} كيلومتر مربع</unitPattern>
+				<unitPattern count="other">{0} كيلومتر مربع</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>هكتار</displayName>
+				<unitPattern count="zero">{0} هكتار</unitPattern>
+				<unitPattern count="one">{0} هكتار</unitPattern>
+				<unitPattern count="two">هكتاران</unitPattern>
+				<unitPattern count="few">{0} هكتارات</unitPattern>
+				<unitPattern count="many">{0} هكتار</unitPattern>
+				<unitPattern count="other">{0} هكتار</unitPattern>
 			</unit>
 			<unit type="area-square-meter">
-				<displayName draft="contributed">متر مربع</displayName>
-				<unitPattern count="zero" draft="contributed">{0} متر مربع</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} متر مربع</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} متر مربع</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} متر مربع</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} متر مربع</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} متر مربع</unitPattern>
+				<displayName>متر مربع</displayName>
+				<unitPattern count="zero">{0} متر مربع</unitPattern>
+				<unitPattern count="one">{0} متر مربع</unitPattern>
+				<unitPattern count="two">{0} متر مربع</unitPattern>
+				<unitPattern count="few">{0} متر مربع</unitPattern>
+				<unitPattern count="many">{0} متر مربع</unitPattern>
+				<unitPattern count="other">{0} متر مربع</unitPattern>
+				<perUnitPattern>{0} لكل متر مربع</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>سنتيمتر مربع</displayName>
+				<unitPattern count="zero">{0} سنتيمتر مربع</unitPattern>
+				<unitPattern count="one">{0} سنتيمتر مربع</unitPattern>
+				<unitPattern count="two">{0} سنتيمتر مربع</unitPattern>
+				<unitPattern count="few">{0} سنتيمتر مربع</unitPattern>
+				<unitPattern count="many">{0} سنتيمتر مربع</unitPattern>
+				<unitPattern count="other">{0} سنتيمتر مربع</unitPattern>
+				<perUnitPattern>{0}/سنتيمتر مربع</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
-				<displayName draft="contributed">ميل مربع</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ميل مربع</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ميل مربع</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ميل مربع</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ميل مربع</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ميل مربع</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ميل مربع</unitPattern>
+				<displayName>ميل مربع</displayName>
+				<unitPattern count="zero">{0} ميل مربع</unitPattern>
+				<unitPattern count="one">{0} ميل مربع</unitPattern>
+				<unitPattern count="two">{0} ميل مربع</unitPattern>
+				<unitPattern count="few">{0} ميل مربع</unitPattern>
+				<unitPattern count="many">{0} ميل مربع</unitPattern>
+				<unitPattern count="other">{0} ميل مربع</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>فدان</displayName>
+				<unitPattern count="zero">{0} فدان</unitPattern>
+				<unitPattern count="one">فدان</unitPattern>
+				<unitPattern count="two">فدانان</unitPattern>
+				<unitPattern count="few">{0} فدادين</unitPattern>
+				<unitPattern count="many">{0} فدانًا</unitPattern>
+				<unitPattern count="other">{0} فدان</unitPattern>
 			</unit>
 			<unit type="area-square-yard">
-				<displayName draft="contributed">ياردة مربعة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ياردة مربعة</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ياردة مربعة</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ياردة مربعة</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ياردة مربعة</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ياردة مربعة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ياردة مربعة</unitPattern>
+				<displayName>ياردة مربعة</displayName>
+				<unitPattern count="zero">{0} ياردة مربعة</unitPattern>
+				<unitPattern count="one">{0} ياردة مربعة</unitPattern>
+				<unitPattern count="two">{0} ياردة مربعة</unitPattern>
+				<unitPattern count="few">{0} ياردة مربعة</unitPattern>
+				<unitPattern count="many">{0} ياردة مربعة</unitPattern>
+				<unitPattern count="other">{0} ياردة مربعة</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>قدم مربعة</displayName>
+				<unitPattern count="zero">{0} قدم مربعة</unitPattern>
+				<unitPattern count="one">قدم مربعة</unitPattern>
+				<unitPattern count="two">قدمان مربعان ({0})</unitPattern>
+				<unitPattern count="few">{0} أقدام مربعة</unitPattern>
+				<unitPattern count="many">{0} قدمًا مربعًا</unitPattern>
+				<unitPattern count="other">{0} قدم مربعة</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>بوصة مربعة</displayName>
+				<unitPattern count="zero">{0} بوصة مربعة</unitPattern>
+				<unitPattern count="one">{0} بوصة مربعة</unitPattern>
+				<unitPattern count="two">{0} بوصة مربعة</unitPattern>
+				<unitPattern count="few">{0} بوصة مربعة</unitPattern>
+				<unitPattern count="many">{0} بوصة مربعة</unitPattern>
+				<unitPattern count="other">{0} بوصة مربعة</unitPattern>
+				<perUnitPattern>{0} لكل بوصة مربعة</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>قيراط</displayName>
+				<unitPattern count="zero">{0} قيراط</unitPattern>
+				<unitPattern count="one">{0} قيراط</unitPattern>
+				<unitPattern count="two">{0} قيراط</unitPattern>
+				<unitPattern count="few">{0} قيراط</unitPattern>
+				<unitPattern count="many">{0} قيراط</unitPattern>
+				<unitPattern count="other">{0} قيراط</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName draft="contributed">لتر لكل كيلومتر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} لتر لكل كيلومتر</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} لتر لكل كيلومتر</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} لتر لكل كيلومتر</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} لتر لكل كيلومتر</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} لتر لكل كيلومتر</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} لتر لكل كيلومتر</unitPattern>
+				<displayName>لتر لكل كيلومتر</displayName>
+				<unitPattern count="zero">{0} لتر لكل كيلومتر</unitPattern>
+				<unitPattern count="one">{0} لتر لكل كيلومتر</unitPattern>
+				<unitPattern count="two">{0} لتر لكل كيلومتر</unitPattern>
+				<unitPattern count="few">{0} لتر لكل كيلومتر</unitPattern>
+				<unitPattern count="many">{0} لتر لكل كيلومتر</unitPattern>
+				<unitPattern count="other">{0} لتر لكل كيلومتر</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>لتر لكل ١٠٠ كيلومتر</displayName>
+				<unitPattern count="zero">{0} لتر لكل ١٠٠ كيلومتر</unitPattern>
+				<unitPattern count="one">{0} لتر لكل ١٠٠ كيلومتر</unitPattern>
+				<unitPattern count="two">{0} لتر لكل ١٠٠ كيلومتر</unitPattern>
+				<unitPattern count="few">{0} لتر لكل ١٠٠ كيلومتر</unitPattern>
+				<unitPattern count="many">{0} لتر لكل ١٠٠ كيلومتر</unitPattern>
+				<unitPattern count="other">{0} لتر لكل ١٠٠ كيلومتر</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
-				<displayName draft="contributed">ميل لكل غالون</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ميل لكل غالون</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ميل لكل غالون</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ميل لكل غالون</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ميل لكل غالون</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ميل لكل غالون</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ميل لكل غالون</unitPattern>
-			</unit>
-			<unit type="digital-bit">
-				<displayName draft="contributed">بت</displayName>
-				<unitPattern count="zero" draft="contributed">{0} بت</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} بت</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} بت</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} بت</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} بت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} بت</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName draft="contributed">بايت</displayName>
-				<unitPattern count="zero" draft="contributed">{0} بايت</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} بايت</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} بايت</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} بايت</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} بايت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} بايت</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName draft="contributed">غيغابت</displayName>
-				<unitPattern count="zero" draft="contributed">{0} غيغابت</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} غيغابت</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} غيغابت</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} غيغابت</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} غيغابت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} غيغابت</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName draft="contributed">غيغابايت</displayName>
-				<unitPattern count="zero" draft="contributed">{0} غيغابايت</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} غيغابايت</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} غيغابايت</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} غيغابايت</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} غيغابايت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} غيغابايت</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName draft="contributed">كيلوبت</displayName>
-				<unitPattern count="zero" draft="contributed">{0} كيلوبت</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كيلوبت</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} كيلوبت</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} كيلوبت</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كيلوبت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كيلوبت</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName draft="contributed">كيلوبايت</displayName>
-				<unitPattern count="zero" draft="contributed">{0} كيلوبايت</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كيلوبايت</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} كيلوبايت</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} كيلوبايت</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كيلوبايت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كيلوبايت</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName draft="contributed">ميغابت</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ميغابت</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ميغابت</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ميغابت</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ميغابت</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ميغابت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ميغابت</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName draft="contributed">ميغابايت</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ميغابايت</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ميغابايت</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ميغابايت</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ميغابايت</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ميغابايت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ميغابايت</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName draft="contributed">تيرابت</displayName>
-				<unitPattern count="zero" draft="contributed">{0} تيرابت</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} تيرابت</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} تيرابت</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} تيرابت</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} تيرابت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} تيرابت</unitPattern>
+				<displayName>ميل لكل غالون</displayName>
+				<unitPattern count="zero">{0} ميل لكل غالون</unitPattern>
+				<unitPattern count="one">{0} ميل لكل غالون</unitPattern>
+				<unitPattern count="two">{0} ميل لكل غالون</unitPattern>
+				<unitPattern count="few">{0} ميل لكل غالون</unitPattern>
+				<unitPattern count="many">{0} ميل لكل غالون</unitPattern>
+				<unitPattern count="other">{0} ميل لكل غالون</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
-				<displayName draft="contributed">تيرابايت</displayName>
-				<unitPattern count="zero" draft="contributed">{0} تيرابايت</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} تيرابايت</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} تيرابايت</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} تيرابايت</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} تيرابايت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} تيرابايت</unitPattern>
+				<displayName>تيرابايت</displayName>
+				<unitPattern count="zero">{0} تيرابايت</unitPattern>
+				<unitPattern count="one">{0} تيرابايت</unitPattern>
+				<unitPattern count="two">{0} تيرابايت</unitPattern>
+				<unitPattern count="few">{0} تيرابايت</unitPattern>
+				<unitPattern count="many">{0} تيرابايت</unitPattern>
+				<unitPattern count="other">{0} تيرابايت</unitPattern>
 			</unit>
-			<unit type="duration-day">
-				<displayName>يوم</displayName>
-				<unitPattern count="zero">{0} يوم</unitPattern>
-				<unitPattern count="one">يوم</unitPattern>
-				<unitPattern count="two">يومان</unitPattern>
-				<unitPattern count="few">{0} أيام</unitPattern>
-				<unitPattern count="many">{0} يومًا</unitPattern>
-				<unitPattern count="other">{0} يوم</unitPattern>
+			<unit type="digital-terabit">
+				<displayName>تيرابت</displayName>
+				<unitPattern count="zero">{0} تيرابت</unitPattern>
+				<unitPattern count="one">{0} تيرابت</unitPattern>
+				<unitPattern count="two">{0} تيرابت</unitPattern>
+				<unitPattern count="few">{0} تيرابت</unitPattern>
+				<unitPattern count="many">{0} تيرابت</unitPattern>
+				<unitPattern count="other">{0} تيرابت</unitPattern>
 			</unit>
-			<unit type="duration-hour">
-				<displayName>ساعة</displayName>
-				<unitPattern count="zero">{0} ساعة</unitPattern>
-				<unitPattern count="one">ساعة</unitPattern>
-				<unitPattern count="two">ساعتان</unitPattern>
-				<unitPattern count="few">{0} ساعات</unitPattern>
-				<unitPattern count="many">{0} ساعة</unitPattern>
-				<unitPattern count="other">{0} ساعة</unitPattern>
-				<perUnitPattern>{0}/ساعة</perUnitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>غيغابايت</displayName>
+				<unitPattern count="zero">{0} غيغابايت</unitPattern>
+				<unitPattern count="one">{0} غيغابايت</unitPattern>
+				<unitPattern count="two">{0} غيغابايت</unitPattern>
+				<unitPattern count="few">{0} غيغابايت</unitPattern>
+				<unitPattern count="many">{0} غيغابايت</unitPattern>
+				<unitPattern count="other">{0} غيغابايت</unitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>ميكروثانية</displayName>
-				<unitPattern count="zero">{0} ميكروثانية</unitPattern>
-				<unitPattern count="one">{0} ميكروثانية</unitPattern>
-				<unitPattern count="two">{0} ميكروثانية</unitPattern>
-				<unitPattern count="few">{0} ميكروثانية</unitPattern>
-				<unitPattern count="many">{0} ميكروثانية</unitPattern>
-				<unitPattern count="other">{0} ميكروثانية</unitPattern>
+			<unit type="digital-gigabit">
+				<displayName>غيغابت</displayName>
+				<unitPattern count="zero">{0} غيغابت</unitPattern>
+				<unitPattern count="one">{0} غيغابت</unitPattern>
+				<unitPattern count="two">{0} غيغابت</unitPattern>
+				<unitPattern count="few">{0} غيغابت</unitPattern>
+				<unitPattern count="many">{0} غيغابت</unitPattern>
+				<unitPattern count="other">{0} غيغابت</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>مللي ثانية</displayName>
-				<unitPattern count="zero">{0} مللي ثانية</unitPattern>
-				<unitPattern count="one">{0} مللي ثانية</unitPattern>
-				<unitPattern count="two">{0} مللي ثانية</unitPattern>
-				<unitPattern count="few">{0} مللي ثانية</unitPattern>
-				<unitPattern count="many">{0} مللي ثانية</unitPattern>
-				<unitPattern count="other">{0} مللي ثانية</unitPattern>
+			<unit type="digital-megabyte">
+				<displayName>ميغابايت</displayName>
+				<unitPattern count="zero">{0} ميغابايت</unitPattern>
+				<unitPattern count="one">{0} ميغابايت</unitPattern>
+				<unitPattern count="two">{0} ميغابايت</unitPattern>
+				<unitPattern count="few">{0} ميغابايت</unitPattern>
+				<unitPattern count="many">{0} ميغابايت</unitPattern>
+				<unitPattern count="other">{0} ميغابايت</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>دقيقة</displayName>
-				<unitPattern count="zero">{0} دقيقة</unitPattern>
-				<unitPattern count="one">{0} دقيقة</unitPattern>
-				<unitPattern count="two">دقيقتان</unitPattern>
-				<unitPattern count="few">{0} دقائق</unitPattern>
-				<unitPattern count="many">{0} دقيقة</unitPattern>
-				<unitPattern count="other">{0} دقيقة</unitPattern>
+			<unit type="digital-megabit">
+				<displayName>ميغابت</displayName>
+				<unitPattern count="zero">{0} ميغابت</unitPattern>
+				<unitPattern count="one">{0} ميغابت</unitPattern>
+				<unitPattern count="two">{0} ميغابت</unitPattern>
+				<unitPattern count="few">{0} ميغابت</unitPattern>
+				<unitPattern count="many">{0} ميغابت</unitPattern>
+				<unitPattern count="other">{0} ميغابت</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>كيلوبايت</displayName>
+				<unitPattern count="zero">{0} كيلوبايت</unitPattern>
+				<unitPattern count="one">{0} كيلوبايت</unitPattern>
+				<unitPattern count="two">{0} كيلوبايت</unitPattern>
+				<unitPattern count="few">{0} كيلوبايت</unitPattern>
+				<unitPattern count="many">{0} كيلوبايت</unitPattern>
+				<unitPattern count="other">{0} كيلوبايت</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>كيلوبت</displayName>
+				<unitPattern count="zero">{0} كيلوبت</unitPattern>
+				<unitPattern count="one">{0} كيلوبت</unitPattern>
+				<unitPattern count="two">{0} كيلوبت</unitPattern>
+				<unitPattern count="few">{0} كيلوبت</unitPattern>
+				<unitPattern count="many">{0} كيلوبت</unitPattern>
+				<unitPattern count="other">{0} كيلوبت</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>بايت</displayName>
+				<unitPattern count="zero">{0} بايت</unitPattern>
+				<unitPattern count="one">{0} بايت</unitPattern>
+				<unitPattern count="two">{0} بايت</unitPattern>
+				<unitPattern count="few">{0} بايت</unitPattern>
+				<unitPattern count="many">{0} بايت</unitPattern>
+				<unitPattern count="other">{0} بايت</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>بت</displayName>
+				<unitPattern count="zero">{0} بت</unitPattern>
+				<unitPattern count="one">{0} بت</unitPattern>
+				<unitPattern count="two">{0} بت</unitPattern>
+				<unitPattern count="few">{0} بت</unitPattern>
+				<unitPattern count="many">{0} بت</unitPattern>
+				<unitPattern count="other">{0} بت</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>قرون</displayName>
+				<unitPattern count="zero">{0} قرن</unitPattern>
+				<unitPattern count="one">قرن ({0})</unitPattern>
+				<unitPattern count="two">قرنان ({0})</unitPattern>
+				<unitPattern count="few">{0} قرون</unitPattern>
+				<unitPattern count="many">{0} قرنًا</unitPattern>
+				<unitPattern count="other">{0} قرن</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>سنوات</displayName>
+				<unitPattern count="zero">{0} سنة</unitPattern>
+				<unitPattern count="one">سنة</unitPattern>
+				<unitPattern count="two">سنتان</unitPattern>
+				<unitPattern count="few">{0} سنوات</unitPattern>
+				<unitPattern count="many">{0} سنة</unitPattern>
+				<unitPattern count="other">{0} سنة</unitPattern>
+				<perUnitPattern>{0} في السنة</perUnitPattern>
 			</unit>
 			<unit type="duration-month">
-				<displayName>شهر</displayName>
+				<displayName>شهور</displayName>
 				<unitPattern count="zero">{0} شهر</unitPattern>
 				<unitPattern count="one">شهر</unitPattern>
 				<unitPattern count="two">شهران</unitPattern>
 				<unitPattern count="few">{0} أشهر</unitPattern>
 				<unitPattern count="many">{0} شهرًا</unitPattern>
 				<unitPattern count="other">{0} شهر</unitPattern>
+				<perUnitPattern>{0}/ش</perUnitPattern>
 			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>نانو ثانية</displayName>
-				<unitPattern count="zero">{0} نانو ثانية</unitPattern>
-				<unitPattern count="one">{0} نانو ثانية</unitPattern>
-				<unitPattern count="two">{0} نانو ثانية</unitPattern>
-				<unitPattern count="few">{0} نانو ثانية</unitPattern>
-				<unitPattern count="many">{0} نانو ثانية</unitPattern>
-				<unitPattern count="other">{0} نانو ثانية</unitPattern>
+			<unit type="duration-week">
+				<displayName>أسابيع</displayName>
+				<unitPattern count="zero">{0} أسبوع</unitPattern>
+				<unitPattern count="one">أسبوع</unitPattern>
+				<unitPattern count="two">أسبوعان</unitPattern>
+				<unitPattern count="few">{0} أسابيع</unitPattern>
+				<unitPattern count="many">{0} أسبوعًا</unitPattern>
+				<unitPattern count="other">{0} أسبوع</unitPattern>
+				<perUnitPattern>{0} كل أسبوع</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>أيام</displayName>
+				<unitPattern count="zero">{0} يوم</unitPattern>
+				<unitPattern count="one">يوم</unitPattern>
+				<unitPattern count="two">يومان</unitPattern>
+				<unitPattern count="few">{0} أيام</unitPattern>
+				<unitPattern count="many">{0} يومًا</unitPattern>
+				<unitPattern count="other">{0} يوم</unitPattern>
+				<perUnitPattern>{0} كل يوم</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>ساعات</displayName>
+				<unitPattern count="zero">{0} ساعة</unitPattern>
+				<unitPattern count="one">ساعة</unitPattern>
+				<unitPattern count="two">ساعتان</unitPattern>
+				<unitPattern count="few">{0} ساعات</unitPattern>
+				<unitPattern count="many">{0} ساعة</unitPattern>
+				<unitPattern count="other">{0} ساعة</unitPattern>
+				<perUnitPattern>{0} كل ساعة</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>دقيقة</displayName>
+				<unitPattern count="zero">{0} دقيقة</unitPattern>
+				<unitPattern count="one">دقيقة</unitPattern>
+				<unitPattern count="two">دقيقتان</unitPattern>
+				<unitPattern count="few">{0} دقائق</unitPattern>
+				<unitPattern count="many">{0} دقيقة</unitPattern>
+				<unitPattern count="other">{0} دقيقة</unitPattern>
+				<perUnitPattern>{0} كل دقيقة</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>ثانية</displayName>
@@ -7856,59 +8193,77 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ثانية</unitPattern>
 				<perUnitPattern>{0}/ثانية</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>أسبوع</displayName>
-				<unitPattern count="zero">{0} أسبوع</unitPattern>
-				<unitPattern count="one">أسبوع</unitPattern>
-				<unitPattern count="two">أسبوعان</unitPattern>
-				<unitPattern count="few">{0} أسابيع</unitPattern>
-				<unitPattern count="many">{0} أسبوعًا</unitPattern>
-				<unitPattern count="other">{0} أسبوع</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>مللي ثانية</displayName>
+				<unitPattern count="zero">{0} مللي ثانية</unitPattern>
+				<unitPattern count="one">{0} مللي ثانية</unitPattern>
+				<unitPattern count="two">{0} مللي ثانية</unitPattern>
+				<unitPattern count="few">{0} مللي ثانية</unitPattern>
+				<unitPattern count="many">{0} مللي ثانية</unitPattern>
+				<unitPattern count="other">{0} مللي ثانية</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>سنة</displayName>
-				<unitPattern count="zero">{0} سنة</unitPattern>
-				<unitPattern count="one">سنة</unitPattern>
-				<unitPattern count="two">سنتان</unitPattern>
-				<unitPattern count="few">{0} سنوات</unitPattern>
-				<unitPattern count="many">{0} سنة</unitPattern>
-				<unitPattern count="other">{0} سنة</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>ميكروثانية</displayName>
+				<unitPattern count="zero">{0} ميكروثانية</unitPattern>
+				<unitPattern count="one">{0} ميكروثانية</unitPattern>
+				<unitPattern count="two">{0} ميكروثانية</unitPattern>
+				<unitPattern count="few">{0} ميكروثانية</unitPattern>
+				<unitPattern count="many">{0} ميكروثانية</unitPattern>
+				<unitPattern count="other">{0} ميكروثانية</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>نانو ثانية</displayName>
+				<unitPattern count="zero">{0} نانو ثانية</unitPattern>
+				<unitPattern count="one">{0} نانو ثانية</unitPattern>
+				<unitPattern count="two">{0} نانو ثانية</unitPattern>
+				<unitPattern count="few">{0} نانو ثانية</unitPattern>
+				<unitPattern count="many">{0} نانو ثانية</unitPattern>
+				<unitPattern count="other">{0} نانو ثانية</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
-				<displayName draft="contributed">أمبير</displayName>
-				<unitPattern count="zero" draft="contributed">{0} أمبير</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} أمبير</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} أمبير</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أمبير</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} أمبير</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} أمبير</unitPattern>
+				<displayName>أمبير</displayName>
+				<unitPattern count="zero">{0} أمبير</unitPattern>
+				<unitPattern count="one">{0} أمبير</unitPattern>
+				<unitPattern count="two">{0} أمبير</unitPattern>
+				<unitPattern count="few">{0} أمبير</unitPattern>
+				<unitPattern count="many">{0} أمبير</unitPattern>
+				<unitPattern count="other">{0} أمبير</unitPattern>
 			</unit>
 			<unit type="electric-milliampere">
-				<displayName draft="contributed">مللي أمبير</displayName>
-				<unitPattern count="zero" draft="contributed">{0} مللي أمبير</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} مللي أمبير</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} مللي أمبير</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} مللي أمبير</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} مللي أمبير</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} مللي أمبير</unitPattern>
+				<displayName>مللي أمبير</displayName>
+				<unitPattern count="zero">{0} مللي أمبير</unitPattern>
+				<unitPattern count="one">{0} مللي أمبير</unitPattern>
+				<unitPattern count="two">{0} مللي أمبير</unitPattern>
+				<unitPattern count="few">{0} مللي أمبير</unitPattern>
+				<unitPattern count="many">{0} مللي أمبير</unitPattern>
+				<unitPattern count="other">{0} مللي أمبير</unitPattern>
 			</unit>
 			<unit type="electric-ohm">
-				<displayName draft="contributed">أوم</displayName>
-				<unitPattern count="zero" draft="contributed">{0} أوم</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} أوم</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} أوم</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أوم</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} أوم</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} أوم</unitPattern>
+				<displayName>أوم</displayName>
+				<unitPattern count="zero">{0} أوم</unitPattern>
+				<unitPattern count="one">{0} أوم</unitPattern>
+				<unitPattern count="two">{0} أوم</unitPattern>
+				<unitPattern count="few">{0} أوم</unitPattern>
+				<unitPattern count="many">{0} أوم</unitPattern>
+				<unitPattern count="other">{0} أوم</unitPattern>
 			</unit>
 			<unit type="electric-volt">
-				<displayName draft="contributed">فولت</displayName>
-				<unitPattern count="zero" draft="contributed">{0} فولت</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} فولت</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} فولت</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} فولت</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} فولت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} فولت</unitPattern>
+				<displayName>فولت</displayName>
+				<unitPattern count="zero">{0} فولت</unitPattern>
+				<unitPattern count="one">{0} فولت</unitPattern>
+				<unitPattern count="two">{0} فولت</unitPattern>
+				<unitPattern count="few">{0} فولت</unitPattern>
+				<unitPattern count="many">{0} فولت</unitPattern>
+				<unitPattern count="other">{0} فولت</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>كيلو كالوري</displayName>
+				<unitPattern count="zero">{0} كيلو كالوري</unitPattern>
+				<unitPattern count="one">{0} كيلو كالوري</unitPattern>
+				<unitPattern count="two">{0} كيلو كالوري</unitPattern>
+				<unitPattern count="few">{0} كيلو كالوري</unitPattern>
+				<unitPattern count="many">{0} كيلو كالوري</unitPattern>
+				<unitPattern count="other">{0} كيلو كالوري</unitPattern>
 			</unit>
 			<unit type="energy-calorie">
 				<displayName>كالوري</displayName>
@@ -7928,455 +8283,473 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} كالوري</unitPattern>
 				<unitPattern count="other">{0} كالوري</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName draft="contributed">جول</displayName>
-				<unitPattern count="zero" draft="contributed">{0} جول</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} جول</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} جول</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} جول</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} جول</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} جول</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName draft="contributed">كيلو كالوري</displayName>
-				<unitPattern count="zero" draft="contributed">{0} كيلو كالوري</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كيلو كالوري</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} كيلو كالوري</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} كيلو كالوري</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كيلو كالوري</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كيلو كالوري</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
-				<displayName draft="contributed">كيلو جول</displayName>
-				<unitPattern count="zero" draft="contributed">{0} كيلو جول</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كيلو جول</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} كيلو جول</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} كيلو جول</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كيلو جول</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كيلو جول</unitPattern>
+				<displayName>كيلو جول</displayName>
+				<unitPattern count="zero">{0} كيلو جول</unitPattern>
+				<unitPattern count="one">{0} كيلو جول</unitPattern>
+				<unitPattern count="two">{0} كيلو جول</unitPattern>
+				<unitPattern count="few">{0} كيلو جول</unitPattern>
+				<unitPattern count="many">{0} كيلو جول</unitPattern>
+				<unitPattern count="other">{0} كيلو جول</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>جول</displayName>
+				<unitPattern count="zero">{0} جول</unitPattern>
+				<unitPattern count="one">{0} جول</unitPattern>
+				<unitPattern count="two">{0} جول</unitPattern>
+				<unitPattern count="few">{0} جول</unitPattern>
+				<unitPattern count="many">{0} جول</unitPattern>
+				<unitPattern count="other">{0} جول</unitPattern>
 			</unit>
 			<unit type="energy-kilowatt-hour">
-				<displayName draft="contributed">كيلو واط/ساعة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} كيلو واط/ساعة</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كيلو واط/ساعة</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} كيلو واط/ساعة</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} كيلو واط/ساعة</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كيلو واط/ساعة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كيلو واط/ساعة</unitPattern>
+				<displayName>كيلو واط/ساعة</displayName>
+				<unitPattern count="zero">{0} كيلو واط/ساعة</unitPattern>
+				<unitPattern count="one">{0} كيلو واط/ساعة</unitPattern>
+				<unitPattern count="two">{0} كيلو واط/ساعة</unitPattern>
+				<unitPattern count="few">{0} كيلو واط/ساعة</unitPattern>
+				<unitPattern count="many">{0} كيلو واط/ساعة</unitPattern>
+				<unitPattern count="other">{0} كيلو واط/ساعة</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
-				<displayName draft="contributed">غيغا هرتز</displayName>
-				<unitPattern count="zero" draft="contributed">{0} غيغا هرتز</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} غيغا هرتز</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} غيغا هرتز</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} غيغا هرتز</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} غيغا هرتز</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} غيغا هرتز</unitPattern>
-			</unit>
-			<unit type="frequency-hertz">
-				<displayName draft="contributed">هرتز</displayName>
-				<unitPattern count="zero" draft="contributed">{0} هرتز</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} هرتز</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} هرتز</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} هرتز</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} هرتز</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} هرتز</unitPattern>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<displayName draft="contributed">كيلو هرتز</displayName>
-				<unitPattern count="zero" draft="contributed">{0} كيلو هرتز</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كيلو هرتز</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} كيلو هرتز</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} كيلو هرتز</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كيلو هرتز</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كيلو هرتز</unitPattern>
+				<displayName>غيغا هرتز</displayName>
+				<unitPattern count="zero">{0} غيغا هرتز</unitPattern>
+				<unitPattern count="one">{0} غيغا هرتز</unitPattern>
+				<unitPattern count="two">{0} غيغا هرتز</unitPattern>
+				<unitPattern count="few">{0} غيغا هرتز</unitPattern>
+				<unitPattern count="many">{0} غيغا هرتز</unitPattern>
+				<unitPattern count="other">{0} غيغا هرتز</unitPattern>
 			</unit>
 			<unit type="frequency-megahertz">
-				<displayName draft="contributed">ميغا هرتز</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ميغا هرتز</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ميغا هرتز</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ميغا هرتز</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ميغا هرتز</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ميغا هرتز</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ميغا هرتز</unitPattern>
+				<displayName>ميغا هرتز</displayName>
+				<unitPattern count="zero">{0} ميغا هرتز</unitPattern>
+				<unitPattern count="one">{0} ميغا هرتز</unitPattern>
+				<unitPattern count="two">{0} ميغا هرتز</unitPattern>
+				<unitPattern count="few">{0} ميغا هرتز</unitPattern>
+				<unitPattern count="many">{0} ميغا هرتز</unitPattern>
+				<unitPattern count="other">{0} ميغا هرتز</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName draft="contributed">وحدة فلكية</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الوحدات الفلكية</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} وحدة فلكية</unitPattern>
-				<unitPattern count="two" draft="contributed">وحدتان فلكيتان</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} وحدات فلكية</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} وحدة فلكية</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الوحدات الفلكية</unitPattern>
+			<unit type="frequency-kilohertz">
+				<displayName>كيلو هرتز</displayName>
+				<unitPattern count="zero">{0} كيلو هرتز</unitPattern>
+				<unitPattern count="one">{0} كيلو هرتز</unitPattern>
+				<unitPattern count="two">{0} كيلو هرتز</unitPattern>
+				<unitPattern count="few">{0} كيلو هرتز</unitPattern>
+				<unitPattern count="many">{0} كيلو هرتز</unitPattern>
+				<unitPattern count="other">{0} كيلو هرتز</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">سنتيمتر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} سنتيمتر</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} سنتيمتر</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} سنتيمتر</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} سنتيمتر</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} سنتيمتر</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} سنتيمتر</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<displayName draft="contributed">ديسيمتر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ديسيمتر</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ديسيمتر</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ديسيمتر</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ديسيمتر</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ديسيمتر</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ديسيمتر</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="contributed">قدم</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الأقدام</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} قدم</unitPattern>
-				<unitPattern count="two" draft="contributed">قدمان ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أقدام</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} قدمًا</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الأقدام</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="contributed">بوصة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} بوصة</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} بوصة</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} بوصة</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} بوصة</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} بوصة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} بوصة</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>هرتز</displayName>
+				<unitPattern count="zero">{0} هرتز</unitPattern>
+				<unitPattern count="one">{0} هرتز</unitPattern>
+				<unitPattern count="two">{0} هرتز</unitPattern>
+				<unitPattern count="few">{0} هرتز</unitPattern>
+				<unitPattern count="many">{0} هرتز</unitPattern>
+				<unitPattern count="other">{0} هرتز</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
-				<displayName draft="contributed">كيلومتر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} كيلومتر</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كيلومتر</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} كيلومتر</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} كيلومتر</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كيلومتر</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كيلومتر</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName draft="contributed">سنة ضوئية</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من السنوات الضوئية</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} سنة ضوئية</unitPattern>
-				<unitPattern count="two" draft="contributed">سنتان ضوئيتان ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} سنوات ضوئية</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} سنة ضوئية</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من السنوات الضوئية</unitPattern>
+				<displayName>كيلومتر</displayName>
+				<unitPattern count="zero">{0} كيلومتر</unitPattern>
+				<unitPattern count="one">{0} كيلومتر</unitPattern>
+				<unitPattern count="two">{0} كيلومتر</unitPattern>
+				<unitPattern count="few">{0} كيلومتر</unitPattern>
+				<unitPattern count="many">{0} كيلومتر</unitPattern>
+				<unitPattern count="other">{0} كيلومتر</unitPattern>
+				<perUnitPattern>{0}/كيلومتر</perUnitPattern>
 			</unit>
 			<unit type="length-meter">
-				<displayName draft="contributed">متر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الأمتار</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} متر</unitPattern>
-				<unitPattern count="two" draft="contributed">متران ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أمتار</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} مترًا</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الأمتار</unitPattern>
+				<displayName>متر</displayName>
+				<unitPattern count="zero">{0} متر</unitPattern>
+				<unitPattern count="one">متر</unitPattern>
+				<unitPattern count="two">متران</unitPattern>
+				<unitPattern count="few">{0} أمتار</unitPattern>
+				<unitPattern count="many">{0} مترًا</unitPattern>
+				<unitPattern count="other">{0} متر</unitPattern>
+				<perUnitPattern>{0} لكل متر</perUnitPattern>
 			</unit>
-			<unit type="length-micrometer">
-				<displayName draft="contributed">ميكرومتر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ميكرومتر</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ميكرومتر</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ميكرومتر</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ميكرومتر</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ميكرومتر</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ميكرومتر</unitPattern>
+			<unit type="length-decimeter">
+				<displayName>ديسيمتر</displayName>
+				<unitPattern count="zero">{0} ديسيمتر</unitPattern>
+				<unitPattern count="one">{0} ديسيمتر</unitPattern>
+				<unitPattern count="two">{0} ديسيمتر</unitPattern>
+				<unitPattern count="few">{0} ديسيمتر</unitPattern>
+				<unitPattern count="many">{0} ديسيمتر</unitPattern>
+				<unitPattern count="other">{0} ديسيمتر</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName draft="contributed">ميل</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الأميال</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ميل</unitPattern>
-				<unitPattern count="two" draft="contributed">ميلان ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أميال</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ميلاً</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الأميال</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>سنتيمتر</displayName>
+				<unitPattern count="zero">{0} سنتيمتر</unitPattern>
+				<unitPattern count="one">{0} سنتيمتر</unitPattern>
+				<unitPattern count="two">{0} سنتيمتر</unitPattern>
+				<unitPattern count="few">{0} سنتيمتر</unitPattern>
+				<unitPattern count="many">{0} سنتيمتر</unitPattern>
+				<unitPattern count="other">{0} سنتيمتر</unitPattern>
+				<perUnitPattern>{0}/سنتيمتر</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
-				<displayName draft="contributed">ملليمتر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ملليمتر</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ملليمتر</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ملليمتر</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ملليمتر</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ملليمتر</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ملليمتر</unitPattern>
+				<displayName>ملليمتر</displayName>
+				<unitPattern count="zero">{0} ملليمتر</unitPattern>
+				<unitPattern count="one">{0} ملليمتر</unitPattern>
+				<unitPattern count="two">{0} ملليمتر</unitPattern>
+				<unitPattern count="few">{0} ملليمتر</unitPattern>
+				<unitPattern count="many">{0} ملليمتر</unitPattern>
+				<unitPattern count="other">{0} ملليمتر</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>ميكرومتر</displayName>
+				<unitPattern count="zero">{0} ميكرومتر</unitPattern>
+				<unitPattern count="one">{0} ميكرومتر</unitPattern>
+				<unitPattern count="two">{0} ميكرومتر</unitPattern>
+				<unitPattern count="few">{0} ميكرومتر</unitPattern>
+				<unitPattern count="many">{0} ميكرومتر</unitPattern>
+				<unitPattern count="other">{0} ميكرومتر</unitPattern>
 			</unit>
 			<unit type="length-nanometer">
-				<displayName draft="contributed">نانو متر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} نانو متر</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} نانو متر</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} نانو متر</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} نانو متر</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} نانو متر</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} نانو متر</unitPattern>
-			</unit>
-			<unit type="length-nautical-mile">
-				<displayName draft="contributed">ميل بحري</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الأميال البحرية</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ميل بحري</unitPattern>
-				<unitPattern count="two" draft="contributed">ميلان بحريان</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أميال بحرية</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ميلاً بحريًا</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الأميال البحرية</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName draft="contributed">فرسخ فلكي</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الفراسخ الفلكية</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} فرسخ فلكي</unitPattern>
-				<unitPattern count="two" draft="contributed">فرسخان فلكيان</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} فراسخ فلكية</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} فرسخًا فلكيًا</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الفراسخ الفلكية</unitPattern>
+				<displayName>نانو متر</displayName>
+				<unitPattern count="zero">{0} نانو متر</unitPattern>
+				<unitPattern count="one">{0} نانو متر</unitPattern>
+				<unitPattern count="two">{0} نانو متر</unitPattern>
+				<unitPattern count="few">{0} نانو متر</unitPattern>
+				<unitPattern count="many">{0} نانو متر</unitPattern>
+				<unitPattern count="other">{0} نانو متر</unitPattern>
 			</unit>
 			<unit type="length-picometer">
-				<displayName draft="contributed">بيكومتر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} بيكومتر</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} بيكومتر</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} بيكومتر</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} بيكومتر</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} بيكومتر</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} بيكومتر</unitPattern>
+				<displayName>بيكومتر</displayName>
+				<unitPattern count="zero">{0} بيكومتر</unitPattern>
+				<unitPattern count="one">{0} بيكومتر</unitPattern>
+				<unitPattern count="two">{0} بيكومتر</unitPattern>
+				<unitPattern count="few">{0} بيكومتر</unitPattern>
+				<unitPattern count="many">{0} بيكومتر</unitPattern>
+				<unitPattern count="other">{0} بيكومتر</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>ميل</displayName>
+				<unitPattern count="zero">{0} ميل</unitPattern>
+				<unitPattern count="one">ميل</unitPattern>
+				<unitPattern count="two">ميلان</unitPattern>
+				<unitPattern count="few">{0} أميال</unitPattern>
+				<unitPattern count="many">{0} ميلاً</unitPattern>
+				<unitPattern count="other">{0} ميل</unitPattern>
 			</unit>
 			<unit type="length-yard">
-				<displayName draft="contributed">ياردة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الياردات</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ياردة</unitPattern>
-				<unitPattern count="two" draft="contributed">ياردتان ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ياردات</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ياردة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الياردات</unitPattern>
+				<displayName>ياردة</displayName>
+				<unitPattern count="zero">ياردة</unitPattern>
+				<unitPattern count="one">ياردة</unitPattern>
+				<unitPattern count="two">ياردتان</unitPattern>
+				<unitPattern count="few">{0} ياردات</unitPattern>
+				<unitPattern count="many">{0} ياردة</unitPattern>
+				<unitPattern count="other">{0} ياردة</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>قدم</displayName>
+				<unitPattern count="zero">{0} قدم</unitPattern>
+				<unitPattern count="one">قدم</unitPattern>
+				<unitPattern count="two">قدمان</unitPattern>
+				<unitPattern count="few">{0} أقدام</unitPattern>
+				<unitPattern count="many">{0} قدمًا</unitPattern>
+				<unitPattern count="other">{0} قدم</unitPattern>
+				<perUnitPattern>{0} لكل قدم</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>بوصة</displayName>
+				<unitPattern count="zero">{0} بوصة</unitPattern>
+				<unitPattern count="one">{0} بوصة</unitPattern>
+				<unitPattern count="two">{0} بوصة</unitPattern>
+				<unitPattern count="few">{0} بوصة</unitPattern>
+				<unitPattern count="many">{0} بوصة</unitPattern>
+				<unitPattern count="other">{0} بوصة</unitPattern>
+				<perUnitPattern>{0}/بوصة</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>فرسخ فلكي</displayName>
+				<unitPattern count="zero">{0} فرسخ فلكي</unitPattern>
+				<unitPattern count="one">فرسخ فلكي</unitPattern>
+				<unitPattern count="two">فرسخان فلكيان</unitPattern>
+				<unitPattern count="few">{0} فراسخ فلكية</unitPattern>
+				<unitPattern count="many">{0} فرسخًا فلكيًا</unitPattern>
+				<unitPattern count="other">{0} فرسخ فلكي</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>سنة ضوئية</displayName>
+				<unitPattern count="zero">{0} سنة ضوئية</unitPattern>
+				<unitPattern count="one">سنة ضوئية</unitPattern>
+				<unitPattern count="two">سنتان ضوئيتان</unitPattern>
+				<unitPattern count="few">{0} سنوات ضوئية</unitPattern>
+				<unitPattern count="many">{0} سنة ضوئية</unitPattern>
+				<unitPattern count="other">{0} سنة ضوئية</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>وحدة فلكية</displayName>
+				<unitPattern count="zero">{0} وحدة فلكية</unitPattern>
+				<unitPattern count="one">وحدة فلكية</unitPattern>
+				<unitPattern count="two">وحدتان فلكيتان</unitPattern>
+				<unitPattern count="few">{0} وحدات فلكية</unitPattern>
+				<unitPattern count="many">{0} وحدة فلكية</unitPattern>
+				<unitPattern count="other">{0} من الوحدات الفلكية</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>ميل بحري</displayName>
+				<unitPattern count="zero">{0} ميل بحري</unitPattern>
+				<unitPattern count="one">ميل بحري</unitPattern>
+				<unitPattern count="two">ميلان بحريان</unitPattern>
+				<unitPattern count="few">{0} أميال بحرية</unitPattern>
+				<unitPattern count="many">{0} ميلاً بحريًا</unitPattern>
+				<unitPattern count="other">{0} ميل بحري</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>ميل اسكندنافي</displayName>
+				<unitPattern count="zero">{0} ميل اسكندنافي</unitPattern>
+				<unitPattern count="one">{0} ميل اسكندنافي</unitPattern>
+				<unitPattern count="two">{0} ميل اسكندنافي</unitPattern>
+				<unitPattern count="few">{0} ميل اسكندنافي</unitPattern>
+				<unitPattern count="many">{0} ميل اسكندنافي</unitPattern>
+				<unitPattern count="other">{0} ميل اسكندنافي</unitPattern>
 			</unit>
 			<unit type="light-lux">
-				<displayName draft="contributed">لكس</displayName>
-				<unitPattern count="zero" draft="contributed">{0} لكس</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} لكس</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} لكس</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} لكس</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} لكس</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} لكس</unitPattern>
+				<displayName>لكس</displayName>
+				<unitPattern count="zero">{0} لكس</unitPattern>
+				<unitPattern count="one">{0} لكس</unitPattern>
+				<unitPattern count="two">{0} لكس</unitPattern>
+				<unitPattern count="few">{0} لكس</unitPattern>
+				<unitPattern count="many">{0} لكس</unitPattern>
+				<unitPattern count="other">{0} لكس</unitPattern>
+			</unit>
+			<unit type="mass-metric-ton">
+				<displayName>طن متري</displayName>
+				<unitPattern count="zero">{0} طن متري</unitPattern>
+				<unitPattern count="one">{0} طن متري</unitPattern>
+				<unitPattern count="two">{0} طن متري</unitPattern>
+				<unitPattern count="few">{0} طن متري</unitPattern>
+				<unitPattern count="many">{0} طن متري</unitPattern>
+				<unitPattern count="other">{0} طن متري</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>كيلوغرام</displayName>
+				<unitPattern count="zero">{0} كيلوغرام</unitPattern>
+				<unitPattern count="one">{0} كيلوغرام</unitPattern>
+				<unitPattern count="two">{0} كيلوغرام</unitPattern>
+				<unitPattern count="few">{0} كيلوغرام</unitPattern>
+				<unitPattern count="many">{0} كيلوغرام</unitPattern>
+				<unitPattern count="other">{0} كيلوغرام</unitPattern>
+				<perUnitPattern>{0}/كيلوغرام</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>غرام</displayName>
+				<unitPattern count="zero">{0} غرام</unitPattern>
+				<unitPattern count="one">غرام ({0})</unitPattern>
+				<unitPattern count="two">غرامان ({0})</unitPattern>
+				<unitPattern count="few">{0} غرامات</unitPattern>
+				<unitPattern count="many">{0} غرامًا</unitPattern>
+				<unitPattern count="other">{0} غرام</unitPattern>
+				<perUnitPattern>{0}/غرام</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>ملليغرام</displayName>
+				<unitPattern count="zero">{0} ملليغرام</unitPattern>
+				<unitPattern count="one">{0} ملليغرام</unitPattern>
+				<unitPattern count="two">{0} ملليغرام</unitPattern>
+				<unitPattern count="few">{0} ملليغرام</unitPattern>
+				<unitPattern count="many">{0} ملليغرام</unitPattern>
+				<unitPattern count="other">{0} ملليغرام</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>ميكروغرام</displayName>
+				<unitPattern count="zero">{0} ميكروغرام</unitPattern>
+				<unitPattern count="one">{0} ميكروغرام</unitPattern>
+				<unitPattern count="two">{0} ميكروغرام</unitPattern>
+				<unitPattern count="few">{0} ميكروغرام</unitPattern>
+				<unitPattern count="many">{0} ميكروغرام</unitPattern>
+				<unitPattern count="other">{0} ميكروغرام</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>طن</displayName>
+				<unitPattern count="zero">{0} طن</unitPattern>
+				<unitPattern count="one">{0} طن</unitPattern>
+				<unitPattern count="two">{0} طن</unitPattern>
+				<unitPattern count="few">{0} طن</unitPattern>
+				<unitPattern count="many">{0} طن</unitPattern>
+				<unitPattern count="other">{0} طن</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>رطل</displayName>
+				<unitPattern count="zero">{0} رطل</unitPattern>
+				<unitPattern count="one">{0} رطل</unitPattern>
+				<unitPattern count="two">{0} رطل</unitPattern>
+				<unitPattern count="few">{0} رطل</unitPattern>
+				<unitPattern count="many">{0} رطل</unitPattern>
+				<unitPattern count="other">{0} رطل</unitPattern>
+				<perUnitPattern>{0}/رطل</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>أونصة</displayName>
+				<unitPattern count="zero">أونصة</unitPattern>
+				<unitPattern count="one">{0} أونصة</unitPattern>
+				<unitPattern count="two">أونصتان</unitPattern>
+				<unitPattern count="few">{0} أونصات</unitPattern>
+				<unitPattern count="many">{0} أونصة</unitPattern>
+				<unitPattern count="other">{0} أونصة</unitPattern>
+				<perUnitPattern>{0}/أونصة</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>أونصة ترويسية</displayName>
+				<unitPattern count="zero">{0} أونصة ترويسية</unitPattern>
+				<unitPattern count="one">{0} أونصة ترويسية</unitPattern>
+				<unitPattern count="two">أونصتان ترويسيتان</unitPattern>
+				<unitPattern count="few">{0} أونصات ترويسية</unitPattern>
+				<unitPattern count="many">{0} أونصة ترويسية</unitPattern>
+				<unitPattern count="other">{0} أونصة ترويسية</unitPattern>
 			</unit>
 			<unit type="mass-carat">
 				<displayName>قيراط</displayName>
 				<unitPattern count="zero">{0} قيراط</unitPattern>
 				<unitPattern count="one">{0} قيراط</unitPattern>
-				<unitPattern count="two">{0} قيراط</unitPattern>
-				<unitPattern count="few">{0} قيراط</unitPattern>
+				<unitPattern count="two">قيراطان</unitPattern>
+				<unitPattern count="few">{0} قراريط</unitPattern>
 				<unitPattern count="many">{0} قيراط</unitPattern>
 				<unitPattern count="other">{0} قيراط</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="contributed">غرام</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الغرامات</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} غرام</unitPattern>
-				<unitPattern count="two" draft="contributed">غرامان ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} غرامات</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} غرامًا</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الغرامات</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName draft="contributed">كيلوغرام</displayName>
-				<unitPattern count="zero" draft="contributed">{0} كيلوغرام</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كيلوغرام</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} كيلوغرام</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} كيلوغرام</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كيلوغرام</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كيلوغرام</unitPattern>
-			</unit>
-			<unit type="mass-metric-ton">
-				<displayName draft="contributed">طن متري</displayName>
-				<unitPattern count="zero" draft="contributed">{0} طن متري</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} طن متري</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} طن متري</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} طن متري</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} طن متري</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} طن متري</unitPattern>
-			</unit>
-			<unit type="mass-microgram">
-				<displayName draft="contributed">ميكروغرام</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ميكروغرام</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ميكروغرام</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ميكروغرام</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ميكروغرام</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ميكروغرام</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ميكروغرام</unitPattern>
-			</unit>
-			<unit type="mass-milligram">
-				<displayName draft="contributed">ملليغرام</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ملليغرام</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ملليغرام</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ملليغرام</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ملليغرام</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ملليغرام</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ملليغرام</unitPattern>
-			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="contributed">أونصة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} أونس</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} أونس</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} أونس</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أونس</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} أونس</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} أونس</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName draft="contributed">أونصة ترويسية</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الأونصات الترويسية</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} أونصة ترويسية</unitPattern>
-				<unitPattern count="two" draft="contributed">أونصتان ترويسيتان</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أونصات ترويسية</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} أونصة ترويسية</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الأونصات الترويسية</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName draft="contributed">رطل</displayName>
-				<unitPattern count="zero" draft="contributed">{0} رطل</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} رطل</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} رطل</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} رطل</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} رطل</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} رطل</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<displayName draft="contributed">طن</displayName>
-				<unitPattern count="zero" draft="contributed">{0} طن</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} طن</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} طن</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} طن</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} طن</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} طن</unitPattern>
-			</unit>
 			<unit type="power-gigawatt">
-				<displayName draft="contributed">غيغا واط</displayName>
-				<unitPattern count="zero" draft="contributed">{0} غيغا واط</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} غيغا واط</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} غيغا واط</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} غيغا واط</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} غيغا واط</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} غيغا واط</unitPattern>
-			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="contributed">قوة حصان</displayName>
-				<unitPattern count="zero" draft="contributed">{0} قوة حصان</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} قوة حصان</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} قوة حصان</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} قوة حصان</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} قوة حصان</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} قوة حصان</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName draft="contributed">كيلوواط</displayName>
-				<unitPattern count="zero" draft="contributed">{0} كيلوواط</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كيلوواط</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} كيلوواط</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} كيلوواط</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كيلوواط</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كيلوواط</unitPattern>
+				<displayName>غيغا واط</displayName>
+				<unitPattern count="zero">{0} غيغا واط</unitPattern>
+				<unitPattern count="one">{0} غيغا واط</unitPattern>
+				<unitPattern count="two">{0} غيغا واط</unitPattern>
+				<unitPattern count="few">{0} غيغا واط</unitPattern>
+				<unitPattern count="many">{0} غيغا واط</unitPattern>
+				<unitPattern count="other">{0} غيغا واط</unitPattern>
 			</unit>
 			<unit type="power-megawatt">
-				<displayName draft="contributed">ميغا واط</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ميغا واط</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ميغا واط</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ميغا واط</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ميغا واط</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ميغا واط</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ميغا واط</unitPattern>
+				<displayName>ميغا واط</displayName>
+				<unitPattern count="zero">{0} ميغا واط</unitPattern>
+				<unitPattern count="one">{0} ميغا واط</unitPattern>
+				<unitPattern count="two">{0} ميغا واط</unitPattern>
+				<unitPattern count="few">{0} ميغا واط</unitPattern>
+				<unitPattern count="many">{0} ميغا واط</unitPattern>
+				<unitPattern count="other">{0} ميغا واط</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName draft="contributed">مللي واط</displayName>
-				<unitPattern count="zero" draft="contributed">{0} مللي واط</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} مللي واط</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} مللي واط</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} مللي واط</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} مللي واط</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} مللي واط</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>كيلوواط</displayName>
+				<unitPattern count="zero">{0} كيلوواط</unitPattern>
+				<unitPattern count="one">{0} كيلوواط</unitPattern>
+				<unitPattern count="two">{0} كيلوواط</unitPattern>
+				<unitPattern count="few">{0} كيلوواط</unitPattern>
+				<unitPattern count="many">{0} كيلوواط</unitPattern>
+				<unitPattern count="other">{0} كيلوواط</unitPattern>
 			</unit>
 			<unit type="power-watt">
-				<displayName draft="contributed">واط</displayName>
-				<unitPattern count="zero" draft="contributed">{0} واط</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} واط</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} واط</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} واط</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} واط</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} واط</unitPattern>
+				<displayName>واط</displayName>
+				<unitPattern count="zero">{0} واط</unitPattern>
+				<unitPattern count="one">{0} واط</unitPattern>
+				<unitPattern count="two">{0} واط</unitPattern>
+				<unitPattern count="few">{0} واط</unitPattern>
+				<unitPattern count="many">{0} واط</unitPattern>
+				<unitPattern count="other">{0} واط</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>مللي واط</displayName>
+				<unitPattern count="zero">{0} مللي واط</unitPattern>
+				<unitPattern count="one">{0} مللي واط</unitPattern>
+				<unitPattern count="two">{0} مللي واط</unitPattern>
+				<unitPattern count="few">{0} مللي واط</unitPattern>
+				<unitPattern count="many">{0} مللي واط</unitPattern>
+				<unitPattern count="other">{0} مللي واط</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>قوة حصان</displayName>
+				<unitPattern count="zero">{0} قوة حصان</unitPattern>
+				<unitPattern count="one">{0} قوة حصان</unitPattern>
+				<unitPattern count="two">{0} قوة حصان</unitPattern>
+				<unitPattern count="few">{0} قوة حصان</unitPattern>
+				<unitPattern count="many">{0} قوة حصان</unitPattern>
+				<unitPattern count="other">{0} قوة حصان</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
-				<displayName draft="contributed">هكتوباسكال</displayName>
-				<unitPattern count="zero" draft="contributed">{0} هكتوباسكال</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} هكتوباسكال</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} هكتوباسكال</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} هكتوباسكال</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} هكتوباسكال</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} هكتوباسكال</unitPattern>
-			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName draft="contributed">بوصة زئبقية</displayName>
-				<unitPattern count="zero" draft="contributed">{0} بوصة زئبقية</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} بوصة زئبقية</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} بوصة زئبقية</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} بوصة زئبقية</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} بوصة زئبقية</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} بوصة زئبقية</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName draft="contributed">مللي بار</displayName>
-				<unitPattern count="zero" draft="contributed">{0} مللي بار</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} مللي بار</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} مللي بار</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} مللي بار</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} مللي بار</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} مللي بار</unitPattern>
+				<displayName>هكتوباسكال</displayName>
+				<unitPattern count="zero">{0} هكتوباسكال</unitPattern>
+				<unitPattern count="one">{0} هكتوباسكال</unitPattern>
+				<unitPattern count="two">{0} هكتوباسكال</unitPattern>
+				<unitPattern count="few">{0} هكتوباسكال</unitPattern>
+				<unitPattern count="many">{0} هكتوباسكال</unitPattern>
+				<unitPattern count="other">{0} هكتوباسكال</unitPattern>
 			</unit>
 			<unit type="pressure-millimeter-of-mercury">
-				<displayName draft="contributed">ملليمتر زئبقي</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ملليمتر زئبقي</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ملليمتر زئبقي</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ملليمتر زئبقي</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ملليمتر زئبقي</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ملليمتر زئبقي</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ملليمتر زئبقي</unitPattern>
+				<displayName>ملليمتر زئبقي</displayName>
+				<unitPattern count="zero">{0} ملليمتر زئبقي</unitPattern>
+				<unitPattern count="one">{0} ملليمتر زئبقي</unitPattern>
+				<unitPattern count="two">{0} ملليمتر زئبقي</unitPattern>
+				<unitPattern count="few">{0} ملليمتر زئبقي</unitPattern>
+				<unitPattern count="many">{0} ملليمتر زئبقي</unitPattern>
+				<unitPattern count="other">{0} ملليمتر زئبقي</unitPattern>
 			</unit>
 			<unit type="pressure-pound-per-square-inch">
-				<displayName draft="contributed">رطل لكل بوصة مربعة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} رطل لكل بوصة مربعة</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} رطل لكل بوصة مربعة</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} رطل لكل بوصة مربعة</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} رطل لكل بوصة مربعة</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} رطل لكل بوصة مربعة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} رطل لكل بوصة مربعة</unitPattern>
+				<displayName>رطل لكل بوصة مربعة</displayName>
+				<unitPattern count="zero">{0} رطل لكل بوصة مربعة</unitPattern>
+				<unitPattern count="one">{0} رطل لكل بوصة مربعة</unitPattern>
+				<unitPattern count="two">{0} رطل لكل بوصة مربعة</unitPattern>
+				<unitPattern count="few">{0} رطل لكل بوصة مربعة</unitPattern>
+				<unitPattern count="many">{0} رطل لكل بوصة مربعة</unitPattern>
+				<unitPattern count="other">{0} رطل لكل بوصة مربعة</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName draft="contributed">قيراط</displayName>
-				<unitPattern count="zero" draft="contributed">{0} قيراط</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} قيراط</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} قيراط</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} قيراط</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} قيراط</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} قيراط</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>بوصة زئبقية</displayName>
+				<unitPattern count="zero">{0} بوصة زئبقية</unitPattern>
+				<unitPattern count="one">{0} بوصة زئبقية</unitPattern>
+				<unitPattern count="two">{0} بوصة زئبقية</unitPattern>
+				<unitPattern count="few">{0} بوصة زئبقية</unitPattern>
+				<unitPattern count="many">{0} بوصة زئبقية</unitPattern>
+				<unitPattern count="other">{0} بوصة زئبقية</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>مللي بار</displayName>
+				<unitPattern count="zero">{0} مللي بار</unitPattern>
+				<unitPattern count="one">{0} مللي بار</unitPattern>
+				<unitPattern count="two">{0} مللي بار</unitPattern>
+				<unitPattern count="few">{0} مللي بار</unitPattern>
+				<unitPattern count="many">{0} مللي بار</unitPattern>
+				<unitPattern count="other">{0} مللي بار</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName draft="contributed">كيلومتر في الساعة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} كيلومتر في الساعة</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كيلومتر في الساعة</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} كيلومتر في الساعة</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} كيلومتر في الساعة</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كيلومتر في الساعة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كيلومتر في الساعة</unitPattern>
+				<displayName>كيلومتر في الساعة</displayName>
+				<unitPattern count="zero">{0} كيلومتر في الساعة</unitPattern>
+				<unitPattern count="one">{0} كيلومتر في الساعة</unitPattern>
+				<unitPattern count="two">{0} كيلومتر في الساعة</unitPattern>
+				<unitPattern count="few">{0} كيلومتر في الساعة</unitPattern>
+				<unitPattern count="many">{0} كيلومتر في الساعة</unitPattern>
+				<unitPattern count="other">{0} كيلومتر في الساعة</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
-				<displayName draft="contributed">متر في الثانية</displayName>
-				<unitPattern count="zero" draft="contributed">{0} متر في الثانية</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} متر في الثانية</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} متر في الثانية</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} متر في الثانية</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} متر في الثانية</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} متر في الثانية</unitPattern>
+				<displayName>متر في الثانية</displayName>
+				<unitPattern count="zero">{0} متر في الثانية</unitPattern>
+				<unitPattern count="one">{0} متر في الثانية</unitPattern>
+				<unitPattern count="two">{0} متر في الثانية</unitPattern>
+				<unitPattern count="few">{0} متر في الثانية</unitPattern>
+				<unitPattern count="many">{0} متر في الثانية</unitPattern>
+				<unitPattern count="other">{0} متر في الثانية</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<displayName draft="contributed">ميل في الساعة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ميل في الساعة</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ميل في الساعة</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ميل في الساعة</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ميل في الساعة</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ميل في الساعة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ميل في الساعة</unitPattern>
+				<displayName>ميل في الساعة</displayName>
+				<unitPattern count="zero">{0} ميل في الساعة</unitPattern>
+				<unitPattern count="one">{0} ميل في الساعة</unitPattern>
+				<unitPattern count="two">{0} ميل في الساعة</unitPattern>
+				<unitPattern count="few">{0} ميل في الساعة</unitPattern>
+				<unitPattern count="many">{0} ميل في الساعة</unitPattern>
+				<unitPattern count="other">{0} ميل في الساعة</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>عقدة</displayName>
+				<unitPattern count="zero">{0} عقدة</unitPattern>
+				<unitPattern count="one">{0} عقدة</unitPattern>
+				<unitPattern count="two">{0} عقدة</unitPattern>
+				<unitPattern count="few">{0} عقدة</unitPattern>
+				<unitPattern count="many">{0} عقدة</unitPattern>
+				<unitPattern count="other">{0} عقدة</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="zero">{0}°</unitPattern>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="two">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
 				<displayName>درجة مئوية</displayName>
@@ -8405,451 +8778,549 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} درجة كلفن</unitPattern>
 				<unitPattern count="other">{0} درجة كلفن</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName draft="contributed">فدان قدم</displayName>
-				<unitPattern count="zero" draft="contributed">{0} فدان قدم</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} فدان قدم</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} فدان قدم</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} فدان قدم</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} فدان قدم</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} فدان قدم</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName draft="contributed">سنتيلتر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} سنتيلتر</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} سنتيلتر</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} سنتيلتر</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} سنتيلتر</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} سنتيلتر</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} سنتيلتر</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName draft="contributed">سنتيمتر مكعب</displayName>
-				<unitPattern count="zero" draft="contributed">{0} سنتيمتر مكعب</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} سنتيمتر مكعب</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} سنتيمتر مكعب</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} سنتيمتر مكعب</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} سنتيمتر مكعب</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} سنتيمتر مكعب</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName draft="contributed">قدم مكعبة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الأقدام المكعبة</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} قدم مكعبة</unitPattern>
-				<unitPattern count="two" draft="contributed">قدمان مكعبان</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أقدام مكعبة</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} قدمًا مكعبًا</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الأقدام المكعبة</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName draft="contributed">بوصة مكعبة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} بوصة مكعبة</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} بوصة مكعبة</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} بوصة مكعبة</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} بوصة مكعبة</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} بوصة مكعبة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} بوصة مكعبة</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
-				<displayName draft="contributed">كيلومتر مكعب</displayName>
-				<unitPattern count="zero" draft="contributed">{0} كيلومتر مكعب</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كيلومتر مكعب</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} كيلومتر مكعب</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} كيلومتر مكعب</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كيلومتر مكعب</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كيلومتر مكعب</unitPattern>
+				<displayName>كيلومتر مكعب</displayName>
+				<unitPattern count="zero">{0} كيلومتر مكعب</unitPattern>
+				<unitPattern count="one">{0} كيلومتر مكعب</unitPattern>
+				<unitPattern count="two">{0} كيلومتر مكعب</unitPattern>
+				<unitPattern count="few">{0} كيلومتر مكعب</unitPattern>
+				<unitPattern count="many">{0} كيلومتر مكعب</unitPattern>
+				<unitPattern count="other">{0} كيلومتر مكعب</unitPattern>
 			</unit>
 			<unit type="volume-cubic-meter">
-				<displayName draft="contributed">متر مكعب</displayName>
-				<unitPattern count="zero" draft="contributed">{0} متر مكعب</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} متر مكعب</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} متر مكعب</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} متر مكعب</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} متر مكعب</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} متر مكعب</unitPattern>
+				<displayName>متر مكعب</displayName>
+				<unitPattern count="zero">{0} متر مكعب</unitPattern>
+				<unitPattern count="one">{0} متر مكعب</unitPattern>
+				<unitPattern count="two">{0} متر مكعب</unitPattern>
+				<unitPattern count="few">{0} متر مكعب</unitPattern>
+				<unitPattern count="many">{0} متر مكعب</unitPattern>
+				<unitPattern count="other">{0} متر مكعب</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>سنتيمتر مكعب</displayName>
+				<unitPattern count="zero">{0} سنتيمتر مكعب</unitPattern>
+				<unitPattern count="one">{0} سنتيمتر مكعب</unitPattern>
+				<unitPattern count="two">{0} سنتيمتر مكعب</unitPattern>
+				<unitPattern count="few">{0} سنتيمتر مكعب</unitPattern>
+				<unitPattern count="many">{0} سنتيمتر مكعب</unitPattern>
+				<unitPattern count="other">{0} سنتيمتر مكعب</unitPattern>
+				<perUnitPattern>{0}/سنتيمتر مكعب</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
-				<displayName draft="contributed">ميل مكعب</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ميل مكعب</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ميل مكعب</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ميل مكعب</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ميل مكعب</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ميل مكعب</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ميل مكعب</unitPattern>
+				<displayName>ميل مكعب</displayName>
+				<unitPattern count="zero">{0} ميل مكعب</unitPattern>
+				<unitPattern count="one">{0} ميل مكعب</unitPattern>
+				<unitPattern count="two">{0} ميل مكعب</unitPattern>
+				<unitPattern count="few">{0} ميل مكعب</unitPattern>
+				<unitPattern count="many">{0} ميل مكعب</unitPattern>
+				<unitPattern count="other">{0} ميل مكعب</unitPattern>
 			</unit>
 			<unit type="volume-cubic-yard">
-				<displayName draft="contributed">ياردة مكعبة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ياردة مكعبة</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ياردة مكعبة</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ياردة مكعبة</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ياردة مكعبة</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ياردة مكعبة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ياردة مكعبة</unitPattern>
+				<displayName>ياردة مكعبة</displayName>
+				<unitPattern count="zero">{0} ياردة مكعبة</unitPattern>
+				<unitPattern count="one">{0} ياردة مكعبة</unitPattern>
+				<unitPattern count="two">{0} ياردة مكعبة</unitPattern>
+				<unitPattern count="few">{0} ياردة مكعبة</unitPattern>
+				<unitPattern count="many">{0} ياردة مكعبة</unitPattern>
+				<unitPattern count="other">{0} ياردة مكعبة</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName draft="contributed">كوب</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الأكواب</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كوب</unitPattern>
-				<unitPattern count="two" draft="contributed">كوبان</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أكواب</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كوبًا</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الأكواب</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>قدم مكعبة</displayName>
+				<unitPattern count="zero">{0} قدم مكعبة</unitPattern>
+				<unitPattern count="one">قدم مكعبة</unitPattern>
+				<unitPattern count="two">قدمان مكعبان</unitPattern>
+				<unitPattern count="few">{0} أقدام مكعبة</unitPattern>
+				<unitPattern count="many">{0} قدمًا مكعبًا</unitPattern>
+				<unitPattern count="other">{0} قدم مكعبة</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName draft="contributed">ديسيلتر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ديسيلتر</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ديسيلتر</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ديسيلتر</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ديسيلتر</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ديسيلتر</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ديسيلتر</unitPattern>
-			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName draft="contributed">أونصة سائلة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الأونصات السائلة</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} أونصة سائلة</unitPattern>
-				<unitPattern count="two" draft="contributed">أونصتان سائلتان</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أونصات سائلة</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} أونصة سائلة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الأونصات السائلة</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName draft="contributed">غالون</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الغالونات</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} غالون</unitPattern>
-				<unitPattern count="two" draft="contributed">غالونان</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} غالونات</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} غالونًا</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الغالونات</unitPattern>
-			</unit>
-			<unit type="volume-hectoliter">
-				<displayName draft="contributed">هكتولتر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} هكتولتر</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} هكتولتر</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} هكتولتر</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} هكتولتر</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} هكتولتر</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} هكتولتر</unitPattern>
-			</unit>
-			<unit type="volume-liter">
-				<displayName draft="contributed">لتر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من اللترات</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} لتر</unitPattern>
-				<unitPattern count="two" draft="contributed">لتران ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} لترات</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} لترًا</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من اللترات</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>بوصة مكعبة</displayName>
+				<unitPattern count="zero">{0} بوصة مكعبة</unitPattern>
+				<unitPattern count="one">{0} بوصة مكعبة</unitPattern>
+				<unitPattern count="two">{0} بوصة مكعبة</unitPattern>
+				<unitPattern count="few">{0} بوصة مكعبة</unitPattern>
+				<unitPattern count="many">{0} بوصة مكعبة</unitPattern>
+				<unitPattern count="other">{0} بوصة مكعبة</unitPattern>
 			</unit>
 			<unit type="volume-megaliter">
-				<displayName draft="contributed">ميغالتر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ميغالتر</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ميغالتر</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ميغالتر</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ميغالتر</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ميغالتر</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ميغالتر</unitPattern>
+				<displayName>ميغالتر</displayName>
+				<unitPattern count="zero">{0} ميغالتر</unitPattern>
+				<unitPattern count="one">{0} ميغالتر</unitPattern>
+				<unitPattern count="two">{0} ميغالتر</unitPattern>
+				<unitPattern count="few">{0} ميغالتر</unitPattern>
+				<unitPattern count="many">{0} ميغالتر</unitPattern>
+				<unitPattern count="other">{0} ميغالتر</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>هكتولتر</displayName>
+				<unitPattern count="zero">{0} هكتولتر</unitPattern>
+				<unitPattern count="one">{0} هكتولتر</unitPattern>
+				<unitPattern count="two">{0} هكتولتر</unitPattern>
+				<unitPattern count="few">{0} هكتولتر</unitPattern>
+				<unitPattern count="many">{0} هكتولتر</unitPattern>
+				<unitPattern count="other">{0} هكتولتر</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>لتر</displayName>
+				<unitPattern count="zero">{0} لتر</unitPattern>
+				<unitPattern count="one">لتر</unitPattern>
+				<unitPattern count="two">لتران</unitPattern>
+				<unitPattern count="few">{0} لترات</unitPattern>
+				<unitPattern count="many">{0} لترًا</unitPattern>
+				<unitPattern count="other">{0} لتر</unitPattern>
+				<perUnitPattern>{0} لكل لتر</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>ديسيلتر</displayName>
+				<unitPattern count="zero">{0} ديسيلتر</unitPattern>
+				<unitPattern count="one">{0} ديسيلتر</unitPattern>
+				<unitPattern count="two">{0} ديسيلتر</unitPattern>
+				<unitPattern count="few">{0} ديسيلتر</unitPattern>
+				<unitPattern count="many">{0} ديسيلتر</unitPattern>
+				<unitPattern count="other">{0} ديسيلتر</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>سنتيلتر</displayName>
+				<unitPattern count="zero">{0} سنتيلتر</unitPattern>
+				<unitPattern count="one">{0} سنتيلتر</unitPattern>
+				<unitPattern count="two">{0} سنتيلتر</unitPattern>
+				<unitPattern count="few">{0} سنتيلتر</unitPattern>
+				<unitPattern count="many">{0} سنتيلتر</unitPattern>
+				<unitPattern count="other">{0} سنتيلتر</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
-				<displayName draft="contributed">ملليلتر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ملليلتر</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ملليلتر</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ملليلتر</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ملليلتر</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ملليلتر</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ملليلتر</unitPattern>
+				<displayName>ملليلتر</displayName>
+				<unitPattern count="zero">{0} ملليلتر</unitPattern>
+				<unitPattern count="one">{0} ملليلتر</unitPattern>
+				<unitPattern count="two">{0} ملليلتر</unitPattern>
+				<unitPattern count="few">{0} ملليلتر</unitPattern>
+				<unitPattern count="many">{0} ملليلتر</unitPattern>
+				<unitPattern count="other">{0} ملليلتر</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName draft="contributed">باينت</displayName>
-				<unitPattern count="zero" draft="contributed">{0} باينت</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} باينت</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} باينت</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} باينت</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} باينت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} باينت</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>مكيال متري</displayName>
+				<unitPattern count="zero">{0} مكيال متري</unitPattern>
+				<unitPattern count="one">{0} مكيال متري</unitPattern>
+				<unitPattern count="two">{0} مكيال متري</unitPattern>
+				<unitPattern count="few">{0} مكيال متري</unitPattern>
+				<unitPattern count="many">{0} مكيال متري</unitPattern>
+				<unitPattern count="other">{0} مكيال متري</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>كوب متري</displayName>
+				<unitPattern count="zero">{0} كوب متري</unitPattern>
+				<unitPattern count="one">{0} كوب متري</unitPattern>
+				<unitPattern count="two">{0} كوب متري</unitPattern>
+				<unitPattern count="few">{0} كوب متري</unitPattern>
+				<unitPattern count="many">{0} كوب متري</unitPattern>
+				<unitPattern count="other">{0} كوب متري</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>فدان قدم</displayName>
+				<unitPattern count="zero">{0} فدان قدم</unitPattern>
+				<unitPattern count="one">{0} فدان قدم</unitPattern>
+				<unitPattern count="two">{0} فدان قدم</unitPattern>
+				<unitPattern count="few">{0} فدان قدم</unitPattern>
+				<unitPattern count="many">{0} فدان قدم</unitPattern>
+				<unitPattern count="other">{0} فدان قدم</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>غالون</displayName>
+				<unitPattern count="zero">{0} غالون</unitPattern>
+				<unitPattern count="one">غالون</unitPattern>
+				<unitPattern count="two">غالونان</unitPattern>
+				<unitPattern count="few">{0} غالونات</unitPattern>
+				<unitPattern count="many">{0} غالونًا</unitPattern>
+				<unitPattern count="other">{0} غالون</unitPattern>
+				<perUnitPattern>{0} لكل غالون</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
-				<displayName draft="contributed">ربع غالون</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من أرباع الغالون</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ربع غالون</unitPattern>
-				<unitPattern count="two" draft="contributed">نصف غالون</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أرباع غالون</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ربع غالون</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من أرباع الغالون</unitPattern>
+				<displayName>ربع غالون</displayName>
+				<unitPattern count="zero">{0} ربع غالون</unitPattern>
+				<unitPattern count="one">ربع غالون</unitPattern>
+				<unitPattern count="two">نصف غالون</unitPattern>
+				<unitPattern count="few">{0} أرباع غالون</unitPattern>
+				<unitPattern count="many">{0} ربع غالون</unitPattern>
+				<unitPattern count="other">{0} ربع غالون</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>مكيال</displayName>
+				<unitPattern count="zero">{0} مكيال</unitPattern>
+				<unitPattern count="one">مكيال</unitPattern>
+				<unitPattern count="two">مكيالان</unitPattern>
+				<unitPattern count="few">{0} مكاييل</unitPattern>
+				<unitPattern count="many">{0} مكيالاً</unitPattern>
+				<unitPattern count="other">{0} مكيال</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>كوب</displayName>
+				<unitPattern count="zero">{0} كوب</unitPattern>
+				<unitPattern count="one">كوب</unitPattern>
+				<unitPattern count="two">كوبان</unitPattern>
+				<unitPattern count="few">{0} أكواب</unitPattern>
+				<unitPattern count="many">{0} كوبًا</unitPattern>
+				<unitPattern count="other">{0} كوب</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>أونصة سائلة</displayName>
+				<unitPattern count="zero">{0} أونصة سائلة</unitPattern>
+				<unitPattern count="one">أونصة سائلة</unitPattern>
+				<unitPattern count="two">أونصتان سائلتان</unitPattern>
+				<unitPattern count="few">{0} أونصات سائلة</unitPattern>
+				<unitPattern count="many">{0} أونصة سائلة</unitPattern>
+				<unitPattern count="other">{0} أونصة سائلة</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
-				<displayName draft="contributed">ملعقة المائدة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من ملاعق المائدة</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ملعقة مائدة</unitPattern>
-				<unitPattern count="two" draft="contributed">ملعقتا مائدة</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ملاعق مائدة</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ملعقة مائدة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من ملاعق المائدة</unitPattern>
+				<displayName>ملعقة المائدة</displayName>
+				<unitPattern count="zero">{0} ملعقة مائدة</unitPattern>
+				<unitPattern count="one">ملعقة مائدة</unitPattern>
+				<unitPattern count="two">ملعقتا مائدة</unitPattern>
+				<unitPattern count="few">{0} ملاعق مائدة</unitPattern>
+				<unitPattern count="many">{0} ملعقة مائدة</unitPattern>
+				<unitPattern count="other">{0} ملعقة مائدة</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
-				<displayName draft="contributed">ملعقة شاي</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من ملاعق الشاي</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ملعقة شاي</unitPattern>
-				<unitPattern count="two" draft="contributed">ملعقتا شاي</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ملاعق شاي</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ملعقة شاي</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من ملاعق الشاي</unitPattern>
+				<displayName>ملعقة شاي</displayName>
+				<unitPattern count="zero">{0} ملعقة شاي</unitPattern>
+				<unitPattern count="one">ملعقة شاي</unitPattern>
+				<unitPattern count="two">ملعقتا شاي</unitPattern>
+				<unitPattern count="few">{0} ملاعق شاي</unitPattern>
+				<unitPattern count="many">{0} ملعقة شاي</unitPattern>
+				<unitPattern count="other">{0} ملعقة شاي</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} شرقًا</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} شمالاً</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} جنوبًا</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} غربًا</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
-				<displayName draft="contributed">قوة تسارع</displayName>
-				<unitPattern count="zero" draft="contributed">{0} قوة تسارع</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} قوة تسارع</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} قوة تسارع</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} قوة تسارع</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} قوة تسارع</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} قوة تسارع</unitPattern>
+				<displayName>قوة تسارع</displayName>
+				<unitPattern count="zero">{0} قوة تسارع</unitPattern>
+				<unitPattern count="one">{0} قوة تسارع</unitPattern>
+				<unitPattern count="two">{0} قوة تسارع</unitPattern>
+				<unitPattern count="few">{0} قوة تسارع</unitPattern>
+				<unitPattern count="many">{0} قوة تسارع</unitPattern>
+				<unitPattern count="other">{0} قوة تسارع</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
-				<displayName draft="contributed">م/ث²</displayName>
-				<unitPattern count="zero" draft="contributed">{0} م/ث²</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} م/ث²</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} م/ث²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} م/ث²</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} م/ث²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} م/ث²</unitPattern>
+				<displayName>م/ث²</displayName>
+				<unitPattern count="zero">{0} م/ث²</unitPattern>
+				<unitPattern count="one">{0} م/ث²</unitPattern>
+				<unitPattern count="two">{0} م/ث²</unitPattern>
+				<unitPattern count="few">{0} م/ث²</unitPattern>
+				<unitPattern count="many">{0} م/ث²</unitPattern>
+				<unitPattern count="other">{0} م/ث²</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName draft="contributed">دقيقة قوسية</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الدقائق</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} دقيقة</unitPattern>
-				<unitPattern count="two" draft="contributed">دقيقتان ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} دقائق</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} دقيقة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الدقائق</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName draft="contributed">ثانية قوسية</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الثواني</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ثانية</unitPattern>
-				<unitPattern count="two" draft="contributed">ثانيتان ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ثوانٍ</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ثانية</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الثواني</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName draft="contributed">درجة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الدرجات</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} درجة</unitPattern>
-				<unitPattern count="two" draft="contributed">درجتان ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} درجات</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} درجة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الدرجات</unitPattern>
+			<unit type="angle-revolution">
+				<displayName>دورة</displayName>
+				<unitPattern count="zero">{0} دورة</unitPattern>
+				<unitPattern count="one">دورة ({0})</unitPattern>
+				<unitPattern count="two">دورتان ({0})</unitPattern>
+				<unitPattern count="few">{0} دورات</unitPattern>
+				<unitPattern count="many">{0} دورة</unitPattern>
+				<unitPattern count="other">{0} دورة</unitPattern>
 			</unit>
 			<unit type="angle-radian">
-				<displayName draft="contributed">راديان</displayName>
-				<unitPattern count="zero" draft="contributed">{0} راديان</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} راديان</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} راديان</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} راديان</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} راديان</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} راديان</unitPattern>
+				<displayName>راديان</displayName>
+				<unitPattern count="zero">{0} راديان</unitPattern>
+				<unitPattern count="one">{0} راديان</unitPattern>
+				<unitPattern count="two">{0} راديان</unitPattern>
+				<unitPattern count="few">{0} راديان</unitPattern>
+				<unitPattern count="many">{0} راديان</unitPattern>
+				<unitPattern count="other">{0} راديان</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName draft="contributed">فدان</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الفدادين</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} فدان</unitPattern>
-				<unitPattern count="two" draft="contributed">فدانان ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} فدادين</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} فدانًا</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الفدادين</unitPattern>
+			<unit type="angle-degree">
+				<displayName>درجة</displayName>
+				<unitPattern count="zero">{0} درجة</unitPattern>
+				<unitPattern count="one">{0} درجة</unitPattern>
+				<unitPattern count="two">درجتان ({0})</unitPattern>
+				<unitPattern count="few">{0} درجات</unitPattern>
+				<unitPattern count="many">{0} درجة</unitPattern>
+				<unitPattern count="other">{0} درجة</unitPattern>
 			</unit>
-			<unit type="area-hectare">
-				<displayName draft="contributed">هكتار</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الهكتارات</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} هكتار</unitPattern>
-				<unitPattern count="two" draft="contributed">هكتاران ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} هكتارات</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} هكتارًا</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الهكتارات</unitPattern>
+			<unit type="angle-arc-minute">
+				<displayName>دقيقة قوسية</displayName>
+				<unitPattern count="zero">{0} دقيقة قوسية</unitPattern>
+				<unitPattern count="one">{0} دقيقة قوسية</unitPattern>
+				<unitPattern count="two">دقيقتان قوسيتان</unitPattern>
+				<unitPattern count="few">{0} دقائق قوسية</unitPattern>
+				<unitPattern count="many">{0} دقيقة قوسية</unitPattern>
+				<unitPattern count="other">{0} دقيقة قوسية</unitPattern>
 			</unit>
-			<unit type="area-square-centimeter">
-				<displayName draft="contributed">سم ²</displayName>
-				<unitPattern count="zero" draft="contributed">{0} سم ²</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} سم ²</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} سم ²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} سم ²</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} سم ²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} سم ²</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<displayName draft="contributed">قدم مربعة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الأقدام المربعة</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} قدم مربعة</unitPattern>
-				<unitPattern count="two" draft="contributed">قدمان مربعان ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أقدام مربعة</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} قدمًا مربعًا</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الأقدام المربعة</unitPattern>
-			</unit>
-			<unit type="area-square-inch">
-				<displayName draft="contributed">بوصة مربعة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} بوصة مربعة</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} بوصة مربعة</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} بوصة مربعة</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} بوصة مربعة</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} بوصة مربعة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} بوصة مربعة</unitPattern>
+			<unit type="angle-arc-second">
+				<displayName>ثانية قوسية</displayName>
+				<unitPattern count="zero">{0} ثانية قوسية</unitPattern>
+				<unitPattern count="one">{0} ثانية قوسية</unitPattern>
+				<unitPattern count="two">ثانيتان قوسيتان</unitPattern>
+				<unitPattern count="few">{0} ثوانٍ قوسية</unitPattern>
+				<unitPattern count="many">{0} ثانية قوسية</unitPattern>
+				<unitPattern count="other">{0} ثانية قوسية</unitPattern>
 			</unit>
 			<unit type="area-square-kilometer">
-				<displayName draft="contributed">كم²</displayName>
-				<unitPattern count="zero" draft="contributed">{0} كم²</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كم²</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} كم²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} كم²</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كم²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كم²</unitPattern>
+				<displayName>كم²</displayName>
+				<unitPattern count="zero">{0} كم²</unitPattern>
+				<unitPattern count="one">{0} كم²</unitPattern>
+				<unitPattern count="two">{0} كم²</unitPattern>
+				<unitPattern count="few">{0} كم²</unitPattern>
+				<unitPattern count="many">{0} كم²</unitPattern>
+				<unitPattern count="other">{0} كم²</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>هكتار</displayName>
+				<unitPattern count="zero">{0} هكتار</unitPattern>
+				<unitPattern count="one">{0} هكتار</unitPattern>
+				<unitPattern count="two">هكتاران</unitPattern>
+				<unitPattern count="few">{0} هكتارات</unitPattern>
+				<unitPattern count="many">{0} هكتار</unitPattern>
+				<unitPattern count="other">{0} هكتار</unitPattern>
 			</unit>
 			<unit type="area-square-meter">
-				<displayName draft="contributed">م²</displayName>
-				<unitPattern count="zero" draft="contributed">{0} م²</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} م²</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} م²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} م²</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} م²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} م²</unitPattern>
+				<displayName>م²</displayName>
+				<unitPattern count="zero">{0} م²</unitPattern>
+				<unitPattern count="one">{0} م²</unitPattern>
+				<unitPattern count="two">{0} م²</unitPattern>
+				<unitPattern count="few">{0} م²</unitPattern>
+				<unitPattern count="many">{0} م²</unitPattern>
+				<unitPattern count="other">{0} م²</unitPattern>
+				<perUnitPattern>{0}/م²</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>سم ²</displayName>
+				<unitPattern count="zero">{0} سم²</unitPattern>
+				<unitPattern count="one">{0} سم²</unitPattern>
+				<unitPattern count="two">{0} سم²</unitPattern>
+				<unitPattern count="few">{0} سم²</unitPattern>
+				<unitPattern count="many">{0} سم²</unitPattern>
+				<unitPattern count="other">{0} سم²</unitPattern>
+				<perUnitPattern>{0}/سم²</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
-				<displayName draft="contributed">ميل مربع</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ميل مربع</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ميل مربع</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ميل مربع</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ميل مربع</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ميل مربع</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ميل مربع</unitPattern>
+				<displayName>ميل مربع</displayName>
+				<unitPattern count="zero">{0} ميل مربع</unitPattern>
+				<unitPattern count="one">{0} ميل مربع</unitPattern>
+				<unitPattern count="two">{0} ميل مربع</unitPattern>
+				<unitPattern count="few">{0} ميل مربع</unitPattern>
+				<unitPattern count="many">{0} ميل مربع</unitPattern>
+				<unitPattern count="other">{0} ميل مربع</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>فدان</displayName>
+				<unitPattern count="zero">{0} فدان</unitPattern>
+				<unitPattern count="one">فدان</unitPattern>
+				<unitPattern count="two">فدانان</unitPattern>
+				<unitPattern count="few">{0} فدادين</unitPattern>
+				<unitPattern count="many">{0} فدانًا</unitPattern>
+				<unitPattern count="other">{0} فدان</unitPattern>
 			</unit>
 			<unit type="area-square-yard">
-				<displayName draft="contributed">ياردة مربعة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ياردة مربعة</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ياردة مربعة</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ياردة مربعة</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ياردة مربعة</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ياردة مربعة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ياردة مربعة</unitPattern>
+				<displayName>ياردة مربعة</displayName>
+				<unitPattern count="zero">{0} ياردة مربعة</unitPattern>
+				<unitPattern count="one">{0} ياردة مربعة</unitPattern>
+				<unitPattern count="two">{0} ياردة مربعة</unitPattern>
+				<unitPattern count="few">{0} ياردة مربعة</unitPattern>
+				<unitPattern count="many">{0} ياردة مربعة</unitPattern>
+				<unitPattern count="other">{0} ياردة مربعة</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>قدم مربعة</displayName>
+				<unitPattern count="zero">{0} قدم مربعة</unitPattern>
+				<unitPattern count="one">قدم مربعة</unitPattern>
+				<unitPattern count="two">قدمان مربعان</unitPattern>
+				<unitPattern count="few">{0} أقدام مربعة</unitPattern>
+				<unitPattern count="many">{0} قدمًا مربعًا</unitPattern>
+				<unitPattern count="other">{0} قدم مربعة</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>بوصة مربعة</displayName>
+				<unitPattern count="zero">{0} بوصة مربعة</unitPattern>
+				<unitPattern count="one">{0} بوصة مربعة</unitPattern>
+				<unitPattern count="two">{0} بوصة مربعة</unitPattern>
+				<unitPattern count="few">{0} بوصة مربعة</unitPattern>
+				<unitPattern count="many">{0} بوصة مربعة</unitPattern>
+				<unitPattern count="other">{0} بوصة مربعة</unitPattern>
+				<perUnitPattern>{0}/بوصة مربعة</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>قيراط</displayName>
+				<unitPattern count="zero">{0} قيراط</unitPattern>
+				<unitPattern count="one">{0} قيراط</unitPattern>
+				<unitPattern count="two">{0} قيراط</unitPattern>
+				<unitPattern count="few">{0} قيراط</unitPattern>
+				<unitPattern count="many">{0} قيراط</unitPattern>
+				<unitPattern count="other">{0} قيراط</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName draft="contributed">لتر/كم</displayName>
-				<unitPattern count="zero" draft="contributed">{0} لتر/كم</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} لتر/كم</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} لتر/كم</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} لتر/كم</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} لتر/كم</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} لتر/كم</unitPattern>
+				<displayName>لتر/كم</displayName>
+				<unitPattern count="zero">{0} لتر/كم</unitPattern>
+				<unitPattern count="one">{0} لتر/كم</unitPattern>
+				<unitPattern count="two">{0} لتر/كم</unitPattern>
+				<unitPattern count="few">{0} لتر/كم</unitPattern>
+				<unitPattern count="many">{0} لتر/كم</unitPattern>
+				<unitPattern count="other">{0} لتر/كم</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName draft="contributed">لتر/‏١٠٠ كم</displayName>
+				<unitPattern count="zero" draft="contributed">{0} لتر/١٠٠ كم</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} لتر/١٠٠ كم</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} لتر/١٠٠ كم</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} لتر/١٠٠ كم</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} لتر/١٠٠ كم</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} لتر/١٠٠ كم</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
-				<displayName draft="contributed">ميل/غالون</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ميل/غالون</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ميل/غالون</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ميل/غالون</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ميل/غالون</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ميل/غالون</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ميل/غالون</unitPattern>
-			</unit>
-			<unit type="digital-bit">
-				<displayName draft="contributed">بت</displayName>
-				<unitPattern count="zero" draft="contributed">{0} بت</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} بت</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} بت</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} بت</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} بت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} بت</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName draft="contributed">بايت</displayName>
-				<unitPattern count="zero" draft="contributed">{0} بايت</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} بايت</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} بايت</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} بايت</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} بايت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} بايت</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName draft="contributed">غيغابت</displayName>
-				<unitPattern count="zero" draft="contributed">{0} غيغابت</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} غيغابت</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} غيغابت</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} غيغابت</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} غيغابت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} غيغابت</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName draft="contributed">غيغابايت</displayName>
-				<unitPattern count="zero" draft="contributed">{0} غيغابايت</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} غيغابايت</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} غيغابايت</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} غيغابايت</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} غيغابايت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} غيغابايت</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName draft="contributed">كيلوبت</displayName>
-				<unitPattern count="zero" draft="contributed">{0} كيلوبت</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كيلوبت</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} كيلوبت</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} كيلوبت</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كيلوبت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كيلوبت</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName draft="contributed">كيلوبايت</displayName>
-				<unitPattern count="zero" draft="contributed">{0} كيلوبايت</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كيلوبايت</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} كيلوبايت</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} كيلوبايت</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كيلوبايت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كيلوبايت</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName draft="contributed">ميغابت</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ميغابت</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ميغابت</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ميغابت</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ميغابت</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ميغابت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ميغابت</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName draft="contributed">ميغابايت</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ميغابايت</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ميغابايت</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ميغابايت</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ميغابايت</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ميغابايت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ميغابايت</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName draft="contributed">تيرابت</displayName>
-				<unitPattern count="zero" draft="contributed">{0} تيرابت</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} تيرابت</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} تيرابت</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} تيرابت</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} تيرابت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} تيرابت</unitPattern>
+				<displayName>ميل/غالون</displayName>
+				<unitPattern count="zero">{0} ميل/غالون</unitPattern>
+				<unitPattern count="one">{0} ميل/غالون</unitPattern>
+				<unitPattern count="two">{0} ميل/غالون</unitPattern>
+				<unitPattern count="few">{0} ميل/غالون</unitPattern>
+				<unitPattern count="many">{0} ميل/غالون</unitPattern>
+				<unitPattern count="other">{0} ميل/غالون</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
-				<displayName draft="contributed">تيرابايت</displayName>
-				<unitPattern count="zero" draft="contributed">{0} تيرابايت</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} تيرابايت</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} تيرابايت</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} تيرابايت</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} تيرابايت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} تيرابايت</unitPattern>
+				<displayName>تيرابايت</displayName>
+				<unitPattern count="zero">{0} تيرابايت</unitPattern>
+				<unitPattern count="one">{0} تيرابايت</unitPattern>
+				<unitPattern count="two">{0} تيرابايت</unitPattern>
+				<unitPattern count="few">{0} تيرابايت</unitPattern>
+				<unitPattern count="many">{0} تيرابايت</unitPattern>
+				<unitPattern count="other">{0} تيرابايت</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>تيرابت</displayName>
+				<unitPattern count="zero">{0} تيرابت</unitPattern>
+				<unitPattern count="one">{0} تيرابت</unitPattern>
+				<unitPattern count="two">{0} تيرابت</unitPattern>
+				<unitPattern count="few">{0} تيرابت</unitPattern>
+				<unitPattern count="many">{0} تيرابت</unitPattern>
+				<unitPattern count="other">{0} تيرابت</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>غيغابايت</displayName>
+				<unitPattern count="zero">{0} غيغابايت</unitPattern>
+				<unitPattern count="one">{0} غيغابايت</unitPattern>
+				<unitPattern count="two">{0} غيغابايت</unitPattern>
+				<unitPattern count="few">{0} غيغابايت</unitPattern>
+				<unitPattern count="many">{0} غيغابايت</unitPattern>
+				<unitPattern count="other">{0} غيغابايت</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>غيغابت</displayName>
+				<unitPattern count="zero">{0} غيغابت</unitPattern>
+				<unitPattern count="one">{0} غيغابت</unitPattern>
+				<unitPattern count="two">{0} غيغابت</unitPattern>
+				<unitPattern count="few">{0} غيغابت</unitPattern>
+				<unitPattern count="many">{0} غيغابت</unitPattern>
+				<unitPattern count="other">{0} غيغابت</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>ميغابايت</displayName>
+				<unitPattern count="zero">{0} ميغابايت</unitPattern>
+				<unitPattern count="one">{0} ميغابايت</unitPattern>
+				<unitPattern count="two">{0} ميغابايت</unitPattern>
+				<unitPattern count="few">{0} ميغابايت</unitPattern>
+				<unitPattern count="many">{0} ميغابايت</unitPattern>
+				<unitPattern count="other">{0} ميغابايت</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>ميغابت</displayName>
+				<unitPattern count="zero">{0} ميغابت</unitPattern>
+				<unitPattern count="one">{0} ميغابت</unitPattern>
+				<unitPattern count="two">{0} ميغابت</unitPattern>
+				<unitPattern count="few">{0} ميغابت</unitPattern>
+				<unitPattern count="many">{0} ميغابت</unitPattern>
+				<unitPattern count="other">{0} ميغابت</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>كيلوبايت</displayName>
+				<unitPattern count="zero">{0} كيلوبايت</unitPattern>
+				<unitPattern count="one">{0} كيلوبايت</unitPattern>
+				<unitPattern count="two">{0} كيلوبايت</unitPattern>
+				<unitPattern count="few">{0} كيلوبايت</unitPattern>
+				<unitPattern count="many">{0} كيلوبايت</unitPattern>
+				<unitPattern count="other">{0} كيلوبايت</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>كيلوبت</displayName>
+				<unitPattern count="zero">{0} كيلوبت</unitPattern>
+				<unitPattern count="one">{0} كيلوبت</unitPattern>
+				<unitPattern count="two">{0} كيلوبت</unitPattern>
+				<unitPattern count="few">{0} كيلوبت</unitPattern>
+				<unitPattern count="many">{0} كيلوبت</unitPattern>
+				<unitPattern count="other">{0} كيلوبت</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>بايت</displayName>
+				<unitPattern count="zero">{0} بايت</unitPattern>
+				<unitPattern count="one">{0} بايت</unitPattern>
+				<unitPattern count="two">{0} بايت</unitPattern>
+				<unitPattern count="few">{0} بايت</unitPattern>
+				<unitPattern count="many">{0} بايت</unitPattern>
+				<unitPattern count="other">{0} بايت</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>بت</displayName>
+				<unitPattern count="zero">{0} بت</unitPattern>
+				<unitPattern count="one">{0} بت</unitPattern>
+				<unitPattern count="two">{0} بت</unitPattern>
+				<unitPattern count="few">{0} بت</unitPattern>
+				<unitPattern count="many">{0} بت</unitPattern>
+				<unitPattern count="other">{0} بت</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>قرن</displayName>
+				<unitPattern count="zero">{0} قرن</unitPattern>
+				<unitPattern count="one">قرن</unitPattern>
+				<unitPattern count="two">قرنان</unitPattern>
+				<unitPattern count="few">{0} قرون</unitPattern>
+				<unitPattern count="many">{0} قرنًا</unitPattern>
+				<unitPattern count="other">{0} قرن</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>سنة</displayName>
+				<unitPattern count="zero">{0} سنة</unitPattern>
+				<unitPattern count="one">سنة واحدة</unitPattern>
+				<unitPattern count="two">سنتان</unitPattern>
+				<unitPattern count="few">{0} سنة</unitPattern>
+				<unitPattern count="many">{0} سنة</unitPattern>
+				<unitPattern count="other">{0} سنة</unitPattern>
+				<perUnitPattern>{0}/سنة</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>شهور</displayName>
+				<unitPattern count="zero">{0} شهر</unitPattern>
+				<unitPattern count="one">شهر</unitPattern>
+				<unitPattern count="two">شهران</unitPattern>
+				<unitPattern count="few">{0} أشهر</unitPattern>
+				<unitPattern count="many">{0} شهرًا</unitPattern>
+				<unitPattern count="other">{0} شهر</unitPattern>
+				<perUnitPattern>{0}/ش</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>أسبوع</displayName>
+				<unitPattern count="zero">{0} أسبوع</unitPattern>
+				<unitPattern count="one">أسبوع</unitPattern>
+				<unitPattern count="two">أسبوعان</unitPattern>
+				<unitPattern count="few">{0} أسابيع</unitPattern>
+				<unitPattern count="many">{0} أسبوعًا</unitPattern>
+				<unitPattern count="other">{0} أسبوع</unitPattern>
+				<perUnitPattern>{0}/أ</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
-				<displayName>يوم</displayName>
+				<displayName>أيام</displayName>
 				<unitPattern count="zero">{0} يوم</unitPattern>
-				<unitPattern count="one">{0} يوم</unitPattern>
+				<unitPattern count="one">يوم</unitPattern>
 				<unitPattern count="two">يومان</unitPattern>
 				<unitPattern count="few">{0} أيام</unitPattern>
 				<unitPattern count="many">{0} يومًا</unitPattern>
 				<unitPattern count="other">{0} يوم</unitPattern>
+				<perUnitPattern>{0}/ي</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>ساعة</displayName>
@@ -8861,50 +9332,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} س</unitPattern>
 				<perUnitPattern>{0}/س</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>م.ث.</displayName>
-				<unitPattern count="zero">{0} م.ث.</unitPattern>
-				<unitPattern count="one">{0} م.ث.</unitPattern>
-				<unitPattern count="two">{0} م.ث.</unitPattern>
-				<unitPattern count="few">{0} م.ث.</unitPattern>
-				<unitPattern count="many">{0} م.ث.</unitPattern>
-				<unitPattern count="other">{0} م.ث.</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>مللي ثانية</displayName>
-				<unitPattern count="zero" draft="contributed">{0} مللي ث.</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} مللي ث.</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} مللي ث.</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} مللي ث.</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} مللي ث.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} مللي ث.</unitPattern>
-			</unit>
 			<unit type="duration-minute">
-				<displayName>دقيقة</displayName>
+				<displayName>د</displayName>
 				<unitPattern count="zero">{0} د</unitPattern>
 				<unitPattern count="one">{0} د</unitPattern>
 				<unitPattern count="two">{0} د</unitPattern>
 				<unitPattern count="few">{0} د</unitPattern>
 				<unitPattern count="many">{0} د</unitPattern>
 				<unitPattern count="other">{0} د</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>شهر</displayName>
-				<unitPattern count="zero">{0} شهر</unitPattern>
-				<unitPattern count="one">شهر</unitPattern>
-				<unitPattern count="two">شهران</unitPattern>
-				<unitPattern count="few">{0} أشهر</unitPattern>
-				<unitPattern count="many">{0} شهرًا</unitPattern>
-				<unitPattern count="other">{0} شهر</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ن.ث.</displayName>
-				<unitPattern count="zero">{0} ن.ث.</unitPattern>
-				<unitPattern count="one">{0} ن.ث.</unitPattern>
-				<unitPattern count="two">{0} ن.ث.</unitPattern>
-				<unitPattern count="few">{0} ن.ث.</unitPattern>
-				<unitPattern count="many">{0} ن.ث.</unitPattern>
-				<unitPattern count="other">{0} ن.ث.</unitPattern>
+				<perUnitPattern>{0}/د</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>ثانية</displayName>
@@ -8916,59 +9352,77 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ث</unitPattern>
 				<perUnitPattern>{0}/ث</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>أسبوع</displayName>
-				<unitPattern count="zero">{0} أسبوع</unitPattern>
-				<unitPattern count="one">{0} أسبوع</unitPattern>
-				<unitPattern count="two">أسبوعان</unitPattern>
-				<unitPattern count="few">{0} أسابيع</unitPattern>
-				<unitPattern count="many">{0} أسبوعًا</unitPattern>
-				<unitPattern count="other">{0} أسبوع</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>مللي ثانية</displayName>
+				<unitPattern count="zero">{0} مللي ث.</unitPattern>
+				<unitPattern count="one">{0} مللي ث.</unitPattern>
+				<unitPattern count="two">{0} مللي ث.</unitPattern>
+				<unitPattern count="few">{0} مللي ث.</unitPattern>
+				<unitPattern count="many">{0} مللي ث.</unitPattern>
+				<unitPattern count="other">{0} مللي ث.</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>سنة</displayName>
-				<unitPattern count="zero">{0} سنة</unitPattern>
-				<unitPattern count="one">سنة</unitPattern>
-				<unitPattern count="two">سنتان</unitPattern>
-				<unitPattern count="few">{0} سنة</unitPattern>
-				<unitPattern count="many">{0} سنة</unitPattern>
-				<unitPattern count="other">{0} سنة</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>م.ث.</displayName>
+				<unitPattern count="zero">{0} م.ث.</unitPattern>
+				<unitPattern count="one">{0} م.ث.</unitPattern>
+				<unitPattern count="two">{0} م.ث.</unitPattern>
+				<unitPattern count="few">{0} م.ث.</unitPattern>
+				<unitPattern count="many">{0} م.ث.</unitPattern>
+				<unitPattern count="other">{0} م.ث.</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ن.ث.</displayName>
+				<unitPattern count="zero">{0} ن.ث.</unitPattern>
+				<unitPattern count="one">{0} ن.ث.</unitPattern>
+				<unitPattern count="two">{0} ن.ث.</unitPattern>
+				<unitPattern count="few">{0} ن.ث.</unitPattern>
+				<unitPattern count="many">{0} ن.ث.</unitPattern>
+				<unitPattern count="other">{0} ن.ث.</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
-				<displayName draft="contributed">أمبير</displayName>
-				<unitPattern count="zero" draft="contributed">{0} أمبير</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} أمبير</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} أمبير</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أمبير</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} أمبير</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} أمبير</unitPattern>
+				<displayName>أمبير</displayName>
+				<unitPattern count="zero">{0} أمبير</unitPattern>
+				<unitPattern count="one">{0} أمبير</unitPattern>
+				<unitPattern count="two">{0} أمبير</unitPattern>
+				<unitPattern count="few">{0} أمبير</unitPattern>
+				<unitPattern count="many">{0} أمبير</unitPattern>
+				<unitPattern count="other">{0} أمبير</unitPattern>
 			</unit>
 			<unit type="electric-milliampere">
-				<displayName draft="contributed">مللي أمبير</displayName>
-				<unitPattern count="zero" draft="contributed">{0} مللي أمبير</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} مللي أمبير</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} مللي أمبير</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} مللي أمبير</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} مللي أمبير</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} مللي أمبير</unitPattern>
+				<displayName>مللي أمبير</displayName>
+				<unitPattern count="zero">{0} مللي أمبير</unitPattern>
+				<unitPattern count="one">{0} مللي أمبير</unitPattern>
+				<unitPattern count="two">{0} مللي أمبير</unitPattern>
+				<unitPattern count="few">{0} مللي أمبير</unitPattern>
+				<unitPattern count="many">{0} مللي أمبير</unitPattern>
+				<unitPattern count="other">{0} مللي أمبير</unitPattern>
 			</unit>
 			<unit type="electric-ohm">
-				<displayName draft="contributed">أوم</displayName>
-				<unitPattern count="zero" draft="contributed">{0} أوم</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} أوم</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} أوم</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أوم</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} أوم</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} أوم</unitPattern>
+				<displayName>أوم</displayName>
+				<unitPattern count="zero">{0} أوم</unitPattern>
+				<unitPattern count="one">{0} أوم</unitPattern>
+				<unitPattern count="two">{0} أوم</unitPattern>
+				<unitPattern count="few">{0} أوم</unitPattern>
+				<unitPattern count="many">{0} أوم</unitPattern>
+				<unitPattern count="other">{0} أوم</unitPattern>
 			</unit>
 			<unit type="electric-volt">
-				<displayName draft="contributed">فولت</displayName>
-				<unitPattern count="zero" draft="contributed">{0} فولت</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} فولت</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} فولت</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} فولت</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} فولت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} فولت</unitPattern>
+				<displayName>فولت</displayName>
+				<unitPattern count="zero">{0} فولت</unitPattern>
+				<unitPattern count="one">{0} فولت</unitPattern>
+				<unitPattern count="two">{0} فولت</unitPattern>
+				<unitPattern count="few">{0} فولت</unitPattern>
+				<unitPattern count="many">{0} فولت</unitPattern>
+				<unitPattern count="other">{0} فولت</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>ك كالوري</displayName>
+				<unitPattern count="zero">{0} ك كالوري</unitPattern>
+				<unitPattern count="one">{0} ك كالوري</unitPattern>
+				<unitPattern count="two">{0} ك كالوري</unitPattern>
+				<unitPattern count="few">{0} ك كالوري</unitPattern>
+				<unitPattern count="many">{0} ك كالوري</unitPattern>
+				<unitPattern count="other">{0} ك كالوري</unitPattern>
 			</unit>
 			<unit type="energy-calorie">
 				<displayName>كالوري</displayName>
@@ -8980,238 +9434,328 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} كالوري</unitPattern>
 			</unit>
 			<unit type="energy-foodcalorie">
-				<displayName draft="contributed">كالوري</displayName>
-				<unitPattern count="zero" draft="contributed">{0} كالوري</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كالوري</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} كالوري</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} كالوري</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كالوري</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كالوري</unitPattern>
-			</unit>
-			<unit type="energy-joule">
-				<displayName draft="contributed">جول</displayName>
-				<unitPattern count="zero" draft="contributed">{0} جول</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} جول</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} جول</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} جول</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} جول</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} جول</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName draft="contributed">ك كالوري</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ك كالوري</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ك كالوري</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ك كالوري</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ك كالوري</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ك كالوري</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ك كالوري</unitPattern>
+				<displayName>كالوري</displayName>
+				<unitPattern count="zero">{0} كالوري</unitPattern>
+				<unitPattern count="one">{0} كالوري</unitPattern>
+				<unitPattern count="two">{0} كالوري</unitPattern>
+				<unitPattern count="few">{0} كالوري</unitPattern>
+				<unitPattern count="many">{0} كالوري</unitPattern>
+				<unitPattern count="other">{0} كالوري</unitPattern>
 			</unit>
 			<unit type="energy-kilojoule">
-				<displayName draft="contributed">ك جول</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ك جول</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ك جول</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ك جول</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ك جول</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ك جول</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ك جول</unitPattern>
+				<displayName>ك جول</displayName>
+				<unitPattern count="zero">{0} ك جول</unitPattern>
+				<unitPattern count="one">{0} ك جول</unitPattern>
+				<unitPattern count="two">{0} ك جول</unitPattern>
+				<unitPattern count="few">{0} ك جول</unitPattern>
+				<unitPattern count="many">{0} ك جول</unitPattern>
+				<unitPattern count="other">{0} ك جول</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>جول</displayName>
+				<unitPattern count="zero">{0} جول</unitPattern>
+				<unitPattern count="one">{0} جول</unitPattern>
+				<unitPattern count="two">{0} جول</unitPattern>
+				<unitPattern count="few">{0} جول</unitPattern>
+				<unitPattern count="many">{0} جول</unitPattern>
+				<unitPattern count="other">{0} جول</unitPattern>
 			</unit>
 			<unit type="energy-kilowatt-hour">
-				<displayName draft="contributed">ك.و.س</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ك.و.س</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ك.و.س</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ك.و.س</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ك.و.س</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ك.و.س</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ك.و.س</unitPattern>
+				<displayName>ك.و.س</displayName>
+				<unitPattern count="zero">{0} ك.و.س</unitPattern>
+				<unitPattern count="one">{0} ك.و.س</unitPattern>
+				<unitPattern count="two">{0} ك.و.س</unitPattern>
+				<unitPattern count="few">{0} ك.و.س</unitPattern>
+				<unitPattern count="many">{0} ك.و.س</unitPattern>
+				<unitPattern count="other">{0} ك.و.س</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
-				<displayName draft="contributed">غ هرتز</displayName>
-				<unitPattern count="zero" draft="contributed">{0} غ هرتز</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} غ هرتز</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} غ هرتز</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} غ هرتز</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} غ هرتز</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} غ هرتز</unitPattern>
-			</unit>
-			<unit type="frequency-hertz">
-				<displayName draft="contributed">هرتز</displayName>
-				<unitPattern count="zero" draft="contributed">{0} هرتز</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} هرتز</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} هرتز</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} هرتز</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} هرتز</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} هرتز</unitPattern>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<displayName draft="contributed">ك هرتز</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ك هرتز</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ك هرتز</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ك هرتز</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ك هرتز</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ك هرتز</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ك هرتز</unitPattern>
+				<displayName>غ هرتز</displayName>
+				<unitPattern count="zero">{0} غ هرتز</unitPattern>
+				<unitPattern count="one">{0} غ هرتز</unitPattern>
+				<unitPattern count="two">{0} غ هرتز</unitPattern>
+				<unitPattern count="few">{0} غ هرتز</unitPattern>
+				<unitPattern count="many">{0} غ هرتز</unitPattern>
+				<unitPattern count="other">{0} غ هرتز</unitPattern>
 			</unit>
 			<unit type="frequency-megahertz">
-				<displayName draft="contributed">م هرتز</displayName>
-				<unitPattern count="zero" draft="contributed">{0} م هرتز</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} م هرتز</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} م هرتز</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} م هرتز</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} م هرتز</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} م هرتز</unitPattern>
+				<displayName>م هرتز</displayName>
+				<unitPattern count="zero">{0} م هرتز</unitPattern>
+				<unitPattern count="one">{0} م هرتز</unitPattern>
+				<unitPattern count="two">{0} م هرتز</unitPattern>
+				<unitPattern count="few">{0} م هرتز</unitPattern>
+				<unitPattern count="many">{0} م هرتز</unitPattern>
+				<unitPattern count="other">{0} م هرتز</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName draft="contributed">و.ف.</displayName>
-				<unitPattern count="zero" draft="contributed">{0} و.ف.</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} و.ف.</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} و.ف.</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} و.ف.</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} و.ف.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} و.ف.</unitPattern>
+			<unit type="frequency-kilohertz">
+				<displayName>ك هرتز</displayName>
+				<unitPattern count="zero">{0} ك هرتز</unitPattern>
+				<unitPattern count="one">{0} ك هرتز</unitPattern>
+				<unitPattern count="two">{0} ك هرتز</unitPattern>
+				<unitPattern count="few">{0} ك هرتز</unitPattern>
+				<unitPattern count="many">{0} ك هرتز</unitPattern>
+				<unitPattern count="other">{0} ك هرتز</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">سم</displayName>
-				<unitPattern count="zero" draft="contributed">{0} سم</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} سم</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} سم</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} سم</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} سم</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} سم</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<displayName draft="contributed">دسم</displayName>
-				<unitPattern count="zero" draft="contributed">{0} دسم</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} دسم</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} دسم</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} دسم</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} دسم</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} دسم</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="contributed">قدم</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الأقدام</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} قدم</unitPattern>
-				<unitPattern count="two" draft="contributed">قدمان ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أقدام</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} قدمًا</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الأقدام</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="contributed">بوصة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} بوصة</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} بوصة</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} بوصة</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} بوصة</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} بوصة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} بوصة</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>هرتز</displayName>
+				<unitPattern count="zero">{0} هرتز</unitPattern>
+				<unitPattern count="one">{0} هرتز</unitPattern>
+				<unitPattern count="two">{0} هرتز</unitPattern>
+				<unitPattern count="few">{0} هرتز</unitPattern>
+				<unitPattern count="many">{0} هرتز</unitPattern>
+				<unitPattern count="other">{0} هرتز</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
-				<displayName draft="contributed">كم</displayName>
-				<unitPattern count="zero" draft="contributed">{0} كم</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كم</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} كم</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} كم</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كم</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كم</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName draft="contributed">سنة ضوئية</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من السنوات الضوئية</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} سنة ضوئية</unitPattern>
-				<unitPattern count="two" draft="contributed">سنتان ضوئيتان ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} سنوات ضوئية</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} سنة ضوئية</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من السنوات الضوئية</unitPattern>
+				<displayName>كم</displayName>
+				<unitPattern count="zero">{0} كم</unitPattern>
+				<unitPattern count="one">{0} كم</unitPattern>
+				<unitPattern count="two">{0} كم</unitPattern>
+				<unitPattern count="few">{0} كم</unitPattern>
+				<unitPattern count="many">{0} كم</unitPattern>
+				<unitPattern count="other">{0} كم</unitPattern>
+				<perUnitPattern>{0}/كم</perUnitPattern>
 			</unit>
 			<unit type="length-meter">
-				<displayName draft="contributed">متر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الأمتار</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} متر</unitPattern>
-				<unitPattern count="two" draft="contributed">متران ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أمتار</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} مترًا</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الأمتار</unitPattern>
+				<displayName>متر</displayName>
+				<unitPattern count="zero">{0} متر</unitPattern>
+				<unitPattern count="one">متر</unitPattern>
+				<unitPattern count="two">متران</unitPattern>
+				<unitPattern count="few">{0} أمتار</unitPattern>
+				<unitPattern count="many">{0} مترًا</unitPattern>
+				<unitPattern count="other">{0} متر</unitPattern>
+				<perUnitPattern>{0}/م</perUnitPattern>
 			</unit>
-			<unit type="length-micrometer">
-				<displayName draft="contributed">ميكرومتر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ميكرومتر</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ميكرومتر</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ميكرومتر</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ميكرومتر</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ميكرومتر</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ميكرومتر</unitPattern>
+			<unit type="length-decimeter">
+				<displayName>دسم</displayName>
+				<unitPattern count="zero">{0} دسم</unitPattern>
+				<unitPattern count="one">{0} دسم</unitPattern>
+				<unitPattern count="two">{0} دسم</unitPattern>
+				<unitPattern count="few">{0} دسم</unitPattern>
+				<unitPattern count="many">{0} دسم</unitPattern>
+				<unitPattern count="other">{0} دسم</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName draft="contributed">ميل</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الأميال</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ميل</unitPattern>
-				<unitPattern count="two" draft="contributed">ميلان ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أميال</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ميلاً</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الأميال</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>سم</displayName>
+				<unitPattern count="zero">{0} سم</unitPattern>
+				<unitPattern count="one">{0} سم</unitPattern>
+				<unitPattern count="two">{0} سم</unitPattern>
+				<unitPattern count="few">{0} سم</unitPattern>
+				<unitPattern count="many">{0} سم</unitPattern>
+				<unitPattern count="other">{0} سم</unitPattern>
+				<perUnitPattern>{0}/سم</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
-				<displayName draft="contributed">ملليمتر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ملليمتر</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ملليمتر</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ملليمتر</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ملليمتر</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ملليمتر</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ملليمتر</unitPattern>
+				<displayName>ملليمتر</displayName>
+				<unitPattern count="zero">{0} ملليمتر</unitPattern>
+				<unitPattern count="one">{0} ملليمتر</unitPattern>
+				<unitPattern count="two">{0} ملليمتر</unitPattern>
+				<unitPattern count="few">{0} ملليمتر</unitPattern>
+				<unitPattern count="many">{0} ملليمتر</unitPattern>
+				<unitPattern count="other">{0} ملليمتر</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>ميكرومتر</displayName>
+				<unitPattern count="zero">{0} ميكرومتر</unitPattern>
+				<unitPattern count="one">{0} ميكرومتر</unitPattern>
+				<unitPattern count="two">{0} ميكرومتر</unitPattern>
+				<unitPattern count="few">{0} ميكرومتر</unitPattern>
+				<unitPattern count="many">{0} ميكرومتر</unitPattern>
+				<unitPattern count="other">{0} ميكرومتر</unitPattern>
 			</unit>
 			<unit type="length-nanometer">
-				<displayName draft="contributed">نانو متر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} نانو متر</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} نانو متر</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} نانو متر</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} نانو متر</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} نانو متر</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} نانو متر</unitPattern>
-			</unit>
-			<unit type="length-nautical-mile">
-				<displayName draft="contributed">ميل بحري</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الأميال البحرية</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ميل بحري</unitPattern>
-				<unitPattern count="two" draft="contributed">ميلان بحريان</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أميال بحرية</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ميلاً بحريًا</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الأميال البحرية</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName draft="contributed">فرسخ فلكي</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الفراسخ الفلكية</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} فرسخ فلكي</unitPattern>
-				<unitPattern count="two" draft="contributed">فرسخان فلكيان</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} فراسخ فلكية</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} فرسخًا فلكيًا</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الفراسخ الفلكية</unitPattern>
+				<displayName>نانو متر</displayName>
+				<unitPattern count="zero">{0} نانو متر</unitPattern>
+				<unitPattern count="one">{0} نانو متر</unitPattern>
+				<unitPattern count="two">{0} نانو متر</unitPattern>
+				<unitPattern count="few">{0} نانو متر</unitPattern>
+				<unitPattern count="many">{0} نانو متر</unitPattern>
+				<unitPattern count="other">{0} نانو متر</unitPattern>
 			</unit>
 			<unit type="length-picometer">
-				<displayName draft="contributed">بيكومتر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} بيكومتر</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} بيكومتر</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} بيكومتر</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} بيكومتر</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} بيكومتر</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} بيكومتر</unitPattern>
+				<displayName>بيكومتر</displayName>
+				<unitPattern count="zero">{0} بيكومتر</unitPattern>
+				<unitPattern count="one">{0} بيكومتر</unitPattern>
+				<unitPattern count="two">{0} بيكومتر</unitPattern>
+				<unitPattern count="few">{0} بيكومتر</unitPattern>
+				<unitPattern count="many">{0} بيكومتر</unitPattern>
+				<unitPattern count="other">{0} بيكومتر</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>ميل</displayName>
+				<unitPattern count="zero">{0} ميل</unitPattern>
+				<unitPattern count="one">ميل</unitPattern>
+				<unitPattern count="two">ميلان</unitPattern>
+				<unitPattern count="few">{0} أميال</unitPattern>
+				<unitPattern count="many">{0} ميلاً</unitPattern>
+				<unitPattern count="other">{0} ميل</unitPattern>
 			</unit>
 			<unit type="length-yard">
-				<displayName draft="contributed">ياردة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الياردات</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ياردة</unitPattern>
-				<unitPattern count="two" draft="contributed">ياردتان ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ياردات</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ياردة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الياردات</unitPattern>
+				<displayName>ياردة</displayName>
+				<unitPattern count="zero">{0} ياردة</unitPattern>
+				<unitPattern count="one">ياردة</unitPattern>
+				<unitPattern count="two">ياردتان</unitPattern>
+				<unitPattern count="few">{0} ياردات</unitPattern>
+				<unitPattern count="many">{0} ياردة</unitPattern>
+				<unitPattern count="other">{0} ياردة</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>قدم</displayName>
+				<unitPattern count="zero">{0} قدم</unitPattern>
+				<unitPattern count="one">قدم</unitPattern>
+				<unitPattern count="two">قدمان</unitPattern>
+				<unitPattern count="few">{0} أقدام</unitPattern>
+				<unitPattern count="many">{0} قدمًا</unitPattern>
+				<unitPattern count="other">{0} قدم</unitPattern>
+				<perUnitPattern>{0}/قدم</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>بوصة</displayName>
+				<unitPattern count="zero">{0} بوصة</unitPattern>
+				<unitPattern count="one">{0} بوصة</unitPattern>
+				<unitPattern count="two">{0} بوصة</unitPattern>
+				<unitPattern count="few">{0} بوصة</unitPattern>
+				<unitPattern count="many">{0} بوصة</unitPattern>
+				<unitPattern count="other">{0} بوصة</unitPattern>
+				<perUnitPattern>{0}/بوصة</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>فرسخ فلكي</displayName>
+				<unitPattern count="zero">{0} فرسخ فلكي</unitPattern>
+				<unitPattern count="one">فرسخ فلكي</unitPattern>
+				<unitPattern count="two">فرسخان فلكيان</unitPattern>
+				<unitPattern count="few">{0} فراسخ فلكية</unitPattern>
+				<unitPattern count="many">{0} فرسخًا فلكيًا</unitPattern>
+				<unitPattern count="other">{0} فرسخ فلكي</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>سنة ضوئية</displayName>
+				<unitPattern count="zero">{0} سنة ضوئية</unitPattern>
+				<unitPattern count="one">سنة ضوئية</unitPattern>
+				<unitPattern count="two">سنتان ضوئيتان</unitPattern>
+				<unitPattern count="few">{0} سنوات ضوئية</unitPattern>
+				<unitPattern count="many">{0} سنة ضوئية</unitPattern>
+				<unitPattern count="other">{0} سنة ضوئية</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>و.ف.</displayName>
+				<unitPattern count="zero">{0} و.ف.</unitPattern>
+				<unitPattern count="one">{0} و.ف.</unitPattern>
+				<unitPattern count="two">{0} و.ف.</unitPattern>
+				<unitPattern count="few">{0} و.ف.</unitPattern>
+				<unitPattern count="many">{0} و.ف.</unitPattern>
+				<unitPattern count="other">{0} و.ف.</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>ميل بحري</displayName>
+				<unitPattern count="zero">{0} ميل بحري</unitPattern>
+				<unitPattern count="one">ميل بحري</unitPattern>
+				<unitPattern count="two">ميلان بحريان</unitPattern>
+				<unitPattern count="few">{0} أميال بحرية</unitPattern>
+				<unitPattern count="many">{0} ميلاً بحريًا</unitPattern>
+				<unitPattern count="other">{0} ميل بحري</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>ميل اسكندنافي</displayName>
+				<unitPattern count="zero">{0} ميل اسكندنافي</unitPattern>
+				<unitPattern count="one">{0} ميل اسكندنافي</unitPattern>
+				<unitPattern count="two">{0} ميل اسكندنافي</unitPattern>
+				<unitPattern count="few">{0} ميل اسكندنافي</unitPattern>
+				<unitPattern count="many">{0} ميل اسكندنافي</unitPattern>
+				<unitPattern count="other">{0} ميل اسكندنافي</unitPattern>
 			</unit>
 			<unit type="light-lux">
-				<displayName draft="contributed">لكس</displayName>
-				<unitPattern count="zero" draft="contributed">{0} لكس</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} لكس</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} لكس</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} لكس</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} لكس</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} لكس</unitPattern>
+				<displayName>لكس</displayName>
+				<unitPattern count="zero">{0} لكس</unitPattern>
+				<unitPattern count="one">{0} لكس</unitPattern>
+				<unitPattern count="two">{0} لكس</unitPattern>
+				<unitPattern count="few">{0} لكس</unitPattern>
+				<unitPattern count="many">{0} لكس</unitPattern>
+				<unitPattern count="other">{0} لكس</unitPattern>
+			</unit>
+			<unit type="mass-metric-ton">
+				<displayName>ط/م</displayName>
+				<unitPattern count="zero">{0} ط/م</unitPattern>
+				<unitPattern count="one">{0} ط/م</unitPattern>
+				<unitPattern count="two">{0} ط/م</unitPattern>
+				<unitPattern count="few">{0} ط/م</unitPattern>
+				<unitPattern count="many">{0} ط/م</unitPattern>
+				<unitPattern count="other">{0} ط/م</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>كغم</displayName>
+				<unitPattern count="zero">{0} كغم</unitPattern>
+				<unitPattern count="one">{0} كغم</unitPattern>
+				<unitPattern count="two">{0} كغم</unitPattern>
+				<unitPattern count="few">{0} كغم</unitPattern>
+				<unitPattern count="many">{0} كغم</unitPattern>
+				<unitPattern count="other">{0} كغم</unitPattern>
+				<perUnitPattern>{0}/كغم</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>غرام</displayName>
+				<unitPattern count="zero">{0} غرام</unitPattern>
+				<unitPattern count="one">غرام ({0})</unitPattern>
+				<unitPattern count="two">غرامان ({0})</unitPattern>
+				<unitPattern count="few">{0} غرامات</unitPattern>
+				<unitPattern count="many">{0} غرامًا</unitPattern>
+				<unitPattern count="other">{0} غرام</unitPattern>
+				<perUnitPattern>{0}/غم</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>مغم</displayName>
+				<unitPattern count="zero">{0} مغم</unitPattern>
+				<unitPattern count="one">{0} مغم</unitPattern>
+				<unitPattern count="two">{0} مغم</unitPattern>
+				<unitPattern count="few">{0} مغم</unitPattern>
+				<unitPattern count="many">{0} مغم</unitPattern>
+				<unitPattern count="other">{0} مغم</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>مكغم</displayName>
+				<unitPattern count="zero">{0} مكغم</unitPattern>
+				<unitPattern count="one">{0} مكغم</unitPattern>
+				<unitPattern count="two">{0} مكغم</unitPattern>
+				<unitPattern count="few">{0} مكغم</unitPattern>
+				<unitPattern count="many">{0} مكغم</unitPattern>
+				<unitPattern count="other">{0} مكغم</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>طن</displayName>
+				<unitPattern count="zero">{0} طن</unitPattern>
+				<unitPattern count="one">{0} طن</unitPattern>
+				<unitPattern count="two">{0} طن</unitPattern>
+				<unitPattern count="few">{0} طن</unitPattern>
+				<unitPattern count="many">{0} طن</unitPattern>
+				<unitPattern count="other">{0} طن</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>رطل</displayName>
+				<unitPattern count="zero">{0} رطل</unitPattern>
+				<unitPattern count="one">{0} رطل</unitPattern>
+				<unitPattern count="two">{0} رطل</unitPattern>
+				<unitPattern count="few">{0} رطل</unitPattern>
+				<unitPattern count="many">{0} رطل</unitPattern>
+				<unitPattern count="other">{0} رطل</unitPattern>
+				<perUnitPattern>{0}/رطل</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>أونصة</displayName>
+				<unitPattern count="zero">أونصة</unitPattern>
+				<unitPattern count="one">{0} أونصة</unitPattern>
+				<unitPattern count="two">أونصتان</unitPattern>
+				<unitPattern count="few">{0} أونصات</unitPattern>
+				<unitPattern count="many">{0} أونصة</unitPattern>
+				<unitPattern count="other">{0} أونصة</unitPattern>
+				<perUnitPattern>{0}/أونصة</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>أونصة ترويسية</displayName>
+				<unitPattern count="zero">{0} أونصة ترويسية</unitPattern>
+				<unitPattern count="one">{0} أونصة ترويسية</unitPattern>
+				<unitPattern count="two">أونصتان ترويسيتان</unitPattern>
+				<unitPattern count="few">{0} أونصات ترويسية</unitPattern>
+				<unitPattern count="many">{0} أونصة ترويسية</unitPattern>
+				<unitPattern count="other">{0} أونصة ترويسية</unitPattern>
 			</unit>
 			<unit type="mass-carat">
 				<displayName>قيراط</displayName>
@@ -9222,221 +9766,149 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} قيراط</unitPattern>
 				<unitPattern count="other">{0} قيراط</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="contributed">غرام</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الغرامات</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} غرام</unitPattern>
-				<unitPattern count="two" draft="contributed">غرامان ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} غرامات</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} غرامًا</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الغرامات</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName draft="contributed">كغم</displayName>
-				<unitPattern count="zero" draft="contributed">{0} كغم</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كغم</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} كغم</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} كغم</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كغم</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كغم</unitPattern>
-			</unit>
-			<unit type="mass-metric-ton">
-				<displayName draft="contributed">ط/م</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ط/م</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ط/م</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ط/م</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ط/م</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ط/م</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ط/م</unitPattern>
-			</unit>
-			<unit type="mass-microgram">
-				<displayName draft="contributed">مكغم</displayName>
-				<unitPattern count="zero" draft="contributed">{0} مكغم</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} مكغم</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} مكغم</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} مكغم</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} مكغم</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} مكغم</unitPattern>
-			</unit>
-			<unit type="mass-milligram">
-				<displayName draft="contributed">مغم</displayName>
-				<unitPattern count="zero" draft="contributed">{0} مغم</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} مغم</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} مغم</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} مغم</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} مغم</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} مغم</unitPattern>
-			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="contributed">أونصة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} أونس</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} أونس</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} أونس</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أونس</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} أونس</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} أونس</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName draft="contributed">أونصة ترويسية</displayName>
-				<unitPattern count="zero" draft="contributed">{0} أونصات ترويسية</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} أونصة ترويسية</unitPattern>
-				<unitPattern count="two" draft="contributed">أونصتان ترويسيتان</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أونصات ترويسية</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} أونصة ترويسية</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} أونصات ترويسية</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName draft="contributed">رطل</displayName>
-				<unitPattern count="zero" draft="contributed">{0} رطل</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} رطل</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} رطل</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} رطل</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} رطل</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} رطل</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<displayName draft="contributed">طن</displayName>
-				<unitPattern count="zero" draft="contributed">{0} طن</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} طن</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} طن</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} طن</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} طن</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} طن</unitPattern>
-			</unit>
 			<unit type="power-gigawatt">
-				<displayName draft="contributed">غ واط</displayName>
-				<unitPattern count="zero" draft="contributed">{0} غ واط</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} غ واط</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} غ واط</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} غ واط</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} غ واط</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} غ واط</unitPattern>
-			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="contributed">قوة حصان</displayName>
-				<unitPattern count="zero" draft="contributed">{0} قوة حصان</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} قوة حصان</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} قوة حصان</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} قوة حصان</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} قوة حصان</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} قوة حصان</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName draft="contributed">ك واط</displayName>
-				<unitPattern count="zero" draft="contributed">{0} كيلوواط</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كيلوواط</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} كيلوواط</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} كيلوواط</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كيلوواط</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كيلوواط</unitPattern>
+				<displayName>غ واط</displayName>
+				<unitPattern count="zero">{0} غ واط</unitPattern>
+				<unitPattern count="one">{0} غ واط</unitPattern>
+				<unitPattern count="two">{0} غ واط</unitPattern>
+				<unitPattern count="few">{0} غ واط</unitPattern>
+				<unitPattern count="many">{0} غ واط</unitPattern>
+				<unitPattern count="other">{0} غ واط</unitPattern>
 			</unit>
 			<unit type="power-megawatt">
-				<displayName draft="contributed">م واط</displayName>
-				<unitPattern count="zero" draft="contributed">{0} م واط</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} م واط</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} م واط</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} م واط</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} م واط</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} م واط</unitPattern>
+				<displayName>م واط</displayName>
+				<unitPattern count="zero">{0} م واط</unitPattern>
+				<unitPattern count="one">{0} م واط</unitPattern>
+				<unitPattern count="two">{0} م واط</unitPattern>
+				<unitPattern count="few">{0} م واط</unitPattern>
+				<unitPattern count="many">{0} م واط</unitPattern>
+				<unitPattern count="other">{0} م واط</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName draft="contributed">مللي واط</displayName>
-				<unitPattern count="zero" draft="contributed">{0} مللي واط</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} مللي واط</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} مللي واط</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} مللي واط</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} مللي واط</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} مللي واط</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>ك واط</displayName>
+				<unitPattern count="zero">{0} كيلوواط</unitPattern>
+				<unitPattern count="one">{0} كيلوواط</unitPattern>
+				<unitPattern count="two">{0} كيلوواط</unitPattern>
+				<unitPattern count="few">{0} كيلوواط</unitPattern>
+				<unitPattern count="many">{0} كيلوواط</unitPattern>
+				<unitPattern count="other">{0} كيلوواط</unitPattern>
 			</unit>
 			<unit type="power-watt">
-				<displayName draft="contributed">واط</displayName>
-				<unitPattern count="zero" draft="contributed">{0} واط</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} واط</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} واط</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} واط</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} واط</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} واط</unitPattern>
+				<displayName>واط</displayName>
+				<unitPattern count="zero">{0} واط</unitPattern>
+				<unitPattern count="one">{0} واط</unitPattern>
+				<unitPattern count="two">{0} واط</unitPattern>
+				<unitPattern count="few">{0} واط</unitPattern>
+				<unitPattern count="many">{0} واط</unitPattern>
+				<unitPattern count="other">{0} واط</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>مللي واط</displayName>
+				<unitPattern count="zero">{0} مللي واط</unitPattern>
+				<unitPattern count="one">{0} مللي واط</unitPattern>
+				<unitPattern count="two">{0} مللي واط</unitPattern>
+				<unitPattern count="few">{0} مللي واط</unitPattern>
+				<unitPattern count="many">{0} مللي واط</unitPattern>
+				<unitPattern count="other">{0} مللي واط</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>حصان</displayName>
+				<unitPattern count="zero">{0} حصان</unitPattern>
+				<unitPattern count="one">{0} حصان</unitPattern>
+				<unitPattern count="two">{0} حصان</unitPattern>
+				<unitPattern count="few">{0} حصان</unitPattern>
+				<unitPattern count="many">{0} حصان</unitPattern>
+				<unitPattern count="other">{0} حصان</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
-				<displayName draft="contributed">هكتوباسكال</displayName>
-				<unitPattern count="zero" draft="contributed">{0} هكتوباسكال</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} هكتوباسكال</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} هكتوباسكال</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} هكتوباسكال</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} هكتوباسكال</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} هكتوباسكال</unitPattern>
-			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName draft="contributed">بوصة زئبقية</displayName>
-				<unitPattern count="zero" draft="contributed">{0} بوصة زئبقية</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} بوصة زئبقية</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} بوصة زئبقية</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} بوصة زئبقية</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} بوصة زئبقية</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} بوصة زئبقية</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName draft="contributed">مللي بار</displayName>
-				<unitPattern count="zero" draft="contributed">{0} مللي بار</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} مللي بار</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} مللي بار</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} مللي بار</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} مللي بار</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} مللي بار</unitPattern>
+				<displayName>هكتوباسكال</displayName>
+				<unitPattern count="zero">{0} هكتوباسكال</unitPattern>
+				<unitPattern count="one">{0} هكتوباسكال</unitPattern>
+				<unitPattern count="two">{0} هكتوباسكال</unitPattern>
+				<unitPattern count="few">{0} هكتوباسكال</unitPattern>
+				<unitPattern count="many">{0} هكتوباسكال</unitPattern>
+				<unitPattern count="other">{0} هكتوباسكال</unitPattern>
 			</unit>
 			<unit type="pressure-millimeter-of-mercury">
-				<displayName draft="contributed">ملم زئبقي</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ملم زئبقي</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ملم زئبقي</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ملم زئبقي</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ملم زئبقي</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ملم زئبقي</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ملم زئبقي</unitPattern>
+				<displayName>ملم زئبقي</displayName>
+				<unitPattern count="zero">{0} ملم زئبقي</unitPattern>
+				<unitPattern count="one">{0} ملم زئبقي</unitPattern>
+				<unitPattern count="two">{0} ملم زئبقي</unitPattern>
+				<unitPattern count="few">{0} ملم زئبقي</unitPattern>
+				<unitPattern count="many">{0} ملم زئبقي</unitPattern>
+				<unitPattern count="other">{0} ملم زئبقي</unitPattern>
 			</unit>
 			<unit type="pressure-pound-per-square-inch">
-				<displayName draft="contributed">رطل/بوصة مربعة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} رطل/بوصة مربعة</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} رطل/بوصة مربعة</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} رطل/بوصة مربعة</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} رطل/بوصة مربعة</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} رطل/بوصة مربعة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} رطل/بوصة مربعة</unitPattern>
+				<displayName>رطل/بوصة مربعة</displayName>
+				<unitPattern count="zero">{0} رطل/بوصة مربعة</unitPattern>
+				<unitPattern count="one">{0} رطل/بوصة مربعة</unitPattern>
+				<unitPattern count="two">{0} رطل/بوصة مربعة</unitPattern>
+				<unitPattern count="few">{0} رطل/بوصة مربعة</unitPattern>
+				<unitPattern count="many">{0} رطل/بوصة مربعة</unitPattern>
+				<unitPattern count="other">{0} رطل/بوصة مربعة</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName draft="contributed">قيراط</displayName>
-				<unitPattern count="zero" draft="contributed">{0} قيراط</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} قيراط</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} قيراط</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} قيراط</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} قيراط</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} قيراط</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>بوصة زئبقية</displayName>
+				<unitPattern count="zero">{0} بوصة زئبقية</unitPattern>
+				<unitPattern count="one">{0} بوصة زئبقية</unitPattern>
+				<unitPattern count="two">{0} بوصة زئبقية</unitPattern>
+				<unitPattern count="few">{0} بوصة زئبقية</unitPattern>
+				<unitPattern count="many">{0} بوصة زئبقية</unitPattern>
+				<unitPattern count="other">{0} بوصة زئبقية</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>مللي بار</displayName>
+				<unitPattern count="zero">{0} مللي بار</unitPattern>
+				<unitPattern count="one">{0} مللي بار</unitPattern>
+				<unitPattern count="two">{0} مللي بار</unitPattern>
+				<unitPattern count="few">{0} مللي بار</unitPattern>
+				<unitPattern count="many">{0} مللي بار</unitPattern>
+				<unitPattern count="other">{0} مللي بار</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName draft="contributed">كم/س</displayName>
-				<unitPattern count="zero" draft="contributed">{0} كم/س</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كم/س</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} كم/س</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} كم/س</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كم/س</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كم/س</unitPattern>
+				<displayName>كم/س</displayName>
+				<unitPattern count="zero">{0} كم/س</unitPattern>
+				<unitPattern count="one">{0} كم/س</unitPattern>
+				<unitPattern count="two">{0} كم/س</unitPattern>
+				<unitPattern count="few">{0} كم/س</unitPattern>
+				<unitPattern count="many">{0} كم/س</unitPattern>
+				<unitPattern count="other">{0} كم/س</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
-				<displayName draft="contributed">م/ث</displayName>
-				<unitPattern count="zero" draft="contributed">{0} م/ث</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} م/ث</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} م/ث</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} م/ث</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} م/ث</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} م/ث</unitPattern>
+				<displayName>م/ث</displayName>
+				<unitPattern count="zero">{0} م/ث</unitPattern>
+				<unitPattern count="one">{0} م/ث</unitPattern>
+				<unitPattern count="two">{0} م/ث</unitPattern>
+				<unitPattern count="few">{0} م/ث</unitPattern>
+				<unitPattern count="many">{0} م/ث</unitPattern>
+				<unitPattern count="other">{0} م/ث</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<displayName draft="contributed">ميل/س</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ميل/س</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ميل/س</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ميل/س</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ميل/س</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ميل/س</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ميل/س</unitPattern>
+				<displayName>ميل/س</displayName>
+				<unitPattern count="zero">{0} ميل/س</unitPattern>
+				<unitPattern count="one">{0} ميل/س</unitPattern>
+				<unitPattern count="two">{0} ميل/س</unitPattern>
+				<unitPattern count="few">{0} ميل/س</unitPattern>
+				<unitPattern count="many">{0} ميل/س</unitPattern>
+				<unitPattern count="other">{0} ميل/س</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>عقدة</displayName>
+				<unitPattern count="zero">{0} عقدة</unitPattern>
+				<unitPattern count="one">{0} عقدة</unitPattern>
+				<unitPattern count="two">{0} عقدة</unitPattern>
+				<unitPattern count="few">{0} عقدة</unitPattern>
+				<unitPattern count="many">{0} عقدة</unitPattern>
+				<unitPattern count="other">{0} عقدة</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="zero">{0}°</unitPattern>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="two">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
 				<displayName>درجة مئوية</displayName>
@@ -9457,207 +9929,235 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0}°ف</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
-				<displayName draft="contributed">د كلفن</displayName>
-				<unitPattern count="zero" draft="contributed">{0} د كلفن</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} د كلفن</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} د كلفن</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} د كلفن</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} د كلفن</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} د كلفن</unitPattern>
-			</unit>
-			<unit type="volume-acre-foot">
-				<displayName draft="contributed">فدان قدم</displayName>
-				<unitPattern count="zero" draft="contributed">{0} فدان قدم</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} فدان قدم</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} فدان قدم</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} فدان قدم</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} فدان قدم</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} فدان قدم</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName draft="contributed">سنتيلتر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} سنتيلتر</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} سنتيلتر</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} سنتيلتر</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} سنتيلتر</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} سنتيلتر</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} سنتيلتر</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName draft="contributed">سم³</displayName>
-				<unitPattern count="zero" draft="contributed">{0} سم³</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} سم³</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} سم³</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} سم³</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} سم³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} سم³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName draft="contributed">قدم مكعبة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الأقدام المكعبة</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} قدم مكعبة</unitPattern>
-				<unitPattern count="two" draft="contributed">قدمان مكعبان</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أقدام مكعبة</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} قدمًا مكعبًا</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الأقدام المكعبة</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName draft="contributed">بوصة مكعبة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} بوصة مكعبة</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} بوصة مكعبة</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} بوصة مكعبة</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} بوصة مكعبة</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} بوصة مكعبة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} بوصة مكعبة</unitPattern>
+				<displayName>د كلفن</displayName>
+				<unitPattern count="zero">{0} د كلفن</unitPattern>
+				<unitPattern count="one">{0} د كلفن</unitPattern>
+				<unitPattern count="two">{0} د كلفن</unitPattern>
+				<unitPattern count="few">{0} د كلفن</unitPattern>
+				<unitPattern count="many">{0} د كلفن</unitPattern>
+				<unitPattern count="other">{0} د كلفن</unitPattern>
 			</unit>
 			<unit type="volume-cubic-kilometer">
-				<displayName draft="contributed">كم³</displayName>
-				<unitPattern count="zero" draft="contributed">{0} كم³</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كم³</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} كم³</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} كم³</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كم³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كم³</unitPattern>
+				<displayName>كم³</displayName>
+				<unitPattern count="zero">{0} كم³</unitPattern>
+				<unitPattern count="one">{0} كم³</unitPattern>
+				<unitPattern count="two">{0} كم³</unitPattern>
+				<unitPattern count="few">{0} كم³</unitPattern>
+				<unitPattern count="many">{0} كم³</unitPattern>
+				<unitPattern count="other">{0} كم³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-meter">
-				<displayName draft="contributed">م³</displayName>
-				<unitPattern count="zero" draft="contributed">{0} م³</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} م³</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} م³</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} م³</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} م³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} م³</unitPattern>
+				<displayName>م³</displayName>
+				<unitPattern count="zero">{0} م³</unitPattern>
+				<unitPattern count="one">{0} م³</unitPattern>
+				<unitPattern count="two">{0} م³</unitPattern>
+				<unitPattern count="few">{0} م³</unitPattern>
+				<unitPattern count="many">{0} م³</unitPattern>
+				<unitPattern count="other">{0} م³</unitPattern>
+				<perUnitPattern>{0}/م³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>سم³</displayName>
+				<unitPattern count="zero">{0} سم³</unitPattern>
+				<unitPattern count="one">{0} سم³</unitPattern>
+				<unitPattern count="two">{0} سم³</unitPattern>
+				<unitPattern count="few">{0} سم³</unitPattern>
+				<unitPattern count="many">{0} سم³</unitPattern>
+				<unitPattern count="other">{0} سم³</unitPattern>
+				<perUnitPattern>{0}/سم³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
-				<displayName draft="contributed">ميل مكعب</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ميل مكعب</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ميل مكعب</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ميل مكعب</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ميل مكعب</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ميل مكعب</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ميل مكعب</unitPattern>
+				<displayName>ميل مكعب</displayName>
+				<unitPattern count="zero">{0} ميل مكعب</unitPattern>
+				<unitPattern count="one">{0} ميل مكعب</unitPattern>
+				<unitPattern count="two">{0} ميل مكعب</unitPattern>
+				<unitPattern count="few">{0} ميل مكعب</unitPattern>
+				<unitPattern count="many">{0} ميل مكعب</unitPattern>
+				<unitPattern count="other">{0} ميل مكعب</unitPattern>
 			</unit>
 			<unit type="volume-cubic-yard">
-				<displayName draft="contributed">ياردة مكعبة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ياردة مكعبة</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ياردة مكعبة</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ياردة مكعبة</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ياردة مكعبة</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ياردة مكعبة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ياردة مكعبة</unitPattern>
+				<displayName>ياردة مكعبة</displayName>
+				<unitPattern count="zero">{0} ياردة مكعبة</unitPattern>
+				<unitPattern count="one">{0} ياردة مكعبة</unitPattern>
+				<unitPattern count="two">{0} ياردة مكعبة</unitPattern>
+				<unitPattern count="few">{0} ياردة مكعبة</unitPattern>
+				<unitPattern count="many">{0} ياردة مكعبة</unitPattern>
+				<unitPattern count="other">{0} ياردة مكعبة</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName draft="contributed">كوب</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الأكواب</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كوب</unitPattern>
-				<unitPattern count="two" draft="contributed">كوبان</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أكواب</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كوبًا</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الأكواب</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>قدم مكعبة</displayName>
+				<unitPattern count="zero">{0} قدم مكعبة</unitPattern>
+				<unitPattern count="one">قدم مكعبة</unitPattern>
+				<unitPattern count="two">قدمان مكعبان</unitPattern>
+				<unitPattern count="few">{0} أقدام مكعبة</unitPattern>
+				<unitPattern count="many">{0} قدمًا مكعبًا</unitPattern>
+				<unitPattern count="other">{0} قدم مكعبة</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName draft="contributed">ديسيلتر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ديسيلتر</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ديسيلتر</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ديسيلتر</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ديسيلتر</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ديسيلتر</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ديسيلتر</unitPattern>
-			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName draft="contributed">أونصة سائلة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الأونصات السائلة</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} أونصة سائلة</unitPattern>
-				<unitPattern count="two" draft="contributed">أونصتان سائلتان</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أونصات سائلة</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} أونصة سائلة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الأونصات السائلة</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName draft="contributed">غالون</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الغالونات</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} غالون</unitPattern>
-				<unitPattern count="two" draft="contributed">غالونان</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} غالونات</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} غالونًا</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الغالونات</unitPattern>
-			</unit>
-			<unit type="volume-hectoliter">
-				<displayName draft="contributed">هكتولتر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} هكتولتر</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} هكتولتر</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} هكتولتر</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} هكتولتر</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} هكتولتر</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} هكتولتر</unitPattern>
-			</unit>
-			<unit type="volume-liter">
-				<displayName draft="contributed">لتر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من اللترات</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} لتر</unitPattern>
-				<unitPattern count="two" draft="contributed">لتران ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} لترات</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} لترًا</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من اللترات</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>بوصة مكعبة</displayName>
+				<unitPattern count="zero">{0} بوصة مكعبة</unitPattern>
+				<unitPattern count="one">{0} بوصة مكعبة</unitPattern>
+				<unitPattern count="two">{0} بوصة مكعبة</unitPattern>
+				<unitPattern count="few">{0} بوصة مكعبة</unitPattern>
+				<unitPattern count="many">{0} بوصة مكعبة</unitPattern>
+				<unitPattern count="other">{0} بوصة مكعبة</unitPattern>
 			</unit>
 			<unit type="volume-megaliter">
-				<displayName draft="contributed">ميغالتر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ميغالتر</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ميغالتر</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ميغالتر</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ميغالتر</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ميغالتر</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ميغالتر</unitPattern>
+				<displayName>ميغالتر</displayName>
+				<unitPattern count="zero">{0} ميغالتر</unitPattern>
+				<unitPattern count="one">{0} ميغالتر</unitPattern>
+				<unitPattern count="two">{0} ميغالتر</unitPattern>
+				<unitPattern count="few">{0} ميغالتر</unitPattern>
+				<unitPattern count="many">{0} ميغالتر</unitPattern>
+				<unitPattern count="other">{0} ميغالتر</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>هكتولتر</displayName>
+				<unitPattern count="zero">{0} هكتولتر</unitPattern>
+				<unitPattern count="one">{0} هكتولتر</unitPattern>
+				<unitPattern count="two">{0} هكتولتر</unitPattern>
+				<unitPattern count="few">{0} هكتولتر</unitPattern>
+				<unitPattern count="many">{0} هكتولتر</unitPattern>
+				<unitPattern count="other">{0} هكتولتر</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>لتر</displayName>
+				<unitPattern count="zero">{0} لتر</unitPattern>
+				<unitPattern count="one">لتر</unitPattern>
+				<unitPattern count="two">لتران</unitPattern>
+				<unitPattern count="few">{0} لترات</unitPattern>
+				<unitPattern count="many">{0} لترًا</unitPattern>
+				<unitPattern count="other">{0} لتر</unitPattern>
+				<perUnitPattern>{0}/ل</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>ديسيلتر</displayName>
+				<unitPattern count="zero">{0} ديسيلتر</unitPattern>
+				<unitPattern count="one">{0} ديسيلتر</unitPattern>
+				<unitPattern count="two">{0} ديسيلتر</unitPattern>
+				<unitPattern count="few">{0} ديسيلتر</unitPattern>
+				<unitPattern count="many">{0} ديسيلتر</unitPattern>
+				<unitPattern count="other">{0} ديسيلتر</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>سنتيلتر</displayName>
+				<unitPattern count="zero">{0} سنتيلتر</unitPattern>
+				<unitPattern count="one">{0} سنتيلتر</unitPattern>
+				<unitPattern count="two">{0} سنتيلتر</unitPattern>
+				<unitPattern count="few">{0} سنتيلتر</unitPattern>
+				<unitPattern count="many">{0} سنتيلتر</unitPattern>
+				<unitPattern count="other">{0} سنتيلتر</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
-				<displayName draft="contributed">ملتر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ملتر</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ملتر</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ملتر</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ملتر</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ملتر</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ملتر</unitPattern>
+				<displayName>ملتر</displayName>
+				<unitPattern count="zero">{0} ملتر</unitPattern>
+				<unitPattern count="one">{0} ملتر</unitPattern>
+				<unitPattern count="two">{0} ملتر</unitPattern>
+				<unitPattern count="few">{0} ملتر</unitPattern>
+				<unitPattern count="many">{0} ملتر</unitPattern>
+				<unitPattern count="other">{0} ملتر</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName draft="contributed">باينت</displayName>
-				<unitPattern count="zero" draft="contributed">{0} باينت</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} باينت</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} باينت</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} باينت</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} باينت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} باينت</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>مكيال متري</displayName>
+				<unitPattern count="zero">{0} مكيال متري</unitPattern>
+				<unitPattern count="one">{0} مكيال متري</unitPattern>
+				<unitPattern count="two">{0} مكيال متري</unitPattern>
+				<unitPattern count="few">{0} مكيال متري</unitPattern>
+				<unitPattern count="many">{0} مكيال متري</unitPattern>
+				<unitPattern count="other">{0} مكيال متري</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>كوب متري</displayName>
+				<unitPattern count="zero">{0} كوب متري</unitPattern>
+				<unitPattern count="one">{0} كوب متري</unitPattern>
+				<unitPattern count="two">{0} كوب متري</unitPattern>
+				<unitPattern count="few">{0} كوب متري</unitPattern>
+				<unitPattern count="many">{0} كوب متري</unitPattern>
+				<unitPattern count="other">{0} كوب متري</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>فدان قدم</displayName>
+				<unitPattern count="zero">{0} فدان قدم</unitPattern>
+				<unitPattern count="one">{0} فدان قدم</unitPattern>
+				<unitPattern count="two">{0} فدان قدم</unitPattern>
+				<unitPattern count="few">{0} فدان قدم</unitPattern>
+				<unitPattern count="many">{0} فدان قدم</unitPattern>
+				<unitPattern count="other">{0} فدان قدم</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>غالون</displayName>
+				<unitPattern count="zero">{0} غالون</unitPattern>
+				<unitPattern count="one">غالون</unitPattern>
+				<unitPattern count="two">غالونان</unitPattern>
+				<unitPattern count="few">{0} غالونات</unitPattern>
+				<unitPattern count="many">{0} غالونًا</unitPattern>
+				<unitPattern count="other">{0} غالون</unitPattern>
+				<perUnitPattern>{0}/غالون</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
-				<displayName draft="contributed">ربع غالون</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من أرباع الغالون</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ربع غالون</unitPattern>
-				<unitPattern count="two" draft="contributed">نصف غالون</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أرباع غالون</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ربع غالون</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من أرباع الغالون</unitPattern>
+				<displayName>ربع غالون</displayName>
+				<unitPattern count="zero">{0} ربع غالون</unitPattern>
+				<unitPattern count="one">ربع غالون</unitPattern>
+				<unitPattern count="two">نصف غالون</unitPattern>
+				<unitPattern count="few">{0} أرباع غالون</unitPattern>
+				<unitPattern count="many">{0} ربع غالون</unitPattern>
+				<unitPattern count="other">{0} ربع غالون</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>مكيال</displayName>
+				<unitPattern count="zero">{0} مكيال</unitPattern>
+				<unitPattern count="one">مكيال</unitPattern>
+				<unitPattern count="two">مكيالان</unitPattern>
+				<unitPattern count="few">{0} مكاييل</unitPattern>
+				<unitPattern count="many">{0} مكيالاً</unitPattern>
+				<unitPattern count="other">{0} مكيال</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>كوب</displayName>
+				<unitPattern count="zero">{0} كوب</unitPattern>
+				<unitPattern count="one">كوب</unitPattern>
+				<unitPattern count="two">كوبان</unitPattern>
+				<unitPattern count="few">{0} أكواب</unitPattern>
+				<unitPattern count="many">{0} كوبًا</unitPattern>
+				<unitPattern count="other">{0} كوب</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>أونصة سائلة</displayName>
+				<unitPattern count="zero">{0} أونصة سائلة</unitPattern>
+				<unitPattern count="one">أونصة سائلة</unitPattern>
+				<unitPattern count="two">أونصتان سائلتان</unitPattern>
+				<unitPattern count="few">{0} أونصات سائلة</unitPattern>
+				<unitPattern count="many">{0} أونصة سائلة</unitPattern>
+				<unitPattern count="other">{0} أونصة سائلة</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
-				<displayName draft="contributed">ملعقة المائدة</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من ملاعق المائدة</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ملعقة مائدة</unitPattern>
-				<unitPattern count="two" draft="contributed">ملعقتا مائدة</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ملاعق مائدة</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ملعقة مائدة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من ملاعق المائدة</unitPattern>
+				<displayName>ملعقة المائدة</displayName>
+				<unitPattern count="zero">{0} ملعقة مائدة</unitPattern>
+				<unitPattern count="one">ملعقة مائدة</unitPattern>
+				<unitPattern count="two">ملعقتا مائدة</unitPattern>
+				<unitPattern count="few">{0} ملاعق مائدة</unitPattern>
+				<unitPattern count="many">{0} ملعقة مائدة</unitPattern>
+				<unitPattern count="other">{0} ملعقة مائدة</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
-				<displayName draft="contributed">ملعقة شاي</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من ملاعق الشاي</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ملعقة شاي</unitPattern>
-				<unitPattern count="two" draft="contributed">ملعقتا شاي</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ملاعق شاي</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ملعقة شاي</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من ملاعق الشاي</unitPattern>
+				<displayName>ملعقة شاي</displayName>
+				<unitPattern count="zero">{0} ملعقة شاي</unitPattern>
+				<unitPattern count="one">ملعقة شاي</unitPattern>
+				<unitPattern count="two">ملعقتا شاي</unitPattern>
+				<unitPattern count="few">{0} ملاعق شاي</unitPattern>
+				<unitPattern count="many">{0} ملعقة شاي</unitPattern>
+				<unitPattern count="other">{0} ملعقة شاي</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} شرق</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} شمال</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">{0} ج</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0} غ</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<unitPattern count="zero" draft="contributed">{0} قوة تسارع</unitPattern>
@@ -9667,6 +10167,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} قوة تسارع</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} قوة تسارع</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="zero">{0} درجة</unitPattern>
+				<unitPattern count="one">{0} درجة</unitPattern>
+				<unitPattern count="two">درجتان ({0})</unitPattern>
+				<unitPattern count="few">{0} درجات</unitPattern>
+				<unitPattern count="many">{0} درجة</unitPattern>
+				<unitPattern count="other">{0} درجة</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="zero">{0}′</unitPattern>
 				<unitPattern count="one">{0} دقيقة</unitPattern>
@@ -9683,21 +10191,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="zero">{0} درجة</unitPattern>
-				<unitPattern count="one">{0} درجة</unitPattern>
-				<unitPattern count="two">درجتان ({0})</unitPattern>
-				<unitPattern count="few">{0} درجات</unitPattern>
-				<unitPattern count="many">{0} درجة</unitPattern>
-				<unitPattern count="other">{0} درجة</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="zero" draft="contributed">{0} من الفدادين</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} فدان</unitPattern>
-				<unitPattern count="two" draft="contributed">فدانان ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} فدادين</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} فدانًا</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الفدادين</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="zero" draft="contributed">{0} كم²</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} كم²</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} كم²</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} كم²</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} كم²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كم²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="zero">{0} هكت</unitPattern>
@@ -9707,22 +10207,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} هكتارًا</unitPattern>
 				<unitPattern count="other">{0} هكت</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="zero">{0}ft²</unitPattern>
-				<unitPattern count="one">{0}ft²</unitPattern>
-				<unitPattern count="two">{0}ft²</unitPattern>
-				<unitPattern count="few">{0}ft²</unitPattern>
-				<unitPattern count="many">{0}ft²</unitPattern>
-				<unitPattern count="other">{0}ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="zero" draft="contributed">{0} كم²</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كم²</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} كم²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} كم²</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كم²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كم²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="zero" draft="contributed">{0} م²</unitPattern>
 				<unitPattern count="one" draft="contributed">{0} م²</unitPattern>
@@ -9739,13 +10223,65 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} ميل مربع</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ميل مربع</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="zero" draft="contributed">{0} من الفدادين</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} فدان</unitPattern>
+				<unitPattern count="two" draft="contributed">فدانان ({0})</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} فدادين</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} فدانًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} من الفدادين</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="zero">{0}ft²</unitPattern>
+				<unitPattern count="one">{0}ft²</unitPattern>
+				<unitPattern count="two">{0}ft²</unitPattern>
+				<unitPattern count="few">{0}ft²</unitPattern>
+				<unitPattern count="many">{0}ft²</unitPattern>
+				<unitPattern count="other">{0}ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ل/١٠٠كم</displayName>
+				<unitPattern count="zero">{0} ل/١٠٠كم</unitPattern>
+				<unitPattern count="one">{0} ل/١٠٠كم</unitPattern>
+				<unitPattern count="two">{0} ل/١٠٠كم</unitPattern>
+				<unitPattern count="few">{0} ل/١٠٠كم</unitPattern>
+				<unitPattern count="many">{0} ل/١٠٠كم</unitPattern>
+				<unitPattern count="other">{0} ل/١٠٠كم</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>سنة</displayName>
+				<unitPattern count="zero">{0} سنة</unitPattern>
+				<unitPattern count="one">{0} سنة</unitPattern>
+				<unitPattern count="two">{0} سنة</unitPattern>
+				<unitPattern count="few">{0} سنة</unitPattern>
+				<unitPattern count="many">{0} سنة</unitPattern>
+				<unitPattern count="other">{0} سنة</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>شهر</displayName>
+				<unitPattern count="zero">{0} شهر</unitPattern>
+				<unitPattern count="one">{0} شهر</unitPattern>
+				<unitPattern count="two">{0} شهر</unitPattern>
+				<unitPattern count="few">{0} شهر</unitPattern>
+				<unitPattern count="many">{0} شهر</unitPattern>
+				<unitPattern count="other">{0} شهر</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>أسبوع</displayName>
+				<unitPattern count="zero">{0} أسبوع</unitPattern>
+				<unitPattern count="one">أسبوع</unitPattern>
+				<unitPattern count="two">أسبوعان</unitPattern>
+				<unitPattern count="few">{0} أسابيع</unitPattern>
+				<unitPattern count="many">{0} أسبوع</unitPattern>
+				<unitPattern count="other">{0} أسبوع</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>يوم</displayName>
 				<unitPattern count="zero">{0} يوم</unitPattern>
-				<unitPattern count="one">{0} يوم</unitPattern>
-				<unitPattern count="two">{0} يوم</unitPattern>
-				<unitPattern count="few">{0} يوم</unitPattern>
-				<unitPattern count="many">{0} يوم</unitPattern>
+				<unitPattern count="one">يوم</unitPattern>
+				<unitPattern count="two">يومان</unitPattern>
+				<unitPattern count="few">{0} أيام</unitPattern>
+				<unitPattern count="many">{0} يومًا</unitPattern>
 				<unitPattern count="other">{0} يوم</unitPattern>
 			</unit>
 			<unit type="duration-hour">
@@ -9757,15 +10293,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} س</unitPattern>
 				<unitPattern count="other">{0} س</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>مللي ثانية</displayName>
-				<unitPattern count="zero" draft="contributed">{0} مللي ث.</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} مللي ث.</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} مللي ث.</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} مللي ث.</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} مللي ث.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} مللي ث.</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>د</displayName>
 				<unitPattern count="zero">{0} د</unitPattern>
@@ -9775,15 +10302,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} د</unitPattern>
 				<unitPattern count="other">{0} د</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>شهر</displayName>
-				<unitPattern count="zero">{0} شهر</unitPattern>
-				<unitPattern count="one">{0} شهر</unitPattern>
-				<unitPattern count="two">{0} شهر</unitPattern>
-				<unitPattern count="few">{0} شهر</unitPattern>
-				<unitPattern count="many">{0} شهر</unitPattern>
-				<unitPattern count="other">{0} شهر</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>ث</displayName>
 				<unitPattern count="zero">{0} ث</unitPattern>
@@ -9793,32 +10311,74 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ث</unitPattern>
 				<unitPattern count="other">{0} ث</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>أسبوع</displayName>
-				<unitPattern count="zero">{0} أسبوع</unitPattern>
-				<unitPattern count="one">{0} أسبوع</unitPattern>
-				<unitPattern count="two">{0} أسبوع</unitPattern>
-				<unitPattern count="few">{0} أسبوع</unitPattern>
-				<unitPattern count="many">{0} أسبوع</unitPattern>
-				<unitPattern count="other">{0} أسبوع</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>مللي ثانية</displayName>
+				<unitPattern count="zero">{0} مللي ث.</unitPattern>
+				<unitPattern count="one">{0} مللي ث.</unitPattern>
+				<unitPattern count="two">{0} مللي ث.</unitPattern>
+				<unitPattern count="few">{0} مللي ث.</unitPattern>
+				<unitPattern count="many">{0} مللي ث.</unitPattern>
+				<unitPattern count="other">{0} مللي ث.</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>سنة</displayName>
-				<unitPattern count="zero">{0} سنة</unitPattern>
-				<unitPattern count="one">{0} سنة</unitPattern>
-				<unitPattern count="two">{0} سنة</unitPattern>
-				<unitPattern count="few">{0} سنة</unitPattern>
-				<unitPattern count="many">{0} سنة</unitPattern>
-				<unitPattern count="other">{0} سنة</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>كم</displayName>
+				<unitPattern count="zero">{0} كم</unitPattern>
+				<unitPattern count="one">{0} كم</unitPattern>
+				<unitPattern count="two">{0} كم</unitPattern>
+				<unitPattern count="few">{0} كم</unitPattern>
+				<unitPattern count="many">{0} كم</unitPattern>
+				<unitPattern count="other">{0} كم</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>متر</displayName>
+				<unitPattern count="zero">{0} م</unitPattern>
+				<unitPattern count="one">{0} متر</unitPattern>
+				<unitPattern count="two">{0} م</unitPattern>
+				<unitPattern count="few">{0} م</unitPattern>
+				<unitPattern count="many">{0} م</unitPattern>
+				<unitPattern count="other">{0} م</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
-				<displayName draft="contributed">سم</displayName>
-				<unitPattern count="zero" draft="contributed">{0} سم</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} سم</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} سم</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} سم</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} سم</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} سم</unitPattern>
+				<displayName>سم</displayName>
+				<unitPattern count="zero">{0} سم</unitPattern>
+				<unitPattern count="one">{0} سم</unitPattern>
+				<unitPattern count="two">{0} سم</unitPattern>
+				<unitPattern count="few">{0} سم</unitPattern>
+				<unitPattern count="many">{0} سم</unitPattern>
+				<unitPattern count="other">{0} سم</unitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>مم</displayName>
+				<unitPattern count="zero">{0} ملم</unitPattern>
+				<unitPattern count="one">{0} ملم</unitPattern>
+				<unitPattern count="two">{0} ملم</unitPattern>
+				<unitPattern count="few">{0} ملم</unitPattern>
+				<unitPattern count="many">{0} ملم</unitPattern>
+				<unitPattern count="other">{0} ملم</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<unitPattern count="zero" draft="contributed">{0} بيكومتر</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} بيكومتر</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} بيكومتر</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} بيكومتر</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} بيكومتر</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} بيكومتر</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<unitPattern count="zero" draft="contributed">{0} من الأميال</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} ميل</unitPattern>
+				<unitPattern count="two" draft="contributed">ميلان ({0})</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أميال</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ميلاً</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} من الأميال</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<unitPattern count="zero" draft="contributed">{0} من الياردات</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} ياردة</unitPattern>
+				<unitPattern count="two" draft="contributed">ياردتان ({0})</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ياردات</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ياردة</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} من الياردات</unitPattern>
 			</unit>
 			<unit type="length-foot">
 				<unitPattern count="zero" draft="contributed">{0} من الأقدام</unitPattern>
@@ -9836,15 +10396,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} بوصة</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} بوصة</unitPattern>
 			</unit>
-			<unit type="length-kilometer">
-				<displayName draft="contributed">كم</displayName>
-				<unitPattern count="zero" draft="contributed">{0} كم</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كم</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} كم</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} كم</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كم</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كم</unitPattern>
-			</unit>
 			<unit type="length-light-year">
 				<unitPattern count="zero">{0}س ض</unitPattern>
 				<unitPattern count="one">{0} س ض</unitPattern>
@@ -9853,74 +10404,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} س ض</unitPattern>
 				<unitPattern count="other">{0} س ض</unitPattern>
 			</unit>
-			<unit type="length-meter">
-				<displayName draft="contributed">متر</displayName>
-				<unitPattern count="zero" draft="contributed">{0} من الأمتار</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} متر</unitPattern>
-				<unitPattern count="two" draft="contributed">متران ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أمتار</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} مترًا</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الأمتار</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<unitPattern count="zero" draft="contributed">{0} من الأميال</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ميل</unitPattern>
-				<unitPattern count="two" draft="contributed">ميلان ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أميال</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ميلاً</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الأميال</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName draft="contributed">مم</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ملم</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ملم</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ملم</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ملم</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ملم</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ملم</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<unitPattern count="zero" draft="contributed">{0} بيكومتر</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} بيكومتر</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} بيكومتر</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} بيكومتر</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} بيكومتر</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} بيكومتر</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<unitPattern count="zero" draft="contributed">{0} من الياردات</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ياردة</unitPattern>
-				<unitPattern count="two" draft="contributed">ياردتان ({0})</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ياردات</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ياردة</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} من الياردات</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>كغم</displayName>
+				<unitPattern count="zero">{0} كغم</unitPattern>
+				<unitPattern count="one">{0} كغم</unitPattern>
+				<unitPattern count="two">{0} كغم</unitPattern>
+				<unitPattern count="few">{0} كغم</unitPattern>
+				<unitPattern count="many">{0} كغم</unitPattern>
+				<unitPattern count="other">{0} كغم</unitPattern>
 			</unit>
 			<unit type="mass-gram">
-				<displayName draft="contributed">غ</displayName>
+				<displayName>غ</displayName>
 				<unitPattern count="zero">{0} غ</unitPattern>
-				<unitPattern count="one">{0} غرام</unitPattern>
-				<unitPattern count="two">غرامان ({0})</unitPattern>
-				<unitPattern count="few">{0} غرامات</unitPattern>
-				<unitPattern count="many">{0} غرامًا</unitPattern>
+				<unitPattern count="one">{0} غ</unitPattern>
+				<unitPattern count="two">{0} غ</unitPattern>
+				<unitPattern count="few">{0} غ</unitPattern>
+				<unitPattern count="many">{0} غ</unitPattern>
 				<unitPattern count="other">{0}غ</unitPattern>
 			</unit>
-			<unit type="mass-kilogram">
-				<displayName draft="contributed">كغم</displayName>
-				<unitPattern count="zero" draft="contributed">{0} كغم</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كغم</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} كغم</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} كغم</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كغم</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كغم</unitPattern>
-			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="zero" draft="contributed">{0} أونس</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} أونس</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} أونس</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} أونس</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} أونس</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} أونس</unitPattern>
-			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="zero" draft="contributed">{0}#</unitPattern>
 				<unitPattern count="one" draft="contributed">{0}#</unitPattern>
@@ -9929,13 +10430,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0}#</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}#</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="zero" draft="contributed">{0} قوة حصان</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} قوة حصان</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} قوة حصان</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} قوة حصان</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} قوة حصان</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} قوة حصان</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="zero" draft="contributed">{0} أونس</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} أونس</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} أونس</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أونس</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} أونس</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} أونس</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="zero">{0} كواط</unitPattern>
@@ -9953,6 +10454,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} واط</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} واط</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="zero" draft="contributed">{0} قوة حصان</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} قوة حصان</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} قوة حصان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} قوة حصان</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} قوة حصان</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} قوة حصان</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="zero">{0} هكب</unitPattern>
 				<unitPattern count="one">{0} هكب</unitPattern>
@@ -9978,13 +10487,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other" draft="contributed">{0} مللي بار</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName draft="contributed">كم/س</displayName>
-				<unitPattern count="zero" draft="contributed">{0} كم/س</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} كم/س</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} كم/س</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} كم/س</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} كم/س</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كم/س</unitPattern>
+				<displayName>كم/س</displayName>
+				<unitPattern count="zero">{0} كم/س</unitPattern>
+				<unitPattern count="one">{0} كم/س</unitPattern>
+				<unitPattern count="two">{0} كم/س</unitPattern>
+				<unitPattern count="few">{0} كم/س</unitPattern>
+				<unitPattern count="many">{0} كم/س</unitPattern>
+				<unitPattern count="other">{0} كم/س</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
 				<unitPattern count="zero" draft="contributed">{0} م/ث</unitPattern>
@@ -10036,14 +10545,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other" draft="contributed">{0} ميل مكعب</unitPattern>
 			</unit>
 			<unit type="volume-liter">
-				<displayName draft="contributed">لتر</displayName>
+				<displayName>لتر</displayName>
 				<unitPattern count="zero">{0} ل</unitPattern>
-				<unitPattern count="one">{0} لتر</unitPattern>
-				<unitPattern count="two">لتران ({0})</unitPattern>
-				<unitPattern count="few">{0} لترات</unitPattern>
-				<unitPattern count="many">{0} لترًا</unitPattern>
+				<unitPattern count="one">{0} ل</unitPattern>
+				<unitPattern count="two">{0} ل</unitPattern>
+				<unitPattern count="few">{0} ل</unitPattern>
+				<unitPattern count="many">{0} ل</unitPattern>
 				<unitPattern count="other">{0} ل</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} شرق</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} شمال</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">{0} ج</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0} غ</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
@@ -10057,28 +10572,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</units>
 	<listPatterns>
 		<listPattern>
-			<listPatternPart type="start" draft="contributed">{0}، {1}</listPatternPart>
-			<listPatternPart type="middle" draft="contributed">{0}، {1}</listPatternPart>
-			<listPatternPart type="end" draft="contributed">{0}، و {1}</listPatternPart>
-			<listPatternPart type="2" draft="contributed">{0} و {1}</listPatternPart>
+			<listPatternPart type="start">{0}، {1}</listPatternPart>
+			<listPatternPart type="middle">{0}، {1}</listPatternPart>
+			<listPatternPart type="end" draft="contributed">{0}، و{1}</listPatternPart>
+			<listPatternPart type="2" draft="contributed">{0} و{1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit">
-			<listPatternPart type="start" draft="contributed">{0}، {1}</listPatternPart>
-			<listPatternPart type="middle" draft="contributed">{0}، {1}</listPatternPart>
-			<listPatternPart type="end" draft="contributed">{0}، و {1}</listPatternPart>
-			<listPatternPart type="2" draft="contributed">{0} و {1}</listPatternPart>
+			<listPatternPart type="start">{0}، {1}</listPatternPart>
+			<listPatternPart type="middle">{0}، {1}</listPatternPart>
+			<listPatternPart type="end" draft="contributed">{0}، و{1}</listPatternPart>
+			<listPatternPart type="2" draft="contributed">{0} و{1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-narrow">
-			<listPatternPart type="start" draft="contributed">{0}، {1}</listPatternPart>
-			<listPatternPart type="middle" draft="contributed">{0}، {1}</listPatternPart>
-			<listPatternPart type="end" draft="contributed">{0}، و {1}</listPatternPart>
-			<listPatternPart type="2" draft="contributed">{0} و {1}</listPatternPart>
+			<listPatternPart type="start">{0}، {1}</listPatternPart>
+			<listPatternPart type="middle">{0}، {1}</listPatternPart>
+			<listPatternPart type="end" draft="contributed">{0}، و{1}</listPatternPart>
+			<listPatternPart type="2" draft="contributed">{0} و{1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-short">
-			<listPatternPart type="start" draft="contributed">{0}، {1}</listPatternPart>
-			<listPatternPart type="middle" draft="contributed">{0}، {1}</listPatternPart>
-			<listPatternPart type="end" draft="contributed">{0}، و {1}</listPatternPart>
-			<listPatternPart type="2" draft="contributed">{0} و {1}</listPatternPart>
+			<listPatternPart type="start">{0}، {1}</listPatternPart>
+			<listPatternPart type="middle">{0}، {1}</listPatternPart>
+			<listPatternPart type="end" draft="contributed">{0}، و{1}</listPatternPart>
+			<listPatternPart type="2" draft="contributed">{0} و{1}</listPatternPart>
 		</listPattern>
 	</listPatterns>
 	<posix>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_001.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_001.xml
new file mode 100644
index 00000000000..89bd2ca6d64
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_001.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="ar"/>
+		<territory type="001"/>
+	</identity>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_AE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_AE.xml
similarity index 83%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_AE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_AE.xml
index 91a9ae42704..fa0b7096ecf 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_AE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_AE.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 11994 $"/>
 		<language type="ar"/>
 		<territory type="AE"/>
 	</identity>
@@ -32,7 +31,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</calendars>
 		<fields>
 			<field type="year">
+				<relative type="-1" draft="contributed">السنة الماضية</relative>
 				<relative type="0" draft="contributed">هذه السنة</relative>
+				<relative type="1" draft="contributed">السنة التالية</relative>
 			</field>
 		</fields>
 	</dates>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_BH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_BH.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_BH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_BH.xml
index 70cab6bdbd1..12360d0d0b8 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_BH.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_BH.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ar"/>
 		<territory type="BH"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_DJ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_DJ.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_DJ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_DJ.xml
index 21eeef707c5..abd2c2ec37f 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_DJ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_DJ.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ar"/>
 		<territory type="DJ"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_DZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_DZ.xml
similarity index 96%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_DZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_DZ.xml
index 8c7da2cf4e8..f5affb8d019 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_DZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_DZ.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11217 $"/>
-		<generation date="$Date: 2015-02-17 23:51:09 -0600 (Tue, 17 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ar"/>
 		<territory type="DZ"/>
 	</identity>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_EG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_EG.xml
similarity index 62%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_EG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_EG.xml
index 2b0efc5086e..d611e544c54 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_EG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_EG.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11217 $"/>
-		<generation date="$Date: 2015-02-17 23:51:09 -0600 (Tue, 17 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ar"/>
 		<territory type="EG"/>
 	</identity>
@@ -16,10 +15,5 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="da" draft="contributed">الدنماركية</language>
 		</languages>
 	</localeDisplayNames>
-	<listPatterns>
-		<listPattern>
-			<listPatternPart type="2" draft="contributed">{0} و{1}</listPatternPart>
-		</listPattern>
-	</listPatterns>
 </ldml>
 
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_EH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_EH.xml
similarity index 72%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_EH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_EH.xml
index 72ad3d531f4..5cc63d7055c 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_EH.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_EH.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ar"/>
 		<territory type="EH"/>
 	</identity>
@@ -15,3 +14,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<defaultNumberingSystem>latn</defaultNumberingSystem>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_ER.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_ER.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_ER.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_ER.xml
index fe2b190a330..2d99dea8f13 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_ER.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_ER.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ar"/>
 		<territory type="ER"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_IL.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_IL.xml
new file mode 100644
index 00000000000..e3b6c6df902
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_IL.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="ar"/>
+		<territory type="IL"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>H:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>H:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>H:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>H:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_IQ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_IQ.xml
similarity index 96%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_IQ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_IQ.xml
index 2937fa92bdf..c62256d21c6 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_IQ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_IQ.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ar"/>
 		<territory type="IQ"/>
 	</identity>
@@ -108,3 +107,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</calendars>
 	</dates>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_JO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_JO.xml
similarity index 96%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_JO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_JO.xml
index 13ccfaddf6a..aa8ca381a8a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_JO.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_JO.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ar"/>
 		<territory type="JO"/>
 	</identity>
@@ -108,3 +107,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</calendars>
 	</dates>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_KM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_KM.xml
new file mode 100644
index 00000000000..36e7af66988
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_KM.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="ar"/>
+		<territory type="KM"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_KW.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_KW.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_KW.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_KW.xml
index a63f1cbbb6a..8ae014ce34d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_KW.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_KW.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ar"/>
 		<territory type="KW"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_LB.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_LB.xml
similarity index 96%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_LB.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_LB.xml
index 897e16379bc..85ff426cee0 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_LB.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_LB.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11218 $"/>
-		<generation date="$Date: 2015-02-17 23:53:06 -0600 (Tue, 17 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ar"/>
 		<territory type="LB"/>
 	</identity>
@@ -118,4 +117,5 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 		</currencies>
 	</numbers>
-</ldml>
\ No newline at end of file
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_LY.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_LY.xml
similarity index 76%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_LY.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_LY.xml
index 9d347c9eb8c..645efce4d0d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_LY.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_LY.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ar"/>
 		<territory type="LY"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</symbols>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_MA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_MA.xml
similarity index 85%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_MA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_MA.xml
index 115cb3bbc8c..b273d3d4a32 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_MA.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_MA.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11217 $"/>
-		<generation date="$Date: 2015-02-17 23:51:09 -0600 (Tue, 17 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ar"/>
 		<territory type="MA"/>
 	</identity>
@@ -104,6 +103,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</monthWidth>
 					</monthContext>
 				</months>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
 			</calendar>
 		</calendars>
 	</dates>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_MR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_MR.xml
similarity index 80%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_MR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_MR.xml
index 242591da167..f365d91a896 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_MR.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_MR.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12217 $"/>
 		<language type="ar"/>
 		<territory type="MR"/>
 	</identity>
@@ -31,8 +30,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="12">دجمبر</month>
 						</monthWidth>
 						<monthWidth type="narrow">
+							<month type="1">ي</month>
+							<month type="2">ف</month>
+							<month type="3">م</month>
 							<month type="4">إ</month>
+							<month type="5">و</month>
+							<month type="6">ن</month>
+							<month type="7">ل</month>
+							<month type="8">غ</month>
 							<month type="9">ش</month>
+							<month type="10">ك</month>
+							<month type="11">ب</month>
+							<month type="12">د</month>
 						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">يناير</month>
@@ -65,8 +74,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="12">دجمبر</month>
 						</monthWidth>
 						<monthWidth type="narrow">
+							<month type="1">ي</month>
+							<month type="2">ف</month>
+							<month type="3">م</month>
 							<month type="4">إ</month>
+							<month type="5">و</month>
+							<month type="6">ن</month>
+							<month type="7">ل</month>
+							<month type="8">غ</month>
 							<month type="9">ش</month>
+							<month type="10">ك</month>
+							<month type="11">ب</month>
+							<month type="12">د</month>
 						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">يناير</month>
@@ -94,3 +113,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</symbols>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_OM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_OM.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_OM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_OM.xml
index 901eb5a4ae0..a1e921ea907 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_OM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_OM.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ar"/>
 		<territory type="OM"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_PS.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_PS.xml
similarity index 96%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_PS.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_PS.xml
index 317af1e4a4b..9cfa050ea5b 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_PS.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_PS.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ar"/>
 		<territory type="PS"/>
 	</identity>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_QA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_QA.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_QA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_QA.xml
index 789635f3282..07501a2b147 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_QA.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_QA.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11217 $"/>
-		<generation date="$Date: 2015-02-17 23:51:09 -0600 (Tue, 17 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ar"/>
 		<territory type="QA"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_SA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SA.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_SA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SA.xml
index ce99a25cd73..3736aba366c 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_SA.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SA.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11217 $"/>
-		<generation date="$Date: 2015-02-17 23:51:09 -0600 (Tue, 17 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ar"/>
 		<territory type="SA"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_SD.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SD.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_SD.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SD.xml
index d187770ae77..e8e8242a34d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_SD.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SD.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ar"/>
 		<territory type="SD"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_SO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SO.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_SO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SO.xml
index 9732167cf97..fabd56d6e34 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_SO.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SO.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ar"/>
 		<territory type="SO"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_SS.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SS.xml
similarity index 76%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_SS.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SS.xml
index 89316e51761..55ce8b93ab7 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_SS.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SS.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ar"/>
 		<territory type="SS"/>
 	</identity>
@@ -22,3 +21,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_SY.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SY.xml
similarity index 96%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_SY.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SY.xml
index 94baf73538e..5345efe7249 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_SY.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SY.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11218 $"/>
-		<generation date="$Date: 2015-02-17 23:53:06 -0600 (Tue, 17 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ar"/>
 		<territory type="SY"/>
 	</identity>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_TD.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_TD.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_TD.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_TD.xml
index fe81b107737..4105246a002 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_TD.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_TD.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ar"/>
 		<territory type="TD"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_TN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_TN.xml
similarity index 96%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_TN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_TN.xml
index 488ec975091..d579dd1a613 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_TN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_TN.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11217 $"/>
-		<generation date="$Date: 2015-02-17 23:51:09 -0600 (Tue, 17 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ar"/>
 		<territory type="TN"/>
 	</identity>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_YE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_YE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_YE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_YE.xml
index f885349202d..fc5635de7c8 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_YE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_YE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11217 $"/>
-		<generation date="$Date: 2015-02-17 23:51:09 -0600 (Tue, 17 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ar"/>
 		<territory type="YE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/as.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/as.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/as.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/as.xml
index f444e6cfc6d..21002f47fff 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/as.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/as.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="as"/>
 	</identity>
 	<localeDisplayNames>
@@ -44,21 +43,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="currency" draft="contributed">মুদ্ৰা</key>
 		</keys>
 		<types>
-			<type type="big5han" key="collation" draft="contributed">পৰম্পৰাগত চীনা শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম - Big5</type>
-			<type type="buddhist" key="calendar" draft="contributed">বৌদ্ধ পঞ্জিকা</type>
-			<type type="chinese" key="calendar" draft="contributed">চীনা পঞ্জিকা</type>
-			<type type="gb2312han" key="collation" draft="contributed">সৰল চীনা শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম - GB2312</type>
-			<type type="gregorian" key="calendar" draft="contributed">গ্ৰিগোৰীয় পঞ্জিকা</type>
-			<type type="hebrew" key="calendar" draft="contributed">হীব্ৰু পঞ্জিকা</type>
-			<type type="indian" key="calendar" draft="contributed">ভাৰতীয় ৰাষ্ট্ৰীয় পঞ্জিকা</type>
-			<type type="islamic" key="calendar" draft="contributed">ইচলামী পঞ্জিকা</type>
-			<type type="islamic-civil" key="calendar" draft="contributed">ইচলামী-নাগৰিকৰ পঞ্জিকা</type>
-			<type type="japanese" key="calendar" draft="contributed">জাপানী পঞ্জিকা</type>
-			<type type="phonebook" key="collation" draft="contributed">টেলিফোন বহিৰ মতেশৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম</type>
-			<type type="pinyin" key="collation" draft="contributed">পিন্‌য়িন শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম</type>
-			<type type="roc" key="calendar" draft="contributed">চীনা গণৰাজ্যৰ পঞ্জিকা</type>
-			<type type="stroke" key="collation" draft="contributed">স্ট্ৰোক শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম</type>
-			<type type="traditional" key="collation" draft="contributed">পৰম্পৰাগতভাবে শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম</type>
+			<type key="calendar" type="buddhist" draft="contributed">বৌদ্ধ পঞ্জিকা</type>
+			<type key="calendar" type="chinese" draft="contributed">চীনা পঞ্জিকা</type>
+			<type key="calendar" type="gregorian" draft="contributed">গ্ৰিগোৰীয় পঞ্জিকা</type>
+			<type key="calendar" type="hebrew" draft="contributed">হীব্ৰু পঞ্জিকা</type>
+			<type key="calendar" type="indian" draft="contributed">ভাৰতীয় ৰাষ্ট্ৰীয় পঞ্জিকা</type>
+			<type key="calendar" type="islamic" draft="contributed">ইচলামী পঞ্জিকা</type>
+			<type key="calendar" type="islamic-civil" draft="contributed">ইচলামী-নাগৰিকৰ পঞ্জিকা</type>
+			<type key="calendar" type="japanese" draft="contributed">জাপানী পঞ্জিকা</type>
+			<type key="calendar" type="roc" draft="contributed">চীনা গণৰাজ্যৰ পঞ্জিকা</type>
+			<type key="collation" type="big5han" draft="contributed">পৰম্পৰাগত চীনা শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম - Big5</type>
+			<type key="collation" type="gb2312han" draft="contributed">সৰল চীনা শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম - GB2312</type>
+			<type key="collation" type="phonebook" draft="contributed">টেলিফোন বহিৰ মতেশৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম</type>
+			<type key="collation" type="pinyin" draft="contributed">পিন্‌য়িন শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম</type>
+			<type key="collation" type="stroke" draft="contributed">স্ট্ৰোক শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম</type>
+			<type key="collation" type="traditional" draft="contributed">পৰম্পৰাগতভাবে শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">মেট্ৰিক</measurementSystemName>
@@ -66,7 +65,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</measurementSystemNames>
 	</localeDisplayNames>
 	<characters>
-		<exemplarCharacters>[অ আ ই ঈ উ ঊ ঋ এ ঐ ও ঔ ং \u0981 ঃ ক খ গ ঘ ঙ চ ছ জ ঝ ঞ ট ঠ ড {ড\u09BC}ড় ঢ {ঢ\u09BC}ঢ় ণ ত থ দ ধ ন প ফ ব ভ ম য {য\u09BC} ৰ ল ৱ শ ষ স হ {ক\u09CDষ} া ি ী \u09C1 \u09C2 \u09C3 ে ৈ ো ৌ \u09CD]</exemplarCharacters>
+		<exemplarCharacters>[\u09BC অ আ ই ঈ উ ঊ ঋ এ ঐ ও ঔ ং \u0981 ঃ ক খ গ ঘ ঙ চ ছ জ ঝ ঞ ট ঠ ড {ড\u09BC} ঢ {ঢ\u09BC} ণ ত থ দ ধ ন প ফ ব ভ ম য {য\u09BC} ৰ ল ৱ শ ষ স হ {ক\u09CDষ} া ি ী \u09C1 \u09C2 \u09C3 ে ৈ ো ৌ \u09CD]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[\u200C\u200D ৲]</exemplarCharacters>
 		<exemplarCharacters type="index" draft="unconfirmed">[অ আ ই ঈ উ ঊ ঋ ৠ ঌ ৡ এ ঐ ও ঔ ক খ গ ঘ ঙ চ ছ জ ঝ ঞ ট ঠ ড ঢ ণ ৎ ত থ দ ধ ন প ফ ব ভ ম য ৰ ল ৱ শ ষ স হ ঽ]</exemplarCharacters>
 	</characters>
@@ -163,6 +162,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">পূৰ্বাহ্ণ</dayPeriod>
+							<dayPeriod type="pm">অপৰাহ্ণ</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">পূৰ্বাহ্ণ</dayPeriod>
 							<dayPeriod type="pm">অপৰাহ্ণ</dayPeriod>
@@ -230,8 +233,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day">
 				<displayName>দিন</displayName>
-				<relative type="-2" draft="unconfirmed">পৰহি</relative>
+				<relative type="-2">পৰহি</relative>
 				<relative type="-1">কালি</relative>
+				<relative type="0">আজি</relative>
 				<relative type="1">কাইলৈ</relative>
 				<relative type="2">পৰহিলৈ</relative>
 			</field>
@@ -267,6 +271,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<otherNumberingSystems>
 			<native>beng</native>
 		</otherNumberingSystems>
+		<symbols>
+			<timeSeparator draft="unconfirmed">.</timeSeparator>
+		</symbols>
 		<decimalFormats numberSystem="latn">
 			<decimalFormatLength>
 				<decimalFormat>
@@ -287,6 +294,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤ #,##,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤ 0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤ 00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤ 000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤ 0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤ 00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤ 000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤ 0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤ 00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤ 000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤ 0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤ 00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤ 000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 	</numbers>
 </ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/as_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/as_IN.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/as_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/as_IN.xml
index 0c78daaf25d..6a8d97753d1 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/as_IN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/as_IN.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="as"/>
 		<territory type="IN"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/asa.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/asa.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/asa.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/asa.xml
index ef92273634f..69a1b65e24a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/asa.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/asa.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="asa"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antili za Uholandhi</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Ajentina</territory>
 			<territory type="AS">Thamoa ya Marekani</territory>
@@ -448,6 +446,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">icheheavo</dayPeriod>
+							<dayPeriod type="pm">ichamthi</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">icheheavo</dayPeriod>
 							<dayPeriod type="pm">ichamthi</dayPeriod>
@@ -489,22 +491,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -583,6 +585,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0K ¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0K ¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00K ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K ¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000K ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K ¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0M ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M ¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00M ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M ¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000M ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M ¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0G ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G ¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00G ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G ¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000G ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0T ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00T ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000T ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -763,3 +793,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/asa_TZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/asa_TZ.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/asa_TZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/asa_TZ.xml
index 851fc5f2d2e..1654141cfba 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/asa_TZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/asa_TZ.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="asa"/>
 		<territory type="TZ"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ast.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ast.xml
new file mode 100644
index 00000000000..10573d1635d
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ast.xml
@@ -0,0 +1,10293 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12411 $"/>
+		<language type="ast"/>
+	</identity>
+	<localeDisplayNames>
+		<localeDisplayPattern>
+			<localePattern>{0} ({1})</localePattern>
+			<localeSeparator>{0}, {1}</localeSeparator>
+			<localeKeyTypePattern>{0}: {1}</localeKeyTypePattern>
+		</localeDisplayPattern>
+		<languages>
+			<language type="aa">afar</language>
+			<language type="ab">abkhazianu</language>
+			<language type="ace">achinés</language>
+			<language type="ach">acoli</language>
+			<language type="ada">adangme</language>
+			<language type="ady">adyghe</language>
+			<language type="ae">avestanín</language>
+			<language type="aeb">árabe de Túnez</language>
+			<language type="af">afrikaans</language>
+			<language type="afh">afrihili</language>
+			<language type="agq">aghem</language>
+			<language type="ain">ainu</language>
+			<language type="ak">akan</language>
+			<language type="akk">acadianu</language>
+			<language type="akz">alabama</language>
+			<language type="ale">aleut</language>
+			<language type="aln">gheg d’Albania</language>
+			<language type="alt">altai del sur</language>
+			<language type="am">amháricu</language>
+			<language type="an">aragonés</language>
+			<language type="ang">inglés antiguu</language>
+			<language type="anp">angika</language>
+			<language type="ar">árabe</language>
+			<language type="ar_001">árabe estándar modernu</language>
+			<language type="arc">araméu</language>
+			<language type="arn">mapuche</language>
+			<language type="aro">araona</language>
+			<language type="arp">arapaho</language>
+			<language type="arq">árabe d’Arxelia</language>
+			<language type="arw">arawak</language>
+			<language type="ary">árabe de Marruecos</language>
+			<language type="arz">árabe d’Exiptu</language>
+			<language type="as">asamés</language>
+			<language type="asa">asu</language>
+			<language type="ase">llingua de signos americana</language>
+			<language type="ast">asturianu</language>
+			<language type="av">aváricu</language>
+			<language type="avk">kotava</language>
+			<language type="awa">awadhi</language>
+			<language type="ay">aymara</language>
+			<language type="az">azerbaixanu</language>
+			<language type="az" alt="short">azerí</language>
+			<language type="ba">bashkir</language>
+			<language type="bal">baluchi</language>
+			<language type="ban">balinés</language>
+			<language type="bar">bávaru</language>
+			<language type="bas">basaa</language>
+			<language type="bax">bamun</language>
+			<language type="bbc">batak toba</language>
+			<language type="bbj">ghomala</language>
+			<language type="be">bielorrusu</language>
+			<language type="bej">beja</language>
+			<language type="bem">bemba</language>
+			<language type="bew">betawi</language>
+			<language type="bez">bena</language>
+			<language type="bfd">bafut</language>
+			<language type="bfq">badaga</language>
+			<language type="bg">búlgaru</language>
+			<language type="bgn">balochi occidental</language>
+			<language type="bho">bhojpuri</language>
+			<language type="bi">bislama</language>
+			<language type="bik">bikol</language>
+			<language type="bin">bini</language>
+			<language type="bjn">banjar</language>
+			<language type="bkm">kom</language>
+			<language type="bla">siksika</language>
+			<language type="bm">bambara</language>
+			<language type="bn">bengalín</language>
+			<language type="bo">tibetanu</language>
+			<language type="bpy">bishnupriya</language>
+			<language type="bqi">bakhtiari</language>
+			<language type="br">bretón</language>
+			<language type="bra">braj</language>
+			<language type="brh">brahui</language>
+			<language type="brx">bodo</language>
+			<language type="bs">bosniu</language>
+			<language type="bss">akoose</language>
+			<language type="bua">buriat</language>
+			<language type="bug">buginés</language>
+			<language type="bum">bulu</language>
+			<language type="byn">blin</language>
+			<language type="byv">medumba</language>
+			<language type="ca">catalán</language>
+			<language type="cad">caddo</language>
+			<language type="car">caribe</language>
+			<language type="cay">cayuga</language>
+			<language type="cch">atsam</language>
+			<language type="ce">chechenu</language>
+			<language type="ceb">cebuanu</language>
+			<language type="cgg">chiga</language>
+			<language type="ch">chamorro</language>
+			<language type="chb">chibcha</language>
+			<language type="chg">chagatai</language>
+			<language type="chk">chuukés</language>
+			<language type="chm">mari</language>
+			<language type="chn">xíriga chinook</language>
+			<language type="cho">choctaw</language>
+			<language type="chp">chipewyanu</language>
+			<language type="chr">cheroqui</language>
+			<language type="chy">cheyenne</language>
+			<language type="ckb">kurdu central</language>
+			<language type="co">corsu</language>
+			<language type="cop">cópticu</language>
+			<language type="cps">capiznon</language>
+			<language type="cr">cree</language>
+			<language type="crh">turcu de Crimea</language>
+			<language type="cs">checu</language>
+			<language type="csb">kashubianu</language>
+			<language type="cu">eslávicu eclesiásticu</language>
+			<language type="cv">chuvash</language>
+			<language type="cy">galés</language>
+			<language type="da">danés</language>
+			<language type="dak">dakota</language>
+			<language type="dar">dargwa</language>
+			<language type="dav">taita</language>
+			<language type="de">alemán</language>
+			<language type="de_AT">alemán d’Austria</language>
+			<language type="de_CH">altualemán de Suiza</language>
+			<language type="del">delaware</language>
+			<language type="den">slave</language>
+			<language type="dgr">dogrib</language>
+			<language type="din">dinka</language>
+			<language type="dje">zarma</language>
+			<language type="doi">dogri</language>
+			<language type="dsb">baxu sorbiu</language>
+			<language type="dtp">dusun central</language>
+			<language type="dua">duala</language>
+			<language type="dum">neerlandés mediu</language>
+			<language type="dv">divehi</language>
+			<language type="dyo">jola-fonyi</language>
+			<language type="dyu">dyula</language>
+			<language type="dz">dzongkha</language>
+			<language type="dzg">dazaga</language>
+			<language type="ebu">embú</language>
+			<language type="ee">ewe</language>
+			<language type="efi">efik</language>
+			<language type="egl">emilianu</language>
+			<language type="egy">exipciu antiguu</language>
+			<language type="eka">ekajuk</language>
+			<language type="el">griegu</language>
+			<language type="elx">elamita</language>
+			<language type="en">inglés</language>
+			<language type="en_AU">inglés d’Australia</language>
+			<language type="en_CA">inglés de Canadá</language>
+			<language type="en_GB">inglés de Gran Bretaña</language>
+			<language type="en_GB" alt="short">inglés del R.X.</language>
+			<language type="en_US">inglés d’Estaos Xuníos</language>
+			<language type="en_US" alt="short">inglés d’EE.XX.</language>
+			<language type="enm">inglés mediu</language>
+			<language type="eo">esperanto</language>
+			<language type="es">español</language>
+			<language type="es_419">español d’América Llatina</language>
+			<language type="es_ES">español européu</language>
+			<language type="es_MX">español de Méxicu</language>
+			<language type="esu">yupik central</language>
+			<language type="et">estoniu</language>
+			<language type="eu">vascu</language>
+			<language type="ewo">ewondo</language>
+			<language type="ext">estremeñu</language>
+			<language type="fa">persa</language>
+			<language type="fan">fang</language>
+			<language type="fat">fanti</language>
+			<language type="ff">fulah</language>
+			<language type="fi">finlandés</language>
+			<language type="fil">filipín</language>
+			<language type="fit">finlandés de Tornedalen</language>
+			<language type="fj">fixanu</language>
+			<language type="fo">feroés</language>
+			<language type="fon">fon</language>
+			<language type="fr">francés</language>
+			<language type="fr_CA">francés de Canadá</language>
+			<language type="fr_CH">francés de Suiza</language>
+			<language type="frc">francés cajun</language>
+			<language type="frm">francés mediu</language>
+			<language type="fro">francés antiguu</language>
+			<language type="frp">arpitanu</language>
+			<language type="frr">frisón del norte</language>
+			<language type="frs">frisón oriental</language>
+			<language type="fur">friulianu</language>
+			<language type="fy">frisón occidental</language>
+			<language type="ga">irlandés</language>
+			<language type="gaa">ga</language>
+			<language type="gag">gagauz</language>
+			<language type="gan">chinu gan</language>
+			<language type="gay">gayo</language>
+			<language type="gba">gbaya</language>
+			<language type="gbz">dari zoroastrianu</language>
+			<language type="gd">gaélicu escocés</language>
+			<language type="gez">geez</language>
+			<language type="gil">gilbertés</language>
+			<language type="gl">gallegu</language>
+			<language type="glk">gilaki</language>
+			<language type="gmh">altualemán mediu</language>
+			<language type="gn">guaraní</language>
+			<language type="goh">altualemán antiguu</language>
+			<language type="gom">goan konkani</language>
+			<language type="gon">gondi</language>
+			<language type="gor">gorontalo</language>
+			<language type="got">góticu</language>
+			<language type="grb">grebo</language>
+			<language type="grc">griegu antiguu</language>
+			<language type="gsw">alemán de Suiza</language>
+			<language type="gu">guyaratí</language>
+			<language type="guc">wayuu</language>
+			<language type="gur">frafra</language>
+			<language type="guz">gusii</language>
+			<language type="gv">manés</language>
+			<language type="gwi">gwichʼin</language>
+			<language type="ha">ḥausa</language>
+			<language type="hai">haida</language>
+			<language type="hak">chinu hakka</language>
+			<language type="haw">hawaianu</language>
+			<language type="he">hebréu</language>
+			<language type="hi">hindi</language>
+			<language type="hif">hindi de Fiji</language>
+			<language type="hil">hiligaynon</language>
+			<language type="hit">hitita</language>
+			<language type="hmn">hmong</language>
+			<language type="ho">hiri motu</language>
+			<language type="hr">croata</language>
+			<language type="hsb">altu sorbiu</language>
+			<language type="hsn">chinu xiang</language>
+			<language type="ht">haitianu</language>
+			<language type="hu">húngaru</language>
+			<language type="hup">hupa</language>
+			<language type="hy">armeniu</language>
+			<language type="hz">herero</language>
+			<language type="ia">interlingua</language>
+			<language type="iba">iban</language>
+			<language type="ibb">ibibio</language>
+			<language type="id">indonesiu</language>
+			<language type="ie">interlingue</language>
+			<language type="ig">igbo</language>
+			<language type="ii">yi de Sichuán</language>
+			<language type="ik">inupiaq</language>
+			<language type="ilo">iloko</language>
+			<language type="inh">ingush</language>
+			<language type="io">ido</language>
+			<language type="is">islandés</language>
+			<language type="it">italianu</language>
+			<language type="iu">inuktitut</language>
+			<language type="izh">ingrianu</language>
+			<language type="ja">xaponés</language>
+			<language type="jam">inglés criollu xamaicanu</language>
+			<language type="jbo">lojban</language>
+			<language type="jgo">ngomba</language>
+			<language type="jmc">machame</language>
+			<language type="jpr">xudeo-persa</language>
+			<language type="jrb">xudeo-árabe</language>
+			<language type="jut">jutlandés</language>
+			<language type="jv">xavanés</language>
+			<language type="ka">xeorxanu</language>
+			<language type="kaa">kara-kalpak</language>
+			<language type="kab">kabileñu</language>
+			<language type="kac">kachin</language>
+			<language type="kaj">jju</language>
+			<language type="kam">kamba</language>
+			<language type="kaw">kawi</language>
+			<language type="kbd">kabardianu</language>
+			<language type="kbl">kanembu</language>
+			<language type="kcg">tyap</language>
+			<language type="kde">makonde</language>
+			<language type="kea">cabuverdianu</language>
+			<language type="ken">kenyang</language>
+			<language type="kfo">koro</language>
+			<language type="kg">kongo</language>
+			<language type="kgp">kaingang</language>
+			<language type="kha">khasi</language>
+			<language type="kho">khotanés</language>
+			<language type="khq">koyra chiini</language>
+			<language type="khw">khowar</language>
+			<language type="ki">kikuyu</language>
+			<language type="kiu">kirmanjki</language>
+			<language type="kj">kuanyama</language>
+			<language type="kk">kazaquistanín</language>
+			<language type="kkj">kako</language>
+			<language type="kl">kalaallisut</language>
+			<language type="kln">kalenjin</language>
+			<language type="km">ḥemer</language>
+			<language type="kmb">kimbundu</language>
+			<language type="kn">canarés</language>
+			<language type="ko">coreanu</language>
+			<language type="koi">komi-permyak</language>
+			<language type="kok">konkani</language>
+			<language type="kos">kosraeanu</language>
+			<language type="kpe">kpelle</language>
+			<language type="kr">kanuri</language>
+			<language type="krc">karachay-balkar</language>
+			<language type="kri">krio</language>
+			<language type="krj">kinaray-a</language>
+			<language type="krl">karelianu</language>
+			<language type="kru">kurukh</language>
+			<language type="ks">cachemirés</language>
+			<language type="ksb">shambala</language>
+			<language type="ksf">bafia</language>
+			<language type="ksh">colonianu</language>
+			<language type="ku">curdu</language>
+			<language type="kum">kumyk</language>
+			<language type="kut">kutenai</language>
+			<language type="kv">komi</language>
+			<language type="kw">córnicu</language>
+			<language type="ky">kirguistanín</language>
+			<language type="la">llatín</language>
+			<language type="lad">ladino</language>
+			<language type="lag">langi</language>
+			<language type="lah">lahnda</language>
+			<language type="lam">lamba</language>
+			<language type="lb">luxemburgués</language>
+			<language type="lez">lezghianu</language>
+			<language type="lfn">lingua franca nova</language>
+			<language type="lg">ganda</language>
+			<language type="li">limburgués</language>
+			<language type="lij">ligurianu</language>
+			<language type="liv">livonianu</language>
+			<language type="lkt">lakota</language>
+			<language type="lmo">lombardu</language>
+			<language type="ln">lingala</language>
+			<language type="lo">laosianu</language>
+			<language type="lol">mongo</language>
+			<language type="loz">lozi</language>
+			<language type="lrc">luri del norte</language>
+			<language type="lt">lituanu</language>
+			<language type="ltg">latgalianu</language>
+			<language type="lu">luba-katanga</language>
+			<language type="lua">luba-lulua</language>
+			<language type="lui">luiseno</language>
+			<language type="lun">lunda</language>
+			<language type="luo">luo</language>
+			<language type="lus">mizo</language>
+			<language type="luy">luyia</language>
+			<language type="lv">letón</language>
+			<language type="lzh">chinu lliterariu</language>
+			<language type="lzz">laz</language>
+			<language type="mad">madurés</language>
+			<language type="maf">mafa</language>
+			<language type="mag">magahi</language>
+			<language type="mai">maithili</language>
+			<language type="mak">makasar</language>
+			<language type="man">mandingo</language>
+			<language type="mas">masái</language>
+			<language type="mde">maba</language>
+			<language type="mdf">moksha</language>
+			<language type="mdr">mandar</language>
+			<language type="men">mende</language>
+			<language type="mer">meru</language>
+			<language type="mfe">morisyen</language>
+			<language type="mg">malgaxe</language>
+			<language type="mga">írlandés mediu</language>
+			<language type="mgh">makhuwa-meetto</language>
+			<language type="mgo">meta’</language>
+			<language type="mh">marshallés</language>
+			<language type="mi">maorí</language>
+			<language type="mic">micmac</language>
+			<language type="min">minangkabau</language>
+			<language type="mk">macedoniu</language>
+			<language type="ml">malayalam</language>
+			<language type="mn">mongol</language>
+			<language type="mnc">manchú</language>
+			<language type="mni">manipuri</language>
+			<language type="moh">mohawk</language>
+			<language type="mos">mossi</language>
+			<language type="mr">marathi</language>
+			<language type="mrj">mari occidental</language>
+			<language type="ms">malayu</language>
+			<language type="mt">maltés</language>
+			<language type="mua">mundang</language>
+			<language type="mul">múltiples llingües</language>
+			<language type="mus">creek</language>
+			<language type="mwl">mirandés</language>
+			<language type="mwr">marwari</language>
+			<language type="mwv">mentawai</language>
+			<language type="my">birmanu</language>
+			<language type="mye">myene</language>
+			<language type="myv">erzya</language>
+			<language type="mzn">mazanderani</language>
+			<language type="na">nauru</language>
+			<language type="nan">chinu min nan</language>
+			<language type="nap">napolitanu</language>
+			<language type="naq">nama</language>
+			<language type="nb">noruegu Bokmål</language>
+			<language type="nd">ndebele del norte</language>
+			<language type="nds">baxu alemán</language>
+			<language type="nds_NL">baxu saxón</language>
+			<language type="ne">nepalés</language>
+			<language type="new">newari</language>
+			<language type="ng">ndonga</language>
+			<language type="nia">nias</language>
+			<language type="niu">niueanu</language>
+			<language type="njo">ao naga</language>
+			<language type="nl">neerlandés</language>
+			<language type="nl_BE">flamencu</language>
+			<language type="nmg">kwasio</language>
+			<language type="nn">noruegu Nynorsk</language>
+			<language type="nnh">ngiemboon</language>
+			<language type="no">noruegu</language>
+			<language type="nog">nogai</language>
+			<language type="non">noruegu antiguu</language>
+			<language type="nov">novial</language>
+			<language type="nqo">n’ko</language>
+			<language type="nr">ndebele del sur</language>
+			<language type="nso">sotho del norte</language>
+			<language type="nus">nuer</language>
+			<language type="nv">navajo</language>
+			<language type="nwc">newari clásicu</language>
+			<language type="ny">nyanja</language>
+			<language type="nym">nyamwezi</language>
+			<language type="nyn">nyankole</language>
+			<language type="nyo">nyoro</language>
+			<language type="nzi">nzima</language>
+			<language type="oc">occitanu</language>
+			<language type="oj">ojibwa</language>
+			<language type="om">oromo</language>
+			<language type="or">oriya</language>
+			<language type="os">oséticu</language>
+			<language type="osa">Osage</language>
+			<language type="ota">turcu otomanu</language>
+			<language type="pa">punyabí</language>
+			<language type="pag">pangasinan</language>
+			<language type="pal">pahlavi</language>
+			<language type="pam">pampanga</language>
+			<language type="pap">papiamento</language>
+			<language type="pau">palauanu</language>
+			<language type="pcd">pícaru</language>
+			<language type="pdc">alemán de Pennsylvania</language>
+			<language type="pdt">plautdietsch</language>
+			<language type="peo">persa antiguu</language>
+			<language type="pfl">alemán palatinu</language>
+			<language type="phn">feniciu</language>
+			<language type="pi">pali</language>
+			<language type="pl">polacu</language>
+			<language type="pms">piamontés</language>
+			<language type="pnt">pónticu</language>
+			<language type="pon">pohnpeianu</language>
+			<language type="prg">prusianu</language>
+			<language type="pro">provenzal antiguu</language>
+			<language type="ps">pashtu</language>
+			<language type="pt">portugués</language>
+			<language type="pt_BR">portugués del Brasil</language>
+			<language type="pt_PT">portugués européu</language>
+			<language type="qu">quechua</language>
+			<language type="quc">kʼicheʼ</language>
+			<language type="qug">quichua del altiplanu de Chimborazo</language>
+			<language type="raj">rajasthanín</language>
+			<language type="rap">rapanui</language>
+			<language type="rar">rarotonganu</language>
+			<language type="rgn">romañol</language>
+			<language type="rif">rifianu</language>
+			<language type="rm">romanche</language>
+			<language type="rn">rundi</language>
+			<language type="ro">rumanu</language>
+			<language type="ro_MD">moldavu</language>
+			<language type="rof">rombo</language>
+			<language type="rom">romaní</language>
+			<language type="root">root</language>
+			<language type="rtm">rotumanu</language>
+			<language type="ru">rusu</language>
+			<language type="rue">rusyn</language>
+			<language type="rug">roviana</language>
+			<language type="rup">aromanianu</language>
+			<language type="rw">kinyarwanda</language>
+			<language type="rwk">rwa</language>
+			<language type="sa">sánscritu</language>
+			<language type="sad">sandavés</language>
+			<language type="sah">sakha</language>
+			<language type="sam">araméu samaritanu</language>
+			<language type="saq">samburu</language>
+			<language type="sas">sasak</language>
+			<language type="sat">santali</language>
+			<language type="saz">saurashtra</language>
+			<language type="sba">ngambay</language>
+			<language type="sbp">sangu</language>
+			<language type="sc">sardu</language>
+			<language type="scn">sicilianu</language>
+			<language type="sco">scots</language>
+			<language type="sd">sindhi</language>
+			<language type="sdc">sardu sassarés</language>
+			<language type="sdh">Kurdu del sur</language>
+			<language type="se">sami del norte</language>
+			<language type="see">séneca</language>
+			<language type="seh">sena</language>
+			<language type="sei">seri</language>
+			<language type="sel">selkup</language>
+			<language type="ses">koyraboro senni</language>
+			<language type="sg">sango</language>
+			<language type="sga">irlandés antiguu</language>
+			<language type="sgs">samogitianu</language>
+			<language type="sh">serbo-croata</language>
+			<language type="shi">tachelhit</language>
+			<language type="shn">shan</language>
+			<language type="shu">árabe chadianu</language>
+			<language type="si">cingalés</language>
+			<language type="sid">sidamo</language>
+			<language type="sk">eslovacu</language>
+			<language type="sl">eslovenu</language>
+			<language type="sli">baxu silesianu</language>
+			<language type="sly">selayarés</language>
+			<language type="sm">samoanu</language>
+			<language type="sma">sami del sur</language>
+			<language type="smj">lule sami</language>
+			<language type="smn">inari sami</language>
+			<language type="sms">skolt sami</language>
+			<language type="sn">shona</language>
+			<language type="snk">soninke</language>
+			<language type="so">somalín</language>
+			<language type="sog">sogdianu</language>
+			<language type="sq">albanu</language>
+			<language type="sr">serbiu</language>
+			<language type="srn">sranan tongo</language>
+			<language type="srr">serer</language>
+			<language type="ss">swati</language>
+			<language type="ssy">saho</language>
+			<language type="st">sotho del sur</language>
+			<language type="stq">frisón de Saterland</language>
+			<language type="su">sondanés</language>
+			<language type="suk">sukuma</language>
+			<language type="sus">susu</language>
+			<language type="sux">sumeriu</language>
+			<language type="sv">suecu</language>
+			<language type="sw">suaḥili</language>
+			<language type="sw_CD">swahili del Congu</language>
+			<language type="swb">comorianu</language>
+			<language type="syc">siriacu clásicu</language>
+			<language type="syr">siriacu</language>
+			<language type="szl">silesianu</language>
+			<language type="ta">tamil</language>
+			<language type="tcy">tulu</language>
+			<language type="te">telugu</language>
+			<language type="tem">timne</language>
+			<language type="teo">teso</language>
+			<language type="ter">terena</language>
+			<language type="tet">tetum</language>
+			<language type="tg">taxiquistanín</language>
+			<language type="th">tailandés</language>
+			<language type="ti">tigrinya</language>
+			<language type="tig">tigre</language>
+			<language type="tiv">tiv</language>
+			<language type="tk">turcomanu</language>
+			<language type="tkl">tokelau</language>
+			<language type="tkr">tsakhur</language>
+			<language type="tl">tagalog</language>
+			<language type="tlh">klingon</language>
+			<language type="tli">tlingit</language>
+			<language type="tly">talixín</language>
+			<language type="tmh">tamashek</language>
+			<language type="tn">tswana</language>
+			<language type="to">tonganu</language>
+			<language type="tog">tonga nyasa</language>
+			<language type="tpi">tok pisin</language>
+			<language type="tr">turcu</language>
+			<language type="tru">turoyo</language>
+			<language type="trv">taroko</language>
+			<language type="ts">tsonga</language>
+			<language type="tsd">tsakoniu</language>
+			<language type="tsi">tsimshian</language>
+			<language type="tt">tártaru</language>
+			<language type="ttt">tati musulmán</language>
+			<language type="tum">tumbuka</language>
+			<language type="tvl">tuvalu</language>
+			<language type="tw">twi</language>
+			<language type="twq">tasawaq</language>
+			<language type="ty">tahitianu</language>
+			<language type="tyv">tuvinianu</language>
+			<language type="tzm">tamazight del Atles central</language>
+			<language type="udm">udmurt</language>
+			<language type="ug">uigur</language>
+			<language type="uga">ugaríticu</language>
+			<language type="uk">ucraín</language>
+			<language type="umb">umbundu</language>
+			<language type="und">llingua desconocida</language>
+			<language type="ur">urdu</language>
+			<language type="uz">uzbequistanín</language>
+			<language type="vai">vai</language>
+			<language type="ve">venda</language>
+			<language type="vec">venecianu</language>
+			<language type="vep">vepsiu</language>
+			<language type="vi">vietnamín</language>
+			<language type="vls">flamencu occidental</language>
+			<language type="vmf">franconianu del Main</language>
+			<language type="vo">volapük</language>
+			<language type="vot">vóticu</language>
+			<language type="vro">voro</language>
+			<language type="vun">vunjo</language>
+			<language type="wa">valón</language>
+			<language type="wae">walser</language>
+			<language type="wal">wolaytta</language>
+			<language type="war">waray</language>
+			<language type="was">washo</language>
+			<language type="wbp">warlpiri</language>
+			<language type="wo">wolof</language>
+			<language type="wuu">chinu wu</language>
+			<language type="xal">calmuco</language>
+			<language type="xh">xhosa</language>
+			<language type="xmf">mingrelianu</language>
+			<language type="xog">soga</language>
+			<language type="yao">yao</language>
+			<language type="yap">yapés</language>
+			<language type="yav">yangben</language>
+			<language type="ybb">yemba</language>
+			<language type="yi">yiddish</language>
+			<language type="yo">yoruba</language>
+			<language type="yrl">nheengatu</language>
+			<language type="yue">cantonés</language>
+			<language type="za">zhuang</language>
+			<language type="zap">zapoteca</language>
+			<language type="zbl">simbólicu Bliss</language>
+			<language type="zea">zeelandés</language>
+			<language type="zen">zenaga</language>
+			<language type="zgh">tamazight estándar de Marruecos</language>
+			<language type="zh">chinu</language>
+			<language type="zh_Hans">chinu simplificáu</language>
+			<language type="zh_Hant">chinu tradicional</language>
+			<language type="zu">zulú</language>
+			<language type="zun">zuni</language>
+			<language type="zxx">ensin conteníu llingüísticu</language>
+			<language type="zza">zaza</language>
+		</languages>
+		<scripts>
+			<script type="Afak">afaka</script>
+			<script type="Aghb">cáucaso-albanés</script>
+			<script type="Ahom">ahom</script>
+			<script type="Arab">árabe</script>
+			<script type="Armi">aramaicu imperial</script>
+			<script type="Armn">armeniu</script>
+			<script type="Avst">avésticu</script>
+			<script type="Bali">balinés</script>
+			<script type="Bamu">bamum</script>
+			<script type="Bass">bassa vah</script>
+			<script type="Batk">batak</script>
+			<script type="Beng">bengalín</script>
+			<script type="Blis">símbolos de Bliss</script>
+			<script type="Bopo">bopomofo</script>
+			<script type="Brah">brahmi</script>
+			<script type="Brai">braille</script>
+			<script type="Bugi">lontara</script>
+			<script type="Buhd">buhid</script>
+			<script type="Cakm">chakma</script>
+			<script type="Cans">silábicu unificáu de los nativos canadienses</script>
+			<script type="Cari">cariu</script>
+			<script type="Cham">cham</script>
+			<script type="Cher">cheroki</script>
+			<script type="Cirt">cirth</script>
+			<script type="Copt">coptu</script>
+			<script type="Cprt">xipriota</script>
+			<script type="Cyrl">cirílicu</script>
+			<script type="Cyrs">eslavónicu cirílicu eclesiásticu antiguu</script>
+			<script type="Deva">devanagari</script>
+			<script type="Dsrt">alfabetu Deseret</script>
+			<script type="Dupl">taquigrafía Duployé</script>
+			<script type="Egyd">demóticu exipcianu</script>
+			<script type="Egyh">hieráticu exipcianu</script>
+			<script type="Egyp">xeroglíficos exipcianos</script>
+			<script type="Elba">elbasan</script>
+			<script type="Ethi">etíope</script>
+			<script type="Geok">khutsuri xeorxanu</script>
+			<script type="Geor">xeorxanu</script>
+			<script type="Glag">glagolíticu</script>
+			<script type="Goth">góticu</script>
+			<script type="Gran">grantha</script>
+			<script type="Grek">griegu</script>
+			<script type="Gujr">guyarati</script>
+			<script type="Guru">gurmukhi</script>
+			<script type="Hang">hangul</script>
+			<script type="Hani">han</script>
+			<script type="Hano">hanunó’o</script>
+			<script type="Hans">simplificáu</script>
+			<script type="Hans" alt="stand-alone">han simplificáu</script>
+			<script type="Hant">tradicional</script>
+			<script type="Hant" alt="stand-alone">han tradicional</script>
+			<script type="Hatr">hatranu</script>
+			<script type="Hebr">hebréu</script>
+			<script type="Hira">ḥiragana</script>
+			<script type="Hluw">xeroglíficos anatolios</script>
+			<script type="Hmng">pahawh hmong</script>
+			<script type="Hrkt">silabarios xaponeses</script>
+			<script type="Hung">húngaru antiguu</script>
+			<script type="Inds">indus</script>
+			<script type="Ital">itálicu antiguu</script>
+			<script type="Java">xavanés</script>
+			<script type="Jpan">xaponés</script>
+			<script type="Jurc">jurchen</script>
+			<script type="Kali">kayah li</script>
+			<script type="Kana">katakana</script>
+			<script type="Khar">kharoshthi</script>
+			<script type="Khmr">ḥemer</script>
+			<script type="Khoj">khojki</script>
+			<script type="Knda">canarés</script>
+			<script type="Kore">coreanu</script>
+			<script type="Kpel">kpelle</script>
+			<script type="Kthi">kaithi</script>
+			<script type="Lana">lanna</script>
+			<script type="Laoo">laosianu</script>
+			<script type="Latf">fraktur llatín</script>
+			<script type="Latg">gaélicu llatín</script>
+			<script type="Latn">llatín</script>
+			<script type="Lepc">lepcha</script>
+			<script type="Limb">limbu</script>
+			<script type="Lina">llinial A</script>
+			<script type="Linb">llinial B</script>
+			<script type="Lisu">alfabetu de Fraser</script>
+			<script type="Loma">loma</script>
+			<script type="Lyci">liciu</script>
+			<script type="Lydi">lidiu</script>
+			<script type="Mahj">mahajani</script>
+			<script type="Mand">mandéu</script>
+			<script type="Mani">maniquéu</script>
+			<script type="Maya">xeroglíficos mayes</script>
+			<script type="Mend">mende</script>
+			<script type="Merc">meroíticu en cursiva</script>
+			<script type="Mero">meroíticu</script>
+			<script type="Mlym">malayalam</script>
+			<script type="Modi">modi</script>
+			<script type="Mong">mongol</script>
+			<script type="Moon">tipos Moon</script>
+			<script type="Mroo">mro</script>
+			<script type="Mtei">meitei mayek</script>
+			<script type="Mult">multani</script>
+			<script type="Mymr">birmanu</script>
+			<script type="Narb">árabe del norte antiguu</script>
+			<script type="Nbat">nabatéu</script>
+			<script type="Nkgb">geba del naxi</script>
+			<script type="Nkoo">n’ko</script>
+			<script type="Nshu">nüshu</script>
+			<script type="Ogam">ogham</script>
+			<script type="Olck">ol chiki</script>
+			<script type="Orkh">orkhon</script>
+			<script type="Orya">oriya</script>
+			<script type="Osma">osmanya</script>
+			<script type="Palm">palmirenu</script>
+			<script type="Pauc">Pau Cin Hau</script>
+			<script type="Perm">pérmicu antiguu</script>
+			<script type="Phag">escritura ‘Phags-pa</script>
+			<script type="Phli">pahlavi d’inscripciones</script>
+			<script type="Phlp">pahlavi de salteriu</script>
+			<script type="Phlv">pahlavi de llibros</script>
+			<script type="Phnx">feniciu</script>
+			<script type="Plrd">fonéticu de Pollard</script>
+			<script type="Prti">partu d’inscripciones</script>
+			<script type="Qaaa">qaaa</script>
+			<script type="Qaab">qaab</script>
+			<script type="Qaac">qaac</script>
+			<script type="Qaad">qaad</script>
+			<script type="Qaae">qaae</script>
+			<script type="Qaaf">qaaf</script>
+			<script type="Qaag">qaag</script>
+			<script type="Qaah">qaah</script>
+			<script type="Qaak">qaak</script>
+			<script type="Qaal">qaal</script>
+			<script type="Qaam">qaam</script>
+			<script type="Qaan">qaan</script>
+			<script type="Qaao">qaao</script>
+			<script type="Qaap">qaap</script>
+			<script type="Qaaq">qaaq</script>
+			<script type="Qaar">qaar</script>
+			<script type="Qaas">qaas</script>
+			<script type="Qaat">qaat</script>
+			<script type="Qaau">qaau</script>
+			<script type="Qaav">qaav</script>
+			<script type="Qaaw">qaaw</script>
+			<script type="Qaax">qaax</script>
+			<script type="Qaay">qaay</script>
+			<script type="Qaaz">qaaz</script>
+			<script type="Qaba">qaba</script>
+			<script type="Qabb">qabb</script>
+			<script type="Qabc">qabc</script>
+			<script type="Qabd">qabd</script>
+			<script type="Qabe">qabe</script>
+			<script type="Qabf">qabf</script>
+			<script type="Qabg">qabg</script>
+			<script type="Qabh">qabh</script>
+			<script type="Qabi">qabi</script>
+			<script type="Qabj">qabj</script>
+			<script type="Qabk">qabk</script>
+			<script type="Qabl">qabl</script>
+			<script type="Qabm">qabm</script>
+			<script type="Qabn">qabn</script>
+			<script type="Qabo">qabo</script>
+			<script type="Qabp">qabp</script>
+			<script type="Qabq">qabq</script>
+			<script type="Qabr">qabr</script>
+			<script type="Qabs">qabs</script>
+			<script type="Qabt">qabt</script>
+			<script type="Qabu">qabu</script>
+			<script type="Qabv">qabv</script>
+			<script type="Qabw">qabw</script>
+			<script type="Qabx">qabx</script>
+			<script type="Rjng">rejang</script>
+			<script type="Roro">rongorongo</script>
+			<script type="Runr">runes</script>
+			<script type="Samr">samaritanu</script>
+			<script type="Sara">sarati</script>
+			<script type="Sarb">árabe del sur antiguu</script>
+			<script type="Saur">saurashtra</script>
+			<script type="Sgnw">escritura de signos</script>
+			<script type="Shaw">shavianu</script>
+			<script type="Shrd">sharada</script>
+			<script type="Sidd">siddham</script>
+			<script type="Sind">khudabadi</script>
+			<script type="Sinh">cingalés</script>
+			<script type="Sora">sora sompeng</script>
+			<script type="Sund">sondanés</script>
+			<script type="Sylo">syloti nagri</script>
+			<script type="Syrc">siriacu</script>
+			<script type="Syre">siriacu estrangelo</script>
+			<script type="Syrj">siriacu occidental</script>
+			<script type="Syrn">siriacu oriental</script>
+			<script type="Tagb">tagbanwa</script>
+			<script type="Takr">takri</script>
+			<script type="Tale">tai le</script>
+			<script type="Talu">tai lue nuevu</script>
+			<script type="Taml">tamil</script>
+			<script type="Tang">tangut</script>
+			<script type="Tavt">tai viet</script>
+			<script type="Telu">telugu</script>
+			<script type="Teng">tengwar</script>
+			<script type="Tfng">tifinagh</script>
+			<script type="Tglg">tagalog</script>
+			<script type="Thaa">thaana</script>
+			<script type="Thai">tailandés</script>
+			<script type="Tibt">tibetanu</script>
+			<script type="Tirh">tirhuta</script>
+			<script type="Ugar">ugaríticu</script>
+			<script type="Vaii">vai</script>
+			<script type="Visp">fala visible</script>
+			<script type="Wara">varang kshiti</script>
+			<script type="Wole">woleai</script>
+			<script type="Xpeo">persa antiguu</script>
+			<script type="Xsux">cuneiforme sumeriu acadiu</script>
+			<script type="Yiii">yi</script>
+			<script type="Zinh">heredáu</script>
+			<script type="Zmth">escritura matemática</script>
+			<script type="Zsym">símbolos</script>
+			<script type="Zxxx">non escritu</script>
+			<script type="Zyyy">común</script>
+			<script type="Zzzz">escritura desconocida</script>
+		</scripts>
+		<territories>
+			<territory type="001">Mundu</territory>
+			<territory type="002">África</territory>
+			<territory type="003">Norteamérica</territory>
+			<territory type="005">América del Sur</territory>
+			<territory type="009">Oceanía</territory>
+			<territory type="011">África Occidental</territory>
+			<territory type="013">América Central</territory>
+			<territory type="014">África Oriental</territory>
+			<territory type="015">África del Norte</territory>
+			<territory type="017">África Central</territory>
+			<territory type="018">África del Sur</territory>
+			<territory type="019">América</territory>
+			<territory type="021">América del Norte</territory>
+			<territory type="029">Caribe</territory>
+			<territory type="030">Asia Oriental</territory>
+			<territory type="034">Asia del Sur</territory>
+			<territory type="035">Sureste Asiáticu</territory>
+			<territory type="039">Europa del Sur</territory>
+			<territory type="053">Australasia</territory>
+			<territory type="054">Melanesia</territory>
+			<territory type="057">Rexón de Micronesia</territory>
+			<territory type="061">Polinesia</territory>
+			<territory type="142">Asia</territory>
+			<territory type="143">Asia Central</territory>
+			<territory type="145">Asia Occidental</territory>
+			<territory type="150">Europa</territory>
+			<territory type="151">Europa Oriental</territory>
+			<territory type="154">Europa del Norte</territory>
+			<territory type="155">Europa Occidental</territory>
+			<territory type="419">América Llatina</territory>
+			<territory type="AC">Islla Ascensión</territory>
+			<territory type="AD">Andorra</territory>
+			<territory type="AE">Emiratos Árabes Xuníos</territory>
+			<territory type="AF">Afganistán</territory>
+			<territory type="AG">Antigua y Barbuda</territory>
+			<territory type="AI">Anguila</territory>
+			<territory type="AL">Albania</territory>
+			<territory type="AM">Armenia</territory>
+			<territory type="AO">Angola</territory>
+			<territory type="AQ">L’Antártida</territory>
+			<territory type="AR">Arxentina</territory>
+			<territory type="AS">Samoa Americana</territory>
+			<territory type="AT">Austria</territory>
+			<territory type="AU">Australia</territory>
+			<territory type="AW">Aruba</territory>
+			<territory type="AX">Islles Aland</territory>
+			<territory type="AZ">Azerbaixán</territory>
+			<territory type="BA">Bosnia y Herzegovina</territory>
+			<territory type="BB">Barbados</territory>
+			<territory type="BD">Bangladex</territory>
+			<territory type="BE">Bélxica</territory>
+			<territory type="BF">Burkina Fasu</territory>
+			<territory type="BG">Bulgaria</territory>
+			<territory type="BH">Baḥréin</territory>
+			<territory type="BI">Burundi</territory>
+			<territory type="BJ">Benín</territory>
+			<territory type="BL">San Bartolomé</territory>
+			<territory type="BM">Les Bermudes</territory>
+			<territory type="BN">Brunéi</territory>
+			<territory type="BO">Bolivia</territory>
+			<territory type="BQ">Caribe neerlandés</territory>
+			<territory type="BR">Brasil</territory>
+			<territory type="BS">Les Bahames</territory>
+			<territory type="BT">Bután</territory>
+			<territory type="BV">Islla Bouvet</territory>
+			<territory type="BW">Botsuana</territory>
+			<territory type="BY">Bielorrusia</territory>
+			<territory type="BZ">Belize</territory>
+			<territory type="CA">Canadá</territory>
+			<territory type="CC">Islles Cocos (Keeling)</territory>
+			<territory type="CD">Congu - Kinxasa</territory>
+			<territory type="CD" alt="variant">Congu (RDC)</territory>
+			<territory type="CF">República Centroafricana</territory>
+			<territory type="CG">Congu - Brazzaville</territory>
+			<territory type="CG" alt="variant">Congu (República del)</territory>
+			<territory type="CH">Suiza</territory>
+			<territory type="CI">Costa de Marfil</territory>
+			<territory type="CK">Islles Cook</territory>
+			<territory type="CL">Chile</territory>
+			<territory type="CM">Camerún</territory>
+			<territory type="CN">China</territory>
+			<territory type="CO">Colombia</territory>
+			<territory type="CP">Islla Clipperton</territory>
+			<territory type="CR">Costa Rica</territory>
+			<territory type="CU">Cuba</territory>
+			<territory type="CV">Cabu Verde</territory>
+			<territory type="CW">Curaçao</territory>
+			<territory type="CX">Islla Christmas</territory>
+			<territory type="CY">Xipre</territory>
+			<territory type="CZ">Chequia</territory>
+			<territory type="DE">Alemaña</territory>
+			<territory type="DG">Diego Garcia</territory>
+			<territory type="DJ">Xibuti</territory>
+			<territory type="DK">Dinamarca</territory>
+			<territory type="DM">Dominica</territory>
+			<territory type="DO">República Dominicana</territory>
+			<territory type="DZ">Arxelia</territory>
+			<territory type="EA">Ceuta y Melilla</territory>
+			<territory type="EC">Ecuador</territory>
+			<territory type="EE">Estonia</territory>
+			<territory type="EG">Exiptu</territory>
+			<territory type="EH">Sáḥara Occidental</territory>
+			<territory type="ER">Eritrea</territory>
+			<territory type="ES">España</territory>
+			<territory type="ET">Etiopía</territory>
+			<territory type="EU">Xunión Europea</territory>
+			<territory type="FI">Finlandia</territory>
+			<territory type="FJ">Islles Fixi</territory>
+			<territory type="FK">Falkland Islands</territory>
+			<territory type="FK" alt="variant">Islles Malvines (Falkland Islands)</territory>
+			<territory type="FM">Micronesia</territory>
+			<territory type="FO">Islles Feroe</territory>
+			<territory type="FR">Francia</territory>
+			<territory type="GA">Gabón</territory>
+			<territory type="GB">Reinu Xuníu</territory>
+			<territory type="GB" alt="short">RX</territory>
+			<territory type="GD">Granada</territory>
+			<territory type="GE">Xeorxa</territory>
+			<territory type="GF">Guyana Francesa</territory>
+			<territory type="GG">Guernsey</territory>
+			<territory type="GH">Ghana</territory>
+			<territory type="GI">Xibraltar</territory>
+			<territory type="GL">Groenlandia</territory>
+			<territory type="GM">Gambia</territory>
+			<territory type="GN">Guinea</territory>
+			<territory type="GP">Guadalupe</territory>
+			<territory type="GQ">Guinea Ecuatorial</territory>
+			<territory type="GR">Grecia</territory>
+			<territory type="GS">Islles Xeorxa del Sur y Sandwich del Sur</territory>
+			<territory type="GT">Guatemala</territory>
+			<territory type="GU">Guam</territory>
+			<territory type="GW">Guinea-Bisáu</territory>
+			<territory type="GY">Guyana</territory>
+			<territory type="HK">ARE China de Ḥong Kong</territory>
+			<territory type="HK" alt="short">Ḥong Kong</territory>
+			<territory type="HM">Islles Heard y McDonald</territory>
+			<territory type="HN">Hondures</territory>
+			<territory type="HR">Croacia</territory>
+			<territory type="HT">Haití</territory>
+			<territory type="HU">Hungría</territory>
+			<territory type="IC">Islles Canaries</territory>
+			<territory type="ID">Indonesia</territory>
+			<territory type="IE">Irlanda</territory>
+			<territory type="IL">Israel</territory>
+			<territory type="IM">Islla de Man</territory>
+			<territory type="IN">India</territory>
+			<territory type="IO">Territoriu Británicu del Océanu Índicu</territory>
+			<territory type="IQ">Iraq</territory>
+			<territory type="IR">Irán</territory>
+			<territory type="IS">Islandia</territory>
+			<territory type="IT">Italia</territory>
+			<territory type="JE">Jersey</territory>
+			<territory type="JM">Xamaica</territory>
+			<territory type="JO">Xordania</territory>
+			<territory type="JP">Xapón</territory>
+			<territory type="KE">Kenia</territory>
+			<territory type="KG">Kirguistán</territory>
+			<territory type="KH">Camboya</territory>
+			<territory type="KI">Kiribati</territory>
+			<territory type="KM">Les Comores</territory>
+			<territory type="KN">Saint Kitts y Nevis</territory>
+			<territory type="KP">Corea del Norte</territory>
+			<territory type="KR">Corea del Sur</territory>
+			<territory type="KW">Kuwait</territory>
+			<territory type="KY">Islles Caimán</territory>
+			<territory type="KZ">Kazakstán</territory>
+			<territory type="LA">Laos</territory>
+			<territory type="LB">Líbanu</territory>
+			<territory type="LC">Santa Llucía</territory>
+			<territory type="LI">Liechtenstein</territory>
+			<territory type="LK">Sri Lanka</territory>
+			<territory type="LR">Liberia</territory>
+			<territory type="LS">Lesothu</territory>
+			<territory type="LT">Lituania</territory>
+			<territory type="LU">Luxemburgu</territory>
+			<territory type="LV">Letonia</territory>
+			<territory type="LY">Libia</territory>
+			<territory type="MA">Marruecos</territory>
+			<territory type="MC">Mónacu</territory>
+			<territory type="MD">Moldavia</territory>
+			<territory type="ME">Montenegru</territory>
+			<territory type="MF">Saint Martin</territory>
+			<territory type="MG">Madagascar</territory>
+			<territory type="MH">Islles Marshall</territory>
+			<territory type="MK">Macedonia</territory>
+			<territory type="MK" alt="variant">Macedonia (ARYDM)</territory>
+			<territory type="ML">Malí</territory>
+			<territory type="MM">Myanmar (Birmania)</territory>
+			<territory type="MN">Mongolia</territory>
+			<territory type="MO">ARE China de Macáu</territory>
+			<territory type="MO" alt="short">Macáu</territory>
+			<territory type="MP">Islles Marianes del Norte</territory>
+			<territory type="MQ">La Martinica</territory>
+			<territory type="MR">Mauritania</territory>
+			<territory type="MS">Montserrat</territory>
+			<territory type="MT">Malta</territory>
+			<territory type="MU">Mauriciu</territory>
+			<territory type="MV">Les Maldives</territory>
+			<territory type="MW">Malaui</territory>
+			<territory type="MX">Méxicu</territory>
+			<territory type="MY">Malasia</territory>
+			<territory type="MZ">Mozambique</territory>
+			<territory type="NA">Namibia</territory>
+			<territory type="NC">Nueva Caledonia</territory>
+			<territory type="NE">El Níxer</territory>
+			<territory type="NF">Islla Norfolk</territory>
+			<territory type="NG">Nixeria</territory>
+			<territory type="NI">Nicaragua</territory>
+			<territory type="NL">Países Baxos</territory>
+			<territory type="NO">Noruega</territory>
+			<territory type="NP">Nepal</territory>
+			<territory type="NR">Nauru</territory>
+			<territory type="NU">Niue</territory>
+			<territory type="NZ">Nueva Zelanda</territory>
+			<territory type="OM">Omán</territory>
+			<territory type="PA">Panamá</territory>
+			<territory type="PE">Perú</territory>
+			<territory type="PF">Polinesia Francesa</territory>
+			<territory type="PG">Papúa Nueva Guinea</territory>
+			<territory type="PH">Filipines</territory>
+			<territory type="PK">Paquistán</territory>
+			<territory type="PL">Polonia</territory>
+			<territory type="PM">Saint Pierre y Miquelon</territory>
+			<territory type="PN">Islles Pitcairn</territory>
+			<territory type="PR">Puertu Ricu</territory>
+			<territory type="PS">Territorios Palestinos</territory>
+			<territory type="PS" alt="short">Palestina</territory>
+			<territory type="PT">Portugal</territory>
+			<territory type="PW">Paláu</territory>
+			<territory type="PY">Paraguái</territory>
+			<territory type="QA">Qatar</territory>
+			<territory type="QO">Oceanía esterior</territory>
+			<territory type="RE">Reunión</territory>
+			<territory type="RO">Rumanía</territory>
+			<territory type="RS">Serbia</territory>
+			<territory type="RU">Rusia</territory>
+			<territory type="RW">Ruanda</territory>
+			<territory type="SA">Arabia Saudita</territory>
+			<territory type="SB">Islles Salomón</territory>
+			<territory type="SC">Les Seixeles</territory>
+			<territory type="SD">Sudán</territory>
+			<territory type="SE">Suecia</territory>
+			<territory type="SG">Singapur</territory>
+			<territory type="SH">Santa Helena</territory>
+			<territory type="SI">Eslovenia</territory>
+			<territory type="SJ">Svalbard ya Islla Jan Mayen</territory>
+			<territory type="SK">Eslovaquia</territory>
+			<territory type="SL">Sierra Lleona</territory>
+			<territory type="SM">San Marín</territory>
+			<territory type="SN">Senegal</territory>
+			<territory type="SO">Somalia</territory>
+			<territory type="SR">Surinam</territory>
+			<territory type="SS">Sudán del Sur</territory>
+			<territory type="ST">Santu Tomé y Príncipe</territory>
+			<territory type="SV">El Salvador</territory>
+			<territory type="SX">Sint Maarten</territory>
+			<territory type="SY">Siria</territory>
+			<territory type="SZ">Suazilandia</territory>
+			<territory type="TA">Tristán da Cunha</territory>
+			<territory type="TC">Islles Turques y Caicos</territory>
+			<territory type="TD">Chad</territory>
+			<territory type="TF">Tierres Australes Franceses</territory>
+			<territory type="TG">Togu</territory>
+			<territory type="TH">Tailandia</territory>
+			<territory type="TJ">Taxiquistán</territory>
+			<territory type="TK">Tokeláu</territory>
+			<territory type="TL">Timor Oriental</territory>
+			<territory type="TL" alt="variant">Timor Este</territory>
+			<territory type="TM">Turkmenistán</territory>
+			<territory type="TN">Tunicia</territory>
+			<territory type="TO">Tonga</territory>
+			<territory type="TR">Turquía</territory>
+			<territory type="TT">Trinidá y Tobagu</territory>
+			<territory type="TV">Tuvalu</territory>
+			<territory type="TW">Taiwán</territory>
+			<territory type="TZ">Tanzania</territory>
+			<territory type="UA">Ucraína</territory>
+			<territory type="UG">Uganda</territory>
+			<territory type="UM">Islles Perifériques Menores de los EE.XX.</territory>
+			<territory type="US">Estaos Xuníos</territory>
+			<territory type="US" alt="short">EE.XX.</territory>
+			<territory type="UY">Uruguái</territory>
+			<territory type="UZ">Uzbequistán</territory>
+			<territory type="VA">Ciudá del Vaticanu</territory>
+			<territory type="VC">San Vicente y Granadines</territory>
+			<territory type="VE">Venezuela</territory>
+			<territory type="VG">Islles Vírxenes Britániques</territory>
+			<territory type="VI">Islles Vírxenes Americanes</territory>
+			<territory type="VN">Vietnam</territory>
+			<territory type="VU">Vanuatu</territory>
+			<territory type="WF">Wallis y Futuna</territory>
+			<territory type="WS">Samoa</territory>
+			<territory type="XK">Kosovu</territory>
+			<territory type="YE">Yemen</territory>
+			<territory type="YT">Mayotte</territory>
+			<territory type="ZA">Sudáfrica</territory>
+			<territory type="ZM">Zambia</territory>
+			<territory type="ZW">Zimbabue</territory>
+			<territory type="ZZ">Rexón desconocida</territory>
+		</territories>
+		<variants>
+			<variant type="1901">ortografía alemana tradicional</variant>
+			<variant type="1994">ortografía resiana estandarizada</variant>
+			<variant type="1996">ortografía alemana de 1996</variant>
+			<variant type="1606NICT">últimu francés mediu fasta 1606</variant>
+			<variant type="1694ACAD">francés modernu primitivu</variant>
+			<variant type="1959ACAD">académicu</variant>
+			<variant type="ALALC97">romanizacion ALA-LC, edicion de 1997</variant>
+			<variant type="ALUKU">dialectu aluku</variant>
+			<variant type="AREVELA">armeniu oriental</variant>
+			<variant type="AREVMDA">armeniu occidental</variant>
+			<variant type="BAKU1926">alfabetu turcu llatino unificáu</variant>
+			<variant type="BALANKA">dialectu balanka del anii</variant>
+			<variant type="BARLA">grupu dialectal barlavento del cabuverdianu</variant>
+			<variant type="BAUDDHA">BAUDDHA</variant>
+			<variant type="BISCAYAN">BISCAYAN</variant>
+			<variant type="BISKE">dialectu San Giorgio/Bila</variant>
+			<variant type="BOHORIC">alfabetu bohorič</variant>
+			<variant type="BOONT">boontling</variant>
+			<variant type="DAJNKO">alfabetu dajnko</variant>
+			<variant type="EKAVSK">serbiu con pronunciación ekaviana</variant>
+			<variant type="EMODENG">inglés modernu primitivu</variant>
+			<variant type="FONIPA">fonética IPA</variant>
+			<variant type="FONUPA">fonética UPA</variant>
+			<variant type="FONXSAMP">FONXSAMP</variant>
+			<variant type="HEPBURN">romanización de Hepburn</variant>
+			<variant type="HOGNORSK">HOGNORSK</variant>
+			<variant type="IJEKAVSK">serbiu con pronunciación Ijekaviana</variant>
+			<variant type="ITIHASA">ITIHASA</variant>
+			<variant type="JAUER">JAUER</variant>
+			<variant type="JYUTPING">JYUTPING</variant>
+			<variant type="KKCOR">ortografía común</variant>
+			<variant type="KOCIEWIE">KOCIEWIE</variant>
+			<variant type="KSCOR">ortografía estándar</variant>
+			<variant type="LAUKIKA">LAUKIKA</variant>
+			<variant type="LIPAW">el dialectu lipovaz del resianu</variant>
+			<variant type="LUNA1918">LUNA1918</variant>
+			<variant type="METELKO">alfabetu metelko</variant>
+			<variant type="MONOTON">monotónicu</variant>
+			<variant type="NDYUKA">dialectu ndyuka</variant>
+			<variant type="NEDIS">dialectu natisone</variant>
+			<variant type="NJIVA">dialectu gniva/njiva</variant>
+			<variant type="NULIK">volapük modernu</variant>
+			<variant type="OSOJS">dialectu oseacco/osojane</variant>
+			<variant type="PAMAKA">dialectu pamaka</variant>
+			<variant type="PETR1708">PETR1708</variant>
+			<variant type="PINYIN">romanización pinyin</variant>
+			<variant type="POLYTON">politónicu</variant>
+			<variant type="POSIX">ordenador</variant>
+			<variant type="PUTER">PUTER</variant>
+			<variant type="REVISED">ortografía revisada</variant>
+			<variant type="RIGIK">volapük clásicu</variant>
+			<variant type="ROZAJ">resianu</variant>
+			<variant type="RUMGR">RUMGR</variant>
+			<variant type="SAAHO">saho</variant>
+			<variant type="SCOTLAND">inglés estándar escocés</variant>
+			<variant type="SCOUSE">scouse</variant>
+			<variant type="SOLBA">dialectu stolvizza/solbica</variant>
+			<variant type="SOTAV">grupu dialectal sotavento del cabuverdianu</variant>
+			<variant type="SURMIRAN">SURMIRAN</variant>
+			<variant type="SURSILV">SURSILV</variant>
+			<variant type="SUTSILV">SUTSILV</variant>
+			<variant type="TARASK">ortografía taraskievica</variant>
+			<variant type="UCCOR">ortografía unificada</variant>
+			<variant type="UCRCOR">ortografía unificada revisada</variant>
+			<variant type="ULSTER">ULSTER</variant>
+			<variant type="UNIFON">alfabetu fonéticu Unifon</variant>
+			<variant type="VAIDIKA">VAIDIKA</variant>
+			<variant type="VALENCIA">valencianu</variant>
+			<variant type="VALLADER">VALLADER</variant>
+			<variant type="WADEGILE">romanización de Wade-Giles</variant>
+		</variants>
+		<keys>
+			<key type="calendar">calendariu</key>
+			<key type="collation">orde de clasificación</key>
+			<key type="currency">moneda</key>
+			<key type="hc">ciclu horariu (12 o 24)</key>
+			<key type="lb">estilu de saltu de llinia</key>
+			<key type="ms">sistema de midida</key>
+			<key type="numbers">númberos</key>
+		</keys>
+		<types>
+			<type key="calendar" type="buddhist">calendariu budista</type>
+			<type key="calendar" type="chinese">calendariu chinu</type>
+			<type key="calendar" type="coptic">calendariu coptu</type>
+			<type key="calendar" type="dangi">calendariu dangi</type>
+			<type key="calendar" type="ethiopic">calendariu etíope</type>
+			<type key="calendar" type="ethiopic-amete-alem">calendariu etíope Amete Alem</type>
+			<type key="calendar" type="gregorian">calendariu gregorianu</type>
+			<type key="calendar" type="hebrew">calendariu hebréu</type>
+			<type key="calendar" type="indian">calendariu nacional indiu</type>
+			<type key="calendar" type="islamic">calendariu islámicu</type>
+			<type key="calendar" type="islamic-civil">calendariu islámicu (tabular, época civil)</type>
+			<type key="calendar" type="islamic-rgsa">calendariu islámicu (Arabia Saudita, visual)</type>
+			<type key="calendar" type="islamic-tbla">calendariu islámicu (tabular, época astronómica)</type>
+			<type key="calendar" type="islamic-umalqura">calendariu islámicu (Umm al-Qura)</type>
+			<type key="calendar" type="iso8601">calendariu ISO-8601</type>
+			<type key="calendar" type="japanese">calendariu xaponés</type>
+			<type key="calendar" type="persian">calendariu persa</type>
+			<type key="calendar" type="roc">calendariu Minguo</type>
+			<type key="collation" type="big5han">orde de clasificación chinu tradicional - Big5</type>
+			<type key="collation" type="compat">orde de clasificación anterior, por compatibilidá</type>
+			<type key="collation" type="dictionary">orde de clasificación de diccionariu</type>
+			<type key="collation" type="ducet">orde de clasificación Unicode predetermináu</type>
+			<type key="collation" type="emoji">orde de clasificación Emoji</type>
+			<type key="collation" type="eor">regles d’ordenamientu europees</type>
+			<type key="collation" type="gb2312han">orde de clasificación chinu simplificáu - GB2312</type>
+			<type key="collation" type="phonebook">orde de clasificación de llista telefónica</type>
+			<type key="collation" type="pinyin">orde de clasificación pinyin</type>
+			<type key="collation" type="reformed">orde de clasificación reformáu</type>
+			<type key="collation" type="search">gueta xeneral</type>
+			<type key="collation" type="searchjl">gueta por consonante Hangul d’aniciu</type>
+			<type key="collation" type="standard">orde de clasificación estándar</type>
+			<type key="collation" type="stroke">orde de clasificación pol trazu</type>
+			<type key="collation" type="traditional">orde de clasificación tradicional</type>
+			<type key="collation" type="unihan">orde de clasificación por radical y trazu</type>
+			<type key="collation" type="zhuyin">orde de clasificación zhuyin</type>
+			<type key="hc" type="h11">sistema de 12 hores (0–11)</type>
+			<type key="hc" type="h12">sistema de 12 hores (1–12)</type>
+			<type key="hc" type="h23">sistema de 24 hores (0–23)</type>
+			<type key="hc" type="h24">sistema de 24 hores (1–24)</type>
+			<type key="lb" type="loose">saltu de llinia relaxáu</type>
+			<type key="lb" type="normal">saltu de llinia normal</type>
+			<type key="lb" type="strict">saltu de llinia estrictu</type>
+			<type key="ms" type="metric">sistema métricu</type>
+			<type key="ms" type="uksystem">sistema de midida imperial</type>
+			<type key="ms" type="ussystem">sistema de midida d’EE.XX.</type>
+			<type key="numbers" type="arab">númberos arábico-índicos</type>
+			<type key="numbers" type="arabext">númberos arábico-índicos estendíos</type>
+			<type key="numbers" type="armn">númberos armenios</type>
+			<type key="numbers" type="armnlow">númberos armenios en minúscules</type>
+			<type key="numbers" type="bali">númberos balineses</type>
+			<type key="numbers" type="beng">númberos bengalinos</type>
+			<type key="numbers" type="brah">númberos brahmi</type>
+			<type key="numbers" type="cakm">númberos chakma</type>
+			<type key="numbers" type="cham">númberos cham</type>
+			<type key="numbers" type="deva">númberos devanagari</type>
+			<type key="numbers" type="ethi">númberos etíopes</type>
+			<type key="numbers" type="fullwide">númberos n’anchu completu</type>
+			<type key="numbers" type="geor">númberos xeorxanos</type>
+			<type key="numbers" type="grek">númberos griegos</type>
+			<type key="numbers" type="greklow">númberos griegos en minúscules</type>
+			<type key="numbers" type="gujr">númberos gujarati</type>
+			<type key="numbers" type="guru">númberos gurmukhi</type>
+			<type key="numbers" type="hanidec">númberos decimales chinos</type>
+			<type key="numbers" type="hans">númberos chinos simplificaos</type>
+			<type key="numbers" type="hansfin">númberos chinos financieros simplificaos</type>
+			<type key="numbers" type="hant">númberos chinos tradicionales</type>
+			<type key="numbers" type="hantfin">númberos chinos financieros tradicionales</type>
+			<type key="numbers" type="hebr">númberos hebreos</type>
+			<type key="numbers" type="java">númberos xavanesos</type>
+			<type key="numbers" type="jpan">númberos xaponeses</type>
+			<type key="numbers" type="jpanfin">númberos financieros xaponeses</type>
+			<type key="numbers" type="kali">númberos Kayah Li</type>
+			<type key="numbers" type="khmr">numberación khmer</type>
+			<type key="numbers" type="knda">numberación kannada</type>
+			<type key="numbers" type="lana">numberación Tai Tham Hora</type>
+			<type key="numbers" type="lanatham">numberación Tai Tham Tham</type>
+			<type key="numbers" type="laoo">númberos laosianos</type>
+			<type key="numbers" type="latn">númberos occidentales</type>
+			<type key="numbers" type="lepc">númberos lepcha</type>
+			<type key="numbers" type="limb">númberos limbu</type>
+			<type key="numbers" type="mlym">númberos malayalam</type>
+			<type key="numbers" type="mong">númberos mongoles</type>
+			<type key="numbers" type="mtei">númberos Meetei Mayek</type>
+			<type key="numbers" type="mymr">númberos de Myanmar</type>
+			<type key="numbers" type="mymrshan">númberos Shan de Myanmar</type>
+			<type key="numbers" type="nkoo">númberos N’Ko</type>
+			<type key="numbers" type="olck">númberos Ol Chiki</type>
+			<type key="numbers" type="orya">númberos oriya</type>
+			<type key="numbers" type="osma">númberos osmanya</type>
+			<type key="numbers" type="roman">númberos romanos</type>
+			<type key="numbers" type="romanlow">númberos romanos en minúscules</type>
+			<type key="numbers" type="saur">númberos saurashtra</type>
+			<type key="numbers" type="shrd">númberos sharada</type>
+			<type key="numbers" type="sora">númberos Sora Sompeng</type>
+			<type key="numbers" type="sund">númberos sondaneses</type>
+			<type key="numbers" type="takr">númberos takri</type>
+			<type key="numbers" type="talu">numberación Tai Lue nueva</type>
+			<type key="numbers" type="taml">númberos tamil tradicionales</type>
+			<type key="numbers" type="tamldec">númberos tamil</type>
+			<type key="numbers" type="telu">númberos telugu</type>
+			<type key="numbers" type="thai">númberos tailandeses</type>
+			<type key="numbers" type="tibt">númberos tibetanos</type>
+			<type key="numbers" type="vaii">númberos vai</type>
+		</types>
+		<measurementSystemNames>
+			<measurementSystemName type="metric">Métricu</measurementSystemName>
+			<measurementSystemName type="UK">R.X.</measurementSystemName>
+			<measurementSystemName type="US">EE.XX.</measurementSystemName>
+		</measurementSystemNames>
+		<codePatterns>
+			<codePattern type="language">Llingua: {0}</codePattern>
+			<codePattern type="script">Alfabetu: {0}</codePattern>
+			<codePattern type="territory">Rexón: {0}</codePattern>
+		</codePatterns>
+	</localeDisplayNames>
+	<characters>
+		<exemplarCharacters>[a á b c d e é f g h ḥ i í l ḷ m n ñ o ó p q r s t u ú ü v x y z]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[ª à ă â å ä ã ā æ ç è ĕ ê ë ē ì ĭ î ï ī j k º ò ŏ ô ö ø ō œ ù ŭ û ū w ÿ]</exemplarCharacters>
+		<exemplarCharacters type="index">[A B C D E F G H I L M N Ñ O P Q R S T U V X Y Z]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐ – — , ; \: ! ¡ ? ¿ . … ' ‘ ’ &quot; “ ” « » ( ) \[ \] § @ * / \\ \&amp; # † ‡ ′ ″]</exemplarCharacters>
+		<ellipsis type="final">{0}…</ellipsis>
+		<ellipsis type="initial">…{0}</ellipsis>
+		<ellipsis type="medial">{0}… {1}</ellipsis>
+		<ellipsis type="word-final">{0} …</ellipsis>
+		<ellipsis type="word-initial">… {0}</ellipsis>
+		<ellipsis type="word-medial">{0} … {1}</ellipsis>
+		<moreInformation>?</moreInformation>
+	</characters>
+	<delimiters>
+		<quotationStart>«</quotationStart>
+		<quotationEnd>»</quotationEnd>
+		<alternateQuotationStart>“</alternateQuotationStart>
+		<alternateQuotationEnd>”</alternateQuotationEnd>
+	</delimiters>
+	<dates>
+		<calendars>
+			<calendar type="buddhist">
+				<eras>
+					<eraNames>
+						<era type="0">era budista</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">EB</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0">EB</era>
+					</eraNarrow>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE, dd MMMM 'de' y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d MMMM 'de' y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>d MMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>d/M/yy GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} 'a' 'les' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} 'a' 'les' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
+						<dateFormatItem id="Ed">E d</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d MMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d MMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="M">L</dateFormatItem>
+						<dateFormatItem id="Md">d/M</dateFormatItem>
+						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d 'de' MMMM</dateFormatItem>
+						<dateFormatItem id="y">y G</dateFormatItem>
+						<dateFormatItem id="yM">M/y</dateFormatItem>
+						<dateFormatItem id="yMd">d/M/y</dateFormatItem>
+						<dateFormatItem id="yMEd">E, d/M/y</dateFormatItem>
+						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMEd">E, d MMM y</dateFormatItem>
+						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
+						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
+						<dateFormatItem id="yyyy">y G</dateFormatItem>
+						<dateFormatItem id="yyyyM">M/y GGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMd">d/M/y GGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E, d/M/y GGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">d MMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">E, d MMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">MMMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">QQQQ 'de' y G</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d – d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">h a – h a</greatestDifference>
+							<greatestDifference id="h">h–h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH – HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">HH:mm – HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm – HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm – HH:mm v</greatestDifference>
+							<greatestDifference id="m">HH:mm – HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">h a – h a v</greatestDifference>
+							<greatestDifference id="h">h – h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH – HH v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">M – M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">dd – dd/MM</greatestDifference>
+							<greatestDifference id="M">dd/MM – dd/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">E, dd – E, dd/MM</greatestDifference>
+							<greatestDifference id="M">E, dd/MM – E, dd/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">LLL – LLL</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">d – d MMM</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">y – y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">M/y – M/y GGGG</greatestDifference>
+							<greatestDifference id="y">M/y – M/y GGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">d/M/y – d/M/y GGGG</greatestDifference>
+							<greatestDifference id="M">d/M/y – d/M/y GGGG</greatestDifference>
+							<greatestDifference id="y">d/M/y – d/M/y GGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">E, d/M/y – E, d/M/y GGGG</greatestDifference>
+							<greatestDifference id="M">E, d/M/y – E, d/M/y GGGG</greatestDifference>
+							<greatestDifference id="y">E, d/M/y – E, d/M/y GGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">LLL – LLL y G</greatestDifference>
+							<greatestDifference id="y">LLL y – LLL y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">d – d MMM 'de' y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM 'de' y G</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">E, d MMM – E, d MMM y G</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM y G</greatestDifference>
+							<greatestDifference id="y">E, d MMM y – E, d MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">LLLL – LLLL 'de' y G</greatestDifference>
+							<greatestDifference id="y">LLLL 'de' y – LLLL 'de' y G</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="chinese">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">mes 1</month>
+							<month type="2">mes 2</month>
+							<month type="3">mes 3</month>
+							<month type="4">mes 4</month>
+							<month type="5">mes 5</month>
+							<month type="6">mes 6</month>
+							<month type="7">mes 7</month>
+							<month type="8">mes 8</month>
+							<month type="9">mes 9</month>
+							<month type="10">mes 10</month>
+							<month type="11">mes 11</month>
+							<month type="12">mes 12</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">1</month>
+							<month type="2">2</month>
+							<month type="3">3</month>
+							<month type="4">4</month>
+							<month type="5">5</month>
+							<month type="6">6</month>
+							<month type="7">7</month>
+							<month type="8">8</month>
+							<month type="9">9</month>
+							<month type="10">10</month>
+							<month type="11">11</month>
+							<month type="12">12</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">mes 1</month>
+							<month type="2">mes 2</month>
+							<month type="3">mes 3</month>
+							<month type="4">mes 4</month>
+							<month type="5">mes 5</month>
+							<month type="6">mes 6</month>
+							<month type="7">mes 7</month>
+							<month type="8">mes 8</month>
+							<month type="9">mes 9</month>
+							<month type="10">mes 10</month>
+							<month type="11">mes 11</month>
+							<month type="12">mes 12</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="narrow">
+							<month type="1">1</month>
+							<month type="2">2</month>
+							<month type="3">3</month>
+							<month type="4">4</month>
+							<month type="5">5</month>
+							<month type="6">6</month>
+							<month type="7">7</month>
+							<month type="8">8</month>
+							<month type="9">9</month>
+							<month type="10">10</month>
+							<month type="11">11</month>
+							<month type="12">12</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">Mes 1</month>
+							<month type="2">Mes 2</month>
+							<month type="3">Mes 3</month>
+							<month type="4">Mes 4</month>
+							<month type="5">Mes 5</month>
+							<month type="6">Mes 6</month>
+							<month type="7">Mes 7</month>
+							<month type="8">Mes 8</month>
+							<month type="9">Mes 9</month>
+							<month type="10">Mes 10</month>
+							<month type="11">Mes 11</month>
+							<month type="12">Mes 12</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<monthPatterns>
+					<monthPatternContext type="format">
+						<monthPatternWidth type="abbreviated">
+							<monthPattern type="leap">{0}bis</monthPattern>
+						</monthPatternWidth>
+						<monthPatternWidth type="narrow">
+							<monthPattern type="leap">{0}b</monthPattern>
+						</monthPatternWidth>
+						<monthPatternWidth type="wide">
+							<monthPattern type="leap">{0} bisiestu</monthPattern>
+						</monthPatternWidth>
+					</monthPatternContext>
+					<monthPatternContext type="numeric">
+						<monthPatternWidth type="all">
+							<monthPattern type="leap">{0} bis</monthPattern>
+						</monthPatternWidth>
+					</monthPatternContext>
+					<monthPatternContext type="stand-alone">
+						<monthPatternWidth type="abbreviated">
+							<monthPattern type="leap">{0}bis</monthPattern>
+						</monthPatternWidth>
+						<monthPatternWidth type="narrow">
+							<monthPattern type="leap">{0}b</monthPattern>
+						</monthPatternWidth>
+						<monthPatternWidth type="wide">
+							<monthPattern type="leap">{0} bisiestu</monthPattern>
+						</monthPatternWidth>
+					</monthPatternContext>
+				</monthPatterns>
+				<cyclicNameSets>
+					<cyclicNameSet type="dayParts">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">ratu</cyclicName>
+								<cyclicName type="2">güe</cyclicName>
+								<cyclicName type="3">tigre</cyclicName>
+								<cyclicName type="4">conexu</cyclicName>
+								<cyclicName type="5">dragón</cyclicName>
+								<cyclicName type="6">culebra</cyclicName>
+								<cyclicName type="7">caballu</cyclicName>
+								<cyclicName type="8">cabra</cyclicName>
+								<cyclicName type="9">monu</cyclicName>
+								<cyclicName type="10">gallu</cyclicName>
+								<cyclicName type="11">perru</cyclicName>
+								<cyclicName type="12">gochu</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="narrow">
+								<cyclicName type="1">ratu</cyclicName>
+								<cyclicName type="2">güe</cyclicName>
+								<cyclicName type="3">tigre</cyclicName>
+								<cyclicName type="4">conexu</cyclicName>
+								<cyclicName type="5">dragón</cyclicName>
+								<cyclicName type="6">culebra</cyclicName>
+								<cyclicName type="7">caballu</cyclicName>
+								<cyclicName type="8">cabra</cyclicName>
+								<cyclicName type="9">monu</cyclicName>
+								<cyclicName type="10">gallu</cyclicName>
+								<cyclicName type="11">perru</cyclicName>
+								<cyclicName type="12">gochu</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="wide">
+								<cyclicName type="1">ratu</cyclicName>
+								<cyclicName type="2">güe</cyclicName>
+								<cyclicName type="3">tigre</cyclicName>
+								<cyclicName type="4">conexu</cyclicName>
+								<cyclicName type="5">dragón</cyclicName>
+								<cyclicName type="6">culebra</cyclicName>
+								<cyclicName type="7">caballu</cyclicName>
+								<cyclicName type="8">cabra</cyclicName>
+								<cyclicName type="9">monu</cyclicName>
+								<cyclicName type="10">gallu</cyclicName>
+								<cyclicName type="11">perru</cyclicName>
+								<cyclicName type="12">gochu</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+					<cyclicNameSet type="solarTerms">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="wide">
+								<cyclicName type="1">principia la primavera</cyclicName>
+								<cyclicName type="2">agua de lluvia</cyclicName>
+								<cyclicName type="3">esconsoñen los inseutos</cyclicName>
+								<cyclicName type="4">equinocciu de primavera</cyclicName>
+								<cyclicName type="5">brillante y claro</cyclicName>
+								<cyclicName type="6">lluvia del granu</cyclicName>
+								<cyclicName type="7">principia’l branu</cyclicName>
+								<cyclicName type="8">granu completu</cyclicName>
+								<cyclicName type="9">granu n’espiga</cyclicName>
+								<cyclicName type="10">solsticiu braniegu</cyclicName>
+								<cyclicName type="11">pequeña calor</cyclicName>
+								<cyclicName type="12">gran calor</cyclicName>
+								<cyclicName type="13">principia la seronda</cyclicName>
+								<cyclicName type="14">fin de la calor</cyclicName>
+								<cyclicName type="15">rosada blanca</cyclicName>
+								<cyclicName type="16">equinocciu serondiegu</cyclicName>
+								<cyclicName type="17">rosada fría</cyclicName>
+								<cyclicName type="18">descende’l xelu</cyclicName>
+								<cyclicName type="19">principia l’iviernu</cyclicName>
+								<cyclicName type="20">pequeña ñeve</cyclicName>
+								<cyclicName type="21">gran ñeve</cyclicName>
+								<cyclicName type="22">solsticiu d’iviernu</cyclicName>
+								<cyclicName type="23">pequeñu fríu</cyclicName>
+								<cyclicName type="24">gran fríu</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+					<cyclicNameSet type="years">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="wide">
+								<cyclicName type="1">ratu de madera yang</cyclicName>
+								<cyclicName type="2">güe de madera yin</cyclicName>
+								<cyclicName type="3">tigre de fueu yang</cyclicName>
+								<cyclicName type="4">conexu de fueu yin</cyclicName>
+								<cyclicName type="5">dragón de tierra yang</cyclicName>
+								<cyclicName type="6">culebra de tierra yin</cyclicName>
+								<cyclicName type="7">caballu de metal yang</cyclicName>
+								<cyclicName type="8">cabra de metal yin</cyclicName>
+								<cyclicName type="9">monu d’agua yang</cyclicName>
+								<cyclicName type="10">gallu d’agua yin</cyclicName>
+								<cyclicName type="11">perru de madera yang</cyclicName>
+								<cyclicName type="12">gochu de madera yin</cyclicName>
+								<cyclicName type="13">ratu de fueu yang</cyclicName>
+								<cyclicName type="14">güe de fueu yin</cyclicName>
+								<cyclicName type="15">tigre de tierra yang</cyclicName>
+								<cyclicName type="16">conexu de tierra yin</cyclicName>
+								<cyclicName type="17">dragón de metal yang</cyclicName>
+								<cyclicName type="18">culebra de metal yin</cyclicName>
+								<cyclicName type="19">caballu d’agua yang</cyclicName>
+								<cyclicName type="20">cabra d’agua yin</cyclicName>
+								<cyclicName type="21">monu de madera yang</cyclicName>
+								<cyclicName type="22">gallu de madera yin</cyclicName>
+								<cyclicName type="23">perru de fueu yang</cyclicName>
+								<cyclicName type="24">gochu de fueu yin</cyclicName>
+								<cyclicName type="25">ratu de tierra yang</cyclicName>
+								<cyclicName type="26">güe de tierra yin</cyclicName>
+								<cyclicName type="27">tigre de metal yang</cyclicName>
+								<cyclicName type="28">conexu de metal yin</cyclicName>
+								<cyclicName type="29">dragón d’agua yang</cyclicName>
+								<cyclicName type="30">culebra d’agua yin</cyclicName>
+								<cyclicName type="31">caballu de madera yang</cyclicName>
+								<cyclicName type="32">cabra de madera yin</cyclicName>
+								<cyclicName type="33">monu de fueu yang</cyclicName>
+								<cyclicName type="34">gallu de fueu yin</cyclicName>
+								<cyclicName type="35">perru de tierra yang</cyclicName>
+								<cyclicName type="36">gochu de tierra yin</cyclicName>
+								<cyclicName type="37">ratu de metal yang</cyclicName>
+								<cyclicName type="38">güe de metal yin</cyclicName>
+								<cyclicName type="39">tigre d’agua yang</cyclicName>
+								<cyclicName type="40">conexu d’agua yin</cyclicName>
+								<cyclicName type="41">dragón de madera yang</cyclicName>
+								<cyclicName type="42">culebra de madera yin</cyclicName>
+								<cyclicName type="43">caballu de fueu yang</cyclicName>
+								<cyclicName type="44">cabra de fueu yin</cyclicName>
+								<cyclicName type="45">monu de tierra yang</cyclicName>
+								<cyclicName type="46">gallu de tierra yin</cyclicName>
+								<cyclicName type="47">perru de metal yang</cyclicName>
+								<cyclicName type="48">gochu de metal yin</cyclicName>
+								<cyclicName type="49">rata d’agua yang</cyclicName>
+								<cyclicName type="50">güe d’agua yin</cyclicName>
+								<cyclicName type="51">tigre de madera yang</cyclicName>
+								<cyclicName type="52">conexu de madera yin</cyclicName>
+								<cyclicName type="53">dragón de fueu yang</cyclicName>
+								<cyclicName type="54">culebra de fueu yin</cyclicName>
+								<cyclicName type="55">caballu de tierra yang</cyclicName>
+								<cyclicName type="56">cabra de tierra yin</cyclicName>
+								<cyclicName type="57">monu de metal yang</cyclicName>
+								<cyclicName type="58">gallu de metal yin</cyclicName>
+								<cyclicName type="59">perru d’agua yang</cyclicName>
+								<cyclicName type="60">gochu d’agua yin</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+					<cyclicNameSet type="zodiacs">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">ratu</cyclicName>
+								<cyclicName type="2">güe</cyclicName>
+								<cyclicName type="3">tigre</cyclicName>
+								<cyclicName type="4">conexu</cyclicName>
+								<cyclicName type="5">dragón</cyclicName>
+								<cyclicName type="6">culebra</cyclicName>
+								<cyclicName type="7">caballu</cyclicName>
+								<cyclicName type="8">cabra</cyclicName>
+								<cyclicName type="9">monu</cyclicName>
+								<cyclicName type="10">gallu</cyclicName>
+								<cyclicName type="11">perru</cyclicName>
+								<cyclicName type="12">gochu</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="narrow">
+								<cyclicName type="1">rat</cyclicName>
+								<cyclicName type="2">güe</cyclicName>
+								<cyclicName type="3">tig</cyclicName>
+								<cyclicName type="4">con</cyclicName>
+								<cyclicName type="5">dra</cyclicName>
+								<cyclicName type="6">cul</cyclicName>
+								<cyclicName type="7">cbl</cyclicName>
+								<cyclicName type="8">cbr</cyclicName>
+								<cyclicName type="9">mon</cyclicName>
+								<cyclicName type="10">gal</cyclicName>
+								<cyclicName type="11">per</cyclicName>
+								<cyclicName type="12">gch</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="wide">
+								<cyclicName type="1">Ratu</cyclicName>
+								<cyclicName type="2">Güe</cyclicName>
+								<cyclicName type="3">Tigre</cyclicName>
+								<cyclicName type="4">Conexu</cyclicName>
+								<cyclicName type="5">Dragón</cyclicName>
+								<cyclicName type="6">Culebra</cyclicName>
+								<cyclicName type="7">Caballu</cyclicName>
+								<cyclicName type="8">Cabra</cyclicName>
+								<cyclicName type="9">Monu</cyclicName>
+								<cyclicName type="10">Gallu</cyclicName>
+								<cyclicName type="11">Perru</cyclicName>
+								<cyclicName type="12">Gochu</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+				</cyclicNameSets>
+			</calendar>
+			<calendar type="dangi">
+				<cyclicNameSets>
+					<cyclicNameSet type="dayParts">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">ratu</cyclicName>
+								<cyclicName type="2">güe</cyclicName>
+								<cyclicName type="3">tigre</cyclicName>
+								<cyclicName type="4">conexu</cyclicName>
+								<cyclicName type="5">dragón</cyclicName>
+								<cyclicName type="6">culebra</cyclicName>
+								<cyclicName type="7">caballu</cyclicName>
+								<cyclicName type="8">cabra</cyclicName>
+								<cyclicName type="9">monu</cyclicName>
+								<cyclicName type="10">gallu</cyclicName>
+								<cyclicName type="11">perru</cyclicName>
+								<cyclicName type="12">gochu</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="wide">
+								<cyclicName type="1">ratu</cyclicName>
+								<cyclicName type="2">güe</cyclicName>
+								<cyclicName type="3">tigre</cyclicName>
+								<cyclicName type="4">conexu</cyclicName>
+								<cyclicName type="5">dragón</cyclicName>
+								<cyclicName type="6">culebra</cyclicName>
+								<cyclicName type="7">caballu</cyclicName>
+								<cyclicName type="8">cabra</cyclicName>
+								<cyclicName type="9">monu</cyclicName>
+								<cyclicName type="10">gallu</cyclicName>
+								<cyclicName type="11">perru</cyclicName>
+								<cyclicName type="12">gochu</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+				</cyclicNameSets>
+			</calendar>
+			<calendar type="ethiopic">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">mes</month>
+							<month type="2">tek</month>
+							<month type="3">hed</month>
+							<month type="4">tah</month>
+							<month type="5">ter</month>
+							<month type="6">yek</month>
+							<month type="7">meg</month>
+							<month type="8">mia</month>
+							<month type="9">gen</month>
+							<month type="10">sen</month>
+							<month type="11">ham</month>
+							<month type="12">neh</month>
+							<month type="13">pag</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">1</month>
+							<month type="2">2</month>
+							<month type="3">3</month>
+							<month type="4">4</month>
+							<month type="5">5</month>
+							<month type="6">6</month>
+							<month type="7">7</month>
+							<month type="8">8</month>
+							<month type="9">9</month>
+							<month type="10">10</month>
+							<month type="11">11</month>
+							<month type="12">12</month>
+							<month type="13">13</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">de meskerem</month>
+							<month type="2">de tekemt</month>
+							<month type="3">d’hedar</month>
+							<month type="4">de tahsas</month>
+							<month type="5">de ter</month>
+							<month type="6">de yekatit</month>
+							<month type="7">de megabit</month>
+							<month type="8">de miazia</month>
+							<month type="9">de genbot</month>
+							<month type="10">de sene</month>
+							<month type="11">d’hamle</month>
+							<month type="12">de nehasse</month>
+							<month type="13">de pagumen</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">mes</month>
+							<month type="2">tek</month>
+							<month type="3">hed</month>
+							<month type="4">tah</month>
+							<month type="5">ter</month>
+							<month type="6">yek</month>
+							<month type="7">meg</month>
+							<month type="8">mia</month>
+							<month type="9">gen</month>
+							<month type="10">sen</month>
+							<month type="11">ham</month>
+							<month type="12">neh</month>
+							<month type="13">pag</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">1</month>
+							<month type="2">2</month>
+							<month type="3">3</month>
+							<month type="4">4</month>
+							<month type="5">5</month>
+							<month type="6">6</month>
+							<month type="7">7</month>
+							<month type="8">8</month>
+							<month type="9">9</month>
+							<month type="10">10</month>
+							<month type="11">11</month>
+							<month type="12">12</month>
+							<month type="13">13</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">Meskerem</month>
+							<month type="2">Tekemt</month>
+							<month type="3">Hedar</month>
+							<month type="4">Tahsas</month>
+							<month type="5">Ter</month>
+							<month type="6">Yekatit</month>
+							<month type="7">Megabit</month>
+							<month type="8">Miazia</month>
+							<month type="9">Genbot</month>
+							<month type="10">Sene</month>
+							<month type="11">Hamle</month>
+							<month type="12">Nehasse</month>
+							<month type="13">Pagumen</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<eras>
+					<eraNames>
+						<era type="0">antes de la Encarnación</era>
+						<era type="1">después de la Encarnación</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">a. E.</era>
+						<era type="1">d. E.</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0">aE</era>
+						<era type="1">dE</era>
+					</eraNarrow>
+				</eras>
+				<dateTimeFormats>
+					<intervalFormats>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d – d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">M – M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">LLL – LLL</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">y – y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">LLL – LLL y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">d – d MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M" draft="unconfirmed">LLLL – LLLL y G</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE, dd MMMM 'de' y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d MMMM 'de' y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>d MMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>d/M/yy GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} 'a' 'les' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} 'a' 'les' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
+						<dateFormatItem id="Ed">E d</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d MMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d MMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="h" draft="unconfirmed">h a</dateFormatItem>
+						<dateFormatItem id="H" draft="unconfirmed">HH</dateFormatItem>
+						<dateFormatItem id="hm" draft="unconfirmed">h:mm a</dateFormatItem>
+						<dateFormatItem id="Hm" draft="unconfirmed">HH:mm</dateFormatItem>
+						<dateFormatItem id="hms" draft="unconfirmed">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hms" draft="unconfirmed">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="M">L</dateFormatItem>
+						<dateFormatItem id="Md">d/M</dateFormatItem>
+						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d 'de' MMMM</dateFormatItem>
+						<dateFormatItem id="ms" draft="unconfirmed">mm:ss</dateFormatItem>
+						<dateFormatItem id="y">y G</dateFormatItem>
+						<dateFormatItem id="yM">M/y</dateFormatItem>
+						<dateFormatItem id="yMd">d/M/y</dateFormatItem>
+						<dateFormatItem id="yMEd">E, d/M/y</dateFormatItem>
+						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMEd">E, d MMM y</dateFormatItem>
+						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
+						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
+						<dateFormatItem id="yyyy">y G</dateFormatItem>
+						<dateFormatItem id="yyyyM">M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E, d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">d MMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">E, d MMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">MMMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d – d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">h a – h a</greatestDifference>
+							<greatestDifference id="h">h–h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">h a – h a v</greatestDifference>
+							<greatestDifference id="h">h–h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">M – M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">dd – dd/MM</greatestDifference>
+							<greatestDifference id="M">dd/MM – dd/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">E, dd – E, dd/MM</greatestDifference>
+							<greatestDifference id="M">E, dd/MM – E, dd/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">LLL – LLL</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">d – d MMM</greatestDifference>
+							<greatestDifference id="M">d/MM – d/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">y – y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">MM – MM/y GGGGG</greatestDifference>
+							<greatestDifference id="y">MM/y – MM/y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">d/M/y – d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="M">d/M/y – d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="y">d/M/y – d/M/y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="M">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="y">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">LLL – LLL y G</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">d – d MMM 'de' y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM 'de' y G</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">E, d MMM – E, d MMM y</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM y</greatestDifference>
+							<greatestDifference id="y">E, d MMM y – E, d MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">LLLL – LLLL 'de' y G</greatestDifference>
+							<greatestDifference id="y">LLLL y – LLLL y</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">xin</month>
+							<month type="2">feb</month>
+							<month type="3">mar</month>
+							<month type="4">abr</month>
+							<month type="5">may</month>
+							<month type="6">xun</month>
+							<month type="7">xnt</month>
+							<month type="8">ago</month>
+							<month type="9">set</month>
+							<month type="10">och</month>
+							<month type="11">pay</month>
+							<month type="12">avi</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">X</month>
+							<month type="2">F</month>
+							<month type="3">M</month>
+							<month type="4">A</month>
+							<month type="5">M</month>
+							<month type="6">X</month>
+							<month type="7">X</month>
+							<month type="8">A</month>
+							<month type="9">S</month>
+							<month type="10">O</month>
+							<month type="11">P</month>
+							<month type="12">A</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">de xineru</month>
+							<month type="2">de febreru</month>
+							<month type="3">de marzu</month>
+							<month type="4">d’abril</month>
+							<month type="5">de mayu</month>
+							<month type="6">de xunu</month>
+							<month type="7">de xunetu</month>
+							<month type="8">d’agostu</month>
+							<month type="9">de setiembre</month>
+							<month type="10">d’ochobre</month>
+							<month type="11">de payares</month>
+							<month type="12">d’avientu</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">Xin</month>
+							<month type="2">Feb</month>
+							<month type="3">Mar</month>
+							<month type="4">Abr</month>
+							<month type="5">May</month>
+							<month type="6">Xun</month>
+							<month type="7">Xnt</month>
+							<month type="8">Ago</month>
+							<month type="9">Set</month>
+							<month type="10">Och</month>
+							<month type="11">Pay</month>
+							<month type="12">Avi</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">X</month>
+							<month type="2">F</month>
+							<month type="3">M</month>
+							<month type="4">A</month>
+							<month type="5">M</month>
+							<month type="6">X</month>
+							<month type="7">X</month>
+							<month type="8">A</month>
+							<month type="9">S</month>
+							<month type="10">O</month>
+							<month type="11">P</month>
+							<month type="12">A</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">xineru</month>
+							<month type="2">febreru</month>
+							<month type="3">marzu</month>
+							<month type="4">abril</month>
+							<month type="5">mayu</month>
+							<month type="6">xunu</month>
+							<month type="7">xunetu</month>
+							<month type="8">agostu</month>
+							<month type="9">setiembre</month>
+							<month type="10">ochobre</month>
+							<month type="11">payares</month>
+							<month type="12">avientu</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="abbreviated">
+							<day type="sun">dom</day>
+							<day type="mon">llu</day>
+							<day type="tue">mar</day>
+							<day type="wed">mié</day>
+							<day type="thu">xue</day>
+							<day type="fri">vie</day>
+							<day type="sat">sáb</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun">D</day>
+							<day type="mon">L</day>
+							<day type="tue">M</day>
+							<day type="wed">M</day>
+							<day type="thu">X</day>
+							<day type="fri">V</day>
+							<day type="sat">S</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">do</day>
+							<day type="mon">ll</day>
+							<day type="tue">ma</day>
+							<day type="wed">mi</day>
+							<day type="thu">xu</day>
+							<day type="fri">vi</day>
+							<day type="sat">sá</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun">domingu</day>
+							<day type="mon">llunes</day>
+							<day type="tue">martes</day>
+							<day type="wed">miércoles</day>
+							<day type="thu">xueves</day>
+							<day type="fri">vienres</day>
+							<day type="sat">sábadu</day>
+						</dayWidth>
+					</dayContext>
+					<dayContext type="stand-alone">
+						<dayWidth type="abbreviated">
+							<day type="sun">dom</day>
+							<day type="mon">llu</day>
+							<day type="tue">mar</day>
+							<day type="wed">mié</day>
+							<day type="thu">xue</day>
+							<day type="fri">vie</day>
+							<day type="sat">sáb</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun">D</day>
+							<day type="mon">L</day>
+							<day type="tue">M</day>
+							<day type="wed">M</day>
+							<day type="thu">X</day>
+							<day type="fri">V</day>
+							<day type="sat">S</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">do</day>
+							<day type="mon">ll</day>
+							<day type="tue">ma</day>
+							<day type="wed">mi</day>
+							<day type="thu">xu</day>
+							<day type="fri">vi</day>
+							<day type="sat">sá</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun">domingu</day>
+							<day type="mon">llunes</day>
+							<day type="tue">martes</day>
+							<day type="wed">miércoles</day>
+							<day type="thu">xueves</day>
+							<day type="fri">vienres</day>
+							<day type="sat">sábadu</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<quarters>
+					<quarterContext type="format">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">1T</quarter>
+							<quarter type="2">2T</quarter>
+							<quarter type="3">3T</quarter>
+							<quarter type="4">4T</quarter>
+						</quarterWidth>
+						<quarterWidth type="narrow">
+							<quarter type="1">1</quarter>
+							<quarter type="2">2</quarter>
+							<quarter type="3">3</quarter>
+							<quarter type="4">4</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1">1er trimestre</quarter>
+							<quarter type="2">2u trimestre</quarter>
+							<quarter type="3">3er trimestre</quarter>
+							<quarter type="4">4u trimestre</quarter>
+						</quarterWidth>
+					</quarterContext>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">1T</quarter>
+							<quarter type="2">2T</quarter>
+							<quarter type="3">3T</quarter>
+							<quarter type="4">4T</quarter>
+						</quarterWidth>
+						<quarterWidth type="narrow">
+							<quarter type="1">1</quarter>
+							<quarter type="2">2</quarter>
+							<quarter type="3">3</quarter>
+							<quarter type="4">4</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1">1er trimestre</quarter>
+							<quarter type="2">2u trimestre</quarter>
+							<quarter type="3">3er trimestre</quarter>
+							<quarter type="4">4u trimestre</quarter>
+						</quarterWidth>
+					</quarterContext>
+				</quarters>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">a</dayPeriod>
+							<dayPeriod type="pm">p</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">de la mañana</dayPeriod>
+							<dayPeriod type="pm">de la tardi</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">a</dayPeriod>
+							<dayPeriod type="pm">p</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">mañana</dayPeriod>
+							<dayPeriod type="pm">tardi</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<eras>
+					<eraNames>
+						<era type="0">a.C.</era>
+						<era type="0" alt="variant">antes de nuestra Era</era>
+						<era type="1">después de Cristu</era>
+						<era type="1" alt="variant">nuestra Era</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">a.C.</era>
+						<era type="0" alt="variant">edC</era>
+						<era type="1">d.C.</era>
+						<era type="1" alt="variant">n.E.</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0">aC</era>
+						<era type="0" alt="variant">anE</era>
+						<era type="1">dC</era>
+						<era type="1" alt="variant">nE</era>
+					</eraNarrow>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE, d MMMM 'de' y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d MMMM 'de' y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>d MMM y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>d/M/yy</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} 'a' 'les' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} 'a' 'les' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
+						<dateFormatItem id="Ed">E d</dateFormatItem>
+						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
+						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
+						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="h">h a</dateFormatItem>
+						<dateFormatItem id="H">HH</dateFormatItem>
+						<dateFormatItem id="hm">h:mm a</dateFormatItem>
+						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
+						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
+						<dateFormatItem id="M">L</dateFormatItem>
+						<dateFormatItem id="Md">d/M</dateFormatItem>
+						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
+						<dateFormatItem id="ms">mm:ss</dateFormatItem>
+						<dateFormatItem id="y">y</dateFormatItem>
+						<dateFormatItem id="yM">M/y</dateFormatItem>
+						<dateFormatItem id="yMd">d/M/y</dateFormatItem>
+						<dateFormatItem id="yMEd">E, d/M/y</dateFormatItem>
+						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMEd">E, d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMM">LLLL 'de' y</dateFormatItem>
+						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
+						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
+					</availableFormats>
+					<appendItems>
+						<appendItem request="Timezone">{0} {1}</appendItem>
+					</appendItems>
+					<intervalFormats>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d – d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">h a – h a</greatestDifference>
+							<greatestDifference id="h">h – h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH – HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">HH:mm – HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm – HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm – HH:mm v</greatestDifference>
+							<greatestDifference id="m">HH:mm – HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">h a – h a v</greatestDifference>
+							<greatestDifference id="h">h – h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH – HH v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">M – M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">dd – dd/MM</greatestDifference>
+							<greatestDifference id="M">dd/MM – dd/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">E, dd – E, dd/MM</greatestDifference>
+							<greatestDifference id="M">E, dd/MM – E, dd/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">LLL – LLL</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">d – d MMM</greatestDifference>
+							<greatestDifference id="M">d/MM – d/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">y – y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">MM – MM/y</greatestDifference>
+							<greatestDifference id="y">MM/y – MM/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">d/M/y – d/M/y</greatestDifference>
+							<greatestDifference id="M">d/M/y – d/M/y</greatestDifference>
+							<greatestDifference id="y">d/M/y – d/M/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">E, d/M/y – E, d/M/y</greatestDifference>
+							<greatestDifference id="M">E, d/M/y – E, d/M/y</greatestDifference>
+							<greatestDifference id="y">E, d/M/y – E, d/M/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">MMM – MMM y</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">d – d MMM 'de' y</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM 'de' y</greatestDifference>
+							<greatestDifference id="y">d MMM 'de' y – d MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">E, d MMM – E, d MMM 'de' y</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM 'de' y</greatestDifference>
+							<greatestDifference id="y">E, d MMM 'de' y – E, d MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">LLLL – LLLL y</greatestDifference>
+							<greatestDifference id="y">LLLL y – LLLL y</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="indian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">Chaitra</month>
+							<month type="2">Vaisakha</month>
+							<month type="3">Jyaistha</month>
+							<month type="4">Asadha</month>
+							<month type="5">Sravana</month>
+							<month type="6">Bhadra</month>
+							<month type="7">Asvina</month>
+							<month type="8">Kartika</month>
+							<month type="9">Agrahayana</month>
+							<month type="10">Pausa</month>
+							<month type="11">Magha</month>
+							<month type="12">Phalguna</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">Chaitra</month>
+							<month type="2">Vaisakha</month>
+							<month type="3">Jyaistha</month>
+							<month type="4">Asadha</month>
+							<month type="5">Sravana</month>
+							<month type="6">Bhadra</month>
+							<month type="7">Asvina</month>
+							<month type="8">Kartika</month>
+							<month type="9">Agrahayana</month>
+							<month type="10">Pausa</month>
+							<month type="11">Magha</month>
+							<month type="12">Phalguna</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">Chaitra</month>
+							<month type="2">Vaisakha</month>
+							<month type="3">Jyaistha</month>
+							<month type="4">Asadha</month>
+							<month type="5">Sravana</month>
+							<month type="6">Bhadra</month>
+							<month type="7">Asvina</month>
+							<month type="8">Kartika</month>
+							<month type="9">Agrahayana</month>
+							<month type="10">Pausa</month>
+							<month type="11">Magha</month>
+							<month type="12">Phalguna</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">Chaitra</month>
+							<month type="2">Vaisakha</month>
+							<month type="3">Jyaistha</month>
+							<month type="4">Asadha</month>
+							<month type="5">Sravana</month>
+							<month type="6">Bhadra</month>
+							<month type="7">Asvina</month>
+							<month type="8">Kartika</month>
+							<month type="9">Agrahayana</month>
+							<month type="10">Pausa</month>
+							<month type="11">Magha</month>
+							<month type="12">Phalguna</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<eras>
+					<eraNames>
+						<era type="0">Saka</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">Saka</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0">Saka</era>
+					</eraNarrow>
+				</eras>
+			</calendar>
+			<calendar type="islamic">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">Muh.</month>
+							<month type="2">Saf.</month>
+							<month type="3">Rab. I</month>
+							<month type="4">Rab. II</month>
+							<month type="5">Jum. I</month>
+							<month type="6">Jum. II</month>
+							<month type="7">Raj.</month>
+							<month type="8">Sha.</month>
+							<month type="9">Ram.</month>
+							<month type="10">Shaw.</month>
+							<month type="11">Dhuʻl-Q.</month>
+							<month type="12">Dhuʻl-H.</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">Muharram</month>
+							<month type="2">Safar</month>
+							<month type="3">Rabiʻ I</month>
+							<month type="4">Rabiʻ II</month>
+							<month type="5">Jumada I</month>
+							<month type="6">Jumada II</month>
+							<month type="7">Rajab</month>
+							<month type="8">Shaʻban</month>
+							<month type="9">Ramadan</month>
+							<month type="10">Shawwal</month>
+							<month type="11">Dhuʻl-Qiʻdah</month>
+							<month type="12">Dhuʻl-Hijjah</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">Muh.</month>
+							<month type="2">Saf.</month>
+							<month type="3">Rab. I</month>
+							<month type="4">Rab. II</month>
+							<month type="5">Jum. I</month>
+							<month type="6">Jum. II</month>
+							<month type="7">Raj.</month>
+							<month type="8">Sha.</month>
+							<month type="9">Ram.</month>
+							<month type="10">Shaw.</month>
+							<month type="11">Dhuʻl-Q.</month>
+							<month type="12">Dhuʻl-H.</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">Muharram</month>
+							<month type="2">Safar</month>
+							<month type="3">Rabiʻ I</month>
+							<month type="4">Rabiʻ II</month>
+							<month type="5">Jumada I</month>
+							<month type="6">Jumada II</month>
+							<month type="7">Rajab</month>
+							<month type="8">Shaʻban</month>
+							<month type="9">Ramadan</month>
+							<month type="10">Shawwal</month>
+							<month type="11">Dhuʻl-Qiʻdah</month>
+							<month type="12">Dhuʻl-Hijjah</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<eras>
+					<eraNames>
+						<era type="0">AH</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">AH</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0">AH</era>
+					</eraNarrow>
+				</eras>
+			</calendar>
+			<calendar type="japanese">
+				<eras>
+					<eraNames>
+						<era type="0">Taika (645–650)</era>
+						<era type="1">Hakuchi (650–671)</era>
+						<era type="2">Hakuhō (672–686)</era>
+						<era type="3">Shuchō (686–701)</era>
+						<era type="4">Taihō (701–704)</era>
+						<era type="5">Keiun (704–708)</era>
+						<era type="6">Wadō (708–715)</era>
+						<era type="7">Reiki (715–717)</era>
+						<era type="8">Yōrō (717–724)</era>
+						<era type="9">Jinki (724–729)</era>
+						<era type="10">Tenpyō (729–749)</era>
+						<era type="11">Tenpyō-kampō (749-749)</era>
+						<era type="12">Tenpyō-shōhō (749-757)</era>
+						<era type="13">Tenpyō-hōji (757-765)</era>
+						<era type="14">Tenpyō-jingo (765-767)</era>
+						<era type="15">Jingo-keiun (767-770)</era>
+						<era type="16">Hōki (770–780)</era>
+						<era type="17">Ten-ō (781-782)</era>
+						<era type="18">Enryaku (782–806)</era>
+						<era type="19">Daidō (806–810)</era>
+						<era type="20">Kōnin (810–824)</era>
+						<era type="21">Tenchō (824–834)</era>
+						<era type="22">Jōwa (834–848)</era>
+						<era type="23">Kajō (848–851)</era>
+						<era type="24">Ninju (851–854)</era>
+						<era type="25">Saikō (854–857)</era>
+						<era type="26">Ten-an (857-859)</era>
+						<era type="27">Jōgan (859–877)</era>
+						<era type="28">Gangyō (877–885)</era>
+						<era type="29">Ninna (885–889)</era>
+						<era type="30">Kanpyō (889–898)</era>
+						<era type="31">Shōtai (898–901)</era>
+						<era type="32">Engi (901–923)</era>
+						<era type="33">Enchō (923–931)</era>
+						<era type="34">Jōhei (931–938)</era>
+						<era type="35">Tengyō (938–947)</era>
+						<era type="36">Tenryaku (947–957)</era>
+						<era type="37">Tentoku (957–961)</era>
+						<era type="38">Ōwa (961–964)</era>
+						<era type="39">Kōhō (964–968)</era>
+						<era type="40">Anna (968–970)</era>
+						<era type="41">Tenroku (970–973)</era>
+						<era type="42">Ten’en (973–976)</era>
+						<era type="43">Jōgen (976–978)</era>
+						<era type="44">Tengen (978–983)</era>
+						<era type="45">Eikan (983–985)</era>
+						<era type="46">Kanna (985–987)</era>
+						<era type="47">Eien (987–989)</era>
+						<era type="48">Eiso (989–990)</era>
+						<era type="49">Shōryaku (990–995)</era>
+						<era type="50">Chōtoku (995–999)</era>
+						<era type="51">Chōhō (999–1004)</era>
+						<era type="52">Kankō (1004–1012)</era>
+						<era type="53">Chōwa (1012–1017)</era>
+						<era type="54">Kannin (1017–1021)</era>
+						<era type="55">Jian (1021–1024)</era>
+						<era type="56">Manju (1024–1028)</era>
+						<era type="57">Chōgen (1028–1037)</era>
+						<era type="58">Chōryaku (1037–1040)</era>
+						<era type="59">Chōkyū (1040–1044)</era>
+						<era type="60">Kantoku (1044–1046)</era>
+						<era type="61">Eishō (1046–1053)</era>
+						<era type="62">Tengi (1053–1058)</era>
+						<era type="63">Kōhei (1058–1065)</era>
+						<era type="64">Jiryaku (1065–1069)</era>
+						<era type="65">Enkyū (1069–1074)</era>
+						<era type="66">Shōho (1074–1077)</era>
+						<era type="67">Shōryaku (1077–1081)</era>
+						<era type="68">Eihō (1081–1084)</era>
+						<era type="69">Ōtoku (1084–1087)</era>
+						<era type="70">Kanji (1087–1094)</era>
+						<era type="71">Kahō (1094–1096)</era>
+						<era type="72">Eichō (1096–1097)</era>
+						<era type="73">Jōtoku (1097–1099)</era>
+						<era type="74">Kōwa (1099–1104)</era>
+						<era type="75">Chōji (1104–1106)</era>
+						<era type="76">Kashō (1106–1108)</era>
+						<era type="77">Tennin (1108–1110)</era>
+						<era type="78">Ten-ei (1110-1113)</era>
+						<era type="79">Eikyū (1113–1118)</era>
+						<era type="80">Gen’ei (1118–1120)</era>
+						<era type="81">Hōan (1120–1124)</era>
+						<era type="82">Tenji (1124–1126)</era>
+						<era type="83">Daiji (1126–1131)</era>
+						<era type="84">Tenshō (1131–1132)</era>
+						<era type="85">Chōshō (1132–1135)</era>
+						<era type="86">Hōen (1135–1141)</era>
+						<era type="87">Eiji (1141–1142)</era>
+						<era type="88">Kōji (1142–1144)</era>
+						<era type="89">Ten’yō (1144–1145)</era>
+						<era type="90">Kyūan (1145–1151)</era>
+						<era type="91">Ninpei (1151–1154)</era>
+						<era type="92">Kyūju (1154–1156)</era>
+						<era type="93">Hōgen (1156–1159)</era>
+						<era type="94">Heiji (1159–1160)</era>
+						<era type="95">Eiryaku (1160–1161)</era>
+						<era type="96">Ōho (1161–1163)</era>
+						<era type="97">Chōkan (1163–1165)</era>
+						<era type="98">Eiman (1165–1166)</era>
+						<era type="99">Nin’an (1166–1169)</era>
+						<era type="100">Kaō (1169–1171)</era>
+						<era type="101">Shōan (1171–1175)</era>
+						<era type="102">Angen (1175–1177)</era>
+						<era type="103">Jishō (1177–1181)</era>
+						<era type="104">Yōwa (1181–1182)</era>
+						<era type="105">Juei (1182–1184)</era>
+						<era type="106">Genryaku (1184–1185)</era>
+						<era type="107">Bunji (1185–1190)</era>
+						<era type="108">Kenkyū (1190–1199)</era>
+						<era type="109">Shōji (1199–1201)</era>
+						<era type="110">Kennin (1201–1204)</era>
+						<era type="111">Genkyū (1204–1206)</era>
+						<era type="112">Ken’ei (1206–1207)</era>
+						<era type="113">Jōgen (1207–1211)</era>
+						<era type="114">Kenryaku (1211–1213)</era>
+						<era type="115">Kenpō (1213–1219)</era>
+						<era type="116">Jōkyū (1219–1222)</era>
+						<era type="117">Jōō (1222–1224)</era>
+						<era type="118">Gennin (1224–1225)</era>
+						<era type="119">Karoku (1225–1227)</era>
+						<era type="120">Antei (1227–1229)</era>
+						<era type="121">Kanki (1229–1232)</era>
+						<era type="122">Jōei (1232–1233)</era>
+						<era type="123">Tenpuku (1233–1234)</era>
+						<era type="124">Bunryaku (1234–1235)</era>
+						<era type="125">Katei (1235–1238)</era>
+						<era type="126">Ryakunin (1238–1239)</era>
+						<era type="127">En-ō (1239-1240)</era>
+						<era type="128">Ninji (1240–1243)</era>
+						<era type="129">Kangen (1243–1247)</era>
+						<era type="130">Hōji (1247–1249)</era>
+						<era type="131">Kenchō (1249–1256)</era>
+						<era type="132">Kōgen (1256–1257)</era>
+						<era type="133">Shōka (1257–1259)</era>
+						<era type="134">Shōgen (1259–1260)</era>
+						<era type="135">Bun’ō (1260–1261)</era>
+						<era type="136">Kōchō (1261–1264)</era>
+						<era type="137">Bun’ei (1264–1275)</era>
+						<era type="138">Kenji (1275–1278)</era>
+						<era type="139">Kōan (1278–1288)</era>
+						<era type="140">Shōō (1288–1293)</era>
+						<era type="141">Einin (1293–1299)</era>
+						<era type="142">Shōan (1299–1302)</era>
+						<era type="143">Kengen (1302–1303)</era>
+						<era type="144">Kagen (1303–1306)</era>
+						<era type="145">Tokuji (1306–1308)</era>
+						<era type="146">Enkyō (1308–1311)</era>
+						<era type="147">Ōchō (1311–1312)</era>
+						<era type="148">Shōwa (1312–1317)</era>
+						<era type="149">Bunpō (1317–1319)</era>
+						<era type="150">Genō (1319–1321)</era>
+						<era type="151">Genkō (1321–1324)</era>
+						<era type="152">Shōchū (1324–1326)</era>
+						<era type="153">Karyaku (1326–1329)</era>
+						<era type="154">Gentoku (1329–1331)</era>
+						<era type="155">Genkō (1331–1334)</era>
+						<era type="156">Kenmu (1334–1336)</era>
+						<era type="157">Engen (1336–1340)</era>
+						<era type="158">Kōkoku (1340–1346)</era>
+						<era type="159">Shōhei (1346–1370)</era>
+						<era type="160">Kentoku (1370–1372)</era>
+						<era type="161">Bunchū (1372–1375)</era>
+						<era type="162">Tenju (1375–1379)</era>
+						<era type="163">Kōryaku (1379–1381)</era>
+						<era type="164">Kōwa (1381–1384)</era>
+						<era type="165">Genchū (1384–1392)</era>
+						<era type="166">Meitoku (1384–1387)</era>
+						<era type="167">Kakei (1387–1389)</era>
+						<era type="168">Kōō (1389–1390)</era>
+						<era type="169">Meitoku (1390–1394)</era>
+						<era type="170">Ōei (1394–1428)</era>
+						<era type="171">Shōchō (1428–1429)</era>
+						<era type="172">Eikyō (1429–1441)</era>
+						<era type="173">Kakitsu (1441–1444)</era>
+						<era type="174">Bun’an (1444–1449)</era>
+						<era type="175">Hōtoku (1449–1452)</era>
+						<era type="176">Kyōtoku (1452–1455)</era>
+						<era type="177">Kōshō (1455–1457)</era>
+						<era type="178">Chōroku (1457–1460)</era>
+						<era type="179">Kanshō (1460–1466)</era>
+						<era type="180">Bunshō (1466–1467)</era>
+						<era type="181">Ōnin (1467–1469)</era>
+						<era type="182">Bunmei (1469–1487)</era>
+						<era type="183">Chōkyō (1487–1489)</era>
+						<era type="184">Entoku (1489–1492)</era>
+						<era type="185">Meiō (1492–1501)</era>
+						<era type="186">Bunki (1501–1504)</era>
+						<era type="187">Eishō (1504–1521)</era>
+						<era type="188">Taiei (1521–1528)</era>
+						<era type="189">Kyōroku (1528–1532)</era>
+						<era type="190">Tenbun (1532–1555)</era>
+						<era type="191">Kōji (1555–1558)</era>
+						<era type="192">Eiroku (1558–1570)</era>
+						<era type="193">Genki (1570–1573)</era>
+						<era type="194">Tenshō (1573–1592)</era>
+						<era type="195">Bunroku (1592–1596)</era>
+						<era type="196">Keichō (1596–1615)</era>
+						<era type="197">Genna (1615–1624)</era>
+						<era type="198">Kan’ei (1624–1644)</era>
+						<era type="199">Shōho (1644–1648)</era>
+						<era type="200">Keian (1648–1652)</era>
+						<era type="201">Jōō (1652–1655)</era>
+						<era type="202">Meireki (1655–1658)</era>
+						<era type="203">Manji (1658–1661)</era>
+						<era type="204">Kanbun (1661–1673)</era>
+						<era type="205">Enpō (1673–1681)</era>
+						<era type="206">Tenna (1681–1684)</era>
+						<era type="207">Jōkyō (1684–1688)</era>
+						<era type="208">Genroku (1688–1704)</era>
+						<era type="209">Hōei (1704–1711)</era>
+						<era type="210">Shōtoku (1711–1716)</era>
+						<era type="211">Kyōhō (1716–1736)</era>
+						<era type="212">Genbun (1736–1741)</era>
+						<era type="213">Kanpō (1741–1744)</era>
+						<era type="214">Enkyō (1744–1748)</era>
+						<era type="215">Kan’en (1748–1751)</era>
+						<era type="216">Hōreki (1751–1764)</era>
+						<era type="217">Meiwa (1764–1772)</era>
+						<era type="218">An’ei (1772–1781)</era>
+						<era type="219">Tenmei (1781–1789)</era>
+						<era type="220">Kansei (1789–1801)</era>
+						<era type="221">Kyōwa (1801–1804)</era>
+						<era type="222">Bunka (1804–1818)</era>
+						<era type="223">Bunsei (1818–1830)</era>
+						<era type="224">Tenpō (1830–1844)</era>
+						<era type="225">Kōka (1844–1848)</era>
+						<era type="226">Kaei (1848–1854)</era>
+						<era type="227">Ansei (1854–1860)</era>
+						<era type="228">Man’en (1860–1861)</era>
+						<era type="229">Bunkyū (1861–1864)</era>
+						<era type="230">Genji (1864–1865)</era>
+						<era type="231">Keiō (1865–1868)</era>
+						<era type="232">Meiji</era>
+						<era type="233">Taishō</era>
+						<era type="234">era Shōwa</era>
+						<era type="235">Heisei</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">Taika</era>
+						<era type="1">Hakuchi</era>
+						<era type="2">Hakuhō</era>
+						<era type="3">Shuchō</era>
+						<era type="4">Taihō</era>
+						<era type="5">Keiun</era>
+						<era type="6">Wadō</era>
+						<era type="7">Reiki</era>
+						<era type="8">Yōrō</era>
+						<era type="9">Jinki</era>
+						<era type="10">Tenpyō</era>
+						<era type="11">T.-kampō</era>
+						<era type="12">T.-shōhō</era>
+						<era type="13">T.-hōji</era>
+						<era type="14">T.-jingo</era>
+						<era type="15">J.-keiun</era>
+						<era type="16">Hōki</era>
+						<era type="17">Ten-ō</era>
+						<era type="18">Enryaku</era>
+						<era type="19">Daidō</era>
+						<era type="20">Kōnin</era>
+						<era type="21">Tenchō</era>
+						<era type="22">Jōwa</era>
+						<era type="23">Kajō</era>
+						<era type="24">Ninju</era>
+						<era type="25">Saikō</era>
+						<era type="26">Ten-an</era>
+						<era type="27">Jōgan</era>
+						<era type="28">Gangyō</era>
+						<era type="29">Ninna</era>
+						<era type="30">Kanpyō</era>
+						<era type="31">Shōtai</era>
+						<era type="32">Engi</era>
+						<era type="33">Enchō</era>
+						<era type="34">Jōhei</era>
+						<era type="35">Tengyō</era>
+						<era type="36">Tenryaku</era>
+						<era type="37">Tentoku</era>
+						<era type="38">Ōwa</era>
+						<era type="39">Kōhō</era>
+						<era type="40">Anna</era>
+						<era type="41">Tenroku</era>
+						<era type="42">Ten’en</era>
+						<era type="43">Jōgen</era>
+						<era type="44">Tengen</era>
+						<era type="45">Eikan</era>
+						<era type="46">Kanna</era>
+						<era type="47">Eien</era>
+						<era type="48">Eiso</era>
+						<era type="49">Shōryaku</era>
+						<era type="50">Chōtoku</era>
+						<era type="51">Chōhō</era>
+						<era type="52">Kankō</era>
+						<era type="53">Chōwa</era>
+						<era type="54">Kannin</era>
+						<era type="55">Jian</era>
+						<era type="56">Manju</era>
+						<era type="57">Chōgen</era>
+						<era type="58">Chōryaku</era>
+						<era type="59">Chōkyū</era>
+						<era type="60">Kantoku</era>
+						<era type="61">Eishō</era>
+						<era type="62">Tengi</era>
+						<era type="63">Kōhei</era>
+						<era type="64">Jiryaku</era>
+						<era type="65">Enkyū</era>
+						<era type="66">Shōho</era>
+						<era type="67">Shōryaku II</era>
+						<era type="68">Eihō</era>
+						<era type="69">Ōtoku</era>
+						<era type="70">Kanji</era>
+						<era type="71">Kahō</era>
+						<era type="72">Eichō</era>
+						<era type="73">Jōtoku</era>
+						<era type="74">Kōwa</era>
+						<era type="75">Chōji</era>
+						<era type="76">Kashō</era>
+						<era type="77">Tennin</era>
+						<era type="78">Ten-ei</era>
+						<era type="79">Eikyū</era>
+						<era type="80">Gen’ei</era>
+						<era type="81">Hōan</era>
+						<era type="82">Tenji</era>
+						<era type="83">Daiji</era>
+						<era type="84">Tenshō</era>
+						<era type="85">Chōshō</era>
+						<era type="86">Hōen</era>
+						<era type="87">Eiji</era>
+						<era type="88">Kōji</era>
+						<era type="89">Ten’yō</era>
+						<era type="90">Kyūan</era>
+						<era type="91">Ninpei</era>
+						<era type="92">Kyūju</era>
+						<era type="93">Hōgen</era>
+						<era type="94">Heiji</era>
+						<era type="95">Eiryaku</era>
+						<era type="96">Ōho</era>
+						<era type="97">Chōkan</era>
+						<era type="98">Eiman</era>
+						<era type="99">Nin’an</era>
+						<era type="100">Kaō</era>
+						<era type="101">Shōan</era>
+						<era type="102">Angen</era>
+						<era type="103">Jishō</era>
+						<era type="104">Yōwa</era>
+						<era type="105">Juei</era>
+						<era type="106">Genryaku</era>
+						<era type="107">Bunji</era>
+						<era type="108">Kenkyū</era>
+						<era type="109">Shōji</era>
+						<era type="110">Kennin</era>
+						<era type="111">Genkyū</era>
+						<era type="112">Ken’ei</era>
+						<era type="113">Jōgen II</era>
+						<era type="114">Kenryaku</era>
+						<era type="115">Kenpō</era>
+						<era type="116">Jōkyū</era>
+						<era type="117">Jōō</era>
+						<era type="118">Gennin</era>
+						<era type="119">Karoku</era>
+						<era type="120">Antei</era>
+						<era type="121">Kanki</era>
+						<era type="122">Jōei</era>
+						<era type="123">Tenpuku</era>
+						<era type="124">Bunryaku</era>
+						<era type="125">Katei</era>
+						<era type="126">Ryakunin</era>
+						<era type="127">En’ō</era>
+						<era type="128">Ninji</era>
+						<era type="129">Kangen</era>
+						<era type="130">Hōji</era>
+						<era type="131">Kenchō</era>
+						<era type="132">Kōgen</era>
+						<era type="133">Shōka</era>
+						<era type="134">Shōgen</era>
+						<era type="135">Bun’ō</era>
+						<era type="136">Kōchō</era>
+						<era type="137">Bun’ei</era>
+						<era type="138">Kenji</era>
+						<era type="139">Kōan</era>
+						<era type="140">Shōō</era>
+						<era type="141">Einin</era>
+						<era type="142">Shōan II</era>
+						<era type="143">Kengen</era>
+						<era type="144">Kagen</era>
+						<era type="145">Tokuji</era>
+						<era type="146">Enkyō</era>
+						<era type="147">Ōchō</era>
+						<era type="148">Shōwa</era>
+						<era type="149">Bunpō</era>
+						<era type="150">Genō</era>
+						<era type="151">Genkō</era>
+						<era type="152">Shōchū</era>
+						<era type="153">Karyaku</era>
+						<era type="154">Gentoku</era>
+						<era type="155">Genkō II</era>
+						<era type="156">Kenmu</era>
+						<era type="157">Engen</era>
+						<era type="158">Kōkoku</era>
+						<era type="159">Shōhei</era>
+						<era type="160">Kentoku</era>
+						<era type="161">Bunchū</era>
+						<era type="162">Tenju</era>
+						<era type="163">Kōryaku</era>
+						<era type="164">Kōwa II</era>
+						<era type="165">Genchū</era>
+						<era type="166">Meitoku</era>
+						<era type="167">Kakei</era>
+						<era type="168">Kōō</era>
+						<era type="169">Meitoku II</era>
+						<era type="170">Ōei</era>
+						<era type="171">Shōchō</era>
+						<era type="172">Eikyō</era>
+						<era type="173">Kakitsu</era>
+						<era type="174">Bun’an</era>
+						<era type="175">Hōtoku</era>
+						<era type="176">Kyōtoku</era>
+						<era type="177">Kōshō</era>
+						<era type="178">Chōroku</era>
+						<era type="179">Kanshō</era>
+						<era type="180">Bunshō</era>
+						<era type="181">Ōnin</era>
+						<era type="182">Bunmei</era>
+						<era type="183">Chōkyō</era>
+						<era type="184">Entoku</era>
+						<era type="185">Meiō</era>
+						<era type="186">Bunki</era>
+						<era type="187">Eishō II</era>
+						<era type="188">Taiei</era>
+						<era type="189">Kyōroku</era>
+						<era type="190">Tenbun</era>
+						<era type="191">Kōji II</era>
+						<era type="192">Eiroku</era>
+						<era type="193">Genki</era>
+						<era type="194">Tenshō II</era>
+						<era type="195">Bunroku</era>
+						<era type="196">Keichō</era>
+						<era type="197">Genna</era>
+						<era type="198">Kan’ei</era>
+						<era type="199">Shōho II</era>
+						<era type="200">Keian</era>
+						<era type="201">Jōō II</era>
+						<era type="202">Meireki</era>
+						<era type="203">Manji</era>
+						<era type="204">Kanbun</era>
+						<era type="205">Enpō</era>
+						<era type="206">Tenna</era>
+						<era type="207">Jōkyō</era>
+						<era type="208">Genroku</era>
+						<era type="209">Hōei</era>
+						<era type="210">Shōtoku</era>
+						<era type="211">Kyōhō</era>
+						<era type="212">Genbun</era>
+						<era type="213">Kanpō</era>
+						<era type="214">Enkyō II</era>
+						<era type="215">Kan’en</era>
+						<era type="216">Hōreki</era>
+						<era type="217">Meiwa</era>
+						<era type="218">An’ei</era>
+						<era type="219">Tenmei</era>
+						<era type="220">Kansei</era>
+						<era type="221">Kyōwa</era>
+						<era type="222">Bunka</era>
+						<era type="223">Bunsei</era>
+						<era type="224">Tenpō</era>
+						<era type="225">Kōka</era>
+						<era type="226">Kaei</era>
+						<era type="227">Ansei</era>
+						<era type="228">Man’en</era>
+						<era type="229">Bunkyū</era>
+						<era type="230">Genji</era>
+						<era type="231">Keiō</era>
+						<era type="232">Meiji</era>
+						<era type="233">Taishō</era>
+						<era type="234">e. Shōwa</era>
+						<era type="235">Heisei</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0">Taika</era>
+						<era type="10">Tenpyō</era>
+						<era type="11">T. kampō</era>
+						<era type="12">T. shōhō</era>
+						<era type="13">T. hōji</era>
+						<era type="14">T. jingo</era>
+						<era type="25">Saikō</era>
+						<era type="26">Ten-an</era>
+						<era type="27">Jōgan</era>
+						<era type="28">Gangyō</era>
+						<era type="30">Kanpyō</era>
+						<era type="34">Jōhei</era>
+						<era type="36">Tenryaku</era>
+						<era type="47">Eien</era>
+						<era type="68">Eihō</era>
+					</eraNarrow>
+				</eras>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} 'a' 'les' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} 'a' 'les' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d MMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d MMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="y">y G</dateFormatItem>
+						<dateFormatItem id="yyyy">y G</dateFormatItem>
+						<dateFormatItem id="yyyyM">y-MM GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMd">dd-MM-y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E, d-M-y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">d MMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">E, d MMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d – d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">M – M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">LLL – LLL</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">y – y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">MM – MM/y GGGGG</greatestDifference>
+							<greatestDifference id="y">MM/y – MM/y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">d/M/y – d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="M">d/M/y – d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="y">d/M/y – d/M/y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="M">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="y">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">LLL – LLL y G</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">d – d MMM 'de' y</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM 'de' y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M" draft="unconfirmed">LLLL – LLLL y G</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="persian">
+				<dateTimeFormats>
+					<intervalFormats>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d – d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">M – M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">LLL – LLL</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">y – y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">LLL – LLL y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">d – d MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="roc">
+				<eras>
+					<eraNames>
+						<era type="0">antes de la R.D.C.</era>
+						<era type="1">Minguo</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">A.R.D.C.</era>
+						<era type="1">Minguo</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="1">R.D.C.</era>
+					</eraNarrow>
+				</eras>
+				<dateTimeFormats>
+					<intervalFormats>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d – d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">M – M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">LLL – LLL</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">y – y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">LLL – LLL y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">d – d MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="era">
+				<displayName>era</displayName>
+			</field>
+			<field type="year">
+				<displayName>añu</displayName>
+				<relative type="-1">l’añu pasáu</relative>
+				<relative type="0">esti añu</relative>
+				<relative type="1">l’añu viniente</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} añu</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} años</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">hai {0} añu</relativeTimePattern>
+					<relativeTimePattern count="other">hai {0} años</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-short">
+				<displayName>añu</displayName>
+				<relative type="-1">l’añu pas.</relative>
+				<relative type="0">esti añu</relative>
+				<relative type="1">l’añu vin.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} añu</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} años</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">hai {0} añu</relativeTimePattern>
+					<relativeTimePattern count="other">hai {0} años</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-narrow">
+				<displayName>añu</displayName>
+				<relative type="-1">añu pas.</relative>
+				<relative type="0">esti añu</relative>
+				<relative type="1">añu vin.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} a.</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} a.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">hai {0} a.</relativeTimePattern>
+					<relativeTimePattern count="other">hai {0} a.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter">
+				<displayName>trimestre</displayName>
+				<relative type="-1">trimestre anterior</relative>
+				<relative type="0">esti trimestre</relative>
+				<relative type="1">trimestre viniente</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} trimestre</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} trimestres</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">hai {0} trimestre</relativeTimePattern>
+					<relativeTimePattern count="other">hai {0} trimestres</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-short">
+				<displayName>tri.</displayName>
+				<relative type="-1">trim. ant.</relative>
+				<relative type="0">esti trim.</relative>
+				<relative type="1">trim. vin.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} trim.</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} trim.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">hai {0} trim.</relativeTimePattern>
+					<relativeTimePattern count="other">hai {0} trim.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-narrow">
+				<displayName>tri.</displayName>
+				<relative type="-1">trim. ant.</relative>
+				<relative type="0">esti trim.</relative>
+				<relative type="1">trim. vin.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} tr.</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} tr.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">hai {0} tr.</relativeTimePattern>
+					<relativeTimePattern count="other">hai {0} tr.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month">
+				<displayName>mes</displayName>
+				<relative type="-1">el mes pasáu</relative>
+				<relative type="0">esti mes</relative>
+				<relative type="1">el mes viniente</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} mes</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} meses</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">hai {0} mes</relativeTimePattern>
+					<relativeTimePattern count="other">hai {0} meses</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-short">
+				<displayName>mes</displayName>
+				<relative type="-1">mes pas.</relative>
+				<relative type="0">esti mes</relative>
+				<relative type="1">mes vin.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} mes</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} meses</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">hai {0} mes</relativeTimePattern>
+					<relativeTimePattern count="other">hai {0} meses</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-narrow">
+				<displayName>mes</displayName>
+				<relative type="-1">mes pas.</relative>
+				<relative type="0">esti mes</relative>
+				<relative type="1">mes vin.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} m.</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} m.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">hai {0} m.</relativeTimePattern>
+					<relativeTimePattern count="other">hai {0} m.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week">
+				<displayName>selmana</displayName>
+				<relative type="-1">la selmana pasada</relative>
+				<relative type="0">esta selmana</relative>
+				<relative type="1">la selmana viniente</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} selmana</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} selmanes</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">hai {0} selmana</relativeTimePattern>
+					<relativeTimePattern count="other">hai {0} selmanes</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-short">
+				<displayName>sel.</displayName>
+				<relative type="-1">selm. pasada</relative>
+				<relative type="0">esta selm.</relative>
+				<relative type="1">selm. viniente</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} selm.</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} selm.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">hai {0} selm.</relativeTimePattern>
+					<relativeTimePattern count="other">hai {0} selm.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-narrow">
+				<displayName>sel.</displayName>
+				<relative type="-1">selm. pas.</relative>
+				<relative type="0">esta selm.</relative>
+				<relative type="1">selm. vin.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} se.</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} se.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">hai {0} se.</relativeTimePattern>
+					<relativeTimePattern count="other">hai {0} se.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day">
+				<displayName>día</displayName>
+				<relative type="-2">antayeri</relative>
+				<relative type="-1">ayeri</relative>
+				<relative type="0">güei</relative>
+				<relative type="1">mañana</relative>
+				<relative type="2">pasao mañana</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} día</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} díes</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">hai {0} día</relativeTimePattern>
+					<relativeTimePattern count="other">hai {0} díes</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-short">
+				<displayName>día</displayName>
+				<relative type="-2">antayeri</relative>
+				<relative type="-1">ayeri</relative>
+				<relative type="0">güei</relative>
+				<relative type="1">mañana</relative>
+				<relative type="2">pasao mañana</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} día</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} díes</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">hai {0} día</relativeTimePattern>
+					<relativeTimePattern count="other">hai {0} díes</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-narrow">
+				<displayName>día</displayName>
+				<relative type="-2">antay.</relative>
+				<relative type="-1">ayeri</relative>
+				<relative type="0">güei</relative>
+				<relative type="1">mañ.</relative>
+				<relative type="2">p. mañ.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} d.</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} d.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">hai {0} d.</relativeTimePattern>
+					<relativeTimePattern count="other">hai {0} d.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="weekday">
+				<displayName>día de la selmana</displayName>
+			</field>
+			<field type="sun">
+				<relative type="-1">el domingu pasáu</relative>
+				<relative type="0">esti domingu</relative>
+				<relative type="1">el domingu viniente</relative>
+			</field>
+			<field type="sun-short">
+				<relative type="-1">dom. pasáu</relative>
+				<relative type="0">esti dom.</relative>
+				<relative type="1">dom. viniente</relative>
+			</field>
+			<field type="sun-narrow">
+				<relative type="-1">dom. pas.</relative>
+				<relative type="0">esti dom.</relative>
+				<relative type="1">dom. vin.</relative>
+			</field>
+			<field type="mon">
+				<relative type="-1">el llunes pasáu</relative>
+				<relative type="0">esti llunes</relative>
+				<relative type="1">el llunes viniente</relative>
+			</field>
+			<field type="mon-short">
+				<relative type="-1">llun. pasáu</relative>
+				<relative type="0">esti llun.</relative>
+				<relative type="1">llun. viniente</relative>
+			</field>
+			<field type="mon-narrow">
+				<relative type="-1">llu. pas.</relative>
+				<relative type="0">esti llu.</relative>
+				<relative type="1">llu. vin.</relative>
+			</field>
+			<field type="tue">
+				<relative type="-1">el martes pasáu</relative>
+				<relative type="0">esti martes</relative>
+				<relative type="1">el martes viniente</relative>
+			</field>
+			<field type="tue-short">
+				<relative type="-1">mar. pasáu</relative>
+				<relative type="0">esti mar.</relative>
+				<relative type="1">mar. viniente</relative>
+			</field>
+			<field type="tue-narrow">
+				<relative type="-1">mar. pas.</relative>
+				<relative type="0">esti mar.</relative>
+				<relative type="1">mar. vin.</relative>
+			</field>
+			<field type="wed">
+				<relative type="-1">el miércoles pasáu</relative>
+				<relative type="0">esti miércoles</relative>
+				<relative type="1">el miércoles viniente</relative>
+			</field>
+			<field type="wed-short">
+				<relative type="-1">mié. pasáu</relative>
+				<relative type="0">esti mié.</relative>
+				<relative type="1">mié. viniente</relative>
+			</field>
+			<field type="wed-narrow">
+				<relative type="-1">mié. pas.</relative>
+				<relative type="0">esti mié.</relative>
+				<relative type="1">mié. vin.</relative>
+			</field>
+			<field type="thu">
+				<relative type="-1">el xueves pasáu</relative>
+				<relative type="0">esti xueves</relative>
+				<relative type="1">el xueves viniente</relative>
+			</field>
+			<field type="thu-short">
+				<relative type="-1">xue. pasáu</relative>
+				<relative type="0">esti xue.</relative>
+				<relative type="1">xue. viniente</relative>
+			</field>
+			<field type="thu-narrow">
+				<relative type="-1">xue. pas.</relative>
+				<relative type="0">esti xue.</relative>
+				<relative type="1">xue. vin.</relative>
+			</field>
+			<field type="fri">
+				<relative type="-1">el vienres pasáu</relative>
+				<relative type="0">esti vienres</relative>
+				<relative type="1">el vienres viniente</relative>
+			</field>
+			<field type="fri-short">
+				<relative type="-1">vie. pasáu</relative>
+				<relative type="0">esti vie.</relative>
+				<relative type="1">vie. viniente</relative>
+			</field>
+			<field type="fri-narrow">
+				<relative type="-1">vie. pas.</relative>
+				<relative type="0">esti vie.</relative>
+				<relative type="1">vie. vin.</relative>
+			</field>
+			<field type="sat">
+				<relative type="-1">el sábadu pasáu</relative>
+				<relative type="0">esti sábadu</relative>
+				<relative type="1">el sábadu viniente</relative>
+			</field>
+			<field type="sat-short">
+				<relative type="-1">sáb. pasáu</relative>
+				<relative type="0">esti sáb.</relative>
+				<relative type="1">sáb. viniente</relative>
+			</field>
+			<field type="sat-narrow">
+				<relative type="-1">sáb. pas.</relative>
+				<relative type="0">esti sáb.</relative>
+				<relative type="1">sáb. vin.</relative>
+			</field>
+			<field type="dayperiod">
+				<displayName>periodu del día</displayName>
+			</field>
+			<field type="hour">
+				<displayName>hora</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} hora</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} hores</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">hai {0} hora</relativeTimePattern>
+					<relativeTimePattern count="other">hai {0} hores</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-short">
+				<displayName>h.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} h.</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} h.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">hai {0} h.</relativeTimePattern>
+					<relativeTimePattern count="other">hai {0} h.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-narrow">
+				<displayName>h.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} h.</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} h.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">hai {0} h.</relativeTimePattern>
+					<relativeTimePattern count="other">hai {0} h.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute">
+				<displayName>minutu</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} minutu</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} minutos</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">hai {0} minutu</relativeTimePattern>
+					<relativeTimePattern count="other">hai {0} minutos</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-short">
+				<displayName>min.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} min.</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} min.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">hai {0} min.</relativeTimePattern>
+					<relativeTimePattern count="other">hai {0} min.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-narrow">
+				<displayName>m.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} min.</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} min.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">hai {0} min.</relativeTimePattern>
+					<relativeTimePattern count="other">hai {0} min.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second">
+				<displayName>segundu</displayName>
+				<relative type="0">agora</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} segundu</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} segundos</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">hai {0} segundu</relativeTimePattern>
+					<relativeTimePattern count="other">hai {0} segundos</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-short">
+				<displayName>s.</displayName>
+				<relative type="0">agora</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} seg.</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} seg.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">hai {0} seg.</relativeTimePattern>
+					<relativeTimePattern count="other">hai {0} seg.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-narrow">
+				<displayName>s.</displayName>
+				<relative type="0">agora</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} s.</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} s.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">hai {0} s.</relativeTimePattern>
+					<relativeTimePattern count="other">hai {0} s.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="zone">
+				<displayName>estaya horaria</displayName>
+			</field>
+		</fields>
+		<timeZoneNames>
+			<hourFormat>+HH:mm;-HH:mm</hourFormat>
+			<gmtFormat>GMT{0}</gmtFormat>
+			<gmtZeroFormat>GMT</gmtZeroFormat>
+			<regionFormat>Hora de {0}</regionFormat>
+			<regionFormat type="daylight">Hora braniega de {0}</regionFormat>
+			<regionFormat type="standard">Hora estándar de {0}</regionFormat>
+			<fallbackFormat>{1} ({0})</fallbackFormat>
+			<zone type="Etc/Unknown">
+				<exemplarCity>Ciudá desconocida</exemplarCity>
+			</zone>
+			<zone type="Europe/Andorra">
+				<exemplarCity>Andorra</exemplarCity>
+			</zone>
+			<zone type="Asia/Dubai">
+				<exemplarCity>Dubai</exemplarCity>
+			</zone>
+			<zone type="Asia/Kabul">
+				<exemplarCity>Kabul</exemplarCity>
+			</zone>
+			<zone type="America/Antigua">
+				<exemplarCity>Antigua</exemplarCity>
+			</zone>
+			<zone type="America/Anguilla">
+				<exemplarCity>Anguila</exemplarCity>
+			</zone>
+			<zone type="Europe/Tirane">
+				<exemplarCity>Tirana</exemplarCity>
+			</zone>
+			<zone type="Asia/Yerevan">
+				<exemplarCity>Yerevan</exemplarCity>
+			</zone>
+			<zone type="Africa/Luanda">
+				<exemplarCity>Luanda</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Rothera">
+				<exemplarCity>Rothera</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Palmer">
+				<exemplarCity>Palmer</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Troll">
+				<exemplarCity>Troll</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Syowa">
+				<exemplarCity>Syowa</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Mawson">
+				<exemplarCity>Mawson</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Davis">
+				<exemplarCity>Davis</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Vostok">
+				<exemplarCity>Vostok</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Casey">
+				<exemplarCity>Casey</exemplarCity>
+			</zone>
+			<zone type="Antarctica/DumontDUrville">
+				<exemplarCity>Dumont d’Urville</exemplarCity>
+			</zone>
+			<zone type="Antarctica/McMurdo">
+				<exemplarCity>McMurdo</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Rio_Gallegos">
+				<exemplarCity>Rio Gallegos</exemplarCity>
+			</zone>
+			<zone type="America/Mendoza">
+				<exemplarCity>Mendoza</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/San_Juan">
+				<exemplarCity>San Juan</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Ushuaia">
+				<exemplarCity>Ushuaia</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/La_Rioja">
+				<exemplarCity>La Rioja</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/San_Luis">
+				<exemplarCity>San Luis</exemplarCity>
+			</zone>
+			<zone type="America/Catamarca">
+				<exemplarCity>Catamarca</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Salta">
+				<exemplarCity>Salta</exemplarCity>
+			</zone>
+			<zone type="America/Jujuy">
+				<exemplarCity>Jujuy</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Tucuman">
+				<exemplarCity>Tucumán</exemplarCity>
+			</zone>
+			<zone type="America/Cordoba">
+				<exemplarCity>Córdoba</exemplarCity>
+			</zone>
+			<zone type="America/Buenos_Aires">
+				<exemplarCity>Buenos Aires</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pago_Pago">
+				<exemplarCity>Pago Pago</exemplarCity>
+			</zone>
+			<zone type="Europe/Vienna">
+				<exemplarCity>Viena</exemplarCity>
+			</zone>
+			<zone type="Australia/Perth">
+				<exemplarCity>Perth</exemplarCity>
+			</zone>
+			<zone type="Australia/Eucla">
+				<exemplarCity>Eucla</exemplarCity>
+			</zone>
+			<zone type="Australia/Darwin">
+				<exemplarCity>Darwin</exemplarCity>
+			</zone>
+			<zone type="Australia/Adelaide">
+				<exemplarCity>Adelaida</exemplarCity>
+			</zone>
+			<zone type="Australia/Broken_Hill">
+				<exemplarCity>Broken Hill</exemplarCity>
+			</zone>
+			<zone type="Australia/Currie">
+				<exemplarCity>Currie</exemplarCity>
+			</zone>
+			<zone type="Australia/Melbourne">
+				<exemplarCity>Melbourne</exemplarCity>
+			</zone>
+			<zone type="Australia/Hobart">
+				<exemplarCity>Hobart</exemplarCity>
+			</zone>
+			<zone type="Australia/Lindeman">
+				<exemplarCity>Lindeman</exemplarCity>
+			</zone>
+			<zone type="Australia/Sydney">
+				<exemplarCity>Sydney</exemplarCity>
+			</zone>
+			<zone type="Australia/Brisbane">
+				<exemplarCity>Brisbane</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Macquarie">
+				<exemplarCity>Macquarie</exemplarCity>
+			</zone>
+			<zone type="Australia/Lord_Howe">
+				<exemplarCity>Lord Howe</exemplarCity>
+			</zone>
+			<zone type="America/Aruba">
+				<exemplarCity>Aruba</exemplarCity>
+			</zone>
+			<zone type="Europe/Mariehamn">
+				<exemplarCity>Mariehamn</exemplarCity>
+			</zone>
+			<zone type="Asia/Baku">
+				<exemplarCity>Bakú</exemplarCity>
+			</zone>
+			<zone type="Europe/Sarajevo">
+				<exemplarCity>Sarajevo</exemplarCity>
+			</zone>
+			<zone type="America/Barbados">
+				<exemplarCity>Barbados</exemplarCity>
+			</zone>
+			<zone type="Asia/Dhaka">
+				<exemplarCity>Dhaka</exemplarCity>
+			</zone>
+			<zone type="Europe/Brussels">
+				<exemplarCity>Bruxeles</exemplarCity>
+			</zone>
+			<zone type="Africa/Ouagadougou">
+				<exemplarCity>Uagadugú</exemplarCity>
+			</zone>
+			<zone type="Europe/Sofia">
+				<exemplarCity>Sofía</exemplarCity>
+			</zone>
+			<zone type="Asia/Bahrain">
+				<exemplarCity>Baḥréin</exemplarCity>
+			</zone>
+			<zone type="Africa/Bujumbura">
+				<exemplarCity>Bujumbura</exemplarCity>
+			</zone>
+			<zone type="Africa/Porto-Novo">
+				<exemplarCity>Porto-Novo</exemplarCity>
+			</zone>
+			<zone type="America/St_Barthelemy">
+				<exemplarCity>St. Barthelemy</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Bermuda">
+				<exemplarCity>Bermuda</exemplarCity>
+			</zone>
+			<zone type="Asia/Brunei">
+				<exemplarCity>Brunéi</exemplarCity>
+			</zone>
+			<zone type="America/La_Paz">
+				<exemplarCity>La Paz</exemplarCity>
+			</zone>
+			<zone type="America/Kralendijk">
+				<exemplarCity>Kralendijk</exemplarCity>
+			</zone>
+			<zone type="America/Eirunepe">
+				<exemplarCity>Eirunepe</exemplarCity>
+			</zone>
+			<zone type="America/Rio_Branco">
+				<exemplarCity>Rio Branco</exemplarCity>
+			</zone>
+			<zone type="America/Porto_Velho">
+				<exemplarCity>Porto Velho</exemplarCity>
+			</zone>
+			<zone type="America/Boa_Vista">
+				<exemplarCity>Boa Vista</exemplarCity>
+			</zone>
+			<zone type="America/Manaus">
+				<exemplarCity>Manaus</exemplarCity>
+			</zone>
+			<zone type="America/Cuiaba">
+				<exemplarCity>Cuiaba</exemplarCity>
+			</zone>
+			<zone type="America/Santarem">
+				<exemplarCity>Santarem</exemplarCity>
+			</zone>
+			<zone type="America/Campo_Grande">
+				<exemplarCity>Campo Grande</exemplarCity>
+			</zone>
+			<zone type="America/Belem">
+				<exemplarCity>Belem</exemplarCity>
+			</zone>
+			<zone type="America/Araguaina">
+				<exemplarCity>Araguaina</exemplarCity>
+			</zone>
+			<zone type="America/Sao_Paulo">
+				<exemplarCity>Sao Paulo</exemplarCity>
+			</zone>
+			<zone type="America/Bahia">
+				<exemplarCity>Bahía</exemplarCity>
+			</zone>
+			<zone type="America/Fortaleza">
+				<exemplarCity>Fortaleza</exemplarCity>
+			</zone>
+			<zone type="America/Maceio">
+				<exemplarCity>Maceio</exemplarCity>
+			</zone>
+			<zone type="America/Recife">
+				<exemplarCity>Recife</exemplarCity>
+			</zone>
+			<zone type="America/Noronha">
+				<exemplarCity>Noronha</exemplarCity>
+			</zone>
+			<zone type="America/Nassau">
+				<exemplarCity>Nassau</exemplarCity>
+			</zone>
+			<zone type="Asia/Thimphu">
+				<exemplarCity>Thimphu</exemplarCity>
+			</zone>
+			<zone type="Africa/Gaborone">
+				<exemplarCity>Gaborone</exemplarCity>
+			</zone>
+			<zone type="Europe/Minsk">
+				<exemplarCity>Minsk</exemplarCity>
+			</zone>
+			<zone type="America/Belize">
+				<exemplarCity>Belize</exemplarCity>
+			</zone>
+			<zone type="America/Dawson">
+				<exemplarCity>Dawson</exemplarCity>
+			</zone>
+			<zone type="America/Whitehorse">
+				<exemplarCity>Whitehorse</exemplarCity>
+			</zone>
+			<zone type="America/Inuvik">
+				<exemplarCity>Inuvik</exemplarCity>
+			</zone>
+			<zone type="America/Vancouver">
+				<exemplarCity>Vancouver</exemplarCity>
+			</zone>
+			<zone type="America/Dawson_Creek">
+				<exemplarCity>Dawson Creek</exemplarCity>
+			</zone>
+			<zone type="America/Creston">
+				<exemplarCity>Creston</exemplarCity>
+			</zone>
+			<zone type="America/Yellowknife">
+				<exemplarCity>Yellowknife</exemplarCity>
+			</zone>
+			<zone type="America/Edmonton">
+				<exemplarCity>Edmonton</exemplarCity>
+			</zone>
+			<zone type="America/Swift_Current">
+				<exemplarCity>Swift Current</exemplarCity>
+			</zone>
+			<zone type="America/Cambridge_Bay">
+				<exemplarCity>Cambridge Bay</exemplarCity>
+			</zone>
+			<zone type="America/Regina">
+				<exemplarCity>Regina</exemplarCity>
+			</zone>
+			<zone type="America/Winnipeg">
+				<exemplarCity>Winnipeg</exemplarCity>
+			</zone>
+			<zone type="America/Resolute">
+				<exemplarCity>Resolute</exemplarCity>
+			</zone>
+			<zone type="America/Rainy_River">
+				<exemplarCity>Rainy River</exemplarCity>
+			</zone>
+			<zone type="America/Rankin_Inlet">
+				<exemplarCity>Rankin Inlet</exemplarCity>
+			</zone>
+			<zone type="America/Coral_Harbour">
+				<exemplarCity>Atikokan</exemplarCity>
+			</zone>
+			<zone type="America/Thunder_Bay">
+				<exemplarCity>Thunder Bay</exemplarCity>
+			</zone>
+			<zone type="America/Nipigon">
+				<exemplarCity>Nipigon</exemplarCity>
+			</zone>
+			<zone type="America/Toronto">
+				<exemplarCity>Toronto</exemplarCity>
+			</zone>
+			<zone type="America/Iqaluit">
+				<exemplarCity>Iqaluit</exemplarCity>
+			</zone>
+			<zone type="America/Pangnirtung">
+				<exemplarCity>Pangnirtung</exemplarCity>
+			</zone>
+			<zone type="America/Moncton">
+				<exemplarCity>Moncton</exemplarCity>
+			</zone>
+			<zone type="America/Halifax">
+				<exemplarCity>Halifax</exemplarCity>
+			</zone>
+			<zone type="America/Goose_Bay">
+				<exemplarCity>Goose Bay</exemplarCity>
+			</zone>
+			<zone type="America/Glace_Bay">
+				<exemplarCity>Glace Bay</exemplarCity>
+			</zone>
+			<zone type="America/Blanc-Sablon">
+				<exemplarCity>Blanc-Sablon</exemplarCity>
+			</zone>
+			<zone type="America/St_Johns">
+				<exemplarCity>St. John’s</exemplarCity>
+			</zone>
+			<zone type="Indian/Cocos">
+				<exemplarCity>Cocos</exemplarCity>
+			</zone>
+			<zone type="Africa/Kinshasa">
+				<exemplarCity>Kinshasa</exemplarCity>
+			</zone>
+			<zone type="Africa/Lubumbashi">
+				<exemplarCity>Lubumbashi</exemplarCity>
+			</zone>
+			<zone type="Africa/Bangui">
+				<exemplarCity>Bangui</exemplarCity>
+			</zone>
+			<zone type="Africa/Brazzaville">
+				<exemplarCity>Brazzaville</exemplarCity>
+			</zone>
+			<zone type="Europe/Zurich">
+				<exemplarCity>Zurich</exemplarCity>
+			</zone>
+			<zone type="Africa/Abidjan">
+				<exemplarCity>Abidjan</exemplarCity>
+			</zone>
+			<zone type="Pacific/Rarotonga">
+				<exemplarCity>Rarotonga</exemplarCity>
+			</zone>
+			<zone type="Pacific/Easter">
+				<exemplarCity>Pascua</exemplarCity>
+			</zone>
+			<zone type="America/Santiago">
+				<exemplarCity>Santiago</exemplarCity>
+			</zone>
+			<zone type="Africa/Douala">
+				<exemplarCity>Douala</exemplarCity>
+			</zone>
+			<zone type="Asia/Urumqi">
+				<exemplarCity>Urumqi</exemplarCity>
+			</zone>
+			<zone type="Asia/Shanghai">
+				<exemplarCity>Shanghai</exemplarCity>
+			</zone>
+			<zone type="America/Bogota">
+				<exemplarCity>Bogotá</exemplarCity>
+			</zone>
+			<zone type="America/Costa_Rica">
+				<exemplarCity>Costa Rica</exemplarCity>
+			</zone>
+			<zone type="America/Havana">
+				<exemplarCity>La Habana</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Cape_Verde">
+				<exemplarCity>Cabu Verde</exemplarCity>
+			</zone>
+			<zone type="America/Curacao">
+				<exemplarCity>Curaçao</exemplarCity>
+			</zone>
+			<zone type="Indian/Christmas">
+				<exemplarCity>Christmas</exemplarCity>
+			</zone>
+			<zone type="Asia/Nicosia">
+				<exemplarCity>Nicosia</exemplarCity>
+			</zone>
+			<zone type="Europe/Prague">
+				<exemplarCity>Praga</exemplarCity>
+			</zone>
+			<zone type="Europe/Busingen">
+				<exemplarCity>Busingen</exemplarCity>
+			</zone>
+			<zone type="Europe/Berlin">
+				<exemplarCity>Berlín</exemplarCity>
+			</zone>
+			<zone type="Africa/Djibouti">
+				<exemplarCity>Xibuti</exemplarCity>
+			</zone>
+			<zone type="Europe/Copenhagen">
+				<exemplarCity>Copenhague</exemplarCity>
+			</zone>
+			<zone type="America/Dominica">
+				<exemplarCity>Dominica</exemplarCity>
+			</zone>
+			<zone type="America/Santo_Domingo">
+				<exemplarCity>Santu Domingu</exemplarCity>
+			</zone>
+			<zone type="Africa/Algiers">
+				<exemplarCity>Arxel</exemplarCity>
+			</zone>
+			<zone type="Pacific/Galapagos">
+				<exemplarCity>Galápagos</exemplarCity>
+			</zone>
+			<zone type="America/Guayaquil">
+				<exemplarCity>Guayaquil</exemplarCity>
+			</zone>
+			<zone type="Europe/Tallinn">
+				<exemplarCity>Tallinn</exemplarCity>
+			</zone>
+			<zone type="Africa/Cairo">
+				<exemplarCity>El Cairu</exemplarCity>
+			</zone>
+			<zone type="Africa/El_Aaiun">
+				<exemplarCity>El Aaiun</exemplarCity>
+			</zone>
+			<zone type="Africa/Asmera">
+				<exemplarCity>Asmara</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Canary">
+				<exemplarCity>Canaries</exemplarCity>
+			</zone>
+			<zone type="Africa/Ceuta">
+				<exemplarCity>Ceuta</exemplarCity>
+			</zone>
+			<zone type="Europe/Madrid">
+				<exemplarCity>Madrid</exemplarCity>
+			</zone>
+			<zone type="Africa/Addis_Ababa">
+				<exemplarCity>Adís Abeba</exemplarCity>
+			</zone>
+			<zone type="Europe/Helsinki">
+				<exemplarCity>Ḥélsinki</exemplarCity>
+			</zone>
+			<zone type="Pacific/Fiji">
+				<exemplarCity>Fixi</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Stanley">
+				<exemplarCity>Stanley</exemplarCity>
+			</zone>
+			<zone type="Pacific/Truk">
+				<exemplarCity>Chuuk</exemplarCity>
+			</zone>
+			<zone type="Pacific/Ponape">
+				<exemplarCity>Pohnpei</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kosrae">
+				<exemplarCity>Kosrae</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Faeroe">
+				<exemplarCity>Islles Feroe</exemplarCity>
+			</zone>
+			<zone type="Europe/Paris">
+				<exemplarCity>París</exemplarCity>
+			</zone>
+			<zone type="Africa/Libreville">
+				<exemplarCity>Libreville</exemplarCity>
+			</zone>
+			<zone type="Europe/London">
+				<long>
+					<daylight>Hora braniega británica</daylight>
+				</long>
+				<exemplarCity>Londres</exemplarCity>
+			</zone>
+			<zone type="America/Grenada">
+				<exemplarCity>Granada</exemplarCity>
+			</zone>
+			<zone type="Asia/Tbilisi">
+				<exemplarCity>Tbilisi</exemplarCity>
+			</zone>
+			<zone type="America/Cayenne">
+				<exemplarCity>Cayenne</exemplarCity>
+			</zone>
+			<zone type="Europe/Guernsey">
+				<exemplarCity>Guernsey</exemplarCity>
+			</zone>
+			<zone type="Africa/Accra">
+				<exemplarCity>Accra</exemplarCity>
+			</zone>
+			<zone type="Europe/Gibraltar">
+				<exemplarCity>Xibraltar</exemplarCity>
+			</zone>
+			<zone type="America/Thule">
+				<exemplarCity>Thule</exemplarCity>
+			</zone>
+			<zone type="America/Godthab">
+				<exemplarCity>Nuuk</exemplarCity>
+			</zone>
+			<zone type="America/Scoresbysund">
+				<exemplarCity>Ittoqqortoormiit</exemplarCity>
+			</zone>
+			<zone type="America/Danmarkshavn">
+				<exemplarCity>Danmarkshavn</exemplarCity>
+			</zone>
+			<zone type="Africa/Banjul">
+				<exemplarCity>Banjul</exemplarCity>
+			</zone>
+			<zone type="Africa/Conakry">
+				<exemplarCity>Conakry</exemplarCity>
+			</zone>
+			<zone type="America/Guadeloupe">
+				<exemplarCity>Guadalupe</exemplarCity>
+			</zone>
+			<zone type="Africa/Malabo">
+				<exemplarCity>Malabo</exemplarCity>
+			</zone>
+			<zone type="Europe/Athens">
+				<exemplarCity>Atenes</exemplarCity>
+			</zone>
+			<zone type="Atlantic/South_Georgia">
+				<exemplarCity>Xeorxa del Sur</exemplarCity>
+			</zone>
+			<zone type="America/Guatemala">
+				<exemplarCity>Guatemala</exemplarCity>
+			</zone>
+			<zone type="Pacific/Guam">
+				<exemplarCity>Guam</exemplarCity>
+			</zone>
+			<zone type="Africa/Bissau">
+				<exemplarCity>Bissau</exemplarCity>
+			</zone>
+			<zone type="America/Guyana">
+				<exemplarCity>Guyana</exemplarCity>
+			</zone>
+			<zone type="Asia/Hong_Kong">
+				<exemplarCity>Ḥong Kong</exemplarCity>
+			</zone>
+			<zone type="America/Tegucigalpa">
+				<exemplarCity>Tegucigalpa</exemplarCity>
+			</zone>
+			<zone type="Europe/Zagreb">
+				<exemplarCity>Zagreb</exemplarCity>
+			</zone>
+			<zone type="America/Port-au-Prince">
+				<exemplarCity>Puertu Príncipe</exemplarCity>
+			</zone>
+			<zone type="Europe/Budapest">
+				<exemplarCity>Budapest</exemplarCity>
+			</zone>
+			<zone type="Asia/Jakarta">
+				<exemplarCity>Xakarta</exemplarCity>
+			</zone>
+			<zone type="Asia/Pontianak">
+				<exemplarCity>Pontianak</exemplarCity>
+			</zone>
+			<zone type="Asia/Makassar">
+				<exemplarCity>Makassar</exemplarCity>
+			</zone>
+			<zone type="Asia/Jayapura">
+				<exemplarCity>Xayapura</exemplarCity>
+			</zone>
+			<zone type="Europe/Dublin">
+				<long>
+					<daylight>Hora estándar irlandesa</daylight>
+				</long>
+				<exemplarCity>Dublín</exemplarCity>
+			</zone>
+			<zone type="Asia/Jerusalem">
+				<exemplarCity>Xerusalén</exemplarCity>
+			</zone>
+			<zone type="Europe/Isle_of_Man">
+				<exemplarCity>Islla de Man</exemplarCity>
+			</zone>
+			<zone type="Asia/Calcutta">
+				<exemplarCity>Calcuta</exemplarCity>
+			</zone>
+			<zone type="Indian/Chagos">
+				<exemplarCity>Chagos</exemplarCity>
+			</zone>
+			<zone type="Asia/Baghdad">
+				<exemplarCity>Bagdag</exemplarCity>
+			</zone>
+			<zone type="Asia/Tehran">
+				<exemplarCity>Teḥrán</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Reykjavik">
+				<exemplarCity>Reikiavik</exemplarCity>
+			</zone>
+			<zone type="Europe/Rome">
+				<exemplarCity>Roma</exemplarCity>
+			</zone>
+			<zone type="Europe/Jersey">
+				<exemplarCity>Jersey</exemplarCity>
+			</zone>
+			<zone type="America/Jamaica">
+				<exemplarCity>Xamaica</exemplarCity>
+			</zone>
+			<zone type="Asia/Amman">
+				<exemplarCity>Amán</exemplarCity>
+			</zone>
+			<zone type="Asia/Tokyo">
+				<exemplarCity>Tokiu</exemplarCity>
+			</zone>
+			<zone type="Africa/Nairobi">
+				<exemplarCity>Nairobi</exemplarCity>
+			</zone>
+			<zone type="Asia/Bishkek">
+				<exemplarCity>Bishkek</exemplarCity>
+			</zone>
+			<zone type="Asia/Phnom_Penh">
+				<exemplarCity>Phnom Penh</exemplarCity>
+			</zone>
+			<zone type="Pacific/Enderbury">
+				<exemplarCity>Enderbury</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kiritimati">
+				<exemplarCity>Kiritimati</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tarawa">
+				<exemplarCity>Tarawa</exemplarCity>
+			</zone>
+			<zone type="Indian/Comoro">
+				<exemplarCity>Comoro</exemplarCity>
+			</zone>
+			<zone type="America/St_Kitts">
+				<exemplarCity>St. Kitts</exemplarCity>
+			</zone>
+			<zone type="Asia/Pyongyang">
+				<exemplarCity>Pyong Yang</exemplarCity>
+			</zone>
+			<zone type="Asia/Seoul">
+				<exemplarCity>Seúl</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuwait">
+				<exemplarCity>Kuwait</exemplarCity>
+			</zone>
+			<zone type="America/Cayman">
+				<exemplarCity>Caimán</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtau">
+				<exemplarCity>Aqtau</exemplarCity>
+			</zone>
+			<zone type="Asia/Oral">
+				<exemplarCity>Oral</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtobe">
+				<exemplarCity>Aqtobe</exemplarCity>
+			</zone>
+			<zone type="Asia/Qyzylorda">
+				<exemplarCity>Qyzylorda</exemplarCity>
+			</zone>
+			<zone type="Asia/Almaty">
+				<exemplarCity>Almaty</exemplarCity>
+			</zone>
+			<zone type="Asia/Vientiane">
+				<exemplarCity>Vientián</exemplarCity>
+			</zone>
+			<zone type="Asia/Beirut">
+				<exemplarCity>Beirut</exemplarCity>
+			</zone>
+			<zone type="America/St_Lucia">
+				<exemplarCity>St. Lucia</exemplarCity>
+			</zone>
+			<zone type="Europe/Vaduz">
+				<exemplarCity>Vaduz</exemplarCity>
+			</zone>
+			<zone type="Asia/Colombo">
+				<exemplarCity>Colombo</exemplarCity>
+			</zone>
+			<zone type="Africa/Monrovia">
+				<exemplarCity>Monrovia</exemplarCity>
+			</zone>
+			<zone type="Africa/Maseru">
+				<exemplarCity>Maseru</exemplarCity>
+			</zone>
+			<zone type="Europe/Vilnius">
+				<exemplarCity>Vilnius</exemplarCity>
+			</zone>
+			<zone type="Europe/Luxembourg">
+				<exemplarCity>Luxemburgu</exemplarCity>
+			</zone>
+			<zone type="Europe/Riga">
+				<exemplarCity>Riga</exemplarCity>
+			</zone>
+			<zone type="Africa/Tripoli">
+				<exemplarCity>Trípoli</exemplarCity>
+			</zone>
+			<zone type="Africa/Casablanca">
+				<exemplarCity>Casablanca</exemplarCity>
+			</zone>
+			<zone type="Europe/Monaco">
+				<exemplarCity>Mónacu</exemplarCity>
+			</zone>
+			<zone type="Europe/Chisinau">
+				<exemplarCity>Chisinau</exemplarCity>
+			</zone>
+			<zone type="Europe/Podgorica">
+				<exemplarCity>Podgorica</exemplarCity>
+			</zone>
+			<zone type="America/Marigot">
+				<exemplarCity>Marigot</exemplarCity>
+			</zone>
+			<zone type="Indian/Antananarivo">
+				<exemplarCity>Antananarivo</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kwajalein">
+				<exemplarCity>Kwajalein</exemplarCity>
+			</zone>
+			<zone type="Pacific/Majuro">
+				<exemplarCity>Majuro</exemplarCity>
+			</zone>
+			<zone type="Europe/Skopje">
+				<exemplarCity>Skopje</exemplarCity>
+			</zone>
+			<zone type="Africa/Bamako">
+				<exemplarCity>Bamako</exemplarCity>
+			</zone>
+			<zone type="Asia/Rangoon">
+				<exemplarCity>Rangún</exemplarCity>
+			</zone>
+			<zone type="Asia/Hovd">
+				<exemplarCity>Hovd</exemplarCity>
+			</zone>
+			<zone type="Asia/Ulaanbaatar">
+				<exemplarCity>Ulán Bátor</exemplarCity>
+			</zone>
+			<zone type="Asia/Choibalsan">
+				<exemplarCity>Choibalsan</exemplarCity>
+			</zone>
+			<zone type="Asia/Macau">
+				<exemplarCity>Macáu</exemplarCity>
+			</zone>
+			<zone type="Pacific/Saipan">
+				<exemplarCity>Saipan</exemplarCity>
+			</zone>
+			<zone type="America/Martinique">
+				<exemplarCity>La Martinica</exemplarCity>
+			</zone>
+			<zone type="Africa/Nouakchott">
+				<exemplarCity>Nuakxot</exemplarCity>
+			</zone>
+			<zone type="America/Montserrat">
+				<exemplarCity>Montserrat</exemplarCity>
+			</zone>
+			<zone type="Europe/Malta">
+				<exemplarCity>Malta</exemplarCity>
+			</zone>
+			<zone type="Indian/Mauritius">
+				<exemplarCity>Mauriciu</exemplarCity>
+			</zone>
+			<zone type="Indian/Maldives">
+				<exemplarCity>Maldives</exemplarCity>
+			</zone>
+			<zone type="Africa/Blantyre">
+				<exemplarCity>Blantyre</exemplarCity>
+			</zone>
+			<zone type="America/Tijuana">
+				<exemplarCity>Tijuana</exemplarCity>
+			</zone>
+			<zone type="America/Santa_Isabel">
+				<exemplarCity>Santa Isabel</exemplarCity>
+			</zone>
+			<zone type="America/Hermosillo">
+				<exemplarCity>Hermosillo</exemplarCity>
+			</zone>
+			<zone type="America/Mazatlan">
+				<exemplarCity>Mazatlan</exemplarCity>
+			</zone>
+			<zone type="America/Chihuahua">
+				<exemplarCity>Chihuahua</exemplarCity>
+			</zone>
+			<zone type="America/Bahia_Banderas">
+				<exemplarCity>Bahía Banderas</exemplarCity>
+			</zone>
+			<zone type="America/Ojinaga">
+				<exemplarCity>Ojinaga</exemplarCity>
+			</zone>
+			<zone type="America/Monterrey">
+				<exemplarCity>Monterrey</exemplarCity>
+			</zone>
+			<zone type="America/Mexico_City">
+				<exemplarCity>Ciudá de Méxicu</exemplarCity>
+			</zone>
+			<zone type="America/Matamoros">
+				<exemplarCity>Matamoros</exemplarCity>
+			</zone>
+			<zone type="America/Merida">
+				<exemplarCity>Mérida</exemplarCity>
+			</zone>
+			<zone type="America/Cancun">
+				<exemplarCity>Cancún</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuala_Lumpur">
+				<exemplarCity>Kuala Lumpur</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuching">
+				<exemplarCity>Kuching</exemplarCity>
+			</zone>
+			<zone type="Africa/Maputo">
+				<exemplarCity>Maputo</exemplarCity>
+			</zone>
+			<zone type="Africa/Windhoek">
+				<exemplarCity>Windhoek</exemplarCity>
+			</zone>
+			<zone type="Pacific/Noumea">
+				<exemplarCity>Noumea</exemplarCity>
+			</zone>
+			<zone type="Africa/Niamey">
+				<exemplarCity>Niaméi</exemplarCity>
+			</zone>
+			<zone type="Pacific/Norfolk">
+				<exemplarCity>Norfolk</exemplarCity>
+			</zone>
+			<zone type="Africa/Lagos">
+				<exemplarCity>Lagos</exemplarCity>
+			</zone>
+			<zone type="America/Managua">
+				<exemplarCity>Managua</exemplarCity>
+			</zone>
+			<zone type="Europe/Amsterdam">
+				<exemplarCity>Amsterdam</exemplarCity>
+			</zone>
+			<zone type="Europe/Oslo">
+				<exemplarCity>Oslo</exemplarCity>
+			</zone>
+			<zone type="Asia/Katmandu">
+				<exemplarCity>Katmandú</exemplarCity>
+			</zone>
+			<zone type="Pacific/Nauru">
+				<exemplarCity>Nauru</exemplarCity>
+			</zone>
+			<zone type="Pacific/Niue">
+				<exemplarCity>Niue</exemplarCity>
+			</zone>
+			<zone type="Pacific/Chatham">
+				<exemplarCity>Chatham</exemplarCity>
+			</zone>
+			<zone type="Pacific/Auckland">
+				<exemplarCity>Auckland</exemplarCity>
+			</zone>
+			<zone type="Asia/Muscat">
+				<exemplarCity>Mascate</exemplarCity>
+			</zone>
+			<zone type="America/Panama">
+				<exemplarCity>Panamá</exemplarCity>
+			</zone>
+			<zone type="America/Lima">
+				<exemplarCity>Lima</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tahiti">
+				<exemplarCity>Tahiti</exemplarCity>
+			</zone>
+			<zone type="Pacific/Marquesas">
+				<exemplarCity>Marquesas</exemplarCity>
+			</zone>
+			<zone type="Pacific/Gambier">
+				<exemplarCity>Gambier</exemplarCity>
+			</zone>
+			<zone type="Pacific/Port_Moresby">
+				<exemplarCity>Port Moresby</exemplarCity>
+			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bougainville</exemplarCity>
+			</zone>
+			<zone type="Asia/Manila">
+				<exemplarCity>Manila</exemplarCity>
+			</zone>
+			<zone type="Asia/Karachi">
+				<exemplarCity>Karachi</exemplarCity>
+			</zone>
+			<zone type="Europe/Warsaw">
+				<exemplarCity>Varsovia</exemplarCity>
+			</zone>
+			<zone type="America/Miquelon">
+				<exemplarCity>Miquelon</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pitcairn">
+				<exemplarCity>Pitcairn</exemplarCity>
+			</zone>
+			<zone type="America/Puerto_Rico">
+				<exemplarCity>Puertu Ricu</exemplarCity>
+			</zone>
+			<zone type="Asia/Gaza">
+				<exemplarCity>Gaza</exemplarCity>
+			</zone>
+			<zone type="Asia/Hebron">
+				<exemplarCity>Hebrón</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Azores">
+				<exemplarCity>Les Azores</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Madeira">
+				<exemplarCity>Madeira</exemplarCity>
+			</zone>
+			<zone type="Europe/Lisbon">
+				<exemplarCity>Lisboa</exemplarCity>
+			</zone>
+			<zone type="Pacific/Palau">
+				<exemplarCity>Palau</exemplarCity>
+			</zone>
+			<zone type="America/Asuncion">
+				<exemplarCity>Asunción</exemplarCity>
+			</zone>
+			<zone type="Asia/Qatar">
+				<exemplarCity>Qatar</exemplarCity>
+			</zone>
+			<zone type="Indian/Reunion">
+				<exemplarCity>Reunión</exemplarCity>
+			</zone>
+			<zone type="Europe/Bucharest">
+				<exemplarCity>Bucarest</exemplarCity>
+			</zone>
+			<zone type="Europe/Belgrade">
+				<exemplarCity>Belgráu</exemplarCity>
+			</zone>
+			<zone type="Europe/Kaliningrad">
+				<exemplarCity>Kaliningráu</exemplarCity>
+			</zone>
+			<zone type="Europe/Simferopol">
+				<exemplarCity>Simferopol</exemplarCity>
+			</zone>
+			<zone type="Europe/Moscow">
+				<exemplarCity>Moscú</exemplarCity>
+			</zone>
+			<zone type="Europe/Volgograd">
+				<exemplarCity>Volgográu</exemplarCity>
+			</zone>
+			<zone type="Europe/Samara">
+				<exemplarCity>Samara</exemplarCity>
+			</zone>
+			<zone type="Asia/Yekaterinburg">
+				<exemplarCity>Yekaterimburgu</exemplarCity>
+			</zone>
+			<zone type="Asia/Omsk">
+				<exemplarCity>Omsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Novosibirsk">
+				<exemplarCity>Novosibirsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Novokuznetsk">
+				<exemplarCity>Novokuznetsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Krasnoyarsk">
+				<exemplarCity>Krasnoyarsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Irkutsk">
+				<exemplarCity>Irkutsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Chita</exemplarCity>
+			</zone>
+			<zone type="Asia/Yakutsk">
+				<exemplarCity>Yakutsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Vladivostok">
+				<exemplarCity>Vladivostok</exemplarCity>
+			</zone>
+			<zone type="Asia/Khandyga">
+				<exemplarCity>Khandyga</exemplarCity>
+			</zone>
+			<zone type="Asia/Sakhalin">
+				<exemplarCity>Saxalín</exemplarCity>
+			</zone>
+			<zone type="Asia/Ust-Nera">
+				<exemplarCity>Ust-Nera</exemplarCity>
+			</zone>
+			<zone type="Asia/Magadan">
+				<exemplarCity>Magadán</exemplarCity>
+			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolymsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Kamchatka">
+				<exemplarCity>Kamchatka</exemplarCity>
+			</zone>
+			<zone type="Asia/Anadyr">
+				<exemplarCity>Anadyr</exemplarCity>
+			</zone>
+			<zone type="Africa/Kigali">
+				<exemplarCity>Kigali</exemplarCity>
+			</zone>
+			<zone type="Asia/Riyadh">
+				<exemplarCity>Riyad</exemplarCity>
+			</zone>
+			<zone type="Pacific/Guadalcanal">
+				<exemplarCity>Guadalcanal</exemplarCity>
+			</zone>
+			<zone type="Indian/Mahe">
+				<exemplarCity>Mahe</exemplarCity>
+			</zone>
+			<zone type="Africa/Khartoum">
+				<exemplarCity>Ḥartum</exemplarCity>
+			</zone>
+			<zone type="Europe/Stockholm">
+				<exemplarCity>Estocolmu</exemplarCity>
+			</zone>
+			<zone type="Asia/Singapore">
+				<exemplarCity>Singapur</exemplarCity>
+			</zone>
+			<zone type="Atlantic/St_Helena">
+				<exemplarCity>Santa Lena</exemplarCity>
+			</zone>
+			<zone type="Europe/Ljubljana">
+				<exemplarCity>Liubliana</exemplarCity>
+			</zone>
+			<zone type="Arctic/Longyearbyen">
+				<exemplarCity>Longyearbyen</exemplarCity>
+			</zone>
+			<zone type="Europe/Bratislava">
+				<exemplarCity>Bratislava</exemplarCity>
+			</zone>
+			<zone type="Africa/Freetown">
+				<exemplarCity>Freetown</exemplarCity>
+			</zone>
+			<zone type="Europe/San_Marino">
+				<exemplarCity>San Marín</exemplarCity>
+			</zone>
+			<zone type="Africa/Dakar">
+				<exemplarCity>Dakar</exemplarCity>
+			</zone>
+			<zone type="Africa/Mogadishu">
+				<exemplarCity>Mogadixu</exemplarCity>
+			</zone>
+			<zone type="America/Paramaribo">
+				<exemplarCity>Paramaribo</exemplarCity>
+			</zone>
+			<zone type="Africa/Juba">
+				<exemplarCity>Juba</exemplarCity>
+			</zone>
+			<zone type="Africa/Sao_Tome">
+				<exemplarCity>Santu Tomé</exemplarCity>
+			</zone>
+			<zone type="America/El_Salvador">
+				<exemplarCity>El Salvador</exemplarCity>
+			</zone>
+			<zone type="America/Lower_Princes">
+				<exemplarCity>Lower Prince’s Quarter</exemplarCity>
+			</zone>
+			<zone type="Asia/Damascus">
+				<exemplarCity>Damascu</exemplarCity>
+			</zone>
+			<zone type="Africa/Mbabane">
+				<exemplarCity>Mbabane</exemplarCity>
+			</zone>
+			<zone type="America/Grand_Turk">
+				<exemplarCity>Grand Turk</exemplarCity>
+			</zone>
+			<zone type="Africa/Ndjamena">
+				<exemplarCity>Xamena</exemplarCity>
+			</zone>
+			<zone type="Indian/Kerguelen">
+				<exemplarCity>Kerguelen</exemplarCity>
+			</zone>
+			<zone type="Africa/Lome">
+				<exemplarCity>Lomé</exemplarCity>
+			</zone>
+			<zone type="Asia/Bangkok">
+				<exemplarCity>Bangkok</exemplarCity>
+			</zone>
+			<zone type="Asia/Dushanbe">
+				<exemplarCity>Duxanbé</exemplarCity>
+			</zone>
+			<zone type="Pacific/Fakaofo">
+				<exemplarCity>Fakaofo</exemplarCity>
+			</zone>
+			<zone type="Asia/Dili">
+				<exemplarCity>Dili</exemplarCity>
+			</zone>
+			<zone type="Asia/Ashgabat">
+				<exemplarCity>Ashgabat</exemplarCity>
+			</zone>
+			<zone type="Africa/Tunis">
+				<exemplarCity>Túnez</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tongatapu">
+				<exemplarCity>Tongatapu</exemplarCity>
+			</zone>
+			<zone type="Europe/Istanbul">
+				<exemplarCity>Istanbul</exemplarCity>
+			</zone>
+			<zone type="America/Port_of_Spain">
+				<exemplarCity>Puertu España</exemplarCity>
+			</zone>
+			<zone type="Pacific/Funafuti">
+				<exemplarCity>Funafuti</exemplarCity>
+			</zone>
+			<zone type="Asia/Taipei">
+				<exemplarCity>Taipei</exemplarCity>
+			</zone>
+			<zone type="Africa/Dar_es_Salaam">
+				<exemplarCity>Dar es Salaam</exemplarCity>
+			</zone>
+			<zone type="Europe/Uzhgorod">
+				<exemplarCity>Uzhgorod</exemplarCity>
+			</zone>
+			<zone type="Europe/Kiev">
+				<exemplarCity>Kiev</exemplarCity>
+			</zone>
+			<zone type="Europe/Zaporozhye">
+				<exemplarCity>Zaporozhye</exemplarCity>
+			</zone>
+			<zone type="Africa/Kampala">
+				<exemplarCity>Kampala</exemplarCity>
+			</zone>
+			<zone type="Pacific/Midway">
+				<exemplarCity>Midway</exemplarCity>
+			</zone>
+			<zone type="Pacific/Johnston">
+				<exemplarCity>Johnston</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wake">
+				<exemplarCity>Wake</exemplarCity>
+			</zone>
+			<zone type="America/Adak">
+				<exemplarCity>Adak</exemplarCity>
+			</zone>
+			<zone type="America/Nome">
+				<exemplarCity>Nome</exemplarCity>
+			</zone>
+			<zone type="Pacific/Honolulu">
+				<short>
+					<generic>HST</generic>
+					<standard>HST</standard>
+					<daylight>HDT</daylight>
+				</short>
+				<exemplarCity>Honolulu</exemplarCity>
+			</zone>
+			<zone type="America/Anchorage">
+				<exemplarCity>Anchorage</exemplarCity>
+			</zone>
+			<zone type="America/Yakutat">
+				<exemplarCity>Yakutat</exemplarCity>
+			</zone>
+			<zone type="America/Sitka">
+				<exemplarCity>Sitka</exemplarCity>
+			</zone>
+			<zone type="America/Juneau">
+				<exemplarCity>Juneau</exemplarCity>
+			</zone>
+			<zone type="America/Metlakatla">
+				<exemplarCity>Metlakatla</exemplarCity>
+			</zone>
+			<zone type="America/Los_Angeles">
+				<exemplarCity>Los Angeles</exemplarCity>
+			</zone>
+			<zone type="America/Boise">
+				<exemplarCity>Boise</exemplarCity>
+			</zone>
+			<zone type="America/Phoenix">
+				<exemplarCity>Phoenix</exemplarCity>
+			</zone>
+			<zone type="America/Denver">
+				<exemplarCity>Denver</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Beulah">
+				<exemplarCity>Beulah, Dakota del Norte</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/New_Salem">
+				<exemplarCity>Nueva Salem, Dakota del Norte</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Center">
+				<exemplarCity>Center, Dakota del Norte</exemplarCity>
+			</zone>
+			<zone type="America/Chicago">
+				<exemplarCity>Chicago</exemplarCity>
+			</zone>
+			<zone type="America/Menominee">
+				<exemplarCity>Menominee</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Vincennes">
+				<exemplarCity>Vincennes, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Petersburg">
+				<exemplarCity>Petersburg, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Tell_City">
+				<exemplarCity>Tell City, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Knox">
+				<exemplarCity>Knox, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Winamac">
+				<exemplarCity>Winamac, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Marengo">
+				<exemplarCity>Marengo, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indianapolis">
+				<exemplarCity>Indianapolis</exemplarCity>
+			</zone>
+			<zone type="America/Louisville">
+				<exemplarCity>Louisville</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Vevay">
+				<exemplarCity>Vevay, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Kentucky/Monticello">
+				<exemplarCity>Monticello, Kentucky</exemplarCity>
+			</zone>
+			<zone type="America/Detroit">
+				<exemplarCity>Detroit</exemplarCity>
+			</zone>
+			<zone type="America/New_York">
+				<exemplarCity>Nueva York</exemplarCity>
+			</zone>
+			<zone type="America/Montevideo">
+				<exemplarCity>Montevideo</exemplarCity>
+			</zone>
+			<zone type="Asia/Samarkand">
+				<exemplarCity>Samarcanda</exemplarCity>
+			</zone>
+			<zone type="Asia/Tashkent">
+				<exemplarCity>Tashkent</exemplarCity>
+			</zone>
+			<zone type="Europe/Vatican">
+				<exemplarCity>El Vaticanu</exemplarCity>
+			</zone>
+			<zone type="America/St_Vincent">
+				<exemplarCity>St. Vincent</exemplarCity>
+			</zone>
+			<zone type="America/Caracas">
+				<exemplarCity>Caracas</exemplarCity>
+			</zone>
+			<zone type="America/Tortola">
+				<exemplarCity>Tórtola</exemplarCity>
+			</zone>
+			<zone type="America/St_Thomas">
+				<exemplarCity>St. Thomas</exemplarCity>
+			</zone>
+			<zone type="Asia/Saigon">
+				<exemplarCity>Ciudá de Ho Chi Minh</exemplarCity>
+			</zone>
+			<zone type="Pacific/Efate">
+				<exemplarCity>Efate</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wallis">
+				<exemplarCity>Wallis</exemplarCity>
+			</zone>
+			<zone type="Pacific/Apia">
+				<exemplarCity>Apia</exemplarCity>
+			</zone>
+			<zone type="Asia/Aden">
+				<exemplarCity>Aden</exemplarCity>
+			</zone>
+			<zone type="Indian/Mayotte">
+				<exemplarCity>Mayotte</exemplarCity>
+			</zone>
+			<zone type="Africa/Johannesburg">
+				<exemplarCity>Johannesburgu</exemplarCity>
+			</zone>
+			<zone type="Africa/Lusaka">
+				<exemplarCity>Lusaka</exemplarCity>
+			</zone>
+			<zone type="Africa/Harare">
+				<exemplarCity>Harare</exemplarCity>
+			</zone>
+			<metazone type="Acre">
+				<long>
+					<generic>hora d’Acre</generic>
+					<standard>hora estándar d’Acre</standard>
+					<daylight>hora braniega d’Acre</daylight>
+				</long>
+			</metazone>
+			<metazone type="Afghanistan">
+				<long>
+					<standard>Hora d’Afganistán</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Central">
+				<long>
+					<standard>Hora d’África central</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Eastern">
+				<long>
+					<standard>Hora d’África del este</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Southern">
+				<long>
+					<standard>Hora de Sudáfrica</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Western">
+				<long>
+					<generic>Hora d’África del oeste</generic>
+					<standard>Hora estándar d’África del oeste</standard>
+					<daylight>Hora braniega d’África del oeste</daylight>
+				</long>
+			</metazone>
+			<metazone type="Alaska">
+				<long>
+					<generic>Hora d’Alaska</generic>
+					<standard>Hora estándar d’Alaska</standard>
+					<daylight>Hora braniega d’Alaska</daylight>
+				</long>
+				<short>
+					<generic draft="contributed">AKT</generic>
+					<standard draft="contributed">AKST</standard>
+					<daylight draft="contributed">AKDT</daylight>
+				</short>
+			</metazone>
+			<metazone type="Almaty">
+				<long>
+					<generic>Hora d’Almaty</generic>
+					<standard>hora estándar d’Almaty</standard>
+					<daylight>hora braniega d’Almaty</daylight>
+				</long>
+			</metazone>
+			<metazone type="Amazon">
+				<long>
+					<generic>Hora del Amazonas</generic>
+					<standard>Hora estándar del Amazonas</standard>
+					<daylight>Hora braniega del Amazonas</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Central">
+				<long>
+					<generic>Hora central norteamericana</generic>
+					<standard>Hora estándar central norteamericana</standard>
+					<daylight>Hora braniega central norteamericana</daylight>
+				</long>
+				<short>
+					<generic draft="contributed">CT</generic>
+					<standard draft="contributed">CST</standard>
+					<daylight draft="contributed">CDT</daylight>
+				</short>
+			</metazone>
+			<metazone type="America_Eastern">
+				<long>
+					<generic>Hora del este norteamericanu</generic>
+					<standard>Hora estándar del este norteamericanu</standard>
+					<daylight>Hora braniega del este norteamericanu</daylight>
+				</long>
+				<short>
+					<generic draft="contributed">ET</generic>
+					<standard draft="contributed">EST</standard>
+					<daylight draft="contributed">EDT</daylight>
+				</short>
+			</metazone>
+			<metazone type="America_Mountain">
+				<long>
+					<generic>Hora de les montañes norteamericanes</generic>
+					<standard>Hora estándar de les montañes norteamericanes</standard>
+					<daylight>Hora braniega de les montañes norteamericanes</daylight>
+				</long>
+				<short>
+					<generic draft="contributed">MT</generic>
+					<standard draft="contributed">MST</standard>
+					<daylight draft="contributed">MDT</daylight>
+				</short>
+			</metazone>
+			<metazone type="America_Pacific">
+				<long>
+					<generic>Hora del Pacíficu norteamericanu</generic>
+					<standard>Hora estándar del Pacíficu norteamericanu</standard>
+					<daylight>Hora braniega del Pacíficu norteamericanu</daylight>
+				</long>
+				<short>
+					<generic draft="contributed">PT</generic>
+					<standard draft="contributed">PST</standard>
+					<daylight draft="contributed">PDT</daylight>
+				</short>
+			</metazone>
+			<metazone type="Anadyr">
+				<long>
+					<generic>hora d’Anadyr</generic>
+					<standard>hora estándar d’Anadyr</standard>
+					<daylight>hora braniega d’Anadyr</daylight>
+				</long>
+			</metazone>
+			<metazone type="Apia">
+				<long>
+					<generic>Hora d’Apia</generic>
+					<standard>Hora estándar d’Apia</standard>
+					<daylight>Hora braniega d’Apia</daylight>
+				</long>
+			</metazone>
+			<metazone type="Aqtau">
+				<long>
+					<generic>Hora d’Aqtau</generic>
+					<standard>Hora estándar d’Aqtau</standard>
+					<daylight>Hora braniega d’Aqtau</daylight>
+				</long>
+			</metazone>
+			<metazone type="Aqtobe">
+				<long>
+					<generic>Hora d’Aqtobe</generic>
+					<standard>Hora estándar d’Aqtobe</standard>
+					<daylight>Hora braniega d’Aqtobe</daylight>
+				</long>
+			</metazone>
+			<metazone type="Arabian">
+				<long>
+					<generic>Hora d’Arabia</generic>
+					<standard>Hora estándar d’Arabia</standard>
+					<daylight>Hora braniega d’Arabia</daylight>
+				</long>
+			</metazone>
+			<metazone type="Argentina">
+				<long>
+					<generic>Hora d’Arxentina</generic>
+					<standard>Hora estándar d’Arxentina</standard>
+					<daylight>Hora braniega d’Arxentina</daylight>
+				</long>
+			</metazone>
+			<metazone type="Argentina_Western">
+				<long>
+					<generic>Hora occidental d’Arxentina</generic>
+					<standard>Hora estándar occidental d’Arxentina</standard>
+					<daylight>Hora braniega occidental d’Arxentina</daylight>
+				</long>
+			</metazone>
+			<metazone type="Armenia">
+				<long>
+					<generic>Hora d’Armenia</generic>
+					<standard>Hora estándar d’Armenia</standard>
+					<daylight>Hora braniega d’Armenia</daylight>
+				</long>
+			</metazone>
+			<metazone type="Atlantic">
+				<long>
+					<generic>Hora del Atlánticu</generic>
+					<standard>Hora estándar del Atlánticu</standard>
+					<daylight>Hora braniega del Atlánticu</daylight>
+				</long>
+				<short>
+					<generic draft="contributed">AT</generic>
+					<standard draft="contributed">AST</standard>
+					<daylight draft="contributed">ADT</daylight>
+				</short>
+			</metazone>
+			<metazone type="Australia_Central">
+				<long>
+					<generic>Hora d’Australia central</generic>
+					<standard>Hora estándar d’Australia central</standard>
+					<daylight>Hora braniega d’Australia central</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_CentralWestern">
+				<long>
+					<generic>Hora d’Australia central del oeste</generic>
+					<standard>Hora estándar d’Australia central del oeste</standard>
+					<daylight>Hora braniega d’Australia central del oeste</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Eastern">
+				<long>
+					<generic>Hora d’Australia del este</generic>
+					<standard>Hora estándar d’Australia del este</standard>
+					<daylight>Hora braniega d’Australia del este</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Western">
+				<long>
+					<generic>Hora d’Australia del oeste</generic>
+					<standard>Hora estándar d’Australia del oeste</standard>
+					<daylight>Hora braniega d’Australia del oeste</daylight>
+				</long>
+			</metazone>
+			<metazone type="Azerbaijan">
+				<long>
+					<generic>Hora d’Azerbaixán</generic>
+					<standard>Hora estándar d’Azerbaixán</standard>
+					<daylight>Hora braniega d’Azerbaixán</daylight>
+				</long>
+			</metazone>
+			<metazone type="Azores">
+				<long>
+					<generic>Hora de les Azores</generic>
+					<standard>Hora estándar de les Azores</standard>
+					<daylight>Hora braniega de Les Azores</daylight>
+				</long>
+			</metazone>
+			<metazone type="Bangladesh">
+				<long>
+					<generic>Hora de Bangladex</generic>
+					<standard>Hora estándar de Bangladex</standard>
+					<daylight>Hora braniega de Bangladex</daylight>
+				</long>
+			</metazone>
+			<metazone type="Bhutan">
+				<long>
+					<standard>Hora de Bután</standard>
+				</long>
+			</metazone>
+			<metazone type="Bolivia">
+				<long>
+					<standard>Hora de Bolivia</standard>
+				</long>
+			</metazone>
+			<metazone type="Brasilia">
+				<long>
+					<generic>Hora de Brasilia</generic>
+					<standard>Hora estándar de Brasilia</standard>
+					<daylight>Hora braniega de Brasilia</daylight>
+				</long>
+			</metazone>
+			<metazone type="Brunei">
+				<long>
+					<standard>Hora de Brunéi Darussalam</standard>
+				</long>
+			</metazone>
+			<metazone type="Cape_Verde">
+				<long>
+					<generic>Hora de Cabu Verde</generic>
+					<standard>Hora estándar de Cabu Verde</standard>
+					<daylight>Hora braniega de Cabu Verde</daylight>
+				</long>
+			</metazone>
+			<metazone type="Casey">
+				<long>
+					<standard>Hora de Casey</standard>
+				</long>
+			</metazone>
+			<metazone type="Chamorro">
+				<long>
+					<standard>Hora estándar de Chamorro</standard>
+				</long>
+			</metazone>
+			<metazone type="Chatham">
+				<long>
+					<generic>Hora de Chatham</generic>
+					<standard>Hora estándar de Chatham</standard>
+					<daylight>Hora braniega de Chatham</daylight>
+				</long>
+			</metazone>
+			<metazone type="Chile">
+				<long>
+					<generic>Hora de Chile</generic>
+					<standard>Hora estándar de Chile</standard>
+					<daylight>Hora braniega de Chile</daylight>
+				</long>
+			</metazone>
+			<metazone type="China">
+				<long>
+					<generic>Hora de China</generic>
+					<standard>Hora estándar de China</standard>
+					<daylight>Hora braniega de China</daylight>
+				</long>
+			</metazone>
+			<metazone type="Choibalsan">
+				<long>
+					<generic>Hora de Choibalsan</generic>
+					<standard>Hora estándar de Choibalsan</standard>
+					<daylight>Hora braniega de Choibalsan</daylight>
+				</long>
+			</metazone>
+			<metazone type="Christmas">
+				<long>
+					<standard>Hora estándar de la Islla Christmas</standard>
+				</long>
+			</metazone>
+			<metazone type="Cocos">
+				<long>
+					<standard>Hora de les Islles Cocos</standard>
+				</long>
+			</metazone>
+			<metazone type="Colombia">
+				<long>
+					<generic>Hora de Colombia</generic>
+					<standard>Hora estándar de Colombia</standard>
+					<daylight>Hora braniega de Colombia</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cook">
+				<long>
+					<generic>Hora de les Islles Cook</generic>
+					<standard>Hora estándar de les Islles Cook</standard>
+					<daylight>Hora media braniega de les Islles Cook</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cuba">
+				<long>
+					<generic>Hora de Cuba</generic>
+					<standard>Hora estándar de Cuba</standard>
+					<daylight>Hora braniega de Cuba</daylight>
+				</long>
+			</metazone>
+			<metazone type="Davis">
+				<long>
+					<standard>Hora de Davis</standard>
+				</long>
+			</metazone>
+			<metazone type="DumontDUrville">
+				<long>
+					<standard>Hora de Dumont-d’Urville</standard>
+				</long>
+			</metazone>
+			<metazone type="East_Timor">
+				<long>
+					<standard>Hora de Timor Oriental</standard>
+				</long>
+			</metazone>
+			<metazone type="Easter">
+				<long>
+					<generic>Hora de la Islla de Pascua</generic>
+					<standard>Hora estándar de la Islla de Pascua</standard>
+					<daylight>Hora braniega de la Islla de Pascua</daylight>
+				</long>
+			</metazone>
+			<metazone type="Ecuador">
+				<long>
+					<standard>Hora d’Ecuador</standard>
+				</long>
+			</metazone>
+			<metazone type="Europe_Central">
+				<long>
+					<generic>Hora d’Europa Central</generic>
+					<standard>Hora estándar d’Europa Central</standard>
+					<daylight>Hora braniega d’Europa Central</daylight>
+				</long>
+				<short>
+					<generic draft="unconfirmed">CET</generic>
+					<standard draft="unconfirmed">CET</standard>
+					<daylight draft="unconfirmed">CEST</daylight>
+				</short>
+			</metazone>
+			<metazone type="Europe_Eastern">
+				<long>
+					<generic>Hora d’Europa del Este</generic>
+					<standard>Hora estándar d’Europa del Este</standard>
+					<daylight>Hora braniega d’Europa del Este</daylight>
+				</long>
+				<short>
+					<generic draft="unconfirmed">EET</generic>
+					<standard draft="unconfirmed">EET</standard>
+					<daylight draft="unconfirmed">EEST</daylight>
+				</short>
+			</metazone>
+			<metazone type="Europe_Further_Eastern">
+				<long>
+					<standard>Hora d’Europa del estremu este</standard>
+				</long>
+			</metazone>
+			<metazone type="Europe_Western">
+				<long>
+					<generic>Hora d’Europa Occidental</generic>
+					<standard>Hora estándar d’Europa Occidental</standard>
+					<daylight>Hora braniega d’Europa Occidental</daylight>
+				</long>
+				<short>
+					<generic draft="unconfirmed">WET</generic>
+					<standard draft="unconfirmed">WET</standard>
+					<daylight draft="unconfirmed">WEST</daylight>
+				</short>
+			</metazone>
+			<metazone type="Falkland">
+				<long>
+					<generic>Hora de les Islles Falkland</generic>
+					<standard>Hora estándar de les Islles Falkland</standard>
+					<daylight>Hora braniega de les Islles Falkland</daylight>
+				</long>
+			</metazone>
+			<metazone type="Fiji">
+				<long>
+					<generic>Hora de Fixi</generic>
+					<standard>Hora estándar de Fixi</standard>
+					<daylight>Hora braniega de Fixi</daylight>
+				</long>
+			</metazone>
+			<metazone type="French_Guiana">
+				<long>
+					<standard>Hora de La Guyana Francesa</standard>
+				</long>
+			</metazone>
+			<metazone type="French_Southern">
+				<long>
+					<standard>Hora del sur y l’antárticu francés</standard>
+				</long>
+			</metazone>
+			<metazone type="Galapagos">
+				<long>
+					<standard>Hora de Galápagos</standard>
+				</long>
+			</metazone>
+			<metazone type="Gambier">
+				<long>
+					<standard>Hora de Gambier</standard>
+				</long>
+			</metazone>
+			<metazone type="Georgia">
+				<long>
+					<generic>Hora de Xeorxa</generic>
+					<standard>Hora estándar de Xeorxa</standard>
+					<daylight>Hora braniega de Xeorxa</daylight>
+				</long>
+			</metazone>
+			<metazone type="Gilbert_Islands">
+				<long>
+					<standard>Hora de les Islles Gilbert</standard>
+				</long>
+			</metazone>
+			<metazone type="GMT">
+				<long>
+					<standard>Hora media de Greenwich</standard>
+				</long>
+				<short>
+					<standard draft="contributed">GMT</standard>
+				</short>
+			</metazone>
+			<metazone type="Greenland_Eastern">
+				<long>
+					<generic>Hora de Groenlandia oriental</generic>
+					<standard>Hora estándar de Groenlandia oriental</standard>
+					<daylight>Hora braniega de Groenlandia oriental</daylight>
+				</long>
+			</metazone>
+			<metazone type="Greenland_Western">
+				<long>
+					<generic>Hora de Groenlandia occidental</generic>
+					<standard>Hora estándar de Groenlandia occidental</standard>
+					<daylight>Hora braniega de Groenlandia occidental</daylight>
+				</long>
+			</metazone>
+			<metazone type="Guam">
+				<long>
+					<standard>Hora estándar de Guam</standard>
+				</long>
+			</metazone>
+			<metazone type="Gulf">
+				<long>
+					<standard>Hora estándar del Golfu</standard>
+				</long>
+			</metazone>
+			<metazone type="Guyana">
+				<long>
+					<standard>Hora de La Guyana</standard>
+				</long>
+			</metazone>
+			<metazone type="Hawaii_Aleutian">
+				<long>
+					<generic>Hora de Hawaii-Aleutianes</generic>
+					<standard>Hora estándar de Hawaii-Aleutianes</standard>
+					<daylight>Hora braniega de Hawaii-Aleutianes</daylight>
+				</long>
+				<short>
+					<generic draft="contributed">HAT</generic>
+					<standard draft="contributed">HAST</standard>
+					<daylight draft="contributed">HADT</daylight>
+				</short>
+			</metazone>
+			<metazone type="Hong_Kong">
+				<long>
+					<generic>Hora de Ḥong Kong</generic>
+					<standard>Hora estándar de Ḥong Kong</standard>
+					<daylight>Hora braniega de Ḥong Kong</daylight>
+				</long>
+			</metazone>
+			<metazone type="Hovd">
+				<long>
+					<generic>Hora de Hovd</generic>
+					<standard>Hora estándar de Hovd</standard>
+					<daylight>Hora braniega de Hovd</daylight>
+				</long>
+			</metazone>
+			<metazone type="India">
+				<long>
+					<standard>Hora estándar de la India</standard>
+				</long>
+			</metazone>
+			<metazone type="Indian_Ocean">
+				<long>
+					<standard>Hora del Océanu Índicu</standard>
+				</long>
+			</metazone>
+			<metazone type="Indochina">
+				<long>
+					<standard>Hora d’Indochina</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Central">
+				<long>
+					<standard>Hora d’Indonesia central</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Eastern">
+				<long>
+					<standard>Hora d’Indonesia del este</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Western">
+				<long>
+					<standard>Hora d’Indonesia del oeste</standard>
+				</long>
+			</metazone>
+			<metazone type="Iran">
+				<long>
+					<generic>Hora d’Irán</generic>
+					<standard>Hora estándar d’Irán</standard>
+					<daylight>Hora braniega d’Irán</daylight>
+				</long>
+			</metazone>
+			<metazone type="Irkutsk">
+				<long>
+					<generic>Hora d’Irkutsk</generic>
+					<standard>Hora estándar d’Irkutsk</standard>
+					<daylight>Hora braniega d’Irkutsk</daylight>
+				</long>
+			</metazone>
+			<metazone type="Israel">
+				<long>
+					<generic>Hora d’Israel</generic>
+					<standard>Hora estándar d’Israel</standard>
+					<daylight>Hora braniega d’Israel</daylight>
+				</long>
+			</metazone>
+			<metazone type="Japan">
+				<long>
+					<generic>Hora de Xapón</generic>
+					<standard>Hora estándar de Xapón</standard>
+					<daylight>Hora braniega de Xapón</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kamchatka">
+				<long>
+					<generic>hora de Petropavlovsk-Kamchatski</generic>
+					<standard>hora estandar de Petropavlovsk-Kamchatski</standard>
+					<daylight>hora braniega de Petropavlovsk-Kamchatski</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Eastern">
+				<long>
+					<standard>Hora del Kazakstán oriental</standard>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Western">
+				<long>
+					<standard>Hora del Kazakstán occidental</standard>
+				</long>
+			</metazone>
+			<metazone type="Korea">
+				<long>
+					<generic>Hora de Corea</generic>
+					<standard>Hora estándar de Corea</standard>
+					<daylight>Hora braniega de Corea</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kosrae">
+				<long>
+					<standard>Hora de Kosrae</standard>
+				</long>
+			</metazone>
+			<metazone type="Krasnoyarsk">
+				<long>
+					<generic>Hora de Krasnoyarsk</generic>
+					<standard>Hora estándar de Krasnoyarsk</standard>
+					<daylight>Hora braniega de Krasnoyarsk</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kyrgystan">
+				<long>
+					<standard>Hora del Kirguistán</standard>
+				</long>
+			</metazone>
+			<metazone type="Lanka">
+				<long>
+					<standard>Hora de Lanka</standard>
+				</long>
+			</metazone>
+			<metazone type="Line_Islands">
+				<long>
+					<standard>Hora de les Islles Line</standard>
+				</long>
+			</metazone>
+			<metazone type="Lord_Howe">
+				<long>
+					<generic>Hora de Lord Howe</generic>
+					<standard>Hora estándar de Lord Howe</standard>
+					<daylight>Hora braniega de Lord Howe</daylight>
+				</long>
+			</metazone>
+			<metazone type="Macau">
+				<long>
+					<generic>Hora de Macáu</generic>
+					<standard>Hora estándar de Macáu</standard>
+					<daylight>Hora braniega de Macáu</daylight>
+				</long>
+			</metazone>
+			<metazone type="Macquarie">
+				<long>
+					<standard>Hora de la Islla Macquarie</standard>
+				</long>
+			</metazone>
+			<metazone type="Magadan">
+				<long>
+					<generic>Hora de Magadán</generic>
+					<standard>Hora estándar de Magadán</standard>
+					<daylight>Hora braniega de Magadán</daylight>
+				</long>
+			</metazone>
+			<metazone type="Malaysia">
+				<long>
+					<standard>Hora de Malasia</standard>
+				</long>
+			</metazone>
+			<metazone type="Maldives">
+				<long>
+					<standard>Hora de Les Maldives</standard>
+				</long>
+			</metazone>
+			<metazone type="Marquesas">
+				<long>
+					<standard>Hora de les Marqueses</standard>
+				</long>
+			</metazone>
+			<metazone type="Marshall_Islands">
+				<long>
+					<standard>Hora de les Islles Marshall</standard>
+				</long>
+			</metazone>
+			<metazone type="Mauritius">
+				<long>
+					<generic>Hora de Mauriciu</generic>
+					<standard>Hora estándar de Mauriciu</standard>
+					<daylight>Hora braniega de Mauriciu</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mawson">
+				<long>
+					<standard>Hora de Mawson</standard>
+				</long>
+			</metazone>
+			<metazone type="Mexico_Northwest">
+				<long>
+					<generic>Hora del noroeste de Méxicu</generic>
+					<standard>Hora estándar del noroeste de Méxicu</standard>
+					<daylight>Hora braniega del noroeste de Méxicu</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mexico_Pacific">
+				<long>
+					<generic>Hora del Pacíficu de Méxicu</generic>
+					<standard>Hora estándar del Pacíficu de Méxicu</standard>
+					<daylight>Hora braniega del Pacíficu de Méxicu</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mongolia">
+				<long>
+					<generic>Hora d’Ulán Bátor</generic>
+					<standard>Hora estándar d’Ulán Bátor</standard>
+					<daylight>Hora braniega d’Ulán Bátor</daylight>
+				</long>
+			</metazone>
+			<metazone type="Moscow">
+				<long>
+					<generic>Hora de Moscú</generic>
+					<standard>Hora estándar de Moscú</standard>
+					<daylight>Hora braniega de Moscú</daylight>
+				</long>
+			</metazone>
+			<metazone type="Myanmar">
+				<long>
+					<standard>Hora de Myanmar</standard>
+				</long>
+			</metazone>
+			<metazone type="Nauru">
+				<long>
+					<standard>Hora de Nauru</standard>
+				</long>
+			</metazone>
+			<metazone type="Nepal">
+				<long>
+					<standard>Hora del Nepal</standard>
+				</long>
+			</metazone>
+			<metazone type="New_Caledonia">
+				<long>
+					<generic>Hora de Nueva Caledonia</generic>
+					<standard>Hora estándar de Nueva Caledonia</standard>
+					<daylight>Hora braniega de Nueva Caledonia</daylight>
+				</long>
+			</metazone>
+			<metazone type="New_Zealand">
+				<long>
+					<generic>Hora de Nueva Zelanda</generic>
+					<standard>Hora estándar de Nueva Zelanda</standard>
+					<daylight>Hora braniega de Nueva Zelanda</daylight>
+				</long>
+			</metazone>
+			<metazone type="Newfoundland">
+				<long>
+					<generic>Hora de Newfoundland</generic>
+					<standard>Hora estándar de Newfoundland</standard>
+					<daylight>Hora braniega de Newfoundland</daylight>
+				</long>
+			</metazone>
+			<metazone type="Niue">
+				<long>
+					<standard>Hora de Niue</standard>
+				</long>
+			</metazone>
+			<metazone type="Norfolk">
+				<long>
+					<standard>Hora de la Islla Norfolk</standard>
+				</long>
+			</metazone>
+			<metazone type="Noronha">
+				<long>
+					<generic>Hora de Fernando de Noronha</generic>
+					<standard>Hora estándar de Fernando de Noronha</standard>
+					<daylight>Hora braniega de Fernando de Noronha</daylight>
+				</long>
+			</metazone>
+			<metazone type="North_Mariana">
+				<long>
+					<standard>Hora de les Islles Marianes del Norte</standard>
+				</long>
+			</metazone>
+			<metazone type="Novosibirsk">
+				<long>
+					<generic>Hora de Novosibirsk</generic>
+					<standard>Hora estándar de Novosibirsk</standard>
+					<daylight>Hora braniega de Novosibirsk</daylight>
+				</long>
+			</metazone>
+			<metazone type="Omsk">
+				<long>
+					<generic>Hora d’Omsk</generic>
+					<standard>Hora estándar d’Omsk</standard>
+					<daylight>Hora braniega d’Omsk</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pakistan">
+				<long>
+					<generic>Hora del Paquistán</generic>
+					<standard>Hora estándar del Paquistán</standard>
+					<daylight>Hora braniega del Paquistán</daylight>
+				</long>
+			</metazone>
+			<metazone type="Palau">
+				<long>
+					<standard>Hora de Palau</standard>
+				</long>
+			</metazone>
+			<metazone type="Papua_New_Guinea">
+				<long>
+					<standard>Hora de Papúa Nueva Guinea</standard>
+				</long>
+			</metazone>
+			<metazone type="Paraguay">
+				<long>
+					<generic>Hora del Paraguái</generic>
+					<standard>Hora estándar del Paraguái</standard>
+					<daylight>Hora braniega del Paraguái</daylight>
+				</long>
+			</metazone>
+			<metazone type="Peru">
+				<long>
+					<generic>Hora del Perú</generic>
+					<standard>Hora estándar del Perú</standard>
+					<daylight>Hora braniega del Perú</daylight>
+				</long>
+			</metazone>
+			<metazone type="Philippines">
+				<long>
+					<generic>Hora de Filipines</generic>
+					<standard>Hora estándar de Filipines</standard>
+					<daylight>Hora de branu de Filipines</daylight>
+				</long>
+			</metazone>
+			<metazone type="Phoenix_Islands">
+				<long>
+					<standard>Hora de les Islles Phoenix</standard>
+				</long>
+			</metazone>
+			<metazone type="Pierre_Miquelon">
+				<long>
+					<generic>Hora de Saint Pierre y Miquelon</generic>
+					<standard>Hora estándar de Saint Pierre y Miquelon</standard>
+					<daylight>Hora braniega de Saint Pierre y Miquelon</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pitcairn">
+				<long>
+					<standard>Hora de Pitcairn</standard>
+				</long>
+			</metazone>
+			<metazone type="Ponape">
+				<long>
+					<standard>Hora de Ponape</standard>
+				</long>
+			</metazone>
+			<metazone type="Qyzylorda">
+				<long>
+					<generic>Hora de Qyzylorda</generic>
+					<standard>Hora estándar de Qyzylorda</standard>
+					<daylight>Hora braniega de Qyzylorda</daylight>
+				</long>
+			</metazone>
+			<metazone type="Reunion">
+				<long>
+					<standard>Hora de Reunión</standard>
+				</long>
+			</metazone>
+			<metazone type="Rothera">
+				<long>
+					<standard>Hora de Rothera</standard>
+				</long>
+			</metazone>
+			<metazone type="Sakhalin">
+				<long>
+					<generic>Hora de Saxalín</generic>
+					<standard>Hora estándar de Saxalín</standard>
+					<daylight>Hora braniega de Saxalín</daylight>
+				</long>
+			</metazone>
+			<metazone type="Samara">
+				<long>
+					<generic>Hora de Samara</generic>
+					<standard>Hora estándar de Samara</standard>
+					<daylight>Hora braniega de Samara</daylight>
+				</long>
+			</metazone>
+			<metazone type="Samoa">
+				<long>
+					<generic>Hora de Samoa</generic>
+					<standard>Hora estándar de Samoa</standard>
+					<daylight>Hora braniega de Samoa</daylight>
+				</long>
+			</metazone>
+			<metazone type="Seychelles">
+				<long>
+					<standard>Hora de Les Seixeles</standard>
+				</long>
+			</metazone>
+			<metazone type="Singapore">
+				<long>
+					<standard>Hora estándar de Singapur</standard>
+				</long>
+			</metazone>
+			<metazone type="Solomon">
+				<long>
+					<standard>Hora de les Islles Salomón</standard>
+				</long>
+			</metazone>
+			<metazone type="South_Georgia">
+				<long>
+					<standard>Hora de Xeorxa del Sur</standard>
+				</long>
+			</metazone>
+			<metazone type="Suriname">
+				<long>
+					<standard>Hora del Surinam</standard>
+				</long>
+			</metazone>
+			<metazone type="Syowa">
+				<long>
+					<standard>Hora de Syowa</standard>
+				</long>
+			</metazone>
+			<metazone type="Tahiti">
+				<long>
+					<standard>Hora de Tahiti</standard>
+				</long>
+			</metazone>
+			<metazone type="Taipei">
+				<long>
+					<generic>Hora de Taipéi</generic>
+					<standard>Hora estándar de Taipéi</standard>
+					<daylight>Hora braniega de Taipéi</daylight>
+				</long>
+			</metazone>
+			<metazone type="Tajikistan">
+				<long>
+					<standard>Hora del Taxiquistán</standard>
+				</long>
+			</metazone>
+			<metazone type="Tokelau">
+				<long>
+					<standard>Hora de Tokelau</standard>
+				</long>
+			</metazone>
+			<metazone type="Tonga">
+				<long>
+					<generic>Hora de Tonga</generic>
+					<standard>Hora estándar de Tonga</standard>
+					<daylight>Hora braniega de Tonga</daylight>
+				</long>
+			</metazone>
+			<metazone type="Truk">
+				<long>
+					<standard>Hora de Chuuk</standard>
+				</long>
+			</metazone>
+			<metazone type="Turkmenistan">
+				<long>
+					<generic>Hora del Turkmenistán</generic>
+					<standard>Hora estándar del Turkmenistán</standard>
+					<daylight>Hora braniega del Turkmenistán</daylight>
+				</long>
+			</metazone>
+			<metazone type="Tuvalu">
+				<long>
+					<standard>Hora de Tuvalu</standard>
+				</long>
+			</metazone>
+			<metazone type="Uruguay">
+				<long>
+					<generic>Hora del Uruguái</generic>
+					<standard>Hora estándar del Uruguái</standard>
+					<daylight>Hora braniega del Uruguái</daylight>
+				</long>
+			</metazone>
+			<metazone type="Uzbekistan">
+				<long>
+					<generic>Hora del Uzbequistán</generic>
+					<standard>Hora estándar del Uzbequistán</standard>
+					<daylight>Hora braniega del Uzbequistán</daylight>
+				</long>
+			</metazone>
+			<metazone type="Vanuatu">
+				<long>
+					<generic>Hora de Vanuatu</generic>
+					<standard>Hora estándar de Vanuatu</standard>
+					<daylight>Hora braniega de Vanuatu</daylight>
+				</long>
+			</metazone>
+			<metazone type="Venezuela">
+				<long>
+					<standard>Hora de Venezuela</standard>
+				</long>
+			</metazone>
+			<metazone type="Vladivostok">
+				<long>
+					<generic>Hora de Vladivostok</generic>
+					<standard>Hora estándar de Vladivostok</standard>
+					<daylight>Hora braniega de Vladivostok</daylight>
+				</long>
+			</metazone>
+			<metazone type="Volgograd">
+				<long>
+					<generic>Hora de Volgográu</generic>
+					<standard>Hora estándar de Volgográu</standard>
+					<daylight>Hora braniega de Volgográu</daylight>
+				</long>
+			</metazone>
+			<metazone type="Vostok">
+				<long>
+					<standard>Hora de Vostok</standard>
+				</long>
+			</metazone>
+			<metazone type="Wake">
+				<long>
+					<standard>Hora de la Islla Wake</standard>
+				</long>
+			</metazone>
+			<metazone type="Wallis">
+				<long>
+					<standard>Hora de Wallis y Futuna</standard>
+				</long>
+			</metazone>
+			<metazone type="Yakutsk">
+				<long>
+					<generic>Hora de Yakutsk</generic>
+					<standard>Hora estándar de Yakutsk</standard>
+					<daylight>Hora braniega de Yakutsk</daylight>
+				</long>
+			</metazone>
+			<metazone type="Yekaterinburg">
+				<long>
+					<generic>Hora de Yekaterimburgu</generic>
+					<standard>Hora estándar de Yekaterimburgu</standard>
+					<daylight>Hora braniega de Yekaterimburgu</daylight>
+				</long>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<defaultNumberingSystem draft="contributed">latn</defaultNumberingSystem>
+		<otherNumberingSystems>
+			<native draft="contributed">latn</native>
+		</otherNumberingSystems>
+		<minimumGroupingDigits draft="contributed">1</minimumGroupingDigits>
+		<symbols numberSystem="arab">
+			<decimal>٫</decimal>
+			<group>٬</group>
+			<percentSign>٪</percentSign>
+			<plusSign>‏+</plusSign>
+			<minusSign>‏-</minusSign>
+			<perMille>؉</perMille>
+			<timeSeparator draft="contributed">:</timeSeparator>
+		</symbols>
+		<symbols numberSystem="arabext">
+			<plusSign>‎+‎</plusSign>
+			<minusSign>‎-‎</minusSign>
+		</symbols>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group>.</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>ND</nan>
+			<timeSeparator draft="contributed">:</timeSeparator>
+		</symbols>
+		<decimalFormats numberSystem="latn">
+			<decimalFormatLength>
+				<decimalFormat>
+					<pattern>#,##0.###</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+			<decimalFormatLength type="long">
+				<decimalFormat>
+					<pattern type="1000" count="one">0 millar</pattern>
+					<pattern type="1000" count="other">0 millares</pattern>
+					<pattern type="10000" count="one">00 millares</pattern>
+					<pattern type="10000" count="other">00 millares</pattern>
+					<pattern type="100000" count="one">000 millares</pattern>
+					<pattern type="100000" count="other">000 millares</pattern>
+					<pattern type="1000000" count="one">0 millón</pattern>
+					<pattern type="1000000" count="other">0 millones</pattern>
+					<pattern type="10000000" count="one">00 millones</pattern>
+					<pattern type="10000000" count="other">00 millones</pattern>
+					<pattern type="100000000" count="one">000 millones</pattern>
+					<pattern type="100000000" count="other">000 millones</pattern>
+					<pattern type="1000000000" count="one">0G</pattern>
+					<pattern type="1000000000" count="other">0G</pattern>
+					<pattern type="10000000000" count="one">00G</pattern>
+					<pattern type="10000000000" count="other">00G</pattern>
+					<pattern type="100000000000" count="one">000G</pattern>
+					<pattern type="100000000000" count="other">000G</pattern>
+					<pattern type="1000000000000" count="one">0T</pattern>
+					<pattern type="1000000000000" count="other">0T</pattern>
+					<pattern type="10000000000000" count="one">00T</pattern>
+					<pattern type="10000000000000" count="other">00T</pattern>
+					<pattern type="100000000000000" count="one">000T</pattern>
+					<pattern type="100000000000000" count="other">000T</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+			<decimalFormatLength type="short">
+				<decimalFormat>
+					<pattern type="1000" count="one">0K</pattern>
+					<pattern type="1000" count="other">0K</pattern>
+					<pattern type="10000" count="one">00K</pattern>
+					<pattern type="10000" count="other">00K</pattern>
+					<pattern type="100000" count="one">000K</pattern>
+					<pattern type="100000" count="other">000K</pattern>
+					<pattern type="1000000" count="one">0M</pattern>
+					<pattern type="1000000" count="other">0M</pattern>
+					<pattern type="10000000" count="one">00M</pattern>
+					<pattern type="10000000" count="other">00M</pattern>
+					<pattern type="100000000" count="one">000M</pattern>
+					<pattern type="100000000" count="other">000M</pattern>
+					<pattern type="1000000000" count="one">0G</pattern>
+					<pattern type="1000000000" count="other">0G</pattern>
+					<pattern type="10000000000" count="one">00G</pattern>
+					<pattern type="10000000000" count="other">00G</pattern>
+					<pattern type="100000000000" count="one">000G</pattern>
+					<pattern type="100000000000" count="other">000G</pattern>
+					<pattern type="1000000000000" count="one">0T</pattern>
+					<pattern type="1000000000000" count="other">0T</pattern>
+					<pattern type="10000000000000" count="one">00T</pattern>
+					<pattern type="10000000000000" count="other">00T</pattern>
+					<pattern type="100000000000000" count="one">000T</pattern>
+					<pattern type="100000000000000" count="other">000T</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+		</decimalFormats>
+		<scientificFormats numberSystem="latn">
+			<scientificFormatLength>
+				<scientificFormat>
+					<pattern>#E0</pattern>
+				</scientificFormat>
+			</scientificFormatLength>
+		</scientificFormats>
+		<percentFormats numberSystem="latn">
+			<percentFormatLength>
+				<percentFormat>
+					<pattern>#,##0%</pattern>
+				</percentFormat>
+			</percentFormatLength>
+		</percentFormats>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">0K ¤</pattern>
+					<pattern type="1000" count="other">0K ¤</pattern>
+					<pattern type="10000" count="one">00K ¤</pattern>
+					<pattern type="10000" count="other">00K ¤</pattern>
+					<pattern type="100000" count="one">000K ¤</pattern>
+					<pattern type="100000" count="other">000K ¤</pattern>
+					<pattern type="1000000" count="one">0M ¤</pattern>
+					<pattern type="1000000" count="other">0M ¤</pattern>
+					<pattern type="10000000" count="one">00M ¤</pattern>
+					<pattern type="10000000" count="other">00M ¤</pattern>
+					<pattern type="100000000" count="one">000M ¤</pattern>
+					<pattern type="100000000" count="other">000M ¤</pattern>
+					<pattern type="1000000000" count="one">0G ¤</pattern>
+					<pattern type="1000000000" count="other">0G ¤</pattern>
+					<pattern type="10000000000" count="one">00G ¤</pattern>
+					<pattern type="10000000000" count="other">00G ¤</pattern>
+					<pattern type="100000000000" count="one">000G ¤</pattern>
+					<pattern type="100000000000" count="other">000G ¤</pattern>
+					<pattern type="1000000000000" count="one">0T ¤</pattern>
+					<pattern type="1000000000000" count="other">0T ¤</pattern>
+					<pattern type="10000000000000" count="one">00T ¤</pattern>
+					<pattern type="10000000000000" count="other">00T ¤</pattern>
+					<pattern type="100000000000000" count="one">000T ¤</pattern>
+					<pattern type="100000000000000" count="other">000T ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<unitPattern count="one">{0} {1}</unitPattern>
+			<unitPattern count="other">{0} {1}</unitPattern>
+		</currencyFormats>
+		<currencies>
+			<currency type="ADP">
+				<displayName>Peseta andorrana</displayName>
+				<displayName count="one">peseta andorrana</displayName>
+				<displayName count="other">pesetes andorranes</displayName>
+				<symbol draft="contributed">ADP</symbol>
+			</currency>
+			<currency type="AED">
+				<displayName>Dirḥam de los Emiratos Árabes Xuníos</displayName>
+				<displayName count="one">dirḥam EAX</displayName>
+				<displayName count="other">dirḥams EAX</displayName>
+				<symbol>AED</symbol>
+			</currency>
+			<currency type="AFA">
+				<displayName>Afganí afganistanu (1927–2002)</displayName>
+				<displayName count="one">afganí afganistanu (1927–2002)</displayName>
+				<displayName count="other">afganís afganistanos (1927–2002)</displayName>
+				<symbol draft="contributed">AFA</symbol>
+			</currency>
+			<currency type="AFN">
+				<displayName>Afganí afganistanu</displayName>
+				<displayName count="one">afganí afganistanu</displayName>
+				<displayName count="other">afganís afganistanos</displayName>
+				<symbol>AFN</symbol>
+			</currency>
+			<currency type="ALK">
+				<displayName>Lek albanés (1946–1965)</displayName>
+				<displayName count="one">lek albanés (1946–1965)</displayName>
+				<displayName count="other">lekë albaneses (1946–1965)</displayName>
+			</currency>
+			<currency type="ALL">
+				<displayName>Lek albanés</displayName>
+				<displayName count="one">lek albanés</displayName>
+				<displayName count="other">lekë albaneses</displayName>
+				<symbol draft="contributed">ALL</symbol>
+			</currency>
+			<currency type="AMD">
+				<displayName>Dram armeniu</displayName>
+				<displayName count="one">dram armeniu</displayName>
+				<displayName count="other">drams armenios</displayName>
+				<symbol>AMD</symbol>
+			</currency>
+			<currency type="ANG">
+				<displayName>Guílder de les Antilles Neerlandeses</displayName>
+				<displayName count="one">guílder de les Antilles Neerlandeses</displayName>
+				<displayName count="other">guílders de les Antilles Neerlandeses</displayName>
+				<symbol>ANG</symbol>
+			</currency>
+			<currency type="AOA">
+				<displayName>Kwanza angolanu</displayName>
+				<displayName count="one">kwanza angolanu</displayName>
+				<displayName count="other">kwanzas angolanos</displayName>
+				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
+			</currency>
+			<currency type="AOK">
+				<displayName>Kwanza angolanu (1977–1991)</displayName>
+				<displayName count="one">kwanza angolanu (1977–1991)</displayName>
+				<displayName count="other">kwanzas angolanos (1977–1991)</displayName>
+				<symbol draft="contributed">AOK</symbol>
+			</currency>
+			<currency type="AON">
+				<displayName>Kwanza nuevu angolanu (1990–2000)</displayName>
+				<displayName count="one">kwanza nuevu angolanu (1990–2000)</displayName>
+				<displayName count="other">kwanzas nuevos angolanos (1990–2000)</displayName>
+				<symbol draft="contributed">AON</symbol>
+			</currency>
+			<currency type="AOR">
+				<displayName>Kwanza angolanu reaxustáu (1995–1999)</displayName>
+				<displayName count="one">kwanza angolanu reaxustáu (1995–1999)</displayName>
+				<displayName count="other">kwanzas angolanos reaxustaos (1995–1999)</displayName>
+				<symbol draft="contributed">AOR</symbol>
+			</currency>
+			<currency type="ARA">
+				<displayName>Austral arxentín</displayName>
+				<displayName count="one">austral arxentín</displayName>
+				<displayName count="other">australes arxentinos</displayName>
+				<symbol draft="contributed">ARA</symbol>
+			</currency>
+			<currency type="ARL">
+				<displayName>Pesu Ley arxentín (1970–1983)</displayName>
+				<displayName count="one">pesu ley arxentín (1970–1983)</displayName>
+				<displayName count="other">pesos ley arxentinos (1970–1983)</displayName>
+				<symbol draft="contributed">ARL</symbol>
+			</currency>
+			<currency type="ARM">
+				<displayName>Pesu arxentín (1881–1970)</displayName>
+				<displayName count="one">pesu arxentín (1881–1970)</displayName>
+				<displayName count="other">pesos arxentinos (1881–1970)</displayName>
+				<symbol draft="contributed">ARM</symbol>
+			</currency>
+			<currency type="ARP">
+				<displayName>Pesu arxentín (1983–1985)</displayName>
+				<displayName count="one">pesu arxentín (1983–1985)</displayName>
+				<displayName count="other">pesos arxentinos (1983–1985)</displayName>
+				<symbol draft="contributed">ARP</symbol>
+			</currency>
+			<currency type="ARS">
+				<displayName>pesu arxentín</displayName>
+				<displayName count="one">pesu arxentín</displayName>
+				<displayName count="other">pesos arxentinos</displayName>
+				<symbol>ARS</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="ATS">
+				<displayName>Chelín austriacu</displayName>
+				<displayName count="one">chelín austriacu</displayName>
+				<displayName count="other">chelinos austriacos</displayName>
+				<symbol draft="contributed">ATS</symbol>
+			</currency>
+			<currency type="AUD">
+				<displayName>Dólar australianu</displayName>
+				<displayName count="one">dólar australianu</displayName>
+				<displayName count="other">dólares australianos</displayName>
+				<symbol>A$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="AWG">
+				<displayName>Florín arubanu</displayName>
+				<displayName count="one">florín arubanu</displayName>
+				<displayName count="other">florines arubanos</displayName>
+				<symbol>AWG</symbol>
+			</currency>
+			<currency type="AZM">
+				<displayName>Manat azerbaixanu (1993–2006)</displayName>
+				<displayName count="one">manat azerbaixanu (1993–2006)</displayName>
+				<displayName count="other">manats azerbaixanos (1993–2006)</displayName>
+				<symbol draft="contributed">AZM</symbol>
+			</currency>
+			<currency type="AZN">
+				<displayName>Manat azerbaixanu</displayName>
+				<displayName count="one">manat azerbaixanu</displayName>
+				<displayName count="other">manats azerbaixanos</displayName>
+				<symbol draft="contributed">AZN</symbol>
+			</currency>
+			<currency type="BAD">
+				<displayName>Dinar de Bosnia-Herzegovina (1992–1994)</displayName>
+				<displayName count="one">dinar de Bosnia-Herzegovina (1992–1994)</displayName>
+				<displayName count="other">dinares de Bosnia-Herzegovina (1992–1994)</displayName>
+				<symbol draft="contributed">BAD</symbol>
+			</currency>
+			<currency type="BAM">
+				<displayName>marcu convertible de Bosnia-Herzegovina</displayName>
+				<displayName count="one">marcu convertible de Bosnia-Herzegovina</displayName>
+				<displayName count="other">marcos convertibles de Bosnia-Herzegovina</displayName>
+				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
+			</currency>
+			<currency type="BAN">
+				<displayName>Dinar nuevu de Bosnia-Herzegovina (1994–1997)</displayName>
+				<displayName count="one">dinar nuevu de Bosnia-Herzegovina (1994–1997)</displayName>
+				<displayName count="other">dinares nuevos de Bosnia-Herzegovina (1994–1997)</displayName>
+				<symbol draft="contributed">BAN</symbol>
+			</currency>
+			<currency type="BBD">
+				<displayName>Dólar barbadianu</displayName>
+				<displayName count="one">dólar barbadianu</displayName>
+				<displayName count="other">dólares barbadianos</displayName>
+				<symbol>BBD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BDT">
+				<displayName>Taka bangladexí</displayName>
+				<displayName count="one">taka bangladexí</displayName>
+				<displayName count="other">takas bangladexinos</displayName>
+				<symbol>BDT</symbol>
+				<symbol alt="narrow" draft="contributed">৳</symbol>
+			</currency>
+			<currency type="BEC">
+				<displayName>Francu belga (convertible)</displayName>
+				<displayName count="one">francu belga (convertible)</displayName>
+				<displayName count="other">francos belgas (convertibles)</displayName>
+				<symbol draft="contributed">BEC</symbol>
+			</currency>
+			<currency type="BEF">
+				<displayName>Francu belga</displayName>
+				<displayName count="one">francu belga</displayName>
+				<displayName count="other">francos belgues</displayName>
+				<symbol draft="contributed">BEF</symbol>
+			</currency>
+			<currency type="BEL">
+				<displayName>Francu belga (financieru)</displayName>
+				<displayName count="one">francu belga (financieru)</displayName>
+				<displayName count="other">francos belgues (financieros)</displayName>
+				<symbol draft="contributed">BEL</symbol>
+			</currency>
+			<currency type="BGL">
+				<displayName>Lev fuerte búlgaru</displayName>
+				<displayName count="one">lev fuerte búlgaru</displayName>
+				<displayName count="other">leva fuertes búlgaros</displayName>
+				<symbol draft="contributed">BGL</symbol>
+			</currency>
+			<currency type="BGM">
+				<displayName>Lev socialista búlgaru</displayName>
+				<displayName count="one">lev socialista búlgaru</displayName>
+				<displayName count="other">leva socialistes búlgaros</displayName>
+				<symbol draft="contributed">BGM</symbol>
+			</currency>
+			<currency type="BGN">
+				<displayName>Lev búlgaru</displayName>
+				<displayName count="one">lev búlgaru</displayName>
+				<displayName count="other">leva búlgaros</displayName>
+				<symbol draft="contributed">BGN</symbol>
+			</currency>
+			<currency type="BGO">
+				<displayName>Lev búlgaru (1879–1952)</displayName>
+				<displayName count="one">lev búlgaru (1879–1952)</displayName>
+				<displayName count="other">leva búlgaros (1879–1952)</displayName>
+				<symbol draft="contributed">BGO</symbol>
+			</currency>
+			<currency type="BHD">
+				<displayName>Dinar baḥreiní</displayName>
+				<displayName count="one">dinar baḥreiní</displayName>
+				<displayName count="other">dinares baḥreininos</displayName>
+				<symbol draft="contributed">BHD</symbol>
+			</currency>
+			<currency type="BIF">
+				<displayName>Francu burundianu</displayName>
+				<displayName count="one">francu burundianu</displayName>
+				<displayName count="other">francos burundianos</displayName>
+				<symbol>BIF</symbol>
+			</currency>
+			<currency type="BMD">
+				<displayName>Dólar bermudianu</displayName>
+				<displayName count="one">dólar bermudianu</displayName>
+				<displayName count="other">dólares bermudianos</displayName>
+				<symbol>BMD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BND">
+				<displayName>dólar bruneyanu</displayName>
+				<displayName count="one">dólar bruneyanu</displayName>
+				<displayName count="other">dólares bruneyanos</displayName>
+				<symbol>BND</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BOB">
+				<displayName>Bolivianu de Bolivia</displayName>
+				<displayName count="one">bolivianu de Bolivia</displayName>
+				<displayName count="other">bolivianos de Bolivia</displayName>
+				<symbol draft="contributed">BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
+			</currency>
+			<currency type="BOL">
+				<displayName>Boliviano de Bolivia (1863–1963)</displayName>
+				<displayName count="one">boliviano de Bolivia (1863–1963)</displayName>
+				<displayName count="other">bolivianos de Bolivia (1863–1963)</displayName>
+				<symbol draft="contributed">BOL</symbol>
+			</currency>
+			<currency type="BOP">
+				<displayName>Pesu bolivianu</displayName>
+				<displayName count="one">pesu bolivianu</displayName>
+				<displayName count="other">pesos bolivianos</displayName>
+				<symbol draft="contributed">BOP</symbol>
+			</currency>
+			<currency type="BOV">
+				<displayName>Bolivianos mvdol</displayName>
+				<displayName count="one">bolivianu mvdol</displayName>
+				<displayName count="other">bolivianos mvdol</displayName>
+				<symbol draft="contributed">BOV</symbol>
+			</currency>
+			<currency type="BRB">
+				<displayName>Cruzeiro nuevu brasilanu (1967–1986)</displayName>
+				<displayName count="one">cruzeiro nuevu brasilanu (1967–1986)</displayName>
+				<displayName count="other">cruzeiros nuevos brasilanos (1967–1986)</displayName>
+				<symbol draft="contributed">BRB</symbol>
+			</currency>
+			<currency type="BRC">
+				<displayName>Cruzado brasilanu (1986–1989)</displayName>
+				<displayName count="one">cruzado brasilanu (1986–1989)</displayName>
+				<displayName count="other">cruzados brasilanos (1986–1989)</displayName>
+				<symbol draft="contributed">BRC</symbol>
+			</currency>
+			<currency type="BRE">
+				<displayName>Cruzeiro brasilanu (1990–1993)</displayName>
+				<displayName count="one">cruzeiro brasilanu (1990–1993)</displayName>
+				<displayName count="other">cruzeiros brasilanos (1990–1993)</displayName>
+				<symbol draft="contributed">BRE</symbol>
+			</currency>
+			<currency type="BRL">
+				<displayName>real brasilanu</displayName>
+				<displayName count="one">real brasilanu</displayName>
+				<displayName count="other">reales brasilanos</displayName>
+				<symbol>R$</symbol>
+				<symbol alt="narrow" draft="contributed">R$</symbol>
+			</currency>
+			<currency type="BRN">
+				<displayName>Cruzado nuevu brasilanu (1989–1990)</displayName>
+				<displayName count="one">cruzado nuevu brasilanu (1989–1990)</displayName>
+				<displayName count="other">cruzados nuevos brasilanos (1989–1990)</displayName>
+				<symbol draft="contributed">BRN</symbol>
+			</currency>
+			<currency type="BRR">
+				<displayName>Cruzeiro brasilanu (1993–1994)</displayName>
+				<displayName count="one">cruzeiro brasilanu (1993–1994)</displayName>
+				<displayName count="other">cruzeiros brasilanos (1993–1994)</displayName>
+				<symbol draft="contributed">BRR</symbol>
+			</currency>
+			<currency type="BRZ">
+				<displayName>Cruzeiru brasilanu (1942–1967)</displayName>
+				<displayName count="one">cruzeiru brasilanu (1942–1967)</displayName>
+				<displayName count="other">cruzeiros brasilanos (1942–1967)</displayName>
+				<symbol draft="contributed">BRZ</symbol>
+			</currency>
+			<currency type="BSD">
+				<displayName>Dólar bahamés</displayName>
+				<displayName count="one">dólar bahamés</displayName>
+				<displayName count="other">dólares bahameses</displayName>
+				<symbol>BSD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BTN">
+				<displayName>Ngultrum butanés</displayName>
+				<displayName count="one">ngultrum butanés</displayName>
+				<displayName count="other">ngultrums butaneses</displayName>
+				<symbol>BTN</symbol>
+			</currency>
+			<currency type="BUK">
+				<displayName>Kyat birmanu</displayName>
+				<displayName count="one">kyat birmanu</displayName>
+				<displayName count="other">kyats birmanos</displayName>
+				<symbol draft="contributed">BUK</symbol>
+			</currency>
+			<currency type="BWP">
+				<displayName>Pula botsuaniana</displayName>
+				<displayName count="one">pula botsuaniana</displayName>
+				<displayName count="other">pulas botsuanianes</displayName>
+				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
+			</currency>
+			<currency type="BYB">
+				<displayName>Rublu nuevu bielorrusu (1994–1999)</displayName>
+				<displayName count="one">rublu nuevu bielorrusu (1994–1999)</displayName>
+				<displayName count="other">rublos nuevos bielorrusos (1994–1999)</displayName>
+				<symbol draft="contributed">BYB</symbol>
+			</currency>
+			<currency type="BYR">
+				<displayName>Rublu bielorrusu</displayName>
+				<displayName count="one">rublu bielorrusu</displayName>
+				<displayName count="other">rublos bielorrusos</displayName>
+				<symbol>BYR</symbol>
+				<symbol alt="narrow" draft="contributed">BYR</symbol>
+			</currency>
+			<currency type="BZD">
+				<displayName>Dólar belizianu</displayName>
+				<displayName count="one">dólar belizianu</displayName>
+				<displayName count="other">dólares belizianos</displayName>
+				<symbol>BZD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CAD">
+				<displayName>Dólar canadiense</displayName>
+				<displayName count="one">dólar canadiense</displayName>
+				<displayName count="other">dólares canadienses</displayName>
+				<symbol>CA$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CDF">
+				<displayName>francu congolés</displayName>
+				<displayName count="one">francu congolés</displayName>
+				<displayName count="other">francos congoleses</displayName>
+				<symbol>CDF</symbol>
+			</currency>
+			<currency type="CHE">
+				<displayName>Euru WIR</displayName>
+				<displayName count="one">euru WIR</displayName>
+				<displayName count="other">euros WIR</displayName>
+				<symbol draft="contributed">CHE</symbol>
+			</currency>
+			<currency type="CHF">
+				<displayName>francu suizu</displayName>
+				<displayName count="one">francu suizu</displayName>
+				<displayName count="other">francos suizos</displayName>
+				<symbol>CHF</symbol>
+			</currency>
+			<currency type="CHW">
+				<displayName>Francu WIR</displayName>
+				<displayName count="one">francu WIR</displayName>
+				<displayName count="other">francos WIR</displayName>
+				<symbol draft="contributed">CHW</symbol>
+			</currency>
+			<currency type="CLE">
+				<displayName>Escudu chilenu</displayName>
+				<displayName count="one">escudu chilenu</displayName>
+				<displayName count="other">escudos chilenos</displayName>
+				<symbol draft="contributed">CLE</symbol>
+			</currency>
+			<currency type="CLF">
+				<displayName>Unidá de cuenta chilena (UF)</displayName>
+				<displayName count="one">unidá de cuenta chilena (UF)</displayName>
+				<displayName count="other">unidaes de cuenta chilenes (UF)</displayName>
+				<symbol draft="contributed">CLF</symbol>
+			</currency>
+			<currency type="CLP">
+				<displayName>pesu chilenu</displayName>
+				<displayName count="one">pesu chilenu</displayName>
+				<displayName count="other">pesos chilenos</displayName>
+				<symbol>CLP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CNX">
+				<displayName>Dólar del Bancu Popular Chinu</displayName>
+				<displayName count="one">dólar del Bancu Popular Chinu</displayName>
+				<displayName count="other">dólares del Bancu Popular Chinu</displayName>
+			</currency>
+			<currency type="CNY">
+				<displayName>Yuan chinu</displayName>
+				<displayName count="one">yuan chinu</displayName>
+				<displayName count="other">yuanes chinos</displayName>
+				<symbol>CN¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
+			</currency>
+			<currency type="COP">
+				<displayName>pesu colombianu</displayName>
+				<displayName count="one">pesu colombianu</displayName>
+				<displayName count="other">pesos colombianos</displayName>
+				<symbol>COP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="COU">
+				<displayName>Unidá de valor real colombiana</displayName>
+				<displayName count="one">unidá de valor real colombiana</displayName>
+				<displayName count="other">unidaes de valor real colombianes</displayName>
+				<symbol draft="contributed">COU</symbol>
+			</currency>
+			<currency type="CRC">
+				<displayName>Colón costarricanu</displayName>
+				<displayName count="one">colón costarricanu</displayName>
+				<displayName count="other">colones costarricanos</displayName>
+				<symbol>CRC</symbol>
+				<symbol alt="narrow" draft="contributed">₡</symbol>
+			</currency>
+			<currency type="CSD">
+				<displayName>Dinar serbiu (2002–2006)</displayName>
+				<displayName count="one">dinar serbiu (2002–2006)</displayName>
+				<displayName count="other">dinares serbios (2002–2006)</displayName>
+				<symbol draft="contributed">CSD</symbol>
+			</currency>
+			<currency type="CSK">
+				<displayName>Corona fuerte checoslovaca</displayName>
+				<displayName count="one">corona fuerte checoslovaca</displayName>
+				<displayName count="other">corones fuertes checoslovaques</displayName>
+				<symbol draft="contributed">CSK</symbol>
+			</currency>
+			<currency type="CUC">
+				<displayName>Pesu cubanu convertible</displayName>
+				<displayName count="one">pesu cubanu convertible</displayName>
+				<displayName count="other">pesos cubanos convertibles</displayName>
+				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CUP">
+				<displayName>Pesu cubanu</displayName>
+				<displayName count="one">pesu cubanu</displayName>
+				<displayName count="other">pesos cubanos</displayName>
+				<symbol>CUP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CVE">
+				<displayName>escudu cabuverdianu</displayName>
+				<displayName count="one">escudu cabuverdianu</displayName>
+				<displayName count="other">escudos cabuverdianos</displayName>
+				<symbol>CVE</symbol>
+			</currency>
+			<currency type="CYP">
+				<displayName>Llibra xipriota</displayName>
+				<displayName count="one">llibra xipriota</displayName>
+				<displayName count="other">llibres xipriotes</displayName>
+				<symbol draft="contributed">CYP</symbol>
+			</currency>
+			<currency type="CZK">
+				<displayName>Corona checa</displayName>
+				<displayName count="one">corona checa</displayName>
+				<displayName count="other">corones cheques</displayName>
+				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
+			</currency>
+			<currency type="DDM">
+				<displayName>Marcu d’Alemaña Oriental</displayName>
+				<displayName count="one">marcu d’Alemaña Oriental</displayName>
+				<displayName count="other">marcos d’Alemaña Oriental</displayName>
+				<symbol draft="contributed">DDM</symbol>
+			</currency>
+			<currency type="DEM">
+				<displayName>Marcu alemán</displayName>
+				<displayName count="one">marcu alemán</displayName>
+				<displayName count="other">marcos alemanes</displayName>
+				<symbol draft="contributed">DEM</symbol>
+			</currency>
+			<currency type="DJF">
+				<displayName>Francu xibutianu</displayName>
+				<displayName count="one">francu xibutianu</displayName>
+				<displayName count="other">francos xibutianos</displayName>
+				<symbol draft="contributed">DJF</symbol>
+			</currency>
+			<currency type="DKK">
+				<displayName>corona danesa</displayName>
+				<displayName count="one">corona danesa</displayName>
+				<displayName count="other">corones daneses</displayName>
+				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">DKK</symbol>
+			</currency>
+			<currency type="DOP">
+				<displayName>Pesu dominicanu</displayName>
+				<displayName count="one">pesu dominicanu</displayName>
+				<displayName count="other">pesos dominicanos</displayName>
+				<symbol>DOP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="DZD">
+				<displayName>dinar arxelín</displayName>
+				<displayName count="one">dinar arxelín</displayName>
+				<displayName count="other">dinares arxelinos</displayName>
+				<symbol>DZD</symbol>
+			</currency>
+			<currency type="ECS">
+				<displayName>Sucre ecuatorianu</displayName>
+				<displayName count="one">sucre ecuatorianu</displayName>
+				<displayName count="other">sucres ecuatorianos</displayName>
+				<symbol draft="contributed">ECS</symbol>
+			</currency>
+			<currency type="ECV">
+				<displayName>Unidá ecuatoriana de valor constante</displayName>
+				<displayName count="one">unidá ecuatoriana de valor constante</displayName>
+				<displayName count="other">unidaes ecuatorianes de valor constante</displayName>
+				<symbol draft="contributed">ECV</symbol>
+			</currency>
+			<currency type="EEK">
+				<displayName>Corona estonia</displayName>
+				<displayName count="one">corona estoniana</displayName>
+				<displayName count="other">corones estonianes</displayName>
+				<symbol draft="contributed">EEK</symbol>
+			</currency>
+			<currency type="EGP">
+				<displayName>llibra exipciana</displayName>
+				<displayName count="one">llibra exipciana</displayName>
+				<displayName count="other">llibres exipcianes</displayName>
+				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
+			</currency>
+			<currency type="ERN">
+				<displayName>Nakfa eritréu</displayName>
+				<displayName count="one">nakfa eritréu</displayName>
+				<displayName count="other">nafkas eritreos</displayName>
+				<symbol>ERN</symbol>
+			</currency>
+			<currency type="ESA">
+				<displayName>Peseta española (cuenta A)</displayName>
+				<displayName count="one">peseta española (cuenta A)</displayName>
+				<displayName count="other">pesetes españoles (cuenta A)</displayName>
+				<symbol draft="contributed">ESA</symbol>
+			</currency>
+			<currency type="ESB">
+				<displayName>Peseta española (cuenta convertible)</displayName>
+				<displayName count="one">peseta española (cuenta convertible)</displayName>
+				<displayName count="other">pesetes españoles (cuenta convertible)</displayName>
+				<symbol draft="contributed">ESB</symbol>
+			</currency>
+			<currency type="ESP">
+				<displayName>Peseta española</displayName>
+				<displayName count="one">peseta española</displayName>
+				<displayName count="other">pesetes españoles</displayName>
+				<symbol draft="contributed">ESP</symbol>
+				<symbol alt="narrow" draft="contributed">₧</symbol>
+			</currency>
+			<currency type="ETB">
+				<displayName>Birr etíope</displayName>
+				<displayName count="one">birr etíope</displayName>
+				<displayName count="other">birrs etíopes</displayName>
+				<symbol>ETB</symbol>
+			</currency>
+			<currency type="EUR">
+				<displayName>euro</displayName>
+				<displayName count="one">euro</displayName>
+				<displayName count="other">euros</displayName>
+				<symbol>€</symbol>
+				<symbol alt="narrow" draft="contributed">€</symbol>
+			</currency>
+			<currency type="FIM">
+				<displayName>Marcu finlandés</displayName>
+				<displayName count="one">marcu finlandés</displayName>
+				<displayName count="other">marcos finlandeses</displayName>
+				<symbol draft="contributed">FIM</symbol>
+			</currency>
+			<currency type="FJD">
+				<displayName>dólar fixanu</displayName>
+				<displayName count="one">dólar fixanu</displayName>
+				<displayName count="other">dólares fixanos</displayName>
+				<symbol draft="contributed">FJD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="FKP">
+				<displayName>llibra malviniana</displayName>
+				<displayName count="one">llibra malviniana</displayName>
+				<displayName count="other">llibres malvinianes</displayName>
+				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="FRF">
+				<displayName>Francu francés</displayName>
+				<displayName count="one">francu francés</displayName>
+				<displayName count="other">francos franceses</displayName>
+				<symbol draft="contributed">FRF</symbol>
+			</currency>
+			<currency type="GBP">
+				<displayName>llibra esterlina</displayName>
+				<displayName count="one">llibra esterlina</displayName>
+				<displayName count="other">llibres esterlines</displayName>
+				<symbol>£</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="GEK">
+				<displayName>Kupon larit xeorxanu</displayName>
+				<displayName count="one">kupon larit xeorxanu</displayName>
+				<displayName count="other">kupon larits xeorxanos</displayName>
+				<symbol draft="contributed">GEK</symbol>
+			</currency>
+			<currency type="GEL">
+				<displayName>Lari xeorxanu</displayName>
+				<displayName count="one">lari xeorxanu</displayName>
+				<displayName count="other">laris xeorxanos</displayName>
+				<symbol>GEL</symbol>
+			</currency>
+			<currency type="GHC">
+				<displayName>Cedi ghanianu (1979–2007)</displayName>
+				<displayName count="one">cedi ghanianu (1979–2007)</displayName>
+				<displayName count="other">cedis ghanianos (1979–2007)</displayName>
+				<symbol draft="contributed">GHC</symbol>
+			</currency>
+			<currency type="GHS">
+				<displayName>cedi ghanianu</displayName>
+				<displayName count="one">cedi ghanianu</displayName>
+				<displayName count="other">cedis ghanianos</displayName>
+				<symbol>GHS</symbol>
+			</currency>
+			<currency type="GIP">
+				<displayName>llibra de Xibraltar</displayName>
+				<displayName count="one">llibra de Xibraltar</displayName>
+				<displayName count="other">llibres de Xibraltar</displayName>
+				<symbol>GIP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="GMD">
+				<displayName>dalasi gambianu</displayName>
+				<displayName count="one">dalasi gambianu</displayName>
+				<displayName count="other">dalasis gambianos</displayName>
+				<symbol>GMD</symbol>
+			</currency>
+			<currency type="GNF">
+				<displayName>francu guineanu</displayName>
+				<displayName count="one">francu guineanu</displayName>
+				<displayName count="other">francos guineanos</displayName>
+				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
+			</currency>
+			<currency type="GNS">
+				<displayName>syli guineanu</displayName>
+				<displayName count="one">syli guineanu</displayName>
+				<displayName count="other">sylis guineanos</displayName>
+				<symbol draft="contributed">GNS</symbol>
+			</currency>
+			<currency type="GQE">
+				<displayName>Ekwele de Guinea Ecuatorial</displayName>
+				<displayName count="one">ekwele de Guinea Ecuatorial</displayName>
+				<displayName count="other">ekweles de Guinea Ecuatorial</displayName>
+				<symbol draft="contributed">GQE</symbol>
+			</currency>
+			<currency type="GRD">
+				<displayName>Dracma griegu</displayName>
+				<displayName count="one">dracma griegu</displayName>
+				<displayName count="other">dracmes griegos</displayName>
+				<symbol draft="contributed">GRD</symbol>
+			</currency>
+			<currency type="GTQ">
+				<displayName>Quetzal guatemalianu</displayName>
+				<displayName count="one">quetzal guatemalianu</displayName>
+				<displayName count="other">quetzales guatemalianos</displayName>
+				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
+			</currency>
+			<currency type="GWE">
+				<displayName>Escudo de Guinea portuguesa</displayName>
+				<displayName count="one">escudo de Guinea portuguesa</displayName>
+				<displayName count="other">escudos de Guinea portuguesa</displayName>
+				<symbol draft="contributed">GWE</symbol>
+			</currency>
+			<currency type="GWP">
+				<displayName>Pesu de Guinea-Bisáu</displayName>
+				<displayName count="one">pesu de Guinea-Bisáu</displayName>
+				<displayName count="other">pesos de Guinea-Bisáu</displayName>
+				<symbol draft="contributed">GWP</symbol>
+			</currency>
+			<currency type="GYD">
+				<displayName>dólar guyanés</displayName>
+				<displayName count="one">dólar guyanés</displayName>
+				<displayName count="other">dólares guyaneses</displayName>
+				<symbol>GYD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="HKD">
+				<displayName>Dólar hongkonés</displayName>
+				<displayName count="one">dólar hongkonés</displayName>
+				<displayName count="other">dólares ḥongkoneses</displayName>
+				<symbol>HK$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="HNL">
+				<displayName>Lempira hondurana</displayName>
+				<displayName count="one">lempira hondurana</displayName>
+				<displayName count="other">lempires honduranes</displayName>
+				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
+			</currency>
+			<currency type="HRD">
+				<displayName>Dinar croata</displayName>
+				<displayName count="one">dinar croata</displayName>
+				<displayName count="other">dinares croates</displayName>
+				<symbol draft="contributed">HRD</symbol>
+			</currency>
+			<currency type="HRK">
+				<displayName>Kuna croata</displayName>
+				<displayName count="one">kuna croata</displayName>
+				<displayName count="other">kunes croates</displayName>
+				<symbol draft="contributed">HRK</symbol>
+				<symbol alt="narrow" draft="contributed">HRK</symbol>
+			</currency>
+			<currency type="HTG">
+				<displayName>Gourde haitianu</displayName>
+				<displayName count="one">gourde haitianu</displayName>
+				<displayName count="other">gourde haitianos</displayName>
+				<symbol>HTG</symbol>
+			</currency>
+			<currency type="HUF">
+				<displayName>Forint húngaru</displayName>
+				<displayName count="one">forint húngaru</displayName>
+				<displayName count="other">forints húngaros</displayName>
+				<symbol draft="contributed">HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
+			</currency>
+			<currency type="IDR">
+				<displayName>rupiah indonesia</displayName>
+				<displayName count="one">rupiah indonesia</displayName>
+				<displayName count="other">rupiahs indonesies</displayName>
+				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
+			</currency>
+			<currency type="IEP">
+				<displayName>Llibra irlandesa</displayName>
+				<displayName count="one">llibra irlandesa</displayName>
+				<displayName count="other">llibres irlandeses</displayName>
+				<symbol draft="contributed">IEP</symbol>
+			</currency>
+			<currency type="ILP">
+				<displayName>Llibra israelina</displayName>
+				<displayName count="one">llibra israelina</displayName>
+				<displayName count="other">llibres israelines</displayName>
+				<symbol draft="contributed">ILP</symbol>
+			</currency>
+			<currency type="ILR">
+				<displayName>Xequel israelín (1980–1985)</displayName>
+				<displayName count="one">xequel israelín (1980–1985)</displayName>
+				<displayName count="other">xequels israelinos (1980–1985)</displayName>
+			</currency>
+			<currency type="ILS">
+				<displayName>Xequel nuevu israelín</displayName>
+				<displayName count="one">xequel nuevu israelín</displayName>
+				<displayName count="other">xequels nuevos israelinos</displayName>
+				<symbol draft="contributed">₪</symbol>
+				<symbol alt="narrow" draft="contributed">₪</symbol>
+			</currency>
+			<currency type="INR">
+				<displayName>Rupia india</displayName>
+				<displayName count="one">rupia india</displayName>
+				<displayName count="other">rupies indies</displayName>
+				<symbol>₹</symbol>
+				<symbol alt="narrow" draft="contributed">₹</symbol>
+			</currency>
+			<currency type="IQD">
+				<displayName>Dinar iraquín</displayName>
+				<displayName count="one">dinar iraquín</displayName>
+				<displayName count="other">dinares iraquinos</displayName>
+				<symbol>IQD</symbol>
+			</currency>
+			<currency type="IRR">
+				<displayName>Rial iranín</displayName>
+				<displayName count="one">rial iranín</displayName>
+				<displayName count="other">riales iraninos</displayName>
+				<symbol>IRR</symbol>
+			</currency>
+			<currency type="ISJ">
+				<displayName>Corona islandesa (1918–1981)</displayName>
+				<displayName count="one">corona islandesa (1918–1981)</displayName>
+				<displayName count="other">corones islandeses (1918–1981)</displayName>
+			</currency>
+			<currency type="ISK">
+				<displayName>corona islandesa</displayName>
+				<displayName count="one">corona islandesa</displayName>
+				<displayName count="other">corones islandeses</displayName>
+				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">ISK</symbol>
+			</currency>
+			<currency type="ITL">
+				<displayName>Llira italiana</displayName>
+				<displayName count="one">llira italiana</displayName>
+				<displayName count="other">llires italianes</displayName>
+				<symbol draft="contributed">ITL</symbol>
+			</currency>
+			<currency type="JMD">
+				<displayName>Dólar xamaicanu</displayName>
+				<displayName count="one">dólar xamaicanu</displayName>
+				<displayName count="other">dólares xamaicanos</displayName>
+				<symbol>JMD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="JOD">
+				<displayName>Dinar xordanu</displayName>
+				<displayName count="one">dinar xordanu</displayName>
+				<displayName count="other">dinares xordanos</displayName>
+				<symbol>JOD</symbol>
+			</currency>
+			<currency type="JPY">
+				<displayName>Yen xaponés</displayName>
+				<displayName count="one">yen xaponés</displayName>
+				<displayName count="other">yenes xaponeses</displayName>
+				<symbol>¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
+			</currency>
+			<currency type="KES">
+				<displayName>Shilling kenianu</displayName>
+				<displayName count="one">shilling kenianu</displayName>
+				<displayName count="other">shillings kenianos</displayName>
+				<symbol>KES</symbol>
+			</currency>
+			<currency type="KGS">
+				<displayName>Som kirguistanín</displayName>
+				<displayName count="one">som kirguistanín</displayName>
+				<displayName count="other">soms kirguistaninos</displayName>
+				<symbol>KGS</symbol>
+			</currency>
+			<currency type="KHR">
+				<displayName>riel camboyanu</displayName>
+				<displayName count="one">riel camboyanu</displayName>
+				<displayName count="other">riels camboyanos</displayName>
+				<symbol>KHR</symbol>
+				<symbol alt="narrow" draft="contributed">៛</symbol>
+			</currency>
+			<currency type="KMF">
+				<displayName>Francu comoranu</displayName>
+				<displayName count="one">francu comoranu</displayName>
+				<displayName count="other">francos comoranos</displayName>
+				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
+			</currency>
+			<currency type="KPW">
+				<displayName>Won norcoreanu</displayName>
+				<displayName count="one">won norcoreanu</displayName>
+				<displayName count="other">wons norcoreanos</displayName>
+				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
+			</currency>
+			<currency type="KRH">
+				<displayName>Hwan surcoreanu (1953–1962)</displayName>
+				<displayName count="one">hwan surcoreanu (1953–1962)</displayName>
+				<displayName count="other">hwans surcoreanos (1953–1962)</displayName>
+				<symbol draft="contributed">KRH</symbol>
+			</currency>
+			<currency type="KRO">
+				<displayName>Won surcoreanu (1945–1953)</displayName>
+				<displayName count="one">won surcoreanu (1945–1953)</displayName>
+				<displayName count="other">won surcoreanos (1945–1953)</displayName>
+				<symbol draft="contributed">KRO</symbol>
+			</currency>
+			<currency type="KRW">
+				<displayName>Won surcoreanu</displayName>
+				<displayName count="one">won surcoreanu</displayName>
+				<displayName count="other">wons surcoreanos</displayName>
+				<symbol>₩</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
+			</currency>
+			<currency type="KWD">
+				<displayName>Dinar kuwaitianu</displayName>
+				<displayName count="one">dinar kuwaitianu</displayName>
+				<displayName count="other">dinares kuwaitianos</displayName>
+				<symbol>KWD</symbol>
+			</currency>
+			<currency type="KYD">
+				<displayName>dólar caimanés</displayName>
+				<displayName count="one">dólar caimanés</displayName>
+				<displayName count="other">dólares caimaneses</displayName>
+				<symbol>KYD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="KZT">
+				<displayName>Tenge kazaquistanín</displayName>
+				<displayName count="one">tenge kazaquistanín</displayName>
+				<displayName count="other">tenges kazaquistaninos</displayName>
+				<symbol>KZT</symbol>
+				<symbol alt="narrow" draft="contributed">₸</symbol>
+			</currency>
+			<currency type="LAK">
+				<displayName>kip laosianu</displayName>
+				<displayName count="one">kip laosianu</displayName>
+				<displayName count="other">kips laosianos</displayName>
+				<symbol>LAK</symbol>
+				<symbol alt="narrow" draft="contributed">₭</symbol>
+			</currency>
+			<currency type="LBP">
+				<displayName>Llibra libanesa</displayName>
+				<displayName count="one">llibra libanesa</displayName>
+				<displayName count="other">llibres libaneses</displayName>
+				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
+			</currency>
+			<currency type="LKR">
+				<displayName>Rupia de Sri Lanka</displayName>
+				<displayName count="one">rupia de Sri Lanka</displayName>
+				<displayName count="other">rupies de Sri Lanka</displayName>
+				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="LRD">
+				<displayName>dólar liberianu</displayName>
+				<displayName count="one">dólar liberianu</displayName>
+				<displayName count="other">dólares liberianos</displayName>
+				<symbol>LRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="LSL">
+				<displayName>Loti de Lesothu</displayName>
+				<displayName count="one">loti de Lesothu</displayName>
+				<displayName count="other">lotis de Lesothu</displayName>
+				<symbol draft="contributed">LSL</symbol>
+			</currency>
+			<currency type="LTL">
+				<displayName>Litas lituanu</displayName>
+				<displayName count="one">litas lituanu</displayName>
+				<displayName count="other">litas lituanos</displayName>
+				<symbol draft="contributed">LTL</symbol>
+				<symbol alt="narrow" draft="contributed">Lt</symbol>
+			</currency>
+			<currency type="LTT">
+				<displayName>Talonas lituanu</displayName>
+				<displayName count="one">talonas lituanu</displayName>
+				<displayName count="other">talonas lituanos</displayName>
+				<symbol draft="contributed">LTT</symbol>
+			</currency>
+			<currency type="LUC">
+				<displayName>Francu convertible luxemburgués</displayName>
+				<displayName count="one">francu convertible luxemburgués</displayName>
+				<displayName count="other">francos convertibles luxemburgueses</displayName>
+				<symbol draft="contributed">LUC</symbol>
+			</currency>
+			<currency type="LUF">
+				<displayName>Francu luxemburgués</displayName>
+				<displayName count="one">francu luxemburgués</displayName>
+				<displayName count="other">francos luxemburgueses</displayName>
+				<symbol draft="contributed">LUF</symbol>
+			</currency>
+			<currency type="LUL">
+				<displayName>Francu financieru luxemburgués</displayName>
+				<displayName count="one">francu financieru luxemburgués</displayName>
+				<displayName count="other">francos financieros luxemburgueses</displayName>
+				<symbol draft="contributed">LUL</symbol>
+			</currency>
+			<currency type="LVL">
+				<displayName>Lats letón</displayName>
+				<displayName count="one">lats letón</displayName>
+				<displayName count="other">lats letones</displayName>
+				<symbol draft="contributed">LVL</symbol>
+				<symbol alt="narrow" draft="contributed">Ls</symbol>
+			</currency>
+			<currency type="LVR">
+				<displayName>Rublu letón</displayName>
+				<displayName count="one">rublu letón</displayName>
+				<displayName count="other">rublos letones</displayName>
+				<symbol draft="contributed">LVR</symbol>
+			</currency>
+			<currency type="LYD">
+				<displayName>dinar libiu</displayName>
+				<displayName count="one">dinar libiu</displayName>
+				<displayName count="other">dinares libios</displayName>
+				<symbol>LYD</symbol>
+			</currency>
+			<currency type="MAD">
+				<displayName>dirḥam marroquín</displayName>
+				<displayName count="one">dirḥam marroquín</displayName>
+				<displayName count="other">dirḥams marroquinos</displayName>
+				<symbol>MAD</symbol>
+			</currency>
+			<currency type="MAF">
+				<displayName>francu marroquín</displayName>
+				<displayName count="one">francu marroquín</displayName>
+				<displayName count="other">francos marroquinos</displayName>
+				<symbol draft="contributed">MAF</symbol>
+			</currency>
+			<currency type="MCF">
+				<displayName>Francu monegascu</displayName>
+				<displayName count="one">francu monegascu</displayName>
+				<displayName count="other">francos monegascos</displayName>
+				<symbol draft="contributed">MCF</symbol>
+			</currency>
+			<currency type="MDC">
+				<displayName>Cupón moldavu</displayName>
+				<displayName count="one">cupón moldavu</displayName>
+				<displayName count="other">cupones moldavos</displayName>
+				<symbol draft="contributed">MDC</symbol>
+			</currency>
+			<currency type="MDL">
+				<displayName>Leu moldavu</displayName>
+				<displayName count="one">leu moldavu</displayName>
+				<displayName count="other">leus moldavos</displayName>
+				<symbol>MDL</symbol>
+			</currency>
+			<currency type="MGA">
+				<displayName>Ariary malgaxe</displayName>
+				<displayName count="one">ariary malgaxe</displayName>
+				<displayName count="other">ariarys malgaxes</displayName>
+				<symbol draft="contributed">MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
+			</currency>
+			<currency type="MGF">
+				<displayName>Francu malgaxe</displayName>
+				<displayName count="one">francu malgaxe</displayName>
+				<displayName count="other">francos malgaxes</displayName>
+				<symbol draft="contributed">MGF</symbol>
+			</currency>
+			<currency type="MKD">
+				<displayName>Denar macedoniu</displayName>
+				<displayName count="one">denar macedoniu</displayName>
+				<displayName count="other">denares macedonios</displayName>
+				<symbol draft="contributed">MKD</symbol>
+			</currency>
+			<currency type="MKN">
+				<displayName>Denar macedoniu (1992–1993)</displayName>
+				<displayName count="one">denar macedoniu (1992–1993)</displayName>
+				<displayName count="other">denares macedonios (1992–1993)</displayName>
+				<symbol draft="contributed">MKN</symbol>
+			</currency>
+			<currency type="MLF">
+				<displayName>Francu malianu</displayName>
+				<displayName count="one">francu malianu</displayName>
+				<displayName count="other">francos malianos</displayName>
+				<symbol draft="contributed">MLF</symbol>
+			</currency>
+			<currency type="MMK">
+				<displayName>kyat de Myanmar</displayName>
+				<displayName count="one">kyat de Myanmar</displayName>
+				<displayName count="other">kyats de Myanmar</displayName>
+				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
+			</currency>
+			<currency type="MNT">
+				<displayName>Tugrik mongol</displayName>
+				<displayName count="one">tugrik mongol</displayName>
+				<displayName count="other">tugriks mongoles</displayName>
+				<symbol>MNT</symbol>
+				<symbol alt="narrow" draft="contributed">₮</symbol>
+			</currency>
+			<currency type="MOP">
+				<displayName>Pataca de Macáu</displayName>
+				<displayName count="one">pataca de Macáu</displayName>
+				<displayName count="other">pataques de Macáu</displayName>
+				<symbol>MOP</symbol>
+			</currency>
+			<currency type="MRO">
+				<displayName>ouguiya mauritanu</displayName>
+				<displayName count="one">ouguiya mauritanu</displayName>
+				<displayName count="other">ouguiyas mauritanos</displayName>
+				<symbol>MRO</symbol>
+			</currency>
+			<currency type="MTL">
+				<displayName>Llira maltesa</displayName>
+				<displayName count="one">llira maltesa</displayName>
+				<displayName count="other">llires malteses</displayName>
+				<symbol draft="contributed">MTL</symbol>
+			</currency>
+			<currency type="MTP">
+				<displayName>Llibra maltesa</displayName>
+				<displayName count="one">llibra maltesa</displayName>
+				<displayName count="other">llibres malteses</displayName>
+				<symbol draft="contributed">MTP</symbol>
+			</currency>
+			<currency type="MUR">
+				<displayName>Rupia mauriciana</displayName>
+				<displayName count="one">rupia mauriciana</displayName>
+				<displayName count="other">rupies mauricianes</displayName>
+				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="MVP">
+				<displayName>Rupia maldiviana (1947–1981)</displayName>
+				<displayName count="one">rupia maldiviana (1947–1981)</displayName>
+				<displayName count="other">rupies maldivianes (1947–1981)</displayName>
+			</currency>
+			<currency type="MVR">
+				<displayName>Rufiyaa maldiviana</displayName>
+				<displayName count="one">rufiyaa maldiviana</displayName>
+				<displayName count="other">rufiyaas maldivianas</displayName>
+				<symbol>MVR</symbol>
+			</currency>
+			<currency type="MWK">
+				<displayName>Kwacha malauianu</displayName>
+				<displayName count="one">kwacha malauianu</displayName>
+				<displayName count="other">kwachas malauianos</displayName>
+				<symbol draft="contributed">MWK</symbol>
+			</currency>
+			<currency type="MXN">
+				<displayName>Pesu mexicanu</displayName>
+				<displayName count="one">pesu mexicanu</displayName>
+				<displayName count="other">pesos mexicanos</displayName>
+				<symbol>MX$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="MXP">
+				<displayName>Pesu de plata mexicanu (1861–1992)</displayName>
+				<displayName count="one">pesu de plata mexicanu (1861–1992)</displayName>
+				<displayName count="other">pesos de plata mexicanos (1861–1992)</displayName>
+				<symbol draft="contributed">MXP</symbol>
+			</currency>
+			<currency type="MXV">
+				<displayName>Unidá d’inversión mexicana</displayName>
+				<displayName count="one">unidá d’inversión mexicana</displayName>
+				<displayName count="other">unidaes d’inversión mexicanes</displayName>
+				<symbol draft="contributed">MXV</symbol>
+			</currency>
+			<currency type="MYR">
+				<displayName>ringgit malasiu</displayName>
+				<displayName count="one">ringgit malasiu</displayName>
+				<displayName count="other">ringgits malasios</displayName>
+				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
+			</currency>
+			<currency type="MZE">
+				<displayName>Escudu mozambicanu</displayName>
+				<displayName count="one">escudu mozambicanu</displayName>
+				<displayName count="other">escudos mozambicanos</displayName>
+				<symbol draft="contributed">MZE</symbol>
+			</currency>
+			<currency type="MZM">
+				<displayName>Metical mozambicanu (1980–2006)</displayName>
+				<displayName count="one">metical mozambicanu (1980–2006)</displayName>
+				<displayName count="other">meticales mozambicanos (1980–2006)</displayName>
+				<symbol draft="contributed">MZM</symbol>
+			</currency>
+			<currency type="MZN">
+				<displayName>Metical mozambicanu</displayName>
+				<displayName count="one">metical mozambicanu</displayName>
+				<displayName count="other">meticales mozambicanos</displayName>
+				<symbol>MZN</symbol>
+			</currency>
+			<currency type="NAD">
+				<displayName>Dólar namibianu</displayName>
+				<displayName count="one">dólar namibianu</displayName>
+				<displayName count="other">dólares namibianos</displayName>
+				<symbol>NAD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="NGN">
+				<displayName>naira nixeriana</displayName>
+				<displayName count="one">naira nixeriana</displayName>
+				<displayName count="other">nairas nixerianes</displayName>
+				<symbol>NGN</symbol>
+				<symbol alt="narrow" draft="contributed">₦</symbol>
+			</currency>
+			<currency type="NIC">
+				<displayName>Córdoba nicaraguanu (1988–1991)</displayName>
+				<displayName count="one">córdoba nicaraguanu (1988–1991)</displayName>
+				<displayName count="other">córdobes nicaraguanes (1988–1991)</displayName>
+				<symbol draft="contributed">NIC</symbol>
+			</currency>
+			<currency type="NIO">
+				<displayName>Córdoba nicaraguanu</displayName>
+				<displayName count="one">córdoba nicaraguanu</displayName>
+				<displayName count="other">córdobes nicaraguanos</displayName>
+				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
+			</currency>
+			<currency type="NLG">
+				<displayName>Florín neerlandés</displayName>
+				<displayName count="one">florín neerlandés</displayName>
+				<displayName count="other">florines neerlandeses</displayName>
+				<symbol draft="contributed">NLG</symbol>
+			</currency>
+			<currency type="NOK">
+				<displayName>corona noruega</displayName>
+				<displayName count="one">corona noruega</displayName>
+				<displayName count="other">corones noruegues</displayName>
+				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">NOK</symbol>
+			</currency>
+			<currency type="NPR">
+				<displayName>Rupia nepalesa</displayName>
+				<displayName count="one">rupia nepalesa</displayName>
+				<displayName count="other">rupies nepaleses</displayName>
+				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="NZD">
+				<displayName>dólar neozelandés</displayName>
+				<displayName count="one">dólar neozelandés</displayName>
+				<displayName count="other">dólares neozelandeses</displayName>
+				<symbol>NZ$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="OMR">
+				<displayName>Rial omanianu</displayName>
+				<displayName count="one">rial omanianu</displayName>
+				<displayName count="other">riales omanianos</displayName>
+				<symbol>OMR</symbol>
+			</currency>
+			<currency type="PAB">
+				<displayName>Balboa panamiegu</displayName>
+				<displayName count="one">balboa panamiegu</displayName>
+				<displayName count="other">balboes panamiegos</displayName>
+				<symbol>PAB</symbol>
+			</currency>
+			<currency type="PEI">
+				<displayName>Inti peruanu</displayName>
+				<displayName count="one">inti peruanu</displayName>
+				<displayName count="other">intis peruanos</displayName>
+				<symbol draft="contributed">PEI</symbol>
+			</currency>
+			<currency type="PEN">
+				<displayName>sol nuevu peruanu</displayName>
+				<displayName count="one">sol nuevu peruanu</displayName>
+				<displayName count="other">soles nuevos peruanos</displayName>
+				<symbol>PEN</symbol>
+			</currency>
+			<currency type="PES">
+				<displayName>Sol peruanu (1863–1965)</displayName>
+				<displayName count="one">sol peruanu (1863–1965)</displayName>
+				<displayName count="other">soles peruanos (1863–1965)</displayName>
+				<symbol draft="contributed">PES</symbol>
+			</currency>
+			<currency type="PGK">
+				<displayName>kina papuana</displayName>
+				<displayName count="one">kina papuana</displayName>
+				<displayName count="other">kines papuanes</displayName>
+				<symbol draft="contributed">PGK</symbol>
+			</currency>
+			<currency type="PHP">
+				<displayName>pesu filipín</displayName>
+				<displayName count="one">pesu filipín</displayName>
+				<displayName count="other">pesos filipinos</displayName>
+				<symbol>PHP</symbol>
+				<symbol alt="narrow" draft="contributed">₱</symbol>
+			</currency>
+			<currency type="PKR">
+				<displayName>Rupia paquistanina</displayName>
+				<displayName count="one">rupia paquistanina</displayName>
+				<displayName count="other">rupies paquistanines</displayName>
+				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="PLN">
+				<displayName>Zloty polacu</displayName>
+				<displayName count="one">zloty polacu</displayName>
+				<displayName count="other">zlotys polacos</displayName>
+				<symbol draft="contributed">PLN</symbol>
+				<symbol alt="narrow" draft="contributed">PLN</symbol>
+			</currency>
+			<currency type="PLZ">
+				<displayName>Zloty polacu (1950–1995)</displayName>
+				<displayName count="one">zloty polacu (1950–1995)</displayName>
+				<displayName count="other">zloty polacos (1950–1995)</displayName>
+				<symbol draft="contributed">PLZ</symbol>
+			</currency>
+			<currency type="PTE">
+				<displayName>Escudu portugués</displayName>
+				<displayName count="one">escudu portugués</displayName>
+				<displayName count="other">escudos portugueses</displayName>
+				<symbol draft="contributed">PTE</symbol>
+			</currency>
+			<currency type="PYG">
+				<displayName>guaraní paraguayu</displayName>
+				<displayName count="one">guaraní paraguayu</displayName>
+				<displayName count="other">guaranís paraguayos</displayName>
+				<symbol>PYG</symbol>
+				<symbol alt="narrow" draft="contributed">₲</symbol>
+			</currency>
+			<currency type="QAR">
+				<displayName>Rial qatarín</displayName>
+				<displayName count="one">rial qatarín</displayName>
+				<displayName count="other">riales qatarinos</displayName>
+				<symbol>QAR</symbol>
+			</currency>
+			<currency type="RHD">
+				<displayName>Dólar rodesianu</displayName>
+				<displayName count="one">dólar rodesianu</displayName>
+				<displayName count="other">dólares rodesianos</displayName>
+				<symbol draft="contributed">RHD</symbol>
+			</currency>
+			<currency type="ROL">
+				<displayName>Leu rumanu (1952–2006)</displayName>
+				<displayName count="one">leu rumanu (1952–2006)</displayName>
+				<displayName count="other">leus rumanos (1952–2006)</displayName>
+				<symbol draft="contributed">ROL</symbol>
+			</currency>
+			<currency type="RON">
+				<displayName>Leu rumanu</displayName>
+				<displayName count="one">leu rumanu</displayName>
+				<displayName count="other">leus rumanos</displayName>
+				<symbol>RON</symbol>
+			</currency>
+			<currency type="RSD">
+				<displayName>dinar serbiu</displayName>
+				<displayName count="one">dinar serbiu</displayName>
+				<displayName count="other">dinares serbios</displayName>
+				<symbol>RSD</symbol>
+			</currency>
+			<currency type="RUB">
+				<displayName>Rublu rusu</displayName>
+				<displayName count="one">rublu rusu</displayName>
+				<displayName count="other">rublos rusos</displayName>
+				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
+				<symbol alt="variant">₽</symbol>
+			</currency>
+			<currency type="RUR">
+				<displayName>Rublu rusu (1991–1998)</displayName>
+				<displayName count="one">rublu rusu (1991–1998)</displayName>
+				<displayName count="other">rublos rusos (1991–1998)</displayName>
+				<symbol draft="contributed">RUR</symbol>
+				<symbol alt="narrow" draft="contributed">RUR</symbol>
+			</currency>
+			<currency type="RWF">
+				<displayName>Francu ruandés</displayName>
+				<displayName count="one">francu ruandés</displayName>
+				<displayName count="other">francos ruandeses</displayName>
+				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
+			</currency>
+			<currency type="SAR">
+				<displayName>Riyal saudita</displayName>
+				<displayName count="one">riyal saudita</displayName>
+				<displayName count="other">riyales saudites</displayName>
+				<symbol>SAR</symbol>
+			</currency>
+			<currency type="SBD">
+				<displayName>dólar salomonés</displayName>
+				<displayName count="one">dólar salomonés</displayName>
+				<displayName count="other">dólares salomoneses</displayName>
+				<symbol>SBD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="SCR">
+				<displayName>Rupia seixelesa</displayName>
+				<displayName count="one">rupia seixelesa</displayName>
+				<displayName count="other">rupies seixeleses</displayName>
+				<symbol draft="contributed">SCR</symbol>
+			</currency>
+			<currency type="SDD">
+				<displayName>dinar sudanés (1992–2007)</displayName>
+				<displayName count="one">dinar sudanés (1992–2007)</displayName>
+				<displayName count="other">dinares sudaneses (1992–2007)</displayName>
+				<symbol draft="contributed">SDD</symbol>
+			</currency>
+			<currency type="SDG">
+				<displayName>llibra sudanesa</displayName>
+				<displayName count="one">llibra sudanesa</displayName>
+				<displayName count="other">llibres sudaneses</displayName>
+				<symbol>SDG</symbol>
+			</currency>
+			<currency type="SDP">
+				<displayName>llibra sudanesa (1957–1998)</displayName>
+				<displayName count="one">llibra sudanesa (1957–1998)</displayName>
+				<displayName count="other">llibres sudaneses (1957–1998)</displayName>
+				<symbol draft="contributed">SDP</symbol>
+			</currency>
+			<currency type="SEK">
+				<displayName>corona sueca</displayName>
+				<displayName count="one">corona sueca</displayName>
+				<displayName count="other">corones sueques</displayName>
+				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">SEK</symbol>
+			</currency>
+			<currency type="SGD">
+				<displayName>dólar singapuranu</displayName>
+				<displayName count="one">dólar singapuranu</displayName>
+				<displayName count="other">dólares singapuranos</displayName>
+				<symbol>SGD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="SHP">
+				<displayName>llibra de Santa Lena</displayName>
+				<displayName count="one">llibra de Santa Lena</displayName>
+				<displayName count="other">llibres de Santa Lena</displayName>
+				<symbol draft="contributed">SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="SIT">
+				<displayName>Tolar eslovenu</displayName>
+				<displayName count="one">tolar eslovenu</displayName>
+				<displayName count="other">tolares eslovenos</displayName>
+				<symbol draft="contributed">SIT</symbol>
+			</currency>
+			<currency type="SKK">
+				<displayName>Corona eslovaca</displayName>
+				<displayName count="one">corona eslovaca</displayName>
+				<displayName count="other">corones eslovaques</displayName>
+				<symbol draft="contributed">SKK</symbol>
+			</currency>
+			<currency type="SLL">
+				<displayName>leone sierralleonés</displayName>
+				<displayName count="one">leone sierralleonés</displayName>
+				<displayName count="other">leones sierralleoneses</displayName>
+				<symbol>SLL</symbol>
+			</currency>
+			<currency type="SOS">
+				<displayName>Shilling somalín</displayName>
+				<displayName count="one">shilling somalín</displayName>
+				<displayName count="other">shillings somalinos</displayName>
+				<symbol>SOS</symbol>
+			</currency>
+			<currency type="SRD">
+				<displayName>dólar surinamés</displayName>
+				<displayName count="one">dólar surinamés</displayName>
+				<displayName count="other">dólares surinameses</displayName>
+				<symbol>SRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="SRG">
+				<displayName>Florín surinamés</displayName>
+				<displayName count="one">florín surinamés</displayName>
+				<displayName count="other">florinos surinameses</displayName>
+				<symbol draft="contributed">SRG</symbol>
+			</currency>
+			<currency type="SSP">
+				<displayName>llibra sursudanesa</displayName>
+				<displayName count="one">llibra sursudanesa</displayName>
+				<displayName count="other">llibres sursudaneses</displayName>
+				<symbol>SSP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="STD">
+				<displayName>dobra de Santu Tomé y Príncipe</displayName>
+				<displayName count="one">dobra de Santu Tomé y Príncipe</displayName>
+				<displayName count="other">dobras de Santu Tomé y Príncipe</displayName>
+				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
+			</currency>
+			<currency type="SUR">
+				<displayName>Rublu soviéticu</displayName>
+				<displayName count="one">rublu soviéticu</displayName>
+				<displayName count="other">rublos soviéticos</displayName>
+				<symbol draft="contributed">SUR</symbol>
+			</currency>
+			<currency type="SVC">
+				<displayName>Colón salvadorianu</displayName>
+				<displayName count="one">colón salvadorianu</displayName>
+				<displayName count="other">colones salvadorianos</displayName>
+				<symbol draft="contributed">SVC</symbol>
+			</currency>
+			<currency type="SYP">
+				<displayName>Llibra siria</displayName>
+				<displayName count="one">llibra siria</displayName>
+				<displayName count="other">llibres siries</displayName>
+				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="SZL">
+				<displayName>Lilangeni suazilandés</displayName>
+				<displayName count="one">lilangeni suazilandés</displayName>
+				<displayName count="other">lilangenis suazilandeses</displayName>
+				<symbol>SZL</symbol>
+			</currency>
+			<currency type="THB">
+				<displayName>baht tailandés</displayName>
+				<displayName count="one">baht tailandés</displayName>
+				<displayName count="other">bahts tailandeses</displayName>
+				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
+			</currency>
+			<currency type="TJR">
+				<displayName>Rublu taxiquistanín</displayName>
+				<displayName count="one">rublu taxiquistanín</displayName>
+				<displayName count="other">rublos taxiquistaninos</displayName>
+				<symbol draft="contributed">TJR</symbol>
+			</currency>
+			<currency type="TJS">
+				<displayName>Somoni taxiquistanín</displayName>
+				<displayName count="one">somoni taxiquistanín</displayName>
+				<displayName count="other">somonis taxiquistaninos</displayName>
+				<symbol draft="contributed">TJS</symbol>
+			</currency>
+			<currency type="TMM">
+				<displayName>Manat turcomanu (1993–2009)</displayName>
+				<displayName count="one">manat turcomanu (1993–2009)</displayName>
+				<displayName count="other">manats turcomanos (1993–2009)</displayName>
+				<symbol draft="contributed">TMM</symbol>
+			</currency>
+			<currency type="TMT">
+				<displayName>Manat turcomanu</displayName>
+				<displayName count="one">manat turcomanu</displayName>
+				<displayName count="other">manats turcomanos</displayName>
+				<symbol draft="contributed">TMT</symbol>
+			</currency>
+			<currency type="TND">
+				<displayName>dinar tunecín</displayName>
+				<displayName count="one">dinar tunecín</displayName>
+				<displayName count="other">dinares tunecinos</displayName>
+				<symbol>TND</symbol>
+			</currency>
+			<currency type="TOP">
+				<displayName>paʻanga tonganu</displayName>
+				<displayName count="one">paʻanga tonganu</displayName>
+				<displayName count="other">paʻangas tonganos</displayName>
+				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
+			</currency>
+			<currency type="TPE">
+				<displayName>Escudu timorés</displayName>
+				<displayName count="one">escudu timorés</displayName>
+				<displayName count="other">escudos timoreses</displayName>
+				<symbol draft="contributed">TPE</symbol>
+			</currency>
+			<currency type="TRL">
+				<displayName>Llira turca (1922–2005)</displayName>
+				<displayName count="one">llira turca (1922–2005)</displayName>
+				<displayName count="other">llires turques (1922–2005)</displayName>
+				<symbol draft="contributed">TRL</symbol>
+			</currency>
+			<currency type="TRY">
+				<displayName>Llira turca</displayName>
+				<displayName count="one">llira turca</displayName>
+				<displayName count="other">llires turques</displayName>
+				<symbol draft="contributed">TRY</symbol>
+				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
+			</currency>
+			<currency type="TTD">
+				<displayName>dólar de Trinidá y Tobagu</displayName>
+				<displayName count="one">dólar de Trinidá y Tobagu</displayName>
+				<displayName count="other">dólares de Trinidá y Tobagu</displayName>
+				<symbol>TTD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="TWD">
+				<displayName>Dólar nuevu taiwanés</displayName>
+				<displayName count="one">dólar nuevu taiwanés</displayName>
+				<displayName count="other">dólares nuevos taiwaneses</displayName>
+				<symbol>NT$</symbol>
+				<symbol alt="narrow" draft="contributed">NT$</symbol>
+			</currency>
+			<currency type="TZS">
+				<displayName>Shilling tanzanianu</displayName>
+				<displayName count="one">shilling tanzanianu</displayName>
+				<displayName count="other">shillings tanzanianos</displayName>
+				<symbol>TZS</symbol>
+			</currency>
+			<currency type="UAH">
+				<displayName>Grivna ucraína</displayName>
+				<displayName count="one">grivna ucraína</displayName>
+				<displayName count="other">grivnas ucraínes</displayName>
+				<symbol draft="contributed">UAH</symbol>
+				<symbol alt="narrow" draft="contributed">₴</symbol>
+			</currency>
+			<currency type="UAK">
+				<displayName>Karbovanets ucraína</displayName>
+				<displayName count="one">karbovanets ucraína</displayName>
+				<displayName count="other">karbovanets ucraínes</displayName>
+				<symbol draft="contributed">UAK</symbol>
+			</currency>
+			<currency type="UGS">
+				<displayName>Shilling ugandés (1966–1987)</displayName>
+				<displayName count="one">shilling ugandés (1966–1987)</displayName>
+				<displayName count="other">shillings ugandeses (1966–1987)</displayName>
+				<symbol draft="contributed">UGS</symbol>
+			</currency>
+			<currency type="UGX">
+				<displayName>Shilling ugandés</displayName>
+				<displayName count="one">shilling ugandés</displayName>
+				<displayName count="other">shillings ugandeses</displayName>
+				<symbol>UGX</symbol>
+			</currency>
+			<currency type="USD">
+				<displayName>Dólar estaunidense</displayName>
+				<displayName count="one">dólar estaunidense</displayName>
+				<displayName count="other">dólares estaunidenses</displayName>
+				<symbol>$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="USN">
+				<displayName>Dólar d’EE.XX. (día siguiente)</displayName>
+				<displayName count="one">dólar d’EE.XX. (día siguiente)</displayName>
+				<displayName count="other">dólares d’EE.XX. (día siguiente)</displayName>
+				<symbol draft="contributed">USN</symbol>
+			</currency>
+			<currency type="USS">
+				<displayName>Dólar d’EE.XX. (mesmu día)</displayName>
+				<displayName count="one">dólar d’EE.XX. (mesmu día)</displayName>
+				<displayName count="other">dólares d’EE.XX. (mesmu día)</displayName>
+				<symbol draft="contributed">USS</symbol>
+			</currency>
+			<currency type="UYI">
+				<displayName>Pesu uruguayu (Unidaes indexaes)</displayName>
+				<displayName count="one">pesu uruguayu (unidaes indexaes)</displayName>
+				<displayName count="other">pesos uruguayos (unidaes indexaes)</displayName>
+				<symbol draft="contributed">UYI</symbol>
+			</currency>
+			<currency type="UYP">
+				<displayName>Pesu uruguayu (1975–1993)</displayName>
+				<displayName count="one">pesu uruguayu (1975–1993)</displayName>
+				<displayName count="other">pesos uruguayos (1975–1993)</displayName>
+				<symbol draft="contributed">UYP</symbol>
+			</currency>
+			<currency type="UYU">
+				<displayName>pesu uruguayu</displayName>
+				<displayName count="one">pesu uruguayu</displayName>
+				<displayName count="other">pesos uruguayos</displayName>
+				<symbol>UYU</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="UZS">
+				<displayName>Som uzbequistanín</displayName>
+				<displayName count="one">som uzbequistanín</displayName>
+				<displayName count="other">soms uzbequistaninos</displayName>
+				<symbol>UZS</symbol>
+			</currency>
+			<currency type="VEB">
+				<displayName>Bolívar venezolanu (1871–2008)</displayName>
+				<displayName count="one">bolívar venezolanu (1871–2008)</displayName>
+				<displayName count="other">bolívares venezolanos (1871–2008)</displayName>
+				<symbol draft="contributed">VEB</symbol>
+			</currency>
+			<currency type="VEF">
+				<displayName>bolívar venezolanu</displayName>
+				<displayName count="one">bolívar venezolanu</displayName>
+				<displayName count="other">bolívares venezolanos</displayName>
+				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
+			</currency>
+			<currency type="VND">
+				<displayName>dong vietnamín</displayName>
+				<displayName count="one">dong vietnamín</displayName>
+				<displayName count="other">dongs vietnaminos</displayName>
+				<symbol>₫</symbol>
+				<symbol alt="narrow" draft="contributed">₫</symbol>
+			</currency>
+			<currency type="VNN">
+				<displayName>Dong vietnamín (1978–1985)</displayName>
+				<displayName count="one">dong vietnamín (1978–1985)</displayName>
+				<displayName count="other">dongs vietnaminos (1978–1985)</displayName>
+				<symbol draft="contributed">VNN</symbol>
+			</currency>
+			<currency type="VUV">
+				<displayName>vatu vanuatuanu</displayName>
+				<displayName count="one">vatu vanuatuanu</displayName>
+				<displayName count="other">vatus vanuatuanos</displayName>
+				<symbol>VUV</symbol>
+			</currency>
+			<currency type="WST">
+				<displayName>tala samoanu</displayName>
+				<displayName count="one">tala samoanu</displayName>
+				<displayName count="other">talas samoanos</displayName>
+				<symbol>WST</symbol>
+			</currency>
+			<currency type="XAF">
+				<displayName>Francu CFA centroafricanu</displayName>
+				<displayName count="one">francu CFA centroafricanu</displayName>
+				<displayName count="other">francos CFA centroafricanos</displayName>
+				<symbol>FCFA</symbol>
+			</currency>
+			<currency type="XAG">
+				<displayName>Plata</displayName>
+				<displayName count="one">onza troy de plata</displayName>
+				<displayName count="other">onces troy de plata</displayName>
+				<symbol draft="contributed">XAG</symbol>
+			</currency>
+			<currency type="XAU">
+				<displayName>Oru</displayName>
+				<displayName count="one">onza troy d’oru</displayName>
+				<displayName count="other">onces troy d’oru</displayName>
+				<symbol draft="contributed">XAU</symbol>
+			</currency>
+			<currency type="XBA">
+				<displayName>Unidá Compuesta Europea</displayName>
+				<displayName count="one">unidá compuesta europea</displayName>
+				<displayName count="other">unidaes compuestes europées</displayName>
+				<symbol draft="contributed">XBA</symbol>
+			</currency>
+			<currency type="XBB">
+				<displayName>Unidá monetaria europea</displayName>
+				<displayName count="one">unidá monetaria europea</displayName>
+				<displayName count="other">unidaes monetaries europées</displayName>
+				<symbol draft="contributed">XBB</symbol>
+			</currency>
+			<currency type="XBC">
+				<displayName>Unidá de cuenta europea (XBC)</displayName>
+				<displayName count="one">unidá de cuenta europea (XBC)</displayName>
+				<displayName count="other">unidaes de cuenta europées (XBC)</displayName>
+				<symbol draft="contributed">XBC</symbol>
+			</currency>
+			<currency type="XBD">
+				<displayName>Unidá de cuenta europea (XBD)</displayName>
+				<displayName count="one">unidá de cuenta europea (XBD)</displayName>
+				<displayName count="other">unidaes de cuenta europées (XBD)</displayName>
+				<symbol draft="contributed">XBD</symbol>
+			</currency>
+			<currency type="XCD">
+				<displayName>dólar del Caribe Oriental</displayName>
+				<displayName count="one">dólar del Caribe Oriental</displayName>
+				<displayName count="other">dólares del Caribe Oriental</displayName>
+				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="XDR">
+				<displayName>Drechos especiales de xiru</displayName>
+				<displayName count="one">drechos especiales de xiru</displayName>
+				<displayName count="other">drechos especiales de xiru</displayName>
+				<symbol draft="contributed">XDR</symbol>
+			</currency>
+			<currency type="XEU">
+				<displayName>Unidá de divisa europea</displayName>
+				<displayName count="one">unidá de divisa europea</displayName>
+				<displayName count="other">unidaes de divisa europees</displayName>
+				<symbol draft="contributed">XEU</symbol>
+			</currency>
+			<currency type="XFO">
+				<displayName>Francu oru francés</displayName>
+				<displayName count="one">francu oru francés</displayName>
+				<displayName count="other">francos oru franceses</displayName>
+				<symbol draft="contributed">XFO</symbol>
+			</currency>
+			<currency type="XFU">
+				<displayName>Francu UIC francés</displayName>
+				<displayName count="one">francu UIC francés</displayName>
+				<displayName count="other">francos UIC franceses</displayName>
+				<symbol draft="contributed">XFU</symbol>
+			</currency>
+			<currency type="XOF">
+				<displayName>francu CFA BCEAO</displayName>
+				<displayName count="one">francu CFA BCEAO</displayName>
+				<displayName count="other">francos CFA BCEAO</displayName>
+				<symbol>CFA</symbol>
+			</currency>
+			<currency type="XPD">
+				<displayName>Paladiu</displayName>
+				<displayName count="one">onza troy de paladiu</displayName>
+				<displayName count="other">onces troy de paladiu</displayName>
+				<symbol draft="contributed">XPD</symbol>
+			</currency>
+			<currency type="XPF">
+				<displayName>francu CFP</displayName>
+				<displayName count="one">francu CFP</displayName>
+				<displayName count="other">francos CFP</displayName>
+				<symbol>CFPF</symbol>
+			</currency>
+			<currency type="XPT">
+				<displayName>Platín</displayName>
+				<displayName count="one">onza troy de platín</displayName>
+				<displayName count="other">onces troy de platín</displayName>
+				<symbol draft="contributed">XPT</symbol>
+			</currency>
+			<currency type="XRE">
+				<displayName>Fondos RINET</displayName>
+				<displayName count="one">unidá de fondos RINET</displayName>
+				<displayName count="other">unidaes de fondos RINET</displayName>
+				<symbol draft="contributed">XRE</symbol>
+			</currency>
+			<currency type="XSU">
+				<displayName>Sucre</displayName>
+				<displayName count="one">sucre</displayName>
+				<displayName count="other">sucres</displayName>
+				<symbol draft="contributed">XSU</symbol>
+			</currency>
+			<currency type="XTS">
+				<displayName>Códigu monetariu de prueba</displayName>
+				<displayName count="one">códigu monetariu de prueba</displayName>
+				<displayName count="other">códigos monetarios de prueba</displayName>
+				<symbol draft="contributed">XTS</symbol>
+			</currency>
+			<currency type="XUA">
+				<displayName>unidá de cuenta ADB</displayName>
+				<displayName count="one">unidá de cuenta ADB</displayName>
+				<displayName count="other">unidaes de cuenta ADB</displayName>
+				<symbol draft="contributed">XUA</symbol>
+			</currency>
+			<currency type="XXX">
+				<displayName>Divisa desconocida</displayName>
+				<displayName count="one">(unidá desconocida de divisa)</displayName>
+				<displayName count="other">(divises desconocíes)</displayName>
+				<symbol draft="contributed">XXX</symbol>
+			</currency>
+			<currency type="YDD">
+				<displayName>Dinar yemenín</displayName>
+				<displayName count="one">dinar yemenín</displayName>
+				<displayName count="other">dinares yemeninos</displayName>
+				<symbol draft="contributed">YDD</symbol>
+			</currency>
+			<currency type="YER">
+				<displayName>Rial yemenín</displayName>
+				<displayName count="one">rial yemenín</displayName>
+				<displayName count="other">riales yemeninos</displayName>
+				<symbol>YER</symbol>
+			</currency>
+			<currency type="YUD">
+				<displayName>Dinar fuerte yugoslavu (1966–1990)</displayName>
+				<displayName count="one">dinar fuerte yugoslavu (1966–1990)</displayName>
+				<displayName count="other">dinares fuertes yugoslavos (1966–1990)</displayName>
+				<symbol draft="contributed">YUD</symbol>
+			</currency>
+			<currency type="YUM">
+				<displayName>Dinar nuevu yugoslavu (1994–2002)</displayName>
+				<displayName count="one">dinar nuevu yugoslavu (1994–2002)</displayName>
+				<displayName count="other">dinares nuevos yugoslavos (1994–2002)</displayName>
+				<symbol draft="contributed">YUM</symbol>
+			</currency>
+			<currency type="YUN">
+				<displayName>Dinar convertible yugoslavu (1990–1992)</displayName>
+				<displayName count="one">dinar convertible yugoslavu (1990–1992)</displayName>
+				<displayName count="other">dinares convertibles yugoslavos (1990–1992)</displayName>
+				<symbol draft="contributed">YUN</symbol>
+			</currency>
+			<currency type="YUR">
+				<displayName>Dinar reformáu yugoslavu (1992–1993)</displayName>
+				<displayName count="one">dinar reformáu yugoslavu (1992–1993)</displayName>
+				<displayName count="other">dinares reformaos yugoslavos (1992–1993)</displayName>
+				<symbol draft="contributed">YUR</symbol>
+			</currency>
+			<currency type="ZAL">
+				<displayName>Rand sudafricanu (financieru)</displayName>
+				<displayName count="one">rand sudafricanu (financieru)</displayName>
+				<displayName count="other">rands sudafricanos (financieros)</displayName>
+				<symbol draft="contributed">ZAL</symbol>
+			</currency>
+			<currency type="ZAR">
+				<displayName>Rand sudafricanu</displayName>
+				<displayName count="one">rand sudafricanu</displayName>
+				<displayName count="other">rands sudafricanos</displayName>
+				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
+			</currency>
+			<currency type="ZMK">
+				<displayName>Kwacha zambianu (1968–2012)</displayName>
+				<displayName count="one">kwacha zambianu (1968–2012)</displayName>
+				<displayName count="other">kwachas zambianos (1968–2012)</displayName>
+				<symbol draft="contributed">ZMK</symbol>
+			</currency>
+			<currency type="ZMW">
+				<displayName>Kwacha zambianu</displayName>
+				<displayName count="one">kwacha zambianu</displayName>
+				<displayName count="other">kwachas zambianos</displayName>
+				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
+			</currency>
+			<currency type="ZRN">
+				<displayName>Zaire nuevu zairiegu (1993–1998)</displayName>
+				<displayName count="one">zaire nuevu zairiegu (1993–1998)</displayName>
+				<displayName count="other">zaires nuevos zairiegos (1993–1998)</displayName>
+				<symbol draft="contributed">ZRN</symbol>
+			</currency>
+			<currency type="ZRZ">
+				<displayName>Zaire zairiegu (1971–1993)</displayName>
+				<displayName count="one">zaire zairiegu (1971–1993)</displayName>
+				<displayName count="other">zaires zairiegos (1971–1993)</displayName>
+				<symbol draft="contributed">ZRZ</symbol>
+			</currency>
+			<currency type="ZWD">
+				<displayName>Dólar zimbabuanu (1980–2008)</displayName>
+				<displayName count="one">dólar zimbabuanu (1980–2008)</displayName>
+				<displayName count="other">dólares zimbabuanos (1980–2008)</displayName>
+				<symbol draft="contributed">ZWD</symbol>
+			</currency>
+			<currency type="ZWL">
+				<displayName>Dólar zimbabuanu (2009)</displayName>
+				<displayName count="one">dólar zimbabuanu (2009)</displayName>
+				<displayName count="other">dólares zimbabuanos (2009)</displayName>
+				<symbol draft="contributed">ZWL</symbol>
+			</currency>
+			<currency type="ZWR">
+				<displayName>Dólar zimbabuanu (2008)</displayName>
+				<displayName count="one">dólar zimbabuanu (2008)</displayName>
+				<displayName count="other">dólares zimbabuanos (2008)</displayName>
+				<symbol draft="contributed">ZWR</symbol>
+			</currency>
+		</currencies>
+		<miscPatterns numberSystem="latn">
+			<pattern type="atLeast">⩾{0}</pattern>
+			<pattern type="range">{0}–{1}</pattern>
+		</miscPatterns>
+	</numbers>
+	<units>
+		<unitLength type="long">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0} per {1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<displayName>fuercia g</displayName>
+				<unitPattern count="one">{0} fuercia g</unitPattern>
+				<unitPattern count="other">{0} fuercies gues</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-second-squared">
+				<displayName>metros per segundu al cuadráu</displayName>
+				<unitPattern count="one">{0} metru per segundu al cuadráu</unitPattern>
+				<unitPattern count="other">{0} metros por segundu al cuadráu</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>revolución</displayName>
+				<unitPattern count="one">{0} revolución</unitPattern>
+				<unitPattern count="other">{0} revoluciones</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radianes</displayName>
+				<unitPattern count="one">{0} radián</unitPattern>
+				<unitPattern count="other">{0} radianes</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>graos</displayName>
+				<unitPattern count="one">{0} grau</unitPattern>
+				<unitPattern count="other">{0} graos</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>minutos d’arcu</displayName>
+				<unitPattern count="one">{0} minutu d'arcu</unitPattern>
+				<unitPattern count="other">{0} minutos d'arcu</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>segundos d’arcu</displayName>
+				<unitPattern count="one">{0} segundu d'arcu</unitPattern>
+				<unitPattern count="other">{0} segundos d'arcu</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>kilómetros cuadraos</displayName>
+				<unitPattern count="one">{0} kilómetru cuadráu</unitPattern>
+				<unitPattern count="other">{0} kilómetros cuadraos</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>hectárees</displayName>
+				<unitPattern count="one">{0} hectárea</unitPattern>
+				<unitPattern count="other">{0} hectárees</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>metros cuadraos</displayName>
+				<unitPattern count="one">{0} metru cuadráu</unitPattern>
+				<unitPattern count="other">{0} metros cuadraos</unitPattern>
+				<perUnitPattern>{0} per metru cuadráu</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>centímetros cuadraos</displayName>
+				<unitPattern count="one">{0} centímetru cuadráu</unitPattern>
+				<unitPattern count="other">{0} centímetros cuadraos</unitPattern>
+				<perUnitPattern>{0} per centímetru cuadráu</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>milles cuadraes</displayName>
+				<unitPattern count="one">{0} milla cuadrada</unitPattern>
+				<unitPattern count="other">{0} milles cuadraes</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acres</displayName>
+				<unitPattern count="one">{0} acre</unitPattern>
+				<unitPattern count="other">{0} acres</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yardes cuadraes</displayName>
+				<unitPattern count="one">{0} yarda cuadrada</unitPattern>
+				<unitPattern count="other">{0} yardes cuadraes</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>pies cuadraos</displayName>
+				<unitPattern count="one">{0} pie cuadráu</unitPattern>
+				<unitPattern count="other">{0} pies cuadraos</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>pulgaes cuadraes</displayName>
+				<unitPattern count="one">{0} pulgada cuadrada</unitPattern>
+				<unitPattern count="other">{0} pulgaes cuadraes</unitPattern>
+				<perUnitPattern>{0} per pulgada cuadrada</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>quilates</displayName>
+				<unitPattern count="one">{0} quilate</unitPattern>
+				<unitPattern count="other">{0} quilates</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>llitros per quilómetru</displayName>
+				<unitPattern count="one">{0} llitru per quilómetru</unitPattern>
+				<unitPattern count="other">{0} llitros per quilómetru</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>llitros per 100 quilómetros</displayName>
+				<unitPattern count="one">{0} llitru per 100 quilómetros</unitPattern>
+				<unitPattern count="other">{0} llitros per 100 quilómetros</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>milles per galón</displayName>
+				<unitPattern count="one">{0} milla per galón</unitPattern>
+				<unitPattern count="other">{0} milles per galón</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<displayName>terabytes</displayName>
+				<unitPattern count="one">{0} terabyte</unitPattern>
+				<unitPattern count="other">{0} terabytes</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabits</displayName>
+				<unitPattern count="one">{0} terabit</unitPattern>
+				<unitPattern count="other">{0} terabits</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabytes</displayName>
+				<unitPattern count="one">{0} gigabyte</unitPattern>
+				<unitPattern count="other">{0} gigabytes</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabits</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="other">{0} gigabits</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabytes</displayName>
+				<unitPattern count="one">{0} megabyte</unitPattern>
+				<unitPattern count="other">{0} megabytes</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabits</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="other">{0} megabits</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobytes</displayName>
+				<unitPattern count="one">{0} kilobyte</unitPattern>
+				<unitPattern count="other">{0} kilobytes</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobits</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="other">{0} kilobits</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bytes</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} bytes</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bits</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bits</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>sieglos</displayName>
+				<unitPattern count="one">{0} sieglu</unitPattern>
+				<unitPattern count="other">{0} sieglos</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>años</displayName>
+				<unitPattern count="one">{0} añu</unitPattern>
+				<unitPattern count="other">{0} años</unitPattern>
+				<perUnitPattern>{0} per añu</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>meses</displayName>
+				<unitPattern count="one">{0} mes</unitPattern>
+				<unitPattern count="other">{0} meses</unitPattern>
+				<perUnitPattern>{0} per mes</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>selmanes</displayName>
+				<unitPattern count="one">{0} selmana</unitPattern>
+				<unitPattern count="other">{0} selmanes</unitPattern>
+				<perUnitPattern>{0} per selmana</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>díes</displayName>
+				<unitPattern count="one">{0} día</unitPattern>
+				<unitPattern count="other">{0} díes</unitPattern>
+				<perUnitPattern>{0} per día</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>hores</displayName>
+				<unitPattern count="one">{0} hora</unitPattern>
+				<unitPattern count="other">{0} hores</unitPattern>
+				<perUnitPattern>{0} per hora</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>minutos</displayName>
+				<unitPattern count="one">{0} minutu</unitPattern>
+				<unitPattern count="other">{0} minutos</unitPattern>
+				<perUnitPattern>{0} per minutu</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>segundos</displayName>
+				<unitPattern count="one">{0} segundu</unitPattern>
+				<unitPattern count="other">{0} segundos</unitPattern>
+				<perUnitPattern>{0} per segundu</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>milisegundos</displayName>
+				<unitPattern count="one">{0} milisegundu</unitPattern>
+				<unitPattern count="other">{0} milisegundos</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>microsegundos</displayName>
+				<unitPattern count="one">{0} microsegundu</unitPattern>
+				<unitPattern count="other">{0} microsegundos</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosegundos</displayName>
+				<unitPattern count="one">{0} nanosegundu</unitPattern>
+				<unitPattern count="other">{0} nanosegundos</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName>amperios</displayName>
+				<unitPattern count="one">{0} amperiu</unitPattern>
+				<unitPattern count="other">{0} amperios</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>miliamperios</displayName>
+				<unitPattern count="one">{0} milliamperiu</unitPattern>
+				<unitPattern count="other">{0} milliamperios</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<displayName>ohmnios</displayName>
+				<unitPattern count="one">{0} ohmiu</unitPattern>
+				<unitPattern count="other">{0} ohmios</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>voltios</displayName>
+				<unitPattern count="one">{0} voltiu</unitPattern>
+				<unitPattern count="other">{0} voltios</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>quilocaloríes</displayName>
+				<unitPattern count="one">{0} quilocaloría</unitPattern>
+				<unitPattern count="other">{0} quilocaloríes</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>caloríes</displayName>
+				<unitPattern count="one">{0} caloría</unitPattern>
+				<unitPattern count="other">{0} caloríes</unitPattern>
+			</unit>
+			<unit type="energy-foodcalorie">
+				<displayName>Caloríes</displayName>
+				<unitPattern count="one">{0} Caloría</unitPattern>
+				<unitPattern count="other">{0} Caloríes</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>quiloxulios</displayName>
+				<unitPattern count="one">{0} quiloxuliu</unitPattern>
+				<unitPattern count="other">{0} quiloxulios</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>xulios</displayName>
+				<unitPattern count="one">{0} xuliu</unitPattern>
+				<unitPattern count="other">{0} xulios</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>quilovatios hora</displayName>
+				<unitPattern count="one">{0} quilovatiu hora</unitPattern>
+				<unitPattern count="other">{0} quilovatios hora</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<displayName>gigahercios</displayName>
+				<unitPattern count="one">{0} gigaherciu</unitPattern>
+				<unitPattern count="other">{0} gigahercios</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<displayName>megahercios</displayName>
+				<unitPattern count="one">{0} megaherciu</unitPattern>
+				<unitPattern count="other">{0} megahercios</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>quilohercios</displayName>
+				<unitPattern count="one">{0} quiloherciu</unitPattern>
+				<unitPattern count="other">{0} kilohercios</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<displayName>hercios</displayName>
+				<unitPattern count="one">{0} herciu</unitPattern>
+				<unitPattern count="other">{0} hercios</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>quilómetros</displayName>
+				<unitPattern count="one">{0} quilómetru</unitPattern>
+				<unitPattern count="other">{0} quilómetros</unitPattern>
+				<perUnitPattern>{0} per quilómetru</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>metros</displayName>
+				<unitPattern count="one">{0} metru</unitPattern>
+				<unitPattern count="other">{0} metros</unitPattern>
+				<perUnitPattern>{0} per metru</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>decímetros</displayName>
+				<unitPattern count="one">{0} decímetru</unitPattern>
+				<unitPattern count="other">{0} decímetros</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>centímetros</displayName>
+				<unitPattern count="one">{0} centímetru</unitPattern>
+				<unitPattern count="other">{0} centímetros</unitPattern>
+				<perUnitPattern>{0} por centímetru</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>milímetros</displayName>
+				<unitPattern count="one">{0} milímetru</unitPattern>
+				<unitPattern count="other">{0} milímetros</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>micrómetros</displayName>
+				<unitPattern count="one">{0} micrómetru</unitPattern>
+				<unitPattern count="other">{0} micrómetros</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nanómetros</displayName>
+				<unitPattern count="one">{0} nanómetru</unitPattern>
+				<unitPattern count="other">{0} nanómetros</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>picómetros</displayName>
+				<unitPattern count="one">{0} picómetru</unitPattern>
+				<unitPattern count="other">{0} picómetros</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>milles</displayName>
+				<unitPattern count="one">{0} milla</unitPattern>
+				<unitPattern count="other">{0} milles</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>yardes</displayName>
+				<unitPattern count="one">{0} yarda</unitPattern>
+				<unitPattern count="other">{0} yardes</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>pies</displayName>
+				<unitPattern count="one">{0} pie</unitPattern>
+				<unitPattern count="other">{0} pies</unitPattern>
+				<perUnitPattern>{0} per pie</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>pulgaes</displayName>
+				<unitPattern count="one">{0} pulgada</unitPattern>
+				<unitPattern count="other">{0} pulgaes</unitPattern>
+				<perUnitPattern>{0} per pulgada</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsecs</displayName>
+				<unitPattern count="one">{0} parsec</unitPattern>
+				<unitPattern count="other">{0} parsecs</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>años lluz</displayName>
+				<unitPattern count="one">{0} añu lluz</unitPattern>
+				<unitPattern count="other">{0} años lluz</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>unidaes astronómiques</displayName>
+				<unitPattern count="one">{0} unidá astronómica</unitPattern>
+				<unitPattern count="other">{0} unidaes astronómiques</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>furlongs</displayName>
+				<unitPattern count="one">{0} furlong</unitPattern>
+				<unitPattern count="other">{0} furlongs</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>fathoms</displayName>
+				<unitPattern count="one">{0} fathom</unitPattern>
+				<unitPattern count="other">{0} fathoms</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>milles náutiques</displayName>
+				<unitPattern count="one">{0} milla náutica</unitPattern>
+				<unitPattern count="other">{0} milles náutiques</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>milla escandinava</displayName>
+				<unitPattern count="one">{0} milla escandinava</unitPattern>
+				<unitPattern count="other">{0} milles escandinaves</unitPattern>
+			</unit>
+			<unit type="light-lux">
+				<displayName>lux</displayName>
+				<unitPattern count="one">{0} lux</unitPattern>
+				<unitPattern count="other">{0} lux</unitPattern>
+			</unit>
+			<unit type="mass-metric-ton">
+				<displayName>tonelaes métriques</displayName>
+				<unitPattern count="one">{0} tonelada métrica</unitPattern>
+				<unitPattern count="other">{0} tonelaes métriques</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>quilogramos</displayName>
+				<unitPattern count="one">{0} quilogramu</unitPattern>
+				<unitPattern count="other">{0} quilogramos</unitPattern>
+				<perUnitPattern>{0} per quilogramu</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gramos</displayName>
+				<unitPattern count="one">{0} gramu</unitPattern>
+				<unitPattern count="other">{0} gramos</unitPattern>
+				<perUnitPattern>{0} per gramu</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>miligramos</displayName>
+				<unitPattern count="one">{0} miligramu</unitPattern>
+				<unitPattern count="other">{0} miligramos</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>microgramos</displayName>
+				<unitPattern count="one">{0} microgramu</unitPattern>
+				<unitPattern count="other">{0} microgramos</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>tonelaes</displayName>
+				<unitPattern count="one">{0} tonelada</unitPattern>
+				<unitPattern count="other">{0} tonelaes</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName>piedres</displayName>
+				<unitPattern count="one">{0} piedra</unitPattern>
+				<unitPattern count="other">{0} piedres</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>llibres</displayName>
+				<unitPattern count="one">{0} llibra</unitPattern>
+				<unitPattern count="other">{0} llibres</unitPattern>
+				<perUnitPattern>{0} per llibra</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>onces</displayName>
+				<unitPattern count="one">{0} onza</unitPattern>
+				<unitPattern count="other">{0} onces</unitPattern>
+				<perUnitPattern>{0} per onza</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>onces troy</displayName>
+				<unitPattern count="one">{0} onza troy</unitPattern>
+				<unitPattern count="other">{0} onces troy</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>quilates</displayName>
+				<unitPattern count="one">{0} quilate</unitPattern>
+				<unitPattern count="other">{0} quilates</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<displayName>gigavatios</displayName>
+				<unitPattern count="one">{0} gigavatiu</unitPattern>
+				<unitPattern count="other">{0} gigavatios</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>megavatios</displayName>
+				<unitPattern count="one">{0} megavatiu</unitPattern>
+				<unitPattern count="other">{0} megavatios</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>quilovatios</displayName>
+				<unitPattern count="one">{0} quilovatiu</unitPattern>
+				<unitPattern count="other">{0} quilovatios</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>vatios</displayName>
+				<unitPattern count="one">{0} vatiu</unitPattern>
+				<unitPattern count="other">{0} vatios</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>millivatios</displayName>
+				<unitPattern count="one">{0} millivatiu</unitPattern>
+				<unitPattern count="other">{0} millivatios</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>caballos de fuerza</displayName>
+				<unitPattern count="one">{0} caballu de fuerza</unitPattern>
+				<unitPattern count="other">{0} caballos de fuerza</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<displayName>hectopascales</displayName>
+				<unitPattern count="one">{0} hectopascal</unitPattern>
+				<unitPattern count="other">{0} hectopascales</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>milímetros de mercuriu</displayName>
+				<unitPattern count="one">{0} milímetru de mercuriu</unitPattern>
+				<unitPattern count="other">{0} milímetros de mercuriu</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>llibres per pulgada cuadrada</displayName>
+				<unitPattern count="one">{0} llibra per pulgada cuadrada</unitPattern>
+				<unitPattern count="other">{0} llibres per pulgada cuadrada</unitPattern>
+			</unit>
+			<unit type="pressure-inch-hg">
+				<displayName>pulgaes de mercuriu</displayName>
+				<unitPattern count="one">{0} pulgada de mercuriu</unitPattern>
+				<unitPattern count="other">{0} pulgaes de mercuriu</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>milibares</displayName>
+				<unitPattern count="one">{0} milibar</unitPattern>
+				<unitPattern count="other">{0} milibares</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>quilómetros per hora</displayName>
+				<unitPattern count="one">{0} quilómetru per hora</unitPattern>
+				<unitPattern count="other">{0} quilómetros per hora</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>metros per segundu</displayName>
+				<unitPattern count="one">{0} metru per segundu</unitPattern>
+				<unitPattern count="other">{0} metros per segundu</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>milles per hora</displayName>
+				<unitPattern count="one">{0} milla per hora</unitPattern>
+				<unitPattern count="other">{0} milles per hora</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>nuedu</displayName>
+				<unitPattern count="one">{0} nuedu</unitPattern>
+				<unitPattern count="other">{0} nuedos</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>graos Celsius</displayName>
+				<unitPattern count="one">{0} grau Celsius</unitPattern>
+				<unitPattern count="other">{0} graos Celsius</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName>graos Fahrenheit</displayName>
+				<unitPattern count="one">{0} grau Fahrenheit</unitPattern>
+				<unitPattern count="other">{0} graos Fahrenheit</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>kelvins</displayName>
+				<unitPattern count="one">{0} kelvin</unitPattern>
+				<unitPattern count="other">{0} kelvins</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>quilómetros cúbicos</displayName>
+				<unitPattern count="one">{0} quilómetru cúbicu</unitPattern>
+				<unitPattern count="other">{0} quilómetros cúbicos</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>metros cúbicos</displayName>
+				<unitPattern count="one">{0} metru cúbicu</unitPattern>
+				<unitPattern count="other">{0} metros cúbicos</unitPattern>
+				<perUnitPattern>{0} per metru cúbicu</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>centímetros cúbicos</displayName>
+				<unitPattern count="one">{0} centímetru cúbicu</unitPattern>
+				<unitPattern count="other">{0} centímetros cúbicos</unitPattern>
+				<perUnitPattern>{0} per centímetru cúbicu</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>milles cúbiques</displayName>
+				<unitPattern count="one">{0} milla cúbica</unitPattern>
+				<unitPattern count="other">{0} milles cúbiques</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>yardes cúbiques</displayName>
+				<unitPattern count="one">{0} yarda cúbica</unitPattern>
+				<unitPattern count="other">{0} yardes cúbiques</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>pies cúbicos</displayName>
+				<unitPattern count="one">{0} pie cúbicu</unitPattern>
+				<unitPattern count="other">{0} pies cúbicos</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>pulgaes cúbiques</displayName>
+				<unitPattern count="one">{0} pulgada cúbica</unitPattern>
+				<unitPattern count="other">{0} pulgaes cúbiques</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>megallitros</displayName>
+				<unitPattern count="one">{0} megallitru</unitPattern>
+				<unitPattern count="other">{0} megallitros</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hectollitros</displayName>
+				<unitPattern count="one">{0} hectollitru</unitPattern>
+				<unitPattern count="other">{0} hectollitros</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>llitros</displayName>
+				<unitPattern count="one">{0} llitru</unitPattern>
+				<unitPattern count="other">{0} llitros</unitPattern>
+				<perUnitPattern>{0} per llitru</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>decillitros</displayName>
+				<unitPattern count="one">{0} decillitru</unitPattern>
+				<unitPattern count="other">{0} decillitros</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centillitros</displayName>
+				<unitPattern count="one">{0} centillitru</unitPattern>
+				<unitPattern count="other">{0} centillitros</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>milillitros</displayName>
+				<unitPattern count="one">{0} milillitru</unitPattern>
+				<unitPattern count="other">{0} milillitros</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>pintes métriques</displayName>
+				<unitPattern count="one">{0} pinta métrica</unitPattern>
+				<unitPattern count="other">{0} pintes métriques</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>taces métriques</displayName>
+				<unitPattern count="one">{0} taza métrica</unitPattern>
+				<unitPattern count="other">{0} taces métriques</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acre-pies</displayName>
+				<unitPattern count="one">{0} acre-pie</unitPattern>
+				<unitPattern count="other">{0} acre-pies</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>bushels</displayName>
+				<unitPattern count="one">{0} bushel</unitPattern>
+				<unitPattern count="other">{0} bushels</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galones</displayName>
+				<unitPattern count="one">{0} galón</unitPattern>
+				<unitPattern count="other">{0} galones</unitPattern>
+				<perUnitPattern>{0} per galón</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>cuartos</displayName>
+				<unitPattern count="one">{0} cuartu</unitPattern>
+				<unitPattern count="other">{0} cuartos</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>pintes</displayName>
+				<unitPattern count="one">{0} pinta</unitPattern>
+				<unitPattern count="other">{0} pintes</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>taces</displayName>
+				<unitPattern count="one">{0} taza</unitPattern>
+				<unitPattern count="other">{0} taces</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>onces de fluidos</displayName>
+				<unitPattern count="one">{0} onza de fluidos</unitPattern>
+				<unitPattern count="other">{0} onces de fluidos</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>cuyares</displayName>
+				<unitPattern count="one">{0} cuyar</unitPattern>
+				<unitPattern count="other">{0} cuyares</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>cuyarines</displayName>
+				<unitPattern count="one">{0} cuyarina</unitPattern>
+				<unitPattern count="other">{0} cuyarines</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}O</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<unitLength type="short">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<displayName>fuercia g</displayName>
+				<unitPattern count="one">{0} G</unitPattern>
+				<unitPattern count="other">{0} Gs</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-second-squared">
+				<displayName>m/s²</displayName>
+				<unitPattern count="one">{0} m/s²</unitPattern>
+				<unitPattern count="other">{0} m/s²</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="one">{0} rev</unitPattern>
+				<unitPattern count="other">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radianes</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>graos</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>arcmins</displayName>
+				<unitPattern count="one">{0} arcmin</unitPattern>
+				<unitPattern count="other">{0} arcmins</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>arcsecs</displayName>
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>hectárees</displayName>
+				<unitPattern count="one">{0} ha</unitPattern>
+				<unitPattern count="other">{0} ha</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>cm²</displayName>
+				<unitPattern count="one">{0} cm²</unitPattern>
+				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acre</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>ft²</displayName>
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>in²</displayName>
+				<unitPattern count="one">{0} in²</unitPattern>
+				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>quilates</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>llitros/km</displayName>
+				<unitPattern count="one">{0} L/km</unitPattern>
+				<unitPattern count="other">{0} L/km</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} L/100km</unitPattern>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>milles/gal</displayName>
+				<unitPattern count="one">{0} mpg</unitPattern>
+				<unitPattern count="other">{0} mpg</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<displayName>TByte</displayName>
+				<unitPattern count="one">{0} TB</unitPattern>
+				<unitPattern count="other">{0} TB</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tbit</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GByte</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gbit</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MByte</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mbit</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kByte</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kbit</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>sgl</displayName>
+				<unitPattern count="one">{0} sgl</unitPattern>
+				<unitPattern count="other">{0} sgls</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>años</displayName>
+				<unitPattern count="one">{0} añ</unitPattern>
+				<unitPattern count="other">{0} añs</unitPattern>
+				<perUnitPattern>{0}/añ</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>meses</displayName>
+				<unitPattern count="one">{0} mes</unitPattern>
+				<unitPattern count="other">{0} meses</unitPattern>
+				<perUnitPattern>{0}/mes</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>selmanes</displayName>
+				<unitPattern count="one">{0} sel</unitPattern>
+				<unitPattern count="other">{0} sels</unitPattern>
+				<perUnitPattern>{0}/sel</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>díes</displayName>
+				<unitPattern count="one">{0} día</unitPattern>
+				<unitPattern count="other">{0} díes</unitPattern>
+				<perUnitPattern>{0}/día</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>hores</displayName>
+				<unitPattern count="one">{0} hr</unitPattern>
+				<unitPattern count="other">{0} hrs</unitPattern>
+				<perUnitPattern>{0}/hr</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>mins</displayName>
+				<unitPattern count="one">{0} min</unitPattern>
+				<unitPattern count="other">{0} mins</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>segs</displayName>
+				<unitPattern count="one">{0} seg</unitPattern>
+				<unitPattern count="other">{0} segs</unitPattern>
+				<perUnitPattern>{0}/seg</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>milisegs</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>μsegs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosegs</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName>amps</displayName>
+				<unitPattern count="one">{0} A</unitPattern>
+				<unitPattern count="other">{0} A</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>miliamps</displayName>
+				<unitPattern count="one">{0} mA</unitPattern>
+				<unitPattern count="other">{0} mA</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<displayName>ohmnios</displayName>
+				<unitPattern count="one">{0} Ω</unitPattern>
+				<unitPattern count="other">{0} Ω</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>voltios</displayName>
+				<unitPattern count="one">{0} V</unitPattern>
+				<unitPattern count="other">{0} V</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>cal</displayName>
+				<unitPattern count="one">{0} cal</unitPattern>
+				<unitPattern count="other">{0} cal</unitPattern>
+			</unit>
+			<unit type="energy-foodcalorie">
+				<displayName>Cal</displayName>
+				<unitPattern count="one">{0} Cal</unitPattern>
+				<unitPattern count="other">{0} Cal</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>quiloxuliu</displayName>
+				<unitPattern count="one">{0} kJ</unitPattern>
+				<unitPattern count="other">{0} kJ</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>xulios</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>kW-hora</displayName>
+				<unitPattern count="one">{0} kWh</unitPattern>
+				<unitPattern count="other">{0} kWh</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<displayName>GHz</displayName>
+				<unitPattern count="one">{0} GHz</unitPattern>
+				<unitPattern count="other">{0} GHz</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>kHz</displayName>
+				<unitPattern count="one">{0} kHz</unitPattern>
+				<unitPattern count="other">{0} kHz</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>metros</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>dm</displayName>
+				<unitPattern count="one">{0} dm</unitPattern>
+				<unitPattern count="other">{0} dm</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>mm</displayName>
+				<unitPattern count="one">{0} mm</unitPattern>
+				<unitPattern count="other">{0} mm</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>µmetros</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nm</displayName>
+				<unitPattern count="one">{0} nm</unitPattern>
+				<unitPattern count="other">{0} nm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>pm</displayName>
+				<unitPattern count="one">{0} pm</unitPattern>
+				<unitPattern count="other">{0} pm</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>milles</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>yd</displayName>
+				<unitPattern count="one">{0} yd</unitPattern>
+				<unitPattern count="other">{0} yd</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>pies</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>pulgaes</displayName>
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>añ. lluz</displayName>
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ua</displayName>
+				<unitPattern count="one">{0} ua</unitPattern>
+				<unitPattern count="other">{0} ua</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>furlongs</displayName>
+				<unitPattern count="one">{0} fur</unitPattern>
+				<unitPattern count="other">{0} fur</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>fathoms</displayName>
+				<unitPattern count="one">{0} ftm</unitPattern>
+				<unitPattern count="other">{0} ftm</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
+			<unit type="light-lux">
+				<displayName>lux</displayName>
+				<unitPattern count="one">{0} lx</unitPattern>
+				<unitPattern count="other">{0} lx</unitPattern>
+			</unit>
+			<unit type="mass-metric-ton">
+				<displayName>t</displayName>
+				<unitPattern count="one">{0} t</unitPattern>
+				<unitPattern count="other">{0} t</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gramos</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>mg</displayName>
+				<unitPattern count="one">{0} mg</unitPattern>
+				<unitPattern count="other">{0} mg</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>tonelaes</displayName>
+				<unitPattern count="one">{0} tn</unitPattern>
+				<unitPattern count="other">{0} tn</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName>piedres</displayName>
+				<unitPattern count="one">{0} st</unitPattern>
+				<unitPattern count="other">{0} st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>llibres</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lbs</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz troy</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>quilates</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<displayName>GW</displayName>
+				<unitPattern count="one">{0} GW</unitPattern>
+				<unitPattern count="other">{0} GW</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>MW</displayName>
+				<unitPattern count="one">{0} MW</unitPattern>
+				<unitPattern count="other">{0} MW</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>vatios</displayName>
+				<unitPattern count="one">{0} W</unitPattern>
+				<unitPattern count="other">{0} W</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<displayName>hPa</displayName>
+				<unitPattern count="one">{0} hPa</unitPattern>
+				<unitPattern count="other">{0} hPa</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>mm Hg</displayName>
+				<unitPattern count="one">{0} mm Hg</unitPattern>
+				<unitPattern count="other">{0} mm Hg</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>psi</displayName>
+				<unitPattern count="one">{0} psi</unitPattern>
+				<unitPattern count="other">{0} psi</unitPattern>
+			</unit>
+			<unit type="pressure-inch-hg">
+				<displayName>in Hg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>km/h</displayName>
+				<unitPattern count="one">{0} km/h</unitPattern>
+				<unitPattern count="other">{0} km/h</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>metros/seg</displayName>
+				<unitPattern count="one">{0} m/s</unitPattern>
+				<unitPattern count="other">{0} m/s</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>milles/hora</displayName>
+				<unitPattern count="one">{0} mi/h</unitPattern>
+				<unitPattern count="other">{0} mi/h</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>°C</displayName>
+				<unitPattern count="one">{0}°C</unitPattern>
+				<unitPattern count="other">{0}°C</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName>°F</displayName>
+				<unitPattern count="one">{0}°F</unitPattern>
+				<unitPattern count="other">{0}°F</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>K</displayName>
+				<unitPattern count="one">{0} K</unitPattern>
+				<unitPattern count="other">{0} K</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>km³</displayName>
+				<unitPattern count="one">{0} km³</unitPattern>
+				<unitPattern count="other">{0} km³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>m³</displayName>
+				<unitPattern count="one">{0} m³</unitPattern>
+				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>mi³</displayName>
+				<unitPattern count="one">{0} mi³</unitPattern>
+				<unitPattern count="other">{0} mi³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>yd³</displayName>
+				<unitPattern count="one">{0} yd³</unitPattern>
+				<unitPattern count="other">{0} yd³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>pulgaes³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hectollitros</displayName>
+				<unitPattern count="one">{0} hL</unitPattern>
+				<unitPattern count="other">{0} hL</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>llitros</displayName>
+				<unitPattern count="one">{0} l</unitPattern>
+				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0} dL</unitPattern>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="one">{0} cL</unitPattern>
+				<unitPattern count="other">{0} cL</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>mL</displayName>
+				<unitPattern count="one">{0} mL</unitPattern>
+				<unitPattern count="other">{0} mL</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>taces mét.</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>bushels</displayName>
+				<unitPattern count="one">{0} bu</unitPattern>
+				<unitPattern count="other">{0} bu</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>cuartos</displayName>
+				<unitPattern count="one">{0} qt</unitPattern>
+				<unitPattern count="other">{0} qt</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>pintes</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>taces</displayName>
+				<unitPattern count="one">{0} tz</unitPattern>
+				<unitPattern count="other">{0} tz</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>cuyar</displayName>
+				<unitPattern count="one">{0} cuyar</unitPattern>
+				<unitPattern count="other">{0} cuyar</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>cuyrn</displayName>
+				<unitPattern count="one">{0} cuyrn</unitPattern>
+				<unitPattern count="other">{0} cuyrn</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}O</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<unitLength type="narrow">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<displayName>fuercia g</displayName>
+				<unitPattern count="one">{0}G</unitPattern>
+				<unitPattern count="other">{0}Gs</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-second-squared">
+				<displayName>m/s²</displayName>
+				<unitPattern count="one">{0}m/s²</unitPattern>
+				<unitPattern count="other">{0}m/s²</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="one">{0}rev</unitPattern>
+				<unitPattern count="other">{0}rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0}rad</unitPattern>
+				<unitPattern count="other">{0}rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>graos</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>arcmin</displayName>
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="other">{0}′</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>arcsecs</displayName>
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>hectárea</displayName>
+				<unitPattern count="one">{0}ha</unitPattern>
+				<unitPattern count="other">{0}ha</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0} per m²</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>cm²</displayName>
+				<unitPattern count="one">{0}cm²</unitPattern>
+				<unitPattern count="other">{0}cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0}mi²</unitPattern>
+				<unitPattern count="other">{0}mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acre</displayName>
+				<unitPattern count="one">{0}ac</unitPattern>
+				<unitPattern count="other">{0}ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0}yd²</unitPattern>
+				<unitPattern count="other">{0}yd²</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>ft²</displayName>
+				<unitPattern count="one">{0}ft²</unitPattern>
+				<unitPattern count="other">{0}ft²</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>in²</displayName>
+				<unitPattern count="one">{0}in²</unitPattern>
+				<unitPattern count="other">{0}in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>quilate</displayName>
+				<unitPattern count="one">{0}kt</unitPattern>
+				<unitPattern count="other">{0}kt</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>L/km</displayName>
+				<unitPattern count="one">{0}L/km</unitPattern>
+				<unitPattern count="other">{0}L/km</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0}L/100km</unitPattern>
+				<unitPattern count="other">{0}L/100km</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>mpg</displayName>
+				<unitPattern count="one">{0}mpg</unitPattern>
+				<unitPattern count="other">{0}mpg</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<displayName>TByte</displayName>
+				<unitPattern count="one">{0}TB</unitPattern>
+				<unitPattern count="other">{0}TB</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tbit</displayName>
+				<unitPattern count="one">{0}Tb</unitPattern>
+				<unitPattern count="other">{0}Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GByte</displayName>
+				<unitPattern count="one">{0}GB</unitPattern>
+				<unitPattern count="other">{0}GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gbit</displayName>
+				<unitPattern count="one">{0}Gb</unitPattern>
+				<unitPattern count="other">{0}Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MByte</displayName>
+				<unitPattern count="one">{0}MB</unitPattern>
+				<unitPattern count="other">{0}MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mbit</displayName>
+				<unitPattern count="one">{0}Mb</unitPattern>
+				<unitPattern count="other">{0}Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kByte</displayName>
+				<unitPattern count="one">{0}kB</unitPattern>
+				<unitPattern count="other">{0}kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kbit</displayName>
+				<unitPattern count="one">{0}kb</unitPattern>
+				<unitPattern count="other">{0}kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0}byte</unitPattern>
+				<unitPattern count="other">{0}byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0}bit</unitPattern>
+				<unitPattern count="other">{0}bits</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>sgl</displayName>
+				<unitPattern count="one">{0} sgl</unitPattern>
+				<unitPattern count="other">{0} sgls</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>añ</displayName>
+				<unitPattern count="one">{0}añ</unitPattern>
+				<unitPattern count="other">{0}añs</unitPattern>
+				<perUnitPattern>{0}/añ</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mes</displayName>
+				<unitPattern count="one">{0}mes</unitPattern>
+				<unitPattern count="other">{0}meses</unitPattern>
+				<perUnitPattern>{0}/mes</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>sel</displayName>
+				<unitPattern count="one">{0}sel</unitPattern>
+				<unitPattern count="other">{0}sels</unitPattern>
+				<perUnitPattern>{0}/sel</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>día</displayName>
+				<unitPattern count="one">{0}día</unitPattern>
+				<unitPattern count="other">{0}díes</unitPattern>
+				<perUnitPattern>{0}/día</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>hora</displayName>
+				<unitPattern count="one">{0}hr</unitPattern>
+				<unitPattern count="other">{0}hrs</unitPattern>
+				<perUnitPattern>{0}/hr</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>min</displayName>
+				<unitPattern count="one">{0}min</unitPattern>
+				<unitPattern count="other">{0}mins</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>seg</displayName>
+				<unitPattern count="one">{0}seg</unitPattern>
+				<unitPattern count="other">{0}segs</unitPattern>
+				<perUnitPattern>{0}/seg</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>mseg</displayName>
+				<unitPattern count="one">{0}ms</unitPattern>
+				<unitPattern count="other">{0}ms</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>μseg</displayName>
+				<unitPattern count="one">{0}μs</unitPattern>
+				<unitPattern count="other">{0}μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0}ns</unitPattern>
+				<unitPattern count="other">{0}ns</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName>amp</displayName>
+				<unitPattern count="one">{0}A</unitPattern>
+				<unitPattern count="other">{0}A</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>mA</displayName>
+				<unitPattern count="one">{0}mA</unitPattern>
+				<unitPattern count="other">{0}mA</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<displayName>ohmnios</displayName>
+				<unitPattern count="one">{0}Ω</unitPattern>
+				<unitPattern count="other">{0}Ω</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>voltios</displayName>
+				<unitPattern count="one">{0}V</unitPattern>
+				<unitPattern count="other">{0}V</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0}kcal</unitPattern>
+				<unitPattern count="other">{0}kcal</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>cal</displayName>
+				<unitPattern count="one">{0}cal</unitPattern>
+				<unitPattern count="other">{0}cal</unitPattern>
+			</unit>
+			<unit type="energy-foodcalorie">
+				<displayName>Cal</displayName>
+				<unitPattern count="one">{0}Cal</unitPattern>
+				<unitPattern count="other">{0}Cal</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>kJ</displayName>
+				<unitPattern count="one">{0}kJ</unitPattern>
+				<unitPattern count="other">{0}kJ</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>xulios</displayName>
+				<unitPattern count="one">{0}J</unitPattern>
+				<unitPattern count="other">{0}J</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>kWh</displayName>
+				<unitPattern count="one">{0}kWh</unitPattern>
+				<unitPattern count="other">{0}kWh</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<displayName>GHz</displayName>
+				<unitPattern count="one">{0}GHz</unitPattern>
+				<unitPattern count="other">{0}GHz</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0}MHz</unitPattern>
+				<unitPattern count="other">{0}MHz</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>kHz</displayName>
+				<unitPattern count="one">{0}kHz</unitPattern>
+				<unitPattern count="other">{0}kHz</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0}Hz</unitPattern>
+				<unitPattern count="other">{0}Hz</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0}km</unitPattern>
+				<unitPattern count="other">{0}km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>metru</displayName>
+				<unitPattern count="one">{0}m</unitPattern>
+				<unitPattern count="other">{0}m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>dm</displayName>
+				<unitPattern count="one">{0}dm</unitPattern>
+				<unitPattern count="other">{0}dm</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0}cm</unitPattern>
+				<unitPattern count="other">{0}cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>mm</displayName>
+				<unitPattern count="one">{0}mm</unitPattern>
+				<unitPattern count="other">{0}mm</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0}µm</unitPattern>
+				<unitPattern count="other">{0}µm</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nm</displayName>
+				<unitPattern count="one">{0}nm</unitPattern>
+				<unitPattern count="other">{0}nm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>pm</displayName>
+				<unitPattern count="one">{0}pm</unitPattern>
+				<unitPattern count="other">{0}pm</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="one">{0}mi</unitPattern>
+				<unitPattern count="other">{0}mi</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>yd</displayName>
+				<unitPattern count="one">{0}yd</unitPattern>
+				<unitPattern count="other">{0}yd</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>ft</displayName>
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="other">{0}′</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>in</displayName>
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsec</displayName>
+				<unitPattern count="one">{0}pc</unitPattern>
+				<unitPattern count="other">{0}pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>añ. lluz</displayName>
+				<unitPattern count="one">{0}ly</unitPattern>
+				<unitPattern count="other">{0}ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ua</displayName>
+				<unitPattern count="one">{0}ua</unitPattern>
+				<unitPattern count="other">{0}ua</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>furlongs</displayName>
+				<unitPattern count="one">{0}fur</unitPattern>
+				<unitPattern count="other">{0}fur</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>fathom</displayName>
+				<unitPattern count="one">{0}fm</unitPattern>
+				<unitPattern count="other">{0}fm</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0}nmi</unitPattern>
+				<unitPattern count="other">{0}nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0}smi</unitPattern>
+				<unitPattern count="other">{0}smi</unitPattern>
+			</unit>
+			<unit type="light-lux">
+				<displayName>lux</displayName>
+				<unitPattern count="one">{0}lx</unitPattern>
+				<unitPattern count="other">{0}lx</unitPattern>
+			</unit>
+			<unit type="mass-metric-ton">
+				<displayName>t</displayName>
+				<unitPattern count="one">{0}t</unitPattern>
+				<unitPattern count="other">{0}t</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0}kg</unitPattern>
+				<unitPattern count="other">{0}kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gramos</displayName>
+				<unitPattern count="one">{0}g</unitPattern>
+				<unitPattern count="other">{0}g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>mg</displayName>
+				<unitPattern count="one">{0}mg</unitPattern>
+				<unitPattern count="other">{0}mg</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0}µg</unitPattern>
+				<unitPattern count="other">{0}µg</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>ton</displayName>
+				<unitPattern count="one">{0}tn</unitPattern>
+				<unitPattern count="other">{0}tn</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName>piedres</displayName>
+				<unitPattern count="one">{0}st</unitPattern>
+				<unitPattern count="other">{0}st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0}#</unitPattern>
+				<unitPattern count="other">{0}#</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0}oz</unitPattern>
+				<unitPattern count="other">{0}oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0}oz t</unitPattern>
+				<unitPattern count="other">{0}oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>quilates</displayName>
+				<unitPattern count="one">{0}CD</unitPattern>
+				<unitPattern count="other">{0}CD</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<displayName>GW</displayName>
+				<unitPattern count="one">{0}GW</unitPattern>
+				<unitPattern count="other">{0}GW</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>MW</displayName>
+				<unitPattern count="one">{0}MW</unitPattern>
+				<unitPattern count="other">{0}MW</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0}kW</unitPattern>
+				<unitPattern count="other">{0}kW</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>vatios</displayName>
+				<unitPattern count="one">{0}W</unitPattern>
+				<unitPattern count="other">{0}W</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0}mW</unitPattern>
+				<unitPattern count="other">{0}mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="one">{0}hp</unitPattern>
+				<unitPattern count="other">{0}hp</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<displayName>hPa</displayName>
+				<unitPattern count="one">{0}hPa</unitPattern>
+				<unitPattern count="other">{0}hPa</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>mm Hg</displayName>
+				<unitPattern count="one">{0}mm Hg</unitPattern>
+				<unitPattern count="other">{0}mm Hg</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>psi</displayName>
+				<unitPattern count="one">{0}psi</unitPattern>
+				<unitPattern count="other">{0}psi</unitPattern>
+			</unit>
+			<unit type="pressure-inch-hg">
+				<displayName>″ Hg</displayName>
+				<unitPattern count="one">{0}″ Hg</unitPattern>
+				<unitPattern count="other">{0}″ Hg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0}mb</unitPattern>
+				<unitPattern count="other">{0}mb</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>km/h</displayName>
+				<unitPattern count="one">{0}km/h</unitPattern>
+				<unitPattern count="other">{0}km/h</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>m/s</displayName>
+				<unitPattern count="one">{0}m/s</unitPattern>
+				<unitPattern count="other">{0}m/s</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>mi/h</displayName>
+				<unitPattern count="one">{0}mph</unitPattern>
+				<unitPattern count="other">{0}mph</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0}kn</unitPattern>
+				<unitPattern count="other">{0}kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>°C</displayName>
+				<unitPattern count="one">{0}°C</unitPattern>
+				<unitPattern count="other">{0}°C</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName>°F</displayName>
+				<unitPattern count="one">{0}°F</unitPattern>
+				<unitPattern count="other">{0}°F</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>K</displayName>
+				<unitPattern count="one">{0}K</unitPattern>
+				<unitPattern count="other">{0}K</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>km³</displayName>
+				<unitPattern count="one">{0}km³</unitPattern>
+				<unitPattern count="other">{0}km³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>m³</displayName>
+				<unitPattern count="one">{0}m³</unitPattern>
+				<unitPattern count="other">{0}m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0}cm³</unitPattern>
+				<unitPattern count="other">{0}cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>mi³</displayName>
+				<unitPattern count="one">{0}mi³</unitPattern>
+				<unitPattern count="other">{0}mi³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>yd³</displayName>
+				<unitPattern count="one">{0}yd³</unitPattern>
+				<unitPattern count="other">{0}yd³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0}ft³</unitPattern>
+				<unitPattern count="other">{0}ft³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0}in³</unitPattern>
+				<unitPattern count="other">{0}in³</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0}ML</unitPattern>
+				<unitPattern count="other">{0}ML</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hL</displayName>
+				<unitPattern count="one">{0}hL</unitPattern>
+				<unitPattern count="other">{0}hL</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>llitru</displayName>
+				<unitPattern count="one">{0}l</unitPattern>
+				<unitPattern count="other">{0}l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0}dL</unitPattern>
+				<unitPattern count="other">{0}dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="one">{0}cL</unitPattern>
+				<unitPattern count="other">{0}cL</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>mL</displayName>
+				<unitPattern count="one">{0}mL</unitPattern>
+				<unitPattern count="other">{0}mL</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0}mpt</unitPattern>
+				<unitPattern count="other">{0}mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>taces mét.</displayName>
+				<unitPattern count="one">{0}mc</unitPattern>
+				<unitPattern count="other">{0}mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acre ft</displayName>
+				<unitPattern count="one">{0}ac ft</unitPattern>
+				<unitPattern count="other">{0}ac ft</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>bushel</displayName>
+				<unitPattern count="one">{0}bu</unitPattern>
+				<unitPattern count="other">{0}bu</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0}gal</unitPattern>
+				<unitPattern count="other">{0}gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>qt</displayName>
+				<unitPattern count="one">{0}qt</unitPattern>
+				<unitPattern count="other">{0}qt</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0}pt</unitPattern>
+				<unitPattern count="other">{0}pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>taces</displayName>
+				<unitPattern count="one">{0}tz</unitPattern>
+				<unitPattern count="other">{0}tz</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0}fl oz</unitPattern>
+				<unitPattern count="other">{0}fl oz</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>tbsp</displayName>
+				<unitPattern count="one">{0}tbsp</unitPattern>
+				<unitPattern count="other">{0}tbsp</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>tsp</displayName>
+				<unitPattern count="one">{0}tsp</unitPattern>
+				<unitPattern count="other">{0}tsp</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}O</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<durationUnit type="hm">
+			<durationUnitPattern>h:mm</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="hms">
+			<durationUnitPattern>h:mm:ss</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="ms">
+			<durationUnitPattern>m:ss</durationUnitPattern>
+		</durationUnit>
+	</units>
+	<listPatterns>
+		<listPattern>
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0} y {1}</listPatternPart>
+			<listPatternPart type="2">{0} y {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0} y {1}</listPatternPart>
+			<listPatternPart type="2">{0} y {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-narrow">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0} y {1}</listPatternPart>
+			<listPatternPart type="2">{0} y {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-short">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0} y {1}</listPatternPart>
+			<listPatternPart type="2">{0} y {1}</listPatternPart>
+		</listPattern>
+	</listPatterns>
+	<posix>
+		<messages>
+			<yesstr>sí:s</yesstr>
+			<nostr>non:n</nostr>
+		</messages>
+	</posix>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ast_ES.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ast_ES.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ast_ES.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ast_ES.xml
index 025527dc974..3cd332153a6 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ast_ES.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ast_ES.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ast"/>
 		<territory type="ES"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/az.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az.xml
similarity index 90%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/az.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az.xml
index c163b004578..ab2c120a644 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/az.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="az"/>
 	</identity>
 	<localeDisplayNames>
@@ -19,28 +18,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<languages>
 			<language type="aa">afarca</language>
 			<language type="ab">abxaz</language>
-			<language type="ace">akin dili</language>
-			<language type="ach">akoli dili</language>
-			<language type="ada">adangme dili</language>
-			<language type="ady">aduge dili</language>
+			<language type="ace">akin</language>
+			<language type="ach">akoli</language>
+			<language type="ada">adangme</language>
+			<language type="ady">aduge</language>
 			<language type="ae">avestanca</language>
 			<language type="af">afrikaans</language>
-			<language type="afh">afrihili dili</language>
+			<language type="afh">afrihili</language>
 			<language type="agq">aqhem</language>
 			<language type="ain">aynuca</language>
 			<language type="ak">akanca</language>
 			<language type="akk">akadianca</language>
 			<language type="ale">aleutca</language>
-			<language type="alt" draft="contributed">cənub altay dili</language>
+			<language type="alt" draft="contributed">cənub altay</language>
 			<language type="am">amhar</language>
 			<language type="an">aragonca</language>
 			<language type="ang" draft="contributed">qədimi ingiliscə</language>
-			<language type="anp">angikə dili</language>
+			<language type="anp">angikə</language>
 			<language type="ar">ərəb</language>
 			<language type="ar_001">Modern Standart Ərəbcə</language>
-			<language type="arc">aramik dili</language>
+			<language type="arc">aramik</language>
 			<language type="arn">araukanca</language>
-			<language type="arp">arapaho dili</language>
+			<language type="arp">arapaho</language>
 			<language type="arw">aravakça</language>
 			<language type="as">assam</language>
 			<language type="asa">asu</language>
@@ -48,86 +47,88 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="av">avarikcə</language>
 			<language type="awa">avadicə</language>
 			<language type="ay">aymarca</language>
-			<language type="az">azərbaycan</language>
+			<language type="az">azərbaycan dili</language>
 			<language type="az" alt="short">azəri</language>
+			<language type="az_Arab">cənubi azərbaycan</language>
 			<language type="ba">başqırd</language>
-			<language type="bal">baluc dili</language>
+			<language type="bal">baluc</language>
 			<language type="ban">balincə</language>
-			<language type="bas">basa dili</language>
+			<language type="bas">basa</language>
 			<language type="be">belarus</language>
-			<language type="bej">beja dili</language>
+			<language type="bej">beja</language>
 			<language type="bem">bemba</language>
 			<language type="bez">bena</language>
 			<language type="bg">bolqar</language>
-			<language type="bho">bxoçpuri dili</language>
-			<language type="bi">bislama dili</language>
+			<language type="bgn">qərbi bəluc</language>
+			<language type="bho">bxoçpuri</language>
+			<language type="bi">bislama</language>
 			<language type="bik">bikolca</language>
-			<language type="bin">bini dili</language>
-			<language type="bla" draft="contributed">siksikə dili</language>
+			<language type="bin">bini</language>
+			<language type="bla" draft="contributed">siksikə</language>
 			<language type="bm">bambara</language>
 			<language type="bn">benqal</language>
 			<language type="bo">tibet</language>
 			<language type="br">Bretonca</language>
-			<language type="bra">braj dili</language>
+			<language type="bra">braj</language>
 			<language type="brx">bodo</language>
 			<language type="bs">bosniak</language>
-			<language type="bua">buryat dili</language>
-			<language type="bug">bugin dili</language>
+			<language type="bua">buryat</language>
+			<language type="bug">bugin</language>
 			<language type="byn">bilincə</language>
 			<language type="ca">katalan</language>
-			<language type="cad">kado dili</language>
-			<language type="car">karib dili</language>
+			<language type="cad">kado</language>
+			<language type="car">karib</language>
 			<language type="cch">atsamca</language>
-			<language type="ce">çeçen dili</language>
-			<language type="ceb">kebuano dili</language>
+			<language type="ce">çeçen</language>
+			<language type="ceb">kebuano</language>
 			<language type="cgg">çiqa</language>
-			<language type="ch">çamoro dili</language>
-			<language type="chb">çibçə dili</language>
-			<language type="chg">çağatay dili</language>
-			<language type="chk">çukiz dili</language>
-			<language type="chm" draft="contributed">mari dili</language>
+			<language type="ch">çamoro</language>
+			<language type="chb">çibçə</language>
+			<language type="chg">çağatay</language>
+			<language type="chk">çukiz</language>
+			<language type="chm" draft="contributed">mari</language>
 			<language type="chn">çinuk ləhçəsi</language>
-			<language type="cho">çoktau dili</language>
-			<language type="chp">çipevyan dili</language>
+			<language type="cho">çoktau</language>
+			<language type="chp">çipevyan</language>
 			<language type="chr">çiroki</language>
-			<language type="chy">çeyen dili</language>
+			<language type="chy">çeyen</language>
 			<language type="ckb">sorani kürd</language>
 			<language type="co">korsika</language>
-			<language type="cop">kopt dili</language>
+			<language type="cop">kopt</language>
 			<language type="cr">kri dili</language>
 			<language type="crh">krım türkçə</language>
 			<language type="cs">çex</language>
-			<language type="csb" draft="contributed">kaşubyan dili</language>
-			<language type="cu">kilsə slav dili</language>
-			<language type="cv">çuvaş dili</language>
+			<language type="csb" draft="contributed">kaşubyan</language>
+			<language type="cu">kilsə slav</language>
+			<language type="cv">çuvaş</language>
 			<language type="cy">uels</language>
 			<language type="da">danimarka</language>
-			<language type="dak">dakota dili</language>
-			<language type="dar">darqva dili</language>
+			<language type="dak">dakota</language>
+			<language type="dar">darqva</language>
 			<language type="dav">taita</language>
 			<language type="de">alman</language>
 			<language type="de_AT">Avstriya almancası</language>
 			<language type="de_CH">İsveçrə yüksək almancası</language>
-			<language type="del">delaver dili</language>
+			<language type="del">delaver</language>
 			<language type="den" draft="contributed">slavey</language>
-			<language type="dgr">doqrib dili</language>
-			<language type="din">dinka dili</language>
+			<language type="dgr">doqrib</language>
+			<language type="din">dinka</language>
 			<language type="dje">zarma</language>
-			<language type="doi">doqri dili</language>
+			<language type="doi">doqri</language>
 			<language type="dsb">aşağı sorb</language>
 			<language type="dua">duala</language>
 			<language type="dum" draft="contributed">ortacaq hollandca</language>
-			<language type="dv">diveh dili</language>
+			<language type="dv">diveh</language>
 			<language type="dyo">diola</language>
-			<language type="dyu">dyula dili</language>
+			<language type="dyu">dyula</language>
 			<language type="dz">dzonqa</language>
 			<language type="ebu">embu</language>
 			<language type="ee">eve</language>
-			<language type="efi">efik dili</language>
-			<language type="egy">qədimi misir dili</language>
-			<language type="eka">ekacuk dili</language>
+			<language type="efi">efik</language>
+			<language type="egy">qədimi misir</language>
+			<language type="eka">ekacuk</language>
 			<language type="el">yunan</language>
-			<language type="elx">elamit dili</language>
+			<language type="elx">elamit</language>
 			<language type="en">ingilis</language>
 			<language type="en_AU">Avstraliya ingiliscəsi</language>
 			<language type="en_CA">Kanada ingiliscəsi</language>
@@ -143,229 +144,232 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="es_MX">Meksika ispancası</language>
 			<language type="et">eston</language>
 			<language type="eu">bask</language>
-			<language type="ewo">evondo dili</language>
+			<language type="ewo">evondo</language>
 			<language type="fa">fars</language>
-			<language type="fan">fang dili</language>
-			<language type="fat">fanti dili</language>
-			<language type="ff">fula dili</language>
+			<language type="fan">fang</language>
+			<language type="fat">fanti</language>
+			<language type="ff">fula</language>
 			<language type="fi">fin</language>
 			<language type="fil">filippin</language>
 			<language type="fj">fici</language>
 			<language type="fo">farer</language>
-			<language type="fon">fon dili</language>
+			<language type="fon">fon</language>
 			<language type="fr">fransız</language>
 			<language type="fr_CA">Kanada fransızcası</language>
 			<language type="fr_CH">İsveçrə fransızcası</language>
 			<language type="frm" draft="contributed">ortacaq fransızca</language>
 			<language type="fro" draft="contributed">qədimi fransızca</language>
-			<language type="frr" draft="contributed">şimal fris dili</language>
-			<language type="fur">friul dili</language>
+			<language type="frr" draft="contributed">şimal fris</language>
+			<language type="fur">friul</language>
 			<language type="fy">qərbi friz</language>
 			<language type="ga">irland</language>
-			<language type="gaa">qa dili</language>
+			<language type="gaa">qa</language>
 			<language type="gag">qaqauz</language>
-			<language type="gay">qayo dili</language>
-			<language type="gba">qabaya dili</language>
-			<language type="gd" draft="contributed">skot gaelik dili</language>
-			<language type="gez">qez dili</language>
+			<language type="gay">qayo</language>
+			<language type="gba">qabaya</language>
+			<language type="gd" draft="contributed">skot gaelik</language>
+			<language type="gez">qez</language>
 			<language type="gil">qilbert gili</language>
 			<language type="gl">qalisian</language>
 			<language type="gmh" draft="contributed">ortacaq yüksək almanca</language>
 			<language type="gn">quarani</language>
 			<language type="goh" draft="contributed">qədimi almanca</language>
-			<language type="gon">qondi dili</language>
-			<language type="gor">qorontalo dili</language>
+			<language type="gon">qondi</language>
+			<language type="gor">qorontalo</language>
 			<language type="got">gotça</language>
-			<language type="grb">qrebo dili</language>
+			<language type="grb">qrebo</language>
 			<language type="grc">qədimi yunanca</language>
 			<language type="gsw">İsveçrə almancası</language>
 			<language type="gu">qucarat</language>
 			<language type="guz">qusi</language>
 			<language type="gv">manks</language>
-			<language type="gwi">qviçin dili</language>
+			<language type="gwi">qviçin</language>
 			<language type="ha">hausa</language>
-			<language type="hai">hayda dili</language>
+			<language type="hai">hayda</language>
 			<language type="haw">havay</language>
 			<language type="he">ivrit</language>
 			<language type="hi">hindi</language>
-			<language type="hil" draft="contributed">hiliqaynon dili</language>
-			<language type="hit" draft="contributed">hittit dili</language>
-			<language type="hmn" draft="contributed">monq dili</language>
-			<language type="ho" draft="contributed">hiri motu dili</language>
+			<language type="hil" draft="contributed">hiliqaynon</language>
+			<language type="hit" draft="contributed">hittit</language>
+			<language type="hmn" draft="contributed">monq</language>
+			<language type="ho" draft="contributed">hiri motu</language>
 			<language type="hr">xorvat</language>
 			<language type="hsb">yuxarı sorb</language>
 			<language type="ht">haiti</language>
 			<language type="hu">macar</language>
-			<language type="hup" draft="contributed">hupa dili</language>
+			<language type="hup" draft="contributed">hupa</language>
 			<language type="hy">erməni</language>
-			<language type="hz" draft="contributed">Herer dili</language>
-			<language type="ia" draft="contributed">interlingua dili</language>
-			<language type="iba" draft="contributed">iban dili</language>
+			<language type="hz" draft="contributed">Herer</language>
+			<language type="ia" draft="contributed">interlingua</language>
+			<language type="iba" draft="contributed">iban</language>
 			<language type="id">indonez</language>
-			<language type="ie" draft="contributed">interlingue dili</language>
+			<language type="ie" draft="contributed">interlingue</language>
 			<language type="ig">iqbo</language>
 			<language type="ii">siçuan yi</language>
-			<language type="ik" draft="contributed">inupiaq dili</language>
-			<language type="ilo" draft="contributed">iloko dili</language>
-			<language type="inh" draft="contributed">inquş dili</language>
-			<language type="io" draft="contributed">ido dili</language>
+			<language type="ik" draft="contributed">inupiaq</language>
+			<language type="ilo" draft="contributed">iloko</language>
+			<language type="inh" draft="contributed">inquş</language>
+			<language type="io" draft="contributed">ido</language>
 			<language type="is">island</language>
 			<language type="it">italyan</language>
 			<language type="iu">inuktitut</language>
 			<language type="ja">yapon</language>
-			<language type="jbo" draft="contributed">loğban dili</language>
+			<language type="jbo" draft="contributed">loğban</language>
 			<language type="jgo">nqomba</language>
 			<language type="jmc">maçam</language>
 			<language type="jpr" draft="contributed">judo-farsca</language>
 			<language type="jrb" draft="contributed">jude-ərəbcə</language>
 			<language type="jv">yava</language>
 			<language type="ka">gürcü</language>
-			<language type="kaa" draft="contributed">qara-qalpaq dili</language>
+			<language type="kaa" draft="contributed">qara-qalpaq</language>
 			<language type="kab">kabile</language>
 			<language type="kac" draft="contributed">kaçinca</language>
-			<language type="kaj" draft="contributed">ju dili</language>
+			<language type="kaj" draft="contributed">ju</language>
 			<language type="kam">kamba</language>
-			<language type="kaw" draft="contributed">kavi dili</language>
+			<language type="kaw" draft="contributed">kavi</language>
 			<language type="kbd" draft="contributed">kabardca</language>
-			<language type="kcg" draft="contributed">tiyap dili</language>
+			<language type="kcg" draft="contributed">tiyap</language>
 			<language type="kde">makond</language>
 			<language type="kea">kabuverdian</language>
-			<language type="kfo" draft="contributed">koro dili</language>
-			<language type="kg" draft="contributed">konqo dili</language>
-			<language type="kha" draft="contributed">xazi dili</language>
-			<language type="kho" draft="contributed">xotan dili</language>
+			<language type="kfo" draft="contributed">koro</language>
+			<language type="kg" draft="contributed">konqo</language>
+			<language type="kha" draft="contributed">xazi</language>
+			<language type="kho" draft="contributed">xotan</language>
 			<language type="khq">koyra çiini</language>
 			<language type="ki">kikuyu</language>
-			<language type="kj" draft="contributed">kuanyama dili</language>
+			<language type="kj" draft="contributed">kuanyama</language>
 			<language type="kk">qazax</language>
 			<language type="kl">kalaallisut</language>
 			<language type="kln">kalencin</language>
 			<language type="km">kxmer</language>
-			<language type="kmb" draft="contributed">kimbundu dili</language>
+			<language type="kmb" draft="contributed">kimbundu</language>
 			<language type="kn">kannada</language>
 			<language type="ko">koreya</language>
 			<language type="koi">komi-permyak</language>
 			<language type="kok">konkan</language>
-			<language type="kos" draft="contributed">kosreyan dili</language>
-			<language type="kpe" draft="contributed">kpelle dili</language>
-			<language type="kr" draft="contributed">kanur dili</language>
-			<language type="krc" draft="contributed">qaraçay-balkar dili</language>
-			<language type="krl" draft="contributed">karelyan dili</language>
-			<language type="kru" draft="contributed">kurux dili</language>
+			<language type="kos" draft="contributed">kosreyan</language>
+			<language type="kpe" draft="contributed">kpelle</language>
+			<language type="kr" draft="contributed">kanur</language>
+			<language type="krc" draft="contributed">qaraçay-balkar</language>
+			<language type="krl" draft="contributed">karelyan</language>
+			<language type="kru" draft="contributed">kurux</language>
 			<language type="ks">kaşmir</language>
 			<language type="ksb">şambala</language>
 			<language type="ksf">bafia</language>
 			<language type="ku">kürd</language>
-			<language type="kum" draft="contributed">kumuk dili</language>
-			<language type="kut" draft="contributed">kutenay dili</language>
-			<language type="kv" draft="contributed">komi dili</language>
+			<language type="kum" draft="contributed">kumuk</language>
+			<language type="kut" draft="contributed">kutenay</language>
+			<language type="kv" draft="contributed">komi</language>
 			<language type="kw">korn</language>
 			<language type="ky">qırğız</language>
 			<language type="la">latın</language>
-			<language type="lad" draft="contributed">ladin dili</language>
+			<language type="lad" draft="contributed">ladin</language>
 			<language type="lag">langi</language>
-			<language type="lah" draft="contributed">laxnda dili</language>
-			<language type="lam" draft="contributed">lamba dili</language>
+			<language type="lah" draft="contributed">laxnda</language>
+			<language type="lam" draft="contributed">lamba</language>
 			<language type="lb">lüksemburq</language>
-			<language type="lez" draft="contributed">ləzqi dili</language>
+			<language type="lez" draft="contributed">ləzqi</language>
 			<language type="lg">qanda</language>
-			<language type="li" draft="contributed">limburqiş dili</language>
+			<language type="li" draft="contributed">limburqiş</language>
 			<language type="lkt">lakota</language>
 			<language type="ln">linqala</language>
 			<language type="lo">laos</language>
-			<language type="lol" draft="contributed">monqo dili</language>
-			<language type="loz" draft="contributed">lozi dili</language>
+			<language type="lol" draft="contributed">monqo</language>
+			<language type="loz" draft="contributed">lozi</language>
+			<language type="lrc">şimali luri</language>
 			<language type="lt">litva</language>
 			<language type="lu">luba-katanqa</language>
-			<language type="lua" draft="contributed">luba-lulua dili</language>
-			<language type="lui" draft="contributed">luyseno dili</language>
-			<language type="lun" draft="contributed">lunda dili</language>
+			<language type="lua" draft="contributed">luba-lulua</language>
+			<language type="lui" draft="contributed">luyseno</language>
+			<language type="lun" draft="contributed">lunda</language>
 			<language type="luo">luo</language>
 			<language type="lus" draft="contributed">lushayca</language>
 			<language type="luy">luyia</language>
 			<language type="lv">latış</language>
-			<language type="mad" draft="contributed">maduriz dili</language>
-			<language type="mag" draft="contributed">maqahi dili</language>
-			<language type="mai" draft="contributed">maitili dili</language>
-			<language type="mak" draft="contributed">makasar dili</language>
-			<language type="man" draft="contributed">məndinqo dili</language>
+			<language type="mad" draft="contributed">maduriz</language>
+			<language type="mag" draft="contributed">maqahi</language>
+			<language type="mai" draft="contributed">maitili</language>
+			<language type="mak" draft="contributed">makasar</language>
+			<language type="man" draft="contributed">məndinqo</language>
 			<language type="mas">masay</language>
-			<language type="mdf" draft="contributed">mokşa dili</language>
-			<language type="mdr" draft="contributed">mandar dili</language>
-			<language type="men" draft="contributed">mende dili</language>
+			<language type="mdf" draft="contributed">mokşa</language>
+			<language type="mdr" draft="contributed">mandar</language>
+			<language type="men" draft="contributed">mende</language>
 			<language type="mer">meru</language>
 			<language type="mfe">morisien</language>
 			<language type="mg">malaqas</language>
 			<language type="mga" draft="contributed">ortacaq irlandca</language>
 			<language type="mgh">maxuva-meetto</language>
 			<language type="mgo">meta’</language>
-			<language type="mh" draft="contributed">marşal dili</language>
+			<language type="mh" draft="contributed">marşal</language>
 			<language type="mi">maori</language>
-			<language type="mic" draft="contributed">mikmak dili</language>
-			<language type="min" draft="contributed">minanqkaban dili</language>
+			<language type="mic" draft="contributed">mikmak</language>
+			<language type="min" draft="contributed">minanqkaban</language>
 			<language type="mk">makedon</language>
 			<language type="ml">malayalam</language>
 			<language type="mn">monqol</language>
-			<language type="mnc" draft="contributed">mançu dili</language>
-			<language type="mni" draft="contributed">manipüri dili</language>
+			<language type="mnc" draft="contributed">mançu</language>
+			<language type="mni" draft="contributed">manipüri</language>
 			<language type="moh">mohavk</language>
-			<language type="mos" draft="contributed">mosi dili</language>
+			<language type="mos" draft="contributed">mosi</language>
 			<language type="mr">marati</language>
 			<language type="ms">malay</language>
 			<language type="mt">malta</language>
 			<language type="mua">mundanq</language>
 			<language type="mul" draft="contributed">digər dillər</language>
-			<language type="mus">krik dili</language>
-			<language type="mwl" draft="contributed">mirand dili</language>
-			<language type="mwr" draft="contributed">maruari dili</language>
+			<language type="mus">krik</language>
+			<language type="mwl" draft="contributed">mirand</language>
+			<language type="mwr" draft="contributed">maruari</language>
 			<language type="my">birma</language>
-			<language type="myv">erzya dili</language>
-			<language type="na" draft="contributed">nauru dili</language>
-			<language type="nap" draft="contributed">neapolital dili</language>
+			<language type="myv">erzya</language>
+			<language type="mzn">mazandaran</language>
+			<language type="na" draft="contributed">nauru</language>
+			<language type="nap" draft="contributed">neapolital</language>
 			<language type="naq">nama</language>
 			<language type="nb">bokmal norveç</language>
 			<language type="nd">şimali ndebele</language>
 			<language type="nds" draft="contributed">aşağı almanca</language>
+			<language type="nds_NL">aşağı sakson</language>
 			<language type="ne">nepal</language>
-			<language type="new" draft="contributed">nevari dili</language>
-			<language type="ng" draft="contributed">nqonka dili</language>
-			<language type="nia" draft="contributed">nyas dili</language>
-			<language type="niu" draft="contributed">niyuan dili</language>
+			<language type="new" draft="contributed">nevari</language>
+			<language type="ng" draft="contributed">nqonka</language>
+			<language type="nia" draft="contributed">nyas</language>
+			<language type="niu" draft="contributed">niyuan</language>
 			<language type="nl">holland</language>
 			<language type="nl_BE">flamand</language>
 			<language type="nmg">kvasio</language>
 			<language type="nn">nünorsk norveç</language>
-			<language type="no" draft="contributed">norveç dili</language>
-			<language type="nog" draft="contributed">noqay dili</language>
+			<language type="no" draft="contributed">norveç</language>
+			<language type="nog" draft="contributed">noqay</language>
 			<language type="non" draft="contributed">qədimi norsca</language>
 			<language type="nqo">nqo</language>
-			<language type="nr" draft="contributed">cənub ndebele dili</language>
-			<language type="nso" draft="contributed">şimal soto dili</language>
+			<language type="nr" draft="contributed">cənub ndebele</language>
+			<language type="nso" draft="contributed">şimal soto</language>
 			<language type="nus">nuer</language>
-			<language type="nv" draft="contributed">navayo dili</language>
-			<language type="ny" draft="contributed">nyanca dili</language>
-			<language type="nym" draft="contributed">nyamvezi dili</language>
+			<language type="nv" draft="contributed">navayo</language>
+			<language type="ny" draft="contributed">nyanca</language>
+			<language type="nym" draft="contributed">nyamvezi</language>
 			<language type="nyn">nyankol</language>
-			<language type="nyo" draft="contributed">niyoro dili</language>
-			<language type="nzi" draft="contributed">nizima dili</language>
+			<language type="nyo" draft="contributed">niyoro</language>
+			<language type="nzi" draft="contributed">nizima</language>
 			<language type="oc" draft="contributed">oksitanca</language>
-			<language type="oj" draft="contributed">ocibva dili</language>
+			<language type="oj" draft="contributed">ocibva</language>
 			<language type="om">oromo</language>
 			<language type="or">oriya</language>
-			<language type="os" draft="contributed">osetik dili</language>
-			<language type="osa" draft="contributed">osage dili</language>
-			<language type="ota" draft="contributed">osman dili</language>
+			<language type="os" draft="contributed">osetik</language>
+			<language type="osa" draft="contributed">osage</language>
+			<language type="ota" draft="contributed">osman</language>
 			<language type="pa">pəncab</language>
-			<language type="pag" draft="contributed">panqasinan dili</language>
-			<language type="pal" draft="contributed">paxlavi dili</language>
-			<language type="pam" draft="contributed">pampanqa dili</language>
-			<language type="pap" draft="contributed">papyamento dili</language>
+			<language type="pag" draft="contributed">panqasinan</language>
+			<language type="pal" draft="contributed">paxlavi</language>
+			<language type="pam" draft="contributed">pampanqa</language>
+			<language type="pap" draft="contributed">papyamento</language>
 			<language type="pau" draft="contributed">palayanca</language>
 			<language type="peo" draft="contributed">qədimi farsca</language>
-			<language type="phn" draft="contributed">foyenik dili</language>
-			<language type="pi" draft="contributed">pali dili</language>
+			<language type="phn" draft="contributed">foyenik</language>
+			<language type="pi" draft="contributed">pali</language>
 			<language type="pl">polyak</language>
-			<language type="pon" draft="contributed">ponpeyan dili</language>
+			<language type="pon" draft="contributed">ponpeyan</language>
 			<language type="pro" draft="contributed">qədimi provensialca</language>
 			<language type="ps">puştu</language>
 			<language type="pt">portuqal</language>
@@ -373,138 +377,139 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="pt_PT">Portuqaliya portuqalcası</language>
 			<language type="qu">keçua</language>
 			<language type="quc">kiçe</language>
-			<language type="raj" draft="contributed">racastan dili</language>
-			<language type="rap" draft="contributed">rapanu dili</language>
-			<language type="rar" draft="contributed">rarotonqan dili</language>
+			<language type="raj" draft="contributed">racastan</language>
+			<language type="rap" draft="contributed">rapanu</language>
+			<language type="rar" draft="contributed">rarotonqan</language>
 			<language type="rm">retoroman</language>
 			<language type="rn">rundi</language>
 			<language type="ro">rumın</language>
 			<language type="ro_MD">moldav</language>
 			<language type="rof">rombo</language>
-			<language type="rom" draft="contributed">roman dili</language>
-			<language type="root" draft="contributed">rut dili</language>
+			<language type="rom" draft="contributed">roman</language>
+			<language type="root" draft="contributed">rut</language>
 			<language type="ru">rus</language>
 			<language type="rup">aromanca</language>
 			<language type="rw">kinyarvanda</language>
 			<language type="rwk">rua</language>
 			<language type="sa">sanskrit</language>
-			<language type="sad" draft="contributed">sandave dili</language>
-			<language type="sah" draft="contributed">yakut dili</language>
-			<language type="sam" draft="contributed">samaritan dili</language>
+			<language type="sad" draft="contributed">sandave</language>
+			<language type="sah" draft="contributed">yakut</language>
+			<language type="sam" draft="contributed">samaritan</language>
 			<language type="saq">samburu</language>
-			<language type="sas" draft="contributed">sasak dili</language>
-			<language type="sat" draft="contributed">santal dili</language>
+			<language type="sas" draft="contributed">sasak</language>
+			<language type="sat" draft="contributed">santal</language>
 			<language type="sbp">sanqu</language>
-			<language type="sc" draft="contributed">sardin dili</language>
-			<language type="scn" draft="contributed">sisili dili</language>
-			<language type="sco" draft="contributed">skots dili</language>
+			<language type="sc" draft="contributed">sardin</language>
+			<language type="scn" draft="contributed">sisili</language>
+			<language type="sco" draft="contributed">skots</language>
 			<language type="sd">sindhi</language>
+			<language type="sdh">cənubi kürd</language>
 			<language type="se">şimali sami</language>
 			<language type="seh">sena</language>
-			<language type="sel" draft="contributed">selkup dili</language>
+			<language type="sel" draft="contributed">selkup</language>
 			<language type="ses">koyraboro senni</language>
 			<language type="sg">sanqo</language>
 			<language type="sga" draft="contributed">qədimi irlandca</language>
 			<language type="sh" draft="contributed">serb-xorvatca</language>
 			<language type="shi">taçelit</language>
-			<language type="shn" draft="contributed">şan dili</language>
+			<language type="shn" draft="contributed">şan</language>
 			<language type="si">sinhal</language>
-			<language type="sid" draft="contributed">sidamo dili</language>
+			<language type="sid" draft="contributed">sidamo</language>
 			<language type="sk">slovak</language>
 			<language type="sl">sloven</language>
-			<language type="sm" draft="contributed">samoa dili</language>
+			<language type="sm" draft="contributed">samoa</language>
 			<language type="sma">cənubi sami</language>
 			<language type="smj">lule sami</language>
 			<language type="smn">inari sami</language>
 			<language type="sms">skolt</language>
 			<language type="sn">şona</language>
-			<language type="snk" draft="contributed">soninke dili</language>
+			<language type="snk" draft="contributed">soninke</language>
 			<language type="so">somali</language>
-			<language type="sog" draft="contributed">soqdiyen dili</language>
+			<language type="sog" draft="contributed">soqdiyen</language>
 			<language type="sq">alban</language>
 			<language type="sr">serb</language>
-			<language type="srn" draft="contributed">sranan tonqo dili</language>
+			<language type="srn" draft="contributed">sranan tonqo</language>
 			<language type="srr" draft="contributed">serer dilii</language>
-			<language type="ss" draft="contributed">svati dili</language>
-			<language type="st" draft="contributed">Sesoto dili</language>
-			<language type="su">sudan</language>
-			<language type="suk" draft="contributed">sukuma dili</language>
-			<language type="sus" draft="contributed">susu dili</language>
-			<language type="sux" draft="contributed">sumeryan dili</language>
+			<language type="ss" draft="contributed">svati</language>
+			<language type="st" draft="contributed">Sesoto</language>
+			<language type="suk" draft="contributed">sukuma</language>
+			<language type="sus" draft="contributed">susu</language>
+			<language type="sux" draft="contributed">sumeryan</language>
 			<language type="sv">isveç</language>
 			<language type="sw">suahili</language>
-			<language type="swc">Konqo suahilicəsi</language>
-			<language type="syr" draft="contributed">siryak dili</language>
+			<language type="sw_CD">Konqo suahilicəsi</language>
+			<language type="syr" draft="contributed">siryak</language>
 			<language type="ta">tamil</language>
 			<language type="te">teluqu</language>
-			<language type="tem" draft="contributed">timne dili</language>
+			<language type="tem" draft="contributed">timne</language>
 			<language type="teo">teso</language>
-			<language type="ter" draft="contributed">tereno dili</language>
-			<language type="tet" draft="contributed">tetum dili</language>
+			<language type="ter" draft="contributed">tereno</language>
+			<language type="tet" draft="contributed">tetum</language>
 			<language type="tg">tacik</language>
 			<language type="th">tay</language>
 			<language type="ti">tiqrin</language>
-			<language type="tig" draft="contributed">tiqre dili</language>
-			<language type="tiv" draft="contributed">tiv dili</language>
+			<language type="tig" draft="contributed">tiqre</language>
+			<language type="tiv" draft="contributed">tiv</language>
 			<language type="tk">türkmən</language>
-			<language type="tkl" draft="contributed">tokelay dili</language>
-			<language type="tl" draft="contributed">taqaloq dili</language>
+			<language type="tkl" draft="contributed">tokelay</language>
+			<language type="tl" draft="contributed">taqaloq</language>
 			<language type="tlh" draft="contributed">klinqon</language>
-			<language type="tli" draft="contributed">tlinqit dili</language>
-			<language type="tmh" draft="contributed">tamaşek dili</language>
-			<language type="tn" draft="contributed">svana dili</language>
+			<language type="tli" draft="contributed">tlinqit</language>
+			<language type="tmh" draft="contributed">tamaşek</language>
+			<language type="tn" draft="contributed">svana</language>
 			<language type="to">tonqa</language>
-			<language type="tog" draft="contributed">niyasa tonga dili</language>
-			<language type="tpi" draft="contributed">tok pisin dili</language>
+			<language type="tog" draft="contributed">niyasa tonga</language>
+			<language type="tpi" draft="contributed">tok pisin</language>
 			<language type="tr">türk</language>
-			<language type="ts" draft="contributed">sonqa dili</language>
-			<language type="tsi" draft="contributed">simşyan dili</language>
+			<language type="ts" draft="contributed">sonqa</language>
+			<language type="tsi" draft="contributed">simşyan</language>
 			<language type="tt">tatar</language>
-			<language type="tum" draft="contributed">tumbuka dili</language>
-			<language type="tvl" draft="contributed">tuvalu dili</language>
-			<language type="tw" draft="contributed">Tvi dili</language>
+			<language type="tum" draft="contributed">tumbuka</language>
+			<language type="tvl" draft="contributed">tuvalu</language>
+			<language type="tw" draft="contributed">Tvi</language>
 			<language type="twq">tasavaq</language>
-			<language type="ty" draft="contributed">taxiti dili</language>
-			<language type="tyv" draft="contributed">tuvinyan dili</language>
+			<language type="ty" draft="contributed">taxiti</language>
+			<language type="tyv" draft="contributed">tuvinyan</language>
 			<language type="tzm">Mərkəzi Atlas tamazicəsi</language>
-			<language type="udm" draft="contributed">udmurt dili</language>
+			<language type="udm" draft="contributed">udmurt</language>
 			<language type="ug">uyğur</language>
-			<language type="uga" draft="contributed">uqaritik dili</language>
+			<language type="uga" draft="contributed">uqaritik</language>
 			<language type="uk">ukrayna</language>
-			<language type="umb" draft="contributed">umbundu dili</language>
+			<language type="umb" draft="contributed">umbundu</language>
 			<language type="und">naməlum dil</language>
 			<language type="ur">urdu</language>
 			<language type="uz">özbək</language>
 			<language type="vai">vai</language>
-			<language type="ve" draft="contributed">venda dili</language>
+			<language type="ve" draft="contributed">venda</language>
 			<language type="vi">vyetnam</language>
-			<language type="vo" draft="contributed">volapük dili</language>
-			<language type="vot" draft="contributed">votik dili</language>
+			<language type="vo" draft="contributed">volapük</language>
+			<language type="vot" draft="contributed">votik</language>
 			<language type="vun">vunyo</language>
-			<language type="wa" draft="contributed">valun dili</language>
-			<language type="wal" draft="contributed">valamo dili</language>
-			<language type="war" draft="contributed">varay dili</language>
-			<language type="was" draft="contributed">vaşo dili</language>
+			<language type="wa" draft="contributed">valun</language>
+			<language type="wal" draft="contributed">valamo</language>
+			<language type="war" draft="contributed">varay</language>
+			<language type="was" draft="contributed">vaşo</language>
+			<language type="wbp">Valpiri</language>
 			<language type="wo">volof</language>
 			<language type="xal" draft="contributed">kalmıqca</language>
 			<language type="xh">xosa</language>
 			<language type="xog">soqa</language>
-			<language type="yao" draft="contributed">yao dili</language>
-			<language type="yap" draft="contributed">yapiz dili</language>
-			<language type="yi" draft="contributed">Yahudi dili</language>
+			<language type="yao" draft="contributed">yao</language>
+			<language type="yap" draft="contributed">yapiz</language>
+			<language type="yi" draft="contributed">Yahudi</language>
 			<language type="yo">yoruba</language>
-			<language type="za" draft="contributed">juənq dili</language>
-			<language type="zap" draft="contributed">zapotek dili</language>
-			<language type="zbl">blisimbols dili</language>
-			<language type="zen" draft="contributed">zenaqa dili</language>
+			<language type="za" draft="contributed">juənq</language>
+			<language type="zap" draft="contributed">zapotek</language>
+			<language type="zbl">blisimbols</language>
+			<language type="zen" draft="contributed">zenaqa</language>
 			<language type="zgh">tamazi</language>
 			<language type="zh">çin</language>
 			<language type="zh_Hans">sadələşmiş çin</language>
 			<language type="zh_Hant">ənənəvi çin</language>
 			<language type="zu">zulu</language>
-			<language type="zun" draft="contributed">zuni dili</language>
+			<language type="zun" draft="contributed">zuni</language>
 			<language type="zxx">dil məzmunu yoxdur</language>
-			<language type="zza" draft="contributed">zaza dili</language>
+			<language type="zza" draft="contributed">zaza</language>
 		</languages>
 		<scripts>
 			<script type="Arab">ərəb</script>
@@ -546,11 +551,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Hang">hanqıl</script>
 			<script type="Hani">han</script>
 			<script type="Hano" draft="contributed">hanunu</script>
-			<script type="Hans">sadələşmiş han</script>
+			<script type="Hans">sadələşmiş</script>
 			<script type="Hans" alt="stand-alone">Sadələşdirilmiş Han</script>
-			<script type="Hant">ənənəvi han</script>
+			<script type="Hant">ənənəvi</script>
 			<script type="Hant" alt="stand-alone">Ənənəvi Han</script>
-			<script type="Hebr">yəhudi</script>
+			<script type="Hebr">ibrani</script>
 			<script type="Hira">iraqana</script>
 			<script type="Hmng" draft="contributed">pahav monq</script>
 			<script type="Hrkt" draft="contributed">katakana vəya hiraqana</script>
@@ -674,7 +679,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angila</territory>
 			<territory type="AL">Albaniya</territory>
 			<territory type="AM">Ermənistan</territory>
-			<territory type="AN" draft="contributed">Hollandiya antilleri</territory>
 			<territory type="AO">Anqola</territory>
 			<territory type="AQ">Antarktika</territory>
 			<territory type="AR">Argentina</territory>
@@ -941,61 +945,74 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="calendar">Təqvim</key>
 			<key type="collation">Çeşidləmə</key>
 			<key type="currency">Valyuta</key>
+			<key type="hc">Saat Sikli (12 / 24)</key>
+			<key type="lb">Sətirdən sətrə keçirmə üslubu</key>
+			<key type="ms">Ölçü Sistemi</key>
 			<key type="numbers">Rəqəmlər</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Ərəb-Hind Rəqəmləri</type>
-			<type type="arabext" key="numbers">Genişlənmiş Ərəb-Hind Rəqəmləri</type>
-			<type type="armn" key="numbers">Erməni Rəqəmləri</type>
-			<type type="armnlow" key="numbers">Kiçik Erməni Rəqəmləri</type>
-			<type type="beng" key="numbers">Benqal Rəqəmləri</type>
-			<type type="buddhist" key="calendar">Buddist Təqvimi</type>
-			<type type="chinese" key="calendar">Çin Təqvimi</type>
-			<type type="dangi" key="calendar">Dangi Təqvimi</type>
-			<type type="deva" key="numbers">Devanaqari Rəqəmləri</type>
-			<type type="ducet" key="collation">Defolt Unicode Çeşidləmə</type>
-			<type type="ethi" key="numbers">Efiop Rəqəmləri</type>
-			<type type="ethiopic" key="calendar">Efiop Təqvimi</type>
-			<type type="fullwide" key="numbers">Tam Geniş Rəqəmlər</type>
-			<type type="geor" key="numbers">Gürcü Rəqəmləri</type>
-			<type type="gregorian" key="calendar">Qreqorian Təqvimi</type>
-			<type type="grek" key="numbers">Yunan Rəqəmləri</type>
-			<type type="greklow" key="numbers">Kiçik Yunan Rəqəmləri</type>
-			<type type="gujr" key="numbers">Qucarat Rəqəmləri</type>
-			<type type="guru" key="numbers">Qurmuxi Rəqəmləri</type>
-			<type type="hanidec" key="numbers">Onluq Çin Rəqəmləri</type>
-			<type type="hans" key="numbers">Sadələşmiş Çin Rəqəmləri</type>
-			<type type="hansfin" key="numbers">Sadələşmiş Çin Maliyyə Rəqəmləri</type>
-			<type type="hant" key="numbers">Ənənəvi Çin Rəqəmləri</type>
-			<type type="hantfin" key="numbers">Ənənəvi Çin Maliyyə Rəqəmləri</type>
-			<type type="hebr" key="numbers">İvrit Rəqəmləri</type>
-			<type type="hebrew" key="calendar">Yəhudi Təqvimi</type>
-			<type type="indian" key="calendar" draft="contributed">Hindi təqvimi</type>
-			<type type="islamic" key="calendar">İslam Təqvimi</type>
-			<type type="islamic-civil" key="calendar" draft="contributed">Ivrit təqvimi</type>
-			<type type="iso8601" key="calendar">ISO-8601 Təqvimi</type>
-			<type type="japanese" key="calendar">Yapon Təqvimi</type>
-			<type type="jpan" key="numbers">Yapon Rəqəmləri</type>
-			<type type="jpanfin" key="numbers">Yapon Maliyyə Rəqəmləri</type>
-			<type type="khmr" key="numbers">Kxmer Rəqəmləri</type>
-			<type type="knda" key="numbers">Kannada Rəqəmləri</type>
-			<type type="laoo" key="numbers">Lao Rəqəmləri</type>
-			<type type="latn" key="numbers">Qərb Rəqəmləri</type>
-			<type type="mlym" key="numbers">Malayalam Rəqəmləri</type>
-			<type type="mymr" key="numbers">Myanma Rəqəmləri</type>
-			<type type="orya" key="numbers">Oriya Rəqəmləri</type>
-			<type type="persian" key="calendar">İran Təqvimi</type>
-			<type type="pinyin" key="collation" draft="contributed">Pinyin təqvimi</type>
-			<type type="roc" key="calendar">Minquo Təqvimi</type>
-			<type type="roman" key="numbers">Rum Rəqəmləri</type>
-			<type type="romanlow" key="numbers">Kiçik Rum Rəqəmləri</type>
-			<type type="search" key="collation">Ümumi Məqsədli Axtarış</type>
-			<type type="standard" key="collation">Standart Çeşidləmə</type>
-			<type type="taml" key="numbers">Ənənəvi Tamil Rəqəmləri</type>
-			<type type="tamldec" key="numbers">Tamil Rəqəmləri</type>
-			<type type="telu" key="numbers">Teluqu Rəqəmləri</type>
-			<type type="thai" key="numbers">Tay Rəqəmləri</type>
-			<type type="tibt" key="numbers">Tibet Rəqəmləri</type>
+			<type key="calendar" type="buddhist">Buddist Təqvimi</type>
+			<type key="calendar" type="chinese">Çin Təqvimi</type>
+			<type key="calendar" type="dangi">Dangi Təqvimi</type>
+			<type key="calendar" type="ethiopic">Efiop Təqvimi</type>
+			<type key="calendar" type="gregorian">Qreqorian Təqvimi</type>
+			<type key="calendar" type="hebrew">Yəhudi Təqvimi</type>
+			<type key="calendar" type="indian" draft="contributed">Hindi təqvimi</type>
+			<type key="calendar" type="islamic">İslam Təqvimi</type>
+			<type key="calendar" type="islamic-civil" draft="contributed">Ivrit təqvimi</type>
+			<type key="calendar" type="iso8601">ISO-8601 Təqvimi</type>
+			<type key="calendar" type="japanese">Yapon Təqvimi</type>
+			<type key="calendar" type="persian">İran Təqvimi</type>
+			<type key="calendar" type="roc">Minquo Təqvimi</type>
+			<type key="collation" type="ducet">Defolt Unicode Çeşidləmə</type>
+			<type key="collation" type="pinyin" draft="contributed">Pinyin təqvimi</type>
+			<type key="collation" type="search">Ümumi Məqsədli Axtarış</type>
+			<type key="collation" type="standard">Standart Çeşidləmə</type>
+			<type key="hc" type="h11">12 Saatlıq Sistem (0–11)</type>
+			<type key="hc" type="h12">12 Saatlıq Sistem (0–12)</type>
+			<type key="hc" type="h23">24 Saatlıq Sistem (0–23)</type>
+			<type key="hc" type="h24">24 Saatlıq Sistem (0–23)</type>
+			<type key="lb" type="loose">Sərbəst sətirdən sətrə keçirmə üslubu</type>
+			<type key="lb" type="normal">Normal sətirdən sətrə keçirmə üslubu</type>
+			<type key="lb" type="strict">Sərt sətirdən sətrə keçirmə üslubu</type>
+			<type key="ms" type="metric">Metrik Sistem</type>
+			<type key="ms" type="uksystem">İmperial Ölçü Sistemi</type>
+			<type key="ms" type="ussystem">ABŞ Ölçü Sistemi</type>
+			<type key="numbers" type="arab">Ərəb-Hind Rəqəmləri</type>
+			<type key="numbers" type="arabext">Genişlənmiş Ərəb-Hind Rəqəmləri</type>
+			<type key="numbers" type="armn">Erməni Rəqəmləri</type>
+			<type key="numbers" type="armnlow">Kiçik Erməni Rəqəmləri</type>
+			<type key="numbers" type="beng">Benqal Rəqəmləri</type>
+			<type key="numbers" type="deva">Devanaqari Rəqəmləri</type>
+			<type key="numbers" type="ethi">Efiop Rəqəmləri</type>
+			<type key="numbers" type="fullwide">Tam Geniş Rəqəmlər</type>
+			<type key="numbers" type="geor">Gürcü Rəqəmləri</type>
+			<type key="numbers" type="grek">Yunan Rəqəmləri</type>
+			<type key="numbers" type="greklow">Kiçik Yunan Rəqəmləri</type>
+			<type key="numbers" type="gujr">Qucarat Rəqəmləri</type>
+			<type key="numbers" type="guru">Qurmuxi Rəqəmləri</type>
+			<type key="numbers" type="hanidec">Onluq Çin Rəqəmləri</type>
+			<type key="numbers" type="hans">Sadələşmiş Çin Rəqəmləri</type>
+			<type key="numbers" type="hansfin">Sadələşmiş Çin Maliyyə Rəqəmləri</type>
+			<type key="numbers" type="hant">Ənənəvi Çin Rəqəmləri</type>
+			<type key="numbers" type="hantfin">Ənənəvi Çin Maliyyə Rəqəmləri</type>
+			<type key="numbers" type="hebr">İvrit Rəqəmləri</type>
+			<type key="numbers" type="jpan">Yapon Rəqəmləri</type>
+			<type key="numbers" type="jpanfin">Yapon Maliyyə Rəqəmləri</type>
+			<type key="numbers" type="khmr">Kxmer Rəqəmləri</type>
+			<type key="numbers" type="knda">Kannada Rəqəmləri</type>
+			<type key="numbers" type="laoo">Lao Rəqəmləri</type>
+			<type key="numbers" type="latn">Qərb Rəqəmləri</type>
+			<type key="numbers" type="mlym">Malayalam Rəqəmləri</type>
+			<type key="numbers" type="mymr">Myanma Rəqəmləri</type>
+			<type key="numbers" type="orya">Oriya Rəqəmləri</type>
+			<type key="numbers" type="roman">Rum Rəqəmləri</type>
+			<type key="numbers" type="romanlow">Kiçik Rum Rəqəmləri</type>
+			<type key="numbers" type="taml">Ənənəvi Tamil Rəqəmləri</type>
+			<type key="numbers" type="tamldec">Tamil Rəqəmləri</type>
+			<type key="numbers" type="telu">Teluqu Rəqəmləri</type>
+			<type key="numbers" type="thai">Tay Rəqəmləri</type>
+			<type key="numbers" type="tibt">Tibet Rəqəmləri</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Metrik</measurementSystemName>
@@ -1075,6 +1092,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d, E</dateFormatItem>
 						<dateFormatItem id="Gy">G y</dateFormatItem>
 						<dateFormatItem id="GyMMM">G MMM y</dateFormatItem>
@@ -1086,6 +1104,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">d MMM, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="y">G y</dateFormatItem>
 						<dateFormatItem id="yyyy">G y</dateFormatItem>
 						<dateFormatItem id="yyyyM">GGGGG MM y</dateFormatItem>
@@ -1094,6 +1113,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">G MMM y</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">G d MMM y</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">G d MMM y, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y MMMM</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">G y QQQ</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">G y QQQQ</dateFormatItem>
 					</availableFormats>
@@ -1375,15 +1395,67 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">a</dayPeriod>
-							<dayPeriod type="noon">g</dayPeriod>
-							<dayPeriod type="pm">p</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">gecəyarı</dayPeriod>
 							<dayPeriod type="am">AM</dayPeriod>
 							<dayPeriod type="noon">günorta</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">sübh</dayPeriod>
+							<dayPeriod type="morning2">səhər</dayPeriod>
+							<dayPeriod type="afternoon1">gündüz</dayPeriod>
+							<dayPeriod type="evening1">axşamüstü</dayPeriod>
+							<dayPeriod type="night1">axşam</dayPeriod>
+							<dayPeriod type="night2">gecə</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">gecəyarı</dayPeriod>
+							<dayPeriod type="am">a</dayPeriod>
+							<dayPeriod type="noon">g</dayPeriod>
+							<dayPeriod type="pm">p</dayPeriod>
+							<dayPeriod type="morning1">sübh</dayPeriod>
+							<dayPeriod type="morning2">səhər</dayPeriod>
+							<dayPeriod type="afternoon1">gündüz</dayPeriod>
+							<dayPeriod type="evening1">axşamüstü</dayPeriod>
+							<dayPeriod type="night1">axşam</dayPeriod>
+							<dayPeriod type="night2">gecə</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">gecəyarı</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">günorta</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">sübh</dayPeriod>
+							<dayPeriod type="morning2">səhər</dayPeriod>
+							<dayPeriod type="afternoon1">gündüz</dayPeriod>
+							<dayPeriod type="evening1">axşamüstü</dayPeriod>
+							<dayPeriod type="night1">axşam</dayPeriod>
+							<dayPeriod type="night2">gecə</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">gecəyarı</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">günorta</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">sübh</dayPeriod>
+							<dayPeriod type="morning2">səhər</dayPeriod>
+							<dayPeriod type="afternoon1">gündüz</dayPeriod>
+							<dayPeriod type="evening1">axşamüstü</dayPeriod>
+							<dayPeriod type="night1">axşam</dayPeriod>
+							<dayPeriod type="night2">gecə</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">gecəyarı</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">günorta</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">sübh</dayPeriod>
+							<dayPeriod type="morning2">səhər</dayPeriod>
+							<dayPeriod type="afternoon1">gündüz</dayPeriod>
+							<dayPeriod type="evening1">axşamüstü</dayPeriod>
+							<dayPeriod type="night1">axşam</dayPeriod>
+							<dayPeriod type="night2">gecə</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1391,8 +1463,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<eraNames>
 						<era type="0">eramızdan əvvəl</era>
 						<era type="0" alt="variant">ümumi eradan öncə</era>
-						<era type="1">bizim eramızın</era>
-						<era type="1" alt="variant">ümumi eranın</era>
+						<era type="1">eramız</era>
+						<era type="1" alt="variant">ümumi era</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">e.ə.</era>
@@ -1484,12 +1556,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">dd.MM</dateFormatItem>
 						<dateFormatItem id="MEd">dd.MM, E</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">d MMM, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">MM.y</dateFormatItem>
@@ -1498,6 +1575,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMEd">d MMM y, E</dateFormatItem>
+						<dateFormatItem id="yMMMM">y MMMM</dateFormatItem>
 						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
 						<dateFormatItem id="yQQQQ">y QQQQ</dateFormatItem>
 					</availableFormats>
@@ -2873,6 +2951,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Moresbi</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Buqanvil</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
 			</zone>
@@ -2957,6 +3038,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>İrkutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Çita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Yakutsk</exemplarCity>
 			</zone>
@@ -2975,6 +3059,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Maqadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolımsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamçatka</exemplarCity>
 			</zone>
@@ -4243,6 +4330,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤ #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">¤ 0K</pattern>
+					<pattern type="1000" count="other">¤ 0K</pattern>
+					<pattern type="10000" count="one">¤ 00K</pattern>
+					<pattern type="10000" count="other">¤ 00K</pattern>
+					<pattern type="100000" count="one">¤ 000K</pattern>
+					<pattern type="100000" count="other">¤ 000K</pattern>
+					<pattern type="1000000" count="one">¤ 0M</pattern>
+					<pattern type="1000000" count="other">¤ 0M</pattern>
+					<pattern type="10000000" count="one">¤ 00M</pattern>
+					<pattern type="10000000" count="other">¤ 00M</pattern>
+					<pattern type="100000000" count="one">¤ 000M</pattern>
+					<pattern type="100000000" count="other">¤ 000M</pattern>
+					<pattern type="1000000000" count="one">¤ 0G</pattern>
+					<pattern type="1000000000" count="other">¤ 0G</pattern>
+					<pattern type="10000000000" count="one">¤ 00G</pattern>
+					<pattern type="10000000000" count="other">¤ 00G</pattern>
+					<pattern type="100000000000" count="one">¤ 000G</pattern>
+					<pattern type="100000000000" count="other">¤ 000G</pattern>
+					<pattern type="1000000000000" count="one">¤ 0T</pattern>
+					<pattern type="1000000000000" count="other">¤ 0T</pattern>
+					<pattern type="10000000000000" count="one">¤ 00T</pattern>
+					<pattern type="10000000000000" count="other">¤ 00T</pattern>
+					<pattern type="100000000000000" count="one">¤ 000T</pattern>
+					<pattern type="100000000000000" count="other">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4357,8 +4472,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Azərbaycan Manatı</displayName>
 				<displayName count="one">Azərbaycan manatı</displayName>
 				<displayName count="other">Azərbaycan manatı</displayName>
-				<symbol>AZN</symbol>
-				<symbol alt="variant">₼</symbol>
+				<symbol>₼</symbol>
 			</currency>
 			<currency type="BAD">
 				<displayName>Bosniya-Herseqovina Dinarı</displayName>
@@ -4370,6 +4484,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Bosniya-Herseqovina markası</displayName>
 				<displayName count="other">Bosniya-Herseqovina markası</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>Barbados Dolları</displayName>
@@ -4624,6 +4739,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Çexiya korunası</displayName>
 				<displayName count="other">Çexiya korunası</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>Şərq Almaniya Ostmarkı</displayName>
@@ -4646,6 +4762,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Danimarka kronu</displayName>
 				<displayName count="other">Danimarka kronu</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Dominika Pesosu</displayName>
@@ -4675,6 +4792,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Misir funtu</displayName>
 				<displayName count="other">Misir funtu</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>Eritreya Nakfası</displayName>
@@ -4750,6 +4868,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Gürcüstan larisi</displayName>
 				<displayName count="other">Gürcüstan larisi</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>Qana Sedisi (1979–2007)</displayName>
@@ -4842,6 +4961,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Xorvatiya kunası</displayName>
 				<displayName count="other">Xorvatiya kunası</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>Haiti Qourdu</displayName>
@@ -4854,6 +4974,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Macarıstan forinti</displayName>
 				<displayName count="other">Macarıstan forinti</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>İndoneziya Rupisi</displayName>
@@ -5008,6 +5129,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Livan funtu</displayName>
 				<displayName count="other">Livan funtu</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>Şri Lanka Rupisi</displayName>
@@ -5297,6 +5419,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Polşa zlotısı</displayName>
 				<displayName count="other">Polşa zlotısı</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>Polşa Zlotısı (1950–1995)</displayName>
@@ -5348,6 +5471,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Rusiya rublu</displayName>
 				<displayName count="other">Rusiya rublu</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>Rusiya Rublu (1991–1998)</displayName>
@@ -5403,6 +5527,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Müqəddəs Yelena funtu</displayName>
 				<displayName count="other">Müqəddəs Yelena funtu</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>Sloveniya Toları</displayName>
@@ -5461,6 +5586,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Suriya funtu</displayName>
 				<displayName count="other">Suriya funtu</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">S£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>Svazilend Lilangenini</displayName>
@@ -5524,6 +5650,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">Türkiyə lirəsi</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Trinidad və Tobaqo Dolları</displayName>
@@ -5796,6 +5923,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} metr saniyə kvadratı</unitPattern>
 				<unitPattern count="other">{0} metr saniyə kvadratı</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>dövrə</displayName>
+				<unitPattern count="one">{0} dövrə</unitPattern>
+				<unitPattern count="other">{0} dövrə</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radian</displayName>
+				<unitPattern count="one">{0} radian</unitPattern>
+				<unitPattern count="other">{0} radian</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>dərəcə</displayName>
+				<unitPattern count="one">{0} dərəcə</unitPattern>
+				<unitPattern count="other">{0} dərəcə</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>dəqiqə</displayName>
 				<unitPattern count="one">{0} dəqiqə</unitPattern>
@@ -5806,30 +5948,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} saniyə</unitPattern>
 				<unitPattern count="other">{0} saniyə</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>dərəcə</displayName>
-				<unitPattern count="one">{0} dərəcə</unitPattern>
-				<unitPattern count="other">{0} dərəcə</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radian</displayName>
-				<unitPattern count="one">{0} radian</unitPattern>
-				<unitPattern count="other">{0} radian</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>akr</displayName>
-				<unitPattern count="one">{0} akr</unitPattern>
-				<unitPattern count="other">{0} akr</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>kvadrat kilometr</displayName>
+				<unitPattern count="one">{0} kvadrat kilometr</unitPattern>
+				<unitPattern count="other">{0} kvadrat kilometr</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektar</displayName>
 				<unitPattern count="one">{0} hektar</unitPattern>
 				<unitPattern count="other">{0} hektar</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>kvadrat metr</displayName>
+				<unitPattern count="one">{0} kvadrat metr</unitPattern>
+				<unitPattern count="other">{0} kvadrat metr</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>kvadrat santimetr</displayName>
 				<unitPattern count="one">{0} kvadrat santimetr</unitPattern>
 				<unitPattern count="other">{0} kvadrat santimetr</unitPattern>
+				<perUnitPattern>{0}/sm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>kvadrat mil</displayName>
+				<unitPattern count="one">{0} kvadrat mil</unitPattern>
+				<unitPattern count="other">{0} kvadrat mil</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>akr</displayName>
+				<unitPattern count="one">{0} akr</unitPattern>
+				<unitPattern count="other">{0} akr</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>kvadrat fut</displayName>
@@ -5840,91 +5994,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>kvadrat düym</displayName>
 				<unitPattern count="one">{0} kvadrat düym</unitPattern>
 				<unitPattern count="other">{0} kvadrat düym</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kvadrat kilometr</displayName>
-				<unitPattern count="one">{0} kvadrat kilometr</unitPattern>
-				<unitPattern count="other">{0} kvadrat kilometr</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>kvadrat metr</displayName>
-				<unitPattern count="one">{0} kvadrat metr</unitPattern>
-				<unitPattern count="other">{0} kvadrat metr</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>kvadrat mil</displayName>
-				<unitPattern count="one">{0} kvadrat mil</unitPattern>
-				<unitPattern count="other">{0} kvadrat mil</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="other">{0} karat</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litr/kilometr</displayName>
 				<unitPattern count="one">{0} litr/kilometr</unitPattern>
 				<unitPattern count="other">{0} litr/kilometr</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} L/100km</unitPattern>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mil/qallon</displayName>
 				<unitPattern count="one">{0} mil/qallon</unitPattern>
 				<unitPattern count="other">{0} mil/qallon</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bayt</displayName>
-				<unitPattern count="one">{0} bayt</unitPattern>
-				<unitPattern count="other">{0} bayt</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>giqabit</displayName>
-				<unitPattern count="one">{0} giqabit</unitPattern>
-				<unitPattern count="other">{0} giqabit</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>giqabayt</displayName>
-				<unitPattern count="one">{0} giqabayt</unitPattern>
-				<unitPattern count="other">{0} giqabayt</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobit</displayName>
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="other">{0} kilobit</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobayt</displayName>
-				<unitPattern count="one">{0} kilobayt</unitPattern>
-				<unitPattern count="other">{0} kilobayt</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>meqabit</displayName>
-				<unitPattern count="one">{0} meqabit</unitPattern>
-				<unitPattern count="other">{0} meqabit</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>meqabayt</displayName>
-				<unitPattern count="one">{0} meqabayt</unitPattern>
-				<unitPattern count="other">{0} meqabayt</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabit</displayName>
-				<unitPattern count="one">{0} terabit</unitPattern>
-				<unitPattern count="other">{0} terabit</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabayt</displayName>
 				<unitPattern count="one">{0} terabayt</unitPattern>
 				<unitPattern count="other">{0} terabayt</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabit</displayName>
+				<unitPattern count="one">{0} terabit</unitPattern>
+				<unitPattern count="other">{0} terabit</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>giqabayt</displayName>
+				<unitPattern count="one">{0} giqabayt</unitPattern>
+				<unitPattern count="other">{0} giqabayt</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>giqabit</displayName>
+				<unitPattern count="one">{0} giqabit</unitPattern>
+				<unitPattern count="other">{0} giqabit</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>meqabayt</displayName>
+				<unitPattern count="one">{0} meqabayt</unitPattern>
+				<unitPattern count="other">{0} meqabayt</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>meqabit</displayName>
+				<unitPattern count="one">{0} meqabit</unitPattern>
+				<unitPattern count="other">{0} meqabit</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobayt</displayName>
+				<unitPattern count="one">{0} kilobayt</unitPattern>
+				<unitPattern count="other">{0} kilobayt</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobit</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="other">{0} kilobit</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bayt</displayName>
+				<unitPattern count="one">{0} bayt</unitPattern>
+				<unitPattern count="other">{0} bayt</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>əsr</displayName>
+				<unitPattern count="one">{0} əsr</unitPattern>
+				<unitPattern count="other">{0} əsr</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>il</displayName>
+				<unitPattern count="one">{0} il</unitPattern>
+				<unitPattern count="other">{0} il</unitPattern>
+				<perUnitPattern>{0}/il</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ay</displayName>
+				<unitPattern count="one">{0} ay</unitPattern>
+				<unitPattern count="other">{0} ay</unitPattern>
+				<perUnitPattern>{0}/ay</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>həftə</displayName>
+				<unitPattern count="one">{0} həftə</unitPattern>
+				<unitPattern count="other">{0} həftə</unitPattern>
+				<perUnitPattern>{0}/həftə</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>gün</displayName>
 				<unitPattern count="one">{0} gün</unitPattern>
 				<unitPattern count="other">{0} gün</unitPattern>
+				<perUnitPattern>{0}/gün</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>saat</displayName>
@@ -5932,47 +6101,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} saat</unitPattern>
 				<perUnitPattern>{0}/saat</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikrosaniyə</displayName>
-				<unitPattern count="one">{0} mikrosaniyə</unitPattern>
-				<unitPattern count="other">{0} mikrosaniyə</unitPattern>
+			<unit type="duration-minute">
+				<displayName>dəqiqə</displayName>
+				<unitPattern count="one">{0} dəqiqə</unitPattern>
+				<unitPattern count="other">{0} dəqiqə</unitPattern>
+				<perUnitPattern>{0}/dəqiqə</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>saniyə</displayName>
+				<unitPattern count="one">{0} saniyə</unitPattern>
+				<unitPattern count="other">{0} saniyə</unitPattern>
+				<perUnitPattern>{0}/saniyə</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>millisaniyə</displayName>
 				<unitPattern count="one">{0} millisaniyə</unitPattern>
 				<unitPattern count="other">{0} millisaniyə</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>dəqiqə</displayName>
-				<unitPattern count="one">{0} dəqiqə</unitPattern>
-				<unitPattern count="other">{0} dəqiqə</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>ay</displayName>
-				<unitPattern count="one">{0} ay</unitPattern>
-				<unitPattern count="other">{0} ay</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>mikrosaniyə</displayName>
+				<unitPattern count="one">{0} mikrosaniyə</unitPattern>
+				<unitPattern count="other">{0} mikrosaniyə</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>nanosaniyə</displayName>
 				<unitPattern count="one">{0} nanosaniyə</unitPattern>
 				<unitPattern count="other">{0} nanosaniyə</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>saniyə</displayName>
-				<unitPattern count="one">{0} saniyə</unitPattern>
-				<unitPattern count="other">{0} saniyə</unitPattern>
-				<perUnitPattern>{0}/san</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>həftə</displayName>
-				<unitPattern count="one">{0} həftə</unitPattern>
-				<unitPattern count="other">{0} həftə</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>il</displayName>
-				<unitPattern count="one">{0} il</unitPattern>
-				<unitPattern count="other">{0} il</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>amper</displayName>
 				<unitPattern count="one">{0} amper</unitPattern>
@@ -5993,6 +6148,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} volt</unitPattern>
 				<unitPattern count="other">{0} volt</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokalori</displayName>
+				<unitPattern count="one">{0} kilokalori</unitPattern>
+				<unitPattern count="other">{0} kilokalori</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kalori</displayName>
 				<unitPattern count="one">{0} kalori</unitPattern>
@@ -6003,21 +6163,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Kalori</unitPattern>
 				<unitPattern count="other">{0} Kalori</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>coul</displayName>
-				<unitPattern count="one">{0} coul</unitPattern>
-				<unitPattern count="other">{0} coul</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokalori</displayName>
-				<unitPattern count="one">{0} kilokalori</unitPattern>
-				<unitPattern count="other">{0} kilokalori</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilocoul</displayName>
 				<unitPattern count="one">{0} kilocoul</unitPattern>
 				<unitPattern count="other">{0} kilocoul</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>coul</displayName>
+				<unitPattern count="one">{0} coul</unitPattern>
+				<unitPattern count="other">{0} coul</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilovatt-saat</displayName>
 				<unitPattern count="one">{0} kilovatt-saat</unitPattern>
@@ -6028,206 +6183,210 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} giqahers</unitPattern>
 				<unitPattern count="other">{0} giqahers</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hers</displayName>
-				<unitPattern count="one">{0} hers</unitPattern>
-				<unitPattern count="other">{0} hers</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>meqahers</displayName>
+				<unitPattern count="one">{0} meqahers</unitPattern>
+				<unitPattern count="other">{0} meqahers</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kilohers</displayName>
 				<unitPattern count="one">{0} kilohers</unitPattern>
 				<unitPattern count="other">{0} kilohers</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>meqahers</displayName>
-				<unitPattern count="one">{0} meqahers</unitPattern>
-				<unitPattern count="other">{0} meqahers</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hers</displayName>
+				<unitPattern count="one">{0} hers</unitPattern>
+				<unitPattern count="other">{0} hers</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>astronomik vahid</displayName>
-				<unitPattern count="one">{0} astronomik vahid</unitPattern>
-				<unitPattern count="other">{0} astronomik vahid</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometr</displayName>
+				<unitPattern count="one">{0} kilometr</unitPattern>
+				<unitPattern count="other">{0} kilometr</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>santimetr</displayName>
-				<unitPattern count="one">{0} santimetr</unitPattern>
-				<unitPattern count="other">{0} santimetr</unitPattern>
+			<unit type="length-meter">
+				<displayName>metr</displayName>
+				<unitPattern count="one">{0} metr</unitPattern>
+				<unitPattern count="other">{0} metr</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>fut</displayName>
-				<unitPattern count="one">{0} fut</unitPattern>
-				<unitPattern count="other">{0} fut</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>düym</displayName>
-				<unitPattern count="one">{0} düym</unitPattern>
-				<unitPattern count="other">{0} düym</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometr</displayName>
-				<unitPattern count="one">{0} kilometr</unitPattern>
-				<unitPattern count="other">{0} kilometr</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>işıq ili</displayName>
-				<unitPattern count="one">{0} işıq ili</unitPattern>
-				<unitPattern count="other">{0} işıq ili</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metr</displayName>
-				<unitPattern count="one">{0} metr</unitPattern>
-				<unitPattern count="other">{0} metr</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mil</displayName>
-				<unitPattern count="one">{0} mil</unitPattern>
-				<unitPattern count="other">{0} mil</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>santimetr</displayName>
+				<unitPattern count="one">{0} santimetr</unitPattern>
+				<unitPattern count="other">{0} santimetr</unitPattern>
+				<perUnitPattern>{0}/sm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>millimetr</displayName>
 				<unitPattern count="one">{0} millimetr</unitPattern>
 				<unitPattern count="other">{0} millimetr</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pikometr</displayName>
 				<unitPattern count="one">{0} pikometr</unitPattern>
 				<unitPattern count="other">{0} pikometr</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mil</displayName>
+				<unitPattern count="one">{0} mil</unitPattern>
+				<unitPattern count="other">{0} mil</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yard</displayName>
 				<unitPattern count="one">{0} yard</unitPattern>
 				<unitPattern count="other">{0} yard</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>fut</displayName>
+				<unitPattern count="one">{0} fut</unitPattern>
+				<unitPattern count="other">{0} fut</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>düym</displayName>
+				<unitPattern count="one">{0} düym</unitPattern>
+				<unitPattern count="other">{0} düym</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>işıq ili</displayName>
+				<unitPattern count="one">{0} işıq ili</unitPattern>
+				<unitPattern count="other">{0} işıq ili</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>astronomik vahid</displayName>
+				<unitPattern count="one">{0} astronomik vahid</unitPattern>
+				<unitPattern count="other">{0} astronomik vahid</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lüks</displayName>
 				<unitPattern count="one">{0} lüks</unitPattern>
 				<unitPattern count="other">{0} lüks</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="other">{0} karat</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>qram</displayName>
-				<unitPattern count="one">{0} qram</unitPattern>
-				<unitPattern count="other">{0} qram</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kiloqram</displayName>
-				<unitPattern count="one">{0} kiloqram</unitPattern>
-				<unitPattern count="other">{0} kiloqram</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>metrik ton</displayName>
 				<unitPattern count="one">{0} metrik ton</unitPattern>
 				<unitPattern count="other">{0} metrik ton</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mikroqram</displayName>
-				<unitPattern count="one">{0} mikroqram</unitPattern>
-				<unitPattern count="other">{0} mikroqram</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kiloqram</displayName>
+				<unitPattern count="one">{0} kiloqram</unitPattern>
+				<unitPattern count="other">{0} kiloqram</unitPattern>
+				<perUnitPattern>{0}/kq</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>qram</displayName>
+				<unitPattern count="one">{0} qram</unitPattern>
+				<unitPattern count="other">{0} qram</unitPattern>
+				<perUnitPattern>{0}/q</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>milliqram</displayName>
 				<unitPattern count="one">{0} milliqram</unitPattern>
 				<unitPattern count="other">{0} milliqram</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>unsiya</displayName>
-				<unitPattern count="one">{0} unsiya</unitPattern>
-				<unitPattern count="other">{0} unsiya</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>troy unsiyası</displayName>
-				<unitPattern count="one">{0} troy unsiyası</unitPattern>
-				<unitPattern count="other">{0} troy unsiyası</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>funt</displayName>
-				<unitPattern count="one">{0} funt</unitPattern>
-				<unitPattern count="other">{0} funt</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>stone</displayName>
-				<unitPattern count="one">{0} stone</unitPattern>
-				<unitPattern count="other">{0} stone</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>mikroqram</displayName>
+				<unitPattern count="one">{0} mikroqram</unitPattern>
+				<unitPattern count="other">{0} mikroqram</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>ton</displayName>
 				<unitPattern count="one">{0} ton</unitPattern>
 				<unitPattern count="other">{0} ton</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName>stone</displayName>
+				<unitPattern count="one">{0} stone</unitPattern>
+				<unitPattern count="other">{0} stone</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>funt</displayName>
+				<unitPattern count="one">{0} funt</unitPattern>
+				<unitPattern count="other">{0} funt</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>unsiya</displayName>
+				<unitPattern count="one">{0} unsiya</unitPattern>
+				<unitPattern count="other">{0} unsiya</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>troy unsiyası</displayName>
+				<unitPattern count="one">{0} troy unsiyası</unitPattern>
+				<unitPattern count="other">{0} troy unsiyası</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="other">{0} karat</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>giqavatt</displayName>
 				<unitPattern count="one">{0} giqavatt</unitPattern>
 				<unitPattern count="other">{0} giqavatt</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>at gücü</displayName>
-				<unitPattern count="one">{0} at gücü</unitPattern>
-				<unitPattern count="other">{0} at gücü</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilovatt</displayName>
-				<unitPattern count="one">{0} kilovatt</unitPattern>
-				<unitPattern count="other">{0} kilovatt</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>meqavatt</displayName>
 				<unitPattern count="one">{0} meqavatt</unitPattern>
 				<unitPattern count="other">{0} meqavatt</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>millivatt</displayName>
-				<unitPattern count="one">{0} millivatt</unitPattern>
-				<unitPattern count="other">{0} millivatt</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilovatt</displayName>
+				<unitPattern count="one">{0} kilovatt</unitPattern>
+				<unitPattern count="other">{0} kilovatt</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>vatt</displayName>
 				<unitPattern count="one">{0} vatt</unitPattern>
 				<unitPattern count="other">{0} vatt</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>millivatt</displayName>
+				<unitPattern count="one">{0} millivatt</unitPattern>
+				<unitPattern count="other">{0} millivatt</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>at gücü</displayName>
+				<unitPattern count="one">{0} at gücü</unitPattern>
+				<unitPattern count="other">{0} at gücü</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hektopaskal</displayName>
 				<unitPattern count="one">{0} hektopaskal</unitPattern>
 				<unitPattern count="other">{0} hektopaskal</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>civə düymü</displayName>
-				<unitPattern count="one">{0} civə düymü</unitPattern>
-				<unitPattern count="other">{0} civə düymü</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>millibar</displayName>
-				<unitPattern count="one">{0} millibar</unitPattern>
-				<unitPattern count="other">{0} millibar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>millimetr civə sütunu</displayName>
 				<unitPattern count="one">{0} millimetr civə sütunu</unitPattern>
@@ -6238,10 +6397,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} funt/kvadrat düym</unitPattern>
 				<unitPattern count="other">{0} funt/kvadrat düym</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="other">{0} karat</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>civə düymü</displayName>
+				<unitPattern count="one">{0} civə düymü</unitPattern>
+				<unitPattern count="other">{0} civə düymü</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>millibar</displayName>
+				<unitPattern count="one">{0} millibar</unitPattern>
+				<unitPattern count="other">{0} millibar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometr/saat</displayName>
@@ -6258,6 +6422,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mil/saat</unitPattern>
 				<unitPattern count="other">{0} mil/saat</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>dərəcə Selsi</displayName>
 				<unitPattern count="one">{0} dərəcə Selsi</unitPattern>
@@ -6273,31 +6447,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} dərəcə Kelvin</unitPattern>
 				<unitPattern count="other">{0} dərəcə Kelvin</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>akr-fut</displayName>
-				<unitPattern count="one">{0} akr-fut</unitPattern>
-				<unitPattern count="other">{0} akr-fut</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>santilitr</displayName>
-				<unitPattern count="one">{0} santilitr</unitPattern>
-				<unitPattern count="other">{0} santilitr</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>kub santimetr</displayName>
-				<unitPattern count="one">{0} kub santimetr</unitPattern>
-				<unitPattern count="other">{0} kub santimetr</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>kub fut</displayName>
-				<unitPattern count="one">{0} kub fut</unitPattern>
-				<unitPattern count="other">{0} kub fut</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>kub düym</displayName>
-				<unitPattern count="one">{0} kub düym</unitPattern>
-				<unitPattern count="other">{0} kub düym</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kub kilometr</displayName>
 				<unitPattern count="one">{0} kub kilometr</unitPattern>
@@ -6307,6 +6456,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>kub metr</displayName>
 				<unitPattern count="one">{0} kub metr</unitPattern>
 				<unitPattern count="other">{0} kub metr</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>kub santimetr</displayName>
+				<unitPattern count="one">{0} kub santimetr</unitPattern>
+				<unitPattern count="other">{0} kub santimetr</unitPattern>
+				<perUnitPattern>{0}/sm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>kub mil</displayName>
@@ -6318,25 +6474,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kub yard</unitPattern>
 				<unitPattern count="other">{0} kub yard</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>stəkan</displayName>
-				<unitPattern count="one">{0} stəkan</unitPattern>
-				<unitPattern count="other">{0} stəkan</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>kub fut</displayName>
+				<unitPattern count="one">{0} kub fut</unitPattern>
+				<unitPattern count="other">{0} kub fut</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>desilitr</displayName>
-				<unitPattern count="one">{0} desilitr</unitPattern>
-				<unitPattern count="other">{0} desilitr</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>kub düym</displayName>
+				<unitPattern count="one">{0} kub düym</unitPattern>
+				<unitPattern count="other">{0} kub düym</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>maye unsiyası</displayName>
-				<unitPattern count="one">{0} maye unsiyası</unitPattern>
-				<unitPattern count="other">{0} maye unsiyası</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>qallon</displayName>
-				<unitPattern count="one">{0} qallon</unitPattern>
-				<unitPattern count="other">{0} qallon</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>meqalitr</displayName>
+				<unitPattern count="one">{0} meqalitr</unitPattern>
+				<unitPattern count="other">{0} meqalitr</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hektolitr</displayName>
@@ -6347,27 +6498,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>litr</displayName>
 				<unitPattern count="one">{0} litr</unitPattern>
 				<unitPattern count="other">{0} litr</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>meqalitr</displayName>
-				<unitPattern count="one">{0} meqalitr</unitPattern>
-				<unitPattern count="other">{0} meqalitr</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>desilitr</displayName>
+				<unitPattern count="one">{0} desilitr</unitPattern>
+				<unitPattern count="other">{0} desilitr</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>santilitr</displayName>
+				<unitPattern count="one">{0} santilitr</unitPattern>
+				<unitPattern count="other">{0} santilitr</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>millilitr</displayName>
 				<unitPattern count="one">{0} millilitr</unitPattern>
 				<unitPattern count="other">{0} millilitr</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pint</displayName>
-				<unitPattern count="one">{0} pint</unitPattern>
-				<unitPattern count="other">{0} pint</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>akr-fut</displayName>
+				<unitPattern count="one">{0} akr-fut</unitPattern>
+				<unitPattern count="other">{0} akr-fut</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>qallon</displayName>
+				<unitPattern count="one">{0} qallon</unitPattern>
+				<unitPattern count="other">{0} qallon</unitPattern>
+				<perUnitPattern>{0}/qal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>kvart</displayName>
 				<unitPattern count="one">{0} kvart</unitPattern>
 				<unitPattern count="other">{0} kvart</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pint</displayName>
+				<unitPattern count="one">{0} pint</unitPattern>
+				<unitPattern count="other">{0} pint</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>stəkan</displayName>
+				<unitPattern count="one">{0} stəkan</unitPattern>
+				<unitPattern count="other">{0} stəkan</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>maye unsiyası</displayName>
+				<unitPattern count="one">{0} maye unsiyası</unitPattern>
+				<unitPattern count="other">{0} maye unsiyası</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>xörək qaşığı</displayName>
 				<unitPattern count="one">{0} xörək qaşığı</unitPattern>
@@ -6378,6 +6566,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} çay qaşığı</unitPattern>
 				<unitPattern count="other">{0} çay qaşığı</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -6393,6 +6587,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>döv</displayName>
+				<unitPattern count="one">{0} döv</unitPattern>
+				<unitPattern count="other">{0} döv</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>dərəcə</displayName>
+				<unitPattern count="one">{0}dər</unitPattern>
+				<unitPattern count="other">{0}dər</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>dəqiqə</displayName>
 				<unitPattern count="one">{0}dəq</unitPattern>
@@ -6403,30 +6612,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}san</unitPattern>
 				<unitPattern count="other">{0}san</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>dərəcə</displayName>
-				<unitPattern count="one">{0}dər</unitPattern>
-				<unitPattern count="other">{0}dər</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>akr</displayName>
-				<unitPattern count="one">{0} ak</unitPattern>
-				<unitPattern count="other">{0} ak</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>kvadrat kilometr</displayName>
+				<unitPattern count="one">{0} kv km</unitPattern>
+				<unitPattern count="other">{0} kv km</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektar</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>kvadrat metr</displayName>
+				<unitPattern count="one">{0} kv m</unitPattern>
+				<unitPattern count="other">{0} kv m</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>sm²</displayName>
 				<unitPattern count="one">{0} sm²</unitPattern>
 				<unitPattern count="other">{0} sm²</unitPattern>
+				<perUnitPattern>{0}/sm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>kvadrat mil</displayName>
+				<unitPattern count="one">{0} kv mil</unitPattern>
+				<unitPattern count="other">{0} kv mil</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>akr</displayName>
+				<unitPattern count="one">{0} ak</unitPattern>
+				<unitPattern count="other">{0} ak</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>kvadrat fut</displayName>
@@ -6437,91 +6658,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>in²</displayName>
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kvadrat kilometr</displayName>
-				<unitPattern count="one">{0} kv km</unitPattern>
-				<unitPattern count="other">{0} kv km</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>kvadrat metr</displayName>
-				<unitPattern count="one">{0} kv m</unitPattern>
-				<unitPattern count="other">{0} kv m</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>kvadrat mil</displayName>
-				<unitPattern count="one">{0} kv mil</unitPattern>
-				<unitPattern count="other">{0} kv mil</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
 				<unitPattern count="one">{0} L/km</unitPattern>
 				<unitPattern count="other">{0} L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} L/100km</unitPattern>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bayt</displayName>
-				<unitPattern count="one">{0} bayt</unitPattern>
-				<unitPattern count="other">{0} bayt</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bayt</displayName>
+				<unitPattern count="one">{0} bayt</unitPattern>
+				<unitPattern count="other">{0} bayt</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>əsr</displayName>
+				<unitPattern count="one">{0} əsr</unitPattern>
+				<unitPattern count="other">{0} əsr</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>il</displayName>
+				<unitPattern count="one">{0} il</unitPattern>
+				<unitPattern count="other">{0} il</unitPattern>
+				<perUnitPattern>{0}/il</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ay</displayName>
+				<unitPattern count="one">{0} ay</unitPattern>
+				<unitPattern count="other">{0} ay</unitPattern>
+				<perUnitPattern>{0}/ay</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>həftə</displayName>
+				<unitPattern count="one">{0} hft</unitPattern>
+				<unitPattern count="other">{0} hft</unitPattern>
+				<perUnitPattern>{0}/hft</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>gün</displayName>
 				<unitPattern count="one">{0} gün</unitPattern>
 				<unitPattern count="other">{0} gün</unitPattern>
+				<perUnitPattern>{0}/gün</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>saat</displayName>
@@ -6529,30 +6765,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} saat</unitPattern>
 				<perUnitPattern>{0}/saat</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μsan</displayName>
-				<unitPattern count="one">{0} μsan</unitPattern>
-				<unitPattern count="other">{0} μsan</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>millisaniyə</displayName>
-				<unitPattern count="one">{0} msan</unitPattern>
-				<unitPattern count="other">{0} msan</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>dəqiqə</displayName>
 				<unitPattern count="one">{0} dəq</unitPattern>
 				<unitPattern count="other">{0} dəq</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>ay</displayName>
-				<unitPattern count="one">{0} ay</unitPattern>
-				<unitPattern count="other">{0} ay</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nsan</displayName>
-				<unitPattern count="one">{0} nsan</unitPattern>
-				<unitPattern count="other">{0} nsan</unitPattern>
+				<perUnitPattern>{0}/dəq</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>saniyə</displayName>
@@ -6560,15 +6777,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} san</unitPattern>
 				<perUnitPattern>{0}/san</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>həftə</displayName>
-				<unitPattern count="one">{0} hft</unitPattern>
-				<unitPattern count="other">{0} hft</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>millisaniyə</displayName>
+				<unitPattern count="one">{0} msan</unitPattern>
+				<unitPattern count="other">{0} msan</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>il</displayName>
-				<unitPattern count="one">{0} il</unitPattern>
-				<unitPattern count="other">{0} il</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μsan</displayName>
+				<unitPattern count="one">{0} μsan</unitPattern>
+				<unitPattern count="other">{0} μsan</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nsan</displayName>
+				<unitPattern count="one">{0} nsan</unitPattern>
+				<unitPattern count="other">{0} nsan</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amp</displayName>
@@ -6590,6 +6812,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kkal</displayName>
+				<unitPattern count="one">{0} kkal</unitPattern>
+				<unitPattern count="other">{0} kkal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kal</displayName>
 				<unitPattern count="one">{0} kal</unitPattern>
@@ -6600,21 +6827,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Kal</unitPattern>
 				<unitPattern count="other">{0} Kal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>coul</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kkal</displayName>
-				<unitPattern count="one">{0} kkal</unitPattern>
-				<unitPattern count="other">{0} kkal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kc</displayName>
 				<unitPattern count="one">{0} kc</unitPattern>
 				<unitPattern count="other">{0} kc</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>coul</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -6625,206 +6847,210 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>av</displayName>
-				<unitPattern count="one">{0} av</unitPattern>
-				<unitPattern count="other">{0} av</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometr</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>sm</displayName>
-				<unitPattern count="one">{0} sm</unitPattern>
-				<unitPattern count="other">{0} sm</unitPattern>
+			<unit type="length-meter">
+				<displayName>metr</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>fut</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>düym</displayName>
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometr</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>işıq ili</displayName>
-				<unitPattern count="one">{0} ii</unitPattern>
-				<unitPattern count="other">{0} ii</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metr</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mil</displayName>
-				<unitPattern count="one">{0} mil</unitPattern>
-				<unitPattern count="other">{0} mil</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>sm</displayName>
+				<unitPattern count="one">{0} sm</unitPattern>
+				<unitPattern count="other">{0} sm</unitPattern>
+				<perUnitPattern>{0}/sm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>millimetr</displayName>
 				<unitPattern count="one">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pikometr</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mil</displayName>
+				<unitPattern count="one">{0} mil</unitPattern>
+				<unitPattern count="other">{0} mil</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yard</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>fut</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>düym</displayName>
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>işıq ili</displayName>
+				<unitPattern count="one">{0} ii</unitPattern>
+				<unitPattern count="other">{0} ii</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>av</displayName>
+				<unitPattern count="one">{0} av</unitPattern>
+				<unitPattern count="other">{0} av</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>CD</displayName>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>qram</displayName>
-				<unitPattern count="one">{0} q</unitPattern>
-				<unitPattern count="other">{0} q</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kiloqram</displayName>
-				<unitPattern count="one">{0} kq</unitPattern>
-				<unitPattern count="other">{0} kq</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µq</displayName>
-				<unitPattern count="one">{0} µq</unitPattern>
-				<unitPattern count="other">{0} µq</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kiloqram</displayName>
+				<unitPattern count="one">{0} kq</unitPattern>
+				<unitPattern count="other">{0} kq</unitPattern>
+				<perUnitPattern>{0}/kq</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>qram</displayName>
+				<unitPattern count="one">{0} q</unitPattern>
+				<unitPattern count="other">{0} q</unitPattern>
+				<perUnitPattern>{0}/q</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mq</displayName>
 				<unitPattern count="one">{0} mq</unitPattern>
 				<unitPattern count="other">{0} mq</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>unsiya</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>funt</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>stone</displayName>
-				<unitPattern count="one">{0} stone</unitPattern>
-				<unitPattern count="other">{0} stone</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µq</displayName>
+				<unitPattern count="one">{0} µq</unitPattern>
+				<unitPattern count="other">{0} µq</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tn</displayName>
 				<unitPattern count="one">{0} tn</unitPattern>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName>stone</displayName>
+				<unitPattern count="one">{0} stone</unitPattern>
+				<unitPattern count="other">{0} stone</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>funt</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>unsiya</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>CD</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>at gücü</displayName>
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilovatt</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilovatt</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>vatt</displayName>
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>at gücü</displayName>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hektopaskal</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>civə düymü</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>millibar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -6835,10 +7061,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>civə düymü</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>millibar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometr/saat</displayName>
@@ -6855,6 +7086,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mil/saat</unitPattern>
 				<unitPattern count="other">{0} mil/saat</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>dərəcə Selsi</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -6870,31 +7111,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>sL</displayName>
-				<unitPattern count="one">{0} sL</unitPattern>
-				<unitPattern count="other">{0} sL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>sm³</displayName>
-				<unitPattern count="one">{0} sm³</unitPattern>
-				<unitPattern count="other">{0} sm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -6904,6 +7120,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>sm³</displayName>
+				<unitPattern count="one">{0} sm³</unitPattern>
+				<unitPattern count="other">{0} sm³</unitPattern>
+				<perUnitPattern>{0}/sm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>kub mil</displayName>
@@ -6915,25 +7138,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>st</displayName>
-				<unitPattern count="one">{0} st</unitPattern>
-				<unitPattern count="other">{0} st</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="one">{0} dL</unitPattern>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -6944,27 +7162,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>litr</displayName>
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="one">{0} ML</unitPattern>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0} dL</unitPattern>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>sL</displayName>
+				<unitPattern count="one">{0} sL</unitPattern>
+				<unitPattern count="other">{0} sL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
 				<unitPattern count="one">{0} mL</unitPattern>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>qal</displayName>
+				<unitPattern count="one">{0} qal</unitPattern>
+				<unitPattern count="other">{0} qal</unitPattern>
+				<perUnitPattern>{0}/qal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>st</displayName>
+				<unitPattern count="one">{0} st</unitPattern>
+				<unitPattern count="other">{0} st</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>xrqş</displayName>
 				<unitPattern count="one">{0} xrqş</unitPattern>
@@ -6975,6 +7230,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} çyqş</unitPattern>
 				<unitPattern count="other">{0} çyqş</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -6984,6 +7245,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} G</unitPattern>
 				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -6992,26 +7257,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} ak</unitPattern>
-				<unitPattern count="other">{0} ak</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} m²</unitPattern>
 				<unitPattern count="other">{0} m²</unitPattern>
@@ -7020,6 +7273,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mil²</unitPattern>
 				<unitPattern count="other">{0} mil²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} ak</unitPattern>
+				<unitPattern count="other">{0} ak</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} L/100km</unitPattern>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>il</displayName>
+				<unitPattern count="one">{0} il</unitPattern>
+				<unitPattern count="other">{0} il</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ay</displayName>
+				<unitPattern count="one">{0} ay</unitPattern>
+				<unitPattern count="other">{0} ay</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>hft</displayName>
+				<unitPattern count="one">{0} hft</unitPattern>
+				<unitPattern count="other">{0} hft</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>gün</displayName>
 				<unitPattern count="one">{0} gün</unitPattern>
@@ -7030,66 +7311,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} saat</unitPattern>
 				<unitPattern count="other">{0} saat</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>msan</displayName>
-				<unitPattern count="one">{0} msan</unitPattern>
-				<unitPattern count="other">{0} msan</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>dəq</displayName>
 				<unitPattern count="one">{0} dəq</unitPattern>
 				<unitPattern count="other">{0} dəq</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>ay</displayName>
-				<unitPattern count="one">{0} ay</unitPattern>
-				<unitPattern count="other">{0} ay</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>san</displayName>
 				<unitPattern count="one">{0} san</unitPattern>
 				<unitPattern count="other">{0} san</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>hft</displayName>
-				<unitPattern count="one">{0} hft</unitPattern>
-				<unitPattern count="other">{0} hft</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>il</displayName>
-				<unitPattern count="one">{0} il</unitPattern>
-				<unitPattern count="other">{0} il</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>sm</displayName>
-				<unitPattern count="one">{0} sm</unitPattern>
-				<unitPattern count="other">{0} sm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>msan</displayName>
+				<unitPattern count="one">{0} msan</unitPattern>
+				<unitPattern count="other">{0} msan</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>kilometr</displayName>
 				<unitPattern count="one">{0} km</unitPattern>
 				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} ii</unitPattern>
-				<unitPattern count="other">{0} ii</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>metr</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} mil</unitPattern>
-				<unitPattern count="other">{0} mil</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>sm</displayName>
+				<unitPattern count="one">{0} sm</unitPattern>
+				<unitPattern count="other">{0} sm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>millimetr</displayName>
@@ -7100,34 +7350,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} mil</unitPattern>
+				<unitPattern count="other">{0} mil</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>qram</displayName>
-				<unitPattern count="one">{0} q</unitPattern>
-				<unitPattern count="other">{0} q</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} ii</unitPattern>
+				<unitPattern count="other">{0} ii</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kiloqram</displayName>
 				<unitPattern count="one">{0} kq</unitPattern>
 				<unitPattern count="other">{0} kq</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
+			<unit type="mass-gram">
+				<displayName>qram</displayName>
+				<unitPattern count="one">{0} q</unitPattern>
+				<unitPattern count="other">{0} q</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName>stone</displayName>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} lb</unitPattern>
 				<unitPattern count="other">{0} lb</unitPattern>
 			</unit>
-			<unit type="mass-stone">
-				<displayName>stone</displayName>
-			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} kW</unitPattern>
@@ -7137,6 +7399,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
@@ -7163,7 +7429,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} mil/saat</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
-				<displayName>dərəcə Selsi</displayName>
+				<displayName>°C</displayName>
 				<unitPattern count="one">{0}°</unitPattern>
 				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
@@ -7184,6 +7450,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/az_Cyrl.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Cyrl.xml
similarity index 73%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/az_Cyrl.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Cyrl.xml
index 39164b4685f..b8d29752dd6 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/az_Cyrl.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Cyrl.xml
@@ -1,28 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11034 $"/>
-		<generation date="$Date: 2014-10-17 13:57:28 -0500 (Fri, 17 Oct 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="az"/>
 		<script type="Cyrl"/>
 	</identity>
 	<localeDisplayNames>
 		<languages>
-			<language type="az">Азәрбајҹан</language>
-			<language type="de">алманҹа</language>
-			<language type="en">инҝилисҹә</language>
-			<language type="es">испанҹа</language>
-			<language type="fr">франсызҹа</language>
-			<language type="it">италјанҹа</language>
-			<language type="ja">јапонҹа</language>
-			<language type="pt">португалҹа</language>
-			<language type="ru">русҹа</language>
-			<language type="zh">чинҹә</language>
+			<language type="az">азәрбајҹан дили</language>
+			<language type="de">алман дили</language>
+			<language type="en">инҝилис дили</language>
+			<language type="es">испан дили</language>
+			<language type="fr">франсыз дили</language>
+			<language type="it">италјан дили</language>
+			<language type="ja">јапон дили</language>
+			<language type="pt">португал дили</language>
+			<language type="ru">рус дили</language>
+			<language type="zh">чин дили</language>
 		</languages>
 		<scripts>
 			<script type="Cyrl">Кирил</script>
@@ -216,13 +215,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern draft="contributed">¤ #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤ 0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤ 00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤ 000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤ 0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤ 00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤ 000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤ 0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤ 00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤ 000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤ 0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤ 00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤ 000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AZN">
 				<displayName draft="unconfirmed">манат</displayName>
-				<symbol>ман.</symbol>
-				<symbol alt="variant">₼</symbol>
+				<symbol>₼</symbol>
+				<symbol alt="variant">ман.</symbol>
 			</currency>
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/az_Cyrl_AZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Cyrl_AZ.xml
similarity index 69%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/az_Cyrl_AZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Cyrl_AZ.xml
index caf8a6dd19c..af6b4e45695 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/az_Cyrl_AZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Cyrl_AZ.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="az"/>
 		<script type="Cyrl"/>
 		<territory type="AZ"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/az_Latn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Latn.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/az_Latn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Latn.xml
index 61451290fd0..a9509f7402f 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/az_Latn.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Latn.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="az"/>
 		<script type="Latn"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/az_Latn_AZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Latn_AZ.xml
similarity index 69%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/az_Latn_AZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Latn_AZ.xml
index 64dbe63e30b..0cefc497282 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/az_Latn_AZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Latn_AZ.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="az"/>
 		<script type="Latn"/>
 		<territory type="AZ"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bas.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bas.xml
similarity index 95%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bas.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bas.xml
index 7fa3a951bf5..d6b9686feef 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bas.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bas.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="bas"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Àŋgiyà</territory>
 			<territory type="AL">Àlbanìà</territory>
 			<territory type="AM">Àrmenìà</territory>
-			<territory type="AN">Àŋtîy ǹlɛ̀ndi</territory>
 			<territory type="AO">Àŋgolà</territory>
 			<territory type="AR">Àrgàŋtinà</territory>
 			<territory type="AT">Òstrǐk</territory>
@@ -446,6 +444,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">I bikɛ̂glà</dayPeriod>
+							<dayPeriod type="pm">I ɓugajɔp</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">I bikɛ̂glà</dayPeriod>
 							<dayPeriod type="pm">I ɓugajɔp</dayPeriod>
@@ -598,6 +600,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">0K ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -777,3 +795,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bas_CM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bas_CM.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bas_CM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bas_CM.xml
index 4b021106539..f82701a58ac 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bas_CM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bas_CM.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="bas"/>
 		<territory type="CM"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/be.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/be.xml
new file mode 100644
index 00000000000..db9e9636894
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/be.xml
@@ -0,0 +1,7600 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12293 $"/>
+		<language type="be"/>
+	</identity>
+	<localeDisplayNames>
+		<localeDisplayPattern>
+			<localePattern>{0} ({1})</localePattern>
+			<localeSeparator>{0}, {1}</localeSeparator>
+			<localeKeyTypePattern>{0}: {1}</localeKeyTypePattern>
+		</localeDisplayPattern>
+		<languages>
+			<language type="ab">абхазская</language>
+			<language type="ady" draft="contributed">адыгейская</language>
+			<language type="af">афрыкаанс</language>
+			<language type="agq">агем</language>
+			<language type="ak">акан</language>
+			<language type="akk" draft="contributed">акадзкая</language>
+			<language type="ale" draft="contributed">алеуцкая</language>
+			<language type="am">амхарская</language>
+			<language type="an" draft="contributed">арагонская</language>
+			<language type="ang">стараанглійская</language>
+			<language type="ar">арабская</language>
+			<language type="ar_001">сучасная стандартная арабская</language>
+			<language type="arc" draft="contributed">арамейская</language>
+			<language type="arn">мапучэ</language>
+			<language type="as">асамская</language>
+			<language type="asa">асу</language>
+			<language type="ast" draft="contributed">астурыйская</language>
+			<language type="av" draft="contributed">аварская</language>
+			<language type="ay" draft="contributed">аймара</language>
+			<language type="az">азербайджанская</language>
+			<language type="az" alt="short">азеры</language>
+			<language type="ba">башкірская</language>
+			<language type="be">беларуская</language>
+			<language type="bem">бемба</language>
+			<language type="bez">бена</language>
+			<language type="bg">балгарская</language>
+			<language type="bgn">заходняя белуджская</language>
+			<language type="bm">бамбара</language>
+			<language type="bn">бенгальская</language>
+			<language type="bo">тыбецкая</language>
+			<language type="br">брэтонская</language>
+			<language type="brx">бода</language>
+			<language type="bs">баснійская</language>
+			<language type="bua" draft="contributed">бурацкая</language>
+			<language type="ca">каталанская</language>
+			<language type="ce">чачэнская</language>
+			<language type="cgg">чыга</language>
+			<language type="chb" draft="unconfirmed">чыбча</language>
+			<language type="chr">чэрокі</language>
+			<language type="ckb">цэнтральнакурдская</language>
+			<language type="co">карсіканская</language>
+			<language type="cop">копцкая</language>
+			<language type="cs">чэшская</language>
+			<language type="cv">чувашская</language>
+			<language type="cy">валійская</language>
+			<language type="da">дацкая</language>
+			<language type="dav">тайта</language>
+			<language type="de">нямецкая</language>
+			<language type="de_AT">нямецкая (аўстр.)</language>
+			<language type="de_CH">нямецкая (швейц.)</language>
+			<language type="dje">зарма</language>
+			<language type="dsb">ніжнелужыцкая</language>
+			<language type="dua">дуала</language>
+			<language type="dyo">дыёла-фон’і</language>
+			<language type="dz">дзонгкха</language>
+			<language type="ebu">эмбу</language>
+			<language type="ee">эве</language>
+			<language type="egy" draft="contributed">стараэгіпецкая</language>
+			<language type="el">грэчаская</language>
+			<language type="en">англійская</language>
+			<language type="en_AU">англійская (аўстрал.)</language>
+			<language type="en_CA">англійская (канад.)</language>
+			<language type="en_GB" alt="short">брытанская англійская</language>
+			<language type="en_US">англійская (ЗША)</language>
+			<language type="en_US" alt="short">амерыканская англійская</language>
+			<language type="eo">эсперанта</language>
+			<language type="es">іспанская</language>
+			<language type="es_419">іспанская (лацінаамер.)</language>
+			<language type="es_ES">іспанская (еўрап.)</language>
+			<language type="es_MX">іспанская (мексікан.)</language>
+			<language type="et">эстонская</language>
+			<language type="eu">баскская</language>
+			<language type="fa">фарсі</language>
+			<language type="fi">фінская</language>
+			<language type="fil">тагальская</language>
+			<language type="fj">фіджыйская</language>
+			<language type="fo">фарэрская</language>
+			<language type="fr">французская</language>
+			<language type="fr_CA">французская (канад.)</language>
+			<language type="fr_CH">французская (швейц.)</language>
+			<language type="fro">старафранцузская</language>
+			<language type="fy">фрызская</language>
+			<language type="ga">ірландская</language>
+			<language type="gag">гагаузская</language>
+			<language type="gd">шатландская гэльская</language>
+			<language type="gl">галісійская</language>
+			<language type="gn">гуарані</language>
+			<language type="grc" draft="contributed">старагрэцкая</language>
+			<language type="gsw">швейцарская нямецкая</language>
+			<language type="gu">гуджараці</language>
+			<language type="guz">гусіі</language>
+			<language type="gv">мэнская</language>
+			<language type="ha">хаўса</language>
+			<language type="haw">гавайская</language>
+			<language type="he">іўрыт</language>
+			<language type="hi">хіндзі</language>
+			<language type="hr">харвацкая</language>
+			<language type="hsb">верхнелужыцкая</language>
+			<language type="ht">гаіцянская</language>
+			<language type="hu">венгерская</language>
+			<language type="hy">армянская</language>
+			<language type="ia">інтэрлінгва</language>
+			<language type="id">інданезійская</language>
+			<language type="ie">інтэрлінгве</language>
+			<language type="ig">ігба</language>
+			<language type="ii">Сычуань І</language>
+			<language type="is">ісландская</language>
+			<language type="it">італьянская</language>
+			<language type="iu">інуктытут</language>
+			<language type="ja">японская</language>
+			<language type="jgo">нгомбэ</language>
+			<language type="jmc">мачамэ</language>
+			<language type="jv">яванская</language>
+			<language type="ka">грузінская</language>
+			<language type="kab">кабільская</language>
+			<language type="kam">камба</language>
+			<language type="kde">макондэ</language>
+			<language type="kea">кабувердзьяну</language>
+			<language type="khq">койра чыіні</language>
+			<language type="ki">кікую</language>
+			<language type="kk">казахская</language>
+			<language type="kl">грэнландская</language>
+			<language type="kln">календжын</language>
+			<language type="km">кхмерская</language>
+			<language type="kn">канада</language>
+			<language type="ko">карэйская</language>
+			<language type="koi">комі-пярмяцкая</language>
+			<language type="kok">конкані</language>
+			<language type="ks">кашмірская</language>
+			<language type="ksb">шамбала</language>
+			<language type="ksf">бафія</language>
+			<language type="ku">курдская</language>
+			<language type="kw">корнская</language>
+			<language type="ky">кіргізская</language>
+			<language type="la">лацінская</language>
+			<language type="lag">ланга</language>
+			<language type="lb">люксембургская</language>
+			<language type="lg">ганда</language>
+			<language type="lkt">лакота</language>
+			<language type="ln">лінгала</language>
+			<language type="lo">лаоская</language>
+			<language type="lol" draft="unconfirmed">монга</language>
+			<language type="lrc">паўночны луры</language>
+			<language type="lt">літоўская</language>
+			<language type="lu">луба-катанга</language>
+			<language type="luo">луа</language>
+			<language type="luy">луя</language>
+			<language type="lv">латышская</language>
+			<language type="man" draft="unconfirmed">мандынга</language>
+			<language type="mas">масаі</language>
+			<language type="men" draft="unconfirmed">мендэ</language>
+			<language type="mer">меру</language>
+			<language type="mfe">маўрыкійская</language>
+			<language type="mg">малагасійская</language>
+			<language type="mgh">макуа-меета</language>
+			<language type="mgo">мета</language>
+			<language type="mi">маары</language>
+			<language type="mk">македонская</language>
+			<language type="ml">малаялам</language>
+			<language type="mn">мангольская</language>
+			<language type="moh">магаўкская</language>
+			<language type="mos" draft="unconfirmed">мосі</language>
+			<language type="mr">маратхі</language>
+			<language type="ms">малайская</language>
+			<language type="mt">мальтыйская</language>
+			<language type="mua">мунданг</language>
+			<language type="my">бірманская</language>
+			<language type="mzn">мазандэранская</language>
+			<language type="naq">нама</language>
+			<language type="nb">нарвежская (букмал)</language>
+			<language type="nd">паўночная ндэбеле</language>
+			<language type="nds">ніжненямецкая</language>
+			<language type="nds_NL">ніжнесаксонская</language>
+			<language type="ne">непальская</language>
+			<language type="nl">галандская</language>
+			<language type="nl_BE">фламандская</language>
+			<language type="nmg">квасіа</language>
+			<language type="nn">нарвежская (нюнорск)</language>
+			<language type="no">нарвежская</language>
+			<language type="nog" draft="unconfirmed">нагайская</language>
+			<language type="non" draft="unconfirmed">старанарвежская</language>
+			<language type="nqo">нко</language>
+			<language type="nus">нуэр</language>
+			<language type="nyn">ньянколе</language>
+			<language type="oc">правансальская</language>
+			<language type="oj" draft="unconfirmed">аджыбве</language>
+			<language type="om">арома</language>
+			<language type="or">орыя</language>
+			<language type="os" draft="unconfirmed">асецінская</language>
+			<language type="pa">панджабі</language>
+			<language type="peo" draft="unconfirmed">стараперсідская</language>
+			<language type="phn" draft="unconfirmed">фінікійская</language>
+			<language type="pl">польская</language>
+			<language type="pro" draft="unconfirmed">стараправансальская</language>
+			<language type="ps">пушту</language>
+			<language type="pt">партугальская</language>
+			<language type="pt_BR">партугальская (бразіл.)</language>
+			<language type="pt_PT">партугальская (еўрап.)</language>
+			<language type="qu">кечуа</language>
+			<language type="quc">кічэ</language>
+			<language type="raj" draft="unconfirmed">раджастханская</language>
+			<language type="rm">рэтараманская</language>
+			<language type="rn">рундзі</language>
+			<language type="ro">румынская</language>
+			<language type="ro_MD">малдаўская</language>
+			<language type="rof">ромба</language>
+			<language type="ru">руская</language>
+			<language type="rw">кіньяруанда</language>
+			<language type="rwk">рва</language>
+			<language type="sa">санскрыт</language>
+			<language type="sah">якуцкая</language>
+			<language type="saq">самбуру</language>
+			<language type="sbp">сангу</language>
+			<language type="sd">сіндхі</language>
+			<language type="sdh">паўднёвакурдская</language>
+			<language type="se">паўночнасаамская</language>
+			<language type="seh">сена</language>
+			<language type="ses">койрабара сенні</language>
+			<language type="sg">санга</language>
+			<language type="sga" draft="unconfirmed">стараірландская</language>
+			<language type="sh">сербска-харвацкая</language>
+			<language type="shi">тачалхіт</language>
+			<language type="si">сінгальская</language>
+			<language type="sk">славацкая</language>
+			<language type="sl">славенская</language>
+			<language type="sma">паўднёвасаамская</language>
+			<language type="smj">луле-саамская</language>
+			<language type="smn">інары-саамская</language>
+			<language type="sms">колта-саамская</language>
+			<language type="sn">шона</language>
+			<language type="so">самалійская</language>
+			<language type="sq">албанская</language>
+			<language type="sr">сербская</language>
+			<language type="su">сундская</language>
+			<language type="sux" draft="unconfirmed">шумерская</language>
+			<language type="sv">шведская</language>
+			<language type="sw">суахілі</language>
+			<language type="sw_CD">суахілі Конга</language>
+			<language type="ta">тамільская</language>
+			<language type="te">тэлугу</language>
+			<language type="teo">тэсо</language>
+			<language type="tg">таджыкская</language>
+			<language type="th">тайская</language>
+			<language type="ti">тыгрынья</language>
+			<language type="tk">туркменская</language>
+			<language type="tlh">клінгон</language>
+			<language type="to">танганская</language>
+			<language type="tr">турэцкая</language>
+			<language type="tt">татарская</language>
+			<language type="twq">тасавак</language>
+			<language type="tyv" draft="unconfirmed">тувінская</language>
+			<language type="tzm">мовы тамазігхтаў</language>
+			<language type="ug">уйгурская</language>
+			<language type="uk">украінская</language>
+			<language type="und">невядомая мова</language>
+			<language type="ur">урду</language>
+			<language type="uz">узбекская</language>
+			<language type="vai">ваі</language>
+			<language type="vi">в’етнамская</language>
+			<language type="vo" draft="unconfirmed">валапюк</language>
+			<language type="vun">вуньё</language>
+			<language type="wbp">вальбіры</language>
+			<language type="wo">валоф</language>
+			<language type="xh">коса</language>
+			<language type="xog">сога</language>
+			<language type="yi" draft="contributed">ідыш</language>
+			<language type="yo">ёруба</language>
+			<language type="zap" draft="unconfirmed">сапатэкаў</language>
+			<language type="zgh">стандартны мараканскі тамазігхт</language>
+			<language type="zh">кітайская</language>
+			<language type="zh_Hans">спрошчаная кітайская</language>
+			<language type="zh_Hant">традыцыйная кітайская</language>
+			<language type="zu">зулу</language>
+			<language type="zxx">няма моўнага матэрыялу</language>
+		</languages>
+		<scripts>
+			<script type="Arab">арабскае</script>
+			<script type="Armn">армянскае</script>
+			<script type="Beng">бенгальскае</script>
+			<script type="Bopo">бапамофа</script>
+			<script type="Brai">шрыфт Брайля</script>
+			<script type="Cyrl">кірыліца</script>
+			<script type="Deva">дэванагары</script>
+			<script type="Ethi">эфіопскае</script>
+			<script type="Geor">грузінскае</script>
+			<script type="Grek">грэчаскае</script>
+			<script type="Gujr">гуджараці</script>
+			<script type="Guru">Гурмукхі</script>
+			<script type="Hang">хангыль</script>
+			<script type="Hani">хан</script>
+			<script type="Hans">спрошчанае кітайскае</script>
+			<script type="Hans" alt="stand-alone">спрошчаны хан</script>
+			<script type="Hant">традыцыйнае кітайскае</script>
+			<script type="Hant" alt="stand-alone">традыцыйны хан</script>
+			<script type="Hebr">яўрэйскае</script>
+			<script type="Hira">хірагана</script>
+			<script type="Jpan">японскае</script>
+			<script type="Kana">катакана</script>
+			<script type="Khmr">кхмерскае</script>
+			<script type="Knda">канада</script>
+			<script type="Kore">карэйскае</script>
+			<script type="Laoo">лаоскае</script>
+			<script type="Latn">лацінка</script>
+			<script type="Mlym">малаялам</script>
+			<script type="Mong">старамангольскае</script>
+			<script type="Mymr">м’янмарскае</script>
+			<script type="Orya">орыя</script>
+			<script type="Sinh">сінгальскае</script>
+			<script type="Taml">тамільскае</script>
+			<script type="Telu">тэлугу</script>
+			<script type="Thaa">тана</script>
+			<script type="Thai">тайскае</script>
+			<script type="Tibt">тыбецкае</script>
+			<script type="Zsym">сімвалы</script>
+			<script type="Zxxx">непісьменны</script>
+			<script type="Zyyy">звычайнае</script>
+			<script type="Zzzz">невядомае пісьмо</script>
+		</scripts>
+		<territories>
+			<territory type="001">Свет</territory>
+			<territory type="002">Афрыка</territory>
+			<territory type="003">Паўночная Амерыка</territory>
+			<territory type="005">Паўднёвая Амерыка</territory>
+			<territory type="009">Акіянія</territory>
+			<territory type="011">Заходняя Афрыка</territory>
+			<territory type="013">Цэнтральная Амерыка</territory>
+			<territory type="014">Усходняя Афрыка</territory>
+			<territory type="015">Паўночная Афрыка</territory>
+			<territory type="017">Цэнтральная Афрыка</territory>
+			<territory type="018">Паўднёвая Афрыка</territory>
+			<territory type="019">Паўночная і Паўднёвая Амерыкі</territory>
+			<territory type="021">Паўночнаамерыканскі рэгіён</territory>
+			<territory type="029">Карыбскія астравы</territory>
+			<territory type="030">Усходняя Азія</territory>
+			<territory type="034">Паўднёвая Азія</territory>
+			<territory type="035">Паўднёва-Усходняя Азія</territory>
+			<territory type="039">Паўднёвая Еўропа</territory>
+			<territory type="053">Аўстралазія</territory>
+			<territory type="054">Меланезія</territory>
+			<territory type="057">Мікранезійскі рэгіён</territory>
+			<territory type="061">Палінезія</territory>
+			<territory type="142">Азія</territory>
+			<territory type="143">Цэнтральная Азія</territory>
+			<territory type="145">Заходняя Азія</territory>
+			<territory type="150">Еўропа</territory>
+			<territory type="151">Усходняя Еўропа</territory>
+			<territory type="154">Паўночная Еўропа</territory>
+			<territory type="155">Заходняя Еўропа</territory>
+			<territory type="419">Лацінская Амерыка</territory>
+			<territory type="AC">Востраў Ушэсця</territory>
+			<territory type="AD">Андора</territory>
+			<territory type="AE">Аб’яднаныя Арабскія Эміраты</territory>
+			<territory type="AF">Афганістан</territory>
+			<territory type="AG">Антыгуа і Барбуда</territory>
+			<territory type="AI">Ангілья</territory>
+			<territory type="AL">Албанія</territory>
+			<territory type="AM">Арменія</territory>
+			<territory type="AO">Ангола</territory>
+			<territory type="AQ">Антарктыка</territory>
+			<territory type="AR">Аргенціна</territory>
+			<territory type="AS">Амерыканскае Самоа</territory>
+			<territory type="AT">Аўстрыя</territory>
+			<territory type="AU">Аўстралія</territory>
+			<territory type="AW">Аруба</territory>
+			<territory type="AX">Аландскія астравы</territory>
+			<territory type="AZ">Азербайджан</territory>
+			<territory type="BA">Боснія і Герцагавіна</territory>
+			<territory type="BB">Барбадас</territory>
+			<territory type="BD">Бангладэш</territory>
+			<territory type="BE">Бельгія</territory>
+			<territory type="BF">Буркіна-Фасо</territory>
+			<territory type="BG">Балгарыя</territory>
+			<territory type="BH">Бахрэйн</territory>
+			<territory type="BI">Бурундзі</territory>
+			<territory type="BJ">Бенін</territory>
+			<territory type="BL">Сен-Бартэльмі</territory>
+			<territory type="BM">Бермудскія астравы</territory>
+			<territory type="BN">Бруней</territory>
+			<territory type="BO">Балівія</territory>
+			<territory type="BQ">Карыбскія Нідэрланды</territory>
+			<territory type="BR">Бразілія</territory>
+			<territory type="BS">Багамы</territory>
+			<territory type="BT">Бутан</territory>
+			<territory type="BV">Востраў Бувэ</territory>
+			<territory type="BW">Батсвана</territory>
+			<territory type="BY">Беларусь</territory>
+			<territory type="BZ">Беліз</territory>
+			<territory type="CA">Канада</territory>
+			<territory type="CC">Какосавыя астравы</territory>
+			<territory type="CD">Конга (Кіншаса)</territory>
+			<territory type="CD" alt="variant">Дэмакратычная Рэспубліка Конга</territory>
+			<territory type="CF">Цэнтральна-Афрыканская Рэспубліка</territory>
+			<territory type="CG">Конга (Бразавіль)</territory>
+			<territory type="CG" alt="variant">Рэспубліка Конга</territory>
+			<territory type="CH">Швейцарыя</territory>
+			<territory type="CI">Кот-д’Івуар</territory>
+			<territory type="CI" alt="variant">Бераг Слановай Косці</territory>
+			<territory type="CK">Астравы Кука</territory>
+			<territory type="CL">Чылі</territory>
+			<territory type="CM">Камерун</territory>
+			<territory type="CN">Кітай</territory>
+			<territory type="CO">Калумбія</territory>
+			<territory type="CP">Востраў Кліпертон</territory>
+			<territory type="CR">Коста-Рыка</territory>
+			<territory type="CU">Куба</territory>
+			<territory type="CV">Каба-Вердэ</territory>
+			<territory type="CW">Востраў Кюрасаа</territory>
+			<territory type="CX">Востраў Раства</territory>
+			<territory type="CY">Кіпр</territory>
+			<territory type="CZ">Чэхія</territory>
+			<territory type="DE">Германія</territory>
+			<territory type="DG">Востраў Дыега-Гарсія</territory>
+			<territory type="DJ">Джыбуці</territory>
+			<territory type="DK">Данія</territory>
+			<territory type="DM">Дамініка</territory>
+			<territory type="DO">Дамініканская Рэспубліка</territory>
+			<territory type="DZ">Алжыр</territory>
+			<territory type="EA">Сеўта і Мелілья</territory>
+			<territory type="EC">Эквадор</territory>
+			<territory type="EE">Эстонія</territory>
+			<territory type="EG">Егіпет</territory>
+			<territory type="EH">Заходняя Сахара</territory>
+			<territory type="ER">Эрытрэя</territory>
+			<territory type="ES">Іспанія</territory>
+			<territory type="ET">Эфіопія</territory>
+			<territory type="EU">Еўрапейскі саюз</territory>
+			<territory type="FI">Фінляндыя</territory>
+			<territory type="FJ">Фіджы</territory>
+			<territory type="FK">Фалклендскія астравы</territory>
+			<territory type="FK" alt="variant">Фалклендскія (Мальвінскія) астравы</territory>
+			<territory type="FM">Мікранезія</territory>
+			<territory type="FO">Фарэрскія астравы</territory>
+			<territory type="FR">Францыя</territory>
+			<territory type="GA">Габон</territory>
+			<territory type="GB">Вялікабрытанія</territory>
+			<territory type="GB" alt="short">Брытанія</territory>
+			<territory type="GD">Грэнада</territory>
+			<territory type="GE">Грузія</territory>
+			<territory type="GF">Французская Гвіяна</territory>
+			<territory type="GG">Востраў Гернсі</territory>
+			<territory type="GH">Гана</territory>
+			<territory type="GI">Гібралтар</territory>
+			<territory type="GL">Грэнландыя</territory>
+			<territory type="GM">Гамбія</territory>
+			<territory type="GN">Гвінея</territory>
+			<territory type="GP">Гвадэлупа</territory>
+			<territory type="GQ">Экватарыяльная Гвінея</territory>
+			<territory type="GR">Грэцыя</territory>
+			<territory type="GS">Паўднёвая Джорджыя і Паўднёвыя Сандвічавы астравы</territory>
+			<territory type="GT">Гватэмала</territory>
+			<territory type="GU">Гуам</territory>
+			<territory type="GW">Гвінея-Бісау</territory>
+			<territory type="GY">Гаяна</territory>
+			<territory type="HK">Ганконг, САР (Кітай)</territory>
+			<territory type="HK" alt="short">Ганконг</territory>
+			<territory type="HM">Востраў Херд і астравы Макдональд</territory>
+			<territory type="HN">Гандурас</territory>
+			<territory type="HR">Харватыя</territory>
+			<territory type="HT">Гаіці</territory>
+			<territory type="HU">Венгрыя</territory>
+			<territory type="IC">Канарскія астравы</territory>
+			<territory type="ID">Інданезія</territory>
+			<territory type="IE">Ірландыя</territory>
+			<territory type="IL">Ізраіль</territory>
+			<territory type="IM">Востраў Мэн</territory>
+			<territory type="IN">Індыя</territory>
+			<territory type="IO">Брытанская тэрыторыя ў Індыйскім акіяне</territory>
+			<territory type="IQ">Ірак</territory>
+			<territory type="IR">Іран</territory>
+			<territory type="IS">Ісландыя</territory>
+			<territory type="IT">Італія</territory>
+			<territory type="JE">Востраў Джэрсі</territory>
+			<territory type="JM">Ямайка</territory>
+			<territory type="JO">Іарданія</territory>
+			<territory type="JP">Японія</territory>
+			<territory type="KE">Кенія</territory>
+			<territory type="KG">Кыргызстан</territory>
+			<territory type="KH">Камбоджа</territory>
+			<territory type="KI">Кірыбаці</territory>
+			<territory type="KM">Каморскія Астравы</territory>
+			<territory type="KN">Сент-Кітс і Невіс</territory>
+			<territory type="KP">Паўночная Карэя</territory>
+			<territory type="KR">Паўднёвая Карэя</territory>
+			<territory type="KW">Кувейт</territory>
+			<territory type="KY">Кайманавы астравы</territory>
+			<territory type="KZ">Казахстан</territory>
+			<territory type="LA">Лаос</territory>
+			<territory type="LB">Ліван</territory>
+			<territory type="LC">Сент-Люсія</territory>
+			<territory type="LI">Ліхтэнштэйн</territory>
+			<territory type="LK">Шры-Ланка</territory>
+			<territory type="LR">Ліберыя</territory>
+			<territory type="LS">Лесота</territory>
+			<territory type="LT">Літва</territory>
+			<territory type="LU">Люксембург</territory>
+			<territory type="LV">Латвія</territory>
+			<territory type="LY">Лівія</territory>
+			<territory type="MA">Марока</territory>
+			<territory type="MC">Манака</territory>
+			<territory type="MD">Малдова</territory>
+			<territory type="ME">Чарнагорыя</territory>
+			<territory type="MF">Сен-Мартэн</territory>
+			<territory type="MG">Мадагаскар</territory>
+			<territory type="MH">Маршалавы Астравы</territory>
+			<territory type="MK">Македонія</territory>
+			<territory type="MK" alt="variant">Македонія (БЮРМ)</territory>
+			<territory type="ML">Малі</territory>
+			<territory type="MM">М’янма (Бірма)</territory>
+			<territory type="MN">Манголія</territory>
+			<territory type="MO">Макаа, САР (Кітай)</territory>
+			<territory type="MO" alt="short">Макаа</territory>
+			<territory type="MP">Паўночныя Марыянскія астравы</territory>
+			<territory type="MQ">Марцініка</territory>
+			<territory type="MR">Маўрытанія</territory>
+			<territory type="MS">Мантсерат</territory>
+			<territory type="MT">Мальта</territory>
+			<territory type="MU">Маўрыкій</territory>
+			<territory type="MV">Мальдывы</territory>
+			<territory type="MW">Малаві</territory>
+			<territory type="MX">Мексіка</territory>
+			<territory type="MY">Малайзія</territory>
+			<territory type="MZ">Мазамбік</territory>
+			<territory type="NA">Намібія</territory>
+			<territory type="NC">Новая Каледонія</territory>
+			<territory type="NE">Нігер</territory>
+			<territory type="NF">Востраў Норфалк</territory>
+			<territory type="NG">Нігерыя</territory>
+			<territory type="NI">Нікарагуа</territory>
+			<territory type="NL">Нідэрланды</territory>
+			<territory type="NO">Нарвегія</territory>
+			<territory type="NP">Непал</territory>
+			<territory type="NR">Науру</territory>
+			<territory type="NU">Ніуэ</territory>
+			<territory type="NZ">Новая Зеландыя</territory>
+			<territory type="OM">Аман</territory>
+			<territory type="PA">Панама</territory>
+			<territory type="PE">Перу</territory>
+			<territory type="PF">Французская Палінезія</territory>
+			<territory type="PG">Папуа — Новая Гвінея</territory>
+			<territory type="PH">Філіпіны</territory>
+			<territory type="PK">Пакістан</territory>
+			<territory type="PL">Польшча</territory>
+			<territory type="PM">Сен-П’ер і Мікелон</territory>
+			<territory type="PN">Астравы Піткэрн</territory>
+			<territory type="PR">Пуэрта-Рыка</territory>
+			<territory type="PS">Палестынскія тэрыторыі</territory>
+			<territory type="PS" alt="short">Палесціна</territory>
+			<territory type="PT">Партугалія</territory>
+			<territory type="PW">Палау</territory>
+			<territory type="PY">Парагвай</territory>
+			<territory type="QA">Катар</territory>
+			<territory type="QO">Вонкавая Акіянія</territory>
+			<territory type="RE">Рэюньён</territory>
+			<territory type="RO">Румынія</territory>
+			<territory type="RS">Сербія</territory>
+			<territory type="RU">Расія</territory>
+			<territory type="RW">Руанда</territory>
+			<territory type="SA">Саудаўская Аравія</territory>
+			<territory type="SB">Саламонавы Астравы</territory>
+			<territory type="SC">Сейшэльскія Астравы</territory>
+			<territory type="SD">Судан</territory>
+			<territory type="SE">Швецыя</territory>
+			<territory type="SG">Сінгапур</territory>
+			<territory type="SH">Востраў Святой Алены</territory>
+			<territory type="SI">Славенія</territory>
+			<territory type="SJ">Свальбард (Паўночна-Усходняя Зямля) і Ян-Маен</territory>
+			<territory type="SK">Славакія</territory>
+			<territory type="SL">Сьера-Леонэ</territory>
+			<territory type="SM">Сан-Марына</territory>
+			<territory type="SN">Сенегал</territory>
+			<territory type="SO">Самалі</territory>
+			<territory type="SR">Сурынам</territory>
+			<territory type="SS">Паўднёвы Судан</territory>
+			<territory type="ST">Сан-Тамэ і Прынсіпі</territory>
+			<territory type="SV">Сальвадор</territory>
+			<territory type="SX">Сінт-Мартэн</territory>
+			<territory type="SY">Сірыя</territory>
+			<territory type="SZ">Свазіленд</territory>
+			<territory type="TA">Трыстан-да-Кунья</territory>
+			<territory type="TC">Цёркс і Кайкас</territory>
+			<territory type="TD">Чад</territory>
+			<territory type="TF">Французскія Паўднёвыя тэрыторыі</territory>
+			<territory type="TG">Тога</territory>
+			<territory type="TH">Тайланд</territory>
+			<territory type="TJ">Таджыкістан</territory>
+			<territory type="TK">Такелау</territory>
+			<territory type="TL">Усходні Тымор</territory>
+			<territory type="TM">Туркменістан</territory>
+			<territory type="TN">Туніс</territory>
+			<territory type="TO">Тонга</territory>
+			<territory type="TR">Турцыя</territory>
+			<territory type="TT">Трынідад і Табага</territory>
+			<territory type="TV">Тувалу</territory>
+			<territory type="TW">Тайвань</territory>
+			<territory type="TZ">Танзанія</territory>
+			<territory type="UA">Украіна</territory>
+			<territory type="UG">Уганда</territory>
+			<territory type="UM">Знешнія малыя астравы ЗША</territory>
+			<territory type="US">Злучаныя Штаты Амерыкі</territory>
+			<territory type="US" alt="short">ЗША</territory>
+			<territory type="UY">Уругвай</territory>
+			<territory type="UZ">Узбекістан</territory>
+			<territory type="VA">Ватыкан</territory>
+			<territory type="VC">Сент-Вінсент і Грэнадзіны</territory>
+			<territory type="VE">Венесуэла</territory>
+			<territory type="VG">Брытанскія Віргінскія астравы</territory>
+			<territory type="VI">Амерыканскія Віргінскія астравы</territory>
+			<territory type="VN">В’етнам</territory>
+			<territory type="VU">Вануату</territory>
+			<territory type="WF">Уоліс і Футуна</territory>
+			<territory type="WS">Самоа</territory>
+			<territory type="XK">Косава</territory>
+			<territory type="YE">Емен</territory>
+			<territory type="YT">Востраў Маёта</territory>
+			<territory type="ZA">Паўднёва-Афрыканская Рэспубліка</territory>
+			<territory type="ZM">Замбія</territory>
+			<territory type="ZW">Зімбабвэ</territory>
+			<territory type="ZZ">Невядомы рэгіён</territory>
+		</territories>
+		<keys>
+			<key type="calendar">каляндар</key>
+			<key type="collation">сартаванне</key>
+			<key type="currency">валюта</key>
+			<key type="hc">часавы цыкл (12 і 24)</key>
+			<key type="lb">правілы разрыву радка</key>
+			<key type="ms">сістэма мер</key>
+			<key type="numbers">лічбы</key>
+		</keys>
+		<types>
+			<type key="calendar" type="buddhist">будыйскі каляндар</type>
+			<type key="calendar" type="chinese">кітайскі каляндар</type>
+			<type key="calendar" type="dangi">каляндар дангі</type>
+			<type key="calendar" type="ethiopic">эфіопскі каляндар</type>
+			<type key="calendar" type="gregorian">грыгарыянскі каляндар</type>
+			<type key="calendar" type="hebrew">яўрэйскі каляндар</type>
+			<type key="calendar" type="islamic">мусульманскі каляндар</type>
+			<type key="calendar" type="islamic-civil">мусульманскі свецкі каляндар</type>
+			<type key="calendar" type="iso8601">каляндар ISO-8601</type>
+			<type key="calendar" type="japanese">японскі каляндар</type>
+			<type key="calendar" type="persian">персідскі каляндар</type>
+			<type key="calendar" type="roc">каляндар Міньго</type>
+			<type key="collation" type="ducet">стандартнае сартаванне Unicode</type>
+			<type key="collation" type="search">універсальны пошук</type>
+			<type key="collation" type="standard">стандартнае сартаванне</type>
+			<type key="hc" type="h11">12-гадзінны фармат часу (0-11)</type>
+			<type key="hc" type="h12">12-гадзінны фармат часу (1-12)</type>
+			<type key="hc" type="h23">24-гадзінны фармат часу (0-23)</type>
+			<type key="hc" type="h24">24-гадзінны фармат часу (1-24)</type>
+			<type key="lb" type="loose">гібкія правілы разрыву радка</type>
+			<type key="lb" type="normal">стандартныя правілы разрыву радка</type>
+			<type key="lb" type="strict">строгія правілы разрыву радка</type>
+			<type key="ms" type="metric">метрычная сістэма мер</type>
+			<type key="ms" type="uksystem">брытанская сістэма мер</type>
+			<type key="ms" type="ussystem">амерыканская сістэма мер</type>
+			<type key="numbers" type="arab">арабска-індыйскія лічбы</type>
+			<type key="numbers" type="arabext">пашыраная сістэма арабска-індыйскіх лічбаў</type>
+			<type key="numbers" type="armn">армянскія лічбы</type>
+			<type key="numbers" type="armnlow">армянскія лічбы ў ніжнім рэгістры</type>
+			<type key="numbers" type="beng">бенгальскія лічбы</type>
+			<type key="numbers" type="deva">лічбы дэванагары</type>
+			<type key="numbers" type="ethi">эфіопскія лічбы</type>
+			<type key="numbers" type="fullwide">поўнашырынныя лічбы</type>
+			<type key="numbers" type="geor">грузінскія лічбы</type>
+			<type key="numbers" type="grek">грэчаскія лічбы</type>
+			<type key="numbers" type="greklow">грэчаскія лічбы ў ніжнім рэгістры</type>
+			<type key="numbers" type="gujr">лічбы гуджараці</type>
+			<type key="numbers" type="guru">лічбы гурмукхі</type>
+			<type key="numbers" type="hanidec">кітайскія дзесятковыя лічбы</type>
+			<type key="numbers" type="hans">кітайскія спрошчаныя лічбы</type>
+			<type key="numbers" type="hansfin">кітайскія спрошчаныя лічбы (фінансы)</type>
+			<type key="numbers" type="hant">кітайскія традыцыйныя лічбы</type>
+			<type key="numbers" type="hantfin">кітайскія традыцыйныя лічбы (фінансы)</type>
+			<type key="numbers" type="hebr">яўрэйскія лічбы</type>
+			<type key="numbers" type="jpan">японскія лічбы</type>
+			<type key="numbers" type="jpanfin">японскія лічбы (фінансы)</type>
+			<type key="numbers" type="khmr">хмерскія лічбы</type>
+			<type key="numbers" type="knda">лічбы каннада</type>
+			<type key="numbers" type="laoo">лаоскія лічбы</type>
+			<type key="numbers" type="latn">сучасныя арабскія лічбы</type>
+			<type key="numbers" type="mlym">лічбы малаялам</type>
+			<type key="numbers" type="mymr">бірманскія лічбы</type>
+			<type key="numbers" type="orya">лічбы орыя</type>
+			<type key="numbers" type="roman">рымскія лічбы</type>
+			<type key="numbers" type="romanlow">рымскія лічбы ў ніжнім рэгістры</type>
+			<type key="numbers" type="taml">тамільскія традыцыйныя лічбы</type>
+			<type key="numbers" type="tamldec">тамільскія лічбы</type>
+			<type key="numbers" type="telu">лічбы тэлугу</type>
+			<type key="numbers" type="thai">тайскія лічбы</type>
+			<type key="numbers" type="tibt">тыбецкія лічбы</type>
+		</types>
+		<measurementSystemNames>
+			<measurementSystemName type="metric">метрычная</measurementSystemName>
+			<measurementSystemName type="UK">брытанская</measurementSystemName>
+			<measurementSystemName type="US">амерыканская</measurementSystemName>
+		</measurementSystemNames>
+		<codePatterns>
+			<codePattern type="language">Мова: {0}</codePattern>
+			<codePattern type="script">Пісьмо: {0}</codePattern>
+			<codePattern type="territory">Рэгіён: {0}</codePattern>
+		</codePatterns>
+	</localeDisplayNames>
+	<characters>
+		<exemplarCharacters>[а б в г д {дж} {дз} е ё ж з і й к л м н о п р с т у ў ф х ц ч ш ы ь э ю я]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[{а\u0301} {е\u0301} {ё\u0301} {і\u0301} {о\u0301} {у\u0301} {ы\u0301} {э\u0301} {ю\u0301} {я\u0301}]</exemplarCharacters>
+		<exemplarCharacters type="index" draft="contributed">[А Б В Г Д Е Ж З І Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Ы Э Ю Я]</exemplarCharacters>
+		<ellipsis type="final">{0}…</ellipsis>
+		<ellipsis type="initial">…{0}</ellipsis>
+		<ellipsis type="medial">{0}…{1}</ellipsis>
+		<ellipsis type="word-final">{0} …</ellipsis>
+		<ellipsis type="word-initial">… {0}</ellipsis>
+		<ellipsis type="word-medial">{0} … {1}</ellipsis>
+		<moreInformation>?</moreInformation>
+	</characters>
+	<delimiters>
+		<quotationStart>«</quotationStart>
+		<quotationEnd>»</quotationEnd>
+		<alternateQuotationStart>«</alternateQuotationStart>
+		<alternateQuotationEnd>»</alternateQuotationEnd>
+	</delimiters>
+	<dates>
+		<calendars>
+			<calendar type="buddhist">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE, d MMMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d MMMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>d MMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>d.M.yy</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="Ed">E, d</dateFormatItem>
+						<dateFormatItem id="Gy">G y</dateFormatItem>
+						<dateFormatItem id="hm">h.mm a</dateFormatItem>
+						<dateFormatItem id="Hm">HH.mm</dateFormatItem>
+						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
+						<dateFormatItem id="Hms">HH.mm.ss</dateFormatItem>
+						<dateFormatItem id="M">L</dateFormatItem>
+						<dateFormatItem id="Md">d.M</dateFormatItem>
+						<dateFormatItem id="MEd">E, d.M</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+						<dateFormatItem id="y">G y</dateFormatItem>
+						<dateFormatItem id="yM">M.y</dateFormatItem>
+						<dateFormatItem id="yMd">d.M.y</dateFormatItem>
+						<dateFormatItem id="yMEd">E, d.M.y</dateFormatItem>
+						<dateFormatItem id="yMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="yMMMd">d MMM y G</dateFormatItem>
+						<dateFormatItem id="yMMMEd">E, d MMM y G</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE, d MMMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d MMMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>d.M.y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>d.M.y GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} 'у' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} 'у' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
+						<dateFormatItem id="Ed">E, d</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="hm">h.mm a</dateFormatItem>
+						<dateFormatItem id="Hm">HH.mm</dateFormatItem>
+						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
+						<dateFormatItem id="Hms">HH.mm.ss</dateFormatItem>
+						<dateFormatItem id="M">L</dateFormatItem>
+						<dateFormatItem id="Md">d.M</dateFormatItem>
+						<dateFormatItem id="MEd">E, d.M</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
+						<dateFormatItem id="ms" draft="contributed">mm.ss</dateFormatItem>
+						<dateFormatItem id="y">y G</dateFormatItem>
+						<dateFormatItem id="yyyy">y G</dateFormatItem>
+						<dateFormatItem id="yyyyM">M.y G</dateFormatItem>
+						<dateFormatItem id="yyyyMd">d.M.y G</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E, d.M.y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">LLL y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">d MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">LLLL y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d–d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="h" draft="unconfirmed">h–h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H" draft="unconfirmed">HH–HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="h" draft="unconfirmed">h.mm–h.mm a</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">h.mm–h.mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H" draft="unconfirmed">HH.mm–HH.mm</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">HH.mm–HH.mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="h" draft="unconfirmed">h.mm–h.mm a v</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">h.mm–h.mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H" draft="unconfirmed">HH.mm–HH.mm v</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">HH.mm–HH.mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="h" draft="unconfirmed">h–h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H" draft="unconfirmed">HH–HH v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">M–M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">d.M – d.M</greatestDifference>
+							<greatestDifference id="M">d.M – d.M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">E, d.M – E, d.M</greatestDifference>
+							<greatestDifference id="M">E, d.M – E, d.M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">LLL–LLL</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">d–d MMM</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">E, d – E, d MMM</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">y–y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">M.y – M.y G</greatestDifference>
+							<greatestDifference id="y">M.y – M.y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">d.M.y – d.M.y G</greatestDifference>
+							<greatestDifference id="M">d.M.y – d.M.y G</greatestDifference>
+							<greatestDifference id="y">d.M.y – d.M.y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">E, d.M.y – E, d.M.y G</greatestDifference>
+							<greatestDifference id="M">E, d.M.y – E, d.M.y G</greatestDifference>
+							<greatestDifference id="y">E, d.M.y – E, d.M.y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">LLL–LLL y G</greatestDifference>
+							<greatestDifference id="y">LLL y – LLL y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">d–d MMM y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">E, d – E, d MMM y G</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM y G</greatestDifference>
+							<greatestDifference id="y">E, d MMM y – E, d MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">LLLL–LLLL y G</greatestDifference>
+							<greatestDifference id="y">LLLL y – LLLL y G</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">сту</month>
+							<month type="2">лют</month>
+							<month type="3">сак</month>
+							<month type="4">кра</month>
+							<month type="5">мая</month>
+							<month type="6">чэр</month>
+							<month type="7">ліп</month>
+							<month type="8">жні</month>
+							<month type="9">вер</month>
+							<month type="10">кас</month>
+							<month type="11">ліс</month>
+							<month type="12">сне</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">с</month>
+							<month type="2">л</month>
+							<month type="3">с</month>
+							<month type="4">к</month>
+							<month type="5">м</month>
+							<month type="6">ч</month>
+							<month type="7">л</month>
+							<month type="8">ж</month>
+							<month type="9">в</month>
+							<month type="10">к</month>
+							<month type="11">л</month>
+							<month type="12">с</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">студзеня</month>
+							<month type="2">лютага</month>
+							<month type="3">сакавіка</month>
+							<month type="4">красавіка</month>
+							<month type="5">мая</month>
+							<month type="6">чэрвеня</month>
+							<month type="7">ліпеня</month>
+							<month type="8">жніўня</month>
+							<month type="9">верасня</month>
+							<month type="10">кастрычніка</month>
+							<month type="11">лістапада</month>
+							<month type="12">снежня</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">сту</month>
+							<month type="2">лют</month>
+							<month type="3">сак</month>
+							<month type="4">кра</month>
+							<month type="5">май</month>
+							<month type="6">чэр</month>
+							<month type="7">ліп</month>
+							<month type="8">жні</month>
+							<month type="9">вер</month>
+							<month type="10">кас</month>
+							<month type="11">ліс</month>
+							<month type="12">сне</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">с</month>
+							<month type="2">л</month>
+							<month type="3">с</month>
+							<month type="4">к</month>
+							<month type="5">м</month>
+							<month type="6">ч</month>
+							<month type="7">л</month>
+							<month type="8">ж</month>
+							<month type="9">в</month>
+							<month type="10">к</month>
+							<month type="11">л</month>
+							<month type="12">с</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">студзень</month>
+							<month type="2">люты</month>
+							<month type="3">сакавік</month>
+							<month type="4">красавік</month>
+							<month type="5">май</month>
+							<month type="6">чэрвень</month>
+							<month type="7">ліпень</month>
+							<month type="8">жнівень</month>
+							<month type="9">верасень</month>
+							<month type="10">кастрычнік</month>
+							<month type="11">лістапад</month>
+							<month type="12">снежань</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="abbreviated">
+							<day type="sun">нд</day>
+							<day type="mon">пн</day>
+							<day type="tue">аў</day>
+							<day type="wed">ср</day>
+							<day type="thu">чц</day>
+							<day type="fri">пт</day>
+							<day type="sat">сб</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun">н</day>
+							<day type="mon">п</day>
+							<day type="tue">а</day>
+							<day type="wed">с</day>
+							<day type="thu">ч</day>
+							<day type="fri">п</day>
+							<day type="sat">с</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">нд</day>
+							<day type="mon">пн</day>
+							<day type="tue">аў</day>
+							<day type="wed">ср</day>
+							<day type="thu">чц</day>
+							<day type="fri">пт</day>
+							<day type="sat">сб</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun">нядзеля</day>
+							<day type="mon">панядзелак</day>
+							<day type="tue">аўторак</day>
+							<day type="wed">серада</day>
+							<day type="thu">чацвер</day>
+							<day type="fri">пятніца</day>
+							<day type="sat">субота</day>
+						</dayWidth>
+					</dayContext>
+					<dayContext type="stand-alone">
+						<dayWidth type="abbreviated">
+							<day type="sun">нд</day>
+							<day type="mon">пн</day>
+							<day type="tue">аў</day>
+							<day type="wed">ср</day>
+							<day type="thu">чц</day>
+							<day type="fri">пт</day>
+							<day type="sat">сб</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun">н</day>
+							<day type="mon">п</day>
+							<day type="tue">а</day>
+							<day type="wed">с</day>
+							<day type="thu">ч</day>
+							<day type="fri">п</day>
+							<day type="sat">с</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">нд</day>
+							<day type="mon">пн</day>
+							<day type="tue">аў</day>
+							<day type="wed">ср</day>
+							<day type="thu">чц</day>
+							<day type="fri">пт</day>
+							<day type="sat">сб</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun">нядзеля</day>
+							<day type="mon">панядзелак</day>
+							<day type="tue">аўторак</day>
+							<day type="wed">серада</day>
+							<day type="thu">чацвер</day>
+							<day type="fri">пятніца</day>
+							<day type="sat">субота</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<quarters>
+					<quarterContext type="format">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">1-шы кв.</quarter>
+							<quarter type="2">2-гі кв.</quarter>
+							<quarter type="3">3-ці кв.</quarter>
+							<quarter type="4">4-ты кв.</quarter>
+						</quarterWidth>
+						<quarterWidth type="narrow">
+							<quarter type="1">1</quarter>
+							<quarter type="2">2</quarter>
+							<quarter type="3">3</quarter>
+							<quarter type="4">4</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1">1-шы квартал</quarter>
+							<quarter type="2">2-гі квартал</quarter>
+							<quarter type="3">3-ці квартал</quarter>
+							<quarter type="4">4-ты квартал</quarter>
+						</quarterWidth>
+					</quarterContext>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">1-шы кв.</quarter>
+							<quarter type="2">2-гі кв.</quarter>
+							<quarter type="3">3-ці кв.</quarter>
+							<quarter type="4">4-ты кв.</quarter>
+						</quarterWidth>
+						<quarterWidth type="narrow">
+							<quarter type="1">1</quarter>
+							<quarter type="2">2</quarter>
+							<quarter type="3">3</quarter>
+							<quarter type="4">4</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1">1-шы квартал</quarter>
+							<quarter type="2">2-гі квартал</quarter>
+							<quarter type="3">3-ці квартал</quarter>
+							<quarter type="4">4-ты квартал</quarter>
+						</quarterWidth>
+					</quarterContext>
+				</quarters>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">раніцы</dayPeriod>
+							<dayPeriod type="pm">вечара</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">ран.</dayPeriod>
+							<dayPeriod type="pm">веч.</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">да паўдня</dayPeriod>
+							<dayPeriod type="pm">пасля паўдня</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">раніцы</dayPeriod>
+							<dayPeriod type="pm">вечара</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">раніцы</dayPeriod>
+							<dayPeriod type="pm">вечара</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">да паўдня</dayPeriod>
+							<dayPeriod type="pm">пасля паўдня</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<eras>
+					<eraNames>
+						<era type="0">да нашай эры</era>
+						<era type="1">нашай эры</era>
+						<era type="1" alt="variant">наша эра</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">да н.э.</era>
+						<era type="1">н.э.</era>
+					</eraAbbr>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE, d MMMM y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d MMMM y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>d.M.y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>d.M.yy</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH.mm.ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH.mm.ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH.mm.ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH.mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} 'у' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} 'у' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
+						<dateFormatItem id="Ed">d, E</dateFormatItem>
+						<dateFormatItem id="Ehm">E hh.mm a</dateFormatItem>
+						<dateFormatItem id="EHm">E HH.mm</dateFormatItem>
+						<dateFormatItem id="Ehms">E hh.mm.ss a</dateFormatItem>
+						<dateFormatItem id="EHms">E HH.mm.ss</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="h">hh a</dateFormatItem>
+						<dateFormatItem id="H">HH</dateFormatItem>
+						<dateFormatItem id="hm">hh.mm a</dateFormatItem>
+						<dateFormatItem id="Hm">HH.mm</dateFormatItem>
+						<dateFormatItem id="hms">hh.mm.ss a</dateFormatItem>
+						<dateFormatItem id="Hms">HH.mm.ss</dateFormatItem>
+						<dateFormatItem id="hmsv">hh.mm.ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH.mm.ss v</dateFormatItem>
+						<dateFormatItem id="hmv">hh.mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH.mm v</dateFormatItem>
+						<dateFormatItem id="M">L</dateFormatItem>
+						<dateFormatItem id="Md">d.M</dateFormatItem>
+						<dateFormatItem id="MEd">E, d.M</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMEd">E, d MMMM</dateFormatItem>
+						<dateFormatItem id="ms">mm.ss</dateFormatItem>
+						<dateFormatItem id="y">y</dateFormatItem>
+						<dateFormatItem id="yM">M.y</dateFormatItem>
+						<dateFormatItem id="yMd">d.M.y</dateFormatItem>
+						<dateFormatItem id="yMEd">E, d.M.y</dateFormatItem>
+						<dateFormatItem id="yMMM">LLL y</dateFormatItem>
+						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMEd">E, d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMM">LLLL y</dateFormatItem>
+						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
+						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
+					</availableFormats>
+					<appendItems>
+						<appendItem request="Timezone">{0} {1}</appendItem>
+					</appendItems>
+					<intervalFormats>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d–d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">h a – h a</greatestDifference>
+							<greatestDifference id="h">h–h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">hh.mm a – hh.mm a</greatestDifference>
+							<greatestDifference id="h">hh.mm–hh.mm a</greatestDifference>
+							<greatestDifference id="m">hh.mm–hh.mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">HH.mm–HH.mm</greatestDifference>
+							<greatestDifference id="m">HH.mm–HH.mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">hh.mm a – hh.mm a v</greatestDifference>
+							<greatestDifference id="h">hh.mm–hh.mm a v</greatestDifference>
+							<greatestDifference id="m">hh.mm–hh.mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH.mm–HH.mm v</greatestDifference>
+							<greatestDifference id="m">HH.mm–HH.mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">h a – h a v</greatestDifference>
+							<greatestDifference id="h">h–h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">M–M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">d.M – d.M</greatestDifference>
+							<greatestDifference id="M">d.M – d.M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">E, d.M – E, d.M</greatestDifference>
+							<greatestDifference id="M">E, d.M – E, d.M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">LLL–LLL</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">d–d MMM</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">E, d – E, d MMM</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">M.y – M.y</greatestDifference>
+							<greatestDifference id="y">M.y – M.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">d.M.y – d.M.y</greatestDifference>
+							<greatestDifference id="M">d.M.y – d.M.y</greatestDifference>
+							<greatestDifference id="y">d.M.y – d.M.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">E, d.M.y – E, d.M.y</greatestDifference>
+							<greatestDifference id="M">E, d.M.y – E, d.M.y</greatestDifference>
+							<greatestDifference id="y">E, d.M.y – E, d.M.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">LLL–LLL y</greatestDifference>
+							<greatestDifference id="y">LLL y – LLL y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">d–d MMM y</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">E, d – E, d MMM y</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM y</greatestDifference>
+							<greatestDifference id="y">E, d MMM y – E, d MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">LLLL–LLLL y</greatestDifference>
+							<greatestDifference id="y">LLLL y – LLLL y</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="era">
+				<displayName>эра</displayName>
+			</field>
+			<field type="year">
+				<displayName>год</displayName>
+				<relative type="-1">у мінулым годзе</relative>
+				<relative type="0">у гэтым годзе</relative>
+				<relative type="1">у наступным годзе</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">праз {0} год</relativeTimePattern>
+					<relativeTimePattern count="few">праз {0} гады</relativeTimePattern>
+					<relativeTimePattern count="many">праз {0} гадоў</relativeTimePattern>
+					<relativeTimePattern count="other">праз {0} года</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} год таму</relativeTimePattern>
+					<relativeTimePattern count="few">{0} гады таму</relativeTimePattern>
+					<relativeTimePattern count="many">{0} гадоў таму</relativeTimePattern>
+					<relativeTimePattern count="other">{0} года таму</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-short">
+				<displayName>г.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">праз {0} г.</relativeTimePattern>
+					<relativeTimePattern count="few">праз {0} г.</relativeTimePattern>
+					<relativeTimePattern count="many">праз {0} г.</relativeTimePattern>
+					<relativeTimePattern count="other">праз {0} г.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} г. таму</relativeTimePattern>
+					<relativeTimePattern count="few">{0} г. таму</relativeTimePattern>
+					<relativeTimePattern count="many">{0} г. таму</relativeTimePattern>
+					<relativeTimePattern count="other">{0} г. таму</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-narrow">
+				<displayName>г.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">праз {0} г.</relativeTimePattern>
+					<relativeTimePattern count="few">праз {0} г.</relativeTimePattern>
+					<relativeTimePattern count="many">праз {0} г.</relativeTimePattern>
+					<relativeTimePattern count="other">праз {0} г.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} г. таму</relativeTimePattern>
+					<relativeTimePattern count="few">{0} г. таму</relativeTimePattern>
+					<relativeTimePattern count="many">{0} г. таму</relativeTimePattern>
+					<relativeTimePattern count="other">{0} г. таму</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter">
+				<displayName>квартал</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">праз {0} квартал</relativeTimePattern>
+					<relativeTimePattern count="few">праз {0} кварталы</relativeTimePattern>
+					<relativeTimePattern count="many">праз {0} кварталаў</relativeTimePattern>
+					<relativeTimePattern count="other">праз {0} квартала</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} квартал таму</relativeTimePattern>
+					<relativeTimePattern count="few">{0} кварталы таму</relativeTimePattern>
+					<relativeTimePattern count="many">{0} кварталаў таму</relativeTimePattern>
+					<relativeTimePattern count="other">{0} квартала таму</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-short">
+				<displayName>кв.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">праз {0} кв.</relativeTimePattern>
+					<relativeTimePattern count="few">праз {0} кв.</relativeTimePattern>
+					<relativeTimePattern count="many">праз {0} кв.</relativeTimePattern>
+					<relativeTimePattern count="other">праз {0} кв.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} кв. таму</relativeTimePattern>
+					<relativeTimePattern count="few">{0} кв. таму</relativeTimePattern>
+					<relativeTimePattern count="many">{0} кв. таму</relativeTimePattern>
+					<relativeTimePattern count="other">{0} кв. таму</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-narrow">
+				<displayName>кв.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">праз {0} кв.</relativeTimePattern>
+					<relativeTimePattern count="few">праз {0} кв.</relativeTimePattern>
+					<relativeTimePattern count="many">праз {0} кв.</relativeTimePattern>
+					<relativeTimePattern count="other">праз {0} кв.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} кв. таму</relativeTimePattern>
+					<relativeTimePattern count="few">{0} кв. таму</relativeTimePattern>
+					<relativeTimePattern count="many">{0} кв. таму</relativeTimePattern>
+					<relativeTimePattern count="other">{0} кв. таму</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month">
+				<displayName>месяц</displayName>
+				<relative type="-1">у мінулым месяцы</relative>
+				<relative type="0">у гэтым месяцы</relative>
+				<relative type="1">у наступным месяцы</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">праз {0} месяц</relativeTimePattern>
+					<relativeTimePattern count="few">праз {0} месяцы</relativeTimePattern>
+					<relativeTimePattern count="many">праз {0} месяцаў</relativeTimePattern>
+					<relativeTimePattern count="other">праз {0} месяца</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} месяц таму</relativeTimePattern>
+					<relativeTimePattern count="few">{0} месяцы таму</relativeTimePattern>
+					<relativeTimePattern count="many">{0} месяцаў таму</relativeTimePattern>
+					<relativeTimePattern count="other">{0} месяца таму</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-short">
+				<displayName>мес.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">праз {0} мес.</relativeTimePattern>
+					<relativeTimePattern count="few">праз {0} мес.</relativeTimePattern>
+					<relativeTimePattern count="many">праз {0} мес.</relativeTimePattern>
+					<relativeTimePattern count="other">праз {0} мес.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} мес. таму</relativeTimePattern>
+					<relativeTimePattern count="few">{0} мес. таму</relativeTimePattern>
+					<relativeTimePattern count="many">{0} мес. таму</relativeTimePattern>
+					<relativeTimePattern count="other">{0} мес. таму</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-narrow">
+				<displayName>мес.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">праз {0} мес.</relativeTimePattern>
+					<relativeTimePattern count="few">праз {0} мес.</relativeTimePattern>
+					<relativeTimePattern count="many">праз {0} мес.</relativeTimePattern>
+					<relativeTimePattern count="other">праз {0} мес.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} мес. таму</relativeTimePattern>
+					<relativeTimePattern count="few">{0} мес. таму</relativeTimePattern>
+					<relativeTimePattern count="many">{0} мес. таму</relativeTimePattern>
+					<relativeTimePattern count="other">{0} мес. таму</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week">
+				<displayName>тыдзень</displayName>
+				<relative type="-1">на мінулым тыдні</relative>
+				<relative type="0">на гэтым тыдні</relative>
+				<relative type="1">на наступным тыдні</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">праз {0} тыдзень</relativeTimePattern>
+					<relativeTimePattern count="few">праз {0} тыдні</relativeTimePattern>
+					<relativeTimePattern count="many">праз {0} тыдняў</relativeTimePattern>
+					<relativeTimePattern count="other">праз {0} тыдня</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} тыдзень таму</relativeTimePattern>
+					<relativeTimePattern count="few">{0} тыдні таму</relativeTimePattern>
+					<relativeTimePattern count="many">{0} тыдняў таму</relativeTimePattern>
+					<relativeTimePattern count="other">{0} тыдня таму</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-short">
+				<displayName>тыд.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">праз {0} тыд.</relativeTimePattern>
+					<relativeTimePattern count="few">праз {0} тыд.</relativeTimePattern>
+					<relativeTimePattern count="many">праз {0} тыд.</relativeTimePattern>
+					<relativeTimePattern count="other">праз {0} тыд.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} тыд. таму</relativeTimePattern>
+					<relativeTimePattern count="few">{0} тыд. таму</relativeTimePattern>
+					<relativeTimePattern count="many">{0} тыд. таму</relativeTimePattern>
+					<relativeTimePattern count="other">{0} тыд. таму</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-narrow">
+				<displayName>тыд.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">праз {0} тыд.</relativeTimePattern>
+					<relativeTimePattern count="few">праз {0} тыд.</relativeTimePattern>
+					<relativeTimePattern count="many">праз {0} тыд.</relativeTimePattern>
+					<relativeTimePattern count="other">праз {0} тыд.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} тыд. таму</relativeTimePattern>
+					<relativeTimePattern count="few">{0} тыд. таму</relativeTimePattern>
+					<relativeTimePattern count="many">{0} тыд. таму</relativeTimePattern>
+					<relativeTimePattern count="other">{0} тыд. таму</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day">
+				<displayName>дзень</displayName>
+				<relative type="-2">пазаўчора</relative>
+				<relative type="-1">учора</relative>
+				<relative type="0">сёння</relative>
+				<relative type="1">заўтра</relative>
+				<relative type="2">паслязаўтра</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">праз {0} дзень</relativeTimePattern>
+					<relativeTimePattern count="few">праз {0} дні</relativeTimePattern>
+					<relativeTimePattern count="many">праз {0} дзён</relativeTimePattern>
+					<relativeTimePattern count="other">праз {0} дня</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} дзень таму</relativeTimePattern>
+					<relativeTimePattern count="few">{0} дні таму</relativeTimePattern>
+					<relativeTimePattern count="many">{0} дзён таму</relativeTimePattern>
+					<relativeTimePattern count="other">{0} дня таму</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-short">
+				<displayName>дзень</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">праз {0} дзень</relativeTimePattern>
+					<relativeTimePattern count="few">праз {0} дні</relativeTimePattern>
+					<relativeTimePattern count="many">праз {0} дзён</relativeTimePattern>
+					<relativeTimePattern count="other">праз {0} дня</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} дзень таму</relativeTimePattern>
+					<relativeTimePattern count="few">{0} дні таму</relativeTimePattern>
+					<relativeTimePattern count="many">{0} дзён таму</relativeTimePattern>
+					<relativeTimePattern count="other">{0} дня таму</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-narrow">
+				<displayName>д.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">праз {0} д.</relativeTimePattern>
+					<relativeTimePattern count="few">праз {0} д.</relativeTimePattern>
+					<relativeTimePattern count="many">праз {0} д.</relativeTimePattern>
+					<relativeTimePattern count="other">праз {0} д.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} д. таму</relativeTimePattern>
+					<relativeTimePattern count="few">{0} д. таму</relativeTimePattern>
+					<relativeTimePattern count="many">{0} д. таму</relativeTimePattern>
+					<relativeTimePattern count="other">{0} д. таму</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="weekday">
+				<displayName>дзень тыдня</displayName>
+			</field>
+			<field type="sun">
+				<relative type="-1">у мінулую нядзелю</relative>
+				<relative type="0">у гэту нядзелю</relative>
+				<relative type="1">у наступную нядзелю</relative>
+			</field>
+			<field type="sun-short">
+				<relative type="-1">у мінулую нд</relative>
+				<relative type="0">у гэту нд</relative>
+				<relative type="1">у наступную нд</relative>
+			</field>
+			<field type="sun-narrow">
+				<relative type="-1">у мінулую нд</relative>
+				<relative type="0">у гэту нд</relative>
+				<relative type="1">у наступную нд</relative>
+			</field>
+			<field type="mon">
+				<relative type="-1">у мінулы панядзелак</relative>
+				<relative type="0">у гэты панядзелак</relative>
+				<relative type="1">у наступны панядзелак</relative>
+			</field>
+			<field type="mon-short">
+				<relative type="-1">у мінулы пн</relative>
+				<relative type="0">у гэты пн</relative>
+				<relative type="1">у наступны пн</relative>
+			</field>
+			<field type="mon-narrow">
+				<relative type="-1">у мінулы пн</relative>
+				<relative type="0">у гэты пн</relative>
+				<relative type="1">у наступны пн</relative>
+			</field>
+			<field type="tue">
+				<relative type="-1">у мінулы аўторак</relative>
+				<relative type="0">у гэты аўторак</relative>
+				<relative type="1">у наступны аўторак</relative>
+			</field>
+			<field type="tue-short">
+				<relative type="-1">у мінулы аў</relative>
+				<relative type="0">у гэты аў</relative>
+				<relative type="1">у наступны аў</relative>
+			</field>
+			<field type="tue-narrow">
+				<relative type="-1">у мінулы аў</relative>
+				<relative type="0">у гэты аў</relative>
+				<relative type="1">у наступны аў</relative>
+			</field>
+			<field type="wed">
+				<relative type="-1">у мінулую сераду</relative>
+				<relative type="0">у гэту сераду</relative>
+				<relative type="1">у наступную сераду</relative>
+			</field>
+			<field type="wed-short">
+				<relative type="-1">у мінулую ср</relative>
+				<relative type="0">у гэту ср</relative>
+				<relative type="1">у наступную ср</relative>
+			</field>
+			<field type="wed-narrow">
+				<relative type="-1">у мінулую ср</relative>
+				<relative type="0">у гэту ср</relative>
+				<relative type="1">у наступную ср</relative>
+			</field>
+			<field type="thu">
+				<relative type="-1">у мінулы чацвер</relative>
+				<relative type="0">у гэты чацвер</relative>
+				<relative type="1">у наступны чацвер</relative>
+			</field>
+			<field type="thu-short">
+				<relative type="-1">у мінулы чц</relative>
+				<relative type="0">у гэты чц</relative>
+				<relative type="1">у наступны чц</relative>
+			</field>
+			<field type="thu-narrow">
+				<relative type="-1">у мінулы чц</relative>
+				<relative type="0">у гэты чц</relative>
+				<relative type="1">у наступны чц</relative>
+			</field>
+			<field type="fri">
+				<relative type="-1">у мінулую пятніцу</relative>
+				<relative type="0">у гэту пятніцу</relative>
+				<relative type="1">у наступную пятніцу</relative>
+			</field>
+			<field type="fri-short">
+				<relative type="-1">у мінулую пт</relative>
+				<relative type="0">у гэту пт</relative>
+				<relative type="1">у наступную пт</relative>
+			</field>
+			<field type="fri-narrow">
+				<relative type="-1">у мінулую пт</relative>
+				<relative type="0">у гэту пт</relative>
+				<relative type="1">у наступную пт</relative>
+			</field>
+			<field type="sat">
+				<relative type="-1">у мінулую суботу</relative>
+				<relative type="0">у гэту суботу</relative>
+				<relative type="1">у наступную суботу</relative>
+			</field>
+			<field type="sat-short">
+				<relative type="-1">у мінулую сб</relative>
+				<relative type="0">у гэту сб</relative>
+				<relative type="1">у наступную сб</relative>
+			</field>
+			<field type="sat-narrow">
+				<relative type="-1">у мінулую сб</relative>
+				<relative type="0">у гэту сб</relative>
+				<relative type="1">у наступную сб</relative>
+			</field>
+			<field type="dayperiod">
+				<displayName>ДП/ПП</displayName>
+			</field>
+			<field type="hour">
+				<displayName>гадзіна</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">праз {0} гадзіну</relativeTimePattern>
+					<relativeTimePattern count="few">праз {0} гадзіны</relativeTimePattern>
+					<relativeTimePattern count="many">праз {0} гадзін</relativeTimePattern>
+					<relativeTimePattern count="other">праз {0} гадзіны</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} гадзіна таму</relativeTimePattern>
+					<relativeTimePattern count="few">{0} гадзіны таму</relativeTimePattern>
+					<relativeTimePattern count="many">{0} гадзін таму</relativeTimePattern>
+					<relativeTimePattern count="other">{0} гадзіны таму</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-short">
+				<displayName>гадз.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">праз {0} гадз.</relativeTimePattern>
+					<relativeTimePattern count="few">праз {0} гадз.</relativeTimePattern>
+					<relativeTimePattern count="many">праз {0} гадз.</relativeTimePattern>
+					<relativeTimePattern count="other">праз {0} гадз.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} гадз. таму</relativeTimePattern>
+					<relativeTimePattern count="few">{0} гадз. таму</relativeTimePattern>
+					<relativeTimePattern count="many">{0} гадз. таму</relativeTimePattern>
+					<relativeTimePattern count="other">{0} гадз. таму</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-narrow">
+				<displayName>гадз.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">праз {0} гадз.</relativeTimePattern>
+					<relativeTimePattern count="few">праз {0} гадз.</relativeTimePattern>
+					<relativeTimePattern count="many">праз {0} гадз.</relativeTimePattern>
+					<relativeTimePattern count="other">праз {0} гадз.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} гадз. таму</relativeTimePattern>
+					<relativeTimePattern count="few">{0} гадз. таму</relativeTimePattern>
+					<relativeTimePattern count="many">{0} гадз. таму</relativeTimePattern>
+					<relativeTimePattern count="other">{0} гадз. таму</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute">
+				<displayName>хвіліна</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">праз {0} хвіліну</relativeTimePattern>
+					<relativeTimePattern count="few">праз {0} хвіліны</relativeTimePattern>
+					<relativeTimePattern count="many">праз {0} хвілін</relativeTimePattern>
+					<relativeTimePattern count="other">праз {0} хвіліны</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} хвіліна таму</relativeTimePattern>
+					<relativeTimePattern count="few">{0} хвіліны таму</relativeTimePattern>
+					<relativeTimePattern count="many">{0} хвілін таму</relativeTimePattern>
+					<relativeTimePattern count="other">{0} хвіліны таму</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-short">
+				<displayName>хв.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">праз {0} хв.</relativeTimePattern>
+					<relativeTimePattern count="few">праз {0} хв.</relativeTimePattern>
+					<relativeTimePattern count="many">праз {0} хв.</relativeTimePattern>
+					<relativeTimePattern count="other">праз {0} хв.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} хв. таму</relativeTimePattern>
+					<relativeTimePattern count="few">{0} хв. таму</relativeTimePattern>
+					<relativeTimePattern count="many">{0} хв. таму</relativeTimePattern>
+					<relativeTimePattern count="other">{0} хв. таму</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-narrow">
+				<displayName>хв.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">праз {0} хв.</relativeTimePattern>
+					<relativeTimePattern count="few">праз {0} хв.</relativeTimePattern>
+					<relativeTimePattern count="many">праз {0} хв.</relativeTimePattern>
+					<relativeTimePattern count="other">праз {0} хв.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} хв. таму</relativeTimePattern>
+					<relativeTimePattern count="few">{0} хв. таму</relativeTimePattern>
+					<relativeTimePattern count="many">{0} хв. таму</relativeTimePattern>
+					<relativeTimePattern count="other">{0} хв. таму</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second">
+				<displayName>секунда</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">праз {0} секунду</relativeTimePattern>
+					<relativeTimePattern count="few">праз {0} секунды</relativeTimePattern>
+					<relativeTimePattern count="many">праз {0} секунд</relativeTimePattern>
+					<relativeTimePattern count="other">праз {0} секунды</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} секунда таму</relativeTimePattern>
+					<relativeTimePattern count="few">{0} секунды таму</relativeTimePattern>
+					<relativeTimePattern count="many">{0} секунд таму</relativeTimePattern>
+					<relativeTimePattern count="other">{0} секунды таму</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-short">
+				<displayName>сек.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">праз {0} сек.</relativeTimePattern>
+					<relativeTimePattern count="few">праз {0} сек.</relativeTimePattern>
+					<relativeTimePattern count="many">праз {0} сек.</relativeTimePattern>
+					<relativeTimePattern count="other">праз {0} сек.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} сек. таму</relativeTimePattern>
+					<relativeTimePattern count="few">{0} сек. таму</relativeTimePattern>
+					<relativeTimePattern count="many">{0} сек. таму</relativeTimePattern>
+					<relativeTimePattern count="other">{0} сек. таму</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-narrow">
+				<displayName>сек.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">праз {0} сек.</relativeTimePattern>
+					<relativeTimePattern count="few">праз {0} сек.</relativeTimePattern>
+					<relativeTimePattern count="many">праз {0} сек.</relativeTimePattern>
+					<relativeTimePattern count="other">праз {0} сек.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} сек. таму</relativeTimePattern>
+					<relativeTimePattern count="few">{0} сек. таму</relativeTimePattern>
+					<relativeTimePattern count="many">{0} сек. таму</relativeTimePattern>
+					<relativeTimePattern count="other">{0} сек. таму</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="zone">
+				<displayName>часавы пояс</displayName>
+			</field>
+		</fields>
+		<timeZoneNames>
+			<hourFormat>+HH.mm;-HH.mm</hourFormat>
+			<gmtFormat>GMT{0}</gmtFormat>
+			<gmtZeroFormat>GMT</gmtZeroFormat>
+			<regionFormat>Час: {0}</regionFormat>
+			<regionFormat type="daylight">{0} (+1)</regionFormat>
+			<regionFormat type="standard">{0} (+0)</regionFormat>
+			<fallbackFormat>{1} ({0})</fallbackFormat>
+			<zone type="Etc/Unknown">
+				<exemplarCity>Невядомы горад</exemplarCity>
+			</zone>
+			<zone type="Europe/Andorra">
+				<exemplarCity>Андора</exemplarCity>
+			</zone>
+			<zone type="Asia/Dubai">
+				<exemplarCity>Дубай</exemplarCity>
+			</zone>
+			<zone type="Asia/Kabul">
+				<exemplarCity>Кабул</exemplarCity>
+			</zone>
+			<zone type="America/Antigua">
+				<exemplarCity>Антыгуа</exemplarCity>
+			</zone>
+			<zone type="America/Anguilla">
+				<exemplarCity>Ангілья</exemplarCity>
+			</zone>
+			<zone type="Europe/Tirane">
+				<exemplarCity>Тырана</exemplarCity>
+			</zone>
+			<zone type="Asia/Yerevan">
+				<exemplarCity>Ерэван</exemplarCity>
+			</zone>
+			<zone type="Africa/Luanda">
+				<exemplarCity>Луанда</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Rothera">
+				<exemplarCity>Ратэра</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Palmer">
+				<exemplarCity>Палмер</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Troll">
+				<exemplarCity>Трол</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Syowa">
+				<exemplarCity>Сёва</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Mawson">
+				<exemplarCity>Моўсан</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Davis">
+				<exemplarCity>Дэйвіс</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Vostok">
+				<exemplarCity>Усход</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Casey">
+				<exemplarCity>Кэйсі</exemplarCity>
+			</zone>
+			<zone type="Antarctica/DumontDUrville">
+				<exemplarCity>Дзюмон-Дзюрвіль</exemplarCity>
+			</zone>
+			<zone type="Antarctica/McMurdo">
+				<exemplarCity>Мак-Мерда</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Rio_Gallegos">
+				<exemplarCity>Рыа-Гальегас</exemplarCity>
+			</zone>
+			<zone type="America/Mendoza">
+				<exemplarCity>Мендоса</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/San_Juan">
+				<exemplarCity>Сан-Хуан</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Ushuaia">
+				<exemplarCity>Ушуая</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/La_Rioja">
+				<exemplarCity>Ла-Рыёха</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/San_Luis">
+				<exemplarCity>Сан-Луіс</exemplarCity>
+			</zone>
+			<zone type="America/Catamarca">
+				<exemplarCity>Катамарка</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Salta">
+				<exemplarCity>Сальта</exemplarCity>
+			</zone>
+			<zone type="America/Jujuy">
+				<exemplarCity>Жужуй</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Tucuman">
+				<exemplarCity>Тукуман</exemplarCity>
+			</zone>
+			<zone type="America/Cordoba">
+				<exemplarCity>Кордава</exemplarCity>
+			</zone>
+			<zone type="America/Buenos_Aires">
+				<exemplarCity>Буэнас-Айрэс</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pago_Pago">
+				<exemplarCity>Пага-Пага</exemplarCity>
+			</zone>
+			<zone type="Europe/Vienna">
+				<exemplarCity>Вена</exemplarCity>
+			</zone>
+			<zone type="Australia/Perth">
+				<exemplarCity>Перт</exemplarCity>
+			</zone>
+			<zone type="Australia/Eucla">
+				<exemplarCity>Юкла</exemplarCity>
+			</zone>
+			<zone type="Australia/Darwin">
+				<exemplarCity>Дарвін</exemplarCity>
+			</zone>
+			<zone type="Australia/Adelaide">
+				<exemplarCity>Адэлаіда</exemplarCity>
+			</zone>
+			<zone type="Australia/Broken_Hill">
+				<exemplarCity>Брокен-Хіл</exemplarCity>
+			</zone>
+			<zone type="Australia/Currie">
+				<exemplarCity>Керы</exemplarCity>
+			</zone>
+			<zone type="Australia/Melbourne">
+				<exemplarCity>Мельбурн</exemplarCity>
+			</zone>
+			<zone type="Australia/Hobart">
+				<exemplarCity>Хобарт</exemplarCity>
+			</zone>
+			<zone type="Australia/Lindeman">
+				<exemplarCity>Ліндэман</exemplarCity>
+			</zone>
+			<zone type="Australia/Sydney">
+				<exemplarCity>Сідней</exemplarCity>
+			</zone>
+			<zone type="Australia/Brisbane">
+				<exemplarCity>Брысбен</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Macquarie">
+				<exemplarCity>Макуоры</exemplarCity>
+			</zone>
+			<zone type="Australia/Lord_Howe">
+				<exemplarCity>Лорд-Хау</exemplarCity>
+			</zone>
+			<zone type="America/Aruba">
+				<exemplarCity>Аруба</exemplarCity>
+			</zone>
+			<zone type="Europe/Mariehamn">
+				<exemplarCity>Марыехамн</exemplarCity>
+			</zone>
+			<zone type="Asia/Baku">
+				<exemplarCity>Баку</exemplarCity>
+			</zone>
+			<zone type="Europe/Sarajevo">
+				<exemplarCity>Сараева</exemplarCity>
+			</zone>
+			<zone type="America/Barbados">
+				<exemplarCity>Барбадас</exemplarCity>
+			</zone>
+			<zone type="Asia/Dhaka">
+				<exemplarCity>Дака</exemplarCity>
+			</zone>
+			<zone type="Europe/Brussels">
+				<exemplarCity>Брусель</exemplarCity>
+			</zone>
+			<zone type="Africa/Ouagadougou">
+				<exemplarCity>Уагадугу</exemplarCity>
+			</zone>
+			<zone type="Europe/Sofia">
+				<exemplarCity>Сафія</exemplarCity>
+			</zone>
+			<zone type="Asia/Bahrain">
+				<exemplarCity>Бахрэйн</exemplarCity>
+			</zone>
+			<zone type="Africa/Bujumbura">
+				<exemplarCity>Бужумбура</exemplarCity>
+			</zone>
+			<zone type="Africa/Porto-Novo">
+				<exemplarCity>Порта-Нова</exemplarCity>
+			</zone>
+			<zone type="America/St_Barthelemy">
+				<exemplarCity>Сен-Бартэльмі</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Bermuda">
+				<exemplarCity>Бермудскія астравы</exemplarCity>
+			</zone>
+			<zone type="Asia/Brunei">
+				<exemplarCity>Бруней</exemplarCity>
+			</zone>
+			<zone type="America/La_Paz">
+				<exemplarCity>Ла-Пас</exemplarCity>
+			</zone>
+			<zone type="America/Kralendijk">
+				<exemplarCity>Кралендэйк</exemplarCity>
+			</zone>
+			<zone type="America/Eirunepe">
+				<exemplarCity>Эйрунэпе</exemplarCity>
+			</zone>
+			<zone type="America/Rio_Branco">
+				<exemplarCity>Рыу-Бранку</exemplarCity>
+			</zone>
+			<zone type="America/Porto_Velho">
+				<exemplarCity>Порту-Велью</exemplarCity>
+			</zone>
+			<zone type="America/Boa_Vista">
+				<exemplarCity>Боа-Віста</exemplarCity>
+			</zone>
+			<zone type="America/Manaus">
+				<exemplarCity>Манаус</exemplarCity>
+			</zone>
+			<zone type="America/Cuiaba">
+				<exemplarCity>Куяба</exemplarCity>
+			</zone>
+			<zone type="America/Santarem">
+				<exemplarCity>Сантарэн</exemplarCity>
+			</zone>
+			<zone type="America/Campo_Grande">
+				<exemplarCity>Кампу-Гранды</exemplarCity>
+			</zone>
+			<zone type="America/Belem">
+				<exemplarCity>Белен</exemplarCity>
+			</zone>
+			<zone type="America/Araguaina">
+				<exemplarCity>Арагуаіна</exemplarCity>
+			</zone>
+			<zone type="America/Sao_Paulo">
+				<exemplarCity>Сан-Паўлу</exemplarCity>
+			</zone>
+			<zone type="America/Bahia">
+				<exemplarCity>Баія</exemplarCity>
+			</zone>
+			<zone type="America/Fortaleza">
+				<exemplarCity>Фарталеза</exemplarCity>
+			</zone>
+			<zone type="America/Maceio">
+				<exemplarCity>Масеё</exemplarCity>
+			</zone>
+			<zone type="America/Recife">
+				<exemplarCity>Рэсіфі</exemplarCity>
+			</zone>
+			<zone type="America/Noronha">
+				<exemplarCity>Наронья</exemplarCity>
+			</zone>
+			<zone type="America/Nassau">
+				<exemplarCity>Насау</exemplarCity>
+			</zone>
+			<zone type="Asia/Thimphu">
+				<exemplarCity>Тхімпху</exemplarCity>
+			</zone>
+			<zone type="Africa/Gaborone">
+				<exemplarCity>Габаронэ</exemplarCity>
+			</zone>
+			<zone type="Europe/Minsk">
+				<exemplarCity>Мінск</exemplarCity>
+			</zone>
+			<zone type="America/Belize">
+				<exemplarCity>Беліз</exemplarCity>
+			</zone>
+			<zone type="America/Dawson">
+				<exemplarCity>Доўсан</exemplarCity>
+			</zone>
+			<zone type="America/Whitehorse">
+				<exemplarCity>Уайтхорс</exemplarCity>
+			</zone>
+			<zone type="America/Inuvik">
+				<exemplarCity>Інувік</exemplarCity>
+			</zone>
+			<zone type="America/Vancouver">
+				<exemplarCity>Ванкувер</exemplarCity>
+			</zone>
+			<zone type="America/Dawson_Creek">
+				<exemplarCity>Досан-Крык</exemplarCity>
+			</zone>
+			<zone type="America/Creston">
+				<exemplarCity>Крэстан</exemplarCity>
+			</zone>
+			<zone type="America/Yellowknife">
+				<exemplarCity>Елаўнайф</exemplarCity>
+			</zone>
+			<zone type="America/Edmonton">
+				<exemplarCity>Эдмантан</exemplarCity>
+			</zone>
+			<zone type="America/Swift_Current">
+				<exemplarCity>Свіфт Керэнт</exemplarCity>
+			</zone>
+			<zone type="America/Cambridge_Bay">
+				<exemplarCity>Кеймбрыдж-Бэй</exemplarCity>
+			</zone>
+			<zone type="America/Regina">
+				<exemplarCity>Рэджайна</exemplarCity>
+			</zone>
+			<zone type="America/Winnipeg">
+				<exemplarCity>Вініпег</exemplarCity>
+			</zone>
+			<zone type="America/Resolute">
+				<exemplarCity>Рэзальют</exemplarCity>
+			</zone>
+			<zone type="America/Rainy_River">
+				<exemplarCity>Рэйні-Рывер</exemplarCity>
+			</zone>
+			<zone type="America/Rankin_Inlet">
+				<exemplarCity>Ранкін-Інлет</exemplarCity>
+			</zone>
+			<zone type="America/Coral_Harbour">
+				<exemplarCity>Атыкокан</exemplarCity>
+			</zone>
+			<zone type="America/Thunder_Bay">
+				<exemplarCity>Тандэр-Бэй</exemplarCity>
+			</zone>
+			<zone type="America/Nipigon">
+				<exemplarCity>Ніпігон</exemplarCity>
+			</zone>
+			<zone type="America/Toronto">
+				<exemplarCity>Таронта</exemplarCity>
+			</zone>
+			<zone type="America/Iqaluit">
+				<exemplarCity>Ікалуіт</exemplarCity>
+			</zone>
+			<zone type="America/Pangnirtung">
+				<exemplarCity>Пангніртунг</exemplarCity>
+			</zone>
+			<zone type="America/Moncton">
+				<exemplarCity>Манктон</exemplarCity>
+			</zone>
+			<zone type="America/Halifax">
+				<exemplarCity>Галіфакс</exemplarCity>
+			</zone>
+			<zone type="America/Goose_Bay">
+				<exemplarCity>Гус-Бэй</exemplarCity>
+			</zone>
+			<zone type="America/Glace_Bay">
+				<exemplarCity>Глэйс-Бэй</exemplarCity>
+			</zone>
+			<zone type="America/Blanc-Sablon">
+				<exemplarCity>Бланк-Саблон</exemplarCity>
+			</zone>
+			<zone type="America/St_Johns">
+				<exemplarCity>Сент-Джонс</exemplarCity>
+			</zone>
+			<zone type="Indian/Cocos">
+				<exemplarCity>Какосавыя астравы</exemplarCity>
+			</zone>
+			<zone type="Africa/Kinshasa">
+				<exemplarCity>Кіншаса</exemplarCity>
+			</zone>
+			<zone type="Africa/Lubumbashi">
+				<exemplarCity>Лубумбашы</exemplarCity>
+			</zone>
+			<zone type="Africa/Bangui">
+				<exemplarCity>Бангі</exemplarCity>
+			</zone>
+			<zone type="Africa/Brazzaville">
+				<exemplarCity>Бразавіль</exemplarCity>
+			</zone>
+			<zone type="Europe/Zurich">
+				<exemplarCity>Цюрых</exemplarCity>
+			</zone>
+			<zone type="Africa/Abidjan">
+				<exemplarCity>Абіджан</exemplarCity>
+			</zone>
+			<zone type="Pacific/Rarotonga">
+				<exemplarCity>Раратонга</exemplarCity>
+			</zone>
+			<zone type="Pacific/Easter">
+				<exemplarCity>Пасхі востраў</exemplarCity>
+			</zone>
+			<zone type="America/Santiago">
+				<exemplarCity>Сант’яга</exemplarCity>
+			</zone>
+			<zone type="Africa/Douala">
+				<exemplarCity>Дуала</exemplarCity>
+			</zone>
+			<zone type="Asia/Urumqi">
+				<exemplarCity>Урумчы</exemplarCity>
+			</zone>
+			<zone type="Asia/Shanghai">
+				<exemplarCity>Шанхай</exemplarCity>
+			</zone>
+			<zone type="America/Bogota">
+				<exemplarCity>Багата</exemplarCity>
+			</zone>
+			<zone type="America/Costa_Rica">
+				<exemplarCity>Коста-Рыка</exemplarCity>
+			</zone>
+			<zone type="America/Havana">
+				<exemplarCity>Гавана</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Cape_Verde">
+				<exemplarCity>Каба-Вердэ</exemplarCity>
+			</zone>
+			<zone type="America/Curacao">
+				<exemplarCity>Кюрасаа</exemplarCity>
+			</zone>
+			<zone type="Indian/Christmas">
+				<exemplarCity>Востраў Раства</exemplarCity>
+			</zone>
+			<zone type="Asia/Nicosia">
+				<exemplarCity>Нікасія</exemplarCity>
+			</zone>
+			<zone type="Europe/Prague">
+				<exemplarCity>Прага</exemplarCity>
+			</zone>
+			<zone type="Europe/Busingen">
+				<exemplarCity>Бюзінген</exemplarCity>
+			</zone>
+			<zone type="Europe/Berlin">
+				<exemplarCity>Берлін</exemplarCity>
+			</zone>
+			<zone type="Africa/Djibouti">
+				<exemplarCity>Джыбуці</exemplarCity>
+			</zone>
+			<zone type="Europe/Copenhagen">
+				<exemplarCity>Капенгаген</exemplarCity>
+			</zone>
+			<zone type="America/Dominica">
+				<exemplarCity>Дамініка</exemplarCity>
+			</zone>
+			<zone type="America/Santo_Domingo">
+				<exemplarCity>Санта-Дамінга</exemplarCity>
+			</zone>
+			<zone type="Africa/Algiers">
+				<exemplarCity>Алжыр</exemplarCity>
+			</zone>
+			<zone type="Pacific/Galapagos">
+				<exemplarCity>Галапагас</exemplarCity>
+			</zone>
+			<zone type="America/Guayaquil">
+				<exemplarCity>Гуаякіль</exemplarCity>
+			</zone>
+			<zone type="Europe/Tallinn">
+				<exemplarCity>Талін</exemplarCity>
+			</zone>
+			<zone type="Africa/Cairo">
+				<exemplarCity>Каір</exemplarCity>
+			</zone>
+			<zone type="Africa/El_Aaiun">
+				<exemplarCity>Эль-Аюн</exemplarCity>
+			</zone>
+			<zone type="Africa/Asmera">
+				<exemplarCity>Асмара</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Canary">
+				<exemplarCity>Канарскія астравы</exemplarCity>
+			</zone>
+			<zone type="Africa/Ceuta">
+				<exemplarCity>Сеўта</exemplarCity>
+			</zone>
+			<zone type="Europe/Madrid">
+				<exemplarCity>Мадрыд</exemplarCity>
+			</zone>
+			<zone type="Africa/Addis_Ababa">
+				<exemplarCity>Адыс-Абеба</exemplarCity>
+			</zone>
+			<zone type="Europe/Helsinki">
+				<exemplarCity>Хельсінкі</exemplarCity>
+			</zone>
+			<zone type="Pacific/Fiji">
+				<exemplarCity>Фіджы</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Stanley">
+				<exemplarCity>Стэнлі</exemplarCity>
+			</zone>
+			<zone type="Pacific/Truk">
+				<exemplarCity>Чуўк</exemplarCity>
+			</zone>
+			<zone type="Pacific/Ponape">
+				<exemplarCity>Панпеі</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kosrae">
+				<exemplarCity>Кусаіе</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Faeroe">
+				<exemplarCity>Фарэрскія астравы</exemplarCity>
+			</zone>
+			<zone type="Europe/Paris">
+				<exemplarCity>Парыж</exemplarCity>
+			</zone>
+			<zone type="Africa/Libreville">
+				<exemplarCity>Лібрэвіль</exemplarCity>
+			</zone>
+			<zone type="Europe/London">
+				<long>
+					<daylight>Брытанскі летні час</daylight>
+				</long>
+				<exemplarCity>Лондан</exemplarCity>
+			</zone>
+			<zone type="America/Grenada">
+				<exemplarCity>Грэнада</exemplarCity>
+			</zone>
+			<zone type="Asia/Tbilisi">
+				<exemplarCity>Тбілісі</exemplarCity>
+			</zone>
+			<zone type="America/Cayenne">
+				<exemplarCity>Каена</exemplarCity>
+			</zone>
+			<zone type="Europe/Guernsey">
+				<exemplarCity>Гернсі</exemplarCity>
+			</zone>
+			<zone type="Africa/Accra">
+				<exemplarCity>Акра</exemplarCity>
+			</zone>
+			<zone type="Europe/Gibraltar">
+				<exemplarCity>Гібралтар</exemplarCity>
+			</zone>
+			<zone type="America/Thule">
+				<exemplarCity>Туле</exemplarCity>
+			</zone>
+			<zone type="America/Godthab">
+				<exemplarCity>Нуўк</exemplarCity>
+			</zone>
+			<zone type="America/Scoresbysund">
+				<exemplarCity>Ілакортаарміут</exemplarCity>
+			</zone>
+			<zone type="America/Danmarkshavn">
+				<exemplarCity>Данмарксхаўн</exemplarCity>
+			</zone>
+			<zone type="Africa/Banjul">
+				<exemplarCity>Банжул</exemplarCity>
+			</zone>
+			<zone type="Africa/Conakry">
+				<exemplarCity>Конакры</exemplarCity>
+			</zone>
+			<zone type="America/Guadeloupe">
+				<exemplarCity>Гвадэлупа</exemplarCity>
+			</zone>
+			<zone type="Africa/Malabo">
+				<exemplarCity>Малаба</exemplarCity>
+			</zone>
+			<zone type="Europe/Athens">
+				<exemplarCity>Афіны</exemplarCity>
+			</zone>
+			<zone type="Atlantic/South_Georgia">
+				<exemplarCity>Паўднёвая Джорджыя</exemplarCity>
+			</zone>
+			<zone type="America/Guatemala">
+				<exemplarCity>Гватэмала</exemplarCity>
+			</zone>
+			<zone type="Pacific/Guam">
+				<exemplarCity>Гуам</exemplarCity>
+			</zone>
+			<zone type="Africa/Bissau">
+				<exemplarCity>Бісау</exemplarCity>
+			</zone>
+			<zone type="America/Guyana">
+				<exemplarCity>Гаяна</exemplarCity>
+			</zone>
+			<zone type="Asia/Hong_Kong">
+				<exemplarCity>Ганконг</exemplarCity>
+			</zone>
+			<zone type="America/Tegucigalpa">
+				<exemplarCity>Тэгусігальпа</exemplarCity>
+			</zone>
+			<zone type="Europe/Zagreb">
+				<exemplarCity>Заграб</exemplarCity>
+			</zone>
+			<zone type="America/Port-au-Prince">
+				<exemplarCity>Порт-о-Прэнс</exemplarCity>
+			</zone>
+			<zone type="Europe/Budapest">
+				<exemplarCity>Будапешт</exemplarCity>
+			</zone>
+			<zone type="Asia/Jakarta">
+				<exemplarCity>Джакарта</exemplarCity>
+			</zone>
+			<zone type="Asia/Pontianak">
+				<exemplarCity>Панціянак</exemplarCity>
+			</zone>
+			<zone type="Asia/Makassar">
+				<exemplarCity>Макасар</exemplarCity>
+			</zone>
+			<zone type="Asia/Jayapura">
+				<exemplarCity>Джаяпура</exemplarCity>
+			</zone>
+			<zone type="Europe/Dublin">
+				<long>
+					<daylight>Ірландскі стандартны час</daylight>
+				</long>
+				<exemplarCity>Дублін</exemplarCity>
+			</zone>
+			<zone type="Asia/Jerusalem">
+				<exemplarCity>Іерусалім</exemplarCity>
+			</zone>
+			<zone type="Europe/Isle_of_Man">
+				<exemplarCity>Востраў Мэн</exemplarCity>
+			</zone>
+			<zone type="Asia/Calcutta">
+				<exemplarCity>Калькута</exemplarCity>
+			</zone>
+			<zone type="Indian/Chagos">
+				<exemplarCity>Чагас</exemplarCity>
+			</zone>
+			<zone type="Asia/Baghdad">
+				<exemplarCity>Багдад</exemplarCity>
+			</zone>
+			<zone type="Asia/Tehran">
+				<exemplarCity>Тэгеран</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Reykjavik">
+				<exemplarCity>Рэйк’явік</exemplarCity>
+			</zone>
+			<zone type="Europe/Rome">
+				<exemplarCity>Рым</exemplarCity>
+			</zone>
+			<zone type="Europe/Jersey">
+				<exemplarCity>Джэрсі</exemplarCity>
+			</zone>
+			<zone type="America/Jamaica">
+				<exemplarCity>Ямайка</exemplarCity>
+			</zone>
+			<zone type="Asia/Amman">
+				<exemplarCity>Аман (горад)</exemplarCity>
+			</zone>
+			<zone type="Asia/Tokyo">
+				<exemplarCity>Токіа</exemplarCity>
+			</zone>
+			<zone type="Africa/Nairobi">
+				<exemplarCity>Найробі</exemplarCity>
+			</zone>
+			<zone type="Asia/Bishkek">
+				<exemplarCity>Бішкек</exemplarCity>
+			</zone>
+			<zone type="Asia/Phnom_Penh">
+				<exemplarCity>Пнампень</exemplarCity>
+			</zone>
+			<zone type="Pacific/Enderbury">
+				<exemplarCity>Эндэрберы</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kiritimati">
+				<exemplarCity>Кірыцімаці</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tarawa">
+				<exemplarCity>Тарава</exemplarCity>
+			</zone>
+			<zone type="Indian/Comoro">
+				<exemplarCity>Камор</exemplarCity>
+			</zone>
+			<zone type="America/St_Kitts">
+				<exemplarCity>Сент-Кітс</exemplarCity>
+			</zone>
+			<zone type="Asia/Pyongyang">
+				<exemplarCity>Пхеньян</exemplarCity>
+			</zone>
+			<zone type="Asia/Seoul">
+				<exemplarCity>Сеул</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuwait">
+				<exemplarCity>Кувейт</exemplarCity>
+			</zone>
+			<zone type="America/Cayman">
+				<exemplarCity>Кайман</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtau">
+				<exemplarCity>Актау</exemplarCity>
+			</zone>
+			<zone type="Asia/Oral">
+				<exemplarCity>Уральск</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtobe">
+				<exemplarCity>Актабэ</exemplarCity>
+			</zone>
+			<zone type="Asia/Qyzylorda">
+				<exemplarCity>Кызыларда</exemplarCity>
+			</zone>
+			<zone type="Asia/Almaty">
+				<exemplarCity>Алматы</exemplarCity>
+			</zone>
+			<zone type="Asia/Vientiane">
+				<exemplarCity>В’енцьян</exemplarCity>
+			</zone>
+			<zone type="Asia/Beirut">
+				<exemplarCity>Бейрут</exemplarCity>
+			</zone>
+			<zone type="America/St_Lucia">
+				<exemplarCity>Сент-Люсія</exemplarCity>
+			</zone>
+			<zone type="Europe/Vaduz">
+				<exemplarCity>Вадуц</exemplarCity>
+			</zone>
+			<zone type="Asia/Colombo">
+				<exemplarCity>Каломба</exemplarCity>
+			</zone>
+			<zone type="Africa/Monrovia">
+				<exemplarCity>Манровія</exemplarCity>
+			</zone>
+			<zone type="Africa/Maseru">
+				<exemplarCity>Масеру</exemplarCity>
+			</zone>
+			<zone type="Europe/Vilnius">
+				<exemplarCity>Вільнюс</exemplarCity>
+			</zone>
+			<zone type="Europe/Luxembourg">
+				<exemplarCity>Люксембург</exemplarCity>
+			</zone>
+			<zone type="Europe/Riga">
+				<exemplarCity>Рыга</exemplarCity>
+			</zone>
+			<zone type="Africa/Tripoli">
+				<exemplarCity>Трыпалі</exemplarCity>
+			</zone>
+			<zone type="Africa/Casablanca">
+				<exemplarCity>Касабланка</exemplarCity>
+			</zone>
+			<zone type="Europe/Monaco">
+				<exemplarCity>Манака</exemplarCity>
+			</zone>
+			<zone type="Europe/Chisinau">
+				<exemplarCity>Кішынёў</exemplarCity>
+			</zone>
+			<zone type="Europe/Podgorica">
+				<exemplarCity>Падгорыца</exemplarCity>
+			</zone>
+			<zone type="America/Marigot">
+				<exemplarCity>Марыго</exemplarCity>
+			</zone>
+			<zone type="Indian/Antananarivo">
+				<exemplarCity>Антананарыву</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kwajalein">
+				<exemplarCity>Кваджалейн</exemplarCity>
+			</zone>
+			<zone type="Pacific/Majuro">
+				<exemplarCity>Маджура</exemplarCity>
+			</zone>
+			<zone type="Europe/Skopje">
+				<exemplarCity>Скоп’е</exemplarCity>
+			</zone>
+			<zone type="Africa/Bamako">
+				<exemplarCity>Бамако</exemplarCity>
+			</zone>
+			<zone type="Asia/Rangoon">
+				<exemplarCity>Рангун</exemplarCity>
+			</zone>
+			<zone type="Asia/Hovd">
+				<exemplarCity>Хоўд</exemplarCity>
+			</zone>
+			<zone type="Asia/Ulaanbaatar">
+				<exemplarCity>Улан-Батар</exemplarCity>
+			</zone>
+			<zone type="Asia/Choibalsan">
+				<exemplarCity>Чайбалсан</exemplarCity>
+			</zone>
+			<zone type="Asia/Macau">
+				<exemplarCity>Макаа</exemplarCity>
+			</zone>
+			<zone type="Pacific/Saipan">
+				<exemplarCity>Сайпан</exemplarCity>
+			</zone>
+			<zone type="America/Martinique">
+				<exemplarCity>Марцініка</exemplarCity>
+			</zone>
+			<zone type="Africa/Nouakchott">
+				<exemplarCity>Нуакшот</exemplarCity>
+			</zone>
+			<zone type="America/Montserrat">
+				<exemplarCity>Мантсерат</exemplarCity>
+			</zone>
+			<zone type="Europe/Malta">
+				<exemplarCity>Мальта</exemplarCity>
+			</zone>
+			<zone type="Indian/Mauritius">
+				<exemplarCity>Маўрыкій</exemplarCity>
+			</zone>
+			<zone type="Indian/Maldives">
+				<exemplarCity>Мальдывы</exemplarCity>
+			</zone>
+			<zone type="Africa/Blantyre">
+				<exemplarCity>Блантайр</exemplarCity>
+			</zone>
+			<zone type="America/Tijuana">
+				<exemplarCity>Тыхуана</exemplarCity>
+			</zone>
+			<zone type="America/Santa_Isabel">
+				<exemplarCity>Санта-Ісабель</exemplarCity>
+			</zone>
+			<zone type="America/Hermosillo">
+				<exemplarCity>Эрмасілья</exemplarCity>
+			</zone>
+			<zone type="America/Mazatlan">
+				<exemplarCity>Масатлан</exemplarCity>
+			</zone>
+			<zone type="America/Chihuahua">
+				<exemplarCity>Чыуауа</exemplarCity>
+			</zone>
+			<zone type="America/Bahia_Banderas">
+				<exemplarCity>Баія-дэ-Бандэрас</exemplarCity>
+			</zone>
+			<zone type="America/Ojinaga">
+				<exemplarCity>Ахінага</exemplarCity>
+			</zone>
+			<zone type="America/Monterrey">
+				<exemplarCity>Мантэрэй</exemplarCity>
+			</zone>
+			<zone type="America/Mexico_City">
+				<exemplarCity>Мехіка</exemplarCity>
+			</zone>
+			<zone type="America/Matamoros">
+				<exemplarCity>Матаморас</exemplarCity>
+			</zone>
+			<zone type="America/Merida">
+				<exemplarCity>Мерыда</exemplarCity>
+			</zone>
+			<zone type="America/Cancun">
+				<exemplarCity>Канкун</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuala_Lumpur">
+				<exemplarCity>Куала-Лумпур</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuching">
+				<exemplarCity>Кучынг</exemplarCity>
+			</zone>
+			<zone type="Africa/Maputo">
+				<exemplarCity>Мапуту</exemplarCity>
+			</zone>
+			<zone type="Africa/Windhoek">
+				<exemplarCity>Віндхук</exemplarCity>
+			</zone>
+			<zone type="Pacific/Noumea">
+				<exemplarCity>Нумеа</exemplarCity>
+			</zone>
+			<zone type="Africa/Niamey">
+				<exemplarCity>Ніямей</exemplarCity>
+			</zone>
+			<zone type="Pacific/Norfolk">
+				<exemplarCity>Норфалк</exemplarCity>
+			</zone>
+			<zone type="Africa/Lagos">
+				<exemplarCity>Лагас</exemplarCity>
+			</zone>
+			<zone type="America/Managua">
+				<exemplarCity>Манагуа</exemplarCity>
+			</zone>
+			<zone type="Europe/Amsterdam">
+				<exemplarCity>Амстэрдам</exemplarCity>
+			</zone>
+			<zone type="Europe/Oslo">
+				<exemplarCity>Осла</exemplarCity>
+			</zone>
+			<zone type="Asia/Katmandu">
+				<exemplarCity>Катманду</exemplarCity>
+			</zone>
+			<zone type="Pacific/Nauru">
+				<exemplarCity>Науру</exemplarCity>
+			</zone>
+			<zone type="Pacific/Niue">
+				<exemplarCity>Ніуэ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Chatham">
+				<exemplarCity>Чатэм</exemplarCity>
+			</zone>
+			<zone type="Pacific/Auckland">
+				<exemplarCity>Окленд</exemplarCity>
+			</zone>
+			<zone type="Asia/Muscat">
+				<exemplarCity>Маскат</exemplarCity>
+			</zone>
+			<zone type="America/Panama">
+				<exemplarCity>Панама</exemplarCity>
+			</zone>
+			<zone type="America/Lima">
+				<exemplarCity>Ліма</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tahiti">
+				<exemplarCity>Таіці</exemplarCity>
+			</zone>
+			<zone type="Pacific/Marquesas">
+				<exemplarCity>Маркізскія астравы</exemplarCity>
+			</zone>
+			<zone type="Pacific/Gambier">
+				<exemplarCity>Астравы Гамб’е</exemplarCity>
+			</zone>
+			<zone type="Pacific/Port_Moresby">
+				<exemplarCity>Порт-Морсбі</exemplarCity>
+			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Бугенвіль</exemplarCity>
+			</zone>
+			<zone type="Asia/Manila">
+				<exemplarCity>Маніла</exemplarCity>
+			</zone>
+			<zone type="Asia/Karachi">
+				<exemplarCity>Карачы</exemplarCity>
+			</zone>
+			<zone type="Europe/Warsaw">
+				<exemplarCity>Варшава</exemplarCity>
+			</zone>
+			<zone type="America/Miquelon">
+				<exemplarCity>Мікелон</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pitcairn">
+				<exemplarCity>Піткэрн</exemplarCity>
+			</zone>
+			<zone type="America/Puerto_Rico">
+				<exemplarCity>Пуэрта-Рыка</exemplarCity>
+			</zone>
+			<zone type="Asia/Gaza">
+				<exemplarCity>Газа</exemplarCity>
+			</zone>
+			<zone type="Asia/Hebron">
+				<exemplarCity>Хеўрон</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Azores">
+				<exemplarCity>Азорскія астравы</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Madeira">
+				<exemplarCity>Мадэйра</exemplarCity>
+			</zone>
+			<zone type="Europe/Lisbon">
+				<exemplarCity>Лісабон</exemplarCity>
+			</zone>
+			<zone type="Pacific/Palau">
+				<exemplarCity>Палау</exemplarCity>
+			</zone>
+			<zone type="America/Asuncion">
+				<exemplarCity>Асунсьён</exemplarCity>
+			</zone>
+			<zone type="Asia/Qatar">
+				<exemplarCity>Катар</exemplarCity>
+			</zone>
+			<zone type="Indian/Reunion">
+				<exemplarCity>Рэюньён</exemplarCity>
+			</zone>
+			<zone type="Europe/Bucharest">
+				<exemplarCity>Бухарэст</exemplarCity>
+			</zone>
+			<zone type="Europe/Belgrade">
+				<exemplarCity>Бялград</exemplarCity>
+			</zone>
+			<zone type="Europe/Kaliningrad">
+				<exemplarCity>Калінінград</exemplarCity>
+			</zone>
+			<zone type="Europe/Simferopol">
+				<exemplarCity>Сімферопаль</exemplarCity>
+			</zone>
+			<zone type="Europe/Moscow">
+				<exemplarCity>Масква</exemplarCity>
+			</zone>
+			<zone type="Europe/Volgograd">
+				<exemplarCity>Валгаград</exemplarCity>
+			</zone>
+			<zone type="Europe/Samara">
+				<exemplarCity>Самара</exemplarCity>
+			</zone>
+			<zone type="Asia/Yekaterinburg">
+				<exemplarCity>Екацярынбург</exemplarCity>
+			</zone>
+			<zone type="Asia/Omsk">
+				<exemplarCity>Омск</exemplarCity>
+			</zone>
+			<zone type="Asia/Novosibirsk">
+				<exemplarCity>Новасібірск</exemplarCity>
+			</zone>
+			<zone type="Asia/Novokuznetsk">
+				<exemplarCity>Навакузнецк</exemplarCity>
+			</zone>
+			<zone type="Asia/Krasnoyarsk">
+				<exemplarCity>Краснаярск</exemplarCity>
+			</zone>
+			<zone type="Asia/Irkutsk">
+				<exemplarCity>Іркуцк</exemplarCity>
+			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Чыта</exemplarCity>
+			</zone>
+			<zone type="Asia/Yakutsk">
+				<exemplarCity>Якуцк</exemplarCity>
+			</zone>
+			<zone type="Asia/Vladivostok">
+				<exemplarCity>Уладзівасток</exemplarCity>
+			</zone>
+			<zone type="Asia/Khandyga">
+				<exemplarCity>Хандыга</exemplarCity>
+			</zone>
+			<zone type="Asia/Sakhalin">
+				<exemplarCity>Сахалін</exemplarCity>
+			</zone>
+			<zone type="Asia/Ust-Nera">
+				<exemplarCity>Вусць-Нера</exemplarCity>
+			</zone>
+			<zone type="Asia/Magadan">
+				<exemplarCity>Магадан</exemplarCity>
+			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Сярэднекалымск</exemplarCity>
+			</zone>
+			<zone type="Asia/Kamchatka">
+				<exemplarCity>Камчатка</exemplarCity>
+			</zone>
+			<zone type="Asia/Anadyr">
+				<exemplarCity>Анадыр</exemplarCity>
+			</zone>
+			<zone type="Africa/Kigali">
+				<exemplarCity>Кігалі</exemplarCity>
+			</zone>
+			<zone type="Asia/Riyadh">
+				<exemplarCity>Эр-Рыяд</exemplarCity>
+			</zone>
+			<zone type="Pacific/Guadalcanal">
+				<exemplarCity>Гуадалканал</exemplarCity>
+			</zone>
+			<zone type="Indian/Mahe">
+				<exemplarCity>Маэ</exemplarCity>
+			</zone>
+			<zone type="Africa/Khartoum">
+				<exemplarCity>Хартум</exemplarCity>
+			</zone>
+			<zone type="Europe/Stockholm">
+				<exemplarCity>Стакгольм</exemplarCity>
+			</zone>
+			<zone type="Asia/Singapore">
+				<exemplarCity>Сінгапур</exemplarCity>
+			</zone>
+			<zone type="Atlantic/St_Helena">
+				<exemplarCity>Востраў Святой Алены</exemplarCity>
+			</zone>
+			<zone type="Europe/Ljubljana">
+				<exemplarCity>Любляна</exemplarCity>
+			</zone>
+			<zone type="Arctic/Longyearbyen">
+				<exemplarCity>Лонгйір</exemplarCity>
+			</zone>
+			<zone type="Europe/Bratislava">
+				<exemplarCity>Браціслава</exemplarCity>
+			</zone>
+			<zone type="Africa/Freetown">
+				<exemplarCity>Фрытаўн</exemplarCity>
+			</zone>
+			<zone type="Europe/San_Marino">
+				<exemplarCity>Сан-Марына</exemplarCity>
+			</zone>
+			<zone type="Africa/Dakar">
+				<exemplarCity>Дакар</exemplarCity>
+			</zone>
+			<zone type="Africa/Mogadishu">
+				<exemplarCity>Магадыша</exemplarCity>
+			</zone>
+			<zone type="America/Paramaribo">
+				<exemplarCity>Парамарыба</exemplarCity>
+			</zone>
+			<zone type="Africa/Juba">
+				<exemplarCity>Джуба</exemplarCity>
+			</zone>
+			<zone type="Africa/Sao_Tome">
+				<exemplarCity>Сан-Тамэ</exemplarCity>
+			</zone>
+			<zone type="America/El_Salvador">
+				<exemplarCity>Эль-Сальвадор</exemplarCity>
+			</zone>
+			<zone type="America/Lower_Princes">
+				<exemplarCity>Лоуэр Прынсіз Квортар</exemplarCity>
+			</zone>
+			<zone type="Asia/Damascus">
+				<exemplarCity>Дамаск</exemplarCity>
+			</zone>
+			<zone type="Africa/Mbabane">
+				<exemplarCity>Мбабанэ</exemplarCity>
+			</zone>
+			<zone type="America/Grand_Turk">
+				<exemplarCity>Гранд-Цёрк</exemplarCity>
+			</zone>
+			<zone type="Africa/Ndjamena">
+				<exemplarCity>Нджамена</exemplarCity>
+			</zone>
+			<zone type="Indian/Kerguelen">
+				<exemplarCity>Кергелен</exemplarCity>
+			</zone>
+			<zone type="Africa/Lome">
+				<exemplarCity>Ламэ</exemplarCity>
+			</zone>
+			<zone type="Asia/Bangkok">
+				<exemplarCity>Бангкок</exemplarCity>
+			</zone>
+			<zone type="Asia/Dushanbe">
+				<exemplarCity>Душанбэ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Fakaofo">
+				<exemplarCity>Факаофа</exemplarCity>
+			</zone>
+			<zone type="Asia/Dili">
+				<exemplarCity>Дылі</exemplarCity>
+			</zone>
+			<zone type="Asia/Ashgabat">
+				<exemplarCity>Ашгабад</exemplarCity>
+			</zone>
+			<zone type="Africa/Tunis">
+				<exemplarCity>Туніс</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tongatapu">
+				<exemplarCity>Тангатапу</exemplarCity>
+			</zone>
+			<zone type="Europe/Istanbul">
+				<exemplarCity>Стамбул</exemplarCity>
+			</zone>
+			<zone type="America/Port_of_Spain">
+				<exemplarCity>Порт-оф-Спейн</exemplarCity>
+			</zone>
+			<zone type="Pacific/Funafuti">
+				<exemplarCity>Фунафуці</exemplarCity>
+			</zone>
+			<zone type="Asia/Taipei">
+				<exemplarCity>Тайбэй</exemplarCity>
+			</zone>
+			<zone type="Africa/Dar_es_Salaam">
+				<exemplarCity>Дар-эс-Салам</exemplarCity>
+			</zone>
+			<zone type="Europe/Uzhgorod">
+				<exemplarCity>Ужгарад</exemplarCity>
+			</zone>
+			<zone type="Europe/Kiev">
+				<exemplarCity>Кіеў</exemplarCity>
+			</zone>
+			<zone type="Europe/Zaporozhye">
+				<exemplarCity>Запарожжа</exemplarCity>
+			</zone>
+			<zone type="Africa/Kampala">
+				<exemplarCity>Кампала</exemplarCity>
+			</zone>
+			<zone type="Pacific/Midway">
+				<exemplarCity>Мідуэй</exemplarCity>
+			</zone>
+			<zone type="Pacific/Johnston">
+				<exemplarCity>Джонстан</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wake">
+				<exemplarCity>Уэйк</exemplarCity>
+			</zone>
+			<zone type="America/Adak">
+				<exemplarCity>Адак</exemplarCity>
+			</zone>
+			<zone type="America/Nome">
+				<exemplarCity>Ном</exemplarCity>
+			</zone>
+			<zone type="Pacific/Honolulu">
+				<exemplarCity>Ганалулу</exemplarCity>
+			</zone>
+			<zone type="America/Anchorage">
+				<exemplarCity>Анкорыдж</exemplarCity>
+			</zone>
+			<zone type="America/Yakutat">
+				<exemplarCity>Якутат</exemplarCity>
+			</zone>
+			<zone type="America/Sitka">
+				<exemplarCity>Сітка</exemplarCity>
+			</zone>
+			<zone type="America/Juneau">
+				<exemplarCity>Джуна</exemplarCity>
+			</zone>
+			<zone type="America/Metlakatla">
+				<exemplarCity>Метлакатла</exemplarCity>
+			</zone>
+			<zone type="America/Los_Angeles">
+				<exemplarCity>Лос-Анджэлес</exemplarCity>
+			</zone>
+			<zone type="America/Boise">
+				<exemplarCity>Бойсэ</exemplarCity>
+			</zone>
+			<zone type="America/Phoenix">
+				<exemplarCity>Фінікс</exemplarCity>
+			</zone>
+			<zone type="America/Denver">
+				<exemplarCity>Дэнвер</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Beulah">
+				<exemplarCity>Бойла, Паўночная Дакота</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/New_Salem">
+				<exemplarCity>Нью-Сейлем, Паўночная Дакота</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Center">
+				<exemplarCity>Сентар, Паўночная Дакота</exemplarCity>
+			</zone>
+			<zone type="America/Chicago">
+				<exemplarCity>Чыкага</exemplarCity>
+			</zone>
+			<zone type="America/Menominee">
+				<exemplarCity>Мяноміні</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Vincennes">
+				<exemplarCity>Вінсенс, Індыяна</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Petersburg">
+				<exemplarCity>Пецярсбург, Індыяна</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Tell_City">
+				<exemplarCity>Тэл Сіці, Індыяна</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Knox">
+				<exemplarCity>Нокс, Індыяна</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Winamac">
+				<exemplarCity>Уінамак, Індыяна</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Marengo">
+				<exemplarCity>Марэнга, Індыяна</exemplarCity>
+			</zone>
+			<zone type="America/Indianapolis">
+				<exemplarCity>Індыянапаліс</exemplarCity>
+			</zone>
+			<zone type="America/Louisville">
+				<exemplarCity>Луісвіл</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Vevay">
+				<exemplarCity>Віві, Індыяна</exemplarCity>
+			</zone>
+			<zone type="America/Kentucky/Monticello">
+				<exemplarCity>Мантысела, Кентукі</exemplarCity>
+			</zone>
+			<zone type="America/Detroit">
+				<exemplarCity>Дэтройт</exemplarCity>
+			</zone>
+			<zone type="America/New_York">
+				<exemplarCity>Нью-Ёрк</exemplarCity>
+			</zone>
+			<zone type="America/Montevideo">
+				<exemplarCity>Мантэвідэа</exemplarCity>
+			</zone>
+			<zone type="Asia/Samarkand">
+				<exemplarCity>Самарканд</exemplarCity>
+			</zone>
+			<zone type="Asia/Tashkent">
+				<exemplarCity>Ташкент</exemplarCity>
+			</zone>
+			<zone type="Europe/Vatican">
+				<exemplarCity>Ватыкан</exemplarCity>
+			</zone>
+			<zone type="America/St_Vincent">
+				<exemplarCity>Сент-Вінсент</exemplarCity>
+			</zone>
+			<zone type="America/Caracas">
+				<exemplarCity>Каракас</exemplarCity>
+			</zone>
+			<zone type="America/Tortola">
+				<exemplarCity>Тартола</exemplarCity>
+			</zone>
+			<zone type="America/St_Thomas">
+				<exemplarCity>Сент-Томас</exemplarCity>
+			</zone>
+			<zone type="Asia/Saigon">
+				<exemplarCity>Хашымін</exemplarCity>
+			</zone>
+			<zone type="Pacific/Efate">
+				<exemplarCity>Эфатэ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wallis">
+				<exemplarCity>Уоліс</exemplarCity>
+			</zone>
+			<zone type="Pacific/Apia">
+				<exemplarCity>Апія</exemplarCity>
+			</zone>
+			<zone type="Asia/Aden">
+				<exemplarCity>Адэн</exemplarCity>
+			</zone>
+			<zone type="Indian/Mayotte">
+				<exemplarCity>Маёта</exemplarCity>
+			</zone>
+			<zone type="Africa/Johannesburg">
+				<exemplarCity>Іаганэсбург</exemplarCity>
+			</zone>
+			<zone type="Africa/Lusaka">
+				<exemplarCity>Лусака</exemplarCity>
+			</zone>
+			<zone type="Africa/Harare">
+				<exemplarCity>Харарэ</exemplarCity>
+			</zone>
+			<metazone type="Afghanistan">
+				<long>
+					<standard>Афганістанскі час</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Central">
+				<long>
+					<standard>Цэнтральнаафрыканскі час</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Eastern">
+				<long>
+					<standard>Усходнеафрыканскі час</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Southern">
+				<long>
+					<standard>Паўднёваафрыканскі час</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Western">
+				<long>
+					<generic>Заходнеафрыканскі час</generic>
+					<standard>Заходнеафрыканскі стандартны час</standard>
+					<daylight>Заходнеафрыканскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Alaska">
+				<long>
+					<generic>Час Аляскі</generic>
+					<standard>Стандартны час Аляскі</standard>
+					<daylight>Летні час Аляскі</daylight>
+				</long>
+			</metazone>
+			<metazone type="Amazon">
+				<long>
+					<generic>Амазонскі час</generic>
+					<standard>Амазонскі стандартны час</standard>
+					<daylight>Амазонскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Central">
+				<long>
+					<generic>Паўночнаамерыканскі цэнтральны час</generic>
+					<standard>Паўночнаамерыканскі цэнтральны стандартны час</standard>
+					<daylight>Паўночнаамерыканскі цэнтральны летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Eastern">
+				<long>
+					<generic>Паўночнаамерыканскі ўсходні час</generic>
+					<standard>Паўночнаамерыканскі ўсходні стандартны час</standard>
+					<daylight>Паўночнаамерыканскі ўсходні летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Mountain">
+				<long>
+					<generic>Паўночнаамерыканскі горны час</generic>
+					<standard>Паўночнаамерыканскі горны стандартны час</standard>
+					<daylight>Паўночнаамерыканскі горны летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Pacific">
+				<long>
+					<generic>Ціхаакіянскі час</generic>
+					<standard>Ціхаакіянскі стандартны час</standard>
+					<daylight>Ціхаакіянскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Apia">
+				<long>
+					<generic>Час Апіі</generic>
+					<standard>Стандартны час Апіі</standard>
+					<daylight>Летні час Апіі</daylight>
+				</long>
+			</metazone>
+			<metazone type="Arabian">
+				<long>
+					<generic>Час Саудаўскай Аравіі</generic>
+					<standard>Стандартны час Саудаўскай Аравіі</standard>
+					<daylight>Летні час Саудаўскай Аравіі</daylight>
+				</long>
+			</metazone>
+			<metazone type="Argentina">
+				<long>
+					<generic>Аргенцінскі час</generic>
+					<standard>Аргенцінскі стандартны час</standard>
+					<daylight>Аргенцінскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Argentina_Western">
+				<long>
+					<generic>Час Заходняй Аргенціны</generic>
+					<standard>Стандартны час Заходняй Аргенціны</standard>
+					<daylight>Летні час Заходняй Аргенціны</daylight>
+				</long>
+			</metazone>
+			<metazone type="Armenia">
+				<long>
+					<generic>Час Арменіі</generic>
+					<standard>Стандартны час Арменіі</standard>
+					<daylight>Летні час Арменіі</daylight>
+				</long>
+			</metazone>
+			<metazone type="Atlantic">
+				<long>
+					<generic>Атлантычны час</generic>
+					<standard>Атлантычны стандартны час</standard>
+					<daylight>Атлантычны летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Central">
+				<long>
+					<generic>Час цэнтральнай Аўстраліі</generic>
+					<standard>Стандартны час цэнтральнай Аўстраліі</standard>
+					<daylight>Летні час цэнтральнай Аўстраліі</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_CentralWestern">
+				<long>
+					<generic>Заходні час Цэнтральнай Аўстраліі</generic>
+					<standard>Заходні стандартны час Цэнтральнай Аўстраліі</standard>
+					<daylight>Заходні летні час Цэнтральнай Аўстраліі</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Eastern">
+				<long>
+					<generic>Час усходняй Аўстраліі</generic>
+					<standard>Стандартны час усходняй Аўстраліі</standard>
+					<daylight>Летні час усходняй Аўстраліі</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Western">
+				<long>
+					<generic>Час заходняй Аўстраліі</generic>
+					<standard>Стандартны час заходняй Аўстраліі</standard>
+					<daylight>Летні час заходняй Аўстраліі</daylight>
+				</long>
+			</metazone>
+			<metazone type="Azerbaijan">
+				<long>
+					<generic>Час Азербайджана</generic>
+					<standard>Стандартны час Азербайджана</standard>
+					<daylight>Летні час Азербайджана</daylight>
+				</long>
+			</metazone>
+			<metazone type="Azores">
+				<long>
+					<generic>Час Азорскіх астравоў</generic>
+					<standard>Стандартны час Азорскіх астравоў</standard>
+					<daylight>Летні час Азорскіх астравоў</daylight>
+				</long>
+			</metazone>
+			<metazone type="Bangladesh">
+				<long>
+					<generic>Час Бангладэша</generic>
+					<standard>Стандартны час Бангладэша</standard>
+					<daylight>Летні час Бангладэша</daylight>
+				</long>
+			</metazone>
+			<metazone type="Bhutan">
+				<long>
+					<standard>Час Бутана</standard>
+				</long>
+			</metazone>
+			<metazone type="Bolivia">
+				<long>
+					<standard>Балівійскі час</standard>
+				</long>
+			</metazone>
+			<metazone type="Brasilia">
+				<long>
+					<generic>Бразільскі час</generic>
+					<standard>Бразільскі стандартны час</standard>
+					<daylight>Бразільскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Brunei">
+				<long>
+					<standard>Час Брунея</standard>
+				</long>
+			</metazone>
+			<metazone type="Cape_Verde">
+				<long>
+					<generic>Час Каба-Вердэ</generic>
+					<standard>Стандартны час Каба-Вердэ</standard>
+					<daylight>Летні час Каба-Вердэ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Chamorro">
+				<long>
+					<standard>Час Чамора</standard>
+				</long>
+			</metazone>
+			<metazone type="Chatham">
+				<long>
+					<generic>Час Чатэма</generic>
+					<standard>Стандартны час Чатэма</standard>
+					<daylight>Летні час Чатэма</daylight>
+				</long>
+			</metazone>
+			<metazone type="Chile">
+				<long>
+					<generic>Чылійскі час</generic>
+					<standard>Чылійскі стандартны час</standard>
+					<daylight>Чылійскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="China">
+				<long>
+					<generic>Час Кітая</generic>
+					<standard>Стандартны час Кітая</standard>
+					<daylight>Летні час Кітая</daylight>
+				</long>
+			</metazone>
+			<metazone type="Choibalsan">
+				<long>
+					<generic>Час Чайбалсана</generic>
+					<standard>Стандартны час Чайбалсана</standard>
+					<daylight>Летні час Чайбалсана</daylight>
+				</long>
+			</metazone>
+			<metazone type="Christmas">
+				<long>
+					<standard>Час вострава Раства</standard>
+				</long>
+			</metazone>
+			<metazone type="Cocos">
+				<long>
+					<standard>Час Какосавых астравоў</standard>
+				</long>
+			</metazone>
+			<metazone type="Colombia">
+				<long>
+					<generic>Калумбійскі час</generic>
+					<standard>Калумбійскі стандартны час</standard>
+					<daylight>Калумбійскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cook">
+				<long>
+					<generic>Час астравоў Кука</generic>
+					<standard>Стандартны час астравоў Кука</standard>
+					<daylight>Паўлетні час астравоў Кука</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cuba">
+				<long>
+					<generic>Час Кубы</generic>
+					<standard>Стандартны час Кубы</standard>
+					<daylight>Летні час Кубы</daylight>
+				</long>
+			</metazone>
+			<metazone type="Davis">
+				<long>
+					<standard>Час станцыі Дэйвіс</standard>
+				</long>
+			</metazone>
+			<metazone type="DumontDUrville">
+				<long>
+					<standard>Час станцыі Дзюмон-Дзюрвіль</standard>
+				</long>
+			</metazone>
+			<metazone type="East_Timor">
+				<long>
+					<standard>Час Усходняга Тымора</standard>
+				</long>
+			</metazone>
+			<metazone type="Easter">
+				<long>
+					<generic>Час вострава Пасхі</generic>
+					<standard>Стандартны час вострава Пасхі</standard>
+					<daylight>Летні час вострава Пасхі</daylight>
+				</long>
+			</metazone>
+			<metazone type="Ecuador">
+				<long>
+					<standard>Эквадорскі час</standard>
+				</long>
+			</metazone>
+			<metazone type="Europe_Central">
+				<long>
+					<generic>Цэнтральнаеўрапейскі час</generic>
+					<standard>Цэнтральнаеўрапейскі стандартны час</standard>
+					<daylight>Цэнтральнаеўрапейскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Europe_Eastern">
+				<long>
+					<generic>Усходнееўрапейскі час</generic>
+					<standard>Усходнееўрапейскі стандартны час</standard>
+					<daylight>Усходнееўрапейскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Europe_Further_Eastern">
+				<long>
+					<standard>Беларускі час</standard>
+				</long>
+			</metazone>
+			<metazone type="Europe_Western">
+				<long>
+					<generic>Заходнееўрапейскі час</generic>
+					<standard>Заходнееўрапейскі стандартны час</standard>
+					<daylight>Заходнееўрапейскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Falkland">
+				<long>
+					<generic>Час Фалклендскіх астравоў</generic>
+					<standard>Стандартны час Фалклендскіх астравоў</standard>
+					<daylight>Летні час Фалклендскіх астравоў</daylight>
+				</long>
+			</metazone>
+			<metazone type="Fiji">
+				<long>
+					<generic>Час Фіджы</generic>
+					<standard>Стандартны час Фіджы</standard>
+					<daylight>Летні час Фіджы</daylight>
+				</long>
+			</metazone>
+			<metazone type="French_Guiana">
+				<long>
+					<standard>Час Французскай Гвіяны</standard>
+				</long>
+			</metazone>
+			<metazone type="French_Southern">
+				<long>
+					<standard>Час Французскіх Паўднёвых і Антарктычных терыторый</standard>
+				</long>
+			</metazone>
+			<metazone type="Galapagos">
+				<long>
+					<standard>Стандартны час Галапагоскіх астравоў</standard>
+				</long>
+			</metazone>
+			<metazone type="Gambier">
+				<long>
+					<standard>Час атравоў Гамб’е</standard>
+				</long>
+			</metazone>
+			<metazone type="Georgia">
+				<long>
+					<generic>Грузінскі час</generic>
+					<standard>Грузінскі стандартны час</standard>
+					<daylight>Грузінскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Gilbert_Islands">
+				<long>
+					<standard>Час астравоў Гілберта</standard>
+				</long>
+			</metazone>
+			<metazone type="GMT">
+				<long>
+					<standard>Час па Грынвічы</standard>
+				</long>
+			</metazone>
+			<metazone type="Greenland_Eastern">
+				<long>
+					<generic>Час Усходняй Грэнландыі</generic>
+					<standard>Стандартны час Усходняй Грэнландыі</standard>
+					<daylight>Летні час Усходняй Грэнландыі</daylight>
+				</long>
+			</metazone>
+			<metazone type="Greenland_Western">
+				<long>
+					<generic>Час Заходняй Грэнландыі</generic>
+					<standard>Стандартны час Заходняй Грэнландыі</standard>
+					<daylight>Летні час Заходняй Грэнландыі</daylight>
+				</long>
+			</metazone>
+			<metazone type="Gulf">
+				<long>
+					<standard>Час Персідскага заліва</standard>
+				</long>
+			</metazone>
+			<metazone type="Guyana">
+				<long>
+					<standard>Час Гаяны</standard>
+				</long>
+			</metazone>
+			<metazone type="Hawaii_Aleutian">
+				<long>
+					<generic>Гавайска-Алеуцкі час</generic>
+					<standard>Гавайска-Алеуцкі стандартны час</standard>
+					<daylight>Гавайска-Алеуцкі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Hong_Kong">
+				<long>
+					<generic>Час Ганконга</generic>
+					<standard>Стандартны час Ганконга</standard>
+					<daylight>Летні час Ганконга</daylight>
+				</long>
+			</metazone>
+			<metazone type="Hovd">
+				<long>
+					<generic>Час Хоўда</generic>
+					<standard>Стандартны час Хоўда</standard>
+					<daylight>Летні час Хоўда</daylight>
+				</long>
+			</metazone>
+			<metazone type="India">
+				<long>
+					<standard>Час Індыі</standard>
+				</long>
+			</metazone>
+			<metazone type="Indian_Ocean">
+				<long>
+					<standard>Час Індыйскага акіяна</standard>
+				</long>
+			</metazone>
+			<metazone type="Indochina">
+				<long>
+					<standard>Індакітайскі час</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Central">
+				<long>
+					<standard>Цэнтральнаінданезійскі час</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Eastern">
+				<long>
+					<standard>Усходнеінданезійскі час</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Western">
+				<long>
+					<standard>Заходнеінданезійскі час</standard>
+				</long>
+			</metazone>
+			<metazone type="Iran">
+				<long>
+					<generic>Іранскі час</generic>
+					<standard>Іранскі стандартны час</standard>
+					<daylight>Іранскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Irkutsk">
+				<long>
+					<generic>Іркуцкі час</generic>
+					<standard>Іркуцкі стандартны час</standard>
+					<daylight>Іркуцкі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Israel">
+				<long>
+					<generic>Ізраільскі час</generic>
+					<standard>Ізраільскі стандартны час</standard>
+					<daylight>Ізраільскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Japan">
+				<long>
+					<generic>Час Японіі</generic>
+					<standard>Стандартны час Японіі</standard>
+					<daylight>Летні час Японіі</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Eastern">
+				<long>
+					<standard>Усходнеказахстанскі час</standard>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Western">
+				<long>
+					<standard>Заходнеказахстанскі час</standard>
+				</long>
+			</metazone>
+			<metazone type="Korea">
+				<long>
+					<generic>Час Карэі</generic>
+					<standard>Стандартны час Карэі</standard>
+					<daylight>Летні час Карэі</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kosrae">
+				<long>
+					<standard>Час астравоў Кусаіе</standard>
+				</long>
+			</metazone>
+			<metazone type="Krasnoyarsk">
+				<long>
+					<generic>Краснаярскі час</generic>
+					<standard>Краснаярскі стандартны час</standard>
+					<daylight>Краснаярскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kyrgystan">
+				<long>
+					<standard>Час Кыргызстана</standard>
+				</long>
+			</metazone>
+			<metazone type="Line_Islands">
+				<long>
+					<standard>Час астравоў Лайн</standard>
+				</long>
+			</metazone>
+			<metazone type="Lord_Howe">
+				<long>
+					<generic>Час Лорд-Хау</generic>
+					<standard>Стандартны час Лорд-Хау</standard>
+					<daylight>Летні час Лорд-Хау</daylight>
+				</long>
+			</metazone>
+			<metazone type="Macquarie">
+				<long>
+					<standard>Час вострава Макуоры</standard>
+				</long>
+			</metazone>
+			<metazone type="Magadan">
+				<long>
+					<generic>Магаданскі час</generic>
+					<standard>Магаданскі стандартны час</standard>
+					<daylight>Магаданскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Malaysia">
+				<long>
+					<standard>Час Малайзіі</standard>
+				</long>
+			</metazone>
+			<metazone type="Maldives">
+				<long>
+					<standard>Час Мальдыў</standard>
+				</long>
+			</metazone>
+			<metazone type="Marquesas">
+				<long>
+					<standard>Час Маркізскіх астравоў</standard>
+				</long>
+			</metazone>
+			<metazone type="Marshall_Islands">
+				<long>
+					<standard>Час Маршалавых Астравоў</standard>
+				</long>
+			</metazone>
+			<metazone type="Mauritius">
+				<long>
+					<generic>Час Маўрыкія</generic>
+					<standard>Стандартны час Маўрыкія</standard>
+					<daylight>Летні час Маўрыкія</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mawson">
+				<long>
+					<standard>Час станцыі Моўсан</standard>
+				</long>
+			</metazone>
+			<metazone type="Mexico_Northwest">
+				<long>
+					<generic>Паўночнаамерыканскі мексіканскі час</generic>
+					<standard>Паўночнаамерыканскі мексіканскі стандартны час</standard>
+					<daylight>Паўночнаамерыканскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mexico_Pacific">
+				<long>
+					<generic>Мексіканскі ціхаакіянскі час</generic>
+					<standard>Мексіканскі ціхаакіянскі стандатны час</standard>
+					<daylight>Мексіканскі ціхаакіянскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mongolia">
+				<long>
+					<generic>Час Улан-Батара</generic>
+					<standard>Стандартны час Улан-Батара</standard>
+					<daylight>Летні час Улан-Батара</daylight>
+				</long>
+			</metazone>
+			<metazone type="Moscow">
+				<long>
+					<generic>Маскоўскі час</generic>
+					<standard>Маскоўскі стандартны час</standard>
+					<daylight>Маскоўскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Myanmar">
+				<long>
+					<standard>Час М’янмы</standard>
+				</long>
+			</metazone>
+			<metazone type="Nauru">
+				<long>
+					<standard>Час Науру</standard>
+				</long>
+			</metazone>
+			<metazone type="Nepal">
+				<long>
+					<standard>Непальскі час</standard>
+				</long>
+			</metazone>
+			<metazone type="New_Caledonia">
+				<long>
+					<generic>Час Новай Каледоніі</generic>
+					<standard>Стандартны час Новай Каледоніі</standard>
+					<daylight>Летні час Новай Каледоніі</daylight>
+				</long>
+			</metazone>
+			<metazone type="New_Zealand">
+				<long>
+					<generic>Час Новай Зеландыі</generic>
+					<standard>Стандартны час Новай Зеландыі</standard>
+					<daylight>Летні час Новай Зеландыі</daylight>
+				</long>
+			</metazone>
+			<metazone type="Newfoundland">
+				<long>
+					<generic>Ньюфаўндлендскі час</generic>
+					<standard>Ньюфаўндлендскі стандартны час</standard>
+					<daylight>Ньюфаўндлендскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Niue">
+				<long>
+					<standard>Час Ніуэ</standard>
+				</long>
+			</metazone>
+			<metazone type="Norfolk">
+				<long>
+					<standard>Час вострава Норфалк</standard>
+				</long>
+			</metazone>
+			<metazone type="Noronha">
+				<long>
+					<generic>Час Фернанду-ды-Наронья</generic>
+					<standard>Стандартны час Фернанду-ды-Наронья</standard>
+					<daylight>Летні час Фернанду-ды-Наронья</daylight>
+				</long>
+			</metazone>
+			<metazone type="Novosibirsk">
+				<long>
+					<generic>Новасібірскі час</generic>
+					<standard>Новасібірскі стандартны час</standard>
+					<daylight>Новасібірскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Omsk">
+				<long>
+					<generic>Омскі час</generic>
+					<standard>Омскі стандартны час</standard>
+					<daylight>Омскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pakistan">
+				<long>
+					<generic>Пакістанскі час</generic>
+					<standard>Пакістанскі стандартны час</standard>
+					<daylight>Пакістанскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Palau">
+				<long>
+					<standard>Час Палау</standard>
+				</long>
+			</metazone>
+			<metazone type="Papua_New_Guinea">
+				<long>
+					<standard>Час Папуа — Новай Гвінеі</standard>
+				</long>
+			</metazone>
+			<metazone type="Paraguay">
+				<long>
+					<generic>Час Парагвая</generic>
+					<standard>Стандартны час Парагвая</standard>
+					<daylight>Летні час Парагвая</daylight>
+				</long>
+			</metazone>
+			<metazone type="Peru">
+				<long>
+					<generic>Перуанскі час</generic>
+					<standard>Перуанскі стандартны час</standard>
+					<daylight>Перуанскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Philippines">
+				<long>
+					<generic>Філіпінскі час</generic>
+					<standard>Філіпінскі стандартны час</standard>
+					<daylight>Філіпінскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Phoenix_Islands">
+				<long>
+					<standard>Час астравоў Фенікс</standard>
+				</long>
+			</metazone>
+			<metazone type="Pierre_Miquelon">
+				<long>
+					<generic>Час Сен-П’ер і Мікелон</generic>
+					<standard>Стандартны час Сен-П’ер і Мікелон</standard>
+					<daylight>Стандартны летні час Сен-П’ер і Мікелон</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pitcairn">
+				<long>
+					<standard>Час астравоў Піткэрн</standard>
+				</long>
+			</metazone>
+			<metazone type="Ponape">
+				<long>
+					<standard>Час Панапэ</standard>
+				</long>
+			</metazone>
+			<metazone type="Reunion">
+				<long>
+					<standard>Час Рэюньёна</standard>
+				</long>
+			</metazone>
+			<metazone type="Rothera">
+				<long>
+					<standard>Час станцыі Ратэра</standard>
+				</long>
+			</metazone>
+			<metazone type="Sakhalin">
+				<long>
+					<generic>Сахалінскі час</generic>
+					<standard>Сахалінскі стандартны час</standard>
+					<daylight>Сахалінскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Samoa">
+				<long>
+					<generic>Час Самоа</generic>
+					<standard>Стандартны час Самоа</standard>
+					<daylight>Летні час Самоа</daylight>
+				</long>
+			</metazone>
+			<metazone type="Seychelles">
+				<long>
+					<standard>Час Сейшэльскіх астравоў</standard>
+				</long>
+			</metazone>
+			<metazone type="Singapore">
+				<long>
+					<standard>Сінгапурскі час</standard>
+				</long>
+			</metazone>
+			<metazone type="Solomon">
+				<long>
+					<standard>Час Саламонавых Астравоў</standard>
+				</long>
+			</metazone>
+			<metazone type="South_Georgia">
+				<long>
+					<standard>Час Паўднёвай Джорджыі</standard>
+				</long>
+			</metazone>
+			<metazone type="Suriname">
+				<long>
+					<standard>Час Сурынама</standard>
+				</long>
+			</metazone>
+			<metazone type="Syowa">
+				<long>
+					<standard>Час станцыі Сёва</standard>
+				</long>
+			</metazone>
+			<metazone type="Tahiti">
+				<long>
+					<standard>Час Таіці</standard>
+				</long>
+			</metazone>
+			<metazone type="Taipei">
+				<long>
+					<generic>Час Тайбэя</generic>
+					<standard>Стандартны час Тайбэя</standard>
+					<daylight>Летні час Тайбэя</daylight>
+				</long>
+			</metazone>
+			<metazone type="Tajikistan">
+				<long>
+					<standard>Час Таджыкістана</standard>
+				</long>
+			</metazone>
+			<metazone type="Tokelau">
+				<long>
+					<standard>Час Такелау</standard>
+				</long>
+			</metazone>
+			<metazone type="Tonga">
+				<long>
+					<generic>Час Тонга</generic>
+					<standard>Стандартны час Тонга</standard>
+					<daylight>Летні час Тонга</daylight>
+				</long>
+			</metazone>
+			<metazone type="Truk">
+				<long>
+					<standard>Час Чуўк</standard>
+				</long>
+			</metazone>
+			<metazone type="Turkmenistan">
+				<long>
+					<generic>Час Туркменістана</generic>
+					<standard>Стандартны час Туркменістана</standard>
+					<daylight>Летні час Туркменістана</daylight>
+				</long>
+			</metazone>
+			<metazone type="Tuvalu">
+				<long>
+					<standard>Час Тувалу</standard>
+				</long>
+			</metazone>
+			<metazone type="Uruguay">
+				<long>
+					<generic>Уругвайскі час</generic>
+					<standard>Уругвайскі стандартны час</standard>
+					<daylight>Уругвайскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Uzbekistan">
+				<long>
+					<generic>Час Узбекістана</generic>
+					<standard>Стандартны час Узбекістана</standard>
+					<daylight>Летні час Узбекістана</daylight>
+				</long>
+			</metazone>
+			<metazone type="Vanuatu">
+				<long>
+					<generic>Час Вануату</generic>
+					<standard>Стандартны час Вануату</standard>
+					<daylight>Летні час Вануату</daylight>
+				</long>
+			</metazone>
+			<metazone type="Venezuela">
+				<long>
+					<standard>Венесуэльскі час</standard>
+				</long>
+			</metazone>
+			<metazone type="Vladivostok">
+				<long>
+					<generic>Уладзівастоцкі час</generic>
+					<standard>Уладзівастоцкі стандартны час</standard>
+					<daylight>Уладзівастоцкі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Volgograd">
+				<long>
+					<generic>Валгаградскі час</generic>
+					<standard>Валгаградскі стандартны час</standard>
+					<daylight>Валгаградскі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Vostok">
+				<long>
+					<standard>Час станцыі Усход</standard>
+				</long>
+			</metazone>
+			<metazone type="Wake">
+				<long>
+					<standard>Час вострава Уэйк</standard>
+				</long>
+			</metazone>
+			<metazone type="Wallis">
+				<long>
+					<standard>Час астравоў Уоліс і Футуна</standard>
+				</long>
+			</metazone>
+			<metazone type="Yakutsk">
+				<long>
+					<generic>Якуцкі час</generic>
+					<standard>Якуцкі стандартны час</standard>
+					<daylight>Якуцкі летні час</daylight>
+				</long>
+			</metazone>
+			<metazone type="Yekaterinburg">
+				<long>
+					<generic>Екацярынбургскі час</generic>
+					<standard>Екацярынбургскі стандартны час</standard>
+					<daylight>Екацярынбургскі летні час</daylight>
+				</long>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<defaultNumberingSystem draft="contributed">latn</defaultNumberingSystem>
+		<otherNumberingSystems>
+			<native draft="contributed">latn</native>
+		</otherNumberingSystems>
+		<minimumGroupingDigits draft="contributed">2</minimumGroupingDigits>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group> </group>
+			<percentSign>%</percentSign>
+			<plusSign draft="contributed">+</plusSign>
+			<minusSign draft="contributed">-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+			<timeSeparator>.</timeSeparator>
+		</symbols>
+		<decimalFormats numberSystem="latn">
+			<decimalFormatLength>
+				<decimalFormat>
+					<pattern draft="contributed">#,##0.###</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+			<decimalFormatLength type="long">
+				<decimalFormat>
+					<pattern type="1000" count="one">0 тысяча</pattern>
+					<pattern type="1000" count="few">0 тысячы</pattern>
+					<pattern type="1000" count="many">0 тысяч</pattern>
+					<pattern type="1000" count="other">0 тысячы</pattern>
+					<pattern type="10000" count="one">00 тысяча</pattern>
+					<pattern type="10000" count="few">00 тысячы</pattern>
+					<pattern type="10000" count="many">00 тысяч</pattern>
+					<pattern type="10000" count="other">00 тысячы</pattern>
+					<pattern type="100000" count="one">000 тысяча</pattern>
+					<pattern type="100000" count="few">000 тысячы</pattern>
+					<pattern type="100000" count="many">000 тысяч</pattern>
+					<pattern type="100000" count="other">000 тысячы</pattern>
+					<pattern type="1000000" count="one">0 мільён</pattern>
+					<pattern type="1000000" count="few">0 мільёны</pattern>
+					<pattern type="1000000" count="many">0 мільёнаў</pattern>
+					<pattern type="1000000" count="other">0 мільёна</pattern>
+					<pattern type="10000000" count="one">00 мільён</pattern>
+					<pattern type="10000000" count="few">00 мільёны</pattern>
+					<pattern type="10000000" count="many">00 мільёнаў</pattern>
+					<pattern type="10000000" count="other">00 мільёна</pattern>
+					<pattern type="100000000" count="one">000 мільён</pattern>
+					<pattern type="100000000" count="few">000 мільёны</pattern>
+					<pattern type="100000000" count="many">000 мільёнаў</pattern>
+					<pattern type="100000000" count="other">000 мільёна</pattern>
+					<pattern type="1000000000" count="one">0 мільярд</pattern>
+					<pattern type="1000000000" count="few">0 мільярды</pattern>
+					<pattern type="1000000000" count="many">0 мільярдаў</pattern>
+					<pattern type="1000000000" count="other">0 мільярда</pattern>
+					<pattern type="10000000000" count="one">00 мільярд</pattern>
+					<pattern type="10000000000" count="few">00 мільярды</pattern>
+					<pattern type="10000000000" count="many">00 мільярдаў</pattern>
+					<pattern type="10000000000" count="other">00 мільярда</pattern>
+					<pattern type="100000000000" count="one">000 мільярд</pattern>
+					<pattern type="100000000000" count="few">000 мільярды</pattern>
+					<pattern type="100000000000" count="many">000 мільярдаў</pattern>
+					<pattern type="100000000000" count="other">000 мільярда</pattern>
+					<pattern type="1000000000000" count="one">0 трыльён</pattern>
+					<pattern type="1000000000000" count="few">0 трыльёны</pattern>
+					<pattern type="1000000000000" count="many">0 трыльёнаў</pattern>
+					<pattern type="1000000000000" count="other">0 трыльёна</pattern>
+					<pattern type="10000000000000" count="one">00 трыльён</pattern>
+					<pattern type="10000000000000" count="few">00 трыльёны</pattern>
+					<pattern type="10000000000000" count="many">00 трыльёнаў</pattern>
+					<pattern type="10000000000000" count="other">00 трыльёна</pattern>
+					<pattern type="100000000000000" count="one">000 трыльён</pattern>
+					<pattern type="100000000000000" count="few">000 трыльёны</pattern>
+					<pattern type="100000000000000" count="many">000 трыльёнаў</pattern>
+					<pattern type="100000000000000" count="other">000 трыльёна</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+			<decimalFormatLength type="short">
+				<decimalFormat>
+					<pattern type="1000" count="one">0 тыс'.'</pattern>
+					<pattern type="1000" count="few">0 тыс'.'</pattern>
+					<pattern type="1000" count="many">0 тыс'.'</pattern>
+					<pattern type="1000" count="other">0 тыс'.'</pattern>
+					<pattern type="10000" count="one">00 тыс'.'</pattern>
+					<pattern type="10000" count="few">00 тыс'.'</pattern>
+					<pattern type="10000" count="many">00 тыс'.'</pattern>
+					<pattern type="10000" count="other">00 тыс'.'</pattern>
+					<pattern type="100000" count="one">000 тыс'.'</pattern>
+					<pattern type="100000" count="few">000 тыс'.'</pattern>
+					<pattern type="100000" count="many">000 тыс'.'</pattern>
+					<pattern type="100000" count="other">000 тыс'.'</pattern>
+					<pattern type="1000000" count="one">0 млн</pattern>
+					<pattern type="1000000" count="few">0 млн</pattern>
+					<pattern type="1000000" count="many">0 млн</pattern>
+					<pattern type="1000000" count="other">0 млн</pattern>
+					<pattern type="10000000" count="one">00 млн</pattern>
+					<pattern type="10000000" count="few">00 млн</pattern>
+					<pattern type="10000000" count="many">00 млн</pattern>
+					<pattern type="10000000" count="other">00 млн</pattern>
+					<pattern type="100000000" count="one">000 млн</pattern>
+					<pattern type="100000000" count="few">000 млн</pattern>
+					<pattern type="100000000" count="many">000 млн</pattern>
+					<pattern type="100000000" count="other">000 млн</pattern>
+					<pattern type="1000000000" count="one">0 млрд</pattern>
+					<pattern type="1000000000" count="few">0 млрд</pattern>
+					<pattern type="1000000000" count="many">0 млрд</pattern>
+					<pattern type="1000000000" count="other">0 млрд</pattern>
+					<pattern type="10000000000" count="one">00 млрд</pattern>
+					<pattern type="10000000000" count="few">00 млрд</pattern>
+					<pattern type="10000000000" count="many">00 млрд</pattern>
+					<pattern type="10000000000" count="other">00 млрд</pattern>
+					<pattern type="100000000000" count="one">000 млрд</pattern>
+					<pattern type="100000000000" count="few">000 млрд</pattern>
+					<pattern type="100000000000" count="many">000 млрд</pattern>
+					<pattern type="100000000000" count="other">000 млрд</pattern>
+					<pattern type="1000000000000" count="one">0 трлн</pattern>
+					<pattern type="1000000000000" count="few">0 трлн</pattern>
+					<pattern type="1000000000000" count="many">0 трлн</pattern>
+					<pattern type="1000000000000" count="other">0 трлн</pattern>
+					<pattern type="10000000000000" count="one">00 трлн</pattern>
+					<pattern type="10000000000000" count="few">00 трлн</pattern>
+					<pattern type="10000000000000" count="many">00 трлн</pattern>
+					<pattern type="10000000000000" count="other">00 трлн</pattern>
+					<pattern type="100000000000000" count="one">000 трлн</pattern>
+					<pattern type="100000000000000" count="few">000 трлн</pattern>
+					<pattern type="100000000000000" count="many">000 трлн</pattern>
+					<pattern type="100000000000000" count="other">000 трлн</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+		</decimalFormats>
+		<scientificFormats numberSystem="latn">
+			<scientificFormatLength>
+				<scientificFormat>
+					<pattern>#E0</pattern>
+				</scientificFormat>
+			</scientificFormatLength>
+		</scientificFormats>
+		<percentFormats numberSystem="latn">
+			<percentFormatLength>
+				<percentFormat>
+					<pattern>#,##0 %</pattern>
+				</percentFormat>
+			</percentFormatLength>
+		</percentFormats>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">0 тыс'.' ¤</pattern>
+					<pattern type="1000" count="few">0 тыс'.' ¤</pattern>
+					<pattern type="1000" count="many">0 тыс'.' ¤</pattern>
+					<pattern type="1000" count="other">0 тыс'.' ¤</pattern>
+					<pattern type="10000" count="one">00 тыс'.' ¤</pattern>
+					<pattern type="10000" count="few">00 тыс'.' ¤</pattern>
+					<pattern type="10000" count="many">00 тыс'.' ¤</pattern>
+					<pattern type="10000" count="other">00 тыс'.' ¤</pattern>
+					<pattern type="100000" count="one">000 тыс'.' ¤</pattern>
+					<pattern type="100000" count="few">000 тыс'.' ¤</pattern>
+					<pattern type="100000" count="many">000 тыс'.' ¤</pattern>
+					<pattern type="100000" count="other">000 тыс'.' ¤</pattern>
+					<pattern type="1000000" count="one">0 млн ¤</pattern>
+					<pattern type="1000000" count="few">0 млн ¤</pattern>
+					<pattern type="1000000" count="many">0 млн ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="one">00 млн ¤</pattern>
+					<pattern type="10000000" count="few">00 млн ¤</pattern>
+					<pattern type="10000000" count="many">00 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="one">000 млн ¤</pattern>
+					<pattern type="100000000" count="few">000 млн ¤</pattern>
+					<pattern type="100000000" count="many">000 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="one">0 млрд ¤ </pattern>
+					<pattern type="1000000000" count="few">0 млрд ¤ </pattern>
+					<pattern type="1000000000" count="many">0 млрд ¤ </pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤ </pattern>
+					<pattern type="10000000000" count="one">00 млрд ¤</pattern>
+					<pattern type="10000000000" count="few">00 млрд ¤</pattern>
+					<pattern type="10000000000" count="many">00 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="one">000 млрд ¤</pattern>
+					<pattern type="100000000000" count="few">000 млрд ¤</pattern>
+					<pattern type="100000000000" count="many">000 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="one">0 трлн ¤</pattern>
+					<pattern type="1000000000000" count="few">0 трлн ¤</pattern>
+					<pattern type="1000000000000" count="many">0 трлн ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="one">00 трлн ¤</pattern>
+					<pattern type="10000000000000" count="few">00 трлн ¤</pattern>
+					<pattern type="10000000000000" count="many">00 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="one">000 трлн ¤</pattern>
+					<pattern type="100000000000000" count="few">000 трлн ¤</pattern>
+					<pattern type="100000000000000" count="many">000 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<unitPattern count="one">{0} {1}</unitPattern>
+			<unitPattern count="few">{0} {1}</unitPattern>
+			<unitPattern count="many">{0} {1}</unitPattern>
+			<unitPattern count="other">{0} {1}</unitPattern>
+		</currencyFormats>
+		<currencies>
+			<currency type="AED">
+				<displayName>дырхем ААЭ</displayName>
+				<displayName count="one">дырхем ААЭ</displayName>
+				<displayName count="few">дырхемы ААЭ</displayName>
+				<displayName count="many">дырхемаў ААЭ</displayName>
+				<displayName count="other">дырхема ААЭ</displayName>
+				<symbol draft="contributed">AED</symbol>
+			</currency>
+			<currency type="AFN">
+				<displayName>афганскі афгані</displayName>
+				<displayName count="one">афганскі афгані</displayName>
+				<displayName count="few">афганскія афгані</displayName>
+				<displayName count="many">афганскіх афгані</displayName>
+				<displayName count="other">афганскага афгані</displayName>
+				<symbol draft="contributed">AFN</symbol>
+			</currency>
+			<currency type="ALL">
+				<displayName>албанскі лек</displayName>
+				<displayName count="one">албанскі лек</displayName>
+				<displayName count="few">албанскія лекі</displayName>
+				<displayName count="many">албанскіх лекаў</displayName>
+				<displayName count="other">албанскага лека</displayName>
+				<symbol draft="contributed">ALL</symbol>
+			</currency>
+			<currency type="AMD">
+				<displayName>армянскі драм</displayName>
+				<displayName count="one">армянскі драм</displayName>
+				<displayName count="few">армянскія драмы</displayName>
+				<displayName count="many">армянскіх драмаў</displayName>
+				<displayName count="other">армянскага драма</displayName>
+				<symbol draft="contributed">AMD</symbol>
+			</currency>
+			<currency type="ANG">
+				<displayName>нідэрландскі антыльскі гульдэн</displayName>
+				<displayName count="one">нідэрландскі антыльскі гульдэн</displayName>
+				<displayName count="few">нідэрландскія антыльскія гульдэны</displayName>
+				<displayName count="many">нідэрландскіх антыльскіх гульдэнаў</displayName>
+				<displayName count="other">нідэрландскага антыльскага гульдэна</displayName>
+				<symbol draft="contributed">ANG</symbol>
+			</currency>
+			<currency type="AOA">
+				<displayName>ангольская кванза</displayName>
+				<displayName count="one">ангольская кванза</displayName>
+				<displayName count="few">ангольскія кванзы</displayName>
+				<displayName count="many">ангольскіх кванз</displayName>
+				<displayName count="other">ангольскай кванзы</displayName>
+				<symbol draft="contributed">AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
+			</currency>
+			<currency type="ARS">
+				<displayName>аргенцінскае песа</displayName>
+				<displayName count="one">аргенцінскае песа</displayName>
+				<displayName count="few">аргенцінскія песа</displayName>
+				<displayName count="many">аргенцінскіх песа</displayName>
+				<displayName count="other">аргенцінскага песа</displayName>
+				<symbol draft="contributed">ARS</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="AUD">
+				<displayName>аўстралійскі долар</displayName>
+				<displayName count="one">аўстралійскі долар</displayName>
+				<displayName count="few">аўстралійскія долары</displayName>
+				<displayName count="many">аўстралійскіх долараў</displayName>
+				<displayName count="other">аўстралійскага долара</displayName>
+				<symbol draft="contributed">A$</symbol>
+				<symbol alt="narrow" draft="contributed">A$</symbol>
+			</currency>
+			<currency type="AWG">
+				<displayName>арубанскі фларын</displayName>
+				<displayName count="one">арубанскі фларын</displayName>
+				<displayName count="few">арубанскія фларыны</displayName>
+				<displayName count="many">арубанскіх фларынаў</displayName>
+				<displayName count="other">арубанскага фларына</displayName>
+				<symbol draft="contributed">AWG</symbol>
+			</currency>
+			<currency type="AZN">
+				<displayName>азербайджанскі манат</displayName>
+				<displayName count="one">азербайджанскі манат</displayName>
+				<displayName count="few">азербайджанскія манаты</displayName>
+				<displayName count="many">азербайджанскіх манатаў</displayName>
+				<displayName count="other">азербайджанскага маната</displayName>
+				<symbol draft="contributed">AZN</symbol>
+			</currency>
+			<currency type="BAM">
+				<displayName>канверсоўная марка</displayName>
+				<displayName count="one">канверсоўная марка</displayName>
+				<displayName count="few">канверсоўныя маркі</displayName>
+				<displayName count="many">канверсоўных марак</displayName>
+				<displayName count="other">канверсоўнай маркі</displayName>
+				<symbol draft="contributed">BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
+			</currency>
+			<currency type="BBD">
+				<displayName>барбадоскі долар</displayName>
+				<displayName count="one">барбадоскі долар</displayName>
+				<displayName count="few">барбадоскія долары</displayName>
+				<displayName count="many">барбадоскіх долараў</displayName>
+				<displayName count="other">барбадоскага долара</displayName>
+				<symbol draft="contributed">BBD</symbol>
+				<symbol alt="narrow" draft="contributed">Bds$</symbol>
+			</currency>
+			<currency type="BDT">
+				<displayName>бангладэшская така</displayName>
+				<displayName count="one">бангладэшская така</displayName>
+				<displayName count="few">бангладэшскія такі</displayName>
+				<displayName count="many">бангладэшскіх так</displayName>
+				<displayName count="other">бангладэшскай такі</displayName>
+				<symbol draft="contributed">BDT</symbol>
+				<symbol alt="narrow" draft="contributed">৳</symbol>
+			</currency>
+			<currency type="BGN">
+				<displayName>балгарскі леў</displayName>
+				<displayName count="one">балгарскі леў</displayName>
+				<displayName count="few">балгарскія левы</displayName>
+				<displayName count="many">балгарскіх леваў</displayName>
+				<displayName count="other">балгарскага лева</displayName>
+				<symbol draft="contributed">BGN</symbol>
+			</currency>
+			<currency type="BHD">
+				<displayName>бахрэйнскі дынар</displayName>
+				<displayName count="one">бахрэйнскі дынар</displayName>
+				<displayName count="few">бахрэйнскія дынары</displayName>
+				<displayName count="many">бахрэйнскі дынараў</displayName>
+				<displayName count="other">бахрэйнскага дынара</displayName>
+				<symbol draft="contributed">BHD</symbol>
+			</currency>
+			<currency type="BIF">
+				<displayName>бурундзійскі франк</displayName>
+				<displayName count="one">бурундзійскі франк</displayName>
+				<displayName count="few">бурундзійскія франкі</displayName>
+				<displayName count="many">бурундзійскіх франкаў</displayName>
+				<displayName count="other">бурундзійскага франка</displayName>
+				<symbol draft="contributed">BIF</symbol>
+			</currency>
+			<currency type="BMD">
+				<displayName>бермудскі долар</displayName>
+				<displayName count="one">бермудскі долар</displayName>
+				<displayName count="few">бермудскія долары</displayName>
+				<displayName count="many">бермудскіх долараў</displayName>
+				<displayName count="other">бермудскага долара</displayName>
+				<symbol draft="contributed">BMD</symbol>
+				<symbol alt="narrow" draft="contributed">BD$</symbol>
+			</currency>
+			<currency type="BND">
+				<displayName>брунейскі долар</displayName>
+				<displayName count="one">брунейскі долар</displayName>
+				<displayName count="few">брунейскія долары</displayName>
+				<displayName count="many">брунейскіх долараў</displayName>
+				<displayName count="other">брунейскага долара</displayName>
+				<symbol draft="contributed">BND</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BOB">
+				<displayName>балівіяна</displayName>
+				<displayName count="one">балівіяна</displayName>
+				<displayName count="few">балівіяна</displayName>
+				<displayName count="many">балівіяна</displayName>
+				<displayName count="other">балівіяна</displayName>
+				<symbol draft="contributed">BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
+			</currency>
+			<currency type="BRL">
+				<displayName>бразільскі рэал</displayName>
+				<displayName count="one">бразільскі рэал</displayName>
+				<displayName count="few">бразільскія рэалы</displayName>
+				<displayName count="many">бразільскіх рэалаў</displayName>
+				<displayName count="other">бразільскага рэала</displayName>
+				<symbol draft="contributed">BRL</symbol>
+				<symbol alt="narrow" draft="contributed">R$</symbol>
+			</currency>
+			<currency type="BSD">
+				<displayName>багамскі долар</displayName>
+				<displayName count="one">багамскі долар</displayName>
+				<displayName count="few">багамскія долары</displayName>
+				<displayName count="many">багамскіх долараў</displayName>
+				<displayName count="other">багамскага долара</displayName>
+				<symbol draft="contributed">BSD</symbol>
+				<symbol alt="narrow" draft="contributed">B$</symbol>
+			</currency>
+			<currency type="BTN">
+				<displayName>бутанскі нгултрум</displayName>
+				<displayName count="one">бутанскі нгултрум</displayName>
+				<displayName count="few">бутанскія нгултрумы</displayName>
+				<displayName count="many">бутанскіх нгултрумаў</displayName>
+				<displayName count="other">бутанскага нгултрума</displayName>
+				<symbol draft="contributed">BTN</symbol>
+			</currency>
+			<currency type="BWP">
+				<displayName>батсванская пула</displayName>
+				<displayName count="one">батсванская пула</displayName>
+				<displayName count="few">батсванскія пулы</displayName>
+				<displayName count="many">батсванскіх пул</displayName>
+				<displayName count="other">батсванскай пулы</displayName>
+				<symbol draft="contributed">BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
+			</currency>
+			<currency type="BYR">
+				<displayName>беларускі рубель</displayName>
+				<displayName count="one">беларускі рубель</displayName>
+				<displayName count="few">беларускія рублі</displayName>
+				<displayName count="many">беларускіх рублёў</displayName>
+				<displayName count="other">беларускага рубля</displayName>
+				<symbol>р.</symbol>
+				<symbol alt="narrow" draft="contributed">р.</symbol>
+			</currency>
+			<currency type="BZD">
+				<displayName>белізскі долар</displayName>
+				<displayName count="one">белізскі долар</displayName>
+				<displayName count="few">белізскія долары</displayName>
+				<displayName count="many">белізскіх долараў</displayName>
+				<displayName count="other">белізскага долара</displayName>
+				<symbol draft="contributed">BZD</symbol>
+				<symbol alt="narrow" draft="contributed">BZ$</symbol>
+			</currency>
+			<currency type="CAD">
+				<displayName>канадскі долар</displayName>
+				<displayName count="one">канадскі долар</displayName>
+				<displayName count="few">канадскія долары</displayName>
+				<displayName count="many">канадскіх долараў</displayName>
+				<displayName count="other">канадскага долара</displayName>
+				<symbol draft="contributed">CAD</symbol>
+				<symbol alt="narrow" draft="contributed">CA$</symbol>
+			</currency>
+			<currency type="CDF">
+				<displayName>кангалезскі франк</displayName>
+				<displayName count="one">кангалезскі франк</displayName>
+				<displayName count="few">кангалезскія франкі</displayName>
+				<displayName count="many">кангалезскіх франкаў</displayName>
+				<displayName count="other">кангалезскага франка</displayName>
+				<symbol draft="contributed">CDF</symbol>
+			</currency>
+			<currency type="CHF">
+				<displayName>швейцарскі франк</displayName>
+				<displayName count="one">швейцарскі франк</displayName>
+				<displayName count="few">швейцарскія франкі</displayName>
+				<displayName count="many">швейцарскіх франкаў</displayName>
+				<displayName count="other">швейцарскага франка</displayName>
+				<symbol draft="contributed">CHF</symbol>
+			</currency>
+			<currency type="CLP">
+				<displayName>чылійскае песа</displayName>
+				<displayName count="one">чылійскае песа</displayName>
+				<displayName count="few">чылійскія песа</displayName>
+				<displayName count="many">чылійскіх песа</displayName>
+				<displayName count="other">чылійскага песа</displayName>
+				<symbol draft="contributed">CLP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CNY">
+				<displayName>кітайскі юань</displayName>
+				<displayName count="one">кітайскі юань</displayName>
+				<displayName count="few">кітайскія юані</displayName>
+				<displayName count="many">кітайскіх юаняў</displayName>
+				<displayName count="other">кітайскага юаня</displayName>
+				<symbol draft="contributed">CN¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
+			</currency>
+			<currency type="COP">
+				<displayName>калумбійскае песа</displayName>
+				<displayName count="one">калумбійскае песа</displayName>
+				<displayName count="few">калумбійскія песа</displayName>
+				<displayName count="many">калумбійскіх песа</displayName>
+				<displayName count="other">калумбійскага песа</displayName>
+				<symbol draft="contributed">COP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CRC">
+				<displayName>коста-рыканскі калон</displayName>
+				<displayName count="one">коста-рыканскі калон</displayName>
+				<displayName count="few">коста-рыканскія калоны</displayName>
+				<displayName count="many">коста-рыканскіх калонаў</displayName>
+				<displayName count="other">коста-рыканскага калона</displayName>
+				<symbol draft="contributed">CRC</symbol>
+				<symbol alt="narrow" draft="contributed">₡</symbol>
+			</currency>
+			<currency type="CUC">
+				<displayName>кубінскае канверсоўнае песа</displayName>
+				<displayName count="one">кубінскае канверсоўнае песа</displayName>
+				<displayName count="few">кубінскія канверсоўныя песа</displayName>
+				<displayName count="many">кубінскіх канверсоўных песа</displayName>
+				<displayName count="other">кубінскага канверсоўнага песа</displayName>
+				<symbol draft="contributed">CUC</symbol>
+				<symbol alt="narrow" draft="contributed">CUC$</symbol>
+			</currency>
+			<currency type="CUP">
+				<displayName>кубінскае песа</displayName>
+				<displayName count="one">кубінскае песа</displayName>
+				<displayName count="few">кубінскія песа</displayName>
+				<displayName count="many">кубінскіх песа</displayName>
+				<displayName count="other">кубінскага песа</displayName>
+				<symbol draft="contributed">CUP</symbol>
+				<symbol alt="narrow" draft="contributed">$MN</symbol>
+			</currency>
+			<currency type="CVE">
+				<displayName>эскуда Каба-Вердэ</displayName>
+				<displayName count="one">эскуда Каба-Вердэ</displayName>
+				<displayName count="few">эскуда Каба-Вердэ</displayName>
+				<displayName count="many">эскуда Каба-Вердэ</displayName>
+				<displayName count="other">эскуда Каба-Вердэ</displayName>
+				<symbol draft="contributed">CVE</symbol>
+			</currency>
+			<currency type="CZK">
+				<displayName>чэшская крона</displayName>
+				<displayName count="one">чэшская крона</displayName>
+				<displayName count="few">чэшскія кроны</displayName>
+				<displayName count="many">чэшскіх крон</displayName>
+				<displayName count="other">чэшскай кроны</displayName>
+				<symbol draft="contributed">CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
+			</currency>
+			<currency type="DJF">
+				<displayName>джыбуційскі франк</displayName>
+				<displayName count="one">джыбуційскі франк</displayName>
+				<displayName count="few">джыбуційскія франкі</displayName>
+				<displayName count="many">джыбуційскіх франкаў</displayName>
+				<displayName count="other">джыбуційскага франка</displayName>
+				<symbol draft="contributed">DJF</symbol>
+			</currency>
+			<currency type="DKK">
+				<displayName>дацкая крона</displayName>
+				<displayName count="one">дацкая крона</displayName>
+				<displayName count="few">дацкія кроны</displayName>
+				<displayName count="many">дацкіх крон</displayName>
+				<displayName count="other">дацкай кроны</displayName>
+				<symbol draft="contributed">DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="DOP">
+				<displayName>дамініканскае песа</displayName>
+				<displayName count="one">дамініканскае песа</displayName>
+				<displayName count="few">дамініканскія песа</displayName>
+				<displayName count="many">дамініканскіх песа</displayName>
+				<displayName count="other">дамініканскага песа</displayName>
+				<symbol draft="contributed">DOP</symbol>
+				<symbol alt="narrow" draft="contributed">RD$</symbol>
+			</currency>
+			<currency type="DZD">
+				<displayName>алжырскі дынар</displayName>
+				<displayName count="one">алжырскі дынар</displayName>
+				<displayName count="few">алжырскія дынары</displayName>
+				<displayName count="many">алжырскіх дынараў</displayName>
+				<displayName count="other">алжырскага дынара</displayName>
+				<symbol draft="contributed">DZD</symbol>
+			</currency>
+			<currency type="EGP">
+				<displayName>егіпецкі фунт</displayName>
+				<displayName count="one">егіпецкі фунт</displayName>
+				<displayName count="few">егіпецкія фунты</displayName>
+				<displayName count="many">егіпецкіх фунтаў</displayName>
+				<displayName count="other">егіпецкага фунта</displayName>
+				<symbol draft="contributed">EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
+			</currency>
+			<currency type="ERN">
+				<displayName>эрытрэйская накфа</displayName>
+				<displayName count="one">эрытрэйская накфа</displayName>
+				<displayName count="few">эрытрэйскія накфы</displayName>
+				<displayName count="many">эрытрэйскіх накфаў</displayName>
+				<displayName count="other">эрытрэйскай накфы</displayName>
+				<symbol draft="contributed">ERN</symbol>
+			</currency>
+			<currency type="ETB">
+				<displayName>эфіопскі быр</displayName>
+				<displayName count="one">эфіопскі быр</displayName>
+				<displayName count="few">эфіопскія быры</displayName>
+				<displayName count="many">эфіопскіх быраў</displayName>
+				<displayName count="other">эфіопскага быра</displayName>
+				<symbol draft="contributed">ETB</symbol>
+			</currency>
+			<currency type="EUR">
+				<displayName>еўра</displayName>
+				<displayName count="one">еўра</displayName>
+				<displayName count="few">еўра</displayName>
+				<displayName count="many">еўра</displayName>
+				<displayName count="other">еўра</displayName>
+				<symbol draft="contributed">€</symbol>
+				<symbol alt="narrow" draft="contributed">€</symbol>
+			</currency>
+			<currency type="FJD">
+				<displayName>фіджыйскі долар</displayName>
+				<displayName count="one">фіджыйскі долар</displayName>
+				<displayName count="few">фіджыйскія долары</displayName>
+				<displayName count="many">фіджыйскіх долараў</displayName>
+				<displayName count="other">фіджыйскага долара</displayName>
+				<symbol draft="contributed">FJD</symbol>
+				<symbol alt="narrow" draft="contributed">FJ$</symbol>
+			</currency>
+			<currency type="FKP">
+				<displayName>фунт Фалклендскіх астравоў</displayName>
+				<displayName count="one">фунт Фалклендскіх астравоў</displayName>
+				<displayName count="few">фунты Фалклендскіх астравоў</displayName>
+				<displayName count="many">фунтаў Фалклендскіх астравоў</displayName>
+				<displayName count="other">фунта Фалклендскіх астравоў</displayName>
+				<symbol draft="contributed">FKP</symbol>
+				<symbol alt="narrow" draft="contributed">FK£</symbol>
+			</currency>
+			<currency type="GBP">
+				<displayName>брытанскі фунт стэрлінгаў</displayName>
+				<displayName count="one">брытанскі фунт стэрлінгаў</displayName>
+				<displayName count="few">брытанскія фунты стэрлінгаў</displayName>
+				<displayName count="many">брытанскіх фунтаў стэрлінгаў</displayName>
+				<displayName count="other">брытанскага фунта стэрлінгаў</displayName>
+				<symbol draft="contributed">£</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="GEL">
+				<displayName>грузінскі лары</displayName>
+				<displayName count="one">грузінскі лары</displayName>
+				<displayName count="few">грузінскія лары</displayName>
+				<displayName count="many">грузінскіх лары</displayName>
+				<displayName count="other">грузінскага лары</displayName>
+				<symbol draft="contributed">GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
+			</currency>
+			<currency type="GHS">
+				<displayName>ганскі седзі</displayName>
+				<displayName count="one">ганскі седзі</displayName>
+				<displayName count="few">ганскія седзі</displayName>
+				<displayName count="many">ганскіх седзі</displayName>
+				<displayName count="other">ганскага седзі</displayName>
+				<symbol draft="contributed">GHS</symbol>
+			</currency>
+			<currency type="GIP">
+				<displayName>гібралтарскі фунт</displayName>
+				<displayName count="one">гібралтарскі фунт</displayName>
+				<displayName count="few">гібралтарскія фунты</displayName>
+				<displayName count="many">гібралтарскіх фунтаў</displayName>
+				<displayName count="other">гібралтарскага фунта</displayName>
+				<symbol draft="contributed">GIP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="GMD">
+				<displayName>гамбійскі даласі</displayName>
+				<displayName count="one">гамбійскі даласі</displayName>
+				<displayName count="few">гамбійскія даласі</displayName>
+				<displayName count="many">гамбійскіх даласі</displayName>
+				<displayName count="other">гамбійскага даласі</displayName>
+				<symbol draft="contributed">GMD</symbol>
+			</currency>
+			<currency type="GNF">
+				<displayName>гвінейскі франк</displayName>
+				<displayName count="one">гвінейскі франк</displayName>
+				<displayName count="few">гвінейскія франкі</displayName>
+				<displayName count="many">гвінейскіх франкаў</displayName>
+				<displayName count="other">гвінейскага франка</displayName>
+				<symbol draft="contributed">GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
+			</currency>
+			<currency type="GTQ">
+				<displayName>гватэмальскі кетсаль</displayName>
+				<displayName count="one">гватэмальскі кетсаль</displayName>
+				<displayName count="few">гватэмальскія кетсалі</displayName>
+				<displayName count="many">гватэмальскіх кетсаляў</displayName>
+				<displayName count="other">гватэмальскага кетсаля</displayName>
+				<symbol draft="contributed">GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
+			</currency>
+			<currency type="GYD">
+				<displayName>гаянскі долар</displayName>
+				<displayName count="one">гаянскі долар</displayName>
+				<displayName count="few">гаянскія долары</displayName>
+				<displayName count="many">гаянскіх долараў</displayName>
+				<displayName count="other">гаянскага долара</displayName>
+				<symbol draft="contributed">GYD</symbol>
+				<symbol alt="narrow" draft="contributed">G$</symbol>
+			</currency>
+			<currency type="HKD">
+				<displayName>ганконгскі долар</displayName>
+				<displayName count="one">ганконгскі долар</displayName>
+				<displayName count="few">ганконгскія долары</displayName>
+				<displayName count="many">ганконгскіх долараў</displayName>
+				<displayName count="other">ганконгскага долара</displayName>
+				<symbol draft="contributed">HK$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="HNL">
+				<displayName>гандураская лемпіра</displayName>
+				<displayName count="one">гандураская лемпіра</displayName>
+				<displayName count="few">гандураскія лемпіры</displayName>
+				<displayName count="many">гандураскіх лемпір</displayName>
+				<displayName count="other">гандураскай лемпіры</displayName>
+				<symbol draft="contributed">HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
+			</currency>
+			<currency type="HRK">
+				<displayName>харвацкая куна</displayName>
+				<displayName count="one">харвацкая куна</displayName>
+				<displayName count="few">харвацкія куны</displayName>
+				<displayName count="many">харвацкіх кун</displayName>
+				<displayName count="other">харвацкай куны</displayName>
+				<symbol draft="contributed">HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
+			</currency>
+			<currency type="HTG">
+				<displayName>гаіцянскі гурд</displayName>
+				<displayName count="one">гаіцянскі гурд</displayName>
+				<displayName count="few">гаіцянскія гурды</displayName>
+				<displayName count="many">гаіцянскіх гурдаў</displayName>
+				<displayName count="other">гаіцянскага гурда</displayName>
+				<symbol draft="contributed">HTG</symbol>
+			</currency>
+			<currency type="HUF">
+				<displayName>венгерскі форынт</displayName>
+				<displayName count="one">венгерскі форынт</displayName>
+				<displayName count="few">венгерскія форынты</displayName>
+				<displayName count="many">венгерскіх форынтаў</displayName>
+				<displayName count="other">венгерскага форынта</displayName>
+				<symbol draft="contributed">HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
+			</currency>
+			<currency type="IDR">
+				<displayName>інданезійская рупія</displayName>
+				<displayName count="one">інданезійская рупія</displayName>
+				<displayName count="few">інданезійскія рупіі</displayName>
+				<displayName count="many">інданезійскіх рупій</displayName>
+				<displayName count="other">інданезійскай рупіі</displayName>
+				<symbol draft="contributed">IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
+			</currency>
+			<currency type="ILS">
+				<displayName>новы ізраільскі шэкель</displayName>
+				<displayName count="one">новы ізраільскі шэкель</displayName>
+				<displayName count="few">новыя ізраільскі шэкелі</displayName>
+				<displayName count="many">новых ізраільскіх шэкеляў</displayName>
+				<displayName count="other">новага ізраільскага шэкеля</displayName>
+				<symbol draft="contributed">₪</symbol>
+				<symbol alt="narrow" draft="contributed">₪</symbol>
+			</currency>
+			<currency type="INR">
+				<displayName>індыйская рупія</displayName>
+				<displayName count="one">індыйская рупія</displayName>
+				<displayName count="few">індыйскія рупіі</displayName>
+				<displayName count="many">індыйскіх рупій</displayName>
+				<displayName count="other">індыйскай рупіі</displayName>
+				<symbol draft="contributed">₹</symbol>
+				<symbol alt="narrow" draft="contributed">₹</symbol>
+			</currency>
+			<currency type="IQD">
+				<displayName>іракскі дынар</displayName>
+				<displayName count="one">іракскі дынар</displayName>
+				<displayName count="few">іракскія дынары</displayName>
+				<displayName count="many">іракскіх дынараў</displayName>
+				<displayName count="other">іракскага дынара</displayName>
+				<symbol draft="contributed">IQD</symbol>
+			</currency>
+			<currency type="IRR">
+				<displayName>іранскі рыал</displayName>
+				<displayName count="one">іранскі рыал</displayName>
+				<displayName count="few">іранскія рыалы</displayName>
+				<displayName count="many">іранскіх рыалаў</displayName>
+				<displayName count="other">іранскага рыала</displayName>
+				<symbol draft="contributed">IRR</symbol>
+			</currency>
+			<currency type="ISK">
+				<displayName>ісландская крона</displayName>
+				<displayName count="one">ісландская крона</displayName>
+				<displayName count="few">ісландскія кроны</displayName>
+				<displayName count="many">ісландскіх крон</displayName>
+				<displayName count="other">ісландскай кроны</displayName>
+				<symbol draft="contributed">ISK</symbol>
+				<symbol alt="narrow" draft="contributed">Íkr</symbol>
+			</currency>
+			<currency type="JMD">
+				<displayName>ямайскі долар</displayName>
+				<displayName count="one">ямайскі долар</displayName>
+				<displayName count="few">ямайскія долары</displayName>
+				<displayName count="many">ямайскіх долараў</displayName>
+				<displayName count="other">ямайскага долара</displayName>
+				<symbol draft="contributed">JMD</symbol>
+				<symbol alt="narrow" draft="contributed">J$</symbol>
+			</currency>
+			<currency type="JOD">
+				<displayName>іарданскі дынар</displayName>
+				<displayName count="one">іарданскі дынар</displayName>
+				<displayName count="few">іарданскія дынары</displayName>
+				<displayName count="many">іарданскіх дынараў</displayName>
+				<displayName count="other">іарданскага дынара</displayName>
+				<symbol draft="contributed">JOD</symbol>
+			</currency>
+			<currency type="JPY">
+				<displayName>японская іена</displayName>
+				<displayName count="one">японская іена</displayName>
+				<displayName count="few">японскія іены</displayName>
+				<displayName count="many">японскіх іен</displayName>
+				<displayName count="other">японскай іены</displayName>
+				<symbol draft="contributed">¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
+			</currency>
+			<currency type="KES">
+				<displayName>кенійскі шылінг</displayName>
+				<displayName count="one">кенійскі шылінг</displayName>
+				<displayName count="few">кенійскія шылінгі</displayName>
+				<displayName count="many">кенійскіх шылінгаў</displayName>
+				<displayName count="other">кенійскага шылінга</displayName>
+				<symbol draft="contributed">KES</symbol>
+			</currency>
+			<currency type="KGS">
+				<displayName>кіргізскі сом</displayName>
+				<displayName count="one">кіргізскі сом</displayName>
+				<displayName count="few">кіргізскія сомы</displayName>
+				<displayName count="many">кіргізскіх сомаў</displayName>
+				<displayName count="other">кіргізскага сома</displayName>
+				<symbol draft="contributed">KGS</symbol>
+			</currency>
+			<currency type="KHR">
+				<displayName>камбаджыйскі рыэль</displayName>
+				<displayName count="one">камбаджыйскі рыэль</displayName>
+				<displayName count="few">камбаджыйскія рыэлі</displayName>
+				<displayName count="many">камбаджыйскіх рыэляў</displayName>
+				<displayName count="other">камбаджыйскага рыэля</displayName>
+				<symbol draft="contributed">KHR</symbol>
+				<symbol alt="narrow" draft="contributed">៛</symbol>
+			</currency>
+			<currency type="KMF">
+				<displayName>каморскі франк</displayName>
+				<displayName count="one">каморскі франк</displayName>
+				<displayName count="few">каморскія франкі</displayName>
+				<displayName count="many">каморскіх франкаў</displayName>
+				<displayName count="other">каморскага франка</displayName>
+				<symbol draft="contributed">KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
+			</currency>
+			<currency type="KPW">
+				<displayName>паўночнакарэйская вона</displayName>
+				<displayName count="one">паўночнакарэйская вона</displayName>
+				<displayName count="few">паўночнакарэйскія воны</displayName>
+				<displayName count="many">паўночнакарэйскіх вон</displayName>
+				<displayName count="other">паўночнакарэйскай воны</displayName>
+				<symbol draft="contributed">KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
+			</currency>
+			<currency type="KRW">
+				<displayName>паўднёвакарэйская вона</displayName>
+				<displayName count="one">паўднёвакарэйская вона</displayName>
+				<displayName count="few">паўднёвакарэйскія воны</displayName>
+				<displayName count="many">паўднёвакарэйскіх вон</displayName>
+				<displayName count="other">паўднёвакарэйскай воны</displayName>
+				<symbol draft="contributed">₩</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
+			</currency>
+			<currency type="KWD">
+				<displayName>кувейцкі дынар</displayName>
+				<displayName count="one">кувейцкі дынар</displayName>
+				<displayName count="few">кувейцкія дынары</displayName>
+				<displayName count="many">кувейцкіх дынараў</displayName>
+				<displayName count="other">кувейцкага дынара</displayName>
+				<symbol draft="contributed">KWD</symbol>
+			</currency>
+			<currency type="KYD">
+				<displayName>долар Кайманавых астравоў</displayName>
+				<displayName count="one">долар Кайманавых астравоў</displayName>
+				<displayName count="few">долары Кайманавых астравоў</displayName>
+				<displayName count="many">долараў Кайманавых астравоў</displayName>
+				<displayName count="other">долара Кайманавых астравоў</displayName>
+				<symbol draft="contributed">KYD</symbol>
+				<symbol alt="narrow" draft="contributed">CI$</symbol>
+			</currency>
+			<currency type="KZT">
+				<displayName>казахстанскі тэнгэ</displayName>
+				<displayName count="one">казахстанскі тэнгэ</displayName>
+				<displayName count="few">казахстанскія тэнгэ</displayName>
+				<displayName count="many">казахстанскіх тэнгэ</displayName>
+				<displayName count="other">казахстанскага тэнгэ</displayName>
+				<symbol draft="contributed">KZT</symbol>
+				<symbol alt="narrow" draft="contributed">₸</symbol>
+			</currency>
+			<currency type="LAK">
+				<displayName>лаоскі кіп</displayName>
+				<displayName count="one">лаоскі кіп</displayName>
+				<displayName count="few">лаоскія кіпы</displayName>
+				<displayName count="many">лаоскіх кіпаў</displayName>
+				<displayName count="other">лаоскага кіпа</displayName>
+				<symbol draft="contributed">LAK</symbol>
+				<symbol alt="narrow" draft="contributed">₭</symbol>
+			</currency>
+			<currency type="LBP">
+				<displayName>ліванскі фунт</displayName>
+				<displayName count="one">ліванскі фунт</displayName>
+				<displayName count="few">ліванскія фунты</displayName>
+				<displayName count="many">ліванскіх фунтаў</displayName>
+				<displayName count="other">ліванскага фунта</displayName>
+				<symbol draft="contributed">LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
+			</currency>
+			<currency type="LKR">
+				<displayName>шры-ланкійская рупія</displayName>
+				<displayName count="one">шры-ланкійская рупія</displayName>
+				<displayName count="few">шры-ланкійскія рупіі</displayName>
+				<displayName count="many">шры-ланкійскіх рупій</displayName>
+				<displayName count="other">шры-ланкійскай рупіі</displayName>
+				<symbol draft="contributed">LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="LRD">
+				<displayName>ліберыйскі долар</displayName>
+				<displayName count="one">ліберыйскі долар</displayName>
+				<displayName count="few">ліберыйскія долары</displayName>
+				<displayName count="many">ліберыйскіх долараў</displayName>
+				<displayName count="other">ліберыйскага долара</displayName>
+				<symbol draft="contributed">LRD</symbol>
+				<symbol alt="narrow" draft="contributed">L$</symbol>
+			</currency>
+			<currency type="LYD">
+				<displayName>лівійскі дынар</displayName>
+				<displayName count="one">лівійскі дынар</displayName>
+				<displayName count="few">лівійскія дынары</displayName>
+				<displayName count="many">лівійскіх дынараў</displayName>
+				<displayName count="other">лівійскага дынара</displayName>
+				<symbol draft="contributed">LYD</symbol>
+			</currency>
+			<currency type="MAD">
+				<displayName>мараканскі дырхам</displayName>
+				<displayName count="one">мараканскі дырхам</displayName>
+				<displayName count="few">мараканскія дырхамы</displayName>
+				<displayName count="many">мараканскіх дырхамаў</displayName>
+				<displayName count="other">мараканскага дырхама</displayName>
+				<symbol draft="contributed">MAD</symbol>
+			</currency>
+			<currency type="MDL">
+				<displayName>малдаўскі лей</displayName>
+				<displayName count="one">малдаўскі лей</displayName>
+				<displayName count="few">малдаўскія леі</displayName>
+				<displayName count="many">малдаўскіх леяў</displayName>
+				<displayName count="other">малдаўскага лея</displayName>
+				<symbol draft="contributed">MDL</symbol>
+			</currency>
+			<currency type="MGA">
+				<displayName>малагасійскі арыяры</displayName>
+				<displayName count="one">малагасійскі арыяры</displayName>
+				<displayName count="few">малагасійскія арыяры</displayName>
+				<displayName count="many">малагасійскіх арыяры</displayName>
+				<displayName count="other">малагасійскага арыяры</displayName>
+				<symbol draft="contributed">MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
+			</currency>
+			<currency type="MKD">
+				<displayName>македонскі дэнар</displayName>
+				<displayName count="one">македонскі дэнар</displayName>
+				<displayName count="few">македонскія дэнары</displayName>
+				<displayName count="many">македонскіх дэнараў</displayName>
+				<displayName count="other">македонскага дэнара</displayName>
+				<symbol draft="contributed">MKD</symbol>
+			</currency>
+			<currency type="MMK">
+				<displayName>м’янманскі к’ят</displayName>
+				<displayName count="one">м’янманскі к’ят</displayName>
+				<displayName count="few">м’янманскія к’яты</displayName>
+				<displayName count="many">м’янманскіх к’ятаў</displayName>
+				<displayName count="other">м’янманскага к’ята</displayName>
+				<symbol draft="contributed">MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
+			</currency>
+			<currency type="MNT">
+				<displayName>мангольскі тугрык</displayName>
+				<displayName count="one">мангольскі тугрык</displayName>
+				<displayName count="few">мангольскія тугрыкі</displayName>
+				<displayName count="many">мангольскіх тугрыкаў</displayName>
+				<displayName count="other">мангольскага тугрыка</displayName>
+				<symbol draft="contributed">MNT</symbol>
+				<symbol alt="narrow" draft="contributed">₮</symbol>
+			</currency>
+			<currency type="MOP">
+				<displayName>патака Макаа</displayName>
+				<displayName count="one">патака Макаа</displayName>
+				<displayName count="few">патакі Макаа</displayName>
+				<displayName count="many">патак Макаа</displayName>
+				<displayName count="other">патакі Макаа</displayName>
+				<symbol draft="contributed">MOP</symbol>
+			</currency>
+			<currency type="MRO">
+				<displayName>маўрытанская ўгія</displayName>
+				<displayName count="one">маўрытанская ўгія</displayName>
+				<displayName count="few">маўрытанскія ўгіі</displayName>
+				<displayName count="many">маўрытанскіх угій</displayName>
+				<displayName count="other">маўрытанскай ўгіі</displayName>
+				<symbol draft="contributed">MRO</symbol>
+			</currency>
+			<currency type="MUR">
+				<displayName>маўрыкійская рупія</displayName>
+				<displayName count="one">маўрыкійская рупія</displayName>
+				<displayName count="few">маўрыкійскія рупіі</displayName>
+				<displayName count="many">маўрыкійскіх рупій</displayName>
+				<displayName count="other">маўрыкійскай рупіі</displayName>
+				<symbol draft="contributed">MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="MVR">
+				<displayName>мальдыўская руфія</displayName>
+				<displayName count="one">мальдыўская руфія</displayName>
+				<displayName count="few">мальдыўскія руфіі</displayName>
+				<displayName count="many">мальдыўскіх руфій</displayName>
+				<displayName count="other">мальдыўскай руфіі</displayName>
+				<symbol draft="contributed">MVR</symbol>
+			</currency>
+			<currency type="MWK">
+				<displayName>малавійская квача</displayName>
+				<displayName count="one">малавійская квача</displayName>
+				<displayName count="few">малавійскія квачы</displayName>
+				<displayName count="many">малавійскіх квач</displayName>
+				<displayName count="other">малавійскай квачы</displayName>
+				<symbol draft="contributed">MWK</symbol>
+			</currency>
+			<currency type="MXN">
+				<displayName>мексіканскае песа</displayName>
+				<displayName count="one">мексіканскае песа</displayName>
+				<displayName count="few">мексіканскія песа</displayName>
+				<displayName count="many">мексіканскіх песа</displayName>
+				<displayName count="other">мексіканскага песа</displayName>
+				<symbol draft="contributed">MX$</symbol>
+				<symbol alt="narrow" draft="contributed">MX$</symbol>
+			</currency>
+			<currency type="MYR">
+				<displayName>малайзійскі рынгіт</displayName>
+				<displayName count="one">малайзійскі рынгіт</displayName>
+				<displayName count="few">малайзійскія рынгіты</displayName>
+				<displayName count="many">малайзійскіх рынгітаў</displayName>
+				<displayName count="other">малайзійскага рынгіта</displayName>
+				<symbol draft="contributed">MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
+			</currency>
+			<currency type="MZN">
+				<displayName>мазамбікскі метыкал</displayName>
+				<displayName count="one">мазамбікскі метыкал</displayName>
+				<displayName count="few">мазамбікскія метыкалы</displayName>
+				<displayName count="many">мазамбікскіх метыкалаў</displayName>
+				<displayName count="other">мазамбікскага метыкала</displayName>
+				<symbol draft="contributed">MZN</symbol>
+			</currency>
+			<currency type="NAD">
+				<displayName>намібійскі долар</displayName>
+				<displayName count="one">намібійскі долар</displayName>
+				<displayName count="few">намібійскія долары</displayName>
+				<displayName count="many">намібійскіх долараў</displayName>
+				<displayName count="other">намібійскага долара</displayName>
+				<symbol draft="contributed">NAD</symbol>
+				<symbol alt="narrow" draft="contributed">N$</symbol>
+			</currency>
+			<currency type="NGN">
+				<displayName>нігерыйская найра</displayName>
+				<displayName count="one">нігерыйская найра</displayName>
+				<displayName count="few">нігерыйскія найры</displayName>
+				<displayName count="many">нігерыйскіх найр</displayName>
+				<displayName count="other">нігерыйскай найры</displayName>
+				<symbol draft="contributed">NGN</symbol>
+				<symbol alt="narrow" draft="contributed">₦</symbol>
+			</currency>
+			<currency type="NIO">
+				<displayName>нікарагуанская кордаба</displayName>
+				<displayName count="one">нікарагуанская кордаба</displayName>
+				<displayName count="few">нікарагуанскія кордабы</displayName>
+				<displayName count="many">нікарагуанскіх кордаб</displayName>
+				<displayName count="other">нікарагуанскай кордабы</displayName>
+				<symbol draft="contributed">NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
+			</currency>
+			<currency type="NOK">
+				<displayName>нарвежская крона</displayName>
+				<displayName count="one">нарвежская крона</displayName>
+				<displayName count="few">нарвежскія кроны</displayName>
+				<displayName count="many">нарвежскіх крон</displayName>
+				<displayName count="other">нарвежскай кроны</displayName>
+				<symbol draft="contributed">NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="NPR">
+				<displayName>непальская рупія</displayName>
+				<displayName count="one">непальская рупія</displayName>
+				<displayName count="few">непальскія рупіі</displayName>
+				<displayName count="many">непальскіх рупій</displayName>
+				<displayName count="other">непальскай рупіі</displayName>
+				<symbol draft="contributed">NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="NZD">
+				<displayName>новазеландскі долар</displayName>
+				<displayName count="one">новазеландскі долар</displayName>
+				<displayName count="few">новазеландскія долары</displayName>
+				<displayName count="many">новазеландскіх долараў</displayName>
+				<displayName count="other">новазеландскага долара</displayName>
+				<symbol draft="contributed">NZD</symbol>
+				<symbol alt="narrow" draft="contributed">NZ$</symbol>
+			</currency>
+			<currency type="OMR">
+				<displayName>аманскі рыал</displayName>
+				<displayName count="one">аманскі рыал</displayName>
+				<displayName count="few">аманскія рыалы</displayName>
+				<displayName count="many">аманскіх рыалаў</displayName>
+				<displayName count="other">аманска рыала</displayName>
+				<symbol draft="contributed">OMR</symbol>
+			</currency>
+			<currency type="PAB">
+				<displayName>панамскае бальбоа</displayName>
+				<displayName count="one">панамскае бальбоа</displayName>
+				<displayName count="few">панамскія бальбоа</displayName>
+				<displayName count="many">панамскіх бальбоа</displayName>
+				<displayName count="other">панамскага бальбоа</displayName>
+				<symbol draft="contributed">PAB</symbol>
+			</currency>
+			<currency type="PEN">
+				<displayName>перуанскі новы соль</displayName>
+				<displayName count="one">перуанскі новы соль</displayName>
+				<displayName count="few">перуанскія новыя солі</displayName>
+				<displayName count="many">перуанскіх новых соляў</displayName>
+				<displayName count="other">перуанскага новага соля</displayName>
+				<symbol draft="contributed">PEN</symbol>
+			</currency>
+			<currency type="PGK">
+				<displayName>кіна</displayName>
+				<displayName count="one">кіна</displayName>
+				<displayName count="few">кіна</displayName>
+				<displayName count="many">кіна</displayName>
+				<displayName count="other">кіна</displayName>
+				<symbol draft="contributed">PGK</symbol>
+			</currency>
+			<currency type="PHP">
+				<displayName>філіпінскае песа</displayName>
+				<displayName count="one">філіпінскае песа</displayName>
+				<displayName count="few">філіпінскія песа</displayName>
+				<displayName count="many">філіпінскіх песа</displayName>
+				<displayName count="other">філіпінскага песа</displayName>
+				<symbol draft="contributed">PHP</symbol>
+				<symbol alt="narrow" draft="contributed">₱</symbol>
+			</currency>
+			<currency type="PKR">
+				<displayName>пакістанская рупія</displayName>
+				<displayName count="one">пакістанская рупія</displayName>
+				<displayName count="few">пакістанскія рупіі</displayName>
+				<displayName count="many">пакістанскіх рупій</displayName>
+				<displayName count="other">пакістанскай рупіі</displayName>
+				<symbol draft="contributed">PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="PLN">
+				<displayName>польскі злоты</displayName>
+				<displayName count="one">польскі злоты</displayName>
+				<displayName count="few">польскія злотыя</displayName>
+				<displayName count="many">польскіх злотых</displayName>
+				<displayName count="other">польскага злотага</displayName>
+				<symbol draft="contributed">PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
+			</currency>
+			<currency type="PYG">
+				<displayName>парагвайскі гуарані</displayName>
+				<displayName count="one">парагвайскі гуарані</displayName>
+				<displayName count="few">парагвайскія гуарані</displayName>
+				<displayName count="many">парагвайскіх гуарані</displayName>
+				<displayName count="other">парагвайскага гуарані</displayName>
+				<symbol draft="contributed">PYG</symbol>
+				<symbol alt="narrow" draft="contributed">₲</symbol>
+			</currency>
+			<currency type="QAR">
+				<displayName>катарскі рыал</displayName>
+				<displayName count="one">катарскі рыал</displayName>
+				<displayName count="few">катарскія рыалы</displayName>
+				<displayName count="many">катарскіх рыалаў</displayName>
+				<displayName count="other">катарскага рыала</displayName>
+				<symbol draft="contributed">QAR</symbol>
+			</currency>
+			<currency type="RON">
+				<displayName>румынскі лей</displayName>
+				<displayName count="one">румынскі лей</displayName>
+				<displayName count="few">румынскія леі</displayName>
+				<displayName count="many">румынскіх леяў</displayName>
+				<displayName count="other">румынскага лея</displayName>
+				<symbol draft="contributed">RON</symbol>
+			</currency>
+			<currency type="RSD">
+				<displayName>сербскі дынар</displayName>
+				<displayName count="one">сербскі дынар</displayName>
+				<displayName count="few">сербскія дынары</displayName>
+				<displayName count="many">сербскіх дынараў</displayName>
+				<displayName count="other">сербскага дынара</displayName>
+				<symbol draft="contributed">RSD</symbol>
+			</currency>
+			<currency type="RUB">
+				<displayName>расійскі рубель</displayName>
+				<displayName count="one">расійскі рубель</displayName>
+				<displayName count="few">расійскія рублі</displayName>
+				<displayName count="many">расійскіх рублёў</displayName>
+				<displayName count="other">расійскага рубля</displayName>
+				<symbol>₽</symbol>
+				<symbol alt="narrow" draft="contributed">руб.</symbol>
+			</currency>
+			<currency type="RWF">
+				<displayName>руандыйскі франк</displayName>
+				<displayName count="one">руандыйскі франк</displayName>
+				<displayName count="few">руандыйскія франкі</displayName>
+				<displayName count="many">руандыйскіх франкаў</displayName>
+				<displayName count="other">руандыйскага франка</displayName>
+				<symbol draft="contributed">RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
+			</currency>
+			<currency type="SAR">
+				<displayName>саудаўскі рыял</displayName>
+				<displayName count="one">саудаўскі рыял</displayName>
+				<displayName count="few">саудаўскія рыялы</displayName>
+				<displayName count="many">саудаўскіх рыялаў</displayName>
+				<displayName count="other">саудаўскага рыяла</displayName>
+				<symbol draft="contributed">SAR</symbol>
+			</currency>
+			<currency type="SBD">
+				<displayName>долар Саламонавых Астравоў</displayName>
+				<displayName count="one">долар Саламонавых Астравоў</displayName>
+				<displayName count="few">долары Саламонавых Астравоў</displayName>
+				<displayName count="many">долараў Саламонавых Астравоў</displayName>
+				<displayName count="other">долара Саламонавых Астравоў</displayName>
+				<symbol draft="contributed">SBD</symbol>
+				<symbol alt="narrow" draft="contributed">SI$</symbol>
+			</currency>
+			<currency type="SCR">
+				<displayName>сейшэльская рупія</displayName>
+				<displayName count="one">сейшэльская рупія</displayName>
+				<displayName count="few">сейшэльскія рупіі</displayName>
+				<displayName count="many">сейшэльскіх рупій</displayName>
+				<displayName count="other">сейшэльскай рупіі</displayName>
+				<symbol draft="contributed">SCR</symbol>
+			</currency>
+			<currency type="SDG">
+				<displayName>суданскі фунт</displayName>
+				<displayName count="one">суданскі фунт</displayName>
+				<displayName count="few">суданскія фунты</displayName>
+				<displayName count="many">суданскіх фунтаў</displayName>
+				<displayName count="other">суданскага фунта</displayName>
+				<symbol draft="contributed">SDG</symbol>
+			</currency>
+			<currency type="SEK">
+				<displayName>шведская крона</displayName>
+				<displayName count="one">шведская крона</displayName>
+				<displayName count="few">шведскія кроны</displayName>
+				<displayName count="many">шведскіх крон</displayName>
+				<displayName count="other">шведскай кроны</displayName>
+				<symbol draft="contributed">SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="SGD">
+				<displayName>сінгапурскі долар</displayName>
+				<displayName count="one">сінгапурскі долар</displayName>
+				<displayName count="few">сінгапурскія долары</displayName>
+				<displayName count="many">сінгапурскіх долараў</displayName>
+				<displayName count="other">сінгапурскага долара</displayName>
+				<symbol draft="contributed">SGD</symbol>
+				<symbol alt="narrow" draft="contributed">S$</symbol>
+			</currency>
+			<currency type="SHP">
+				<displayName>фунт Святой Алены</displayName>
+				<displayName count="one">фунт Святой Алены</displayName>
+				<displayName count="few">фунты Святой Алены</displayName>
+				<displayName count="many">фунтаў Святой Алены</displayName>
+				<displayName count="other">фунта Святой Алены</displayName>
+				<symbol draft="contributed">SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="SLL">
+				<displayName>леонэ</displayName>
+				<displayName count="one">леонэ</displayName>
+				<displayName count="few">леонэ</displayName>
+				<displayName count="many">леонэ</displayName>
+				<displayName count="other">леонэ</displayName>
+				<symbol draft="contributed">SLL</symbol>
+			</currency>
+			<currency type="SOS">
+				<displayName>самалійскі шылінг</displayName>
+				<displayName count="one">самалійскі шылінг</displayName>
+				<displayName count="few">самалійскія шылінгі</displayName>
+				<displayName count="many">самалійскіх шылінгаў</displayName>
+				<displayName count="other">самалійскага шылінга</displayName>
+				<symbol draft="contributed">SOS</symbol>
+			</currency>
+			<currency type="SRD">
+				<displayName>сурынамскі долар</displayName>
+				<displayName count="one">сурынамскі долар</displayName>
+				<displayName count="few">сурынамскія долары</displayName>
+				<displayName count="many">сурынамскіх долараў</displayName>
+				<displayName count="other">сурынамскага долара</displayName>
+				<symbol draft="contributed">SRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="SSP">
+				<displayName>паўднёвасуданскі фунт</displayName>
+				<displayName count="one">паўднёвасуданскі фунт</displayName>
+				<displayName count="few">паўднёвасуданскія фунты</displayName>
+				<displayName count="many">паўднёвасуданскіх фунтаў</displayName>
+				<displayName count="other">паўднёвасуданскага фунта</displayName>
+				<symbol draft="contributed">SSP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="STD">
+				<displayName>добра Сан-Тамэ і Прынсіпі</displayName>
+				<displayName count="one">добра Сан-Тамэ і Прынсіпі</displayName>
+				<displayName count="few">добры Сан-Тамэ і Прынсіпі</displayName>
+				<displayName count="many">добр Сан-Тамэ і Прынсіпі</displayName>
+				<displayName count="other">добры Сан-Тамэ і Прынсіпі</displayName>
+				<symbol draft="contributed">STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
+			</currency>
+			<currency type="SYP">
+				<displayName>сірыйскі фунт</displayName>
+				<displayName count="one">сірыйскі фунт</displayName>
+				<displayName count="few">сірыйскія фунты</displayName>
+				<displayName count="many">сірыйскіх фунтаў</displayName>
+				<displayName count="other">сірыйскага фунта</displayName>
+				<symbol draft="contributed">SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="SZL">
+				<displayName>свазілендскі лілангені</displayName>
+				<displayName count="one">свазілендскі лілангені</displayName>
+				<displayName count="few">свазілендскія лілангені</displayName>
+				<displayName count="many">свазілендскіх лілангені</displayName>
+				<displayName count="other">свазілендскага лілангені</displayName>
+				<symbol draft="contributed">SZL</symbol>
+			</currency>
+			<currency type="THB">
+				<displayName>тайскі бат</displayName>
+				<displayName count="one">тайскі бат</displayName>
+				<displayName count="few">тайскія баты</displayName>
+				<displayName count="many">тайскіх батаў</displayName>
+				<displayName count="other">тайскага бата</displayName>
+				<symbol draft="contributed">THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
+			</currency>
+			<currency type="TJS">
+				<displayName>таджыкскі самані</displayName>
+				<displayName count="one">таджыкскі самані</displayName>
+				<displayName count="few">таджыкскія самані</displayName>
+				<displayName count="many">таджыкскіх самані</displayName>
+				<displayName count="other">таджыкскага самані</displayName>
+				<symbol draft="contributed">TJS</symbol>
+			</currency>
+			<currency type="TMT">
+				<displayName>туркменскі манат</displayName>
+				<displayName count="one">туркменскі манат</displayName>
+				<displayName count="few">туркменскія манаты</displayName>
+				<displayName count="many">туркменскіх манатаў</displayName>
+				<displayName count="other">туркменскага маната</displayName>
+				<symbol draft="contributed">TMT</symbol>
+			</currency>
+			<currency type="TND">
+				<displayName>туніскі дынар</displayName>
+				<displayName count="one">туніскі дынар</displayName>
+				<displayName count="few">туніскія дынары</displayName>
+				<displayName count="many">туніскіх дынараў</displayName>
+				<displayName count="other">туніскага дынара</displayName>
+				<symbol draft="contributed">TND</symbol>
+			</currency>
+			<currency type="TOP">
+				<displayName>танганская паанга</displayName>
+				<displayName count="one">танганская паанга</displayName>
+				<displayName count="few">танганскія паангі</displayName>
+				<displayName count="many">танганскіх паанг</displayName>
+				<displayName count="other">танганскай паангі</displayName>
+				<symbol draft="contributed">TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
+			</currency>
+			<currency type="TRY">
+				<displayName>турэцкая ліра</displayName>
+				<displayName count="one">турэцкая ліра</displayName>
+				<displayName count="few">турэцкія ліры</displayName>
+				<displayName count="many">турэцкіх лір</displayName>
+				<displayName count="other">турэцкай ліры</displayName>
+				<symbol draft="contributed">TRY</symbol>
+				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
+			</currency>
+			<currency type="TTD">
+				<displayName>долар Трынідада і Табага</displayName>
+				<displayName count="one">долар Трынідада і Табага</displayName>
+				<displayName count="few">долары Трынідада і Табага</displayName>
+				<displayName count="many">долараў Трынідада і Табага</displayName>
+				<displayName count="other">долара Трынідада і Табага</displayName>
+				<symbol draft="contributed">TTD</symbol>
+				<symbol alt="narrow" draft="contributed">TT$</symbol>
+			</currency>
+			<currency type="TWD">
+				<displayName>новы тайваньскі долар</displayName>
+				<displayName count="one">новы тайваньскі долар</displayName>
+				<displayName count="few">новыя тайваньскія долары</displayName>
+				<displayName count="many">новых тайваньскіх долараў</displayName>
+				<displayName count="other">новага тайваньскага долара</displayName>
+				<symbol draft="contributed">NT$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="TZS">
+				<displayName>танзанійскі шылінг</displayName>
+				<displayName count="one">танзанійскі шылінг</displayName>
+				<displayName count="few">танзанійскія шылінгі</displayName>
+				<displayName count="many">танзанійскіх шылінгаў</displayName>
+				<displayName count="other">танзанійскага шылінга</displayName>
+				<symbol draft="contributed">TZS</symbol>
+			</currency>
+			<currency type="UAH">
+				<displayName>украінская грыўна</displayName>
+				<displayName count="one">украінская грыўна</displayName>
+				<displayName count="few">украінскія грыўні</displayName>
+				<displayName count="many">украінскіх грыўнаў</displayName>
+				<displayName count="other">украінскай грыўны</displayName>
+				<symbol draft="contributed">UAH</symbol>
+				<symbol alt="narrow" draft="contributed">₴</symbol>
+			</currency>
+			<currency type="UGX">
+				<displayName>угандыйскі шылінг</displayName>
+				<displayName count="one">угандыйскі шылінг</displayName>
+				<displayName count="few">угандыйскія шылінгі</displayName>
+				<displayName count="many">угандыйскіх шылінгаў</displayName>
+				<displayName count="other">угандыйскага шылінга</displayName>
+				<symbol draft="contributed">UGX</symbol>
+			</currency>
+			<currency type="USD">
+				<displayName>долар ЗША</displayName>
+				<displayName count="one">долар ЗША</displayName>
+				<displayName count="few">долары ЗША</displayName>
+				<displayName count="many">долараў ЗША</displayName>
+				<displayName count="other">долара ЗША</displayName>
+				<symbol draft="contributed">$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="UYU">
+				<displayName>уругвайскае песа</displayName>
+				<displayName count="one">уругвайскае песа</displayName>
+				<displayName count="few">уругвайскія песа</displayName>
+				<displayName count="many">уругвайскіх песа</displayName>
+				<displayName count="other">уругвайскага песа</displayName>
+				<symbol draft="contributed">UYU</symbol>
+				<symbol alt="narrow" draft="contributed">$U</symbol>
+			</currency>
+			<currency type="UZS">
+				<displayName>узбекскі сум</displayName>
+				<displayName count="one">узбекскі сум</displayName>
+				<displayName count="few">узбекскія сумы</displayName>
+				<displayName count="many">узбекскіх сумаў</displayName>
+				<displayName count="other">узбекскага сума</displayName>
+				<symbol draft="contributed">UZS</symbol>
+			</currency>
+			<currency type="VEF">
+				<displayName>венесуальскі балівар</displayName>
+				<displayName count="one">венесуальскі балівар</displayName>
+				<displayName count="few">венесуальскія балівары</displayName>
+				<displayName count="many">венесуальскіх балівараў</displayName>
+				<displayName count="other">венесуальскага балівара</displayName>
+				<symbol draft="contributed">VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
+			</currency>
+			<currency type="VND">
+				<displayName>в’етнамскі донг</displayName>
+				<displayName count="one">в’етнамскі донг</displayName>
+				<displayName count="few">в’етнамскія донгі</displayName>
+				<displayName count="many">в’етнамскіх донгаў</displayName>
+				<displayName count="other">в’етнамскага донга</displayName>
+				<symbol draft="contributed">₫</symbol>
+				<symbol alt="narrow" draft="contributed">₫</symbol>
+			</currency>
+			<currency type="VUV">
+				<displayName>вату</displayName>
+				<displayName count="one">вату</displayName>
+				<displayName count="few">вату</displayName>
+				<displayName count="many">вату</displayName>
+				<displayName count="other">вату</displayName>
+				<symbol draft="contributed">VUV</symbol>
+			</currency>
+			<currency type="WST">
+				<displayName>самаанская тала</displayName>
+				<displayName count="one">самаанская тала</displayName>
+				<displayName count="few">самаанскія талы</displayName>
+				<displayName count="many">самаанскіх тал</displayName>
+				<displayName count="other">самаанскай талы</displayName>
+				<symbol draft="contributed">WST</symbol>
+			</currency>
+			<currency type="XAF">
+				<displayName>цэнтральнаафрыканскі франк КФА</displayName>
+				<displayName count="one">цэнтральнаафрыканскі франк КФА</displayName>
+				<displayName count="few">цэнтральнаафрыканскія франкі КФА</displayName>
+				<displayName count="many">цэнтральнаафрыканскіх франкаў КФА</displayName>
+				<displayName count="other">цэнтральнаафрыканскага франка КФА</displayName>
+				<symbol draft="contributed">FCFA</symbol>
+			</currency>
+			<currency type="XCD">
+				<displayName>усходнекарыбскі долар</displayName>
+				<displayName count="one">усходнекарыбскі долар</displayName>
+				<displayName count="few">усходнекарыбскія долары</displayName>
+				<displayName count="many">усходнекарыбскіх долараў</displayName>
+				<displayName count="other">усходнекарыбскага долара</displayName>
+				<symbol draft="contributed">EC$</symbol>
+				<symbol alt="narrow" draft="contributed">EC$</symbol>
+			</currency>
+			<currency type="XOF">
+				<displayName>заходнеафрыканскі франк КФА</displayName>
+				<displayName count="one">заходнеафрыканскі франк КФА</displayName>
+				<displayName count="few">заходнеафрыканскія франкі КФА</displayName>
+				<displayName count="many">заходнеафрыканскіх франкаў КФА</displayName>
+				<displayName count="other">заходнеафрыканскага франка КФА</displayName>
+				<symbol draft="contributed">CFA</symbol>
+			</currency>
+			<currency type="XPF">
+				<displayName>французскі ціхаакіянскі франк</displayName>
+				<displayName count="one">французскі ціхаакіянскі франк</displayName>
+				<displayName count="few">французскія ціхаакіянскія франкі</displayName>
+				<displayName count="many">французскіх ціхаакіянскіх франкаў</displayName>
+				<displayName count="other">французскага ціхаакіянскага франка</displayName>
+				<symbol draft="contributed">CFPF</symbol>
+			</currency>
+			<currency type="XXX">
+				<displayName>невядомая валюта</displayName>
+				<displayName count="one">невядомая валюта</displayName>
+				<displayName count="few">невядомая валюта</displayName>
+				<displayName count="many">невядомая валюта</displayName>
+				<displayName count="other">невядомая валюта</displayName>
+			</currency>
+			<currency type="YER">
+				<displayName>еменскі рыал</displayName>
+				<displayName count="one">еменскі рыал</displayName>
+				<displayName count="few">еменскія рыалы</displayName>
+				<displayName count="many">еменскіх рыалаў</displayName>
+				<displayName count="other">еменскага рыала</displayName>
+				<symbol draft="contributed">YER</symbol>
+			</currency>
+			<currency type="ZAR">
+				<displayName>паўднёваафрыканскі ранд</displayName>
+				<displayName count="one">паўднёваафрыканскі ранд</displayName>
+				<displayName count="few">паўднёваафрыканскія ранды</displayName>
+				<displayName count="many">паўднёваафрыканскіх рандаў</displayName>
+				<displayName count="other">паўднёваафрыканскага ранда</displayName>
+				<symbol draft="contributed">ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
+			</currency>
+			<currency type="ZMW">
+				<displayName>замбійская квача</displayName>
+				<displayName count="one">замбійская квача</displayName>
+				<displayName count="few">замбійскія квачы</displayName>
+				<displayName count="many">замбійскіх квач</displayName>
+				<displayName count="other">замбійскай квачы</displayName>
+				<symbol draft="contributed">ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
+			</currency>
+		</currencies>
+		<miscPatterns numberSystem="latn">
+			<pattern type="atLeast">{0}+</pattern>
+			<pattern type="range">{0}–{1}</pattern>
+		</miscPatterns>
+	</numbers>
+	<units>
+		<unitLength type="long">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0} у {1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<displayName>перагрузка</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="many">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-second-squared">
+				<displayName>метры ў секунду ў квадраце</displayName>
+				<unitPattern count="one">{0} метр у секунду ў квадраце</unitPattern>
+				<unitPattern count="few">{0} метры ў секунду ў квадраце</unitPattern>
+				<unitPattern count="many">{0} метраў у секунду ў квадраце</unitPattern>
+				<unitPattern count="other">{0} метра ў секунду ў квадраце</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>абарот</displayName>
+				<unitPattern count="one">{0} абарот</unitPattern>
+				<unitPattern count="few">{0} абароты</unitPattern>
+				<unitPattern count="many">{0} абаротаў</unitPattern>
+				<unitPattern count="other">{0} абарота</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>радыяны</displayName>
+				<unitPattern count="one">{0} радыян</unitPattern>
+				<unitPattern count="few">{0} радыяны</unitPattern>
+				<unitPattern count="many">{0} радыян</unitPattern>
+				<unitPattern count="other">{0} радыяна</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>градусы</displayName>
+				<unitPattern count="one">{0} градус</unitPattern>
+				<unitPattern count="few">{0} градусы</unitPattern>
+				<unitPattern count="many">{0} градусаў</unitPattern>
+				<unitPattern count="other">{0} градуса</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>вуглавыя хвіліны</displayName>
+				<unitPattern count="one">{0} вуглавая хвіліна</unitPattern>
+				<unitPattern count="few">{0} вуглавыя хвіліны</unitPattern>
+				<unitPattern count="many">{0} вуглавых хвілін</unitPattern>
+				<unitPattern count="other">{0} вуглавой хвіліны</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>вуглавыя секунды</displayName>
+				<unitPattern count="one">{0} вуглавая секунда</unitPattern>
+				<unitPattern count="few">{0} вуглавыя секунды</unitPattern>
+				<unitPattern count="many">{0} вуглавых секунд</unitPattern>
+				<unitPattern count="other">{0} вуглавой секунды</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>квадратныя кіламетры</displayName>
+				<unitPattern count="one">{0} квадратны кіламетр</unitPattern>
+				<unitPattern count="few">{0} квадратныя кіламетры</unitPattern>
+				<unitPattern count="many">{0} квадратных кіламетраў</unitPattern>
+				<unitPattern count="other">{0} квадратнага кіламетра</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>гектары</displayName>
+				<unitPattern count="one">{0} гектар</unitPattern>
+				<unitPattern count="few">{0} гектары</unitPattern>
+				<unitPattern count="many">{0} гектараў</unitPattern>
+				<unitPattern count="other">{0} гектара</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>квадратныя метры</displayName>
+				<unitPattern count="one">{0} квадратны метр</unitPattern>
+				<unitPattern count="few">{0} квадратныя метры</unitPattern>
+				<unitPattern count="many">{0} квадратных метраў</unitPattern>
+				<unitPattern count="other">{0} квадратнага метра</unitPattern>
+				<perUnitPattern>{0} на квадратны метр</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>квадратныя сантыметры</displayName>
+				<unitPattern count="one">{0} квадратны сантыметр</unitPattern>
+				<unitPattern count="few">{0} квадратныя сантыметры</unitPattern>
+				<unitPattern count="many">{0} квадратных сантыметраў</unitPattern>
+				<unitPattern count="other">{0} квадратнага сантыметра</unitPattern>
+				<perUnitPattern>{0} на квадратны сантыметр</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>квадратныя мілі</displayName>
+				<unitPattern count="one">{0} квадратная міля</unitPattern>
+				<unitPattern count="few">{0} квадратныя мілі</unitPattern>
+				<unitPattern count="many">{0} квадратных міль</unitPattern>
+				<unitPattern count="other">{0} квадратнай мілі</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>акры</displayName>
+				<unitPattern count="one">{0} акр</unitPattern>
+				<unitPattern count="few">{0} акры</unitPattern>
+				<unitPattern count="many">{0} акраў</unitPattern>
+				<unitPattern count="other">{0} акра</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>квадратны ярд</displayName>
+				<unitPattern count="one">{0} квадратны ярд</unitPattern>
+				<unitPattern count="few">{0} квадратныя ярды</unitPattern>
+				<unitPattern count="many">{0} квадратных ярдаў</unitPattern>
+				<unitPattern count="other">{0} квадратнага ярда</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>квадратны фут</displayName>
+				<unitPattern count="one">{0} квадратны фут</unitPattern>
+				<unitPattern count="few">{0} квадратныя футы</unitPattern>
+				<unitPattern count="many">{0} квадратных футаў</unitPattern>
+				<unitPattern count="other">{0} квадратнага фута</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>квадратныя цалі</displayName>
+				<unitPattern count="one">{0} квадратная цаля</unitPattern>
+				<unitPattern count="few">{0} квадратныя цалі</unitPattern>
+				<unitPattern count="many">{0} квадратных цаляў</unitPattern>
+				<unitPattern count="other">{0} квадратнай цалі</unitPattern>
+				<perUnitPattern>{0} на квадратную цалю</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>караты золата</displayName>
+				<unitPattern count="one">{0} карат золата</unitPattern>
+				<unitPattern count="few">{0} караты золата</unitPattern>
+				<unitPattern count="many">{0} карат золата</unitPattern>
+				<unitPattern count="other">{0} карата золата</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>літры на кіламетр</displayName>
+				<unitPattern count="one">{0} літр на кіламетр</unitPattern>
+				<unitPattern count="few">{0} літры на кіламетр</unitPattern>
+				<unitPattern count="many">{0} літраў на кіламетр</unitPattern>
+				<unitPattern count="other">{0} літра на кіламетр</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>літры на 100 кіламетраў</displayName>
+				<unitPattern count="one">{0} літр на 100 кіламетраў</unitPattern>
+				<unitPattern count="few">{0} літры на 100 кіламетраў</unitPattern>
+				<unitPattern count="many">{0} літраў на 100 кіламетраў</unitPattern>
+				<unitPattern count="other">{0} літра на 100 кіламетраў</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>мілі на галон</displayName>
+				<unitPattern count="one">{0} міля на галон</unitPattern>
+				<unitPattern count="few">{0} мілі на галон</unitPattern>
+				<unitPattern count="many">{0} міль на галон</unitPattern>
+				<unitPattern count="other">{0} мілі на галон</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<displayName>тэрабайты</displayName>
+				<unitPattern count="one">{0} тэрабайт</unitPattern>
+				<unitPattern count="few">{0} тэрабайты</unitPattern>
+				<unitPattern count="many">{0} тэрабайт</unitPattern>
+				<unitPattern count="other">{0} тэрабайта</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>тэрабіты</displayName>
+				<unitPattern count="one">{0} тэрабіт</unitPattern>
+				<unitPattern count="few">{0} тэрабіты</unitPattern>
+				<unitPattern count="many">{0} тэрабіт</unitPattern>
+				<unitPattern count="other">{0} тэрабіт</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>гігабайты</displayName>
+				<unitPattern count="one">{0} гігабайт</unitPattern>
+				<unitPattern count="few">{0} гігабайты</unitPattern>
+				<unitPattern count="many">{0} гігабайт</unitPattern>
+				<unitPattern count="other">{0} гігабайта</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>гігабіты</displayName>
+				<unitPattern count="one">{0} гігабіт</unitPattern>
+				<unitPattern count="few">{0} гігабіты</unitPattern>
+				<unitPattern count="many">{0} гігабіт</unitPattern>
+				<unitPattern count="other">{0} гігабіта</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>мегабайты</displayName>
+				<unitPattern count="one">{0} мегабайт</unitPattern>
+				<unitPattern count="few">{0} мегабайты</unitPattern>
+				<unitPattern count="many">{0} мегабайт</unitPattern>
+				<unitPattern count="other">{0} мегабайта</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>мегабіты</displayName>
+				<unitPattern count="one">{0} мегабіт</unitPattern>
+				<unitPattern count="few">{0} мегабіты</unitPattern>
+				<unitPattern count="many">{0} мегабіт</unitPattern>
+				<unitPattern count="other">{0} мегабіта</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>кілабайты</displayName>
+				<unitPattern count="one">{0} кілабайт</unitPattern>
+				<unitPattern count="few">{0} кілабайты</unitPattern>
+				<unitPattern count="many">{0} кілабайт</unitPattern>
+				<unitPattern count="other">{0} кілабайта</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>кілабіты</displayName>
+				<unitPattern count="one">{0} кілабіт</unitPattern>
+				<unitPattern count="few">{0} кілабіты</unitPattern>
+				<unitPattern count="many">{0} кілабіт</unitPattern>
+				<unitPattern count="other">{0} кілабіта</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>байты</displayName>
+				<unitPattern count="one">{0} байт</unitPattern>
+				<unitPattern count="few">{0} байты</unitPattern>
+				<unitPattern count="many">{0} байт</unitPattern>
+				<unitPattern count="other">{0} байта</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>біты</displayName>
+				<unitPattern count="one">{0} біт</unitPattern>
+				<unitPattern count="few">{0} біты</unitPattern>
+				<unitPattern count="many">{0} біт</unitPattern>
+				<unitPattern count="other">{0} біта</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>стагоддзі</displayName>
+				<unitPattern count="one">{0} стагоддзе</unitPattern>
+				<unitPattern count="few">{0} стагоддзі</unitPattern>
+				<unitPattern count="many">{0} стагоддзяў</unitPattern>
+				<unitPattern count="other">{0} стагоддзя</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>гады</displayName>
+				<unitPattern count="one">{0} год</unitPattern>
+				<unitPattern count="few">{0} гады</unitPattern>
+				<unitPattern count="many">{0} гадоў</unitPattern>
+				<unitPattern count="other">{0} года</unitPattern>
+				<perUnitPattern>{0} у год</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>месяцы</displayName>
+				<unitPattern count="one">{0} месяц</unitPattern>
+				<unitPattern count="few">{0} месяца</unitPattern>
+				<unitPattern count="many">{0} месяцаў</unitPattern>
+				<unitPattern count="other">{0} месяца</unitPattern>
+				<perUnitPattern>{0} у месяц</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>тыдні</displayName>
+				<unitPattern count="one">{0} тыдзень</unitPattern>
+				<unitPattern count="few">{0} тыдні</unitPattern>
+				<unitPattern count="many">{0} тыдняў</unitPattern>
+				<unitPattern count="other">{0} тыдня</unitPattern>
+				<perUnitPattern>{0} у тыдзень</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>суткі</displayName>
+				<unitPattern count="one">{0} суткі</unitPattern>
+				<unitPattern count="few">{0} сутак</unitPattern>
+				<unitPattern count="many">{0} сутак</unitPattern>
+				<unitPattern count="other">{0} сутак</unitPattern>
+				<perUnitPattern>{0} у суткі</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>гадзіны</displayName>
+				<unitPattern count="one">{0} гадзіна</unitPattern>
+				<unitPattern count="few">{0} гадзіны</unitPattern>
+				<unitPattern count="many">{0} гадзін</unitPattern>
+				<unitPattern count="other">{0} гадзіны</unitPattern>
+				<perUnitPattern>{0} у гадзіну</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>хвіліны</displayName>
+				<unitPattern count="one">{0} хвіліна</unitPattern>
+				<unitPattern count="few">{0} хвіліны</unitPattern>
+				<unitPattern count="many">{0} хвілін</unitPattern>
+				<unitPattern count="other">{0} хвіліны</unitPattern>
+				<perUnitPattern>{0} у хвіліну</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>секунды</displayName>
+				<unitPattern count="one">{0} секунда</unitPattern>
+				<unitPattern count="few">{0} секунды</unitPattern>
+				<unitPattern count="many">{0} секунд</unitPattern>
+				<unitPattern count="other">{0} секунды</unitPattern>
+				<perUnitPattern>{0} у секунду</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>мілісекунды</displayName>
+				<unitPattern count="one">{0} мілісекунда</unitPattern>
+				<unitPattern count="few">{0} мілісекунды</unitPattern>
+				<unitPattern count="many">{0} мілісекунд</unitPattern>
+				<unitPattern count="other">{0} мілісекунды</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>мікрасекунды</displayName>
+				<unitPattern count="one">{0} мікрасекунда</unitPattern>
+				<unitPattern count="few">{0} мікрасекунды</unitPattern>
+				<unitPattern count="many">{0} мікрасекунд</unitPattern>
+				<unitPattern count="other">{0} мікрасекунды</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>нанасекунды</displayName>
+				<unitPattern count="one">{0} нанасекунда</unitPattern>
+				<unitPattern count="few">{0} нанасекунды</unitPattern>
+				<unitPattern count="many">{0} нанасекунд</unitPattern>
+				<unitPattern count="other">{0} нанасекунды</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName>амперы</displayName>
+				<unitPattern count="one">{0} ампер</unitPattern>
+				<unitPattern count="few">{0} амперы</unitPattern>
+				<unitPattern count="many">{0} ампер</unitPattern>
+				<unitPattern count="other">{0} ампера</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>міліамперы</displayName>
+				<unitPattern count="one">{0} міліампер</unitPattern>
+				<unitPattern count="few">{0} міліамперы</unitPattern>
+				<unitPattern count="many">{0} міліампер</unitPattern>
+				<unitPattern count="other">{0} міліампера</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<displayName>омы</displayName>
+				<unitPattern count="one">{0} Ом</unitPattern>
+				<unitPattern count="few">{0} Ом</unitPattern>
+				<unitPattern count="many">{0} Ом</unitPattern>
+				<unitPattern count="other">{0} Ом</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>вольты</displayName>
+				<unitPattern count="one">{0} вольт</unitPattern>
+				<unitPattern count="few">{0} вольты</unitPattern>
+				<unitPattern count="many">{0} вольт</unitPattern>
+				<unitPattern count="other">{0} вольта</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>кілакалорыі</displayName>
+				<unitPattern count="one">{0} кілакалорыя</unitPattern>
+				<unitPattern count="few">{0} кілакалорыі</unitPattern>
+				<unitPattern count="many">{0} кілакалорый</unitPattern>
+				<unitPattern count="other">{0} кілакалорыі</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>калорыі</displayName>
+				<unitPattern count="one">{0} калорыя</unitPattern>
+				<unitPattern count="few">{0} калорыі</unitPattern>
+				<unitPattern count="many">{0} калорый</unitPattern>
+				<unitPattern count="other">{0} калорыі</unitPattern>
+			</unit>
+			<unit type="energy-foodcalorie">
+				<displayName>калорыі</displayName>
+				<unitPattern count="one">{0} калорыя</unitPattern>
+				<unitPattern count="few">{0} калорыі</unitPattern>
+				<unitPattern count="many">{0} калорый</unitPattern>
+				<unitPattern count="other">{0} калорыі</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>кіладжоўлі</displayName>
+				<unitPattern count="one">{0} кіладжоўль</unitPattern>
+				<unitPattern count="few">{0} кіладжоўлі</unitPattern>
+				<unitPattern count="many">{0} кіладжоўляў</unitPattern>
+				<unitPattern count="other">{0} кіладжоўля</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>джоўлі</displayName>
+				<unitPattern count="one">{0} джоўль</unitPattern>
+				<unitPattern count="few">{0} джоўлі</unitPattern>
+				<unitPattern count="many">{0} джоўляў</unitPattern>
+				<unitPattern count="other">{0} джоўля</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>кілават-гадзіны</displayName>
+				<unitPattern count="one">{0} кілават-гадзіна</unitPattern>
+				<unitPattern count="few">{0} кілават-гадзіны</unitPattern>
+				<unitPattern count="many">{0} кілават-гадзін</unitPattern>
+				<unitPattern count="other">{0} кілават-гадзіны</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<displayName>гігагерцы</displayName>
+				<unitPattern count="one">{0} гігагерц</unitPattern>
+				<unitPattern count="few">{0} гігагерцы</unitPattern>
+				<unitPattern count="many">{0} гігагерц</unitPattern>
+				<unitPattern count="other">{0} гігагерца</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<displayName>мегагерцы</displayName>
+				<unitPattern count="one">{0} мегагерц</unitPattern>
+				<unitPattern count="few">{0} мегагерцы</unitPattern>
+				<unitPattern count="many">{0} мегагерц</unitPattern>
+				<unitPattern count="other">{0} мегагерца</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>кілагерцы</displayName>
+				<unitPattern count="one">{0} кілагерц</unitPattern>
+				<unitPattern count="few">{0} кілагерцы</unitPattern>
+				<unitPattern count="many">{0} кілагерц</unitPattern>
+				<unitPattern count="other">{0} кілагерца</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<displayName>герцы</displayName>
+				<unitPattern count="one">{0} герц</unitPattern>
+				<unitPattern count="few">{0} герцы</unitPattern>
+				<unitPattern count="many">{0} герц</unitPattern>
+				<unitPattern count="other">{0} герца</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>кіламетры</displayName>
+				<unitPattern count="one">{0} кіламетр</unitPattern>
+				<unitPattern count="few">{0} кіламетры</unitPattern>
+				<unitPattern count="many">{0} кіламетраў</unitPattern>
+				<unitPattern count="other">{0} кіламетра</unitPattern>
+				<perUnitPattern>{0} на кіламетр</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>метры</displayName>
+				<unitPattern count="one">{0} метр</unitPattern>
+				<unitPattern count="few">{0} метры</unitPattern>
+				<unitPattern count="many">{0} метраў</unitPattern>
+				<unitPattern count="other">{0} метра</unitPattern>
+				<perUnitPattern>{0} на метр</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>дэцыметры</displayName>
+				<unitPattern count="one">{0} дэцыметр</unitPattern>
+				<unitPattern count="few">{0} дэцыметры</unitPattern>
+				<unitPattern count="many">{0} дэцыметраў</unitPattern>
+				<unitPattern count="other">{0} дэцыметра</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>сантыметры</displayName>
+				<unitPattern count="one">{0} сантыметр</unitPattern>
+				<unitPattern count="few">{0} сантыметры</unitPattern>
+				<unitPattern count="many">{0} сантыметраў</unitPattern>
+				<unitPattern count="other">{0} сантыметра</unitPattern>
+				<perUnitPattern>{0} на сантыметр</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>міліметры</displayName>
+				<unitPattern count="one">{0} міліметр</unitPattern>
+				<unitPattern count="few">{0} міліметры</unitPattern>
+				<unitPattern count="many">{0} міліметраў</unitPattern>
+				<unitPattern count="other">{0} міліметра</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>мікраметры</displayName>
+				<unitPattern count="one">{0} мікраметр</unitPattern>
+				<unitPattern count="few">{0} мікраметры</unitPattern>
+				<unitPattern count="many">{0} мікраметраў</unitPattern>
+				<unitPattern count="other">{0} мікраметра</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>нанаметры</displayName>
+				<unitPattern count="one">{0} нанаметр</unitPattern>
+				<unitPattern count="few">{0} нанаметры</unitPattern>
+				<unitPattern count="many">{0} нанаметраў</unitPattern>
+				<unitPattern count="other">{0} нанаметра</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>пікаметры</displayName>
+				<unitPattern count="one">{0} пікаметр</unitPattern>
+				<unitPattern count="few">{0} пікаметры</unitPattern>
+				<unitPattern count="many">{0} пікаметраў</unitPattern>
+				<unitPattern count="other">{0} пікаметра</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>мілі</displayName>
+				<unitPattern count="one">{0} міля</unitPattern>
+				<unitPattern count="few">{0} мілі</unitPattern>
+				<unitPattern count="many">{0} міль</unitPattern>
+				<unitPattern count="other">{0} мілі</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>ярды</displayName>
+				<unitPattern count="one">{0} ярд</unitPattern>
+				<unitPattern count="few">{0} ярды</unitPattern>
+				<unitPattern count="many">{0} ярдаў</unitPattern>
+				<unitPattern count="other">{0} ярда</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>футы</displayName>
+				<unitPattern count="one">{0} фут</unitPattern>
+				<unitPattern count="few">{0} футы</unitPattern>
+				<unitPattern count="many">{0} футаў</unitPattern>
+				<unitPattern count="other">{0} фута</unitPattern>
+				<perUnitPattern>{0} на фут</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>цалі</displayName>
+				<unitPattern count="one">{0} цаля</unitPattern>
+				<unitPattern count="few">{0} цалі</unitPattern>
+				<unitPattern count="many">{0} цаляў</unitPattern>
+				<unitPattern count="other">{0} цалі</unitPattern>
+				<perUnitPattern>{0} на цалю</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>парсекі</displayName>
+				<unitPattern count="one">{0} парсек</unitPattern>
+				<unitPattern count="few">{0} парсекі</unitPattern>
+				<unitPattern count="many">{0} парсекаў</unitPattern>
+				<unitPattern count="other">{0} парсека</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>светлавыя гады</displayName>
+				<unitPattern count="one">{0} светлавы год</unitPattern>
+				<unitPattern count="few">{0} светлавыя гады</unitPattern>
+				<unitPattern count="many">{0} светлавых гадоў</unitPattern>
+				<unitPattern count="other">{0} светлавога года</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>астранамічныя адзінкі</displayName>
+				<unitPattern count="one">{0} астранамічная адзінка</unitPattern>
+				<unitPattern count="few">{0} астранамічныя адзінкі</unitPattern>
+				<unitPattern count="many">{0} астранамічных адзінак</unitPattern>
+				<unitPattern count="other">{0} астранамічнай адзінкі</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>марскія мілі</displayName>
+				<unitPattern count="one">{0} марская міля</unitPattern>
+				<unitPattern count="few">{0} марскія мілі</unitPattern>
+				<unitPattern count="many">{0} марскіх міль</unitPattern>
+				<unitPattern count="other">{0} марской мілі</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>скандынаўскія мілі</displayName>
+				<unitPattern count="one">{0} скандынаўская міля</unitPattern>
+				<unitPattern count="few">{0} скандынаўскія мілі</unitPattern>
+				<unitPattern count="many">{0} скандынаўскіх міль</unitPattern>
+				<unitPattern count="other">{0} скандынаўскай мілі</unitPattern>
+			</unit>
+			<unit type="light-lux">
+				<displayName>люкс</displayName>
+				<unitPattern count="one">{0} люкс</unitPattern>
+				<unitPattern count="few">{0} люксы</unitPattern>
+				<unitPattern count="many">{0} люксаў</unitPattern>
+				<unitPattern count="other">{0} люкса</unitPattern>
+			</unit>
+			<unit type="mass-metric-ton">
+				<displayName>метрычныя тоны</displayName>
+				<unitPattern count="one">{0} метрычная тона</unitPattern>
+				<unitPattern count="few">{0} метрычныя тоны</unitPattern>
+				<unitPattern count="many">{0} метрычных тон</unitPattern>
+				<unitPattern count="other">{0} метрычнай тоны</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>кілаграмы</displayName>
+				<unitPattern count="one">{0} кілаграмаў</unitPattern>
+				<unitPattern count="few">{0} кілаграмы</unitPattern>
+				<unitPattern count="many">{0} кілаграм</unitPattern>
+				<unitPattern count="other">{0} кілаграма</unitPattern>
+				<perUnitPattern>{0} на кілаграм</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>грамы</displayName>
+				<unitPattern count="one">{0} грам</unitPattern>
+				<unitPattern count="few">{0} грамы</unitPattern>
+				<unitPattern count="many">{0} грамаў</unitPattern>
+				<unitPattern count="other">{0} грама</unitPattern>
+				<perUnitPattern>{0} на грам</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>міліграмы</displayName>
+				<unitPattern count="one">{0} міліграм</unitPattern>
+				<unitPattern count="few">{0} міліграмы</unitPattern>
+				<unitPattern count="many">{0} міліграмаў</unitPattern>
+				<unitPattern count="other">{0} міліграма</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>мікраграмы</displayName>
+				<unitPattern count="one">{0} мікраграм</unitPattern>
+				<unitPattern count="few">{0} мікраграмы</unitPattern>
+				<unitPattern count="many">{0} мікраграмаў</unitPattern>
+				<unitPattern count="other">{0} мікраграма</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>тоны</displayName>
+				<unitPattern count="one">{0} тона</unitPattern>
+				<unitPattern count="few">{0} тоны</unitPattern>
+				<unitPattern count="many">{0} тон</unitPattern>
+				<unitPattern count="other">{0} тоны</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>фунты</displayName>
+				<unitPattern count="one">{0} фунт</unitPattern>
+				<unitPattern count="few">{0} фунты</unitPattern>
+				<unitPattern count="many">{0} фунтаў</unitPattern>
+				<unitPattern count="other">{0} фунта</unitPattern>
+				<perUnitPattern>{0} на фунт</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>унцыі</displayName>
+				<unitPattern count="one">{0} унцыя</unitPattern>
+				<unitPattern count="few">{0} унцыі</unitPattern>
+				<unitPattern count="many">{0} унцый</unitPattern>
+				<unitPattern count="other">{0} унцыі</unitPattern>
+				<perUnitPattern>{0} на ўнцыю</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>тройскія ўнцыі</displayName>
+				<unitPattern count="one">{0} тройская ўнцыя</unitPattern>
+				<unitPattern count="few">{0} тройскія ўнцыі</unitPattern>
+				<unitPattern count="many">{0} тройскіх унцый</unitPattern>
+				<unitPattern count="other">{0} тройскай унцыі</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>караты</displayName>
+				<unitPattern count="one">{0} карат</unitPattern>
+				<unitPattern count="few">{0} караты</unitPattern>
+				<unitPattern count="many">{0} каратаў</unitPattern>
+				<unitPattern count="other">{0} карата</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<displayName>гігаваты</displayName>
+				<unitPattern count="one">{0} гігават</unitPattern>
+				<unitPattern count="few">{0} гігаваты</unitPattern>
+				<unitPattern count="many">{0} гігават</unitPattern>
+				<unitPattern count="other">{0} гігавата</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>мегаваты</displayName>
+				<unitPattern count="one">{0} мегават</unitPattern>
+				<unitPattern count="few">{0} мегаваты</unitPattern>
+				<unitPattern count="many">{0} мегават</unitPattern>
+				<unitPattern count="other">{0} мегавата</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>кілаваты</displayName>
+				<unitPattern count="one">{0} кілават</unitPattern>
+				<unitPattern count="few">{0} кілаваты</unitPattern>
+				<unitPattern count="many">{0} кілават</unitPattern>
+				<unitPattern count="other">{0} кілавата</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>ваты</displayName>
+				<unitPattern count="one">{0} ват</unitPattern>
+				<unitPattern count="few">{0} ваты</unitPattern>
+				<unitPattern count="many">{0} ват</unitPattern>
+				<unitPattern count="other">{0} вата</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>міліваты</displayName>
+				<unitPattern count="one">{0} міліват</unitPattern>
+				<unitPattern count="few">{0} міліваты</unitPattern>
+				<unitPattern count="many">{0} міліват</unitPattern>
+				<unitPattern count="other">{0} мілівата</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>конская сіла</displayName>
+				<unitPattern count="one">{0} конская сіла</unitPattern>
+				<unitPattern count="few">{0} конскія сілы</unitPattern>
+				<unitPattern count="many">{0} конскіх сіл</unitPattern>
+				<unitPattern count="other">{0} конскай сілы</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<displayName>гектапаскалі</displayName>
+				<unitPattern count="one">{0} гектапаскаль</unitPattern>
+				<unitPattern count="few">{0} гектапаскалі</unitPattern>
+				<unitPattern count="many">{0} гектапаскаль</unitPattern>
+				<unitPattern count="other">{0} гектапаскаля</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>міліметры ртутнага слупа</displayName>
+				<unitPattern count="one">{0} міліметр ртутнага слупа</unitPattern>
+				<unitPattern count="few">{0} міліметры ртутнага слупа</unitPattern>
+				<unitPattern count="many">{0} міліметраў ртутнага слупа</unitPattern>
+				<unitPattern count="other">{0} міліметра ртутнага слупа</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>фунты на квадратную цалю</displayName>
+				<unitPattern count="one">{0} фунт на квадратную цалю</unitPattern>
+				<unitPattern count="few">{0} фунты на квадратную цалю</unitPattern>
+				<unitPattern count="many">{0} фунтаў на квадратную цалю</unitPattern>
+				<unitPattern count="other">{0} фунта на квадратную цалю</unitPattern>
+			</unit>
+			<unit type="pressure-inch-hg">
+				<displayName>цалі ртутнага слупа</displayName>
+				<unitPattern count="one">{0} цаля ртутнага слупа</unitPattern>
+				<unitPattern count="few">{0} цалі ртутнага слупа</unitPattern>
+				<unitPattern count="many">{0} цаляў ртутнага слупа</unitPattern>
+				<unitPattern count="other">{0} цалі ртутнага слупа</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>мілібары</displayName>
+				<unitPattern count="one">{0} мілібар</unitPattern>
+				<unitPattern count="few">{0} мілібары</unitPattern>
+				<unitPattern count="many">{0} мілібар</unitPattern>
+				<unitPattern count="other">{0} мілібара</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>кіламетраў у гадзіну</displayName>
+				<unitPattern count="one">{0} кіламетр у гадзіну</unitPattern>
+				<unitPattern count="few">{0} кіламетры ў гадзіну</unitPattern>
+				<unitPattern count="many">{0} кіламетраў у гадзіну</unitPattern>
+				<unitPattern count="other">{0} кіламетра ў гадзіну</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>метраў у секунду</displayName>
+				<unitPattern count="one">{0} метр у секунду</unitPattern>
+				<unitPattern count="few">{0} метры ў секунду</unitPattern>
+				<unitPattern count="many">{0} метраў у секунду</unitPattern>
+				<unitPattern count="other">{0} метра ў секунду</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>міль у гадзіну</displayName>
+				<unitPattern count="one">{0} міля ў гадзіну</unitPattern>
+				<unitPattern count="few">{0} мілі ў гадзіну</unitPattern>
+				<unitPattern count="many">{0} міль у гадзіну</unitPattern>
+				<unitPattern count="other">{0} мілі ў гадзіну</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>вузел</displayName>
+				<unitPattern count="one">{0} вузел</unitPattern>
+				<unitPattern count="few">{0} вузлы</unitPattern>
+				<unitPattern count="many">{0} вузлоў</unitPattern>
+				<unitPattern count="other">{0} вузла</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>градусы Цэльсія</displayName>
+				<unitPattern count="one">{0} градус Цэльсія</unitPattern>
+				<unitPattern count="few">{0} градусы Цэльсія</unitPattern>
+				<unitPattern count="many">{0} градусаў Цэльсія</unitPattern>
+				<unitPattern count="other">{0} градуса Цэльсія</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName>градусы Фарэнгейта</displayName>
+				<unitPattern count="one">{0} градус Фарэнгейта</unitPattern>
+				<unitPattern count="few">{0} градусы Фарэнгейта</unitPattern>
+				<unitPattern count="many">{0} градусаў Фарэнгейта</unitPattern>
+				<unitPattern count="other">{0} градуса Фарэнгейта</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>кельвіны</displayName>
+				<unitPattern count="one">{0} кельвін</unitPattern>
+				<unitPattern count="few">{0} кельвіны</unitPattern>
+				<unitPattern count="many">{0} кельвінаў</unitPattern>
+				<unitPattern count="other">{0} кельвіна</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>кубічныя кіламетры</displayName>
+				<unitPattern count="one">{0} кубічны кіламетр</unitPattern>
+				<unitPattern count="few">{0} кубічныя кіламетры</unitPattern>
+				<unitPattern count="many">{0} кубічных кіламетраў</unitPattern>
+				<unitPattern count="other">{0} кубічнага кіламетра</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>кубічныя метры</displayName>
+				<unitPattern count="one">{0} кубічны метр</unitPattern>
+				<unitPattern count="few">{0} кубічныя метры</unitPattern>
+				<unitPattern count="many">{0} кубічных метраў</unitPattern>
+				<unitPattern count="other">{0} кубічнага метра</unitPattern>
+				<perUnitPattern>{0} на кубічны метр</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>кубічныя сантыметры</displayName>
+				<unitPattern count="one">{0} кубічны сантыметр</unitPattern>
+				<unitPattern count="few">{0} кубічныя сантыметры</unitPattern>
+				<unitPattern count="many">{0} кубічных сантыметраў</unitPattern>
+				<unitPattern count="other">{0} кубічнага сантыметра</unitPattern>
+				<perUnitPattern>{0} на кубічны сантыметр</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>кубічныя мілі</displayName>
+				<unitPattern count="one">{0} кубічная міля</unitPattern>
+				<unitPattern count="few">{0} кубічныя мілі</unitPattern>
+				<unitPattern count="many">{0} кубічных міль</unitPattern>
+				<unitPattern count="other">{0} кубічнай мілі</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>кубічныя ярды</displayName>
+				<unitPattern count="one">{0} кубічны ярд</unitPattern>
+				<unitPattern count="few">{0} кубічныя ярды</unitPattern>
+				<unitPattern count="many">{0} кубічных ярдаў</unitPattern>
+				<unitPattern count="other">{0} кубічнага ярда</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>кубічныя футы</displayName>
+				<unitPattern count="one">{0} кубічны фут</unitPattern>
+				<unitPattern count="few">{0} кубічныя футы</unitPattern>
+				<unitPattern count="many">{0} кубічных футаў</unitPattern>
+				<unitPattern count="other">{0} кубічнага фута</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>кубічныя цалі</displayName>
+				<unitPattern count="one">{0} кубічная цаля</unitPattern>
+				<unitPattern count="few">{0} кубічныя цалі</unitPattern>
+				<unitPattern count="many">{0} кубічных цаляў</unitPattern>
+				<unitPattern count="other">{0} кубічнай цалі</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>мегалітры</displayName>
+				<unitPattern count="one">{0} мегалітр</unitPattern>
+				<unitPattern count="few">{0} мегалітры</unitPattern>
+				<unitPattern count="many">{0} мегалітраў</unitPattern>
+				<unitPattern count="other">{0} мегалітра</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>гекталітры</displayName>
+				<unitPattern count="one">{0} гекталітр</unitPattern>
+				<unitPattern count="few">{0} гекталітры</unitPattern>
+				<unitPattern count="many">{0} гекталітраў</unitPattern>
+				<unitPattern count="other">{0} гекталітра</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>літры</displayName>
+				<unitPattern count="one">{0} літр</unitPattern>
+				<unitPattern count="few">{0} літры</unitPattern>
+				<unitPattern count="many">{0} літраў</unitPattern>
+				<unitPattern count="other">{0} літра</unitPattern>
+				<perUnitPattern>{0} на літр</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>дэцылітры</displayName>
+				<unitPattern count="one">{0} дэцылітр</unitPattern>
+				<unitPattern count="few">{0} дэцылітры</unitPattern>
+				<unitPattern count="many">{0} дэцылітраў</unitPattern>
+				<unitPattern count="other">{0} дэцылітра</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>сантылітр</displayName>
+				<unitPattern count="one">{0} сантылітр</unitPattern>
+				<unitPattern count="few">{0} сантылітры</unitPattern>
+				<unitPattern count="many">{0} сантылітраў</unitPattern>
+				<unitPattern count="other">{0} сантылітра</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>мілілітры</displayName>
+				<unitPattern count="one">{0} мілілітр</unitPattern>
+				<unitPattern count="few">{0} мілілітры</unitPattern>
+				<unitPattern count="many">{0} мілілітраў</unitPattern>
+				<unitPattern count="other">{0} мілілітра</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>метрычныя пінты</displayName>
+				<unitPattern count="one">{0} метрычная пінта</unitPattern>
+				<unitPattern count="few">{0} метрычныя пінты</unitPattern>
+				<unitPattern count="many">{0} метрычных пінтаў</unitPattern>
+				<unitPattern count="other">{0} метрычнай пінты</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>метрычныя кубкі</displayName>
+				<unitPattern count="one">{0} метрычны кубак</unitPattern>
+				<unitPattern count="few">{0} метрычныя кубкі</unitPattern>
+				<unitPattern count="many">{0} метрычных кубкаў</unitPattern>
+				<unitPattern count="other">{0} метрычнага кубка</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>акр-футы</displayName>
+				<unitPattern count="one">{0} акр-фут</unitPattern>
+				<unitPattern count="few">{0} акр-футы</unitPattern>
+				<unitPattern count="many">{0} акр-футаў</unitPattern>
+				<unitPattern count="other">{0} акр-фута</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>галоны</displayName>
+				<unitPattern count="one">{0} галон</unitPattern>
+				<unitPattern count="few">{0} галоны</unitPattern>
+				<unitPattern count="many">{0} галонаў</unitPattern>
+				<unitPattern count="other">{0} галона</unitPattern>
+				<perUnitPattern>{0} на галон</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>кварты</displayName>
+				<unitPattern count="one">{0} кварта</unitPattern>
+				<unitPattern count="few">{0} кварты</unitPattern>
+				<unitPattern count="many">{0} кварт</unitPattern>
+				<unitPattern count="other">{0} кварты</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>пінты</displayName>
+				<unitPattern count="one">{0} пінта</unitPattern>
+				<unitPattern count="few">{0} пінты</unitPattern>
+				<unitPattern count="many">{0} пінтаў</unitPattern>
+				<unitPattern count="other">{0} пінты</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>кубкі</displayName>
+				<unitPattern count="one">{0} кубак</unitPattern>
+				<unitPattern count="few">{0} кубкі</unitPattern>
+				<unitPattern count="many">{0} кубкаў</unitPattern>
+				<unitPattern count="other">{0} кубка</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>вадкія ўнцыі</displayName>
+				<unitPattern count="one">{0} вадкая ўнцыя</unitPattern>
+				<unitPattern count="few">{0} вадкія ўнцыі</unitPattern>
+				<unitPattern count="many">{0} вадкіх унцый</unitPattern>
+				<unitPattern count="other">{0} вадкай унцыі</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>сталовыя лыжкі</displayName>
+				<unitPattern count="one">{0} сталовая лыжка</unitPattern>
+				<unitPattern count="few">{0} сталовыя лыжкі</unitPattern>
+				<unitPattern count="many">{0} сталовых лыжак</unitPattern>
+				<unitPattern count="other">{0} сталовай лыжкі</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>чайныя лыжкі</displayName>
+				<unitPattern count="one">{0} чайная лыжка</unitPattern>
+				<unitPattern count="few">{0} чайныя лыжкі</unitPattern>
+				<unitPattern count="many">{0} чайных лыжак</unitPattern>
+				<unitPattern count="other">{0} чайнай лыжкі</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} У</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} Пн</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} Пд</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} З</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<unitLength type="short">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<displayName>перагрузка</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="many">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-second-squared">
+				<displayName>м/с²</displayName>
+				<unitPattern count="one">{0} м/с²</unitPattern>
+				<unitPattern count="few">{0} м/с²</unitPattern>
+				<unitPattern count="many">{0} м/с²</unitPattern>
+				<unitPattern count="other">{0} м/с²</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>аб</displayName>
+				<unitPattern count="one">{0} аб</unitPattern>
+				<unitPattern count="few">{0} аб</unitPattern>
+				<unitPattern count="many">{0} аб</unitPattern>
+				<unitPattern count="other">{0} аб</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>рад</displayName>
+				<unitPattern count="one">{0} рад</unitPattern>
+				<unitPattern count="few">{0} рад</unitPattern>
+				<unitPattern count="many">{0} рад</unitPattern>
+				<unitPattern count="other">{0} рад</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>′</displayName>
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="few">{0}′</unitPattern>
+				<unitPattern count="many">{0}′</unitPattern>
+				<unitPattern count="other">{0}′</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>′′</displayName>
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="few">{0}″</unitPattern>
+				<unitPattern count="many">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>км²</displayName>
+				<unitPattern count="one">{0} км²</unitPattern>
+				<unitPattern count="few">{0} км²</unitPattern>
+				<unitPattern count="many">{0} км²</unitPattern>
+				<unitPattern count="other">{0} км²</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>га</displayName>
+				<unitPattern count="one">{0} га</unitPattern>
+				<unitPattern count="few">{0} га</unitPattern>
+				<unitPattern count="many">{0} га</unitPattern>
+				<unitPattern count="other">{0} га</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>м²</displayName>
+				<unitPattern count="one">{0} м²</unitPattern>
+				<unitPattern count="few">{0} м²</unitPattern>
+				<unitPattern count="many">{0} м²</unitPattern>
+				<unitPattern count="other">{0} м²</unitPattern>
+				<perUnitPattern>{0}/м²</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>см²</displayName>
+				<unitPattern count="one">{0} см²</unitPattern>
+				<unitPattern count="few">{0} см²</unitPattern>
+				<unitPattern count="many">{0} см²</unitPattern>
+				<unitPattern count="other">{0} см²</unitPattern>
+				<perUnitPattern>{0}/см²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>кв. мілі</displayName>
+				<unitPattern count="one">{0} кв. міля</unitPattern>
+				<unitPattern count="few">{0} кв. мілі</unitPattern>
+				<unitPattern count="many">{0} кв. міль</unitPattern>
+				<unitPattern count="other">{0} кв. мілі</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>акры</displayName>
+				<unitPattern count="one">{0} акр</unitPattern>
+				<unitPattern count="few">{0} акры</unitPattern>
+				<unitPattern count="many">{0} акраў</unitPattern>
+				<unitPattern count="other">{0} акра</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>кв. ярды</displayName>
+				<unitPattern count="one">{0} кв. ярд</unitPattern>
+				<unitPattern count="few">{0} кв. ярды</unitPattern>
+				<unitPattern count="many">{0} кв. ярдаў</unitPattern>
+				<unitPattern count="other">{0} кв. ярда</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>кв. футы</displayName>
+				<unitPattern count="one">{0} кв. фут</unitPattern>
+				<unitPattern count="few">{0} кв. футы</unitPattern>
+				<unitPattern count="many">{0} кв. футаў</unitPattern>
+				<unitPattern count="other">{0} кв. фута</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>кв. цалі</displayName>
+				<unitPattern count="one">{0} кв. цаля</unitPattern>
+				<unitPattern count="few">{0} кв. цалі</unitPattern>
+				<unitPattern count="many">{0} кв. цаляў</unitPattern>
+				<unitPattern count="other">{0} кв. цалі</unitPattern>
+				<perUnitPattern>{0}/кв. цалю</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>кар золата</displayName>
+				<unitPattern count="one">{0} кар зол</unitPattern>
+				<unitPattern count="few">{0} кар зол</unitPattern>
+				<unitPattern count="many">{0} кар зол</unitPattern>
+				<unitPattern count="other">{0} кар зол</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>л/км</displayName>
+				<unitPattern count="one">{0} л/км</unitPattern>
+				<unitPattern count="few">{0} л/км</unitPattern>
+				<unitPattern count="many">{0} л/км</unitPattern>
+				<unitPattern count="other">{0} л/км</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>л/100 км</displayName>
+				<unitPattern count="one">{0} л/100 км</unitPattern>
+				<unitPattern count="few">{0} л/100 км</unitPattern>
+				<unitPattern count="many">{0} л/100 км</unitPattern>
+				<unitPattern count="other">{0} л/100 км</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>мілі/гал</displayName>
+				<unitPattern count="one">{0} міля/гал</unitPattern>
+				<unitPattern count="few">{0} міля/гал</unitPattern>
+				<unitPattern count="many">{0} міль/гал</unitPattern>
+				<unitPattern count="other">{0} мілі/гал</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<displayName>Тб</displayName>
+				<unitPattern count="one">{0} Тб</unitPattern>
+				<unitPattern count="few">{0} Тб</unitPattern>
+				<unitPattern count="many">{0} Тб</unitPattern>
+				<unitPattern count="other">{0} Тб</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>Тбіт</displayName>
+				<unitPattern count="one">{0} Тбіт</unitPattern>
+				<unitPattern count="few">{0} Тбіт</unitPattern>
+				<unitPattern count="many">{0} Тбіт</unitPattern>
+				<unitPattern count="other">{0} Тбіт</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>Гб</displayName>
+				<unitPattern count="one">{0} Гб</unitPattern>
+				<unitPattern count="few">{0} Гб</unitPattern>
+				<unitPattern count="many">{0} Гб</unitPattern>
+				<unitPattern count="other">{0} Гб</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Гбіт</displayName>
+				<unitPattern count="one">{0} Гбіт</unitPattern>
+				<unitPattern count="few">{0} Гбіт</unitPattern>
+				<unitPattern count="many">{0} Гбіт</unitPattern>
+				<unitPattern count="other">{0} Гбіт</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>Мб</displayName>
+				<unitPattern count="one">{0} Мб</unitPattern>
+				<unitPattern count="few">{0} Мб</unitPattern>
+				<unitPattern count="many">{0} Мб</unitPattern>
+				<unitPattern count="other">{0} Мб</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Мбіт</displayName>
+				<unitPattern count="one">{0} Мбіт</unitPattern>
+				<unitPattern count="few">{0} Мбіт</unitPattern>
+				<unitPattern count="many">{0} Мбіт</unitPattern>
+				<unitPattern count="other">{0} Мбіт</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>Кб</displayName>
+				<unitPattern count="one">{0} Кб</unitPattern>
+				<unitPattern count="few">{0} Кб</unitPattern>
+				<unitPattern count="many">{0} Кб</unitPattern>
+				<unitPattern count="other">{0} Кб</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>кбіт</displayName>
+				<unitPattern count="one">{0} кбіт</unitPattern>
+				<unitPattern count="few">{0} кбіт</unitPattern>
+				<unitPattern count="many">{0} кбіт</unitPattern>
+				<unitPattern count="other">{0} кбіт</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>байты</displayName>
+				<unitPattern count="one">{0} байт</unitPattern>
+				<unitPattern count="few">{0} байты</unitPattern>
+				<unitPattern count="many">{0} байт</unitPattern>
+				<unitPattern count="other">{0} байта</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>біты</displayName>
+				<unitPattern count="one">{0} біт</unitPattern>
+				<unitPattern count="few">{0} біты</unitPattern>
+				<unitPattern count="many">{0} біт</unitPattern>
+				<unitPattern count="other">{0} біта</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>ст.</displayName>
+				<unitPattern count="one">{0} ст.</unitPattern>
+				<unitPattern count="few">{0} ст.</unitPattern>
+				<unitPattern count="many">{0} ст.</unitPattern>
+				<unitPattern count="other">{0} ст.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>г.</displayName>
+				<unitPattern count="one">{0} г.</unitPattern>
+				<unitPattern count="few">{0} г.</unitPattern>
+				<unitPattern count="many">{0} г.</unitPattern>
+				<unitPattern count="other">{0} г.</unitPattern>
+				<perUnitPattern>{0} у г.</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>мес.</displayName>
+				<unitPattern count="one">{0} мес.</unitPattern>
+				<unitPattern count="few">{0} мес.</unitPattern>
+				<unitPattern count="many">{0} мес.</unitPattern>
+				<unitPattern count="other">{0} мес.</unitPattern>
+				<perUnitPattern>{0} у мес.</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>тыдз.</displayName>
+				<unitPattern count="one">{0} тыдз.</unitPattern>
+				<unitPattern count="few">{0} тыдз.</unitPattern>
+				<unitPattern count="many">{0} тыдз.</unitPattern>
+				<unitPattern count="other">{0} тыдз.</unitPattern>
+				<perUnitPattern>{0} у тыдз.</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>сут.</displayName>
+				<unitPattern count="one">{0} сут.</unitPattern>
+				<unitPattern count="few">{0} сут.</unitPattern>
+				<unitPattern count="many">{0} сут.</unitPattern>
+				<unitPattern count="other">{0} сут.</unitPattern>
+				<perUnitPattern>{0} у сут.</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>гадз.</displayName>
+				<unitPattern count="one">{0} гадз.</unitPattern>
+				<unitPattern count="few">{0} гадз.</unitPattern>
+				<unitPattern count="many">{0} гадз.</unitPattern>
+				<unitPattern count="other">{0} гадз.</unitPattern>
+				<perUnitPattern>{0} у гадз.</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>хв.</displayName>
+				<unitPattern count="one">{0} хв.</unitPattern>
+				<unitPattern count="few">{0} хв.</unitPattern>
+				<unitPattern count="many">{0} хв.</unitPattern>
+				<unitPattern count="other">{0} хв.</unitPattern>
+				<perUnitPattern>{0} у хв.</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>с</displayName>
+				<unitPattern count="one">{0} с</unitPattern>
+				<unitPattern count="few">{0} с</unitPattern>
+				<unitPattern count="many">{0} с</unitPattern>
+				<unitPattern count="other">{0} с</unitPattern>
+				<perUnitPattern>{0}/с</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>мс</displayName>
+				<unitPattern count="one">{0} мс</unitPattern>
+				<unitPattern count="few">{0} мс</unitPattern>
+				<unitPattern count="many">{0} мс</unitPattern>
+				<unitPattern count="other">{0} мс</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>мкс</displayName>
+				<unitPattern count="one">{0} мкс</unitPattern>
+				<unitPattern count="few">{0} мкс</unitPattern>
+				<unitPattern count="many">{0} мкс</unitPattern>
+				<unitPattern count="other">{0} мкс</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>нс</displayName>
+				<unitPattern count="one">{0} нс</unitPattern>
+				<unitPattern count="few">{0} нс</unitPattern>
+				<unitPattern count="many">{0} нс</unitPattern>
+				<unitPattern count="other">{0} нс</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName>А</displayName>
+				<unitPattern count="one">{0} A</unitPattern>
+				<unitPattern count="few">{0} A</unitPattern>
+				<unitPattern count="many">{0} A</unitPattern>
+				<unitPattern count="other">{0} A</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>мА</displayName>
+				<unitPattern count="one">{0} мА</unitPattern>
+				<unitPattern count="few">{0} мА</unitPattern>
+				<unitPattern count="many">{0} мА</unitPattern>
+				<unitPattern count="other">{0} мА</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<displayName>Ом</displayName>
+				<unitPattern count="one">{0} Ом</unitPattern>
+				<unitPattern count="few">{0} Ом</unitPattern>
+				<unitPattern count="many">{0} Ом</unitPattern>
+				<unitPattern count="other">{0} Ом</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>В</displayName>
+				<unitPattern count="one">{0} В</unitPattern>
+				<unitPattern count="few">{0} В</unitPattern>
+				<unitPattern count="many">{0} В</unitPattern>
+				<unitPattern count="other">{0} В</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>ккал</displayName>
+				<unitPattern count="one">{0} ккал</unitPattern>
+				<unitPattern count="few">{0} ккал</unitPattern>
+				<unitPattern count="many">{0} ккал</unitPattern>
+				<unitPattern count="other">{0} ккал</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>кал</displayName>
+				<unitPattern count="one">{0} кал</unitPattern>
+				<unitPattern count="few">{0} кал</unitPattern>
+				<unitPattern count="many">{0} кал</unitPattern>
+				<unitPattern count="other">{0} кал</unitPattern>
+			</unit>
+			<unit type="energy-foodcalorie">
+				<displayName>кал</displayName>
+				<unitPattern count="one">{0} кал</unitPattern>
+				<unitPattern count="few">{0} кал</unitPattern>
+				<unitPattern count="many">{0} кал</unitPattern>
+				<unitPattern count="other">{0} кал</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>кДж</displayName>
+				<unitPattern count="one">{0} кДж</unitPattern>
+				<unitPattern count="few">{0} кДж</unitPattern>
+				<unitPattern count="many">{0} кДж</unitPattern>
+				<unitPattern count="other">{0} кДж</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>Дж</displayName>
+				<unitPattern count="one">{0} Дж</unitPattern>
+				<unitPattern count="few">{0} Дж</unitPattern>
+				<unitPattern count="many">{0} Дж</unitPattern>
+				<unitPattern count="other">{0} Дж</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>кВт·г</displayName>
+				<unitPattern count="one">{0} кВт·г</unitPattern>
+				<unitPattern count="few">{0} кВт·г</unitPattern>
+				<unitPattern count="many">{0} кВт·г</unitPattern>
+				<unitPattern count="other">{0} кВт·г</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<displayName>ГГц</displayName>
+				<unitPattern count="one">{0} ГГц</unitPattern>
+				<unitPattern count="few">{0} ГГц</unitPattern>
+				<unitPattern count="many">{0} ГГц</unitPattern>
+				<unitPattern count="other">{0} ГГц</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<displayName>МГц</displayName>
+				<unitPattern count="one">{0} МГц</unitPattern>
+				<unitPattern count="few">{0} МГц</unitPattern>
+				<unitPattern count="many">{0} МГц</unitPattern>
+				<unitPattern count="other">{0} МГц</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>кГц</displayName>
+				<unitPattern count="one">{0} кГц</unitPattern>
+				<unitPattern count="few">{0} кГц</unitPattern>
+				<unitPattern count="many">{0} кГц</unitPattern>
+				<unitPattern count="other">{0} кГц</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<displayName>Гц</displayName>
+				<unitPattern count="one">{0} Гц</unitPattern>
+				<unitPattern count="few">{0} Гц</unitPattern>
+				<unitPattern count="many">{0} Гц</unitPattern>
+				<unitPattern count="other">{0} Гц</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>км</displayName>
+				<unitPattern count="one">{0} км</unitPattern>
+				<unitPattern count="few">{0} км</unitPattern>
+				<unitPattern count="many">{0} км</unitPattern>
+				<unitPattern count="other">{0} км</unitPattern>
+				<perUnitPattern>{0}/км</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>м</displayName>
+				<unitPattern count="one">{0} м</unitPattern>
+				<unitPattern count="few">{0} м</unitPattern>
+				<unitPattern count="many">{0} м</unitPattern>
+				<unitPattern count="other">{0} м</unitPattern>
+				<perUnitPattern>{0}/м</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>дм</displayName>
+				<unitPattern count="one">{0} дм</unitPattern>
+				<unitPattern count="few">{0} дм</unitPattern>
+				<unitPattern count="many">{0} дм</unitPattern>
+				<unitPattern count="other">{0} дм</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>см</displayName>
+				<unitPattern count="one">{0} см</unitPattern>
+				<unitPattern count="few">{0} см</unitPattern>
+				<unitPattern count="many">{0} см</unitPattern>
+				<unitPattern count="other">{0} см</unitPattern>
+				<perUnitPattern>{0}/см</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>мм</displayName>
+				<unitPattern count="one">{0} мм</unitPattern>
+				<unitPattern count="few">{0} мм</unitPattern>
+				<unitPattern count="many">{0} мм</unitPattern>
+				<unitPattern count="other">{0} мм</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>мкм</displayName>
+				<unitPattern count="one">{0} мкм</unitPattern>
+				<unitPattern count="few">{0} мкм</unitPattern>
+				<unitPattern count="many">{0} мкм</unitPattern>
+				<unitPattern count="other">{0} мкм</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>нм</displayName>
+				<unitPattern count="one">{0} нм</unitPattern>
+				<unitPattern count="few">{0} нм</unitPattern>
+				<unitPattern count="many">{0} нм</unitPattern>
+				<unitPattern count="other">{0} нм</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>пм</displayName>
+				<unitPattern count="one">{0} пм</unitPattern>
+				<unitPattern count="few">{0} пм</unitPattern>
+				<unitPattern count="many">{0} пм</unitPattern>
+				<unitPattern count="other">{0} пм</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>мілі</displayName>
+				<unitPattern count="one">{0} міля</unitPattern>
+				<unitPattern count="few">{0} мілі</unitPattern>
+				<unitPattern count="many">{0} міль</unitPattern>
+				<unitPattern count="other">{0} мілі</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>ярды</displayName>
+				<unitPattern count="one">{0} ярд</unitPattern>
+				<unitPattern count="few">{0} ярды</unitPattern>
+				<unitPattern count="many">{0} ярдаў</unitPattern>
+				<unitPattern count="other">{0} ярда</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>футы</displayName>
+				<unitPattern count="one">{0} фут</unitPattern>
+				<unitPattern count="few">{0} футы</unitPattern>
+				<unitPattern count="many">{0} футаў</unitPattern>
+				<unitPattern count="other">{0} фута</unitPattern>
+				<perUnitPattern>{0}/фут</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>цалі</displayName>
+				<unitPattern count="one">{0} цаля</unitPattern>
+				<unitPattern count="few">{0} цалі</unitPattern>
+				<unitPattern count="many">{0} цаляў</unitPattern>
+				<unitPattern count="other">{0} цалі</unitPattern>
+				<perUnitPattern>{0}/цалю</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>пс</displayName>
+				<unitPattern count="one">{0} пс</unitPattern>
+				<unitPattern count="few">{0} пс</unitPattern>
+				<unitPattern count="many">{0} пс</unitPattern>
+				<unitPattern count="other">{0} пс</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>св. г.</displayName>
+				<unitPattern count="one">{0} св. г.</unitPattern>
+				<unitPattern count="few">{0} св. г.</unitPattern>
+				<unitPattern count="many">{0} св. г.</unitPattern>
+				<unitPattern count="other">{0} св. г.</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>а. а.</displayName>
+				<unitPattern count="one">{0} а. а.</unitPattern>
+				<unitPattern count="few">{0} а. а.</unitPattern>
+				<unitPattern count="many">{0} а. а.</unitPattern>
+				<unitPattern count="other">{0} а. а.</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>мар. мілі</displayName>
+				<unitPattern count="one">{0} мар. міля</unitPattern>
+				<unitPattern count="few">{0} мар. мілі</unitPattern>
+				<unitPattern count="many">{0} мар. міль</unitPattern>
+				<unitPattern count="other">{0} мар. міль</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>сканд. мілі</displayName>
+				<unitPattern count="one">{0} скан. мілі</unitPattern>
+				<unitPattern count="few">{0} скан. мілі</unitPattern>
+				<unitPattern count="many">{0} скан. міль</unitPattern>
+				<unitPattern count="other">{0} скан. мілі</unitPattern>
+			</unit>
+			<unit type="light-lux">
+				<displayName>лк</displayName>
+				<unitPattern count="one">{0} лк</unitPattern>
+				<unitPattern count="few">{0} лк</unitPattern>
+				<unitPattern count="many">{0} лк</unitPattern>
+				<unitPattern count="other">{0} лк</unitPattern>
+			</unit>
+			<unit type="mass-metric-ton">
+				<displayName>мет. тоны</displayName>
+				<unitPattern count="one">{0} мет. тона</unitPattern>
+				<unitPattern count="few">{0} мет. тоны</unitPattern>
+				<unitPattern count="many">{0} мет. тон</unitPattern>
+				<unitPattern count="other">{0} мет. тоны</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>кг</displayName>
+				<unitPattern count="one">{0} кг</unitPattern>
+				<unitPattern count="few">{0} кг</unitPattern>
+				<unitPattern count="many">{0} кг</unitPattern>
+				<unitPattern count="other">{0} кг</unitPattern>
+				<perUnitPattern>{0}/кг</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>г</displayName>
+				<unitPattern count="one">{0} г</unitPattern>
+				<unitPattern count="few">{0} г</unitPattern>
+				<unitPattern count="many">{0} г</unitPattern>
+				<unitPattern count="other">{0} г</unitPattern>
+				<perUnitPattern>{0}/г</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>мг</displayName>
+				<unitPattern count="one">{0} мг</unitPattern>
+				<unitPattern count="few">{0} мг</unitPattern>
+				<unitPattern count="many">{0} мг</unitPattern>
+				<unitPattern count="other">{0} мг</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>мкг</displayName>
+				<unitPattern count="one">{0} мкг</unitPattern>
+				<unitPattern count="few">{0} мкг</unitPattern>
+				<unitPattern count="many">{0} мкг</unitPattern>
+				<unitPattern count="other">{0} мкг</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>т</displayName>
+				<unitPattern count="one">{0} т</unitPattern>
+				<unitPattern count="few">{0} т</unitPattern>
+				<unitPattern count="many">{0} т</unitPattern>
+				<unitPattern count="other">{0} т</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>фунты</displayName>
+				<unitPattern count="one">{0} фунт</unitPattern>
+				<unitPattern count="few">{0} фунты</unitPattern>
+				<unitPattern count="many">{0} фунтаў</unitPattern>
+				<unitPattern count="other">{0} фунта</unitPattern>
+				<perUnitPattern>{0}/фунт</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>унц.</displayName>
+				<unitPattern count="one">{0} унц.</unitPattern>
+				<unitPattern count="few">{0} унц.</unitPattern>
+				<unitPattern count="many">{0} унц.</unitPattern>
+				<unitPattern count="other">{0} унц.</unitPattern>
+				<perUnitPattern>{0}/унц.</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>тр. унц.</displayName>
+				<unitPattern count="one">{0} тр. унц.</unitPattern>
+				<unitPattern count="few">{0} тр. унц.</unitPattern>
+				<unitPattern count="many">{0} тр. унц.</unitPattern>
+				<unitPattern count="other">{0} тр. унц.</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>кар</displayName>
+				<unitPattern count="one">{0} кар</unitPattern>
+				<unitPattern count="few">{0} кар</unitPattern>
+				<unitPattern count="many">{0} кар</unitPattern>
+				<unitPattern count="other">{0} кар</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<displayName>ГВт</displayName>
+				<unitPattern count="one">{0} ГВт</unitPattern>
+				<unitPattern count="few">{0} ГВт</unitPattern>
+				<unitPattern count="many">{0} ГВт</unitPattern>
+				<unitPattern count="other">{0} ГВт</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>МВт</displayName>
+				<unitPattern count="one">{0} МВт</unitPattern>
+				<unitPattern count="few">{0} МВт</unitPattern>
+				<unitPattern count="many">{0} МВт</unitPattern>
+				<unitPattern count="other">{0} МВт</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>кВт</displayName>
+				<unitPattern count="one">{0} кВт</unitPattern>
+				<unitPattern count="few">{0} кВт</unitPattern>
+				<unitPattern count="many">{0} кВт</unitPattern>
+				<unitPattern count="other">{0} кВт</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>Вт</displayName>
+				<unitPattern count="one">{0} Вт</unitPattern>
+				<unitPattern count="few">{0} Вт</unitPattern>
+				<unitPattern count="many">{0} Вт</unitPattern>
+				<unitPattern count="other">{0} Вт</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>мВт</displayName>
+				<unitPattern count="one">{0} мВт</unitPattern>
+				<unitPattern count="few">{0} мВт</unitPattern>
+				<unitPattern count="many">{0} мВт</unitPattern>
+				<unitPattern count="other">{0} мВт</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>к. с.</displayName>
+				<unitPattern count="one">{0} к. с.</unitPattern>
+				<unitPattern count="few">{0} к. с.</unitPattern>
+				<unitPattern count="many">{0} к. с.</unitPattern>
+				<unitPattern count="other">{0} к. с.</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<displayName>гПа</displayName>
+				<unitPattern count="one">{0} гПа</unitPattern>
+				<unitPattern count="few">{0} гПа</unitPattern>
+				<unitPattern count="many">{0} гПа</unitPattern>
+				<unitPattern count="other">{0} гПа</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>мм рт. сл.</displayName>
+				<unitPattern count="one">{0} мм рт. сл.</unitPattern>
+				<unitPattern count="few">{0} мм рт. сл.</unitPattern>
+				<unitPattern count="many">{0} мм рт. сл.</unitPattern>
+				<unitPattern count="other">{0} мм рт. сл.</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>фунты на кв. цалю</displayName>
+				<unitPattern count="one">{0} фунт на кв. цалю</unitPattern>
+				<unitPattern count="few">{0} фунты на кв. цалю</unitPattern>
+				<unitPattern count="many">{0} фунтаў на кв. цалю</unitPattern>
+				<unitPattern count="other">{0} фунта на кв. цалю</unitPattern>
+			</unit>
+			<unit type="pressure-inch-hg">
+				<displayName>цалі рт. сл.</displayName>
+				<unitPattern count="one">{0} цаля рт. сл.</unitPattern>
+				<unitPattern count="few">{0} цалі рт. сл.</unitPattern>
+				<unitPattern count="many">{0} цаляў рт. сл.</unitPattern>
+				<unitPattern count="other">{0} цалі рт. сл.</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>мбар</displayName>
+				<unitPattern count="one">{0} мбар</unitPattern>
+				<unitPattern count="few">{0} мбар</unitPattern>
+				<unitPattern count="many">{0} мбар</unitPattern>
+				<unitPattern count="other">{0} мбар</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>км/г</displayName>
+				<unitPattern count="one">{0} км/г</unitPattern>
+				<unitPattern count="few">{0} км/г</unitPattern>
+				<unitPattern count="many">{0} км/г</unitPattern>
+				<unitPattern count="other">{0} км/г</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>м/с</displayName>
+				<unitPattern count="one">{0} м/с</unitPattern>
+				<unitPattern count="few">{0} м/с</unitPattern>
+				<unitPattern count="many">{0} м/с</unitPattern>
+				<unitPattern count="other">{0} м/с</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>мілі/г</displayName>
+				<unitPattern count="one">{0} міля/г</unitPattern>
+				<unitPattern count="few">{0} мілі/г</unitPattern>
+				<unitPattern count="many">{0} міль/г</unitPattern>
+				<unitPattern count="other">{0} мілі/г</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>вуз</displayName>
+				<unitPattern count="one">{0} вуз</unitPattern>
+				<unitPattern count="few">{0} вуз</unitPattern>
+				<unitPattern count="many">{0} вуз</unitPattern>
+				<unitPattern count="other">{0} вуз</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>°C</displayName>
+				<unitPattern count="one">{0} °C</unitPattern>
+				<unitPattern count="few">{0} °C</unitPattern>
+				<unitPattern count="many">{0} °C</unitPattern>
+				<unitPattern count="other">{0} °C</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName>°F</displayName>
+				<unitPattern count="one">{0} °F</unitPattern>
+				<unitPattern count="few">{0} °F</unitPattern>
+				<unitPattern count="many">{0} °F</unitPattern>
+				<unitPattern count="other">{0} °F</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>К</displayName>
+				<unitPattern count="one">{0} К</unitPattern>
+				<unitPattern count="few">{0} К</unitPattern>
+				<unitPattern count="many">{0} К</unitPattern>
+				<unitPattern count="other">{0} К</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>км³</displayName>
+				<unitPattern count="one">{0} км³</unitPattern>
+				<unitPattern count="few">{0} км³</unitPattern>
+				<unitPattern count="many">{0} км³</unitPattern>
+				<unitPattern count="other">{0} км³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>м³</displayName>
+				<unitPattern count="one">{0} м³</unitPattern>
+				<unitPattern count="few">{0} м³</unitPattern>
+				<unitPattern count="many">{0} м³</unitPattern>
+				<unitPattern count="other">{0} м³</unitPattern>
+				<perUnitPattern>{0}/м³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>см³</displayName>
+				<unitPattern count="one">{0} см³</unitPattern>
+				<unitPattern count="few">{0} см³</unitPattern>
+				<unitPattern count="many">{0} см³</unitPattern>
+				<unitPattern count="other">{0} см³</unitPattern>
+				<perUnitPattern>{0}/см³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>куб. мілі</displayName>
+				<unitPattern count="one">{0} куб. міля</unitPattern>
+				<unitPattern count="few">{0} куб. мілі</unitPattern>
+				<unitPattern count="many">{0} куб. міль</unitPattern>
+				<unitPattern count="other">{0} куб. мілі</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>куб. ярды</displayName>
+				<unitPattern count="one">{0} куб. ярд</unitPattern>
+				<unitPattern count="few">{0} куб. ярды</unitPattern>
+				<unitPattern count="many">{0} куб. ярдаў</unitPattern>
+				<unitPattern count="other">{0} куб. ярда</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>куб. футы</displayName>
+				<unitPattern count="one">{0} куб. фут</unitPattern>
+				<unitPattern count="few">{0} куб. футы</unitPattern>
+				<unitPattern count="many">{0} куб. футаў</unitPattern>
+				<unitPattern count="other">{0} куб. фута</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>куб. цалі</displayName>
+				<unitPattern count="one">{0} куб. цаля</unitPattern>
+				<unitPattern count="few">{0} куб. цалі</unitPattern>
+				<unitPattern count="many">{0} куб. цаляў</unitPattern>
+				<unitPattern count="other">{0} куб. цалі</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>Мл</displayName>
+				<unitPattern count="one">{0} Мл</unitPattern>
+				<unitPattern count="few">{0} Мл</unitPattern>
+				<unitPattern count="many">{0} Мл</unitPattern>
+				<unitPattern count="other">{0} Мл</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>гл</displayName>
+				<unitPattern count="one">{0} гл</unitPattern>
+				<unitPattern count="few">{0} гл</unitPattern>
+				<unitPattern count="many">{0} гл</unitPattern>
+				<unitPattern count="other">{0} гл</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>л</displayName>
+				<unitPattern count="one">{0} л</unitPattern>
+				<unitPattern count="few">{0} л</unitPattern>
+				<unitPattern count="many">{0} л</unitPattern>
+				<unitPattern count="other">{0} л</unitPattern>
+				<perUnitPattern>{0}/л</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>дл</displayName>
+				<unitPattern count="one">{0} дл</unitPattern>
+				<unitPattern count="few">{0} дл</unitPattern>
+				<unitPattern count="many">{0} дл</unitPattern>
+				<unitPattern count="other">{0} дл</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>сл</displayName>
+				<unitPattern count="one">{0} сл</unitPattern>
+				<unitPattern count="few">{0} сл</unitPattern>
+				<unitPattern count="many">{0} сл</unitPattern>
+				<unitPattern count="other">{0} сл</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>мл</displayName>
+				<unitPattern count="one">{0} мл</unitPattern>
+				<unitPattern count="few">{0} мл</unitPattern>
+				<unitPattern count="many">{0} мл</unitPattern>
+				<unitPattern count="other">{0} мл</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>мет. пінты</displayName>
+				<unitPattern count="one">{0} мет. пінта</unitPattern>
+				<unitPattern count="few">{0} мет. пінты</unitPattern>
+				<unitPattern count="many">{0} мет. пінтаў</unitPattern>
+				<unitPattern count="other">{0} мет. пінты</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>мет. кубак</displayName>
+				<unitPattern count="one">{0} мет. кубак</unitPattern>
+				<unitPattern count="few">{0} мет. кубкі</unitPattern>
+				<unitPattern count="many">{0} мет. кубкаў</unitPattern>
+				<unitPattern count="other">{0} мет. кубка</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>акр-футы</displayName>
+				<unitPattern count="one">{0} акр-фут</unitPattern>
+				<unitPattern count="few">{0} акр-футы</unitPattern>
+				<unitPattern count="many">{0} акр-футаў</unitPattern>
+				<unitPattern count="other">{0} акр-фута</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>гал</displayName>
+				<unitPattern count="one">{0} гал</unitPattern>
+				<unitPattern count="few">{0} гал</unitPattern>
+				<unitPattern count="many">{0} гал</unitPattern>
+				<unitPattern count="other">{0} гал</unitPattern>
+				<perUnitPattern>{0}/гал</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>кварты</displayName>
+				<unitPattern count="one">{0} кварта</unitPattern>
+				<unitPattern count="few">{0} кварты</unitPattern>
+				<unitPattern count="many">{0} кварт</unitPattern>
+				<unitPattern count="other">{0} кварты</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>пінты</displayName>
+				<unitPattern count="one">{0} пінта</unitPattern>
+				<unitPattern count="few">{0} пінты</unitPattern>
+				<unitPattern count="many">{0} пінтаў</unitPattern>
+				<unitPattern count="other">{0} пінты</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>кубкі</displayName>
+				<unitPattern count="one">{0} кубак</unitPattern>
+				<unitPattern count="few">{0} кубкі</unitPattern>
+				<unitPattern count="many">{0} кубкаў</unitPattern>
+				<unitPattern count="other">{0} кубка</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>вадк. унц.</displayName>
+				<unitPattern count="one">{0} вадк. унц.</unitPattern>
+				<unitPattern count="few">{0} вадк. унц.</unitPattern>
+				<unitPattern count="many">{0} вадк. унц.</unitPattern>
+				<unitPattern count="other">{0} вадк. унц.</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>ст. лыжкі</displayName>
+				<unitPattern count="one">{0} ст. лыжка</unitPattern>
+				<unitPattern count="few">{0} ст. лыжкі</unitPattern>
+				<unitPattern count="many">{0} ст. лыжак</unitPattern>
+				<unitPattern count="other">{0} ст. лыжкі</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>ч. лыжкі</displayName>
+				<unitPattern count="one">{0} ч. лыжка</unitPattern>
+				<unitPattern count="few">{0} ч. лыжкі</unitPattern>
+				<unitPattern count="many">{0} ч. лыжак</unitPattern>
+				<unitPattern count="other">{0} ч. лыжкі</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} У</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} Пн</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} Пд</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} З</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<unitLength type="narrow">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>л/100км</displayName>
+				<unitPattern count="one">{0}л/100км</unitPattern>
+				<unitPattern count="few">{0}л/100км</unitPattern>
+				<unitPattern count="many">{0}л/100км</unitPattern>
+				<unitPattern count="other">{0}л/100км</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>г.</displayName>
+				<unitPattern count="one">{0}г.</unitPattern>
+				<unitPattern count="few">{0}г.</unitPattern>
+				<unitPattern count="many">{0}г.</unitPattern>
+				<unitPattern count="other">{0}г.</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>мес.</displayName>
+				<unitPattern count="one">{0}мес.</unitPattern>
+				<unitPattern count="few">{0}мес.</unitPattern>
+				<unitPattern count="many">{0}мес.</unitPattern>
+				<unitPattern count="other">{0}мес.</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>тыдз.</displayName>
+				<unitPattern count="one">{0}тыдз.</unitPattern>
+				<unitPattern count="few">{0}тыдз.</unitPattern>
+				<unitPattern count="many">{0}тыдз.</unitPattern>
+				<unitPattern count="other">{0}тыдз.</unitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>сут.</displayName>
+				<unitPattern count="one">{0}сут.</unitPattern>
+				<unitPattern count="few">{0}сут.</unitPattern>
+				<unitPattern count="many">{0}сут.</unitPattern>
+				<unitPattern count="other">{0}сут.</unitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>гадз.</displayName>
+				<unitPattern count="one">{0}гадз.</unitPattern>
+				<unitPattern count="few">{0}гадз.</unitPattern>
+				<unitPattern count="many">{0}гадз.</unitPattern>
+				<unitPattern count="other">{0}гадз.</unitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>хв.</displayName>
+				<unitPattern count="one">{0}хв.</unitPattern>
+				<unitPattern count="few">{0}хв.</unitPattern>
+				<unitPattern count="many">{0}хв.</unitPattern>
+				<unitPattern count="other">{0}хв.</unitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>с</displayName>
+				<unitPattern count="one">{0}с</unitPattern>
+				<unitPattern count="few">{0}с</unitPattern>
+				<unitPattern count="many">{0}с</unitPattern>
+				<unitPattern count="other">{0}с</unitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>мс</displayName>
+				<unitPattern count="one">{0}мс</unitPattern>
+				<unitPattern count="few">{0}мс</unitPattern>
+				<unitPattern count="many">{0}мс</unitPattern>
+				<unitPattern count="other">{0}мс</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>км</displayName>
+				<unitPattern count="one">{0}км</unitPattern>
+				<unitPattern count="few">{0}км</unitPattern>
+				<unitPattern count="many">{0}км</unitPattern>
+				<unitPattern count="other">{0}км</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>м</displayName>
+				<unitPattern count="one">{0}м</unitPattern>
+				<unitPattern count="few">{0}м</unitPattern>
+				<unitPattern count="many">{0}м</unitPattern>
+				<unitPattern count="other">{0}м</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>см</displayName>
+				<unitPattern count="one">{0}см</unitPattern>
+				<unitPattern count="few">{0}см</unitPattern>
+				<unitPattern count="many">{0}см</unitPattern>
+				<unitPattern count="other">{0}см</unitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>мм</displayName>
+				<unitPattern count="one">{0}мм</unitPattern>
+				<unitPattern count="few">{0}мм</unitPattern>
+				<unitPattern count="many">{0}мм</unitPattern>
+				<unitPattern count="other">{0}мм</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>кг</displayName>
+				<unitPattern count="one">{0}кг</unitPattern>
+				<unitPattern count="few">{0}кг</unitPattern>
+				<unitPattern count="many">{0}кг</unitPattern>
+				<unitPattern count="other">{0}кг</unitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>г</displayName>
+				<unitPattern count="one">{0}г</unitPattern>
+				<unitPattern count="few">{0}г</unitPattern>
+				<unitPattern count="many">{0}г</unitPattern>
+				<unitPattern count="other">{0}г</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>км/г</displayName>
+				<unitPattern count="one">{0}км/г</unitPattern>
+				<unitPattern count="few">{0}км/г</unitPattern>
+				<unitPattern count="many">{0}км/г</unitPattern>
+				<unitPattern count="other">{0}км/г</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>°C</displayName>
+				<unitPattern count="one">{0}°C</unitPattern>
+				<unitPattern count="few">{0}°C</unitPattern>
+				<unitPattern count="many">{0}°C</unitPattern>
+				<unitPattern count="other">{0}°C</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>л</displayName>
+				<unitPattern count="one">{0}л</unitPattern>
+				<unitPattern count="few">{0}л</unitPattern>
+				<unitPattern count="many">{0}л</unitPattern>
+				<unitPattern count="other">{0}л</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} У</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} Пн</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} Пд</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} З</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<durationUnit type="hm">
+			<durationUnitPattern>hh.mm</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="hms">
+			<durationUnitPattern>hh.mm.ss</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="ms">
+			<durationUnitPattern>mm.ss</durationUnitPattern>
+		</durationUnit>
+	</units>
+	<listPatterns>
+		<listPattern>
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0} і {1}</listPatternPart>
+			<listPatternPart type="2">{0} і {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-narrow">
+			<listPatternPart type="start">{0} {1}</listPatternPart>
+			<listPatternPart type="middle">{0} {1}</listPatternPart>
+			<listPatternPart type="end">{0} {1}</listPatternPart>
+			<listPatternPart type="2">{0} {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-short">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
+		</listPattern>
+	</listPatterns>
+	<posix>
+		<messages>
+			<yesstr>так:т</yesstr>
+			<nostr>не:н</nostr>
+		</messages>
+	</posix>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/be_BY.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/be_BY.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/be_BY.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/be_BY.xml
index c4f11b76f30..7cb14021365 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/be_BY.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/be_BY.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="be"/>
 		<territory type="BY"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bem.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bem.xml
similarity index 82%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bem.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bem.xml
index e6cbe2bbc7b..771808dd70a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bem.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bem.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="bem"/>
 	</identity>
 	<localeDisplayNames>
@@ -190,6 +189,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</days>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">uluchelo</dayPeriod>
+							<dayPeriod type="pm">akasuba</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">uluchelo</dayPeriod>
 							<dayPeriod type="pm">akasuba</dayPeriod>
@@ -294,7 +297,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day">
 				<displayName>Ubushiku</displayName>
+				<relative type="-1">yesterday</relative>
 				<relative type="0">Lelo</relative>
+				<relative type="1">tomorrow</relative>
 			</field>
 			<field type="dayperiod">
 				<displayName>Akasuba</displayName>
@@ -320,6 +325,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="ZMW">
@@ -334,3 +367,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bem_ZM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bem_ZM.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bem_ZM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bem_ZM.xml
index 8af8a182500..d4f1c52e776 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bem_ZM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bem_ZM.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="bem"/>
 		<territory type="ZM"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bez.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bez.xml
similarity index 92%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bez.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bez.xml
index 5a51328dec6..6397a8d23d6 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bez.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bez.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="bez"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Huanguila</territory>
 			<territory type="AL">Hualbania</territory>
 			<territory type="AM">Huamenia</territory>
-			<territory type="AN">Huantili dza Huuholanzi</territory>
 			<territory type="AO">Huangola</territory>
 			<territory type="AR">Huajendina</territory>
 			<territory type="AS">Husamoa ya Humalekani</territory>
@@ -450,6 +448,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">pamilau</dayPeriod>
+							<dayPeriod type="pm">pamunyi</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">pamilau</dayPeriod>
 							<dayPeriod type="pm">pamunyi</dayPeriod>
@@ -491,22 +493,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -585,6 +587,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0K¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0K¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00K¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000K¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0M¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00M¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000M¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0G¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00G¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000G¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0T¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00T¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000T¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bez_TZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bez_TZ.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bez_TZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bez_TZ.xml
index 328bc61ef72..46a18970e8e 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bez_TZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bez_TZ.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="bez"/>
 		<territory type="TZ"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bg.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bg.xml
similarity index 92%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bg.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bg.xml
index 3223feebf88..b75128eeb31 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bg.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bg.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="bg"/>
 	</identity>
 	<localeDisplayNames>
@@ -24,7 +23,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ada" draft="contributed">адангме</language>
 			<language type="ady">адиге</language>
 			<language type="ae" draft="contributed">авестски</language>
-			<language type="af">африканс</language>
+			<language type="af">африкаанс</language>
 			<language type="afh">африхили</language>
 			<language type="agq">агем</language>
 			<language type="ain" draft="contributed">айну</language>
@@ -59,6 +58,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bem">бемба</language>
 			<language type="bez">бена</language>
 			<language type="bg">български</language>
+			<language type="bgn">западен балочи</language>
 			<language type="bho">божпури</language>
 			<language type="bi">бислама</language>
 			<language type="bik" draft="contributed">биколски</language>
@@ -91,7 +91,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="chp">чиипувски</language>
 			<language type="chr">чероки</language>
 			<language type="chy">чейенски</language>
-			<language type="ckb">кюрдски (сорани)</language>
+			<language type="ckb">кюрдски (централен)</language>
 			<language type="co">корсикански</language>
 			<language type="cop">коптски</language>
 			<language type="cr">крии</language>
@@ -106,8 +106,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="dar">даргва</language>
 			<language type="dav">таита</language>
 			<language type="de">немски</language>
-			<language type="de_AT">австрийски немски</language>
-			<language type="de_CH">швейцарски горногермански</language>
 			<language type="del">делауер</language>
 			<language type="den">слейви</language>
 			<language type="dgr">догриб</language>
@@ -129,16 +127,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="el">гръцки</language>
 			<language type="elx">еламитски</language>
 			<language type="en">английски</language>
-			<language type="en_AU">австралийски английски</language>
-			<language type="en_CA">канадски английски</language>
-			<language type="en_GB">британски английски</language>
-			<language type="en_GB" alt="short">английски (GB)</language>
-			<language type="en_US">американски английски</language>
+			<language type="en_GB" alt="short">английски (UK)</language>
+			<language type="en_US">английски (САЩ)</language>
 			<language type="en_US" alt="short">английски (US)</language>
 			<language type="enm">средновековен английски</language>
 			<language type="eo">есперанто</language>
 			<language type="es">испански</language>
-			<language type="es_MX">мексикански испански</language>
 			<language type="et">естонски</language>
 			<language type="eu">баски</language>
 			<language type="ewo">евондо</language>
@@ -152,8 +146,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="fo">фарьорски</language>
 			<language type="fon">фон</language>
 			<language type="fr">френски</language>
-			<language type="fr_CA">канадски френски</language>
-			<language type="fr_CH">швейцарски френски</language>
 			<language type="frm">средновековен френски</language>
 			<language type="fro">старофренски</language>
 			<language type="frr">северен фризски</language>
@@ -274,6 +266,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">лаоски</language>
 			<language type="lol">монго</language>
 			<language type="loz">лози</language>
+			<language type="lrc">северен лури</language>
 			<language type="lt">литовски</language>
 			<language type="lu">луба катанга</language>
 			<language type="lua">луба-лулуа</language>
@@ -319,12 +312,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mwr">марвари</language>
 			<language type="my">бирмански</language>
 			<language type="myv">ерзиа</language>
+			<language type="mzn">мазандаран</language>
 			<language type="na">науру</language>
 			<language type="nap">неаполитански</language>
 			<language type="naq">нама</language>
-			<language type="nb">норвежки букмол</language>
+			<language type="nb">норвежки (букмол)</language>
 			<language type="nd">северен ндебеле</language>
-			<language type="nds">долносаксонски</language>
+			<language type="nds">долнонемски</language>
+			<language type="nds_NL">долносаксонски</language>
 			<language type="ne">непалски</language>
 			<language type="new">неварски</language>
 			<language type="ng">ндонга</language>
@@ -333,7 +328,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nl">нидерландски</language>
 			<language type="nl_BE">фламандски</language>
 			<language type="nmg">квасио</language>
-			<language type="nn">норвежки нюношк</language>
+			<language type="nn">норвежки (нюношк)</language>
 			<language type="no">норвежки</language>
 			<language type="nog">ногаи</language>
 			<language type="non">старонорвежски</language>
@@ -398,6 +393,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">сицилиански</language>
 			<language type="sco">шотландски</language>
 			<language type="sd">синдхи</language>
+			<language type="sdh">южнокюрдски</language>
 			<language type="se">северносаамски</language>
 			<language type="seh">сена</language>
 			<language type="sel">селкуп</language>
@@ -432,8 +428,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">шумерски</language>
 			<language type="sv">шведски</language>
 			<language type="sw">суахили</language>
+			<language type="sw_CD">конгоански суахили</language>
 			<language type="swb">коморски</language>
-			<language type="swc">конгоански суахили</language>
 			<language type="syc">класически сирийски</language>
 			<language type="syr">сирийски</language>
 			<language type="ta">тамилски</language>
@@ -486,6 +482,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">валамо</language>
 			<language type="war">варай</language>
 			<language type="was">уашо</language>
+			<language type="wbp">валпири</language>
 			<language type="wo">волоф</language>
 			<language type="xal">калмик</language>
 			<language type="xh">ксоса</language>
@@ -501,8 +498,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="zen">зенага</language>
 			<language type="zgh">стандартен марокански тамазигт</language>
 			<language type="zh">китайски</language>
-			<language type="zh_Hans">опростен китайски</language>
-			<language type="zh_Hant">традиционен китайски</language>
 			<language type="zu">зулуски</language>
 			<language type="zun">зуни</language>
 			<language type="zxx">без лингвистично съдържание</language>
@@ -634,7 +629,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Zzzz">непозната писменост</script>
 		</scripts>
 		<territories>
-			<territory type="001">Земята</territory>
+			<territory type="001">Свят</territory>
 			<territory type="002">Африка</territory>
 			<territory type="003">Северноамерикански континент</territory>
 			<territory type="005">Южна Америка</territory>
@@ -672,7 +667,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Ангуила</territory>
 			<territory type="AL">Албания</territory>
 			<territory type="AM">Армения</territory>
-			<territory type="AN">Холандски Антили</territory>
 			<territory type="AO">Ангола</territory>
 			<territory type="AQ">Антарктика</territory>
 			<territory type="AR">Аржентина</territory>
@@ -693,7 +687,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BJ">Бенин</territory>
 			<territory type="BL">Сен Бартелеми</territory>
 			<territory type="BM">Бермуда</territory>
-			<territory type="BN">Бруней Дарусалам</territory>
+			<territory type="BN">Бруней Даруссалам</territory>
 			<territory type="BO">Боливия</territory>
 			<territory type="BQ">Карибска Нидерландия</territory>
 			<territory type="BR">Бразилия</territory>
@@ -705,10 +699,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BZ">Белиз</territory>
 			<territory type="CA">Канада</territory>
 			<territory type="CC">Кокосови острови (острови Кийлинг)</territory>
-			<territory type="CD">Демократична република Конго</territory>
-			<territory type="CD" alt="variant">Конго (Демократична република)</territory>
+			<territory type="CD">Конго (Киншаса)</territory>
+			<territory type="CD" alt="variant">Конго (ДРК)</territory>
 			<territory type="CF">Централноафриканска република</territory>
-			<territory type="CG">Конго</territory>
+			<territory type="CG">Конго (Бразавил)</territory>
 			<territory type="CG" alt="variant">Конго (Република)</territory>
 			<territory type="CH">Швейцария</territory>
 			<territory type="CI">Кот д’Ивоар</territory>
@@ -725,7 +719,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CW">Кюрасао</territory>
 			<territory type="CX">остров Рождество</territory>
 			<territory type="CY">Кипър</territory>
-			<territory type="CZ">Чехия</territory>
+			<territory type="CZ">Чешка република</territory>
 			<territory type="DE">Германия</territory>
 			<territory type="DG">Диего Гарсия</territory>
 			<territory type="DJ">Джибути</territory>
@@ -750,12 +744,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="FO">Фарьорски острови</territory>
 			<territory type="FR">Франция</territory>
 			<territory type="GA">Габон</territory>
-			<territory type="GB">Великобритания</territory>
-			<territory type="GB" alt="short">Великобритания</territory>
+			<territory type="GB">Обединеното кралство</territory>
+			<territory type="GB" alt="short">Обединеното кралство</territory>
 			<territory type="GD">Гренада</territory>
 			<territory type="GE">Грузия</territory>
 			<territory type="GF">Френска Гвиана</territory>
-			<territory type="GG">Гърнси</territory>
+			<territory type="GG">Гърнзи</territory>
 			<territory type="GH">Гана</territory>
 			<territory type="GI">Гибралтар</territory>
 			<territory type="GL">Гренландия</territory>
@@ -821,7 +815,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="MG">Мадагаскар</territory>
 			<territory type="MH">Маршалови острови</territory>
 			<territory type="MK">Македония</territory>
-			<territory type="MK" alt="variant">Македония (БЮРМ)</territory>
+			<territory type="MK" alt="variant">Бивша югославска република Македония</territory>
 			<territory type="ML">Мали</territory>
 			<territory type="MM">Мианмар (Бирма)</territory>
 			<territory type="MN">Монголия</territory>
@@ -854,7 +848,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="PA">Панама</territory>
 			<territory type="PE">Перу</territory>
 			<territory type="PF">Френска Полинезия</territory>
-			<territory type="PG">Папуа Нова Гвинея</territory>
+			<territory type="PG">Папуа-Нова Гвинея</territory>
 			<territory type="PH">Филипини</territory>
 			<territory type="PK">Пакистан</territory>
 			<territory type="PL">Полша</territory>
@@ -867,7 +861,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="PW">Палау</territory>
 			<territory type="PY">Парагвай</territory>
 			<territory type="QA">Катар</territory>
-			<territory type="QO">отдалечени острови на Океания</territory>
+			<territory type="QO">Отдалечени острови на Океания</territory>
 			<territory type="RE">Реюнион</territory>
 			<territory type="RO">Румъния</territory>
 			<territory type="RS">Сърбия</territory>
@@ -980,6 +974,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric">Сортиране на цифрите</key>
 			<key type="colStrength">Сила на сортиране</key>
 			<key type="currency">валута</key>
+			<key type="hc">Часови формат (12- или 24-часов)</key>
+			<key type="lb">Стил за нов ред</key>
+			<key type="ms">Мерна система</key>
 			<key type="numbers">цифри</key>
 			<key type="timezone">Часова зона</key>
 			<key type="va">Вариант на локала</key>
@@ -987,95 +984,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">Собствена употреба</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">арабско-индийски цифри</type>
-			<type type="arabext" key="numbers">разширени арабско-индийски цифри</type>
-			<type type="armn" key="numbers">арменски цифри</type>
-			<type type="armnlow" key="numbers">арменски цифри в долен регистър</type>
-			<type type="beng" key="numbers">бенгалски цифри</type>
-			<type type="big5han" key="collation">Традиционен китайски (Big5)</type>
-			<type type="buddhist" key="calendar">будистки календар</type>
-			<type type="chinese" key="calendar">китайски календар</type>
-			<type type="coptic" key="calendar" draft="contributed">Коптски календар</type>
-			<type type="dangi" key="calendar">корейски календар</type>
-			<type type="deva" key="numbers">цифри в деванагари</type>
-			<type type="dictionary" key="collation" draft="contributed">Речников ред на сортиране</type>
-			<type type="ducet" key="collation">стандартен ред на сортиране в уникод</type>
-			<type type="ethi" key="numbers">етиопски цифри</type>
-			<type type="ethiopic" key="calendar">етиопски календар</type>
-			<type type="ethiopic-amete-alem" key="calendar" draft="contributed">Етиопски календар Амит Алем</type>
-			<type type="finance" key="numbers">Финансови цифри</type>
-			<type type="fullwide" key="numbers">цифри с пълна ширина</type>
-			<type type="gb2312han" key="collation">Опростен китайски (GB2312)</type>
-			<type type="geor" key="numbers">грузински цифри</type>
-			<type type="gregorian" key="calendar">григориански календар</type>
-			<type type="grek" key="numbers">гръцки цифри</type>
-			<type type="greklow" key="numbers">гръцки цифри в долен регистър</type>
-			<type type="gujr" key="numbers">цифри в гуджарати</type>
-			<type type="guru" key="numbers">цифри в гурмукхи</type>
-			<type type="hanidec" key="numbers">китайски десетични цифри</type>
-			<type type="hans" key="numbers">цифри в опростения китайски</type>
-			<type type="hansfin" key="numbers">финансови цифри в опростения китайски</type>
-			<type type="hant" key="numbers">цифри в традиционния китайски</type>
-			<type type="hantfin" key="numbers">финансови цифри в традиционния китайски</type>
-			<type type="hebr" key="numbers">цифри в иврит</type>
-			<type type="hebrew" key="calendar">еврейски календар</type>
-			<type type="identical" key="colStrength">Сортиране на всички</type>
-			<type type="indian" key="calendar">Индийски граждански календар</type>
-			<type type="islamic" key="calendar">ислямски календар</type>
-			<type type="islamic-civil" key="calendar">Ислямски цивилен календар</type>
-			<type type="iso8601" key="calendar">календар според ISO 8601</type>
-			<type type="japanese" key="calendar">японски календар</type>
-			<type type="jpan" key="numbers">японски цифри</type>
-			<type type="jpanfin" key="numbers">японски финансови цифри</type>
-			<type type="khmr" key="numbers">кхмерски цифри</type>
-			<type type="knda" key="numbers">цифри в каннада</type>
-			<type type="laoo" key="numbers">лаоски цифри</type>
-			<type type="latn" key="numbers">западни цифри</type>
-			<type type="lower" key="colCaseFirst">Сортиране първо по долен регистър</type>
-			<type type="mlym" key="numbers">цифри в малаялам</type>
-			<type type="mong" key="numbers" draft="contributed">Монголски цифри</type>
-			<type type="mymr" key="numbers">мианмарски цифри</type>
-			<type type="native" key="numbers">Местни цифри</type>
-			<type type="no" key="colBackwards">Нормално сортиране по диакритични знаци</type>
-			<type type="no" key="colCaseFirst">Сортиране с нормален ред за регистъра</type>
-			<type type="no" key="colCaseLevel">Сортиране без различаване на регистъра на буквите</type>
-			<type type="no" key="colHiraganaQuaternary">Сортиране на кана отделно</type>
-			<type type="no" key="colNormalization">Сортиране без нормализиране</type>
-			<type type="no" key="colNumeric">Сортиране на цифрите индивидуално</type>
-			<type type="non-ignorable" key="colAlternate">Сортиране по символи</type>
-			<type type="orya" key="numbers">цифри в ория</type>
-			<type type="persian" key="calendar">персийски календар</type>
-			<type type="phonebook" key="collation">Азбучен ред</type>
-			<type type="phonetic" key="collation">Фонетичен ред на сортиране</type>
-			<type type="pinyin" key="collation">Сортиране Пинин</type>
-			<type type="primary" key="colStrength">Сортиране само по основни букви</type>
-			<type type="quaternary" key="colStrength">Сортиране по диакритични знаци/регистър/ширина/кана</type>
-			<type type="reformed" key="collation" draft="contributed">Следреформен ред на сортиране</type>
-			<type type="roc" key="calendar">календар на Република Китай</type>
-			<type type="roman" key="numbers">римски цифри</type>
-			<type type="romanlow" key="numbers">римски цифри в долен регистър</type>
-			<type type="search" key="collation">търсене с общо предназначение</type>
-			<type type="searchjl" key="collation">Търсене по първоначални съгласни в хангул</type>
-			<type type="secondary" key="colStrength">Сортиране по диакритични знаци</type>
-			<type type="shifted" key="colAlternate">Сортиране с пренебрегване на символи</type>
-			<type type="standard" key="collation">стандартен ред на сортиране</type>
-			<type type="stroke" key="collation">Сортиране по щрих</type>
-			<type type="taml" key="numbers">традиционни тамилски цифри</type>
-			<type type="tamldec" key="numbers">тамилски цифри</type>
-			<type type="telu" key="numbers">цифри в телугу</type>
-			<type type="tertiary" key="colStrength">Сортиране по диакритични знаци/регистър/ширина</type>
-			<type type="thai" key="numbers">тайландски цифри</type>
-			<type type="tibt" key="numbers">тибетски цифри</type>
-			<type type="traditional" key="collation">Традиционно</type>
-			<type type="traditional" key="numbers">Традиционни цифри</type>
-			<type type="unihan" key="collation" draft="contributed">Ред на сортиране по ключове и черти</type>
-			<type type="upper" key="colCaseFirst">Сортиране първо по горен регистър</type>
-			<type type="vaii" key="numbers">Цифри във ваи</type>
-			<type type="yes" key="colBackwards">Обратно сортиране по диакритични знаци</type>
-			<type type="yes" key="colCaseLevel">Сортиране с различаване на регистъра на буквите</type>
-			<type type="yes" key="colHiraganaQuaternary">Сортиране на кана по различен начин</type>
-			<type type="yes" key="colNormalization">Нормализирано сортиране в Уникод</type>
-			<type type="yes" key="colNumeric">Сортиране на цифрите по числена стойност</type>
+			<type key="calendar" type="buddhist">будистки календар</type>
+			<type key="calendar" type="chinese">китайски календар</type>
+			<type key="calendar" type="coptic" draft="contributed">Коптски календар</type>
+			<type key="calendar" type="dangi">корейски календар</type>
+			<type key="calendar" type="ethiopic">етиопски календар</type>
+			<type key="calendar" type="ethiopic-amete-alem" draft="contributed">Етиопски календар Амит Алем</type>
+			<type key="calendar" type="gregorian">григориански календар</type>
+			<type key="calendar" type="hebrew">еврейски календар</type>
+			<type key="calendar" type="indian">Индийски граждански календар</type>
+			<type key="calendar" type="islamic">ислямски календар</type>
+			<type key="calendar" type="islamic-civil">Ислямски цивилен календар</type>
+			<type key="calendar" type="iso8601">календар според ISO 8601</type>
+			<type key="calendar" type="japanese">японски календар</type>
+			<type key="calendar" type="persian">персийски календар</type>
+			<type key="calendar" type="roc">календар на Република Китай</type>
+			<type key="colAlternate" type="non-ignorable">Сортиране по символи</type>
+			<type key="colAlternate" type="shifted">Сортиране с пренебрегване на символи</type>
+			<type key="colBackwards" type="no">Нормално сортиране по диакритични знаци</type>
+			<type key="colBackwards" type="yes">Обратно сортиране по диакритични знаци</type>
+			<type key="colCaseFirst" type="lower">Сортиране първо по долен регистър</type>
+			<type key="colCaseFirst" type="no">Сортиране с нормален ред за регистъра</type>
+			<type key="colCaseFirst" type="upper">Сортиране първо по горен регистър</type>
+			<type key="colCaseLevel" type="no">Сортиране без различаване на регистъра на буквите</type>
+			<type key="colCaseLevel" type="yes">Сортиране с различаване на регистъра на буквите</type>
+			<type key="colHiraganaQuaternary" type="no">Сортиране на кана отделно</type>
+			<type key="colHiraganaQuaternary" type="yes">Сортиране на кана по различен начин</type>
+			<type key="collation" type="big5han">Традиционен китайски (Big5)</type>
+			<type key="collation" type="dictionary" draft="contributed">Речников ред на сортиране</type>
+			<type key="collation" type="ducet">стандартен ред на сортиране в Уникод</type>
+			<type key="collation" type="gb2312han">Опростен китайски (GB2312)</type>
+			<type key="collation" type="phonebook">Азбучен ред</type>
+			<type key="collation" type="phonetic">Фонетичен ред на сортиране</type>
+			<type key="collation" type="pinyin">Сортиране Пинин</type>
+			<type key="collation" type="reformed" draft="contributed">Следреформен ред на сортиране</type>
+			<type key="collation" type="search">търсене с общо предназначение</type>
+			<type key="collation" type="searchjl">Търсене по първоначални съгласни в хангул</type>
+			<type key="collation" type="standard">стандартен ред на сортиране</type>
+			<type key="collation" type="stroke">Сортиране по щрих</type>
+			<type key="collation" type="traditional">Традиционно</type>
+			<type key="collation" type="unihan" draft="contributed">Ред на сортиране по ключове и черти</type>
+			<type key="colNormalization" type="no">Сортиране без нормализиране</type>
+			<type key="colNormalization" type="yes">Нормализирано сортиране в Уникод</type>
+			<type key="colNumeric" type="no">Сортиране на цифрите индивидуално</type>
+			<type key="colNumeric" type="yes">Сортиране на цифрите по числена стойност</type>
+			<type key="colStrength" type="identical">Сортиране на всички</type>
+			<type key="colStrength" type="primary">Сортиране само по основни букви</type>
+			<type key="colStrength" type="quaternary">Сортиране по диакритични знаци/регистър/ширина/кана</type>
+			<type key="colStrength" type="secondary">Сортиране по диакритични знаци</type>
+			<type key="colStrength" type="tertiary">Сортиране по диакритични знаци/регистър/ширина</type>
+			<type key="hc" type="h11">12-часова система (0 – 11)</type>
+			<type key="hc" type="h12">12-часова система (1 – 12)</type>
+			<type key="hc" type="h23">24-часова система (0 – 23)</type>
+			<type key="hc" type="h24">24-часова система (1 – 24)</type>
+			<type key="lb" type="loose">Свободен стил за нов ред</type>
+			<type key="lb" type="normal">Нормален стил за нов ред</type>
+			<type key="lb" type="strict">Строг стил за нов ред</type>
+			<type key="ms" type="metric">Метрична система</type>
+			<type key="ms" type="uksystem">Имперска мерна система</type>
+			<type key="ms" type="ussystem">Мерна система на САЩ</type>
+			<type key="numbers" type="arab">арабско-индийски цифри</type>
+			<type key="numbers" type="arabext">разширени арабско-индийски цифри</type>
+			<type key="numbers" type="armn">арменски цифри</type>
+			<type key="numbers" type="armnlow">арменски цифри в долен регистър</type>
+			<type key="numbers" type="beng">бенгалски цифри</type>
+			<type key="numbers" type="deva">цифри в деванагари</type>
+			<type key="numbers" type="ethi">етиопски цифри</type>
+			<type key="numbers" type="finance">Финансови цифри</type>
+			<type key="numbers" type="fullwide">цифри с пълна ширина</type>
+			<type key="numbers" type="geor">грузински цифри</type>
+			<type key="numbers" type="grek">гръцки цифри</type>
+			<type key="numbers" type="greklow">гръцки цифри в долен регистър</type>
+			<type key="numbers" type="gujr">цифри в гуджарати</type>
+			<type key="numbers" type="guru">цифри в гурмукхи</type>
+			<type key="numbers" type="hanidec">китайски десетични цифри</type>
+			<type key="numbers" type="hans">цифри в китайски (опростен)</type>
+			<type key="numbers" type="hansfin">финансови цифри в китайски (опростен)</type>
+			<type key="numbers" type="hant">цифри в китайски (традиционен)</type>
+			<type key="numbers" type="hantfin">финансови цифри в китайски (традиционен)</type>
+			<type key="numbers" type="hebr">цифри в иврит</type>
+			<type key="numbers" type="jpan">японски цифри</type>
+			<type key="numbers" type="jpanfin">японски финансови цифри</type>
+			<type key="numbers" type="khmr">кхмерски цифри</type>
+			<type key="numbers" type="knda">цифри в каннада</type>
+			<type key="numbers" type="laoo">лаоски цифри</type>
+			<type key="numbers" type="latn">западни цифри</type>
+			<type key="numbers" type="mlym">цифри в малаялам</type>
+			<type key="numbers" type="mong" draft="contributed">Монголски цифри</type>
+			<type key="numbers" type="mymr">бирмански цифри</type>
+			<type key="numbers" type="native">Местни цифри</type>
+			<type key="numbers" type="orya">цифри в ория</type>
+			<type key="numbers" type="roman">римски цифри</type>
+			<type key="numbers" type="romanlow">римски цифри в долен регистър</type>
+			<type key="numbers" type="taml">традиционни тамилски цифри</type>
+			<type key="numbers" type="tamldec">тамилски цифри</type>
+			<type key="numbers" type="telu">цифри в телугу</type>
+			<type key="numbers" type="thai">тайландски цифри</type>
+			<type key="numbers" type="tibt">тибетски цифри</type>
+			<type key="numbers" type="traditional">Традиционни цифри</type>
+			<type key="numbers" type="vaii">Цифри във ваи</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">АКГН (BGN)</transformName>
@@ -1167,6 +1174,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
 						<dateFormatItem id="Gy">y 'г'. G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MM.y 'г'. G</dateFormatItem>
@@ -1327,18 +1335,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<months>
 					<monthContext type="format">
 						<monthWidth type="abbreviated">
-							<month type="1">ян.</month>
-							<month type="2">февр.</month>
+							<month type="1">яну</month>
+							<month type="2">фев</month>
 							<month type="3">март</month>
-							<month type="4">апр.</month>
+							<month type="4">апр</month>
 							<month type="5">май</month>
 							<month type="6">юни</month>
 							<month type="7">юли</month>
-							<month type="8">авг.</month>
-							<month type="9">септ.</month>
-							<month type="10">окт.</month>
-							<month type="11">ноем.</month>
-							<month type="12">дек.</month>
+							<month type="8">авг</month>
+							<month type="9">сеп</month>
+							<month type="10">окт</month>
+							<month type="11">ное</month>
+							<month type="12">дек</month>
 						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">я</month>
@@ -1371,18 +1379,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</monthContext>
 					<monthContext type="stand-alone">
 						<monthWidth type="abbreviated">
-							<month type="1">ян.</month>
-							<month type="2">февр.</month>
+							<month type="1">яну</month>
+							<month type="2">фев</month>
 							<month type="3">март</month>
-							<month type="4">апр.</month>
+							<month type="4">апр</month>
 							<month type="5">май</month>
 							<month type="6">юни</month>
 							<month type="7">юли</month>
-							<month type="8">авг.</month>
-							<month type="9">септ.</month>
-							<month type="10">окт.</month>
-							<month type="11">ноем.</month>
-							<month type="12">дек.</month>
+							<month type="8">авг</month>
+							<month type="9">сеп</month>
+							<month type="10">окт</month>
+							<month type="11">ное</month>
+							<month type="12">дек</month>
 						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">я</month>
@@ -1536,15 +1544,61 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">полунощ</dayPeriod>
+							<dayPeriod type="am">пр.об.</dayPeriod>
+							<dayPeriod type="pm">сл.об.</dayPeriod>
+							<dayPeriod type="morning1">сутринта</dayPeriod>
+							<dayPeriod type="morning2">на обед</dayPeriod>
+							<dayPeriod type="afternoon1">следобед</dayPeriod>
+							<dayPeriod type="evening1">вечерта</dayPeriod>
+							<dayPeriod type="night1">през нощта</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am">пр.об.</dayPeriod>
-							<dayPeriod type="noon">пл.</dayPeriod>
 							<dayPeriod type="pm">сл.об.</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">полунощ</dayPeriod>
 							<dayPeriod type="am">пр.об.</dayPeriod>
-							<dayPeriod type="noon">пладне</dayPeriod>
 							<dayPeriod type="pm">сл.об.</dayPeriod>
+							<dayPeriod type="morning1">сутринта</dayPeriod>
+							<dayPeriod type="morning2">на обяд</dayPeriod>
+							<dayPeriod type="afternoon1">следобед</dayPeriod>
+							<dayPeriod type="evening1">вечерта</dayPeriod>
+							<dayPeriod type="night1">през нощта</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">полунощ</dayPeriod>
+							<dayPeriod type="am">пр.об.</dayPeriod>
+							<dayPeriod type="pm">сл.об.</dayPeriod>
+							<dayPeriod type="morning1">сутрин</dayPeriod>
+							<dayPeriod type="morning2">на обед</dayPeriod>
+							<dayPeriod type="afternoon1">следобед</dayPeriod>
+							<dayPeriod type="evening1">вечер</dayPeriod>
+							<dayPeriod type="night1">нощ</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">полунощ</dayPeriod>
+							<dayPeriod type="am">пр.об.</dayPeriod>
+							<dayPeriod type="pm">сл.об.</dayPeriod>
+							<dayPeriod type="morning1">сутрин</dayPeriod>
+							<dayPeriod type="morning2">на обед</dayPeriod>
+							<dayPeriod type="afternoon1">следобед</dayPeriod>
+							<dayPeriod type="evening1">вечер</dayPeriod>
+							<dayPeriod type="night1">нощ</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">полунощ</dayPeriod>
+							<dayPeriod type="am">пр.об.</dayPeriod>
+							<dayPeriod type="pm">сл.об.</dayPeriod>
+							<dayPeriod type="morning1">сутринта</dayPeriod>
+							<dayPeriod type="morning2">на обед</dayPeriod>
+							<dayPeriod type="afternoon1">следобед</dayPeriod>
+							<dayPeriod type="evening1">вечерта</dayPeriod>
+							<dayPeriod type="night1">нощ</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1561,9 +1615,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<era type="1">сл.Хр.</era>
 						<era type="1" alt="variant">сл.н.е.</era>
 					</eraAbbr>
-					<eraNarrow>
-						<era type="1" draft="contributed">сл.н.е.</era>
-					</eraNarrow>
 				</eras>
 				<dateFormats>
 					<dateFormatLength type="full">
@@ -1651,6 +1702,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">H:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d.MM</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.MM</dateFormatItem>
@@ -1879,6 +1934,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>г.</displayName>
+				<relative type="-1">мин. г.</relative>
+				<relative type="0">т. г.</relative>
+				<relative type="1">следв. г.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">сл. {0} г.</relativeTimePattern>
 					<relativeTimePattern count="other">сл. {0} г.</relativeTimePattern>
@@ -1890,6 +1948,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>г.</displayName>
+				<relative type="-1">мин. г.</relative>
+				<relative type="0">т. г.</relative>
+				<relative type="1">сл. г.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">сл. {0} г.</relativeTimePattern>
 					<relativeTimePattern count="other">сл. {0} г.</relativeTimePattern>
@@ -1901,6 +1962,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter">
 				<displayName>тримесечие</displayName>
+				<relative type="-1">миналото тримесечие</relative>
+				<relative type="0">това тримесечие</relative>
+				<relative type="1">следващото тримесечие</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">след {0} тримесечие</relativeTimePattern>
 					<relativeTimePattern count="other">след {0} тримесечия</relativeTimePattern>
@@ -1912,6 +1976,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>трим.</displayName>
+				<relative type="-1">мин. трим.</relative>
+				<relative type="0">това трим.</relative>
+				<relative type="1">следв. трим.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">сл. {0} трим.</relativeTimePattern>
 					<relativeTimePattern count="other">сл. {0} трим.</relativeTimePattern>
@@ -1923,6 +1990,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>трим.</displayName>
+				<relative type="-1">мин. трим.</relative>
+				<relative type="0">това трим.</relative>
+				<relative type="1">следв. трим.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">сл. {0} трим.</relativeTimePattern>
 					<relativeTimePattern count="other">сл. {0} трим.</relativeTimePattern>
@@ -1948,6 +2018,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>м</displayName>
+				<relative type="-1">мин. мес.</relative>
+				<relative type="0">този мес.</relative>
+				<relative type="1">следв. мес.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">сл. {0} м.</relativeTimePattern>
 					<relativeTimePattern count="other">сл. {0} м.</relativeTimePattern>
@@ -1959,6 +2032,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>м</displayName>
+				<relative type="-1">мин. м.</relative>
+				<relative type="0">т. м.</relative>
+				<relative type="1">сл. м.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">сл. {0} м.</relativeTimePattern>
 					<relativeTimePattern count="other">сл. {0} м.</relativeTimePattern>
@@ -1983,7 +2059,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="week-short">
-				<displayName>седм</displayName>
+				<displayName>седм.</displayName>
+				<relative type="-1">миналата седмица</relative>
+				<relative type="0">тази седм.</relative>
+				<relative type="1">следв. седм.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">след {0} седм.</relativeTimePattern>
 					<relativeTimePattern count="other">след {0} седм.</relativeTimePattern>
@@ -1994,7 +2073,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="week-narrow">
-				<displayName>седм</displayName>
+				<displayName>седм.</displayName>
+				<relative type="-1">мин. седм.</relative>
+				<relative type="0">тази седм.</relative>
+				<relative type="1">сл. седм.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">сл. {0} седм.</relativeTimePattern>
 					<relativeTimePattern count="other">сл. {0} седм.</relativeTimePattern>
@@ -2022,6 +2104,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>д</displayName>
+				<relative type="-2">онзи ден</relative>
+				<relative type="-1">вчера</relative>
+				<relative type="0">днес</relative>
+				<relative type="1">утре</relative>
+				<relative type="2">вдругиден</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">след {0} д</relativeTimePattern>
 					<relativeTimePattern count="other">след {0} д</relativeTimePattern>
@@ -2033,6 +2120,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>д</displayName>
+				<relative type="-2">онзи ден</relative>
+				<relative type="-1">вчера</relative>
+				<relative type="0">днес</relative>
+				<relative type="1">утре</relative>
+				<relative type="2">вдругиден</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">сл. {0} д</relativeTimePattern>
 					<relativeTimePattern count="other">сл. {0} д</relativeTimePattern>
@@ -2262,7 +2354,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<gmtFormat>Гринуич{0}</gmtFormat>
 			<gmtZeroFormat>Гринуич</gmtZeroFormat>
 			<regionFormat>{0}</regionFormat>
-			<regionFormat type="daylight">{0} – лятно часово време</regionFormat>
+			<regionFormat type="daylight">{0}, лятно часово време</regionFormat>
 			<regionFormat type="standard">{0} – стандартно време</regionFormat>
 			<fallbackFormat>{1} ({0})</fallbackFormat>
 			<zone type="Etc/Unknown">
@@ -3132,6 +3224,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Порт Морсби</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Бугенвил</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Манила</exemplarCity>
 			</zone>
@@ -3216,6 +3311,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Иркутск</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Чита</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Якутск</exemplarCity>
 			</zone>
@@ -3234,6 +3332,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Магадан</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Среднеколимск</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Камчатка</exemplarCity>
 			</zone>
@@ -4476,8 +4577,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern type="1000000" count="other">0 млн'.'</pattern>
 					<pattern type="10000000" count="one">00 млн'.'</pattern>
 					<pattern type="10000000" count="other">00 млн'.'</pattern>
-					<pattern type="100000000" count="one">000 млн'.'</pattern>
-					<pattern type="100000000" count="other">000 млн'.'</pattern>
+					<pattern type="100000000" count="one">000 млн</pattern>
+					<pattern type="100000000" count="other">000 млн</pattern>
 					<pattern type="1000000000" count="one">0 млрд'.'</pattern>
 					<pattern type="1000000000" count="other">0 млрд'.'</pattern>
 					<pattern type="10000000000" count="one">00 млрд'.'</pattern>
@@ -4516,6 +4617,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">0 хил'.' ¤</pattern>
+					<pattern type="1000" count="other">0 хил'.' ¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00 хил'.' ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00 хил'.' ¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000 хил'.' ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000 хил'.' ¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0 млн'.' ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0 млн'.' ¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00 млн'.' ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00 млн'.' ¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000 млн'.' ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000 млн'.' ¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0 млрд'.' ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0 млрд'.' ¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00 млрд'.' ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00 млрд'.' ¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000 млрд'.' ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000 млрд'.' ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0 трлн'.' ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0 трлн'.' ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00 трлн'.' ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00 трлн'.' ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000 трлн'.' ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000 трлн'.' ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4996,6 +5125,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">грузински лари</displayName>
 				<displayName count="other">грузински лари</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>Ганайско седи (1979–2007)</displayName>
@@ -5558,7 +5688,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Руска рубла</displayName>
 				<displayName count="one">руска рубла</displayName>
 				<displayName count="other">руски рубли</displayName>
-				<symbol>руб.</symbol>
+				<symbol>RUB</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>Руска рубла (1991–1998)</displayName>
@@ -5695,6 +5825,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">тайландски бат</displayName>
 				<displayName count="other">тайландски бата</displayName>
 				<symbol>THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>Таджикистанска рубла</displayName>
@@ -6008,6 +6139,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} метър за секунда на квадрат</unitPattern>
 				<unitPattern count="other">{0} метра за секунда на квадрат</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>оборот</displayName>
+				<unitPattern count="one">{0} оборот</unitPattern>
+				<unitPattern count="other">{0} оборота</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>радиани</displayName>
+				<unitPattern count="one">{0} радиан</unitPattern>
+				<unitPattern count="other">{0} радиана</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>градуси</displayName>
+				<unitPattern count="one">{0} градус</unitPattern>
+				<unitPattern count="other">{0} градуса</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>дъгови минути</displayName>
 				<unitPattern count="one">{0} дъгова минута</unitPattern>
@@ -6018,30 +6164,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} дъгова секунда</unitPattern>
 				<unitPattern count="other">{0} дъгови секунди</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>градуси</displayName>
-				<unitPattern count="one">{0} градус</unitPattern>
-				<unitPattern count="other">{0} градуса</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>радиани</displayName>
-				<unitPattern count="one">{0} радиан</unitPattern>
-				<unitPattern count="other">{0} радиана</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>акри</displayName>
-				<unitPattern count="one">{0} акър</unitPattern>
-				<unitPattern count="other">{0} акра</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>квадратни километри</displayName>
+				<unitPattern count="one">{0} квадратен километър</unitPattern>
+				<unitPattern count="other">{0} квадратни километра</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>хектари</displayName>
 				<unitPattern count="one">{0} хектар</unitPattern>
 				<unitPattern count="other">{0} хектара</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>квадратни метри</displayName>
+				<unitPattern count="one">{0} квадратен метър</unitPattern>
+				<unitPattern count="other">{0} квадратни метра</unitPattern>
+				<perUnitPattern>{0} на квадратен метър</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>квадратни сантиметри</displayName>
 				<unitPattern count="one">{0} квадратен сантиметър</unitPattern>
 				<unitPattern count="other">{0} квадратни сантиметра</unitPattern>
+				<perUnitPattern>{0} на квадратен сантиметър</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>квадратни мили</displayName>
+				<unitPattern count="one">{0} квадратна миля</unitPattern>
+				<unitPattern count="other">{0} квадратни мили</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>акри</displayName>
+				<unitPattern count="one">{0} акър</unitPattern>
+				<unitPattern count="other">{0} акра</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>квадратни ярдове</displayName>
+				<unitPattern count="one">{0} квадратен ярд</unitPattern>
+				<unitPattern count="other">{0} квадратни ярда</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>квадратни футове</displayName>
@@ -6052,91 +6210,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>квадратни инчове</displayName>
 				<unitPattern count="one">{0} квадратен инч</unitPattern>
 				<unitPattern count="other">{0} квадратни инча</unitPattern>
+				<perUnitPattern>{0} на квадратен инч</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>квадратни километри</displayName>
-				<unitPattern count="one">{0} квадратен километър</unitPattern>
-				<unitPattern count="other">{0} квадратни километра</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>квадратни метри</displayName>
-				<unitPattern count="one">{0} квадратен метър</unitPattern>
-				<unitPattern count="other">{0} квадратни метра</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>квадратни мили</displayName>
-				<unitPattern count="one">{0} квадратна миля</unitPattern>
-				<unitPattern count="other">{0} квадратни мили</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>квадратни ярдове</displayName>
-				<unitPattern count="one">{0} квадратен ярд</unitPattern>
-				<unitPattern count="other">{0} квадратни ярда</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>карати</displayName>
+				<unitPattern count="one">{0} карат</unitPattern>
+				<unitPattern count="other">{0} карата</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>литри на километър</displayName>
 				<unitPattern count="one">{0} литър на километър</unitPattern>
 				<unitPattern count="other">{0} литра на километър</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>литри на 100 километра</displayName>
+				<unitPattern count="one">{0} литър на 100 километра</unitPattern>
+				<unitPattern count="other">{0} литра на 100 километра</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>мили с един галон</displayName>
 				<unitPattern count="one">{0} миля с един галон</unitPattern>
 				<unitPattern count="other">{0} мили с един галон</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>битове</displayName>
-				<unitPattern count="one">{0} бит</unitPattern>
-				<unitPattern count="other">{0} бита</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>байтове</displayName>
-				<unitPattern count="one">{0} байт</unitPattern>
-				<unitPattern count="other">{0} байта</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>гигабити</displayName>
-				<unitPattern count="one">{0} гигабит</unitPattern>
-				<unitPattern count="other">{0} гигабита</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>гигабайти</displayName>
-				<unitPattern count="one">{0} гигабайт</unitPattern>
-				<unitPattern count="other">{0} гигабайта</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>килобитове</displayName>
-				<unitPattern count="one">{0} килобит</unitPattern>
-				<unitPattern count="other">{0} килобита</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>килобайтове</displayName>
-				<unitPattern count="one">{0} килобайт</unitPattern>
-				<unitPattern count="other">{0} килобайта</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>мегабитове</displayName>
-				<unitPattern count="one">{0} мегабит</unitPattern>
-				<unitPattern count="other">{0} мегабита</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>мегабайти</displayName>
-				<unitPattern count="one">{0} мегабайт</unitPattern>
-				<unitPattern count="other">{0} мегабайта</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>терабитове</displayName>
-				<unitPattern count="one">{0} терабит</unitPattern>
-				<unitPattern count="other">{0} терабита</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>терабайтове</displayName>
 				<unitPattern count="one">{0} терабайт</unitPattern>
 				<unitPattern count="other">{0} терабайта</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>терабитове</displayName>
+				<unitPattern count="one">{0} терабит</unitPattern>
+				<unitPattern count="other">{0} терабита</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>гигабайти</displayName>
+				<unitPattern count="one">{0} гигабайт</unitPattern>
+				<unitPattern count="other">{0} гигабайта</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>гигабити</displayName>
+				<unitPattern count="one">{0} гигабит</unitPattern>
+				<unitPattern count="other">{0} гигабита</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>мегабайти</displayName>
+				<unitPattern count="one">{0} мегабайт</unitPattern>
+				<unitPattern count="other">{0} мегабайта</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>мегабитове</displayName>
+				<unitPattern count="one">{0} мегабит</unitPattern>
+				<unitPattern count="other">{0} мегабита</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>килобайтове</displayName>
+				<unitPattern count="one">{0} килобайт</unitPattern>
+				<unitPattern count="other">{0} килобайта</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>килобитове</displayName>
+				<unitPattern count="one">{0} килобит</unitPattern>
+				<unitPattern count="other">{0} килобита</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>байтове</displayName>
+				<unitPattern count="one">{0} байт</unitPattern>
+				<unitPattern count="other">{0} байта</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>битове</displayName>
+				<unitPattern count="one">{0} бит</unitPattern>
+				<unitPattern count="other">{0} бита</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>векове</displayName>
+				<unitPattern count="one">{0} век</unitPattern>
+				<unitPattern count="other">{0} века</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>години</displayName>
+				<unitPattern count="one">{0} година</unitPattern>
+				<unitPattern count="other">{0} години</unitPattern>
+				<perUnitPattern>{0} на година</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>месеци</displayName>
+				<unitPattern count="one">{0} месец</unitPattern>
+				<unitPattern count="other">{0} месеца</unitPattern>
+				<perUnitPattern>{0} на месец</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>седмици</displayName>
+				<unitPattern count="one">{0} седмица</unitPattern>
+				<unitPattern count="other">{0} седмици</unitPattern>
+				<perUnitPattern>{0} на седмица</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>дни</displayName>
 				<unitPattern count="one">{0} ден</unitPattern>
 				<unitPattern count="other">{0} дни</unitPattern>
+				<perUnitPattern>{0} на ден</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>часове</displayName>
@@ -6144,30 +6317,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} часа</unitPattern>
 				<perUnitPattern>{0} за час</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>микросекунди</displayName>
-				<unitPattern count="one">{0} микросекунда</unitPattern>
-				<unitPattern count="other">{0} микросекунди</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>милисекунди</displayName>
-				<unitPattern count="one">{0} милисекунда</unitPattern>
-				<unitPattern count="other">{0} милисекунди</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>минути</displayName>
 				<unitPattern count="one">{0} минута</unitPattern>
 				<unitPattern count="other">{0} минути</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>месеци</displayName>
-				<unitPattern count="one">{0} месец</unitPattern>
-				<unitPattern count="other">{0} месеца</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>наносекунди</displayName>
-				<unitPattern count="one">{0} наносекунда</unitPattern>
-				<unitPattern count="other">{0} наносекунди</unitPattern>
+				<perUnitPattern>{0} на минута</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>секунди</displayName>
@@ -6175,15 +6329,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} секунди</unitPattern>
 				<perUnitPattern>{0} за секунда</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>седмици</displayName>
-				<unitPattern count="one">{0} седмица</unitPattern>
-				<unitPattern count="other">{0} седмици</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>милисекунди</displayName>
+				<unitPattern count="one">{0} милисекунда</unitPattern>
+				<unitPattern count="other">{0} милисекунди</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>години</displayName>
-				<unitPattern count="one">{0} година</unitPattern>
-				<unitPattern count="other">{0} години</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>микросекунди</displayName>
+				<unitPattern count="one">{0} микросекунда</unitPattern>
+				<unitPattern count="other">{0} микросекунди</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>наносекунди</displayName>
+				<unitPattern count="one">{0} наносекунда</unitPattern>
+				<unitPattern count="other">{0} наносекунди</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ампери</displayName>
@@ -6205,6 +6364,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} волт</unitPattern>
 				<unitPattern count="other">{0} волта</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>килокалории</displayName>
+				<unitPattern count="one">{0} килокалория</unitPattern>
+				<unitPattern count="other">{0} килокалории</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>калории</displayName>
 				<unitPattern count="one">{0} калория</unitPattern>
@@ -6215,21 +6379,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} калория</unitPattern>
 				<unitPattern count="other">{0} калории</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>джаули</displayName>
-				<unitPattern count="one">{0} джаул</unitPattern>
-				<unitPattern count="other">{0} джаула</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>килокалории</displayName>
-				<unitPattern count="one">{0} килокалория</unitPattern>
-				<unitPattern count="other">{0} килокалории</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>килоджаули</displayName>
 				<unitPattern count="one">{0} килоджаул</unitPattern>
 				<unitPattern count="other">{0} килоджаула</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>джаули</displayName>
+				<unitPattern count="one">{0} джаул</unitPattern>
+				<unitPattern count="other">{0} джаула</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>киловатчаси</displayName>
 				<unitPattern count="one">{0} киловатчас</unitPattern>
@@ -6240,36 +6399,74 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} гигахерц</unitPattern>
 				<unitPattern count="other">{0} гигахерца</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>херцове</displayName>
-				<unitPattern count="one">{0} херц</unitPattern>
-				<unitPattern count="other">{0} херца</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>мегахерци</displayName>
+				<unitPattern count="one">{0} мегахерц</unitPattern>
+				<unitPattern count="other">{0} мегахерца</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>килохерци</displayName>
 				<unitPattern count="one">{0} килохерц</unitPattern>
 				<unitPattern count="other">{0} килохерца</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>мегахерци</displayName>
-				<unitPattern count="one">{0} мегахерц</unitPattern>
-				<unitPattern count="other">{0} мегахерца</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>херцове</displayName>
+				<unitPattern count="one">{0} херц</unitPattern>
+				<unitPattern count="other">{0} херца</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>астрономически единици</displayName>
-				<unitPattern count="one">{0} астрономическа единица</unitPattern>
-				<unitPattern count="other">{0} астрономически единици</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>километри</displayName>
+				<unitPattern count="one">{0} километър</unitPattern>
+				<unitPattern count="other">{0} километра</unitPattern>
+				<perUnitPattern>{0} на километър</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>сантиметри</displayName>
-				<unitPattern count="one">{0} сантиметър</unitPattern>
-				<unitPattern count="other">{0} сантиметра</unitPattern>
+			<unit type="length-meter">
+				<displayName>метри</displayName>
+				<unitPattern count="one">{0} метър</unitPattern>
+				<unitPattern count="other">{0} метра</unitPattern>
+				<perUnitPattern>{0} на метър</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>дециметри</displayName>
 				<unitPattern count="one">{0} дециметър</unitPattern>
 				<unitPattern count="other">{0} дециметра</unitPattern>
 			</unit>
+			<unit type="length-centimeter">
+				<displayName>сантиметри</displayName>
+				<unitPattern count="one">{0} сантиметър</unitPattern>
+				<unitPattern count="other">{0} сантиметра</unitPattern>
+				<perUnitPattern>{0} на сантиметър</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>милиметри</displayName>
+				<unitPattern count="one">{0} милиметър</unitPattern>
+				<unitPattern count="other">{0} милиметра</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>микрометри</displayName>
+				<unitPattern count="one">{0} микрометър</unitPattern>
+				<unitPattern count="other">{0} микрометра</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>нанометри</displayName>
+				<unitPattern count="one">{0} нанометър</unitPattern>
+				<unitPattern count="other">{0} нанометра</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>пикометри</displayName>
+				<unitPattern count="one">{0} пикометър</unitPattern>
+				<unitPattern count="other">{0} пикометра</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>мили</displayName>
+				<unitPattern count="one">{0} миля</unitPattern>
+				<unitPattern count="other">{0} мили</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>ярдове</displayName>
+				<unitPattern count="one">{0} ярд</unitPattern>
+				<unitPattern count="other">{0} ярда</unitPattern>
+			</unit>
 			<unit type="length-foot">
 				<displayName>футове</displayName>
 				<unitPattern count="one">{0} фут</unitPattern>
@@ -6279,162 +6476,126 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>инчове</displayName>
 				<unitPattern count="one">{0} инч</unitPattern>
 				<unitPattern count="other">{0} инча</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>километри</displayName>
-				<unitPattern count="one">{0} километър</unitPattern>
-				<unitPattern count="other">{0} километра</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>светлинни години</displayName>
-				<unitPattern count="one">{0} светлинна година</unitPattern>
-				<unitPattern count="other">{0} светлинни години</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>метри</displayName>
-				<unitPattern count="one">{0} метър</unitPattern>
-				<unitPattern count="other">{0} метра</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>микрометри</displayName>
-				<unitPattern count="one">{0} микрометър</unitPattern>
-				<unitPattern count="other">{0} микрометра</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>мили</displayName>
-				<unitPattern count="one">{0} миля</unitPattern>
-				<unitPattern count="other">{0} мили</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>милиметри</displayName>
-				<unitPattern count="one">{0} милиметър</unitPattern>
-				<unitPattern count="other">{0} милиметра</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<displayName>нанометри</displayName>
-				<unitPattern count="one">{0} нанометър</unitPattern>
-				<unitPattern count="other">{0} нанометра</unitPattern>
-			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>морски мили</displayName>
-				<unitPattern count="one">{0} морска миля</unitPattern>
-				<unitPattern count="other">{0} морски мили</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
 			</unit>
 			<unit type="length-parsec">
 				<displayName>парсеци</displayName>
 				<unitPattern count="one">{0} парсек</unitPattern>
 				<unitPattern count="other">{0} парсека</unitPattern>
 			</unit>
-			<unit type="length-picometer">
-				<displayName>пикометри</displayName>
-				<unitPattern count="one">{0} пикометър</unitPattern>
-				<unitPattern count="other">{0} пикометра</unitPattern>
+			<unit type="length-light-year">
+				<displayName>светлинни години</displayName>
+				<unitPattern count="one">{0} светлинна година</unitPattern>
+				<unitPattern count="other">{0} светлинни години</unitPattern>
 			</unit>
-			<unit type="length-yard">
-				<displayName>ярдове</displayName>
-				<unitPattern count="one">{0} ярд</unitPattern>
-				<unitPattern count="other">{0} ярда</unitPattern>
+			<unit type="length-astronomical-unit">
+				<displayName>астрономически единици</displayName>
+				<unitPattern count="one">{0} астрономическа единица</unitPattern>
+				<unitPattern count="other">{0} астрономически единици</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>морски мили</displayName>
+				<unitPattern count="one">{0} морска миля</unitPattern>
+				<unitPattern count="other">{0} морски мили</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>шведска миля</displayName>
+				<unitPattern count="one">{0} шведска миля</unitPattern>
+				<unitPattern count="other">{0} шведски мили</unitPattern>
 			</unit>
 			<unit type="light-lux">
 				<displayName>луксове</displayName>
 				<unitPattern count="one">{0} лукс</unitPattern>
 				<unitPattern count="other">{0} лукса</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>карати</displayName>
-				<unitPattern count="one">{0} карат</unitPattern>
-				<unitPattern count="other">{0} карата</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>грамове</displayName>
-				<unitPattern count="one">{0} грам</unitPattern>
-				<unitPattern count="other">{0} грама</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>килограми</displayName>
-				<unitPattern count="one">{0} килограм</unitPattern>
-				<unitPattern count="other">{0} килограма</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>тонове</displayName>
 				<unitPattern count="one">{0} тон</unitPattern>
 				<unitPattern count="other">{0} тона</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>микрограмове</displayName>
-				<unitPattern count="one">{0} микрограм</unitPattern>
-				<unitPattern count="other">{0} микрограма</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>килограми</displayName>
+				<unitPattern count="one">{0} килограм</unitPattern>
+				<unitPattern count="other">{0} килограма</unitPattern>
+				<perUnitPattern>{0} на килограм</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>грамове</displayName>
+				<unitPattern count="one">{0} грам</unitPattern>
+				<unitPattern count="other">{0} грама</unitPattern>
+				<perUnitPattern>{0} на грам</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>милиграмове</displayName>
 				<unitPattern count="one">{0} милиграм</unitPattern>
 				<unitPattern count="other">{0} милиграма</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>унции</displayName>
-				<unitPattern count="one">{0} унция</unitPattern>
-				<unitPattern count="other">{0} унции</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>тройунции</displayName>
-				<unitPattern count="one">{0} тройунция</unitPattern>
-				<unitPattern count="other">{0} тройунции</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>фунтове</displayName>
-				<unitPattern count="one">{0} фунт</unitPattern>
-				<unitPattern count="other">{0} фунта</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>микрограмове</displayName>
+				<unitPattern count="one">{0} микрограм</unitPattern>
+				<unitPattern count="other">{0} микрограма</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>къси тонове</displayName>
 				<unitPattern count="one">{0} къс тон</unitPattern>
 				<unitPattern count="other">{0} къси тона</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>фунтове</displayName>
+				<unitPattern count="one">{0} фунт</unitPattern>
+				<unitPattern count="other">{0} фунта</unitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>унции</displayName>
+				<unitPattern count="one">{0} унция</unitPattern>
+				<unitPattern count="other">{0} унции</unitPattern>
+				<perUnitPattern>{0} на унция</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>тройунции</displayName>
+				<unitPattern count="one">{0} тройунция</unitPattern>
+				<unitPattern count="other">{0} тройунции</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>карати</displayName>
+				<unitPattern count="one">{0} карат</unitPattern>
+				<unitPattern count="other">{0} карата</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>гигавати</displayName>
 				<unitPattern count="one">{0} гигават</unitPattern>
 				<unitPattern count="other">{0} гигавата</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>конски сили</displayName>
-				<unitPattern count="one">{0} конска сила</unitPattern>
-				<unitPattern count="other">{0} конски сили</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>киловати</displayName>
-				<unitPattern count="one">{0} киловат</unitPattern>
-				<unitPattern count="other">{0} киловата</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>мегавати</displayName>
 				<unitPattern count="one">{0} мегават</unitPattern>
 				<unitPattern count="other">{0} мегавата</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>миливати</displayName>
-				<unitPattern count="one">{0} миливат</unitPattern>
-				<unitPattern count="other">{0} миливата</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>киловати</displayName>
+				<unitPattern count="one">{0} киловат</unitPattern>
+				<unitPattern count="other">{0} киловата</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>ватове</displayName>
 				<unitPattern count="one">{0} ват</unitPattern>
 				<unitPattern count="other">{0} вата</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>миливати</displayName>
+				<unitPattern count="one">{0} миливат</unitPattern>
+				<unitPattern count="other">{0} миливата</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>конски сили</displayName>
+				<unitPattern count="one">{0} конска сила</unitPattern>
+				<unitPattern count="other">{0} конски сили</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>хектопаскали</displayName>
 				<unitPattern count="one">{0} хектопаскал</unitPattern>
 				<unitPattern count="other">{0} хектопаскала</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>инчове живачен стълб</displayName>
-				<unitPattern count="one">{0} инч живачен стълб</unitPattern>
-				<unitPattern count="other">{0} инча живачен стълб</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>милибари</displayName>
-				<unitPattern count="one">{0} милибар</unitPattern>
-				<unitPattern count="other">{0} милибара</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>милиметри живачен стълб</displayName>
 				<unitPattern count="one">{0} мм живачен стълб</unitPattern>
@@ -6445,10 +6606,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} фунт на квадратен инч</unitPattern>
 				<unitPattern count="other">{0} фунта на квадратен инч</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>карати</displayName>
-				<unitPattern count="one">{0} карат</unitPattern>
-				<unitPattern count="other">{0} карата</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>инчове живачен стълб</displayName>
+				<unitPattern count="one">{0} инч живачен стълб</unitPattern>
+				<unitPattern count="other">{0} инча живачен стълб</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>милибари</displayName>
+				<unitPattern count="one">{0} милибар</unitPattern>
+				<unitPattern count="other">{0} милибара</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>километри в час</displayName>
@@ -6465,6 +6631,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} миля в час</unitPattern>
 				<unitPattern count="other">{0} мили в час</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>възел</displayName>
+				<unitPattern count="one">{0} възел</unitPattern>
+				<unitPattern count="other">{0} възла</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>градуси Целзий</displayName>
 				<unitPattern count="one">{0} градус Целзий</unitPattern>
@@ -6480,31 +6656,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} келвин</unitPattern>
 				<unitPattern count="other">{0} келвина</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>акър-футове</displayName>
-				<unitPattern count="one">{0} акър-фут</unitPattern>
-				<unitPattern count="other">{0} акър-фута</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>сентилитри</displayName>
-				<unitPattern count="one">{0} сентилитър</unitPattern>
-				<unitPattern count="other">{0} сентилитра</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>кубически сантиметри</displayName>
-				<unitPattern count="one">{0} кубически сантиметър</unitPattern>
-				<unitPattern count="other">{0} кубически сантиметра</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>кубически футове</displayName>
-				<unitPattern count="one">{0} кубически фут</unitPattern>
-				<unitPattern count="other">{0} кубически фута</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>кубически инчове</displayName>
-				<unitPattern count="one">{0} кубически инч</unitPattern>
-				<unitPattern count="other">{0} кубически инча</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>кубически километри</displayName>
 				<unitPattern count="one">{0} кубически километър</unitPattern>
@@ -6514,6 +6665,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>кубически метри</displayName>
 				<unitPattern count="one">{0} кубически метър</unitPattern>
 				<unitPattern count="other">{0} кубически метра</unitPattern>
+				<perUnitPattern>{0} на кубичен метър</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>кубически сантиметри</displayName>
+				<unitPattern count="one">{0} кубически сантиметър</unitPattern>
+				<unitPattern count="other">{0} кубически сантиметра</unitPattern>
+				<perUnitPattern>{0} на кубичен сантиметър</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>кубически мили</displayName>
@@ -6525,25 +6683,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} кубически ярд</unitPattern>
 				<unitPattern count="other">{0} кубически ярда</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>чаши</displayName>
-				<unitPattern count="one">{0} чаша</unitPattern>
-				<unitPattern count="other">{0} чаши</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>кубически футове</displayName>
+				<unitPattern count="one">{0} кубически фут</unitPattern>
+				<unitPattern count="other">{0} кубически фута</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>децилитри</displayName>
-				<unitPattern count="one">{0} децилитър</unitPattern>
-				<unitPattern count="other">{0} децилитра</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>кубически инчове</displayName>
+				<unitPattern count="one">{0} кубически инч</unitPattern>
+				<unitPattern count="other">{0} кубически инча</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>течни унции</displayName>
-				<unitPattern count="one">{0} течна унция</unitPattern>
-				<unitPattern count="other">{0} течни унции</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>галони</displayName>
-				<unitPattern count="one">{0} галона</unitPattern>
-				<unitPattern count="other">{0} галона</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>мегалитри</displayName>
+				<unitPattern count="one">{0} мегалитър</unitPattern>
+				<unitPattern count="other">{0} мегалитра</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>хектолитри</displayName>
@@ -6554,27 +6707,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>литри</displayName>
 				<unitPattern count="one">{0} литър</unitPattern>
 				<unitPattern count="other">{0} литра</unitPattern>
+				<perUnitPattern>{0} на литър</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>мегалитри</displayName>
-				<unitPattern count="one">{0} мегалитър</unitPattern>
-				<unitPattern count="other">{0} мегалитра</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>децилитри</displayName>
+				<unitPattern count="one">{0} децилитър</unitPattern>
+				<unitPattern count="other">{0} децилитра</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>сентилитри</displayName>
+				<unitPattern count="one">{0} сентилитър</unitPattern>
+				<unitPattern count="other">{0} сентилитра</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>милилитри</displayName>
 				<unitPattern count="one">{0} милилитър</unitPattern>
 				<unitPattern count="other">{0} милилитра</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>пинти</displayName>
-				<unitPattern count="one">{0} пинта</unitPattern>
-				<unitPattern count="other">{0} пинти</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>метрични пинти</displayName>
+				<unitPattern count="one">{0} метричен пинт</unitPattern>
+				<unitPattern count="other">{0} метрични пинта</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>метрични чаши</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} метрични чаши</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>акър-футове</displayName>
+				<unitPattern count="one">{0} акър-фут</unitPattern>
+				<unitPattern count="other">{0} акър-фута</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>галони</displayName>
+				<unitPattern count="one">{0} галона</unitPattern>
+				<unitPattern count="other">{0} галона</unitPattern>
+				<perUnitPattern>{0} на галон</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>кварти</displayName>
 				<unitPattern count="one">{0} кварта</unitPattern>
 				<unitPattern count="other">{0} кварти</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>пинти</displayName>
+				<unitPattern count="one">{0} пинта</unitPattern>
+				<unitPattern count="other">{0} пинти</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>чаши</displayName>
+				<unitPattern count="one">{0} чаша</unitPattern>
+				<unitPattern count="other">{0} чаши</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>течни унции</displayName>
+				<unitPattern count="one">{0} течна унция</unitPattern>
+				<unitPattern count="other">{0} течни унции</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>супени лъжици</displayName>
 				<unitPattern count="one">{0} супена лъжица</unitPattern>
@@ -6585,6 +6775,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} чаена лъжица</unitPattern>
 				<unitPattern count="other">{0} чаени лъжици</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}И</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}С</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}Ю</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}З</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -6600,6 +6796,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>оборот</displayName>
+				<unitPattern count="one">{0} оборот</unitPattern>
+				<unitPattern count="other">{0} оборота</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>дъгови мин.</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
@@ -6610,30 +6821,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>°</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>акри</displayName>
-				<unitPattern count="one">{0} акър</unitPattern>
-				<unitPattern count="other">{0} акра</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>хектари</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>кв. мили</displayName>
+				<unitPattern count="one">{0} кв. миля</unitPattern>
+				<unitPattern count="other">{0} кв. мили</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>акри</displayName>
+				<unitPattern count="one">{0} акър</unitPattern>
+				<unitPattern count="other">{0} акра</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>кв. ярдове</displayName>
+				<unitPattern count="one">{0} кв. ярд</unitPattern>
+				<unitPattern count="other">{0} кв. ярда</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>кв. футове</displayName>
@@ -6644,91 +6867,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>кв. инчове</displayName>
 				<unitPattern count="one">{0} кв. инч</unitPattern>
 				<unitPattern count="other">{0} кв. инча</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>кв. мили</displayName>
-				<unitPattern count="one">{0} кв. миля</unitPattern>
-				<unitPattern count="other">{0} кв. мили</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>кв. ярдове</displayName>
-				<unitPattern count="one">{0} кв. ярд</unitPattern>
-				<unitPattern count="other">{0} кв. ярда</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>К</displayName>
+				<unitPattern count="one">{0} карат</unitPattern>
+				<unitPattern count="other">{0} карата</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
 				<unitPattern count="other">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>б</displayName>
-				<unitPattern count="one">{0} б</unitPattern>
-				<unitPattern count="other">{0} б</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>B</displayName>
-				<unitPattern count="one">{0} B</unitPattern>
-				<unitPattern count="other">{0} B</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>B</displayName>
+				<unitPattern count="one">{0} B</unitPattern>
+				<unitPattern count="other">{0} B</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>б</displayName>
+				<unitPattern count="one">{0} б</unitPattern>
+				<unitPattern count="other">{0} б</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>в.</displayName>
+				<unitPattern count="one">{0} в.</unitPattern>
+				<unitPattern count="other">{0} в.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>години</displayName>
+				<unitPattern count="one">{0} г</unitPattern>
+				<unitPattern count="other">{0} г</unitPattern>
+				<perUnitPattern>{0}/год.</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>месеци</displayName>
+				<unitPattern count="one">{0} мес.</unitPattern>
+				<unitPattern count="other">{0} мес.</unitPattern>
+				<perUnitPattern>{0}/месец</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>седмици</displayName>
+				<unitPattern count="one">{0} седм.</unitPattern>
+				<unitPattern count="other">{0} седм.</unitPattern>
+				<perUnitPattern>{0}/седмица</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>дни</displayName>
 				<unitPattern count="one">{0} д</unitPattern>
 				<unitPattern count="other">{0} д</unitPattern>
+				<perUnitPattern>{0}/д</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>часове</displayName>
@@ -6736,30 +6974,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} h</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>милисекунди</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>месеци</displayName>
-				<unitPattern count="one">{0} мес.</unitPattern>
-				<unitPattern count="other">{0} мес.</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/мин</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>секунди</displayName>
@@ -6767,15 +6986,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} s</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>седмици</displayName>
-				<unitPattern count="one">{0} седм.</unitPattern>
-				<unitPattern count="other">{0} седм.</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>милисекунди</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>години</displayName>
-				<unitPattern count="one">{0} г</unitPattern>
-				<unitPattern count="other">{0} г</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>A</displayName>
@@ -6797,6 +7021,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -6807,21 +7036,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} cal</unitPattern>
 				<unitPattern count="other">{0} cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>J</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -6832,201 +7056,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>AU</displayName>
-				<unitPattern count="one">{0} AU</unitPattern>
-				<unitPattern count="other">{0} AU</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>метри</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>футове</displayName>
-				<unitPattern count="one">{0} фут</unitPattern>
-				<unitPattern count="other">{0} фута</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>инчове</displayName>
-				<unitPattern count="one">{0} инч</unitPattern>
-				<unitPattern count="other">{0} инча</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>св. г.</displayName>
-				<unitPattern count="one">{0} св.г.</unitPattern>
-				<unitPattern count="other">{0} св.г.</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>метри</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>мили</displayName>
-				<unitPattern count="one">{0} миля</unitPattern>
-				<unitPattern count="other">{0} мили</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="one">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>пикометри</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>мили</displayName>
+				<unitPattern count="one">{0} миля</unitPattern>
+				<unitPattern count="other">{0} мили</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>ярдове</displayName>
 				<unitPattern count="one">{0} ярд</unitPattern>
 				<unitPattern count="other">{0} ярда</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>футове</displayName>
+				<unitPattern count="one">{0} фут</unitPattern>
+				<unitPattern count="other">{0} фута</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>инчове</displayName>
+				<unitPattern count="one">{0} инч</unitPattern>
+				<unitPattern count="other">{0} инча</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>св. г.</displayName>
+				<unitPattern count="one">{0} св.г.</unitPattern>
+				<unitPattern count="other">{0} св.г.</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>AU</displayName>
+				<unitPattern count="one">{0} AU</unitPattern>
+				<unitPattern count="other">{0} AU</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>CD</displayName>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>т</displayName>
 				<unitPattern count="one">{0} т</unitPattern>
 				<unitPattern count="other">{0} т</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>унц.</displayName>
-				<unitPattern count="one">{0} унц.</unitPattern>
-				<unitPattern count="other">{0} унц.</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>тр. унц.</displayName>
-				<unitPattern count="one">{0} тр. унц.</unitPattern>
-				<unitPattern count="other">{0} тр. унц.</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>фунтове</displayName>
-				<unitPattern count="one">{0} фунт</unitPattern>
-				<unitPattern count="other">{0} фунта</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>къси тонове</displayName>
 				<unitPattern count="one">{0} к. т.</unitPattern>
 				<unitPattern count="other">{0} к. т.</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>фунтове</displayName>
+				<unitPattern count="one">{0} фунт</unitPattern>
+				<unitPattern count="other">{0} фунта</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>унц.</displayName>
+				<unitPattern count="one">{0} унц.</unitPattern>
+				<unitPattern count="other">{0} унц.</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>тр. унц.</displayName>
+				<unitPattern count="one">{0} тр. унц.</unitPattern>
+				<unitPattern count="other">{0} тр. унц.</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>CD</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>к. с.</displayName>
-				<unitPattern count="one">{0} к. с.</unitPattern>
-				<unitPattern count="other">{0} к. с.</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>W</displayName>
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>к. с.</displayName>
+				<unitPattern count="one">{0} к. с.</unitPattern>
+				<unitPattern count="other">{0} к. с.</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mmHg</displayName>
 				<unitPattern count="one">{0} mmHg</unitPattern>
@@ -7037,10 +7265,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>К</displayName>
-				<unitPattern count="one">{0} карат</unitPattern>
-				<unitPattern count="other">{0} карат</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -7057,6 +7290,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} миля/ч</unitPattern>
 				<unitPattern count="other">{0} мили/ч</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0} °C</unitPattern>
@@ -7072,31 +7315,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>акър-футове</displayName>
-				<unitPattern count="one">{0} акър-фут</unitPattern>
-				<unitPattern count="other">{0} акър-фута</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>куб. футове</displayName>
-				<unitPattern count="one">{0} куб. фут</unitPattern>
-				<unitPattern count="other">{0} куб. фута</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>куб. инчове</displayName>
-				<unitPattern count="one">{0} куб. инч</unitPattern>
-				<unitPattern count="other">{0} куб. инча</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -7106,6 +7324,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>куб. мили</displayName>
@@ -7117,25 +7342,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} куб. ярд</unitPattern>
 				<unitPattern count="other">{0} куб. ярда</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>чаши</displayName>
-				<unitPattern count="one">{0} чаша</unitPattern>
-				<unitPattern count="other">{0} чаши</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>куб. футове</displayName>
+				<unitPattern count="one">{0} куб. фут</unitPattern>
+				<unitPattern count="other">{0} куб. фута</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>куб. инчове</displayName>
+				<unitPattern count="one">{0} куб. инч</unitPattern>
+				<unitPattern count="other">{0} куб. инча</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>т. унц.</displayName>
-				<unitPattern count="one">{0} т. унц.</unitPattern>
-				<unitPattern count="other">{0} т. унц.</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>галони</displayName>
-				<unitPattern count="one">{0} галон</unitPattern>
-				<unitPattern count="other">{0} галона</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -7146,27 +7366,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>литри</displayName>
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="one">{0} Ml</unitPattern>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
 				<unitPattern count="one">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>пинти</displayName>
-				<unitPattern count="one">{0} пинта</unitPattern>
-				<unitPattern count="other">{0} пинти</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>акър-футове</displayName>
+				<unitPattern count="one">{0} акър-фут</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>галони</displayName>
+				<unitPattern count="one">{0} галон</unitPattern>
+				<unitPattern count="other">{0} галона</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>кварти</displayName>
 				<unitPattern count="one">{0} кварта</unitPattern>
 				<unitPattern count="other">{0} кварти</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>пинти</displayName>
+				<unitPattern count="one">{0} пинта</unitPattern>
+				<unitPattern count="other">{0} пинти</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>чаши</displayName>
+				<unitPattern count="one">{0} чаша</unitPattern>
+				<unitPattern count="other">{0} чаши</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>т. унц.</displayName>
+				<unitPattern count="one">{0} т. унц.</unitPattern>
+				<unitPattern count="other">{0} т. унц.</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>с. л.</displayName>
 				<unitPattern count="one">{0} с. л.</unitPattern>
@@ -7177,6 +7434,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ч. л.</unitPattern>
 				<unitPattern count="other">{0} ч. л.</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}И</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}С</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}Ю</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}З</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -7186,6 +7449,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} G</unitPattern>
 				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -7194,26 +7461,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} акър</unitPattern>
-				<unitPattern count="other">{0} акра</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} кв. фут</unitPattern>
-				<unitPattern count="other">{0} кв. фута</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} m²</unitPattern>
 				<unitPattern count="other">{0} m²</unitPattern>
@@ -7222,6 +7477,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} кв. миля</unitPattern>
 				<unitPattern count="other">{0} кв. мили</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} акър</unitPattern>
+				<unitPattern count="other">{0} акра</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} кв. фут</unitPattern>
+				<unitPattern count="other">{0} кв. фута</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>г</displayName>
+				<unitPattern count="one">{0} г</unitPattern>
+				<unitPattern count="other">{0} г</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>м</displayName>
+				<unitPattern count="one">{0} м</unitPattern>
+				<unitPattern count="other">{0} м</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>седм.</displayName>
+				<unitPattern count="one">{0} седм.</unitPattern>
+				<unitPattern count="other">{0} седм.</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>д</displayName>
 				<unitPattern count="one">{0} д</unitPattern>
@@ -7232,66 +7515,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} h</unitPattern>
 				<unitPattern count="other">{0} h</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>м</displayName>
-				<unitPattern count="one">{0} м</unitPattern>
-				<unitPattern count="other">{0} м</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>s</displayName>
 				<unitPattern count="one">{0} s</unitPattern>
 				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>седм.</displayName>
-				<unitPattern count="one">{0} седм.</unitPattern>
-				<unitPattern count="other">{0} седм.</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>г</displayName>
-				<unitPattern count="one">{0} г</unitPattern>
-				<unitPattern count="other">{0} г</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0} фут</unitPattern>
-				<unitPattern count="other">{0} фута</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0}&quot;</unitPattern>
-				<unitPattern count="other">{0}&quot;</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
 				<unitPattern count="one">{0} km</unitPattern>
 				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} св.г.</unitPattern>
-				<unitPattern count="other">{0} св.г.</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>m</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} миля</unitPattern>
-				<unitPattern count="other">{0} мили</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -7302,31 +7554,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} миля</unitPattern>
+				<unitPattern count="other">{0} мили</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} ярд</unitPattern>
 				<unitPattern count="other">{0} ярда</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} фут</unitPattern>
+				<unitPattern count="other">{0} фута</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0}&quot;</unitPattern>
+				<unitPattern count="other">{0}&quot;</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} св.г.</unitPattern>
+				<unitPattern count="other">{0} св.г.</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="one">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} унц.</unitPattern>
-				<unitPattern count="other">{0} унц.</unitPattern>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} фунт</unitPattern>
 				<unitPattern count="other">{0} фунта</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} к.с.</unitPattern>
-				<unitPattern count="other">{0} к.с.</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} унц.</unitPattern>
+				<unitPattern count="other">{0} унц.</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} kW</unitPattern>
@@ -7336,6 +7600,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} к.с.</unitPattern>
+				<unitPattern count="other">{0} к.с.</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
@@ -7383,6 +7651,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}И</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}С</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}Ю</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}З</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bg_BG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bg_BG.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bg_BG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bg_BG.xml
index b744c2e482e..034d2e38ead 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bg_BG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bg_BG.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="bg"/>
 		<territory type="BG"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bm.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bm.xml
similarity index 95%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bm.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bm.xml
index 32ce3f166bb..7bde755ad9a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bm.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bm.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11042 $"/>
-		<generation date="$Date: 2014-10-31 12:11:19 -0500 (Fri, 31 Oct 2014) $"/>
+		<version number="$Revision: 12128 $"/>
 		<language type="bm"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angiya</territory>
 			<territory type="AL">Alibani</territory>
 			<territory type="AM">Arimeni</territory>
-			<territory type="AN">Peyiba ka Antiyi</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Arizantin</territory>
 			<territory type="AS">Samowa amerikani</territory>
@@ -573,6 +571,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -752,3 +766,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bm_Latn_ML.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bm_ML.xml
similarity index 65%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bm_Latn_ML.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bm_ML.xml
index d93fd0014de..36ea3825b8a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bm_Latn_ML.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bm_ML.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="bm"/>
-		<script type="Latn"/>
 		<territory type="ML"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bn.xml
similarity index 90%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bn.xml
index cbc9c563acb..83468857380 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bn.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bn.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12306 $"/>
 		<language type="bn"/>
 	</identity>
 	<localeDisplayNames>
@@ -59,6 +58,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bem">বেম্বা</language>
 			<language type="bez">বেনা</language>
 			<language type="bg">বুলগেরিয়</language>
+			<language type="bgn">পশ্চিম বালোচি</language>
 			<language type="bho">ভোজপুরি</language>
 			<language type="bi">বিসলামা</language>
 			<language type="bik">বিকোল</language>
@@ -69,7 +69,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bo">তিব্বতি</language>
 			<language type="br">ব্রেটন</language>
 			<language type="bra">ব্রাজ</language>
-			<language type="brx">বড়ো</language>
+			<language type="brx">বোড়ো</language>
 			<language type="bs">বসনীয়ান</language>
 			<language type="bua">বুরিয়াত</language>
 			<language type="bug" draft="contributed">বুগিনি</language>
@@ -99,22 +99,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="cs">চেক</language>
 			<language type="csb">কাশুবিয়ান</language>
 			<language type="cu">চার্চ স্লাভিক</language>
-			<language type="cv" draft="contributed">চুবাস</language>
+			<language type="cv">চুবাস</language>
 			<language type="cy">ওয়েলশ</language>
 			<language type="da">ডেনিশ</language>
 			<language type="dak">ডাকোটা</language>
 			<language type="dar">দার্গওয়া</language>
 			<language type="dav">তাইতা</language>
 			<language type="de">জার্মান</language>
-			<language type="de_AT">অস্ট্রিয়ান জারমান</language>
-			<language type="de_CH">সুইস উচ্চ জার্মানি</language>
+			<language type="de_AT">অস্ট্রিয়ান জার্মান</language>
+			<language type="de_CH">সুইস হাই জার্মান</language>
 			<language type="del" draft="contributed">ডেলাওয়ের</language>
 			<language type="den">স্ল্যাভ</language>
 			<language type="dgr">দোগ্রীব</language>
 			<language type="din" draft="contributed">ডিংকা</language>
 			<language type="dje">জার্মা</language>
 			<language type="doi">ডোগরি</language>
-			<language type="dsb" draft="contributed">নিম্নতর সোর্বিয়ান</language>
+			<language type="dsb">নিম্নতর সোর্বিয়ান</language>
 			<language type="dua">দুয়ালা</language>
 			<language type="dum">মধ্য ডাচ</language>
 			<language type="dv">দিবেহি</language>
@@ -122,7 +122,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="dyu">ডিউলা</language>
 			<language type="dz">জোঙ্গা</language>
 			<language type="ebu">এম্বু</language>
-			<language type="ee">এয়ে</language>
+			<language type="ee">ইউয়ি</language>
 			<language type="efi">এফিক</language>
 			<language type="egy">প্রাচীন মিশরীয়</language>
 			<language type="eka" draft="contributed">ইকাজুক</language>
@@ -150,18 +150,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ff" draft="contributed">ফুলাহ্</language>
 			<language type="fi">ফিনিশ</language>
 			<language type="fil">ফিলিপিনো</language>
-			<language type="fj">ফিজিও</language>
-			<language type="fo">ফেরাউনি</language>
+			<language type="fj">ফিজিআন</language>
+			<language type="fo">ফারোস</language>
 			<language type="fon" draft="contributed">ফন</language>
 			<language type="fr">ফরাসি</language>
-			<language type="fr_CA">ক্যানাডিয়ান ফরাসী</language>
+			<language type="fr_CA">কানাডীয় ফরাসি</language>
 			<language type="fr_CH">সুইস ফরাসি</language>
 			<language type="frm">মধ্য ফরাসি</language>
 			<language type="fro">প্রাচীন ফরাসি</language>
 			<language type="frr">উত্তরাঞ্চলীয় ফ্রিসিয়ান</language>
 			<language type="frs" draft="contributed">পূর্ব ফ্রিসিয়</language>
 			<language type="fur">ফ্রিউলিয়ান</language>
-			<language type="fy">পশ্চিম ফ্রিসিয়</language>
+			<language type="fy">পশ্চিম ফ্রিসিআন</language>
 			<language type="ga">আইরিশ</language>
 			<language type="gaa">গা</language>
 			<language type="gag">গাগাউজ</language>
@@ -219,7 +219,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="jmc">মাকামে</language>
 			<language type="jpr">জুদেও ফার্সি</language>
 			<language type="jrb">জুদেও আরবি</language>
-			<language type="jv">জাভানি</language>
+			<language type="jv">জাভানিজ</language>
 			<language type="ka">জর্জিয়ান</language>
 			<language type="kaa">কারা-কাল্পাক</language>
 			<language type="kab">কাবাইলে</language>
@@ -236,7 +236,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="kha">খাশি</language>
 			<language type="kho">খোটানিজ</language>
 			<language type="khq">কোয়রা চীনি</language>
-			<language type="ki">কিকু্ইয়ু</language>
+			<language type="ki">কিকুয়ু</language>
 			<language type="kj">কোয়ানিয়ামা</language>
 			<language type="kk">কাজাখ</language>
 			<language type="kl">ক্যালাল্লিসুট</language>
@@ -256,7 +256,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ks">কাশ্মীরী</language>
 			<language type="ksb">শাম্বালা</language>
 			<language type="ksf">বাফিয়া</language>
-			<language type="ku">কুর্দি</language>
+			<language type="ku">কুর্দিশ</language>
 			<language type="kum">কুমিক</language>
 			<language type="kut">কুটেনাই</language>
 			<language type="kv">কোমি</language>
@@ -276,6 +276,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">লাও</language>
 			<language type="lol">মোঙ্গো</language>
 			<language type="loz">লোজি</language>
+			<language type="lrc">উত্তর লুরি</language>
 			<language type="lt">লিথুয়েনীয়</language>
 			<language type="lu">লুবা-কাটাঙ্গা</language>
 			<language type="lua">লুবা-লুলুয়া</language>
@@ -321,12 +322,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mwr" draft="contributed">মারোয়ারি</language>
 			<language type="my">বর্মি</language>
 			<language type="myv" draft="contributed">এরজিয়া</language>
+			<language type="mzn">মাজানদেরানি</language>
 			<language type="na">নাউরু</language>
 			<language type="nap">নেয়াপোলিটান</language>
 			<language type="naq">নামা</language>
 			<language type="nb">নরওয়েজিয়ান বোকমাল</language>
 			<language type="nd">উত্তর এন্দেবিলি</language>
-			<language type="nds" draft="contributed">নিম্ন জার্মানি</language>
+			<language type="nds">নিম্ন জার্মানি</language>
+			<language type="nds_NL">লো স্যাক্সন</language>
 			<language type="ne">নেপালী</language>
 			<language type="new">নেওয়ারি</language>
 			<language type="ng" draft="contributed">এন্দোঙ্গা</language>
@@ -402,6 +405,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">সিসিলিয়ান</language>
 			<language type="sco">স্কটস</language>
 			<language type="sd">সিন্ধি</language>
+			<language type="sdh">দক্ষিণ কুর্দিশ</language>
 			<language type="se">উত্তরাঞ্চলীয় সামি</language>
 			<language type="seh">সেনা</language>
 			<language type="sel">সেল্কুপ</language>
@@ -430,14 +434,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="srr">সেরের</language>
 			<language type="ss">সোয়াতি</language>
 			<language type="st" draft="contributed">দক্ষিন সোথো</language>
-			<language type="su">সুদানী</language>
+			<language type="su">সুন্দানী</language>
 			<language type="suk">সুকুমা</language>
 			<language type="sus">সুসু</language>
 			<language type="sux">সুমেরীয়</language>
 			<language type="sv">সুইডিশ</language>
 			<language type="sw">সোয়াহিলি</language>
+			<language type="sw_CD">কঙ্গো সোয়াহিলি</language>
 			<language type="swb" draft="provisional">কমোরিয়ান</language>
-			<language type="swc">কঙ্গো সোয়াহিলি</language>
 			<language type="syc">প্রাচীন সিরিও</language>
 			<language type="syr">সিরিয়াক</language>
 			<language type="ta">তামিল</language>
@@ -490,6 +494,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">ওয়ালামো</language>
 			<language type="war">ওয়ারে</language>
 			<language type="was">ওয়াশো</language>
+			<language type="wbp">ওয়ার্লপিরি</language>
 			<language type="wo">উওলোফ</language>
 			<language type="xal">কাল্মইক</language>
 			<language type="xh">জোসা</language>
@@ -658,7 +663,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="014">পূর্ব আফ্রিকা</territory>
 			<territory type="015">উত্তর আফ্রিকা</territory>
 			<territory type="017">মধ্য আফ্রিকা</territory>
-			<territory type="018">দক্ষিণাঞ্চলীয় আফ্রিকা</territory>
+			<territory type="018">দক্ষিন আফ্রিকা</territory>
 			<territory type="019">আমেরিকাস</territory>
 			<territory type="021">উত্তরাঞ্চলীয় আমেরিকা</territory>
 			<territory type="029">ক্যারাবিয়ান</territory>
@@ -686,7 +691,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">এ্যাঙ্গুইলা</territory>
 			<territory type="AL">আলব্যানিয়া</territory>
 			<territory type="AM">আর্মেনিয়া</territory>
-			<territory type="AN">নেদারল্যান্ডস এ্যান্টিলিস</territory>
 			<territory type="AO">অ্যাঙ্গোলা</territory>
 			<territory type="AQ">অ্যান্টার্কটিকা</territory>
 			<territory type="AR">আর্জেন্টিনা</territory>
@@ -726,6 +730,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CG" alt="variant">কঙ্গো (প্রজাতন্ত্র)</territory>
 			<territory type="CH">সুইজারল্যান্ড</territory>
 			<territory type="CI">আইভরি কোস্ট</territory>
+			<territory type="CI" alt="variant" draft="provisional">CI</territory>
 			<territory type="CK">কুক দ্বীপপুঞ্জ</territory>
 			<territory type="CL">চিলি</territory>
 			<territory type="CM">ক্যামেরুন</territory>
@@ -792,7 +797,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="IC">ক্যানারি দ্বীপপুঞ্জ</territory>
 			<territory type="ID">ইন্দোনেশিয়া</territory>
 			<territory type="IE">আয়ারল্যান্ড</territory>
-			<territory type="IL">ইস্রায়েল</territory>
+			<territory type="IL">ইজরায়েল</territory>
 			<territory type="IM">আইল অফ ম্যান</territory>
 			<territory type="IN">ভারত</territory>
 			<territory type="IO">ব্রিটিশ ভারত মহাসাগরীয় অঞ্চল</territory>
@@ -814,7 +819,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="KR">দক্ষিণ কোরিয়া</territory>
 			<territory type="KW">কুয়েত</territory>
 			<territory type="KY">কেম্যান দ্বীপপুঞ্জ</territory>
-			<territory type="KZ">কাজাকস্থান</territory>
+			<territory type="KZ">কাজাখস্তান</territory>
 			<territory type="LA">লাওস</territory>
 			<territory type="LB">লেবানন</territory>
 			<territory type="LC">সেন্ট লুসিয়া</territory>
@@ -965,102 +970,115 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">সংখ্যাসূচক বাছাইকরণ</key>
 			<key type="colStrength" draft="contributed">বাছাইকরণ শক্তি</key>
 			<key type="currency">মুদ্রা</key>
-			<key type="numbers">সংখ্যাসমূহ</key>
+			<key type="hc" draft="provisional">hc</key>
+			<key type="lb" draft="provisional">lb</key>
+			<key type="ms" draft="provisional">ms</key>
+			<key type="numbers">সংখ্যাগুলি</key>
 			<key type="timezone">সময় জোন</key>
 			<key type="va" draft="contributed">স্থানীয় ভিন্নতা</key>
 			<key type="variableTop" draft="contributed">প্রতীক হিসেবে বাছাই করুন</key>
 			<key type="x" draft="contributed">বক্তিগত- ব্যবহার</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">আরবি-ভারতীয় সংখ্যা</type>
-			<type type="arabext" key="numbers">প্রসারিত আরবি -ভারতীয় সংখ্যা</type>
-			<type type="armn" key="numbers">আর্মেনীয় সংখ্যা</type>
-			<type type="armnlow" key="numbers">আর্মেনীয় ছোটহাতের সংখ্যা</type>
-			<type type="beng" key="numbers">বাংলা সংখ্যা</type>
-			<type type="big5han" key="collation">প্রথাগত চীনা সজ্জাক্রম - বিগ৫</type>
-			<type type="buddhist" key="calendar">বৌদ্ধ বর্ষপঞ্জী</type>
-			<type type="chinese" key="calendar">চীনা বর্ষপঞ্জী</type>
-			<type type="coptic" key="calendar" draft="contributed">কপটিক ক্যালেন্ডার</type>
-			<type type="dangi" key="calendar">দাঙ্গী বর্ষপঞ্জী</type>
-			<type type="deva" key="numbers">দেবনাগরি সংখ্যা</type>
-			<type type="dictionary" key="collation" draft="contributed">অভিধান বাছাই বিন্যাস</type>
-			<type type="ducet" key="collation">ডিফল্ট ইউনিকোড বাছাই বিন্যাস</type>
-			<type type="ethi" key="numbers">ইথীয়োপিক সংখ্যা</type>
-			<type type="ethiopic" key="calendar">ইথিওপিক ক্যালেন্ডার</type>
-			<type type="ethiopic-amete-alem" key="calendar" draft="contributed">ইথিওপিও আমেতে আলেম ক্যালেন্ডার</type>
-			<type type="finance" key="numbers" draft="contributed">অর্থনৈতিক সংখ্যাসূচক</type>
-			<type type="fullwide" key="numbers">পূর্ণ চওড়া সংখ্যা</type>
-			<type type="gb2312han" key="collation">সাধারণ চীনা সজ্জাক্রম - জিবি২৩১২</type>
-			<type type="geor" key="numbers">জর্জিয়ান সংখ্যা</type>
-			<type type="gregorian" key="calendar">গ্রিগোরিয়ান বর্ষপঞ্জী</type>
-			<type type="grek" key="numbers">গ্রিক সংখ্যা</type>
-			<type type="greklow" key="numbers">গ্রীক ছোট হাতের সংখ্যা</type>
-			<type type="gujr" key="numbers">গুজরাতি শংখ্যা</type>
-			<type type="guru" key="numbers">গুরুমুখি সংখ্যা</type>
-			<type type="hanidec" key="numbers">চৈনিক দশমিক সংখ্যা</type>
-			<type type="hans" key="numbers">সরলিকৃত চৈনিক সংখ্যা</type>
-			<type type="hansfin" key="numbers">সরলিকৃত চৈনিক আর্থিক সংখ্যা</type>
-			<type type="hant" key="numbers">ঐতিহ্যাবাহী চৈনিক সংখ্যা</type>
-			<type type="hantfin" key="numbers">ঐতিহ্যবাহী চৈনিক আর্থিক সংখ্যা</type>
-			<type type="hebr" key="numbers">হিব্রু সংখ্যা</type>
-			<type type="hebrew" key="calendar">হিব্রু বর্ষপঞ্জী</type>
-			<type type="identical" key="colStrength" draft="contributed">সমস্ত বাছাই করুন</type>
-			<type type="indian" key="calendar">ভারতীয় জাতীয় বর্ষপঞ্জী</type>
-			<type type="islamic" key="calendar">ইসলামিক বর্ষপঞ্জী</type>
-			<type type="islamic-civil" key="calendar">ইসলামিক-সিভিল বর্ষপঞ্জী</type>
-			<type type="iso8601" key="calendar">ISO-8601 বর্ষপঞ্জী</type>
-			<type type="japanese" key="calendar">জাপানি বর্ষপঞ্জী</type>
-			<type type="jpan" key="numbers">জাপানি সংখ্যা</type>
-			<type type="jpanfin" key="numbers">জাপানি আর্থিক সংখ্যা</type>
-			<type type="khmr" key="numbers">খেমের সংখ্যা</type>
-			<type type="knda" key="numbers">কান্নাডা শংখ্যা</type>
-			<type type="laoo" key="numbers">লাও সংখ্যা</type>
-			<type type="latn" key="numbers">ওয়েস্টার্ন ডিজিট</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">প্রথমে ছোট হাতের অক্ষর বাছাই করুন</type>
-			<type type="mlym" key="numbers">মালয়ালম শংখ্যা</type>
-			<type type="mong" key="numbers" draft="contributed">মঙ্গোলীয় সংখ্যা</type>
-			<type type="mymr" key="numbers">মায়ানমার সংখ্যা</type>
-			<type type="native" key="numbers">স্থানীয় সংখ্যা</type>
-			<type type="no" key="colBackwards" draft="contributed">স্বরাঘাত সাধারণতভাবে বাছাই করুন</type>
-			<type type="no" key="colCaseFirst" draft="contributed">সাধারন কেস ক্রম বাছাই করুন</type>
-			<type type="no" key="colCaseLevel" draft="contributed">কেস অসংবেদী বাছাই করুন</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">কানা আলাদাভাবে বাছাই করুন</type>
-			<type type="no" key="colNormalization" draft="contributed">স্বাভাবিক ছাড়া বাছাই করুন</type>
-			<type type="no" key="colNumeric" draft="contributed">সংখ্যা পৃথকভাবে বাছাই করুন</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">প্রতীক বাছাই করুন</type>
-			<type type="orya" key="numbers">ওড়িয়া শংখ্যা</type>
-			<type type="persian" key="calendar">ফারসি ক্যালেন্ডার</type>
-			<type type="phonebook" key="collation">ফোনবুক সজ্জাক্রম</type>
-			<type type="phonetic" key="collation" draft="contributed">ধ্বনি নির্দেশক বাছাই ক্রম</type>
-			<type type="pinyin" key="collation" draft="contributed">পিনিন সজ্জাক্রম</type>
-			<type type="primary" key="colStrength">কেবল বুনিয়াদি বর্ণ বাছাই করুন</type>
-			<type type="quaternary" key="colStrength" draft="contributed">স্বরাঘাত/কেস/প্রস্থ/কানা বাছাই করুন</type>
-			<type type="reformed" key="collation" draft="contributed">রিফর্মড বাছাই বিন্যাস</type>
-			<type type="roc" key="calendar">মিঙ্গুও বর্ষপঞ্জী</type>
-			<type type="roman" key="numbers">রোমান সংখ্যা</type>
-			<type type="romanlow" key="numbers">রোমান ছোটহাতের সংখ্যা</type>
-			<type type="search" key="collation">সাধারণ-উদ্দেশ্যে অনুসন্ধান</type>
-			<type type="searchjl" key="collation" draft="contributed">হাঙ্গুল প্রাথমিক ব্যঞ্জনবর্ণ দ্বারা অনুসন্ধান করুন</type>
-			<type type="secondary" key="colStrength" draft="contributed">স্বরাঘাত বাছাই করুন</type>
-			<type type="shifted" key="colAlternate" draft="contributed">উপেক্ষা প্রতীক বাছাই করুন</type>
-			<type type="standard" key="collation">আদর্শ বাছাই বিন্যাস</type>
-			<type type="stroke" key="collation" draft="contributed">আবর্তিত সজ্জাক্রম</type>
-			<type type="taml" key="numbers">ঐতিহ্যবাহী তামিল সংখ্যা</type>
-			<type type="tamldec" key="numbers">তামিল সংখ্যা</type>
-			<type type="telu" key="numbers">তেলুগু সংখ্যা</type>
-			<type type="tertiary" key="colStrength" draft="contributed">স্বরাঘাত/কেস/প্রস্থ বাছাই করুন</type>
-			<type type="thai" key="numbers">থাই সংখ্যা</type>
-			<type type="tibt" key="numbers">তিব্বতি সংখ্যা</type>
-			<type type="traditional" key="collation">প্রথাগত সজ্জাক্রম</type>
-			<type type="traditional" key="numbers" draft="contributed">ঐতিহ্যগত সংখ্যাসূচক</type>
-			<type type="unihan" key="collation" draft="contributed">রাডিকেল স্ট্রোক বাছাই বিন্যাস</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">প্রথমে বড়হাতের অক্ষর বাছাই করুন</type>
-			<type type="vaii" key="numbers" draft="contributed">ভাই সংখ্যা</type>
-			<type type="yes" key="colBackwards" draft="contributed">স্বরাঘাত বিপরীত বাছাই করুন</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">কেস সংবেদী বাছাই করুন</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">কানা ভিন্নভাবে বাছাই করুন</type>
-			<type type="yes" key="colNormalization" draft="contributed">স্বাভাবিকৃত ইউনিকোড বাছাই করুন</type>
-			<type type="yes" key="colNumeric" draft="contributed">সংখ্যা সংখ্যাসূচকভাবে বাছাই করুন</type>
+			<type key="calendar" type="buddhist">বৌদ্ধ বর্ষপঞ্জী</type>
+			<type key="calendar" type="chinese">চীনা বর্ষপঞ্জী</type>
+			<type key="calendar" type="coptic" draft="contributed">কপটিক ক্যালেন্ডার</type>
+			<type key="calendar" type="dangi">দাঙ্গী বর্ষপঞ্জী</type>
+			<type key="calendar" type="ethiopic">ইথিওপিক ক্যালেন্ডার</type>
+			<type key="calendar" type="ethiopic-amete-alem" draft="contributed">ইথিওপিও আমেতে আলেম ক্যালেন্ডার</type>
+			<type key="calendar" type="gregorian">গ্রিগোরিয়ান বর্ষপঞ্জী</type>
+			<type key="calendar" type="hebrew">হিব্রু বর্ষপঞ্জী</type>
+			<type key="calendar" type="indian">ভারতীয় জাতীয় বর্ষপঞ্জী</type>
+			<type key="calendar" type="islamic">ইসলামিক বর্ষপঞ্জী</type>
+			<type key="calendar" type="islamic-civil">ইসলামিক-সিভিল বর্ষপঞ্জী</type>
+			<type key="calendar" type="iso8601">ISO-8601 বর্ষপঞ্জী</type>
+			<type key="calendar" type="japanese">জাপানি বর্ষপঞ্জী</type>
+			<type key="calendar" type="persian">ফারসি ক্যালেন্ডার</type>
+			<type key="calendar" type="roc">মিঙ্গুও বর্ষপঞ্জী</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">প্রতীক বাছাই করুন</type>
+			<type key="colAlternate" type="shifted" draft="contributed">উপেক্ষা প্রতীক বাছাই করুন</type>
+			<type key="colBackwards" type="no" draft="contributed">স্বরাঘাত সাধারণতভাবে বাছাই করুন</type>
+			<type key="colBackwards" type="yes" draft="contributed">স্বরাঘাত বিপরীত বাছাই করুন</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">প্রথমে ছোট হাতের অক্ষর বাছাই করুন</type>
+			<type key="colCaseFirst" type="no" draft="contributed">সাধারন কেস ক্রম বাছাই করুন</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">প্রথমে বড়হাতের অক্ষর বাছাই করুন</type>
+			<type key="colCaseLevel" type="no" draft="contributed">কেস অসংবেদী বাছাই করুন</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">কেস সংবেদী বাছাই করুন</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">কানা আলাদাভাবে বাছাই করুন</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">কানা ভিন্নভাবে বাছাই করুন</type>
+			<type key="collation" type="big5han">প্রথাগত চীনা সজ্জাক্রম - বিগ৫</type>
+			<type key="collation" type="dictionary" draft="contributed">অভিধান বাছাই বিন্যাস</type>
+			<type key="collation" type="ducet">ডিফল্ট ইউনিকোড বাছাই বিন্যাস</type>
+			<type key="collation" type="gb2312han">সাধারণ চীনা সজ্জাক্রম - জিবি২৩১২</type>
+			<type key="collation" type="phonebook">ফোনবুক সজ্জাক্রম</type>
+			<type key="collation" type="phonetic" draft="contributed">ধ্বনি নির্দেশক বাছাই ক্রম</type>
+			<type key="collation" type="pinyin" draft="contributed">পিনিন সজ্জাক্রম</type>
+			<type key="collation" type="reformed" draft="contributed">রিফর্মড বাছাই বিন্যাস</type>
+			<type key="collation" type="search">সাধারণ-উদ্দেশ্যে অনুসন্ধান</type>
+			<type key="collation" type="searchjl" draft="contributed">হাঙ্গুল প্রাথমিক ব্যঞ্জনবর্ণ দ্বারা অনুসন্ধান করুন</type>
+			<type key="collation" type="standard">আদর্শ বাছাই বিন্যাস</type>
+			<type key="collation" type="stroke" draft="contributed">আবর্তিত সজ্জাক্রম</type>
+			<type key="collation" type="traditional">প্রথাগত সজ্জাক্রম</type>
+			<type key="collation" type="unihan" draft="contributed">রাডিকেল স্ট্রোক বাছাই বিন্যাস</type>
+			<type key="colNormalization" type="no" draft="contributed">স্বাভাবিক ছাড়া বাছাই করুন</type>
+			<type key="colNormalization" type="yes" draft="contributed">স্বাভাবিকৃত ইউনিকোড বাছাই করুন</type>
+			<type key="colNumeric" type="no" draft="contributed">সংখ্যা পৃথকভাবে বাছাই করুন</type>
+			<type key="colNumeric" type="yes" draft="contributed">সংখ্যা সংখ্যাসূচকভাবে বাছাই করুন</type>
+			<type key="colStrength" type="identical" draft="contributed">সমস্ত বাছাই করুন</type>
+			<type key="colStrength" type="primary">কেবল বুনিয়াদি বর্ণ বাছাই করুন</type>
+			<type key="colStrength" type="quaternary" draft="contributed">স্বরাঘাত/কেস/প্রস্থ/কানা বাছাই করুন</type>
+			<type key="colStrength" type="secondary" draft="contributed">স্বরাঘাত বাছাই করুন</type>
+			<type key="colStrength" type="tertiary" draft="contributed">স্বরাঘাত/কেস/প্রস্থ বাছাই করুন</type>
+			<type key="hc" type="h11" draft="provisional">12 ঘণ্টার হিসাবে (0–11)</type>
+			<type key="hc" type="h12" draft="provisional">12 ঘণ্টার হিসাবে (1–12)</type>
+			<type key="hc" type="h23" draft="provisional">24 ঘণ্টার হিসাবে (0–23)</type>
+			<type key="hc" type="h24" draft="provisional">24 ঘণ্টার হিসাবে (1–24)</type>
+			<type key="lb" type="loose" draft="provisional">loose</type>
+			<type key="lb" type="normal" draft="provisional">normal</type>
+			<type key="lb" type="strict" draft="provisional">strict</type>
+			<type key="ms" type="metric" draft="provisional">metric</type>
+			<type key="ms" type="uksystem" draft="provisional">uksystem</type>
+			<type key="ms" type="ussystem" draft="provisional">ussystem</type>
+			<type key="numbers" type="arab">আরবি-ভারতীয় সংখ্যা</type>
+			<type key="numbers" type="arabext">প্রসারিত আরবি -ভারতীয় সংখ্যা</type>
+			<type key="numbers" type="armn">আর্মেনীয় সংখ্যা</type>
+			<type key="numbers" type="armnlow">আর্মেনীয় ছোটহাতের সংখ্যা</type>
+			<type key="numbers" type="beng">বাংলা সংখ্যা</type>
+			<type key="numbers" type="deva">দেবনাগরি সংখ্যা</type>
+			<type key="numbers" type="ethi">ইথীয়োপিক সংখ্যা</type>
+			<type key="numbers" type="finance" draft="contributed">অর্থনৈতিক সংখ্যাসূচক</type>
+			<type key="numbers" type="fullwide">পূর্ণ চওড়া সংখ্যা</type>
+			<type key="numbers" type="geor">জর্জিয়ান সংখ্যা</type>
+			<type key="numbers" type="grek">গ্রিক সংখ্যা</type>
+			<type key="numbers" type="greklow">গ্রীক ছোট হাতের সংখ্যা</type>
+			<type key="numbers" type="gujr">গুজরাতি শংখ্যা</type>
+			<type key="numbers" type="guru">গুরুমুখি সংখ্যা</type>
+			<type key="numbers" type="hanidec">চৈনিক দশমিক সংখ্যা</type>
+			<type key="numbers" type="hans">সরলিকৃত চৈনিক সংখ্যা</type>
+			<type key="numbers" type="hansfin">সরলিকৃত চৈনিক আর্থিক সংখ্যা</type>
+			<type key="numbers" type="hant">ঐতিহ্যাবাহী চৈনিক সংখ্যা</type>
+			<type key="numbers" type="hantfin">ঐতিহ্যবাহী চৈনিক আর্থিক সংখ্যা</type>
+			<type key="numbers" type="hebr">হিব্রু সংখ্যা</type>
+			<type key="numbers" type="jpan">জাপানি সংখ্যা</type>
+			<type key="numbers" type="jpanfin">জাপানি আর্থিক সংখ্যা</type>
+			<type key="numbers" type="khmr">খেমের সংখ্যা</type>
+			<type key="numbers" type="knda">কান্নাডা শংখ্যা</type>
+			<type key="numbers" type="laoo">লাও সংখ্যা</type>
+			<type key="numbers" type="latn">ওয়েস্টার্ন ডিজিট</type>
+			<type key="numbers" type="mlym">মালয়ালম শংখ্যা</type>
+			<type key="numbers" type="mong" draft="contributed">মঙ্গোলীয় সংখ্যা</type>
+			<type key="numbers" type="mymr">মায়ানমার সংখ্যা</type>
+			<type key="numbers" type="native">স্থানীয় সংখ্যা</type>
+			<type key="numbers" type="orya">ওড়িয়া শংখ্যা</type>
+			<type key="numbers" type="roman">রোমান সংখ্যা</type>
+			<type key="numbers" type="romanlow">রোমান ছোটহাতের সংখ্যা</type>
+			<type key="numbers" type="taml">ঐতিহ্যবাহী তামিল সংখ্যা</type>
+			<type key="numbers" type="tamldec">তামিল সংখ্যা</type>
+			<type key="numbers" type="telu">তেলুগু সংখ্যা</type>
+			<type key="numbers" type="thai">থাই সংখ্যা</type>
+			<type key="numbers" type="tibt">তিব্বতি সংখ্যা</type>
+			<type key="numbers" type="traditional" draft="contributed">ঐতিহ্যগত সংখ্যাসূচক</type>
+			<type key="numbers" type="vaii" draft="contributed">ভাই সংখ্যা</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">BGN</transformName>
@@ -1151,6 +1169,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -1467,8 +1486,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</quarterWidth>
 						<quarterWidth type="wide">
 							<quarter type="1">ত্রৈমাসিক</quarter>
-							<quarter type="2">ষাণ্মাসিক</quarter>
-							<quarter type="3">তৃতীয় চতুর্থাংশ</quarter>
+							<quarter type="2">দ্বিতীয় ত্রৈমাসিক</quarter>
+							<quarter type="3">তৃতীয় ত্রৈমাসিক</quarter>
 							<quarter type="4">চতুর্থ ত্রৈমাসিক</quarter>
 						</quarterWidth>
 					</quarterContext>
@@ -1487,23 +1506,75 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</quarterWidth>
 						<quarterWidth type="wide">
 							<quarter type="1">ত্রৈমাসিক</quarter>
-							<quarter type="2">ষাণ্মাসিক</quarter>
-							<quarter type="3">তৃতীয় চতুর্থাংশ</quarter>
+							<quarter type="2">দ্বিতীয় ত্রৈমাসিক</quarter>
+							<quarter type="3">তৃতীয় ত্রৈমাসিক</quarter>
 							<quarter type="4">চতুর্থ ত্রৈমাসিক</quarter>
 						</quarterWidth>
 					</quarterContext>
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">ভোর</dayPeriod>
+							<dayPeriod type="morning2">সকাল</dayPeriod>
+							<dayPeriod type="afternoon1">দুপুর</dayPeriod>
+							<dayPeriod type="afternoon2">বিকাল</dayPeriod>
+							<dayPeriod type="evening1">সন্ধ্যা</dayPeriod>
+							<dayPeriod type="night1">রাত্রি</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">পূর্বাহ্ণ</dayPeriod>
-							<dayPeriod type="noon">দুপুর</dayPeriod>
-							<dayPeriod type="pm">অপরাহ্ণ</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">ভোর</dayPeriod>
+							<dayPeriod type="morning2">সকাল</dayPeriod>
+							<dayPeriod type="afternoon1">দুপুর</dayPeriod>
+							<dayPeriod type="afternoon2">বিকাল</dayPeriod>
+							<dayPeriod type="evening1">সন্ধ্যা</dayPeriod>
+							<dayPeriod type="night1">রাত্রি</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">পূর্বাহ্ণ</dayPeriod>
-							<dayPeriod type="noon">দুপুর</dayPeriod>
 							<dayPeriod type="pm">অপরাহ্ণ</dayPeriod>
+							<dayPeriod type="morning1">ভোর</dayPeriod>
+							<dayPeriod type="morning2">সকাল</dayPeriod>
+							<dayPeriod type="afternoon1">দুপুর</dayPeriod>
+							<dayPeriod type="afternoon2">বিকাল</dayPeriod>
+							<dayPeriod type="evening1">সন্ধ্যা</dayPeriod>
+							<dayPeriod type="night1">রাত্রি</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">ভোর</dayPeriod>
+							<dayPeriod type="morning2">সকাল</dayPeriod>
+							<dayPeriod type="afternoon1">দুপুর</dayPeriod>
+							<dayPeriod type="afternoon2">বিকাল</dayPeriod>
+							<dayPeriod type="evening1">সন্ধ্যা</dayPeriod>
+							<dayPeriod type="night1">রাত্রি</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">ভোর</dayPeriod>
+							<dayPeriod type="morning2">সকাল</dayPeriod>
+							<dayPeriod type="afternoon1">দুপুর</dayPeriod>
+							<dayPeriod type="afternoon2">বিকাল</dayPeriod>
+							<dayPeriod type="evening1">সন্ধ্যা</dayPeriod>
+							<dayPeriod type="night1">রাত্রি</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">ভোর</dayPeriod>
+							<dayPeriod type="morning2">সকাল</dayPeriod>
+							<dayPeriod type="afternoon1">দুপুর</dayPeriod>
+							<dayPeriod type="afternoon2">বিকাল</dayPeriod>
+							<dayPeriod type="evening1">সন্ধ্যা</dayPeriod>
+							<dayPeriod type="night1">রাত্রি</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1604,6 +1675,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d-M</dateFormatItem>
@@ -1678,7 +1753,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">E, d/M – E, d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL–LLL</greatestDifference>
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">d–d MMM</greatestDifference>
@@ -1829,6 +1904,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>বছর</displayName>
+				<relative type="-1">গত বছর</relative>
+				<relative type="0">এই বছর</relative>
+				<relative type="1">পরের বছর</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} বছরে</relativeTimePattern>
 					<relativeTimePattern count="other">{0} বছরে</relativeTimePattern>
@@ -1840,6 +1918,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>বছর</displayName>
+				<relative type="-1">গত বছর</relative>
+				<relative type="0">এই বছর</relative>
+				<relative type="1">পরের বছর</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} বছরে</relativeTimePattern>
 					<relativeTimePattern count="other">{0} বছরে</relativeTimePattern>
@@ -1898,6 +1979,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>মাস</displayName>
+				<relative type="-1">গত মাস</relative>
+				<relative type="0">এই মাস</relative>
+				<relative type="1">পরের মাস</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} মাসে</relativeTimePattern>
 					<relativeTimePattern count="other">{0} মাসে</relativeTimePattern>
@@ -1909,6 +1993,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>মাস</displayName>
+				<relative type="-1">গত মাস</relative>
+				<relative type="0">এই মাস</relative>
+				<relative type="1">পরের মাস</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} মাসে</relativeTimePattern>
 					<relativeTimePattern count="other">{0} মাসে</relativeTimePattern>
@@ -1934,6 +2021,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>সপ্তাহ</displayName>
+				<relative type="-1">গত সপ্তাহ</relative>
+				<relative type="0">এই সপ্তাহ</relative>
+				<relative type="1">পরের সপ্তাহ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} সপ্তাহে</relativeTimePattern>
 					<relativeTimePattern count="other">{0} সপ্তাহে</relativeTimePattern>
@@ -1945,6 +2035,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>সপ্তাহ</displayName>
+				<relative type="-1">গত সপ্তাহ</relative>
+				<relative type="0">এই সপ্তাহ</relative>
+				<relative type="1">পরের সপ্তাহ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} সপ্তাহে</relativeTimePattern>
 					<relativeTimePattern count="other">{0} সপ্তাহে</relativeTimePattern>
@@ -1972,6 +2065,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>দিন</displayName>
+				<relative type="-2">গত পরশু</relative>
+				<relative type="-1">গতকাল</relative>
+				<relative type="0">আজ</relative>
+				<relative type="1">আগামীকাল</relative>
+				<relative type="2">আগামী পরশু</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} দিনের মধ্যে</relativeTimePattern>
 					<relativeTimePattern count="other">{0} দিনের মধ্যে</relativeTimePattern>
@@ -1983,6 +2081,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>দিন</displayName>
+				<relative type="-2">গত পরশু</relative>
+				<relative type="-1">গতকাল</relative>
+				<relative type="0">আজ</relative>
+				<relative type="1">আগামীকাল</relative>
+				<relative type="2">আগামী পরশু</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} দিনের মধ্যে</relativeTimePattern>
 					<relativeTimePattern count="other">{0} দিনের মধ্যে</relativeTimePattern>
@@ -2558,7 +2661,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>লুবুম্বাশি</exemplarCity>
 			</zone>
 			<zone type="Africa/Bangui">
-				<exemplarCity>বাঙ্গুল</exemplarCity>
+				<exemplarCity>বাঙ্গুই</exemplarCity>
 			</zone>
 			<zone type="Africa/Brazzaville">
 				<exemplarCity>ব্রাজউহভিল</exemplarCity>
@@ -3082,6 +3185,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>পোর্ট মৌরজবি</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>বুগেনভিলে</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>ম্যানিলা</exemplarCity>
 			</zone>
@@ -3166,6 +3272,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>ইর্কুট্স্ক</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>চিতা</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>ইয়াকুট্স্ক</exemplarCity>
 			</zone>
@@ -3184,6 +3293,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>ম্যাগাডান</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>স্রেদনেকোলয়মস্ক</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>কামচাটকা</exemplarCity>
 			</zone>
@@ -3266,7 +3378,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>কার্গুলেন</exemplarCity>
 			</zone>
 			<zone type="Africa/Lome">
-				<exemplarCity>লোমায়</exemplarCity>
+				<exemplarCity>লোমে</exemplarCity>
 			</zone>
 			<zone type="Asia/Bangkok">
 				<exemplarCity>ব্যাংকক</exemplarCity>
@@ -3520,30 +3632,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="America_Central">
 				<long>
-					<generic>উত্তর আমিরিকা মধ্যবর্তী অঞ্চলের কেন্দ্রীয় সময়</generic>
-					<standard>উত্তর আমিরিকা মধ্যবর্তী অঞ্চলের কেন্দ্রীয় মানক সময়</standard>
-					<daylight>উত্তর আমেরিকা মধ্যবর্তী অঞ্চলের দিবালোক সময়</daylight>
+					<generic>কেন্দ্রীয় সময়</generic>
+					<standard>কেন্দ্রীয় মানক সময়</standard>
+					<daylight>কেন্দ্রীয় দিবালোক সময়</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
-					<generic>উত্তর আমেরিকার পূর্বাঞ্চলীয় সময়</generic>
-					<standard>উত্তর আমেরিকার পূর্বাঞ্চলের প্রমাণ সময়</standard>
-					<daylight>উত্তর আমেরিকার পূর্বাঞ্চলের দিনের সময়</daylight>
+					<generic>পূর্বাঞ্চলীয় সময়</generic>
+					<standard>পূর্বাঞ্চলের প্রমাণ সময়</standard>
+					<daylight>পূর্বাঞ্চলের দিবালোক সময়</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
-					<generic>উত্তর আমেরিকার পার্বত্য অঞ্চলের সময়</generic>
-					<standard>উত্তর আমেরিকার পার্বত্য অঞ্চলের প্রমাণ সময়</standard>
-					<daylight>উত্তর আমেরিকার পার্বত্য অঞ্চলের দিনের সময়</daylight>
+					<generic>পার্বত্য অঞ্চলের সময়</generic>
+					<standard>পার্বত্য অঞ্চলের প্রমাণ সময়</standard>
+					<daylight>পার্বত্য অঞ্চলের দিনের সময়</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
-					<generic>উত্তর আমেরিকার প্রশান্ত মহাসাগরীয় অঞ্চলের সময়</generic>
-					<standard>উত্তর আমেরিকার প্রশান্ত মহাসাগরীয় অঞ্চলের প্রমাণ সময়</standard>
-					<daylight>উত্তর আমেরিকার প্রশান্ত মহাসাগরীয় অঞ্চলের দিনের সময়</daylight>
+					<generic>প্রশান্ত মহাসাগরীয় অঞ্চলের সময়</generic>
+					<standard>প্রশান্ত মহাসাগরীয় অঞ্চলের প্রমাণ সময়</standard>
+					<daylight>প্রশান্ত মহাসাগরীয় অঞ্চলের দিনের সময়</daylight>
 				</long>
 			</metazone>
 			<metazone type="Anadyr">
@@ -3590,7 +3702,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Argentina_Western">
 				<long>
-					<generic>আর্জেনটিনা পশ্চিমি সময়</generic>
+					<generic>পশ্চিমি আর্জেন্টিনা সময়</generic>
 					<standard>পশ্চিমি আর্জেনটিনার প্রমাণ সময়</standard>
 					<daylight>পশ্চিমি আর্জেনটিনা গৃষ্মকালীন সময়</daylight>
 				</long>
@@ -3949,7 +4061,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>য়াকুটস্ক সময়</generic>
 					<standard>য়াকুটস্ক মানক সময়</standard>
-					<daylight>য়াকুটস্ক গৃষ্মকালীন সময়</daylight>
+					<daylight>য়াকুটস্ক গ্রীষ্মকালীন সময়</daylight>
 				</long>
 			</metazone>
 			<metazone type="Israel">
@@ -4100,7 +4212,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>মস্কো সময়</generic>
 					<standard>মস্কো মানক সময়</standard>
-					<daylight>মস্কো গৃষ্মকালীন সময়</daylight>
+					<daylight>মস্কো গ্রীষ্মকালীন সময়</daylight>
 				</long>
 			</metazone>
 			<metazone type="Myanmar">
@@ -4172,7 +4284,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>ওমস্ক সময়</generic>
 					<standard>ওমস্ক মানক সময়</standard>
-					<daylight>ওমস্ক গৃষ্মকালীন সময়</daylight>
+					<daylight>ওমস্ক গ্রীষ্মকালীন সময়</daylight>
 				</long>
 			</metazone>
 			<metazone type="Pakistan">
@@ -4189,7 +4301,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Papua_New_Guinea">
 				<long>
-					<standard>পাপুয়া নিউগিনি সময়</standard>
+					<standard>পাপুয়া নিউ গিনি সময়</standard>
 				</long>
 			</metazone>
 			<metazone type="Paraguay">
@@ -4227,12 +4339,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Pitcairn">
 				<long>
-					<standard>পিটকাইর্ন সময়</standard>
+					<standard>পিটকেয়ার্ন সময়</standard>
 				</long>
 			</metazone>
 			<metazone type="Ponape">
 				<long>
-					<standard>পোনাপ সময়</standard>
+					<standard>পোনাপে সময়</standard>
 				</long>
 			</metazone>
 			<metazone type="Qyzylorda">
@@ -4322,7 +4434,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Tokelau">
 				<long>
-					<standard>টোকেলু সময়</standard>
+					<standard>টোকেলাউ সময়</standard>
 				</long>
 			</metazone>
 			<metazone type="Tonga">
@@ -4529,6 +4641,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##,##0.00¤;(#,##,##0.00¤)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">0 হাজার¤</pattern>
+					<pattern type="1000" count="other">0 হাজার¤</pattern>
+					<pattern type="10000" count="one">00 হাজার¤</pattern>
+					<pattern type="10000" count="other">00 হাজার¤</pattern>
+					<pattern type="100000" count="one">0 লাখ¤</pattern>
+					<pattern type="100000" count="other">0 লাখ¤</pattern>
+					<pattern type="1000000" count="one">0 লাখ¤</pattern>
+					<pattern type="1000000" count="other">0 লাখ¤</pattern>
+					<pattern type="10000000" count="one">00 কোটি¤</pattern>
+					<pattern type="10000000" count="other">00 কোটি¤</pattern>
+					<pattern type="100000000" count="one">000 কোটি¤</pattern>
+					<pattern type="100000000" count="other">000 কোটি¤</pattern>
+					<pattern type="1000000000" count="one">0 একশো কোটি¤</pattern>
+					<pattern type="1000000000" count="other">0 একশো কোটি¤</pattern>
+					<pattern type="10000000000" count="one">00 হাজার কোটি¤</pattern>
+					<pattern type="10000000000" count="other">00 হাজার কোটি¤</pattern>
+					<pattern type="100000000000" count="one">000 সহস্র কোটি¤</pattern>
+					<pattern type="100000000000" count="other">000 সহস্র কোটি¤</pattern>
+					<pattern type="1000000000000" count="one">0 দশ সহস্রের ত্রিঘাত¤</pattern>
+					<pattern type="1000000000000" count="other">0 দশ সহস্রের ত্রিঘাত¤</pattern>
+					<pattern type="10000000000000" count="one">00 একশো সহস্রের ত্রিঘাত¤</pattern>
+					<pattern type="10000000000000" count="other">00 একশো সহস্রের ত্রিঘাত¤</pattern>
+					<pattern type="100000000000000" count="one">000 সহস্র সহস্রের ত্রিঘাত¤</pattern>
+					<pattern type="100000000000000" count="other">000 সহস্র সহস্রের ত্রিঘাত¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4574,6 +4714,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">এ্যাঙ্গোলান কওয়ানজা</displayName>
 				<displayName count="other">এ্যাঙ্গোলান কওয়ানজা</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>এ্যাঙ্গোলান কওয়ানজা (১৯৭৭–১৯৯০)</displayName>
@@ -4630,6 +4771,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">বসনিয়া এবং হার্জেগোভিনা মার্ক</displayName>
 				<displayName count="other">বসনিয়া এবং হার্জেগোভিনা মার্ক</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>বার্বেডোজ ডলার</displayName>
@@ -4694,6 +4836,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">বলিভিয়ানো</displayName>
 				<displayName count="other">বলিভিয়ানো</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOP">
 				<displayName>বলিভিয়ান পেসো</displayName>
@@ -4744,6 +4887,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">বতসোয়ানা পুলা</displayName>
 				<displayName count="other">বতসোয়ানা পুলা</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>বেলারুশিয়ান নিউ রুবেল (১৯৯৪–১৯৯৯)</displayName>
@@ -4832,6 +4976,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">কিউবান রূপান্তরযোগ্য পেসো</displayName>
 				<displayName count="other">কিউবান রূপান্তরযোগ্য পেসো</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>কিউবান পেসো</displayName>
@@ -4854,6 +4999,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">চেকোস্লোভাক কোরুনা</displayName>
 				<displayName count="other">চেকোস্লোভাক কোরুনা</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>পূর্ব জার্মান মার্ক</displayName>
@@ -4872,6 +5018,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ড্যানিশ ক্রৌন</displayName>
 				<displayName count="other">ড্যানিশ ক্রৌন</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>ডোমিনিকান পেসো</displayName>
@@ -4900,6 +5047,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">মিশরীয় পাউন্ড</displayName>
 				<displayName count="other">মিশরীয় পাউন্ড</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>এরিট্রিয়েন নাকফা</displayName>
@@ -4944,6 +5092,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ফকল্যান্ড দ্বীপপুঞ্জ পাউন্ড</displayName>
 				<displayName count="other">ফকল্যান্ড দ্বীপপুঞ্জ পাউন্ড</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>ফরাসি ফ্রাঙ্ক</displayName>
@@ -4963,6 +5112,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">জর্জিয়ান লারি</displayName>
 				<displayName count="other">জর্জিয়ান লারি</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>ঘানা সেডি (১৯৭৯–২০০৭)</displayName>
@@ -4991,6 +5141,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">গিনি ফ্রাঙ্ক</displayName>
 				<displayName count="other">গিনি ফ্রাঙ্ক</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>গিনি সাইলি</displayName>
@@ -5006,6 +5157,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">গুয়াতেমালা কুয়েৎজাল</displayName>
 				<displayName count="other">গুয়াতেমালা কুয়েৎজাল</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>পর্তুগিজ গিনি এসকুডো</displayName>
@@ -5032,6 +5184,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">হন্ডুরাস লেম্পিরা</displayName>
 				<displayName count="other">হন্ডুরাস লেম্পিরা</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>ক্রোয়েশিয়ান দিনার</displayName>
@@ -5041,6 +5194,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ক্রোয়েশিয়ান কুনা</displayName>
 				<displayName count="other">ক্রোয়েশিয়ান কুনাস</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>হাইতি গৌর্দে</displayName>
@@ -5053,12 +5207,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">হাঙ্গেরিয়ান ফোরিন্ট</displayName>
 				<displayName count="other">হাঙ্গেরিয়ান ফোরিন্ট</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>ইন্দোনেশিয়ান রুপিয়াহ</displayName>
 				<displayName count="one">ইন্দোনেশিয়ান রুপিয়াহ</displayName>
 				<displayName count="other">ইন্দোনেশিয়ান রুপিয়াহ</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>ইরিশ পাউন্ড</displayName>
@@ -5097,6 +5253,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">আইসল্যান্ড ক্রৌন</displayName>
 				<displayName count="other">আইসল্যান্ড ক্রৌন</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>ইতালীয় লিরা</displayName>
@@ -5145,12 +5302,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">কম্বোরো ফ্রাঙ্ক</displayName>
 				<displayName count="other">কম্বোরো ফ্রাঙ্ক</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>উত্তর কোরিয়ার ওন</displayName>
 				<displayName count="one">উত্তর কোরিয়ার ওন</displayName>
 				<displayName count="other">উত্তর কোরিয়ার ওন</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>দক্ষিণ কোরিয়ান ওন</displayName>
@@ -5173,9 +5332,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="KZT">
-				<displayName>কাজাক্সটান টেঙ্গে</displayName>
-				<displayName count="one">কাজাক্সটান টেঙ্গে</displayName>
-				<displayName count="other">কাজাক্সটান টেঙ্গে</displayName>
+				<displayName>কাজাখাস্তানি টেঙ্গে</displayName>
+				<displayName count="one">কাজাখাস্তানি টেঙ্গে</displayName>
+				<displayName count="other">কাজাখাস্তানি টেঙ্গে</displayName>
 				<symbol>KZT</symbol>
 				<symbol alt="narrow" draft="contributed">₸</symbol>
 			</currency>
@@ -5191,12 +5350,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">লেবানিজ পাউন্ড</displayName>
 				<displayName count="other">লেবানিজ পাউন্ড</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>শ্রীলঙ্কান রুপি</displayName>
 				<displayName count="one">শ্রীলঙ্কান রুপি</displayName>
 				<displayName count="other">শ্রীলঙ্কান রুপি</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>লাইবেরিয়ান ডলার</displayName>
@@ -5261,6 +5422,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">মাদাগাস্কার আরিয়ারি</displayName>
 				<displayName count="other">মাদাগাস্কার আরিয়ারি</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>মাদাগাস্কার ফ্রাঙ্ক</displayName>
@@ -5279,6 +5441,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">মায়ানমার কিয়াত</displayName>
 				<displayName count="other">মায়ানমার কিয়াত</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>মঙ্গোলিয়ান তুগরিক</displayName>
@@ -5310,6 +5473,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">মৌরিতানিয়ান রুপি</displayName>
 				<displayName count="other">মৌরিতানিয়ান রুপি</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>মালদিভিয়ান রুফিয়া</displayName>
@@ -5341,6 +5505,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">মালয়েশিয়ান রিঙ্গিৎ</displayName>
 				<displayName count="other">মালয়েশিয়ান রিঙ্গিৎ</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>মোজাম্বিক এসকুডো</displayName>
@@ -5376,6 +5541,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">নিকারাগুয়ান কর্ডোবা</displayName>
 				<displayName count="other">নিকারাগুয়ান কর্ডোবা</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>নেদারল্যান্ড গুল্ডের</displayName>
@@ -5385,12 +5551,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">নরওয়ে ক্রৌন</displayName>
 				<displayName count="other">নরওয়ে ক্রৌন</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>নেপালি রুপি</displayName>
 				<displayName count="one">নেপালি রুপি</displayName>
 				<displayName count="other">নেপালি রুপি</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>নিউজিল্যান্ড ডলার</displayName>
@@ -5441,12 +5609,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">পাকিস্তানি রুপি</displayName>
 				<displayName count="other">পাকিস্তানি রুপি</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>পোলিশ জ্লোটি</displayName>
 				<displayName count="one">পোলিশ জ্লোটি</displayName>
 				<displayName count="other">পোলিশ জ্লোটি</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>পোলিশ জ্লোটি (১৯৫০–১৯৯৫)</displayName>
@@ -5490,6 +5660,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">রাশিয়ান রুবেল</displayName>
 				<displayName count="other">রাশিয়ান রুবেল</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>রাশিয়ান রুবল (১৯৯১–১৯৯৮)</displayName>
@@ -5499,6 +5670,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">রুয়ান্ডান ফ্রাঙ্ক</displayName>
 				<displayName count="other">রুয়ান্ডান ফ্রাঙ্ক</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>সৌদি রিয়্যাল</displayName>
@@ -5536,6 +5708,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">সুইডিশ ক্রোনা</displayName>
 				<displayName count="other">সুইডিশ ক্রোনা</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>সিঙ্গাপুর ডলার</displayName>
@@ -5549,6 +5722,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">সেন্ট হেলেনা পাউন্ড</displayName>
 				<displayName count="other">সেন্ট হেলেনা পাউন্ড</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>স্লোভানিয়া টোলার</displayName>
@@ -5590,6 +5764,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">সাও টোমে এবং প্রিন্সিপে ডোবরা</displayName>
 				<displayName count="other">সাও টোমে এবং প্রিন্সিপে ডোবরা</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>সোভিয়েত রুবল</displayName>
@@ -5602,6 +5777,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">সিরিয়ান পাউন্ড</displayName>
 				<displayName count="other">সিরিয়ান পাউন্ড</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>সোয়াজিল্যান্ড লিলাঙ্গেনি</displayName>
@@ -5614,6 +5790,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">থাই বাত</displayName>
 				<displayName count="other">থাই বাত</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>তাজিকিস্তান রুবল</displayName>
@@ -5628,9 +5805,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>তুর্কমেনিস্টানি মানাত</displayName>
 			</currency>
 			<currency type="TMT">
-				<displayName>তুর্কমেনিস্তান নতুন মানত</displayName>
-				<displayName count="one">তুর্কমেনিস্তান নতুন মানত</displayName>
-				<displayName count="other">তুর্কমেনিস্তান নতুন মানত</displayName>
+				<displayName>তুর্কমেনিস্তান মানত</displayName>
+				<displayName count="one">তুর্কমেনিস্তান মানত</displayName>
+				<displayName count="other">তুর্কমেনিস্তান মানত</displayName>
 				<symbol>TMT</symbol>
 			</currency>
 			<currency type="TND">
@@ -5644,6 +5821,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">টোঙ্গা পা’আঙ্গা</displayName>
 				<displayName count="other">টোঙ্গা পা’আঙ্গা</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>তিমুর এসকুডো</displayName>
@@ -5657,6 +5835,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">তুর্কি লিরা</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>ত্রিনিদাদ এবং টোবাগো ডলার</displayName>
@@ -5737,6 +5916,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ভেনিজুয়েলীয় বলিভার</displayName>
 				<displayName count="other">ভেনিজুয়েলীয় বলিভার</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>ভিয়েতনামি ডঙ্গ</displayName>
@@ -5758,9 +5938,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>WST</symbol>
 			</currency>
 			<currency type="XAF">
-				<displayName>সিএফএ ফ্র্যাঙ্ক বিইএসি</displayName>
-				<displayName count="one">সিএফএ ফ্র্যাঙ্ক বিইএসি</displayName>
-				<displayName count="other">সিএফএ ফ্র্যাঙ্ক বিইএসি</displayName>
+				<displayName>মধ্য আফ্রিকান [CFA] ফ্র্যাঙ্ক</displayName>
+				<displayName count="one">মধ্য আফ্রিকান [CFA] ফ্র্যাঙ্ক</displayName>
+				<displayName count="other">মধ্য আফ্রিকান [CFA] ফ্র্যাঙ্ক</displayName>
 				<symbol>FCFA</symbol>
 			</currency>
 			<currency type="XAG">
@@ -5777,6 +5957,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">পূর্ব ক্যারাবিয়ান ডলার</displayName>
 				<displayName count="other">পূর্ব ক্যারাবিয়ান ডলার</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XEU">
 				<displayName>ইউরোপীয় মুদ্রা একক</displayName>
@@ -5788,9 +5969,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ফরাসি ইউআইসি - ফ্রাঙ্ক</displayName>
 			</currency>
 			<currency type="XOF">
-				<displayName>সিএফএ ফ্র্যাঙ্ক বিসিইএও</displayName>
-				<displayName count="one">সিএফএ ফ্র্যাঙ্ক বিসিইএও</displayName>
-				<displayName count="other">সিএফএ ফ্র্যাঙ্ক বিসিইএও</displayName>
+				<displayName>পশ্চিম আফ্রিকান [CFA] ফ্র্যাঙ্ক</displayName>
+				<displayName count="one">পশ্চিম আফ্রিকান [CFA] ফ্র্যাঙ্ক</displayName>
+				<displayName count="other">পশ্চিম আফ্রিকান [CFA] ফ্র্যাঙ্ক</displayName>
 				<symbol>CFA</symbol>
 			</currency>
 			<currency type="XPD">
@@ -5836,6 +6017,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">দক্ষিণ আফ্রিকান রেন্ড</displayName>
 				<displayName count="other">দক্ষিণ আফ্রিকান রেন্ড</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>জাম্বিয়ান কওয়াচা (১৯৬৮–২০১২)</displayName>
@@ -5845,6 +6027,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">জাম্বিয়ান কওয়াচা</displayName>
 				<displayName count="other">জাম্বিয়ান কওয়াচা</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>জাইরিয়ান নিউ জাইরে</displayName>
@@ -5882,40 +6065,67 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName>মিনিট</displayName>
-				<unitPattern count="one">{0} মিনিট</unitPattern>
-				<unitPattern count="other">{0} মিনিট</unitPattern>
+			<unit type="angle-revolution">
+				<displayName>রিভোলিউশন</displayName>
+				<unitPattern count="one">{0} রিভোলিউশন</unitPattern>
+				<unitPattern count="other">{0} রিভোলিউশন্স</unitPattern>
 			</unit>
-			<unit type="angle-arc-second">
-				<displayName>সেকেন্ড</displayName>
-				<unitPattern count="one">{0} সেকেন্ড</unitPattern>
-				<unitPattern count="other">{0} সেকেন্ড</unitPattern>
+			<unit type="angle-radian">
+				<displayName>রেডিয়্যান</displayName>
+				<unitPattern count="one">{0} রেডিয়্যান</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
 			</unit>
 			<unit type="angle-degree">
 				<displayName>ডিগ্রী</displayName>
 				<unitPattern count="one">{0} ডিগ্রী</unitPattern>
 				<unitPattern count="other">{0} ডিগ্রী</unitPattern>
 			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
+			<unit type="angle-arc-minute">
+				<displayName>আর্ক-মিনিট</displayName>
+				<unitPattern count="one">{0} মিনিট</unitPattern>
+				<unitPattern count="other">{0} আর্ক-মিনিট</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName>একর</displayName>
-				<unitPattern count="one">{0} একর</unitPattern>
-				<unitPattern count="other">{0} একর</unitPattern>
+			<unit type="angle-arc-second">
+				<displayName>আর্কসেকেন্ড</displayName>
+				<unitPattern count="one">{0} আর্কসেকেন্ড</unitPattern>
+				<unitPattern count="other">{0} সেকেন্ড</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>বর্গ কিলোমিটার</displayName>
+				<unitPattern count="one">{0} বর্গ কিলোমিটার</unitPattern>
+				<unitPattern count="other">{0} বর্গ কিলোমিটার</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>হেক্টর</displayName>
 				<unitPattern count="one">{0} হেক্টর</unitPattern>
 				<unitPattern count="other">{0} হেক্টর</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>বর্গ মিটার</displayName>
+				<unitPattern count="one">{0} বর্গ মিটার</unitPattern>
+				<unitPattern count="other">{0} বর্গ মিটার</unitPattern>
+				<perUnitPattern>{0} প্রতি বর্গ মিটার</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>প্রতি বর্গ সেন্টিমিটারে {0}</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>বর্গ মাইল</displayName>
+				<unitPattern count="one">{0} বর্গ মাইল</unitPattern>
+				<unitPattern count="other">{0} বর্গ মাইল</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>একর</displayName>
+				<unitPattern count="one">{0} একর</unitPattern>
+				<unitPattern count="other">{0} একর</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>বর্গ ফুট</displayName>
@@ -5926,91 +6136,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>in²</displayName>
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>প্রতি বর্গ ইঞ্চিতে {0}</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>বর্গ কিলোমিটার</displayName>
-				<unitPattern count="one">{0} বর্গ কিলোমিটার</unitPattern>
-				<unitPattern count="other">{0} বর্গ কিলোমিটার</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>বর্গ মিটার</displayName>
-				<unitPattern count="one">{0} বর্গ মিটার</unitPattern>
-				<unitPattern count="other">{0} বর্গ মিটার</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>বর্গ মাইল</displayName>
-				<unitPattern count="one">{0} বর্গ মাইল</unitPattern>
-				<unitPattern count="other">{0} বর্গ মাইল</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>ক্যারেট</displayName>
+				<unitPattern count="one">{0} ক্যারেট</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName>L/km</displayName>
-				<unitPattern count="one">{0} L/km</unitPattern>
+				<displayName>লিটার, প্রতি কিলোমিটারে</displayName>
+				<unitPattern count="one">{0} লিটার, প্রতি কিলোমিটারে</unitPattern>
 				<unitPattern count="other">{0} L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>লিটার, প্রতি 100 কিলোমিটারে</displayName>
+				<unitPattern count="one">{0} লিটার, প্রতি 100 কিলোমিটারে</unitPattern>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
-				<displayName>mpg</displayName>
-				<unitPattern count="one">{0} mpg</unitPattern>
+				<displayName>মাইল প্রতি গ্যালন</displayName>
+				<unitPattern count="one">{0} মাইল প্রতি গ্যালন</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>টেরাবাইট</displayName>
+				<unitPattern count="one">{0} টেরাবাইট</unitPattern>
+				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} বাইট</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
+			<unit type="digital-terabit">
+				<displayName>টেরাবিট</displayName>
+				<unitPattern count="one">{0} টেরাবিট</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
 			</unit>
 			<unit type="digital-gigabyte">
 				<displayName>GB</displayName>
 				<unitPattern count="one">{0} GB</unitPattern>
 				<unitPattern count="other">{0} GB</unitPattern>
 			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
 			</unit>
 			<unit type="digital-megabyte">
 				<displayName>MB</displayName>
 				<unitPattern count="one">{0} MB</unitPattern>
 				<unitPattern count="other">{0} MB</unitPattern>
 			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>TB</displayName>
-				<unitPattern count="one">{0} TB</unitPattern>
-				<unitPattern count="other">{0} TB</unitPattern>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} বাইট</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>শতাব্দী</displayName>
+				<unitPattern count="one">{0} শতাব্দী</unitPattern>
+				<unitPattern count="other">{0} শতাব্দী</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>বছর</displayName>
+				<unitPattern count="one">{0} বছর</unitPattern>
+				<unitPattern count="other">{0} বছর</unitPattern>
+				<perUnitPattern>{0} প্রতি বছর</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>মাস</displayName>
+				<unitPattern count="one">{0} মাস</unitPattern>
+				<unitPattern count="other">{0} মাস</unitPattern>
+				<perUnitPattern>{0} প্রতি মাস</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>সপ্তাহ</displayName>
+				<unitPattern count="one">{0} সপ্তাহ</unitPattern>
+				<unitPattern count="other">{0} সপ্তাহ</unitPattern>
+				<perUnitPattern>{0} প্রতি সপ্তাহ</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>দিন</displayName>
 				<unitPattern count="one">{0} দিন</unitPattern>
 				<unitPattern count="other">{0} দিন</unitPattern>
+				<perUnitPattern>{0} প্রতি দিন</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>ঘন্টা</displayName>
@@ -6018,30 +6243,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ঘন্টা</unitPattern>
 				<perUnitPattern>{0} প্রতি ঘন্টা</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>মাইক্রোসেকেন্ড</displayName>
-				<unitPattern count="one">{0} মাইক্রোসেকেন্ড</unitPattern>
-				<unitPattern count="other">{0} মাইক্রোসেকেন্ড</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>মিলিসেকেন্ড</displayName>
-				<unitPattern count="one">{0} মিলিসেকেন্ড</unitPattern>
-				<unitPattern count="other">{0} মিলিসেকেন্ড</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>মিনিট</displayName>
 				<unitPattern count="one">{0} মিনিট</unitPattern>
 				<unitPattern count="other">{0} মিনিট</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>মাস</displayName>
-				<unitPattern count="one">{0} মাস</unitPattern>
-				<unitPattern count="other">{0} মাস</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ন্যানোসেকেন্ড</displayName>
-				<unitPattern count="one">{0} ন্যানোসেকেন্ড</unitPattern>
-				<unitPattern count="other">{0} ন্যানোসেকেন্ড</unitPattern>
+				<perUnitPattern>{0} প্রতি মিনিট</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>সেকেন্ড</displayName>
@@ -6049,266 +6255,275 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} সেকেন্ড</unitPattern>
 				<perUnitPattern>{0} প্রতি সেকেন্ড</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>সপ্তাহ</displayName>
-				<unitPattern count="one">{0} সপ্তাহ</unitPattern>
-				<unitPattern count="other">{0} সপ্তাহ</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>মিলিসেকেন্ড</displayName>
+				<unitPattern count="one">{0} মিলিসেকেন্ড</unitPattern>
+				<unitPattern count="other">{0} মিলিসেকেন্ড</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>বছর</displayName>
-				<unitPattern count="one">{0} বছর</unitPattern>
-				<unitPattern count="other">{0} বছর</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>মাইক্রোসেকেন্ড</displayName>
+				<unitPattern count="one">{0} মাইক্রোসেকেন্ড</unitPattern>
+				<unitPattern count="other">{0} মাইক্রোসেকেন্ড</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ন্যানোসেকেন্ড</displayName>
+				<unitPattern count="one">{0} ন্যানোসেকেন্ড</unitPattern>
+				<unitPattern count="other">{0} ন্যানোসেকেন্ড</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
-				<displayName>amp</displayName>
-				<unitPattern count="one">{0} A</unitPattern>
-				<unitPattern count="other">{0} A</unitPattern>
+				<displayName>অ্যাম্পিয়ার</displayName>
+				<unitPattern count="one">{0} অ্যাম্পিয়ার</unitPattern>
+				<unitPattern count="other">{0} অ্যাম্পিয়ার</unitPattern>
 			</unit>
 			<unit type="electric-milliampere">
-				<displayName>mA</displayName>
-				<unitPattern count="one">{0} mA</unitPattern>
-				<unitPattern count="other">{0} mA</unitPattern>
+				<displayName>মিলি-অ্যাম্পিয়ার</displayName>
+				<unitPattern count="one">{0} মিলি-অ্যাম্পিয়ার</unitPattern>
+				<unitPattern count="other">{0} মিলি-অ্যাম্পিয়ার</unitPattern>
 			</unit>
 			<unit type="electric-ohm">
-				<displayName>ohm</displayName>
-				<unitPattern count="one">{0} Ω</unitPattern>
+				<displayName>ওম</displayName>
+				<unitPattern count="one">{0} ওম</unitPattern>
 				<unitPattern count="other">{0} Ω</unitPattern>
 			</unit>
 			<unit type="electric-volt">
-				<displayName>volt</displayName>
-				<unitPattern count="one">{0} V</unitPattern>
+				<displayName>ভোল্ট</displayName>
+				<unitPattern count="one">{0} ভোল্ট</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>কিলোক্যালরি</displayName>
+				<unitPattern count="one">{0} কিলোক্যালরি</unitPattern>
+				<unitPattern count="other">{0} কিলোক্যালরি</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
-				<displayName>cal</displayName>
-				<unitPattern count="one">{0} cal</unitPattern>
-				<unitPattern count="other">{0} cal</unitPattern>
+				<displayName>ক্যালোরি</displayName>
+				<unitPattern count="one">{0} ক্যালোরি</unitPattern>
+				<unitPattern count="other">{0} ক্যালোরি</unitPattern>
 			</unit>
 			<unit type="energy-foodcalorie">
-				<displayName>Cal</displayName>
-				<unitPattern count="one">{0} Cal</unitPattern>
-				<unitPattern count="other">{0} Cal</unitPattern>
-			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
+				<displayName>ক্যালোরি</displayName>
+				<unitPattern count="one">{0} ক্যালোরি</unitPattern>
+				<unitPattern count="other">{0} ক্যালোরি</unitPattern>
 			</unit>
 			<unit type="energy-kilojoule">
-				<displayName>kJ</displayName>
-				<unitPattern count="one">{0} kJ</unitPattern>
-				<unitPattern count="other">{0} kJ</unitPattern>
+				<displayName>কিলোজুল</displayName>
+				<unitPattern count="one">{0} কিলোজুল</unitPattern>
+				<unitPattern count="other">{0} কিলোজুল</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>জুল</displayName>
+				<unitPattern count="one">{0} জুল</unitPattern>
+				<unitPattern count="other">{0} জুল</unitPattern>
 			</unit>
 			<unit type="energy-kilowatt-hour">
-				<displayName>kWh</displayName>
-				<unitPattern count="one">{0} kWh</unitPattern>
-				<unitPattern count="other">{0} kWh</unitPattern>
+				<displayName>কিলোওয়াট ঘন্টা</displayName>
+				<unitPattern count="one">{0} কিলোওয়াট ঘন্টা</unitPattern>
+				<unitPattern count="other">{0} কিলোওয়াট ঘন্টা</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
-				<displayName>GHz</displayName>
-				<unitPattern count="one">{0} GHz</unitPattern>
+				<displayName>গিগাহার্জ</displayName>
+				<unitPattern count="one">{0} গিগাহার্জ</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<displayName>kHz</displayName>
-				<unitPattern count="one">{0} kHz</unitPattern>
-				<unitPattern count="other">{0} kHz</unitPattern>
-			</unit>
 			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
+				<displayName>মেগাহার্জ</displayName>
+				<unitPattern count="one">{0} মেগাহার্জ</unitPattern>
 				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="frequency-kilohertz">
+				<displayName>কিলোহার্জ</displayName>
+				<unitPattern count="one">{0} কিলোহার্জ</unitPattern>
+				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>সেন্টিমিটার</displayName>
-				<unitPattern count="one">{0} সেন্টিমিটার</unitPattern>
-				<unitPattern count="other">{0} সেন্টিমিটার</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>হার্জ</displayName>
+				<unitPattern count="one">{0} হার্জ</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>কিলোমিটার</displayName>
+				<unitPattern count="one">{0} কিলোমিটার</unitPattern>
+				<unitPattern count="other">{0} কিলোমিটার</unitPattern>
+				<perUnitPattern>প্রতি কিলোমিটারে {0}</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>মিটার</displayName>
+				<unitPattern count="one">{0} মিটার</unitPattern>
+				<unitPattern count="other">{0} মিটার</unitPattern>
+				<perUnitPattern>মিটার প্রতি {0}</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ফুট</displayName>
-				<unitPattern count="one">{0} ফুট</unitPattern>
-				<unitPattern count="other">{0} ফুট</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>ইঞ্চি</displayName>
-				<unitPattern count="one">{0} ইঞ্চি</unitPattern>
-				<unitPattern count="other">{0} ইঞ্চি</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>কিলোমিটার</displayName>
-				<unitPattern count="one">{0} কিলোমিটার</unitPattern>
-				<unitPattern count="other">{0} কিলোমিটার</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>আলোকবর্ষ</displayName>
-				<unitPattern count="one">{0} আলোকবর্ষ</unitPattern>
-				<unitPattern count="other">{0} আলোকবর্ষ</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>মিটার</displayName>
-				<unitPattern count="one">{0} মিটার</unitPattern>
-				<unitPattern count="other">{0} মিটার</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>মাইল</displayName>
-				<unitPattern count="one">{0} মাইল</unitPattern>
-				<unitPattern count="other">{0} মাইল</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>সেন্টিমিটার</displayName>
+				<unitPattern count="one">{0} সেন্টিমিটার</unitPattern>
+				<unitPattern count="other">{0} সেন্টিমিটার</unitPattern>
+				<perUnitPattern>প্রতি সেন্টিমিটারে {0}</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>মিলিমিটার</displayName>
 				<unitPattern count="one">{0} মিলিমিটার</unitPattern>
 				<unitPattern count="other">{0} মিলিমিটার</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>পিকোমিটার</displayName>
 				<unitPattern count="one">{0} পিকোমিটার</unitPattern>
 				<unitPattern count="other">{0} পিকোমিটার</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>মাইল</displayName>
+				<unitPattern count="one">{0} মাইল</unitPattern>
+				<unitPattern count="other">{0} মাইল</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>গজ</displayName>
 				<unitPattern count="one">{0} গজ</unitPattern>
 				<unitPattern count="other">{0} গজ</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ফুট</displayName>
+				<unitPattern count="one">{0} ফুট</unitPattern>
+				<unitPattern count="other">{0} ফুট</unitPattern>
+				<perUnitPattern>প্রতি ফুটে {0}</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>ইঞ্চি</displayName>
+				<unitPattern count="one">{0} ইঞ্চি</unitPattern>
+				<unitPattern count="other">{0} ইঞ্চি</unitPattern>
+				<perUnitPattern>প্রতি ইঞ্চিতে {0}</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>আলোকবর্ষ</displayName>
+				<unitPattern count="one">{0} আলোকবর্ষ</unitPattern>
+				<unitPattern count="other">{0} আলোকবর্ষ</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>মাইল-স্ক্যান্ডিনেভিয়ান</displayName>
+				<unitPattern count="one">{0} মাইল-স্ক্যান্ডিনেভিয়ান</unitPattern>
+				<unitPattern count="other">{0} মাইল-স্ক্যান্ডিনেভিয়ান</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>CD</displayName>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>গ্রাম</displayName>
-				<unitPattern count="one">{0} গ্রাম</unitPattern>
-				<unitPattern count="other">{0} গ্রাম</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>কিলোগ্রাম</displayName>
-				<unitPattern count="one">{0} কিলোগ্রাম</unitPattern>
-				<unitPattern count="other">{0} কিলোগ্রাম</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} মেট্রিক টন</unitPattern>
 				<unitPattern count="other">{0} মেট্রিক টন</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>কিলোগ্রাম</displayName>
+				<unitPattern count="one">{0} কিলোগ্রাম</unitPattern>
+				<unitPattern count="other">{0} কিলোগ্রাম</unitPattern>
+				<perUnitPattern draft="provisional">{0} প্রতি/কিলোগ্রাম</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>গ্রাম</displayName>
+				<unitPattern count="one">{0} গ্রাম</unitPattern>
+				<unitPattern count="other">{0} গ্রাম</unitPattern>
+				<perUnitPattern draft="provisional">{0} প্রতি/গ্রাম</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>মিলিগ্রাম</displayName>
 				<unitPattern count="one">{0} মিলিগ্রাম</unitPattern>
 				<unitPattern count="other">{0} মিলিগ্রাম</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>আউন্স</displayName>
-				<unitPattern count="one">{0} আউন্স</unitPattern>
-				<unitPattern count="other">{0} আউন্স</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>পাউন্ড</displayName>
-				<unitPattern count="one">{0} পাউন্ড</unitPattern>
-				<unitPattern count="other">{0} পাউন্ড</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>টন</displayName>
 				<unitPattern count="one">{0} টন</unitPattern>
 				<unitPattern count="other">{0} টন</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>পাউন্ড</displayName>
+				<unitPattern count="one">{0} পাউন্ড</unitPattern>
+				<unitPattern count="other">{0} পাউন্ড</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>আউন্স</displayName>
+				<unitPattern count="one">{0} আউন্স</unitPattern>
+				<unitPattern count="other">{0} আউন্স</unitPattern>
+				<perUnitPattern>{0}প্রতি/আউন্স</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>CD</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>হর্সপাওয়ার</displayName>
-				<unitPattern count="one">{0} হর্সপাওয়ার</unitPattern>
-				<unitPattern count="other">{0} হর্সপাওয়ার</unitPattern>
+			<unit type="power-megawatt">
+				<displayName>মেগাওয়াট</displayName>
+				<unitPattern count="one">{0} মেগাওয়াট</unitPattern>
+				<unitPattern count="other">{0} মেগাওয়াট</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName>কিলোওয়াট</displayName>
 				<unitPattern count="one">{0} কিলোওয়াট</unitPattern>
 				<unitPattern count="other">{0} কিলোওয়াট</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<displayName>MW</displayName>
-				<unitPattern count="one">{0} MW</unitPattern>
-				<unitPattern count="other">{0} MW</unitPattern>
-			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
-			</unit>
 			<unit type="power-watt">
 				<displayName>ওয়াট</displayName>
 				<unitPattern count="one">{0} ওয়াট</unitPattern>
 				<unitPattern count="other">{0} ওয়াট</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>মিলিওয়াট</displayName>
+				<unitPattern count="one">{0} মিলিওয়াট</unitPattern>
+				<unitPattern count="other">{0} মিলিওয়াট</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>হর্সপাওয়ার</displayName>
+				<unitPattern count="one">{0} হর্সপাওয়ার</unitPattern>
+				<unitPattern count="other">{0} হর্সপাওয়ার</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>হেক্টোপাসকল</displayName>
 				<unitPattern count="one">{0} হেক্টোপাসকল</unitPattern>
 				<unitPattern count="other">{0} হেক্টোপাসকল</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>ইঞ্চি পারদ</displayName>
-				<unitPattern count="one">{0} ইঞ্চি পারদ</unitPattern>
-				<unitPattern count="other">{0} ইঞ্চি পারদ</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>মিলিবার</displayName>
-				<unitPattern count="one">{0} মিলিবার</unitPattern>
-				<unitPattern count="other">{0} মিলিবার</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>মিলিমিটার পারদ</displayName>
 				<unitPattern count="one">{0} মিলিমিটার পারদ</unitPattern>
@@ -6319,10 +6534,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} বর্গইঞ্চি প্রতি পাউন্ড</unitPattern>
 				<unitPattern count="other">{0} বর্গইঞ্চি প্রতি পাউন্ড</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>ইঞ্চি পারদ</displayName>
+				<unitPattern count="one">{0} ইঞ্চি পারদ</unitPattern>
+				<unitPattern count="other">{0} ইঞ্চি পারদ</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>মিলিবার</displayName>
+				<unitPattern count="one">{0} মিলিবার</unitPattern>
+				<unitPattern count="other">{0} মিলিবার</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>ঘন্টা প্রতি কিলোমিটার</displayName>
@@ -6339,6 +6559,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ঘন্টা প্রতি মাইল</unitPattern>
 				<unitPattern count="other">{0} ঘন্টা প্রতি মাইল</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>নট</displayName>
+				<unitPattern count="one">{0} নট</unitPattern>
+				<unitPattern count="other">{0} নট</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>ডিগ্রী সেলসিয়াস</displayName>
 				<unitPattern count="one">{0} ডিগ্রী সেলসিয়াস</unitPattern>
@@ -6354,31 +6584,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} কেলভিন</unitPattern>
 				<unitPattern count="other">{0} কেলভিন</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cL</displayName>
-				<unitPattern count="one">{0} cL</unitPattern>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>কিউবিক কিলোমিটার</displayName>
 				<unitPattern count="one">{0} কিউবিক কিলোমিটার</unitPattern>
@@ -6388,6 +6593,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0} প্রতি ঘন মিটার</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0} প্রতি ঘন সেন্টিমিটার</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>কিউবিক মাইল</displayName>
@@ -6399,25 +6611,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>cup</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="one">{0} dL</unitPattern>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -6428,27 +6635,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>লিটার</displayName>
 				<unitPattern count="one">{0} লিটার</unitPattern>
 				<unitPattern count="other">{0} লিটার</unitPattern>
+				<perUnitPattern>{0} প্রতি লিটার</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="one">{0} ML</unitPattern>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0} dL</unitPattern>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="one">{0} cL</unitPattern>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
 				<unitPattern count="one">{0} mL</unitPattern>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>মেট্রিক পিন্ট</displayName>
+				<unitPattern count="one">{0} মেট্রিক পিন্ট</unitPattern>
+				<unitPattern count="other">{0} মেট্রিক পিন্ট</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>মেট্রিক কাপ</displayName>
+				<unitPattern count="one">{0} মেট্রিক কাপ</unitPattern>
+				<unitPattern count="other">{0} মেট্রিক কাপ</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0} প্রতি গ্যালন</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cup</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>tbsp</displayName>
 				<unitPattern count="one">{0} tbsp</unitPattern>
@@ -6459,6 +6703,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} tsp</unitPattern>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} পূর্ব</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} উত্তর</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="provisional">{0}দ</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}প</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -6474,40 +6724,67 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName>আর্কমিন</displayName>
-				<unitPattern count="one">{0}মিনিট</unitPattern>
-				<unitPattern count="other">{0}মিনিট</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName>সেকেন্ড</displayName>
-				<unitPattern count="one">{0}সেকেন্ড</unitPattern>
-				<unitPattern count="other">{0}সেকেন্ড</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName>ডিগ্রী</displayName>
-				<unitPattern count="one">{0}ডিগ্রী</unitPattern>
-				<unitPattern count="other">{0}ডিগ্রী</unitPattern>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="one">{0} rev</unitPattern>
+				<unitPattern count="other">{0} rev</unitPattern>
 			</unit>
 			<unit type="angle-radian">
 				<displayName>rad</displayName>
 				<unitPattern count="one">{0} rad</unitPattern>
 				<unitPattern count="other">{0} rad</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName>একর</displayName>
-				<unitPattern count="one">{0} একর</unitPattern>
-				<unitPattern count="other">{0} একর</unitPattern>
+			<unit type="angle-degree">
+				<displayName>ডিগ্রী</displayName>
+				<unitPattern count="one">{0}ডিগ্রী</unitPattern>
+				<unitPattern count="other">{0}ডিগ্রী</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>আর্কমিন</displayName>
+				<unitPattern count="one">{0} আর্কমিন</unitPattern>
+				<unitPattern count="other">{0} আর্কমিন</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>আর্কসেকেন্ড</displayName>
+				<unitPattern count="one">{0} আর্কসেক</unitPattern>
+				<unitPattern count="other">{0} আর্কসেক</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>বর্গ কিলোমিটার</displayName>
+				<unitPattern count="one">{0} বর্গ কিমি</unitPattern>
+				<unitPattern count="other">{0} বর্গ কিমি</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>হেক্টর</displayName>
 				<unitPattern count="one">{0} হেক্টর</unitPattern>
 				<unitPattern count="other">{0} হেক্টর</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>বর্গ মিটার</displayName>
+				<unitPattern count="one">{0} বর্গ মিটার</unitPattern>
+				<unitPattern count="other">{0} বর্গ মিটার</unitPattern>
+				<perUnitPattern draft="provisional">{0} প্রতি বর্গ মিটার</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>বর্গ মাইল</displayName>
+				<unitPattern count="one">{0} বর্গ মাইল</unitPattern>
+				<unitPattern count="other">{0} বর্গ মাইল</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>একর</displayName>
+				<unitPattern count="one">{0} একর</unitPattern>
+				<unitPattern count="other">{0} একর</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>বর্গ ফুট</displayName>
@@ -6518,91 +6795,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>in²</displayName>
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>বর্গ কিলোমিটার</displayName>
-				<unitPattern count="one">{0} বর্গ কিমি</unitPattern>
-				<unitPattern count="other">{0} বর্গ কিমি</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>বর্গ মিটার</displayName>
-				<unitPattern count="one">{0} বর্গ মিটার</unitPattern>
-				<unitPattern count="other">{0} বর্গ মিটার</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>বর্গ মাইল</displayName>
-				<unitPattern count="one">{0} বর্গ মাইল</unitPattern>
-				<unitPattern count="other">{0} বর্গ মাইল</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName>L/km</displayName>
+				<displayName>লিটার/কিমি</displayName>
 				<unitPattern count="one">{0} L/km</unitPattern>
 				<unitPattern count="other">{0} L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} L/100km</unitPattern>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
-				<displayName>mpg</displayName>
+				<displayName>মাইল/গ্যালন</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>TByte</displayName>
+				<unitPattern count="one">{0} TB</unitPattern>
+				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
+			<unit type="digital-terabit">
+				<displayName>Tbit</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
 			</unit>
 			<unit type="digital-gigabyte">
 				<displayName>GB</displayName>
 				<unitPattern count="one">{0} GB</unitPattern>
 				<unitPattern count="other">{0} GB</unitPattern>
 			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
 			</unit>
 			<unit type="digital-megabyte">
 				<displayName>MB</displayName>
 				<unitPattern count="one">{0} MB</unitPattern>
 				<unitPattern count="other">{0} MB</unitPattern>
 			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>TB</displayName>
-				<unitPattern count="one">{0} TB</unitPattern>
-				<unitPattern count="other">{0} TB</unitPattern>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>শতক</displayName>
+				<unitPattern count="one">{0} শতক</unitPattern>
+				<unitPattern count="other">{0} শতক</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>বছর</displayName>
+				<unitPattern count="one">{0} বছর</unitPattern>
+				<unitPattern count="other">{0} বছর</unitPattern>
+				<perUnitPattern>{0} প্রতি বছর</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>মাস</displayName>
+				<unitPattern count="one">{0} মাস</unitPattern>
+				<unitPattern count="other">{0} মাস</unitPattern>
+				<perUnitPattern>{0} প্রতি মাস</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>সপ্তাহ</displayName>
+				<unitPattern count="one">{0} সপ্তাহ</unitPattern>
+				<unitPattern count="other">{0} সপ্তাহ</unitPattern>
+				<perUnitPattern>{0} প্রতি সপ্তাহ</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>দিন</displayName>
 				<unitPattern count="one">{0} দিন</unitPattern>
 				<unitPattern count="other">{0} দিন</unitPattern>
+				<perUnitPattern>{0} প্রতি দিন</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>ঘন্টা</displayName>
@@ -6610,30 +6902,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ঘন্টা</unitPattern>
 				<perUnitPattern>{0} প্রতি ঘন্টা</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μsecs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>মিলিসেকেন্ড</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>মিনিট</displayName>
 				<unitPattern count="one">{0} মিনিট</unitPattern>
 				<unitPattern count="other">{0} মিনিট</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>মাস</displayName>
-				<unitPattern count="one">{0} মাস</unitPattern>
-				<unitPattern count="other">{0} মাস</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ন্যানোসেকেন্ড</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0} প্রতি মিনিট</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>সেকেন্ড</displayName>
@@ -6641,15 +6914,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} সেকেন্ড</unitPattern>
 				<perUnitPattern>{0} প্রতি সেকেন্ড</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>সপ্তাহ</displayName>
-				<unitPattern count="one">{0} সপ্তাহ</unitPattern>
-				<unitPattern count="other">{0} সপ্তাহ</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>মিলিসেকেন্ড</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>বছর</displayName>
-				<unitPattern count="one">{0} বছর</unitPattern>
-				<unitPattern count="other">{0} বছর</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μsecs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ন্যানোসেকেন্ড</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amp</displayName>
@@ -6671,6 +6949,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -6681,21 +6964,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Cal</unitPattern>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>জুল</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -6706,201 +6984,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>কিলোমিটার</displayName>
+				<unitPattern count="one">{0} কিমি</unitPattern>
+				<unitPattern count="other">{0} কিমি</unitPattern>
+				<perUnitPattern>{0}/কিমি</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>সেন্টিমিটার</displayName>
-				<unitPattern count="one">{0} সেমি</unitPattern>
-				<unitPattern count="other">{0} সেমি</unitPattern>
+			<unit type="length-meter">
+				<displayName>মিটার</displayName>
+				<unitPattern count="one">{0} মিটার</unitPattern>
+				<unitPattern count="other">{0} মিটার</unitPattern>
+				<perUnitPattern>{0}/মি</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ফুট</displayName>
-				<unitPattern count="one">{0} ফুট</unitPattern>
-				<unitPattern count="other">{0} ফুট</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>ইঞ্চি</displayName>
-				<unitPattern count="one">{0} ইঞ্চি</unitPattern>
-				<unitPattern count="other">{0} ইঞ্চি</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>কিলোমিটার</displayName>
-				<unitPattern count="one">{0} কিমি</unitPattern>
-				<unitPattern count="other">{0} কিমি</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>আলোকবর্ষ</displayName>
-				<unitPattern count="one">{0} আলোকবর্ষ</unitPattern>
-				<unitPattern count="other">{0} আলোকবর্ষ</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>মিটার</displayName>
-				<unitPattern count="one">{0} মিটার</unitPattern>
-				<unitPattern count="other">{0} মিটার</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>মাইল</displayName>
-				<unitPattern count="one">{0} মাইল</unitPattern>
-				<unitPattern count="other">{0} মাইল</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>সেন্টিমিটার</displayName>
+				<unitPattern count="one">{0} সেমি</unitPattern>
+				<unitPattern count="other">{0} সেমি</unitPattern>
+				<perUnitPattern>{0}/সেমি</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>মিলিমিটার</displayName>
 				<unitPattern count="one">{0} মিমি</unitPattern>
 				<unitPattern count="other">{0} মিমি</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>পিকোমিটার</displayName>
 				<unitPattern count="one">{0} পিকোমিটার</unitPattern>
 				<unitPattern count="other">{0} পিকোমিটার</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>মাইল</displayName>
+				<unitPattern count="one">{0} মাইল</unitPattern>
+				<unitPattern count="other">{0} মাইল</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>গজ</displayName>
 				<unitPattern count="one">{0} গজ</unitPattern>
 				<unitPattern count="other">{0} গজ</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ফুট</displayName>
+				<unitPattern count="one">{0} ফুট</unitPattern>
+				<unitPattern count="other">{0} ফুট</unitPattern>
+				<perUnitPattern>{0}/ফুট</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>ইঞ্চি</displayName>
+				<unitPattern count="one">{0} ইঞ্চি</unitPattern>
+				<unitPattern count="other">{0} ইঞ্চি</unitPattern>
+				<perUnitPattern>{0}/ইঞ্চি</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>আলোকবর্ষ</displayName>
+				<unitPattern count="one">{0} আলোকবর্ষ</unitPattern>
+				<unitPattern count="other">{0} আলোকবর্ষ</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>CD</displayName>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>গ্রাম</displayName>
-				<unitPattern count="one">{0}গ্রাম</unitPattern>
-				<unitPattern count="other">{0} গ্রাম</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>কিলোগ্রাম</displayName>
-				<unitPattern count="one">{0} কেজি</unitPattern>
-				<unitPattern count="other">{0} কেজি</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>কিলোগ্রাম</displayName>
+				<unitPattern count="one">{0} কেজি</unitPattern>
+				<unitPattern count="other">{0} কেজি</unitPattern>
+				<perUnitPattern draft="provisional">{0} প্রতি/কেজি</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>গ্রাম</displayName>
+				<unitPattern count="one">{0}গ্রাম</unitPattern>
+				<unitPattern count="other">{0} গ্রাম</unitPattern>
+				<perUnitPattern draft="provisional">{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>আউন্স</displayName>
-				<unitPattern count="one">{0} আউন্স</unitPattern>
-				<unitPattern count="other">{0} আউন্স</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>পাউন্ড</displayName>
-				<unitPattern count="one">{0} পাউন্ড</unitPattern>
-				<unitPattern count="other">{0} পাউন্ড</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tn</displayName>
 				<unitPattern count="one">{0} tn</unitPattern>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>পাউন্ড</displayName>
+				<unitPattern count="one">{0} পাউন্ড</unitPattern>
+				<unitPattern count="other">{0} পাউন্ড</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>আউন্স</displayName>
+				<unitPattern count="one">{0} আউন্স</unitPattern>
+				<unitPattern count="other">{0} আউন্স</unitPattern>
+				<perUnitPattern>{0}প্রতি/আউন্স</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>CD</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>হর্সপাওয়ার</displayName>
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>কিলোওয়াট</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>কিলোওয়াট</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>ওয়াট</displayName>
 				<unitPattern count="one">{0} ওয়াট</unitPattern>
 				<unitPattern count="other">{0} ওয়াট</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>হর্সপাওয়ার</displayName>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -6911,10 +7193,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>ঘন্টা প্রতি কিলোমিটার</displayName>
@@ -6931,6 +7218,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mph</unitPattern>
 				<unitPattern count="other">{0} mph</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -6946,31 +7243,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cL</displayName>
-				<unitPattern count="one">{0} cL</unitPattern>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>কিউবিক কিলোমিটার</displayName>
 				<unitPattern count="one">{0} কিউবিক কিলোমিটার</unitPattern>
@@ -6980,6 +7252,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>কিউবিক মাইল</displayName>
@@ -6991,25 +7270,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>cup</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="one">{0} dL</unitPattern>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -7020,27 +7294,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>লিটার</displayName>
 				<unitPattern count="one">{0} লিটার</unitPattern>
 				<unitPattern count="other">{0} লিটার</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="one">{0} ML</unitPattern>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0} dL</unitPattern>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="one">{0} cL</unitPattern>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
 				<unitPattern count="one">{0} mL</unitPattern>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cup</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>tbsp</displayName>
 				<unitPattern count="one">{0} tbsp</unitPattern>
@@ -7051,6 +7362,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} tsp</unitPattern>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="provisional">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="provisional">{0} উ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}দ</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}প</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -7060,6 +7377,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} জি-বল</unitPattern>
 				<unitPattern count="other">{0} জি-বল</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}ডিগ্রী</unitPattern>
+				<unitPattern count="other">{0}ডিগ্রী</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}মিনিট</unitPattern>
 				<unitPattern count="other">{0}মিনিট</unitPattern>
@@ -7068,26 +7389,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}সেকেন্ড</unitPattern>
 				<unitPattern count="other">{0}সেকেন্ড</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}ডিগ্রী</unitPattern>
-				<unitPattern count="other">{0}ডিগ্রী</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} একর</unitPattern>
-				<unitPattern count="other">{0} একর</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} বর্গ কিমি</unitPattern>
+				<unitPattern count="other">{0} বর্গ কিমি</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} হেক্টর</unitPattern>
 				<unitPattern count="other">{0} হেক্টর</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} বর্গ ফুট</unitPattern>
-				<unitPattern count="other">{0} বর্গ ফুট</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} বর্গ কিমি</unitPattern>
-				<unitPattern count="other">{0} বর্গ কিমি</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} m²</unitPattern>
 				<unitPattern count="other">{0} m²</unitPattern>
@@ -7096,6 +7405,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} বর্গ মাইল</unitPattern>
 				<unitPattern count="other">{0} বর্গ মাইল</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} একর</unitPattern>
+				<unitPattern count="other">{0} একর</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} বর্গ ফুট</unitPattern>
+				<unitPattern count="other">{0} বর্গ ফুট</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0}লি/100কিমী</unitPattern>
+				<unitPattern count="other">{0}লি/100কিমী</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>বছর</displayName>
+				<unitPattern count="one">{0} বছর</unitPattern>
+				<unitPattern count="other">{0} বছর</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>মাস</displayName>
+				<unitPattern count="one">{0} মাস</unitPattern>
+				<unitPattern count="other">{0} মাস</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>সপ্তাহ</displayName>
+				<unitPattern count="one">{0} সপ্তাহ</unitPattern>
+				<unitPattern count="other">{0} সপ্তাহ</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>দিন</displayName>
 				<unitPattern count="one">{0} দিন</unitPattern>
@@ -7106,66 +7443,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ঘন্টা</unitPattern>
 				<unitPattern count="other">{0} ঘন্টা</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>মিলিসেকেন্ড</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>মিনিট</displayName>
 				<unitPattern count="one">{0} মিনিট</unitPattern>
 				<unitPattern count="other">{0} মিনিট</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>মাস</displayName>
-				<unitPattern count="one">{0} মাস</unitPattern>
-				<unitPattern count="other">{0} মাস</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>সেকেন্ড</displayName>
 				<unitPattern count="one">{0} সেকেন্ড</unitPattern>
 				<unitPattern count="other">{0} সেকেন্ড</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>সপ্তাহ</displayName>
-				<unitPattern count="one">{0} সপ্তাহ</unitPattern>
-				<unitPattern count="other">{0} সপ্তাহ</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>বছর</displayName>
-				<unitPattern count="one">{0} বছর</unitPattern>
-				<unitPattern count="other">{0} বছর</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>সেন্টিমিটার</displayName>
-				<unitPattern count="one">{0} সেমি</unitPattern>
-				<unitPattern count="other">{0} সেমি</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0} ফুট</unitPattern>
-				<unitPattern count="other">{0} ফুট</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0} ইঞ্চি</unitPattern>
-				<unitPattern count="other">{0} ইঞ্চি</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>মিলিসেকেন্ড</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>কিলোমিটার</displayName>
 				<unitPattern count="one">{0} কিমি</unitPattern>
 				<unitPattern count="other">{0} কিমি</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} আলোকবর্ষ</unitPattern>
-				<unitPattern count="other">{0} আলোকবর্ষ</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>মিটার</displayName>
 				<unitPattern count="one">{0} মিটার</unitPattern>
 				<unitPattern count="other">{0} মিটার</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} মাইল</unitPattern>
-				<unitPattern count="other">{0} মাইল</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>সেন্টিমিটার</displayName>
+				<unitPattern count="one">{0} সেমি</unitPattern>
+				<unitPattern count="other">{0} সেমি</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>মিলিমিটার</displayName>
@@ -7176,31 +7482,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} পিমি</unitPattern>
 				<unitPattern count="other">{0} পিমি</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} মাইল</unitPattern>
+				<unitPattern count="other">{0} মাইল</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} গজ</unitPattern>
 				<unitPattern count="other">{0} গজ</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>গ্রাম</displayName>
-				<unitPattern count="one">{0} গ্রাম</unitPattern>
-				<unitPattern count="other">{0} গ্রাম</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} ফুট</unitPattern>
+				<unitPattern count="other">{0} ফুট</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} ইঞ্চি</unitPattern>
+				<unitPattern count="other">{0} ইঞ্চি</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} আলোকবর্ষ</unitPattern>
+				<unitPattern count="other">{0} আলোকবর্ষ</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>কিলোগ্রাম</displayName>
 				<unitPattern count="one">{0} কেজি</unitPattern>
 				<unitPattern count="other">{0} কেজি</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} আউন্স</unitPattern>
-				<unitPattern count="other">{0} আউন্স</unitPattern>
+			<unit type="mass-gram">
+				<displayName>গ্রাম</displayName>
+				<unitPattern count="one">{0} গ্রাম</unitPattern>
+				<unitPattern count="other">{0} গ্রাম</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} পাউন্ড</unitPattern>
 				<unitPattern count="other">{0} পাউন্ড</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} আউন্স</unitPattern>
+				<unitPattern count="other">{0} আউন্স</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} kW</unitPattern>
@@ -7210,6 +7528,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ওয়াট</unitPattern>
 				<unitPattern count="other">{0} ওয়াট</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
@@ -7257,6 +7579,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} লিটার</unitPattern>
 				<unitPattern count="other">{0} লিটার</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="provisional">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="provisional">{0} উ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bn_BD.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bn_BD.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bn_BD.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bn_BD.xml
index e3c98d9d494..12e57798529 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bn_BD.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bn_BD.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="bn"/>
 		<territory type="BD"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bn_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bn_IN.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bn_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bn_IN.xml
index 3f1bd3cfa7c..70ea0942de6 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bn_IN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bn_IN.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11169 $"/>
-		<generation date="$Date: 2015-02-09 16:11:16 -0600 (Mon, 09 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="bn"/>
 		<territory type="IN"/>
 	</identity>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bo.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bo.xml
similarity index 80%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bo.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bo.xml
index 6ce5b6542a9..f82e69ec23c 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bo.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bo.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="bo"/>
 	</identity>
 	<localeDisplayNames>
@@ -17,10 +16,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="da" draft="unconfirmed">ཏེན་མག་གི་སྐད།</language>
 			<language type="de" draft="provisional">འཇར་མན་གྱི།</language>
 			<language type="dz">རྫོང་ཁ</language>
-			<language type="en" draft="unconfirmed">དབིན་ཇིའི་སྐད།</language>
-			<language type="en_CA" draft="unconfirmed">དབིན་ཇིའི་སྐད། (ཁེ་ན་ཌ་)</language>
-			<language type="en_GB" draft="unconfirmed">དབིན་ཇིའི་སྐད། (དབིན་ཇིའི་རྒྱལ་ཁབ་)</language>
-			<language type="en_US" draft="unconfirmed">དབིན་ཇིའི་སྐད། (ཨ་རི་)</language>
+			<language type="en">དབྱིན་ཇིའི་སྐད།</language>
+			<language type="en_CA">དབྱིན་ཇིའི་སྐད། (ཁེ་ན་ཌ་)</language>
+			<language type="en_GB">དབྱིན་ཇིའི་སྐད། (དབྱིན་ལན་)</language>
+			<language type="en_US">དབྱིན་ཇིའི་སྐད། (ཨ་རི་)</language>
 			<language type="es" draft="provisional">ཞི་པན་ཡའི།</language>
 			<language type="fr" draft="provisional">ཧྥ་རན་སིའི་།</language>
 			<language type="gaa" draft="unconfirmed">གཱ་སྐད།</language>
@@ -28,7 +27,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="hi">ཧིན་དི</language>
 			<language type="id" draft="unconfirmed">ཨིན་དོ་ནི་སི་སྐད།</language>
 			<language type="it" draft="provisional">དབྱི་ཏ་་ལའི་མི།</language>
-			<language type="ja">རི་པིན་སྐད་</language>
+			<language type="ja">ཉི་ཧོང་སྐད་</language>
 			<language type="kn" draft="unconfirmed">ཀནྣ་ཌ་སྐད།</language>
 			<language type="ko" draft="unconfirmed">ཁོ་རེ་ཡའི་སྐད།</language>
 			<language type="la" draft="unconfirmed">ལཱ་ཏིན་སྐད།</language>
@@ -62,19 +61,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="zh_Hant" draft="provisional">སྲོལ་རྒྱུན་གྱི།</language>
 			<language type="zu" draft="unconfirmed">ཟུ་ལུ་སྐད།</language>
 			<language type="zun" draft="unconfirmed">ཟུ་ནི་སྐད།</language>
-			<language type="zza" draft="unconfirmed">ཟ་ཟཱ་སྐད།</language>
+			<language type="zza">ཟ་ཟའ་སྐད།</language>
 		</languages>
 		<scripts>
 			<script type="Arab" draft="provisional">འ་ལ་པོའི་སྐད་ཡིག་།</script>
 			<script type="Cyrl" draft="provisional">གོ་སའི་ལ་ཧྥུ་སྐད་ཡིག་།</script>
 			<script type="Deva" draft="unconfirmed">དེ་བ་ནཱ་ག་རཱི་སྐད་ཡིག</script>
 			<script type="Gujr" draft="unconfirmed">གུཇ་རཱཏི་སྐད།</script>
-			<script type="Hans" draft="provisional">སླ་བསྡུའི་རྒྱའི་སྐད་ཡིག།</script>
-			<script type="Hant" draft="provisional">གནའ་དུས་རྒྱའི་སྐད་ཡིག།</script>
+			<script type="Hans">རྒྱ་ཡིག་གསར་པ།</script>
+			<script type="Hant">རྒྱ་ཡིག་རྙིང་པ།</script>
 			<script type="Latn" draft="provisional">ལ་ཏིན་སྐད་ཡིག་།</script>
 			<script type="Mymr" draft="unconfirmed">འབར་མའི་སྐད་ཡིག</script>
 			<script type="Tibt">བོད་ཡིག་</script>
-			<script type="Zxxx" draft="provisional">སྙན་བརྒྱུད། ཡིག་རིགས་སུ་མ་བཀོད་པའི་ཟིན་ཐོ།་</script>
+			<script type="Zxxx">སྙན་བརྒྱུད། ཡིག་རིགས་སུ་མ་བཀོད་པའི་ཟིན་ཐོ།</script>
 			<script type="Zzzz" draft="provisional">མིའི་ཤེས་རྟོགས་མ་བྱུང་བ། ཡང་ན་ཆད་ལྷག་ཅན་གྱི་ཟིན་བྲིས།</script>
 		</scripts>
 		<territories>
@@ -170,13 +169,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="IT">ཨི་ཀྲར་ལི་</territory>
 			<territory type="JM" draft="unconfirmed">ཛ་མེ་ཀ།</territory>
 			<territory type="JO" draft="unconfirmed">ཇོར་ཌན།</territory>
-			<territory type="JP">རི་པིན་</territory>
+			<territory type="JP">ཉི་ཧོང་</territory>
 			<territory type="KE" draft="unconfirmed">ཁེན་ཉི་ཡ།</territory>
 			<territory type="KG" draft="unconfirmed">ཁིར་གིཛ་སྟཱན།</territory>
 			<territory type="KH" draft="unconfirmed">ཀམ་བོ་ཌི་ཡ།</territory>
 			<territory type="KI" draft="unconfirmed">ཀི་རི་བཱ་ཏི།</territory>
 			<territory type="KN" draft="unconfirmed">སེནྚ། ཀིཊྚས྄། དང༌། ནེ་བིས྄།</territory>
-			<territory type="KR" draft="unconfirmed">ཀོ་རི་ཡ། ལྷོ་མ།</territory>
+			<territory type="KR">ལྷོ་ཀོ་རི་ཡ།</territory>
 			<territory type="KW" draft="unconfirmed">ཀུ་ཝེད་རྒྱལ་ཁབ།</territory>
 			<territory type="KY" draft="unconfirmed">ཁེ་མེན་གླིང་ཕྲན།</territory>
 			<territory type="KZ" draft="unconfirmed">ཁ་ཛཱག་སྟཱན།</territory>
@@ -213,7 +212,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="NI" draft="unconfirmed">ནི་ཀ་ར་གུ་ཨ།</territory>
 			<territory type="NL" draft="unconfirmed">ཧའོ་ལན།</territory>
 			<territory type="NO" draft="unconfirmed">ནོར་ཝེ།</territory>
-			<territory type="NP">བར་ཡུལ་</territory>
+			<territory type="NP">བལ་ཡུལ་</territory>
 			<territory type="NR" draft="unconfirmed">ནཽ་རུ།</territory>
 			<territory type="NU" draft="unconfirmed">ནིའུ་ཝ།</territory>
 			<territory type="NZ" draft="unconfirmed">ནིའུ་ཛི་ལན྄ཌ།</territory>
@@ -287,20 +286,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateFormats>
 					<dateFormatLength type="long">
 						<dateFormat>
-							<pattern>G སྤྱི་ལོ་y MMMMའི་ཙེས་dད</pattern>
+							<pattern>G སྤྱི་ལོ་y MMMMའི་ཚེས་d</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern>G y ལོ་འི་MMMཙེས་d</pattern>
+							<pattern>G y ལོའི་MMMཚེས་d</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
 				<dateTimeFormats>
 					<availableFormats>
-						<dateFormatItem id="yMMMd">G y ལོ་འི་MMMཙེས་d</dateFormatItem>
-						<dateFormatItem id="yMMMMd">G སྤྱི་ལོ་y MMMMའི་ཙེས་dད</dateFormatItem>
-						<dateFormatItem id="yyyyMMMd">G y ལོ་འི་MMMཙེས་d</dateFormatItem>
+						<dateFormatItem id="yMMMd">G y ལོའི་MMMཚེས་d</dateFormatItem>
+						<dateFormatItem id="yMMMMd">G སྤྱི་ལོ་y MMMMའི་ཚེས་d</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">G y ལོའི་MMMཚེས་d</dateFormatItem>
 					</availableFormats>
 				</dateTimeFormats>
 			</calendar>
@@ -321,10 +320,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="11">ཟླ་༡༡</month>
 							<month type="12">ཟླ་༡༢</month>
 						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">ཟླ་བ་དང་པོ</month>
+							<month type="2">ཟླ་བ་གཉིས་པ</month>
+							<month type="3">ཟླ་བ་གསུམ་པ</month>
+							<month type="4">ཟླ་བ་བཞི་པ</month>
+							<month type="5">ཟླ་བ་ལྔ་པ</month>
+							<month type="6">ཟླ་བ་དྲུག་པ</month>
+							<month type="7">ཟླ་བ་བདུན་པ</month>
+							<month type="8">ཟླ་བ་བརྒྱད་པ</month>
+							<month type="9">ཟླ་བ་དགུ་པ</month>
+							<month type="10">ཟླ་བ་བཅུ་པ</month>
+							<month type="11">ཟླ་བ་བཅུ་གཅིག་པ</month>
+							<month type="12">ཟླ་བ་བཅུ་གཉིས་པ</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
 						<monthWidth type="wide">
 							<month type="1">ཟླ་བ་དང་པོ་</month>
 							<month type="2">ཟླ་བ་གཉིས་པ་</month>
-							<month type="3">ཟླ་བ་སུམ་པ་</month>
+							<month type="3">ཟླ་བ་གསུམ་པ་</month>
 							<month type="4">ཟླ་བ་བཞི་པ་</month>
 							<month type="5">ཟླ་བ་ལྔ་པ་</month>
 							<month type="6">ཟླ་བ་དྲུག་པ་</month>
@@ -351,11 +366,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dayWidth type="narrow">
 							<day type="sun">ཉི</day>
 							<day type="mon">ཟླ</day>
-							<day type="tue">མི</day>
-							<day type="wed">ལྷ</day>
-							<day type="thu">ཕུ</day>
-							<day type="fri">པ</day>
-							<day type="sat">སྤེ</day>
+							<day type="tue">མིག</day>
+							<day type="wed">ལྷག</day>
+							<day type="thu">ཕུར</day>
+							<day type="fri">སངས</day>
+							<day type="sat">སྤེན</day>
 						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">གཟའ་ཉི་མ་</day>
@@ -380,11 +395,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dayWidth type="narrow">
 							<day type="sun">ཉི</day>
 							<day type="mon">ཟླ</day>
-							<day type="tue">མི</day>
-							<day type="wed">ལྷ</day>
-							<day type="thu">ཕུ</day>
-							<day type="fri">པ</day>
-							<day type="sat">སྤེ</day>
+							<day type="tue">མིག</day>
+							<day type="wed">ལྷག</day>
+							<day type="thu">ཕུར</day>
+							<day type="fri">སངས</day>
+							<day type="sat">སྤེན</day>
 						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">གཟའ་ཉི་མ་</day>
@@ -400,35 +415,39 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<quarters>
 					<quarterContext type="format">
 						<quarterWidth type="abbreviated">
-							<quarter type="1" draft="provisional">དུས་ཚིགས་དང་པོ།</quarter>
-							<quarter type="2" draft="provisional">དུས་ཚིགས་གཉིས་པ།</quarter>
-							<quarter type="3" draft="provisional">་དུས་ཚིགས་གསུམ་པ།</quarter>
-							<quarter type="4" draft="provisional">དུས་ཚིགས་བཞི་པ།</quarter>
+							<quarter type="1">དུས་ཚིགས་དང་པོ།</quarter>
+							<quarter type="2">དུས་ཚིགས་གཉིས་པ།</quarter>
+							<quarter type="3">དུས་ཚིགས་གསུམ་པ།</quarter>
+							<quarter type="4">དུས་ཚིགས་བཞི་པ།</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
-							<quarter type="1" draft="provisional">དུས་ཚིགས་དང་པོ།</quarter>
-							<quarter type="2" draft="provisional">དུས་ཚིགས་གཉིས་པ།</quarter>
-							<quarter type="3" draft="provisional">་དུས་ཚིགས་གསུམ་པ།</quarter>
-							<quarter type="4" draft="provisional">དུས་ཚིགས་བཞི་པ།</quarter>
+							<quarter type="1">དུས་ཚིགས་དང་པོ།</quarter>
+							<quarter type="2">དུས་ཚིགས་གཉིས་པ།</quarter>
+							<quarter type="3">དུས་ཚིགས་གསུམ་པ།</quarter>
+							<quarter type="4">དུས་ཚིགས་བཞི་པ།</quarter>
 						</quarterWidth>
 					</quarterContext>
 					<quarterContext type="stand-alone">
 						<quarterWidth type="abbreviated">
-							<quarter type="1" draft="provisional">དུས་ཚིགས་དང་པོ།</quarter>
-							<quarter type="2" draft="provisional">དུས་ཚིགས་གཉིས་པ།</quarter>
-							<quarter type="3" draft="provisional">་དུས་ཚིགས་གསུམ་པ།</quarter>
-							<quarter type="4" draft="provisional">དུས་ཚིགས་བཞི་པ།</quarter>
+							<quarter type="1">དུས་ཚིགས་དང་པོ།</quarter>
+							<quarter type="2">དུས་ཚིགས་གཉིས་པ།</quarter>
+							<quarter type="3">དུས་ཚིགས་གསུམ་པ།</quarter>
+							<quarter type="4">དུས་ཚིགས་བཞི་པ།</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
-							<quarter type="1" draft="provisional">དུས་ཚིགས་དང་པོ།</quarter>
-							<quarter type="2" draft="provisional">དུས་ཚིགས་གཉིས་པ།</quarter>
-							<quarter type="3" draft="provisional">་དུས་ཚིགས་གསུམ་པ།</quarter>
-							<quarter type="4" draft="provisional">དུས་ཚིགས་བཞི་པ།</quarter>
+							<quarter type="1">དུས་ཚིགས་དང་པོ།</quarter>
+							<quarter type="2">དུས་ཚིགས་གཉིས་པ།</quarter>
+							<quarter type="3">དུས་ཚིགས་གསུམ་པ།</quarter>
+							<quarter type="4">དུས་ཚིགས་བཞི་པ།</quarter>
 						</quarterWidth>
 					</quarterContext>
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">སྔ་དྲོ་</dayPeriod>
+							<dayPeriod type="pm">ཕྱི་དྲོ་</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">སྔ་དྲོ་</dayPeriod>
 							<dayPeriod type="pm">ཕྱི་དྲོ་</dayPeriod>
@@ -437,26 +456,63 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</dayPeriods>
 				<eras>
 					<eraAbbr>
-						<era type="0" draft="contributed">སྤྱི་ལོ་སྔོན།</era>
-						<era type="1" draft="contributed">སྤྱི་ལོ།</era>
+						<era type="0">སྤྱི་ལོ་སྔོན་</era>
+						<era type="1">སྤྱི་ལོ་</era>
 					</eraAbbr>
 				</eras>
 				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>y MMMMའི་ཚེས་d, EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
-							<pattern>སྤྱི་ལོ་y MMMMའི་ཙེས་dད</pattern>
+							<pattern>སྤྱི་ལོ་y MMMMའི་ཚེས་d</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern>y ལོ་འི་MMMཙེས་d</pattern>
+							<pattern>y ལོའི་MMMཚེས་d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>y-MM-dd</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>h:mm:ss a zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>h:mm:ss a z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>h:mm:ss a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>h:mm a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
 				<dateTimeFormats>
 					<availableFormats>
-						<dateFormatItem id="yMMMd">y ལོ་འི་MMMཙེས་d</dateFormatItem>
-						<dateFormatItem id="yMMMMd">སྤྱི་ལོ་y MMMMའི་ཙེས་dད</dateFormatItem>
+						<dateFormatItem id="GyMMM">G y LLLL</dateFormatItem>
+						<dateFormatItem id="MMMd">MMMཚེས་d</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMMཚེས་d, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMMའི་ཚེས་d</dateFormatItem>
+						<dateFormatItem id="yMMM">y LLL</dateFormatItem>
+						<dateFormatItem id="yMMMd">y ལོའི་MMMཚེས་d</dateFormatItem>
+						<dateFormatItem id="yMMMMd">སྤྱི་ལོ་y MMMMའི་ཚེས་d</dateFormatItem>
 					</availableFormats>
 				</dateTimeFormats>
 			</calendar>
@@ -476,11 +532,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day">
 				<displayName draft="contributed">ཉིན།</displayName>
-				<relative type="-2">ཁས་ཉིན་ཀ་</relative>
+				<relative type="-2">ཁས་ཉིན་</relative>
 				<relative type="-1">ཁས་ས་</relative>
 				<relative type="0">དེ་རིང་</relative>
 				<relative type="1">སང་ཉིན་</relative>
-				<relative type="2">གནངས་ཉིན་ཀ་</relative>
+				<relative type="2">གནངས་ཉིན་</relative>
 			</field>
 			<field type="weekday">
 				<displayName draft="provisional">གཟའ་འཁོར་གཅིག</displayName>
@@ -489,7 +545,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName draft="provisional">སྔ་དྲོ། ཕྱི་དྲོ།</displayName>
 			</field>
 			<field type="hour">
-				<displayName>ཆུ་ཙོ་</displayName>
+				<displayName>ཆུ་ཚོད་</displayName>
 			</field>
 			<field type="minute">
 				<displayName draft="contributed">སྐར་མ།</displayName>
@@ -540,6 +596,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern draft="unconfirmed">¤ #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="CNY">
@@ -547,10 +619,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>¥</symbol>
 			</currency>
 			<currency type="INR">
-				<displayName>རྒྱ་གར་སྒོར་མོ་</displayName>
+				<displayName>རྒྱ་གར་སྒོར་</displayName>
 			</currency>
 			<currency type="USD">
-				<displayName draft="unconfirmed">ཨ་རིའི་སྒོར་མོ།</displayName>
+				<displayName>ཨ་རིའི་སྒོར་</displayName>
 			</currency>
 			<currency type="XXX">
 				<displayName>མ་རྟོགས་པའི་ནུས་མེད་དངུལ་ལོར</displayName>
@@ -559,8 +631,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</numbers>
 	<posix>
 		<messages>
-			<yesstr draft="unconfirmed">ཡིན།:Y</yesstr>
-			<nostr draft="unconfirmed">མེད།:N</nostr>
+			<yesstr>ཡིན།:Y</yesstr>
+			<nostr>མིན།:N</nostr>
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bo_CN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bo_CN.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bo_CN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bo_CN.xml
index e933321c03e..dc1c51d5137 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bo_CN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bo_CN.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="bo"/>
 		<territory type="CN"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bo_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bo_IN.xml
similarity index 79%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bo_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bo_IN.xml
index 9159706316f..5256c475d3c 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bo_IN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bo_IN.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="bo"/>
 		<territory type="IN"/>
 	</identity>
@@ -24,3 +23,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/br.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/br.xml
similarity index 64%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/br.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/br.xml
index 095bae1338b..9898d9877dc 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/br.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/br.xml
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11093 $"/>
-		<generation date="$Date: 2015-01-02 21:36:02 -0600 (Fri, 02 Jan 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="br"/>
 	</identity>
 	<localeDisplayNames>
+		<localeDisplayPattern>
+			<localePattern>{0} ({1})</localePattern>
+			<localeSeparator>{0}, {1}</localeSeparator>
+			<localeKeyTypePattern>{0} : {1}</localeKeyTypePattern>
+		</localeDisplayPattern>
 		<languages>
 			<language type="aa">afar</language>
 			<language type="ab">abkhazeg</language>
@@ -33,10 +37,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="am">amhareg</language>
 			<language type="an">aragoneg</language>
 			<language type="ang">hensaozneg</language>
+			<language type="anp">angika</language>
 			<language type="ar">arabeg</language>
 			<language type="ar_001">arabeg modern</language>
 			<language type="arc">arameeg</language>
 			<language type="arn">araoukaneg</language>
+			<language type="aro">araona</language>
 			<language type="arp">arapaho</language>
 			<language type="arq">arabeg Aljeria</language>
 			<language type="arw">arawakeg</language>
@@ -44,11 +50,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="arz">arabeg Egipt</language>
 			<language type="as">asameg</language>
 			<language type="asa">asu</language>
+			<language type="ase">yezh sinoù Amerika</language>
+			<language type="ast">asturianeg</language>
 			<language type="av">avar</language>
 			<language type="awa">awadhi</language>
 			<language type="ay">aymara</language>
-			<language type="az">azeri</language>
-			<language type="azb">azeri ar Su</language>
+			<language type="az">azerbaidjaneg</language>
+			<language type="az" alt="short">azeri</language>
 			<language type="ba">bachkir</language>
 			<language type="bal">baloutchi</language>
 			<language type="ban">balineg</language>
@@ -59,6 +67,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bem">bemba</language>
 			<language type="bez">bena</language>
 			<language type="bg">bulgareg</language>
+			<language type="bgn">baloutchi ar Cʼhornôg</language>
 			<language type="bho">bhojpuri</language>
 			<language type="bi">bislama</language>
 			<language type="bik">bikol</language>
@@ -71,12 +80,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="brh">brahweg</language>
 			<language type="brx">bodo</language>
 			<language type="bs">bosneg</language>
+			<language type="bss">akoose</language>
 			<language type="bua">bouriat</language>
 			<language type="bug">bugi</language>
 			<language type="byn">blin</language>
 			<language type="ca">katalaneg</language>
 			<language type="cad">caddo</language>
 			<language type="car">karibeg</language>
+			<language type="cch">atsam</language>
 			<language type="ce">tchetcheneg</language>
 			<language type="ceb">cebuano</language>
 			<language type="ch">chamorru</language>
@@ -122,9 +133,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="en_AU">saozneg Aostralia</language>
 			<language type="en_CA">saozneg Kanada</language>
 			<language type="en_GB">saozneg Breizh-Veur</language>
-			<language type="en_GB" alt="short">saozneg R.U.</language>
+			<language type="en_GB" alt="short">saozneg RU</language>
 			<language type="en_US">saozneg Amerika</language>
-			<language type="en_US" alt="short">saozneg S.U.</language>
+			<language type="en_US" alt="short">saozneg SU</language>
 			<language type="enm">krennsaozneg</language>
 			<language type="eo">esperanteg</language>
 			<language type="es">spagnoleg</language>
@@ -139,12 +150,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="fat">fanti</language>
 			<language type="fi">finneg</language>
 			<language type="fil">filipineg</language>
+			<language type="fit">finneg traoñienn an Torne</language>
 			<language type="fj">fidjieg</language>
 			<language type="fo">faeroeg</language>
 			<language type="fon">fon</language>
 			<language type="fr">galleg</language>
 			<language type="fr_CA">galleg Kanada</language>
 			<language type="fr_CH">galleg Suis</language>
+			<language type="frc">galleg cajun</language>
 			<language type="frm">krenncʼhalleg</language>
 			<language type="fro">hencʼhalleg</language>
 			<language type="frp">arpitaneg</language>
@@ -203,6 +216,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="it">italianeg</language>
 			<language type="iu">inuktitut</language>
 			<language type="ja">japaneg</language>
+			<language type="jam">kreoleg Jamaika</language>
 			<language type="jpr">yuzev-perseg</language>
 			<language type="jrb">yuzev-arabeg</language>
 			<language type="jv">javaneg</language>
@@ -232,6 +246,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="krl">karelieg</language>
 			<language type="kru">kurukh</language>
 			<language type="ks">kashmiri</language>
+			<language type="ksh">koluneg</language>
 			<language type="ku">kurdeg</language>
 			<language type="kut">kutenai</language>
 			<language type="kw">kerneveureg</language>
@@ -283,6 +298,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mt">malteg</language>
 			<language type="mul">yezhoù lies</language>
 			<language type="mus">muskogi</language>
+			<language type="mwl">mirandeg</language>
 			<language type="my">birmaneg</language>
 			<language type="myv">erza</language>
 			<language type="na">naurueg</language>
@@ -291,11 +307,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nb">norvegeg bokmål</language>
 			<language type="nd">ndebele an Norzh</language>
 			<language type="nds">alamaneg izel</language>
+			<language type="nds_NL">saksoneg izel</language>
 			<language type="ne">nepaleg</language>
 			<language type="new">newari</language>
 			<language type="ng">ndonga</language>
 			<language type="nia">nias</language>
 			<language type="niu">niue</language>
+			<language type="njo">aoeg</language>
 			<language type="nl">nederlandeg</language>
 			<language type="nl_BE">flandrezeg</language>
 			<language type="nn">norvegeg nynorsk</language>
@@ -339,6 +357,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="pt_BR">portugaleg Brazil</language>
 			<language type="pt_PT">portugaleg Europa</language>
 			<language type="qu">kechuaeg</language>
+			<language type="qug">kichuaeg Chimborazo</language>
 			<language type="raj">rajasthani</language>
 			<language type="rap">rapanui</language>
 			<language type="rar">rarotonga</language>
@@ -368,6 +387,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sg">sango</language>
 			<language type="sga">heniwerzhoneg</language>
 			<language type="sh">serb-kroateg</language>
+			<language type="shi">tacheliteg</language>
 			<language type="shn">shan</language>
 			<language type="shu">arabeg Tchad</language>
 			<language type="si">singhaleg</language>
@@ -392,9 +412,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">sumereg</language>
 			<language type="sv">svedeg</language>
 			<language type="sw">swahili</language>
+			<language type="sw_CD">swahili Kongo</language>
 			<language type="swb">komoreg</language>
 			<language type="syc">sirieg klasel</language>
 			<language type="syr">sirieg</language>
+			<language type="szl">silezieg</language>
 			<language type="ta">tamileg</language>
 			<language type="tcy">touloueg</language>
 			<language type="te">telougou</language>
@@ -416,6 +438,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="tog">nyasa tonga</language>
 			<language type="tpi">tok pisin</language>
 			<language type="tr">turkeg</language>
+			<language type="tru">turoyoeg</language>
 			<language type="ts">tsonga</language>
 			<language type="tsi">tsimshian</language>
 			<language type="tt">tatar</language>
@@ -424,6 +447,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="tw">twi</language>
 			<language type="ty">tahitianeg</language>
 			<language type="tyv">touva</language>
+			<language type="tzm">tamazigteg Kreizatlas</language>
 			<language type="udm">oudmourteg</language>
 			<language type="ug">ouigoureg</language>
 			<language type="uga">ougariteg</language>
@@ -434,10 +458,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="uz">ouzbekeg</language>
 			<language type="vai">vai</language>
 			<language type="ve">venda</language>
+			<language type="vec">venezieg</language>
+			<language type="vep">vepseg</language>
 			<language type="vi">vietnameg</language>
 			<language type="vls">flandrezeg ar c’hornôg</language>
 			<language type="vo">volapük</language>
 			<language type="vot">votyakeg</language>
+			<language type="vro">voroeg</language>
 			<language type="wa">walloneg</language>
 			<language type="wae">walser</language>
 			<language type="wal">walamo</language>
@@ -447,6 +474,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wuu">sinaeg Wu</language>
 			<language type="xal">kalmouk</language>
 			<language type="xh">xhosa</language>
+			<language type="xmf">megreleg</language>
 			<language type="yao">yao</language>
 			<language type="yap">yapeg</language>
 			<language type="yi">yiddish</language>
@@ -573,7 +601,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antilhez Nederlandat</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antarktika</territory>
 			<territory type="AR">Arcʼhantina</territory>
@@ -596,7 +623,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BM">Bermuda</territory>
 			<territory type="BN">Brunei</territory>
 			<territory type="BO">Bolivia</territory>
-			<territory type="BQ">Nederlandat Karib</territory>
+			<territory type="BQ">Karib Nederlandat</territory>
 			<territory type="BR">Brazil</territory>
 			<territory type="BS">Bahamas</territory>
 			<territory type="BT">Bhoutan</territory>
@@ -622,7 +649,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CP">Enez Clipperton</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Kuba</territory>
-			<territory type="CV">Kab Glas</territory>
+			<territory type="CV">Kab-Glas</territory>
 			<territory type="CW">Curaçao</territory>
 			<territory type="CX">Enez Christmas</territory>
 			<territory type="CY">Kiprenez</territory>
@@ -652,7 +679,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="FR">Frañs</territory>
 			<territory type="GA">Gabon</territory>
 			<territory type="GB">Rouantelezh-Unanet</territory>
-			<territory type="GB" alt="short">R.U.</territory>
+			<territory type="GB" alt="short">RU</territory>
 			<territory type="GD">Grenada</territory>
 			<territory type="GE">Jorjia</territory>
 			<territory type="GF">Gwiana cʼhall</territory>
@@ -769,13 +796,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="PY">Paraguay</territory>
 			<territory type="QA">Qatar</territory>
 			<territory type="QO">Oseania diabell</territory>
-			<territory type="RE">Reünion</territory>
+			<territory type="RE">Ar Reünion</territory>
 			<territory type="RO">Roumania</territory>
 			<territory type="RS">Serbia</territory>
 			<territory type="RU">Rusia</territory>
 			<territory type="RW">Rwanda</territory>
 			<territory type="SA">Arabia Saoudat</territory>
-			<territory type="SB">Salomon</territory>
+			<territory type="SB">Inizi Salomon</territory>
 			<territory type="SC">Sechelez</territory>
 			<territory type="SD">Soudan</territory>
 			<territory type="SE">Sveden</territory>
@@ -817,7 +844,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="UG">Ouganda</territory>
 			<territory type="UM">Inizi diabell ar Stadoù-Unanet</territory>
 			<territory type="US">Stadoù-Unanet</territory>
-			<territory type="US" alt="short">S.U.</territory>
+			<territory type="US" alt="short">SU</territory>
 			<territory type="UY">Uruguay</territory>
 			<territory type="UZ">Ouzbekistan</territory>
 			<territory type="VA">Vatikan</territory>
@@ -852,7 +879,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<variant type="BAUDDHA">sanskriteg hiron boudaat</variant>
 			<variant type="BISCAYAN">rannyezh euskarek Bizkaia</variant>
 			<variant type="BISKE">rannyezh San Giorgio/Bila</variant>
+			<variant type="BOHORIC">lizherenneg Bohorič</variant>
 			<variant type="BOONT">boontling</variant>
+			<variant type="DAJNKO">lizherenneg Dajnko</variant>
+			<variant type="EMODENG">saozneg rakvodern</variant>
 			<variant type="FONIPA">lizherenneg fonetek etrebroadel</variant>
 			<variant type="FONUPA">lizherenneg fonetek ouralek</variant>
 			<variant type="FONXSAMP">treuzskrivadur X-SAMPA</variant>
@@ -862,20 +892,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<variant type="JAUER">rannyezh romañchek Jauer</variant>
 			<variant type="JYUTPING">romanekadur kantonek Jyutping</variant>
 			<variant type="KKCOR">kerneveureg kumun</variant>
+			<variant type="KOCIEWIE">Kociewie</variant>
+			<variant type="KSCOR">kerneveureg standart</variant>
 			<variant type="LAUKIKA">sanskriteg klasel</variant>
 			<variant type="LIPAW">rannyezh resianek Lipovaz</variant>
 			<variant type="LUNA1918">reizhskrivadur rusianek goude 1917</variant>
+			<variant type="METELKO">lizherenneg Metelko</variant>
 			<variant type="MONOTON">gresianeg untonel</variant>
 			<variant type="NDYUKA">rannyezh Ndyuka</variant>
 			<variant type="NEDIS">rannyezh Natisone</variant>
 			<variant type="NJIVA">rannyezh Gniva/Njiva</variant>
+			<variant type="NULIK">volapük modern</variant>
 			<variant type="OSOJS">rannyezh Oseacco/Osojane</variant>
 			<variant type="PAMAKA">rannyezh Pamaka</variant>
 			<variant type="PETR1708">reizhskrivadur rusianek 1708 Pêr I</variant>
 			<variant type="PINYIN">romanekadur pinyin</variant>
 			<variant type="POLYTON">gresianeg liestonel</variant>
+			<variant type="POSIX">POSIX</variant>
 			<variant type="PUTER">rannyezh romañchek Puter</variant>
 			<variant type="REVISED">reizhskrivadur reizhet</variant>
+			<variant type="RIGIK">volapük klasel</variant>
 			<variant type="ROZAJ">resianeg</variant>
 			<variant type="RUMGR">romañcheg Grischun</variant>
 			<variant type="SAAHO">saho</variant>
@@ -889,6 +925,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<variant type="UCCOR">kerneveureg unvan</variant>
 			<variant type="UCRCOR">kerneveureg unvan reizhet</variant>
 			<variant type="ULSTER">rannyezh skotek Ulad</variant>
+			<variant type="UNIFON">lizherenneg fonetek Unifon</variant>
 			<variant type="VAIDIKA">sanskriteg vedek</variant>
 			<variant type="VALENCIA">valensianeg</variant>
 			<variant type="VALLADER">rannyezh romañchek Vallader</variant>
@@ -898,104 +935,134 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="calendar">deiziadur</key>
 			<key type="collation">doare rummañ</key>
 			<key type="currency">moneiz</key>
+			<key type="hc">kelcʼhiad eurioù</key>
+			<key type="ms">reizhiad vuzuliañ</key>
 			<key type="numbers">niveroù</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">sifroù arabek indian</type>
-			<type type="arabext" key="numbers">sifroù arabek indian astennet</type>
-			<type type="armn" key="numbers">niveroù armenianek</type>
-			<type type="armnlow" key="numbers">niveroù armenianek bihan</type>
-			<type type="bali" key="numbers">sifroù balinek</type>
-			<type type="beng" key="numbers">sifroù bengali</type>
-			<type type="big5han" key="collation">urzh rummañ sinaek hengounel - Big5</type>
-			<type type="brah" key="numbers">sifroù brahmi</type>
-			<type type="buddhist" key="calendar">deiziadur boudaat</type>
-			<type type="chinese" key="calendar">deiziadur sinaat</type>
-			<type type="coptic" key="calendar">deiziadur kopt</type>
-			<type type="dangi" key="calendar">deiziadur dangi</type>
-			<type type="deva" key="numbers">sifroù devanagari</type>
-			<type type="dictionary" key="collation">urzh rummañ ar geriadur</type>
-			<type type="ducet" key="collation">urzh rummañ Unicode dre ziouer</type>
-			<type type="eor" key="collation">reolennoù urzhiañ europat</type>
-			<type type="ethi" key="numbers">niveroù etiopiat</type>
-			<type type="ethiopic" key="calendar">deiziadur etiopiat</type>
-			<type type="ethiopic-amete-alem" key="calendar">deiziadur etiopiat Amete Alem</type>
-			<type type="fullwide" key="numbers">sifroù led plaen</type>
-			<type type="gb2312han" key="collation">urzh rummañ sinaek eeunaet - GB2312</type>
-			<type type="geor" key="numbers">niveroù jorjianek</type>
-			<type type="gregorian" key="calendar">deiziadur gregorian</type>
-			<type type="grek" key="numbers">niveroù gresianek</type>
-			<type type="greklow" key="numbers">niveroù gresianek bihan</type>
-			<type type="gujr" key="numbers">sifroù gujarati</type>
-			<type type="guru" key="numbers">sifroù gurmukhi</type>
-			<type type="hanidec" key="numbers">niveroù sinaek dekvedennek</type>
-			<type type="hans" key="numbers">niveroù sinaek eeunaet</type>
-			<type type="hansfin" key="numbers">niveroù sinaek eeunaet an arcʼhant</type>
-			<type type="hant" key="numbers">niveroù sinaek hengounel</type>
-			<type type="hantfin" key="numbers">niveroù sinaek hengounel an arcʼhant</type>
-			<type type="hebr" key="numbers">niveroù hebraek</type>
-			<type type="hebrew" key="calendar">deiziadur hebraek</type>
-			<type type="indian" key="calendar">deiziadur indian</type>
-			<type type="islamic" key="calendar">deiziadur islamek</type>
-			<type type="islamic-civil" key="calendar">deiziadur islamek keodedel</type>
-			<type type="islamic-rgsa" key="calendar">deiziadur islamek (Arabia Saoudat)</type>
-			<type type="islamic-tbla" key="calendar">deiziadur islamek steredoniel</type>
-			<type type="islamic-umalqura" key="calendar">deiziadur islamek (Umm al-Qura)</type>
-			<type type="iso8601" key="calendar">deiziadur ISO-8601</type>
-			<type type="japanese" key="calendar">deiziadur japanat</type>
-			<type type="java" key="numbers">sifroù javanek</type>
-			<type type="jpan" key="numbers">niveroù japanek</type>
-			<type type="jpanfin" key="numbers">niveroù japanek an arcʼhant</type>
-			<type type="kali" key="numbers">sifroù Kayah Li</type>
-			<type type="khmr" key="numbers">sifroù khmer</type>
-			<type type="knda" key="numbers">sifroù kanarek</type>
-			<type type="lana" key="numbers">sifroù Tai Tham Hora</type>
-			<type type="lanatham" key="numbers">sifroù Tai Tham Tham</type>
-			<type type="laoo" key="numbers">sifroù laosek</type>
-			<type type="latn" key="numbers">sifroù arabek ar Cʼhornôg</type>
-			<type type="mlym" key="numbers">sifroù malayalam</type>
-			<type type="mong" key="numbers">sifroù mongolek</type>
-			<type type="mymr" key="numbers">sifroù myanmar</type>
-			<type type="mymrshan" key="numbers">sifroù shan Myanmar</type>
-			<type type="orya" key="numbers">sifroù oriya</type>
-			<type type="persian" key="calendar">deiziadur persek</type>
-			<type type="phonebook" key="collation">urzh rummañ al levr-pellgomz</type>
-			<type type="pinyin" key="collation">urzh rummañ pinyin</type>
-			<type type="reformed" key="collation">urzh rummañ adreizhet</type>
-			<type type="roc" key="calendar">deiziadur Republik Sina</type>
-			<type type="roman" key="numbers">niveroù roman</type>
-			<type type="romanlow" key="numbers">niveroù roman bihan</type>
-			<type type="search" key="collation">enklask hollek</type>
-			<type type="standard" key="collation">urzh rummañ standart</type>
-			<type type="stroke" key="collation">urzh rummañ an tresoù</type>
-			<type type="sund" key="numbers">sifroù sundanek</type>
-			<type type="taml" key="numbers">niveroù tamilek hengounel</type>
-			<type type="tamldec" key="numbers">sifroù tamilek</type>
-			<type type="telu" key="numbers">sifroù telougou</type>
-			<type type="thai" key="numbers">sifroù thai</type>
-			<type type="tibt" key="numbers">sifroù tibetan</type>
-			<type type="traditional" key="collation">urzh rummañ hengounel</type>
-			<type type="unihan" key="collation">urzh rummañ UniHan</type>
-			<type type="vaii" key="numbers">sifroù vai</type>
-			<type type="zhuyin" key="collation">urzh rummañ Zhuyin</type>
+			<type key="calendar" type="buddhist">deiziadur boudaat</type>
+			<type key="calendar" type="chinese">deiziadur sinaat</type>
+			<type key="calendar" type="coptic">deiziadur kopt</type>
+			<type key="calendar" type="dangi">deiziadur dangi</type>
+			<type key="calendar" type="ethiopic">deiziadur etiopiat</type>
+			<type key="calendar" type="ethiopic-amete-alem">deiziadur etiopiat Amete Alem</type>
+			<type key="calendar" type="gregorian">deiziadur gregorian</type>
+			<type key="calendar" type="hebrew">deiziadur hebraek</type>
+			<type key="calendar" type="indian">deiziadur indian</type>
+			<type key="calendar" type="islamic">deiziadur islamek</type>
+			<type key="calendar" type="islamic-civil">deiziadur islamek keodedel</type>
+			<type key="calendar" type="islamic-rgsa">deiziadur islamek (Arabia Saoudat)</type>
+			<type key="calendar" type="islamic-tbla">deiziadur islamek steredoniel</type>
+			<type key="calendar" type="islamic-umalqura">deiziadur islamek (Umm al-Qura)</type>
+			<type key="calendar" type="iso8601">deiziadur ISO-8601</type>
+			<type key="calendar" type="japanese">deiziadur japanat</type>
+			<type key="calendar" type="persian">deiziadur persek</type>
+			<type key="calendar" type="roc">deiziadur Republik Sina</type>
+			<type key="collation" type="big5han">urzh rummañ sinaek hengounel - Big5</type>
+			<type key="collation" type="dictionary">urzh rummañ ar geriadur</type>
+			<type key="collation" type="ducet">urzh rummañ Unicode dre ziouer</type>
+			<type key="collation" type="eor">reolennoù urzhiañ europat</type>
+			<type key="collation" type="gb2312han">urzh rummañ sinaek eeunaet - GB2312</type>
+			<type key="collation" type="phonebook">urzh rummañ al levr-pellgomz</type>
+			<type key="collation" type="pinyin">urzh rummañ pinyin</type>
+			<type key="collation" type="reformed">urzh rummañ adreizhet</type>
+			<type key="collation" type="search">enklask hollek</type>
+			<type key="collation" type="standard">urzh rummañ standart</type>
+			<type key="collation" type="stroke">urzh rummañ an tresoù</type>
+			<type key="collation" type="traditional">urzh rummañ hengounel</type>
+			<type key="collation" type="unihan">urzh rummañ UniHan</type>
+			<type key="collation" type="zhuyin">urzh rummañ Zhuyin</type>
+			<type key="hc" type="h11">reizhiad 12 eurvezh (0–11)</type>
+			<type key="hc" type="h12">reizhiad 12 eurvezh (1–12)</type>
+			<type key="hc" type="h23">reizhiad 24 eurvezh (0–23)</type>
+			<type key="hc" type="h24">reizhiad 24 eurvezh (1–24)</type>
+			<type key="ms" type="metric">reizhiad vetrek</type>
+			<type key="ms" type="uksystem">reizhiad vuzuliañ RU</type>
+			<type key="ms" type="ussystem">reizhiad vuzuliañ SU</type>
+			<type key="numbers" type="arab">sifroù arabek indian</type>
+			<type key="numbers" type="arabext">sifroù arabek indian astennet</type>
+			<type key="numbers" type="armn">niveroù armenianek</type>
+			<type key="numbers" type="armnlow">niveroù armenianek bihan</type>
+			<type key="numbers" type="bali">sifroù balinek</type>
+			<type key="numbers" type="beng">sifroù bengali</type>
+			<type key="numbers" type="brah">sifroù brahmi</type>
+			<type key="numbers" type="cakm">sifroù chakma</type>
+			<type key="numbers" type="cham">sifroù cham</type>
+			<type key="numbers" type="deva">sifroù devanagari</type>
+			<type key="numbers" type="ethi">niveroù etiopiat</type>
+			<type key="numbers" type="fullwide">sifroù led plaen</type>
+			<type key="numbers" type="geor">niveroù jorjianek</type>
+			<type key="numbers" type="grek">niveroù gresianek</type>
+			<type key="numbers" type="greklow">niveroù gresianek bihan</type>
+			<type key="numbers" type="gujr">sifroù gujarati</type>
+			<type key="numbers" type="guru">sifroù gurmukhi</type>
+			<type key="numbers" type="hanidec">niveroù sinaek dekvedennek</type>
+			<type key="numbers" type="hans">niveroù sinaek eeunaet</type>
+			<type key="numbers" type="hansfin">niveroù sinaek eeunaet an arcʼhant</type>
+			<type key="numbers" type="hant">niveroù sinaek hengounel</type>
+			<type key="numbers" type="hantfin">niveroù sinaek hengounel an arcʼhant</type>
+			<type key="numbers" type="hebr">niveroù hebraek</type>
+			<type key="numbers" type="java">sifroù javanek</type>
+			<type key="numbers" type="jpan">niveroù japanek</type>
+			<type key="numbers" type="jpanfin">niveroù japanek an arcʼhant</type>
+			<type key="numbers" type="kali">sifroù Kayah Li</type>
+			<type key="numbers" type="khmr">sifroù khmer</type>
+			<type key="numbers" type="knda">sifroù kanarek</type>
+			<type key="numbers" type="lana">sifroù Tai Tham Hora</type>
+			<type key="numbers" type="lanatham">sifroù Tai Tham Tham</type>
+			<type key="numbers" type="laoo">sifroù laosek</type>
+			<type key="numbers" type="latn">sifroù arabek ar Cʼhornôg</type>
+			<type key="numbers" type="lepc">sifroù lepcha</type>
+			<type key="numbers" type="limb">sifroù limbu</type>
+			<type key="numbers" type="mlym">sifroù malayalam</type>
+			<type key="numbers" type="mong">sifroù mongolek</type>
+			<type key="numbers" type="mtei">sifroù meitei mayek</type>
+			<type key="numbers" type="mymr">sifroù myanmar</type>
+			<type key="numbers" type="mymrshan">sifroù shan Myanmar</type>
+			<type key="numbers" type="nkoo">sifroù nʼko</type>
+			<type key="numbers" type="olck">sifroù ol chiki</type>
+			<type key="numbers" type="orya">sifroù oriya</type>
+			<type key="numbers" type="osma">sifroù osmanya</type>
+			<type key="numbers" type="roman">niveroù roman</type>
+			<type key="numbers" type="romanlow">niveroù roman bihan</type>
+			<type key="numbers" type="sora">sifroù Sora Sompeng</type>
+			<type key="numbers" type="sund">sifroù sundanek</type>
+			<type key="numbers" type="takr">sifroù takri</type>
+			<type key="numbers" type="taml">niveroù tamilek hengounel</type>
+			<type key="numbers" type="tamldec">sifroù tamilek</type>
+			<type key="numbers" type="telu">sifroù telougou</type>
+			<type key="numbers" type="thai">sifroù thai</type>
+			<type key="numbers" type="tibt">sifroù tibetan</type>
+			<type key="numbers" type="vaii">sifroù vai</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metrek</measurementSystemName>
 			<measurementSystemName type="UK">RU</measurementSystemName>
 			<measurementSystemName type="US">SU</measurementSystemName>
 		</measurementSystemNames>
+		<codePatterns>
+			<codePattern type="language">{0}</codePattern>
+			<codePattern type="script">{0}</codePattern>
+			<codePattern type="territory">{0}</codePattern>
+		</codePatterns>
 	</localeDisplayNames>
 	<characters>
 		<exemplarCharacters>[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]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[á à ă â å ä ã ā æ c ç é è ĕ ë ē í ì ĭ î ï ī ó ò ŏ ô ö ø ō œ q ú ŭ û ü ū ÿ]</exemplarCharacters>
 		<exemplarCharacters type="index">[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]</exemplarCharacters>
+		<ellipsis type="final">{0}…</ellipsis>
+		<ellipsis type="initial">…{0}</ellipsis>
+		<ellipsis type="medial">{0}…{1}</ellipsis>
+		<ellipsis type="word-final">{0} …</ellipsis>
+		<ellipsis type="word-initial">… {0}</ellipsis>
+		<ellipsis type="word-medial">{0} … {1}</ellipsis>
 		<moreInformation>?</moreInformation>
 	</characters>
 	<delimiters>
 		<quotationStart>«</quotationStart>
 		<quotationEnd>»</quotationEnd>
-		<alternateQuotationStart>‹</alternateQuotationStart>
-		<alternateQuotationEnd>›</alternateQuotationEnd>
+		<alternateQuotationStart>“</alternateQuotationStart>
+		<alternateQuotationEnd>”</alternateQuotationEnd>
 	</delimiters>
 	<dates>
 		<calendars>
@@ -1003,18 +1070,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<months>
 					<monthContext type="format">
 						<monthWidth type="abbreviated">
-							<month type="1">Gen</month>
-							<month type="2">Cʼhwe</month>
-							<month type="3">Meur</month>
-							<month type="4">Ebr</month>
+							<month type="1">Gen.</month>
+							<month type="2">Cʼhwe.</month>
+							<month type="3">Meur.</month>
+							<month type="4">Ebr.</month>
 							<month type="5">Mae</month>
-							<month type="6">Mezh</month>
-							<month type="7">Goue</month>
+							<month type="6">Mezh.</month>
+							<month type="7">Goue.</month>
 							<month type="8">Eost</month>
-							<month type="9">Gwen</month>
+							<month type="9">Gwen.</month>
 							<month type="10">Here</month>
 							<month type="11">Du</month>
-							<month type="12">Ker</month>
+							<month type="12">Kzu.</month>
 						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">01</month>
@@ -1047,18 +1114,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</monthContext>
 					<monthContext type="stand-alone">
 						<monthWidth type="abbreviated">
-							<month type="1">Gen</month>
-							<month type="2">Cʼhwe</month>
-							<month type="3">Meur</month>
-							<month type="4">Ebr</month>
+							<month type="1">Gen.</month>
+							<month type="2">Cʼhwe.</month>
+							<month type="3">Meur.</month>
+							<month type="4">Ebr.</month>
 							<month type="5">Mae</month>
-							<month type="6">Mezh</month>
-							<month type="7">Goue</month>
+							<month type="6">Mezh.</month>
+							<month type="7">Goue.</month>
 							<month type="8">Eost</month>
-							<month type="9">Gwen</month>
+							<month type="9">Gwen.</month>
 							<month type="10">Here</month>
 							<month type="11">Du</month>
-							<month type="12">Ker</month>
+							<month type="12">Ker.</month>
 						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">01</month>
@@ -1182,31 +1249,90 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">A.M.</dayPeriod>
+							<dayPeriod type="pm">G.M.</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am">am</dayPeriod>
-							<dayPeriod type="noon">k</dayPeriod>
 							<dayPeriod type="pm">gm</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">A.M.</dayPeriod>
-							<dayPeriod type="noon">kreisteiz</dayPeriod>
 							<dayPeriod type="pm">G.M.</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">a-raok merenn</dayPeriod>
+							<dayPeriod type="pm">goude merenn</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
 				</dayPeriods>
+				<eras>
+					<eraNames>
+						<era type="0">a-raok Jezuz-Krist</era>
+						<era type="1">goude Jezuz-Krist</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">a-raok J.K.</era>
+						<era type="1">goude J.K.</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0">a-raok J.K.</era>
+						<era type="1">goude J.K.</era>
+					</eraNarrow>
+				</eras>
 				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} 'da' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} 'da' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
+						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
+						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
+						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
+						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">HH</dateFormatItem>
+						<dateFormatItem id="hm">h:mm a</dateFormatItem>
+						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
+						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">MM</dateFormatItem>
 						<dateFormatItem id="Md">dd/MM</dateFormatItem>
 						<dateFormatItem id="MEd">E dd/MM</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
+						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">MM/y</dateFormatItem>
 						<dateFormatItem id="yMd">dd/MM/y</dateFormatItem>
@@ -1217,10 +1343,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
 						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
 					</availableFormats>
+					<appendItems>
+						<appendItem request="Timezone">{0} {1}</appendItem>
+					</appendItems>
 					<intervalFormats>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
 						<intervalFormatItem id="d">
 							<greatestDifference id="d">d–d</greatestDifference>
 						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">h a – h a</greatestDifference>
+							<greatestDifference id="h">h–h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">h a – h a v</greatestDifference>
+							<greatestDifference id="h">h–h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH v</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">MM–MM</greatestDifference>
 						</intervalFormatItem>
@@ -1232,6 +1394,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="d">E dd/MM – E dd/MM</greatestDifference>
 							<greatestDifference id="M">E dd/MM – E dd/MM</greatestDifference>
 						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">LLL–LLL</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">d–d MMM</greatestDifference>
 							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
@@ -1278,6 +1443,39 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
+			<calendar type="roc">
+				<eras>
+					<eraNames>
+						<era type="0">a-raok Republik Sina</era>
+						<era type="1">Republik Sina</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">a-raok R.S.</era>
+						<era type="1">R.S.</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0">a-raok R.S.</era>
+						<era type="1">R.S.</era>
+					</eraNarrow>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G y MMMM d, EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>GGGGG y-MM-dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<intervalFormats>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
 		</calendars>
 		<fields>
 			<field type="era">
@@ -1286,12 +1484,193 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="year">
 				<displayName>bloaz</displayName>
 				<relative type="-1">warlene</relative>
+				<relative type="0">hevlene</relative>
+				<relative type="1">ar bloaz a zeu</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">a-benn {0} bloaz</relativeTimePattern>
+					<relativeTimePattern count="two">a-benn {0} vloaz</relativeTimePattern>
+					<relativeTimePattern count="few">a-benn {0} bloaz</relativeTimePattern>
+					<relativeTimePattern count="many">a-benn {0} a vloazioù</relativeTimePattern>
+					<relativeTimePattern count="other">a-benn {0} vloaz</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} bloaz zo</relativeTimePattern>
+					<relativeTimePattern count="two">{0} vloaz zo</relativeTimePattern>
+					<relativeTimePattern count="few">{0} bloaz zo</relativeTimePattern>
+					<relativeTimePattern count="many">{0} a vloazioù zo</relativeTimePattern>
+					<relativeTimePattern count="other">{0} vloaz zo</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-short">
+				<displayName>bl.</displayName>
+				<relative type="-1">warlene</relative>
+				<relative type="0">hevlene</relative>
+				<relative type="1">ar bl. a zeu</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">a-benn {0} bl.</relativeTimePattern>
+					<relativeTimePattern count="two">a-benn {0} bl.</relativeTimePattern>
+					<relativeTimePattern count="few">a-benn {0} bl.</relativeTimePattern>
+					<relativeTimePattern count="many">a-benn {0} bl.</relativeTimePattern>
+					<relativeTimePattern count="other">a-benn {0} bl.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} bl. zo</relativeTimePattern>
+					<relativeTimePattern count="two">{0} bl. zo</relativeTimePattern>
+					<relativeTimePattern count="few">{0} bl. zo</relativeTimePattern>
+					<relativeTimePattern count="many">{0} bl. zo</relativeTimePattern>
+					<relativeTimePattern count="other">{0} bl. zo</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-narrow">
+				<displayName>bl.</displayName>
+				<relative type="-1">warlene</relative>
+				<relative type="0">hevlene</relative>
+				<relative type="1">ar bl. a zeu</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">+{0} bl.</relativeTimePattern>
+					<relativeTimePattern count="two">+{0} bl.</relativeTimePattern>
+					<relativeTimePattern count="few">+{0} bl.</relativeTimePattern>
+					<relativeTimePattern count="many">+{0} bl.</relativeTimePattern>
+					<relativeTimePattern count="other">+{0} bl.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">-{0} bl.</relativeTimePattern>
+					<relativeTimePattern count="two">-{0} bl.</relativeTimePattern>
+					<relativeTimePattern count="few">-{0} bl.</relativeTimePattern>
+					<relativeTimePattern count="many">-{0} bl.</relativeTimePattern>
+					<relativeTimePattern count="other">-{0} bl.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter">
+				<displayName>trimiziad</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">a-benn {0} trimiziad</relativeTimePattern>
+					<relativeTimePattern count="two">a-benn {0} drimiziad</relativeTimePattern>
+					<relativeTimePattern count="few">a-benn {0} zrimiziad</relativeTimePattern>
+					<relativeTimePattern count="many">a-benn {0} a drimiziadoù</relativeTimePattern>
+					<relativeTimePattern count="other">a-benn {0} trimiziad</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} trimiziad zo</relativeTimePattern>
+					<relativeTimePattern count="two">{0} drimiziad zo</relativeTimePattern>
+					<relativeTimePattern count="few">{0} zrimiziad zo</relativeTimePattern>
+					<relativeTimePattern count="many">{0} a zrimiziadoù zo</relativeTimePattern>
+					<relativeTimePattern count="other">{0} trimiziad zo</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-short">
+				<displayName>trim.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">a-benn {0} trim.</relativeTimePattern>
+					<relativeTimePattern count="two">a-benn {0} trim.</relativeTimePattern>
+					<relativeTimePattern count="few">a-benn {0} trim.</relativeTimePattern>
+					<relativeTimePattern count="many">a-benn {0} trim.</relativeTimePattern>
+					<relativeTimePattern count="other">a-benn {0} trim.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} trim. zo</relativeTimePattern>
+					<relativeTimePattern count="two">{0} trim. zo</relativeTimePattern>
+					<relativeTimePattern count="few">{0} trim. zo</relativeTimePattern>
+					<relativeTimePattern count="many">{0} trim. zo</relativeTimePattern>
+					<relativeTimePattern count="other">{0} trim. zo</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-narrow">
+				<displayName>trim.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">+{0} trim.</relativeTimePattern>
+					<relativeTimePattern count="two">+{0} trim.</relativeTimePattern>
+					<relativeTimePattern count="few">+{0} trim.</relativeTimePattern>
+					<relativeTimePattern count="many">+{0} trim.</relativeTimePattern>
+					<relativeTimePattern count="other">+{0} trim.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">-{0} trim.</relativeTimePattern>
+					<relativeTimePattern count="two">-{0} trim.</relativeTimePattern>
+					<relativeTimePattern count="few">-{0} trim.</relativeTimePattern>
+					<relativeTimePattern count="many">-{0} trim.</relativeTimePattern>
+					<relativeTimePattern count="other">-{0} trim.</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="month">
 				<displayName>miz</displayName>
+				<relative type="-1">ar miz diaraok</relative>
+				<relative type="0">ar miz-mañ</relative>
+				<relative type="1">ar miz a zeu</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">a-benn {0} miz</relativeTimePattern>
+					<relativeTimePattern count="two">a-benn {0} viz</relativeTimePattern>
+					<relativeTimePattern count="few">a-benn {0} miz</relativeTimePattern>
+					<relativeTimePattern count="many">a-benn {0} a vizioù</relativeTimePattern>
+					<relativeTimePattern count="other">a-benn {0} miz</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} miz zo</relativeTimePattern>
+					<relativeTimePattern count="two">{0} viz zo</relativeTimePattern>
+					<relativeTimePattern count="few">{0} miz zo</relativeTimePattern>
+					<relativeTimePattern count="many">{0} a vizioù zo</relativeTimePattern>
+					<relativeTimePattern count="other">{0} miz zo</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-short">
+				<displayName>miz</displayName>
+				<relative type="-1">ar miz diaraok</relative>
+				<relative type="0">ar miz-mañ</relative>
+				<relative type="1">ar miz a zeu</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">a-benn {0} miz</relativeTimePattern>
+					<relativeTimePattern count="two">a-benn {0} viz</relativeTimePattern>
+					<relativeTimePattern count="few">a-benn {0} miz</relativeTimePattern>
+					<relativeTimePattern count="many">a-benn {0} a vizioù</relativeTimePattern>
+					<relativeTimePattern count="other">a-benn {0} miz</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} miz zo</relativeTimePattern>
+					<relativeTimePattern count="two">{0} viz zo</relativeTimePattern>
+					<relativeTimePattern count="few">{0} miz zo</relativeTimePattern>
+					<relativeTimePattern count="many">{0} a vizioù zo</relativeTimePattern>
+					<relativeTimePattern count="other">{0} miz zo</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-narrow">
+				<displayName>miz</displayName>
+				<relative type="-1">ar miz diaraok</relative>
+				<relative type="0">ar miz-mañ</relative>
+				<relative type="1">ar miz a zeu</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">+{0} miz</relativeTimePattern>
+					<relativeTimePattern count="two">+{0} miz</relativeTimePattern>
+					<relativeTimePattern count="few">+{0} miz</relativeTimePattern>
+					<relativeTimePattern count="many">+{0} miz</relativeTimePattern>
+					<relativeTimePattern count="other">+{0} miz</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">-{0} miz</relativeTimePattern>
+					<relativeTimePattern count="two">-{0} miz</relativeTimePattern>
+					<relativeTimePattern count="few">-{0} miz</relativeTimePattern>
+					<relativeTimePattern count="many">-{0} miz</relativeTimePattern>
+					<relativeTimePattern count="other">-{0} miz</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="week">
 				<displayName>sizhun</displayName>
+				<relative type="-1">ar sizhun diaraok</relative>
+				<relative type="0">ar sizhun-mañ</relative>
+				<relative type="1">ar sizhun a zeu</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">a-benn {0} sizhun</relativeTimePattern>
+					<relativeTimePattern count="two">a-benn {0} sizhun</relativeTimePattern>
+					<relativeTimePattern count="few">a-benn {0} sizhun</relativeTimePattern>
+					<relativeTimePattern count="many">a-benn {0} a sizhunioù</relativeTimePattern>
+					<relativeTimePattern count="other">a-benn {0} sizhun</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} sizhun zo</relativeTimePattern>
+					<relativeTimePattern count="two">{0} sizhun zo</relativeTimePattern>
+					<relativeTimePattern count="few">{0} sizhun zo</relativeTimePattern>
+					<relativeTimePattern count="many">{0} a sizhunioù zo</relativeTimePattern>
+					<relativeTimePattern count="other">{0} sizhun zo</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="day">
 				<displayName>deiz</displayName>
@@ -1299,33 +1678,342 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="-1">decʼh</relative>
 				<relative type="0">hiziv</relative>
 				<relative type="1">warcʼhoazh</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">a-benn {0} deiz</relativeTimePattern>
+					<relativeTimePattern count="two">a-benn {0} zeiz</relativeTimePattern>
+					<relativeTimePattern count="few">a-benn {0} deiz</relativeTimePattern>
+					<relativeTimePattern count="many">a-benn {0} a zeizioù</relativeTimePattern>
+					<relativeTimePattern count="other">a-benn {0} deiz</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} deiz zo</relativeTimePattern>
+					<relativeTimePattern count="two">{0} zeiz zo</relativeTimePattern>
+					<relativeTimePattern count="few">{0} deiz zo</relativeTimePattern>
+					<relativeTimePattern count="many">{0} a zeizioù zo</relativeTimePattern>
+					<relativeTimePattern count="other">{0} deiz zo</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="day-short">
 				<displayName>d</displayName>
+				<relative type="-2">dercʼhent-decʼh</relative>
+				<relative type="-1">decʼh</relative>
+				<relative type="0">hiziv</relative>
+				<relative type="1">warcʼhoazh</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">a-benn {0} d</relativeTimePattern>
+					<relativeTimePattern count="two">a-benn {0} d</relativeTimePattern>
+					<relativeTimePattern count="few">a-benn {0} d</relativeTimePattern>
+					<relativeTimePattern count="many">a-benn {0} d</relativeTimePattern>
+					<relativeTimePattern count="other">a-benn {0} d</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} d zo</relativeTimePattern>
+					<relativeTimePattern count="two">{0} d zo</relativeTimePattern>
+					<relativeTimePattern count="few">{0} d zo</relativeTimePattern>
+					<relativeTimePattern count="many">{0} d zo</relativeTimePattern>
+					<relativeTimePattern count="other">{0} d zo</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-narrow">
+				<displayName>d</displayName>
+				<relative type="-2">dercʼhent-decʼh</relative>
+				<relative type="-1">decʼh</relative>
+				<relative type="0">hiziv</relative>
+				<relative type="1">warcʼhoazh</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">+{0} d</relativeTimePattern>
+					<relativeTimePattern count="two">+{0} d</relativeTimePattern>
+					<relativeTimePattern count="few">+{0} d</relativeTimePattern>
+					<relativeTimePattern count="many">+{0} d</relativeTimePattern>
+					<relativeTimePattern count="other">+{0} d</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">-{0} d</relativeTimePattern>
+					<relativeTimePattern count="two">-{0} d</relativeTimePattern>
+					<relativeTimePattern count="few">-{0} d</relativeTimePattern>
+					<relativeTimePattern count="many">-{0} d</relativeTimePattern>
+					<relativeTimePattern count="other">-{0} d</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="weekday">
+				<displayName>deiz ar sizhun</displayName>
+			</field>
+			<field type="sun">
+				<relative type="-1">Disul diwezhañ</relative>
+				<relative type="0">ar Sul-mañ</relative>
+				<relative type="1">Disul a zeu</relative>
+			</field>
+			<field type="sun-short">
+				<relative type="-1">Sul diwezhañ</relative>
+				<relative type="0">Sul-mañ</relative>
+				<relative type="1">Sul a zeu</relative>
+			</field>
+			<field type="sun-narrow">
+				<relative type="-1">Su diwezhañ</relative>
+				<relative type="0">Su-mañ</relative>
+				<relative type="1">Su a zeu</relative>
+			</field>
+			<field type="mon">
+				<relative type="-1">Dilun diwezhañ</relative>
+				<relative type="0">al Lun-mañ</relative>
+				<relative type="1">Dilun a zeu</relative>
+			</field>
+			<field type="mon-short">
+				<relative type="-1">Lun diwezhañ</relative>
+				<relative type="0">Lun-mañ</relative>
+				<relative type="1">Lun a zeu</relative>
+			</field>
+			<field type="mon-narrow">
+				<relative type="-1">L diwezhañ</relative>
+				<relative type="0">L-mañ</relative>
+				<relative type="1">L a zeu</relative>
+			</field>
+			<field type="tue">
+				<relative type="-1">Dimeurzh diwezhañ</relative>
+				<relative type="0">ar Meurzh-mañ</relative>
+				<relative type="1">Dimeurzh a zeu</relative>
+			</field>
+			<field type="tue-short">
+				<relative type="-1">Meu. diwezhañ</relative>
+				<relative type="0">Meu.-mañ</relative>
+				<relative type="1">Meu. a zeu</relative>
+			</field>
+			<field type="tue-narrow">
+				<relative type="-1">Mz diwezhañ</relative>
+				<relative type="0">Mz-mañ</relative>
+				<relative type="1">Mz a zeu</relative>
+			</field>
+			<field type="wed">
+				<relative type="-1">Dimercʼher diwezhañ</relative>
+				<relative type="0">ar Mercʼher-mañ</relative>
+				<relative type="1">Dimercʼher a zeu</relative>
+			</field>
+			<field type="wed-short">
+				<relative type="-1">Mer. diwezhañ</relative>
+				<relative type="0">Mer.-mañ</relative>
+				<relative type="1">Mer. a zeu</relative>
+			</field>
+			<field type="wed-narrow">
+				<relative type="-1">Mc diwezhañ</relative>
+				<relative type="0">Mc-mañ</relative>
+				<relative type="1">Mc a zeu</relative>
+			</field>
+			<field type="thu">
+				<relative type="-1">Diriaou diwezhañ</relative>
+				<relative type="0">ar Yaou-mañ</relative>
+				<relative type="1">Diriaou a zeu</relative>
+			</field>
+			<field type="thu-short">
+				<relative type="-1">Yaou diwezhañ</relative>
+				<relative type="0">Yaou-mañ</relative>
+				<relative type="1">Yaou a zeu</relative>
+			</field>
+			<field type="thu-narrow">
+				<relative type="-1">Y diwezhañ</relative>
+				<relative type="0">Y-mañ</relative>
+				<relative type="1">Yaou a zeu</relative>
+			</field>
+			<field type="fri">
+				<relative type="-1">Digwener diwezhañ</relative>
+				<relative type="0">ar Gwener-mañ</relative>
+				<relative type="1">Digwener a zeu</relative>
+			</field>
+			<field type="fri-short">
+				<relative type="-1">Gwe. diwezhañ</relative>
+				<relative type="0">Gwe.-mañ</relative>
+				<relative type="1">Gwe. a zeu</relative>
+			</field>
+			<field type="fri-narrow">
+				<relative type="-1">G diwezhañ</relative>
+				<relative type="0">G-mañ</relative>
+				<relative type="1">G a zeu</relative>
+			</field>
+			<field type="sat">
+				<relative type="-1">Disadorn diwezhañ</relative>
+				<relative type="0">ar Sadorn-mañ</relative>
+				<relative type="1">Disadorn a zeu</relative>
+			</field>
+			<field type="sat-short">
+				<relative type="-1">Sad. diwezhañ</relative>
+				<relative type="0">Sad.-mañ</relative>
+				<relative type="1">Sad. a zeu</relative>
+			</field>
+			<field type="sat-narrow">
+				<relative type="-1">Sa diwezhañ</relative>
+				<relative type="0">Sa-mañ</relative>
+				<relative type="1">Sa a zeu</relative>
+			</field>
+			<field type="dayperiod">
+				<displayName>AM/GM</displayName>
 			</field>
 			<field type="hour">
 				<displayName>eur</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">a-benn {0} eur</relativeTimePattern>
+					<relativeTimePattern count="two">a-benn {0} eur</relativeTimePattern>
+					<relativeTimePattern count="few">a-benn {0} eur</relativeTimePattern>
+					<relativeTimePattern count="many">a-benn {0} a eurioù</relativeTimePattern>
+					<relativeTimePattern count="other">a-benn {0} eur</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} eur zo</relativeTimePattern>
+					<relativeTimePattern count="two">{0} eur zo</relativeTimePattern>
+					<relativeTimePattern count="few">{0} eur zo</relativeTimePattern>
+					<relativeTimePattern count="many">{0} a eurioù zo</relativeTimePattern>
+					<relativeTimePattern count="other">{0} eur zo</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="hour-short">
-				<displayName>h</displayName>
+				<displayName>e</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">a-benn {0} e</relativeTimePattern>
+					<relativeTimePattern count="two">a-benn {0} e</relativeTimePattern>
+					<relativeTimePattern count="few">a-benn {0} e</relativeTimePattern>
+					<relativeTimePattern count="many">a-benn {0} e</relativeTimePattern>
+					<relativeTimePattern count="other">a-benn {0} e</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} e zo</relativeTimePattern>
+					<relativeTimePattern count="two">{0} e zo</relativeTimePattern>
+					<relativeTimePattern count="few">{0} e zo</relativeTimePattern>
+					<relativeTimePattern count="many">{0} e zo</relativeTimePattern>
+					<relativeTimePattern count="other">{0} e zo</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="hour-narrow">
 				<displayName>e</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">+{0} h</relativeTimePattern>
+					<relativeTimePattern count="two">+{0} h</relativeTimePattern>
+					<relativeTimePattern count="few">+{0} h</relativeTimePattern>
+					<relativeTimePattern count="many">+{0} h</relativeTimePattern>
+					<relativeTimePattern count="other">+{0} h</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">-{0} h</relativeTimePattern>
+					<relativeTimePattern count="two">-{0} h</relativeTimePattern>
+					<relativeTimePattern count="few">-{0} h</relativeTimePattern>
+					<relativeTimePattern count="many">-{0} h</relativeTimePattern>
+					<relativeTimePattern count="other">-{0} h</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="minute">
 				<displayName>munut</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">a-benn {0} munut</relativeTimePattern>
+					<relativeTimePattern count="two">a-benn {0} vunut</relativeTimePattern>
+					<relativeTimePattern count="few">a-benn {0} munut</relativeTimePattern>
+					<relativeTimePattern count="many">a-benn {0} a vunutoù</relativeTimePattern>
+					<relativeTimePattern count="other">a-benn {0} munut</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} munut zo</relativeTimePattern>
+					<relativeTimePattern count="two">{0} vunut zo</relativeTimePattern>
+					<relativeTimePattern count="few">{0} munut zo</relativeTimePattern>
+					<relativeTimePattern count="many">{0} a vunutoù zo</relativeTimePattern>
+					<relativeTimePattern count="other">{0} munut zo</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="minute-short">
 				<displayName>min</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">a-benn {0} min</relativeTimePattern>
+					<relativeTimePattern count="two">a-benn {0} min</relativeTimePattern>
+					<relativeTimePattern count="few">a-benn {0} min</relativeTimePattern>
+					<relativeTimePattern count="many">a-benn {0} min</relativeTimePattern>
+					<relativeTimePattern count="other">a-benn {0} min</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} min zo</relativeTimePattern>
+					<relativeTimePattern count="two">{0} min zo</relativeTimePattern>
+					<relativeTimePattern count="few">{0} min zo</relativeTimePattern>
+					<relativeTimePattern count="many">{0} min zo</relativeTimePattern>
+					<relativeTimePattern count="other">{0} min zo</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-narrow">
+				<displayName>min</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">+{0} min</relativeTimePattern>
+					<relativeTimePattern count="two">+{0} min</relativeTimePattern>
+					<relativeTimePattern count="few">+{0} min</relativeTimePattern>
+					<relativeTimePattern count="many">+{0} min</relativeTimePattern>
+					<relativeTimePattern count="other">+{0} min</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">-{0} min</relativeTimePattern>
+					<relativeTimePattern count="two">-{0} min</relativeTimePattern>
+					<relativeTimePattern count="few">-{0} min</relativeTimePattern>
+					<relativeTimePattern count="many">-{0} min</relativeTimePattern>
+					<relativeTimePattern count="other">-{0} min</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="second">
 				<displayName>eilenn</displayName>
+				<relative type="0">bremañ</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">a-benn {0} eilenn</relativeTimePattern>
+					<relativeTimePattern count="two">a-benn {0} eilenn</relativeTimePattern>
+					<relativeTimePattern count="few">a-benn {0} eilenn</relativeTimePattern>
+					<relativeTimePattern count="many">a-benn {0} a eilennoù</relativeTimePattern>
+					<relativeTimePattern count="other">a-benn {0} eilenn</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} eilenn zo</relativeTimePattern>
+					<relativeTimePattern count="two">{0} eilenn zo</relativeTimePattern>
+					<relativeTimePattern count="few">{0} eilenn zo</relativeTimePattern>
+					<relativeTimePattern count="many">{0} eilenn zo</relativeTimePattern>
+					<relativeTimePattern count="other">{0} eilenn zo</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="second-short">
 				<displayName>s</displayName>
+				<relative type="0">brem.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">a-benn {0} s</relativeTimePattern>
+					<relativeTimePattern count="two">a-benn {0} s</relativeTimePattern>
+					<relativeTimePattern count="few">a-benn {0} s</relativeTimePattern>
+					<relativeTimePattern count="many">a-benn {0} s</relativeTimePattern>
+					<relativeTimePattern count="other">a-benn {0} s</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} s zo</relativeTimePattern>
+					<relativeTimePattern count="two">{0} s zo</relativeTimePattern>
+					<relativeTimePattern count="few">{0} s zo</relativeTimePattern>
+					<relativeTimePattern count="many">{0} s zo</relativeTimePattern>
+					<relativeTimePattern count="other">{0} s zo</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-narrow">
+				<displayName>s</displayName>
+				<relative type="0">brem.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">+{0} s</relativeTimePattern>
+					<relativeTimePattern count="two">+{0} s</relativeTimePattern>
+					<relativeTimePattern count="few">+{0} s</relativeTimePattern>
+					<relativeTimePattern count="many">+{0} s</relativeTimePattern>
+					<relativeTimePattern count="other">+{0} s</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">-{0} s</relativeTimePattern>
+					<relativeTimePattern count="two">-{0} s</relativeTimePattern>
+					<relativeTimePattern count="few">-{0} s</relativeTimePattern>
+					<relativeTimePattern count="many">-{0} s</relativeTimePattern>
+					<relativeTimePattern count="other">-{0} s</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="zone">
+				<displayName>takad eur</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
+			<hourFormat>+HH:mm;-HH:mm</hourFormat>
+			<gmtFormat>GMT{0}</gmtFormat>
+			<gmtZeroFormat>UTC</gmtZeroFormat>
+			<regionFormat>eur {0}</regionFormat>
+			<regionFormat type="daylight">eur hañv {0}</regionFormat>
+			<regionFormat type="standard">eur cʼhoañv {0}</regionFormat>
+			<fallbackFormat>{1} ({0})</fallbackFormat>
 			<zone type="Etc/Unknown">
 				<exemplarCity>kêr dianav</exemplarCity>
 			</zone>
@@ -1335,6 +2023,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Kabul">
 				<exemplarCity>Kaboul</exemplarCity>
 			</zone>
+			<zone type="America/Antigua">
+				<exemplarCity>Antigua</exemplarCity>
+			</zone>
+			<zone type="America/Anguilla">
+				<exemplarCity>Anguilla</exemplarCity>
+			</zone>
 			<zone type="Europe/Tirane">
 				<exemplarCity>Tiranë</exemplarCity>
 			</zone>
@@ -1344,9 +2038,39 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Africa/Luanda">
 				<exemplarCity>Luanda</exemplarCity>
 			</zone>
+			<zone type="America/Buenos_Aires">
+				<exemplarCity>Buenos Aires</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pago_Pago">
+				<exemplarCity>Pago Pago</exemplarCity>
+			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Vienna</exemplarCity>
 			</zone>
+			<zone type="Australia/Perth">
+				<exemplarCity>Perth</exemplarCity>
+			</zone>
+			<zone type="Australia/Darwin">
+				<exemplarCity>Darwin</exemplarCity>
+			</zone>
+			<zone type="Australia/Adelaide">
+				<exemplarCity>Adelaide</exemplarCity>
+			</zone>
+			<zone type="Australia/Melbourne">
+				<exemplarCity>Melbourne</exemplarCity>
+			</zone>
+			<zone type="Australia/Sydney">
+				<exemplarCity>Sydney</exemplarCity>
+			</zone>
+			<zone type="Australia/Brisbane">
+				<exemplarCity>Brisbane</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Macquarie">
+				<exemplarCity>Macquarie</exemplarCity>
+			</zone>
+			<zone type="America/Aruba">
+				<exemplarCity>Aruba</exemplarCity>
+			</zone>
 			<zone type="Europe/Mariehamn">
 				<exemplarCity>Marjehamn</exemplarCity>
 			</zone>
@@ -1356,6 +2080,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Europe/Sarajevo">
 				<exemplarCity>Sarajevo</exemplarCity>
 			</zone>
+			<zone type="America/Barbados">
+				<exemplarCity>Barbados</exemplarCity>
+			</zone>
 			<zone type="Europe/Brussels">
 				<exemplarCity>Brusel</exemplarCity>
 			</zone>
@@ -1371,21 +2098,60 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Africa/Bujumbura">
 				<exemplarCity>Bujumbura</exemplarCity>
 			</zone>
+			<zone type="Africa/Porto-Novo">
+				<exemplarCity>Porto-Novo</exemplarCity>
+			</zone>
+			<zone type="America/St_Barthelemy">
+				<exemplarCity>Saint Barthélemy</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Bermuda">
+				<exemplarCity>Bermudez</exemplarCity>
+			</zone>
 			<zone type="Asia/Brunei">
 				<exemplarCity>Brunei</exemplarCity>
 			</zone>
+			<zone type="America/La_Paz">
+				<exemplarCity>La Paz</exemplarCity>
+			</zone>
+			<zone type="America/Manaus">
+				<exemplarCity>Manaus</exemplarCity>
+			</zone>
 			<zone type="America/Belem">
 				<exemplarCity>Belém</exemplarCity>
 			</zone>
 			<zone type="America/Sao_Paulo">
 				<exemplarCity>São Paulo</exemplarCity>
 			</zone>
+			<zone type="America/Recife">
+				<exemplarCity>Recife</exemplarCity>
+			</zone>
+			<zone type="America/Nassau">
+				<exemplarCity>Nassau</exemplarCity>
+			</zone>
+			<zone type="Asia/Thimphu">
+				<exemplarCity>Thimphu</exemplarCity>
+			</zone>
 			<zone type="Africa/Gaborone">
 				<exemplarCity>Gaborone</exemplarCity>
 			</zone>
 			<zone type="Europe/Minsk">
 				<exemplarCity>Mensk</exemplarCity>
 			</zone>
+			<zone type="America/Belize">
+				<exemplarCity>Belize</exemplarCity>
+			</zone>
+			<zone type="America/Inuvik">
+				<exemplarCity>Inuvik</exemplarCity>
+			</zone>
+			<zone type="America/Vancouver">
+				<exemplarCity>Vancouver</exemplarCity>
+			</zone>
+			<zone type="America/Edmonton">
+				<exemplarCity>Edmonton</exemplarCity>
+			</zone>
+			<zone type="America/Winnipeg">
+				<exemplarCity>Winnipeg</exemplarCity>
+			</zone>
 			<zone type="America/St_Johns">
 				<exemplarCity>Saint Johnʼs</exemplarCity>
 			</zone>
@@ -1395,6 +2161,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Africa/Kinshasa">
 				<exemplarCity>Kinshasa</exemplarCity>
 			</zone>
+			<zone type="Africa/Lubumbashi">
+				<exemplarCity>Lubumbashi</exemplarCity>
+			</zone>
 			<zone type="Africa/Bangui">
 				<exemplarCity>Bangui</exemplarCity>
 			</zone>
@@ -1404,18 +2173,36 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Africa/Abidjan">
 				<exemplarCity>Abidjan</exemplarCity>
 			</zone>
+			<zone type="Pacific/Rarotonga">
+				<exemplarCity>Rarotonga</exemplarCity>
+			</zone>
+			<zone type="Pacific/Easter">
+				<exemplarCity>Enez Pask</exemplarCity>
+			</zone>
+			<zone type="America/Santiago">
+				<exemplarCity>Santiago</exemplarCity>
+			</zone>
 			<zone type="Asia/Urumqi">
 				<exemplarCity>Ürümqi</exemplarCity>
 			</zone>
+			<zone type="Asia/Shanghai">
+				<exemplarCity>Shanghai</exemplarCity>
+			</zone>
 			<zone type="America/Bogota">
 				<exemplarCity>Bogotá</exemplarCity>
 			</zone>
+			<zone type="America/Costa_Rica">
+				<exemplarCity>Costa Rica</exemplarCity>
+			</zone>
 			<zone type="America/Havana">
 				<exemplarCity>La Habana</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Cape_Verde">
 				<exemplarCity>Kab Glas</exemplarCity>
 			</zone>
+			<zone type="Indian/Christmas">
+				<exemplarCity>Christmas</exemplarCity>
+			</zone>
 			<zone type="Asia/Nicosia">
 				<exemplarCity>Levkosía</exemplarCity>
 			</zone>
@@ -1431,6 +2218,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Europe/Copenhagen">
 				<exemplarCity>Kopenhagen</exemplarCity>
 			</zone>
+			<zone type="America/Dominica">
+				<exemplarCity>Dominica</exemplarCity>
+			</zone>
 			<zone type="Africa/Algiers">
 				<exemplarCity>Aljer</exemplarCity>
 			</zone>
@@ -1474,11 +2264,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Libreville</exemplarCity>
 			</zone>
 			<zone type="Europe/London">
+				<long>
+					<daylight>eur hañv Breizh-Veur</daylight>
+				</long>
 				<exemplarCity>Londrez</exemplarCity>
 			</zone>
+			<zone type="America/Grenada">
+				<exemplarCity>Grenada</exemplarCity>
+			</zone>
 			<zone type="Asia/Tbilisi">
 				<exemplarCity>Tbilisi</exemplarCity>
 			</zone>
+			<zone type="America/Cayenne">
+				<exemplarCity>Cayenne</exemplarCity>
+			</zone>
 			<zone type="Europe/Guernsey">
 				<exemplarCity>Gwernenez</exemplarCity>
 			</zone>
@@ -1491,6 +2290,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="America/Thule">
 				<exemplarCity>Qânâq</exemplarCity>
 			</zone>
+			<zone type="America/Godthab">
+				<exemplarCity>Nuuk (Godthåb)</exemplarCity>
+			</zone>
 			<zone type="Africa/Banjul">
 				<exemplarCity>Banjul</exemplarCity>
 			</zone>
@@ -1506,12 +2308,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Europe/Athens">
 				<exemplarCity>Aten</exemplarCity>
 			</zone>
+			<zone type="Atlantic/South_Georgia">
+				<exemplarCity>Georgia ar Su</exemplarCity>
+			</zone>
+			<zone type="America/Guatemala">
+				<exemplarCity>Guatemala</exemplarCity>
+			</zone>
+			<zone type="Pacific/Guam">
+				<exemplarCity>Guam</exemplarCity>
+			</zone>
 			<zone type="Africa/Bissau">
 				<exemplarCity>Bissau</exemplarCity>
 			</zone>
+			<zone type="America/Guyana">
+				<exemplarCity>Guyana</exemplarCity>
+			</zone>
+			<zone type="Asia/Hong_Kong">
+				<exemplarCity>Hong Kong</exemplarCity>
+			</zone>
+			<zone type="America/Tegucigalpa">
+				<exemplarCity>Tegucigalpa</exemplarCity>
+			</zone>
 			<zone type="Europe/Zagreb">
 				<exemplarCity>Zagreb</exemplarCity>
 			</zone>
+			<zone type="America/Port-au-Prince">
+				<exemplarCity>Port-au-Prince</exemplarCity>
+			</zone>
 			<zone type="Europe/Budapest">
 				<exemplarCity>Budapest</exemplarCity>
 			</zone>
@@ -1522,6 +2345,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Jayapura</exemplarCity>
 			</zone>
 			<zone type="Europe/Dublin">
+				<long>
+					<daylight>eur cʼhoañv Iwerzhon</daylight>
+				</long>
 				<exemplarCity>Dulenn</exemplarCity>
 			</zone>
 			<zone type="Asia/Jerusalem">
@@ -1530,9 +2356,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Europe/Isle_of_Man">
 				<exemplarCity>Manav</exemplarCity>
 			</zone>
+			<zone type="Asia/Calcutta">
+				<exemplarCity>Calcutta</exemplarCity>
+			</zone>
+			<zone type="Indian/Chagos">
+				<exemplarCity>Chagos</exemplarCity>
+			</zone>
 			<zone type="Asia/Baghdad">
 				<exemplarCity>Baghdad</exemplarCity>
 			</zone>
+			<zone type="Asia/Tehran">
+				<exemplarCity>Tehran</exemplarCity>
+			</zone>
 			<zone type="Atlantic/Reykjavik">
 				<exemplarCity>Reykjavík</exemplarCity>
 			</zone>
@@ -1548,9 +2383,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Amman">
 				<exemplarCity>Amman</exemplarCity>
 			</zone>
+			<zone type="Asia/Tokyo">
+				<exemplarCity>Tokyo</exemplarCity>
+			</zone>
 			<zone type="Africa/Nairobi">
 				<exemplarCity>Nairobi</exemplarCity>
 			</zone>
+			<zone type="Asia/Bishkek">
+				<exemplarCity>Bishkek</exemplarCity>
+			</zone>
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity>Phnum Pénh</exemplarCity>
 			</zone>
@@ -1563,9 +2404,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Pyongyang">
 				<exemplarCity>Pʼyongyang</exemplarCity>
 			</zone>
+			<zone type="Asia/Seoul">
+				<exemplarCity>Seoul</exemplarCity>
+			</zone>
 			<zone type="Asia/Kuwait">
 				<exemplarCity>Koweit</exemplarCity>
 			</zone>
+			<zone type="America/Cayman">
+				<exemplarCity>Cayman</exemplarCity>
+			</zone>
+			<zone type="Asia/Almaty">
+				<exemplarCity>Almaty</exemplarCity>
+			</zone>
 			<zone type="Asia/Vientiane">
 				<exemplarCity>Viangchan</exemplarCity>
 			</zone>
@@ -1578,6 +2428,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Europe/Vaduz">
 				<exemplarCity>Vaduz</exemplarCity>
 			</zone>
+			<zone type="Asia/Colombo">
+				<exemplarCity>Kolamba</exemplarCity>
+			</zone>
 			<zone type="Africa/Monrovia">
 				<exemplarCity>Monrovia</exemplarCity>
 			</zone>
@@ -1620,12 +2473,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Rangoon">
 				<exemplarCity>Yangon</exemplarCity>
 			</zone>
+			<zone type="Asia/Ulaanbaatar">
+				<exemplarCity>Ulaanbaatar</exemplarCity>
+			</zone>
+			<zone type="Asia/Macau">
+				<exemplarCity>Macau</exemplarCity>
+			</zone>
 			<zone type="America/Martinique">
 				<exemplarCity>Martinik</exemplarCity>
 			</zone>
 			<zone type="Africa/Nouakchott">
 				<exemplarCity>Nouakchott</exemplarCity>
 			</zone>
+			<zone type="America/Montserrat">
+				<exemplarCity>Montserrat</exemplarCity>
+			</zone>
 			<zone type="Europe/Malta">
 				<exemplarCity>Malta</exemplarCity>
 			</zone>
@@ -1635,6 +2497,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Indian/Maldives">
 				<exemplarCity>Maldivez</exemplarCity>
 			</zone>
+			<zone type="America/Monterrey">
+				<exemplarCity>Monterrey</exemplarCity>
+			</zone>
+			<zone type="America/Mexico_City">
+				<exemplarCity>Kêr Vecʼhiko</exemplarCity>
+			</zone>
 			<zone type="Asia/Kuala_Lumpur">
 				<exemplarCity>Kuala Lumpur</exemplarCity>
 			</zone>
@@ -1650,6 +2518,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Africa/Niamey">
 				<exemplarCity>Niamey</exemplarCity>
 			</zone>
+			<zone type="Pacific/Norfolk">
+				<exemplarCity>Norfolk</exemplarCity>
+			</zone>
+			<zone type="Africa/Lagos">
+				<exemplarCity>Lagos</exemplarCity>
+			</zone>
 			<zone type="America/Managua">
 				<exemplarCity>Managua</exemplarCity>
 			</zone>
@@ -1659,6 +2533,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Europe/Oslo">
 				<exemplarCity>Oslo</exemplarCity>
 			</zone>
+			<zone type="Asia/Katmandu">
+				<exemplarCity>Kathmandu</exemplarCity>
+			</zone>
+			<zone type="Pacific/Nauru">
+				<exemplarCity>Nauru</exemplarCity>
+			</zone>
+			<zone type="Pacific/Niue">
+				<exemplarCity>Niue</exemplarCity>
+			</zone>
 			<zone type="Pacific/Chatham">
 				<exemplarCity>Chatham</exemplarCity>
 			</zone>
@@ -1671,18 +2554,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="America/Panama">
 				<exemplarCity>Panamá</exemplarCity>
 			</zone>
+			<zone type="America/Lima">
+				<exemplarCity>Lima</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tahiti">
+				<exemplarCity>Tahiti</exemplarCity>
+			</zone>
+			<zone type="Pacific/Marquesas">
+				<exemplarCity>Markiz</exemplarCity>
+			</zone>
+			<zone type="Pacific/Gambier">
+				<exemplarCity>Gambier</exemplarCity>
+			</zone>
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
 			</zone>
+			<zone type="Asia/Karachi">
+				<exemplarCity>Karachi</exemplarCity>
+			</zone>
 			<zone type="Europe/Warsaw">
 				<exemplarCity>Varsovia</exemplarCity>
 			</zone>
 			<zone type="America/Miquelon">
 				<exemplarCity>Mikelon</exemplarCity>
 			</zone>
+			<zone type="Pacific/Pitcairn">
+				<exemplarCity>Pitcairn</exemplarCity>
+			</zone>
+			<zone type="America/Puerto_Rico">
+				<exemplarCity>Puerto Rico</exemplarCity>
+			</zone>
 			<zone type="Asia/Gaza">
 				<exemplarCity>Gaza</exemplarCity>
 			</zone>
@@ -1695,6 +2602,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Europe/Lisbon">
 				<exemplarCity>Lisboa</exemplarCity>
 			</zone>
+			<zone type="Pacific/Palau">
+				<exemplarCity>Palau</exemplarCity>
+			</zone>
 			<zone type="America/Asuncion">
 				<exemplarCity>Asunción</exemplarCity>
 			</zone>
@@ -1710,12 +2620,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Europe/Belgrade">
 				<exemplarCity>Beograd</exemplarCity>
 			</zone>
+			<zone type="Europe/Kaliningrad">
+				<exemplarCity>Kaliningrad</exemplarCity>
+			</zone>
 			<zone type="Europe/Moscow">
 				<exemplarCity>Moskov</exemplarCity>
 			</zone>
+			<zone type="Europe/Volgograd">
+				<exemplarCity>Volgograd</exemplarCity>
+			</zone>
 			<zone type="Asia/Yekaterinburg">
 				<exemplarCity>Yekaterinbourg</exemplarCity>
 			</zone>
+			<zone type="Asia/Novosibirsk">
+				<exemplarCity>Novosibirsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Irkutsk">
+				<exemplarCity>Irkutsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Yakutsk">
+				<exemplarCity>Yakutsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Vladivostok">
+				<exemplarCity>Vladivostok</exemplarCity>
+			</zone>
+			<zone type="Asia/Sakhalin">
+				<exemplarCity>Sakhalin</exemplarCity>
+			</zone>
 			<zone type="Asia/Anadyr">
 				<exemplarCity>Anadyrʼ</exemplarCity>
 			</zone>
@@ -1740,6 +2671,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Europe/Ljubljana">
 				<exemplarCity>Ljubljana</exemplarCity>
 			</zone>
+			<zone type="Arctic/Longyearbyen">
+				<exemplarCity>Longyearbyen</exemplarCity>
+			</zone>
 			<zone type="Europe/Bratislava">
 				<exemplarCity>Bratislava</exemplarCity>
 			</zone>
@@ -1755,6 +2689,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Africa/Mogadishu">
 				<exemplarCity>Muqdisho</exemplarCity>
 			</zone>
+			<zone type="America/Paramaribo">
+				<exemplarCity>Paramaribo</exemplarCity>
+			</zone>
 			<zone type="Africa/Juba">
 				<exemplarCity>Juba</exemplarCity>
 			</zone>
@@ -1782,6 +2719,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Bangkok">
 				<exemplarCity>Bangkok</exemplarCity>
 			</zone>
+			<zone type="Asia/Dushanbe">
+				<exemplarCity>Dushanbe</exemplarCity>
+			</zone>
+			<zone type="Asia/Ashgabat">
+				<exemplarCity>Ashgabat</exemplarCity>
+			</zone>
 			<zone type="Africa/Tunis">
 				<exemplarCity>Tuniz</exemplarCity>
 			</zone>
@@ -1791,6 +2734,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="America/Port_of_Spain">
 				<exemplarCity>Port of Spain</exemplarCity>
 			</zone>
+			<zone type="Asia/Taipei">
+				<exemplarCity>Taipei</exemplarCity>
+			</zone>
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Dar es Salaam</exemplarCity>
 			</zone>
@@ -1800,35 +2746,380 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Africa/Kampala">
 				<exemplarCity>Kampala</exemplarCity>
 			</zone>
+			<zone type="Pacific/Midway">
+				<exemplarCity>Midway</exemplarCity>
+			</zone>
+			<zone type="America/Adak">
+				<exemplarCity>Adak</exemplarCity>
+			</zone>
+			<zone type="Pacific/Honolulu">
+				<exemplarCity>Honolulu</exemplarCity>
+			</zone>
+			<zone type="America/Anchorage">
+				<exemplarCity>Anchorage</exemplarCity>
+			</zone>
+			<zone type="America/Los_Angeles">
+				<exemplarCity>Los Angeles</exemplarCity>
+			</zone>
+			<zone type="America/Denver">
+				<exemplarCity>Denver</exemplarCity>
+			</zone>
+			<zone type="America/Chicago">
+				<exemplarCity>Chicago</exemplarCity>
+			</zone>
+			<zone type="America/New_York">
+				<exemplarCity>New York</exemplarCity>
+			</zone>
+			<zone type="America/Montevideo">
+				<exemplarCity>Montevideo</exemplarCity>
+			</zone>
+			<zone type="Asia/Tashkent">
+				<exemplarCity>Toshkent</exemplarCity>
+			</zone>
 			<zone type="Europe/Vatican">
 				<exemplarCity>Vatikan</exemplarCity>
 			</zone>
 			<zone type="America/St_Vincent">
 				<exemplarCity>Sant Visant</exemplarCity>
 			</zone>
+			<zone type="America/Caracas">
+				<exemplarCity>Caracas</exemplarCity>
+			</zone>
 			<zone type="Asia/Saigon">
 				<exemplarCity>Kêr Hô-Chi-Minh</exemplarCity>
 			</zone>
+			<zone type="Pacific/Wallis">
+				<exemplarCity>Wallis</exemplarCity>
+			</zone>
+			<zone type="Pacific/Apia">
+				<exemplarCity>Apia</exemplarCity>
+			</zone>
 			<zone type="Asia/Aden">
 				<exemplarCity>Aden</exemplarCity>
 			</zone>
 			<zone type="Indian/Mayotte">
 				<exemplarCity>Mayotte</exemplarCity>
 			</zone>
+			<zone type="Africa/Johannesburg">
+				<exemplarCity>Johannesburg</exemplarCity>
+			</zone>
 			<zone type="Africa/Lusaka">
 				<exemplarCity>Lusaka</exemplarCity>
 			</zone>
 			<zone type="Africa/Harare">
 				<exemplarCity>Harare</exemplarCity>
 			</zone>
+			<metazone type="Afghanistan">
+				<long>
+					<standard>eur Afghanistan</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Central">
+				<long>
+					<standard>eur Kreizafrika</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Eastern">
+				<long>
+					<standard>eur Afrika ar Reter</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Southern">
+				<long>
+					<standard>eur cʼhoañv Suafrika</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Western">
+				<long>
+					<generic>eur Afrika ar Cʼhornôg</generic>
+					<standard>eur cʼhoañv Afrika ar Cʼhornôg</standard>
+					<daylight>eur hañv Afrika ar Cʼhornôg</daylight>
+				</long>
+			</metazone>
+			<metazone type="Alaska">
+				<long>
+					<generic>eur Alaska</generic>
+					<standard>eur cʼhoañv Alaska</standard>
+					<daylight>eur hañv Alaska</daylight>
+				</long>
+			</metazone>
+			<metazone type="Almaty">
+				<long>
+					<generic>eur Almaty</generic>
+					<standard>eur cʼhoañv Almaty</standard>
+					<daylight>eur hañv Almaty</daylight>
+				</long>
+			</metazone>
+			<metazone type="Amazon">
+				<long>
+					<generic>eur an Amazon</generic>
+					<standard>eur cʼhoañv an Amazon</standard>
+					<daylight>eur hañv an Amazon</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Eastern">
+				<long>
+					<generic>eur ar Reter</generic>
+					<standard>eur cʼhoañv ar Reter</standard>
+					<daylight>eur hañv ar Reter</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Mountain">
+				<long>
+					<generic>eur ar Menezioù</generic>
+					<standard>eur cʼhoañv ar Menezioù</standard>
+					<daylight>eur hañv ar Menezioù</daylight>
+				</long>
+			</metazone>
+			<metazone type="Anadyr">
+				<long>
+					<generic>eur Anadyrʼ</generic>
+					<standard>eur cʼhoañv Anadyrʼ</standard>
+					<daylight>eur hañv Anadyrʼ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Apia">
+				<long>
+					<generic>eur Apia</generic>
+					<standard>eur cʼhoañv Apia</standard>
+					<daylight>eur hañv Apia</daylight>
+				</long>
+			</metazone>
+			<metazone type="Arabian">
+				<long>
+					<generic>eur Arabia</generic>
+					<standard>eur cʼhoañv Arabia</standard>
+					<daylight>eur hañv Arabia</daylight>
+				</long>
+			</metazone>
+			<metazone type="Argentina">
+				<long>
+					<generic>eur Arcʼhantina</generic>
+					<standard>eur cʼhoañv Arcʼhantina</standard>
+					<daylight>eur hañv Arcʼhantina</daylight>
+				</long>
+			</metazone>
+			<metazone type="Argentina_Western">
+				<long>
+					<generic>eur Arcʼhantina ar Cʼhornôg</generic>
+					<standard>eur cʼhoañv Arcʼhantina ar Cʼhornôg</standard>
+					<daylight>eur hañv Arcʼhantina ar Cʼhornôg</daylight>
+				</long>
+			</metazone>
+			<metazone type="Armenia">
+				<long>
+					<generic>eur Armenia</generic>
+					<standard>eur cʼhoañv Armenia</standard>
+					<daylight>eur hañv Armenia</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Central">
+				<long>
+					<generic>eur Kreizaostralia</generic>
+					<standard>eur cʼhoañv Kreizaostralia</standard>
+					<daylight>eur hañv Kreizaostralia</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_CentralWestern">
+				<long>
+					<generic>eur Kreizaostralia ar Cʼhornôg</generic>
+					<standard>eur cʼhoañv Kreizaostralia ar Cʼhornôg</standard>
+					<daylight>eur hañv Kreizaostralia ar Cʼhornôg</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Eastern">
+				<long>
+					<generic>eur Aostralia ar Reter</generic>
+					<standard>eur cʼhoañv Aostralia ar Reter</standard>
+					<daylight>eur hañv Aostralia ar Reter</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Western">
+				<long>
+					<generic>eur Aostralia ar Cʼhornôg</generic>
+					<standard>eur cʼhoañv Aostralia ar Cʼhornôg</standard>
+					<daylight>eur hañv Aostralia ar Cʼhornôg</daylight>
+				</long>
+			</metazone>
+			<metazone type="Azerbaijan">
+				<long>
+					<generic>eur Azerbaidjan</generic>
+					<standard>eur cʼhoañv Azerbaidjan</standard>
+					<daylight>eur hañv Azerbaidjan</daylight>
+				</long>
+			</metazone>
+			<metazone type="Azores">
+				<long>
+					<generic>eur an Azorez</generic>
+					<standard>eur cʼhoañv an Azorez</standard>
+					<daylight>eur hañv an Azorez</daylight>
+				</long>
+			</metazone>
+			<metazone type="Bangladesh">
+				<long>
+					<generic>eur Bangladesh</generic>
+					<standard>eur cʼhoañv Bangladesh</standard>
+					<daylight>eur hañv Bangladesh</daylight>
+				</long>
+			</metazone>
+			<metazone type="Bhutan">
+				<long>
+					<standard>eur Bhoutan</standard>
+				</long>
+			</metazone>
+			<metazone type="Bolivia">
+				<long>
+					<standard>eur Bolivia</standard>
+				</long>
+			</metazone>
+			<metazone type="Brasilia">
+				<long>
+					<generic>eur Brasília</generic>
+					<standard>eur cʼhoañv Brasília</standard>
+					<daylight>eur hañv Brasília</daylight>
+				</long>
+			</metazone>
 			<metazone type="Brunei">
 				<long>
-					<standard>Eur Brunei Darussalam</standard>
+					<standard>eur Brunei Darussalam</standard>
+				</long>
+			</metazone>
+			<metazone type="Cape_Verde">
+				<long>
+					<generic>eur ar Cʼhab-Glas</generic>
+					<standard>eur cʼhoañv ar Cʼhab-Glas</standard>
+					<daylight>eur hañv ar Cʼhab-Glas</daylight>
+				</long>
+			</metazone>
+			<metazone type="Chatham">
+				<long>
+					<generic>eur Chatham</generic>
+					<standard>eur cʼhoañv Chatham</standard>
+					<daylight>eur hañv Chatham</daylight>
+				</long>
+			</metazone>
+			<metazone type="Chile">
+				<long>
+					<generic>eur Chile</generic>
+					<standard>eur cʼhoañv Chile</standard>
+					<daylight>eur hañv Chile</daylight>
+				</long>
+			</metazone>
+			<metazone type="China">
+				<long>
+					<generic>eur Sina</generic>
+					<standard>eur cʼhoañv Sina</standard>
+					<daylight>eur hañv Sina</daylight>
+				</long>
+			</metazone>
+			<metazone type="Christmas">
+				<long>
+					<standard>eur Enez Christmas</standard>
+				</long>
+			</metazone>
+			<metazone type="Cocos">
+				<long>
+					<standard>eur Inizi Kokoz</standard>
+				</long>
+			</metazone>
+			<metazone type="Colombia">
+				<long>
+					<generic>eur Kolombia</generic>
+					<standard>eur cʼhoañv Kolombia</standard>
+					<daylight>eur hañv Kolombia</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cook">
+				<long>
+					<generic>eur Inizi Cook</generic>
+					<standard>eur cʼhoañv Inizi Cook</standard>
+					<daylight>eur hañv Inizi Cook</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cuba">
+				<long>
+					<generic>eur Kuba</generic>
+					<standard>eur cʼhoañv Kuba</standard>
+					<daylight>eur hañv Kuba</daylight>
 				</long>
 			</metazone>
 			<metazone type="East_Timor">
 				<long>
-					<standard>Eur Timor ar Reter</standard>
+					<standard>eur Timor ar Reter</standard>
+				</long>
+			</metazone>
+			<metazone type="Easter">
+				<long>
+					<generic>eur Enez Pask</generic>
+					<standard>eur cʼhoañv Enez Pask</standard>
+					<daylight>eur hañv Enez Pask</daylight>
+				</long>
+			</metazone>
+			<metazone type="Ecuador">
+				<long>
+					<standard>eur Ecuador</standard>
+				</long>
+			</metazone>
+			<metazone type="Europe_Central">
+				<long>
+					<generic>eur Kreizeuropa</generic>
+					<standard>eur cʼhoañv Kreizeuropa</standard>
+					<daylight>eur hañv Kreizeuropa</daylight>
+				</long>
+			</metazone>
+			<metazone type="Europe_Eastern">
+				<long>
+					<generic>eur Europa ar Reter</generic>
+					<standard>eur cʼhoañv Europa ar Reter</standard>
+					<daylight>eur hañv Europa ar Reter</daylight>
+				</long>
+			</metazone>
+			<metazone type="Europe_Western">
+				<long>
+					<generic>eur Europa ar Cʼhornôg</generic>
+					<standard>eur cʼhoañv Europa ar Cʼhornôg</standard>
+					<daylight>eur hañv Europa ar Cʼhornôg</daylight>
+				</long>
+			</metazone>
+			<metazone type="Falkland">
+				<long>
+					<generic>eur Inizi Falkland</generic>
+					<standard>eur cʼhoañv Inizi Falkland</standard>
+					<daylight>eur hañv Inizi Falkland</daylight>
+				</long>
+			</metazone>
+			<metazone type="Fiji">
+				<long>
+					<generic>eur Fidji</generic>
+					<standard>eur cʼhoañv Fidji</standard>
+					<daylight>eur hañv Fidji</daylight>
+				</long>
+			</metazone>
+			<metazone type="French_Guiana">
+				<long>
+					<standard>eur Gwiana cʼhall</standard>
+				</long>
+			</metazone>
+			<metazone type="French_Southern">
+				<long>
+					<standard>eur Douaroù aostral Frañs hag Antarktika</standard>
+				</long>
+			</metazone>
+			<metazone type="Galapagos">
+				<long>
+					<standard>eur Inizi Galápagos</standard>
+				</long>
+			</metazone>
+			<metazone type="Gambier">
+				<long>
+					<standard>eur Gambier</standard>
+				</long>
+			</metazone>
+			<metazone type="Georgia">
+				<long>
+					<generic>eur Jorjia</generic>
+					<standard>eur cʼhoañv Jorjia</standard>
+					<daylight>eur hañv Jorjia</daylight>
 				</long>
 			</metazone>
 			<metazone type="GMT">
@@ -1836,19 +3127,417 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<standard>Amzer keitat Greenwich (AKG)</standard>
 				</long>
 			</metazone>
+			<metazone type="Greenland_Eastern">
+				<long>
+					<generic>eur Greunland ar Reter</generic>
+					<standard>eur cʼhoañv Greunland ar Reter</standard>
+					<daylight>eur hañv Greunland ar Reter</daylight>
+				</long>
+			</metazone>
+			<metazone type="Greenland_Western">
+				<long>
+					<generic>eur Greunland ar Cʼhornôg</generic>
+					<standard>eur cʼhoañv Greunland ar Cʼhornôg</standard>
+					<daylight>eur hañv Greunland ar Cʼhornôg</daylight>
+				</long>
+			</metazone>
+			<metazone type="Guam">
+				<long>
+					<standard>eur cʼhoañv Guam</standard>
+				</long>
+			</metazone>
+			<metazone type="Gulf">
+				<long>
+					<standard>eur cʼhoañv ar Pleg-mor Arab-ha-Pers</standard>
+				</long>
+			</metazone>
+			<metazone type="Guyana">
+				<long>
+					<standard>eur Guyana</standard>
+				</long>
+			</metazone>
+			<metazone type="Hong_Kong">
+				<long>
+					<generic>eur Hong Kong</generic>
+					<standard>eur cʼhoañv Hong Kong</standard>
+					<daylight>eur hañv Hong Kong</daylight>
+				</long>
+			</metazone>
+			<metazone type="India">
+				<long>
+					<standard>eur cʼhoañv India</standard>
+				</long>
+			</metazone>
 			<metazone type="Indochina">
 				<long>
-					<standard>Eur Indez-Sina</standard>
+					<standard>eur Indez-Sina</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Eastern">
+				<long>
+					<standard>eur Indonezia ar Reter</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Western">
+				<long>
+					<standard>eur Indonezia ar Cʼhornôg</standard>
+				</long>
+			</metazone>
+			<metazone type="Iran">
+				<long>
+					<generic>eur Iran</generic>
+					<standard>eur cʼhoañv Iran</standard>
+					<daylight>eur hañv Iran</daylight>
+				</long>
+			</metazone>
+			<metazone type="Irkutsk">
+				<long>
+					<generic>eur Irkutsk</generic>
+					<standard>eur cʼhoañv Irkutsk</standard>
+					<daylight>eur hañv Irkutsk</daylight>
+				</long>
+			</metazone>
+			<metazone type="Israel">
+				<long>
+					<generic>eur Israel</generic>
+					<standard>eur cʼhoañv Israel</standard>
+					<daylight>eur hañv Israel</daylight>
+				</long>
+			</metazone>
+			<metazone type="Japan">
+				<long>
+					<generic>eur Japan</generic>
+					<standard>eur cʼhoañv Japan</standard>
+					<daylight>eur hañv Japan</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Eastern">
+				<long>
+					<standard>eur Kazakstan ar Reter</standard>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Western">
+				<long>
+					<standard>eur Kazakstan ar Cʼhornôg</standard>
+				</long>
+			</metazone>
+			<metazone type="Korea">
+				<long>
+					<generic>eur Korea</generic>
+					<standard>eur cʼhoañv Korea</standard>
+					<daylight>eur hañv Korea</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kyrgystan">
+				<long>
+					<standard>eur Kyrgyzstan</standard>
+				</long>
+			</metazone>
+			<metazone type="Lanka">
+				<long>
+					<standard>eur Sri Lanka</standard>
+				</long>
+			</metazone>
+			<metazone type="Macau">
+				<long>
+					<generic>eur Macau</generic>
+					<standard>eur cʼhoañv Macau</standard>
+					<daylight>eur hañv Macau</daylight>
+				</long>
+			</metazone>
+			<metazone type="Macquarie">
+				<long>
+					<standard>eur Enez Macquarie</standard>
 				</long>
 			</metazone>
 			<metazone type="Malaysia">
 				<long>
-					<standard>Eur Malaysia</standard>
+					<standard>eur Malaysia</standard>
+				</long>
+			</metazone>
+			<metazone type="Maldives">
+				<long>
+					<standard>eur ar Maldivez</standard>
+				</long>
+			</metazone>
+			<metazone type="Marquesas">
+				<long>
+					<standard>eur Inizi Markiz</standard>
+				</long>
+			</metazone>
+			<metazone type="Marshall_Islands">
+				<long>
+					<standard>eur Inizi Marshall</standard>
+				</long>
+			</metazone>
+			<metazone type="Mauritius">
+				<long>
+					<generic>eur Moris</generic>
+					<standard>eur cʼhoañv Moris</standard>
+					<daylight>eur hañv Moris</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mexico_Northwest">
+				<long>
+					<generic>eur Gwalarn Mecʼhiko</generic>
+					<standard>eur cʼhoañv Gwalarn Mecʼhiko</standard>
+					<daylight>eur hañv Gwalarn Mecʼhiko</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mongolia">
+				<long>
+					<generic>eur Ulaanbaatar</generic>
+					<standard>eur cʼhoañv Ulaanbaatar</standard>
+					<daylight>eur hañv Ulaanbaatar</daylight>
+				</long>
+			</metazone>
+			<metazone type="Moscow">
+				<long>
+					<generic>eur Moskov</generic>
+					<standard>eur cʼhoañv Moskov</standard>
+					<daylight>eur hañv Moskov</daylight>
 				</long>
 			</metazone>
 			<metazone type="Myanmar">
 				<long>
-					<standard>Eur Myanmar</standard>
+					<standard>eur Myanmar</standard>
+				</long>
+			</metazone>
+			<metazone type="Nauru">
+				<long>
+					<standard>eur Nauru</standard>
+				</long>
+			</metazone>
+			<metazone type="Nepal">
+				<long>
+					<standard>eur Nepal</standard>
+				</long>
+			</metazone>
+			<metazone type="New_Caledonia">
+				<long>
+					<generic>eur Kaledonia Nevez</generic>
+					<standard>eur cʼhoañv Kaledonia Nevez</standard>
+					<daylight>eur hañv Kaledonia Nevez</daylight>
+				</long>
+			</metazone>
+			<metazone type="New_Zealand">
+				<long>
+					<generic>eur Zeland-Nevez</generic>
+					<standard>eur cʼhoañv Zeland-Nevez</standard>
+					<daylight>eur hañv Zeland-Nevez</daylight>
+				</long>
+			</metazone>
+			<metazone type="Newfoundland">
+				<long>
+					<generic>eur Newfoundland</generic>
+					<standard>eur cʼhoañv Newfoundland</standard>
+					<daylight>eur hañv Newfoundland</daylight>
+				</long>
+			</metazone>
+			<metazone type="Niue">
+				<long>
+					<standard>eur Niue</standard>
+				</long>
+			</metazone>
+			<metazone type="Norfolk">
+				<long>
+					<standard>eur Enez Norfolk</standard>
+				</long>
+			</metazone>
+			<metazone type="Novosibirsk">
+				<long>
+					<generic>eur Novosibirsk</generic>
+					<standard>eur cʼhoañv Novosibirsk</standard>
+					<daylight>eur hañv Novosibirsk</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pakistan">
+				<long>
+					<generic>eur Pakistan</generic>
+					<standard>eur cʼhoañv Pakistan</standard>
+					<daylight>eur hañv Pakistan</daylight>
+				</long>
+			</metazone>
+			<metazone type="Palau">
+				<long>
+					<standard>eur Palau</standard>
+				</long>
+			</metazone>
+			<metazone type="Paraguay">
+				<long>
+					<generic>eur Paraguay</generic>
+					<standard>eur cʼhoañv Paraguay</standard>
+					<daylight>eur hañv Paraguay</daylight>
+				</long>
+			</metazone>
+			<metazone type="Peru">
+				<long>
+					<generic>eur Perou</generic>
+					<standard>eur cʼhoañv Perou</standard>
+					<daylight>eur hañv Perou</daylight>
+				</long>
+			</metazone>
+			<metazone type="Philippines">
+				<long>
+					<generic>eur ar Filipinez</generic>
+					<standard>eur cʼhoañv ar Filipinez</standard>
+					<daylight>eur hañv ar Filipinez</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pierre_Miquelon">
+				<long>
+					<generic>eur Sant-Pêr-ha-Mikelon</generic>
+					<standard>eur cʼhoañv Sant-Pêr-ha-Mikelon</standard>
+					<daylight>eur hañv Sant-Pêr-ha-Mikelon</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pitcairn">
+				<long>
+					<standard>eur Pitcairn</standard>
+				</long>
+			</metazone>
+			<metazone type="Reunion">
+				<long>
+					<standard>eur ar Reünion</standard>
+				</long>
+			</metazone>
+			<metazone type="Sakhalin">
+				<long>
+					<generic>eur Sakhalin</generic>
+					<standard>eur cʼhoañv Sakhalin</standard>
+					<daylight>eur hañv Sakhalin</daylight>
+				</long>
+			</metazone>
+			<metazone type="Samoa">
+				<long>
+					<generic>eur Samoa</generic>
+					<standard>eur cʼhoañv Samoa</standard>
+					<daylight>eur hañv Samoa</daylight>
+				</long>
+			</metazone>
+			<metazone type="Seychelles">
+				<long>
+					<standard>eur Sechelez</standard>
+				</long>
+			</metazone>
+			<metazone type="Singapore">
+				<long>
+					<standard>eur cʼhoañv Singapour</standard>
+				</long>
+			</metazone>
+			<metazone type="Solomon">
+				<long>
+					<standard>eur Inizi Salomon</standard>
+				</long>
+			</metazone>
+			<metazone type="South_Georgia">
+				<long>
+					<standard>eur Georgia ar Su</standard>
+				</long>
+			</metazone>
+			<metazone type="Suriname">
+				<long>
+					<standard>eur Surinam</standard>
+				</long>
+			</metazone>
+			<metazone type="Tahiti">
+				<long>
+					<standard>eur Tahiti</standard>
+				</long>
+			</metazone>
+			<metazone type="Taipei">
+				<long>
+					<generic>eur Taipei</generic>
+					<standard>eur cʼhoañv Taipei</standard>
+					<daylight>eur hañv Taipei</daylight>
+				</long>
+			</metazone>
+			<metazone type="Tajikistan">
+				<long>
+					<standard>eur Tadjikistan</standard>
+				</long>
+			</metazone>
+			<metazone type="Tokelau">
+				<long>
+					<standard>eur Tokelau</standard>
+				</long>
+			</metazone>
+			<metazone type="Tonga">
+				<long>
+					<generic>eur Tonga</generic>
+					<standard>eur cʼhoañv Tonga</standard>
+					<daylight>eur hañv Tonga</daylight>
+				</long>
+			</metazone>
+			<metazone type="Turkmenistan">
+				<long>
+					<generic>eur Turkmenistan</generic>
+					<standard>eur cʼhoañv Turkmenistan</standard>
+					<daylight>eur hañv Turkmenistan</daylight>
+				</long>
+			</metazone>
+			<metazone type="Tuvalu">
+				<long>
+					<standard>eur Tuvalu</standard>
+				</long>
+			</metazone>
+			<metazone type="Uruguay">
+				<long>
+					<generic>eur Uruguay</generic>
+					<standard>eur cʼhoañv Uruguay</standard>
+					<daylight>eur hañv Uruguay</daylight>
+				</long>
+			</metazone>
+			<metazone type="Uzbekistan">
+				<long>
+					<generic>eur Ouzbekistan</generic>
+					<standard>eur cʼhoañv Ouzbekistan</standard>
+					<daylight>eur hañv Ouzbekistan</daylight>
+				</long>
+			</metazone>
+			<metazone type="Vanuatu">
+				<long>
+					<generic>eur Vanuatu</generic>
+					<standard>eur cʼhoañv Vanuatu</standard>
+					<daylight>eur hañv Vanuatu</daylight>
+				</long>
+			</metazone>
+			<metazone type="Venezuela">
+				<long>
+					<standard>eur Venezuela</standard>
+				</long>
+			</metazone>
+			<metazone type="Vladivostok">
+				<long>
+					<generic>eur Vladivostok</generic>
+					<standard>eur cʼhoañv Vladivostok</standard>
+					<daylight>eur hañv Vladivostok</daylight>
+				</long>
+			</metazone>
+			<metazone type="Volgograd">
+				<long>
+					<generic>eur Volgograd</generic>
+					<standard>eur cʼhoañv Volgograd</standard>
+					<daylight>eur hañv Volgograd</daylight>
+				</long>
+			</metazone>
+			<metazone type="Wallis">
+				<long>
+					<standard>eur Wallis ha Futuna</standard>
+				</long>
+			</metazone>
+			<metazone type="Yakutsk">
+				<long>
+					<generic>eur Yakutsk</generic>
+					<standard>eur cʼhoañv Yakutsk</standard>
+					<daylight>eur hañv Yakutsk</daylight>
+				</long>
+			</metazone>
+			<metazone type="Yekaterinburg">
+				<long>
+					<generic>eur Yekaterinbourg</generic>
+					<standard>eur cʼhoañv Yekaterinbourg</standard>
+					<daylight>eur hañv Yekaterinbourg</daylight>
 				</long>
 			</metazone>
 		</timeZoneNames>
@@ -1858,9 +3547,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<otherNumberingSystems>
 			<native draft="contributed">latn</native>
 		</otherNumberingSystems>
+		<symbols numberSystem="arab">
+			<timeSeparator draft="contributed">:</timeSeparator>
+		</symbols>
 		<symbols numberSystem="latn">
 			<decimal>,</decimal>
 			<group> </group>
+			<list>;</list>
 			<percentSign>%</percentSign>
 			<plusSign>+</plusSign>
 			<minusSign>-</minusSign>
@@ -1892,6 +3585,70 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0K ¤</pattern>
+					<pattern type="1000" count="two" draft="provisional">0K ¤</pattern>
+					<pattern type="1000" count="few" draft="provisional">0K ¤</pattern>
+					<pattern type="1000" count="many" draft="provisional">0K ¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0K ¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00K ¤</pattern>
+					<pattern type="10000" count="two" draft="provisional">00K ¤</pattern>
+					<pattern type="10000" count="few" draft="provisional">00K ¤</pattern>
+					<pattern type="10000" count="many" draft="provisional">00K ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K ¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000K ¤</pattern>
+					<pattern type="100000" count="two" draft="provisional">000K ¤</pattern>
+					<pattern type="100000" count="few" draft="provisional">000K ¤</pattern>
+					<pattern type="100000" count="many" draft="provisional">000K ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K ¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0M ¤</pattern>
+					<pattern type="1000000" count="two" draft="provisional">0M ¤</pattern>
+					<pattern type="1000000" count="few" draft="provisional">0M ¤</pattern>
+					<pattern type="1000000" count="many" draft="provisional">0M ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M ¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00M ¤</pattern>
+					<pattern type="10000000" count="two" draft="provisional">00M ¤</pattern>
+					<pattern type="10000000" count="few" draft="provisional">00M ¤</pattern>
+					<pattern type="10000000" count="many" draft="provisional">00M ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M ¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000M ¤</pattern>
+					<pattern type="100000000" count="two" draft="provisional">000M ¤</pattern>
+					<pattern type="100000000" count="few" draft="provisional">000M ¤</pattern>
+					<pattern type="100000000" count="many" draft="provisional">000M ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M ¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0G ¤</pattern>
+					<pattern type="1000000000" count="two" draft="provisional">0G ¤</pattern>
+					<pattern type="1000000000" count="few" draft="provisional">0G ¤</pattern>
+					<pattern type="1000000000" count="many" draft="provisional">0G ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G ¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00G ¤</pattern>
+					<pattern type="10000000000" count="two" draft="provisional">00G ¤</pattern>
+					<pattern type="10000000000" count="few" draft="provisional">00G ¤</pattern>
+					<pattern type="10000000000" count="many" draft="provisional">00G ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G ¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000G ¤</pattern>
+					<pattern type="100000000000" count="two" draft="provisional">000G ¤</pattern>
+					<pattern type="100000000000" count="few" draft="provisional">000G ¤</pattern>
+					<pattern type="100000000000" count="many" draft="provisional">000G ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0T ¤</pattern>
+					<pattern type="1000000000000" count="two" draft="provisional">0T ¤</pattern>
+					<pattern type="1000000000000" count="few" draft="provisional">0T ¤</pattern>
+					<pattern type="1000000000000" count="many" draft="provisional">0T ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00T ¤</pattern>
+					<pattern type="10000000000000" count="two" draft="provisional">00T ¤</pattern>
+					<pattern type="10000000000000" count="few" draft="provisional">00T ¤</pattern>
+					<pattern type="10000000000000" count="many" draft="provisional">00T ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000T ¤</pattern>
+					<pattern type="100000000000000" count="two" draft="provisional">000T ¤</pattern>
+					<pattern type="100000000000000" count="few" draft="provisional">000T ¤</pattern>
+					<pattern type="100000000000000" count="many" draft="provisional">000T ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="two">{0} {1}</unitPattern>
 			<unitPattern count="few">{0} {1}</unitPattern>
@@ -1906,6 +3663,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">feseta Andorra</displayName>
 				<displayName count="many">a besetaoù Andorra</displayName>
 				<displayName count="other">peseta Andorra</displayName>
+				<symbol draft="contributed">ADP</symbol>
 			</currency>
 			<currency type="AED">
 				<displayName>dirham EAU</displayName>
@@ -1914,6 +3672,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dirham EAU</displayName>
 				<displayName count="many">a zirhamoù EAU</displayName>
 				<displayName count="other">dirham EAU</displayName>
+				<symbol draft="contributed">AED</symbol>
 			</currency>
 			<currency type="AFA">
 				<displayName>afghani Afghanistan (1927–2002)</displayName>
@@ -1922,6 +3681,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">afghani Afghanistan (1927–2002)</displayName>
 				<displayName count="many">a afghanioù Afghanistan (1927–2002)</displayName>
 				<displayName count="other">afghani Afghanistan (1927–2002)</displayName>
+				<symbol draft="contributed">AFA</symbol>
 			</currency>
 			<currency type="AFN">
 				<displayName>afghani Afghanistan</displayName>
@@ -1930,6 +3690,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">afghani Afghanistan</displayName>
 				<displayName count="many">a afghanioù Afghanistan</displayName>
 				<displayName count="other">afghani Afghanistan</displayName>
+				<symbol draft="contributed">AFN</symbol>
 			</currency>
 			<currency type="ALK">
 				<displayName>lek Albania (1946–1965)</displayName>
@@ -1938,6 +3699,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lek Albania (1946–1965)</displayName>
 				<displayName count="many">a lekoù Albania (1946–1965)</displayName>
 				<displayName count="other">lek Albania (1946–1965)</displayName>
+				<symbol draft="contributed">ALK</symbol>
 			</currency>
 			<currency type="ALL">
 				<displayName>lek Albania</displayName>
@@ -1946,6 +3708,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lek Albania</displayName>
 				<displayName count="many">a lekoù Albania</displayName>
 				<displayName count="other">lek Albania</displayName>
+				<symbol draft="contributed">ALL</symbol>
 			</currency>
 			<currency type="AMD">
 				<displayName>dram Armenia</displayName>
@@ -1954,6 +3717,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dram Armenia</displayName>
 				<displayName count="many">a zramoù Armenia</displayName>
 				<displayName count="other">dram Armenia</displayName>
+				<symbol draft="contributed">AMD</symbol>
 			</currency>
 			<currency type="ANG">
 				<displayName>florin Antilhez nederlandat</displayName>
@@ -1962,6 +3726,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">florin Antilhez nederlandat</displayName>
 				<displayName count="many">a florinoù Antilhez</displayName>
 				<displayName count="other">florin Antilhez nederlandat</displayName>
+				<symbol draft="contributed">ANG</symbol>
 			</currency>
 			<currency type="AOA">
 				<displayName>kwanza Angola</displayName>
@@ -1970,6 +3735,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">cʼhwanza Angola</displayName>
 				<displayName count="many">a gwanzaoù Angola</displayName>
 				<displayName count="other">kwanza Angola</displayName>
+				<symbol draft="contributed">AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>kwanza Angola (1977–1991)</displayName>
@@ -1978,6 +3745,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">cʼhwanza Angola (1977–1991)</displayName>
 				<displayName count="many">a gwanzaoù Angola (1977–1991)</displayName>
 				<displayName count="other">kwanza Angola (1977–1991)</displayName>
+				<symbol draft="contributed">AOK</symbol>
 			</currency>
 			<currency type="AON">
 				<displayName>kwanza nevez Angola (1990–2000)</displayName>
@@ -1986,6 +3754,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">cʼhwanza nevez Angola (1990–2000)</displayName>
 				<displayName count="many">a gwanzaoù nevez Angola (1990–2000)</displayName>
 				<displayName count="other">kwanza nevez Angola (1990–2000)</displayName>
+				<symbol draft="contributed">AON</symbol>
+			</currency>
+			<currency type="AOR">
+				<symbol draft="contributed">AOR</symbol>
+			</currency>
+			<currency type="ARA">
+				<symbol draft="contributed">ARA</symbol>
+			</currency>
+			<currency type="ARL">
+				<symbol draft="contributed">ARL</symbol>
 			</currency>
 			<currency type="ARM">
 				<displayName>peso Arcʼhantina (1881–1970)</displayName>
@@ -1994,6 +3772,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">feso Arcʼhantina (1881–1970)</displayName>
 				<displayName count="many">a besoioù Arcʼhantina (1881–1970)</displayName>
 				<displayName count="other">peso Arcʼhantina (1881–1970)</displayName>
+				<symbol draft="contributed">ARM</symbol>
 			</currency>
 			<currency type="ARP">
 				<displayName>peso Arcʼhantina (1983–1985)</displayName>
@@ -2002,6 +3781,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">feso Arcʼhantina (1983–1985)</displayName>
 				<displayName count="many">a besoioù Arcʼhantina (1983–1985)</displayName>
 				<displayName count="other">peso Arcʼhantina (1983–1985)</displayName>
+				<symbol draft="contributed">ARP</symbol>
 			</currency>
 			<currency type="ARS">
 				<displayName>peso Arcʼhantina</displayName>
@@ -2010,6 +3790,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">feso Arcʼhantina</displayName>
 				<displayName count="many">a pesoioù Arcʼhantina</displayName>
 				<displayName count="other">peso Arcʼhantina</displayName>
+				<symbol draft="contributed">ARS</symbol>
 			</currency>
 			<currency type="ATS">
 				<displayName>schilling Aostria</displayName>
@@ -2018,6 +3799,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">schilling Aostria</displayName>
 				<displayName count="many">a schillingoù Aostria</displayName>
 				<displayName count="other">schilling Aostria</displayName>
+				<symbol draft="contributed">ATS</symbol>
 			</currency>
 			<currency type="AUD">
 				<displayName>dollar Aostralia</displayName>
@@ -2036,6 +3818,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">florin Aruba</displayName>
 				<displayName count="many">a florinoù Aruba</displayName>
 				<displayName count="other">florin Aruba</displayName>
+				<symbol draft="contributed">AWG</symbol>
 			</currency>
 			<currency type="AZM">
 				<displayName>manat Azerbaidjan (1993–2006)</displayName>
@@ -2044,6 +3827,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">manat Azerbaidjan (1993–2006)</displayName>
 				<displayName count="many">a vanatoù Azerbaidjan (1993–2006)</displayName>
 				<displayName count="other">manat Azerbaidjan (1993–2006)</displayName>
+				<symbol draft="contributed">AZM</symbol>
 			</currency>
 			<currency type="AZN">
 				<displayName>manat Azerbaidjan</displayName>
@@ -2052,6 +3836,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">manat Azerbaidjan</displayName>
 				<displayName count="many">a vanatoù Azerbaidjan</displayName>
 				<displayName count="other">manat Azerbaidjan</displayName>
+				<symbol draft="contributed">AZN</symbol>
 			</currency>
 			<currency type="BAD">
 				<displayName>dinar Bosnia ha Herzegovina (1992–1994)</displayName>
@@ -2060,6 +3845,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dinar Bosnia ha Herzegovina (1992–1994)</displayName>
 				<displayName count="many">a zinaroù Bosnia ha Herzegovina (1992–1994)</displayName>
 				<displayName count="other">dinar Bosnia ha Herzegovina (1992–1994)</displayName>
+				<symbol draft="contributed">BAD</symbol>
 			</currency>
 			<currency type="BAM">
 				<displayName>mark kemmadus Bosnia ha Herzegovina</displayName>
@@ -2068,6 +3854,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">mark kemmadus Bosnia ha Herzegovina</displayName>
 				<displayName count="many">a varkoù kemmadus Bosnia ha Herzegovina</displayName>
 				<displayName count="other">mark kemmadus Bosnia ha Herzegovina</displayName>
+				<symbol draft="contributed">BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BAN">
 				<displayName>dinar nevez Bosnia ha Herzegovina (1994–1997)</displayName>
@@ -2076,6 +3864,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dinar nevez Bosnia ha Herzegovina (1994–1997)</displayName>
 				<displayName count="many">a zinaroù nevez Bosnia ha Herzegovina (1994–1997)</displayName>
 				<displayName count="other">dinar nevez Bosnia ha Herzegovina (1994–1997)</displayName>
+				<symbol draft="contributed">BAN</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>dollar Barbados</displayName>
@@ -2084,6 +3873,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dollar Barbados</displayName>
 				<displayName count="many">a zollaroù Barbados</displayName>
 				<displayName count="other">dollar Barbados</displayName>
+				<symbol draft="contributed">BBD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BDT">
@@ -2093,6 +3883,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">zaka Bangladesh</displayName>
 				<displayName count="many">a dakaoù Bangladesh</displayName>
 				<displayName count="other">taka Bangladesh</displayName>
+				<symbol draft="contributed">BDT</symbol>
 				<symbol alt="narrow" draft="contributed">৳</symbol>
 			</currency>
 			<currency type="BEC">
@@ -2102,6 +3893,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Belgia (kemmadus)</displayName>
 				<displayName count="many">a lurioù Belgia (kemmadus)</displayName>
 				<displayName count="other">lur Belgia (kemmadus)</displayName>
+				<symbol draft="contributed">BEC</symbol>
 			</currency>
 			<currency type="BEF">
 				<displayName>lur Belgia</displayName>
@@ -2110,6 +3902,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Belgia</displayName>
 				<displayName count="many">a lurioù Belgia</displayName>
 				<displayName count="other">lur Belgia</displayName>
+				<symbol draft="contributed">BEF</symbol>
 			</currency>
 			<currency type="BEL">
 				<displayName>BEL</displayName>
@@ -2118,6 +3911,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">BEL</displayName>
 				<displayName count="many">BEL</displayName>
 				<displayName count="other">BEL</displayName>
+				<symbol draft="contributed">BEL</symbol>
+			</currency>
+			<currency type="BGL">
+				<symbol draft="contributed">BGL</symbol>
 			</currency>
 			<currency type="BGM">
 				<displayName>lev sokialour Bulgaria</displayName>
@@ -2126,6 +3923,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lev sokialour Bulgaria</displayName>
 				<displayName count="many">a levoù sokialour Bulgaria</displayName>
 				<displayName count="other">lev sokialour Bulgaria</displayName>
+				<symbol draft="contributed">BGM</symbol>
 			</currency>
 			<currency type="BGN">
 				<displayName>lev Bulgaria</displayName>
@@ -2134,6 +3932,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lev Bulgaria</displayName>
 				<displayName count="many">a levoù Bulgaria</displayName>
 				<displayName count="other">lev Bulgaria</displayName>
+				<symbol draft="contributed">BGN</symbol>
 			</currency>
 			<currency type="BGO">
 				<displayName>lev Bulgaria (1879–1952)</displayName>
@@ -2142,6 +3941,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lev Bulgaria (1879–1952)</displayName>
 				<displayName count="many">a levoù Bulgaria (1879–1952)</displayName>
 				<displayName count="other">lev Bulgaria (1879–1952)</displayName>
+				<symbol draft="contributed">BGO</symbol>
 			</currency>
 			<currency type="BHD">
 				<displayName>dinar Bahrein</displayName>
@@ -2150,6 +3950,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dinar Bahrein</displayName>
 				<displayName count="many">a zinaroù Bahrein</displayName>
 				<displayName count="other">dinar Bahrein</displayName>
+				<symbol draft="contributed">BHD</symbol>
 			</currency>
 			<currency type="BIF">
 				<displayName>lur Burundi</displayName>
@@ -2158,6 +3959,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Burundi</displayName>
 				<displayName count="many">a lurioù Burundi</displayName>
 				<displayName count="other">lur Burundi</displayName>
+				<symbol draft="contributed">BIF</symbol>
 			</currency>
 			<currency type="BMD">
 				<displayName>dollar Bermuda</displayName>
@@ -2166,6 +3968,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dollar Bermuda</displayName>
 				<displayName count="many">a zollaroù Bermuda</displayName>
 				<displayName count="other">dollar Bermuda</displayName>
+				<symbol draft="contributed">BMD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BND">
@@ -2175,6 +3978,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dollar Brunei</displayName>
 				<displayName count="many">a zollaroù Brunei</displayName>
 				<displayName count="other">dollar Brunei</displayName>
+				<symbol draft="contributed">BND</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BOB">
@@ -2184,6 +3988,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">boliviano Bolivia</displayName>
 				<displayName count="many">a volivianoioù Bolivia</displayName>
 				<displayName count="other">boliviano Bolivia</displayName>
+				<symbol draft="contributed">BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOL">
 				<displayName>boliviano Bolivia (1863–1963)</displayName>
@@ -2192,6 +3998,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">boliviano Bolivia (1863–1963)</displayName>
 				<displayName count="many">a volivianoioù Bolivia (1863–1963)</displayName>
 				<displayName count="other">boliviano Bolivia (1863–1963)</displayName>
+				<symbol draft="contributed">BOL</symbol>
 			</currency>
 			<currency type="BOP">
 				<displayName>peso Bolivia</displayName>
@@ -2200,6 +4007,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">feso Bolivia</displayName>
 				<displayName count="many">a besoioù Bolivia</displayName>
 				<displayName count="other">peso Bolivia</displayName>
+				<symbol draft="contributed">BOP</symbol>
+			</currency>
+			<currency type="BOV">
+				<symbol draft="contributed">BOV</symbol>
+			</currency>
+			<currency type="BRB">
+				<symbol draft="contributed">BRB</symbol>
+			</currency>
+			<currency type="BRC">
+				<symbol draft="contributed">BRC</symbol>
+			</currency>
+			<currency type="BRE">
+				<symbol draft="contributed">BRE</symbol>
 			</currency>
 			<currency type="BRL">
 				<displayName>real Brazil</displayName>
@@ -2208,6 +4028,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">real Brazil</displayName>
 				<displayName count="many">a realioù Brazil</displayName>
 				<displayName count="other">real Brazil</displayName>
+				<symbol draft="contributed">BRL</symbol>
+			</currency>
+			<currency type="BRN">
+				<symbol draft="contributed">BRN</symbol>
+			</currency>
+			<currency type="BRR">
+				<symbol draft="contributed">BRR</symbol>
+			</currency>
+			<currency type="BRZ">
+				<symbol draft="contributed">BRZ</symbol>
 			</currency>
 			<currency type="BSD">
 				<displayName>dollar Bahamas</displayName>
@@ -2216,6 +4046,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dollar Bahamas</displayName>
 				<displayName count="many">a zollaroù Bahamas</displayName>
 				<displayName count="other">dollar Bahamas</displayName>
+				<symbol draft="contributed">BSD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BTN">
@@ -2225,6 +4056,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">ngultrum Bhoutan</displayName>
 				<displayName count="many">a ngultrumoù Bhoutan</displayName>
 				<displayName count="other">ngultrum Bhoutan</displayName>
+				<symbol draft="contributed">BTN</symbol>
 			</currency>
 			<currency type="BUK">
 				<displayName>kyat Birmania</displayName>
@@ -2233,6 +4065,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">cʼhyat Birmania</displayName>
 				<displayName count="many">a gyatoù Birmania</displayName>
 				<displayName count="other">kyat Birmania</displayName>
+				<symbol draft="contributed">BUK</symbol>
 			</currency>
 			<currency type="BWP">
 				<displayName>pula Botswana</displayName>
@@ -2241,6 +4074,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">fula Botswana</displayName>
 				<displayName count="many">a bulaoù Botswana</displayName>
 				<displayName count="other">pula Botswana</displayName>
+				<symbol draft="contributed">BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>roubl nevez Belarus (1994–1999)</displayName>
@@ -2249,6 +4084,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">roubl nevez Belarus (1994–1999)</displayName>
 				<displayName count="many">a roubloù nevez Belarus (1994–1999)</displayName>
 				<displayName count="other">roubl nevez Belarus (1994–1999)</displayName>
+				<symbol draft="contributed">BYB</symbol>
 			</currency>
 			<currency type="BYR">
 				<displayName>roubl Belarus</displayName>
@@ -2257,6 +4093,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">roubl Belarus</displayName>
 				<displayName count="many">a roubloù Belarus</displayName>
 				<displayName count="other">roubl Belarus</displayName>
+				<symbol draft="contributed">BYR</symbol>
+				<symbol alt="narrow" draft="contributed">р.</symbol>
 			</currency>
 			<currency type="BZD">
 				<displayName>dollar Belize</displayName>
@@ -2265,6 +4103,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dollar Belize</displayName>
 				<displayName count="many">a zollaroù Belize</displayName>
 				<displayName count="other">dollar Belize</displayName>
+				<symbol draft="contributed">BZD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CAD">
@@ -2284,6 +4123,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Kongo</displayName>
 				<displayName count="many">a lurioù Kongo</displayName>
 				<displayName count="other">lur Kongo</displayName>
+				<symbol draft="contributed">CDF</symbol>
+			</currency>
+			<currency type="CHE">
+				<displayName>euro WIR</displayName>
+				<displayName count="one">euro WIR</displayName>
+				<displayName count="two">euro WIR</displayName>
+				<displayName count="few">euro WIR</displayName>
+				<displayName count="many">a euroioù WIR</displayName>
+				<displayName count="other">euro WIR</displayName>
+				<symbol draft="contributed">CHE</symbol>
 			</currency>
 			<currency type="CHF">
 				<displayName>lur Suis</displayName>
@@ -2292,6 +4141,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Suis</displayName>
 				<displayName count="many">a lurioù Suis</displayName>
 				<displayName count="other">lur Suis</displayName>
+				<symbol draft="contributed">CHF</symbol>
+			</currency>
+			<currency type="CHW">
+				<displayName>lur WIR</displayName>
+				<displayName count="one">lur WIR</displayName>
+				<displayName count="two">lur WIR</displayName>
+				<displayName count="few">lur WIR</displayName>
+				<displayName count="many">a lurioù WIR</displayName>
+				<displayName count="other">lur WIR</displayName>
+				<symbol draft="contributed">CHW</symbol>
 			</currency>
 			<currency type="CLE">
 				<displayName>escudo Chile</displayName>
@@ -2300,6 +4159,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">escudo Chile</displayName>
 				<displayName count="many">a escudoioù Chile</displayName>
 				<displayName count="other">escudo Chile</displayName>
+				<symbol draft="contributed">CLE</symbol>
 			</currency>
 			<currency type="CLF">
 				<displayName>unanenn jediñ Chile</displayName>
@@ -2308,6 +4168,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">unanenn jediñ Chile</displayName>
 				<displayName count="many">a unanennoù jediñ Chile</displayName>
 				<displayName count="other">unanenn jediñ Chile</displayName>
+				<symbol draft="contributed">CLF</symbol>
 			</currency>
 			<currency type="CLP">
 				<displayName>peso Chile</displayName>
@@ -2316,6 +4177,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">feso Chile</displayName>
 				<displayName count="many">a besoioù Chile</displayName>
 				<displayName count="other">peso Chile</displayName>
+				<symbol draft="contributed">CLP</symbol>
 			</currency>
 			<currency type="CNX">
 				<displayName>dollar Bank poblel Sina</displayName>
@@ -2324,6 +4186,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dollar Bank poblel Sina</displayName>
 				<displayName count="many">a zollaroù Bank poblel Sina</displayName>
 				<displayName count="other">dollar Bank poblel Sina</displayName>
+				<symbol draft="contributed">CNX</symbol>
 			</currency>
 			<currency type="CNY">
 				<displayName>yuan Sina</displayName>
@@ -2332,6 +4195,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">yuan Sina</displayName>
 				<displayName count="many">a yuanoù Sina</displayName>
 				<displayName count="other">yuan Sina</displayName>
+				<symbol draft="contributed">CNY</symbol>
 				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
 			<currency type="COP">
@@ -2341,6 +4205,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">feso Kolombia</displayName>
 				<displayName count="many">a besoioù Kolombia</displayName>
 				<displayName count="other">peso Kolombia</displayName>
+				<symbol draft="contributed">COP</symbol>
+			</currency>
+			<currency type="COU">
+				<symbol draft="contributed">COU</symbol>
 			</currency>
 			<currency type="CRC">
 				<displayName>colón Costa Rica</displayName>
@@ -2349,6 +4217,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">cʼholón Costa Rica</displayName>
 				<displayName count="many">a golónoù Costa Rica</displayName>
 				<displayName count="other">colón Costa Rica</displayName>
+				<symbol draft="contributed">CRC</symbol>
 				<symbol alt="narrow" draft="contributed">₡</symbol>
 			</currency>
 			<currency type="CSD">
@@ -2358,6 +4227,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dinar Serbia (2002–2006)</displayName>
 				<displayName count="many">a zinaroù Serbia (2002–2006)</displayName>
 				<displayName count="other">dinar Serbia (2002–2006)</displayName>
+				<symbol draft="contributed">CSD</symbol>
+			</currency>
+			<currency type="CSK">
+				<symbol draft="contributed">CSK</symbol>
 			</currency>
 			<currency type="CUC">
 				<displayName>peso kemmadus Kuba</displayName>
@@ -2366,6 +4239,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">feso kemmadus Kuba</displayName>
 				<displayName count="many">a besoioù kemmadus Kuba</displayName>
 				<displayName count="other">peso kemmadus Kuba</displayName>
+				<symbol draft="contributed">CUC</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>peso Kuba</displayName>
@@ -2374,6 +4248,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">feso Kuba</displayName>
 				<displayName count="many">a besoioù Kuba</displayName>
 				<displayName count="other">peso Kuba</displayName>
+				<symbol draft="contributed">CUP</symbol>
 			</currency>
 			<currency type="CVE">
 				<displayName>escudo Kab Glas</displayName>
@@ -2382,6 +4257,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">escudo Kab Glas</displayName>
 				<displayName count="many">a escudoioù Kab Glas</displayName>
 				<displayName count="other">escudo Kab Glas</displayName>
+				<symbol draft="contributed">CVE</symbol>
 			</currency>
 			<currency type="CYP">
 				<displayName>lur Kiprenez</displayName>
@@ -2390,6 +4266,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Kiprenez</displayName>
 				<displayName count="many">a lurioù Kiprenez</displayName>
 				<displayName count="other">lur Kiprenez</displayName>
+				<symbol draft="contributed">CYP</symbol>
 			</currency>
 			<currency type="CZK">
 				<displayName>kurunenn Tchek</displayName>
@@ -2398,6 +4275,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">cʼhurunenn Tchek</displayName>
 				<displayName count="many">a gurunennoù Tchek</displayName>
 				<displayName count="other">kurunenn Tchek</displayName>
+				<symbol draft="contributed">CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>mark Alamagn ar Reter</displayName>
@@ -2406,6 +4285,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">mark Alamagn ar Reter</displayName>
 				<displayName count="many">a varkoù Alamagn ar Reter</displayName>
 				<displayName count="other">mark Alamagn ar Reter</displayName>
+				<symbol draft="contributed">DDM</symbol>
 			</currency>
 			<currency type="DEM">
 				<displayName>mark Alamagn</displayName>
@@ -2414,6 +4294,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">mark Alamagn</displayName>
 				<displayName count="many">a varkoù Alamagn</displayName>
 				<displayName count="other">mark Alamagn</displayName>
+				<symbol draft="contributed">DEM</symbol>
 			</currency>
 			<currency type="DJF">
 				<displayName>lur Djibouti</displayName>
@@ -2422,6 +4303,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Djibouti</displayName>
 				<displayName count="many">a lurioù Djibouti</displayName>
 				<displayName count="other">lur Djibouti</displayName>
+				<symbol draft="contributed">DJF</symbol>
 			</currency>
 			<currency type="DKK">
 				<displayName>kurunenn Danmark</displayName>
@@ -2430,6 +4312,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">cʼhurunenn Danmark</displayName>
 				<displayName count="many">a gurunennoù Danmark</displayName>
 				<displayName count="other">kurunenn Danmark</displayName>
+				<symbol draft="contributed">DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>peso Dominikan</displayName>
@@ -2438,6 +4322,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">feso Dominikan</displayName>
 				<displayName count="many">a besoioù Dominikan</displayName>
 				<displayName count="other">peso Dominikan</displayName>
+				<symbol draft="contributed">DOP</symbol>
 			</currency>
 			<currency type="DZD">
 				<displayName>dinar Aljeria</displayName>
@@ -2446,6 +4331,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dinar Aljeria</displayName>
 				<displayName count="many">a zinaroù Aljeria</displayName>
 				<displayName count="other">dinar Aljeria</displayName>
+				<symbol draft="contributed">DZD</symbol>
+			</currency>
+			<currency type="ECS">
+				<symbol draft="contributed">ECS</symbol>
+			</currency>
+			<currency type="ECV">
+				<symbol draft="contributed">ECV</symbol>
 			</currency>
 			<currency type="EEK">
 				<displayName>kurunenn Estonia</displayName>
@@ -2454,6 +4346,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">cʼhurunenn Estonia</displayName>
 				<displayName count="many">a gurunennoù Estonia</displayName>
 				<displayName count="other">kurunenn Estonia</displayName>
+				<symbol draft="contributed">EEK</symbol>
 			</currency>
 			<currency type="EGP">
 				<displayName>lur Egipt</displayName>
@@ -2462,6 +4355,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Egipt</displayName>
 				<displayName count="many">a lurioù Egipt</displayName>
 				<displayName count="other">lur Egipt</displayName>
+				<symbol draft="contributed">EGP</symbol>
+				<symbol alt="narrow" draft="contributed">£ E</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>nakfa Eritrea</displayName>
@@ -2470,6 +4365,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">nakfa Eritrea</displayName>
 				<displayName count="many">a nakfaoù Eritrea</displayName>
 				<displayName count="other">nakfa Eritrea</displayName>
+				<symbol draft="contributed">ERN</symbol>
+			</currency>
+			<currency type="ESA">
+				<symbol draft="contributed">ESA</symbol>
 			</currency>
 			<currency type="ESB">
 				<displayName>peseta gemmadus Spagn</displayName>
@@ -2478,6 +4377,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">feseta gemmadus Spagn</displayName>
 				<displayName count="many">a besetaoù kemmadus Spagn</displayName>
 				<displayName count="other">peseta gemmadus Spagn</displayName>
+				<symbol draft="contributed">ESB</symbol>
 			</currency>
 			<currency type="ESP">
 				<displayName>peseta Spagn</displayName>
@@ -2486,6 +4386,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">feseta Spagn</displayName>
 				<displayName count="many">a besetaoù Spagn</displayName>
 				<displayName count="other">peseta Spagn</displayName>
+				<symbol draft="contributed">ESP</symbol>
+				<symbol alt="narrow" draft="contributed">₧</symbol>
 			</currency>
 			<currency type="ETB">
 				<displayName>birr Etiopia</displayName>
@@ -2494,6 +4396,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">birr Etiopia</displayName>
 				<displayName count="many">a virroù Etiopia</displayName>
 				<displayName count="other">birr Etiopia</displayName>
+				<symbol draft="contributed">ETB</symbol>
 			</currency>
 			<currency type="EUR">
 				<displayName>euro</displayName>
@@ -2512,6 +4415,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">mark Finland</displayName>
 				<displayName count="many">a varkoù Finland</displayName>
 				<displayName count="other">mark Finland</displayName>
+				<symbol draft="contributed">FIM</symbol>
 			</currency>
 			<currency type="FJD">
 				<displayName>dollar Fidji</displayName>
@@ -2520,6 +4424,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dollar Fidji</displayName>
 				<displayName count="many">a zollaroù Fidji</displayName>
 				<displayName count="other">dollar Fidji</displayName>
+				<symbol draft="contributed">FJD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="FKP">
@@ -2529,6 +4434,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Inizi Falkland</displayName>
 				<displayName count="many">a lurioù Inizi Falkland</displayName>
 				<displayName count="other">lur Inizi Falkland</displayName>
+				<symbol draft="contributed">FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>lur gall</displayName>
@@ -2537,6 +4444,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur gall</displayName>
 				<displayName count="many">a lurioù gall</displayName>
 				<displayName count="other">lur gall</displayName>
+				<symbol draft="contributed">FRF</symbol>
 			</currency>
 			<currency type="GBP">
 				<displayName>lur Breizh-Veur</displayName>
@@ -2548,6 +4456,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>£ RU</symbol>
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
+			<currency type="GEK">
+				<symbol draft="contributed">GEK</symbol>
+			</currency>
 			<currency type="GEL">
 				<displayName>lari Jorjia</displayName>
 				<displayName count="one">lari Jorjia</displayName>
@@ -2555,6 +4466,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lari Jorjia</displayName>
 				<displayName count="many">a larioù Jorjia</displayName>
 				<displayName count="other">lari Jorjia</displayName>
+				<symbol draft="contributed">GEL</symbol>
+			</currency>
+			<currency type="GHC">
+				<symbol draft="contributed">GHC</symbol>
 			</currency>
 			<currency type="GHS">
 				<displayName>cedi Ghana</displayName>
@@ -2563,6 +4478,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">cedi Ghana</displayName>
 				<displayName count="many">cedi Ghana</displayName>
 				<displayName count="other">cedi Ghana</displayName>
+				<symbol draft="contributed">GHS</symbol>
 			</currency>
 			<currency type="GIP">
 				<displayName>lur Jibraltar</displayName>
@@ -2571,6 +4487,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Jibraltar</displayName>
 				<displayName count="many">a lurioù Jibraltar</displayName>
 				<displayName count="other">lur Jibraltar</displayName>
+				<symbol draft="contributed">GIP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GMD">
 				<displayName>dalasi Gambia</displayName>
@@ -2579,6 +4497,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dalasi Gambia</displayName>
 				<displayName count="many">a zalasioù Gambia</displayName>
 				<displayName count="other">dalasi Gambia</displayName>
+				<symbol draft="contributed">GMD</symbol>
 			</currency>
 			<currency type="GNF">
 				<displayName>lur Ginea</displayName>
@@ -2587,6 +4506,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Ginea</displayName>
 				<displayName count="many">a lurioù Ginea</displayName>
 				<displayName count="other">lur Ginea</displayName>
+				<symbol draft="contributed">GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>syli Ginea</displayName>
@@ -2595,6 +4516,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">syli Ginea</displayName>
 				<displayName count="many">a sylioù Ginea</displayName>
 				<displayName count="other">syli Ginea</displayName>
+				<symbol draft="contributed">GNS</symbol>
 			</currency>
 			<currency type="GQE">
 				<displayName>ekwele Ginea ar Cʼheheder</displayName>
@@ -2603,6 +4525,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">ekwele Ginea ar Cʼheheder</displayName>
 				<displayName count="many">a ekweleoù Ginea ar Cʼheheder</displayName>
 				<displayName count="other">ekwele Ginea ar Cʼheheder</displayName>
+				<symbol draft="contributed">GQE</symbol>
 			</currency>
 			<currency type="GRD">
 				<displayName>drakm Gres</displayName>
@@ -2611,6 +4534,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">drakm Gres</displayName>
 				<displayName count="many">a zrakmoù Gres</displayName>
 				<displayName count="other">drakm Gres</displayName>
+				<symbol draft="contributed">GRD</symbol>
 			</currency>
 			<currency type="GTQ">
 				<displayName>quetzal Guatemala</displayName>
@@ -2619,6 +4543,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">cʼhuetzal Guatemala</displayName>
 				<displayName count="many">a guetzaloù Guatemala</displayName>
 				<displayName count="other">quetzal Guatemala</displayName>
+				<symbol draft="contributed">GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
+			</currency>
+			<currency type="GWE">
+				<symbol draft="contributed">GWE</symbol>
 			</currency>
 			<currency type="GWP">
 				<displayName>peso Ginea-Bissau</displayName>
@@ -2627,6 +4556,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">feso Ginea-Bissau</displayName>
 				<displayName count="many">a besoioù Ginea-Bissau</displayName>
 				<displayName count="other">peso Ginea-Bissau</displayName>
+				<symbol draft="contributed">GWP</symbol>
 			</currency>
 			<currency type="GYD">
 				<displayName>dollar Guyana</displayName>
@@ -2635,6 +4565,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dollar Guyana</displayName>
 				<displayName count="many">a zollaroù Guyana</displayName>
 				<displayName count="other">dollar Guyana</displayName>
+				<symbol draft="contributed">GYD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="HKD">
 				<displayName>dollar Hong Kong</displayName>
@@ -2653,6 +4585,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lempira Honduras</displayName>
 				<displayName count="many">a lempiraoù Honduras</displayName>
 				<displayName count="other">lempira Honduras</displayName>
+				<symbol draft="contributed">HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>dinar Kroatia</displayName>
@@ -2661,6 +4595,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dinar Kroatia</displayName>
 				<displayName count="many">a zinaroù Kroatia</displayName>
 				<displayName count="other">dinar Kroatia</displayName>
+				<symbol draft="contributed">HRD</symbol>
 			</currency>
 			<currency type="HRK">
 				<displayName>kuna Kroatia</displayName>
@@ -2669,6 +4604,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">cʼhuna Kroatia</displayName>
 				<displayName count="many">a gunaoù Kroatia</displayName>
 				<displayName count="other">kuna Kroatia</displayName>
+				<symbol draft="contributed">HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>gourde Haiti</displayName>
@@ -2677,6 +4614,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">gourde Haiti</displayName>
 				<displayName count="many">a cʼhourdeoù Haiti</displayName>
 				<displayName count="other">gourde Haiti</displayName>
+				<symbol draft="contributed">HTG</symbol>
 			</currency>
 			<currency type="HUF">
 				<displayName>forint Hungaria</displayName>
@@ -2685,6 +4623,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">forint Hungaria</displayName>
 				<displayName count="many">a forintoù Hungaria</displayName>
 				<displayName count="other">forint Hungaria</displayName>
+				<symbol draft="contributed">HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>roupi Indonezia</displayName>
@@ -2693,6 +4633,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">roupi Indonezia</displayName>
 				<displayName count="many">a roupioù Indonezia</displayName>
 				<displayName count="other">roupi Indonezia</displayName>
+				<symbol draft="contributed">IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>lur Iwerzhon</displayName>
@@ -2701,6 +4643,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Iwerzhon</displayName>
 				<displayName count="many">a lurioù Iwerzhon</displayName>
 				<displayName count="other">lur Iwerzhon</displayName>
+				<symbol draft="contributed">IEP</symbol>
 			</currency>
 			<currency type="ILP">
 				<displayName>lur Israel</displayName>
@@ -2709,6 +4652,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Israel</displayName>
 				<displayName count="many">a lurioù Israel</displayName>
 				<displayName count="other">lur Israel</displayName>
+				<symbol draft="contributed">ILP</symbol>
 			</currency>
 			<currency type="ILR">
 				<displayName>shekel Israel (1980–1985)</displayName>
@@ -2717,6 +4661,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">shekel Israel (1980–1985)</displayName>
 				<displayName count="many">shekel Israel (1980–1985)</displayName>
 				<displayName count="other">shekel Israel (1980–1985)</displayName>
+				<symbol draft="contributed">ILR</symbol>
 			</currency>
 			<currency type="ILS">
 				<displayName>shekel nevez Israel</displayName>
@@ -2725,6 +4670,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">shekel nevez Israel</displayName>
 				<displayName count="many">shekel nevez Israel</displayName>
 				<displayName count="other">shekel nevez Israel</displayName>
+				<symbol draft="contributed">ILS</symbol>
 				<symbol alt="narrow" draft="contributed">₪</symbol>
 			</currency>
 			<currency type="INR">
@@ -2743,6 +4689,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dinar Iraq</displayName>
 				<displayName count="many">a zinaroù Iraq</displayName>
 				<displayName count="other">dinar Iraq</displayName>
+				<symbol draft="contributed">IQD</symbol>
 			</currency>
 			<currency type="IRR">
 				<displayName>rial Iran</displayName>
@@ -2751,6 +4698,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">rial Iran</displayName>
 				<displayName count="many">a rialoù Iran</displayName>
 				<displayName count="other">rial Iran</displayName>
+				<symbol draft="contributed">IRR</symbol>
 			</currency>
 			<currency type="ISJ">
 				<displayName>kurunenn Island (1918–1981)</displayName>
@@ -2759,6 +4707,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">cʼhurunenn Island (1918–1981)</displayName>
 				<displayName count="many">a gurunennoù Island (1918–1981)</displayName>
 				<displayName count="other">kurunenn Island (1918–1981)</displayName>
+				<symbol draft="contributed">ISJ</symbol>
 			</currency>
 			<currency type="ISK">
 				<displayName>kurunenn Island</displayName>
@@ -2767,6 +4716,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">cʼhurunenn Island</displayName>
 				<displayName count="many">a gurunennoù Island</displayName>
 				<displayName count="other">kurunenn Island</displayName>
+				<symbol draft="contributed">ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>lur Italia</displayName>
@@ -2775,6 +4726,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Italia</displayName>
 				<displayName count="many">a lurioù Italia</displayName>
 				<displayName count="other">lur Italia</displayName>
+				<symbol draft="contributed">ITL</symbol>
 			</currency>
 			<currency type="JMD">
 				<displayName>dollar Jamaika</displayName>
@@ -2783,6 +4735,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dollar Jamaika</displayName>
 				<displayName count="many">a zollaroù Jamaika</displayName>
 				<displayName count="other">dollar Jamaika</displayName>
+				<symbol draft="contributed">JMD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="JOD">
@@ -2792,6 +4745,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dinar Jordania</displayName>
 				<displayName count="many">a zinaroù Jordania</displayName>
 				<displayName count="other">dinar Jordania</displayName>
+				<symbol draft="contributed">JOD</symbol>
 			</currency>
 			<currency type="JPY">
 				<displayName>yen Japan</displayName>
@@ -2800,6 +4754,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">yen Japan</displayName>
 				<displayName count="many">a yenoù Japan</displayName>
 				<displayName count="other">yen Japan</displayName>
+				<symbol draft="contributed">JPY</symbol>
 				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
 			<currency type="KES">
@@ -2809,6 +4764,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">shilling Kenya</displayName>
 				<displayName count="many">a shillingoù Kenya</displayName>
 				<displayName count="other">shilling Kenya</displayName>
+				<symbol draft="contributed">KES</symbol>
 			</currency>
 			<currency type="KGS">
 				<displayName>som Kyrgyzstan</displayName>
@@ -2817,6 +4773,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">som Kyrgyzstan</displayName>
 				<displayName count="many">a somoù Kyrgyzstan</displayName>
 				<displayName count="other">som Kyrgyzstan</displayName>
+				<symbol draft="contributed">KGS</symbol>
 			</currency>
 			<currency type="KHR">
 				<displayName>riel Kambodja</displayName>
@@ -2825,6 +4782,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">riel Kambodja</displayName>
 				<displayName count="many">a rieloù Kambodja</displayName>
 				<displayName count="other">riel Kambodja</displayName>
+				<symbol draft="contributed">KHR</symbol>
 				<symbol alt="narrow" draft="contributed">៛</symbol>
 			</currency>
 			<currency type="KMF">
@@ -2834,6 +4792,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Komorez</displayName>
 				<displayName count="many">a lurioù Komorez</displayName>
 				<displayName count="other">lur Komorez</displayName>
+				<symbol draft="contributed">KMF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>won Korea an Norzh</displayName>
@@ -2842,6 +4801,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">won Korea an Norzh</displayName>
 				<displayName count="many">a wonoù Korea an Norzh</displayName>
 				<displayName count="other">won Korea an Norzh</displayName>
+				<symbol draft="contributed">KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRH">
 				<displayName>hwan Korea ar Su (1953–1962)</displayName>
@@ -2850,6 +4811,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">hwan Korea ar Su (1953–1962)</displayName>
 				<displayName count="many">a hwanoù Korea ar Su (1953–1962)</displayName>
 				<displayName count="other">hwan Korea ar Su (1953–1962)</displayName>
+				<symbol draft="contributed">KRH</symbol>
 			</currency>
 			<currency type="KRO">
 				<displayName>won Korea ar Su (1945–1953)</displayName>
@@ -2858,6 +4820,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">won Korea ar Su (1945–1953)</displayName>
 				<displayName count="many">a wonoù Korea ar Su (1945–1953)</displayName>
 				<displayName count="other">won Korea ar Su (1945–1953)</displayName>
+				<symbol draft="contributed">KRO</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>won Korea ar Su</displayName>
@@ -2866,6 +4829,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">won Korea ar Su</displayName>
 				<displayName count="many">a wonoù Korea ar Su</displayName>
 				<displayName count="other">won Korea ar Su</displayName>
+				<symbol draft="contributed">KRW</symbol>
 				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KWD">
@@ -2875,6 +4839,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dinar Koweit</displayName>
 				<displayName count="many">a zinaroù Koweit</displayName>
 				<displayName count="other">dinar Koweit</displayName>
+				<symbol draft="contributed">KWD</symbol>
 			</currency>
 			<currency type="KYD">
 				<displayName>dollar Inizi Cayman</displayName>
@@ -2883,6 +4848,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dollar Inizi Cayman</displayName>
 				<displayName count="many">a zollaroù Inizi Cayman</displayName>
 				<displayName count="other">dollar Inizi Cayman</displayName>
+				<symbol draft="contributed">KYD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="KZT">
@@ -2892,6 +4858,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">zenge Kazakstan</displayName>
 				<displayName count="many">a dengeoù Kazakstan</displayName>
 				<displayName count="other">tenge Kazakstan</displayName>
+				<symbol draft="contributed">KZT</symbol>
 				<symbol alt="narrow" draft="contributed">₸</symbol>
 			</currency>
 			<currency type="LAK">
@@ -2901,6 +4868,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">cʼhip Laos</displayName>
 				<displayName count="many">a gipoù Laos</displayName>
 				<displayName count="other">kip Laos</displayName>
+				<symbol draft="contributed">LAK</symbol>
 				<symbol alt="narrow" draft="contributed">₭</symbol>
 			</currency>
 			<currency type="LBP">
@@ -2910,6 +4878,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Liban</displayName>
 				<displayName count="many">a lurioù Liban</displayName>
 				<displayName count="other">lur Liban</displayName>
+				<symbol draft="contributed">LBP</symbol>
+				<symbol alt="narrow" draft="contributed">£L</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>roupi Sri Lanka</displayName>
@@ -2918,6 +4888,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">roupi Sri Lanka</displayName>
 				<displayName count="many">a roupioù Sri Lanka</displayName>
 				<displayName count="other">roupi Sri Lanka</displayName>
+				<symbol draft="contributed">LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>dollar Liberia</displayName>
@@ -2926,6 +4898,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dollar Liberia</displayName>
 				<displayName count="many">a zollaroù Liberia</displayName>
 				<displayName count="other">dollar Liberia</displayName>
+				<symbol draft="contributed">LRD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="LSL">
@@ -2935,6 +4908,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">loti Lesotho</displayName>
 				<displayName count="many">a lotioù Lesotho</displayName>
 				<displayName count="other">loti Lesotho</displayName>
+				<symbol draft="contributed">LSL</symbol>
 			</currency>
 			<currency type="LTL">
 				<displayName>litas Lituania</displayName>
@@ -2943,6 +4917,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">litas Lituania</displayName>
 				<displayName count="many">a litasoù Lituania</displayName>
 				<displayName count="other">litas Lituania</displayName>
+				<symbol draft="contributed">LTL</symbol>
+				<symbol alt="narrow" draft="contributed">Lt</symbol>
 			</currency>
 			<currency type="LTT">
 				<displayName>talonas Lituania</displayName>
@@ -2951,6 +4927,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">zalonas Lituania</displayName>
 				<displayName count="many">a dalonasoù Lituania</displayName>
 				<displayName count="other">talonas Lituania</displayName>
+				<symbol draft="contributed">LTT</symbol>
 			</currency>
 			<currency type="LUC">
 				<displayName>lur kemmadus Luksembourg</displayName>
@@ -2959,6 +4936,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur kemmadus Luksembourg</displayName>
 				<displayName count="many">a lurioù kemmadus Luksembourg</displayName>
 				<displayName count="other">lur kemmadus Luksembourg</displayName>
+				<symbol draft="contributed">LUC</symbol>
 			</currency>
 			<currency type="LUF">
 				<displayName>lur Luksembourg</displayName>
@@ -2967,6 +4945,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Luksembourg</displayName>
 				<displayName count="many">a lurioù Luksembourg</displayName>
 				<displayName count="other">lur Luksembourg</displayName>
+				<symbol draft="contributed">LUF</symbol>
+			</currency>
+			<currency type="LUL">
+				<symbol draft="contributed">LUL</symbol>
 			</currency>
 			<currency type="LVL">
 				<displayName>lats Latvia</displayName>
@@ -2975,6 +4957,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lats Latvia</displayName>
 				<displayName count="many">a latsoù Latvia</displayName>
 				<displayName count="other">lats Latvia</displayName>
+				<symbol draft="contributed">LVL</symbol>
+				<symbol alt="narrow" draft="contributed">Ls</symbol>
 			</currency>
 			<currency type="LVR">
 				<displayName>roubl Latvia</displayName>
@@ -2983,6 +4967,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">roubl Latvia</displayName>
 				<displayName count="many">a roubloù Latvia</displayName>
 				<displayName count="other">roubl Latvia</displayName>
+				<symbol draft="contributed">LVR</symbol>
 			</currency>
 			<currency type="LYD">
 				<displayName>dinar Libia</displayName>
@@ -2991,6 +4976,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dinar Libia</displayName>
 				<displayName count="many">a zinaroù Libia</displayName>
 				<displayName count="other">dinar Libia</displayName>
+				<symbol draft="contributed">LYD</symbol>
 			</currency>
 			<currency type="MAD">
 				<displayName>dirham Maroko</displayName>
@@ -2999,6 +4985,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dirham Maroko</displayName>
 				<displayName count="many">a zirhamoù Maroko</displayName>
 				<displayName count="other">dirham Maroko</displayName>
+				<symbol draft="contributed">MAD</symbol>
 			</currency>
 			<currency type="MAF">
 				<displayName>lur Maroko</displayName>
@@ -3007,6 +4994,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Maroko</displayName>
 				<displayName count="many">a lurioù Maroko</displayName>
 				<displayName count="other">lur Maroko</displayName>
+				<symbol draft="contributed">MAF</symbol>
 			</currency>
 			<currency type="MCF">
 				<displayName>lur Monaco</displayName>
@@ -3015,6 +5003,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Monaco</displayName>
 				<displayName count="many">a lurioù Monaco</displayName>
 				<displayName count="other">lur Monaco</displayName>
+				<symbol draft="contributed">MCF</symbol>
+			</currency>
+			<currency type="MDC">
+				<symbol draft="contributed">MDC</symbol>
 			</currency>
 			<currency type="MDL">
 				<displayName>leu Moldova</displayName>
@@ -3023,6 +5015,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">leu Moldova</displayName>
 				<displayName count="many">leu Moldova</displayName>
 				<displayName count="other">leu Moldova</displayName>
+				<symbol draft="contributed">MDL</symbol>
 			</currency>
 			<currency type="MGA">
 				<displayName>ariary Madagaskar</displayName>
@@ -3031,6 +5024,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">ariary Madagaskar</displayName>
 				<displayName count="many">a ariaryoù Madagaska</displayName>
 				<displayName count="other">ariary Madagaskar</displayName>
+				<symbol draft="contributed">MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>lur Madagaskar</displayName>
@@ -3039,6 +5034,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Madagaskar</displayName>
 				<displayName count="many">a lurioù Madagaskar</displayName>
 				<displayName count="other">lur Madagaskar</displayName>
+				<symbol draft="contributed">MGF</symbol>
 			</currency>
 			<currency type="MKD">
 				<displayName>denar Makedonia</displayName>
@@ -3047,6 +5043,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">denar Makedonia</displayName>
 				<displayName count="many">a zenaroù Makedonia</displayName>
 				<displayName count="other">denar Makedonia</displayName>
+				<symbol draft="contributed">MKD</symbol>
 			</currency>
 			<currency type="MKN">
 				<displayName>denar Makedonia (1992–1993)</displayName>
@@ -3055,6 +5052,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">denar Makedonia (1992–1993)</displayName>
 				<displayName count="many">a zenaroù Makedonia (1992–1993)</displayName>
 				<displayName count="other">denar Makedonia (1992–1993)</displayName>
+				<symbol draft="contributed">MKN</symbol>
 			</currency>
 			<currency type="MLF">
 				<displayName>lur Mali</displayName>
@@ -3063,6 +5061,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Mali</displayName>
 				<displayName count="many">a lurioù Mali</displayName>
 				<displayName count="other">lur Mali</displayName>
+				<symbol draft="contributed">MLF</symbol>
 			</currency>
 			<currency type="MMK">
 				<displayName>kyat Myanmar</displayName>
@@ -3071,6 +5070,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">cʼhyat Myanmar</displayName>
 				<displayName count="many">a gyatoù Myanmar</displayName>
 				<displayName count="other">kyat Myanmar</displayName>
+				<symbol draft="contributed">MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>tugrik Mongolia</displayName>
@@ -3079,6 +5080,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">zugrik Mongolia</displayName>
 				<displayName count="many">a dugrikoù Mongolia</displayName>
 				<displayName count="other">tugrik Mongolia</displayName>
+				<symbol draft="contributed">MNT</symbol>
 				<symbol alt="narrow" draft="contributed">₮</symbol>
 			</currency>
 			<currency type="MOP">
@@ -3088,6 +5090,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">fataca Macau</displayName>
 				<displayName count="many">a batacaoù Macau</displayName>
 				<displayName count="other">pataca Macau</displayName>
+				<symbol draft="contributed">MOP</symbol>
 			</currency>
 			<currency type="MRO">
 				<displayName>ouguiya Maouritania</displayName>
@@ -3096,6 +5099,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">ouguiya Maouritania</displayName>
 				<displayName count="many">a ouguiyaoù Maouritania</displayName>
 				<displayName count="other">ouguiya Maouritania</displayName>
+				<symbol draft="contributed">MRO</symbol>
 			</currency>
 			<currency type="MTL">
 				<displayName>lira Malta</displayName>
@@ -3104,6 +5108,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lira Malta</displayName>
 				<displayName count="many">a liraoù Malta</displayName>
 				<displayName count="other">lira Malta</displayName>
+				<symbol draft="contributed">MTL</symbol>
 			</currency>
 			<currency type="MTP">
 				<displayName>lur Malta</displayName>
@@ -3112,6 +5117,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Malta</displayName>
 				<displayName count="many">a lurioù Malta</displayName>
 				<displayName count="other">lur Malta</displayName>
+				<symbol draft="contributed">MTP</symbol>
 			</currency>
 			<currency type="MUR">
 				<displayName>roupi Moris</displayName>
@@ -3120,6 +5126,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">roupi Moris</displayName>
 				<displayName count="many">a roupioù Moris</displayName>
 				<displayName count="other">roupi Moris</displayName>
+				<symbol draft="contributed">MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVP">
 				<displayName>roupi Maldivez</displayName>
@@ -3136,6 +5144,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">rufiyaa Maldivez</displayName>
 				<displayName count="many">a rufiyaaoù Maldivez</displayName>
 				<displayName count="other">rufiyaa Maldivez</displayName>
+				<symbol draft="contributed">MVR</symbol>
 			</currency>
 			<currency type="MWK">
 				<displayName>kwacha Malawi</displayName>
@@ -3144,6 +5153,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">kwacha Malawi</displayName>
 				<displayName count="many">a gwachaoù Malawi</displayName>
 				<displayName count="other">kwacha Malawi</displayName>
+				<symbol draft="contributed">MWK</symbol>
 			</currency>
 			<currency type="MXN">
 				<displayName>peso Mecʼhiko</displayName>
@@ -3152,6 +5162,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">feso Mecʼhiko</displayName>
 				<displayName count="many">a besoioù Mecʼhiko</displayName>
 				<displayName count="other">peso Mecʼhiko</displayName>
+				<symbol draft="contributed">MX$</symbol>
 			</currency>
 			<currency type="MXP">
 				<displayName>peso arcʼhant Mecʼhiko (1861–1992)</displayName>
@@ -3160,6 +5171,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">feso arcʼhant Mecʼhiko (1861–1992)</displayName>
 				<displayName count="many">a besoioù arcʼhant Mecʼhiko (1861–1992)</displayName>
 				<displayName count="other">peso arcʼhant Mecʼhiko (1861–1992)</displayName>
+				<symbol draft="contributed">MXP</symbol>
+			</currency>
+			<currency type="MXV">
+				<symbol draft="contributed">MXV</symbol>
 			</currency>
 			<currency type="MYR">
 				<displayName>ringgit Malaysia</displayName>
@@ -3168,6 +5183,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">ringgit Malaysia</displayName>
 				<displayName count="many">a ringgitoù Malaysia</displayName>
 				<displayName count="other">ringgit Malaysia</displayName>
+				<symbol draft="contributed">MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>escudo Mozambik</displayName>
@@ -3176,6 +5193,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">escudo Mozambik</displayName>
 				<displayName count="many">a escudoioù Mozambik</displayName>
 				<displayName count="other">escudo Mozambik</displayName>
+				<symbol draft="contributed">MZE</symbol>
 			</currency>
 			<currency type="MZM">
 				<displayName>metical Mozambik (1980–2006)</displayName>
@@ -3184,6 +5202,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">metical Mozambik (1980–2006)</displayName>
 				<displayName count="many">a veticaloù Mozambik (1980–2006)</displayName>
 				<displayName count="other">metical Mozambik (1980–2006)</displayName>
+				<symbol draft="contributed">MZM</symbol>
 			</currency>
 			<currency type="MZN">
 				<displayName>metical Mozambik</displayName>
@@ -3192,6 +5211,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">metical Mozambik</displayName>
 				<displayName count="many">a veticaloù Mozambik</displayName>
 				<displayName count="other">metical Mozambik</displayName>
+				<symbol draft="contributed">MZN</symbol>
 			</currency>
 			<currency type="NAD">
 				<displayName>dollar Namibia</displayName>
@@ -3200,6 +5220,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dollar Namibia</displayName>
 				<displayName count="many">a zollaroù Namibia</displayName>
 				<displayName count="other">dollar Namibia</displayName>
+				<symbol draft="contributed">NAD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="NGN">
@@ -3209,6 +5230,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">naira Nigeria</displayName>
 				<displayName count="many">a nairaoù Nigeria</displayName>
 				<displayName count="other">naira Nigeria</displayName>
+				<symbol draft="contributed">NGN</symbol>
 				<symbol alt="narrow" draft="contributed">₦</symbol>
 			</currency>
 			<currency type="NIC">
@@ -3218,6 +5240,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">cʼhordoba Nicaragua (1988–1991)</displayName>
 				<displayName count="many">a gordobaoù Nicaragua (1988–1991)</displayName>
 				<displayName count="other">cordoba Nicaragua (1988–1991)</displayName>
+				<symbol draft="contributed">NIC</symbol>
 			</currency>
 			<currency type="NIO">
 				<displayName>cordoba Nicaragua</displayName>
@@ -3226,6 +5249,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">cʼhordoba Nicaragua</displayName>
 				<displayName count="many">a gordobaoù Nicaragua</displayName>
 				<displayName count="other">cordoba Nicaragua</displayName>
+				<symbol draft="contributed">NIO</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>florin an Izelvroioù</displayName>
@@ -3234,6 +5258,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">florin an Izelvroioù</displayName>
 				<displayName count="many">a florinoù an Izelvroioù</displayName>
 				<displayName count="other">florin an Izelvroioù</displayName>
+				<symbol draft="contributed">NLG</symbol>
 			</currency>
 			<currency type="NOK">
 				<displayName>kurunenn Norvegia</displayName>
@@ -3242,6 +5267,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">cʼhurunenn Norvegia</displayName>
 				<displayName count="many">a gurunennoù Norvegia</displayName>
 				<displayName count="other">kurunenn Norvegia</displayName>
+				<symbol draft="contributed">NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>roupi Nepal</displayName>
@@ -3250,6 +5277,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">roupi Nepal</displayName>
 				<displayName count="many">a roupioù Nepal</displayName>
 				<displayName count="other">roupi Nepal</displayName>
+				<symbol draft="contributed">NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>dollar Zeland-Nevez</displayName>
@@ -3268,6 +5297,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">rial Oman</displayName>
 				<displayName count="many">a rialoù Oman</displayName>
 				<displayName count="other">rial Oman</displayName>
+				<symbol draft="contributed">OMR</symbol>
 			</currency>
 			<currency type="PAB">
 				<displayName>balboa Panamá</displayName>
@@ -3276,6 +5306,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">balboa Panamá</displayName>
 				<displayName count="many">a valboaoù Panamá</displayName>
 				<displayName count="other">balboa Panamá</displayName>
+				<symbol draft="contributed">PAB</symbol>
+			</currency>
+			<currency type="PEI">
+				<symbol draft="contributed">PEI</symbol>
 			</currency>
 			<currency type="PEN">
 				<displayName>nuevo sol Perou</displayName>
@@ -3284,6 +5318,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">nuevo sol Perou</displayName>
 				<displayName count="many">nuevo sol Perou</displayName>
 				<displayName count="other">nuevo sol Perou</displayName>
+				<symbol draft="contributed">PEN</symbol>
 			</currency>
 			<currency type="PES">
 				<displayName>sol Perou (1863–1965)</displayName>
@@ -3292,6 +5327,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">sol Perou (1863–1965)</displayName>
 				<displayName count="many">a solioù Perou (1863–1965)</displayName>
 				<displayName count="other">sol Perou (1863–1965)</displayName>
+				<symbol draft="contributed">PES</symbol>
 			</currency>
 			<currency type="PGK">
 				<displayName>kina Papoua Ginea-Nevez</displayName>
@@ -3300,6 +5336,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">cʼhina Papoua Ginea-Nevez</displayName>
 				<displayName count="many">a ginaoù Papoua Ginea-Nevez</displayName>
 				<displayName count="other">kina Papoua Ginea-Nevez</displayName>
+				<symbol draft="contributed">PGK</symbol>
 			</currency>
 			<currency type="PHP">
 				<displayName>peso Filipinez</displayName>
@@ -3308,6 +5345,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">feso Filipinez</displayName>
 				<displayName count="many">a besoioù Filipinez</displayName>
 				<displayName count="other">peso Filipinez</displayName>
+				<symbol draft="contributed">PHP</symbol>
 				<symbol alt="narrow" draft="contributed">₱</symbol>
 			</currency>
 			<currency type="PKR">
@@ -3317,6 +5355,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">roupi Pakistan</displayName>
 				<displayName count="many">a roupioù Pakistan</displayName>
 				<displayName count="other">roupi Pakistan</displayName>
+				<symbol draft="contributed">PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>zloty Polonia</displayName>
@@ -3325,6 +5365,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">zloty Polonia</displayName>
 				<displayName count="many">a zlotyoù Polonia</displayName>
 				<displayName count="other">zloty Polonia</displayName>
+				<symbol draft="contributed">PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>zloty Polonia (1950–1995)</displayName>
@@ -3333,6 +5375,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">zloty Polonia (1950–1995)</displayName>
 				<displayName count="many">a zlotyoù Polonia (1950–1995)</displayName>
 				<displayName count="other">zloty Polonia (1950–1995)</displayName>
+				<symbol draft="contributed">PLZ</symbol>
 			</currency>
 			<currency type="PTE">
 				<displayName>escudo Portugal</displayName>
@@ -3341,6 +5384,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">escudo Portugal</displayName>
 				<displayName count="many">a escudoioù Portugal</displayName>
 				<displayName count="other">escudo Portugal</displayName>
+				<symbol draft="contributed">PTE</symbol>
 			</currency>
 			<currency type="PYG">
 				<displayName>guarani Paraguay</displayName>
@@ -3349,6 +5393,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">guarani Paraguay</displayName>
 				<displayName count="many">a uaranioù Paraguay</displayName>
 				<displayName count="other">guarani Paraguay</displayName>
+				<symbol draft="contributed">PYG</symbol>
 				<symbol alt="narrow" draft="contributed">₲</symbol>
 			</currency>
 			<currency type="QAR">
@@ -3358,6 +5403,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">rial Qatar</displayName>
 				<displayName count="many">a rialoù Qatar</displayName>
 				<displayName count="other">rial Qatar</displayName>
+				<symbol draft="contributed">QAR</symbol>
 			</currency>
 			<currency type="RHD">
 				<displayName>dollar Rodezia</displayName>
@@ -3366,6 +5412,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dollar Rodezia</displayName>
 				<displayName count="many">a zollaroù Rodezia</displayName>
 				<displayName count="other">dollar Rodezia</displayName>
+				<symbol draft="contributed">RHD</symbol>
 			</currency>
 			<currency type="ROL">
 				<displayName>leu Roumania (1952–2006)</displayName>
@@ -3374,6 +5421,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">leu Roumania (1952–2006)</displayName>
 				<displayName count="many">leu Roumania (1952–2006)</displayName>
 				<displayName count="other">leu Roumania (1952–2006)</displayName>
+				<symbol draft="contributed">ROL</symbol>
 			</currency>
 			<currency type="RON">
 				<displayName>leu Roumania</displayName>
@@ -3382,6 +5430,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">leu Roumania</displayName>
 				<displayName count="many">leu Roumania</displayName>
 				<displayName count="other">leu Roumania</displayName>
+				<symbol draft="contributed">RON</symbol>
 			</currency>
 			<currency type="RSD">
 				<displayName>dinar Serbia</displayName>
@@ -3390,6 +5439,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dinar Serbia</displayName>
 				<displayName count="many">a zinaroù Serbia</displayName>
 				<displayName count="other">dinar Serbia</displayName>
+				<symbol draft="contributed">RSD</symbol>
 			</currency>
 			<currency type="RUB">
 				<displayName>roubl Rusia</displayName>
@@ -3398,6 +5448,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">roubl Rusia</displayName>
 				<displayName count="many">a roubloù Rusia</displayName>
 				<displayName count="other">roubl Rusia</displayName>
+				<symbol draft="contributed">RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>roubl Rusia (1991–1998)</displayName>
@@ -3406,6 +5458,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">roubl Rusia (1991–1998)</displayName>
 				<displayName count="many">a roubloù Rusia (1991–1998)</displayName>
 				<displayName count="other">roubl Rusia (1991–1998)</displayName>
+				<symbol draft="contributed">RUR</symbol>
+				<symbol alt="narrow" draft="contributed">р.</symbol>
 			</currency>
 			<currency type="RWF">
 				<displayName>lur Rwanda</displayName>
@@ -3414,6 +5468,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Rwanda</displayName>
 				<displayName count="many">a lurioù Rwanda</displayName>
 				<displayName count="other">lur Rwanda</displayName>
+				<symbol draft="contributed">RWF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>riyal Arabia Saoudat</displayName>
@@ -3422,6 +5477,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">riyal Arabia Saoudat</displayName>
 				<displayName count="many">a riyaloù Arabia Saoudat</displayName>
 				<displayName count="other">riyal Arabia Saoudat</displayName>
+				<symbol draft="contributed">SAR</symbol>
 			</currency>
 			<currency type="SBD">
 				<displayName>dollar Inizi Salomon</displayName>
@@ -3430,6 +5486,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dollar Inizi Salomon</displayName>
 				<displayName count="many">a zollaroù Inizi Salomon</displayName>
 				<displayName count="other">dollar Inizi Salomon</displayName>
+				<symbol draft="contributed">SBD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SCR">
@@ -3439,6 +5496,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">roupi Sechelez</displayName>
 				<displayName count="many">a roupioù Sechelez</displayName>
 				<displayName count="other">roupi Sechelez</displayName>
+				<symbol draft="contributed">SCR</symbol>
 			</currency>
 			<currency type="SDD">
 				<displayName>dinar Soudan (1992–2007)</displayName>
@@ -3447,6 +5505,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dinar Soudan (1992–2007)</displayName>
 				<displayName count="many">a zinaroù Soudan (1992–2007)</displayName>
 				<displayName count="other">dinar Soudan (1992–2007)</displayName>
+				<symbol draft="contributed">SDD</symbol>
 			</currency>
 			<currency type="SDG">
 				<displayName>lur Soudan</displayName>
@@ -3455,6 +5514,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Soudan</displayName>
 				<displayName count="many">a lurioù Soudan</displayName>
 				<displayName count="other">lur Soudan</displayName>
+				<symbol draft="contributed">SDG</symbol>
 			</currency>
 			<currency type="SDP">
 				<displayName>lur Soudan (1957–1998)</displayName>
@@ -3463,6 +5523,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Soudan (1957–1998)</displayName>
 				<displayName count="many">a lurioù Soudan (1957–1998)</displayName>
 				<displayName count="other">lur Soudan (1957–1998)</displayName>
+				<symbol draft="contributed">SDP</symbol>
 			</currency>
 			<currency type="SEK">
 				<displayName>kurunenn Sveden</displayName>
@@ -3471,6 +5532,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">cʼhurunenn Sveden</displayName>
 				<displayName count="many">a gurunennoù Sveden</displayName>
 				<displayName count="other">kurunenn Sveden</displayName>
+				<symbol draft="contributed">SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>dollar Singapour</displayName>
@@ -3479,6 +5542,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dollar Singapour</displayName>
 				<displayName count="many">a zollaroù Singapour</displayName>
 				<displayName count="other">dollar Singapour</displayName>
+				<symbol draft="contributed">SGD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SHP">
@@ -3488,6 +5552,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Saint-Helena</displayName>
 				<displayName count="many">a lurioù Saint-Helena</displayName>
 				<displayName count="other">lur Saint-Helena</displayName>
+				<symbol draft="contributed">SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>tolar Slovenia</displayName>
@@ -3496,6 +5562,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">zolar Slovenia</displayName>
 				<displayName count="many">a dolaroù Slovenia</displayName>
 				<displayName count="other">tolar Slovenia</displayName>
+				<symbol draft="contributed">SIT</symbol>
 			</currency>
 			<currency type="SKK">
 				<displayName>kurunenn Slovakia</displayName>
@@ -3504,6 +5571,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">cʼhurunenn Slovakia</displayName>
 				<displayName count="many">a gurunennoù Slovakia</displayName>
 				<displayName count="other">kurunenn Slovakia</displayName>
+				<symbol draft="contributed">SKK</symbol>
 			</currency>
 			<currency type="SLL">
 				<displayName>leone Sierra Leone</displayName>
@@ -3512,6 +5580,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">leone Sierra Leone</displayName>
 				<displayName count="many">a leoneoù Sierra Leone</displayName>
 				<displayName count="other">leone Sierra Leone</displayName>
+				<symbol draft="contributed">SLL</symbol>
 			</currency>
 			<currency type="SOS">
 				<displayName>shilling Somalia</displayName>
@@ -3520,6 +5589,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">shilling Somalia</displayName>
 				<displayName count="many">a shillingoù Somalia</displayName>
 				<displayName count="other">shilling Somalia</displayName>
+				<symbol draft="contributed">SOS</symbol>
 			</currency>
 			<currency type="SRD">
 				<displayName>dollar Surinam</displayName>
@@ -3528,6 +5598,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dollar Surinam</displayName>
 				<displayName count="many">a zollaroù Surinam</displayName>
 				<displayName count="other">dollar Surinam</displayName>
+				<symbol draft="contributed">SRD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SRG">
@@ -3537,6 +5608,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">florin Surinam</displayName>
 				<displayName count="many">a florinoù Surinam</displayName>
 				<displayName count="other">florin Surinam</displayName>
+				<symbol draft="contributed">SRG</symbol>
 			</currency>
 			<currency type="SSP">
 				<displayName>lur Susoudan</displayName>
@@ -3545,6 +5617,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Susoudan</displayName>
 				<displayName count="many">a lurioù Susoudan</displayName>
 				<displayName count="other">lur Susoudan</displayName>
+				<symbol draft="contributed">SSP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="STD">
 				<displayName>dobra São Tomé ha Príncipe</displayName>
@@ -3553,6 +5627,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dobra São Tomé ha Príncipe</displayName>
 				<displayName count="many">a zobraoù São Tomé ha Príncipe</displayName>
 				<displayName count="other">dobra São Tomé ha Príncipe</displayName>
+				<symbol draft="contributed">STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>roubl soviedel</displayName>
@@ -3561,6 +5637,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">roubl soviedel</displayName>
 				<displayName count="many">a roubloù soviedel</displayName>
 				<displayName count="other">roubl soviedel</displayName>
+				<symbol draft="contributed">SUR</symbol>
 			</currency>
 			<currency type="SVC">
 				<displayName>colón Salvador</displayName>
@@ -3569,6 +5646,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">cʼholón Salvador</displayName>
 				<displayName count="many">a golónoù Salvador</displayName>
 				<displayName count="other">colón Salvador</displayName>
+				<symbol draft="contributed">SVC</symbol>
 			</currency>
 			<currency type="SYP">
 				<displayName>lur Siria</displayName>
@@ -3577,6 +5655,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Siria</displayName>
 				<displayName count="many">a lurioù Siria</displayName>
 				<displayName count="other">lur Siria</displayName>
+				<symbol draft="contributed">SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>lilangeni Swaziland</displayName>
@@ -3585,6 +5665,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lilangeni Swaziland</displayName>
 				<displayName count="many">a lilangenioù Swaziland</displayName>
 				<displayName count="other">lilangeni Swaziland</displayName>
+				<symbol draft="contributed">SZL</symbol>
 			</currency>
 			<currency type="THB">
 				<displayName>baht Thailand</displayName>
@@ -3593,6 +5674,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">baht Thailand</displayName>
 				<displayName count="many">a vahtoù Thailand</displayName>
 				<displayName count="other">baht Thailand</displayName>
+				<symbol draft="contributed">THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>roubl Tadjikistan</displayName>
@@ -3601,6 +5684,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">roubl Tadjikistan</displayName>
 				<displayName count="many">a roubloù Tadjikistan</displayName>
 				<displayName count="other">roubl Tadjikistan</displayName>
+				<symbol draft="contributed">TJR</symbol>
 			</currency>
 			<currency type="TJS">
 				<displayName>somoni Tadjikistan</displayName>
@@ -3609,6 +5693,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">somoni Tadjikistan</displayName>
 				<displayName count="many">a somonioù Tadjikistan</displayName>
 				<displayName count="other">somoni Tadjikistan</displayName>
+				<symbol draft="contributed">TJS</symbol>
 			</currency>
 			<currency type="TMM">
 				<displayName>manat Turkmenistan (1993–2009)</displayName>
@@ -3617,6 +5702,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">manat Turkmenistan (1993–2009)</displayName>
 				<displayName count="many">a vanatoù Turkmenistan (1993–2009)</displayName>
 				<displayName count="other">manat Turkmenistan (1993–2009)</displayName>
+				<symbol draft="contributed">TMM</symbol>
 			</currency>
 			<currency type="TMT">
 				<displayName>manat Turkmenistan</displayName>
@@ -3625,6 +5711,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">manat Turkmenistan</displayName>
 				<displayName count="many">a vanatoù Turkmenistan</displayName>
 				<displayName count="other">manat Turkmenistan</displayName>
+				<symbol draft="contributed">TMT</symbol>
 			</currency>
 			<currency type="TND">
 				<displayName>dinar Tunizia</displayName>
@@ -3633,6 +5720,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dinar Tunizia</displayName>
 				<displayName count="many">a zinaroù Tunizia</displayName>
 				<displayName count="other">dinar Tunizia</displayName>
+				<symbol draft="contributed">TND</symbol>
 			</currency>
 			<currency type="TOP">
 				<displayName>paʻanga Tonga</displayName>
@@ -3641,6 +5729,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">faʻanga Tonga</displayName>
 				<displayName count="many">a baʻangaoù Tonga</displayName>
 				<displayName count="other">paʻanga Tonga</displayName>
+				<symbol draft="contributed">TOP</symbol>
+				<symbol alt="narrow" draft="contributed">$ T</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>escudo Timor</displayName>
@@ -3649,6 +5739,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">escudo Timor</displayName>
 				<displayName count="many">a escudoioù Timor</displayName>
 				<displayName count="other">escudo Timor</displayName>
+				<symbol draft="contributed">TPE</symbol>
 			</currency>
 			<currency type="TRL">
 				<displayName>lur Turkia (1922–2005)</displayName>
@@ -3657,6 +5748,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Turkia (1922–2005)</displayName>
 				<displayName count="many">a lurioù Turkia (1922–2005)</displayName>
 				<displayName count="other">lur Turkia (1922–2005)</displayName>
+				<symbol draft="contributed">TRL</symbol>
 			</currency>
 			<currency type="TRY">
 				<displayName>lur Turkia</displayName>
@@ -3665,6 +5757,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur Turkia</displayName>
 				<displayName count="many">a lurioù Turkia</displayName>
 				<displayName count="other">lur Turkia</displayName>
+				<symbol draft="contributed">TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
 			</currency>
 			<currency type="TTD">
@@ -3674,6 +5767,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dollar Trinidad ha Tobago</displayName>
 				<displayName count="many">a zollaroù Trinidad ha Tobago</displayName>
 				<displayName count="other">dollar Trinidad ha Tobago</displayName>
+				<symbol draft="contributed">TTD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="TWD">
@@ -3683,6 +5777,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dollar nevez Taiwan</displayName>
 				<displayName count="many">a zollaroù nevez Taiwan</displayName>
 				<displayName count="other">dollar nevez Taiwan</displayName>
+				<symbol draft="contributed">TWD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="TZS">
@@ -3692,6 +5787,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">shilling Tanzania</displayName>
 				<displayName count="many">a shillingoù Tanzania</displayName>
 				<displayName count="other">shilling Tanzania</displayName>
+				<symbol draft="contributed">TZS</symbol>
 			</currency>
 			<currency type="UAH">
 				<displayName>hryvnia Ukraina</displayName>
@@ -3700,6 +5796,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">hryvnia Ukraina</displayName>
 				<displayName count="many">a hryvniaoù Ukraina</displayName>
 				<displayName count="other">hryvnia Ukraina</displayName>
+				<symbol draft="contributed">UAH</symbol>
+				<symbol alt="narrow" draft="contributed">₴</symbol>
+			</currency>
+			<currency type="UAK">
+				<symbol draft="contributed">UAK</symbol>
 			</currency>
 			<currency type="UGS">
 				<displayName>shilling Ouganda (1966–1987)</displayName>
@@ -3708,6 +5809,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">shilling Ouganda (1966–1987)</displayName>
 				<displayName count="many">a shillingoù Ouganda (1966–1987)</displayName>
 				<displayName count="other">shilling Ouganda (1966–1987)</displayName>
+				<symbol draft="contributed">UGS</symbol>
 			</currency>
 			<currency type="UGX">
 				<displayName>shilling Ouganda</displayName>
@@ -3716,6 +5818,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">shilling Ouganda</displayName>
 				<displayName count="many">a shillingoù Ouganda</displayName>
 				<displayName count="other">shilling Ouganda</displayName>
+				<symbol draft="contributed">UGX</symbol>
 			</currency>
 			<currency type="USD">
 				<displayName>dollar SU</displayName>
@@ -3727,6 +5830,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>$ SU</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
+			<currency type="USN">
+				<symbol draft="contributed">USN</symbol>
+			</currency>
+			<currency type="USS">
+				<symbol draft="contributed">USS</symbol>
+			</currency>
+			<currency type="UYI">
+				<symbol draft="contributed">UYI</symbol>
+			</currency>
 			<currency type="UYP">
 				<displayName>peso Uruguay (1975–1993)</displayName>
 				<displayName count="one">peso Uruguay (1975–1993)</displayName>
@@ -3734,6 +5846,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">feso Uruguay (1975–1993)</displayName>
 				<displayName count="many">a besoioù Uruguay (1975–1993)</displayName>
 				<displayName count="other">peso Uruguay (1975–1993)</displayName>
+				<symbol draft="contributed">UYP</symbol>
 			</currency>
 			<currency type="UYU">
 				<displayName>peso Uruguay</displayName>
@@ -3742,6 +5855,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">feso Uruguay</displayName>
 				<displayName count="many">a besoioù Uruguay</displayName>
 				<displayName count="other">peso Uruguay</displayName>
+				<symbol draft="contributed">UYU</symbol>
 			</currency>
 			<currency type="UZS">
 				<displayName>som Ouzbekistan</displayName>
@@ -3750,6 +5864,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">som Ouzbekistan</displayName>
 				<displayName count="many">a somoù Ouzbekistan</displayName>
 				<displayName count="other">som Ouzbekistan</displayName>
+				<symbol draft="contributed">UZS</symbol>
 			</currency>
 			<currency type="VEB">
 				<displayName>bolivar Venezuela (1871–2008)</displayName>
@@ -3758,6 +5873,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">bolivar Venezuela (1871–2008)</displayName>
 				<displayName count="many">a volivaroù Venezuela (1871–2008)</displayName>
 				<displayName count="other">bolivar Venezuela (1871–2008)</displayName>
+				<symbol draft="contributed">VEB</symbol>
 			</currency>
 			<currency type="VEF">
 				<displayName>bolivar Venezuela</displayName>
@@ -3766,6 +5882,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">bolivar Venezuela</displayName>
 				<displayName count="many">a volivaroù Venezuela</displayName>
 				<displayName count="other">bolivar Venezuela</displayName>
+				<symbol draft="contributed">VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>dong Viêt Nam</displayName>
@@ -3774,6 +5892,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dong Viêt Nam</displayName>
 				<displayName count="many">a zongoù Viêt Nam</displayName>
 				<displayName count="other">dong Viêt Nam</displayName>
+				<symbol draft="contributed">VND</symbol>
 				<symbol alt="narrow" draft="contributed">₫</symbol>
 			</currency>
 			<currency type="VNN">
@@ -3783,6 +5902,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dong Viêt Nam (1978–1985)</displayName>
 				<displayName count="many">a zongoù Viêt Nam (1978–1985)</displayName>
 				<displayName count="other">dong Viêt Nam (1978–1985)</displayName>
+				<symbol draft="contributed">VNN</symbol>
 			</currency>
 			<currency type="VUV">
 				<displayName>vatu Vanuatu</displayName>
@@ -3791,6 +5911,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">vatu Vanuatu</displayName>
 				<displayName count="many">a vatuoù Vanuatu</displayName>
 				<displayName count="other">vatu Vanuatu</displayName>
+				<symbol draft="contributed">VUV</symbol>
 			</currency>
 			<currency type="WST">
 				<displayName>tala Samoa</displayName>
@@ -3799,20 +5920,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">zala Samoa</displayName>
 				<displayName count="many">a dalaoù Samoa</displayName>
 				<displayName count="other">tala Samoa</displayName>
+				<symbol draft="contributed">WST</symbol>
 			</currency>
 			<currency type="XAF">
-				<displayName>lur CFA BEAC</displayName>
-				<displayName count="one">lur CFA BEAC</displayName>
-				<displayName count="two">lur CFA BEAC</displayName>
-				<displayName count="few">lur CFA BEAC</displayName>
-				<displayName count="many">a lurioù CFA BEAC</displayName>
-				<displayName count="other">lur CFA BEAC</displayName>
+				<displayName>lur CFA Kreizafrika</displayName>
+				<displayName count="one">lur CFA Kreizafrika</displayName>
+				<displayName count="two">lur CFA Kreizafrika</displayName>
+				<displayName count="few">lur CFA Kreizafrika</displayName>
+				<displayName count="many">lur CFA Kreizafrika</displayName>
+				<displayName count="other">lur CFA Kreizafrika</displayName>
+				<symbol draft="contributed">FCFA</symbol>
 			</currency>
 			<currency type="XAG">
 				<displayName>arcʼhant</displayName>
+				<symbol draft="contributed">XAG</symbol>
 			</currency>
 			<currency type="XAU">
 				<displayName>aour</displayName>
+				<symbol draft="contributed">XAU</symbol>
 			</currency>
 			<currency type="XBA">
 				<displayName>unanenn genaoz europat</displayName>
@@ -3821,6 +5946,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">unanenn genaoz europat</displayName>
 				<displayName count="many">a unanennoù kenaoz europat</displayName>
 				<displayName count="other">unanenn genaoz europat</displayName>
+				<symbol draft="contributed">XBA</symbol>
 			</currency>
 			<currency type="XBB">
 				<displayName>unanenn voneiz europat</displayName>
@@ -3829,6 +5955,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">unanenn voneiz europat</displayName>
 				<displayName count="many">a unanennoù moneiz europat</displayName>
 				<displayName count="other">unanenn voneiz europat</displayName>
+				<symbol draft="contributed">XBB</symbol>
 			</currency>
 			<currency type="XBC">
 				<displayName>unanenn jediñ europat (XBC)</displayName>
@@ -3837,6 +5964,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">unanenn jediñ europat (XBC)</displayName>
 				<displayName count="many">a unanennoù jediñ europat (XBC)</displayName>
 				<displayName count="other">unanenn jediñ europat (XBC)</displayName>
+				<symbol draft="contributed">XBC</symbol>
 			</currency>
 			<currency type="XBD">
 				<displayName>unanenn jediñ europat (XBD)</displayName>
@@ -3845,6 +5973,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">unanenn jediñ europat (XBD)</displayName>
 				<displayName count="many">a unanennoù jediñ europat (XBD)</displayName>
 				<displayName count="other">unanenn jediñ europat (XBD)</displayName>
+				<symbol draft="contributed">XBD</symbol>
 			</currency>
 			<currency type="XCD">
 				<displayName>dollar Karib ar reter</displayName>
@@ -3853,9 +5982,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dollar Karib ar reter</displayName>
 				<displayName count="many">a zollaroù Karib ar reter</displayName>
 				<displayName count="other">dollar Karib ar reter</displayName>
+				<symbol draft="contributed">XCD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>gwirioù tennañ arbennik</displayName>
+				<displayName count="one">gwirioù tennañ arbennik</displayName>
+				<displayName count="two">gwirioù tennañ arbennik</displayName>
+				<displayName count="few">gwirioù tennañ arbennik</displayName>
+				<displayName count="many">gwirioù tennañ arbennik</displayName>
+				<displayName count="other">gwirioù tennañ arbennik</displayName>
+				<symbol draft="contributed">XDR</symbol>
 			</currency>
 			<currency type="XEU">
 				<displayName>unanenn jediñ europat</displayName>
@@ -3864,6 +6001,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">unanenn jediñ europat</displayName>
 				<displayName count="many">a unanennoù jediñ europat</displayName>
 				<displayName count="other">unanenn jediñ europat</displayName>
+				<symbol draft="contributed">XEU</symbol>
 			</currency>
 			<currency type="XFO">
 				<displayName>lur aour Frañs</displayName>
@@ -3872,6 +6010,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur aour Frañs</displayName>
 				<displayName count="many">a lurioù aour Frañs</displayName>
 				<displayName count="other">lur aour Frañs</displayName>
+				<symbol draft="contributed">XFO</symbol>
 			</currency>
 			<currency type="XFU">
 				<displayName>lur Unaniezh etrebroadel an hentoù-houarn</displayName>
@@ -3883,15 +6022,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>XFU</symbol>
 			</currency>
 			<currency type="XOF">
-				<displayName>lur CFA BCEAO</displayName>
-				<displayName count="one">lur CFA BCEAO</displayName>
+				<displayName>lur CFA Afrika ar Cʼhornôg</displayName>
+				<displayName count="one">lur CFA Afrika ar Cʼhornôg</displayName>
 				<displayName count="two">lur CFA BCEAO</displayName>
 				<displayName count="few">lur CFA BCEAO</displayName>
 				<displayName count="many">a lurioù CFA BCEAO</displayName>
-				<displayName count="other">lur CFA BCEAO</displayName>
+				<displayName count="other">lur CFA Afrika ar Cʼhornôg</displayName>
+				<symbol draft="contributed">CFA</symbol>
 			</currency>
 			<currency type="XPD">
 				<displayName>palladiom</displayName>
+				<symbol draft="contributed">XPD</symbol>
 			</currency>
 			<currency type="XPF">
 				<displayName>lur CFP</displayName>
@@ -3900,9 +6041,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lur CFP</displayName>
 				<displayName count="many">a lurioù CFP</displayName>
 				<displayName count="other">lur CFP</displayName>
+				<symbol draft="contributed">CFPF</symbol>
 			</currency>
 			<currency type="XPT">
 				<displayName>platin</displayName>
+				<symbol draft="contributed">XPT</symbol>
+			</currency>
+			<currency type="XRE">
+				<symbol draft="contributed">XRE</symbol>
+			</currency>
+			<currency type="XSU">
+				<symbol draft="contributed">XSU</symbol>
 			</currency>
 			<currency type="XTS">
 				<displayName>kod moneiz amprouiñ</displayName>
@@ -3911,14 +6060,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">unanenn voneiz amprouiñ</displayName>
 				<displayName count="many">a unanennoù voneiz amprouiñ</displayName>
 				<displayName count="other">unanenn voneiz amprouiñ</displayName>
+				<symbol draft="contributed">XTS</symbol>
 			</currency>
 			<currency type="XXX">
 				<displayName>moneiz dianav</displayName>
-				<displayName count="one">moneiz dianav</displayName>
-				<displayName count="two">moneiz dianav</displayName>
-				<displayName count="few">moneiz dianav</displayName>
-				<displayName count="many">moneiz dianav</displayName>
-				<displayName count="other">moneiz dianav</displayName>
+				<displayName count="one">(moneiz dianav)</displayName>
+				<displayName count="two">(moneiz dianav)</displayName>
+				<displayName count="few">(moneiz dianav)</displayName>
+				<displayName count="many">(moneiz dianav)</displayName>
+				<displayName count="other">(moneiz dianav)</displayName>
+				<symbol draft="contributed">XXX</symbol>
 			</currency>
 			<currency type="YDD">
 				<displayName>dinar Yemen</displayName>
@@ -3927,6 +6078,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dinar Yemen</displayName>
 				<displayName count="many">a zinaroù Yemen</displayName>
 				<displayName count="other">dinar Yemen</displayName>
+				<symbol draft="contributed">YDD</symbol>
 			</currency>
 			<currency type="YER">
 				<displayName>rial Yemen</displayName>
@@ -3935,6 +6087,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">rial Yemen</displayName>
 				<displayName count="many">a rialoù Yemen</displayName>
 				<displayName count="other">rial Yemen</displayName>
+				<symbol draft="contributed">YER</symbol>
+			</currency>
+			<currency type="YUD">
+				<symbol draft="contributed">YUD</symbol>
 			</currency>
 			<currency type="YUM">
 				<displayName>dinar nevez Yougoslavia (1994–2002)</displayName>
@@ -3943,6 +6099,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dinar nevez Yougoslavia (1994–2002)</displayName>
 				<displayName count="many">a zinaroù nevez Yougoslavia (1994–2002)</displayName>
 				<displayName count="other">dinar nevez Yougoslavia (1994–2002)</displayName>
+				<symbol draft="contributed">YUM</symbol>
 			</currency>
 			<currency type="YUN">
 				<displayName>dinar kemmadus Yougoslavia (1990–1992)</displayName>
@@ -3951,6 +6108,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dinar kemmadus Yougoslavia (1990–1992)</displayName>
 				<displayName count="many">a zinaroù kemmadus Yougoslavia (1990–1992)</displayName>
 				<displayName count="other">dinar kemmadus Yougoslavia (1990–1992)</displayName>
+				<symbol draft="contributed">YUN</symbol>
 			</currency>
 			<currency type="YUR">
 				<displayName>dinar adreizhet Yougoslavia (1992–1993)</displayName>
@@ -3959,6 +6117,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dinar adreizhet Yougoslavia (1992–1993)</displayName>
 				<displayName count="many">a zinaroù adreizhet Yougoslavia (1992–1993)</displayName>
 				<displayName count="other">dinar adreizhet Yougoslavia (1992–1993)</displayName>
+				<symbol draft="contributed">YUR</symbol>
+			</currency>
+			<currency type="ZAL">
+				<symbol draft="contributed">ZAL</symbol>
 			</currency>
 			<currency type="ZAR">
 				<displayName>rand Suafrika</displayName>
@@ -3967,6 +6129,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">rand Suafrika</displayName>
 				<displayName count="many">a randoù Suafrika</displayName>
 				<displayName count="other">rand Suafrika</displayName>
+				<symbol draft="contributed">ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>kwacha Zambia (1968–2012)</displayName>
@@ -3975,6 +6139,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">kwacha Zambia (1968–2012)</displayName>
 				<displayName count="many">a gwachaoù Zambia (1968–2012)</displayName>
 				<displayName count="other">kwacha Zambia (1968–2012)</displayName>
+				<symbol draft="contributed">ZMK</symbol>
 			</currency>
 			<currency type="ZMW">
 				<displayName>kwacha Zambia</displayName>
@@ -3983,6 +6148,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">kwacha Zambia</displayName>
 				<displayName count="many">a gwachaoù Zambia</displayName>
 				<displayName count="other">kwacha Zambia</displayName>
+				<symbol draft="contributed">ZMW</symbol>
+			</currency>
+			<currency type="ZRN">
+				<symbol draft="contributed">ZRN</symbol>
+			</currency>
+			<currency type="ZRZ">
+				<symbol draft="contributed">ZRZ</symbol>
 			</currency>
 			<currency type="ZWD">
 				<displayName>dollar Zimbabwe (1980–2008)</displayName>
@@ -3991,6 +6163,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dollar Zimbabwe (1980–2008)</displayName>
 				<displayName count="many">a zollaroù Zimbabwe (1980–2008)</displayName>
 				<displayName count="other">dollar Zimbabwe (1980–2008)</displayName>
+				<symbol draft="contributed">ZWD</symbol>
 			</currency>
 			<currency type="ZWL">
 				<displayName>dollar Zimbabwe (2009)</displayName>
@@ -3999,6 +6172,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dollar Zimbabwe (2009)</displayName>
 				<displayName count="many">a zollaroù Zimbabwe (2009)</displayName>
 				<displayName count="other">dollar Zimbabwe (2009)</displayName>
+				<symbol draft="contributed">ZWL</symbol>
 			</currency>
 			<currency type="ZWR">
 				<displayName>dollar Zimbabwe (2008)</displayName>
@@ -4007,18 +6181,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dollar Zimbabwe (2008)</displayName>
 				<displayName count="many">a zollaroù Zimbabwe (2008)</displayName>
 				<displayName count="other">dollar Zimbabwe (2008)</displayName>
+				<symbol draft="contributed">ZWR</symbol>
 			</currency>
 		</currencies>
 	</numbers>
 	<units>
 		<unitLength type="long">
-			<unit type="angle-degree">
-				<displayName>derezioù</displayName>
-				<unitPattern count="one">{0} derez</unitPattern>
-				<unitPattern count="two">{0} zerez</unitPattern>
-				<unitPattern count="few">{0} derez</unitPattern>
-				<unitPattern count="many">{0} a zerezioù</unitPattern>
-				<unitPattern count="other">{0} derez</unitPattern>
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0} dre {1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="acceleration-meter-per-second-squared">
+				<displayName>metroù dre eilenn garrez</displayName>
+				<unitPattern count="one">{0} metr dre eilenn garrez</unitPattern>
+				<unitPattern count="two">{0} vetr dre eilenn garrez</unitPattern>
+				<unitPattern count="few">{0} metr dre eilenn garrez</unitPattern>
+				<unitPattern count="many">{0} a vetroù dre eilenn garrez</unitPattern>
+				<unitPattern count="other">{0} metr dre eilenn garrez</unitPattern>
 			</unit>
 			<unit type="angle-radian">
 				<displayName>radianoù</displayName>
@@ -4028,6 +6206,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} a radianoù</unitPattern>
 				<unitPattern count="other">{0} radian</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<displayName>derezioù</displayName>
+				<unitPattern count="one">{0} derez</unitPattern>
+				<unitPattern count="two">{0} zerez</unitPattern>
+				<unitPattern count="few">{0} derez</unitPattern>
+				<unitPattern count="many">{0} a zerezioù</unitPattern>
+				<unitPattern count="other">{0} derez</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>kilometroù karrez</displayName>
+				<unitPattern count="one">{0} c'hilometr karrez</unitPattern>
+				<unitPattern count="two">{0} gilometr karrez</unitPattern>
+				<unitPattern count="few">{0} c'hilometr karrez</unitPattern>
+				<unitPattern count="many">{0} a gilometroù karrez</unitPattern>
+				<unitPattern count="other">{0} kilometr karrez</unitPattern>
+			</unit>
 			<unit type="area-hectare">
 				<displayName>hektaroù</displayName>
 				<unitPattern count="one">{0} hektar</unitPattern>
@@ -4036,6 +6230,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} a hektaroù</unitPattern>
 				<unitPattern count="other">{0} hektar</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>metroù karrez</displayName>
+				<unitPattern count="one">{0} metr karrez</unitPattern>
+				<unitPattern count="two">{0} vetr karrez</unitPattern>
+				<unitPattern count="few">{0} metr karrez</unitPattern>
+				<unitPattern count="many">{0} a vetroù garrez</unitPattern>
+				<unitPattern count="other">{0} metr karrez</unitPattern>
+				<perUnitPattern>{0} dre vetr karrez</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>kentimetroù karrez</displayName>
 				<unitPattern count="one">{0} c'hentimetr karrez</unitPattern>
@@ -4043,6 +6246,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} c'hentimetr karrez</unitPattern>
 				<unitPattern count="many">{0} a gentimetroù karrez</unitPattern>
 				<unitPattern count="other">{0} kentimetr karrez</unitPattern>
+				<perUnitPattern>{0} dre gentimetr karrez</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>miltirioù karrez</displayName>
+				<unitPattern count="one">{0} miltir karrez</unitPattern>
+				<unitPattern count="two">{0} viltir karrez</unitPattern>
+				<unitPattern count="few">{0} miltir karrez</unitPattern>
+				<unitPattern count="many">{0} a viltirioù karrez</unitPattern>
+				<unitPattern count="other">{0} miltir karrez</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>akroù</displayName>
+				<unitPattern count="one">{0} akr</unitPattern>
+				<unitPattern count="two">{0} akr</unitPattern>
+				<unitPattern count="few">{0} akr</unitPattern>
+				<unitPattern count="many">{0} a akroù</unitPattern>
+				<unitPattern count="other">{0} akr</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>troatadoù karrez</displayName>
@@ -4059,102 +6279,39 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} meutad karrez</unitPattern>
 				<unitPattern count="many">{0} a veutadoù karrez</unitPattern>
 				<unitPattern count="other">{0} meutad karrez</unitPattern>
+				<perUnitPattern>{0} dre veutad karrez</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kilometroù karrez</displayName>
-				<unitPattern count="one">{0} c'hilometr karrez</unitPattern>
-				<unitPattern count="two">{0} gilometr karrez</unitPattern>
-				<unitPattern count="few">{0} c'hilometr karrez</unitPattern>
-				<unitPattern count="many">{0} a gilometroù karrez</unitPattern>
-				<unitPattern count="other">{0} kilometr karrez</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karatoù</displayName>
+				<unitPattern count="one">{0} c'harat</unitPattern>
+				<unitPattern count="two">{0} garat</unitPattern>
+				<unitPattern count="few">{0} c'harat</unitPattern>
+				<unitPattern count="many">{0} a garatoù</unitPattern>
+				<unitPattern count="other">{0} karat</unitPattern>
 			</unit>
-			<unit type="area-square-meter">
-				<displayName>metroù karrez</displayName>
-				<unitPattern count="one">{0} metr karrez</unitPattern>
-				<unitPattern count="two">{0} vetr karrez</unitPattern>
-				<unitPattern count="few">{0} metr karrez</unitPattern>
-				<unitPattern count="many">{0} a vetroù garrez</unitPattern>
-				<unitPattern count="other">{0} metr karrez</unitPattern>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>litroù dre gilometr</displayName>
+				<unitPattern count="one">{0} litr dre gilometr</unitPattern>
+				<unitPattern count="two">{0} litr dre gilometr</unitPattern>
+				<unitPattern count="few">{0} litr dre gilometr</unitPattern>
+				<unitPattern count="many">{0} a litroù dre gilometr</unitPattern>
+				<unitPattern count="other">{0} litr dre gilometr</unitPattern>
 			</unit>
-			<unit type="area-square-mile">
-				<displayName>miltirioù karrez</displayName>
-				<unitPattern count="one">{0} miltir karrez</unitPattern>
-				<unitPattern count="two">{0} viltir karrez</unitPattern>
-				<unitPattern count="few">{0} miltir karrez</unitPattern>
-				<unitPattern count="many">{0} a viltirioù karrez</unitPattern>
-				<unitPattern count="other">{0} miltir karrez</unitPattern>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>litroù dre 100 kilometr</displayName>
+				<unitPattern count="one">{0} litr dre 100 kilometr</unitPattern>
+				<unitPattern count="two">{0} litr dre 100 kilometr</unitPattern>
+				<unitPattern count="few">{0} litr dre 100 kilometr</unitPattern>
+				<unitPattern count="many">{0} a litroù dre 100 kilometr</unitPattern>
+				<unitPattern count="other">{0} litr dre 100 kilometr</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bitoù</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="two">{0} vit</unitPattern>
-				<unitPattern count="few">{0} bit</unitPattern>
-				<unitPattern count="many">{0} a vitoù</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>oktedoù</displayName>
-				<unitPattern count="one">{0} okted</unitPattern>
-				<unitPattern count="two">{0} okted</unitPattern>
-				<unitPattern count="few">{0} okted</unitPattern>
-				<unitPattern count="many">{0} a oktedoù</unitPattern>
-				<unitPattern count="other">{0} okted</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabitoù</displayName>
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="two">{0} c'higabit</unitPattern>
-				<unitPattern count="few">{0} gigabit</unitPattern>
-				<unitPattern count="many">{0} a c'higabitoù</unitPattern>
-				<unitPattern count="other">{0} gigabit</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigaoktedoù</displayName>
-				<unitPattern count="one">{0} gigaokted</unitPattern>
-				<unitPattern count="two">{0} c'higaokted</unitPattern>
-				<unitPattern count="few">{0} gigaokted</unitPattern>
-				<unitPattern count="many">{0} a c'higaoktedoù</unitPattern>
-				<unitPattern count="other">{0} gigaokted</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobitoù</displayName>
-				<unitPattern count="one">{0} c'hilobit</unitPattern>
-				<unitPattern count="two">{0} gilobit</unitPattern>
-				<unitPattern count="few">{0} c'hilobit</unitPattern>
-				<unitPattern count="many">{0} a gilobitoù</unitPattern>
-				<unitPattern count="other">{0} kilobit</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilooktedoù</displayName>
-				<unitPattern count="one">{0} c'hilookted</unitPattern>
-				<unitPattern count="two">{0} gilookted</unitPattern>
-				<unitPattern count="few">{0} c'hilookted</unitPattern>
-				<unitPattern count="many">{0} a gilooktedoù</unitPattern>
-				<unitPattern count="other">{0} kilookted</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabitoù</displayName>
-				<unitPattern count="one">{0} megabit</unitPattern>
-				<unitPattern count="two">{0} vegabit</unitPattern>
-				<unitPattern count="few">{0} megabit</unitPattern>
-				<unitPattern count="many">{0} a vegabitoù</unitPattern>
-				<unitPattern count="other">{0} megabit</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megaoktedoù</displayName>
-				<unitPattern count="one">{0} megaokted</unitPattern>
-				<unitPattern count="two">{0} vegaokted</unitPattern>
-				<unitPattern count="few">{0} megaokted</unitPattern>
-				<unitPattern count="many">{0} a vegaoktedoù</unitPattern>
-				<unitPattern count="other">{0} megaokted</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabitoù</displayName>
-				<unitPattern count="one">{0} terabit</unitPattern>
-				<unitPattern count="two">{0} derabit</unitPattern>
-				<unitPattern count="few">{0} zerabit</unitPattern>
-				<unitPattern count="many">{0} a derabitoù</unitPattern>
-				<unitPattern count="other">{0} terabit</unitPattern>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>miltirioù dre cʼhallon</displayName>
+				<unitPattern count="one">{0} miltir dre c'hallon</unitPattern>
+				<unitPattern count="two">{0} viltir dre c'hallon</unitPattern>
+				<unitPattern count="few">{0} miltir dre c'hallon</unitPattern>
+				<unitPattern count="many">{0} a viltirioù dre c'hallon</unitPattern>
+				<unitPattern count="other">{0} miltir dre c'hallon</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
 				<displayName>teraoktedoù</displayName>
@@ -4164,6 +6321,113 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} a deraoktedoù</unitPattern>
 				<unitPattern count="other">{0} teraokted</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabitoù</displayName>
+				<unitPattern count="one">{0} terabit</unitPattern>
+				<unitPattern count="two">{0} derabit</unitPattern>
+				<unitPattern count="few">{0} zerabit</unitPattern>
+				<unitPattern count="many">{0} a derabitoù</unitPattern>
+				<unitPattern count="other">{0} terabit</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigaoktedoù</displayName>
+				<unitPattern count="one">{0} gigaokted</unitPattern>
+				<unitPattern count="two">{0} c'higaokted</unitPattern>
+				<unitPattern count="few">{0} gigaokted</unitPattern>
+				<unitPattern count="many">{0} a c'higaoktedoù</unitPattern>
+				<unitPattern count="other">{0} gigaokted</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabitoù</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="two">{0} c'higabit</unitPattern>
+				<unitPattern count="few">{0} gigabit</unitPattern>
+				<unitPattern count="many">{0} a c'higabitoù</unitPattern>
+				<unitPattern count="other">{0} gigabit</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megaoktedoù</displayName>
+				<unitPattern count="one">{0} megaokted</unitPattern>
+				<unitPattern count="two">{0} vegaokted</unitPattern>
+				<unitPattern count="few">{0} megaokted</unitPattern>
+				<unitPattern count="many">{0} a vegaoktedoù</unitPattern>
+				<unitPattern count="other">{0} megaokted</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabitoù</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="two">{0} vegabit</unitPattern>
+				<unitPattern count="few">{0} megabit</unitPattern>
+				<unitPattern count="many">{0} a vegabitoù</unitPattern>
+				<unitPattern count="other">{0} megabit</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilooktedoù</displayName>
+				<unitPattern count="one">{0} c'hilookted</unitPattern>
+				<unitPattern count="two">{0} gilookted</unitPattern>
+				<unitPattern count="few">{0} c'hilookted</unitPattern>
+				<unitPattern count="many">{0} a gilooktedoù</unitPattern>
+				<unitPattern count="other">{0} kilookted</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobitoù</displayName>
+				<unitPattern count="one">{0} c'hilobit</unitPattern>
+				<unitPattern count="two">{0} gilobit</unitPattern>
+				<unitPattern count="few">{0} c'hilobit</unitPattern>
+				<unitPattern count="many">{0} a gilobitoù</unitPattern>
+				<unitPattern count="other">{0} kilobit</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>oktedoù</displayName>
+				<unitPattern count="one">{0} okted</unitPattern>
+				<unitPattern count="two">{0} okted</unitPattern>
+				<unitPattern count="few">{0} okted</unitPattern>
+				<unitPattern count="many">{0} a oktedoù</unitPattern>
+				<unitPattern count="other">{0} okted</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bitoù</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="two">{0} vit</unitPattern>
+				<unitPattern count="few">{0} bit</unitPattern>
+				<unitPattern count="many">{0} a vitoù</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>kantvedoù</displayName>
+				<unitPattern count="one">{0} c'hantved</unitPattern>
+				<unitPattern count="two">{0} gantved</unitPattern>
+				<unitPattern count="few">{0} c'hantved</unitPattern>
+				<unitPattern count="many">{0} a gantvedoù</unitPattern>
+				<unitPattern count="other">{0} kantved</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>bloazioù</displayName>
+				<unitPattern count="one">{0} bloaz</unitPattern>
+				<unitPattern count="two">{0} vloaz</unitPattern>
+				<unitPattern count="few">{0} bloaz</unitPattern>
+				<unitPattern count="many">{0} a vloazioù</unitPattern>
+				<unitPattern count="other">{0} vloaz</unitPattern>
+				<perUnitPattern>{0} dre vloaz</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mizioù</displayName>
+				<unitPattern count="one">{0} miz</unitPattern>
+				<unitPattern count="two">{0} viz</unitPattern>
+				<unitPattern count="few">{0} miz</unitPattern>
+				<unitPattern count="many">{0} a vizioù</unitPattern>
+				<unitPattern count="other">{0} miz</unitPattern>
+				<perUnitPattern>{0} dre viz</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>sizhunioù</displayName>
+				<unitPattern count="one">{0} sizhun</unitPattern>
+				<unitPattern count="two">{0} sizhun</unitPattern>
+				<unitPattern count="few">{0} sizhun</unitPattern>
+				<unitPattern count="many">{0} a sizhunioù</unitPattern>
+				<unitPattern count="other">{0} sizhun</unitPattern>
+				<perUnitPattern>{0} dre sizhun</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>deizioù</displayName>
 				<unitPattern count="one">{0} deiz</unitPattern>
@@ -4171,6 +6435,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} deiz</unitPattern>
 				<unitPattern count="many">{0} a zeizioù</unitPattern>
 				<unitPattern count="other">{0} deiz</unitPattern>
+				<perUnitPattern>{0} dre zeiz</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>eurioù</displayName>
@@ -4181,22 +6446,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} eur</unitPattern>
 				<perUnitPattern>{0} dre eur</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikroeilennoù</displayName>
-				<unitPattern count="one">{0} mikroeilenn</unitPattern>
-				<unitPattern count="two">{0} vikroeilenn</unitPattern>
-				<unitPattern count="few">{0} mikroeilenn</unitPattern>
-				<unitPattern count="many">{0} a vikroeilennoù</unitPattern>
-				<unitPattern count="other">{0} mikroeilenn</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milieilennoù</displayName>
-				<unitPattern count="one">{0} milieilenn</unitPattern>
-				<unitPattern count="two">{0} vilieilenn</unitPattern>
-				<unitPattern count="few">{0} milieilenn</unitPattern>
-				<unitPattern count="many">{0} a vilieilennoù</unitPattern>
-				<unitPattern count="other">{0} milieilenn</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>munutoù</displayName>
 				<unitPattern count="one">{0} munut</unitPattern>
@@ -4204,22 +6453,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} munut</unitPattern>
 				<unitPattern count="many">{0} a vunutoù</unitPattern>
 				<unitPattern count="other">{0} munut</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>mizioù</displayName>
-				<unitPattern count="one">{0} miz</unitPattern>
-				<unitPattern count="two">{0} viz</unitPattern>
-				<unitPattern count="few">{0} miz</unitPattern>
-				<unitPattern count="many">{0} a vizioù</unitPattern>
-				<unitPattern count="other">{0} miz</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanoeilennoù</displayName>
-				<unitPattern count="one">{0} nanoeilenn</unitPattern>
-				<unitPattern count="two">{0} nanoeilenn</unitPattern>
-				<unitPattern count="few">{0} nanoeilenn</unitPattern>
-				<unitPattern count="many">{0} a nanoeilennoù</unitPattern>
-				<unitPattern count="other">{0} nanoeilenn</unitPattern>
+				<perUnitPattern>{0} dre vunut</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>eilennoù</displayName>
@@ -4230,13 +6464,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} eilenn</unitPattern>
 				<perUnitPattern>{0} dre eilenn</perUnitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>bloazioù</displayName>
-				<unitPattern count="one">{0} bloaz</unitPattern>
-				<unitPattern count="two">{0} vloaz</unitPattern>
-				<unitPattern count="few">{0} bloaz</unitPattern>
-				<unitPattern count="many">{0} a vloazioù</unitPattern>
-				<unitPattern count="other">{0} vloaz</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milieilennoù</displayName>
+				<unitPattern count="one">{0} milieilenn</unitPattern>
+				<unitPattern count="two">{0} vilieilenn</unitPattern>
+				<unitPattern count="few">{0} milieilenn</unitPattern>
+				<unitPattern count="many">{0} a vilieilennoù</unitPattern>
+				<unitPattern count="other">{0} milieilenn</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>mikroeilennoù</displayName>
+				<unitPattern count="one">{0} mikroeilenn</unitPattern>
+				<unitPattern count="two">{0} vikroeilenn</unitPattern>
+				<unitPattern count="few">{0} mikroeilenn</unitPattern>
+				<unitPattern count="many">{0} a vikroeilennoù</unitPattern>
+				<unitPattern count="other">{0} mikroeilenn</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanoeilennoù</displayName>
+				<unitPattern count="one">{0} nanoeilenn</unitPattern>
+				<unitPattern count="two">{0} nanoeilenn</unitPattern>
+				<unitPattern count="few">{0} nanoeilenn</unitPattern>
+				<unitPattern count="many">{0} a nanoeilennoù</unitPattern>
+				<unitPattern count="other">{0} nanoeilenn</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amperoù</displayName>
@@ -4270,22 +6520,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} a voltoù</unitPattern>
 				<unitPattern count="other">{0} volt</unitPattern>
 			</unit>
-			<unit type="energy-calorie">
-				<displayName>kaloriennoù</displayName>
-				<unitPattern count="one">{0} galorienn</unitPattern>
-				<unitPattern count="two">{0} galorienn</unitPattern>
-				<unitPattern count="few">{0} c'halorienn</unitPattern>
-				<unitPattern count="many">{0} a galoriennoù</unitPattern>
-				<unitPattern count="other">{0} kalorienn</unitPattern>
-			</unit>
-			<unit type="energy-joule">
-				<displayName>jouloù</displayName>
-				<unitPattern count="one">{0} joul</unitPattern>
-				<unitPattern count="two">{0} joul</unitPattern>
-				<unitPattern count="few">{0} joul</unitPattern>
-				<unitPattern count="many">{0} a jouloù</unitPattern>
-				<unitPattern count="other">{0} joul</unitPattern>
-			</unit>
 			<unit type="energy-kilocalorie">
 				<displayName>kilokaloriennoù</displayName>
 				<unitPattern count="one">{0} gilokalorienn</unitPattern>
@@ -4294,6 +6528,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} a gilokaloriennoù</unitPattern>
 				<unitPattern count="other">{0} kilokalorienn</unitPattern>
 			</unit>
+			<unit type="energy-calorie">
+				<displayName>kaloriennoù</displayName>
+				<unitPattern count="one">{0} galorienn</unitPattern>
+				<unitPattern count="two">{0} galorienn</unitPattern>
+				<unitPattern count="few">{0} c'halorienn</unitPattern>
+				<unitPattern count="many">{0} a galoriennoù</unitPattern>
+				<unitPattern count="other">{0} kalorienn</unitPattern>
+			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojouloù</displayName>
 				<unitPattern count="one">{0} c'hilojoul</unitPattern>
@@ -4302,6 +6544,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} a gilojouloù</unitPattern>
 				<unitPattern count="other">{0} kilojoul</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>jouloù</displayName>
+				<unitPattern count="one">{0} joul</unitPattern>
+				<unitPattern count="two">{0} joul</unitPattern>
+				<unitPattern count="few">{0} joul</unitPattern>
+				<unitPattern count="many">{0} a jouloù</unitPattern>
+				<unitPattern count="other">{0} joul</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilowattoù-eurioù</displayName>
 				<unitPattern count="one">{0} c'hilowatt-eur</unitPattern>
@@ -4318,13 +6568,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} a c'higahertzoù</unitPattern>
 				<unitPattern count="other">{0} gigahertz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hertzoù</displayName>
-				<unitPattern count="one">{0} hertz</unitPattern>
-				<unitPattern count="two">{0} hertz</unitPattern>
-				<unitPattern count="few">{0} hertz</unitPattern>
-				<unitPattern count="many">{0} a hertzoù</unitPattern>
-				<unitPattern count="other">{0} hertz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megahertzoù</displayName>
+				<unitPattern count="one">{0} megahertz</unitPattern>
+				<unitPattern count="two">{0} vegahertz</unitPattern>
+				<unitPattern count="few">{0} megahertz</unitPattern>
+				<unitPattern count="many">{0} a vegahertzoù</unitPattern>
+				<unitPattern count="other">{0} megahertz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kilohertzoù</displayName>
@@ -4334,21 +6584,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} a gilohertzoù</unitPattern>
 				<unitPattern count="other">{0} kilohertz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megahertzoù</displayName>
-				<unitPattern count="one">{0} megahertz</unitPattern>
-				<unitPattern count="two">{0} vegahertz</unitPattern>
-				<unitPattern count="few">{0} megahertz</unitPattern>
-				<unitPattern count="many">{0} a vegahertzoù</unitPattern>
-				<unitPattern count="other">{0} megahertz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hertzoù</displayName>
+				<unitPattern count="one">{0} hertz</unitPattern>
+				<unitPattern count="two">{0} hertz</unitPattern>
+				<unitPattern count="few">{0} hertz</unitPattern>
+				<unitPattern count="many">{0} a hertzoù</unitPattern>
+				<unitPattern count="other">{0} hertz</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>kentimetroù</displayName>
-				<unitPattern count="one">{0} c'hentimetr</unitPattern>
-				<unitPattern count="two">{0} gentimetr</unitPattern>
-				<unitPattern count="few">{0} c'hentimetr</unitPattern>
-				<unitPattern count="many">{0} a gentimetroù</unitPattern>
-				<unitPattern count="other">{0} kentimetr</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometroù</displayName>
+				<unitPattern count="one">{0} c'hilometr</unitPattern>
+				<unitPattern count="two">{0} gilometr</unitPattern>
+				<unitPattern count="few">{0} c'hilometr</unitPattern>
+				<unitPattern count="many">{0} a gilometroù</unitPattern>
+				<unitPattern count="other">{0} kilometr</unitPattern>
+				<perUnitPattern>{0} dre gilometr</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>metroù</displayName>
+				<unitPattern count="one">{0} metr</unitPattern>
+				<unitPattern count="two">{0} vetr</unitPattern>
+				<unitPattern count="few">{0} metr</unitPattern>
+				<unitPattern count="many">{0} a vetroù</unitPattern>
+				<unitPattern count="other">{0} metr</unitPattern>
+				<perUnitPattern>{0} dre vetr</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dekimetroù</displayName>
@@ -4358,61 +6618,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} a zekimetroù</unitPattern>
 				<unitPattern count="other">{0} dekimetr</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName>gourhedadoù</displayName>
-				<unitPattern count="one">{0} gourhedad</unitPattern>
-				<unitPattern count="two">{0} c'hourhedad</unitPattern>
-				<unitPattern count="few">{0} gourhedad</unitPattern>
-				<unitPattern count="many">{0} a c'hourhedadoù</unitPattern>
-				<unitPattern count="other">{0} gourhedad</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>troatadoù</displayName>
-				<unitPattern count="one">{0} troatad</unitPattern>
-				<unitPattern count="two">{0} droatad</unitPattern>
-				<unitPattern count="few">{0} zroatad</unitPattern>
-				<unitPattern count="many">{0} a droatadoù</unitPattern>
-				<unitPattern count="other">{0} troatad</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>meutadoù</displayName>
-				<unitPattern count="one">{0} meutad</unitPattern>
-				<unitPattern count="two">{0} veutad</unitPattern>
-				<unitPattern count="few">{0} meutad</unitPattern>
-				<unitPattern count="many">{0} a veutadoù</unitPattern>
-				<unitPattern count="other">{0} meutad</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometroù</displayName>
-				<unitPattern count="one">{0} c'hilometr</unitPattern>
-				<unitPattern count="two">{0} gilometr</unitPattern>
-				<unitPattern count="few">{0} c'hilometr</unitPattern>
-				<unitPattern count="many">{0} a gilometroù</unitPattern>
-				<unitPattern count="other">{0} kilometr</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metroù</displayName>
-				<unitPattern count="one">{0} metr</unitPattern>
-				<unitPattern count="two">{0} vetr</unitPattern>
-				<unitPattern count="few">{0} metr</unitPattern>
-				<unitPattern count="many">{0} a vetroù</unitPattern>
-				<unitPattern count="other">{0} metr</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>mikrometroù</displayName>
-				<unitPattern count="one">{0} mikrometr</unitPattern>
-				<unitPattern count="two">{0} vikrometr</unitPattern>
-				<unitPattern count="few">{0} mikrometr</unitPattern>
-				<unitPattern count="many">{0} a vikrometroù</unitPattern>
-				<unitPattern count="other">{0} mikrometr</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>miltirioù</displayName>
-				<unitPattern count="one">{0} miltir</unitPattern>
-				<unitPattern count="two">{0} viltir</unitPattern>
-				<unitPattern count="few">{0} miltir</unitPattern>
-				<unitPattern count="many">{0} a viltirioù</unitPattern>
-				<unitPattern count="other">{0} miltir</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>kentimetroù</displayName>
+				<unitPattern count="one">{0} c'hentimetr</unitPattern>
+				<unitPattern count="two">{0} gentimetr</unitPattern>
+				<unitPattern count="few">{0} c'hentimetr</unitPattern>
+				<unitPattern count="many">{0} a gentimetroù</unitPattern>
+				<unitPattern count="other">{0} kentimetr</unitPattern>
+				<perUnitPattern>{0} dre gentimetr</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>milimetroù</displayName>
@@ -4422,6 +6635,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} a vilimetroù</unitPattern>
 				<unitPattern count="other">{0} milimetr</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikrometroù</displayName>
+				<unitPattern count="one">{0} mikrometr</unitPattern>
+				<unitPattern count="two">{0} vikrometr</unitPattern>
+				<unitPattern count="few">{0} mikrometr</unitPattern>
+				<unitPattern count="many">{0} a vikrometroù</unitPattern>
+				<unitPattern count="other">{0} mikrometr</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanometroù</displayName>
 				<unitPattern count="one">{0} nanometr</unitPattern>
@@ -4430,22 +6651,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} a nanometroù</unitPattern>
 				<unitPattern count="other">{0} nanometr</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>milmorioù</displayName>
-				<unitPattern count="one">{0} milmor</unitPattern>
-				<unitPattern count="two">{0} vilmor</unitPattern>
-				<unitPattern count="few">{0} milmor</unitPattern>
-				<unitPattern count="many">{0} a vilmorioù</unitPattern>
-				<unitPattern count="other">{0} milmor</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsekoù</displayName>
-				<unitPattern count="one">{0} parsek</unitPattern>
-				<unitPattern count="two">{0} barsek</unitPattern>
-				<unitPattern count="few">{0} farsek</unitPattern>
-				<unitPattern count="many">{0} a barsekoù</unitPattern>
-				<unitPattern count="other">{0} parsek</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pikometroù</displayName>
 				<unitPattern count="one">{0} pikometr</unitPattern>
@@ -4454,6 +6659,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} a bikometroù</unitPattern>
 				<unitPattern count="other">{0} pikometr</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>miltirioù</displayName>
+				<unitPattern count="one">{0} miltir</unitPattern>
+				<unitPattern count="two">{0} viltir</unitPattern>
+				<unitPattern count="few">{0} miltir</unitPattern>
+				<unitPattern count="many">{0} a viltirioù</unitPattern>
+				<unitPattern count="other">{0} miltir</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>troatadoù</displayName>
+				<unitPattern count="one">{0} troatad</unitPattern>
+				<unitPattern count="two">{0} droatad</unitPattern>
+				<unitPattern count="few">{0} zroatad</unitPattern>
+				<unitPattern count="many">{0} a droatadoù</unitPattern>
+				<unitPattern count="other">{0} troatad</unitPattern>
+				<perUnitPattern>{0} dre droatad</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>meutadoù</displayName>
+				<unitPattern count="one">{0} meutad</unitPattern>
+				<unitPattern count="two">{0} veutad</unitPattern>
+				<unitPattern count="few">{0} meutad</unitPattern>
+				<unitPattern count="many">{0} a veutadoù</unitPattern>
+				<unitPattern count="other">{0} meutad</unitPattern>
+				<perUnitPattern>{0} dre veutad</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsekoù</displayName>
+				<unitPattern count="one">{0} parsek</unitPattern>
+				<unitPattern count="two">{0} barsek</unitPattern>
+				<unitPattern count="few">{0} farsek</unitPattern>
+				<unitPattern count="many">{0} a barsekoù</unitPattern>
+				<unitPattern count="other">{0} parsek</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>unanennoù steredoniel</displayName>
+				<unitPattern count="one">{0} unanenn steredoniel</unitPattern>
+				<unitPattern count="two">{0} unanenn steredoniel</unitPattern>
+				<unitPattern count="few">{0} unanenn steredoniel</unitPattern>
+				<unitPattern count="many">{0} a unanennoù steredoniel</unitPattern>
+				<unitPattern count="other">{0} unanenn steredoniel</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>gourhedadoù</displayName>
+				<unitPattern count="one">{0} gourhedad</unitPattern>
+				<unitPattern count="two">{0} c'hourhedad</unitPattern>
+				<unitPattern count="few">{0} gourhedad</unitPattern>
+				<unitPattern count="many">{0} a c'hourhedadoù</unitPattern>
+				<unitPattern count="other">{0} gourhedad</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>milmorioù</displayName>
+				<unitPattern count="one">{0} milmor</unitPattern>
+				<unitPattern count="two">{0} vilmor</unitPattern>
+				<unitPattern count="few">{0} milmor</unitPattern>
+				<unitPattern count="many">{0} a vilmorioù</unitPattern>
+				<unitPattern count="other">{0} milmor</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>luksoù</displayName>
 				<unitPattern count="one">{0} luks</unitPattern>
@@ -4462,30 +6725,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} a luksoù</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karatoù</displayName>
-				<unitPattern count="one">{0} c'harat</unitPattern>
-				<unitPattern count="two">{0} garat</unitPattern>
-				<unitPattern count="few">{0} c'harat</unitPattern>
-				<unitPattern count="many">{0} a garatoù</unitPattern>
-				<unitPattern count="other">{0} karat</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>grammoù</displayName>
-				<unitPattern count="one">{0} gramm</unitPattern>
-				<unitPattern count="two">{0} c'hramm</unitPattern>
-				<unitPattern count="few">{0} gramm</unitPattern>
-				<unitPattern count="many">{0} a c'hrammoù</unitPattern>
-				<unitPattern count="other">{0} gramm</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogrammoù</displayName>
-				<unitPattern count="one">{0} c'hilogramm</unitPattern>
-				<unitPattern count="two">{0} gilogramm</unitPattern>
-				<unitPattern count="few">{0} c'hilogramm</unitPattern>
-				<unitPattern count="many">{0} a gilogrammoù</unitPattern>
-				<unitPattern count="other">{0} kilogramm</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>tonennoù metrek</displayName>
 				<unitPattern count="one">{0} donenn vetrek</unitPattern>
@@ -4494,13 +6733,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} a donennoù metrek</unitPattern>
 				<unitPattern count="other">{0} tonenn vetrek</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mikrogrammoù</displayName>
-				<unitPattern count="one">{0} mikrogramm</unitPattern>
-				<unitPattern count="two">{0} vikrogramm</unitPattern>
-				<unitPattern count="few">{0} mikrogramm</unitPattern>
-				<unitPattern count="many">{0} a vikrogrammoù</unitPattern>
-				<unitPattern count="other">{0} mikrogramm</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogrammoù</displayName>
+				<unitPattern count="one">{0} c'hilogramm</unitPattern>
+				<unitPattern count="two">{0} gilogramm</unitPattern>
+				<unitPattern count="few">{0} c'hilogramm</unitPattern>
+				<unitPattern count="many">{0} a gilogrammoù</unitPattern>
+				<unitPattern count="other">{0} kilogramm</unitPattern>
+				<perUnitPattern>{0} dre gilogramm</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>grammoù</displayName>
+				<unitPattern count="one">{0} gramm</unitPattern>
+				<unitPattern count="two">{0} c'hramm</unitPattern>
+				<unitPattern count="few">{0} gramm</unitPattern>
+				<unitPattern count="many">{0} a c'hrammoù</unitPattern>
+				<unitPattern count="other">{0} gramm</unitPattern>
+				<perUnitPattern>{0} dre cʼhramm</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>miligrammoù</displayName>
@@ -4510,21 +6759,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} a viligrammoù</unitPattern>
 				<unitPattern count="other">{0} miligramm</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oñsoù</displayName>
-				<unitPattern count="one">{0} oñs</unitPattern>
-				<unitPattern count="two">{0} oñs</unitPattern>
-				<unitPattern count="few">{0} oñs</unitPattern>
-				<unitPattern count="many">{0} a oñsoù</unitPattern>
-				<unitPattern count="other">{0} oñs</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>lurioù</displayName>
-				<unitPattern count="one">{0} lur</unitPattern>
-				<unitPattern count="two">{0} lur</unitPattern>
-				<unitPattern count="few">{0} lur</unitPattern>
-				<unitPattern count="many">{0} a lurioù</unitPattern>
-				<unitPattern count="other">{0} lur</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>mikrogrammoù</displayName>
+				<unitPattern count="one">{0} mikrogramm</unitPattern>
+				<unitPattern count="two">{0} vikrogramm</unitPattern>
+				<unitPattern count="few">{0} mikrogramm</unitPattern>
+				<unitPattern count="many">{0} a vikrogrammoù</unitPattern>
+				<unitPattern count="other">{0} mikrogramm</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tonennoù</displayName>
@@ -4534,6 +6775,32 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} a donennoù</unitPattern>
 				<unitPattern count="other">{0} tonenn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>lurioù</displayName>
+				<unitPattern count="one">{0} lur</unitPattern>
+				<unitPattern count="two">{0} lur</unitPattern>
+				<unitPattern count="few">{0} lur</unitPattern>
+				<unitPattern count="many">{0} a lurioù</unitPattern>
+				<unitPattern count="other">{0} lur</unitPattern>
+				<perUnitPattern>{0} dre lur</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oñsoù</displayName>
+				<unitPattern count="one">{0} oñs</unitPattern>
+				<unitPattern count="two">{0} oñs</unitPattern>
+				<unitPattern count="few">{0} oñs</unitPattern>
+				<unitPattern count="many">{0} a oñsoù</unitPattern>
+				<unitPattern count="other">{0} oñs</unitPattern>
+				<perUnitPattern>{0} dre oñs</perUnitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karatoù</displayName>
+				<unitPattern count="one">{0} c'harat</unitPattern>
+				<unitPattern count="two">{0} garat</unitPattern>
+				<unitPattern count="few">{0} c'harat</unitPattern>
+				<unitPattern count="many">{0} a garatoù</unitPattern>
+				<unitPattern count="other">{0} karat</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigawattoù</displayName>
 				<unitPattern count="one">{0} gigawatt</unitPattern>
@@ -4542,14 +6809,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} a c'higawattoù</unitPattern>
 				<unitPattern count="other">{0} gigawatt</unitPattern>
 			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilowattoù</displayName>
-				<unitPattern count="one">{0} c'hilowatt</unitPattern>
-				<unitPattern count="two">{0} gilowatt</unitPattern>
-				<unitPattern count="few">{0} c'hilowatt</unitPattern>
-				<unitPattern count="many">{0} a gilowattoù</unitPattern>
-				<unitPattern count="other">{0} kilowatt</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>megawattoù</displayName>
 				<unitPattern count="one">{0} megawatt</unitPattern>
@@ -4558,13 +6817,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} a vegawattoù</unitPattern>
 				<unitPattern count="other">{0} megawatt</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>miliwattoù</displayName>
-				<unitPattern count="one">{0} miliwatt</unitPattern>
-				<unitPattern count="two">{0} viliwatt</unitPattern>
-				<unitPattern count="few">{0} miliwatt</unitPattern>
-				<unitPattern count="many">{0} a viliwattoù</unitPattern>
-				<unitPattern count="other">{0} miliwatt</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilowattoù</displayName>
+				<unitPattern count="one">{0} c'hilowatt</unitPattern>
+				<unitPattern count="two">{0} gilowatt</unitPattern>
+				<unitPattern count="few">{0} c'hilowatt</unitPattern>
+				<unitPattern count="many">{0} a gilowattoù</unitPattern>
+				<unitPattern count="other">{0} kilowatt</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>wattoù</displayName>
@@ -4574,6 +6833,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} a wattoù</unitPattern>
 				<unitPattern count="other">{0} watt</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>miliwattoù</displayName>
+				<unitPattern count="one">{0} miliwatt</unitPattern>
+				<unitPattern count="two">{0} viliwatt</unitPattern>
+				<unitPattern count="few">{0} miliwatt</unitPattern>
+				<unitPattern count="many">{0} a viliwattoù</unitPattern>
+				<unitPattern count="other">{0} miliwatt</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>marcʼhadoù nerzh</displayName>
+				<unitPattern count="one">{0} marc'had nerzh</unitPattern>
+				<unitPattern count="two">{0} varc'had nerzh</unitPattern>
+				<unitPattern count="few">{0} marc'had nerzh</unitPattern>
+				<unitPattern count="many">{0} a varc'hadoù nerzh</unitPattern>
+				<unitPattern count="other">{0} marc'had nerzh</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hektopaskaloù</displayName>
 				<unitPattern count="one">{0} hektopaskal</unitPattern>
@@ -4582,6 +6857,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} a hektopaskaloù</unitPattern>
 				<unitPattern count="other">{0} hektopaskal</unitPattern>
 			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>lurioù dre veutad karrez</displayName>
+				<unitPattern count="one">{0} lur dre veutad karrez</unitPattern>
+				<unitPattern count="two">{0} lur dre veutad karrez</unitPattern>
+				<unitPattern count="few">{0} lur dre veutad karrez</unitPattern>
+				<unitPattern count="many">{0} a lurioù dre veutad karrez</unitPattern>
+				<unitPattern count="other">{0} lur dre veutad karrez</unitPattern>
+			</unit>
 			<unit type="pressure-millibar">
 				<displayName>milibaroù</displayName>
 				<unitPattern count="one">{0} milibar</unitPattern>
@@ -4590,13 +6873,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} a vilibaroù</unitPattern>
 				<unitPattern count="other">{0} milibar</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karatoù</displayName>
-				<unitPattern count="one">{0} c'harat</unitPattern>
-				<unitPattern count="two">{0} garat</unitPattern>
-				<unitPattern count="few">{0} c'harat</unitPattern>
-				<unitPattern count="many">{0} a garatoù</unitPattern>
-				<unitPattern count="other">{0} karat</unitPattern>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>kilometroù dre eur</displayName>
+				<unitPattern count="one">{0} c'hilometr dre eur</unitPattern>
+				<unitPattern count="two">{0} gilometr dre eur</unitPattern>
+				<unitPattern count="few">{0} c'hilometr dre eur</unitPattern>
+				<unitPattern count="many">{0} a gilometroù dre eur</unitPattern>
+				<unitPattern count="other">{0} kilometr dre eur</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
 				<displayName>metroù dre eilenn</displayName>
@@ -4606,6 +6889,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} a vetroù dre eilenn</unitPattern>
 				<unitPattern count="other">{0} metr dre eilenn</unitPattern>
 			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>miltirioù dre eur</displayName>
+				<unitPattern count="one">{0} miltir dre eur</unitPattern>
+				<unitPattern count="two">{0} viltir dre eur</unitPattern>
+				<unitPattern count="few">{0} miltir dre eur</unitPattern>
+				<unitPattern count="many">{0} a viltirioù dre eur</unitPattern>
+				<unitPattern count="other">{0} miltir dre eur</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>skoulmoù</displayName>
+				<unitPattern count="one">{0} skoulm</unitPattern>
+				<unitPattern count="two">{0} skoulm</unitPattern>
+				<unitPattern count="few">{0} skoulm</unitPattern>
+				<unitPattern count="many">{0} a skoulmoù</unitPattern>
+				<unitPattern count="other">{0} skoulm</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>derezioù</displayName>
+				<unitPattern count="one">{0} derez</unitPattern>
+				<unitPattern count="two">{0} zerez</unitPattern>
+				<unitPattern count="few">{0} derez</unitPattern>
+				<unitPattern count="many">{0} a zerezioù</unitPattern>
+				<unitPattern count="other">{0} derez</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>derezioù Celsius</displayName>
 				<unitPattern count="one">{0} derez Celsius</unitPattern>
@@ -4624,22 +6931,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="temperature-kelvin">
 				<displayName>kelvinoù</displayName>
+				<unitPattern count="one">{0} c'helvin</unitPattern>
+				<unitPattern count="two">{0} gelvin</unitPattern>
+				<unitPattern count="few">{0} c'helvin</unitPattern>
+				<unitPattern count="many">{0} a gelvinoù</unitPattern>
+				<unitPattern count="other">{0} kelvin</unitPattern>
 			</unit>
-			<unit type="volume-bushel">
-				<displayName>poezelladoù</displayName>
-				<unitPattern count="one">{0} poezellad</unitPattern>
-				<unitPattern count="two">{0} boezellad</unitPattern>
-				<unitPattern count="few">{0} foezellad</unitPattern>
-				<unitPattern count="many">{0} a boezelladoù</unitPattern>
-				<unitPattern count="other">{0} poezellad</unitPattern>
+			<unit type="volume-cubic-kilometer">
+				<displayName>kilometroù diñs</displayName>
+				<unitPattern count="one">{0} c'hilometr diñs</unitPattern>
+				<unitPattern count="two">{0} gilometr diñs</unitPattern>
+				<unitPattern count="few">{0} c'hilometr diñs</unitPattern>
+				<unitPattern count="many">{0} a gilometroù diñs</unitPattern>
+				<unitPattern count="other">{0} kilometr diñs</unitPattern>
 			</unit>
-			<unit type="volume-centiliter">
-				<displayName>kentilitroù</displayName>
-				<unitPattern count="one">{0} c'hentilitr</unitPattern>
-				<unitPattern count="two">{0} gentilitr</unitPattern>
-				<unitPattern count="few">{0} c'hentilitr</unitPattern>
-				<unitPattern count="many">{0} a gentilitroù</unitPattern>
-				<unitPattern count="other">{0} kentilitr</unitPattern>
+			<unit type="volume-cubic-meter">
+				<displayName>metroù diñs</displayName>
+				<unitPattern count="one">{0} metr diñs</unitPattern>
+				<unitPattern count="two">{0} vetr diñs</unitPattern>
+				<unitPattern count="few">{0} metr diñs</unitPattern>
+				<unitPattern count="many">{0} a vetroù diñs</unitPattern>
+				<unitPattern count="other">{0} metr diñs</unitPattern>
+				<perUnitPattern>{0} dre vetr diñs</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-centimeter">
 				<displayName>kentimetroù diñs</displayName>
@@ -4648,6 +6961,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} c'hentimetr diñs</unitPattern>
 				<unitPattern count="many">{0} a gentimetroù diñs</unitPattern>
 				<unitPattern count="other">{0} kentimetr diñs</unitPattern>
+				<perUnitPattern>{0} dre gentimetr diñs</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>miltirioù diñs</displayName>
+				<unitPattern count="one">{0} miltir diñs</unitPattern>
+				<unitPattern count="two">{0} viltir diñs</unitPattern>
+				<unitPattern count="few">{0} miltir diñs</unitPattern>
+				<unitPattern count="many">{0} a viltirioù diñs</unitPattern>
+				<unitPattern count="other">{0} miltir diñs</unitPattern>
 			</unit>
 			<unit type="volume-cubic-foot">
 				<displayName>troatadoù diñs</displayName>
@@ -4665,45 +6987,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} a veutadoù diñs</unitPattern>
 				<unitPattern count="other">{0} meutad diñs</unitPattern>
 			</unit>
-			<unit type="volume-cubic-kilometer">
-				<displayName>kilometroù diñs</displayName>
-				<unitPattern count="one">{0} c'hilometr diñs</unitPattern>
-				<unitPattern count="two">{0} gilometr diñs</unitPattern>
-				<unitPattern count="few">{0} c'hilometr diñs</unitPattern>
-				<unitPattern count="many">{0} a gilometroù diñs</unitPattern>
-				<unitPattern count="other">{0} kilometr diñs</unitPattern>
-			</unit>
-			<unit type="volume-cubic-meter">
-				<displayName>metroù diñs</displayName>
-				<unitPattern count="one">{0} metr diñs</unitPattern>
-				<unitPattern count="two">{0} vetr diñs</unitPattern>
-				<unitPattern count="few">{0} metr diñs</unitPattern>
-				<unitPattern count="many">{0} a vetroù diñs</unitPattern>
-				<unitPattern count="other">{0} metr diñs</unitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<displayName>miltirioù diñs</displayName>
-				<unitPattern count="one">{0} miltir diñs</unitPattern>
-				<unitPattern count="two">{0} viltir diñs</unitPattern>
-				<unitPattern count="few">{0} miltir diñs</unitPattern>
-				<unitPattern count="many">{0} a viltirioù diñs</unitPattern>
-				<unitPattern count="other">{0} miltir diñs</unitPattern>
-			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dekilitroù</displayName>
-				<unitPattern count="one">{0} dekilitr</unitPattern>
-				<unitPattern count="two">{0} zekilitr</unitPattern>
-				<unitPattern count="few">{0} dekilitr</unitPattern>
-				<unitPattern count="many">{0} a zekilitroù</unitPattern>
-				<unitPattern count="other">{0} dekilitr</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gallonoù</displayName>
-				<unitPattern count="one">{0} gallon</unitPattern>
-				<unitPattern count="two">{0} c'hallon</unitPattern>
-				<unitPattern count="few">{0} gallon</unitPattern>
-				<unitPattern count="many">{0} a c'hallonoù</unitPattern>
-				<unitPattern count="other">{0} gallon</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megalitroù</displayName>
+				<unitPattern count="one">{0} megalitr</unitPattern>
+				<unitPattern count="two">{0} vegalitr</unitPattern>
+				<unitPattern count="few">{0} megalitr</unitPattern>
+				<unitPattern count="many">{0} a vegalitroù</unitPattern>
+				<unitPattern count="other">{0} megalitr</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hektolitroù</displayName>
@@ -4720,14 +7010,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} litr</unitPattern>
 				<unitPattern count="many">{0} a litroù</unitPattern>
 				<unitPattern count="other">{0} litr</unitPattern>
+				<perUnitPattern>{0} dre litr</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalitroù</displayName>
-				<unitPattern count="one">{0} megalitr</unitPattern>
-				<unitPattern count="two">{0} vegalitr</unitPattern>
-				<unitPattern count="few">{0} megalitr</unitPattern>
-				<unitPattern count="many">{0} a vegalitroù</unitPattern>
-				<unitPattern count="other">{0} megalitr</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dekilitroù</displayName>
+				<unitPattern count="one">{0} dekilitr</unitPattern>
+				<unitPattern count="two">{0} zekilitr</unitPattern>
+				<unitPattern count="few">{0} dekilitr</unitPattern>
+				<unitPattern count="many">{0} a zekilitroù</unitPattern>
+				<unitPattern count="other">{0} dekilitr</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>kentilitroù</displayName>
+				<unitPattern count="one">{0} c'hentilitr</unitPattern>
+				<unitPattern count="two">{0} gentilitr</unitPattern>
+				<unitPattern count="few">{0} c'hentilitr</unitPattern>
+				<unitPattern count="many">{0} a gentilitroù</unitPattern>
+				<unitPattern count="other">{0} kentilitr</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mililitroù</displayName>
@@ -4737,6 +7036,39 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} a vililitroù</unitPattern>
 				<unitPattern count="other">{0} mililitr</unitPattern>
 			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>pintoù metrek</displayName>
+				<unitPattern count="one">{0} pint metrek</unitPattern>
+				<unitPattern count="two">{0} bint metrek</unitPattern>
+				<unitPattern count="few">{0} fint metrek</unitPattern>
+				<unitPattern count="many">{0} a bintoù metrek</unitPattern>
+				<unitPattern count="other">{0} pint metrek</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>poezelladoù</displayName>
+				<unitPattern count="one">{0} poezellad</unitPattern>
+				<unitPattern count="two">{0} boezellad</unitPattern>
+				<unitPattern count="few">{0} foezellad</unitPattern>
+				<unitPattern count="many">{0} a boezelladoù</unitPattern>
+				<unitPattern count="other">{0} poezellad</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gallonoù</displayName>
+				<unitPattern count="one">{0} gallon</unitPattern>
+				<unitPattern count="two">{0} c'hallon</unitPattern>
+				<unitPattern count="few">{0} gallon</unitPattern>
+				<unitPattern count="many">{0} a c'hallonoù</unitPattern>
+				<unitPattern count="other">{0} gallon</unitPattern>
+				<perUnitPattern>{0} dre cʼhallon</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>kardoù</displayName>
+				<unitPattern count="one">{0} c'hard</unitPattern>
+				<unitPattern count="two">{0} gard</unitPattern>
+				<unitPattern count="few">{0} c'hard</unitPattern>
+				<unitPattern count="many">{0} a gardoù</unitPattern>
+				<unitPattern count="other">{0} kard</unitPattern>
+			</unit>
 			<unit type="volume-pint">
 				<displayName>pintoù</displayName>
 				<unitPattern count="one">{0} pint</unitPattern>
@@ -4745,8 +7077,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} a bintoù</unitPattern>
 				<unitPattern count="other">{0} pint</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} Reter</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} Norzh</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} Su</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} Kornôg</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+			</compoundUnit>
 			<unit type="acceleration-meter-per-second-squared">
 				<displayName>m/s²</displayName>
 				<unitPattern count="one">{0} m/s²</unitPattern>
@@ -4755,9 +7096,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>°</displayName>
-			</unit>
 			<unit type="angle-radian">
 				<displayName>rad</displayName>
 				<unitPattern count="one">{0} rad</unitPattern>
@@ -4766,13 +7104,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} rad</unitPattern>
 				<unitPattern count="other">{0} rad</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName>ac</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="two">{0} ac</unitPattern>
-				<unitPattern count="few">{0} ac</unitPattern>
-				<unitPattern count="many">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="angle-degree">
+				<displayName>deg</displayName>
+				<unitPattern count="one">{0} deg</unitPattern>
+				<unitPattern count="two">{0} deg</unitPattern>
+				<unitPattern count="few">{0} deg</unitPattern>
+				<unitPattern count="many">{0} deg</unitPattern>
+				<unitPattern count="other">{0} deg</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="two">{0} km²</unitPattern>
+				<unitPattern count="few">{0} km²</unitPattern>
+				<unitPattern count="many">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ha</displayName>
@@ -4782,6 +7128,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="two">{0} m²</unitPattern>
+				<unitPattern count="few">{0} m²</unitPattern>
+				<unitPattern count="many">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
@@ -4789,6 +7144,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} cm²</unitPattern>
 				<unitPattern count="many">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="two">{0} mi²</unitPattern>
+				<unitPattern count="few">{0} mi²</unitPattern>
+				<unitPattern count="many">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ac</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="two">{0} ac</unitPattern>
+				<unitPattern count="few">{0} ac</unitPattern>
+				<unitPattern count="many">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ft²</displayName>
@@ -4805,30 +7177,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} in²</unitPattern>
 				<unitPattern count="many">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="two">{0} km²</unitPattern>
-				<unitPattern count="few">{0} km²</unitPattern>
-				<unitPattern count="many">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="two">{0} m²</unitPattern>
-				<unitPattern count="few">{0} m²</unitPattern>
-				<unitPattern count="many">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="two">{0} mi²</unitPattern>
-				<unitPattern count="few">{0} mi²</unitPattern>
-				<unitPattern count="many">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="two">{0} kt</unitPattern>
+				<unitPattern count="few">{0} kt</unitPattern>
+				<unitPattern count="many">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
@@ -4838,77 +7195,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} l/km</unitPattern>
 				<unitPattern count="other">{0} l/km</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="two">{0} bit</unitPattern>
-				<unitPattern count="few">{0} bit</unitPattern>
-				<unitPattern count="many">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100km</displayName>
+				<unitPattern count="one">{0} l/100km</unitPattern>
+				<unitPattern count="two">{0} l/100km</unitPattern>
+				<unitPattern count="few">{0} l/100km</unitPattern>
+				<unitPattern count="many">{0} l/100km</unitPattern>
+				<unitPattern count="other">{0} l/100km</unitPattern>
 			</unit>
-			<unit type="digital-byte">
-				<displayName>o</displayName>
-				<unitPattern count="one">{0} o</unitPattern>
-				<unitPattern count="two">{0} o</unitPattern>
-				<unitPattern count="few">{0} o</unitPattern>
-				<unitPattern count="many">{0} o</unitPattern>
-				<unitPattern count="other">{0} o</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="two">{0} Gb</unitPattern>
-				<unitPattern count="few">{0} Gb</unitPattern>
-				<unitPattern count="many">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>Go</displayName>
-				<unitPattern count="one">{0} Go</unitPattern>
-				<unitPattern count="two">{0} Go</unitPattern>
-				<unitPattern count="few">{0} Go</unitPattern>
-				<unitPattern count="many">{0} Go</unitPattern>
-				<unitPattern count="other">{0} Go</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="two">{0} kb</unitPattern>
-				<unitPattern count="few">{0} kb</unitPattern>
-				<unitPattern count="many">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>ko</displayName>
-				<unitPattern count="one">{0} ko</unitPattern>
-				<unitPattern count="two">{0} ko</unitPattern>
-				<unitPattern count="few">{0} ko</unitPattern>
-				<unitPattern count="many">{0} ko</unitPattern>
-				<unitPattern count="other">{0} ko</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="two">{0} Mb</unitPattern>
-				<unitPattern count="few">{0} Mb</unitPattern>
-				<unitPattern count="many">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>Mo</displayName>
-				<unitPattern count="one">{0} Mo</unitPattern>
-				<unitPattern count="two">{0} Mo</unitPattern>
-				<unitPattern count="few">{0} Mo</unitPattern>
-				<unitPattern count="many">{0} Mo</unitPattern>
-				<unitPattern count="other">{0} Mo</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="two">{0} Tb</unitPattern>
-				<unitPattern count="few">{0} Tb</unitPattern>
-				<unitPattern count="many">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>mi/gal</displayName>
+				<unitPattern count="one">{0} mi/gal</unitPattern>
+				<unitPattern count="two">{0} mi/gal</unitPattern>
+				<unitPattern count="few">{0} mi/gal</unitPattern>
+				<unitPattern count="many">{0} mi/gal</unitPattern>
+				<unitPattern count="other">{0} mi/gal</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
 				<displayName>To</displayName>
@@ -4918,6 +7219,95 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} To</unitPattern>
 				<unitPattern count="other">{0} To</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tbit</displayName>
+				<unitPattern count="one">{0} Tbit</unitPattern>
+				<unitPattern count="two">{0} Tbit</unitPattern>
+				<unitPattern count="few">{0} Tbit</unitPattern>
+				<unitPattern count="many">{0} Tbit</unitPattern>
+				<unitPattern count="other">{0} Tbit</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>Go</displayName>
+				<unitPattern count="one">{0} Go</unitPattern>
+				<unitPattern count="two">{0} Go</unitPattern>
+				<unitPattern count="few">{0} Go</unitPattern>
+				<unitPattern count="many">{0} Go</unitPattern>
+				<unitPattern count="other">{0} Go</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gbit</displayName>
+				<unitPattern count="one">{0} Gbit</unitPattern>
+				<unitPattern count="two">{0} Gbit</unitPattern>
+				<unitPattern count="few">{0} Gbit</unitPattern>
+				<unitPattern count="many">{0} Gbit</unitPattern>
+				<unitPattern count="other">{0} Gbit</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>Mo</displayName>
+				<unitPattern count="one">{0} Mo</unitPattern>
+				<unitPattern count="two">{0} Mo</unitPattern>
+				<unitPattern count="few">{0} Mo</unitPattern>
+				<unitPattern count="many">{0} Mo</unitPattern>
+				<unitPattern count="other">{0} Mo</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mbit</displayName>
+				<unitPattern count="one">{0} Mbit</unitPattern>
+				<unitPattern count="two">{0} Mbit</unitPattern>
+				<unitPattern count="few">{0} Mbit</unitPattern>
+				<unitPattern count="many">{0} Mbit</unitPattern>
+				<unitPattern count="other">{0} Mbit</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>ko</displayName>
+				<unitPattern count="one">{0} ko</unitPattern>
+				<unitPattern count="two">{0} ko</unitPattern>
+				<unitPattern count="few">{0} ko</unitPattern>
+				<unitPattern count="many">{0} ko</unitPattern>
+				<unitPattern count="other">{0} ko</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kbit</displayName>
+				<unitPattern count="one">{0} kbit</unitPattern>
+				<unitPattern count="two">{0} kbit</unitPattern>
+				<unitPattern count="few">{0} kbit</unitPattern>
+				<unitPattern count="many">{0} kbit</unitPattern>
+				<unitPattern count="other">{0} kbit</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>o</displayName>
+				<unitPattern count="one">{0} o</unitPattern>
+				<unitPattern count="two">{0} o</unitPattern>
+				<unitPattern count="few">{0} o</unitPattern>
+				<unitPattern count="many">{0} o</unitPattern>
+				<unitPattern count="other">{0} o</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="two">{0} bit</unitPattern>
+				<unitPattern count="few">{0} bit</unitPattern>
+				<unitPattern count="many">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>kved</displayName>
+				<unitPattern count="one">{0} kved</unitPattern>
+				<unitPattern count="two">{0} kved</unitPattern>
+				<unitPattern count="few">{0} kved</unitPattern>
+				<unitPattern count="many">{0} kved</unitPattern>
+				<unitPattern count="other">{0} kved</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>bl.</displayName>
+				<unitPattern count="one">{0} bl.</unitPattern>
+				<unitPattern count="two">{0} bl.</unitPattern>
+				<unitPattern count="few">{0} bl.</unitPattern>
+				<unitPattern count="many">{0} bl.</unitPattern>
+				<unitPattern count="other">{0} bl.</unitPattern>
+				<perUnitPattern>{0}/bl.</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>d</displayName>
 				<unitPattern count="one">{0} d</unitPattern>
@@ -4925,6 +7315,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} d</unitPattern>
 				<unitPattern count="many">{0} d</unitPattern>
 				<unitPattern count="other">{0} d</unitPattern>
+				<perUnitPattern>{0}/d</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>h</displayName>
@@ -4935,22 +7326,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} h</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="two">{0} μs</unitPattern>
-				<unitPattern count="few">{0} μs</unitPattern>
-				<unitPattern count="many">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="two">{0} ms</unitPattern>
-				<unitPattern count="few">{0} ms</unitPattern>
-				<unitPattern count="many">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
@@ -4958,14 +7333,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} min</unitPattern>
 				<unitPattern count="many">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="two">{0} ns</unitPattern>
-				<unitPattern count="few">{0} ns</unitPattern>
-				<unitPattern count="many">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>s</displayName>
@@ -4976,6 +7344,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} s</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="two">{0} ms</unitPattern>
+				<unitPattern count="few">{0} ms</unitPattern>
+				<unitPattern count="many">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="two">{0} μs</unitPattern>
+				<unitPattern count="few">{0} μs</unitPattern>
+				<unitPattern count="many">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="two">{0} ns</unitPattern>
+				<unitPattern count="few">{0} ns</unitPattern>
+				<unitPattern count="many">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
+			</unit>
 			<unit type="electric-ampere">
 				<displayName>A</displayName>
 				<unitPattern count="one">{0} A</unitPattern>
@@ -5008,22 +7400,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
-			<unit type="energy-calorie">
-				<displayName>cal</displayName>
-				<unitPattern count="one">{0} cal</unitPattern>
-				<unitPattern count="two">{0} cal</unitPattern>
-				<unitPattern count="few">{0} cal</unitPattern>
-				<unitPattern count="many">{0} cal</unitPattern>
-				<unitPattern count="other">{0} cal</unitPattern>
-			</unit>
-			<unit type="energy-joule">
-				<displayName>J</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="two">{0} J</unitPattern>
-				<unitPattern count="few">{0} J</unitPattern>
-				<unitPattern count="many">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
 			<unit type="energy-kilocalorie">
 				<displayName>kcal</displayName>
 				<unitPattern count="one">{0} kcal</unitPattern>
@@ -5032,6 +7408,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kcal</unitPattern>
 				<unitPattern count="other">{0} kcal</unitPattern>
 			</unit>
+			<unit type="energy-calorie">
+				<displayName>cal</displayName>
+				<unitPattern count="one">{0} cal</unitPattern>
+				<unitPattern count="two">{0} cal</unitPattern>
+				<unitPattern count="few">{0} cal</unitPattern>
+				<unitPattern count="many">{0} cal</unitPattern>
+				<unitPattern count="other">{0} cal</unitPattern>
+			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
@@ -5040,6 +7424,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="two">{0} J</unitPattern>
+				<unitPattern count="few">{0} J</unitPattern>
+				<unitPattern count="many">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -5056,13 +7448,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="two">{0} Hz</unitPattern>
-				<unitPattern count="few">{0} Hz</unitPattern>
-				<unitPattern count="many">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="two">{0} MHz</unitPattern>
+				<unitPattern count="few">{0} MHz</unitPattern>
+				<unitPattern count="many">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
@@ -5072,21 +7464,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="two">{0} MHz</unitPattern>
-				<unitPattern count="few">{0} MHz</unitPattern>
-				<unitPattern count="many">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="two">{0} Hz</unitPattern>
+				<unitPattern count="few">{0} Hz</unitPattern>
+				<unitPattern count="many">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="two">{0} cm</unitPattern>
-				<unitPattern count="few">{0} cm</unitPattern>
-				<unitPattern count="many">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="two">{0} km</unitPattern>
+				<unitPattern count="few">{0} km</unitPattern>
+				<unitPattern count="many">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="two">{0} m</unitPattern>
+				<unitPattern count="few">{0} m</unitPattern>
+				<unitPattern count="many">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
@@ -5096,53 +7498,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ft</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="two">{0} ft</unitPattern>
-				<unitPattern count="few">{0} ft</unitPattern>
-				<unitPattern count="many">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>in</displayName>
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="two">{0} in</unitPattern>
-				<unitPattern count="few">{0} in</unitPattern>
-				<unitPattern count="many">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="two">{0} km</unitPattern>
-				<unitPattern count="few">{0} km</unitPattern>
-				<unitPattern count="many">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="two">{0} m</unitPattern>
-				<unitPattern count="few">{0} m</unitPattern>
-				<unitPattern count="many">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="two">{0} µm</unitPattern>
-				<unitPattern count="few">{0} µm</unitPattern>
-				<unitPattern count="many">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mi</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="two">{0} mi</unitPattern>
-				<unitPattern count="few">{0} mi</unitPattern>
-				<unitPattern count="many">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="two">{0} cm</unitPattern>
+				<unitPattern count="few">{0} cm</unitPattern>
+				<unitPattern count="many">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -5152,6 +7515,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="two">{0} µm</unitPattern>
+				<unitPattern count="few">{0} µm</unitPattern>
+				<unitPattern count="many">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
@@ -5160,22 +7531,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="two">{0} nmi</unitPattern>
-				<unitPattern count="few">{0} nmi</unitPattern>
-				<unitPattern count="many">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="two">{0} pc</unitPattern>
-				<unitPattern count="few">{0} pc</unitPattern>
-				<unitPattern count="many">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
@@ -5184,6 +7539,75 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="two">{0} mi</unitPattern>
+				<unitPattern count="few">{0} mi</unitPattern>
+				<unitPattern count="many">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>ft</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="two">{0} ft</unitPattern>
+				<unitPattern count="few">{0} ft</unitPattern>
+				<unitPattern count="many">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>in</displayName>
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="two">{0} in</unitPattern>
+				<unitPattern count="few">{0} in</unitPattern>
+				<unitPattern count="many">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="two">{0} pc</unitPattern>
+				<unitPattern count="few">{0} pc</unitPattern>
+				<unitPattern count="many">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ly</displayName>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="two">{0} au</unitPattern>
+				<unitPattern count="few">{0} au</unitPattern>
+				<unitPattern count="many">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>fm</displayName>
+				<unitPattern count="one">{0} fm</unitPattern>
+				<unitPattern count="two">{0} fm</unitPattern>
+				<unitPattern count="few">{0} fm</unitPattern>
+				<unitPattern count="many">{0} fm</unitPattern>
+				<unitPattern count="other">{0} fm</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="two">{0} nmi</unitPattern>
+				<unitPattern count="few">{0} nmi</unitPattern>
+				<unitPattern count="many">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="two">{0} smi</unitPattern>
+				<unitPattern count="few">{0} smi</unitPattern>
+				<unitPattern count="many">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
@@ -5192,30 +7616,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>CD</displayName>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="two">{0} CD</unitPattern>
-				<unitPattern count="few">{0} CD</unitPattern>
-				<unitPattern count="many">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="two">{0} g</unitPattern>
-				<unitPattern count="few">{0} g</unitPattern>
-				<unitPattern count="many">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="two">{0} kg</unitPattern>
-				<unitPattern count="few">{0} kg</unitPattern>
-				<unitPattern count="many">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
@@ -5224,13 +7624,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="two">{0} µg</unitPattern>
-				<unitPattern count="few">{0} µg</unitPattern>
-				<unitPattern count="many">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="two">{0} kg</unitPattern>
+				<unitPattern count="few">{0} kg</unitPattern>
+				<unitPattern count="many">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="two">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="many">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
@@ -5240,29 +7650,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="two">{0} oz</unitPattern>
-				<unitPattern count="few">{0} oz</unitPattern>
-				<unitPattern count="many">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="two">{0} oz t</unitPattern>
-				<unitPattern count="few">{0} oz t</unitPattern>
-				<unitPattern count="many">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="two">{0} lb</unitPattern>
-				<unitPattern count="few">{0} lb</unitPattern>
-				<unitPattern count="many">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="two">{0} µg</unitPattern>
+				<unitPattern count="few">{0} µg</unitPattern>
+				<unitPattern count="many">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tn</displayName>
@@ -5272,6 +7666,40 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} tn</unitPattern>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="two">{0} lb</unitPattern>
+				<unitPattern count="few">{0} lb</unitPattern>
+				<unitPattern count="many">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="two">{0} oz</unitPattern>
+				<unitPattern count="few">{0} oz</unitPattern>
+				<unitPattern count="many">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="two">{0} oz t</unitPattern>
+				<unitPattern count="few">{0} oz t</unitPattern>
+				<unitPattern count="many">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>CD</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="two">{0} CD</unitPattern>
+				<unitPattern count="few">{0} CD</unitPattern>
+				<unitPattern count="many">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
@@ -5280,14 +7708,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="two">{0} kW</unitPattern>
-				<unitPattern count="few">{0} kW</unitPattern>
-				<unitPattern count="many">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
@@ -5296,13 +7716,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="two">{0} mW</unitPattern>
-				<unitPattern count="few">{0} mW</unitPattern>
-				<unitPattern count="many">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="two">{0} kW</unitPattern>
+				<unitPattern count="few">{0} kW</unitPattern>
+				<unitPattern count="many">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>W</displayName>
@@ -5312,6 +7732,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="two">{0} mW</unitPattern>
+				<unitPattern count="few">{0} mW</unitPattern>
+				<unitPattern count="many">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="two">{0} hp</unitPattern>
+				<unitPattern count="few">{0} hp</unitPattern>
+				<unitPattern count="many">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
@@ -5320,6 +7756,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>mmHg</displayName>
+				<unitPattern count="one">{0} mmHg</unitPattern>
+				<unitPattern count="two">{0} mmHg</unitPattern>
+				<unitPattern count="few">{0} mmHg</unitPattern>
+				<unitPattern count="many">{0} mmHg</unitPattern>
+				<unitPattern count="other">{0} mmHg</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>lb/in²</displayName>
+				<unitPattern count="one">{0} lb/in²</unitPattern>
+				<unitPattern count="two">{0} lb/in²</unitPattern>
+				<unitPattern count="few">{0} lb/in²</unitPattern>
+				<unitPattern count="many">{0} lb/in²</unitPattern>
+				<unitPattern count="other">{0} lb/in²</unitPattern>
+			</unit>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="two">{0} inHg</unitPattern>
+				<unitPattern count="few">{0} inHg</unitPattern>
+				<unitPattern count="many">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
 			<unit type="pressure-millibar">
 				<displayName>mbar</displayName>
 				<unitPattern count="one">{0} mbar</unitPattern>
@@ -5328,14 +7788,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mbar</unitPattern>
 				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="two">{0} kt</unitPattern>
-				<unitPattern count="few">{0} kt</unitPattern>
-				<unitPattern count="many">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
-			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
 				<unitPattern count="one">{0} km/h</unitPattern>
@@ -5360,6 +7812,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>nd</displayName>
+				<unitPattern count="one">{0} nd</unitPattern>
+				<unitPattern count="two">{0} nd</unitPattern>
+				<unitPattern count="few">{0} nd</unitPattern>
+				<unitPattern count="many">{0} nd</unitPattern>
+				<unitPattern count="other">{0} nd</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="two">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -5384,13 +7852,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="two">{0} cl</unitPattern>
-				<unitPattern count="few">{0} cl</unitPattern>
-				<unitPattern count="many">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
+			<unit type="volume-cubic-kilometer">
+				<displayName>km³</displayName>
+				<unitPattern count="one">{0} km³</unitPattern>
+				<unitPattern count="two">{0} km³</unitPattern>
+				<unitPattern count="few">{0} km³</unitPattern>
+				<unitPattern count="many">{0} km³</unitPattern>
+				<unitPattern count="other">{0} km³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>m³</displayName>
+				<unitPattern count="one">{0} m³</unitPattern>
+				<unitPattern count="two">{0} m³</unitPattern>
+				<unitPattern count="few">{0} m³</unitPattern>
+				<unitPattern count="many">{0} m³</unitPattern>
+				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-centimeter">
 				<displayName>cm³</displayName>
@@ -5399,6 +7876,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} cm³</unitPattern>
 				<unitPattern count="many">{0} cm³</unitPattern>
 				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>mi³</displayName>
+				<unitPattern count="one">{0} mi³</unitPattern>
+				<unitPattern count="two">{0} mi³</unitPattern>
+				<unitPattern count="few">{0} mi³</unitPattern>
+				<unitPattern count="many">{0} mi³</unitPattern>
+				<unitPattern count="other">{0} mi³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-foot">
 				<displayName>ft³</displayName>
@@ -5416,45 +7902,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} in³</unitPattern>
 				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-cubic-kilometer">
-				<displayName>km³</displayName>
-				<unitPattern count="one">{0} km³</unitPattern>
-				<unitPattern count="two">{0} km³</unitPattern>
-				<unitPattern count="few">{0} km³</unitPattern>
-				<unitPattern count="many">{0} km³</unitPattern>
-				<unitPattern count="other">{0} km³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-meter">
-				<displayName>m³</displayName>
-				<unitPattern count="one">{0} m³</unitPattern>
-				<unitPattern count="two">{0} m³</unitPattern>
-				<unitPattern count="few">{0} m³</unitPattern>
-				<unitPattern count="many">{0} m³</unitPattern>
-				<unitPattern count="other">{0} m³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<displayName>mi³</displayName>
-				<unitPattern count="one">{0} mi³</unitPattern>
-				<unitPattern count="two">{0} mi³</unitPattern>
-				<unitPattern count="few">{0} mi³</unitPattern>
-				<unitPattern count="many">{0} mi³</unitPattern>
-				<unitPattern count="other">{0} mi³</unitPattern>
-			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="two">{0} dl</unitPattern>
-				<unitPattern count="few">{0} dl</unitPattern>
-				<unitPattern count="many">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="two">{0} gal</unitPattern>
-				<unitPattern count="few">{0} gal</unitPattern>
-				<unitPattern count="many">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="two">{0} Ml</unitPattern>
+				<unitPattern count="few">{0} Ml</unitPattern>
+				<unitPattern count="many">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -5471,14 +7925,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} l</unitPattern>
 				<unitPattern count="many">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="one">{0} Ml</unitPattern>
-				<unitPattern count="two">{0} Ml</unitPattern>
-				<unitPattern count="few">{0} Ml</unitPattern>
-				<unitPattern count="many">{0} Ml</unitPattern>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="two">{0} dl</unitPattern>
+				<unitPattern count="few">{0} dl</unitPattern>
+				<unitPattern count="many">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="two">{0} cl</unitPattern>
+				<unitPattern count="few">{0} cl</unitPattern>
+				<unitPattern count="many">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
@@ -5488,6 +7951,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="two">{0} mpt</unitPattern>
+				<unitPattern count="few">{0} mpt</unitPattern>
+				<unitPattern count="many">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="two">{0} gal</unitPattern>
+				<unitPattern count="few">{0} gal</unitPattern>
+				<unitPattern count="many">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>qt</displayName>
+				<unitPattern count="one">{0} qt</unitPattern>
+				<unitPattern count="two">{0} qt</unitPattern>
+				<unitPattern count="few">{0} qt</unitPattern>
+				<unitPattern count="many">{0} qt</unitPattern>
+				<unitPattern count="other">{0} qt</unitPattern>
+			</unit>
 			<unit type="volume-pint">
 				<displayName>pt</displayName>
 				<unitPattern count="one">{0} pt</unitPattern>
@@ -5496,35 +7984,691 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} pt</unitPattern>
 				<unitPattern count="other">{0} pt</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} R</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} K</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="acceleration-meter-per-second-squared">
+				<displayName>m/s²</displayName>
+				<unitPattern count="one">{0} m/s²</unitPattern>
+				<unitPattern count="two">{0} m/s²</unitPattern>
+				<unitPattern count="few">{0} m/s²</unitPattern>
+				<unitPattern count="many">{0} m/s²</unitPattern>
+				<unitPattern count="other">{0} m/s²</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="two">{0} rad</unitPattern>
+				<unitPattern count="few">{0} rad</unitPattern>
+				<unitPattern count="many">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
 			<unit type="angle-degree">
+				<displayName>°</displayName>
 				<unitPattern count="one">{0}°</unitPattern>
 				<unitPattern count="two">{0}°</unitPattern>
 				<unitPattern count="few">{0}°</unitPattern>
 				<unitPattern count="many">{0}°</unitPattern>
 				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="two">{0} km²</unitPattern>
+				<unitPattern count="few">{0} km²</unitPattern>
+				<unitPattern count="many">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>ha</displayName>
+				<unitPattern count="one">{0} ha</unitPattern>
+				<unitPattern count="two">{0} ha</unitPattern>
+				<unitPattern count="few">{0} ha</unitPattern>
+				<unitPattern count="many">{0} ha</unitPattern>
+				<unitPattern count="other">{0} ha</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="two">{0} m²</unitPattern>
+				<unitPattern count="few">{0} m²</unitPattern>
+				<unitPattern count="many">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>cm²</displayName>
+				<unitPattern count="one">{0} cm²</unitPattern>
+				<unitPattern count="two">{0} cm²</unitPattern>
+				<unitPattern count="few">{0} cm²</unitPattern>
+				<unitPattern count="many">{0} cm²</unitPattern>
+				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="two">{0} mi²</unitPattern>
+				<unitPattern count="few">{0} mi²</unitPattern>
+				<unitPattern count="many">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ac</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="two">{0} ac</unitPattern>
+				<unitPattern count="few">{0} ac</unitPattern>
+				<unitPattern count="many">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>ft²</displayName>
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="two">{0} ft²</unitPattern>
+				<unitPattern count="few">{0} ft²</unitPattern>
+				<unitPattern count="many">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>in²</displayName>
+				<unitPattern count="one">{0} in²</unitPattern>
+				<unitPattern count="two">{0} in²</unitPattern>
+				<unitPattern count="few">{0} in²</unitPattern>
+				<unitPattern count="many">{0} in²</unitPattern>
+				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="two">{0} kt</unitPattern>
+				<unitPattern count="few">{0} kt</unitPattern>
+				<unitPattern count="many">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>l/km</displayName>
+				<unitPattern count="one">{0} l/km</unitPattern>
+				<unitPattern count="two">{0} l/km</unitPattern>
+				<unitPattern count="few">{0} l/km</unitPattern>
+				<unitPattern count="many">{0} l/km</unitPattern>
+				<unitPattern count="other">{0} l/km</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100km</displayName>
+				<unitPattern count="one">{0} l/100km</unitPattern>
+				<unitPattern count="two">{0} l/100km</unitPattern>
+				<unitPattern count="few">{0} l/100km</unitPattern>
+				<unitPattern count="many">{0} l/100km</unitPattern>
+				<unitPattern count="other">{0} l/100km</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>mi/gal</displayName>
+				<unitPattern count="one">{0} mi/gal</unitPattern>
+				<unitPattern count="two">{0} mi/gal</unitPattern>
+				<unitPattern count="few">{0} mi/gal</unitPattern>
+				<unitPattern count="many">{0} mi/gal</unitPattern>
+				<unitPattern count="other">{0} mi/gal</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<displayName>To</displayName>
+				<unitPattern count="one">{0} To</unitPattern>
+				<unitPattern count="two">{0} To</unitPattern>
+				<unitPattern count="few">{0} To</unitPattern>
+				<unitPattern count="many">{0} To</unitPattern>
+				<unitPattern count="other">{0} To</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="two">{0} Tb</unitPattern>
+				<unitPattern count="few">{0} Tb</unitPattern>
+				<unitPattern count="many">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>Go</displayName>
+				<unitPattern count="one">{0} Go</unitPattern>
+				<unitPattern count="two">{0} Go</unitPattern>
+				<unitPattern count="few">{0} Go</unitPattern>
+				<unitPattern count="many">{0} Go</unitPattern>
+				<unitPattern count="other">{0} Go</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="two">{0} Gb</unitPattern>
+				<unitPattern count="few">{0} Gb</unitPattern>
+				<unitPattern count="many">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>Mo</displayName>
+				<unitPattern count="one">{0} Mo</unitPattern>
+				<unitPattern count="two">{0} Mo</unitPattern>
+				<unitPattern count="few">{0} Mo</unitPattern>
+				<unitPattern count="many">{0} Mo</unitPattern>
+				<unitPattern count="other">{0} Mo</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="two">{0} Mb</unitPattern>
+				<unitPattern count="few">{0} Mb</unitPattern>
+				<unitPattern count="many">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>ko</displayName>
+				<unitPattern count="one">{0} ko</unitPattern>
+				<unitPattern count="two">{0} ko</unitPattern>
+				<unitPattern count="few">{0} ko</unitPattern>
+				<unitPattern count="many">{0} ko</unitPattern>
+				<unitPattern count="other">{0} ko</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="two">{0} kb</unitPattern>
+				<unitPattern count="few">{0} kb</unitPattern>
+				<unitPattern count="many">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>o</displayName>
+				<unitPattern count="one">{0} o</unitPattern>
+				<unitPattern count="two">{0} o</unitPattern>
+				<unitPattern count="few">{0} o</unitPattern>
+				<unitPattern count="many">{0} o</unitPattern>
+				<unitPattern count="other">{0} o</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>b</displayName>
+				<unitPattern count="one">{0} b</unitPattern>
+				<unitPattern count="two">{0} b</unitPattern>
+				<unitPattern count="few">{0} b</unitPattern>
+				<unitPattern count="many">{0} b</unitPattern>
+				<unitPattern count="other">{0} b</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>b</displayName>
+				<unitPattern count="one">{0} b</unitPattern>
+				<unitPattern count="two">{0} b</unitPattern>
+				<unitPattern count="few">{0} b</unitPattern>
+				<unitPattern count="many">{0} b</unitPattern>
+				<unitPattern count="other">{0} b</unitPattern>
+				<perUnitPattern>{0}/b</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<perUnitPattern>{0}/d</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<perUnitPattern>{0}/min</perUnitPattern>
+			</unit>
 			<unit type="electric-ohm">
+				<displayName>Ω</displayName>
 				<unitPattern count="one">{0} Ω</unitPattern>
 				<unitPattern count="two">{0} Ω</unitPattern>
 				<unitPattern count="few">{0} Ω</unitPattern>
 				<unitPattern count="many">{0} Ω</unitPattern>
 				<unitPattern count="other">{0} Ω</unitPattern>
 			</unit>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="two">{0} km</unitPattern>
+				<unitPattern count="few">{0} km</unitPattern>
+				<unitPattern count="many">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="two">{0} m</unitPattern>
+				<unitPattern count="few">{0} m</unitPattern>
+				<unitPattern count="many">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>dm</displayName>
+				<unitPattern count="one">{0} dm</unitPattern>
+				<unitPattern count="two">{0} dm</unitPattern>
+				<unitPattern count="few">{0} dm</unitPattern>
+				<unitPattern count="many">{0} dm</unitPattern>
+				<unitPattern count="other">{0} dm</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="two">{0} cm</unitPattern>
+				<unitPattern count="few">{0} cm</unitPattern>
+				<unitPattern count="many">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>mm</displayName>
+				<unitPattern count="one">{0} mm</unitPattern>
+				<unitPattern count="two">{0} mm</unitPattern>
+				<unitPattern count="few">{0} mm</unitPattern>
+				<unitPattern count="many">{0} mm</unitPattern>
+				<unitPattern count="other">{0} mm</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="two">{0} µm</unitPattern>
+				<unitPattern count="few">{0} µm</unitPattern>
+				<unitPattern count="many">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nm</displayName>
+				<unitPattern count="one">{0} nm</unitPattern>
+				<unitPattern count="two">{0} nm</unitPattern>
+				<unitPattern count="few">{0} nm</unitPattern>
+				<unitPattern count="many">{0} nm</unitPattern>
+				<unitPattern count="other">{0} nm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>pm</displayName>
+				<unitPattern count="one">{0} pm</unitPattern>
+				<unitPattern count="two">{0} pm</unitPattern>
+				<unitPattern count="few">{0} pm</unitPattern>
+				<unitPattern count="many">{0} pm</unitPattern>
+				<unitPattern count="other">{0} pm</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="two">{0} mi</unitPattern>
+				<unitPattern count="few">{0} mi</unitPattern>
+				<unitPattern count="many">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-foot">
+				<displayName>′</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="two">{0}′</unitPattern>
 				<unitPattern count="few">{0}′</unitPattern>
 				<unitPattern count="many">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
+				<perUnitPattern>{0}/′</perUnitPattern>
 			</unit>
 			<unit type="length-inch">
+				<displayName>″</displayName>
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="two">{0}″</unitPattern>
 				<unitPattern count="few">{0}″</unitPattern>
 				<unitPattern count="many">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
+				<perUnitPattern>{0}/″</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="two">{0} pc</unitPattern>
+				<unitPattern count="few">{0} pc</unitPattern>
+				<unitPattern count="many">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="two">{0} au</unitPattern>
+				<unitPattern count="few">{0} au</unitPattern>
+				<unitPattern count="many">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>fm</displayName>
+				<unitPattern count="one">{0} fm</unitPattern>
+				<unitPattern count="two">{0} fm</unitPattern>
+				<unitPattern count="few">{0} fm</unitPattern>
+				<unitPattern count="many">{0} fm</unitPattern>
+				<unitPattern count="other">{0} fm</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="two">{0} nmi</unitPattern>
+				<unitPattern count="few">{0} nmi</unitPattern>
+				<unitPattern count="many">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="two">{0} smi</unitPattern>
+				<unitPattern count="few">{0} smi</unitPattern>
+				<unitPattern count="many">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
+			<unit type="light-lux">
+				<displayName>lx</displayName>
+				<unitPattern count="one">{0} lx</unitPattern>
+				<unitPattern count="two">{0} lx</unitPattern>
+				<unitPattern count="few">{0} lx</unitPattern>
+				<unitPattern count="many">{0} lx</unitPattern>
+				<unitPattern count="other">{0} lx</unitPattern>
+			</unit>
+			<unit type="mass-metric-ton">
+				<displayName>t</displayName>
+				<unitPattern count="one">{0} t</unitPattern>
+				<unitPattern count="two">{0} t</unitPattern>
+				<unitPattern count="few">{0} t</unitPattern>
+				<unitPattern count="many">{0} t</unitPattern>
+				<unitPattern count="other">{0} t</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="two">{0} kg</unitPattern>
+				<unitPattern count="few">{0} kg</unitPattern>
+				<unitPattern count="many">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="two">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="many">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>mg</displayName>
+				<unitPattern count="one">{0} mg</unitPattern>
+				<unitPattern count="two">{0} mg</unitPattern>
+				<unitPattern count="few">{0} mg</unitPattern>
+				<unitPattern count="many">{0} mg</unitPattern>
+				<unitPattern count="other">{0} mg</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="two">{0} µg</unitPattern>
+				<unitPattern count="few">{0} µg</unitPattern>
+				<unitPattern count="many">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>tn</displayName>
+				<unitPattern count="one">{0} tn</unitPattern>
+				<unitPattern count="two">{0} tn</unitPattern>
+				<unitPattern count="few">{0} tn</unitPattern>
+				<unitPattern count="many">{0} tn</unitPattern>
+				<unitPattern count="other">{0} tn</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="two">{0} lb</unitPattern>
+				<unitPattern count="few">{0} lb</unitPattern>
+				<unitPattern count="many">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>CD</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="two">{0} CD</unitPattern>
+				<unitPattern count="few">{0} CD</unitPattern>
+				<unitPattern count="many">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="two">{0} hp</unitPattern>
+				<unitPattern count="few">{0} hp</unitPattern>
+				<unitPattern count="many">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<displayName>hPa</displayName>
+				<unitPattern count="one">{0} hPa</unitPattern>
+				<unitPattern count="two">{0} hPa</unitPattern>
+				<unitPattern count="few">{0} hPa</unitPattern>
+				<unitPattern count="many">{0} hPa</unitPattern>
+				<unitPattern count="other">{0} hPa</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>mmHg</displayName>
+				<unitPattern count="one">{0} mmHg</unitPattern>
+				<unitPattern count="two">{0} mmHg</unitPattern>
+				<unitPattern count="few">{0} mmHg</unitPattern>
+				<unitPattern count="many">{0} mmHg</unitPattern>
+				<unitPattern count="other">{0} mmHg</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>lb/in²</displayName>
+				<unitPattern count="one">{0} lb/in²</unitPattern>
+				<unitPattern count="two">{0} lb/in²</unitPattern>
+				<unitPattern count="few">{0} lb/in²</unitPattern>
+				<unitPattern count="many">{0} lb/in²</unitPattern>
+				<unitPattern count="other">{0} lb/in²</unitPattern>
+			</unit>
+			<unit type="pressure-inch-hg">
+				<displayName>″Hg</displayName>
+				<unitPattern count="one">{0}″Hg</unitPattern>
+				<unitPattern count="two">{0}″Hg</unitPattern>
+				<unitPattern count="few">{0}″Hg</unitPattern>
+				<unitPattern count="many">{0}″Hg</unitPattern>
+				<unitPattern count="other">{0}″Hg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="two">{0} mbar</unitPattern>
+				<unitPattern count="few">{0} mbar</unitPattern>
+				<unitPattern count="many">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>km/h</displayName>
+				<unitPattern count="one">{0} km/h</unitPattern>
+				<unitPattern count="two">{0} km/h</unitPattern>
+				<unitPattern count="few">{0} km/h</unitPattern>
+				<unitPattern count="many">{0} km/h</unitPattern>
+				<unitPattern count="other">{0} km/h</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>m/s</displayName>
+				<unitPattern count="one">{0} m/s</unitPattern>
+				<unitPattern count="two">{0} m/s</unitPattern>
+				<unitPattern count="few">{0} m/s</unitPattern>
+				<unitPattern count="many">{0} m/s</unitPattern>
+				<unitPattern count="other">{0} m/s</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>mi/h</displayName>
+				<unitPattern count="one">{0} mi/h</unitPattern>
+				<unitPattern count="two">{0} mi/h</unitPattern>
+				<unitPattern count="few">{0} mi/h</unitPattern>
+				<unitPattern count="many">{0} mi/h</unitPattern>
+				<unitPattern count="other">{0} mi/h</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>n</displayName>
+				<unitPattern count="one">{0} n</unitPattern>
+				<unitPattern count="two">{0} n</unitPattern>
+				<unitPattern count="few">{0} n</unitPattern>
+				<unitPattern count="many">{0} n</unitPattern>
+				<unitPattern count="other">{0} n</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="two">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>°C</displayName>
+				<unitPattern count="one">{0}°C</unitPattern>
+				<unitPattern count="two">{0}°C</unitPattern>
+				<unitPattern count="few">{0}°C</unitPattern>
+				<unitPattern count="many">{0}°C</unitPattern>
+				<unitPattern count="other">{0}°C</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName>°F</displayName>
+				<unitPattern count="one">{0}°F</unitPattern>
+				<unitPattern count="two">{0}°F</unitPattern>
+				<unitPattern count="few">{0}°F</unitPattern>
+				<unitPattern count="many">{0}°F</unitPattern>
+				<unitPattern count="other">{0}°F</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>K</displayName>
+				<unitPattern count="one">{0} K</unitPattern>
+				<unitPattern count="two">{0} K</unitPattern>
+				<unitPattern count="few">{0} K</unitPattern>
+				<unitPattern count="many">{0} K</unitPattern>
+				<unitPattern count="other">{0} K</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>km³</displayName>
+				<unitPattern count="one">{0} km³</unitPattern>
+				<unitPattern count="two">{0} km³</unitPattern>
+				<unitPattern count="few">{0} km³</unitPattern>
+				<unitPattern count="many">{0} km³</unitPattern>
+				<unitPattern count="other">{0} km³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>m³</displayName>
+				<unitPattern count="one">{0} m³</unitPattern>
+				<unitPattern count="two">{0} m³</unitPattern>
+				<unitPattern count="few">{0} m³</unitPattern>
+				<unitPattern count="many">{0} m³</unitPattern>
+				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="two">{0} cm³</unitPattern>
+				<unitPattern count="few">{0} cm³</unitPattern>
+				<unitPattern count="many">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>mi³</displayName>
+				<unitPattern count="one">{0} mi³</unitPattern>
+				<unitPattern count="two">{0} mi³</unitPattern>
+				<unitPattern count="few">{0} mi³</unitPattern>
+				<unitPattern count="many">{0} mi³</unitPattern>
+				<unitPattern count="other">{0} mi³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="two">{0} ft³</unitPattern>
+				<unitPattern count="few">{0} ft³</unitPattern>
+				<unitPattern count="many">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="two">{0} in³</unitPattern>
+				<unitPattern count="few">{0} in³</unitPattern>
+				<unitPattern count="many">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="two">{0} Ml</unitPattern>
+				<unitPattern count="few">{0} Ml</unitPattern>
+				<unitPattern count="many">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hl</displayName>
+				<unitPattern count="one">{0} hl</unitPattern>
+				<unitPattern count="two">{0} hl</unitPattern>
+				<unitPattern count="few">{0} hl</unitPattern>
+				<unitPattern count="many">{0} hl</unitPattern>
+				<unitPattern count="other">{0} hl</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>l</displayName>
+				<unitPattern count="one">{0} l</unitPattern>
+				<unitPattern count="two">{0} l</unitPattern>
+				<unitPattern count="few">{0} l</unitPattern>
+				<unitPattern count="many">{0} l</unitPattern>
+				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="two">{0} dl</unitPattern>
+				<unitPattern count="few">{0} dl</unitPattern>
+				<unitPattern count="many">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="two">{0} cl</unitPattern>
+				<unitPattern count="few">{0} cl</unitPattern>
+				<unitPattern count="many">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>ml</displayName>
+				<unitPattern count="one">{0} ml</unitPattern>
+				<unitPattern count="two">{0} ml</unitPattern>
+				<unitPattern count="few">{0} ml</unitPattern>
+				<unitPattern count="many">{0} ml</unitPattern>
+				<unitPattern count="other">{0} ml</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="two">{0} mpt</unitPattern>
+				<unitPattern count="few">{0} mpt</unitPattern>
+				<unitPattern count="many">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<perUnitPattern>{0}/gal</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>qt</displayName>
+				<unitPattern count="one">{0} qt</unitPattern>
+				<unitPattern count="two">{0} qt</unitPattern>
+				<unitPattern count="few">{0} qt</unitPattern>
+				<unitPattern count="many">{0} qt</unitPattern>
+				<unitPattern count="other">{0} qt</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="two">{0} pt</unitPattern>
+				<unitPattern count="few">{0} pt</unitPattern>
+				<unitPattern count="many">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
 			</unit>
 		</unitLength>
 		<durationUnit type="hm">
@@ -5537,6 +8681,32 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<durationUnitPattern>m:ss</durationUnitPattern>
 		</durationUnit>
 	</units>
+	<listPatterns>
+		<listPattern>
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-narrow">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-short">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
+		</listPattern>
+	</listPatterns>
 	<posix>
 		<messages>
 			<yesstr>y</yesstr>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/br_FR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/br_FR.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/br_FR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/br_FR.xml
index 331f979968b..aae1a1393fe 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/br_FR.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/br_FR.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="br"/>
 		<territory type="FR"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/brx.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/brx.xml
similarity index 97%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/brx.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/brx.xml
index dc7293d62ac..dfb5effb814 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/brx.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/brx.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="brx"/>
 	</identity>
 	<localeDisplayNames>
@@ -610,7 +609,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">एंगीला</territory>
 			<territory type="AL">अल्बानिया</territory>
 			<territory type="AM">आर्मेनिया</territory>
-			<territory type="AN">नीदरलैंड्स एंटिलीज़</territory>
 			<territory type="AO">अंगोला</territory>
 			<territory type="AQ">अंटार्कटिका</territory>
 			<territory type="AR">अर्जेण्टिना</territory>
@@ -885,20 +883,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="currency">मुद्रा</key>
 		</keys>
 		<types>
-			<type type="big5han" key="collation">पारम्पारिक चीनी वर्गीकरण बीग फ़ाईव</type>
-			<type type="buddhist" key="calendar">बौद्ध पंचांग</type>
-			<type type="chinese" key="calendar">चीनी पंचांग</type>
-			<type type="gb2312han" key="collation">सरलीकृत चीनी वर्गीकरण जीबी2312</type>
-			<type type="gregorian" key="calendar">ग्रेगरीअन पंचांग</type>
-			<type type="hebrew" key="calendar">यहुदी पंचांग</type>
-			<type type="islamic" key="calendar">इस्लामी पंचांग</type>
-			<type type="islamic-civil" key="calendar">इस्लामी नागरिक पंचांग</type>
-			<type type="japanese" key="calendar">जापानी पंचांग</type>
-			<type type="phonebook" key="collation">दूरभाष निर्देशिका वर्गीकरण</type>
-			<type type="pinyin" key="collation">पिनयीन वर्गीकरण</type>
-			<type type="roc" key="calendar">चीनी गणतंत्र पंचांग</type>
-			<type type="stroke" key="collation">स्ट्रोक वर्गीकरण</type>
-			<type type="traditional" key="collation">पारम्पारिक वर्गीकरण</type>
+			<type key="calendar" type="buddhist">बौद्ध पंचांग</type>
+			<type key="calendar" type="chinese">चीनी पंचांग</type>
+			<type key="calendar" type="gregorian">ग्रेगरीअन पंचांग</type>
+			<type key="calendar" type="hebrew">यहुदी पंचांग</type>
+			<type key="calendar" type="islamic">इस्लामी पंचांग</type>
+			<type key="calendar" type="islamic-civil">इस्लामी नागरिक पंचांग</type>
+			<type key="calendar" type="japanese">जापानी पंचांग</type>
+			<type key="calendar" type="roc">चीनी गणतंत्र पंचांग</type>
+			<type key="collation" type="big5han">पारम्पारिक चीनी वर्गीकरण बीग फ़ाईव</type>
+			<type key="collation" type="gb2312han">सरलीकृत चीनी वर्गीकरण जीबी2312</type>
+			<type key="collation" type="phonebook">दूरभाष निर्देशिका वर्गीकरण</type>
+			<type key="collation" type="pinyin">पिनयीन वर्गीकरण</type>
+			<type key="collation" type="stroke">स्ट्रोक वर्गीकरण</type>
+			<type key="collation" type="traditional">पारम्पारिक वर्गीकरण</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">मिथार खिलमिथार</measurementSystemName>
@@ -948,7 +946,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="GGGGyMMMMEEEEdd">EEEE,dd MMMM GGGGy</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM, y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
@@ -1052,6 +1053,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">फुं</dayPeriod>
+							<dayPeriod type="pm">बेलासे</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">फुं</dayPeriod>
 							<dayPeriod type="pm">बेलासे</dayPeriod>
@@ -1111,7 +1116,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="GGGGyMMMMEEEEdd">EEEE,dd MMMM GGGGy</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM, y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
@@ -3286,6 +3294,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤ #,##,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤ 0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤ 00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤ 000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤ 0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤ 00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤ 000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤ 0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤ 00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤ 000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤ 0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤ 00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤ 000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="ADP">
@@ -3295,7 +3331,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>संयुक्त अरब अमीरात का दिर्हाम</displayName>
 			</currency>
 			<currency type="AFA">
-				<displayName>अफ़ग़ानी 1927-2002</displayName>
+				<displayName>अफ़ग़ानी 1927–2002</displayName>
 			</currency>
 			<currency type="AFN">
 				<displayName>अफ़ग़ानी</displayName>
@@ -4093,6 +4129,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</numbers>
 	<units>
 		<unitLength type="long">
+			<unit type="duration-year">
+				<displayName draft="provisional">साल</displayName>
+				<unitPattern count="one">{0} साल</unitPattern>
+				<unitPattern count="other">{0} साल</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="provisional">महीने</displayName>
+				<unitPattern count="one">{0} महीना</unitPattern>
+				<unitPattern count="other">{0} महीने</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="provisional">सप्ताह</displayName>
+				<unitPattern count="one">{0} सप्ताह</unitPattern>
+				<unitPattern count="other">{0} सप्ताह</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">सान</displayName>
 				<unitPattern count="one">{0} सान</unitPattern>
@@ -4108,28 +4159,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} मिन.</unitPattern>
 				<unitPattern count="other">{0} मिन.</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">महीने</displayName>
-				<unitPattern count="one">{0} महीना</unitPattern>
-				<unitPattern count="other">{0} महीने</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="provisional">सेकं.</displayName>
 				<unitPattern count="one">{0} सेकं.</unitPattern>
 				<unitPattern count="other">{0} सेकं.</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">सप्ताह</displayName>
-				<unitPattern count="one">{0} सप्ताह</unitPattern>
-				<unitPattern count="other">{0} सप्ताह</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">साल</displayName>
-				<unitPattern count="one">{0} साल</unitPattern>
-				<unitPattern count="other">{0} साल</unitPattern>
-			</unit>
 		</unitLength>
 		<unitLength type="short">
+			<unit type="duration-year">
+				<displayName draft="provisional">साल</displayName>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="provisional">महीने</displayName>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="provisional">सप्ताह</displayName>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">सान</displayName>
 			</unit>
@@ -4139,18 +4184,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="duration-minute">
 				<displayName draft="provisional">मिन.</displayName>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">महीने</displayName>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="provisional">सेकं.</displayName>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">सप्ताह</displayName>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">साल</displayName>
-			</unit>
 		</unitLength>
 	</units>
 	<posix>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/brx_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/brx_IN.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/brx_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/brx_IN.xml
index e7bf69b258a..897824fc467 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/brx_IN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/brx_IN.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="brx"/>
 		<territory type="IN"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bs.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs.xml
similarity index 93%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bs.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs.xml
index 84b3e3fd0b7..287cdf1cf16 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bs.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11346 $"/>
-		<generation date="$Date: 2015-03-05 00:47:17 -0600 (Thu, 05 Mar 2015) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="bs"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,6 +65,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bez">bena</language>
 			<language type="bfd" draft="provisional">bafut</language>
 			<language type="bg">bugarski</language>
+			<language type="bgn">zapadni belučki</language>
 			<language type="bho">bojpuri</language>
 			<language type="bi">bislama</language>
 			<language type="bik">bikol</language>
@@ -112,7 +112,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="csb">kašubijanski</language>
 			<language type="cu">staroslovenski</language>
 			<language type="cv">čuvaški</language>
-			<language type="cy">cy</language>
+			<language type="cy">velški</language>
 			<language type="da">danski</language>
 			<language type="dak">dakota</language>
 			<language type="dar">dargva</language>
@@ -294,6 +294,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">laoški</language>
 			<language type="lol">mongo</language>
 			<language type="loz">lozi</language>
+			<language type="lrc">sjeverni luri</language>
 			<language type="lt">litvanski</language>
 			<language type="lu">luba-katanga</language>
 			<language type="lua">luba-lulua</language>
@@ -342,12 +343,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="my">burmanski</language>
 			<language type="mye" draft="provisional">myene</language>
 			<language type="myv">erzija</language>
+			<language type="mzn">mazanderanski</language>
 			<language type="na">nauru</language>
 			<language type="nap">neapolitanski</language>
 			<language type="naq">nama</language>
 			<language type="nb">norveški bokmal</language>
 			<language type="nd">sjeverni ndebele</language>
 			<language type="nds">niski nemački</language>
+			<language type="nds_NL">niskosaksonski</language>
 			<language type="ne">nepalski</language>
 			<language type="new">nevari</language>
 			<language type="ng">ndonga</language>
@@ -423,6 +426,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">sicilijanski</language>
 			<language type="sco">škotski</language>
 			<language type="sd">sindi</language>
+			<language type="sdh">južnokurdski</language>
 			<language type="se">sjeverni sami</language>
 			<language type="see" draft="provisional">seneca</language>
 			<language type="seh">sena</language>
@@ -454,14 +458,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ss">svati</language>
 			<language type="ssy" draft="provisional">saho</language>
 			<language type="st">sesoto</language>
-			<language type="su">sudanski</language>
+			<language type="su">sundanski</language>
 			<language type="suk">sukuma</language>
 			<language type="sus">susu</language>
 			<language type="sux">sumerski</language>
 			<language type="sv">švedski</language>
 			<language type="sw">svahili</language>
+			<language type="sw_CD">kongoanski swahili</language>
 			<language type="swb" draft="provisional">komorski</language>
-			<language type="swc">kongoanski swahili</language>
 			<language type="syc">klasični sirijski</language>
 			<language type="syr">sirijski</language>
 			<language type="ta">tamilski</language>
@@ -482,7 +486,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="tli">tlingit</language>
 			<language type="tmh">tamašek</language>
 			<language type="tn">tsvana</language>
-			<language type="to">tonga</language>
+			<language type="to">tonganski</language>
 			<language type="tog">njasa tonga</language>
 			<language type="tpi">tok pisin</language>
 			<language type="tr">turski</language>
@@ -502,7 +506,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="uga">ugaritski</language>
 			<language type="uk">ukrajinski</language>
 			<language type="umb">umbundu</language>
-			<language type="und">nepoznati ili nevažeći jezik</language>
+			<language type="und">nepoznati jezik</language>
 			<language type="ur">urdu</language>
 			<language type="uz">uzbečki</language>
 			<language type="vai">vai</language>
@@ -516,6 +520,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">valamo</language>
 			<language type="war">varej</language>
 			<language type="was">vašo</language>
+			<language type="wbp">varlpiri</language>
 			<language type="wo">volof</language>
 			<language type="xal">kalmik</language>
 			<language type="xh">kosa</language>
@@ -589,9 +594,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Hang">hangul pismo</script>
 			<script type="Hani">han pismo</script>
 			<script type="Hano">hanuno pismo</script>
-			<script type="Hans">pojednostavljeno kinesko pismo</script>
+			<script type="Hans">pojednostavljeno</script>
 			<script type="Hans" alt="stand-alone">pojednostavljeno hansko pismo</script>
-			<script type="Hant">tradicionalno kinesko pismo</script>
+			<script type="Hant">tradicionalno</script>
 			<script type="Hant" alt="stand-alone">tradicionalno hansko pismo</script>
 			<script type="Hebr">hebrejsko pismo</script>
 			<script type="Hira">hiragana</script>
@@ -670,7 +675,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Sind" draft="provisional">khudawadi pismo</script>
 			<script type="Sinh">sinhala pismo</script>
 			<script type="Sora" draft="provisional">sora sompeng pismo</script>
-			<script type="Sund">sudansko pismo</script>
 			<script type="Sylo">siloti nagri pismo</script>
 			<script type="Syrc">sirijsko pismo</script>
 			<script type="Syre">sirijsko estrangelo pismo</script>
@@ -704,7 +708,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Zsym">simboli</script>
 			<script type="Zxxx">nepisani jezik</script>
 			<script type="Zyyy">zajedničko pismo</script>
-			<script type="Zzzz">nepoznato ili nevažeće pismo</script>
+			<script type="Zzzz">nepoznato pismo</script>
 		</scripts>
 		<territories>
 			<!-- This just had data for BA, ZZ, and unconfirmed for ME, RS, TO (??). All
@@ -728,7 +732,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="034">Južna Azija</territory>
 			<territory type="035">Jugoistočna Azija</territory>
 			<territory type="039">Južna Evropa</territory>
-			<territory type="053">Australija i Novi Zeland</territory>
+			<territory type="053">Australazija</territory>
 			<territory type="054">Melanezija</territory>
 			<territory type="057">Mikronezijski Region</territory>
 			<territory type="061">Polinezija</territory>
@@ -748,7 +752,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angvila</territory>
 			<territory type="AL">Albanija</territory>
 			<territory type="AM">Jermenija</territory>
-			<territory type="AN">Holandski Antili</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antarktika</territory>
 			<territory type="AR">Argentina</territory>
@@ -767,7 +770,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BH">Bahrein</territory>
 			<territory type="BI">Burundi</territory>
 			<territory type="BJ">Benin</territory>
-			<territory type="BL">Sv. Bartolomej</territory>
+			<territory type="BL">Sveti Bartolomej</territory>
 			<territory type="BM">Bermuda</territory>
 			<territory type="BN">Brunej</territory>
 			<territory type="BO">Bolivija</territory>
@@ -780,7 +783,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BY">Bjelorusija</territory>
 			<territory type="BZ">Belize</territory>
 			<territory type="CA">Kanada</territory>
-			<territory type="CC">Kokos (Keling) Ostrva</territory>
+			<territory type="CC">Kokosova (Kilingova) ostrva</territory>
 			<territory type="CD">Demokratska Republika Kongo</territory>
 			<territory type="CD" alt="variant">Kongo (DRC)</territory>
 			<territory type="CF">Centralnoafrička Republika</territory>
@@ -821,7 +824,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="FI">Finska</territory>
 			<territory type="FJ">Fidži</territory>
 			<territory type="FK">Folklandska Ostrva</territory>
-			<territory type="FK" alt="variant">Folklandska ostrva (Malvinska ostrva)</territory>
+			<territory type="FK" alt="variant">Falklandska ostrva (Malvinska ostrva)</territory>
 			<territory type="FM">Mikronezija</territory>
 			<territory type="FO">Farska Ostrva</territory>
 			<territory type="FR">Francuska</territory>
@@ -847,7 +850,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GY">Gvajana</territory>
 			<territory type="HK">Hong Kong (S. A. R. Kina)</territory>
 			<territory type="HK" alt="short">Hong Kong</territory>
-			<territory type="HM">Herd i Mekdonald Ostrva</territory>
+			<territory type="HM">Heard i arhipelag McDonald</territory>
 			<territory type="HN">Honduras</territory>
 			<territory type="HR">Hrvatska</territory>
 			<territory type="HT">Haiti</territory>
@@ -880,7 +883,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="KZ">Kazahstan</territory>
 			<territory type="LA">Laos</territory>
 			<territory type="LB">Liban</territory>
-			<territory type="LC">Sent Lucija</territory>
+			<territory type="LC">Sveta Lucija</territory>
 			<territory type="LI">Lihtenštajn</territory>
 			<territory type="LK">Šri Lanka</territory>
 			<territory type="LR">Liberija</territory>
@@ -934,7 +937,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="PH">Filipini</territory>
 			<territory type="PK">Pakistan</territory>
 			<territory type="PL">Poljska</territory>
-			<territory type="PM">Sen Pjer i Mikelon</territory>
+			<territory type="PM">Sveti Petar i Mikelon</territory>
 			<territory type="PN">Pitkern</territory>
 			<territory type="PR">Porto Riko</territory>
 			<territory type="PS">Palestinska Teritorija</territory>
@@ -957,7 +960,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="SG">Singapur</territory>
 			<territory type="SH">Sveta Helena</territory>
 			<territory type="SI">Slovenija</territory>
-			<territory type="SJ">Svalbard i Janmajen Ostrva</territory>
+			<territory type="SJ">Svalbard i Jan Majen</territory>
 			<territory type="SK">Slovačka</territory>
 			<territory type="SL">Sijera Leone</territory>
 			<territory type="SM">San Marino</territory>
@@ -971,7 +974,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="SY">Sirija</territory>
 			<territory type="SZ">Svazilend</territory>
 			<territory type="TA">Tristan da Kunja</territory>
-			<territory type="TC">Turks i Kajkos Ostrva</territory>
+			<territory type="TC">Ostrva Turks i Caicos</territory>
 			<territory type="TD">Čad</territory>
 			<territory type="TF">Francuske Južne Teritorije</territory>
 			<territory type="TG">Togo</territory>
@@ -990,19 +993,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="TZ">Tanzanija</territory>
 			<territory type="UA">Ukrajina</territory>
 			<territory type="UG">Uganda</territory>
-			<territory type="UM">Manja Udaljena Ostrva SAD</territory>
+			<territory type="UM">Udaljena ostrva SAD</territory>
 			<territory type="US">Sjedinjene Američke Države</territory>
 			<territory type="US" alt="short">SAD</territory>
 			<territory type="UY">Urugvaj</territory>
 			<territory type="UZ">Uzbekistan</territory>
 			<territory type="VA">Vatikan</territory>
-			<territory type="VC">Sent Vinsent i Grenadini</territory>
+			<territory type="VC">Sveti Vincent i Grenadini</territory>
 			<territory type="VE">Venecuela</territory>
 			<territory type="VG">Britanska Djevičanska Ostrva</territory>
 			<territory type="VI">Djevičanska Ostrva SAD</territory>
 			<territory type="VN">Vijetnam</territory>
 			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Valis i Futuna Ostrva</territory>
+			<territory type="WF">Wallis i Futuna</territory>
 			<territory type="WS">Samoa</territory>
 			<territory type="XK">Kosovo</territory>
 			<territory type="YE">Jemen</territory>
@@ -1010,7 +1013,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ZA">Južnoafrička Republika</territory>
 			<territory type="ZM">Zambija</territory>
 			<territory type="ZW">Zimbabve</territory>
-			<territory type="ZZ">Nepoznata ili nevažeća oblast</territory>
+			<territory type="ZZ">Nepoznata oblast</territory>
 		</territories>
 		<variants>
 			<!-- Copied from sr_Latn -->
@@ -1067,104 +1070,117 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="provisional">Numeričko poredavanje</key>
 			<key type="colStrength" draft="provisional">Jačina poredavanja</key>
 			<key type="currency">Valuta</key>
-			<key type="numbers">brojevi</key>
+			<key type="hc">Satni ciklus (12 ili 24)</key>
+			<key type="lb">Stil završetka reda</key>
+			<key type="ms">Mjerni sistem</key>
+			<key type="numbers">Brojevi</key>
 			<key type="timezone" draft="provisional">Vremenska zona</key>
 			<key type="va" draft="provisional">Varijanta zemlje/jezika</key>
 			<key type="variableTop" draft="provisional">Poredaj kao simbole</key>
 			<key type="x" draft="provisional">Privatna upotreba</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">arapsko-indijske znamenke</type>
-			<type type="arabext" key="numbers">proširene arapsko-indijske znamenke</type>
-			<type type="armn" key="numbers">jermenski brojevi</type>
-			<type type="armnlow" key="numbers">mali jermenski brojevi</type>
-			<type type="beng" key="numbers">znamenke bengalskog pisma</type>
+			<type key="calendar" type="buddhist">Budistički kalendar</type>
+			<type key="calendar" type="chinese">Kineski kalendar</type>
+			<type key="calendar" type="coptic" draft="provisional">Koptski kalendar</type>
+			<type key="calendar" type="dangi">Dangi kalendar</type>
+			<type key="calendar" type="ethiopic">Etiopski kalendar</type>
+			<type key="calendar" type="ethiopic-amete-alem" draft="provisional">Etiopski kalendar &quot;Amete Alem&quot;</type>
+			<type key="calendar" type="gregorian">Gregorijanski kalendar</type>
+			<type key="calendar" type="hebrew">Hebrejski kalendar</type>
+			<type key="calendar" type="indian">Indijski nacionalni kalendar</type>
+			<type key="calendar" type="islamic">Islamski kalendar</type>
+			<type key="calendar" type="islamic-civil">Islamski civilni kalendar</type>
+			<type key="calendar" type="iso8601">ISO-8601 kalendar</type>
+			<type key="calendar" type="japanese">Japanski kalendar</type>
+			<type key="calendar" type="persian">Perzijski kalendar</type>
+			<type key="calendar" type="roc">Kalendar Republike Kine</type>
+			<type key="colAlternate" type="non-ignorable" draft="provisional">Poredaj simbole</type>
+			<type key="colAlternate" type="shifted" draft="provisional">Poredaj zanemarujući simbole</type>
+			<type key="colBackwards" type="no" draft="provisional">Poredaj naglaske normalno</type>
+			<type key="colBackwards" type="yes" draft="provisional">Poredaj naglaske obrnuto</type>
+			<type key="colCaseFirst" type="lower" draft="provisional">Prvo poredaj mala slova</type>
+			<type key="colCaseFirst" type="no" draft="provisional">Poredaj po normalnom poretku veličine slova</type>
+			<type key="colCaseFirst" type="upper" draft="provisional">Poredaj prvo velika slova</type>
+			<type key="colCaseLevel" type="no" draft="provisional">Poredaj zanemarujući veličinu</type>
+			<type key="colCaseLevel" type="yes" draft="provisional">Poredaj u skladu s veličinom slova</type>
+			<type key="colHiraganaQuaternary" type="no" draft="provisional">Poredaj pismo kana zasebno</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="provisional">Poredaj pismo kana drugačije</type>
 			<!-- Copied from sr_Latn -->
-			<type type="big5han" key="collation">Tradicionalno kinesko sortiranje</type>
-			<type type="buddhist" key="calendar">Budistički kalendar</type>
-			<type type="chinese" key="calendar">Kineski kalendar</type>
-			<type type="coptic" key="calendar" draft="provisional">Koptski kalendar</type>
-			<type type="dangi" key="calendar">Dangi kalendar</type>
-			<type type="deva" key="numbers">znamenke pisma devanagari</type>
-			<type type="dictionary" key="collation" draft="provisional">rječničko razvrstavanje</type>
-			<type type="ducet" key="collation">Standardno Unicode razvrstavanje</type>
-			<type type="ethi" key="numbers">etiopski brojevi</type>
-			<type type="ethiopic" key="calendar">Etiopski kalendar</type>
-			<type type="ethiopic-amete-alem" key="calendar" draft="provisional">Etiopski kalendar &quot;Amete Alem&quot;</type>
-			<type type="finance" key="numbers" draft="provisional">Financijski brojevi</type>
-			<type type="fullwide" key="numbers">široki brojevi</type>
-			<type type="gb2312han" key="collation">Pojednostavljeno kinesko sortiranje</type>
-			<type type="geor" key="numbers">gruzijski brojevi</type>
-			<type type="gregorian" key="calendar">Gregorijanski kalendar</type>
-			<type type="grek" key="numbers">grčki brojevi</type>
-			<type type="greklow" key="numbers">mali grčki brojevi</type>
-			<type type="gujr" key="numbers">gudžaratske znamenke</type>
-			<type type="guru" key="numbers">znamenke pisma gurmuki</type>
-			<type type="hanidec" key="numbers">kineski decimalni brojevi</type>
-			<type type="hans" key="numbers">pojednostavljeni kineski brojevi</type>
-			<type type="hansfin" key="numbers">pojednostavljeni kineski finansijski brojevi</type>
-			<type type="hant" key="numbers">tradicionalni kineski brojevi</type>
-			<type type="hantfin" key="numbers">tradicionalni kineski finansijski brojevi</type>
-			<type type="hebr" key="numbers">hebrejski brojevi</type>
-			<type type="hebrew" key="calendar">Hebrejski kalendar</type>
-			<type type="identical" key="colStrength" draft="provisional">Poredaj sve</type>
-			<type type="indian" key="calendar">Indijski nacionalni kalendar</type>
-			<type type="islamic" key="calendar">Islamski kalendar</type>
-			<type type="islamic-civil" key="calendar">Islamski civilni kalendar</type>
-			<type type="iso8601" key="calendar">ISO-8601 kalendar</type>
-			<type type="japanese" key="calendar">Japanski kalendar</type>
-			<type type="jpan" key="numbers">japanski brojevi</type>
-			<type type="jpanfin" key="numbers">japanski finansijski brojevi</type>
-			<type type="khmr" key="numbers">kmerske znamenke</type>
-			<type type="knda" key="numbers">znamenke pisma kanada</type>
-			<type type="laoo" key="numbers">laoske znamenke</type>
-			<type type="latn" key="numbers">arapski brojevi</type>
-			<type type="lower" key="colCaseFirst" draft="provisional">Prvo poredaj mala slova</type>
-			<type type="mlym" key="numbers">malajalamske znamenke</type>
-			<type type="mong" key="numbers" draft="provisional">Mongolske znamenke</type>
-			<type type="mymr" key="numbers">mijanmarske znamenke</type>
-			<type type="native" key="numbers" draft="provisional">Izvorne znamenke</type>
-			<type type="no" key="colBackwards" draft="provisional">Poredaj naglaske normalno</type>
-			<type type="no" key="colCaseFirst" draft="provisional">Poredaj po normalnom poretku veličine slova</type>
-			<type type="no" key="colCaseLevel" draft="provisional">Poredaj zanemarujući veličinu</type>
-			<type type="no" key="colHiraganaQuaternary" draft="provisional">Poredaj pismo kana zasebno</type>
-			<type type="no" key="colNormalization" draft="provisional">Poredaj bez normalizacije</type>
-			<type type="no" key="colNumeric" draft="provisional">Poredaj znamenke pojedinačno</type>
-			<type type="non-ignorable" key="colAlternate" draft="provisional">Poredaj simbole</type>
-			<type type="orya" key="numbers">orijske znamenke</type>
-			<type type="persian" key="calendar">Perzijski kalendar</type>
-			<type type="phonebook" key="collation">Sortiranje kao telefonski imenik</type>
-			<type type="phonetic" key="collation" draft="provisional">Fonetski poredak</type>
-			<type type="pinyin" key="collation">Pinjin sortiranje</type>
-			<type type="primary" key="colStrength" draft="provisional">Poredaj samo po osnovnim slovima</type>
-			<type type="quaternary" key="colStrength" draft="provisional">Poredaj po naglascima/veličini/širini/pismu kana</type>
-			<type type="reformed" key="collation" draft="provisional">reformirano razvrstavanje</type>
-			<type type="roc" key="calendar">Kalendar Republike Kine</type>
-			<type type="roman" key="numbers">rimski brojevi</type>
-			<type type="romanlow" key="numbers">mali rimski brojevi</type>
-			<type type="search" key="collation">Općenito pretraživanje</type>
-			<type type="searchjl" key="collation" draft="provisional">Pretraživanje po početnom suglasniku hangula</type>
-			<type type="secondary" key="colStrength" draft="provisional">Poredaj po naglasku</type>
-			<type type="shifted" key="colAlternate" draft="provisional">Poredaj zanemarujući simbole</type>
-			<type type="standard" key="collation">Standardno razvrstavanje</type>
-			<type type="stroke" key="collation">Sortiranje po broju crta</type>
-			<type type="taml" key="numbers">tamilski brojevi</type>
-			<type type="tamldec" key="numbers">tamilske znamenke</type>
-			<type type="telu" key="numbers">znamenke teluškog pisma</type>
-			<type type="tertiary" key="colStrength" draft="provisional">Poredaj po naglascima/veličini/širini</type>
-			<type type="thai" key="numbers">tajske znamenke</type>
-			<type type="tibt" key="numbers">tibetske znamenke</type>
-			<type type="traditional" key="collation">Tradicionalno sortiranje</type>
-			<type type="traditional" key="numbers" draft="provisional">Tradicionalni brojevi</type>
-			<type type="unihan" key="collation" draft="provisional">razvrstavanje prema korijenu i potezu</type>
-			<type type="upper" key="colCaseFirst" draft="provisional">Poredaj prvo velika slova</type>
-			<type type="vaii" key="numbers" draft="provisional">Vai znamenke</type>
-			<type type="yes" key="colBackwards" draft="provisional">Poredaj naglaske obrnuto</type>
-			<type type="yes" key="colCaseLevel" draft="provisional">Poredaj u skladu s veličinom slova</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="provisional">Poredaj pismo kana drugačije</type>
-			<type type="yes" key="colNormalization" draft="provisional">Poredaj unikod normalizirano</type>
-			<type type="yes" key="colNumeric" draft="provisional">Poredaj znamenke numerički</type>
-			<type type="zhuyin" key="collation" draft="provisional">zhuyin razvrstavanje</type>
+			<type key="collation" type="big5han">Tradicionalno kinesko sortiranje</type>
+			<type key="collation" type="dictionary" draft="provisional">rječničko razvrstavanje</type>
+			<type key="collation" type="ducet">Standardno Unicode razvrstavanje</type>
+			<type key="collation" type="gb2312han">Pojednostavljeno kinesko sortiranje</type>
+			<type key="collation" type="phonebook">Sortiranje kao telefonski imenik</type>
+			<type key="collation" type="phonetic" draft="provisional">Fonetski poredak</type>
+			<type key="collation" type="pinyin">Pinjin sortiranje</type>
+			<type key="collation" type="reformed" draft="provisional">reformirano razvrstavanje</type>
+			<type key="collation" type="search">Općenito pretraživanje</type>
+			<type key="collation" type="searchjl" draft="provisional">Pretraživanje po početnom suglasniku hangula</type>
+			<type key="collation" type="standard">Standardno razvrstavanje</type>
+			<type key="collation" type="stroke">Sortiranje po broju crta</type>
+			<type key="collation" type="traditional">Tradicionalno sortiranje</type>
+			<type key="collation" type="unihan" draft="provisional">razvrstavanje prema korijenu i potezu</type>
+			<type key="collation" type="zhuyin" draft="provisional">zhuyin razvrstavanje</type>
+			<type key="colNormalization" type="no" draft="provisional">Poredaj bez normalizacije</type>
+			<type key="colNormalization" type="yes" draft="provisional">Poredaj unikod normalizirano</type>
+			<type key="colNumeric" type="no" draft="provisional">Poredaj znamenke pojedinačno</type>
+			<type key="colNumeric" type="yes" draft="provisional">Poredaj znamenke numerički</type>
+			<type key="colStrength" type="identical" draft="provisional">Poredaj sve</type>
+			<type key="colStrength" type="primary" draft="provisional">Poredaj samo po osnovnim slovima</type>
+			<type key="colStrength" type="quaternary" draft="provisional">Poredaj po naglascima/veličini/širini/pismu kana</type>
+			<type key="colStrength" type="secondary" draft="provisional">Poredaj po naglasku</type>
+			<type key="colStrength" type="tertiary" draft="provisional">Poredaj po naglascima/veličini/širini</type>
+			<type key="hc" type="h11">12-satni sistem (0-11)</type>
+			<type key="hc" type="h12">12-satni sistem (1-12)</type>
+			<type key="hc" type="h23">24- satni sistem (0-23)</type>
+			<type key="hc" type="h24">24-satni sistem (1-24)</type>
+			<type key="lb" type="loose">Opušteni stil završetka reda</type>
+			<type key="lb" type="normal">Normalni stil završetka reda</type>
+			<type key="lb" type="strict">Strogi stil završetka reda</type>
+			<type key="ms" type="metric">Metrički sistem</type>
+			<type key="ms" type="uksystem">Imperijalni mjerni sistem</type>
+			<type key="ms" type="ussystem">Američki mjerni sistem</type>
+			<type key="numbers" type="arab">arapsko-indijske brojke</type>
+			<type key="numbers" type="arabext">proširene arapsko-indijske brojke</type>
+			<type key="numbers" type="armn">jermenski brojevi</type>
+			<type key="numbers" type="armnlow">mali jermenski brojevi</type>
+			<type key="numbers" type="beng">brojke bengalskog pisma</type>
+			<type key="numbers" type="deva">brojke pisma devanagari</type>
+			<type key="numbers" type="ethi">etiopski brojevi</type>
+			<type key="numbers" type="finance" draft="provisional">Financijski brojevi</type>
+			<type key="numbers" type="fullwide">Široki brojevi</type>
+			<type key="numbers" type="geor">gruzijski brojevi</type>
+			<type key="numbers" type="grek">grčki brojevi</type>
+			<type key="numbers" type="greklow">mali grčki brojevi</type>
+			<type key="numbers" type="gujr">gudžaratske brojke</type>
+			<type key="numbers" type="guru">brojke pisma gurmuki</type>
+			<type key="numbers" type="hanidec">kineski decimalni brojevi</type>
+			<type key="numbers" type="hans">pojednostavljeni kineski brojevi</type>
+			<type key="numbers" type="hansfin">pojednostavljeni kineski finansijski brojevi</type>
+			<type key="numbers" type="hant">tradicionalni kineski brojevi</type>
+			<type key="numbers" type="hantfin">tradicionalni kineski finansijski brojevi</type>
+			<type key="numbers" type="hebr">hebrejski brojevi</type>
+			<type key="numbers" type="jpan">japanski brojevi</type>
+			<type key="numbers" type="jpanfin">japanski finansijski brojevi</type>
+			<type key="numbers" type="khmr">kmerske brojke</type>
+			<type key="numbers" type="knda">brojke pisma kanada</type>
+			<type key="numbers" type="laoo">laoske brojke</type>
+			<type key="numbers" type="latn">arapski brojevi</type>
+			<type key="numbers" type="mlym">malajalamske brojke</type>
+			<type key="numbers" type="mong" draft="provisional">Mongolske znamenke</type>
+			<type key="numbers" type="mymr">mijanmarske brojke</type>
+			<type key="numbers" type="native" draft="provisional">Izvorne znamenke</type>
+			<type key="numbers" type="orya">orijske brojke</type>
+			<type key="numbers" type="roman">rimski brojevi</type>
+			<type key="numbers" type="romanlow">mali rimski brojevi</type>
+			<type key="numbers" type="taml">tamilski brojevi</type>
+			<type key="numbers" type="tamldec">tamilske brojke</type>
+			<type key="numbers" type="telu">brojke teluškog pisma</type>
+			<type key="numbers" type="thai">tajlandske brojke</type>
+			<type key="numbers" type="tibt">tibetske brojke</type>
+			<type key="numbers" type="traditional" draft="provisional">Tradicionalni brojevi</type>
+			<type key="numbers" type="vaii" draft="provisional">Vai znamenke</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="provisional">BGN</transformName>
@@ -1214,9 +1230,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</contextTransformUsage>
 	</contextTransforms>
 	<characters>
-		<exemplarCharacters>[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 ž]</exemplarCharacters>
+		<exemplarCharacters>[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 ž]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[q w x y]</exemplarCharacters>
-		<exemplarCharacters type="index" draft="provisional">[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 Ž]</exemplarCharacters>
+		<exemplarCharacters type="index" draft="provisional">[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 Ž]</exemplarCharacters>
 		<exemplarCharacters type="punctuation" draft="provisional">[‐ – — , ; \: ! ? . … ' ‘ ’ &quot; “ ” ( ) \[ \] @ * / ′ ″]</exemplarCharacters>
 		<ellipsis type="final">{0}…</ellipsis>
 		<ellipsis type="initial">… {0}</ellipsis>
@@ -1311,6 +1327,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E, dd.</dateFormatItem>
 						<dateFormatItem id="Gy">y. G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y. G</dateFormatItem>
@@ -1655,37 +1672,51 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<!-- Copied from sr_Latn -->
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="afternoon" draft="provisional">popodne</dayPeriod>
-							<dayPeriod type="earlyMorning" draft="provisional">ujutro</dayPeriod>
-							<dayPeriod type="evening" draft="provisional">navečer</dayPeriod>
-							<dayPeriod type="morning" draft="provisional">prijepodne</dayPeriod>
-							<dayPeriod type="night" draft="provisional">noću</dayPeriod>
-							<dayPeriod type="noon" draft="provisional">podne</dayPeriod>
+							<dayPeriod type="midnight">ponoć</dayPeriod>
+							<dayPeriod type="am">prijepodne</dayPeriod>
+							<dayPeriod type="noon">podne</dayPeriod>
+							<dayPeriod type="pm">popodne</dayPeriod>
+							<dayPeriod type="morning1">jutro</dayPeriod>
+							<dayPeriod type="afternoon1">poslijepodne</dayPeriod>
+							<dayPeriod type="evening1">večer</dayPeriod>
+							<dayPeriod type="night1">noć</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
-							<dayPeriod type="afternoon" draft="provisional">popodne</dayPeriod>
+							<dayPeriod type="midnight">ponoć</dayPeriod>
+							<dayPeriod type="am">prijepodne</dayPeriod>
+							<dayPeriod type="noon">podne</dayPeriod>
+							<dayPeriod type="pm">popodne</dayPeriod>
+							<dayPeriod type="morning1">jutro</dayPeriod>
+							<dayPeriod type="afternoon1">poslijepodne</dayPeriod>
+							<dayPeriod type="evening1">večer</dayPeriod>
+							<dayPeriod type="night1">noć</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">ponoć</dayPeriod>
+							<dayPeriod type="am">prije podne</dayPeriod>
+							<dayPeriod type="noon">podne</dayPeriod>
+							<dayPeriod type="pm">popodne</dayPeriod>
+							<dayPeriod type="morning1">jutro</dayPeriod>
+							<dayPeriod type="afternoon1">poslijepodne</dayPeriod>
+							<dayPeriod type="evening1">večer</dayPeriod>
+							<dayPeriod type="night1">noć</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am">prijepodne</dayPeriod>
-							<dayPeriod type="earlyMorning" draft="provisional">ujutro</dayPeriod>
-							<dayPeriod type="evening" draft="provisional">navečer</dayPeriod>
-							<dayPeriod type="morning" draft="provisional">prijepodne</dayPeriod>
-							<dayPeriod type="night" draft="provisional">noću</dayPeriod>
 							<dayPeriod type="noon">podne</dayPeriod>
 							<dayPeriod type="pm">popodne</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">u ponoć</dayPeriod>
 							<dayPeriod type="am">prije podne</dayPeriod>
 							<dayPeriod type="noon">podne</dayPeriod>
 							<dayPeriod type="pm">popodne</dayPeriod>
-						</dayPeriodWidth>
-					</dayPeriodContext>
-					<dayPeriodContext type="stand-alone">
-						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="afternoon" draft="provisional">popodne</dayPeriod>
-							<dayPeriod type="earlyMorning" draft="provisional">ujutro</dayPeriod>
-							<dayPeriod type="evening" draft="provisional">navečer</dayPeriod>
-							<dayPeriod type="morning" draft="provisional">prijepodne</dayPeriod>
-							<dayPeriod type="night" draft="provisional">noću</dayPeriod>
-							<dayPeriod type="noon" draft="provisional">podne</dayPeriod>
+							<dayPeriod type="morning1">jutro</dayPeriod>
+							<dayPeriod type="afternoon1">poslijepodne</dayPeriod>
+							<dayPeriod type="evening1">veče</dayPeriod>
+							<dayPeriod type="night1">noć</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1699,7 +1730,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</eraNames>
 					<eraAbbr>
 						<era type="0">p. n. e.</era>
-						<era type="0" alt="variant">pr. n. e.</era>
+						<era type="0" alt="variant">pr.n.e.</era>
 						<era type="1">n. e.</era>
 						<era type="1" alt="variant">n.e.</era>
 					</eraAbbr>
@@ -1791,6 +1822,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">hh:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">dd.MM.</dateFormatItem>
 						<dateFormatItem id="MEd">E, dd.MM.</dateFormatItem>
@@ -2218,7 +2253,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="day">
 				<displayName>dan</displayName>
 				<relative type="-2">prekjuče</relative>
-				<relative type="-1">juče</relative>
+				<relative type="-1">jučer</relative>
 				<relative type="0">danas</relative>
 				<relative type="1">sutra</relative>
 				<relative type="2">prekosutra</relative>
@@ -2504,7 +2539,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				 in sr_Latn). Fill in the other translations from data in sr_Latn.
 			-->
 			<zone type="Etc/Unknown">
-				<exemplarCity>Nepoznati ili nevažeći grad</exemplarCity>
+				<exemplarCity>Nepoznati grad</exemplarCity>
 			</zone>
 			<zone type="Europe/Andorra">
 				<exemplarCity>Andora</exemplarCity>
@@ -4852,6 +4887,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0 hilj'.' ¤</pattern>
+					<pattern type="1000" count="few" draft="provisional">0 hilj'.' ¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0 hilj'.' ¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00 hilj'.' ¤</pattern>
+					<pattern type="10000" count="few" draft="provisional">00 hilj'.' ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00 hilj'.' ¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000 hilj'.' ¤</pattern>
+					<pattern type="100000" count="few" draft="provisional">000 hilj'.' ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000 hilj'.' ¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0 mil'.' ¤</pattern>
+					<pattern type="1000000" count="few" draft="provisional">0 mil'.' ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0 mil'.' ¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00 mil'.' ¤</pattern>
+					<pattern type="10000000" count="few" draft="provisional">00 mil'.' ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00 mil'.' ¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000 mil'.' ¤</pattern>
+					<pattern type="100000000" count="few" draft="provisional">000 mil'.' ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000 mil'.' ¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0 mlr'.' ¤</pattern>
+					<pattern type="1000000000" count="few" draft="provisional">0 mlr'.' ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0 mlr'.' ¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00 mlr'.' ¤</pattern>
+					<pattern type="10000000000" count="few" draft="provisional">00 mlr'.' ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00 mlr'.' ¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000 mlr'.' ¤</pattern>
+					<pattern type="100000000000" count="few" draft="provisional">000 mlr'.' ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000 mlr'.' ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0 bil'.' ¤</pattern>
+					<pattern type="1000000000000" count="few" draft="provisional">0 bil'.' ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="few" draft="provisional">00 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="few" draft="provisional">000 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000 bil'.' ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="few">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
@@ -5232,7 +5307,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="CAD">
 				<displayName>Kanadski dolar</displayName>
 				<displayName count="one">kanadski dolar</displayName>
-				<displayName count="few">Kanadska dolara</displayName>
+				<displayName count="few">kanadski dolari</displayName>
 				<displayName count="other">kanadskih dolara</displayName>
 				<symbol>CAD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
@@ -5624,7 +5699,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="HRK">
 				<displayName>Hrvatska kuna</displayName>
 				<displayName count="one">hrvatska kuna</displayName>
-				<displayName count="few">Hrvatske kune</displayName>
+				<displayName count="few">hrvatske kune</displayName>
 				<displayName count="other">hrvatskih kuna</displayName>
 				<symbol>kn</symbol>
 			</currency>
@@ -5939,9 +6014,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="MGA">
 				<displayName>Malagaski ariari</displayName>
-				<displayName count="one">malagaski ariari</displayName>
+				<displayName count="one">malgaški arijari</displayName>
 				<displayName count="few">malagaska ariarija</displayName>
-				<displayName count="other">madagaskarski ariariji</displayName>
+				<displayName count="other">malgaški arijariji</displayName>
 				<symbol>MGA</symbol>
 			</currency>
 			<currency type="MGF">
@@ -6026,7 +6101,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="MWK">
 				<displayName>Malavska kvača</displayName>
-				<displayName count="one">malavska kvača</displayName>
+				<displayName count="one">malavijska kvača</displayName>
 				<displayName count="few">malavske kvače</displayName>
 				<displayName count="other">malavijskih kvača</displayName>
 				<symbol>MWK</symbol>
@@ -6114,8 +6189,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="NOK">
 				<displayName>Norveška kruna</displayName>
-				<displayName count="one">Norveška kuna</displayName>
-				<displayName count="few">Norveške kune</displayName>
+				<displayName count="one">norveška kruna</displayName>
+				<displayName count="few">norveških kruna</displayName>
 				<displayName count="other">norveških kruna</displayName>
 				<symbol>NOK</symbol>
 			</currency>
@@ -6382,7 +6457,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="STD">
 				<displayName>Dobra Sao Toma i Principa</displayName>
-				<displayName count="one">dobra Sao Toma i Principa</displayName>
+				<displayName count="one">svetotomska dobra</displayName>
 				<displayName count="few">dobre Sao Toma i Principa</displayName>
 				<displayName count="other">dobri Sao Toma i Principa</displayName>
 				<symbol>STD</symbol>
@@ -6484,7 +6559,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Trinidadtobaški dolar</displayName>
 				<displayName count="one">trinidadtobaški dolar</displayName>
 				<displayName count="few">trinidadtobaška dolara</displayName>
-				<displayName count="other">trinidadtobaški dolar</displayName>
+				<displayName count="other">trinidadtobaški dolari</displayName>
 				<symbol>TTD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -6571,10 +6646,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="UZS">
-				<displayName>Uzbekistanski som</displayName>
+				<displayName>uzbekistanski som</displayName>
 				<displayName count="one">uzbekistanski som</displayName>
 				<displayName count="few">uzbekistanska soma</displayName>
-				<displayName count="other">uzbekistanskih soma</displayName>
+				<displayName count="other">uzbekistanski somi</displayName>
 				<symbol>UZS</symbol>
 			</currency>
 			<currency type="VEB">
@@ -6619,10 +6694,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>WST</symbol>
 			</currency>
 			<currency type="XAF">
-				<displayName>CFA franak BEAC</displayName>
-				<displayName count="one">CFA franak BEAC</displayName>
-				<displayName count="few">CFA franka BEAC</displayName>
-				<displayName count="other">CFA franaka BEAC</displayName>
+				<displayName>centralnoafrički franak CFA</displayName>
+				<displayName count="one">centralnoafrički franak CFA</displayName>
+				<displayName count="few">centralnoafrička franka CFA</displayName>
+				<displayName count="other">centralnoafričkih franaka CFA</displayName>
 				<symbol>FCFA</symbol>
 			</currency>
 			<currency type="XAG">
@@ -6693,10 +6768,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">francuskih UIC-franaka</displayName>
 			</currency>
 			<currency type="XOF">
-				<displayName>CFA franak BCEAO</displayName>
-				<displayName count="one">CFA franak BCEAO</displayName>
-				<displayName count="few">CFA franka BCEAO</displayName>
-				<displayName count="other">CFA franaka BCEAO</displayName>
+				<displayName>zapadnoafrički franak CFA</displayName>
+				<displayName count="one">zapadnoafrički franak CFA</displayName>
+				<displayName count="few">zapadnoafrički franci CFA</displayName>
+				<displayName count="other">zapadnoafrički franci CFA</displayName>
 				<symbol>CFA</symbol>
 			</currency>
 			<currency type="XPD">
@@ -6852,6 +6927,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} metra u sekundi za sekundu</unitPattern>
 				<unitPattern count="other">{0} metara u sekundi za sekundu</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>okret</displayName>
+				<unitPattern count="one">{0} okret</unitPattern>
+				<unitPattern count="few">{0} okreta</unitPattern>
+				<unitPattern count="other">{0} okreta</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radijani</displayName>
+				<unitPattern count="one">{0} radijan</unitPattern>
+				<unitPattern count="few">{0} radijana</unitPattern>
+				<unitPattern count="other">{0} radijana</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>stepeni</displayName>
+				<unitPattern count="one">{0} stepen</unitPattern>
+				<unitPattern count="few">{0} stepena</unitPattern>
+				<unitPattern count="other">{0} stepeni</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>lučni minuti</displayName>
 				<unitPattern count="one">{0} lučni minut</unitPattern>
@@ -6864,23 +6957,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} lučne sekunde</unitPattern>
 				<unitPattern count="other">{0} lučnih sekundi</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>stepeni</displayName>
-				<unitPattern count="one">{0} stepen</unitPattern>
-				<unitPattern count="few">{0} stepena</unitPattern>
-				<unitPattern count="other">{0} stepeni</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radijani</displayName>
-				<unitPattern count="one">{0} radijan</unitPattern>
-				<unitPattern count="few">{0} radijana</unitPattern>
-				<unitPattern count="other">{0} radijana</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>katastarskih jutara</displayName>
-				<unitPattern count="one">{0} katastarsko jutro</unitPattern>
-				<unitPattern count="few">{0} katastarska jutra</unitPattern>
-				<unitPattern count="other">{0} katastarskih jutara</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>kvadratni kilometri</displayName>
+				<unitPattern count="one">{0} kvadratni kilometar</unitPattern>
+				<unitPattern count="few">{0} kvadratna kilometra</unitPattern>
+				<unitPattern count="other">{0} kvadratnih kilometara</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektara</displayName>
@@ -6888,11 +6969,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} hektra</unitPattern>
 				<unitPattern count="other">{0} hektara</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>kvadratni metri</displayName>
+				<unitPattern count="one">{0} kvadratni metar</unitPattern>
+				<unitPattern count="few">{0} kvadratna metra</unitPattern>
+				<unitPattern count="other">{0} kvadratnih metara</unitPattern>
+				<perUnitPattern>{0} po kvadratnom metru</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>kvadratni centimetri</displayName>
 				<unitPattern count="one">{0} kvadratni centimetar</unitPattern>
 				<unitPattern count="few">{0} kvadratna centimetra</unitPattern>
 				<unitPattern count="other">{0} kvadratnih centimetara</unitPattern>
+				<perUnitPattern>{0} po kvadratnom centimetru</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>kvadratne milje</displayName>
+				<unitPattern count="one">{0} kvadratna milja</unitPattern>
+				<unitPattern count="few">{0} kvadratne milje</unitPattern>
+				<unitPattern count="other">{0} kvadratnih milja</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>katastarskih jutara</displayName>
+				<unitPattern count="one">{0} katastarsko jutro</unitPattern>
+				<unitPattern count="few">{0} katastarska jutra</unitPattern>
+				<unitPattern count="other">{0} katastarskih jutara</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>kvadratni jard</displayName>
+				<unitPattern count="one">{0} kvadratni jard</unitPattern>
+				<unitPattern count="few">{0} kvadratna jarda</unitPattern>
+				<unitPattern count="other">{0} kvadratnih jarda</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>kvadratne stope</displayName>
@@ -6905,30 +7012,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kvadratni inč</unitPattern>
 				<unitPattern count="few">{0} kvadratna inča</unitPattern>
 				<unitPattern count="other">{0} kvadratnih inča</unitPattern>
+				<perUnitPattern>{0} po kvadratnom inču</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kvadratni kilometri</displayName>
-				<unitPattern count="one">{0} kvadratni kilometar</unitPattern>
-				<unitPattern count="few">{0} kvadratna kilometra</unitPattern>
-				<unitPattern count="other">{0} kvadratnih kilometara</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>kvadratni metri</displayName>
-				<unitPattern count="one">{0} kvadratni metar</unitPattern>
-				<unitPattern count="few">{0} kvadratna metra</unitPattern>
-				<unitPattern count="other">{0} kvadratnih metara</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>kvadratne milje</displayName>
-				<unitPattern count="one">{0} kvadratna milja</unitPattern>
-				<unitPattern count="few">{0} kvadratne milje</unitPattern>
-				<unitPattern count="other">{0} kvadratnih milja</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>kvadratni jard</displayName>
-				<unitPattern count="one">{0} kvadratni jard</unitPattern>
-				<unitPattern count="few">{0} kvadratna jarda</unitPattern>
-				<unitPattern count="other">{0} kvadratnih jarda</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karati</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="few">{0} karata</unitPattern>
+				<unitPattern count="other">{0} karata</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litri po kilometru</displayName>
@@ -6936,77 +7026,108 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} litra po kilometru</unitPattern>
 				<unitPattern count="other">{0} litara po kilometru</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>litara na 100 kilometara</displayName>
+				<unitPattern count="one">{0} litar na 100 kilometara</unitPattern>
+				<unitPattern count="few">{0} litara na 100 kilometara</unitPattern>
+				<unitPattern count="other">{0} litara na 100 kilometara</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>milje po galonu</displayName>
 				<unitPattern count="one">{0} milja po galonu</unitPattern>
 				<unitPattern count="few">{0} milje po galonu</unitPattern>
 				<unitPattern count="other">{0} milja po galonu</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>biti</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="few">{0} bita</unitPattern>
-				<unitPattern count="other">{0} bita</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bajtovi</displayName>
-				<unitPattern count="one">{0} bajt</unitPattern>
-				<unitPattern count="few">{0} bajta</unitPattern>
-				<unitPattern count="other">{0} bajtova</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabiti</displayName>
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="few">{0} gigabita</unitPattern>
-				<unitPattern count="other">{0} gigabita</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabajti</displayName>
-				<unitPattern count="one">{0} gigabajt</unitPattern>
-				<unitPattern count="few">{0} gigabajta</unitPattern>
-				<unitPattern count="other">{0} gigabajta</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobiti</displayName>
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="few">{0} kilobita</unitPattern>
-				<unitPattern count="other">{0} kilobita</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobajti</displayName>
-				<unitPattern count="one">{0} kilobajt</unitPattern>
-				<unitPattern count="few">{0} kilobajta</unitPattern>
-				<unitPattern count="other">{0} kilobajta</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabiti</displayName>
-				<unitPattern count="one">{0} megabit</unitPattern>
-				<unitPattern count="few">{0} megabita</unitPattern>
-				<unitPattern count="other">{0} megabita</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabajti</displayName>
-				<unitPattern count="one">{0} megabajta</unitPattern>
-				<unitPattern count="few">{0} megabajta</unitPattern>
-				<unitPattern count="other">{0} megabajta</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabiti</displayName>
-				<unitPattern count="one">{0} terabit</unitPattern>
-				<unitPattern count="few">{0} terabita</unitPattern>
-				<unitPattern count="other">{0} terabita</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabajti</displayName>
 				<unitPattern count="one">{0} terabajt</unitPattern>
 				<unitPattern count="few">{0} terabajta</unitPattern>
 				<unitPattern count="other">{0} terabajta</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabiti</displayName>
+				<unitPattern count="one">{0} terabit</unitPattern>
+				<unitPattern count="few">{0} terabita</unitPattern>
+				<unitPattern count="other">{0} terabita</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabajti</displayName>
+				<unitPattern count="one">{0} gigabajt</unitPattern>
+				<unitPattern count="few">{0} gigabajta</unitPattern>
+				<unitPattern count="other">{0} gigabajta</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabiti</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="few">{0} gigabita</unitPattern>
+				<unitPattern count="other">{0} gigabita</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabajti</displayName>
+				<unitPattern count="one">{0} megabajta</unitPattern>
+				<unitPattern count="few">{0} megabajta</unitPattern>
+				<unitPattern count="other">{0} megabajta</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabiti</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="few">{0} megabita</unitPattern>
+				<unitPattern count="other">{0} megabita</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobajti</displayName>
+				<unitPattern count="one">{0} kilobajt</unitPattern>
+				<unitPattern count="few">{0} kilobajta</unitPattern>
+				<unitPattern count="other">{0} kilobajta</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobiti</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="few">{0} kilobita</unitPattern>
+				<unitPattern count="other">{0} kilobita</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bajtovi</displayName>
+				<unitPattern count="one">{0} bajt</unitPattern>
+				<unitPattern count="few">{0} bajta</unitPattern>
+				<unitPattern count="other">{0} bajtova</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>biti</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="few">{0} bita</unitPattern>
+				<unitPattern count="other">{0} bita</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>stoljeća</displayName>
+			</unit>
+			<unit type="duration-year">
+				<displayName>godina</displayName>
+				<unitPattern count="one">{0} godina</unitPattern>
+				<unitPattern count="few">{0} godine</unitPattern>
+				<unitPattern count="other">{0} godina</unitPattern>
+				<perUnitPattern>{0} godišnje</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mjeseci</displayName>
+				<unitPattern count="one">{0} mjesec</unitPattern>
+				<unitPattern count="few">{0} mjeseca</unitPattern>
+				<unitPattern count="other">{0} mjeseci</unitPattern>
+				<perUnitPattern>{0} mjesečno</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>sedmica</displayName>
+				<unitPattern count="one">{0} sedmica</unitPattern>
+				<unitPattern count="few">{0} sedmice</unitPattern>
+				<unitPattern count="other">{0} sedmica</unitPattern>
+				<perUnitPattern>{0} sedmično</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>dana</displayName>
 				<unitPattern count="one">{0} dan</unitPattern>
 				<unitPattern count="few">{0} dana</unitPattern>
 				<unitPattern count="other">{0} dana</unitPattern>
+				<perUnitPattern>{0} dnevno</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>sati</displayName>
@@ -7015,35 +7136,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} sati</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="few">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milisekundi</displayName>
-				<unitPattern count="one">{0} milisekunda</unitPattern>
-				<unitPattern count="few">{0} milisekunde</unitPattern>
-				<unitPattern count="other">{0} milisekundi</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>minuta</displayName>
 				<unitPattern count="one">{0} minut</unitPattern>
 				<unitPattern count="few">{0} minute</unitPattern>
 				<unitPattern count="other">{0} minuta</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>mjeseci</displayName>
-				<unitPattern count="one">{0} mjesec</unitPattern>
-				<unitPattern count="few">{0} mjeseca</unitPattern>
-				<unitPattern count="other">{0} mjeseci</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="few">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0} po minuti</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sekundi</displayName>
@@ -7052,17 +7150,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} sekundi</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>sedmica</displayName>
-				<unitPattern count="one">{0} sedmica</unitPattern>
-				<unitPattern count="few">{0} sedmice</unitPattern>
-				<unitPattern count="other">{0} sedmica</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milisekundi</displayName>
+				<unitPattern count="one">{0} milisekunda</unitPattern>
+				<unitPattern count="few">{0} milisekunde</unitPattern>
+				<unitPattern count="other">{0} milisekundi</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>godina</displayName>
-				<unitPattern count="one">{0} godina</unitPattern>
-				<unitPattern count="few">{0} godine</unitPattern>
-				<unitPattern count="other">{0} godina</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="few">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="few">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amperi</displayName>
@@ -7088,6 +7192,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} volta</unitPattern>
 				<unitPattern count="other">{0} volta</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokalorije</displayName>
+				<unitPattern count="one">{0} kilokalorija</unitPattern>
+				<unitPattern count="few">{0} kilokalorije</unitPattern>
+				<unitPattern count="other">{0} kilokalorija</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kalorije</displayName>
 				<unitPattern count="one">{0} kalorija</unitPattern>
@@ -7100,24 +7210,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kalorije</unitPattern>
 				<unitPattern count="other">{0} kalorija</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>džuli</displayName>
-				<unitPattern count="one">{0} džul</unitPattern>
-				<unitPattern count="few">{0} džula</unitPattern>
-				<unitPattern count="other">{0} džula</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokalorije</displayName>
-				<unitPattern count="one">{0} kilokalorija</unitPattern>
-				<unitPattern count="few">{0} kilokalorije</unitPattern>
-				<unitPattern count="other">{0} kilokalorija</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilodžuli</displayName>
 				<unitPattern count="one">{0} kilodžul</unitPattern>
 				<unitPattern count="few">{0} kilodžula</unitPattern>
 				<unitPattern count="other">{0} kilodžula</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>džuli</displayName>
+				<unitPattern count="one">{0} džul</unitPattern>
+				<unitPattern count="few">{0} džula</unitPattern>
+				<unitPattern count="other">{0} džula</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilovat-sat</displayName>
 				<unitPattern count="one">{0} kilovat-sat</unitPattern>
@@ -7130,11 +7234,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} gigaherca</unitPattern>
 				<unitPattern count="other">{0} gigaherca</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>herci</displayName>
-				<unitPattern count="one">{0} herc</unitPattern>
-				<unitPattern count="few">{0} herca</unitPattern>
-				<unitPattern count="other">{0} herca</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megaherci</displayName>
+				<unitPattern count="one">{0} megaherc</unitPattern>
+				<unitPattern count="few">{0} megaherca</unitPattern>
+				<unitPattern count="other">{0} megaherca</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kiloherci</displayName>
@@ -7142,23 +7246,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kiloherca</unitPattern>
 				<unitPattern count="other">{0} kiloherca</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megaherci</displayName>
-				<unitPattern count="one">{0} megaherc</unitPattern>
-				<unitPattern count="few">{0} megaherca</unitPattern>
-				<unitPattern count="other">{0} megaherca</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>herci</displayName>
+				<unitPattern count="one">{0} herc</unitPattern>
+				<unitPattern count="few">{0} herca</unitPattern>
+				<unitPattern count="other">{0} herca</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>astronomske jedinice</displayName>
-				<unitPattern count="one">{0} astronomska jedinica</unitPattern>
-				<unitPattern count="few">{0} astronomske jedinice</unitPattern>
-				<unitPattern count="other">{0} astronomskih jedinica</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometara</displayName>
+				<unitPattern count="one">{0} kilometar</unitPattern>
+				<unitPattern count="few">{0} kilometra</unitPattern>
+				<unitPattern count="other">{0} kilometara</unitPattern>
+				<perUnitPattern>{0} po kilometru</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>centimetara</displayName>
-				<unitPattern count="one">{0} centimetar</unitPattern>
-				<unitPattern count="few">{0} centimetra</unitPattern>
-				<unitPattern count="other">{0} centimetara</unitPattern>
+			<unit type="length-meter">
+				<displayName>metara</displayName>
+				<unitPattern count="one">{0} metar</unitPattern>
+				<unitPattern count="few">{0} metra</unitPattern>
+				<unitPattern count="other">{0} metara</unitPattern>
+				<perUnitPattern>{0} po metru</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>decimetara</displayName>
@@ -7166,47 +7272,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} decimetara</unitPattern>
 				<unitPattern count="other">{0} decimetara</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>stopa</displayName>
-				<unitPattern count="one">{0} stopa</unitPattern>
-				<unitPattern count="few">{0} stope</unitPattern>
-				<unitPattern count="other">{0} stopa</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>inča</displayName>
-				<unitPattern count="one">{0} inč</unitPattern>
-				<unitPattern count="few">{0} inča</unitPattern>
-				<unitPattern count="other">{0} inča</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometara</displayName>
-				<unitPattern count="one">{0} kilometar</unitPattern>
-				<unitPattern count="few">{0} kilometra</unitPattern>
-				<unitPattern count="other">{0} kilometara</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>svjetlosnih godina</displayName>
-				<unitPattern count="one">{0} svjetlosna godina</unitPattern>
-				<unitPattern count="few">{0} svjetlosne godine</unitPattern>
-				<unitPattern count="other">{0} svjetlosnih godina</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metara</displayName>
-				<unitPattern count="one">{0} metar</unitPattern>
-				<unitPattern count="few">{0} metra</unitPattern>
-				<unitPattern count="other">{0} metara</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>mikrometara</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="few">{0} mikrometra</unitPattern>
-				<unitPattern count="other">{0} mikrometara</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>milja</displayName>
-				<unitPattern count="one">{0} milja</unitPattern>
-				<unitPattern count="few">{0} milje</unitPattern>
-				<unitPattern count="other">{0} milja</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>centimetara</displayName>
+				<unitPattern count="one">{0} centimetar</unitPattern>
+				<unitPattern count="few">{0} centimetra</unitPattern>
+				<unitPattern count="other">{0} centimetara</unitPattern>
+				<perUnitPattern>{0} po centimetru</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>milimetara</displayName>
@@ -7214,71 +7285,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} milimetra</unitPattern>
 				<unitPattern count="other">{0} milimetara</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikrometara</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="few">{0} mikrometra</unitPattern>
+				<unitPattern count="other">{0} mikrometara</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanometara</displayName>
 				<unitPattern count="one">{0} nanometar</unitPattern>
 				<unitPattern count="few">{0} nanometra</unitPattern>
 				<unitPattern count="other">{0} nanometara</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nautičke milje</displayName>
-				<unitPattern count="one">{0} nautička milja</unitPattern>
-				<unitPattern count="few">{0} nautičke milje</unitPattern>
-				<unitPattern count="other">{0} nautičkih milja</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parseci</displayName>
-				<unitPattern count="one">{0} parsek</unitPattern>
-				<unitPattern count="few">{0} parseka</unitPattern>
-				<unitPattern count="other">{0} parseka</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pikometara</displayName>
 				<unitPattern count="one">{0} pikometar</unitPattern>
 				<unitPattern count="few">{0} pikometra</unitPattern>
 				<unitPattern count="other">{0} pikometara</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>milja</displayName>
+				<unitPattern count="one">{0} milja</unitPattern>
+				<unitPattern count="few">{0} milje</unitPattern>
+				<unitPattern count="other">{0} milja</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>jardi</displayName>
 				<unitPattern count="one">{0} jard</unitPattern>
 				<unitPattern count="few">{0} jarda</unitPattern>
 				<unitPattern count="other">{0} jardi</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>stopa</displayName>
+				<unitPattern count="one">{0} stopa</unitPattern>
+				<unitPattern count="few">{0} stope</unitPattern>
+				<unitPattern count="other">{0} stopa</unitPattern>
+				<perUnitPattern>{0} po stopi</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>inča</displayName>
+				<unitPattern count="one">{0} inč</unitPattern>
+				<unitPattern count="few">{0} inča</unitPattern>
+				<unitPattern count="other">{0} inča</unitPattern>
+				<perUnitPattern>{0} po inču</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parseci</displayName>
+				<unitPattern count="one">{0} parsek</unitPattern>
+				<unitPattern count="few">{0} parseka</unitPattern>
+				<unitPattern count="other">{0} parseka</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>svjetlosnih godina</displayName>
+				<unitPattern count="one">{0} svjetlosna godina</unitPattern>
+				<unitPattern count="few">{0} svjetlosne godine</unitPattern>
+				<unitPattern count="other">{0} svjetlosnih godina</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>astronomske jedinice</displayName>
+				<unitPattern count="one">{0} astronomska jedinica</unitPattern>
+				<unitPattern count="few">{0} astronomske jedinice</unitPattern>
+				<unitPattern count="other">{0} astronomskih jedinica</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nautičke milje</displayName>
+				<unitPattern count="one">{0} nautička milja</unitPattern>
+				<unitPattern count="few">{0} nautičke milje</unitPattern>
+				<unitPattern count="other">{0} nautičkih milja</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>skandinavska milja</displayName>
+				<unitPattern count="one">{0} skandinavska milja</unitPattern>
+				<unitPattern count="few">{0} skandinavske milje</unitPattern>
+				<unitPattern count="other">{0} skandinavskih milja</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>luksi</displayName>
 				<unitPattern count="one">{0} luks</unitPattern>
 				<unitPattern count="few">{0} luksa</unitPattern>
 				<unitPattern count="other">{0} luksa</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karati</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="few">{0} karata</unitPattern>
-				<unitPattern count="other">{0} karata</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>grami</displayName>
-				<unitPattern count="one">{0} gram</unitPattern>
-				<unitPattern count="few">{0} grama</unitPattern>
-				<unitPattern count="other">{0} grama</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogrami</displayName>
-				<unitPattern count="one">{0} kilogram</unitPattern>
-				<unitPattern count="few">{0} kilograma</unitPattern>
-				<unitPattern count="other">{0} kilograma</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>metričke tone</displayName>
 				<unitPattern count="one">{0} metrička tona</unitPattern>
 				<unitPattern count="few">{0} metričke tone</unitPattern>
 				<unitPattern count="other">{0} metričkih tona</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mikrogrami</displayName>
-				<unitPattern count="one">{0} mikrogram</unitPattern>
-				<unitPattern count="few">{0} mikrograma</unitPattern>
-				<unitPattern count="other">{0} mikrograma</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogrami</displayName>
+				<unitPattern count="one">{0} kilogram</unitPattern>
+				<unitPattern count="few">{0} kilograma</unitPattern>
+				<unitPattern count="other">{0} kilograma</unitPattern>
+				<perUnitPattern>{0} po kilogramu</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>grami</displayName>
+				<unitPattern count="one">{0} gram</unitPattern>
+				<unitPattern count="few">{0} grama</unitPattern>
+				<unitPattern count="other">{0} grama</unitPattern>
+				<perUnitPattern>{0} po gramu</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>miligrami</displayName>
@@ -7286,23 +7391,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} miligrama</unitPattern>
 				<unitPattern count="other">{0} miligrama</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>unce</displayName>
-				<unitPattern count="one">{0} unca</unitPattern>
-				<unitPattern count="few">{0} unce</unitPattern>
-				<unitPattern count="other">{0} unci</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>fine unce</displayName>
-				<unitPattern count="one">{0} fina unca</unitPattern>
-				<unitPattern count="few">{0} fine unce</unitPattern>
-				<unitPattern count="other">{0} finih unci</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>funte</displayName>
-				<unitPattern count="one">{0} funta</unitPattern>
-				<unitPattern count="few">{0} funte</unitPattern>
-				<unitPattern count="other">{0} funti</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>mikrogrami</displayName>
+				<unitPattern count="one">{0} mikrogram</unitPattern>
+				<unitPattern count="few">{0} mikrograma</unitPattern>
+				<unitPattern count="other">{0} mikrograma</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tone</displayName>
@@ -7310,35 +7403,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} tone</unitPattern>
 				<unitPattern count="other">{0} tona</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>funte</displayName>
+				<unitPattern count="one">{0} funta</unitPattern>
+				<unitPattern count="few">{0} funte</unitPattern>
+				<unitPattern count="other">{0} funti</unitPattern>
+				<perUnitPattern>{0} po funti</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>unce</displayName>
+				<unitPattern count="one">{0} unca</unitPattern>
+				<unitPattern count="few">{0} unce</unitPattern>
+				<unitPattern count="other">{0} unci</unitPattern>
+				<perUnitPattern>{0} po unci</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>fine unce</displayName>
+				<unitPattern count="one">{0} fina unca</unitPattern>
+				<unitPattern count="few">{0} fine unce</unitPattern>
+				<unitPattern count="other">{0} finih unci</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karati</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="few">{0} karata</unitPattern>
+				<unitPattern count="other">{0} karata</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigavati</displayName>
 				<unitPattern count="one">{0} gigavat</unitPattern>
 				<unitPattern count="few">{0} gigavata</unitPattern>
 				<unitPattern count="other">{0} gigavata</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>konjske snage</displayName>
-				<unitPattern count="one">{0} konjska snaga</unitPattern>
-				<unitPattern count="few">{0} konjske snage</unitPattern>
-				<unitPattern count="other">{0} konjskih snaga</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilovati</displayName>
-				<unitPattern count="one">{0} kilovat</unitPattern>
-				<unitPattern count="few">{0} kilovata</unitPattern>
-				<unitPattern count="other">{0} kilovata</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>megavati</displayName>
 				<unitPattern count="one">{0} megavat</unitPattern>
 				<unitPattern count="few">{0} megavata</unitPattern>
 				<unitPattern count="other">{0} megavata</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>milivati</displayName>
-				<unitPattern count="one">{0} milivat</unitPattern>
-				<unitPattern count="few">{0} milivata</unitPattern>
-				<unitPattern count="other">{0} milivata</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilovati</displayName>
+				<unitPattern count="one">{0} kilovat</unitPattern>
+				<unitPattern count="few">{0} kilovata</unitPattern>
+				<unitPattern count="other">{0} kilovata</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>vati</displayName>
@@ -7346,24 +7453,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} vata</unitPattern>
 				<unitPattern count="other">{0} vata</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>milivati</displayName>
+				<unitPattern count="one">{0} milivat</unitPattern>
+				<unitPattern count="few">{0} milivata</unitPattern>
+				<unitPattern count="other">{0} milivata</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>konjske snage</displayName>
+				<unitPattern count="one">{0} konjska snaga</unitPattern>
+				<unitPattern count="few">{0} konjske snage</unitPattern>
+				<unitPattern count="other">{0} konjskih snaga</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hektopaskali</displayName>
 				<unitPattern count="one">{0} hektopaskal</unitPattern>
 				<unitPattern count="few">{0} hektopaskala</unitPattern>
 				<unitPattern count="other">{0} hektopaskala</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inčevi žive</displayName>
-				<unitPattern count="one">{0} inč žive</unitPattern>
-				<unitPattern count="few">{0} inča žive</unitPattern>
-				<unitPattern count="other">{0} inča žive</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>milibari</displayName>
-				<unitPattern count="one">{0} milibar</unitPattern>
-				<unitPattern count="few">{0} milibara</unitPattern>
-				<unitPattern count="other">{0} milibara</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>milimetri žive</displayName>
 				<unitPattern count="one">{0} milimetar žive</unitPattern>
@@ -7376,11 +7483,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} funte po kvadratnom inču</unitPattern>
 				<unitPattern count="other">{0} funti po kvadratnom inču</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karati</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="few">{0} karata</unitPattern>
-				<unitPattern count="other">{0} karata</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inčevi žive</displayName>
+				<unitPattern count="one">{0} inč žive</unitPattern>
+				<unitPattern count="few">{0} inča žive</unitPattern>
+				<unitPattern count="other">{0} inča žive</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>milibari</displayName>
+				<unitPattern count="one">{0} milibar</unitPattern>
+				<unitPattern count="few">{0} milibara</unitPattern>
+				<unitPattern count="other">{0} milibara</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometara na sat</displayName>
@@ -7400,6 +7513,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} milje na sat</unitPattern>
 				<unitPattern count="other">{0} milja na sat</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>čvor</displayName>
+				<unitPattern count="one">{0} čvor</unitPattern>
+				<unitPattern count="few">{0} čvora</unitPattern>
+				<unitPattern count="other">{0} čvorova</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>Celzijusovi stepeni</displayName>
 				<unitPattern count="one">{0} Celzijusov stepen</unitPattern>
@@ -7418,36 +7543,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} Kelvinova stepena</unitPattern>
 				<unitPattern count="other">{0} Kelvinovih stepeni</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="few">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>centilitri</displayName>
-				<unitPattern count="one">{0} centilitar</unitPattern>
-				<unitPattern count="few">{0} centilitra</unitPattern>
-				<unitPattern count="other">{0} centilitara</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>kubni centimetri</displayName>
-				<unitPattern count="one">{0} kubni centimetar</unitPattern>
-				<unitPattern count="few">{0} kubna centimetra</unitPattern>
-				<unitPattern count="other">{0} kubnih centimetara</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>kubne stope</displayName>
-				<unitPattern count="one">{0} kubna stopa</unitPattern>
-				<unitPattern count="few">{0} kubne stope</unitPattern>
-				<unitPattern count="other">{0} kubnih stopa</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>kubni inči</displayName>
-				<unitPattern count="one">{0} kubni inč</unitPattern>
-				<unitPattern count="few">{0} kubna inča</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kubni kilometri</displayName>
 				<unitPattern count="one">{0} kubni kilometar</unitPattern>
@@ -7459,6 +7554,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kubni metar</unitPattern>
 				<unitPattern count="few">{0} kubna metra</unitPattern>
 				<unitPattern count="other">{0} kubnih metara</unitPattern>
+				<perUnitPattern>{0} po kubnom metru</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>kubni centimetri</displayName>
+				<unitPattern count="one">{0} kubni centimetar</unitPattern>
+				<unitPattern count="few">{0} kubna centimetra</unitPattern>
+				<unitPattern count="other">{0} kubnih centimetara</unitPattern>
+				<perUnitPattern>{0} po kubnom centimetru</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>kubne milje</displayName>
@@ -7472,29 +7575,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kubna jarda</unitPattern>
 				<unitPattern count="other">{0} kubnih jarda</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>čaša</displayName>
-				<unitPattern count="one">{0} čaša</unitPattern>
-				<unitPattern count="few">{0} čaše</unitPattern>
-				<unitPattern count="other">{0} čaša</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>kubne stope</displayName>
+				<unitPattern count="one">{0} kubna stopa</unitPattern>
+				<unitPattern count="few">{0} kubne stope</unitPattern>
+				<unitPattern count="other">{0} kubnih stopa</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>decilitri</displayName>
-				<unitPattern count="one">{0} decilitar</unitPattern>
-				<unitPattern count="few">{0} decilitra</unitPattern>
-				<unitPattern count="other">{0} decilitara</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>kubni inči</displayName>
+				<unitPattern count="one">{0} kubni inč</unitPattern>
+				<unitPattern count="few">{0} kubna inča</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>tečne unce</displayName>
-				<unitPattern count="one">{0} tečna unca</unitPattern>
-				<unitPattern count="few">{0} tečne unce</unitPattern>
-				<unitPattern count="other">{0} tečnih unci</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>galoni</displayName>
-				<unitPattern count="one">{0} galon</unitPattern>
-				<unitPattern count="few">{0} galona</unitPattern>
-				<unitPattern count="other">{0} galona</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megalitri</displayName>
+				<unitPattern count="one">{0} megalitar</unitPattern>
+				<unitPattern count="few">{0} megalitra</unitPattern>
+				<unitPattern count="other">{0} megalitara</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hektolitri</displayName>
@@ -7507,12 +7604,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} litar</unitPattern>
 				<unitPattern count="few">{0} litra</unitPattern>
 				<unitPattern count="other">{0} litara</unitPattern>
+				<perUnitPattern>{0} po litru</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalitri</displayName>
-				<unitPattern count="one">{0} megalitar</unitPattern>
-				<unitPattern count="few">{0} megalitra</unitPattern>
-				<unitPattern count="other">{0} megalitara</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>decilitri</displayName>
+				<unitPattern count="one">{0} decilitar</unitPattern>
+				<unitPattern count="few">{0} decilitra</unitPattern>
+				<unitPattern count="other">{0} decilitara</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centilitri</displayName>
+				<unitPattern count="one">{0} centilitar</unitPattern>
+				<unitPattern count="few">{0} centilitra</unitPattern>
+				<unitPattern count="other">{0} centilitara</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mililitri</displayName>
@@ -7520,11 +7624,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mililitra</unitPattern>
 				<unitPattern count="other">{0} mililitara</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pinte</displayName>
-				<unitPattern count="one">{0} pinta</unitPattern>
-				<unitPattern count="few">{0} pinte</unitPattern>
-				<unitPattern count="other">{0} pinti</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>metričke pinte</displayName>
+				<unitPattern count="one">{0} metrička pinta</unitPattern>
+				<unitPattern count="few">{0} metričke pinte</unitPattern>
+				<unitPattern count="other">{0} metričkih pinti</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>metričke šolje</displayName>
+				<unitPattern count="one">{0} metrička šolja</unitPattern>
+				<unitPattern count="few">{0} metričke šolje</unitPattern>
+				<unitPattern count="other">{0} metričkih šolja</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="few">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galoni</displayName>
+				<unitPattern count="one">{0} galon</unitPattern>
+				<unitPattern count="few">{0} galona</unitPattern>
+				<unitPattern count="other">{0} galona</unitPattern>
+				<perUnitPattern>{0} po galonu</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>kvarti</displayName>
@@ -7532,6 +7655,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kvarta</unitPattern>
 				<unitPattern count="other">{0} kvarti</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pinte</displayName>
+				<unitPattern count="one">{0} pinta</unitPattern>
+				<unitPattern count="few">{0} pinte</unitPattern>
+				<unitPattern count="other">{0} pinti</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>čaša</displayName>
+				<unitPattern count="one">{0} čaša</unitPattern>
+				<unitPattern count="few">{0} čaše</unitPattern>
+				<unitPattern count="other">{0} čaša</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>tečne unce</displayName>
+				<unitPattern count="one">{0} tečna unca</unitPattern>
+				<unitPattern count="few">{0} tečne unce</unitPattern>
+				<unitPattern count="other">{0} tečnih unci</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>kašike</displayName>
 				<unitPattern count="one">{0} kašika</unitPattern>
@@ -7544,6 +7685,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kašičice</unitPattern>
 				<unitPattern count="other">{0} kašičica</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} istok</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} sjever</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} jug</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}Z</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -7561,6 +7708,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>okret</displayName>
+				<unitPattern count="one">{0} okr.</unitPattern>
+				<unitPattern count="few">{0} okr.</unitPattern>
+				<unitPattern count="other">{0} okr.</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="few">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>stepeni</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>lučni minut</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
@@ -7573,23 +7738,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>stepeni</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="few">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="few">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>katastarskih jutara</displayName>
-				<unitPattern count="one">{0} kj</unitPattern>
-				<unitPattern count="few">{0} kj</unitPattern>
-				<unitPattern count="other">{0} kj</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="few">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektara</displayName>
@@ -7597,11 +7750,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="few">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="few">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0} po cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="few">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>katastarskih jutara</displayName>
+				<unitPattern count="one">{0} kj</unitPattern>
+				<unitPattern count="few">{0} kj</unitPattern>
+				<unitPattern count="other">{0} kj</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="few">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ft²</displayName>
@@ -7614,30 +7793,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="few">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="few">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="few">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="few">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="few">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="few">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
@@ -7645,77 +7807,111 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} L/km</unitPattern>
 				<unitPattern count="other">{0} L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} L/100km</unitPattern>
+				<unitPattern count="few">{0} L/100km</unitPattern>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="few">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="few">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bajt</displayName>
-				<unitPattern count="one">{0} bajt</unitPattern>
-				<unitPattern count="few">{0} bajt</unitPattern>
-				<unitPattern count="other">{0} bajt</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="few">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="few">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="few">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="few">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="few">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="few">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="few">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="few">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="few">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="few">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="few">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="few">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="few">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="few">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="few">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bajt</displayName>
+				<unitPattern count="one">{0} bajt</unitPattern>
+				<unitPattern count="few">{0} bajt</unitPattern>
+				<unitPattern count="other">{0} bajt</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="few">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>st.</displayName>
+				<unitPattern count="one">{0} st.</unitPattern>
+				<unitPattern count="few">{0} st.</unitPattern>
+				<unitPattern count="other">{0} st.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>godina</displayName>
+				<unitPattern count="one">{0} god</unitPattern>
+				<unitPattern count="few">{0} god</unitPattern>
+				<unitPattern count="other">{0} god</unitPattern>
+				<perUnitPattern>{0} god.</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mjeseci</displayName>
+				<unitPattern count="one">{0} mj</unitPattern>
+				<unitPattern count="few">{0} mj</unitPattern>
+				<unitPattern count="other">{0} mj</unitPattern>
+				<perUnitPattern>{0} mjes.</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>sedmica</displayName>
+				<unitPattern count="one">{0} sedm</unitPattern>
+				<unitPattern count="few">{0} sedm</unitPattern>
+				<unitPattern count="other">{0} sedm</unitPattern>
+				<perUnitPattern>{0} sedm.</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>dana</displayName>
 				<unitPattern count="one">{0} dan</unitPattern>
 				<unitPattern count="few">{0} dana</unitPattern>
 				<unitPattern count="other">{0} dan</unitPattern>
+				<perUnitPattern>{0} dn.</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>sati</displayName>
@@ -7724,35 +7920,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} sat</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="few">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milisekundi</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="few">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>minuta</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
 				<unitPattern count="few">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>mjeseci</displayName>
-				<unitPattern count="one">{0} mj</unitPattern>
-				<unitPattern count="few">{0} mj</unitPattern>
-				<unitPattern count="other">{0} mj</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="few">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sekundi</displayName>
@@ -7761,17 +7934,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} sek</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>sedmica</displayName>
-				<unitPattern count="one">{0} sedm</unitPattern>
-				<unitPattern count="few">{0} sedm</unitPattern>
-				<unitPattern count="other">{0} sedm</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milisekundi</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="few">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>godina</displayName>
-				<unitPattern count="one">{0} god</unitPattern>
-				<unitPattern count="few">{0} god</unitPattern>
-				<unitPattern count="other">{0} god</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="few">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="few">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amp</displayName>
@@ -7797,6 +7976,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="few">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kal.</displayName>
 				<unitPattern count="one">{0} kal.</unitPattern>
@@ -7809,24 +7994,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kal.</unitPattern>
 				<unitPattern count="other">{0} kal.</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>džuli</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="few">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="few">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilodžul</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="few">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>džuli</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="few">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kW-sat</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -7839,11 +8018,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="few">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="few">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
@@ -7851,23 +8030,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="few">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="few">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>aj</displayName>
-				<unitPattern count="one">{0} aj</unitPattern>
-				<unitPattern count="few">{0} aj</unitPattern>
-				<unitPattern count="other">{0} aj</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometara</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="few">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>centimetara</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="few">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>metara</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="few">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
@@ -7875,47 +8056,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>stopa</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="few">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>inča</displayName>
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="few">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometara</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="few">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>svjetlosnih godina</displayName>
-				<unitPattern count="one">{0} gs</unitPattern>
-				<unitPattern count="few">{0} gs</unitPattern>
-				<unitPattern count="other">{0} gs</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metara</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="few">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="few">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>milja</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="few">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>centimetara</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="few">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -7923,71 +8069,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="few">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="few">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="few">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parseka</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="few">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="few">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>milja</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="few">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>jardi</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="few">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>stopa</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="few">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>inča</displayName>
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="few">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parseka</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="few">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>svjetlosnih godina</displayName>
+				<unitPattern count="one">{0} gs</unitPattern>
+				<unitPattern count="few">{0} gs</unitPattern>
+				<unitPattern count="other">{0} gs</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>aj</displayName>
+				<unitPattern count="one">{0} aj</unitPattern>
+				<unitPattern count="few">{0} aj</unitPattern>
+				<unitPattern count="other">{0} aj</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="few">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="few">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="few">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karati</displayName>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="few">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>grami</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="few">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="few">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="few">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="few">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="few">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>grami</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
@@ -7995,23 +8175,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="few">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="few">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="few">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="few">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tone</displayName>
@@ -8019,35 +8187,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} tn</unitPattern>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="few">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lbs</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="few">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="few">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karati</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="few">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="few">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>ks</displayName>
-				<unitPattern count="one">{0} ks</unitPattern>
-				<unitPattern count="few">{0} ks</unitPattern>
-				<unitPattern count="other">{0} ks</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="few">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="few">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="few">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="few">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>vati</displayName>
@@ -8055,24 +8237,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="few">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>ks</displayName>
+				<unitPattern count="one">{0} ks</unitPattern>
+				<unitPattern count="few">{0} ks</unitPattern>
+				<unitPattern count="other">{0} ks</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="few">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>in Hg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="few">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="few">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -8085,11 +8267,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="few">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>in Hg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="few">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="few">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -8109,6 +8297,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>čv</displayName>
+				<unitPattern count="one">{0} čv</unitPattern>
+				<unitPattern count="few">{0} čv</unitPattern>
+				<unitPattern count="other">{0} čv</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -8127,36 +8327,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0}°K</unitPattern>
 				<unitPattern count="other">{0}°K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="few">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cL</displayName>
-				<unitPattern count="one">{0} cL</unitPattern>
-				<unitPattern count="few">{0} cL</unitPattern>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="few">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="few">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="few">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -8168,6 +8338,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="few">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="few">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -8181,29 +8359,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>čaša</displayName>
-				<unitPattern count="one">{0} čaša</unitPattern>
-				<unitPattern count="few">{0} čaše</unitPattern>
-				<unitPattern count="other">{0} čaša</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="few">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="one">{0} dL</unitPattern>
-				<unitPattern count="few">{0} dL</unitPattern>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="few">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="few">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="few">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="few">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -8216,12 +8388,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="few">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="one">{0} ML</unitPattern>
-				<unitPattern count="few">{0} ML</unitPattern>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0} dL</unitPattern>
+				<unitPattern count="few">{0} dL</unitPattern>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="one">{0} cL</unitPattern>
+				<unitPattern count="few">{0} cL</unitPattern>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
@@ -8229,11 +8408,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mL</unitPattern>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pinte</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="few">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="few">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="few">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="few">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="few">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
@@ -8241,6 +8439,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pinte</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="few">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>čaša</displayName>
+				<unitPattern count="one">{0} čaša</unitPattern>
+				<unitPattern count="few">{0} čaše</unitPattern>
+				<unitPattern count="other">{0} čaša</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="few">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>tbsp</displayName>
 				<unitPattern count="one">{0} tbsp</unitPattern>
@@ -8253,6 +8469,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} tsp</unitPattern>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} ist.</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} sj.</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} j.</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}Z</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -8263,6 +8485,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="provisional">{0} G</unitPattern>
 				<unitPattern count="other" draft="provisional">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one" draft="provisional">{0}°</unitPattern>
+				<unitPattern count="few" draft="provisional">{0}°</unitPattern>
+				<unitPattern count="other" draft="provisional">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one" draft="provisional">{0}′</unitPattern>
 				<unitPattern count="few" draft="provisional">{0}′</unitPattern>
@@ -8273,31 +8500,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="provisional">{0}″</unitPattern>
 				<unitPattern count="other" draft="provisional">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one" draft="provisional">{0}°</unitPattern>
-				<unitPattern count="few" draft="provisional">{0}°</unitPattern>
-				<unitPattern count="other" draft="provisional">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one" draft="provisional">{0} kj</unitPattern>
-				<unitPattern count="few" draft="provisional">{0} kj</unitPattern>
-				<unitPattern count="other" draft="provisional">{0} kj</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one" draft="provisional">{0} km²</unitPattern>
+				<unitPattern count="few" draft="provisional">{0} km²</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one" draft="provisional">{0} ha</unitPattern>
 				<unitPattern count="few" draft="provisional">{0} ha</unitPattern>
 				<unitPattern count="other" draft="provisional">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one" draft="provisional">{0} ft²</unitPattern>
-				<unitPattern count="few" draft="provisional">{0} ft²</unitPattern>
-				<unitPattern count="other" draft="provisional">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one" draft="provisional">{0} km²</unitPattern>
-				<unitPattern count="few" draft="provisional">{0} km²</unitPattern>
-				<unitPattern count="other" draft="provisional">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one" draft="provisional">{0} m²</unitPattern>
 				<unitPattern count="few" draft="provisional">{0} m²</unitPattern>
@@ -8308,6 +8520,40 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="provisional">{0} mi²</unitPattern>
 				<unitPattern count="other" draft="provisional">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one" draft="provisional">{0} kj</unitPattern>
+				<unitPattern count="few" draft="provisional">{0} kj</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} kj</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one" draft="provisional">{0} ft²</unitPattern>
+				<unitPattern count="few" draft="provisional">{0} ft²</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0}l/100km</unitPattern>
+				<unitPattern count="few">{0}l/100km</unitPattern>
+				<unitPattern count="other">{0}l/100km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>godina</displayName>
+				<unitPattern count="one">{0} god</unitPattern>
+				<unitPattern count="few">{0} god</unitPattern>
+				<unitPattern count="other">{0} god</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mjesec</displayName>
+				<unitPattern count="one">{0} mj.</unitPattern>
+				<unitPattern count="few">{0} mj.</unitPattern>
+				<unitPattern count="other">{0} mj.</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>sedm.</displayName>
+				<unitPattern count="one">{0} sedm</unitPattern>
+				<unitPattern count="few">{0} sedm</unitPattern>
+				<unitPattern count="other">{0} sedm</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>dan</displayName>
 				<unitPattern count="one">{0} dan</unitPattern>
@@ -8320,57 +8566,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} sat</unitPattern>
 				<unitPattern count="other">{0} sat</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milisekundi</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="few">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>minuta</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
 				<unitPattern count="few">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>mjesec</displayName>
-				<unitPattern count="one">{0} mj.</unitPattern>
-				<unitPattern count="few">{0} mj.</unitPattern>
-				<unitPattern count="other">{0} mj.</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>sekundi</displayName>
 				<unitPattern count="one">{0} sek</unitPattern>
 				<unitPattern count="few">{0} sek</unitPattern>
 				<unitPattern count="other">{0} sek</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>sedm.</displayName>
-				<unitPattern count="one">{0} sedm</unitPattern>
-				<unitPattern count="few">{0} sedm</unitPattern>
-				<unitPattern count="other">{0} sedm</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>godina</displayName>
-				<unitPattern count="one">{0} god</unitPattern>
-				<unitPattern count="few">{0} god</unitPattern>
-				<unitPattern count="other">{0} god</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="few">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one" draft="provisional">{0}′</unitPattern>
-				<unitPattern count="few" draft="provisional">{0}′</unitPattern>
-				<unitPattern count="other" draft="provisional">{0}′</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one" draft="provisional">{0}″</unitPattern>
-				<unitPattern count="few" draft="provisional">{0}″</unitPattern>
-				<unitPattern count="other" draft="provisional">{0}″</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milisekundi</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="few">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>kilometara</displayName>
@@ -8378,21 +8590,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} km</unitPattern>
 				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one" draft="provisional">{0} ly</unitPattern>
-				<unitPattern count="few" draft="provisional">{0} ly</unitPattern>
-				<unitPattern count="other" draft="provisional">{0} ly</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>metara</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
 				<unitPattern count="few">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one" draft="provisional">{0} mi</unitPattern>
-				<unitPattern count="few" draft="provisional">{0} mi</unitPattern>
-				<unitPattern count="other" draft="provisional">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="few">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -8405,16 +8613,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="provisional">{0} pm</unitPattern>
 				<unitPattern count="other" draft="provisional">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one" draft="provisional">{0} mi</unitPattern>
+				<unitPattern count="few" draft="provisional">{0} mi</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one" draft="provisional">{0} yd</unitPattern>
 				<unitPattern count="few" draft="provisional">{0} yd</unitPattern>
 				<unitPattern count="other" draft="provisional">{0} yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>gram</displayName>
-				<unitPattern count="one">{0}g</unitPattern>
-				<unitPattern count="few">{0}g</unitPattern>
-				<unitPattern count="other">{0}g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one" draft="provisional">{0}′</unitPattern>
+				<unitPattern count="few" draft="provisional">{0}′</unitPattern>
+				<unitPattern count="other" draft="provisional">{0}′</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one" draft="provisional">{0}″</unitPattern>
+				<unitPattern count="few" draft="provisional">{0}″</unitPattern>
+				<unitPattern count="other" draft="provisional">{0}″</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one" draft="provisional">{0} ly</unitPattern>
+				<unitPattern count="few" draft="provisional">{0} ly</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} ly</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
@@ -8422,20 +8644,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0}kg</unitPattern>
 				<unitPattern count="other">{0}kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one" draft="provisional">{0} oz</unitPattern>
-				<unitPattern count="few" draft="provisional">{0} oz</unitPattern>
-				<unitPattern count="other" draft="provisional">{0} oz</unitPattern>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="one">{0}g</unitPattern>
+				<unitPattern count="few">{0}g</unitPattern>
+				<unitPattern count="other">{0}g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one" draft="provisional">{0} lb</unitPattern>
 				<unitPattern count="few" draft="provisional">{0} lb</unitPattern>
 				<unitPattern count="other" draft="provisional">{0} lb</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one" draft="provisional">{0} KS</unitPattern>
-				<unitPattern count="few" draft="provisional">{0} KS</unitPattern>
-				<unitPattern count="other" draft="provisional">{0} KS</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one" draft="provisional">{0} oz</unitPattern>
+				<unitPattern count="few" draft="provisional">{0} oz</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one" draft="provisional">{0} kW</unitPattern>
@@ -8447,6 +8670,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="provisional">{0} W</unitPattern>
 				<unitPattern count="other" draft="provisional">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one" draft="provisional">{0} KS</unitPattern>
+				<unitPattern count="few" draft="provisional">{0} KS</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} KS</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one" draft="provisional">{0} hPa</unitPattern>
 				<unitPattern count="few" draft="provisional">{0} hPa</unitPattern>
@@ -8505,6 +8733,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0}l</unitPattern>
 				<unitPattern count="other">{0}l</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}I</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}J</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}Z</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bs_Cyrl.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Cyrl.xml
similarity index 93%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bs_Cyrl.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Cyrl.xml
index 90eb7950743..468a6f86b1a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bs_Cyrl.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Cyrl.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="bs"/>
 		<script type="Cyrl"/>
 	</identity>
@@ -386,7 +385,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="srr">серер</language>
 			<language type="ss">свати</language>
 			<language type="st">сесото</language>
-			<language type="su">судански</language>
+			<language type="su">сундански</language>
 			<language type="suk">сукума</language>
 			<language type="sus">сусу</language>
 			<language type="sux">сумерски</language>
@@ -565,7 +564,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Sgnw">знаковно писмо</script>
 			<script type="Shaw">шавијанско писмо</script>
 			<script type="Sinh">синхала писмо</script>
-			<script type="Sund">суданско писмо</script>
 			<script type="Sylo">силоти нагри писмо</script>
 			<script type="Syrc">сиријско писмо</script>
 			<script type="Syre">сиријско естрангело писмо</script>
@@ -631,11 +629,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AD">Андора</territory>
 			<territory type="AE">Уједињени Арапски Емирати</territory>
 			<territory type="AF">Авганистан</territory>
-			<territory type="AG">Антигве и Барбуда</territory>
+			<territory type="AG">Антигва и Барбуда</territory>
 			<territory type="AI">Ангвила</territory>
 			<territory type="AL">Албанија</territory>
 			<territory type="AM">Арменија</territory>
-			<territory type="AN">Холандски Антили</territory>
 			<territory type="AO">Ангола</territory>
 			<territory type="AQ">Антарктик</territory>
 			<territory type="AR">Аргентина</territory>
@@ -930,65 +927,65 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x" draft="contributed">Приватна употреба</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers" draft="contributed">арапско-индијске цифре</type>
-			<type type="arabext" key="numbers" draft="contributed">продужене арапско-индијске цифре</type>
-			<type type="armn" key="numbers" draft="contributed">јерменски бројеви</type>
-			<type type="armnlow" key="numbers" draft="contributed">мали јерменски бројеви</type>
-			<type type="beng" key="numbers" draft="contributed">бенгалске цифре</type>
-			<type type="big5han" key="collation">Традиционално кинеско сортирање</type>
-			<type type="buddhist" key="calendar">Будистички календар</type>
-			<type type="chinese" key="calendar">Кинески календар</type>
-			<type type="coptic" key="calendar" draft="contributed">коптски календар</type>
-			<type type="deva" key="numbers" draft="contributed">девангари цифре</type>
-			<type type="dictionary" key="collation" draft="contributed">Редослед сортирања у речнику</type>
-			<type type="ducet" key="collation" draft="contributed">Подразумевани Unicode редослед сортирања</type>
-			<type type="ethi" key="numbers" draft="contributed">етиопски бројеви</type>
-			<type type="ethiopic" key="calendar" draft="contributed">етиопски календар</type>
-			<type type="ethiopic-amete-alem" key="calendar" draft="contributed">етиопски амет алем календар</type>
-			<type type="fullwide" key="numbers" draft="contributed">цифре пуне ширине</type>
-			<type type="gb2312han" key="collation">Поједностављено кинеско сортирање</type>
-			<type type="geor" key="numbers" draft="contributed">грузијски бројеви</type>
-			<type type="gregorian" key="calendar">Грегоријански календар</type>
-			<type type="grek" key="numbers" draft="contributed">грчки бројеви</type>
-			<type type="greklow" key="numbers" draft="contributed">мали грчки бројеви</type>
-			<type type="gujr" key="numbers" draft="contributed">гуџаратске цифре</type>
-			<type type="guru" key="numbers" draft="contributed">гурмуки цифре</type>
-			<type type="hanidec" key="numbers" draft="contributed">кинески децимални бројеви</type>
-			<type type="hans" key="numbers" draft="contributed">поједностављени кинески бројеви</type>
-			<type type="hansfin" key="numbers" draft="contributed">поједностављени кинески финансијски бројеви</type>
-			<type type="hant" key="numbers" draft="contributed">традиционални кинески бројеви</type>
-			<type type="hantfin" key="numbers" draft="contributed">традиционални кинески финансијски бројеви</type>
-			<type type="hebr" key="numbers" draft="contributed">хебрејски бројеви</type>
-			<type type="hebrew" key="calendar">Хебрејски календар</type>
-			<type type="indian" key="calendar">Индијски национални календар</type>
-			<type type="islamic" key="calendar">Исламски календар</type>
-			<type type="islamic-civil" key="calendar">Исламски цивилни календар</type>
-			<type type="japanese" key="calendar">Јапански календар</type>
-			<type type="jpan" key="numbers" draft="contributed">јапански бројеви</type>
-			<type type="jpanfin" key="numbers" draft="contributed">јапански финансијски бројеви</type>
-			<type type="khmr" key="numbers" draft="contributed">кмерске цифре</type>
-			<type type="knda" key="numbers" draft="contributed">канада цифре</type>
-			<type type="laoo" key="numbers" draft="contributed">лаошке цифре</type>
-			<type type="latn" key="numbers" draft="contributed">западне цифре</type>
-			<type type="mlym" key="numbers" draft="contributed">малајалам цифре</type>
-			<type type="mong" key="numbers" draft="contributed">монголске цифре</type>
-			<type type="mymr" key="numbers" draft="contributed">мијанмарске цифре</type>
-			<type type="orya" key="numbers" draft="contributed">орија цифре</type>
-			<type type="persian" key="calendar" draft="contributed">персијски календар</type>
-			<type type="phonebook" key="collation">Сортирање као телефонски именик</type>
-			<type type="pinyin" key="collation">Пињин сортирање</type>
-			<type type="reformed" key="collation" draft="contributed">Реформисани редослед сортирања</type>
-			<type type="roc" key="calendar">Календар Републике Кине</type>
-			<type type="roman" key="numbers" draft="contributed">римски бројеви</type>
-			<type type="romanlow" key="numbers" draft="contributed">мали римски бројеви</type>
-			<type type="search" key="collation" draft="contributed">Опште намењена претрага</type>
-			<type type="stroke" key="collation">Сортирање по броју црта</type>
-			<type type="taml" key="numbers" draft="contributed">тамилски бројеви</type>
-			<type type="telu" key="numbers" draft="contributed">телугу цифре</type>
-			<type type="thai" key="numbers" draft="contributed">тајске цифре</type>
-			<type type="tibt" key="numbers" draft="contributed">тибетанске цифре</type>
-			<type type="traditional" key="collation">Традиционално сортирање</type>
-			<type type="unihan" key="collation" draft="contributed">Редослед сортирања радикалним цртицама</type>
+			<type key="calendar" type="buddhist">Будистички календар</type>
+			<type key="calendar" type="chinese">Кинески календар</type>
+			<type key="calendar" type="coptic" draft="contributed">коптски календар</type>
+			<type key="calendar" type="ethiopic" draft="contributed">етиопски календар</type>
+			<type key="calendar" type="ethiopic-amete-alem" draft="contributed">етиопски амет алем календар</type>
+			<type key="calendar" type="gregorian">Грегоријански календар</type>
+			<type key="calendar" type="hebrew">Хебрејски календар</type>
+			<type key="calendar" type="indian">Индијски национални календар</type>
+			<type key="calendar" type="islamic">Исламски календар</type>
+			<type key="calendar" type="islamic-civil">Исламски цивилни календар</type>
+			<type key="calendar" type="japanese">Јапански календар</type>
+			<type key="calendar" type="persian" draft="contributed">персијски календар</type>
+			<type key="calendar" type="roc">Календар Републике Кине</type>
+			<type key="collation" type="big5han">Традиционално кинеско сортирање</type>
+			<type key="collation" type="dictionary" draft="contributed">Редослед сортирања у речнику</type>
+			<type key="collation" type="ducet" draft="contributed">Подразумевани Unicode редослед сортирања</type>
+			<type key="collation" type="gb2312han">Поједностављено кинеско сортирање</type>
+			<type key="collation" type="phonebook">Сортирање као телефонски именик</type>
+			<type key="collation" type="pinyin">Пињин сортирање</type>
+			<type key="collation" type="reformed" draft="contributed">Реформисани редослед сортирања</type>
+			<type key="collation" type="search" draft="contributed">Опште намењена претрага</type>
+			<type key="collation" type="stroke">Сортирање по броју црта</type>
+			<type key="collation" type="traditional">Традиционално сортирање</type>
+			<type key="collation" type="unihan" draft="contributed">Редослед сортирања радикалним цртицама</type>
+			<type key="numbers" type="arab" draft="contributed">арапско-индијске цифре</type>
+			<type key="numbers" type="arabext" draft="contributed">продужене арапско-индијске цифре</type>
+			<type key="numbers" type="armn" draft="contributed">јерменски бројеви</type>
+			<type key="numbers" type="armnlow" draft="contributed">мали јерменски бројеви</type>
+			<type key="numbers" type="beng" draft="contributed">бенгалске цифре</type>
+			<type key="numbers" type="deva" draft="contributed">девангари цифре</type>
+			<type key="numbers" type="ethi" draft="contributed">етиопски бројеви</type>
+			<type key="numbers" type="fullwide" draft="contributed">цифре пуне ширине</type>
+			<type key="numbers" type="geor" draft="contributed">грузијски бројеви</type>
+			<type key="numbers" type="grek" draft="contributed">грчки бројеви</type>
+			<type key="numbers" type="greklow" draft="contributed">мали грчки бројеви</type>
+			<type key="numbers" type="gujr" draft="contributed">гуџаратске цифре</type>
+			<type key="numbers" type="guru" draft="contributed">гурмуки цифре</type>
+			<type key="numbers" type="hanidec" draft="contributed">кинески децимални бројеви</type>
+			<type key="numbers" type="hans" draft="contributed">поједностављени кинески бројеви</type>
+			<type key="numbers" type="hansfin" draft="contributed">поједностављени кинески финансијски бројеви</type>
+			<type key="numbers" type="hant" draft="contributed">традиционални кинески бројеви</type>
+			<type key="numbers" type="hantfin" draft="contributed">традиционални кинески финансијски бројеви</type>
+			<type key="numbers" type="hebr" draft="contributed">хебрејски бројеви</type>
+			<type key="numbers" type="jpan" draft="contributed">јапански бројеви</type>
+			<type key="numbers" type="jpanfin" draft="contributed">јапански финансијски бројеви</type>
+			<type key="numbers" type="khmr" draft="contributed">кмерске цифре</type>
+			<type key="numbers" type="knda" draft="contributed">канада цифре</type>
+			<type key="numbers" type="laoo" draft="contributed">лаошке цифре</type>
+			<type key="numbers" type="latn" draft="contributed">западне цифре</type>
+			<type key="numbers" type="mlym" draft="contributed">малајалам цифре</type>
+			<type key="numbers" type="mong" draft="contributed">монголске цифре</type>
+			<type key="numbers" type="mymr" draft="contributed">мијанмарске цифре</type>
+			<type key="numbers" type="orya" draft="contributed">орија цифре</type>
+			<type key="numbers" type="roman" draft="contributed">римски бројеви</type>
+			<type key="numbers" type="romanlow" draft="contributed">мали римски бројеви</type>
+			<type key="numbers" type="taml" draft="contributed">тамилски бројеви</type>
+			<type key="numbers" type="telu" draft="contributed">телугу цифре</type>
+			<type key="numbers" type="thai" draft="contributed">тајске цифре</type>
+			<type key="numbers" type="tibt" draft="contributed">тибетанске цифре</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">БГН (BGN)</transformName>
@@ -1342,6 +1339,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">пре подне</dayPeriod>
+							<dayPeriod type="pm">поподне</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">пре подне</dayPeriod>
 							<dayPeriod type="pm">поподне</dayPeriod>
@@ -1587,7 +1588,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="1" draft="provisional">Мух.</month>
 							<month type="2" draft="provisional">Саф.</month>
 							<month type="3" draft="provisional">Реб. 1</month>
-							<month type="4" draft="provisional">Реб 2</month>
+							<month type="4" draft="provisional">Реб. 2</month>
 							<month type="5" draft="provisional">Џум. 1</month>
 							<month type="6" draft="provisional">Џум. 2</month>
 							<month type="7" draft="provisional">Реџ.</month>
@@ -1686,238 +1687,238 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<calendar type="japanese">
 				<eras>
 					<eraAbbr>
-						<era type="0">Таика (645-650)</era>
-						<era type="1">Хакучи (650-671)</era>
-						<era type="2">Хакухо (672-686)</era>
-						<era type="3">Шучо (686-701)</era>
-						<era type="4">Таихо (701-704)</era>
-						<era type="5">Кеиун (704-708)</era>
-						<era type="6">Вадо (708-715)</era>
-						<era type="7">Реики (715-717)</era>
-						<era type="8">Јоро (717-724)</era>
-						<era type="9">Јинки (724-729)</era>
-						<era type="10">Темпио (729-749)</era>
+						<era type="0">Таика (645–650)</era>
+						<era type="1">Хакучи (650–671)</era>
+						<era type="2">Хакухо (672–686)</era>
+						<era type="3">Шучо (686–701)</era>
+						<era type="4">Таихо (701–704)</era>
+						<era type="5">Кеиун (704–708)</era>
+						<era type="6">Вадо (708–715)</era>
+						<era type="7">Реики (715–717)</era>
+						<era type="8">Јоро (717–724)</era>
+						<era type="9">Јинки (724–729)</era>
+						<era type="10">Темпио (729–749)</era>
 						<era type="11">Темпио-кампо (749-749)</era>
 						<era type="12">Темпио-шохо (749-757)</era>
 						<era type="13">Темпио-хођи (757-765)</era>
 						<era type="14">Темпо-ђинго (765-767)</era>
 						<era type="15">Ђинго-кеиун (767-770)</era>
-						<era type="16">Хоки (770-780)</era>
+						<era type="16">Хоки (770–780)</era>
 						<era type="17">Тен-о (781-782)</era>
-						<era type="18">Енрјаку (782-806)</era>
-						<era type="19">Даидо (806-810)</era>
-						<era type="20">Конин (810-824)</era>
-						<era type="21">Тенчо (824-834)</era>
-						<era type="22">Шова (834-848)</era>
-						<era type="23">Кајо (848-851)</era>
-						<era type="24">Нињу (851-854)</era>
-						<era type="25">Саико (854-857)</era>
-						<era type="26">Тенан (857-859)</era>
-						<era type="27">Јоган (859-877)</era>
-						<era type="28">Генкеи (877-885)</era>
-						<era type="29">Ниња (885-889)</era>
-						<era type="30">Кампјо (889-898)</era>
-						<era type="31">Шотаи (898-901)</era>
-						<era type="32">Енђи (901-923)</era>
-						<era type="33">Енчо (923-931)</era>
-						<era type="34">Шохеи (931-938)</era>
-						<era type="35">Тенгјо (938-947)</era>
-						<era type="36">Тенриаку (947-957)</era>
-						<era type="37">Тентоку (957-961)</era>
-						<era type="38">Ова (961-964)</era>
-						<era type="39">Кохо (964-968)</era>
-						<era type="40">Ана (968-970)</era>
-						<era type="41">Тенроку (970-973)</era>
+						<era type="18">Енрјаку (782–806)</era>
+						<era type="19">Даидо (806–810)</era>
+						<era type="20">Конин (810–824)</era>
+						<era type="21">Тенчо (824–834)</era>
+						<era type="22">Шова (834–848)</era>
+						<era type="23">Кајо (848–851)</era>
+						<era type="24">Нињу (851–854)</era>
+						<era type="25">Саико (854–857)</era>
+						<era type="26">Тенан (857–859)</era>
+						<era type="27">Јоган (859–877)</era>
+						<era type="28">Генкеи (877–885)</era>
+						<era type="29">Ниња (885–889)</era>
+						<era type="30">Кампјо (889–898)</era>
+						<era type="31">Шотаи (898–901)</era>
+						<era type="32">Енђи (901–923)</era>
+						<era type="33">Енчо (923–931)</era>
+						<era type="34">Шохеи (931–938)</era>
+						<era type="35">Тенгјо (938–947)</era>
+						<era type="36">Тенриаку (947–957)</era>
+						<era type="37">Тентоку (957–961)</era>
+						<era type="38">Ова (961–964)</era>
+						<era type="39">Кохо (964–968)</era>
+						<era type="40">Ана (968–970)</era>
+						<era type="41">Тенроку (970–973)</era>
 						<era type="42">Тен-ен (973-976)</era>
-						<era type="43">Јоген (976-978)</era>
-						<era type="44">Тенген (978-983)</era>
-						<era type="45">Еикан (983-985)</era>
-						<era type="46">Кана (985-987)</era>
+						<era type="43">Јоген (976–978)</era>
+						<era type="44">Тенген (978–983)</era>
+						<era type="45">Еикан (983–985)</era>
+						<era type="46">Кана (985–987)</era>
 						<era type="47">Еи-ен (987-989)</era>
-						<era type="48">Еисо (989-990)</era>
-						<era type="49">Шорјаку (990-995)</era>
-						<era type="50">Чотоку (995-999)</era>
-						<era type="51">Чохо (999-1004)</era>
-						<era type="52">Канко (1004-1012)</era>
-						<era type="53">Чова (1012-1017)</era>
-						<era type="54">Канин (1017-1021)</era>
-						<era type="55">Ђиан (1021-1024)</era>
-						<era type="56">Мању (1024-1028)</era>
-						<era type="57">Чоген (1028-1037)</era>
-						<era type="58">Чорјаку (1037-1040)</era>
-						<era type="59">Чокју (1040-1044)</era>
-						<era type="60">Кантоку (1044-1046)</era>
-						<era type="61">Еишо (1046-1053)</era>
-						<era type="62">Тенђи (1053-1058)</era>
-						<era type="63">Кохеи (1058-1065)</era>
-						<era type="64">Ђирјаку (1065-1069)</era>
-						<era type="65">Енкју (1069-1074)</era>
-						<era type="66">Шохо (1074-1077)</era>
-						<era type="67">Шорјаку (1077-1081)</era>
-						<era type="68">Еишо (1081-1084)</era>
-						<era type="69">Отоку (1084-1087)</era>
-						<era type="70">Канђи (1087-1094)</era>
-						<era type="71">Кахо (1094-1096)</era>
-						<era type="72">Еичо (1096-1097)</era>
-						<era type="73">Шотоку (1097-1099)</era>
-						<era type="74">Кова (1099-1104)</era>
-						<era type="75">Чођи (1104-1106)</era>
-						<era type="76">Кашо (1106-1108)</era>
-						<era type="77">Тенин (1108-1110)</era>
+						<era type="48">Еисо (989–990)</era>
+						<era type="49">Шорјаку (990–995)</era>
+						<era type="50">Чотоку (995–999)</era>
+						<era type="51">Чохо (999–1004)</era>
+						<era type="52">Канко (1004–1012)</era>
+						<era type="53">Чова (1012–1017)</era>
+						<era type="54">Канин (1017–1021)</era>
+						<era type="55">Ђиан (1021–1024)</era>
+						<era type="56">Мању (1024–1028)</era>
+						<era type="57">Чоген (1028–1037)</era>
+						<era type="58">Чорјаку (1037–1040)</era>
+						<era type="59">Чокју (1040–1044)</era>
+						<era type="60">Кантоку (1044–1046)</era>
+						<era type="61">Еишо (1046–1053)</era>
+						<era type="62">Тенђи (1053–1058)</era>
+						<era type="63">Кохеи (1058–1065)</era>
+						<era type="64">Ђирјаку (1065–1069)</era>
+						<era type="65">Енкју (1069–1074)</era>
+						<era type="66">Шохо (1074–1077)</era>
+						<era type="67">Шорјаку (1077–1081)</era>
+						<era type="68">Еишо (1081–1084)</era>
+						<era type="69">Отоку (1084–1087)</era>
+						<era type="70">Канђи (1087–1094)</era>
+						<era type="71">Кахо (1094–1096)</era>
+						<era type="72">Еичо (1096–1097)</era>
+						<era type="73">Шотоку (1097–1099)</era>
+						<era type="74">Кова (1099–1104)</era>
+						<era type="75">Чођи (1104–1106)</era>
+						<era type="76">Кашо (1106–1108)</era>
+						<era type="77">Тенин (1108–1110)</era>
 						<era type="78">Тен-еи (1110-1113)</era>
-						<era type="79">Еикју (1113-1118)</era>
+						<era type="79">Еикју (1113–1118)</era>
 						<era type="80">Ђен-еи (1118-1120)</era>
-						<era type="81">Хоан (1120-1124)</era>
-						<era type="82">Тенђи (1124-1126)</era>
-						<era type="83">Даиђи (1126-1131)</era>
-						<era type="84">Теншо (1131-1132)</era>
-						<era type="85">Чошао (1132-1135)</era>
-						<era type="86">Хоен (1135-1141)</era>
-						<era type="87">Еиђи (1141-1142)</era>
-						<era type="88">Кођи (1142-1144)</era>
-						<era type="89">Тењо (1144-1145)</era>
-						<era type="90">Кјуан (1145-1151)</era>
-						<era type="91">Нинпеи (1151-1154)</era>
-						<era type="92">Кјују (1154-1156)</era>
-						<era type="93">Хоген (1156-1159)</era>
-						<era type="94">Хеиђи (1159-1160)</era>
-						<era type="95">Еирјаку (1160-1161)</era>
-						<era type="96">Охо (1161-1163)</era>
-						<era type="97">Чокан (1163-1165)</era>
-						<era type="98">Еиман (1165-1166)</era>
+						<era type="81">Хоан (1120–1124)</era>
+						<era type="82">Тенђи (1124–1126)</era>
+						<era type="83">Даиђи (1126–1131)</era>
+						<era type="84">Теншо (1131–1132)</era>
+						<era type="85">Чошао (1132–1135)</era>
+						<era type="86">Хоен (1135–1141)</era>
+						<era type="87">Еиђи (1141–1142)</era>
+						<era type="88">Кођи (1142–1144)</era>
+						<era type="89">Тењо (1144–1145)</era>
+						<era type="90">Кјуан (1145–1151)</era>
+						<era type="91">Нинпеи (1151–1154)</era>
+						<era type="92">Кјују (1154–1156)</era>
+						<era type="93">Хоген (1156–1159)</era>
+						<era type="94">Хеиђи (1159–1160)</era>
+						<era type="95">Еирјаку (1160–1161)</era>
+						<era type="96">Охо (1161–1163)</era>
+						<era type="97">Чокан (1163–1165)</era>
+						<era type="98">Еиман (1165–1166)</era>
 						<era type="99">Нин-ан (1166-1169)</era>
-						<era type="100">Као (1169-1171)</era>
-						<era type="101">Шоан (1171-1175)</era>
-						<era type="102">Анген (1175-1177)</era>
-						<era type="103">Ђишо (1177-1181)</era>
-						<era type="104">Јова (1181-1182)</era>
-						<era type="105">Ђуеи (1182-1184)</era>
-						<era type="106">Генрјуку (1184-1185)</era>
-						<era type="107">Бунђи (1185-1190)</era>
-						<era type="108">Кенкју (1190-1199)</era>
-						<era type="109">Шођи (1199-1201)</era>
-						<era type="110">Кенин (1201-1204)</era>
-						<era type="111">Генкју (1204-1206)</era>
+						<era type="100">Као (1169–1171)</era>
+						<era type="101">Шоан (1171–1175)</era>
+						<era type="102">Анген (1175–1177)</era>
+						<era type="103">Ђишо (1177–1181)</era>
+						<era type="104">Јова (1181–1182)</era>
+						<era type="105">Ђуеи (1182–1184)</era>
+						<era type="106">Генрјуку (1184–1185)</era>
+						<era type="107">Бунђи (1185–1190)</era>
+						<era type="108">Кенкју (1190–1199)</era>
+						<era type="109">Шођи (1199–1201)</era>
+						<era type="110">Кенин (1201–1204)</era>
+						<era type="111">Генкју (1204–1206)</era>
 						<era type="112">Кен-еи (1206-1207)</era>
-						<era type="113">Шоген (1207-1211)</era>
-						<era type="114">Кенрјаку (1211-1213)</era>
-						<era type="115">Кенпо (1213-1219)</era>
-						<era type="116">Шокју (1219-1222)</era>
-						<era type="117">Ђу (1222-1224)</era>
-						<era type="118">Ђенин (1224-1225)</era>
-						<era type="119">Кароку (1225-1227)</era>
-						<era type="120">Антеи (1227-1229)</era>
-						<era type="121">Канки (1229-1232)</era>
-						<era type="122">Ђоеи (1232-1233)</era>
-						<era type="123">Темпуку (1233-1234)</era>
-						<era type="124">Бунрјаку (1234-1235)</era>
-						<era type="125">Катеи (1235-1238)</era>
-						<era type="126">Рјакунин (1238-1239)</era>
+						<era type="113">Шоген (1207–1211)</era>
+						<era type="114">Кенрјаку (1211–1213)</era>
+						<era type="115">Кенпо (1213–1219)</era>
+						<era type="116">Шокју (1219–1222)</era>
+						<era type="117">Ђу (1222–1224)</era>
+						<era type="118">Ђенин (1224–1225)</era>
+						<era type="119">Кароку (1225–1227)</era>
+						<era type="120">Антеи (1227–1229)</era>
+						<era type="121">Канки (1229–1232)</era>
+						<era type="122">Ђоеи (1232–1233)</era>
+						<era type="123">Темпуку (1233–1234)</era>
+						<era type="124">Бунрјаку (1234–1235)</era>
+						<era type="125">Катеи (1235–1238)</era>
+						<era type="126">Рјакунин (1238–1239)</era>
 						<era type="127">Ен-о (1239-1240)</era>
-						<era type="128">Нињи (1240-1243)</era>
-						<era type="129">Канген (1243-1247)</era>
-						<era type="130">Хођи (1247-1249)</era>
-						<era type="131">Кенчо (1249-1256)</era>
-						<era type="132">Коген (1256-1257)</era>
-						<era type="133">Шока (1257-1259)</era>
-						<era type="134">Шоген (1259-1260)</era>
+						<era type="128">Нињи (1240–1243)</era>
+						<era type="129">Канген (1243–1247)</era>
+						<era type="130">Хођи (1247–1249)</era>
+						<era type="131">Кенчо (1249–1256)</era>
+						<era type="132">Коген (1256–1257)</era>
+						<era type="133">Шока (1257–1259)</era>
+						<era type="134">Шоген (1259–1260)</era>
 						<era type="135">Бун-о (1260-1261)</era>
-						<era type="136">Кочо (1261-1264)</era>
+						<era type="136">Кочо (1261–1264)</era>
 						<era type="137">Бун-еи (1264-1275)</era>
-						<era type="138">Кенђи (1275-1278)</era>
-						<era type="139">Коан (1278-1288)</era>
-						<era type="140">Шу (1288-1293)</era>
-						<era type="141">Еинин (1293-1299)</era>
-						<era type="142">Шоан (1299-1302)</era>
-						<era type="143">Кенген (1302-1303)</era>
-						<era type="144">Каген (1303-1306)</era>
-						<era type="145">Токуђи (1306-1308)</era>
-						<era type="146">Енкеи (1308-1311)</era>
-						<era type="147">Очо (1311-1312)</era>
-						<era type="148">Шова (1312-1317)</era>
-						<era type="149">Бунпо (1317-1319)</era>
-						<era type="150">Ђено (1319-1321)</era>
-						<era type="151">Ђенкјо (1321-1324)</era>
-						<era type="152">Шочу (1324-1326)</era>
-						<era type="153">Кареки (1326-1329)</era>
-						<era type="154">Гентоку (1329-1331)</era>
-						<era type="155">Генко (1331-1334)</era>
-						<era type="156">Кему (1334-1336)</era>
-						<era type="157">Енген (1336-1340)</era>
-						<era type="158">Кококу (1340-1346)</era>
-						<era type="159">Шохеи (1346-1370)</era>
-						<era type="160">Кентоку (1370-1372)</era>
-						<era type="161">Бучу (1372-1375)</era>
-						<era type="162">Тењу (1375-1379)</era>
-						<era type="163">Корјаку (1379-1381)</era>
-						<era type="164">Кова (1381-1384)</era>
-						<era type="165">Генчу (1384-1392)</era>
-						<era type="166">Меитоку (1384-1387)</era>
-						<era type="167">Какеи (1387-1389)</era>
-						<era type="168">Ку (1389-1390)</era>
-						<era type="169">Меитоку (1390-1394)</era>
-						<era type="170">Оеи (1394-1428)</era>
-						<era type="171">Шочо (1428-1429)</era>
-						<era type="172">Еикјо (1429-1441)</era>
-						<era type="173">Какитсу (1441-1444)</era>
+						<era type="138">Кенђи (1275–1278)</era>
+						<era type="139">Коан (1278–1288)</era>
+						<era type="140">Шу (1288–1293)</era>
+						<era type="141">Еинин (1293–1299)</era>
+						<era type="142">Шоан (1299–1302)</era>
+						<era type="143">Кенген (1302–1303)</era>
+						<era type="144">Каген (1303–1306)</era>
+						<era type="145">Токуђи (1306–1308)</era>
+						<era type="146">Енкеи (1308–1311)</era>
+						<era type="147">Очо (1311–1312)</era>
+						<era type="148">Шова (1312–1317)</era>
+						<era type="149">Бунпо (1317–1319)</era>
+						<era type="150">Ђено (1319–1321)</era>
+						<era type="151">Ђенкјо (1321–1324)</era>
+						<era type="152">Шочу (1324–1326)</era>
+						<era type="153">Кареки (1326–1329)</era>
+						<era type="154">Гентоку (1329–1331)</era>
+						<era type="155">Генко (1331–1334)</era>
+						<era type="156">Кему (1334–1336)</era>
+						<era type="157">Енген (1336–1340)</era>
+						<era type="158">Кококу (1340–1346)</era>
+						<era type="159">Шохеи (1346–1370)</era>
+						<era type="160">Кентоку (1370–1372)</era>
+						<era type="161">Бучу (1372–1375)</era>
+						<era type="162">Тењу (1375–1379)</era>
+						<era type="163">Корјаку (1379–1381)</era>
+						<era type="164">Кова (1381–1384)</era>
+						<era type="165">Генчу (1384–1392)</era>
+						<era type="166">Меитоку (1384–1387)</era>
+						<era type="167">Какеи (1387–1389)</era>
+						<era type="168">Ку (1389–1390)</era>
+						<era type="169">Меитоку (1390–1394)</era>
+						<era type="170">Оеи (1394–1428)</era>
+						<era type="171">Шочо (1428–1429)</era>
+						<era type="172">Еикјо (1429–1441)</era>
+						<era type="173">Какитсу (1441–1444)</era>
 						<era type="174">Бун-ан (1444-1449)</era>
-						<era type="175">Хотоку (1449-1452)</era>
-						<era type="176">Кјотоку (1452-1455)</era>
-						<era type="177">Кошо (1455-1457)</era>
-						<era type="178">Чороку (1457-1460)</era>
-						<era type="179">Каншо (1460-1466)</era>
-						<era type="180">Буншо (1466-1467)</era>
-						<era type="181">Онин (1467-1469)</era>
-						<era type="182">Бунмеи (1469-1487)</era>
-						<era type="183">Чокјо (1487-1489)</era>
-						<era type="184">Ентоку (1489-1492)</era>
-						<era type="185">Меио (1492-1501)</era>
-						<era type="186">Бунки (1501-1504)</era>
-						<era type="187">Еишо (1504-1521)</era>
-						<era type="188">Таиеи (1521-1528)</era>
-						<era type="189">Кјороку (1528-1532)</era>
-						<era type="190">Тенмон (1532-1555)</era>
-						<era type="191">Кођи (1555-1558)</era>
-						<era type="192">Еироку (1558-1570)</era>
-						<era type="193">Генки (1570-1573)</era>
-						<era type="194">Теншо (1573-1592)</era>
-						<era type="195">Бунроку (1592-1596)</era>
-						<era type="196">Кеичо (1596-1615)</era>
-						<era type="197">Генва (1615-1624)</era>
+						<era type="175">Хотоку (1449–1452)</era>
+						<era type="176">Кјотоку (1452–1455)</era>
+						<era type="177">Кошо (1455–1457)</era>
+						<era type="178">Чороку (1457–1460)</era>
+						<era type="179">Каншо (1460–1466)</era>
+						<era type="180">Буншо (1466–1467)</era>
+						<era type="181">Онин (1467–1469)</era>
+						<era type="182">Бунмеи (1469–1487)</era>
+						<era type="183">Чокјо (1487–1489)</era>
+						<era type="184">Ентоку (1489–1492)</era>
+						<era type="185">Меио (1492–1501)</era>
+						<era type="186">Бунки (1501–1504)</era>
+						<era type="187">Еишо (1504–1521)</era>
+						<era type="188">Таиеи (1521–1528)</era>
+						<era type="189">Кјороку (1528–1532)</era>
+						<era type="190">Тенмон (1532–1555)</era>
+						<era type="191">Кођи (1555–1558)</era>
+						<era type="192">Еироку (1558–1570)</era>
+						<era type="193">Генки (1570–1573)</era>
+						<era type="194">Теншо (1573–1592)</era>
+						<era type="195">Бунроку (1592–1596)</era>
+						<era type="196">Кеичо (1596–1615)</era>
+						<era type="197">Генва (1615–1624)</era>
 						<era type="198">Кан-еи (1624-1644)</era>
-						<era type="199">Шохо (1644-1648)</era>
-						<era type="200">Кеиан (1648-1652)</era>
-						<era type="201">Шу (1652-1655)</era>
-						<era type="202">Меирјаку (1655-1658)</era>
-						<era type="203">Мањи (1658-1661)</era>
-						<era type="204">Канбун (1661-1673)</era>
-						<era type="205">Енпо (1673-1681)</era>
-						<era type="206">Тенва (1681-1684)</era>
-						<era type="207">Јокјо (1684-1688)</era>
-						<era type="208">Генроку (1688-1704)</era>
-						<era type="209">Хоеи (1704-1711)</era>
-						<era type="210">Шотоку (1711-1716)</era>
-						<era type="211">Кјохо (1716-1736)</era>
-						<era type="212">Генбун (1736-1741)</era>
-						<era type="213">Канпо (1741-1744)</era>
-						<era type="214">Енкјо (1744-1748)</era>
+						<era type="199">Шохо (1644–1648)</era>
+						<era type="200">Кеиан (1648–1652)</era>
+						<era type="201">Шу (1652–1655)</era>
+						<era type="202">Меирјаку (1655–1658)</era>
+						<era type="203">Мањи (1658–1661)</era>
+						<era type="204">Канбун (1661–1673)</era>
+						<era type="205">Енпо (1673–1681)</era>
+						<era type="206">Тенва (1681–1684)</era>
+						<era type="207">Јокјо (1684–1688)</era>
+						<era type="208">Генроку (1688–1704)</era>
+						<era type="209">Хоеи (1704–1711)</era>
+						<era type="210">Шотоку (1711–1716)</era>
+						<era type="211">Кјохо (1716–1736)</era>
+						<era type="212">Генбун (1736–1741)</era>
+						<era type="213">Канпо (1741–1744)</era>
+						<era type="214">Енкјо (1744–1748)</era>
 						<era type="215">Кан-ен (1748-1751)</era>
-						<era type="216">Хорјаку (1751-1764)</era>
-						<era type="217">Меива (1764-1772)</era>
+						<era type="216">Хорјаку (1751–1764)</era>
+						<era type="217">Меива (1764–1772)</era>
 						<era type="218">Ан-еи (1772-1781)</era>
-						<era type="219">Тенмеи (1781-1789)</era>
-						<era type="220">Кансеи (1789-1801)</era>
-						<era type="221">Кјова (1801-1804)</era>
-						<era type="222">Бунка (1804-1818)</era>
-						<era type="223">Бунсеи (1818-1830)</era>
-						<era type="224">Тенпо (1830-1844)</era>
-						<era type="225">Кока (1844-1848)</era>
-						<era type="226">Каеи (1848-1854)</era>
-						<era type="227">Ансеи (1854-1860)</era>
+						<era type="219">Тенмеи (1781–1789)</era>
+						<era type="220">Кансеи (1789–1801)</era>
+						<era type="221">Кјова (1801–1804)</era>
+						<era type="222">Бунка (1804–1818)</era>
+						<era type="223">Бунсеи (1818–1830)</era>
+						<era type="224">Тенпо (1830–1844)</era>
+						<era type="225">Кока (1844–1848)</era>
+						<era type="226">Каеи (1848–1854)</era>
+						<era type="227">Ансеи (1854–1860)</era>
 						<era type="228">Ман-ен (1860-1861)</era>
-						<era type="229">Бункју (1861-1864)</era>
-						<era type="230">Генђи (1864-1865)</era>
-						<era type="231">Кеико (1865-1868)</era>
+						<era type="229">Бункју (1861–1864)</era>
+						<era type="230">Генђи (1864–1865)</era>
+						<era type="231">Кеико (1865–1868)</era>
 						<era type="232">Меиђи</era>
 						<era type="233">Таишо</era>
 						<era type="234">Шова</era>
@@ -4344,6 +4345,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0 ¤</pattern>
+					<pattern type="1000" count="few" draft="provisional">0 ¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0 ¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00 хиљ ¤</pattern>
+					<pattern type="10000" count="few" draft="provisional">00 хиљ ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00 хиљ ¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000 хиљ ¤</pattern>
+					<pattern type="100000" count="few" draft="provisional">000 хиљ ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000 хиљ ¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0 мил ¤</pattern>
+					<pattern type="1000000" count="few" draft="provisional">0 мил ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0 мил ¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00 мил ¤</pattern>
+					<pattern type="10000000" count="few" draft="provisional">00 мил ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00 мил ¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000 мил ¤</pattern>
+					<pattern type="100000000" count="few" draft="provisional">000 мил ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000 мил ¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0 млрд ¤</pattern>
+					<pattern type="1000000000" count="few" draft="provisional">0 млрд ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00 млрд ¤</pattern>
+					<pattern type="10000000000" count="few" draft="provisional">00 млрд ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000 млрд ¤</pattern>
+					<pattern type="100000000000" count="few" draft="provisional">000 млрд ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0 бил ¤</pattern>
+					<pattern type="1000000000000" count="few" draft="provisional">0 бил ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0 бил ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00 бил ¤</pattern>
+					<pattern type="10000000000000" count="few" draft="provisional">00 бил ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00 бил ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000 бил ¤</pattern>
+					<pattern type="100000000000000" count="few" draft="provisional">000 бил ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000 бил ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="few">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
@@ -6097,6 +6138,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</numbers>
 	<units>
 		<unitLength type="long">
+			<unit type="duration-year">
+				<displayName draft="provisional">година</displayName>
+				<unitPattern count="one">{0} година</unitPattern>
+				<unitPattern count="few">{0} године</unitPattern>
+				<unitPattern count="other">{0} година</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="provisional">месец</displayName>
+				<unitPattern count="one">{0} месец</unitPattern>
+				<unitPattern count="few">{0} месеца</unitPattern>
+				<unitPattern count="other">{0} месец</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="provisional">недеља</displayName>
+				<unitPattern count="one">{0} недеља</unitPattern>
+				<unitPattern count="few">{0} недеље</unitPattern>
+				<unitPattern count="other">{0} недеља</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">дан</displayName>
 				<unitPattern count="one">{0} дан</unitPattern>
@@ -6115,32 +6174,32 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} минута</unitPattern>
 				<unitPattern count="other">{0} минут</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">месец</displayName>
-				<unitPattern count="one">{0} месец</unitPattern>
-				<unitPattern count="few">{0} месеца</unitPattern>
-				<unitPattern count="other">{0} месец</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="provisional">секунда</displayName>
 				<unitPattern count="one">{0} секунда</unitPattern>
 				<unitPattern count="few">{0} секунде</unitPattern>
 				<unitPattern count="other">{0} секунда</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">недеља</displayName>
-				<unitPattern count="one">{0} недеља</unitPattern>
-				<unitPattern count="few">{0} недеље</unitPattern>
-				<unitPattern count="other">{0} недеља</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">година</displayName>
-				<unitPattern count="one">{0} година</unitPattern>
-				<unitPattern count="few">{0} године</unitPattern>
-				<unitPattern count="other">{0} година</unitPattern>
-			</unit>
 		</unitLength>
 		<unitLength type="short">
+			<unit type="duration-year">
+				<displayName draft="provisional">година</displayName>
+				<unitPattern count="one">{0} год</unitPattern>
+				<unitPattern count="few">{0} год</unitPattern>
+				<unitPattern count="other">{0} год</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="provisional">месец</displayName>
+				<unitPattern count="one">{0} мес</unitPattern>
+				<unitPattern count="few">{0} мес</unitPattern>
+				<unitPattern count="other">{0} мес</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="provisional">недеља</displayName>
+				<unitPattern count="one">{0} нед</unitPattern>
+				<unitPattern count="few">{0} нед</unitPattern>
+				<unitPattern count="other">{0} нед</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">дан</displayName>
 				<unitPattern count="one">{0} дан</unitPattern>
@@ -6159,30 +6218,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} мин</unitPattern>
 				<unitPattern count="other">{0} мин</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">месец</displayName>
-				<unitPattern count="one">{0} мес</unitPattern>
-				<unitPattern count="few">{0} мес</unitPattern>
-				<unitPattern count="other">{0} мес</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="provisional">секунда</displayName>
 				<unitPattern count="one">{0} сек</unitPattern>
 				<unitPattern count="few">{0} сек</unitPattern>
 				<unitPattern count="other">{0} сек</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">недеља</displayName>
-				<unitPattern count="one">{0} нед</unitPattern>
-				<unitPattern count="few">{0} нед</unitPattern>
-				<unitPattern count="other">{0} нед</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">година</displayName>
-				<unitPattern count="one">{0} год</unitPattern>
-				<unitPattern count="few">{0} год</unitPattern>
-				<unitPattern count="other">{0} год</unitPattern>
-			</unit>
 		</unitLength>
 	</units>
 	<listPatterns>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bs_Cyrl_BA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Cyrl_BA.xml
similarity index 69%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bs_Cyrl_BA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Cyrl_BA.xml
index 72f6e067e59..830ffdbc2ed 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bs_Cyrl_BA.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Cyrl_BA.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="bs"/>
 		<script type="Cyrl"/>
 		<territory type="BA"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bs_Latn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Latn.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bs_Latn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Latn.xml
index 940cdb54d37..42cea4cda58 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bs_Latn.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Latn.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="bs"/>
 		<script type="Latn"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bs_Latn_BA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Latn_BA.xml
similarity index 69%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bs_Latn_BA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Latn_BA.xml
index 4e714142453..472697437eb 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bs_Latn_BA.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Latn_BA.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="bs"/>
 		<script type="Latn"/>
 		<territory type="BA"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ca.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca.xml
similarity index 89%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ca.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca.xml
index 2f2b6b8b68e..996f7e1782f 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ca.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="ca"/>
 	</identity>
 	<localeDisplayNames>
@@ -30,7 +29,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ain">ainu</language>
 			<language type="ak">àkan</language>
 			<language type="akk">accadi</language>
+			<language type="akz" draft="contributed">alabama</language>
 			<language type="ale">aleuta</language>
+			<language type="aln" draft="contributed">albanès geg</language>
 			<language type="alt">altaic meridional</language>
 			<language type="am">amhàric</language>
 			<language type="an">aragonès</language>
@@ -40,10 +41,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ar_001">àrab estàndard modern</language>
 			<language type="arc">arameu</language>
 			<language type="arn">araucà</language>
+			<language type="aro" draft="contributed">araona</language>
 			<language type="arp">arapaho</language>
 			<language type="arw">arauac</language>
+			<language type="arz" draft="contributed">àrab egipci</language>
 			<language type="as">assamès</language>
 			<language type="asa">pare</language>
+			<language type="ase" draft="contributed">llengua de signes americana</language>
 			<language type="ast">asturià</language>
 			<language type="av">àvar</language>
 			<language type="awa">awadhi</language>
@@ -53,6 +57,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ba">baixkir</language>
 			<language type="bal">balutxi</language>
 			<language type="ban">balinès</language>
+			<language type="bar" draft="contributed">bavarès</language>
 			<language type="bas">basa</language>
 			<language type="bax" draft="contributed">bamun</language>
 			<language type="bbj" draft="contributed">ghomala</language>
@@ -61,7 +66,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bem">bemba</language>
 			<language type="bez">bena</language>
 			<language type="bfd" draft="contributed">bafut</language>
+			<language type="bfq" draft="contributed">badaga</language>
 			<language type="bg">búlgar</language>
+			<language type="bgn">balutxi occidental</language>
 			<language type="bho">bhojpuri</language>
 			<language type="bi">bislama</language>
 			<language type="bik">bicol</language>
@@ -73,12 +80,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bo">tibetà</language>
 			<language type="br">bretó</language>
 			<language type="bra">braj</language>
+			<language type="brh" draft="contributed">brahui</language>
 			<language type="brx">bodo</language>
 			<language type="bs">bosnià</language>
 			<language type="bss" draft="contributed">akoose</language>
 			<language type="bua">buriat</language>
 			<language type="bug">bugui</language>
-			<language type="bum" draft="contributed">seki</language>
+			<language type="bum">seki</language>
 			<language type="byn">bilin</language>
 			<language type="byv" draft="contributed">medumba</language>
 			<language type="ca">català</language>
@@ -133,6 +141,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ebu">embu</language>
 			<language type="ee">ewe</language>
 			<language type="efi">efik</language>
+			<language type="egl" draft="contributed">emilià</language>
 			<language type="egy">egipci antic</language>
 			<language type="eka">ekajuk</language>
 			<language type="el">grec</language>
@@ -153,6 +162,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="et">estonià</language>
 			<language type="eu">basc</language>
 			<language type="ewo">ewondo</language>
+			<language type="ext" draft="contributed">extremeny</language>
 			<language type="fa">persa</language>
 			<language type="fan">fang</language>
 			<language type="fat">fanti</language>
@@ -168,21 +178,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="frm">francès mitjà</language>
 			<language type="fro">francès antic</language>
 			<language type="frr">frisó septentrional</language>
-			<language type="frs">frisó occidental</language>
+			<language type="frs">frisó oriental</language>
 			<language type="fur">friülà</language>
-			<language type="fy">frisó oriental</language>
+			<language type="fy">frisó occidental</language>
 			<language type="ga">irlandès</language>
 			<language type="gaa">ga</language>
 			<language type="gag">gagaús</language>
+			<language type="gan" draft="contributed">xinès gan</language>
 			<language type="gay">gayo</language>
 			<language type="gba">gbaya</language>
 			<language type="gd">gaèlic escocès</language>
 			<language type="gez">gueez</language>
 			<language type="gil">gilbertès</language>
 			<language type="gl">gallec</language>
+			<language type="glk" draft="contributed">gilaki</language>
 			<language type="gmh">alt alemany mitjà</language>
 			<language type="gn">guaraní</language>
 			<language type="goh">alt alemany antic</language>
+			<language type="gom" draft="contributed">concani de Goa</language>
 			<language type="gon">gondi</language>
 			<language type="gor">gorontalo</language>
 			<language type="got">gòtic</language>
@@ -190,20 +203,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="grc">grec antic</language>
 			<language type="gsw">alemany suís</language>
 			<language type="gu">gujarati</language>
+			<language type="guc" draft="contributed">wayú</language>
 			<language type="guz">gusí</language>
 			<language type="gv">manx</language>
 			<language type="gwi">gwichin</language>
 			<language type="ha">haussa</language>
 			<language type="hai">haida</language>
+			<language type="hak" draft="contributed">xinès hakka</language>
 			<language type="haw">hawaià</language>
 			<language type="he">hebreu</language>
 			<language type="hi">hindi</language>
+			<language type="hif" draft="contributed">hindi de Fiji</language>
 			<language type="hil">hiligainon</language>
 			<language type="hit">hitita</language>
 			<language type="hmn">hmong</language>
 			<language type="ho">hiri motu</language>
 			<language type="hr">croat</language>
 			<language type="hsb">alt sòrab</language>
+			<language type="hsn" draft="contributed">xinès xiang</language>
 			<language type="ht">haitià</language>
 			<language type="hu">hongarès</language>
 			<language type="hup">hupa</language>
@@ -224,6 +241,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="it">italià</language>
 			<language type="iu">inuktitut</language>
 			<language type="ja">japonès</language>
+			<language type="jam" draft="contributed">crioll anglès de Jamaica</language>
 			<language type="jbo">lojban</language>
 			<language type="jgo">ngomba</language>
 			<language type="jmc">machame</language>
@@ -242,8 +260,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="kcg">tyap</language>
 			<language type="kde">makonde</language>
 			<language type="kea">crioll capverdià</language>
+			<language type="ken" draft="contributed">kenyang</language>
 			<language type="kfo">koro</language>
 			<language type="kg">kongo</language>
+			<language type="kgp" draft="contributed">kaingà</language>
 			<language type="kha">khasi</language>
 			<language type="kho">khotanès</language>
 			<language type="khq">koyra chiini</language>
@@ -263,6 +283,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="kpe">kpelle</language>
 			<language type="kr">kanuri</language>
 			<language type="krc">karatxai</language>
+			<language type="kri" draft="contributed">krio</language>
 			<language type="krl">carelià</language>
 			<language type="kru">kurukh</language>
 			<language type="ks">caixmiri</language>
@@ -284,11 +305,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lez">lesguià</language>
 			<language type="lg">ganda</language>
 			<language type="li">limburguès</language>
+			<language type="lij" draft="contributed">lígur</language>
 			<language type="lkt">lakota</language>
+			<language type="lmo" draft="contributed">llombard</language>
 			<language type="ln">lingala</language>
 			<language type="lo">laosià</language>
 			<language type="lol">mongo</language>
 			<language type="loz">lozi</language>
+			<language type="lrc" draft="contributed">luri septentrional</language>
 			<language type="lt">lituà</language>
 			<language type="lu">luba katanga</language>
 			<language type="lua">luba-lulua</language>
@@ -298,6 +322,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lus">mizo</language>
 			<language type="luy">luyia</language>
 			<language type="lv">letó</language>
+			<language type="lzh" draft="contributed">xinès clàssic</language>
+			<language type="lzz" draft="contributed">laz</language>
 			<language type="mad">madurès</language>
 			<language type="maf" draft="contributed">mafa</language>
 			<language type="mag">magahi</language>
@@ -327,6 +353,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="moh">mohawk</language>
 			<language type="mos">moré</language>
 			<language type="mr">marathi</language>
+			<language type="mrj" draft="contributed">mari occidental</language>
 			<language type="ms">malai</language>
 			<language type="mt">maltès</language>
 			<language type="mua">mundang</language>
@@ -337,12 +364,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="my">birmà</language>
 			<language type="mye" draft="contributed">myene</language>
 			<language type="myv">mordovià erza</language>
+			<language type="mzn" draft="contributed">mazanderani</language>
 			<language type="na">nauruà</language>
+			<language type="nan" draft="contributed">xinès min del sud</language>
 			<language type="nap">napolità</language>
 			<language type="naq">nama</language>
 			<language type="nb">noruec bokmål</language>
 			<language type="nd">ndebele septentrional</language>
 			<language type="nds">baix alemany</language>
+			<language type="nds_NL" draft="contributed">baix saxó</language>
 			<language type="ne">nepalès</language>
 			<language type="new">newari</language>
 			<language type="ng">ndonga</language>
@@ -356,6 +386,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="no">noruec</language>
 			<language type="nog">nogai</language>
 			<language type="non">nòrdic antic</language>
+			<language type="nov" draft="contributed">novial</language>
 			<language type="nqo">n’Ko</language>
 			<language type="nr">ndebele meridional</language>
 			<language type="nso">sotho septentrional</language>
@@ -371,19 +402,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="oj">ojibwa</language>
 			<language type="om">oromo</language>
 			<language type="or">oriya</language>
-			<language type="os">osset</language>
+			<language type="os">osseta</language>
 			<language type="osa">osage</language>
 			<language type="ota">turc otomà</language>
 			<language type="pa">panjabi</language>
 			<language type="pag">pangasi</language>
 			<language type="pal">pahlavi</language>
-			<language type="pam">pampangà</language>
+			<language type="pam">pampanga</language>
 			<language type="pap">papiamento</language>
 			<language type="pau">palauà</language>
+			<language type="pcd" draft="contributed">picard</language>
+			<language type="pdc" draft="contributed">alemany pennsilvanià</language>
 			<language type="peo">persa antic</language>
+			<language type="pfl" draft="contributed">alemany palatí</language>
 			<language type="phn">fenici</language>
 			<language type="pi">pali</language>
 			<language type="pl">polonès</language>
+			<language type="pms" draft="contributed">piemontès</language>
+			<language type="pnt" draft="contributed">grec pòntic</language>
 			<language type="pon">ponapeà</language>
 			<language type="pro">provençal antic</language>
 			<language type="ps">paixtu</language>
@@ -396,6 +432,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="raj">rajasthani</language>
 			<language type="rap">rapanui</language>
 			<language type="rar">rarotongà</language>
+			<language type="rgn" draft="contributed">romanyès</language>
 			<language type="rm">retoromànic</language>
 			<language type="rn">rundi</language>
 			<language type="ro">romanès</language>
@@ -420,6 +457,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">sicilià</language>
 			<language type="sco">escocès</language>
 			<language type="sd">sindhi</language>
+			<language type="sdc" draft="contributed">sard sasserès</language>
+			<language type="sdh" draft="contributed">kurd meridional</language>
 			<language type="se">sami septentrional</language>
 			<language type="see" draft="contributed">seneca</language>
 			<language type="seh">sena</language>
@@ -448,7 +487,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sr">serbi</language>
 			<language type="srn">sranan</language>
 			<language type="srr">serer</language>
-			<language type="ss">siswati</language>
+			<language type="ss">swazi</language>
 			<language type="ssy" draft="contributed">saho</language>
 			<language type="st">sotho meridional</language>
 			<language type="su">sundanès</language>
@@ -457,10 +496,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">sumeri</language>
 			<language type="sv">suec</language>
 			<language type="sw">suahili</language>
+			<language type="sw_CD">suahili del Congo</language>
 			<language type="swb">comorià</language>
-			<language type="swc">suahili del Congo</language>
 			<language type="syc">siríac clàssic</language>
 			<language type="syr">siríac</language>
+			<language type="szl" draft="contributed">silesià</language>
 			<language type="ta">tàmil</language>
 			<language type="te">telugu</language>
 			<language type="tem">temne</language>
@@ -474,11 +514,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="tiv">tiv</language>
 			<language type="tk">turcman</language>
 			<language type="tkl">tokelauès</language>
-			<language type="tl">tagàlog</language>
+			<language type="tkr" draft="contributed">tsakhur</language>
+			<language type="tl">tagal</language>
 			<language type="tlh">klingonià</language>
 			<language type="tli">tlingit</language>
-			<language type="tmh">tamazight</language>
-			<language type="tn">tswana</language>
+			<language type="tly" draft="contributed">talix</language>
+			<language type="tmh">amazic</language>
+			<language type="tn">setswana</language>
 			<language type="to">tongalès</language>
 			<language type="tog">tonga</language>
 			<language type="tpi">tok pisin</language>
@@ -487,6 +529,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ts">tsonga</language>
 			<language type="tsi">tsimshià</language>
 			<language type="tt">tàtar</language>
+			<language type="ttt" draft="contributed">tat meridional</language>
 			<language type="tum">tumbuka</language>
 			<language type="tvl">tuvaluà</language>
 			<language type="tw">twi</language>
@@ -504,18 +547,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="uz">uzbek</language>
 			<language type="vai">vai</language>
 			<language type="ve">venda</language>
+			<language type="vec" draft="contributed">vènet</language>
+			<language type="vep" draft="contributed">vepse</language>
 			<language type="vi">vietnamita</language>
+			<language type="vls" draft="contributed">flamenc occidental</language>
 			<language type="vo">volapük</language>
 			<language type="vot">vòtic</language>
 			<language type="vun">vunjo</language>
 			<language type="wa">való</language>
 			<language type="wae" draft="contributed">walser</language>
 			<language type="wal">ameto</language>
-			<language type="war">waray-waray</language>
+			<language type="war">waray</language>
 			<language type="was">washo</language>
+			<language type="wbp" draft="contributed">warlpiri</language>
 			<language type="wo">wòlof</language>
+			<language type="wuu" draft="contributed">xinès wu</language>
 			<language type="xal">calmuc</language>
 			<language type="xh">xosa</language>
+			<language type="xmf" draft="contributed">mingrelià</language>
 			<language type="xog">soga</language>
 			<language type="yao">yao</language>
 			<language type="yap">yapeà</language>
@@ -527,6 +576,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="za">zhuang</language>
 			<language type="zap">zapoteca</language>
 			<language type="zbl">símbols Bliss</language>
+			<language type="zea" draft="contributed">zelandès</language>
 			<language type="zen">zenaga</language>
 			<language type="zgh">amazic estàndard marroquí</language>
 			<language type="zh">xinès</language>
@@ -731,7 +781,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="154">Europa septentrional</territory>
 			<territory type="155">Europa occidental</territory>
 			<territory type="419">Amèrica Llatina</territory>
-			<territory type="AC">illa de l’Ascensió</territory>
+			<territory type="AC">Illa de l’Ascensió</territory>
 			<territory type="AD">Andorra</territory>
 			<territory type="AE">Emirats Àrabs Units</territory>
 			<territory type="AF">Afganistan</territory>
@@ -739,7 +789,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albània</territory>
 			<territory type="AM">Armènia</territory>
-			<territory type="AN">Antilles Neerlandeses</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antàrtida</territory>
 			<territory type="AR">Argentina</territory>
@@ -747,7 +796,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AT">Àustria</territory>
 			<territory type="AU">Austràlia</territory>
 			<territory type="AW">Aruba</territory>
-			<territory type="AX">illes Åland</territory>
+			<territory type="AX">Illes Åland</territory>
 			<territory type="AZ">Azerbaidjan</territory>
 			<territory type="BA">Bòsnia i Hercegovina</territory>
 			<territory type="BB">Barbados</territory>
@@ -768,10 +817,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BT">Bhutan</territory>
 			<territory type="BV">Bouvet</territory>
 			<territory type="BW">Botswana</territory>
-			<territory type="BY">Bielorússia</territory>
+			<territory type="BY">Belarús</territory>
 			<territory type="BZ">Belize</territory>
 			<territory type="CA">Canadà</territory>
-			<territory type="CC">illes Cocos</territory>
+			<territory type="CC">Illes Cocos</territory>
 			<territory type="CD">Congo - Kinshasa</territory>
 			<territory type="CD" alt="variant">Congo (República Democràtica del Congo)</territory>
 			<territory type="CF">República Centreafricana</territory>
@@ -779,17 +828,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CG" alt="variant">Congo (República del Congo)</territory>
 			<territory type="CH">Suïssa</territory>
 			<territory type="CI">Costa d’Ivori</territory>
-			<territory type="CK">illes Cook</territory>
+			<territory type="CK">Illes Cook</territory>
 			<territory type="CL">Xile</territory>
 			<territory type="CM">Camerun</territory>
 			<territory type="CN">Xina</territory>
 			<territory type="CO">Colòmbia</territory>
-			<territory type="CP">illa Clipperton</territory>
+			<territory type="CP">Illa Clipperton</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Cuba</territory>
 			<territory type="CV">Cap Verd</territory>
 			<territory type="CW">Curaçao</territory>
-			<territory type="CX">illa Christmas</territory>
+			<territory type="CX">Illa Christmas</territory>
 			<territory type="CY">Xipre</territory>
 			<territory type="CZ">República Txeca</territory>
 			<territory type="DE">Alemanya</territory>
@@ -813,7 +862,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="FK">Illes Malvines</territory>
 			<territory type="FK" alt="variant">Illes Malvines (Illes Falkland)</territory>
 			<territory type="FM">Micronèsia</territory>
-			<territory type="FO">illes Fèroe</territory>
+			<territory type="FO">Illes Fèroe</territory>
 			<territory type="FR">França</territory>
 			<territory type="GA">Gabon</territory>
 			<territory type="GB">Regne Unit</territory>
@@ -830,7 +879,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GP">Guadeloupe</territory>
 			<territory type="GQ">Guinea Equatorial</territory>
 			<territory type="GR">Grècia</territory>
-			<territory type="GS">illes Geòrgia del Sud i Sandwich del Sud</territory>
+			<territory type="GS">Illes Geòrgia del Sud i Sandwich del Sud</territory>
 			<territory type="GT">Guatemala</territory>
 			<territory type="GU">Guam</territory>
 			<territory type="GW">Guinea Bissau</territory>
@@ -842,11 +891,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="HR">Croàcia</territory>
 			<territory type="HT">Haití</territory>
 			<territory type="HU">Hongria</territory>
-			<territory type="IC">illes Canàries</territory>
+			<territory type="IC">Illes Canàries</territory>
 			<territory type="ID">Indonèsia</territory>
 			<territory type="IE">Irlanda</territory>
 			<territory type="IL">Israel</territory>
-			<territory type="IM">illa de Man</territory>
+			<territory type="IM">Illa de Man</territory>
 			<territory type="IN">Índia</territory>
 			<territory type="IO">Territori Britànic de l’Oceà Índic</territory>
 			<territory type="IQ">Iraq</territory>
@@ -885,7 +934,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ME">Montenegro</territory>
 			<territory type="MF">Saint Martin</territory>
 			<territory type="MG">Madagascar</territory>
-			<territory type="MH">illes Marshall</territory>
+			<territory type="MH">Illes Marshall</territory>
 			<territory type="MK">Macedònia</territory>
 			<territory type="MK" alt="variant">Macedònia (Antiga República Iugoslava de Macedònia)</territory>
 			<territory type="ML">Mali</territory>
@@ -893,7 +942,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="MN">Mongòlia</territory>
 			<territory type="MO">Macau (RAE Xina)</territory>
 			<territory type="MO" alt="short">Macau</territory>
-			<territory type="MP">illes Mariannes del Nord</territory>
+			<territory type="MP">Illes Mariannes del Nord</territory>
 			<territory type="MQ">Martinica</territory>
 			<territory type="MR">Mauritània</territory>
 			<territory type="MS">Montserrat</territory>
@@ -925,7 +974,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="PK">Pakistan</territory>
 			<territory type="PL">Polònia</territory>
 			<territory type="PM">Saint-Pierre-et-Miquelon</territory>
-			<territory type="PN">illes Pitcairn</territory>
+			<territory type="PN">Illes Pitcairn</territory>
 			<territory type="PR">Puerto Rico</territory>
 			<territory type="PS">Palestina</territory>
 			<territory type="PS" alt="short">Palestina</territory>
@@ -940,7 +989,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="RU">Rússia</territory>
 			<territory type="RW">Ruanda</territory>
 			<territory type="SA">Aràbia Saudita</territory>
-			<territory type="SB">illes Salomó</territory>
+			<territory type="SB">Illes Salomó</territory>
 			<territory type="SC">Seychelles</territory>
 			<territory type="SD">Sudan</territory>
 			<territory type="SE">Suècia</territory>
@@ -979,7 +1028,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="TZ">Tanzània</territory>
 			<territory type="UA">Ucraïna</territory>
 			<territory type="UG">Uganda</territory>
-			<territory type="UM">illes Perifèriques Menors dels EUA</territory>
+			<territory type="UM">Illes Perifèriques Menors dels EUA</territory>
 			<territory type="US">Estats Units</territory>
 			<territory type="US" alt="short">EUA</territory>
 			<territory type="UY">Uruguai</territory>
@@ -1035,7 +1084,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<variant type="NJIVA">dialecte de Gniva/Njiva</variant>
 			<variant type="OSOJS">dialecte d’Oseacco/Osojane</variant>
 			<variant type="PAMAKA" draft="contributed">dialecte pamaka</variant>
-			<variant type="PETR1708" draft="contributed">ortografia russa 1708-1917</variant>
+			<variant type="PETR1708" draft="contributed">ortografia russa 1708–1917</variant>
 			<variant type="PINYIN">romanització Pinyin</variant>
 			<variant type="POLYTON">politònic</variant>
 			<variant type="POSIX">ordinador</variant>
@@ -1071,6 +1120,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">Ordenació numèrica</key>
 			<key type="colStrength" draft="contributed">Força de l’ordenació</key>
 			<key type="currency">moneda</key>
+			<key type="hc" draft="contributed">sistema horari (12h o 24h)</key>
+			<key type="lb" draft="contributed">estil de salt de línia</key>
+			<key type="ms" draft="contributed">Sistema de mesures</key>
 			<key type="numbers">xifres</key>
 			<key type="timezone" draft="contributed">Zona horària</key>
 			<key type="va" draft="contributed">Variant local</key>
@@ -1078,111 +1130,121 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x" draft="contributed">ús privat</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">dígits àrabs i índics</type>
-			<type type="arabext" key="numbers">dígits àrabs i índics ampliats</type>
-			<type type="armn" key="numbers">numerals armenis</type>
-			<type type="armnlow" key="numbers">numerals armenis en minúscules</type>
-			<type type="bali" key="numbers" draft="contributed">dígits balinesos</type>
-			<type type="beng" key="numbers">dígits bengalins</type>
-			<type type="big5han" key="collation">ordre del xinès tradicional - Big5</type>
-			<type type="buddhist" key="calendar">calendari budista</type>
-			<type type="cham" key="numbers" draft="contributed">dígits txams</type>
-			<type type="chinese" key="calendar">calendari xinès</type>
-			<type type="coptic" key="calendar" draft="contributed">calendari copte</type>
-			<type type="dangi" key="calendar">calendari dangi</type>
-			<type type="deva" key="numbers">dígits devanagaris</type>
-			<type type="dictionary" key="collation" draft="contributed">ordenació de diccionari</type>
-			<type type="ducet" key="collation">ordenació Unicode predeterminada</type>
-			<type type="eor" key="collation" draft="contributed">normes europees d’ordenació</type>
-			<type type="ethi" key="numbers">numerals etiòpics</type>
-			<type type="ethiopic" key="calendar">calendari etíop</type>
-			<type type="ethiopic-amete-alem" key="calendar" draft="contributed">calendari etíop amete-alem</type>
-			<type type="finance" key="numbers" draft="contributed">Numerals financers</type>
-			<type type="fullwide" key="numbers">dígits d’amplada completa</type>
-			<type type="gb2312han" key="collation">ordre del xinès simplificat - GB2312</type>
-			<type type="geor" key="numbers">numerals georgians</type>
-			<type type="gregorian" key="calendar">calendari gregorià</type>
-			<type type="grek" key="numbers">numerals grecs</type>
-			<type type="greklow" key="numbers">numerals grecs en minúscules</type>
-			<type type="gujr" key="numbers">dígits gujarati</type>
-			<type type="guru" key="numbers">dígits gurmukhi</type>
-			<type type="hanidec" key="numbers">numerals decimals xinesos</type>
-			<type type="hans" key="numbers">numerals xinesos simplificats</type>
-			<type type="hansfin" key="numbers">numerals financers xinesos simplificats</type>
-			<type type="hant" key="numbers">numerals xinesos tradicionals</type>
-			<type type="hantfin" key="numbers">numerals financers xinesos tradicionals</type>
-			<type type="hebr" key="numbers">numerals hebreus</type>
-			<type type="hebrew" key="calendar">calendari hebreu</type>
-			<type type="identical" key="colStrength" draft="contributed">Ordena-ho tot</type>
-			<type type="indian" key="calendar">calendari hindú</type>
-			<type type="islamic" key="calendar">calendari musulmà</type>
-			<type type="islamic-civil" key="calendar">calendari civil islàmic</type>
-			<type type="iso8601" key="calendar">calendari ISO-8601</type>
-			<type type="japanese" key="calendar">calendari japonès</type>
-			<type type="java" key="numbers" draft="contributed">dígits javanesos</type>
-			<type type="jpan" key="numbers">numerals japonesos</type>
-			<type type="jpanfin" key="numbers">numerals financers japonesos</type>
-			<type type="kali" key="numbers" draft="contributed">dígits kayah</type>
-			<type type="khmr" key="numbers">dígits khmer</type>
-			<type type="knda" key="numbers">dígits kannada</type>
-			<type type="lana" key="numbers" draft="contributed">dígits tai tham hora</type>
-			<type type="lanatham" key="numbers" draft="contributed">dígits tai tham tham</type>
-			<type type="laoo" key="numbers">dígits lao</type>
-			<type type="latn" key="numbers">dígits aràbics</type>
-			<type type="lepc" key="numbers" draft="contributed">dígits lepcha</type>
-			<type type="limb" key="numbers" draft="contributed">dígits limbu</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">Mostra primer les minúscules</type>
-			<type type="mlym" key="numbers">dígits malaiàlam</type>
-			<type type="mong" key="numbers" draft="contributed">dígits mongols</type>
-			<type type="mtei" key="numbers" draft="contributed">dígits meitei mayek</type>
-			<type type="mymr" key="numbers">dígits de Myanmar</type>
-			<type type="mymrshan" key="numbers" draft="contributed">dígits shan de Myanmar</type>
-			<type type="native" key="numbers" draft="contributed">Dígits natius</type>
-			<type type="nkoo" key="numbers" draft="contributed">dígits n’ko</type>
-			<type type="no" key="colBackwards" draft="contributed">Ordena els accents de manera normal</type>
-			<type type="no" key="colCaseFirst" draft="contributed">Ordena per tipus de lletra normal</type>
-			<type type="no" key="colCaseLevel" draft="contributed">Ordena sense distingir majúscules i minúscules</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">Ordena els caràcters kana de manera independent</type>
-			<type type="no" key="colNormalization" draft="contributed">Ordena sense normalització</type>
-			<type type="no" key="colNumeric" draft="contributed">Ordena els dígits individualment</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">Ordena els símbols</type>
-			<type type="olck" key="numbers" draft="contributed">dígits ol chiki</type>
-			<type type="orya" key="numbers">dígits oriya</type>
-			<type type="persian" key="calendar">calendari persa</type>
-			<type type="phonebook" key="collation">ordre de la guia telefònica</type>
-			<type type="phonetic" key="collation" draft="contributed">Ordenació fonètica</type>
-			<type type="pinyin" key="collation">ordre pinyin</type>
-			<type type="primary" key="colStrength" draft="contributed">Ordena només les lletres de base</type>
-			<type type="quaternary" key="colStrength" draft="contributed">Ordena per accents/majúscules/amplada/kana</type>
-			<type type="reformed" key="collation" draft="contributed">ordenació reformada</type>
-			<type type="roc" key="calendar">calendari de la República de Xina</type>
-			<type type="roman" key="numbers">numerals romans</type>
-			<type type="romanlow" key="numbers">numerals romans en minúscules</type>
-			<type type="saur" key="numbers" draft="contributed">dígits saurashtra</type>
-			<type type="search" key="collation">cerca de propòsit general</type>
-			<type type="searchjl" key="collation" draft="contributed">cerca per consonant inicial del hangul</type>
-			<type type="secondary" key="colStrength" draft="contributed">Ordena els accents</type>
-			<type type="shifted" key="colAlternate" draft="contributed">Ordena sense tenir en compte els símbols</type>
-			<type type="standard" key="collation">ordenació estàndard</type>
-			<type type="stroke" key="collation">ordre dels traços</type>
-			<type type="sund" key="numbers" draft="contributed">dígits sudanesos</type>
-			<type type="talu" key="numbers" draft="contributed">dígits tai lue nous</type>
-			<type type="taml" key="numbers">numerals tamils tradicionals</type>
-			<type type="tamldec" key="numbers">dígits tamils</type>
-			<type type="telu" key="numbers">dígits telugu</type>
-			<type type="tertiary" key="colStrength" draft="contributed">Ordena per accent/majúscules/amplada</type>
-			<type type="thai" key="numbers">dígits thai</type>
-			<type type="tibt" key="numbers">dígits tibetans</type>
-			<type type="traditional" key="collation">ordre tradicional</type>
-			<type type="traditional" key="numbers" draft="contributed">Numerals tradicionals</type>
-			<type type="unihan" key="collation" draft="contributed">ordenació per quantitat de traços radicals</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">Ordena amb majúscules primer</type>
-			<type type="vaii" key="numbers" draft="contributed">dígits vai</type>
-			<type type="yes" key="colBackwards" draft="contributed">Ordena amb ordre invers dels accents</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">Ordena amb detecció de majúscules i minúscules</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">Ordena els caràcters kana de manera diferent</type>
-			<type type="yes" key="colNormalization" draft="contributed">Ordena per caràcters Unicode normalitzats</type>
-			<type type="yes" key="colNumeric" draft="contributed">Ordena els dígits numèricament</type>
+			<type key="calendar" type="buddhist">calendari budista</type>
+			<type key="calendar" type="chinese">calendari xinès</type>
+			<type key="calendar" type="coptic" draft="contributed">calendari copte</type>
+			<type key="calendar" type="dangi">calendari dangi</type>
+			<type key="calendar" type="ethiopic">calendari etíop</type>
+			<type key="calendar" type="ethiopic-amete-alem" draft="contributed">calendari etíop amete-alem</type>
+			<type key="calendar" type="gregorian">calendari gregorià</type>
+			<type key="calendar" type="hebrew">calendari hebreu</type>
+			<type key="calendar" type="indian">calendari hindú</type>
+			<type key="calendar" type="islamic">calendari musulmà</type>
+			<type key="calendar" type="islamic-civil">calendari civil islàmic</type>
+			<type key="calendar" type="iso8601">calendari ISO-8601</type>
+			<type key="calendar" type="japanese">calendari japonès</type>
+			<type key="calendar" type="persian">calendari persa</type>
+			<type key="calendar" type="roc">calendari de la República de Xina</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">Ordena els símbols</type>
+			<type key="colAlternate" type="shifted" draft="contributed">Ordena sense tenir en compte els símbols</type>
+			<type key="colBackwards" type="no" draft="contributed">Ordena els accents de manera normal</type>
+			<type key="colBackwards" type="yes" draft="contributed">Ordena amb ordre invers dels accents</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">Mostra primer les minúscules</type>
+			<type key="colCaseFirst" type="no" draft="contributed">Ordena per tipus de lletra normal</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">Ordena amb majúscules primer</type>
+			<type key="colCaseLevel" type="no" draft="contributed">Ordena sense distingir majúscules i minúscules</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">Ordena amb detecció de majúscules i minúscules</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">Ordena els caràcters kana de manera independent</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">Ordena els caràcters kana de manera diferent</type>
+			<type key="collation" type="big5han">ordre del xinès tradicional - Big5</type>
+			<type key="collation" type="dictionary" draft="contributed">ordenació de diccionari</type>
+			<type key="collation" type="ducet">ordenació Unicode predeterminada</type>
+			<type key="collation" type="eor" draft="contributed">normes europees d’ordenació</type>
+			<type key="collation" type="gb2312han">ordre del xinès simplificat - GB2312</type>
+			<type key="collation" type="phonebook">ordre de la guia telefònica</type>
+			<type key="collation" type="phonetic" draft="contributed">Ordenació fonètica</type>
+			<type key="collation" type="pinyin">ordre pinyin</type>
+			<type key="collation" type="reformed" draft="contributed">ordenació reformada</type>
+			<type key="collation" type="search">cerca de propòsit general</type>
+			<type key="collation" type="searchjl" draft="contributed">cerca per consonant inicial del hangul</type>
+			<type key="collation" type="standard">ordenació estàndard</type>
+			<type key="collation" type="stroke">ordre dels traços</type>
+			<type key="collation" type="traditional">ordre tradicional</type>
+			<type key="collation" type="unihan" draft="contributed">ordenació per quantitat de traços radicals</type>
+			<type key="colNormalization" type="no" draft="contributed">Ordena sense normalització</type>
+			<type key="colNormalization" type="yes" draft="contributed">Ordena per caràcters Unicode normalitzats</type>
+			<type key="colNumeric" type="no" draft="contributed">Ordena els dígits individualment</type>
+			<type key="colNumeric" type="yes" draft="contributed">Ordena els dígits numèricament</type>
+			<type key="colStrength" type="identical" draft="contributed">Ordena-ho tot</type>
+			<type key="colStrength" type="primary" draft="contributed">Ordena només les lletres de base</type>
+			<type key="colStrength" type="quaternary" draft="contributed">Ordena per accents/majúscules/amplada/kana</type>
+			<type key="colStrength" type="secondary" draft="contributed">Ordena els accents</type>
+			<type key="colStrength" type="tertiary" draft="contributed">Ordena per accent/majúscules/amplada</type>
+			<type key="hc" type="h11" draft="contributed">sistema de 12 hores (0–11)</type>
+			<type key="hc" type="h12" draft="contributed">sistema de 12 hores (1–12)</type>
+			<type key="hc" type="h23" draft="contributed">sistema de 24 hores (0–23)</type>
+			<type key="hc" type="h24" draft="contributed">sistema de 24 hores (1–24)</type>
+			<type key="lb" type="loose" draft="contributed">salt de línia flexible</type>
+			<type key="lb" type="normal" draft="contributed">salt de línia normal</type>
+			<type key="lb" type="strict" draft="contributed">salt de línia estricte</type>
+			<type key="ms" type="metric" draft="contributed">sistema mètric</type>
+			<type key="ms" type="uksystem">sistema imperial d’unitats</type>
+			<type key="ms" type="ussystem">sistema d’unitats dels EUA</type>
+			<type key="numbers" type="arab">xifres indoaràbigues</type>
+			<type key="numbers" type="arabext">xifres indoaràbigues ampliades</type>
+			<type key="numbers" type="armn">nombres armenis</type>
+			<type key="numbers" type="armnlow">nombres armenis en minúscula</type>
+			<type key="numbers" type="bali" draft="contributed">dígits balinesos</type>
+			<type key="numbers" type="beng">dígits bengalins</type>
+			<type key="numbers" type="cham" draft="contributed">dígits txams</type>
+			<type key="numbers" type="deva">dígits devanagaris</type>
+			<type key="numbers" type="ethi">nombres etiòpics</type>
+			<type key="numbers" type="finance" draft="contributed">Numerals financers</type>
+			<type key="numbers" type="fullwide">dígits d’amplada completa</type>
+			<type key="numbers" type="geor">nombres georgians</type>
+			<type key="numbers" type="grek">nombres grecs</type>
+			<type key="numbers" type="greklow">nombres grecs en minúscula</type>
+			<type key="numbers" type="gujr">dígits gujarati</type>
+			<type key="numbers" type="guru">dígits gurmukhi</type>
+			<type key="numbers" type="hanidec">nombres decimals xinesos</type>
+			<type key="numbers" type="hans">nombres xinesos simplificats</type>
+			<type key="numbers" type="hansfin">numerals financers xinesos simplificats</type>
+			<type key="numbers" type="hant">numerals xinesos tradicionals</type>
+			<type key="numbers" type="hantfin">numerals financers xinesos tradicionals</type>
+			<type key="numbers" type="hebr">numerals hebreus</type>
+			<type key="numbers" type="java" draft="contributed">dígits javanesos</type>
+			<type key="numbers" type="jpan">numerals japonesos</type>
+			<type key="numbers" type="jpanfin">numerals financers japonesos</type>
+			<type key="numbers" type="kali" draft="contributed">dígits kayah</type>
+			<type key="numbers" type="khmr">dígits khmer</type>
+			<type key="numbers" type="knda">dígits kannada</type>
+			<type key="numbers" type="lana" draft="contributed">dígits tai tham hora</type>
+			<type key="numbers" type="lanatham" draft="contributed">dígits tai tham tham</type>
+			<type key="numbers" type="laoo">dígits lao</type>
+			<type key="numbers" type="latn">dígits aràbics</type>
+			<type key="numbers" type="lepc" draft="contributed">dígits lepcha</type>
+			<type key="numbers" type="limb" draft="contributed">dígits limbu</type>
+			<type key="numbers" type="mlym">dígits malaiàlam</type>
+			<type key="numbers" type="mong" draft="contributed">dígits mongols</type>
+			<type key="numbers" type="mtei" draft="contributed">dígits meitei mayek</type>
+			<type key="numbers" type="mymr">dígits de Myanmar</type>
+			<type key="numbers" type="mymrshan" draft="contributed">dígits shan de Myanmar</type>
+			<type key="numbers" type="native" draft="contributed">Dígits natius</type>
+			<type key="numbers" type="nkoo" draft="contributed">dígits n’ko</type>
+			<type key="numbers" type="olck" draft="contributed">dígits ol chiki</type>
+			<type key="numbers" type="orya">dígits oriya</type>
+			<type key="numbers" type="roman">nombres romans</type>
+			<type key="numbers" type="romanlow">nombres romans en minúscula</type>
+			<type key="numbers" type="saur" draft="contributed">dígits saurashtra</type>
+			<type key="numbers" type="sund" draft="contributed">dígits sudanesos</type>
+			<type key="numbers" type="talu" draft="contributed">dígits tai lue nous</type>
+			<type key="numbers" type="taml">nombres tamils tradicionals</type>
+			<type key="numbers" type="tamldec">dígits tamils</type>
+			<type key="numbers" type="telu">dígits telugu</type>
+			<type key="numbers" type="thai">dígits thai</type>
+			<type key="numbers" type="tibt">dígits tibetans</type>
+			<type key="numbers" type="traditional" draft="contributed">Numerals tradicionals</type>
+			<type key="numbers" type="vaii" draft="contributed">dígits vai</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">BGN</transformName>
@@ -1198,8 +1260,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</transformNames>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">mètric</measurementSystemName>
-			<measurementSystemName type="UK">anglosaxó</measurementSystemName>
-			<measurementSystemName type="US">imperial</measurementSystemName>
+			<measurementSystemName type="UK">RU</measurementSystemName>
+			<measurementSystemName type="US">EUA</measurementSystemName>
 		</measurementSystemNames>
 		<codePatterns>
 			<codePattern type="language">Idioma: {0}</codePattern>
@@ -1501,12 +1563,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern>dd/MM/y G</pattern>
+							<pattern>d/M/y G</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>dd/MM/yy GGGGG</pattern>
+							<pattern>d/M/yy GGGGG</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -1533,6 +1595,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
@@ -1611,15 +1674,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">M–M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd/MM – dd/MM</greatestDifference>
-							<greatestDifference id="M">dd/MM – dd/MM</greatestDifference>
+							<greatestDifference id="d">d/M – d/M</greatestDifference>
+							<greatestDifference id="M">d/M – d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E dd/MM – E dd/MM</greatestDifference>
-							<greatestDifference id="M">E dd/MM – E dd/MM</greatestDifference>
+							<greatestDifference id="d">E d/M – E d/M</greatestDifference>
+							<greatestDifference id="M">E d/M – E d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL–LLL</greatestDifference>
+							<greatestDifference id="M">MMM–MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">d–d MMM</greatestDifference>
@@ -1633,36 +1696,36 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="y">y–y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/y – MM/y GGGG</greatestDifference>
-							<greatestDifference id="y">MM/y – MM/y GGGG</greatestDifference>
+							<greatestDifference id="M">M/y – M/y GGGG</greatestDifference>
+							<greatestDifference id="y">M/y – M/y GGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd/MM/y – dd/MM/y GGGG</greatestDifference>
-							<greatestDifference id="M">dd/MM/y – dd/MM/y GGGG</greatestDifference>
-							<greatestDifference id="y">dd/MM/y – dd/MM/y GGGG</greatestDifference>
+							<greatestDifference id="d">d/M/y – d/M/y GGGG</greatestDifference>
+							<greatestDifference id="M">d/M/y – d/M/y GGGG</greatestDifference>
+							<greatestDifference id="y">d/M/y – d/M/y GGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E dd/MM/y – E dd/MM/y GGGG</greatestDifference>
-							<greatestDifference id="M">E dd/MM/y – E dd/MM/y GGGG</greatestDifference>
-							<greatestDifference id="y">E dd/MM/y – E dd/MM/y GGGG</greatestDifference>
+							<greatestDifference id="d">E d/M/y – E d/M/y GGGG</greatestDifference>
+							<greatestDifference id="M">E d/M/y – E d/M/y GGGG</greatestDifference>
+							<greatestDifference id="y">E d/M/y – E d/M/y GGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
 							<greatestDifference id="M">LLL–LLL y G</greatestDifference>
-							<greatestDifference id="y">LLL y – LLL y G</greatestDifference>
+							<greatestDifference id="y">MMM 'de' y – MMM 'de' y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d–d MMM y G</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
-							<greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
+							<greatestDifference id="d">d–d MMM 'de' y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM 'de' y G</greatestDifference>
+							<greatestDifference id="y">d MMM 'de' y – d MMM 'de' y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d MMM – E, d MMM y G</greatestDifference>
-							<greatestDifference id="M">E, d MMM – E, d MMM y G</greatestDifference>
-							<greatestDifference id="y">E, d MMM y – E, d MMM y G</greatestDifference>
+							<greatestDifference id="d">E d MMM – E d MMM 'de' y G</greatestDifference>
+							<greatestDifference id="M">E d MMM – E d MMM 'de' y G</greatestDifference>
+							<greatestDifference id="y">E d MMM 'de' y – E d MMM 'de' y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">LLLL–LLLL 'de' y G</greatestDifference>
-							<greatestDifference id="y">LLLL 'de' y – LLLL 'de' y G</greatestDifference>
+							<greatestDifference id="M">MMMM–MMMM 'de' y G</greatestDifference>
+							<greatestDifference id="y">MMMM 'de' y – MMMM 'de' y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMMd">
 							<greatestDifference id="d">d–d MMMM 'de' y G</greatestDifference>
@@ -1890,15 +1953,73 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">mitjanit</dayPeriod>
+							<dayPeriod type="am">a. m.</dayPeriod>
+							<dayPeriod type="pm">p. m.</dayPeriod>
+							<dayPeriod type="morning1">matinada</dayPeriod>
+							<dayPeriod type="morning2">matí</dayPeriod>
+							<dayPeriod type="afternoon1">migdia</dayPeriod>
+							<dayPeriod type="afternoon2">tarda</dayPeriod>
+							<dayPeriod type="evening1">vespre</dayPeriod>
+							<dayPeriod type="night1">nit</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">a.m.</dayPeriod>
-							<dayPeriod type="noon">md</dayPeriod>
-							<dayPeriod type="pm">p.m.</dayPeriod>
+							<dayPeriod type="midnight">mitjanit</dayPeriod>
+							<dayPeriod type="am">a. m.</dayPeriod>
+							<dayPeriod type="pm">p. m.</dayPeriod>
+							<dayPeriod type="morning1">mat.</dayPeriod>
+							<dayPeriod type="morning2">matí</dayPeriod>
+							<dayPeriod type="afternoon1">md</dayPeriod>
+							<dayPeriod type="afternoon2">tarda</dayPeriod>
+							<dayPeriod type="evening1">vespre</dayPeriod>
+							<dayPeriod type="night1">nit</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">mitjanit</dayPeriod>
 							<dayPeriod type="am">a. m.</dayPeriod>
-							<dayPeriod type="noon">migdia</dayPeriod>
 							<dayPeriod type="pm">p. m.</dayPeriod>
+							<dayPeriod type="morning1">matinada</dayPeriod>
+							<dayPeriod type="morning2">matí</dayPeriod>
+							<dayPeriod type="afternoon1">migdia</dayPeriod>
+							<dayPeriod type="afternoon2">tarda</dayPeriod>
+							<dayPeriod type="evening1">vespre</dayPeriod>
+							<dayPeriod type="night1">nit</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">mitjanit</dayPeriod>
+							<dayPeriod type="am">a. m.</dayPeriod>
+							<dayPeriod type="pm">p. m.</dayPeriod>
+							<dayPeriod type="morning1">matinada</dayPeriod>
+							<dayPeriod type="morning2">matí</dayPeriod>
+							<dayPeriod type="afternoon1">migdia</dayPeriod>
+							<dayPeriod type="afternoon2">tarda</dayPeriod>
+							<dayPeriod type="evening1">vespre</dayPeriod>
+							<dayPeriod type="night1">nit</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">mitjanit</dayPeriod>
+							<dayPeriod type="am">a. m.</dayPeriod>
+							<dayPeriod type="pm">p. m.</dayPeriod>
+							<dayPeriod type="morning1">matinada</dayPeriod>
+							<dayPeriod type="morning2">matí</dayPeriod>
+							<dayPeriod type="afternoon1">migdia</dayPeriod>
+							<dayPeriod type="afternoon2">tarda</dayPeriod>
+							<dayPeriod type="evening1">vespre</dayPeriod>
+							<dayPeriod type="night1">nit</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">mitjanit</dayPeriod>
+							<dayPeriod type="am">a. m.</dayPeriod>
+							<dayPeriod type="pm">p. m.</dayPeriod>
+							<dayPeriod type="morning1">matinada</dayPeriod>
+							<dayPeriod type="morning2">matí</dayPeriod>
+							<dayPeriod type="afternoon1">migdia</dayPeriod>
+							<dayPeriod type="afternoon2">tarda</dayPeriod>
+							<dayPeriod type="evening1">vespre</dayPeriod>
+							<dayPeriod type="night1">nit</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1917,9 +2038,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</eraAbbr>
 					<eraNarrow>
 						<era type="0">aC</era>
-						<era type="0" alt="variant">a. de la n. e.</era>
+						<era type="0" alt="variant">AEC</era>
 						<era type="1">dC</era>
-						<era type="1" alt="variant">de la n.e.</era>
+						<era type="1" alt="variant">EC</era>
 					</eraNarrow>
 				</eras>
 				<dateFormats>
@@ -1969,7 +2090,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern>{1} 'a les' {0}</pattern>
+							<pattern>{1} 'a' 'les' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
@@ -1979,7 +2100,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern>{1} , {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
@@ -2008,6 +2129,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv" draft="contributed">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv" draft="contributed">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv" draft="contributed">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv" draft="contributed">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E d/M</dateFormatItem>
@@ -2021,7 +2146,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yM">M/y</dateFormatItem>
 						<dateFormatItem id="yMd">d/M/y</dateFormatItem>
 						<dateFormatItem id="yMEd">E, d/M/y</dateFormatItem>
-						<dateFormatItem id="yMMM">LLL y</dateFormatItem>
+						<dateFormatItem id="yMMM">LLL 'de' y</dateFormatItem>
 						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMEd">E, d MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMM">LLLL 'de' y</dateFormatItem>
@@ -2074,12 +2199,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">M–M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd/MM – dd/MM</greatestDifference>
-							<greatestDifference id="M">dd/MM – dd/MM</greatestDifference>
+							<greatestDifference id="d">d/M – d/M</greatestDifference>
+							<greatestDifference id="M">d/M – d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E dd/MM – E dd/MM</greatestDifference>
-							<greatestDifference id="M">E dd/MM – E dd/MM</greatestDifference>
+							<greatestDifference id="d">E d/M – E d/M</greatestDifference>
+							<greatestDifference id="M">E d/M – E d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
 							<greatestDifference id="M">LLL – LLL</greatestDifference>
@@ -2096,18 +2221,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="y">y–y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/y – MM/y</greatestDifference>
-							<greatestDifference id="y">MM/y – MM/y</greatestDifference>
+							<greatestDifference id="M">M/y – M/y</greatestDifference>
+							<greatestDifference id="y">M/y – M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd/MM/y – dd/MM/y</greatestDifference>
-							<greatestDifference id="M">dd/MM/y – dd/MM/y</greatestDifference>
-							<greatestDifference id="y">dd/MM/y – dd/MM/y</greatestDifference>
+							<greatestDifference id="d">d/M/y – d/M/y</greatestDifference>
+							<greatestDifference id="M">d/M/y – d/M/y</greatestDifference>
+							<greatestDifference id="y">d/M/y – d/M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E dd/MM/y – E dd/MM/y</greatestDifference>
-							<greatestDifference id="M">E dd/MM/y – E dd/MM/y</greatestDifference>
-							<greatestDifference id="y">E dd/MM/y – E dd/MM/y</greatestDifference>
+							<greatestDifference id="d">E d/M/y – E d/M/y</greatestDifference>
+							<greatestDifference id="M">E d/M/y – E d/M/y</greatestDifference>
+							<greatestDifference id="y">E d/M/y – E d/M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
 							<greatestDifference id="M">LLL–LLL y</greatestDifference>
@@ -2185,6 +2310,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>any</displayName>
+				<relative type="-1">l’any passat</relative>
+				<relative type="0">enguany</relative>
+				<relative type="1">l’any que ve</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">d’aquí a {0} any</relativeTimePattern>
 					<relativeTimePattern count="other">d’aquí a {0} anys</relativeTimePattern>
@@ -2196,6 +2324,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>any</displayName>
+				<relative type="-1">l’any passat</relative>
+				<relative type="0">enguany</relative>
+				<relative type="1">l’any que ve</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">en {0} any</relativeTimePattern>
 					<relativeTimePattern count="other">en {0} anys</relativeTimePattern>
@@ -2207,6 +2338,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter">
 				<displayName>trimestre</displayName>
+				<relative type="-1">el trimestre passat</relative>
+				<relative type="0">aquest trimestre</relative>
+				<relative type="1">el trimestre que ve</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">d’aquí a {0} trimestre</relativeTimePattern>
 					<relativeTimePattern count="other">d’aquí a {0} trimestres</relativeTimePattern>
@@ -2218,6 +2352,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>trim.</displayName>
+				<relative type="-1">el trim. passat</relative>
+				<relative type="0">aquest trim.</relative>
+				<relative type="1">el trim. que ve</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">d’aquí a {0} trim.</relativeTimePattern>
 					<relativeTimePattern count="other">d’aquí a {0} trim.</relativeTimePattern>
@@ -2228,7 +2365,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="quarter-narrow">
-				<displayName>T</displayName>
+				<displayName>trim.</displayName>
+				<relative type="-1">trim. passat</relative>
+				<relative type="0">aquest trim.</relative>
+				<relative type="1">trim. vinent</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">en {0} trim.</relativeTimePattern>
 					<relativeTimePattern count="other">en {0} trim.</relativeTimePattern>
@@ -2254,6 +2394,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>mes</displayName>
+				<relative type="-1">el mes passat</relative>
+				<relative type="0">aquest mes</relative>
+				<relative type="1">el mes que ve</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">d’aquí a {0} mes</relativeTimePattern>
 					<relativeTimePattern count="other">d’aquí a {0} mesos</relativeTimePattern>
@@ -2265,6 +2408,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>mes</displayName>
+				<relative type="-1">mes passat</relative>
+				<relative type="0">aquest mes</relative>
+				<relative type="1">mes vinent</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">en {0} mes</relativeTimePattern>
 					<relativeTimePattern count="other">en {0} mesos</relativeTimePattern>
@@ -2290,6 +2436,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>setm.</displayName>
+				<relative type="-1">la setm. passada</relative>
+				<relative type="0">aquesta setm.</relative>
+				<relative type="1">la setm. que ve</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">d’aquí a {0} setm.</relativeTimePattern>
 					<relativeTimePattern count="other">d’aquí a {0} setm.</relativeTimePattern>
@@ -2301,6 +2450,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>setm.</displayName>
+				<relative type="-1">setm. passada</relative>
+				<relative type="0">aquesta setm.</relative>
+				<relative type="1">setm. vinent</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">en {0} setm.</relativeTimePattern>
 					<relativeTimePattern count="other">en {0} setm.</relativeTimePattern>
@@ -2328,6 +2480,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName draft="contributed">dia</displayName>
+				<relative type="-2">abans-d’ahir</relative>
+				<relative type="-1">ahir</relative>
+				<relative type="0">avui</relative>
+				<relative type="1">demà</relative>
+				<relative type="2">demà passat</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">d’aquí a {0} dia</relativeTimePattern>
 					<relativeTimePattern count="other">d’aquí a {0} dies</relativeTimePattern>
@@ -2339,6 +2496,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName draft="contributed">dia</displayName>
+				<relative type="-2">abans-d’ahir</relative>
+				<relative type="-1">ahir</relative>
+				<relative type="0">avui</relative>
+				<relative type="1">demà</relative>
+				<relative type="2">demà passat</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">d’aquí a {0} dia</relativeTimePattern>
 					<relativeTimePattern count="other">d’aquí a {0} dies</relativeTimePattern>
@@ -2364,7 +2526,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="sun-narrow">
 				<relative type="-1">dg. passat</relative>
 				<relative type="0">aquest dg.</relative>
-				<relative type="1" draft="contributed">dg. que ve</relative>
+				<relative type="1">dg. que ve</relative>
 			</field>
 			<field type="mon">
 				<relative type="-1">dilluns passat</relative>
@@ -2387,14 +2549,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">dimarts que ve</relative>
 			</field>
 			<field type="tue-short">
-				<relative type="-1">dm. passat</relative>
-				<relative type="0">aquest dm.</relative>
-				<relative type="1">dm. que ve</relative>
+				<relative type="-1">dt. passat</relative>
+				<relative type="0">aquest dt.</relative>
+				<relative type="1">dt. que ve</relative>
 			</field>
 			<field type="tue-narrow">
-				<relative type="-1">dm. passat</relative>
-				<relative type="0">aquest dm.</relative>
-				<relative type="1" draft="contributed">dm. que ve</relative>
+				<relative type="-1">dt. passat</relative>
+				<relative type="0">aquest dt.</relative>
+				<relative type="1">dt. que ve</relative>
 			</field>
 			<field type="wed">
 				<relative type="-1">dimecres passat</relative>
@@ -2454,7 +2616,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="sat-narrow">
 				<relative type="-1">ds. passat</relative>
 				<relative type="0">aquest ds.</relative>
-				<relative type="1" draft="contributed">ds. que ve</relative>
+				<relative type="1">ds. que ve</relative>
 			</field>
 			<field type="dayperiod">
 				<displayName>a. m./p. m.</displayName>
@@ -2463,7 +2625,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>hora</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">d’aquí a {0} hora</relativeTimePattern>
-					<relativeTimePattern count="other">d’aquí {0} hores</relativeTimePattern>
+					<relativeTimePattern count="other">d’aquí a {0} hores</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">fa {0} hora</relativeTimePattern>
@@ -2474,7 +2636,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>h</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">d’aquí a {0} h</relativeTimePattern>
-					<relativeTimePattern count="other">d’aquí {0} hores</relativeTimePattern>
+					<relativeTimePattern count="other">d’aquí a {0} h</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">fa {0} h</relativeTimePattern>
@@ -2517,8 +2679,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="minute-narrow">
 				<displayName>min</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="contributed">d’aquí a {0} min</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">d’aquí a {0} min</relativeTimePattern>
+					<relativeTimePattern count="one">d’aquí a {0} min</relativeTimePattern>
+					<relativeTimePattern count="other">d’aquí a {0} min</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">fa {0} min</relativeTimePattern>
@@ -2560,7 +2722,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>zona</displayName>
+				<displayName>fus horari</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
@@ -3007,7 +3169,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Asmara</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Canary">
-				<exemplarCity>illes Canàries</exemplarCity>
+				<exemplarCity>Illes Canàries</exemplarCity>
 			</zone>
 			<zone type="Africa/Ceuta">
 				<exemplarCity>Ceuta</exemplarCity>
@@ -3438,6 +3600,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity draft="contributed">Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
 			</zone>
@@ -3522,6 +3687,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity draft="contributed">Txità</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Jakutsk</exemplarCity>
 			</zone>
@@ -3540,6 +3708,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity draft="contributed">Srednekolimsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamtxatka</exemplarCity>
 			</zone>
@@ -3897,9 +4068,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic draft="contributed">Hora d’Apia</generic>
-					<standard draft="contributed">Hora estàndard d’Apia</standard>
-					<daylight draft="contributed">Hora d’estiu d’Apia</daylight>
+					<generic>Hora d’Apia</generic>
+					<standard>Hora estàndard d’Apia</standard>
+					<daylight>Hora d’estiu d’Apia</daylight>
 				</long>
 			</metazone>
 			<metazone type="Arabian">
@@ -4847,6 +5018,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="contributed">0m ¤</pattern>
+					<pattern type="1000" count="other" draft="contributed">0m ¤</pattern>
+					<pattern type="10000" count="one" draft="contributed">00m ¤</pattern>
+					<pattern type="10000" count="other" draft="contributed">00m ¤</pattern>
+					<pattern type="100000" count="one" draft="contributed">000m ¤</pattern>
+					<pattern type="100000" count="other" draft="contributed">000m ¤</pattern>
+					<pattern type="1000000" count="one" draft="contributed">0M ¤</pattern>
+					<pattern type="1000000" count="other" draft="contributed">0M ¤</pattern>
+					<pattern type="10000000" count="one" draft="contributed">00 M ¤</pattern>
+					<pattern type="10000000" count="other" draft="contributed">00 M ¤</pattern>
+					<pattern type="100000000" count="one" draft="contributed">000 M ¤</pattern>
+					<pattern type="100000000" count="other" draft="contributed">000 M ¤</pattern>
+					<pattern type="1000000000" count="one" draft="contributed">0000 M ¤</pattern>
+					<pattern type="1000000000" count="other" draft="contributed">0000 M ¤</pattern>
+					<pattern type="10000000000" count="one" draft="contributed">00mM ¤</pattern>
+					<pattern type="10000000000" count="other" draft="contributed">00mM ¤</pattern>
+					<pattern type="100000000000" count="one" draft="contributed">000mM ¤</pattern>
+					<pattern type="100000000000" count="other" draft="contributed">000mM ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="contributed">0B ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="contributed">0B ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="contributed">00 B ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="contributed">00 B ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="contributed">000 B ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="contributed">000 B ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4903,6 +5102,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">kwanza angolès</displayName>
 				<displayName count="other">kwanzas angolesos</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">AOA</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>kwanza angolès (1977–1991)</displayName>
@@ -4951,6 +5151,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">peso argentí</displayName>
 				<displayName count="other">pesos argentins</displayName>
 				<symbol>ARS</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="ATS">
 				<displayName>xíling austríac</displayName>
@@ -4963,6 +5164,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dòlar australià</displayName>
 				<displayName count="other">dòlars australians</displayName>
 				<symbol>AU$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="AWG">
 				<displayName>florí d’Aruba</displayName>
@@ -4993,6 +5195,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">marc convertible de Bòsnia i Hercegovina</displayName>
 				<displayName count="other">marcs convertibles de Bòsnia i Hercegovina</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BAN">
 				<displayName>nou dinar de Bòsnia i Hercegovina (1994–1997)</displayName>
@@ -5005,12 +5208,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dòlar de Barbados</displayName>
 				<displayName count="other">dòlars de Barbados</displayName>
 				<symbol>BBD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BDT">
 				<displayName>taka de Bangla Desh</displayName>
 				<displayName count="one">taka de Bangla Desh</displayName>
 				<displayName count="other">taka de Bangla Desh</displayName>
 				<symbol>BDT</symbol>
+				<symbol alt="narrow" draft="contributed">৳</symbol>
 			</currency>
 			<currency type="BEC">
 				<displayName>franc belga (convertible)</displayName>
@@ -5078,12 +5283,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dòlar de Brunei</displayName>
 				<displayName count="other">dòlars de Brunei</displayName>
 				<symbol>BND</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BOB">
 				<displayName>bolivià</displayName>
 				<displayName count="one">bolivià</displayName>
 				<displayName count="other">bolivians</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">BOB</symbol>
 			</currency>
 			<currency type="BOL">
 				<displayName>boliviano bolivià (1863–1963)</displayName>
@@ -5126,6 +5333,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">real brasiler</displayName>
 				<displayName count="other">reals brasilers</displayName>
 				<symbol>BRL</symbol>
+				<symbol alt="narrow" draft="contributed">R$</symbol>
 			</currency>
 			<currency type="BRN">
 				<displayName>cruzado novo brasiler</displayName>
@@ -5150,6 +5358,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dòlar de les Bahames</displayName>
 				<displayName count="other">dòlars de les Bahames</displayName>
 				<symbol>BSD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BTN">
 				<displayName>ngultrum de Bhutan</displayName>
@@ -5168,6 +5377,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">pula de Botswana</displayName>
 				<displayName count="other">pula de Botswana</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>nou ruble bielorús (1994–1999)</displayName>
@@ -5180,13 +5390,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ruble bielorús</displayName>
 				<displayName count="other">rubles bielorussos</displayName>
 				<symbol>BYR</symbol>
+				<symbol alt="narrow" draft="contributed">р.</symbol>
 			</currency>
 			<currency type="BZD">
 				<displayName>dòlar de Belize</displayName>
 				<displayName count="one">dòlar de Belize</displayName>
 				<displayName count="other">dòlars de Belize</displayName>
 				<symbol>BZD</symbol>
-				<symbol alt="narrow" draft="contributed">USD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CAD">
 				<displayName>dòlar canadenc</displayName>
@@ -5236,6 +5447,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">peso xilè</displayName>
 				<displayName count="other">pesos xilens</displayName>
 				<symbol>CLP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CNX">
 				<displayName count="one" draft="contributed">dòlar del Banc Popular Xinès</displayName>
@@ -5246,12 +5458,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">iuan xinès</displayName>
 				<displayName count="other">iuan xinesos</displayName>
 				<symbol>¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
 			<currency type="COP">
 				<displayName>peso colombià</displayName>
 				<displayName count="one">peso colombià</displayName>
 				<displayName count="other">pesos colombians</displayName>
 				<symbol>COP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="COU">
 				<displayName>unidad de valor real colombiana</displayName>
@@ -5283,12 +5497,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">peso convertible cubà</displayName>
 				<displayName count="other">pesos convertibles cubans</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>peso cubà</displayName>
 				<displayName count="one">peso cubà</displayName>
 				<displayName count="other">pesos cubans</displayName>
 				<symbol>CUP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CVE">
 				<displayName>escut de Cap Verd</displayName>
@@ -5307,6 +5523,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">corona txeca</displayName>
 				<displayName count="other">corones txeques</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>marc de l’Alemanya Oriental</displayName>
@@ -5331,12 +5548,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">corona danesa</displayName>
 				<displayName count="other">corones daneses</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">DKK</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>peso dominicà</displayName>
 				<displayName count="one">peso dominicà</displayName>
 				<displayName count="other">pesos dominicans</displayName>
 				<symbol>DOP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="DZD">
 				<displayName>dinar algerià</displayName>
@@ -5367,6 +5586,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">lliura egípcia</displayName>
 				<displayName count="other">lliures egípcies</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>nakfa eritreu</displayName>
@@ -5419,12 +5639,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dòlar fijià</displayName>
 				<displayName count="other">dòlars fijians</displayName>
 				<symbol>FJD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="FKP">
 				<displayName>lliura de les illes Malvines</displayName>
 				<displayName count="one">lliura de les illes Malvines</displayName>
 				<displayName count="other">lliures de les illes Malvines</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>franc francès</displayName>
@@ -5433,9 +5655,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol draft="contributed">FRF</symbol>
 			</currency>
 			<currency type="GBP">
-				<displayName>lliura britànica</displayName>
-				<displayName count="one">lliura britànica</displayName>
-				<displayName count="other">lliures britàniques</displayName>
+				<displayName>lliura esterlina britànica</displayName>
+				<displayName count="one">lliura esterlina britànica</displayName>
+				<displayName count="other">lliures esterlines britàniques</displayName>
 				<symbol>£</symbol>
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
@@ -5450,6 +5672,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">lari georgià</displayName>
 				<displayName count="other">laris georgians</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>cedi ghanès (1979–2007)</displayName>
@@ -5468,6 +5691,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">lliura de Gibraltar</displayName>
 				<displayName count="other">lliures de Gibraltar</displayName>
 				<symbol>GIP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GMD">
 				<displayName>dalasi gambià</displayName>
@@ -5480,6 +5704,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">franc guineà</displayName>
 				<displayName count="other">francs guineans</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>syli guineà</displayName>
@@ -5504,6 +5729,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">quetzal guatemalenc</displayName>
 				<displayName count="other">quetzals guatemalencs</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">GTQ</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>escut de la Guinea Portuguesa</displayName>
@@ -5522,18 +5748,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dòlar de Guyana</displayName>
 				<displayName count="other">dòlars de Guyana</displayName>
 				<symbol>GYD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="HKD">
 				<displayName>dòlar de Hong Kong</displayName>
 				<displayName count="one">dòlar de Hong Kong</displayName>
 				<displayName count="other">dòlars de Hong Kong</displayName>
 				<symbol>HK$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="HNL">
 				<displayName>lempira hondurenya</displayName>
 				<displayName count="one">lempira hondurenya</displayName>
 				<displayName count="other">lempires hondurenyes</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">HNL</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>dinar croat</displayName>
@@ -5546,6 +5775,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">kuna croata</displayName>
 				<displayName count="other">kunes croates</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>gourde haitià</displayName>
@@ -5558,12 +5788,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">fòrint hongarès</displayName>
 				<displayName count="other">fòrints hongaresos</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>rupia indonèsia</displayName>
 				<displayName count="one">rupia indonèsia</displayName>
 				<displayName count="other">rupies indonèsies</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>lliura irlandesa</displayName>
@@ -5587,12 +5819,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">nou xéquel israelià</displayName>
 				<displayName count="other">nous xéquels israelians</displayName>
 				<symbol>₪</symbol>
+				<symbol alt="narrow" draft="contributed">₪</symbol>
 			</currency>
 			<currency type="INR">
 				<displayName>rupia índia</displayName>
 				<displayName count="one">rupia índia</displayName>
 				<displayName count="other">rupies índies</displayName>
 				<symbol>₹</symbol>
+				<symbol alt="narrow" draft="contributed">₹</symbol>
 			</currency>
 			<currency type="IQD">
 				<displayName>dinar iraquià</displayName>
@@ -5616,6 +5850,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">corona islandesa</displayName>
 				<displayName count="other">corones islandeses</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">ISK</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>lira italiana</displayName>
@@ -5628,6 +5863,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dòlar jamaicà</displayName>
 				<displayName count="other">dòlars jamaicans</displayName>
 				<symbol>JMD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="JOD">
 				<displayName>dinar jordà</displayName>
@@ -5640,6 +5876,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ien japonès</displayName>
 				<displayName count="other">iens japonesos</displayName>
 				<symbol>JP¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
 			<currency type="KES">
 				<displayName>xíling kenyà</displayName>
@@ -5658,18 +5895,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">riel cambodjà</displayName>
 				<displayName count="other">riels cambodjans</displayName>
 				<symbol>KHR</symbol>
+				<symbol alt="narrow" draft="contributed">៛</symbol>
 			</currency>
 			<currency type="KMF">
 				<displayName>franc de les Comores</displayName>
 				<displayName count="one">franc de les Comores</displayName>
 				<displayName count="other">francs de les Comores</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>won nord-coreà</displayName>
 				<displayName count="one">won nord-coreà</displayName>
 				<displayName count="other">wons nord-coreans</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRH">
 				<displayName draft="contributed">hwan sud-coreà (1953–1962)</displayName>
@@ -5688,6 +5928,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">won sud-coreà</displayName>
 				<displayName count="other">wons sud-coreans</displayName>
 				<symbol>₩</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KWD">
 				<displayName>dinar kuwaitià</displayName>
@@ -5700,36 +5941,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dòlar de les illes Caiman</displayName>
 				<displayName count="other">dòlars de les illes Caiman</displayName>
 				<symbol>KYD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="KZT">
 				<displayName>tenge kazakh</displayName>
 				<displayName count="one">tenge kazakh</displayName>
 				<displayName count="other">tenges kazakhs</displayName>
 				<symbol>KZT</symbol>
+				<symbol alt="narrow" draft="contributed">₸</symbol>
 			</currency>
 			<currency type="LAK">
 				<displayName>kip laosià</displayName>
 				<displayName count="one">kip laosià</displayName>
 				<displayName count="other">kips laosians</displayName>
 				<symbol>LAK</symbol>
+				<symbol alt="narrow" draft="contributed">₭</symbol>
 			</currency>
 			<currency type="LBP">
 				<displayName>lliura libanesa</displayName>
 				<displayName count="one">lliura libanesa</displayName>
 				<displayName count="other">lliures libaneses</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>rupia de Sri Lanka</displayName>
 				<displayName count="one">rupia de Sri Lanka</displayName>
 				<displayName count="other">rupies de Sri Lanka</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>dòlar liberià</displayName>
 				<displayName count="one">dòlar liberià</displayName>
 				<displayName count="other">dòlars liberians</displayName>
 				<symbol>LRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="LSL">
 				<displayName>loti de Lesotho</displayName>
@@ -5820,6 +6067,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ariary malgaix</displayName>
 				<displayName count="other">ariarys malgaixos</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>franc malgaix</displayName>
@@ -5850,12 +6098,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">kyat de Myanmar</displayName>
 				<displayName count="other">kyats de Myanmar</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>tögrög mongol</displayName>
 				<displayName count="one">tögrög mongol</displayName>
 				<displayName count="other">tögrögs mongols</displayName>
 				<symbol>MNT</symbol>
+				<symbol alt="narrow" draft="contributed">₮</symbol>
 			</currency>
 			<currency type="MOP">
 				<displayName>pataca de Macau</displayName>
@@ -5886,6 +6136,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">rupia mauriciana</displayName>
 				<displayName count="other">rupies mauricianes</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>rupia de les Maldives</displayName>
@@ -5923,6 +6174,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ringgit de Malàisia</displayName>
 				<displayName count="other">ringgits de Malàisia</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>escut moçambiquès</displayName>
@@ -5947,12 +6199,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dòlar namibià</displayName>
 				<displayName count="other">dòlars namibians</displayName>
 				<symbol>NAD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="NGN">
 				<displayName>naira nigerià</displayName>
 				<displayName count="one">naira nigerià</displayName>
 				<displayName count="other">naires nigerians</displayName>
 				<symbol>NGN</symbol>
+				<symbol alt="narrow" draft="contributed">₦</symbol>
 			</currency>
 			<currency type="NIC">
 				<displayName>córdoba nicaragüenca</displayName>
@@ -5965,6 +6219,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">córdoba oro nicaragüenca</displayName>
 				<displayName count="other">córdobas oro nicaragüenques</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>florí neerlandès</displayName>
@@ -5977,18 +6232,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">corona noruega</displayName>
 				<displayName count="other">corones noruegues</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">NOK</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>rupia nepalesa</displayName>
 				<displayName count="one">rupia nepalesa</displayName>
 				<displayName count="other">rupies nepaleses</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>dòlar neozelandès</displayName>
 				<displayName count="one">dòlar neozelandès</displayName>
 				<displayName count="other">dòlars neozelandesos</displayName>
 				<symbol>NZ$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="OMR">
 				<displayName>rial omanita</displayName>
@@ -6031,18 +6289,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">peso filipí</displayName>
 				<displayName count="other">pesos filipins</displayName>
 				<symbol>PHP</symbol>
+				<symbol alt="narrow" draft="contributed">₱</symbol>
 			</currency>
 			<currency type="PKR">
 				<displayName>rupia pakistanesa</displayName>
 				<displayName count="one">rupia pakistanesa</displayName>
 				<displayName count="other">rupies pakistaneses</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>zloty polonès</displayName>
 				<displayName count="one">zloty polonès</displayName>
 				<displayName count="other">zlote polonesos</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>zloty polonès (1950–1995)</displayName>
@@ -6061,6 +6322,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">guaraní paraguaià</displayName>
 				<displayName count="other">guaranís paraguaians</displayName>
 				<symbol>PYG</symbol>
+				<symbol alt="narrow" draft="contributed">₲</symbol>
 			</currency>
 			<currency type="QAR">
 				<displayName>rial de Qatar</displayName>
@@ -6097,6 +6359,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ruble rus</displayName>
 				<displayName count="other">rubles russos</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>ruble rus (1991–1998)</displayName>
@@ -6109,6 +6372,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">franc de Ruanda</displayName>
 				<displayName count="other">francs de Ruanda</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>rial saudita</displayName>
@@ -6121,6 +6385,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dòlar de les illes Salomó</displayName>
 				<displayName count="other">dòlars de les illes Salomó</displayName>
 				<symbol>SBD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SCR">
 				<displayName>rupia de les Seychelles</displayName>
@@ -6151,18 +6416,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">corona sueca</displayName>
 				<displayName count="other">corones sueques</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">SEK</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>dòlar de Singapur</displayName>
 				<displayName count="one">dòlar de Singapur</displayName>
 				<displayName count="other">dòlars de Singapur</displayName>
 				<symbol>SGD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SHP">
 				<displayName>lliura de Santa Helena</displayName>
 				<displayName count="one">lliura de Santa Helena</displayName>
 				<displayName count="other">lliures de Santa Helena</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>tolar eslovè</displayName>
@@ -6193,6 +6461,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dòlar de Surinam</displayName>
 				<displayName count="other">dòlars de Surinam</displayName>
 				<symbol>SRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SRG">
 				<displayName>florí de Surinam</displayName>
@@ -6205,12 +6474,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">lliura del Sudan del Sud</displayName>
 				<displayName count="other">lliures del Sudan del Sud</displayName>
 				<symbol>SSP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="STD">
 				<displayName>dobra de São Tomé i Príncipe</displayName>
 				<displayName count="one">dobra de São Tomé i Príncipe</displayName>
 				<displayName count="other">dobras de São Tomé i Príncipe</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">STD</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>ruble soviètic</displayName>
@@ -6229,6 +6500,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">lliura síria</displayName>
 				<displayName count="other">lliures síries</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>lilangeni swazi</displayName>
@@ -6241,6 +6513,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">baht tailandès</displayName>
 				<displayName count="other">bahts tailandesos</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>ruble tadjik</displayName>
@@ -6277,6 +6550,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">pa‘anga tongà</displayName>
 				<displayName count="other">pa‘angas tongans</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>escut de Timor</displayName>
@@ -6295,18 +6569,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">lira turca</displayName>
 				<displayName count="other">lires turques</displayName>
 				<symbol>TRY</symbol>
+				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>dòlar de Trinitat i Tobago</displayName>
 				<displayName count="one">dòlar de Trinitat i Tobago</displayName>
 				<displayName count="other">dòlars de Trinitat i Tobago</displayName>
 				<symbol>TTD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="TWD">
 				<displayName>nou dòlar de Taiwan</displayName>
 				<displayName count="one">nou dòlar de Taiwan</displayName>
 				<displayName count="other">nous dòlars de Taiwan</displayName>
 				<symbol>NT$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="TZS">
 				<displayName>xíling tanzà</displayName>
@@ -6319,6 +6597,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">hrívnia ucraïnesa</displayName>
 				<displayName count="other">hrívnies ucraïneses</displayName>
 				<symbol>UAH</symbol>
+				<symbol alt="narrow" draft="contributed">₴</symbol>
 			</currency>
 			<currency type="UAK">
 				<displayName>karbóvanets ucraïnès</displayName>
@@ -6374,6 +6653,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">peso uruguaià</displayName>
 				<displayName count="other">pesos uruguaians</displayName>
 				<symbol>UYU</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="UZS">
 				<displayName>som uzbek</displayName>
@@ -6392,12 +6672,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">bolívar veneçolà</displayName>
 				<displayName count="other">bolívars veneçolans</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">VEF</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>dong vietnamita</displayName>
 				<displayName count="one">dong vietnamita</displayName>
 				<displayName count="other">dongs vietnamites</displayName>
 				<symbol>₫</symbol>
+				<symbol alt="narrow" draft="contributed">₫</symbol>
 			</currency>
 			<currency type="VNN">
 				<displayName>dong vietnamita (1978–1985)</displayName>
@@ -6464,6 +6746,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dòlar del Carib Oriental</displayName>
 				<displayName count="other">dòlars del Carib Oriental</displayName>
 				<symbol>XCD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>drets especials de gir</displayName>
@@ -6493,7 +6776,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>franc CFA BCEAO</displayName>
 				<displayName count="one">franc CFA BCEAO</displayName>
 				<displayName count="other">francs CFA BCEAO</displayName>
-				<symbol>XOF</symbol>
+				<symbol>CFA</symbol>
 			</currency>
 			<currency type="XPD">
 				<displayName>pal·ladi</displayName>
@@ -6578,6 +6861,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">rand sud-africà</displayName>
 				<displayName count="other">rands sud-africans</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>kwacha zambià (1968–2012)</displayName>
@@ -6590,6 +6874,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">kwacha zambià</displayName>
 				<displayName count="other">kwacha zambians</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>nou zaire zairès</displayName>
@@ -6642,6 +6927,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} metre per segon al quadrat</unitPattern>
 				<unitPattern count="other">{0} metres per segon al quadrat</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>revolució</displayName>
+				<unitPattern count="one">{0} revolució</unitPattern>
+				<unitPattern count="other">{0} revolucions</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radiant</displayName>
+				<unitPattern count="one">{0} radiant</unitPattern>
+				<unitPattern count="other">{0} radiants</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>graus</displayName>
+				<unitPattern count="one">{0} grau</unitPattern>
+				<unitPattern count="other">{0} graus</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>minuts d’arc</displayName>
 				<unitPattern count="one">{0} minut d'arc</unitPattern>
@@ -6649,33 +6949,45 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="angle-arc-second">
 				<displayName>segons d’arc</displayName>
-				<unitPattern count="one">{0} segon</unitPattern>
-				<unitPattern count="other">{0} segons</unitPattern>
+				<unitPattern count="one">{0} segon d'arc</unitPattern>
+				<unitPattern count="other">{0} segons d'arc</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>graus</displayName>
-				<unitPattern count="one">{0} grau</unitPattern>
-				<unitPattern count="other">{0} graus</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radiant</displayName>
-				<unitPattern count="one">{0} radiant</unitPattern>
-				<unitPattern count="other">{0} radiants</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>acres</displayName>
-				<unitPattern count="one">{0} acre</unitPattern>
-				<unitPattern count="other">{0} acres</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>quilòmetres quadrats</displayName>
+				<unitPattern count="one">{0} quilòmetre quadrat</unitPattern>
+				<unitPattern count="other">{0} quilòmetres quadrats</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hectàrees</displayName>
 				<unitPattern count="one">{0} hectàrea</unitPattern>
 				<unitPattern count="other">{0} hectàrees</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>metres quadrats</displayName>
+				<unitPattern count="one">{0} metre quadrat</unitPattern>
+				<unitPattern count="other">{0} metres quadrats</unitPattern>
+				<perUnitPattern>{0} per metre quadrat</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>centímetres quadrats</displayName>
 				<unitPattern count="one">{0} centímetre quadrat</unitPattern>
 				<unitPattern count="other">{0} centímetres quadrats</unitPattern>
+				<perUnitPattern>{0} per centímetre quadrat</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>milles quadrades</displayName>
+				<unitPattern count="one">{0} milla quadrada</unitPattern>
+				<unitPattern count="other">{0} milles quadrades</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acres</displayName>
+				<unitPattern count="one">{0} acre</unitPattern>
+				<unitPattern count="other">{0} acres</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>iardes quadrades</displayName>
+				<unitPattern count="one">{0} iarda quadrada</unitPattern>
+				<unitPattern count="other">{0} iardes quadrades</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>peus quadrats</displayName>
@@ -6686,91 +6998,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>polzades quadrades</displayName>
 				<unitPattern count="one">{0} polzada quadrada</unitPattern>
 				<unitPattern count="other">{0} polzades quadrades</unitPattern>
+				<perUnitPattern>{0} per polzada quadrada</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>quilòmetres quadrats</displayName>
-				<unitPattern count="one">{0} quilòmetre quadrat</unitPattern>
-				<unitPattern count="other">{0} quilòmetres quadrats</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>metres quadrats</displayName>
-				<unitPattern count="one">{0} metre quadrat</unitPattern>
-				<unitPattern count="other">{0} metres quadrats</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>milles quadrades</displayName>
-				<unitPattern count="one">{0} milla quadrada</unitPattern>
-				<unitPattern count="other">{0} milles quadrades</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>iardes quadrades</displayName>
-				<unitPattern count="one">{0} iarda quadrada</unitPattern>
-				<unitPattern count="other">{0} iardes quadrades</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>quirats</displayName>
+				<unitPattern count="one">{0} quirat</unitPattern>
+				<unitPattern count="other">{0} quirats</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litres per quilòmetre</displayName>
 				<unitPattern count="one">{0} litre per quilòmetre</unitPattern>
 				<unitPattern count="other">{0} litres per quilòmetre</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>litres per 100 quilòmetres</displayName>
+				<unitPattern count="one">{0} litres per 100 quilòmetres</unitPattern>
+				<unitPattern count="other">{0} litres per 100 quilòmetres</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>milles per galó</displayName>
 				<unitPattern count="one">{0} milla per galó</unitPattern>
 				<unitPattern count="other">{0} milles per galó</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bits</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bytes</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} bytes</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabits</displayName>
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="other">{0} gigabits</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabytes</displayName>
-				<unitPattern count="one">{0} gigabyte</unitPattern>
-				<unitPattern count="other">{0} gigabytes</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>quilobits</displayName>
-				<unitPattern count="one">{0} quilobit</unitPattern>
-				<unitPattern count="other">{0} quilobits</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>quilobytes</displayName>
-				<unitPattern count="one">{0} quilobyte</unitPattern>
-				<unitPattern count="other">{0} quilobytes</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabit</displayName>
-				<unitPattern count="one">{0} megabit</unitPattern>
-				<unitPattern count="other">{0} megabits</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabyte</displayName>
-				<unitPattern count="one">{0} megabyte</unitPattern>
-				<unitPattern count="other">{0} megabytes</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabits</displayName>
-				<unitPattern count="one">{0} terabit</unitPattern>
-				<unitPattern count="other">{0} terabits</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabytes</displayName>
 				<unitPattern count="one">{0} terabyte</unitPattern>
 				<unitPattern count="other">{0} terabytes</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabits</displayName>
+				<unitPattern count="one">{0} terabit</unitPattern>
+				<unitPattern count="other">{0} terabits</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabytes</displayName>
+				<unitPattern count="one">{0} gigabyte</unitPattern>
+				<unitPattern count="other">{0} gigabytes</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabits</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="other">{0} gigabits</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabyte</displayName>
+				<unitPattern count="one">{0} megabyte</unitPattern>
+				<unitPattern count="other">{0} megabytes</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabit</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="other">{0} megabits</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>quilobytes</displayName>
+				<unitPattern count="one">{0} quilobyte</unitPattern>
+				<unitPattern count="other">{0} quilobytes</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>quilobits</displayName>
+				<unitPattern count="one">{0} quilobit</unitPattern>
+				<unitPattern count="other">{0} quilobits</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bytes</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} bytes</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bits</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="contributed">segles</displayName>
+				<unitPattern count="one" draft="contributed">{0} segle</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} segles</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>anys</displayName>
+				<unitPattern count="one">{0} any</unitPattern>
+				<unitPattern count="other">{0} anys</unitPattern>
+				<perUnitPattern draft="contributed">{0} per any</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mesos</displayName>
+				<unitPattern count="one">{0} mes</unitPattern>
+				<unitPattern count="other">{0} mesos</unitPattern>
+				<perUnitPattern>{0} per mes</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>setmanes</displayName>
+				<unitPattern count="one">{0} setmana</unitPattern>
+				<unitPattern count="other">{0} setmanes</unitPattern>
+				<perUnitPattern>{0} per setmana</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>dies</displayName>
 				<unitPattern count="one">{0} dia</unitPattern>
 				<unitPattern count="other">{0} dies</unitPattern>
+				<perUnitPattern>{0} per dia</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>hores</displayName>
@@ -6778,30 +7105,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} hores</unitPattern>
 				<perUnitPattern>{0} per hora</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>microsegon</displayName>
-				<unitPattern count="one">{0} microsegon</unitPattern>
-				<unitPattern count="other">{0} microsegons</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>mil·lisegons</displayName>
-				<unitPattern count="one">{0} mil·lisegon</unitPattern>
-				<unitPattern count="other">{0} mil·lisegons</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>minuts</displayName>
 				<unitPattern count="one">{0} minut</unitPattern>
 				<unitPattern count="other">{0} minuts</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>mesos</displayName>
-				<unitPattern count="one">{0} mes</unitPattern>
-				<unitPattern count="other">{0} mesos</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanosegons</displayName>
-				<unitPattern count="one">{0} nanosegon</unitPattern>
-				<unitPattern count="other">{0} nanosegons</unitPattern>
+				<perUnitPattern>{0} per minut</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>segons</displayName>
@@ -6809,15 +7117,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} segons</unitPattern>
 				<perUnitPattern>{0} per segon</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>setmanes</displayName>
-				<unitPattern count="one">{0} setmana</unitPattern>
-				<unitPattern count="other">{0} setmanes</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>mil·lisegons</displayName>
+				<unitPattern count="one">{0} mil·lisegon</unitPattern>
+				<unitPattern count="other">{0} mil·lisegons</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>anys</displayName>
-				<unitPattern count="one">{0} any</unitPattern>
-				<unitPattern count="other">{0} anys</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>microsegon</displayName>
+				<unitPattern count="one">{0} microsegon</unitPattern>
+				<unitPattern count="other">{0} microsegons</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosegons</displayName>
+				<unitPattern count="one">{0} nanosegon</unitPattern>
+				<unitPattern count="other">{0} nanosegons</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ampere</displayName>
@@ -6839,6 +7152,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} volt</unitPattern>
 				<unitPattern count="other">{0} volts</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>quilocalories</displayName>
+				<unitPattern count="one">{0} quilocaloria</unitPattern>
+				<unitPattern count="other">{0} quilocalories</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>calories</displayName>
 				<unitPattern count="one">{0} caloria</unitPattern>
@@ -6849,21 +7167,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} quilocaloria</unitPattern>
 				<unitPattern count="other">{0} quilocalories</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joules</displayName>
-				<unitPattern count="one">{0} joule</unitPattern>
-				<unitPattern count="other">{0} joules</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>quilocalories</displayName>
-				<unitPattern count="one">{0} quilocaloria</unitPattern>
-				<unitPattern count="other">{0} quilocalories</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>quilojoules</displayName>
 				<unitPattern count="one">{0} quilojoule</unitPattern>
 				<unitPattern count="other">{0} quilojoules</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joules</displayName>
+				<unitPattern count="one">{0} joule</unitPattern>
+				<unitPattern count="other">{0} joules</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>quilowatts hora</displayName>
 				<unitPattern count="one">{0} quilowatt hora</unitPattern>
@@ -6872,203 +7185,207 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="frequency-gigahertz">
 				<displayName>gigahertz</displayName>
 				<unitPattern count="one">{0} gigahertz</unitPattern>
-				<unitPattern count="other">{0} gigahertz</unitPattern>
-			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hertz</displayName>
-				<unitPattern count="one">{0} hertz</unitPattern>
-				<unitPattern count="other">{0} hertz</unitPattern>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<displayName>quilohertz</displayName>
-				<unitPattern count="one">{0} quilohertz</unitPattern>
-				<unitPattern count="other">{0} quilohertz</unitPattern>
+				<unitPattern count="other">{0} gigahertzs</unitPattern>
 			</unit>
 			<unit type="frequency-megahertz">
 				<displayName>megahertz</displayName>
 				<unitPattern count="one">{0} megahertz</unitPattern>
-				<unitPattern count="other">{0} megahertz</unitPattern>
+				<unitPattern count="other">{0} megahertzs</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>unitats astronòmiques</displayName>
-				<unitPattern count="one">{0} unitat astronòmica</unitPattern>
-				<unitPattern count="other">{0} unitats astronòmiques</unitPattern>
+			<unit type="frequency-kilohertz">
+				<displayName>quilohertz</displayName>
+				<unitPattern count="one">{0} quilohertz</unitPattern>
+				<unitPattern count="other">{0} quilohertzs</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>centímetres</displayName>
-				<unitPattern count="one">{0} centímetre</unitPattern>
-				<unitPattern count="other">{0} centímetres</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hertz</displayName>
+				<unitPattern count="one">{0} hertz</unitPattern>
+				<unitPattern count="other">{0} hertzs</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>quilòmetres</displayName>
+				<unitPattern count="one">{0} quilòmetre</unitPattern>
+				<unitPattern count="other">{0} quilòmetres</unitPattern>
+				<perUnitPattern>{0} per quilòmetre</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>metres</displayName>
+				<unitPattern count="one">{0} metre</unitPattern>
+				<unitPattern count="other">{0} metres</unitPattern>
+				<perUnitPattern>{0} per metre</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>decímetres</displayName>
 				<unitPattern count="one">{0} decímetres</unitPattern>
 				<unitPattern count="other">{0} decímetres</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>peus</displayName>
-				<unitPattern count="one">{0} peu</unitPattern>
-				<unitPattern count="other">{0} peus</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>polzades</displayName>
-				<unitPattern count="one">{0} polzada</unitPattern>
-				<unitPattern count="other">{0} polzades</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName draft="contributed">quilòmetres</displayName>
-				<unitPattern count="one">{0} quilòmetre</unitPattern>
-				<unitPattern count="other">{0} quilòmetres</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>anys llum</displayName>
-				<unitPattern count="one">{0} any llum</unitPattern>
-				<unitPattern count="other">{0} anys llum</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metres</displayName>
-				<unitPattern count="one">{0} metre</unitPattern>
-				<unitPattern count="other">{0} metres</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>micròmetres</displayName>
-				<unitPattern count="one">{0} micròmetre</unitPattern>
-				<unitPattern count="other">{0} micròmetres</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>milles</displayName>
-				<unitPattern count="one">{0} milla</unitPattern>
-				<unitPattern count="other">{0} milles</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>centímetres</displayName>
+				<unitPattern count="one">{0} centímetre</unitPattern>
+				<unitPattern count="other">{0} centímetres</unitPattern>
+				<perUnitPattern>{0} per centímetre</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mil·límetres</displayName>
 				<unitPattern count="one">{0} mil·límetre</unitPattern>
 				<unitPattern count="other">{0} mil·límetres</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>micròmetres</displayName>
+				<unitPattern count="one">{0} micròmetre</unitPattern>
+				<unitPattern count="other">{0} micròmetres</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanòmetre</displayName>
 				<unitPattern count="one">{0} nanòmetre</unitPattern>
 				<unitPattern count="other">{0} nanòmetres</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>milla nàutica</displayName>
-				<unitPattern count="one">{0} milla nàutica</unitPattern>
-				<unitPattern count="other">{0} milles nàutiques</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsecs</displayName>
-				<unitPattern count="one">{0} parsec</unitPattern>
-				<unitPattern count="other">{0} parsecs</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>picòmetres</displayName>
 				<unitPattern count="one">{0} picòmetre</unitPattern>
 				<unitPattern count="other">{0} picòmetres</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>milles</displayName>
+				<unitPattern count="one">{0} milla</unitPattern>
+				<unitPattern count="other">{0} milles</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>iardes</displayName>
 				<unitPattern count="one">{0} iarda</unitPattern>
 				<unitPattern count="other">{0} iardes</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>peus</displayName>
+				<unitPattern count="one">{0} peu</unitPattern>
+				<unitPattern count="other">{0} peus</unitPattern>
+				<perUnitPattern>{0} per peu</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>polzades</displayName>
+				<unitPattern count="one">{0} polzada</unitPattern>
+				<unitPattern count="other">{0} polzades</unitPattern>
+				<perUnitPattern>{0} per polzada</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsecs</displayName>
+				<unitPattern count="one">{0} parsec</unitPattern>
+				<unitPattern count="other">{0} parsecs</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>anys llum</displayName>
+				<unitPattern count="one">{0} any llum</unitPattern>
+				<unitPattern count="other">{0} anys llum</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>unitats astronòmiques</displayName>
+				<unitPattern count="one">{0} unitat astronòmica</unitPattern>
+				<unitPattern count="other">{0} unitats astronòmiques</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>milla nàutica</displayName>
+				<unitPattern count="one">{0} milla nàutica</unitPattern>
+				<unitPattern count="other">{0} milles nàutiques</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>milla escandinava</displayName>
+				<unitPattern count="one">{0} milla escandinava</unitPattern>
+				<unitPattern count="other">{0} milles escandinaves</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>quirat</displayName>
-				<unitPattern count="one">{0} quirat</unitPattern>
-				<unitPattern count="other">{0} quirats</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gram</displayName>
-				<unitPattern count="one">{0} gram</unitPattern>
-				<unitPattern count="other">{0} grams</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>quilogram</displayName>
-				<unitPattern count="one">{0} quilogram</unitPattern>
-				<unitPattern count="other">{0} quilograms</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>tones mètriques</displayName>
 				<unitPattern count="one">{0} tona mètrica</unitPattern>
 				<unitPattern count="other">{0} tones mètriques</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>micrograms</displayName>
-				<unitPattern count="one">{0} microgram</unitPattern>
-				<unitPattern count="other">{0} micrograms</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>quilogram</displayName>
+				<unitPattern count="one">{0} quilogram</unitPattern>
+				<unitPattern count="other">{0} quilograms</unitPattern>
+				<perUnitPattern>{0} per quilogram</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="one">{0} gram</unitPattern>
+				<unitPattern count="other">{0} grams</unitPattern>
+				<perUnitPattern draft="contributed">{0} per gram</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mil·ligram</displayName>
 				<unitPattern count="one">{0} mil·ligram</unitPattern>
 				<unitPattern count="other">{0} mil·ligrams</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>unça</displayName>
-				<unitPattern count="one">{0} unça</unitPattern>
-				<unitPattern count="other">{0} unces</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>unça troy</displayName>
-				<unitPattern count="one">{0} unça troy</unitPattern>
-				<unitPattern count="other">{0} unces troy</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>lliura</displayName>
-				<unitPattern count="one">{0} lliura</unitPattern>
-				<unitPattern count="other">{0} lliures</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>micrograms</displayName>
+				<unitPattern count="one">{0} microgram</unitPattern>
+				<unitPattern count="other">{0} micrograms</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tones</displayName>
 				<unitPattern count="one">{0} tona</unitPattern>
 				<unitPattern count="other">{0} tones</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>lliura</displayName>
+				<unitPattern count="one">{0} lliura</unitPattern>
+				<unitPattern count="other">{0} lliures</unitPattern>
+				<perUnitPattern>{0} per lliura</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>unça</displayName>
+				<unitPattern count="one">{0} unça</unitPattern>
+				<unitPattern count="other">{0} unces</unitPattern>
+				<perUnitPattern>{0} per unça</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>unça troy</displayName>
+				<unitPattern count="one">{0} unça troy</unitPattern>
+				<unitPattern count="other">{0} unces troy</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>quirat</displayName>
+				<unitPattern count="one">{0} quirat</unitPattern>
+				<unitPattern count="other">{0} quirats</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigawatts</displayName>
 				<unitPattern count="one">{0} gigawatt</unitPattern>
 				<unitPattern count="other">{0} gigawatts</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>cavalls de vapor</displayName>
-				<unitPattern count="one">{0} cavall de vapor</unitPattern>
-				<unitPattern count="other">{0} cavalls de vapor</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>quilowatts</displayName>
-				<unitPattern count="one">{0} quilowatt</unitPattern>
-				<unitPattern count="other">{0} quilowatts</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>megawatts</displayName>
 				<unitPattern count="one">{0} megawatt</unitPattern>
 				<unitPattern count="other">{0} megawatts</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>miliwatts</displayName>
-				<unitPattern count="one">{0} miliwatt</unitPattern>
-				<unitPattern count="other">{0} miliwatts</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>quilowatts</displayName>
+				<unitPattern count="one">{0} quilowatt</unitPattern>
+				<unitPattern count="other">{0} quilowatts</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watts</displayName>
 				<unitPattern count="one">{0} watt</unitPattern>
 				<unitPattern count="other">{0} watts</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>miliwatts</displayName>
+				<unitPattern count="one">{0} miliwatt</unitPattern>
+				<unitPattern count="other">{0} miliwatts</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>cavalls de vapor</displayName>
+				<unitPattern count="one">{0} cavall de vapor</unitPattern>
+				<unitPattern count="other">{0} cavalls de vapor</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hectopascals</displayName>
 				<unitPattern count="one">{0} hectopascal</unitPattern>
 				<unitPattern count="other">{0} hectopascals</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>polzades de mercuri</displayName>
-				<unitPattern count="one">{0} polzada de mercuri</unitPattern>
-				<unitPattern count="other">{0} polzades de mercuri</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mil·libars</displayName>
-				<unitPattern count="one">{0} mil·libar</unitPattern>
-				<unitPattern count="other">{0} mil·libars</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mil·límetres de mercuri</displayName>
 				<unitPattern count="one">mil·límetre de mercuri</unitPattern>
@@ -7079,10 +7396,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} lliura per polzada quadrada</unitPattern>
 				<unitPattern count="other">{0} lliures per polzada quadrada</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>quirats</displayName>
-				<unitPattern count="one">{0} quirat</unitPattern>
-				<unitPattern count="other">{0} quirats</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>polzades de mercuri</displayName>
+				<unitPattern count="one">{0} polzada de mercuri</unitPattern>
+				<unitPattern count="other">{0} polzades de mercuri</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mil·libars</displayName>
+				<unitPattern count="one">{0} mil·libar</unitPattern>
+				<unitPattern count="other">{0} mil·libars</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>quilòmetres per hora</displayName>
@@ -7099,6 +7421,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} milla per hora</unitPattern>
 				<unitPattern count="other">{0} milles per hora</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>nus</displayName>
+				<unitPattern count="one">{0} nus</unitPattern>
+				<unitPattern count="other">{0} nusos</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>graus Celsius</displayName>
 				<unitPattern count="one">{0} grau Celsius</unitPattern>
@@ -7114,31 +7446,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Kelvin</unitPattern>
 				<unitPattern count="other">{0} Kelvin</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>acre-peu</displayName>
-				<unitPattern count="one">{0} acre-peu</unitPattern>
-				<unitPattern count="other">{0} acres-peus</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>centilitres</displayName>
-				<unitPattern count="one">{0} centilitre</unitPattern>
-				<unitPattern count="other">{0} centilitres</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>centímetres cúbics</displayName>
-				<unitPattern count="one">{0} centímetre cúbic</unitPattern>
-				<unitPattern count="other">{0} centímetres cúbics</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>peus cúbics</displayName>
-				<unitPattern count="one">{0} peu cúbic</unitPattern>
-				<unitPattern count="other">{0} peus cúbics</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>polzades cúbiques</displayName>
-				<unitPattern count="one">{0} polzada cúbica</unitPattern>
-				<unitPattern count="other">{0} polzades cúbiques</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>quilòmetres cúbics</displayName>
 				<unitPattern count="one">{0} quilòmetre cúbic</unitPattern>
@@ -7148,6 +7455,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>metres cúbics</displayName>
 				<unitPattern count="one">{0} metre cúbic</unitPattern>
 				<unitPattern count="other">{0} metres cúbics</unitPattern>
+				<perUnitPattern>{0} per metre cúbic</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>centímetres cúbics</displayName>
+				<unitPattern count="one">{0} centímetre cúbic</unitPattern>
+				<unitPattern count="other">{0} centímetres cúbics</unitPattern>
+				<perUnitPattern>{0} per centímetre cúbic</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>milles cúbiques</displayName>
@@ -7159,25 +7473,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} iarda cúbica</unitPattern>
 				<unitPattern count="other">{0} iardes cúbiques</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>tasses</displayName>
-				<unitPattern count="one">{0} tassa</unitPattern>
-				<unitPattern count="other">{0} tasses</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>peus cúbics</displayName>
+				<unitPattern count="one">{0} peu cúbic</unitPattern>
+				<unitPattern count="other">{0} peus cúbics</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>decilitres</displayName>
-				<unitPattern count="one">{0} decilitre</unitPattern>
-				<unitPattern count="other">{0} decilitres</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>polzades cúbiques</displayName>
+				<unitPattern count="one">{0} polzada cúbica</unitPattern>
+				<unitPattern count="other">{0} polzades cúbiques</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>unça líquida</displayName>
-				<unitPattern count="one">{0} unça líquida</unitPattern>
-				<unitPattern count="other">{0} unces líquides</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>galons</displayName>
-				<unitPattern count="one">{0} galó</unitPattern>
-				<unitPattern count="other">{0} galons</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megalitres</displayName>
+				<unitPattern count="one">{0} megalitre</unitPattern>
+				<unitPattern count="other">{0} megalitres</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hectolitres</displayName>
@@ -7188,27 +7497,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>litres</displayName>
 				<unitPattern count="one">{0} litre</unitPattern>
 				<unitPattern count="other">{0} litres</unitPattern>
+				<perUnitPattern draft="contributed">{0} per litre</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalitres</displayName>
-				<unitPattern count="one">{0} megalitre</unitPattern>
-				<unitPattern count="other">{0} megalitres</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>decilitres</displayName>
+				<unitPattern count="one">{0} decilitre</unitPattern>
+				<unitPattern count="other">{0} decilitres</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centilitres</displayName>
+				<unitPattern count="one">{0} centilitre</unitPattern>
+				<unitPattern count="other">{0} centilitres</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mil·lilitres</displayName>
 				<unitPattern count="one">{0} mil·lilitre</unitPattern>
 				<unitPattern count="other">{0} mil·lilitres</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pintes</displayName>
-				<unitPattern count="one">{0} pinta</unitPattern>
-				<unitPattern count="other">{0} pintes</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>pintes mètriques</displayName>
+				<unitPattern count="one">{0} pinta mètrica</unitPattern>
+				<unitPattern count="other">{0} pintes mètriques</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>tasses mètriques</displayName>
+				<unitPattern count="one">{0} tassa mètrica</unitPattern>
+				<unitPattern count="other">{0} tasses mètriques</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acre-peu</displayName>
+				<unitPattern count="one">{0} acre-peu</unitPattern>
+				<unitPattern count="other">{0} acres-peus</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galons</displayName>
+				<unitPattern count="one">{0} galó</unitPattern>
+				<unitPattern count="other">{0} galons</unitPattern>
+				<perUnitPattern>{0} per galó</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>quarts</displayName>
 				<unitPattern count="one">{0} quart</unitPattern>
 				<unitPattern count="other">{0} quarts</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pintes</displayName>
+				<unitPattern count="one">{0} pinta</unitPattern>
+				<unitPattern count="other">{0} pintes</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>tasses</displayName>
+				<unitPattern count="one">{0} tassa</unitPattern>
+				<unitPattern count="other">{0} tasses</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>unça líquida</displayName>
+				<unitPattern count="one">{0} unça líquida</unitPattern>
+				<unitPattern count="other">{0} unces líquides</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>cullerades</displayName>
 				<unitPattern count="one">{0} cullerada</unitPattern>
@@ -7219,6 +7565,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} culleradeta</unitPattern>
 				<unitPattern count="other">{0} culleradetes</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0}O</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -7234,6 +7586,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>r</displayName>
+				<unitPattern count="one">{0} r</unitPattern>
+				<unitPattern count="other">{0} r</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radiant</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>º</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>´</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
@@ -7244,30 +7611,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} s</unitPattern>
 				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>º</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radiant</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>acres</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hectàrees</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acres</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ft²</displayName>
@@ -7278,122 +7657,118 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>in²</displayName>
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>ct</displayName>
+				<unitPattern count="one">{0} ct</unitPattern>
+				<unitPattern count="other">{0} ct</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
 				<unitPattern count="other">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mi/gal</displayName>
 				<unitPattern count="one">{0} mi/gal</unitPattern>
 				<unitPattern count="other">{0} mi/gal</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bits</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>B</displayName>
-				<unitPattern count="one">{0} B</unitPattern>
-				<unitPattern count="other">{0} B</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mbit</displayName>
-				<unitPattern count="one">{0} Mbit</unitPattern>
-				<unitPattern count="other">{0} Mbit</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
-			<unit type="duration-day">
-				<displayName>dies</displayName>
-				<unitPattern count="one">{0} dia</unitPattern>
-				<unitPattern count="other">{0} dies</unitPattern>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
 			</unit>
-			<unit type="duration-hour">
-				<displayName>h</displayName>
-				<unitPattern count="one">{0} h</unitPattern>
-				<unitPattern count="other">{0} h</unitPattern>
-				<perUnitPattern>{0}/h</perUnitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>mil·lisegons</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>min</displayName>
-				<unitPattern count="one">{0} min</unitPattern>
-				<unitPattern count="other">{0} min</unitPattern>
+			<unit type="digital-megabit">
+				<displayName>Mbit</displayName>
+				<unitPattern count="one">{0} Mbit</unitPattern>
+				<unitPattern count="other">{0} Mbit</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>B</displayName>
+				<unitPattern count="one">{0} B</unitPattern>
+				<unitPattern count="other">{0} B</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bits</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>segles</displayName>
+				<unitPattern count="one">{0} segle</unitPattern>
+				<unitPattern count="other">{0} segles</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>anys</displayName>
+				<unitPattern count="one">{0} any</unitPattern>
+				<unitPattern count="other">{0} anys</unitPattern>
+				<perUnitPattern>{0}/a</perUnitPattern>
 			</unit>
 			<unit type="duration-month">
 				<displayName>mesos</displayName>
 				<unitPattern count="one">{0} mes</unitPattern>
 				<unitPattern count="other">{0} mesos</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+			<unit type="duration-week">
+				<displayName>setm.</displayName>
+				<unitPattern count="one">{0} setm.</unitPattern>
+				<unitPattern count="other">{0} setm.</unitPattern>
+				<perUnitPattern>{0}/setm.</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>dies</displayName>
+				<unitPattern count="one">{0} dia</unitPattern>
+				<unitPattern count="other">{0} dies</unitPattern>
+				<perUnitPattern>{0}/d</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>hores</displayName>
+				<unitPattern count="one">{0} h</unitPattern>
+				<unitPattern count="other">{0} h</unitPattern>
+				<perUnitPattern>{0}/h</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>min</displayName>
+				<unitPattern count="one">{0} min</unitPattern>
+				<unitPattern count="other">{0} min</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>s</displayName>
@@ -7401,15 +7776,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} s</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>setm.</displayName>
-				<unitPattern count="one">{0} setm.</unitPattern>
-				<unitPattern count="other">{0} setm.</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>mil·lisegons</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>anys</displayName>
-				<unitPattern count="one">{0} any</unitPattern>
-				<unitPattern count="other">{0} anys</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>A</displayName>
@@ -7431,6 +7811,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -7441,21 +7826,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kcal</unitPattern>
 				<unitPattern count="other">{0} kcal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>J</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -7466,201 +7846,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>ua</displayName>
-				<unitPattern count="one">{0} ua</unitPattern>
-				<unitPattern count="other">{0} ua</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>metres</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ft</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>polz.</displayName>
-				<unitPattern count="one">{0} polz.</unitPattern>
-				<unitPattern count="other">{0} polz.</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>anys llum</displayName>
-				<unitPattern count="one">{0} any ll.</unitPattern>
-				<unitPattern count="other">{0} anys ll.</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metres</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>milles</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mil·límetres</displayName>
 				<unitPattern count="one">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsecs</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>milles</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>iardes</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>peus</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>polzades</displayName>
+				<unitPattern count="one">{0} polz.</unitPattern>
+				<unitPattern count="other">{0} polz.</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsecs</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>anys llum</displayName>
+				<unitPattern count="one">{0} any ll.</unitPattern>
+				<unitPattern count="other">{0} anys ll.</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ua</displayName>
+				<unitPattern count="one">{0} ua</unitPattern>
+				<unitPattern count="other">{0} ua</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>quirat</displayName>
-				<unitPattern count="one">{0} ct</unitPattern>
-				<unitPattern count="other">{0} ct</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gram</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t mètriques</displayName>
 				<unitPattern count="one">{0} t mètrica</unitPattern>
 				<unitPattern count="other">{0} t mètr.</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern draft="contributed">{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ozt</displayName>
-				<unitPattern count="one">{0} ozt</unitPattern>
-				<unitPattern count="other">{0} ozt</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ozt</displayName>
+				<unitPattern count="one">{0} ozt</unitPattern>
+				<unitPattern count="other">{0} ozt</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>quirat</displayName>
+				<unitPattern count="one">{0} ct</unitPattern>
+				<unitPattern count="other">{0} ct</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>CV</displayName>
-				<unitPattern count="one">{0} CV</unitPattern>
-				<unitPattern count="other">{0} CV</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>W</displayName>
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>CV</displayName>
+				<unitPattern count="one">{0} CV</unitPattern>
+				<unitPattern count="other">{0} CV</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -7671,10 +8055,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>ct</displayName>
-				<unitPattern count="one">{0} ct</unitPattern>
-				<unitPattern count="other">{0} ct</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -7691,6 +8080,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0} °C</unitPattern>
@@ -7706,31 +8105,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -7740,6 +8114,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -7751,25 +8132,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>tassa</displayName>
-				<unitPattern count="one">{0} tassa</unitPattern>
-				<unitPattern count="other">{0} tasses</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -7780,27 +8156,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>l</displayName>
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="one">{0} Ml</unitPattern>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
 				<unitPattern count="one">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>ptm</displayName>
+				<unitPattern count="one">{0} ptm</unitPattern>
+				<unitPattern count="other">{0} ptm</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>tassa</displayName>
+				<unitPattern count="one">{0} tassa</unitPattern>
+				<unitPattern count="other">{0} tasses</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>cull.</displayName>
 				<unitPattern count="one">{0} cull.</unitPattern>
@@ -7811,6 +8224,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} cdta.</unitPattern>
 				<unitPattern count="other">{0} cdta.</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0}O</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -7820,6 +8239,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}G</unitPattern>
 				<unitPattern count="other">{0}G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -7828,42 +8251,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0}ac.</unitPattern>
-				<unitPattern count="other">{0}ac.</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0}km²</unitPattern>
+				<unitPattern count="other">{0}km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0}ha</unitPattern>
 				<unitPattern count="other">{0}ha</unitPattern>
 			</unit>
-			<unit type="area-square-centimeter">
-				<unitPattern count="one" draft="contributed">{0} cm²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cm²</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0}ft²</unitPattern>
-				<unitPattern count="other">{0}ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0}km²</unitPattern>
-				<unitPattern count="other">{0}km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0}m²</unitPattern>
 				<unitPattern count="other">{0}m²</unitPattern>
 			</unit>
+			<unit type="area-square-centimeter">
+				<unitPattern count="one" draft="contributed">{0} cm²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cm²</unitPattern>
+			</unit>
 			<unit type="area-square-mile">
 				<unitPattern count="one">{0}mi²</unitPattern>
 				<unitPattern count="other">{0}mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0}ac.</unitPattern>
+				<unitPattern count="other">{0}ac.</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0}ft²</unitPattern>
+				<unitPattern count="other">{0}ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
 			<unit type="digital-megabyte">
 				<unitPattern count="one" draft="contributed">{0} MB</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} MB</unitPattern>
 			</unit>
+			<unit type="duration-century">
+				<displayName draft="unconfirmed">s.</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} s.</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} s.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>anys</displayName>
+				<unitPattern count="one">{0} any</unitPattern>
+				<unitPattern count="other">{0} anys</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/any</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mes</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>setm.</displayName>
+				<unitPattern count="one">{0}s</unitPattern>
+				<unitPattern count="other">{0} s</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>dia</displayName>
 				<unitPattern count="one">{0} d</unitPattern>
@@ -7874,45 +8319,58 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} h</unitPattern>
 				<unitPattern count="other">{0} h</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>mes</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>s</displayName>
 				<unitPattern count="one">{0} s</unitPattern>
 				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>s</displayName>
-				<unitPattern count="one">{0}s</unitPattern>
-				<unitPattern count="other">{0} s</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>anys</displayName>
-				<unitPattern count="one">{0} any</unitPattern>
-				<unitPattern count="other">{0} anys</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
 			<unit type="frequency-hertz">
 				<unitPattern count="one" draft="contributed">{0} Hz</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} Hz</unitPattern>
 			</unit>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+			</unit>
 			<unit type="length-centimeter">
 				<displayName>cm</displayName>
 				<unitPattern count="one">{0} cm</unitPattern>
 				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
+			<unit type="length-millimeter">
+				<displayName>mm</displayName>
+				<unitPattern count="one">{0} mm</unitPattern>
+				<unitPattern count="other">{0} mm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<unitPattern count="one">{0}pm</unitPattern>
+				<unitPattern count="other">{0}pm</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one" draft="contributed">{0} mi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mi</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<unitPattern count="one" draft="contributed">{0} yd</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} yd</unitPattern>
+			</unit>
 			<unit type="length-foot">
 				<unitPattern count="one" draft="contributed">{0} ft</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ft</unitPattern>
@@ -7921,66 +8379,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} in</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} in</unitPattern>
 			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
 			<unit type="length-light-year">
 				<unitPattern count="one" draft="contributed">{0} l. y.</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} l. y.</unitPattern>
 			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one" draft="contributed">{0} mi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mi</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>mm</displayName>
-				<unitPattern count="one">{0} mm</unitPattern>
-				<unitPattern count="other">{0} mm</unitPattern>
-			</unit>
 			<unit type="length-nautical-mile">
 				<unitPattern count="one" draft="contributed">{0} nmi</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} nmi</unitPattern>
 			</unit>
-			<unit type="length-picometer">
-				<unitPattern count="one">{0}pm</unitPattern>
-				<unitPattern count="other">{0}pm</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<unitPattern count="one" draft="contributed">{0} yd</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} yd</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="one">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+			</unit>
 			<unit type="mass-microgram">
 				<unitPattern count="one" draft="contributed">{0} µg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} µg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one" draft="contributed">{0} oz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} oz</unitPattern>
-			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one" draft="contributed">{0} lb</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} lb</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0}CV</unitPattern>
-				<unitPattern count="other">{0}CV</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one" draft="contributed">{0} oz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0}kW</unitPattern>
@@ -7990,10 +8417,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}W</unitPattern>
 				<unitPattern count="other">{0}W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0}CV</unitPattern>
+				<unitPattern count="other">{0}CV</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0}hPa</unitPattern>
 				<unitPattern count="other">{0}hPa</unitPattern>
 			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<unitPattern count="one" draft="contributed">{0} mm Hg</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mm Hg</unitPattern>
+			</unit>
 			<unit type="pressure-inch-hg">
 				<unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
@@ -8002,10 +8437,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} mb</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mb</unitPattern>
 			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<unitPattern count="one" draft="contributed">{0} mm Hg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mm Hg</unitPattern>
-			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
 				<unitPattern count="one">{0} km/h</unitPattern>
@@ -8019,6 +8450,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}mi/h</unitPattern>
 				<unitPattern count="other">{0}mi/h</unitPattern>
 			</unit>
+			<unit type="temperature-generic">
+				<displayName draft="unconfirmed">°</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}°</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -8028,10 +8464,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}°F</unitPattern>
 				<unitPattern count="other">{0}°F</unitPattern>
 			</unit>
-			<unit type="volume-cubic-centimeter">
-				<unitPattern count="one" draft="contributed">{0} cm³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cm³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<unitPattern count="one">{0}km³</unitPattern>
 				<unitPattern count="other">{0}km³</unitPattern>
@@ -8040,6 +8472,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} m³</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} m³</unitPattern>
 			</unit>
+			<unit type="volume-cubic-centimeter">
+				<unitPattern count="one" draft="contributed">{0} cm³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cm³</unitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<unitPattern count="one">{0}mi³</unitPattern>
 				<unitPattern count="other">{0}mi³</unitPattern>
@@ -8049,6 +8485,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0}O</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ca_AD.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_AD.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ca_AD.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_AD.xml
index fd7c58f47a4..b35aca8a100 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ca_AD.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_AD.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ca"/>
 		<territory type="AD"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ca_ES.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_ES.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ca_ES.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_ES.xml
index 2ca16eccd7b..1df11beed9e 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ca_ES.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_ES.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ca"/>
 		<territory type="ES"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ca_ES_VALENCIA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_ES_VALENCIA.xml
similarity index 97%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ca_ES_VALENCIA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_ES_VALENCIA.xml
index 9b43a24fccc..b4d658331c0 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ca_ES_VALENCIA.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_ES_VALENCIA.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10741 $"/>
-		<generation date="$Date: 2014-08-07 13:24:47 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ca"/>
 		<territory type="ES"/>
 		<variant type="VALENCIA"/>
@@ -80,10 +79,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Thai" draft="unconfirmed">tailandés</script>
 		</scripts>
 		<types>
-			<type type="big5han" key="collation" draft="unconfirmed">ordre del xinés tradicional - Big5</type>
-			<type type="chinese" key="calendar" draft="unconfirmed">calendari xinés</type>
-			<type type="gb2312han" key="collation" draft="unconfirmed">ordre del xinés simplificat - GB2312</type>
-			<type type="japanese" key="calendar" draft="unconfirmed">calendari japonés</type>
+			<type key="calendar" type="chinese" draft="unconfirmed">calendari xinés</type>
+			<type key="calendar" type="japanese" draft="unconfirmed">calendari japonés</type>
+			<type key="collation" type="big5han" draft="unconfirmed">ordre del xinés tradicional - Big5</type>
+			<type key="collation" type="gb2312han" draft="unconfirmed">ordre del xinés simplificat - GB2312</type>
 		</types>
 	</localeDisplayNames>
 	<numbers>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ca_FR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_FR.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ca_FR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_FR.xml
index d69610c8e22..bb167f608e6 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ca_FR.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_FR.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ca"/>
 		<territory type="FR"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ca_IT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_IT.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ca_IT.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_IT.xml
index 1fa5cbb8510..72c9d13c75b 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ca_IT.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_IT.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ca"/>
 		<territory type="IT"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ce.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ce.xml
new file mode 100644
index 00000000000..466ba004e30
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ce.xml
@@ -0,0 +1,4672 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2014 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12197 $"/>
+		<language type="ce"/>
+	</identity>
+	<localeDisplayNames>
+		<localeDisplayPattern>
+			<localePattern>{0} ({1})</localePattern>
+			<localeSeparator>{0}, {1}</localeSeparator>
+			<localeKeyTypePattern>{0}: {1}</localeKeyTypePattern>
+		</localeDisplayPattern>
+		<languages>
+			<language type="ab">абхазхойн</language>
+			<language type="af">африкаанс</language>
+			<language type="agq">агхӀем</language>
+			<language type="ak">акан</language>
+			<language type="am">амхаройн</language>
+			<language type="ar">Ӏаьрбийн</language>
+			<language type="ar_001">ХӀинца болу стандартан Ӏаьрбийн</language>
+			<language type="arn">арауканхойн</language>
+			<language type="as">ассамийн</language>
+			<language type="asa">асу</language>
+			<language type="az">азербайджанийн</language>
+			<language type="az" alt="short">азербайджанийн</language>
+			<language type="ba">башкирийн</language>
+			<language type="be">белорусийн</language>
+			<language type="bem">бемба</language>
+			<language type="bez">бена</language>
+			<language type="bg">болгарийн</language>
+			<language type="bgn">малхбузен-белуджийн</language>
+			<language type="bm">бамбара</language>
+			<language type="bn">бенгалийн</language>
+			<language type="bo">тибетхойн</language>
+			<language type="br">бретонийн</language>
+			<language type="brx">бодо</language>
+			<language type="bs">боснийн</language>
+			<language type="ca">каталонийн</language>
+			<language type="ce">нохчийн</language>
+			<language type="cgg">чига</language>
+			<language type="chr">чероки</language>
+			<language type="ckb">юккъерчу курдийн</language>
+			<language type="co">корсиканийн</language>
+			<language type="cs">чехийн</language>
+			<language type="cv">чувашийн</language>
+			<language type="cy">валлийн</language>
+			<language type="da">датхойн</language>
+			<language type="dav">таита</language>
+			<language type="de">немцойн</language>
+			<language type="de_AT">австрин немцойн</language>
+			<language type="de_CH">швейцарин лакхара немцойн</language>
+			<language type="dje">зарма</language>
+			<language type="dsb">сорбийн</language>
+			<language type="dua">дуала</language>
+			<language type="dyo">дьола-фоньи</language>
+			<language type="dz">дзонг-кэ</language>
+			<language type="ebu">эмбу</language>
+			<language type="ee">эве</language>
+			<language type="el">грекийн</language>
+			<language type="en">ингалсан</language>
+			<language type="en_AU">Австралин ингалсан</language>
+			<language type="en_CA">канадан ингалсан</language>
+			<language type="en_GB">британин ингалсан</language>
+			<language type="en_GB" alt="short">ингалсан (Британи)</language>
+			<language type="en_US">американ ингалсан</language>
+			<language type="en_US" alt="short">ингалсан (АЦШ)</language>
+			<language type="eo">эсперанто</language>
+			<language type="es">испанхойн</language>
+			<language type="es_419">латинан американ испанхойн</language>
+			<language type="es_ES">европан испанхойн</language>
+			<language type="es_MX">мексикан испанхойн</language>
+			<language type="et">эстонийн</language>
+			<language type="eu">баскийн</language>
+			<language type="fa">гӀажарийн</language>
+			<language type="fi">финнийн</language>
+			<language type="fil">филиппинийн</language>
+			<language type="fj">фиджи</language>
+			<language type="fo">фарерийн</language>
+			<language type="fr">французийн</language>
+			<language type="fr_CA">канадан французийн</language>
+			<language type="fr_CH">швейцарин французийн</language>
+			<language type="fy">малхбузен-фризийн</language>
+			<language type="ga">ирландхойн</language>
+			<language type="gag">гагаузийн</language>
+			<language type="gl">галисийн</language>
+			<language type="gn">гуарани</language>
+			<language type="gsw">швейцарин немцойн</language>
+			<language type="gu">гуджарати</language>
+			<language type="guz">гусии</language>
+			<language type="gv">мэнийн</language>
+			<language type="ha">хауса</language>
+			<language type="haw">гавайн</language>
+			<language type="he">жугтийн</language>
+			<language type="hi">хинди</language>
+			<language type="hr">хорватийн</language>
+			<language type="hsb">лакхара сербийн</language>
+			<language type="ht">гаитийн</language>
+			<language type="hu">венгрийн</language>
+			<language type="hy">эрмалойн</language>
+			<language type="id">индонезихойн</language>
+			<language type="ig">игбо</language>
+			<language type="ii">сычуань</language>
+			<language type="is">исландхойн</language>
+			<language type="it">итальянийн</language>
+			<language type="iu">инуктитут</language>
+			<language type="ja">японийн</language>
+			<language type="jgo">нгомба</language>
+			<language type="jmc">мачаме</language>
+			<language type="jv">яванийн</language>
+			<language type="ka">гуьржийн</language>
+			<language type="kab">кабилийн</language>
+			<language type="kam">камба</language>
+			<language type="kde">маконде</language>
+			<language type="kea">кабувердьяну</language>
+			<language type="khq">койра чиини</language>
+			<language type="ki">кикуйю</language>
+			<language type="kk">казахийн</language>
+			<language type="kl">гренландхойн</language>
+			<language type="kln">календжин</language>
+			<language type="km">кхмерийн</language>
+			<language type="kn">каннада</language>
+			<language type="ko">корейн</language>
+			<language type="koi">коми-пермякийн</language>
+			<language type="kok">конкани</language>
+			<language type="ks">кашмири</language>
+			<language type="ksb">шамбала</language>
+			<language type="ksf">бафиа</language>
+			<language type="ku">курдийн</language>
+			<language type="kw">корнуоллийн</language>
+			<language type="ky">гӀиргӀизойн</language>
+			<language type="la">латинан</language>
+			<language type="lag">ланги</language>
+			<language type="lb">люксембургхойн</language>
+			<language type="lg">ганда</language>
+			<language type="lkt">лакота</language>
+			<language type="ln">лингала</language>
+			<language type="lo">лаоссийн</language>
+			<language type="lrc">къилбаседа лури</language>
+			<language type="lt">литвахойн</language>
+			<language type="lu">луба-катанга</language>
+			<language type="luo">луо (Кени а, Танзани а)</language>
+			<language type="luy">лухья</language>
+			<language type="lv">латышийн</language>
+			<language type="mas">масаи</language>
+			<language type="mer">меру</language>
+			<language type="mfe">маврикин креолийн</language>
+			<language type="mg">малагасийн</language>
+			<language type="mgh">макуа-меетто</language>
+			<language type="mgo">мета</language>
+			<language type="mi">маори</language>
+			<language type="mk">македонхойн</language>
+			<language type="ml">малаялам</language>
+			<language type="mn">монголийн</language>
+			<language type="moh">мохаук</language>
+			<language type="mr">маратхи</language>
+			<language type="ms">малайн</language>
+			<language type="mt">мальтойн</language>
+			<language type="mua">мунданг</language>
+			<language type="my">бирманийн</language>
+			<language type="mzn">мазандеранхойн</language>
+			<language type="naq">нама</language>
+			<language type="nb">норвегийн букмол</language>
+			<language type="nd">къилбаседа ндебели</language>
+			<language type="nds">лахара германхойн</language>
+			<language type="nds_NL">лахара саксонийн</language>
+			<language type="ne">непалхойн</language>
+			<language type="nl">голландхойн</language>
+			<language type="nl_BE">фламандийн</language>
+			<language type="nmg">квасио</language>
+			<language type="nn">норвегийн нюнорск</language>
+			<language type="nqo">нко</language>
+			<language type="nus">нуэр</language>
+			<language type="nyn">ньянколе</language>
+			<language type="om">оромо</language>
+			<language type="or">ори</language>
+			<language type="pa">панджаби</language>
+			<language type="pl">полякийн</language>
+			<language type="ps">пушту</language>
+			<language type="pt">португалихойн</language>
+			<language type="pt_BR">бразилин португалихойн</language>
+			<language type="pt_PT">европан португалихойн</language>
+			<language type="qu">кечуа</language>
+			<language type="quc">киче</language>
+			<language type="rm">романшийн</language>
+			<language type="rn">рунди</language>
+			<language type="ro">румынийн</language>
+			<language type="ro_MD">молдавийн</language>
+			<language type="rof">ромбо</language>
+			<language type="ru">оьрсийн</language>
+			<language type="rw">киньяруанда</language>
+			<language type="rwk">руанда</language>
+			<language type="sa">санскрит</language>
+			<language type="saq">самбуру</language>
+			<language type="sbp">сангу</language>
+			<language type="sd">синдхи</language>
+			<language type="se">къилбаседа саамийн</language>
+			<language type="seh">сена</language>
+			<language type="ses">койраборо сенни</language>
+			<language type="sg">санго</language>
+			<language type="shi">тахелхит</language>
+			<language type="si">сингалхойн</language>
+			<language type="sk">словакийн</language>
+			<language type="sl">словенийн</language>
+			<language type="sma">саамийн (къилба)</language>
+			<language type="smj">луле-саамийн</language>
+			<language type="smn">инари-саамийн</language>
+			<language type="sms">скольт-саамийн</language>
+			<language type="sn">шона</language>
+			<language type="so">сомали</language>
+			<language type="sq">албанойн</language>
+			<language type="sr">сербийн</language>
+			<language type="su">сунданхойн</language>
+			<language type="sv">шведийн</language>
+			<language type="sw">суахили</language>
+			<language type="sw_CD">суахили (Конго)</language>
+			<language type="ta">тамилхойн</language>
+			<language type="te">телугу</language>
+			<language type="teo">тесо</language>
+			<language type="tg">таджикийн</language>
+			<language type="th">тайн</language>
+			<language type="ti">тигринья</language>
+			<language type="tk">туркменийн</language>
+			<language type="to">тонганийн</language>
+			<language type="tr">туркойн</language>
+			<language type="tt">гӀезалойн</language>
+			<language type="twq">тасавак</language>
+			<language type="tzm">тамазигхтийн</language>
+			<language type="ug">уйгурийн</language>
+			<language type="uk">украинийн</language>
+			<language type="und">боьвзуш боцу мотт</language>
+			<language type="ur">урду</language>
+			<language type="uz">узбекийн</language>
+			<language type="vai">ваи</language>
+			<language type="vi">вьетнамхойн</language>
+			<language type="vun">вунджо</language>
+			<language type="wbp">варлпири</language>
+			<language type="wo">волоф</language>
+			<language type="xh">коса</language>
+			<language type="xog">сога</language>
+			<language type="yo">йоруба</language>
+			<language type="zgh">мороккон стандартан тамазигхтийн</language>
+			<language type="zh">китайн</language>
+			<language type="zh_Hans">атта китайн</language>
+			<language type="zh_Hant">ламастан китайн</language>
+			<language type="zu">зулу</language>
+			<language type="zxx">меттан чулацам боцуш</language>
+		</languages>
+		<scripts>
+			<script type="Arab">Ӏаьрбийн</script>
+			<script type="Armn">эрмалойн</script>
+			<script type="Beng">бенгалхойн</script>
+			<script type="Bopo">бопомофо</script>
+			<script type="Brai">брайля</script>
+			<script type="Cyrl">кириллица</script>
+			<script type="Deva">деванагари</script>
+			<script type="Ethi">эфиопин</script>
+			<script type="Geor">гуьржийн</script>
+			<script type="Grek">грекийн</script>
+			<script type="Gujr">гуджарати</script>
+			<script type="Guru">гурмукхи</script>
+			<script type="Hang">хангыль</script>
+			<script type="Hani">китайн</script>
+			<script type="Hans">атта китайн</script>
+			<script type="Hans" alt="stand-alone">атта китайн</script>
+			<script type="Hant">ламастан китайн</script>
+			<script type="Hant" alt="stand-alone">ламастан китайн</script>
+			<script type="Hebr">жугтийн</script>
+			<script type="Hira">хирагана</script>
+			<script type="Jpan">японийн</script>
+			<script type="Kana">катакана</script>
+			<script type="Khmr">кхмерийн</script>
+			<script type="Knda">каннада</script>
+			<script type="Kore">корейн</script>
+			<script type="Laoo">лаоссийн</script>
+			<script type="Latn">латинан</script>
+			<script type="Mlym">малаялийн</script>
+			<script type="Mong">монголийн</script>
+			<script type="Mymr">мьянманийн</script>
+			<script type="Orya">ори</script>
+			<script type="Sinh">сингалхойн</script>
+			<script type="Taml">тамилхойн</script>
+			<script type="Telu">телугу</script>
+			<script type="Thaa">таана</script>
+			<script type="Thai">тайн</script>
+			<script type="Tibt">тибетхойн</script>
+			<script type="Zsym">символаш</script>
+			<script type="Zxxx">йоза доцу</script>
+			<script type="Zyyy">массара а тӀеэцна</script>
+			<script type="Zzzz">доьвзуш доцу йоза</script>
+		</scripts>
+		<territories>
+			<territory type="001">Дерригдуьненан</territory>
+			<territory type="002">Африка</territory>
+			<territory type="003">Къилбаседа Америка</territory>
+			<territory type="005">Къилба Америка</territory>
+			<territory type="009">Океани</territory>
+			<territory type="011">Малхбузен Африка</territory>
+			<territory type="013">Юккъера Америка</territory>
+			<territory type="014">Малхбален Африка</territory>
+			<territory type="015">Къилбаседа Африка</territory>
+			<territory type="017">Юккъера Африка</territory>
+			<territory type="018">Къилба Африка</territory>
+			<territory type="019">Къилбаседа а, къилба а Америка</territory>
+			<territory type="021">Къилбаседа Америка – АЦШ а, Канада а</territory>
+			<territory type="029">Карибаш</territory>
+			<territory type="030">Юккъера Ази</territory>
+			<territory type="034">Къилба Ази</territory>
+			<territory type="035">Къилба-малхбален Ази</territory>
+			<territory type="039">Къилба Европа</territory>
+			<territory type="053">Австралази</territory>
+			<territory type="054">Меланези</territory>
+			<territory type="057">Микронези</territory>
+			<territory type="061">Полинези</territory>
+			<territory type="142">Ази</territory>
+			<territory type="143">Юккъера Малхбале</territory>
+			<territory type="145">Юккъера а, Гергара а Малхбале</territory>
+			<territory type="150">Европа</territory>
+			<territory type="151">Малхбален Европа</territory>
+			<territory type="154">Къилбаседа Европа</territory>
+			<territory type="155">Малхбузен Европа</territory>
+			<territory type="419">Латинан Америка</territory>
+			<territory type="AC">Айъадаларан гӀайре</territory>
+			<territory type="AD">Андорра</territory>
+			<territory type="AE">Ӏарбийн Цхьанатоьхна Эмираташ</territory>
+			<territory type="AF">ОвхӀан-пачхьалкх</territory>
+			<territory type="AG">Антигуа а, Барбуда а</territory>
+			<territory type="AI">Ангилья</territory>
+			<territory type="AL">Албани</territory>
+			<territory type="AM">Эрмалойчоь</territory>
+			<territory type="AO">Ангола</territory>
+			<territory type="AQ">Антарктида</territory>
+			<territory type="AR">Аргентина</territory>
+			<territory type="AS">Американ Самоа</territory>
+			<territory type="AT">Австри</territory>
+			<territory type="AU">Австрали</territory>
+			<territory type="AW">Аруба</territory>
+			<territory type="AX">Аландан гӀайренаш</territory>
+			<territory type="AZ">Азербайджан</territory>
+			<territory type="BA">Босни а, Герцеговина а</territory>
+			<territory type="BB">Барбадос</territory>
+			<territory type="BD">Бангладеш</territory>
+			<territory type="BE">Бельги</territory>
+			<territory type="BF">Буркина- Фасо</territory>
+			<territory type="BG">Болгари</territory>
+			<territory type="BH">Бахрейн</territory>
+			<territory type="BI">Бурунди</territory>
+			<territory type="BJ">Бенин</territory>
+			<territory type="BL">Сен-Бартельми</territory>
+			<territory type="BM">Бермудан гӀайренаш</territory>
+			<territory type="BN">Бруней-Даруссалам</territory>
+			<territory type="BO">Боливи</territory>
+			<territory type="BQ">Бонэйр, Синт-Эстатиус а, Саба а</territory>
+			<territory type="BR">Бразили</territory>
+			<territory type="BS">Багаман гӀайренаш</territory>
+			<territory type="BT">Бутан</territory>
+			<territory type="BV">Бувен гӀайре</territory>
+			<territory type="BW">Ботсвана</territory>
+			<territory type="BY">Белорусси</territory>
+			<territory type="BZ">Белиз</territory>
+			<territory type="CA">Канада</territory>
+			<territory type="CC">Кокосийн гӀайренаш</territory>
+			<territory type="CD">Демократин Республика Конго</territory>
+			<territory type="CD" alt="variant">Конго (ДРК)</territory>
+			<territory type="CF">Юккъерчу Африкин Республика</territory>
+			<territory type="CG">Республика Конго</territory>
+			<territory type="CH">Швейцари</territory>
+			<territory type="CI">Кот-Д’ивуар</territory>
+			<territory type="CK">Кукан гӀайренаш</territory>
+			<territory type="CL">Чили</territory>
+			<territory type="CM">Камерун</territory>
+			<territory type="CN">Китай</territory>
+			<territory type="CO">Колумби</territory>
+			<territory type="CP">Клиппертон</territory>
+			<territory type="CR">Коста-Рика</territory>
+			<territory type="CU">Куба</territory>
+			<territory type="CV">Кабо-Верде</territory>
+			<territory type="CW">Кюрасао</territory>
+			<territory type="CX">ГӀайре ӏиса пайхӏамар вина де</territory>
+			<territory type="CY">Кипр</territory>
+			<territory type="CZ">Чехи</territory>
+			<territory type="DE">Германи</territory>
+			<territory type="DG">Диего-Гарси</territory>
+			<territory type="DJ">Джибути</territory>
+			<territory type="DK">Дани</territory>
+			<territory type="DM">Доминика</territory>
+			<territory type="DO">Доминикан Республика</territory>
+			<territory type="DZ">Алжир</territory>
+			<territory type="EA">Сеута а, Мелилья а</territory>
+			<territory type="EC">Эквадор</territory>
+			<territory type="EE">Эстони</territory>
+			<territory type="EG">Мисар</territory>
+			<territory type="EH">Малхбузен Саьхьара</territory>
+			<territory type="ER">Эритрей</territory>
+			<territory type="ES">Испани</territory>
+			<territory type="ET">Эфиопи</territory>
+			<territory type="EU">Евробарт</territory>
+			<territory type="FI">Финлянди</territory>
+			<territory type="FJ">Фиджи</territory>
+			<territory type="FK">Фолклендан гӀайренаш</territory>
+			<territory type="FK" alt="variant">Фолклендан гӀайренаш (Мальвинаш)</territory>
+			<territory type="FM">Микронезин Федеративни штаташ</territory>
+			<territory type="FO">Фарерийн гӀайренаш</territory>
+			<territory type="FR">Франци</territory>
+			<territory type="GA">Габон</territory>
+			<territory type="GB">Йоккха Британи</territory>
+			<territory type="GB" alt="short">Йоккха Британи</territory>
+			<territory type="GD">Гренада</territory>
+			<territory type="GE">Гуьржийчоь</territory>
+			<territory type="GF">Французийн Гвиана</territory>
+			<territory type="GG">Гернси</territory>
+			<territory type="GH">Гана</territory>
+			<territory type="GI">Гибралтар</territory>
+			<territory type="GL">Гренланди</territory>
+			<territory type="GM">Гамби</territory>
+			<territory type="GN">Гвиней</territory>
+			<territory type="GP">Гваделупа</territory>
+			<territory type="GQ">Экваторан Гвиней</territory>
+			<territory type="GR">Греци</territory>
+			<territory type="GS">Къилба Джорджи а, Къилба Гавайн гӀайренаш а</territory>
+			<territory type="GT">Гватемала</territory>
+			<territory type="GU">Гуам</territory>
+			<territory type="GW">Гвиней-Бисау</territory>
+			<territory type="GY">Гайана</territory>
+			<territory type="HK">Гонконг (ша-къаьстина кӀошт)</territory>
+			<territory type="HK" alt="short">Гонконг</territory>
+			<territory type="HM">Херд гӀайре а, Макдональд гӀайренаш а</territory>
+			<territory type="HN">Гондурас</territory>
+			<territory type="HR">Хорвати</territory>
+			<territory type="HT">Гаити</territory>
+			<territory type="HU">Венгри</territory>
+			<territory type="IC">Канаран гӀайренаш</territory>
+			<territory type="ID">Индонези</territory>
+			<territory type="IE">Ирланди</territory>
+			<territory type="IL">Израиль</territory>
+			<territory type="IM">Мэн гӀайре</territory>
+			<territory type="IN">Инди</territory>
+			<territory type="IO">Британин латта Индин океанехь</territory>
+			<territory type="IQ">Ӏиракъ</territory>
+			<territory type="IR">ГӀажарийчоь</territory>
+			<territory type="IS">Исланди</territory>
+			<territory type="IT">Итали</territory>
+			<territory type="JE">Джерси</territory>
+			<territory type="JM">Ямайка</territory>
+			<territory type="JO">Урдан</territory>
+			<territory type="JP">Япони</territory>
+			<territory type="KE">Кени</territory>
+			<territory type="KG">Киргизи</territory>
+			<territory type="KH">Камбоджа</territory>
+			<territory type="KI">Кирибати</territory>
+			<territory type="KM">Комораш</territory>
+			<territory type="KN">Сент-Китс а, Невис а</territory>
+			<territory type="KP">Къилбаседа Корей</territory>
+			<territory type="KR">Къилба Корей</territory>
+			<territory type="KW">Кувейт</territory>
+			<territory type="KY">Кайман гӀайренаш</territory>
+			<territory type="KZ">Казахстан</territory>
+			<territory type="LA">Лаос</territory>
+			<territory type="LB">Ливан</territory>
+			<territory type="LC">Сент-Люси</territory>
+			<territory type="LI">Лихтенштейн</territory>
+			<territory type="LK">Шри-Ланка</territory>
+			<territory type="LR">Либери</territory>
+			<territory type="LS">Лесото</territory>
+			<territory type="LT">Литва</territory>
+			<territory type="LU">Люксембург</territory>
+			<territory type="LV">Латви</territory>
+			<territory type="LY">Ливи</territory>
+			<territory type="MA">Марокко</territory>
+			<territory type="MC">Монако</territory>
+			<territory type="MD">Молдави</territory>
+			<territory type="ME">Ӏаьржаламанхойчоь</territory>
+			<territory type="MF">Сен-Мартен</territory>
+			<territory type="MG">Мадагаскар</territory>
+			<territory type="MH">Маршаллан гӀайренаш</territory>
+			<territory type="MK">Македони</territory>
+			<territory type="ML">Мали</territory>
+			<territory type="MM">Мьянма (Бирма)</territory>
+			<territory type="MN">Монголи</territory>
+			<territory type="MO">Макао (ша-къаьстина кӀошт)</territory>
+			<territory type="MO" alt="short">Макао</territory>
+			<territory type="MP">Къилбаседа Марианан гӀайренаш</territory>
+			<territory type="MQ">Мартиника</territory>
+			<territory type="MR">Мавритани</territory>
+			<territory type="MS">Монтсеррат</territory>
+			<territory type="MT">Мальта</territory>
+			<territory type="MU">Маврики</territory>
+			<territory type="MV">Мальдиваш</territory>
+			<territory type="MW">Малави</territory>
+			<territory type="MX">Мексика</territory>
+			<territory type="MY">Малайзи</territory>
+			<territory type="MZ">Мозамбик</territory>
+			<territory type="NA">Намиби</territory>
+			<territory type="NC">Керла Каледони</territory>
+			<territory type="NE">Нигер</territory>
+			<territory type="NF">Норфолк гӀайре</territory>
+			<territory type="NG">Нигери</territory>
+			<territory type="NI">Никарагуа</territory>
+			<territory type="NL">Нидерландаш</territory>
+			<territory type="NO">Норвеги</territory>
+			<territory type="NP">Непал</territory>
+			<territory type="NR">Науру</territory>
+			<territory type="NU">Ниуэ</territory>
+			<territory type="NZ">Керла Зеланди</territory>
+			<territory type="OM">Оман</territory>
+			<territory type="PA">Панама</territory>
+			<territory type="PE">Перу</territory>
+			<territory type="PF">Французийн Полинези</territory>
+			<territory type="PG">Папуа — Керла Гвиней</territory>
+			<territory type="PH">Филиппинаш</territory>
+			<territory type="PK">Пакистан</territory>
+			<territory type="PL">Польша</territory>
+			<territory type="PM">Сен-Пьер а, Микелон а</territory>
+			<territory type="PN">Питкэрн гӀайренаш</territory>
+			<territory type="PR">Пуэрто-Рико</territory>
+			<territory type="PS">Палестинан латтанаш</territory>
+			<territory type="PS" alt="short">Палестина</territory>
+			<territory type="PT">Португали</territory>
+			<territory type="PW">Палау</territory>
+			<territory type="PY">Парагвай</territory>
+			<territory type="QA">Катар</territory>
+			<territory type="QO">Арахьара Океани</territory>
+			<territory type="RE">Реюньон</territory>
+			<territory type="RO">Румыни</territory>
+			<territory type="RS">Серби</territory>
+			<territory type="RU">Росси</territory>
+			<territory type="RW">Руанда</territory>
+			<territory type="SA">СаӀудийн Арави</territory>
+			<territory type="SB">Соломонан гӀайренаш</territory>
+			<territory type="SC">Сейшелан гӀайренаш</territory>
+			<territory type="SD">Судан</territory>
+			<territory type="SE">Швеци</territory>
+			<territory type="SG">Сингапур</territory>
+			<territory type="SH">Сийлахьчу Еленин гӀайре</territory>
+			<territory type="SI">Словени</territory>
+			<territory type="SJ">Шпицберген а, Ян-Майен а</territory>
+			<territory type="SK">Словаки</territory>
+			<territory type="SL">Сьерра- Леоне</territory>
+			<territory type="SM">Сан-Марино</territory>
+			<territory type="SN">Сенегал</territory>
+			<territory type="SO">Сомали</territory>
+			<territory type="SR">Суринам</territory>
+			<territory type="SS">Къилба Судан</territory>
+			<territory type="ST">Сан-Томе а, Принсипи а</territory>
+			<territory type="SV">Сальвадор</territory>
+			<territory type="SX">Синт-Мартен</territory>
+			<territory type="SY">Шема</territory>
+			<territory type="SZ">Свазиленд</territory>
+			<territory type="TA">Тристан-да- Кунья</territory>
+			<territory type="TC">Тёркс а, Кайкос а гӀайренаш</territory>
+			<territory type="TD">Чад</territory>
+			<territory type="TF">Французийн къилба латтанаш</territory>
+			<territory type="TG">Того</territory>
+			<territory type="TH">Таиланд</territory>
+			<territory type="TJ">Таджикистан</territory>
+			<territory type="TK">Токелау</territory>
+			<territory type="TL">Малхбален Тимор</territory>
+			<territory type="TM">Туркмени</territory>
+			<territory type="TN">Тунис</territory>
+			<territory type="TO">Тонга</territory>
+			<territory type="TR">Туркойчоь</territory>
+			<territory type="TT">Тринидад а, Тобаго а</territory>
+			<territory type="TV">Тувалу</territory>
+			<territory type="TW">Тайвань</territory>
+			<territory type="TZ">Танзани</territory>
+			<territory type="UA">Украина</territory>
+			<territory type="UG">Уганда</territory>
+			<territory type="UM">АЦШн арахьара кегийн гӀайренаш</territory>
+			<territory type="US">Цхьанатоьхна Штаташ</territory>
+			<territory type="US" alt="short">АЦШ</territory>
+			<territory type="UY">Уругвай</territory>
+			<territory type="UZ">Узбекистан</territory>
+			<territory type="VA">Ватикан</territory>
+			<territory type="VC">Сент-Винсент а, Гренадинаш а</territory>
+			<territory type="VE">Венесуэла</territory>
+			<territory type="VG">Виргинийн гӀайренаш (Британи)</territory>
+			<territory type="VI">Виргинийн гӀайренаш (АЦШ)</territory>
+			<territory type="VN">Вьетнам</territory>
+			<territory type="VU">Вануату</territory>
+			<territory type="WF">Уоллис а, Футуна а</territory>
+			<territory type="WS">Самоа</territory>
+			<territory type="XK">Косово</territory>
+			<territory type="YE">Йемен</territory>
+			<territory type="YT">Майотта</territory>
+			<territory type="ZA">Къилба-Африкин Республика</territory>
+			<territory type="ZM">Замби</territory>
+			<territory type="ZW">Зимбабве</territory>
+			<territory type="ZZ">Йоьвзуш йоцу регион</territory>
+		</territories>
+		<keys>
+			<key type="calendar">Календарь</key>
+			<key type="currency">ахча</key>
+		</keys>
+		<types>
+			<type key="calendar" type="gregorian">григорианан</type>
+			<type key="calendar" type="islamic">исламан</type>
+			<type key="calendar" type="japanese">японийн</type>
+			<type key="calendar" type="persian">гӀажарийн</type>
+		</types>
+		<measurementSystemNames>
+			<measurementSystemName type="metric">Метрикин</measurementSystemName>
+			<measurementSystemName type="UK">Ингалсан</measurementSystemName>
+			<measurementSystemName type="US">Инг-американ</measurementSystemName>
+		</measurementSystemNames>
+		<codePatterns>
+			<codePattern type="language">Мотт: {0}</codePattern>
+			<codePattern type="script">Скрипт: {0}</codePattern>
+			<codePattern type="territory">Регион: {0}</codePattern>
+		</codePatterns>
+	</localeDisplayNames>
+	<layout>
+		<orientation>
+			<characterOrder>left-to-right</characterOrder>
+			<lineOrder>top-to-bottom</lineOrder>
+		</orientation>
+	</layout>
+	<characters>
+		<exemplarCharacters>[а {аь} б в г {гӏ} д е ё ж з и {ий} й к {кк} {ккх} {кх} {кь} {кӏ} л м н о {ов} {оь} п {пп} {пӏ} р {рхӏ} с {сс} т {тт} {тӏ} у {ув} {уь} {уьй} ф х {хь} {хӏ} ц {цӏ} ч {чӏ} ш щ ъ ы ь э ю {юь} я {яь}]</exemplarCharacters>
+		<exemplarCharacters type="index">[А Б В Г Д Е Ё Ж З И К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐ – — , ; \: ! ? . … ' ‘ ‚ &quot; “ „ « » ( ) \[ \] \{ \} § @ * / \&amp; #]</exemplarCharacters>
+	</characters>
+	<dates>
+		<calendars>
+			<calendar type="generic">
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="d">d</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">янв</month>
+							<month type="2">фев</month>
+							<month type="3">мар</month>
+							<month type="4">апр</month>
+							<month type="5">май</month>
+							<month type="6">июн</month>
+							<month type="7">июл</month>
+							<month type="8">авг</month>
+							<month type="9">сен</month>
+							<month type="10">окт</month>
+							<month type="11">ноя</month>
+							<month type="12">дек</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">январь</month>
+							<month type="2">февраль</month>
+							<month type="3">март</month>
+							<month type="4">апрель</month>
+							<month type="5">май</month>
+							<month type="6">июнь</month>
+							<month type="7">июль</month>
+							<month type="8">август</month>
+							<month type="9">сентябрь</month>
+							<month type="10">октябрь</month>
+							<month type="11">ноябрь</month>
+							<month type="12">декабрь</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="wide">
+							<month type="1">январь</month>
+							<month type="2">февраль</month>
+							<month type="3">март</month>
+							<month type="4">апрель</month>
+							<month type="5">май</month>
+							<month type="6">июнь</month>
+							<month type="7">июль</month>
+							<month type="8">август</month>
+							<month type="9">сентябрь</month>
+							<month type="10">октябрь</month>
+							<month type="11">ноябрь</month>
+							<month type="12">декабрь</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="wide">
+							<day type="sun">кӀиранан де</day>
+							<day type="mon">оршотан де</day>
+							<day type="tue">шинарин де</day>
+							<day type="wed">кхаарин де</day>
+							<day type="thu">еарин де</day>
+							<day type="fri">пӀераскан де</day>
+							<day type="sat">шот де</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<quarters>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="wide">
+							<quarter type="1">1-гӀа квартал</quarter>
+							<quarter type="2">2-гӀа квартал</quarter>
+							<quarter type="3">3-гӀа квартал</quarter>
+							<quarter type="4">4-гӀа квартал</quarter>
+						</quarterWidth>
+					</quarterContext>
+				</quarters>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="era">
+				<displayName>мур</displayName>
+			</field>
+			<field type="year">
+				<displayName>шо</displayName>
+				<relative type="-1">даханчу шарахь</relative>
+				<relative type="0">карарчу шарахь</relative>
+				<relative type="1">рогӀерчу шарахь</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} шо даьлча</relativeTimePattern>
+					<relativeTimePattern count="other">{0} шо даьлча</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} шо хьалха</relativeTimePattern>
+					<relativeTimePattern count="other">{0} шо хьалха</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-short">
+				<displayName>ш.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} ш. даьлча</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ш. даьлча</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} ш. хьалха</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ш. хьалха</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-narrow">
+				<displayName>ш.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} ш. даьлча</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ш. даьлча</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} ш. хьалха</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ш. хьалха</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter">
+				<displayName>Квартал</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} квартал яьлча</relativeTimePattern>
+					<relativeTimePattern count="other">{0} квартал яьлча</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} квартал хьалха</relativeTimePattern>
+					<relativeTimePattern count="other">{0} квартал хьалха</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-short">
+				<displayName>кв.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} кв. яьлча</relativeTimePattern>
+					<relativeTimePattern count="other">{0} кв. яьлча</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} кв. хьалха</relativeTimePattern>
+					<relativeTimePattern count="other">{0} кв. хьалха</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-narrow">
+				<displayName>кв.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} кв. яьлча</relativeTimePattern>
+					<relativeTimePattern count="other">{0} кв. яьлча</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} кв. хьалха</relativeTimePattern>
+					<relativeTimePattern count="other">{0} кв. хьалха</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month">
+				<displayName>бутт</displayName>
+				<relative type="-1">баханчу баттахь</relative>
+				<relative type="0">карарчу баттахь</relative>
+				<relative type="1">рогӀерчу баттахь</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} бутт баьлча</relativeTimePattern>
+					<relativeTimePattern count="other">{0} бутт баьлча</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} бутт хьалха</relativeTimePattern>
+					<relativeTimePattern count="other">{0} бутт хьалха</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-short">
+				<displayName>бут.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} б. баьлча</relativeTimePattern>
+					<relativeTimePattern count="other">{0} б. баьлча</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} б. хьалха</relativeTimePattern>
+					<relativeTimePattern count="other">{0} б. хьалха</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-narrow">
+				<displayName>бут.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} б. баьлча</relativeTimePattern>
+					<relativeTimePattern count="other">{0} б. баьлча</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} б. хьалха</relativeTimePattern>
+					<relativeTimePattern count="other">{0} б. хьалха</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week">
+				<displayName>кӀира</displayName>
+				<relative type="-1">даханчу кӀирнахь</relative>
+				<relative type="0">карарчу кӀирнахь</relative>
+				<relative type="1">рогӀерчу кӀирнахь</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} кӀира даьлча</relativeTimePattern>
+					<relativeTimePattern count="other">{0} кӀира даьлча</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} кӀира хьалха</relativeTimePattern>
+					<relativeTimePattern count="other">{0} кӀира хьалха</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-short">
+				<displayName>кӀир.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} кӀир. даьлча</relativeTimePattern>
+					<relativeTimePattern count="other">{0} кӀир. даьлча</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} кӀир. хьалха</relativeTimePattern>
+					<relativeTimePattern count="other">{0} кӀир. хьалха</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-narrow">
+				<displayName>кӀир.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} кӀир. даьлча</relativeTimePattern>
+					<relativeTimePattern count="other">{0} кӀир. даьлча</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} кӀир. хьалха</relativeTimePattern>
+					<relativeTimePattern count="other">{0} кӀир. хьалха</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day">
+				<displayName>де</displayName>
+				<relative type="-1">селхана</relative>
+				<relative type="0">тахана</relative>
+				<relative type="1">кхана</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} де даьлча</relativeTimePattern>
+					<relativeTimePattern count="other">{0} де даьлча</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} де хьалха</relativeTimePattern>
+					<relativeTimePattern count="other">{0} де хьалха</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-short">
+				<displayName>де</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} д. даьлча</relativeTimePattern>
+					<relativeTimePattern count="other">{0} д. даьлча</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} д. хьалха</relativeTimePattern>
+					<relativeTimePattern count="other">{0} де хьалха</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-narrow">
+				<displayName>де</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} д. даьлча</relativeTimePattern>
+					<relativeTimePattern count="other">{0} д. даьлча</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">де хьалха</relativeTimePattern>
+					<relativeTimePattern count="other">{0} де хьалха</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="weekday">
+				<displayName>кӀиран де</displayName>
+			</field>
+			<field type="sun">
+				<relative type="-1">даханчу кӀиранан дийнахь</relative>
+				<relative type="0">карарчу кӀиранан дийнахь</relative>
+				<relative type="1">рогӀерчу кӀиранан дийнахь</relative>
+			</field>
+			<field type="sun-short">
+				<relative type="-1">даханчу кӀиранан д.</relative>
+				<relative type="0">карарчу кӀиранан д.</relative>
+				<relative type="1">рогӀерчу кӀиранан д.</relative>
+			</field>
+			<field type="sun-narrow">
+				<relative type="-1">даханчу кӀиранан д.</relative>
+				<relative type="0">карарчу кӀиранан д.</relative>
+				<relative type="1">рогӀерчу кӀиранан д</relative>
+			</field>
+			<field type="mon">
+				<relative type="-1">даханчу оршотан дийнахь</relative>
+				<relative type="0">карарчу оршотан дийнахь</relative>
+				<relative type="1">рогӀерчу оршотан дийнахь</relative>
+			</field>
+			<field type="mon-short">
+				<relative type="-1">даханчу оршотан д.</relative>
+				<relative type="0">карара оршотан д.</relative>
+				<relative type="1">рогӀерчу оршотан д.</relative>
+			</field>
+			<field type="mon-narrow">
+				<relative type="-1">даханчу оршотан д.</relative>
+				<relative type="0">карара оршотан д.</relative>
+				<relative type="1">рогӀерчу оршотан д.</relative>
+			</field>
+			<field type="tue">
+				<relative type="-1">даханчу шинарин дийнахь</relative>
+				<relative type="0">карарчу шинарин дийнахь</relative>
+				<relative type="1">рогӀерчу шинарин дийнахь</relative>
+			</field>
+			<field type="tue-short">
+				<relative type="-1">даханчу шинарин д.</relative>
+				<relative type="0">карарчу шинарин д.</relative>
+				<relative type="1">рогӀерчу шинарин д.</relative>
+			</field>
+			<field type="tue-narrow">
+				<relative type="-1">даханчу шинарин д.</relative>
+				<relative type="0">карарчу шинарин д.</relative>
+				<relative type="1">рогӀерчу шинарин д.</relative>
+			</field>
+			<field type="wed">
+				<relative type="-1">даханчу кхаарин дийнахь</relative>
+				<relative type="0">карарчу кхаарин дийнахь</relative>
+				<relative type="1">рогӀерчу кхаарин дийнахь</relative>
+			</field>
+			<field type="wed-short">
+				<relative type="-1">даханчу кхаарин д.</relative>
+				<relative type="0">карарчу кхаарин д.</relative>
+				<relative type="1">рогӀерчу кхаарин д.</relative>
+			</field>
+			<field type="wed-narrow">
+				<relative type="-1">даханчу кхаарин д.</relative>
+				<relative type="0">карарчу кхаарин д.</relative>
+				<relative type="1">рогӀерчу кхаарин д.</relative>
+			</field>
+			<field type="thu">
+				<relative type="-1">даханчу еарин дийнахь</relative>
+				<relative type="0">карарчу еарин дийнахь</relative>
+				<relative type="1">рогӀерчу еарин дийнахь</relative>
+			</field>
+			<field type="thu-short">
+				<relative type="-1">даханчу еарин д.</relative>
+				<relative type="0">карарчу еарин д.</relative>
+				<relative type="1">рогӀерчу еарин д.</relative>
+			</field>
+			<field type="thu-narrow">
+				<relative type="-1">даханчу еарин д.</relative>
+				<relative type="0">карарчу еарин д.</relative>
+				<relative type="1">рогӀерчу еарин д.</relative>
+			</field>
+			<field type="fri">
+				<relative type="-1">даханчу пӀераскан дийнахь</relative>
+				<relative type="0">карарчу пӀераскан дийнахь</relative>
+				<relative type="1">рогӀерчу пӀераскан дийнахь</relative>
+			</field>
+			<field type="fri-short">
+				<relative type="-1">даханчу пӀераскан д.</relative>
+				<relative type="0">карарчу пӀераскан д.</relative>
+				<relative type="1">рогӀерчу пӀераскан д.</relative>
+			</field>
+			<field type="fri-narrow">
+				<relative type="-1">даханчу пӀераскан д.</relative>
+				<relative type="0">карарчу пӀераскан д.</relative>
+				<relative type="1">рогӀерчу пӀераскан д.</relative>
+			</field>
+			<field type="sat">
+				<relative type="-1">даханчу шотдийнахь</relative>
+				<relative type="0">карарчу шотдийнахь</relative>
+				<relative type="1">рогӀерчу шотдийнахь</relative>
+			</field>
+			<field type="sat-short">
+				<relative type="-1">даханчу шотд.</relative>
+				<relative type="0">карарчу даханчу шотд.</relative>
+				<relative type="1">рогӀерчу даханчу шотд.</relative>
+			</field>
+			<field type="sat-narrow">
+				<relative type="-1">даханчу шотд.</relative>
+				<relative type="0">карарчу даханчу шотд.</relative>
+				<relative type="1">рогӀерчу даханчу шотд.</relative>
+			</field>
+			<field type="dayperiod">
+				<displayName>делкъал тӀехьа</displayName>
+			</field>
+			<field type="hour">
+				<displayName>сахьт</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} сахьт даьлча</relativeTimePattern>
+					<relativeTimePattern count="other">{0} сахьт даьлча</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} сахьт хьалха</relativeTimePattern>
+					<relativeTimePattern count="other">{0} сахьт хьалха</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-short">
+				<displayName>сахь.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} сахь. даьлча</relativeTimePattern>
+					<relativeTimePattern count="other">{0} сахь. даьлча</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} сахь. хьалха</relativeTimePattern>
+					<relativeTimePattern count="other">{0} сахь. хьалха</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-narrow">
+				<displayName>сахь.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} сахь. даьлча</relativeTimePattern>
+					<relativeTimePattern count="other">{0} сахь. даьлча</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} сахь. хьалха</relativeTimePattern>
+					<relativeTimePattern count="other">{0} сахь. хьалха</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute">
+				<displayName>минот</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} минот яьлча</relativeTimePattern>
+					<relativeTimePattern count="other">{0} минот яьлча</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} минот хьалха</relativeTimePattern>
+					<relativeTimePattern count="other">{0} минот хьалха</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-short">
+				<displayName>мин.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} мин. яьлча</relativeTimePattern>
+					<relativeTimePattern count="other">{0} мин. яьлча</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} мин. хьалха</relativeTimePattern>
+					<relativeTimePattern count="other">{0} мин. хьалха</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-narrow">
+				<displayName>мин.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} мин. яьлча</relativeTimePattern>
+					<relativeTimePattern count="other">{0} мин. яьлча</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} мин. хьалха</relativeTimePattern>
+					<relativeTimePattern count="other">{0} мин. хьалха</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second">
+				<displayName>секунд</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} секунд яьлча</relativeTimePattern>
+					<relativeTimePattern count="other">{0} секунд яьлча</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} секунд хьалха</relativeTimePattern>
+					<relativeTimePattern count="other">{0} секунд хьалха</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-short">
+				<displayName>сек.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} сек. яьлча</relativeTimePattern>
+					<relativeTimePattern count="other">{0} сек. яьлча</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} сек. хьалха</relativeTimePattern>
+					<relativeTimePattern count="other">{0} сек. хьалха</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-narrow">
+				<displayName>сек.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} сек. яьлча</relativeTimePattern>
+					<relativeTimePattern count="other">{0} сек. яьлча</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} сек. хьалха</relativeTimePattern>
+					<relativeTimePattern count="other">{0} сек. хьалха</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="zone">
+				<displayName>сахьтан аса</displayName>
+			</field>
+		</fields>
+		<timeZoneNames>
+			<hourFormat>+HH:mm;-HH:mm</hourFormat>
+			<gmtFormat>GMT{0}</gmtFormat>
+			<gmtZeroFormat>GMT</gmtZeroFormat>
+			<regionFormat>{0}</regionFormat>
+			<regionFormat type="daylight">{0} (+1)</regionFormat>
+			<regionFormat type="standard">{0} (+0)</regionFormat>
+			<fallbackFormat>{1} ({0})</fallbackFormat>
+			<zone type="Etc/Unknown">
+				<exemplarCity>Йоьвзуш йоцу гӀала</exemplarCity>
+			</zone>
+			<zone type="Europe/Andorra">
+				<exemplarCity>Андорра</exemplarCity>
+			</zone>
+			<zone type="Asia/Dubai">
+				<exemplarCity>Дубай</exemplarCity>
+			</zone>
+			<zone type="Asia/Kabul">
+				<exemplarCity>Кабул</exemplarCity>
+			</zone>
+			<zone type="America/Antigua">
+				<exemplarCity>Антигуа</exemplarCity>
+			</zone>
+			<zone type="America/Anguilla">
+				<exemplarCity>Ангилья</exemplarCity>
+			</zone>
+			<zone type="Europe/Tirane">
+				<exemplarCity>Тирана</exemplarCity>
+			</zone>
+			<zone type="Asia/Yerevan">
+				<exemplarCity>Ереван</exemplarCity>
+			</zone>
+			<zone type="Africa/Luanda">
+				<exemplarCity>Луанда</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Rothera">
+				<exemplarCity>Ротера</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Palmer">
+				<exemplarCity>Палмер</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Troll">
+				<exemplarCity>Тролль</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Syowa">
+				<exemplarCity>Сёва</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Mawson">
+				<exemplarCity>Моусон</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Davis">
+				<exemplarCity>Дейвис</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Vostok">
+				<exemplarCity>Восток</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Casey">
+				<exemplarCity>Кейси</exemplarCity>
+			</zone>
+			<zone type="Antarctica/DumontDUrville">
+				<exemplarCity>Дюмон-д’Юрвиль</exemplarCity>
+			</zone>
+			<zone type="Antarctica/McMurdo">
+				<exemplarCity>Мак-Мердо</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Rio_Gallegos">
+				<exemplarCity>Рио-Гальегос</exemplarCity>
+			</zone>
+			<zone type="America/Mendoza">
+				<exemplarCity>Мендоса</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/San_Juan">
+				<exemplarCity>Сан-Хуан</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Ushuaia">
+				<exemplarCity>Ушуая</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/La_Rioja">
+				<exemplarCity>Ла-Риоха</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/San_Luis">
+				<exemplarCity>Сан-Луис</exemplarCity>
+			</zone>
+			<zone type="America/Catamarca">
+				<exemplarCity>Катамарка</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Salta">
+				<exemplarCity>Сальта</exemplarCity>
+			</zone>
+			<zone type="America/Jujuy">
+				<exemplarCity>Жужуй</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Tucuman">
+				<exemplarCity>Тукуман</exemplarCity>
+			</zone>
+			<zone type="America/Cordoba">
+				<exemplarCity>Кордова</exemplarCity>
+			</zone>
+			<zone type="America/Buenos_Aires">
+				<exemplarCity>Буэнос-Айрес</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pago_Pago">
+				<exemplarCity>Паго-Паго</exemplarCity>
+			</zone>
+			<zone type="Europe/Vienna">
+				<exemplarCity>Вена</exemplarCity>
+			</zone>
+			<zone type="Australia/Perth">
+				<exemplarCity>Перт</exemplarCity>
+			</zone>
+			<zone type="Australia/Eucla">
+				<exemplarCity>Юкла</exemplarCity>
+			</zone>
+			<zone type="Australia/Darwin">
+				<exemplarCity>Дарвин</exemplarCity>
+			</zone>
+			<zone type="Australia/Adelaide">
+				<exemplarCity>Аделаида</exemplarCity>
+			</zone>
+			<zone type="Australia/Broken_Hill">
+				<exemplarCity>Брокен-Хилл</exemplarCity>
+			</zone>
+			<zone type="Australia/Currie">
+				<exemplarCity>Керри</exemplarCity>
+			</zone>
+			<zone type="Australia/Melbourne">
+				<exemplarCity>Мельбурн</exemplarCity>
+			</zone>
+			<zone type="Australia/Hobart">
+				<exemplarCity>Хобарт</exemplarCity>
+			</zone>
+			<zone type="Australia/Lindeman">
+				<exemplarCity>Линдеман</exemplarCity>
+			</zone>
+			<zone type="Australia/Sydney">
+				<exemplarCity>Сидней</exemplarCity>
+			</zone>
+			<zone type="Australia/Brisbane">
+				<exemplarCity>Брисбен</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Macquarie">
+				<exemplarCity>Маккуори</exemplarCity>
+			</zone>
+			<zone type="Australia/Lord_Howe">
+				<exemplarCity>Лорд-Хау, гӀ-е</exemplarCity>
+			</zone>
+			<zone type="America/Aruba">
+				<exemplarCity>Аруба</exemplarCity>
+			</zone>
+			<zone type="Europe/Mariehamn">
+				<exemplarCity>Мариехамн</exemplarCity>
+			</zone>
+			<zone type="Asia/Baku">
+				<exemplarCity>Бакох</exemplarCity>
+			</zone>
+			<zone type="Europe/Sarajevo">
+				<exemplarCity>Сараево</exemplarCity>
+			</zone>
+			<zone type="America/Barbados">
+				<exemplarCity>Барбадос</exemplarCity>
+			</zone>
+			<zone type="Asia/Dhaka">
+				<exemplarCity>Дакка</exemplarCity>
+			</zone>
+			<zone type="Europe/Brussels">
+				<exemplarCity>Брюссель</exemplarCity>
+			</zone>
+			<zone type="Africa/Ouagadougou">
+				<exemplarCity>Уагадугу</exemplarCity>
+			</zone>
+			<zone type="Europe/Sofia">
+				<exemplarCity>Софи</exemplarCity>
+			</zone>
+			<zone type="Asia/Bahrain">
+				<exemplarCity>Бахрейн</exemplarCity>
+			</zone>
+			<zone type="Africa/Bujumbura">
+				<exemplarCity>Бужумбура</exemplarCity>
+			</zone>
+			<zone type="Africa/Porto-Novo">
+				<exemplarCity>Порто-Ново</exemplarCity>
+			</zone>
+			<zone type="America/St_Barthelemy">
+				<exemplarCity>Сен-Бартельми</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Bermuda">
+				<exemplarCity>Бермудаш</exemplarCity>
+			</zone>
+			<zone type="Asia/Brunei">
+				<exemplarCity>Бруней</exemplarCity>
+			</zone>
+			<zone type="America/La_Paz">
+				<exemplarCity>Ла-Пас</exemplarCity>
+			</zone>
+			<zone type="America/Kralendijk">
+				<exemplarCity>Кралендейк</exemplarCity>
+			</zone>
+			<zone type="America/Eirunepe">
+				<exemplarCity>Эйрунепе</exemplarCity>
+			</zone>
+			<zone type="America/Rio_Branco">
+				<exemplarCity>Риу-Бранку</exemplarCity>
+			</zone>
+			<zone type="America/Porto_Velho">
+				<exemplarCity>Порту-Велью</exemplarCity>
+			</zone>
+			<zone type="America/Boa_Vista">
+				<exemplarCity>Боа-Виста</exemplarCity>
+			</zone>
+			<zone type="America/Manaus">
+				<exemplarCity>Манаус</exemplarCity>
+			</zone>
+			<zone type="America/Cuiaba">
+				<exemplarCity>Куяба</exemplarCity>
+			</zone>
+			<zone type="America/Santarem">
+				<exemplarCity>Сантарен</exemplarCity>
+			</zone>
+			<zone type="America/Campo_Grande">
+				<exemplarCity>Кампу-Гранди</exemplarCity>
+			</zone>
+			<zone type="America/Belem">
+				<exemplarCity>Белен</exemplarCity>
+			</zone>
+			<zone type="America/Araguaina">
+				<exemplarCity>Арагуаина</exemplarCity>
+			</zone>
+			<zone type="America/Sao_Paulo">
+				<exemplarCity>Сан-Паулу</exemplarCity>
+			</zone>
+			<zone type="America/Bahia">
+				<exemplarCity>Баи</exemplarCity>
+			</zone>
+			<zone type="America/Fortaleza">
+				<exemplarCity>Форталеза</exemplarCity>
+			</zone>
+			<zone type="America/Maceio">
+				<exemplarCity>Масейо</exemplarCity>
+			</zone>
+			<zone type="America/Recife">
+				<exemplarCity>Ресифи</exemplarCity>
+			</zone>
+			<zone type="America/Noronha">
+				<exemplarCity>Норонха</exemplarCity>
+			</zone>
+			<zone type="America/Nassau">
+				<exemplarCity>Нассау</exemplarCity>
+			</zone>
+			<zone type="Asia/Thimphu">
+				<exemplarCity>Тимпу</exemplarCity>
+			</zone>
+			<zone type="Africa/Gaborone">
+				<exemplarCity>Габороне</exemplarCity>
+			</zone>
+			<zone type="Europe/Minsk">
+				<exemplarCity>Минск</exemplarCity>
+			</zone>
+			<zone type="America/Belize">
+				<exemplarCity>Белиз</exemplarCity>
+			</zone>
+			<zone type="America/Dawson">
+				<exemplarCity>Доусон</exemplarCity>
+			</zone>
+			<zone type="America/Whitehorse">
+				<exemplarCity>Уайтхорс</exemplarCity>
+			</zone>
+			<zone type="America/Inuvik">
+				<exemplarCity>Инувик</exemplarCity>
+			</zone>
+			<zone type="America/Vancouver">
+				<exemplarCity>Ванкувер</exemplarCity>
+			</zone>
+			<zone type="America/Dawson_Creek">
+				<exemplarCity>Доусон-Крик</exemplarCity>
+			</zone>
+			<zone type="America/Creston">
+				<exemplarCity>Крестон</exemplarCity>
+			</zone>
+			<zone type="America/Yellowknife">
+				<exemplarCity>Йеллоунайф</exemplarCity>
+			</zone>
+			<zone type="America/Edmonton">
+				<exemplarCity>Эдмонтон</exemplarCity>
+			</zone>
+			<zone type="America/Swift_Current">
+				<exemplarCity>Свифт-Карент</exemplarCity>
+			</zone>
+			<zone type="America/Cambridge_Bay">
+				<exemplarCity>Кеймбридж-Бей</exemplarCity>
+			</zone>
+			<zone type="America/Regina">
+				<exemplarCity>Реджайна</exemplarCity>
+			</zone>
+			<zone type="America/Winnipeg">
+				<exemplarCity>Виннипег</exemplarCity>
+			</zone>
+			<zone type="America/Resolute">
+				<exemplarCity>Резолют</exemplarCity>
+			</zone>
+			<zone type="America/Rainy_River">
+				<exemplarCity>Рейни-Ривер</exemplarCity>
+			</zone>
+			<zone type="America/Rankin_Inlet">
+				<exemplarCity>Ранкин-Инлет</exemplarCity>
+			</zone>
+			<zone type="America/Coral_Harbour">
+				<exemplarCity>Корал-Харбор</exemplarCity>
+			</zone>
+			<zone type="America/Thunder_Bay">
+				<exemplarCity>Тандер-Бей</exemplarCity>
+			</zone>
+			<zone type="America/Nipigon">
+				<exemplarCity>Нипигон</exemplarCity>
+			</zone>
+			<zone type="America/Toronto">
+				<exemplarCity>Торонто</exemplarCity>
+			</zone>
+			<zone type="America/Iqaluit">
+				<exemplarCity>Икалуит</exemplarCity>
+			</zone>
+			<zone type="America/Pangnirtung">
+				<exemplarCity>Пангниртанг</exemplarCity>
+			</zone>
+			<zone type="America/Moncton">
+				<exemplarCity>Монктон</exemplarCity>
+			</zone>
+			<zone type="America/Halifax">
+				<exemplarCity>Галифакс</exemplarCity>
+			</zone>
+			<zone type="America/Goose_Bay">
+				<exemplarCity>Гус-Бей</exemplarCity>
+			</zone>
+			<zone type="America/Glace_Bay">
+				<exemplarCity>Глейс-Бей</exemplarCity>
+			</zone>
+			<zone type="America/Blanc-Sablon">
+				<exemplarCity>Бланк-Саблон</exemplarCity>
+			</zone>
+			<zone type="America/St_Johns">
+				<exemplarCity>Сент-Джонс</exemplarCity>
+			</zone>
+			<zone type="Indian/Cocos">
+				<exemplarCity>Кокосийн, гӀ-наш</exemplarCity>
+			</zone>
+			<zone type="Africa/Kinshasa">
+				<exemplarCity>Киншаса</exemplarCity>
+			</zone>
+			<zone type="Africa/Lubumbashi">
+				<exemplarCity>Лубумбаши</exemplarCity>
+			</zone>
+			<zone type="Africa/Bangui">
+				<exemplarCity>Банги</exemplarCity>
+			</zone>
+			<zone type="Africa/Brazzaville">
+				<exemplarCity>Браззавиль</exemplarCity>
+			</zone>
+			<zone type="Europe/Zurich">
+				<exemplarCity>Цюрих</exemplarCity>
+			</zone>
+			<zone type="Africa/Abidjan">
+				<exemplarCity>Абиджан</exemplarCity>
+			</zone>
+			<zone type="Pacific/Rarotonga">
+				<exemplarCity>Раротонга</exemplarCity>
+			</zone>
+			<zone type="Pacific/Easter">
+				<exemplarCity>Мархин гӀайренаш</exemplarCity>
+			</zone>
+			<zone type="America/Santiago">
+				<exemplarCity>Сантьяго</exemplarCity>
+			</zone>
+			<zone type="Africa/Douala">
+				<exemplarCity>Дуала</exemplarCity>
+			</zone>
+			<zone type="Asia/Urumqi">
+				<exemplarCity>Урумчи</exemplarCity>
+			</zone>
+			<zone type="Asia/Shanghai">
+				<exemplarCity>Шанхай</exemplarCity>
+			</zone>
+			<zone type="America/Bogota">
+				<exemplarCity>Богота</exemplarCity>
+			</zone>
+			<zone type="America/Costa_Rica">
+				<exemplarCity>Коста-Рика</exemplarCity>
+			</zone>
+			<zone type="America/Havana">
+				<exemplarCity>Гавана</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Cape_Verde">
+				<exemplarCity>Кабо-Верде</exemplarCity>
+			</zone>
+			<zone type="America/Curacao">
+				<exemplarCity>Кюрасао</exemplarCity>
+			</zone>
+			<zone type="Indian/Christmas">
+				<exemplarCity>Ӏийса пайхамар винчу ден гӀайре</exemplarCity>
+			</zone>
+			<zone type="Asia/Nicosia">
+				<exemplarCity>Никоси</exemplarCity>
+			</zone>
+			<zone type="Europe/Prague">
+				<exemplarCity>Прага</exemplarCity>
+			</zone>
+			<zone type="Europe/Busingen">
+				<exemplarCity>Бюзинген-ам-Хохрайн</exemplarCity>
+			</zone>
+			<zone type="Europe/Berlin">
+				<exemplarCity>Берлин</exemplarCity>
+			</zone>
+			<zone type="Africa/Djibouti">
+				<exemplarCity>Джибути</exemplarCity>
+			</zone>
+			<zone type="Europe/Copenhagen">
+				<exemplarCity>Копенгаген</exemplarCity>
+			</zone>
+			<zone type="America/Dominica">
+				<exemplarCity>Доминика</exemplarCity>
+			</zone>
+			<zone type="America/Santo_Domingo">
+				<exemplarCity>Санто-Доминго</exemplarCity>
+			</zone>
+			<zone type="Africa/Algiers">
+				<exemplarCity>Алжир</exemplarCity>
+			</zone>
+			<zone type="Pacific/Galapagos">
+				<exemplarCity>Галапагосан гӀайренаш</exemplarCity>
+			</zone>
+			<zone type="America/Guayaquil">
+				<exemplarCity>Гуаякиль</exemplarCity>
+			</zone>
+			<zone type="Europe/Tallinn">
+				<exemplarCity>Таллин</exemplarCity>
+			</zone>
+			<zone type="Africa/Cairo">
+				<exemplarCity>КъахӀира</exemplarCity>
+			</zone>
+			<zone type="Africa/El_Aaiun">
+				<exemplarCity>Эль-Аюн</exemplarCity>
+			</zone>
+			<zone type="Africa/Asmera">
+				<exemplarCity>Асмера</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Canary">
+				<exemplarCity>Канаран гӀайренаш</exemplarCity>
+			</zone>
+			<zone type="Africa/Ceuta">
+				<exemplarCity>Сеута</exemplarCity>
+			</zone>
+			<zone type="Europe/Madrid">
+				<exemplarCity>Мадрид</exemplarCity>
+			</zone>
+			<zone type="Africa/Addis_Ababa">
+				<exemplarCity>Аддис-Абеба</exemplarCity>
+			</zone>
+			<zone type="Europe/Helsinki">
+				<exemplarCity>Хельсинки</exemplarCity>
+			</zone>
+			<zone type="Pacific/Fiji">
+				<exemplarCity>Фиджи</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Stanley">
+				<exemplarCity>Стэнли</exemplarCity>
+			</zone>
+			<zone type="Pacific/Truk">
+				<exemplarCity>Трук, гӀ-наш</exemplarCity>
+			</zone>
+			<zone type="Pacific/Ponape">
+				<exemplarCity>Понапе, гӀ-наш</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kosrae">
+				<exemplarCity>Косрае</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Faeroe">
+				<exemplarCity>Фарерийн гӀайренаш</exemplarCity>
+			</zone>
+			<zone type="Europe/Paris">
+				<exemplarCity>Париж</exemplarCity>
+			</zone>
+			<zone type="Africa/Libreville">
+				<exemplarCity>Либревиль</exemplarCity>
+			</zone>
+			<zone type="Europe/London">
+				<long>
+					<daylight>Британин, аьхкенан хан</daylight>
+				</long>
+				<exemplarCity>Лондон</exemplarCity>
+			</zone>
+			<zone type="America/Grenada">
+				<exemplarCity>Гренада</exemplarCity>
+			</zone>
+			<zone type="Asia/Tbilisi">
+				<exemplarCity>Тбилиси</exemplarCity>
+			</zone>
+			<zone type="America/Cayenne">
+				<exemplarCity>Кайенна</exemplarCity>
+			</zone>
+			<zone type="Europe/Guernsey">
+				<exemplarCity>Гернси</exemplarCity>
+			</zone>
+			<zone type="Africa/Accra">
+				<exemplarCity>Аккра</exemplarCity>
+			</zone>
+			<zone type="Europe/Gibraltar">
+				<exemplarCity>Гибралтар</exemplarCity>
+			</zone>
+			<zone type="America/Thule">
+				<exemplarCity>Туле</exemplarCity>
+			</zone>
+			<zone type="America/Godthab">
+				<exemplarCity>Готхоб</exemplarCity>
+			</zone>
+			<zone type="America/Scoresbysund">
+				<exemplarCity>Скорсбисунн</exemplarCity>
+			</zone>
+			<zone type="America/Danmarkshavn">
+				<exemplarCity>Денмарксхавн</exemplarCity>
+			</zone>
+			<zone type="Africa/Banjul">
+				<exemplarCity>Банжул</exemplarCity>
+			</zone>
+			<zone type="Africa/Conakry">
+				<exemplarCity>Конакри</exemplarCity>
+			</zone>
+			<zone type="America/Guadeloupe">
+				<exemplarCity>Гваделупа</exemplarCity>
+			</zone>
+			<zone type="Africa/Malabo">
+				<exemplarCity>Малабо</exemplarCity>
+			</zone>
+			<zone type="Europe/Athens">
+				<exemplarCity>Афина</exemplarCity>
+			</zone>
+			<zone type="Atlantic/South_Georgia">
+				<exemplarCity>Къилба Джорджи</exemplarCity>
+			</zone>
+			<zone type="America/Guatemala">
+				<exemplarCity>Гватемала</exemplarCity>
+			</zone>
+			<zone type="Pacific/Guam">
+				<exemplarCity>Гуам</exemplarCity>
+			</zone>
+			<zone type="Africa/Bissau">
+				<exemplarCity>Бисау</exemplarCity>
+			</zone>
+			<zone type="America/Guyana">
+				<exemplarCity>Гайана</exemplarCity>
+			</zone>
+			<zone type="Asia/Hong_Kong">
+				<exemplarCity>Гонконг</exemplarCity>
+			</zone>
+			<zone type="America/Tegucigalpa">
+				<exemplarCity>Тегусигальпа</exemplarCity>
+			</zone>
+			<zone type="Europe/Zagreb">
+				<exemplarCity>Загреб</exemplarCity>
+			</zone>
+			<zone type="America/Port-au-Prince">
+				<exemplarCity>Порт-о-Пренс</exemplarCity>
+			</zone>
+			<zone type="Europe/Budapest">
+				<exemplarCity>Будапешт</exemplarCity>
+			</zone>
+			<zone type="Asia/Jakarta">
+				<exemplarCity>Джакарта</exemplarCity>
+			</zone>
+			<zone type="Asia/Pontianak">
+				<exemplarCity>Понтианак</exemplarCity>
+			</zone>
+			<zone type="Asia/Makassar">
+				<exemplarCity>Макасар</exemplarCity>
+			</zone>
+			<zone type="Asia/Jayapura">
+				<exemplarCity>Джайпур</exemplarCity>
+			</zone>
+			<zone type="Europe/Dublin">
+				<long>
+					<daylight>Ирланди, аьхкенан хан</daylight>
+				</long>
+				<exemplarCity>Дублин</exemplarCity>
+			</zone>
+			<zone type="Asia/Jerusalem">
+				<exemplarCity>Къудс-ГӀала</exemplarCity>
+			</zone>
+			<zone type="Europe/Isle_of_Man">
+				<exemplarCity>Мэн, гӀ-е</exemplarCity>
+			</zone>
+			<zone type="Asia/Calcutta">
+				<exemplarCity>Калькутта</exemplarCity>
+			</zone>
+			<zone type="Indian/Chagos">
+				<exemplarCity>Чагос</exemplarCity>
+			</zone>
+			<zone type="Asia/Baghdad">
+				<exemplarCity>БагӀдад</exemplarCity>
+			</zone>
+			<zone type="Asia/Tehran">
+				<exemplarCity>ТехӀран</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Reykjavik">
+				<exemplarCity>Рейкьявик</exemplarCity>
+			</zone>
+			<zone type="Europe/Rome">
+				<exemplarCity>Рим</exemplarCity>
+			</zone>
+			<zone type="Europe/Jersey">
+				<exemplarCity>Джерси</exemplarCity>
+			</zone>
+			<zone type="America/Jamaica">
+				<exemplarCity>Ямайка</exemplarCity>
+			</zone>
+			<zone type="Asia/Amman">
+				<exemplarCity>Ӏамман</exemplarCity>
+			</zone>
+			<zone type="Asia/Tokyo">
+				<exemplarCity>Токио</exemplarCity>
+			</zone>
+			<zone type="Africa/Nairobi">
+				<exemplarCity>Найроби</exemplarCity>
+			</zone>
+			<zone type="Asia/Bishkek">
+				<exemplarCity>Бишкек</exemplarCity>
+			</zone>
+			<zone type="Asia/Phnom_Penh">
+				<exemplarCity>Пномпень</exemplarCity>
+			</zone>
+			<zone type="Pacific/Enderbury">
+				<exemplarCity>Эндерберин, гӀ-е</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kiritimati">
+				<exemplarCity>Киритимати</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tarawa">
+				<exemplarCity>Тарава</exemplarCity>
+			</zone>
+			<zone type="Indian/Comoro">
+				<exemplarCity>Коморийн гӀайренаш</exemplarCity>
+			</zone>
+			<zone type="America/St_Kitts">
+				<exemplarCity>Сент-Китс</exemplarCity>
+			</zone>
+			<zone type="Asia/Pyongyang">
+				<exemplarCity>Пхеньян</exemplarCity>
+			</zone>
+			<zone type="Asia/Seoul">
+				<exemplarCity>Сеул</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuwait">
+				<exemplarCity>Кувейт</exemplarCity>
+			</zone>
+			<zone type="America/Cayman">
+				<exemplarCity>Кайман</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtau">
+				<exemplarCity>Актау</exemplarCity>
+			</zone>
+			<zone type="Asia/Oral">
+				<exemplarCity>Орал</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtobe">
+				<exemplarCity>Актобе</exemplarCity>
+			</zone>
+			<zone type="Asia/Qyzylorda">
+				<exemplarCity>Кызылорда</exemplarCity>
+			</zone>
+			<zone type="Asia/Almaty">
+				<exemplarCity>Алма-Ата</exemplarCity>
+			</zone>
+			<zone type="Asia/Vientiane">
+				<exemplarCity>Вьентьян</exemplarCity>
+			</zone>
+			<zone type="Asia/Beirut">
+				<exemplarCity>Бейрут</exemplarCity>
+			</zone>
+			<zone type="America/St_Lucia">
+				<exemplarCity>Сент-Люси</exemplarCity>
+			</zone>
+			<zone type="Europe/Vaduz">
+				<exemplarCity>Вадуц</exemplarCity>
+			</zone>
+			<zone type="Asia/Colombo">
+				<exemplarCity>Коломбо</exemplarCity>
+			</zone>
+			<zone type="Africa/Monrovia">
+				<exemplarCity>Монрови</exemplarCity>
+			</zone>
+			<zone type="Africa/Maseru">
+				<exemplarCity>Масеру</exemplarCity>
+			</zone>
+			<zone type="Europe/Vilnius">
+				<exemplarCity>Вильнюс</exemplarCity>
+			</zone>
+			<zone type="Europe/Luxembourg">
+				<exemplarCity>Люксембург</exemplarCity>
+			</zone>
+			<zone type="Europe/Riga">
+				<exemplarCity>Рига</exemplarCity>
+			</zone>
+			<zone type="Africa/Tripoli">
+				<exemplarCity>Триполи</exemplarCity>
+			</zone>
+			<zone type="Africa/Casablanca">
+				<exemplarCity>Касабланка</exemplarCity>
+			</zone>
+			<zone type="Europe/Monaco">
+				<exemplarCity>Монако</exemplarCity>
+			</zone>
+			<zone type="Europe/Chisinau">
+				<exemplarCity>Кишинев</exemplarCity>
+			</zone>
+			<zone type="Europe/Podgorica">
+				<exemplarCity>Подгорица</exemplarCity>
+			</zone>
+			<zone type="America/Marigot">
+				<exemplarCity>Мариго</exemplarCity>
+			</zone>
+			<zone type="Indian/Antananarivo">
+				<exemplarCity>Антананариву</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kwajalein">
+				<exemplarCity>Кваджалейн</exemplarCity>
+			</zone>
+			<zone type="Pacific/Majuro">
+				<exemplarCity>Маджуро</exemplarCity>
+			</zone>
+			<zone type="Europe/Skopje">
+				<exemplarCity>Скопье</exemplarCity>
+			</zone>
+			<zone type="Africa/Bamako">
+				<exemplarCity>Бамако</exemplarCity>
+			</zone>
+			<zone type="Asia/Rangoon">
+				<exemplarCity>Рангун</exemplarCity>
+			</zone>
+			<zone type="Asia/Hovd">
+				<exemplarCity>Ховд</exemplarCity>
+			</zone>
+			<zone type="Asia/Ulaanbaatar">
+				<exemplarCity>Улан-Батор</exemplarCity>
+			</zone>
+			<zone type="Asia/Choibalsan">
+				<exemplarCity>Чойбалсан</exemplarCity>
+			</zone>
+			<zone type="Asia/Macau">
+				<exemplarCity>Макао</exemplarCity>
+			</zone>
+			<zone type="Pacific/Saipan">
+				<exemplarCity>Сайпан</exemplarCity>
+			</zone>
+			<zone type="America/Martinique">
+				<exemplarCity>Мартиника</exemplarCity>
+			</zone>
+			<zone type="Africa/Nouakchott">
+				<exemplarCity>Нуакшот</exemplarCity>
+			</zone>
+			<zone type="America/Montserrat">
+				<exemplarCity>Монсеррат</exemplarCity>
+			</zone>
+			<zone type="Europe/Malta">
+				<exemplarCity>Мальта</exemplarCity>
+			</zone>
+			<zone type="Indian/Mauritius">
+				<exemplarCity>Маврики</exemplarCity>
+			</zone>
+			<zone type="Indian/Maldives">
+				<exemplarCity>Мальдиваш</exemplarCity>
+			</zone>
+			<zone type="Africa/Blantyre">
+				<exemplarCity>Блантайр</exemplarCity>
+			</zone>
+			<zone type="America/Tijuana">
+				<exemplarCity>Тихуана</exemplarCity>
+			</zone>
+			<zone type="America/Santa_Isabel">
+				<exemplarCity>Санта-Изабел</exemplarCity>
+			</zone>
+			<zone type="America/Hermosillo">
+				<exemplarCity>Эрмосильо</exemplarCity>
+			</zone>
+			<zone type="America/Mazatlan">
+				<exemplarCity>Масатлан</exemplarCity>
+			</zone>
+			<zone type="America/Chihuahua">
+				<exemplarCity>Чиуауа</exemplarCity>
+			</zone>
+			<zone type="America/Bahia_Banderas">
+				<exemplarCity>Баия-де-Бандерас</exemplarCity>
+			</zone>
+			<zone type="America/Ojinaga">
+				<exemplarCity>Охинага</exemplarCity>
+			</zone>
+			<zone type="America/Monterrey">
+				<exemplarCity>Монтеррей</exemplarCity>
+			</zone>
+			<zone type="America/Mexico_City">
+				<exemplarCity>Мехико</exemplarCity>
+			</zone>
+			<zone type="America/Matamoros">
+				<exemplarCity>Матаморос</exemplarCity>
+			</zone>
+			<zone type="America/Merida">
+				<exemplarCity>Мерида</exemplarCity>
+			</zone>
+			<zone type="America/Cancun">
+				<exemplarCity>Канкун</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuala_Lumpur">
+				<exemplarCity>Куала-Лумпур</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuching">
+				<exemplarCity>Кучинг</exemplarCity>
+			</zone>
+			<zone type="Africa/Maputo">
+				<exemplarCity>Мапуту</exemplarCity>
+			</zone>
+			<zone type="Africa/Windhoek">
+				<exemplarCity>Виндхук</exemplarCity>
+			</zone>
+			<zone type="Pacific/Noumea">
+				<exemplarCity>Нумеа</exemplarCity>
+			</zone>
+			<zone type="Africa/Niamey">
+				<exemplarCity>Ниамей</exemplarCity>
+			</zone>
+			<zone type="Pacific/Norfolk">
+				<exemplarCity>Норфолк</exemplarCity>
+			</zone>
+			<zone type="Africa/Lagos">
+				<exemplarCity>Лагос</exemplarCity>
+			</zone>
+			<zone type="America/Managua">
+				<exemplarCity>Манагуа</exemplarCity>
+			</zone>
+			<zone type="Europe/Amsterdam">
+				<exemplarCity>Амстердам</exemplarCity>
+			</zone>
+			<zone type="Europe/Oslo">
+				<exemplarCity>Осло</exemplarCity>
+			</zone>
+			<zone type="Asia/Katmandu">
+				<exemplarCity>Катманду</exemplarCity>
+			</zone>
+			<zone type="Pacific/Nauru">
+				<exemplarCity>Науру</exemplarCity>
+			</zone>
+			<zone type="Pacific/Niue">
+				<exemplarCity>Ниуэ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Chatham">
+				<exemplarCity>Чатем, гӀ-е</exemplarCity>
+			</zone>
+			<zone type="Pacific/Auckland">
+				<exemplarCity>Окленд</exemplarCity>
+			</zone>
+			<zone type="Asia/Muscat">
+				<exemplarCity>Маскат</exemplarCity>
+			</zone>
+			<zone type="America/Panama">
+				<exemplarCity>Панама</exemplarCity>
+			</zone>
+			<zone type="America/Lima">
+				<exemplarCity>Лима</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tahiti">
+				<exemplarCity>Таити, гӀ-наш</exemplarCity>
+			</zone>
+			<zone type="Pacific/Marquesas">
+				<exemplarCity>Маркизан, гӀ-наш</exemplarCity>
+			</zone>
+			<zone type="Pacific/Gambier">
+				<exemplarCity>Гамбьен, гӀ-наш</exemplarCity>
+			</zone>
+			<zone type="Pacific/Port_Moresby">
+				<exemplarCity>Порт-Морсби</exemplarCity>
+			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Бугенвиль, гӀ-е</exemplarCity>
+			</zone>
+			<zone type="Asia/Manila">
+				<exemplarCity>Манила</exemplarCity>
+			</zone>
+			<zone type="Asia/Karachi">
+				<exemplarCity>Карачи</exemplarCity>
+			</zone>
+			<zone type="Europe/Warsaw">
+				<exemplarCity>Варшава</exemplarCity>
+			</zone>
+			<zone type="America/Miquelon">
+				<exemplarCity>Микелон</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pitcairn">
+				<exemplarCity>Питкерн</exemplarCity>
+			</zone>
+			<zone type="America/Puerto_Rico">
+				<exemplarCity>Пуэрто-Рико</exemplarCity>
+			</zone>
+			<zone type="Asia/Gaza">
+				<exemplarCity>Газа</exemplarCity>
+			</zone>
+			<zone type="Asia/Hebron">
+				<exemplarCity>Хеврон</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Azores">
+				<exemplarCity>Азоран гӀайренаш</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Madeira">
+				<exemplarCity>Мадейра, гӀ-е</exemplarCity>
+			</zone>
+			<zone type="Europe/Lisbon">
+				<exemplarCity>Лиссабон</exemplarCity>
+			</zone>
+			<zone type="Pacific/Palau">
+				<exemplarCity>Палау</exemplarCity>
+			</zone>
+			<zone type="America/Asuncion">
+				<exemplarCity>Асунсьон</exemplarCity>
+			</zone>
+			<zone type="Asia/Qatar">
+				<exemplarCity>Катар</exemplarCity>
+			</zone>
+			<zone type="Indian/Reunion">
+				<exemplarCity>Реюньон</exemplarCity>
+			</zone>
+			<zone type="Europe/Bucharest">
+				<exemplarCity>Бухарест</exemplarCity>
+			</zone>
+			<zone type="Europe/Belgrade">
+				<exemplarCity>Белград</exemplarCity>
+			</zone>
+			<zone type="Europe/Kaliningrad">
+				<exemplarCity>Калининград</exemplarCity>
+			</zone>
+			<zone type="Europe/Simferopol">
+				<exemplarCity>Симферополь</exemplarCity>
+			</zone>
+			<zone type="Europe/Moscow">
+				<exemplarCity>Москва</exemplarCity>
+			</zone>
+			<zone type="Europe/Volgograd">
+				<exemplarCity>Волгоград</exemplarCity>
+			</zone>
+			<zone type="Europe/Samara">
+				<exemplarCity>Самара</exemplarCity>
+			</zone>
+			<zone type="Asia/Yekaterinburg">
+				<exemplarCity>Екатеринбург</exemplarCity>
+			</zone>
+			<zone type="Asia/Omsk">
+				<exemplarCity>Омск</exemplarCity>
+			</zone>
+			<zone type="Asia/Novosibirsk">
+				<exemplarCity>Новосибирск</exemplarCity>
+			</zone>
+			<zone type="Asia/Novokuznetsk">
+				<exemplarCity>Новокузнецк</exemplarCity>
+			</zone>
+			<zone type="Asia/Krasnoyarsk">
+				<exemplarCity>Красноярск</exemplarCity>
+			</zone>
+			<zone type="Asia/Irkutsk">
+				<exemplarCity>Иркутск</exemplarCity>
+			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Чита</exemplarCity>
+			</zone>
+			<zone type="Asia/Yakutsk">
+				<exemplarCity>Якутск</exemplarCity>
+			</zone>
+			<zone type="Asia/Vladivostok">
+				<exemplarCity>Владивосток</exemplarCity>
+			</zone>
+			<zone type="Asia/Khandyga">
+				<exemplarCity>Хандыга</exemplarCity>
+			</zone>
+			<zone type="Asia/Sakhalin">
+				<exemplarCity>Сахалин гӀ-е</exemplarCity>
+			</zone>
+			<zone type="Asia/Ust-Nera">
+				<exemplarCity>Усть-Нера</exemplarCity>
+			</zone>
+			<zone type="Asia/Magadan">
+				<exemplarCity>Магадан</exemplarCity>
+			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Среднеколымск</exemplarCity>
+			</zone>
+			<zone type="Asia/Kamchatka">
+				<exemplarCity>Петропавловск-Камчатски</exemplarCity>
+			</zone>
+			<zone type="Asia/Anadyr">
+				<exemplarCity>Анадырь</exemplarCity>
+			</zone>
+			<zone type="Africa/Kigali">
+				<exemplarCity>Кигали</exemplarCity>
+			</zone>
+			<zone type="Asia/Riyadh">
+				<exemplarCity>Эр-Рияд</exemplarCity>
+			</zone>
+			<zone type="Pacific/Guadalcanal">
+				<exemplarCity>Гвадалканал</exemplarCity>
+			</zone>
+			<zone type="Indian/Mahe">
+				<exemplarCity>Маэ</exemplarCity>
+			</zone>
+			<zone type="Africa/Khartoum">
+				<exemplarCity>Хартум</exemplarCity>
+			</zone>
+			<zone type="Europe/Stockholm">
+				<exemplarCity>Стокгольм</exemplarCity>
+			</zone>
+			<zone type="Asia/Singapore">
+				<exemplarCity>Сингапур</exemplarCity>
+			</zone>
+			<zone type="Atlantic/St_Helena">
+				<exemplarCity>Езачу Еленин гӀайре</exemplarCity>
+			</zone>
+			<zone type="Europe/Ljubljana">
+				<exemplarCity>Любляна</exemplarCity>
+			</zone>
+			<zone type="Arctic/Longyearbyen">
+				<exemplarCity>Лонгйир</exemplarCity>
+			</zone>
+			<zone type="Europe/Bratislava">
+				<exemplarCity>Братислава</exemplarCity>
+			</zone>
+			<zone type="Africa/Freetown">
+				<exemplarCity>Фритаун</exemplarCity>
+			</zone>
+			<zone type="Europe/San_Marino">
+				<exemplarCity>Сан-Марино</exemplarCity>
+			</zone>
+			<zone type="Africa/Dakar">
+				<exemplarCity>Дакар</exemplarCity>
+			</zone>
+			<zone type="Africa/Mogadishu">
+				<exemplarCity>Могадишо</exemplarCity>
+			</zone>
+			<zone type="America/Paramaribo">
+				<exemplarCity>Парамарибо</exemplarCity>
+			</zone>
+			<zone type="Africa/Juba">
+				<exemplarCity>Джуба</exemplarCity>
+			</zone>
+			<zone type="Africa/Sao_Tome">
+				<exemplarCity>Сан-Томе</exemplarCity>
+			</zone>
+			<zone type="America/El_Salvador">
+				<exemplarCity>Сальвадор</exemplarCity>
+			</zone>
+			<zone type="America/Lower_Princes">
+				<exemplarCity>Лоуэр-Принсес-Куортер</exemplarCity>
+			</zone>
+			<zone type="Asia/Damascus">
+				<exemplarCity>Димашкъ</exemplarCity>
+			</zone>
+			<zone type="Africa/Mbabane">
+				<exemplarCity>Мбабане</exemplarCity>
+			</zone>
+			<zone type="America/Grand_Turk">
+				<exemplarCity>Гранд Турк</exemplarCity>
+			</zone>
+			<zone type="Africa/Ndjamena">
+				<exemplarCity>Нджамена</exemplarCity>
+			</zone>
+			<zone type="Indian/Kerguelen">
+				<exemplarCity>Кергелен</exemplarCity>
+			</zone>
+			<zone type="Africa/Lome">
+				<exemplarCity>Ломе</exemplarCity>
+			</zone>
+			<zone type="Asia/Bangkok">
+				<exemplarCity>Бангкок</exemplarCity>
+			</zone>
+			<zone type="Asia/Dushanbe">
+				<exemplarCity>Душанбе</exemplarCity>
+			</zone>
+			<zone type="Pacific/Fakaofo">
+				<exemplarCity>Факаофо</exemplarCity>
+			</zone>
+			<zone type="Asia/Dili">
+				<exemplarCity>Дили</exemplarCity>
+			</zone>
+			<zone type="Asia/Ashgabat">
+				<exemplarCity>Ашхабад</exemplarCity>
+			</zone>
+			<zone type="Africa/Tunis">
+				<exemplarCity>Тунис</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tongatapu">
+				<exemplarCity>Тонгатапу</exemplarCity>
+			</zone>
+			<zone type="Europe/Istanbul">
+				<exemplarCity>Стамбул</exemplarCity>
+			</zone>
+			<zone type="America/Port_of_Spain">
+				<exemplarCity>Порт-оф-Спейн</exemplarCity>
+			</zone>
+			<zone type="Pacific/Funafuti">
+				<exemplarCity>Фунафути</exemplarCity>
+			</zone>
+			<zone type="Asia/Taipei">
+				<exemplarCity>Тайбэй</exemplarCity>
+			</zone>
+			<zone type="Africa/Dar_es_Salaam">
+				<exemplarCity>Дар-эс-Салам</exemplarCity>
+			</zone>
+			<zone type="Europe/Uzhgorod">
+				<exemplarCity>Ужгород</exemplarCity>
+			</zone>
+			<zone type="Europe/Kiev">
+				<exemplarCity>Киев</exemplarCity>
+			</zone>
+			<zone type="Europe/Zaporozhye">
+				<exemplarCity>Запорожье</exemplarCity>
+			</zone>
+			<zone type="Africa/Kampala">
+				<exemplarCity>Кампала</exemplarCity>
+			</zone>
+			<zone type="Pacific/Midway">
+				<exemplarCity>Мидуэй, гӀ-наш</exemplarCity>
+			</zone>
+			<zone type="Pacific/Johnston">
+				<exemplarCity>Джонстон</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wake">
+				<exemplarCity>Уэйк, гӀ-е</exemplarCity>
+			</zone>
+			<zone type="America/Adak">
+				<exemplarCity>Адак</exemplarCity>
+			</zone>
+			<zone type="America/Nome">
+				<exemplarCity>Ном</exemplarCity>
+			</zone>
+			<zone type="Pacific/Honolulu">
+				<exemplarCity>Гонолулу</exemplarCity>
+			</zone>
+			<zone type="America/Anchorage">
+				<exemplarCity>Анкоридж</exemplarCity>
+			</zone>
+			<zone type="America/Yakutat">
+				<exemplarCity>Якутат</exemplarCity>
+			</zone>
+			<zone type="America/Sitka">
+				<exemplarCity>Ситка</exemplarCity>
+			</zone>
+			<zone type="America/Juneau">
+				<exemplarCity>Джуно</exemplarCity>
+			</zone>
+			<zone type="America/Metlakatla">
+				<exemplarCity>Метлакатла</exemplarCity>
+			</zone>
+			<zone type="America/Los_Angeles">
+				<exemplarCity>Лос-Анджелес</exemplarCity>
+			</zone>
+			<zone type="America/Boise">
+				<exemplarCity>Бойсе</exemplarCity>
+			</zone>
+			<zone type="America/Phoenix">
+				<exemplarCity>Финикс</exemplarCity>
+			</zone>
+			<zone type="America/Denver">
+				<exemplarCity>Денвер</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Beulah">
+				<exemplarCity>Бойла, Къилбаседа Дакота</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/New_Salem">
+				<exemplarCity>Нью-Салем</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Center">
+				<exemplarCity>Юкъ, Къилбаседа Дакота</exemplarCity>
+			</zone>
+			<zone type="America/Chicago">
+				<exemplarCity>Чикаго</exemplarCity>
+			</zone>
+			<zone type="America/Menominee">
+				<exemplarCity>Меномини</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Vincennes">
+				<exemplarCity>Винсенс</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Petersburg">
+				<exemplarCity>Петерсбург</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Tell_City">
+				<exemplarCity>Телл-Сити</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Knox">
+				<exemplarCity>Нокс</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Winamac">
+				<exemplarCity>Винамак</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Marengo">
+				<exemplarCity>Маренго</exemplarCity>
+			</zone>
+			<zone type="America/Indianapolis">
+				<exemplarCity>Индианаполис</exemplarCity>
+			</zone>
+			<zone type="America/Louisville">
+				<exemplarCity>Луисвилл</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Vevay">
+				<exemplarCity>Вивэй</exemplarCity>
+			</zone>
+			<zone type="America/Kentucky/Monticello">
+				<exemplarCity>Монтиселло</exemplarCity>
+			</zone>
+			<zone type="America/Detroit">
+				<exemplarCity>Детройт</exemplarCity>
+			</zone>
+			<zone type="America/New_York">
+				<exemplarCity>Нью-Йорк</exemplarCity>
+			</zone>
+			<zone type="America/Montevideo">
+				<exemplarCity>Монтевидео</exemplarCity>
+			</zone>
+			<zone type="Asia/Samarkand">
+				<exemplarCity>Самарканд</exemplarCity>
+			</zone>
+			<zone type="Asia/Tashkent">
+				<exemplarCity>Ташкент</exemplarCity>
+			</zone>
+			<zone type="Europe/Vatican">
+				<exemplarCity>Ватикан</exemplarCity>
+			</zone>
+			<zone type="America/St_Vincent">
+				<exemplarCity>Сент-Винсент</exemplarCity>
+			</zone>
+			<zone type="America/Caracas">
+				<exemplarCity>Каракас</exemplarCity>
+			</zone>
+			<zone type="America/Tortola">
+				<exemplarCity>Тортола</exemplarCity>
+			</zone>
+			<zone type="America/St_Thomas">
+				<exemplarCity>Сент-Томас</exemplarCity>
+			</zone>
+			<zone type="Asia/Saigon">
+				<exemplarCity>Хошимин</exemplarCity>
+			</zone>
+			<zone type="Pacific/Efate">
+				<exemplarCity>Эфате</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wallis">
+				<exemplarCity>Уоллис</exemplarCity>
+			</zone>
+			<zone type="Pacific/Apia">
+				<exemplarCity>Апи</exemplarCity>
+			</zone>
+			<zone type="Asia/Aden">
+				<exemplarCity>Аден</exemplarCity>
+			</zone>
+			<zone type="Indian/Mayotte">
+				<exemplarCity>Майорка</exemplarCity>
+			</zone>
+			<zone type="Africa/Johannesburg">
+				<exemplarCity>Йоханнесбург</exemplarCity>
+			</zone>
+			<zone type="Africa/Lusaka">
+				<exemplarCity>Лусака</exemplarCity>
+			</zone>
+			<zone type="Africa/Harare">
+				<exemplarCity>Хараре</exemplarCity>
+			</zone>
+			<metazone type="Afghanistan">
+				<long>
+					<standard>ОвхӀан-пачхьалкх</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Central">
+				<long>
+					<standard>Юккъера Африка</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Eastern">
+				<long>
+					<standard>Малхбален Африка</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Southern">
+				<long>
+					<standard>Къилба Африка</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Western">
+				<long>
+					<generic>Малхбузен Африка</generic>
+					<standard>Малхбузен Африка, стандартан хан</standard>
+					<daylight>Малхбузен Африка, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Alaska">
+				<long>
+					<generic>Аляска</generic>
+					<standard>Аляска, стандартан хан</standard>
+					<daylight>Аляска, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Amazon">
+				<long>
+					<generic>Амазонка</generic>
+					<standard>Амазонка, стандартан хан</standard>
+					<daylight>Амазонка, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Central">
+				<long>
+					<generic>Юккъера Америка</generic>
+					<standard>Юккъера Америка, стандартан хан</standard>
+					<daylight>Юккъера Америка, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Eastern">
+				<long>
+					<generic>Малхбален Америка</generic>
+					<standard>Малхбален Америка, стандартан хан</standard>
+					<daylight>Малхбален Америка, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Mountain">
+				<long>
+					<generic>Лаьмнийн хан (АЦШ)</generic>
+					<standard>Лаьмнийн стандартан хан (АЦШ)</standard>
+					<daylight>Лаьмнийн аьхкенан хан (АЦШ)</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Pacific">
+				<long>
+					<generic>Тийна океанан хан</generic>
+					<standard>Тийна океанан стандартан хан</standard>
+					<daylight>Тийна океанан аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Apia">
+				<long>
+					<generic>хан Апиа, Самоа</generic>
+					<standard>стандартан хан Апиа, Самоа</standard>
+					<daylight>аьхкенан хан Апиа, Самоа</daylight>
+				</long>
+			</metazone>
+			<metazone type="Arabian">
+				<long>
+					<generic>СаӀудийн Арави</generic>
+					<standard>СаӀудийн Арави, стандартан хан</standard>
+					<daylight>СаӀудийн Арави, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Argentina">
+				<long>
+					<generic>Аргентина</generic>
+					<standard>Аргентина, стандартан хан</standard>
+					<daylight>Аргентина, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Argentina_Western">
+				<long>
+					<generic>Малхбузен Аргентина</generic>
+					<standard>Малхбузен Аргентина, стандартан хан</standard>
+					<daylight>Малхбузен Аргентина, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Armenia">
+				<long>
+					<generic>Эрмалойчоь</generic>
+					<standard>Эрмалойчоь, стандартан хан</standard>
+					<daylight>Эрмалойчоь, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Atlantic">
+				<long>
+					<generic>Атлантикан хан</generic>
+					<standard>Атлантикан стандартан хан</standard>
+					<daylight>Атлантикан аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Central">
+				<long>
+					<generic>Юккъера Австрали</generic>
+					<standard>Юккъера Австрали, стандартан хан</standard>
+					<daylight>Юккъера Австрали, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_CentralWestern">
+				<long>
+					<generic>Юккъера Австрали, малхбузен хан</generic>
+					<standard>Юккъера Австрали, малхбузен стандартан хан</standard>
+					<daylight>Юккъера Австрали, малхбузен аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Eastern">
+				<long>
+					<generic>Малхбален Австрали</generic>
+					<standard>Малхбален Австрали, стандартан хан</standard>
+					<daylight>Малхбален Австрали, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Western">
+				<long>
+					<generic>Малхбузен Австрали</generic>
+					<standard>Малхбузен Австрали, стандартан хан</standard>
+					<daylight>Малхбузен Австрали, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Azerbaijan">
+				<long>
+					<generic>Азербайджан</generic>
+					<standard>Азербайджан, стандартан хан</standard>
+					<daylight>Азербайджан, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Azores">
+				<long>
+					<generic>Азоран гӀайренаш</generic>
+					<standard>Азоран гӀайренаш, стандартан хан</standard>
+					<daylight>Азоран гӀайренаш, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Bangladesh">
+				<long>
+					<generic>Бангладеш</generic>
+					<standard>Бангладеш, стандартан хан</standard>
+					<daylight>Бангладеш, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Bhutan">
+				<long>
+					<standard>Бутан</standard>
+				</long>
+			</metazone>
+			<metazone type="Bolivia">
+				<long>
+					<standard>Боливи</standard>
+				</long>
+			</metazone>
+			<metazone type="Brasilia">
+				<long>
+					<generic>Бразили</generic>
+					<standard>Бразили, стандартан хан</standard>
+					<daylight>Бразили, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Brunei">
+				<long>
+					<standard>Бруней-Даруссалам</standard>
+				</long>
+			</metazone>
+			<metazone type="Cape_Verde">
+				<long>
+					<generic>Кабо-Верде</generic>
+					<standard>Кабо-Верде, стандартан хан</standard>
+					<daylight>Кабо-Верде, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Chamorro">
+				<long>
+					<standard>Чаморро</standard>
+				</long>
+			</metazone>
+			<metazone type="Chatham">
+				<long>
+					<generic>Чатем</generic>
+					<standard>Чатем, стандартан хан</standard>
+					<daylight>Чатем, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Chile">
+				<long>
+					<generic>Чили</generic>
+					<standard>Чили, стандартан хан</standard>
+					<daylight>Чили, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="China">
+				<long>
+					<generic>Китай</generic>
+					<standard>Китай, стандартан хан</standard>
+					<daylight>Китай, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Choibalsan">
+				<long>
+					<generic>Чойбалсан</generic>
+					<standard>Чойбалсан, стандартан хан</standard>
+					<daylight>Чойбалсан, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Christmas">
+				<long>
+					<standard>Ӏийса пайхамар винчу ден гӀайре</standard>
+				</long>
+			</metazone>
+			<metazone type="Cocos">
+				<long>
+					<standard>Кокосийн, гӀ-наш</standard>
+				</long>
+			</metazone>
+			<metazone type="Colombia">
+				<long>
+					<generic>Колумби</generic>
+					<standard>Колумби, стандартан хан</standard>
+					<daylight>Колумби, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cook">
+				<long>
+					<generic>Кукан, гӀ-наш</generic>
+					<standard>Кукан, гӀ-наш, стандартан хан</standard>
+					<daylight>Кукан, гӀ-наш, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cuba">
+				<long>
+					<generic>Куба</generic>
+					<standard>Куба, стандартан хан</standard>
+					<daylight>Куба, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Davis">
+				<long>
+					<standard>Дейвис</standard>
+				</long>
+			</metazone>
+			<metazone type="DumontDUrville">
+				<long>
+					<standard>Дюмон-д’Юрвиль</standard>
+				</long>
+			</metazone>
+			<metazone type="East_Timor">
+				<long>
+					<standard>Малхбален Тимор</standard>
+				</long>
+			</metazone>
+			<metazone type="Easter">
+				<long>
+					<generic>Мархин гӀайре</generic>
+					<standard>Мархин гӀайре, стандартан хан</standard>
+					<daylight>Мархин гӀайре, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Ecuador">
+				<long>
+					<standard>Эквадор</standard>
+				</long>
+			</metazone>
+			<metazone type="Europe_Central">
+				<long>
+					<generic>Юккъера Европа</generic>
+					<standard>Юккъера Европа, стандартан хан</standard>
+					<daylight>Юккъера Европа, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Europe_Eastern">
+				<long>
+					<generic>Малхбален Европа</generic>
+					<standard>Малхбален Европа, стандартан хан</standard>
+					<daylight>Малхбален Европа, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Europe_Further_Eastern">
+				<long>
+					<standard>Калининградера а, Минскера а хан</standard>
+				</long>
+			</metazone>
+			<metazone type="Europe_Western">
+				<long>
+					<generic>Малхбузен Европа</generic>
+					<standard>Малхбузен Европа, стандартан хан</standard>
+					<daylight>Малхбузен Европа, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Falkland">
+				<long>
+					<generic>Фолклендан гӀайренаш</generic>
+					<standard>Фолклендан гӀайренаш, стандартан хан</standard>
+					<daylight>Фолклендан гӀайренаш, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Fiji">
+				<long>
+					<generic>Фиджи</generic>
+					<standard>Фиджи, стандартан хан</standard>
+					<daylight>Фиджи, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="French_Guiana">
+				<long>
+					<standard>Французийн Гвиана</standard>
+				</long>
+			</metazone>
+			<metazone type="French_Southern">
+				<long>
+					<standard>Французийн къилба а, Антарктидан а хан</standard>
+				</long>
+			</metazone>
+			<metazone type="Galapagos">
+				<long>
+					<standard>Галапагосан гӀайренаш</standard>
+				</long>
+			</metazone>
+			<metazone type="Gambier">
+				<long>
+					<standard>Гамбье</standard>
+				</long>
+			</metazone>
+			<metazone type="Georgia">
+				<long>
+					<generic>Гуьржийчоь</generic>
+					<standard>Гуьржийчоь, стандартан хан</standard>
+					<daylight>Гуьржийчоь, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Gilbert_Islands">
+				<long>
+					<standard>Гилбертан, гӀ-наш</standard>
+				</long>
+			</metazone>
+			<metazone type="GMT">
+				<long>
+					<standard>Гринвичица юкъара хан</standard>
+				</long>
+			</metazone>
+			<metazone type="Greenland_Eastern">
+				<long>
+					<generic>Малхбален Гренланди</generic>
+					<standard>Малхбален Гренланди, стандартан хан</standard>
+					<daylight>Малхбален Гренланди, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Greenland_Western">
+				<long>
+					<generic>Малхбузен Гренланди</generic>
+					<standard>Малхбузен Гренланди, стандартан хан</standard>
+					<daylight>Малхбузен Гренланди, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Gulf">
+				<long>
+					<standard>ГӀажарийн айма</standard>
+				</long>
+			</metazone>
+			<metazone type="Guyana">
+				<long>
+					<standard>Гайана</standard>
+				</long>
+			</metazone>
+			<metazone type="Hawaii_Aleutian">
+				<long>
+					<generic>Гавайн-алеутийн хан</generic>
+					<standard>Гавайн-алеутийн стандартан хан</standard>
+					<daylight>Гавайн-алеутийн аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Hong_Kong">
+				<long>
+					<generic>Гонконг</generic>
+					<standard>Гонконг, стандартан хан</standard>
+					<daylight>Гонконг, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Hovd">
+				<long>
+					<generic>Ховд</generic>
+					<standard>Ховд, стандартан хан</standard>
+					<daylight>Ховд, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="India">
+				<long>
+					<standard>Инди</standard>
+				</long>
+			</metazone>
+			<metazone type="Indian_Ocean">
+				<long>
+					<standard>Индин океан</standard>
+				</long>
+			</metazone>
+			<metazone type="Indochina">
+				<long>
+					<standard>Индокитай</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Central">
+				<long>
+					<standard>Юккъера Индонези</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Eastern">
+				<long>
+					<standard>Малхбален Индонези</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Western">
+				<long>
+					<standard>Малхбузен Индонези</standard>
+				</long>
+			</metazone>
+			<metazone type="Iran">
+				<long>
+					<generic>ГӀажарийчоь</generic>
+					<standard>ГӀажарийчоь, стандартан хан</standard>
+					<daylight>ГӀажарийчоь, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Irkutsk">
+				<long>
+					<generic>Иркутск</generic>
+					<standard>Иркутск, стандартан хан</standard>
+					<daylight>Иркутск, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Israel">
+				<long>
+					<generic>Израиль</generic>
+					<standard>Израиль, стандартан хан</standard>
+					<daylight>Израиль, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Japan">
+				<long>
+					<generic>Япони</generic>
+					<standard>Япони, стандартан хан</standard>
+					<daylight>Япони, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Eastern">
+				<long>
+					<standard>Малхбален Казахстан</standard>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Western">
+				<long>
+					<standard>Малхбузен Казахстан</standard>
+				</long>
+			</metazone>
+			<metazone type="Korea">
+				<long>
+					<generic>Корей</generic>
+					<standard>Корей, стандартан хан</standard>
+					<daylight>Корей, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kosrae">
+				<long>
+					<standard>Косраэ</standard>
+				</long>
+			</metazone>
+			<metazone type="Krasnoyarsk">
+				<long>
+					<generic>Красноярск</generic>
+					<standard>Красноярск, стандартан хан</standard>
+					<daylight>Красноярск, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kyrgystan">
+				<long>
+					<standard>Киргизи</standard>
+				</long>
+			</metazone>
+			<metazone type="Line_Islands">
+				<long>
+					<standard>Лайн, гӀ-наш</standard>
+				</long>
+			</metazone>
+			<metazone type="Lord_Howe">
+				<long>
+					<generic>Лорд-Хау</generic>
+					<standard>Лорд-Хау, стандартан хан</standard>
+					<daylight>Лорд-Хау, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Macquarie">
+				<long>
+					<standard>Маккуори</standard>
+				</long>
+			</metazone>
+			<metazone type="Magadan">
+				<long>
+					<generic>Магадан</generic>
+					<standard>Магадан, стандартан хан</standard>
+					<daylight>Магадан, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Malaysia">
+				<long>
+					<standard>Малайзи</standard>
+				</long>
+			</metazone>
+			<metazone type="Maldives">
+				<long>
+					<standard>Мальдиваш</standard>
+				</long>
+			</metazone>
+			<metazone type="Marquesas">
+				<long>
+					<standard>Маркизан, гӀ-наш</standard>
+				</long>
+			</metazone>
+			<metazone type="Marshall_Islands">
+				<long>
+					<standard>Маршалан , гӀ-наш</standard>
+				</long>
+			</metazone>
+			<metazone type="Mauritius">
+				<long>
+					<generic>Маврики</generic>
+					<standard>Маврики, стандартан хан</standard>
+					<daylight>Маврики, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mawson">
+				<long>
+					<standard>Моусон</standard>
+				</long>
+			</metazone>
+			<metazone type="Mexico_Northwest">
+				<long>
+					<generic>Къилбаседа Американ Мексикан хан</generic>
+					<standard>Къилбаседа Американ Мексикан стандартан хан</standard>
+					<daylight>Къилбаседа Американ Мексикан аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mexico_Pacific">
+				<long>
+					<generic>Тийна океанан Мексикан хан</generic>
+					<standard>Тийна океанан Мексикан стандартан хан</standard>
+					<daylight>Тийна океанан Мексикан аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mongolia">
+				<long>
+					<generic>Улан-Батор</generic>
+					<standard>Улан-Батор, стандартан хан</standard>
+					<daylight>Улан-Батор, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Moscow">
+				<long>
+					<generic>Москва</generic>
+					<standard>Москва, стандартан хан</standard>
+					<daylight>Москва, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Myanmar">
+				<long>
+					<standard>Мьянма</standard>
+				</long>
+			</metazone>
+			<metazone type="Nauru">
+				<long>
+					<standard>Науру</standard>
+				</long>
+			</metazone>
+			<metazone type="Nepal">
+				<long>
+					<standard>Непал</standard>
+				</long>
+			</metazone>
+			<metazone type="New_Caledonia">
+				<long>
+					<generic>Керла Каледони</generic>
+					<standard>Керла Каледони, стандартан хан</standard>
+					<daylight>Керла Каледони, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="New_Zealand">
+				<long>
+					<generic>Керла Зеланди</generic>
+					<standard>Керла Зеланди, стандартан хан</standard>
+					<daylight>Керла Зеланди, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Newfoundland">
+				<long>
+					<generic>Ньюфаундленд</generic>
+					<standard>Ньюфаундленд, стандартан хан</standard>
+					<daylight>Ньюфаундленд, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Niue">
+				<long>
+					<standard>Ниуэ</standard>
+				</long>
+			</metazone>
+			<metazone type="Norfolk">
+				<long>
+					<standard>Норфолк</standard>
+				</long>
+			</metazone>
+			<metazone type="Noronha">
+				<long>
+					<generic>Фернанду-ди-Норонья</generic>
+					<standard>Фернанду-ди-Норонья, стандартан хан</standard>
+					<daylight>Фернанду-ди-Норонья, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Novosibirsk">
+				<long>
+					<generic>Новосибирск</generic>
+					<standard>Новосибирск, стандартан хан</standard>
+					<daylight>Новосибирск, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Omsk">
+				<long>
+					<generic>Омск</generic>
+					<standard>Омск, стандартан хан</standard>
+					<daylight>Омск, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pakistan">
+				<long>
+					<generic>Пакистан</generic>
+					<standard>Пакистан, стандартан хан</standard>
+					<daylight>Пакистан, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Palau">
+				<long>
+					<standard>Палау</standard>
+				</long>
+			</metazone>
+			<metazone type="Papua_New_Guinea">
+				<long>
+					<standard>Папуа – Керла Гвиней</standard>
+				</long>
+			</metazone>
+			<metazone type="Paraguay">
+				<long>
+					<generic>Парагвай</generic>
+					<standard>Парагвай, стандартан хан</standard>
+					<daylight>Парагвай, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Peru">
+				<long>
+					<generic>Перу</generic>
+					<standard>Перу, стандартан хан</standard>
+					<daylight>Перу, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Philippines">
+				<long>
+					<generic>Филиппинаш</generic>
+					<standard>Филиппинаш, стандартан хан</standard>
+					<daylight>Филиппинаш, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Phoenix_Islands">
+				<long>
+					<standard>Феникс, гӀ-наш</standard>
+				</long>
+			</metazone>
+			<metazone type="Pierre_Miquelon">
+				<long>
+					<generic>Сен-Пьер а, Микелон а</generic>
+					<standard>Сен-Пьер а, Микелон а, стандартан хан</standard>
+					<daylight>Сен-Пьер а, Микелон а, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pitcairn">
+				<long>
+					<standard>Питкэрн</standard>
+				</long>
+			</metazone>
+			<metazone type="Ponape">
+				<long>
+					<standard>Понапе, гӀ-наш</standard>
+				</long>
+			</metazone>
+			<metazone type="Reunion">
+				<long>
+					<standard>Реюньон</standard>
+				</long>
+			</metazone>
+			<metazone type="Rothera">
+				<long>
+					<standard>Ротера</standard>
+				</long>
+			</metazone>
+			<metazone type="Sakhalin">
+				<long>
+					<generic>Сахалин</generic>
+					<standard>Сахалин, стандартан хан</standard>
+					<daylight>Сахалин, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Samoa">
+				<long>
+					<generic>Самоа</generic>
+					<standard>Самоа, стандартан хан</standard>
+					<daylight>Самоа, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Seychelles">
+				<long>
+					<standard>Сейшелан гӀайренаш</standard>
+				</long>
+			</metazone>
+			<metazone type="Singapore">
+				<long>
+					<standard>Сингапур</standard>
+				</long>
+			</metazone>
+			<metazone type="Solomon">
+				<long>
+					<standard>Соломонан, гӀ-наш</standard>
+				</long>
+			</metazone>
+			<metazone type="South_Georgia">
+				<long>
+					<standard>Къилба Георги</standard>
+				</long>
+			</metazone>
+			<metazone type="Suriname">
+				<long>
+					<standard>Суринам</standard>
+				</long>
+			</metazone>
+			<metazone type="Syowa">
+				<long>
+					<standard>Сёва</standard>
+				</long>
+			</metazone>
+			<metazone type="Tahiti">
+				<long>
+					<standard>Таити, гӀ-наш</standard>
+				</long>
+			</metazone>
+			<metazone type="Taipei">
+				<long>
+					<generic>Тайвань</generic>
+					<standard>Тайвань, стандартан хан</standard>
+					<daylight>Тайвань, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Tajikistan">
+				<long>
+					<standard>Таджикистан</standard>
+				</long>
+			</metazone>
+			<metazone type="Tokelau">
+				<long>
+					<standard>Токелау</standard>
+				</long>
+			</metazone>
+			<metazone type="Tonga">
+				<long>
+					<generic>Тонга</generic>
+					<standard>Тонга, стандартан хан</standard>
+					<daylight>Тонга, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Truk">
+				<long>
+					<standard>Чуук</standard>
+				</long>
+			</metazone>
+			<metazone type="Turkmenistan">
+				<long>
+					<generic>Туркмени</generic>
+					<standard>Туркменин стандартан хан</standard>
+					<daylight>Туркменин аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Tuvalu">
+				<long>
+					<standard>Тувалу</standard>
+				</long>
+			</metazone>
+			<metazone type="Uruguay">
+				<long>
+					<generic>Уругвай</generic>
+					<standard>Уругвай, стандартан хан</standard>
+					<daylight>Уругвай, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Uzbekistan">
+				<long>
+					<generic>Узбекистан</generic>
+					<standard>Узбекистанан стандартан хан</standard>
+					<daylight>Узбекистанан аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Vanuatu">
+				<long>
+					<generic>Вануату</generic>
+					<standard>Вануату, стандартан хан</standard>
+					<daylight>Вануату, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Venezuela">
+				<long>
+					<standard>Венесуэла</standard>
+				</long>
+			</metazone>
+			<metazone type="Vladivostok">
+				<long>
+					<generic>Владивосток</generic>
+					<standard>Владивосток, стандартан хан</standard>
+					<daylight>Владивосток, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Volgograd">
+				<long>
+					<generic>Волгоград</generic>
+					<standard>Волгоград, стандартан хан</standard>
+					<daylight>Волгоград, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Vostok">
+				<long>
+					<standard>Восток</standard>
+				</long>
+			</metazone>
+			<metazone type="Wake">
+				<long>
+					<standard>Уэйк, гӀ-е</standard>
+				</long>
+			</metazone>
+			<metazone type="Wallis">
+				<long>
+					<standard>Уоллис а, Футуна а</standard>
+				</long>
+			</metazone>
+			<metazone type="Yakutsk">
+				<long>
+					<generic>Якутск</generic>
+					<standard>Якутск, стандартан хан</standard>
+					<daylight>Якутск, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+			<metazone type="Yekaterinburg">
+				<long>
+					<generic>Екатеринбург</generic>
+					<standard>Екатеринбург, стандартан хан</standard>
+					<daylight>Екатеринбург, аьхкенан хан</daylight>
+				</long>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<minimumGroupingDigits draft="contributed">1</minimumGroupingDigits>
+		<symbols numberSystem="latn">
+			<decimal>.</decimal>
+			<group>,</group>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<nan>Терхьаш дац</nan>
+			<timeSeparator draft="contributed">:</timeSeparator>
+		</symbols>
+		<decimalFormats numberSystem="latn">
+			<decimalFormatLength>
+				<decimalFormat>
+					<pattern>#,##0.###</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+			<decimalFormatLength type="long">
+				<decimalFormat>
+					<pattern type="1000" count="one">0 эзар</pattern>
+					<pattern type="1000" count="other">0 эзар</pattern>
+					<pattern type="10000" count="one">00 эзар</pattern>
+					<pattern type="10000" count="other">00 эзар</pattern>
+					<pattern type="100000" count="one">000 эзар</pattern>
+					<pattern type="100000" count="other">000 эзар</pattern>
+					<pattern type="1000000" count="one">0 миллион</pattern>
+					<pattern type="1000000" count="other">0 миллион</pattern>
+					<pattern type="10000000" count="one">00 миллион</pattern>
+					<pattern type="10000000" count="other">00 миллион</pattern>
+					<pattern type="100000000" count="one">000 миллион</pattern>
+					<pattern type="100000000" count="other">000 миллион</pattern>
+					<pattern type="1000000000" count="one">0 миллиард</pattern>
+					<pattern type="1000000000" count="other">0 миллиард</pattern>
+					<pattern type="10000000000" count="one">00 миллиард</pattern>
+					<pattern type="10000000000" count="other">00 миллиард</pattern>
+					<pattern type="100000000000" count="one">000 миллиард</pattern>
+					<pattern type="100000000000" count="other">000 миллиард</pattern>
+					<pattern type="1000000000000" count="one">0 триллион</pattern>
+					<pattern type="1000000000000" count="other">0 триллион</pattern>
+					<pattern type="10000000000000" count="one">00 триллион</pattern>
+					<pattern type="10000000000000" count="other">00 триллион</pattern>
+					<pattern type="100000000000000" count="one">000 триллион</pattern>
+					<pattern type="100000000000000" count="other">000 триллион</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+			<decimalFormatLength type="short">
+				<decimalFormat>
+					<pattern type="1000" count="one">0 эзар</pattern>
+					<pattern type="1000" count="other">0 эзар</pattern>
+					<pattern type="10000" count="one">00 эзар</pattern>
+					<pattern type="10000" count="other">00 эзар</pattern>
+					<pattern type="100000" count="one">000 эзар</pattern>
+					<pattern type="100000" count="other">000 эзар</pattern>
+					<pattern type="1000000" count="one">0 млн</pattern>
+					<pattern type="1000000" count="other">0 млн</pattern>
+					<pattern type="10000000" count="one">00 млн</pattern>
+					<pattern type="10000000" count="other">00 млн</pattern>
+					<pattern type="100000000" count="one">000 млн</pattern>
+					<pattern type="100000000" count="other">000 млн</pattern>
+					<pattern type="1000000000" count="one">0 млрд</pattern>
+					<pattern type="1000000000" count="other">0 млрд</pattern>
+					<pattern type="10000000000" count="one">00 млрд</pattern>
+					<pattern type="10000000000" count="other">00 млрд</pattern>
+					<pattern type="100000000000" count="one">000 млрд</pattern>
+					<pattern type="100000000000" count="other">000 млрд</pattern>
+					<pattern type="1000000000000" count="one">0 трлн</pattern>
+					<pattern type="1000000000000" count="other">0 трлн</pattern>
+					<pattern type="10000000000000" count="one">00 трлн</pattern>
+					<pattern type="10000000000000" count="other">00 трлн</pattern>
+					<pattern type="100000000000000" count="one">000 трлн</pattern>
+					<pattern type="100000000000000" count="other">000 трлн</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+		</decimalFormats>
+		<scientificFormats numberSystem="latn">
+			<scientificFormatLength>
+				<scientificFormat>
+					<pattern>#E0</pattern>
+				</scientificFormat>
+			</scientificFormatLength>
+		</scientificFormats>
+		<percentFormats numberSystem="latn">
+			<percentFormatLength>
+				<percentFormat>
+					<pattern>#,##0 %</pattern>
+				</percentFormat>
+			</percentFormatLength>
+		</percentFormats>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">0 эзар ¤</pattern>
+					<pattern type="1000" count="other">0 эзар ¤</pattern>
+					<pattern type="10000" count="one">00 эзар ¤</pattern>
+					<pattern type="10000" count="other">00 эзар ¤</pattern>
+					<pattern type="100000" count="one">000 эзар ¤</pattern>
+					<pattern type="100000" count="other">000 эзар ¤</pattern>
+					<pattern type="1000000" count="one">0 млн ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="one">00 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="one">000 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="one">0 млрд ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="one">00 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="one">000 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="one">0 трлн ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="one">00 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="one">000 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<unitPattern count="one">{0} {1}</unitPattern>
+			<unitPattern count="other">{0} {1}</unitPattern>
+		</currencyFormats>
+		<currencies>
+			<currency type="AED">
+				<displayName>Дирхам ӀЦЭ</displayName>
+				<displayName count="one">Дирхам ӀЦЭ</displayName>
+				<displayName count="other">Дирхамаш ӀЦЭ</displayName>
+				<symbol draft="contributed">AED</symbol>
+			</currency>
+			<currency type="AFN">
+				<displayName>ОвхӀан-пачхьалкхан афгани</displayName>
+				<displayName count="one">ОвхӀан-пачхьалкхан афгани</displayName>
+				<displayName count="other">ОвхӀан-пачхьалкхан афганиш</displayName>
+				<symbol draft="contributed">AFN</symbol>
+			</currency>
+			<currency type="ALL">
+				<displayName>Албанин лек</displayName>
+				<displayName count="one">Албанин лек</displayName>
+				<displayName count="other">Албанин лекаш</displayName>
+				<symbol draft="contributed">ALL</symbol>
+			</currency>
+			<currency type="AMD">
+				<displayName>Эрмалойчоьнан драм</displayName>
+				<displayName count="one">Эрмалойчоьнан драм</displayName>
+				<displayName count="other">Эрмалойчоьнан драмаш</displayName>
+				<symbol draft="contributed">AMD</symbol>
+			</currency>
+			<currency type="ANG">
+				<displayName>Нидерландин Антилин гульден</displayName>
+				<displayName count="one">Нидерландин Антилин гульден</displayName>
+				<displayName count="other">Нидерландин Антилин гульденш</displayName>
+				<symbol draft="contributed">ANG</symbol>
+			</currency>
+			<currency type="AOA">
+				<displayName>Анголан кванза</displayName>
+				<displayName count="one">Анголан кванза</displayName>
+				<displayName count="other">Анголан кванзаш</displayName>
+				<symbol draft="contributed">AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
+			</currency>
+			<currency type="ARS">
+				<displayName>Аргентинан песо</displayName>
+				<displayName count="one">Аргентинан песо</displayName>
+				<displayName count="other">Аргентинан песош</displayName>
+				<symbol draft="contributed">ARS</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="AUD">
+				<displayName>Австралин доллар</displayName>
+				<displayName count="one">Австралин доллар</displayName>
+				<displayName count="other">Австралин долларш</displayName>
+				<symbol draft="contributed">A$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="AWG">
+				<displayName>Арубан флорин</displayName>
+				<displayName count="one">Арубан флорин</displayName>
+				<displayName count="other">Арубан флоринаш</displayName>
+				<symbol draft="contributed">AWG</symbol>
+			</currency>
+			<currency type="AZN">
+				<displayName>Азербайджанан манат</displayName>
+				<displayName count="one">Азербайджанан манат</displayName>
+				<displayName count="other">Азербайджанан манаташ</displayName>
+				<symbol draft="contributed">AZN</symbol>
+			</currency>
+			<currency type="BAM">
+				<displayName>Боснин а, Герцеговинан а хийцалун марка</displayName>
+				<displayName count="one">Боснин а, Герцеговинан а хийцалун марка</displayName>
+				<displayName count="other">Боснин а, Герцеговинан а хийцалун маркаш</displayName>
+				<symbol draft="contributed">BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
+			</currency>
+			<currency type="BBD">
+				<displayName>Барбадосан доллар</displayName>
+				<displayName count="one">Барбадосан доллар</displayName>
+				<displayName count="other">Барбадосан долларш</displayName>
+				<symbol draft="contributed">BBD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BDT">
+				<displayName>Бангладешан така</displayName>
+				<displayName count="one">Бангладешан така</displayName>
+				<displayName count="other">Бангладешан такаш</displayName>
+				<symbol draft="contributed">BDT</symbol>
+				<symbol alt="narrow" draft="contributed">৳</symbol>
+			</currency>
+			<currency type="BGN">
+				<displayName>Болгарин лев</displayName>
+				<displayName count="one">Болгарин лев</displayName>
+				<displayName count="other">Болгарин левш</displayName>
+				<symbol draft="contributed">BGN</symbol>
+			</currency>
+			<currency type="BHD">
+				<displayName>Бахрейнан динар</displayName>
+				<displayName count="one">Бахрейнан динар</displayName>
+				<displayName count="other">Бахрейнан динараш</displayName>
+				<symbol draft="contributed">BHD</symbol>
+			</currency>
+			<currency type="BIF">
+				<displayName>Бурундин франк</displayName>
+				<displayName count="one">Бурундин франк</displayName>
+				<displayName count="other">Бурундин франкаш</displayName>
+				<symbol draft="contributed">BIF</symbol>
+			</currency>
+			<currency type="BMD">
+				<displayName>Бермудан доллар</displayName>
+				<displayName count="one">Бермудан доллар</displayName>
+				<displayName count="other">Бермудан долларш</displayName>
+				<symbol draft="contributed">BMD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BND">
+				<displayName>Брунейн доллар</displayName>
+				<displayName count="one">Брунейн доллар</displayName>
+				<displayName count="other">Брунейн долларш</displayName>
+				<symbol draft="contributed">BND</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BOB">
+				<displayName>Боливин боливиано</displayName>
+				<displayName count="one">Боливин боливиано</displayName>
+				<displayName count="other">Боливин боливианош</displayName>
+				<symbol draft="contributed">BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
+			</currency>
+			<currency type="BRL">
+				<displayName>Бразилин реал</displayName>
+				<displayName count="one">Бразилин реал</displayName>
+				<displayName count="other">Бразилин реалш</displayName>
+				<symbol draft="contributed">R$</symbol>
+				<symbol alt="narrow" draft="contributed">R$</symbol>
+			</currency>
+			<currency type="BSD">
+				<displayName>Багаман доллар</displayName>
+				<displayName count="one">Багаман доллар</displayName>
+				<displayName count="other">Багаман долларш</displayName>
+				<symbol draft="contributed">BSD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BTN">
+				<displayName>Бутанан нгултрум</displayName>
+				<displayName count="one">Бутанан нгултрум</displayName>
+				<displayName count="other">Бутанан нгултрумаш</displayName>
+				<symbol draft="contributed">BTN</symbol>
+			</currency>
+			<currency type="BWP">
+				<displayName>Ботсванан пула</displayName>
+				<displayName count="one">Ботсванан пула</displayName>
+				<displayName count="other">Ботсванан пулаш</displayName>
+				<symbol draft="contributed">BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
+			</currency>
+			<currency type="BYR">
+				<displayName>Белоруссин сом</displayName>
+				<displayName count="one">Белоруссин сом</displayName>
+				<displayName count="other">Белоруссин соьмаш</displayName>
+				<symbol draft="contributed">BYR</symbol>
+				<symbol alt="narrow" draft="contributed">р.</symbol>
+			</currency>
+			<currency type="BZD">
+				<displayName>Белизин доллар</displayName>
+				<displayName count="one">Белизин доллар</displayName>
+				<displayName count="other">Белизин долларш</displayName>
+				<symbol draft="contributed">BZD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CAD">
+				<displayName>Канадан доллар</displayName>
+				<displayName count="one">Канадан доллар</displayName>
+				<displayName count="other">Канадан долларш</displayName>
+				<symbol draft="contributed">CA$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CDF">
+				<displayName>Конголезин франк</displayName>
+				<displayName count="one">Конголезин франк</displayName>
+				<displayName count="other">Конголезин франкаш</displayName>
+				<symbol draft="contributed">CDF</symbol>
+			</currency>
+			<currency type="CHF">
+				<displayName>Швейцарин франк</displayName>
+				<displayName count="one">Швейцарин франк</displayName>
+				<displayName count="other">Швейцарин франкаш</displayName>
+				<symbol draft="contributed">CHF</symbol>
+			</currency>
+			<currency type="CLP">
+				<displayName>Чилин песо</displayName>
+				<displayName count="one">Чилин песо</displayName>
+				<displayName count="other">Чилин песош</displayName>
+				<symbol draft="contributed">CLP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CNY">
+				<displayName>Китайн юань</displayName>
+				<displayName count="one">Китайн юань</displayName>
+				<displayName count="other">Китайн юанаш</displayName>
+				<symbol draft="contributed">CN¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
+			</currency>
+			<currency type="COP">
+				<displayName>Колумбин песо</displayName>
+				<displayName count="one">Колумбин песо</displayName>
+				<displayName count="other">Колумбин песо</displayName>
+				<symbol draft="contributed">COP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CRC">
+				<displayName>Костарикан колон</displayName>
+				<displayName count="one">Костарикан колон</displayName>
+				<displayName count="other">Костарикан колонш</displayName>
+				<symbol draft="contributed">CRC</symbol>
+				<symbol alt="narrow" draft="contributed">₡</symbol>
+			</currency>
+			<currency type="CUC">
+				<displayName>Кубан хийцалун песо</displayName>
+				<displayName count="one">Кубан хийцалун песо</displayName>
+				<displayName count="other">Кубан хийцалун песош</displayName>
+				<symbol draft="contributed">CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CUP">
+				<displayName>Кубан песо</displayName>
+				<displayName count="one">Кубан песо</displayName>
+				<displayName count="other">Кубан песош</displayName>
+				<symbol draft="contributed">CUP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CVE">
+				<displayName>Кабо-Верден эскудо</displayName>
+				<displayName count="one">Кабо-Верден эскудо</displayName>
+				<displayName count="other">Кабо-Верден эскудош</displayName>
+				<symbol draft="contributed">CVE</symbol>
+			</currency>
+			<currency type="CZK">
+				<displayName>Чехин крона</displayName>
+				<displayName count="one">Чехин крона</displayName>
+				<displayName count="other">Чехин кронаш</displayName>
+				<symbol draft="contributed">CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
+			</currency>
+			<currency type="DJF">
+				<displayName>Джибутин франк</displayName>
+				<displayName count="one">Джибутин франк</displayName>
+				<displayName count="other">Джибутин франкаш</displayName>
+				<symbol draft="contributed">DJF</symbol>
+			</currency>
+			<currency type="DKK">
+				<displayName>Данин крона</displayName>
+				<displayName count="one">Данин крона</displayName>
+				<displayName count="other">Данин кронаш</displayName>
+				<symbol draft="contributed">DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="DOP">
+				<displayName>Доминикан песо</displayName>
+				<displayName count="one">Доминикан песо</displayName>
+				<displayName count="other">Доминикан песош</displayName>
+				<symbol draft="contributed">DOP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="DZD">
+				<displayName>Алжиран динар</displayName>
+				<displayName count="one">Алжиран динар</displayName>
+				<displayName count="other">Алжиран динараш</displayName>
+				<symbol draft="contributed">DZD</symbol>
+			</currency>
+			<currency type="EGP">
+				<displayName>Мисаран фунт</displayName>
+				<displayName count="one">Мисаран фунт</displayName>
+				<displayName count="other">Мисаран фунташ</displayName>
+				<symbol draft="contributed">EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
+			</currency>
+			<currency type="ERN">
+				<displayName>Эритрейн накфа</displayName>
+				<displayName count="one">Эритрейн накфа</displayName>
+				<displayName count="other">Эритрейн накфаш</displayName>
+				<symbol draft="contributed">ERN</symbol>
+			</currency>
+			<currency type="ETB">
+				<displayName>Эфиопин быр</displayName>
+				<displayName count="one">Эфиопин быр</displayName>
+				<displayName count="other">Эфиопин быраш</displayName>
+				<symbol draft="contributed">ETB</symbol>
+			</currency>
+			<currency type="EUR">
+				<displayName>Евро</displayName>
+				<displayName count="one">евро</displayName>
+				<displayName count="other">Еврош</displayName>
+				<symbol draft="contributed">€</symbol>
+				<symbol alt="narrow" draft="contributed">€</symbol>
+			</currency>
+			<currency type="FJD">
+				<displayName>Фиджин доллар</displayName>
+				<displayName count="one">Фиджин доллар</displayName>
+				<displayName count="other">Фиджин долларш</displayName>
+				<symbol draft="contributed">FJD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="FKP">
+				<displayName>Фолклендан гӀайренийн фунт</displayName>
+				<displayName count="one">Фолклендан гӀайренийн фунт</displayName>
+				<displayName count="other">Фолклендан гӀайренийн фунташ</displayName>
+				<symbol draft="contributed">FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="GBP">
+				<displayName>Англин фунт</displayName>
+				<displayName count="one">Англин фунт</displayName>
+				<displayName count="other">Англин фунташ</displayName>
+				<symbol draft="contributed">£</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="GEL">
+				<displayName>Гуьржийчоьнан лари</displayName>
+				<displayName count="one">Гуьржийчоьнан лари</displayName>
+				<displayName count="other">Гуьржийчоьнан лариш</displayName>
+				<symbol draft="contributed">GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
+			</currency>
+			<currency type="GHS">
+				<displayName>Ганан седи</displayName>
+				<displayName count="one">Ганан седи</displayName>
+				<displayName count="other">Ганан седиш</displayName>
+				<symbol draft="contributed">GHS</symbol>
+			</currency>
+			<currency type="GIP">
+				<displayName>Гибралтаран фунт</displayName>
+				<displayName count="one">Гибралтаран фунт</displayName>
+				<displayName count="other">Гибралтаран фунташ</displayName>
+				<symbol draft="contributed">GIP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="GMD">
+				<displayName>Гамбин даласи</displayName>
+				<displayName count="one">Гамбин даласи</displayName>
+				<displayName count="other">Гамбин даласиш</displayName>
+				<symbol draft="contributed">GMD</symbol>
+			</currency>
+			<currency type="GNF">
+				<displayName>Гвинейн франк</displayName>
+				<displayName count="one">Гвинейн франк</displayName>
+				<displayName count="other">Гвинейн франкаш</displayName>
+				<symbol draft="contributed">GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
+			</currency>
+			<currency type="GTQ">
+				<displayName>Гватемалан кетсаль</displayName>
+				<displayName count="one">Гватемалан кетсаль</displayName>
+				<displayName count="other">Гватемалан кетсалш</displayName>
+				<symbol draft="contributed">GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
+			</currency>
+			<currency type="GYD">
+				<displayName>Гайанан доллар</displayName>
+				<displayName count="one">Гайанан доллар</displayName>
+				<displayName count="other">Гайанан долларш</displayName>
+				<symbol draft="contributed">GYD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="HKD">
+				<displayName>Гонконган доллар</displayName>
+				<displayName count="one">Гонконган доллар</displayName>
+				<displayName count="other">Гонконган долларш</displayName>
+				<symbol draft="contributed">HK$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="HNL">
+				<displayName>Гондурасан лемпира</displayName>
+				<displayName count="one">Гондурасан лемпира</displayName>
+				<displayName count="other">Гондурасан лемпираш</displayName>
+				<symbol draft="contributed">HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
+			</currency>
+			<currency type="HRK">
+				<displayName>Хорватин куна</displayName>
+				<displayName count="one">Хорватин куна</displayName>
+				<displayName count="other">Хорватин кунаш</displayName>
+				<symbol draft="contributed">HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
+			</currency>
+			<currency type="HTG">
+				<displayName>Гаитин гурд</displayName>
+				<displayName count="one">Гаитин гурд</displayName>
+				<displayName count="other">Гаитин гурдаш</displayName>
+				<symbol draft="contributed">HTG</symbol>
+			</currency>
+			<currency type="HUF">
+				<displayName>Венгрин форинт</displayName>
+				<displayName count="one">Венгрин форинт</displayName>
+				<displayName count="other">Венгрин форинташ</displayName>
+				<symbol draft="contributed">HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
+			</currency>
+			<currency type="IDR">
+				<displayName>Индонезин рупи</displayName>
+				<displayName count="one">Индонезин рупи</displayName>
+				<displayName count="other">Индонезин рупиш</displayName>
+				<symbol draft="contributed">IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
+			</currency>
+			<currency type="ILS">
+				<displayName>Израилан керла шекель</displayName>
+				<displayName count="one">Израилан керла шекель</displayName>
+				<displayName count="other">Израилан керла шекелш</displayName>
+				<symbol draft="contributed">₪</symbol>
+				<symbol alt="narrow" draft="contributed">₪</symbol>
+			</currency>
+			<currency type="INR">
+				<displayName>Индин рупи</displayName>
+				<displayName count="one">Индин рупи</displayName>
+				<displayName count="other">Индин рупиш</displayName>
+				<symbol draft="contributed">₹</symbol>
+				<symbol alt="narrow" draft="contributed">₹</symbol>
+			</currency>
+			<currency type="IQD">
+				<displayName>Ӏиракъан динар</displayName>
+				<displayName count="one">Ӏиракъан динар</displayName>
+				<displayName count="other">Ӏиракъан динарш</displayName>
+				<symbol draft="contributed">IQD</symbol>
+			</currency>
+			<currency type="IRR">
+				<displayName>ГӀажарийчоьнан риал</displayName>
+				<displayName count="one">ГӀажарийчоьнан риал</displayName>
+				<displayName count="other">ГӀажарийчоьнан риалш</displayName>
+				<symbol draft="contributed">IRR</symbol>
+			</currency>
+			<currency type="ISK">
+				<displayName>Исландин крона</displayName>
+				<displayName count="one">Исландин крона</displayName>
+				<displayName count="other">Исландин кронаш</displayName>
+				<symbol draft="contributed">ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="JMD">
+				<displayName>Ямайн доллар</displayName>
+				<displayName count="one">Ямайн доллар</displayName>
+				<displayName count="other">Ямайн долларш</displayName>
+				<symbol draft="contributed">JMD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="JOD">
+				<displayName>Урданан динар</displayName>
+				<displayName count="one">Урданан динар</displayName>
+				<displayName count="other">Урданан динарш</displayName>
+				<symbol draft="contributed">JOD</symbol>
+			</currency>
+			<currency type="JPY">
+				<displayName>Японин иена</displayName>
+				<displayName count="one">Японин иена</displayName>
+				<displayName count="other">Японин иенаш</displayName>
+				<symbol draft="contributed">JP¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
+			</currency>
+			<currency type="KES">
+				<displayName>Кенин шиллинг</displayName>
+				<displayName count="one">Кенин шиллинг</displayName>
+				<displayName count="other">Кенин шиллингаш</displayName>
+				<symbol draft="contributed">KES</symbol>
+			</currency>
+			<currency type="KGS">
+				<displayName>Киргизин сом</displayName>
+				<displayName count="one">Киргизин сом</displayName>
+				<displayName count="other">Киргизин соьмаш</displayName>
+				<symbol draft="contributed">KGS</symbol>
+			</currency>
+			<currency type="KHR">
+				<displayName>Камбоджан риель</displayName>
+				<displayName count="one">Камбоджан риель</displayName>
+				<displayName count="other">Камбоджан риелш</displayName>
+				<symbol draft="contributed">KHR</symbol>
+				<symbol alt="narrow" draft="contributed">៛</symbol>
+			</currency>
+			<currency type="KMF">
+				<displayName>Коморийн гӀайренийн франк</displayName>
+				<displayName count="one">Коморийн гӀайренийн франк</displayName>
+				<displayName count="other">Коморийн гӀайренийн франкаш</displayName>
+				<symbol draft="contributed">KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
+			</currency>
+			<currency type="KPW">
+				<displayName>Къилбаседа Корейн вона</displayName>
+				<displayName count="one">Къилбаседа Корейн вона</displayName>
+				<displayName count="other">Къилбаседа Корейн вонаш</displayName>
+				<symbol draft="contributed">KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
+			</currency>
+			<currency type="KRW">
+				<displayName>Къилба Корейн вона</displayName>
+				<displayName count="one">Къилба Корейн вона</displayName>
+				<displayName count="other">Къилба Корейн вонаш</displayName>
+				<symbol draft="contributed">₩</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
+			</currency>
+			<currency type="KWD">
+				<displayName>Кувейтан динар</displayName>
+				<displayName count="one">Кувейтан динар</displayName>
+				<displayName count="other">Кувейтан динарш</displayName>
+				<symbol draft="contributed">KWD</symbol>
+			</currency>
+			<currency type="KYD">
+				<displayName>Кайманийн гӀайренийн доллар</displayName>
+				<displayName count="one">Кайманийн гӀайренийн доллар</displayName>
+				<displayName count="other">Кайманийн гӀайренийн долларш</displayName>
+				<symbol draft="contributed">KYD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="KZT">
+				<displayName>Казахстанан тенге</displayName>
+				<displayName count="one">Казахстанан тенге</displayName>
+				<displayName count="other">Казахстанан тенгеш</displayName>
+				<symbol draft="contributed">KZT</symbol>
+				<symbol alt="narrow" draft="contributed">₸</symbol>
+			</currency>
+			<currency type="LAK">
+				<displayName>Лаосан кип</displayName>
+				<displayName count="one">Лаосан кип</displayName>
+				<displayName count="other">Лаосан кипаш</displayName>
+				<symbol draft="contributed">LAK</symbol>
+				<symbol alt="narrow" draft="contributed">₭</symbol>
+			</currency>
+			<currency type="LBP">
+				<displayName>Ливанан фунт</displayName>
+				<displayName count="one">Ливанан фунт</displayName>
+				<displayName count="other">Ливанан фунташ</displayName>
+				<symbol draft="contributed">LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
+			</currency>
+			<currency type="LKR">
+				<displayName>Шри-Ланкан рупи</displayName>
+				<displayName count="one">Шри-Ланкан рупи</displayName>
+				<displayName count="other">Шри-Ланкан рупиш</displayName>
+				<symbol draft="contributed">LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="LRD">
+				<displayName>Либерин доллар</displayName>
+				<displayName count="one">Либерин доллар</displayName>
+				<displayName count="other">Либерин долларш</displayName>
+				<symbol draft="contributed">LRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="LYD">
+				<displayName>Ливин динар</displayName>
+				<displayName count="one">Ливийский динар</displayName>
+				<displayName count="other">Ливийский динараш</displayName>
+				<symbol draft="contributed">LYD</symbol>
+			</currency>
+			<currency type="MAD">
+				<displayName>Мароккон дирхам</displayName>
+				<displayName count="one">Мароккон дирхам</displayName>
+				<displayName count="other">Мароккон дирхамаш</displayName>
+				<symbol draft="contributed">MAD</symbol>
+			</currency>
+			<currency type="MDL">
+				<displayName>Молдавин лей</displayName>
+				<displayName count="one">Молдавин лей</displayName>
+				<displayName count="other">Молдавин лейш</displayName>
+				<symbol draft="contributed">MDL</symbol>
+			</currency>
+			<currency type="MGA">
+				<displayName>Малагасийн ариари</displayName>
+				<displayName count="one">Малагасийн ариари</displayName>
+				<displayName count="other">Малагасийн ариариш</displayName>
+				<symbol draft="contributed">MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
+			</currency>
+			<currency type="MKD">
+				<displayName>Македонин динар</displayName>
+				<displayName count="one">Македонин динар</displayName>
+				<displayName count="other">Македонин динараш</displayName>
+				<symbol draft="contributed">MKD</symbol>
+			</currency>
+			<currency type="MMK">
+				<displayName>Мьянман кьят</displayName>
+				<displayName count="one">Мьянман кьят</displayName>
+				<displayName count="other">Мьянман кьяташ</displayName>
+				<symbol draft="contributed">MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
+			</currency>
+			<currency type="MNT">
+				<displayName>Монголин тугрик</displayName>
+				<displayName count="one">Монголин тугрик</displayName>
+				<displayName count="other">Монголин тугрикаш</displayName>
+				<symbol draft="contributed">MNT</symbol>
+				<symbol alt="narrow" draft="contributed">₮</symbol>
+			</currency>
+			<currency type="MOP">
+				<displayName>Макаон патака</displayName>
+				<displayName count="one">Макаон патака</displayName>
+				<displayName count="other">Макаон патакаш</displayName>
+				<symbol draft="contributed">MOP</symbol>
+			</currency>
+			<currency type="MRO">
+				<displayName>Мавританин уги</displayName>
+				<displayName count="one">Мавританин уги</displayName>
+				<displayName count="other">Мавританин угиш</displayName>
+				<symbol draft="contributed">MRO</symbol>
+			</currency>
+			<currency type="MUR">
+				<displayName>Маврикин рупи</displayName>
+				<displayName count="one">Маврикин рупи</displayName>
+				<displayName count="other">Маврикин рупиш</displayName>
+				<symbol draft="contributed">MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="MVR">
+				<displayName>Мальдивийн руфи</displayName>
+				<displayName count="one">Мальдивийн руфи</displayName>
+				<displayName count="other">Мальдивийн руфиш</displayName>
+				<symbol draft="contributed">MVR</symbol>
+			</currency>
+			<currency type="MWK">
+				<displayName>Малавин квача</displayName>
+				<displayName count="one">Малавин квача</displayName>
+				<displayName count="other">Малавин квачаш</displayName>
+				<symbol draft="contributed">MWK</symbol>
+			</currency>
+			<currency type="MXN">
+				<displayName>Мексикан песо</displayName>
+				<displayName count="one">Мексикан песо</displayName>
+				<displayName count="other">Мексикан песош</displayName>
+				<symbol draft="contributed">MX$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="MYR">
+				<displayName>Малайзин ринггит</displayName>
+				<displayName count="one">Малайзин ринггит</displayName>
+				<displayName count="other">Малайзин ринггиташ</displayName>
+				<symbol draft="contributed">MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
+			</currency>
+			<currency type="MZN">
+				<displayName>Мозамбикан метикал</displayName>
+				<displayName count="one">Мозамбикан метикал</displayName>
+				<displayName count="other">Мозамбикан метикалш</displayName>
+				<symbol draft="contributed">MZN</symbol>
+			</currency>
+			<currency type="NAD">
+				<displayName>Намибин доллар</displayName>
+				<displayName count="one">Намибин доллар</displayName>
+				<displayName count="other">Намибин долларш</displayName>
+				<symbol draft="contributed">NAD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="NGN">
+				<displayName>Нигерин найра</displayName>
+				<displayName count="one">Нигерин найра</displayName>
+				<displayName count="other">Нигерин найраш</displayName>
+				<symbol draft="contributed">NGN</symbol>
+				<symbol alt="narrow" draft="contributed">₦</symbol>
+			</currency>
+			<currency type="NIO">
+				<displayName>Никарагуан кордоба</displayName>
+				<displayName count="one">Никарагуан кордоба</displayName>
+				<displayName count="other">Никарагуан кордобаш</displayName>
+				<symbol draft="contributed">NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
+			</currency>
+			<currency type="NOK">
+				<displayName>Норвегин крона</displayName>
+				<displayName count="one">Норвегин крона</displayName>
+				<displayName count="other">Норвегин кронаш</displayName>
+				<symbol draft="contributed">NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="NPR">
+				<displayName>Непалан рупи</displayName>
+				<displayName count="one">Непалан рупи</displayName>
+				<displayName count="other">Непалан рупиш</displayName>
+				<symbol draft="contributed">NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="NZD">
+				<displayName>Керла Зеландин доллар</displayName>
+				<displayName count="one">Керла Зеландин доллар</displayName>
+				<displayName count="other">Керла Зеландин долларш</displayName>
+				<symbol draft="contributed">NZ$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="OMR">
+				<displayName>Оманан риал</displayName>
+				<displayName count="one">Оманан риал</displayName>
+				<displayName count="other">Оманан риалш</displayName>
+				<symbol draft="contributed">OMR</symbol>
+			</currency>
+			<currency type="PAB">
+				<displayName>Панаман бальбоа</displayName>
+				<displayName count="one">Панаман бальбоа</displayName>
+				<displayName count="other">Панаман бальбоаш</displayName>
+				<symbol draft="contributed">PAB</symbol>
+			</currency>
+			<currency type="PEN">
+				<displayName>Перун керла соль</displayName>
+				<displayName count="one">Перун керла соль</displayName>
+				<displayName count="other">Перун керла солаш</displayName>
+				<symbol draft="contributed">PEN</symbol>
+			</currency>
+			<currency type="PGK">
+				<displayName>Папуа — Керла Гвинейн кина</displayName>
+				<displayName count="one">Папуа — Керла Гвинейн кина</displayName>
+				<displayName count="other">Папуа — Керла Гвинейн кинаш</displayName>
+				<symbol draft="contributed">PGK</symbol>
+			</currency>
+			<currency type="PHP">
+				<displayName>Филиппинийн песо</displayName>
+				<displayName count="one">Филиппинийн песо</displayName>
+				<displayName count="other">Филиппинийн песош</displayName>
+				<symbol draft="contributed">PHP</symbol>
+				<symbol alt="narrow" draft="contributed">₱</symbol>
+			</currency>
+			<currency type="PKR">
+				<displayName>Пакистанан рупи</displayName>
+				<displayName count="one">Пакистанан рупи</displayName>
+				<displayName count="other">Пакистанан рупиш</displayName>
+				<symbol draft="contributed">PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="PLN">
+				<displayName>Польшан злотый</displayName>
+				<displayName count="one">Польшан злотый</displayName>
+				<displayName count="other">Польшан злотыйш</displayName>
+				<symbol draft="contributed">PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
+			</currency>
+			<currency type="PYG">
+				<displayName>Парагвайн гуарани</displayName>
+				<displayName count="one">Парагвайн гуарани</displayName>
+				<displayName count="other">Парагвайн гуараниш</displayName>
+				<symbol draft="contributed">PYG</symbol>
+				<symbol alt="narrow" draft="contributed">₲</symbol>
+			</currency>
+			<currency type="QAR">
+				<displayName>Катаран риал</displayName>
+				<displayName count="one">Катаран риал</displayName>
+				<displayName count="other">Катаран риалш</displayName>
+				<symbol draft="contributed">QAR</symbol>
+			</currency>
+			<currency type="RON">
+				<displayName>Румынин лей</displayName>
+				<displayName count="one">Румынин лей</displayName>
+				<displayName count="other">Румынин лейш</displayName>
+				<symbol draft="contributed">RON</symbol>
+			</currency>
+			<currency type="RSD">
+				<displayName>Сербин динар</displayName>
+				<displayName count="one">Сербин динар</displayName>
+				<displayName count="other">Сербин динараш</displayName>
+				<symbol draft="contributed">RSD</symbol>
+			</currency>
+			<currency type="RUB">
+				<displayName>Российн сом</displayName>
+				<displayName count="one">Российн сом</displayName>
+				<displayName count="other">Российн соьмаш</displayName>
+				<symbol>₽</symbol>
+			</currency>
+			<currency type="RWF">
+				<displayName>Руандан франк</displayName>
+				<displayName count="one">Руандан франк</displayName>
+				<displayName count="other">Руандан франкаш</displayName>
+				<symbol draft="contributed">RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
+			</currency>
+			<currency type="SAR">
+				<displayName>СаӀудийн Аравин риал</displayName>
+				<displayName count="one">СаӀудийн Аравин риал</displayName>
+				<displayName count="other">СаӀудийн Аравин риалш</displayName>
+				<symbol draft="contributed">SAR</symbol>
+			</currency>
+			<currency type="SBD">
+				<displayName>Соломонан гӀайренийн доллар</displayName>
+				<displayName count="one">Соломонан гӀайренийн доллар</displayName>
+				<displayName count="other">Соломонан гӀайренийн долларш</displayName>
+				<symbol draft="contributed">SBD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="SCR">
+				<displayName>Сейшелан рупи</displayName>
+				<displayName count="one">Сейшелан рупи</displayName>
+				<displayName count="other">Сейшелан рупиш</displayName>
+				<symbol draft="contributed">SCR</symbol>
+			</currency>
+			<currency type="SDG">
+				<displayName>Суданан фунт</displayName>
+				<displayName count="one">Суданан фунт</displayName>
+				<displayName count="other">Суданан фунташ</displayName>
+				<symbol draft="contributed">SDG</symbol>
+			</currency>
+			<currency type="SEK">
+				<displayName>Швецин крона</displayName>
+				<displayName count="one">Швецин крона</displayName>
+				<displayName count="other">Швецин кронаш</displayName>
+				<symbol draft="contributed">SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="SGD">
+				<displayName>Сингапуран доллар</displayName>
+				<displayName count="one">Сингапуран доллар</displayName>
+				<displayName count="other">Сингапуран долларш</displayName>
+				<symbol draft="contributed">SGD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="SHP">
+				<displayName>Сийлахьчу Еленин гӀайрен фунт</displayName>
+				<displayName count="one">Сийлахьчу Еленин гӀайрен фунт</displayName>
+				<displayName count="other">Сийлахьчу Еленин гӀайрен фунташ</displayName>
+				<symbol draft="contributed">SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="SLL">
+				<displayName>Леоне</displayName>
+				<displayName count="one">леоне</displayName>
+				<displayName count="other">леонеш</displayName>
+				<symbol draft="contributed">SLL</symbol>
+			</currency>
+			<currency type="SOS">
+				<displayName>Сомалин шиллинг</displayName>
+				<displayName count="one">Сомалин шиллинг</displayName>
+				<displayName count="other">Сомалин шиллингаш</displayName>
+				<symbol draft="contributed">SOS</symbol>
+			</currency>
+			<currency type="SRD">
+				<displayName>Суринаман доллар</displayName>
+				<displayName count="one">Суринаман доллар</displayName>
+				<displayName count="other">Суринаман долларш</displayName>
+				<symbol draft="contributed">SRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="SSP">
+				<displayName>Къилба Суданан фунт</displayName>
+				<displayName count="one">Къилба Суданан фунт</displayName>
+				<displayName count="other">Къилба Суданан фунташ</displayName>
+				<symbol draft="contributed">SSP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="STD">
+				<displayName>Сан-Томен а, Принсипин а добра</displayName>
+				<displayName count="one">Сан-Томен а, Принсипин а добра</displayName>
+				<displayName count="other">Сан-Томен а, Принсипин а добраш</displayName>
+				<symbol draft="contributed">STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
+			</currency>
+			<currency type="SYP">
+				<displayName>Шеман фунт</displayName>
+				<displayName count="one">Шеман фунт</displayName>
+				<displayName count="other">Шеман фунташ</displayName>
+				<symbol draft="contributed">SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="SZL">
+				<displayName>Свазилендан лилангени</displayName>
+				<displayName count="one">Свазилендан лилангени</displayName>
+				<displayName count="other">Свазилендан лилангениш</displayName>
+				<symbol draft="contributed">SZL</symbol>
+			</currency>
+			<currency type="THB">
+				<displayName>Таиландан бат</displayName>
+				<displayName count="one">Таиландан бат</displayName>
+				<displayName count="other">Таиландан баташ</displayName>
+				<symbol draft="contributed">THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
+			</currency>
+			<currency type="TJS">
+				<displayName>Таджикистанан сомони</displayName>
+				<displayName count="one">Таджикистанан сомони</displayName>
+				<displayName count="other">Таджикистанан сомониш</displayName>
+				<symbol draft="contributed">TJS</symbol>
+			</currency>
+			<currency type="TMT">
+				<displayName>Туркменин керла манат</displayName>
+				<displayName count="one">Туркменин керла манат</displayName>
+				<displayName count="other">Туркменин керла манаташ</displayName>
+				<symbol draft="contributed">TMT</symbol>
+			</currency>
+			<currency type="TND">
+				<displayName>Тунисан динар</displayName>
+				<displayName count="one">Тунисан динар</displayName>
+				<displayName count="other">Тунисан динараш</displayName>
+				<symbol draft="contributed">TND</symbol>
+			</currency>
+			<currency type="TOP">
+				<displayName>Тонганан паанга</displayName>
+				<displayName count="one">Тонганан паанга</displayName>
+				<displayName count="other">Тонганан паангаш</displayName>
+				<symbol draft="contributed">TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
+			</currency>
+			<currency type="TRY">
+				<displayName>Туркойчоьнан лира</displayName>
+				<displayName count="one">Туркойчоьнан керла лира</displayName>
+				<displayName count="other">Туркойчоьнан лираш</displayName>
+				<symbol draft="contributed">TRY</symbol>
+				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
+			</currency>
+			<currency type="TTD">
+				<displayName>Тринидадан а, Тобагон а доллар</displayName>
+				<displayName count="one">Тринидадан а, Тобагон а доллар</displayName>
+				<displayName count="other">Тринидадан а, Тобагон а долларш</displayName>
+				<symbol draft="contributed">TTD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="TWD">
+				<displayName>Тайванан керла доллар</displayName>
+				<displayName count="one">Тайванан керла доллар</displayName>
+				<displayName count="other">Тайванан керла долларш</displayName>
+				<symbol draft="contributed">NT$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="TZS">
+				<displayName>Танзанин шиллинг</displayName>
+				<displayName count="one">Танзанин шиллинг</displayName>
+				<displayName count="other">Танзанин шиллингаш</displayName>
+				<symbol draft="contributed">TZS</symbol>
+			</currency>
+			<currency type="UAH">
+				<displayName>Украинан гривна</displayName>
+				<displayName count="one">Украинан гривна</displayName>
+				<displayName count="other">Украинан гривнаш</displayName>
+				<symbol draft="contributed">UAH</symbol>
+				<symbol alt="narrow" draft="contributed">₴</symbol>
+			</currency>
+			<currency type="UGX">
+				<displayName>Угандан шиллинг</displayName>
+				<displayName count="one">Угандан шиллинг</displayName>
+				<displayName count="other">Угандан шиллингаш</displayName>
+				<symbol draft="contributed">UGX</symbol>
+			</currency>
+			<currency type="USD">
+				<displayName>АЦШн доллар</displayName>
+				<displayName count="one">АЦШн доллар</displayName>
+				<displayName count="other">АЦШн долларш</displayName>
+				<symbol draft="contributed">US$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="UYU">
+				<displayName>Уругвайн песо</displayName>
+				<displayName count="one">Уругвайн песо</displayName>
+				<displayName count="other">Уругвайн песош</displayName>
+				<symbol draft="contributed">UYU</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="UZS">
+				<displayName>Узбекистанан сум</displayName>
+				<displayName count="one">Узбекистанан сум</displayName>
+				<displayName count="other">Узбекистанан сумаш</displayName>
+				<symbol draft="contributed">UZS</symbol>
+			</currency>
+			<currency type="VEF">
+				<displayName>Венесуэлан боливар</displayName>
+				<displayName count="one">Венесуэлан боливар</displayName>
+				<displayName count="other">Венесуэлан боливарш</displayName>
+				<symbol draft="contributed">VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
+			</currency>
+			<currency type="VND">
+				<displayName>Вьетнаман донг</displayName>
+				<displayName count="one">Вьетнаман донг</displayName>
+				<displayName count="other">Вьетнаман донгаш</displayName>
+				<symbol draft="contributed">₫</symbol>
+				<symbol alt="narrow" draft="contributed">₫</symbol>
+			</currency>
+			<currency type="VUV">
+				<displayName>Вануатун вату</displayName>
+				<displayName count="one">Вануатун вату</displayName>
+				<displayName count="other">Вануатун ватуш</displayName>
+				<symbol draft="contributed">VUV</symbol>
+			</currency>
+			<currency type="WST">
+				<displayName>Самоанан тала</displayName>
+				<displayName count="one">Самоанан тала</displayName>
+				<displayName count="other">Самоанан талаш</displayName>
+				<symbol draft="contributed">WST</symbol>
+			</currency>
+			<currency type="XAF">
+				<displayName>Юккъерчу Африкан КФА франк</displayName>
+				<displayName count="one">Юккъерчу Африкан КФА франк</displayName>
+				<displayName count="other">Юккъерчу Африкан КФА франкаш</displayName>
+				<symbol draft="contributed">FCFA</symbol>
+			</currency>
+			<currency type="XCD">
+				<displayName>Малхбален Карибийн доллар</displayName>
+				<displayName count="one">Малхбален Карибийн доллар</displayName>
+				<displayName count="other">Малхбален Карибийн долларш</displayName>
+				<symbol draft="contributed">EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="XOF">
+				<displayName>Малхбузен Африкан КФА франк</displayName>
+				<displayName count="one">Малхбузен Африкан КФА франк</displayName>
+				<displayName count="other">Малхбузен Африкан КФА франк</displayName>
+				<symbol draft="contributed">CFA</symbol>
+			</currency>
+			<currency type="XPF">
+				<displayName>Французийн Тийна океанан франк</displayName>
+				<displayName count="one">Французийн Тийна океанан франк</displayName>
+				<displayName count="other">Французийн Тийна океанан франк</displayName>
+				<symbol draft="contributed">CFPF</symbol>
+			</currency>
+			<currency type="XXX">
+				<displayName>девзаш доцу я лелаш доцу ахча</displayName>
+				<displayName count="one">девзаш доцу я лелаш доцу ахча</displayName>
+				<displayName count="other">девзаш доцу я лелаш доцу ахча</displayName>
+			</currency>
+			<currency type="YER">
+				<displayName>Йеменан риал</displayName>
+				<displayName count="one">Йеменан риал</displayName>
+				<displayName count="other">Йеменан риалш</displayName>
+				<symbol draft="contributed">YER</symbol>
+			</currency>
+			<currency type="ZAR">
+				<displayName>Къилба-Африкин рэнд</displayName>
+				<displayName count="one">Къилба-Африкин рэнд</displayName>
+				<displayName count="other">Къилба-Африкин рэндаш</displayName>
+				<symbol draft="contributed">ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
+			</currency>
+			<currency type="ZMW">
+				<displayName>Замбин квача</displayName>
+				<displayName count="one">Замбин квача</displayName>
+				<displayName count="other">Замбин квачаш</displayName>
+				<symbol draft="contributed">ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
+			</currency>
+		</currencies>
+		<miscPatterns numberSystem="latn">
+			<pattern type="range">{0}–{1}</pattern>
+		</miscPatterns>
+	</numbers>
+	<units>
+		<unitLength type="long">
+			<unit type="duration-century">
+				<displayName>c</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>шераш</displayName>
+				<unitPattern count="one">{0} шо</unitPattern>
+				<unitPattern count="other">{0} шо</unitPattern>
+				<perUnitPattern>{0} шарахь</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>беттанаш</displayName>
+				<unitPattern count="one">{0} бутт</unitPattern>
+				<unitPattern count="other">{0} бутт</unitPattern>
+				<perUnitPattern>{0} баттахь</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>кӀиранаш</displayName>
+				<unitPattern count="one">{0} кӀира</unitPattern>
+				<unitPattern count="other">{0} кӀира</unitPattern>
+				<perUnitPattern>{0} кӀиранахь</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>денош</displayName>
+				<unitPattern count="one">{0} де</unitPattern>
+				<unitPattern count="other">{0} де</unitPattern>
+				<perUnitPattern>{0} дийнахь</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>сахьташ</displayName>
+				<unitPattern count="one">{0} сахьт</unitPattern>
+				<unitPattern count="other">{0} сахьт</unitPattern>
+				<perUnitPattern>{0} сахьтехь</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>миноташ</displayName>
+				<unitPattern count="one">{0} минот</unitPattern>
+				<unitPattern count="other">{0} минот</unitPattern>
+				<perUnitPattern>{0} минотехь</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>секундаш</displayName>
+				<unitPattern count="one">{0} секунд</unitPattern>
+				<unitPattern count="other">{0} секунд</unitPattern>
+				<perUnitPattern>{0} секундехь</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>миллисекундаш</displayName>
+				<unitPattern count="one">{0} миллисекунд</unitPattern>
+				<unitPattern count="other">{0} миллисекунд</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>микросекундаш</displayName>
+				<unitPattern count="one">{0} микросекунд</unitPattern>
+				<unitPattern count="other">{0} микросекунд</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>наносекундаш</displayName>
+				<unitPattern count="one">{0} наносекунд</unitPattern>
+				<unitPattern count="other">{0} наносекунд</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>километраш</displayName>
+				<unitPattern count="one">{0} километр</unitPattern>
+				<unitPattern count="other">{0} километр</unitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>дециметраш</displayName>
+				<unitPattern count="one">{0} дециметр</unitPattern>
+				<unitPattern count="other">{0} дециметр</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>сантиметраш</displayName>
+				<unitPattern count="one">{0} сантиметр</unitPattern>
+				<unitPattern count="other">{0} сантиметр</unitPattern>
+				<perUnitPattern>{0} сантиметрехь</perUnitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>футаш</displayName>
+				<unitPattern count="one">{0} фут</unitPattern>
+				<unitPattern count="other">{0} фут</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>дюймаш</displayName>
+				<unitPattern count="one">{0} дюйм</unitPattern>
+				<unitPattern count="other">{0} дюйм</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>астрономин дакъош</displayName>
+				<unitPattern count="one">{0} астрономин дакъа</unitPattern>
+				<unitPattern count="other">{0} астрономин дакъа</unitPattern>
+			</unit>
+		</unitLength>
+		<unitLength type="short">
+			<unit type="duration-century">
+				<displayName>c</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ш.</displayName>
+				<unitPattern count="one">{0} ш.</unitPattern>
+				<unitPattern count="other">{0} ш.</unitPattern>
+				<perUnitPattern>{0} ш.</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>бут</displayName>
+				<unitPattern count="one">{0} бут.</unitPattern>
+				<unitPattern count="other">{0} бут.</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>кӀир</displayName>
+				<unitPattern count="one">{0} кӀир.</unitPattern>
+				<unitPattern count="other">{0} кӀир.</unitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>денош</displayName>
+				<unitPattern count="one">д.</unitPattern>
+				<unitPattern count="other">{0} д.</unitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>сахь</displayName>
+				<unitPattern count="one">{0} сахь.</unitPattern>
+				<unitPattern count="other">{0} сахь.</unitPattern>
+				<perUnitPattern>{0} сахь.</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>мин</displayName>
+				<unitPattern count="one">{0} мин</unitPattern>
+				<unitPattern count="other">{0} мин</unitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>сек</displayName>
+				<unitPattern count="one">{0} сек</unitPattern>
+				<unitPattern count="other">{0} сек</unitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>мс</displayName>
+				<unitPattern count="one">{0} мс</unitPattern>
+				<unitPattern count="other">{0} мс</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>мкс</displayName>
+				<unitPattern count="one">{0} мкс</unitPattern>
+				<unitPattern count="other">{0} мкс</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>нс</displayName>
+				<unitPattern count="one">{0} нс</unitPattern>
+				<unitPattern count="other">{0} нс</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>км</displayName>
+				<unitPattern count="one">{0} км</unitPattern>
+				<unitPattern count="other">{0} км</unitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>дм</displayName>
+				<unitPattern count="one">{0} дм</unitPattern>
+				<unitPattern count="other">{0} дм</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>см</displayName>
+				<unitPattern count="one">{0} см</unitPattern>
+				<unitPattern count="other">{0} см</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>футаш</displayName>
+				<unitPattern count="one">{0} фут</unitPattern>
+				<unitPattern count="other">{0} фут</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>дюйм</displayName>
+				<unitPattern count="one">{0} дюйм.</unitPattern>
+				<unitPattern count="other">{0} дюйм.</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>а. д.</displayName>
+				<unitPattern count="one">{0} а. д.</unitPattern>
+				<unitPattern count="other">{0} а. д.</unitPattern>
+			</unit>
+		</unitLength>
+		<unitLength type="narrow">
+			<unit type="duration-year">
+				<displayName>ш.</displayName>
+				<unitPattern count="one">{0} ш.</unitPattern>
+				<unitPattern count="other">{0} ш.</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>бут</displayName>
+				<unitPattern count="one">{0} б.</unitPattern>
+				<unitPattern count="other">{0} б.</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>кӀир</displayName>
+				<unitPattern count="one">{0} кӀ.</unitPattern>
+				<unitPattern count="other">{0} кӀ.</unitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>д.</displayName>
+				<unitPattern count="one">{0} д.</unitPattern>
+				<unitPattern count="other">{0} д.</unitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>сахь</displayName>
+				<unitPattern count="one">{0} сахь.</unitPattern>
+				<unitPattern count="other">{0} сахь.</unitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>мин</displayName>
+				<unitPattern count="one">{0} мин</unitPattern>
+				<unitPattern count="other">{0} мин</unitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>с</displayName>
+				<unitPattern count="one">{0} с</unitPattern>
+				<unitPattern count="other">{0} с</unitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>мс</displayName>
+				<unitPattern count="one">{0} мс</unitPattern>
+				<unitPattern count="other">{0} мс</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>км</displayName>
+				<unitPattern count="one">{0} км</unitPattern>
+				<unitPattern count="other">{0} км</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>см</displayName>
+				<unitPattern count="one">{0} см</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+			</unit>
+		</unitLength>
+		<durationUnit type="hm">
+			<durationUnitPattern>h:mm</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="hms">
+			<durationUnitPattern>h:mm:ss</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="ms">
+			<durationUnitPattern>m:ss</durationUnitPattern>
+		</durationUnit>
+	</units>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ru_RU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ce_RU.xml
similarity index 71%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ru_RU.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ce_RU.xml
index f5840bf6665..adbb2ac7dcd 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ru_RU.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ce_RU.xml
@@ -6,9 +6,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="ru"/>
+		<version number="$Revision: 11914 $"/>
+		<language type="ce"/>
 		<territory type="RU"/>
 	</identity>
 </ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/cgg.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cgg.xml
similarity index 92%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/cgg.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cgg.xml
index 057fa934e37..c7d232b976b 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/cgg.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cgg.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12128 $"/>
 		<language type="cgg"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angwira</territory>
 			<territory type="AL">Arubania</territory>
 			<territory type="AM">Arimeniya</territory>
-			<territory type="AN">Antiri za Hoorandi</territory>
 			<territory type="AO">Angora</territory>
 			<territory type="AR">Arigentina</territory>
 			<territory type="AS">Samowa ya Ameerika</territory>
@@ -480,22 +478,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -571,6 +569,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/cgg_UG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cgg_UG.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/cgg_UG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cgg_UG.xml
index 05885384bd3..879d4ab9e38 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/cgg_UG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cgg_UG.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="cgg"/>
 		<territory type="UG"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/chr.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/chr.xml
similarity index 89%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/chr.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/chr.xml
index 4a26ae96a5b..ae45c3cdd01 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/chr.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/chr.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="chr"/>
 	</identity>
 	<localeDisplayNames>
@@ -57,7 +56,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AT">ᎠᏍᏟᏯ</territory>
 			<territory type="AU">ᎡᎳᏗᏜ</territory>
 			<territory type="AW">ᎠᎷᏆ</territory>
-			<territory type="AX">ᎣᎴᏅᏓ ᏚᎦᏚᏛ</territory>
+			<territory type="AX">ᎣᎴᏅᏓ ᏚᎦᏚᏛᎢ</territory>
 			<territory type="AZ">ᎠᏏᎵᏆᏌᏂ</territory>
 			<territory type="BA">ᏉᏏᏂᎠ ᎠᎴ ᎲᏤᎪᏫ</territory>
 			<territory type="BB">ᏆᏇᏙᏍ</territory>
@@ -75,7 +74,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BR">ᏆᏏᎵᎢ</territory>
 			<territory type="BS">ᎾᏍᎩ ᏆᎭᎹᏍ</territory>
 			<territory type="BT">ᏊᏔᏂ</territory>
-			<territory type="BV">ᏊᏪ ᎤᎦᏚᏛ</territory>
+			<territory type="BV">ᏊᏪ ᎤᎦᏚᏛᎢ</territory>
 			<territory type="BW">ᏆᏣᏩᎾ</territory>
 			<territory type="BY">ᏇᎳᎷᏍ</territory>
 			<territory type="BZ">ᏇᎵᏍ</territory>
@@ -95,7 +94,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CU">ᎫᏆ</territory>
 			<territory type="CV">ᎢᎬᎾᏕᎾ ᎢᏤᏳᏍᏗ</territory>
 			<territory type="CW">ᏂᎦᏓ ᎤᏂᎲ ᎾᎿ ᎫᎳᎨᎣ</territory>
-			<territory type="CX">ᏓᏂᏍᏓᏲᎯᎲ ᎤᎦᏚᏛ</territory>
+			<territory type="CX">ᏓᏂᏍᏓᏲᎯᎲ ᎤᎦᏚᏛᎢ</territory>
 			<territory type="CY">ᏌᎢᏆᏍ</territory>
 			<territory type="CZ">ᏤᎩ ᏍᎦᏚᎩ</territory>
 			<territory type="DE">ᎠᏂᏛᏥ</territory>
@@ -111,10 +110,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ES">ᎠᏂᏍᏆᏂᏱ</territory>
 			<territory type="FI">ᏫᏂᎦᏙᎯ</territory>
 			<territory type="FJ">ᏫᏥ</territory>
-			<territory type="FK">ᏩᎩ ᎤᎦᏚᏛ</territory>
+			<territory type="FK">ᏩᎩ ᏚᎦᏚᏛᎢ</territory>
 			<territory type="FK" alt="variant">ᏩᎩ ᎤᎦᏚᏛ (ᎢᏍᎳᏍ ᎹᎸᏫᎾᏍ)</territory>
 			<territory type="FM">ᎠᏰᏟ ᏧᎾᎵᎪᎯ ᎾᎿ ᎹᎢᏉᏂᏏᏯ</territory>
-			<territory type="FO">ᏪᎶ ᏚᎦᏚᏛ</territory>
+			<territory type="FO">ᏪᎶ ᏚᎦᏚᏛᎢ</territory>
 			<territory type="FR">ᎦᎸᏥᏱ</territory>
 			<territory type="GA">ᎦᏉᏂ</territory>
 			<territory type="GB">ᎩᎵᏏᏲ</territory>
@@ -136,14 +135,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GW">ᎫᏇ-ᏈᏌᎤᏫ</territory>
 			<territory type="GY">ᎦᏯᎾ</territory>
 			<territory type="HK">ᎰᏂᎩ ᎪᏂᎩ</territory>
-			<territory type="HM">ᎲᏗ ᎤᎦᏚᏛ ᎠᎴ ᎺᎩᏓᎾᎵᏗ ᏚᎦᏚᏛ</territory>
+			<territory type="HM">ᎲᏗ ᎤᎦᏚᏛᎢ ᎠᎴ ᎺᎩᏓᎾᎵᏗ ᏚᎦᏚᏛᎢ</territory>
 			<territory type="HR">ᎧᎶᎡᏏᎠ</territory>
 			<territory type="HT">ᎮᎢᏘ</territory>
 			<territory type="HU">ᎲᏂᎦᎵ</territory>
 			<territory type="ID">ᎢᏂᏙᏂᏍᏯ</territory>
 			<territory type="IE">ᎠᎢᎴᏂᏗ</territory>
 			<territory type="IL">ᎢᏏᎵᏱ</territory>
-			<territory type="IM">ᎤᏍᏗ ᎤᎦᏚᏛ ᎾᎿ ᎠᏍᎦᏯ</territory>
+			<territory type="IM">ᎤᏍᏗ ᎤᎦᏚᏛᎢ ᎾᎿ ᎠᏍᎦᏯ</territory>
 			<territory type="IN">ᎢᏅᏗᎾ</territory>
 			<territory type="IO">ᏈᏗᏏ ᏴᏫᏯ ᎠᎺᏉ ᎢᎬᎾᏕᏅ</territory>
 			<territory type="IQ">ᎢᎳᎩ</territory>
@@ -201,7 +200,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="MZ">ᎼᏎᎻᏇᎩ</territory>
 			<territory type="NA">ᎾᎻᏈᎢᏯ</territory>
 			<territory type="NC">ᎢᏤ ᎧᎵᏙᏂᎠᏂ</territory>
-			<territory type="NF">ᏃᎵᏬᎵᎩ ᎤᎦᏚᏛ</territory>
+			<territory type="NF">ᏃᎵᏬᎵᎩ ᎤᎦᏚᏛᎢ</territory>
 			<territory type="NG">ᏂᏥᎵᏯ</territory>
 			<territory type="NI">ᏂᎧᎳᏆ</territory>
 			<territory type="NL">ᏁᏛᎳᏂ</territory>
@@ -231,7 +230,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="RU">ᏲᏂᎢ</territory>
 			<territory type="RW">ᎶᏩᏂᏓ</territory>
 			<territory type="SA">ᏌᎤᏗ ᎡᎴᏈᎠ</territory>
-			<territory type="SB">ᏐᎶᎹᏂ ᏚᎦᏚᏛ</territory>
+			<territory type="SB">ᏐᎶᎹᏂ ᏚᎦᏚᏛᎢ</territory>
 			<territory type="SC">ᏏᎡᏥᎵᏍ</territory>
 			<territory type="SD">ᏑᏕᏂ</territory>
 			<territory type="SE">ᏍᏫᏕᏂ</territory>
@@ -248,7 +247,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="currency">ᎠᏕᎳ</key>
 		</keys>
 		<types>
-			<type type="gregorian" key="calendar">ᏅᏙ ᏗᏎᏗ</type>
+			<type key="calendar" type="gregorian">ᏅᏙ ᏗᏎᏗ</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">ᎺᏘᎩ</measurementSystemName>
@@ -256,7 +255,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</measurementSystemNames>
 	</localeDisplayNames>
 	<characters>
-		<exemplarCharacters>[Ꭰ Ꭱ Ꭲ Ꭳ Ꭴ Ꭵ Ꭶ Ꭷ Ꭸ Ꭹ Ꭺ Ꭻ Ꭼ Ꭽ Ꭾ Ꭿ Ꮀ Ꮁ Ꮂ Ꮃ Ꮄ Ꮅ Ꮆ Ꮇ Ꮈ Ꮉ Ꮊ Ꮋ Ꮌ Ꮍ Ꮎ Ꮏ Ꮐ Ꮑ Ꮒ Ꮓ Ꮔ Ꮕ Ꮖ Ꮗ Ꮘ Ꮙ Ꮚ Ꮛ Ꮜ Ꮝ Ꮞ Ꮟ Ꮠ Ꮡ Ꮢ Ꮣ Ꮤ Ꮥ Ꮦ Ꮧ Ꮨ Ꮩ Ꮪ Ꮫ Ꮬ Ꮭ Ꮮ Ꮯ Ꮰ Ꮱ Ꮲ Ꮳ Ꮴ Ꮵ Ꮶ Ꮷ Ꮸ Ꮹ Ꮺ Ꮻ Ꮼ Ꮽ Ꮾ Ꮿ Ᏸ Ᏹ Ᏺ Ᏻ Ᏼ]</exemplarCharacters>
+		<exemplarCharacters>[ꭰ ꭱ ꭲ ꭳ ꭴ ꭵ ꭶ ꭷ ꭸ ꭹ ꭺ ꭻ ꭼ ꭽ ꭾ ꭿ ꮀ ꮁ ꮂ ꮃ ꮄ ꮅ ꮆ ꮇ ꮈ ꮉ ꮊ ꮋ ꮌ ꮍ ꮎ ꮏ ꮐ ꮑ ꮒ ꮓ ꮔ ꮕ ꮖ ꮗ ꮘ ꮙ ꮚ ꮛ ꮜ ꮝ ꮞ ꮟ ꮠ ꮡ ꮢ ꮣ ꮤ ꮥ ꮦ ꮧ ꮨ ꮩ ꮪ ꮫ ꮬ ꮭ ꮮ ꮯ ꮰ ꮱ ꮲ ꮳ ꮴ ꮵ ꮶ ꮷ ꮸ ꮹ ꮺ ꮻ ꮼ ꮽ ꮾ ꮿ ᏸ ᏹ ᏺ ᏻ ᏼ]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[]</exemplarCharacters>
 		<exemplarCharacters type="index">[Ꭰ Ꭶ Ꭽ Ꮃ Ꮉ Ꮎ Ꮖ Ꮜ Ꮣ Ꮬ Ꮳ Ꮹ Ꮿ]</exemplarCharacters>
 	</characters>
@@ -452,10 +451,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</days>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">ᏌᎾᎴ</dayPeriod>
+							<dayPeriod type="noon">ᎢᎦ</dayPeriod>
+							<dayPeriod type="pm">ᏒᎯᏱᎢᏗᏢ</dayPeriod>
+							<dayPeriod type="morning1">ᏌᎾᎴ</dayPeriod>
+							<dayPeriod type="afternoon1">ᏒᎯᏱᎢᏗᏢ</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">ᏌᎾᎴ</dayPeriod>
 							<dayPeriod type="noon">ᎢᎦ</dayPeriod>
 							<dayPeriod type="pm">ᏒᎯᏱᎢᏗᏢ</dayPeriod>
+							<dayPeriod type="morning1">ᏌᎾᎴ</dayPeriod>
+							<dayPeriod type="afternoon1">ᏒᎯᏱᎢᏗᏢ</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">ᏌᎾᎴ</dayPeriod>
+							<dayPeriod type="noon">ᎢᎦ</dayPeriod>
+							<dayPeriod type="pm">ᏒᎯᏱᎢᏗᏢ</dayPeriod>
+							<dayPeriod type="morning1">ᏌᎾᎴ</dayPeriod>
+							<dayPeriod type="afternoon1">ᏒᎯᏱᎢᏗᏢ</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -755,6 +772,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -796,6 +841,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</numbers>
 	<units>
 		<unitLength type="long">
+			<unit type="duration-year">
+				<displayName draft="provisional">ᏧᏕᏘᏴᏓ</displayName>
+				<unitPattern count="one">{0} ᏑᏕᏘᏴᏓ</unitPattern>
+				<unitPattern count="other">{0} ᏧᏕᏘᏴᏓ</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="provisional">ᎢᏯᏅᏓ</displayName>
+				<unitPattern count="one">{0} ᏏᏅᏓ</unitPattern>
+				<unitPattern count="other">{0} ᎢᏯᏅᏓ</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="provisional">ᎢᏳᎾᏙᏓᏆᏍᏗ</displayName>
+				<unitPattern count="one">{0} ᏒᎾᏙᏓᏆᏍᏗ</unitPattern>
+				<unitPattern count="other">{0} ᎢᏳᎾᏙᏓᏆᏍᏗ</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">ᏧᏒᎯᏓ</displayName>
 				<unitPattern count="one">{0} ᏏᎦ</unitPattern>
@@ -811,28 +871,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ᎢᏯᏔᏬᏍᏔᏅ</unitPattern>
 				<unitPattern count="other">{0} ᎢᏧᏔᏬᏍᏔᏅ</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">ᎢᏯᏅᏓ</displayName>
-				<unitPattern count="one">{0} ᏏᏅᏓ</unitPattern>
-				<unitPattern count="other">{0} ᎢᏯᏅᏓ</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="provisional">ᏗᏎᏢ</displayName>
 				<unitPattern count="one">{0} ᎠᏎᏢ</unitPattern>
 				<unitPattern count="other">{0} ᏗᏎᏢ</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">ᎢᏳᎾᏙᏓᏆᏍᏗ</displayName>
-				<unitPattern count="one">{0} ᏒᎾᏙᏓᏆᏍᏗ</unitPattern>
-				<unitPattern count="other">{0} ᎢᏳᎾᏙᏓᏆᏍᏗ</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">ᏧᏕᏘᏴᏓ</displayName>
-				<unitPattern count="one">{0} ᏑᏕᏘᏴᏓ</unitPattern>
-				<unitPattern count="other">{0} ᏧᏕᏘᏴᏓ</unitPattern>
-			</unit>
 		</unitLength>
 		<unitLength type="short">
+			<unit type="duration-year">
+				<displayName draft="provisional">ᏧᏕᏘᏴᏓ</displayName>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="provisional">ᎢᏯᏅᏓ</displayName>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="provisional">ᎢᏳᎾᏙᏓᏆᏍᏗ</displayName>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">ᏧᏒᎯᏓ</displayName>
 			</unit>
@@ -842,18 +896,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="duration-minute">
 				<displayName draft="provisional">ᎢᏧᏔᏬᏍᏔᏅ</displayName>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">ᎢᏯᏅᏓ</displayName>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="provisional">ᏗᏎᏢ</displayName>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">ᎢᏳᎾᏙᏓᏆᏍᏗ</displayName>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">ᏧᏕᏘᏴᏓ</displayName>
-			</unit>
 		</unitLength>
 		<unitLength type="narrow">
 			<unit type="temperature-celsius">
@@ -873,3 +918,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/chr_US.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/chr_US.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/chr_US.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/chr_US.xml
index 277ecc8738b..d1dbacb5788 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/chr_US.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/chr_US.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="chr"/>
 		<territory type="US"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ckb.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ckb.xml
new file mode 100644
index 00000000000..7d67cddb60e
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ckb.xml
@@ -0,0 +1,983 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2014 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12307 $"/>
+		<language type="ckb"/>
+	</identity>
+	<localeDisplayNames>
+		<languages>
+			<language type="af" draft="unconfirmed">ئه‌فریكای</language>
+			<language type="am">ئەمهەرینجی</language>
+			<language type="ar">عەرەبی</language>
+			<language type="as">ئاسامی</language>
+			<language type="az">ئازەربایجانی</language>
+			<language type="az" alt="short">ئازەربایجانی</language>
+			<language type="az_Arab">ئازەربایجانی باشووری</language>
+			<language type="be">بێلاڕووسی</language>
+			<language type="bg">بۆلگاری</language>
+			<language type="bn">بەنگلادێشی</language>
+			<language type="br">برێتونی</language>
+			<language type="bs">بۆسنی</language>
+			<language type="ca">كاتالۆنی</language>
+			<language type="ckb">کوردیی ناوەندی</language>
+			<language type="cs">چەكی</language>
+			<language type="cy">وێلزی</language>
+			<language type="da">دانماركی</language>
+			<language type="de">ئاڵمانی</language>
+			<language type="el">یۆنانی</language>
+			<language type="en">ئینگلیزی</language>
+			<language type="en_AU">ئینگلیزیی ئۆسترالیایی</language>
+			<language type="en_CA">ئینگلیزیی کەنەدایی</language>
+			<language type="en_GB">ئینگلیزیی بریتانیایی</language>
+			<language type="en_US">ئینگلیزیی ئەمەریکایی</language>
+			<language type="en_US" alt="short">ئینگلیزیی ئەمەریکایی</language>
+			<language type="eo">ئێسپیرانتۆ</language>
+			<language type="es">ئیسپانی</language>
+			<language type="et">ئیستۆنی</language>
+			<language type="eu">باسکی</language>
+			<language type="fa">فارسی</language>
+			<language type="fi">فینلەندی</language>
+			<language type="fil" draft="unconfirmed">تاگالۆگی</language>
+			<language type="fo" draft="unconfirmed">فه‌رئۆیی</language>
+			<language type="fr">فەرانسی</language>
+			<language type="fy">فریسیی ڕۆژاوا</language>
+			<language type="ga">ئیرلەندی</language>
+			<language type="gd" draft="unconfirmed">گه‌لیكی سكۆتله‌ندی</language>
+			<language type="gl">گالیسی</language>
+			<language type="gn">گووارانی</language>
+			<language type="gu">گوجاراتی</language>
+			<language type="he">هیبرێ</language>
+			<language type="hi">هیندی</language>
+			<language type="hr">كرواتی</language>
+			<language type="hu">هەنگاری (مەجاری)</language>
+			<language type="hy">ئەرمەنی</language>
+			<language type="ia" draft="unconfirmed">ئینترلینگوی</language>
+			<language type="id">ئێەندونیزی</language>
+			<language type="ie" draft="unconfirmed">ئینتەرلیگ</language>
+			<language type="is">ئیسلەندی</language>
+			<language type="it">ئیتالی</language>
+			<language type="ja">ژاپۆنی</language>
+			<language type="jv">جاڤانی</language>
+			<language type="ka">گۆرجستانی</language>
+			<language type="kk" draft="unconfirmed">کازاخی</language>
+			<language type="km" draft="unconfirmed">کامبۆجی (زوبان)</language>
+			<language type="kn" draft="unconfirmed">كه‌نه‌دایی</language>
+			<language type="ko" draft="unconfirmed">كۆری</language>
+			<language type="ku">کوردی</language>
+			<language type="ky">كرگیزی</language>
+			<language type="la">لاتینی</language>
+			<language type="ln">لينگالا</language>
+			<language type="lo">لاوی</language>
+			<language type="lt">لیتوانی</language>
+			<language type="lv">لێتۆنی</language>
+			<language type="mk">ماكێدۆنی</language>
+			<language type="ml" draft="unconfirmed">مالایلام</language>
+			<language type="mn">مەنگۆلی</language>
+			<language type="mr">ماراتی</language>
+			<language type="ms" draft="unconfirmed">مالیزی</language>
+			<language type="mt" draft="unconfirmed">ماڵتایی</language>
+			<language type="mzn">مازەندەرانی</language>
+			<language type="ne">نیپالی</language>
+			<language type="nl">هۆڵەندی</language>
+			<language type="no" draft="unconfirmed">نۆروێژی</language>
+			<language type="oc" draft="unconfirmed">ئۆسیتانی</language>
+			<language type="or">ئۆرییا</language>
+			<language type="pa">پەنجابی</language>
+			<language type="pl">پۆڵۆنیایی (لەهستانی)</language>
+			<language type="ps">پەشتوو</language>
+			<language type="pt">پورتوگالی</language>
+			<language type="pt_BR">پورتوگاڵی برازیل</language>
+			<language type="pt_PT">پورتوگاڵی (پورتوگاڵ)</language>
+			<language type="ro">ڕۆمانی</language>
+			<language type="ru">ڕووسی</language>
+			<language type="sa">سانسکريت</language>
+			<language type="sd">سيندی</language>
+			<language type="sdh">کوردیی باشووری</language>
+			<language type="sh" draft="unconfirmed">سێربۆكرواتی</language>
+			<language type="si">سینهەلی</language>
+			<language type="sk">سلۆڤاكی</language>
+			<language type="sl">سلۆڤێنی</language>
+			<language type="sma">سامی باشووری</language>
+			<language type="so">سۆمالی</language>
+			<language type="sq">ئاڵبانی</language>
+			<language type="sr">سەربی</language>
+			<language type="st" draft="unconfirmed">سێسۆتۆ</language>
+			<language type="su">سودانی</language>
+			<language type="sv">سویدی</language>
+			<language type="sw" draft="unconfirmed">سواهیلی</language>
+			<language type="ta">تامیلی</language>
+			<language type="te">تەلۆگوی</language>
+			<language type="tg">تاجیکی</language>
+			<language type="th">تایلەندی</language>
+			<language type="ti">تیگرینیای</language>
+			<language type="tk">تورکمانی</language>
+			<language type="tlh" draft="unconfirmed">كلینگۆن</language>
+			<language type="tr">تورکی</language>
+			<language type="tw" draft="unconfirmed">توی</language>
+			<language type="ug">ئويخووری</language>
+			<language type="uk">ئۆكراینی</language>
+			<language type="und">زمانی نەناسراو</language>
+			<language type="ur">ئۆردوو</language>
+			<language type="uz">ئوزبەکی</language>
+			<language type="vi">ڤیەتنامی</language>
+			<language type="xh" draft="unconfirmed">سسوسا</language>
+			<language type="yi" draft="unconfirmed">یوددی</language>
+			<language type="zh">چینی</language>
+			<language type="zu">زولو</language>
+		</languages>
+		<scripts>
+			<script type="Arab">عەرەبی</script>
+			<script type="Armn">ئەرمەنی</script>
+			<script type="Beng">بەنگالی</script>
+			<script type="Bopo">بۆپۆمۆفۆ</script>
+			<script type="Brai">برەیل</script>
+			<script type="Cyrl">سریلیک</script>
+			<script type="Deva">دەڤەناگەری</script>
+			<script type="Ethi">ئەتیۆپیک</script>
+			<script type="Geor">گورجی</script>
+			<script type="Grek">یۆنانی</script>
+			<script type="Gujr">گوجەراتی</script>
+			<script type="Guru">گورموکھی</script>
+			<script type="Hang">ھانگول</script>
+			<script type="Hani" draft="unconfirmed">ھان</script>
+			<script type="Hans" draft="unconfirmed">چینیی ئاسانکراو</script>
+			<script type="Hant" draft="unconfirmed">چینیی دێرین</script>
+			<script type="Hebr">هیبرێ</script>
+			<script type="Hira">ھیراگانا</script>
+			<script type="Jpan">ژاپۆنی</script>
+			<script type="Kana">کاتاکانا</script>
+			<script type="Khmr">خمێری</script>
+			<script type="Knda">کەنەدا</script>
+			<script type="Kore">کۆریایی</script>
+			<script type="Laoo">لاو</script>
+			<script type="Latn">لاتینی</script>
+			<script type="Mlym">مالایالام</script>
+			<script type="Mong">مەنگۆلی</script>
+			<script type="Mymr">میانمار</script>
+			<script type="Orya">ئۆریا</script>
+			<script type="Sinh">سینھالا</script>
+			<script type="Taml">تامیلی</script>
+			<script type="Telu">تیلوگو</script>
+			<script type="Thaa">تانە</script>
+			<script type="Thai">تایلەندی</script>
+			<script type="Zxxx" draft="unconfirmed">نەنووسراو</script>
+			<script type="Zzzz" draft="unconfirmed">خەتی نەناسراو</script>
+		</scripts>
+		<territories>
+			<territory type="002" draft="unconfirmed">ئەفریقا</territory>
+			<territory type="003" draft="unconfirmed">ئەمەریکای باکوور</territory>
+			<territory type="005" draft="unconfirmed">ئەمەریکای باشوور</territory>
+			<territory type="009" draft="unconfirmed">ئۆقیانووسیا</territory>
+			<territory type="011" draft="unconfirmed">ڕۆژاوای ئەفریقا</territory>
+			<territory type="013" draft="unconfirmed">ئەمریکای ناوەڕاست</territory>
+			<territory type="014" draft="unconfirmed">ڕۆژھەڵاتی ئەفریقا</territory>
+			<territory type="018" draft="unconfirmed">باشووری ئەفریقا</territory>
+			<territory type="019" draft="unconfirmed">ئەمریکاکان</territory>
+			<territory type="021" draft="unconfirmed">ئەمریکای باکوور</territory>
+			<territory type="030" draft="unconfirmed">ئاسیای ڕۆژھەڵات</territory>
+			<territory type="034" draft="unconfirmed">باشووری ئاسیا</territory>
+			<territory type="035" draft="unconfirmed">باشووری ڕۆژھەڵاتی ئاسیا</territory>
+			<territory type="039">ئەورووپای باشووری</territory>
+			<territory type="057" draft="unconfirmed">ناوچەی مایکرۆنیزیا</territory>
+			<territory type="142" draft="unconfirmed">ئاسیا</territory>
+			<territory type="143">ئاسیای ناوەندی</territory>
+			<territory type="145">ئاسیای ڕۆژاوا</territory>
+			<territory type="150" draft="unconfirmed">ئەورووپا</territory>
+			<territory type="151" draft="unconfirmed">ئەورووپای ڕۆژھەڵات</territory>
+			<territory type="154" draft="unconfirmed">ئەورووپای باکوور</territory>
+			<territory type="155" draft="unconfirmed">ڕۆژاوای ئەورووپا</territory>
+			<territory type="419" draft="unconfirmed">ئەمەریکای لاتین</territory>
+			<territory type="AD" draft="unconfirmed">ئاندۆرا</territory>
+			<territory type="AE" draft="unconfirmed">میرنشینە یەکگرتووە عەرەبییەکان</territory>
+			<territory type="AF" draft="unconfirmed">ئەفغانستان</territory>
+			<territory type="AG" draft="unconfirmed">ئانتیگوا و باربودا</territory>
+			<territory type="AL" draft="unconfirmed">ئەڵبانیا</territory>
+			<territory type="AM" draft="unconfirmed">ئەرمەنستان</territory>
+			<territory type="AO" draft="unconfirmed">ئەنگۆلا</territory>
+			<territory type="AQ" draft="unconfirmed">ئانتارکتیکا</territory>
+			<territory type="AR" draft="unconfirmed">ئارجەنتینا</territory>
+			<territory type="AS" draft="unconfirmed">ساموای ئەمەریکایی</territory>
+			<territory type="AT" draft="unconfirmed">نەمسا</territory>
+			<territory type="AU" draft="unconfirmed">ئۆسترالیا</territory>
+			<territory type="AW" draft="unconfirmed">ئارووبا</territory>
+			<territory type="AZ" draft="unconfirmed">ئازەربایجان</territory>
+			<territory type="BA" draft="unconfirmed">بۆسنیا و ھەرزەگۆڤینا</territory>
+			<territory type="BB" draft="unconfirmed">باربادۆس</territory>
+			<territory type="BD" draft="unconfirmed">بەنگلادیش</territory>
+			<territory type="BE" draft="unconfirmed">بەلژیک</territory>
+			<territory type="BF" draft="unconfirmed">بورکینافاسۆ</territory>
+			<territory type="BG" draft="unconfirmed">بولگاریا</territory>
+			<territory type="BH" draft="unconfirmed">بەحرەین</territory>
+			<territory type="BI" draft="unconfirmed">بوروندی</territory>
+			<territory type="BJ" draft="unconfirmed">بنین</territory>
+			<territory type="BN" draft="unconfirmed">بروونای</territory>
+			<territory type="BO" draft="unconfirmed">بۆلیڤیا</territory>
+			<territory type="BR" draft="unconfirmed">برازیل</territory>
+			<territory type="BS" draft="unconfirmed">بەھاما</territory>
+			<territory type="BT" draft="unconfirmed">بووتان</territory>
+			<territory type="BW" draft="unconfirmed">بۆتسوانا</territory>
+			<territory type="BY" draft="unconfirmed">بیلاڕووس</territory>
+			<territory type="BZ" draft="unconfirmed">بەلیز</territory>
+			<territory type="CA" draft="unconfirmed">کانەدا</territory>
+			<territory type="CD" draft="unconfirmed">کۆنگۆ کینشاسا</territory>
+			<territory type="CD" alt="variant" draft="unconfirmed">کۆماری دیموکراتیکی کۆنگۆ</territory>
+			<territory type="CF" draft="unconfirmed">کۆماری ئەفریقای ناوەڕاست</territory>
+			<territory type="CG" draft="unconfirmed">کۆنگۆ برازاڤیل</territory>
+			<territory type="CG" alt="variant" draft="unconfirmed">کۆماری کۆنگۆ</territory>
+			<territory type="CH" draft="unconfirmed">سویسرا</territory>
+			<territory type="CI" draft="unconfirmed">کۆتدیڤوار</territory>
+			<territory type="CL" draft="unconfirmed">شیلی</territory>
+			<territory type="CM" draft="unconfirmed">کامیروون</territory>
+			<territory type="CN" draft="unconfirmed">چین</territory>
+			<territory type="CO" draft="unconfirmed">کۆلۆمبیا</territory>
+			<territory type="CR" draft="unconfirmed">کۆستاریکا</territory>
+			<territory type="CU" draft="unconfirmed">کووبا</territory>
+			<territory type="CV" draft="unconfirmed">کەیپڤەرد</territory>
+			<territory type="CY" draft="unconfirmed">قیبرس</territory>
+			<territory type="CZ" draft="unconfirmed">کۆماری چیک</territory>
+			<territory type="DE" draft="unconfirmed">ئەڵمانیا</territory>
+			<territory type="DJ" draft="unconfirmed">جیبووتی</territory>
+			<territory type="DK" draft="unconfirmed">دانمارک</territory>
+			<territory type="DM" draft="unconfirmed">دۆمینیکا</territory>
+			<territory type="DZ" draft="unconfirmed">ئەلجەزایر</territory>
+			<territory type="EC" draft="unconfirmed">ئیکوادۆر</territory>
+			<territory type="EG" draft="unconfirmed">میسر</territory>
+			<territory type="EH" draft="unconfirmed">ڕۆژاوای سەحرا</territory>
+			<territory type="ER" draft="unconfirmed">ئەریتریا</territory>
+			<territory type="ES" draft="unconfirmed">ئیسپانیا</territory>
+			<territory type="ET" draft="unconfirmed">ئەتیۆپیا</territory>
+			<territory type="EU" draft="unconfirmed">یەکێتیی ئەورووپا</territory>
+			<territory type="FI" draft="unconfirmed">فینلاند</territory>
+			<territory type="FJ" draft="unconfirmed">فیجی</territory>
+			<territory type="FM" draft="unconfirmed">مایکرۆنیزیا</territory>
+			<territory type="FR" draft="unconfirmed">فەڕەنسا</territory>
+			<territory type="GA" draft="unconfirmed">گابۆن</territory>
+			<territory type="GB" draft="unconfirmed">شانشینی یەکگرتوو</territory>
+			<territory type="GD" draft="unconfirmed">گرینادا</territory>
+			<territory type="GE" draft="unconfirmed">گورجستان</territory>
+			<territory type="GH" draft="unconfirmed">غەنا</territory>
+			<territory type="GL" draft="unconfirmed">گرینلاند</territory>
+			<territory type="GM" draft="unconfirmed">گامبیا</territory>
+			<territory type="GN" draft="unconfirmed">گینێ</territory>
+			<territory type="GR" draft="unconfirmed">یۆنان</territory>
+			<territory type="GT" draft="unconfirmed">گواتیمالا</territory>
+			<territory type="GU" draft="unconfirmed">گوام</territory>
+			<territory type="GW" draft="unconfirmed">گینێ بیساو</territory>
+			<territory type="GY" draft="unconfirmed">گویانا</territory>
+			<territory type="HN" draft="unconfirmed">ھۆندووراس</territory>
+			<territory type="HR" draft="unconfirmed">کرۆواتیا</territory>
+			<territory type="HT" draft="unconfirmed">ھایتی</territory>
+			<territory type="HU" draft="unconfirmed">مەجارستان</territory>
+			<territory type="ID" draft="unconfirmed">ئیندۆنیزیا</territory>
+			<territory type="IE" draft="unconfirmed">ئیرلەند</territory>
+			<territory type="IL" draft="unconfirmed">ئیسرائیل</territory>
+			<territory type="IN" draft="unconfirmed">ھیندستان</territory>
+			<territory type="IQ" draft="unconfirmed">عێراق</territory>
+			<territory type="IR" draft="unconfirmed">ئێران</territory>
+			<territory type="IS" draft="unconfirmed">ئایسلەند</territory>
+			<territory type="IT" draft="unconfirmed">ئیتاڵی</territory>
+			<territory type="JM" draft="unconfirmed">جامایکا</territory>
+			<territory type="JO" draft="unconfirmed">ئوردن</territory>
+			<territory type="JP" draft="unconfirmed">ژاپۆن</territory>
+			<territory type="KG" draft="unconfirmed">قرغیزستان</territory>
+			<territory type="KH" draft="unconfirmed">کەمبۆدیا</territory>
+			<territory type="KI" draft="unconfirmed">کیریباس</territory>
+			<territory type="KM" draft="unconfirmed">دوورگەکانی قەمەر</territory>
+			<territory type="KN" draft="unconfirmed">سەینت کیتس و نیڤیس</territory>
+			<territory type="KP" draft="unconfirmed">کۆریای باکوور</territory>
+			<territory type="KR" draft="unconfirmed">کۆریای باشوور</territory>
+			<territory type="KW" draft="unconfirmed">کوەیت</territory>
+			<territory type="KZ" draft="unconfirmed">کازاخستان</territory>
+			<territory type="LA" draft="unconfirmed">لاوس</territory>
+			<territory type="LB" draft="unconfirmed">لوبنان</territory>
+			<territory type="LC" draft="unconfirmed">سەینت لووسیا</territory>
+			<territory type="LI" draft="unconfirmed">لیختنشتاین</territory>
+			<territory type="LK" draft="unconfirmed">سریلانکا</territory>
+			<territory type="LR" draft="unconfirmed">لیبەریا</territory>
+			<territory type="LS" draft="unconfirmed">لەسۆتۆ</territory>
+			<territory type="LT" draft="unconfirmed">لیتوانایا</territory>
+			<territory type="LU" draft="unconfirmed">لوکسەمبورگ</territory>
+			<territory type="LV" draft="unconfirmed">لاتڤیا</territory>
+			<territory type="LY" draft="unconfirmed">لیبیا</territory>
+			<territory type="MA" draft="unconfirmed">مەغریب</territory>
+			<territory type="MC" draft="unconfirmed">مۆناکۆ</territory>
+			<territory type="MD" draft="unconfirmed">مۆلدۆڤا</territory>
+			<territory type="ME" draft="unconfirmed">مۆنتینیگرۆ</territory>
+			<territory type="MG" draft="unconfirmed">ماداگاسکار</territory>
+			<territory type="MH" draft="unconfirmed">دوورگەکانی مارشاڵ</territory>
+			<territory type="ML" draft="unconfirmed">مالی</territory>
+			<territory type="MM" draft="unconfirmed">میانمار</territory>
+			<territory type="MN" draft="unconfirmed">مەنگۆلیا</territory>
+			<territory type="MO" alt="short" draft="unconfirmed">ماکاو</territory>
+			<territory type="MR" draft="unconfirmed">مۆریتانیا</territory>
+			<territory type="MT" draft="unconfirmed">ماڵتا</territory>
+			<territory type="MV" draft="unconfirmed">مالدیڤ</territory>
+			<territory type="MW" draft="unconfirmed">مالاوی</territory>
+			<territory type="MX" draft="unconfirmed">مەکسیک</territory>
+			<territory type="MY" draft="unconfirmed">مالیزیا</territory>
+			<territory type="MZ" draft="unconfirmed">مۆزامبیک</territory>
+			<territory type="NA" draft="unconfirmed">نامیبیا</territory>
+			<territory type="NE" draft="unconfirmed">نیجەر</territory>
+			<territory type="NI" draft="unconfirmed">نیکاراگوا</territory>
+			<territory type="NL" draft="unconfirmed">ھۆڵەندا</territory>
+			<territory type="NO" draft="unconfirmed">نۆرویژ</territory>
+			<territory type="NP" draft="unconfirmed">نیپال</territory>
+			<territory type="NR" draft="unconfirmed">نائوروو</territory>
+			<territory type="NZ" draft="unconfirmed">نیوزیلاند</territory>
+			<territory type="OM" draft="unconfirmed">عومان</territory>
+			<territory type="PA" draft="unconfirmed">پاناما</territory>
+			<territory type="PE" draft="unconfirmed">پیروو</territory>
+			<territory type="PG" draft="unconfirmed">پاپوا گینێی نوێ</territory>
+			<territory type="PH" draft="unconfirmed">فلیپین</territory>
+			<territory type="PK" draft="unconfirmed">پاکستان</territory>
+			<territory type="PL" draft="unconfirmed">پۆڵەندا</territory>
+			<territory type="PS" draft="unconfirmed">فەلەستین</territory>
+			<territory type="PT" draft="unconfirmed">پورتوگال</territory>
+			<territory type="PW" draft="unconfirmed">پالاو</territory>
+			<territory type="PY" draft="unconfirmed">پاراگوای</territory>
+			<territory type="QA" draft="unconfirmed">قەتەر</territory>
+			<territory type="RO" draft="unconfirmed">ڕۆمانیا</territory>
+			<territory type="RS" draft="unconfirmed">سربیا</territory>
+			<territory type="RU" draft="unconfirmed">ڕووسیا</territory>
+			<territory type="RW" draft="unconfirmed">ڕواندا</territory>
+			<territory type="SA" draft="unconfirmed">عەرەبستانی سەعوودی</territory>
+			<territory type="SB" draft="unconfirmed">دوورگەکانی سلێمان</territory>
+			<territory type="SC" draft="unconfirmed">سیشێل</territory>
+			<territory type="SD" draft="unconfirmed">سوودان</territory>
+			<territory type="SE" draft="unconfirmed">سوید</territory>
+			<territory type="SG" draft="unconfirmed">سینگاپور</territory>
+			<territory type="SI" draft="unconfirmed">سلۆڤێنیا</territory>
+			<territory type="SK" draft="unconfirmed">سلۆڤاکیا</territory>
+			<territory type="SL" draft="unconfirmed">سیەرالیۆن</territory>
+			<territory type="SM" draft="unconfirmed">سان مارینۆ</territory>
+			<territory type="SN" draft="unconfirmed">سینیگال</territory>
+			<territory type="SO" draft="unconfirmed">سۆمالیا</territory>
+			<territory type="SR" draft="unconfirmed">سورینام</territory>
+			<territory type="ST" draft="unconfirmed">ساوتۆمێ و پرینسیپی</territory>
+			<territory type="SV" draft="unconfirmed">ئێلسالڤادۆر</territory>
+			<territory type="SY" draft="unconfirmed">سووریا</territory>
+			<territory type="SZ" draft="unconfirmed">سوازیلاند</territory>
+			<territory type="TD" draft="unconfirmed">چاد</territory>
+			<territory type="TG" draft="unconfirmed">تۆگۆ</territory>
+			<territory type="TH" draft="unconfirmed">تایلەند</territory>
+			<territory type="TJ" draft="unconfirmed">تاجیکستان</territory>
+			<territory type="TL" alt="variant" draft="unconfirmed">تیمۆری ڕۆژھەڵات</territory>
+			<territory type="TM" draft="unconfirmed">تورکمانستان</territory>
+			<territory type="TN" draft="unconfirmed">توونس</territory>
+			<territory type="TO" draft="unconfirmed">تۆنگا</territory>
+			<territory type="TR" draft="unconfirmed">تورکیا</territory>
+			<territory type="TT" draft="unconfirmed">ترینیداد و تۆباگو</territory>
+			<territory type="TV" draft="unconfirmed">تووڤالوو</territory>
+			<territory type="TW" draft="unconfirmed">تایوان</territory>
+			<territory type="TZ" draft="unconfirmed">تانزانیا</territory>
+			<territory type="UA" draft="unconfirmed">ئۆکرانیا</territory>
+			<territory type="UG" draft="unconfirmed">ئوگاندا</territory>
+			<territory type="US" draft="unconfirmed">وڵاتە یەکگرتووەکان</territory>
+			<territory type="UY" draft="unconfirmed">ئوروگوای</territory>
+			<territory type="UZ" draft="unconfirmed">ئوزبەکستان</territory>
+			<territory type="VA" draft="unconfirmed">ڤاتیکان</territory>
+			<territory type="VC" draft="unconfirmed">سەینت ڤینسەنت و گرینادینز</territory>
+			<territory type="VN" draft="unconfirmed">ڤیەتنام</territory>
+			<territory type="VU" draft="unconfirmed">ڤانوواتوو</territory>
+			<territory type="WS" draft="unconfirmed">ساموا</territory>
+			<territory type="YE" draft="unconfirmed">یەمەن</territory>
+			<territory type="ZA" draft="unconfirmed">ئەفریقای باشوور</territory>
+			<territory type="ZM" draft="unconfirmed">زامبیا</territory>
+			<territory type="ZW" draft="unconfirmed">زیمبابوی</territory>
+			<territory type="ZZ" draft="unconfirmed">نەناسراو</territory>
+		</territories>
+		<keys>
+			<key type="calendar" draft="unconfirmed">ڕۆژژمێر</key>
+			<key type="collation" draft="unconfirmed">ڕیزبەندی</key>
+			<key type="currency" draft="unconfirmed">دراو</key>
+			<key type="numbers" draft="unconfirmed">ژمارەکان</key>
+		</keys>
+		<types>
+			<type key="calendar" type="chinese" draft="unconfirmed">ڕۆژژمێری چینی</type>
+			<type key="calendar" type="gregorian" draft="unconfirmed">ڕۆژژمێری گورجی</type>
+			<type key="calendar" type="hebrew" draft="unconfirmed">ڕۆژژمێری عیبری</type>
+			<type key="calendar" type="indian" draft="unconfirmed">ڕۆژژمێری نەتەوەیی ھیندی</type>
+			<type key="calendar" type="islamic" draft="unconfirmed">ڕۆژژمێری کۆچیی مانگی</type>
+			<type key="calendar" type="persian" draft="unconfirmed">ڕۆژژمێری کۆچیی ھەتاوی</type>
+			<type key="numbers" type="arab" draft="unconfirmed">ژمارە عەربی-ھیندییەکان</type>
+			<type key="numbers" type="gujr" draft="unconfirmed">ژمارە گوجەراتییەکان</type>
+			<type key="numbers" type="khmr" draft="unconfirmed">ژمارە خمێرییەکان</type>
+			<type key="numbers" type="latn" draft="unconfirmed">ژمارە ڕۆژاوایییەکان</type>
+			<type key="numbers" type="mymr" draft="unconfirmed">ژمارە میانمارییەکان</type>
+		</types>
+		<measurementSystemNames>
+			<measurementSystemName type="metric" draft="unconfirmed">مەتریک</measurementSystemName>
+			<measurementSystemName type="UK" draft="unconfirmed">بریتانی</measurementSystemName>
+			<measurementSystemName type="US" draft="unconfirmed">ئەمەریکی</measurementSystemName>
+		</measurementSystemNames>
+		<codePatterns>
+			<codePattern type="language" draft="unconfirmed">زمان: {0}</codePattern>
+			<codePattern type="script" draft="unconfirmed">خەت: {0}</codePattern>
+			<codePattern type="territory" draft="unconfirmed">ناوچە: {0}</codePattern>
+		</codePatterns>
+	</localeDisplayNames>
+	<layout>
+		<orientation>
+			<characterOrder>right-to-left</characterOrder>
+		</orientation>
+	</layout>
+	<characters>
+		<exemplarCharacters>[ئ ا ب پ ت ج چ ح خ د ر ز ڕ ژ س ش ع غ ف ڤ ق ک گ ل ڵ م ن ھ ە و ۆ ی ێ]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[\u200E\u200F \u064B \u064C \u064D \u064E \u064F \u0650 \u0651 \u0652 ء آ أ ؤ إ ة ث ذ ص ض ط ظ ك ه ى ي]</exemplarCharacters>
+		<exemplarCharacters type="index" draft="unconfirmed">[ئ ا ب پ ت ج چ ح خ د ر ز ڕ ژ س ش ع غ ف ڤ ق ک گ ل ڵ م ن ھ ە و ۆ ی ێ]</exemplarCharacters>
+	</characters>
+	<dates>
+		<calendars>
+			<calendar type="generic">
+				<days>
+					<dayContext type="format">
+						<dayWidth type="abbreviated">
+							<day type="sun" draft="unconfirmed">یەکشەممە</day>
+							<day type="mon" draft="unconfirmed">دووشەممە</day>
+							<day type="tue" draft="unconfirmed">سێشەممە</day>
+							<day type="wed" draft="unconfirmed">چوارشەممە</day>
+							<day type="thu" draft="unconfirmed">پێنجشەممە</day>
+							<day type="fri" draft="unconfirmed">ھەینی</day>
+							<day type="sat" draft="unconfirmed">شەممە</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun" draft="unconfirmed">ی</day>
+							<day type="mon" draft="unconfirmed">د</day>
+							<day type="tue" draft="unconfirmed">س</day>
+							<day type="wed" draft="unconfirmed">چ</day>
+							<day type="thu" draft="unconfirmed">پ</day>
+							<day type="fri" draft="unconfirmed">ھ</day>
+							<day type="sat" draft="unconfirmed">ش</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun" draft="unconfirmed">یەکشەممە</day>
+							<day type="mon" draft="unconfirmed">دووشەممە</day>
+							<day type="tue" draft="unconfirmed">سێشەممە</day>
+							<day type="wed" draft="unconfirmed">چوارشەممە</day>
+							<day type="thu" draft="unconfirmed">پێنجشەممە</day>
+							<day type="fri" draft="unconfirmed">ھەینی</day>
+							<day type="sat" draft="unconfirmed">شەممە</day>
+						</dayWidth>
+					</dayContext>
+					<dayContext type="stand-alone">
+						<dayWidth type="abbreviated">
+							<day type="sun" draft="unconfirmed">یەکشەممە</day>
+							<day type="mon" draft="unconfirmed">دووشەممە</day>
+							<day type="tue" draft="unconfirmed">سێشەممە</day>
+							<day type="wed" draft="unconfirmed">چوارشەممە</day>
+							<day type="thu" draft="unconfirmed">پێنجشەممە</day>
+							<day type="fri" draft="unconfirmed">ھەینی</day>
+							<day type="sat" draft="unconfirmed">شەممە</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun" draft="unconfirmed">ی</day>
+							<day type="mon" draft="unconfirmed">د</day>
+							<day type="tue" draft="unconfirmed">س</day>
+							<day type="wed" draft="unconfirmed">چ</day>
+							<day type="thu" draft="unconfirmed">پ</day>
+							<day type="fri" draft="unconfirmed">ھ</day>
+							<day type="sat" draft="unconfirmed">ش</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun" draft="unconfirmed">یەکشەممە</day>
+							<day type="mon" draft="unconfirmed">دووشەممە</day>
+							<day type="tue" draft="unconfirmed">سێشەممە</day>
+							<day type="wed" draft="unconfirmed">چوارشەممە</day>
+							<day type="thu" draft="unconfirmed">پێنجشەممە</day>
+							<day type="fri" draft="unconfirmed">ھەینی</day>
+							<day type="sat" draft="unconfirmed">شەممە</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<quarters>
+					<quarterContext type="format">
+						<quarterWidth type="wide">
+							<quarter type="1" draft="unconfirmed">چارەکی یەکەم</quarter>
+							<quarter type="2" draft="unconfirmed">چارەکی دووەم</quarter>
+							<quarter type="3" draft="unconfirmed">چارەکی سێەم</quarter>
+							<quarter type="4" draft="unconfirmed">چارەکی چوارەم</quarter>
+						</quarterWidth>
+					</quarterContext>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="wide">
+							<quarter type="1" draft="unconfirmed">چارەکی یەکەم</quarter>
+							<quarter type="2" draft="unconfirmed">چارەکی دووەم</quarter>
+							<quarter type="3" draft="unconfirmed">چارەکی سێەم</quarter>
+							<quarter type="4" draft="unconfirmed">چارەکی چوارەم</quarter>
+						</quarterWidth>
+					</quarterContext>
+				</quarters>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am" draft="unconfirmed">ب.ن</dayPeriod>
+							<dayPeriod type="pm" draft="unconfirmed">د.ن</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am" draft="unconfirmed">ب.ن</dayPeriod>
+							<dayPeriod type="pm" draft="unconfirmed">د.ن</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<dateFormats>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern draft="unconfirmed">dی MMMMی y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="Ed" draft="unconfirmed">E dەھەم</dateFormatItem>
+						<dateFormatItem id="h" draft="unconfirmed">hی a</dateFormatItem>
+						<dateFormatItem id="MEd" draft="unconfirmed">E، M/d</dateFormatItem>
+						<dateFormatItem id="MMMd" draft="unconfirmed">dی MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd" draft="unconfirmed">E، dی MMM</dateFormatItem>
+						<dateFormatItem id="yM" draft="unconfirmed">M/y</dateFormatItem>
+						<dateFormatItem id="yMd" draft="unconfirmed">d/M/y</dateFormatItem>
+						<dateFormatItem id="yMEd" draft="unconfirmed">E، d/M/y</dateFormatItem>
+						<dateFormatItem id="yMMM" draft="unconfirmed">MMMی y</dateFormatItem>
+						<dateFormatItem id="yMMMd" draft="unconfirmed">dی MMMی y</dateFormatItem>
+						<dateFormatItem id="yMMMEd" draft="unconfirmed">E، dی MMMی y</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d" draft="unconfirmed">E، M/d – E، M/d</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E، M/d – E، M/d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M" draft="unconfirmed">MMM–MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d" draft="unconfirmed">d–dی MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d" draft="unconfirmed">E، dی MMM – E، dی MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="y" draft="unconfirmed">d/M/y – d/M/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d" draft="unconfirmed">E، d/M/y – E، d/M/y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E، d/M/y – E، d/M/y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">E، d/M/y – E، d/M/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M" draft="unconfirmed">MMM–MMMی y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">MMMی y – MMMی y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d" draft="unconfirmed">d–dی MMMی y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">dی MMM – dی MMMی y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">dی MMMMی y – dی MMMMی y</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="unconfirmed">کانوونی دووەم</month>
+							<month type="2" draft="unconfirmed">شوبات</month>
+							<month type="3" draft="unconfirmed">ئازار</month>
+							<month type="4" draft="unconfirmed">نیسان</month>
+							<month type="5" draft="unconfirmed">ئایار</month>
+							<month type="6" draft="unconfirmed">حوزەیران</month>
+							<month type="7" draft="unconfirmed">تەمووز</month>
+							<month type="8" draft="unconfirmed">ئاب</month>
+							<month type="9" draft="unconfirmed">ئەیلوول</month>
+							<month type="10" draft="unconfirmed">تشرینی یەکەم</month>
+							<month type="11" draft="unconfirmed">تشرینی دووەم</month>
+							<month type="12" draft="unconfirmed">کانونی یەکەم</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">کانوونی دووەم</month>
+							<month type="2" draft="unconfirmed">شوبات</month>
+							<month type="3" draft="unconfirmed">ئازار</month>
+							<month type="4" draft="unconfirmed">نیسان</month>
+							<month type="5" draft="unconfirmed">ئایار</month>
+							<month type="6" draft="unconfirmed">حوزەیران</month>
+							<month type="7" draft="unconfirmed">تەمووز</month>
+							<month type="8" draft="unconfirmed">ئاب</month>
+							<month type="9" draft="unconfirmed">ئەیلوول</month>
+							<month type="10" draft="unconfirmed">تشرینی یەکەم</month>
+							<month type="11" draft="unconfirmed">تشرینی دووەم</month>
+							<month type="12" draft="unconfirmed">کانونی یەکەم</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="unconfirmed">کانوونی دووەم</month>
+							<month type="2" draft="unconfirmed">شوبات</month>
+							<month type="3" draft="unconfirmed">ئازار</month>
+							<month type="4" draft="unconfirmed">نیسان</month>
+							<month type="5" draft="unconfirmed">ئایار</month>
+							<month type="6" draft="unconfirmed">حوزەیران</month>
+							<month type="7" draft="unconfirmed">تەمووز</month>
+							<month type="8" draft="unconfirmed">ئاب</month>
+							<month type="9" draft="unconfirmed">ئەیلوول</month>
+							<month type="10" draft="unconfirmed">تشرینی یەکەم</month>
+							<month type="11" draft="unconfirmed">تشرینی دووەم</month>
+							<month type="12" draft="unconfirmed">کانونی یەکەم</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">کانوونی دووەم</month>
+							<month type="2" draft="unconfirmed">شوبات</month>
+							<month type="3" draft="unconfirmed">ئازار</month>
+							<month type="4" draft="unconfirmed">نیسان</month>
+							<month type="5" draft="unconfirmed">ئایار</month>
+							<month type="6" draft="unconfirmed">حوزەیران</month>
+							<month type="7" draft="unconfirmed">تەمووز</month>
+							<month type="8" draft="unconfirmed">ئاب</month>
+							<month type="9" draft="unconfirmed">ئەیلوول</month>
+							<month type="10" draft="unconfirmed">تشرینی یەکەم</month>
+							<month type="11" draft="unconfirmed">تشرینی دووەم</month>
+							<month type="12" draft="unconfirmed">کانونی یەکەم</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="abbreviated">
+							<day type="sun" draft="unconfirmed">یەکشەممە</day>
+							<day type="mon" draft="unconfirmed">دووشەممە</day>
+							<day type="tue" draft="unconfirmed">سێشەممە</day>
+							<day type="wed" draft="unconfirmed">چوارشەممە</day>
+							<day type="thu" draft="unconfirmed">پێنجشەممە</day>
+							<day type="fri" draft="unconfirmed">ھەینی</day>
+							<day type="sat" draft="unconfirmed">شەممە</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun" draft="unconfirmed">ی</day>
+							<day type="mon" draft="unconfirmed">د</day>
+							<day type="tue" draft="unconfirmed">س</day>
+							<day type="wed" draft="unconfirmed">چ</day>
+							<day type="thu" draft="unconfirmed">پ</day>
+							<day type="fri" draft="unconfirmed">ھ</day>
+							<day type="sat" draft="unconfirmed">ش</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun" draft="unconfirmed">یەکشەممە</day>
+							<day type="mon" draft="unconfirmed">دووشەممە</day>
+							<day type="tue" draft="unconfirmed">سێشەممە</day>
+							<day type="wed" draft="unconfirmed">چوارشەممە</day>
+							<day type="thu" draft="unconfirmed">پێنجشەممە</day>
+							<day type="fri" draft="unconfirmed">ھەینی</day>
+							<day type="sat" draft="unconfirmed">شەممە</day>
+						</dayWidth>
+					</dayContext>
+					<dayContext type="stand-alone">
+						<dayWidth type="abbreviated">
+							<day type="sun" draft="unconfirmed">یەکشەممە</day>
+							<day type="mon" draft="unconfirmed">دووشەممە</day>
+							<day type="tue" draft="unconfirmed">سێشەممە</day>
+							<day type="wed" draft="unconfirmed">چوارشەممە</day>
+							<day type="thu" draft="unconfirmed">پێنجشەممە</day>
+							<day type="fri" draft="unconfirmed">ھەینی</day>
+							<day type="sat" draft="unconfirmed">شەممە</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun" draft="unconfirmed">ی</day>
+							<day type="mon" draft="unconfirmed">د</day>
+							<day type="tue" draft="unconfirmed">س</day>
+							<day type="wed" draft="unconfirmed">چ</day>
+							<day type="thu" draft="unconfirmed">پ</day>
+							<day type="fri" draft="unconfirmed">ھ</day>
+							<day type="sat" draft="unconfirmed">ش</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun" draft="unconfirmed">یەکشەممە</day>
+							<day type="mon" draft="unconfirmed">دووشەممە</day>
+							<day type="tue" draft="unconfirmed">سێشەممە</day>
+							<day type="wed" draft="unconfirmed">چوارشەممە</day>
+							<day type="thu" draft="unconfirmed">پێنجشەممە</day>
+							<day type="fri" draft="unconfirmed">ھەینی</day>
+							<day type="sat" draft="unconfirmed">شەممە</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<quarters>
+					<quarterContext type="format">
+						<quarterWidth type="wide">
+							<quarter type="1" draft="unconfirmed">چارەکی یەکەم</quarter>
+							<quarter type="2" draft="unconfirmed">چارەکی دووەم</quarter>
+							<quarter type="3" draft="unconfirmed">چارەکی سێەم</quarter>
+							<quarter type="4" draft="unconfirmed">چارەکی چوارەم</quarter>
+						</quarterWidth>
+					</quarterContext>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="wide">
+							<quarter type="1" draft="unconfirmed">چارەکی یەکەم</quarter>
+							<quarter type="2" draft="unconfirmed">چارەکی دووەم</quarter>
+							<quarter type="3" draft="unconfirmed">چارەکی سێەم</quarter>
+							<quarter type="4" draft="unconfirmed">چارەکی چوارەم</quarter>
+						</quarterWidth>
+					</quarterContext>
+				</quarters>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am" draft="unconfirmed">ب.ن</dayPeriod>
+							<dayPeriod type="pm" draft="unconfirmed">د.ن</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<eras>
+					<eraNames>
+						<era type="0" draft="unconfirmed">پێش زایین</era>
+						<era type="1" draft="unconfirmed">زایینی</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0" draft="unconfirmed">پ.ن</era>
+						<era type="1" draft="unconfirmed">ز</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0" draft="unconfirmed">پ.ن</era>
+						<era type="1" draft="unconfirmed">ز</era>
+					</eraNarrow>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern draft="unconfirmed">dی MMMMی y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern draft="unconfirmed">h:mm:ss a zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern draft="unconfirmed">h:mm:ss a z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern draft="unconfirmed">h:mm:ss a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern draft="unconfirmed">h:mm a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="Ed" draft="unconfirmed">E dەھەم</dateFormatItem>
+						<dateFormatItem id="h" draft="unconfirmed">hی a</dateFormatItem>
+						<dateFormatItem id="MEd" draft="unconfirmed">E، M/d</dateFormatItem>
+						<dateFormatItem id="MMMd" draft="unconfirmed">dی MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd" draft="unconfirmed">E، dی MMM</dateFormatItem>
+						<dateFormatItem id="yM" draft="unconfirmed">M/y</dateFormatItem>
+						<dateFormatItem id="yMd" draft="unconfirmed">d/M/y</dateFormatItem>
+						<dateFormatItem id="yMEd" draft="unconfirmed">E، d/M/y</dateFormatItem>
+						<dateFormatItem id="yMMM" draft="unconfirmed">MMMی y</dateFormatItem>
+						<dateFormatItem id="yMMMd" draft="unconfirmed">dی MMMی y</dateFormatItem>
+						<dateFormatItem id="yMMMEd" draft="unconfirmed">E، dی MMMی y</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d" draft="unconfirmed">E، M/d – E، M/d</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E، M/d – E، M/d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M" draft="unconfirmed">MMM–MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d" draft="unconfirmed">d–dی MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d" draft="unconfirmed">E، dی MMM – E، dی MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="y" draft="unconfirmed">d/M/y – d/M/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d" draft="unconfirmed">E، d/M/y – E، d/M/y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E، d/M/y – E، d/M/y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">E، d/M/y – E، d/M/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M" draft="unconfirmed">MMM–MMMی y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">MMMی y – MMMی y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d" draft="unconfirmed">d–dی MMMی y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">dی MMM – dی MMMی y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">dی MMMMی y – dی MMMMی y</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="persian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="unconfirmed">خاکەلێوە</month>
+							<month type="2" draft="unconfirmed">بانەمەڕ</month>
+							<month type="3" draft="unconfirmed">جۆزەردان</month>
+							<month type="4" draft="unconfirmed">پووشپەڕ</month>
+							<month type="5" draft="unconfirmed">گەلاوێژ</month>
+							<month type="6" draft="unconfirmed">خەرمانان</month>
+							<month type="7" draft="unconfirmed">ڕەزبەر</month>
+							<month type="8" draft="unconfirmed">خەزەڵوەر</month>
+							<month type="9" draft="unconfirmed">سەرماوەز</month>
+							<month type="10" draft="unconfirmed">بەفرانبار</month>
+							<month type="11" draft="unconfirmed">ڕێبەندان</month>
+							<month type="12" draft="unconfirmed">رەشەمێ</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">خاکەلێوە</month>
+							<month type="2" draft="unconfirmed">بانەمەڕ</month>
+							<month type="3" draft="unconfirmed">جۆزەردان</month>
+							<month type="4" draft="unconfirmed">پووشپەڕ</month>
+							<month type="5" draft="unconfirmed">گەلاوێژ</month>
+							<month type="6" draft="unconfirmed">خەرمانان</month>
+							<month type="7" draft="unconfirmed">ڕەزبەر</month>
+							<month type="8" draft="unconfirmed">خەزەڵوەر</month>
+							<month type="9" draft="unconfirmed">سەرماوەز</month>
+							<month type="10" draft="unconfirmed">بەفرانبار</month>
+							<month type="11" draft="unconfirmed">ڕێبەندان</month>
+							<month type="12" draft="unconfirmed">رەشەمێ</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="unconfirmed">خاکەلێوە</month>
+							<month type="2" draft="unconfirmed">بانەمەڕ</month>
+							<month type="3" draft="unconfirmed">جۆزەردان</month>
+							<month type="4" draft="unconfirmed">پووشپەڕ</month>
+							<month type="5" draft="unconfirmed">گەلاوێژ</month>
+							<month type="6" draft="unconfirmed">خەرمانان</month>
+							<month type="7" draft="unconfirmed">ڕەزبەر</month>
+							<month type="8" draft="unconfirmed">خەزەڵوەر</month>
+							<month type="9" draft="unconfirmed">سەرماوەز</month>
+							<month type="10" draft="unconfirmed">بەفرانبار</month>
+							<month type="11" draft="unconfirmed">ڕێبەندان</month>
+							<month type="12" draft="unconfirmed">رەشەمێ</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">خاکەلێوە</month>
+							<month type="2" draft="unconfirmed">بانەمەڕ</month>
+							<month type="3" draft="unconfirmed">جۆزەردان</month>
+							<month type="4" draft="unconfirmed">پووشپەڕ</month>
+							<month type="5" draft="unconfirmed">گەلاوێژ</month>
+							<month type="6" draft="unconfirmed">خەرمانان</month>
+							<month type="7" draft="unconfirmed">ڕەزبەر</month>
+							<month type="8" draft="unconfirmed">خەزەڵوەر</month>
+							<month type="9" draft="unconfirmed">سەرماوەز</month>
+							<month type="10" draft="unconfirmed">بەفرانبار</month>
+							<month type="11" draft="unconfirmed">ڕێبەندان</month>
+							<month type="12" draft="unconfirmed">رەشەمێ</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="year">
+				<displayName draft="unconfirmed">ساڵ</displayName>
+			</field>
+			<field type="month">
+				<displayName draft="unconfirmed">مانگ</displayName>
+			</field>
+			<field type="week">
+				<displayName draft="unconfirmed">ھەفتە</displayName>
+			</field>
+			<field type="day">
+				<displayName draft="unconfirmed">ڕۆژ</displayName>
+				<relative type="-1" draft="unconfirmed">yesterday</relative>
+				<relative type="0" draft="unconfirmed">ئەمڕۆ</relative>
+				<relative type="1" draft="unconfirmed">سبەی</relative>
+			</field>
+			<field type="weekday">
+				<displayName draft="unconfirmed">ڕۆژی ھەفتە</displayName>
+			</field>
+			<field type="hour">
+				<displayName draft="unconfirmed">کاتژمێر</displayName>
+			</field>
+			<field type="minute">
+				<displayName draft="unconfirmed">خولەک</displayName>
+			</field>
+			<field type="second">
+				<displayName draft="unconfirmed">چرکە</displayName>
+			</field>
+		</fields>
+	</dates>
+	<numbers>
+		<defaultNumberingSystem>arab</defaultNumberingSystem>
+		<otherNumberingSystems>
+			<native>arab</native>
+		</otherNumberingSystems>
+		<symbols numberSystem="latn">
+			<percentSign draft="unconfirmed">٪</percentSign>
+			<plusSign>‎+</plusSign> <!-- includes LRM before sign -->
+			<minusSign>‎-</minusSign> <!-- includes LRM before sign (002D) -->
+		</symbols>
+		<currencyFormats numberSystem="latn">
+			<unitPattern count="one" draft="unconfirmed">{0} {1}</unitPattern>
+			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
+		</currencyFormats>
+		<currencies>
+			<currency type="AFN">
+				<displayName draft="unconfirmed">ئەفغانیی ئەفغانستان</displayName>
+			</currency>
+			<currency type="BHD">
+				<displayName draft="unconfirmed">دیناری بەحرەینی</displayName>
+			</currency>
+			<currency type="BZD">
+				<displayName draft="unconfirmed">دۆلاری بەلیزی</displayName>
+			</currency>
+			<currency type="DZD">
+				<displayName draft="unconfirmed">دیناری جەزائیری</displayName>
+			</currency>
+			<currency type="EUR">
+				<displayName draft="unconfirmed">یورۆ</displayName>
+			</currency>
+			<currency type="IQD">
+				<displayName draft="unconfirmed">دیناری عێراقی</displayName>
+			</currency>
+			<currency type="IRR">
+				<displayName draft="unconfirmed">ڕیاڵی ئێرانی</displayName>
+			</currency>
+			<currency type="JOD">
+				<displayName draft="unconfirmed">دیناری ئوردنی</displayName>
+			</currency>
+			<currency type="KWD">
+				<displayName draft="unconfirmed">دیناری کووەیتی</displayName>
+			</currency>
+			<currency type="OMR">
+				<displayName draft="unconfirmed">ڕیاڵی عومانی</displayName>
+			</currency>
+			<currency type="QAR">
+				<displayName draft="unconfirmed">ڕیاڵی قەتەری</displayName>
+			</currency>
+			<currency type="SAR">
+				<displayName draft="unconfirmed">ڕیاڵی سەعوودی</displayName>
+			</currency>
+			<currency type="TND">
+				<displayName draft="unconfirmed">دیناری توونس</displayName>
+			</currency>
+			<currency type="TRY">
+				<displayName draft="unconfirmed">لیرەی تورکیا</displayName>
+			</currency>
+			<currency type="TTD">
+				<displayName draft="unconfirmed">دۆلاری ترینیداد و تۆباگۆ</displayName>
+			</currency>
+			<currency type="XAU">
+				<displayName draft="unconfirmed">زێڕ</displayName>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bm_Latn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ckb_IQ.xml
similarity index 67%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bm_Latn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ckb_IQ.xml
index 887a5d17c6f..55caa81ad62 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/bm_Latn.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ckb_IQ.xml
@@ -6,9 +6,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="bm"/>
-		<script type="Latn"/>
+		<version number="$Revision: 11914 $"/>
+		<language type="ckb"/>
+		<territory type="IQ"/>
 	</identity>
 </ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ckb_IR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ckb_IR.xml
new file mode 100644
index 00000000000..c9c6cd2621f
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ckb_IR.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2014 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="ckb"/>
+		<territory type="IR"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/cs.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cs.xml
similarity index 93%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/cs.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cs.xml
index 7720f5db744..0b6472403a6 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/cs.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cs.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="cs"/>
 	</identity>
 	<localeDisplayNames>
@@ -59,7 +58,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ay">ajmarština</language>
 			<language type="az">ázerbájdžánština</language>
 			<language type="az" alt="short">ázerbájdžánština</language>
-			<language type="azb">ázerbájdžánština (jižní)</language>
 			<language type="ba">baškirština</language>
 			<language type="bal">balúčština</language>
 			<language type="ban">balijština</language>
@@ -76,6 +74,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bfd">bafut</language>
 			<language type="bfq">badagština</language>
 			<language type="bg">bulharština</language>
+			<language type="bgn">balúčština (západní)</language>
 			<language type="bho">bhojpurština</language>
 			<language type="bi">bislamština</language>
 			<language type="bik">bikolština</language>
@@ -242,7 +241,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="id">indonéština</language>
 			<language type="ie">interlingue</language>
 			<language type="ig">igboština</language>
-			<language type="ii">s’-čchuan i</language>
+			<language type="ii">iština (sečuánská)</language>
 			<language type="ik">inupiakština</language>
 			<language type="ilo">ilokánština</language>
 			<language type="inh">inguština</language>
@@ -329,6 +328,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">laoština</language>
 			<language type="lol">mongština</language>
 			<language type="loz">lozština</language>
+			<language type="lrc">lúrština (severní)</language>
 			<language type="lt">litevština</language>
 			<language type="ltg">latgalština</language>
 			<language type="lu">lubu-katanžština</language>
@@ -390,6 +390,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nb">norština (bokmål)</language>
 			<language type="nd">ndebele (Zimbabwe)</language>
 			<language type="nds">dolnoněmčina</language>
+			<language type="nds_NL">dolnosaština</language>
 			<language type="ne">nepálština</language>
 			<language type="new">névárština</language>
 			<language type="ng">ndondština</language>
@@ -459,7 +460,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ro_MD">moldavština</language>
 			<language type="rof">rombo</language>
 			<language type="rom">romština</language>
-			<language type="root" draft="unconfirmed">kořen</language>
+			<language type="root" draft="contributed">kořen</language>
 			<language type="rtm">rotumanština</language>
 			<language type="ru">ruština</language>
 			<language type="rue">rusínština</language>
@@ -482,6 +483,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sco">skotština</language>
 			<language type="sd">sindhština</language>
 			<language type="sdc">sassarština</language>
+			<language type="sdh">kurdština (jižní)</language>
 			<language type="se">sámština (severní)</language>
 			<language type="see">seneca</language>
 			<language type="seh">sena</language>
@@ -524,8 +526,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">sumerština</language>
 			<language type="sv">švédština</language>
 			<language type="sw">svahilština</language>
+			<language type="sw_CD">svahilština (Kongo)</language>
 			<language type="swb">komorština</language>
-			<language type="swc">svahilština (Kongo)</language>
 			<language type="syc">syrština (klasická)</language>
 			<language type="syr">syrština</language>
 			<language type="szl">slezština</language>
@@ -592,6 +594,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">wolajtština</language>
 			<language type="war">warajština</language>
 			<language type="was">waština</language>
+			<language type="wbp">warlpiri</language>
 			<language type="wo">wolofština</language>
 			<language type="wuu">čínština (dialekty Wu)</language>
 			<language type="xal">kalmyčtina</language>
@@ -826,7 +829,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albánie</territory>
 			<territory type="AM">Arménie</territory>
-			<territory type="AN">Nizozemské Antily</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antarktida</territory>
 			<territory type="AR">Argentina</territory>
@@ -866,6 +868,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CG" alt="variant">Kongo (republika)</territory>
 			<territory type="CH">Švýcarsko</territory>
 			<territory type="CI">Pobřeží slonoviny</territory>
+			<territory type="CI" alt="variant">Côte d’Ivoire</territory>
 			<territory type="CK">Cookovy ostrovy</territory>
 			<territory type="CL">Chile</territory>
 			<territory type="CM">Kamerun</territory>
@@ -1105,6 +1108,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">Číselné řazení</key>
 			<key type="colStrength">Míra řazení</key>
 			<key type="currency">Měna</key>
+			<key type="hc">Hodinový cyklus (12 vs. 24)</key>
+			<key type="lb">Styl zalamování řádků</key>
+			<key type="ms">Měrná soustava</key>
 			<key type="numbers">Čísla</key>
 			<key type="timezone">Časové pásmo</key>
 			<key type="va">Varianta národního prostředí</key>
@@ -1112,102 +1118,112 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">Soukromé použití</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Arabsko-indické číslice</type>
-			<type type="arabext" key="numbers">Rozšířené arabsko-indické číslice</type>
-			<type type="armn" key="numbers">Arménské číslice</type>
-			<type type="armnlow" key="numbers">Malé arménské číslice</type>
-			<type type="bali" key="numbers" draft="contributed">Balijské číslice</type>
-			<type type="beng" key="numbers">Bengálské číslice</type>
-			<type type="big5han" key="collation">Řazení pro tradiční čínštinu – Big5</type>
-			<type type="buddhist" key="calendar">Buddhistický kalendář</type>
-			<type type="chinese" key="calendar">Čínský kalendář</type>
-			<type type="coptic" key="calendar">Koptský kalendář</type>
-			<type type="dangi" key="calendar">Korejský kalendář Dangi</type>
-			<type type="deva" key="numbers">Číslice písma dévanágarí</type>
-			<type type="dictionary" key="collation">Slovníkové řazení</type>
-			<type type="ducet" key="collation">Výchozí řazení Unicode</type>
-			<type type="eor" key="collation" draft="contributed">Evropské řazení</type>
-			<type type="ethi" key="numbers">Etiopské číslice</type>
-			<type type="ethiopic" key="calendar">Etiopský kalendář</type>
-			<type type="ethiopic-amete-alem" key="calendar">Etiopský kalendář (Amete-Alem)</type>
-			<type type="finance" key="numbers">Finanční zápis čísel</type>
-			<type type="fullwide" key="numbers">Číslice – plná šířka</type>
-			<type type="gb2312han" key="collation">Řazení pro zjednodušenou čínštinu – GB2312</type>
-			<type type="geor" key="numbers">Gruzínské číslice</type>
-			<type type="gregorian" key="calendar">Gregoriánský kalendář</type>
-			<type type="grek" key="numbers">Řecké číslice</type>
-			<type type="greklow" key="numbers">Malé řecké číslice</type>
-			<type type="gujr" key="numbers">Gudžarátské číslice</type>
-			<type type="guru" key="numbers">Číslice gurmukhí</type>
-			<type type="hanidec" key="numbers">Čínské desítkové číslice</type>
-			<type type="hans" key="numbers">Číslice zjednodušené čínštiny</type>
-			<type type="hansfin" key="numbers">Finanční číslice zjednodušené čínštiny</type>
-			<type type="hant" key="numbers">Číslice tradiční čínštiny</type>
-			<type type="hantfin" key="numbers">Finanční číslice tradiční čínštiny</type>
-			<type type="hebr" key="numbers">Hebrejské číslice</type>
-			<type type="hebrew" key="calendar">Hebrejský kalendář</type>
-			<type type="identical" key="colStrength" draft="contributed">Řadit vše</type>
-			<type type="indian" key="calendar">Indický národní kalendář</type>
-			<type type="islamic" key="calendar">Muslimský kalendář</type>
-			<type type="islamic-civil" key="calendar">Muslimský občanský kalendář</type>
-			<type type="iso8601" key="calendar">Kalendář ISO-8601</type>
-			<type type="japanese" key="calendar">Japonský kalendář</type>
-			<type type="java" key="numbers" draft="contributed">Javánské číslice</type>
-			<type type="jpan" key="numbers">Japonské číslice</type>
-			<type type="jpanfin" key="numbers">Japonské finanční číslice</type>
-			<type type="khmr" key="numbers">Khmerské číslice</type>
-			<type type="knda" key="numbers">Kannadské číslice</type>
-			<type type="laoo" key="numbers">Laoské číslice</type>
-			<type type="latn" key="numbers">Západní číslice</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">Nejdříve řadit malá písmena</type>
-			<type type="mlym" key="numbers">Malajálamské číslice</type>
-			<type type="mong" key="numbers">Mongolské číslice</type>
-			<type type="mymr" key="numbers">Myanmarské číslice</type>
-			<type type="native" key="numbers" draft="contributed">Nativní číslice</type>
-			<type type="no" key="colBackwards" draft="contributed">Normální řazení akcentů</type>
-			<type type="no" key="colCaseFirst">Běžné řazení velkých a malých písmen</type>
-			<type type="no" key="colCaseLevel" draft="contributed">Nerozlišovat při řazení velká a malá písmena</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">Řadit slabičná písma (kana) samostatně</type>
-			<type type="no" key="colNormalization" draft="contributed">Řadit bez normalizace</type>
-			<type type="no" key="colNumeric" draft="contributed">Řadit číslice jednotlivě</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">Řadit symboly</type>
-			<type type="orya" key="numbers">Urijské číslice</type>
-			<type type="osma" key="numbers" draft="contributed">Somálské číslice</type>
-			<type type="persian" key="calendar">Perský kalendář</type>
-			<type type="phonebook" key="collation">Řazení jako v telefonním seznamu</type>
-			<type type="phonetic" key="collation" draft="contributed">Fonetické řazení</type>
-			<type type="pinyin" key="collation">Řazení podle pchin-jinu</type>
-			<type type="primary" key="colStrength" draft="contributed">Řadit pouze základní písmena</type>
-			<type type="quaternary" key="colStrength" draft="contributed">Řadit akcenty/velká a malá písmena/šířku/kana</type>
-			<type type="reformed" key="collation">Reformované řazení</type>
-			<type type="roc" key="calendar">Kalendář Čínské republiky</type>
-			<type type="roman" key="numbers">Římské číslice</type>
-			<type type="romanlow" key="numbers">Malé římské číslice</type>
-			<type type="saur" key="numbers" draft="contributed">Saurášterské číslice</type>
-			<type type="search" key="collation">Obecné hledání</type>
-			<type type="searchjl" key="collation" draft="contributed">Vyhledávat podle počáteční souhlásky písma hangul</type>
-			<type type="secondary" key="colStrength" draft="contributed">Řadit akcenty</type>
-			<type type="shifted" key="colAlternate" draft="contributed">Při řazení ignorovat symboly</type>
-			<type type="standard" key="collation">Standardní řazení</type>
-			<type type="stroke" key="collation">Řazení podle tahů</type>
-			<type type="sund" key="numbers" draft="contributed">Sundské číslice</type>
-			<type type="taml" key="numbers">Tamilské tradiční číslice</type>
-			<type type="tamldec" key="numbers">Tamilské číslice</type>
-			<type type="telu" key="numbers">Telugské číslice</type>
-			<type type="tertiary" key="colStrength" draft="contributed">Řadit akcenty/velká a malá písmena/šířku</type>
-			<type type="thai" key="numbers">Thajské číslice</type>
-			<type type="tibt" key="numbers">Tibetské číslice</type>
-			<type type="traditional" key="collation">Tradiční řazení</type>
-			<type type="traditional" key="numbers">Tradiční číslovky</type>
-			<type type="unihan" key="collation">Řazení podle radikálů</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">Nejdříve řadit velká písmena</type>
-			<type type="vaii" key="numbers">Vaiské číslice</type>
-			<type type="yes" key="colBackwards" draft="contributed">Řadit akcenty opačně</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">Rozlišovat při řazení velká a malá písmena</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">Řadit jednotlivé typy slabičných písem (kana) různě</type>
-			<type type="yes" key="colNormalization">Řadit podle normalizovaného kódování Unicode</type>
-			<type type="yes" key="colNumeric">Řadit číslice numericky</type>
-			<type type="zhuyin" key="collation">Ču-jin</type>
+			<type key="calendar" type="buddhist">Buddhistický kalendář</type>
+			<type key="calendar" type="chinese">Čínský kalendář</type>
+			<type key="calendar" type="coptic">Koptský kalendář</type>
+			<type key="calendar" type="dangi">Korejský kalendář Dangi</type>
+			<type key="calendar" type="ethiopic">Etiopský kalendář</type>
+			<type key="calendar" type="ethiopic-amete-alem">Etiopský kalendář (Amete-Alem)</type>
+			<type key="calendar" type="gregorian">Gregoriánský kalendář</type>
+			<type key="calendar" type="hebrew">Hebrejský kalendář</type>
+			<type key="calendar" type="indian">Indický národní kalendář</type>
+			<type key="calendar" type="islamic">Muslimský kalendář</type>
+			<type key="calendar" type="islamic-civil">Muslimský občanský kalendář</type>
+			<type key="calendar" type="iso8601">Kalendář ISO-8601</type>
+			<type key="calendar" type="japanese">Japonský kalendář</type>
+			<type key="calendar" type="persian">Perský kalendář</type>
+			<type key="calendar" type="roc">Kalendář Čínské republiky</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">Řadit symboly</type>
+			<type key="colAlternate" type="shifted" draft="contributed">Při řazení ignorovat symboly</type>
+			<type key="colBackwards" type="no" draft="contributed">Normální řazení akcentů</type>
+			<type key="colBackwards" type="yes" draft="contributed">Řadit akcenty opačně</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">Nejdříve řadit malá písmena</type>
+			<type key="colCaseFirst" type="no">Běžné řazení velkých a malých písmen</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">Nejdříve řadit velká písmena</type>
+			<type key="colCaseLevel" type="no" draft="contributed">Nerozlišovat při řazení velká a malá písmena</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">Rozlišovat při řazení velká a malá písmena</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">Řadit slabičná písma (kana) samostatně</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">Řadit jednotlivé typy slabičných písem (kana) různě</type>
+			<type key="collation" type="big5han">Řazení pro tradiční čínštinu – Big5</type>
+			<type key="collation" type="dictionary">Slovníkové řazení</type>
+			<type key="collation" type="ducet">Výchozí řazení Unicode</type>
+			<type key="collation" type="eor" draft="contributed">Evropské řazení</type>
+			<type key="collation" type="gb2312han">Řazení pro zjednodušenou čínštinu – GB2312</type>
+			<type key="collation" type="phonebook">Řazení jako v telefonním seznamu</type>
+			<type key="collation" type="phonetic" draft="contributed">Fonetické řazení</type>
+			<type key="collation" type="pinyin">Řazení podle pchin-jinu</type>
+			<type key="collation" type="reformed">Reformované řazení</type>
+			<type key="collation" type="search">Obecné hledání</type>
+			<type key="collation" type="searchjl" draft="contributed">Vyhledávat podle počáteční souhlásky písma hangul</type>
+			<type key="collation" type="standard">Standardní řazení</type>
+			<type key="collation" type="stroke">Řazení podle tahů</type>
+			<type key="collation" type="traditional">Tradiční řazení</type>
+			<type key="collation" type="unihan">Řazení podle radikálů</type>
+			<type key="collation" type="zhuyin">Ču-jin</type>
+			<type key="colNormalization" type="no" draft="contributed">Řadit bez normalizace</type>
+			<type key="colNormalization" type="yes">Řadit podle normalizovaného kódování Unicode</type>
+			<type key="colNumeric" type="no" draft="contributed">Řadit číslice jednotlivě</type>
+			<type key="colNumeric" type="yes">Řadit číslice numericky</type>
+			<type key="colStrength" type="identical" draft="contributed">Řadit vše</type>
+			<type key="colStrength" type="primary" draft="contributed">Řadit pouze základní písmena</type>
+			<type key="colStrength" type="quaternary" draft="contributed">Řadit akcenty/velká a malá písmena/šířku/kana</type>
+			<type key="colStrength" type="secondary" draft="contributed">Řadit akcenty</type>
+			<type key="colStrength" type="tertiary" draft="contributed">Řadit akcenty/velká a malá písmena/šířku</type>
+			<type key="hc" type="h11">12hodinový systém (0–11)</type>
+			<type key="hc" type="h12">12hodinový systém (1–12)</type>
+			<type key="hc" type="h23">24hodinový systém (0–23)</type>
+			<type key="hc" type="h24">24hodinový systém (1–24)</type>
+			<type key="lb" type="loose">Volný styl zalamování řádků</type>
+			<type key="lb" type="normal">Běžný styl zalamování řádků</type>
+			<type key="lb" type="strict">Striktní styl zalamování řádků</type>
+			<type key="ms" type="metric">Metrická soustava</type>
+			<type key="ms" type="uksystem">Britská měrná soustava</type>
+			<type key="ms" type="ussystem">Americká měrná soustava</type>
+			<type key="numbers" type="arab">Arabsko-indické číslice</type>
+			<type key="numbers" type="arabext">Rozšířené arabsko-indické číslice</type>
+			<type key="numbers" type="armn">Arménské číslice</type>
+			<type key="numbers" type="armnlow">Malé arménské číslice</type>
+			<type key="numbers" type="bali" draft="contributed">Balijské číslice</type>
+			<type key="numbers" type="beng">Bengálské číslice</type>
+			<type key="numbers" type="deva">Číslice písma dévanágarí</type>
+			<type key="numbers" type="ethi">Etiopské číslice</type>
+			<type key="numbers" type="finance">Finanční zápis čísel</type>
+			<type key="numbers" type="fullwide">Číslice – plná šířka</type>
+			<type key="numbers" type="geor">Gruzínské číslice</type>
+			<type key="numbers" type="grek">Řecké číslice</type>
+			<type key="numbers" type="greklow">Malé řecké číslice</type>
+			<type key="numbers" type="gujr">Gudžarátské číslice</type>
+			<type key="numbers" type="guru">Číslice gurmukhí</type>
+			<type key="numbers" type="hanidec">Čínské desítkové číslice</type>
+			<type key="numbers" type="hans">Číslice zjednodušené čínštiny</type>
+			<type key="numbers" type="hansfin">Finanční číslice zjednodušené čínštiny</type>
+			<type key="numbers" type="hant">Číslice tradiční čínštiny</type>
+			<type key="numbers" type="hantfin">Finanční číslice tradiční čínštiny</type>
+			<type key="numbers" type="hebr">Hebrejské číslice</type>
+			<type key="numbers" type="java" draft="contributed">Javánské číslice</type>
+			<type key="numbers" type="jpan">Japonské číslice</type>
+			<type key="numbers" type="jpanfin">Japonské finanční číslice</type>
+			<type key="numbers" type="khmr">Khmerské číslice</type>
+			<type key="numbers" type="knda">Kannadské číslice</type>
+			<type key="numbers" type="laoo">Laoské číslice</type>
+			<type key="numbers" type="latn">Západní číslice</type>
+			<type key="numbers" type="mlym">Malajálamské číslice</type>
+			<type key="numbers" type="mong">Mongolské číslice</type>
+			<type key="numbers" type="mymr">Myanmarské číslice</type>
+			<type key="numbers" type="native" draft="contributed">Nativní číslice</type>
+			<type key="numbers" type="orya">Urijské číslice</type>
+			<type key="numbers" type="osma" draft="contributed">Somálské číslice</type>
+			<type key="numbers" type="roman">Římské číslice</type>
+			<type key="numbers" type="romanlow">Malé římské číslice</type>
+			<type key="numbers" type="saur" draft="contributed">Saurášterské číslice</type>
+			<type key="numbers" type="sund" draft="contributed">Sundské číslice</type>
+			<type key="numbers" type="taml">Tamilské tradiční číslice</type>
+			<type key="numbers" type="tamldec">Tamilské číslice</type>
+			<type key="numbers" type="telu">Telugské číslice</type>
+			<type key="numbers" type="thai">Thajské číslice</type>
+			<type key="numbers" type="tibt">Tibetské číslice</type>
+			<type key="numbers" type="traditional">Tradiční číslovky</type>
+			<type key="numbers" type="vaii">Vaiské číslice</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">BGN</transformName>
@@ -1469,6 +1485,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d.</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d.</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLLL y G</dateFormatItem>
@@ -1816,19 +1833,72 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">půln.</dayPeriod>
 							<dayPeriod type="am">dop.</dayPeriod>
 							<dayPeriod type="noon">pol.</dayPeriod>
 							<dayPeriod type="pm">odp.</dayPeriod>
+							<dayPeriod type="morning1">r.</dayPeriod>
+							<dayPeriod type="morning2">dop.</dayPeriod>
+							<dayPeriod type="afternoon1">odp.</dayPeriod>
+							<dayPeriod type="evening1">več.</dayPeriod>
+							<dayPeriod type="night1">v n.</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">půl.</dayPeriod>
 							<dayPeriod type="am">dop.</dayPeriod>
 							<dayPeriod type="noon">pol.</dayPeriod>
 							<dayPeriod type="pm">odp.</dayPeriod>
+							<dayPeriod type="morning1">r.</dayPeriod>
+							<dayPeriod type="morning2">d.</dayPeriod>
+							<dayPeriod type="afternoon1">o.</dayPeriod>
+							<dayPeriod type="evening1">v.</dayPeriod>
+							<dayPeriod type="night1">n.</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">dopoledne</dayPeriod>
+							<dayPeriod type="midnight">půlnoc</dayPeriod>
+							<dayPeriod type="am">dop.</dayPeriod>
 							<dayPeriod type="noon">poledne</dayPeriod>
-							<dayPeriod type="pm">odpoledne</dayPeriod>
+							<dayPeriod type="pm">odp.</dayPeriod>
+							<dayPeriod type="morning1">ráno</dayPeriod>
+							<dayPeriod type="morning2">dopoledne</dayPeriod>
+							<dayPeriod type="afternoon1">odpoledne</dayPeriod>
+							<dayPeriod type="evening1">večer</dayPeriod>
+							<dayPeriod type="night1">v noci</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">půlnoc</dayPeriod>
+							<dayPeriod type="am">dop.</dayPeriod>
+							<dayPeriod type="noon">poledne</dayPeriod>
+							<dayPeriod type="pm">odp.</dayPeriod>
+							<dayPeriod type="morning1">ráno</dayPeriod>
+							<dayPeriod type="morning2">dopoledne</dayPeriod>
+							<dayPeriod type="afternoon1">odpoledne</dayPeriod>
+							<dayPeriod type="evening1">večer</dayPeriod>
+							<dayPeriod type="night1">noc</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">půl.</dayPeriod>
+							<dayPeriod type="am">dop.</dayPeriod>
+							<dayPeriod type="noon">pol.</dayPeriod>
+							<dayPeriod type="pm">odp.</dayPeriod>
+							<dayPeriod type="morning1">ráno</dayPeriod>
+							<dayPeriod type="morning2">dop.</dayPeriod>
+							<dayPeriod type="afternoon1">odp.</dayPeriod>
+							<dayPeriod type="evening1">več.</dayPeriod>
+							<dayPeriod type="night1">noc</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">půlnoc</dayPeriod>
+							<dayPeriod type="am">dop.</dayPeriod>
+							<dayPeriod type="noon">poledne</dayPeriod>
+							<dayPeriod type="pm">odp.</dayPeriod>
+							<dayPeriod type="morning1">ráno</dayPeriod>
+							<dayPeriod type="morning2">dopoledne</dayPeriod>
+							<dayPeriod type="afternoon1">odpoledne</dayPeriod>
+							<dayPeriod type="evening1">večer</dayPeriod>
+							<dayPeriod type="night1">noc</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1844,7 +1914,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<eraNarrow>
 						<era type="0">př.n.l.</era>
 						<era type="1">n.l.</era>
-						<era type="1" alt="variant" draft="contributed">n. l.</era>
 					</eraNarrow>
 				</eras>
 				<dateFormats>
@@ -1932,6 +2001,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">H:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">H:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">H:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d. M.</dateFormatItem>
 						<dateFormatItem id="MEd">E d. M.</dateFormatItem>
@@ -2177,9 +2250,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</eras>
 			</calendar>
 			<calendar type="japanese">
-				<!-- need some non-empty element here to make inheritance work,
-					 this copy of generic dateFormats above is smaller than root japanese eras
-				-->
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
@@ -2254,10 +2324,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</calendars>
 		<fields>
 			<field type="era">
-				<displayName>Letopočet</displayName>
+				<displayName>letopočet</displayName>
 			</field>
 			<field type="year">
-				<displayName>Rok</displayName>
+				<displayName>rok</displayName>
 				<relative type="-1">minulý rok</relative>
 				<relative type="0">tento rok</relative>
 				<relative type="1">příští rok</relative>
@@ -2276,6 +2346,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>r.</displayName>
+				<relative type="-1">minulý rok</relative>
+				<relative type="0">tento rok</relative>
+				<relative type="1">příští rok</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">za {0} r.</relativeTimePattern>
 					<relativeTimePattern count="few">za {0} r.</relativeTimePattern>
@@ -2291,6 +2364,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>r.</displayName>
+				<relative type="-1">minulý rok</relative>
+				<relative type="0">tento rok</relative>
+				<relative type="1">příští rok</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">za {0} r.</relativeTimePattern>
 					<relativeTimePattern count="few">za {0} r.</relativeTimePattern>
@@ -2305,7 +2381,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="quarter">
-				<displayName>Čtvrtletí</displayName>
+				<displayName>čtvrtletí</displayName>
+				<relative type="-1">minulé čtvrtletí</relative>
+				<relative type="0">toto čtvrtletí</relative>
+				<relative type="1">příští čtvrtletí</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">za {0} čtvrtletí</relativeTimePattern>
 					<relativeTimePattern count="few">za {0} čtvrtletí</relativeTimePattern>
@@ -2350,7 +2429,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="month">
-				<displayName>Měsíc</displayName>
+				<displayName>měsíc</displayName>
 				<relative type="-1">minulý měsíc</relative>
 				<relative type="0">tento měsíc</relative>
 				<relative type="1">příští měsíc</relative>
@@ -2398,7 +2477,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="week">
-				<displayName>Týden</displayName>
+				<displayName>týden</displayName>
 				<relative type="-1">minulý týden</relative>
 				<relative type="0">tento týden</relative>
 				<relative type="1">příští týden</relative>
@@ -2417,6 +2496,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>týd.</displayName>
+				<relative type="-1">minulý týd.</relative>
+				<relative type="0">tento týd.</relative>
+				<relative type="1">příští týd.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">za {0} týd.</relativeTimePattern>
 					<relativeTimePattern count="few">za {0} týd.</relativeTimePattern>
@@ -2432,6 +2514,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>týd.</displayName>
+				<relative type="-1">minulý týd.</relative>
+				<relative type="0">tento týd.</relative>
+				<relative type="1">příští týd.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">za {0} týd.</relativeTimePattern>
 					<relativeTimePattern count="few">za {0} týd.</relativeTimePattern>
@@ -2446,7 +2531,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day">
-				<displayName>Den</displayName>
+				<displayName>den</displayName>
 				<relative type="-2">předevčírem</relative>
 				<relative type="-1">včera</relative>
 				<relative type="0">dnes</relative>
@@ -2467,6 +2552,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>den</displayName>
+				<relative type="-2">předevčírem</relative>
+				<relative type="-1">včera</relative>
+				<relative type="0">dnes</relative>
+				<relative type="1">zítra</relative>
+				<relative type="2">pozítří</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">za {0} den</relativeTimePattern>
 					<relativeTimePattern count="few">za {0} dny</relativeTimePattern>
@@ -2482,6 +2572,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>den</displayName>
+				<relative type="-2">předevčírem</relative>
+				<relative type="-1">včera</relative>
+				<relative type="0">dnes</relative>
+				<relative type="1">zítra</relative>
+				<relative type="2">pozítří</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">za {0} den</relativeTimePattern>
 					<relativeTimePattern count="few">za {0} dny</relativeTimePattern>
@@ -2496,7 +2591,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="weekday">
-				<displayName>Den v týdnu</displayName>
+				<displayName>den v týdnu</displayName>
 			</field>
 			<field type="sun">
 				<relative type="-1">minulou neděli</relative>
@@ -2604,10 +2699,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">příští sobotu</relative>
 			</field>
 			<field type="dayperiod">
-				<displayName>dop./odp.</displayName>
+				<displayName>část dne</displayName>
 			</field>
 			<field type="hour">
-				<displayName>Hodina</displayName>
+				<displayName>hodina</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">za {0} hodinu</relativeTimePattern>
 					<relativeTimePattern count="few">za {0} hodiny</relativeTimePattern>
@@ -2652,7 +2747,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="minute">
-				<displayName>Minuta</displayName>
+				<displayName>minuta</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">za {0} minutu</relativeTimePattern>
 					<relativeTimePattern count="few">za {0} minuty</relativeTimePattern>
@@ -2697,7 +2792,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="second">
-				<displayName>Sekunda</displayName>
+				<displayName>sekunda</displayName>
 				<relative type="0">nyní</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">za {0} sekundu</relativeTimePattern>
@@ -2714,6 +2809,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="second-short">
 				<displayName>s</displayName>
+				<relative type="0">nyní</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">za {0} s</relativeTimePattern>
 					<relativeTimePattern count="few">za {0} s</relativeTimePattern>
@@ -2729,6 +2825,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="second-narrow">
 				<displayName>s</displayName>
+				<relative type="0">nyní</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">za {0} s</relativeTimePattern>
 					<relativeTimePattern count="few">za {0} s</relativeTimePattern>
@@ -2743,7 +2840,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>Časové pásmo</displayName>
+				<displayName>časové pásmo</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
@@ -3621,6 +3718,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
 			</zone>
@@ -3705,6 +3805,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Čita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Jakutsk</exemplarCity>
 			</zone>
@@ -3723,6 +3826,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Sredněkolymsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamčatka</exemplarCity>
 			</zone>
@@ -4094,9 +4200,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic draft="contributed">Apijský čas</generic>
-					<standard draft="contributed">Apijský standardní čas</standard>
-					<daylight draft="contributed">Apijský letní čas</daylight>
+					<generic>Apijský čas</generic>
+					<standard>Apijský standardní čas</standard>
+					<daylight>Apijský letní čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Aqtau">
@@ -4972,6 +5078,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<native draft="contributed">latn</native>
 		</otherNumberingSystems>
 		<minimumGroupingDigits draft="contributed">1</minimumGroupingDigits>
+		<symbols numberSystem="arab">
+			<timeSeparator draft="contributed">:</timeSeparator>
+		</symbols>
 		<symbols numberSystem="latn">
 			<decimal>,</decimal>
 			<group> </group>
@@ -5120,6 +5229,58 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="contributed">0 tis'.' ¤</pattern>
+					<pattern type="1000" count="few" draft="contributed">0 tis'.' ¤</pattern>
+					<pattern type="1000" count="many" draft="contributed">0 tis'.' ¤</pattern>
+					<pattern type="1000" count="other" draft="contributed">0 tis'.' ¤</pattern>
+					<pattern type="10000" count="one" draft="contributed">00 tis'.' ¤</pattern>
+					<pattern type="10000" count="few" draft="contributed">00 tis'.' ¤</pattern>
+					<pattern type="10000" count="many" draft="contributed">00 tis'.' ¤</pattern>
+					<pattern type="10000" count="other" draft="contributed">00 tis'.' ¤</pattern>
+					<pattern type="100000" count="one" draft="contributed">000 tis'.' ¤</pattern>
+					<pattern type="100000" count="few" draft="contributed">000 tis'.' ¤</pattern>
+					<pattern type="100000" count="many" draft="contributed">000 tis'.' ¤</pattern>
+					<pattern type="100000" count="other" draft="contributed">000 tis'.' ¤</pattern>
+					<pattern type="1000000" count="one" draft="contributed">0 mil'.' ¤</pattern>
+					<pattern type="1000000" count="few" draft="contributed">0 mil'.' ¤</pattern>
+					<pattern type="1000000" count="many" draft="contributed">0 mil'.' ¤</pattern>
+					<pattern type="1000000" count="other" draft="contributed">0 mil'.' ¤</pattern>
+					<pattern type="10000000" count="one" draft="contributed">00 mil'.' ¤</pattern>
+					<pattern type="10000000" count="few" draft="contributed">00 mil'.' ¤</pattern>
+					<pattern type="10000000" count="many" draft="contributed">00 mil'.' ¤</pattern>
+					<pattern type="10000000" count="other" draft="contributed">00 mil'.' ¤</pattern>
+					<pattern type="100000000" count="one" draft="contributed">000 mil'.' ¤</pattern>
+					<pattern type="100000000" count="few" draft="contributed">000 mil'.' ¤</pattern>
+					<pattern type="100000000" count="many" draft="contributed">000 mil'.' ¤</pattern>
+					<pattern type="100000000" count="other" draft="contributed">000 mil'.' ¤</pattern>
+					<pattern type="1000000000" count="one" draft="contributed">0 mld'.' ¤</pattern>
+					<pattern type="1000000000" count="few" draft="contributed">0 mld'.' ¤</pattern>
+					<pattern type="1000000000" count="many" draft="contributed">0 mld'.' ¤</pattern>
+					<pattern type="1000000000" count="other" draft="contributed">0 mld'.' ¤</pattern>
+					<pattern type="10000000000" count="one" draft="contributed">00 mld'.' ¤</pattern>
+					<pattern type="10000000000" count="few" draft="contributed">00 mld'.' ¤</pattern>
+					<pattern type="10000000000" count="many" draft="contributed">00 mld'.' ¤</pattern>
+					<pattern type="10000000000" count="other" draft="contributed">00 mld'.' ¤</pattern>
+					<pattern type="100000000000" count="one" draft="contributed">000 mld'.' ¤</pattern>
+					<pattern type="100000000000" count="few" draft="contributed">000 mld'.' ¤</pattern>
+					<pattern type="100000000000" count="many" draft="contributed">000 mld'.' ¤</pattern>
+					<pattern type="100000000000" count="other" draft="contributed">000 mld'.' ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="contributed">0 bil'.' ¤</pattern>
+					<pattern type="1000000000000" count="few" draft="contributed">0 bil'.' ¤</pattern>
+					<pattern type="1000000000000" count="many" draft="contributed">0 bil'.' ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="contributed">0 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="contributed">00 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="few" draft="contributed">00 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="many" draft="contributed">00 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="contributed">00 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="contributed">000 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="few" draft="contributed">000 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="many" draft="contributed">000 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="contributed">000 bil'.' ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="few">{0} {1}</unitPattern>
 			<unitPattern count="many">{0} {1}</unitPattern>
@@ -5197,6 +5358,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">angolské kwanzy</displayName>
 				<displayName count="other">angolských kwanz</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>angolská kwanza (1977–1991)</displayName>
@@ -5319,6 +5481,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">bosenské konvertibilní marky</displayName>
 				<displayName count="other">bosenských konvertibilních marek</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BAN">
 				<displayName>bosenský nový dinár (1994–1997)</displayName>
@@ -5434,6 +5597,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">bolivijského boliviana</displayName>
 				<displayName count="other">bolivijských bolivianos</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOL">
 				<displayName>bolivijský boliviano (1863–1963)</displayName>
@@ -5548,6 +5712,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">botswanské puly</displayName>
 				<displayName count="other">botswanských pul</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>běloruský rubl (1994–1999)</displayName>
@@ -5699,6 +5864,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">kubánského konvertibilního pesa</displayName>
 				<displayName count="other">kubánských konvertibilních pes</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>kubánské peso</displayName>
@@ -5732,6 +5898,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">české koruny</displayName>
 				<displayName count="other">českých korun</displayName>
 				<symbol>Kč</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>východoněmecká marka</displayName>
@@ -5764,6 +5931,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">dánské koruny</displayName>
 				<displayName count="other">dánských korun</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>dominikánské peso</displayName>
@@ -5813,6 +5981,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">egyptské libry</displayName>
 				<displayName count="other">egyptských liber</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>eritrejská nakfa</displayName>
@@ -5888,6 +6057,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">falklandské libry</displayName>
 				<displayName count="other">falklandských liber</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>francouzský frank</displayName>
@@ -5921,6 +6091,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">gruzínského lari</displayName>
 				<displayName count="other">gruzínských lari</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>ghanský cedi (1979–2007)</displayName>
@@ -5962,6 +6133,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">guinejského franku</displayName>
 				<displayName count="other">guinejských franků</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>guinejský syli</displayName>
@@ -5994,6 +6166,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">guatemalského quetzalu</displayName>
 				<displayName count="other">guatemalských quetzalů</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>portugalskoguinejské escudo</displayName>
@@ -6036,6 +6209,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">honduraské lempiry</displayName>
 				<displayName count="other">honduraských lempir</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>chorvatský dinár</displayName>
@@ -6052,6 +6226,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">chorvatské kuny</displayName>
 				<displayName count="other">chorvatských kun</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>haitský gourde</displayName>
@@ -6068,6 +6243,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">maďarského forintu</displayName>
 				<displayName count="other">maďarských forintů</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>indonéská rupie</displayName>
@@ -6076,6 +6252,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">indonéské rupie</displayName>
 				<displayName count="other">indonéských rupií</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>irská libra</displayName>
@@ -6150,6 +6327,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">islandské koruny</displayName>
 				<displayName count="other">islandských korun</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>italská lira</displayName>
@@ -6217,6 +6395,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">komorského franku</displayName>
 				<displayName count="other">komorských franků</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>severokorejský won</displayName>
@@ -6225,6 +6404,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">severokorejského wonu</displayName>
 				<displayName count="other">severokorejských wonů</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRH">
 				<displayName>jihokorejský hwan (1953–1962)</displayName>
@@ -6293,6 +6473,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">libanonské libry</displayName>
 				<displayName count="other">libanonských liber</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>srílanská rupie</displayName>
@@ -6301,6 +6482,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">srílanské rupie</displayName>
 				<displayName count="other">srílanských rupií</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>liberijský dolar</displayName>
@@ -6430,6 +6612,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">madagaskarského ariary</displayName>
 				<displayName count="other">madagaskarských ariary</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>madagaskarský frank</displayName>
@@ -6470,6 +6653,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">myanmarského kyatu</displayName>
 				<displayName count="other">myanmarských kyatů</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>mongolský tugrik</displayName>
@@ -6519,6 +6703,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">mauricijské rupie</displayName>
 				<displayName count="other">mauricijských rupií</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVP">
 				<displayName>maledivská rupie (1947–1981)</displayName>
@@ -6576,6 +6761,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">malajsijského ringgitu</displayName>
 				<displayName count="other">malajsijských ringgitů</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>mosambický escudo</displayName>
@@ -6634,6 +6820,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">nikaragujské córdoby</displayName>
 				<displayName count="other">nikaragujských córdob</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>nizozemský gulden</displayName>
@@ -6650,6 +6837,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">norské koruny</displayName>
 				<displayName count="other">norských korun</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>nepálská rupie</displayName>
@@ -6658,6 +6846,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">nepálské rupie</displayName>
 				<displayName count="other">nepálských rupií</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>novozélandský dolar</displayName>
@@ -6732,6 +6921,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">pákistánské rupie</displayName>
 				<displayName count="other">pákistánských rupií</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>polský zlotý</displayName>
@@ -6740,6 +6930,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">polského zlotého</displayName>
 				<displayName count="other">polských zlotých</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>polský zlotý (1950–1995)</displayName>
@@ -6813,6 +7004,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">ruského rublu</displayName>
 				<displayName count="other">ruských rublů</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>ruský rubl (1991–1998)</displayName>
@@ -6830,6 +7022,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">rwandského franku</displayName>
 				<displayName count="other">rwandských franků</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>saúdský rijál</displayName>
@@ -6887,6 +7080,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">švédské koruny</displayName>
 				<displayName count="other">švédských korun</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>singapurský dolar</displayName>
@@ -6904,6 +7098,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">svatohelenské libry</displayName>
 				<displayName count="other">svatohelenských liber</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>slovinský tolar</displayName>
@@ -6970,6 +7165,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">svatotomášské dobry</displayName>
 				<displayName count="other">svatotomášských dober</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>sovětský rubl</displayName>
@@ -6994,6 +7190,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">syrské libry</displayName>
 				<displayName count="other">syrských liber</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>svazijský lilangeni</displayName>
@@ -7010,6 +7207,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">thajského bahtu</displayName>
 				<displayName count="other">thajských bahtů</displayName>
 				<symbol>THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>tádžický rubl</displayName>
@@ -7058,6 +7256,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">tonžské paangy</displayName>
 				<displayName count="other">tonžských paang</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>timorské escudo</displayName>
@@ -7083,6 +7282,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">tureckých lir</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>trinidadský dolar</displayName>
@@ -7216,6 +7416,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">venezuelského bolívaru</displayName>
 				<displayName count="other">venezuelských bolívarů</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>vietnamský dong</displayName>
@@ -7284,11 +7485,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="XBB">
 				<displayName>evropská peněžní jednotka</displayName>
-				<displayName count="one">EMU</displayName>
-				<displayName count="few">EMU</displayName>
-				<displayName count="many">EMU</displayName>
-				<displayName count="other">EMU</displayName>
-				<symbol>EMU</symbol>
+				<displayName count="one">evropská peněžní jednotka</displayName>
+				<displayName count="few">evropské peněžní jednotky</displayName>
+				<displayName count="many">evropské peněžní jednotky</displayName>
+				<displayName count="other">evropských peněžních jednotek</displayName>
+				<symbol>XBB</symbol>
 			</currency>
 			<currency type="XBC">
 				<displayName>evropská jednotka účtu 9 (XBC)</displayName>
@@ -7313,6 +7514,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">východokaribského dolaru</displayName>
 				<displayName count="other">východokaribských dolarů</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>SDR</displayName>
@@ -7468,6 +7670,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">jihoafrického randu</displayName>
 				<displayName count="other">jihoafrických randů</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>zambijská kwacha (1968–2012)</displayName>
@@ -7484,6 +7687,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">zambijské kwachy</displayName>
 				<displayName count="other">zambijských kwach</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>zairský nový zaire (1993–1998)</displayName>
@@ -7550,6 +7754,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} metru za sekundu na druhou</unitPattern>
 				<unitPattern count="other">{0} metrů za sekundu na druhou</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>otáčky</displayName>
+				<unitPattern count="one">{0} otáčka</unitPattern>
+				<unitPattern count="few">{0} otáčky</unitPattern>
+				<unitPattern count="many">{0} otáčky</unitPattern>
+				<unitPattern count="other">{0} otáček</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radiány</displayName>
+				<unitPattern count="one">{0} radián</unitPattern>
+				<unitPattern count="few">{0} radiány</unitPattern>
+				<unitPattern count="many">{0} radiánu</unitPattern>
+				<unitPattern count="other">{0} radiánů</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>stupně</displayName>
+				<unitPattern count="one">{0} stupeň</unitPattern>
+				<unitPattern count="few">{0} stupně</unitPattern>
+				<unitPattern count="many">{0} stupně</unitPattern>
+				<unitPattern count="other">{0} stupňů</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>minuty</displayName>
 				<unitPattern count="one">{0} minuta</unitPattern>
@@ -7564,26 +7789,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} vteřiny</unitPattern>
 				<unitPattern count="other">{0} vteřin</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>stupně</displayName>
-				<unitPattern count="one">{0} stupeň</unitPattern>
-				<unitPattern count="few">{0} stupně</unitPattern>
-				<unitPattern count="many">{0} stupně</unitPattern>
-				<unitPattern count="other">{0} stupňů</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radiány</displayName>
-				<unitPattern count="one">{0} radián</unitPattern>
-				<unitPattern count="few">{0} radiány</unitPattern>
-				<unitPattern count="many">{0} radiánu</unitPattern>
-				<unitPattern count="other">{0} radiánů</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>akry</displayName>
-				<unitPattern count="one">{0} akr</unitPattern>
-				<unitPattern count="few">{0} akry</unitPattern>
-				<unitPattern count="many">{0} akru</unitPattern>
-				<unitPattern count="other">{0} akrů</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>kilometry čtvereční</displayName>
+				<unitPattern count="one">{0} kilometr čtvereční</unitPattern>
+				<unitPattern count="few">{0} kilometry čtvereční</unitPattern>
+				<unitPattern count="many">{0} kilometru čtverečního</unitPattern>
+				<unitPattern count="other">{0} kilometrů čtverečních</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektary</displayName>
@@ -7592,12 +7803,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} hektaru</unitPattern>
 				<unitPattern count="other">{0} hektarů</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>metry čtvereční</displayName>
+				<unitPattern count="one">{0} metr čtvereční</unitPattern>
+				<unitPattern count="few">{0} metry čtvereční</unitPattern>
+				<unitPattern count="many">{0} metru čtverečního</unitPattern>
+				<unitPattern count="other">{0} metrů čtverečních</unitPattern>
+				<perUnitPattern>{0} na metr čtvereční</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>centimetry čtvereční</displayName>
 				<unitPattern count="one">{0} centimetr čtvereční</unitPattern>
 				<unitPattern count="few">{0} centimetry čtvereční</unitPattern>
 				<unitPattern count="many">{0} centimetru čtverečního</unitPattern>
 				<unitPattern count="other">{0} centimetrů čtverečních</unitPattern>
+				<perUnitPattern>{0} na centimetr čtvereční</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>míle čtvereční</displayName>
+				<unitPattern count="one">{0} míle čtvereční</unitPattern>
+				<unitPattern count="few">{0} míle čtvereční</unitPattern>
+				<unitPattern count="many">{0} míle čtvereční</unitPattern>
+				<unitPattern count="other">{0} mil čtverečních</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>akry</displayName>
+				<unitPattern count="one">{0} akr</unitPattern>
+				<unitPattern count="few">{0} akry</unitPattern>
+				<unitPattern count="many">{0} akru</unitPattern>
+				<unitPattern count="other">{0} akrů</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yardy čtvereční</displayName>
+				<unitPattern count="one">{0} yard čtvereční</unitPattern>
+				<unitPattern count="few">{0} yardy čtvereční</unitPattern>
+				<unitPattern count="many">{0} yardu čtverečního</unitPattern>
+				<unitPattern count="other">{0} yardů čtverečních</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>stopy čtvereční</displayName>
@@ -7612,34 +7853,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} palce čtvereční</unitPattern>
 				<unitPattern count="many">{0} palce čtverečního</unitPattern>
 				<unitPattern count="other">{0} palců čtverečních</unitPattern>
+				<perUnitPattern>{0} na palec čtvereční</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kilometry čtvereční</displayName>
-				<unitPattern count="one">{0} kilometr čtvereční</unitPattern>
-				<unitPattern count="few">{0} kilometry čtvereční</unitPattern>
-				<unitPattern count="many">{0} kilometru čtverečního</unitPattern>
-				<unitPattern count="other">{0} kilometrů čtverečních</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>metry čtvereční</displayName>
-				<unitPattern count="one">{0} metr čtvereční</unitPattern>
-				<unitPattern count="few">{0} metry čtvereční</unitPattern>
-				<unitPattern count="many">{0} metru čtverečního</unitPattern>
-				<unitPattern count="other">{0} metrů čtverečních</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>míle čtvereční</displayName>
-				<unitPattern count="one">{0} míle čtvereční</unitPattern>
-				<unitPattern count="few">{0} míle čtvereční</unitPattern>
-				<unitPattern count="many">{0} míle čtvereční</unitPattern>
-				<unitPattern count="other">{0} mil čtverečních</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yardy čtvereční</displayName>
-				<unitPattern count="one">{0} yard čtvereční</unitPattern>
-				<unitPattern count="few">{0} yardy čtvereční</unitPattern>
-				<unitPattern count="many">{0} yardu čtverečního</unitPattern>
-				<unitPattern count="other">{0} yardů čtverečních</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karáty</displayName>
+				<unitPattern count="one">{0} karát</unitPattern>
+				<unitPattern count="few">{0} karáty</unitPattern>
+				<unitPattern count="many">{0} karátu</unitPattern>
+				<unitPattern count="other">{0} karátů</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litry na kilometr</displayName>
@@ -7648,6 +7869,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} litru na kilometr</unitPattern>
 				<unitPattern count="other">{0} litrů na kilometr</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>litry na sto kilometrů</displayName>
+				<unitPattern count="one">{0} litr na sto kilometrů</unitPattern>
+				<unitPattern count="few">{0} litry na sto kilometrů</unitPattern>
+				<unitPattern count="many">{0} litru na sto kilometrů</unitPattern>
+				<unitPattern count="other">{0} litrů na sto kilometrů</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>míle na galon</displayName>
 				<unitPattern count="one">{0} míle na galon</unitPattern>
@@ -7655,69 +7883,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} míle na galon</unitPattern>
 				<unitPattern count="other">{0} mil na galon</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bity</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="few">{0} bity</unitPattern>
-				<unitPattern count="many">{0} bitu</unitPattern>
-				<unitPattern count="other">{0} bitů</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bajty</displayName>
-				<unitPattern count="one">{0} bajt</unitPattern>
-				<unitPattern count="few">{0} bajty</unitPattern>
-				<unitPattern count="many">{0} bajtu</unitPattern>
-				<unitPattern count="other">{0} bajtů</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabity</displayName>
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="few">{0} gigabity</unitPattern>
-				<unitPattern count="many">{0} gigabitu</unitPattern>
-				<unitPattern count="other">{0} gigabitů</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabajty</displayName>
-				<unitPattern count="one">{0} gigabajt</unitPattern>
-				<unitPattern count="few">{0} gigabajty</unitPattern>
-				<unitPattern count="many">{0} gigabajtu</unitPattern>
-				<unitPattern count="other">{0} gigabajtů</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobity</displayName>
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="few">{0} kilobity</unitPattern>
-				<unitPattern count="many">{0} kilobitu</unitPattern>
-				<unitPattern count="other">{0} kilobitů</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobajty</displayName>
-				<unitPattern count="one">{0} kilobajt</unitPattern>
-				<unitPattern count="few">{0} kilobajty</unitPattern>
-				<unitPattern count="many">{0} kilobajtu</unitPattern>
-				<unitPattern count="other">{0} kilobajtů</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabity</displayName>
-				<unitPattern count="one">{0} megabit</unitPattern>
-				<unitPattern count="few">{0} megabity</unitPattern>
-				<unitPattern count="many">{0} megabitu</unitPattern>
-				<unitPattern count="other">{0} megabitů</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabajty</displayName>
-				<unitPattern count="one">{0} megabajt</unitPattern>
-				<unitPattern count="few">{0} megabajty</unitPattern>
-				<unitPattern count="many">{0} megabajtu</unitPattern>
-				<unitPattern count="other">{0} megabajtů</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabity</displayName>
-				<unitPattern count="one">{0} terabit</unitPattern>
-				<unitPattern count="few">{0} terabity</unitPattern>
-				<unitPattern count="many">{0} terabitu</unitPattern>
-				<unitPattern count="other">{0} terabitů</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabajty</displayName>
 				<unitPattern count="one">{0} terabajt</unitPattern>
@@ -7725,12 +7890,107 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} terabajtu</unitPattern>
 				<unitPattern count="other">{0} terabajtů</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabity</displayName>
+				<unitPattern count="one">{0} terabit</unitPattern>
+				<unitPattern count="few">{0} terabity</unitPattern>
+				<unitPattern count="many">{0} terabitu</unitPattern>
+				<unitPattern count="other">{0} terabitů</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabajty</displayName>
+				<unitPattern count="one">{0} gigabajt</unitPattern>
+				<unitPattern count="few">{0} gigabajty</unitPattern>
+				<unitPattern count="many">{0} gigabajtu</unitPattern>
+				<unitPattern count="other">{0} gigabajtů</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabity</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="few">{0} gigabity</unitPattern>
+				<unitPattern count="many">{0} gigabitu</unitPattern>
+				<unitPattern count="other">{0} gigabitů</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabajty</displayName>
+				<unitPattern count="one">{0} megabajt</unitPattern>
+				<unitPattern count="few">{0} megabajty</unitPattern>
+				<unitPattern count="many">{0} megabajtu</unitPattern>
+				<unitPattern count="other">{0} megabajtů</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabity</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="few">{0} megabity</unitPattern>
+				<unitPattern count="many">{0} megabitu</unitPattern>
+				<unitPattern count="other">{0} megabitů</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobajty</displayName>
+				<unitPattern count="one">{0} kilobajt</unitPattern>
+				<unitPattern count="few">{0} kilobajty</unitPattern>
+				<unitPattern count="many">{0} kilobajtu</unitPattern>
+				<unitPattern count="other">{0} kilobajtů</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobity</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="few">{0} kilobity</unitPattern>
+				<unitPattern count="many">{0} kilobitu</unitPattern>
+				<unitPattern count="other">{0} kilobitů</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bajty</displayName>
+				<unitPattern count="one">{0} bajt</unitPattern>
+				<unitPattern count="few">{0} bajty</unitPattern>
+				<unitPattern count="many">{0} bajtu</unitPattern>
+				<unitPattern count="other">{0} bajtů</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bity</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="few">{0} bity</unitPattern>
+				<unitPattern count="many">{0} bitu</unitPattern>
+				<unitPattern count="other">{0} bitů</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>století</displayName>
+				<unitPattern count="one">{0} století</unitPattern>
+				<unitPattern count="few">{0} století</unitPattern>
+				<unitPattern count="many">{0} století</unitPattern>
+				<unitPattern count="other">{0} století</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>roky</displayName>
+				<unitPattern count="one">{0} rok</unitPattern>
+				<unitPattern count="few">{0} roky</unitPattern>
+				<unitPattern count="many">{0} roku</unitPattern>
+				<unitPattern count="other">{0} let</unitPattern>
+				<perUnitPattern>{0} za rok</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>měsíce</displayName>
+				<unitPattern count="one">{0} měsíc</unitPattern>
+				<unitPattern count="few">{0} měsíce</unitPattern>
+				<unitPattern count="many">{0} měsíce</unitPattern>
+				<unitPattern count="other">{0} měsíců</unitPattern>
+				<perUnitPattern>{0} za měsíc</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>týdny</displayName>
+				<unitPattern count="one">{0} týden</unitPattern>
+				<unitPattern count="few">{0} týdny</unitPattern>
+				<unitPattern count="many">{0} týdne</unitPattern>
+				<unitPattern count="other">{0} týdnů</unitPattern>
+				<perUnitPattern>{0} za týden</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>dny</displayName>
 				<unitPattern count="one">{0} den</unitPattern>
 				<unitPattern count="few">{0} dny</unitPattern>
 				<unitPattern count="many">{0} dne</unitPattern>
 				<unitPattern count="other">{0} dní</unitPattern>
+				<perUnitPattern>{0} za den</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>hodiny</displayName>
@@ -7738,14 +7998,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} hodiny</unitPattern>
 				<unitPattern count="many">{0} hodiny</unitPattern>
 				<unitPattern count="other">{0} hodin</unitPattern>
-				<perUnitPattern>za hodinu</perUnitPattern>
+				<perUnitPattern>{0} za hodinu</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikrosekundy</displayName>
-				<unitPattern count="one">{0} mikrosekunda</unitPattern>
-				<unitPattern count="few">{0} mikrosekundy</unitPattern>
-				<unitPattern count="many">{0} mikrosekundy</unitPattern>
-				<unitPattern count="other">{0} mikrosekund</unitPattern>
+			<unit type="duration-minute">
+				<displayName>minuty</displayName>
+				<unitPattern count="one">{0} minuta</unitPattern>
+				<unitPattern count="few">{0} minuty</unitPattern>
+				<unitPattern count="many">{0} minuty</unitPattern>
+				<unitPattern count="other">{0} minut</unitPattern>
+				<perUnitPattern>{0} za minutu</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>sekundy</displayName>
+				<unitPattern count="one">{0} sekunda</unitPattern>
+				<unitPattern count="few">{0} sekundy</unitPattern>
+				<unitPattern count="many">{0} sekundy</unitPattern>
+				<unitPattern count="other">{0} sekund</unitPattern>
+				<perUnitPattern>{0} za sekundu</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>milisekundy</displayName>
@@ -7754,19 +8023,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} milisekundy</unitPattern>
 				<unitPattern count="other">{0} milisekund</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>minuty</displayName>
-				<unitPattern count="one">{0} minuta</unitPattern>
-				<unitPattern count="few">{0} minuty</unitPattern>
-				<unitPattern count="many">{0} minuty</unitPattern>
-				<unitPattern count="other">{0} minut</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>měsíce</displayName>
-				<unitPattern count="one">{0} měsíc</unitPattern>
-				<unitPattern count="few">{0} měsíce</unitPattern>
-				<unitPattern count="many">{0} měsíce</unitPattern>
-				<unitPattern count="other">{0} měsíců</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>mikrosekundy</displayName>
+				<unitPattern count="one">{0} mikrosekunda</unitPattern>
+				<unitPattern count="few">{0} mikrosekundy</unitPattern>
+				<unitPattern count="many">{0} mikrosekundy</unitPattern>
+				<unitPattern count="other">{0} mikrosekund</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>nanosekundy</displayName>
@@ -7775,28 +8037,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} nanosekundy</unitPattern>
 				<unitPattern count="other">{0} nanosekund</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>sekundy</displayName>
-				<unitPattern count="one">{0} sekunda</unitPattern>
-				<unitPattern count="few">{0} sekundy</unitPattern>
-				<unitPattern count="many">{0} sekundy</unitPattern>
-				<unitPattern count="other">{0} sekund</unitPattern>
-				<perUnitPattern>za sekundu</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>týdny</displayName>
-				<unitPattern count="one">{0} týden</unitPattern>
-				<unitPattern count="few">{0} týdny</unitPattern>
-				<unitPattern count="many">{0} týdne</unitPattern>
-				<unitPattern count="other">{0} týdnů</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>roky</displayName>
-				<unitPattern count="one">{0} rok</unitPattern>
-				<unitPattern count="few">{0} roky</unitPattern>
-				<unitPattern count="many">{0} roku</unitPattern>
-				<unitPattern count="other">{0} let</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>ampéry</displayName>
 				<unitPattern count="one">{0} ampér</unitPattern>
@@ -7825,6 +8065,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} voltu</unitPattern>
 				<unitPattern count="other">{0} voltů</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokalorie</displayName>
+				<unitPattern count="one">{0} kilokalorie</unitPattern>
+				<unitPattern count="few">{0} kilokalorie</unitPattern>
+				<unitPattern count="many">{0} kilokalorie</unitPattern>
+				<unitPattern count="other">{0} kilokalorií</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kalorie</displayName>
 				<unitPattern count="one">{0} kalorie</unitPattern>
@@ -7839,20 +8086,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kilokalorie</unitPattern>
 				<unitPattern count="other">{0} kilokalorií</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>jouly</displayName>
-				<unitPattern count="one">{0} joule</unitPattern>
-				<unitPattern count="few">{0} jouly</unitPattern>
-				<unitPattern count="many">{0} joulu</unitPattern>
-				<unitPattern count="other">{0} joulů</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokalorie</displayName>
-				<unitPattern count="one">{0} kilokalorie</unitPattern>
-				<unitPattern count="few">{0} kilokalorie</unitPattern>
-				<unitPattern count="many">{0} kilokalorie</unitPattern>
-				<unitPattern count="other">{0} kilokalorií</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojouly</displayName>
 				<unitPattern count="one">{0} kilojoule</unitPattern>
@@ -7860,6 +8093,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kilojoulu</unitPattern>
 				<unitPattern count="other">{0} kilojoulů</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>jouly</displayName>
+				<unitPattern count="one">{0} joule</unitPattern>
+				<unitPattern count="few">{0} jouly</unitPattern>
+				<unitPattern count="many">{0} joulu</unitPattern>
+				<unitPattern count="other">{0} joulů</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilowatthodiny</displayName>
 				<unitPattern count="one">{0} kilowatthodina</unitPattern>
@@ -7874,12 +8114,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} gigahertzu</unitPattern>
 				<unitPattern count="other">{0} gigahertzů</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hertzy</displayName>
-				<unitPattern count="one">{0} hertz</unitPattern>
-				<unitPattern count="few">{0} hertzy</unitPattern>
-				<unitPattern count="many">{0} hertzu</unitPattern>
-				<unitPattern count="other">{0} hertzů</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megahertzy</displayName>
+				<unitPattern count="one">{0} megahertz</unitPattern>
+				<unitPattern count="few">{0} megahertzy</unitPattern>
+				<unitPattern count="many">{0} megahertzu</unitPattern>
+				<unitPattern count="other">{0} megahertzů</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kilohertzy</displayName>
@@ -7888,26 +8128,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kilohertzu</unitPattern>
 				<unitPattern count="other">{0} kilohertzů</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megahertzy</displayName>
-				<unitPattern count="one">{0} megahertz</unitPattern>
-				<unitPattern count="few">{0} megahertzy</unitPattern>
-				<unitPattern count="many">{0} megahertzu</unitPattern>
-				<unitPattern count="other">{0} megahertzů</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hertzy</displayName>
+				<unitPattern count="one">{0} hertz</unitPattern>
+				<unitPattern count="few">{0} hertzy</unitPattern>
+				<unitPattern count="many">{0} hertzu</unitPattern>
+				<unitPattern count="other">{0} hertzů</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>astronomické jednotky</displayName>
-				<unitPattern count="one">{0} astronomická jednotka</unitPattern>
-				<unitPattern count="few">{0} astronomické jednotky</unitPattern>
-				<unitPattern count="many">{0} astronomické jednotky</unitPattern>
-				<unitPattern count="other">{0} astronomických jednotek</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometry</displayName>
+				<unitPattern count="one">{0} kilometr</unitPattern>
+				<unitPattern count="few">{0} kilometry</unitPattern>
+				<unitPattern count="many">{0} kilometru</unitPattern>
+				<unitPattern count="other">{0} kilometrů</unitPattern>
+				<perUnitPattern>{0} na kilometr</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>centimetry</displayName>
-				<unitPattern count="one">{0} centimetr</unitPattern>
-				<unitPattern count="few">{0} centimetry</unitPattern>
-				<unitPattern count="many">{0} centimetru</unitPattern>
-				<unitPattern count="other">{0} centimetrů</unitPattern>
+			<unit type="length-meter">
+				<displayName>metry</displayName>
+				<unitPattern count="one">{0} metr</unitPattern>
+				<unitPattern count="few">{0} metry</unitPattern>
+				<unitPattern count="many">{0} metru</unitPattern>
+				<unitPattern count="other">{0} metrů</unitPattern>
+				<perUnitPattern>{0} na metr</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>decimetry</displayName>
@@ -7916,68 +8158,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} decimetru</unitPattern>
 				<unitPattern count="other">{0} decimetrů</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName>fathomy</displayName>
-				<unitPattern count="one">{0} fathom</unitPattern>
-				<unitPattern count="few">{0} fathomy</unitPattern>
-				<unitPattern count="many">{0} fathomu</unitPattern>
-				<unitPattern count="other">{0} fathomů</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>stopy</displayName>
-				<unitPattern count="one">{0} stopa</unitPattern>
-				<unitPattern count="few">{0} stopy</unitPattern>
-				<unitPattern count="many">{0} stopy</unitPattern>
-				<unitPattern count="other">{0} stop</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>furlongy</displayName>
-				<unitPattern count="one">{0} furlong</unitPattern>
-				<unitPattern count="few">{0} furlongy</unitPattern>
-				<unitPattern count="many">{0} furlongu</unitPattern>
-				<unitPattern count="other">{0} furlongů</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>palce</displayName>
-				<unitPattern count="one">{0} palec</unitPattern>
-				<unitPattern count="few">{0} palce</unitPattern>
-				<unitPattern count="many">{0} palce</unitPattern>
-				<unitPattern count="other">{0} palců</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometry</displayName>
-				<unitPattern count="one">{0} kilometr</unitPattern>
-				<unitPattern count="few">{0} kilometry</unitPattern>
-				<unitPattern count="many">{0} kilometru</unitPattern>
-				<unitPattern count="other">{0} kilometrů</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>světelné roky</displayName>
-				<unitPattern count="one">{0} světelný rok</unitPattern>
-				<unitPattern count="few">{0} světelné roky</unitPattern>
-				<unitPattern count="many">{0} světelného roku</unitPattern>
-				<unitPattern count="other">{0} světelných let</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metry</displayName>
-				<unitPattern count="one">{0} metr</unitPattern>
-				<unitPattern count="few">{0} metry</unitPattern>
-				<unitPattern count="many">{0} metru</unitPattern>
-				<unitPattern count="other">{0} metrů</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>mikrometry</displayName>
-				<unitPattern count="one">{0} mikrometr</unitPattern>
-				<unitPattern count="few">{0} mikrometry</unitPattern>
-				<unitPattern count="many">{0} mikrometru</unitPattern>
-				<unitPattern count="other">{0} mikrometrů</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>míle</displayName>
-				<unitPattern count="one">{0} míle</unitPattern>
-				<unitPattern count="few">{0} míle</unitPattern>
-				<unitPattern count="many">{0} míle</unitPattern>
-				<unitPattern count="other">{0} mil</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>centimetry</displayName>
+				<unitPattern count="one">{0} centimetr</unitPattern>
+				<unitPattern count="few">{0} centimetry</unitPattern>
+				<unitPattern count="many">{0} centimetru</unitPattern>
+				<unitPattern count="other">{0} centimetrů</unitPattern>
+				<perUnitPattern>{0} na centimetr</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>milimetry</displayName>
@@ -7986,6 +8173,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} milimetru</unitPattern>
 				<unitPattern count="other">{0} milimetrů</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikrometry</displayName>
+				<unitPattern count="one">{0} mikrometr</unitPattern>
+				<unitPattern count="few">{0} mikrometry</unitPattern>
+				<unitPattern count="many">{0} mikrometru</unitPattern>
+				<unitPattern count="other">{0} mikrometrů</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanometry</displayName>
 				<unitPattern count="one">{0} nanometr</unitPattern>
@@ -7993,20 +8187,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} nanometru</unitPattern>
 				<unitPattern count="other">{0} nanometrů</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>námořní míle</displayName>
-				<unitPattern count="one">{0} námořní míle</unitPattern>
-				<unitPattern count="few">{0} námořní míle</unitPattern>
-				<unitPattern count="many">{0} námořní míle</unitPattern>
-				<unitPattern count="other">{0} námořních mil</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parseky</displayName>
-				<unitPattern count="one">{0} parsek</unitPattern>
-				<unitPattern count="few">{0} parseky</unitPattern>
-				<unitPattern count="many">{0} parseku</unitPattern>
-				<unitPattern count="other">{0} parseků</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pikometry</displayName>
 				<unitPattern count="one">{0} pikometr</unitPattern>
@@ -8014,6 +8194,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} pikometru</unitPattern>
 				<unitPattern count="other">{0} pikometrů</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>míle</displayName>
+				<unitPattern count="one">{0} míle</unitPattern>
+				<unitPattern count="few">{0} míle</unitPattern>
+				<unitPattern count="many">{0} míle</unitPattern>
+				<unitPattern count="other">{0} mil</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yardy</displayName>
 				<unitPattern count="one">{0} yard</unitPattern>
@@ -8021,6 +8208,71 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} yardu</unitPattern>
 				<unitPattern count="other">{0} yardů</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>stopy</displayName>
+				<unitPattern count="one">{0} stopa</unitPattern>
+				<unitPattern count="few">{0} stopy</unitPattern>
+				<unitPattern count="many">{0} stopy</unitPattern>
+				<unitPattern count="other">{0} stop</unitPattern>
+				<perUnitPattern>{0} na stopu</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>palce</displayName>
+				<unitPattern count="one">{0} palec</unitPattern>
+				<unitPattern count="few">{0} palce</unitPattern>
+				<unitPattern count="many">{0} palce</unitPattern>
+				<unitPattern count="other">{0} palců</unitPattern>
+				<perUnitPattern>{0} na palec</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parseky</displayName>
+				<unitPattern count="one">{0} parsek</unitPattern>
+				<unitPattern count="few">{0} parseky</unitPattern>
+				<unitPattern count="many">{0} parseku</unitPattern>
+				<unitPattern count="other">{0} parseků</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>světelné roky</displayName>
+				<unitPattern count="one">{0} světelný rok</unitPattern>
+				<unitPattern count="few">{0} světelné roky</unitPattern>
+				<unitPattern count="many">{0} světelného roku</unitPattern>
+				<unitPattern count="other">{0} světelných let</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>astronomické jednotky</displayName>
+				<unitPattern count="one">{0} astronomická jednotka</unitPattern>
+				<unitPattern count="few">{0} astronomické jednotky</unitPattern>
+				<unitPattern count="many">{0} astronomické jednotky</unitPattern>
+				<unitPattern count="other">{0} astronomických jednotek</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>furlongy</displayName>
+				<unitPattern count="one">{0} furlong</unitPattern>
+				<unitPattern count="few">{0} furlongy</unitPattern>
+				<unitPattern count="many">{0} furlongu</unitPattern>
+				<unitPattern count="other">{0} furlongů</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>fathomy</displayName>
+				<unitPattern count="one">{0} fathom</unitPattern>
+				<unitPattern count="few">{0} fathomy</unitPattern>
+				<unitPattern count="many">{0} fathomu</unitPattern>
+				<unitPattern count="other">{0} fathomů</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>námořní míle</displayName>
+				<unitPattern count="one">{0} námořní míle</unitPattern>
+				<unitPattern count="few">{0} námořní míle</unitPattern>
+				<unitPattern count="many">{0} námořní míle</unitPattern>
+				<unitPattern count="other">{0} námořních mil</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>skandinávské míle</displayName>
+				<unitPattern count="one">{0} skandinávská míle</unitPattern>
+				<unitPattern count="few">{0} skandinávské míle</unitPattern>
+				<unitPattern count="many">{0} skandinávské míle</unitPattern>
+				<unitPattern count="other">{0} skandinávských mil</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>luxy</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
@@ -8028,27 +8280,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} luxu</unitPattern>
 				<unitPattern count="other">{0} luxů</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karáty</displayName>
-				<unitPattern count="one">{0} karát</unitPattern>
-				<unitPattern count="few">{0} karáty</unitPattern>
-				<unitPattern count="many">{0} karátu</unitPattern>
-				<unitPattern count="other">{0} karátů</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gramy</displayName>
-				<unitPattern count="one">{0} gram</unitPattern>
-				<unitPattern count="few">{0} gramy</unitPattern>
-				<unitPattern count="many">{0} gramu</unitPattern>
-				<unitPattern count="other">{0} gramů</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogramy</displayName>
-				<unitPattern count="one">{0} kilogram</unitPattern>
-				<unitPattern count="few">{0} kilogramy</unitPattern>
-				<unitPattern count="many">{0} kilogramu</unitPattern>
-				<unitPattern count="other">{0} kilogramů</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>metrické tuny</displayName>
 				<unitPattern count="one">{0} metrická tuna</unitPattern>
@@ -8056,12 +8287,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} metrické tuny</unitPattern>
 				<unitPattern count="other">{0} metrických tun</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mikrogramy</displayName>
-				<unitPattern count="one">{0} mikrogram</unitPattern>
-				<unitPattern count="few">{0} mikrogramy</unitPattern>
-				<unitPattern count="many">{0} mikrogramu</unitPattern>
-				<unitPattern count="other">{0} mikrogramů</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogramy</displayName>
+				<unitPattern count="one">{0} kilogram</unitPattern>
+				<unitPattern count="few">{0} kilogramy</unitPattern>
+				<unitPattern count="many">{0} kilogramu</unitPattern>
+				<unitPattern count="other">{0} kilogramů</unitPattern>
+				<perUnitPattern>{0} na kilogram</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gramy</displayName>
+				<unitPattern count="one">{0} gram</unitPattern>
+				<unitPattern count="few">{0} gramy</unitPattern>
+				<unitPattern count="many">{0} gramu</unitPattern>
+				<unitPattern count="other">{0} gramů</unitPattern>
+				<perUnitPattern>{0} na gram</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>miligramy</displayName>
@@ -8070,33 +8310,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} miligramu</unitPattern>
 				<unitPattern count="other">{0} miligramů</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>unce</displayName>
-				<unitPattern count="one">{0} unce</unitPattern>
-				<unitPattern count="few">{0} unce</unitPattern>
-				<unitPattern count="many">{0} unce</unitPattern>
-				<unitPattern count="other">{0} uncí</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>trojské unce</displayName>
-				<unitPattern count="one">{0} trojská unce</unitPattern>
-				<unitPattern count="few">{0} trojské unce</unitPattern>
-				<unitPattern count="many">{0} trojské unce</unitPattern>
-				<unitPattern count="other">{0} trojských uncí</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>libra</displayName>
-				<unitPattern count="one">{0} libra</unitPattern>
-				<unitPattern count="few">{0} libry</unitPattern>
-				<unitPattern count="many">{0} libry</unitPattern>
-				<unitPattern count="other">{0} liber</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>kameny</displayName>
-				<unitPattern count="one">{0} kámen</unitPattern>
-				<unitPattern count="few">{0} kameny</unitPattern>
-				<unitPattern count="many">{0} kamene</unitPattern>
-				<unitPattern count="other">{0} kamenů</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>mikrogramy</displayName>
+				<unitPattern count="one">{0} mikrogram</unitPattern>
+				<unitPattern count="few">{0} mikrogramy</unitPattern>
+				<unitPattern count="many">{0} mikrogramu</unitPattern>
+				<unitPattern count="other">{0} mikrogramů</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tuny</displayName>
@@ -8105,6 +8324,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} tuny</unitPattern>
 				<unitPattern count="other">{0} tun</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName>kameny</displayName>
+				<unitPattern count="one">{0} kámen</unitPattern>
+				<unitPattern count="few">{0} kameny</unitPattern>
+				<unitPattern count="many">{0} kamene</unitPattern>
+				<unitPattern count="other">{0} kamenů</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>libra</displayName>
+				<unitPattern count="one">{0} libra</unitPattern>
+				<unitPattern count="few">{0} libry</unitPattern>
+				<unitPattern count="many">{0} libry</unitPattern>
+				<unitPattern count="other">{0} liber</unitPattern>
+				<perUnitPattern>{0} na libru</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>unce</displayName>
+				<unitPattern count="one">{0} unce</unitPattern>
+				<unitPattern count="few">{0} unce</unitPattern>
+				<unitPattern count="many">{0} unce</unitPattern>
+				<unitPattern count="other">{0} uncí</unitPattern>
+				<perUnitPattern>{0} na unci</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>trojské unce</displayName>
+				<unitPattern count="one">{0} trojská unce</unitPattern>
+				<unitPattern count="few">{0} trojské unce</unitPattern>
+				<unitPattern count="many">{0} trojské unce</unitPattern>
+				<unitPattern count="other">{0} trojských uncí</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karáty</displayName>
+				<unitPattern count="one">{0} karát</unitPattern>
+				<unitPattern count="few">{0} karáty</unitPattern>
+				<unitPattern count="many">{0} karátu</unitPattern>
+				<unitPattern count="other">{0} karátů</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigawatty</displayName>
 				<unitPattern count="one">{0} gigawatt</unitPattern>
@@ -8112,20 +8368,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} gigawattu</unitPattern>
 				<unitPattern count="other">{0} gigawattů</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>koňská síla</displayName>
-				<unitPattern count="one">{0} koňská síla</unitPattern>
-				<unitPattern count="few">{0} koňské síly</unitPattern>
-				<unitPattern count="many">{0} koňské síly</unitPattern>
-				<unitPattern count="other">{0} koňských sil</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilowatty</displayName>
-				<unitPattern count="one">{0} kilowatt</unitPattern>
-				<unitPattern count="few">{0} kilowatty</unitPattern>
-				<unitPattern count="many">{0} kilowattu</unitPattern>
-				<unitPattern count="other">{0} kilowattů</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>megawatty</displayName>
 				<unitPattern count="one">{0} megawatt</unitPattern>
@@ -8133,12 +8375,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} megawattu</unitPattern>
 				<unitPattern count="other">{0} megawattů</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>miliwatty</displayName>
-				<unitPattern count="one">{0} miliwatt</unitPattern>
-				<unitPattern count="few">{0} miliwatty</unitPattern>
-				<unitPattern count="many">{0} miliwattu</unitPattern>
-				<unitPattern count="other">{0} miliwattů</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilowatty</displayName>
+				<unitPattern count="one">{0} kilowatt</unitPattern>
+				<unitPattern count="few">{0} kilowatty</unitPattern>
+				<unitPattern count="many">{0} kilowattu</unitPattern>
+				<unitPattern count="other">{0} kilowattů</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watty</displayName>
@@ -8147,6 +8389,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} wattu</unitPattern>
 				<unitPattern count="other">{0} wattů</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>miliwatty</displayName>
+				<unitPattern count="one">{0} miliwatt</unitPattern>
+				<unitPattern count="few">{0} miliwatty</unitPattern>
+				<unitPattern count="many">{0} miliwattu</unitPattern>
+				<unitPattern count="other">{0} miliwattů</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>koňská síla</displayName>
+				<unitPattern count="one">{0} koňská síla</unitPattern>
+				<unitPattern count="few">{0} koňské síly</unitPattern>
+				<unitPattern count="many">{0} koňské síly</unitPattern>
+				<unitPattern count="other">{0} koňských sil</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hektopascaly</displayName>
 				<unitPattern count="one">{0} hektopascal</unitPattern>
@@ -8154,20 +8410,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} hektopascalu</unitPattern>
 				<unitPattern count="other">{0} hektopascalů</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>palce rtuti</displayName>
-				<unitPattern count="one">{0} palec rtuti</unitPattern>
-				<unitPattern count="few">{0} palce rtuti</unitPattern>
-				<unitPattern count="many">{0} palce rtuti</unitPattern>
-				<unitPattern count="other">{0} palců rtuti</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>milibary</displayName>
-				<unitPattern count="one">{0} milibar</unitPattern>
-				<unitPattern count="few">{0} milibary</unitPattern>
-				<unitPattern count="many">{0} milibaru</unitPattern>
-				<unitPattern count="other">{0} milibarů</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>milimetry rtuti</displayName>
 				<unitPattern count="one">{0} milimetr rtuti</unitPattern>
@@ -8182,12 +8424,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} libry na čtvereční palec</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karáty</displayName>
-				<unitPattern count="one">{0} karát</unitPattern>
-				<unitPattern count="few">{0} karáty</unitPattern>
-				<unitPattern count="many">{0} karátu</unitPattern>
-				<unitPattern count="other">{0} karátů</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>palce rtuti</displayName>
+				<unitPattern count="one">{0} palec rtuti</unitPattern>
+				<unitPattern count="few">{0} palce rtuti</unitPattern>
+				<unitPattern count="many">{0} palce rtuti</unitPattern>
+				<unitPattern count="other">{0} palců rtuti</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>milibary</displayName>
+				<unitPattern count="one">{0} milibar</unitPattern>
+				<unitPattern count="few">{0} milibary</unitPattern>
+				<unitPattern count="many">{0} milibaru</unitPattern>
+				<unitPattern count="other">{0} milibarů</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometry za hodinu</displayName>
@@ -8210,6 +8459,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} míle za hodinu</unitPattern>
 				<unitPattern count="other">{0} mil za hodinu</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>uzly</displayName>
+				<unitPattern count="one">{0} uzel</unitPattern>
+				<unitPattern count="few">{0} uzly</unitPattern>
+				<unitPattern count="many">{0} uzlu</unitPattern>
+				<unitPattern count="other">{0} uzlů</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>stupně</displayName>
+				<unitPattern count="one">{0} stupeň</unitPattern>
+				<unitPattern count="few">{0} stupně</unitPattern>
+				<unitPattern count="many">{0} stupně</unitPattern>
+				<unitPattern count="other">{0} stupňů</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>stupně Celsia</displayName>
 				<unitPattern count="one">{0} stupeň Celsia</unitPattern>
@@ -8231,48 +8494,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kelvinu</unitPattern>
 				<unitPattern count="other">{0} kelvinů</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>akro-stopy</displayName>
-				<unitPattern count="one">{0} akro-stopa</unitPattern>
-				<unitPattern count="few">{0} akro-stopy</unitPattern>
-				<unitPattern count="many">{0} akro-stopy</unitPattern>
-				<unitPattern count="other">{0} akro-stop</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>bušly</displayName>
-				<unitPattern count="one">{0} bušl</unitPattern>
-				<unitPattern count="few">{0} bušly</unitPattern>
-				<unitPattern count="many">{0} bušlu</unitPattern>
-				<unitPattern count="other">{0} bušlů</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>centilitry</displayName>
-				<unitPattern count="one">{0} centilitr</unitPattern>
-				<unitPattern count="few">{0} centilitry</unitPattern>
-				<unitPattern count="many">{0} centilitru</unitPattern>
-				<unitPattern count="other">{0} centilitrů</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>centimetry krychlové</displayName>
-				<unitPattern count="one">{0} centimetr krychlový</unitPattern>
-				<unitPattern count="few">{0} centimetry krychlové</unitPattern>
-				<unitPattern count="many">{0} centimetru krychlového</unitPattern>
-				<unitPattern count="other">{0} centimetrů krychlových</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>stopy krychlové</displayName>
-				<unitPattern count="one">{0} stopa krychlová</unitPattern>
-				<unitPattern count="few">{0} stopy krychlové</unitPattern>
-				<unitPattern count="many">{0} stopy krychlové</unitPattern>
-				<unitPattern count="other">{0} stop krychlových</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>palce krychlové</displayName>
-				<unitPattern count="one">{0} palec krychlový</unitPattern>
-				<unitPattern count="few">{0} palce krychlové</unitPattern>
-				<unitPattern count="many">{0} palce krychlového</unitPattern>
-				<unitPattern count="other">{0} palců krychlových</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kilometry krychlové</displayName>
 				<unitPattern count="one">{0} kilometr krychlový</unitPattern>
@@ -8286,6 +8507,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} metry krychlové</unitPattern>
 				<unitPattern count="many">{0} metru krychlového</unitPattern>
 				<unitPattern count="other">{0} metrů krychlových</unitPattern>
+				<perUnitPattern>{0} na metr krychlový</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>centimetry krychlové</displayName>
+				<unitPattern count="one">{0} centimetr krychlový</unitPattern>
+				<unitPattern count="few">{0} centimetry krychlové</unitPattern>
+				<unitPattern count="many">{0} centimetru krychlového</unitPattern>
+				<unitPattern count="other">{0} centimetrů krychlových</unitPattern>
+				<perUnitPattern>{0} na centimetr krychlový</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>míle krychlové</displayName>
@@ -8301,33 +8531,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} yardu krychlového</unitPattern>
 				<unitPattern count="other">{0} yardů krychlových</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>šálek</displayName>
-				<unitPattern count="one">{0} šálek</unitPattern>
-				<unitPattern count="few">{0} šálky</unitPattern>
-				<unitPattern count="many">{0} šálku</unitPattern>
-				<unitPattern count="other">{0} šálků</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>stopy krychlové</displayName>
+				<unitPattern count="one">{0} stopa krychlová</unitPattern>
+				<unitPattern count="few">{0} stopy krychlové</unitPattern>
+				<unitPattern count="many">{0} stopy krychlové</unitPattern>
+				<unitPattern count="other">{0} stop krychlových</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>decilitry</displayName>
-				<unitPattern count="one">{0} decilitr</unitPattern>
-				<unitPattern count="few">{0} decilitry</unitPattern>
-				<unitPattern count="many">{0} decilitru</unitPattern>
-				<unitPattern count="other">{0} decilitrů</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>palce krychlové</displayName>
+				<unitPattern count="one">{0} palec krychlový</unitPattern>
+				<unitPattern count="few">{0} palce krychlové</unitPattern>
+				<unitPattern count="many">{0} palce krychlového</unitPattern>
+				<unitPattern count="other">{0} palců krychlových</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>kapalinové unce</displayName>
-				<unitPattern count="one">{0} kapalinová unce</unitPattern>
-				<unitPattern count="few">{0} kapalinové unce</unitPattern>
-				<unitPattern count="many">{0} kapalinové unce</unitPattern>
-				<unitPattern count="other">{0} kapalinových uncí</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>galon</displayName>
-				<unitPattern count="one">{0} galon</unitPattern>
-				<unitPattern count="few">{0} galony</unitPattern>
-				<unitPattern count="many">{0} galonu</unitPattern>
-				<unitPattern count="other">{0} galonů</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megalitry</displayName>
+				<unitPattern count="one">{0} megalitr</unitPattern>
+				<unitPattern count="few">{0} megalitry</unitPattern>
+				<unitPattern count="many">{0} megalitru</unitPattern>
+				<unitPattern count="other">{0} megalitrů</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hektolitr</displayName>
@@ -8342,13 +8565,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} litry</unitPattern>
 				<unitPattern count="many">{0} litru</unitPattern>
 				<unitPattern count="other">{0} litrů</unitPattern>
+				<perUnitPattern>{0} na litr</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalitry</displayName>
-				<unitPattern count="one">{0} megalitr</unitPattern>
-				<unitPattern count="few">{0} megalitry</unitPattern>
-				<unitPattern count="many">{0} megalitru</unitPattern>
-				<unitPattern count="other">{0} megalitrů</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>decilitry</displayName>
+				<unitPattern count="one">{0} decilitr</unitPattern>
+				<unitPattern count="few">{0} decilitry</unitPattern>
+				<unitPattern count="many">{0} decilitru</unitPattern>
+				<unitPattern count="other">{0} decilitrů</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centilitry</displayName>
+				<unitPattern count="one">{0} centilitr</unitPattern>
+				<unitPattern count="few">{0} centilitry</unitPattern>
+				<unitPattern count="many">{0} centilitru</unitPattern>
+				<unitPattern count="other">{0} centilitrů</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mililitry</displayName>
@@ -8357,12 +8588,41 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mililitru</unitPattern>
 				<unitPattern count="other">{0} mililitrů</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pinty</displayName>
-				<unitPattern count="one">{0} pinta</unitPattern>
-				<unitPattern count="few">{0} pinty</unitPattern>
-				<unitPattern count="many">{0} pinty</unitPattern>
-				<unitPattern count="other">{0} pint</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>metrické pinty</displayName>
+				<unitPattern count="one">{0} metrická pinta</unitPattern>
+				<unitPattern count="few">{0} metrické pinty</unitPattern>
+				<unitPattern count="many">{0} metrické pinty</unitPattern>
+				<unitPattern count="other">{0} metrických pint</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>metrické šálky</displayName>
+				<unitPattern count="one">{0} metrický šálek</unitPattern>
+				<unitPattern count="few">{0} metrické šálky</unitPattern>
+				<unitPattern count="many">{0} metrického šálku</unitPattern>
+				<unitPattern count="other">{0} metrických šálků</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>akro-stopy</displayName>
+				<unitPattern count="one">{0} akro-stopa</unitPattern>
+				<unitPattern count="few">{0} akro-stopy</unitPattern>
+				<unitPattern count="many">{0} akro-stopy</unitPattern>
+				<unitPattern count="other">{0} akro-stop</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>bušly</displayName>
+				<unitPattern count="one">{0} bušl</unitPattern>
+				<unitPattern count="few">{0} bušly</unitPattern>
+				<unitPattern count="many">{0} bušlu</unitPattern>
+				<unitPattern count="other">{0} bušlů</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galon</displayName>
+				<unitPattern count="one">{0} galon</unitPattern>
+				<unitPattern count="few">{0} galony</unitPattern>
+				<unitPattern count="many">{0} galonu</unitPattern>
+				<unitPattern count="other">{0} galonů</unitPattern>
+				<perUnitPattern>{0} na galon</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>kvarty</displayName>
@@ -8371,6 +8631,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kvartu</unitPattern>
 				<unitPattern count="other">{0} kvartů</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pinty</displayName>
+				<unitPattern count="one">{0} pinta</unitPattern>
+				<unitPattern count="few">{0} pinty</unitPattern>
+				<unitPattern count="many">{0} pinty</unitPattern>
+				<unitPattern count="other">{0} pint</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>šálek</displayName>
+				<unitPattern count="one">{0} šálek</unitPattern>
+				<unitPattern count="few">{0} šálky</unitPattern>
+				<unitPattern count="many">{0} šálku</unitPattern>
+				<unitPattern count="other">{0} šálků</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>kapalinové unce</displayName>
+				<unitPattern count="one">{0} kapalinová unce</unitPattern>
+				<unitPattern count="few">{0} kapalinové unce</unitPattern>
+				<unitPattern count="many">{0} kapalinové unce</unitPattern>
+				<unitPattern count="other">{0} kapalinových uncí</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>lžíce</displayName>
 				<unitPattern count="one">{0} lžíce</unitPattern>
@@ -8385,6 +8666,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} lžičky</unitPattern>
 				<unitPattern count="other">{0} lžiček</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} východní délky</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} severní šířky</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} jižní šířky</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} západní délky</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -8404,6 +8691,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>ot.</displayName>
+				<unitPattern count="one">{0} ot.</unitPattern>
+				<unitPattern count="few">{0} ot.</unitPattern>
+				<unitPattern count="many">{0} ot.</unitPattern>
+				<unitPattern count="other">{0} ot.</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="few">{0} rad</unitPattern>
+				<unitPattern count="many">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>′</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
@@ -8418,26 +8726,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>°</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="few">{0}°</unitPattern>
-				<unitPattern count="many">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="few">{0} rad</unitPattern>
-				<unitPattern count="many">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ac</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="few">{0} ac</unitPattern>
-				<unitPattern count="many">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="few">{0} km²</unitPattern>
+				<unitPattern count="many">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ha</displayName>
@@ -8446,12 +8740,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="few">{0} m²</unitPattern>
+				<unitPattern count="many">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="few">{0} cm²</unitPattern>
 				<unitPattern count="many">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="few">{0} mi²</unitPattern>
+				<unitPattern count="many">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ac</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="few">{0} ac</unitPattern>
+				<unitPattern count="many">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="few">{0} yd²</unitPattern>
+				<unitPattern count="many">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ft²</displayName>
@@ -8466,34 +8790,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} in²</unitPattern>
 				<unitPattern count="many">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="few">{0} km²</unitPattern>
-				<unitPattern count="many">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="few">{0} m²</unitPattern>
-				<unitPattern count="many">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="few">{0} mi²</unitPattern>
-				<unitPattern count="many">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="few">{0} yd²</unitPattern>
-				<unitPattern count="many">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="few">{0} kt</unitPattern>
+				<unitPattern count="many">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
@@ -8502,6 +8806,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} l/km</unitPattern>
 				<unitPattern count="other">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="few">{0} l/100 km</unitPattern>
+				<unitPattern count="many">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
@@ -8509,69 +8820,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="few">{0} bity</unitPattern>
-				<unitPattern count="many">{0} bitu</unitPattern>
-				<unitPattern count="other">{0} bitů</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bajt</displayName>
-				<unitPattern count="one">{0} bajt</unitPattern>
-				<unitPattern count="few">{0} bajty</unitPattern>
-				<unitPattern count="many">{0} bajtu</unitPattern>
-				<unitPattern count="other">{0} bajtů</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="few">{0} Gb</unitPattern>
-				<unitPattern count="many">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="few">{0} GB</unitPattern>
-				<unitPattern count="many">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="few">{0} kb</unitPattern>
-				<unitPattern count="many">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="few">{0} kB</unitPattern>
-				<unitPattern count="many">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="few">{0} Mb</unitPattern>
-				<unitPattern count="many">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="few">{0} MB</unitPattern>
-				<unitPattern count="many">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="few">{0} Tb</unitPattern>
-				<unitPattern count="many">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
@@ -8579,12 +8827,107 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="few">{0} Tb</unitPattern>
+				<unitPattern count="many">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="few">{0} GB</unitPattern>
+				<unitPattern count="many">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="few">{0} Gb</unitPattern>
+				<unitPattern count="many">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="few">{0} MB</unitPattern>
+				<unitPattern count="many">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="few">{0} Mb</unitPattern>
+				<unitPattern count="many">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="few">{0} kB</unitPattern>
+				<unitPattern count="many">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="few">{0} kb</unitPattern>
+				<unitPattern count="many">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bajt</displayName>
+				<unitPattern count="one">{0} bajt</unitPattern>
+				<unitPattern count="few">{0} bajty</unitPattern>
+				<unitPattern count="many">{0} bajtu</unitPattern>
+				<unitPattern count="other">{0} bajtů</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="few">{0} bity</unitPattern>
+				<unitPattern count="many">{0} bitu</unitPattern>
+				<unitPattern count="other">{0} bitů</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>stol.</displayName>
+				<unitPattern count="one">{0} stol.</unitPattern>
+				<unitPattern count="few">{0} stol.</unitPattern>
+				<unitPattern count="many">{0} stol.</unitPattern>
+				<unitPattern count="other">{0} stol.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>roky</displayName>
+				<unitPattern count="one">{0} rok</unitPattern>
+				<unitPattern count="few">{0} roky</unitPattern>
+				<unitPattern count="many">{0} roku</unitPattern>
+				<unitPattern count="other">{0} let</unitPattern>
+				<perUnitPattern>{0}/r</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>měs.</displayName>
+				<unitPattern count="one">{0} měs.</unitPattern>
+				<unitPattern count="few">{0} měs.</unitPattern>
+				<unitPattern count="many">{0} měs.</unitPattern>
+				<unitPattern count="other">{0} měs.</unitPattern>
+				<perUnitPattern>{0}/měs.</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>týd.</displayName>
+				<unitPattern count="one">{0} týd.</unitPattern>
+				<unitPattern count="few">{0} týd.</unitPattern>
+				<unitPattern count="many">{0} týd.</unitPattern>
+				<unitPattern count="other">{0} týd.</unitPattern>
+				<perUnitPattern>{0}/týd.</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>dny</displayName>
 				<unitPattern count="one">{0} den</unitPattern>
 				<unitPattern count="few">{0} dny</unitPattern>
 				<unitPattern count="many">{0} dne</unitPattern>
 				<unitPattern count="other">{0} dní</unitPattern>
+				<perUnitPattern>{0}/den</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>h</displayName>
@@ -8594,40 +8937,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} h</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="few">{0} μs</unitPattern>
-				<unitPattern count="many">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="few">{0} ms</unitPattern>
-				<unitPattern count="many">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
 				<unitPattern count="few">{0} min</unitPattern>
 				<unitPattern count="many">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>měs.</displayName>
-				<unitPattern count="one">{0} měs.</unitPattern>
-				<unitPattern count="few">{0} měs.</unitPattern>
-				<unitPattern count="many">{0} měs.</unitPattern>
-				<unitPattern count="other">{0} měs.</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="few">{0} ns</unitPattern>
-				<unitPattern count="many">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>s</displayName>
@@ -8637,19 +8953,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} s</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>týd.</displayName>
-				<unitPattern count="one">{0} týd.</unitPattern>
-				<unitPattern count="few">{0} týd.</unitPattern>
-				<unitPattern count="many">{0} týd.</unitPattern>
-				<unitPattern count="other">{0} týd.</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="few">{0} ms</unitPattern>
+				<unitPattern count="many">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>roky</displayName>
-				<unitPattern count="one">{0} rok</unitPattern>
-				<unitPattern count="few">{0} roky</unitPattern>
-				<unitPattern count="many">{0} roku</unitPattern>
-				<unitPattern count="other">{0} let</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="few">{0} μs</unitPattern>
+				<unitPattern count="many">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="few">{0} ns</unitPattern>
+				<unitPattern count="many">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>A</displayName>
@@ -8679,6 +9002,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="few">{0} kcal</unitPattern>
+				<unitPattern count="many">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -8693,20 +9023,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kcal</unitPattern>
 				<unitPattern count="other">{0} kcal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>J</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="few">{0} J</unitPattern>
-				<unitPattern count="many">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="few">{0} kcal</unitPattern>
-				<unitPattern count="many">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
@@ -8714,6 +9030,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="few">{0} J</unitPattern>
+				<unitPattern count="many">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -8728,12 +9051,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="few">{0} Hz</unitPattern>
-				<unitPattern count="many">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="few">{0} MHz</unitPattern>
+				<unitPattern count="many">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
@@ -8742,26 +9065,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="few">{0} MHz</unitPattern>
-				<unitPattern count="many">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="few">{0} Hz</unitPattern>
+				<unitPattern count="many">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="few">{0} au</unitPattern>
-				<unitPattern count="many">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="few">{0} km</unitPattern>
+				<unitPattern count="many">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="few">{0} cm</unitPattern>
-				<unitPattern count="many">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="few">{0} m</unitPattern>
+				<unitPattern count="many">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
@@ -8770,68 +9095,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName>fm</displayName>
-				<unitPattern count="one">{0} fm</unitPattern>
-				<unitPattern count="few">{0} fm</unitPattern>
-				<unitPattern count="many">{0} fm</unitPattern>
-				<unitPattern count="other">{0} fm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>ft</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="few">{0} ft</unitPattern>
-				<unitPattern count="many">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>fur</displayName>
-				<unitPattern count="one">{0} fur</unitPattern>
-				<unitPattern count="few">{0} fur</unitPattern>
-				<unitPattern count="many">{0} fur</unitPattern>
-				<unitPattern count="other">{0} fur</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>in</displayName>
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="few">{0} in</unitPattern>
-				<unitPattern count="many">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="few">{0} km</unitPattern>
-				<unitPattern count="many">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ly</displayName>
-				<unitPattern count="one">{0} ly</unitPattern>
-				<unitPattern count="few">{0} ly</unitPattern>
-				<unitPattern count="many">{0} ly</unitPattern>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="few">{0} m</unitPattern>
-				<unitPattern count="many">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="few">{0} µm</unitPattern>
-				<unitPattern count="many">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mi</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="few">{0} mi</unitPattern>
-				<unitPattern count="many">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="few">{0} cm</unitPattern>
+				<unitPattern count="many">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -8840,6 +9110,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="few">{0} µm</unitPattern>
+				<unitPattern count="many">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
@@ -8847,20 +9124,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="few">{0} nmi</unitPattern>
-				<unitPattern count="many">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="few">{0} pc</unitPattern>
-				<unitPattern count="many">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
@@ -8868,6 +9131,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="few">{0} mi</unitPattern>
+				<unitPattern count="many">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yd</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
@@ -8875,6 +9145,71 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ft</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="few">{0} ft</unitPattern>
+				<unitPattern count="many">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>in</displayName>
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="few">{0} in</unitPattern>
+				<unitPattern count="many">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="few">{0} pc</unitPattern>
+				<unitPattern count="many">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ly</displayName>
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="few">{0} ly</unitPattern>
+				<unitPattern count="many">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="few">{0} au</unitPattern>
+				<unitPattern count="many">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>fur</displayName>
+				<unitPattern count="one">{0} fur</unitPattern>
+				<unitPattern count="few">{0} fur</unitPattern>
+				<unitPattern count="many">{0} fur</unitPattern>
+				<unitPattern count="other">{0} fur</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>fm</displayName>
+				<unitPattern count="one">{0} fm</unitPattern>
+				<unitPattern count="few">{0} fm</unitPattern>
+				<unitPattern count="many">{0} fm</unitPattern>
+				<unitPattern count="other">{0} fm</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="few">{0} nmi</unitPattern>
+				<unitPattern count="many">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="few">{0} smi</unitPattern>
+				<unitPattern count="many">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
@@ -8882,27 +9217,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>CD</displayName>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="few">{0} CD</unitPattern>
-				<unitPattern count="many">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="few">{0} g</unitPattern>
-				<unitPattern count="many">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="few">{0} kg</unitPattern>
-				<unitPattern count="many">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>mt</displayName>
 				<unitPattern count="one">{0} mt</unitPattern>
@@ -8910,12 +9224,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mt</unitPattern>
 				<unitPattern count="other">{0} mt</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="few">{0} µg</unitPattern>
-				<unitPattern count="many">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="few">{0} kg</unitPattern>
+				<unitPattern count="many">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="many">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
@@ -8924,33 +9247,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="few">{0} oz</unitPattern>
-				<unitPattern count="many">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="few">{0} oz t</unitPattern>
-				<unitPattern count="many">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="few">{0} lb</unitPattern>
-				<unitPattern count="many">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>st</displayName>
-				<unitPattern count="one">{0} st</unitPattern>
-				<unitPattern count="few">{0} st</unitPattern>
-				<unitPattern count="many">{0} st</unitPattern>
-				<unitPattern count="other">{0} st</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="few">{0} µg</unitPattern>
+				<unitPattern count="many">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>t</displayName>
@@ -8959,6 +9261,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName>st</displayName>
+				<unitPattern count="one">{0} st</unitPattern>
+				<unitPattern count="few">{0} st</unitPattern>
+				<unitPattern count="many">{0} st</unitPattern>
+				<unitPattern count="other">{0} st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="few">{0} lb</unitPattern>
+				<unitPattern count="many">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="few">{0} oz</unitPattern>
+				<unitPattern count="many">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="few">{0} oz t</unitPattern>
+				<unitPattern count="many">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>CD</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="few">{0} CD</unitPattern>
+				<unitPattern count="many">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
@@ -8966,20 +9305,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hp</displayName>
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="few">{0} hp</unitPattern>
-				<unitPattern count="many">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="few">{0} kW</unitPattern>
-				<unitPattern count="many">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
@@ -8987,12 +9312,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="few">{0} mW</unitPattern>
-				<unitPattern count="many">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="few">{0} kW</unitPattern>
+				<unitPattern count="many">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>W</displayName>
@@ -9001,6 +9326,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="few">{0} mW</unitPattern>
+				<unitPattern count="many">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="few">{0} hp</unitPattern>
+				<unitPattern count="many">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
@@ -9008,20 +9347,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="few">{0} inHg</unitPattern>
-				<unitPattern count="many">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mb</displayName>
-				<unitPattern count="one">{0} mb</unitPattern>
-				<unitPattern count="few">{0} mb</unitPattern>
-				<unitPattern count="many">{0} mb</unitPattern>
-				<unitPattern count="other">{0} mb</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -9036,12 +9361,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="few">{0} kt</unitPattern>
-				<unitPattern count="many">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="few">{0} inHg</unitPattern>
+				<unitPattern count="many">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mb</displayName>
+				<unitPattern count="one">{0} mb</unitPattern>
+				<unitPattern count="few">{0} mb</unitPattern>
+				<unitPattern count="many">{0} mb</unitPattern>
+				<unitPattern count="other">{0} mb</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -9064,6 +9396,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="few">{0} kn</unitPattern>
+				<unitPattern count="many">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0} °C</unitPattern>
@@ -9085,48 +9431,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="few">{0} ac ft</unitPattern>
-				<unitPattern count="many">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>bu</displayName>
-				<unitPattern count="one">{0} bu</unitPattern>
-				<unitPattern count="few">{0} bu</unitPattern>
-				<unitPattern count="many">{0} bu</unitPattern>
-				<unitPattern count="other">{0} bu</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="few">{0} cl</unitPattern>
-				<unitPattern count="many">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="few">{0} cm³</unitPattern>
-				<unitPattern count="many">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="few">{0} ft³</unitPattern>
-				<unitPattern count="many">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="few">{0} in³</unitPattern>
-				<unitPattern count="many">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -9140,6 +9444,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} m³</unitPattern>
 				<unitPattern count="many">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="few">{0} cm³</unitPattern>
+				<unitPattern count="many">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -9155,33 +9468,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>c</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="few">{0} c</unitPattern>
-				<unitPattern count="many">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="few">{0} ft³</unitPattern>
+				<unitPattern count="many">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="few">{0} dl</unitPattern>
-				<unitPattern count="many">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="few">{0} in³</unitPattern>
+				<unitPattern count="many">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="few">{0} fl oz</unitPattern>
-				<unitPattern count="many">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="few">{0} gal</unitPattern>
-				<unitPattern count="many">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="few">{0} Ml</unitPattern>
+				<unitPattern count="many">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -9196,13 +9502,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} l</unitPattern>
 				<unitPattern count="many">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="one">{0} Ml</unitPattern>
-				<unitPattern count="few">{0} Ml</unitPattern>
-				<unitPattern count="many">{0} Ml</unitPattern>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="few">{0} dl</unitPattern>
+				<unitPattern count="many">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="few">{0} cl</unitPattern>
+				<unitPattern count="many">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
@@ -9211,12 +9525,41 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="few">{0} pt</unitPattern>
-				<unitPattern count="many">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="few">{0} mpt</unitPattern>
+				<unitPattern count="many">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="few">{0} mc</unitPattern>
+				<unitPattern count="many">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="few">{0} ac ft</unitPattern>
+				<unitPattern count="many">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>bu</displayName>
+				<unitPattern count="one">{0} bu</unitPattern>
+				<unitPattern count="few">{0} bu</unitPattern>
+				<unitPattern count="many">{0} bu</unitPattern>
+				<unitPattern count="other">{0} bu</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="few">{0} gal</unitPattern>
+				<unitPattern count="many">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
@@ -9225,6 +9568,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="few">{0} pt</unitPattern>
+				<unitPattern count="many">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>c</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="few">{0} c</unitPattern>
+				<unitPattern count="many">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="few">{0} fl oz</unitPattern>
+				<unitPattern count="many">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>tbsp</displayName>
 				<unitPattern count="one">{0} tbsp</unitPattern>
@@ -9239,6 +9603,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} tsp</unitPattern>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} v. d.</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} s. š.</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} j. š.</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} z. d.</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -9258,6 +9628,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-radian">
+				<displayName draft="contributed">rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="few">{0} rad</unitPattern>
+				<unitPattern count="many">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName draft="contributed">°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName draft="contributed">′</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
@@ -9272,26 +9656,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName draft="contributed">°</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="few">{0}°</unitPattern>
-				<unitPattern count="many">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName draft="contributed">rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="few">{0} rad</unitPattern>
-				<unitPattern count="many">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="contributed">ac</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="few">{0} ac</unitPattern>
-				<unitPattern count="many">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName draft="contributed">km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="few">{0} km²</unitPattern>
+				<unitPattern count="many">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName draft="contributed">ha</displayName>
@@ -9300,6 +9670,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName draft="contributed">m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="few">{0} m²</unitPattern>
+				<unitPattern count="many">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName draft="contributed">cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
@@ -9307,6 +9684,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<displayName draft="contributed">mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="few">{0} mi²</unitPattern>
+				<unitPattern count="many">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName draft="contributed">ac</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="few">{0} ac</unitPattern>
+				<unitPattern count="many">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName draft="contributed">yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="few">{0} yd²</unitPattern>
+				<unitPattern count="many">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<displayName draft="contributed">ft²</displayName>
 				<unitPattern count="one">{0} ft²</unitPattern>
@@ -9321,33 +9719,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="contributed">km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="few">{0} km²</unitPattern>
-				<unitPattern count="many">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName draft="contributed">m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="few">{0} m²</unitPattern>
-				<unitPattern count="many">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName draft="contributed">mi²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="few">{0} mi²</unitPattern>
-				<unitPattern count="many">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName draft="contributed">yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="few">{0} yd²</unitPattern>
-				<unitPattern count="many">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName draft="contributed">kt</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="few">{0} kt</unitPattern>
+				<unitPattern count="many">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName draft="contributed">l/km</displayName>
@@ -9356,6 +9733,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} l/km</unitPattern>
 				<unitPattern count="other">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="few">{0} l/100 km</unitPattern>
+				<unitPattern count="many">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName draft="contributed">mpg</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
@@ -9363,61 +9747,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName draft="contributed">bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="few">{0} bity</unitPattern>
-				<unitPattern count="many">{0} bitu</unitPattern>
-				<unitPattern count="other">{0} bitů</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName draft="contributed">bajt</displayName>
-				<unitPattern count="one">{0} bajt</unitPattern>
-				<unitPattern count="few">{0} bajty</unitPattern>
-				<unitPattern count="many">{0} bajtu</unitPattern>
-				<unitPattern count="other">{0} bajtů</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName draft="contributed">Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="few">{0} Gb</unitPattern>
-				<unitPattern count="many">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName draft="contributed">GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="few">{0} GB</unitPattern>
-				<unitPattern count="many">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName draft="contributed">kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="few">{0} kb</unitPattern>
-				<unitPattern count="many">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName draft="contributed">kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="few">{0} kB</unitPattern>
-				<unitPattern count="many">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName draft="contributed">Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="few">{0} Mb</unitPattern>
-				<unitPattern count="many">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName draft="contributed">MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="few">{0} MB</unitPattern>
-				<unitPattern count="many">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName draft="contributed">TB</displayName>
+				<unitPattern count="one">{0} TB</unitPattern>
+				<unitPattern count="few">{0} TB</unitPattern>
+				<unitPattern count="many">{0} TB</unitPattern>
+				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName draft="contributed">Tb</displayName>
@@ -9426,12 +9761,82 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} Tb</unitPattern>
 				<unitPattern count="other">{0} Tb</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName draft="contributed">TB</displayName>
-				<unitPattern count="one">{0} TB</unitPattern>
-				<unitPattern count="few">{0} TB</unitPattern>
-				<unitPattern count="many">{0} TB</unitPattern>
-				<unitPattern count="other">{0} TB</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName draft="contributed">GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="few">{0} GB</unitPattern>
+				<unitPattern count="many">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName draft="contributed">Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="few">{0} Gb</unitPattern>
+				<unitPattern count="many">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName draft="contributed">MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="few">{0} MB</unitPattern>
+				<unitPattern count="many">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName draft="contributed">Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="few">{0} Mb</unitPattern>
+				<unitPattern count="many">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName draft="contributed">kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="few">{0} kB</unitPattern>
+				<unitPattern count="many">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName draft="contributed">kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="few">{0} kb</unitPattern>
+				<unitPattern count="many">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName draft="contributed">bajt</displayName>
+				<unitPattern count="one">{0} bajt</unitPattern>
+				<unitPattern count="few">{0} bajty</unitPattern>
+				<unitPattern count="many">{0} bajtu</unitPattern>
+				<unitPattern count="other">{0} bajtů</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName draft="contributed">bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="few">{0} bity</unitPattern>
+				<unitPattern count="many">{0} bitu</unitPattern>
+				<unitPattern count="other">{0} bitů</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>r</displayName>
+				<unitPattern count="one">{0} r</unitPattern>
+				<unitPattern count="few">{0} r</unitPattern>
+				<unitPattern count="many">{0} r</unitPattern>
+				<unitPattern count="other">{0} r</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="few">{0} m</unitPattern>
+				<unitPattern count="many">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>t</displayName>
+				<unitPattern count="one">{0} t</unitPattern>
+				<unitPattern count="few">{0} t</unitPattern>
+				<unitPattern count="many">{0} t</unitPattern>
+				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>d</displayName>
@@ -9448,20 +9853,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} h</unitPattern>
 				<perUnitPattern draft="contributed">{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName draft="contributed">μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="few">{0} μs</unitPattern>
-				<unitPattern count="many">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="few">{0} ms</unitPattern>
-				<unitPattern count="many">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>m</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
@@ -9469,20 +9860,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>m</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="few">{0} m</unitPattern>
-				<unitPattern count="many">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName draft="contributed">ns</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="few">{0} ns</unitPattern>
-				<unitPattern count="many">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>s</displayName>
 				<unitPattern count="one">{0} s</unitPattern>
@@ -9491,19 +9868,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} s</unitPattern>
 				<perUnitPattern draft="contributed">{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>t</displayName>
-				<unitPattern count="one">{0} t</unitPattern>
-				<unitPattern count="few">{0} t</unitPattern>
-				<unitPattern count="many">{0} t</unitPattern>
-				<unitPattern count="other">{0} t</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="few">{0} ms</unitPattern>
+				<unitPattern count="many">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>r</displayName>
-				<unitPattern count="one">{0} r</unitPattern>
-				<unitPattern count="few">{0} r</unitPattern>
-				<unitPattern count="many">{0} r</unitPattern>
-				<unitPattern count="other">{0} r</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName draft="contributed">μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="few">{0} μs</unitPattern>
+				<unitPattern count="many">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName draft="contributed">ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="few">{0} ns</unitPattern>
+				<unitPattern count="many">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName draft="contributed">A</displayName>
@@ -9533,6 +9917,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName draft="contributed">kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="few">{0} kcal</unitPattern>
+				<unitPattern count="many">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName draft="contributed">cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -9547,20 +9938,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kcal</unitPattern>
 				<unitPattern count="other">{0} kcal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName draft="contributed">J</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="few">{0} J</unitPattern>
-				<unitPattern count="many">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName draft="contributed">kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="few">{0} kcal</unitPattern>
-				<unitPattern count="many">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName draft="contributed">kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
@@ -9568,6 +9945,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName draft="contributed">J</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="few">{0} J</unitPattern>
+				<unitPattern count="many">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName draft="contributed">kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -9582,12 +9966,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName draft="contributed">Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="few">{0} Hz</unitPattern>
-				<unitPattern count="many">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName draft="contributed">MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="few">{0} MHz</unitPattern>
+				<unitPattern count="many">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName draft="contributed">kHz</displayName>
@@ -9596,61 +9980,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName draft="contributed">MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="few">{0} MHz</unitPattern>
-				<unitPattern count="many">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
-			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName draft="contributed">au</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="few">{0} au</unitPattern>
-				<unitPattern count="many">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="few">{0} cm</unitPattern>
-				<unitPattern count="many">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<displayName draft="contributed">dm</displayName>
-				<unitPattern count="one">{0} dm</unitPattern>
-				<unitPattern count="few">{0} dm</unitPattern>
-				<unitPattern count="many">{0} dm</unitPattern>
-				<unitPattern count="other">{0} dm</unitPattern>
-			</unit>
-			<unit type="length-fathom">
-				<displayName>fm</displayName>
-				<unitPattern count="one">{0} fm</unitPattern>
-				<unitPattern count="few">{0} fm</unitPattern>
-				<unitPattern count="many">{0} fm</unitPattern>
-				<unitPattern count="other">{0} fm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="contributed">ft</displayName>
-				<unitPattern count="one">{0}′</unitPattern>
-				<unitPattern count="few">{0}′</unitPattern>
-				<unitPattern count="many">{0}′</unitPattern>
-				<unitPattern count="other">{0}′</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>fur</displayName>
-				<unitPattern count="one">{0} fur</unitPattern>
-				<unitPattern count="few">{0} fur</unitPattern>
-				<unitPattern count="many">{0} fur</unitPattern>
-				<unitPattern count="other">{0} fur</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="contributed">in</displayName>
-				<unitPattern count="one">{0}″</unitPattern>
-				<unitPattern count="few">{0}″</unitPattern>
-				<unitPattern count="many">{0}″</unitPattern>
-				<unitPattern count="other">{0}″</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName draft="contributed">Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="few">{0} Hz</unitPattern>
+				<unitPattern count="many">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
@@ -9659,13 +9994,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} km</unitPattern>
 				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<displayName draft="contributed">ly</displayName>
-				<unitPattern count="one">{0} ly</unitPattern>
-				<unitPattern count="few">{0} ly</unitPattern>
-				<unitPattern count="many">{0} ly</unitPattern>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>m</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
@@ -9673,19 +10001,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-micrometer">
-				<displayName draft="contributed">µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="few">{0} µm</unitPattern>
-				<unitPattern count="many">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
+			<unit type="length-decimeter">
+				<displayName draft="contributed">dm</displayName>
+				<unitPattern count="one">{0} dm</unitPattern>
+				<unitPattern count="few">{0} dm</unitPattern>
+				<unitPattern count="many">{0} dm</unitPattern>
+				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName draft="contributed">mi</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="few">{0} mi</unitPattern>
-				<unitPattern count="many">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="few">{0} cm</unitPattern>
+				<unitPattern count="many">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -9694,6 +10022,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName draft="contributed">µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="few">{0} µm</unitPattern>
+				<unitPattern count="many">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName draft="contributed">nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
@@ -9701,20 +10036,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName draft="contributed">nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="few">{0} nmi</unitPattern>
-				<unitPattern count="many">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName draft="contributed">pc</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="few">{0} pc</unitPattern>
-				<unitPattern count="many">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName draft="contributed">pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
@@ -9722,6 +10043,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="contributed">mi</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="few">{0} mi</unitPattern>
+				<unitPattern count="many">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName draft="contributed">yd</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
@@ -9729,6 +10057,62 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName draft="contributed">ft</displayName>
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="few">{0}′</unitPattern>
+				<unitPattern count="many">{0}′</unitPattern>
+				<unitPattern count="other">{0}′</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="contributed">in</displayName>
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="few">{0}″</unitPattern>
+				<unitPattern count="many">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName draft="contributed">pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="few">{0} pc</unitPattern>
+				<unitPattern count="many">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="contributed">ly</displayName>
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="few">{0} ly</unitPattern>
+				<unitPattern count="many">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName draft="contributed">au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="few">{0} au</unitPattern>
+				<unitPattern count="many">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>fur</displayName>
+				<unitPattern count="one">{0} fur</unitPattern>
+				<unitPattern count="few">{0} fur</unitPattern>
+				<unitPattern count="many">{0} fur</unitPattern>
+				<unitPattern count="other">{0} fur</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>fm</displayName>
+				<unitPattern count="one">{0} fm</unitPattern>
+				<unitPattern count="few">{0} fm</unitPattern>
+				<unitPattern count="many">{0} fm</unitPattern>
+				<unitPattern count="other">{0} fm</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName draft="contributed">nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="few">{0} nmi</unitPattern>
+				<unitPattern count="many">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName draft="contributed">lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
@@ -9736,19 +10120,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName draft="contributed">CD</displayName>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="few">{0} CD</unitPattern>
-				<unitPattern count="many">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="few">{0} g</unitPattern>
-				<unitPattern count="many">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="mass-metric-ton">
+				<displayName draft="contributed">mt</displayName>
+				<unitPattern count="one">{0} mt</unitPattern>
+				<unitPattern count="few">{0} mt</unitPattern>
+				<unitPattern count="many">{0} mt</unitPattern>
+				<unitPattern count="other">{0} mt</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
@@ -9757,12 +10134,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-metric-ton">
-				<displayName draft="contributed">mt</displayName>
-				<unitPattern count="one">{0} mt</unitPattern>
-				<unitPattern count="few">{0} mt</unitPattern>
-				<unitPattern count="many">{0} mt</unitPattern>
-				<unitPattern count="other">{0} mt</unitPattern>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="many">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName draft="contributed">mg</displayName>
+				<unitPattern count="one">{0} mg</unitPattern>
+				<unitPattern count="few">{0} mg</unitPattern>
+				<unitPattern count="many">{0} mg</unitPattern>
+				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
 			<unit type="mass-microgram">
 				<displayName draft="contributed">µg</displayName>
@@ -9771,12 +10155,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} µg</unitPattern>
 				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
-			<unit type="mass-milligram">
-				<displayName draft="contributed">mg</displayName>
-				<unitPattern count="one">{0} mg</unitPattern>
-				<unitPattern count="few">{0} mg</unitPattern>
-				<unitPattern count="many">{0} mg</unitPattern>
-				<unitPattern count="other">{0} mg</unitPattern>
+			<unit type="mass-ton">
+				<displayName draft="contributed">t</displayName>
+				<unitPattern count="one">{0} t</unitPattern>
+				<unitPattern count="few">{0} t</unitPattern>
+				<unitPattern count="many">{0} t</unitPattern>
+				<unitPattern count="other">{0} t</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName>st</displayName>
+				<unitPattern count="one">{0} st</unitPattern>
+				<unitPattern count="few">{0} st</unitPattern>
+				<unitPattern count="many">{0} st</unitPattern>
+				<unitPattern count="other">{0} st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName draft="contributed">lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="few">{0} lb</unitPattern>
+				<unitPattern count="many">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
 			</unit>
 			<unit type="mass-ounce">
 				<displayName draft="contributed">oz</displayName>
@@ -9792,26 +10190,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} oz t</unitPattern>
 				<unitPattern count="other">{0} oz t</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<displayName draft="contributed">lb</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="few">{0} lb</unitPattern>
-				<unitPattern count="many">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>st</displayName>
-				<unitPattern count="one">{0} st</unitPattern>
-				<unitPattern count="few">{0} st</unitPattern>
-				<unitPattern count="many">{0} st</unitPattern>
-				<unitPattern count="other">{0} st</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<displayName draft="contributed">t</displayName>
-				<unitPattern count="one">{0} t</unitPattern>
-				<unitPattern count="few">{0} t</unitPattern>
-				<unitPattern count="many">{0} t</unitPattern>
-				<unitPattern count="other">{0} t</unitPattern>
+			<unit type="mass-carat">
+				<displayName draft="contributed">CD</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="few">{0} CD</unitPattern>
+				<unitPattern count="many">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<displayName draft="contributed">GW</displayName>
@@ -9820,12 +10204,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="contributed">hp</displayName>
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="few">{0} hp</unitPattern>
-				<unitPattern count="many">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
+			<unit type="power-megawatt">
+				<displayName draft="contributed">MW</displayName>
+				<unitPattern count="one">{0} MW</unitPattern>
+				<unitPattern count="few">{0} MW</unitPattern>
+				<unitPattern count="many">{0} MW</unitPattern>
+				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName draft="contributed">kW</displayName>
@@ -9834,12 +10218,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kW</unitPattern>
 				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<displayName draft="contributed">MW</displayName>
-				<unitPattern count="one">{0} MW</unitPattern>
-				<unitPattern count="few">{0} MW</unitPattern>
-				<unitPattern count="many">{0} MW</unitPattern>
-				<unitPattern count="other">{0} MW</unitPattern>
+			<unit type="power-watt">
+				<displayName draft="contributed">W</displayName>
+				<unitPattern count="one">{0} W</unitPattern>
+				<unitPattern count="few">{0} W</unitPattern>
+				<unitPattern count="many">{0} W</unitPattern>
+				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<displayName draft="contributed">mW</displayName>
@@ -9848,12 +10232,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mW</unitPattern>
 				<unitPattern count="other">{0} mW</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName draft="contributed">W</displayName>
-				<unitPattern count="one">{0} W</unitPattern>
-				<unitPattern count="few">{0} W</unitPattern>
-				<unitPattern count="many">{0} W</unitPattern>
-				<unitPattern count="other">{0} W</unitPattern>
+			<unit type="power-horsepower">
+				<displayName draft="contributed">hp</displayName>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="few">{0} hp</unitPattern>
+				<unitPattern count="many">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="contributed">hPa</displayName>
@@ -9862,20 +10246,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName draft="contributed">inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="few">{0} inHg</unitPattern>
-				<unitPattern count="many">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName draft="contributed">mb</displayName>
-				<unitPattern count="one">{0} mb</unitPattern>
-				<unitPattern count="few">{0} mb</unitPattern>
-				<unitPattern count="many">{0} mb</unitPattern>
-				<unitPattern count="other">{0} mb</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName draft="contributed">mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -9890,12 +10260,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName draft="contributed">kt</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="few">{0} kt</unitPattern>
-				<unitPattern count="many">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName draft="contributed">inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="few">{0} inHg</unitPattern>
+				<unitPattern count="many">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName draft="contributed">mb</displayName>
+				<unitPattern count="one">{0} mb</unitPattern>
+				<unitPattern count="few">{0} mb</unitPattern>
+				<unitPattern count="many">{0} mb</unitPattern>
+				<unitPattern count="other">{0} mb</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -9918,6 +10295,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName draft="contributed">kn</displayName>
+				<unitPattern count="one" draft="contributed">{0} kn</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kn</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} kn</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kn</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0} °C</unitPattern>
@@ -9939,47 +10323,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="few">{0} ac ft</unitPattern>
-				<unitPattern count="many">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>bu</displayName>
-				<unitPattern count="one">{0} bu</unitPattern>
-				<unitPattern count="few">{0} bu</unitPattern>
-				<unitPattern count="many">{0} bu</unitPattern>
-				<unitPattern count="other">{0} bu</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName draft="contributed">cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="few">{0} cl</unitPattern>
-				<unitPattern count="many">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName draft="contributed">cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="few">{0} cm³</unitPattern>
-				<unitPattern count="many">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName draft="contributed">ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="few">{0} ft³</unitPattern>
-				<unitPattern count="many">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName draft="contributed">in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="few">{0} in³</unitPattern>
-				<unitPattern count="many">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName draft="contributed">km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -9993,6 +10336,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} m³</unitPattern>
 				<unitPattern count="many">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern draft="contributed">{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName draft="contributed">cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="few">{0} cm³</unitPattern>
+				<unitPattern count="many">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern draft="contributed">{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName draft="contributed">mi³</displayName>
@@ -10008,33 +10360,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName draft="contributed">c</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="few">{0} c</unitPattern>
-				<unitPattern count="many">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName draft="contributed">ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="few">{0} ft³</unitPattern>
+				<unitPattern count="many">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName draft="contributed">dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="few">{0} dl</unitPattern>
-				<unitPattern count="many">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName draft="contributed">in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="few">{0} in³</unitPattern>
+				<unitPattern count="many">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName draft="contributed">fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="few">{0} fl oz</unitPattern>
-				<unitPattern count="many">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName draft="contributed">gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="few">{0} gal</unitPattern>
-				<unitPattern count="many">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName draft="contributed">Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="few">{0} Ml</unitPattern>
+				<unitPattern count="many">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName draft="contributed">hl</displayName>
@@ -10049,13 +10394,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} l</unitPattern>
 				<unitPattern count="many">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern draft="contributed">{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName draft="contributed">Ml</displayName>
-				<unitPattern count="one">{0} Ml</unitPattern>
-				<unitPattern count="few">{0} Ml</unitPattern>
-				<unitPattern count="many">{0} Ml</unitPattern>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName draft="contributed">dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="few">{0} dl</unitPattern>
+				<unitPattern count="many">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName draft="contributed">cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="few">{0} cl</unitPattern>
+				<unitPattern count="many">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName draft="contributed">ml</displayName>
@@ -10064,12 +10417,40 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName draft="contributed">pt</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="few">{0} pt</unitPattern>
-				<unitPattern count="many">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName draft="contributed">mpt</displayName>
+				<unitPattern count="one" draft="contributed">{0} mpt</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mpt</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} mpt</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName draft="contributed">mcup</displayName>
+				<unitPattern count="one" draft="contributed">{0} mc</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mc</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} mc</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="few">{0} ac ft</unitPattern>
+				<unitPattern count="many">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>bu</displayName>
+				<unitPattern count="one">{0} bu</unitPattern>
+				<unitPattern count="few">{0} bu</unitPattern>
+				<unitPattern count="many">{0} bu</unitPattern>
+				<unitPattern count="other">{0} bu</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName draft="contributed">gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="few">{0} gal</unitPattern>
+				<unitPattern count="many">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern draft="contributed">{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName draft="contributed">qt</displayName>
@@ -10078,6 +10459,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName draft="contributed">pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="few">{0} pt</unitPattern>
+				<unitPattern count="many">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName draft="contributed">c</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="few">{0} c</unitPattern>
+				<unitPattern count="many">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName draft="contributed">fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="few">{0} fl oz</unitPattern>
+				<unitPattern count="many">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName draft="contributed">tbsp</displayName>
 				<unitPattern count="one">{0} tbsp</unitPattern>
@@ -10092,6 +10494,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} tsp</unitPattern>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/cs_CZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cs_CZ.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/cs_CZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cs_CZ.xml
index 54e94ea3971..5228b9b1cdc 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/cs_CZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cs_CZ.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="cs"/>
 		<territory type="CZ"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cu.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cu.xml
new file mode 100644
index 00000000000..c01a6a80250
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cu.xml
@@ -0,0 +1,997 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2014 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11977 $"/>
+		<language type="cu"/>
+	</identity>
+	<localeDisplayNames>
+		<languages>
+			<language type="ar" draft="unconfirmed">а҆ра́вскїй</language>
+			<language type="be" draft="unconfirmed">бѣлорꙋ́сскїй</language>
+			<language type="cu" draft="unconfirmed">церковнослове́нскїй</language>
+			<language type="de" draft="unconfirmed">нѣме́цкїй</language>
+			<language type="de_AT" draft="unconfirmed">а҆ѵстрі́йскїй нѣме́цкїй</language>
+			<language type="de_CH" draft="unconfirmed">є҆лветі́йскїй нѣме́цкїй</language>
+			<language type="en" draft="unconfirmed">а҆нглі́йскїй</language>
+			<language type="en_AU" draft="unconfirmed">а҆ѵстралі́йскїй а҆нглі́йскїй</language>
+			<language type="en_CA" draft="unconfirmed">кана́дскїй а҆нглі́йскїй</language>
+			<language type="en_GB" draft="unconfirmed">брїта́нскїй а҆нглі́йскїй</language>
+			<language type="en_GB" alt="short" draft="unconfirmed">а҆нглі́йскїй (вели́каѧ брїта́нїа)</language>
+			<language type="en_US" draft="unconfirmed">а҆мерїка́нскїй а҆нглі́йскїй</language>
+			<language type="en_US" alt="short" draft="unconfirmed">а҆нглі́йскїй (асд)</language>
+			<language type="es" draft="unconfirmed">і҆спа́нскїй</language>
+			<language type="es_419" draft="unconfirmed">латїноамерїка́нскїй і҆спа́нскїй</language>
+			<language type="es_ES" draft="unconfirmed">є҆ѵрѡпе́йскїй і҆спа́нскїй</language>
+			<language type="es_MX" draft="unconfirmed">і҆спанскїй (ме́ѯїка)</language>
+			<language type="fr" draft="unconfirmed">францꙋ́зскїй</language>
+			<language type="fr_CA" draft="unconfirmed">кана́дскїй францꙋ́зскїй</language>
+			<language type="fr_CH" draft="unconfirmed">є҆лветі́йскїй францꙋ́зскїй</language>
+			<language type="it" draft="unconfirmed">і҆талїа́нскїй</language>
+			<language type="ja" draft="unconfirmed">ꙗ҆пѡ́нскїй</language>
+			<language type="kk" draft="unconfirmed">каза́хскїй</language>
+			<language type="pt" draft="unconfirmed">портога́льскїй</language>
+			<language type="pt_BR" draft="unconfirmed">бразі́льскїй портога́льскїй</language>
+			<language type="pt_PT" draft="unconfirmed">є҆ѵрѡпе́йскїй портога́льскїй</language>
+			<language type="ro" draft="unconfirmed">дакорꙋмы́нскїй</language>
+			<language type="ro_MD" draft="unconfirmed">молда́вскїй</language>
+			<language type="ru" draft="unconfirmed">рꙋ́сскїй</language>
+			<language type="uk" draft="unconfirmed">ᲂу҆краи́нскїй</language>
+			<language type="und" draft="unconfirmed">невѣ́домый ѧ҆зы́къ</language>
+			<language type="zh" draft="unconfirmed">хи́нскїй</language>
+			<language type="zh_Hans" draft="unconfirmed">ᲂу҆проще́нный хи́нскїй</language>
+			<language type="zh_Hant" draft="unconfirmed">традїцїо́нный хи́нскїй</language>
+		</languages>
+		<scripts>
+			<script type="Arab" draft="unconfirmed">а҆раві́йскаѧ</script>
+			<script type="Cyrl" draft="unconfirmed">кѷри́ллица</script>
+			<script type="Glag" draft="unconfirmed">глаго́лица</script>
+			<script type="Hans" draft="unconfirmed">хи́нскаѧ ᲂу҆проще́ннаѧ</script>
+			<script type="Hans" alt="stand-alone" draft="unconfirmed">хи́нскаѧ ᲂу҆проще́ннаѧ</script>
+			<script type="Hant" draft="unconfirmed">хи́нскаѧ традїцїо́ннаѧ</script>
+			<script type="Hant" alt="stand-alone" draft="unconfirmed">хи́нскаѧ традїцїо́ннаѧ</script>
+			<script type="Latn" draft="unconfirmed">латі́ница</script>
+			<script type="Zxxx" draft="unconfirmed">безпи́сьменный</script>
+			<script type="Zzzz" draft="unconfirmed">невѣ̑домаѧ пи́сьмена</script>
+		</scripts>
+		<territories>
+			<territory type="AU" draft="unconfirmed">А҆ѵстралі́ѧ</territory>
+			<territory type="BR" draft="unconfirmed">бразі́лїа</territory>
+			<territory type="BY" draft="unconfirmed">бѣ́лаѧ рꙋ́сь</territory>
+			<territory type="CA" draft="unconfirmed">Кана́да</territory>
+			<territory type="CN" draft="unconfirmed">хи́нскаѧ страна̀</territory>
+			<territory type="DE" draft="unconfirmed">герма́нїа</territory>
+			<territory type="DK" draft="unconfirmed">Дані́ѧ</territory>
+			<territory type="FR" draft="unconfirmed">га́ллїа</territory>
+			<territory type="GB" draft="unconfirmed">Вели́каѧ брїта́нїа</territory>
+			<territory type="IN" draft="unconfirmed">і҆́ндїа</territory>
+			<territory type="IT" draft="unconfirmed">і҆та́лїа</territory>
+			<territory type="JP" draft="unconfirmed">ꙗ҆пѡ́нїа</territory>
+			<territory type="KG" draft="unconfirmed">кирги́зїа</territory>
+			<territory type="KZ" draft="unconfirmed">казахста́нъ</territory>
+			<territory type="MX" draft="unconfirmed">Ме́ѯїко</territory>
+			<territory type="RU" draft="unconfirmed">рѡссі́а</territory>
+			<territory type="UA" draft="unconfirmed">ᲂу҆краи́на</territory>
+			<territory type="US" draft="unconfirmed">а҆мерїка̑нскїѧ соедине̑нныѧ держа̑вы</territory>
+			<territory type="ZZ" draft="unconfirmed">невѣ́домаѧ страна̀</territory>
+		</territories>
+		<types>
+			<type key="calendar" type="gregorian" draft="unconfirmed">григорїа́нскїй мѣсѧцесло́въ</type>
+			<type key="collation" type="standard" draft="unconfirmed">канѡни́ческое ᲂу҆порѧ́доченїе</type>
+			<type key="numbers" type="latn" draft="unconfirmed">а҆раві́йстїи числові́и зна́цы</type>
+		</types>
+		<measurementSystemNames>
+			<measurementSystemName type="metric" draft="unconfirmed">метрі́ческаѧ</measurementSystemName>
+			<measurementSystemName type="UK" draft="unconfirmed">а҆нглі́йскаѧ</measurementSystemName>
+			<measurementSystemName type="US" draft="unconfirmed">а҆мерїка́нскаѧ</measurementSystemName>
+		</measurementSystemNames>
+	</localeDisplayNames>
+	<layout>
+		<orientation>
+			<characterOrder>left-to-right</characterOrder>
+			<lineOrder>top-to-bottom</lineOrder>
+		</orientation>
+	</layout>
+	<characters>
+		<exemplarCharacters>[\u0487 \u0483 \u2DE0 \u2DE1 \u2DE2 \u2DE3 \u2DE4 \u2DE5 \u2DE6 \u2DE7 \u2DE8 \u2DE9 \u2DEA \u2DEC \u2DED \u2DEF \u2DF1 ⸯ \uA67D ꙿ \u2DF4 ҂ а б в г д е є ж ѕ з ꙁ и і ї й к л м н ѻ о ѡ ꙍ ѽ ѿ п р с т ꙋ у ф х ц ч ш щ ъ ы ь ѣ ю ꙗ ѧ ѫ ѯ ѱ ѳ ѵ ѷ]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[\u200C\u200D\uFE2F \u2DF6 \u2DF7 \uA674 \uA675 \uA676 \uA67B \u2DEB \u2DF5 \u2DEE \u2DF9 \uA677 \u2DF0 \u2DF2 \u2DF3 \uA678 \uA679 \uA67A \u2DFA \u2DFB \u2DFC \u2DFD \u2DFE \u2DFF \u0488\u0489\uA670\uA671\uA672 \u0484 \uFE2E \uA66F ꙣ ꙃ ꙅ ꙇ ꙉ \u2DF8 ꙥ ꙧ ҥ ꙩꙫꙭꙮꚙꚛ ҁ \uA69E ꙡ џ ꙏ ꙑ ꙓ ꙕ ѥ \uA69F ꙙ ꙛ ѩ ꙝ ѭ ꙟ]</exemplarCharacters>
+		<exemplarCharacters type="index">[А Б В Г Д Є Ж Ѕ З И І К Л М Н Ѻ О Ѡ Ѿ П Р С Т Ꙋ Ф Х Ц Ч Ш Щ Ъ Ы Ь Ѣ Ю Ꙗ Ѧ Ѫ Ѯ Ѱ Ѳ Ѵ]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[꙾ , \- . \: ; _ – — ꙳ ‐ ! ? ( ) /]</exemplarCharacters>
+	</characters>
+	<delimiters>
+		<quotationStart draft="unconfirmed">«</quotationStart>
+		<quotationEnd draft="unconfirmed">»</quotationEnd>
+		<alternateQuotationStart draft="unconfirmed">„</alternateQuotationStart>
+		<alternateQuotationEnd draft="unconfirmed">“</alternateQuotationEnd>
+	</delimiters>
+	<dates>
+		<calendars>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern draft="unconfirmed">G y MMMM d, EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern draft="unconfirmed">G y MMMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern draft="unconfirmed">G y MMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern draft="unconfirmed">GGGGG y-MM-dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<intervalFormats>
+						<intervalFormatFallback draft="unconfirmed">{0} – {1}</intervalFormatFallback>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="unconfirmed">і҆аⷩ҇</month>
+							<month type="2" draft="unconfirmed">феⷡ҇</month>
+							<month type="3" draft="unconfirmed">маⷬ҇</month>
+							<month type="4" draft="unconfirmed">а҆пⷬ҇</month>
+							<month type="5" draft="unconfirmed">маꙵ</month>
+							<month type="6" draft="unconfirmed">і҆ꙋⷩ҇</month>
+							<month type="7" draft="unconfirmed">і҆ꙋⷧ҇</month>
+							<month type="8" draft="unconfirmed">а҆́ѵⷢ҇</month>
+							<month type="9" draft="unconfirmed">сеⷫ҇</month>
+							<month type="10" draft="unconfirmed">ѻ҆кⷮ</month>
+							<month type="11" draft="unconfirmed">ноеⷨ</month>
+							<month type="12" draft="unconfirmed">деⷦ҇</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="unconfirmed">І҆</month>
+							<month type="2" draft="unconfirmed">Ф</month>
+							<month type="3" draft="unconfirmed">М</month>
+							<month type="4" draft="unconfirmed">А҆</month>
+							<month type="5" draft="unconfirmed">М</month>
+							<month type="6" draft="unconfirmed">І҆</month>
+							<month type="7" draft="unconfirmed">І҆</month>
+							<month type="8" draft="unconfirmed">А҆</month>
+							<month type="9" draft="unconfirmed">С</month>
+							<month type="10" draft="unconfirmed">Ѻ҆</month>
+							<month type="11" draft="unconfirmed">Н</month>
+							<month type="12" draft="unconfirmed">Д</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">і҆аннꙋа́рїа</month>
+							<month type="2" draft="unconfirmed">феврꙋа́рїа</month>
+							<month type="3" draft="unconfirmed">ма́рта</month>
+							<month type="4" draft="unconfirmed">а҆прі́ллїа</month>
+							<month type="5" draft="unconfirmed">ма́їа</month>
+							<month type="6" draft="unconfirmed">і҆ꙋ́нїа</month>
+							<month type="7" draft="unconfirmed">і҆ꙋ́лїа</month>
+							<month type="8" draft="unconfirmed">а҆́ѵгꙋста</month>
+							<month type="9" draft="unconfirmed">септе́мврїа</month>
+							<month type="10" draft="unconfirmed">ѻ҆ктѡ́врїа</month>
+							<month type="11" draft="unconfirmed">ное́мврїа</month>
+							<month type="12" draft="unconfirmed">деке́мврїа</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="unconfirmed">і҆аⷩ҇</month>
+							<month type="2" draft="unconfirmed">феⷡ҇</month>
+							<month type="3" draft="unconfirmed">маⷬ҇</month>
+							<month type="4" draft="unconfirmed">а҆пⷬ҇</month>
+							<month type="5" draft="unconfirmed">маꙵ</month>
+							<month type="6" draft="unconfirmed">і҆ꙋⷩ҇</month>
+							<month type="7" draft="unconfirmed">і҆ꙋⷧ҇</month>
+							<month type="8" draft="unconfirmed">а҆́ѵⷢ҇</month>
+							<month type="9" draft="unconfirmed">сеⷫ҇</month>
+							<month type="10" draft="unconfirmed">ѻ҆кⷮ</month>
+							<month type="11" draft="unconfirmed">ноеⷨ</month>
+							<month type="12" draft="unconfirmed">деⷦ҇</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="unconfirmed">І҆</month>
+							<month type="2" draft="unconfirmed">Ф</month>
+							<month type="3" draft="unconfirmed">М</month>
+							<month type="4" draft="unconfirmed">А҆</month>
+							<month type="5" draft="unconfirmed">М</month>
+							<month type="6" draft="unconfirmed">І҆</month>
+							<month type="7" draft="unconfirmed">І҆</month>
+							<month type="8" draft="unconfirmed">А҆</month>
+							<month type="9" draft="unconfirmed">С</month>
+							<month type="10" draft="unconfirmed">Ѻ҆</month>
+							<month type="11" draft="unconfirmed">Н</month>
+							<month type="12" draft="unconfirmed">Д</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">і҆аннꙋа́рїй</month>
+							<month type="2" draft="unconfirmed">феврꙋа́рїй</month>
+							<month type="3" draft="unconfirmed">ма́ртъ</month>
+							<month type="4" draft="unconfirmed">а҆прі́ллїй</month>
+							<month type="5" draft="unconfirmed">ма́їй</month>
+							<month type="6" draft="unconfirmed">і҆ꙋ́нїй</month>
+							<month type="7" draft="unconfirmed">і҆ꙋ́лїй</month>
+							<month type="8" draft="unconfirmed">а҆́ѵгꙋстъ</month>
+							<month type="9" draft="unconfirmed">септе́мврїй</month>
+							<month type="10" draft="unconfirmed">ѻ҆ктѡ́врїй</month>
+							<month type="11" draft="unconfirmed">ное́мврїй</month>
+							<month type="12" draft="unconfirmed">деке́мврїй</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="abbreviated">
+							<day type="sun" draft="unconfirmed">ндⷧ҇ѧ</day>
+							<day type="mon" draft="unconfirmed">пнⷣе</day>
+							<day type="tue" draft="unconfirmed">втоⷬ҇</day>
+							<day type="wed" draft="unconfirmed">срⷣе</day>
+							<day type="thu" draft="unconfirmed">чеⷦ҇</day>
+							<day type="fri" draft="unconfirmed">пѧⷦ҇</day>
+							<day type="sat" draft="unconfirmed">сꙋⷠ҇</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun" draft="unconfirmed">Н</day>
+							<day type="mon" draft="unconfirmed">П</day>
+							<day type="tue" draft="unconfirmed">В</day>
+							<day type="wed" draft="unconfirmed">С</day>
+							<day type="thu" draft="unconfirmed">Ч</day>
+							<day type="fri" draft="unconfirmed">П</day>
+							<day type="sat" draft="unconfirmed">С</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun" draft="unconfirmed">ндⷧ҇ѧ</day>
+							<day type="mon" draft="unconfirmed">пнⷣе</day>
+							<day type="tue" draft="unconfirmed">втоⷬ҇</day>
+							<day type="wed" draft="unconfirmed">срⷣе</day>
+							<day type="thu" draft="unconfirmed">чеⷦ҇</day>
+							<day type="fri" draft="unconfirmed">пѧⷦ҇</day>
+							<day type="sat" draft="unconfirmed">сꙋⷠ҇</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun" draft="unconfirmed">недѣ́лѧ</day>
+							<day type="mon" draft="unconfirmed">понедѣ́льникъ</day>
+							<day type="tue" draft="unconfirmed">вто́рникъ</day>
+							<day type="wed" draft="unconfirmed">среда̀</day>
+							<day type="thu" draft="unconfirmed">четверто́къ</day>
+							<day type="fri" draft="unconfirmed">пѧто́къ</day>
+							<day type="sat" draft="unconfirmed">сꙋббѡ́та</day>
+						</dayWidth>
+					</dayContext>
+					<dayContext type="stand-alone">
+						<dayWidth type="abbreviated">
+							<day type="sun" draft="unconfirmed">ндⷧ҇ѧ</day>
+							<day type="mon" draft="unconfirmed">пнⷣе</day>
+							<day type="tue" draft="unconfirmed">втоⷬ҇</day>
+							<day type="wed" draft="unconfirmed">срⷣе</day>
+							<day type="thu" draft="unconfirmed">чеⷦ҇</day>
+							<day type="fri" draft="unconfirmed">пѧⷦ҇</day>
+							<day type="sat" draft="unconfirmed">сꙋⷠ҇</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun" draft="unconfirmed">Н</day>
+							<day type="mon" draft="unconfirmed">П</day>
+							<day type="tue" draft="unconfirmed">В</day>
+							<day type="wed" draft="unconfirmed">С</day>
+							<day type="thu" draft="unconfirmed">Ч</day>
+							<day type="fri" draft="unconfirmed">П</day>
+							<day type="sat" draft="unconfirmed">С</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun" draft="unconfirmed">ндⷧ҇ѧ</day>
+							<day type="mon" draft="unconfirmed">пнⷣе</day>
+							<day type="tue" draft="unconfirmed">втоⷬ҇</day>
+							<day type="wed" draft="unconfirmed">срⷣе</day>
+							<day type="thu" draft="unconfirmed">чеⷦ҇</day>
+							<day type="fri" draft="unconfirmed">пѧⷦ҇</day>
+							<day type="sat" draft="unconfirmed">сꙋⷠ҇</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun" draft="unconfirmed">недѣ́лѧ</day>
+							<day type="mon" draft="unconfirmed">понедѣ́льникъ</day>
+							<day type="tue" draft="unconfirmed">вто́рникъ</day>
+							<day type="wed" draft="unconfirmed">среда̀</day>
+							<day type="thu" draft="unconfirmed">четверто́къ</day>
+							<day type="fri" draft="unconfirmed">пѧто́къ</day>
+							<day type="sat" draft="unconfirmed">сꙋббѡ́та</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<quarters>
+					<quarterContext type="format">
+						<quarterWidth type="abbreviated">
+							<quarter type="1" draft="unconfirmed">а҃-ѧ чеⷡ҇</quarter>
+							<quarter type="2" draft="unconfirmed">в҃-ѧ чеⷡ҇</quarter>
+							<quarter type="3" draft="unconfirmed">г҃-ѧ чеⷡ҇</quarter>
+							<quarter type="4" draft="unconfirmed">д҃-ѧ чеⷡ҇</quarter>
+						</quarterWidth>
+						<quarterWidth type="narrow">
+							<quarter type="1" draft="unconfirmed">а҃</quarter>
+							<quarter type="2" draft="unconfirmed">в҃</quarter>
+							<quarter type="3" draft="unconfirmed">г҃</quarter>
+							<quarter type="4" draft="unconfirmed">д҃</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1" draft="unconfirmed">а҃-ѧ че́тверть</quarter>
+							<quarter type="2" draft="unconfirmed">в҃-ѧ че́тверть</quarter>
+							<quarter type="3" draft="unconfirmed">г҃-ѧ че́тверть</quarter>
+							<quarter type="4" draft="unconfirmed">д҃-ѧ че́тверть</quarter>
+						</quarterWidth>
+					</quarterContext>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="abbreviated">
+							<quarter type="1" draft="unconfirmed">а҃</quarter>
+							<quarter type="2" draft="unconfirmed">в҃</quarter>
+							<quarter type="3" draft="unconfirmed">г҃</quarter>
+							<quarter type="4" draft="unconfirmed">д҃</quarter>
+						</quarterWidth>
+						<quarterWidth type="narrow">
+							<quarter type="1" draft="unconfirmed">а҃</quarter>
+							<quarter type="2" draft="unconfirmed">в҃</quarter>
+							<quarter type="3" draft="unconfirmed">г҃</quarter>
+							<quarter type="4" draft="unconfirmed">д҃</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1" draft="unconfirmed">а҃-ѧ че́тверть</quarter>
+							<quarter type="2" draft="unconfirmed">в҃-ѧ че́тверть</quarter>
+							<quarter type="3" draft="unconfirmed">г҃-ѧ че́тверть</quarter>
+							<quarter type="4" draft="unconfirmed">д҃-ѧ че́тверть</quarter>
+						</quarterWidth>
+					</quarterContext>
+				</quarters>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am" draft="unconfirmed">ДП</dayPeriod>
+							<dayPeriod type="pm" draft="unconfirmed">ПП</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am" draft="unconfirmed">ДП</dayPeriod>
+							<dayPeriod type="pm" draft="unconfirmed">ПП</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am" draft="unconfirmed">ДП</dayPeriod>
+							<dayPeriod type="pm" draft="unconfirmed">ПП</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am" draft="unconfirmed">ДП</dayPeriod>
+							<dayPeriod type="pm" draft="unconfirmed">ПП</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am" draft="unconfirmed">ДП</dayPeriod>
+							<dayPeriod type="pm" draft="unconfirmed">ПП</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<eras>
+					<eraNames>
+						<era type="0" draft="unconfirmed">пре́дъ р. х.</era>
+						<era type="1" draft="unconfirmed">по р. х.</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0" draft="unconfirmed">пре́дъ р. х.</era>
+						<era type="1" draft="unconfirmed">по р. х.</era>
+					</eraAbbr>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern draft="unconfirmed">EEEE, d MMMM 'л'. y.</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern draft="unconfirmed">y MMMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern draft="unconfirmed">y MMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern draft="unconfirmed">y.MM.dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern draft="unconfirmed">HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern draft="unconfirmed">HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern draft="unconfirmed">HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern draft="unconfirmed">HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<intervalFormats>
+						<intervalFormatFallback draft="unconfirmed">{0} – {1}</intervalFormatFallback>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="era">
+				<displayName draft="unconfirmed">вѣ́къ</displayName>
+			</field>
+			<field type="year">
+				<displayName draft="unconfirmed">лѣ́то</displayName>
+			</field>
+			<field type="year-short">
+				<displayName draft="unconfirmed">л.</displayName>
+			</field>
+			<field type="year-narrow">
+				<displayName draft="unconfirmed">л.</displayName>
+			</field>
+			<field type="quarter">
+				<displayName draft="unconfirmed">че́тверть</displayName>
+			</field>
+			<field type="quarter-short">
+				<displayName draft="unconfirmed">чеⷡ҇</displayName>
+			</field>
+			<field type="quarter-narrow">
+				<displayName draft="unconfirmed">чеⷡ҇</displayName>
+			</field>
+			<field type="month">
+				<displayName draft="unconfirmed">мѣ́сѧцъ</displayName>
+			</field>
+			<field type="month-short">
+				<displayName draft="unconfirmed">мцⷭ҇ъ</displayName>
+			</field>
+			<field type="month-narrow">
+				<displayName draft="unconfirmed">мцⷭ҇ъ</displayName>
+			</field>
+			<field type="week">
+				<displayName draft="unconfirmed">седми́ца</displayName>
+			</field>
+			<field type="week-short">
+				<displayName draft="unconfirmed">сеⷣ</displayName>
+			</field>
+			<field type="week-narrow">
+				<displayName draft="unconfirmed">сеⷣ</displayName>
+			</field>
+			<field type="day">
+				<displayName draft="unconfirmed">де́нь</displayName>
+				<relative type="-1" draft="unconfirmed">вчера̀</relative>
+				<relative type="0" draft="unconfirmed">дне́сь</relative>
+				<relative type="1" draft="unconfirmed">наꙋ́трїе</relative>
+			</field>
+			<field type="day-short">
+				<displayName draft="unconfirmed">деⷩ҇</displayName>
+			</field>
+			<field type="day-narrow">
+				<displayName draft="unconfirmed">деⷩ҇</displayName>
+			</field>
+			<field type="weekday">
+				<displayName draft="unconfirmed">де́нь седми́цы</displayName>
+			</field>
+			<field type="dayperiod">
+				<displayName draft="unconfirmed">ДП/ПП</displayName>
+			</field>
+			<field type="hour">
+				<displayName draft="unconfirmed">ча́съ</displayName>
+			</field>
+			<field type="hour-short">
+				<displayName draft="unconfirmed">чаⷭ҇</displayName>
+			</field>
+			<field type="hour-narrow">
+				<displayName draft="unconfirmed">чаⷭ҇</displayName>
+			</field>
+			<field type="minute">
+				<displayName draft="unconfirmed">минꙋ́та</displayName>
+			</field>
+			<field type="minute-short">
+				<displayName draft="unconfirmed">миⷩ҇</displayName>
+			</field>
+			<field type="minute-narrow">
+				<displayName draft="unconfirmed">миⷩ҇</displayName>
+			</field>
+			<field type="second">
+				<displayName draft="unconfirmed">секꙋ́нда</displayName>
+			</field>
+			<field type="second-short">
+				<displayName draft="unconfirmed">сеⷦ҇</displayName>
+			</field>
+			<field type="second-narrow">
+				<displayName draft="unconfirmed">сеⷦ҇</displayName>
+			</field>
+			<field type="zone">
+				<displayName draft="unconfirmed">по́ѧсъ часовѡ́мъ</displayName>
+			</field>
+		</fields>
+		<timeZoneNames>
+			<hourFormat draft="unconfirmed">+HH:mm;-HH:mm</hourFormat>
+			<gmtFormat draft="unconfirmed">GMT{0}</gmtFormat>
+			<gmtZeroFormat draft="unconfirmed">GMT</gmtZeroFormat>
+			<regionFormat draft="unconfirmed">{0} (вре́мѧ)</regionFormat>
+			<regionFormat type="daylight" draft="unconfirmed">{0} (лѣ́тнее вре́мѧ)</regionFormat>
+			<regionFormat type="standard" draft="unconfirmed">{0} (зи́мнее вре́мѧ)</regionFormat>
+			<fallbackFormat draft="unconfirmed">{1} ({0})</fallbackFormat>
+			<zone type="Etc/Unknown">
+				<exemplarCity draft="unconfirmed">невѣ́домый гра́дъ</exemplarCity>
+			</zone>
+			<zone type="Europe/Minsk">
+				<exemplarCity draft="unconfirmed">ми́нскъ</exemplarCity>
+			</zone>
+			<zone type="Asia/Bishkek">
+				<exemplarCity draft="unconfirmed">бишке́къ</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtau">
+				<exemplarCity draft="unconfirmed">а҆кта́ꙋ</exemplarCity>
+			</zone>
+			<zone type="Asia/Oral">
+				<exemplarCity draft="unconfirmed">ᲂу҆ра́льскъ</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtobe">
+				<exemplarCity draft="unconfirmed">а҆ктю́бинскъ</exemplarCity>
+			</zone>
+			<zone type="Asia/Qyzylorda">
+				<exemplarCity draft="unconfirmed">кызылѻрда̀</exemplarCity>
+			</zone>
+			<zone type="Asia/Almaty">
+				<exemplarCity draft="unconfirmed">а҆лматы̀</exemplarCity>
+			</zone>
+			<zone type="Europe/Kaliningrad">
+				<exemplarCity draft="unconfirmed">калинингра́дъ</exemplarCity>
+			</zone>
+			<zone type="Europe/Simferopol">
+				<exemplarCity draft="unconfirmed">сѷмферꙋ́поль</exemplarCity>
+			</zone>
+			<zone type="Europe/Moscow">
+				<exemplarCity draft="unconfirmed">москва̀</exemplarCity>
+			</zone>
+			<zone type="Europe/Volgograd">
+				<exemplarCity draft="unconfirmed">волгогра́дъ</exemplarCity>
+			</zone>
+			<zone type="Europe/Samara">
+				<exemplarCity draft="unconfirmed">сама́ра</exemplarCity>
+			</zone>
+			<zone type="Asia/Yekaterinburg">
+				<exemplarCity draft="unconfirmed">є҆катерїнбꙋ́ргъ</exemplarCity>
+			</zone>
+			<zone type="Asia/Omsk">
+				<exemplarCity draft="unconfirmed">ѻ҆́мскъ</exemplarCity>
+			</zone>
+			<zone type="Asia/Novosibirsk">
+				<exemplarCity draft="unconfirmed">новосиби́рскъ</exemplarCity>
+			</zone>
+			<zone type="Asia/Novokuznetsk">
+				<exemplarCity draft="unconfirmed">новокꙋзне́цкъ</exemplarCity>
+			</zone>
+			<zone type="Asia/Krasnoyarsk">
+				<exemplarCity draft="unconfirmed">красноѧ́рскъ</exemplarCity>
+			</zone>
+			<zone type="Asia/Irkutsk">
+				<exemplarCity draft="unconfirmed">и҆ркꙋ́тскъ</exemplarCity>
+			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity draft="unconfirmed">чита̀</exemplarCity>
+			</zone>
+			<zone type="Asia/Yakutsk">
+				<exemplarCity draft="unconfirmed">ꙗ҆кꙋ́тскъ</exemplarCity>
+			</zone>
+			<zone type="Asia/Vladivostok">
+				<exemplarCity draft="unconfirmed">владивосто́къ</exemplarCity>
+			</zone>
+			<zone type="Asia/Khandyga">
+				<exemplarCity draft="unconfirmed">ха́ндыга</exemplarCity>
+			</zone>
+			<zone type="Asia/Sakhalin">
+				<exemplarCity draft="unconfirmed">сахали́нъ</exemplarCity>
+			</zone>
+			<zone type="Asia/Ust-Nera">
+				<exemplarCity draft="unconfirmed">ᲂу҆́сть_не́ра</exemplarCity>
+			</zone>
+			<zone type="Asia/Magadan">
+				<exemplarCity draft="unconfirmed">магада́нъ</exemplarCity>
+			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity draft="unconfirmed">среднеколы́мскъ</exemplarCity>
+			</zone>
+			<zone type="Asia/Kamchatka">
+				<exemplarCity draft="unconfirmed">петропа́ѵловскъ_камча́тскїй</exemplarCity>
+			</zone>
+			<zone type="Asia/Anadyr">
+				<exemplarCity draft="unconfirmed">а҆на́дырь</exemplarCity>
+			</zone>
+			<zone type="Europe/Uzhgorod">
+				<exemplarCity draft="unconfirmed">ᲂу҆́жградъ</exemplarCity>
+			</zone>
+			<zone type="Europe/Kiev">
+				<exemplarCity draft="unconfirmed">кі́евъ</exemplarCity>
+			</zone>
+			<zone type="Europe/Zaporozhye">
+				<exemplarCity draft="unconfirmed">запра́жїе</exemplarCity>
+			</zone>
+			<metazone type="America_Central">
+				<long>
+					<generic draft="unconfirmed">среднеамерїка́нское вре́мѧ</generic>
+					<standard draft="unconfirmed">среднеамерїка́нское зи́мнее вре́мѧ</standard>
+					<daylight draft="unconfirmed">среднеамерїка́нское лѣ́тнее вре́мѧ</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Eastern">
+				<long>
+					<generic draft="unconfirmed">восточноамерїка́нское вре́мѧ</generic>
+					<standard draft="unconfirmed">восточноамерїка́нское зи́мнее вре́мѧ</standard>
+					<daylight draft="unconfirmed">восточноамерїка́нское лѣ́тнее вре́мѧ</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Mountain">
+				<long>
+					<generic draft="unconfirmed">а҆мерїка́нское наго́рнее вре́мѧ</generic>
+					<standard draft="unconfirmed">а҆мерїка́нское наго́рнее зи́мнее вре́мѧ</standard>
+					<daylight draft="unconfirmed">а҆мерїка́нское наго́рнее лѣ́тнее вре́мѧ</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Pacific">
+				<long>
+					<generic draft="unconfirmed">тихоѻкеа́нское вре́мѧ</generic>
+					<standard draft="unconfirmed">тихоѻкеа́нское зи́мнее вре́мѧ</standard>
+					<daylight draft="unconfirmed">тихоѻкеа́нское лѣ́тнее вре́мѧ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Atlantic">
+				<long>
+					<generic draft="unconfirmed">а҆тланті́ческое вре́мѧ</generic>
+					<standard draft="unconfirmed">а҆тланті́ческое зи́мнее вре́мѧ</standard>
+					<daylight draft="unconfirmed">а҆тланті́ческое лѣ́тнее вре́мѧ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Europe_Central">
+				<long>
+					<generic draft="unconfirmed">среднеєѵрѡпе́йское вре́мѧ</generic>
+					<standard draft="unconfirmed">среднеєѵрѡпе́йское зи́мнее вре́мѧ</standard>
+					<daylight draft="unconfirmed">среднеєѵрѡпе́йское лѣ́тнее вре́мѧ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Europe_Eastern">
+				<long>
+					<generic draft="unconfirmed">восточноєѵрѡпе́йское вре́мѧ</generic>
+					<standard draft="unconfirmed">восточноєѵрѡпе́йское зи́мнее вре́мѧ</standard>
+					<daylight draft="unconfirmed">восточноєѵрѡпе́йское лѣ́тнее вре́мѧ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Europe_Further_Eastern">
+				<long>
+					<standard draft="unconfirmed">вре́мѧ въ калинингра́дѣ и҆ ми́нскѣ</standard>
+				</long>
+			</metazone>
+			<metazone type="Europe_Western">
+				<long>
+					<generic draft="unconfirmed">западноєѵрѡпе́йское вре́мѧ</generic>
+					<standard draft="unconfirmed">западноєѵрѡпе́йское зи́мнее вре́мѧ</standard>
+					<daylight draft="unconfirmed">западноєѵрѡпе́йское лѣ́тнее вре́мѧ</daylight>
+				</long>
+			</metazone>
+			<metazone type="GMT">
+				<long>
+					<standard draft="unconfirmed">сре́днее вре́мѧ по грі́нꙋичꙋ</standard>
+				</long>
+			</metazone>
+			<metazone type="Irkutsk">
+				<long>
+					<generic draft="unconfirmed">и҆ркꙋ́тское вре́мѧ</generic>
+					<standard draft="unconfirmed">и҆ркꙋ́тское зи́мнее вре́мѧ</standard>
+					<daylight draft="unconfirmed">и҆ркꙋ́тское лѣ́тнее вре́мѧ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Eastern">
+				<long>
+					<standard draft="unconfirmed">восто́чный казахста́нъ</standard>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Western">
+				<long>
+					<standard draft="unconfirmed">за́падный казахста́нъ</standard>
+				</long>
+			</metazone>
+			<metazone type="Krasnoyarsk">
+				<long>
+					<generic draft="unconfirmed">красноѧ́рское вре́мѧ</generic>
+					<standard draft="unconfirmed">красноѧ́рское зи́мнее вре́мѧ</standard>
+					<daylight draft="unconfirmed">красноѧ́рское лѣ́тнее вре́мѧ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kyrgystan">
+				<long>
+					<standard draft="unconfirmed">кирги́зїа</standard>
+				</long>
+			</metazone>
+			<metazone type="Magadan">
+				<long>
+					<generic draft="unconfirmed">магада́нское вре́мѧ</generic>
+					<standard draft="unconfirmed">магада́нское зи́мнее вре́мѧ</standard>
+					<daylight draft="unconfirmed">магада́нское лѣ́тнее вре́мѧ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Moscow">
+				<long>
+					<generic draft="unconfirmed">моско́вское вре́мѧ</generic>
+					<standard draft="unconfirmed">моско́вское зи́мнее вре́мѧ</standard>
+					<daylight draft="unconfirmed">моско́вское лѣ́тнее вре́мѧ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Novosibirsk">
+				<long>
+					<generic draft="unconfirmed">новосиби́рское вре́мѧ</generic>
+					<standard draft="unconfirmed">новосиби́рское зи́мнее вре́мѧ</standard>
+					<daylight draft="unconfirmed">новосиби́рское лѣ́тнее вре́мѧ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Omsk">
+				<long>
+					<generic draft="unconfirmed">ѻ҆́мское вре́мѧ</generic>
+					<standard draft="unconfirmed">ѻ҆́мское зи́мнее вре́мѧ</standard>
+					<daylight draft="unconfirmed">ѻ҆́мское лѣ́тнее вре́мѧ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Sakhalin">
+				<long>
+					<generic draft="unconfirmed">вре́мѧ на сахали́нѣ</generic>
+					<standard draft="unconfirmed">зи́мнее вре́мѧ на сахали́нѣ</standard>
+					<daylight draft="unconfirmed">лѣ́тнее вре́мѧ на сахали́нѣ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Vladivostok">
+				<long>
+					<generic draft="unconfirmed">владивосто́цкое вре́мѧ</generic>
+					<standard draft="unconfirmed">владивосто́цкое зи́мнее вре́мѧ</standard>
+					<daylight draft="unconfirmed">владивосто́цкое лѣ́тнее вре́мѧ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Volgograd">
+				<long>
+					<generic draft="unconfirmed">волгогра́дское вре́мѧ</generic>
+					<standard draft="unconfirmed">волгогра́дское зи́мнее вре́мѧ</standard>
+					<daylight draft="unconfirmed">волгогра́дское лѣ́тнее вре́мѧ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Yakutsk">
+				<long>
+					<generic draft="unconfirmed">ꙗ҆кꙋ́тское вре́мѧ</generic>
+					<standard draft="unconfirmed">ꙗ҆кꙋ́тское зи́мнее вре́мѧ</standard>
+					<daylight draft="unconfirmed">ꙗ҆кꙋ́тское лѣ́тнее вре́мѧ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Yekaterinburg">
+				<long>
+					<generic draft="unconfirmed">є҆катерїнбꙋ́ржское вре́мѧ</generic>
+					<standard draft="unconfirmed">є҆катерїнбꙋ́ржское зи́мнее вре́мѧ</standard>
+					<daylight draft="unconfirmed">є҆катерїнбꙋ́ржское лѣ́тнее вре́мѧ</daylight>
+				</long>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<defaultNumberingSystem>latn</defaultNumberingSystem>
+		<otherNumberingSystems>
+			<traditional>cyrl</traditional>
+		</otherNumberingSystems>
+		<symbols numberSystem="latn">
+			<decimal draft="unconfirmed">,</decimal>
+			<group draft="unconfirmed"> </group>
+			<percentSign draft="unconfirmed">%</percentSign>
+			<plusSign draft="unconfirmed">+</plusSign>
+			<minusSign draft="unconfirmed">-</minusSign>
+			<infinity draft="unconfirmed">∞</infinity>
+		</symbols>
+		<decimalFormats numberSystem="latn">
+			<decimalFormatLength>
+				<decimalFormat>
+					<pattern draft="unconfirmed">#,##0.###</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+		</decimalFormats>
+		<scientificFormats numberSystem="latn">
+			<scientificFormatLength>
+				<scientificFormat>
+					<pattern draft="unconfirmed">#E0</pattern>
+				</scientificFormat>
+			</scientificFormatLength>
+		</scientificFormats>
+		<percentFormats numberSystem="latn">
+			<percentFormatLength>
+				<percentFormat>
+					<pattern draft="unconfirmed">#,##0 %</pattern>
+				</percentFormat>
+			</percentFormatLength>
+		</percentFormats>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern draft="unconfirmed">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
+		</currencyFormats>
+		<currencies>
+			<currency type="BRL">
+				<displayName draft="unconfirmed">бразі́льскїй реа́лъ</displayName>
+				<displayName count="other" draft="unconfirmed">бразі́льскагѡ реа́ла</displayName>
+				<symbol draft="unconfirmed">R$</symbol>
+				<symbol alt="narrow" draft="unconfirmed">R$</symbol>
+			</currency>
+			<currency type="BYR">
+				<displayName draft="unconfirmed">бѣлорꙋ́сскїй рꙋ́бль</displayName>
+				<displayName count="other" draft="unconfirmed">бѣлорꙋ́сскагѡ рꙋблѧ̀</displayName>
+				<symbol draft="unconfirmed">BYR</symbol>
+				<symbol alt="narrow" draft="unconfirmed">р.</symbol>
+			</currency>
+			<currency type="CNY">
+				<displayName draft="unconfirmed">хи́нскїй ю҆а́нь</displayName>
+				<displayName count="other" draft="unconfirmed">хи́нскагѡ ю҆а́нѧ</displayName>
+				<symbol draft="unconfirmed">CN¥</symbol>
+				<symbol alt="narrow" draft="unconfirmed">¥</symbol>
+			</currency>
+			<currency type="EUR">
+				<displayName draft="unconfirmed">є҆́ѵрѡ</displayName>
+				<displayName count="other" draft="unconfirmed">є҆́ѵра</displayName>
+				<symbol draft="unconfirmed">€</symbol>
+				<symbol alt="narrow" draft="unconfirmed">€</symbol>
+			</currency>
+			<currency type="GBP">
+				<displayName draft="unconfirmed">а҆нглі́йскїй фꙋ́нтъ сте́рлингѡвъ</displayName>
+				<displayName count="other" draft="unconfirmed">а҆нглі́йскагѡ фꙋ́нта сте́рлингѡвъ</displayName>
+				<symbol draft="unconfirmed">£</symbol>
+				<symbol alt="narrow" draft="unconfirmed">£</symbol>
+			</currency>
+			<currency type="INR">
+				<displayName draft="unconfirmed">і҆нді́йскаѧ рꙋ́пїѧ</displayName>
+				<displayName count="other" draft="unconfirmed">і҆нді́йскїѧ рꙋ́пїи</displayName>
+				<symbol draft="unconfirmed">₹</symbol>
+				<symbol alt="narrow" draft="unconfirmed">₹</symbol>
+			</currency>
+			<currency type="JPY">
+				<displayName draft="unconfirmed">ꙗ҆пѡ́нскаѧ і҆е́на</displayName>
+				<displayName count="other" draft="unconfirmed">ꙗ҆пѡ́нскїѧ і҆е́ны</displayName>
+				<symbol draft="unconfirmed">JP¥</symbol>
+				<symbol alt="narrow" draft="unconfirmed">¥</symbol>
+			</currency>
+			<currency type="KGS">
+				<displayName draft="unconfirmed">кирги́зскїй сꙋ́мъ</displayName>
+				<displayName count="other" draft="unconfirmed">кирги́зскагѡ сꙋ́ма</displayName>
+				<symbol draft="unconfirmed">KGS</symbol>
+			</currency>
+			<currency type="KZT">
+				<displayName draft="unconfirmed">каза́хскаѧ деньга̀</displayName>
+				<displayName count="other" draft="unconfirmed">каза́хскїѧ деньгѝ</displayName>
+				<symbol draft="unconfirmed">₸</symbol>
+				<symbol alt="narrow" draft="unconfirmed">₸</symbol>
+			</currency>
+			<currency type="RUB">
+				<displayName draft="unconfirmed">рѡссі́йскїй рꙋ́бль</displayName>
+				<displayName count="other" draft="unconfirmed">рѡссі́йскагѡ рꙋблѧ̀</displayName>
+				<symbol>₽</symbol>
+				<symbol alt="narrow">₽</symbol>
+			</currency>
+			<currency type="UAH">
+				<displayName draft="unconfirmed">ᲂу҆краи́нскаѧ гри́вна</displayName>
+				<displayName count="other" draft="unconfirmed">ᲂу҆краи́нскїѧ гри́вны</displayName>
+				<symbol draft="unconfirmed">₴</symbol>
+				<symbol alt="narrow" draft="unconfirmed">₴</symbol>
+			</currency>
+			<currency type="USD">
+				<displayName draft="unconfirmed">а҆мерїка́нскїй до́лларъ</displayName>
+				<displayName count="other" draft="unconfirmed">а҆мерїка́нскагѡ до́ллара</displayName>
+				<symbol draft="unconfirmed">$</symbol>
+				<symbol alt="narrow" draft="unconfirmed">$</symbol>
+			</currency>
+			<currency type="XXX">
+				<displayName draft="unconfirmed">невѣ́домое пла́тное сре́дство</displayName>
+				<displayName count="other" draft="unconfirmed">невѣ́домагѡ пла́тнагѡ сре́дства</displayName>
+			</currency>
+		</currencies>
+	</numbers>
+	<units>
+		<durationUnit type="hm">
+			<durationUnitPattern draft="unconfirmed">h:mm</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="hms">
+			<durationUnitPattern draft="unconfirmed">h:mm:ss</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="ms">
+			<durationUnitPattern draft="unconfirmed">m:ss</durationUnitPattern>
+		</durationUnit>
+	</units>
+	<listPatterns>
+		<listPattern>
+			<listPatternPart type="start" draft="unconfirmed">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle" draft="unconfirmed">{0}, {1}</listPatternPart>
+			<listPatternPart type="end" draft="unconfirmed">{0} и҆ {1}</listPatternPart>
+			<listPatternPart type="2" draft="unconfirmed">{0} и҆ {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit">
+			<listPatternPart type="start" draft="unconfirmed">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle" draft="unconfirmed">{0}, {1}</listPatternPart>
+			<listPatternPart type="end" draft="unconfirmed">{0}, {1}</listPatternPart>
+			<listPatternPart type="2" draft="unconfirmed">{0}, {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-narrow">
+			<listPatternPart type="start" draft="unconfirmed">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle" draft="unconfirmed">{0}, {1}</listPatternPart>
+			<listPatternPart type="end" draft="unconfirmed">{0}, {1}</listPatternPart>
+			<listPatternPart type="2" draft="unconfirmed">{0}, {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-short">
+			<listPatternPart type="start" draft="unconfirmed">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle" draft="unconfirmed">{0}, {1}</listPatternPart>
+			<listPatternPart type="end" draft="unconfirmed">{0}, {1}</listPatternPart>
+			<listPatternPart type="2" draft="unconfirmed">{0}, {1}</listPatternPart>
+		</listPattern>
+	</listPatterns>
+	<posix>
+		<messages>
+			<yesstr draft="unconfirmed">є҆́й:є</yesstr>
+			<nostr draft="unconfirmed">нѝ:н</nostr>
+		</messages>
+	</posix>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sah_RU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cu_RU.xml
similarity index 71%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sah_RU.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cu_RU.xml
index 08a452fc198..6191277c7ac 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sah_RU.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cu_RU.xml
@@ -6,9 +6,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="sah"/>
+		<version number="$Revision: 11914 $"/>
+		<language type="cu"/>
 		<territory type="RU"/>
 	</identity>
 </ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cy.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cy.xml
new file mode 100644
index 00000000000..7978404cadf
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cy.xml
@@ -0,0 +1,10558 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12293 $"/>
+		<language type="cy"/>
+	</identity>
+	<localeDisplayNames>
+		<localeDisplayPattern>
+			<localePattern>{0} ({1})</localePattern>
+			<localeSeparator>{0}, {1}</localeSeparator>
+			<localeKeyTypePattern>{0}: {1}</localeKeyTypePattern>
+		</localeDisplayPattern>
+		<languages>
+			<language type="aa">Affareg</language>
+			<language type="ab">Abchaseg</language>
+			<language type="ace">Acehneg</language>
+			<language type="ach">Acoli</language>
+			<language type="ada">Adangmeg</language>
+			<language type="ady">Circaseg Gorllewinol</language>
+			<language type="ae">Afestaneg</language>
+			<language type="aeb">Arabeg Tunisia</language>
+			<language type="af">Affricâneg</language>
+			<language type="afh">Affrihili</language>
+			<language type="agq">Aghemeg</language>
+			<language type="ain">Ainŵeg</language>
+			<language type="ak">Acaneg</language>
+			<language type="akk">Acadeg</language>
+			<language type="akz">Alabamäeg</language>
+			<language type="ale">Alewteg</language>
+			<language type="aln">Ghegeg Albania</language>
+			<language type="alt">Altäeg Deheuol</language>
+			<language type="am">Amhareg</language>
+			<language type="an">Aragoneg</language>
+			<language type="ang">Hen Saesneg</language>
+			<language type="anp">Angika</language>
+			<language type="ar">Arabeg</language>
+			<language type="ar_001">Arabeg Modern Safonol</language>
+			<language type="arc">Aramaeg</language>
+			<language type="arn">Arawcaneg</language>
+			<language type="aro">Araonaeg</language>
+			<language type="arp">Arapaho</language>
+			<language type="arq">Arabeg Algeria</language>
+			<language type="arw">Arawaceg</language>
+			<language type="ary">Arabeg Moroco</language>
+			<language type="arz">Arabeg yr Aifft</language>
+			<language type="as">Asameg</language>
+			<language type="asa">Asw</language>
+			<language type="ase">Iaith Arwyddion America</language>
+			<language type="ast">Astwrianeg</language>
+			<language type="av">Afareg</language>
+			<language type="awa">Awadhi</language>
+			<language type="ay">Aymareg</language>
+			<language type="az">Aserbaijaneg</language>
+			<language type="az" alt="short" draft="provisional">Aseri</language>
+			<language type="az_Arab">Aserbaijaneg Deheuol</language>
+			<language type="ba">Bashcorteg</language>
+			<language type="bal">Balwtsi</language>
+			<language type="ban">Balïeg</language>
+			<language type="bas">Basâeg</language>
+			<language type="bax">Bamwmeg</language>
+			<language type="be">Belarwseg</language>
+			<language type="bej">Bejäeg</language>
+			<language type="bem">Bembeg</language>
+			<language type="bez">Bena</language>
+			<language type="bfd">Baffwteg</language>
+			<language type="bfq">Badaga</language>
+			<language type="bg">Bwlgareg</language>
+			<language type="bgn">Balochi Gorllewinol</language>
+			<language type="bi">Bislama</language>
+			<language type="bkm">Comeg</language>
+			<language type="bla">Siksika</language>
+			<language type="bm">Bambareg</language>
+			<language type="bn">Bengaleg</language>
+			<language type="bo">Tibeteg</language>
+			<language type="br">Llydaweg</language>
+			<language type="brh">Brahui</language>
+			<language type="brx">Bodo</language>
+			<language type="bs">Bosnieg</language>
+			<language type="bss">Acwseg</language>
+			<language type="bua">Bwriateg</language>
+			<language type="bum">Bwlw</language>
+			<language type="ca">Catalaneg</language>
+			<language type="cad">Cado</language>
+			<language type="car">Caribeg</language>
+			<language type="cch">Atsameg</language>
+			<language type="ce">Tsietsieneg</language>
+			<language type="cgg">Tsiga</language>
+			<language type="ch">Tsiamorro</language>
+			<language type="chm">Marieg</language>
+			<language type="cho">Siocto</language>
+			<language type="chr">Tsierocî</language>
+			<language type="chy">Cheyenne</language>
+			<language type="ckb">Cwrdeg Sorani</language>
+			<language type="co">Corseg</language>
+			<language type="cop">Copteg</language>
+			<language type="cr">Cri</language>
+			<language type="crh">Tyrceg y Crimea</language>
+			<language type="cs">Tsieceg</language>
+			<language type="cu">Hen Slafoneg</language>
+			<language type="cv">Tshwfasheg</language>
+			<language type="cy">Cymraeg</language>
+			<language type="da">Daneg</language>
+			<language type="dak">Dacotaeg</language>
+			<language type="dar">Dargwa</language>
+			<language type="dav">Taita</language>
+			<language type="de">Almaeneg</language>
+			<language type="de_AT">Almaeneg Awstria</language>
+			<language type="de_CH">Almaeneg Safonol y Swistir</language>
+			<language type="din">Dinca</language>
+			<language type="dje">Zarmaeg</language>
+			<language type="doi">Dogri</language>
+			<language type="dsb">Sorbeg Isaf</language>
+			<language type="dua">Diwaleg</language>
+			<language type="dum">Iseldireg Canol</language>
+			<language type="dv">Difehi</language>
+			<language type="dyo">Jola-Fonyi</language>
+			<language type="dz">Dzongkha</language>
+			<language type="ebu">Embw</language>
+			<language type="ee">Ewe</language>
+			<language type="egy">Hen Eiffteg</language>
+			<language type="el">Groeg</language>
+			<language type="elx">Elameg</language>
+			<language type="en">Saesneg</language>
+			<language type="en_AU">Saesneg Awstralia</language>
+			<language type="en_CA">Saesneg Canada</language>
+			<language type="en_GB">Saesneg Prydain</language>
+			<language type="en_GB" alt="short">Saesneg (DU)</language>
+			<language type="en_US">Saesneg America</language>
+			<language type="en_US" alt="short">Saesneg (UDA)</language>
+			<language type="enm">Saesneg Canol</language>
+			<language type="eo">Esperanto</language>
+			<language type="es">Sbaeneg</language>
+			<language type="es_419">Sbaeneg America Ladin</language>
+			<language type="es_ES">Sbaeneg Ewrop</language>
+			<language type="es_MX">Sbaeneg Mecsico</language>
+			<language type="et">Estoneg</language>
+			<language type="eu">Basgeg</language>
+			<language type="ewo">Ewondo</language>
+			<language type="ext">Extremadureg</language>
+			<language type="fa">Perseg</language>
+			<language type="fat">Ffanti</language>
+			<language type="ff">Ffwla</language>
+			<language type="fi">Ffinneg</language>
+			<language type="fil">Ffilipineg</language>
+			<language type="fit">Ffinneg Tornedal</language>
+			<language type="fj">Ffijïeg</language>
+			<language type="fo">Ffaröeg</language>
+			<language type="fr">Ffrangeg</language>
+			<language type="fr_CA">Ffrangeg Canada</language>
+			<language type="fr_CH">Ffrangeg y Swistir</language>
+			<language type="frc">Ffrangeg Cajwn</language>
+			<language type="frm">Ffrangeg Canol</language>
+			<language type="fro">Hen Ffrangeg</language>
+			<language type="frp">Arpitaneg</language>
+			<language type="frr">Ffriseg y Gogledd</language>
+			<language type="frs">Ffriseg y Dwyrain</language>
+			<language type="fur">Ffriwleg</language>
+			<language type="fy">Ffriseg y Gorllewin</language>
+			<language type="ga">Gwyddeleg</language>
+			<language type="gag">Gagauz</language>
+			<language type="gay">Gaio</language>
+			<language type="gba">Gbaia</language>
+			<language type="gbz">Dareg y Zoroastriaid</language>
+			<language type="gd">Gaeleg yr Alban</language>
+			<language type="gil">Gilberteg</language>
+			<language type="gl">Galisieg</language>
+			<language type="gmh">Uchel Almaeneg Canol</language>
+			<language type="gn">Guaraní</language>
+			<language type="goh">Hen Uchel Almaeneg</language>
+			<language type="got">Gotheg</language>
+			<language type="grc">Hen Roeg</language>
+			<language type="gsw">Almaeneg y Swistir</language>
+			<language type="gu">Gwjarati</language>
+			<language type="guz">Gusii</language>
+			<language type="gv">Manaweg</language>
+			<language type="ha">Hawsa</language>
+			<language type="hai">Haida</language>
+			<language type="haw">Hawäieg</language>
+			<language type="he">Hebraeg</language>
+			<language type="hi">Hindi</language>
+			<language type="hit">Hetheg</language>
+			<language type="hmn">Hmongeg</language>
+			<language type="hr">Croateg</language>
+			<language type="hsb">Sorbeg Uchaf</language>
+			<language type="ht">Creol Haiti</language>
+			<language type="hu">Hwngareg</language>
+			<language type="hy">Armeneg</language>
+			<language type="hz">Herero</language>
+			<language type="ia" draft="contributed">Interlingua</language>
+			<language type="iba">Ibaneg</language>
+			<language type="ibb">Ibibio</language>
+			<language type="id">Indoneseg</language>
+			<language type="ie" draft="contributed">Interlingue</language>
+			<language type="ig">Igbo</language>
+			<language type="ii">Nwosw</language>
+			<language type="ik">Inwpiaceg</language>
+			<language type="ilo">Ilocaneg</language>
+			<language type="inh">Ingwsieg</language>
+			<language type="is">Islandeg</language>
+			<language type="it">Eidaleg</language>
+			<language type="iu">Inwctitwt</language>
+			<language type="ja">Japaneeg</language>
+			<language type="jgo">Ngomba</language>
+			<language type="jmc">Matsiame</language>
+			<language type="jpr">Iddew-Bersieg</language>
+			<language type="jrb">Iddew-Arabeg</language>
+			<language type="jv">Jafanaeg</language>
+			<language type="ka">Georgeg</language>
+			<language type="kaa">Cara-Calpaceg</language>
+			<language type="kab">Cabileg</language>
+			<language type="kam">Camba</language>
+			<language type="kbd">Circaseg Dwyreiniol</language>
+			<language type="kcg">Tyapeg</language>
+			<language type="kde">Macondeg</language>
+			<language type="kea">Caboferdianeg</language>
+			<language type="kg">Congo</language>
+			<language type="kha">Càseg</language>
+			<language type="khq">Koyra Chiini</language>
+			<language type="khw">Chowareg</language>
+			<language type="ki">Kikuyu</language>
+			<language type="kk">Casacheg</language>
+			<language type="kl">Kalaallisut</language>
+			<language type="kln">Kalenjin</language>
+			<language type="km">Chmereg</language>
+			<language type="kn">Kannada</language>
+			<language type="ko">Coreeg</language>
+			<language type="koi">Komi-Permyak</language>
+			<language type="kok">Concani</language>
+			<language type="kr">Canwri</language>
+			<language type="krl">Careleg</language>
+			<language type="ks">Cashmireg</language>
+			<language type="ksb">Shambala</language>
+			<language type="ksf">Baffia</language>
+			<language type="ksh">Cwleneg</language>
+			<language type="ku">Cwrdeg</language>
+			<language type="kum">Cwmiceg</language>
+			<language type="kv">Comi</language>
+			<language type="kw">Cernyweg</language>
+			<language type="ky">Cirgiseg</language>
+			<language type="la">Lladin</language>
+			<language type="lad">Iddew-Sbaeneg</language>
+			<language type="lag">Langi</language>
+			<language type="lah">Lahnda</language>
+			<language type="lam">Lamba</language>
+			<language type="lb">Lwcsembwrgeg</language>
+			<language type="lez">Lezgheg</language>
+			<language type="lg">Ganda</language>
+			<language type="li">Limbwrgeg</language>
+			<language type="lkt">Lakota</language>
+			<language type="lmo">Lombardeg</language>
+			<language type="ln">Lingala</language>
+			<language type="lo">Laoeg</language>
+			<language type="lol">Mongo</language>
+			<language type="loz">Lozi</language>
+			<language type="lrc">Luri Gogleddol</language>
+			<language type="lt">Lithwaneg</language>
+			<language type="ltg">Latgaleg</language>
+			<language type="lu">Luba-Katanga</language>
+			<language type="lun">Lwnda</language>
+			<language type="luo">Lŵo</language>
+			<language type="lus">Lwshaieg</language>
+			<language type="luy">Lwyia</language>
+			<language type="lv">Latfieg</language>
+			<language type="mad">Madwreg</language>
+			<language type="mag">Magahi</language>
+			<language type="mai">Maithili</language>
+			<language type="mak">Macasareg</language>
+			<language type="man">Mandingo</language>
+			<language type="mas">Masai</language>
+			<language type="mdf">Mocsia</language>
+			<language type="mdr">Mandareg</language>
+			<language type="men">Mendeg</language>
+			<language type="mer">Mêrw</language>
+			<language type="mfe">Morisyen</language>
+			<language type="mg">Malagaseg</language>
+			<language type="mga">Gwyddeleg Canol</language>
+			<language type="mgh">Makhuwa-Meetto</language>
+			<language type="mgo">Meta</language>
+			<language type="mh">Marsialeg</language>
+			<language type="mi">Maori</language>
+			<language type="mic">Micmaceg</language>
+			<language type="mk">Macedoneg</language>
+			<language type="ml">Malayalam</language>
+			<language type="mn">Mongoleg</language>
+			<language type="mnc">Manshw</language>
+			<language type="mni">Manipwri</language>
+			<language type="moh">Mohoceg</language>
+			<language type="mos">Mosi</language>
+			<language type="mr">Marathi</language>
+			<language type="mrj">Mari Gorllewinol</language>
+			<language type="ms">Maleieg</language>
+			<language type="mt">Malteg</language>
+			<language type="mua">Mundang</language>
+			<language type="mul">mwy nag un iaith</language>
+			<language type="mwl">Mirandeg</language>
+			<language type="mwr">Marwari</language>
+			<language type="my">Byrmaneg</language>
+			<language type="mzn">Masanderani</language>
+			<language type="na">Nawrŵeg</language>
+			<language type="nap">Naplieg</language>
+			<language type="naq">Nama</language>
+			<language type="nb">Norwyeg Bokmål</language>
+			<language type="nd">Ndebele Gogleddol</language>
+			<language type="nds">Isel Almaeneg</language>
+			<language type="nds_NL">Sacsoneg Isel</language>
+			<language type="ne">Nepaleg</language>
+			<language type="new">Newaeg</language>
+			<language type="ng">Ndonga</language>
+			<language type="njo">Ao Naga</language>
+			<language type="nl">Iseldireg</language>
+			<language type="nl_BE">Fflemeg</language>
+			<language type="nmg">Kwasio</language>
+			<language type="nn">Norwyeg Nynorsk</language>
+			<language type="no">Norwyeg</language>
+			<language type="non">Hen Norseg</language>
+			<language type="nqo">N’Ko</language>
+			<language type="nr">Ndebele Deheuol</language>
+			<language type="nso">Sotho Gogleddol</language>
+			<language type="nus">Nŵereg</language>
+			<language type="nv">Nafaho</language>
+			<language type="nwc">Hen Newari</language>
+			<language type="ny">Nianja</language>
+			<language type="nym">Niamwezi</language>
+			<language type="nyn">Niancole</language>
+			<language type="nyo">Nioro</language>
+			<language type="nzi">Nzimeg</language>
+			<language type="oc">Ocsitaneg</language>
+			<language type="oj">Ojibwa</language>
+			<language type="om">Oromo</language>
+			<language type="or">Oriya</language>
+			<language type="os">Oseteg</language>
+			<language type="osa">Osageg</language>
+			<language type="ota">Tyrceg Otoman</language>
+			<language type="pa">Pwnjabeg</language>
+			<language type="pag">Pangasineg</language>
+			<language type="pal">Pahlafi</language>
+			<language type="pam">Pampanga</language>
+			<language type="pcd">Picardeg</language>
+			<language type="pdc">Almaeneg Pensylfania</language>
+			<language type="peo">Hen Bersieg</language>
+			<language type="pfl">Almaeneg Palatin</language>
+			<language type="phn">Phoeniceg</language>
+			<language type="pi">Pali</language>
+			<language type="pl">Pwyleg</language>
+			<language type="pms">Piedmonteg</language>
+			<language type="pnt">Ponteg</language>
+			<language type="pon">Pohnpeianeg</language>
+			<language type="prg">Prwseg</language>
+			<language type="pro">Hen Brofensaleg</language>
+			<language type="ps">Pashto</language>
+			<language type="pt">Portiwgeeg</language>
+			<language type="pt_BR">Portiwgeeg Brasil</language>
+			<language type="pt_PT">Portiwgeeg Ewrop</language>
+			<language type="qu">Quechua</language>
+			<language type="quc">K’iche’</language>
+			<language type="raj">Rajasthaneg</language>
+			<language type="rap">Rapanŵi</language>
+			<language type="rar">Raratongeg</language>
+			<language type="rm">Románsh</language>
+			<language type="rn">Rwndi</language>
+			<language type="ro">Rwmaneg</language>
+			<language type="ro_MD">Moldofeg</language>
+			<language type="rof">Rombo</language>
+			<language type="rom">Romani</language>
+			<language type="root">y Gwraidd</language>
+			<language type="rtm">Rotumaneg</language>
+			<language type="ru">Rwseg</language>
+			<language type="rup">Aromaneg</language>
+			<language type="rw">Ciniarŵandeg</language>
+			<language type="rwk">Rwa</language>
+			<language type="sa">Sansgrit</language>
+			<language type="sad">Sandäweg</language>
+			<language type="sah" draft="unconfirmed">Iacwteg</language>
+			<language type="sam">Aramaeg Samaria</language>
+			<language type="saq">Sambŵrw</language>
+			<language type="sas">Sasaceg</language>
+			<language type="sat">Santali</language>
+			<language type="sba">Ngambeieg</language>
+			<language type="sbp">Sangw</language>
+			<language type="sc">Sardeg</language>
+			<language type="scn">Sisileg</language>
+			<language type="sco">Sgoteg</language>
+			<language type="sd">Sindhi</language>
+			<language type="sdc">Sasareseg Sardinia</language>
+			<language type="sdh">Cwrdeg Deheuol</language>
+			<language type="se">Sami Gogleddol</language>
+			<language type="see">Seneca</language>
+			<language type="seh">Sena</language>
+			<language type="sei">Seri</language>
+			<language type="sel">Selcypeg</language>
+			<language type="ses">Koyraboro Senni</language>
+			<language type="sg">Sango</language>
+			<language type="sga">Hen Wyddeleg</language>
+			<language type="sgs">Samogiteg</language>
+			<language type="sh">Serbo-Croateg</language>
+			<language type="shi">Tachelhit</language>
+			<language type="shu">Arabeg Chad</language>
+			<language type="si">Sinhaleg</language>
+			<language type="sid">Sidamo</language>
+			<language type="sk">Slofaceg</language>
+			<language type="sl">Slofeneg</language>
+			<language type="sli">Is-silesieg</language>
+			<language type="sm">Samöeg</language>
+			<language type="sma">Sami Deheuol</language>
+			<language type="smj">Sami Lwle</language>
+			<language type="smn">Sami Inari</language>
+			<language type="sms">Sami Scolt</language>
+			<language type="sn">Shona</language>
+			<language type="snk">Soninceg</language>
+			<language type="so">Somaleg</language>
+			<language type="sog">Sogdeg</language>
+			<language type="sq">Albaneg</language>
+			<language type="sr">Serbeg</language>
+			<language type="srr">Serereg</language>
+			<language type="ss">Swati</language>
+			<language type="st" draft="contributed">Sesotheg</language>
+			<language type="stq">Ffriseg Saterland</language>
+			<language type="su">Swndaneg</language>
+			<language type="suk">Swcwma</language>
+			<language type="sus">Swsŵeg</language>
+			<language type="sux">Swmereg</language>
+			<language type="sv">Swedeg</language>
+			<language type="sw">Swahili</language>
+			<language type="sw_CD">Swahili’r Congo</language>
+			<language type="swb">Comoreg</language>
+			<language type="syc">Hen Syrieg</language>
+			<language type="syr">Syrieg</language>
+			<language type="szl">Silesieg</language>
+			<language type="ta">Tamileg</language>
+			<language type="tcy">Tulu</language>
+			<language type="te">Telugu</language>
+			<language type="tem">Timneg</language>
+			<language type="teo">Teso</language>
+			<language type="ter">Terena</language>
+			<language type="tet">Tetumeg</language>
+			<language type="tg">Tajiceg</language>
+			<language type="th">Thai</language>
+			<language type="ti">Tigrinya</language>
+			<language type="tig">Tigreg</language>
+			<language type="tiv">Tifeg</language>
+			<language type="tk">Twrcmeneg</language>
+			<language type="tkl">Tocelaweg</language>
+			<language type="tkr">Tsakhureg</language>
+			<language type="tl">Tagalog</language>
+			<language type="tlh">Klingon</language>
+			<language type="tli">Llingit</language>
+			<language type="tly">Talysheg</language>
+			<language type="tmh">Tamasheceg</language>
+			<language type="tn">Tswana</language>
+			<language type="to">Tongeg</language>
+			<language type="tpi">Tok Pisin</language>
+			<language type="tr">Tyrceg</language>
+			<language type="trv">Taroko</language>
+			<language type="ts">Tsongaeg</language>
+			<language type="tsd">Tsaconeg</language>
+			<language type="tt">Tatareg</language>
+			<language type="tum">Twmbwca</language>
+			<language type="tvl">Twfalweg</language>
+			<language type="tw">Twi</language>
+			<language type="twq">Tasawaq</language>
+			<language type="ty" draft="unconfirmed">Tahitïeg</language>
+			<language type="tzm">Tamaseit Canolbarth Moroco</language>
+			<language type="udm">Fotiaceg</language>
+			<language type="ug">Uighur</language>
+			<language type="uga">Wgariteg</language>
+			<language type="uk">Wcreineg</language>
+			<language type="umb">Umbundu</language>
+			<language type="und">Iaith Anhysbys</language>
+			<language type="ur">Wrdw</language>
+			<language type="uz">Wsbeceg</language>
+			<language type="vai">Faieg</language>
+			<language type="ve">Fendeg</language>
+			<language type="vec">Feniseg</language>
+			<language type="vep">Feps</language>
+			<language type="vi">Fietnameg</language>
+			<language type="vls">Fflemeg Gorllewinol</language>
+			<language type="vot">Foteg</language>
+			<language type="vun">Funjo</language>
+			<language type="wa">Walwneg</language>
+			<language type="wae">Walsereg</language>
+			<language type="wal">Walamo</language>
+			<language type="war">Winarayeg</language>
+			<language type="was">Washo</language>
+			<language type="wbp">Warlpiri</language>
+			<language type="wo">Woloff</language>
+			<language type="xal">Calmyceg</language>
+			<language type="xh">Xhosa</language>
+			<language type="xog">Soga</language>
+			<language type="ybb">Iembaeg</language>
+			<language type="yi">Iddew-Almaeneg</language>
+			<language type="yo">Iorwba</language>
+			<language type="yue">Cantoneeg</language>
+			<language type="zap">Zapoteceg</language>
+			<language type="zbl">Blisssymbols</language>
+			<language type="zea">Zêlandeg</language>
+			<language type="zgh">Tamaseit Safonol</language>
+			<language type="zh">Tsieineeg</language>
+			<language type="zh_Hans">Tsieineeg Symledig</language>
+			<language type="zh_Hant">Tsieineeg Traddodiadol</language>
+			<language type="zu">Swlw</language>
+			<language type="zun">Zuni</language>
+			<language type="zxx">Dim cynnwys ieithyddol</language>
+			<language type="zza">Zazäeg</language>
+		</languages>
+		<scripts>
+			<script type="Arab">Arabaidd</script>
+			<script type="Armn">Armenaidd</script>
+			<script type="Beng">Bengalaidd</script>
+			<script type="Bopo">Bopomofo</script>
+			<script type="Brai">Braille</script>
+			<script type="Cyrl">Cyrilig</script>
+			<script type="Deva">Devanagari</script>
+			<script type="Ethi">Ethiopig</script>
+			<script type="Geor">Georgaidd</script>
+			<script type="Grek">Groegaidd</script>
+			<script type="Gujr">Gwjarataidd</script>
+			<script type="Guru">Gwrmwci</script>
+			<script type="Hang">Hangul</script>
+			<script type="Hani">Han</script>
+			<script type="Hans">Symledig</script>
+			<script type="Hans" alt="stand-alone">Han symledig</script>
+			<script type="Hant">Traddodiadol</script>
+			<script type="Hant" alt="stand-alone">Han traddodiadol</script>
+			<script type="Hebr">Hebreig</script>
+			<script type="Hira">Hiragana</script>
+			<script type="Jpan">Japaneaidd</script>
+			<script type="Kana">Catacana</script>
+			<script type="Khmr">Chmeraidd</script>
+			<script type="Knda">Canaraidd</script>
+			<script type="Kore">Coreaidd</script>
+			<script type="Laoo">Laoaidd</script>
+			<script type="Latn">Lladin</script>
+			<script type="Mlym">Malayalamaidd</script>
+			<script type="Mong">Mongolaidd</script>
+			<script type="Mymr">Myanmaraidd</script>
+			<script type="Ogam">Ogam</script>
+			<script type="Orya">Orïaidd</script>
+			<script type="Sinh">Sinhanaidd</script>
+			<script type="Taml">Tamilaidd</script>
+			<script type="Telu">Telugu</script>
+			<script type="Thaa">Thaana</script>
+			<script type="Thai">Tai</script>
+			<script type="Tibt">Tibetaidd</script>
+			<script type="Zsym">Symbolau</script>
+			<script type="Zxxx">Anysgrifenedig</script>
+			<script type="Zyyy">Cyffredin</script>
+			<script type="Zzzz">Sgript anhysbys</script>
+		</scripts>
+		<territories>
+			<territory type="001">Y Byd</territory>
+			<territory type="002">Affrica</territory>
+			<territory type="003">Gogledd America</territory>
+			<territory type="005">De America</territory>
+			<territory type="009">Oceania</territory>
+			<territory type="011">Gorllewin Affrica</territory>
+			<territory type="013">Canolbarth America</territory>
+			<territory type="014">Dwyrain Affrica</territory>
+			<territory type="015">Gogledd Affrica</territory>
+			<territory type="017">Canol Affrica</territory>
+			<territory type="018">Deheudir Affrica</territory>
+			<territory type="019">Yr Amerig</territory>
+			<territory type="021">America i’r Gogledd o Fecsico</territory>
+			<territory type="029">Y Caribî</territory>
+			<territory type="030">Dwyrain Asia</territory>
+			<territory type="034">De Asia</territory>
+			<territory type="035">De-Ddwyrain Asia</territory>
+			<territory type="039">De Ewrop</territory>
+			<territory type="053">Awstralasia</territory>
+			<territory type="054">Melanesia</territory>
+			<territory type="057">Rhanbarth Micronesia</territory>
+			<territory type="061">Polynesia</territory>
+			<territory type="142">Asia</territory>
+			<territory type="143">Canol Asia</territory>
+			<territory type="145">Gorllewin Asia</territory>
+			<territory type="150">Ewrop</territory>
+			<territory type="151">Dwyrain Ewrop</territory>
+			<territory type="154">Gogledd Ewrop</territory>
+			<territory type="155">Gorllewin Ewrop</territory>
+			<territory type="419">America Ladin</territory>
+			<territory type="AC">Ynys Ascension</territory>
+			<territory type="AD">Andorra</territory>
+			<territory type="AE">Emiradau Arabaidd Unedig</territory>
+			<territory type="AF">Afghanistan</territory>
+			<territory type="AG">Antigua a Barbuda</territory>
+			<territory type="AI">Anguilla</territory>
+			<territory type="AL">Albania</territory>
+			<territory type="AM">Armenia</territory>
+			<territory type="AO">Angola</territory>
+			<territory type="AQ">Antarctica</territory>
+			<territory type="AR">Yr Ariannin</territory>
+			<territory type="AS">Samoa America</territory>
+			<territory type="AT">Awstria</territory>
+			<territory type="AU">Awstralia</territory>
+			<territory type="AW">Aruba</territory>
+			<territory type="AX">Ynysoedd Åland</territory>
+			<territory type="AZ">Azerbaijan</territory>
+			<territory type="BA">Bosnia a Hercegovina</territory>
+			<territory type="BB">Barbados</territory>
+			<territory type="BD">Bangladesh</territory>
+			<territory type="BE">Gwlad Belg</territory>
+			<territory type="BF">Burkina Faso</territory>
+			<territory type="BG">Bwlgaria</territory>
+			<territory type="BH">Bahrain</territory>
+			<territory type="BI">Burundi</territory>
+			<territory type="BJ">Benin</territory>
+			<territory type="BL">Saint Barthélemy</territory>
+			<territory type="BM">Bermuda</territory>
+			<territory type="BN">Brunei</territory>
+			<territory type="BO">Bolifia</territory>
+			<territory type="BQ">Antilles yr Iseldiroedd</territory>
+			<territory type="BR">Brasil</territory>
+			<territory type="BS">Y Bahamas</territory>
+			<territory type="BT">Bhutan</territory>
+			<territory type="BV">Ynys Bouvet</territory>
+			<territory type="BW">Botswana</territory>
+			<territory type="BY">Belarws</territory>
+			<territory type="BZ">Belize</territory>
+			<territory type="CA">Canada</territory>
+			<territory type="CC">Ynysoedd Cocos (Keeling)</territory>
+			<territory type="CD">Y Congo - Kinshasa</territory>
+			<territory type="CD" alt="variant">y Congo (G.Dd.C.)</territory>
+			<territory type="CF">Gweriniaeth Canolbarth Affrica</territory>
+			<territory type="CG">Y Congo - Brazzaville</territory>
+			<territory type="CG" alt="variant">Y Congo (Gweriniaeth)</territory>
+			<territory type="CH">Y Swistir</territory>
+			<territory type="CI">Côte d’Ivoire</territory>
+			<territory type="CI" alt="variant">Arfordir Ifori</territory>
+			<territory type="CK">Ynysoedd Cook</territory>
+			<territory type="CL">Chile</territory>
+			<territory type="CM">Camerŵn</territory>
+			<territory type="CN">Tsieina</territory>
+			<territory type="CO">Colombia</territory>
+			<territory type="CP">Ynys Clipperton</territory>
+			<territory type="CR">Costa Rica</territory>
+			<territory type="CU">Ciwba</territory>
+			<territory type="CV">Cabo Verde</territory>
+			<territory type="CW">Curaçao</territory>
+			<territory type="CX">Ynys y Nadolig</territory>
+			<territory type="CY">Cyprus</territory>
+			<territory type="CZ">Gweriniaeth Tsiec</territory>
+			<territory type="DE">Yr Almaen</territory>
+			<territory type="DG">Diego Garcia</territory>
+			<territory type="DJ">Djibouti</territory>
+			<territory type="DK">Denmarc</territory>
+			<territory type="DM">Dominica</territory>
+			<territory type="DO">Gweriniaeth Dominica</territory>
+			<territory type="DZ">Algeria</territory>
+			<territory type="EA">Ceuta a Melilla</territory>
+			<territory type="EC">Ecuador</territory>
+			<territory type="EE">Estonia</territory>
+			<territory type="EG">Yr Aifft</territory>
+			<territory type="EH">Gorllewin Sahara</territory>
+			<territory type="ER">Eritrea</territory>
+			<territory type="ES">Sbaen</territory>
+			<territory type="ET">Ethiopia</territory>
+			<territory type="EU">Yr Undeb Ewropeaidd</territory>
+			<territory type="FI">Y Ffindir</territory>
+			<territory type="FJ">Fiji</territory>
+			<territory type="FK">Ynysoedd y Falkland/Malvinas</territory>
+			<territory type="FK" alt="variant">Ynysoedd y Falkland (Ynysoedd y Malfinas)</territory>
+			<territory type="FM">Micronesia</territory>
+			<territory type="FO">Ynysoedd Ffaro</territory>
+			<territory type="FR">Ffrainc</territory>
+			<territory type="GA">Gabon</territory>
+			<territory type="GB">Y Deyrnas Unedig</territory>
+			<territory type="GB" alt="short">DU</territory>
+			<territory type="GD">Grenada</territory>
+			<territory type="GE">Georgia</territory>
+			<territory type="GF">Guyane Ffrengig</territory>
+			<territory type="GG">Ynys y Garn</territory>
+			<territory type="GH">Ghana</territory>
+			<territory type="GI">Gibraltar</territory>
+			<territory type="GL">Yr Ynys Las</territory>
+			<territory type="GM">Gambia</territory>
+			<territory type="GN">Guinée</territory>
+			<territory type="GP">Guadeloupe</territory>
+			<territory type="GQ">Guinea Gyhydeddol</territory>
+			<territory type="GR">Gwlad Groeg</territory>
+			<territory type="GS">De Georgia ac Ynysoedd Sandwich y De</territory>
+			<territory type="GT">Guatemala</territory>
+			<territory type="GU">Guam</territory>
+			<territory type="GW">Guiné-Bissau</territory>
+			<territory type="GY">Guyana</territory>
+			<territory type="HK">Hong Kong RhGA Tsieina</territory>
+			<territory type="HK" alt="short">Hong Kong</territory>
+			<territory type="HM">Ynys Heard ac Ynysoedd McDonald</territory>
+			<territory type="HN">Honduras</territory>
+			<territory type="HR">Croatia</territory>
+			<territory type="HT">Haiti</territory>
+			<territory type="HU">Hwngari</territory>
+			<territory type="IC">Yr Ynysoedd Dedwydd</territory>
+			<territory type="ID">Indonesia</territory>
+			<territory type="IE">Iwerddon</territory>
+			<territory type="IL">Israel</territory>
+			<territory type="IM">Ynys Manaw</territory>
+			<territory type="IN">India</territory>
+			<territory type="IO">Tiriogaeth Brydeinig Cefnfor India</territory>
+			<territory type="IQ">Irac</territory>
+			<territory type="IR">Iran</territory>
+			<territory type="IS">Gwlad yr Iâ</territory>
+			<territory type="IT">Yr Eidal</territory>
+			<territory type="JE">Jersey</territory>
+			<territory type="JM">Jamaica</territory>
+			<territory type="JO">Gwlad Iorddonen</territory>
+			<territory type="JP">Japan</territory>
+			<territory type="KE">Kenya</territory>
+			<territory type="KG">Kyrgyzstan</territory>
+			<territory type="KH">Cambodia</territory>
+			<territory type="KI">Kiribati</territory>
+			<territory type="KM">Comoros</territory>
+			<territory type="KN">Saint Kitts a Nevis</territory>
+			<territory type="KP">Gogledd Korea</territory>
+			<territory type="KR">De Korea</territory>
+			<territory type="KW">Kuwait</territory>
+			<territory type="KY">Ynysoedd Cayman</territory>
+			<territory type="KZ">Kazakstan</territory>
+			<territory type="LA">Laos</territory>
+			<territory type="LB">Libanus</territory>
+			<territory type="LC">Saint Lucia</territory>
+			<territory type="LI">Liechtenstein</territory>
+			<territory type="LK">Sri Lanka</territory>
+			<territory type="LR">Liberia</territory>
+			<territory type="LS">Lesotho</territory>
+			<territory type="LT">Lithuania</territory>
+			<territory type="LU">Lwcsembwrg</territory>
+			<territory type="LV">Latfia</territory>
+			<territory type="LY">Libya</territory>
+			<territory type="MA">Moroco</territory>
+			<territory type="MC">Monaco</territory>
+			<territory type="MD">Moldofa</territory>
+			<territory type="ME">Montenegro</territory>
+			<territory type="MF">Saint Martin</territory>
+			<territory type="MG">Madagascar</territory>
+			<territory type="MH">Ynysoedd Marshall</territory>
+			<territory type="MK">Macedonia</territory>
+			<territory type="MK" alt="variant">Macedonia (CWIM)</territory>
+			<territory type="ML">Mali</territory>
+			<territory type="MM">Myanmar (Burma)</territory>
+			<territory type="MN">Mongolia</territory>
+			<territory type="MO">Macau RhGA Tsieina</territory>
+			<territory type="MO" alt="short">Macau</territory>
+			<territory type="MP">Ynysoedd Gogledd Mariana</territory>
+			<territory type="MQ">Martinique</territory>
+			<territory type="MR">Mauritania</territory>
+			<territory type="MS">Montserrat</territory>
+			<territory type="MT">Malta</territory>
+			<territory type="MU">Mauritius</territory>
+			<territory type="MV">Y Maldives</territory>
+			<territory type="MW">Malawi</territory>
+			<territory type="MX">Mecsico</territory>
+			<territory type="MY">Malaysia</territory>
+			<territory type="MZ">Mozambique</territory>
+			<territory type="NA">Namibia</territory>
+			<territory type="NC">Caledonia Newydd</territory>
+			<territory type="NE">Niger</territory>
+			<territory type="NF">Ynys Norfolk</territory>
+			<territory type="NG">Nigeria</territory>
+			<territory type="NI">Nicaragua</territory>
+			<territory type="NL">Yr Iseldiroedd</territory>
+			<territory type="NO">Norwy</territory>
+			<territory type="NP">Nepal</territory>
+			<territory type="NR">Nauru</territory>
+			<territory type="NU">Niue</territory>
+			<territory type="NZ">Seland Newydd</territory>
+			<territory type="OM">Oman</territory>
+			<territory type="PA">Panama</territory>
+			<territory type="PE">Periw</territory>
+			<territory type="PF">Polynesia Ffrengig</territory>
+			<territory type="PG">Papua Guinea Newydd</territory>
+			<territory type="PH">Y Philipinau</territory>
+			<territory type="PK">Pakistan</territory>
+			<territory type="PL">Gwlad Pwyl</territory>
+			<territory type="PM">Saint-Pierre-et-Miquelon</territory>
+			<territory type="PN">Ynysoedd Pitcairn</territory>
+			<territory type="PR">Puerto Rico</territory>
+			<territory type="PS">Tiriogaethau Palesteinaidd</territory>
+			<territory type="PS" alt="short">Palesteina</territory>
+			<territory type="PT">Portiwgal</territory>
+			<territory type="PW">Palau</territory>
+			<territory type="PY">Paraguay</territory>
+			<territory type="QA">Qatar</territory>
+			<territory type="QO">Oceania Bellennig</territory>
+			<territory type="RE">Réunion</territory>
+			<territory type="RO">Rwmania</territory>
+			<territory type="RS">Serbia</territory>
+			<territory type="RU">Rwsia</territory>
+			<territory type="RW">Rwanda</territory>
+			<territory type="SA">Saudi Arabia</territory>
+			<territory type="SB">Ynysoedd Solomon</territory>
+			<territory type="SC">Seychelles</territory>
+			<territory type="SD">Swdan</territory>
+			<territory type="SE">Sweden</territory>
+			<territory type="SG">Singapore</territory>
+			<territory type="SH">Saint Helena</territory>
+			<territory type="SI">Slofenia</territory>
+			<territory type="SJ">Svalbard a Jan Mayen</territory>
+			<territory type="SK">Slofacia</territory>
+			<territory type="SL">Sierra Leone</territory>
+			<territory type="SM">San Marino</territory>
+			<territory type="SN">Senegal</territory>
+			<territory type="SO">Somalia</territory>
+			<territory type="SR">Suriname</territory>
+			<territory type="SS">De Swdan</territory>
+			<territory type="ST">São Tomé a Príncipe</territory>
+			<territory type="SV">El Salvador</territory>
+			<territory type="SX">Sint Maarten</territory>
+			<territory type="SY">Syria</territory>
+			<territory type="SZ">Gwlad Swazi</territory>
+			<territory type="TA">Tristan da Cunha</territory>
+			<territory type="TC">Ynysoedd Turks a Caicos</territory>
+			<territory type="TD">Tchad</territory>
+			<territory type="TF">Tiroedd Deheuol ac Antarctig Ffrainc</territory>
+			<territory type="TG">Togo</territory>
+			<territory type="TH">Gwlad Thai</territory>
+			<territory type="TJ">Tajikistan</territory>
+			<territory type="TK">Tokelau</territory>
+			<territory type="TL">Timor-Leste</territory>
+			<territory type="TL" alt="variant">Dwyrain Timor</territory>
+			<territory type="TM">Turkmenistan</territory>
+			<territory type="TN">Tunisia</territory>
+			<territory type="TO">Tonga</territory>
+			<territory type="TR">Twrci</territory>
+			<territory type="TT">Trinidad a Tobago</territory>
+			<territory type="TV">Tuvalu</territory>
+			<territory type="TW">Taiwan</territory>
+			<territory type="TZ">Tanzania</territory>
+			<territory type="UA">Wcráin</territory>
+			<territory type="UG">Uganda</territory>
+			<territory type="UM">Ynysoedd Pellennig UDA</territory>
+			<territory type="US">Yr Unol Daleithiau</territory>
+			<territory type="US" alt="short">UDA</territory>
+			<territory type="UY">Uruguay</territory>
+			<territory type="UZ">Uzbekistan</territory>
+			<territory type="VA">Y Fatican</territory>
+			<territory type="VC">Saint Vincent a’r Grenadines</territory>
+			<territory type="VE">Venezuela</territory>
+			<territory type="VG">Ynysoedd Gwyryf Prydain</territory>
+			<territory type="VI">Ynysoedd Gwyryf yr Unol Daleithiau</territory>
+			<territory type="VN">Fietnam</territory>
+			<territory type="VU">Vanuatu</territory>
+			<territory type="WF">Wallis a Futuna</territory>
+			<territory type="WS">Samoa</territory>
+			<territory type="XK">Kosovo</territory>
+			<territory type="YE">Yemen</territory>
+			<territory type="YT">Mayotte</territory>
+			<territory type="ZA">De Affrica</territory>
+			<territory type="ZM">Zambia</territory>
+			<territory type="ZW">Zimbabwe</territory>
+			<territory type="ZZ">Rhanbarth Anhysbys</territory>
+		</territories>
+		<variants>
+			<variant type="1901">orgraff draddodiadol yr Almaeneg</variant>
+			<variant type="1606NICT">Ffrangeg Canol Diweddar hyd at 1606</variant>
+			<variant type="1694ACAD">Ffrangeg Modern Cynnar</variant>
+			<variant type="1959ACAD">Academig</variant>
+			<variant type="ALUKU">tafodiaith Aluku</variant>
+			<variant type="AREVELA">Armeneg Dwyreiniol</variant>
+			<variant type="AREVMDA">Armeneg Gorllewinol</variant>
+			<variant type="BAUDDHA">BAUDDHA</variant>
+			<variant type="BISCAYAN">BISCAYAN</variant>
+			<variant type="BOHORIC">Gwyddor Bohorič</variant>
+			<variant type="DAJNKO">gwyddor Dajnko</variant>
+			<variant type="EMODENG">Saesneg Modern Cynnar</variant>
+			<variant type="FONIPA">Seineg IPA</variant>
+			<variant type="FONUPA">Seineg UPA</variant>
+			<variant type="FONXSAMP">FONXSAMP</variant>
+			<variant type="HOGNORSK">HOGNORSK</variant>
+			<variant type="ITIHASA">ITIHASA</variant>
+			<variant type="JAUER">JAUER</variant>
+			<variant type="JYUTPING">JYUTPING</variant>
+			<variant type="KKCOR">yr Orgraff Gyffredin</variant>
+			<variant type="KOCIEWIE">KOCIEWIE</variant>
+			<variant type="KSCOR">yr Orgraff Safonol</variant>
+			<variant type="LAUKIKA">LAUKIKA</variant>
+			<variant type="LUNA1918">LUNA1918</variant>
+			<variant type="METELKO">gwyddor Metelko</variant>
+			<variant type="NDYUKA">tafodiaith Ndyuka</variant>
+			<variant type="NEDIS">tafodiaith Natisone</variant>
+			<variant type="NJIVA">tafodiaith Gniva/Njiva</variant>
+			<variant type="OSOJS">tafodiaith Oseacco/Osojane</variant>
+			<variant type="PAMAKA">tafodiaith Pamaka</variant>
+			<variant type="POSIX">Cyfrifiadur</variant>
+			<variant type="SCOTLAND">Saesneg Safonol yr Alban</variant>
+			<variant type="SURMIRAN">SURMIRAN</variant>
+			<variant type="SURSILV">SURSILV</variant>
+			<variant type="SUTSILV">SUTSILV</variant>
+			<variant type="VAIDIKA">VAIDIKA</variant>
+			<variant type="VALLADER">VALLADER</variant>
+		</variants>
+		<keys>
+			<key type="calendar">Calendr</key>
+			<key type="collation">Trefn</key>
+			<key type="currency">Arian Breiniol</key>
+			<key type="hc">Cylched Awr (12 vs 24)</key>
+			<key type="lb">Arddull Torriad Llinell</key>
+			<key type="ms">System Fesur</key>
+			<key type="numbers">Rhifau</key>
+		</keys>
+		<types>
+			<type key="calendar" type="buddhist">Calendr y Bwdiaid</type>
+			<type key="calendar" type="chinese">Calendr Tseina</type>
+			<type key="calendar" type="coptic">Calendr y Coptiaid</type>
+			<type key="calendar" type="dangi">Calendr Dangi</type>
+			<type key="calendar" type="ethiopic">Calendr Ethiopia</type>
+			<type key="calendar" type="ethiopic-amete-alem">Calendr Amete Alem Ethiopia</type>
+			<type key="calendar" type="gregorian">Calendr Gregori</type>
+			<type key="calendar" type="hebrew">Calendr yr Hebraed</type>
+			<type key="calendar" type="indian">Calendr Cenedlaethol India</type>
+			<type key="calendar" type="islamic">Calendr Islam</type>
+			<type key="calendar" type="islamic-umalqura" draft="unconfirmed">Calendr Islam (Umm al-Qura)</type>
+			<type key="calendar" type="iso8601">Calendr ISO-8601</type>
+			<type key="calendar" type="japanese">Calendr Japan</type>
+			<type key="calendar" type="persian">Calendr Persia</type>
+			<type key="calendar" type="roc">Calendr Gweriniaeth Tseina</type>
+			<type key="collation" type="big5han">Trefn Traddodiadol Tsieina - Big5</type>
+			<type key="collation" type="dictionary">Trefn Geiriadur</type>
+			<type key="collation" type="ducet">Trefn Rhagosodedig Unicode</type>
+			<type key="collation" type="eor">Rheolau trefnu Ewropeaidd</type>
+			<type key="collation" type="gb2312han">Trefn Symledig Tsieina - GB2312</type>
+			<type key="collation" type="phonebook">Trefn Llyfr Ffôn</type>
+			<type key="collation" type="pinyin">Trefn Pinyin</type>
+			<type key="collation" type="reformed">Trefn Diwygiedig</type>
+			<type key="collation" type="search">Chwilio at Ddibenion Cyffredinol</type>
+			<type key="collation" type="standard">Trefn Safonol</type>
+			<type key="collation" type="traditional">Trefn Traddodiadol</type>
+			<type key="collation" type="zhuyin">Trefn Zhuyin</type>
+			<type key="hc" type="h11">System 12 Awr (0–11)</type>
+			<type key="hc" type="h12">System 12 Awr (1–12)</type>
+			<type key="hc" type="h23">System 24 Awr (0–23)</type>
+			<type key="hc" type="h24">System 24 Awr (1–24)</type>
+			<type key="lb" type="loose">Arddull Torriad Llinell Rhydd</type>
+			<type key="lb" type="normal">Arddull Torriad Llinell Arferol</type>
+			<type key="lb" type="strict">Arddull Torriad Llinell Caeth</type>
+			<type key="ms" type="metric">System Fetrig</type>
+			<type key="ms" type="uksystem">System Fesur Imperialaidd</type>
+			<type key="ms" type="ussystem">System Fesur UDA</type>
+			<type key="numbers" type="arab">Digidau Arabig-Indig</type>
+			<type key="numbers" type="arabext">Digidau Arabig-Indig Estynedig</type>
+			<type key="numbers" type="armn">Rhifolion Armenaidd</type>
+			<type key="numbers" type="armnlow">Rhifolion Armenaidd mewn Llythrennau Bychain</type>
+			<type key="numbers" type="beng">Digidau Bengalaidd</type>
+			<type key="numbers" type="deva">Digidau Devanagarig</type>
+			<type key="numbers" type="ethi">Rhifolion Ethiopig</type>
+			<type key="numbers" type="fullwide">Digidau Lled Llawn</type>
+			<type key="numbers" type="geor">Rhifolion Georgaidd</type>
+			<type key="numbers" type="grek">Rhifolion Groegaidd</type>
+			<type key="numbers" type="greklow">Rhifolion Groegaidd mewn Llythrennau Bychain</type>
+			<type key="numbers" type="gujr">Digidau Gwjarataidd</type>
+			<type key="numbers" type="guru">Digidau Gwrmwcaidd</type>
+			<type key="numbers" type="hanidec">Rhifolion Degol Tsieineaidd</type>
+			<type key="numbers" type="hans">Rhifolion Tsieineaidd Symledig</type>
+			<type key="numbers" type="hansfin">Rhifolion Ariannol Tsieineaidd Symledig</type>
+			<type key="numbers" type="hant">Rhifolion Tsieineaidd Traddodiadol</type>
+			<type key="numbers" type="hantfin">Rhifolion Ariannol Tsieineaidd Traddodiadol</type>
+			<type key="numbers" type="hebr">Rhifolion Hebreig</type>
+			<type key="numbers" type="jpan">Rhifolion Japaneaidd</type>
+			<type key="numbers" type="jpanfin">Rhifolion Ariannol Japaneaidd</type>
+			<type key="numbers" type="khmr">Digidau Chmeraidd</type>
+			<type key="numbers" type="knda">Digidau Kannaraidd</type>
+			<type key="numbers" type="laoo">Digidau Laoaidd</type>
+			<type key="numbers" type="latn">Digidau Gorllewinol</type>
+			<type key="numbers" type="mlym">Digidau Malayalamaidd</type>
+			<type key="numbers" type="mong">Digidau Mongolia</type>
+			<type key="numbers" type="mymr">Digidau Myanmar</type>
+			<type key="numbers" type="orya">Digidau Orïaidd</type>
+			<type key="numbers" type="roman">Rhifolion Rhufeinig</type>
+			<type key="numbers" type="romanlow">Rhifolion Rhufeinig mewn Llythrennau Bychain</type>
+			<type key="numbers" type="takr">Digidau Takri</type>
+			<type key="numbers" type="taml">Rhifolion Tamilaidd Traddodiadol</type>
+			<type key="numbers" type="tamldec">Digidau Tamilaidd</type>
+			<type key="numbers" type="telu">Digidau Telugu</type>
+			<type key="numbers" type="thai">Digidau Thai</type>
+			<type key="numbers" type="tibt">Digidau Tibetaidd</type>
+		</types>
+		<measurementSystemNames>
+			<measurementSystemName type="metric">Metrig</measurementSystemName>
+			<measurementSystemName type="UK">DU</measurementSystemName>
+			<measurementSystemName type="US">UDA</measurementSystemName>
+		</measurementSystemNames>
+		<codePatterns>
+			<codePattern type="language">Iaith: {0}</codePattern>
+			<codePattern type="script">Sgript: {0}</codePattern>
+			<codePattern type="territory">Rhanbarth: {0}</codePattern>
+		</codePatterns>
+	</localeDisplayNames>
+	<characters>
+		<exemplarCharacters>[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 ý ỳ ŷ ÿ]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[ă å ã ā æ ç ĕ ē ĭ ī k ñ ŏ ø ō œ q ŭ ū v x z]</exemplarCharacters>
+		<exemplarCharacters type="index">[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]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐ – — , ; \: ! ? . … ' ‘ ’ &quot; “ ” ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
+		<ellipsis type="final">{0}…</ellipsis>
+		<ellipsis type="initial">…{0}</ellipsis>
+		<ellipsis type="medial">{0}…{1}</ellipsis>
+		<ellipsis type="word-final">{0} …</ellipsis>
+		<ellipsis type="word-initial">… {0}</ellipsis>
+		<ellipsis type="word-medial">{0} … {1}</ellipsis>
+		<moreInformation>?</moreInformation>
+	</characters>
+	<delimiters>
+		<quotationStart>‘</quotationStart>
+		<quotationEnd>’</quotationEnd>
+		<alternateQuotationStart>“</alternateQuotationStart>
+		<alternateQuotationEnd>”</alternateQuotationEnd>
+	</delimiters>
+	<dates>
+		<calendars>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE, d MMMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d MMMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>d MMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>dd/MM/y GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} am {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} am {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
+						<dateFormatItem id="Ed">E, d</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="h">h a</dateFormatItem>
+						<dateFormatItem id="H">HH</dateFormatItem>
+						<dateFormatItem id="hm">h:mm a</dateFormatItem>
+						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
+						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="M">L</dateFormatItem>
+						<dateFormatItem id="Md">d/M</dateFormatItem>
+						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
+						<dateFormatItem id="ms">mm:ss</dateFormatItem>
+						<dateFormatItem id="y">y</dateFormatItem>
+						<dateFormatItem id="yyyy">y G</dateFormatItem>
+						<dateFormatItem id="yyyyM">M/y G</dateFormatItem>
+						<dateFormatItem id="yyyyMd">d/M/y G</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E, d/M/y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">d MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y MMMM</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d – d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">h a – h a</greatestDifference>
+							<greatestDifference id="h">h – h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH – HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">HH:mm – HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm – HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm – HH:mm v</greatestDifference>
+							<greatestDifference id="m">HH:mm – HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">h a – h a v</greatestDifference>
+							<greatestDifference id="h">h – h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH – HH v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">M – M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">d/M – d/M</greatestDifference>
+							<greatestDifference id="M">d/M – d/M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">E, d/M – E, d/M</greatestDifference>
+							<greatestDifference id="M">E, d/M – E, d/M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">MMM–MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">d – d MMM</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMM">
+							<greatestDifference id="M">LLLL–LLLL</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">y–y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">M/y – M/y GGGGG</greatestDifference>
+							<greatestDifference id="y">M/y – M/y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">d/M/y – d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="M">d/M/y – d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="y">d/M/y – d/M/y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="M">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="y">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">MMM – MMM y G</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">d–d MMM y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">E, d MMM – E, d MMM y G</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM y G</greatestDifference>
+							<greatestDifference id="y">E, d MMM, y – E, d MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">MMMM–MMMM y G</greatestDifference>
+							<greatestDifference id="y">MMMM y – MMMM y G</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">Ion</month>
+							<month type="2">Chwef</month>
+							<month type="3">Maw</month>
+							<month type="4">Ebrill</month>
+							<month type="5">Mai</month>
+							<month type="6">Meh</month>
+							<month type="7">Gorff</month>
+							<month type="8">Awst</month>
+							<month type="9">Medi</month>
+							<month type="10">Hyd</month>
+							<month type="11">Tach</month>
+							<month type="12">Rhag</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">I</month>
+							<month type="2">Ch</month>
+							<month type="3">M</month>
+							<month type="4">E</month>
+							<month type="5">M</month>
+							<month type="6">M</month>
+							<month type="7">G</month>
+							<month type="8">A</month>
+							<month type="9">M</month>
+							<month type="10">H</month>
+							<month type="11">T</month>
+							<month type="12">Rh</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">Ionawr</month>
+							<month type="2">Chwefror</month>
+							<month type="3">Mawrth</month>
+							<month type="4">Ebrill</month>
+							<month type="5">Mai</month>
+							<month type="6">Mehefin</month>
+							<month type="7">Gorffennaf</month>
+							<month type="8">Awst</month>
+							<month type="9">Medi</month>
+							<month type="10">Hydref</month>
+							<month type="11">Tachwedd</month>
+							<month type="12">Rhagfyr</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">Ion</month>
+							<month type="2">Chw</month>
+							<month type="3">Maw</month>
+							<month type="4">Ebr</month>
+							<month type="5">Mai</month>
+							<month type="6">Meh</month>
+							<month type="7">Gor</month>
+							<month type="8">Awst</month>
+							<month type="9">Medi</month>
+							<month type="10">Hyd</month>
+							<month type="11">Tach</month>
+							<month type="12">Rhag</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">I</month>
+							<month type="2">Ch</month>
+							<month type="3">M</month>
+							<month type="4">E</month>
+							<month type="5">M</month>
+							<month type="6">M</month>
+							<month type="7">G</month>
+							<month type="8">A</month>
+							<month type="9">M</month>
+							<month type="10">H</month>
+							<month type="11">T</month>
+							<month type="12">Rh</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">Ionawr</month>
+							<month type="2">Chwefror</month>
+							<month type="3">Mawrth</month>
+							<month type="4">Ebrill</month>
+							<month type="5">Mai</month>
+							<month type="6">Mehefin</month>
+							<month type="7">Gorffennaf</month>
+							<month type="8">Awst</month>
+							<month type="9">Medi</month>
+							<month type="10">Hydref</month>
+							<month type="11">Tachwedd</month>
+							<month type="12">Rhagfyr</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="abbreviated">
+							<day type="sun">Sul</day>
+							<day type="mon">Llun</day>
+							<day type="tue">Maw</day>
+							<day type="wed">Mer</day>
+							<day type="thu">Iau</day>
+							<day type="fri">Gwen</day>
+							<day type="sat">Sad</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun">S</day>
+							<day type="mon">Ll</day>
+							<day type="tue">M</day>
+							<day type="wed">M</day>
+							<day type="thu">I</day>
+							<day type="fri">G</day>
+							<day type="sat">S</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">Su</day>
+							<day type="mon">Ll</day>
+							<day type="tue">Ma</day>
+							<day type="wed">Me</day>
+							<day type="thu">Ia</day>
+							<day type="fri">Gw</day>
+							<day type="sat">Sa</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun">Dydd Sul</day>
+							<day type="mon">Dydd Llun</day>
+							<day type="tue">Dydd Mawrth</day>
+							<day type="wed">Dydd Mercher</day>
+							<day type="thu">Dydd Iau</day>
+							<day type="fri">Dydd Gwener</day>
+							<day type="sat">Dydd Sadwrn</day>
+						</dayWidth>
+					</dayContext>
+					<dayContext type="stand-alone">
+						<dayWidth type="abbreviated">
+							<day type="sun">Sul</day>
+							<day type="mon">Llun</day>
+							<day type="tue">Maw</day>
+							<day type="wed">Mer</day>
+							<day type="thu">Iau</day>
+							<day type="fri">Gwe</day>
+							<day type="sat">Sad</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun">S</day>
+							<day type="mon">Ll</day>
+							<day type="tue">M</day>
+							<day type="wed">M</day>
+							<day type="thu">I</day>
+							<day type="fri">G</day>
+							<day type="sat">S</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">Su</day>
+							<day type="mon">Ll</day>
+							<day type="tue">Ma</day>
+							<day type="wed">Me</day>
+							<day type="thu">Ia</day>
+							<day type="fri">Gw</day>
+							<day type="sat">Sa</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun">Dydd Sul</day>
+							<day type="mon">Dydd Llun</day>
+							<day type="tue">Dydd Mawrth</day>
+							<day type="wed">Dydd Mercher</day>
+							<day type="thu">Dydd Iau</day>
+							<day type="fri">Dydd Gwener</day>
+							<day type="sat">Dydd Sadwrn</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<quarters>
+					<quarterContext type="format">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">Ch1</quarter>
+							<quarter type="2">Ch2</quarter>
+							<quarter type="3">Ch3</quarter>
+							<quarter type="4">Ch4</quarter>
+						</quarterWidth>
+						<quarterWidth type="narrow">
+							<quarter type="1">1</quarter>
+							<quarter type="2">2</quarter>
+							<quarter type="3">3</quarter>
+							<quarter type="4">4</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1">chwarter 1af</quarter>
+							<quarter type="2">2il chwarter</quarter>
+							<quarter type="3">3ydd chwarter</quarter>
+							<quarter type="4">4ydd chwarter</quarter>
+						</quarterWidth>
+					</quarterContext>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">Ch1</quarter>
+							<quarter type="2">Ch2</quarter>
+							<quarter type="3">Ch3</quarter>
+							<quarter type="4">Ch4</quarter>
+						</quarterWidth>
+						<quarterWidth type="narrow">
+							<quarter type="1">1</quarter>
+							<quarter type="2">2</quarter>
+							<quarter type="3">3</quarter>
+							<quarter type="4">4</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1">chwarter 1af</quarter>
+							<quarter type="2">2il chwarter</quarter>
+							<quarter type="3">3ydd chwarter</quarter>
+							<quarter type="4">4ydd chwarter</quarter>
+						</quarterWidth>
+					</quarterContext>
+				</quarters>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<eras>
+					<eraNames>
+						<era type="0">Cyn Crist</era>
+						<era type="0" alt="variant">Cyn Cyfnod Cyffredin</era>
+						<era type="1">Oed Crist</era>
+						<era type="1" alt="variant">Cyfnod Cyffredin</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">CC</era>
+						<era type="0" alt="variant">BCE</era>
+						<era type="1">OC</era>
+						<era type="1" alt="variant">CE</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0">C</era>
+						<era type="1">O</era>
+					</eraNarrow>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE, d MMMM y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d MMMM y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>d MMM y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>dd/MM/yy</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} 'am' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} 'am' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
+						<dateFormatItem id="Ed">E, d</dateFormatItem>
+						<dateFormatItem id="Ehm">E, h:mm a</dateFormatItem>
+						<dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
+						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="h">h a</dateFormatItem>
+						<dateFormatItem id="H">HH</dateFormatItem>
+						<dateFormatItem id="hm">h:mm a</dateFormatItem>
+						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
+						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
+						<dateFormatItem id="M">L</dateFormatItem>
+						<dateFormatItem id="Md">d/M</dateFormatItem>
+						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
+						<dateFormatItem id="ms">mm:ss</dateFormatItem>
+						<dateFormatItem id="y">y</dateFormatItem>
+						<dateFormatItem id="yM">M/y</dateFormatItem>
+						<dateFormatItem id="yMd">d/M/y</dateFormatItem>
+						<dateFormatItem id="yMEd">E, d/M/y</dateFormatItem>
+						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMEd">E, d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
+						<dateFormatItem id="yQ">Q y</dateFormatItem>
+						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
+						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
+					</availableFormats>
+					<appendItems>
+						<appendItem request="Timezone">{0} {1}</appendItem>
+					</appendItems>
+					<intervalFormats>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d–d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">h a – h a</greatestDifference>
+							<greatestDifference id="h">h–h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">h a – h a v</greatestDifference>
+							<greatestDifference id="h">h–h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">M–M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">d/M – d/M</greatestDifference>
+							<greatestDifference id="M">d/M – d/M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">E, d/M – E, d/M</greatestDifference>
+							<greatestDifference id="M">E, d/M – E, d/M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">MMM–MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">d–d MMM</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMM">
+							<greatestDifference id="M">LLLL–LLLL</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">M/y – M/y</greatestDifference>
+							<greatestDifference id="y">M/y – M/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">d/M/y – d/M/y</greatestDifference>
+							<greatestDifference id="M">d/M/y – d/M/y</greatestDifference>
+							<greatestDifference id="y">d/M/y – d/M/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">E, d/M/y – E, d/M/y</greatestDifference>
+							<greatestDifference id="M">E, d/M/y – E, d/M/y</greatestDifference>
+							<greatestDifference id="y">E, d/M/y – E, d/M/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">MMM – MMM y</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">d–d MMM y</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y</greatestDifference>
+							<greatestDifference id="y">d MMM, y – d MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">E, d MMM – E, d MMM y</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM y</greatestDifference>
+							<greatestDifference id="y">E, d MMM y – E, d MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">MMMM–MMMM y</greatestDifference>
+							<greatestDifference id="y">MMMM y – MMMM y</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="era">
+				<displayName>Oes</displayName>
+			</field>
+			<field type="year">
+				<displayName>blwyddyn</displayName>
+				<relative type="-1">llynedd</relative>
+				<relative type="0">eleni</relative>
+				<relative type="1">blwyddyn nesaf</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="zero">ymhen {0} mlynedd</relativeTimePattern>
+					<relativeTimePattern count="one">ymhen blwyddyn</relativeTimePattern>
+					<relativeTimePattern count="two">ymhen {0} flynedd</relativeTimePattern>
+					<relativeTimePattern count="few">ymhen {0} blynedd</relativeTimePattern>
+					<relativeTimePattern count="many">ymhen {0} blynedd</relativeTimePattern>
+					<relativeTimePattern count="other">ymhen {0} mlynedd</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="zero">{0} o flynyddoedd yn ôl</relativeTimePattern>
+					<relativeTimePattern count="one">blwyddyn yn ôl</relativeTimePattern>
+					<relativeTimePattern count="two">{0} flynedd yn ôl</relativeTimePattern>
+					<relativeTimePattern count="few">{0} blynedd yn ôl</relativeTimePattern>
+					<relativeTimePattern count="many">{0} blynedd yn ôl</relativeTimePattern>
+					<relativeTimePattern count="other">{0} o flynyddoedd yn ôl</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-short">
+				<displayName>bl.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="zero">ymhen {0} mlynedd</relativeTimePattern>
+					<relativeTimePattern count="one">ymhen blwyddyn</relativeTimePattern>
+					<relativeTimePattern count="two">ymhen {0} flynedd</relativeTimePattern>
+					<relativeTimePattern count="few">ymhen {0} blynedd</relativeTimePattern>
+					<relativeTimePattern count="many">ymhen {0} blynedd</relativeTimePattern>
+					<relativeTimePattern count="other">ymhen {0} mlynedd</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="zero">{0} o flynyddoedd yn ôl</relativeTimePattern>
+					<relativeTimePattern count="one">blwyddyn yn ôl</relativeTimePattern>
+					<relativeTimePattern count="two">{0} flynedd yn ôl</relativeTimePattern>
+					<relativeTimePattern count="few">{0} blynedd yn ôl</relativeTimePattern>
+					<relativeTimePattern count="many">{0} blynedd yn ôl</relativeTimePattern>
+					<relativeTimePattern count="other">{0} o flynyddoedd yn ôl</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-narrow">
+				<displayName>bl.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="zero">ymhen {0} mlynedd</relativeTimePattern>
+					<relativeTimePattern count="one">ymhen blwyddyn</relativeTimePattern>
+					<relativeTimePattern count="two">ymhen {0} flynedd</relativeTimePattern>
+					<relativeTimePattern count="few">ymhen {0} blynedd</relativeTimePattern>
+					<relativeTimePattern count="many">ymhen {0} blynedd</relativeTimePattern>
+					<relativeTimePattern count="other">ymhen {0} mlynedd</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="zero">{0} o flynyddoedd yn ôl</relativeTimePattern>
+					<relativeTimePattern count="one">blwyddyn yn ôl</relativeTimePattern>
+					<relativeTimePattern count="two">{0} flynedd yn ôl</relativeTimePattern>
+					<relativeTimePattern count="few">{0} blynedd yn ôl</relativeTimePattern>
+					<relativeTimePattern count="many">{0} blynedd yn ôl</relativeTimePattern>
+					<relativeTimePattern count="other">{0} o flynyddoedd yn ôl</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter">
+				<displayName>chwarter</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="zero">ymhen {0} o chwarteri</relativeTimePattern>
+					<relativeTimePattern count="one">ymhen {0} chwarter</relativeTimePattern>
+					<relativeTimePattern count="two">ymhen {0} chwarter</relativeTimePattern>
+					<relativeTimePattern count="few">ymhen {0} chwarter</relativeTimePattern>
+					<relativeTimePattern count="many">ymhen {0} chwarter</relativeTimePattern>
+					<relativeTimePattern count="other">ymhen {0} chwarter</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="zero">{0} o chwarteri yn ôl</relativeTimePattern>
+					<relativeTimePattern count="one">{0} chwarter yn ôl</relativeTimePattern>
+					<relativeTimePattern count="two">{0} chwarter yn ôl</relativeTimePattern>
+					<relativeTimePattern count="few">{0} chwarter yn ôl</relativeTimePattern>
+					<relativeTimePattern count="many">{0} chwarter yn ôl</relativeTimePattern>
+					<relativeTimePattern count="other">{0} o chwarteri yn ôl</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-short">
+				<displayName>chwarter</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="zero">ymhen {0} o chwarteri</relativeTimePattern>
+					<relativeTimePattern count="one">ymhen {0} o chwarteri</relativeTimePattern>
+					<relativeTimePattern count="two">ymhen {0} o chwarteri</relativeTimePattern>
+					<relativeTimePattern count="few">ymhen {0} o chwarteri</relativeTimePattern>
+					<relativeTimePattern count="many">ymhen {0} o chwarteri</relativeTimePattern>
+					<relativeTimePattern count="other">ymhen {0} o chwarteri</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="zero">{0} o chwarteri yn ôl</relativeTimePattern>
+					<relativeTimePattern count="one">{0} chwarter yn ôl</relativeTimePattern>
+					<relativeTimePattern count="two">{0} chwarter yn ôl</relativeTimePattern>
+					<relativeTimePattern count="few">{0} chwarter yn ôl</relativeTimePattern>
+					<relativeTimePattern count="many">{0} chwarter yn ôl</relativeTimePattern>
+					<relativeTimePattern count="other">{0} o chwarteri yn ôl</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-narrow">
+				<displayName>chwarter</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="zero">ymhen {0} o chwarteri</relativeTimePattern>
+					<relativeTimePattern count="one">ymhen {0} chwarter</relativeTimePattern>
+					<relativeTimePattern count="two">ymhen {0} chwarter</relativeTimePattern>
+					<relativeTimePattern count="few">ymhen {0} chwarter</relativeTimePattern>
+					<relativeTimePattern count="many">ymhen {0} chwarter</relativeTimePattern>
+					<relativeTimePattern count="other">ymhen {0} o chwarteri</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="zero">{0} o chwarteri yn ôl</relativeTimePattern>
+					<relativeTimePattern count="one">{0} chwarter yn ôl</relativeTimePattern>
+					<relativeTimePattern count="two">{0} chwarter yn ôl</relativeTimePattern>
+					<relativeTimePattern count="few">{0} chwarter yn ôl</relativeTimePattern>
+					<relativeTimePattern count="many">{0} chwarter yn ôl</relativeTimePattern>
+					<relativeTimePattern count="other">{0} o chwarteri yn ôl</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month">
+				<displayName>mis</displayName>
+				<relative type="-1">mis diwethaf</relative>
+				<relative type="0">y mis hwn</relative>
+				<relative type="1">mis nesaf</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="zero">ymhen {0} mis</relativeTimePattern>
+					<relativeTimePattern count="one">ymhen mis</relativeTimePattern>
+					<relativeTimePattern count="two">ymhen deufis</relativeTimePattern>
+					<relativeTimePattern count="few">ymhen {0} mis</relativeTimePattern>
+					<relativeTimePattern count="many">ymhen {0} mis</relativeTimePattern>
+					<relativeTimePattern count="other">ymhen {0} mis</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="zero">{0} mis yn ôl</relativeTimePattern>
+					<relativeTimePattern count="one">{0} mis yn ôl</relativeTimePattern>
+					<relativeTimePattern count="two">{0} fis yn ôl</relativeTimePattern>
+					<relativeTimePattern count="few">{0} mis yn ôl</relativeTimePattern>
+					<relativeTimePattern count="many">{0} mis yn ôl</relativeTimePattern>
+					<relativeTimePattern count="other">{0} mis yn ôl</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-short">
+				<displayName>mis</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="zero">ymhen {0} mis</relativeTimePattern>
+					<relativeTimePattern count="one">ymhen mis</relativeTimePattern>
+					<relativeTimePattern count="two">ymhen deufis</relativeTimePattern>
+					<relativeTimePattern count="few">ymhen {0} mis</relativeTimePattern>
+					<relativeTimePattern count="many">ymhen {0} mis</relativeTimePattern>
+					<relativeTimePattern count="other">ymhen {0} mis</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="zero">{0} mis yn ôl</relativeTimePattern>
+					<relativeTimePattern count="one">{0} mis yn ôl</relativeTimePattern>
+					<relativeTimePattern count="two">{0} mis yn ôl</relativeTimePattern>
+					<relativeTimePattern count="few">{0} mis yn ôl</relativeTimePattern>
+					<relativeTimePattern count="many">{0} mis yn ôl</relativeTimePattern>
+					<relativeTimePattern count="other">{0} mis yn ôl</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-narrow">
+				<displayName>mis</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="zero">ymhen {0} mis</relativeTimePattern>
+					<relativeTimePattern count="one">ymhen mis</relativeTimePattern>
+					<relativeTimePattern count="two">ymhen deufis</relativeTimePattern>
+					<relativeTimePattern count="few">ymhen {0} mis</relativeTimePattern>
+					<relativeTimePattern count="many">ymhen {0} mis</relativeTimePattern>
+					<relativeTimePattern count="other">ymhen {0} mis</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="zero">{0} mis yn ôl</relativeTimePattern>
+					<relativeTimePattern count="one">{0} mis yn ôl</relativeTimePattern>
+					<relativeTimePattern count="two">{0} fis yn ôl</relativeTimePattern>
+					<relativeTimePattern count="few">{0} mis yn ôl</relativeTimePattern>
+					<relativeTimePattern count="many">{0} mis yn ôl</relativeTimePattern>
+					<relativeTimePattern count="other">{0} mis yn ôl</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week">
+				<displayName>wythnos</displayName>
+				<relative type="-1">wythnos ddiwethaf</relative>
+				<relative type="0">yr wythnos hon</relative>
+				<relative type="1">wythnos nesaf</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="zero">ymhen {0} wythnos</relativeTimePattern>
+					<relativeTimePattern count="one">ymhen wythnos</relativeTimePattern>
+					<relativeTimePattern count="two">ymhen pythefnos</relativeTimePattern>
+					<relativeTimePattern count="few">ymhen {0} wythnos</relativeTimePattern>
+					<relativeTimePattern count="many">ymhen {0} wythnos</relativeTimePattern>
+					<relativeTimePattern count="other">ymhen {0} wythnos</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="zero">{0} wythnos yn ôl</relativeTimePattern>
+					<relativeTimePattern count="one">{0} wythnos yn ôl</relativeTimePattern>
+					<relativeTimePattern count="two">{0} wythnos yn ôl</relativeTimePattern>
+					<relativeTimePattern count="few">{0} wythnos yn ôl</relativeTimePattern>
+					<relativeTimePattern count="many">{0} wythnos yn ôl</relativeTimePattern>
+					<relativeTimePattern count="other">{0} wythnos yn ôl</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-short">
+				<displayName>wythnos</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="zero">ymhen {0} wythnos</relativeTimePattern>
+					<relativeTimePattern count="one">ymhen wythnos</relativeTimePattern>
+					<relativeTimePattern count="two">ymhen pythefnos</relativeTimePattern>
+					<relativeTimePattern count="few">ymhen {0} wythnos</relativeTimePattern>
+					<relativeTimePattern count="many">ymhen {0} wythnos</relativeTimePattern>
+					<relativeTimePattern count="other">ymhen {0} wythnos</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="zero">{0} wythnos yn ôl</relativeTimePattern>
+					<relativeTimePattern count="one">{0} wythnos yn ôl</relativeTimePattern>
+					<relativeTimePattern count="two">pythefnos yn ôl</relativeTimePattern>
+					<relativeTimePattern count="few">{0} wythnos yn ôl</relativeTimePattern>
+					<relativeTimePattern count="many">{0} wythnos yn ôl</relativeTimePattern>
+					<relativeTimePattern count="other">{0} wythnos yn ôl</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-narrow">
+				<displayName>wythnos</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="zero">ymhen {0} wythnos</relativeTimePattern>
+					<relativeTimePattern count="one">ymhen wythnos</relativeTimePattern>
+					<relativeTimePattern count="two">ymhen pythefnos</relativeTimePattern>
+					<relativeTimePattern count="few">ymhen {0} wythnos</relativeTimePattern>
+					<relativeTimePattern count="many">ymhen {0} wythnos</relativeTimePattern>
+					<relativeTimePattern count="other">ymhen {0} wythnos</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="zero">{0} wythnos yn ôl</relativeTimePattern>
+					<relativeTimePattern count="one">{0} wythnos yn ôl</relativeTimePattern>
+					<relativeTimePattern count="two">pythefnos yn ôl</relativeTimePattern>
+					<relativeTimePattern count="few">{0} wythnos yn ôl</relativeTimePattern>
+					<relativeTimePattern count="many">{0} wythnos yn ôl</relativeTimePattern>
+					<relativeTimePattern count="other">{0} wythnos yn ôl</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day">
+				<displayName>dydd</displayName>
+				<relative type="-2">echdoe</relative>
+				<relative type="-1">ddoe</relative>
+				<relative type="0">heddiw</relative>
+				<relative type="1">yfory</relative>
+				<relative type="2">drennydd</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="zero">ymhen {0} diwrnod</relativeTimePattern>
+					<relativeTimePattern count="one">ymhen diwrnod</relativeTimePattern>
+					<relativeTimePattern count="two">ymhen deuddydd</relativeTimePattern>
+					<relativeTimePattern count="few">ymhen tridiau</relativeTimePattern>
+					<relativeTimePattern count="many">ymhen {0} diwrnod</relativeTimePattern>
+					<relativeTimePattern count="other">ymhen {0} diwrnod</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="zero">{0} diwrnod yn ôl</relativeTimePattern>
+					<relativeTimePattern count="one">{0} diwrnod yn ôl</relativeTimePattern>
+					<relativeTimePattern count="two">{0} ddiwrnod yn ôl</relativeTimePattern>
+					<relativeTimePattern count="few">{0} diwrnod yn ôl</relativeTimePattern>
+					<relativeTimePattern count="many">{0} diwrnod yn ôl</relativeTimePattern>
+					<relativeTimePattern count="other">{0} diwrnod yn ôl</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-short">
+				<displayName>dydd</displayName>
+				<relative type="-2">echdoe</relative>
+				<relative type="-1">ddoe</relative>
+				<relative type="0">heddiw</relative>
+				<relative type="1">yfory</relative>
+				<relative type="2">drennydd</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="zero">ymhen {0} diwrnod</relativeTimePattern>
+					<relativeTimePattern count="one">ymhen diwrnod</relativeTimePattern>
+					<relativeTimePattern count="two">ymhen deuddydd</relativeTimePattern>
+					<relativeTimePattern count="few">ymhen tridiau</relativeTimePattern>
+					<relativeTimePattern count="many">ymhen {0} diwrnod</relativeTimePattern>
+					<relativeTimePattern count="other">ymhen {0} diwrnod</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="zero">{0} diwrnod yn ôl</relativeTimePattern>
+					<relativeTimePattern count="one">{0} diwrnod yn ôl</relativeTimePattern>
+					<relativeTimePattern count="two">{0} ddiwrnod yn ôl</relativeTimePattern>
+					<relativeTimePattern count="few">{0} diwrnod yn ôl</relativeTimePattern>
+					<relativeTimePattern count="many">{0} diwrnod yn ôl</relativeTimePattern>
+					<relativeTimePattern count="other">{0} diwrnod yn ôl</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-narrow">
+				<displayName>dydd</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="zero">ymhen {0} diwrnod</relativeTimePattern>
+					<relativeTimePattern count="one">ymhen diwrnod</relativeTimePattern>
+					<relativeTimePattern count="two">ymhen deuddydd</relativeTimePattern>
+					<relativeTimePattern count="few">ymhen tridiau</relativeTimePattern>
+					<relativeTimePattern count="many">ymhen {0} diwrnod</relativeTimePattern>
+					<relativeTimePattern count="other">ymhen {0} diwrnod</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="zero">{0} diwrnod yn ôl</relativeTimePattern>
+					<relativeTimePattern count="one">{0} diwrnod yn ôl</relativeTimePattern>
+					<relativeTimePattern count="two">{0} ddiwrnod yn ôl</relativeTimePattern>
+					<relativeTimePattern count="few">{0} diwrnod yn ôl</relativeTimePattern>
+					<relativeTimePattern count="many">{0} diwrnod yn ôl</relativeTimePattern>
+					<relativeTimePattern count="other">{0} diwrnod yn ôl</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="weekday">
+				<displayName>dydd o’r wythnos</displayName>
+			</field>
+			<field type="sun">
+				<relative type="-1">dydd Sul diwethaf</relative>
+				<relative type="0">dydd Sul yma</relative>
+				<relative type="1">dydd Sul nesaf</relative>
+			</field>
+			<field type="sun-short">
+				<relative type="-1">Sul diwethaf</relative>
+				<relative type="0">Sul yma</relative>
+				<relative type="1">Sul nesaf</relative>
+			</field>
+			<field type="sun-narrow">
+				<relative type="-1">Sul diwethaf</relative>
+				<relative type="0">Sul yma</relative>
+				<relative type="1">Sul nesaf</relative>
+			</field>
+			<field type="mon">
+				<relative type="-1">dydd Llun diwethaf</relative>
+				<relative type="0">dydd Llun yma</relative>
+				<relative type="1">dydd Llun nesaf</relative>
+			</field>
+			<field type="mon-short">
+				<relative type="-1">Llun diwethaf</relative>
+				<relative type="0">Llun yma</relative>
+				<relative type="1">Llun nesaf</relative>
+			</field>
+			<field type="mon-narrow">
+				<relative type="-1">Llun diwethaf</relative>
+				<relative type="0">Llun yma</relative>
+				<relative type="1">Llun nesaf</relative>
+			</field>
+			<field type="tue">
+				<relative type="-1">dydd Mawrth diwethaf</relative>
+				<relative type="0">dydd Mawrth yma</relative>
+				<relative type="1">dydd Mawrth nesaf</relative>
+			</field>
+			<field type="tue-short">
+				<relative type="-1">Mawrth diwethaf</relative>
+				<relative type="0">Mawrth yma</relative>
+				<relative type="1">Mawrth nesaf</relative>
+			</field>
+			<field type="tue-narrow">
+				<relative type="-1">Maw. diwethaf</relative>
+				<relative type="0">Maw. yma</relative>
+				<relative type="1">Maw. nesaf</relative>
+			</field>
+			<field type="wed">
+				<relative type="-1">dydd Mercher diwethaf</relative>
+				<relative type="0">dydd Mercher yma</relative>
+				<relative type="1">dydd Mercher nesaf</relative>
+			</field>
+			<field type="wed-short">
+				<relative type="-1">Mercher diwethaf</relative>
+				<relative type="0">Mercher yma</relative>
+				<relative type="1">Mercher nesaf</relative>
+			</field>
+			<field type="wed-narrow">
+				<relative type="-1">Merch. diwethaf</relative>
+				<relative type="0">Merch. yma</relative>
+				<relative type="1">Merch. nesaf</relative>
+			</field>
+			<field type="thu">
+				<relative type="-1">dydd Iau diwethaf</relative>
+				<relative type="0">dydd Iau yma</relative>
+				<relative type="1">dydd Iau nesaf</relative>
+			</field>
+			<field type="thu-short">
+				<relative type="-1">Iau diwethaf</relative>
+				<relative type="0">Iau yma</relative>
+				<relative type="1">Iau nesaf</relative>
+			</field>
+			<field type="thu-narrow">
+				<relative type="-1">Iau diwethaf</relative>
+				<relative type="0">Iau yma</relative>
+				<relative type="1">Iau nesaf</relative>
+			</field>
+			<field type="fri">
+				<relative type="-1">dydd Gwener diwethaf</relative>
+				<relative type="0">dydd Gwener yma</relative>
+				<relative type="1">dydd Gwener nesaf</relative>
+			</field>
+			<field type="fri-short">
+				<relative type="-1">Gwener diwethaf</relative>
+				<relative type="0">Gwener yma</relative>
+				<relative type="1">Gwener nesaf</relative>
+			</field>
+			<field type="fri-narrow">
+				<relative type="-1">Gwen. diwethaf</relative>
+				<relative type="0">Gwen. yma</relative>
+				<relative type="1">Gwen. nesaf</relative>
+			</field>
+			<field type="sat">
+				<relative type="-1">dydd Sadwrn diwethaf</relative>
+				<relative type="0">dydd Sadwrn yma</relative>
+				<relative type="1">dydd Sadwrn nesaf</relative>
+			</field>
+			<field type="sat-short">
+				<relative type="-1">Sadwrn diwethaf</relative>
+				<relative type="0">Sadwrn yma</relative>
+				<relative type="1">Sadwrn nesaf</relative>
+			</field>
+			<field type="sat-narrow">
+				<relative type="-1">Sad. diwethaf</relative>
+				<relative type="0">Sad. yma</relative>
+				<relative type="1">Sad. nesaf</relative>
+			</field>
+			<field type="dayperiod">
+				<displayName>AM/PM</displayName>
+			</field>
+			<field type="hour">
+				<displayName>awr</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="zero">ymhen {0} awr</relativeTimePattern>
+					<relativeTimePattern count="one">ymhen awr</relativeTimePattern>
+					<relativeTimePattern count="two">ymhen {0} awr</relativeTimePattern>
+					<relativeTimePattern count="few">ymhen {0} awr</relativeTimePattern>
+					<relativeTimePattern count="many">ymhen {0} awr</relativeTimePattern>
+					<relativeTimePattern count="other">ymhen {0} awr</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="zero">{0} awr yn ôl</relativeTimePattern>
+					<relativeTimePattern count="one">awr yn ôl</relativeTimePattern>
+					<relativeTimePattern count="two">{0} awr yn ôl</relativeTimePattern>
+					<relativeTimePattern count="few">{0} awr yn ôl</relativeTimePattern>
+					<relativeTimePattern count="many">{0} awr yn ôl</relativeTimePattern>
+					<relativeTimePattern count="other">{0} awr yn ôl</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-short">
+				<displayName>awr</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="zero">ymhen {0} awr</relativeTimePattern>
+					<relativeTimePattern count="one">ymhen awr</relativeTimePattern>
+					<relativeTimePattern count="two">ymhen {0} awr</relativeTimePattern>
+					<relativeTimePattern count="few">ymhen {0} awr</relativeTimePattern>
+					<relativeTimePattern count="many">ymhen {0} awr</relativeTimePattern>
+					<relativeTimePattern count="other">ymhen {0} awr</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="zero">{0} awr yn ôl</relativeTimePattern>
+					<relativeTimePattern count="one">awr yn ôl</relativeTimePattern>
+					<relativeTimePattern count="two">{0} awr yn ôl</relativeTimePattern>
+					<relativeTimePattern count="few">{0} awr yn ôl</relativeTimePattern>
+					<relativeTimePattern count="many">{0} awr yn ôl</relativeTimePattern>
+					<relativeTimePattern count="other">{0} awr yn ôl</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-narrow">
+				<displayName>awr</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="zero">ymhen {0} awr</relativeTimePattern>
+					<relativeTimePattern count="one">ymhen awr</relativeTimePattern>
+					<relativeTimePattern count="two">ymhen {0} awr</relativeTimePattern>
+					<relativeTimePattern count="few">ymhen {0} awr</relativeTimePattern>
+					<relativeTimePattern count="many">ymhen {0} awr</relativeTimePattern>
+					<relativeTimePattern count="other">ymhen {0} awr</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="zero">{0} awr yn ôl</relativeTimePattern>
+					<relativeTimePattern count="one">{0} awr yn ôl</relativeTimePattern>
+					<relativeTimePattern count="two">{0} awr yn ôl</relativeTimePattern>
+					<relativeTimePattern count="few">{0} awr yn ôl</relativeTimePattern>
+					<relativeTimePattern count="many">{0} awr yn ôl</relativeTimePattern>
+					<relativeTimePattern count="other">{0} awr yn ôl</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute">
+				<displayName>munud</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="zero">ymhen {0} munud</relativeTimePattern>
+					<relativeTimePattern count="one">ymhen munud</relativeTimePattern>
+					<relativeTimePattern count="two">ymhen {0} funud</relativeTimePattern>
+					<relativeTimePattern count="few">ymhen {0} munud</relativeTimePattern>
+					<relativeTimePattern count="many">ymhen {0} munud</relativeTimePattern>
+					<relativeTimePattern count="other">ymhen {0} munud</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="zero">{0} munud yn ôl</relativeTimePattern>
+					<relativeTimePattern count="one">{0} munud yn ôl</relativeTimePattern>
+					<relativeTimePattern count="two">{0} funud yn ôl</relativeTimePattern>
+					<relativeTimePattern count="few">{0} munud yn ôl</relativeTimePattern>
+					<relativeTimePattern count="many">{0} munud yn ôl</relativeTimePattern>
+					<relativeTimePattern count="other">{0} munud yn ôl</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-short">
+				<displayName>mun.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="zero">ymhen {0} mun.</relativeTimePattern>
+					<relativeTimePattern count="one">ymhen {0} mun.</relativeTimePattern>
+					<relativeTimePattern count="two">ymhen {0} fun.</relativeTimePattern>
+					<relativeTimePattern count="few">ymhen {0} mun.</relativeTimePattern>
+					<relativeTimePattern count="many">ymhen {0} mun.</relativeTimePattern>
+					<relativeTimePattern count="other">ymhen {0} mun.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="zero">{0} mun. yn ôl</relativeTimePattern>
+					<relativeTimePattern count="one">{0} mun. yn ôl</relativeTimePattern>
+					<relativeTimePattern count="two">{0} fun. yn ôl</relativeTimePattern>
+					<relativeTimePattern count="few">{0} mun. yn ôl</relativeTimePattern>
+					<relativeTimePattern count="many">{0} mun. yn ôl</relativeTimePattern>
+					<relativeTimePattern count="other">{0} mun. yn ôl</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-narrow">
+				<displayName>mun.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="zero">ymhen {0} mun.</relativeTimePattern>
+					<relativeTimePattern count="one">ymhen {0} mun.</relativeTimePattern>
+					<relativeTimePattern count="two">ymhen {0} fun.</relativeTimePattern>
+					<relativeTimePattern count="few">ymhen {0} mun.</relativeTimePattern>
+					<relativeTimePattern count="many">ymhen {0} mun.</relativeTimePattern>
+					<relativeTimePattern count="other">ymhen {0} mun.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="zero">{0} mun. yn ôl</relativeTimePattern>
+					<relativeTimePattern count="one">{0} mun. yn ôl</relativeTimePattern>
+					<relativeTimePattern count="two">{0} fun. yn ôl</relativeTimePattern>
+					<relativeTimePattern count="few">{0} mun. yn ôl</relativeTimePattern>
+					<relativeTimePattern count="many">{0} mun. yn ôl</relativeTimePattern>
+					<relativeTimePattern count="other">{0} mun. yn ôl</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second">
+				<displayName>eiliad</displayName>
+				<relative type="0">nawr</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="zero">ymhen {0} eiliad</relativeTimePattern>
+					<relativeTimePattern count="one">ymhen eiliad</relativeTimePattern>
+					<relativeTimePattern count="two">ymhen {0} eiliad</relativeTimePattern>
+					<relativeTimePattern count="few">ymhen {0} eiliad</relativeTimePattern>
+					<relativeTimePattern count="many">ymhen {0} eiliad</relativeTimePattern>
+					<relativeTimePattern count="other">ymhen {0} eiliad</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="zero">{0} eiliad yn ôl</relativeTimePattern>
+					<relativeTimePattern count="one">eiliad yn ôl</relativeTimePattern>
+					<relativeTimePattern count="two">{0} eiliad yn ôl</relativeTimePattern>
+					<relativeTimePattern count="few">{0} eiliad yn ôl</relativeTimePattern>
+					<relativeTimePattern count="many">{0} eiliad yn ôl</relativeTimePattern>
+					<relativeTimePattern count="other">{0} eiliad yn ôl</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-short">
+				<displayName>eiliad</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="zero">ymhen {0} eiliad</relativeTimePattern>
+					<relativeTimePattern count="one">ymhen eiliad</relativeTimePattern>
+					<relativeTimePattern count="two">ymhen {0} eiliad</relativeTimePattern>
+					<relativeTimePattern count="few">ymhen {0} eiliad</relativeTimePattern>
+					<relativeTimePattern count="many">ymhen {0} eiliad</relativeTimePattern>
+					<relativeTimePattern count="other">ymhen {0} eiliad</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="zero">{0} eiliad yn ôl</relativeTimePattern>
+					<relativeTimePattern count="one">{0} eiliad yn ôl</relativeTimePattern>
+					<relativeTimePattern count="two">{0} eiliad yn ôl</relativeTimePattern>
+					<relativeTimePattern count="few">{0} eiliad yn ôl</relativeTimePattern>
+					<relativeTimePattern count="many">{0} eiliad yn ôl</relativeTimePattern>
+					<relativeTimePattern count="other">{0} eiliad yn ôl</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-narrow">
+				<displayName>eiliad</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="zero">ymhen {0} eiliad</relativeTimePattern>
+					<relativeTimePattern count="one">ymhen eiliad</relativeTimePattern>
+					<relativeTimePattern count="two">ymhen {0} eiliad</relativeTimePattern>
+					<relativeTimePattern count="few">ymhen {0} eiliad</relativeTimePattern>
+					<relativeTimePattern count="many">ymhen {0} eiliad</relativeTimePattern>
+					<relativeTimePattern count="other">ymhen {0} eiliad</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="zero">{0} eiliad yn ôl</relativeTimePattern>
+					<relativeTimePattern count="one">{0} eiliad yn ôl</relativeTimePattern>
+					<relativeTimePattern count="two">{0} eiliad yn ôl</relativeTimePattern>
+					<relativeTimePattern count="few">{0} eiliad yn ôl</relativeTimePattern>
+					<relativeTimePattern count="many">{0} eiliad yn ôl</relativeTimePattern>
+					<relativeTimePattern count="other">{0} eiliad yn ôl</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="zone">
+				<displayName>Cylchfa Amser</displayName>
+			</field>
+		</fields>
+		<timeZoneNames>
+			<hourFormat>+HH:mm;-HH:mm</hourFormat>
+			<gmtFormat>GMT{0}</gmtFormat>
+			<gmtZeroFormat>GMT</gmtZeroFormat>
+			<regionFormat>Amser {0}</regionFormat>
+			<regionFormat type="daylight">Amser Haf {0}</regionFormat>
+			<regionFormat type="standard">Amser Safonol {0}</regionFormat>
+			<fallbackFormat>{1} ({0})</fallbackFormat>
+			<zone type="Etc/Unknown">
+				<exemplarCity>Dinas Anhysbys</exemplarCity>
+			</zone>
+			<zone type="Europe/Andorra">
+				<exemplarCity>Andorra</exemplarCity>
+			</zone>
+			<zone type="Asia/Dubai">
+				<exemplarCity>Dubai</exemplarCity>
+			</zone>
+			<zone type="Asia/Kabul">
+				<exemplarCity>Kabul</exemplarCity>
+			</zone>
+			<zone type="America/Antigua">
+				<exemplarCity>Antigua</exemplarCity>
+			</zone>
+			<zone type="America/Anguilla">
+				<exemplarCity>Anguilla</exemplarCity>
+			</zone>
+			<zone type="Europe/Tirane">
+				<exemplarCity>Tirane</exemplarCity>
+			</zone>
+			<zone type="Asia/Yerevan">
+				<exemplarCity>Yerevan</exemplarCity>
+			</zone>
+			<zone type="Africa/Luanda">
+				<exemplarCity>Luanda</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Rothera">
+				<exemplarCity>Rothera</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Palmer">
+				<exemplarCity>Palmer</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Troll">
+				<exemplarCity>Troll</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Syowa">
+				<exemplarCity>Syowa</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Mawson">
+				<exemplarCity>Mawson</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Davis">
+				<exemplarCity>Davis</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Vostok">
+				<exemplarCity>Vostok</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Casey">
+				<exemplarCity>Casey</exemplarCity>
+			</zone>
+			<zone type="Antarctica/DumontDUrville">
+				<exemplarCity>Dumont d’Urville</exemplarCity>
+			</zone>
+			<zone type="Antarctica/McMurdo">
+				<exemplarCity>McMurdo</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Rio_Gallegos">
+				<exemplarCity>Rio Gallegos</exemplarCity>
+			</zone>
+			<zone type="America/Mendoza">
+				<exemplarCity>Mendoza</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/San_Juan">
+				<exemplarCity>San Juan</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Ushuaia">
+				<exemplarCity>Ushuaia</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/La_Rioja">
+				<exemplarCity>La Rioja</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/San_Luis">
+				<exemplarCity>San Luis</exemplarCity>
+			</zone>
+			<zone type="America/Catamarca">
+				<exemplarCity>Catamarca</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Salta">
+				<exemplarCity>Salta</exemplarCity>
+			</zone>
+			<zone type="America/Jujuy">
+				<exemplarCity>Jujuy</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Tucuman">
+				<exemplarCity>Tucumán</exemplarCity>
+			</zone>
+			<zone type="America/Cordoba">
+				<exemplarCity>Cordoba</exemplarCity>
+			</zone>
+			<zone type="America/Buenos_Aires">
+				<exemplarCity>Buenos Aires</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pago_Pago">
+				<exemplarCity>Pago Pago</exemplarCity>
+			</zone>
+			<zone type="Europe/Vienna">
+				<exemplarCity>Fienna</exemplarCity>
+			</zone>
+			<zone type="Australia/Perth">
+				<exemplarCity>Perth</exemplarCity>
+			</zone>
+			<zone type="Australia/Eucla">
+				<exemplarCity>Eucla</exemplarCity>
+			</zone>
+			<zone type="Australia/Darwin">
+				<exemplarCity>Darwin</exemplarCity>
+			</zone>
+			<zone type="Australia/Adelaide">
+				<exemplarCity>Adelaide</exemplarCity>
+			</zone>
+			<zone type="Australia/Broken_Hill">
+				<exemplarCity>Broken Hill</exemplarCity>
+			</zone>
+			<zone type="Australia/Currie">
+				<exemplarCity>Currie</exemplarCity>
+			</zone>
+			<zone type="Australia/Melbourne">
+				<exemplarCity>Melbourne</exemplarCity>
+			</zone>
+			<zone type="Australia/Hobart">
+				<exemplarCity>Hobart</exemplarCity>
+			</zone>
+			<zone type="Australia/Lindeman">
+				<exemplarCity>Lindeman</exemplarCity>
+			</zone>
+			<zone type="Australia/Sydney">
+				<exemplarCity>Sydney</exemplarCity>
+			</zone>
+			<zone type="Australia/Brisbane">
+				<exemplarCity>Brisbane</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Macquarie">
+				<exemplarCity>Macquarie</exemplarCity>
+			</zone>
+			<zone type="Australia/Lord_Howe">
+				<exemplarCity draft="provisional">Lord Howe</exemplarCity>
+			</zone>
+			<zone type="America/Aruba">
+				<exemplarCity>Aruba</exemplarCity>
+			</zone>
+			<zone type="Europe/Mariehamn">
+				<exemplarCity>Mariehamn</exemplarCity>
+			</zone>
+			<zone type="Asia/Baku">
+				<exemplarCity>Baku</exemplarCity>
+			</zone>
+			<zone type="Europe/Sarajevo">
+				<exemplarCity>Sarajevo</exemplarCity>
+			</zone>
+			<zone type="America/Barbados">
+				<exemplarCity>Barbados</exemplarCity>
+			</zone>
+			<zone type="Asia/Dhaka">
+				<exemplarCity>Dhaka</exemplarCity>
+			</zone>
+			<zone type="Europe/Brussels">
+				<exemplarCity>Brwsel</exemplarCity>
+			</zone>
+			<zone type="Africa/Ouagadougou">
+				<exemplarCity>Ouagadougou</exemplarCity>
+			</zone>
+			<zone type="Europe/Sofia">
+				<exemplarCity>Sofia</exemplarCity>
+			</zone>
+			<zone type="Asia/Bahrain">
+				<exemplarCity>Bahrain</exemplarCity>
+			</zone>
+			<zone type="Africa/Bujumbura">
+				<exemplarCity>Bujumbura</exemplarCity>
+			</zone>
+			<zone type="Africa/Porto-Novo">
+				<exemplarCity>Porto-Novo</exemplarCity>
+			</zone>
+			<zone type="America/St_Barthelemy">
+				<exemplarCity>St. Barthelemy</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Bermuda">
+				<exemplarCity>Bermuda</exemplarCity>
+			</zone>
+			<zone type="Asia/Brunei">
+				<exemplarCity>Brunei</exemplarCity>
+			</zone>
+			<zone type="America/La_Paz">
+				<exemplarCity>La Paz</exemplarCity>
+			</zone>
+			<zone type="America/Kralendijk">
+				<exemplarCity>Kralendijk</exemplarCity>
+			</zone>
+			<zone type="America/Eirunepe">
+				<exemplarCity>Eirunepé</exemplarCity>
+			</zone>
+			<zone type="America/Rio_Branco">
+				<exemplarCity>Rio Branco</exemplarCity>
+			</zone>
+			<zone type="America/Porto_Velho">
+				<exemplarCity>Porto Velho</exemplarCity>
+			</zone>
+			<zone type="America/Boa_Vista">
+				<exemplarCity>Boa Vista</exemplarCity>
+			</zone>
+			<zone type="America/Manaus">
+				<exemplarCity>Manaus</exemplarCity>
+			</zone>
+			<zone type="America/Cuiaba">
+				<exemplarCity>Cuiabá</exemplarCity>
+			</zone>
+			<zone type="America/Santarem">
+				<exemplarCity>Santarem</exemplarCity>
+			</zone>
+			<zone type="America/Campo_Grande">
+				<exemplarCity>Campo Grande</exemplarCity>
+			</zone>
+			<zone type="America/Belem">
+				<exemplarCity>Belém</exemplarCity>
+			</zone>
+			<zone type="America/Araguaina">
+				<exemplarCity>Araguaina</exemplarCity>
+			</zone>
+			<zone type="America/Sao_Paulo">
+				<exemplarCity>São Paulo</exemplarCity>
+			</zone>
+			<zone type="America/Bahia">
+				<exemplarCity>Bahia</exemplarCity>
+			</zone>
+			<zone type="America/Fortaleza">
+				<exemplarCity>Fortaleza</exemplarCity>
+			</zone>
+			<zone type="America/Maceio">
+				<exemplarCity>Maceió</exemplarCity>
+			</zone>
+			<zone type="America/Recife">
+				<exemplarCity>Recife</exemplarCity>
+			</zone>
+			<zone type="America/Noronha">
+				<exemplarCity>Noronha</exemplarCity>
+			</zone>
+			<zone type="America/Nassau">
+				<exemplarCity>Nassau</exemplarCity>
+			</zone>
+			<zone type="Asia/Thimphu">
+				<exemplarCity>Thimphu</exemplarCity>
+			</zone>
+			<zone type="Africa/Gaborone">
+				<exemplarCity>Gaborone</exemplarCity>
+			</zone>
+			<zone type="Europe/Minsk">
+				<exemplarCity>Minsk</exemplarCity>
+			</zone>
+			<zone type="America/Belize">
+				<exemplarCity>Belize</exemplarCity>
+			</zone>
+			<zone type="America/Dawson">
+				<exemplarCity>Dawson</exemplarCity>
+			</zone>
+			<zone type="America/Whitehorse">
+				<exemplarCity>Whitehorse</exemplarCity>
+			</zone>
+			<zone type="America/Inuvik">
+				<exemplarCity>Inuvik</exemplarCity>
+			</zone>
+			<zone type="America/Vancouver">
+				<exemplarCity>Vancouver</exemplarCity>
+			</zone>
+			<zone type="America/Dawson_Creek">
+				<exemplarCity>Dawson Creek</exemplarCity>
+			</zone>
+			<zone type="America/Creston">
+				<exemplarCity>Creston</exemplarCity>
+			</zone>
+			<zone type="America/Yellowknife">
+				<exemplarCity>Yellowknife</exemplarCity>
+			</zone>
+			<zone type="America/Edmonton">
+				<exemplarCity>Edmonton</exemplarCity>
+			</zone>
+			<zone type="America/Swift_Current">
+				<exemplarCity>Swift Current</exemplarCity>
+			</zone>
+			<zone type="America/Cambridge_Bay">
+				<exemplarCity>Cambridge Bay</exemplarCity>
+			</zone>
+			<zone type="America/Regina">
+				<exemplarCity>Regina</exemplarCity>
+			</zone>
+			<zone type="America/Winnipeg">
+				<exemplarCity>Winnipeg</exemplarCity>
+			</zone>
+			<zone type="America/Resolute">
+				<exemplarCity>Resolute</exemplarCity>
+			</zone>
+			<zone type="America/Rainy_River">
+				<exemplarCity>Rainy River</exemplarCity>
+			</zone>
+			<zone type="America/Rankin_Inlet">
+				<exemplarCity>Rankin Inlet</exemplarCity>
+			</zone>
+			<zone type="America/Coral_Harbour">
+				<exemplarCity>Atikokan</exemplarCity>
+			</zone>
+			<zone type="America/Thunder_Bay">
+				<exemplarCity>Thunder Bay</exemplarCity>
+			</zone>
+			<zone type="America/Nipigon">
+				<exemplarCity>Nipigon</exemplarCity>
+			</zone>
+			<zone type="America/Toronto">
+				<exemplarCity>Toronto</exemplarCity>
+			</zone>
+			<zone type="America/Iqaluit">
+				<exemplarCity>Iqaluit</exemplarCity>
+			</zone>
+			<zone type="America/Pangnirtung">
+				<exemplarCity>Pangnirtung</exemplarCity>
+			</zone>
+			<zone type="America/Moncton">
+				<exemplarCity>Moncton</exemplarCity>
+			</zone>
+			<zone type="America/Halifax">
+				<exemplarCity>Halifax</exemplarCity>
+			</zone>
+			<zone type="America/Goose_Bay">
+				<exemplarCity>Goose Bay</exemplarCity>
+			</zone>
+			<zone type="America/Glace_Bay">
+				<exemplarCity>Glace Bay</exemplarCity>
+			</zone>
+			<zone type="America/Blanc-Sablon">
+				<exemplarCity>Blanc-Sablon</exemplarCity>
+			</zone>
+			<zone type="America/St_Johns">
+				<exemplarCity>St. John’s</exemplarCity>
+			</zone>
+			<zone type="Indian/Cocos">
+				<exemplarCity>Cocos</exemplarCity>
+			</zone>
+			<zone type="Africa/Kinshasa">
+				<exemplarCity>Kinshasa</exemplarCity>
+			</zone>
+			<zone type="Africa/Lubumbashi">
+				<exemplarCity>Lubumbashi</exemplarCity>
+			</zone>
+			<zone type="Africa/Bangui">
+				<exemplarCity>Bangui</exemplarCity>
+			</zone>
+			<zone type="Africa/Brazzaville">
+				<exemplarCity>Brazzaville</exemplarCity>
+			</zone>
+			<zone type="Europe/Zurich">
+				<exemplarCity>Zurich</exemplarCity>
+			</zone>
+			<zone type="Africa/Abidjan">
+				<exemplarCity>Abidjan</exemplarCity>
+			</zone>
+			<zone type="Pacific/Rarotonga">
+				<exemplarCity>Rarotonga</exemplarCity>
+			</zone>
+			<zone type="Pacific/Easter">
+				<exemplarCity>Ynys y Pasg</exemplarCity>
+			</zone>
+			<zone type="America/Santiago">
+				<exemplarCity>Santiago</exemplarCity>
+			</zone>
+			<zone type="Africa/Douala">
+				<exemplarCity>Douala</exemplarCity>
+			</zone>
+			<zone type="Asia/Urumqi">
+				<exemplarCity>Urumqi</exemplarCity>
+			</zone>
+			<zone type="Asia/Shanghai">
+				<exemplarCity>Shanghai</exemplarCity>
+			</zone>
+			<zone type="America/Bogota">
+				<exemplarCity>Bogotá</exemplarCity>
+			</zone>
+			<zone type="America/Costa_Rica">
+				<exemplarCity>Costa Rica</exemplarCity>
+			</zone>
+			<zone type="America/Havana">
+				<exemplarCity>Havana</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Cape_Verde">
+				<exemplarCity>Cabo Verde</exemplarCity>
+			</zone>
+			<zone type="America/Curacao">
+				<exemplarCity>Curaçao</exemplarCity>
+			</zone>
+			<zone type="Indian/Christmas">
+				<exemplarCity>Ynys y Nadolig</exemplarCity>
+			</zone>
+			<zone type="Asia/Nicosia">
+				<exemplarCity>Nicosia</exemplarCity>
+			</zone>
+			<zone type="Europe/Prague">
+				<exemplarCity>Prag</exemplarCity>
+			</zone>
+			<zone type="Europe/Busingen">
+				<exemplarCity>Busingen</exemplarCity>
+			</zone>
+			<zone type="Europe/Berlin">
+				<exemplarCity>Berlin</exemplarCity>
+			</zone>
+			<zone type="Africa/Djibouti">
+				<exemplarCity>Djibouti</exemplarCity>
+			</zone>
+			<zone type="Europe/Copenhagen">
+				<exemplarCity>Copenhagen</exemplarCity>
+			</zone>
+			<zone type="America/Dominica">
+				<exemplarCity>Dominica</exemplarCity>
+			</zone>
+			<zone type="America/Santo_Domingo">
+				<exemplarCity>Santo Domingo</exemplarCity>
+			</zone>
+			<zone type="Africa/Algiers">
+				<exemplarCity>Alger</exemplarCity>
+			</zone>
+			<zone type="Pacific/Galapagos">
+				<exemplarCity>Galapagos</exemplarCity>
+			</zone>
+			<zone type="America/Guayaquil">
+				<exemplarCity>Guayaquil</exemplarCity>
+			</zone>
+			<zone type="Europe/Tallinn">
+				<exemplarCity>Tallinn</exemplarCity>
+			</zone>
+			<zone type="Africa/Cairo">
+				<exemplarCity>Cairo</exemplarCity>
+			</zone>
+			<zone type="Africa/El_Aaiun">
+				<exemplarCity>El Aaiún</exemplarCity>
+			</zone>
+			<zone type="Africa/Asmera">
+				<exemplarCity>Asmera</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Canary">
+				<exemplarCity>yr Ynysoedd Dedwydd</exemplarCity>
+			</zone>
+			<zone type="Africa/Ceuta">
+				<exemplarCity>Ceuta</exemplarCity>
+			</zone>
+			<zone type="Europe/Madrid">
+				<exemplarCity>Madrid</exemplarCity>
+			</zone>
+			<zone type="Africa/Addis_Ababa">
+				<exemplarCity>Addis Ababa</exemplarCity>
+			</zone>
+			<zone type="Europe/Helsinki">
+				<exemplarCity>Helsinki</exemplarCity>
+			</zone>
+			<zone type="Pacific/Fiji">
+				<exemplarCity>Fiji</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Stanley">
+				<exemplarCity>Stanley</exemplarCity>
+			</zone>
+			<zone type="Pacific/Truk">
+				<exemplarCity>Chuuk</exemplarCity>
+			</zone>
+			<zone type="Pacific/Ponape">
+				<exemplarCity>Pohnpei</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kosrae">
+				<exemplarCity>Kosrae</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Faeroe">
+				<exemplarCity>Ffaro</exemplarCity>
+			</zone>
+			<zone type="Europe/Paris">
+				<exemplarCity>Paris</exemplarCity>
+			</zone>
+			<zone type="Africa/Libreville">
+				<exemplarCity>Libreville</exemplarCity>
+			</zone>
+			<zone type="Europe/London">
+				<long>
+					<daylight>Amser Haf Prydain</daylight>
+				</long>
+				<exemplarCity>Llundain</exemplarCity>
+			</zone>
+			<zone type="America/Grenada">
+				<exemplarCity>Grenada</exemplarCity>
+			</zone>
+			<zone type="Asia/Tbilisi">
+				<exemplarCity>Tiflis</exemplarCity>
+			</zone>
+			<zone type="America/Cayenne">
+				<exemplarCity>Cayenne</exemplarCity>
+			</zone>
+			<zone type="Europe/Guernsey">
+				<exemplarCity>Ynys y Garn</exemplarCity>
+			</zone>
+			<zone type="Africa/Accra">
+				<exemplarCity>Accra</exemplarCity>
+			</zone>
+			<zone type="Europe/Gibraltar">
+				<exemplarCity>Gibraltar</exemplarCity>
+			</zone>
+			<zone type="America/Thule">
+				<exemplarCity>Thule</exemplarCity>
+			</zone>
+			<zone type="America/Godthab">
+				<exemplarCity>Nuuk</exemplarCity>
+			</zone>
+			<zone type="America/Scoresbysund">
+				<exemplarCity>Ittoqqortoormiit</exemplarCity>
+			</zone>
+			<zone type="America/Danmarkshavn">
+				<exemplarCity>Danmarkshavn</exemplarCity>
+			</zone>
+			<zone type="Africa/Banjul">
+				<exemplarCity>Banjul</exemplarCity>
+			</zone>
+			<zone type="Africa/Conakry">
+				<exemplarCity>Conakry</exemplarCity>
+			</zone>
+			<zone type="America/Guadeloupe">
+				<exemplarCity>Guadeloupe</exemplarCity>
+			</zone>
+			<zone type="Africa/Malabo">
+				<exemplarCity>Malabo</exemplarCity>
+			</zone>
+			<zone type="Europe/Athens">
+				<exemplarCity>Athen</exemplarCity>
+			</zone>
+			<zone type="Atlantic/South_Georgia">
+				<exemplarCity>De Georgia</exemplarCity>
+			</zone>
+			<zone type="America/Guatemala">
+				<exemplarCity>Guatemala</exemplarCity>
+			</zone>
+			<zone type="Pacific/Guam">
+				<exemplarCity>Guam</exemplarCity>
+			</zone>
+			<zone type="Africa/Bissau">
+				<exemplarCity>Bissau</exemplarCity>
+			</zone>
+			<zone type="America/Guyana">
+				<exemplarCity>Guyana</exemplarCity>
+			</zone>
+			<zone type="Asia/Hong_Kong">
+				<exemplarCity>Hong Kong</exemplarCity>
+			</zone>
+			<zone type="America/Tegucigalpa">
+				<exemplarCity>Tegucigalpa</exemplarCity>
+			</zone>
+			<zone type="Europe/Zagreb">
+				<exemplarCity>Zagreb</exemplarCity>
+			</zone>
+			<zone type="America/Port-au-Prince">
+				<exemplarCity>Port-au-Prince</exemplarCity>
+			</zone>
+			<zone type="Europe/Budapest">
+				<exemplarCity>Budapest</exemplarCity>
+			</zone>
+			<zone type="Asia/Jakarta">
+				<exemplarCity>Jakarta</exemplarCity>
+			</zone>
+			<zone type="Asia/Pontianak">
+				<exemplarCity>Pontianak</exemplarCity>
+			</zone>
+			<zone type="Asia/Makassar">
+				<exemplarCity>Makassar</exemplarCity>
+			</zone>
+			<zone type="Asia/Jayapura">
+				<exemplarCity>Jayapura</exemplarCity>
+			</zone>
+			<zone type="Europe/Dublin">
+				<long>
+					<daylight>Amser Haf Iwerddon</daylight>
+				</long>
+				<exemplarCity>Dulyn</exemplarCity>
+			</zone>
+			<zone type="Asia/Jerusalem">
+				<exemplarCity>Jerwsalem</exemplarCity>
+			</zone>
+			<zone type="Europe/Isle_of_Man">
+				<exemplarCity>Ynys Manaw</exemplarCity>
+			</zone>
+			<zone type="Asia/Calcutta">
+				<exemplarCity>Kolkata</exemplarCity>
+			</zone>
+			<zone type="Indian/Chagos">
+				<exemplarCity>Chagos</exemplarCity>
+			</zone>
+			<zone type="Asia/Baghdad">
+				<exemplarCity>Baghdad</exemplarCity>
+			</zone>
+			<zone type="Asia/Tehran">
+				<exemplarCity>Tehran</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Reykjavik">
+				<exemplarCity>Reykjavík</exemplarCity>
+			</zone>
+			<zone type="Europe/Rome">
+				<exemplarCity>Rhufain</exemplarCity>
+			</zone>
+			<zone type="Europe/Jersey">
+				<exemplarCity>Jersey</exemplarCity>
+			</zone>
+			<zone type="America/Jamaica">
+				<exemplarCity>Jamaica</exemplarCity>
+			</zone>
+			<zone type="Asia/Amman">
+				<exemplarCity>Amman</exemplarCity>
+			</zone>
+			<zone type="Asia/Tokyo">
+				<exemplarCity>Tokyo</exemplarCity>
+			</zone>
+			<zone type="Africa/Nairobi">
+				<exemplarCity>Nairobi</exemplarCity>
+			</zone>
+			<zone type="Asia/Bishkek">
+				<exemplarCity>Bishkek</exemplarCity>
+			</zone>
+			<zone type="Asia/Phnom_Penh">
+				<exemplarCity>Phnom Penh</exemplarCity>
+			</zone>
+			<zone type="Pacific/Enderbury">
+				<exemplarCity>Enderbury</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kiritimati">
+				<exemplarCity>Kiritimati</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tarawa">
+				<exemplarCity>Tarawa</exemplarCity>
+			</zone>
+			<zone type="Indian/Comoro">
+				<exemplarCity>Comoro</exemplarCity>
+			</zone>
+			<zone type="America/St_Kitts">
+				<exemplarCity>Saint Kitts</exemplarCity>
+			</zone>
+			<zone type="Asia/Pyongyang">
+				<exemplarCity>Pyongyang</exemplarCity>
+			</zone>
+			<zone type="Asia/Seoul">
+				<exemplarCity>Seoul</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuwait">
+				<exemplarCity>Kuwait</exemplarCity>
+			</zone>
+			<zone type="America/Cayman">
+				<exemplarCity>Cayman</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtau">
+				<exemplarCity>Aqtau</exemplarCity>
+			</zone>
+			<zone type="Asia/Oral">
+				<exemplarCity>Oral</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtobe">
+				<exemplarCity>Aqtobe</exemplarCity>
+			</zone>
+			<zone type="Asia/Qyzylorda">
+				<exemplarCity>Qyzylorda</exemplarCity>
+			</zone>
+			<zone type="Asia/Almaty">
+				<exemplarCity>Almaty</exemplarCity>
+			</zone>
+			<zone type="Asia/Vientiane">
+				<exemplarCity>Vientiane</exemplarCity>
+			</zone>
+			<zone type="Asia/Beirut">
+				<exemplarCity>Beirut</exemplarCity>
+			</zone>
+			<zone type="America/St_Lucia">
+				<exemplarCity>Saint Lucia</exemplarCity>
+			</zone>
+			<zone type="Europe/Vaduz">
+				<exemplarCity>Vaduz</exemplarCity>
+			</zone>
+			<zone type="Asia/Colombo">
+				<exemplarCity>Colombo</exemplarCity>
+			</zone>
+			<zone type="Africa/Monrovia">
+				<exemplarCity>Monrovia</exemplarCity>
+			</zone>
+			<zone type="Africa/Maseru">
+				<exemplarCity>Maseru</exemplarCity>
+			</zone>
+			<zone type="Europe/Vilnius">
+				<exemplarCity>Vilnius</exemplarCity>
+			</zone>
+			<zone type="Europe/Luxembourg">
+				<exemplarCity>Lwcsembwrg</exemplarCity>
+			</zone>
+			<zone type="Europe/Riga">
+				<exemplarCity>Riga</exemplarCity>
+			</zone>
+			<zone type="Africa/Tripoli">
+				<exemplarCity>Tripoli</exemplarCity>
+			</zone>
+			<zone type="Africa/Casablanca">
+				<exemplarCity>Casablanca</exemplarCity>
+			</zone>
+			<zone type="Europe/Monaco">
+				<exemplarCity>Monaco</exemplarCity>
+			</zone>
+			<zone type="Europe/Chisinau">
+				<exemplarCity>Chisinau</exemplarCity>
+			</zone>
+			<zone type="Europe/Podgorica">
+				<exemplarCity>Podgorica</exemplarCity>
+			</zone>
+			<zone type="America/Marigot">
+				<exemplarCity>Marigot</exemplarCity>
+			</zone>
+			<zone type="Indian/Antananarivo">
+				<exemplarCity>Antananarivo</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kwajalein">
+				<exemplarCity>Kwajalein</exemplarCity>
+			</zone>
+			<zone type="Pacific/Majuro">
+				<exemplarCity>Majuro</exemplarCity>
+			</zone>
+			<zone type="Europe/Skopje">
+				<exemplarCity>Skopje</exemplarCity>
+			</zone>
+			<zone type="Africa/Bamako">
+				<exemplarCity>Bamako</exemplarCity>
+			</zone>
+			<zone type="Asia/Rangoon">
+				<exemplarCity>Yangon</exemplarCity>
+			</zone>
+			<zone type="Asia/Hovd">
+				<exemplarCity>Hovd</exemplarCity>
+			</zone>
+			<zone type="Asia/Ulaanbaatar">
+				<exemplarCity>Ulan Bator</exemplarCity>
+			</zone>
+			<zone type="Asia/Choibalsan">
+				<exemplarCity>Choibalsan</exemplarCity>
+			</zone>
+			<zone type="Asia/Macau">
+				<exemplarCity>Macau</exemplarCity>
+			</zone>
+			<zone type="Pacific/Saipan">
+				<exemplarCity>Saipan</exemplarCity>
+			</zone>
+			<zone type="America/Martinique">
+				<exemplarCity>Martinique</exemplarCity>
+			</zone>
+			<zone type="Africa/Nouakchott">
+				<exemplarCity>Nouakchott</exemplarCity>
+			</zone>
+			<zone type="America/Montserrat">
+				<exemplarCity>Montserrat</exemplarCity>
+			</zone>
+			<zone type="Europe/Malta">
+				<exemplarCity>Malta</exemplarCity>
+			</zone>
+			<zone type="Indian/Mauritius">
+				<exemplarCity>Mauritius</exemplarCity>
+			</zone>
+			<zone type="Indian/Maldives">
+				<exemplarCity>Maldives</exemplarCity>
+			</zone>
+			<zone type="Africa/Blantyre">
+				<exemplarCity>Blantyre</exemplarCity>
+			</zone>
+			<zone type="America/Tijuana">
+				<exemplarCity>Tijuana</exemplarCity>
+			</zone>
+			<zone type="America/Santa_Isabel">
+				<exemplarCity>Santa Isabel</exemplarCity>
+			</zone>
+			<zone type="America/Hermosillo">
+				<exemplarCity>Hermosillo</exemplarCity>
+			</zone>
+			<zone type="America/Mazatlan">
+				<exemplarCity>Mazatlán</exemplarCity>
+			</zone>
+			<zone type="America/Chihuahua">
+				<exemplarCity>Chihuahua</exemplarCity>
+			</zone>
+			<zone type="America/Bahia_Banderas">
+				<exemplarCity>Bae Banderas</exemplarCity>
+			</zone>
+			<zone type="America/Ojinaga">
+				<exemplarCity>Ojinaga</exemplarCity>
+			</zone>
+			<zone type="America/Monterrey">
+				<exemplarCity>Monterrey</exemplarCity>
+			</zone>
+			<zone type="America/Mexico_City">
+				<exemplarCity>Dinas Mecsico</exemplarCity>
+			</zone>
+			<zone type="America/Matamoros">
+				<exemplarCity>Matamoros</exemplarCity>
+			</zone>
+			<zone type="America/Merida">
+				<exemplarCity>Merida</exemplarCity>
+			</zone>
+			<zone type="America/Cancun">
+				<exemplarCity>Cancún</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuala_Lumpur">
+				<exemplarCity>Kuala Lumpur</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuching">
+				<exemplarCity>Kuching</exemplarCity>
+			</zone>
+			<zone type="Africa/Maputo">
+				<exemplarCity>Maputo</exemplarCity>
+			</zone>
+			<zone type="Africa/Windhoek">
+				<exemplarCity>Windhoek</exemplarCity>
+			</zone>
+			<zone type="Pacific/Noumea">
+				<exemplarCity>Noumea</exemplarCity>
+			</zone>
+			<zone type="Africa/Niamey">
+				<exemplarCity>Niamey</exemplarCity>
+			</zone>
+			<zone type="Pacific/Norfolk">
+				<exemplarCity>Norfolk</exemplarCity>
+			</zone>
+			<zone type="Africa/Lagos">
+				<exemplarCity>Lagos</exemplarCity>
+			</zone>
+			<zone type="America/Managua">
+				<exemplarCity>Managua</exemplarCity>
+			</zone>
+			<zone type="Europe/Amsterdam">
+				<exemplarCity>Amsterdam</exemplarCity>
+			</zone>
+			<zone type="Europe/Oslo">
+				<exemplarCity>Oslo</exemplarCity>
+			</zone>
+			<zone type="Asia/Katmandu">
+				<exemplarCity>Kathmandu</exemplarCity>
+			</zone>
+			<zone type="Pacific/Nauru">
+				<exemplarCity>Nauru</exemplarCity>
+			</zone>
+			<zone type="Pacific/Niue">
+				<exemplarCity>Niue</exemplarCity>
+			</zone>
+			<zone type="Pacific/Chatham">
+				<exemplarCity>Chatham</exemplarCity>
+			</zone>
+			<zone type="Pacific/Auckland">
+				<exemplarCity>Auckland</exemplarCity>
+			</zone>
+			<zone type="Asia/Muscat">
+				<exemplarCity>Muscat</exemplarCity>
+			</zone>
+			<zone type="America/Panama">
+				<exemplarCity>Panamá</exemplarCity>
+			</zone>
+			<zone type="America/Lima">
+				<exemplarCity>Lima</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tahiti">
+				<exemplarCity>Tahiti</exemplarCity>
+			</zone>
+			<zone type="Pacific/Marquesas">
+				<exemplarCity>Marquesas</exemplarCity>
+			</zone>
+			<zone type="Pacific/Gambier">
+				<exemplarCity>Gambier</exemplarCity>
+			</zone>
+			<zone type="Pacific/Port_Moresby">
+				<exemplarCity>Port Moresby</exemplarCity>
+			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bougainville</exemplarCity>
+			</zone>
+			<zone type="Asia/Manila">
+				<exemplarCity>Manila</exemplarCity>
+			</zone>
+			<zone type="Asia/Karachi">
+				<exemplarCity>Karachi</exemplarCity>
+			</zone>
+			<zone type="Europe/Warsaw">
+				<exemplarCity>Warsaw</exemplarCity>
+			</zone>
+			<zone type="America/Miquelon">
+				<exemplarCity>Miquelon</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pitcairn">
+				<exemplarCity>Pitcairn</exemplarCity>
+			</zone>
+			<zone type="America/Puerto_Rico">
+				<exemplarCity>Puerto Rico</exemplarCity>
+			</zone>
+			<zone type="Asia/Gaza">
+				<exemplarCity>Gasa</exemplarCity>
+			</zone>
+			<zone type="Asia/Hebron">
+				<exemplarCity>Hebron</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Azores">
+				<exemplarCity>Azores</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Madeira">
+				<exemplarCity>Madeira</exemplarCity>
+			</zone>
+			<zone type="Europe/Lisbon">
+				<exemplarCity>Lisbon</exemplarCity>
+			</zone>
+			<zone type="Pacific/Palau">
+				<exemplarCity>Palau</exemplarCity>
+			</zone>
+			<zone type="America/Asuncion">
+				<exemplarCity>Asunción</exemplarCity>
+			</zone>
+			<zone type="Asia/Qatar">
+				<exemplarCity>Qatar</exemplarCity>
+			</zone>
+			<zone type="Indian/Reunion">
+				<exemplarCity>Réunion</exemplarCity>
+			</zone>
+			<zone type="Europe/Bucharest">
+				<exemplarCity>Bwcarést</exemplarCity>
+			</zone>
+			<zone type="Europe/Belgrade">
+				<exemplarCity>Beograd</exemplarCity>
+			</zone>
+			<zone type="Europe/Kaliningrad">
+				<exemplarCity>Kaliningrad</exemplarCity>
+			</zone>
+			<zone type="Europe/Simferopol">
+				<exemplarCity>Simferopol</exemplarCity>
+			</zone>
+			<zone type="Europe/Moscow">
+				<exemplarCity>Moscfa</exemplarCity>
+			</zone>
+			<zone type="Europe/Volgograd">
+				<exemplarCity>Volgograd</exemplarCity>
+			</zone>
+			<zone type="Europe/Samara">
+				<exemplarCity>Samara</exemplarCity>
+			</zone>
+			<zone type="Asia/Yekaterinburg">
+				<exemplarCity>Yekaterinburg</exemplarCity>
+			</zone>
+			<zone type="Asia/Omsk">
+				<exemplarCity>Omsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Novosibirsk">
+				<exemplarCity>Novosibirsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Novokuznetsk">
+				<exemplarCity>Novokuznetsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Krasnoyarsk">
+				<exemplarCity>Krasnoyarsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Irkutsk">
+				<exemplarCity>Irkutsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Chita</exemplarCity>
+			</zone>
+			<zone type="Asia/Yakutsk">
+				<exemplarCity>Yakutsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Vladivostok">
+				<exemplarCity>Vladivostok</exemplarCity>
+			</zone>
+			<zone type="Asia/Khandyga">
+				<exemplarCity>Khandyga</exemplarCity>
+			</zone>
+			<zone type="Asia/Sakhalin">
+				<exemplarCity>Sakhalin</exemplarCity>
+			</zone>
+			<zone type="Asia/Ust-Nera">
+				<exemplarCity>Ust-Nera</exemplarCity>
+			</zone>
+			<zone type="Asia/Magadan">
+				<exemplarCity>Magadan</exemplarCity>
+			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolymsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Kamchatka">
+				<exemplarCity>Kamchatka</exemplarCity>
+			</zone>
+			<zone type="Asia/Anadyr">
+				<exemplarCity>Anadyr</exemplarCity>
+			</zone>
+			<zone type="Africa/Kigali">
+				<exemplarCity>Kigali</exemplarCity>
+			</zone>
+			<zone type="Asia/Riyadh">
+				<exemplarCity>Riyadh</exemplarCity>
+			</zone>
+			<zone type="Pacific/Guadalcanal">
+				<exemplarCity>Guadalcanal</exemplarCity>
+			</zone>
+			<zone type="Indian/Mahe">
+				<exemplarCity>Mahé</exemplarCity>
+			</zone>
+			<zone type="Africa/Khartoum">
+				<exemplarCity>Khartoum</exemplarCity>
+			</zone>
+			<zone type="Europe/Stockholm">
+				<exemplarCity>Stockholm</exemplarCity>
+			</zone>
+			<zone type="Asia/Singapore">
+				<exemplarCity>Singapore</exemplarCity>
+			</zone>
+			<zone type="Atlantic/St_Helena">
+				<exemplarCity>Saint Helena</exemplarCity>
+			</zone>
+			<zone type="Europe/Ljubljana">
+				<exemplarCity>Ljubljana</exemplarCity>
+			</zone>
+			<zone type="Arctic/Longyearbyen">
+				<exemplarCity>Longyearbyen</exemplarCity>
+			</zone>
+			<zone type="Europe/Bratislava">
+				<exemplarCity>Bratislava</exemplarCity>
+			</zone>
+			<zone type="Africa/Freetown">
+				<exemplarCity>Freetown</exemplarCity>
+			</zone>
+			<zone type="Europe/San_Marino">
+				<exemplarCity>San Marino</exemplarCity>
+			</zone>
+			<zone type="Africa/Dakar">
+				<exemplarCity>Dakar</exemplarCity>
+			</zone>
+			<zone type="Africa/Mogadishu">
+				<exemplarCity>Mogadishu</exemplarCity>
+			</zone>
+			<zone type="America/Paramaribo">
+				<exemplarCity>Paramaribo</exemplarCity>
+			</zone>
+			<zone type="Africa/Juba">
+				<exemplarCity>Juba</exemplarCity>
+			</zone>
+			<zone type="Africa/Sao_Tome">
+				<exemplarCity>São Tomé</exemplarCity>
+			</zone>
+			<zone type="America/El_Salvador">
+				<exemplarCity>El Salvador</exemplarCity>
+			</zone>
+			<zone type="America/Lower_Princes">
+				<exemplarCity>Lower Prince’s Quarter</exemplarCity>
+			</zone>
+			<zone type="Asia/Damascus">
+				<exemplarCity>Damascus</exemplarCity>
+			</zone>
+			<zone type="Africa/Mbabane">
+				<exemplarCity>Mbabane</exemplarCity>
+			</zone>
+			<zone type="America/Grand_Turk">
+				<exemplarCity>Grand Turk</exemplarCity>
+			</zone>
+			<zone type="Africa/Ndjamena">
+				<exemplarCity>N’Djamena</exemplarCity>
+			</zone>
+			<zone type="Indian/Kerguelen">
+				<exemplarCity>Kerguelen</exemplarCity>
+			</zone>
+			<zone type="Africa/Lome">
+				<exemplarCity>Lomé</exemplarCity>
+			</zone>
+			<zone type="Asia/Bangkok">
+				<exemplarCity>Bangkok</exemplarCity>
+			</zone>
+			<zone type="Asia/Dushanbe">
+				<exemplarCity>Dushanbe</exemplarCity>
+			</zone>
+			<zone type="Pacific/Fakaofo">
+				<exemplarCity>Fakaofo</exemplarCity>
+			</zone>
+			<zone type="Asia/Dili">
+				<exemplarCity>Dili</exemplarCity>
+			</zone>
+			<zone type="Asia/Ashgabat">
+				<exemplarCity>Ashgabat</exemplarCity>
+			</zone>
+			<zone type="Africa/Tunis">
+				<exemplarCity>Tunis</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tongatapu">
+				<exemplarCity>Tongatapu</exemplarCity>
+			</zone>
+			<zone type="Europe/Istanbul">
+				<exemplarCity>Caergystennin</exemplarCity>
+			</zone>
+			<zone type="America/Port_of_Spain">
+				<exemplarCity>Port of Spain</exemplarCity>
+			</zone>
+			<zone type="Pacific/Funafuti">
+				<exemplarCity>Funafuti</exemplarCity>
+			</zone>
+			<zone type="Asia/Taipei">
+				<exemplarCity>Taipei</exemplarCity>
+			</zone>
+			<zone type="Africa/Dar_es_Salaam">
+				<exemplarCity>Dar es Salaam</exemplarCity>
+			</zone>
+			<zone type="Europe/Uzhgorod">
+				<exemplarCity>Uzhhorod</exemplarCity>
+			</zone>
+			<zone type="Europe/Kiev">
+				<exemplarCity>Kiev</exemplarCity>
+			</zone>
+			<zone type="Europe/Zaporozhye">
+				<exemplarCity>Zaporizhzhya</exemplarCity>
+			</zone>
+			<zone type="Africa/Kampala">
+				<exemplarCity>Kampala</exemplarCity>
+			</zone>
+			<zone type="Pacific/Midway">
+				<exemplarCity>Midway</exemplarCity>
+			</zone>
+			<zone type="Pacific/Johnston">
+				<exemplarCity>Johnston</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wake">
+				<exemplarCity>Wake</exemplarCity>
+			</zone>
+			<zone type="America/Adak">
+				<exemplarCity>Adak</exemplarCity>
+			</zone>
+			<zone type="America/Nome">
+				<exemplarCity>Nome</exemplarCity>
+			</zone>
+			<zone type="Pacific/Honolulu">
+				<exemplarCity>Honolulu</exemplarCity>
+			</zone>
+			<zone type="America/Anchorage">
+				<exemplarCity>Anchorage</exemplarCity>
+			</zone>
+			<zone type="America/Yakutat">
+				<exemplarCity>Yakutat</exemplarCity>
+			</zone>
+			<zone type="America/Sitka">
+				<exemplarCity>Sitka</exemplarCity>
+			</zone>
+			<zone type="America/Juneau">
+				<exemplarCity>Juneau</exemplarCity>
+			</zone>
+			<zone type="America/Metlakatla">
+				<exemplarCity>Metlakatla</exemplarCity>
+			</zone>
+			<zone type="America/Los_Angeles">
+				<exemplarCity>Los Angeles</exemplarCity>
+			</zone>
+			<zone type="America/Boise">
+				<exemplarCity>Boise</exemplarCity>
+			</zone>
+			<zone type="America/Phoenix">
+				<exemplarCity>Phoenix</exemplarCity>
+			</zone>
+			<zone type="America/Denver">
+				<exemplarCity>Denver</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Beulah">
+				<exemplarCity>Beulah, Gogledd Dakota</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/New_Salem">
+				<exemplarCity>New Salem, Gogledd Dakota</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Center">
+				<exemplarCity>Center, Gogledd Dakota</exemplarCity>
+			</zone>
+			<zone type="America/Chicago">
+				<exemplarCity>Chicago</exemplarCity>
+			</zone>
+			<zone type="America/Menominee">
+				<exemplarCity>Menominee</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Vincennes">
+				<exemplarCity>Vincennes, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Petersburg">
+				<exemplarCity>Petersburg, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Tell_City">
+				<exemplarCity>Dinas Tell, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Knox">
+				<exemplarCity>Knox, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Winamac">
+				<exemplarCity>Winamac, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Marengo">
+				<exemplarCity>Marengo, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indianapolis">
+				<exemplarCity>Indianapolis</exemplarCity>
+			</zone>
+			<zone type="America/Louisville">
+				<exemplarCity>Louisville</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Vevay">
+				<exemplarCity>Vevay, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Kentucky/Monticello">
+				<exemplarCity>Monticello, Kentucky</exemplarCity>
+			</zone>
+			<zone type="America/Detroit">
+				<exemplarCity>Detroit</exemplarCity>
+			</zone>
+			<zone type="America/New_York">
+				<exemplarCity>Efrog Newydd</exemplarCity>
+			</zone>
+			<zone type="America/Montevideo">
+				<exemplarCity>Montevideo</exemplarCity>
+			</zone>
+			<zone type="Asia/Samarkand">
+				<exemplarCity>Samarkand</exemplarCity>
+			</zone>
+			<zone type="Asia/Tashkent">
+				<exemplarCity>Tashkent</exemplarCity>
+			</zone>
+			<zone type="Europe/Vatican">
+				<exemplarCity>y Fatican</exemplarCity>
+			</zone>
+			<zone type="America/St_Vincent">
+				<exemplarCity>Saint Vincent</exemplarCity>
+			</zone>
+			<zone type="America/Caracas">
+				<exemplarCity>Caracas</exemplarCity>
+			</zone>
+			<zone type="America/Tortola">
+				<exemplarCity>Tortola</exemplarCity>
+			</zone>
+			<zone type="America/St_Thomas">
+				<exemplarCity>Saint Thomas</exemplarCity>
+			</zone>
+			<zone type="Asia/Saigon">
+				<exemplarCity>Dinas Hô Chi Minh</exemplarCity>
+			</zone>
+			<zone type="Pacific/Efate">
+				<exemplarCity>Efate</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wallis">
+				<exemplarCity>Wallis</exemplarCity>
+			</zone>
+			<zone type="Pacific/Apia">
+				<exemplarCity>Apia</exemplarCity>
+			</zone>
+			<zone type="Asia/Aden">
+				<exemplarCity>Aden</exemplarCity>
+			</zone>
+			<zone type="Indian/Mayotte">
+				<exemplarCity>Mayotte</exemplarCity>
+			</zone>
+			<zone type="Africa/Johannesburg">
+				<exemplarCity>Johannesburg</exemplarCity>
+			</zone>
+			<zone type="Africa/Lusaka">
+				<exemplarCity>Lusaka</exemplarCity>
+			</zone>
+			<zone type="Africa/Harare">
+				<exemplarCity>Harare</exemplarCity>
+			</zone>
+			<metazone type="Afghanistan">
+				<long>
+					<standard>Amser Afghanistan</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Central">
+				<long>
+					<standard>Amser Canolbarth Affrica</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Eastern">
+				<long>
+					<standard>Amser Dwyrain Affrica</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Southern">
+				<long>
+					<standard>Amser Safonol De Affrica</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Western">
+				<long>
+					<generic>Amser Gorllewin Affrica</generic>
+					<standard>Amser Safonol Gorllewin Affrica</standard>
+					<daylight>Amser Haf Gorllewin Affrica</daylight>
+				</long>
+			</metazone>
+			<metazone type="Alaska">
+				<long>
+					<generic>Amser Alaska</generic>
+					<standard>Amser Safonol Alaska</standard>
+					<daylight>Amser Haf Alaska</daylight>
+				</long>
+			</metazone>
+			<metazone type="Amazon">
+				<long>
+					<generic>Amser Amazonas</generic>
+					<standard>Amser Safonol Amazonas</standard>
+					<daylight>Amser Haf Amazonas</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Central">
+				<long>
+					<generic>Amser Canolbarth Gogledd America</generic>
+					<standard>Amser Safonol Canolbarth Gogledd America</standard>
+					<daylight>Amser Haf Canolbarth Gogledd America</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Eastern">
+				<long>
+					<generic>Amser Dwyrain Gogledd America</generic>
+					<standard>Amser Safonol Dwyrain Gogledd America</standard>
+					<daylight>Amser Haf Dwyrain Gogledd America</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Mountain">
+				<long>
+					<generic>Amser Mynyddoedd Gogledd America</generic>
+					<standard>Amser Safonol Mynyddoedd Gogledd America</standard>
+					<daylight>Amser Haf Mynyddoedd Gogledd America</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Pacific">
+				<long>
+					<generic>Amser Cefnfor Tawel Gogledd America</generic>
+					<standard>Amser Safonol Cefnfor Tawel Gogledd America</standard>
+					<daylight>Amser Haf Cefnfor Tawel Gogledd America</daylight>
+				</long>
+			</metazone>
+			<metazone type="Apia">
+				<long>
+					<generic>Amser Apia</generic>
+					<standard>Amser Safonol Apia</standard>
+					<daylight>Amser Haf Apia</daylight>
+				</long>
+			</metazone>
+			<metazone type="Arabian">
+				<long>
+					<generic>Amser Arabaidd</generic>
+					<standard>Amser Safonol Arabaidd</standard>
+					<daylight>Amser Haf Arabaidd</daylight>
+				</long>
+			</metazone>
+			<metazone type="Argentina">
+				<long>
+					<generic>Amser yr Ariannin</generic>
+					<standard>Amser Safonol Ariannin</standard>
+					<daylight>Amser Haf Ariannin</daylight>
+				</long>
+			</metazone>
+			<metazone type="Argentina_Western">
+				<long>
+					<generic>Amser Gorllewin Ariannin</generic>
+					<standard>Amser Safonol Gorllewin Ariannin</standard>
+					<daylight>Amser Haf Gorllewin Ariannin</daylight>
+				</long>
+			</metazone>
+			<metazone type="Armenia">
+				<long>
+					<generic>Amser Armenia</generic>
+					<standard>Amser Safonol Armenia</standard>
+					<daylight>Amser Haf Armenia</daylight>
+				</long>
+			</metazone>
+			<metazone type="Atlantic">
+				<long>
+					<generic>Amser Cefnfor yr Iwerydd</generic>
+					<standard>Amser Safonol Cefnfor yr Iwerydd</standard>
+					<daylight>Amser Haf Cefnfor yr Iwerydd</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Central">
+				<long>
+					<generic>Amser Canolbarth Awstralia</generic>
+					<standard>Amser Safonol Canolbarth Awstralia</standard>
+					<daylight>Amser Haf Canolbarth Awstralia</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_CentralWestern">
+				<long>
+					<generic>Amser Canolbarth Gorllewin Awstralia</generic>
+					<standard>Amser Safonol Canolbarth Gorllewin Awstralia</standard>
+					<daylight>Amser Haf Canolbarth Gorllewin Awstralia</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Eastern">
+				<long>
+					<generic>Amser Dwyrain Awstralia</generic>
+					<standard>Amser Safonol Dwyrain Awstralia</standard>
+					<daylight>Amser Haf Dwyrain Awstralia</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Western">
+				<long>
+					<generic>Amser Gorllewin Awstralia</generic>
+					<standard>Amser Safonol Gorllewin Awstralia</standard>
+					<daylight>Amser Haf Gorllewin Awstralia</daylight>
+				</long>
+			</metazone>
+			<metazone type="Azerbaijan">
+				<long>
+					<generic>Amser Aserbaijan</generic>
+					<standard>Amser Safonol Aserbaijan</standard>
+					<daylight>Amser Haf Aserbaijan</daylight>
+				</long>
+			</metazone>
+			<metazone type="Azores">
+				<long>
+					<generic>Amser yr Azores</generic>
+					<standard>Amser Safonol yr Azores</standard>
+					<daylight>Amser Haf yr Azores</daylight>
+				</long>
+			</metazone>
+			<metazone type="Bangladesh">
+				<long>
+					<generic>Amser Bangladesh</generic>
+					<standard>Amser Safonol Bangladesh</standard>
+					<daylight>Amser Haf Bangladesh</daylight>
+				</long>
+			</metazone>
+			<metazone type="Bhutan">
+				<long>
+					<standard>Amser Bhutan</standard>
+				</long>
+			</metazone>
+			<metazone type="Bolivia">
+				<long>
+					<standard>Amser Bolivia</standard>
+				</long>
+			</metazone>
+			<metazone type="Brasilia">
+				<long>
+					<generic>Amser Brasília</generic>
+					<standard>Amser Safonol Brasília</standard>
+					<daylight>Amser Haf Brasília</daylight>
+				</long>
+			</metazone>
+			<metazone type="Brunei">
+				<long>
+					<standard>Amser Brunei Darussalam</standard>
+				</long>
+			</metazone>
+			<metazone type="Cape_Verde">
+				<long>
+					<generic>Amser Cabo Verde</generic>
+					<standard>Amser Safonol Cabo Verde</standard>
+					<daylight>Amser Haf Cabo Verde</daylight>
+				</long>
+			</metazone>
+			<metazone type="Chamorro">
+				<long>
+					<standard>Amser Chamorro</standard>
+				</long>
+			</metazone>
+			<metazone type="Chatham">
+				<long>
+					<generic>Amser Chatham</generic>
+					<standard>Amser Safonol Chatham</standard>
+					<daylight>Amser Haf Chatham</daylight>
+				</long>
+			</metazone>
+			<metazone type="Chile">
+				<long>
+					<generic>Amser Chile</generic>
+					<standard>Amser Safonol Chile</standard>
+					<daylight>Amser Haf Chile</daylight>
+				</long>
+			</metazone>
+			<metazone type="China">
+				<long>
+					<generic>Amser Tsieina</generic>
+					<standard>Amser Safonol Tsieina</standard>
+					<daylight>Amser Haf Tsieina</daylight>
+				</long>
+			</metazone>
+			<metazone type="Choibalsan">
+				<long>
+					<generic>Amser Choibalsan</generic>
+					<standard>Amser Safonol Choibalsan</standard>
+					<daylight>Amser Haf Choibalsan</daylight>
+				</long>
+			</metazone>
+			<metazone type="Christmas">
+				<long>
+					<standard>Amser Ynys Y Nadolig</standard>
+				</long>
+			</metazone>
+			<metazone type="Cocos">
+				<long>
+					<standard>Amser Ynysoedd Cocos</standard>
+				</long>
+			</metazone>
+			<metazone type="Colombia">
+				<long>
+					<generic>Amser Colombia</generic>
+					<standard>Amser Safonol Colombia</standard>
+					<daylight>Amser Haf Colombia</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cook">
+				<long>
+					<generic>Amser Ynysoedd Cook</generic>
+					<standard>Amser Safonol Ynysoedd Cook</standard>
+					<daylight>Amser Hanner Haf Ynysoedd Cook</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cuba">
+				<long>
+					<generic>Amser Cuba</generic>
+					<standard>Amser Safonol Cuba</standard>
+					<daylight>Amser Haf Cuba</daylight>
+				</long>
+			</metazone>
+			<metazone type="Davis">
+				<long>
+					<standard>Amser Davis</standard>
+				</long>
+			</metazone>
+			<metazone type="DumontDUrville">
+				<long>
+					<standard>Amser Dumont-d’Urville</standard>
+				</long>
+			</metazone>
+			<metazone type="East_Timor">
+				<long>
+					<standard>Amser Dwyrain Timor</standard>
+				</long>
+			</metazone>
+			<metazone type="Easter">
+				<long>
+					<generic>Amser Ynys y Pasg</generic>
+					<standard>Amser Safonol Ynys y Pasg</standard>
+					<daylight>Amser Haf Ynys y Pasg</daylight>
+				</long>
+			</metazone>
+			<metazone type="Ecuador">
+				<long>
+					<standard>Amser Ecuador</standard>
+				</long>
+			</metazone>
+			<metazone type="Europe_Central">
+				<long>
+					<generic>Amser Canolbarth Ewrop</generic>
+					<standard>Amser Safonol Canolbarth Ewrop</standard>
+					<daylight>Amser Haf Canolbarth Ewrop</daylight>
+				</long>
+				<short>
+					<generic>CET</generic>
+					<standard>CET</standard>
+					<daylight>CEST</daylight>
+				</short>
+			</metazone>
+			<metazone type="Europe_Eastern">
+				<long>
+					<generic>Amser Dwyrain Ewrop</generic>
+					<standard>Amser Safonol Dwyrain Ewrop</standard>
+					<daylight>Amser Haf Dwyrain Ewrop</daylight>
+				</long>
+				<short>
+					<generic>EET</generic>
+					<standard>EET</standard>
+					<daylight>EEST</daylight>
+				</short>
+			</metazone>
+			<metazone type="Europe_Further_Eastern">
+				<long>
+					<standard>Amser Dwyrain Pell Ewrop</standard>
+				</long>
+			</metazone>
+			<metazone type="Europe_Western">
+				<long>
+					<generic>Amser Gorllewin Ewrop</generic>
+					<standard>Amser Safonol Gorllewin Ewrop</standard>
+					<daylight>Amser Haf Gorllewin Ewrop</daylight>
+				</long>
+				<short>
+					<generic>WET</generic>
+					<standard>WET</standard>
+					<daylight>WEST</daylight>
+				</short>
+			</metazone>
+			<metazone type="Falkland">
+				<long>
+					<generic>Amser Ynysoedd Falklands/Malvinas</generic>
+					<standard>Amser Safonol Ynysoedd Falklands/Malvinas</standard>
+					<daylight>Amser Haf Ynysoedd Falklands/Malvinas</daylight>
+				</long>
+			</metazone>
+			<metazone type="Fiji">
+				<long>
+					<generic>Amser Fiji</generic>
+					<standard>Amser Safonol Fiji</standard>
+					<daylight>Amser Haf Fiji</daylight>
+				</long>
+			</metazone>
+			<metazone type="French_Guiana">
+				<long>
+					<standard>Amser Guyane Ffrengig</standard>
+				</long>
+			</metazone>
+			<metazone type="French_Southern">
+				<long>
+					<standard>Amser Deheuol ac Antarctig Frengig</standard>
+				</long>
+			</metazone>
+			<metazone type="Galapagos">
+				<long>
+					<standard>Amser Galapagos</standard>
+				</long>
+			</metazone>
+			<metazone type="Gambier">
+				<long>
+					<standard>Amser Gambier</standard>
+				</long>
+			</metazone>
+			<metazone type="Georgia">
+				<long>
+					<generic>Amser Georgia</generic>
+					<standard>Amser Safonol Georgia</standard>
+					<daylight>Amser Haf Georgia</daylight>
+				</long>
+			</metazone>
+			<metazone type="Gilbert_Islands">
+				<long>
+					<standard>Amser Ynysoedd Gilbert</standard>
+				</long>
+			</metazone>
+			<metazone type="GMT">
+				<long>
+					<standard>Amser Safonol Greenwich</standard>
+				</long>
+				<short>
+					<standard>GMT</standard>
+				</short>
+			</metazone>
+			<metazone type="Greenland_Eastern">
+				<long>
+					<generic>Amser Dwyrain yr Ynys Las</generic>
+					<standard>Amser Safonol Dwyrain yr Ynys Las</standard>
+					<daylight>Amser Haf Dwyrain yr Ynys Las</daylight>
+				</long>
+			</metazone>
+			<metazone type="Greenland_Western">
+				<long>
+					<generic>Amser Gorllewin yr Ynys Las</generic>
+					<standard>Amser Safonol Gorllewin yr Ynys Las</standard>
+					<daylight>Amser Haf Gorllewin yr Ynys Las</daylight>
+				</long>
+			</metazone>
+			<metazone type="Gulf">
+				<long>
+					<standard>Amser Safonol y Gwlff</standard>
+				</long>
+			</metazone>
+			<metazone type="Guyana">
+				<long>
+					<standard>Amser Guyana</standard>
+				</long>
+			</metazone>
+			<metazone type="Hawaii_Aleutian">
+				<long>
+					<generic>Amser Hawaii-Aleutian</generic>
+					<standard>Amser Safonol Hawaii-Aleutian</standard>
+					<daylight>Amser Haf Hawaii-Aleutian</daylight>
+				</long>
+			</metazone>
+			<metazone type="Hong_Kong">
+				<long>
+					<generic>Amser Hong Kong</generic>
+					<standard>Amser Safonol Hong Kong</standard>
+					<daylight>Amser Haf Hong Kong</daylight>
+				</long>
+			</metazone>
+			<metazone type="Hovd">
+				<long>
+					<generic>Amser Hovd</generic>
+					<standard>Amser Safonol Hovd</standard>
+					<daylight>Amser Haf Hovd</daylight>
+				</long>
+			</metazone>
+			<metazone type="India">
+				<long>
+					<standard>Amser India</standard>
+				</long>
+			</metazone>
+			<metazone type="Indian_Ocean">
+				<long>
+					<standard>Amser Cefnfor India</standard>
+				</long>
+			</metazone>
+			<metazone type="Indochina">
+				<long>
+					<standard>Amser Indo-Tsieina</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Central">
+				<long>
+					<standard>Amser Canolbarth Indonesia</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Eastern">
+				<long>
+					<standard>Amser Dwyrain Indonesia</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Western">
+				<long>
+					<standard>Amser Gorllewin Indonesia</standard>
+				</long>
+			</metazone>
+			<metazone type="Iran">
+				<long>
+					<generic>Amser Iran</generic>
+					<standard>Amser Safonol Iran</standard>
+					<daylight>Amser Haf Iran</daylight>
+				</long>
+			</metazone>
+			<metazone type="Irkutsk">
+				<long>
+					<generic>Amser Irkutsk</generic>
+					<standard>Amser Safonol Irkutsk</standard>
+					<daylight>Amser Haf Irkutsk</daylight>
+				</long>
+			</metazone>
+			<metazone type="Israel">
+				<long>
+					<generic>Amser Israel</generic>
+					<standard>Amser Safonol Israel</standard>
+					<daylight>Amser Haf Israel</daylight>
+				</long>
+			</metazone>
+			<metazone type="Japan">
+				<long>
+					<generic>Amser Siapan</generic>
+					<standard>Amser Safonol Siapan</standard>
+					<daylight>Amser Haf Siapan</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Eastern">
+				<long>
+					<standard>Amser Dwyrain Casachstan</standard>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Western">
+				<long>
+					<standard>Amser Gorllewin Casachstan</standard>
+				</long>
+			</metazone>
+			<metazone type="Korea">
+				<long>
+					<generic>Amser Corea</generic>
+					<standard>Amser Safonol Corea</standard>
+					<daylight>Amser Haf Corea</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kosrae">
+				<long>
+					<standard>Amser Kosrae</standard>
+				</long>
+			</metazone>
+			<metazone type="Krasnoyarsk">
+				<long>
+					<generic>Amser Krasnoyarsk</generic>
+					<standard>Amser Safonol Krasnoyarsk</standard>
+					<daylight>Amser Haf Krasnoyarsk</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kyrgystan">
+				<long>
+					<standard>Amser Casachstan</standard>
+				</long>
+			</metazone>
+			<metazone type="Line_Islands">
+				<long>
+					<standard>Amser Ynysoedd Line</standard>
+				</long>
+			</metazone>
+			<metazone type="Lord_Howe">
+				<long>
+					<generic>Amser yr Arglwydd Howe</generic>
+					<standard>Amser Safonol yr Arglwydd Howe</standard>
+					<daylight>Amser Haf yr Arglwydd Howe</daylight>
+				</long>
+			</metazone>
+			<metazone type="Macquarie">
+				<long>
+					<standard>Amser Ynys Macquarie</standard>
+				</long>
+			</metazone>
+			<metazone type="Magadan">
+				<long>
+					<generic>Amser Magadan</generic>
+					<standard>Amser Safonol Magadan</standard>
+					<daylight>Amser Haf Magadan</daylight>
+				</long>
+			</metazone>
+			<metazone type="Malaysia">
+				<long>
+					<standard>Amser Malaysia</standard>
+				</long>
+			</metazone>
+			<metazone type="Maldives">
+				<long>
+					<standard>Amser Y Maldives</standard>
+				</long>
+			</metazone>
+			<metazone type="Marquesas">
+				<long>
+					<standard>Amser Marquises</standard>
+				</long>
+			</metazone>
+			<metazone type="Marshall_Islands">
+				<long>
+					<standard>Amser Ynysoedd Marshall</standard>
+				</long>
+			</metazone>
+			<metazone type="Mauritius">
+				<long>
+					<generic>Amser Mauritius</generic>
+					<standard>Amser Safonol Mauritius</standard>
+					<daylight>Amser Haf Mauritius</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mawson">
+				<long>
+					<standard>Amser Mawson</standard>
+				</long>
+			</metazone>
+			<metazone type="Mexico_Northwest">
+				<long>
+					<generic>Amser Gogledd Orllewin Mecsico</generic>
+					<standard>Amser Safonol Gogledd Orllewin Mecsico</standard>
+					<daylight>Amser Haf Gogledd Orllewin Mecsico</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mexico_Pacific">
+				<long>
+					<generic>Amser Pasiffig Mecsico</generic>
+					<standard>Amser Safonol Pasiffig Mecsico</standard>
+					<daylight>Amser Haf Pasiffig Mecsico</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mongolia">
+				<long>
+					<generic>Amser Ulan Bator</generic>
+					<standard>Amser Safonol Ulan Bator</standard>
+					<daylight>Amser Haf Ulan Bator</daylight>
+				</long>
+			</metazone>
+			<metazone type="Moscow">
+				<long>
+					<generic>Amser Moscfa</generic>
+					<standard>Amser Safonol Moscfa</standard>
+					<daylight>Amser Haf Moscfa</daylight>
+				</long>
+			</metazone>
+			<metazone type="Myanmar">
+				<long>
+					<standard>Amser Myanmar</standard>
+				</long>
+			</metazone>
+			<metazone type="Nauru">
+				<long>
+					<standard>Amser Nauru</standard>
+				</long>
+			</metazone>
+			<metazone type="Nepal">
+				<long>
+					<standard>Amser Nepal</standard>
+				</long>
+			</metazone>
+			<metazone type="New_Caledonia">
+				<long>
+					<generic>Amser Caledonia Newydd</generic>
+					<standard>Amser Safonol Caledonia Newydd</standard>
+					<daylight>Amser Haf Caledonia Newydd</daylight>
+				</long>
+			</metazone>
+			<metazone type="New_Zealand">
+				<long>
+					<generic>Amser Seland Newydd</generic>
+					<standard>Amser Safonol Seland Newydd</standard>
+					<daylight>Amser Haf Seland Newydd</daylight>
+				</long>
+			</metazone>
+			<metazone type="Newfoundland">
+				<long>
+					<generic>Amser Newfoundland</generic>
+					<standard>Amser Safonol Newfoundland</standard>
+					<daylight>Amser Haf Newfoundland</daylight>
+				</long>
+			</metazone>
+			<metazone type="Niue">
+				<long>
+					<standard>Amser Niue</standard>
+				</long>
+			</metazone>
+			<metazone type="Norfolk">
+				<long>
+					<standard>Amser Ynys Norfolk</standard>
+				</long>
+			</metazone>
+			<metazone type="Noronha">
+				<long>
+					<generic>Amser Fernando de Noronha</generic>
+					<standard>Amser Safonol Fernando de Noronha</standard>
+					<daylight>Amser Haf Fernando de Noronha</daylight>
+				</long>
+			</metazone>
+			<metazone type="Novosibirsk">
+				<long>
+					<generic>Amser Novosibirsk</generic>
+					<standard>Amser Safonol Novosibirsk</standard>
+					<daylight>Amser Haf Novosibirsk</daylight>
+				</long>
+			</metazone>
+			<metazone type="Omsk">
+				<long>
+					<generic>Amser Omsk</generic>
+					<standard>Amser Safonol Omsk</standard>
+					<daylight>Amser Haf Omsk</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pakistan">
+				<long>
+					<generic>Amser Pakistan</generic>
+					<standard>Amser Safonol Pakistan</standard>
+					<daylight>Amser Haf Pakistan</daylight>
+				</long>
+			</metazone>
+			<metazone type="Palau">
+				<long>
+					<standard>Amser Palau</standard>
+				</long>
+			</metazone>
+			<metazone type="Papua_New_Guinea">
+				<long>
+					<standard>Amser Papua Guinea Newydd</standard>
+				</long>
+			</metazone>
+			<metazone type="Paraguay">
+				<long>
+					<generic>Amser Paraguay</generic>
+					<standard>Amser Safonol Paraguay</standard>
+					<daylight>Amser Haf Paraguay</daylight>
+				</long>
+			</metazone>
+			<metazone type="Peru">
+				<long>
+					<generic>Amser Periw</generic>
+					<standard>Amser Safonol Periw</standard>
+					<daylight>Amser Haf Periw</daylight>
+				</long>
+			</metazone>
+			<metazone type="Philippines">
+				<long>
+					<generic>Amser Pilipinas</generic>
+					<standard>Amser Safonol Pilipinas</standard>
+					<daylight>Amser Haf Pilipinas</daylight>
+				</long>
+			</metazone>
+			<metazone type="Phoenix_Islands">
+				<long>
+					<standard>Amser Ynysoedd Phoenix</standard>
+				</long>
+			</metazone>
+			<metazone type="Pierre_Miquelon">
+				<long>
+					<generic>Amser Saint-Pierre-et-Miquelon</generic>
+					<standard>Amser Safonol Saint-Pierre-et-Miquelon</standard>
+					<daylight>Amser Haf Saint-Pierre-et-Miquelon</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pitcairn">
+				<long>
+					<standard>Amser Pitcairn</standard>
+				</long>
+			</metazone>
+			<metazone type="Ponape">
+				<long>
+					<standard>Amser Pohnpei</standard>
+				</long>
+			</metazone>
+			<metazone type="Reunion">
+				<long>
+					<standard>Amser Réunion</standard>
+				</long>
+			</metazone>
+			<metazone type="Rothera">
+				<long>
+					<standard>Amser Rothera</standard>
+				</long>
+			</metazone>
+			<metazone type="Sakhalin">
+				<long>
+					<generic>Amser Sakhalin</generic>
+					<standard>Amser Safonol Sakhalin</standard>
+					<daylight>Amser Haf Sakhalin</daylight>
+				</long>
+			</metazone>
+			<metazone type="Samoa">
+				<long>
+					<generic>Amser Samoa</generic>
+					<standard>Amser Safonol Samoa</standard>
+					<daylight>Amser Haf Samoa</daylight>
+				</long>
+			</metazone>
+			<metazone type="Seychelles">
+				<long>
+					<standard>Amser Seychelles</standard>
+				</long>
+			</metazone>
+			<metazone type="Singapore">
+				<long>
+					<standard>Amser Singapore</standard>
+				</long>
+			</metazone>
+			<metazone type="Solomon">
+				<long>
+					<standard>Amser Ynysoedd Solomon</standard>
+				</long>
+			</metazone>
+			<metazone type="South_Georgia">
+				<long>
+					<standard>Amser De Georgia</standard>
+				</long>
+			</metazone>
+			<metazone type="Suriname">
+				<long>
+					<standard>Amser Suriname</standard>
+				</long>
+			</metazone>
+			<metazone type="Syowa">
+				<long>
+					<standard>Amser Syowa</standard>
+				</long>
+			</metazone>
+			<metazone type="Tahiti">
+				<long>
+					<standard>Amser Tahiti</standard>
+				</long>
+			</metazone>
+			<metazone type="Taipei">
+				<long>
+					<generic>Amser Taipei</generic>
+					<standard>Amser Safonol Taipei</standard>
+					<daylight>Amser Haf Taipei</daylight>
+				</long>
+			</metazone>
+			<metazone type="Tajikistan">
+				<long>
+					<standard>Amser Tajicistan</standard>
+				</long>
+			</metazone>
+			<metazone type="Tokelau">
+				<long>
+					<standard>Amser Tokelau</standard>
+				</long>
+			</metazone>
+			<metazone type="Tonga">
+				<long>
+					<generic>Amser Tonga</generic>
+					<standard>Amser Safonol Tonga</standard>
+					<daylight>Amser Haf Tonga</daylight>
+				</long>
+			</metazone>
+			<metazone type="Truk">
+				<long>
+					<standard>Amser Chuuk</standard>
+				</long>
+			</metazone>
+			<metazone type="Turkmenistan">
+				<long>
+					<generic>Amser Tyrcmenistan</generic>
+					<standard>Amser Safonol Tyrcmenistan</standard>
+					<daylight>Amser Haf Tyrcmenistan</daylight>
+				</long>
+			</metazone>
+			<metazone type="Tuvalu">
+				<long>
+					<standard>Amser Tuvalu</standard>
+				</long>
+			</metazone>
+			<metazone type="Uruguay">
+				<long>
+					<generic>Amser Uruguay</generic>
+					<standard>Amser Safonol Uruguay</standard>
+					<daylight>Amser Haf Uruguay</daylight>
+				</long>
+			</metazone>
+			<metazone type="Uzbekistan">
+				<long>
+					<generic>Amser Wsbecistan</generic>
+					<standard>Amser Safonol Wsbecistan</standard>
+					<daylight>Amser Haf Wsbecistan</daylight>
+				</long>
+			</metazone>
+			<metazone type="Vanuatu">
+				<long>
+					<generic>Amser Vanuatu</generic>
+					<standard>Amser Safonol Vanuatu</standard>
+					<daylight>Amser Haf Vanuatu</daylight>
+				</long>
+			</metazone>
+			<metazone type="Venezuela">
+				<long>
+					<standard>Amser Venezuela</standard>
+				</long>
+			</metazone>
+			<metazone type="Vladivostok">
+				<long>
+					<generic>Amser Vladivostok</generic>
+					<standard>Amser Safonol Vladivostok</standard>
+					<daylight>Amser Haf Vladivostok</daylight>
+				</long>
+			</metazone>
+			<metazone type="Volgograd">
+				<long>
+					<generic>Amser Volgograd</generic>
+					<standard>Amser Safonol Volgograd</standard>
+					<daylight>Amser Haf Volgograd</daylight>
+				</long>
+			</metazone>
+			<metazone type="Vostok">
+				<long>
+					<standard>Amser Vostok</standard>
+				</long>
+			</metazone>
+			<metazone type="Wake">
+				<long>
+					<standard>Amser Ynys Wake</standard>
+				</long>
+			</metazone>
+			<metazone type="Wallis">
+				<long>
+					<standard>Amser Wallis a Futuna</standard>
+				</long>
+			</metazone>
+			<metazone type="Yakutsk">
+				<long>
+					<generic>Amser Yakutsk</generic>
+					<standard>Amser Safonol Yakutsk</standard>
+					<daylight>Amser Haf Yakutsk</daylight>
+				</long>
+			</metazone>
+			<metazone type="Yekaterinburg">
+				<long>
+					<generic>Amser Yekaterinburg</generic>
+					<standard>Amser Safonol Yekaterinburg</standard>
+					<daylight>Amser Haf Yekaterinburg</daylight>
+				</long>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<defaultNumberingSystem draft="contributed">latn</defaultNumberingSystem>
+		<otherNumberingSystems>
+			<native draft="contributed">latn</native>
+		</otherNumberingSystems>
+		<minimumGroupingDigits draft="contributed">1</minimumGroupingDigits>
+		<symbols numberSystem="arab">
+			<timeSeparator draft="contributed">:</timeSeparator>
+		</symbols>
+		<symbols numberSystem="latn">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>x</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+			<timeSeparator draft="contributed">:</timeSeparator>
+		</symbols>
+		<decimalFormats numberSystem="latn">
+			<decimalFormatLength>
+				<decimalFormat>
+					<pattern>#,##0.###</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+			<decimalFormatLength type="long">
+				<decimalFormat>
+					<pattern type="1000" count="zero">0 mil</pattern>
+					<pattern type="1000" count="one">0 mil</pattern>
+					<pattern type="1000" count="two">0 fil</pattern>
+					<pattern type="1000" count="few">0 mil</pattern>
+					<pattern type="1000" count="many">0 mil</pattern>
+					<pattern type="1000" count="other">0 mil</pattern>
+					<pattern type="10000" count="zero">00 mil</pattern>
+					<pattern type="10000" count="one">00 mil</pattern>
+					<pattern type="10000" count="two">00 mil</pattern>
+					<pattern type="10000" count="few">00 mil</pattern>
+					<pattern type="10000" count="many">00 mil</pattern>
+					<pattern type="10000" count="other">00 mil</pattern>
+					<pattern type="100000" count="zero">000 mil</pattern>
+					<pattern type="100000" count="one">000 mil</pattern>
+					<pattern type="100000" count="two">000 mil</pattern>
+					<pattern type="100000" count="few">000 mil</pattern>
+					<pattern type="100000" count="many">000 mil</pattern>
+					<pattern type="100000" count="other">000 mil</pattern>
+					<pattern type="1000000" count="zero">0 miliwn</pattern>
+					<pattern type="1000000" count="one">0 miliwn</pattern>
+					<pattern type="1000000" count="two">0 filiwn</pattern>
+					<pattern type="1000000" count="few">0 miliwn</pattern>
+					<pattern type="1000000" count="many">0 miliwn</pattern>
+					<pattern type="1000000" count="other">0 miliwn</pattern>
+					<pattern type="10000000" count="zero">00 miliwn</pattern>
+					<pattern type="10000000" count="one">00 miliwn</pattern>
+					<pattern type="10000000" count="two">00 miliwn</pattern>
+					<pattern type="10000000" count="few">00 miliwn</pattern>
+					<pattern type="10000000" count="many">00 miliwn</pattern>
+					<pattern type="10000000" count="other">00 miliwn</pattern>
+					<pattern type="100000000" count="zero">000 miliwn</pattern>
+					<pattern type="100000000" count="one">000 miliwn</pattern>
+					<pattern type="100000000" count="two">000 miliwn</pattern>
+					<pattern type="100000000" count="few">000 miliwn</pattern>
+					<pattern type="100000000" count="many">000 miliwn</pattern>
+					<pattern type="100000000" count="other">000 miliwn</pattern>
+					<pattern type="1000000000" count="zero">0 biliwn</pattern>
+					<pattern type="1000000000" count="one">0 biliwn</pattern>
+					<pattern type="1000000000" count="two">0 biliwn</pattern>
+					<pattern type="1000000000" count="few">0 biliwn</pattern>
+					<pattern type="1000000000" count="many">0 biliwn</pattern>
+					<pattern type="1000000000" count="other">0 biliwn</pattern>
+					<pattern type="10000000000" count="zero">00 biliwn</pattern>
+					<pattern type="10000000000" count="one">00 biliwn</pattern>
+					<pattern type="10000000000" count="two">00 biliwn</pattern>
+					<pattern type="10000000000" count="few">00 biliwn</pattern>
+					<pattern type="10000000000" count="many">00 biliwn</pattern>
+					<pattern type="10000000000" count="other">00 biliwn</pattern>
+					<pattern type="100000000000" count="zero">000 biliwn</pattern>
+					<pattern type="100000000000" count="one">000 biliwn</pattern>
+					<pattern type="100000000000" count="two">000 biliwn</pattern>
+					<pattern type="100000000000" count="few">000 biliwn</pattern>
+					<pattern type="100000000000" count="many">000 biliwn</pattern>
+					<pattern type="100000000000" count="other">000 biliwn</pattern>
+					<pattern type="1000000000000" count="zero">0 triliwn</pattern>
+					<pattern type="1000000000000" count="one">0 triliwn</pattern>
+					<pattern type="1000000000000" count="two">0 driliwn</pattern>
+					<pattern type="1000000000000" count="few">0 thriliwn</pattern>
+					<pattern type="1000000000000" count="many">0 thriliwn</pattern>
+					<pattern type="1000000000000" count="other">0 triliwn</pattern>
+					<pattern type="10000000000000" count="zero">00 triliwn</pattern>
+					<pattern type="10000000000000" count="one">00 triliwn</pattern>
+					<pattern type="10000000000000" count="two">00 triliwn</pattern>
+					<pattern type="10000000000000" count="few">00 triliwn</pattern>
+					<pattern type="10000000000000" count="many">00 triliwn</pattern>
+					<pattern type="10000000000000" count="other">00 triliwn</pattern>
+					<pattern type="100000000000000" count="zero">000 triliwn</pattern>
+					<pattern type="100000000000000" count="one">000 triliwn</pattern>
+					<pattern type="100000000000000" count="two">000 triliwn</pattern>
+					<pattern type="100000000000000" count="few">000 triliwn</pattern>
+					<pattern type="100000000000000" count="many">000 triliwn</pattern>
+					<pattern type="100000000000000" count="other">000 triliwn</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+			<decimalFormatLength type="short">
+				<decimalFormat>
+					<pattern type="1000" count="zero">0K</pattern>
+					<pattern type="1000" count="one">0K</pattern>
+					<pattern type="1000" count="two">0K</pattern>
+					<pattern type="1000" count="few">0K</pattern>
+					<pattern type="1000" count="many">0K</pattern>
+					<pattern type="1000" count="other">0K</pattern>
+					<pattern type="10000" count="zero">00K</pattern>
+					<pattern type="10000" count="one">00K</pattern>
+					<pattern type="10000" count="two">00K</pattern>
+					<pattern type="10000" count="few">00K</pattern>
+					<pattern type="10000" count="many">00K</pattern>
+					<pattern type="10000" count="other">00K</pattern>
+					<pattern type="100000" count="zero">000K</pattern>
+					<pattern type="100000" count="one">000K</pattern>
+					<pattern type="100000" count="two">000K</pattern>
+					<pattern type="100000" count="few">000K</pattern>
+					<pattern type="100000" count="many">000K</pattern>
+					<pattern type="100000" count="other">000K</pattern>
+					<pattern type="1000000" count="zero">0M</pattern>
+					<pattern type="1000000" count="one">0M</pattern>
+					<pattern type="1000000" count="two">0M</pattern>
+					<pattern type="1000000" count="few">0M</pattern>
+					<pattern type="1000000" count="many">0M</pattern>
+					<pattern type="1000000" count="other">0M</pattern>
+					<pattern type="10000000" count="zero">00M</pattern>
+					<pattern type="10000000" count="one">00M</pattern>
+					<pattern type="10000000" count="two">00M</pattern>
+					<pattern type="10000000" count="few">00M</pattern>
+					<pattern type="10000000" count="many">00M</pattern>
+					<pattern type="10000000" count="other">00M</pattern>
+					<pattern type="100000000" count="zero">000M</pattern>
+					<pattern type="100000000" count="one">000M</pattern>
+					<pattern type="100000000" count="two">000M</pattern>
+					<pattern type="100000000" count="few">000M</pattern>
+					<pattern type="100000000" count="many">000M</pattern>
+					<pattern type="100000000" count="other">000M</pattern>
+					<pattern type="1000000000" count="zero">0B</pattern>
+					<pattern type="1000000000" count="one">0B</pattern>
+					<pattern type="1000000000" count="two">0B</pattern>
+					<pattern type="1000000000" count="few">0B</pattern>
+					<pattern type="1000000000" count="many">0B</pattern>
+					<pattern type="1000000000" count="other">0B</pattern>
+					<pattern type="10000000000" count="zero">00B</pattern>
+					<pattern type="10000000000" count="one">00B</pattern>
+					<pattern type="10000000000" count="two">00B</pattern>
+					<pattern type="10000000000" count="few">00B</pattern>
+					<pattern type="10000000000" count="many">00B</pattern>
+					<pattern type="10000000000" count="other">00B</pattern>
+					<pattern type="100000000000" count="zero">000B</pattern>
+					<pattern type="100000000000" count="one">000B</pattern>
+					<pattern type="100000000000" count="two">000B</pattern>
+					<pattern type="100000000000" count="few">000B</pattern>
+					<pattern type="100000000000" count="many">000B</pattern>
+					<pattern type="100000000000" count="other">000B</pattern>
+					<pattern type="1000000000000" count="zero">0T</pattern>
+					<pattern type="1000000000000" count="one">0T</pattern>
+					<pattern type="1000000000000" count="two">0T</pattern>
+					<pattern type="1000000000000" count="few">0T</pattern>
+					<pattern type="1000000000000" count="many">0T</pattern>
+					<pattern type="1000000000000" count="other">0T</pattern>
+					<pattern type="10000000000000" count="zero">00T</pattern>
+					<pattern type="10000000000000" count="one">00T</pattern>
+					<pattern type="10000000000000" count="two">00T</pattern>
+					<pattern type="10000000000000" count="few">00T</pattern>
+					<pattern type="10000000000000" count="many">00T</pattern>
+					<pattern type="10000000000000" count="other">00T</pattern>
+					<pattern type="100000000000000" count="zero">000T</pattern>
+					<pattern type="100000000000000" count="one">000T</pattern>
+					<pattern type="100000000000000" count="two">000T</pattern>
+					<pattern type="100000000000000" count="few">000T</pattern>
+					<pattern type="100000000000000" count="many">000T</pattern>
+					<pattern type="100000000000000" count="other">000T</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+		</decimalFormats>
+		<scientificFormats numberSystem="latn">
+			<scientificFormatLength>
+				<scientificFormat>
+					<pattern>#E0</pattern>
+				</scientificFormat>
+			</scientificFormatLength>
+		</scientificFormats>
+		<percentFormats numberSystem="latn">
+			<percentFormatLength>
+				<percentFormat>
+					<pattern>#,##0%</pattern>
+				</percentFormat>
+			</percentFormatLength>
+		</percentFormats>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>¤#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="zero">¤0 mil</pattern>
+					<pattern type="1000" count="one">¤0K</pattern>
+					<pattern type="1000" count="two">¤0K</pattern>
+					<pattern type="1000" count="few">¤0K</pattern>
+					<pattern type="1000" count="many">¤0K</pattern>
+					<pattern type="1000" count="other">¤0K</pattern>
+					<pattern type="10000" count="zero">¤00K</pattern>
+					<pattern type="10000" count="one">¤00K</pattern>
+					<pattern type="10000" count="two">¤00K</pattern>
+					<pattern type="10000" count="few">¤00K</pattern>
+					<pattern type="10000" count="many">¤00K</pattern>
+					<pattern type="10000" count="other">¤00K</pattern>
+					<pattern type="100000" count="zero">¤000K</pattern>
+					<pattern type="100000" count="one">¤000K</pattern>
+					<pattern type="100000" count="two">¤000K</pattern>
+					<pattern type="100000" count="few">¤000K</pattern>
+					<pattern type="100000" count="many">¤000K</pattern>
+					<pattern type="100000" count="other">¤000K</pattern>
+					<pattern type="1000000" count="zero">¤0M</pattern>
+					<pattern type="1000000" count="one">¤0M</pattern>
+					<pattern type="1000000" count="two">¤0M</pattern>
+					<pattern type="1000000" count="few">¤0M</pattern>
+					<pattern type="1000000" count="many">¤0M</pattern>
+					<pattern type="1000000" count="other">¤0M</pattern>
+					<pattern type="10000000" count="zero">¤00M</pattern>
+					<pattern type="10000000" count="one">¤00M</pattern>
+					<pattern type="10000000" count="two">¤00M</pattern>
+					<pattern type="10000000" count="few">¤00M</pattern>
+					<pattern type="10000000" count="many">¤00M</pattern>
+					<pattern type="10000000" count="other">¤00M</pattern>
+					<pattern type="100000000" count="zero">¤000M</pattern>
+					<pattern type="100000000" count="one">¤000M</pattern>
+					<pattern type="100000000" count="two">¤000M</pattern>
+					<pattern type="100000000" count="few">¤000M</pattern>
+					<pattern type="100000000" count="many">¤000M</pattern>
+					<pattern type="100000000" count="other">¤000M</pattern>
+					<pattern type="1000000000" count="zero">¤0B</pattern>
+					<pattern type="1000000000" count="one">¤0B</pattern>
+					<pattern type="1000000000" count="two">¤0B</pattern>
+					<pattern type="1000000000" count="few">¤0B</pattern>
+					<pattern type="1000000000" count="many">¤0B</pattern>
+					<pattern type="1000000000" count="other">¤0B</pattern>
+					<pattern type="10000000000" count="zero">¤00B</pattern>
+					<pattern type="10000000000" count="one">¤00B</pattern>
+					<pattern type="10000000000" count="two">¤00B</pattern>
+					<pattern type="10000000000" count="few">¤00B</pattern>
+					<pattern type="10000000000" count="many">¤00B</pattern>
+					<pattern type="10000000000" count="other">¤00B</pattern>
+					<pattern type="100000000000" count="zero">¤000B</pattern>
+					<pattern type="100000000000" count="one">¤000B</pattern>
+					<pattern type="100000000000" count="two">¤000B</pattern>
+					<pattern type="100000000000" count="few">¤000B</pattern>
+					<pattern type="100000000000" count="many">¤000B</pattern>
+					<pattern type="100000000000" count="other">¤000B</pattern>
+					<pattern type="1000000000000" count="zero">¤0T</pattern>
+					<pattern type="1000000000000" count="one">¤0T</pattern>
+					<pattern type="1000000000000" count="two">¤0T</pattern>
+					<pattern type="1000000000000" count="few">¤0T</pattern>
+					<pattern type="1000000000000" count="many">¤0T</pattern>
+					<pattern type="1000000000000" count="other">¤0T</pattern>
+					<pattern type="10000000000000" count="zero">¤00T</pattern>
+					<pattern type="10000000000000" count="one">¤00T</pattern>
+					<pattern type="10000000000000" count="two">¤00T</pattern>
+					<pattern type="10000000000000" count="few">¤00T</pattern>
+					<pattern type="10000000000000" count="many">¤00T</pattern>
+					<pattern type="10000000000000" count="other">¤00T</pattern>
+					<pattern type="100000000000000" count="zero">¤000T</pattern>
+					<pattern type="100000000000000" count="one">¤000T</pattern>
+					<pattern type="100000000000000" count="two">¤000T</pattern>
+					<pattern type="100000000000000" count="few">¤000T</pattern>
+					<pattern type="100000000000000" count="many">¤000T</pattern>
+					<pattern type="100000000000000" count="other">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<unitPattern count="zero">{0} {1}</unitPattern>
+			<unitPattern count="one">{0} {1}</unitPattern>
+			<unitPattern count="two">{0} {1}</unitPattern>
+			<unitPattern count="few">{0} {1}</unitPattern>
+			<unitPattern count="many">{0} {1}</unitPattern>
+			<unitPattern count="other">{0} {1}</unitPattern>
+		</currencyFormats>
+		<currencies>
+			<currency type="AED">
+				<displayName>Dirham Yr Emiradau Arabaidd Unedig</displayName>
+				<displayName count="zero">dirham yr Emiradau Arabaidd Unedig</displayName>
+				<displayName count="one">dirham yr Emiradau Arabaidd Unedig</displayName>
+				<displayName count="two">dirham yr Emiradau Arabaidd Unedig</displayName>
+				<displayName count="few">dirham yr Emiradau Arabaidd Unedig</displayName>
+				<displayName count="many">dirham yr Emiradau Arabaidd Unedig</displayName>
+				<displayName count="other">dirham yr Emiradau Arabaidd Unedig</displayName>
+				<symbol draft="contributed">AED</symbol>
+			</currency>
+			<currency type="AFA">
+				<displayName>Afghani Afghanistan (1927–2002)</displayName>
+				<displayName count="zero">afghani Afghanistan (1927–2002)</displayName>
+				<displayName count="one">afghani Afghanistan (1927–2002)</displayName>
+				<displayName count="two">afghani Afghanistan (1927–2002)</displayName>
+				<displayName count="few">afghani Afghanistan (1927–2002)</displayName>
+				<displayName count="many">afghani Afghanistan (1927–2002)</displayName>
+				<displayName count="other">afghani Afghanistan (1927–2002)</displayName>
+				<symbol draft="contributed">AFA</symbol>
+			</currency>
+			<currency type="AFN">
+				<displayName>Afghani Afghanistan</displayName>
+				<displayName count="zero">Afghani Afghanistan</displayName>
+				<displayName count="one">Afghani Afghanistan</displayName>
+				<displayName count="two">Afghani Afghanistan</displayName>
+				<displayName count="few">Afghani Afghanistan</displayName>
+				<displayName count="many">Afghani Afghanistan</displayName>
+				<displayName count="other">Afghani Afghanistan</displayName>
+				<symbol draft="contributed">AFN</symbol>
+			</currency>
+			<currency type="ALL">
+				<displayName>Lek Albania</displayName>
+				<displayName count="zero">lek Albania</displayName>
+				<displayName count="one">lek Albania</displayName>
+				<displayName count="two">lek Albania</displayName>
+				<displayName count="few">lek Albania</displayName>
+				<displayName count="many">lek Albania</displayName>
+				<displayName count="other">lek Albania</displayName>
+				<symbol draft="contributed">ALL</symbol>
+			</currency>
+			<currency type="AMD">
+				<displayName>Dram Armenia</displayName>
+				<displayName count="zero">dram Armenia</displayName>
+				<displayName count="one">dram Armenia</displayName>
+				<displayName count="two">dram Armenia</displayName>
+				<displayName count="few">dram Armenia</displayName>
+				<displayName count="many">dram Armenia</displayName>
+				<displayName count="other">dram Armenia</displayName>
+				<symbol draft="contributed">AMD</symbol>
+			</currency>
+			<currency type="ANG">
+				<displayName>Guilder Antilles yr Iseldiroedd</displayName>
+				<displayName count="zero">guilder Antilles yr Iseldiroedd</displayName>
+				<displayName count="one">guilder Antilles yr Iseldiroedd</displayName>
+				<displayName count="two">guilder Antilles yr Iseldiroedd</displayName>
+				<displayName count="few">guilder Antilles yr Iseldiroedd</displayName>
+				<displayName count="many">guilder Antilles yr Iseldiroedd</displayName>
+				<displayName count="other">guilder Antilles yr Iseldiroedd</displayName>
+				<symbol draft="contributed">ANG</symbol>
+			</currency>
+			<currency type="AOA">
+				<displayName>Kwanza Angola</displayName>
+				<displayName count="zero">kwanza Angola</displayName>
+				<displayName count="one">kwanza Angola</displayName>
+				<displayName count="two">kwanza Angola</displayName>
+				<displayName count="few">kwanza Angola</displayName>
+				<displayName count="many">kwanza Angola</displayName>
+				<displayName count="other">kwanza Angola</displayName>
+				<symbol draft="contributed">AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
+			</currency>
+			<currency type="AOK">
+				<displayName>Kwanza Angola (1977–1991)</displayName>
+				<displayName count="zero">Kwanza Angola (1977–1991)</displayName>
+				<displayName count="one">Kwanza Angola (1977–1991)</displayName>
+				<displayName count="two">Kwanza Angola (1977–1991)</displayName>
+				<displayName count="few">Kwanza Angola (1977–1991)</displayName>
+				<displayName count="many">Kwanza Angola (1977–1991)</displayName>
+				<displayName count="other">Kwanza Angola (1977–1991)</displayName>
+				<symbol draft="contributed">AOK</symbol>
+			</currency>
+			<currency type="AON">
+				<displayName>Kwanza Newydd Angola (1990–2000)</displayName>
+				<displayName count="zero">Kwanza Newydd Angola (1990–2000)</displayName>
+				<displayName count="one">Kwanza Newydd Angola (1990–2000)</displayName>
+				<displayName count="two">Kwanza Newydd Angola (1990–2000)</displayName>
+				<displayName count="few">Kwanza Newydd Angola (1990–2000)</displayName>
+				<displayName count="many">Kwanza Newydd Angola (1990–2000)</displayName>
+				<displayName count="other">Kwanza Newydd Angola (1990–2000)</displayName>
+				<symbol draft="contributed">AON</symbol>
+			</currency>
+			<currency type="AOR">
+				<displayName>Kwanza Ailgymhwysedig Angola (1995–1999)</displayName>
+				<displayName count="zero">Kwanza Ailgymhwysedig Angola (1995–1999)</displayName>
+				<displayName count="one">Kwanza Ailgymhwysedig Angola (1995–1999)</displayName>
+				<displayName count="two">Kwanza Ailgymhwysedig Angola (1995–1999)</displayName>
+				<displayName count="few">Kwanza Ailgymhwysedig Angola (1995–1999)</displayName>
+				<displayName count="many">Kwanza Ailgymhwysedig Angola (1995–1999)</displayName>
+				<displayName count="other">Kwanza Ailgymhwysedig Angola (1995–1999)</displayName>
+				<symbol draft="contributed">AOR</symbol>
+			</currency>
+			<currency type="ARA">
+				<displayName>Austral yr Ariannin</displayName>
+				<displayName count="zero">austral yr Ariannin</displayName>
+				<displayName count="one">austral yr Ariannin</displayName>
+				<displayName count="two">austral yr Ariannin</displayName>
+				<displayName count="few">austral yr Ariannin</displayName>
+				<displayName count="many">austral yr Ariannin</displayName>
+				<displayName count="other">austral yr Ariannin</displayName>
+				<symbol draft="contributed">ARA</symbol>
+			</currency>
+			<currency type="ARL">
+				<displayName>Peso Ley yr Ariannin (1970–1983)</displayName>
+				<displayName count="zero">peso ley yr Ariannin (1970–1983)</displayName>
+				<displayName count="one">peso ley yr Ariannin (1970–1983)</displayName>
+				<displayName count="two">peso ley yr Ariannin (1970–1983)</displayName>
+				<displayName count="few">peso ley yr Ariannin (1970–1983)</displayName>
+				<displayName count="many">peso ley yr Ariannin (1970–1983)</displayName>
+				<displayName count="other">peso ley yr Ariannin (1970–1983)</displayName>
+				<symbol draft="contributed">ARL</symbol>
+			</currency>
+			<currency type="ARM">
+				<displayName>Peso yr Ariannin (1881–1970)</displayName>
+				<displayName count="zero">peso yr Ariannin (1881–1970)</displayName>
+				<displayName count="one">peso yr Ariannin (1881–1970)</displayName>
+				<displayName count="two">peso yr Ariannin (1881–1970)</displayName>
+				<displayName count="few">peso yr Ariannin (1881–1970)</displayName>
+				<displayName count="many">peso yr Ariannin (1881–1970)</displayName>
+				<displayName count="other">peso yr Ariannin (1881–1970)</displayName>
+				<symbol draft="contributed">ARM</symbol>
+			</currency>
+			<currency type="ARP">
+				<displayName>Peso yr Ariannin (1983–1985)</displayName>
+				<displayName count="zero">peso yr Ariannin (1983–1985)</displayName>
+				<displayName count="one">peso yr Ariannin (1983–1985)</displayName>
+				<displayName count="two">peso yr Ariannin (1983–1985)</displayName>
+				<displayName count="few">peso yr Ariannin (1983–1985)</displayName>
+				<displayName count="many">peso yr Ariannin (1983–1985)</displayName>
+				<displayName count="other">peso yr Ariannin (1983–1985)</displayName>
+				<symbol draft="contributed">ARP</symbol>
+			</currency>
+			<currency type="ARS">
+				<displayName>Peso yr Ariannin</displayName>
+				<displayName count="zero">peso yr Ariannin</displayName>
+				<displayName count="one">peso yr Ariannin</displayName>
+				<displayName count="two">peso yr Ariannin</displayName>
+				<displayName count="few">peso yr Ariannin</displayName>
+				<displayName count="many">peso yr Ariannin</displayName>
+				<displayName count="other">peso yr Ariannin</displayName>
+				<symbol draft="contributed">ARS</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="ATS">
+				<displayName>Swllt Awstria</displayName>
+				<displayName count="zero">swllt Awstria</displayName>
+				<displayName count="one">swllt Awstria</displayName>
+				<displayName count="two">swllt Awstria</displayName>
+				<displayName count="few">swllt Awstria</displayName>
+				<displayName count="many">swllt Awstria</displayName>
+				<displayName count="other">swllt Awstria</displayName>
+				<symbol draft="contributed">ATS</symbol>
+			</currency>
+			<currency type="AUD">
+				<displayName>Doler Awstralia</displayName>
+				<displayName count="zero">Doler Awstralia</displayName>
+				<displayName count="one">Doler Awstralia</displayName>
+				<displayName count="two">Doler Awstralia</displayName>
+				<displayName count="few">Doler Awstralia</displayName>
+				<displayName count="many">Doler Awstralia</displayName>
+				<displayName count="other">Doler Awstralia</displayName>
+				<symbol>A$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="AWG">
+				<displayName>Fflorin Aruba</displayName>
+				<displayName count="zero">fflorin Aruba</displayName>
+				<displayName count="one">fflorin Aruba</displayName>
+				<displayName count="two">fflorin Aruba</displayName>
+				<displayName count="few">fflorin Aruba</displayName>
+				<displayName count="many">fflorin Aruba</displayName>
+				<displayName count="other">fflorin Aruba</displayName>
+				<symbol draft="contributed">AWG</symbol>
+			</currency>
+			<currency type="AZM">
+				<displayName>Manat Azerbaijan (1993–2006)</displayName>
+				<displayName count="zero">manat Azerbaijan (1993–2006)</displayName>
+				<displayName count="one">manat Azerbaijan (1993–2006)</displayName>
+				<displayName count="two">manat Azerbaijan (1993–2006)</displayName>
+				<displayName count="few">manat Azerbaijan (1993–2006)</displayName>
+				<displayName count="many">manat Azerbaijan (1993–2006)</displayName>
+				<displayName count="other">manat Azerbaijan (1993–2006)</displayName>
+				<symbol draft="contributed">AZM</symbol>
+			</currency>
+			<currency type="AZN">
+				<displayName>Manat Azerbaijan</displayName>
+				<displayName count="zero">manat Azerbaijan</displayName>
+				<displayName count="one">manat Azerbaijan</displayName>
+				<displayName count="two">manat Azerbaijan</displayName>
+				<displayName count="few">manat Azerbaijan</displayName>
+				<displayName count="many">manat Azerbaijan</displayName>
+				<displayName count="other">Manat Azerbaijan</displayName>
+				<symbol draft="contributed">AZN</symbol>
+			</currency>
+			<currency type="BAM">
+				<displayName>Marc Trosadwy Bosnia a Hercegovina</displayName>
+				<displayName count="zero">marc trosadwy Bosnia a Hercegovina</displayName>
+				<displayName count="one">marc trosadwy Bosnia a Hercegovina</displayName>
+				<displayName count="two">marc trosadwy Bosnia a Hercegovina</displayName>
+				<displayName count="few">marc trosadwy Bosnia a Hercegovina</displayName>
+				<displayName count="many">marc trosadwy Bosnia a Hercegovina</displayName>
+				<displayName count="other">marc trosadwy Bosnia a Hercegovina</displayName>
+				<symbol draft="contributed">BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
+			</currency>
+			<currency type="BBD">
+				<displayName>Doler Barbados</displayName>
+				<displayName count="zero">doler Barbados</displayName>
+				<displayName count="one">ddoler Barbados</displayName>
+				<displayName count="two">ddoler Barbados</displayName>
+				<displayName count="few">doler Barbados</displayName>
+				<displayName count="many">doler Barbados</displayName>
+				<displayName count="other">doler Barbados</displayName>
+				<symbol draft="contributed">BBD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BDT">
+				<displayName>Taka Bangladesh</displayName>
+				<displayName count="zero">Taka Bangladesh</displayName>
+				<displayName count="one">Taka Bangladesh</displayName>
+				<displayName count="two">Taka Bangladesh</displayName>
+				<displayName count="few">Taka Bangladesh</displayName>
+				<displayName count="many">Taka Bangladesh</displayName>
+				<displayName count="other">Taka Bangladesh</displayName>
+				<symbol draft="contributed">BDT</symbol>
+				<symbol alt="narrow" draft="contributed">TK</symbol>
+			</currency>
+			<currency type="BEC">
+				<symbol draft="contributed">BEC</symbol>
+			</currency>
+			<currency type="BEF">
+				<symbol draft="contributed">BEF</symbol>
+			</currency>
+			<currency type="BEL">
+				<symbol draft="contributed">BEL</symbol>
+			</currency>
+			<currency type="BGM">
+				<displayName>Lev Sosialaidd Bwlgaria</displayName>
+				<displayName count="zero">lev sosialaidd Bwlgaria</displayName>
+				<displayName count="one">lev sosialaidd Bwlgaria</displayName>
+				<displayName count="two">lev sosialaidd Bwlgaria</displayName>
+				<displayName count="few">lev sosialaidd Bwlgaria</displayName>
+				<displayName count="many">lev sosialaidd Bwlgaria</displayName>
+				<displayName count="other">lev sosialaidd Bwlgaria</displayName>
+				<symbol draft="contributed">BGM</symbol>
+			</currency>
+			<currency type="BGN">
+				<displayName>Lev Bwlgaria</displayName>
+				<displayName count="zero">lev Bwlgaria</displayName>
+				<displayName count="one">lev Bwlgaria</displayName>
+				<displayName count="two">lev Bwlgaria</displayName>
+				<displayName count="few">lev Bwlgaria</displayName>
+				<displayName count="many">lev Bwlgaria</displayName>
+				<displayName count="other">lev Bwlgaria</displayName>
+				<symbol draft="contributed">BGN</symbol>
+			</currency>
+			<currency type="BGO">
+				<displayName>Lev Bwlgaria (1879–1952)</displayName>
+				<displayName count="zero">Lev Bwlgaria (1879–1952)</displayName>
+				<displayName count="one">Lev Bwlgaria (1879–1952)</displayName>
+				<displayName count="two">Lev Bwlgaria (1879–1952)</displayName>
+				<displayName count="few">Lev Bwlgaria (1879–1952)</displayName>
+				<displayName count="many">Lev Bwlgaria (1879–1952)</displayName>
+				<displayName count="other">Lev Bwlgaria (1879–1952)</displayName>
+				<symbol draft="contributed">BGO</symbol>
+			</currency>
+			<currency type="BHD">
+				<displayName>Dinar Bahrain</displayName>
+				<displayName count="zero">dinar Bahrain</displayName>
+				<displayName count="one">dinar Bahrain</displayName>
+				<displayName count="two">dinar Bahrain</displayName>
+				<displayName count="few">dinar Bahrain</displayName>
+				<displayName count="many">dinar Bahrain</displayName>
+				<displayName count="other">dinar Bahrain</displayName>
+				<symbol draft="contributed">BHD</symbol>
+			</currency>
+			<currency type="BIF">
+				<displayName>Ffranc Burundi</displayName>
+				<displayName count="zero">ffranc Burundi</displayName>
+				<displayName count="one">ffranc Burundi</displayName>
+				<displayName count="two">ffranc Burundi</displayName>
+				<displayName count="few">ffranc Burundi</displayName>
+				<displayName count="many">ffranc Burundi</displayName>
+				<displayName count="other">ffranc Burundi</displayName>
+				<symbol draft="contributed">BIF</symbol>
+			</currency>
+			<currency type="BMD">
+				<displayName>Doler Bermuda</displayName>
+				<displayName count="zero">doler Bermuda</displayName>
+				<displayName count="one">ddoler Bermuda</displayName>
+				<displayName count="two">ddoler Bermuda</displayName>
+				<displayName count="few">doler Bermuda</displayName>
+				<displayName count="many">doler Bermuda</displayName>
+				<displayName count="other">doler Bermuda</displayName>
+				<symbol>BMD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BND">
+				<displayName>Doler Brunei</displayName>
+				<displayName count="zero">Doler Brunei</displayName>
+				<displayName count="one">Doler Brunei</displayName>
+				<displayName count="two">Doler Brunei</displayName>
+				<displayName count="few">Doler Brunei</displayName>
+				<displayName count="many">Doler Brunei</displayName>
+				<displayName count="other">Doler Brunei</displayName>
+				<symbol draft="contributed">BND</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BOB">
+				<displayName>Boliviano Bolifia</displayName>
+				<displayName count="zero">boliviano Bolifia</displayName>
+				<displayName count="one">boliviano Bolifia</displayName>
+				<displayName count="two">boliviano Bolifia</displayName>
+				<displayName count="few">boliviano Bolifia</displayName>
+				<displayName count="many">boliviano Bolifia</displayName>
+				<displayName count="other">boliviano Bolifia</displayName>
+				<symbol draft="contributed">BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
+			</currency>
+			<currency type="BOL">
+				<displayName>Boliviano Bolifia (1863–1963)</displayName>
+				<displayName count="zero">boliviano Bolifia (1863–1963)</displayName>
+				<displayName count="one">boliviano Bolifia (1863–1963)</displayName>
+				<displayName count="two">boliviano Bolifia (1863–1963)</displayName>
+				<displayName count="few">boliviano Bolifia (1863–1963)</displayName>
+				<displayName count="many">boliviano Bolifia (1863–1963)</displayName>
+				<displayName count="other">boliviano Bolifia (1863–1963)</displayName>
+				<symbol draft="contributed">BOL</symbol>
+			</currency>
+			<currency type="BOP">
+				<displayName>Peso Bolifia</displayName>
+				<displayName count="zero">peso Bolifia</displayName>
+				<displayName count="one">peso Bolifia</displayName>
+				<displayName count="two">peso Bolifia</displayName>
+				<displayName count="few">peso Bolifia</displayName>
+				<displayName count="many">peso Bolifia</displayName>
+				<displayName count="other">peso Bolifia</displayName>
+				<symbol draft="contributed">BOP</symbol>
+			</currency>
+			<currency type="BOV">
+				<displayName>Mvdol Bolifia</displayName>
+				<displayName count="zero">mvdol Bolifia</displayName>
+				<displayName count="one">mvdol Bolifia</displayName>
+				<displayName count="two">mvdol Bolifia</displayName>
+				<displayName count="few">mvdol Bolifia</displayName>
+				<displayName count="many">mvdol Bolifia</displayName>
+				<displayName count="other">mvdol Bolifia</displayName>
+				<symbol draft="contributed">BOV</symbol>
+			</currency>
+			<currency type="BRB">
+				<displayName>Cruzeiro Newydd Brasil (1967–1986)</displayName>
+				<displayName count="zero">cruzeiro newydd Brasil (1967–1986)</displayName>
+				<displayName count="one">cruzeiro newydd Brasil (1967–1986)</displayName>
+				<displayName count="two">cruzeiro newydd Brasil (1967–1986)</displayName>
+				<displayName count="few">cruzeiro newydd Brasil (1967–1986)</displayName>
+				<displayName count="many">cruzeiro newydd Brasil (1967–1986)</displayName>
+				<displayName count="other">cruzeiro newydd Brasil (1967–1986)</displayName>
+				<symbol draft="contributed">BRB</symbol>
+			</currency>
+			<currency type="BRC">
+				<displayName>Cruzado Brasil (1986–1989)</displayName>
+				<displayName count="zero">cruzado Brasil (1986–1989)</displayName>
+				<displayName count="one">cruzado Brasil (1986–1989)</displayName>
+				<displayName count="two">cruzado Brasil (1986–1989)</displayName>
+				<displayName count="few">cruzado Brasil (1986–1989)</displayName>
+				<displayName count="many">cruzado Brasil (1986–1989)</displayName>
+				<displayName count="other">cruzado Brasil (1986–1989)</displayName>
+				<symbol draft="contributed">BRC</symbol>
+			</currency>
+			<currency type="BRE">
+				<displayName>Cruzeiro Brasil (1990–1993)</displayName>
+				<displayName count="zero">cruzeiro Brasil (1990–1993)</displayName>
+				<displayName count="one">cruzeiro Brasil (1990–1993)</displayName>
+				<displayName count="two">cruzeiro Brasil (1990–1993)</displayName>
+				<displayName count="few">cruzeiro Brasil (1990–1993)</displayName>
+				<displayName count="many">cruzeiro Brasil (1990–1993)</displayName>
+				<displayName count="other">cruzeiro Brasil (1990–1993)</displayName>
+				<symbol draft="contributed">BRE</symbol>
+			</currency>
+			<currency type="BRL">
+				<displayName>Real Brasil</displayName>
+				<displayName count="zero">real Brasil</displayName>
+				<displayName count="one">real Brasil</displayName>
+				<displayName count="two">real Brasil</displayName>
+				<displayName count="few">real Brasil</displayName>
+				<displayName count="many">real Brasil</displayName>
+				<displayName count="other">real Brasil</displayName>
+				<symbol>R$</symbol>
+				<symbol alt="narrow" draft="contributed">R$</symbol>
+			</currency>
+			<currency type="BRN">
+				<displayName>Cruzado Newydd Brasil (1989–1990)</displayName>
+				<displayName count="zero">cruzado newydd Brasil (1989–1990)</displayName>
+				<displayName count="one">cruzado newydd Brasil (1989–1990)</displayName>
+				<displayName count="two">cruzado newydd Brasil (1989–1990)</displayName>
+				<displayName count="few">cruzado newydd Brasil (1989–1990)</displayName>
+				<displayName count="many">cruzado newydd Brasil (1989–1990)</displayName>
+				<displayName count="other">cruzado newydd Brasil (1989–1990)</displayName>
+				<symbol draft="contributed">BRN</symbol>
+			</currency>
+			<currency type="BRR">
+				<displayName>Cruzeiro Brasil (1993–1994)</displayName>
+				<displayName count="zero">cruzeiro Brasil (1993–1994)</displayName>
+				<displayName count="one">cruzeiro Brasil (1993–1994)</displayName>
+				<displayName count="two">cruzeiro Brasil (1993–1994)</displayName>
+				<displayName count="few">cruzeiro Brasil (1993–1994)</displayName>
+				<displayName count="many">cruzeiro Brasil (1993–1994)</displayName>
+				<displayName count="other">cruzeiro Brasil (1993–1994)</displayName>
+				<symbol draft="contributed">BRR</symbol>
+			</currency>
+			<currency type="BRZ">
+				<displayName>Cruzeiro Brasil (1942–1967)</displayName>
+				<displayName count="zero">cruzeiro Brasil (1942–1967)</displayName>
+				<displayName count="one">cruzeiro Brasil (1942–1967)</displayName>
+				<displayName count="two">cruzeiro Brasil (1942–1967)</displayName>
+				<displayName count="few">cruzeiro Brasil (1942–1967)</displayName>
+				<displayName count="many">cruzeiro Brasil (1942–1967)</displayName>
+				<displayName count="other">cruzeiro Brasil (1942–1967)</displayName>
+				<symbol draft="contributed">BRZ</symbol>
+			</currency>
+			<currency type="BSD">
+				<displayName>Doler y Bahamas</displayName>
+				<displayName count="zero">doler y Bahamas</displayName>
+				<displayName count="one">doler y Bahamas</displayName>
+				<displayName count="two">doler y Bahamas</displayName>
+				<displayName count="few">doler y Bahamas</displayName>
+				<displayName count="many">doler y Bahamas</displayName>
+				<displayName count="other">doler y Bahamas</displayName>
+				<symbol draft="contributed">BSD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BTN">
+				<displayName>Ngultrum Bhutan</displayName>
+				<displayName count="zero">Ngultrum Bhutan</displayName>
+				<displayName count="one">Ngultrum Bhutan</displayName>
+				<displayName count="two">Ngultrum Bhutan</displayName>
+				<displayName count="few">Ngultrum Bhutan</displayName>
+				<displayName count="many">Ngultrum Bhutan</displayName>
+				<displayName count="other">Ngultrum Bhutan</displayName>
+				<symbol draft="contributed">BTN</symbol>
+			</currency>
+			<currency type="BUK">
+				<displayName>Kyat Byrma</displayName>
+				<displayName count="zero">kyat Byrma</displayName>
+				<displayName count="one">kyat Byrma</displayName>
+				<displayName count="two">kyat Byrma</displayName>
+				<displayName count="few">kyat Byrma</displayName>
+				<displayName count="many">kyat Byrma</displayName>
+				<displayName count="other">kyat Byrma</displayName>
+				<symbol draft="contributed">BUK</symbol>
+			</currency>
+			<currency type="BWP">
+				<displayName>Pula Botswana</displayName>
+				<displayName count="zero">pula Botswana</displayName>
+				<displayName count="one">pula Botswana</displayName>
+				<displayName count="two">pula Botswana</displayName>
+				<displayName count="few">pula Botswana</displayName>
+				<displayName count="many">pula Botswana</displayName>
+				<displayName count="other">pula Botswana</displayName>
+				<symbol draft="contributed">BWP</symbol>
+				<symbol alt="narrow" draft="contributed">BWP</symbol>
+			</currency>
+			<currency type="BYR">
+				<displayName>Rwbl Belarws</displayName>
+				<displayName count="zero">rwbl Belarws</displayName>
+				<displayName count="one">rwbl Belarws</displayName>
+				<displayName count="two">rwbl Belarws</displayName>
+				<displayName count="few">rwbl Belarws</displayName>
+				<displayName count="many">rwbl Belarws</displayName>
+				<displayName count="other">rwbl Belarws</displayName>
+				<symbol draft="contributed">BYR</symbol>
+				<symbol alt="narrow" draft="contributed">р.</symbol>
+			</currency>
+			<currency type="BZD">
+				<displayName>Doler Belize</displayName>
+				<displayName count="zero">doler Belize</displayName>
+				<displayName count="one">ddoler Belize</displayName>
+				<displayName count="two">ddoler Belize</displayName>
+				<displayName count="few">doler Belize</displayName>
+				<displayName count="many">doler Belize</displayName>
+				<displayName count="other">doler Belize</displayName>
+				<symbol>BZD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CAD">
+				<displayName>Doler Canada</displayName>
+				<displayName count="zero">doler Canada</displayName>
+				<displayName count="one">ddoler Canada</displayName>
+				<displayName count="two">ddoler Canada</displayName>
+				<displayName count="few">doler Canada</displayName>
+				<displayName count="many">doler Canada</displayName>
+				<displayName count="other">doler Canada</displayName>
+				<symbol>CA$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CDF">
+				<displayName>Ffranc Congo</displayName>
+				<displayName count="zero">ffranc Congo</displayName>
+				<displayName count="one">ffranc Congo</displayName>
+				<displayName count="two">ffranc Congo</displayName>
+				<displayName count="few">ffranc Congo</displayName>
+				<displayName count="many">ffranc Congo</displayName>
+				<displayName count="other">ffranc Congo</displayName>
+				<symbol draft="contributed">CDF</symbol>
+			</currency>
+			<currency type="CHE">
+				<symbol draft="contributed">CHE</symbol>
+			</currency>
+			<currency type="CHF">
+				<displayName>Ffranc y Swistir</displayName>
+				<displayName count="zero">ffranc y Swistir</displayName>
+				<displayName count="one">ffranc y Swistir</displayName>
+				<displayName count="two">ffranc y Swistir</displayName>
+				<displayName count="few">ffranc y Swistir</displayName>
+				<displayName count="many">ffranc y Swistir</displayName>
+				<displayName count="other">ffranc y Swistir</displayName>
+				<symbol draft="contributed">CHF</symbol>
+			</currency>
+			<currency type="CHW">
+				<symbol draft="contributed">CHW</symbol>
+			</currency>
+			<currency type="CLE">
+				<displayName>Escudo Chile</displayName>
+				<displayName count="zero">escudo Chile</displayName>
+				<displayName count="one">escudo Chile</displayName>
+				<displayName count="two">escudo Chile</displayName>
+				<displayName count="few">escudo Chile</displayName>
+				<displayName count="many">escudo Chile</displayName>
+				<displayName count="other">escudo Chile</displayName>
+				<symbol draft="contributed">CLE</symbol>
+			</currency>
+			<currency type="CLF">
+				<displayName>Uned Cyfrifo Chile (UF)</displayName>
+				<displayName count="zero">uned cyfrifo Chile (UF)</displayName>
+				<displayName count="one">uned cyfrifo Chile (UF)</displayName>
+				<displayName count="two">uned cyfrifo Chile (UF)</displayName>
+				<displayName count="few">uned cyfrifo Chile (UF)</displayName>
+				<displayName count="many">uned cyfrifo Chile (UF)</displayName>
+				<displayName count="other">uned cyfrifo Chile (UF)</displayName>
+				<symbol draft="contributed">CLF</symbol>
+			</currency>
+			<currency type="CLP">
+				<displayName>Peso Chile</displayName>
+				<displayName count="zero">peso Chile</displayName>
+				<displayName count="one">peso Chile</displayName>
+				<displayName count="two">peso Chile</displayName>
+				<displayName count="few">peso Chile</displayName>
+				<displayName count="many">peso Chile</displayName>
+				<displayName count="other">peso Chile</displayName>
+				<symbol draft="contributed">CLP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CNX">
+				<displayName>Doler Banc Pobl Tsieina</displayName>
+				<displayName count="zero">doler Banc Pobl Tsieina</displayName>
+				<displayName count="one">ddoler Banc Pobl Tsieina</displayName>
+				<displayName count="two">ddoler Banc Pobl Tsieina</displayName>
+				<displayName count="few">doler Banc Pobl Tsieina</displayName>
+				<displayName count="many">doler Banc Pobl Tsieina</displayName>
+				<displayName count="other">doler Banc Pobl Tsieina</displayName>
+			</currency>
+			<currency type="CNY">
+				<displayName>Yuan Tsieina</displayName>
+				<displayName count="zero">yuan Tsieina</displayName>
+				<displayName count="one">yuan Tsieina</displayName>
+				<displayName count="two">yuan Tsieina</displayName>
+				<displayName count="few">yuan Tsieina</displayName>
+				<displayName count="many">yuan Tsieina</displayName>
+				<displayName count="other">yuan Tsieina</displayName>
+				<symbol>CN¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
+			</currency>
+			<currency type="COP">
+				<displayName>Peso Colombia</displayName>
+				<displayName count="zero">peso Colombia</displayName>
+				<displayName count="one">peso Colombia</displayName>
+				<displayName count="two">peso Colombia</displayName>
+				<displayName count="few">peso Colombia</displayName>
+				<displayName count="many">peso Colombia</displayName>
+				<displayName count="other">peso Colombia</displayName>
+				<symbol draft="contributed">COP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="COU">
+				<symbol draft="contributed">COU</symbol>
+			</currency>
+			<currency type="CRC">
+				<displayName>Colón Costa Rica</displayName>
+				<displayName count="zero">colón Costa Rica</displayName>
+				<displayName count="one">colón Costa Rica</displayName>
+				<displayName count="two">colón Costa Rica</displayName>
+				<displayName count="few">colón Costa Rica</displayName>
+				<displayName count="many">colón Costa Rica</displayName>
+				<displayName count="other">colón Costa Rica</displayName>
+				<symbol>CRC</symbol>
+				<symbol alt="narrow" draft="contributed">₡</symbol>
+			</currency>
+			<currency type="CSD">
+				<symbol draft="contributed">CSD</symbol>
+			</currency>
+			<currency type="CUC">
+				<displayName>Peso Trosadwy Ciwba</displayName>
+				<displayName count="zero">peso trosadwy Ciwba</displayName>
+				<displayName count="one">peso trosadwy Ciwba</displayName>
+				<displayName count="two">peso trosadwy Ciwba</displayName>
+				<displayName count="few">peso trosadwy Ciwba</displayName>
+				<displayName count="many">peso trosadwy Ciwba</displayName>
+				<displayName count="other">peso trosadwy Ciwba</displayName>
+				<symbol draft="contributed">CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CUP">
+				<displayName>Peso Ciwba</displayName>
+				<displayName count="zero">peso Ciwba</displayName>
+				<displayName count="one">peso Ciwba</displayName>
+				<displayName count="two">peso Ciwba</displayName>
+				<displayName count="few">peso Ciwba</displayName>
+				<displayName count="many">peso Ciwba</displayName>
+				<displayName count="other">peso Ciwba</displayName>
+				<symbol draft="contributed">CUP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CVE">
+				<displayName>Esgwdo Cabo Verde</displayName>
+				<displayName count="zero">esgwdo Cabo Verde</displayName>
+				<displayName count="one">esgwdo Cabo Verde</displayName>
+				<displayName count="two">esgwdo Cabo Verde</displayName>
+				<displayName count="few">esgwdo Cabo Verde</displayName>
+				<displayName count="many">esgwdo Cabo Verde</displayName>
+				<displayName count="other">esgwdo Cabo Verde</displayName>
+				<symbol draft="contributed">CVE</symbol>
+			</currency>
+			<currency type="CYP">
+				<displayName>Punt Cyprus</displayName>
+				<displayName count="zero">punt Cyprus</displayName>
+				<displayName count="one">bunt Cyprus</displayName>
+				<displayName count="two">bunt Cyprus</displayName>
+				<displayName count="few">punt Cyprus</displayName>
+				<displayName count="many">punt Cyprus</displayName>
+				<displayName count="other">punt Cyprus</displayName>
+				<symbol draft="contributed">CYP</symbol>
+			</currency>
+			<currency type="CZK">
+				<displayName>Koruna Tsiec</displayName>
+				<displayName count="zero">koruna’r Weriniaeth Tsiec</displayName>
+				<displayName count="one">koruna’r Weriniaeth Tsiec</displayName>
+				<displayName count="two">koruna’r Weriniaeth Tsiec</displayName>
+				<displayName count="few">koruna’r Weriniaeth Tsiec</displayName>
+				<displayName count="many">koruna’r Weriniaeth Tsiec</displayName>
+				<displayName count="other">koruna’r Weriniaeth Tsiec</displayName>
+				<symbol draft="contributed">CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
+			</currency>
+			<currency type="DDM">
+				<symbol draft="contributed">DDM</symbol>
+			</currency>
+			<currency type="DEM">
+				<symbol draft="contributed">DEM</symbol>
+			</currency>
+			<currency type="DJF">
+				<displayName>Ffranc Djibouti</displayName>
+				<displayName count="zero">ffranc Djibouti</displayName>
+				<displayName count="one">ffranc Djibouti</displayName>
+				<displayName count="two">ffranc Djibouti</displayName>
+				<displayName count="few">ffranc Djibouti</displayName>
+				<displayName count="many">ffranc Djibouti</displayName>
+				<displayName count="other">ffranc Djibouti</displayName>
+				<symbol draft="contributed">DJF</symbol>
+			</currency>
+			<currency type="DKK">
+				<displayName>Krone Denmarc</displayName>
+				<displayName count="zero">krone Denmarc</displayName>
+				<displayName count="one">krone Denmarc</displayName>
+				<displayName count="two">krone Denmarc</displayName>
+				<displayName count="few">krone Denmarc</displayName>
+				<displayName count="many">krone Denmarc</displayName>
+				<displayName count="other">krone Denmarc</displayName>
+				<symbol draft="contributed">DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="DOP">
+				<displayName>Peso Gweriniaeth Dominica</displayName>
+				<displayName count="zero">peso Gweriniaeth Dominica</displayName>
+				<displayName count="one">peso Gweriniaeth Dominica</displayName>
+				<displayName count="two">peso Gweriniaeth Dominica</displayName>
+				<displayName count="few">peso Gweriniaeth Dominica</displayName>
+				<displayName count="many">peso Gweriniaeth Dominica</displayName>
+				<displayName count="other">peso Gweriniaeth Dominica</displayName>
+				<symbol draft="contributed">DOP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="DZD">
+				<displayName>Dinar Algeria</displayName>
+				<displayName count="zero">dinar Algeria</displayName>
+				<displayName count="one">dinar Algeria</displayName>
+				<displayName count="two">dinar Algeria</displayName>
+				<displayName count="few">dinar Algeria</displayName>
+				<displayName count="many">dinar Algeria</displayName>
+				<displayName count="other">dinar Algeria</displayName>
+				<symbol draft="contributed">DZD</symbol>
+			</currency>
+			<currency type="ECS">
+				<displayName>Sucre Ecuador</displayName>
+				<displayName count="zero">sucre Ecuador</displayName>
+				<displayName count="one">sucre Ecuador</displayName>
+				<displayName count="two">sucre Ecuador</displayName>
+				<displayName count="few">sucre Ecuador</displayName>
+				<displayName count="many">sucre Ecuador</displayName>
+				<displayName count="other">sucre Ecuador</displayName>
+				<symbol draft="contributed">ECS</symbol>
+			</currency>
+			<currency type="EGP">
+				<displayName>Punt Yr Aifft</displayName>
+				<displayName count="zero">punt yr Aifft</displayName>
+				<displayName count="one">bunt yr Aifft</displayName>
+				<displayName count="two">bunt yr Aifft</displayName>
+				<displayName count="few">punt yr Aifft</displayName>
+				<displayName count="many">phunt yr Aifft</displayName>
+				<displayName count="other">punt yr Aifft</displayName>
+				<symbol draft="contributed">EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
+			</currency>
+			<currency type="ERN">
+				<displayName>Nakfa Eritrea</displayName>
+				<displayName count="zero">nakfa Eritrea</displayName>
+				<displayName count="one">nakfa Eritrea</displayName>
+				<displayName count="two">nakfa Eritrea</displayName>
+				<displayName count="few">nakfa Eritrea</displayName>
+				<displayName count="many">nakfa Eritrea</displayName>
+				<displayName count="other">nakfa Eritrea</displayName>
+				<symbol draft="contributed">ERN</symbol>
+			</currency>
+			<currency type="ESP">
+				<symbol draft="contributed">ESP</symbol>
+			</currency>
+			<currency type="ETB">
+				<displayName>Birr Ethiopia</displayName>
+				<displayName count="zero">birr Ethiopia</displayName>
+				<displayName count="one">birr Ethiopia</displayName>
+				<displayName count="two">birr Ethiopia</displayName>
+				<displayName count="few">birr Ethiopia</displayName>
+				<displayName count="many">birr Ethiopia</displayName>
+				<displayName count="other">birr Ethiopia</displayName>
+				<symbol draft="contributed">ETB</symbol>
+			</currency>
+			<currency type="EUR">
+				<displayName>Ewro</displayName>
+				<displayName count="zero">Ewro</displayName>
+				<displayName count="one">Ewro</displayName>
+				<displayName count="two">Ewro</displayName>
+				<displayName count="few">Ewro</displayName>
+				<displayName count="many">Ewro</displayName>
+				<displayName count="other">Ewro</displayName>
+				<symbol>€</symbol>
+				<symbol alt="narrow" draft="contributed">€</symbol>
+			</currency>
+			<currency type="FIM">
+				<symbol draft="contributed">FIM</symbol>
+			</currency>
+			<currency type="FJD">
+				<displayName>Doler Ffiji</displayName>
+				<displayName count="zero">Doler Ffiji</displayName>
+				<displayName count="one">Doler Ffiji</displayName>
+				<displayName count="two">Doler Ffiji</displayName>
+				<displayName count="few">Doler Ffiji</displayName>
+				<displayName count="many">Doler Ffiji</displayName>
+				<displayName count="other">Doler Ffiji</displayName>
+				<symbol draft="contributed">FJD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="FKP">
+				<displayName>Punt Ynysoedd Falkland/Malvinas</displayName>
+				<displayName count="zero">punt Ynysoedd Falkland/Malvinas</displayName>
+				<displayName count="one">bunt Ynysoedd Falkland/Malvinas</displayName>
+				<displayName count="two">bunt Ynysoedd Falkland/Malvinas</displayName>
+				<displayName count="few">punt Ynysoedd Falkland/Malvinas</displayName>
+				<displayName count="many">phunt Ynysoedd Falkland/Malvinas</displayName>
+				<displayName count="other">punt Ynysoedd Falkland/Malvinas</displayName>
+				<symbol draft="contributed">FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="FRF">
+				<symbol draft="contributed">FRF</symbol>
+			</currency>
+			<currency type="GBP">
+				<displayName>Punt Prydain</displayName>
+				<displayName count="zero">punt Prydain</displayName>
+				<displayName count="one">bunt Prydain</displayName>
+				<displayName count="two">bunt Prydain</displayName>
+				<displayName count="few">punt Prydain</displayName>
+				<displayName count="many">phunt Prydain</displayName>
+				<displayName count="other">punt Prydain</displayName>
+				<symbol>£</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="GEK">
+				<displayName>Kupon Larit Georgia</displayName>
+				<displayName count="zero">kupon larit Georgia</displayName>
+				<displayName count="one">kupon larit Georgia</displayName>
+				<displayName count="two">kupon larit Georgia</displayName>
+				<displayName count="few">kupon larit Georgia</displayName>
+				<displayName count="many">kupon larit Georgia</displayName>
+				<displayName count="other">kupon larit Georgia</displayName>
+				<symbol draft="contributed">GEK</symbol>
+			</currency>
+			<currency type="GEL">
+				<displayName>Lari Georgia</displayName>
+				<displayName count="zero">lari Georgia</displayName>
+				<displayName count="one">lari Georgia</displayName>
+				<displayName count="two">lari Georgia</displayName>
+				<displayName count="few">lari Georgia</displayName>
+				<displayName count="many">lari Georgia</displayName>
+				<displayName count="other">lari Georgia</displayName>
+				<symbol draft="contributed">GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
+			</currency>
+			<currency type="GHC">
+				<displayName>Cedi Ghana (1979–2007)</displayName>
+				<displayName count="zero">cedi Ghana (1979–2007)</displayName>
+				<displayName count="one">cedi Ghana (1979–2007)</displayName>
+				<displayName count="two">cedi Ghana (1979–2007)</displayName>
+				<displayName count="few">cedi Ghana (1979–2007)</displayName>
+				<displayName count="many">cedi Ghana (1979–2007)</displayName>
+				<displayName count="other">cedi Ghana (1979–2007)</displayName>
+				<symbol draft="contributed">GHC</symbol>
+			</currency>
+			<currency type="GHS">
+				<displayName>Cedi Ghana</displayName>
+				<displayName count="zero">cedi Ghana</displayName>
+				<displayName count="one">cedi Ghana</displayName>
+				<displayName count="two">cedi Ghana</displayName>
+				<displayName count="few">cedi Ghana</displayName>
+				<displayName count="many">cedi Ghana</displayName>
+				<displayName count="other">cedi Ghana</displayName>
+				<symbol draft="contributed">GHS</symbol>
+			</currency>
+			<currency type="GIP">
+				<displayName>Punt Gibraltar</displayName>
+				<displayName count="zero">punt Gibraltar</displayName>
+				<displayName count="one">bunt Gibraltar</displayName>
+				<displayName count="two">bunt Gibraltar</displayName>
+				<displayName count="few">punt Gibraltar</displayName>
+				<displayName count="many">phunt Gibraltar</displayName>
+				<displayName count="other">punt Gibraltar</displayName>
+				<symbol draft="contributed">GIP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="GMD">
+				<displayName>Dalasi Gambia</displayName>
+				<displayName count="zero">dalasi Gambia</displayName>
+				<displayName count="one">dalasi Gambia</displayName>
+				<displayName count="two">dalasi Gambia</displayName>
+				<displayName count="few">dalasi Gambia</displayName>
+				<displayName count="many">dalasi Gambia</displayName>
+				<displayName count="other">dalasi Gambia</displayName>
+				<symbol draft="contributed">GMD</symbol>
+			</currency>
+			<currency type="GNF">
+				<displayName>Ffranc Guinée</displayName>
+				<displayName count="zero">ffranc Guinée</displayName>
+				<displayName count="one">ffranc Guinée</displayName>
+				<displayName count="two">ffranc Guinée</displayName>
+				<displayName count="few">ffranc Guinée</displayName>
+				<displayName count="many">ffranc Guinée</displayName>
+				<displayName count="other">ffranc Guinée</displayName>
+				<symbol draft="contributed">GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
+			</currency>
+			<currency type="GNS">
+				<displayName>Syli Guinée</displayName>
+				<displayName count="zero">syli Guinée</displayName>
+				<displayName count="one">syli Guinée</displayName>
+				<displayName count="two">syli Guinée</displayName>
+				<displayName count="few">syli Guinée</displayName>
+				<displayName count="many">syli Guinée</displayName>
+				<displayName count="other">syli Guinée</displayName>
+				<symbol draft="contributed">GNS</symbol>
+			</currency>
+			<currency type="GQE">
+				<displayName>Ekwele Guinea Gyhydeddol</displayName>
+				<displayName count="zero">Ekwele Guinea Gyhydeddol</displayName>
+				<displayName count="one">Ekwele Guinea Gyhydeddol</displayName>
+				<displayName count="two">Ekwele Guinea Gyhydeddol</displayName>
+				<displayName count="few">Ekwele Guinea Gyhydeddol</displayName>
+				<displayName count="many">Ekwele Guinea Gyhydeddol</displayName>
+				<displayName count="other">Ekwele Guinea Gyhydeddol</displayName>
+				<symbol draft="contributed">GQE</symbol>
+			</currency>
+			<currency type="GRD">
+				<symbol draft="contributed">GRD</symbol>
+			</currency>
+			<currency type="GTQ">
+				<displayName>Quetzal Guatemala</displayName>
+				<displayName count="zero">quetzal Guatemala</displayName>
+				<displayName count="one">quetzal Guatemala</displayName>
+				<displayName count="two">quetzal Guatemala</displayName>
+				<displayName count="few">quetzal Guatemala</displayName>
+				<displayName count="many">quetzal Guatemala</displayName>
+				<displayName count="other">quetzal Guatemala</displayName>
+				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
+			</currency>
+			<currency type="GWE">
+				<symbol draft="contributed">GWE</symbol>
+			</currency>
+			<currency type="GWP">
+				<displayName>Peso Guiné-Bissau</displayName>
+				<displayName count="zero">peso Guiné-Bissau</displayName>
+				<displayName count="one">peso Guiné-Bissau</displayName>
+				<displayName count="two">peso Guiné-Bissau</displayName>
+				<displayName count="few">peso Guiné-Bissau</displayName>
+				<displayName count="many">peso Guiné-Bissau</displayName>
+				<displayName count="other">peso Guiné-Bissau</displayName>
+				<symbol draft="contributed">GWP</symbol>
+			</currency>
+			<currency type="GYD">
+				<displayName>Doler Guyana</displayName>
+				<displayName count="zero">doler Guyana</displayName>
+				<displayName count="one">ddoler Guyana</displayName>
+				<displayName count="two">ddoler Guyana</displayName>
+				<displayName count="few">doler Guyana</displayName>
+				<displayName count="many">doler Guyana</displayName>
+				<displayName count="other">doler Guyana</displayName>
+				<symbol draft="contributed">GYD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="HKD">
+				<displayName>Doler Hong Kong</displayName>
+				<displayName count="zero">doler Hong Kong</displayName>
+				<displayName count="one">ddoler Hong Kong</displayName>
+				<displayName count="two">ddoler Hong Kong</displayName>
+				<displayName count="few">doler Hong Kong</displayName>
+				<displayName count="many">doler Hong Kong</displayName>
+				<displayName count="other">doler Hong Kong</displayName>
+				<symbol>HK$</symbol>
+				<symbol alt="narrow" draft="contributed">HK$</symbol>
+			</currency>
+			<currency type="HNL">
+				<displayName>Lempira Honduras</displayName>
+				<displayName count="zero">lempira Honduras</displayName>
+				<displayName count="one">lempira Honduras</displayName>
+				<displayName count="two">lempira Honduras</displayName>
+				<displayName count="few">lempira Honduras</displayName>
+				<displayName count="many">lempira Honduras</displayName>
+				<displayName count="other">lempira Honduras</displayName>
+				<symbol draft="contributed">HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
+			</currency>
+			<currency type="HRD">
+				<symbol draft="contributed">HRD</symbol>
+			</currency>
+			<currency type="HRK">
+				<displayName>Kuna Croatia</displayName>
+				<displayName count="zero">kuna Croatia</displayName>
+				<displayName count="one">kuna Croatia</displayName>
+				<displayName count="two">kuna Croatia</displayName>
+				<displayName count="few">kuna Croatia</displayName>
+				<displayName count="many">kuna Croatia</displayName>
+				<displayName count="other">kuna Croatia</displayName>
+				<symbol draft="contributed">HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
+			</currency>
+			<currency type="HTG">
+				<displayName>Gourde Haiti</displayName>
+				<displayName count="zero">gourde Haiti</displayName>
+				<displayName count="one">gourde Haiti</displayName>
+				<displayName count="two">gourde Haiti</displayName>
+				<displayName count="few">gourde Haiti</displayName>
+				<displayName count="many">gourde Haiti</displayName>
+				<displayName count="other">gourde Haiti</displayName>
+				<symbol draft="contributed">HTG</symbol>
+			</currency>
+			<currency type="HUF">
+				<displayName>Fforint Hwngari</displayName>
+				<displayName count="zero">fforint Hwngari</displayName>
+				<displayName count="one">fforint Hwngari</displayName>
+				<displayName count="two">fforint Hwngari</displayName>
+				<displayName count="few">fforint Hwngari</displayName>
+				<displayName count="many">fforint Hwngari</displayName>
+				<displayName count="other">fforint Hwngari</displayName>
+				<symbol draft="contributed">HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
+			</currency>
+			<currency type="IDR">
+				<displayName>Rupiah Indonesia</displayName>
+				<displayName count="zero">Rupiah Indonesia</displayName>
+				<displayName count="one">Rupiah Indonesia</displayName>
+				<displayName count="two">Rupiah Indonesia</displayName>
+				<displayName count="few">Rupiah Indonesia</displayName>
+				<displayName count="many">Rupiah Indonesia</displayName>
+				<displayName count="other">Rupiah Indonesia</displayName>
+				<symbol draft="contributed">IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
+			</currency>
+			<currency type="IEP">
+				<displayName>Punt Iwerddon</displayName>
+				<displayName count="zero">punt Iwerddon</displayName>
+				<displayName count="one">bunt Iwerddon</displayName>
+				<displayName count="two">bunt Iwerddon</displayName>
+				<displayName count="few">punt Iwerddon</displayName>
+				<displayName count="many">phunt Iwerddon</displayName>
+				<displayName count="other">punt Iwerddon</displayName>
+				<symbol draft="contributed">IEP</symbol>
+			</currency>
+			<currency type="ILP">
+				<displayName>Punt Israel</displayName>
+				<displayName count="zero">punt Israel</displayName>
+				<displayName count="one">bunt Israel</displayName>
+				<displayName count="two">bunt Israel</displayName>
+				<displayName count="few">punt Israel</displayName>
+				<displayName count="many">phunt Israel</displayName>
+				<displayName count="other">punt Israel</displayName>
+				<symbol draft="contributed">ILP</symbol>
+			</currency>
+			<currency type="ILR">
+				<displayName>Shegel Israel (1980–1985)</displayName>
+				<displayName count="zero">shegel Israel (1980–1985)</displayName>
+				<displayName count="one">shegel Israel (1980–1985)</displayName>
+				<displayName count="two">shegel Israel (1980–1985)</displayName>
+				<displayName count="few">shegel Israel (1980–1985)</displayName>
+				<displayName count="many">shegel Israel (1980–1985)</displayName>
+				<displayName count="other">shegel Israel (1980–1985)</displayName>
+			</currency>
+			<currency type="ILS">
+				<displayName>Shegel Newydd Israel</displayName>
+				<displayName count="zero">shegel newydd Israel</displayName>
+				<displayName count="one">shegel newydd Israel</displayName>
+				<displayName count="two">shegel newydd Israel</displayName>
+				<displayName count="few">shegel newydd Israel</displayName>
+				<displayName count="many">shegel newydd Israel</displayName>
+				<displayName count="other">shegel newydd Israel</displayName>
+				<symbol>₪</symbol>
+				<symbol alt="narrow" draft="contributed">₪</symbol>
+			</currency>
+			<currency type="INR">
+				<displayName>Rwpî India</displayName>
+				<displayName count="zero">Rwpî India</displayName>
+				<displayName count="one">Rwpî India</displayName>
+				<displayName count="two">Rwpî India</displayName>
+				<displayName count="few">Rwpî India</displayName>
+				<displayName count="many">Rwpî India</displayName>
+				<displayName count="other">Rwpî India</displayName>
+				<symbol>₹</symbol>
+				<symbol alt="narrow" draft="contributed">₹</symbol>
+			</currency>
+			<currency type="IQD">
+				<displayName>Dinar Irac</displayName>
+				<displayName count="zero">dinar Irac</displayName>
+				<displayName count="one">dinar Irac</displayName>
+				<displayName count="two">dinar Irac</displayName>
+				<displayName count="few">dinar Irac</displayName>
+				<displayName count="many">dinar Irac</displayName>
+				<displayName count="other">dinar Irac</displayName>
+				<symbol draft="contributed">IQD</symbol>
+			</currency>
+			<currency type="IRR">
+				<displayName>Rial Iran</displayName>
+				<displayName count="zero">Rial Iran</displayName>
+				<displayName count="one">Rial Iran</displayName>
+				<displayName count="two">Rial Iran</displayName>
+				<displayName count="few">Rial Iran</displayName>
+				<displayName count="many">Rial Iran</displayName>
+				<displayName count="other">Rial Iran</displayName>
+				<symbol draft="contributed">IRR</symbol>
+			</currency>
+			<currency type="ISK">
+				<displayName>Króna Gwlad yr Iâ</displayName>
+				<displayName count="zero">króna Gwlad yr Iâ</displayName>
+				<displayName count="one">króna Gwlad yr Iâ</displayName>
+				<displayName count="two">króna Gwlad yr Iâ</displayName>
+				<displayName count="few">króna Gwlad yr Iâ</displayName>
+				<displayName count="many">króna Gwlad yr Iâ</displayName>
+				<displayName count="other">króna Gwlad yr Iâ</displayName>
+				<symbol draft="contributed">ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="ITL">
+				<symbol draft="contributed">ITL</symbol>
+			</currency>
+			<currency type="JMD">
+				<displayName>Doler Jamaica</displayName>
+				<displayName count="zero">doler Jamaica</displayName>
+				<displayName count="one">ddoler Jamaica</displayName>
+				<displayName count="two">ddoler Jamaica</displayName>
+				<displayName count="few">doler Jamaica</displayName>
+				<displayName count="many">doler Jamaica</displayName>
+				<displayName count="other">doler Jamaica</displayName>
+				<symbol draft="contributed">JMD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="JOD">
+				<displayName>Dinar Gwlad yr Iorddonen</displayName>
+				<displayName count="zero">dinar Gwlad yr Iorddonen</displayName>
+				<displayName count="one">dinar Gwlad yr Iorddonen</displayName>
+				<displayName count="two">dinar Gwlad yr Iorddonen</displayName>
+				<displayName count="few">dinar Gwlad yr Iorddonen</displayName>
+				<displayName count="many">dinar Gwlad yr Iorddonen</displayName>
+				<displayName count="other">dinar Gwlad yr Iorddonen</displayName>
+				<symbol draft="contributed">JOD</symbol>
+			</currency>
+			<currency type="JPY">
+				<displayName>Yen Japan</displayName>
+				<displayName count="zero">yen Japan</displayName>
+				<displayName count="one">yen Japan</displayName>
+				<displayName count="two">yen Japan</displayName>
+				<displayName count="few">yen Japan</displayName>
+				<displayName count="many">yen Japan</displayName>
+				<displayName count="other">yen Japan</displayName>
+				<symbol>JP¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
+			</currency>
+			<currency type="KES">
+				<displayName>Swllt Kenya</displayName>
+				<displayName count="zero">swllt Kenya</displayName>
+				<displayName count="one">swllt Kenya</displayName>
+				<displayName count="two">swllt Kenya</displayName>
+				<displayName count="few">swllt Kenya</displayName>
+				<displayName count="many">swllt Kenya</displayName>
+				<displayName count="other">swllt Kenya</displayName>
+				<symbol draft="contributed">KES</symbol>
+			</currency>
+			<currency type="KGS">
+				<displayName>Som Kyrgyzstan</displayName>
+				<displayName count="zero">Som Kyrgyzstan</displayName>
+				<displayName count="one">Som Kyrgyzstan</displayName>
+				<displayName count="two">Som Kyrgyzstan</displayName>
+				<displayName count="few">Som Kyrgyzstan</displayName>
+				<displayName count="many">Som Kyrgyzstan</displayName>
+				<displayName count="other">Som Kyrgyzstan</displayName>
+				<symbol draft="contributed">KGS</symbol>
+			</currency>
+			<currency type="KHR">
+				<displayName>Riel Cambodia</displayName>
+				<displayName count="zero">Riel Cambodia</displayName>
+				<displayName count="one">Riel Cambodia</displayName>
+				<displayName count="two">Riel Cambodia</displayName>
+				<displayName count="few">Riel Cambodia</displayName>
+				<displayName count="many">Riel Cambodia</displayName>
+				<displayName count="other">Riel Cambodia</displayName>
+				<symbol draft="contributed">KHR</symbol>
+				<symbol alt="narrow" draft="contributed">៛</symbol>
+			</currency>
+			<currency type="KMF">
+				<displayName>Ffranc Comoros</displayName>
+				<displayName count="zero">ffranc Comoros</displayName>
+				<displayName count="one">ffranc Comoros</displayName>
+				<displayName count="two">ffranc Comoros</displayName>
+				<displayName count="few">ffranc Comoros</displayName>
+				<displayName count="many">ffranc Comoros</displayName>
+				<displayName count="other">ffranc Comoros</displayName>
+				<symbol draft="contributed">KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
+			</currency>
+			<currency type="KPW">
+				<displayName>Won Gogledd Corea</displayName>
+				<displayName count="zero">won Gogledd Corea</displayName>
+				<displayName count="one">won Gogledd Corea</displayName>
+				<displayName count="two">won Gogledd Corea</displayName>
+				<displayName count="few">won Gogledd Corea</displayName>
+				<displayName count="many">won Gogledd Corea</displayName>
+				<displayName count="other">won Gogledd Corea</displayName>
+				<symbol draft="contributed">KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
+			</currency>
+			<currency type="KRH">
+				<displayName>Hwan De Corea (1953–1962)</displayName>
+				<displayName count="zero">hwan De Corea (1953–1962)</displayName>
+				<displayName count="one">hwan De Corea (1953–1962)</displayName>
+				<displayName count="two">hwan De Corea (1953–1962)</displayName>
+				<displayName count="few">hwan De Corea (1953–1962)</displayName>
+				<displayName count="many">hwan De Corea (1953–1962)</displayName>
+				<displayName count="other">hwan De Corea (1953–1962)</displayName>
+				<symbol draft="contributed">KRH</symbol>
+			</currency>
+			<currency type="KRO">
+				<displayName>Won De Corea (1945–1953)</displayName>
+				<displayName count="zero">won De Corea (1945–1953)</displayName>
+				<displayName count="one">won De Corea (1945–1953)</displayName>
+				<displayName count="two">won De Corea (1945–1953)</displayName>
+				<displayName count="few">won De Corea (1945–1953)</displayName>
+				<displayName count="many">won De Corea (1945–1953)</displayName>
+				<displayName count="other">won De Corea (1945–1953)</displayName>
+				<symbol draft="contributed">KRO</symbol>
+			</currency>
+			<currency type="KRW">
+				<displayName>Won De Corea</displayName>
+				<displayName count="zero">won De Corea</displayName>
+				<displayName count="one">won De Corea</displayName>
+				<displayName count="two">won De Corea</displayName>
+				<displayName count="few">won De Corea</displayName>
+				<displayName count="many">won De Corea</displayName>
+				<displayName count="other">won De Corea</displayName>
+				<symbol>KRW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
+			</currency>
+			<currency type="KWD">
+				<displayName>Dinar Kuwait</displayName>
+				<displayName count="zero">dinar Kuwait</displayName>
+				<displayName count="one">dinar Kuwait</displayName>
+				<displayName count="two">dinar Kuwait</displayName>
+				<displayName count="few">dinar Kuwait</displayName>
+				<displayName count="many">dinar Kuwait</displayName>
+				<displayName count="other">dinar Kuwait</displayName>
+				<symbol draft="contributed">KWD</symbol>
+			</currency>
+			<currency type="KYD">
+				<displayName>Doler Ynysoedd Cayman</displayName>
+				<displayName count="zero">doler Ynysoedd Cayman</displayName>
+				<displayName count="one">ddoler Ynysoedd Cayman</displayName>
+				<displayName count="two">ddoler Ynysoedd Cayman</displayName>
+				<displayName count="few">doler Ynysoedd Cayman</displayName>
+				<displayName count="many">doler Ynysoedd Cayman</displayName>
+				<displayName count="other">doler Ynysoedd Cayman</displayName>
+				<symbol draft="contributed">KYD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="KZT">
+				<displayName>Tenge Kazakstan</displayName>
+				<displayName count="zero">Tenge Kazakstan</displayName>
+				<displayName count="one">Tenge Kazakstan</displayName>
+				<displayName count="two">Tenge Kazakstan</displayName>
+				<displayName count="few">Tenge Kazakstan</displayName>
+				<displayName count="many">Tenge Kazakstan</displayName>
+				<displayName count="other">Tenge Kazakstan</displayName>
+				<symbol draft="contributed">KZT</symbol>
+				<symbol alt="narrow" draft="contributed">₸</symbol>
+			</currency>
+			<currency type="LAK">
+				<displayName>Kip Laos</displayName>
+				<displayName count="zero">Kip Laos</displayName>
+				<displayName count="one">Kip Laos</displayName>
+				<displayName count="two">Kip Laos</displayName>
+				<displayName count="few">Kip Laos</displayName>
+				<displayName count="many">Kip Laos</displayName>
+				<displayName count="other">Kip Laos</displayName>
+				<symbol draft="contributed">LAK</symbol>
+				<symbol alt="narrow" draft="contributed">₭</symbol>
+			</currency>
+			<currency type="LBP">
+				<displayName>Punt Libanus</displayName>
+				<displayName count="zero">punt Libanus</displayName>
+				<displayName count="one">bunt Libanus</displayName>
+				<displayName count="two">bunt Libanus</displayName>
+				<displayName count="few">punt Libanus</displayName>
+				<displayName count="many">phunt Libanus</displayName>
+				<displayName count="other">punt Libanus</displayName>
+				<symbol draft="contributed">LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
+			</currency>
+			<currency type="LKR">
+				<displayName>Rwpî Sri Lanka</displayName>
+				<displayName count="zero">Rwpî Sri Lanka</displayName>
+				<displayName count="one">Rwpî Sri Lanka</displayName>
+				<displayName count="two">Rwpî Sri Lanka</displayName>
+				<displayName count="few">Rwpî Sri Lanka</displayName>
+				<displayName count="many">Rwpî Sri Lanka</displayName>
+				<displayName count="other">Rwpî Sri Lanka</displayName>
+				<symbol draft="contributed">LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="LRD">
+				<displayName>Doler Liberia</displayName>
+				<displayName count="zero">doler Liberia</displayName>
+				<displayName count="one">ddoler Liberia</displayName>
+				<displayName count="two">ddoler Liberia</displayName>
+				<displayName count="few">doler Liberia</displayName>
+				<displayName count="many">doler Liberia</displayName>
+				<displayName count="other">doler Liberia</displayName>
+				<symbol draft="contributed">LRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="LSL">
+				<displayName>Loti Lesotho</displayName>
+				<displayName count="zero">loti Lesotho</displayName>
+				<displayName count="one">loti Lesotho</displayName>
+				<displayName count="two">loti Lesotho</displayName>
+				<displayName count="few">loti Lesotho</displayName>
+				<displayName count="many">loti Lesotho</displayName>
+				<displayName count="other">loti Lesotho</displayName>
+				<symbol draft="contributed">LSL</symbol>
+			</currency>
+			<currency type="LTL">
+				<displayName>Litas Lithwania</displayName>
+				<displayName count="zero">Litas Lithwania</displayName>
+				<displayName count="one">Litas Lithwania</displayName>
+				<displayName count="two">Litas Lithwania</displayName>
+				<displayName count="few">Litas Lithwania</displayName>
+				<displayName count="many">Litas Lithwania</displayName>
+				<displayName count="other">Litas Lithwania</displayName>
+				<symbol draft="contributed">LTL</symbol>
+			</currency>
+			<currency type="LTT">
+				<displayName>Talonas Lithwania</displayName>
+				<displayName count="zero">talonas Lithwania</displayName>
+				<displayName count="one">talonas Lithwania</displayName>
+				<displayName count="two">talonas Lithwania</displayName>
+				<displayName count="few">talonas Lithwania</displayName>
+				<displayName count="many">talonas Lithwania</displayName>
+				<displayName count="other">talonas Lithwania</displayName>
+				<symbol draft="contributed">LTT</symbol>
+			</currency>
+			<currency type="LUC">
+				<symbol draft="contributed">LUC</symbol>
+			</currency>
+			<currency type="LUF">
+				<symbol draft="contributed">LUF</symbol>
+			</currency>
+			<currency type="LUL">
+				<symbol draft="contributed">LUL</symbol>
+			</currency>
+			<currency type="LVL">
+				<displayName>Lats Latfia</displayName>
+				<displayName count="zero">Lats Latfia</displayName>
+				<displayName count="one">Lats Latfia</displayName>
+				<displayName count="two">Lats Latfia</displayName>
+				<displayName count="few">Lats Latfia</displayName>
+				<displayName count="many">Lats Latfia</displayName>
+				<displayName count="other">Lats Latfia</displayName>
+				<symbol draft="contributed">LVL</symbol>
+			</currency>
+			<currency type="LVR">
+				<symbol draft="contributed">LVR</symbol>
+			</currency>
+			<currency type="LYD">
+				<displayName>Dinar Libya</displayName>
+				<displayName count="zero">dinar Libya</displayName>
+				<displayName count="one">dinar Libya</displayName>
+				<displayName count="two">dinar Libya</displayName>
+				<displayName count="few">dinar Libya</displayName>
+				<displayName count="many">dinar Libya</displayName>
+				<displayName count="other">dinar Libya</displayName>
+				<symbol draft="contributed">LYD</symbol>
+			</currency>
+			<currency type="MAD">
+				<displayName>Dirham Moroco</displayName>
+				<displayName count="zero">dirham Moroco</displayName>
+				<displayName count="one">dirham Moroco</displayName>
+				<displayName count="two">dirham Moroco</displayName>
+				<displayName count="few">dirham Moroco</displayName>
+				<displayName count="many">dirham Moroco</displayName>
+				<displayName count="other">dirham Moroco</displayName>
+				<symbol draft="contributed">MAD</symbol>
+			</currency>
+			<currency type="MAF">
+				<displayName>Ffranc Moroco</displayName>
+				<displayName count="zero">ffranc Moroco</displayName>
+				<displayName count="one">ffranc Moroco</displayName>
+				<displayName count="two">ffranc Moroco</displayName>
+				<displayName count="few">ffranc Moroco</displayName>
+				<displayName count="many">ffranc Moroco</displayName>
+				<displayName count="other">ffranc Moroco</displayName>
+				<symbol draft="contributed">MAF</symbol>
+			</currency>
+			<currency type="MCF">
+				<displayName>Ffranc Monaco</displayName>
+				<displayName count="zero">ffranc Monaco</displayName>
+				<displayName count="one">ffranc Monaco</displayName>
+				<displayName count="two">ffranc Monaco</displayName>
+				<displayName count="few">ffranc Monaco</displayName>
+				<displayName count="many">ffranc Monaco</displayName>
+				<displayName count="other">ffranc Monaco</displayName>
+				<symbol draft="contributed">MCF</symbol>
+			</currency>
+			<currency type="MDL">
+				<displayName>Leu Moldofa</displayName>
+				<displayName count="zero">leu Moldofa</displayName>
+				<displayName count="one">leu Moldofa</displayName>
+				<displayName count="two">leu Moldofa</displayName>
+				<displayName count="few">leu Moldofa</displayName>
+				<displayName count="many">leu Moldofa</displayName>
+				<displayName count="other">leu Moldofa</displayName>
+				<symbol draft="contributed">MDL</symbol>
+			</currency>
+			<currency type="MGA">
+				<displayName>Ariary Madagascar</displayName>
+				<displayName count="zero">ariary Madagascar</displayName>
+				<displayName count="one">ariary Madagascar</displayName>
+				<displayName count="two">ariary Madagascar</displayName>
+				<displayName count="few">ariary Madagascar</displayName>
+				<displayName count="many">ariary Madagascar</displayName>
+				<displayName count="other">ariary Madagascar</displayName>
+				<symbol draft="contributed">MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
+			</currency>
+			<currency type="MGF">
+				<displayName>Ffranc Madagascar</displayName>
+				<displayName count="zero">ffranc Madagascar</displayName>
+				<displayName count="one">ffranc Madagascar</displayName>
+				<displayName count="two">ffranc Madagascar</displayName>
+				<displayName count="few">ffranc Madagascar</displayName>
+				<displayName count="many">ffranc Madagascar</displayName>
+				<displayName count="other">ffranc Madagascar</displayName>
+				<symbol draft="contributed">MGF</symbol>
+			</currency>
+			<currency type="MKD">
+				<displayName>Denar Macedonia</displayName>
+				<displayName count="zero">denar Macedonia</displayName>
+				<displayName count="one">denar Macedonia</displayName>
+				<displayName count="two">denar Macedonia</displayName>
+				<displayName count="few">denar Macedonia</displayName>
+				<displayName count="many">denar Macedonia</displayName>
+				<displayName count="other">denar Macedonia</displayName>
+				<symbol draft="contributed">MKD</symbol>
+			</currency>
+			<currency type="MKN">
+				<symbol draft="contributed">MKN</symbol>
+			</currency>
+			<currency type="MLF">
+				<displayName>Ffranc Mali</displayName>
+				<displayName count="zero">ffranc Mali</displayName>
+				<displayName count="one">ffranc Mali</displayName>
+				<displayName count="two">ffranc Mali</displayName>
+				<displayName count="few">ffranc Mali</displayName>
+				<displayName count="many">ffranc Mali</displayName>
+				<displayName count="other">ffranc Mali</displayName>
+				<symbol draft="contributed">MLF</symbol>
+			</currency>
+			<currency type="MMK">
+				<displayName>Kyat Myanmar</displayName>
+				<displayName count="zero">Kyat Myanmar</displayName>
+				<displayName count="one">Kyat Myanmar</displayName>
+				<displayName count="two">Kyat Myanmar</displayName>
+				<displayName count="few">Kyat Myanmar</displayName>
+				<displayName count="many">Kyat Myanmar</displayName>
+				<displayName count="other">Kyat Myanmar</displayName>
+				<symbol draft="contributed">MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
+			</currency>
+			<currency type="MNT">
+				<displayName>Tugrik Mongolia</displayName>
+				<displayName count="zero">tugrik Mongolia</displayName>
+				<displayName count="one">tugrik Mongolia</displayName>
+				<displayName count="two">tugrik Mongolia</displayName>
+				<displayName count="few">tugrik Mongolia</displayName>
+				<displayName count="many">tugrik Mongolia</displayName>
+				<displayName count="other">tugrik Mongolia</displayName>
+				<symbol draft="contributed">MNT</symbol>
+				<symbol alt="narrow" draft="contributed">₮</symbol>
+			</currency>
+			<currency type="MOP">
+				<displayName>Pataca Macau</displayName>
+				<displayName count="zero">pataca Macau</displayName>
+				<displayName count="one">pataca Macau</displayName>
+				<displayName count="two">pataca Macau</displayName>
+				<displayName count="few">pataca Macau</displayName>
+				<displayName count="many">pataca Macau</displayName>
+				<displayName count="other">pataca Macau</displayName>
+				<symbol draft="contributed">MOP</symbol>
+			</currency>
+			<currency type="MRO">
+				<displayName>Ouguiya Mauritania</displayName>
+				<displayName count="zero">ouguiya Mauritania</displayName>
+				<displayName count="one">ouguiya Mauritania</displayName>
+				<displayName count="two">ouguiya Mauritania</displayName>
+				<displayName count="few">ouguiya Mauritania</displayName>
+				<displayName count="many">ouguiya Mauritania</displayName>
+				<displayName count="other">ouguiya Mauritania</displayName>
+				<symbol draft="contributed">MRO</symbol>
+			</currency>
+			<currency type="MTL">
+				<symbol draft="contributed">MTL</symbol>
+			</currency>
+			<currency type="MTP">
+				<symbol draft="contributed">MTP</symbol>
+			</currency>
+			<currency type="MUR">
+				<displayName>Rwpî Mauritius</displayName>
+				<displayName count="zero">rwpî Mauritius</displayName>
+				<displayName count="one">rwpî Mauritius</displayName>
+				<displayName count="two">rwpî Mauritius</displayName>
+				<displayName count="few">rwpî Mauritius</displayName>
+				<displayName count="many">rwpî Mauritius</displayName>
+				<displayName count="other">rwpî Mauritius</displayName>
+				<symbol draft="contributed">MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="MVP">
+				<displayName>Rwpî’r Maldives (1947–1981)</displayName>
+				<displayName count="zero">rwpî’r Maldives (1947–1981)</displayName>
+				<displayName count="one">rwpî’r Maldives (1947–1981)</displayName>
+				<displayName count="two">rwpî’r Maldives (1947–1981)</displayName>
+				<displayName count="few">rwpî’r Maldives (1947–1981)</displayName>
+				<displayName count="many">rwpî’r Maldives (1947–1981)</displayName>
+				<displayName count="other">rwpî’r Maldives (1947–1981)</displayName>
+			</currency>
+			<currency type="MVR">
+				<displayName>Rufiyaa’r Maldives</displayName>
+				<displayName count="zero">Rufiyaa’r Maldives</displayName>
+				<displayName count="one">Rufiyaa’r Maldives</displayName>
+				<displayName count="two">Rufiyaa’r Maldives</displayName>
+				<displayName count="few">Rufiyaa’r Maldives</displayName>
+				<displayName count="many">Rufiyaa’r Maldives</displayName>
+				<displayName count="other">Rufiyaa’r Maldives</displayName>
+				<symbol draft="contributed">MVR</symbol>
+			</currency>
+			<currency type="MWK">
+				<displayName>Kwacha Malawi</displayName>
+				<displayName count="zero">kwacha Malawi</displayName>
+				<displayName count="one">kwacha Malawi</displayName>
+				<displayName count="two">kwacha Malawi</displayName>
+				<displayName count="few">kwacha Malawi</displayName>
+				<displayName count="many">kwacha Malawi</displayName>
+				<displayName count="other">kwacha Malawi</displayName>
+				<symbol draft="contributed">MWK</symbol>
+			</currency>
+			<currency type="MXN">
+				<displayName>Peso Mecsico</displayName>
+				<displayName count="zero">peso Mecsico</displayName>
+				<displayName count="one">peso Mecsico</displayName>
+				<displayName count="two">peso Mecsico</displayName>
+				<displayName count="few">peso Mecsico</displayName>
+				<displayName count="many">peso Mecsico</displayName>
+				<displayName count="other">peso Mecsico</displayName>
+				<symbol>MX$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="MXP">
+				<displayName>Peso Arian México (1861–1992)</displayName>
+				<displayName count="zero">peso arian México (1861–1992)</displayName>
+				<displayName count="one">peso arian México (1861–1992)</displayName>
+				<displayName count="two">peso arian México (1861–1992)</displayName>
+				<displayName count="few">peso arian México (1861–1992)</displayName>
+				<displayName count="many">peso arian México (1861–1992)</displayName>
+				<displayName count="other">peso arian México (1861–1992)</displayName>
+				<symbol draft="contributed">MXP</symbol>
+			</currency>
+			<currency type="MXV">
+				<displayName>Uned Fuddsoddi México</displayName>
+				<displayName count="zero">uned fuddsoddi México</displayName>
+				<displayName count="one">uned fuddsoddi México</displayName>
+				<displayName count="two">uned fuddsoddi México</displayName>
+				<displayName count="few">uned fuddsoddi México</displayName>
+				<displayName count="many">uned fuddsoddi México</displayName>
+				<displayName count="other">uned fuddsoddi México</displayName>
+				<symbol draft="contributed">MXV</symbol>
+			</currency>
+			<currency type="MYR">
+				<displayName>Ringgit Malaysia</displayName>
+				<displayName count="zero">Ringgit Malaysia</displayName>
+				<displayName count="one">Ringgit Malaysia</displayName>
+				<displayName count="two">Ringgit Malaysia</displayName>
+				<displayName count="few">Ringgit Malaysia</displayName>
+				<displayName count="many">Ringgit Malaysia</displayName>
+				<displayName count="other">Ringgit Malaysia</displayName>
+				<symbol draft="contributed">MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
+			</currency>
+			<currency type="MZE">
+				<displayName>Escudo Mozambique</displayName>
+				<displayName count="zero">escudo Mozambique</displayName>
+				<displayName count="one">escudo Mozambique</displayName>
+				<displayName count="two">escudo Mozambique</displayName>
+				<displayName count="few">escudo Mozambique</displayName>
+				<displayName count="many">escudo Mozambique</displayName>
+				<displayName count="other">escudo Mozambique</displayName>
+				<symbol draft="contributed">MZE</symbol>
+			</currency>
+			<currency type="MZM">
+				<displayName>Metical Mozambique (1980–2006)</displayName>
+				<displayName count="zero">metical Mozambique (1980–2006)</displayName>
+				<displayName count="one">metical Mozambique (1980–2006)</displayName>
+				<displayName count="two">metical Mozambique (1980–2006)</displayName>
+				<displayName count="few">metical Mozambique (1980–2006)</displayName>
+				<displayName count="many">metical Mozambique (1980–2006)</displayName>
+				<displayName count="other">metical Mozambique (1980–2006)</displayName>
+				<symbol draft="contributed">MZM</symbol>
+			</currency>
+			<currency type="MZN">
+				<displayName>Metical Mozambique</displayName>
+				<displayName count="zero">metical Mozambique</displayName>
+				<displayName count="one">metical Mozambique</displayName>
+				<displayName count="two">metical Mozambique</displayName>
+				<displayName count="few">metical Mozambique</displayName>
+				<displayName count="many">metical Mozambique</displayName>
+				<displayName count="other">metical Mozambique</displayName>
+				<symbol draft="contributed">MZN</symbol>
+			</currency>
+			<currency type="NAD">
+				<displayName>Doler Namibia</displayName>
+				<displayName count="zero">doler Namibia</displayName>
+				<displayName count="one">ddoler Namibia</displayName>
+				<displayName count="two">ddoler Namibia</displayName>
+				<displayName count="few">doler Namibia</displayName>
+				<displayName count="many">doler Namibia</displayName>
+				<displayName count="other">doler Namibia</displayName>
+				<symbol draft="contributed">NAD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="NGN">
+				<displayName>Naira Nigeria</displayName>
+				<displayName count="zero">naira Nigeria</displayName>
+				<displayName count="one">naira Nigeria</displayName>
+				<displayName count="two">naira Nigeria</displayName>
+				<displayName count="few">naira Nigeria</displayName>
+				<displayName count="many">naira Nigeria</displayName>
+				<displayName count="other">naira Nigeria</displayName>
+				<symbol draft="contributed">NGN</symbol>
+				<symbol alt="narrow" draft="contributed">₦</symbol>
+			</currency>
+			<currency type="NIC">
+				<displayName>Córdoba Nicaragua (1988–1991)</displayName>
+				<displayName count="zero">córdoba Nicaragua (1988–1991)</displayName>
+				<displayName count="one">córdoba Nicaragua (1988–1991)</displayName>
+				<displayName count="two">córdoba Nicaragua (1988–1991)</displayName>
+				<displayName count="few">córdoba Nicaragua (1988–1991)</displayName>
+				<displayName count="many">córdoba Nicaragua (1988–1991)</displayName>
+				<displayName count="other">córdoba Nicaragua (1988–1991)</displayName>
+				<symbol draft="contributed">NIC</symbol>
+			</currency>
+			<currency type="NIO">
+				<displayName>Cordoba Nicaragwa</displayName>
+				<displayName count="zero">Cordoba Nicaragwa</displayName>
+				<displayName count="one">Cordoba Nicaragwa</displayName>
+				<displayName count="two">Cordoba Nicaragwa</displayName>
+				<displayName count="few">Cordoba Nicaragwa</displayName>
+				<displayName count="many">Cordoba Nicaragwa</displayName>
+				<displayName count="other">Cordoba Nicaragwa</displayName>
+				<symbol draft="contributed">NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
+			</currency>
+			<currency type="NLG">
+				<displayName>Guilder yr Iseldiroedd</displayName>
+				<displayName count="zero">guilder yr Iseldiroedd</displayName>
+				<displayName count="one">guilder yr Iseldiroedd</displayName>
+				<displayName count="two">guilder yr Iseldiroedd</displayName>
+				<displayName count="few">guilder yr Iseldiroedd</displayName>
+				<displayName count="many">guilder yr Iseldiroedd</displayName>
+				<displayName count="other">guilder yr Iseldiroedd</displayName>
+				<symbol draft="contributed">NLG</symbol>
+			</currency>
+			<currency type="NOK">
+				<displayName>Krone Norwy</displayName>
+				<displayName count="zero">krone Norwy</displayName>
+				<displayName count="one">krone Norwy</displayName>
+				<displayName count="two">krone Norwy</displayName>
+				<displayName count="few">krone Norwy</displayName>
+				<displayName count="many">krone Norwy</displayName>
+				<displayName count="other">krone Norwy</displayName>
+				<symbol draft="contributed">NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="NPR">
+				<displayName>Rwpî Nepal</displayName>
+				<displayName count="zero">Rwpî Nepal</displayName>
+				<displayName count="one">Rwpî Nepal</displayName>
+				<displayName count="two">Rwpî Nepal</displayName>
+				<displayName count="few">Rwpî Nepal</displayName>
+				<displayName count="many">Rwpî Nepal</displayName>
+				<displayName count="other">Rwpî Nepal</displayName>
+				<symbol draft="contributed">NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="NZD">
+				<displayName>Doler Seland Newydd</displayName>
+				<displayName count="zero">Doler Seland Newydd</displayName>
+				<displayName count="one">Doler Seland Newydd</displayName>
+				<displayName count="two">Doler Seland Newydd</displayName>
+				<displayName count="few">Doler Seland Newydd</displayName>
+				<displayName count="many">Doler Seland Newydd</displayName>
+				<displayName count="other">Doler Seland Newydd</displayName>
+				<symbol>NZ$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="OMR">
+				<displayName>Rial Oman</displayName>
+				<displayName count="zero">rial Oman</displayName>
+				<displayName count="one">rial Oman</displayName>
+				<displayName count="two">rial Oman</displayName>
+				<displayName count="few">rial Oman</displayName>
+				<displayName count="many">rial Oman</displayName>
+				<displayName count="other">rial Oman</displayName>
+				<symbol draft="contributed">OMR</symbol>
+			</currency>
+			<currency type="PAB">
+				<displayName>Balboa Panama</displayName>
+				<displayName count="zero">balboa Panama</displayName>
+				<displayName count="one">balboa Panama</displayName>
+				<displayName count="two">balboa Panama</displayName>
+				<displayName count="few">balboa Panama</displayName>
+				<displayName count="many">balboa Panama</displayName>
+				<displayName count="other">balboa Panama</displayName>
+				<symbol draft="contributed">PAB</symbol>
+			</currency>
+			<currency type="PEI">
+				<displayName>Inti Periw</displayName>
+				<displayName count="zero">inti Periw</displayName>
+				<displayName count="one">inti Periw</displayName>
+				<displayName count="two">inti Periw</displayName>
+				<displayName count="few">inti Periw</displayName>
+				<displayName count="many">inti Periw</displayName>
+				<displayName count="other">inti Periw</displayName>
+				<symbol draft="contributed">PEI</symbol>
+			</currency>
+			<currency type="PEN">
+				<displayName>Nuevo Sol Periw</displayName>
+				<displayName count="zero">nuevo sol Periw</displayName>
+				<displayName count="one">nuevo sol Periw</displayName>
+				<displayName count="two">nuevo sol Periw</displayName>
+				<displayName count="few">nuevo sol Periw</displayName>
+				<displayName count="many">nuevo sol Periw</displayName>
+				<displayName count="other">nuevo sol Periw</displayName>
+				<symbol draft="contributed">PEN</symbol>
+			</currency>
+			<currency type="PES">
+				<displayName>Sol Periw (1863–1965)</displayName>
+				<displayName count="zero">sol Periw (1863–1965)</displayName>
+				<displayName count="one">sol Periw (1863–1965)</displayName>
+				<displayName count="two">sol Periw (1863–1965)</displayName>
+				<displayName count="few">sol Periw (1863–1965)</displayName>
+				<displayName count="many">sol Periw (1863–1965)</displayName>
+				<displayName count="other">sol Periw (1863–1965)</displayName>
+				<symbol draft="contributed">PES</symbol>
+			</currency>
+			<currency type="PGK">
+				<displayName>Kina Papua Guinea Newydd</displayName>
+				<displayName count="zero">Kina Papua Guinea Newydd</displayName>
+				<displayName count="one">Kina Papua Guinea Newydd</displayName>
+				<displayName count="two">Kina Papua Guinea Newydd</displayName>
+				<displayName count="few">Kina Papua Guinea Newydd</displayName>
+				<displayName count="many">Kina Papua Guinea Newydd</displayName>
+				<displayName count="other">Kina Papua Guinea Newydd</displayName>
+				<symbol draft="contributed">PGK</symbol>
+			</currency>
+			<currency type="PHP">
+				<displayName>Peso’r Philipinau</displayName>
+				<displayName count="zero">Peso Pilipinas</displayName>
+				<displayName count="one">Peso Pilipinas</displayName>
+				<displayName count="two">Peso Pilipinas</displayName>
+				<displayName count="few">Peso Pilipinas</displayName>
+				<displayName count="many">Peso Pilipinas</displayName>
+				<displayName count="other">Peso Pilipinas</displayName>
+				<symbol draft="contributed">PHP</symbol>
+				<symbol alt="narrow" draft="contributed">₱</symbol>
+			</currency>
+			<currency type="PKR">
+				<displayName>Rwpî Pacistan</displayName>
+				<displayName count="zero">Rwpî Pacistan</displayName>
+				<displayName count="one">Rwpî Pacistan</displayName>
+				<displayName count="two">Rwpî Pacistan</displayName>
+				<displayName count="few">Rwpî Pacistan</displayName>
+				<displayName count="many">Rwpî Pacistan</displayName>
+				<displayName count="other">Rwpî Pacistan</displayName>
+				<symbol draft="contributed">PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="PLN">
+				<displayName>Zloty Gwlad Pwyl</displayName>
+				<displayName count="zero">zloty Gwlad Pwyl</displayName>
+				<displayName count="one">zloty Gwlad Pwyl</displayName>
+				<displayName count="two">zloty Gwlad Pwyl</displayName>
+				<displayName count="few">zloty Gwlad Pwyl</displayName>
+				<displayName count="many">zloty Gwlad Pwyl</displayName>
+				<displayName count="other">zloty Gwlad Pwyl</displayName>
+				<symbol draft="contributed">PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
+			</currency>
+			<currency type="PTE">
+				<symbol draft="contributed">PTE</symbol>
+			</currency>
+			<currency type="PYG">
+				<displayName>Guarani Paraguay</displayName>
+				<displayName count="zero">guarani Paraguay</displayName>
+				<displayName count="one">guarani Paraguay</displayName>
+				<displayName count="two">guarani Paraguay</displayName>
+				<displayName count="few">guarani Paraguay</displayName>
+				<displayName count="many">guarani Paraguay</displayName>
+				<displayName count="other">guarani Paraguay</displayName>
+				<symbol draft="contributed">PYG</symbol>
+				<symbol alt="narrow" draft="contributed">₲</symbol>
+			</currency>
+			<currency type="QAR">
+				<displayName>Rial Qatar</displayName>
+				<displayName count="zero">rial Qatar</displayName>
+				<displayName count="one">rial Qatar</displayName>
+				<displayName count="two">rial Qatar</displayName>
+				<displayName count="few">rial Qatar</displayName>
+				<displayName count="many">rial Qatar</displayName>
+				<displayName count="other">rial Qatar</displayName>
+				<symbol draft="contributed">QAR</symbol>
+			</currency>
+			<currency type="RHD">
+				<displayName>Doler Rhodesia</displayName>
+				<displayName count="zero">doler Rhodesia</displayName>
+				<displayName count="one">ddoler Rhodesia</displayName>
+				<displayName count="two">ddoler Rhodesia</displayName>
+				<displayName count="few">doler Rhodesia</displayName>
+				<displayName count="many">doler Rhodesia</displayName>
+				<displayName count="other">doler Rhodesia</displayName>
+				<symbol draft="contributed">RHD</symbol>
+			</currency>
+			<currency type="RON">
+				<displayName>Leu Rwmania</displayName>
+				<displayName count="zero">leu Rwmania</displayName>
+				<displayName count="one">leu Rwmania</displayName>
+				<displayName count="two">leu Rwmania</displayName>
+				<displayName count="few">leu Rwmania</displayName>
+				<displayName count="many">leu Rwmania</displayName>
+				<displayName count="other">leu Rwmania</displayName>
+				<symbol draft="contributed">RON</symbol>
+			</currency>
+			<currency type="RSD">
+				<displayName>Dinar Serbia</displayName>
+				<displayName count="zero">dinar Serbia</displayName>
+				<displayName count="one">dinar Serbia</displayName>
+				<displayName count="two">dinar Serbia</displayName>
+				<displayName count="few">dinar Serbia</displayName>
+				<displayName count="many">dinar Serbia</displayName>
+				<displayName count="other">dinar Serbia</displayName>
+				<symbol draft="contributed">RSD</symbol>
+			</currency>
+			<currency type="RUB">
+				<displayName>Rwbl Rwsia</displayName>
+				<displayName count="zero">rwbl Rwsia</displayName>
+				<displayName count="one">rwbl Rwsia</displayName>
+				<displayName count="two">rwbl Rwsia</displayName>
+				<displayName count="few">rwbl Rwsia</displayName>
+				<displayName count="many">rwbl Rwsia</displayName>
+				<displayName count="other">rwbl Rwsia</displayName>
+				<symbol draft="contributed">RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
+			</currency>
+			<currency type="RWF">
+				<displayName>Ffranc Rwanda</displayName>
+				<displayName count="zero">ffranc Rwanda</displayName>
+				<displayName count="one">ffranc Rwanda</displayName>
+				<displayName count="two">ffranc Rwanda</displayName>
+				<displayName count="few">ffranc Rwanda</displayName>
+				<displayName count="many">ffranc Rwanda</displayName>
+				<displayName count="other">ffranc Rwanda</displayName>
+				<symbol draft="contributed">RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
+			</currency>
+			<currency type="SAR">
+				<displayName>Riyal Saudi Arabia</displayName>
+				<displayName count="zero">riyal Saudi Arabia</displayName>
+				<displayName count="one">Riyal Saudi Arabia</displayName>
+				<displayName count="two">riyal Saudi Arabia</displayName>
+				<displayName count="few">riyal Saudi Arabia</displayName>
+				<displayName count="many">riyal Saudi Arabia</displayName>
+				<displayName count="other">riyal Saudi Arabia</displayName>
+				<symbol draft="contributed">SAR</symbol>
+			</currency>
+			<currency type="SBD">
+				<displayName>Doler Ynysoedd Solomon</displayName>
+				<displayName count="zero">Doler Ynysoedd Solomon</displayName>
+				<displayName count="one">Doler Ynysoedd Solomon</displayName>
+				<displayName count="two">Doler Ynysoedd Solomon</displayName>
+				<displayName count="few">Doler Ynysoedd Solomon</displayName>
+				<displayName count="many">Doler Ynysoedd Solomon</displayName>
+				<displayName count="other">Doler Ynysoedd Solomon</displayName>
+				<symbol draft="contributed">SBD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="SCR">
+				<displayName>Rwpî Seychelles</displayName>
+				<displayName count="zero">rwpî Seychelles</displayName>
+				<displayName count="one">rwpî Seychelles</displayName>
+				<displayName count="two">rwpî Seychelles</displayName>
+				<displayName count="few">rwpî Seychelles</displayName>
+				<displayName count="many">rwpî Seychelles</displayName>
+				<displayName count="other">rwpî Seychelles</displayName>
+				<symbol draft="contributed">SCR</symbol>
+			</currency>
+			<currency type="SDD">
+				<displayName>Dinar Sudan (1992–2007)</displayName>
+				<displayName count="zero">dinar Sudan (1992–2007)</displayName>
+				<displayName count="one">dinar Sudan (1992–2007)</displayName>
+				<displayName count="two">dinar Sudan (1992–2007)</displayName>
+				<displayName count="few">dinar Sudan (1992–2007)</displayName>
+				<displayName count="many">dinar Sudan (1992–2007)</displayName>
+				<displayName count="other">dinar Sudan (1992–2007)</displayName>
+				<symbol draft="contributed">SDD</symbol>
+			</currency>
+			<currency type="SDG">
+				<displayName>Punt Sudan</displayName>
+				<displayName count="zero">punt Sudan</displayName>
+				<displayName count="one">bunt Sudan</displayName>
+				<displayName count="two">bunt Sudan</displayName>
+				<displayName count="few">punt Sudan</displayName>
+				<displayName count="many">phunt Sudan</displayName>
+				<displayName count="other">punt Sudan</displayName>
+				<symbol draft="contributed">SDG</symbol>
+			</currency>
+			<currency type="SDP">
+				<displayName>Punt Sudan (1957–1998)</displayName>
+				<displayName count="zero">punt Sudan (1957–1998)</displayName>
+				<displayName count="one">bunt Sudan (1957–1998)</displayName>
+				<displayName count="two">bunt Sudan (1957–1998)</displayName>
+				<displayName count="few">punt Sudan (1957–1998)</displayName>
+				<displayName count="many">phunt Sudan (1957–1998)</displayName>
+				<displayName count="other">punt Sudan (1957–1998)</displayName>
+				<symbol draft="contributed">SDP</symbol>
+			</currency>
+			<currency type="SEK">
+				<displayName>Krona Sweden</displayName>
+				<displayName count="zero">krona Sweden</displayName>
+				<displayName count="one">krona Sweden</displayName>
+				<displayName count="two">krona Sweden</displayName>
+				<displayName count="few">krona Sweden</displayName>
+				<displayName count="many">krona Sweden</displayName>
+				<displayName count="other">krona Sweden</displayName>
+				<symbol draft="contributed">SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="SGD">
+				<displayName>Doler Singapore</displayName>
+				<displayName count="zero">Doler Singapore</displayName>
+				<displayName count="one">Doler Singapore</displayName>
+				<displayName count="two">Doler Singapore</displayName>
+				<displayName count="few">Doler Singapore</displayName>
+				<displayName count="many">Doler Singapore</displayName>
+				<displayName count="other">Doler Singapore</displayName>
+				<symbol draft="contributed">SGD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="SHP">
+				<displayName>Punt Saint Helena</displayName>
+				<displayName count="zero">punt St. Helena</displayName>
+				<displayName count="one">bunt St. Helena</displayName>
+				<displayName count="two">bunt St. Helena</displayName>
+				<displayName count="few">punt St. Helena</displayName>
+				<displayName count="many">phunt St. Helena</displayName>
+				<displayName count="other">punt St. Helena</displayName>
+				<symbol draft="contributed">SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="SIT">
+				<symbol draft="contributed">SIT</symbol>
+			</currency>
+			<currency type="SLL">
+				<displayName>Leone Sierra Leone</displayName>
+				<displayName count="zero">leone Sierra Leone</displayName>
+				<displayName count="one">leone Sierra Leone</displayName>
+				<displayName count="two">leone Sierra Leone</displayName>
+				<displayName count="few">leone Sierra Leone</displayName>
+				<displayName count="many">leone Sierra Leone</displayName>
+				<displayName count="other">leone Sierra Leone</displayName>
+				<symbol draft="contributed">SLL</symbol>
+			</currency>
+			<currency type="SOS">
+				<displayName>Swllt Somalia</displayName>
+				<displayName count="zero">swllt Somalia</displayName>
+				<displayName count="one">swllt Somalia</displayName>
+				<displayName count="two">swllt Somalia</displayName>
+				<displayName count="few">swllt Somalia</displayName>
+				<displayName count="many">swllt Somalia</displayName>
+				<displayName count="other">swllt Somalia</displayName>
+				<symbol draft="contributed">SOS</symbol>
+			</currency>
+			<currency type="SRD">
+				<displayName>Doler Surinam</displayName>
+				<displayName count="zero">doler Surinam</displayName>
+				<displayName count="one">ddoler Surinam</displayName>
+				<displayName count="two">ddoler Surinam</displayName>
+				<displayName count="few">doler Surinam</displayName>
+				<displayName count="many">doler Surinam</displayName>
+				<displayName count="other">doler Surinam</displayName>
+				<symbol draft="contributed">SRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="SRG">
+				<displayName>Guilder Surinam</displayName>
+				<displayName count="zero">guilder Surinam</displayName>
+				<displayName count="one">guilder Surinam</displayName>
+				<displayName count="two">guilder Surinam</displayName>
+				<displayName count="few">guilder Surinam</displayName>
+				<displayName count="many">guilder Surinam</displayName>
+				<displayName count="other">guilder Surinam</displayName>
+				<symbol draft="contributed">SRG</symbol>
+			</currency>
+			<currency type="SSP">
+				<displayName>Punt De Sudan</displayName>
+				<displayName count="zero">punt De Sudan</displayName>
+				<displayName count="one">bunt De Sudan</displayName>
+				<displayName count="two">bunt De Sudan</displayName>
+				<displayName count="few">punt De Sudan</displayName>
+				<displayName count="many">phunt De Sudan</displayName>
+				<displayName count="other">punt De Sudan</displayName>
+				<symbol draft="contributed">SSP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="STD">
+				<displayName>Dobra São Tomé a Príncipe</displayName>
+				<displayName count="zero">Dobra São Tomé a Príncipe</displayName>
+				<displayName count="one">Dobra São Tomé a Príncipe</displayName>
+				<displayName count="two">Dobra São Tomé a Príncipe</displayName>
+				<displayName count="few">Dobra São Tomé a Príncipe</displayName>
+				<displayName count="many">Dobra São Tomé a Príncipe</displayName>
+				<displayName count="other">Dobra São Tomé a Príncipe</displayName>
+				<symbol draft="contributed">STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
+			</currency>
+			<currency type="SVC">
+				<displayName>Colón El Salvador</displayName>
+				<displayName count="zero">colón El Salvador</displayName>
+				<displayName count="one">colón El Salvador</displayName>
+				<displayName count="two">colón El Salvador</displayName>
+				<displayName count="few">colón El Salvador</displayName>
+				<displayName count="many">colón El Salvador</displayName>
+				<displayName count="other">colón El Salvador</displayName>
+				<symbol draft="contributed">SVC</symbol>
+			</currency>
+			<currency type="SYP">
+				<displayName>Punt Syria</displayName>
+				<displayName count="zero">Punt Syria</displayName>
+				<displayName count="one">Punt Syria</displayName>
+				<displayName count="two">Punt Syria</displayName>
+				<displayName count="few">Punt Syria</displayName>
+				<displayName count="many">Punt Syria</displayName>
+				<displayName count="other">Punt Syria</displayName>
+				<symbol draft="contributed">SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="SZL">
+				<displayName>Lilangeni Gwlad Swazi</displayName>
+				<displayName count="zero">lilangeni Gwlad Swazi</displayName>
+				<displayName count="one">lilangeni Gwlad Swazi</displayName>
+				<displayName count="two">lilangeni Gwlad Swazi</displayName>
+				<displayName count="few">lilangeni Gwlad Swazi</displayName>
+				<displayName count="many">lilangeni Gwlad Swazi</displayName>
+				<displayName count="other">lilangeni Gwlad Swazi</displayName>
+				<symbol draft="contributed">SZL</symbol>
+			</currency>
+			<currency type="THB">
+				<displayName>Baht Gwlad Thai</displayName>
+				<displayName count="zero">Baht Gwlad Thai</displayName>
+				<displayName count="one">Baht Gwlad Thai</displayName>
+				<displayName count="two">Baht Gwlad Thai</displayName>
+				<displayName count="few">Baht Gwlad Thai</displayName>
+				<displayName count="many">Baht Gwlad Thai</displayName>
+				<displayName count="other">Baht Gwlad Thai</displayName>
+				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
+			</currency>
+			<currency type="TJR">
+				<displayName>Rwbl Tajikistan</displayName>
+				<displayName count="zero">rwbl Tajikistan</displayName>
+				<displayName count="one">rwbl Tajikistan</displayName>
+				<displayName count="two">rwbl Tajikistan</displayName>
+				<displayName count="few">rwbl Tajikistan</displayName>
+				<displayName count="many">rwbl Tajikistan</displayName>
+				<displayName count="other">rwbl Tajikistan</displayName>
+				<symbol draft="contributed">TJR</symbol>
+			</currency>
+			<currency type="TJS">
+				<displayName>Somoni Tajikistan</displayName>
+				<displayName count="zero">Somoni Tajikistan</displayName>
+				<displayName count="one">Somoni Tajikistan</displayName>
+				<displayName count="two">Somoni Tajikistan</displayName>
+				<displayName count="few">Somoni Tajikistan</displayName>
+				<displayName count="many">Somoni Tajikistan</displayName>
+				<displayName count="other">Somoni Tajikistan</displayName>
+				<symbol draft="contributed">TJS</symbol>
+			</currency>
+			<currency type="TMM">
+				<displayName>Manat Turkmenistan (1993–2009)</displayName>
+				<displayName count="zero">manat Turkmenistan (1993–2009)</displayName>
+				<displayName count="one">manat Turkmenistan (1993–2009)</displayName>
+				<displayName count="two">manat Turkmenistan (1993–2009)</displayName>
+				<displayName count="few">manat Turkmenistan (1993–2009)</displayName>
+				<displayName count="many">manat Turkmenistan (1993–2009)</displayName>
+				<displayName count="other">manat Turkmenistan (1993–2009)</displayName>
+				<symbol draft="contributed">TMM</symbol>
+			</currency>
+			<currency type="TMT">
+				<displayName>Manat Turkmenistan</displayName>
+				<displayName count="zero">Manat Turkmenistan</displayName>
+				<displayName count="one">Manat Turkmenistan</displayName>
+				<displayName count="two">Manat Turkmenistan</displayName>
+				<displayName count="few">Manat Turkmenistan</displayName>
+				<displayName count="many">Manat Turkmenistan</displayName>
+				<displayName count="other">Manat Turkmenistan</displayName>
+				<symbol draft="contributed">TMT</symbol>
+			</currency>
+			<currency type="TND">
+				<displayName>Dinar Tunisia</displayName>
+				<displayName count="zero">dinar Tunisia</displayName>
+				<displayName count="one">dinar Tunisia</displayName>
+				<displayName count="two">dinar Tunisia</displayName>
+				<displayName count="few">dinar Tunisia</displayName>
+				<displayName count="many">dinar Tunisia</displayName>
+				<displayName count="other">dinar Tunisia</displayName>
+				<symbol draft="contributed">TND</symbol>
+			</currency>
+			<currency type="TOP">
+				<displayName>Paʻanga Tonga</displayName>
+				<displayName count="zero">Paʻanga Tonga</displayName>
+				<displayName count="one">Paʻanga Tonga</displayName>
+				<displayName count="two">Paʻanga Tonga</displayName>
+				<displayName count="few">Paʻanga Tonga</displayName>
+				<displayName count="many">Paʻanga Tonga</displayName>
+				<displayName count="other">Paʻanga Tonga</displayName>
+				<symbol draft="contributed">TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
+			</currency>
+			<currency type="TPE">
+				<displayName>Escudo Timor</displayName>
+				<displayName count="zero">escudo Timor</displayName>
+				<displayName count="one">escudo Timor</displayName>
+				<displayName count="two">escudo Timor</displayName>
+				<displayName count="few">escudo Timor</displayName>
+				<displayName count="many">escudo Timor</displayName>
+				<displayName count="other">escudo Timor</displayName>
+				<symbol draft="contributed">TPE</symbol>
+			</currency>
+			<currency type="TRL">
+				<displayName>Lira Twrci (1922–2005)</displayName>
+				<displayName count="zero">lira Twrci (1922–2005)</displayName>
+				<displayName count="one">lira Twrci (1922–2005)</displayName>
+				<displayName count="two">lira Twrci (1922–2005)</displayName>
+				<displayName count="few">lira Twrci (1922–2005)</displayName>
+				<displayName count="many">lira Twrci (1922–2005)</displayName>
+				<displayName count="other">lira Twrci (1922–2005)</displayName>
+				<symbol draft="contributed">TRL</symbol>
+			</currency>
+			<currency type="TRY">
+				<displayName>Lira Twrci</displayName>
+				<displayName count="zero">Lira Twrci</displayName>
+				<displayName count="one">Lira Twrci</displayName>
+				<displayName count="two">Lira Twrci</displayName>
+				<displayName count="few">Lira Twrci</displayName>
+				<displayName count="many">Lira Twrci</displayName>
+				<displayName count="other">Lira Twrci</displayName>
+				<symbol draft="contributed">TRY</symbol>
+				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
+			</currency>
+			<currency type="TTD">
+				<displayName>Doler Trinidad a Tobago</displayName>
+				<displayName count="zero">doler Trinidad a Tobago</displayName>
+				<displayName count="one">ddoler Trinidad a Tobago</displayName>
+				<displayName count="two">ddoler Trinidad a Tobago</displayName>
+				<displayName count="few">doler Trinidad a Tobago</displayName>
+				<displayName count="many">doler Trinidad a Tobago</displayName>
+				<displayName count="other">doler Trinidad a Tobago</displayName>
+				<symbol draft="contributed">TTD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="TWD">
+				<displayName>Doler Newydd Taiwan</displayName>
+				<displayName count="zero">doler newydd Taiwan</displayName>
+				<displayName count="one">ddoler newydd Taiwan</displayName>
+				<displayName count="two">ddoler newydd Taiwan</displayName>
+				<displayName count="few">doler newydd Taiwan</displayName>
+				<displayName count="many">doler newydd Taiwan</displayName>
+				<displayName count="other">doler newydd Taiwan</displayName>
+				<symbol>NT$</symbol>
+				<symbol alt="narrow" draft="contributed">NT$</symbol>
+			</currency>
+			<currency type="TZS">
+				<displayName>Swllt Tanzania</displayName>
+				<displayName count="zero">swllt Tanzania</displayName>
+				<displayName count="one">swllt Tanzania</displayName>
+				<displayName count="two">swllt Tanzania</displayName>
+				<displayName count="few">swllt Tanzania</displayName>
+				<displayName count="many">swllt Tanzania</displayName>
+				<displayName count="other">swllt Tanzania</displayName>
+				<symbol draft="contributed">TZS</symbol>
+			</currency>
+			<currency type="UAH">
+				<displayName>Hryvnia Wcráin</displayName>
+				<displayName count="zero">hryvnia Wcráin</displayName>
+				<displayName count="one">hryvnia Wcráin</displayName>
+				<displayName count="two">hryvnia Wcráin</displayName>
+				<displayName count="few">hryvnia Wcráin</displayName>
+				<displayName count="many">hryvnia Wcráin</displayName>
+				<displayName count="other">hryvnia Wcráin</displayName>
+				<symbol draft="contributed">UAH</symbol>
+				<symbol alt="narrow" draft="contributed">₴</symbol>
+			</currency>
+			<currency type="UGS">
+				<displayName>Swllt Uganda (1966–1987)</displayName>
+				<displayName count="zero">swllt Uganda (1966–1987)</displayName>
+				<displayName count="one">swllt Uganda (1966–1987)</displayName>
+				<displayName count="two">swllt Uganda (1966–1987)</displayName>
+				<displayName count="few">swllt Uganda (1966–1987)</displayName>
+				<displayName count="many">swllt Uganda (1966–1987)</displayName>
+				<displayName count="other">swllt Uganda (1966–1987)</displayName>
+				<symbol draft="contributed">UGS</symbol>
+			</currency>
+			<currency type="UGX">
+				<displayName>Swllt Uganda</displayName>
+				<displayName count="zero">swllt Uganda</displayName>
+				<displayName count="one">swllt Uganda</displayName>
+				<displayName count="two">swllt Uganda</displayName>
+				<displayName count="few">swllt Uganda</displayName>
+				<displayName count="many">swllt Uganda</displayName>
+				<displayName count="other">swllt Uganda</displayName>
+				<symbol draft="contributed">UGX</symbol>
+			</currency>
+			<currency type="USD">
+				<displayName>Doler UDA</displayName>
+				<displayName count="zero">doler UDA</displayName>
+				<displayName count="one">ddoler UDA</displayName>
+				<displayName count="two">ddoler UDA</displayName>
+				<displayName count="few">doler UDA</displayName>
+				<displayName count="many">doler UDA</displayName>
+				<displayName count="other">doler UDA</displayName>
+				<symbol>US$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="USN">
+				<displayName>Doler UDA (y diwrnod nesaf)</displayName>
+				<displayName count="zero">doler UDA (y diwrnod nesaf)</displayName>
+				<displayName count="one">doler UDA (y diwrnod nesaf)</displayName>
+				<displayName count="two">doler UDA (y diwrnod nesaf)</displayName>
+				<displayName count="few">doler UDA (y diwrnod nesaf)</displayName>
+				<displayName count="many">doler UDA (y diwrnod nesaf)</displayName>
+				<displayName count="other">doler UDA (y diwrnod nesaf)</displayName>
+				<symbol draft="contributed">USN</symbol>
+			</currency>
+			<currency type="USS">
+				<displayName>Doler UDA (yr un diwrnod)</displayName>
+				<displayName count="zero">doler UDA (yr un diwrnod)</displayName>
+				<displayName count="one">doler UDA (yr un diwrnod)</displayName>
+				<displayName count="two">doler UDA (yr un diwrnod)</displayName>
+				<displayName count="few">doler UDA (yr un diwrnod)</displayName>
+				<displayName count="many">doler UDA (yr un diwrnod)</displayName>
+				<displayName count="other">doler UDA (yr un diwrnod)</displayName>
+				<symbol draft="contributed">USS</symbol>
+			</currency>
+			<currency type="UYI">
+				<symbol draft="contributed">UYI</symbol>
+			</currency>
+			<currency type="UYP">
+				<displayName>Peso Uruguay (1975–1993)</displayName>
+				<displayName count="zero">peso Uruguay (1975–1993)</displayName>
+				<displayName count="one">peso Uruguay (1975–1993)</displayName>
+				<displayName count="two">peso Uruguay (1975–1993)</displayName>
+				<displayName count="few">peso Uruguay (1975–1993)</displayName>
+				<displayName count="many">peso Uruguay (1975–1993)</displayName>
+				<displayName count="other">peso Uruguay (1975–1993)</displayName>
+				<symbol draft="contributed">UYP</symbol>
+			</currency>
+			<currency type="UYU">
+				<displayName>Peso Uruguay</displayName>
+				<displayName count="zero">peso Uruguay</displayName>
+				<displayName count="one">peso Uruguay</displayName>
+				<displayName count="two">peso Uruguay</displayName>
+				<displayName count="few">peso Uruguay</displayName>
+				<displayName count="many">peso Uruguay</displayName>
+				<displayName count="other">peso Uruguay</displayName>
+				<symbol draft="contributed">UYU</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="UZS">
+				<displayName>Som Uzbekistan</displayName>
+				<displayName count="zero">Som Uzbekistan</displayName>
+				<displayName count="one">Som Uzbekistan</displayName>
+				<displayName count="two">Som Uzbekistan</displayName>
+				<displayName count="few">Som Uzbekistan</displayName>
+				<displayName count="many">Som Uzbekistan</displayName>
+				<displayName count="other">Som Uzbekistan</displayName>
+				<symbol draft="contributed">UZS</symbol>
+			</currency>
+			<currency type="VEB">
+				<displayName>Bolívar Venezuela (1871–2008)</displayName>
+				<displayName count="zero">bolívar Venezuela (1871–2008)</displayName>
+				<displayName count="one">bolívar Venezuela (1871–2008)</displayName>
+				<displayName count="two">bolívar Venezuela (1871–2008)</displayName>
+				<displayName count="few">bolívar Venezuela (1871–2008)</displayName>
+				<displayName count="many">bolívar Venezuela (1871–2008)</displayName>
+				<displayName count="other">bolívar Venezuela (1871–2008)</displayName>
+				<symbol draft="contributed">VEB</symbol>
+			</currency>
+			<currency type="VEF">
+				<displayName>Bolívar Venezuela</displayName>
+				<displayName count="zero">Bolívar Venezuela</displayName>
+				<displayName count="one">Bolívar Venezuela</displayName>
+				<displayName count="two">Bolívar Venezuela</displayName>
+				<displayName count="few">Bolívar Venezuela</displayName>
+				<displayName count="many">bolivar Venezuela</displayName>
+				<displayName count="other">bolivar Venezuela</displayName>
+				<symbol draft="contributed">VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
+			</currency>
+			<currency type="VND">
+				<displayName>Dong Fietnam</displayName>
+				<displayName count="zero">Dong Fietnam</displayName>
+				<displayName count="one">Dong Fietnam</displayName>
+				<displayName count="two">Dong Fietnam</displayName>
+				<displayName count="few">Dong Fietnam</displayName>
+				<displayName count="many">Dong Fietnam</displayName>
+				<displayName count="other">Dong Fietnam</displayName>
+				<symbol>₫</symbol>
+				<symbol alt="narrow" draft="contributed">₫</symbol>
+			</currency>
+			<currency type="VNN">
+				<displayName>Dong Fietnam (1978–1985)</displayName>
+				<displayName count="zero">dong Fietnam (1978–1985)</displayName>
+				<displayName count="one">dong Fietnam (1978–1985)</displayName>
+				<displayName count="two">dong Fietnam (1978–1985)</displayName>
+				<displayName count="few">dong Fietnam (1978–1985)</displayName>
+				<displayName count="many">dong Fietnam (1978–1985)</displayName>
+				<displayName count="other">dong Fietnam (1978–1985)</displayName>
+				<symbol draft="contributed">VNN</symbol>
+			</currency>
+			<currency type="VUV">
+				<displayName>Vatu Vanuatu</displayName>
+				<displayName count="zero">Vatu Vanuatu</displayName>
+				<displayName count="one">Vatu Vanuatu</displayName>
+				<displayName count="two">Vatu Vanuatu</displayName>
+				<displayName count="few">Vatu Vanuatu</displayName>
+				<displayName count="many">Vatu Vanuatu</displayName>
+				<displayName count="other">Vatu Vanuatu</displayName>
+				<symbol draft="contributed">VUV</symbol>
+			</currency>
+			<currency type="WST">
+				<displayName>Tala Samoa</displayName>
+				<displayName count="zero">Tala Samoa</displayName>
+				<displayName count="one">Tala Samoa</displayName>
+				<displayName count="two">Tala Samoa</displayName>
+				<displayName count="few">Tala Samoa</displayName>
+				<displayName count="many">Tala Samoa</displayName>
+				<displayName count="other">Tala Samoa</displayName>
+				<symbol draft="contributed">WST</symbol>
+			</currency>
+			<currency type="XAF">
+				<displayName>Ffranc CFA Canol Affrica</displayName>
+				<displayName count="zero">ffranc CFA Canol Affrica</displayName>
+				<displayName count="one">ffranc CFA Canol Affrica</displayName>
+				<displayName count="two">ffranc CFA Canol Affrica</displayName>
+				<displayName count="few">ffranc CFA Canol Affrica</displayName>
+				<displayName count="many">ffranc CFA Canol Affrica</displayName>
+				<displayName count="other">ffranc CFA Canol Affrica</displayName>
+				<symbol>FCFA</symbol>
+			</currency>
+			<currency type="XCD">
+				<displayName>Doler Dwyrain y Caribî</displayName>
+				<displayName count="zero">doler Dwyrain y Caribî</displayName>
+				<displayName count="one">ddoler Dwyrain y Caribî</displayName>
+				<displayName count="two">ddoler Dwyrain y Caribî</displayName>
+				<displayName count="few">doler Dwyrain y Caribî</displayName>
+				<displayName count="many">doler Dwyrain y Caribî</displayName>
+				<displayName count="other">doler Dwyrain y Caribî</displayName>
+				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="XEU">
+				<symbol draft="contributed">XEU</symbol>
+			</currency>
+			<currency type="XOF">
+				<displayName>Ffranc CFA Gorllewin Affrica</displayName>
+				<displayName count="zero">ffranc CFA Gorllewin Affrica</displayName>
+				<displayName count="one">ffranc CFA Gorllewin Affrica</displayName>
+				<displayName count="two">ffranc CFA Gorllewin Affrica</displayName>
+				<displayName count="few">ffranc CFA Gorllewin Affrica</displayName>
+				<displayName count="many">ffranc CFA Gorllewin Affrica</displayName>
+				<displayName count="other">ffranc CFA Gorllewin Affrica</displayName>
+				<symbol>CFA</symbol>
+			</currency>
+			<currency type="XPF">
+				<displayName>Ffranc CFP</displayName>
+				<displayName count="zero">Ffranc CPF</displayName>
+				<displayName count="one">Ffranc CPF</displayName>
+				<displayName count="two">Ffranc CPF</displayName>
+				<displayName count="few">Ffranc CPF</displayName>
+				<displayName count="many">Ffranc CPF</displayName>
+				<displayName count="other">Ffranc CPF</displayName>
+				<symbol>CFPF</symbol>
+			</currency>
+			<currency type="XXX">
+				<displayName>Arian Cyfred Anhysbys</displayName>
+				<displayName count="zero">(arian cyfred anhysbys)</displayName>
+				<displayName count="one">(arian cyfred anhysbys)</displayName>
+				<displayName count="two">(arian cyfred anhysbys)</displayName>
+				<displayName count="few">(arian cyfred anhysbys)</displayName>
+				<displayName count="many">(arian cyfred anhysbys)</displayName>
+				<displayName count="other">(arian cyfred anhysbys)</displayName>
+				<symbol draft="contributed">XXX</symbol>
+			</currency>
+			<currency type="YDD">
+				<displayName>Dinar Yemen</displayName>
+				<displayName count="zero">dinar Yemen</displayName>
+				<displayName count="one">dinar Yemen</displayName>
+				<displayName count="two">dinar Yemen</displayName>
+				<displayName count="few">dinar Yemen</displayName>
+				<displayName count="many">dinar Yemen</displayName>
+				<displayName count="other">dinar Yemen</displayName>
+				<symbol draft="contributed">YDD</symbol>
+			</currency>
+			<currency type="YER">
+				<displayName>Rial Yemen</displayName>
+				<displayName count="zero">Rial Yemen</displayName>
+				<displayName count="one">Rial Yemen</displayName>
+				<displayName count="two">Rial Yemen</displayName>
+				<displayName count="few">Rial Yemen</displayName>
+				<displayName count="many">Rial Yemen</displayName>
+				<displayName count="other">Rial Yemen</displayName>
+				<symbol draft="contributed">YER</symbol>
+			</currency>
+			<currency type="YUD">
+				<symbol draft="contributed">YUD</symbol>
+			</currency>
+			<currency type="YUM">
+				<symbol draft="contributed">YUM</symbol>
+			</currency>
+			<currency type="YUN">
+				<symbol draft="contributed">YUN</symbol>
+			</currency>
+			<currency type="YUR">
+				<symbol draft="contributed">YUR</symbol>
+			</currency>
+			<currency type="ZAL">
+				<displayName>Rand (ariannol) De Affrica</displayName>
+				<displayName count="zero">rand (ariannol) De Affrica</displayName>
+				<displayName count="one">rand (ariannol) De Affrica</displayName>
+				<displayName count="two">rand (ariannol) De Affrica</displayName>
+				<displayName count="few">rand (ariannol) De Affrica</displayName>
+				<displayName count="many">rand (ariannol) De Affrica</displayName>
+				<displayName count="other">rand (ariannol) De Affrica</displayName>
+				<symbol draft="contributed">ZAL</symbol>
+			</currency>
+			<currency type="ZAR">
+				<displayName>Rand De Affrica</displayName>
+				<displayName count="zero">rand De Affrica</displayName>
+				<displayName count="one">rand De Affrica</displayName>
+				<displayName count="two">rand De Affrica</displayName>
+				<displayName count="few">rand De Affrica</displayName>
+				<displayName count="many">rand De Affrica</displayName>
+				<displayName count="other">rand De Affrica</displayName>
+				<symbol draft="contributed">ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">ZAR</symbol>
+			</currency>
+			<currency type="ZMK">
+				<displayName>Kwacha Zambia (1968–2012)</displayName>
+				<displayName count="zero">kwacha Zambia (1968–2012)</displayName>
+				<displayName count="one">kwacha Zambia (1968–2012)</displayName>
+				<displayName count="two">kwacha Zambia (1968–2012)</displayName>
+				<displayName count="few">kwacha Zambia (1968–2012)</displayName>
+				<displayName count="many">kwacha Zambia (1968–2012)</displayName>
+				<displayName count="other">kwacha Zambia (1968–2012)</displayName>
+				<symbol draft="contributed">ZMK</symbol>
+			</currency>
+			<currency type="ZMW">
+				<displayName>Kwacha Zambia</displayName>
+				<displayName count="zero">kwacha Zambia</displayName>
+				<displayName count="one">kwacha Zambia</displayName>
+				<displayName count="two">kwacha Zambia</displayName>
+				<displayName count="few">kwacha Zambia</displayName>
+				<displayName count="many">kwacha Zambia</displayName>
+				<displayName count="other">kwacha Zambia</displayName>
+				<symbol draft="contributed">ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZMW</symbol>
+			</currency>
+			<currency type="ZRN">
+				<displayName>Zaire Newydd Zaire (1993–1998)</displayName>
+				<displayName count="zero">Zaire Newydd Zaire (1993–1998)</displayName>
+				<displayName count="one">Zaire Newydd Zaire (1993–1998)</displayName>
+				<displayName count="two">Zaire Newydd Zaire (1993–1998)</displayName>
+				<displayName count="few">Zaire Newydd Zaire (1993–1998)</displayName>
+				<displayName count="many">Zaire Newydd Zaire (1993–1998)</displayName>
+				<displayName count="other">Zaire Newydd Zaire (1993–1998)</displayName>
+				<symbol draft="contributed">ZRN</symbol>
+			</currency>
+			<currency type="ZRZ">
+				<displayName>Zaire Zaire (1971–1993)</displayName>
+				<displayName count="zero">Zaire Zaire (1971–1993)</displayName>
+				<displayName count="one">Zaire Zaire (1971–1993)</displayName>
+				<displayName count="two">Zaire Zaire (1971–1993)</displayName>
+				<displayName count="few">Zaire Zaire (1971–1993)</displayName>
+				<displayName count="many">Zaire Zaire (1971–1993)</displayName>
+				<displayName count="other">Zaire Zaire (1971–1993)</displayName>
+				<symbol draft="contributed">ZRZ</symbol>
+			</currency>
+			<currency type="ZWD">
+				<displayName>Doler Zimbabwe (1980–2008)</displayName>
+				<displayName count="zero">doler Zimbabwe (1980–2008)</displayName>
+				<displayName count="one">ddoler Zimbabwe (1980–2008)</displayName>
+				<displayName count="two">ddoler Zimbabwe (1980–2008)</displayName>
+				<displayName count="few">doler Zimbabwe (1980–2008)</displayName>
+				<displayName count="many">doler Zimbabwe (1980–2008)</displayName>
+				<displayName count="other">doler Zimbabwe (1980–2008)</displayName>
+				<symbol draft="contributed">ZWD</symbol>
+			</currency>
+			<currency type="ZWL">
+				<displayName>Doler Zimbabwe (2009)</displayName>
+				<displayName count="zero">doler Zimbabwe (2009)</displayName>
+				<displayName count="one">ddoler Zimbabwe (2009)</displayName>
+				<displayName count="two">ddoler Zimbabwe (2009)</displayName>
+				<displayName count="few">doler Zimbabwe (2009)</displayName>
+				<displayName count="many">doler Zimbabwe (2009)</displayName>
+				<displayName count="other">doler Zimbabwe (2009)</displayName>
+				<symbol draft="contributed">ZWL</symbol>
+			</currency>
+			<currency type="ZWR">
+				<displayName>Doler Zimbabwe (2008)</displayName>
+				<displayName count="zero">doler Zimbabwe (2008)</displayName>
+				<displayName count="one">ddoler Zimbabwe (2008)</displayName>
+				<displayName count="two">ddoler Zimbabwe (2008)</displayName>
+				<displayName count="few">doler Zimbabwe (2008)</displayName>
+				<displayName count="many">doler Zimbabwe (2008)</displayName>
+				<displayName count="other">doler Zimbabwe (2008)</displayName>
+				<symbol draft="contributed">ZWR</symbol>
+			</currency>
+		</currencies>
+		<miscPatterns numberSystem="latn">
+			<pattern type="atLeast">{0}+</pattern>
+			<pattern type="range">{0}–{1}</pattern>
+		</miscPatterns>
+	</numbers>
+	<units>
+		<unitLength type="long">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<displayName>grym disgyrchedd</displayName>
+				<unitPattern count="zero">{0} grym disgyrchedd</unitPattern>
+				<unitPattern count="one">{0} grym disgyrchedd</unitPattern>
+				<unitPattern count="two">{0} rym disgyrchedd</unitPattern>
+				<unitPattern count="few">{0} grym disgyrchedd</unitPattern>
+				<unitPattern count="many">{0} grym disgyrchedd</unitPattern>
+				<unitPattern count="other">{0} grym disgyrchedd</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-second-squared">
+				<displayName>metrau yr eiliad sgwâr</displayName>
+				<unitPattern count="zero">{0} metr yr eiliad sgwâr</unitPattern>
+				<unitPattern count="one">{0} metr yr eiliad sgwâr</unitPattern>
+				<unitPattern count="two">{0} fetr yr eiliad sgwâr</unitPattern>
+				<unitPattern count="few">{0} metr yr eiliad sgwâr</unitPattern>
+				<unitPattern count="many">{0} metr yr eiliad sgwâr</unitPattern>
+				<unitPattern count="other">{0} metr yr eiliad sgwâr</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>cylchdroeon</displayName>
+				<unitPattern count="zero">{0} cylchdro</unitPattern>
+				<unitPattern count="one">{0} cylchdro</unitPattern>
+				<unitPattern count="two">{0} gylchdro</unitPattern>
+				<unitPattern count="few">{0} cylchdro</unitPattern>
+				<unitPattern count="many">{0} cylchdro</unitPattern>
+				<unitPattern count="other">{0} cylchdro</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radianau</displayName>
+				<unitPattern count="zero">{0} radian</unitPattern>
+				<unitPattern count="one">{0} radian</unitPattern>
+				<unitPattern count="two">{0} radian</unitPattern>
+				<unitPattern count="few">{0} radian</unitPattern>
+				<unitPattern count="many">{0} radian</unitPattern>
+				<unitPattern count="other">{0} radian</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>graddau</displayName>
+				<unitPattern count="zero">{0} gradd</unitPattern>
+				<unitPattern count="one">{0} radd</unitPattern>
+				<unitPattern count="two">{0} radd</unitPattern>
+				<unitPattern count="few">{0} gradd</unitPattern>
+				<unitPattern count="many">{0} gradd</unitPattern>
+				<unitPattern count="other">{0} gradd</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>arcfunudau</displayName>
+				<unitPattern count="zero">{0} arcfunud</unitPattern>
+				<unitPattern count="one">{0} arcfunud</unitPattern>
+				<unitPattern count="two">{0} arcfunud</unitPattern>
+				<unitPattern count="few">{0} arcfunud</unitPattern>
+				<unitPattern count="many">{0} arcfunud</unitPattern>
+				<unitPattern count="other">{0} arcfunud</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>arceiliadau</displayName>
+				<unitPattern count="zero">{0} arceiliad</unitPattern>
+				<unitPattern count="one">{0} arceiliad</unitPattern>
+				<unitPattern count="two">{0} arceiliad</unitPattern>
+				<unitPattern count="few">{0} arceiliad</unitPattern>
+				<unitPattern count="many">{0} arceiliad</unitPattern>
+				<unitPattern count="other">{0} arceiliad</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>cilometrau sgwâr</displayName>
+				<unitPattern count="zero">{0} cilometr sgwâr</unitPattern>
+				<unitPattern count="one">{0} cilometr sgwâr</unitPattern>
+				<unitPattern count="two">{0} gilometr sgwâr</unitPattern>
+				<unitPattern count="few">{0} chilometr sgwâr</unitPattern>
+				<unitPattern count="many">{0} chilometr sgwâr</unitPattern>
+				<unitPattern count="other">{0} cilometr sgwâr</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>hectarau</displayName>
+				<unitPattern count="zero">{0} hectar</unitPattern>
+				<unitPattern count="one">{0} hectar</unitPattern>
+				<unitPattern count="two">{0} hectar</unitPattern>
+				<unitPattern count="few">{0} hectar</unitPattern>
+				<unitPattern count="many">{0} hectar</unitPattern>
+				<unitPattern count="other">{0} hectar</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>metrau sgwâr</displayName>
+				<unitPattern count="zero">{0} metr sgwâr</unitPattern>
+				<unitPattern count="one">{0} metr sgwâr</unitPattern>
+				<unitPattern count="two">{0} fetr sgwâr</unitPattern>
+				<unitPattern count="few">{0} metr sgwâr</unitPattern>
+				<unitPattern count="many">{0} metr sgwâr</unitPattern>
+				<unitPattern count="other">{0} metr sgwâr</unitPattern>
+				<perUnitPattern>{0} y metr sgwâr</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>centimetrau sgwâr</displayName>
+				<unitPattern count="zero">{0} centimetr sgwâr</unitPattern>
+				<unitPattern count="one">{0} centimetr sgwâr</unitPattern>
+				<unitPattern count="two">{0} gentimetr sgwâr</unitPattern>
+				<unitPattern count="few">{0} chentimetr sgwâr</unitPattern>
+				<unitPattern count="many">{0} chentimetr sgwâr</unitPattern>
+				<unitPattern count="other">{0} centimetr sgwâr</unitPattern>
+				<perUnitPattern>{0} y centimetr sgwâr</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>milltiroedd sgwâr</displayName>
+				<unitPattern count="zero">{0} milltir sgwâr</unitPattern>
+				<unitPattern count="one">{0} filltir sgwâr</unitPattern>
+				<unitPattern count="two">{0} filltir sgwâr</unitPattern>
+				<unitPattern count="few">{0} milltir sgwâr</unitPattern>
+				<unitPattern count="many">{0} milltir sgwâr</unitPattern>
+				<unitPattern count="other">{0} milltir sgwâr</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName draft="provisional">erw</displayName>
+				<unitPattern count="zero">{0} erw</unitPattern>
+				<unitPattern count="one">{0} erw</unitPattern>
+				<unitPattern count="two">{0} erw</unitPattern>
+				<unitPattern count="few">{0} erw</unitPattern>
+				<unitPattern count="many">{0} erw</unitPattern>
+				<unitPattern count="other">{0} erw</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>llathenni sgwâr</displayName>
+				<unitPattern count="zero">{0} llath sgwâr</unitPattern>
+				<unitPattern count="one">{0} llath sgwâr</unitPattern>
+				<unitPattern count="two">{0} lath sgwâr</unitPattern>
+				<unitPattern count="few">{0} llath sgwâr</unitPattern>
+				<unitPattern count="many">{0} llath sgwâr</unitPattern>
+				<unitPattern count="other">{0} llath sgwâr</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>troedfeddi sgwâr</displayName>
+				<unitPattern count="zero">{0} troedfedd sgwâr</unitPattern>
+				<unitPattern count="one">{0} droedfedd sgwâr</unitPattern>
+				<unitPattern count="two">{0} droedfedd sgwâr</unitPattern>
+				<unitPattern count="few">{0} troedfedd sgwâr</unitPattern>
+				<unitPattern count="many">{0} throedfedd sgwâr</unitPattern>
+				<unitPattern count="other">{0} troedfedd sgwâr</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>modfeddi sgwâr</displayName>
+				<unitPattern count="zero">{0} modfedd sgwâr</unitPattern>
+				<unitPattern count="one">{0} modfedd sgwâr</unitPattern>
+				<unitPattern count="two">{0} fodfedd sgwâr</unitPattern>
+				<unitPattern count="few">{0} modfedd sgwâr</unitPattern>
+				<unitPattern count="many">{0} modfedd sgwâr</unitPattern>
+				<unitPattern count="other">{0} modfedd sgwâr</unitPattern>
+				<perUnitPattern>{0} y modfedd sgwâr</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>karatau</displayName>
+				<unitPattern count="zero">{0} karat</unitPattern>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="two">{0} karat</unitPattern>
+				<unitPattern count="few">{0} karat</unitPattern>
+				<unitPattern count="many">{0} karat</unitPattern>
+				<unitPattern count="other">{0} karat</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>litrau y cilometr</displayName>
+				<unitPattern count="zero">{0} litr y cilometr</unitPattern>
+				<unitPattern count="one">{0} litr y cilometr</unitPattern>
+				<unitPattern count="two">{0} litr y cilometr</unitPattern>
+				<unitPattern count="few">{0} litr y cilometr</unitPattern>
+				<unitPattern count="many">{0} litr y cilometr</unitPattern>
+				<unitPattern count="other">{0} litr y cilometr</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>litrau wrth y 100 cilometr</displayName>
+				<unitPattern count="zero">{0} litr wrth y 100 cilometr</unitPattern>
+				<unitPattern count="one">{0} litr wrth y 100 cilometr</unitPattern>
+				<unitPattern count="two">{0} litr wrth y 100 cilometr</unitPattern>
+				<unitPattern count="few">{0} litr wrth y 100 cilometr</unitPattern>
+				<unitPattern count="many">{0} litr wrth y 100 cilometr</unitPattern>
+				<unitPattern count="other">{0} litr wrth y 100 cilometr</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>milltiroedd y galwyn</displayName>
+				<unitPattern count="zero">{0} milltir y galwyn</unitPattern>
+				<unitPattern count="one">{0} filltir y galwyn</unitPattern>
+				<unitPattern count="two">{0} filltir y galwyn</unitPattern>
+				<unitPattern count="few">{0} milltir y galwyn</unitPattern>
+				<unitPattern count="many">{0} milltir y galwyn</unitPattern>
+				<unitPattern count="other">{0} milltir y galwyn</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<displayName>terabeitiau</displayName>
+				<unitPattern count="zero">{0} terabeit</unitPattern>
+				<unitPattern count="one">{0} terabeit</unitPattern>
+				<unitPattern count="two">{0} derabeit</unitPattern>
+				<unitPattern count="few">{0} terabeit</unitPattern>
+				<unitPattern count="many">{0} terabeit</unitPattern>
+				<unitPattern count="other">{0} terabeit</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>teradidau</displayName>
+				<unitPattern count="zero">{0} teradid</unitPattern>
+				<unitPattern count="one">{0} teradid</unitPattern>
+				<unitPattern count="two">{0} deradid</unitPattern>
+				<unitPattern count="few">{0} teradid</unitPattern>
+				<unitPattern count="many">{0} teradid</unitPattern>
+				<unitPattern count="other">{0} teradid</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabeitiau</displayName>
+				<unitPattern count="zero">{0} gigabeit</unitPattern>
+				<unitPattern count="one">{0} gigabeit</unitPattern>
+				<unitPattern count="two">{0} gigabeit</unitPattern>
+				<unitPattern count="few">{0} gigabeit</unitPattern>
+				<unitPattern count="many">{0} gigabeit</unitPattern>
+				<unitPattern count="other">{0} gigabeit</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigadidau</displayName>
+				<unitPattern count="zero">{0} gigadid</unitPattern>
+				<unitPattern count="one">{0} gigadid</unitPattern>
+				<unitPattern count="two">{0} gigadid</unitPattern>
+				<unitPattern count="few">{0} gigadid</unitPattern>
+				<unitPattern count="many">{0} gigadid</unitPattern>
+				<unitPattern count="other">{0} gigadid</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabeitiau</displayName>
+				<unitPattern count="zero">{0} megabeit</unitPattern>
+				<unitPattern count="one">{0} megabeit</unitPattern>
+				<unitPattern count="two">{0} fegabeit</unitPattern>
+				<unitPattern count="few">{0} megabeit</unitPattern>
+				<unitPattern count="many">{0} megabeit</unitPattern>
+				<unitPattern count="other">{0} megabeit</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megadidau</displayName>
+				<unitPattern count="zero">{0} megadid</unitPattern>
+				<unitPattern count="one">{0} megadid</unitPattern>
+				<unitPattern count="two">{0} fegadid</unitPattern>
+				<unitPattern count="few">{0} megadid</unitPattern>
+				<unitPattern count="many">{0} megadid</unitPattern>
+				<unitPattern count="other">{0} megadid</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>cilobeitiau</displayName>
+				<unitPattern count="zero">{0} cilobeit</unitPattern>
+				<unitPattern count="one">{0} cilobeit</unitPattern>
+				<unitPattern count="two">{0} gilobeit</unitPattern>
+				<unitPattern count="few">{0} cilobeit</unitPattern>
+				<unitPattern count="many">{0} cilobeit</unitPattern>
+				<unitPattern count="other">{0} cilobeit</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>cilodidau</displayName>
+				<unitPattern count="zero">{0} cilodid</unitPattern>
+				<unitPattern count="one">{0} cilodid</unitPattern>
+				<unitPattern count="two">{0} cilodid</unitPattern>
+				<unitPattern count="few">{0} cilodid</unitPattern>
+				<unitPattern count="many">{0} cilodid</unitPattern>
+				<unitPattern count="other">{0} cilodid</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>beitiau</displayName>
+				<unitPattern count="zero">{0} beit</unitPattern>
+				<unitPattern count="one">{0} beit</unitPattern>
+				<unitPattern count="two">{0} feit</unitPattern>
+				<unitPattern count="few">{0} beit</unitPattern>
+				<unitPattern count="many">{0} beit</unitPattern>
+				<unitPattern count="other">{0} beit</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>didau</displayName>
+				<unitPattern count="zero">{0} did</unitPattern>
+				<unitPattern count="one">{0} did</unitPattern>
+				<unitPattern count="two">{0} ddid</unitPattern>
+				<unitPattern count="few">{0} did</unitPattern>
+				<unitPattern count="many">{0} did</unitPattern>
+				<unitPattern count="other">{0} did</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>canrifoedd</displayName>
+				<unitPattern count="zero">{0} canrif</unitPattern>
+				<unitPattern count="one">{0} canrif</unitPattern>
+				<unitPattern count="two">{0} ganrif</unitPattern>
+				<unitPattern count="few">{0} canrif</unitPattern>
+				<unitPattern count="many">{0} canrif</unitPattern>
+				<unitPattern count="other">{0} canrif</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>blynyddoedd</displayName>
+				<unitPattern count="zero">{0} mlynedd</unitPattern>
+				<unitPattern count="one">{0} flwyddyn</unitPattern>
+				<unitPattern count="two">{0} flynedd</unitPattern>
+				<unitPattern count="few">{0} blynedd</unitPattern>
+				<unitPattern count="many">{0} blynedd</unitPattern>
+				<unitPattern count="other">{0} mlynedd</unitPattern>
+				<perUnitPattern>{0} y flwyddyn</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>misoedd</displayName>
+				<unitPattern count="zero">{0} mis</unitPattern>
+				<unitPattern count="one">{0} mis</unitPattern>
+				<unitPattern count="two">{0} fis</unitPattern>
+				<unitPattern count="few">{0} mis</unitPattern>
+				<unitPattern count="many">{0} mis</unitPattern>
+				<unitPattern count="other">{0} mis</unitPattern>
+				<perUnitPattern>{0} y mis</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>wythnosau</displayName>
+				<unitPattern count="zero">{0} wythnos</unitPattern>
+				<unitPattern count="one">{0} wythnos</unitPattern>
+				<unitPattern count="two">{0} wythnos</unitPattern>
+				<unitPattern count="few">{0} wythnos</unitPattern>
+				<unitPattern count="many">{0} wythnos</unitPattern>
+				<unitPattern count="other">{0} wythnos</unitPattern>
+				<perUnitPattern>{0} yr wythnos</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>diwrnodau</displayName>
+				<unitPattern count="zero">{0} diwrnod</unitPattern>
+				<unitPattern count="one">{0} diwrnod</unitPattern>
+				<unitPattern count="two">{0} ddiwrnod</unitPattern>
+				<unitPattern count="few">{0} diwrnod</unitPattern>
+				<unitPattern count="many">{0} diwrnod</unitPattern>
+				<unitPattern count="other">{0} diwrnod</unitPattern>
+				<perUnitPattern>{0} y diwrnod</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>oriau</displayName>
+				<unitPattern count="zero">{0} awr</unitPattern>
+				<unitPattern count="one">{0} awr</unitPattern>
+				<unitPattern count="two">{0} awr</unitPattern>
+				<unitPattern count="few">{0} awr</unitPattern>
+				<unitPattern count="many">{0} awr</unitPattern>
+				<unitPattern count="other">{0} awr</unitPattern>
+				<perUnitPattern>{0} yr awr</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>munudau</displayName>
+				<unitPattern count="zero">{0} munud</unitPattern>
+				<unitPattern count="one">{0} munud</unitPattern>
+				<unitPattern count="two">{0} funud</unitPattern>
+				<unitPattern count="few">{0} munud</unitPattern>
+				<unitPattern count="many">{0} munud</unitPattern>
+				<unitPattern count="other">{0} munud</unitPattern>
+				<perUnitPattern>{0} y munud</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>eiliadau</displayName>
+				<unitPattern count="zero">{0} eiliad</unitPattern>
+				<unitPattern count="one">{0} eiliad</unitPattern>
+				<unitPattern count="two">{0} eiliad</unitPattern>
+				<unitPattern count="few">{0} eiliad</unitPattern>
+				<unitPattern count="many">{0} eiliad</unitPattern>
+				<unitPattern count="other">{0} eiliad</unitPattern>
+				<perUnitPattern>{0} yr eiliad</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>milieiliadau</displayName>
+				<unitPattern count="zero">{0} milieiliad</unitPattern>
+				<unitPattern count="one">{0} milieiliad</unitPattern>
+				<unitPattern count="two">{0} filieiliad</unitPattern>
+				<unitPattern count="few">{0} milieiliad</unitPattern>
+				<unitPattern count="many">{0} milieiliad</unitPattern>
+				<unitPattern count="other">{0} milieiliad</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>microeiliadau</displayName>
+				<unitPattern count="zero">{0} microeiliadau</unitPattern>
+				<unitPattern count="one">{0} microeiliadau</unitPattern>
+				<unitPattern count="two">{0} microeiliadau</unitPattern>
+				<unitPattern count="few">{0} microeiliadau</unitPattern>
+				<unitPattern count="many">{0} microeiliadau</unitPattern>
+				<unitPattern count="other">{0} microeiliadau</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanoeiliadau</displayName>
+				<unitPattern count="zero">{0} nanoeiliadau</unitPattern>
+				<unitPattern count="one">{0} nanoeiliadau</unitPattern>
+				<unitPattern count="two">{0} nanoeiliadau</unitPattern>
+				<unitPattern count="few">{0} nanoeiliadau</unitPattern>
+				<unitPattern count="many">{0} nanoeiliadau</unitPattern>
+				<unitPattern count="other">{0} nanoeiliadau</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName>amperau</displayName>
+				<unitPattern count="zero">{0} amper</unitPattern>
+				<unitPattern count="one">{0} amper</unitPattern>
+				<unitPattern count="two">{0} amper</unitPattern>
+				<unitPattern count="few">{0} amper</unitPattern>
+				<unitPattern count="many">{0} amper</unitPattern>
+				<unitPattern count="other">{0} amper</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>miliamperau</displayName>
+				<unitPattern count="zero">{0} miliamper</unitPattern>
+				<unitPattern count="one">{0} miliamper</unitPattern>
+				<unitPattern count="two">{0} filiamper</unitPattern>
+				<unitPattern count="few">{0} miliamper</unitPattern>
+				<unitPattern count="many">{0} miliamper</unitPattern>
+				<unitPattern count="other">{0} miliamper</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<displayName>ohmau</displayName>
+				<unitPattern count="zero">{0} ohm</unitPattern>
+				<unitPattern count="one">{0} ohm</unitPattern>
+				<unitPattern count="two">{0} ohm</unitPattern>
+				<unitPattern count="few">{0} ohm</unitPattern>
+				<unitPattern count="many">{0} ohm</unitPattern>
+				<unitPattern count="other">{0} ohm</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>foltiau</displayName>
+				<unitPattern count="zero">{0} folt</unitPattern>
+				<unitPattern count="one">{0} folt</unitPattern>
+				<unitPattern count="two">{0} folt</unitPattern>
+				<unitPattern count="few">{0} folt</unitPattern>
+				<unitPattern count="many">{0} folt</unitPattern>
+				<unitPattern count="other">{0} folt</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>cilocalorïau</displayName>
+				<unitPattern count="zero">{0} cilocalori</unitPattern>
+				<unitPattern count="one">{0} cilocalori</unitPattern>
+				<unitPattern count="two">{0} gilocalori</unitPattern>
+				<unitPattern count="few">{0} chilocalori</unitPattern>
+				<unitPattern count="many">{0} chilocalori</unitPattern>
+				<unitPattern count="other">{0} cilocalori</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>calorïau</displayName>
+				<unitPattern count="zero">{0} calori</unitPattern>
+				<unitPattern count="one">{0} calori</unitPattern>
+				<unitPattern count="two">{0} galori</unitPattern>
+				<unitPattern count="few">{0} chalori</unitPattern>
+				<unitPattern count="many">{0} chalori</unitPattern>
+				<unitPattern count="other">{0} calori</unitPattern>
+			</unit>
+			<unit type="energy-foodcalorie">
+				<displayName>Calorïau</displayName>
+				<unitPattern count="zero">{0} Calori</unitPattern>
+				<unitPattern count="one">{0} Calori</unitPattern>
+				<unitPattern count="two">{0} Galori</unitPattern>
+				<unitPattern count="few">{0} Chalori</unitPattern>
+				<unitPattern count="many">{0} Chalori</unitPattern>
+				<unitPattern count="other">{0} Calori</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>cilojouleau</displayName>
+				<unitPattern count="zero">{0} cilojoule</unitPattern>
+				<unitPattern count="one">{0} cilojoule</unitPattern>
+				<unitPattern count="two">{0} gilojoule</unitPattern>
+				<unitPattern count="few">{0} chilojoule</unitPattern>
+				<unitPattern count="many">{0} chilojoule</unitPattern>
+				<unitPattern count="other">{0} cilojoule</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>jouleau</displayName>
+				<unitPattern count="zero">{0} joule</unitPattern>
+				<unitPattern count="one">{0} joule</unitPattern>
+				<unitPattern count="two">{0} joule</unitPattern>
+				<unitPattern count="few">{0} joule</unitPattern>
+				<unitPattern count="many">{0} joule</unitPattern>
+				<unitPattern count="other">{0} joule</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName draft="provisional">cilowat oriau</displayName>
+				<unitPattern count="zero" draft="provisional">{0} cilowat awr</unitPattern>
+				<unitPattern count="one" draft="provisional">{0} cilowat awr</unitPattern>
+				<unitPattern count="two" draft="provisional">{0} gilowat awr</unitPattern>
+				<unitPattern count="few" draft="provisional">{0} chilowat awr</unitPattern>
+				<unitPattern count="many" draft="provisional">{0} chilowat awr</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} cilowat awr</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<displayName>gigaherts</displayName>
+				<unitPattern count="zero">{0} gigaherts</unitPattern>
+				<unitPattern count="one">{0} gigaherts</unitPattern>
+				<unitPattern count="two">{0} gigaherts</unitPattern>
+				<unitPattern count="few">{0} gigaherts</unitPattern>
+				<unitPattern count="many">{0} gigaherts</unitPattern>
+				<unitPattern count="other">{0} gigaherts</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<displayName>megaherts</displayName>
+				<unitPattern count="zero">{0} megaherts</unitPattern>
+				<unitPattern count="one">{0} megaherts</unitPattern>
+				<unitPattern count="two">{0} fegaherts</unitPattern>
+				<unitPattern count="few">{0} megaherts</unitPattern>
+				<unitPattern count="many">{0} megaherts</unitPattern>
+				<unitPattern count="other">{0} megaherts</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>ciloherts</displayName>
+				<unitPattern count="zero">{0} ciloherts</unitPattern>
+				<unitPattern count="one">{0} ciloherts</unitPattern>
+				<unitPattern count="two">{0} ciloherts</unitPattern>
+				<unitPattern count="few">{0} ciloherts</unitPattern>
+				<unitPattern count="many">{0} ciloherts</unitPattern>
+				<unitPattern count="other">{0} ciloherts</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<displayName>herts</displayName>
+				<unitPattern count="zero">{0} herts</unitPattern>
+				<unitPattern count="one">{0} herts</unitPattern>
+				<unitPattern count="two">{0} herts</unitPattern>
+				<unitPattern count="few">{0} herts</unitPattern>
+				<unitPattern count="many">{0} herts</unitPattern>
+				<unitPattern count="other">{0} herts</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>cilometrau</displayName>
+				<unitPattern count="zero">{0} cilometr</unitPattern>
+				<unitPattern count="one">{0} cilometr</unitPattern>
+				<unitPattern count="two">{0} gilometr</unitPattern>
+				<unitPattern count="few">{0} chilometr</unitPattern>
+				<unitPattern count="many">{0} chilometr</unitPattern>
+				<unitPattern count="other">{0} cilometr</unitPattern>
+				<perUnitPattern>{0} y cilometr</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>metrau</displayName>
+				<unitPattern count="zero">{0} metr</unitPattern>
+				<unitPattern count="one">{0} metr</unitPattern>
+				<unitPattern count="two">{0} fetr</unitPattern>
+				<unitPattern count="few">{0} metr</unitPattern>
+				<unitPattern count="many">{0} metr</unitPattern>
+				<unitPattern count="other">{0} metr</unitPattern>
+				<perUnitPattern>{0} y metr</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>decimetrau</displayName>
+				<unitPattern count="zero">{0} decimetr</unitPattern>
+				<unitPattern count="one">{0} decimetr</unitPattern>
+				<unitPattern count="two">{0} decimetr</unitPattern>
+				<unitPattern count="few">{0} decimetr</unitPattern>
+				<unitPattern count="many">{0} decimetr</unitPattern>
+				<unitPattern count="other">{0} decimetr</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>centimetrau</displayName>
+				<unitPattern count="zero">{0} centimetr</unitPattern>
+				<unitPattern count="one">{0} centimetr</unitPattern>
+				<unitPattern count="two">{0} gentimetr</unitPattern>
+				<unitPattern count="few">{0} chentimetr</unitPattern>
+				<unitPattern count="many">{0} chentimetr</unitPattern>
+				<unitPattern count="other">{0} centimetr</unitPattern>
+				<perUnitPattern>{0} y centimetr</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>milimetrau</displayName>
+				<unitPattern count="zero">{0} milimetr</unitPattern>
+				<unitPattern count="one">{0} milimetr</unitPattern>
+				<unitPattern count="two">{0} filimetr</unitPattern>
+				<unitPattern count="few">{0} milimetr</unitPattern>
+				<unitPattern count="many">{0} milimetr</unitPattern>
+				<unitPattern count="other">{0} milimetr</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>micrometrau</displayName>
+				<unitPattern count="zero">{0} micrometr</unitPattern>
+				<unitPattern count="one">{0} micrometr</unitPattern>
+				<unitPattern count="two">{0} ficrometr</unitPattern>
+				<unitPattern count="few">{0} micrometr</unitPattern>
+				<unitPattern count="many">{0} micrometr</unitPattern>
+				<unitPattern count="other">{0} micrometr</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nanometrau</displayName>
+				<unitPattern count="zero">{0} nanometr</unitPattern>
+				<unitPattern count="one">{0} nanometr</unitPattern>
+				<unitPattern count="two">{0} nanometr</unitPattern>
+				<unitPattern count="few">{0} nanometr</unitPattern>
+				<unitPattern count="many">{0} nanometr</unitPattern>
+				<unitPattern count="other">{0} nanometr</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>picometrau</displayName>
+				<unitPattern count="zero">{0} picometr</unitPattern>
+				<unitPattern count="one">{0} picometr</unitPattern>
+				<unitPattern count="two">{0} bicometr</unitPattern>
+				<unitPattern count="few">{0} phicometr</unitPattern>
+				<unitPattern count="many">{0} phicometr</unitPattern>
+				<unitPattern count="other">{0} picometr</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>milltiroedd</displayName>
+				<unitPattern count="zero">{0} milltir</unitPattern>
+				<unitPattern count="one">{0} filltir</unitPattern>
+				<unitPattern count="two">{0} filltir</unitPattern>
+				<unitPattern count="few">{0} milltir</unitPattern>
+				<unitPattern count="many">{0} milltir</unitPattern>
+				<unitPattern count="other">{0} milltir</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>llathenni</displayName>
+				<unitPattern count="zero">{0} llath</unitPattern>
+				<unitPattern count="one">{0} llath</unitPattern>
+				<unitPattern count="two">{0} lath</unitPattern>
+				<unitPattern count="few">{0} llath</unitPattern>
+				<unitPattern count="many">{0} llath</unitPattern>
+				<unitPattern count="other">{0} llath</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>troedfeddi</displayName>
+				<unitPattern count="zero">{0} troedfedd</unitPattern>
+				<unitPattern count="one">{0} droedfedd</unitPattern>
+				<unitPattern count="two">{0} droedfedd</unitPattern>
+				<unitPattern count="few">{0} troedfedd</unitPattern>
+				<unitPattern count="many">{0} throedfedd</unitPattern>
+				<unitPattern count="other">{0} troedfedd</unitPattern>
+				<perUnitPattern>{0} y droedfedd</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>modfeddi</displayName>
+				<unitPattern count="zero">{0} modfedd</unitPattern>
+				<unitPattern count="one">{0} fodfedd</unitPattern>
+				<unitPattern count="two">{0} fodfedd</unitPattern>
+				<unitPattern count="few">{0} modfedd</unitPattern>
+				<unitPattern count="many">{0} modfedd</unitPattern>
+				<unitPattern count="other">{0} modfedd</unitPattern>
+				<perUnitPattern>{0} y fodfedd</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsecau</displayName>
+				<unitPattern count="zero">{0} parsec</unitPattern>
+				<unitPattern count="one">{0} parsec</unitPattern>
+				<unitPattern count="two">{0} barsec</unitPattern>
+				<unitPattern count="few">{0} pharsec</unitPattern>
+				<unitPattern count="many">{0} pharsec</unitPattern>
+				<unitPattern count="other">{0} parsec</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>blynyddoedd golau</displayName>
+				<unitPattern count="zero">{0} blwyddyn golau</unitPattern>
+				<unitPattern count="one">{0} flwyddyn golau</unitPattern>
+				<unitPattern count="two">{0} flwyddyn golau</unitPattern>
+				<unitPattern count="few">{0} blwyddyn golau</unitPattern>
+				<unitPattern count="many">{0} blwyddyn golau</unitPattern>
+				<unitPattern count="other">{0} blwyddyn golau</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>unedau seryddol</displayName>
+				<unitPattern count="zero">{0} uned seryddol</unitPattern>
+				<unitPattern count="one">{0} uned seryddol</unitPattern>
+				<unitPattern count="two">{0} uned seryddol</unitPattern>
+				<unitPattern count="few">{0} uned seryddol</unitPattern>
+				<unitPattern count="many">{0} uned seryddol</unitPattern>
+				<unitPattern count="other">{0} uned seryddol</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>ystadenni</displayName>
+				<unitPattern count="zero">{0} ystaden</unitPattern>
+				<unitPattern count="one">{0} ystaden</unitPattern>
+				<unitPattern count="two">{0} ystaden</unitPattern>
+				<unitPattern count="few">{0} ystaden</unitPattern>
+				<unitPattern count="many">{0} ystaden</unitPattern>
+				<unitPattern count="other">{0} ystaden</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>gwrhydau</displayName>
+				<unitPattern count="zero">{0} gwryd</unitPattern>
+				<unitPattern count="one">{0} gwryd</unitPattern>
+				<unitPattern count="two">{0} wryd</unitPattern>
+				<unitPattern count="few">{0} gwryd</unitPattern>
+				<unitPattern count="many">{0} gwryd</unitPattern>
+				<unitPattern count="other">{0} gwryd</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>milltiroedd môr</displayName>
+				<unitPattern count="zero">{0} milltir fôr</unitPattern>
+				<unitPattern count="one">{0} filltir fôr</unitPattern>
+				<unitPattern count="two">{0} filltir fôr</unitPattern>
+				<unitPattern count="few">{0} milltir fôr</unitPattern>
+				<unitPattern count="many">{0} milltir fôr</unitPattern>
+				<unitPattern count="other">{0} milltir fôr</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>milltir Sgandinafia</displayName>
+				<unitPattern count="zero">{0} milltir Sgandinafia</unitPattern>
+				<unitPattern count="one">{0} filltir Sgandinafia</unitPattern>
+				<unitPattern count="two">{0} filltir Sgandinafia</unitPattern>
+				<unitPattern count="few">{0} milltir Sgandinafia</unitPattern>
+				<unitPattern count="many">{0} milltir Sgandinafia</unitPattern>
+				<unitPattern count="other">{0} milltir Sgandinafia</unitPattern>
+			</unit>
+			<unit type="light-lux">
+				<displayName>lycsau</displayName>
+				<unitPattern count="zero">{0} lwcs</unitPattern>
+				<unitPattern count="one">{0} lwcs</unitPattern>
+				<unitPattern count="two">{0} lwcs</unitPattern>
+				<unitPattern count="few">{0} lwcs</unitPattern>
+				<unitPattern count="many">{0} lwcs</unitPattern>
+				<unitPattern count="other">{0} lwcs</unitPattern>
+			</unit>
+			<unit type="mass-metric-ton">
+				<displayName>tunelli metrig</displayName>
+				<unitPattern count="zero">{0} tunnell fetrig</unitPattern>
+				<unitPattern count="one">{0} dunnell fetrig</unitPattern>
+				<unitPattern count="two">{0} dunnell fetrig</unitPattern>
+				<unitPattern count="few">{0} tunnell fetrig</unitPattern>
+				<unitPattern count="many">{0} tunnell fetrig</unitPattern>
+				<unitPattern count="other">{0} tunnell fetrig</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>cilogramau</displayName>
+				<unitPattern count="zero">{0} cilogram</unitPattern>
+				<unitPattern count="one">{0} cilogram</unitPattern>
+				<unitPattern count="two">{0} gilogram</unitPattern>
+				<unitPattern count="few">{0} chilogram</unitPattern>
+				<unitPattern count="many">{0} chilogram</unitPattern>
+				<unitPattern count="other">{0} cilogram</unitPattern>
+				<perUnitPattern>{0} y cilogram</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gramau</displayName>
+				<unitPattern count="zero">{0} gram</unitPattern>
+				<unitPattern count="one">{0} gram</unitPattern>
+				<unitPattern count="two">{0} gram</unitPattern>
+				<unitPattern count="few">{0} gram</unitPattern>
+				<unitPattern count="many">{0} gram</unitPattern>
+				<unitPattern count="other">{0} gram</unitPattern>
+				<perUnitPattern>{0} y gram</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>miligramau</displayName>
+				<unitPattern count="zero">{0} miligram</unitPattern>
+				<unitPattern count="one">{0} miligram</unitPattern>
+				<unitPattern count="two">{0} filigram</unitPattern>
+				<unitPattern count="few">{0} miligram</unitPattern>
+				<unitPattern count="many">{0} miligram</unitPattern>
+				<unitPattern count="other">{0} miligram</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>microgramau</displayName>
+				<unitPattern count="zero">{0} microgram</unitPattern>
+				<unitPattern count="one">{0} microgram</unitPattern>
+				<unitPattern count="two">{0} ficrogram</unitPattern>
+				<unitPattern count="few">{0} microgram</unitPattern>
+				<unitPattern count="many">{0} microgram</unitPattern>
+				<unitPattern count="other">{0} microgram</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>tunelli</displayName>
+				<unitPattern count="zero">{0} tunnell</unitPattern>
+				<unitPattern count="one">{0} dunnell</unitPattern>
+				<unitPattern count="two">{0} dunnell</unitPattern>
+				<unitPattern count="few">{0} tunnell</unitPattern>
+				<unitPattern count="many">{0} tunnell</unitPattern>
+				<unitPattern count="other">{0} tunnell</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName>stonau</displayName>
+				<unitPattern count="zero">{0} stôn</unitPattern>
+				<unitPattern count="one">{0} stôn</unitPattern>
+				<unitPattern count="two">{0} stôn</unitPattern>
+				<unitPattern count="few">{0} stôn</unitPattern>
+				<unitPattern count="many">{0} stôn</unitPattern>
+				<unitPattern count="other">{0} stôn</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>pwysi</displayName>
+				<unitPattern count="zero">{0} pwys</unitPattern>
+				<unitPattern count="one">{0} pwys</unitPattern>
+				<unitPattern count="two">{0} bwys</unitPattern>
+				<unitPattern count="few">{0} phwys</unitPattern>
+				<unitPattern count="many">{0} phwys</unitPattern>
+				<unitPattern count="other">{0} pwys</unitPattern>
+				<perUnitPattern>{0} y pwys</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ownsys</displayName>
+				<unitPattern count="zero">{0} owns</unitPattern>
+				<unitPattern count="one">{0} owns</unitPattern>
+				<unitPattern count="two">{0} owns</unitPattern>
+				<unitPattern count="few">{0} owns</unitPattern>
+				<unitPattern count="many">{0} owns</unitPattern>
+				<unitPattern count="other">{0} owns</unitPattern>
+				<perUnitPattern>{0} yr owns</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ownsiau pwysau aur</displayName>
+				<unitPattern count="zero">{0} owns pwysau aur</unitPattern>
+				<unitPattern count="one">{0} owns pwysau aur</unitPattern>
+				<unitPattern count="two">{0} owns pwysau aur</unitPattern>
+				<unitPattern count="few">{0} owns pwysau aur</unitPattern>
+				<unitPattern count="many">{0} owns pwysau aur</unitPattern>
+				<unitPattern count="other">{0} owns pwysau aur</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName draft="provisional">caratau</displayName>
+				<unitPattern count="zero" draft="provisional">{0} carat</unitPattern>
+				<unitPattern count="one" draft="provisional">{0} carat</unitPattern>
+				<unitPattern count="two" draft="provisional">{0} garat</unitPattern>
+				<unitPattern count="few" draft="provisional">{0} charat</unitPattern>
+				<unitPattern count="many" draft="provisional">{0} charat</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} carat</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<displayName>gigawatiau</displayName>
+				<unitPattern count="zero">{0} gigawat</unitPattern>
+				<unitPattern count="one">{0} gigawat</unitPattern>
+				<unitPattern count="two">{0} gigawat</unitPattern>
+				<unitPattern count="few">{0} gigawat</unitPattern>
+				<unitPattern count="many">{0} gigawat</unitPattern>
+				<unitPattern count="other">{0} gigawat</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>megawatiau</displayName>
+				<unitPattern count="zero">{0} megawat</unitPattern>
+				<unitPattern count="one">{0} megawat</unitPattern>
+				<unitPattern count="two">{0} fegawat</unitPattern>
+				<unitPattern count="few">{0} megawat</unitPattern>
+				<unitPattern count="many">{0} megawat</unitPattern>
+				<unitPattern count="other">{0} megawat</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>cilawatiau</displayName>
+				<unitPattern count="zero">{0} cilowat</unitPattern>
+				<unitPattern count="one">{0} cilowat</unitPattern>
+				<unitPattern count="two">{0} gilowat</unitPattern>
+				<unitPattern count="few">{0} chilowat</unitPattern>
+				<unitPattern count="many">{0} chilowat</unitPattern>
+				<unitPattern count="other">{0} cilowat</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>watiau</displayName>
+				<unitPattern count="zero">{0} wat</unitPattern>
+				<unitPattern count="one">{0} wat</unitPattern>
+				<unitPattern count="two">{0} wat</unitPattern>
+				<unitPattern count="few">{0} wat</unitPattern>
+				<unitPattern count="many">{0} wat</unitPattern>
+				<unitPattern count="other">{0} wat</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>miliwatiau</displayName>
+				<unitPattern count="zero">{0} miliwat</unitPattern>
+				<unitPattern count="one">{0} miliwat</unitPattern>
+				<unitPattern count="two">{0} filiwat</unitPattern>
+				<unitPattern count="few">{0} miliwat</unitPattern>
+				<unitPattern count="many">{0} miliwat</unitPattern>
+				<unitPattern count="other">{0} miliwat</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>marchnerth</displayName>
+				<unitPattern count="zero">{0} marchnerth</unitPattern>
+				<unitPattern count="one">{0} marchnerth</unitPattern>
+				<unitPattern count="two">{0} farchnerth</unitPattern>
+				<unitPattern count="few">{0} marchnerth</unitPattern>
+				<unitPattern count="many">{0} marchnerth</unitPattern>
+				<unitPattern count="other">{0} marchnerth</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<displayName>hectopascalau</displayName>
+				<unitPattern count="zero">{0} hectopascal</unitPattern>
+				<unitPattern count="one">{0} hectopascal</unitPattern>
+				<unitPattern count="two">{0} hectopascal</unitPattern>
+				<unitPattern count="few">{0} hectopascal</unitPattern>
+				<unitPattern count="many">{0} hectopascal</unitPattern>
+				<unitPattern count="other">{0} hectopascal</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>milimetrau o fercwri</displayName>
+				<unitPattern count="zero">{0} milimetr o fercwri</unitPattern>
+				<unitPattern count="one">{0} milimetr o fercwri</unitPattern>
+				<unitPattern count="two">{0} filimetr o fercwri</unitPattern>
+				<unitPattern count="few">{0} milimetr o fercwri</unitPattern>
+				<unitPattern count="many">{0} milimetr o fercwri</unitPattern>
+				<unitPattern count="other">{0} milimetr o fercwri</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>pwysau y fodfedd sgwar</displayName>
+				<unitPattern count="zero">{0} pwys y fodfedd sgwar</unitPattern>
+				<unitPattern count="one">{0} pwys y fodfedd sgwar</unitPattern>
+				<unitPattern count="two">{0} bwys y fodfedd sgwar</unitPattern>
+				<unitPattern count="few">{0} pwys y fodfedd sgwar</unitPattern>
+				<unitPattern count="many">{0} pwys y fodfedd sgwar</unitPattern>
+				<unitPattern count="other">{0} pwys y fodfedd sgwar</unitPattern>
+			</unit>
+			<unit type="pressure-inch-hg">
+				<displayName>modfeddi o fercwri</displayName>
+				<unitPattern count="zero">{0} modfedd o fercwri</unitPattern>
+				<unitPattern count="one">{0} fodfedd o fercwri</unitPattern>
+				<unitPattern count="two">{0} fodfedd o fercwri</unitPattern>
+				<unitPattern count="few">{0} modfedd o fercwri</unitPattern>
+				<unitPattern count="many">{0} modfedd o fercwri</unitPattern>
+				<unitPattern count="other">{0} modfedd o fercwri</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>milibarrau</displayName>
+				<unitPattern count="zero">{0} milibar</unitPattern>
+				<unitPattern count="one">{0} milibar</unitPattern>
+				<unitPattern count="two">{0} filibar</unitPattern>
+				<unitPattern count="few">{0} milibar</unitPattern>
+				<unitPattern count="many">{0} milibar</unitPattern>
+				<unitPattern count="other">{0} milibar</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>cilometrau yr awr</displayName>
+				<unitPattern count="zero">{0} cilometr yr awr</unitPattern>
+				<unitPattern count="one">{0} cilometr yr awr</unitPattern>
+				<unitPattern count="two">{0} gilometr yr awr</unitPattern>
+				<unitPattern count="few">{0} chilometr yr awr</unitPattern>
+				<unitPattern count="many">{0} chilometr yr awr</unitPattern>
+				<unitPattern count="other">{0} cilometr yr awr</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>metrau yr eiliad</displayName>
+				<unitPattern count="zero">{0} metr yr eiliad</unitPattern>
+				<unitPattern count="one">{0} metr yr eiliad</unitPattern>
+				<unitPattern count="two">{0} fetr yr eiliad</unitPattern>
+				<unitPattern count="few">{0} metr yr eiliad</unitPattern>
+				<unitPattern count="many">{0} metr yr eiliad</unitPattern>
+				<unitPattern count="other">{0} metr yr eiliad</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>milltiroedd yr awr</displayName>
+				<unitPattern count="zero">{0} milltir yr awr</unitPattern>
+				<unitPattern count="one">{0} filltir yr awr</unitPattern>
+				<unitPattern count="two">{0} filltir yr awr</unitPattern>
+				<unitPattern count="few">{0} milltir yr awr</unitPattern>
+				<unitPattern count="many">{0} milltir yr awr</unitPattern>
+				<unitPattern count="other">{0} milltir yr awr</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>notiau</displayName>
+				<unitPattern count="zero">{0} not</unitPattern>
+				<unitPattern count="one">{0} not</unitPattern>
+				<unitPattern count="two">{0} not</unitPattern>
+				<unitPattern count="few">{0} not</unitPattern>
+				<unitPattern count="many">{0} not</unitPattern>
+				<unitPattern count="other">{0} not</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="zero">{0}°</unitPattern>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="two">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>graddau Celsius</displayName>
+				<unitPattern count="zero">{0} gradd Celsius</unitPattern>
+				<unitPattern count="one">{0} radd Celsius</unitPattern>
+				<unitPattern count="two">{0} radd Celsius</unitPattern>
+				<unitPattern count="few">{0} gradd Celsius</unitPattern>
+				<unitPattern count="many">{0} gradd Celsius</unitPattern>
+				<unitPattern count="other">{0} gradd Celsius</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName>gradd Fahrenheit</displayName>
+				<unitPattern count="zero">{0} gradd Fahrenheit</unitPattern>
+				<unitPattern count="one">{0} radd Fahrenheit</unitPattern>
+				<unitPattern count="two">{0} radd Fahrenheit</unitPattern>
+				<unitPattern count="few">{0} gradd Fahrenheit</unitPattern>
+				<unitPattern count="many">{0} gradd Fahrenheit</unitPattern>
+				<unitPattern count="other">{0} gradd Fahrenheit</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>celfinau</displayName>
+				<unitPattern count="zero">{0} celfin</unitPattern>
+				<unitPattern count="one">{0} celfin</unitPattern>
+				<unitPattern count="two">{0} gelfin</unitPattern>
+				<unitPattern count="few">{0} chelfin</unitPattern>
+				<unitPattern count="many">{0} celfin</unitPattern>
+				<unitPattern count="other">{0} celfin</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>cilometrau ciwbig</displayName>
+				<unitPattern count="zero">{0} cilometr ciwbig</unitPattern>
+				<unitPattern count="one">{0} cilometr ciwbig</unitPattern>
+				<unitPattern count="two">{0} gilometr ciwbig</unitPattern>
+				<unitPattern count="few">{0} chilometr ciwbig</unitPattern>
+				<unitPattern count="many">{0} chilometr ciwbig</unitPattern>
+				<unitPattern count="other">{0} cilometr ciwbig</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>metrau ciwbig</displayName>
+				<unitPattern count="zero">{0} metr ciwbig</unitPattern>
+				<unitPattern count="one">{0} metr ciwbig</unitPattern>
+				<unitPattern count="two">{0} fetr ciwbig</unitPattern>
+				<unitPattern count="few">{0} metr ciwbig</unitPattern>
+				<unitPattern count="many">{0} metr ciwbig</unitPattern>
+				<unitPattern count="other">{0} metr ciwbig</unitPattern>
+				<perUnitPattern>{0} y metr ciwbig</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>centimetrau ciwbig</displayName>
+				<unitPattern count="zero">{0} centimetr ciwbig</unitPattern>
+				<unitPattern count="one">{0} centimetr ciwbig</unitPattern>
+				<unitPattern count="two">{0} gentimetr ciwbig</unitPattern>
+				<unitPattern count="few">{0} chentimetr ciwbig</unitPattern>
+				<unitPattern count="many">{0} centimetr ciwbig</unitPattern>
+				<unitPattern count="other">{0} chentimetr ciwbig</unitPattern>
+				<perUnitPattern>{0} y centimetr ciwbig</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>milltiroedd ciwbig</displayName>
+				<unitPattern count="zero">{0} milltir giwbig</unitPattern>
+				<unitPattern count="one">{0} filltir giwbig</unitPattern>
+				<unitPattern count="two">{0} filltir giwbig</unitPattern>
+				<unitPattern count="few">{0} milltir giwbig</unitPattern>
+				<unitPattern count="many">{0} milltir giwbig</unitPattern>
+				<unitPattern count="other">{0} milltir giwbig</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>llathenni ciwbig</displayName>
+				<unitPattern count="zero">{0} llath giwbig</unitPattern>
+				<unitPattern count="one">{0} llathen giwbig</unitPattern>
+				<unitPattern count="two">{0} lath giwbig</unitPattern>
+				<unitPattern count="few">{0} llath giwbig</unitPattern>
+				<unitPattern count="many">{0} llath giwbig</unitPattern>
+				<unitPattern count="other">{0} llath giwbig</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>troedfeddi ciwbig</displayName>
+				<unitPattern count="zero">{0} troedfedd giwbig</unitPattern>
+				<unitPattern count="one">{0} droedfedd giwbig</unitPattern>
+				<unitPattern count="two">{0} droedfedd giwbig</unitPattern>
+				<unitPattern count="few">{0} troedfedd giwbig</unitPattern>
+				<unitPattern count="many">{0} troedfedd giwbig</unitPattern>
+				<unitPattern count="other">{0} troedfedd giwbig</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>modfeddi ciwbig</displayName>
+				<unitPattern count="zero">{0} modfedd giwbig</unitPattern>
+				<unitPattern count="one">{0} fodfedd giwbig</unitPattern>
+				<unitPattern count="two">{0} fodfedd giwbig</unitPattern>
+				<unitPattern count="few">{0} modfedd giwbig</unitPattern>
+				<unitPattern count="many">{0} modfedd giwbig</unitPattern>
+				<unitPattern count="other">{0} modfedd giwbig</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>megalitrau</displayName>
+				<unitPattern count="zero">{0} megalitr</unitPattern>
+				<unitPattern count="one">{0} megalitr</unitPattern>
+				<unitPattern count="two">{0} fegalitr</unitPattern>
+				<unitPattern count="few">{0} megalitr</unitPattern>
+				<unitPattern count="many">{0} megalitr</unitPattern>
+				<unitPattern count="other">{0} megalitr</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hectolitrau</displayName>
+				<unitPattern count="zero">{0} hectolitr</unitPattern>
+				<unitPattern count="one">{0} hectolitr</unitPattern>
+				<unitPattern count="two">{0} hectolitr</unitPattern>
+				<unitPattern count="few">{0} hectolitr</unitPattern>
+				<unitPattern count="many">{0} hectolitr</unitPattern>
+				<unitPattern count="other">{0} hectolitr</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>litrau</displayName>
+				<unitPattern count="zero">{0} litr</unitPattern>
+				<unitPattern count="one">{0} litr</unitPattern>
+				<unitPattern count="two">{0} litr</unitPattern>
+				<unitPattern count="few">{0} litr</unitPattern>
+				<unitPattern count="many">{0} litr</unitPattern>
+				<unitPattern count="other">{0} litr</unitPattern>
+				<perUnitPattern>{0} y litr</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>decilitrau</displayName>
+				<unitPattern count="zero">{0} decilitr</unitPattern>
+				<unitPattern count="one">{0} decilitr</unitPattern>
+				<unitPattern count="two">{0} decilitr</unitPattern>
+				<unitPattern count="few">{0} decilitr</unitPattern>
+				<unitPattern count="many">{0} decilitr</unitPattern>
+				<unitPattern count="other">{0} decilitr</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centilitrau</displayName>
+				<unitPattern count="zero">{0} centilitr</unitPattern>
+				<unitPattern count="one">{0} centilitr</unitPattern>
+				<unitPattern count="two">{0} gentilitr</unitPattern>
+				<unitPattern count="few">{0} chentilitr</unitPattern>
+				<unitPattern count="many">{0} chentilitr</unitPattern>
+				<unitPattern count="other">{0} centilitr</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>mililitrau</displayName>
+				<unitPattern count="zero">{0} mililitr</unitPattern>
+				<unitPattern count="one">{0} mililitr</unitPattern>
+				<unitPattern count="two">{0} mililitr</unitPattern>
+				<unitPattern count="few">{0} mililitr</unitPattern>
+				<unitPattern count="many">{0} mililitr</unitPattern>
+				<unitPattern count="other">{0} mililitr</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>peintiau metrig</displayName>
+				<unitPattern count="zero">{0} peint metrig</unitPattern>
+				<unitPattern count="one">{0} peint metrig</unitPattern>
+				<unitPattern count="two">{0} peint metrig</unitPattern>
+				<unitPattern count="few">{0} peint metrig</unitPattern>
+				<unitPattern count="many">{0} peint metrig</unitPattern>
+				<unitPattern count="other">{0} peint metrig</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>cwpaneidiau metrig</displayName>
+				<unitPattern count="zero">{0} cwpanaid metrig</unitPattern>
+				<unitPattern count="one">{0} cwpanaid metrig</unitPattern>
+				<unitPattern count="two">{0} gwpanaid metrig</unitPattern>
+				<unitPattern count="few">{0} cwpanaid metrig</unitPattern>
+				<unitPattern count="many">{0} cwpanaid metrig</unitPattern>
+				<unitPattern count="other">{0} cwpanaid metrig</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName draft="provisional">erw-droedfeddi</displayName>
+				<unitPattern count="zero" draft="provisional">{0} erw-droedfedd</unitPattern>
+				<unitPattern count="one" draft="provisional">{0} erw-droedfedd</unitPattern>
+				<unitPattern count="two" draft="provisional">{0} erw-droedfedd</unitPattern>
+				<unitPattern count="few" draft="provisional">{0} erw-droedfedd</unitPattern>
+				<unitPattern count="many" draft="provisional">{0} erw-droedfedd</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} erw-droedfedd</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>bwsielau</displayName>
+				<unitPattern count="zero">{0} bwsiel</unitPattern>
+				<unitPattern count="one">{0} bwsiel</unitPattern>
+				<unitPattern count="two">{0} bwsiel</unitPattern>
+				<unitPattern count="few">{0} bwsiel</unitPattern>
+				<unitPattern count="many">{0} bwsiel</unitPattern>
+				<unitPattern count="other">{0} bwsiel</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galwyni</displayName>
+				<unitPattern count="zero">{0} galwyn</unitPattern>
+				<unitPattern count="one">{0} galwyn</unitPattern>
+				<unitPattern count="two">{0} alwyn</unitPattern>
+				<unitPattern count="few">{0} galwyn</unitPattern>
+				<unitPattern count="many">{0} galwyn</unitPattern>
+				<unitPattern count="other">{0} galwyn</unitPattern>
+				<perUnitPattern>{0} y galwyn</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>chwartiau</displayName>
+				<unitPattern count="zero">{0} chwart</unitPattern>
+				<unitPattern count="one">{0} chwart</unitPattern>
+				<unitPattern count="two">{0} gwart</unitPattern>
+				<unitPattern count="few">{0} chwart</unitPattern>
+				<unitPattern count="many">{0} chwart</unitPattern>
+				<unitPattern count="other">{0} chwart</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>peintiau</displayName>
+				<unitPattern count="zero">{0} peint</unitPattern>
+				<unitPattern count="one">{0} peint</unitPattern>
+				<unitPattern count="two">{0} beint</unitPattern>
+				<unitPattern count="few">{0} pheint</unitPattern>
+				<unitPattern count="many">{0} pheint</unitPattern>
+				<unitPattern count="other">{0} peint</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cwpaneidiau</displayName>
+				<unitPattern count="zero">{0} cwpanaid</unitPattern>
+				<unitPattern count="one">{0} cwpanaid</unitPattern>
+				<unitPattern count="two">{0} gwpanaid</unitPattern>
+				<unitPattern count="few">{0} cwpanaid</unitPattern>
+				<unitPattern count="many">{0} cwpanaid</unitPattern>
+				<unitPattern count="other">{0} cwpanaid</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>ownsiau hylifol</displayName>
+				<unitPattern count="zero">{0} owns hylifol</unitPattern>
+				<unitPattern count="one">{0} owns hylifol</unitPattern>
+				<unitPattern count="two">{0} owns hylifol</unitPattern>
+				<unitPattern count="few">{0} owns hylifol</unitPattern>
+				<unitPattern count="many">{0} owns hylifol</unitPattern>
+				<unitPattern count="other">{0} owns hylifol</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>llond llwy fwrdd</displayName>
+				<unitPattern count="zero">{0} llond llwy fwrdd</unitPattern>
+				<unitPattern count="one">{0} llond llwy fwrdd</unitPattern>
+				<unitPattern count="two">{0} lond llwy fwrdd</unitPattern>
+				<unitPattern count="few">{0} llond llwy fwrdd</unitPattern>
+				<unitPattern count="many">{0} llond llwy fwrdd</unitPattern>
+				<unitPattern count="other">{0} llond llwy fwrdd</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>llond llwy de</displayName>
+				<unitPattern count="zero">{0} llond llwy de</unitPattern>
+				<unitPattern count="one">{0} llond llwy de</unitPattern>
+				<unitPattern count="two">{0} lond llwy de</unitPattern>
+				<unitPattern count="few">{0} llond llwy de</unitPattern>
+				<unitPattern count="many">{0} llond llwy de</unitPattern>
+				<unitPattern count="other">{0} llond llwy de</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} i’r dwyrain</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} i’r gogledd</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} i’r de</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} i’r gorllewin</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<unitLength type="short">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<displayName>grym disgyrchedd</displayName>
+				<unitPattern count="zero">{0} G</unitPattern>
+				<unitPattern count="one">{0} G</unitPattern>
+				<unitPattern count="two">{0} G</unitPattern>
+				<unitPattern count="few">{0} G</unitPattern>
+				<unitPattern count="many">{0} G</unitPattern>
+				<unitPattern count="other">{0} G</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-second-squared">
+				<displayName>metrau/eil²</displayName>
+				<unitPattern count="zero">{0} m/eil²</unitPattern>
+				<unitPattern count="one">{0} m/eil²</unitPattern>
+				<unitPattern count="two">{0} m/eil²</unitPattern>
+				<unitPattern count="few">{0} m/eil²</unitPattern>
+				<unitPattern count="many">{0} m/eil²</unitPattern>
+				<unitPattern count="other">{0} m/eil²</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>cylchdro</displayName>
+				<unitPattern count="zero">{0} cylchdro</unitPattern>
+				<unitPattern count="one">{0} cylchdro</unitPattern>
+				<unitPattern count="two">{0} gylchdro</unitPattern>
+				<unitPattern count="few">{0} chylchdro</unitPattern>
+				<unitPattern count="many">{0} cylchdro</unitPattern>
+				<unitPattern count="other">{0} cylchdro</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radianau</displayName>
+				<unitPattern count="zero">{0} rad</unitPattern>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="two">{0} rad</unitPattern>
+				<unitPattern count="few">{0} rad</unitPattern>
+				<unitPattern count="many">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>gradd</displayName>
+				<unitPattern count="zero">{0}°</unitPattern>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="two">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>arcfunudau</displayName>
+				<unitPattern count="zero">{0}′</unitPattern>
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="two">{0}′</unitPattern>
+				<unitPattern count="few">{0}′</unitPattern>
+				<unitPattern count="many">{0}′</unitPattern>
+				<unitPattern count="other">{0}′</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>arceiliadau</displayName>
+				<unitPattern count="zero">{0}″</unitPattern>
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="two">{0}″</unitPattern>
+				<unitPattern count="few">{0}″</unitPattern>
+				<unitPattern count="many">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="zero">{0} km²</unitPattern>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="two">{0} km²</unitPattern>
+				<unitPattern count="few">{0} km²</unitPattern>
+				<unitPattern count="many">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>hectarau</displayName>
+				<unitPattern count="zero">{0} ha</unitPattern>
+				<unitPattern count="one">{0} ha</unitPattern>
+				<unitPattern count="two">{0} ha</unitPattern>
+				<unitPattern count="few">{0} ha</unitPattern>
+				<unitPattern count="many">{0} ha</unitPattern>
+				<unitPattern count="other">{0} ha</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName draft="provisional">meterau²</displayName>
+				<unitPattern count="zero">{0} m²</unitPattern>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="two">{0} m²</unitPattern>
+				<unitPattern count="few">{0} m²</unitPattern>
+				<unitPattern count="many">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0} y m²</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>cm²</displayName>
+				<unitPattern count="zero">{0} cm²</unitPattern>
+				<unitPattern count="one">{0} cm²</unitPattern>
+				<unitPattern count="two">{0} cm²</unitPattern>
+				<unitPattern count="few">{0} cm²</unitPattern>
+				<unitPattern count="many">{0} cm²</unitPattern>
+				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0} y cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="zero">{0} mi²</unitPattern>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="two">{0} mi²</unitPattern>
+				<unitPattern count="few">{0} mi²</unitPattern>
+				<unitPattern count="many">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName draft="provisional">erw</displayName>
+				<unitPattern count="zero">{0} erw</unitPattern>
+				<unitPattern count="one">{0} erw</unitPattern>
+				<unitPattern count="two">{0} erw</unitPattern>
+				<unitPattern count="few">{0} erw</unitPattern>
+				<unitPattern count="many">{0} erw</unitPattern>
+				<unitPattern count="other">{0} erw</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName draft="provisional">llath²</displayName>
+				<unitPattern count="zero">{0} llath²</unitPattern>
+				<unitPattern count="one">{0} llath²</unitPattern>
+				<unitPattern count="two">{0} llath²</unitPattern>
+				<unitPattern count="few">{0} llath²</unitPattern>
+				<unitPattern count="many">{0} llath²</unitPattern>
+				<unitPattern count="other">{0} llath²</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>troedfedd²</displayName>
+				<unitPattern count="zero">{0} tr²</unitPattern>
+				<unitPattern count="one">{0} tr²</unitPattern>
+				<unitPattern count="two">{0} tr²</unitPattern>
+				<unitPattern count="few">{0} tr²</unitPattern>
+				<unitPattern count="many">{0} tr²</unitPattern>
+				<unitPattern count="other">{0} tr²</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>modfedd²</displayName>
+				<unitPattern count="zero">{0} mod²</unitPattern>
+				<unitPattern count="one">{0} mod²</unitPattern>
+				<unitPattern count="two">{0} mod²</unitPattern>
+				<unitPattern count="few">{0} mod²</unitPattern>
+				<unitPattern count="many">{0} mod²</unitPattern>
+				<unitPattern count="other">{0} mod²</unitPattern>
+				<perUnitPattern>{0} y mod²</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>karatau</displayName>
+				<unitPattern count="zero">{0} kt</unitPattern>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="two">{0} kt</unitPattern>
+				<unitPattern count="few">{0} kt</unitPattern>
+				<unitPattern count="many">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>litrau/km</displayName>
+				<unitPattern count="zero">{0} L/km</unitPattern>
+				<unitPattern count="one">{0} L/km</unitPattern>
+				<unitPattern count="two">{0} L/km</unitPattern>
+				<unitPattern count="few">{0} L/km</unitPattern>
+				<unitPattern count="many">{0} L/km</unitPattern>
+				<unitPattern count="other">{0} L/km</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="zero">{0} L/100km</unitPattern>
+				<unitPattern count="one">{0} L/100km</unitPattern>
+				<unitPattern count="two">{0} L/100km</unitPattern>
+				<unitPattern count="few">{0} L/100km</unitPattern>
+				<unitPattern count="many">{0} L/100km</unitPattern>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>mpg</displayName>
+				<unitPattern count="zero">{0} mpg</unitPattern>
+				<unitPattern count="one">{0} mpg</unitPattern>
+				<unitPattern count="two">{0} mpg</unitPattern>
+				<unitPattern count="few">{0} mpg</unitPattern>
+				<unitPattern count="many">{0} mpg</unitPattern>
+				<unitPattern count="other">{0} mpg</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<displayName>TBeit</displayName>
+				<unitPattern count="zero">{0} TB</unitPattern>
+				<unitPattern count="one">{0} TB</unitPattern>
+				<unitPattern count="two">{0} TB</unitPattern>
+				<unitPattern count="few">{0} TB</unitPattern>
+				<unitPattern count="many">{0} TB</unitPattern>
+				<unitPattern count="other">{0} TB</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="zero">{0} Tb</unitPattern>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="two">{0} Tb</unitPattern>
+				<unitPattern count="few">{0} Tb</unitPattern>
+				<unitPattern count="many">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GBeit</displayName>
+				<unitPattern count="zero">{0} GB</unitPattern>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="two">{0} GB</unitPattern>
+				<unitPattern count="few">{0} GB</unitPattern>
+				<unitPattern count="many">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="zero">{0} Gb</unitPattern>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="two">{0} Gb</unitPattern>
+				<unitPattern count="few">{0} Gb</unitPattern>
+				<unitPattern count="many">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MBeit</displayName>
+				<unitPattern count="zero">{0} MB</unitPattern>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="two">{0} MB</unitPattern>
+				<unitPattern count="few">{0} MB</unitPattern>
+				<unitPattern count="many">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="zero">{0} Mb</unitPattern>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="two">{0} Mb</unitPattern>
+				<unitPattern count="few">{0} Mb</unitPattern>
+				<unitPattern count="many">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kBeit</displayName>
+				<unitPattern count="zero">{0} kB</unitPattern>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="two">{0} kB</unitPattern>
+				<unitPattern count="few">{0} kB</unitPattern>
+				<unitPattern count="many">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="zero">{0} kb</unitPattern>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="two">{0} kb</unitPattern>
+				<unitPattern count="few">{0} kb</unitPattern>
+				<unitPattern count="many">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>beit</displayName>
+				<unitPattern count="zero">{0} beit</unitPattern>
+				<unitPattern count="one">{0} beit</unitPattern>
+				<unitPattern count="two">{0} feit</unitPattern>
+				<unitPattern count="few">{0} beit</unitPattern>
+				<unitPattern count="many">{0} beit</unitPattern>
+				<unitPattern count="other">{0} beit</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>did</displayName>
+				<unitPattern count="zero">{0} did</unitPattern>
+				<unitPattern count="one">{0} did</unitPattern>
+				<unitPattern count="two">{0} ddid</unitPattern>
+				<unitPattern count="few">{0} did</unitPattern>
+				<unitPattern count="many">{0} did</unitPattern>
+				<unitPattern count="other">{0} did</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>c</displayName>
+				<unitPattern count="zero">{0} c</unitPattern>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="two">{0} c</unitPattern>
+				<unitPattern count="few">{0} c</unitPattern>
+				<unitPattern count="many">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>blynyddoedd</displayName>
+				<unitPattern count="zero">{0} bl</unitPattern>
+				<unitPattern count="one">{0} bl</unitPattern>
+				<unitPattern count="two">{0} bl</unitPattern>
+				<unitPattern count="few">{0} bl</unitPattern>
+				<unitPattern count="many">{0} bl</unitPattern>
+				<unitPattern count="other">{0} bl</unitPattern>
+				<perUnitPattern>{0}/bl</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>misoedd</displayName>
+				<unitPattern count="zero">{0} mis</unitPattern>
+				<unitPattern count="one">{0} mis</unitPattern>
+				<unitPattern count="two">{0} fis</unitPattern>
+				<unitPattern count="few">{0} mis</unitPattern>
+				<unitPattern count="many">{0} mis</unitPattern>
+				<unitPattern count="other">{0} mis</unitPattern>
+				<perUnitPattern>{0}/mis</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>wythnosau</displayName>
+				<unitPattern count="zero">{0} wythnos</unitPattern>
+				<unitPattern count="one">{0} wythnos</unitPattern>
+				<unitPattern count="two">{0} wythnos</unitPattern>
+				<unitPattern count="few">{0} wythnos</unitPattern>
+				<unitPattern count="many">{0} wythnos</unitPattern>
+				<unitPattern count="other">{0} wythnos</unitPattern>
+				<perUnitPattern>{0}/wythnos</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>diwrnodau</displayName>
+				<unitPattern count="zero">{0} diwrnod</unitPattern>
+				<unitPattern count="one">{0} diwrnod</unitPattern>
+				<unitPattern count="two">{0} ddiwrnod</unitPattern>
+				<unitPattern count="few">{0} diwrnod</unitPattern>
+				<unitPattern count="many">{0} diwrnod</unitPattern>
+				<unitPattern count="other">{0} diwrnod</unitPattern>
+				<perUnitPattern>{0}/d</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>oriau</displayName>
+				<unitPattern count="zero">{0} awr</unitPattern>
+				<unitPattern count="one">{0} awr</unitPattern>
+				<unitPattern count="two">{0} awr</unitPattern>
+				<unitPattern count="few">{0} awr</unitPattern>
+				<unitPattern count="many">{0} awr</unitPattern>
+				<unitPattern count="other">{0} awr</unitPattern>
+				<perUnitPattern draft="provisional">{0} ya</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>mun</displayName>
+				<unitPattern count="zero">{0} mun</unitPattern>
+				<unitPattern count="one">{0} mun</unitPattern>
+				<unitPattern count="two">{0} mun</unitPattern>
+				<unitPattern count="few">{0} mun</unitPattern>
+				<unitPattern count="many">{0} mun</unitPattern>
+				<unitPattern count="other">{0} mun</unitPattern>
+				<perUnitPattern>{0}/mun</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>eiliadau</displayName>
+				<unitPattern count="zero">{0} eil</unitPattern>
+				<unitPattern count="one">{0} eil</unitPattern>
+				<unitPattern count="two">{0} eil</unitPattern>
+				<unitPattern count="few">{0} eil</unitPattern>
+				<unitPattern count="many">{0} eil</unitPattern>
+				<unitPattern count="other">{0} eil</unitPattern>
+				<perUnitPattern>{0}/eil</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>milieiliadau</displayName>
+				<unitPattern count="zero">{0} milieil</unitPattern>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="two">{0} ms</unitPattern>
+				<unitPattern count="few">{0} ms</unitPattern>
+				<unitPattern count="many">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="zero">{0} μs</unitPattern>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="two">{0} μs</unitPattern>
+				<unitPattern count="few">{0} μs</unitPattern>
+				<unitPattern count="many">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="zero">{0} ns</unitPattern>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="two">{0} ns</unitPattern>
+				<unitPattern count="few">{0} ns</unitPattern>
+				<unitPattern count="many">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName draft="provisional">ampau</displayName>
+				<unitPattern count="zero">{0} A</unitPattern>
+				<unitPattern count="one">{0} A</unitPattern>
+				<unitPattern count="two">{0} A</unitPattern>
+				<unitPattern count="few">{0} A</unitPattern>
+				<unitPattern count="many">{0} A</unitPattern>
+				<unitPattern count="other">{0} A</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName draft="provisional">miliampau</displayName>
+				<unitPattern count="zero">{0} mA</unitPattern>
+				<unitPattern count="one">{0} mA</unitPattern>
+				<unitPattern count="two">{0} mA</unitPattern>
+				<unitPattern count="few">{0} mA</unitPattern>
+				<unitPattern count="many">{0} mA</unitPattern>
+				<unitPattern count="other">{0} mA</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<displayName>ohmau</displayName>
+				<unitPattern count="zero">{0} Ω</unitPattern>
+				<unitPattern count="one">{0} Ω</unitPattern>
+				<unitPattern count="two">{0} Ω</unitPattern>
+				<unitPattern count="few">{0} Ω</unitPattern>
+				<unitPattern count="many">{0} Ω</unitPattern>
+				<unitPattern count="other">{0} Ω</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>foltiau</displayName>
+				<unitPattern count="zero">{0} V</unitPattern>
+				<unitPattern count="one">{0} V</unitPattern>
+				<unitPattern count="two">{0} V</unitPattern>
+				<unitPattern count="few">{0} V</unitPattern>
+				<unitPattern count="many">{0} V</unitPattern>
+				<unitPattern count="other">{0} V</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="zero">{0} kcal</unitPattern>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="two">{0} kcal</unitPattern>
+				<unitPattern count="few">{0} kcal</unitPattern>
+				<unitPattern count="many">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>cal</displayName>
+				<unitPattern count="zero">{0} cal</unitPattern>
+				<unitPattern count="one">{0} cal</unitPattern>
+				<unitPattern count="two">{0} cal</unitPattern>
+				<unitPattern count="few">{0} cal</unitPattern>
+				<unitPattern count="many">{0} cal</unitPattern>
+				<unitPattern count="other">{0} cal</unitPattern>
+			</unit>
+			<unit type="energy-foodcalorie">
+				<displayName>Cal</displayName>
+				<unitPattern count="zero">{0} Cal</unitPattern>
+				<unitPattern count="one">{0} Cal</unitPattern>
+				<unitPattern count="two">{0} Cal</unitPattern>
+				<unitPattern count="few">{0} Cal</unitPattern>
+				<unitPattern count="many">{0} Cal</unitPattern>
+				<unitPattern count="other">{0} Cal</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>cilojouleau</displayName>
+				<unitPattern count="zero">{0} kJ</unitPattern>
+				<unitPattern count="one">{0} kJ</unitPattern>
+				<unitPattern count="two">{0} kJ</unitPattern>
+				<unitPattern count="few">{0} kJ</unitPattern>
+				<unitPattern count="many">{0} kJ</unitPattern>
+				<unitPattern count="other">{0} kJ</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>jouleau</displayName>
+				<unitPattern count="zero">{0} J</unitPattern>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="two">{0} J</unitPattern>
+				<unitPattern count="few">{0} J</unitPattern>
+				<unitPattern count="many">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName draft="provisional">kW-awr</displayName>
+				<unitPattern count="zero" draft="provisional">{0} kW-awr</unitPattern>
+				<unitPattern count="one" draft="provisional">{0} kW-awr</unitPattern>
+				<unitPattern count="two" draft="provisional">{0} kW-awr</unitPattern>
+				<unitPattern count="few" draft="provisional">{0} kW-awr</unitPattern>
+				<unitPattern count="many" draft="provisional">{0} kW-awr</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} kW-awr</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<displayName>GHz</displayName>
+				<unitPattern count="zero">{0} GHz</unitPattern>
+				<unitPattern count="one">{0} GHz</unitPattern>
+				<unitPattern count="two">{0} GHz</unitPattern>
+				<unitPattern count="few">{0} GHz</unitPattern>
+				<unitPattern count="many">{0} GHz</unitPattern>
+				<unitPattern count="other">{0} GHz</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="zero">{0} MHz</unitPattern>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="two">{0} MHz</unitPattern>
+				<unitPattern count="few">{0} MHz</unitPattern>
+				<unitPattern count="many">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>kHz</displayName>
+				<unitPattern count="zero">{0} kHz</unitPattern>
+				<unitPattern count="one">{0} kHz</unitPattern>
+				<unitPattern count="two">{0} kHz</unitPattern>
+				<unitPattern count="few">{0} kHz</unitPattern>
+				<unitPattern count="many">{0} kHz</unitPattern>
+				<unitPattern count="other">{0} kHz</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="zero">{0} Hz</unitPattern>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="two">{0} Hz</unitPattern>
+				<unitPattern count="few">{0} Hz</unitPattern>
+				<unitPattern count="many">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="zero">{0} km</unitPattern>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="two">{0} km</unitPattern>
+				<unitPattern count="few">{0} km</unitPattern>
+				<unitPattern count="many">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>metrau</displayName>
+				<unitPattern count="zero">{0} m</unitPattern>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="two">{0} m</unitPattern>
+				<unitPattern count="few">{0} m</unitPattern>
+				<unitPattern count="many">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0} y metr</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>dm</displayName>
+				<unitPattern count="zero">{0} dm</unitPattern>
+				<unitPattern count="one">{0} dm</unitPattern>
+				<unitPattern count="two">{0} dm</unitPattern>
+				<unitPattern count="few">{0} dm</unitPattern>
+				<unitPattern count="many">{0} dm</unitPattern>
+				<unitPattern count="other">{0} dm</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="zero">{0} cm</unitPattern>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="two">{0} cm</unitPattern>
+				<unitPattern count="few">{0} cm</unitPattern>
+				<unitPattern count="many">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>mm</displayName>
+				<unitPattern count="zero">{0} mm</unitPattern>
+				<unitPattern count="one">{0} mm</unitPattern>
+				<unitPattern count="two">{0} mm</unitPattern>
+				<unitPattern count="few">{0} mm</unitPattern>
+				<unitPattern count="many">{0} mm</unitPattern>
+				<unitPattern count="other">{0} mm</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>µmetrau</displayName>
+				<unitPattern count="zero">{0} µm</unitPattern>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="two">{0} µm</unitPattern>
+				<unitPattern count="few">{0} µm</unitPattern>
+				<unitPattern count="many">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nm</displayName>
+				<unitPattern count="zero">{0} nm</unitPattern>
+				<unitPattern count="one">{0} nm</unitPattern>
+				<unitPattern count="two">{0} nm</unitPattern>
+				<unitPattern count="few">{0} nm</unitPattern>
+				<unitPattern count="many">{0} nm</unitPattern>
+				<unitPattern count="other">{0} nm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>pm</displayName>
+				<unitPattern count="zero">{0} pm</unitPattern>
+				<unitPattern count="one">{0} pm</unitPattern>
+				<unitPattern count="two">{0} pm</unitPattern>
+				<unitPattern count="few">{0} pm</unitPattern>
+				<unitPattern count="many">{0} pm</unitPattern>
+				<unitPattern count="other">{0} pm</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>milltiroedd</displayName>
+				<unitPattern count="zero">{0} mi</unitPattern>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="two">{0} mi</unitPattern>
+				<unitPattern count="few">{0} mi</unitPattern>
+				<unitPattern count="many">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>llathenni</displayName>
+				<unitPattern count="zero">{0} llath</unitPattern>
+				<unitPattern count="one">{0} llath</unitPattern>
+				<unitPattern count="two">{0} lath</unitPattern>
+				<unitPattern count="few">{0} llath</unitPattern>
+				<unitPattern count="many">{0} llath</unitPattern>
+				<unitPattern count="other">{0} llath</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>troedfeddi</displayName>
+				<unitPattern count="zero">{0}′</unitPattern>
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="two">{0}′</unitPattern>
+				<unitPattern count="few">{0}′</unitPattern>
+				<unitPattern count="many">{0}′</unitPattern>
+				<unitPattern count="other">{0}′</unitPattern>
+				<perUnitPattern>{0}/troedfedd</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>modfeddi</displayName>
+				<unitPattern count="zero">{0} modfedd</unitPattern>
+				<unitPattern count="one">{0} fodfedd</unitPattern>
+				<unitPattern count="two">{0} fodfedd</unitPattern>
+				<unitPattern count="few">{0} modfedd</unitPattern>
+				<unitPattern count="many">{0} modfedd</unitPattern>
+				<unitPattern count="other">{0} modfedd</unitPattern>
+				<perUnitPattern>{0}/fodfedd</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsecau</displayName>
+				<unitPattern count="zero">{0} pc</unitPattern>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="two">{0} pc</unitPattern>
+				<unitPattern count="few">{0} pc</unitPattern>
+				<unitPattern count="many">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>bl golau</displayName>
+				<unitPattern count="zero">{0} blwyddyn golau</unitPattern>
+				<unitPattern count="one">{0} flwyddyn golau</unitPattern>
+				<unitPattern count="two">{0} flwyddyn golau</unitPattern>
+				<unitPattern count="few">{0} blwyddyn golau</unitPattern>
+				<unitPattern count="many">{0} blwyddyn golau</unitPattern>
+				<unitPattern count="other">{0} blwyddyn golau</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>u.s.</displayName>
+				<unitPattern count="zero">{0} u.s.</unitPattern>
+				<unitPattern count="one">{0} u.s.</unitPattern>
+				<unitPattern count="two">{0} u.s.</unitPattern>
+				<unitPattern count="few">{0} u.s.</unitPattern>
+				<unitPattern count="many">{0} u.s.</unitPattern>
+				<unitPattern count="other">{0} u.s.</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>ystadenni</displayName>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>gwrhydau</displayName>
+				<unitPattern count="zero">{0} gwryd</unitPattern>
+				<unitPattern count="one">{0} gwryd</unitPattern>
+				<unitPattern count="two">{0} wryd</unitPattern>
+				<unitPattern count="few">{0} gwryd</unitPattern>
+				<unitPattern count="many">{0} gwryd</unitPattern>
+				<unitPattern count="other">{0} gwryd</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>mi fôr</displayName>
+				<unitPattern count="zero">{0} mi fôr</unitPattern>
+				<unitPattern count="one">{0} mi fôr</unitPattern>
+				<unitPattern count="two">{0} mi fôr</unitPattern>
+				<unitPattern count="few">{0} mi fôr</unitPattern>
+				<unitPattern count="many">{0} mi fôr</unitPattern>
+				<unitPattern count="other">{0} mi fôr</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>mi Sgand.</displayName>
+				<unitPattern count="zero">{0} mi Sgand.</unitPattern>
+				<unitPattern count="one">{0} mi Sgand.</unitPattern>
+				<unitPattern count="two">{0} mi Sgand.</unitPattern>
+				<unitPattern count="few">{0} mi Sgand.</unitPattern>
+				<unitPattern count="many">{0} mi Sgand.</unitPattern>
+				<unitPattern count="other">{0} mi Sgand.</unitPattern>
+			</unit>
+			<unit type="light-lux">
+				<displayName>lycsau</displayName>
+				<unitPattern count="zero">{0} lx</unitPattern>
+				<unitPattern count="one">{0} lx</unitPattern>
+				<unitPattern count="two">{0} lx</unitPattern>
+				<unitPattern count="few">{0} lx</unitPattern>
+				<unitPattern count="many">{0} lx</unitPattern>
+				<unitPattern count="other">{0} lx</unitPattern>
+			</unit>
+			<unit type="mass-metric-ton">
+				<displayName>t</displayName>
+				<unitPattern count="zero">{0} t</unitPattern>
+				<unitPattern count="one">{0} t</unitPattern>
+				<unitPattern count="two">{0} t</unitPattern>
+				<unitPattern count="few">{0} t</unitPattern>
+				<unitPattern count="many">{0} t</unitPattern>
+				<unitPattern count="other">{0} t</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="zero">{0} kg</unitPattern>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="two">{0} kg</unitPattern>
+				<unitPattern count="few">{0} kg</unitPattern>
+				<unitPattern count="many">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gramau</displayName>
+				<unitPattern count="zero">{0} g</unitPattern>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="two">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="many">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>mg</displayName>
+				<unitPattern count="zero">{0} mg</unitPattern>
+				<unitPattern count="one">{0} mg</unitPattern>
+				<unitPattern count="two">{0} mg</unitPattern>
+				<unitPattern count="few">{0} mg</unitPattern>
+				<unitPattern count="many">{0} mg</unitPattern>
+				<unitPattern count="other">{0} mg</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="zero">{0} µg</unitPattern>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="two">{0} µg</unitPattern>
+				<unitPattern count="few">{0} µg</unitPattern>
+				<unitPattern count="many">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>tn</displayName>
+				<unitPattern count="zero">{0} tn</unitPattern>
+				<unitPattern count="one">{0} tn</unitPattern>
+				<unitPattern count="two">{0} tn</unitPattern>
+				<unitPattern count="few">{0} tn</unitPattern>
+				<unitPattern count="many">{0} tn</unitPattern>
+				<unitPattern count="other">{0} tn</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName>stonau</displayName>
+				<unitPattern count="zero">{0} st</unitPattern>
+				<unitPattern count="one">{0} st</unitPattern>
+				<unitPattern count="two">{0} st</unitPattern>
+				<unitPattern count="few">{0} st</unitPattern>
+				<unitPattern count="many">{0} st</unitPattern>
+				<unitPattern count="other">{0} st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>pwysi</displayName>
+				<unitPattern count="zero">{0} pwys</unitPattern>
+				<unitPattern count="one">{0} pwys</unitPattern>
+				<unitPattern count="two">{0} bwys</unitPattern>
+				<unitPattern count="few">{0} phwys</unitPattern>
+				<unitPattern count="many">{0} phwys</unitPattern>
+				<unitPattern count="other">{0} pwys</unitPattern>
+				<perUnitPattern>{0}/pwys</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>owns</displayName>
+				<unitPattern count="zero">{0} owns</unitPattern>
+				<unitPattern count="one">{0} owns</unitPattern>
+				<unitPattern count="two">{0} owns</unitPattern>
+				<unitPattern count="few">{0} owns</unitPattern>
+				<unitPattern count="many">{0} owns</unitPattern>
+				<unitPattern count="other">{0} owns</unitPattern>
+				<perUnitPattern>{0}/owns</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="zero">{0} oz t</unitPattern>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="two">{0} oz t</unitPattern>
+				<unitPattern count="few">{0} oz t</unitPattern>
+				<unitPattern count="many">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>caratau</displayName>
+				<unitPattern count="zero">{0} CD</unitPattern>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="two">{0} CD</unitPattern>
+				<unitPattern count="few">{0} CD</unitPattern>
+				<unitPattern count="many">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<displayName>GW</displayName>
+				<unitPattern count="zero">{0} GW</unitPattern>
+				<unitPattern count="one">{0} GW</unitPattern>
+				<unitPattern count="two">{0} GW</unitPattern>
+				<unitPattern count="few">{0} GW</unitPattern>
+				<unitPattern count="many">{0} GW</unitPattern>
+				<unitPattern count="other">{0} GW</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>MW</displayName>
+				<unitPattern count="zero">{0} MW</unitPattern>
+				<unitPattern count="one">{0} MW</unitPattern>
+				<unitPattern count="two">{0} MW</unitPattern>
+				<unitPattern count="few">{0} MW</unitPattern>
+				<unitPattern count="many">{0} MW</unitPattern>
+				<unitPattern count="other">{0} MW</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="zero">{0} kW</unitPattern>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="two">{0} kW</unitPattern>
+				<unitPattern count="few">{0} kW</unitPattern>
+				<unitPattern count="many">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>watiau</displayName>
+				<unitPattern count="zero">{0} W</unitPattern>
+				<unitPattern count="one">{0} W</unitPattern>
+				<unitPattern count="two">{0} W</unitPattern>
+				<unitPattern count="few">{0} W</unitPattern>
+				<unitPattern count="many">{0} W</unitPattern>
+				<unitPattern count="other">{0} W</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="zero">{0} mW</unitPattern>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="two">{0} mW</unitPattern>
+				<unitPattern count="few">{0} mW</unitPattern>
+				<unitPattern count="many">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="zero">{0} hp</unitPattern>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="two">{0} hp</unitPattern>
+				<unitPattern count="few">{0} hp</unitPattern>
+				<unitPattern count="many">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<displayName>hPa</displayName>
+				<unitPattern count="zero">{0} hPa</unitPattern>
+				<unitPattern count="one">{0} hPa</unitPattern>
+				<unitPattern count="two">{0} hPa</unitPattern>
+				<unitPattern count="few">{0} hPa</unitPattern>
+				<unitPattern count="many">{0} hPa</unitPattern>
+				<unitPattern count="other">{0} hPa</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>mm Hg</displayName>
+				<unitPattern count="zero">{0} mm Hg</unitPattern>
+				<unitPattern count="one">{0} mm Hg</unitPattern>
+				<unitPattern count="two">{0} mm Hg</unitPattern>
+				<unitPattern count="few">{0} mm Hg</unitPattern>
+				<unitPattern count="many">{0} mm Hg</unitPattern>
+				<unitPattern count="other">{0} mm Hg</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>psi</displayName>
+				<unitPattern count="zero">{0} psi</unitPattern>
+				<unitPattern count="one">{0} psi</unitPattern>
+				<unitPattern count="two">{0} psi</unitPattern>
+				<unitPattern count="few">{0} psi</unitPattern>
+				<unitPattern count="many">{0} psi</unitPattern>
+				<unitPattern count="other">{0} psi</unitPattern>
+			</unit>
+			<unit type="pressure-inch-hg">
+				<displayName>modfeddi o fercwri</displayName>
+				<unitPattern count="zero">{0} ″ Hg</unitPattern>
+				<unitPattern count="one">{0} ″ Hg</unitPattern>
+				<unitPattern count="two">{0} ″ Hg</unitPattern>
+				<unitPattern count="few">{0} ″ Hg</unitPattern>
+				<unitPattern count="many">{0} ″ Hg</unitPattern>
+				<unitPattern count="other">{0} ″ Hg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="zero">{0} mbar</unitPattern>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="two">{0} mbar</unitPattern>
+				<unitPattern count="few">{0} mbar</unitPattern>
+				<unitPattern count="many">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>km/h</displayName>
+				<unitPattern count="zero">{0} km/h</unitPattern>
+				<unitPattern count="one">{0} km/h</unitPattern>
+				<unitPattern count="two">{0} km/h</unitPattern>
+				<unitPattern count="few">{0} km/h</unitPattern>
+				<unitPattern count="many">{0} km/h</unitPattern>
+				<unitPattern count="other">{0} km/h</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>metrau/eil</displayName>
+				<unitPattern count="zero">{0} m/s</unitPattern>
+				<unitPattern count="one">{0} m/s</unitPattern>
+				<unitPattern count="two">{0} m/s</unitPattern>
+				<unitPattern count="few">{0} m/s</unitPattern>
+				<unitPattern count="many">{0} m/s</unitPattern>
+				<unitPattern count="other">{0} m/s</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>milltir/awr</displayName>
+				<unitPattern count="zero">{0} m.y.a.</unitPattern>
+				<unitPattern count="one">{0} m.y.a.</unitPattern>
+				<unitPattern count="two">{0} m.y.a.</unitPattern>
+				<unitPattern count="few">{0} m.y.a.</unitPattern>
+				<unitPattern count="many">{0} m.y.a.</unitPattern>
+				<unitPattern count="other">{0} m.y.a.</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>notiau</displayName>
+				<unitPattern count="zero">{0} not</unitPattern>
+				<unitPattern count="one">{0} not</unitPattern>
+				<unitPattern count="two">{0} not</unitPattern>
+				<unitPattern count="few">{0} not</unitPattern>
+				<unitPattern count="many">{0} not</unitPattern>
+				<unitPattern count="other">{0} not</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="zero">{0}°</unitPattern>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="two">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>gradd C</displayName>
+				<unitPattern count="zero">{0}°C</unitPattern>
+				<unitPattern count="one">{0}°C</unitPattern>
+				<unitPattern count="two">{0}°C</unitPattern>
+				<unitPattern count="few">{0}°C</unitPattern>
+				<unitPattern count="many">{0}°C</unitPattern>
+				<unitPattern count="other">{0}°C</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName>gradd F</displayName>
+				<unitPattern count="zero">{0}°F</unitPattern>
+				<unitPattern count="one">{0}°F</unitPattern>
+				<unitPattern count="two">{0}°F</unitPattern>
+				<unitPattern count="few">{0}°F</unitPattern>
+				<unitPattern count="many">{0}°F</unitPattern>
+				<unitPattern count="other">{0}°F</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>K</displayName>
+				<unitPattern count="zero">{0} K</unitPattern>
+				<unitPattern count="one">{0} K</unitPattern>
+				<unitPattern count="two">{0} K</unitPattern>
+				<unitPattern count="few">{0} K</unitPattern>
+				<unitPattern count="many">{0} K</unitPattern>
+				<unitPattern count="other">{0} K</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>cilometrau ciwbig</displayName>
+				<unitPattern count="zero">{0} km³</unitPattern>
+				<unitPattern count="one">{0} km³</unitPattern>
+				<unitPattern count="two">{0} km³</unitPattern>
+				<unitPattern count="few">{0} km³</unitPattern>
+				<unitPattern count="many">{0} km³</unitPattern>
+				<unitPattern count="other">{0} km³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>m³</displayName>
+				<unitPattern count="zero">{0} m³</unitPattern>
+				<unitPattern count="one">{0} m³</unitPattern>
+				<unitPattern count="two">{0} m³</unitPattern>
+				<unitPattern count="few">{0} m³</unitPattern>
+				<unitPattern count="many">{0} m³</unitPattern>
+				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="zero">{0} cm³</unitPattern>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="two">{0} cm³</unitPattern>
+				<unitPattern count="few">{0} cm³</unitPattern>
+				<unitPattern count="many">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>mi³</displayName>
+				<unitPattern count="zero">{0} mi³</unitPattern>
+				<unitPattern count="one">{0} mi³</unitPattern>
+				<unitPattern count="two">{0} mi³</unitPattern>
+				<unitPattern count="few">{0} mi³</unitPattern>
+				<unitPattern count="many">{0} mi³</unitPattern>
+				<unitPattern count="other">{0} mi³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>llathenni³</displayName>
+				<unitPattern count="zero">{0} llath³</unitPattern>
+				<unitPattern count="one">{0} llathen³</unitPattern>
+				<unitPattern count="two">{0} lath³</unitPattern>
+				<unitPattern count="few">{0} llath³</unitPattern>
+				<unitPattern count="many">{0} llath³</unitPattern>
+				<unitPattern count="other">{0} llath³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>troedfedd³</displayName>
+				<unitPattern count="zero">{0} troedfedd³</unitPattern>
+				<unitPattern count="one">{0} troedfedd³</unitPattern>
+				<unitPattern count="two">{0} droedfedd³</unitPattern>
+				<unitPattern count="few">{0} troedfedd³</unitPattern>
+				<unitPattern count="many">{0} troedfedd³</unitPattern>
+				<unitPattern count="other">{0} troedfedd³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>modfeddi³</displayName>
+				<unitPattern count="zero">{0} modfedd³</unitPattern>
+				<unitPattern count="one">{0} modfedd³</unitPattern>
+				<unitPattern count="two">{0} fodfedd³</unitPattern>
+				<unitPattern count="few">{0} modfedd³</unitPattern>
+				<unitPattern count="many">{0} modfedd³</unitPattern>
+				<unitPattern count="other">{0} modfedd³</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="zero">{0} ML</unitPattern>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="two">{0} ML</unitPattern>
+				<unitPattern count="few">{0} ML</unitPattern>
+				<unitPattern count="many">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hL</displayName>
+				<unitPattern count="zero">{0} hL</unitPattern>
+				<unitPattern count="one">{0} hL</unitPattern>
+				<unitPattern count="two">{0} hL</unitPattern>
+				<unitPattern count="few">{0} hL</unitPattern>
+				<unitPattern count="many">{0} hL</unitPattern>
+				<unitPattern count="other">{0} hL</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>litrau</displayName>
+				<unitPattern count="zero">{0} L</unitPattern>
+				<unitPattern count="one">{0} L</unitPattern>
+				<unitPattern count="two">{0} L</unitPattern>
+				<unitPattern count="few">{0} L</unitPattern>
+				<unitPattern count="many">{0} L</unitPattern>
+				<unitPattern count="other">{0} L</unitPattern>
+				<perUnitPattern>{0}/L</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="zero">{0} dL</unitPattern>
+				<unitPattern count="one">{0} dL</unitPattern>
+				<unitPattern count="two">{0} dL</unitPattern>
+				<unitPattern count="few">{0} dL</unitPattern>
+				<unitPattern count="many">{0} dL</unitPattern>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="zero">{0} cL</unitPattern>
+				<unitPattern count="one">{0} cL</unitPattern>
+				<unitPattern count="two">{0} cL</unitPattern>
+				<unitPattern count="few">{0} cL</unitPattern>
+				<unitPattern count="many">{0} cL</unitPattern>
+				<unitPattern count="other">{0} cL</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>mL</displayName>
+				<unitPattern count="zero">{0} mL</unitPattern>
+				<unitPattern count="one">{0} mL</unitPattern>
+				<unitPattern count="two">{0} mL</unitPattern>
+				<unitPattern count="few">{0} mL</unitPattern>
+				<unitPattern count="many">{0} mL</unitPattern>
+				<unitPattern count="other">{0} mL</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="zero">{0} mpt</unitPattern>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="two">{0} mpt</unitPattern>
+				<unitPattern count="few">{0} mpt</unitPattern>
+				<unitPattern count="many">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>cwpanaid metrig</displayName>
+				<unitPattern count="zero">{0} mc</unitPattern>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="two">{0} mc</unitPattern>
+				<unitPattern count="few">{0} mc</unitPattern>
+				<unitPattern count="many">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>erw tr</displayName>
+				<unitPattern count="zero">{0} erw tr</unitPattern>
+				<unitPattern count="one">{0} erw tr</unitPattern>
+				<unitPattern count="two">{0} erw tr</unitPattern>
+				<unitPattern count="few">{0} erw tr</unitPattern>
+				<unitPattern count="many">{0} erw tr</unitPattern>
+				<unitPattern count="other">{0} erw tr</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>bwsielau</displayName>
+				<unitPattern count="zero">{0} bwsiel</unitPattern>
+				<unitPattern count="one">{0} bwsiel</unitPattern>
+				<unitPattern count="two">{0} bwsiel</unitPattern>
+				<unitPattern count="few">{0} bwsiel</unitPattern>
+				<unitPattern count="many">{0} bwsiel</unitPattern>
+				<unitPattern count="other">{0} bwsiel</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="zero">{0} gal</unitPattern>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="two">{0} gal</unitPattern>
+				<unitPattern count="few">{0} gal</unitPattern>
+				<unitPattern count="many">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>qt</displayName>
+				<unitPattern count="zero">{0} qt</unitPattern>
+				<unitPattern count="one">{0} qt</unitPattern>
+				<unitPattern count="two">{0} qt</unitPattern>
+				<unitPattern count="few">{0} qt</unitPattern>
+				<unitPattern count="many">{0} qt</unitPattern>
+				<unitPattern count="other">{0} qt</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>peintiau</displayName>
+				<unitPattern count="zero">{0} pt</unitPattern>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="two">{0} pt</unitPattern>
+				<unitPattern count="few">{0} pt</unitPattern>
+				<unitPattern count="many">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cwpaneidiau</displayName>
+				<unitPattern count="zero">{0} c</unitPattern>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="two">{0} c</unitPattern>
+				<unitPattern count="few">{0} c</unitPattern>
+				<unitPattern count="many">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="zero">{0} fl oz</unitPattern>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="two">{0} fl oz</unitPattern>
+				<unitPattern count="few">{0} fl oz</unitPattern>
+				<unitPattern count="many">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>tbsp</displayName>
+				<unitPattern count="zero">{0} tbsp</unitPattern>
+				<unitPattern count="one">{0} tbsp</unitPattern>
+				<unitPattern count="two">{0} tbsp</unitPattern>
+				<unitPattern count="few">{0} tbsp</unitPattern>
+				<unitPattern count="many">{0} tbsp</unitPattern>
+				<unitPattern count="other">{0} tbsp</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>tsp</displayName>
+				<unitPattern count="zero">{0} tsp</unitPattern>
+				<unitPattern count="one">{0} tsp</unitPattern>
+				<unitPattern count="two">{0} tsp</unitPattern>
+				<unitPattern count="few">{0} tsp</unitPattern>
+				<unitPattern count="many">{0} tsp</unitPattern>
+				<unitPattern count="other">{0} tsp</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="provisional">{0}dn</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="provisional">{0}g</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="provisional">{0}d</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="provisional">{0}gn</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<unitLength type="narrow">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<unitPattern count="zero">{0}G</unitPattern>
+				<unitPattern count="one">{0}G</unitPattern>
+				<unitPattern count="two">{0}G</unitPattern>
+				<unitPattern count="few">{0}G</unitPattern>
+				<unitPattern count="many">{0}G</unitPattern>
+				<unitPattern count="other">{0}G</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="zero">{0}rad</unitPattern>
+				<unitPattern count="one">{0}rad</unitPattern>
+				<unitPattern count="two">{0}rad</unitPattern>
+				<unitPattern count="few">{0}rad</unitPattern>
+				<unitPattern count="many">{0}rad</unitPattern>
+				<unitPattern count="other">{0}rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>gradd</displayName>
+				<unitPattern count="zero">{0}°</unitPattern>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="two">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<unitPattern count="zero">{0}′</unitPattern>
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="two">{0}′</unitPattern>
+				<unitPattern count="few">{0}′</unitPattern>
+				<unitPattern count="many">{0}′</unitPattern>
+				<unitPattern count="other">{0}′</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<unitPattern count="zero">{0}″</unitPattern>
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="two">{0}″</unitPattern>
+				<unitPattern count="few">{0}″</unitPattern>
+				<unitPattern count="many">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="zero">{0}km²</unitPattern>
+				<unitPattern count="one">{0}km²</unitPattern>
+				<unitPattern count="two">{0}km²</unitPattern>
+				<unitPattern count="few">{0}km²</unitPattern>
+				<unitPattern count="many">{0}km²</unitPattern>
+				<unitPattern count="other">{0}km²</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>hectar</displayName>
+				<unitPattern count="zero">{0}ha</unitPattern>
+				<unitPattern count="one">{0}ha</unitPattern>
+				<unitPattern count="two">{0}ha</unitPattern>
+				<unitPattern count="few">{0}ha</unitPattern>
+				<unitPattern count="many">{0}ha</unitPattern>
+				<unitPattern count="other">{0}ha</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>metrau²</displayName>
+				<unitPattern count="zero">{0}m²</unitPattern>
+				<unitPattern count="one">{0}m²</unitPattern>
+				<unitPattern count="two">{0}m²</unitPattern>
+				<unitPattern count="few">{0}m²</unitPattern>
+				<unitPattern count="many">{0}m²</unitPattern>
+				<unitPattern count="other">{0}m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>cm²</displayName>
+				<unitPattern count="zero">{0}cm²</unitPattern>
+				<unitPattern count="one">{0}cm²</unitPattern>
+				<unitPattern count="two">{0}cm²</unitPattern>
+				<unitPattern count="few">{0}cm²</unitPattern>
+				<unitPattern count="many">{0}cm²</unitPattern>
+				<unitPattern count="other">{0}cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="zero">{0}mi²</unitPattern>
+				<unitPattern count="one">{0}mi²</unitPattern>
+				<unitPattern count="two">{0}mi²</unitPattern>
+				<unitPattern count="few">{0}mi²</unitPattern>
+				<unitPattern count="many">{0}mi²</unitPattern>
+				<unitPattern count="other">{0}mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>erw</displayName>
+				<unitPattern count="zero">{0}erw</unitPattern>
+				<unitPattern count="one">{0}erw</unitPattern>
+				<unitPattern count="two">{0}erw</unitPattern>
+				<unitPattern count="few">{0}erw</unitPattern>
+				<unitPattern count="many">{0}erw</unitPattern>
+				<unitPattern count="other">{0}erw</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="zero">{0}ft²</unitPattern>
+				<unitPattern count="one">{0}ft²</unitPattern>
+				<unitPattern count="two">{0}ft²</unitPattern>
+				<unitPattern count="few">{0}ft²</unitPattern>
+				<unitPattern count="many">{0}ft²</unitPattern>
+				<unitPattern count="other">{0}ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>L/km</displayName>
+				<unitPattern count="zero">{0}L/km</unitPattern>
+				<unitPattern count="one">{0}L/km</unitPattern>
+				<unitPattern count="two">{0}L/km</unitPattern>
+				<unitPattern count="few">{0}L/km</unitPattern>
+				<unitPattern count="many">{0}L/km</unitPattern>
+				<unitPattern count="other">{0}L/km</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="zero">{0}L/100km</unitPattern>
+				<unitPattern count="one">{0}L/100km</unitPattern>
+				<unitPattern count="two">{0}L/100km</unitPattern>
+				<unitPattern count="few">{0}L/100km</unitPattern>
+				<unitPattern count="many">{0}L/100km</unitPattern>
+				<unitPattern count="other">{0}L/100km</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<displayName>TBeit</displayName>
+				<unitPattern count="zero">{0}TB</unitPattern>
+				<unitPattern count="one">{0}TB</unitPattern>
+				<unitPattern count="two">{0}TB</unitPattern>
+				<unitPattern count="few">{0}TB</unitPattern>
+				<unitPattern count="many">{0}TB</unitPattern>
+				<unitPattern count="other">{0}TB</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GBeit</displayName>
+				<unitPattern count="zero">{0}GB</unitPattern>
+				<unitPattern count="one">{0}GB</unitPattern>
+				<unitPattern count="two">{0}GB</unitPattern>
+				<unitPattern count="few">{0}GB</unitPattern>
+				<unitPattern count="many">{0}GB</unitPattern>
+				<unitPattern count="other">{0}GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="zero">{0}Gb</unitPattern>
+				<unitPattern count="one">{0}Gb</unitPattern>
+				<unitPattern count="two">{0}Gb</unitPattern>
+				<unitPattern count="few">{0}Gb</unitPattern>
+				<unitPattern count="many">{0}Gb</unitPattern>
+				<unitPattern count="other">{0}Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MBeit</displayName>
+				<unitPattern count="zero">{0}MB</unitPattern>
+				<unitPattern count="one">{0}MB</unitPattern>
+				<unitPattern count="two">{0}MB</unitPattern>
+				<unitPattern count="few">{0}MB</unitPattern>
+				<unitPattern count="many">{0}MB</unitPattern>
+				<unitPattern count="other">{0}MB</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kBeit</displayName>
+				<unitPattern count="zero">{0}kB</unitPattern>
+				<unitPattern count="one">{0}kB</unitPattern>
+				<unitPattern count="two">{0}kB</unitPattern>
+				<unitPattern count="few">{0}kB</unitPattern>
+				<unitPattern count="many">{0}kB</unitPattern>
+				<unitPattern count="other">{0}kB</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>beit</displayName>
+				<unitPattern count="zero">{0}beit</unitPattern>
+				<unitPattern count="one">{0}beit</unitPattern>
+				<unitPattern count="two">{0}feit</unitPattern>
+				<unitPattern count="few">{0}beit</unitPattern>
+				<unitPattern count="many">{0}beit</unitPattern>
+				<unitPattern count="other">{0}beit</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>did</displayName>
+				<unitPattern count="zero">{0}did</unitPattern>
+				<unitPattern count="one">{0}did</unitPattern>
+				<unitPattern count="two">{0}ddid</unitPattern>
+				<unitPattern count="few">{0}did</unitPattern>
+				<unitPattern count="many">{0}did</unitPattern>
+				<unitPattern count="other">{0}did</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>c</displayName>
+				<unitPattern count="zero">{0}c</unitPattern>
+				<unitPattern count="one">{0}c</unitPattern>
+				<unitPattern count="two">{0}c</unitPattern>
+				<unitPattern count="few">{0}c</unitPattern>
+				<unitPattern count="many">{0}c</unitPattern>
+				<unitPattern count="other">{0}c</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>bl</displayName>
+				<unitPattern count="zero">{0}bl</unitPattern>
+				<unitPattern count="one">{0}bl</unitPattern>
+				<unitPattern count="two">{0}bl</unitPattern>
+				<unitPattern count="few">{0}bl</unitPattern>
+				<unitPattern count="many">{0}bl</unitPattern>
+				<unitPattern count="other">{0}bl</unitPattern>
+				<perUnitPattern>{0}/bl</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mis</displayName>
+				<unitPattern count="zero">{0}m</unitPattern>
+				<unitPattern count="one">{0}m</unitPattern>
+				<unitPattern count="two">{0}m</unitPattern>
+				<unitPattern count="few">{0}m</unitPattern>
+				<unitPattern count="many">{0}m</unitPattern>
+				<unitPattern count="other">{0}m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>w</displayName>
+				<unitPattern count="zero">{0}w</unitPattern>
+				<unitPattern count="one">{0}w</unitPattern>
+				<unitPattern count="two">{0}w</unitPattern>
+				<unitPattern count="few">{0}w</unitPattern>
+				<unitPattern count="many">{0}w</unitPattern>
+				<unitPattern count="other">{0}w</unitPattern>
+				<perUnitPattern>{0}/w</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>d</displayName>
+				<unitPattern count="zero">{0}d</unitPattern>
+				<unitPattern count="one">{0}d</unitPattern>
+				<unitPattern count="two">{0}d</unitPattern>
+				<unitPattern count="few">{0}d</unitPattern>
+				<unitPattern count="many">{0}d</unitPattern>
+				<unitPattern count="other">{0}d</unitPattern>
+				<perUnitPattern>{0}/d</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>awr</displayName>
+				<unitPattern count="zero">{0} awr</unitPattern>
+				<unitPattern count="one">{0} awr</unitPattern>
+				<unitPattern count="two">{0} awr</unitPattern>
+				<unitPattern count="few">{0} awr</unitPattern>
+				<unitPattern count="many">{0} awr</unitPattern>
+				<unitPattern count="other">{0} awr</unitPattern>
+				<perUnitPattern>{0}/a</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>mun</displayName>
+				<unitPattern count="zero">{0}mun</unitPattern>
+				<unitPattern count="one">{0}mun</unitPattern>
+				<unitPattern count="two">{0}mun</unitPattern>
+				<unitPattern count="few">{0}mun</unitPattern>
+				<unitPattern count="many">{0}mun</unitPattern>
+				<unitPattern count="other">{0}mun</unitPattern>
+				<perUnitPattern>{0}/mun</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>eil</displayName>
+				<unitPattern count="zero">{0} eil</unitPattern>
+				<unitPattern count="one">{0} eil</unitPattern>
+				<unitPattern count="two">{0} eil</unitPattern>
+				<unitPattern count="few">{0} eil</unitPattern>
+				<unitPattern count="many">{0} eil</unitPattern>
+				<unitPattern count="other">{0} eil</unitPattern>
+				<perUnitPattern>{0}/e</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>milieiliad</displayName>
+				<unitPattern count="zero">{0}ms</unitPattern>
+				<unitPattern count="one">{0}ms</unitPattern>
+				<unitPattern count="two">{0}ms</unitPattern>
+				<unitPattern count="few">{0}ms</unitPattern>
+				<unitPattern count="many">{0}ms</unitPattern>
+				<unitPattern count="other">{0}ms</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName>amp</displayName>
+				<unitPattern count="zero">{0}A</unitPattern>
+				<unitPattern count="one">{0}A</unitPattern>
+				<unitPattern count="two">{0}A</unitPattern>
+				<unitPattern count="few">{0}A</unitPattern>
+				<unitPattern count="many">{0}A</unitPattern>
+				<unitPattern count="other">{0}A</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>mA</displayName>
+				<unitPattern count="zero">{0}mA</unitPattern>
+				<unitPattern count="one">{0}mA</unitPattern>
+				<unitPattern count="two">{0}mA</unitPattern>
+				<unitPattern count="few">{0}mA</unitPattern>
+				<unitPattern count="many">{0}mA</unitPattern>
+				<unitPattern count="other">{0}mA</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<displayName>ohm</displayName>
+				<unitPattern count="zero">{0}Ω</unitPattern>
+				<unitPattern count="one">{0}Ω</unitPattern>
+				<unitPattern count="two">{0}Ω</unitPattern>
+				<unitPattern count="few">{0}Ω</unitPattern>
+				<unitPattern count="many">{0}Ω</unitPattern>
+				<unitPattern count="other">{0}Ω</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>folt</displayName>
+				<unitPattern count="zero">{0}V</unitPattern>
+				<unitPattern count="one">{0}V</unitPattern>
+				<unitPattern count="two">{0}V</unitPattern>
+				<unitPattern count="few">{0}V</unitPattern>
+				<unitPattern count="many">{0}V</unitPattern>
+				<unitPattern count="other">{0}V</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="zero">{0}kcal</unitPattern>
+				<unitPattern count="one">{0}kcal</unitPattern>
+				<unitPattern count="two">{0}kcal</unitPattern>
+				<unitPattern count="few">{0}kcal</unitPattern>
+				<unitPattern count="many">{0}kcal</unitPattern>
+				<unitPattern count="other">{0}kcal</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>cal</displayName>
+				<unitPattern count="zero">{0}cal</unitPattern>
+				<unitPattern count="one">{0}cal</unitPattern>
+				<unitPattern count="two">{0}cal</unitPattern>
+				<unitPattern count="few">{0}cal</unitPattern>
+				<unitPattern count="many">{0}cal</unitPattern>
+				<unitPattern count="other">{0}cal</unitPattern>
+			</unit>
+			<unit type="energy-foodcalorie">
+				<displayName>Cal</displayName>
+				<unitPattern count="zero">{0}Cal</unitPattern>
+				<unitPattern count="one">{0}Cal</unitPattern>
+				<unitPattern count="two">{0}Cal</unitPattern>
+				<unitPattern count="few">{0}Cal</unitPattern>
+				<unitPattern count="many">{0}Cal</unitPattern>
+				<unitPattern count="other">{0}Cal</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>kJ</displayName>
+				<unitPattern count="zero">{0}kj</unitPattern>
+				<unitPattern count="one">{0}kj</unitPattern>
+				<unitPattern count="two">{0}kj</unitPattern>
+				<unitPattern count="few">{0}kj</unitPattern>
+				<unitPattern count="many">{0}kj</unitPattern>
+				<unitPattern count="other">{0}kj</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="zero">{0}J</unitPattern>
+				<unitPattern count="one">{0}J</unitPattern>
+				<unitPattern count="two">{0}J</unitPattern>
+				<unitPattern count="few">{0}J</unitPattern>
+				<unitPattern count="many">{0}J</unitPattern>
+				<unitPattern count="other">{0}J</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<displayName>GHz</displayName>
+				<unitPattern count="zero">{0}GHz</unitPattern>
+				<unitPattern count="one">{0}GHz</unitPattern>
+				<unitPattern count="two">{0}GHz</unitPattern>
+				<unitPattern count="few">{0}GHz</unitPattern>
+				<unitPattern count="many">{0}GHz</unitPattern>
+				<unitPattern count="other">{0}GHz</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="zero">{0}MHz</unitPattern>
+				<unitPattern count="one">{0}MHz</unitPattern>
+				<unitPattern count="two">{0}MHz</unitPattern>
+				<unitPattern count="few">{0}MHz</unitPattern>
+				<unitPattern count="many">{0}MHz</unitPattern>
+				<unitPattern count="other">{0}MHz</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>kHz</displayName>
+				<unitPattern count="zero">{0}kHz</unitPattern>
+				<unitPattern count="one">{0}kHz</unitPattern>
+				<unitPattern count="two">{0}kHz</unitPattern>
+				<unitPattern count="few">{0}kHz</unitPattern>
+				<unitPattern count="many">{0}kHz</unitPattern>
+				<unitPattern count="other">{0}kHz</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="zero">{0}Hz</unitPattern>
+				<unitPattern count="one">{0}Hz</unitPattern>
+				<unitPattern count="two">{0}Hz</unitPattern>
+				<unitPattern count="few">{0}Hz</unitPattern>
+				<unitPattern count="many">{0}Hz</unitPattern>
+				<unitPattern count="other">{0}Hz</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="zero">{0}km</unitPattern>
+				<unitPattern count="one">{0}km</unitPattern>
+				<unitPattern count="two">{0}km</unitPattern>
+				<unitPattern count="few">{0}km</unitPattern>
+				<unitPattern count="many">{0}km</unitPattern>
+				<unitPattern count="other">{0}km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>metr</displayName>
+				<unitPattern count="zero">{0}m</unitPattern>
+				<unitPattern count="one">{0}m</unitPattern>
+				<unitPattern count="two">{0}m</unitPattern>
+				<unitPattern count="few">{0}m</unitPattern>
+				<unitPattern count="many">{0}m</unitPattern>
+				<unitPattern count="other">{0}m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>dm</displayName>
+				<unitPattern count="zero">{0}dm</unitPattern>
+				<unitPattern count="one">{0}dm</unitPattern>
+				<unitPattern count="two">{0}dm</unitPattern>
+				<unitPattern count="few">{0}dm</unitPattern>
+				<unitPattern count="many">{0}dm</unitPattern>
+				<unitPattern count="other">{0}dm</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="zero">{0}cm</unitPattern>
+				<unitPattern count="one">{0}cm</unitPattern>
+				<unitPattern count="two">{0}cm</unitPattern>
+				<unitPattern count="few">{0}cm</unitPattern>
+				<unitPattern count="many">{0}cm</unitPattern>
+				<unitPattern count="other">{0}cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>mm</displayName>
+				<unitPattern count="zero">{0}mm</unitPattern>
+				<unitPattern count="one">{0}mm</unitPattern>
+				<unitPattern count="two">{0}mm</unitPattern>
+				<unitPattern count="few">{0}mm</unitPattern>
+				<unitPattern count="many">{0}mm</unitPattern>
+				<unitPattern count="other">{0}mm</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="zero">{0}µm</unitPattern>
+				<unitPattern count="one">{0}µm</unitPattern>
+				<unitPattern count="two">{0}µm</unitPattern>
+				<unitPattern count="few">{0}µm</unitPattern>
+				<unitPattern count="many">{0}µm</unitPattern>
+				<unitPattern count="other">{0}µm</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nm</displayName>
+				<unitPattern count="zero">{0}nm</unitPattern>
+				<unitPattern count="one">{0}nm</unitPattern>
+				<unitPattern count="two">{0}nm</unitPattern>
+				<unitPattern count="few">{0}nm</unitPattern>
+				<unitPattern count="many">{0}nm</unitPattern>
+				<unitPattern count="other">{0}nm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>pm</displayName>
+				<unitPattern count="zero">{0}pm</unitPattern>
+				<unitPattern count="one">{0}pm</unitPattern>
+				<unitPattern count="two">{0}pm</unitPattern>
+				<unitPattern count="few">{0}pm</unitPattern>
+				<unitPattern count="many">{0}pm</unitPattern>
+				<unitPattern count="other">{0}pm</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="zero">{0}mi</unitPattern>
+				<unitPattern count="one">{0}mi</unitPattern>
+				<unitPattern count="two">{0}mi</unitPattern>
+				<unitPattern count="few">{0}mi</unitPattern>
+				<unitPattern count="many">{0}mi</unitPattern>
+				<unitPattern count="other">{0}mi</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>llath</displayName>
+				<unitPattern count="zero">{0}llath</unitPattern>
+				<unitPattern count="one">{0}llath</unitPattern>
+				<unitPattern count="two">{0}lath</unitPattern>
+				<unitPattern count="few">{0}llath</unitPattern>
+				<unitPattern count="many">{0}llath</unitPattern>
+				<unitPattern count="other">{0}llath</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>troedfedd</displayName>
+				<unitPattern count="zero">{0}′</unitPattern>
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="two">{0}′</unitPattern>
+				<unitPattern count="few">{0}′</unitPattern>
+				<unitPattern count="many">{0}′</unitPattern>
+				<unitPattern count="other">{0}′</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>modfedd</displayName>
+				<unitPattern count="zero">{0}″</unitPattern>
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="two">{0}″</unitPattern>
+				<unitPattern count="few">{0}″</unitPattern>
+				<unitPattern count="many">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+				<perUnitPattern>{0}/mod</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="zero">{0}pc</unitPattern>
+				<unitPattern count="one">{0}pc</unitPattern>
+				<unitPattern count="two">{0}pc</unitPattern>
+				<unitPattern count="few">{0}pc</unitPattern>
+				<unitPattern count="many">{0}pc</unitPattern>
+				<unitPattern count="other">{0}pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ly</displayName>
+				<unitPattern count="zero">{0}ly</unitPattern>
+				<unitPattern count="one">{0}ly</unitPattern>
+				<unitPattern count="two">{0}ly</unitPattern>
+				<unitPattern count="few">{0}ly</unitPattern>
+				<unitPattern count="many">{0}ly</unitPattern>
+				<unitPattern count="other">{0}ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>u.s.</displayName>
+				<unitPattern count="zero">{0}u.s.</unitPattern>
+				<unitPattern count="one">{0}u.s.</unitPattern>
+				<unitPattern count="two">{0}u.s.</unitPattern>
+				<unitPattern count="few">{0}u.s.</unitPattern>
+				<unitPattern count="many">{0}u.s.</unitPattern>
+				<unitPattern count="other">{0}u.s.</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>gwrhydau</displayName>
+				<unitPattern count="zero">{0}fm</unitPattern>
+				<unitPattern count="one">{0}fm</unitPattern>
+				<unitPattern count="two">{0}fm</unitPattern>
+				<unitPattern count="few">{0}fm</unitPattern>
+				<unitPattern count="many">{0}fm</unitPattern>
+				<unitPattern count="other">{0}fm</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>mi fôr</displayName>
+			</unit>
+			<unit type="light-lux">
+				<displayName>lwcs</displayName>
+				<unitPattern count="zero">{0}lx</unitPattern>
+				<unitPattern count="one">{0}lx</unitPattern>
+				<unitPattern count="two">{0}lx</unitPattern>
+				<unitPattern count="few">{0}lx</unitPattern>
+				<unitPattern count="many">{0}lx</unitPattern>
+				<unitPattern count="other">{0}lx</unitPattern>
+			</unit>
+			<unit type="mass-metric-ton">
+				<displayName>t</displayName>
+				<unitPattern count="zero">{0}t</unitPattern>
+				<unitPattern count="one">{0}t</unitPattern>
+				<unitPattern count="two">{0}t</unitPattern>
+				<unitPattern count="few">{0}t</unitPattern>
+				<unitPattern count="many">{0}t</unitPattern>
+				<unitPattern count="other">{0}t</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="zero">{0}kg</unitPattern>
+				<unitPattern count="one">{0}kg</unitPattern>
+				<unitPattern count="two">{0}kg</unitPattern>
+				<unitPattern count="few">{0}kg</unitPattern>
+				<unitPattern count="many">{0}kg</unitPattern>
+				<unitPattern count="other">{0}kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="zero">{0}g</unitPattern>
+				<unitPattern count="one">{0}g</unitPattern>
+				<unitPattern count="two">{0}g</unitPattern>
+				<unitPattern count="few">{0}g</unitPattern>
+				<unitPattern count="many">{0}g</unitPattern>
+				<unitPattern count="other">{0}g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>mg</displayName>
+				<unitPattern count="zero">{0}mg</unitPattern>
+				<unitPattern count="one">{0}mg</unitPattern>
+				<unitPattern count="two">{0}mg</unitPattern>
+				<unitPattern count="few">{0}mg</unitPattern>
+				<unitPattern count="many">{0}mg</unitPattern>
+				<unitPattern count="other">{0}mg</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="zero">{0}µg</unitPattern>
+				<unitPattern count="one">{0}µg</unitPattern>
+				<unitPattern count="two">{0}µg</unitPattern>
+				<unitPattern count="few">{0}µg</unitPattern>
+				<unitPattern count="many">{0}µg</unitPattern>
+				<unitPattern count="other">{0}µg</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName>stôn</displayName>
+				<unitPattern count="zero">{0}st</unitPattern>
+				<unitPattern count="one">{0}st</unitPattern>
+				<unitPattern count="two">{0}st</unitPattern>
+				<unitPattern count="few">{0}st</unitPattern>
+				<unitPattern count="many">{0}st</unitPattern>
+				<unitPattern count="other">{0}st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>pwys</displayName>
+				<unitPattern count="zero">{0}pwys</unitPattern>
+				<unitPattern count="one">{0}pwys</unitPattern>
+				<unitPattern count="two">{0}bwys</unitPattern>
+				<unitPattern count="few">{0}phwys</unitPattern>
+				<unitPattern count="many">{0}phwys</unitPattern>
+				<unitPattern count="other">{0}pwys</unitPattern>
+				<perUnitPattern>{0}/pwys</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>owns</displayName>
+				<unitPattern count="zero">{0}owns</unitPattern>
+				<unitPattern count="one">{0}owns</unitPattern>
+				<unitPattern count="two">{0}owns</unitPattern>
+				<unitPattern count="few">{0}owns</unitPattern>
+				<unitPattern count="many">{0}owns</unitPattern>
+				<unitPattern count="other">{0}owns</unitPattern>
+				<perUnitPattern>{0}/owns</perUnitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>carat</displayName>
+				<unitPattern count="zero">{0}CD</unitPattern>
+				<unitPattern count="one">{0}CD</unitPattern>
+				<unitPattern count="two">{0}CD</unitPattern>
+				<unitPattern count="few">{0}CD</unitPattern>
+				<unitPattern count="many">{0}CD</unitPattern>
+				<unitPattern count="other">{0}CD</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<displayName>GW</displayName>
+				<unitPattern count="zero">{0}GW</unitPattern>
+				<unitPattern count="one">{0}GW</unitPattern>
+				<unitPattern count="two">{0}GW</unitPattern>
+				<unitPattern count="few">{0}GW</unitPattern>
+				<unitPattern count="many">{0}GW</unitPattern>
+				<unitPattern count="other">{0}GW</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>MW</displayName>
+				<unitPattern count="zero">{0}MW</unitPattern>
+				<unitPattern count="one">{0}MW</unitPattern>
+				<unitPattern count="two">{0}MW</unitPattern>
+				<unitPattern count="few">{0}MW</unitPattern>
+				<unitPattern count="many">{0}MW</unitPattern>
+				<unitPattern count="other">{0}MW</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="zero">{0}kW</unitPattern>
+				<unitPattern count="one">{0}kW</unitPattern>
+				<unitPattern count="two">{0}kW</unitPattern>
+				<unitPattern count="few">{0}kW</unitPattern>
+				<unitPattern count="many">{0}kW</unitPattern>
+				<unitPattern count="other">{0}kW</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>wat</displayName>
+				<unitPattern count="zero">{0}W</unitPattern>
+				<unitPattern count="one">{0}W</unitPattern>
+				<unitPattern count="two">{0}W</unitPattern>
+				<unitPattern count="few">{0}W</unitPattern>
+				<unitPattern count="many">{0}W</unitPattern>
+				<unitPattern count="other">{0}W</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="zero">{0}mW</unitPattern>
+				<unitPattern count="one">{0}mW</unitPattern>
+				<unitPattern count="two">{0}mW</unitPattern>
+				<unitPattern count="few">{0}mW</unitPattern>
+				<unitPattern count="many">{0}mW</unitPattern>
+				<unitPattern count="other">{0}mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="zero">{0}hp</unitPattern>
+				<unitPattern count="one">{0}hp</unitPattern>
+				<unitPattern count="two">{0}hp</unitPattern>
+				<unitPattern count="few">{0}hp</unitPattern>
+				<unitPattern count="many">{0}hp</unitPattern>
+				<unitPattern count="other">{0}hp</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<displayName>hPa</displayName>
+				<unitPattern count="zero">{0}hPa</unitPattern>
+				<unitPattern count="one">{0}hPa</unitPattern>
+				<unitPattern count="two">{0}hPa</unitPattern>
+				<unitPattern count="few">{0}hPa</unitPattern>
+				<unitPattern count="many">{0}hPa</unitPattern>
+				<unitPattern count="other">{0}hPa</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>mm Hg</displayName>
+				<unitPattern count="zero">{0}mm Hg</unitPattern>
+				<unitPattern count="one">{0}mm Hg</unitPattern>
+				<unitPattern count="two">{0}mm Hg</unitPattern>
+				<unitPattern count="few">{0}mm Hg</unitPattern>
+				<unitPattern count="many">{0}mm Hg</unitPattern>
+				<unitPattern count="other">{0}mm Hg</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>psi</displayName>
+				<unitPattern count="zero">{0}psi</unitPattern>
+				<unitPattern count="one">{0}psi</unitPattern>
+				<unitPattern count="two">{0}psi</unitPattern>
+				<unitPattern count="few">{0}psi</unitPattern>
+				<unitPattern count="many">{0}psi</unitPattern>
+				<unitPattern count="other">{0}psi</unitPattern>
+			</unit>
+			<unit type="pressure-inch-hg">
+				<displayName>″ Hg</displayName>
+				<unitPattern count="zero">{0}&quot; Hg</unitPattern>
+				<unitPattern count="one">{0}&quot; Hg</unitPattern>
+				<unitPattern count="two">{0}&quot; Hg</unitPattern>
+				<unitPattern count="few">{0}&quot; Hg</unitPattern>
+				<unitPattern count="many">{0}&quot; Hg</unitPattern>
+				<unitPattern count="other">{0}&quot; Hg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="zero">{0}mb</unitPattern>
+				<unitPattern count="one">{0}mb</unitPattern>
+				<unitPattern count="two">{0}mb</unitPattern>
+				<unitPattern count="few">{0}mb</unitPattern>
+				<unitPattern count="many">{0}mb</unitPattern>
+				<unitPattern count="other">{0}mb</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>km/h</displayName>
+				<unitPattern count="zero">{0}km/h</unitPattern>
+				<unitPattern count="one">{0}km/h</unitPattern>
+				<unitPattern count="two">{0}km/h</unitPattern>
+				<unitPattern count="few">{0}km/h</unitPattern>
+				<unitPattern count="many">{0}km/h</unitPattern>
+				<unitPattern count="other">{0}km/h</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>m/s</displayName>
+				<unitPattern count="zero">{0}m/s</unitPattern>
+				<unitPattern count="one">{0}m/s</unitPattern>
+				<unitPattern count="two">{0}m/s</unitPattern>
+				<unitPattern count="few">{0}m/s</unitPattern>
+				<unitPattern count="many">{0}m/s</unitPattern>
+				<unitPattern count="other">{0}m/s</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>m.y.a.</displayName>
+				<unitPattern count="zero">{0}m.y.a.</unitPattern>
+				<unitPattern count="one">{0}m.y.a.</unitPattern>
+				<unitPattern count="two">{0}m.y.a.</unitPattern>
+				<unitPattern count="few">{0}m.y.a.</unitPattern>
+				<unitPattern count="many">{0}m.y.a.</unitPattern>
+				<unitPattern count="other">{0}m.y.a.</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>not</displayName>
+				<unitPattern count="zero">{0}not</unitPattern>
+				<unitPattern count="one">{0}not</unitPattern>
+				<unitPattern count="two">{0}not</unitPattern>
+				<unitPattern count="few">{0}not</unitPattern>
+				<unitPattern count="many">{0}not</unitPattern>
+				<unitPattern count="other">{0}not</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="zero">{0}°</unitPattern>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="two">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>°C</displayName>
+				<unitPattern count="zero">{0}°</unitPattern>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="two">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName>°F</displayName>
+				<unitPattern count="zero">{0}°F</unitPattern>
+				<unitPattern count="one">{0}°F</unitPattern>
+				<unitPattern count="two">{0}°F</unitPattern>
+				<unitPattern count="few">{0}°F</unitPattern>
+				<unitPattern count="many">{0}°F</unitPattern>
+				<unitPattern count="other">{0}°F</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>K</displayName>
+				<unitPattern count="zero">{0}K</unitPattern>
+				<unitPattern count="one">{0}K</unitPattern>
+				<unitPattern count="two">{0}K</unitPattern>
+				<unitPattern count="few">{0}K</unitPattern>
+				<unitPattern count="many">{0}K</unitPattern>
+				<unitPattern count="other">{0}K</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>km³</displayName>
+				<unitPattern count="zero">{0}km³</unitPattern>
+				<unitPattern count="one">{0}km³</unitPattern>
+				<unitPattern count="two">{0}km³</unitPattern>
+				<unitPattern count="few">{0}km³</unitPattern>
+				<unitPattern count="many">{0}km³</unitPattern>
+				<unitPattern count="other">{0}km³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>m³</displayName>
+				<unitPattern count="zero">{0}m³</unitPattern>
+				<unitPattern count="one">{0}m³</unitPattern>
+				<unitPattern count="two">{0}m³</unitPattern>
+				<unitPattern count="few">{0}m³</unitPattern>
+				<unitPattern count="many">{0}m³</unitPattern>
+				<unitPattern count="other">{0}m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="zero">{0}cm³</unitPattern>
+				<unitPattern count="one">{0}cm³</unitPattern>
+				<unitPattern count="two">{0}cm³</unitPattern>
+				<unitPattern count="few">{0}cm³</unitPattern>
+				<unitPattern count="many">{0}cm³</unitPattern>
+				<unitPattern count="other">{0}cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>mi³</displayName>
+				<unitPattern count="zero">{0}mi³</unitPattern>
+				<unitPattern count="one">{0}mi³</unitPattern>
+				<unitPattern count="two">{0}mi³</unitPattern>
+				<unitPattern count="few">{0}mi³</unitPattern>
+				<unitPattern count="many">{0}mi³</unitPattern>
+				<unitPattern count="other">{0}mi³</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="zero">{0}ML</unitPattern>
+				<unitPattern count="one">{0}ML</unitPattern>
+				<unitPattern count="two">{0}ML</unitPattern>
+				<unitPattern count="few">{0}ML</unitPattern>
+				<unitPattern count="many">{0}ML</unitPattern>
+				<unitPattern count="other">{0}ML</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hL</displayName>
+				<unitPattern count="zero">{0}hL</unitPattern>
+				<unitPattern count="one">{0}hL</unitPattern>
+				<unitPattern count="two">{0}hL</unitPattern>
+				<unitPattern count="few">{0}hL</unitPattern>
+				<unitPattern count="many">{0}hL</unitPattern>
+				<unitPattern count="other">{0}hL</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>litr</displayName>
+				<unitPattern count="zero">{0} L</unitPattern>
+				<unitPattern count="one">{0} L</unitPattern>
+				<unitPattern count="two">{0} L</unitPattern>
+				<unitPattern count="few">{0} L</unitPattern>
+				<unitPattern count="many">{0} L</unitPattern>
+				<unitPattern count="other">{0} L</unitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="zero">{0}dL</unitPattern>
+				<unitPattern count="one">{0}dL</unitPattern>
+				<unitPattern count="two">{0}dL</unitPattern>
+				<unitPattern count="few">{0}dL</unitPattern>
+				<unitPattern count="many">{0}dL</unitPattern>
+				<unitPattern count="other">{0}dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="zero">{0}cL</unitPattern>
+				<unitPattern count="one">{0}cL</unitPattern>
+				<unitPattern count="two">{0}cL</unitPattern>
+				<unitPattern count="few">{0}cL</unitPattern>
+				<unitPattern count="many">{0}cL</unitPattern>
+				<unitPattern count="other">{0}cL</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>mL</displayName>
+				<unitPattern count="zero">{0}mL</unitPattern>
+				<unitPattern count="one">{0}mL</unitPattern>
+				<unitPattern count="two">{0}mL</unitPattern>
+				<unitPattern count="few">{0}mL</unitPattern>
+				<unitPattern count="many">{0}mL</unitPattern>
+				<unitPattern count="other">{0}mL</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="zero">{0}gal</unitPattern>
+				<unitPattern count="one">{0}gal</unitPattern>
+				<unitPattern count="two">{0}gal</unitPattern>
+				<unitPattern count="few">{0}gal</unitPattern>
+				<unitPattern count="many">{0}gal</unitPattern>
+				<unitPattern count="other">{0}gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="zero">{0}pt</unitPattern>
+				<unitPattern count="one">{0}pt</unitPattern>
+				<unitPattern count="two">{0}pt</unitPattern>
+				<unitPattern count="few">{0}pt</unitPattern>
+				<unitPattern count="many">{0}pt</unitPattern>
+				<unitPattern count="other">{0}pt</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="provisional">{0}dn</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="provisional">{0}g</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="provisional">{0}d</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="provisional">{0}gn</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<durationUnit type="hm">
+			<durationUnitPattern>h:mm</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="hms">
+			<durationUnitPattern>h:mm:ss</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="ms">
+			<durationUnitPattern>m:ss</durationUnitPattern>
+		</durationUnit>
+	</units>
+	<listPatterns>
+		<listPattern>
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-narrow">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-short">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
+		</listPattern>
+	</listPatterns>
+	<posix>
+		<messages>
+			<yesstr>ie:i</yesstr>
+			<nostr>na:n</nostr>
+		</messages>
+	</posix>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/cy_GB.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cy_GB.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/cy_GB.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cy_GB.xml
index b5d1e4cd3e9..f73a8b86770 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/cy_GB.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cy_GB.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="cy"/>
 		<territory type="GB"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/da.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/da.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/da.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/da.xml
index 01b01fee380..febf84cafde 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/da.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/da.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12387 $"/>
 		<language type="da"/>
 	</identity>
 	<localeDisplayNames>
@@ -39,7 +38,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ar">arabisk</language>
 			<language type="ar_001">moderne standardarabisk</language>
 			<language type="arc">aramæisk</language>
-			<language type="arn">araukansk</language>
+			<language type="arn">mapuche</language>
 			<language type="arp">arapaho</language>
 			<language type="arw">arawak</language>
 			<language type="as">assamesisk</language>
@@ -50,6 +49,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ay">aymara</language>
 			<language type="az">aserbajdsjansk</language>
 			<language type="az" alt="short">azeri</language>
+			<language type="az_Arab" draft="contributed">sydaserbajdsjansk</language>
 			<language type="ba">bashkir</language>
 			<language type="bal">baluchi</language>
 			<language type="ban">balinesisk</language>
@@ -62,6 +62,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bez">bena</language>
 			<language type="bfd">bafut</language>
 			<language type="bg">bulgarsk</language>
+			<language type="bgn" draft="contributed">vestbaluchi</language>
 			<language type="bho">bhojpuri</language>
 			<language type="bi">bislama</language>
 			<language type="bik">bikol</language>
@@ -288,6 +289,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">lao</language>
 			<language type="lol">mongo</language>
 			<language type="loz">lozi</language>
+			<language type="lrc" draft="contributed">nordluri</language>
 			<language type="lt">litauisk</language>
 			<language type="lu">luba-Katanga</language>
 			<language type="lua">luba-Lulua</language>
@@ -326,7 +328,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="moh">mohawk</language>
 			<language type="mos">mossi</language>
 			<language type="mr">marathisk</language>
-			<language type="ms">malay</language>
+			<language type="ms">malajisk</language>
 			<language type="mt">maltesisk</language>
 			<language type="mua">mundang</language>
 			<language type="mul">flere sprog</language>
@@ -336,6 +338,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="my">burmesisk</language>
 			<language type="mye">myene</language>
 			<language type="myv">erzya</language>
+			<language type="mzn">mazenisk</language>
 			<language type="na">nauru</language>
 			<language type="nap">neapolitansk</language>
 			<language type="naq">nama</language>
@@ -419,6 +422,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">siciliansk</language>
 			<language type="sco">skotsk</language>
 			<language type="sd">sindhi</language>
+			<language type="sdh">sydkurdisk</language>
 			<language type="se">nordsamisk</language>
 			<language type="see">seneca</language>
 			<language type="seh">sena</language>
@@ -456,8 +460,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">sumerisk</language>
 			<language type="sv">svensk</language>
 			<language type="sw">swahili</language>
+			<language type="sw_CD">congolesisk swahili</language>
 			<language type="swb">shimaore</language>
-			<language type="swc">congolesisk swahili</language>
 			<language type="syc">klassisk syrisk</language>
 			<language type="syr">syrisk</language>
 			<language type="ta">tamilsk</language>
@@ -467,7 +471,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ter">tereno</language>
 			<language type="tet">tetum</language>
 			<language type="tg">tajik</language>
-			<language type="th">thailandsk</language>
+			<language type="th">thai</language>
 			<language type="ti">tigrinya</language>
 			<language type="tig">tigre</language>
 			<language type="tiv">tivi</language>
@@ -513,6 +517,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">walamo</language>
 			<language type="war">waray</language>
 			<language type="was">washo</language>
+			<language type="wbp" draft="contributed">walbiri</language>
 			<language type="wo">wolof</language>
 			<language type="xal">kalmyk</language>
 			<language type="xh">xhosa</language>
@@ -733,13 +738,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="419">Latinamerika</territory>
 			<territory type="AC">Ascensionøen</territory>
 			<territory type="AD">Andorra</territory>
-			<territory type="AE">Forenede Arabiske Emirater</territory>
+			<territory type="AE">De Forenede Arabiske Emirater</territory>
 			<territory type="AF">Afghanistan</territory>
 			<territory type="AG">Antigua og Barbuda</territory>
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albanien</territory>
 			<territory type="AM">Armenien</territory>
-			<territory type="AN">Hollandske Antiller</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antarktis</territory>
 			<territory type="AR">Argentina</territory>
@@ -762,7 +766,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BM">Bermuda</territory>
 			<territory type="BN">Brunei</territory>
 			<territory type="BO">Bolivia</territory>
-			<territory type="BQ">Nederlandske antiller</territory>
+			<territory type="BQ">De Nederlandske Antiller</territory>
 			<territory type="BR">Brasilien</territory>
 			<territory type="BS">Bahamas</territory>
 			<territory type="BT">Bhutan</territory>
@@ -774,7 +778,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CC">Cocosøerne</territory>
 			<territory type="CD">Congo-Kinshasa</territory>
 			<territory type="CD" alt="variant">Den Demokratiske Republik Congo</territory>
-			<territory type="CF">Centralafrikanske Republik</territory>
+			<territory type="CF">Den Centralafrikanske Republik</territory>
 			<territory type="CG">Congo-Brazzaville</territory>
 			<territory type="CG" alt="variant">Republikken Congo</territory>
 			<territory type="CH">Schweiz</territory>
@@ -887,7 +891,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="MG">Madagaskar</territory>
 			<territory type="MH">Marshalløerne</territory>
 			<territory type="MK">Makedonien</territory>
-			<territory type="MK" alt="variant">Makedonien (Den Tidligere Jugoslaviske Republik Makedonien)</territory>
+			<territory type="MK" alt="variant">Den tidligere jugoslaviske republik Makedonien</territory>
 			<territory type="ML">Mali</territory>
 			<territory type="MM">Myanmar (Burma)</territory>
 			<territory type="MN">Mongoliet</territory>
@@ -955,7 +959,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="SO">Somalia</territory>
 			<territory type="SR">Surinam</territory>
 			<territory type="SS">Sydsudan</territory>
-			<territory type="ST">Sao Tome og Principe</territory>
+			<territory type="ST">São Tomé og Príncipe</territory>
 			<territory type="SV">El Salvador</territory>
 			<territory type="SX">Sint Maarten</territory>
 			<territory type="SY">Syrien</territory>
@@ -1074,6 +1078,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">Numerisk sortering</key>
 			<key type="colStrength" draft="contributed">Sorteringsstyrke</key>
 			<key type="currency">valuta</key>
+			<key type="hc">timeur (12 vs. 24)</key>
+			<key type="lb">linjeskift</key>
+			<key type="ms">målesystem</key>
 			<key type="numbers">tal</key>
 			<key type="timezone" draft="contributed">Tidszone</key>
 			<key type="va" draft="contributed">Sprogvariant</key>
@@ -1081,121 +1088,131 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">Privatbrug</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">hindu-arabiske tal</type>
-			<type type="arabext" key="numbers">udvidede hindu-arabiske tal</type>
-			<type type="armn" key="numbers">armenske tal</type>
-			<type type="armnlow" key="numbers">armenske tal i små bogstaver</type>
-			<type type="bali" key="numbers" draft="contributed">Balinesiske tal</type>
-			<type type="beng" key="numbers">bengali tal</type>
-			<type type="big5han" key="collation">sorteringsrækkefølge uforkortet kinesisk - Big5</type>
-			<type type="brah" key="numbers" draft="contributed">Brahmi-tal</type>
-			<type type="buddhist" key="calendar">buddhistisk kalender</type>
-			<type type="cakm" key="numbers" draft="contributed">Chakma-tal</type>
-			<type type="cham" key="numbers" draft="contributed">Cham-tal</type>
-			<type type="chinese" key="calendar">kinesisk kalender</type>
-			<type type="coptic" key="calendar">koptisk kalender</type>
-			<type type="dangi" key="calendar">dangi-kalender</type>
-			<type type="deva" key="numbers">devanagariske tal</type>
-			<type type="dictionary" key="collation">sorteringsrækkefølge for ordbog</type>
-			<type type="ducet" key="collation">Unicode-standardsortering</type>
-			<type type="eor" key="collation" draft="contributed">europæisk sorteringsrækkefølge</type>
-			<type type="ethi" key="numbers">etiopiske tal</type>
-			<type type="ethiopic" key="calendar">etiopisk kalender</type>
-			<type type="ethiopic-amete-alem" key="calendar">etiopisk amete-alem-kalender</type>
-			<type type="finance" key="numbers" draft="contributed">Finansielle tal</type>
-			<type type="fullwide" key="numbers">tal i fuld bredde</type>
-			<type type="gb2312han" key="collation">sorteringsrækkefølge forkortet kinesisk - GB2312</type>
-			<type type="geor" key="numbers">georgiske tal</type>
-			<type type="gregorian" key="calendar">gregoriansk kalender</type>
-			<type type="grek" key="numbers">græske tal</type>
-			<type type="greklow" key="numbers">græske tal i små bogstaver</type>
-			<type type="gujr" key="numbers">gujarati tal</type>
-			<type type="guru" key="numbers">gurmukhi tal</type>
-			<type type="hanidec" key="numbers">kinesiske decimaltal</type>
-			<type type="hans" key="numbers">forenklede kinesiske tal</type>
-			<type type="hansfin" key="numbers">forenklede kinesiske financielle tal</type>
-			<type type="hant" key="numbers">traditionelle kinesiske tal</type>
-			<type type="hantfin" key="numbers">traditionelle kinesiske finansielle tal</type>
-			<type type="hebr" key="numbers">hebræiske tal</type>
-			<type type="hebrew" key="calendar">jødisk kalender</type>
-			<type type="identical" key="colStrength" draft="contributed">Sortér alt</type>
-			<type type="indian" key="calendar">indisk nationalkalender</type>
-			<type type="islamic" key="calendar">islamisk kalender</type>
-			<type type="islamic-civil" key="calendar">verdslig islamisk kalender</type>
-			<type type="islamic-rgsa" key="calendar" draft="contributed">islamisk kalender (Saudi-Arabien, observation)</type>
-			<type type="islamic-tbla" key="calendar" draft="contributed">islamisk kalender (tabellarisk, astronomisk epoke)</type>
-			<type type="islamic-umalqura" key="calendar" draft="contributed">islamisk kalender (Umm al-Qura)</type>
-			<type type="iso8601" key="calendar">ISO-8601-kalender</type>
-			<type type="japanese" key="calendar">japansk kalender</type>
-			<type type="java" key="numbers" draft="contributed">Javanesiske tal</type>
-			<type type="jpan" key="numbers">japanske tal</type>
-			<type type="jpanfin" key="numbers">japanske financielle tal</type>
-			<type type="kali" key="numbers" draft="contributed">Kayah Li-tal</type>
-			<type type="khmr" key="numbers">khmer tal</type>
-			<type type="knda" key="numbers">kannada tal</type>
-			<type type="lana" key="numbers" draft="contributed">Tai Tham Hora-tal</type>
-			<type type="lanatham" key="numbers" draft="contributed">Tai Tham Tahm-tal</type>
-			<type type="laoo" key="numbers">laotiske tal</type>
-			<type type="latn" key="numbers">arabertal</type>
-			<type type="lepc" key="numbers" draft="contributed">Lepcha-tal</type>
-			<type type="limb" key="numbers" draft="contributed">Limbu-tal</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">Sortér med små bogstaver først</type>
-			<type type="mlym" key="numbers">Malayalamske tal</type>
-			<type type="mong" key="numbers" draft="contributed">Mongolske tal</type>
-			<type type="mtei" key="numbers" draft="contributed">Meetei Mayek-tal</type>
-			<type type="mymr" key="numbers">Myanmar tal</type>
-			<type type="mymrshan" key="numbers" draft="contributed">Myanmar Shan-tal</type>
-			<type type="native" key="numbers" draft="contributed">Nationale cifre</type>
-			<type type="nkoo" key="numbers" draft="contributed">N’Ko-tal</type>
-			<type type="no" key="colBackwards" draft="contributed">Sortér efter accenter i normal rækkefølge</type>
-			<type type="no" key="colCaseFirst" draft="contributed">Sortér efter store og små bogstaver i almindelig rækkefølge</type>
-			<type type="no" key="colCaseLevel" draft="contributed">Sortér uden forskel på store og små bogstaver</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">Sortér kana separat</type>
-			<type type="no" key="colNormalization" draft="contributed">Sortér uden normalisering</type>
-			<type type="no" key="colNumeric" draft="contributed">Sortér efter individuelle cifre</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">Sortér efter symboler</type>
-			<type type="olck" key="numbers" draft="contributed">Ol Chiki-tal</type>
-			<type type="orya" key="numbers">Oriya tal</type>
-			<type type="osma" key="numbers" draft="contributed">Osmanya-tal</type>
-			<type type="persian" key="calendar">persisk kalender</type>
-			<type type="phonebook" key="collation">sorteringsrækkefølge i telefonbøger</type>
-			<type type="phonetic" key="collation" draft="contributed">fonetisk sorteringsrækkefølge</type>
-			<type type="pinyin" key="collation">pinyin-baseret sorteringsrækkefølge</type>
-			<type type="primary" key="colStrength" draft="contributed">Sortér kun efter basisbogstaver</type>
-			<type type="quaternary" key="colStrength" draft="contributed">Sortér efter accenter/små og store bogstaver/bredde/kana</type>
-			<type type="reformed" key="collation">ny sorteringsrækkefølge</type>
-			<type type="roc" key="calendar">kalender for Republikken Kina</type>
-			<type type="roman" key="numbers">romertal</type>
-			<type type="romanlow" key="numbers">romertal i små bogstaver</type>
-			<type type="saur" key="numbers" draft="contributed">Saurashtra-tal</type>
-			<type type="search" key="collation">generel søgning</type>
-			<type type="searchjl" key="collation" draft="contributed">sortér efter den første konsonant i hangul</type>
-			<type type="secondary" key="colStrength" draft="contributed">Sortér efter accenter</type>
-			<type type="shifted" key="colAlternate" draft="contributed">Sortér, og ignorer symboler</type>
-			<type type="shrd" key="numbers" draft="contributed">Sharada-tal</type>
-			<type type="sora" key="numbers" draft="contributed">Sora Sompeng-tal</type>
-			<type type="standard" key="collation">standardsorteringsrækkefølge</type>
-			<type type="stroke" key="collation">stregbaseret sorteringsrækkefølge</type>
-			<type type="sund" key="numbers" draft="contributed">Sundanesiske tal</type>
-			<type type="takr" key="numbers" draft="contributed">Takri-tal</type>
-			<type type="talu" key="numbers" draft="contributed">Nye Tai Lue-tal</type>
-			<type type="taml" key="numbers">traditionelle tamilske tal</type>
-			<type type="tamldec" key="numbers">tamilske tal</type>
-			<type type="telu" key="numbers">Telugu tal</type>
-			<type type="tertiary" key="colStrength" draft="contributed">Sortér efter accenter/store og små bogstaver/bredde</type>
-			<type type="thai" key="numbers">thailandske tal</type>
-			<type type="tibt" key="numbers">tibetanske tal</type>
-			<type type="traditional" key="collation">traditionel sorteringsrækkefølge</type>
-			<type type="traditional" key="numbers" draft="contributed">Traditionelle tal</type>
-			<type type="unihan" key="collation">sortering efter streger i rodtegn</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">Sortér med store bogstaver først</type>
-			<type type="vaii" key="numbers" draft="contributed">Vai-tal</type>
-			<type type="yes" key="colBackwards" draft="contributed">Sortér efter accenter i omvendt rækkefølge</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">Sortér med skelnen mellem store og små bogstaver</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">Sortér kana med forskel på varianter</type>
-			<type type="yes" key="colNormalization" draft="contributed">Sortér Unicode efter første normalisering</type>
-			<type type="yes" key="colNumeric" draft="contributed">Sortér tal numerisk</type>
-			<type type="zhuyin" key="collation" draft="contributed">zhuyin-sorteringsrækkefølge</type>
+			<type key="calendar" type="buddhist">buddhistisk kalender</type>
+			<type key="calendar" type="chinese">kinesisk kalender</type>
+			<type key="calendar" type="coptic">koptisk kalender</type>
+			<type key="calendar" type="dangi">dangi-kalender</type>
+			<type key="calendar" type="ethiopic">etiopisk kalender</type>
+			<type key="calendar" type="ethiopic-amete-alem">etiopisk amete-alem-kalender</type>
+			<type key="calendar" type="gregorian">gregoriansk kalender</type>
+			<type key="calendar" type="hebrew">jødisk kalender</type>
+			<type key="calendar" type="indian">indisk nationalkalender</type>
+			<type key="calendar" type="islamic">islamisk kalender</type>
+			<type key="calendar" type="islamic-civil">verdslig islamisk kalender</type>
+			<type key="calendar" type="islamic-rgsa" draft="contributed">islamisk kalender (Saudi-Arabien, observation)</type>
+			<type key="calendar" type="islamic-tbla" draft="contributed">islamisk kalender (tabellarisk, astronomisk epoke)</type>
+			<type key="calendar" type="islamic-umalqura" draft="contributed">islamisk kalender (Umm al-Qura)</type>
+			<type key="calendar" type="iso8601">ISO-8601-kalender</type>
+			<type key="calendar" type="japanese">japansk kalender</type>
+			<type key="calendar" type="persian">persisk kalender</type>
+			<type key="calendar" type="roc">kalender for Republikken Kina</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">Sortér efter symboler</type>
+			<type key="colAlternate" type="shifted" draft="contributed">Sortér, og ignorer symboler</type>
+			<type key="colBackwards" type="no" draft="contributed">Sortér efter accenter i normal rækkefølge</type>
+			<type key="colBackwards" type="yes" draft="contributed">Sortér efter accenter i omvendt rækkefølge</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">Sortér med små bogstaver først</type>
+			<type key="colCaseFirst" type="no" draft="contributed">Sortér efter store og små bogstaver i almindelig rækkefølge</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">Sortér med store bogstaver først</type>
+			<type key="colCaseLevel" type="no" draft="contributed">Sortér uden forskel på store og små bogstaver</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">Sortér med skelnen mellem store og små bogstaver</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">Sortér kana separat</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">Sortér kana med forskel på varianter</type>
+			<type key="collation" type="big5han">sorteringsrækkefølge uforkortet kinesisk - Big5</type>
+			<type key="collation" type="dictionary">sorteringsrækkefølge for ordbog</type>
+			<type key="collation" type="ducet">Unicode-standardsortering</type>
+			<type key="collation" type="eor" draft="contributed">europæisk sorteringsrækkefølge</type>
+			<type key="collation" type="gb2312han">sorteringsrækkefølge forkortet kinesisk - GB2312</type>
+			<type key="collation" type="phonebook">sorteringsrækkefølge i telefonbøger</type>
+			<type key="collation" type="phonetic" draft="contributed">fonetisk sorteringsrækkefølge</type>
+			<type key="collation" type="pinyin">pinyin-baseret sorteringsrækkefølge</type>
+			<type key="collation" type="reformed">ny sorteringsrækkefølge</type>
+			<type key="collation" type="search">generel søgning</type>
+			<type key="collation" type="searchjl" draft="contributed">sortér efter den første konsonant i hangul</type>
+			<type key="collation" type="standard">standardsorteringsrækkefølge</type>
+			<type key="collation" type="stroke">stregbaseret sorteringsrækkefølge</type>
+			<type key="collation" type="traditional">traditionel sorteringsrækkefølge</type>
+			<type key="collation" type="unihan">sortering efter streger i rodtegn</type>
+			<type key="collation" type="zhuyin" draft="contributed">zhuyin-sorteringsrækkefølge</type>
+			<type key="colNormalization" type="no" draft="contributed">Sortér uden normalisering</type>
+			<type key="colNormalization" type="yes" draft="contributed">Sortér Unicode efter første normalisering</type>
+			<type key="colNumeric" type="no" draft="contributed">Sortér efter individuelle cifre</type>
+			<type key="colNumeric" type="yes" draft="contributed">Sortér tal numerisk</type>
+			<type key="colStrength" type="identical" draft="contributed">Sortér alt</type>
+			<type key="colStrength" type="primary" draft="contributed">Sortér kun efter basisbogstaver</type>
+			<type key="colStrength" type="quaternary" draft="contributed">Sortér efter accenter/små og store bogstaver/bredde/kana</type>
+			<type key="colStrength" type="secondary" draft="contributed">Sortér efter accenter</type>
+			<type key="colStrength" type="tertiary" draft="contributed">Sortér efter accenter/store og små bogstaver/bredde</type>
+			<type key="hc" type="h11">12-timersur (0-11)</type>
+			<type key="hc" type="h12">12-timersur (1-12)</type>
+			<type key="hc" type="h23">24-timersur (0-23)</type>
+			<type key="hc" type="h24">24-timersur (1-24)</type>
+			<type key="lb" type="loose">løst linjeskift</type>
+			<type key="lb" type="normal">normalt linjeskift</type>
+			<type key="lb" type="strict">hårdt linjeskift</type>
+			<type key="ms" type="metric">metersystem</type>
+			<type key="ms" type="uksystem">britisk målesystem</type>
+			<type key="ms" type="ussystem">amerikansk målesystem</type>
+			<type key="numbers" type="arab">hindu-arabiske tal</type>
+			<type key="numbers" type="arabext">udvidede hindu-arabiske tal</type>
+			<type key="numbers" type="armn">armenske tal</type>
+			<type key="numbers" type="armnlow">armenske tal i små bogstaver</type>
+			<type key="numbers" type="bali" draft="contributed">Balinesiske tal</type>
+			<type key="numbers" type="beng">bengali tal</type>
+			<type key="numbers" type="brah" draft="contributed">Brahmi-tal</type>
+			<type key="numbers" type="cakm" draft="contributed">Chakma-tal</type>
+			<type key="numbers" type="cham" draft="contributed">Cham-tal</type>
+			<type key="numbers" type="deva">devanagariske tal</type>
+			<type key="numbers" type="ethi">etiopiske tal</type>
+			<type key="numbers" type="finance" draft="contributed">Finansielle tal</type>
+			<type key="numbers" type="fullwide">tal i fuld bredde</type>
+			<type key="numbers" type="geor">georgiske tal</type>
+			<type key="numbers" type="grek">græske tal</type>
+			<type key="numbers" type="greklow">græske tal i små bogstaver</type>
+			<type key="numbers" type="gujr">gujarati tal</type>
+			<type key="numbers" type="guru">gurmukhi tal</type>
+			<type key="numbers" type="hanidec">kinesiske decimaltal</type>
+			<type key="numbers" type="hans">forenklede kinesiske tal</type>
+			<type key="numbers" type="hansfin">forenklede kinesiske financielle tal</type>
+			<type key="numbers" type="hant">traditionelle kinesiske tal</type>
+			<type key="numbers" type="hantfin">traditionelle kinesiske finansielle tal</type>
+			<type key="numbers" type="hebr">hebræiske tal</type>
+			<type key="numbers" type="java" draft="contributed">Javanesiske tal</type>
+			<type key="numbers" type="jpan">japanske tal</type>
+			<type key="numbers" type="jpanfin">japanske financielle tal</type>
+			<type key="numbers" type="kali" draft="contributed">Kayah Li-tal</type>
+			<type key="numbers" type="khmr">khmer tal</type>
+			<type key="numbers" type="knda">kannada tal</type>
+			<type key="numbers" type="lana" draft="contributed">Tai Tham Hora-tal</type>
+			<type key="numbers" type="lanatham" draft="contributed">Tai Tham Tahm-tal</type>
+			<type key="numbers" type="laoo">laotiske tal</type>
+			<type key="numbers" type="latn">arabertal</type>
+			<type key="numbers" type="lepc" draft="contributed">Lepcha-tal</type>
+			<type key="numbers" type="limb" draft="contributed">Limbu-tal</type>
+			<type key="numbers" type="mlym">Malayalamske tal</type>
+			<type key="numbers" type="mong" draft="contributed">Mongolske tal</type>
+			<type key="numbers" type="mtei" draft="contributed">Meetei Mayek-tal</type>
+			<type key="numbers" type="mymr">Myanmar tal</type>
+			<type key="numbers" type="mymrshan" draft="contributed">Myanmar Shan-tal</type>
+			<type key="numbers" type="native" draft="contributed">Nationale cifre</type>
+			<type key="numbers" type="nkoo" draft="contributed">N’Ko-tal</type>
+			<type key="numbers" type="olck" draft="contributed">Ol Chiki-tal</type>
+			<type key="numbers" type="orya">Oriya tal</type>
+			<type key="numbers" type="osma" draft="contributed">Osmanya-tal</type>
+			<type key="numbers" type="roman">romertal</type>
+			<type key="numbers" type="romanlow">romertal i små bogstaver</type>
+			<type key="numbers" type="saur" draft="contributed">Saurashtra-tal</type>
+			<type key="numbers" type="shrd" draft="contributed">Sharada-tal</type>
+			<type key="numbers" type="sora" draft="contributed">Sora Sompeng-tal</type>
+			<type key="numbers" type="sund" draft="contributed">Sundanesiske tal</type>
+			<type key="numbers" type="takr" draft="contributed">Takri-tal</type>
+			<type key="numbers" type="talu" draft="contributed">Nye Tai Lue-tal</type>
+			<type key="numbers" type="taml">traditionelle tamilske tal</type>
+			<type key="numbers" type="tamldec">tamilske tal</type>
+			<type key="numbers" type="telu">Telugu tal</type>
+			<type key="numbers" type="thai">thailandske tal</type>
+			<type key="numbers" type="tibt">tibetanske tal</type>
+			<type key="numbers" type="traditional" draft="contributed">Traditionelle tal</type>
+			<type key="numbers" type="vaii" draft="contributed">Vai-tal</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">BGN</transformName>
@@ -1216,7 +1233,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</measurementSystemNames>
 		<codePatterns>
 			<codePattern type="language">Sprog: {0}</codePattern>
-			<codePattern type="script">Instruks: {0}</codePattern>
+			<codePattern type="script">Skrift: {0}</codePattern>
 			<codePattern type="territory">Område: {0}</codePattern>
 		</codePatterns>
 	</localeDisplayNames>
@@ -1299,6 +1316,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d.</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E 'd'. d.</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -1316,6 +1334,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">MMM</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d. MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd" draft="contributed">d MMMM</dateFormatItem>
 						<dateFormatItem id="MMMMEd">E d. MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm.ss</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
@@ -1326,6 +1345,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">d. MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E d. MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM" draft="contributed">MMMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
 					</availableFormats>
@@ -1640,23 +1660,66 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="noon" draft="contributed">middag</dayPeriod>
+							<dayPeriod type="midnight">midnat</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">om morgenen</dayPeriod>
+							<dayPeriod type="morning2">om formiddagen</dayPeriod>
+							<dayPeriod type="afternoon1">om eftermiddagen</dayPeriod>
+							<dayPeriod type="evening1">om aftenen</dayPeriod>
+							<dayPeriod type="night1">om natten</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">midnat</dayPeriod>
 							<dayPeriod type="am">a</dayPeriod>
-							<dayPeriod type="noon">middag</dayPeriod>
 							<dayPeriod type="pm">p</dayPeriod>
+							<dayPeriod type="morning1">om morgenen</dayPeriod>
+							<dayPeriod type="morning2">om formiddagen</dayPeriod>
+							<dayPeriod type="afternoon1">om eftermiddagen</dayPeriod>
+							<dayPeriod type="evening1">om aftenen</dayPeriod>
+							<dayPeriod type="night1">om natten</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">midnat</dayPeriod>
 							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="noon">middag</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">om morgenen</dayPeriod>
+							<dayPeriod type="morning2">om formiddagen</dayPeriod>
+							<dayPeriod type="afternoon1">om eftermiddagen</dayPeriod>
+							<dayPeriod type="evening1">om aftenen</dayPeriod>
+							<dayPeriod type="night1">om natten</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">midnat</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">morgen</dayPeriod>
+							<dayPeriod type="morning2">formiddag</dayPeriod>
+							<dayPeriod type="afternoon1">eftermiddag</dayPeriod>
+							<dayPeriod type="evening1">aften</dayPeriod>
+							<dayPeriod type="night1">nat</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">midnat</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">morgen</dayPeriod>
+							<dayPeriod type="morning2">formiddag</dayPeriod>
+							<dayPeriod type="afternoon1">eftermiddag</dayPeriod>
+							<dayPeriod type="evening1">aften</dayPeriod>
+							<dayPeriod type="night1">nat</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="am" draft="unconfirmed">formiddag</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">eftermiddag</dayPeriod>
+							<dayPeriod type="midnight">midnat</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">morgen</dayPeriod>
+							<dayPeriod type="morning2">formiddag</dayPeriod>
+							<dayPeriod type="afternoon1">eftermiddag</dayPeriod>
+							<dayPeriod type="evening1">aften</dayPeriod>
+							<dayPeriod type="night1">nat</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1727,12 +1790,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern>{1} 'kl.' {0}</pattern>
+							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern>{1} 'kl.' {0}</pattern>
+							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
@@ -1774,6 +1837,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">MMM</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d. MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
 						<dateFormatItem id="MMMMEd">E d. MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm.ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
@@ -1784,6 +1848,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMd">d. MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMEd">E d. MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
 						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
 					</availableFormats>
@@ -1902,9 +1967,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</eras>
 			</calendar>
 			<calendar type="japanese">
-				<!-- need some non-empty element here to make inheritance work,
-					 this copy of generic dateFormats above is smaller than root japanese eras
-				-->
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
@@ -1939,10 +2001,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</calendars>
 		<fields>
 			<field type="era">
-				<displayName>Æra</displayName>
+				<displayName>æra</displayName>
 			</field>
 			<field type="year">
-				<displayName>År</displayName>
+				<displayName>år</displayName>
 				<relative type="-1">sidste år</relative>
 				<relative type="0">i år</relative>
 				<relative type="1">næste år</relative>
@@ -1957,6 +2019,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>år</displayName>
+				<relative type="-1">sidste år</relative>
+				<relative type="0">i år</relative>
+				<relative type="1">næste år</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} år</relativeTimePattern>
 					<relativeTimePattern count="other">om {0} år</relativeTimePattern>
@@ -1968,6 +2033,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>år</displayName>
+				<relative type="-1">sidste år</relative>
+				<relative type="0">i år</relative>
+				<relative type="1">næste år</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} år</relativeTimePattern>
 					<relativeTimePattern count="other">om {0} år</relativeTimePattern>
@@ -1978,7 +2046,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="quarter">
-				<displayName>Kvartal</displayName>
+				<displayName>kvartal</displayName>
+				<relative type="-1">sidste kvartal</relative>
+				<relative type="0">dette kvartal</relative>
+				<relative type="1">næste kvartal</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} kvartal</relativeTimePattern>
 					<relativeTimePattern count="other">om {0} kvartaler</relativeTimePattern>
@@ -1990,6 +2061,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>kvt.</displayName>
+				<relative type="-1">sidste kvt.</relative>
+				<relative type="0">dette kvt.</relative>
+				<relative type="1">næste kvt.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} kvt.</relativeTimePattern>
 					<relativeTimePattern count="other">om {0} kvt.</relativeTimePattern>
@@ -2001,6 +2075,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>kvt.</displayName>
+				<relative type="-1">sidste kvt.</relative>
+				<relative type="0">dette kvt.</relative>
+				<relative type="1">næste kvt.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} kvt.</relativeTimePattern>
 					<relativeTimePattern count="other">om {0} kvt.</relativeTimePattern>
@@ -2011,7 +2088,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="month">
-				<displayName>Måned</displayName>
+				<displayName>måned</displayName>
 				<relative type="-1">sidste måned</relative>
 				<relative type="0">denne måned</relative>
 				<relative type="1">næste måned</relative>
@@ -2026,6 +2103,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>md.</displayName>
+				<relative type="-1">sidste md.</relative>
+				<relative type="0">denne md.</relative>
+				<relative type="1">næste md.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} md.</relativeTimePattern>
 					<relativeTimePattern count="other">om {0} md.</relativeTimePattern>
@@ -2037,6 +2117,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>md.</displayName>
+				<relative type="-1">sidste md.</relative>
+				<relative type="0">denne md.</relative>
+				<relative type="1">næste md.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} md.</relativeTimePattern>
 					<relativeTimePattern count="other">om {0} md.</relativeTimePattern>
@@ -2047,7 +2130,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="week">
-				<displayName>Uge</displayName>
+				<displayName>uge</displayName>
 				<relative type="-1">sidste uge</relative>
 				<relative type="0">denne uge</relative>
 				<relative type="1">næste uge</relative>
@@ -2062,6 +2145,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>uge</displayName>
+				<relative type="-1">sidste uge</relative>
+				<relative type="0">denne uge</relative>
+				<relative type="1">næste uge</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} uge</relativeTimePattern>
 					<relativeTimePattern count="other">om {0} uger</relativeTimePattern>
@@ -2073,6 +2159,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>uge</displayName>
+				<relative type="-1">sidste uge</relative>
+				<relative type="0">denne uge</relative>
+				<relative type="1">næste uge</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} uge</relativeTimePattern>
 					<relativeTimePattern count="other">om {0} uger</relativeTimePattern>
@@ -2083,7 +2172,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day">
-				<displayName>Dag</displayName>
+				<displayName>dag</displayName>
 				<relative type="-2">i forgårs</relative>
 				<relative type="-1">i går</relative>
 				<relative type="0">i dag</relative>
@@ -2100,6 +2189,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>dag</displayName>
+				<relative type="-2">i forgårs</relative>
+				<relative type="-1">i går</relative>
+				<relative type="0">i dag</relative>
+				<relative type="1">i morgen</relative>
+				<relative type="2">i overmorgen</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} dag</relativeTimePattern>
 					<relativeTimePattern count="other">om {0} dage</relativeTimePattern>
@@ -2111,6 +2205,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>dag</displayName>
+				<relative type="-2">i forgårs</relative>
+				<relative type="-1">i går</relative>
+				<relative type="0">i dag</relative>
+				<relative type="1">i morgen</relative>
+				<relative type="2">i overmorgen</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} dag</relativeTimePattern>
 					<relativeTimePattern count="other">om {0} dage</relativeTimePattern>
@@ -2121,7 +2220,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="weekday">
-				<displayName>Ugedag</displayName>
+				<displayName>ugedag</displayName>
 			</field>
 			<field type="sun">
 				<relative type="-1">sidste søndag</relative>
@@ -2191,12 +2290,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="thu-short">
 				<relative type="-1">sidste tor.</relative>
 				<relative type="0">denne tor.</relative>
-				<relative type="1" draft="contributed">næste tor.</relative>
+				<relative type="1">næste tor.</relative>
 			</field>
 			<field type="thu-narrow">
-				<relative type="-1" draft="contributed">sidste to.</relative>
-				<relative type="0" draft="contributed">denne to.</relative>
-				<relative type="1" draft="contributed">næste to.</relative>
+				<relative type="-1">sidste to.</relative>
+				<relative type="0">denne to.</relative>
+				<relative type="1">næste to.</relative>
 			</field>
 			<field type="fri">
 				<relative type="-1">sidste fredag</relative>
@@ -2232,7 +2331,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>AM/PM</displayName>
 			</field>
 			<field type="hour">
-				<displayName>Time</displayName>
+				<displayName>time</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} time</relativeTimePattern>
 					<relativeTimePattern count="other">om {0} timer</relativeTimePattern>
@@ -2265,7 +2364,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="minute">
-				<displayName>Minut</displayName>
+				<displayName>minut</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} minut</relativeTimePattern>
 					<relativeTimePattern count="other">om {0} minutter</relativeTimePattern>
@@ -2298,7 +2397,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="second">
-				<displayName>Sekund</displayName>
+				<displayName>sekund</displayName>
 				<relative type="0">nu</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} sekund</relativeTimePattern>
@@ -2332,14 +2431,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>Tidszone</displayName>
+				<displayName>tidszone</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
 			<hourFormat>+HH.mm;-HH.mm</hourFormat>
 			<gmtFormat>GMT{0}</gmtFormat>
 			<gmtZeroFormat>GMT</gmtZeroFormat>
-			<regionFormat>Tidszone for {0}</regionFormat>
+			<regionFormat>{0}</regionFormat>
 			<regionFormat type="daylight">{0} (+1)</regionFormat>
 			<regionFormat type="standard">{0} (+0)</regionFormat>
 			<fallbackFormat>{1} ({0})</fallbackFormat>
@@ -3210,6 +3309,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
 			</zone>
@@ -3294,6 +3396,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Chita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Jakutsk</exemplarCity>
 			</zone>
@@ -3312,6 +3417,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolymsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamchatka</exemplarCity>
 			</zone>
@@ -3565,7 +3673,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>St. Thomas</exemplarCity>
 			</zone>
 			<zone type="Asia/Saigon">
-				<exemplarCity>Ho Chi Minh-byen</exemplarCity>
+				<exemplarCity>Ho Chi Minh City</exemplarCity>
 			</zone>
 			<zone type="Pacific/Efate">
 				<exemplarCity>Efate</exemplarCity>
@@ -4286,7 +4394,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Norfolk">
 				<long>
-					<standard>Norfolkøen-tid</standard>
+					<standard>Norfolk Island-tid</standard>
 				</long>
 			</metazone>
 			<metazone type="Noronha">
@@ -4474,7 +4582,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Truk">
 				<long>
-					<standard>Truk-tid</standard>
+					<standard>Chuuk-tid</standard>
 				</long>
 			</metazone>
 			<metazone type="Turkmenistan">
@@ -4578,7 +4686,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<perMille>‰</perMille>
 			<infinity>∞</infinity>
 			<nan>NaN</nan>
-			<timeSeparator draft="contributed">.</timeSeparator>
+			<timeSeparator>.</timeSeparator>
 		</symbols>
 		<decimalFormats numberSystem="latn">
 			<decimalFormatLength>
@@ -4634,12 +4742,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern type="10000000000" count="other">00 mia</pattern>
 					<pattern type="100000000000" count="one">000 mia</pattern>
 					<pattern type="100000000000" count="other">000 mia</pattern>
-					<pattern type="1000000000000" count="one">0 bill</pattern>
-					<pattern type="1000000000000" count="other">0 bill</pattern>
-					<pattern type="10000000000000" count="one">00 bill</pattern>
-					<pattern type="10000000000000" count="other">00 bill</pattern>
-					<pattern type="100000000000000" count="one">000 bill</pattern>
-					<pattern type="100000000000000" count="other">000 bill</pattern>
+					<pattern type="1000000000000" count="one">0 bio</pattern>
+					<pattern type="1000000000000" count="other">0 bio</pattern>
+					<pattern type="10000000000000" count="one">00 bio</pattern>
+					<pattern type="10000000000000" count="other">00 bio</pattern>
+					<pattern type="100000000000000" count="one">000 bio</pattern>
+					<pattern type="100000000000000" count="other">000 bio</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
@@ -4666,6 +4774,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="contributed">0 td ¤</pattern>
+					<pattern type="1000" count="other" draft="contributed">0 td ¤</pattern>
+					<pattern type="10000" count="one" draft="contributed">00 td ¤</pattern>
+					<pattern type="10000" count="other" draft="contributed">00 td ¤</pattern>
+					<pattern type="100000" count="one" draft="contributed">000 td ¤</pattern>
+					<pattern type="100000" count="other" draft="contributed">000 td ¤</pattern>
+					<pattern type="1000000" count="one" draft="contributed">0 mio ¤</pattern>
+					<pattern type="1000000" count="other" draft="contributed">0 mio ¤</pattern>
+					<pattern type="10000000" count="one" draft="contributed">00 mio ¤</pattern>
+					<pattern type="10000000" count="other" draft="contributed">00 mio ¤</pattern>
+					<pattern type="100000000" count="one" draft="contributed">000 mio ¤</pattern>
+					<pattern type="100000000" count="other" draft="contributed">000 mio ¤</pattern>
+					<pattern type="1000000000" count="one" draft="contributed">0 mia ¤</pattern>
+					<pattern type="1000000000" count="other" draft="contributed">0 mia ¤</pattern>
+					<pattern type="10000000000" count="one" draft="contributed">00 mia ¤</pattern>
+					<pattern type="10000000000" count="other" draft="contributed">00 mia ¤</pattern>
+					<pattern type="100000000000" count="one" draft="contributed">000 mia ¤</pattern>
+					<pattern type="100000000000" count="other" draft="contributed">000 mia ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="contributed">0 bio ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="contributed">0 bio ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="contributed">00 bio ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="contributed">00 bio ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="contributed">000 bio ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="contributed">000 bio ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4706,7 +4842,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="ANG">
 				<displayName>Nederlandske Antiller-gylden</displayName>
-				<displayName count="one">Nederlandske Antiller-gylden</displayName>
+				<displayName count="one">Nederlandsk Antiller-gylden</displayName>
 				<displayName count="other">Nederlandske Antiller-gylden</displayName>
 				<symbol>ANG</symbol>
 			</currency>
@@ -4715,6 +4851,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Angolansk kwanza</displayName>
 				<displayName count="other">Angolanske kwanza</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>Angolansk kwanza (1977–1990)</displayName>
@@ -4787,6 +4924,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Bosnien-Hercegovinsk konvertibel mark</displayName>
 				<displayName count="other">Bosnien-Hercegovinske konvertible mark</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>Barbadisk dollar</displayName>
@@ -4859,6 +4997,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Boliviansk boliviano</displayName>
 				<displayName count="other">Bolivianske boliviano</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOP">
 				<displayName>Boliviansk peso</displayName>
@@ -4925,6 +5064,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Botswansk pula</displayName>
 				<displayName count="other">Botswanske pula</displayName>
 				<symbol draft="contributed">BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>Hviderussisk rubel (1994–1999)</displayName>
@@ -4964,9 +5104,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">WIR euro</displayName>
 			</currency>
 			<currency type="CHF">
-				<displayName>Schweizisk franc</displayName>
-				<displayName count="one">Schweizisk franc</displayName>
-				<displayName count="other">Schweiziske franc</displayName>
+				<displayName>Schweizerfranc</displayName>
+				<displayName count="one">Schweizerfranc</displayName>
+				<displayName count="other">Schweizerfranc</displayName>
 				<symbol>CHF</symbol>
 			</currency>
 			<currency type="CHW">
@@ -5017,6 +5157,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Cubansk konvertible pesos</displayName>
 				<displayName count="other">Cubanske konvertible pesos</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>Cubansk peso</displayName>
@@ -5041,6 +5182,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Tjekkisk koruna</displayName>
 				<displayName count="other">Tjekkiske koruna</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>Østtysk mark</displayName>
@@ -5063,6 +5205,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Dansk krone</displayName>
 				<displayName count="other">Danske kroner</displayName>
 				<symbol>kr.</symbol>
+				<symbol alt="narrow" draft="contributed">kr.</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Dominikansk peso</displayName>
@@ -5092,6 +5235,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Egyptisk pund</displayName>
 				<displayName count="other">Egyptiske pund</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>Eritreisk nakfa</displayName>
@@ -5144,6 +5288,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Pund fra Falklandsøerne</displayName>
 				<displayName count="other">Pund fra Falklandsøerne</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>Fransk franc</displayName>
@@ -5167,6 +5312,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Georgisk lari</displayName>
 				<displayName count="other">Georgiske lari</displayName>
 				<symbol draft="contributed">GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>Ghanesisk cedi (1979–2007)</displayName>
@@ -5197,6 +5343,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Guineansk franc</displayName>
 				<displayName count="other">Guineanske franc</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>Guineansk syli</displayName>
@@ -5218,6 +5365,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Guatemalansk quetzal</displayName>
 				<displayName count="other">Guatemalanske quetzal</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>Portugisisk guinea escudo</displayName>
@@ -5248,6 +5396,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Honduransk lempira</displayName>
 				<displayName count="other">Honduranske lempira</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>Kroatisk dinar</displayName>
@@ -5259,6 +5408,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Kroatisk kuna</displayName>
 				<displayName count="other">Kroatiske kuna</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>Haitisk gourde</displayName>
@@ -5271,12 +5421,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Ungarsk forint</displayName>
 				<displayName count="other">Ungarske forint</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>Indonesisk rupiah</displayName>
 				<displayName count="one">Indonesisk rupiah</displayName>
 				<displayName count="other">Indonesiske rupiah</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>Irsk pund</displayName>
@@ -5319,6 +5471,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Islandsk krone</displayName>
 				<displayName count="other">Islandske kroner</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr.</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>Italiensk lire</displayName>
@@ -5369,12 +5522,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Comorisk franc</displayName>
 				<displayName count="other">Comoriske franc</displayName>
 				<symbol draft="contributed">KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>Nordkoreansk won</displayName>
 				<displayName count="one">Nordkoreansk won</displayName>
 				<displayName count="other">Nordkoreanske won</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>Sydkoreansk won</displayName>
@@ -5415,12 +5570,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Libanesisk pund</displayName>
 				<displayName count="other">Libanesiske pund</displayName>
 				<symbol draft="contributed">LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>Srilankansk rupee</displayName>
 				<displayName count="one">Srilankansk rupee</displayName>
 				<displayName count="other">Srilankanske rupees</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>Liberisk dollar</displayName>
@@ -5499,6 +5656,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Madagaskisk ariary</displayName>
 				<displayName count="other">Madagaskiske ariary</displayName>
 				<symbol draft="contributed">MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>Madagaskisk franc</displayName>
@@ -5521,6 +5679,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Myanmarsk kyat</displayName>
 				<displayName count="other">Myanmarske kyat</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>Mongolsk tugrik</displayName>
@@ -5556,6 +5715,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Mauritisk rupee</displayName>
 				<displayName count="other">Mauritiske rupees</displayName>
 				<symbol draft="contributed">MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>Maldivisk rufiyaa</displayName>
@@ -5586,6 +5746,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Malaysisk ringgit</displayName>
 				<displayName count="other">Malaysiske ringgit</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>Mozambiquisk escudo</displayName>
@@ -5627,6 +5788,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Nicaraguansk cordoba</displayName>
 				<displayName count="other">Nicaraguanske cordoba</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>Hollandsk guilder</displayName>
@@ -5638,12 +5800,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Norsk krone</displayName>
 				<displayName count="other">Norske kroner</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr.</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>Nepalesisk rupee</displayName>
 				<displayName count="one">Nepalesisk rupee</displayName>
 				<displayName count="other">Nepalesiske rupees</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>New Zealandsk dollar</displayName>
@@ -5698,12 +5862,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Pakistansk rupee</displayName>
 				<displayName count="other">Pakistanske rupees</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>Polsk zloty</displayName>
 				<displayName count="one">Polsk zloty</displayName>
 				<displayName count="other">Polske zloty</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>Polsk zloty (1950–1995)</displayName>
@@ -5750,6 +5916,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Russisk rubel</displayName>
 				<displayName count="other">Russiske rubler</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>Russisk rubel (1991–1998)</displayName>
@@ -5761,6 +5928,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Rwandisk franc</displayName>
 				<displayName count="other">Rwandiske franc</displayName>
 				<symbol draft="contributed">RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>Saudiarabisk riyal</displayName>
@@ -5802,6 +5970,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Svensk krone</displayName>
 				<displayName count="other">Svenske kroner</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr.</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>Singaporeansk dollar</displayName>
@@ -5815,6 +5984,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Pund fra Saint Helena</displayName>
 				<displayName count="other">Pund fra Saint Helena</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>Slovensk tolar</displayName>
@@ -5862,6 +6032,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Dobra fra Sao Tome og Principe</displayName>
 				<displayName count="other">Dobra fra Sao Tome og Principe</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>Sovjetisk rubel</displayName>
@@ -5878,6 +6049,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Syrisk pund</displayName>
 				<displayName count="other">Syriske pund</displayName>
 				<symbol draft="contributed">SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>Swazilandsk lilangeni</displayName>
@@ -5890,6 +6062,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Thailandsk baht</displayName>
 				<displayName count="other">Thailandske baht</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>Tadsjikisk rubel</displayName>
@@ -5924,6 +6097,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Tongansk paʻanga</displayName>
 				<displayName count="other">Tonganske paʻanga</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>Escudo fra Timor</displayName>
@@ -5941,6 +6115,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">Tyrkiske lira</displayName>
 				<symbol draft="contributed">TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Dollar fra Trinidad og Tobago</displayName>
@@ -5952,7 +6127,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="TWD">
 				<displayName>Ny taiwansk dollar</displayName>
 				<displayName count="one">Ny taiwansk dollar</displayName>
-				<displayName count="other">Ny taiwanske dollar</displayName>
+				<displayName count="other">Nye taiwanske dollar</displayName>
 				<symbol>NT$</symbol>
 				<symbol alt="narrow" draft="contributed">NT$</symbol>
 			</currency>
@@ -6030,6 +6205,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Venezuelansk bolivar</displayName>
 				<displayName count="other">Venezuelanske bolivar</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>Vietnamesisk dong</displayName>
@@ -6073,6 +6249,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Østkaribisk dollar</displayName>
 				<displayName count="other">Østkaribiske dollar</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>SDR</displayName>
@@ -6157,6 +6334,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Sydafrikansk rand</displayName>
 				<displayName count="other">Sydafrikanske rand</displayName>
 				<symbol draft="contributed">ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>Zambisk kwacha (1968–2012)</displayName>
@@ -6168,6 +6346,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Zambisk kwacha</displayName>
 				<displayName count="other">Zambiske kwacha</displayName>
 				<symbol draft="contributed">ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>Ny zairisk zaire (1993–1998)</displayName>
@@ -6196,7 +6375,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
-			<pattern type="atLeast">{0} eller derover</pattern>
+			<pattern type="atLeast">{0}+</pattern>
 			<pattern type="range">{0}-{1}</pattern>
 		</miscPatterns>
 	</numbers>
@@ -6215,6 +6394,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} meter pr. sekund²</unitPattern>
 				<unitPattern count="other">{0} meter pr. sekund²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>omdrejning</displayName>
+				<unitPattern count="one">{0} omdrejning</unitPattern>
+				<unitPattern count="other">{0} omdrejninger</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radian</displayName>
+				<unitPattern count="one">{0} radian</unitPattern>
+				<unitPattern count="other">{0} radianer</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>grader</displayName>
+				<unitPattern count="one">{0} grad</unitPattern>
+				<unitPattern count="other">{0} grader</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>bueminutter</displayName>
 				<unitPattern count="one">{0} bueminut</unitPattern>
@@ -6225,30 +6419,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} buesekund</unitPattern>
 				<unitPattern count="other">{0} buesekunder</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>grader</displayName>
-				<unitPattern count="one">{0} grad</unitPattern>
-				<unitPattern count="other">{0} grader</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radian</displayName>
-				<unitPattern count="one">{0} radian</unitPattern>
-				<unitPattern count="other">{0} radianer</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>acre</displayName>
-				<unitPattern count="one">{0} acre</unitPattern>
-				<unitPattern count="other">{0} acres</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>kvadratkilometer</displayName>
+				<unitPattern count="one">{0} kvadratkilometer</unitPattern>
+				<unitPattern count="other">{0} kvadratkilometer</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektar</displayName>
 				<unitPattern count="one">{0} hektar</unitPattern>
 				<unitPattern count="other">{0} hektar</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>kvadratmeter</displayName>
+				<unitPattern count="one">{0} kvadratmeter</unitPattern>
+				<unitPattern count="other">{0} kvadratmeter</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>kvadratcentimeter</displayName>
 				<unitPattern count="one">{0} kvadratcentimeter</unitPattern>
 				<unitPattern count="other">{0} kvadratcentimeter</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>kvadrat-engelske mil</displayName>
+				<unitPattern count="one">{0} kvadrat-engelsk mil</unitPattern>
+				<unitPattern count="other">{0} kvadrat-engelske mil</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acre</displayName>
+				<unitPattern count="one">{0} acre</unitPattern>
+				<unitPattern count="other">{0} acres</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>kvadrat-engelske yard</displayName>
+				<unitPattern count="one">{0} kvadrat engelske yard</unitPattern>
+				<unitPattern count="other">{0} kvadrat engelske yard</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>kvadratfod</displayName>
@@ -6259,91 +6465,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>kvadrattommer</displayName>
 				<unitPattern count="one">{0} kvadrattomme</unitPattern>
 				<unitPattern count="other">{0} kvadrattommer</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kvadratkilometer</displayName>
-				<unitPattern count="one">{0} kvadratkilometer</unitPattern>
-				<unitPattern count="other">{0} kvadratkilometer</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>kvadratmeter</displayName>
-				<unitPattern count="one">{0} kvadratmeter</unitPattern>
-				<unitPattern count="other">{0} kvadratmeter</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>kvadrat-engelske mil</displayName>
-				<unitPattern count="one">{0} kvadrat-engelsk mil</unitPattern>
-				<unitPattern count="other">{0} kvadrat-engelske mil</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>kvadrat-engelske yard</displayName>
-				<unitPattern count="one">{0} kvadrat engelske yard</unitPattern>
-				<unitPattern count="other">{0} kvadrat engelske yard</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="other">{0} karat</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liter pr. kilometer</displayName>
 				<unitPattern count="one">{0} liter pr. kilometer</unitPattern>
 				<unitPattern count="other">{0} liter pr. kilometer</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>liter pr. 100 kilometer</displayName>
+				<unitPattern count="one">{0} liter pr. 100 kilometer</unitPattern>
+				<unitPattern count="other">{0} liter pr. 100 kilometer</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mil pr. gallon</displayName>
 				<unitPattern count="one">mil pr. gallon</unitPattern>
 				<unitPattern count="other">{0} mil pr. gallon</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabit</displayName>
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="other">{0} gigabit</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabyte</displayName>
-				<unitPattern count="one">{0} gigabyte</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobit</displayName>
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="other">{0} kilobit</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobyte</displayName>
-				<unitPattern count="one">{0} kilobyte</unitPattern>
-				<unitPattern count="other">{0} kilobyte</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabit</displayName>
-				<unitPattern count="one">{0} megabit</unitPattern>
-				<unitPattern count="other">{0} megabit</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabyte</displayName>
-				<unitPattern count="one">{0} megabyte</unitPattern>
-				<unitPattern count="other">{0} megabyte</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabit</displayName>
-				<unitPattern count="one">{0} terabit</unitPattern>
-				<unitPattern count="other">{0} terabit</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabyte</displayName>
 				<unitPattern count="one">{0} terabyte</unitPattern>
 				<unitPattern count="other">{0} terabyte</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabit</displayName>
+				<unitPattern count="one">{0} terabit</unitPattern>
+				<unitPattern count="other">{0} terabit</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabyte</displayName>
+				<unitPattern count="one">{0} gigabyte</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabit</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="other">{0} gigabit</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabyte</displayName>
+				<unitPattern count="one">{0} megabyte</unitPattern>
+				<unitPattern count="other">{0} megabyte</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabit</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="other">{0} megabit</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobyte</displayName>
+				<unitPattern count="one">{0} kilobyte</unitPattern>
+				<unitPattern count="other">{0} kilobyte</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobit</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="other">{0} kilobit</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>århundreder</displayName>
+				<unitPattern count="one">{0} århundrede</unitPattern>
+				<unitPattern count="other">{0} århundreder</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>år</displayName>
+				<unitPattern count="one">{0} år</unitPattern>
+				<unitPattern count="other">{0} år</unitPattern>
+				<perUnitPattern>{0} om året</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>måneder</displayName>
+				<unitPattern count="one">{0} måned</unitPattern>
+				<unitPattern count="other">{0} måneder</unitPattern>
+				<perUnitPattern>{0} pr. måned</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>uger</displayName>
+				<unitPattern count="one">{0} uge</unitPattern>
+				<unitPattern count="other">{0} uger</unitPattern>
+				<perUnitPattern>{0} pr. uge</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>dage</displayName>
 				<unitPattern count="one">{0} dag</unitPattern>
 				<unitPattern count="other">{0} dage</unitPattern>
+				<perUnitPattern>{0} pr. dag</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>timer</displayName>
@@ -6351,30 +6572,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} timer</unitPattern>
 				<perUnitPattern>{0} pr. time</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikrosekunder</displayName>
-				<unitPattern count="one">{0} mikrosekund</unitPattern>
-				<unitPattern count="other">{0} mikrosekunder</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>millisekunder</displayName>
-				<unitPattern count="one">{0} millisekund</unitPattern>
-				<unitPattern count="other">{0} millisekunder</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>minutter</displayName>
 				<unitPattern count="one">{0} minut</unitPattern>
 				<unitPattern count="other">{0} minutter</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>måneder</displayName>
-				<unitPattern count="one">{0} måned</unitPattern>
-				<unitPattern count="other">{0} måneder</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanosekunder</displayName>
-				<unitPattern count="one">{0} nanosekund</unitPattern>
-				<unitPattern count="other">{0} nanosekunder</unitPattern>
+				<perUnitPattern>{0} pr. min.</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sekunder</displayName>
@@ -6382,15 +6584,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} sekunder</unitPattern>
 				<perUnitPattern>{0} pr. sekund</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>uger</displayName>
-				<unitPattern count="one">{0} uge</unitPattern>
-				<unitPattern count="other">{0} uger</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>millisekunder</displayName>
+				<unitPattern count="one">{0} millisekund</unitPattern>
+				<unitPattern count="other">{0} millisekunder</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>år</displayName>
-				<unitPattern count="one">{0} år</unitPattern>
-				<unitPattern count="other">{0} år</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>mikrosekunder</displayName>
+				<unitPattern count="one">{0} mikrosekund</unitPattern>
+				<unitPattern count="other">{0} mikrosekunder</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosekunder</displayName>
+				<unitPattern count="one">{0} nanosekund</unitPattern>
+				<unitPattern count="other">{0} nanosekunder</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ampere</displayName>
@@ -6412,6 +6619,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} volt</unitPattern>
 				<unitPattern count="other">{0} volt</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokalorier</displayName>
+				<unitPattern count="one">{0} kilokalorie</unitPattern>
+				<unitPattern count="other">{0} kilokalorier</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kalorier</displayName>
 				<unitPattern count="one">{0} kalorie</unitPattern>
@@ -6422,21 +6634,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kalorie</unitPattern>
 				<unitPattern count="other">{0} kalorier</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="one">{0} joule</unitPattern>
-				<unitPattern count="other">{0} joule</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokalorier</displayName>
-				<unitPattern count="one">{0} kilokalorie</unitPattern>
-				<unitPattern count="other">{0} kilokalorier</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojoule</displayName>
 				<unitPattern count="one">{0} kilojoule</unitPattern>
 				<unitPattern count="other">{0} kilojoule</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="one">{0} joule</unitPattern>
+				<unitPattern count="other">{0} joule</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilowatt-timer</displayName>
 				<unitPattern count="one">kilowatt-time</unitPattern>
@@ -6447,201 +6654,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} gigahertz</unitPattern>
 				<unitPattern count="other">{0} gigahertz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hertz</displayName>
-				<unitPattern count="one">{0} hertz</unitPattern>
-				<unitPattern count="other">{0} hertz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megahertz</displayName>
+				<unitPattern count="one">{0} megahertz</unitPattern>
+				<unitPattern count="other">{0} megahertz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kilohertz</displayName>
 				<unitPattern count="one">{0} kilohertz</unitPattern>
 				<unitPattern count="other">{0} kilohertz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megahertz</displayName>
-				<unitPattern count="one">{0} megahertz</unitPattern>
-				<unitPattern count="other">{0} megahertz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hertz</displayName>
+				<unitPattern count="one">{0} hertz</unitPattern>
+				<unitPattern count="other">{0} hertz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>astronomiske enheder</displayName>
-				<unitPattern count="one">{0} astronomisk enhed</unitPattern>
-				<unitPattern count="other">{0} astronomiske enheder</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometer</displayName>
+				<unitPattern count="one">{0} kilometer</unitPattern>
+				<unitPattern count="other">{0} kilometer</unitPattern>
+				<perUnitPattern>{0} pr. kilometer</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>centimeter</displayName>
-				<unitPattern count="one">{0} centimeter</unitPattern>
-				<unitPattern count="other">{0} centimeter</unitPattern>
+			<unit type="length-meter">
+				<displayName>meter</displayName>
+				<unitPattern count="one">{0} meter</unitPattern>
+				<unitPattern count="other">{0} meter</unitPattern>
+				<perUnitPattern>{0} pr. meter</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>decimeter</displayName>
 				<unitPattern count="one">{0} decimeter</unitPattern>
 				<unitPattern count="other">{0} decimeter</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>fod</displayName>
-				<unitPattern count="one">{0} fod</unitPattern>
-				<unitPattern count="other">{0} fod</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>tommer</displayName>
-				<unitPattern count="one">{0} tomme</unitPattern>
-				<unitPattern count="other">{0} tommer</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometer</displayName>
-				<unitPattern count="one">{0} kilometer</unitPattern>
-				<unitPattern count="other">{0} kilometer</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>lysår</displayName>
-				<unitPattern count="one">{0} lysår</unitPattern>
-				<unitPattern count="other">{0} lysår</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>meter</displayName>
-				<unitPattern count="one">{0} meter</unitPattern>
-				<unitPattern count="other">{0} meter</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>mikrometer</displayName>
-				<unitPattern count="one">{0} mikrometer</unitPattern>
-				<unitPattern count="other">{0} mikrometer</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>engelske mil</displayName>
-				<unitPattern count="one">{0} engelsk mil</unitPattern>
-				<unitPattern count="other">{0} engelske mil</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>centimeter</displayName>
+				<unitPattern count="one">{0} centimeter</unitPattern>
+				<unitPattern count="other">{0} centimeter</unitPattern>
+				<perUnitPattern>{0} pr. centimeter</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>millimeter</displayName>
 				<unitPattern count="one">{0} millimeter</unitPattern>
 				<unitPattern count="other">{0} millimeter</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikrometer</displayName>
+				<unitPattern count="one">{0} mikrometer</unitPattern>
+				<unitPattern count="other">{0} mikrometer</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanometer</displayName>
 				<unitPattern count="one">{0} nanometer</unitPattern>
 				<unitPattern count="other">{0} nanometer</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>sømil</displayName>
-				<unitPattern count="one">{0} sømil</unitPattern>
-				<unitPattern count="other">{0} sømil</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsec</displayName>
-				<unitPattern count="one">{0} parsec</unitPattern>
-				<unitPattern count="other">{0} parsec</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pikometer</displayName>
 				<unitPattern count="one">{0} pikometer</unitPattern>
 				<unitPattern count="other">{0} pikometer</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>engelske mil</displayName>
+				<unitPattern count="one">{0} engelsk mil</unitPattern>
+				<unitPattern count="other">{0} engelske mil</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>engelske yard</displayName>
 				<unitPattern count="one">{0} engelsk yard</unitPattern>
 				<unitPattern count="other">{0} engelske yard</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>fod</displayName>
+				<unitPattern count="one">{0} fod</unitPattern>
+				<unitPattern count="other">{0} fod</unitPattern>
+				<perUnitPattern>{0} pr. fod</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>tommer</displayName>
+				<unitPattern count="one">{0} tomme</unitPattern>
+				<unitPattern count="other">{0} tommer</unitPattern>
+				<perUnitPattern>{0} pr. tomme</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsec</displayName>
+				<unitPattern count="one">{0} parsec</unitPattern>
+				<unitPattern count="other">{0} parsec</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>lysår</displayName>
+				<unitPattern count="one">{0} lysår</unitPattern>
+				<unitPattern count="other">{0} lysår</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>astronomiske enheder</displayName>
+				<unitPattern count="one">{0} astronomisk enhed</unitPattern>
+				<unitPattern count="other">{0} astronomiske enheder</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>sømil</displayName>
+				<unitPattern count="one">{0} sømil</unitPattern>
+				<unitPattern count="other">{0} sømil</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>svensk mil</displayName>
+				<unitPattern count="one">{0} svensk mil</unitPattern>
+				<unitPattern count="other">{0} svenske mil</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="other">{0} karat</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gram</displayName>
-				<unitPattern count="one">{0} gram</unitPattern>
-				<unitPattern count="other">{0} gram</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogram</displayName>
-				<unitPattern count="one">{0} kilogram</unitPattern>
-				<unitPattern count="other">{0} kilogram</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>tons</displayName>
 				<unitPattern count="one">{0} ton</unitPattern>
 				<unitPattern count="other">{0} tons</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mikrogram</displayName>
-				<unitPattern count="one">{0} mikrogram</unitPattern>
-				<unitPattern count="other">{0} mikrogram</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogram</displayName>
+				<unitPattern count="one">{0} kilogram</unitPattern>
+				<unitPattern count="other">{0} kilogram</unitPattern>
+				<perUnitPattern>{0} pr. kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="one">{0} gram</unitPattern>
+				<unitPattern count="other">{0} gram</unitPattern>
+				<perUnitPattern>{0} pr. gram</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>milligram</displayName>
 				<unitPattern count="one">{0} milligram</unitPattern>
 				<unitPattern count="other">{0} milligram</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ounces</displayName>
-				<unitPattern count="one">{0} ounce</unitPattern>
-				<unitPattern count="other">{0} ounces</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>troy ounces</displayName>
-				<unitPattern count="one">{0} troy ounce</unitPattern>
-				<unitPattern count="other">{0} troy ounces</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>pund</displayName>
-				<unitPattern count="one">{0} pund</unitPattern>
-				<unitPattern count="other">{0} pund</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>mikrogram</displayName>
+				<unitPattern count="one">{0} mikrogram</unitPattern>
+				<unitPattern count="other">{0} mikrogram</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>short ton</displayName>
 				<unitPattern count="one">{0} short ton</unitPattern>
 				<unitPattern count="other">{0} short ton</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>pund</displayName>
+				<unitPattern count="one">{0} pund</unitPattern>
+				<unitPattern count="other">{0} pund</unitPattern>
+				<perUnitPattern>{0} pr. pund</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ounces</displayName>
+				<unitPattern count="one">{0} ounce</unitPattern>
+				<unitPattern count="other">{0} ounces</unitPattern>
+				<perUnitPattern>{0} pr. ounce</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>troy ounces</displayName>
+				<unitPattern count="one">{0} troy ounce</unitPattern>
+				<unitPattern count="other">{0} troy ounces</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="other">{0} karat</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigawatt</displayName>
 				<unitPattern count="one">{0} gigawatt</unitPattern>
 				<unitPattern count="other">{0} gigawatt</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hestekræfter</displayName>
-				<unitPattern count="one">{0} hestekraft</unitPattern>
-				<unitPattern count="other">{0} hestekræfter</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilowatt</displayName>
-				<unitPattern count="one">{0} kilowatt</unitPattern>
-				<unitPattern count="other">{0} kilowatt</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>megawatt</displayName>
 				<unitPattern count="one">{0} megawatt</unitPattern>
 				<unitPattern count="other">{0} megawatt</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>milliwatt</displayName>
-				<unitPattern count="one">{0} milliwatt</unitPattern>
-				<unitPattern count="other">{0} milliwatt</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilowatt</displayName>
+				<unitPattern count="one">{0} kilowatt</unitPattern>
+				<unitPattern count="other">{0} kilowatt</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watt</displayName>
 				<unitPattern count="one">{0} watt</unitPattern>
 				<unitPattern count="other">{0} watt</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>milliwatt</displayName>
+				<unitPattern count="one">{0} milliwatt</unitPattern>
+				<unitPattern count="other">{0} milliwatt</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hestekræfter</displayName>
+				<unitPattern count="one">{0} hestekraft</unitPattern>
+				<unitPattern count="other">{0} hestekræfter</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hektopascal</displayName>
 				<unitPattern count="one">{0} hektopascal</unitPattern>
 				<unitPattern count="other">{0} hektopascal</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>tommer kviksølv</displayName>
-				<unitPattern count="one">{0} tomme kviksølv</unitPattern>
-				<unitPattern count="other">{0} tommer kviksølv</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>millibar</displayName>
-				<unitPattern count="one">{0} millibar</unitPattern>
-				<unitPattern count="other">{0} millibar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>millimeter kviksølv</displayName>
 				<unitPattern count="one">{0} millimeter kviksølv</unitPattern>
@@ -6652,10 +6863,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} pounds pr. kvadrattomme</unitPattern>
 				<unitPattern count="other">{0} pounds pr. kvadrattommer</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="other">{0} karat</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>tommer kviksølv</displayName>
+				<unitPattern count="one">{0} tomme kviksølv</unitPattern>
+				<unitPattern count="other">{0} tommer kviksølv</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>millibar</displayName>
+				<unitPattern count="one">{0} millibar</unitPattern>
+				<unitPattern count="other">{0} millibar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometer i timen</displayName>
@@ -6672,46 +6888,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} engelsk mil i timen</unitPattern>
 				<unitPattern count="other">{0} engelske mil i timen</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>knob</displayName>
+				<unitPattern count="one">{0} knob</unitPattern>
+				<unitPattern count="other">{0} knob</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
-				<displayName draft="contributed">grader celsius</displayName>
-				<unitPattern count="one">{0} grad Celsius</unitPattern>
-				<unitPattern count="other">{0} grader Celsius</unitPattern>
+				<displayName>grader celsius</displayName>
+				<unitPattern count="one">{0} grad celsius</unitPattern>
+				<unitPattern count="other">{0} grader celsius</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
-				<displayName>grader Fahrenheit</displayName>
-				<unitPattern count="one">{0} grad Fahrenheit</unitPattern>
-				<unitPattern count="other">{0} grader Fahrenheit</unitPattern>
+				<displayName>grader fahrenheit</displayName>
+				<unitPattern count="one">{0} grad fahrenheit</unitPattern>
+				<unitPattern count="other">{0} grader fahrenheit</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
 				<displayName>kelvin</displayName>
 				<unitPattern count="one">{0} kelvin</unitPattern>
 				<unitPattern count="other">{0} kelvin</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>acre-fod</displayName>
-				<unitPattern count="one">{0} acre-fod</unitPattern>
-				<unitPattern count="other">{0} acre-fod</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>centiliter</displayName>
-				<unitPattern count="one">{0} centiliter</unitPattern>
-				<unitPattern count="other">{0} centiliter</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>kubikcentimeter</displayName>
-				<unitPattern count="one">{0} kubikcentimeter</unitPattern>
-				<unitPattern count="other">{0} kubikcentimeter</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>kubikfod</displayName>
-				<unitPattern count="one">{0} kubikfod</unitPattern>
-				<unitPattern count="other">{0} kubikfod</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>kubiktommer</displayName>
-				<unitPattern count="one">{0} kubiktomme</unitPattern>
-				<unitPattern count="other">{0} kubiktommer</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kubikkilometer</displayName>
 				<unitPattern count="one">{0} kubikkilometer</unitPattern>
@@ -6721,6 +6922,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>kubikmeter</displayName>
 				<unitPattern count="one">{0} kubikmeter</unitPattern>
 				<unitPattern count="other">{0} kubikmeter</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>kubikcentimeter</displayName>
+				<unitPattern count="one">{0} kubikcentimeter</unitPattern>
+				<unitPattern count="other">{0} kubikcentimeter</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>kubik-engelske mil</displayName>
@@ -6732,25 +6940,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kubik-engelske yard</unitPattern>
 				<unitPattern count="other">{0} kubik-engelske yard</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName draft="contributed">engelske kopper</displayName>
-				<unitPattern count="one" draft="contributed">engelsk kop</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} engelske kopper</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>kubikfod</displayName>
+				<unitPattern count="one">{0} kubikfod</unitPattern>
+				<unitPattern count="other">{0} kubikfod</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>deciliter</displayName>
-				<unitPattern count="one">{0} deciliter</unitPattern>
-				<unitPattern count="other">{0} deciliter</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>kubiktommer</displayName>
+				<unitPattern count="one">{0} kubiktomme</unitPattern>
+				<unitPattern count="other">{0} kubiktommer</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>engelske fluid ounces</displayName>
-				<unitPattern count="one">{0} engelsk fluid ounce</unitPattern>
-				<unitPattern count="other">{0} engelske fluid ounces</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gallons</displayName>
-				<unitPattern count="one">{0} gallon</unitPattern>
-				<unitPattern count="other">{0} gallons</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megaliter</displayName>
+				<unitPattern count="one">{0} megaliter</unitPattern>
+				<unitPattern count="other">{0} megaliter</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hektoliter</displayName>
@@ -6761,27 +6964,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>liter</displayName>
 				<unitPattern count="one">{0} liter</unitPattern>
 				<unitPattern count="other">{0} liter</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megaliter</displayName>
-				<unitPattern count="one">{0} megaliter</unitPattern>
-				<unitPattern count="other">{0} megaliter</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>deciliter</displayName>
+				<unitPattern count="one">{0} deciliter</unitPattern>
+				<unitPattern count="other">{0} deciliter</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centiliter</displayName>
+				<unitPattern count="one">{0} centiliter</unitPattern>
+				<unitPattern count="other">{0} centiliter</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>milliliter</displayName>
 				<unitPattern count="one">{0} milliliter</unitPattern>
 				<unitPattern count="other">{0} milliliter</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pints</displayName>
-				<unitPattern count="one">{0} pint</unitPattern>
-				<unitPattern count="other">{0} pints</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>metrisk pint</displayName>
+				<unitPattern count="one">{0} metrisk pint</unitPattern>
+				<unitPattern count="other">{0} metriske pints</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>metrisk kop</displayName>
+				<unitPattern count="one">{0} metrisk kop</unitPattern>
+				<unitPattern count="other">{0} metriske kopper</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acre-fod</displayName>
+				<unitPattern count="one">{0} acre-fod</unitPattern>
+				<unitPattern count="other">{0} acre-fod</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gallons</displayName>
+				<unitPattern count="one">{0} gallon</unitPattern>
+				<unitPattern count="other">{0} gallons</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>engelske quarts</displayName>
 				<unitPattern count="one">{0} engelsk quart</unitPattern>
 				<unitPattern count="other">{0} engelske quarts</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pints</displayName>
+				<unitPattern count="one">{0} pint</unitPattern>
+				<unitPattern count="other">{0} pints</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cups</displayName>
+				<unitPattern count="one">cup</unitPattern>
+				<unitPattern count="other">{0} cups</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>engelske fluid ounces</displayName>
+				<unitPattern count="one">{0} engelsk fluid ounce</unitPattern>
+				<unitPattern count="other">{0} engelske fluid ounces</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>spiseske</displayName>
 				<unitPattern count="one">{0} spiseske</unitPattern>
@@ -6792,6 +7032,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} teske</unitPattern>
 				<unitPattern count="other">{0} teskeer</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}Ø</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}V</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -6807,6 +7053,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>omdrejning</displayName>
+				<unitPattern count="one">{0} omdrejning</unitPattern>
+				<unitPattern count="other">{0} omdrejninger</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radian</displayName>
+				<unitPattern count="one">{0} radian</unitPattern>
+				<unitPattern count="other">{0} radian</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>grader</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>bueminutter</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
@@ -6817,30 +7078,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>grader</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radian</displayName>
-				<unitPattern count="one">{0} radian</unitPattern>
-				<unitPattern count="other">{0} radian</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>acre</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektar</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acre</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>kvadratfod</displayName>
@@ -6851,91 +7124,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>in²</displayName>
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
 				<unitPattern count="other">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gbit</displayName>
-				<unitPattern count="one">{0} Gbit</unitPattern>
-				<unitPattern count="other">{0} Gbit</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gbit</displayName>
+				<unitPattern count="one">{0} Gbit</unitPattern>
+				<unitPattern count="other">{0} Gbit</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>årh.</displayName>
+				<unitPattern count="one">{0} årh.</unitPattern>
+				<unitPattern count="other">{0} årh.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>år</displayName>
+				<unitPattern count="one">{0} år</unitPattern>
+				<unitPattern count="other">{0} år</unitPattern>
+				<perUnitPattern>{0}/år</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>måneder</displayName>
+				<unitPattern count="one">{0} md.</unitPattern>
+				<unitPattern count="other">{0} mdr.</unitPattern>
+				<perUnitPattern>{0}/md.</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>uger</displayName>
+				<unitPattern count="one">{0} uge</unitPattern>
+				<unitPattern count="other">{0} uger</unitPattern>
+				<perUnitPattern>{0}/uge</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>dage</displayName>
 				<unitPattern count="one">{0} dag</unitPattern>
 				<unitPattern count="other">{0} dage</unitPattern>
+				<perUnitPattern>{0}/dag</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>timer</displayName>
@@ -6943,47 +7231,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} t</unitPattern>
 				<perUnitPattern>{0} /t</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
+			<unit type="duration-minute">
+				<displayName>minutter</displayName>
+				<unitPattern count="one">{0} min.</unitPattern>
+				<unitPattern count="other">{0} min.</unitPattern>
+				<perUnitPattern>{0}/min.</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>sekunder</displayName>
+				<unitPattern count="one">{0} sek.</unitPattern>
+				<unitPattern count="other">{0} sek.</unitPattern>
+				<perUnitPattern>{0}/sek.</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>milisek.</displayName>
 				<unitPattern count="one">{0} ms</unitPattern>
 				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>minutter</displayName>
-				<unitPattern count="one">{0} min</unitPattern>
-				<unitPattern count="other">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>måneder</displayName>
-				<unitPattern count="one">{0} md.</unitPattern>
-				<unitPattern count="other">{0} mdr.</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>ns</displayName>
 				<unitPattern count="one">{0} ns</unitPattern>
 				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>sekunder</displayName>
-				<unitPattern count="one">{0} sek</unitPattern>
-				<unitPattern count="other">{0} sek</unitPattern>
-				<perUnitPattern>{0} /sek</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>uger</displayName>
-				<unitPattern count="one">{0} uge</unitPattern>
-				<unitPattern count="other">{0} uger</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>år</displayName>
-				<unitPattern count="one">{0} år</unitPattern>
-				<unitPattern count="other">{0} år</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>A</displayName>
 				<unitPattern count="one">{0} A</unitPattern>
@@ -7004,6 +7278,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -7014,21 +7293,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Cal</unitPattern>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -7039,201 +7313,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>ae</displayName>
-				<unitPattern count="one">{0} ae</unitPattern>
-				<unitPattern count="other">{0} ae</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>meter</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>fod</displayName>
-				<unitPattern count="one">{0} fod</unitPattern>
-				<unitPattern count="other">{0} fod</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>tommer</displayName>
-				<unitPattern count="one">{0} tomme</unitPattern>
-				<unitPattern count="other">{0} tommer</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>lysår</displayName>
-				<unitPattern count="one">{0} ly</unitPattern>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>meter</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>engelske mil</displayName>
-				<unitPattern count="one">{0} mil</unitPattern>
-				<unitPattern count="other">{0} mil</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="one">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>sømil</displayName>
-				<unitPattern count="one">{0} sm</unitPattern>
-				<unitPattern count="other">{0} sm</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>engelske mil</displayName>
+				<unitPattern count="one">{0} mil</unitPattern>
+				<unitPattern count="other">{0} mil</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>engelske yard</displayName>
 				<unitPattern count="one">{0} yard</unitPattern>
 				<unitPattern count="other">{0} yard</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>fod</displayName>
+				<unitPattern count="one">{0} fod</unitPattern>
+				<unitPattern count="other">{0} fod</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>tommer</displayName>
+				<unitPattern count="one">{0} tomme</unitPattern>
+				<unitPattern count="other">{0} tommer</unitPattern>
+				<perUnitPattern>{0}/tomme</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>lysår</displayName>
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ae</displayName>
+				<unitPattern count="one">{0} ae</unitPattern>
+				<unitPattern count="other">{0} ae</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>sømil</displayName>
+				<unitPattern count="one">{0} sm</unitPattern>
+				<unitPattern count="other">{0} sm</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>kt.</displayName>
-				<unitPattern count="one">{0} kt.</unitPattern>
-				<unitPattern count="other">{0} kt.</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gram</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogram</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogram</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>pund</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tn</displayName>
 				<unitPattern count="one">{0} tn</unitPattern>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>pund</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>kt.</displayName>
+				<unitPattern count="one">{0} kt.</unitPattern>
+				<unitPattern count="other">{0} kt.</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hk</displayName>
-				<unitPattern count="one">{0} hk</unitPattern>
-				<unitPattern count="other">{0} hk</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>W</displayName>
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hk</displayName>
+				<unitPattern count="one">{0} hk</unitPattern>
+				<unitPattern count="other">{0} hk</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName># Hg</displayName>
-				<unitPattern count="one">{0} # Hg</unitPattern>
-				<unitPattern count="other">{0} # Hg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mmHg</displayName>
 				<unitPattern count="one">{0} mmHg</unitPattern>
@@ -7244,10 +7522,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName># Hg</displayName>
+				<unitPattern count="one">{0} # Hg</unitPattern>
+				<unitPattern count="other">{0} # Hg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/t</displayName>
@@ -7264,6 +7547,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mph</unitPattern>
 				<unitPattern count="other">{0} mph</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>knob</displayName>
+				<unitPattern count="one">{0} knob</unitPattern>
+				<unitPattern count="other">{0} knob</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -7279,31 +7572,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -7313,6 +7581,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -7324,25 +7599,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName draft="contributed">engelsk kop</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -7353,27 +7623,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>liter</displayName>
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="one">{0} ML</unitPattern>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
 				<unitPattern count="one">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cups</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>spsk.</displayName>
 				<unitPattern count="one">{0} spsk.</unitPattern>
@@ -7384,6 +7691,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} tsk.</unitPattern>
 				<unitPattern count="other">{0} tsk.</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}Ø</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}V</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -7397,6 +7710,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}m/s²</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}m/s²</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -7405,26 +7722,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0}ac</unitPattern>
-				<unitPattern count="other">{0}ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0}km²</unitPattern>
+				<unitPattern count="other">{0}km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0}ha</unitPattern>
 				<unitPattern count="other">{0}ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0}km²</unitPattern>
-				<unitPattern count="other">{0}km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0}m²</unitPattern>
 				<unitPattern count="other">{0}m²</unitPattern>
@@ -7433,66 +7738,120 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
-			<unit type="duration-day">
-				<displayName>dag</displayName>
-				<unitPattern count="one">{0} d</unitPattern>
-				<unitPattern count="other">{0} d</unitPattern>
+			<unit type="area-acre">
+				<unitPattern count="one">{0}ac</unitPattern>
+				<unitPattern count="other">{0}ac</unitPattern>
 			</unit>
-			<unit type="duration-hour">
-				<displayName>time</displayName>
-				<unitPattern count="one">{0} t</unitPattern>
-				<unitPattern count="other">{0} t</unitPattern>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<unitPattern count="one" draft="unconfirmed">{0}μs</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}μs</unitPattern>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
+			<unit type="duration-century">
+				<displayName draft="unconfirmed">årh.</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} årh.</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} årh.</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>min</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} min</unitPattern>
+			<unit type="duration-year">
+				<displayName>år</displayName>
+				<unitPattern count="one">{0} år</unitPattern>
+				<unitPattern count="other">{0} år</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/år</perUnitPattern>
 			</unit>
 			<unit type="duration-month">
 				<displayName>måned</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="duration-nanosecond">
-				<unitPattern count="one" draft="unconfirmed">{0}ns</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}ns</unitPattern>
+			<unit type="duration-week">
+				<displayName>uge</displayName>
+				<unitPattern count="one">{0} u</unitPattern>
+				<unitPattern count="other">{0} u</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/u</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>dag</displayName>
+				<unitPattern count="one">{0} d</unitPattern>
+				<unitPattern count="other">{0} d</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/d</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>time</displayName>
+				<unitPattern count="one">{0} t</unitPattern>
+				<unitPattern count="other">{0} t</unitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>min</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} min</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sek</displayName>
 				<unitPattern count="one">{0} s</unitPattern>
 				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>uge</displayName>
-				<unitPattern count="one">{0} u</unitPattern>
-				<unitPattern count="other">{0} u</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>år</displayName>
-				<unitPattern count="one">{0} år</unitPattern>
-				<unitPattern count="other">{0} år</unitPattern>
+			<unit type="duration-microsecond">
+				<unitPattern count="one" draft="unconfirmed">{0}μs</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}μs</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<unitPattern count="one" draft="unconfirmed">{0} ae</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ae</unitPattern>
+			<unit type="duration-nanosecond">
+				<unitPattern count="one" draft="unconfirmed">{0}ns</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}ns</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>meter</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/m</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<unitPattern count="one" draft="unconfirmed">{0}dm</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}dm</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
 				<displayName>cm</displayName>
 				<unitPattern count="one">{0} cm</unitPattern>
 				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
-			<unit type="length-decimeter">
-				<unitPattern count="one" draft="unconfirmed">{0}dm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}dm</unitPattern>
+			<unit type="length-millimeter">
+				<displayName>mm</displayName>
+				<unitPattern count="one">{0} mm</unitPattern>
+				<unitPattern count="other">{0} mm</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<unitPattern count="one" draft="unconfirmed">{0}μm</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}μm</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<unitPattern count="one" draft="unconfirmed">{0}nm</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}nm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<unitPattern count="one">{0}pm</unitPattern>
+				<unitPattern count="other">{0}pm</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} mil</unitPattern>
+				<unitPattern count="other">{0} mil</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<unitPattern count="one">{0} yard</unitPattern>
+				<unitPattern count="other">{0} yard</unitPattern>
 			</unit>
 			<unit type="length-foot">
 				<unitPattern count="one">{0} fod</unitPattern>
@@ -7502,86 +7861,56 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}&quot;</unitPattern>
 				<unitPattern count="other">{0}&quot;</unitPattern>
 			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
+			<unit type="length-parsec">
+				<unitPattern count="one" draft="unconfirmed">{0} pc</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} pc</unitPattern>
 			</unit>
 			<unit type="length-light-year">
 				<unitPattern count="one">{0} lysår</unitPattern>
 				<unitPattern count="other">{0} lysår</unitPattern>
 			</unit>
-			<unit type="length-meter">
-				<displayName draft="contributed">m</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<unitPattern count="one" draft="unconfirmed">{0}μm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}μm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} mil</unitPattern>
-				<unitPattern count="other">{0} mil</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>mm</displayName>
-				<unitPattern count="one">{0} mm</unitPattern>
-				<unitPattern count="other">{0} mm</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<unitPattern count="one" draft="unconfirmed">{0}nm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}nm</unitPattern>
+			<unit type="length-astronomical-unit">
+				<unitPattern count="one" draft="unconfirmed">{0} ae</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} ae</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
 				<unitPattern count="one" draft="unconfirmed">{0} sømil</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} sømil</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<unitPattern count="one" draft="unconfirmed">{0} pc</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} pc</unitPattern>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="unconfirmed">sv. mil</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}sv.mil</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}sv.mil</unitPattern>
 			</unit>
-			<unit type="length-picometer">
-				<unitPattern count="one">{0}pm</unitPattern>
-				<unitPattern count="other">{0}pm</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<unitPattern count="one">{0} yard</unitPattern>
-				<unitPattern count="other">{0} yard</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="mass-metric-ton">
+				<unitPattern count="one" draft="unconfirmed">{0}t</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}t</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="one">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-metric-ton">
-				<unitPattern count="one" draft="unconfirmed">{0}t</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}t</unitPattern>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<unitPattern count="one" draft="unconfirmed">{0}mg</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} unse</unitPattern>
-				<unitPattern count="other">{0} unser</unitPattern>
+			<unit type="mass-ton">
+				<unitPattern count="one">{0} tn</unitPattern>
+				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} pund</unitPattern>
 				<unitPattern count="other">{0} pund</unitPattern>
 			</unit>
-			<unit type="mass-ton">
-				<unitPattern count="one">{0} tn</unitPattern>
-				<unitPattern count="other">{0} tn</unitPattern>
-			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0}hk</unitPattern>
-				<unitPattern count="other">{0}hk</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} unse</unitPattern>
+				<unitPattern count="other">{0} unser</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0}kW</unitPattern>
@@ -7591,10 +7920,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}W</unitPattern>
 				<unitPattern count="other">{0}W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0}hk</unitPattern>
+				<unitPattern count="other">{0}hk</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0}hPa</unitPattern>
 				<unitPattern count="other">{0}hPa</unitPattern>
 			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<unitPattern count="one" draft="unconfirmed">{0}mm Hg</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}mm Hg</unitPattern>
+			</unit>
 			<unit type="pressure-inch-hg">
 				<unitPattern count="one">{0}&quot; Hg</unitPattern>
 				<unitPattern count="other">{0}&quot; Hg</unitPattern>
@@ -7603,10 +7940,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}mbar</unitPattern>
 				<unitPattern count="other">{0}mbar</unitPattern>
 			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<unitPattern count="one" draft="unconfirmed">{0}mm Hg</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}mm Hg</unitPattern>
-			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/t</displayName>
 				<unitPattern count="one">{0} km/t</unitPattern>
@@ -7620,6 +7953,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mph</unitPattern>
 				<unitPattern count="other">{0} mph</unitPattern>
 			</unit>
+			<unit type="temperature-generic">
+				<displayName draft="unconfirmed">°</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}°</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -7633,10 +7971,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}K</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}K</unitPattern>
 			</unit>
+			<unit type="volume-cubic-kilometer">
+				<unitPattern count="one">{0}km³</unitPattern>
+				<unitPattern count="other">{0}km³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<unitPattern count="one" draft="unconfirmed">{0}m³</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}m³</unitPattern>
+			</unit>
 			<unit type="volume-cubic-centimeter">
 				<unitPattern count="one" draft="unconfirmed">{0}cm³</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}cm³</unitPattern>
 			</unit>
+			<unit type="volume-cubic-mile">
+				<unitPattern count="one">{0} mi³</unitPattern>
+				<unitPattern count="other">{0} mi³</unitPattern>
+			</unit>
 			<unit type="volume-cubic-foot">
 				<unitPattern count="one" draft="unconfirmed">{0} fod³</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} fod³</unitPattern>
@@ -7645,21 +7995,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} in³</unitPattern>
 				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-cubic-kilometer">
-				<unitPattern count="one">{0}km³</unitPattern>
-				<unitPattern count="other">{0}km³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-meter">
-				<unitPattern count="one" draft="unconfirmed">{0}m³</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}m³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<unitPattern count="one">{0} mi³</unitPattern>
-				<unitPattern count="other">{0} mi³</unitPattern>
-			</unit>
-			<unit type="volume-deciliter">
-				<unitPattern count="one" draft="unconfirmed">{0}dL</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}dL</unitPattern>
+			<unit type="volume-megaliter">
+				<unitPattern count="one" draft="unconfirmed">{0}ML</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<unitPattern count="one" draft="unconfirmed">{0}hL</unitPattern>
@@ -7670,9 +8008,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<unitPattern count="one" draft="unconfirmed">{0}ML</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}ML</unitPattern>
+			<unit type="volume-deciliter">
+				<unitPattern count="one" draft="unconfirmed">{0}dL</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}dL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<unitPattern count="one" draft="unconfirmed">{0}mL</unitPattern>
@@ -7686,6 +8024,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} tsk</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} tsk</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}Ø</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}V</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h.mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/da_DK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/da_DK.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/da_DK.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/da_DK.xml
index 1ba0a43d198..55aa2728045 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/da_DK.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/da_DK.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="da"/>
 		<territory type="DK"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/da_GL.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/da_GL.xml
new file mode 100644
index 00000000000..01443f47439
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/da_GL.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="da"/>
+		<territory type="GL"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>h.mm.ss a zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>h.mm.ss a z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>h.mm.ss a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>h.mm a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dav.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dav.xml
similarity index 94%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dav.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dav.xml
index 5553c12dfd0..c88be1918a3 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dav.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dav.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="dav"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antili za Uholanzi</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Ajentina</territory>
 			<territory type="AS">Samoa ya Marekani</territory>
@@ -450,6 +448,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">Luma lwa K</dayPeriod>
+							<dayPeriod type="pm">luma lwa p</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">Luma lwa K</dayPeriod>
 							<dayPeriod type="pm">luma lwa p</dayPeriod>
@@ -491,22 +493,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -585,6 +587,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -762,3 +780,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dav_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dav_KE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dav_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dav_KE.xml
index 0a5b3e8c756..7d8dee68c11 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dav_KE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dav_KE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="dav"/>
 		<territory type="KE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/de.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/de.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de.xml
index ca114b2786e..7ab857d9e83 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/de.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11304 $"/>
-		<generation date="$Date: 2015-02-24 11:35:18 -0600 (Tue, 24 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="de"/>
 	</identity>
 	<localeDisplayNames>
@@ -31,7 +30,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ain">Ainu-Sprache</language>
 			<language type="ak">Akan</language>
 			<language type="akk">Akkadisch</language>
-			<language type="akz" draft="contributed">Alabama</language>
+			<language type="akz">Alabama</language>
 			<language type="ale">Aleutisch</language>
 			<language type="aln" draft="contributed">Gegisch</language>
 			<language type="alt">Süd-Altaisch</language>
@@ -42,16 +41,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ar">Arabisch</language>
 			<language type="ar_001">Modernes Hocharabisch</language>
 			<language type="arc">Aramäisch</language>
-			<language type="arn">Araukanisch</language>
-			<language type="aro" draft="contributed">Araona</language>
+			<language type="arn">Mapudungun</language>
+			<language type="aro">Araona</language>
 			<language type="arp">Arapaho-Sprache</language>
-			<language type="arq" draft="contributed">Algerisches Arabisch</language>
+			<language type="arq">Algerisches Arabisch</language>
 			<language type="arw">Arawak-Sprache</language>
 			<language type="ary" draft="contributed">Marokkanisches Arabisch</language>
 			<language type="arz" draft="contributed">Ägyptisches Arabisch</language>
 			<language type="as">Assamesisch</language>
 			<language type="asa">Pare</language>
-			<language type="ase" draft="contributed">Amerikanische Gebärdensprache</language>
+			<language type="ase">Amerikanische Gebärdensprache</language>
 			<language type="ast">Asturianisch</language>
 			<language type="av">Awarisch</language>
 			<language type="avk" draft="contributed">Kotava</language>
@@ -59,50 +58,50 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ay">Aymara</language>
 			<language type="az">Aserbaidschanisch</language>
 			<language type="az" alt="short">Aserbaidschanisch</language>
-			<language type="azb" draft="contributed">Südaserbaidschanisch</language>
 			<language type="ba">Baschkirisch</language>
 			<language type="bal">Belutschisch</language>
 			<language type="ban">Balinesisch</language>
-			<language type="bar" draft="contributed">Bairisch</language>
+			<language type="bar">Bairisch</language>
 			<language type="bas">Basaa-Sprache</language>
-			<language type="bax" draft="contributed">Bamun</language>
-			<language type="bbc" draft="contributed">Batak Toba</language>
+			<language type="bax">Bamun</language>
+			<language type="bbc">Batak Toba</language>
 			<language type="bbj" draft="contributed">Ghomala</language>
 			<language type="be">Weißrussisch</language>
 			<language type="bej">Bedauye</language>
-			<language type="bem">Bemba-Sprache</language>
-			<language type="bew" draft="contributed">Betawi</language>
+			<language type="bem">Bemba</language>
+			<language type="bew">Betawi</language>
 			<language type="bez">Bena</language>
-			<language type="bfd" draft="contributed">Bafut</language>
-			<language type="bfq" draft="contributed">Badaga</language>
+			<language type="bfd">Bafut</language>
+			<language type="bfq">Badaga</language>
 			<language type="bg">Bulgarisch</language>
+			<language type="bgn">Westliches Belutschi</language>
 			<language type="bho">Bhodschpuri</language>
 			<language type="bi">Bislama</language>
 			<language type="bik">Bikol-Sprache</language>
 			<language type="bin">Bini-Sprache</language>
-			<language type="bjn" draft="contributed">Banjaresisch</language>
+			<language type="bjn">Banjaresisch</language>
 			<language type="bkm" draft="contributed">Kom</language>
 			<language type="bla">Blackfoot-Sprache</language>
-			<language type="bm">Bambara-Sprache</language>
+			<language type="bm">Bambara</language>
 			<language type="bn">Bengalisch</language>
 			<language type="bo">Tibetisch</language>
-			<language type="bpy" draft="contributed">Bishnupriya</language>
-			<language type="bqi" draft="contributed">Bachtiarisch</language>
+			<language type="bpy">Bishnupriya</language>
+			<language type="bqi">Bachtiarisch</language>
 			<language type="br">Bretonisch</language>
 			<language type="bra">Braj-Bhakha</language>
-			<language type="brh" draft="contributed">Brahui</language>
+			<language type="brh">Brahui</language>
 			<language type="brx">Bodo</language>
 			<language type="bs">Bosnisch</language>
-			<language type="bss" draft="contributed">Akoose</language>
+			<language type="bss">Akoose</language>
 			<language type="bua">Burjatisch</language>
 			<language type="bug">Buginesisch</language>
-			<language type="bum" draft="contributed">Bulu</language>
+			<language type="bum">Bulu</language>
 			<language type="byn">Blin</language>
 			<language type="byv" draft="contributed">Medumba</language>
 			<language type="ca">Katalanisch</language>
 			<language type="cad">Caddo</language>
 			<language type="car">Karibisch</language>
-			<language type="cay" draft="contributed">Cayuga</language>
+			<language type="cay">Cayuga</language>
 			<language type="cch">Atsam</language>
 			<language type="ce">Tschetschenisch</language>
 			<language type="ceb">Cebuano</language>
@@ -117,10 +116,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="chp">Chipewyan</language>
 			<language type="chr">Cherokee</language>
 			<language type="chy">Cheyenne</language>
-			<language type="ckb">Sorani</language>
+			<language type="ckb">Zentralkurdisch</language>
 			<language type="co">Korsisch</language>
 			<language type="cop">Koptisch</language>
-			<language type="cps" draft="contributed">Capiznon</language>
+			<language type="cps">Capiznon</language>
 			<language type="cr">Cree</language>
 			<language type="crh">Krimtatarisch</language>
 			<language type="cs">Tschechisch</language>
@@ -142,14 +141,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="dje">Zarma</language>
 			<language type="doi">Dogri</language>
 			<language type="dsb">Niedersorbisch</language>
-			<language type="dtp" draft="contributed">Zentral-Dusun</language>
+			<language type="dtp">Zentral-Dusun</language>
 			<language type="dua">Duala</language>
 			<language type="dum">Mittelniederländisch</language>
 			<language type="dv">Maledivisch</language>
 			<language type="dyo">Diola</language>
 			<language type="dyu">Dyula-Sprache</language>
-			<language type="dz">Bhutanisch</language>
-			<language type="dzg" draft="contributed">Dazaga</language>
+			<language type="dz">Dzongkha</language>
+			<language type="dzg">Dazaga</language>
 			<language type="ebu">Embu</language>
 			<language type="ee">Ewe</language>
 			<language type="efi">Efik</language>
@@ -171,7 +170,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="es_419">Lateinamerikanisches Spanisch</language>
 			<language type="es_ES">Europäisches Spanisch</language>
 			<language type="es_MX">Mexikanisches Spanisch</language>
-			<language type="esu" draft="contributed">Zentral-Alaska-Yupik</language>
+			<language type="esu">Zentral-Alaska-Yupik</language>
 			<language type="et">Estnisch</language>
 			<language type="eu">Baskisch</language>
 			<language type="ewo">Ewondo</language>
@@ -189,10 +188,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="fr">Französisch</language>
 			<language type="fr_CA">Kanadisches Französisch</language>
 			<language type="fr_CH">Schweizer Französisch</language>
-			<language type="frc" draft="contributed">Cajun</language>
+			<language type="frc">Cajun</language>
 			<language type="frm">Mittelfranzösisch</language>
 			<language type="fro">Altfranzösisch</language>
-			<language type="frp" draft="contributed">Frankoprovenzalisch</language>
+			<language type="frp">Frankoprovenzalisch</language>
 			<language type="frr">Nordfriesisch</language>
 			<language type="frs">Ostfriesisch</language>
 			<language type="fur">Friulisch</language>
@@ -225,7 +224,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="guz">Gusii</language>
 			<language type="gv">Manx</language>
 			<language type="gwi">Kutchin-Sprache</language>
-			<language type="ha">Hausa</language>
+			<language type="ha">Haussa</language>
 			<language type="hai">Haida-Sprache</language>
 			<language type="hak" draft="contributed">Hakka</language>
 			<language type="haw">Hawaiisch</language>
@@ -239,7 +238,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="hr">Kroatisch</language>
 			<language type="hsb">Obersorbisch</language>
 			<language type="hsn" draft="contributed">Xiang</language>
-			<language type="ht">Haitianisch</language>
+			<language type="ht">Haiti-Kreolisch</language>
 			<language type="hu">Ungarisch</language>
 			<language type="hup">Hupa</language>
 			<language type="hy">Armenisch</language>
@@ -266,7 +265,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="jmc">Machame</language>
 			<language type="jpr">Jüdisch-Persisch</language>
 			<language type="jrb">Jüdisch-Arabisch</language>
-			<language type="jut" draft="contributed">Jütisch</language>
+			<language type="jut">Jütisch</language>
 			<language type="jv">Javanisch</language>
 			<language type="ka">Georgisch</language>
 			<language type="kaa">Karakalpakisch</language>
@@ -295,7 +294,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="kkj" draft="contributed">Kako</language>
 			<language type="kl">Grönländisch</language>
 			<language type="kln">Kalenjin</language>
-			<language type="km">Kambodschanisch</language>
+			<language type="km">Khmer</language>
 			<language type="kmb">Kimbundu-Sprache</language>
 			<language type="kn">Kannada</language>
 			<language type="ko">Koreanisch</language>
@@ -309,10 +308,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="krj" draft="contributed">Kinaray-a</language>
 			<language type="krl">Karelisch</language>
 			<language type="kru">Oraon-Sprache</language>
-			<language type="ks">Kaschmirisch</language>
+			<language type="ks">Kaschmiri</language>
 			<language type="ksb">Shambala</language>
 			<language type="ksf">Bafia</language>
-			<language type="ksh" draft="contributed">Kölsch</language>
+			<language type="ksh">Kölsch</language>
 			<language type="ku">Kurdisch</language>
 			<language type="kum">Kumükisch</language>
 			<language type="kut">Kutenai-Sprache</language>
@@ -337,6 +336,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">Laotisch</language>
 			<language type="lol">Mongo</language>
 			<language type="loz">Rotse-Sprache</language>
+			<language type="lrc">Nördliches Luri</language>
 			<language type="lt">Litauisch</language>
 			<language type="ltg" draft="contributed">Lettgallisch</language>
 			<language type="lu">Luba-Katanga</language>
@@ -350,13 +350,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lzh" draft="contributed">Klassisches Chinesisch</language>
 			<language type="lzz" draft="contributed">Lasisch</language>
 			<language type="mad">Maduresisch</language>
-			<language type="maf" draft="contributed">Mafa</language>
+			<language type="maf">Mafa</language>
 			<language type="mag">Khotta</language>
 			<language type="mai">Maithili</language>
 			<language type="mak">Makassarisch</language>
 			<language type="man">Manding-Sprache</language>
-			<language type="mas">Massai-Sprache</language>
-			<language type="mde" draft="contributed">Maba</language>
+			<language type="mas">Massai</language>
+			<language type="mde">Maba</language>
 			<language type="mdf">Moksha</language>
 			<language type="mdr">Mandaresisch</language>
 			<language type="men">Mende-Sprache</language>
@@ -390,20 +390,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="my">Birmanisch</language>
 			<language type="mye" draft="contributed">Myene</language>
 			<language type="myv">Ersja-Mordwinisch</language>
-			<language type="mzn" draft="contributed">Masanderanisch</language>
+			<language type="mzn">Masanderanisch</language>
 			<language type="na">Nauruisch</language>
 			<language type="nan" draft="contributed">Min Nan</language>
 			<language type="nap">Neapolitanisch</language>
 			<language type="naq">Nama</language>
 			<language type="nb">Norwegisch Bokmål</language>
-			<language type="nd">Nord-Ndebele-Sprache</language>
+			<language type="nd">Nord-Ndebele</language>
 			<language type="nds">Niederdeutsch</language>
+			<language type="nds_NL">Niedersächsisch</language>
 			<language type="ne">Nepalesisch</language>
 			<language type="new">Newari</language>
 			<language type="ng">Ndonga</language>
 			<language type="nia">Nias-Sprache</language>
 			<language type="niu">Niue-Sprache</language>
-			<language type="njo" draft="contributed">Ao-Naga</language>
+			<language type="njo">Ao-Naga</language>
 			<language type="nl">Niederländisch</language>
 			<language type="nl_BE">Flämisch</language>
 			<language type="nmg">Kwasio</language>
@@ -431,7 +432,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="os">Ossetisch</language>
 			<language type="osa">Osage-Sprache</language>
 			<language type="ota">Osmanisch</language>
-			<language type="pa">Panjabi</language>
+			<language type="pa">Punjabi</language>
 			<language type="pag">Pangasinan-Sprache</language>
 			<language type="pal">Mittelpersisch</language>
 			<language type="pam">Pampanggan-Sprache</language>
@@ -455,15 +456,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="pt_BR">Brasilianisches Portugiesisch</language>
 			<language type="pt_PT">Europäisches Portugiesisch</language>
 			<language type="qu">Quechua</language>
-			<language type="quc" draft="contributed">K’iche’</language>
-			<language type="qug" draft="contributed">Chimborazo Hochland-Quechua</language>
+			<language type="quc">K’iche’</language>
+			<language type="qug">Chimborazo Hochland-Quechua</language>
 			<language type="raj">Rajasthani</language>
 			<language type="rap">Osterinsel-Sprache</language>
 			<language type="rar">Rarotonganisch</language>
 			<language type="rgn" draft="contributed">Romagnol</language>
 			<language type="rif" draft="contributed">Tarifit</language>
 			<language type="rm">Rätoromanisch</language>
-			<language type="rn">Rundi-Sprache</language>
+			<language type="rn">Rundi</language>
 			<language type="ro">Rumänisch</language>
 			<language type="ro_MD">Moldauisch</language>
 			<language type="rof">Rombo</language>
@@ -474,7 +475,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="rue" draft="contributed">Russinisch</language>
 			<language type="rug" draft="contributed">Roviana</language>
 			<language type="rup">Aromunisch</language>
-			<language type="rw">Ruandisch</language>
+			<language type="rw">Kinyarwanda</language>
 			<language type="rwk">Rwa</language>
 			<language type="sa">Sanskrit</language>
 			<language type="sad">Sandawe-Sprache</language>
@@ -491,7 +492,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sco">Schottisch</language>
 			<language type="sd">Sindhi</language>
 			<language type="sdc" draft="contributed">Sassarisch</language>
-			<language type="se">Nord-Samisch</language>
+			<language type="sdh">Südkurdisch</language>
+			<language type="se">Nordsamisch</language>
 			<language type="see" draft="contributed">Seneca</language>
 			<language type="seh">Sena</language>
 			<language type="sei" draft="contributed">Seri</language>
@@ -503,7 +505,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sh">Serbo-Kroatisch</language>
 			<language type="shi">Taschelhit</language>
 			<language type="shn">Schan-Sprache</language>
-			<language type="shu" draft="contributed">Tschadisch-Arabisch</language>
+			<language type="shu">Tschadisch-Arabisch</language>
 			<language type="si">Singhalesisch</language>
 			<language type="sid">Sidamo</language>
 			<language type="sk">Slowakisch</language>
@@ -511,10 +513,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sli" draft="contributed">Schlesisch</language>
 			<language type="sly" draft="contributed">Selayar</language>
 			<language type="sm">Samoanisch</language>
-			<language type="sma">Süd-Samisch</language>
-			<language type="smj">Lule-Lappisch</language>
-			<language type="smn">Inari-Lappisch</language>
-			<language type="sms">Skolt-Lappisch</language>
+			<language type="sma">Südsamisch</language>
+			<language type="smj">Lule-Samisch</language>
+			<language type="smn">Inari-Samisch</language>
+			<language type="sms">Skolt-Samisch</language>
 			<language type="sn">Shona</language>
 			<language type="snk">Soninke-Sprache</language>
 			<language type="so">Somali</language>
@@ -533,12 +535,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">Sumerisch</language>
 			<language type="sv">Schwedisch</language>
 			<language type="sw">Suaheli</language>
+			<language type="sw_CD">Kongo-Suaheli</language>
 			<language type="swb">Komorisch</language>
-			<language type="swc">Kongo-Suaheli</language>
 			<language type="syc">Altsyrisch</language>
 			<language type="syr">Syrisch</language>
 			<language type="szl" draft="contributed">Schlesisch (Polen)</language>
-			<language type="ta">Tamilisch</language>
+			<language type="ta">Tamil</language>
 			<language type="tcy" draft="contributed">Tulu</language>
 			<language type="te">Telugu</language>
 			<language type="tem">Temne</language>
@@ -547,7 +549,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="tet">Tetum-Sprache</language>
 			<language type="tg">Tadschikisch</language>
 			<language type="th">Thailändisch</language>
-			<language type="ti">Tigrinja</language>
+			<language type="ti">Tigrinya</language>
 			<language type="tig">Tigre</language>
 			<language type="tiv">Tiv-Sprache</language>
 			<language type="tk">Turkmenisch</language>
@@ -591,7 +593,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="vep" draft="contributed">Wepsisch</language>
 			<language type="vi">Vietnamesisch</language>
 			<language type="vls" draft="contributed">Westflämisch</language>
-			<language type="vmf" draft="contributed">Mainfränkisch</language>
+			<language type="vmf">Mainfränkisch</language>
 			<language type="vo">Volapük</language>
 			<language type="vot">Wotisch</language>
 			<language type="vro" draft="contributed">Võro</language>
@@ -601,6 +603,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">Walamo-Sprache</language>
 			<language type="war">Waray</language>
 			<language type="was">Washo-Sprache</language>
+			<language type="wbp">Warlpiri</language>
 			<language type="wo">Wolof</language>
 			<language type="wuu" draft="contributed">Wu</language>
 			<language type="xal">Kalmückisch</language>
@@ -837,7 +840,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albanien</territory>
 			<territory type="AM">Armenien</territory>
-			<territory type="AN">Niederländische Antillen</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antarktis</territory>
 			<territory type="AR">Argentinien</territory>
@@ -916,7 +918,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="FR">Frankreich</territory>
 			<territory type="GA">Gabun</territory>
 			<territory type="GB">Vereinigtes Königreich</territory>
-			<territory type="GB" alt="short">UK</territory>
+			<territory type="GB" alt="short">GB</territory>
 			<territory type="GD">Grenada</territory>
 			<territory type="GE">Georgien</territory>
 			<territory type="GF">Französisch-Guayana</territory>
@@ -936,7 +938,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GY">Guyana</territory>
 			<territory type="HK">Sonderverwaltungszone Hongkong</territory>
 			<territory type="HK" alt="short">Hongkong</territory>
-			<territory type="HM">Heard- und McDonald-Inseln</territory>
+			<territory type="HM">Heard und McDonaldinseln</territory>
 			<territory type="HN">Honduras</territory>
 			<territory type="HR">Kroatien</territory>
 			<territory type="HT">Haiti</territory>
@@ -1079,7 +1081,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="TZ">Tansania</territory>
 			<territory type="UA">Ukraine</territory>
 			<territory type="UG">Uganda</territory>
-			<territory type="UM">Amerikanisch-Ozeanien</territory>
+			<territory type="UM">Amerikanische Überseeinseln</territory>
 			<territory type="US">Vereinigte Staaten</territory>
 			<territory type="US" alt="short">USA</territory>
 			<territory type="UY">Uruguay</territory>
@@ -1148,6 +1150,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">Sortierung nach Zahlen</key>
 			<key type="colStrength" draft="contributed">Sortierstärke</key>
 			<key type="currency">Währung</key>
+			<key type="hc">Stundenzählung (12 vs. 24)</key>
+			<key type="lb">Zeilenumbruchstil</key>
+			<key type="ms">Maßsystem</key>
 			<key type="numbers">Zahlen</key>
 			<key type="timezone" draft="contributed">Zeitzone</key>
 			<key type="va" draft="contributed">Lokale Variante</key>
@@ -1155,120 +1160,130 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">Privatnutzung</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Arabisch-indische Ziffern</type>
-			<type type="arabext" key="numbers">Erweiterte arabisch-indische Ziffern</type>
-			<type type="armn" key="numbers">Armenische Ziffern</type>
-			<type type="armnlow" key="numbers">Armenische Ziffern in Kleinschrift</type>
-			<type type="bali" key="numbers" draft="contributed">Balinesische Ziffern</type>
-			<type type="beng" key="numbers">Bengalische Ziffern</type>
-			<type type="big5han" key="collation">Traditionelles Chinesisch - Big5</type>
-			<type type="brah" key="numbers" draft="contributed">Brahmi-Ziffern</type>
-			<type type="buddhist" key="calendar">Buddhistischer Kalender</type>
-			<type type="cakm" key="numbers" draft="contributed">Chakma-Ziffern</type>
-			<type type="cham" key="numbers" draft="contributed">Cham-Ziffern</type>
-			<type type="chinese" key="calendar">Chinesischer Kalender</type>
-			<type type="coptic" key="calendar">Koptischer Kalender</type>
-			<type type="dangi" key="calendar">Dangi Kalender</type>
-			<type type="deva" key="numbers">Devanagari-Ziffern</type>
-			<type type="dictionary" key="collation">Lexikographische Sortierreihenfolge</type>
-			<type type="ducet" key="collation">Unicode-Sortierung</type>
-			<type type="eor" key="collation" draft="contributed">Europäische Sortierregeln</type>
-			<type type="ethi" key="numbers">Äthiopische Ziffern</type>
-			<type type="ethiopic" key="calendar">Äthiopischer Kalender</type>
-			<type type="ethiopic-amete-alem" key="calendar">Äthiopischer Kalender &quot;Amete Alem&quot;</type>
-			<type type="finance" key="numbers" draft="contributed">Finanzzahlen</type>
-			<type type="fullwide" key="numbers">Vollbreite Ziffern</type>
-			<type type="gb2312han" key="collation">Vereinfachtes Chinesisch - GB2312</type>
-			<type type="geor" key="numbers">Georgische Ziffern</type>
-			<type type="gregorian" key="calendar">Gregorianischer Kalender</type>
-			<type type="grek" key="numbers">Griechische Ziffern</type>
-			<type type="greklow" key="numbers">Griechische Ziffern in Kleinschrift</type>
-			<type type="gujr" key="numbers">Gujarati-Ziffern</type>
-			<type type="guru" key="numbers">Gurmukhi-Ziffern</type>
-			<type type="hanidec" key="numbers">Chinesische Dezimalzahlen</type>
-			<type type="hans" key="numbers">Vereinfacht-chinesische Ziffern</type>
-			<type type="hansfin" key="numbers">Vereinfacht-chinesische Finanzziffern</type>
-			<type type="hant" key="numbers">Traditionell-chinesische Ziffern</type>
-			<type type="hantfin" key="numbers">Traditionell-chinesische Finanzziffern</type>
-			<type type="hebr" key="numbers">Hebräische Ziffern</type>
-			<type type="hebrew" key="calendar">Hebräischer Kalender</type>
-			<type type="identical" key="colStrength" draft="contributed">Alle sortieren</type>
-			<type type="indian" key="calendar">Indischer Nationalkalender</type>
-			<type type="islamic" key="calendar">Islamischer Kalender</type>
-			<type type="islamic-civil" key="calendar">Bürgerlicher islamischer Kalender</type>
-			<type type="islamic-rgsa" key="calendar" draft="contributed">Islamischer Kalender (Saudi-Arabien, Beobachtung)</type>
-			<type type="islamic-tbla" key="calendar" draft="contributed">Islamischer Kalender (tabellarisch, astronomische Epoche)</type>
-			<type type="islamic-umalqura" key="calendar" draft="contributed">Islamischer Kalender (Umm al-Qura</type>
-			<type type="iso8601" key="calendar">ISO-8601-Kalender</type>
-			<type type="japanese" key="calendar">Japanischer Kalender</type>
-			<type type="java" key="numbers" draft="contributed">Javanesische Ziffern</type>
-			<type type="jpan" key="numbers">Japanische Ziffern</type>
-			<type type="jpanfin" key="numbers">Japanische Finanzziffern</type>
-			<type type="kali" key="numbers" draft="contributed">Kayah-Li-Ziffern</type>
-			<type type="khmr" key="numbers">Khmer-Ziffern</type>
-			<type type="knda" key="numbers">Kannada-Ziffern</type>
-			<type type="lana" key="numbers" draft="contributed">Lanna-Ziffern (säkular)</type>
-			<type type="lanatham" key="numbers" draft="contributed">Lanna-Ziffern (sakral)</type>
-			<type type="laoo" key="numbers">Laotische Ziffern</type>
-			<type type="latn" key="numbers">Westliche Ziffern</type>
-			<type type="lepc" key="numbers" draft="contributed">Lepcha-Ziffern</type>
-			<type type="limb" key="numbers" draft="contributed">Limbu-Ziffern</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">Kleinbuchstaben zuerst aufführen</type>
-			<type type="mlym" key="numbers">Malayalam-Ziffern</type>
-			<type type="mong" key="numbers">Mongolische Ziffern</type>
-			<type type="mtei" key="numbers" draft="contributed">Meitei-Mayek-Ziffern</type>
-			<type type="mymr" key="numbers">Myanmar-Ziffern</type>
-			<type type="mymrshan" key="numbers" draft="contributed">Myanmarische Shan-Ziffern</type>
-			<type type="native" key="numbers" draft="contributed">Native Ziffern</type>
-			<type type="nkoo" key="numbers" draft="contributed">N’Ko-Ziffern</type>
-			<type type="no" key="colBackwards" draft="contributed">Akzente normal sortieren</type>
-			<type type="no" key="colCaseFirst" draft="contributed">Normal sortieren</type>
-			<type type="no" key="colCaseLevel" draft="contributed">Ohne Groß-/Kleinschreibung sortieren</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">Kana separat sortieren</type>
-			<type type="no" key="colNormalization" draft="contributed">Ohne Normierung sortieren</type>
-			<type type="no" key="colNumeric" draft="contributed">Ziffern einzeln sortieren</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">Symbole sortieren</type>
-			<type type="olck" key="numbers" draft="contributed">Ol-Chiki-Ziffern</type>
-			<type type="orya" key="numbers">Oriya-Ziffern</type>
-			<type type="persian" key="calendar">Persischer Kalender</type>
-			<type type="phonebook" key="collation">Telefonbuch-Sortierung</type>
-			<type type="phonetic" key="collation" draft="contributed">Sortierung nach Phonetik</type>
-			<type type="pinyin" key="collation">Pinyin-Sortierregeln</type>
-			<type type="primary" key="colStrength" draft="contributed">Nur Basisbuchstaben sortieren</type>
-			<type type="quaternary" key="colStrength" draft="contributed">Akzente/Fall/Breite/Kana sortieren</type>
-			<type type="reformed" key="collation">Reformierte Sortierreihenfolge</type>
-			<type type="roc" key="calendar">Kalender der Republik China</type>
-			<type type="roman" key="numbers">Römische Ziffern</type>
-			<type type="romanlow" key="numbers">Römische Ziffern in Kleinschrift</type>
-			<type type="saur" key="numbers" draft="contributed">Saurashtra-Ziffern</type>
-			<type type="search" key="collation">Allgemeine Suche</type>
-			<type type="searchjl" key="collation" draft="contributed">Suche nach Anfangsbuchstaben des koreanischen Alphabets</type>
-			<type type="secondary" key="colStrength" draft="contributed">Akzente sortieren</type>
-			<type type="shifted" key="colAlternate" draft="contributed">Symbole sortieren ignorieren</type>
-			<type type="shrd" key="numbers" draft="contributed">Sharada-Ziffern</type>
-			<type type="sora" key="numbers" draft="contributed">Sora-Sompeng-Ziffern</type>
-			<type type="standard" key="collation">Standard-Sortierung</type>
-			<type type="stroke" key="collation">Strichfolge</type>
-			<type type="sund" key="numbers" draft="contributed">Sundanesische Ziffern</type>
-			<type type="takr" key="numbers" draft="contributed">Takri-Ziffern</type>
-			<type type="talu" key="numbers" draft="contributed">Neue Tai-Lü-Ziffern</type>
-			<type type="taml" key="numbers">Tamilische Ziffern</type>
-			<type type="tamldec" key="numbers">Tamil-Ziffern</type>
-			<type type="telu" key="numbers">Telugu-Ziffern</type>
-			<type type="tertiary" key="colStrength" draft="contributed">Akzente/Fall/Breite sortieren</type>
-			<type type="thai" key="numbers">Thai-Ziffern</type>
-			<type type="tibt" key="numbers">Tibetische Ziffern</type>
-			<type type="traditional" key="collation">Traditionelle Sortierregeln</type>
-			<type type="traditional" key="numbers" draft="contributed">Traditionelle Zahlen</type>
-			<type type="unihan" key="collation">Radikal-Strich-Sortierregeln</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">Großbuchstaben zuerst aufführen</type>
-			<type type="vaii" key="numbers" draft="contributed">Vai-Ziffern</type>
-			<type type="yes" key="colBackwards" draft="contributed">Akzente umgekehrt sortieren</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">Nach Groß-/Kleinschreibung sortieren</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">Kana anders sortieren</type>
-			<type type="yes" key="colNormalization" draft="contributed">Nach Unicode sortieren</type>
-			<type type="yes" key="colNumeric" draft="contributed">Ziffern numerisch sortieren</type>
-			<type type="zhuyin" key="collation" draft="contributed">Zhuyin-Sortierregeln</type>
+			<type key="calendar" type="buddhist">Buddhistischer Kalender</type>
+			<type key="calendar" type="chinese">Chinesischer Kalender</type>
+			<type key="calendar" type="coptic">Koptischer Kalender</type>
+			<type key="calendar" type="dangi">Dangi Kalender</type>
+			<type key="calendar" type="ethiopic">Äthiopischer Kalender</type>
+			<type key="calendar" type="ethiopic-amete-alem">Äthiopischer Kalender &quot;Amete Alem&quot;</type>
+			<type key="calendar" type="gregorian">Gregorianischer Kalender</type>
+			<type key="calendar" type="hebrew">Hebräischer Kalender</type>
+			<type key="calendar" type="indian">Indischer Nationalkalender</type>
+			<type key="calendar" type="islamic">Islamischer Kalender</type>
+			<type key="calendar" type="islamic-civil">Bürgerlicher islamischer Kalender</type>
+			<type key="calendar" type="islamic-rgsa" draft="contributed">Islamischer Kalender (Saudi-Arabien, Beobachtung)</type>
+			<type key="calendar" type="islamic-tbla" draft="contributed">Islamischer Kalender (tabellarisch, astronomische Epoche)</type>
+			<type key="calendar" type="islamic-umalqura" draft="contributed">Islamischer Kalender (Umm al-Qura</type>
+			<type key="calendar" type="iso8601">ISO-8601-Kalender</type>
+			<type key="calendar" type="japanese">Japanischer Kalender</type>
+			<type key="calendar" type="persian">Persischer Kalender</type>
+			<type key="calendar" type="roc">Kalender der Republik China</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">Symbole sortieren</type>
+			<type key="colAlternate" type="shifted" draft="contributed">Symbole sortieren ignorieren</type>
+			<type key="colBackwards" type="no" draft="contributed">Akzente normal sortieren</type>
+			<type key="colBackwards" type="yes" draft="contributed">Akzente umgekehrt sortieren</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">Kleinbuchstaben zuerst aufführen</type>
+			<type key="colCaseFirst" type="no" draft="contributed">Normal sortieren</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">Großbuchstaben zuerst aufführen</type>
+			<type key="colCaseLevel" type="no" draft="contributed">Ohne Groß-/Kleinschreibung sortieren</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">Nach Groß-/Kleinschreibung sortieren</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">Kana separat sortieren</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">Kana anders sortieren</type>
+			<type key="collation" type="big5han">Traditionelles Chinesisch - Big5</type>
+			<type key="collation" type="dictionary">Lexikographische Sortierreihenfolge</type>
+			<type key="collation" type="ducet">Unicode-Sortierung</type>
+			<type key="collation" type="eor" draft="contributed">Europäische Sortierregeln</type>
+			<type key="collation" type="gb2312han">Vereinfachtes Chinesisch - GB2312</type>
+			<type key="collation" type="phonebook">Telefonbuch-Sortierung</type>
+			<type key="collation" type="phonetic" draft="contributed">Sortierung nach Phonetik</type>
+			<type key="collation" type="pinyin">Pinyin-Sortierregeln</type>
+			<type key="collation" type="reformed">Reformierte Sortierreihenfolge</type>
+			<type key="collation" type="search">Allgemeine Suche</type>
+			<type key="collation" type="searchjl" draft="contributed">Suche nach Anfangsbuchstaben des koreanischen Alphabets</type>
+			<type key="collation" type="standard">Standard-Sortierung</type>
+			<type key="collation" type="stroke">Strichfolge</type>
+			<type key="collation" type="traditional">Traditionelle Sortierregeln</type>
+			<type key="collation" type="unihan">Radikal-Strich-Sortierregeln</type>
+			<type key="collation" type="zhuyin" draft="contributed">Zhuyin-Sortierregeln</type>
+			<type key="colNormalization" type="no" draft="contributed">Ohne Normierung sortieren</type>
+			<type key="colNormalization" type="yes" draft="contributed">Nach Unicode sortieren</type>
+			<type key="colNumeric" type="no" draft="contributed">Ziffern einzeln sortieren</type>
+			<type key="colNumeric" type="yes" draft="contributed">Ziffern numerisch sortieren</type>
+			<type key="colStrength" type="identical" draft="contributed">Alle sortieren</type>
+			<type key="colStrength" type="primary" draft="contributed">Nur Basisbuchstaben sortieren</type>
+			<type key="colStrength" type="quaternary" draft="contributed">Akzente/Fall/Breite/Kana sortieren</type>
+			<type key="colStrength" type="secondary" draft="contributed">Akzente sortieren</type>
+			<type key="colStrength" type="tertiary" draft="contributed">Akzente/Fall/Breite sortieren</type>
+			<type key="hc" type="h11">12-Stunden-Zählung (0-11)</type>
+			<type key="hc" type="h12">12-Stunden-Zählung (1-12)</type>
+			<type key="hc" type="h23">24-Stunden-Zählung (0-23)</type>
+			<type key="hc" type="h24">24-Stunden-System (1-24)</type>
+			<type key="lb" type="loose">lockerer Zeilenumbruch</type>
+			<type key="lb" type="normal">normaler Zeilenumbruch</type>
+			<type key="lb" type="strict">fester Zeilenumbruch</type>
+			<type key="ms" type="metric">metrisches System</type>
+			<type key="ms" type="uksystem">britisches Maßsystem</type>
+			<type key="ms" type="ussystem">US-Maßsystem</type>
+			<type key="numbers" type="arab">Arabisch-indische Ziffern</type>
+			<type key="numbers" type="arabext">Erweiterte arabisch-indische Ziffern</type>
+			<type key="numbers" type="armn">Armenische Ziffern</type>
+			<type key="numbers" type="armnlow">Armenische Ziffern in Kleinschrift</type>
+			<type key="numbers" type="bali" draft="contributed">Balinesische Ziffern</type>
+			<type key="numbers" type="beng">Bengalische Ziffern</type>
+			<type key="numbers" type="brah" draft="contributed">Brahmi-Ziffern</type>
+			<type key="numbers" type="cakm" draft="contributed">Chakma-Ziffern</type>
+			<type key="numbers" type="cham" draft="contributed">Cham-Ziffern</type>
+			<type key="numbers" type="deva">Devanagari-Ziffern</type>
+			<type key="numbers" type="ethi">Äthiopische Ziffern</type>
+			<type key="numbers" type="finance" draft="contributed">Finanzzahlen</type>
+			<type key="numbers" type="fullwide">Vollbreite Ziffern</type>
+			<type key="numbers" type="geor">Georgische Ziffern</type>
+			<type key="numbers" type="grek">Griechische Ziffern</type>
+			<type key="numbers" type="greklow">Griechische Ziffern in Kleinschrift</type>
+			<type key="numbers" type="gujr">Gujarati-Ziffern</type>
+			<type key="numbers" type="guru">Gurmukhi-Ziffern</type>
+			<type key="numbers" type="hanidec">Chinesische Dezimalzahlen</type>
+			<type key="numbers" type="hans">Vereinfacht-chinesische Ziffern</type>
+			<type key="numbers" type="hansfin">Vereinfacht-chinesische Finanzziffern</type>
+			<type key="numbers" type="hant">Traditionell-chinesische Ziffern</type>
+			<type key="numbers" type="hantfin">Traditionell-chinesische Finanzziffern</type>
+			<type key="numbers" type="hebr">Hebräische Ziffern</type>
+			<type key="numbers" type="java" draft="contributed">Javanesische Ziffern</type>
+			<type key="numbers" type="jpan">Japanische Ziffern</type>
+			<type key="numbers" type="jpanfin">Japanische Finanzziffern</type>
+			<type key="numbers" type="kali" draft="contributed">Kayah-Li-Ziffern</type>
+			<type key="numbers" type="khmr">Khmer-Ziffern</type>
+			<type key="numbers" type="knda">Kannada-Ziffern</type>
+			<type key="numbers" type="lana" draft="contributed">Lanna-Ziffern (säkular)</type>
+			<type key="numbers" type="lanatham" draft="contributed">Lanna-Ziffern (sakral)</type>
+			<type key="numbers" type="laoo">Laotische Ziffern</type>
+			<type key="numbers" type="latn">Westliche Ziffern</type>
+			<type key="numbers" type="lepc" draft="contributed">Lepcha-Ziffern</type>
+			<type key="numbers" type="limb" draft="contributed">Limbu-Ziffern</type>
+			<type key="numbers" type="mlym">Malayalam-Ziffern</type>
+			<type key="numbers" type="mong">Mongolische Ziffern</type>
+			<type key="numbers" type="mtei" draft="contributed">Meitei-Mayek-Ziffern</type>
+			<type key="numbers" type="mymr">Myanmar-Ziffern</type>
+			<type key="numbers" type="mymrshan" draft="contributed">Myanmarische Shan-Ziffern</type>
+			<type key="numbers" type="native" draft="contributed">Native Ziffern</type>
+			<type key="numbers" type="nkoo" draft="contributed">N’Ko-Ziffern</type>
+			<type key="numbers" type="olck" draft="contributed">Ol-Chiki-Ziffern</type>
+			<type key="numbers" type="orya">Oriya-Ziffern</type>
+			<type key="numbers" type="roman">Römische Ziffern</type>
+			<type key="numbers" type="romanlow">Römische Ziffern in Kleinschrift</type>
+			<type key="numbers" type="saur" draft="contributed">Saurashtra-Ziffern</type>
+			<type key="numbers" type="shrd" draft="contributed">Sharada-Ziffern</type>
+			<type key="numbers" type="sora" draft="contributed">Sora-Sompeng-Ziffern</type>
+			<type key="numbers" type="sund" draft="contributed">Sundanesische Ziffern</type>
+			<type key="numbers" type="takr" draft="contributed">Takri-Ziffern</type>
+			<type key="numbers" type="talu" draft="contributed">Neue Tai-Lü-Ziffern</type>
+			<type key="numbers" type="taml">Tamilische Ziffern</type>
+			<type key="numbers" type="tamldec">Tamil-Ziffern</type>
+			<type key="numbers" type="telu">Telugu-Ziffern</type>
+			<type key="numbers" type="thai">Thai-Ziffern</type>
+			<type key="numbers" type="tibt">Tibetische Ziffern</type>
+			<type key="numbers" type="traditional" draft="contributed">Traditionelle Zahlen</type>
+			<type key="numbers" type="vaii" draft="contributed">Vai-Ziffern</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">BGN</transformName>
@@ -1384,6 +1399,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, d. MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">U</dateFormatItem>
 						<dateFormatItem id="yyyy">U</dateFormatItem>
@@ -1445,6 +1461,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E, d.</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -1462,6 +1479,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, d. MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
@@ -1788,30 +1806,73 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">Mitternacht</dayPeriod>
+							<dayPeriod type="am">vorm.</dayPeriod>
+							<dayPeriod type="pm">nachm.</dayPeriod>
+							<dayPeriod type="morning1">morgens</dayPeriod>
+							<dayPeriod type="morning2">vormittags</dayPeriod>
+							<dayPeriod type="afternoon1">mittags</dayPeriod>
+							<dayPeriod type="afternoon2">nachmittags</dayPeriod>
+							<dayPeriod type="evening1">abends</dayPeriod>
+							<dayPeriod type="night1">nachts</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">Mitternacht</dayPeriod>
 							<dayPeriod type="am">vm.</dayPeriod>
-							<dayPeriod type="noon">m.</dayPeriod>
 							<dayPeriod type="pm">nm.</dayPeriod>
+							<dayPeriod type="morning1">morgens</dayPeriod>
+							<dayPeriod type="morning2">vormittags</dayPeriod>
+							<dayPeriod type="afternoon1">mittags</dayPeriod>
+							<dayPeriod type="afternoon2">nachmittags</dayPeriod>
+							<dayPeriod type="evening1">abends</dayPeriod>
+							<dayPeriod type="night1">nachts</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="afternoon">nachmittags</dayPeriod>
+							<dayPeriod type="midnight">Mitternacht</dayPeriod>
 							<dayPeriod type="am">vorm.</dayPeriod>
-							<dayPeriod type="earlyMorning">morgens</dayPeriod>
-							<dayPeriod type="evening">abends</dayPeriod>
-							<dayPeriod type="morning">vormittags</dayPeriod>
-							<dayPeriod type="night">nachts</dayPeriod>
-							<dayPeriod type="noon">mittags</dayPeriod>
 							<dayPeriod type="pm">nachm.</dayPeriod>
+							<dayPeriod type="morning1">morgens</dayPeriod>
+							<dayPeriod type="morning2">vormittags</dayPeriod>
+							<dayPeriod type="afternoon1">mittags</dayPeriod>
+							<dayPeriod type="afternoon2">nachmittags</dayPeriod>
+							<dayPeriod type="evening1">abends</dayPeriod>
+							<dayPeriod type="night1">nachts</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">Mitternacht</dayPeriod>
+							<dayPeriod type="am">vorm.</dayPeriod>
+							<dayPeriod type="pm">nachm.</dayPeriod>
+							<dayPeriod type="morning1">Morgen</dayPeriod>
+							<dayPeriod type="morning2">Vormittag</dayPeriod>
+							<dayPeriod type="afternoon1">Mittag</dayPeriod>
+							<dayPeriod type="afternoon2">Nachmittag</dayPeriod>
+							<dayPeriod type="evening1">Abend</dayPeriod>
+							<dayPeriod type="night1">Nacht</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">Mitternacht</dayPeriod>
+							<dayPeriod type="am">vorm.</dayPeriod>
+							<dayPeriod type="pm">nachm.</dayPeriod>
+							<dayPeriod type="morning1">Morgen</dayPeriod>
+							<dayPeriod type="morning2">Vormittag</dayPeriod>
+							<dayPeriod type="afternoon1">Mittag</dayPeriod>
+							<dayPeriod type="afternoon2">Nachmittag</dayPeriod>
+							<dayPeriod type="evening1">Abend</dayPeriod>
+							<dayPeriod type="night1">Nacht</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="afternoon" draft="unconfirmed">Nachmittag</dayPeriod>
-							<dayPeriod type="earlyMorning" draft="unconfirmed">Morgen</dayPeriod>
-							<dayPeriod type="evening" draft="unconfirmed">Abend</dayPeriod>
-							<dayPeriod type="morning" draft="unconfirmed">Vormittag</dayPeriod>
-							<dayPeriod type="night" draft="unconfirmed">Nacht</dayPeriod>
-							<dayPeriod type="noon" draft="unconfirmed">Mittag</dayPeriod>
+							<dayPeriod type="midnight">Mitternacht</dayPeriod>
+							<dayPeriod type="am">vorm.</dayPeriod>
+							<dayPeriod type="pm">nachm.</dayPeriod>
+							<dayPeriod type="morning1">Morgen</dayPeriod>
+							<dayPeriod type="morning2">Vormittag</dayPeriod>
+							<dayPeriod type="afternoon1">Mittag</dayPeriod>
+							<dayPeriod type="afternoon2">Nachmittag</dayPeriod>
+							<dayPeriod type="evening1">Abend</dayPeriod>
+							<dayPeriod type="night1">Nacht</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1930,6 +1991,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, d. MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
 						<dateFormatItem id="MMMMEd">E, d. MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
@@ -1966,8 +2028,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hm">
-							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="H">HH:mm–HH:mm 'Uhr'</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm 'Uhr'</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
 							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
@@ -1975,8 +2037,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H">HH:mm–HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="H">HH:mm–HH:mm 'Uhr' v</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm 'Uhr' v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a">h a – h a v</greatestDifference>
@@ -2065,12 +2127,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<calendar type="japanese">
 				<eras>
 					<eraAbbr>
-						<era type="0" draft="contributed">Taika (645-650)</era>
+						<era type="0" draft="contributed">Taika (645–650)</era>
 					</eraAbbr>
 				</eras>
-				<!-- need some non-empty element here to make inheritance work,
-					 this copy of generic dateFormats above is smaller than root japanese eras
-				-->
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
@@ -2123,6 +2182,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>Jahr</displayName>
+				<relative type="-1">letztes Jahr</relative>
+				<relative type="0">dieses Jahr</relative>
+				<relative type="1">nächstes Jahr</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">in {0} Jahr</relativeTimePattern>
 					<relativeTimePattern count="other">in {0} Jahren</relativeTimePattern>
@@ -2134,6 +2196,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>J</displayName>
+				<relative type="-1">letztes Jahr</relative>
+				<relative type="0">dieses Jahr</relative>
+				<relative type="1">nächstes Jahr</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">in {0} Jahr</relativeTimePattern>
 					<relativeTimePattern count="other">in {0} Jahren</relativeTimePattern>
@@ -2192,6 +2257,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>Monat</displayName>
+				<relative type="-1">letzten Monat</relative>
+				<relative type="0">diesen Monat</relative>
+				<relative type="1">nächsten Monat</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">in {0} Monat</relativeTimePattern>
 					<relativeTimePattern count="other">in {0} Monaten</relativeTimePattern>
@@ -2203,6 +2271,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>M</displayName>
+				<relative type="-1">letzten Monat</relative>
+				<relative type="0">diesen Monat</relative>
+				<relative type="1">nächsten Monat</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">in {0} Monat</relativeTimePattern>
 					<relativeTimePattern count="other">in {0} Monaten</relativeTimePattern>
@@ -2228,6 +2299,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>Woche</displayName>
+				<relative type="-1">letzte Woche</relative>
+				<relative type="0">diese Woche</relative>
+				<relative type="1">nächste Woche</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">in {0} Woche</relativeTimePattern>
 					<relativeTimePattern count="other">in {0} Wochen</relativeTimePattern>
@@ -2239,6 +2313,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>W</displayName>
+				<relative type="-1">letzte Woche</relative>
+				<relative type="0">diese Woche</relative>
+				<relative type="1">nächste Woche</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">in {0} Wo.</relativeTimePattern>
 					<relativeTimePattern count="other">in {0} Wo.</relativeTimePattern>
@@ -2266,6 +2343,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>Tag</displayName>
+				<relative type="-2">vorgestern</relative>
+				<relative type="-1">gestern</relative>
+				<relative type="0">heute</relative>
+				<relative type="1">morgen</relative>
+				<relative type="2">übermorgen</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">in {0} Tag</relativeTimePattern>
 					<relativeTimePattern count="other">in {0} Tagen</relativeTimePattern>
@@ -2277,6 +2359,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>Tag</displayName>
+				<relative type="-2">vorgestern</relative>
+				<relative type="-1">gestern</relative>
+				<relative type="0">heute</relative>
+				<relative type="1">morgen</relative>
+				<relative type="2">übermorgen</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">in {0} Tag</relativeTimePattern>
 					<relativeTimePattern count="other">in {0} Tagen</relativeTimePattern>
@@ -3191,7 +3278,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Maseru</exemplarCity>
 			</zone>
 			<zone type="Europe/Vilnius">
-				<exemplarCity>Wilna</exemplarCity>
+				<exemplarCity>Vilnius</exemplarCity>
 			</zone>
 			<zone type="Europe/Luxembourg">
 				<exemplarCity>Luxemburg</exemplarCity>
@@ -3376,6 +3463,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity draft="contributed">Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
 			</zone>
@@ -3460,6 +3550,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Tschita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Jakutsk</exemplarCity>
 			</zone>
@@ -3478,6 +3571,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity draft="contributed">Srednekolymsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamtschatka</exemplarCity>
 			</zone>
@@ -3849,9 +3945,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic draft="contributed">Zeit in Apia</generic>
-					<standard draft="contributed">Normalzeit in Apia</standard>
-					<daylight draft="contributed">Sommerzeit in Apia</daylight>
+					<generic>Apia-Zeit</generic>
+					<standard>Apia-Normalzeit</standard>
+					<daylight>Apia-Sommerzeit</daylight>
 				</long>
 			</metazone>
 			<metazone type="Aqtau">
@@ -4103,7 +4199,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
 				<long>
-					<standard draft="contributed">Kaliningrader Zeit</standard>
+					<standard>Kaliningrader Zeit</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
@@ -4837,6 +4933,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="contributed">0 Tsd'.' ¤</pattern>
+					<pattern type="1000" count="other" draft="contributed">0 Tsd'.' ¤</pattern>
+					<pattern type="10000" count="one" draft="contributed">00 Tsd'.' ¤</pattern>
+					<pattern type="10000" count="other" draft="contributed">00 Tsd'.' ¤</pattern>
+					<pattern type="100000" count="one" draft="contributed">000 Tsd'.' ¤</pattern>
+					<pattern type="100000" count="other" draft="contributed">000 Tsd'.' ¤</pattern>
+					<pattern type="1000000" count="one" draft="contributed">0 Mio'.' ¤</pattern>
+					<pattern type="1000000" count="other" draft="contributed">0 Mio'.' ¤</pattern>
+					<pattern type="10000000" count="one" draft="contributed">00 Mio'.' ¤</pattern>
+					<pattern type="10000000" count="other" draft="contributed">00 Mio'.' ¤</pattern>
+					<pattern type="100000000" count="one" draft="contributed">000 Mio'.' ¤</pattern>
+					<pattern type="100000000" count="other" draft="contributed">000 Mio'.' ¤</pattern>
+					<pattern type="1000000000" count="one" draft="contributed">0 Mrd'.' ¤</pattern>
+					<pattern type="1000000000" count="other" draft="contributed">0 Mrd'.' ¤</pattern>
+					<pattern type="10000000000" count="one" draft="contributed">00 Mrd'.' ¤</pattern>
+					<pattern type="10000000000" count="other" draft="contributed">00 Mrd'.' ¤</pattern>
+					<pattern type="100000000000" count="one" draft="contributed">000 Mrd'.' ¤</pattern>
+					<pattern type="100000000000" count="other" draft="contributed">000 Mrd'.' ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="contributed">0 Bio'.' ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="contributed">0 Bio'.' ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="contributed">00 Bio'.' ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="contributed">00 Bio'.' ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="contributed">000 Bio'.' ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="contributed">000 Bio'.' ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4893,6 +5017,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Angolanischer Kwanza</displayName>
 				<displayName count="other">Angolanische Kwanza</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>Angolanischer Kwanza (1977–1990)</displayName>
@@ -4985,6 +5110,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Bosnien und Herzegowina Konvertierbare Mark</displayName>
 				<displayName count="other">Bosnien und Herzegowina Konvertierbare Mark</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BAN">
 				<displayName draft="contributed">Bosnien und Herzegowina Neuer Dinar (1994–1997)</displayName>
@@ -5078,6 +5204,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Bolivanischer Boliviano</displayName>
 				<displayName count="other">Bolivianische Bolivianos</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOL">
 				<displayName draft="contributed">Bolivianischer Boliviano (1863–1963)</displayName>
@@ -5163,6 +5290,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Botswanischer Pula</displayName>
 				<displayName count="other">Botswanische Pula</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>Belarus-Rubel (1994–1999)</displayName>
@@ -5284,6 +5412,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Kubanischer Peso (konvertibel)</displayName>
 				<displayName count="other">Kubanische Pesos (konvertibel)</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">Cub$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>Kubanischer Peso</displayName>
@@ -5309,6 +5438,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Tschechische Krone</displayName>
 				<displayName count="other">Tschechische Kronen</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>Mark der DDR</displayName>
@@ -5333,6 +5463,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Dänische Krone</displayName>
 				<displayName count="other">Dänische Kronen</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Dominikanischer Peso</displayName>
@@ -5370,6 +5501,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Ägyptisches Pfund</displayName>
 				<displayName count="other">Ägyptische Pfund</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>Eritreischer Nakfa</displayName>
@@ -5427,6 +5559,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Falkland-Pfund</displayName>
 				<displayName count="other">Falkland-Pfund</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">Fl£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>Französischer Franc</displayName>
@@ -5451,6 +5584,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Georgischer Lari</displayName>
 				<displayName count="other">Georgische Lari</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>Ghanaischer Cedi (1979–2007)</displayName>
@@ -5482,6 +5616,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Guinea-Franc</displayName>
 				<displayName count="other">Guinea-Franc</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">F.G.</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>Guineischer Syli</displayName>
@@ -5506,6 +5641,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Guatemaltekischer Quetzal</displayName>
 				<displayName count="other">Guatemaltekische Quetzales</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>Portugiesisch Guinea Escudo</displayName>
@@ -5537,6 +5673,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Honduras-Lempira</displayName>
 				<displayName count="other">Honduras-Lempira</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>Kroatischer Dinar</displayName>
@@ -5549,6 +5686,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Kroatischer Kuna</displayName>
 				<displayName count="other">Kroatische Kuna</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>Haitianische Gourde</displayName>
@@ -5561,12 +5699,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Ungarischer Forint</displayName>
 				<displayName count="other">Ungarische Forint</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>Indonesische Rupiah</displayName>
 				<displayName count="one">Indonesische Rupiah</displayName>
 				<displayName count="other">Indonesische Rupiah</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>Irisches Pfund</displayName>
@@ -5621,6 +5761,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Isländische Krone</displayName>
 				<displayName count="other">Isländische Kronen</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>Italienische Lira</displayName>
@@ -5672,12 +5813,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Komoren-Franc</displayName>
 				<displayName count="other">Komoren-Francs</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">FC</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>Nordkoreanischer Won</displayName>
 				<displayName count="one">Nordkoreanischer Won</displayName>
 				<displayName count="other">Nordkoreanische Won</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRH">
 				<displayName draft="contributed">Südkoreanischer Hwan (1953–1962)</displayName>
@@ -5730,12 +5873,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Libanesisches Pfund</displayName>
 				<displayName count="other">Libanesische Pfund</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>Sri-Lanka-Rupie</displayName>
 				<displayName count="one">Sri-Lanka-Rupie</displayName>
 				<displayName count="other">Sri-Lanka-Rupien</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>Liberianischer Dollar</displayName>
@@ -5833,6 +5978,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Madagaskar-Ariary</displayName>
 				<displayName count="other">Madagaskar-Ariary</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>Madagaskar-Franc</displayName>
@@ -5863,6 +6009,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Myanmarischer Kyat</displayName>
 				<displayName count="other">Myanmarische Kyat</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>Mongolischer Tögrög</displayName>
@@ -5900,6 +6047,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Mauritius-Rupie</displayName>
 				<displayName count="other">Mauritius-Rupien</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVP">
 				<displayName draft="contributed">Malediven-Rupie (alt)</displayName>
@@ -5942,6 +6090,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Malaysischer Ringgit</displayName>
 				<displayName count="other">Malaysische Ringgit</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>Mosambikanischer Escudo</displayName>
@@ -5985,6 +6134,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Nicaragua-Córdoba</displayName>
 				<displayName count="other">Nicaragua-Córdobas</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>Niederländischer Gulden</displayName>
@@ -5997,12 +6147,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Norwegische Krone</displayName>
 				<displayName count="other">Norwegische Kronen</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>Nepalesische Rupie</displayName>
 				<displayName count="one">Nepalesische Rupie</displayName>
 				<displayName count="other">Nepalesische Rupien</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>Neuseeland-Dollar</displayName>
@@ -6059,12 +6211,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Pakistanische Rupie</displayName>
 				<displayName count="other">Pakistanische Rupien</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>Polnischer Złoty</displayName>
 				<displayName count="one">Polnischer Złoty</displayName>
 				<displayName count="other">Polnische Złoty</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>Polnischer Zloty (1950–1995)</displayName>
@@ -6119,6 +6273,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Russischer Rubel</displayName>
 				<displayName count="other">Russische Rubel</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>Russischer Rubel (1991–1998)</displayName>
@@ -6132,6 +6287,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Ruanda-Franc</displayName>
 				<displayName count="other">Ruanda-Francs</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">F.Rw</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>Saudi-Rial</displayName>
@@ -6175,6 +6331,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Schwedische Krone</displayName>
 				<displayName count="other">Schwedische Kronen</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>Singapur-Dollar</displayName>
@@ -6188,6 +6345,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">St. Helena-Pfund</displayName>
 				<displayName count="other">St. Helena-Pfund</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>Slowenischer Tolar</displayName>
@@ -6238,6 +6396,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">São-toméischer Dobra</displayName>
 				<displayName count="other">São-toméische Dobra</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>Sowjetischer Rubel</displayName>
@@ -6256,6 +6415,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Syrisches Pfund</displayName>
 				<displayName count="other">Syrische Pfund</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">SYP</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>Swasiländischer Lilangeni</displayName>
@@ -6268,6 +6428,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Thailändischer Baht</displayName>
 				<displayName count="other">Thailändische Baht</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>Tadschikistan Rubel</displayName>
@@ -6304,6 +6465,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Tongaischer Paʻanga</displayName>
 				<displayName count="other">Tongaische Paʻanga</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>Timor-Escudo</displayName>
@@ -6323,6 +6485,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">Türkische Lira</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Trinidad und Tobago-Dollar</displayName>
@@ -6424,6 +6587,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Venezolanischer Bolívar</displayName>
 				<displayName count="other">Venezolanische Bolívares</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>Vietnamesischer Dong</displayName>
@@ -6497,6 +6661,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Ostkaribischer Dollar</displayName>
 				<displayName count="other">Ostkaribische Dollar</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>Sonderziehungsrechte</displayName>
@@ -6623,6 +6788,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Südafrikanischer Rand</displayName>
 				<displayName count="other">Südafrikanische Rand</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>Kwacha (1968–2012)</displayName>
@@ -6635,6 +6801,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Kwacha</displayName>
 				<displayName count="other">Kwacha</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>Zaire-Neuer Zaïre (1993–1998)</displayName>
@@ -6687,6 +6854,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName draft="contributed">Umdrehung</displayName>
+				<unitPattern count="one" draft="contributed">{0} Umdrehung</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Umdrehungen</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>Radianten</displayName>
+				<unitPattern count="one">{0} Radiant</unitPattern>
+				<unitPattern count="other">{0} Radianten</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>Grad</displayName>
+				<unitPattern count="one">{0} Grad</unitPattern>
+				<unitPattern count="other">{0} Grad</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>Winkelminuten</displayName>
 				<unitPattern count="one">{0} Winkelminute</unitPattern>
@@ -6697,30 +6879,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Winkelsekunde</unitPattern>
 				<unitPattern count="other">{0} Winkelsekunden</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>Grad</displayName>
-				<unitPattern count="one">{0} Grad</unitPattern>
-				<unitPattern count="other">{0} Grad</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>Radianten</displayName>
-				<unitPattern count="one">{0} Radiant</unitPattern>
-				<unitPattern count="other">{0} Radianten</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>Acres</displayName>
-				<unitPattern count="one">{0} Acre</unitPattern>
-				<unitPattern count="other">{0} Acres</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>Quadratkilometer</displayName>
+				<unitPattern count="one">{0} Quadratkilometer</unitPattern>
+				<unitPattern count="other">{0} Quadratkilometer</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>Hektar</displayName>
 				<unitPattern count="one">{0} Hektar</unitPattern>
 				<unitPattern count="other">{0} Hektar</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>Quadratmeter</displayName>
+				<unitPattern count="one">{0} Quadratmeter</unitPattern>
+				<unitPattern count="other">{0} Quadratmeter</unitPattern>
+				<perUnitPattern>{0} pro Quadratmeter</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>Quadratzentimeter</displayName>
 				<unitPattern count="one">{0} Quadratzentimeter</unitPattern>
 				<unitPattern count="other">{0} Quadratzentimeter</unitPattern>
+				<perUnitPattern>{0} pro Quadratzentimeter</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>Quadratmeilen</displayName>
+				<unitPattern count="one">{0} Quadratmeile</unitPattern>
+				<unitPattern count="other">{0} Quadratmeilen</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>Acres</displayName>
+				<unitPattern count="one">{0} Acre</unitPattern>
+				<unitPattern count="other">{0} Acres</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>Quadratyards</displayName>
+				<unitPattern count="one">{0} Quadratyard</unitPattern>
+				<unitPattern count="other">{0} Quadratyards</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>Quadratfuß</displayName>
@@ -6731,91 +6925,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Quadratzoll</displayName>
 				<unitPattern count="one">{0} Quadratzoll</unitPattern>
 				<unitPattern count="other">{0} Quadratzoll</unitPattern>
+				<perUnitPattern>{0} pro Quadratzoll</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>Quadratkilometer</displayName>
-				<unitPattern count="one">{0} Quadratkilometer</unitPattern>
-				<unitPattern count="other">{0} Quadratkilometer</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>Quadratmeter</displayName>
-				<unitPattern count="one">{0} Quadratmeter</unitPattern>
-				<unitPattern count="other">{0} Quadratmeter</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>Quadratmeilen</displayName>
-				<unitPattern count="one">{0} Quadratmeile</unitPattern>
-				<unitPattern count="other">{0} Quadratmeilen</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>Quadratyards</displayName>
-				<unitPattern count="one">{0} Quadratyard</unitPattern>
-				<unitPattern count="other">{0} Quadratyards</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>Karat</displayName>
+				<unitPattern count="one">{0} Karat</unitPattern>
+				<unitPattern count="other">{0} Karat</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>Liter pro Kilometer</displayName>
 				<unitPattern count="one">{0} Liter pro Kilometer</unitPattern>
 				<unitPattern count="other">{0} Liter pro Kilometer</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>Liter auf 100 Kilometer</displayName>
+				<unitPattern count="one">{0} Liter auf 100 Kilometer</unitPattern>
+				<unitPattern count="other">{0} Liter auf 100 Kilometer</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>Meilen pro Gallone</displayName>
 				<unitPattern count="one">{0} Meile pro Gallone</unitPattern>
 				<unitPattern count="other">{0} Meilen pro Gallone</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>Bits</displayName>
-				<unitPattern count="one">{0} Bit</unitPattern>
-				<unitPattern count="other">{0} Bits</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>Bytes</displayName>
-				<unitPattern count="one">{0} Byte</unitPattern>
-				<unitPattern count="other">{0} Bytes</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gigabits</displayName>
-				<unitPattern count="one">{0} Gigabit</unitPattern>
-				<unitPattern count="other">{0} Gigabits</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>Gigabytes</displayName>
-				<unitPattern count="one">{0} Gigabyte</unitPattern>
-				<unitPattern count="other">{0} Gigabytes</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>Kilobits</displayName>
-				<unitPattern count="one">{0} Kilobit</unitPattern>
-				<unitPattern count="other">{0} Kilobits</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>Kilobytes</displayName>
-				<unitPattern count="one">{0} Kilobyte</unitPattern>
-				<unitPattern count="other">{0} Kilobytes</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Megabits</displayName>
-				<unitPattern count="one">{0} Megabit</unitPattern>
-				<unitPattern count="other">{0} Megabits</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>Megabytes</displayName>
-				<unitPattern count="one">{0} Megabyte</unitPattern>
-				<unitPattern count="other">{0} Megabytes</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Terabits</displayName>
-				<unitPattern count="one">{0} Terabit</unitPattern>
-				<unitPattern count="other">{0} Terabits</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>Terabytes</displayName>
 				<unitPattern count="one">{0} Terabyte</unitPattern>
 				<unitPattern count="other">{0} Terabytes</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Terabits</displayName>
+				<unitPattern count="one">{0} Terabit</unitPattern>
+				<unitPattern count="other">{0} Terabits</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>Gigabytes</displayName>
+				<unitPattern count="one">{0} Gigabyte</unitPattern>
+				<unitPattern count="other">{0} Gigabytes</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gigabits</displayName>
+				<unitPattern count="one">{0} Gigabit</unitPattern>
+				<unitPattern count="other">{0} Gigabits</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>Megabytes</displayName>
+				<unitPattern count="one">{0} Megabyte</unitPattern>
+				<unitPattern count="other">{0} Megabytes</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Megabits</displayName>
+				<unitPattern count="one">{0} Megabit</unitPattern>
+				<unitPattern count="other">{0} Megabits</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>Kilobytes</displayName>
+				<unitPattern count="one">{0} Kilobyte</unitPattern>
+				<unitPattern count="other">{0} Kilobytes</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>Kilobits</displayName>
+				<unitPattern count="one">{0} Kilobit</unitPattern>
+				<unitPattern count="other">{0} Kilobits</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>Bytes</displayName>
+				<unitPattern count="one">{0} Byte</unitPattern>
+				<unitPattern count="other">{0} Bytes</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>Bits</displayName>
+				<unitPattern count="one">{0} Bit</unitPattern>
+				<unitPattern count="other">{0} Bits</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>Jahrhunderte</displayName>
+				<unitPattern count="one">{0} Jahrhundert</unitPattern>
+				<unitPattern count="other">{0} Jahrhunderte</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>Jahre</displayName>
+				<unitPattern count="one">{0} Jahr</unitPattern>
+				<unitPattern count="other">{0} Jahre</unitPattern>
+				<perUnitPattern>{0} pro Jahr</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>Monate</displayName>
+				<unitPattern count="one">{0} Monat</unitPattern>
+				<unitPattern count="other">{0} Monate</unitPattern>
+				<perUnitPattern>{0} pro Monat</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>Wochen</displayName>
+				<unitPattern count="one">{0} Woche</unitPattern>
+				<unitPattern count="other">{0} Wochen</unitPattern>
+				<perUnitPattern>{0} pro Woche</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>Tage</displayName>
 				<unitPattern count="one">{0} Tag</unitPattern>
 				<unitPattern count="other">{0} Tage</unitPattern>
+				<perUnitPattern>{0} pro Tag</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>Stunden</displayName>
@@ -6823,30 +7032,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} Stunden</unitPattern>
 				<perUnitPattern>{0} pro Stunde</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>Mikrosekunden</displayName>
-				<unitPattern count="one">{0} Mikrosekunde</unitPattern>
-				<unitPattern count="other">{0} Mikrosekunden</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>Millisekunden</displayName>
-				<unitPattern count="one">{0} Millisekunde</unitPattern>
-				<unitPattern count="other">{0} Millisekunden</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>Minuten</displayName>
 				<unitPattern count="one">{0} Minute</unitPattern>
 				<unitPattern count="other">{0} Minuten</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>Monate</displayName>
-				<unitPattern count="one">{0} Monat</unitPattern>
-				<unitPattern count="other">{0} Monate</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>Nanosekunden</displayName>
-				<unitPattern count="one">{0} Nanosekunde</unitPattern>
-				<unitPattern count="other">{0} Nanosekunden</unitPattern>
+				<perUnitPattern>{0} pro Minute</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>Sekunden</displayName>
@@ -6854,15 +7044,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} Sekunden</unitPattern>
 				<perUnitPattern>{0} pro Sekunde</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>Wochen</displayName>
-				<unitPattern count="one">{0} Woche</unitPattern>
-				<unitPattern count="other">{0} Wochen</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>Millisekunden</displayName>
+				<unitPattern count="one">{0} Millisekunde</unitPattern>
+				<unitPattern count="other">{0} Millisekunden</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>Jahre</displayName>
-				<unitPattern count="one">{0} Jahr</unitPattern>
-				<unitPattern count="other">{0} Jahre</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>Mikrosekunden</displayName>
+				<unitPattern count="one">{0} Mikrosekunde</unitPattern>
+				<unitPattern count="other">{0} Mikrosekunden</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>Nanosekunden</displayName>
+				<unitPattern count="one">{0} Nanosekunde</unitPattern>
+				<unitPattern count="other">{0} Nanosekunden</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>Ampere</displayName>
@@ -6884,6 +7079,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Volt</unitPattern>
 				<unitPattern count="other">{0} Volt</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>Kilokalorien</displayName>
+				<unitPattern count="one">{0} Kilokalorie</unitPattern>
+				<unitPattern count="other">{0} Kilokalorien</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>Kalorien</displayName>
 				<unitPattern count="one">{0} Kalorie</unitPattern>
@@ -6891,17 +7091,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="energy-foodcalorie">
 				<displayName>Kilokalorien</displayName>
-				<unitPattern count="one">{0} Cal</unitPattern>
-				<unitPattern count="other">{0} Kilokalorien</unitPattern>
-			</unit>
-			<unit type="energy-joule">
-				<displayName>Joule</displayName>
-				<unitPattern count="one">{0} Joule</unitPattern>
-				<unitPattern count="other">{0} Joule</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>Kilokalorien</displayName>
-				<unitPattern count="one">{0} Kilokalorie</unitPattern>
+				<unitPattern count="one">{0} Kilokalorien</unitPattern>
 				<unitPattern count="other">{0} Kilokalorien</unitPattern>
 			</unit>
 			<unit type="energy-kilojoule">
@@ -6909,6 +7099,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Kilojoule</unitPattern>
 				<unitPattern count="other">{0} Kilojoule</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>Joule</displayName>
+				<unitPattern count="one">{0} Joule</unitPattern>
+				<unitPattern count="other">{0} Joule</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>Kilowattstunden</displayName>
 				<unitPattern count="one">{0} Kilowattstunde</unitPattern>
@@ -6919,216 +7114,220 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Gigahertz</unitPattern>
 				<unitPattern count="other">{0} Gigahertz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hertz</displayName>
-				<unitPattern count="one">{0} Hertz</unitPattern>
-				<unitPattern count="other">{0} Hertz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>Megahertz</displayName>
+				<unitPattern count="one">{0} Megahertz</unitPattern>
+				<unitPattern count="other">{0} Megahertz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>Kilohertz</displayName>
 				<unitPattern count="one">{0} Kilohertz</unitPattern>
 				<unitPattern count="other">{0} Kilohertz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>Megahertz</displayName>
-				<unitPattern count="one">{0} Megahertz</unitPattern>
-				<unitPattern count="other">{0} Megahertz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hertz</displayName>
+				<unitPattern count="one">{0} Hertz</unitPattern>
+				<unitPattern count="other">{0} Hertz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>Astronomische Einheiten</displayName>
-				<unitPattern count="one">{0} AE</unitPattern>
-				<unitPattern count="other">{0} AE</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>Kilometer</displayName>
+				<unitPattern count="one">{0} Kilometer</unitPattern>
+				<unitPattern count="other">{0} Kilometer</unitPattern>
+				<perUnitPattern>{0} pro Kilometer</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>Zentimeter</displayName>
-				<unitPattern count="one">{0} Zentimeter</unitPattern>
-				<unitPattern count="other">{0} Zentimeter</unitPattern>
+			<unit type="length-meter">
+				<displayName>Meter</displayName>
+				<unitPattern count="one">{0} Meter</unitPattern>
+				<unitPattern count="other">{0} Meter</unitPattern>
+				<perUnitPattern>{0} pro Meter</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>Dezimeter</displayName>
 				<unitPattern count="one">{0} Dezimeter</unitPattern>
 				<unitPattern count="other">{0} Dezimeter</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName draft="contributed">Nautischer Faden</displayName>
-				<unitPattern count="one" draft="contributed">{0} Faden</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Faden</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>Fuß</displayName>
-				<unitPattern count="one">{0} Fuß</unitPattern>
-				<unitPattern count="other">{0} Fuß</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName draft="contributed">Furlong</displayName>
-				<unitPattern count="one" draft="contributed">{0} Furlong</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Furlong</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>Zoll</displayName>
-				<unitPattern count="one">{0} Zoll</unitPattern>
-				<unitPattern count="other">{0} Zoll</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>Kilometer</displayName>
-				<unitPattern count="one">{0} Kilometer</unitPattern>
-				<unitPattern count="other">{0} Kilometer</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>Lichtjahre</displayName>
-				<unitPattern count="one">{0} Lichtjahr</unitPattern>
-				<unitPattern count="other">{0} Lichtjahre</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>Meter</displayName>
-				<unitPattern count="one">{0} Meter</unitPattern>
-				<unitPattern count="other">{0} Meter</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>Mikrometer</displayName>
-				<unitPattern count="one">{0} Mikrometer</unitPattern>
-				<unitPattern count="other">{0} Mikrometer</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>Meilen</displayName>
-				<unitPattern count="one">{0} Meile</unitPattern>
-				<unitPattern count="other">{0} Meilen</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>Zentimeter</displayName>
+				<unitPattern count="one">{0} Zentimeter</unitPattern>
+				<unitPattern count="other">{0} Zentimeter</unitPattern>
+				<perUnitPattern>{0} pro Zentimeter</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>Millimeter</displayName>
 				<unitPattern count="one">{0} Millimeter</unitPattern>
 				<unitPattern count="other">{0} Millimeter</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>Mikrometer</displayName>
+				<unitPattern count="one">{0} Mikrometer</unitPattern>
+				<unitPattern count="other">{0} Mikrometer</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>Nanometer</displayName>
 				<unitPattern count="one">{0} Nanometer</unitPattern>
 				<unitPattern count="other">{0} Nanometer</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>Seemeilen</displayName>
-				<unitPattern count="one">{0} Seemeile</unitPattern>
-				<unitPattern count="other">{0} Seemeilen</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>Parsec</displayName>
-				<unitPattern count="one">{0} Parsec</unitPattern>
-				<unitPattern count="other">{0} Parsec</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>Pikometer</displayName>
 				<unitPattern count="one">{0} Pikometer</unitPattern>
 				<unitPattern count="other">{0} Pikometer</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>Meilen</displayName>
+				<unitPattern count="one">{0} Meile</unitPattern>
+				<unitPattern count="other">{0} Meilen</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>Yards</displayName>
 				<unitPattern count="one">{0} Yard</unitPattern>
 				<unitPattern count="other">{0} Yards</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>Fuß</displayName>
+				<unitPattern count="one">{0} Fuß</unitPattern>
+				<unitPattern count="other">{0} Fuß</unitPattern>
+				<perUnitPattern>{0} pro Fuß</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>Zoll</displayName>
+				<unitPattern count="one">{0} Zoll</unitPattern>
+				<unitPattern count="other">{0} Zoll</unitPattern>
+				<perUnitPattern>{0} pro Zoll</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>Parsec</displayName>
+				<unitPattern count="one">{0} Parsec</unitPattern>
+				<unitPattern count="other">{0} Parsec</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>Lichtjahre</displayName>
+				<unitPattern count="one">{0} Lichtjahr</unitPattern>
+				<unitPattern count="other">{0} Lichtjahre</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>Astronomische Einheiten</displayName>
+				<unitPattern count="one">{0} AE</unitPattern>
+				<unitPattern count="other">{0} AE</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName draft="contributed">Furlong</displayName>
+				<unitPattern count="one" draft="contributed">{0} Furlong</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Furlong</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName draft="contributed">Nautischer Faden</displayName>
+				<unitPattern count="one" draft="contributed">{0} Faden</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Faden</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>Seemeilen</displayName>
+				<unitPattern count="one">{0} Seemeile</unitPattern>
+				<unitPattern count="other">{0} Seemeilen</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>skandinavische Meilen</displayName>
+				<unitPattern count="one">{0} skandinavische Meile</unitPattern>
+				<unitPattern count="other">{0} skandinavische Meilen</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>Lux</displayName>
 				<unitPattern count="one">{0} Lux</unitPattern>
 				<unitPattern count="other">{0} Lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>Karat</displayName>
-				<unitPattern count="one">{0} Karat</unitPattern>
-				<unitPattern count="other">{0} Karat</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>Gramm</displayName>
-				<unitPattern count="one">{0} Gramm</unitPattern>
-				<unitPattern count="other">{0} Gramm</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>Kilogramm</displayName>
-				<unitPattern count="one">{0} Kilogramm</unitPattern>
-				<unitPattern count="other">{0} Kilogramm</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>Tonnen</displayName>
 				<unitPattern count="one">{0} Tonne</unitPattern>
 				<unitPattern count="other">{0} Tonnen</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>Mikrogramm</displayName>
-				<unitPattern count="one">{0} Mikrogramm</unitPattern>
-				<unitPattern count="other">{0} Mikrogramm</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>Kilogramm</displayName>
+				<unitPattern count="one">{0} Kilogramm</unitPattern>
+				<unitPattern count="other">{0} Kilogramm</unitPattern>
+				<perUnitPattern>{0} pro Kilogramm</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>Gramm</displayName>
+				<unitPattern count="one">{0} Gramm</unitPattern>
+				<unitPattern count="other">{0} Gramm</unitPattern>
+				<perUnitPattern>{0} pro Gramm</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>Milligramm</displayName>
 				<unitPattern count="one">{0} Milligramm</unitPattern>
 				<unitPattern count="other">{0} Milligramm</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>Unzen</displayName>
-				<unitPattern count="one">{0} Unze</unitPattern>
-				<unitPattern count="other">{0} Unzen</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>Feinunzen</displayName>
-				<unitPattern count="one">{0} Feinunze</unitPattern>
-				<unitPattern count="other">{0} Feinunzen</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>Pfund</displayName>
-				<unitPattern count="one">{0} Pfund</unitPattern>
-				<unitPattern count="other">{0} Pfund</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="contributed">Stones</displayName>
-				<unitPattern count="one" draft="contributed">{0} Stone</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Stones</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>Mikrogramm</displayName>
+				<unitPattern count="one">{0} Mikrogramm</unitPattern>
+				<unitPattern count="other">{0} Mikrogramm</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>Short Tons</displayName>
 				<unitPattern count="one">{0} Short Ton</unitPattern>
 				<unitPattern count="other">{0} Short Tons</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName draft="contributed">Stones</displayName>
+				<unitPattern count="one" draft="contributed">{0} Stone</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Stones</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>Pfund</displayName>
+				<unitPattern count="one">{0} Pfund</unitPattern>
+				<unitPattern count="other">{0} Pfund</unitPattern>
+				<perUnitPattern>{0} pro Pfund</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>Unzen</displayName>
+				<unitPattern count="one">{0} Unze</unitPattern>
+				<unitPattern count="other">{0} Unzen</unitPattern>
+				<perUnitPattern>{0} pro Unze</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>Feinunzen</displayName>
+				<unitPattern count="one">{0} Feinunze</unitPattern>
+				<unitPattern count="other">{0} Feinunzen</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>Karat</displayName>
+				<unitPattern count="one">{0} Karat</unitPattern>
+				<unitPattern count="other">{0} Karat</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>Gigawatt</displayName>
 				<unitPattern count="one">{0} Gigawatt</unitPattern>
 				<unitPattern count="other">{0} Gigawatt</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>Pferdestärken</displayName>
-				<unitPattern count="one">{0} Pferdestärke</unitPattern>
-				<unitPattern count="other">{0} Pferdestärken</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>Kilowatt</displayName>
-				<unitPattern count="one">{0} Kilowatt</unitPattern>
-				<unitPattern count="other">{0} Kilowatt</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>Megawatt</displayName>
 				<unitPattern count="one">{0} Megawatt</unitPattern>
 				<unitPattern count="other">{0} Megawatt</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>Milliwatt</displayName>
-				<unitPattern count="one">{0} Milliwatt</unitPattern>
-				<unitPattern count="other">{0} Milliwatt</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>Kilowatt</displayName>
+				<unitPattern count="one">{0} Kilowatt</unitPattern>
+				<unitPattern count="other">{0} Kilowatt</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>Watt</displayName>
 				<unitPattern count="one">{0} Watt</unitPattern>
 				<unitPattern count="other">{0} Watt</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>Milliwatt</displayName>
+				<unitPattern count="one">{0} Milliwatt</unitPattern>
+				<unitPattern count="other">{0} Milliwatt</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>Pferdestärken</displayName>
+				<unitPattern count="one">{0} Pferdestärke</unitPattern>
+				<unitPattern count="other">{0} Pferdestärken</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>Hektopascal</displayName>
 				<unitPattern count="one">{0} Hektopascal</unitPattern>
 				<unitPattern count="other">{0} Hektopascal</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>Zoll Quecksilbersäule</displayName>
-				<unitPattern count="one">{0} Zoll Quecksilbersäule</unitPattern>
-				<unitPattern count="other">{0} Zoll Quecksilbersäule</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>Millibar</displayName>
-				<unitPattern count="one">{0} Millibar</unitPattern>
-				<unitPattern count="other">{0} Millibar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>Millimeter Quecksilbersäule</displayName>
 				<unitPattern count="one">{0} Millimeter Quecksilbersäule</unitPattern>
@@ -7139,10 +7338,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Pfund pro Quadratzoll</unitPattern>
 				<unitPattern count="other">{0} Pfund pro Quadratzoll</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>Karat</displayName>
-				<unitPattern count="one">{0} Karat</unitPattern>
-				<unitPattern count="other">{0} Karat</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>Zoll Quecksilbersäule</displayName>
+				<unitPattern count="one">{0} Zoll Quecksilbersäule</unitPattern>
+				<unitPattern count="other">{0} Zoll Quecksilbersäule</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>Millibar</displayName>
+				<unitPattern count="one">{0} Millibar</unitPattern>
+				<unitPattern count="other">{0} Millibar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>Kilometer pro Stunde</displayName>
@@ -7159,6 +7363,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Meile pro Stunde</unitPattern>
 				<unitPattern count="other">{0} Meilen pro Stunde</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>Knoten</displayName>
+				<unitPattern count="one">{0} Knoten</unitPattern>
+				<unitPattern count="other">{0} Knoten</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName draft="contributed">°</displayName>
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>Grad Celsius</displayName>
 				<unitPattern count="one">{0} Grad Celsius</unitPattern>
@@ -7174,36 +7388,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Kelvin</unitPattern>
 				<unitPattern count="other">{0} Kelvin</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>Acre-Feet</displayName>
-				<unitPattern count="one">{0} Acre-Foot</unitPattern>
-				<unitPattern count="other">{0} Acre-Feet</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName draft="contributed">Bushel</displayName>
-				<unitPattern count="one" draft="contributed">{0} Bushel</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Bushel</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>Zentiliter</displayName>
-				<unitPattern count="one">{0} Zentiliter</unitPattern>
-				<unitPattern count="other">{0} Zentiliter</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>Kubikzentimeter</displayName>
-				<unitPattern count="one">{0} Kubikzentimeter</unitPattern>
-				<unitPattern count="other">{0} Kubikzentimeter</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>Kubikfuß</displayName>
-				<unitPattern count="one">{0} Kubikfuß</unitPattern>
-				<unitPattern count="other">{0} Kubikfuß</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>Kubikzoll</displayName>
-				<unitPattern count="one">{0} Kubikzoll</unitPattern>
-				<unitPattern count="other">{0} Kubikzoll</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>Kubikkilometer</displayName>
 				<unitPattern count="one">{0} Kubikkilometer</unitPattern>
@@ -7213,6 +7397,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Kubikmeter</displayName>
 				<unitPattern count="one">{0} Kubikmeter</unitPattern>
 				<unitPattern count="other">{0} Kubikmeter</unitPattern>
+				<perUnitPattern>{0} pro Kubikmeter</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>Kubikzentimeter</displayName>
+				<unitPattern count="one">{0} Kubikzentimeter</unitPattern>
+				<unitPattern count="other">{0} Kubikzentimeter</unitPattern>
+				<perUnitPattern>{0} pro Kubikzentimeter</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>Kubikmeilen</displayName>
@@ -7224,25 +7415,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Kubikyard</unitPattern>
 				<unitPattern count="other">{0} Kubikyards</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>Cups</displayName>
-				<unitPattern count="one">{0} Cup</unitPattern>
-				<unitPattern count="other">{0} Cups</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>Kubikfuß</displayName>
+				<unitPattern count="one">{0} Kubikfuß</unitPattern>
+				<unitPattern count="other">{0} Kubikfuß</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>Deziliter</displayName>
-				<unitPattern count="one">{0} Deziliter</unitPattern>
-				<unitPattern count="other">{0} Deziliter</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>Kubikzoll</displayName>
+				<unitPattern count="one">{0} Kubikzoll</unitPattern>
+				<unitPattern count="other">{0} Kubikzoll</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>Flüssigunzen</displayName>
-				<unitPattern count="one">{0} Flüssigunze</unitPattern>
-				<unitPattern count="other">{0} Flüssigunzen</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>Gallonen</displayName>
-				<unitPattern count="one">{0} Gallone</unitPattern>
-				<unitPattern count="other">{0} Gallonen</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Megaliter</displayName>
+				<unitPattern count="one">{0} Megaliter</unitPattern>
+				<unitPattern count="other">{0} Megaliter</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>Hektoliter</displayName>
@@ -7253,27 +7439,69 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Liter</displayName>
 				<unitPattern count="one">{0} Liter</unitPattern>
 				<unitPattern count="other">{0} Liter</unitPattern>
+				<perUnitPattern>{0} pro Liter</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Megaliter</displayName>
-				<unitPattern count="one">{0} Megaliter</unitPattern>
-				<unitPattern count="other">{0} Megaliter</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>Deziliter</displayName>
+				<unitPattern count="one">{0} Deziliter</unitPattern>
+				<unitPattern count="other">{0} Deziliter</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>Zentiliter</displayName>
+				<unitPattern count="one">{0} Zentiliter</unitPattern>
+				<unitPattern count="other">{0} Zentiliter</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>Milliliter</displayName>
 				<unitPattern count="one">{0} Milliliter</unitPattern>
 				<unitPattern count="other">{0} Milliliter</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>Pints</displayName>
-				<unitPattern count="one">{0} Pint</unitPattern>
-				<unitPattern count="other">{0} Pints</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName draft="contributed">metrische Pints</displayName>
+				<unitPattern count="one" draft="contributed">{0} metrisches Pint</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} metrische Pints</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName draft="contributed">Tasse</displayName>
+				<unitPattern count="one" draft="contributed">{0} Tasse</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Tassen</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>Acre-Feet</displayName>
+				<unitPattern count="one">{0} Acre-Foot</unitPattern>
+				<unitPattern count="other">{0} Acre-Feet</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName draft="contributed">Bushel</displayName>
+				<unitPattern count="one" draft="contributed">{0} Bushel</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Bushel</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>Gallonen</displayName>
+				<unitPattern count="one">{0} Gallone</unitPattern>
+				<unitPattern count="other">{0} Gallonen</unitPattern>
+				<perUnitPattern>{0} pro Gallone</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>Quart</displayName>
 				<unitPattern count="one">{0} Quart</unitPattern>
 				<unitPattern count="other">{0} Quart</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>Pints</displayName>
+				<unitPattern count="one">{0} Pint</unitPattern>
+				<unitPattern count="other">{0} Pints</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>Cups</displayName>
+				<unitPattern count="one">{0} Cup</unitPattern>
+				<unitPattern count="other">{0} Cups</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>Flüssigunzen</displayName>
+				<unitPattern count="one">{0} Flüssigunze</unitPattern>
+				<unitPattern count="other">{0} Flüssigunzen</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>Esslöffel</displayName>
 				<unitPattern count="one">{0} Esslöffel</unitPattern>
@@ -7284,6 +7512,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Teelöffel</unitPattern>
 				<unitPattern count="other">{0} Teelöffel</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} Ost</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} Nord</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} Süd</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} West</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -7299,6 +7533,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName draft="contributed">Umdr.</displayName>
+				<unitPattern count="one" draft="contributed">{0} Umdr.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Umdr.</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>Grad</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>Winkelminuten</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
@@ -7309,30 +7558,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>Grad</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>Acres</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>Hektar</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>Acres</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ft²</displayName>
@@ -7343,122 +7604,118 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>in²</displayName>
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>Karat</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
 				<unitPattern count="other">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100 km</displayName>
+				<unitPattern count="one">{0} L/100 km</unitPattern>
+				<unitPattern count="other">{0} L/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>Bit</displayName>
-				<unitPattern count="one">{0} Bit</unitPattern>
-				<unitPattern count="other">{0} Bits</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>Byte</displayName>
-				<unitPattern count="one">{0} Byte</unitPattern>
-				<unitPattern count="other">{0} Bytes</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gigabit</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>Gigabyte</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kbit</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kbyte</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mbit</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>Mbyte</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>Gigabyte</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gigabit</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>Mbyte</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mbit</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kbyte</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kbit</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>Byte</displayName>
+				<unitPattern count="one">{0} Byte</unitPattern>
+				<unitPattern count="other">{0} Bytes</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>Bit</displayName>
+				<unitPattern count="one">{0} Bit</unitPattern>
+				<unitPattern count="other">{0} Bits</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>Jh.</displayName>
+				<unitPattern count="one">{0} Jh.</unitPattern>
+				<unitPattern count="other">{0} Jh.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+				<perUnitPattern>{0}/J</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>Mon.</displayName>
+				<unitPattern count="one">{0} Mon.</unitPattern>
+				<unitPattern count="other">{0} Mon.</unitPattern>
+				<perUnitPattern>{0}/M</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>Wo.</displayName>
+				<unitPattern count="one">{0} Wo.</unitPattern>
+				<unitPattern count="other">{0} Wo.</unitPattern>
+				<perUnitPattern>{0}/W</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
-				<displayName>Tage</displayName>
-				<unitPattern count="one">{0} T</unitPattern>
-				<unitPattern count="other">{0} T</unitPattern>
+				<displayName>Tg.</displayName>
+				<unitPattern count="one">{0} Tg.</unitPattern>
+				<unitPattern count="other">{0} Tg.</unitPattern>
+				<perUnitPattern>{0}/T</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName>Stunden</displayName>
+				<displayName>Std.</displayName>
 				<unitPattern count="one">{0} Std.</unitPattern>
 				<unitPattern count="other">{0} Std.</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>Millisekunden</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>Min.</displayName>
 				<unitPattern count="one">{0} Min.</unitPattern>
 				<unitPattern count="other">{0} Min.</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">Monate</displayName>
-				<unitPattern count="one">{0} Mon</unitPattern>
-				<unitPattern count="other">{0} Mon</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>Nanosekunden</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>Sek.</displayName>
@@ -7466,15 +7723,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} Sek.</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>Wochen</displayName>
-				<unitPattern count="one">{0} W</unitPattern>
-				<unitPattern count="other">{0} W</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>Jahre</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>Ampere</displayName>
@@ -7496,6 +7758,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -7506,21 +7773,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kcal</unitPattern>
 				<unitPattern count="other">{0} kcal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>Joule</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>Kilojoule</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>Joule</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -7531,216 +7793,220 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>AE</displayName>
-				<unitPattern count="one">{0} AE</unitPattern>
-				<unitPattern count="other">{0} AE</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>Kilometer</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>Meter</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName draft="contributed">Faden</displayName>
-				<unitPattern count="one" draft="contributed">{0} fm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>Fuß</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName draft="contributed">Furlong</displayName>
-				<unitPattern count="one" draft="contributed">{0} fur</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fur</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>Zoll</displayName>
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>Kilometer</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>Lichtjahre</displayName>
-				<unitPattern count="one">{0} Lj</unitPattern>
-				<unitPattern count="other">{0} Lj</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>Meter</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>Meilen</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>Millimeter</displayName>
 				<unitPattern count="one">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>sm</displayName>
-				<unitPattern count="one">{0} sm</unitPattern>
-				<unitPattern count="other">{0} sm</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>Parsec</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>Pikometer</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>Meilen</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>Yards</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>Fuß</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>Zoll</displayName>
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>Parsec</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>Lichtjahre</displayName>
+				<unitPattern count="one">{0} Lj</unitPattern>
+				<unitPattern count="other">{0} Lj</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>AE</displayName>
+				<unitPattern count="one">{0} AE</unitPattern>
+				<unitPattern count="other">{0} AE</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName draft="contributed">Furlong</displayName>
+				<unitPattern count="one" draft="contributed">{0} fur</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fur</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName draft="contributed">Faden</displayName>
+				<unitPattern count="one" draft="contributed">{0} fm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fm</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>sm</displayName>
+				<unitPattern count="one">{0} sm</unitPattern>
+				<unitPattern count="other">{0} sm</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>Lux</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>Karat</displayName>
-				<unitPattern count="one">{0} Kt</unitPattern>
-				<unitPattern count="other">{0} Kt</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>Gramm</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>Gramm</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>Unzen</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz.tr.</displayName>
-				<unitPattern count="one">{0} oz.tr.</unitPattern>
-				<unitPattern count="other">{0} oz.tr.</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>Pfund</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="contributed">Stones</displayName>
-				<unitPattern count="one" draft="contributed">{0} st</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} st</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>Tons</displayName>
 				<unitPattern count="one">{0} tn</unitPattern>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName draft="contributed">Stones</displayName>
+				<unitPattern count="one" draft="contributed">{0} st</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>Pfund</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>Unzen</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz.tr.</displayName>
+				<unitPattern count="one">{0} oz.tr.</unitPattern>
+				<unitPattern count="other">{0} oz.tr.</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>Karat</displayName>
+				<unitPattern count="one">{0} Kt</unitPattern>
+				<unitPattern count="other">{0} Kt</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>Pferdestärken</displayName>
-				<unitPattern count="one">{0} PS</unitPattern>
-				<unitPattern count="other">{0} PS</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>Kilowatt</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>Kilowatt</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>Watt</displayName>
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>Pferdestärken</displayName>
+				<unitPattern count="one">{0} PS</unitPattern>
+				<unitPattern count="other">{0} PS</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>Millibar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -7751,10 +8017,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>Karat</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>Millibar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -7771,6 +8042,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName draft="contributed">°</displayName>
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0} °C</unitPattern>
@@ -7786,36 +8067,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>Acre-Feet</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName draft="contributed">Bushel</displayName>
-				<unitPattern count="one" draft="contributed">{0} bu</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} bu</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -7825,6 +8076,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -7836,25 +8094,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>Cups</displayName>
-				<unitPattern count="one">{0} Cup</unitPattern>
-				<unitPattern count="other">{0} Cups</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -7865,27 +8118,69 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Liter</displayName>
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="one">{0} Ml</unitPattern>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
 				<unitPattern count="one">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>Pints</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName draft="contributed">metr. Pints</displayName>
+				<unitPattern count="one" draft="contributed">{0} mpt</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>Acre-Feet</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName draft="contributed">Bushel</displayName>
+				<unitPattern count="one" draft="contributed">{0} bu</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} bu</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>Quart</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>Pints</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>Cups</displayName>
+				<unitPattern count="one">{0} Cup</unitPattern>
+				<unitPattern count="other">{0} Cups</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>EL</displayName>
 				<unitPattern count="one">{0} EL</unitPattern>
@@ -7896,6 +8191,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} TL</unitPattern>
 				<unitPattern count="other">{0} TL</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} O</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -7909,6 +8210,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} m/s²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one" draft="contributed">{0}′</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}′</unitPattern>
@@ -7917,27 +8227,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0}″</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one" draft="contributed">{0} ac</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one" draft="contributed">{0} ha</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<unitPattern count="one" draft="contributed">{0} m²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} m²</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<unitPattern count="one" draft="contributed">{0} cm²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} cm²</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<unitPattern count="one" draft="contributed">{0} mi²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one" draft="contributed">{0} ac</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<unitPattern count="one" draft="contributed">{0} yd²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} yd²</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<unitPattern count="one" draft="contributed">{0} ft²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ft²</unitPattern>
@@ -7946,72 +8263,86 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} in²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} in²</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<unitPattern count="one" draft="contributed">{0} m²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<unitPattern count="one" draft="contributed">{0} mi²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<unitPattern count="one" draft="contributed">{0} yd²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<unitPattern count="one" draft="contributed">{0} kt</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="one" draft="contributed">{0} l/km</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName draft="contributed">L/100 km</displayName>
+				<unitPattern count="one">{0} L/100 km</unitPattern>
+				<unitPattern count="other">{0} L/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<unitPattern count="one" draft="contributed">{0} mpg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<unitPattern count="one" draft="contributed">{0} Bit</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Bits</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<unitPattern count="one" draft="contributed">{0} Byte</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Bytes</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<unitPattern count="one" draft="contributed">{0} Gb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<unitPattern count="one" draft="contributed">{0} GB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<unitPattern count="one" draft="contributed">{0} kb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<unitPattern count="one" draft="contributed">{0} kB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<unitPattern count="one" draft="contributed">{0} Mb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<unitPattern count="one" draft="contributed">{0} MB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<unitPattern count="one" draft="contributed">{0} Tb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<unitPattern count="one" draft="contributed">{0} TB</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<unitPattern count="one" draft="contributed">{0} Tb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<unitPattern count="one" draft="contributed">{0} GB</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<unitPattern count="one" draft="contributed">{0} Gb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<unitPattern count="one" draft="contributed">{0} MB</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<unitPattern count="one" draft="contributed">{0} Mb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<unitPattern count="one" draft="contributed">{0} kB</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<unitPattern count="one" draft="contributed">{0} kb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<unitPattern count="one" draft="contributed">{0} Byte</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Bytes</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<unitPattern count="one" draft="contributed">{0} Bit</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Bits</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="unconfirmed">Jahrh.</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} Jahrh.</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} Jahrh.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/Jahr</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>M</displayName>
+				<unitPattern count="one">{0} M</unitPattern>
+				<unitPattern count="other">{0} M</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>W</displayName>
+				<unitPattern count="one">{0} W</unitPattern>
+				<unitPattern count="other">{0} W</unitPattern>
+			</unit>
 			<unit type="duration-day">
-				<displayName>Tag</displayName>
+				<displayName>T</displayName>
 				<unitPattern count="one">{0} T</unitPattern>
 				<unitPattern count="other">{0} T</unitPattern>
 			</unit>
@@ -8020,43 +8351,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Std.</unitPattern>
 				<unitPattern count="other">{0} Std.</unitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<unitPattern count="one" draft="contributed">{0} μs</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>Millisekunden</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>Min.</displayName>
 				<unitPattern count="one">{0} Min.</unitPattern>
 				<unitPattern count="other">{0} Min.</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>Monat</displayName>
-				<unitPattern count="one">{0} M</unitPattern>
-				<unitPattern count="other">{0} M</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<unitPattern count="one" draft="contributed">{0} ns</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ns</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>Sek.</displayName>
 				<unitPattern count="one">{0} s</unitPattern>
 				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>Woche</displayName>
-				<unitPattern count="one">{0} W</unitPattern>
-				<unitPattern count="other">{0} W</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>J</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
+			<unit type="duration-microsecond">
+				<unitPattern count="one" draft="contributed">{0} μs</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<unitPattern count="one" draft="contributed">{0} ns</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<unitPattern count="one" draft="contributed">{0} A</unitPattern>
@@ -8074,6 +8390,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} V</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<unitPattern count="one" draft="contributed">{0} cal</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} cal</unitPattern>
@@ -8082,18 +8402,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<unitPattern count="one" draft="contributed">{0} J</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<unitPattern count="one" draft="contributed">{0} kJ</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<unitPattern count="one" draft="contributed">{0} J</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<unitPattern count="one" draft="contributed">{0} kWh</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kWh</unitPattern>
@@ -8102,125 +8418,141 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} GHz</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<unitPattern count="one" draft="contributed">{0} Hz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<unitPattern count="one" draft="contributed">{0} MHz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<unitPattern count="one" draft="contributed">{0} kHz</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<unitPattern count="one" draft="contributed">{0} MHz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<unitPattern count="one" draft="contributed">{0} Hz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<unitPattern count="one" draft="contributed">{0} AE</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} AE</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/km</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>Meter</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/m</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<unitPattern count="one" draft="contributed">{0} dm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} dm</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
 				<displayName>cm</displayName>
 				<unitPattern count="one">{0} cm</unitPattern>
 				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
-			<unit type="length-decimeter">
-				<unitPattern count="one" draft="contributed">{0} dm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} dm</unitPattern>
+			<unit type="length-millimeter">
+				<displayName>mm</displayName>
+				<unitPattern count="one">{0} mm</unitPattern>
+				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName draft="contributed">Faden</displayName>
-				<unitPattern count="one" draft="contributed">{0} fm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fm</unitPattern>
+			<unit type="length-micrometer">
+				<unitPattern count="one" draft="contributed">{0} µm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} µm</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<unitPattern count="one" draft="contributed">{0} nm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} nm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<unitPattern count="one" draft="contributed">{0} pm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} pm</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one" draft="contributed">{0} mi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mi</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<unitPattern count="one" draft="contributed">{0} yd</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} yd</unitPattern>
 			</unit>
 			<unit type="length-foot">
 				<unitPattern count="one" draft="contributed">{0} ft</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ft</unitPattern>
 			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one" draft="contributed">{0} in</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} in</unitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<unitPattern count="one" draft="contributed">{0} pc</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one" draft="contributed">{0} ly</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<unitPattern count="one" draft="contributed">{0} AE</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} AE</unitPattern>
+			</unit>
 			<unit type="length-furlong">
 				<displayName draft="contributed">Furlong</displayName>
 				<unitPattern count="one" draft="contributed">{0} fur</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} fur</unitPattern>
 			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one" draft="contributed">{0} in</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one" draft="contributed">{0} ly</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ly</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>Meter</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<unitPattern count="one" draft="contributed">{0} µm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one" draft="contributed">{0} mi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mi</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>mm</displayName>
-				<unitPattern count="one">{0} mm</unitPattern>
-				<unitPattern count="other">{0} mm</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<unitPattern count="one" draft="contributed">{0} nm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} nm</unitPattern>
+			<unit type="length-fathom">
+				<displayName draft="contributed">Faden</displayName>
+				<unitPattern count="one" draft="contributed">{0} fm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fm</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
 				<unitPattern count="one" draft="contributed">{0} sm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} sm</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<unitPattern count="one" draft="contributed">{0} pc</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pc</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<unitPattern count="one" draft="contributed">{0} pm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pm</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<unitPattern count="one" draft="contributed">{0} yd</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} yd</unitPattern>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
 			</unit>
 			<unit type="light-lux">
 				<unitPattern count="one" draft="contributed">{0} lx</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<unitPattern count="one" draft="contributed">{0} Kt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Kt</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>Gramm</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="mass-metric-ton">
+				<unitPattern count="one" draft="contributed">{0} t</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} t</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="one">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-metric-ton">
-				<unitPattern count="one" draft="contributed">{0} t</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} t</unitPattern>
+			<unit type="mass-gram">
+				<displayName>Gramm</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<unitPattern count="one" draft="contributed">{0} mg</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mg</unitPattern>
 			</unit>
 			<unit type="mass-microgram">
 				<unitPattern count="one" draft="contributed">{0} µg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} µg</unitPattern>
 			</unit>
-			<unit type="mass-milligram">
-				<unitPattern count="one" draft="contributed">{0} mg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mg</unitPattern>
+			<unit type="mass-ton">
+				<unitPattern count="one" draft="contributed">{0} tn</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} tn</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName draft="contributed">Stones</displayName>
+				<unitPattern count="one" draft="contributed">{0} st</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<unitPattern count="one" draft="contributed">{0} lb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} lb</unitPattern>
 			</unit>
 			<unit type="mass-ounce">
 				<unitPattern count="one" draft="contributed">{0} oz</unitPattern>
@@ -8230,55 +8562,38 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} oz.tr.</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} oz.tr.</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<unitPattern count="one" draft="contributed">{0} lb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} lb</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="contributed">Stones</displayName>
-				<unitPattern count="one" draft="contributed">{0} st</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} st</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<unitPattern count="one" draft="contributed">{0} tn</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} tn</unitPattern>
+			<unit type="mass-carat">
+				<unitPattern count="one" draft="contributed">{0} Kt</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Kt</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<unitPattern count="one" draft="contributed">{0} GW</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one" draft="contributed">{0} PS</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} PS</unitPattern>
+			<unit type="power-megawatt">
+				<unitPattern count="one" draft="contributed">{0} MW</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} MW</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one" draft="contributed">{0} kW</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kW</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<unitPattern count="one" draft="contributed">{0} MW</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MW</unitPattern>
+			<unit type="power-watt">
+				<unitPattern count="one" draft="contributed">{0} W</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} W</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<unitPattern count="one" draft="contributed">{0} mW</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mW</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<unitPattern count="one" draft="contributed">{0} W</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} W</unitPattern>
+			<unit type="power-horsepower">
+				<unitPattern count="one" draft="contributed">{0} PS</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} PS</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one" draft="contributed">{0} hPa</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<unitPattern count="one" draft="contributed">{0} mbar</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<unitPattern count="one" draft="contributed">{0} mm Hg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mm Hg</unitPattern>
@@ -8287,9 +8602,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} psi</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<unitPattern count="one" draft="contributed">{0} kt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<unitPattern count="one" draft="contributed">{0} mbar</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -8317,31 +8636,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} K</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<unitPattern count="one" draft="contributed">{0} ac ft</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName draft="contributed">Bushel</displayName>
-				<unitPattern count="one" draft="contributed">{0} bu</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} bu</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<unitPattern count="one" draft="contributed">{0} cl</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<unitPattern count="one" draft="contributed">{0} cm³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<unitPattern count="one" draft="contributed">{0} ft³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<unitPattern count="one" draft="contributed">{0} in³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<unitPattern count="one" draft="contributed">{0} km³</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} km³</unitPattern>
@@ -8350,6 +8644,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} m³</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} m³</unitPattern>
 			</unit>
+			<unit type="volume-cubic-centimeter">
+				<unitPattern count="one" draft="contributed">{0} cm³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cm³</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/cm³</perUnitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<unitPattern count="one" draft="contributed">{0} mi³</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mi³</unitPattern>
@@ -8358,21 +8657,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} yd³</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<unitPattern count="one" draft="contributed">{0} Cup</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Cups</unitPattern>
+			<unit type="volume-cubic-foot">
+				<unitPattern count="one" draft="contributed">{0} ft³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<unitPattern count="one" draft="contributed">{0} dl</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<unitPattern count="one" draft="contributed">{0} in³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<unitPattern count="one" draft="contributed">{0} fl oz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<unitPattern count="one" draft="contributed">{0} gal</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<unitPattern count="one" draft="contributed">{0} Ml</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<unitPattern count="one" draft="contributed">{0} hl</unitPattern>
@@ -8383,22 +8678,47 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<unitPattern count="one" draft="contributed">{0} Ml</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<unitPattern count="one" draft="contributed">{0} dl</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<unitPattern count="one" draft="contributed">{0} cl</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<unitPattern count="one" draft="contributed">{0} ml</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<unitPattern count="one" draft="contributed">{0} pt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pt</unitPattern>
+			<unit type="volume-acre-foot">
+				<unitPattern count="one" draft="contributed">{0} ac ft</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName draft="contributed">Bushel</displayName>
+				<unitPattern count="one" draft="contributed">{0} bu</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} bu</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<unitPattern count="one" draft="contributed">{0} gal</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} gal</unitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<unitPattern count="one" draft="contributed">{0} qt</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<unitPattern count="one" draft="contributed">{0} pt</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<unitPattern count="one" draft="contributed">{0} Cup</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Cups</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<unitPattern count="one" draft="contributed">{0} fl oz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<unitPattern count="one" draft="contributed">{0} EL</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} EL</unitPattern>
@@ -8407,6 +8727,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} TL</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} TL</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}O</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/de_AT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_AT.xml
similarity index 95%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/de_AT.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_AT.xml
index 1b716756e44..ef3d9499f5a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/de_AT.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_AT.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11250 $"/>
-		<generation date="$Date: 2015-02-18 17:24:51 -0600 (Wed, 18 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="de"/>
 		<territory type="AT"/>
 	</identity>
@@ -90,6 +89,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</calendars>
 	</dates>
 	<numbers>
+		<symbols numberSystem="latn">
+			<group draft="contributed"> </group>
+		</symbols>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/de_BE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_BE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/de_BE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_BE.xml
index 1777f59f5f4..a88e702ed56 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/de_BE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_BE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="de"/>
 		<territory type="BE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/de_CH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_CH.xml
similarity index 80%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/de_CH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_CH.xml
index 44cd70e0953..88fac336ba3 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/de_CH.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_CH.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11170 $"/>
-		<generation date="$Date: 2015-02-09 23:12:33 -0600 (Mon, 09 Feb 2015) $"/>
+		<version number="$Revision: 11987 $"/>
 		<language type="de"/>
 		<territory type="CH"/>
 	</identity>
@@ -34,11 +33,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<keys>
 			<key type="colCaseFirst" draft="contributed">Sortierung nach Gross- bzw. Kleinbuchstaben</key>
 			<key type="colCaseLevel" draft="contributed">Sortierung nach Gross- oder Kleinschreibung</key>
+			<key type="ms">Mass-System</key>
 		</keys>
 		<types>
-			<type type="no" key="colCaseLevel" draft="contributed">Ohne Gross-/Kleinschreibung sortieren</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">Grossbuchstaben zuerst aufführen</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">Nach Gross-/Kleinschreibung sortieren</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">Grossbuchstaben zuerst aufführen</type>
+			<type key="colCaseLevel" type="no" draft="contributed">Ohne Gross-/Kleinschreibung sortieren</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">Nach Gross-/Kleinschreibung sortieren</type>
+			<type key="ms" type="uksystem">britisches Mass-System</type>
+			<type key="ms" type="ussystem">US Mass-System</type>
 		</types>
 	</localeDisplayNames>
 	<characters>
@@ -50,6 +52,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<decimal>.</decimal>
 			<group>'</group>
 		</symbols>
+		<percentFormats numberSystem="latn">
+			<percentFormatLength>
+				<percentFormat>
+					<pattern draft="contributed">#,##0%</pattern>
+				</percentFormat>
+			</percentFormatLength>
+		</percentFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
@@ -63,8 +72,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Weissrussischer Rubel</displayName>
 				<displayName count="other">Weissrussische Rubel</displayName>
 			</currency>
-			<currency type="CHF">
-				<symbol>CHF</symbol>
+			<currency type="EUR">
+				<symbol draft="contributed">EUR</symbol>
+				<symbol alt="narrow" draft="contributed">EUR</symbol>
 			</currency>
 		</currencies>
 	</numbers>
@@ -79,6 +89,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Fuss</displayName>
 				<unitPattern count="one">{0} Fuss</unitPattern>
 				<unitPattern count="other">{0} Fuss</unitPattern>
+				<perUnitPattern>{0} pro Fuss</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-foot">
 				<displayName>Kubikfuss</displayName>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/de_DE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_DE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/de_DE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_DE.xml
index e4abfe23d6d..83304f4c5e3 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/de_DE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_DE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="de"/>
 		<territory type="DE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_LI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_LI.xml
new file mode 100644
index 00000000000..6474425f1eb
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_LI.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="de"/>
+		<territory type="LI"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<dayPeriods>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am" draft="contributed">vm.</dayPeriod>
+							<dayPeriod type="pm" draft="contributed">nm.</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<symbols numberSystem="latn">
+			<decimal>.</decimal>
+			<group>'</group>
+		</symbols>
+		<percentFormats numberSystem="latn">
+			<percentFormatLength>
+				<percentFormat>
+					<pattern draft="contributed">#,##0%</pattern>
+				</percentFormat>
+			</percentFormatLength>
+		</percentFormats>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>¤ #,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencies>
+			<currency type="EUR">
+				<symbol draft="contributed">EUR</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/de_LU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_LU.xml
similarity index 76%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/de_LU.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_LU.xml
index 51a28b4881b..8c5cb5073d1 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/de_LU.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_LU.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="de"/>
 		<territory type="LU"/>
 	</identity>
@@ -21,3 +20,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dje.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dje.xml
similarity index 95%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dje.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dje.xml
index b8af8b82441..d4afe62f87a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dje.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dje.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="dje"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angiiya</territory>
 			<territory type="AL">Albaani</territory>
 			<territory type="AM">Armeeni</territory>
-			<territory type="AN">Hollandu Antiiyey Laboo</territory>
 			<territory type="AO">Angoola</territory>
 			<territory type="AR">Argentine</territory>
 			<territory type="AS">Ameriki Samoa</territory>
@@ -448,6 +446,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">Subbaahi</dayPeriod>
+							<dayPeriod type="pm">Zaarikay b</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">Subbaahi</dayPeriod>
 							<dayPeriod type="pm">Zaarikay b</dayPeriod>
@@ -597,6 +599,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">0K¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -776,3 +794,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dje_NE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dje_NE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dje_NE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dje_NE.xml
index 172f8e2cbf3..790e12e0f0e 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dje_NE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dje_NE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="dje"/>
 		<territory type="NE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dsb.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dsb.xml
similarity index 97%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dsb.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dsb.xml
index 0d9e5e3680d..7cc43e53010 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dsb.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dsb.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc. CLDR data files are interpreted
+<!-- Copyright © 1991-2015 Unicode, Inc. CLDR data files are interpreted
 according to the LDML specification (http://unicode.org/reports/tr35/) For
 terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="dsb"/>
 	</identity>
 	<localeDisplayNames>
@@ -243,7 +242,7 @@ terms of use, see http://www.unicode.org/copyright.html
 			<language type="su">sundanšćina</language>
 			<language type="sv">šwedšćina</language>
 			<language type="sw">swahilišćina</language>
-			<language type="swc">kongojska swahilišćina</language>
+			<language type="sw_CD">kongojska swahilišćina</language>
 			<language type="ta">tamilšćina</language>
 			<language type="te">telugšćina</language>
 			<language type="teo">teso</language>
@@ -636,55 +635,55 @@ terms of use, see http://www.unicode.org/copyright.html
 			<key type="numbers">licby</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">arabisko-indiske cyfry</type>
-			<type type="arabext" key="numbers">rozšyrjone arabisko-indiske cyfry</type>
-			<type type="armn" key="numbers">armeńske cyfry</type>
-			<type type="armnlow" key="numbers">armeńske cyfry małopisane</type>
-			<type type="beng" key="numbers">bengalske cyfry</type>
-			<type type="buddhist" key="calendar">buddhistiski kalender</type>
-			<type type="chinese" key="calendar">chinski kalender</type>
-			<type type="dangi" key="calendar">dangi kalender</type>
-			<type type="deva" key="numbers">devanagari-cyfry</type>
-			<type type="ducet" key="collation">sortěrowański slěd pó Unicoźe</type>
-			<type type="ethi" key="numbers">etiopiske cyfry</type>
-			<type type="ethiopic" key="calendar">etiopiski kalender</type>
-			<type type="fullwide" key="numbers">połnošyroke cyfry</type>
-			<type type="geor" key="numbers">georgiske cyfry</type>
-			<type type="gregorian" key="calendar">gregoriański kalender</type>
-			<type type="grek" key="numbers">grichiske cyfry</type>
-			<type type="greklow" key="numbers">grichiske cyfry małopisane</type>
-			<type type="gujr" key="numbers">gujarati-cyfry</type>
-			<type type="guru" key="numbers">gurmukhi-cyfry</type>
-			<type type="hanidec" key="numbers">chinske decimalne licby</type>
-			<type type="hans" key="numbers">zjadnorjone chinske cyfry</type>
-			<type type="hansfin" key="numbers">zjadnorjone chinske financne cyfry</type>
-			<type type="hant" key="numbers">tradicionalne chinske cyfry</type>
-			<type type="hantfin" key="numbers">tradicionalne chinske financne cyfry</type>
-			<type type="hebr" key="numbers">hebrejske cyfry</type>
-			<type type="hebrew" key="calendar">žydojski kalender</type>
-			<type type="islamic" key="calendar">islamski kalender</type>
-			<type type="iso8601" key="calendar">iso-8601-kalender</type>
-			<type type="japanese" key="calendar">japański kalender</type>
-			<type type="jpan" key="numbers">japańske cyfry</type>
-			<type type="jpanfin" key="numbers">japańske financne cyfry</type>
-			<type type="khmr" key="numbers">khmerske cyfry</type>
-			<type type="knda" key="numbers">kannada-cyfry</type>
-			<type type="laoo" key="numbers">laotiske cyfry</type>
-			<type type="latn" key="numbers">arabiske cyfry</type>
-			<type type="mlym" key="numbers">malayalamske cyfry</type>
-			<type type="mymr" key="numbers">burmaske cyfry</type>
-			<type type="orya" key="numbers">oriya-cyfry</type>
-			<type type="persian" key="calendar">persiski kalender</type>
-			<type type="roc" key="calendar">kalender republiki China</type>
-			<type type="roman" key="numbers">romske cyfry</type>
-			<type type="romanlow" key="numbers">romske cyfry małopisane</type>
-			<type type="search" key="collation">powšykne pytanje</type>
-			<type type="standard" key="collation">standardny sortěrowański slěd</type>
-			<type type="taml" key="numbers">tradicionalne tamilske cyfry</type>
-			<type type="tamldec" key="numbers">tamilske cyfry</type>
-			<type type="telu" key="numbers">telugu-cyfry</type>
-			<type type="thai" key="numbers">thaiske cyfry</type>
-			<type type="tibt" key="numbers">tibetske cyfry</type>
+			<type key="calendar" type="buddhist">buddhistiski kalender</type>
+			<type key="calendar" type="chinese">chinski kalender</type>
+			<type key="calendar" type="dangi">dangi kalender</type>
+			<type key="calendar" type="ethiopic">etiopiski kalender</type>
+			<type key="calendar" type="gregorian">gregoriański kalender</type>
+			<type key="calendar" type="hebrew">žydojski kalender</type>
+			<type key="calendar" type="islamic">islamski kalender</type>
+			<type key="calendar" type="iso8601">iso-8601-kalender</type>
+			<type key="calendar" type="japanese">japański kalender</type>
+			<type key="calendar" type="persian">persiski kalender</type>
+			<type key="calendar" type="roc">kalender republiki China</type>
+			<type key="collation" type="ducet">sortěrowański slěd pó Unicoźe</type>
+			<type key="collation" type="search">powšykne pytanje</type>
+			<type key="collation" type="standard">standardny sortěrowański slěd</type>
+			<type key="numbers" type="arab">arabisko-indiske cyfry</type>
+			<type key="numbers" type="arabext">rozšyrjone arabisko-indiske cyfry</type>
+			<type key="numbers" type="armn">armeńske cyfry</type>
+			<type key="numbers" type="armnlow">armeńske cyfry małopisane</type>
+			<type key="numbers" type="beng">bengalske cyfry</type>
+			<type key="numbers" type="deva">devanagari-cyfry</type>
+			<type key="numbers" type="ethi">etiopiske cyfry</type>
+			<type key="numbers" type="fullwide">połnošyroke cyfry</type>
+			<type key="numbers" type="geor">georgiske cyfry</type>
+			<type key="numbers" type="grek">grichiske cyfry</type>
+			<type key="numbers" type="greklow">grichiske cyfry małopisane</type>
+			<type key="numbers" type="gujr">gujarati-cyfry</type>
+			<type key="numbers" type="guru">gurmukhi-cyfry</type>
+			<type key="numbers" type="hanidec">chinske decimalne licby</type>
+			<type key="numbers" type="hans">zjadnorjone chinske cyfry</type>
+			<type key="numbers" type="hansfin">zjadnorjone chinske financne cyfry</type>
+			<type key="numbers" type="hant">tradicionalne chinske cyfry</type>
+			<type key="numbers" type="hantfin">tradicionalne chinske financne cyfry</type>
+			<type key="numbers" type="hebr">hebrejske cyfry</type>
+			<type key="numbers" type="jpan">japańske cyfry</type>
+			<type key="numbers" type="jpanfin">japańske financne cyfry</type>
+			<type key="numbers" type="khmr">khmerske cyfry</type>
+			<type key="numbers" type="knda">kannada-cyfry</type>
+			<type key="numbers" type="laoo">laotiske cyfry</type>
+			<type key="numbers" type="latn">arabiske cyfry</type>
+			<type key="numbers" type="mlym">malayalamske cyfry</type>
+			<type key="numbers" type="mymr">burmaske cyfry</type>
+			<type key="numbers" type="orya">oriya-cyfry</type>
+			<type key="numbers" type="roman">romske cyfry</type>
+			<type key="numbers" type="romanlow">romske cyfry małopisane</type>
+			<type key="numbers" type="taml">tradicionalne tamilske cyfry</type>
+			<type key="numbers" type="tamldec">tamilske cyfry</type>
+			<type key="numbers" type="telu">telugu-cyfry</type>
+			<type key="numbers" type="thai">thaiske cyfry</type>
+			<type key="numbers" type="tibt">tibetske cyfry</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metriski</measurementSystemName>
@@ -1063,14 +1062,16 @@ terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">dopołdnja</dayPeriod>
+							<dayPeriod type="pm">wótpołdnja</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am">dop.</dayPeriod>
-							<dayPeriod type="noon">połd.</dayPeriod>
 							<dayPeriod type="pm">wótp.</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">dopołdnja</dayPeriod>
-							<dayPeriod type="noon">połdnjo</dayPeriod>
 							<dayPeriod type="pm">wótpołdnja</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
@@ -3193,6 +3194,58 @@ terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0 tys'.' ¤</pattern>
+					<pattern type="1000" count="two" draft="provisional">0 tys'.' ¤</pattern>
+					<pattern type="1000" count="few" draft="provisional">0 tys'.' ¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0 tys'.' ¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00 tys'.' ¤</pattern>
+					<pattern type="10000" count="two" draft="provisional">00 tys'.' ¤</pattern>
+					<pattern type="10000" count="few" draft="provisional">00 tys'.' ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00 tys'.' ¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000 tys'.' ¤</pattern>
+					<pattern type="100000" count="two" draft="provisional">000 tys'.' ¤</pattern>
+					<pattern type="100000" count="few" draft="provisional">000 tys'.' ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000 tys'.' ¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0 mio'.' ¤</pattern>
+					<pattern type="1000000" count="two" draft="provisional">0 mio'.' ¤</pattern>
+					<pattern type="1000000" count="few" draft="provisional">0 mio'.' ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0 mio'.' ¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00 mio'.' ¤</pattern>
+					<pattern type="10000000" count="two" draft="provisional">00 mio'.' ¤</pattern>
+					<pattern type="10000000" count="few" draft="provisional">00 mio'.' ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00 mio'.' ¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000 mio'.' ¤</pattern>
+					<pattern type="100000000" count="two" draft="provisional">000 mio'.' ¤</pattern>
+					<pattern type="100000000" count="few" draft="provisional">000 mio'.' ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000 mio'.' ¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0 mrd'.' ¤</pattern>
+					<pattern type="1000000000" count="two" draft="provisional">0 mrd'.' ¤</pattern>
+					<pattern type="1000000000" count="few" draft="provisional">0 mrd'.' ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0 mrd'.' ¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00 mrd'.' ¤</pattern>
+					<pattern type="10000000000" count="two" draft="provisional">00 mrd'.' ¤</pattern>
+					<pattern type="10000000000" count="few" draft="provisional">00 mrd'.' ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00 mrd'.' ¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000 mrd'.' ¤</pattern>
+					<pattern type="100000000000" count="two" draft="provisional">000 mrd'.' ¤</pattern>
+					<pattern type="100000000000" count="few" draft="provisional">000 mrd'.' ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000 mrd'.' ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0 bil'.' ¤</pattern>
+					<pattern type="1000000000000" count="two" draft="provisional">0 bil'.' ¤</pattern>
+					<pattern type="1000000000000" count="few" draft="provisional">0 bil'.' ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="two" draft="provisional">00 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="few" draft="provisional">00 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="two" draft="provisional">000 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="few" draft="provisional">000 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000 bil'.' ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="two">{0} {1}</unitPattern>
 			<unitPattern count="few">{0} {1}</unitPattern>
@@ -4526,6 +4579,20 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} metry na kwadratnu sekundu</unitPattern>
 				<unitPattern count="other">{0} metrow kwadratnu sekundu</unitPattern>
 			</unit>
+			<unit type="angle-radian">
+				<displayName>radianty</displayName>
+				<unitPattern count="one">{0} radiant</unitPattern>
+				<unitPattern count="two">{0} radianta</unitPattern>
+				<unitPattern count="few">{0} radianty</unitPattern>
+				<unitPattern count="other">{0} radiantow</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>wobłukowe stopnje</displayName>
+				<unitPattern count="one">{0} stopjeń</unitPattern>
+				<unitPattern count="two">{0} stopjenja</unitPattern>
+				<unitPattern count="few">{0} stopnje</unitPattern>
+				<unitPattern count="other">{0} stopnjow</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>wobłukowe minuty</displayName>
 				<unitPattern count="one">{0} wobłukowa minuta</unitPattern>
@@ -4540,26 +4607,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} wobłukowe sekundy</unitPattern>
 				<unitPattern count="other">{0} wobłukowych sekundow</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>wobłukowe stopnje</displayName>
-				<unitPattern count="one">{0} stopjeń</unitPattern>
-				<unitPattern count="two">{0} stopjenja</unitPattern>
-				<unitPattern count="few">{0} stopnje</unitPattern>
-				<unitPattern count="other">{0} stopnjow</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radianty</displayName>
-				<unitPattern count="one">{0} radiant</unitPattern>
-				<unitPattern count="two">{0} radianta</unitPattern>
-				<unitPattern count="few">{0} radianty</unitPattern>
-				<unitPattern count="other">{0} radiantow</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>akry</displayName>
-				<unitPattern count="one">{0} aker</unitPattern>
-				<unitPattern count="two">{0} akra</unitPattern>
-				<unitPattern count="few">{0} akry</unitPattern>
-				<unitPattern count="other">{0} akrow</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>kwadratne kilometry</displayName>
+				<unitPattern count="one">{0} kwadratny kilometer</unitPattern>
+				<unitPattern count="two">{0} kwadratnej kilometra</unitPattern>
+				<unitPattern count="few">{0} kwadratne kilometry</unitPattern>
+				<unitPattern count="other">{0} kwadratnych kilometrow</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektary</displayName>
@@ -4568,6 +4621,13 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} hektary</unitPattern>
 				<unitPattern count="other">{0} hektarow</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>kwadratne metry</displayName>
+				<unitPattern count="one">{0} kwadratny meter</unitPattern>
+				<unitPattern count="two">{0} kwadratnej metra</unitPattern>
+				<unitPattern count="few">{0} kwadratne metry</unitPattern>
+				<unitPattern count="other">{0} kwadratnych metrow</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>kwadratne centimetry</displayName>
 				<unitPattern count="one">{0} kwadratny centimeter</unitPattern>
@@ -4575,6 +4635,27 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kwadratne centimetry</unitPattern>
 				<unitPattern count="other">{0} kwadratnych centimetrow</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<displayName>kwadratne mile</displayName>
+				<unitPattern count="one">{0} kwadratna mila</unitPattern>
+				<unitPattern count="two">{0} kwadratnej mili</unitPattern>
+				<unitPattern count="few">{0} kwadratne mile</unitPattern>
+				<unitPattern count="other">{0} kwadratnych milow</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>akry</displayName>
+				<unitPattern count="one">{0} aker</unitPattern>
+				<unitPattern count="two">{0} akra</unitPattern>
+				<unitPattern count="few">{0} akry</unitPattern>
+				<unitPattern count="other">{0} akrow</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>kwadratne yardy</displayName>
+				<unitPattern count="one">{0} kwadratny yard</unitPattern>
+				<unitPattern count="two">{0} kwadratnej yarda</unitPattern>
+				<unitPattern count="few">{0} kwadratne yardy</unitPattern>
+				<unitPattern count="other">{0} kwadratnych yardow</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<displayName>kwadratne stopy</displayName>
 				<unitPattern count="one">{0} kwadratna stopa</unitPattern>
@@ -4589,33 +4670,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kwadratne cole</unitPattern>
 				<unitPattern count="other">{0} kwadratnych colow</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kwadratne kilometry</displayName>
-				<unitPattern count="one">{0} kwadratny kilometer</unitPattern>
-				<unitPattern count="two">{0} kwadratnej kilometra</unitPattern>
-				<unitPattern count="few">{0} kwadratne kilometry</unitPattern>
-				<unitPattern count="other">{0} kwadratnych kilometrow</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>kwadratne metry</displayName>
-				<unitPattern count="one">{0} kwadratny meter</unitPattern>
-				<unitPattern count="two">{0} kwadratnej metra</unitPattern>
-				<unitPattern count="few">{0} kwadratne metry</unitPattern>
-				<unitPattern count="other">{0} kwadratnych metrow</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>kwadratne mile</displayName>
-				<unitPattern count="one">{0} kwadratna mila</unitPattern>
-				<unitPattern count="two">{0} kwadratnej mili</unitPattern>
-				<unitPattern count="few">{0} kwadratne mile</unitPattern>
-				<unitPattern count="other">{0} kwadratnych milow</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>kwadratne yardy</displayName>
-				<unitPattern count="one">{0} kwadratny yard</unitPattern>
-				<unitPattern count="two">{0} kwadratnej yarda</unitPattern>
-				<unitPattern count="few">{0} kwadratne yardy</unitPattern>
-				<unitPattern count="other">{0} kwadratnych yardow</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karaty</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="two">{0} karata</unitPattern>
+				<unitPattern count="few">{0} karaty</unitPattern>
+				<unitPattern count="other">{0} karatow</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litry na kilometer</displayName>
@@ -4631,61 +4691,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mile na gallonu</unitPattern>
 				<unitPattern count="other">{0} milow na gallonu</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="two">{0} bita</unitPattern>
-				<unitPattern count="few">{0} bity</unitPattern>
-				<unitPattern count="other">{0} bitow</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="two">{0} bytea</unitPattern>
-				<unitPattern count="few">{0} bytey</unitPattern>
-				<unitPattern count="other">{0} byteow</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabit</displayName>
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="two">{0} gigabita</unitPattern>
-				<unitPattern count="few">{0} gigabity</unitPattern>
-				<unitPattern count="other">{0} gigabitow</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabyte</displayName>
-				<unitPattern count="one">{0} gigabyte</unitPattern>
-				<unitPattern count="two">{0} gigabytea</unitPattern>
-				<unitPattern count="few">{0} gigabytey</unitPattern>
-				<unitPattern count="other">{0} gigabyteow</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobit</displayName>
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="two">{0} kilobita</unitPattern>
-				<unitPattern count="few">{0} kilobity</unitPattern>
-				<unitPattern count="other">{0} kilobitow</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobyte</displayName>
-				<unitPattern count="one">{0} kilobyte</unitPattern>
-				<unitPattern count="two">{0} kilobytea</unitPattern>
-				<unitPattern count="few">{0} kilobytey</unitPattern>
-				<unitPattern count="other">{0} kilobyteow</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabit</displayName>
-				<unitPattern count="one">{0} megabit</unitPattern>
-				<unitPattern count="two">{0} megabita</unitPattern>
-				<unitPattern count="few">{0} megabity</unitPattern>
-				<unitPattern count="other">{0} megabitow</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabyte</displayName>
-				<unitPattern count="one">{0} megabyte</unitPattern>
-				<unitPattern count="two">{0} megabytea</unitPattern>
-				<unitPattern count="few">{0} megabytey</unitPattern>
-				<unitPattern count="other">{0} megabyteow</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>terabyte</displayName>
+				<unitPattern count="one">{0} terabyte</unitPattern>
+				<unitPattern count="two">{0} terabytea</unitPattern>
+				<unitPattern count="few">{0} terabytey</unitPattern>
+				<unitPattern count="other">{0} terabyteow</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>terabit</displayName>
@@ -4694,12 +4705,82 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} terabity</unitPattern>
 				<unitPattern count="other">{0} terabitow</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>terabyte</displayName>
-				<unitPattern count="one">{0} terabyte</unitPattern>
-				<unitPattern count="two">{0} terabytea</unitPattern>
-				<unitPattern count="few">{0} terabytey</unitPattern>
-				<unitPattern count="other">{0} terabyteow</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>gigabyte</displayName>
+				<unitPattern count="one">{0} gigabyte</unitPattern>
+				<unitPattern count="two">{0} gigabytea</unitPattern>
+				<unitPattern count="few">{0} gigabytey</unitPattern>
+				<unitPattern count="other">{0} gigabyteow</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabit</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="two">{0} gigabita</unitPattern>
+				<unitPattern count="few">{0} gigabity</unitPattern>
+				<unitPattern count="other">{0} gigabitow</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabyte</displayName>
+				<unitPattern count="one">{0} megabyte</unitPattern>
+				<unitPattern count="two">{0} megabytea</unitPattern>
+				<unitPattern count="few">{0} megabytey</unitPattern>
+				<unitPattern count="other">{0} megabyteow</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabit</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="two">{0} megabita</unitPattern>
+				<unitPattern count="few">{0} megabity</unitPattern>
+				<unitPattern count="other">{0} megabitow</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobyte</displayName>
+				<unitPattern count="one">{0} kilobyte</unitPattern>
+				<unitPattern count="two">{0} kilobytea</unitPattern>
+				<unitPattern count="few">{0} kilobytey</unitPattern>
+				<unitPattern count="other">{0} kilobyteow</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobit</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="two">{0} kilobita</unitPattern>
+				<unitPattern count="few">{0} kilobity</unitPattern>
+				<unitPattern count="other">{0} kilobitow</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="two">{0} bytea</unitPattern>
+				<unitPattern count="few">{0} bytey</unitPattern>
+				<unitPattern count="other">{0} byteow</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="two">{0} bita</unitPattern>
+				<unitPattern count="few">{0} bity</unitPattern>
+				<unitPattern count="other">{0} bitow</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>lěta</displayName>
+				<unitPattern count="one">{0} lěto</unitPattern>
+				<unitPattern count="two">{0} lěśe</unitPattern>
+				<unitPattern count="few">{0} lěta</unitPattern>
+				<unitPattern count="other">{0} lět</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mjasecy</displayName>
+				<unitPattern count="one">{0} mjasec</unitPattern>
+				<unitPattern count="two">{0} mjaseca</unitPattern>
+				<unitPattern count="few">{0} mjasecy</unitPattern>
+				<unitPattern count="other">{0} mjasecow</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>tyźenje</displayName>
+				<unitPattern count="one">{0} tyźeń</unitPattern>
+				<unitPattern count="two">{0} tyźenja</unitPattern>
+				<unitPattern count="few">{0} tyźenje</unitPattern>
+				<unitPattern count="other">{0} tyźenjow</unitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>dny</displayName>
@@ -4714,21 +4795,7 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two">{0} góźinje</unitPattern>
 				<unitPattern count="few">{0} góźiny</unitPattern>
 				<unitPattern count="other">{0} góźinow</unitPattern>
-				<perUnitPattern>na góźinu</perUnitPattern>
-			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikrosekundy</displayName>
-				<unitPattern count="one">{0} mikrosekunda</unitPattern>
-				<unitPattern count="two">{0} mikrosekunźe</unitPattern>
-				<unitPattern count="few">{0} mikrosekundy</unitPattern>
-				<unitPattern count="other">{0} mikrosekundow</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milisekundy</displayName>
-				<unitPattern count="one">{0} milisekunda</unitPattern>
-				<unitPattern count="two">{0} milisekunźe</unitPattern>
-				<unitPattern count="few">{0} milisekundy</unitPattern>
-				<unitPattern count="other">{0} milisekundow</unitPattern>
+				<perUnitPattern>{0} na góźinu</perUnitPattern>
 			</unit>
 			<unit type="duration-minute">
 				<displayName>minuty</displayName>
@@ -4737,12 +4804,27 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} minuty</unitPattern>
 				<unitPattern count="other">{0} minutow</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>mjasecy</displayName>
-				<unitPattern count="one">{0} mjasec</unitPattern>
-				<unitPattern count="two">{0} mjaseca</unitPattern>
-				<unitPattern count="few">{0} mjasecy</unitPattern>
-				<unitPattern count="other">{0} mjasecow</unitPattern>
+			<unit type="duration-second">
+				<displayName>sekundy</displayName>
+				<unitPattern count="one">{0} sekunda</unitPattern>
+				<unitPattern count="two">{0} sekunźe</unitPattern>
+				<unitPattern count="few">{0} sekundy</unitPattern>
+				<unitPattern count="other">{0} sekundow</unitPattern>
+				<perUnitPattern>{0} na sekundu</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>milisekundy</displayName>
+				<unitPattern count="one">{0} milisekunda</unitPattern>
+				<unitPattern count="two">{0} milisekunźe</unitPattern>
+				<unitPattern count="few">{0} milisekundy</unitPattern>
+				<unitPattern count="other">{0} milisekundow</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>mikrosekundy</displayName>
+				<unitPattern count="one">{0} mikrosekunda</unitPattern>
+				<unitPattern count="two">{0} mikrosekunźe</unitPattern>
+				<unitPattern count="few">{0} mikrosekundy</unitPattern>
+				<unitPattern count="other">{0} mikrosekundow</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>nanosekundy</displayName>
@@ -4751,28 +4833,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} nanosekundy</unitPattern>
 				<unitPattern count="other">{0} nanosekundow</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>sekundy</displayName>
-				<unitPattern count="one">{0} sekunda</unitPattern>
-				<unitPattern count="two">{0} sekunźe</unitPattern>
-				<unitPattern count="few">{0} sekundy</unitPattern>
-				<unitPattern count="other">{0} sekundow</unitPattern>
-				<perUnitPattern>na sekundu</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>tyźenje</displayName>
-				<unitPattern count="one">{0} tyźeń</unitPattern>
-				<unitPattern count="two">{0} tyźenja</unitPattern>
-				<unitPattern count="few">{0} tyźenje</unitPattern>
-				<unitPattern count="other">{0} tyźenjow</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>lěta</displayName>
-				<unitPattern count="one">{0} lěto</unitPattern>
-				<unitPattern count="two">{0} lěśe</unitPattern>
-				<unitPattern count="few">{0} lěta</unitPattern>
-				<unitPattern count="other">{0} lět</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>ampery</displayName>
 				<unitPattern count="one">{0} ampere</unitPattern>
@@ -4801,6 +4861,13 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} volty</unitPattern>
 				<unitPattern count="other">{0} voltow</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokalorije</displayName>
+				<unitPattern count="one">{0} kilokalorija</unitPattern>
+				<unitPattern count="two">{0} kilokaloriji</unitPattern>
+				<unitPattern count="few">{0} kilokalorije</unitPattern>
+				<unitPattern count="other">{0} kilokalorijow</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kalorije</displayName>
 				<unitPattern count="one">{0} kalorija</unitPattern>
@@ -4815,20 +4882,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kilokalorije</unitPattern>
 				<unitPattern count="other">{0} kilokalorijow</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="one">{0} joule</unitPattern>
-				<unitPattern count="two">{0} joule</unitPattern>
-				<unitPattern count="few">{0} joule</unitPattern>
-				<unitPattern count="other">{0} joule</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokalorije</displayName>
-				<unitPattern count="one">{0} kilokalorija</unitPattern>
-				<unitPattern count="two">{0} kilokaloriji</unitPattern>
-				<unitPattern count="few">{0} kilokalorije</unitPattern>
-				<unitPattern count="other">{0} kilokalorijow</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojoule</displayName>
 				<unitPattern count="one">{0} kilojoule</unitPattern>
@@ -4836,6 +4889,13 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kilojoule</unitPattern>
 				<unitPattern count="other">{0} kilojoule</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="one">{0} joule</unitPattern>
+				<unitPattern count="two">{0} joule</unitPattern>
+				<unitPattern count="few">{0} joule</unitPattern>
+				<unitPattern count="other">{0} joule</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilowattowe góźiny</displayName>
 				<unitPattern count="one">{0} kilowattowa góźina</unitPattern>
@@ -4850,12 +4910,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} gigahertzy</unitPattern>
 				<unitPattern count="other">{0} gigahertzow</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hertzy</displayName>
-				<unitPattern count="one">{0} hertz</unitPattern>
-				<unitPattern count="two">{0} hertza</unitPattern>
-				<unitPattern count="few">{0} hertzy</unitPattern>
-				<unitPattern count="other">{0} hertzow</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megahertzy</displayName>
+				<unitPattern count="one">{0} megahertz</unitPattern>
+				<unitPattern count="two">{0} megahertza</unitPattern>
+				<unitPattern count="few">{0} megahertzy</unitPattern>
+				<unitPattern count="other">{0} megahertzow</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kilohertzy</displayName>
@@ -4864,19 +4924,33 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kilohertzy</unitPattern>
 				<unitPattern count="other">{0} kilohertzow</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megahertzy</displayName>
-				<unitPattern count="one">{0} megahertz</unitPattern>
-				<unitPattern count="two">{0} megahertza</unitPattern>
-				<unitPattern count="few">{0} megahertzy</unitPattern>
-				<unitPattern count="other">{0} megahertzow</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hertzy</displayName>
+				<unitPattern count="one">{0} hertz</unitPattern>
+				<unitPattern count="two">{0} hertza</unitPattern>
+				<unitPattern count="few">{0} hertzy</unitPattern>
+				<unitPattern count="other">{0} hertzow</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>astronomiske jadnotki</displayName>
-				<unitPattern count="one">{0} astronomiska jadnotka</unitPattern>
-				<unitPattern count="two">{0} astronomiskej jadnotce</unitPattern>
-				<unitPattern count="few">{0} astronomiske jadnotki</unitPattern>
-				<unitPattern count="other">{0} astronomiskich jadnotkow</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometry</displayName>
+				<unitPattern count="one">{0} kilometer</unitPattern>
+				<unitPattern count="two">{0} kilometra</unitPattern>
+				<unitPattern count="few">{0} kilometry</unitPattern>
+				<unitPattern count="other">{0} kilometrow</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>metry</displayName>
+				<unitPattern count="one">{0} meter</unitPattern>
+				<unitPattern count="two">{0} metra</unitPattern>
+				<unitPattern count="few">{0} metry</unitPattern>
+				<unitPattern count="other">{0} metrow</unitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>decimetry</displayName>
+				<unitPattern count="one">{0} decimeter</unitPattern>
+				<unitPattern count="two">{0} decimetra</unitPattern>
+				<unitPattern count="few">{0} decimetry</unitPattern>
+				<unitPattern count="other">{0} decimetrow</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
 				<displayName>centimetry</displayName>
@@ -4885,12 +4959,47 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} centimetry</unitPattern>
 				<unitPattern count="other">{0} centimetrow</unitPattern>
 			</unit>
-			<unit type="length-decimeter">
-				<displayName>decimetry</displayName>
-				<unitPattern count="one">{0} decimeter</unitPattern>
-				<unitPattern count="two">{0} decimetra</unitPattern>
-				<unitPattern count="few">{0} decimetry</unitPattern>
-				<unitPattern count="other">{0} decimetrow</unitPattern>
+			<unit type="length-millimeter">
+				<displayName>milimetry</displayName>
+				<unitPattern count="one">{0} milimeter</unitPattern>
+				<unitPattern count="two">{0} milimetra</unitPattern>
+				<unitPattern count="few">{0} milimetry</unitPattern>
+				<unitPattern count="other">{0} milimetrow</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikrometry</displayName>
+				<unitPattern count="one">{0} mikrometer</unitPattern>
+				<unitPattern count="two">{0} mikrometra</unitPattern>
+				<unitPattern count="few">{0} mikrometry</unitPattern>
+				<unitPattern count="other">{0} mikrometrow</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nanometry</displayName>
+				<unitPattern count="one">{0} nanometer</unitPattern>
+				<unitPattern count="two">{0} nanometra</unitPattern>
+				<unitPattern count="few">{0} nanometry</unitPattern>
+				<unitPattern count="other">{0} nanometrow</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>pikometry</displayName>
+				<unitPattern count="one">{0} pikometer</unitPattern>
+				<unitPattern count="two">{0} pikometra</unitPattern>
+				<unitPattern count="few">{0} pikometry</unitPattern>
+				<unitPattern count="other">{0} pikometrow</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>mile</displayName>
+				<unitPattern count="one">{0} mila</unitPattern>
+				<unitPattern count="two">{0} mili</unitPattern>
+				<unitPattern count="few">{0} mile</unitPattern>
+				<unitPattern count="other">{0} milow</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>yardy</displayName>
+				<unitPattern count="one">{0} yard</unitPattern>
+				<unitPattern count="two">{0} yarda</unitPattern>
+				<unitPattern count="few">{0} yardy</unitPattern>
+				<unitPattern count="other">{0} yardow</unitPattern>
 			</unit>
 			<unit type="length-foot">
 				<displayName>stopy</displayName>
@@ -4906,12 +5015,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} cole</unitPattern>
 				<unitPattern count="other">{0} colow</unitPattern>
 			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometry</displayName>
-				<unitPattern count="one">{0} kilometer</unitPattern>
-				<unitPattern count="two">{0} kilometra</unitPattern>
-				<unitPattern count="few">{0} kilometry</unitPattern>
-				<unitPattern count="other">{0} kilometrow</unitPattern>
+			<unit type="length-parsec">
+				<displayName>parsec</displayName>
+				<unitPattern count="one">{0} parsec</unitPattern>
+				<unitPattern count="two">{0} parsec</unitPattern>
+				<unitPattern count="few">{0} parsec</unitPattern>
+				<unitPattern count="other">{0} parsec</unitPattern>
 			</unit>
 			<unit type="length-light-year">
 				<displayName>swětłowe lěta</displayName>
@@ -4920,40 +5029,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} swětłowe lěta</unitPattern>
 				<unitPattern count="other">{0} swětłowych lět</unitPattern>
 			</unit>
-			<unit type="length-meter">
-				<displayName>metry</displayName>
-				<unitPattern count="one">{0} meter</unitPattern>
-				<unitPattern count="two">{0} metra</unitPattern>
-				<unitPattern count="few">{0} metry</unitPattern>
-				<unitPattern count="other">{0} metrow</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>mikrometry</displayName>
-				<unitPattern count="one">{0} mikrometer</unitPattern>
-				<unitPattern count="two">{0} mikrometra</unitPattern>
-				<unitPattern count="few">{0} mikrometry</unitPattern>
-				<unitPattern count="other">{0} mikrometrow</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mile</displayName>
-				<unitPattern count="one">{0} mila</unitPattern>
-				<unitPattern count="two">{0} mili</unitPattern>
-				<unitPattern count="few">{0} mile</unitPattern>
-				<unitPattern count="other">{0} milow</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>milimetry</displayName>
-				<unitPattern count="one">{0} milimeter</unitPattern>
-				<unitPattern count="two">{0} milimetra</unitPattern>
-				<unitPattern count="few">{0} milimetry</unitPattern>
-				<unitPattern count="other">{0} milimetrow</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<displayName>nanometry</displayName>
-				<unitPattern count="one">{0} nanometer</unitPattern>
-				<unitPattern count="two">{0} nanometra</unitPattern>
-				<unitPattern count="few">{0} nanometry</unitPattern>
-				<unitPattern count="other">{0} nanometrow</unitPattern>
+			<unit type="length-astronomical-unit">
+				<displayName>astronomiske jadnotki</displayName>
+				<unitPattern count="one">{0} astronomiska jadnotka</unitPattern>
+				<unitPattern count="two">{0} astronomiskej jadnotce</unitPattern>
+				<unitPattern count="few">{0} astronomiske jadnotki</unitPattern>
+				<unitPattern count="other">{0} astronomiskich jadnotkow</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
 				<displayName>nawtiske mile</displayName>
@@ -4962,27 +5043,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} nawtiske mile</unitPattern>
 				<unitPattern count="other">{0} nawtiskich milow</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<displayName>parsec</displayName>
-				<unitPattern count="one">{0} parsec</unitPattern>
-				<unitPattern count="two">{0} parsec</unitPattern>
-				<unitPattern count="few">{0} parsec</unitPattern>
-				<unitPattern count="other">{0} parsec</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName>pikometry</displayName>
-				<unitPattern count="one">{0} pikometer</unitPattern>
-				<unitPattern count="two">{0} pikometra</unitPattern>
-				<unitPattern count="few">{0} pikometry</unitPattern>
-				<unitPattern count="other">{0} pikometrow</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<displayName>yardy</displayName>
-				<unitPattern count="one">{0} yard</unitPattern>
-				<unitPattern count="two">{0} yarda</unitPattern>
-				<unitPattern count="few">{0} yardy</unitPattern>
-				<unitPattern count="other">{0} yardow</unitPattern>
-			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
@@ -4990,27 +5050,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} lux</unitPattern>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karaty</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="two">{0} karata</unitPattern>
-				<unitPattern count="few">{0} karaty</unitPattern>
-				<unitPattern count="other">{0} karatow</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gramy</displayName>
-				<unitPattern count="one">{0} gram</unitPattern>
-				<unitPattern count="two">{0} grama</unitPattern>
-				<unitPattern count="few">{0} gramy</unitPattern>
-				<unitPattern count="other">{0} gramow</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogramy</displayName>
-				<unitPattern count="one">{0} kilogram</unitPattern>
-				<unitPattern count="two">{0} kilograma</unitPattern>
-				<unitPattern count="few">{0} kilogramy</unitPattern>
-				<unitPattern count="other">{0} kilogramow</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>tony</displayName>
 				<unitPattern count="one">{0} tona</unitPattern>
@@ -5018,12 +5057,19 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} tony</unitPattern>
 				<unitPattern count="other">{0} tonow</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mikrogramy</displayName>
-				<unitPattern count="one">{0} mikrogram</unitPattern>
-				<unitPattern count="two">{0} mikrograma</unitPattern>
-				<unitPattern count="few">{0} mikrogramy</unitPattern>
-				<unitPattern count="other">{0} mikrogramow</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogramy</displayName>
+				<unitPattern count="one">{0} kilogram</unitPattern>
+				<unitPattern count="two">{0} kilograma</unitPattern>
+				<unitPattern count="few">{0} kilogramy</unitPattern>
+				<unitPattern count="other">{0} kilogramow</unitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gramy</displayName>
+				<unitPattern count="one">{0} gram</unitPattern>
+				<unitPattern count="two">{0} grama</unitPattern>
+				<unitPattern count="few">{0} gramy</unitPattern>
+				<unitPattern count="other">{0} gramow</unitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>miligramy</displayName>
@@ -5032,6 +5078,27 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} miligramy</unitPattern>
 				<unitPattern count="other">{0} miligramow</unitPattern>
 			</unit>
+			<unit type="mass-microgram">
+				<displayName>mikrogramy</displayName>
+				<unitPattern count="one">{0} mikrogram</unitPattern>
+				<unitPattern count="two">{0} mikrograma</unitPattern>
+				<unitPattern count="few">{0} mikrogramy</unitPattern>
+				<unitPattern count="other">{0} mikrogramow</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>ameriske tony</displayName>
+				<unitPattern count="one">{0} ameriska tona</unitPattern>
+				<unitPattern count="two">{0} ameriskej tonje</unitPattern>
+				<unitPattern count="few">{0} ameriske tony</unitPattern>
+				<unitPattern count="other">{0} ameriskich tonow</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>punty</displayName>
+				<unitPattern count="one">{0} punt</unitPattern>
+				<unitPattern count="two">{0} punta</unitPattern>
+				<unitPattern count="few">{0} punty</unitPattern>
+				<unitPattern count="other">{0} puntow</unitPattern>
+			</unit>
 			<unit type="mass-ounce">
 				<displayName>unce</displayName>
 				<unitPattern count="one">{0} unca</unitPattern>
@@ -5046,19 +5113,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} troyske unce</unitPattern>
 				<unitPattern count="other">{0} troyskich uncow</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<displayName>punty</displayName>
-				<unitPattern count="one">{0} punt</unitPattern>
-				<unitPattern count="two">{0} punta</unitPattern>
-				<unitPattern count="few">{0} punty</unitPattern>
-				<unitPattern count="other">{0} puntow</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<displayName>ameriske tony</displayName>
-				<unitPattern count="one">{0} ameriska tona</unitPattern>
-				<unitPattern count="two">{0} ameriskej tonje</unitPattern>
-				<unitPattern count="few">{0} ameriske tony</unitPattern>
-				<unitPattern count="other">{0} ameriskich tonow</unitPattern>
+			<unit type="mass-carat">
+				<displayName>karaty</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="two">{0} karata</unitPattern>
+				<unitPattern count="few">{0} karaty</unitPattern>
+				<unitPattern count="other">{0} karatow</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigawatty</displayName>
@@ -5067,12 +5127,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} gigawatty</unitPattern>
 				<unitPattern count="other">{0} gigawattow</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>kónjece mócy</displayName>
-				<unitPattern count="one">{0} kónjeca móc</unitPattern>
-				<unitPattern count="two">{0} kónjecej mócy</unitPattern>
-				<unitPattern count="few">{0} kónjece mócy</unitPattern>
-				<unitPattern count="other">{0} kónjecych mócow</unitPattern>
+			<unit type="power-megawatt">
+				<displayName>megawatty</displayName>
+				<unitPattern count="one">{0} megawatt</unitPattern>
+				<unitPattern count="two">{0} megawatta</unitPattern>
+				<unitPattern count="few">{0} megawatty</unitPattern>
+				<unitPattern count="other">{0} megawattow</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName>kilowatty</displayName>
@@ -5081,12 +5141,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kilowatty</unitPattern>
 				<unitPattern count="other">{0} kilowattow</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<displayName>megawatty</displayName>
-				<unitPattern count="one">{0} megawatt</unitPattern>
-				<unitPattern count="two">{0} megawatta</unitPattern>
-				<unitPattern count="few">{0} megawatty</unitPattern>
-				<unitPattern count="other">{0} megawattow</unitPattern>
+			<unit type="power-watt">
+				<displayName>watty</displayName>
+				<unitPattern count="one">{0} watt</unitPattern>
+				<unitPattern count="two">{0} watta</unitPattern>
+				<unitPattern count="few">{0} watty</unitPattern>
+				<unitPattern count="other">{0} wattow</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<displayName>miliwatty</displayName>
@@ -5095,12 +5155,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} miliwatty</unitPattern>
 				<unitPattern count="other">{0} miliwattow</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName>watty</displayName>
-				<unitPattern count="one">{0} watt</unitPattern>
-				<unitPattern count="two">{0} watta</unitPattern>
-				<unitPattern count="few">{0} watty</unitPattern>
-				<unitPattern count="other">{0} wattow</unitPattern>
+			<unit type="power-horsepower">
+				<displayName>kónjece mócy</displayName>
+				<unitPattern count="one">{0} kónjeca móc</unitPattern>
+				<unitPattern count="two">{0} kónjecej mócy</unitPattern>
+				<unitPattern count="few">{0} kónjece mócy</unitPattern>
+				<unitPattern count="other">{0} kónjecych mócow</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hektopascale</displayName>
@@ -5109,20 +5169,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} hektopascale</unitPattern>
 				<unitPattern count="other">{0} hektopascalow</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>cole žywoslobrowego słupika</displayName>
-				<unitPattern count="one">{0} col słupika žywego slobra</unitPattern>
-				<unitPattern count="two">{0} cola słupika žywego slobra</unitPattern>
-				<unitPattern count="few">{0} cole słupika žywego slobra</unitPattern>
-				<unitPattern count="other">{0} colow słupika žywego slobra</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>milibary</displayName>
-				<unitPattern count="one">{0} milibar</unitPattern>
-				<unitPattern count="two">{0} milibara</unitPattern>
-				<unitPattern count="few">{0} milibary</unitPattern>
-				<unitPattern count="other">{0} milibarow</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>milimetry słupika žywego slobra</displayName>
 				<unitPattern count="one">{0} milimeter słupika žywego slobra</unitPattern>
@@ -5137,12 +5183,19 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} punty na kwadratny col</unitPattern>
 				<unitPattern count="other">{0} puntow na kwadratny col</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karaty</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="two">{0} karata</unitPattern>
-				<unitPattern count="few">{0} karaty</unitPattern>
-				<unitPattern count="other">{0} karatow</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>cole žywoslobrowego słupika</displayName>
+				<unitPattern count="one">{0} col słupika žywego slobra</unitPattern>
+				<unitPattern count="two">{0} cola słupika žywego slobra</unitPattern>
+				<unitPattern count="few">{0} cole słupika žywego slobra</unitPattern>
+				<unitPattern count="other">{0} colow słupika žywego slobra</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>milibary</displayName>
+				<unitPattern count="one">{0} milibar</unitPattern>
+				<unitPattern count="two">{0} milibara</unitPattern>
+				<unitPattern count="few">{0} milibary</unitPattern>
+				<unitPattern count="other">{0} milibarow</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometry na góźinu</displayName>
@@ -5186,41 +5239,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} stopnje Kelvina</unitPattern>
 				<unitPattern count="other">{0} stopnjow Kelvina</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>aker-crjeje</displayName>
-				<unitPattern count="one">{0} aker-crjej</unitPattern>
-				<unitPattern count="two">{0} aker-crjeja</unitPattern>
-				<unitPattern count="few">{0} aker-crjeje</unitPattern>
-				<unitPattern count="other">{0} aker-crjej</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>centilitry</displayName>
-				<unitPattern count="one">{0} centiliter</unitPattern>
-				<unitPattern count="two">{0} centilitra</unitPattern>
-				<unitPattern count="few">{0} centilitry</unitPattern>
-				<unitPattern count="other">{0} centilitrow</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>kubikne centimetry</displayName>
-				<unitPattern count="one">{0} kubikny centimeter</unitPattern>
-				<unitPattern count="two">{0} kubiknej centimetra</unitPattern>
-				<unitPattern count="few">{0} kubikne centimetry</unitPattern>
-				<unitPattern count="other">{0} kubiknych centimetrow</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>kubikne crjeje</displayName>
-				<unitPattern count="one">{0} kubikny crjej</unitPattern>
-				<unitPattern count="two">{0} kubiknej crjeja</unitPattern>
-				<unitPattern count="few">{0} kubikne crjeje</unitPattern>
-				<unitPattern count="other">{0} kubiknych crjejow</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>kubikne cole</displayName>
-				<unitPattern count="one">{0} kubikny col</unitPattern>
-				<unitPattern count="two">{0} kubiknej cola</unitPattern>
-				<unitPattern count="few">{0} kubikne cole</unitPattern>
-				<unitPattern count="other">{0} kubiknych colow</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kubikne kilometry</displayName>
 				<unitPattern count="one">{0} kubikny kilometer</unitPattern>
@@ -5235,6 +5253,13 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kubikne metry</unitPattern>
 				<unitPattern count="other">{0} kubiknych metrow</unitPattern>
 			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>kubikne centimetry</displayName>
+				<unitPattern count="one">{0} kubikny centimeter</unitPattern>
+				<unitPattern count="two">{0} kubiknej centimetra</unitPattern>
+				<unitPattern count="few">{0} kubikne centimetry</unitPattern>
+				<unitPattern count="other">{0} kubiknych centimetrow</unitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>kubikne mile</displayName>
 				<unitPattern count="one">{0} kubikna mila</unitPattern>
@@ -5249,33 +5274,26 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kubikne yardy</unitPattern>
 				<unitPattern count="other">{0} kubiknych yardow</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>taski</displayName>
-				<unitPattern count="one">{0} taska</unitPattern>
-				<unitPattern count="two">{0} tasce</unitPattern>
-				<unitPattern count="few">{0} taski</unitPattern>
-				<unitPattern count="other">{0} taskow</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>kubikne crjeje</displayName>
+				<unitPattern count="one">{0} kubikny crjej</unitPattern>
+				<unitPattern count="two">{0} kubiknej crjeja</unitPattern>
+				<unitPattern count="few">{0} kubikne crjeje</unitPattern>
+				<unitPattern count="other">{0} kubiknych crjejow</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>decilitry</displayName>
-				<unitPattern count="one">{0} deciliter</unitPattern>
-				<unitPattern count="two">{0} decilitra</unitPattern>
-				<unitPattern count="few">{0} decilitry</unitPattern>
-				<unitPattern count="other">{0} decilitrow</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>kubikne cole</displayName>
+				<unitPattern count="one">{0} kubikny col</unitPattern>
+				<unitPattern count="two">{0} kubiknej cola</unitPattern>
+				<unitPattern count="few">{0} kubikne cole</unitPattern>
+				<unitPattern count="other">{0} kubiknych colow</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>žydke unce</displayName>
-				<unitPattern count="one">{0} žydka unca</unitPattern>
-				<unitPattern count="two">{0} žydkej uncy</unitPattern>
-				<unitPattern count="few">{0} žydke unce</unitPattern>
-				<unitPattern count="other">{0} žydkych uncow</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gallony</displayName>
-				<unitPattern count="one">{0} gallona</unitPattern>
-				<unitPattern count="two">{0} gallonje</unitPattern>
-				<unitPattern count="few">{0} gallony</unitPattern>
-				<unitPattern count="other">{0} gallonow</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megalitry</displayName>
+				<unitPattern count="one">{0} megaliter</unitPattern>
+				<unitPattern count="two">{0} megalitra</unitPattern>
+				<unitPattern count="few">{0} megalitry</unitPattern>
+				<unitPattern count="other">{0} megalitrow</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hektolitry</displayName>
@@ -5291,12 +5309,19 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} litry</unitPattern>
 				<unitPattern count="other">{0} litrow</unitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalitry</displayName>
-				<unitPattern count="one">{0} megaliter</unitPattern>
-				<unitPattern count="two">{0} megalitra</unitPattern>
-				<unitPattern count="few">{0} megalitry</unitPattern>
-				<unitPattern count="other">{0} megalitrow</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>decilitry</displayName>
+				<unitPattern count="one">{0} deciliter</unitPattern>
+				<unitPattern count="two">{0} decilitra</unitPattern>
+				<unitPattern count="few">{0} decilitry</unitPattern>
+				<unitPattern count="other">{0} decilitrow</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centilitry</displayName>
+				<unitPattern count="one">{0} centiliter</unitPattern>
+				<unitPattern count="two">{0} centilitra</unitPattern>
+				<unitPattern count="few">{0} centilitry</unitPattern>
+				<unitPattern count="other">{0} centilitrow</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mililitry</displayName>
@@ -5305,12 +5330,19 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mililitry</unitPattern>
 				<unitPattern count="other">{0} mililitrow</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pinty</displayName>
-				<unitPattern count="one">{0} pint</unitPattern>
-				<unitPattern count="two">{0} pinta</unitPattern>
-				<unitPattern count="few">{0} pinty</unitPattern>
-				<unitPattern count="other">{0} pintow</unitPattern>
+			<unit type="volume-acre-foot">
+				<displayName>aker-crjeje</displayName>
+				<unitPattern count="one">{0} aker-crjej</unitPattern>
+				<unitPattern count="two">{0} aker-crjeja</unitPattern>
+				<unitPattern count="few">{0} aker-crjeje</unitPattern>
+				<unitPattern count="other">{0} aker-crjej</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gallony</displayName>
+				<unitPattern count="one">{0} gallona</unitPattern>
+				<unitPattern count="two">{0} gallonje</unitPattern>
+				<unitPattern count="few">{0} gallony</unitPattern>
+				<unitPattern count="other">{0} gallonow</unitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>quarty</displayName>
@@ -5319,6 +5351,27 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} quarty</unitPattern>
 				<unitPattern count="other">{0} quartow</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pinty</displayName>
+				<unitPattern count="one">{0} pint</unitPattern>
+				<unitPattern count="two">{0} pinta</unitPattern>
+				<unitPattern count="few">{0} pinty</unitPattern>
+				<unitPattern count="other">{0} pintow</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>taski</displayName>
+				<unitPattern count="one">{0} taska</unitPattern>
+				<unitPattern count="two">{0} tasce</unitPattern>
+				<unitPattern count="few">{0} taski</unitPattern>
+				<unitPattern count="other">{0} taskow</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>žydke unce</displayName>
+				<unitPattern count="one">{0} žydka unca</unitPattern>
+				<unitPattern count="two">{0} žydkej uncy</unitPattern>
+				<unitPattern count="few">{0} žydke unce</unitPattern>
+				<unitPattern count="other">{0} žydkych uncow</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>łžyce</displayName>
 				<unitPattern count="one">{0} łžyca</unitPattern>
@@ -5349,6 +5402,20 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="two">{0} rad</unitPattern>
+				<unitPattern count="few">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0} °</unitPattern>
+				<unitPattern count="two">{0} °</unitPattern>
+				<unitPattern count="few">{0} °</unitPattern>
+				<unitPattern count="other">{0} °</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>′</displayName>
 				<unitPattern count="one">{0} ′</unitPattern>
@@ -5363,26 +5430,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ″</unitPattern>
 				<unitPattern count="other">{0} ″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>°</displayName>
-				<unitPattern count="one">{0} °</unitPattern>
-				<unitPattern count="two">{0} °</unitPattern>
-				<unitPattern count="few">{0} °</unitPattern>
-				<unitPattern count="other">{0} °</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="two">{0} rad</unitPattern>
-				<unitPattern count="few">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ac</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="two">{0} ac</unitPattern>
-				<unitPattern count="few">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="two">{0} km²</unitPattern>
+				<unitPattern count="few">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ha</displayName>
@@ -5391,6 +5444,13 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="two">{0} m²</unitPattern>
+				<unitPattern count="few">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
@@ -5398,6 +5458,27 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="two">{0} mi²</unitPattern>
+				<unitPattern count="few">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ac</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="two">{0} ac</unitPattern>
+				<unitPattern count="few">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="two">{0} yd²</unitPattern>
+				<unitPattern count="few">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<displayName>ft²</displayName>
 				<unitPattern count="one">{0} ft²</unitPattern>
@@ -5412,33 +5493,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="two">{0} km²</unitPattern>
-				<unitPattern count="few">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="two">{0} m²</unitPattern>
-				<unitPattern count="few">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="two">{0} mi²</unitPattern>
-				<unitPattern count="few">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="two">{0} yd²</unitPattern>
-				<unitPattern count="few">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="two">{0} kt</unitPattern>
+				<unitPattern count="few">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
@@ -5454,61 +5514,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="two">{0} bit</unitPattern>
-				<unitPattern count="few">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="two">{0} byte</unitPattern>
-				<unitPattern count="few">{0} byte</unitPattern>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="two">{0} Gb</unitPattern>
-				<unitPattern count="few">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="two">{0} GB</unitPattern>
-				<unitPattern count="few">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="two">{0} kb</unitPattern>
-				<unitPattern count="few">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="two">{0} kB</unitPattern>
-				<unitPattern count="few">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="two">{0} Mb</unitPattern>
-				<unitPattern count="few">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="two">{0} MB</unitPattern>
-				<unitPattern count="few">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>TB</displayName>
+				<unitPattern count="one">{0} TB</unitPattern>
+				<unitPattern count="two">{0} TB</unitPattern>
+				<unitPattern count="few">{0} TB</unitPattern>
+				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>Tb</displayName>
@@ -5517,12 +5528,82 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} Tb</unitPattern>
 				<unitPattern count="other">{0} Tb</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>TB</displayName>
-				<unitPattern count="one">{0} TB</unitPattern>
-				<unitPattern count="two">{0} TB</unitPattern>
-				<unitPattern count="few">{0} TB</unitPattern>
-				<unitPattern count="other">{0} TB</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="two">{0} GB</unitPattern>
+				<unitPattern count="few">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="two">{0} Gb</unitPattern>
+				<unitPattern count="few">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="two">{0} MB</unitPattern>
+				<unitPattern count="few">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="two">{0} Mb</unitPattern>
+				<unitPattern count="few">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="two">{0} kB</unitPattern>
+				<unitPattern count="few">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="two">{0} kb</unitPattern>
+				<unitPattern count="few">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="two">{0} byte</unitPattern>
+				<unitPattern count="few">{0} byte</unitPattern>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="two">{0} bit</unitPattern>
+				<unitPattern count="few">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>l.</displayName>
+				<unitPattern count="one">{0} l.</unitPattern>
+				<unitPattern count="two">{0} l.</unitPattern>
+				<unitPattern count="few">{0} l.</unitPattern>
+				<unitPattern count="other">{0} l.</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mjas.</displayName>
+				<unitPattern count="one">{0} mjas.</unitPattern>
+				<unitPattern count="two">{0} mjas.</unitPattern>
+				<unitPattern count="few">{0} mjas.</unitPattern>
+				<unitPattern count="other">{0} mjas.</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>tyź.</displayName>
+				<unitPattern count="one">{0} tyź.</unitPattern>
+				<unitPattern count="two">{0} tyź.</unitPattern>
+				<unitPattern count="few">{0} tyź.</unitPattern>
+				<unitPattern count="other">{0} tyź.</unitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>dny</displayName>
@@ -5539,20 +5620,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} góź.</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="two">{0} μs</unitPattern>
-				<unitPattern count="few">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="two">{0} ms</unitPattern>
-				<unitPattern count="few">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min.</displayName>
 				<unitPattern count="one">{0} min.</unitPattern>
@@ -5560,20 +5627,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} min.</unitPattern>
 				<unitPattern count="other">{0} min.</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>mjas.</displayName>
-				<unitPattern count="one">{0} mjas.</unitPattern>
-				<unitPattern count="two">{0} mjas.</unitPattern>
-				<unitPattern count="few">{0} mjas.</unitPattern>
-				<unitPattern count="other">{0} mjas.</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="two">{0} ns</unitPattern>
-				<unitPattern count="few">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>sek.</displayName>
 				<unitPattern count="one">{0} sek.</unitPattern>
@@ -5582,19 +5635,26 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} sek.</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>tyź.</displayName>
-				<unitPattern count="one">{0} tyź.</unitPattern>
-				<unitPattern count="two">{0} tyź.</unitPattern>
-				<unitPattern count="few">{0} tyź.</unitPattern>
-				<unitPattern count="other">{0} tyź.</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="two">{0} ms</unitPattern>
+				<unitPattern count="few">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>l.</displayName>
-				<unitPattern count="one">{0} l.</unitPattern>
-				<unitPattern count="two">{0} l.</unitPattern>
-				<unitPattern count="few">{0} l.</unitPattern>
-				<unitPattern count="other">{0} l.</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="two">{0} μs</unitPattern>
+				<unitPattern count="few">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="two">{0} ns</unitPattern>
+				<unitPattern count="few">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>A</displayName>
@@ -5624,6 +5684,13 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="two">{0} kcal</unitPattern>
+				<unitPattern count="few">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -5638,20 +5705,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kcal</unitPattern>
 				<unitPattern count="other">{0} kcal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>J</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="two">{0} J</unitPattern>
-				<unitPattern count="few">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="two">{0} kcal</unitPattern>
-				<unitPattern count="few">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
@@ -5659,6 +5712,13 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="two">{0} J</unitPattern>
+				<unitPattern count="few">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -5673,12 +5733,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="two">{0} Hz</unitPattern>
-				<unitPattern count="few">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="two">{0} MHz</unitPattern>
+				<unitPattern count="few">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
@@ -5687,19 +5747,33 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="two">{0} MHz</unitPattern>
-				<unitPattern count="few">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="two">{0} Hz</unitPattern>
+				<unitPattern count="few">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="two">{0} au</unitPattern>
-				<unitPattern count="few">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="two">{0} km</unitPattern>
+				<unitPattern count="few">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="two">{0} m</unitPattern>
+				<unitPattern count="few">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>dm</displayName>
+				<unitPattern count="one">{0} dm</unitPattern>
+				<unitPattern count="two">{0} dm</unitPattern>
+				<unitPattern count="few">{0} dm</unitPattern>
+				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
 				<displayName>cm</displayName>
@@ -5708,12 +5782,47 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} cm</unitPattern>
 				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
-			<unit type="length-decimeter">
-				<displayName>dm</displayName>
-				<unitPattern count="one">{0} dm</unitPattern>
-				<unitPattern count="two">{0} dm</unitPattern>
-				<unitPattern count="few">{0} dm</unitPattern>
-				<unitPattern count="other">{0} dm</unitPattern>
+			<unit type="length-millimeter">
+				<displayName>mm</displayName>
+				<unitPattern count="one">{0} mm</unitPattern>
+				<unitPattern count="two">{0} mm</unitPattern>
+				<unitPattern count="few">{0} mm</unitPattern>
+				<unitPattern count="other">{0} mm</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>μm</displayName>
+				<unitPattern count="one">{0} μm</unitPattern>
+				<unitPattern count="two">{0} μm</unitPattern>
+				<unitPattern count="few">{0} μm</unitPattern>
+				<unitPattern count="other">{0} μm</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nm</displayName>
+				<unitPattern count="one">{0} nm</unitPattern>
+				<unitPattern count="two">{0} nm</unitPattern>
+				<unitPattern count="few">{0} nm</unitPattern>
+				<unitPattern count="other">{0} nm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>pm</displayName>
+				<unitPattern count="one">{0} pm</unitPattern>
+				<unitPattern count="two">{0} pm</unitPattern>
+				<unitPattern count="few">{0} pm</unitPattern>
+				<unitPattern count="other">{0} pm</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="two">{0} mi</unitPattern>
+				<unitPattern count="few">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>yd</displayName>
+				<unitPattern count="one">{0} yd</unitPattern>
+				<unitPattern count="two">{0} yd</unitPattern>
+				<unitPattern count="few">{0} yd</unitPattern>
+				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
 			<unit type="length-foot">
 				<displayName>ft</displayName>
@@ -5729,12 +5838,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} in</unitPattern>
 				<unitPattern count="other">{0} in</unitPattern>
 			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="two">{0} km</unitPattern>
-				<unitPattern count="few">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="two">{0} pc</unitPattern>
+				<unitPattern count="few">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
 			</unit>
 			<unit type="length-light-year">
 				<displayName>ly</displayName>
@@ -5743,40 +5852,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ly</unitPattern>
 				<unitPattern count="other">{0} ly</unitPattern>
 			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="two">{0} m</unitPattern>
-				<unitPattern count="few">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>μm</displayName>
-				<unitPattern count="one">{0} μm</unitPattern>
-				<unitPattern count="two">{0} μm</unitPattern>
-				<unitPattern count="few">{0} μm</unitPattern>
-				<unitPattern count="other">{0} μm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mi</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="two">{0} mi</unitPattern>
-				<unitPattern count="few">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>mm</displayName>
-				<unitPattern count="one">{0} mm</unitPattern>
-				<unitPattern count="two">{0} mm</unitPattern>
-				<unitPattern count="few">{0} mm</unitPattern>
-				<unitPattern count="other">{0} mm</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<displayName>nm</displayName>
-				<unitPattern count="one">{0} nm</unitPattern>
-				<unitPattern count="two">{0} nm</unitPattern>
-				<unitPattern count="few">{0} nm</unitPattern>
-				<unitPattern count="other">{0} nm</unitPattern>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="two">{0} au</unitPattern>
+				<unitPattern count="few">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
 				<displayName>nmi</displayName>
@@ -5785,27 +5866,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} nmi</unitPattern>
 				<unitPattern count="other">{0} nmi</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="two">{0} pc</unitPattern>
-				<unitPattern count="few">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName>pm</displayName>
-				<unitPattern count="one">{0} pm</unitPattern>
-				<unitPattern count="two">{0} pm</unitPattern>
-				<unitPattern count="few">{0} pm</unitPattern>
-				<unitPattern count="other">{0} pm</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<displayName>yd</displayName>
-				<unitPattern count="one">{0} yd</unitPattern>
-				<unitPattern count="two">{0} yd</unitPattern>
-				<unitPattern count="few">{0} yd</unitPattern>
-				<unitPattern count="other">{0} yd</unitPattern>
-			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
@@ -5813,27 +5873,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>Kt</displayName>
-				<unitPattern count="one">{0} Kt</unitPattern>
-				<unitPattern count="two">{0} Kt</unitPattern>
-				<unitPattern count="few">{0} Kt</unitPattern>
-				<unitPattern count="other">{0} Kt</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="two">{0} g</unitPattern>
-				<unitPattern count="few">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="two">{0} kg</unitPattern>
-				<unitPattern count="few">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
@@ -5841,12 +5880,19 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="two">{0} µg</unitPattern>
-				<unitPattern count="few">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="two">{0} kg</unitPattern>
+				<unitPattern count="few">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="two">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
@@ -5855,6 +5901,27 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="two">{0} µg</unitPattern>
+				<unitPattern count="few">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>am.tony</displayName>
+				<unitPattern count="one">{0} tn</unitPattern>
+				<unitPattern count="two">{0} tn</unitPattern>
+				<unitPattern count="few">{0} tn</unitPattern>
+				<unitPattern count="other">{0} tn</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="two">{0} lb</unitPattern>
+				<unitPattern count="few">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+			</unit>
 			<unit type="mass-ounce">
 				<displayName>oz</displayName>
 				<unitPattern count="one">{0} oz</unitPattern>
@@ -5869,19 +5936,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} oz. tr.</unitPattern>
 				<unitPattern count="other">{0} oz. tr.</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="two">{0} lb</unitPattern>
-				<unitPattern count="few">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<displayName>am.tony</displayName>
-				<unitPattern count="one">{0} tn</unitPattern>
-				<unitPattern count="two">{0} tn</unitPattern>
-				<unitPattern count="few">{0} tn</unitPattern>
-				<unitPattern count="other">{0} tn</unitPattern>
+			<unit type="mass-carat">
+				<displayName>Kt</displayName>
+				<unitPattern count="one">{0} Kt</unitPattern>
+				<unitPattern count="two">{0} Kt</unitPattern>
+				<unitPattern count="few">{0} Kt</unitPattern>
+				<unitPattern count="other">{0} Kt</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
@@ -5890,12 +5950,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>PS</displayName>
-				<unitPattern count="one">{0} PS</unitPattern>
-				<unitPattern count="two">{0} PS</unitPattern>
-				<unitPattern count="few">{0} PS</unitPattern>
-				<unitPattern count="other">{0} PS</unitPattern>
+			<unit type="power-megawatt">
+				<displayName>MW</displayName>
+				<unitPattern count="one">{0} MW</unitPattern>
+				<unitPattern count="two">{0} MW</unitPattern>
+				<unitPattern count="few">{0} MW</unitPattern>
+				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName>kW</displayName>
@@ -5904,12 +5964,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kW</unitPattern>
 				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<displayName>MW</displayName>
-				<unitPattern count="one">{0} MW</unitPattern>
-				<unitPattern count="two">{0} MW</unitPattern>
-				<unitPattern count="few">{0} MW</unitPattern>
-				<unitPattern count="other">{0} MW</unitPattern>
+			<unit type="power-watt">
+				<displayName>W</displayName>
+				<unitPattern count="one">{0} W</unitPattern>
+				<unitPattern count="two">{0} W</unitPattern>
+				<unitPattern count="few">{0} W</unitPattern>
+				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<displayName>mW</displayName>
@@ -5918,12 +5978,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mW</unitPattern>
 				<unitPattern count="other">{0} mW</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName>W</displayName>
-				<unitPattern count="one">{0} W</unitPattern>
-				<unitPattern count="two">{0} W</unitPattern>
-				<unitPattern count="few">{0} W</unitPattern>
-				<unitPattern count="other">{0} W</unitPattern>
+			<unit type="power-horsepower">
+				<displayName>PS</displayName>
+				<unitPattern count="one">{0} PS</unitPattern>
+				<unitPattern count="two">{0} PS</unitPattern>
+				<unitPattern count="few">{0} PS</unitPattern>
+				<unitPattern count="other">{0} PS</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
@@ -5932,20 +5992,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="two">{0} inHg</unitPattern>
-				<unitPattern count="few">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="two">{0} mbar</unitPattern>
-				<unitPattern count="few">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -5960,12 +6006,19 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="two">{0} kt</unitPattern>
-				<unitPattern count="few">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="two">{0} inHg</unitPattern>
+				<unitPattern count="few">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="two">{0} mbar</unitPattern>
+				<unitPattern count="few">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -6009,41 +6062,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="two">{0} ac ft</unitPattern>
-				<unitPattern count="few">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="two">{0} cl</unitPattern>
-				<unitPattern count="few">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="two">{0} cm³</unitPattern>
-				<unitPattern count="few">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="two">{0} ft³</unitPattern>
-				<unitPattern count="few">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="two">{0} in³</unitPattern>
-				<unitPattern count="few">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -6058,6 +6076,13 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
 			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="two">{0} cm³</unitPattern>
+				<unitPattern count="few">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
 				<unitPattern count="one">{0} mi³</unitPattern>
@@ -6072,33 +6097,26 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>c</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="two">{0} c</unitPattern>
-				<unitPattern count="few">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="two">{0} ft³</unitPattern>
+				<unitPattern count="few">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="two">{0} dl</unitPattern>
-				<unitPattern count="few">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="two">{0} in³</unitPattern>
+				<unitPattern count="few">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl. oz.</displayName>
-				<unitPattern count="one">{0} fl. oz.</unitPattern>
-				<unitPattern count="two">{0} fl. oz.</unitPattern>
-				<unitPattern count="few">{0} fl. oz.</unitPattern>
-				<unitPattern count="other">{0} fl. oz.</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="two">{0} gal</unitPattern>
-				<unitPattern count="few">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="two">{0} Ml</unitPattern>
+				<unitPattern count="few">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -6114,12 +6132,19 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="one">{0} Ml</unitPattern>
-				<unitPattern count="two">{0} Ml</unitPattern>
-				<unitPattern count="few">{0} Ml</unitPattern>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="two">{0} dl</unitPattern>
+				<unitPattern count="few">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="two">{0} cl</unitPattern>
+				<unitPattern count="few">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
@@ -6128,12 +6153,19 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="two">{0} pt</unitPattern>
-				<unitPattern count="few">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="two">{0} ac ft</unitPattern>
+				<unitPattern count="few">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="two">{0} gal</unitPattern>
+				<unitPattern count="few">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
@@ -6142,6 +6174,27 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="two">{0} pt</unitPattern>
+				<unitPattern count="few">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>c</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="two">{0} c</unitPattern>
+				<unitPattern count="few">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl. oz.</displayName>
+				<unitPattern count="one">{0} fl. oz.</unitPattern>
+				<unitPattern count="two">{0} fl. oz.</unitPattern>
+				<unitPattern count="few">{0} fl. oz.</unitPattern>
+				<unitPattern count="other">{0} fl. oz.</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>łž.</displayName>
 				<unitPattern count="one">{0} łž.</unitPattern>
@@ -6164,6 +6217,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} G</unitPattern>
 				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="two">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="two">{0}′</unitPattern>
@@ -6176,17 +6235,11 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="two">{0}°</unitPattern>
-				<unitPattern count="few">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="two">{0} ac</unitPattern>
-				<unitPattern count="few">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="two">{0} km²</unitPattern>
+				<unitPattern count="few">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} ha</unitPattern>
@@ -6194,18 +6247,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="two">{0} ft²</unitPattern>
-				<unitPattern count="few">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="two">{0} km²</unitPattern>
-				<unitPattern count="few">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} m²</unitPattern>
 				<unitPattern count="two">{0} m²</unitPattern>
@@ -6218,6 +6259,39 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="two">{0} ac</unitPattern>
+				<unitPattern count="few">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="two">{0} ft²</unitPattern>
+				<unitPattern count="few">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>l.</displayName>
+				<unitPattern count="one">{0} l.</unitPattern>
+				<unitPattern count="two">{0} l.</unitPattern>
+				<unitPattern count="few">{0} l.</unitPattern>
+				<unitPattern count="other">{0} l.</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mjas.</displayName>
+				<unitPattern count="one">{0} mjas.</unitPattern>
+				<unitPattern count="two">{0} mjas.</unitPattern>
+				<unitPattern count="few">{0} mjas.</unitPattern>
+				<unitPattern count="other">{0} mjas.</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>tyź.</displayName>
+				<unitPattern count="one">{0} tyź.</unitPattern>
+				<unitPattern count="two">{0} tyź.</unitPattern>
+				<unitPattern count="few">{0} tyź.</unitPattern>
+				<unitPattern count="other">{0} tyź.</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>d</displayName>
 				<unitPattern count="one">{0} ź</unitPattern>
@@ -6232,13 +6306,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} g</unitPattern>
 				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="two">{0} ms</unitPattern>
-				<unitPattern count="few">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
@@ -6246,13 +6313,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>mjas.</displayName>
-				<unitPattern count="one">{0} mjas.</unitPattern>
-				<unitPattern count="two">{0} mjas.</unitPattern>
-				<unitPattern count="few">{0} mjas.</unitPattern>
-				<unitPattern count="other">{0} mjas.</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>s</displayName>
 				<unitPattern count="one">{0} s</unitPattern>
@@ -6260,38 +6320,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} s</unitPattern>
 				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>tyź.</displayName>
-				<unitPattern count="one">{0} tyź.</unitPattern>
-				<unitPattern count="two">{0} tyź.</unitPattern>
-				<unitPattern count="few">{0} tyź.</unitPattern>
-				<unitPattern count="other">{0} tyź.</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>l.</displayName>
-				<unitPattern count="one">{0} l.</unitPattern>
-				<unitPattern count="two">{0} l.</unitPattern>
-				<unitPattern count="few">{0} l.</unitPattern>
-				<unitPattern count="other">{0} l.</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="two">{0} cm</unitPattern>
-				<unitPattern count="few">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="two">{0} ft</unitPattern>
-				<unitPattern count="few">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="two">{0} in</unitPattern>
-				<unitPattern count="few">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="two">{0} ms</unitPattern>
+				<unitPattern count="few">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
@@ -6300,12 +6334,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} km</unitPattern>
 				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} ly</unitPattern>
-				<unitPattern count="two">{0} ly</unitPattern>
-				<unitPattern count="few">{0} ly</unitPattern>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>m</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
@@ -6313,11 +6341,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="two">{0} mi</unitPattern>
-				<unitPattern count="few">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="two">{0} cm</unitPattern>
+				<unitPattern count="few">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -6332,18 +6361,35 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="two">{0} mi</unitPattern>
+				<unitPattern count="few">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="two">{0} yd</unitPattern>
 				<unitPattern count="few">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="two">{0} g</unitPattern>
-				<unitPattern count="few">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="two">{0} ft</unitPattern>
+				<unitPattern count="few">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="two">{0} in</unitPattern>
+				<unitPattern count="few">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="two">{0} ly</unitPattern>
+				<unitPattern count="few">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
@@ -6352,11 +6398,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="two">{0} oz</unitPattern>
-				<unitPattern count="few">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="two">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} lb</unitPattern>
@@ -6364,11 +6411,11 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} lb</unitPattern>
 				<unitPattern count="other">{0} lb</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} PS</unitPattern>
-				<unitPattern count="two">{0} PS</unitPattern>
-				<unitPattern count="few">{0} PS</unitPattern>
-				<unitPattern count="other">{0} PS</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="two">{0} oz</unitPattern>
+				<unitPattern count="few">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} kW</unitPattern>
@@ -6382,6 +6429,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} PS</unitPattern>
+				<unitPattern count="two">{0} PS</unitPattern>
+				<unitPattern count="few">{0} PS</unitPattern>
+				<unitPattern count="other">{0} PS</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="two">{0} hPa</unitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dsb_DE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dsb_DE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dsb_DE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dsb_DE.xml
index 35ac80a82f7..aa3eda694f8 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dsb_DE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dsb_DE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10671 $"/>
-		<generation date="$Date: 2014-07-23 17:52:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="dsb"/>
 		<territory type="DE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dua.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dua.xml
similarity index 88%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dua.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dua.xml
index 3a24d957935..093be601b3d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dua.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dua.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="dua"/>
 	</identity>
 	<localeDisplayNames>
@@ -181,6 +180,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">idiɓa</dayPeriod>
+							<dayPeriod type="pm">ebyámu</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">idiɓa</dayPeriod>
 							<dayPeriod type="pm">ebyámu</dayPeriod>
@@ -330,6 +333,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">0K ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 	</numbers>
 	<posix>
@@ -339,3 +358,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dua_CM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dua_CM.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dua_CM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dua_CM.xml
index 46168e1e279..61f7f33244e 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dua_CM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dua_CM.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="dua"/>
 		<territory type="CM"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dyo.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dyo.xml
similarity index 93%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dyo.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dyo.xml
index f0b8dd9f8ad..d1d2aa8ea20 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dyo.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dyo.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="dyo"/>
 	</identity>
 	<localeDisplayNames>
@@ -445,6 +444,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">0K ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AOA">
@@ -543,3 +558,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dyo_SN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dyo_SN.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dyo_SN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dyo_SN.xml
index 6cd1d499ef9..cfcdb08b1e4 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dyo_SN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dyo_SN.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="dyo"/>
 		<territory type="SN"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dz.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dz.xml
similarity index 97%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dz.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dz.xml
index c8e0355061d..3187edc0adf 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dz.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dz.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="dz"/>
 	</identity>
 	<localeDisplayNames>
@@ -510,45 +509,45 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="numbers">ཨང་ཡིག</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">ཨེ་ར་བིཀ་-ཨིན་ཌིཀ་ཨང</type>
-			<type type="arabext" key="numbers">ཨེ་ར་བིཀ་-ཨིན་ཌིཀ་རྒྱ་སྐྱེད་ཨང</type>
-			<type type="armn" key="numbers">ཨར་མི་ནི་ཡཱན་ཨང</type>
-			<type type="armnlow" key="numbers">ཨར་མི་ནི་ཡཱན་གྱི་མགྱོགས་ཡིག་ཨང་རྟགས</type>
-			<type type="beng" key="numbers">བངྒ་ལི་ཨང</type>
-			<type type="deva" key="numbers">དེ་ཝ་ན་ག་རི་ཨང</type>
-			<type type="ducet" key="collation">སྔ་སྒྲིག་ཡུ་ནི་ཀོཊ་གི་གོ་རིམ</type>
-			<type type="ethi" key="numbers">ཨི་ཐི་ཡོ་པིཀ་ཨང་རྟགཨ</type>
-			<type type="fullwide" key="numbers">རྒྱ་ཚད་གང་བའི་ཨང</type>
-			<type type="geor" key="numbers">ཇཽར་ཇཱི་ཡཱན་ཨང་རྟགས</type>
-			<type type="gregorian" key="calendar">གྲེག་གོ་རི་ཡཱན་ཟླ་ཐོ</type>
-			<type type="grek" key="numbers">གྲིཀ་ཨང་རྟགས</type>
-			<type type="greklow" key="numbers">གྲིཀ་གི་མགྱོགས་ཡིག་ཨང་རྟགས</type>
-			<type type="gujr" key="numbers">གུ་ཇ་ར་ཏི་ཨང</type>
-			<type type="guru" key="numbers">གུ་རུ་མུ་ཁི་ཨང</type>
-			<type type="hanidec" key="numbers">རྒྱ་མིའི་ཚག་ཅན་མའི་ཨང་རྟགས</type>
-			<type type="hans" key="numbers">འཇམ་སངམ་རྒྱ་མིའི་ཨང་རྟགས</type>
-			<type type="hansfin" key="numbers">འཇམ་སངམ་རྒྱ་མི་གི་དངུལ་འབྲེལ་ཨང་རྟགས</type>
-			<type type="hant" key="numbers">སྔ་དུས་རྒྱ་མིའི་ཨང་རྟགས</type>
-			<type type="hantfin" key="numbers">སྔ་དུས་རྒྱ་མིའི་གི་དངུལ་འབྲེལ་ཨང་རྟགས</type>
-			<type type="hebr" key="numbers">ཧེ་བྲུ་ཨང་རྟགས</type>
-			<type type="jpan" key="numbers">ཇཱ་པཱན་ནིས་ཨང་རྟགས</type>
-			<type type="jpanfin" key="numbers">ཇཱ་པཱན་ནིས་དངུལ་འབྲེལ་ཨང་རྟགས</type>
-			<type type="khmr" key="numbers">ཁེ་མར་ཨང</type>
-			<type type="knda" key="numbers">ཀ་ན་ཌ་ཨང</type>
-			<type type="laoo" key="numbers">ལཱ་འོས་ཨང་</type>
-			<type type="latn" key="numbers">ཕྱི་གླིང་པའི་ཨང</type>
-			<type type="mlym" key="numbers">མ་ལ་ཡ་ལམ་ཨང་</type>
-			<type type="mymr" key="numbers">མི་ཡཱན་མར་ཨང་</type>
-			<type type="orya" key="numbers">ཨོ་རི་ཡ་ཨང་</type>
-			<type type="roman" key="numbers">རོ་མཱན་ཨང་རྟགས</type>
-			<type type="romanlow" key="numbers">རོ་མཱན་གྱི་མགྱོགས་ཡིག་ཨང་རྟགས</type>
-			<type type="search" key="collation">སྤྱི་དོན་འཚོལ་བ</type>
-			<type type="taml" key="numbers">སྔ་དུས་ཊ་མིལ་ཨང་རྟགས</type>
-			<type type="tamldec" key="numbers">ཊ་མིལ་ཨང</type>
-			<type type="telu" key="numbers">ཏེ་ལུ་གུ་ཨང</type>
-			<type type="thai" key="numbers">ཐཱའི་ཨང</type>
-			<type type="tibt" key="numbers">ང་བཅས་ཀྱི་ཨང་ཡིག</type>
-			<type type="traditional" key="collation" draft="unconfirmed">ལུགས་སྲོལ</type>
+			<type key="calendar" type="gregorian">གྲེག་གོ་རི་ཡཱན་ཟླ་ཐོ</type>
+			<type key="collation" type="ducet">སྔ་སྒྲིག་ཡུ་ནི་ཀོཊ་གི་གོ་རིམ</type>
+			<type key="collation" type="search">སྤྱི་དོན་འཚོལ་བ</type>
+			<type key="collation" type="traditional" draft="unconfirmed">ལུགས་སྲོལ</type>
+			<type key="numbers" type="arab">ཨེ་ར་བིཀ་-ཨིན་ཌིཀ་ཨང</type>
+			<type key="numbers" type="arabext">ཨེ་ར་བིཀ་-ཨིན་ཌིཀ་རྒྱ་སྐྱེད་ཨང</type>
+			<type key="numbers" type="armn">ཨར་མི་ནི་ཡཱན་ཨང</type>
+			<type key="numbers" type="armnlow">ཨར་མི་ནི་ཡཱན་གྱི་མགྱོགས་ཡིག་ཨང་རྟགས</type>
+			<type key="numbers" type="beng">བངྒ་ལི་ཨང</type>
+			<type key="numbers" type="deva">དེ་ཝ་ན་ག་རི་ཨང</type>
+			<type key="numbers" type="ethi">ཨི་ཐི་ཡོ་པིཀ་ཨང་རྟགཨ</type>
+			<type key="numbers" type="fullwide">རྒྱ་ཚད་གང་བའི་ཨང</type>
+			<type key="numbers" type="geor">ཇཽར་ཇཱི་ཡཱན་ཨང་རྟགས</type>
+			<type key="numbers" type="grek">གྲིཀ་ཨང་རྟགས</type>
+			<type key="numbers" type="greklow">གྲིཀ་གི་མགྱོགས་ཡིག་ཨང་རྟགས</type>
+			<type key="numbers" type="gujr">གུ་ཇ་ར་ཏི་ཨང</type>
+			<type key="numbers" type="guru">གུ་རུ་མུ་ཁི་ཨང</type>
+			<type key="numbers" type="hanidec">རྒྱ་མིའི་ཚག་ཅན་མའི་ཨང་རྟགས</type>
+			<type key="numbers" type="hans">འཇམ་སངམ་རྒྱ་མིའི་ཨང་རྟགས</type>
+			<type key="numbers" type="hansfin">འཇམ་སངམ་རྒྱ་མི་གི་དངུལ་འབྲེལ་ཨང་རྟགས</type>
+			<type key="numbers" type="hant">སྔ་དུས་རྒྱ་མིའི་ཨང་རྟགས</type>
+			<type key="numbers" type="hantfin">སྔ་དུས་རྒྱ་མིའི་གི་དངུལ་འབྲེལ་ཨང་རྟགས</type>
+			<type key="numbers" type="hebr">ཧེ་བྲུ་ཨང་རྟགས</type>
+			<type key="numbers" type="jpan">ཇཱ་པཱན་ནིས་ཨང་རྟགས</type>
+			<type key="numbers" type="jpanfin">ཇཱ་པཱན་ནིས་དངུལ་འབྲེལ་ཨང་རྟགས</type>
+			<type key="numbers" type="khmr">ཁེ་མར་ཨང</type>
+			<type key="numbers" type="knda">ཀ་ན་ཌ་ཨང</type>
+			<type key="numbers" type="laoo">ལཱ་འོས་ཨང་</type>
+			<type key="numbers" type="latn">ཕྱི་གླིང་པའི་ཨང</type>
+			<type key="numbers" type="mlym">མ་ལ་ཡ་ལམ་ཨང་</type>
+			<type key="numbers" type="mymr">མི་ཡཱན་མར་ཨང་</type>
+			<type key="numbers" type="orya">ཨོ་རི་ཡ་ཨང་</type>
+			<type key="numbers" type="roman">རོ་མཱན་ཨང་རྟགས</type>
+			<type key="numbers" type="romanlow">རོ་མཱན་གྱི་མགྱོགས་ཡིག་ཨང་རྟགས</type>
+			<type key="numbers" type="taml">སྔ་དུས་ཊ་མིལ་ཨང་རྟགས</type>
+			<type key="numbers" type="tamldec">ཊ་མིལ་ཨང</type>
+			<type key="numbers" type="telu">ཏེ་ལུ་གུ་ཨང</type>
+			<type key="numbers" type="thai">ཐཱའི་ཨང</type>
+			<type key="numbers" type="tibt">ང་བཅས་ཀྱི་ཨང་ཡིག</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">མེ་ཊྲིཀ་བརྩི་ལུགས</measurementSystemName>
@@ -964,6 +963,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">སྔ་ཆ་</dayPeriod>
+							<dayPeriod type="pm">ཕྱི་ཆ་</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am">སྔ་ཆ་</dayPeriod>
 							<dayPeriod type="pm">ཕྱི་ཆ་</dayPeriod>
@@ -2361,6 +2364,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencies>
@@ -2610,6 +2629,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</numbers>
 	<units>
 		<unitLength type="long">
+			<unit type="duration-year">
+				<displayName draft="provisional">ལོ་འཁོར་</displayName>
+				<unitPattern count="other">ལོ་འཁོར་ {0}</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="provisional">ཟླཝ་</displayName>
+				<unitPattern count="other">ཟླཝ་ {0}</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="provisional">བངུན་ཕྲག་</displayName>
+				<unitPattern count="other">བངུན་ཕྲག་ {0}</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">ཉིན་ཞག་</displayName>
 				<unitPattern count="other">ཉིན་ཞག་ {0}</unitPattern>
@@ -2622,24 +2653,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName draft="provisional">སྐར་མ་</displayName>
 				<unitPattern count="other">སྐར་མ་ {0}</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">ཟླཝ་</displayName>
-				<unitPattern count="other">ཟླཝ་ {0}</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="provisional">སྐར་ཆ་</displayName>
 				<unitPattern count="other">སྐར་ཆ་ {0}</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">བངུན་ཕྲག་</displayName>
-				<unitPattern count="other">བངུན་ཕྲག་ {0}</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">ལོ་འཁོར་</displayName>
-				<unitPattern count="other">ལོ་འཁོར་ {0}</unitPattern>
-			</unit>
 		</unitLength>
 		<unitLength type="short">
+			<unit type="duration-year">
+				<displayName draft="provisional">ལོ་འཁོར་</displayName>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="provisional">ཟླཝ་</displayName>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="provisional">བངུན་ཕྲག་</displayName>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">ཉིན་ཞག་</displayName>
 			</unit>
@@ -2649,18 +2677,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="duration-minute">
 				<displayName draft="provisional">སྐར་མ་</displayName>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">ཟླཝ་</displayName>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="provisional">སྐར་ཆ་</displayName>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">བངུན་ཕྲག་</displayName>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">ལོ་འཁོར་</displayName>
-			</unit>
 		</unitLength>
 	</units>
 	<listPatterns>
@@ -2678,3 +2697,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dz_BT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dz_BT.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dz_BT.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dz_BT.xml
index bbc8b1a5b91..da54051a2b1 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/dz_BT.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dz_BT.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="dz"/>
 		<territory type="BT"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ebu.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ebu.xml
similarity index 94%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ebu.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ebu.xml
index e8b07bbfedb..3f5a3bd604b 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ebu.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ebu.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="ebu"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antili za Uholanzi</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Ajentina</territory>
 			<territory type="AS">Samoa ya Marekani</territory>
@@ -449,6 +447,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">KI</dayPeriod>
+							<dayPeriod type="pm">UT</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">KI</dayPeriod>
 							<dayPeriod type="pm">UT</dayPeriod>
@@ -490,22 +492,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -584,6 +586,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -761,3 +779,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ebu_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ebu_KE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ebu_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ebu_KE.xml
index b16c007828d..b91a98eacba 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ebu_KE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ebu_KE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ebu"/>
 		<territory type="KE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ee.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ee.xml
similarity index 89%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ee.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ee.xml
index 42710a49a38..c4d7f3f9b81 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ee.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ee.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="ee"/>
 	</identity>
 	<localeDisplayNames>
@@ -20,10 +19,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ab">abkhaziagbe</language>
 			<language type="ady" draft="unconfirmed">adyghegbe</language>
 			<language type="af">afrikaangbe</language>
-			<language type="agq" draft="unconfirmed">aghemgbe</language>
+			<language type="agq">aghemgbe</language>
 			<language type="ak">blugbe</language>
 			<language type="am">amhariagbe</language>
-			<language type="ar">arabiagbe</language>
+			<language type="ar">Arabiagbe</language>
 			<language type="as">assamegbe</language>
 			<language type="asa">asagbe</language>
 			<language type="ast" draft="unconfirmed">asturiagbe</language>
@@ -42,7 +41,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bi" draft="unconfirmed">bislamagbe</language>
 			<language type="bkm" draft="unconfirmed">komgbe</language>
 			<language type="bm">bambaragbe</language>
-			<language type="bn">bengalgbe</language>
+			<language type="bn">Bengaligbe</language>
 			<language type="bo">tibetagbe</language>
 			<language type="br">bretongbe</language>
 			<language type="brx">bodogbe</language>
@@ -58,27 +57,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="cs">tsɛkgbe</language>
 			<language type="cy">walesgbe</language>
 			<language type="da">denmarkgbe</language>
-			<language type="de">germaniagbe</language>
-			<language type="de_AT">austriatɔwo ƒe germaniagbe</language>
-			<language type="de_CH">swizerlanɖ germaniagbe kɔkɔtɔ</language>
+			<language type="de">Germaniagbe</language>
+			<language type="de_AT">Germaniagbe (Austria)</language>
+			<language type="de_CH">Germaniagbe (Switzerland)</language>
 			<language type="dje" draft="unconfirmed">zamagbe</language>
 			<language type="dua" draft="unconfirmed">dualagbe</language>
 			<language type="dv">divehgbe</language>
 			<language type="dyo" draft="unconfirmed">dzola-fonyigbe</language>
 			<language type="dz">dzongkhagbe</language>
 			<language type="ebu">embugbe</language>
-			<language type="ee">eʋegbe</language>
+			<language type="ee">Eʋegbe</language>
 			<language type="efi">efigbe</language>
 			<language type="el">grisigbe</language>
-			<language type="en">yevugbe</language>
-			<language type="en_AU">australiatɔwo ƒe yevugbe</language>
-			<language type="en_CA">kanadatɔwo ƒe yevugbe</language>
-			<language type="en_GB">britaintɔwo ƒe yevugbe</language>
-			<language type="en_US">u.s.dukɔmetɔwo ƒe yevugbe</language>
+			<language type="en">Yevugbe</language>
+			<language type="en_AU">Yevugbe (Australia)</language>
+			<language type="en_CA">Yevugbe (Canada)</language>
+			<language type="en_GB">Yevugbe (Britain)</language>
+			<language type="en_GB" alt="short">Yevugbe (GB)</language>
+			<language type="en_US">Yevugbe (America)</language>
+			<language type="en_US" alt="short">Yevugbe (US)</language>
 			<language type="eo">esperantogbe</language>
-			<language type="es">spaniagbe</language>
-			<language type="es_419">latin amerikatɔwo ƒe spaniagbe</language>
-			<language type="es_ES">iberiatɔwo ƒe spaniagbe</language>
+			<language type="es">Spanishgbe</language>
+			<language type="es_419">Spanishgbe (Latin America)</language>
+			<language type="es_ES">Spanishgbe (Europe)</language>
+			<language type="es_MX">Spanishgbe (Mexico)</language>
 			<language type="et">estoniagbe</language>
 			<language type="eu">basqugbe</language>
 			<language type="ewo" draft="unconfirmed">ewondogbe</language>
@@ -89,9 +91,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="fil">filipingbe</language>
 			<language type="fj">fidzigbe</language>
 			<language type="fo" draft="unconfirmed">faroegbe</language>
-			<language type="fr">fransegbe</language>
-			<language type="fr_CA">kanadatɔwo ƒe fransegbe</language>
-			<language type="fr_CH">swizerlanɖtɔwo ƒe fransegbe</language>
+			<language type="fr">Fransegbe</language>
+			<language type="fr_CA">Fransegbe (Canada)</language>
+			<language type="fr_CH">Fransegbe (Switzerland)</language>
 			<language type="fy" draft="unconfirmed">ɣetoɖoƒe frisiagbe</language>
 			<language type="ga">irelanɖgbe</language>
 			<language type="gaa" draft="unconfirmed">gɛgbe</language>
@@ -104,7 +106,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ha">hausagbe</language>
 			<language type="haw">hawaigbe</language>
 			<language type="he">hebrigbe</language>
-			<language type="hi">hindigbe</language>
+			<language type="hi">Hindigbe</language>
 			<language type="hil" draft="unconfirmed">hiligenɔgbe</language>
 			<language type="ho" draft="unconfirmed">hiri motugbe</language>
 			<language type="hr">kroatiagbe</language>
@@ -112,13 +114,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="hu">hungarigbe</language>
 			<language type="hy">armeniagbe</language>
 			<language type="ibb" draft="unconfirmed">ibibiogbe</language>
-			<language type="id">indonesiagbe</language>
+			<language type="id">Indonesiagbe</language>
 			<language type="ig">igbogbe</language>
 			<language type="ilo" draft="unconfirmed">ilikogbe</language>
 			<language type="inh" draft="unconfirmed">ingusigbe</language>
 			<language type="is">icelanɖgbe</language>
-			<language type="it">italiagbe</language>
-			<language type="ja">dzapangbe</language>
+			<language type="it">Italiagbe</language>
+			<language type="ja">Japangbe</language>
 			<language type="jv">dzavangbe</language>
 			<language type="ka">gɔgiagbe</language>
 			<language type="kbd" draft="unconfirmed">kabardiagbe</language>
@@ -131,7 +133,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="kl" draft="unconfirmed">kalaalisugbe</language>
 			<language type="km">khmergbe</language>
 			<language type="kn">kannadagbe</language>
-			<language type="ko">koreagbe</language>
+			<language type="ko">Koreagbe</language>
 			<language type="kok" draft="unconfirmed">konkaniagbe</language>
 			<language type="kos" draft="unconfirmed">kosraeagbe</language>
 			<language type="kr" draft="unconfirmed">kanuriagbe</language>
@@ -175,8 +177,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nd">dziehe ndebelegbe</language>
 			<language type="ne">nepalgbe</language>
 			<language type="niu" draft="unconfirmed">niuegbe</language>
-			<language type="nl">hɔlandgbe</language>
-			<language type="nl_BE">flemiagbe</language>
+			<language type="nl">Hollandgbe</language>
+			<language type="nl_BE">Flemishgbe</language>
 			<language type="nmg" draft="unconfirmed">kwasiogbe</language>
 			<language type="nn">nɔweigbe ninɔsk</language>
 			<language type="nnh" draft="unconfirmed">ngiemboongbe</language>
@@ -191,18 +193,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="pag" draft="unconfirmed">pangsinagbe</language>
 			<language type="pap" draft="unconfirmed">papiamentogbe</language>
 			<language type="pau" draft="unconfirmed">paluagbe</language>
-			<language type="pl">polandgbe</language>
+			<language type="pl">Polishgbe</language>
 			<language type="pon" draft="unconfirmed">ponpeiagbe</language>
 			<language type="ps">pashtogbe</language>
-			<language type="pt">pɔtugalgbe</language>
-			<language type="pt_BR">braziltɔwo ƒe portugalgbe</language>
-			<language type="pt_PT">iberiatɔwo ƒe portugalgbe</language>
+			<language type="pt">Portuguesegbe</language>
+			<language type="pt_BR">Portuguesegbe (Brazil)</language>
+			<language type="pt_PT">Portuguesegbe (Europe)</language>
 			<language type="qu">kwetsuagbe</language>
 			<language type="rm">romanshgbe</language>
 			<language type="rn">rundigbe</language>
 			<language type="ro">romaniagbe</language>
 			<language type="rof">rombogbe</language>
-			<language type="ru">rɔtsiagbe</language>
+			<language type="ru">Russiagbe</language>
 			<language type="rw">ruwandagbe</language>
 			<language type="rwk">rwagbe</language>
 			<language type="sa">sanskrigbe</language>
@@ -223,7 +225,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sr">serbiagbe</language>
 			<language type="ss">swatgbe</language>
 			<language type="st">anyiehe sothogbe</language>
-			<language type="su">sudangbe</language>
 			<language type="sv">swedengbe</language>
 			<language type="sw">swahili</language>
 			<language type="swb">komorogbe</language>
@@ -231,7 +232,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="te">telegugbe</language>
 			<language type="tet">tetumgbe</language>
 			<language type="tg">tadzikistangbe</language>
-			<language type="th">tailandgbe</language>
+			<language type="th">Thailandgbe</language>
 			<language type="ti">tigrinyagbe</language>
 			<language type="tk">tɛkmengbe</language>
 			<language type="tkl" draft="unconfirmed">tokelaugbe</language>
@@ -239,7 +240,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="tn">tswanagbe</language>
 			<language type="to">tongagbe</language>
 			<language type="tpi">tok pisigbe</language>
-			<language type="tr">tɛkigbe</language>
+			<language type="tr">Turkishgbe</language>
 			<language type="ts">tsongagbe</language>
 			<language type="tt" draft="unconfirmed">tatargbe</language>
 			<language type="tvl" draft="unconfirmed">tuvalugbe</language>
@@ -265,14 +266,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="yo">yorubagbe</language>
 			<language type="yue">cantongbe</language>
 			<language type="za" draft="unconfirmed">zhuangbe</language>
-			<language type="zh">kinagbe</language>
+			<language type="zh">Chinagbe</language>
 			<language type="zh_Hans">tsainagbe</language>
 			<language type="zh_Hant">blema tsainagbe</language>
 			<language type="zu">zulugbe</language>
 			<language type="zxx">gbegbɔgblɔ manɔmee</language>
 		</languages>
 		<scripts>
-			<script type="Arab">arabiagbeŋɔŋlɔ</script>
+			<script type="Arab">Arabiagbeŋɔŋlɔ</script>
 			<script type="Armi" draft="unconfirmed">aramia gbeŋɔŋlɔ</script>
 			<script type="Armn">armeniagbeŋɔŋlɔ</script>
 			<script type="Avst" draft="unconfirmed">avesta gbeŋɔŋlɔ</script>
@@ -293,7 +294,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Cirt" draft="unconfirmed">seif gbeŋɔŋlɔ</script>
 			<script type="Copt" draft="unconfirmed">koptia gbeŋɔŋlɔ</script>
 			<script type="Cprt" draft="unconfirmed">saipriot gbeŋɔŋlɔ</script>
-			<script type="Cyrl">syrilliagbeŋɔŋlɔ</script>
+			<script type="Cyrl">Cyrillicgbeŋɔŋlɔ</script>
 			<script type="Cyrs" draft="unconfirmed">slavonia sirillia sɔleme gbeŋɔŋlɔ xoxotɔ</script>
 			<script type="Deva">devanagarigbeŋɔŋlɔ</script>
 			<script type="Dsrt" draft="unconfirmed">deseret gbeŋɔŋlɔ</script>
@@ -312,8 +313,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Hang">hangulgbeŋɔŋlɔ</script>
 			<script type="Hani">hangbeŋɔŋlɔ</script>
 			<script type="Hano" draft="unconfirmed">hanuno gbeŋɔŋlɔ</script>
-			<script type="Hans">tsainagbeŋɔŋlɔ</script>
-			<script type="Hant">blema tsainagbeŋɔŋlɔ</script>
+			<script type="Hans">Chinesegbeŋɔŋlɔ</script>
+			<script type="Hans" alt="stand-alone">Hansgbeŋɔŋlɔ</script>
+			<script type="Hant">Blema Chinesegbeŋɔŋlɔ</script>
+			<script type="Hant" alt="stand-alone">Blema Hantgbeŋcŋlɔ</script>
 			<script type="Hebr">hebrigbeŋɔŋlɔ</script>
 			<script type="Hira">hiraganagbeŋɔŋlɔ</script>
 			<script type="Hmng" draft="unconfirmed">pahawh hmong gbeŋɔŋlɔ</script>
@@ -322,20 +325,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Inds" draft="unconfirmed">indus gbeŋɔŋlɔ</script>
 			<script type="Ital" draft="unconfirmed">aitalik xoxotɔ</script>
 			<script type="Java" draft="unconfirmed">dzavanese gbeŋɔŋlɔ</script>
-			<script type="Jpan">dzapangbeŋɔŋlɔ</script>
+			<script type="Jpan">Japanesegbeŋɔŋlɔ</script>
 			<script type="Kali" draft="unconfirmed">kayah li gbeŋɔŋlɔ</script>
 			<script type="Kana">katakanagbeŋɔŋlɔ</script>
 			<script type="Khar" draft="unconfirmed">kharoshthi gbeŋɔŋlɔ</script>
 			<script type="Khmr">khmergbeŋɔŋlɔ</script>
 			<script type="Khoj" draft="unconfirmed">khodziki gbeŋɔŋlɔ</script>
 			<script type="Knda">kannadagbeŋɔŋlɔ</script>
-			<script type="Kore">koreagbeŋɔŋlɔ</script>
+			<script type="Kore">Koreagbeŋɔŋlɔ</script>
 			<script type="Kthi" draft="unconfirmed">kaithi gbeŋɔŋlɔ</script>
 			<script type="Lana" draft="unconfirmed">lanna gbeŋɔŋlɔ</script>
 			<script type="Laoo">laogbeŋɔŋlɔ</script>
 			<script type="Latf" draft="unconfirmed">fraktur latin gbeŋɔŋlɔ</script>
 			<script type="Latg" draft="unconfirmed">gaelia latin gbeŋɔŋlɔ</script>
-			<script type="Latn">latingbeŋɔŋlɔ</script>
+			<script type="Latn">Latingbeŋɔŋlɔ</script>
 			<script type="Lepc" draft="unconfirmed">leptsa gbeŋɔŋlɔ</script>
 			<script type="Limb" draft="unconfirmed">limbu gbeŋɔŋlɔ</script>
 			<script type="Lina" draft="unconfirmed">linia a gbeŋɔŋlɔ</script>
@@ -450,7 +453,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla nutome</territory>
 			<territory type="AL">Albania nutome</territory>
 			<territory type="AM">Armenia nutome</territory>
-			<territory type="AN">Nedalands Antilis nutome</territory>
 			<territory type="AO">Angola nutome</territory>
 			<territory type="AQ">Antartica nutome</territory>
 			<territory type="AR">Argentina nutome</territory>
@@ -481,7 +483,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BW">Botswana nutome</territory>
 			<territory type="BY">Belarus nutome</territory>
 			<territory type="BZ">Belize nutome</territory>
-			<territory type="CA">Kanada nutome</territory>
+			<territory type="CA">Canada nutome</territory>
 			<territory type="CC">Kokos (Kiling) fudomekpo nutome</territory>
 			<territory type="CD">Kongo Kinshasa nutome</territory>
 			<territory type="CD" alt="variant">Kongo demokratik repɔblik nutome</territory>
@@ -517,7 +519,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="EG">Egypte nutome</territory>
 			<territory type="EH">Ɣetoɖoƒe Sahara nutome</territory>
 			<territory type="ER">Eritrea nutome</territory>
-			<territory type="ES">Spania nutome</territory>
+			<territory type="ES">Spain nutome</territory>
 			<territory type="ET">Etiopia nutome</territory>
 			<territory type="EU">Europa Wɔɖeka nutome</territory>
 			<territory type="FI">Finland nutome</territory>
@@ -526,7 +528,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="FK" alt="variant">Falkland ƒudomekpowo (Islas Malvinas) nutome</territory>
 			<territory type="FM">Mikronesia nutome</territory>
 			<territory type="FO">Faroe ƒudomekpowo nutome</territory>
-			<territory type="FR">Frans nutome</territory>
+			<territory type="FR">France nutome</territory>
 			<territory type="GA">Gabɔn nutome</territory>
 			<territory type="GB">United Kingdom nutome</territory>
 			<territory type="GD">Grenada nutome</territory>
@@ -540,7 +542,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GN">Guini nutome</territory>
 			<territory type="GP">Guadelupe nutome</territory>
 			<territory type="GQ">Ekuatorial Guini nutome</territory>
-			<territory type="GR">Grisi nutome</territory>
+			<territory type="GR">Greece nutome</territory>
 			<territory type="GS">Anyiehe Georgia kple Anyiehe Sandwich ƒudomekpowo nutome</territory>
 			<territory type="GT">Guatemala nutome</territory>
 			<territory type="GU">Guam nutome</territory>
@@ -612,7 +614,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="MU">mauritiusdukɔ</territory>
 			<territory type="MV">maldivesdukɔ</territory>
 			<territory type="MW">Malawi nutome</territory>
-			<territory type="MX">Meksico nutome</territory>
+			<territory type="MX">Mexico nutome</territory>
 			<territory type="MY">Malaysia nutome</territory>
 			<territory type="MZ">Mozambiki nutome</territory>
 			<territory type="NA">Namibia nutome</territory>
@@ -621,7 +623,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="NF">Norfolk ƒudomekpo nutome</territory>
 			<territory type="NG">Nigeria nutome</territory>
 			<territory type="NI">Nicaraguadukɔ</territory>
-			<territory type="NL">Nedalands nutome</territory>
+			<territory type="NL">Netherlands nutome</territory>
 			<territory type="NO">Norway nutome</territory>
 			<territory type="NP">Nepal nutome</territory>
 			<territory type="NR">Nauru nutome</territory>
@@ -675,7 +677,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="TD">Tsad nutome</territory>
 			<territory type="TF">Anyiehe Franseme nutome</territory>
 			<territory type="TG">Togo nutome</territory>
-			<territory type="TH">Tailand nutome</territory>
+			<territory type="TH">Thailand nutome</territory>
 			<territory type="TJ">Tajikistan nutome</territory>
 			<territory type="TK">Tokelau nutome</territory>
 			<territory type="TL">Timor-Leste nutome</territory>
@@ -705,7 +707,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="WS">Samoa nutome</territory>
 			<territory type="YE">Yemen nutome</territory>
 			<territory type="YT">Mayotte nutome</territory>
-			<territory type="ZA">Anyiehe Afrika nutome</territory>
+			<territory type="ZA">Anyiehe Africa nutome</territory>
 			<territory type="ZM">Zambia nutome</territory>
 			<territory type="ZW">Zimbabwe nutome</territory>
 			<territory type="ZZ">nutome manya</territory>
@@ -721,83 +723,84 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="numbers">nɔmbawo</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">india ƒe arabia digitwo</type>
-			<type type="arabext" key="numbers">india ƒe arabia digitwo dzi yiyi</type>
-			<type type="armn" key="numbers">armeniatɔwo ƒe numeralwo</type>
-			<type type="armnlow" key="numbers">armeniatɔwo ƒe numeral suetɔwo</type>
-			<type type="bali" key="numbers" draft="unconfirmed">balina digitwo</type>
-			<type type="beng" key="numbers">bengalitɔwo ƒe digitwo</type>
-			<type type="big5han" key="collation">blema chinatɔwo ƒe ɖoɖomɔ nu</type>
-			<type type="buddhist" key="calendar">buddha subɔlawo ƒe kalenda</type>
-			<type type="cham" key="numbers" draft="unconfirmed">tsam digitwo</type>
-			<type type="chinese" key="calendar">chinatɔwo ƒe kalenda</type>
-			<type type="coptic" key="calendar">coptia kalenda</type>
-			<type type="deva" key="numbers">devanagari digitwo</type>
-			<type type="dictionary" key="collation">nuɖoɖo ɖe nyagɔmeɖegbalẽ ƒe ɖoɖomɔ nu</type>
-			<type type="ducet" key="collation">nuɖoɖo ɖe unicode ƒe ɖoɖo nu</type>
-			<type type="ethi" key="numbers">ethiopia numeralwo</type>
-			<type type="ethiopic" key="calendar">ethiopiatɔwo ƒe kalenda</type>
-			<type type="ethiopic-amete-alem" key="calendar">ethiopia amate alemtɔwo ƒe kalenda</type>
-			<type type="fullwide" key="numbers">digit kekeme blibotɔwo</type>
-			<type type="gb2312han" key="collation">chinagbe yeye ƒe ɖoɖomɔ nu</type>
-			<type type="geor" key="numbers">georgiatɔwo ƒe numeralwo</type>
-			<type type="gregorian" key="calendar">gregoria kalenda</type>
-			<type type="grek" key="numbers">greecetɔwo ƒe nemeralwo</type>
-			<type type="greklow" key="numbers">greecetɔwo ƒe numeral suetɔwo</type>
-			<type type="gujr" key="numbers">gujarati digitwo</type>
-			<type type="guru" key="numbers">gurmukhi digitwo</type>
-			<type type="hanidec" key="numbers">chinatɔwo ƒe nɔmba madeblibowo</type>
-			<type type="hans" key="numbers">chinatɔwo ƒe numeralwo</type>
-			<type type="hansfin" key="numbers">chinatɔwo ƒe gadzikpɔ numeralwo</type>
-			<type type="hant" key="numbers">blema chinatɔwo ƒe numeralwo</type>
-			<type type="hantfin" key="numbers">blema chinatɔwo ƒe gadzikpɔ numeralwo</type>
-			<type type="hebr" key="numbers">hebritɔwo ƒe numeralwo</type>
-			<type type="hebrew" key="calendar">hebritɔwo ƒe kalenda</type>
-			<type type="indian" key="calendar">india dukɔ ƒe kalenda</type>
-			<type type="islamic" key="calendar">islam subɔlawo ƒe kalenda</type>
-			<type type="islamic-civil" key="calendar">islam subɔlawo ƒe sivil kalenda</type>
-			<type type="japanese" key="calendar">japantɔwo ƒe kalenda</type>
-			<type type="java" key="numbers" draft="unconfirmed">dzava digitwo</type>
-			<type type="jpan" key="numbers">japantɔwo ƒe numeralwo</type>
-			<type type="jpanfin" key="numbers">japantɔwo ƒe gadzikpɔnumeralwo</type>
-			<type type="kali" key="numbers" draft="unconfirmed">kali digitwo</type>
-			<type type="khmr" key="numbers">khmertɔwo ƒe nɔmbawo</type>
-			<type type="knda" key="numbers">kannadatɔwo ƒe digitwo</type>
-			<type type="lana" key="numbers" draft="unconfirmed">lana digitwo</type>
-			<type type="lanatham" key="numbers" draft="unconfirmed">lanatham digitwo</type>
-			<type type="laoo" key="numbers">laotɔwo ƒe digitwo</type>
-			<type type="latn" key="numbers">nɔmbawo le latingbe ƒe ɖoɖo nu</type>
-			<type type="lepc" key="numbers" draft="unconfirmed">leptsa digitwo</type>
-			<type type="limb" key="numbers" draft="unconfirmed">limbu digitwo</type>
-			<type type="mlym" key="numbers">malaya digitwo</type>
-			<type type="mong" key="numbers">mongolia digitwo</type>
-			<type type="mtei" key="numbers" draft="unconfirmed">meetei mayek digitwo</type>
-			<type type="mymr" key="numbers">myanmar digitwo</type>
-			<type type="mymrshan" key="numbers" draft="unconfirmed">myanmar shan digitwo</type>
-			<type type="nkoo" key="numbers" draft="unconfirmed">n’ko digitwo</type>
-			<type type="olck" key="numbers" draft="unconfirmed">ol tsiki digitwo</type>
-			<type type="orya" key="numbers">oriya digitwo</type>
-			<type type="persian" key="calendar">persiatɔwo ƒe kalenda</type>
-			<type type="phonebook" key="collation">fonegbalẽ me ɖoɖomɔ nu</type>
-			<type type="pinyin" key="collation">pinyin ɖoɖomɔ nu</type>
-			<type type="reformed" key="collation">nugbugbɔtoɖo ƒe ɖoɖomɔ nu</type>
-			<type type="roc" key="calendar">china repɔbliktɔwo ƒe kalenda tso 1912</type>
-			<type type="roman" key="numbers">romatɔwo ƒe numeralwo</type>
-			<type type="romanlow" key="numbers">romatɔwo ƒe numeral suetɔwo</type>
-			<type type="saur" key="numbers" draft="unconfirmed">saurashtra digitwo</type>
-			<type type="search" key="collation">nudidi hena zazã gbadza</type>
-			<type type="searchjl" key="collation" draft="unconfirmed">nudidi le hangul ƒe ɖoɖo gbãtɔ nu</type>
-			<type type="stroke" key="collation">stroke ɖoɖomɔ nu</type>
-			<type type="sund" key="numbers" draft="unconfirmed">sundana digitwo</type>
-			<type type="talu" key="numbers" draft="unconfirmed">tai lue digit yeye wo</type>
-			<type type="taml" key="numbers">tamil numeralwo</type>
-			<type type="tamldec" key="numbers" draft="unconfirmed">tamil digitwo</type>
-			<type type="telu" key="numbers">telegu digitwo</type>
-			<type type="thai" key="numbers">thai digitwo</type>
-			<type type="tibt" key="numbers">tibet digitwo</type>
-			<type type="traditional" key="collation">blema ɖoɖomɔ nu</type>
-			<type type="unihan" key="collation">ɖoɖomɔnutɔxɛ manɔŋu stroke ƒe ɖoɖo nu</type>
-			<type type="vaii" key="numbers" draft="unconfirmed">vaii digitwo</type>
+			<type key="calendar" type="buddhist">buddha subɔlawo ƒe kalenda</type>
+			<type key="calendar" type="chinese">chinatɔwo ƒe kalenda</type>
+			<type key="calendar" type="coptic">coptia kalenda</type>
+			<type key="calendar" type="ethiopic">ethiopiatɔwo ƒe kalenda</type>
+			<type key="calendar" type="ethiopic-amete-alem">ethiopia amate alemtɔwo ƒe kalenda</type>
+			<type key="calendar" type="gregorian">Gregorian kalenda</type>
+			<type key="calendar" type="hebrew">hebritɔwo ƒe kalenda</type>
+			<type key="calendar" type="indian">india dukɔ ƒe kalenda</type>
+			<type key="calendar" type="islamic">islam subɔlawo ƒe kalenda</type>
+			<type key="calendar" type="islamic-civil">islam subɔlawo ƒe sivil kalenda</type>
+			<type key="calendar" type="japanese">japantɔwo ƒe kalenda</type>
+			<type key="calendar" type="persian">persiatɔwo ƒe kalenda</type>
+			<type key="calendar" type="roc">china repɔbliktɔwo ƒe kalenda tso 1912</type>
+			<type key="collation" type="big5han">blema chinatɔwo ƒe ɖoɖomɔ nu</type>
+			<type key="collation" type="dictionary">nuɖoɖo ɖe nyagɔmeɖegbalẽ ƒe ɖoɖomɔ nu</type>
+			<type key="collation" type="ducet">nuɖoɖo ɖe unicode ƒe ɖoɖo nu</type>
+			<type key="collation" type="gb2312han">chinagbe yeye ƒe ɖoɖomɔ nu</type>
+			<type key="collation" type="phonebook">fonegbalẽ me ɖoɖomɔ nu</type>
+			<type key="collation" type="pinyin">pinyin ɖoɖomɔ nu</type>
+			<type key="collation" type="reformed">nugbugbɔtoɖo ƒe ɖoɖomɔ nu</type>
+			<type key="collation" type="search">nudidi hena zazã gbadza</type>
+			<type key="collation" type="searchjl" draft="unconfirmed">nudidi le hangul ƒe ɖoɖo gbãtɔ nu</type>
+			<type key="collation" type="standard">standard</type>
+			<type key="collation" type="stroke">stroke ɖoɖomɔ nu</type>
+			<type key="collation" type="traditional">blema ɖoɖomɔ nu</type>
+			<type key="collation" type="unihan">ɖoɖomɔnutɔxɛ manɔŋu stroke ƒe ɖoɖo nu</type>
+			<type key="numbers" type="arab">india ƒe arabia digitwo</type>
+			<type key="numbers" type="arabext">india ƒe arabia digitwo dzi yiyi</type>
+			<type key="numbers" type="armn">armeniatɔwo ƒe numeralwo</type>
+			<type key="numbers" type="armnlow">armeniatɔwo ƒe numeral suetɔwo</type>
+			<type key="numbers" type="bali" draft="unconfirmed">balina digitwo</type>
+			<type key="numbers" type="beng">bengalitɔwo ƒe digitwo</type>
+			<type key="numbers" type="cham" draft="unconfirmed">tsam digitwo</type>
+			<type key="numbers" type="deva">devanagari digitwo</type>
+			<type key="numbers" type="ethi">ethiopia numeralwo</type>
+			<type key="numbers" type="fullwide">digit kekeme blibotɔwo</type>
+			<type key="numbers" type="geor">georgiatɔwo ƒe numeralwo</type>
+			<type key="numbers" type="grek">greecetɔwo ƒe nemeralwo</type>
+			<type key="numbers" type="greklow">greecetɔwo ƒe numeral suetɔwo</type>
+			<type key="numbers" type="gujr">gujarati digitwo</type>
+			<type key="numbers" type="guru">gurmukhi digitwo</type>
+			<type key="numbers" type="hanidec">chinatɔwo ƒe nɔmba madeblibowo</type>
+			<type key="numbers" type="hans">chinatɔwo ƒe numeralwo</type>
+			<type key="numbers" type="hansfin">chinatɔwo ƒe gadzikpɔ numeralwo</type>
+			<type key="numbers" type="hant">blema chinatɔwo ƒe numeralwo</type>
+			<type key="numbers" type="hantfin">blema chinatɔwo ƒe gadzikpɔ numeralwo</type>
+			<type key="numbers" type="hebr">hebritɔwo ƒe numeralwo</type>
+			<type key="numbers" type="java" draft="unconfirmed">dzava digitwo</type>
+			<type key="numbers" type="jpan">japantɔwo ƒe numeralwo</type>
+			<type key="numbers" type="jpanfin">japantɔwo ƒe gadzikpɔnumeralwo</type>
+			<type key="numbers" type="kali" draft="unconfirmed">kali digitwo</type>
+			<type key="numbers" type="khmr">khmertɔwo ƒe nɔmbawo</type>
+			<type key="numbers" type="knda">kannadatɔwo ƒe digitwo</type>
+			<type key="numbers" type="lana" draft="unconfirmed">lana digitwo</type>
+			<type key="numbers" type="lanatham" draft="unconfirmed">lanatham digitwo</type>
+			<type key="numbers" type="laoo">laotɔwo ƒe digitwo</type>
+			<type key="numbers" type="latn">Nɔmbawo le Latingbe ƒe ɖoɖo nu</type>
+			<type key="numbers" type="lepc" draft="unconfirmed">leptsa digitwo</type>
+			<type key="numbers" type="limb" draft="unconfirmed">limbu digitwo</type>
+			<type key="numbers" type="mlym">malaya digitwo</type>
+			<type key="numbers" type="mong">mongolia digitwo</type>
+			<type key="numbers" type="mtei" draft="unconfirmed">meetei mayek digitwo</type>
+			<type key="numbers" type="mymr">myanmar digitwo</type>
+			<type key="numbers" type="mymrshan" draft="unconfirmed">myanmar shan digitwo</type>
+			<type key="numbers" type="nkoo" draft="unconfirmed">n’ko digitwo</type>
+			<type key="numbers" type="olck" draft="unconfirmed">ol tsiki digitwo</type>
+			<type key="numbers" type="orya">oriya digitwo</type>
+			<type key="numbers" type="roman">romatɔwo ƒe numeralwo</type>
+			<type key="numbers" type="romanlow">romatɔwo ƒe numeral suetɔwo</type>
+			<type key="numbers" type="saur" draft="unconfirmed">saurashtra digitwo</type>
+			<type key="numbers" type="sund" draft="unconfirmed">sundana digitwo</type>
+			<type key="numbers" type="talu" draft="unconfirmed">tai lue digit yeye wo</type>
+			<type key="numbers" type="taml">tamil numeralwo</type>
+			<type key="numbers" type="tamldec" draft="unconfirmed">tamil digitwo</type>
+			<type key="numbers" type="telu">telegu digitwo</type>
+			<type key="numbers" type="thai">thai digitwo</type>
+			<type key="numbers" type="tibt">tibet digitwo</type>
+			<type key="numbers" type="vaii" draft="unconfirmed">vaii digitwo</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metric</measurementSystemName>
@@ -1193,7 +1196,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">E, MMM d 'lia' – E, MMM d 'lia'</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
-							<greatestDifference id="y" draft="unconfirmed">G y–y</greatestDifference>
+							<greatestDifference id="y">G y–y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
 							<greatestDifference id="M">M/y – M/y G</greatestDifference>
@@ -1437,19 +1440,39 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">ŋdi</dayPeriod>
+							<dayPeriod type="pm">ɣetrɔ</dayPeriod>
+							<dayPeriod type="morning1">fɔŋli</dayPeriod>
+							<dayPeriod type="morning2">ŋdi</dayPeriod>
+							<dayPeriod type="afternoon1">ŋdɔ</dayPeriod>
+							<dayPeriod type="afternoon2">ɣetrɔ</dayPeriod>
+							<dayPeriod type="evening1">fiẽ</dayPeriod>
+							<dayPeriod type="night1">zã</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am" draft="unconfirmed">ŋ</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">ɣ</dayPeriod>
+							<dayPeriod type="am">ŋ</dayPeriod>
+							<dayPeriod type="pm">ɣ</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="afternoon">ɣetrɔ</dayPeriod>
 							<dayPeriod type="am">ŋdi</dayPeriod>
-							<dayPeriod type="earlyAfternoon">ŋdɔ</dayPeriod>
-							<dayPeriod type="earlyMorning">fɔŋli</dayPeriod>
-							<dayPeriod type="evening">fiẽ</dayPeriod>
-							<dayPeriod type="morning">ŋdi</dayPeriod>
-							<dayPeriod type="night">zã</dayPeriod>
 							<dayPeriod type="pm">ɣetrɔ</dayPeriod>
+							<dayPeriod type="morning1">fɔŋli</dayPeriod>
+							<dayPeriod type="morning2">ŋdi</dayPeriod>
+							<dayPeriod type="afternoon1">ŋdɔ</dayPeriod>
+							<dayPeriod type="afternoon2">ɣetrɔ</dayPeriod>
+							<dayPeriod type="evening1">fiẽ</dayPeriod>
+							<dayPeriod type="night1">zã</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">ŋ</dayPeriod>
+							<dayPeriod type="pm">ɣ</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am" draft="provisional">ŋdi</dayPeriod>
+							<dayPeriod type="pm" draft="provisional">ɣetrɔ</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1460,7 +1483,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</eraNames>
 					<eraAbbr>
 						<era type="0">hY</era>
+						<era type="0" alt="variant">Bŋ</era>
 						<era type="1">Yŋ</era>
+						<era type="1" alt="variant">Eŋ</era>
 					</eraAbbr>
 					<eraNarrow>
 						<era type="0" draft="unconfirmed">hY</era>
@@ -1492,7 +1517,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>a h:mm:ss zzzz</pattern>
+							<pattern>a 'ga' h:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
@@ -1535,9 +1560,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
-						<dateFormatItem id="Ehm" draft="unconfirmed">E a 'ga' h:mm</dateFormatItem>
+						<dateFormatItem id="Ehm">E a 'ga' h:mm</dateFormatItem>
 						<dateFormatItem id="EHm" draft="unconfirmed">E HH:mm</dateFormatItem>
-						<dateFormatItem id="Ehms" draft="unconfirmed">E a 'ga' h:mm:ss</dateFormatItem>
+						<dateFormatItem id="Ehms">E a 'ga' h:mm:ss</dateFormatItem>
 						<dateFormatItem id="EHms" draft="unconfirmed">E HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -1694,7 +1719,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="6" draft="unconfirmed">masa</month>
 							<month type="7" draft="unconfirmed">siamlɔm</month>
 							<month type="7" yeartype="leap" draft="unconfirmed">siamlɔm</month>
-							<month type="8" draft="unconfirmed">dasiamime</month>
+							<month type="8" draft="unconfirmed">deasiamime</month>
 							<month type="9" draft="unconfirmed">anyɔnyɔ</month>
 							<month type="10" draft="unconfirmed">kele</month>
 							<month type="11" draft="unconfirmed">adeɛmekpɔxe</month>
@@ -2016,15 +2041,67 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">ƒe si gbɔ na</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">le ƒe {0} me</relativeTimePattern>
-					<relativeTimePattern count="other">le ƒe {0} wo me</relativeTimePattern>
+					<relativeTimePattern count="other">le ƒe {0} me</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">ƒe {0} si va yi</relativeTimePattern>
 					<relativeTimePattern count="other">ƒe {0} si wo va yi</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="year-short">
+				<displayName>ƒe</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">le ƒe {0} me</relativeTimePattern>
+					<relativeTimePattern count="other">le ƒe {0} me</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">le ƒe {0} si va yi me</relativeTimePattern>
+					<relativeTimePattern count="other">le ƒe {0} si va yi me</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-narrow">
+				<displayName>ƒe</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">le ƒe {0} si gbɔna me</relativeTimePattern>
+					<relativeTimePattern count="other">le ƒe {0} si gbɔna me</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">ƒe {0} si va yi me</relativeTimePattern>
+					<relativeTimePattern count="other">ƒe {0} si va yi me</relativeTimePattern>
+				</relativeTime>
+			</field>
 			<field type="quarter">
-				<displayName draft="unconfirmed">kɔta</displayName>
+				<displayName>kɔta</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">le kɔta {0} si gbɔ na me</relativeTimePattern>
+					<relativeTimePattern count="other">le kɔta {0} si gbɔ na me</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">kɔta {0} si va yi me</relativeTimePattern>
+					<relativeTimePattern count="other">kɔta {0} si va yi me</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-short">
+				<displayName>kɔta</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">le kɔta {0} si gbɔ na me</relativeTimePattern>
+					<relativeTimePattern count="other">le kɔta {0} si gbɔ na me</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">kɔta {0} si va yi me</relativeTimePattern>
+					<relativeTimePattern count="other">kɔta {0} si va yi me</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-narrow">
+				<displayName>kɔta</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">le kɔta {0} si gbɔna me</relativeTimePattern>
+					<relativeTimePattern count="other">le kɔta {0} si gbɔ na me</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">kɔta {0} si va yi me</relativeTimePattern>
+					<relativeTimePattern count="other">kɔta {0} si va yi me</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="month">
 				<displayName>ɣleti</displayName>
@@ -2040,6 +2117,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">ɣleti {0} si wo va yi</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="month-short">
+				<displayName>ɣleti</displayName>
+			</field>
+			<field type="month-narrow">
+				<displayName>ɣleti</displayName>
+			</field>
 			<field type="week">
 				<displayName>kɔsiɖa ɖeka</displayName>
 				<relative type="-1">kɔsiɖa si va yi</relative>
@@ -2150,8 +2233,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 		</fields>
 		<timeZoneNames>
-			<hourFormat draft="unconfirmed">+HH:mm;-HH:mm</hourFormat>
-			<regionFormat draft="contributed">{0} gaƒoƒo</regionFormat>
+			<hourFormat>+HH:mm;-HH:mm</hourFormat>
+			<gmtFormat>GMT{0}</gmtFormat>
+			<gmtZeroFormat>GMT</gmtZeroFormat>
+			<regionFormat>{0}</regionFormat>
+			<regionFormat type="daylight">{0}</regionFormat>
+			<regionFormat type="standard">{0}</regionFormat>
+			<fallbackFormat>{1} ({0})</fallbackFormat>
 			<zone type="Etc/Unknown">
 				<exemplarCity>du manya</exemplarCity>
 			</zone>
@@ -3360,7 +3448,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Africa_Eastern">
 				<long>
-					<standard>Ɣedzeƒe Afrika gaƒoƒome</standard>
+					<standard>Ɣedzeƒe Africa gaƒoƒome</standard>
 				</long>
 				<short>
 					<standard>EAT</standard>
@@ -3368,7 +3456,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Africa_Southern">
 				<long>
-					<standard>Anyiehe Afrika gaƒoƒome</standard>
+					<standard>Anyiehe Africa gaƒoƒome</standard>
 				</long>
 				<short>
 					<standard>SAST</standard>
@@ -3376,9 +3464,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Ɣetoɖoƒe Afrika gaƒoƒome</generic>
+					<generic>Ɣetoɖoƒe Africa gaƒoƒome</generic>
 					<standard>Ɣetoɖoƒe Afrika gaƒoƒoɖoanyime</standard>
-					<daylight>Ɣetoɖoƒe Afrika dzomeŋɔli gaƒoƒome</daylight>
+					<daylight>Ɣetoɖoƒe Africa ŋkekeme gaƒoƒome</daylight>
 				</long>
 				<short>
 					<generic>WAT</generic>
@@ -3409,30 +3497,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="America_Central">
 				<long>
-					<generic>Titina Amerika gaƒoƒome</generic>
-					<standard>Titina Amerika gaƒoƒoɖoanyime</standard>
-					<daylight>Titina Amerika ŋkekeme gaƒoƒome</daylight>
+					<generic>Titina America gaƒoƒome</generic>
+					<standard>Titina America gaƒoƒoɖoanyime</standard>
+					<daylight>Titina America ŋkekeme gaƒoƒome</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
-					<generic>Ɣedzeƒe Amerika gaƒoƒome</generic>
-					<standard>Ɣedzeƒe Amerika gaƒoƒoɖoanyime</standard>
-					<daylight>Ɣedzeƒe Amerika ŋkekeme gaƒoƒome</daylight>
+					<generic>Ɣedzeƒe America gaƒoƒome</generic>
+					<standard>Ɣedzeƒe America gaƒoƒoɖoanyime</standard>
+					<daylight>Ɣedzeƒe America ŋkekeme gaƒoƒome</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
-					<generic>Amerika Todzidukɔwo ƒe gaƒoƒome</generic>
-					<standard>Amerika Todzidukɔwo ƒe gaƒoƒoɖoanyime</standard>
-					<daylight>Amerika Todzidukɔwo ƒe ŋkekme gaƒoƒome</daylight>
+					<generic>America Todzidukɔwo ƒe gaƒoƒome</generic>
+					<standard>America Todzidukɔwo ƒe gaƒoƒoɖoanyime</standard>
+					<daylight>America Todzidukɔwo ƒe ŋkekme gaƒoƒome</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
-					<generic>Amerika Pasifik gaƒoƒome</generic>
-					<standard>Amerika Pasifik gaƒoƒoɖoanyime</standard>
-					<daylight>Amerika Pasifik ŋkekeme gaƒoƒome</daylight>
+					<generic>Pacific gaƒoƒome</generic>
+					<standard>Pacific gaƒoƒoɖoanyime</standard>
+					<daylight>Pacific ŋkekme gaƒoƒome</daylight>
 				</long>
 			</metazone>
 			<metazone type="Anadyr">
@@ -3458,9 +3546,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Arabian">
 				<long>
-					<generic draft="unconfirmed">Arabia gaƒoƒome</generic>
-					<standard draft="unconfirmed">Arabia gaƒoƒoɖoanyime</standard>
-					<daylight draft="unconfirmed">Arabia ŋkekeme gaƒoƒome</daylight>
+					<generic>Arabia gaƒoƒome</generic>
+					<standard>Arabia gaƒoƒoɖoanyime</standard>
+					<daylight>Arabia ŋkekeme gaƒoƒome</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina">
@@ -3491,6 +3579,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<daylight>Atlantic ŋkekeme gaƒoƒome</daylight>
 				</long>
 			</metazone>
+			<metazone type="Australia_Central">
+				<long>
+					<generic>Titina Australia gaƒoƒome</generic>
+					<standard>Titina Australia gaƒoƒoɖoanyime</standard>
+					<daylight>Titina Australia ŋkekeme gaƒoƒome</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_CentralWestern">
+				<long>
+					<generic>Australia ɣetoɖofe gaƒoƒome</generic>
+					<standard>Australia ɣetoɖofe gaƒoƒoɖoanyime</standard>
+					<daylight>Australia ɣetoɖofe ŋkekeme gaƒoƒome</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Eastern">
+				<long>
+					<generic>Ɣedzeƒe Australia gaƒoƒome</generic>
+					<standard>Ɣedzeƒe Australia gaƒoƒoɖoanyime</standard>
+					<daylight>Ɣedzeƒe Australia ŋkekeme gaƒoƒome</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Western">
+				<long>
+					<generic>Ɣetoɖoƒe Australia gaƒoƒome</generic>
+					<standard>Ɣetoɖoƒe Australia gaƒoƒoɖoanyime</standard>
+					<daylight>Ɣetoɖoƒe Australia ŋkekeme gaƒoƒome</daylight>
+				</long>
+			</metazone>
 			<metazone type="Azerbaijan">
 				<long>
 					<generic draft="unconfirmed">Azerbaidzan gaƒoƒome</generic>
@@ -3533,9 +3649,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="China">
 				<long>
-					<generic draft="unconfirmed">Tsaina gaƒoƒome</generic>
-					<standard draft="unconfirmed">Tsaina gaƒoƒoɖoanyime</standard>
-					<daylight draft="unconfirmed">Tsaina ŋkekeme gaƒoƒome</daylight>
+					<generic>China gaƒoƒome</generic>
+					<standard>China gaƒoƒoɖoanyime</standard>
+					<daylight>China ŋkekeme gaƒoƒome</daylight>
 				</long>
 			</metazone>
 			<metazone type="Choibalsan">
@@ -3573,23 +3689,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Europe_Central">
 				<long>
-					<generic draft="unconfirmed">Titina Yuropa gaƒoƒome</generic>
-					<standard draft="unconfirmed">Titina Yuropa gaƒoƒoɖoanyime</standard>
-					<daylight draft="unconfirmed">Titina Yuropa dzomeŋɔli gaƒoƒome</daylight>
+					<generic>Titina Europe gaƒoƒome</generic>
+					<standard>Titina Europe gaƒoƒoɖoanyime</standard>
+					<daylight>Titina Europe ŋkekeme gaƒoƒome</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Eastern">
 				<long>
-					<generic draft="unconfirmed">Ɣedzeƒe Yuropa gaƒoƒo me</generic>
-					<standard draft="unconfirmed">Ɣedzeƒe Yuropa gaƒoƒoɖoanyime</standard>
-					<daylight draft="unconfirmed">Ɣedzeƒe Yuropa dzomeŋɔli gaƒoƒome</daylight>
+					<generic>Ɣedzeƒe Europe gaƒoƒome</generic>
+					<standard>Ɣedzeƒe Europe gaƒoƒoɖoanyime</standard>
+					<daylight>Ɣedzeƒe Europe ŋkekeme gaƒoƒome</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
 				<long>
-					<generic draft="unconfirmed">Ɣetoɖoƒe Yuropa gaƒoƒome</generic>
-					<standard draft="unconfirmed">Ɣetoɖoƒe Yuropa gaƒoƒoɖoanyime</standard>
-					<daylight draft="unconfirmed">Ɣetoɖoƒe Yuropa dzomeŋɔli gaƒoƒome</daylight>
+					<generic>Ɣetoɖoƒe Europe gaƒoƒome</generic>
+					<standard>Ɣetoɖoƒe Europe gaƒoƒoɖoanyime</standard>
+					<daylight>Ɣetoɖoƒe Europe ŋkekeme gaƒoƒome</daylight>
 				</long>
 			</metazone>
 			<metazone type="Falkland">
@@ -3618,7 +3734,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="GMT">
 				<long>
-					<standard draft="unconfirmed">Grinwish gaƒoƒome</standard>
+					<standard>Greenwich gaƒoƒome</standard>
 				</long>
 			</metazone>
 			<metazone type="Greenland_Eastern">
@@ -3675,16 +3791,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Israel">
 				<long>
-					<generic draft="unconfirmed">Israel gaƒoƒome</generic>
-					<standard draft="unconfirmed">Israel gaƒoƒoɖoanyime</standard>
-					<daylight draft="unconfirmed">Israel ŋkekeme gaƒoƒome</daylight>
+					<generic>Israel gaƒoƒome</generic>
+					<standard>Israel gaƒoƒoɖoanyime</standard>
+					<daylight>Israel ŋkekeme gaƒoƒome</daylight>
 				</long>
 			</metazone>
 			<metazone type="Japan">
 				<long>
-					<generic draft="unconfirmed">Dzapan gaƒoƒome</generic>
-					<standard draft="unconfirmed">Dzapan gaƒoƒoɖanyime</standard>
-					<daylight draft="unconfirmed">Dzapan ŋkekeme gaƒoƒome</daylight>
+					<generic>Japan gaƒoƒome</generic>
+					<standard>Japan gaƒoƒoɖanyime</standard>
+					<daylight>Japan ŋkekeme gaƒoƒome</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kamchatka">
@@ -3706,9 +3822,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Korea">
 				<long>
-					<generic draft="unconfirmed">Korea gaƒoƒome</generic>
-					<standard draft="unconfirmed">Korea gaƒoƒoɖoanyime</standard>
-					<daylight draft="unconfirmed">Korea ŋkekeme gaƒoƒome</daylight>
+					<generic>Korea gaƒoƒome</generic>
+					<standard>Korea gaƒoƒoɖoanyime</standard>
+					<daylight>Korea ŋkekeme gaƒoƒome</daylight>
 				</long>
 			</metazone>
 			<metazone type="Krasnoyarsk">
@@ -3753,9 +3869,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Moscow">
 				<long>
-					<generic draft="unconfirmed">Mɔskowgaƒoƒome</generic>
-					<standard draft="unconfirmed">Mɔskow gaƒoƒoɖoanyime</standard>
-					<daylight draft="unconfirmed">Mɔskow dzomeŋɔli gaƒoƒome</daylight>
+					<generic>Moscow gaƒoƒome</generic>
+					<standard>Moscow gaƒoƒoɖoanyime</standard>
+					<daylight>Moscow ŋkekeme gaƒoƒome</daylight>
 				</long>
 			</metazone>
 			<metazone type="Newfoundland">
@@ -3982,6 +4098,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤0000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0000M</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤00000M</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00000M</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤000000M</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000000M</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤0B</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0B</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤00B</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00B</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤000B</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000B</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{1} {0}</unitPattern>
 			<unitPattern count="other">{1} {0}</unitPattern>
 		</currencyFormats>
@@ -4077,10 +4221,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">ɔstriaga schilling</displayName>
 			</currency>
 			<currency type="AUD">
-				<displayName>australiaga dollar</displayName>
-				<displayName count="one">ɔstraliaga dollar</displayName>
-				<displayName count="other">ɔstraliaga dollar</displayName>
-				<symbol draft="unconfirmed">AU$</symbol>
+				<displayName>Australiaga dollar</displayName>
+				<displayName count="one">Australiaga dollar</displayName>
+				<displayName count="other">Australiaga dollar</displayName>
+				<symbol draft="contributed">AU$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="AWG">
 				<displayName>arubaga lorin</displayName>
@@ -4213,10 +4358,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">braziliaga cruzeiro xoxotɔ gbãtɔwo (1990–1993)</displayName>
 			</currency>
 			<currency type="BRL">
-				<displayName>brazilga real</displayName>
-				<displayName count="one">braziliaga real</displayName>
-				<displayName count="other">braziliaga real</displayName>
-				<symbol draft="unconfirmed">R$</symbol>
+				<displayName>Braziliaga real</displayName>
+				<displayName count="one">Brazilga real</displayName>
+				<displayName count="other">Braziliaga real</displayName>
+				<symbol draft="contributed">R$</symbol>
+				<symbol alt="narrow" draft="contributed">R$</symbol>
 			</currency>
 			<currency type="BRN">
 				<displayName>brazilia cruzado xoxotɔ (1989–1990)</displayName>
@@ -4269,10 +4415,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">belizega dollar</displayName>
 			</currency>
 			<currency type="CAD">
-				<displayName>kanadaga dollar</displayName>
-				<displayName count="one">kanadaga dollar</displayName>
-				<displayName count="other">kanadaga dollar</displayName>
-				<symbol draft="unconfirmed">CA$</symbol>
+				<displayName>Canadaga dollar</displayName>
+				<displayName count="one">Canadaga dollar</displayName>
+				<displayName count="other">Canadaga dollar</displayName>
+				<symbol draft="contributed">CA$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CDF">
 				<displayName>kongoga franc</displayName>
@@ -4285,9 +4432,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">WIR eurowo CHE</displayName>
 			</currency>
 			<currency type="CHF">
-				<displayName>swissga franc</displayName>
-				<displayName count="one">swissga franc</displayName>
-				<displayName count="other">swissga franc</displayName>
+				<displayName>Swissga franc</displayName>
+				<displayName count="one">Swissga franc</displayName>
+				<displayName count="other">Swissga franc</displayName>
+				<symbol draft="contributed">CHF</symbol>
 			</currency>
 			<currency type="CHW">
 				<displayName>WIR euro CHW</displayName>
@@ -4315,10 +4463,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">tsainatɔwo ƒe gadzraɖoƒe dollarwo</displayName>
 			</currency>
 			<currency type="CNY">
-				<displayName>tsainaga yuan</displayName>
-				<displayName count="one">tsainaga yuan</displayName>
-				<displayName count="other">tsainaga yuan</displayName>
-				<symbol draft="unconfirmed">CN¥</symbol>
+				<displayName>Chinesega yuan</displayName>
+				<displayName count="one">Chinesega yuan</displayName>
+				<displayName count="other">Chinesega yuan</displayName>
+				<symbol draft="contributed">CN¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
 			<currency type="COP">
 				<displayName>kolombiaga peso</displayName>
@@ -4386,9 +4535,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">dzibutiga franc</displayName>
 			</currency>
 			<currency type="DKK">
-				<displayName>danemarkga krone</displayName>
-				<displayName count="one">denmarkga krone</displayName>
-				<displayName count="other">denmarkga krone</displayName>
+				<displayName>Denmarkga krone</displayName>
+				<displayName count="one">Denmarkga krone</displayName>
+				<displayName count="other">Denmarkga krone</displayName>
+				<symbol draft="contributed">DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>dominicaga peso</displayName>
@@ -4446,10 +4597,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">ethiopiaga birr</displayName>
 			</currency>
 			<currency type="EUR">
-				<displayName>euro</displayName>
+				<displayName>EUR</displayName>
 				<displayName count="one">euro</displayName>
 				<displayName count="other">euro</displayName>
-				<symbol draft="unconfirmed">€</symbol>
+				<symbol draft="contributed">€</symbol>
+				<symbol alt="narrow" draft="contributed">€</symbol>
 			</currency>
 			<currency type="FIM">
 				<displayName>finlandga markka</displayName>
@@ -4472,10 +4624,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">frentsiga franc</displayName>
 			</currency>
 			<currency type="GBP">
-				<displayName>britainga pound</displayName>
-				<displayName count="one">britainga pound</displayName>
-				<displayName count="other">britainga pound</displayName>
-				<symbol draft="unconfirmed">£</symbol>
+				<displayName>Britishga pound</displayName>
+				<displayName count="one">Britishga pound</displayName>
+				<displayName count="other">Britishga pound</displayName>
+				<symbol draft="contributed">£</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GEK">
 				<displayName>dzɔdziaga kupon larit</displayName>
@@ -4549,10 +4702,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">guyanaga dollar</displayName>
 			</currency>
 			<currency type="HKD">
-				<displayName>hong kongga dollar</displayName>
-				<displayName count="one">hong kongga dollar</displayName>
-				<displayName count="other">hong kongga dollar</displayName>
-				<symbol draft="unconfirmed">HK$</symbol>
+				<displayName>Hong Kongga dollar</displayName>
+				<displayName count="one">Hong Kongga dollar</displayName>
+				<displayName count="other">Hong Kongga dollar</displayName>
+				<symbol draft="contributed">HK$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="HNL">
 				<displayName>honduraga lempira</displayName>
@@ -4580,9 +4734,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">hungariaga forint</displayName>
 			</currency>
 			<currency type="IDR">
-				<displayName>indinesiaga rupiah</displayName>
-				<displayName count="one">indinesiaga rupiah</displayName>
-				<displayName count="other">indinesiaga rupiah</displayName>
+				<displayName>Indonesiaga rupiah</displayName>
+				<displayName count="one">Indonesiaga rupiah</displayName>
+				<displayName count="other">Indonesiaga rupiah</displayName>
+				<symbol draft="contributed">IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>ireland pound</displayName>
@@ -4606,10 +4762,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol draft="unconfirmed">₪</symbol>
 			</currency>
 			<currency type="INR">
-				<displayName>indiaga rupee</displayName>
-				<displayName count="one">indiaga rupee</displayName>
-				<displayName count="other">indiaga rupee</displayName>
-				<symbol draft="unconfirmed">₹</symbol>
+				<displayName>Indiaga rupee</displayName>
+				<displayName count="one">Indiaga rupee</displayName>
+				<displayName count="other">Indiaga rupee</displayName>
+				<symbol draft="contributed">₹</symbol>
+				<symbol alt="narrow" draft="contributed">₹</symbol>
 			</currency>
 			<currency type="IQD">
 				<displayName>irakga dinar</displayName>
@@ -4647,10 +4804,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">yɔdanga dinar</displayName>
 			</currency>
 			<currency type="JPY">
-				<displayName>dzapanga yen</displayName>
-				<displayName count="one">dzapanga yen</displayName>
-				<displayName count="other">dzapanga yen</displayName>
-				<symbol draft="unconfirmed">JP¥</symbol>
+				<displayName>Japanesega yen</displayName>
+				<displayName count="one">Japanesega yen</displayName>
+				<displayName count="other">Japanesega yen</displayName>
+				<symbol draft="contributed">JP¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
 			<currency type="KES">
 				<displayName>kenyaga shilling</displayName>
@@ -4688,10 +4846,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">anyiehe koreaga won (1945–1953)</displayName>
 			</currency>
 			<currency type="KRW">
-				<displayName>anyiehe koreaga won</displayName>
-				<displayName count="one">anyiehe koreaga won</displayName>
-				<displayName count="other">anyiehe koreaga won</displayName>
-				<symbol draft="unconfirmed">₩</symbol>
+				<displayName>South Koreaga won</displayName>
+				<displayName count="one">South Koreaga won</displayName>
+				<displayName count="other">South Koreaga won</displayName>
+				<symbol draft="contributed">₩</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KWD">
 				<displayName>kuwaitga dinar</displayName>
@@ -4869,10 +5028,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other" draft="unconfirmed">malawiga kwacha</displayName>
 			</currency>
 			<currency type="MXN">
-				<displayName>meksikoga peso</displayName>
-				<displayName count="one">meksikoga peso</displayName>
-				<displayName count="other">meksikoga peso</displayName>
-				<symbol draft="unconfirmed">MX$</symbol>
+				<displayName>Mexicoga peso</displayName>
+				<displayName count="one">Mexicoga peso</displayName>
+				<displayName count="other">Mexicoga peso</displayName>
+				<symbol draft="contributed">MX$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="MYR">
 				<displayName>malaysiaga ringit</displayName>
@@ -4908,9 +5068,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">hollandga guilder</displayName>
 			</currency>
 			<currency type="NOK">
-				<displayName>norwayga krone</displayName>
-				<displayName count="one">nɔweiga krone</displayName>
-				<displayName count="other">nɔweiga krone</displayName>
+				<displayName>Norwayga krone</displayName>
+				<displayName count="one">Norwayga krone</displayName>
+				<displayName count="other">Norwayga krone</displayName>
+				<symbol draft="contributed">NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>nepalga rupee</displayName>
@@ -5009,9 +5171,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">serbiaga dinar</displayName>
 			</currency>
 			<currency type="RUB">
-				<displayName>rɔtsiaga ruble</displayName>
-				<displayName count="one">rɔtsiaga ruble</displayName>
-				<displayName count="other">rɔtsiaga ruble</displayName>
+				<displayName>Russiaga ruble</displayName>
+				<displayName count="one">Russiaga ruble</displayName>
+				<displayName count="other">Russiaga ruble</displayName>
+				<symbol draft="contributed">RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>rɔtsiaga ruble (1991–1998)</displayName>
@@ -5024,9 +5188,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">rwandaga franc</displayName>
 			</currency>
 			<currency type="SAR">
-				<displayName>saudiga riyal</displayName>
-				<displayName count="one">saudiga riyal</displayName>
-				<displayName count="other">saudiga riyal</displayName>
+				<displayName>Saudi Arabiaga riyal</displayName>
+				<displayName count="one">Saudi Arabiaga riyal</displayName>
+				<displayName count="other">Saudi Arabiaga riyal</displayName>
+				<symbol draft="contributed">SAR</symbol>
 			</currency>
 			<currency type="SBD">
 				<displayName>solomon ƒudomekpo dukɔwo ƒe ga dollar</displayName>
@@ -5054,9 +5219,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">sudanga pound (1957–1998)</displayName>
 			</currency>
 			<currency type="SEK">
-				<displayName>swedenga krona</displayName>
-				<displayName count="one">swedenga krona</displayName>
-				<displayName count="other">swedenga krona</displayName>
+				<displayName>Swedishga krone</displayName>
+				<displayName count="one">Swedishga krone</displayName>
+				<displayName count="other">Swedishga krone</displayName>
+				<symbol draft="contributed">SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>singapɔga dollar</displayName>
@@ -5129,10 +5296,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">swaziga lilangeni</displayName>
 			</currency>
 			<currency type="THB">
-				<displayName>thaiga baht</displayName>
-				<displayName count="one">thaiga baht</displayName>
-				<displayName count="other">thaiga baht</displayName>
-				<symbol draft="unconfirmed">฿</symbol>
+				<displayName>Thailandga baht</displayName>
+				<displayName count="one">Thailandga baht</displayName>
+				<displayName count="other">Thailandga baht</displayName>
+				<symbol draft="contributed">฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>tajikistanga ruble</displayName>
@@ -5175,9 +5343,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">tɛkiiga lira (1922–2005)</displayName>
 			</currency>
 			<currency type="TRY">
-				<displayName>tɛkiiga lira</displayName>
-				<displayName count="one">tɛkiiga lira</displayName>
-				<displayName count="other">tɛkiiga lira</displayName>
+				<displayName>Turkishga lira</displayName>
+				<displayName count="one">Turkishga lira</displayName>
+				<displayName count="other">Turkishga lira</displayName>
+				<symbol draft="contributed">TRY</symbol>
+				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>trinidad kple tobagoga dollar</displayName>
@@ -5185,10 +5356,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">trinidad kple tobagoga dollar</displayName>
 			</currency>
 			<currency type="TWD">
-				<displayName>taiwanga yeye dollar</displayName>
-				<displayName count="one">taiwanga yeye dollar</displayName>
-				<displayName count="other">taiwanga yeye dollar</displayName>
-				<symbol draft="unconfirmed">NT$</symbol>
+				<displayName>Taiwanga dollar</displayName>
+				<displayName count="one">Taiwanga dollar</displayName>
+				<displayName count="other">Taiwanga dollar</displayName>
+				<symbol draft="contributed">NT$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="TZS">
 				<displayName>Tanzaniatɔwofɛgadudu</displayName>
@@ -5216,10 +5388,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">ugandaga shilling</displayName>
 			</currency>
 			<currency type="USD">
-				<displayName>us ga dollar</displayName>
-				<displayName count="one">us ga dollar</displayName>
-				<displayName count="other">us ga dollar</displayName>
-				<symbol draft="unconfirmed">US$</symbol>
+				<displayName>US ga dollar</displayName>
+				<displayName count="one">US ga dollar</displayName>
+				<displayName count="other">US ga dollar</displayName>
+				<symbol draft="contributed">US$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="USN">
 				<displayName>us ga dollar (ŋkeke si gbɔna tɔ)</displayName>
@@ -5414,9 +5587,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">anyiehe afrikaga rand (gadzikpɔtɔ)</displayName>
 			</currency>
 			<currency type="ZAR">
-				<displayName>anyiehe afrikaga rand</displayName>
-				<displayName count="one">anyiehe afrikaga rand</displayName>
-				<displayName count="other">anyiehe afrikaga rand</displayName>
+				<displayName>South Africaga rand</displayName>
+				<displayName count="one">South Africaga rand</displayName>
+				<displayName count="other">South Africaga rand</displayName>
+				<symbol draft="contributed">ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>zambiaga kwacha (1968–2012)</displayName>
@@ -5457,41 +5632,41 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</numbers>
 	<units>
 		<unitLength type="long">
-			<unit type="duration-day">
-				<displayName draft="unconfirmed">ŋkeke</displayName>
-				<unitPattern count="one">ŋkeke {0} wo</unitPattern>
-				<unitPattern count="other">ŋkeke {0} wo</unitPattern>
-			</unit>
-			<unit type="duration-hour">
-				<displayName draft="unconfirmed">gaƒoƒo</displayName>
-				<unitPattern count="one">gaƒoƒo {0} wo</unitPattern>
-				<unitPattern count="other">gaƒoƒo {0} wo</unitPattern>
-			</unit>
-			<unit type="duration-minute">
-				<displayName draft="unconfirmed">aɖabaƒoƒo</displayName>
-				<unitPattern count="one">aɖabaƒoƒo {0} wo</unitPattern>
-				<unitPattern count="other">aɖabaƒoƒo {0} wo</unitPattern>
+			<unit type="duration-year">
+				<displayName>ƒewo</displayName>
+				<unitPattern count="one">ƒe {0}</unitPattern>
+				<unitPattern count="other">ƒe {0}</unitPattern>
 			</unit>
 			<unit type="duration-month">
-				<displayName draft="unconfirmed">ɣleti</displayName>
-				<unitPattern count="one">ɣleti {0} wo</unitPattern>
-				<unitPattern count="other">ɣleti {0} wo</unitPattern>
+				<displayName>ɣletiwo</displayName>
+				<unitPattern count="one">ɣleti {0}</unitPattern>
+				<unitPattern count="other">ɣleti {0}</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>kɔsiɖawo</displayName>
+				<unitPattern count="one">kɔsiɖa {0}</unitPattern>
+				<unitPattern count="other">kɔsiɖa {0}</unitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>ŋkekewo</displayName>
+				<unitPattern count="one">ŋkeke {0}</unitPattern>
+				<unitPattern count="other">ŋkeke {0}</unitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>gaƒoƒowo</displayName>
+				<unitPattern count="one">gaƒoƒo {0}</unitPattern>
+				<unitPattern count="other">gaƒoƒo {0}</unitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>aɖabaƒoƒowo</displayName>
+				<unitPattern count="one">aɖabaƒoƒo {0}</unitPattern>
+				<unitPattern count="other">aɖabaƒoƒo {0}</unitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName draft="unconfirmed">sekend</displayName>
 				<unitPattern count="one">sekend {0} wo</unitPattern>
 				<unitPattern count="other">sekend {0} wo</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="unconfirmed">kɔsiɖa</displayName>
-				<unitPattern count="one">kɔsiɖa {0} wo</unitPattern>
-				<unitPattern count="other">kɔsiɖa {0} wo</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="unconfirmed">ƒe</displayName>
-				<unitPattern count="one">ƒe {0} wo</unitPattern>
-				<unitPattern count="other">ƒe {0} wo</unitPattern>
-			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="unconfirmed">agbadroƒe</displayName>
 				<unitPattern count="one" draft="unconfirmed">agbadroƒe {0}</unitPattern>
@@ -5504,41 +5679,69 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 		</unitLength>
 		<unitLength type="short">
+			<unit type="duration-year">
+				<displayName>ƒewo</displayName>
+				<unitPattern count="one">ƒe {0}</unitPattern>
+				<unitPattern count="other">ƒe {0}</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ɣletiwo</displayName>
+				<unitPattern count="one">ɣleti {0}</unitPattern>
+				<unitPattern count="other">ɣleti {0}</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>kɔsiɖawo</displayName>
+				<unitPattern count="one">kɔsiɖa {0}</unitPattern>
+				<unitPattern count="other">kɔsiɖa {0}</unitPattern>
+			</unit>
 			<unit type="duration-day">
+				<displayName>ŋkekewo</displayName>
 				<unitPattern count="one">ŋkeke {0}</unitPattern>
 				<unitPattern count="other">ŋkeke {0}</unitPattern>
 			</unit>
 			<unit type="duration-hour">
+				<displayName>gaƒoƒowo</displayName>
 				<unitPattern count="one">gaƒoƒo {0}</unitPattern>
 				<unitPattern count="other">gaƒoƒo {0}</unitPattern>
 			</unit>
 			<unit type="duration-minute">
+				<displayName>aɖabaƒoƒowo</displayName>
 				<unitPattern count="one">aɖabaƒoƒo {0}</unitPattern>
 				<unitPattern count="other">aɖabaƒoƒo {0}</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<unitPattern count="one">ɣleti {0}</unitPattern>
-				<unitPattern count="other">ɣleti {0}</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<unitPattern count="one">sekend {0}</unitPattern>
 				<unitPattern count="other">sekend {0}</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<unitPattern count="one">kɔsiɖa {0}</unitPattern>
-				<unitPattern count="other">kɔsiɖa {0}</unitPattern>
-			</unit>
+		</unitLength>
+		<unitLength type="narrow">
 			<unit type="duration-year">
+				<displayName>ƒe</displayName>
 				<unitPattern count="one">ƒe {0}</unitPattern>
 				<unitPattern count="other">ƒe {0}</unitPattern>
 			</unit>
-		</unitLength>
-		<unitLength type="narrow">
+			<unit type="duration-month">
+				<displayName>ɣletiwo</displayName>
+				<unitPattern count="one">ɣleti {0}</unitPattern>
+				<unitPattern count="other">ɣleti {0}</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>kɔsiɖa</displayName>
+				<unitPattern count="one">kɔsiɖa {0}</unitPattern>
+				<unitPattern count="other">kɔsiɖa {0}</unitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>ŋkeke</displayName>
+				<unitPattern count="one">ŋkeke {0}</unitPattern>
+				<unitPattern count="other">ŋkeke {0}</unitPattern>
+			</unit>
 			<unit type="duration-hour">
-				<unitPattern count="one">g {0}</unitPattern>
-				<unitPattern count="other">g {0}</unitPattern>
+				<displayName>gaƒoƒo</displayName>
+				<unitPattern count="one">gaƒoƒo {0}</unitPattern>
+				<unitPattern count="other">gaƒoƒo {0}</unitPattern>
 			</unit>
 			<unit type="duration-minute">
+				<displayName>aɖabaƒoƒo</displayName>
 				<unitPattern count="one">a {0}</unitPattern>
 				<unitPattern count="other">a {0}</unitPattern>
 			</unit>
@@ -5559,8 +5762,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</units>
 	<listPatterns>
 		<listPattern>
-			<listPatternPart type="start" draft="unconfirmed">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle" draft="unconfirmed">{0}, {1}</listPatternPart>
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, kple {1}</listPatternPart>
+			<listPatternPart type="2">{0} kple {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, kple {1}</listPatternPart>
+			<listPatternPart type="2">{0} kple {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-narrow">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, kple {1}</listPatternPart>
+			<listPatternPart type="2">{0} kple {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-short">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
 			<listPatternPart type="end">{0}, kple {1}</listPatternPart>
 			<listPatternPart type="2">{0} kple {1}</listPatternPart>
 		</listPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ee_GH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ee_GH.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ee_GH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ee_GH.xml
index 2c0616ad1c1..7cfc3b6b1bf 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ee_GH.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ee_GH.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ee"/>
 		<territory type="GH"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ee_TG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ee_TG.xml
new file mode 100644
index 00000000000..1f558a756e3
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ee_TG.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="ee"/>
+		<territory type="TG"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/el.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/el.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/el.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/el.xml
index 2ac750e6d85..a3138758d86 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/el.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/el.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="el"/>
 	</identity>
 	<localeDisplayNames>
@@ -62,6 +61,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bez">Μπένα</language>
 			<language type="bfd" draft="contributed">Μπαφούτ</language>
 			<language type="bg">Βουλγαρικά</language>
+			<language type="bgn" draft="contributed">Δυτικά Μπαλοχικά</language>
 			<language type="bho">Μποζπούρι</language>
 			<language type="bi">Μπισλάμα</language>
 			<language type="bik">Μπικόλ</language>
@@ -86,7 +86,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="car">Καρίμπ</language>
 			<language type="cay" draft="contributed">Καγιούγκα</language>
 			<language type="cch">Ατσάμ</language>
-			<language type="ce">Τσέτσνιαν</language>
+			<language type="ce">Τσετσενικά</language>
 			<language type="ceb">Κεμπουάνο</language>
 			<language type="cgg">Τσίγκα</language>
 			<language type="ch">Καμόρρο</language>
@@ -107,7 +107,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="cs">Τσεχικά</language>
 			<language type="csb">Κασούμπιαν</language>
 			<language type="cu">Εκκλησιαστικά Σλαβικά</language>
-			<language type="cv">Χουβάς</language>
+			<language type="cv">Τσουβασικά</language>
 			<language type="cy">Ουαλικά</language>
 			<language type="da">Δανικά</language>
 			<language type="dak">Ντακότα</language>
@@ -115,7 +115,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="dav">Τάιτα</language>
 			<language type="de">Γερμανικά</language>
 			<language type="de_AT">Γερμανικά Αυστρίας</language>
-			<language type="de_CH">Γερμανικά Ελβετίας</language>
+			<language type="de_CH">Άνω Γερμανικά Ελβετίας</language>
 			<language type="del">Ντέλαγουερ</language>
 			<language type="den">Σλαβικά</language>
 			<language type="dgr">Ντόγκριμπ</language>
@@ -188,7 +188,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="got">Γοτθικά</language>
 			<language type="grb">Γκρίμπο</language>
 			<language type="grc">Αρχαία Ελληνικά</language>
-			<language type="gsw">Ελβετικά Γερμανικά</language>
+			<language type="gsw">Γερμανικά Ελβετίας</language>
 			<language type="gu">Γκουγιαράτι</language>
 			<language type="guz">Γκούσι</language>
 			<language type="gv">Μανξ</language>
@@ -289,6 +289,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">Λαοθιανά</language>
 			<language type="lol">Μόνγκο</language>
 			<language type="loz">Λόζι</language>
+			<language type="lrc">Βόρεια Λούρι</language>
 			<language type="lt">Λιθουανικά</language>
 			<language type="lu">Λούμπα-Κατάνγκα</language>
 			<language type="lua">Λούμπα-Λουλούα</language>
@@ -337,12 +338,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="my">Βιρμανικά</language>
 			<language type="mye" draft="contributed">Μιένε</language>
 			<language type="myv">Έρζυα</language>
+			<language type="mzn">Μαζαντεράνι</language>
 			<language type="na">Ναούρου</language>
 			<language type="nap">Ναπολιτανικά</language>
 			<language type="naq">Νάμα</language>
 			<language type="nb">Νορβηγικά Μποκμάλ</language>
 			<language type="nd">Ντεμπέλε Βορρά</language>
 			<language type="nds">Κάτω Γερμανικά</language>
+			<language type="nds_NL">Κάτω Γερμανικά Ολλανδίας</language>
 			<language type="ne">Νεπάλι</language>
 			<language type="new">Νεγουάρι</language>
 			<language type="ng">Ντόνγκα</language>
@@ -419,6 +422,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">Σικελιανά</language>
 			<language type="sco">Σκωτικά</language>
 			<language type="sd">Σίντι</language>
+			<language type="sdh">Νότια Κουρδικά</language>
 			<language type="se">Βόρεια Σάμι</language>
 			<language type="see" draft="contributed">Σένεκα</language>
 			<language type="seh">Σένα</language>
@@ -450,14 +454,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ss">Σουάτι</language>
 			<language type="ssy" draft="contributed">Σάχο</language>
 			<language type="st">Νότια Σόθο</language>
-			<language type="su">Σουδανικά</language>
+			<language type="su">Σουνδανικά</language>
 			<language type="suk">Σουκούμα</language>
 			<language type="sus">Σούσου</language>
 			<language type="sux">Σουμερικά</language>
 			<language type="sv">Σουηδικά</language>
 			<language type="sw">Σουαχίλι</language>
+			<language type="sw_CD">Κονγκό Σουαχίλι</language>
 			<language type="swb">Κομόρρια</language>
-			<language type="swc">Κονγκό Σουαχίλι</language>
 			<language type="syc">Κλασικά Συριακά</language>
 			<language type="syr">Συριακά</language>
 			<language type="ta">Ταμίλ</language>
@@ -513,6 +517,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">Γουάλαμο</language>
 			<language type="war">Γουάρει</language>
 			<language type="was">Γουασό</language>
+			<language type="wbp">Γουαρλπίρι</language>
 			<language type="wo">Γουόλοφ</language>
 			<language type="xal">Καλμίκ</language>
 			<language type="xh">Ζόσα</language>
@@ -641,7 +646,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Sgnw">Νοηματική γραφή</script>
 			<script type="Shaw">Σαβιανό</script>
 			<script type="Sinh">Σινχάλα</script>
-			<script type="Sund">Σουδανεζικό</script>
+			<script type="Sund">Σουνδανικό</script>
 			<script type="Sylo">Συλότι Νάγκρι</script>
 			<script type="Syrc">Συριακό</script>
 			<script type="Syre">Εστραντζέλο Συριακό</script>
@@ -711,7 +716,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Ανγκουίλα</territory>
 			<territory type="AL">Αλβανία</territory>
 			<territory type="AM">Αρμενία</territory>
-			<territory type="AN">Ολλανδικές Αντίλλες</territory>
 			<territory type="AO">Ανγκόλα</territory>
 			<territory type="AQ">Ανταρκτική</territory>
 			<territory type="AR">Αργεντινή</territory>
@@ -789,7 +793,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="FR">Γαλλία</territory>
 			<territory type="GA">Γκαμπόν</territory>
 			<territory type="GB">Ηνωμένο Βασίλειο</territory>
-			<territory type="GB" alt="short">Η.Β.</territory>
+			<territory type="GB" alt="short">ΗΒ</territory>
 			<territory type="GD">Γρενάδα</territory>
 			<territory type="GE">Γεωργία</territory>
 			<territory type="GF">Γαλλική Γουιάνα</territory>
@@ -858,7 +862,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="MF">Άγιος Μαρτίνος (Γαλλικό τμήμα)</territory>
 			<territory type="MG">Μαδαγασκάρη</territory>
 			<territory type="MH">Νήσοι Μάρσαλ</territory>
-			<territory type="MK">ΠΓΔΜ</territory>
+			<territory type="MK">Πρώην Γιουγκοσλαβική Δημοκρατία της Μακεδονίας</territory>
 			<territory type="MK" alt="variant">Πρώην Γιουγκοσλαβική Δημοκρατία της Μακεδονίας (ΠΓΔΜ)</territory>
 			<territory type="ML">Μάλι</territory>
 			<territory type="MM">Μιανμάρ/Βιρμανία</territory>
@@ -935,7 +939,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="TA">Τριστάν ντα Κούνια</territory>
 			<territory type="TC">Νήσοι Τερκ και Κάικος</territory>
 			<territory type="TD">Τσαντ</territory>
-			<territory type="TF">Γαλλικά Νότια Εδάφη</territory>
+			<territory type="TF">Γαλλικές περιοχές του νοτίου ημισφαιρίου</territory>
 			<territory type="TG">Τόγκο</territory>
 			<territory type="TH">Ταϊλάνδη</territory>
 			<territory type="TJ">Τατζικιστάν</territory>
@@ -952,7 +956,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="TZ">Τανζανία</territory>
 			<territory type="UA">Ουκρανία</territory>
 			<territory type="UG">Ουγκάντα</territory>
-			<territory type="UM">Απομακρυσμένες Νησίδες Η.Π.Α.</territory>
+			<territory type="UM">Απομακρυσμένες Νησίδες ΗΠΑ</territory>
 			<territory type="US">Ηνωμένες Πολιτείες</territory>
 			<territory type="US" alt="short">ΗΠΑ</territory>
 			<territory type="UY">Ουρουγουάη</territory>
@@ -1021,6 +1025,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">Αριθμητική ταξινόμηση</key>
 			<key type="colStrength" draft="contributed">Ισχύς ταξινόμησης</key>
 			<key type="currency">Νόμισμα</key>
+			<key type="hc" draft="contributed">Κύκλος ωρών (12 ή 24)</key>
+			<key type="lb">Στιλ αλλαγής γραμμών</key>
+			<key type="ms">Σύστημα μέτρησης</key>
 			<key type="numbers">Αριθμοί</key>
 			<key type="timezone" draft="contributed">Ζώνη ώρας</key>
 			<key type="va" draft="contributed">Παραλλαγή τοπικών ρυθμίσεων</key>
@@ -1028,97 +1035,107 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x" draft="contributed">Προσωπική χρήση</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Αραβικό-Ινδικά ψηφία</type>
-			<type type="arabext" key="numbers">Εκτεταμένα αραβικό-ινδικά ψηφία</type>
-			<type type="armn" key="numbers">Αρμενικά αριθμητικά</type>
-			<type type="armnlow" key="numbers">Πεζά αρμενικά αριθμητικά</type>
-			<type type="beng" key="numbers">Βεγγαλικά ψηφία</type>
-			<type type="big5han" key="collation">Σειρά ταξινόμησης Παραδοσιακών Κινεζικών - Big5</type>
-			<type type="buddhist" key="calendar">Βουδιστικό ημερολόγιο</type>
-			<type type="chinese" key="calendar">Κινεζικό ημερολόγιο</type>
-			<type type="coptic" key="calendar" draft="contributed">Κοπτικό ημερολόγιο</type>
-			<type type="dangi" key="calendar">Κορεατικό ημερολόγιο ντάνγκι</type>
-			<type type="deva" key="numbers">Ψηφία Ντεβαναγκάρι</type>
-			<type type="dictionary" key="collation" draft="contributed">Σειρά ταξινόμησης ημερολογίου</type>
-			<type type="ducet" key="collation">Προεπιλεγμένη σειρά ταξινόμησης Unicode</type>
-			<type type="ethi" key="numbers">Αιθιοπικά αριθμητικά</type>
-			<type type="ethiopic" key="calendar">Αιθιοπικό ημερολόγιο</type>
-			<type type="ethiopic-amete-alem" key="calendar" draft="contributed">Αιθιοπικό ημερολόγιο Άμετ Άλεμ</type>
-			<type type="finance" key="numbers" draft="contributed">Οικονομικά αριθμητικά</type>
-			<type type="fullwide" key="numbers">Ψηφία πλήρους πλάτους</type>
-			<type type="gb2312han" key="collation">Σειρά ταξινόμησης Απλουστευμένων Κινεζικών - GB2312</type>
-			<type type="geor" key="numbers">Γεωργιανά αριθμητικά</type>
-			<type type="gregorian" key="calendar">Γρηγοριανό ημερολόγιο</type>
-			<type type="grek" key="numbers">Ελληνικά αριθμητικά</type>
-			<type type="greklow" key="numbers">Ελληνικά αριθμητικά με πεζά γράμματα</type>
-			<type type="gujr" key="numbers">Γκουτζαρατικά ψηφία</type>
-			<type type="guru" key="numbers">Ψηφία Γκουρμούκι</type>
-			<type type="hanidec" key="numbers">Κινεζικά δεκαδικά αριθμητικά</type>
-			<type type="hans" key="numbers">Απλοποιημένα κινεζικά αριθμητικά</type>
-			<type type="hansfin" key="numbers">Απλοποιημένα κινεζικά οικονομικά αριθμητικά</type>
-			<type type="hant" key="numbers">Παραδοσιακά κινεζικά αριθμητικά</type>
-			<type type="hantfin" key="numbers">Παραδοσιακά κινεζικά οικονομικά αριθμητικά</type>
-			<type type="hebr" key="numbers">Εβραϊκά αριθμητικά</type>
-			<type type="hebrew" key="calendar">Εβραϊκό ημερολόγιο</type>
-			<type type="identical" key="colStrength" draft="contributed">Ταξινόμηση όλων</type>
-			<type type="indian" key="calendar">Ινδικό εθνικό ημερολόγιο</type>
-			<type type="islamic" key="calendar">Ισλαμικό ημερολόγιο</type>
-			<type type="islamic-civil" key="calendar">Ισλαμικό αστικό ημερολόγιο</type>
-			<type type="islamic-rgsa" key="calendar" draft="contributed">Ισλαμικό ημερολόγιο (Σαουδική Αραβία, θέαση)</type>
-			<type type="islamic-tbla" key="calendar" draft="contributed">Ισλαμικό ημερολόγιο (δομημένο, αστρονομική εποχή)</type>
-			<type type="iso8601" key="calendar">Ημερολόγιο ISO-8601</type>
-			<type type="japanese" key="calendar">Ιαπωνικό ημερολόγιο</type>
-			<type type="jpan" key="numbers">Ιαπωνικά αριθμητικά</type>
-			<type type="jpanfin" key="numbers">Ιαπωνικά οικονομικά αριθμητικά</type>
-			<type type="khmr" key="numbers">Ψηφία Χμερ</type>
-			<type type="knda" key="numbers">Ψηφία Κανάντα</type>
-			<type type="laoo" key="numbers">Λαοϊκά ψηφία</type>
-			<type type="latn" key="numbers">Ψηφία της Δύσης</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">Ταξινόμηση πεζών χαρακτήρων πρώτα</type>
-			<type type="mlym" key="numbers">Μαλαγιαλαμικά ψηφία</type>
-			<type type="mong" key="numbers" draft="contributed">Μογγολικά ψηφία</type>
-			<type type="mymr" key="numbers">Ψηφία Μιανμάρ</type>
-			<type type="native" key="numbers" draft="contributed">Εγγενή ψηφία</type>
-			<type type="no" key="colBackwards" draft="contributed">Κανονικά ταξινόμηση τόνων</type>
-			<type type="no" key="colCaseFirst" draft="contributed">Κανονική ταξινόμηση χαρακτήρων</type>
-			<type type="no" key="colCaseLevel" draft="contributed">Ταξινόμηση με διάκριση χαρακτήρων</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">Ξεχωριστή ταξινόμηση χαρακτήρων Κάνα</type>
-			<type type="no" key="colNormalization" draft="contributed">Ταξινόμηση χωρίς κανονικοποίηση</type>
-			<type type="no" key="colNumeric" draft="contributed">Μεμονωμένη ταξινόμηση ψηφίων</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">Ταξινόμηση συμβόλων</type>
-			<type type="orya" key="numbers">Οριγικά ψηφία</type>
-			<type type="persian" key="calendar">Περσικό ημερολόγιο</type>
-			<type type="phonebook" key="collation">Σειρά ταξινόμησης τηλεφωνικού καταλόγου</type>
-			<type type="phonetic" key="collation" draft="contributed">Φωνητική σειρά ταξινόμησης</type>
-			<type type="pinyin" key="collation">Σειρά ταξινόμησης Πινγίν</type>
-			<type type="primary" key="colStrength" draft="contributed">Ταξινόμηση μόνο βασικών χαρακτήρων</type>
-			<type type="quaternary" key="colStrength" draft="contributed">Ταξινόμηση τόνων/χαρακτήρων διάκρισης/χαρακτήρων μεγάλου μεγέθους/χαρακτήρων Κάνα</type>
-			<type type="reformed" key="collation" draft="contributed">Ανασχηματισμένη σειρά ταξινόμησης</type>
-			<type type="roc" key="calendar">Ημερολόγιο της Δημοκρατίας της Κίνας</type>
-			<type type="roman" key="numbers">Λατινικοί αριθμοί</type>
-			<type type="romanlow" key="numbers">Πεζοί λατινικοί αριθμοί</type>
-			<type type="search" key="collation">Αναζήτηση γενικού τύπου</type>
-			<type type="searchjl" key="collation" draft="contributed">Αναζήτηση κατά αρχικό σύμφωνο Χανγκούλ</type>
-			<type type="secondary" key="colStrength" draft="contributed">Ταξινόμηση τόνων</type>
-			<type type="shifted" key="colAlternate" draft="contributed">Ταξινόμηση με αγνόηση συμβόλων</type>
-			<type type="standard" key="collation">Τυπική σειρά ταξινόμησης</type>
-			<type type="stroke" key="collation">Σειρά ταξινόμησης κινήσεων</type>
-			<type type="taml" key="numbers">Ταμιλικά αριθμητικά</type>
-			<type type="tamldec" key="numbers">Ταμιλικά ψηφία</type>
-			<type type="telu" key="numbers">Τελουγκουϊκά ψηφία</type>
-			<type type="tertiary" key="colStrength" draft="contributed">Ταξινόμηση τόνων/χαρακτήρων διάκρισης/χαρακτήρων μεγάλου μεγέθους</type>
-			<type type="thai" key="numbers">Ταϊλανδικά ψηφία</type>
-			<type type="tibt" key="numbers">Θιβετανικά ψηφία</type>
-			<type type="traditional" key="collation">Παραδοσιακή σειρά ταξινόμησης</type>
-			<type type="traditional" key="numbers" draft="contributed">Παραδοσιακά αριθμητικά</type>
-			<type type="unihan" key="collation" draft="contributed">Σειρά ταξινόμησης ριζικής αρίθμησης</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">Ταξινόμηση κεφαλαίων χαρακτήρων πρώτα</type>
-			<type type="vaii" key="numbers" draft="contributed">Ψηφία Βάι</type>
-			<type type="yes" key="colBackwards" draft="contributed">Αντίστροφη ταξινόμηση τόνων</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">Ταξινόμηση χαρακτήρων διάκρισης</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">Διαφορετική ταξινόμηση Κάνα</type>
-			<type type="yes" key="colNormalization" draft="contributed">Κανονικοποιημένη ταξινόμηση Unicode</type>
-			<type type="yes" key="colNumeric" draft="contributed">Αριθμητική ταξινόμηση ψηφίων</type>
+			<type key="calendar" type="buddhist">Βουδιστικό ημερολόγιο</type>
+			<type key="calendar" type="chinese">Κινεζικό ημερολόγιο</type>
+			<type key="calendar" type="coptic" draft="contributed">Κοπτικό ημερολόγιο</type>
+			<type key="calendar" type="dangi">Κορεατικό ημερολόγιο ντάνγκι</type>
+			<type key="calendar" type="ethiopic">Αιθιοπικό ημερολόγιο</type>
+			<type key="calendar" type="ethiopic-amete-alem" draft="contributed">Αιθιοπικό ημερολόγιο Άμετ Άλεμ</type>
+			<type key="calendar" type="gregorian">Γρηγοριανό ημερολόγιο</type>
+			<type key="calendar" type="hebrew">Εβραϊκό ημερολόγιο</type>
+			<type key="calendar" type="indian">Ινδικό εθνικό ημερολόγιο</type>
+			<type key="calendar" type="islamic">Ισλαμικό ημερολόγιο</type>
+			<type key="calendar" type="islamic-civil">Ισλαμικό αστικό ημερολόγιο</type>
+			<type key="calendar" type="islamic-rgsa" draft="contributed">Ισλαμικό ημερολόγιο (Σαουδική Αραβία, θέαση)</type>
+			<type key="calendar" type="islamic-tbla" draft="contributed">Ισλαμικό ημερολόγιο (δομημένο, αστρονομική εποχή)</type>
+			<type key="calendar" type="iso8601">Ημερολόγιο ISO-8601</type>
+			<type key="calendar" type="japanese">Ιαπωνικό ημερολόγιο</type>
+			<type key="calendar" type="persian">Περσικό ημερολόγιο</type>
+			<type key="calendar" type="roc">Ημερολόγιο της Δημοκρατίας της Κίνας</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">Ταξινόμηση συμβόλων</type>
+			<type key="colAlternate" type="shifted" draft="contributed">Ταξινόμηση με αγνόηση συμβόλων</type>
+			<type key="colBackwards" type="no" draft="contributed">Κανονικά ταξινόμηση τόνων</type>
+			<type key="colBackwards" type="yes" draft="contributed">Αντίστροφη ταξινόμηση τόνων</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">Ταξινόμηση πεζών χαρακτήρων πρώτα</type>
+			<type key="colCaseFirst" type="no" draft="contributed">Κανονική ταξινόμηση χαρακτήρων</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">Ταξινόμηση κεφαλαίων χαρακτήρων πρώτα</type>
+			<type key="colCaseLevel" type="no" draft="contributed">Ταξινόμηση με διάκριση χαρακτήρων</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">Ταξινόμηση χαρακτήρων διάκρισης</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">Ξεχωριστή ταξινόμηση χαρακτήρων Κάνα</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">Διαφορετική ταξινόμηση Κάνα</type>
+			<type key="collation" type="big5han">Σειρά ταξινόμησης Παραδοσιακών Κινεζικών - Big5</type>
+			<type key="collation" type="dictionary" draft="contributed">Σειρά ταξινόμησης ημερολογίου</type>
+			<type key="collation" type="ducet">Προεπιλεγμένη σειρά ταξινόμησης Unicode</type>
+			<type key="collation" type="gb2312han">Σειρά ταξινόμησης Απλουστευμένων Κινεζικών - GB2312</type>
+			<type key="collation" type="phonebook">Σειρά ταξινόμησης τηλεφωνικού καταλόγου</type>
+			<type key="collation" type="phonetic" draft="contributed">Φωνητική σειρά ταξινόμησης</type>
+			<type key="collation" type="pinyin">Σειρά ταξινόμησης Πινγίν</type>
+			<type key="collation" type="reformed" draft="contributed">Ανασχηματισμένη σειρά ταξινόμησης</type>
+			<type key="collation" type="search">Αναζήτηση γενικού τύπου</type>
+			<type key="collation" type="searchjl" draft="contributed">Αναζήτηση κατά αρχικό σύμφωνο Χανγκούλ</type>
+			<type key="collation" type="standard">Τυπική σειρά ταξινόμησης</type>
+			<type key="collation" type="stroke">Σειρά ταξινόμησης κινήσεων</type>
+			<type key="collation" type="traditional">Παραδοσιακή σειρά ταξινόμησης</type>
+			<type key="collation" type="unihan" draft="contributed">Σειρά ταξινόμησης ριζικής αρίθμησης</type>
+			<type key="colNormalization" type="no" draft="contributed">Ταξινόμηση χωρίς κανονικοποίηση</type>
+			<type key="colNormalization" type="yes" draft="contributed">Κανονικοποιημένη ταξινόμηση Unicode</type>
+			<type key="colNumeric" type="no" draft="contributed">Μεμονωμένη ταξινόμηση ψηφίων</type>
+			<type key="colNumeric" type="yes" draft="contributed">Αριθμητική ταξινόμηση ψηφίων</type>
+			<type key="colStrength" type="identical" draft="contributed">Ταξινόμηση όλων</type>
+			<type key="colStrength" type="primary" draft="contributed">Ταξινόμηση μόνο βασικών χαρακτήρων</type>
+			<type key="colStrength" type="quaternary" draft="contributed">Ταξινόμηση τόνων/χαρακτήρων διάκρισης/χαρακτήρων μεγάλου μεγέθους/χαρακτήρων Κάνα</type>
+			<type key="colStrength" type="secondary" draft="contributed">Ταξινόμηση τόνων</type>
+			<type key="colStrength" type="tertiary" draft="contributed">Ταξινόμηση τόνων/χαρακτήρων διάκρισης/χαρακτήρων μεγάλου μεγέθους</type>
+			<type key="hc" type="h11">12ωρο σύστημα (0–11)</type>
+			<type key="hc" type="h12">12ωρο σύστημα (1–12)</type>
+			<type key="hc" type="h23">24ωρο σύστημα (0–23)</type>
+			<type key="hc" type="h24">24ωρο σύστημα (1–24)</type>
+			<type key="lb" type="loose">Χαλαρό στιλ αλλαγής γραμμών</type>
+			<type key="lb" type="normal">Κανονικό στιλ αλλαγής γραμμών</type>
+			<type key="lb" type="strict">Στενό στιλ αλλαγής γραμμών</type>
+			<type key="ms" type="metric">Μετρικό σύστημα</type>
+			<type key="ms" type="uksystem">Βρετανικό σύστημα μέτρησης</type>
+			<type key="ms" type="ussystem">Αγγλοσαξωνικό σύστημα μέτρησης</type>
+			<type key="numbers" type="arab">Αραβικό-Ινδικά ψηφία</type>
+			<type key="numbers" type="arabext">Εκτεταμένα αραβικό-ινδικά ψηφία</type>
+			<type key="numbers" type="armn">Αρμενικά αριθμητικά</type>
+			<type key="numbers" type="armnlow">Πεζά αρμενικά αριθμητικά</type>
+			<type key="numbers" type="beng">Βεγγαλικά ψηφία</type>
+			<type key="numbers" type="deva">Ψηφία Ντεβαναγκάρι</type>
+			<type key="numbers" type="ethi">Αιθιοπικά αριθμητικά</type>
+			<type key="numbers" type="finance" draft="contributed">Οικονομικά αριθμητικά</type>
+			<type key="numbers" type="fullwide">Ψηφία πλήρους πλάτους</type>
+			<type key="numbers" type="geor">Γεωργιανά αριθμητικά</type>
+			<type key="numbers" type="grek">Ελληνικά αριθμητικά</type>
+			<type key="numbers" type="greklow">Ελληνικά αριθμητικά με πεζά γράμματα</type>
+			<type key="numbers" type="gujr">Γκουτζαρατικά ψηφία</type>
+			<type key="numbers" type="guru">Ψηφία Γκουρμούκι</type>
+			<type key="numbers" type="hanidec">Κινεζικά δεκαδικά αριθμητικά</type>
+			<type key="numbers" type="hans">Απλοποιημένα κινεζικά αριθμητικά</type>
+			<type key="numbers" type="hansfin">Απλοποιημένα κινεζικά οικονομικά αριθμητικά</type>
+			<type key="numbers" type="hant">Παραδοσιακά κινεζικά αριθμητικά</type>
+			<type key="numbers" type="hantfin">Παραδοσιακά κινεζικά οικονομικά αριθμητικά</type>
+			<type key="numbers" type="hebr">Εβραϊκά αριθμητικά</type>
+			<type key="numbers" type="jpan">Ιαπωνικά αριθμητικά</type>
+			<type key="numbers" type="jpanfin">Ιαπωνικά οικονομικά αριθμητικά</type>
+			<type key="numbers" type="khmr">Ψηφία Χμερ</type>
+			<type key="numbers" type="knda">Ψηφία Κανάντα</type>
+			<type key="numbers" type="laoo">Λαοϊκά ψηφία</type>
+			<type key="numbers" type="latn">Ψηφία της Δύσης</type>
+			<type key="numbers" type="mlym">Μαλαγιαλαμικά ψηφία</type>
+			<type key="numbers" type="mong" draft="contributed">Μογγολικά ψηφία</type>
+			<type key="numbers" type="mymr">Ψηφία Μιανμάρ</type>
+			<type key="numbers" type="native" draft="contributed">Εγγενή ψηφία</type>
+			<type key="numbers" type="orya">Οριγικά ψηφία</type>
+			<type key="numbers" type="roman">Λατινικοί αριθμοί</type>
+			<type key="numbers" type="romanlow">Πεζοί λατινικοί αριθμοί</type>
+			<type key="numbers" type="taml">Ταμιλικά αριθμητικά</type>
+			<type key="numbers" type="tamldec">Ταμιλικά ψηφία</type>
+			<type key="numbers" type="telu">Τελουγκουϊκά ψηφία</type>
+			<type key="numbers" type="thai">Ταϊλανδικά ψηφία</type>
+			<type key="numbers" type="tibt">Θιβετανικά ψηφία</type>
+			<type key="numbers" type="traditional" draft="contributed">Παραδοσιακά αριθμητικά</type>
+			<type key="numbers" type="vaii" draft="contributed">Ψηφία Βάι</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">BGN</transformName>
@@ -1165,8 +1182,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 	<delimiters>
 		<quotationStart>«</quotationStart>
 		<quotationEnd>»</quotationEnd>
-		<alternateQuotationStart>&quot;</alternateQuotationStart>
-		<alternateQuotationEnd>&quot;</alternateQuotationEnd>
+		<alternateQuotationStart>“</alternateQuotationStart>
+		<alternateQuotationEnd>”</alternateQuotationEnd>
 	</delimiters>
 	<dates>
 		<calendars>
@@ -1213,16 +1230,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern>{1} - {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern>{1} - {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -1230,8 +1248,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
 						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">HH</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
@@ -1567,15 +1583,55 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">π.μ.</dayPeriod>
+							<dayPeriod type="pm">μ.μ.</dayPeriod>
+							<dayPeriod type="morning1">πρωί</dayPeriod>
+							<dayPeriod type="afternoon1">μεσημ.</dayPeriod>
+							<dayPeriod type="evening1">απόγ.</dayPeriod>
+							<dayPeriod type="night1">βράδυ</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">π</dayPeriod>
-							<dayPeriod type="noon">μεσ.</dayPeriod>
-							<dayPeriod type="pm">μ</dayPeriod>
+							<dayPeriod type="am">πμ</dayPeriod>
+							<dayPeriod type="pm">μμ</dayPeriod>
+							<dayPeriod type="morning1">πρωί</dayPeriod>
+							<dayPeriod type="afternoon1">μεσημ.</dayPeriod>
+							<dayPeriod type="evening1">απόγ.</dayPeriod>
+							<dayPeriod type="night1">βράδυ</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">π.μ.</dayPeriod>
-							<dayPeriod type="noon">μεσημέρι</dayPeriod>
 							<dayPeriod type="pm">μ.μ.</dayPeriod>
+							<dayPeriod type="morning1">πρωί</dayPeriod>
+							<dayPeriod type="afternoon1">μεσημέρι</dayPeriod>
+							<dayPeriod type="evening1">απόγευμα</dayPeriod>
+							<dayPeriod type="night1">βράδυ</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">π.μ.</dayPeriod>
+							<dayPeriod type="pm">μ.μ.</dayPeriod>
+							<dayPeriod type="morning1">πρωί</dayPeriod>
+							<dayPeriod type="afternoon1">μεσημ.</dayPeriod>
+							<dayPeriod type="evening1">απόγ.</dayPeriod>
+							<dayPeriod type="night1">βράδυ</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">π.μ.</dayPeriod>
+							<dayPeriod type="pm">μ.μ.</dayPeriod>
+							<dayPeriod type="morning1">πρωί</dayPeriod>
+							<dayPeriod type="afternoon1">μεσημέρι</dayPeriod>
+							<dayPeriod type="evening1">απόγευμα</dayPeriod>
+							<dayPeriod type="night1">βράδυ</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">π.μ.</dayPeriod>
+							<dayPeriod type="pm">μ.μ.</dayPeriod>
+							<dayPeriod type="morning1">πρωί</dayPeriod>
+							<dayPeriod type="afternoon1">μεσημέρι</dayPeriod>
+							<dayPeriod type="evening1">απόγευμα</dayPeriod>
+							<dayPeriod type="night1">βράδυ</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1672,12 +1728,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
 						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">HH</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
@@ -1792,8 +1850,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="y">E, dd MMM y – E, dd MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MMMM–MMMM y</greatestDifference>
-							<greatestDifference id="y">MMMM y – MMMM y</greatestDifference>
+							<greatestDifference id="M">LLLL–LLLL y</greatestDifference>
+							<greatestDifference id="y">LLLL y – LLLL y</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -1862,11 +1920,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</calendars>
 		<fields>
 			<field type="era">
-				<displayName>Περίοδος</displayName>
+				<displayName>περίοδος</displayName>
 			</field>
 			<field type="year">
-				<displayName>Έτος</displayName>
-				<relative type="-1">προηγούμενο έτος</relative>
+				<displayName>έτος</displayName>
+				<relative type="-1">πέρσι</relative>
 				<relative type="0">φέτος</relative>
 				<relative type="1">επόμενο έτος</relative>
 				<relativeTime type="future">
@@ -1880,6 +1938,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>έτ.</displayName>
+				<relative type="-1">πέρσι</relative>
+				<relative type="0">φέτος</relative>
+				<relative type="1">επόμενο έτος</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">σε {0} έτος</relativeTimePattern>
 					<relativeTimePattern count="other">σε {0} έτη</relativeTimePattern>
@@ -1891,17 +1952,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>έτ.</displayName>
+				<relative type="-1">πέρσι</relative>
+				<relative type="0">φέτος</relative>
+				<relative type="1">επόμενο έτος</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">+{0} έτος</relativeTimePattern>
-					<relativeTimePattern count="other">+{0} έτη</relativeTimePattern>
+					<relativeTimePattern count="one">σε {0} έτος</relativeTimePattern>
+					<relativeTimePattern count="other">σε {0} έτη</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} έτος</relativeTimePattern>
-					<relativeTimePattern count="other">-{0} έτη</relativeTimePattern>
+					<relativeTimePattern count="one">{0} έτος πριν</relativeTimePattern>
+					<relativeTimePattern count="other">{0} έτη πριν</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter">
-				<displayName>Τρίμηνο</displayName>
+				<displayName>τρίμηνο</displayName>
+				<relative type="-1" draft="contributed">προηγούμενο τρίμηνο</relative>
+				<relative type="0" draft="contributed">τρέχον τρίμηνο</relative>
+				<relative type="1" draft="contributed">επόμενο τρίμηνο</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">σε {0} τρίμηνο</relativeTimePattern>
 					<relativeTimePattern count="other">σε {0} τρίμηνα</relativeTimePattern>
@@ -1913,6 +1980,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>τρίμ.</displayName>
+				<relative type="-1" draft="contributed">προηγ. τρίμ.</relative>
+				<relative type="0" draft="contributed">τρέχον τρίμ.</relative>
+				<relative type="1" draft="contributed">επόμ. τρίμ.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">σε {0} τρίμ.</relativeTimePattern>
 					<relativeTimePattern count="other">σε {0} τρίμ.</relativeTimePattern>
@@ -1924,17 +1994,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>τρίμ.</displayName>
+				<relative type="-1" draft="contributed">προηγ. τρίμ.</relative>
+				<relative type="0" draft="contributed">τρέχον τρίμ.</relative>
+				<relative type="1" draft="contributed">επόμ. τρίμ.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">+{0} Τ</relativeTimePattern>
-					<relativeTimePattern count="other">+{0} Τ</relativeTimePattern>
+					<relativeTimePattern count="one">σε {0} τρίμ.</relativeTimePattern>
+					<relativeTimePattern count="other">σε {0} τρίμ.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} Τ</relativeTimePattern>
-					<relativeTimePattern count="other">-{0} Τ</relativeTimePattern>
+					<relativeTimePattern count="one">{0} τρίμ. πριν</relativeTimePattern>
+					<relativeTimePattern count="other">{0} τρίμ. πριν</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month">
-				<displayName>Μήνας</displayName>
+				<displayName>μήνας</displayName>
 				<relative type="-1">προηγούμενος μήνας</relative>
 				<relative type="0">τρέχων μήνας</relative>
 				<relative type="1">επόμενος μήνας</relative>
@@ -1950,27 +2023,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="month-short">
 				<displayName>μήν.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">σε {0} μήν.</relativeTimePattern>
-					<relativeTimePattern count="other">σε {0} μήν.</relativeTimePattern>
+					<relativeTimePattern count="one">σε {0} μήνα</relativeTimePattern>
+					<relativeTimePattern count="other">σε {0} μήνες</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">πριν από {0} μήν.</relativeTimePattern>
-					<relativeTimePattern count="other">πριν από {0} μήν.</relativeTimePattern>
+					<relativeTimePattern count="one">πριν από {0} μήνα</relativeTimePattern>
+					<relativeTimePattern count="other">πριν από {0} μήνες</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month-narrow">
 				<displayName>μήν.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">+{0} μήν.</relativeTimePattern>
-					<relativeTimePattern count="other">+{0} μήν.</relativeTimePattern>
+					<relativeTimePattern count="one">σε {0} μ.</relativeTimePattern>
+					<relativeTimePattern count="other">σε {0} μ.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} μήν.</relativeTimePattern>
-					<relativeTimePattern count="other">-{0} μήν.</relativeTimePattern>
+					<relativeTimePattern count="one">{0} μ. πριν</relativeTimePattern>
+					<relativeTimePattern count="other">{0} μ. πριν</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week">
-				<displayName>Εβδομάδα</displayName>
+				<displayName>εβδομάδα</displayName>
 				<relative type="-1">προηγούμενη εβδομάδα</relative>
 				<relative type="0">αυτήν την εβδομάδα</relative>
 				<relative type="1">επόμενη εβδομάδα</relative>
@@ -1997,16 +2070,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="week-narrow">
 				<displayName>εβδ.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">+{0} εβδ.</relativeTimePattern>
-					<relativeTimePattern count="other">+{0} εβδ.</relativeTimePattern>
+					<relativeTimePattern count="one">σε {0} εβδ.</relativeTimePattern>
+					<relativeTimePattern count="other">σε {0} εβδ.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} εβδ.</relativeTimePattern>
-					<relativeTimePattern count="other">-{0} εβδ.</relativeTimePattern>
+					<relativeTimePattern count="one">{0} εβδ. πριν</relativeTimePattern>
+					<relativeTimePattern count="other">{0} εβδ. πριν</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day">
-				<displayName>Ημέρα</displayName>
+				<displayName>ημέρα</displayName>
 				<relative type="-2">προχθές</relative>
 				<relative type="-1">χθες</relative>
 				<relative type="0">σήμερα</relative>
@@ -2035,16 +2108,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="day-narrow">
 				<displayName>ημέρα</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">σε {0} ημέρα</relativeTimePattern>
-					<relativeTimePattern count="other">σε {0} ημέρες</relativeTimePattern>
+					<relativeTimePattern count="one">σε {0} ημ.</relativeTimePattern>
+					<relativeTimePattern count="other">σε {0} ημ.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">πριν από {0} ημέρα</relativeTimePattern>
-					<relativeTimePattern count="other">πριν από {0} ημέρες</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ημ. πριν</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ημ. πριν</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="weekday">
-				<displayName>Ημέρα εβδομάδας</displayName>
+				<displayName>καθημερινή</displayName>
 			</field>
 			<field type="sun">
 				<relative type="-1">προηγούμενη Κυριακή</relative>
@@ -2107,7 +2180,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">επόμ. Τε</relative>
 			</field>
 			<field type="thu">
-				<relative type="-1">επόμενη Πέμπτη</relative>
+				<relative type="-1">προηγούμενη Πέμπτη</relative>
 				<relative type="0">αυτήν την Πέμπτη</relative>
 				<relative type="1">επόμενη Πέμπτη</relative>
 			</field>
@@ -2155,7 +2228,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>π.μ./μ.μ.</displayName>
 			</field>
 			<field type="hour">
-				<displayName>Ώρα</displayName>
+				<displayName>ώρα</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">σε {0} ώρα</relativeTimePattern>
 					<relativeTimePattern count="other">σε {0} ώρες</relativeTimePattern>
@@ -2179,16 +2252,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="hour-narrow">
 				<displayName>ώ</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">+{0} ώ</relativeTimePattern>
-					<relativeTimePattern count="other">+{0} ώ</relativeTimePattern>
+					<relativeTimePattern count="one">σε {0} ώ.</relativeTimePattern>
+					<relativeTimePattern count="other">σε {0} ώ.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} ώ</relativeTimePattern>
-					<relativeTimePattern count="other">-{0} ώ</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ώ. πριν</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ώ. πριν</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute">
-				<displayName>Λεπτό</displayName>
+				<displayName>λεπτό</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">σε {0} λεπτό</relativeTimePattern>
 					<relativeTimePattern count="other">σε {0} λεπτά</relativeTimePattern>
@@ -2212,16 +2285,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="minute-narrow">
 				<displayName>λ</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">+{0} λ</relativeTimePattern>
-					<relativeTimePattern count="other">+{0} λ</relativeTimePattern>
+					<relativeTimePattern count="one">σε {0} λ.</relativeTimePattern>
+					<relativeTimePattern count="other">σε {0} λ.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} λ</relativeTimePattern>
-					<relativeTimePattern count="other">-{0} λ</relativeTimePattern>
+					<relativeTimePattern count="one">{0} λ. πριν</relativeTimePattern>
+					<relativeTimePattern count="other">{0} λ. πριν</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second">
-				<displayName>Δευτερόλεπτο</displayName>
+				<displayName>δευτερόλεπτο</displayName>
 				<relative type="0">τώρα</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">σε {0} δευτερόλεπτο</relativeTimePattern>
@@ -2246,16 +2319,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="second-narrow">
 				<displayName>δ</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">+{0} δ</relativeTimePattern>
-					<relativeTimePattern count="other">+{0} δ</relativeTimePattern>
+					<relativeTimePattern count="one">σε {0} δ.</relativeTimePattern>
+					<relativeTimePattern count="other">σε {0} δ.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} δ</relativeTimePattern>
-					<relativeTimePattern count="other">-{0} δ</relativeTimePattern>
+					<relativeTimePattern count="one">{0} δ. πριν</relativeTimePattern>
+					<relativeTimePattern count="other">{0} δ. πριν</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>Ζώνη ώρας</displayName>
+				<displayName>ζώνη ώρας</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
@@ -3133,6 +3206,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Πορτ Μόρεσμπυ</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Μπουγκενβίλ</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Μανίλα</exemplarCity>
 			</zone>
@@ -3217,6 +3293,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Ιρκούτσκ</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Τσίτα</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Γιάκουτσκ</exemplarCity>
 			</zone>
@@ -3235,6 +3314,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Μαγκαντάν</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity draft="contributed">Σρεντνεκόλιμσκ</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Καμτσάτκα</exemplarCity>
 			</zone>
@@ -3299,7 +3381,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Ελ Σαλβαδόρ</exemplarCity>
 			</zone>
 			<zone type="America/Lower_Princes">
-				<exemplarCity>Lower Prince’s Quarter (Άγιος Μαρτίνος Ολλανδίας)</exemplarCity>
+				<exemplarCity>Άγιος Μαρτίνος Ολλανδίας</exemplarCity>
 			</zone>
 			<zone type="Asia/Damascus">
 				<exemplarCity>Δαμασκός</exemplarCity>
@@ -4547,7 +4629,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="contributed">0 χιλ'.' ¤</pattern>
+					<pattern type="1000" count="other" draft="contributed">0 χιλ'.' ¤</pattern>
+					<pattern type="10000" count="one" draft="contributed">00 χιλ'.' ¤</pattern>
+					<pattern type="10000" count="other" draft="contributed">00 χιλ'.' ¤</pattern>
+					<pattern type="100000" count="one" draft="contributed">000 χιλ'.' ¤</pattern>
+					<pattern type="100000" count="other" draft="contributed">000 χιλ'.' ¤</pattern>
+					<pattern type="1000000" count="one" draft="contributed">0 εκ'.' ¤</pattern>
+					<pattern type="1000000" count="other" draft="contributed">0 εκ'.' ¤</pattern>
+					<pattern type="10000000" count="one" draft="contributed">00 εκ'.' ¤</pattern>
+					<pattern type="10000000" count="other" draft="contributed">00 εκ'.' ¤</pattern>
+					<pattern type="100000000" count="one" draft="contributed">000 εκ'.' ¤</pattern>
+					<pattern type="100000000" count="other" draft="contributed">000 εκ'.' ¤</pattern>
+					<pattern type="1000000000" count="one" draft="contributed">0 δισ'.' ¤</pattern>
+					<pattern type="1000000000" count="other" draft="contributed">0 δισ'.' ¤</pattern>
+					<pattern type="10000000000" count="one" draft="contributed">00 δισ'.' ¤</pattern>
+					<pattern type="10000000000" count="other" draft="contributed">00 δισ'.' ¤</pattern>
+					<pattern type="100000000000" count="one" draft="contributed">000 δισ'.' ¤</pattern>
+					<pattern type="100000000000" count="other" draft="contributed">000 δισ'.' ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="contributed">0 τρισ'.' ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="contributed">0 τρισ'.' ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="contributed">00 τρισ'.' ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="contributed">00 τρισ'.' ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="contributed">000 τρισ'.' ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="contributed">000 τρισ'.' ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
@@ -4603,6 +4713,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">κουάνζα Ανγκόλας</displayName>
 				<displayName count="other">κουάνζες Ανγκόλας</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>Κουάνζα Ανγκόλας (1977–1990)</displayName>
@@ -4674,6 +4785,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">μετατρέψιμο μάρκο Βοσνίας-Ερζεγοβίνης</displayName>
 				<displayName count="other">μετατρέψιμα μάρκα Βοσνίας-Ερζεγοβίνης</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BAN">
 				<displayName count="one" draft="provisional">Νέο δινάριο Βοσνίας-Ερζεγοβίνης</displayName>
@@ -4758,6 +4870,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">μπολιβιάνο Βολιβίας</displayName>
 				<displayName count="other">μπολιβιάνο Βολιβίας</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOL">
 				<displayName count="one" draft="provisional">Παλαιό βολιβιάνο Βολιβίας</displayName>
@@ -4832,6 +4945,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">πούλα Μποτσουάνας</displayName>
 				<displayName count="other">πούλα Μποτσουάνας</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>Νέο Ρούβλι Λευκορωσίας (1994–1999)</displayName>
@@ -4938,6 +5052,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">μετατρέψιμο πέσο Κούβας</displayName>
 				<displayName count="other">μετατρέψιμα πέσο Κούβας</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>Πέσο Κούβας</displayName>
@@ -4962,6 +5077,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">κορόνα Τσεχίας</displayName>
 				<displayName count="other">κορόνες Τσεχίας</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>Οστμάρκ Ανατολικής Γερμανίας</displayName>
@@ -4984,6 +5100,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">κορόνα Δανίας</displayName>
 				<displayName count="other">κορόνες Δανίας</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Πέσο Δομινικανής Δημοκρατίας</displayName>
@@ -5013,6 +5130,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">λίρα Αιγύπτου</displayName>
 				<displayName count="other">λίρες Αιγύπτου</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>Νάκφα Ερυθραίας</displayName>
@@ -5065,6 +5183,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">λίρα Νησιών Φώκλαντ</displayName>
 				<displayName count="other">λίρες Νησιών Φώκλαντ</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>Φράγκο Γαλλίας</displayName>
@@ -5072,9 +5191,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">φράγκα Γαλλίας</displayName>
 			</currency>
 			<currency type="GBP">
-				<displayName>Λίρα Βρετανίας</displayName>
-				<displayName count="one">λίρα Βρετανίας</displayName>
-				<displayName count="other">λίρες Βρετανίας</displayName>
+				<displayName>Λίρα Στερλίνα Βρετανίας</displayName>
+				<displayName count="one">λίρα στερλίνα Βρετανίας</displayName>
+				<displayName count="other">λίρες στερλίνες Βρετανίας</displayName>
 				<symbol>£</symbol>
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
@@ -5088,6 +5207,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">λάρι Γεωργίας</displayName>
 				<displayName count="other">λάρι Γεωργίας</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>Σέντι Γκάνας (1979–2007)</displayName>
@@ -5118,6 +5238,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">φράγκο Γουινέας</displayName>
 				<displayName count="other">φράγκα Γουινέας</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>Συλί Γουινέας</displayName>
@@ -5143,6 +5264,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">κουετσάλ Γουατεμάλας</displayName>
 				<displayName count="other">κουετσάλ Γουατεμάλας</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>Γκινέα Εσκούδο Πορτογαλίας</displayName>
@@ -5173,6 +5295,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">λεμπίρα Ονδούρας</displayName>
 				<displayName count="other">λεμπίρα Ονδούρας</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>Δηνάριο Κροατίας</displayName>
@@ -5184,6 +5307,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">κούνα Κροατίας</displayName>
 				<displayName count="other">κούνα Κροατίας</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>Γκουρντ Αϊτής</displayName>
@@ -5196,12 +5320,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">φιορίνι Ουγγαρίας</displayName>
 				<displayName count="other">φιορίνια Ουγγαρίας</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>Ρουπία Ινδονησίας</displayName>
 				<displayName count="one">ρουπία Ινδονησίας</displayName>
 				<displayName count="other">ρουπία Ινδονησίας</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>Λίρα Ιρλανδίας</displayName>
@@ -5254,6 +5380,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">κορόνα Ισλανδίας</displayName>
 				<displayName count="other">κορόνες Ισλανδίας</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>Λιρέτα Ιταλίας</displayName>
@@ -5304,12 +5431,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">φράγκο Κομορών</displayName>
 				<displayName count="other">φράγκα Κομορών</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>Γουόν Βόρειας Κορέας</displayName>
 				<displayName count="one">γουόν Βόρειας Κορέας</displayName>
 				<displayName count="other">γουόν Βόρειας Κορέας</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRO">
 				<displayName count="one" draft="provisional">Παλιό γον Νότιας Κορέας</displayName>
@@ -5354,12 +5483,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">λίρα Λιβάνου</displayName>
 				<displayName count="other">λίρες Λιβάνου</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>Ρουπία Σρι Λάνκα</displayName>
 				<displayName count="one">ρουπία Σρι Λάνκα</displayName>
 				<displayName count="other">ρουπίες Σρι Λάνκα</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>Δολάριο Λιβερίας</displayName>
@@ -5442,6 +5573,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">αριάρι Μαδαγασκάρης</displayName>
 				<displayName count="other">αριάρι Μαδαγασκάρης</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>Φράγκο Μαδαγασκάρης</displayName>
@@ -5449,9 +5581,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">φράγκα Μαδαγασκάρης</displayName>
 			</currency>
 			<currency type="MKD">
-				<displayName>Δηνάριο Π.Γ.Δ.Μ.</displayName>
-				<displayName count="one">δηνάριο Π.Γ.Δ.Μ.</displayName>
-				<displayName count="other">δηνάρια Π.Γ.Δ.Μ.</displayName>
+				<displayName>Δηνάριο ΠΓΔΜ</displayName>
+				<displayName count="one">δηνάριο ΠΓΔΜ</displayName>
+				<displayName count="other">δηνάρια ΠΓΔΜ</displayName>
 				<symbol>MKD</symbol>
 			</currency>
 			<currency type="MKN">
@@ -5468,6 +5600,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">κυάτ Μιανμάρ</displayName>
 				<displayName count="other">κυάτ Μιανμάρ</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>Τουγκρίκ Μογγολίας</displayName>
@@ -5503,6 +5636,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ρουπία Μαυρικίου</displayName>
 				<displayName count="other">ρουπίες Μαυρικίου</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>Ρουφίγια Μαλδίβων</displayName>
@@ -5533,6 +5667,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ρινγκίτ Μαλαισίας</displayName>
 				<displayName count="other">ρινγκίτ Μαλαισίας</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>Εσκούδο Μοζαμβίκης</displayName>
@@ -5574,6 +5709,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">χρυσή κόρδοβα Νικαράγουας</displayName>
 				<displayName count="other">χρυσές κόρδοβα Νικαράγουας</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>Γκίλντα Ολλανδίας</displayName>
@@ -5585,12 +5721,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">κορόνα Νορβηγίας</displayName>
 				<displayName count="other">κορόνες Νορβηγίας</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>Ρουπία Νεπάλ</displayName>
 				<displayName count="one">ρουπία Νεπάλ</displayName>
 				<displayName count="other">ρουπίες Νεπάλ</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>Δολάριο Νέας Ζηλανδίας</displayName>
@@ -5645,12 +5783,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ρουπία Πακιστάν</displayName>
 				<displayName count="other">ρουπίες Πακιστάν</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>Ζλότι Πολωνίας</displayName>
 				<displayName count="one">ζλότι Πολωνίας</displayName>
 				<displayName count="other">ζλότι Πολωνίας</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>Ζλότυ Πολωνίας (1950–1995)</displayName>
@@ -5702,6 +5842,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ρούβλι Ρωσίας</displayName>
 				<displayName count="other">ρούβλια Ρωσίας</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>Ρούβλι Ρωσίας (1991–1998)</displayName>
@@ -5713,6 +5854,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">φράγκο Ρουάντας</displayName>
 				<displayName count="other">φράγκα Ρουάντας</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>Ριάλ Σαουδικής Αραβίας</displayName>
@@ -5754,6 +5896,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">κορόνα Σουηδίας</displayName>
 				<displayName count="other">κορόνες Σουηδίας</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>Δολάριο Σιγκαπούρης</displayName>
@@ -5767,6 +5910,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">λίρα Αγίας Ελένης</displayName>
 				<displayName count="other">λίρες Αγίας Ελένης</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>Τόλαρ Σλοβενίας</displayName>
@@ -5814,6 +5958,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ντόμπρα Σάο Τόμε και Πρίνσιπε</displayName>
 				<displayName count="other">ντόμπρα Σάο Τόμε και Πρίνσιπε</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>Σοβιετικό Ρούβλι</displayName>
@@ -5830,6 +5975,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">λίρα Συρίας</displayName>
 				<displayName count="other">λίρες Συρίας</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>Λιλανγκένι Σουαζιλάνδης</displayName>
@@ -5842,6 +5988,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">μπατ Ταϊλάνδης</displayName>
 				<displayName count="other">μπατ Ταϊλάνδης</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>Ρούβλι Τατζικιστάν</displayName>
@@ -5876,6 +6023,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">παάγκα νήσων Τόγκα</displayName>
 				<displayName count="other">παάγκα νήσων Τόγκα</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>Εσκούδο Τιμόρ</displayName>
@@ -5894,6 +6042,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">τουρκικές λίρες</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Δολάριο Τρινιντάντ και Τομπάγκο</displayName>
@@ -5907,7 +6056,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">νέο δολάριο Ταϊβάν</displayName>
 				<displayName count="other">νέα δολάρια Ταϊβάν</displayName>
 				<symbol>NT$</symbol>
-				<symbol alt="narrow" draft="contributed">NT$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="TZS">
 				<displayName>Σελίνι Τανζανίας</displayName>
@@ -5983,6 +6132,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">μπολιβάρ Βενεζουέλας</displayName>
 				<displayName count="other">μπολιβάρ Βενεζουέλας</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>Ντονγκ Βιετνάμ</displayName>
@@ -6038,6 +6188,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">δολάριο Ανατολικής Καραϊβικής</displayName>
 				<displayName count="other">δολάρια Ανατολικής Καραϊβικής</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>Ειδικά Δικαιώματα Ανάληψης</displayName>
@@ -6120,6 +6271,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ραντ Νότιας Αφρικής</displayName>
 				<displayName count="other">ραντ Νότιας Αφρικής</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>Κουάνζα Ζαΐρ (1968–2012)</displayName>
@@ -6131,6 +6283,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">κουάτσα Ζάμπιας</displayName>
 				<displayName count="other">κουάτσα Ζάμπιας</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>Νέο Ζαΐρ Ζαΐρ</displayName>
@@ -6177,6 +6330,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} μέτρο ανά τετραγωνικό δευτερόλεπτο</unitPattern>
 				<unitPattern count="other">{0} μέτρα ανά τετραγωνικό δευτερόλεπτο</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>στροφή</displayName>
+				<unitPattern count="one">{0} στροφή</unitPattern>
+				<unitPattern count="other">{0} στροφές</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>ακτίνια</displayName>
+				<unitPattern count="one">{0} ακτίνιο</unitPattern>
+				<unitPattern count="other">{0} ακτίνιο</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>μοίρες</displayName>
+				<unitPattern count="one">{0} μοίρα</unitPattern>
+				<unitPattern count="other">{0} μοίρες</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>λεπτά του τόξου</displayName>
 				<unitPattern count="one">{0} λεπτό του τόξου</unitPattern>
@@ -6187,30 +6355,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} δευτερόλεπτο του τόξου</unitPattern>
 				<unitPattern count="other">{0} δευτερόλεπτα του τόξου</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>μοίρες</displayName>
-				<unitPattern count="one">{0} μοίρα</unitPattern>
-				<unitPattern count="other">{0} μοίρες</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>ακτίνια</displayName>
-				<unitPattern count="one">{0} ακτίνιο</unitPattern>
-				<unitPattern count="other">{0} ακτίνιο</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ακρ</displayName>
-				<unitPattern count="one">{0} ακρ</unitPattern>
-				<unitPattern count="other">{0} ακρ</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>τετραγωνικά χιλιόμετρα</displayName>
+				<unitPattern count="one">{0} τετραγωνικό χιλιόμετρο</unitPattern>
+				<unitPattern count="other">{0} τετραγωνικά χιλιόμετρα</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>εκτάρια</displayName>
 				<unitPattern count="one">{0} εκτάριο</unitPattern>
 				<unitPattern count="other">{0} εκτάρια</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>τετραγωνικά μέτρα</displayName>
+				<unitPattern count="one">{0} τετραγωνικό μέτρο</unitPattern>
+				<unitPattern count="other">{0} τετραγωνικά μέτρα</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>τετραγωνικά εκατοστά</displayName>
 				<unitPattern count="one">{0} τετραγωνικό εκατοστό</unitPattern>
 				<unitPattern count="other">{0} τετραγωνικά εκατοστά</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>τετραγωνικά μίλια</displayName>
+				<unitPattern count="one">{0} τετραγωνικό μίλι</unitPattern>
+				<unitPattern count="other">{0} τετραγωνικά μίλια</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ακρ</displayName>
+				<unitPattern count="one">{0} ακρ</unitPattern>
+				<unitPattern count="other">{0} ακρ</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>τετραγωνικές γιάρδες</displayName>
+				<unitPattern count="one">{0} τετραγωνική γιάρδα</unitPattern>
+				<unitPattern count="other">{0} τετραγωνικές γιάρδες</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>τετραγωνικά πόδια</displayName>
@@ -6221,91 +6401,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>τετραγωνικές ίντσες</displayName>
 				<unitPattern count="one">{0} τετραγωνική ίντσα</unitPattern>
 				<unitPattern count="other">{0} τετραγωνικές ίντσες</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>τετραγωνικά χιλιόμετρα</displayName>
-				<unitPattern count="one">{0} τετραγωνικό χιλιόμετρο</unitPattern>
-				<unitPattern count="other">{0} τετραγωνικά χιλιόμετρα</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>τετραγωνικά μέτρα</displayName>
-				<unitPattern count="one">{0} τετραγωνικό μέτρο</unitPattern>
-				<unitPattern count="other">{0} τετραγωνικά μέτρα</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>τετραγωνικά μίλια</displayName>
-				<unitPattern count="one">{0} τετραγωνικό μίλι</unitPattern>
-				<unitPattern count="other">{0} τετραγωνικά μίλια</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>τετραγωνικές γιάρδες</displayName>
-				<unitPattern count="one">{0} τετραγωνική γιάρδα</unitPattern>
-				<unitPattern count="other">{0} τετραγωνικές γιάρδες</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>καράτια</displayName>
+				<unitPattern count="one">{0} καράτι</unitPattern>
+				<unitPattern count="other">{0} καράτια</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>λίτρα ανά χιλιόμετρο</displayName>
 				<unitPattern count="one">{0} λίτρο ανά χιλιόμετρο</unitPattern>
 				<unitPattern count="other">{0} λίτρα ανά χιλιόμετρο</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>λίτρα ανά 100 χιλιόμετρα</displayName>
+				<unitPattern count="one">{0} λίτρο ανά 100 χιλιόμετρα</unitPattern>
+				<unitPattern count="other">{0} λίτρα ανά 100 χιλιόμετρα</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>μίλια ανά γαλόνι</displayName>
 				<unitPattern count="one">{0} μίλι ανά γαλόνι</unitPattern>
 				<unitPattern count="other">{0} μίλια ανά γαλόνι</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabit</displayName>
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="other">{0} gigabit</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabyte</displayName>
-				<unitPattern count="one">{0} gigabyte</unitPattern>
-				<unitPattern count="other">{0} gigabyte</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobit</displayName>
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="other">{0} kilobit</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobyte</displayName>
-				<unitPattern count="one">{0} kilobyte</unitPattern>
-				<unitPattern count="other">{0} kilobyte</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabit</displayName>
-				<unitPattern count="one">{0} megabit</unitPattern>
-				<unitPattern count="other">{0} megabit</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabyte</displayName>
-				<unitPattern count="one">{0} megabyte</unitPattern>
-				<unitPattern count="other">{0} megabyte</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabit</displayName>
-				<unitPattern count="one">{0} terabit</unitPattern>
-				<unitPattern count="other">{0} terabit</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabyte</displayName>
 				<unitPattern count="one">{0} terabyte</unitPattern>
 				<unitPattern count="other">{0} terabyte</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabit</displayName>
+				<unitPattern count="one">{0} terabit</unitPattern>
+				<unitPattern count="other">{0} terabit</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabyte</displayName>
+				<unitPattern count="one">{0} gigabyte</unitPattern>
+				<unitPattern count="other">{0} gigabyte</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabit</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="other">{0} gigabit</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabyte</displayName>
+				<unitPattern count="one">{0} megabyte</unitPattern>
+				<unitPattern count="other">{0} megabyte</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabit</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="other">{0} megabit</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobyte</displayName>
+				<unitPattern count="one">{0} kilobyte</unitPattern>
+				<unitPattern count="other">{0} kilobyte</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobit</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="other">{0} kilobit</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>αιώνες</displayName>
+				<unitPattern count="one">{0} αιώνας</unitPattern>
+				<unitPattern count="other">{0} αιώνες</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>έτη</displayName>
+				<unitPattern count="one">{0} έτος</unitPattern>
+				<unitPattern count="other">{0} έτη</unitPattern>
+				<perUnitPattern>{0} ανά έτος</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>μήνες</displayName>
+				<unitPattern count="one">{0} μήνας</unitPattern>
+				<unitPattern count="other">{0} μήνες</unitPattern>
+				<perUnitPattern>{0}/μήνα</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>εβδομάδες</displayName>
+				<unitPattern count="one">{0} εβδομάδα</unitPattern>
+				<unitPattern count="other">{0} εβδομάδες</unitPattern>
+				<perUnitPattern>{0} ανά εβδομάδα</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ημέρες</displayName>
 				<unitPattern count="one">{0} ημέρα</unitPattern>
 				<unitPattern count="other">{0} ημέρες</unitPattern>
+				<perUnitPattern>{0} ανά ημέρα</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>ώρες</displayName>
@@ -6313,30 +6508,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ώρες</unitPattern>
 				<perUnitPattern>{0} ανά ώρα</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μικροδευτερόλεπτα</displayName>
-				<unitPattern count="one">{0} μικροδευτερόλεπτο</unitPattern>
-				<unitPattern count="other">{0} μικροδευτερόλεπτα</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>χιλιοστά του δευτερολέπτου</displayName>
-				<unitPattern count="one">{0} χιλιοστό του δευτερολέπτου</unitPattern>
-				<unitPattern count="other">{0} χιλιοστά του δευτερολέπτου</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>λεπτά</displayName>
 				<unitPattern count="one">{0} λεπτό</unitPattern>
 				<unitPattern count="other">{0} λεπτά</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>μήνες</displayName>
-				<unitPattern count="one">{0} μήνας</unitPattern>
-				<unitPattern count="other">{0} μήνες</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>νανοδευτερόλεπτα</displayName>
-				<unitPattern count="one">{0} νανοδευτερόλεπτο</unitPattern>
-				<unitPattern count="other">{0} νανοδευτερόλεπτα</unitPattern>
+				<perUnitPattern>{0} ανά λεπτό</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>δευτερόλεπτα</displayName>
@@ -6344,15 +6520,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} δευτερόλεπτα</unitPattern>
 				<perUnitPattern>{0} ανά δευτερόλεπτο</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>εβδομάδες</displayName>
-				<unitPattern count="one">{0} εβδομάδα</unitPattern>
-				<unitPattern count="other">{0} εβδομάδες</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>χιλιοστά του δευτερολέπτου</displayName>
+				<unitPattern count="one">{0} χιλιοστό του δευτερολέπτου</unitPattern>
+				<unitPattern count="other">{0} χιλιοστά του δευτερολέπτου</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>έτη</displayName>
-				<unitPattern count="one">{0} έτος</unitPattern>
-				<unitPattern count="other">{0} έτη</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μικροδευτερόλεπτα</displayName>
+				<unitPattern count="one">{0} μικροδευτερόλεπτο</unitPattern>
+				<unitPattern count="other">{0} μικροδευτερόλεπτα</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>νανοδευτερόλεπτα</displayName>
+				<unitPattern count="one">{0} νανοδευτερόλεπτο</unitPattern>
+				<unitPattern count="other">{0} νανοδευτερόλεπτα</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>αμπέρ</displayName>
@@ -6374,6 +6555,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} βολτ</unitPattern>
 				<unitPattern count="other">{0} βολτ</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>χιλιοθερμίδες</displayName>
+				<unitPattern count="one">{0} χιλιοθερμίδα</unitPattern>
+				<unitPattern count="other">{0} χιλιοθερμίδες</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>θερμίδες</displayName>
 				<unitPattern count="one">{0} θερμίδα</unitPattern>
@@ -6384,21 +6570,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Θερμίδα</unitPattern>
 				<unitPattern count="other">{0} Θερμίδες</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>τζάουλ</displayName>
-				<unitPattern count="one">{0} τζάουλ</unitPattern>
-				<unitPattern count="other">{0} τζάουλ</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>χιλιοθερμίδες</displayName>
-				<unitPattern count="one">{0} χιλιοθερμίδα</unitPattern>
-				<unitPattern count="other">{0} χιλιοθερμίδες</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>κιλοτζάουλ</displayName>
 				<unitPattern count="one">{0} κιλοτζάουλ</unitPattern>
 				<unitPattern count="other">{0} κιλοτζάουλ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>τζάουλ</displayName>
+				<unitPattern count="one">{0} τζάουλ</unitPattern>
+				<unitPattern count="other">{0} τζάουλ</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>κιλοβατώρες</displayName>
 				<unitPattern count="one">{0} κιλοβατώρα</unitPattern>
@@ -6409,201 +6590,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} γιγαχέρτζ</unitPattern>
 				<unitPattern count="other">{0} γιγαχέρτζ</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>χερτζ</displayName>
-				<unitPattern count="one">{0} χερτζ</unitPattern>
-				<unitPattern count="other">{0} χερτζ</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>μεγαχέρτζ</displayName>
+				<unitPattern count="one">{0} μεγαχέρτζ</unitPattern>
+				<unitPattern count="other">{0} μεγαχέρτζ</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>κιλοχέρτζ</displayName>
 				<unitPattern count="one">{0} κιλοχέρτζ</unitPattern>
 				<unitPattern count="other">{0} κιλοχέρτζ</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>μεγαχέρτζ</displayName>
-				<unitPattern count="one">{0} μεγαχέρτζ</unitPattern>
-				<unitPattern count="other">{0} μεγαχέρτζ</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>χερτζ</displayName>
+				<unitPattern count="one">{0} χερτζ</unitPattern>
+				<unitPattern count="other">{0} χερτζ</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>αστρονομικές μονάδες</displayName>
-				<unitPattern count="one">{0} αστρονομική μονάδα</unitPattern>
-				<unitPattern count="other">{0} αστρονομικές μονάδες</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>χιλιόμετρα</displayName>
+				<unitPattern count="one">{0} χιλιόμετρο</unitPattern>
+				<unitPattern count="other">{0} χιλιόμετρα</unitPattern>
+				<perUnitPattern>{0}/χλμ.</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>εκατοστά</displayName>
-				<unitPattern count="one">{0} εκατοστό</unitPattern>
-				<unitPattern count="other">{0} εκατοστά</unitPattern>
+			<unit type="length-meter">
+				<displayName>μέτρα</displayName>
+				<unitPattern count="one">{0} μέτρο</unitPattern>
+				<unitPattern count="other">{0} μέτρα</unitPattern>
+				<perUnitPattern>{0}/μ.</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>δεκατόμετρα</displayName>
 				<unitPattern count="one">{0} δεκατόμετρο</unitPattern>
 				<unitPattern count="other">{0} δεκατόμετρα</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>πόδια</displayName>
-				<unitPattern count="one">{0} πόδι</unitPattern>
-				<unitPattern count="other">{0} πόδια</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>ίντσες</displayName>
-				<unitPattern count="one">{0} ίντσα</unitPattern>
-				<unitPattern count="other">{0} ίντσες</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>χιλιόμετρα</displayName>
-				<unitPattern count="one">{0} χιλιόμετρο</unitPattern>
-				<unitPattern count="other">{0} χιλιόμετρα</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>έτη φωτός</displayName>
-				<unitPattern count="one">{0} έτος φωτός</unitPattern>
-				<unitPattern count="other">{0} έτη φωτός</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>μέτρα</displayName>
-				<unitPattern count="one">{0} μέτρο</unitPattern>
-				<unitPattern count="other">{0} μέτρα</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} μικρόμετρο</unitPattern>
-				<unitPattern count="other">{0} μικρόμετρα</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>μίλια</displayName>
-				<unitPattern count="one">{0} μίλι</unitPattern>
-				<unitPattern count="other">{0} μίλια</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>εκατοστά</displayName>
+				<unitPattern count="one">{0} εκατοστό</unitPattern>
+				<unitPattern count="other">{0} εκατοστά</unitPattern>
+				<perUnitPattern>{0}/εκ.</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>χιλιοστόμετρα</displayName>
 				<unitPattern count="one">{0} χιλιοστόμετρο</unitPattern>
 				<unitPattern count="other">{0} χιλιοστόμετρα</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} μικρόμετρο</unitPattern>
+				<unitPattern count="other">{0} μικρόμετρα</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>νανόμετρα</displayName>
 				<unitPattern count="one">{0} νανόμετρο</unitPattern>
 				<unitPattern count="other">{0} νανόμετρα</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>ναυτικά μίλια</displayName>
-				<unitPattern count="one">{0} ναυτικό μίλι</unitPattern>
-				<unitPattern count="other">{0} ναυτικά μίλια</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>παρσέκ</displayName>
-				<unitPattern count="one">{0} παρσέκ</unitPattern>
-				<unitPattern count="other">{0} παρσέκ</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>πικόμετρα</displayName>
 				<unitPattern count="one">{0} πικόμετρο</unitPattern>
 				<unitPattern count="other">{0} πικόμετρα</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>μίλια</displayName>
+				<unitPattern count="one">{0} μίλι</unitPattern>
+				<unitPattern count="other">{0} μίλια</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>γιάρδες</displayName>
 				<unitPattern count="one">{0} γιάρδα</unitPattern>
 				<unitPattern count="other">{0} γιάρδες</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>πόδια</displayName>
+				<unitPattern count="one">{0} πόδι</unitPattern>
+				<unitPattern count="other">{0} πόδια</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>ίντσες</displayName>
+				<unitPattern count="one">{0} ίντσα</unitPattern>
+				<unitPattern count="other">{0} ίντσες</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>παρσέκ</displayName>
+				<unitPattern count="one">{0} παρσέκ</unitPattern>
+				<unitPattern count="other">{0} παρσέκ</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>έτη φωτός</displayName>
+				<unitPattern count="one">{0} έτος φωτός</unitPattern>
+				<unitPattern count="other">{0} έτη φωτός</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>αστρονομικές μονάδες</displayName>
+				<unitPattern count="one">{0} αστρονομική μονάδα</unitPattern>
+				<unitPattern count="other">{0} αστρονομικές μονάδες</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>ναυτικά μίλια</displayName>
+				<unitPattern count="one">{0} ναυτικό μίλι</unitPattern>
+				<unitPattern count="other">{0} ναυτικά μίλια</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>καράτια</displayName>
-				<unitPattern count="one">{0} καράτι</unitPattern>
-				<unitPattern count="other">{0} καράτια</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>γραμμάρια</displayName>
-				<unitPattern count="one">{0} γραμμάριο</unitPattern>
-				<unitPattern count="other">{0} γραμμάρια</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>χιλιόγραμμα</displayName>
-				<unitPattern count="one">{0} χιλιόγραμμο</unitPattern>
-				<unitPattern count="other">{0} χιλιόγραμμα</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>μετρικοί τόνοι</displayName>
 				<unitPattern count="one">{0} μετρικός τόνος</unitPattern>
 				<unitPattern count="other">{0} μετρικοί τόνοι</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>μικρογραμμάρια</displayName>
-				<unitPattern count="one">{0} μικρογραμμάριο</unitPattern>
-				<unitPattern count="other">{0} μικρογραμμάρια</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>χιλιόγραμμα</displayName>
+				<unitPattern count="one">{0} χιλιόγραμμο</unitPattern>
+				<unitPattern count="other">{0} χιλιόγραμμα</unitPattern>
+				<perUnitPattern>{0}/κιλό</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>γραμμάρια</displayName>
+				<unitPattern count="one">{0} γραμμάριο</unitPattern>
+				<unitPattern count="other">{0} γραμμάρια</unitPattern>
+				<perUnitPattern>{0} ανά γραμ.</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>χιλιοστόγραμμα</displayName>
 				<unitPattern count="one">{0} χιλιοστόγραμμο</unitPattern>
 				<unitPattern count="other">{0} χιλιοστόγραμμα</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ουγγιές</displayName>
-				<unitPattern count="one">{0} ουγγιά</unitPattern>
-				<unitPattern count="other">{0} ουγγιές</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ευγενείς ουγγιές</displayName>
-				<unitPattern count="one">{0} ευγενής ουγγιά</unitPattern>
-				<unitPattern count="other">{0} ευγενείς ουγγιές</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>λίβρες</displayName>
-				<unitPattern count="one">{0} λίβρα</unitPattern>
-				<unitPattern count="other">{0} λίβρες</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>μικρογραμμάρια</displayName>
+				<unitPattern count="one">{0} μικρογραμμάριο</unitPattern>
+				<unitPattern count="other">{0} μικρογραμμάρια</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>τόνοι</displayName>
 				<unitPattern count="one">{0} τόνος</unitPattern>
 				<unitPattern count="other">{0} τόνοι</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>λίβρες</displayName>
+				<unitPattern count="one">{0} λίβρα</unitPattern>
+				<unitPattern count="other">{0} λίβρες</unitPattern>
+				<perUnitPattern>{0} ανά λίβρα</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ουγγιές</displayName>
+				<unitPattern count="one">{0} ουγγιά</unitPattern>
+				<unitPattern count="other">{0} ουγγιές</unitPattern>
+				<perUnitPattern>{0} ανά ουγγιά</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ευγενείς ουγγιές</displayName>
+				<unitPattern count="one">{0} ευγενής ουγγιά</unitPattern>
+				<unitPattern count="other">{0} ευγενείς ουγγιές</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>καράτια</displayName>
+				<unitPattern count="one">{0} καράτι</unitPattern>
+				<unitPattern count="other">{0} καράτια</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>γιγαβάτ</displayName>
 				<unitPattern count="one">{0} γιγαβάτ</unitPattern>
 				<unitPattern count="other">{0} γιγαβάτ</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>ίπποι</displayName>
-				<unitPattern count="one">{0} ίππος</unitPattern>
-				<unitPattern count="other">{0} ίπποι</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>κιλοβάτ</displayName>
-				<unitPattern count="one">{0} κιλοβάτ</unitPattern>
-				<unitPattern count="other">{0} κιλοβάτ</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>μεγαβάτ</displayName>
 				<unitPattern count="one">{0} μεγαβάτ</unitPattern>
 				<unitPattern count="other">{0} μεγαβάτ</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>μιλιβάτ</displayName>
-				<unitPattern count="one">{0} μιλιβάτ</unitPattern>
-				<unitPattern count="other">{0} μιλιβάτ</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>κιλοβάτ</displayName>
+				<unitPattern count="one">{0} κιλοβάτ</unitPattern>
+				<unitPattern count="other">{0} κιλοβάτ</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>βατ</displayName>
 				<unitPattern count="one">{0} βατ</unitPattern>
 				<unitPattern count="other">{0} βατ</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>μιλιβάτ</displayName>
+				<unitPattern count="one">{0} μιλιβάτ</unitPattern>
+				<unitPattern count="other">{0} μιλιβάτ</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>ίπποι</displayName>
+				<unitPattern count="one">{0} ίππος</unitPattern>
+				<unitPattern count="other">{0} ίπποι</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>εκτοπασκάλ</displayName>
 				<unitPattern count="one">{0} εκτοπασκάλ</unitPattern>
 				<unitPattern count="other">{0} εκτοπασκάλ</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>ίντσες στήλης υδραργύρου</displayName>
-				<unitPattern count="one">{0} ίντσα στήλης υδραργύρου</unitPattern>
-				<unitPattern count="other">{0} ίντσες στήλης υδραργύρου</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>μιλιμπάρ</displayName>
-				<unitPattern count="one">{0} μιλιμπάρ</unitPattern>
-				<unitPattern count="other">{0} μιλιμπάρ</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>χιλιοστόμετρα στήλης υδραργύρου</displayName>
 				<unitPattern count="one">{0} χιλιοστόμετρα στήλης υδραργύρου</unitPattern>
@@ -6614,10 +6799,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} λίβρα ανά τετραγωνική ίντσα</unitPattern>
 				<unitPattern count="other">{0} λίβρες ανά τετραγωνική ίντσα</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>καράτια</displayName>
-				<unitPattern count="one">{0} καράτι</unitPattern>
-				<unitPattern count="other">{0} καράτια</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>ίντσες στήλης υδραργύρου</displayName>
+				<unitPattern count="one">{0} ίντσα στήλης υδραργύρου</unitPattern>
+				<unitPattern count="other">{0} ίντσες στήλης υδραργύρου</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>μιλιμπάρ</displayName>
+				<unitPattern count="one">{0} μιλιμπάρ</unitPattern>
+				<unitPattern count="other">{0} μιλιμπάρ</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>χιλιόμετρα ανά ώρα</displayName>
@@ -6634,6 +6824,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} μίλι ανά ώρα</unitPattern>
 				<unitPattern count="other">{0} μίλια ανά ώρα</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>κόμβος</displayName>
+				<unitPattern count="one">{0} κόμβος</unitPattern>
+				<unitPattern count="other">{0} κόμβοι</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>βαθμοί Κελσίου</displayName>
 				<unitPattern count="one">{0} βαθμός Κελσίου</unitPattern>
@@ -6645,34 +6845,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} βαθμοί Φαρενάιτ</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
-				<displayName>κέλβιν</displayName>
-				<unitPattern count="one">{0} κέλβιν</unitPattern>
-				<unitPattern count="other">{0} κέλβιν</unitPattern>
-			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ακρ-πόδια</displayName>
-				<unitPattern count="one">{0} ακρ-πόδι</unitPattern>
-				<unitPattern count="other">{0} ακρ-πόδια</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>εκατοστόλιτρα</displayName>
-				<unitPattern count="one">{0} εκατοστόλιτρο</unitPattern>
-				<unitPattern count="other">{0} εκατοστόλιτρα</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>κυβικά εκατοστά</displayName>
-				<unitPattern count="one">{0} κυβικό εκατοστό</unitPattern>
-				<unitPattern count="other">{0} κυβικά εκατοστά</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>κυβικά πόδια</displayName>
-				<unitPattern count="one">{0} κυβικό πόδι</unitPattern>
-				<unitPattern count="other">{0} κυβικά πόδια</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>κυβικές ίντσες</displayName>
-				<unitPattern count="one">{0} κυβική ίντσα</unitPattern>
-				<unitPattern count="other">{0} κυβικές ίντσες</unitPattern>
+				<displayName>βαθμοί Κέλβιν</displayName>
+				<unitPattern count="one">{0} βαθμός Κέλβιν</unitPattern>
+				<unitPattern count="other">{0} βαθμοί Κέλβιν</unitPattern>
 			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>κυβικά χιλιόμετρα</displayName>
@@ -6683,6 +6858,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>κυβικά μέτρα</displayName>
 				<unitPattern count="one">{0} κυβικό μέτρο</unitPattern>
 				<unitPattern count="other">{0} κυβικό μέτρο</unitPattern>
+				<perUnitPattern>{0} ανά κυβικό μέτρο</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>κυβικά εκατοστά</displayName>
+				<unitPattern count="one">{0} κυβικό εκατοστό</unitPattern>
+				<unitPattern count="other">{0} κυβικά εκατοστά</unitPattern>
+				<perUnitPattern>{0} ανά κυβικό εκατοστό</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>κυβικά μίλια</displayName>
@@ -6694,25 +6876,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} κυβική γιάρδα</unitPattern>
 				<unitPattern count="other">{0} κυβικές γιάρδες</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>κύπελλο</displayName>
-				<unitPattern count="one">{0} κύπελλο</unitPattern>
-				<unitPattern count="other">{0} κύπελλα</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>κυβικά πόδια</displayName>
+				<unitPattern count="one">{0} κυβικό πόδι</unitPattern>
+				<unitPattern count="other">{0} κυβικά πόδια</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>δεκατόλιτρα</displayName>
-				<unitPattern count="one">{0} δεκατόλιτρο</unitPattern>
-				<unitPattern count="other">{0} δεκατόλιτρα</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>κυβικές ίντσες</displayName>
+				<unitPattern count="one">{0} κυβική ίντσα</unitPattern>
+				<unitPattern count="other">{0} κυβικές ίντσες</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>ουγγιές υγρού</displayName>
-				<unitPattern count="one">{0} ουγγιά υγρού</unitPattern>
-				<unitPattern count="other">{0} ουγγιές υγρού</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>γαλόνια</displayName>
-				<unitPattern count="one">{0} γαλόνι</unitPattern>
-				<unitPattern count="other">{0} γαλόνια</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>μεγαλίτρα</displayName>
+				<unitPattern count="one">{0} μεγαλίτρο</unitPattern>
+				<unitPattern count="other">{0} μεγαλίτρα</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>εκτόλιτρα</displayName>
@@ -6723,27 +6900,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>λίτρα</displayName>
 				<unitPattern count="one">{0} λίτρο</unitPattern>
 				<unitPattern count="other">{0} λίτρα</unitPattern>
+				<perUnitPattern>{0}/λ.</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>μεγαλίτρα</displayName>
-				<unitPattern count="one">{0} μεγαλίτρο</unitPattern>
-				<unitPattern count="other">{0} μεγαλίτρα</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>δεκατόλιτρα</displayName>
+				<unitPattern count="one">{0} δεκατόλιτρο</unitPattern>
+				<unitPattern count="other">{0} δεκατόλιτρα</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>εκατοστόλιτρα</displayName>
+				<unitPattern count="one">{0} εκατοστόλιτρο</unitPattern>
+				<unitPattern count="other">{0} εκατοστόλιτρα</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>χιλιοστόλιτρο</displayName>
 				<unitPattern count="one">{0} χιλιοστόλιτρο</unitPattern>
 				<unitPattern count="other">{0} χιλιοστόλιτρα</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>πίντες</displayName>
-				<unitPattern count="one">{0} πίντα</unitPattern>
-				<unitPattern count="other">{0} πίντες</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName draft="contributed">μετρική πίντα</displayName>
+				<unitPattern count="one" draft="contributed">{0} μετρική πίντα</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} μετρικές πίντες</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName draft="contributed">μετρικό κύπελλο</displayName>
+				<unitPattern count="one" draft="contributed">{0} μετρικό κύπελλο</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} μετρικά κύπελλα</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ακρ-πόδια</displayName>
+				<unitPattern count="one">{0} ακρ-πόδι</unitPattern>
+				<unitPattern count="other">{0} ακρ-πόδια</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>γαλόνια</displayName>
+				<unitPattern count="one">{0} γαλόνι</unitPattern>
+				<unitPattern count="other">{0} γαλόνια</unitPattern>
+				<perUnitPattern>{0} ανά γαλόνι</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>τέταρτα του γαλονιού</displayName>
 				<unitPattern count="one">{0} τέταρτο του γαλονιού</unitPattern>
 				<unitPattern count="other">{0} τέταρτα του γαλονιού</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>πίντες</displayName>
+				<unitPattern count="one">{0} πίντα</unitPattern>
+				<unitPattern count="other">{0} πίντες</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>κύπελλο</displayName>
+				<unitPattern count="one">{0} κύπελλο</unitPattern>
+				<unitPattern count="other">{0} κύπελλα</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>ουγγιές υγρού</displayName>
+				<unitPattern count="one">{0} ουγγιά υγρού</unitPattern>
+				<unitPattern count="other">{0} ουγγιές υγρού</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>κουταλιές της σούπας</displayName>
 				<unitPattern count="one">{0} κουταλιά της σούπας</unitPattern>
@@ -6754,6 +6968,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} κουταλιά του γλυκού</unitPattern>
 				<unitPattern count="other">{0} κουταλιές του γλυκού</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} Α</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} Β</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} Ν</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} Δ</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -6769,40 +6989,67 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName>λεπτά του τόξου</displayName>
-				<unitPattern count="one">{0} λεπ. τόξου</unitPattern>
-				<unitPattern count="other">{0} λεπ. τόξου</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName>δευτερόλεπτα του τόξου</displayName>
-				<unitPattern count="one">{0} δευτ.</unitPattern>
-				<unitPattern count="other">{0} δευτ.</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName>μοίρες</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="one">{0} rev</unitPattern>
+				<unitPattern count="other">{0} rev</unitPattern>
 			</unit>
 			<unit type="angle-radian">
 				<displayName>ακτίνια</displayName>
 				<unitPattern count="one">{0} rad</unitPattern>
 				<unitPattern count="other">{0} rad</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName>ακρ</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="angle-degree">
+				<displayName>μοίρες</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>λεπτά του τόξου</displayName>
+				<unitPattern count="one">{0} λεπ. τόξου</unitPattern>
+				<unitPattern count="other">{0} λεπ. τόξου</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>arcsec</displayName>
+				<unitPattern count="one">{0} arcsec</unitPattern>
+				<unitPattern count="other">{0} arcsec</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>τ. χλμ.</displayName>
+				<unitPattern count="one">{0} τ. χλμ.</unitPattern>
+				<unitPattern count="other">{0} τ. χλμ.</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>εκτάρια</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>τ. μέτρα</displayName>
+				<unitPattern count="one">{0} τ.μ.</unitPattern>
+				<unitPattern count="other">{0} τ.μ.</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>τ. εκ.</displayName>
 				<unitPattern count="one">{0} τ. εκ.</unitPattern>
 				<unitPattern count="other">{0} τ. εκ.</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>τ. μίλια</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ακρ</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>τετρ. γιάρδες</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>τετρ. πόδια</displayName>
@@ -6813,91 +7060,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>τετρ. ίντσες</displayName>
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>τ. χλμ.</displayName>
-				<unitPattern count="one">{0} τ. χλμ.</unitPattern>
-				<unitPattern count="other">{0} τ. χλμ.</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>τ. μέτρα</displayName>
-				<unitPattern count="one">{0} τ.μ.</unitPattern>
-				<unitPattern count="other">{0} τ.μ.</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>τ. μίλια</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>τετρ. γιάρδες</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>καράτια</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>λίτρα/χλμ.</displayName>
 				<unitPattern count="one">{0} λίτρο/χλμ</unitPattern>
 				<unitPattern count="other">{0} λίτρα/χλμ</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>λ./100 χλμ.</displayName>
+				<unitPattern count="one">{0} λ./100 χλμ.</unitPattern>
+				<unitPattern count="other">{0} λ./100 χλμ.</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>μίλια/γαλόνι</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>αιών.</displayName>
+				<unitPattern count="one">{0} αιών.</unitPattern>
+				<unitPattern count="other">{0} αιών.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>έτη</displayName>
+				<unitPattern count="one">{0} έτ.</unitPattern>
+				<unitPattern count="other">{0} έτ.</unitPattern>
+				<perUnitPattern>{0}/έτ.</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>μήνες</displayName>
+				<unitPattern count="one">{0} μήν.</unitPattern>
+				<unitPattern count="other">{0} μήν.</unitPattern>
+				<perUnitPattern>{0}/μ.</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>εβδομάδες</displayName>
+				<unitPattern count="one">{0} εβδ.</unitPattern>
+				<unitPattern count="other">{0} εβδ.</unitPattern>
+				<perUnitPattern>{0}/εβδ.</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ημέρες</displayName>
 				<unitPattern count="one">{0} ημέρα</unitPattern>
 				<unitPattern count="other">{0} ημέρες</unitPattern>
+				<perUnitPattern>{0}/ημ.</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>ώρες</displayName>
@@ -6905,30 +7167,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ώρ.</unitPattern>
 				<perUnitPattern>{0} α.ώ.</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μικροδεύτερα</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>χιλιοστά δευτ.</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>λεπ.</displayName>
 				<unitPattern count="one">{0} λεπ.</unitPattern>
 				<unitPattern count="other">{0} λεπ.</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>μήνες</displayName>
-				<unitPattern count="one">{0} μήν.</unitPattern>
-				<unitPattern count="other">{0} μήν.</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>νανοδεύτερα</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/λ.</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>δευτ.</displayName>
@@ -6936,15 +7179,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} δευτ.</unitPattern>
 				<perUnitPattern>{0} ανα δευτ.</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>εβδομάδες</displayName>
-				<unitPattern count="one">{0} εβδ.</unitPattern>
-				<unitPattern count="other">{0} εβδ.</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>χιλιοστά δευτ.</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>έτη</displayName>
-				<unitPattern count="one">{0} έτ.</unitPattern>
-				<unitPattern count="other">{0} έτ.</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μικροδεύτερα</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>νανοδεύτερα</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>αμπέρ</displayName>
@@ -6966,6 +7214,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -6976,21 +7229,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Cal</unitPattern>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>τζάουλ</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>κιλοτζάουλ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>τζάουλ</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>κιλοβάτ/ώρα</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -7001,201 +7249,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>χερτζ</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>μεγαχέρτζ</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>κιλοχέρτζ</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>μεγαχέρτζ</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>χερτζ</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>α.μ.</displayName>
-				<unitPattern count="one">{0} α.μ.</unitPattern>
-				<unitPattern count="other">{0} α.μ.</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>χλμ.</displayName>
+				<unitPattern count="one">{0} χλμ.</unitPattern>
+				<unitPattern count="other">{0} χλμ.</unitPattern>
+				<perUnitPattern>{0}/χλμ.</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>εκ.</displayName>
-				<unitPattern count="one">{0} εκ.</unitPattern>
-				<unitPattern count="other">{0} εκ.</unitPattern>
+			<unit type="length-meter">
+				<displayName>μέτρα</displayName>
+				<unitPattern count="one">{0} μ.</unitPattern>
+				<unitPattern count="other">{0} μ.</unitPattern>
+				<perUnitPattern>{0}/μ.</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>δεκ.</displayName>
 				<unitPattern count="one">{0} δεκ.</unitPattern>
 				<unitPattern count="other">{0} δεκ.</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>πόδια</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>ίντσες</displayName>
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>χλμ.</displayName>
-				<unitPattern count="one">{0} χλμ.</unitPattern>
-				<unitPattern count="other">{0} χλμ.</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>έτη φωτός</displayName>
-				<unitPattern count="one">{0} ly</unitPattern>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>μέτρα</displayName>
-				<unitPattern count="one">{0} μ.</unitPattern>
-				<unitPattern count="other">{0} μ.</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>μικρόμετρα</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>μίλια</displayName>
-				<unitPattern count="one">{0} μίλ.</unitPattern>
-				<unitPattern count="other">{0} μίλ.</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>εκ.</displayName>
+				<unitPattern count="one">{0} εκ.</unitPattern>
+				<unitPattern count="other">{0} εκ.</unitPattern>
+				<perUnitPattern>{0}/εκ.</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>χιλιοστόμ.</displayName>
 				<unitPattern count="one">{0} χλστ.</unitPattern>
 				<unitPattern count="other">{0} χλστ.</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>μικρόμετρα</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>παρσέκ</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>μίλια</displayName>
+				<unitPattern count="one">{0} μίλ.</unitPattern>
+				<unitPattern count="other">{0} μίλ.</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>γιάρδες</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>πόδια</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>ίντσες</displayName>
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>παρσέκ</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>έτη φωτός</displayName>
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>α.μ.</displayName>
+				<unitPattern count="one">{0} α.μ.</unitPattern>
+				<unitPattern count="other">{0} α.μ.</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>ν.μ.</displayName>
+				<unitPattern count="one">{0} ν.μ.</unitPattern>
+				<unitPattern count="other">{0} ν.μ.</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>καράτια</displayName>
-				<unitPattern count="one">{0} ct</unitPattern>
-				<unitPattern count="other">{0} ct</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>γραμμάρια</displayName>
-				<unitPattern count="one">{0} γρ.</unitPattern>
-				<unitPattern count="other">{0} γρ.</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>κιλά</displayName>
-				<unitPattern count="one">{0} κιλό</unitPattern>
-				<unitPattern count="other">{0} κιλά</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>mt</displayName>
 				<unitPattern count="one">{0} mt</unitPattern>
 				<unitPattern count="other">{0} mt</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} κιλό</unitPattern>
+				<unitPattern count="other">{0} κιλά</unitPattern>
+				<perUnitPattern>{0}/κιλό</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>γραμμάρια</displayName>
+				<unitPattern count="one">{0} γρ.</unitPattern>
+				<unitPattern count="other">{0} γρ.</unitPattern>
+				<perUnitPattern>{0}/γρ.</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ευγενής ουγγιά</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>λίβρες</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>τόνοι</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>λίβρες</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ευγενής ουγγιά</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>καράτια</displayName>
+				<unitPattern count="one">{0} ct</unitPattern>
+				<unitPattern count="other">{0} ct</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>γιγαβάτ</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>ίπποι</displayName>
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>κιλοβάτ</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>μεγαβάτ</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>μιλιβάτ</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>κιλοβάτ</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>βατ</displayName>
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>μιλιβάτ</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>ίπποι</displayName>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>εκτοπασκάλ</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>ίντσες στήλης υδραργύρου</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>μιλιμπάρ</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>χιλιοστόμετρα στήλης υδραργύρου</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -7206,10 +7458,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>καράτια</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>ίντσες στήλης υδραργύρου</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>μιλιμπάρ</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>χλμ./ώρα</displayName>
@@ -7226,6 +7483,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} μίλι/ώρα</unitPattern>
 				<unitPattern count="other">{0} μίλια/ώρα</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>βαθμοί Κελσίου</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -7241,31 +7508,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ακρ πόδια</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cL</displayName>
-				<unitPattern count="one">{0} cL</unitPattern>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -7275,6 +7517,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -7286,25 +7535,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>κύπελλα</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="one">{0} dL</unitPattern>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -7315,27 +7559,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>λίτρα</displayName>
 				<unitPattern count="one">{0} λίτ.</unitPattern>
 				<unitPattern count="other">{0} λίτ.</unitPattern>
+				<perUnitPattern>{0}/λ.</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="one">{0} ML</unitPattern>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0} dL</unitPattern>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="one">{0} cL</unitPattern>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
 				<unitPattern count="one">{0} mL</unitPattern>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>πίντες</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName draft="contributed">μετρικές πίντες</displayName>
+				<unitPattern count="one">{0} μετρική πίντα</unitPattern>
+				<unitPattern count="other">{0} μετρικές πίντες</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName draft="contributed">μετρ. κύπελλο</displayName>
+				<unitPattern count="one">{0} μετρ. κύπελλο</unitPattern>
+				<unitPattern count="other">{0} μετρ. κύπελλα</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ακρ πόδια</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>τέταρτα γαλονιού</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>πίντες</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>κύπελλα</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>κ.σ.</displayName>
 				<unitPattern count="one">{0} κ.σ.</unitPattern>
@@ -7346,6 +7627,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} κ.γ.</unitPattern>
 				<unitPattern count="other">{0} κ.γ.</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} Α</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} Β</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} Ν</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} Δ</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -7355,6 +7642,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} G</unitPattern>
 				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -7363,26 +7654,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} m²</unitPattern>
 				<unitPattern count="other">{0} m²</unitPattern>
@@ -7391,6 +7670,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>λ/100 χλμ</displayName>
+				<unitPattern count="one">{0} λ/100 χλμ</unitPattern>
+				<unitPattern count="other">{0} λ/100 χλμ</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>έτ.</displayName>
+				<unitPattern count="one">{0} έ</unitPattern>
+				<unitPattern count="other">{0} έ</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>μήνας</displayName>
+				<unitPattern count="one">{0} μ</unitPattern>
+				<unitPattern count="other">{0} μ</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>εβδ.</displayName>
+				<unitPattern count="one">{0} ε</unitPattern>
+				<unitPattern count="other">{0} ε</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ημέρα</displayName>
 				<unitPattern count="one">{0} η</unitPattern>
@@ -7401,66 +7708,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ώ</unitPattern>
 				<unitPattern count="other">{0} ώ</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>χιλ. δευτ.</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>λεπ.</displayName>
 				<unitPattern count="one">{0} λ</unitPattern>
 				<unitPattern count="other">{0} λ</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>μήνας</displayName>
-				<unitPattern count="one">{0} μ</unitPattern>
-				<unitPattern count="other">{0} μ</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>δευτ.</displayName>
 				<unitPattern count="one">{0} δ</unitPattern>
 				<unitPattern count="other">{0} δ</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>εβδ.</displayName>
-				<unitPattern count="one">{0} ε</unitPattern>
-				<unitPattern count="other">{0} ε</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>έτ.</displayName>
-				<unitPattern count="one">{0} έ</unitPattern>
-				<unitPattern count="other">{0} έ</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>εκ.</displayName>
-				<unitPattern count="one">{0} εκ.</unitPattern>
-				<unitPattern count="other">{0} εκ.</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>χιλ. δευτ.</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>χλμ.</displayName>
 				<unitPattern count="one">{0} χλμ.</unitPattern>
 				<unitPattern count="other">{0} χλμ.</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} ly</unitPattern>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>μέτρο</displayName>
 				<unitPattern count="one">{0} μ.</unitPattern>
 				<unitPattern count="other">{0} μ.</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>εκ.</displayName>
+				<unitPattern count="one">{0} εκ.</unitPattern>
+				<unitPattern count="other">{0} εκ.</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>χλστ.</displayName>
@@ -7471,31 +7747,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>γρ.</displayName>
-				<unitPattern count="one">{0} γρ.</unitPattern>
-				<unitPattern count="other">{0} γρ.</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="one">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
+			<unit type="mass-gram">
+				<displayName>γρ.</displayName>
+				<unitPattern count="one">{0} γρ.</unitPattern>
+				<unitPattern count="other">{0} γρ.</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} lb</unitPattern>
 				<unitPattern count="other">{0} lb</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} kW</unitPattern>
@@ -7505,6 +7793,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
@@ -7554,6 +7846,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} Α</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} Β</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} Ν</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} Δ</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
@@ -7575,14 +7873,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<listPattern type="unit">
 			<listPatternPart type="start">{0}, {1}</listPatternPart>
 			<listPatternPart type="middle">{0}, {1}</listPatternPart>
-			<listPatternPart type="end">{0} και {1}</listPatternPart>
-			<listPatternPart type="2">{0} και {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-narrow">
-			<listPatternPart type="start">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle">{0}, {1}</listPatternPart>
-			<listPatternPart type="end">{0}, {1}</listPatternPart>
-			<listPatternPart type="2" draft="contributed">{0}, {1}</listPatternPart>
+			<listPatternPart type="start">{0} {1}</listPatternPart>
+			<listPatternPart type="middle">{0} {1}</listPatternPart>
+			<listPatternPart type="end">{0} {1}</listPatternPart>
+			<listPatternPart type="2">{0} {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-short">
 			<listPatternPart type="start">{0}, {1}</listPatternPart>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/el_CY.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/el_CY.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/el_CY.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/el_CY.xml
index 3950a1c294e..f1c2677b55e 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/el_CY.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/el_CY.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11171 $"/>
-		<generation date="$Date: 2015-02-10 11:03:58 -0600 (Tue, 10 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="el"/>
 		<territory type="CY"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/el_GR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/el_GR.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/el_GR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/el_GR.xml
index d45a708efa1..ab44a7cfd2b 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/el_GR.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/el_GR.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="el"/>
 		<territory type="GR"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en.xml
index 54003711ae9..8bc68b6fb43 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11348 $"/>
-		<generation date="$Date: 2015-03-05 01:15:52 -0600 (Thu, 05 Mar 2015) $"/>
+		<version number="$Revision: 12418 $"/>
 		<language type="en"/>
 	</identity>
 	<localeDisplayNames>
@@ -59,7 +58,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ay">Aymara</language>
 			<language type="az">Azerbaijani</language>
 			<language type="az" alt="short">Azeri</language>
-			<language type="azb">South Azerbaijani</language>
 			<language type="ba">Bashkir</language>
 			<language type="bal">Baluchi</language>
 			<language type="ban">Balinese</language>
@@ -76,6 +74,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bfd">Bafut</language>
 			<language type="bfq">Badaga</language>
 			<language type="bg">Bulgarian</language>
+			<language type="bgn">Western Balochi</language>
 			<language type="bho">Bhojpuri</language>
 			<language type="bi">Bislama</language>
 			<language type="bik">Bikol</language>
@@ -177,6 +176,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ewo">Ewondo</language>
 			<language type="ext">Extremaduran</language>
 			<language type="fa">Persian</language>
+			<language type="fa_AF">Dari</language>
 			<language type="fan">Fang</language>
 			<language type="fat">Fanti</language>
 			<language type="ff">Fulah</language>
@@ -239,7 +239,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="hr">Croatian</language>
 			<language type="hsb">Upper Sorbian</language>
 			<language type="hsn">Xiang Chinese</language>
-			<language type="ht">Haitian</language>
+			<language type="ht">Haitian Creole</language>
 			<language type="hu">Hungarian</language>
 			<language type="hup">Hupa</language>
 			<language type="hy">Armenian</language>
@@ -338,6 +338,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">Lao</language>
 			<language type="lol">Mongo</language>
 			<language type="loz">Lozi</language>
+			<language type="lrc">Northern Luri</language>
 			<language type="lt">Lithuanian</language>
 			<language type="ltg">Latgalian</language>
 			<language type="lu">Luba-Katanga</language>
@@ -389,6 +390,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mwr">Marwari</language>
 			<language type="mwv">Mentawai</language>
 			<language type="my">Burmese</language>
+			<language type="my" alt="variant">Myanmar Language</language>
 			<language type="mye">Myene</language>
 			<language type="myv">Erzya</language>
 			<language type="mzn">Mazanderani</language>
@@ -399,6 +401,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nb">Norwegian Bokmål</language>
 			<language type="nd">North Ndebele</language>
 			<language type="nds">Low German</language>
+			<language type="nds_NL">Low Saxon</language>
 			<language type="ne">Nepali</language>
 			<language type="new">Newari</language>
 			<language type="ng">Ndonga</language>
@@ -414,7 +417,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nog">Nogai</language>
 			<language type="non">Old Norse</language>
 			<language type="nov">Novial</language>
-			<language type="nqo">NʼKo</language>
+			<language type="nqo">N’Ko</language>
 			<language type="nr">South Ndebele</language>
 			<language type="nso">Northern Sotho</language>
 			<language type="nus">Nuer</language>
@@ -493,6 +496,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sco">Scots</language>
 			<language type="sd">Sindhi</language>
 			<language type="sdc">Sassarese Sardinian</language>
+			<language type="sdh">Southern Kurdish</language>
 			<language type="se">Northern Sami</language>
 			<language type="see">Seneca</language>
 			<language type="seh">Sena</language>
@@ -535,8 +539,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">Sumerian</language>
 			<language type="sv">Swedish</language>
 			<language type="sw">Swahili</language>
+			<language type="sw_CD">Congo Swahili</language>
 			<language type="swb">Comorian</language>
-			<language type="swc">Congo Swahili</language>
 			<language type="syc">Classical Syriac</language>
 			<language type="syr">Syriac</language>
 			<language type="szl">Silesian</language>
@@ -636,6 +640,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<scripts>
 			<script type="Afak">Afaka</script>
 			<script type="Aghb">Caucasian Albanian</script>
+			<script type="Ahom">Ahom</script>
 			<script type="Arab">Arabic</script>
 			<script type="Arab" alt="variant">Perso-Arabic</script>
 			<script type="Armi">Imperial Aramaic</script>
@@ -686,6 +691,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Hans" alt="stand-alone">Simplified Han</script>
 			<script type="Hant">Traditional</script>
 			<script type="Hant" alt="stand-alone">Traditional Han</script>
+			<script type="Hatr">Hatran</script>
 			<script type="Hebr">Hebrew</script>
 			<script type="Hira">Hiragana</script>
 			<script type="Hluw">Anatolian Hieroglyphs</script>
@@ -732,6 +738,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Moon">Moon</script>
 			<script type="Mroo">Mro</script>
 			<script type="Mtei">Meitei Mayek</script>
+			<script type="Mult">Multani</script>
 			<script type="Mymr">Myanmar</script>
 			<script type="Narb">Old North Arabian</script>
 			<script type="Nbat">Nabataean</script>
@@ -799,6 +806,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Yiii">Yi</script>
 			<script type="Zinh">Inherited</script>
 			<script type="Zmth">Mathematical Notation</script>
+			<script type="Zsye">Emoji</script>
 			<script type="Zsym">Symbols</script>
 			<script type="Zxxx">Unwritten</script>
 			<script type="Zyyy">Common</script>
@@ -844,7 +852,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Netherlands Antilles</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antarctica</territory>
 			<territory type="AR">Argentina</territory>
@@ -1117,8 +1124,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<variant type="1606NICT">Late Middle French to 1606</variant>
 			<variant type="1694ACAD">Early Modern French</variant>
 			<variant type="1959ACAD">Academic</variant>
+			<variant type="ABL1943">Orthographic formulation of 1943</variant>
 			<variant type="ALALC97">ALA-LC Romanization, 1997 edition</variant>
 			<variant type="ALUKU">Aluku dialect</variant>
+			<variant type="AO1990">Portuguese Language Orthographic Agreement of 1990</variant>
 			<variant type="AREVELA">Eastern Armenian</variant>
 			<variant type="AREVMDA">Western Armenian</variant>
 			<variant type="BAKU1926">Unified Turkic Latin Alphabet</variant>
@@ -1127,6 +1136,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<variant type="BISKE">San Giorgio/Bila dialect</variant>
 			<variant type="BOHORIC">Bohorič alphabet</variant>
 			<variant type="BOONT">Boontling</variant>
+			<variant type="COLB1945">Portuguese-Brazilian Orthographic Convention of 1945</variant>
 			<variant type="DAJNKO">Dajnko alphabet</variant>
 			<variant type="EKAVSK">Serbian with Ekavian pronunciation</variant>
 			<variant type="EMODENG">Early Modern English</variant>
@@ -1144,6 +1154,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<variant type="NJIVA">Gniva/Njiva dialect</variant>
 			<variant type="NULIK">Modern Volapük</variant>
 			<variant type="OSOJS">Oseacco/Osojane dialect</variant>
+			<variant type="OXENDICT">Oxford English Dictionary spelling</variant>
 			<variant type="PAMAKA">Pamaka dialect</variant>
 			<variant type="PINYIN">Pinyin Romanization</variant>
 			<variant type="POLYTON">Polytonic</variant>
@@ -1165,6 +1176,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</variants>
 		<keys>
 			<key type="calendar">Calendar</key>
+			<key type="cf">Currency Format</key>
 			<key type="colAlternate">Ignore Symbols Sorting</key>
 			<key type="colBackwards">Reversed Accent Sorting</key>
 			<key type="colCaseFirst">Uppercase/Lowercase Ordering</key>
@@ -1176,138 +1188,185 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colReorder">Script/Block Reordering</key>
 			<key type="colStrength">Sorting Strength</key>
 			<key type="currency">Currency</key>
+			<key type="em">Emoji Presentation Style</key>
+			<key type="fw">First day of week</key>
+			<key type="hc">Hour Cycle (12 vs 24)</key>
 			<key type="kv">Highest Ignored</key>
 			<key type="lb">Line Break Style</key>
+			<key type="lw">Line Breaks In Words Setting</key>
+			<key type="ms">Measurement System</key>
 			<key type="numbers">Numbers</key>
+			<key type="rg">Region For Supplemental Data</key>
+			<key type="sd">Region Subdivision</key>
+			<key type="ss">Sentence Break Suppressions Type</key>
 			<key type="timezone">Time Zone</key>
 			<key type="va">Locale Variant</key>
 			<key type="variableTop">Sort As Symbols</key>
 			<key type="x">Private-Use</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Arabic-Indic Digits</type>
-			<type type="arabext" key="numbers">Extended Arabic-Indic Digits</type>
-			<type type="arabext" key="numbers" alt="short">X Arabic-Indic Digits</type>
-			<type type="armn" key="numbers">Armenian Numerals</type>
-			<type type="armnlow" key="numbers">Armenian Lowercase Numerals</type>
-			<type type="bali" key="numbers">Balinese Digits</type>
-			<type type="beng" key="numbers">Bengali Digits</type>
-			<type type="big5han" key="collation">Traditional Chinese Sort Order - Big5</type>
-			<type type="brah" key="numbers">Brahmi Digits</type>
-			<type type="buddhist" key="calendar">Buddhist Calendar</type>
-			<type type="cakm" key="numbers">Chakma Digits</type>
-			<type type="cham" key="numbers">Cham Digits</type>
-			<type type="chinese" key="calendar">Chinese Calendar</type>
-			<type type="compat" key="collation">Previous Sort Order, for compatibility</type>
-			<type type="coptic" key="calendar">Coptic Calendar</type>
-			<type type="dangi" key="calendar">Dangi Calendar</type>
-			<type type="deva" key="numbers">Devanagari Digits</type>
-			<type type="dictionary" key="collation">Dictionary Sort Order</type>
-			<type type="ducet" key="collation">Default Unicode Sort Order</type>
-			<type type="emoji" key="collation">Emoji Sort Order</type>
-			<type type="eor" key="collation">European Ordering Rules</type>
-			<type type="ethi" key="numbers">Ethiopic Numerals</type>
-			<type type="ethiopic" key="calendar">Ethiopic Calendar</type>
-			<type type="ethiopic-amete-alem" key="calendar">Ethiopic Amete Alem Calendar</type>
-			<type type="finance" key="numbers">Financial Numerals</type>
-			<type type="fullwide" key="numbers">Full-Width Digits</type>
-			<type type="gb2312han" key="collation">Simplified Chinese Sort Order - GB2312</type>
-			<type type="geor" key="numbers">Georgian Numerals</type>
-			<type type="gregorian" key="calendar">Gregorian Calendar</type>
-			<type type="grek" key="numbers">Greek Numerals</type>
-			<type type="greklow" key="numbers">Greek Lowercase Numerals</type>
-			<type type="gujr" key="numbers">Gujarati Digits</type>
-			<type type="guru" key="numbers">Gurmukhi Digits</type>
-			<type type="hanidays" key="numbers">Chinese Calendar Day-of-Month Numerals</type>
-			<type type="hanidec" key="numbers">Chinese Decimal Numerals</type>
-			<type type="hans" key="numbers">Simplified Chinese Numerals</type>
-			<type type="hansfin" key="numbers">Simplified Chinese Financial Numerals</type>
-			<type type="hant" key="numbers">Traditional Chinese Numerals</type>
-			<type type="hantfin" key="numbers">Traditional Chinese Financial Numerals</type>
-			<type type="hebr" key="numbers">Hebrew Numerals</type>
-			<type type="hebrew" key="calendar">Hebrew Calendar</type>
-			<type type="identical" key="colStrength">Sort All</type>
-			<type type="indian" key="calendar">Indian National Calendar</type>
-			<type type="islamic" key="calendar">Islamic Calendar</type>
-			<type type="islamic-civil" key="calendar">Islamic Calendar (tabular, civil epoch)</type>
-			<type type="islamic-rgsa" key="calendar">Islamic Calendar (Saudi Arabia, sighting)</type>
-			<type type="islamic-tbla" key="calendar">Islamic Calendar (tabular, astronomical epoch)</type>
-			<type type="islamic-umalqura" key="calendar">Islamic Calendar (Umm al-Qura)</type>
-			<type type="iso8601" key="calendar">ISO-8601 Calendar</type>
-			<type type="japanese" key="calendar">Japanese Calendar</type>
-			<type type="java" key="numbers">Javanese Digits</type>
-			<type type="jpan" key="numbers">Japanese Numerals</type>
-			<type type="jpanfin" key="numbers">Japanese Financial Numerals</type>
-			<type type="kali" key="numbers">Kayah Li Digits</type>
-			<type type="khmr" key="numbers">Khmer Digits</type>
-			<type type="knda" key="numbers">Kannada Digits</type>
-			<type type="lana" key="numbers">Tai Tham Hora Digits</type>
-			<type type="lanatham" key="numbers">Tai Tham Tham Digits</type>
-			<type type="laoo" key="numbers">Lao Digits</type>
-			<type type="latn" key="numbers">Western Digits</type>
-			<type type="lepc" key="numbers">Lepcha Digits</type>
-			<type type="limb" key="numbers">Limbu Digits</type>
-			<type type="loose" key="lb">Loose Line Break Style</type>
-			<type type="lower" key="colCaseFirst">Sort Lowercase First</type>
-			<type type="mlym" key="numbers">Malayalam Digits</type>
-			<type type="mong" key="numbers">Mongolian Digits</type>
-			<type type="mtei" key="numbers">Meetei Mayek Digits</type>
-			<type type="mymr" key="numbers">Myanmar Digits</type>
-			<type type="mymrshan" key="numbers">Myanmar Shan Digits</type>
-			<type type="native" key="numbers">Native Digits</type>
-			<type type="nkoo" key="numbers">N’Ko Digits</type>
-			<type type="no" key="colBackwards">Sort Accents Normally</type>
-			<type type="no" key="colCaseFirst">Sort Normal Case Order</type>
-			<type type="no" key="colCaseLevel">Sort Case Insensitive</type>
-			<type type="no" key="colHiraganaQuaternary">Sort Kana Separately</type>
-			<type type="no" key="colNormalization">Sort Without Normalization</type>
-			<type type="no" key="colNumeric">Sort Digits Individually</type>
-			<type type="non-ignorable" key="colAlternate">Sort Symbols</type>
-			<type type="normal" key="lb">Normal Line Break Style</type>
-			<type type="olck" key="numbers">Ol Chiki Digits</type>
-			<type type="orya" key="numbers">Oriya Digits</type>
-			<type type="osma" key="numbers">Osmanya Digits</type>
-			<type type="persian" key="calendar">Persian Calendar</type>
-			<type type="phonebook" key="collation">Phonebook Sort Order</type>
-			<type type="phonetic" key="collation">Phonetic Sort Order</type>
-			<type type="pinyin" key="collation">Pinyin Sort Order</type>
-			<type type="posix" key="va">POSIX Compliant Locale</type>
-			<type type="primary" key="colStrength">Sort Base Letters Only</type>
-			<type type="quaternary" key="colStrength">Sort Accents/Case/Width/Kana</type>
-			<type type="reformed" key="collation">Reformed Sort Order</type>
-			<type type="roc" key="calendar">Minguo Calendar</type>
-			<type type="roman" key="numbers">Roman Numerals</type>
-			<type type="romanlow" key="numbers">Roman Lowercase Numerals</type>
-			<type type="saur" key="numbers">Saurashtra Digits</type>
-			<type type="search" key="collation">General-Purpose Search</type>
-			<type type="searchjl" key="collation">Search By Hangul Initial Consonant</type>
-			<type type="secondary" key="colStrength">Sort Accents</type>
-			<type type="shifted" key="colAlternate">Sort Ignoring Symbols</type>
-			<type type="shrd" key="numbers">Sharada Digits</type>
-			<type type="sora" key="numbers">Sora Sompeng Digits</type>
-			<type type="standard" key="collation">Standard Sort Order</type>
-			<type type="strict" key="lb">Strict Line Break Style</type>
-			<type type="stroke" key="collation">Stroke Sort Order</type>
-			<type type="sund" key="numbers">Sundanese Digits</type>
-			<type type="takr" key="numbers">Takri Digits</type>
-			<type type="talu" key="numbers">New Tai Lue Digits</type>
-			<type type="taml" key="numbers">Traditional Tamil Numerals</type>
-			<type type="tamldec" key="numbers">Tamil Digits</type>
-			<type type="telu" key="numbers">Telugu Digits</type>
-			<type type="tertiary" key="colStrength">Sort Accents/Case/Width</type>
-			<type type="thai" key="numbers">Thai Digits</type>
-			<type type="tibt" key="numbers">Tibetan Digits</type>
-			<type type="traditional" key="collation">Traditional Sort Order</type>
-			<type type="traditional" key="numbers">Traditional Numerals</type>
-			<type type="unihan" key="collation">Radical-Stroke Sort Order</type>
-			<type type="upper" key="colCaseFirst">Sort Uppercase First</type>
-			<type type="vaii" key="numbers">Vai Digits</type>
-			<type type="yes" key="colBackwards">Sort Accents Reversed</type>
-			<type type="yes" key="colCaseLevel">Sort Case Sensitive</type>
-			<type type="yes" key="colHiraganaQuaternary">Sort Kana Differently</type>
-			<type type="yes" key="colNormalization">Sort Unicode Normalized</type>
-			<type type="yes" key="colNumeric">Sort Digits Numerically</type>
-			<type type="zhuyin" key="collation">Zhuyin Sort Order</type>
+			<type key="calendar" type="buddhist">Buddhist Calendar</type>
+			<type key="calendar" type="chinese">Chinese Calendar</type>
+			<type key="calendar" type="coptic">Coptic Calendar</type>
+			<type key="calendar" type="dangi">Dangi Calendar</type>
+			<type key="calendar" type="ethiopic">Ethiopic Calendar</type>
+			<type key="calendar" type="ethiopic-amete-alem">Ethiopic Amete Alem Calendar</type>
+			<type key="calendar" type="gregorian">Gregorian Calendar</type>
+			<type key="calendar" type="hebrew">Hebrew Calendar</type>
+			<type key="calendar" type="indian">Indian National Calendar</type>
+			<type key="calendar" type="islamic">Islamic Calendar</type>
+			<type key="calendar" type="islamic-civil">Islamic Calendar (tabular, civil epoch)</type>
+			<type key="calendar" type="islamic-rgsa">Islamic Calendar (Saudi Arabia, sighting)</type>
+			<type key="calendar" type="islamic-tbla">Islamic Calendar (tabular, astronomical epoch)</type>
+			<type key="calendar" type="islamic-umalqura">Islamic Calendar (Umm al-Qura)</type>
+			<type key="calendar" type="iso8601">ISO-8601 Calendar</type>
+			<type key="calendar" type="japanese">Japanese Calendar</type>
+			<type key="calendar" type="persian">Persian Calendar</type>
+			<type key="calendar" type="roc">Minguo Calendar</type>
+			<type key="cf" type="account">Accounting Currency Format</type>
+			<type key="cf" type="standard">Standard Currency Format</type>
+			<type key="colAlternate" type="non-ignorable">Sort Symbols</type>
+			<type key="colAlternate" type="shifted">Sort Ignoring Symbols</type>
+			<type key="colBackwards" type="no">Sort Accents Normally</type>
+			<type key="colBackwards" type="yes">Sort Accents Reversed</type>
+			<type key="colCaseFirst" type="lower">Sort Lowercase First</type>
+			<type key="colCaseFirst" type="no">Sort Normal Case Order</type>
+			<type key="colCaseFirst" type="upper">Sort Uppercase First</type>
+			<type key="colCaseLevel" type="no">Sort Case Insensitive</type>
+			<type key="colCaseLevel" type="yes">Sort Case Sensitive</type>
+			<type key="colHiraganaQuaternary" type="no">Sort Kana Separately</type>
+			<type key="colHiraganaQuaternary" type="yes">Sort Kana Differently</type>
+			<type key="collation" type="big5han">Traditional Chinese Sort Order - Big5</type>
+			<type key="collation" type="compat">Previous Sort Order, for compatibility</type>
+			<type key="collation" type="dictionary">Dictionary Sort Order</type>
+			<type key="collation" type="ducet">Default Unicode Sort Order</type>
+			<type key="collation" type="emoji">Emoji Sort Order</type>
+			<type key="collation" type="eor">European Ordering Rules</type>
+			<type key="collation" type="gb2312han">Simplified Chinese Sort Order - GB2312</type>
+			<type key="collation" type="phonebook">Phonebook Sort Order</type>
+			<type key="collation" type="phonetic">Phonetic Sort Order</type>
+			<type key="collation" type="pinyin">Pinyin Sort Order</type>
+			<type key="collation" type="reformed">Reformed Sort Order</type>
+			<type key="collation" type="search">General-Purpose Search</type>
+			<type key="collation" type="searchjl">Search By Hangul Initial Consonant</type>
+			<type key="collation" type="standard">Standard Sort Order</type>
+			<type key="collation" type="stroke">Stroke Sort Order</type>
+			<type key="collation" type="traditional">Traditional Sort Order</type>
+			<type key="collation" type="unihan">Radical-Stroke Sort Order</type>
+			<type key="collation" type="zhuyin">Zhuyin Sort Order</type>
+			<type key="colNormalization" type="no">Sort Without Normalization</type>
+			<type key="colNormalization" type="yes">Sort Unicode Normalized</type>
+			<type key="colNumeric" type="no">Sort Digits Individually</type>
+			<type key="colNumeric" type="yes">Sort Digits Numerically</type>
+			<type key="colStrength" type="identical">Sort All</type>
+			<type key="colStrength" type="primary">Sort Base Letters Only</type>
+			<type key="colStrength" type="quaternary">Sort Accents/Case/Width/Kana</type>
+			<type key="colStrength" type="secondary">Sort Accents</type>
+			<type key="colStrength" type="tertiary">Sort Accents/Case/Width</type>
+			<type key="em" type="default">Use Default Presentation For Emoji Characters</type>
+			<type key="em" type="emoji">Prefer Emoji Presentation For Emoji Characters</type>
+			<type key="em" type="text">Prefer Text Presentation For Emoji Characters</type>
+			<type key="fw" type="fri">First Day of Week Is Friday</type>
+			<type key="fw" type="mon">First Day of Week Is Monday</type>
+			<type key="fw" type="sat">First Day of Week Is Saturday</type>
+			<type key="fw" type="sun">First Day of Week Is Sunday</type>
+			<type key="fw" type="thu">First Day of Week Is Thursday</type>
+			<type key="fw" type="tue">First Day of Week Is Tuesday</type>
+			<type key="fw" type="wed">First Day of Week Is Wednesday</type>
+			<type key="hc" type="h11">12 Hour System (0–11)</type>
+			<type key="hc" type="h12">12 Hour System (1–12)</type>
+			<type key="hc" type="h23">24 Hour System (0–23)</type>
+			<type key="hc" type="h24">24 Hour System (1–24)</type>
+			<type key="lb" type="loose">Loose Line Break Style</type>
+			<type key="lb" type="normal">Normal Line Break Style</type>
+			<type key="lb" type="strict">Strict Line Break Style</type>
+			<type key="lw" type="breakall">Allow Line Breaks In All Words</type>
+			<type key="lw" type="keepall">Prevent Line Breaks In All Words</type>
+			<type key="lw" type="normal">Normal Line Breaks For Words</type>
+			<type key="ms" type="metric">Metric System</type>
+			<type key="ms" type="uksystem">Imperial Measurement System</type>
+			<type key="ms" type="ussystem">US Measurement System</type>
+			<type key="numbers" type="ahom">Ahom Digits</type>
+			<type key="numbers" type="arab">Arabic-Indic Digits</type>
+			<type key="numbers" type="arabext">Extended Arabic-Indic Digits</type>
+			<type key="numbers" type="arabext" alt="short">X Arabic-Indic Digits</type>
+			<type key="numbers" type="armn">Armenian Numerals</type>
+			<type key="numbers" type="armnlow">Armenian Lowercase Numerals</type>
+			<type key="numbers" type="bali">Balinese Digits</type>
+			<type key="numbers" type="beng">Bengali Digits</type>
+			<type key="numbers" type="brah">Brahmi Digits</type>
+			<type key="numbers" type="cakm">Chakma Digits</type>
+			<type key="numbers" type="cham">Cham Digits</type>
+			<type key="numbers" type="cyrl">Cyrillic Numerals</type>
+			<type key="numbers" type="deva">Devanagari Digits</type>
+			<type key="numbers" type="ethi">Ethiopic Numerals</type>
+			<type key="numbers" type="finance">Financial Numerals</type>
+			<type key="numbers" type="fullwide">Full-Width Digits</type>
+			<type key="numbers" type="geor">Georgian Numerals</type>
+			<type key="numbers" type="grek">Greek Numerals</type>
+			<type key="numbers" type="greklow">Greek Lowercase Numerals</type>
+			<type key="numbers" type="gujr">Gujarati Digits</type>
+			<type key="numbers" type="guru">Gurmukhi Digits</type>
+			<type key="numbers" type="hanidays">Chinese Calendar Day-of-Month Numerals</type>
+			<type key="numbers" type="hanidec">Chinese Decimal Numerals</type>
+			<type key="numbers" type="hans">Simplified Chinese Numerals</type>
+			<type key="numbers" type="hansfin">Simplified Chinese Financial Numerals</type>
+			<type key="numbers" type="hant">Traditional Chinese Numerals</type>
+			<type key="numbers" type="hantfin">Traditional Chinese Financial Numerals</type>
+			<type key="numbers" type="hebr">Hebrew Numerals</type>
+			<type key="numbers" type="hmng">Pahawh Hmong Digits</type>
+			<type key="numbers" type="java">Javanese Digits</type>
+			<type key="numbers" type="jpan">Japanese Numerals</type>
+			<type key="numbers" type="jpanfin">Japanese Financial Numerals</type>
+			<type key="numbers" type="kali">Kayah Li Digits</type>
+			<type key="numbers" type="khmr">Khmer Digits</type>
+			<type key="numbers" type="knda">Kannada Digits</type>
+			<type key="numbers" type="lana">Tai Tham Hora Digits</type>
+			<type key="numbers" type="lanatham">Tai Tham Tham Digits</type>
+			<type key="numbers" type="laoo">Lao Digits</type>
+			<type key="numbers" type="latn">Western Digits</type>
+			<type key="numbers" type="lepc">Lepcha Digits</type>
+			<type key="numbers" type="limb">Limbu Digits</type>
+			<type key="numbers" type="mathbold">Mathematical Bold Digits</type>
+			<type key="numbers" type="mathdbl">Mathematical Double-Struck Digits</type>
+			<type key="numbers" type="mathmono">Mathematical Monospace Digits</type>
+			<type key="numbers" type="mathsanb">Mathematical Sans-Serif Bold Digits</type>
+			<type key="numbers" type="mathsans">Mathematical Sans-Serif Digits</type>
+			<type key="numbers" type="mlym">Malayalam Digits</type>
+			<type key="numbers" type="modi">Modi Digits</type>
+			<type key="numbers" type="mong">Mongolian Digits</type>
+			<type key="numbers" type="mroo">Mro Digits</type>
+			<type key="numbers" type="mtei">Meetei Mayek Digits</type>
+			<type key="numbers" type="mymr">Myanmar Digits</type>
+			<type key="numbers" type="mymrshan">Myanmar Shan Digits</type>
+			<type key="numbers" type="mymrtlng">Myanmar Tai Laing Digits</type>
+			<type key="numbers" type="native">Native Digits</type>
+			<type key="numbers" type="nkoo">N’Ko Digits</type>
+			<type key="numbers" type="olck">Ol Chiki Digits</type>
+			<type key="numbers" type="orya">Oriya Digits</type>
+			<type key="numbers" type="osma">Osmanya Digits</type>
+			<type key="numbers" type="roman">Roman Numerals</type>
+			<type key="numbers" type="romanlow">Roman Lowercase Numerals</type>
+			<type key="numbers" type="saur">Saurashtra Digits</type>
+			<type key="numbers" type="shrd">Sharada Digits</type>
+			<type key="numbers" type="sind">Khudawadi Digits</type>
+			<type key="numbers" type="sinh">Sinhala Lith Digits</type>
+			<type key="numbers" type="sora">Sora Sompeng Digits</type>
+			<type key="numbers" type="sund">Sundanese Digits</type>
+			<type key="numbers" type="takr">Takri Digits</type>
+			<type key="numbers" type="talu">New Tai Lue Digits</type>
+			<type key="numbers" type="taml">Traditional Tamil Numerals</type>
+			<type key="numbers" type="tamldec">Tamil Digits</type>
+			<type key="numbers" type="telu">Telugu Digits</type>
+			<type key="numbers" type="thai">Thai Digits</type>
+			<type key="numbers" type="tibt">Tibetan Digits</type>
+			<type key="numbers" type="tirh">Tirhuta Digits</type>
+			<type key="numbers" type="traditional">Traditional Numerals</type>
+			<type key="numbers" type="vaii">Vai Digits</type>
+			<type key="numbers" type="wara">Warang Citi Digits</type>
+			<type key="ss" type="none">Sentence Breaks Without Abbreviation Handling</type>
+			<type key="ss" type="standard">Suppress Sentence Breaks After Standard Abbreviations</type>
+			<type key="va" type="posix">POSIX Compliant Locale</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN">BGN</transformName>
@@ -1389,18 +1448,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="12">Mo12</month>
 						</monthWidth>
 						<monthWidth type="wide">
-							<month type="1">Month1</month>
-							<month type="2">Month2</month>
-							<month type="3">Month3</month>
-							<month type="4">Month4</month>
-							<month type="5">Month5</month>
-							<month type="6">Month6</month>
-							<month type="7">Month7</month>
-							<month type="8">Month8</month>
-							<month type="9">Month9</month>
-							<month type="10">Month10</month>
-							<month type="11">Month11</month>
-							<month type="12">Month12</month>
+							<month type="1">First Month</month>
+							<month type="2">Second Month</month>
+							<month type="3">Third Month</month>
+							<month type="4">Fourth Month</month>
+							<month type="5">Fifth Month</month>
+							<month type="6">Sixth Month</month>
+							<month type="7">Seventh Month</month>
+							<month type="8">Eighth Month</month>
+							<month type="9">Ninth Month</month>
+							<month type="10">Tenth Month</month>
+							<month type="11">Eleventh Month</month>
+							<month type="12">Twelfth Month</month>
 						</monthWidth>
 					</monthContext>
 				</months>
@@ -1491,6 +1550,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="UM">M/U</dateFormatItem>
 						<dateFormatItem id="UMd">M/d/U</dateFormatItem>
@@ -1505,6 +1565,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">MMM r(U)</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">MMM d, r</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E, MMM d, r(U)</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">MMMM r(U)</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">QQQ r(U)</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">QQQQ r(U)</dateFormatItem>
 					</availableFormats>
@@ -1673,6 +1734,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
@@ -1682,6 +1744,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">MMM d, y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E, MMM d, y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">MMMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
 					</availableFormats>
@@ -1912,17 +1975,51 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">a</dayPeriod>
-							<dayPeriod type="noon">n</dayPeriod>
-							<dayPeriod type="pm">p</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">midnight</dayPeriod>
 							<dayPeriod type="am">AM</dayPeriod>
 							<dayPeriod type="am" alt="variant">am</dayPeriod>
 							<dayPeriod type="noon">noon</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
 							<dayPeriod type="pm" alt="variant">pm</dayPeriod>
+							<dayPeriod type="morning1">in the morning</dayPeriod>
+							<dayPeriod type="afternoon1">in the afternoon</dayPeriod>
+							<dayPeriod type="evening1">in the evening</dayPeriod>
+							<dayPeriod type="night1">at night</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">mi</dayPeriod>
+							<dayPeriod type="am">a</dayPeriod>
+							<dayPeriod type="noon">n</dayPeriod>
+							<dayPeriod type="pm">p</dayPeriod>
+							<dayPeriod type="morning1">in the morning</dayPeriod>
+							<dayPeriod type="afternoon1">in the afternoon</dayPeriod>
+							<dayPeriod type="evening1">in the evening</dayPeriod>
+							<dayPeriod type="night1">at night</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">midnight</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="am" alt="variant">am</dayPeriod>
+							<dayPeriod type="noon">noon</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="pm" alt="variant">pm</dayPeriod>
+							<dayPeriod type="morning1">in the morning</dayPeriod>
+							<dayPeriod type="afternoon1">in the afternoon</dayPeriod>
+							<dayPeriod type="evening1">in the evening</dayPeriod>
+							<dayPeriod type="night1">at night</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">midnight</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">noon</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">morning</dayPeriod>
+							<dayPeriod type="afternoon1">afternoon</dayPeriod>
+							<dayPeriod type="evening1">evening</dayPeriod>
+							<dayPeriod type="night1">night</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -2037,6 +2134,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">M/y</dateFormatItem>
@@ -2045,6 +2143,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMd">MMM d, y</dateFormatItem>
 						<dateFormatItem id="yMMMEd">E, MMM d, y</dateFormatItem>
+						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
 						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
 					</availableFormats>
@@ -2198,6 +2297,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">MMM y</dateFormatItem>
 						<dateFormatItem id="yMd">d MMM y</dateFormatItem>
@@ -2205,6 +2305,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMEd">E, d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
 						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
 					</availableFormats>
@@ -2314,10 +2415,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</calendars>
 		<fields>
 			<field type="era">
-				<displayName>Era</displayName>
+				<displayName>era</displayName>
 			</field>
 			<field type="year">
-				<displayName>Year</displayName>
+				<displayName>year</displayName>
 				<relative type="-1">last year</relative>
 				<relative type="0">this year</relative>
 				<relative type="1">next year</relative>
@@ -2345,7 +2446,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="quarter">
-				<displayName>Quarter</displayName>
+				<displayName>quarter</displayName>
 				<relative type="-1">last quarter</relative>
 				<relative type="0">this quarter</relative>
 				<relative type="1">next quarter</relative>
@@ -2373,7 +2474,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="month">
-				<displayName>Month</displayName>
+				<displayName>month</displayName>
 				<relative type="-1">last month</relative>
 				<relative type="0">this month</relative>
 				<relative type="1">next month</relative>
@@ -2401,7 +2502,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="week">
-				<displayName>Week</displayName>
+				<displayName>week</displayName>
 				<relative type="-1">last week</relative>
 				<relative type="0">this week</relative>
 				<relative type="1">next week</relative>
@@ -2429,7 +2530,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day">
-				<displayName>Day</displayName>
+				<displayName>day</displayName>
 				<relative type="-1">yesterday</relative>
 				<relative type="0">today</relative>
 				<relative type="1">tomorrow</relative>
@@ -2444,9 +2545,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>day</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">in {0} day</relativeTimePattern>
+					<relativeTimePattern count="other">in {0} days</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} day ago</relativeTimePattern>
+					<relativeTimePattern count="other">{0} days ago</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="weekday">
-				<displayName>Day of the Week</displayName>
+				<displayName>day of the week</displayName>
 			</field>
 			<field type="sun">
 				<relative type="-1">last Sunday</relative>
@@ -2558,7 +2667,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName alt="variant">am/pm</displayName>
 			</field>
 			<field type="hour">
-				<displayName>Hour</displayName>
+				<displayName>hour</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">in {0} hour</relativeTimePattern>
 					<relativeTimePattern count="other">in {0} hours</relativeTimePattern>
@@ -2580,7 +2689,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="minute">
-				<displayName>Minute</displayName>
+				<displayName>minute</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">in {0} minute</relativeTimePattern>
 					<relativeTimePattern count="other">in {0} minutes</relativeTimePattern>
@@ -2602,7 +2711,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="second">
-				<displayName>Second</displayName>
+				<displayName>second</displayName>
 				<relative type="0">now</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">in {0} second</relativeTimePattern>
@@ -2626,7 +2735,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>Time Zone</displayName>
+				<displayName>time zone</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
@@ -3492,6 +3601,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<standard>Ponape Time</standard>
 				</long>
 			</metazone>
+			<metazone type="Pyongyang">
+				<long>
+					<standard>Pyongyang Time</standard>
+				</long>
+			</metazone>
 			<metazone type="Qyzylorda">
 				<long>
 					<generic>Qyzylorda Time</generic>
@@ -3777,6 +3891,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">¤0K</pattern>
+					<pattern type="1000" count="other">¤0K</pattern>
+					<pattern type="10000" count="one">¤00K</pattern>
+					<pattern type="10000" count="other">¤00K</pattern>
+					<pattern type="100000" count="one">¤000K</pattern>
+					<pattern type="100000" count="other">¤000K</pattern>
+					<pattern type="1000000" count="one">¤0M</pattern>
+					<pattern type="1000000" count="other">¤0M</pattern>
+					<pattern type="10000000" count="one">¤00M</pattern>
+					<pattern type="10000000" count="other">¤00M</pattern>
+					<pattern type="100000000" count="one">¤000M</pattern>
+					<pattern type="100000000" count="other">¤000M</pattern>
+					<pattern type="1000000000" count="one">¤0B</pattern>
+					<pattern type="1000000000" count="other">¤0B</pattern>
+					<pattern type="10000000000" count="one">¤00B</pattern>
+					<pattern type="10000000000" count="other">¤00B</pattern>
+					<pattern type="100000000000" count="one">¤000B</pattern>
+					<pattern type="100000000000" count="other">¤000B</pattern>
+					<pattern type="1000000000000" count="one">¤0T</pattern>
+					<pattern type="1000000000000" count="other">¤0T</pattern>
+					<pattern type="10000000000000" count="one">¤00T</pattern>
+					<pattern type="10000000000000" count="other">¤00T</pattern>
+					<pattern type="100000000000000" count="one">¤000T</pattern>
+					<pattern type="100000000000000" count="other">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -5288,6 +5430,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} meter per second squared</unitPattern>
 				<unitPattern count="other">{0} meters per second squared</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>revolution</displayName>
+				<unitPattern count="one">{0} revolution</unitPattern>
+				<unitPattern count="other">{0} revolutions</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radians</displayName>
+				<unitPattern count="one">{0} radian</unitPattern>
+				<unitPattern count="other">{0} radians</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>degrees</displayName>
+				<unitPattern count="one">{0} degree</unitPattern>
+				<unitPattern count="other">{0} degrees</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>arcminutes</displayName>
 				<unitPattern count="one">{0} arcminute</unitPattern>
@@ -5298,30 +5455,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} arcsecond</unitPattern>
 				<unitPattern count="other">{0} arcseconds</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>degrees</displayName>
-				<unitPattern count="one">{0} degree</unitPattern>
-				<unitPattern count="other">{0} degrees</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radians</displayName>
-				<unitPattern count="one">{0} radian</unitPattern>
-				<unitPattern count="other">{0} radians</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>acres</displayName>
-				<unitPattern count="one">{0} acre</unitPattern>
-				<unitPattern count="other">{0} acres</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>square kilometers</displayName>
+				<unitPattern count="one">{0} square kilometer</unitPattern>
+				<unitPattern count="other">{0} square kilometers</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hectares</displayName>
 				<unitPattern count="one">{0} hectare</unitPattern>
 				<unitPattern count="other">{0} hectares</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>square meters</displayName>
+				<unitPattern count="one">{0} square meter</unitPattern>
+				<unitPattern count="other">{0} square meters</unitPattern>
+				<perUnitPattern>{0} per square meter</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>square centimeters</displayName>
 				<unitPattern count="one">{0} square centimeter</unitPattern>
 				<unitPattern count="other">{0} square centimeters</unitPattern>
+				<perUnitPattern>{0} per square centimeter</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>square miles</displayName>
+				<unitPattern count="one">{0} square mile</unitPattern>
+				<unitPattern count="other">{0} square miles</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acres</displayName>
+				<unitPattern count="one">{0} acre</unitPattern>
+				<unitPattern count="other">{0} acres</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>square yards</displayName>
+				<unitPattern count="one">{0} square yard</unitPattern>
+				<unitPattern count="other">{0} square yards</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>square feet</displayName>
@@ -5332,91 +5501,126 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>square inches</displayName>
 				<unitPattern count="one">{0} square inch</unitPattern>
 				<unitPattern count="other">{0} square inches</unitPattern>
+				<perUnitPattern>{0} per square inch</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>square kilometers</displayName>
-				<unitPattern count="one">{0} square kilometer</unitPattern>
-				<unitPattern count="other">{0} square kilometers</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karats</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="other">{0} karats</unitPattern>
 			</unit>
-			<unit type="area-square-meter">
-				<displayName>square meters</displayName>
-				<unitPattern count="one">{0} square meter</unitPattern>
-				<unitPattern count="other">{0} square meters</unitPattern>
+			<unit type="concentr-milligram-per-deciliter">
+				<displayName>milligrams per deciliter</displayName>
+				<unitPattern count="one">{0} milligram per deciliter</unitPattern>
+				<unitPattern count="other">{0} milligrams per deciliter</unitPattern>
 			</unit>
-			<unit type="area-square-mile">
-				<displayName>square miles</displayName>
-				<unitPattern count="one">{0} square mile</unitPattern>
-				<unitPattern count="other">{0} square miles</unitPattern>
+			<unit type="concentr-millimole-per-liter">
+				<displayName>millimoles per liter</displayName>
+				<unitPattern count="one">{0} millimole per liter</unitPattern>
+				<unitPattern count="other">{0} millimoles per liter</unitPattern>
 			</unit>
-			<unit type="area-square-yard">
-				<displayName>square yards</displayName>
-				<unitPattern count="one">{0} square yard</unitPattern>
-				<unitPattern count="other">{0} square yards</unitPattern>
+			<unit type="concentr-part-per-million">
+				<displayName>parts per million</displayName>
+				<unitPattern count="one">{0} part per million</unitPattern>
+				<unitPattern count="other">{0} parts per million</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liters per kilometer</displayName>
 				<unitPattern count="one">{0} liter per kilometer</unitPattern>
 				<unitPattern count="other">{0} liters per kilometer</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>liters per 100 kilometers</displayName>
+				<unitPattern count="one">{0} liter per 100 kilometers</unitPattern>
+				<unitPattern count="other">{0} liters per 100 kilometers</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>miles per gallon</displayName>
 				<unitPattern count="one">{0} mile per gallon</unitPattern>
 				<unitPattern count="other">{0} miles per gallon</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bits</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bits</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bytes</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} bytes</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabits</displayName>
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="other">{0} gigabits</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabytes</displayName>
-				<unitPattern count="one">{0} gigabyte</unitPattern>
-				<unitPattern count="other">{0} gigabytes</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobits</displayName>
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="other">{0} kilobits</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobytes</displayName>
-				<unitPattern count="one">{0} kilobyte</unitPattern>
-				<unitPattern count="other">{0} kilobytes</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabits</displayName>
-				<unitPattern count="one">{0} megabit</unitPattern>
-				<unitPattern count="other">{0} megabits</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabytes</displayName>
-				<unitPattern count="one">{0} megabyte</unitPattern>
-				<unitPattern count="other">{0} megabytes</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabits</displayName>
-				<unitPattern count="one">{0} terabit</unitPattern>
-				<unitPattern count="other">{0} terabits</unitPattern>
+			<unit type="consumption-mile-per-gallon-imperial">
+				<displayName>miles per Imp. gallon</displayName>
+				<unitPattern count="one">{0} mile per Imp. gallon</unitPattern>
+				<unitPattern count="other">{0} miles per Imp. gallon</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabytes</displayName>
 				<unitPattern count="one">{0} terabyte</unitPattern>
 				<unitPattern count="other">{0} terabytes</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabits</displayName>
+				<unitPattern count="one">{0} terabit</unitPattern>
+				<unitPattern count="other">{0} terabits</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabytes</displayName>
+				<unitPattern count="one">{0} gigabyte</unitPattern>
+				<unitPattern count="other">{0} gigabytes</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabits</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="other">{0} gigabits</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabytes</displayName>
+				<unitPattern count="one">{0} megabyte</unitPattern>
+				<unitPattern count="other">{0} megabytes</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabits</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="other">{0} megabits</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobytes</displayName>
+				<unitPattern count="one">{0} kilobyte</unitPattern>
+				<unitPattern count="other">{0} kilobytes</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobits</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="other">{0} kilobits</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bytes</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} bytes</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bits</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bits</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>centuries</displayName>
+				<unitPattern count="one">{0} century</unitPattern>
+				<unitPattern count="other">{0} centuries</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>years</displayName>
+				<unitPattern count="one">{0} year</unitPattern>
+				<unitPattern count="other">{0} years</unitPattern>
+				<perUnitPattern>{0} per year</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>months</displayName>
+				<unitPattern count="one">{0} month</unitPattern>
+				<unitPattern count="other">{0} months</unitPattern>
+				<perUnitPattern>{0} per month</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>weeks</displayName>
+				<unitPattern count="one">{0} week</unitPattern>
+				<unitPattern count="other">{0} weeks</unitPattern>
+				<perUnitPattern>{0} per week</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>days</displayName>
 				<unitPattern count="one">{0} day</unitPattern>
 				<unitPattern count="other">{0} days</unitPattern>
+				<perUnitPattern>{0} per day</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>hours</displayName>
@@ -5424,30 +5628,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} hours</unitPattern>
 				<perUnitPattern>{0} per hour</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>microseconds</displayName>
-				<unitPattern count="one">{0} microsecond</unitPattern>
-				<unitPattern count="other">{0} microseconds</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milliseconds</displayName>
-				<unitPattern count="one">{0} millisecond</unitPattern>
-				<unitPattern count="other">{0} milliseconds</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>minutes</displayName>
 				<unitPattern count="one">{0} minute</unitPattern>
 				<unitPattern count="other">{0} minutes</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>months</displayName>
-				<unitPattern count="one">{0} month</unitPattern>
-				<unitPattern count="other">{0} months</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanoseconds</displayName>
-				<unitPattern count="one">{0} nanosecond</unitPattern>
-				<unitPattern count="other">{0} nanoseconds</unitPattern>
+				<perUnitPattern>{0} per minute</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>seconds</displayName>
@@ -5455,15 +5640,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} seconds</unitPattern>
 				<perUnitPattern>{0} per second</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>weeks</displayName>
-				<unitPattern count="one">{0} week</unitPattern>
-				<unitPattern count="other">{0} weeks</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milliseconds</displayName>
+				<unitPattern count="one">{0} millisecond</unitPattern>
+				<unitPattern count="other">{0} milliseconds</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>years</displayName>
-				<unitPattern count="one">{0} year</unitPattern>
-				<unitPattern count="other">{0} years</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>microseconds</displayName>
+				<unitPattern count="one">{0} microsecond</unitPattern>
+				<unitPattern count="other">{0} microseconds</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanoseconds</displayName>
+				<unitPattern count="one">{0} nanosecond</unitPattern>
+				<unitPattern count="other">{0} nanoseconds</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amperes</displayName>
@@ -5485,6 +5675,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} volt</unitPattern>
 				<unitPattern count="other">{0} volts</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilocalories</displayName>
+				<unitPattern count="one">{0} kilocalorie</unitPattern>
+				<unitPattern count="other">{0} kilocalories</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>calories</displayName>
 				<unitPattern count="one">{0} calorie</unitPattern>
@@ -5495,21 +5690,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Calorie</unitPattern>
 				<unitPattern count="other">{0} Calories</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joules</displayName>
-				<unitPattern count="one">{0} joule</unitPattern>
-				<unitPattern count="other">{0} joules</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilocalories</displayName>
-				<unitPattern count="one">{0} kilocalorie</unitPattern>
-				<unitPattern count="other">{0} kilocalories</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojoules</displayName>
 				<unitPattern count="one">{0} kilojoule</unitPattern>
 				<unitPattern count="other">{0} kilojoules</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joules</displayName>
+				<unitPattern count="one">{0} joule</unitPattern>
+				<unitPattern count="other">{0} joules</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilowatt-hours</displayName>
 				<unitPattern count="one">{0} kilowatt hour</unitPattern>
@@ -5520,216 +5710,220 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} gigahertz</unitPattern>
 				<unitPattern count="other">{0} gigahertz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hertz</displayName>
-				<unitPattern count="one">{0} hertz</unitPattern>
-				<unitPattern count="other">{0} hertz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megahertz</displayName>
+				<unitPattern count="one">{0} megahertz</unitPattern>
+				<unitPattern count="other">{0} megahertz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kilohertz</displayName>
 				<unitPattern count="one">{0} kilohertz</unitPattern>
 				<unitPattern count="other">{0} kilohertz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megahertz</displayName>
-				<unitPattern count="one">{0} megahertz</unitPattern>
-				<unitPattern count="other">{0} megahertz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hertz</displayName>
+				<unitPattern count="one">{0} hertz</unitPattern>
+				<unitPattern count="other">{0} hertz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>astronomical units</displayName>
-				<unitPattern count="one">{0} astronomical unit</unitPattern>
-				<unitPattern count="other">{0} astronomical units</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometers</displayName>
+				<unitPattern count="one">{0} kilometer</unitPattern>
+				<unitPattern count="other">{0} kilometers</unitPattern>
+				<perUnitPattern>{0} per kilometer</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>centimeters</displayName>
-				<unitPattern count="one">{0} centimeter</unitPattern>
-				<unitPattern count="other">{0} centimeters</unitPattern>
+			<unit type="length-meter">
+				<displayName>meters</displayName>
+				<unitPattern count="one">{0} meter</unitPattern>
+				<unitPattern count="other">{0} meters</unitPattern>
+				<perUnitPattern>{0} per meter</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>decimeters</displayName>
 				<unitPattern count="one">{0} decimeter</unitPattern>
 				<unitPattern count="other">{0} decimeters</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName>fathoms</displayName>
-				<unitPattern count="one">{0} fathom</unitPattern>
-				<unitPattern count="other">{0} fathoms</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>feet</displayName>
-				<unitPattern count="one">{0} foot</unitPattern>
-				<unitPattern count="other">{0} feet</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>furlongs</displayName>
-				<unitPattern count="one">{0} furlong</unitPattern>
-				<unitPattern count="other">{0} furlongs</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>inches</displayName>
-				<unitPattern count="one">{0} inch</unitPattern>
-				<unitPattern count="other">{0} inches</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometers</displayName>
-				<unitPattern count="one">{0} kilometer</unitPattern>
-				<unitPattern count="other">{0} kilometers</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>light years</displayName>
-				<unitPattern count="one">{0} light year</unitPattern>
-				<unitPattern count="other">{0} light years</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>meters</displayName>
-				<unitPattern count="one">{0} meter</unitPattern>
-				<unitPattern count="other">{0} meters</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>micrometers</displayName>
-				<unitPattern count="one">{0} micrometer</unitPattern>
-				<unitPattern count="other">{0} micrometers</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>miles</displayName>
-				<unitPattern count="one">{0} mile</unitPattern>
-				<unitPattern count="other">{0} miles</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>centimeters</displayName>
+				<unitPattern count="one">{0} centimeter</unitPattern>
+				<unitPattern count="other">{0} centimeters</unitPattern>
+				<perUnitPattern>{0} per centimeter</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>millimeters</displayName>
 				<unitPattern count="one">{0} millimeter</unitPattern>
 				<unitPattern count="other">{0} millimeters</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>micrometers</displayName>
+				<unitPattern count="one">{0} micrometer</unitPattern>
+				<unitPattern count="other">{0} micrometers</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanometers</displayName>
 				<unitPattern count="one">{0} nanometer</unitPattern>
 				<unitPattern count="other">{0} nanometers</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nautical miles</displayName>
-				<unitPattern count="one">{0} nautical mile</unitPattern>
-				<unitPattern count="other">{0} nautical miles</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsecs</displayName>
-				<unitPattern count="one">{0} parsec</unitPattern>
-				<unitPattern count="other">{0} parsecs</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>picometers</displayName>
 				<unitPattern count="one">{0} picometer</unitPattern>
 				<unitPattern count="other">{0} picometers</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>miles</displayName>
+				<unitPattern count="one">{0} mile</unitPattern>
+				<unitPattern count="other">{0} miles</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yards</displayName>
 				<unitPattern count="one">{0} yard</unitPattern>
 				<unitPattern count="other">{0} yards</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>feet</displayName>
+				<unitPattern count="one">{0} foot</unitPattern>
+				<unitPattern count="other">{0} feet</unitPattern>
+				<perUnitPattern>{0} per foot</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>inches</displayName>
+				<unitPattern count="one">{0} inch</unitPattern>
+				<unitPattern count="other">{0} inches</unitPattern>
+				<perUnitPattern>{0} per inch</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsecs</displayName>
+				<unitPattern count="one">{0} parsec</unitPattern>
+				<unitPattern count="other">{0} parsecs</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>light years</displayName>
+				<unitPattern count="one">{0} light year</unitPattern>
+				<unitPattern count="other">{0} light years</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>astronomical units</displayName>
+				<unitPattern count="one">{0} astronomical unit</unitPattern>
+				<unitPattern count="other">{0} astronomical units</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>furlongs</displayName>
+				<unitPattern count="one">{0} furlong</unitPattern>
+				<unitPattern count="other">{0} furlongs</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>fathoms</displayName>
+				<unitPattern count="one">{0} fathom</unitPattern>
+				<unitPattern count="other">{0} fathoms</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nautical miles</displayName>
+				<unitPattern count="one">{0} nautical mile</unitPattern>
+				<unitPattern count="other">{0} nautical miles</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>mile-scandinavian</displayName>
+				<unitPattern count="one">{0} mile-scandinavian</unitPattern>
+				<unitPattern count="other">{0} miles-scandinavian</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>carats</displayName>
-				<unitPattern count="one">{0} carat</unitPattern>
-				<unitPattern count="other">{0} carats</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>grams</displayName>
-				<unitPattern count="one">{0} gram</unitPattern>
-				<unitPattern count="other">{0} grams</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilograms</displayName>
-				<unitPattern count="one">{0} kilogram</unitPattern>
-				<unitPattern count="other">{0} kilograms</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>metric tons</displayName>
 				<unitPattern count="one">{0} metric ton</unitPattern>
 				<unitPattern count="other">{0} metric tons</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>micrograms</displayName>
-				<unitPattern count="one">{0} microgram</unitPattern>
-				<unitPattern count="other">{0} micrograms</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilograms</displayName>
+				<unitPattern count="one">{0} kilogram</unitPattern>
+				<unitPattern count="other">{0} kilograms</unitPattern>
+				<perUnitPattern>{0} per kilogram</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>grams</displayName>
+				<unitPattern count="one">{0} gram</unitPattern>
+				<unitPattern count="other">{0} grams</unitPattern>
+				<perUnitPattern>{0} per gram</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>milligrams</displayName>
 				<unitPattern count="one">{0} milligram</unitPattern>
 				<unitPattern count="other">{0} milligrams</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ounces</displayName>
-				<unitPattern count="one">{0} ounce</unitPattern>
-				<unitPattern count="other">{0} ounces</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>troy ounces</displayName>
-				<unitPattern count="one">{0} troy ounce</unitPattern>
-				<unitPattern count="other">{0} troy ounces</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>pounds</displayName>
-				<unitPattern count="one">{0} pound</unitPattern>
-				<unitPattern count="other">{0} pounds</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>stones</displayName>
-				<unitPattern count="one">{0} stone</unitPattern>
-				<unitPattern count="other">{0} stones</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>micrograms</displayName>
+				<unitPattern count="one">{0} microgram</unitPattern>
+				<unitPattern count="other">{0} micrograms</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tons</displayName>
 				<unitPattern count="one">{0} ton</unitPattern>
 				<unitPattern count="other">{0} tons</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName>stones</displayName>
+				<unitPattern count="one">{0} stone</unitPattern>
+				<unitPattern count="other">{0} stones</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>pounds</displayName>
+				<unitPattern count="one">{0} pound</unitPattern>
+				<unitPattern count="other">{0} pounds</unitPattern>
+				<perUnitPattern>{0} per pound</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ounces</displayName>
+				<unitPattern count="one">{0} ounce</unitPattern>
+				<unitPattern count="other">{0} ounces</unitPattern>
+				<perUnitPattern>{0} per ounce</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>troy ounces</displayName>
+				<unitPattern count="one">{0} troy ounce</unitPattern>
+				<unitPattern count="other">{0} troy ounces</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>carats</displayName>
+				<unitPattern count="one">{0} carat</unitPattern>
+				<unitPattern count="other">{0} carats</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigawatts</displayName>
 				<unitPattern count="one">{0} gigawatt</unitPattern>
 				<unitPattern count="other">{0} gigawatts</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>horsepower</displayName>
-				<unitPattern count="one">{0} horsepower</unitPattern>
-				<unitPattern count="other">{0} horsepower</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilowatts</displayName>
-				<unitPattern count="one">{0} kilowatt</unitPattern>
-				<unitPattern count="other">{0} kilowatts</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>megawatts</displayName>
 				<unitPattern count="one">{0} megawatt</unitPattern>
 				<unitPattern count="other">{0} megawatts</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>milliwatts</displayName>
-				<unitPattern count="one">{0} milliwatt</unitPattern>
-				<unitPattern count="other">{0} milliwatts</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilowatts</displayName>
+				<unitPattern count="one">{0} kilowatt</unitPattern>
+				<unitPattern count="other">{0} kilowatts</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watts</displayName>
 				<unitPattern count="one">{0} watt</unitPattern>
 				<unitPattern count="other">{0} watts</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>milliwatts</displayName>
+				<unitPattern count="one">{0} milliwatt</unitPattern>
+				<unitPattern count="other">{0} milliwatts</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>horsepower</displayName>
+				<unitPattern count="one">{0} horsepower</unitPattern>
+				<unitPattern count="other">{0} horsepower</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hectopascals</displayName>
 				<unitPattern count="one">{0} hectopascal</unitPattern>
 				<unitPattern count="other">{0} hectopascals</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inches of mercury</displayName>
-				<unitPattern count="one">{0} inch of mercury</unitPattern>
-				<unitPattern count="other">{0} inches of mercury</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>millibars</displayName>
-				<unitPattern count="one">{0} millibar</unitPattern>
-				<unitPattern count="other">{0} millibars</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>millimeters of mercury</displayName>
 				<unitPattern count="one">{0} millimeter of mercury</unitPattern>
@@ -5740,10 +5934,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} pound per square inch</unitPattern>
 				<unitPattern count="other">{0} pounds per square inch</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karats</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="other">{0} karats</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inches of mercury</displayName>
+				<unitPattern count="one">{0} inch of mercury</unitPattern>
+				<unitPattern count="other">{0} inches of mercury</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>millibars</displayName>
+				<unitPattern count="one">{0} millibar</unitPattern>
+				<unitPattern count="other">{0} millibars</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometers per hour</displayName>
@@ -5760,6 +5959,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mile per hour</unitPattern>
 				<unitPattern count="other">{0} miles per hour</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>knots</displayName>
+				<unitPattern count="one">{0} knot</unitPattern>
+				<unitPattern count="other">{0} knots</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>degrees Celsius</displayName>
 				<unitPattern count="one">{0} degree Celsius</unitPattern>
@@ -5775,36 +5979,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kelvin</unitPattern>
 				<unitPattern count="other">{0} kelvins</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>acre-feet</displayName>
-				<unitPattern count="one">{0} acre-foot</unitPattern>
-				<unitPattern count="other">{0} acre-feet</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>bushels</displayName>
-				<unitPattern count="one">{0} bushel</unitPattern>
-				<unitPattern count="other">{0} bushels</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>centiliters</displayName>
-				<unitPattern count="one">{0} centiliter</unitPattern>
-				<unitPattern count="other">{0} centiliters</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cubic centimeters</displayName>
-				<unitPattern count="one">{0} cubic centimeter</unitPattern>
-				<unitPattern count="other">{0} cubic centimeters</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>cubic feet</displayName>
-				<unitPattern count="one">{0} cubic foot</unitPattern>
-				<unitPattern count="other">{0} cubic feet</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>cubic inches</displayName>
-				<unitPattern count="one">{0} cubic inch</unitPattern>
-				<unitPattern count="other">{0} cubic inches</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>cubic kilometers</displayName>
 				<unitPattern count="one">{0} cubic kilometer</unitPattern>
@@ -5814,6 +5988,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>cubic meters</displayName>
 				<unitPattern count="one">{0} cubic meter</unitPattern>
 				<unitPattern count="other">{0} cubic meters</unitPattern>
+				<perUnitPattern>{0} per cubic meter</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cubic centimeters</displayName>
+				<unitPattern count="one">{0} cubic centimeter</unitPattern>
+				<unitPattern count="other">{0} cubic centimeters</unitPattern>
+				<perUnitPattern>{0} per cubic centimeter</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>cubic miles</displayName>
@@ -5825,25 +6006,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} cubic yard</unitPattern>
 				<unitPattern count="other">{0} cubic yards</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>cups</displayName>
-				<unitPattern count="one">{0} cup</unitPattern>
-				<unitPattern count="other">{0} cups</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>cubic feet</displayName>
+				<unitPattern count="one">{0} cubic foot</unitPattern>
+				<unitPattern count="other">{0} cubic feet</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>deciliters</displayName>
-				<unitPattern count="one">{0} deciliter</unitPattern>
-				<unitPattern count="other">{0} deciliters</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>cubic inches</displayName>
+				<unitPattern count="one">{0} cubic inch</unitPattern>
+				<unitPattern count="other">{0} cubic inches</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fluid ounces</displayName>
-				<unitPattern count="one">{0} fluid ounce</unitPattern>
-				<unitPattern count="other">{0} fluid ounces</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gallons</displayName>
-				<unitPattern count="one">{0} gallon</unitPattern>
-				<unitPattern count="other">{0} gallons</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megaliters</displayName>
+				<unitPattern count="one">{0} megaliter</unitPattern>
+				<unitPattern count="other">{0} megaliters</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hectoliters</displayName>
@@ -5854,27 +6030,75 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>liters</displayName>
 				<unitPattern count="one">{0} liter</unitPattern>
 				<unitPattern count="other">{0} liters</unitPattern>
+				<perUnitPattern>{0} per liter</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megaliters</displayName>
-				<unitPattern count="one">{0} megaliter</unitPattern>
-				<unitPattern count="other">{0} megaliters</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>deciliters</displayName>
+				<unitPattern count="one">{0} deciliter</unitPattern>
+				<unitPattern count="other">{0} deciliters</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centiliters</displayName>
+				<unitPattern count="one">{0} centiliter</unitPattern>
+				<unitPattern count="other">{0} centiliters</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>milliliters</displayName>
 				<unitPattern count="one">{0} milliliter</unitPattern>
 				<unitPattern count="other">{0} milliliters</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pints</displayName>
-				<unitPattern count="one">{0} pint</unitPattern>
-				<unitPattern count="other">{0} pints</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>metric pints</displayName>
+				<unitPattern count="one">{0} metric pint</unitPattern>
+				<unitPattern count="other">{0} metric pints</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>metric cups</displayName>
+				<unitPattern count="one">{0} metric cup</unitPattern>
+				<unitPattern count="other">{0} metric cups</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acre-feet</displayName>
+				<unitPattern count="one">{0} acre-foot</unitPattern>
+				<unitPattern count="other">{0} acre-feet</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>bushels</displayName>
+				<unitPattern count="one">{0} bushel</unitPattern>
+				<unitPattern count="other">{0} bushels</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gallons</displayName>
+				<unitPattern count="one">{0} gallon</unitPattern>
+				<unitPattern count="other">{0} gallons</unitPattern>
+				<perUnitPattern>{0} per gallon</perUnitPattern>
+			</unit>
+			<unit type="volume-gallon-imperial">
+				<displayName>Imp. gallons</displayName>
+				<unitPattern count="one">{0} Imp. gallon</unitPattern>
+				<unitPattern count="other">{0} Imp. gallons</unitPattern>
+				<perUnitPattern>{0} per Imp. gallon</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>quarts</displayName>
 				<unitPattern count="one">{0} quart</unitPattern>
 				<unitPattern count="other">{0} quarts</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pints</displayName>
+				<unitPattern count="one">{0} pint</unitPattern>
+				<unitPattern count="other">{0} pints</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cups</displayName>
+				<unitPattern count="one">{0} cup</unitPattern>
+				<unitPattern count="other">{0} cups</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fluid ounces</displayName>
+				<unitPattern count="one">{0} fluid ounce</unitPattern>
+				<unitPattern count="other">{0} fluid ounces</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>tablespoons</displayName>
 				<unitPattern count="one">{0} tablespoon</unitPattern>
@@ -5900,6 +6124,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="one">{0} rev</unitPattern>
+				<unitPattern count="other">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radians</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>degrees</displayName>
+				<unitPattern count="one">{0} deg</unitPattern>
+				<unitPattern count="other">{0} deg</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>arcmins</displayName>
 				<unitPattern count="one">{0} arcmin</unitPattern>
@@ -5910,30 +6149,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} arcsec</unitPattern>
 				<unitPattern count="other">{0} arcsecs</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>degrees</displayName>
-				<unitPattern count="one">{0} deg</unitPattern>
-				<unitPattern count="other">{0} deg</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radians</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>acres</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hectares</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>meters²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>sq miles</displayName>
+				<unitPattern count="one">{0} sq mi</unitPattern>
+				<unitPattern count="other">{0} sq mi</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acres</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yards²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>sq feet</displayName>
@@ -5944,139 +6195,160 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>inches²</displayName>
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karats</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
-			<unit type="area-square-meter">
-				<displayName>meters²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
+			<unit type="concentr-milligram-per-deciliter">
+				<displayName>mg/dL</displayName>
+				<unitPattern count="one">{0} mg/dL</unitPattern>
+				<unitPattern count="other">{0} mg/dL</unitPattern>
 			</unit>
-			<unit type="area-square-mile">
-				<displayName>sq miles</displayName>
-				<unitPattern count="one">{0} sq mi</unitPattern>
-				<unitPattern count="other">{0} sq mi</unitPattern>
+			<unit type="concentr-millimole-per-liter">
+				<displayName>millimol/liter</displayName>
+				<unitPattern count="one">{0} mmol/L</unitPattern>
+				<unitPattern count="other">{0} mmol/L</unitPattern>
 			</unit>
-			<unit type="area-square-yard">
-				<displayName>yards²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-part-per-million">
+				<displayName>parts/million</displayName>
+				<unitPattern count="one">{0} ppm</unitPattern>
+				<unitPattern count="other">{0} ppm</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liters/km</displayName>
 				<unitPattern count="one">{0} L/km</unitPattern>
 				<unitPattern count="other">{0} L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100 km</displayName>
+				<unitPattern count="one">{0} L/100 km</unitPattern>
+				<unitPattern count="other">{0} L/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>miles/gal</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gbit</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GByte</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kbit</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kByte</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mbit</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MByte</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tbit</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
+			<unit type="consumption-mile-per-gallon-imperial">
+				<displayName>miles/gal Imp.</displayName>
+				<unitPattern count="one">{0} mpg Imp.</unitPattern>
+				<unitPattern count="other">{0} mpg Imp.</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TByte</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tbit</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GByte</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gbit</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MByte</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mbit</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kByte</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kbit</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>c</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>years</displayName>
+				<unitPattern count="one">{0} yr</unitPattern>
+				<unitPattern count="other">{0} yrs</unitPattern>
+				<perUnitPattern>{0}/y</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>months</displayName>
+				<unitPattern count="one">{0} mth</unitPattern>
+				<unitPattern count="other">{0} mths</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>weeks</displayName>
+				<unitPattern count="one">{0} wk</unitPattern>
+				<unitPattern count="other">{0} wks</unitPattern>
+				<perUnitPattern>{0}/w</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>days</displayName>
 				<unitPattern count="one">{0} day</unitPattern>
 				<unitPattern count="other">{0} days</unitPattern>
+				<perUnitPattern>{0}/d</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>hours</displayName>
 				<unitPattern count="one">{0} hr</unitPattern>
 				<unitPattern count="other">{0} hr</unitPattern>
-				<perUnitPattern>{0}ph</perUnitPattern>
+				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μsecs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
+			<unit type="duration-minute">
+				<displayName>mins</displayName>
+				<unitPattern count="one">{0} min</unitPattern>
+				<unitPattern count="other">{0} min</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>secs</displayName>
+				<unitPattern count="one">{0} sec</unitPattern>
+				<unitPattern count="other">{0} sec</unitPattern>
+				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>millisecs</displayName>
 				<unitPattern count="one">{0} ms</unitPattern>
 				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>mins</displayName>
-				<unitPattern count="one">{0} min</unitPattern>
-				<unitPattern count="other">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>months</displayName>
-				<unitPattern count="one">{0} mth</unitPattern>
-				<unitPattern count="other">{0} mths</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μsecs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>nanosecs</displayName>
 				<unitPattern count="one">{0} ns</unitPattern>
 				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>secs</displayName>
-				<unitPattern count="one">{0} sec</unitPattern>
-				<unitPattern count="other">{0} sec</unitPattern>
-				<perUnitPattern>{0}ps</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>weeks</displayName>
-				<unitPattern count="one">{0} wk</unitPattern>
-				<unitPattern count="other">{0} wks</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>years</displayName>
-				<unitPattern count="one">{0} yr</unitPattern>
-				<unitPattern count="other">{0} yrs</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>amps</displayName>
 				<unitPattern count="one">{0} A</unitPattern>
@@ -6097,6 +6369,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -6107,21 +6384,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Cal</unitPattern>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joules</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojoule</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joules</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kW-hour</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -6132,216 +6404,220 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>meters</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName>fathoms</displayName>
-				<unitPattern count="one">{0} ftm</unitPattern>
-				<unitPattern count="other">{0} ftm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>feet</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>furlongs</displayName>
-				<unitPattern count="one">{0} fur</unitPattern>
-				<unitPattern count="other">{0} fur</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>inches</displayName>
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>light yrs</displayName>
-				<unitPattern count="one">{0} ly</unitPattern>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>meters</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µmeters</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>miles</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="one">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µmeters</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsecs</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>miles</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yards</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>feet</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>inches</displayName>
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsecs</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>light yrs</displayName>
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>furlongs</displayName>
+				<unitPattern count="one">{0} fur</unitPattern>
+				<unitPattern count="other">{0} fur</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>fathoms</displayName>
+				<unitPattern count="one">{0} ftm</unitPattern>
+				<unitPattern count="other">{0} ftm</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>carats</displayName>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>grams</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>grams</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz troy</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>pounds</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>stones</displayName>
-				<unitPattern count="one">{0} st</unitPattern>
-				<unitPattern count="other">{0} st</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tons</displayName>
 				<unitPattern count="one">{0} tn</unitPattern>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName>stones</displayName>
+				<unitPattern count="one">{0} st</unitPattern>
+				<unitPattern count="other">{0} st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>pounds</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz troy</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>carats</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hp</displayName>
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watts</displayName>
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>in Hg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -6352,10 +6628,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karats</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>in Hg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/hour</displayName>
@@ -6372,6 +6653,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mph</unitPattern>
 				<unitPattern count="other">{0} mph</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>deg. C</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -6387,36 +6673,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>acre ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>bushels</displayName>
-				<unitPattern count="one">{0} bu</unitPattern>
-				<unitPattern count="other">{0} bu</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cL</displayName>
-				<unitPattern count="one">{0} cL</unitPattern>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>feet³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>inches³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -6427,6 +6683,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
 			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
 				<unitPattern count="one">{0} mi³</unitPattern>
@@ -6437,25 +6698,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>cups</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>feet³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="one">{0} dL</unitPattern>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>inches³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -6467,26 +6723,71 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} L</unitPattern>
 				<unitPattern count="other">{0} L</unitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="one">{0} ML</unitPattern>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0} dL</unitPattern>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="one">{0} cL</unitPattern>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
 				<unitPattern count="one">{0} mL</unitPattern>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pints</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acre ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>bushels</displayName>
+				<unitPattern count="one">{0} bu</unitPattern>
+				<unitPattern count="other">{0} bu</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+			</unit>
+			<unit type="volume-gallon-imperial">
+				<displayName>Imp. gal</displayName>
+				<unitPattern count="one">{0} gal Imp.</unitPattern>
+				<unitPattern count="other">{0} gal Imp.</unitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qts</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pints</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cups</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>tbsp</displayName>
 				<unitPattern count="one">{0} tbsp</unitPattern>
@@ -6509,6 +6810,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}m/s²</unitPattern>
 				<unitPattern count="other">{0}m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="one">{0}rev</unitPattern>
+				<unitPattern count="other">{0}rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0}rad</unitPattern>
+				<unitPattern count="other">{0}rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>deg</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>arcmin</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
@@ -6519,21 +6835,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>deg</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0}rad</unitPattern>
-				<unitPattern count="other">{0}rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>acre</displayName>
-				<unitPattern count="one">{0}ac</unitPattern>
-				<unitPattern count="other">{0}ac</unitPattern>
-			</unit>
 			<unit type="area-hectare">
 				<displayName>hectare</displayName>
 				<unitPattern count="one">{0}ha</unitPattern>
@@ -6544,6 +6845,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}cm²</unitPattern>
 				<unitPattern count="other">{0}cm²</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0}mi²</unitPattern>
+				<unitPattern count="other">{0}mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acre</displayName>
+				<unitPattern count="one">{0}ac</unitPattern>
+				<unitPattern count="other">{0}ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0}yd²</unitPattern>
+				<unitPattern count="other">{0}yd²</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<displayName>ft²</displayName>
 				<unitPattern count="one">{0}ft²</unitPattern>
@@ -6554,75 +6870,110 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}in²</unitPattern>
 				<unitPattern count="other">{0}in²</unitPattern>
 			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">{0}mi²</unitPattern>
-				<unitPattern count="other">{0}mi²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0}kt</unitPattern>
+				<unitPattern count="other">{0}kt</unitPattern>
 			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0}yd²</unitPattern>
-				<unitPattern count="other">{0}yd²</unitPattern>
+			<unit type="concentr-milligram-per-deciliter">
+				<displayName>mg/dL</displayName>
+				<unitPattern count="one">{0}mg/dL</unitPattern>
+				<unitPattern count="other">{0}mg/dL</unitPattern>
+			</unit>
+			<unit type="concentr-millimole-per-liter">
+				<displayName>mmol/L</displayName>
+				<unitPattern count="one">{0}mmol/L</unitPattern>
+				<unitPattern count="other">{0}mmol/L</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-million">
+				<displayName>ppm</displayName>
+				<unitPattern count="one">{0}ppm</unitPattern>
+				<unitPattern count="other">{0}ppm</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
 				<unitPattern count="one">{0}L/km</unitPattern>
 				<unitPattern count="other">{0}L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0}L/100km</unitPattern>
+				<unitPattern count="other">{0}L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="one">{0}mpg</unitPattern>
 				<unitPattern count="other">{0}mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0}bit</unitPattern>
-				<unitPattern count="other">{0}bit</unitPattern>
+			<unit type="consumption-mile-per-gallon-imperial">
+				<displayName>mpg Imp</displayName>
+				<unitPattern count="one">{0}mpgIm</unitPattern>
+				<unitPattern count="other">{0}mpgIm</unitPattern>
 			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="one">{0}byte</unitPattern>
-				<unitPattern count="other">{0}byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gbit</displayName>
-				<unitPattern count="one">{0}Gb</unitPattern>
-				<unitPattern count="other">{0}Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GByte</displayName>
-				<unitPattern count="one">{0}GB</unitPattern>
-				<unitPattern count="other">{0}GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kbit</displayName>
-				<unitPattern count="one">{0}kb</unitPattern>
-				<unitPattern count="other">{0}kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kByte</displayName>
-				<unitPattern count="one">{0}kB</unitPattern>
-				<unitPattern count="other">{0}kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mbit</displayName>
-				<unitPattern count="one">{0}Mb</unitPattern>
-				<unitPattern count="other">{0}Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MByte</displayName>
-				<unitPattern count="one">{0}MB</unitPattern>
-				<unitPattern count="other">{0}MB</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>TByte</displayName>
+				<unitPattern count="one">{0}TB</unitPattern>
+				<unitPattern count="other">{0}TB</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>Tbit</displayName>
 				<unitPattern count="one">{0}Tb</unitPattern>
 				<unitPattern count="other">{0}Tb</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>TByte</displayName>
-				<unitPattern count="one">{0}TB</unitPattern>
-				<unitPattern count="other">{0}TB</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>GByte</displayName>
+				<unitPattern count="one">{0}GB</unitPattern>
+				<unitPattern count="other">{0}GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gbit</displayName>
+				<unitPattern count="one">{0}Gb</unitPattern>
+				<unitPattern count="other">{0}Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MByte</displayName>
+				<unitPattern count="one">{0}MB</unitPattern>
+				<unitPattern count="other">{0}MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mbit</displayName>
+				<unitPattern count="one">{0}Mb</unitPattern>
+				<unitPattern count="other">{0}Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kByte</displayName>
+				<unitPattern count="one">{0}kB</unitPattern>
+				<unitPattern count="other">{0}kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kbit</displayName>
+				<unitPattern count="one">{0}kb</unitPattern>
+				<unitPattern count="other">{0}kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0}byte</unitPattern>
+				<unitPattern count="other">{0}byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0}bit</unitPattern>
+				<unitPattern count="other">{0}bit</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>yr</displayName>
+				<unitPattern count="one">{0}y</unitPattern>
+				<unitPattern count="other">{0}y</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>month</displayName>
+				<unitPattern count="one">{0}m</unitPattern>
+				<unitPattern count="other">{0}m</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>wk</displayName>
+				<unitPattern count="one">{0}w</unitPattern>
+				<unitPattern count="other">{0}w</unitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>day</displayName>
@@ -6633,49 +6984,32 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>hour</displayName>
 				<unitPattern count="one">{0}h</unitPattern>
 				<unitPattern count="other">{0}h</unitPattern>
-				<perUnitPattern>{0}/h</perUnitPattern>
-			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μsec</displayName>
-				<unitPattern count="one">{0}μs</unitPattern>
-				<unitPattern count="other">{0}μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>msec</displayName>
-				<unitPattern count="one">{0}ms</unitPattern>
-				<unitPattern count="other">{0}ms</unitPattern>
 			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0}m</unitPattern>
 				<unitPattern count="other">{0}m</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>month</displayName>
-				<unitPattern count="one">{0}m</unitPattern>
-				<unitPattern count="other">{0}m</unitPattern>
+			<unit type="duration-second">
+				<displayName>sec</displayName>
+				<unitPattern count="one">{0}s</unitPattern>
+				<unitPattern count="other">{0}s</unitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>msec</displayName>
+				<unitPattern count="one">{0}ms</unitPattern>
+				<unitPattern count="other">{0}ms</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>μsec</displayName>
+				<unitPattern count="one">{0}μs</unitPattern>
+				<unitPattern count="other">{0}μs</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>ns</displayName>
 				<unitPattern count="one">{0}ns</unitPattern>
 				<unitPattern count="other">{0}ns</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>sec</displayName>
-				<unitPattern count="one">{0}s</unitPattern>
-				<unitPattern count="other">{0}s</unitPattern>
-				<perUnitPattern>{0}/s</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>wk</displayName>
-				<unitPattern count="one">{0}w</unitPattern>
-				<unitPattern count="other">{0}w</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>yr</displayName>
-				<unitPattern count="one">{0}y</unitPattern>
-				<unitPattern count="other">{0}y</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>amp</displayName>
 				<unitPattern count="one">{0}A</unitPattern>
@@ -6696,6 +7030,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}V</unitPattern>
 				<unitPattern count="other">{0}V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0}kcal</unitPattern>
+				<unitPattern count="other">{0}kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0}cal</unitPattern>
@@ -6706,21 +7045,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}Cal</unitPattern>
 				<unitPattern count="other">{0}Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="one">{0}J</unitPattern>
-				<unitPattern count="other">{0}J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0}kcal</unitPattern>
-				<unitPattern count="other">{0}kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0}kJ</unitPattern>
 				<unitPattern count="other">{0}kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="one">{0}J</unitPattern>
+				<unitPattern count="other">{0}J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0}kWh</unitPattern>
@@ -6731,145 +7065,160 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}GHz</unitPattern>
 				<unitPattern count="other">{0}GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0}Hz</unitPattern>
-				<unitPattern count="other">{0}Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0}MHz</unitPattern>
+				<unitPattern count="other">{0}MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0}kHz</unitPattern>
 				<unitPattern count="other">{0}kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0}MHz</unitPattern>
-				<unitPattern count="other">{0}MHz</unitPattern>
-			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0}au</unitPattern>
-				<unitPattern count="other">{0}au</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0}cm</unitPattern>
-				<unitPattern count="other">{0}cm</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<displayName>dm</displayName>
-				<unitPattern count="one">{0}dm</unitPattern>
-				<unitPattern count="other">{0}dm</unitPattern>
-			</unit>
-			<unit type="length-fathom">
-				<displayName>fathom</displayName>
-				<unitPattern count="one">{0}fm</unitPattern>
-				<unitPattern count="other">{0}fm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>ft</displayName>
-				<unitPattern count="one">{0}′</unitPattern>
-				<unitPattern count="other">{0}′</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>furlong</displayName>
-				<unitPattern count="one">{0}fur</unitPattern>
-				<unitPattern count="other">{0}fur</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>in</displayName>
-				<unitPattern count="one">{0}″</unitPattern>
-				<unitPattern count="other">{0}″</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0}Hz</unitPattern>
+				<unitPattern count="other">{0}Hz</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
 				<unitPattern count="one">{0}km</unitPattern>
 				<unitPattern count="other">{0}km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<displayName>ly</displayName>
-				<unitPattern count="one">{0}ly</unitPattern>
-				<unitPattern count="other">{0}ly</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>meter</displayName>
 				<unitPattern count="one">{0}m</unitPattern>
 				<unitPattern count="other">{0}m</unitPattern>
 			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0}µm</unitPattern>
-				<unitPattern count="other">{0}µm</unitPattern>
+			<unit type="length-decimeter">
+				<displayName>dm</displayName>
+				<unitPattern count="one">{0}dm</unitPattern>
+				<unitPattern count="other">{0}dm</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName>mi</displayName>
-				<unitPattern count="one">{0}mi</unitPattern>
-				<unitPattern count="other">{0}mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0}cm</unitPattern>
+				<unitPattern count="other">{0}cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="one">{0}mm</unitPattern>
 				<unitPattern count="other">{0}mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0}µm</unitPattern>
+				<unitPattern count="other">{0}µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0}nm</unitPattern>
 				<unitPattern count="other">{0}nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0}nmi</unitPattern>
-				<unitPattern count="other">{0}nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsec</displayName>
-				<unitPattern count="one">{0}pc</unitPattern>
-				<unitPattern count="other">{0}pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0}pm</unitPattern>
 				<unitPattern count="other">{0}pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="one">{0}mi</unitPattern>
+				<unitPattern count="other">{0}mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yd</displayName>
 				<unitPattern count="one">{0}yd</unitPattern>
 				<unitPattern count="other">{0}yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ft</displayName>
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="other">{0}′</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>in</displayName>
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsec</displayName>
+				<unitPattern count="one">{0}pc</unitPattern>
+				<unitPattern count="other">{0}pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ly</displayName>
+				<unitPattern count="one">{0}ly</unitPattern>
+				<unitPattern count="other">{0}ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0}au</unitPattern>
+				<unitPattern count="other">{0}au</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>furlong</displayName>
+				<unitPattern count="one">{0}fur</unitPattern>
+				<unitPattern count="other">{0}fur</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>fathom</displayName>
+				<unitPattern count="one">{0}fm</unitPattern>
+				<unitPattern count="other">{0}fm</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0}nmi</unitPattern>
+				<unitPattern count="other">{0}nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0}smi</unitPattern>
+				<unitPattern count="other">{0}smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0}lx</unitPattern>
 				<unitPattern count="other">{0}lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>carat</displayName>
-				<unitPattern count="one">{0}CD</unitPattern>
-				<unitPattern count="other">{0}CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gram</displayName>
-				<unitPattern count="one">{0}g</unitPattern>
-				<unitPattern count="other">{0}g</unitPattern>
+			<unit type="mass-metric-ton">
+				<displayName>t</displayName>
+				<unitPattern count="one">{0}t</unitPattern>
+				<unitPattern count="other">{0}t</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="one">{0}kg</unitPattern>
 				<unitPattern count="other">{0}kg</unitPattern>
 			</unit>
-			<unit type="mass-metric-ton">
-				<displayName>t</displayName>
-				<unitPattern count="one">{0}t</unitPattern>
-				<unitPattern count="other">{0}t</unitPattern>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="one">{0}g</unitPattern>
+				<unitPattern count="other">{0}g</unitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>mg</displayName>
+				<unitPattern count="one">{0}mg</unitPattern>
+				<unitPattern count="other">{0}mg</unitPattern>
 			</unit>
 			<unit type="mass-microgram">
 				<displayName>µg</displayName>
 				<unitPattern count="one">{0}µg</unitPattern>
 				<unitPattern count="other">{0}µg</unitPattern>
 			</unit>
-			<unit type="mass-milligram">
-				<displayName>mg</displayName>
-				<unitPattern count="one">{0}mg</unitPattern>
-				<unitPattern count="other">{0}mg</unitPattern>
+			<unit type="mass-ton">
+				<displayName>ton</displayName>
+				<unitPattern count="one">{0}tn</unitPattern>
+				<unitPattern count="other">{0}tn</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName>stone</displayName>
+				<unitPattern count="one">{0}st</unitPattern>
+				<unitPattern count="other">{0}st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0}#</unitPattern>
+				<unitPattern count="other">{0}#</unitPattern>
 			</unit>
 			<unit type="mass-ounce">
 				<displayName>oz</displayName>
@@ -6881,66 +7230,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}oz t</unitPattern>
 				<unitPattern count="other">{0}oz t</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="one">{0}#</unitPattern>
-				<unitPattern count="other">{0}#</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>stone</displayName>
-				<unitPattern count="one">{0}st</unitPattern>
-				<unitPattern count="other">{0}st</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<displayName>ton</displayName>
-				<unitPattern count="one">{0}tn</unitPattern>
-				<unitPattern count="other">{0}tn</unitPattern>
+			<unit type="mass-carat">
+				<displayName>carat</displayName>
+				<unitPattern count="one">{0}CD</unitPattern>
+				<unitPattern count="other">{0}CD</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0}GW</unitPattern>
 				<unitPattern count="other">{0}GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hp</displayName>
-				<unitPattern count="one">{0}hp</unitPattern>
-				<unitPattern count="other">{0}hp</unitPattern>
+			<unit type="power-megawatt">
+				<displayName>MW</displayName>
+				<unitPattern count="one">{0}MW</unitPattern>
+				<unitPattern count="other">{0}MW</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName>kW</displayName>
 				<unitPattern count="one">{0}kW</unitPattern>
 				<unitPattern count="other">{0}kW</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<displayName>MW</displayName>
-				<unitPattern count="one">{0}MW</unitPattern>
-				<unitPattern count="other">{0}MW</unitPattern>
+			<unit type="power-watt">
+				<displayName>watt</displayName>
+				<unitPattern count="one">{0}W</unitPattern>
+				<unitPattern count="other">{0}W</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<displayName>mW</displayName>
 				<unitPattern count="one">{0}mW</unitPattern>
 				<unitPattern count="other">{0}mW</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName>watt</displayName>
-				<unitPattern count="one">{0}W</unitPattern>
-				<unitPattern count="other">{0}W</unitPattern>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="one">{0}hp</unitPattern>
+				<unitPattern count="other">{0}hp</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0}hPa</unitPattern>
 				<unitPattern count="other">{0}hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>″ Hg</displayName>
-				<unitPattern count="one">{0}″ Hg</unitPattern>
-				<unitPattern count="other">{0}″ Hg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0}mb</unitPattern>
-				<unitPattern count="other">{0}mb</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0}mm Hg</unitPattern>
@@ -6951,10 +7280,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}psi</unitPattern>
 				<unitPattern count="other">{0}psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">{0}kt</unitPattern>
-				<unitPattern count="other">{0}kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>″ Hg</displayName>
+				<unitPattern count="one">{0}″ Hg</unitPattern>
+				<unitPattern count="other">{0}″ Hg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0}mb</unitPattern>
+				<unitPattern count="other">{0}mb</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/hr</displayName>
@@ -6971,6 +7305,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}mph</unitPattern>
 				<unitPattern count="other">{0}mph</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0}kn</unitPattern>
+				<unitPattern count="other">{0}kn</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -6986,36 +7325,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}K</unitPattern>
 				<unitPattern count="other">{0}K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>acre ft</displayName>
-				<unitPattern count="one">{0}ac ft</unitPattern>
-				<unitPattern count="other">{0}ac ft</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>bushel</displayName>
-				<unitPattern count="one">{0}bu</unitPattern>
-				<unitPattern count="other">{0}bu</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cL</displayName>
-				<unitPattern count="one">{0}cL</unitPattern>
-				<unitPattern count="other">{0}cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0}cm³</unitPattern>
-				<unitPattern count="other">{0}cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0}ft³</unitPattern>
-				<unitPattern count="other">{0}ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0}in³</unitPattern>
-				<unitPattern count="other">{0}in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0}km³</unitPattern>
@@ -7025,6 +7334,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0}m³</unitPattern>
 				<unitPattern count="other">{0}m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0}cm³</unitPattern>
+				<unitPattern count="other">{0}cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -7036,25 +7352,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}yd³</unitPattern>
 				<unitPattern count="other">{0}yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>cup</displayName>
-				<unitPattern count="one">{0}c</unitPattern>
-				<unitPattern count="other">{0}c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0}ft³</unitPattern>
+				<unitPattern count="other">{0}ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="one">{0}dL</unitPattern>
-				<unitPattern count="other">{0}dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0}in³</unitPattern>
+				<unitPattern count="other">{0}in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0}fl oz</unitPattern>
-				<unitPattern count="other">{0}fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0}gal</unitPattern>
-				<unitPattern count="other">{0}gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0}ML</unitPattern>
+				<unitPattern count="other">{0}ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -7063,29 +7374,77 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="volume-liter">
 				<displayName>liter</displayName>
-				<unitPattern count="one">{0}l</unitPattern>
-				<unitPattern count="other">{0}l</unitPattern>
+				<unitPattern count="one">{0}L</unitPattern>
+				<unitPattern count="other">{0}L</unitPattern>
+				<perUnitPattern>{0}/L</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="one">{0}ML</unitPattern>
-				<unitPattern count="other">{0}ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0}dL</unitPattern>
+				<unitPattern count="other">{0}dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="one">{0}cL</unitPattern>
+				<unitPattern count="other">{0}cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
 				<unitPattern count="one">{0}mL</unitPattern>
 				<unitPattern count="other">{0}mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
+			<unit type="volume-pint-metric">
 				<displayName>pt</displayName>
-				<unitPattern count="one">{0}pt</unitPattern>
-				<unitPattern count="other">{0}pt</unitPattern>
+				<unitPattern count="one">{0}mpt</unitPattern>
+				<unitPattern count="other">{0}mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0}mc</unitPattern>
+				<unitPattern count="other">{0}mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acre ft</displayName>
+				<unitPattern count="one">{0}ac ft</unitPattern>
+				<unitPattern count="other">{0}ac ft</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>bushel</displayName>
+				<unitPattern count="one">{0}bu</unitPattern>
+				<unitPattern count="other">{0}bu</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0}gal</unitPattern>
+				<unitPattern count="other">{0}gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
+			</unit>
+			<unit type="volume-gallon-imperial">
+				<displayName>Imp gal</displayName>
+				<unitPattern count="one">{0}galIm</unitPattern>
+				<unitPattern count="other">{0}galIm</unitPattern>
+				<perUnitPattern>{0}/galIm</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="one">{0}qt</unitPattern>
 				<unitPattern count="other">{0}qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0}pt</unitPattern>
+				<unitPattern count="other">{0}pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cup</displayName>
+				<unitPattern count="one">{0}c</unitPattern>
+				<unitPattern count="other">{0}c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0}fl oz</unitPattern>
+				<unitPattern count="other">{0}fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>tbsp</displayName>
 				<unitPattern count="one">{0}tbsp</unitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_001.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_001.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_001.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_001.xml
index 8662208354a..f60bb88f4fb 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_001.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_001.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11290 $"/>
-		<generation date="$Date: 2015-02-22 04:15:45 -0600 (Sun, 22 Feb 2015) $"/>
+		<version number="$Revision: 12291 $"/>
 		<language type="en"/>
 		<territory type="001"/>
 	</identity>
@@ -209,6 +208,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</dateFormats>
 				<dateTimeFormats>
 					<availableFormats>
+						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
 						<dateFormatItem id="Md">dd/MM</dateFormatItem>
@@ -374,11 +374,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} metre per second squared</unitPattern>
 				<unitPattern count="other">{0} metres per second squared</unitPattern>
 			</unit>
-			<unit type="area-square-centimeter">
-				<displayName>square centimetres</displayName>
-				<unitPattern count="one">{0} square centimetre</unitPattern>
-				<unitPattern count="other">{0} square centimetres</unitPattern>
-			</unit>
 			<unit type="area-square-kilometer">
 				<displayName>square kilometres</displayName>
 				<unitPattern count="one">{0} square kilometre</unitPattern>
@@ -388,42 +383,77 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>square metres</displayName>
 				<unitPattern count="one">{0} square metre</unitPattern>
 				<unitPattern count="other">{0} square metres</unitPattern>
+				<perUnitPattern>{0} per square metre</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>square centimetres</displayName>
+				<unitPattern count="one">{0} square centimetre</unitPattern>
+				<unitPattern count="other">{0} square centimetres</unitPattern>
+				<perUnitPattern>{0} per square centimetre</perUnitPattern>
+			</unit>
+			<unit type="concentr-milligram-per-deciliter">
+				<displayName>milligrams per decilitre</displayName>
+				<unitPattern count="one">{0} milligram per decilitre</unitPattern>
+				<unitPattern count="other">{0} milligrams per decilitre</unitPattern>
+			</unit>
+			<unit type="concentr-millimole-per-liter">
+				<displayName>millimoles per litre</displayName>
+				<unitPattern count="one">{0} millimole per litre</unitPattern>
+				<unitPattern count="other">{0} millimoles per litre</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litres per kilometre</displayName>
 				<unitPattern count="one">{0} litre per kilometre</unitPattern>
 				<unitPattern count="other">{0} litres per kilometre</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>centimetres</displayName>
-				<unitPattern count="one">{0} centimetre</unitPattern>
-				<unitPattern count="other">{0} centimetres</unitPattern>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>litres per 100 kilometres</displayName>
+				<unitPattern count="one">{0} litre per 100 kilometres</unitPattern>
+				<unitPattern count="other">{0} litres per 100 kilometres</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>miles per US gallon</displayName>
+				<unitPattern count="one">{0} mile per US gallon</unitPattern>
+				<unitPattern count="other">{0} miles per US gallon</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon-imperial">
+				<displayName>miles per gallon</displayName>
+				<unitPattern count="one">{0} mile per gallon</unitPattern>
+				<unitPattern count="other">{0} miles per gallon</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>kilometres</displayName>
+				<unitPattern count="one">{0} kilometre</unitPattern>
+				<unitPattern count="other">{0} kilometres</unitPattern>
+				<perUnitPattern>{0} per kilometre</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>metres</displayName>
+				<unitPattern count="one">{0} metre</unitPattern>
+				<unitPattern count="other">{0} metres</unitPattern>
+				<perUnitPattern>{0} per metre</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>decimetre</displayName>
 				<unitPattern count="one">{0} decimetre</unitPattern>
 				<unitPattern count="other">{0} decimetres</unitPattern>
 			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometres</displayName>
-				<unitPattern count="one">{0} kilometre</unitPattern>
-				<unitPattern count="other">{0} kilometres</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metres</displayName>
-				<unitPattern count="one">{0} metre</unitPattern>
-				<unitPattern count="other">{0} metres</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>micrometre</displayName>
-				<unitPattern count="one">{0} micrometre</unitPattern>
-				<unitPattern count="other">{0} micrometres</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>centimetres</displayName>
+				<unitPattern count="one">{0} centimetre</unitPattern>
+				<unitPattern count="other">{0} centimetres</unitPattern>
+				<perUnitPattern>{0} per centimetre</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>millimetres</displayName>
 				<unitPattern count="one">{0} millimetre</unitPattern>
 				<unitPattern count="other">{0} millimetres</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>micrometre</displayName>
+				<unitPattern count="one">{0} micrometre</unitPattern>
+				<unitPattern count="other">{0} micrometres</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanometres</displayName>
 				<unitPattern count="one">{0} nanometre</unitPattern>
@@ -449,16 +479,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} metre per second</unitPattern>
 				<unitPattern count="other">{0} metres per second</unitPattern>
 			</unit>
-			<unit type="volume-centiliter">
-				<displayName>centilitres</displayName>
-				<unitPattern count="one">{0} centilitre</unitPattern>
-				<unitPattern count="other">{0} centilitres</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cubic centimetres</displayName>
-				<unitPattern count="one">{0} cubic centimetre</unitPattern>
-				<unitPattern count="other">{0} cubic centimetres</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>cubic kilometres</displayName>
 				<unitPattern count="one">{0} cubic kilometre</unitPattern>
@@ -468,11 +488,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>cubic metres</displayName>
 				<unitPattern count="one">{0} cubic metre</unitPattern>
 				<unitPattern count="other">{0} cubic metres</unitPattern>
+				<perUnitPattern>{0} per cubic metre</perUnitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>decilitres</displayName>
-				<unitPattern count="one">{0} decilitre</unitPattern>
-				<unitPattern count="other">{0} decilitres</unitPattern>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cubic centimetres</displayName>
+				<unitPattern count="one">{0} cubic centimetre</unitPattern>
+				<unitPattern count="other">{0} cubic centimetres</unitPattern>
+				<perUnitPattern>{0} per cubic centimetre</perUnitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>megalitres</displayName>
+				<unitPattern count="one">{0} megalitre</unitPattern>
+				<unitPattern count="other">{0} megalitres</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hectolitres</displayName>
@@ -483,24 +510,69 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>litres</displayName>
 				<unitPattern count="one">{0} litre</unitPattern>
 				<unitPattern count="other">{0} litres</unitPattern>
+				<perUnitPattern>{0} per litre</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalitres</displayName>
-				<unitPattern count="one">{0} megalitre</unitPattern>
-				<unitPattern count="other">{0} megalitres</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>decilitres</displayName>
+				<unitPattern count="one">{0} decilitre</unitPattern>
+				<unitPattern count="other">{0} decilitres</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centilitres</displayName>
+				<unitPattern count="one">{0} centilitre</unitPattern>
+				<unitPattern count="other">{0} centilitres</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>millilitres</displayName>
 				<unitPattern count="one">{0} millilitre</unitPattern>
 				<unitPattern count="other">{0} millilitres</unitPattern>
 			</unit>
+			<unit type="volume-gallon">
+				<displayName>US gallons</displayName>
+				<unitPattern count="one">{0} US gallon</unitPattern>
+				<unitPattern count="other">{0} US gallons</unitPattern>
+				<perUnitPattern>{0} per US gallon</perUnitPattern>
+			</unit>
+			<unit type="volume-gallon-imperial">
+				<displayName>gallons</displayName>
+				<unitPattern count="one">{0} gallon</unitPattern>
+				<unitPattern count="other">{0} gallons</unitPattern>
+				<perUnitPattern>{0} per gallon</perUnitPattern>
+			</unit>
 		</unitLength>
 		<unitLength type="short">
 			<unit type="acceleration-meter-per-second-squared">
 				<displayName>metres/sec²</displayName>
 			</unit>
+			<unit type="concentr-milligram-per-deciliter">
+				<displayName>mg/dl</displayName>
+				<unitPattern count="one">{0} mg/dl</unitPattern>
+				<unitPattern count="other">{0} mg/dl</unitPattern>
+			</unit>
+			<unit type="concentr-millimole-per-liter">
+				<displayName>millimol/litre</displayName>
+				<unitPattern count="one">{0} mmol/l</unitPattern>
+				<unitPattern count="other">{0} mmol/l</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litres/km</displayName>
+				<unitPattern count="one">{0} l/km</unitPattern>
+				<unitPattern count="other">{0} l/km</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>miles/gal US</displayName>
+				<unitPattern count="one">{0} mpg US</unitPattern>
+				<unitPattern count="other">{0} mpg US</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon-imperial">
+				<displayName>miles/gal</displayName>
+				<unitPattern count="one">{0} mpg</unitPattern>
+				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<unitPattern count="one">{0} hr</unitPattern>
@@ -517,14 +589,84 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="length-meter">
 				<displayName>metres</displayName>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µmetres</displayName>
+			</unit>
 			<unit type="speed-meter-per-second">
 				<displayName>metres/sec</displayName>
 			</unit>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hl</displayName>
+				<unitPattern count="one">{0} hl</unitPattern>
+				<unitPattern count="other">{0} hl</unitPattern>
+			</unit>
 			<unit type="volume-liter">
 				<displayName>litres</displayName>
+				<unitPattern count="one">{0} l</unitPattern>
+				<unitPattern count="other">{0} l</unitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>ml</displayName>
+				<unitPattern count="one">{0} ml</unitPattern>
+				<unitPattern count="other">{0} ml</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>US gal</displayName>
+				<unitPattern count="one">{0} gal US</unitPattern>
+				<unitPattern count="other">{0} gal US</unitPattern>
+			</unit>
+			<unit type="volume-gallon-imperial">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
 			</unit>
 		</unitLength>
 		<unitLength type="narrow">
+			<unit type="concentr-milligram-per-deciliter">
+				<displayName>mg/dl</displayName>
+				<unitPattern count="one">{0}mg/dl</unitPattern>
+				<unitPattern count="other">{0}mg/dl</unitPattern>
+			</unit>
+			<unit type="concentr-millimole-per-liter">
+				<displayName>mmol/l</displayName>
+				<unitPattern count="one">{0}mmol/l</unitPattern>
+				<unitPattern count="other">{0}mmol/l</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>l/km</displayName>
+				<unitPattern count="one">{0}l/km</unitPattern>
+				<unitPattern count="other">{0}l/km</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100km</displayName>
+				<unitPattern count="one">{0}l/100km</unitPattern>
+				<unitPattern count="other">{0}l/100km</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>mpg US</displayName>
+				<unitPattern count="one">{0}mpgUS</unitPattern>
+				<unitPattern count="other">{0}mpgUS</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon-imperial">
+				<displayName>mpg</displayName>
+				<unitPattern count="one">{0}mpg</unitPattern>
+				<unitPattern count="other">{0}mpg</unitPattern>
+			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0}lb</unitPattern>
 				<unitPattern count="other">{0}lb</unitPattern>
@@ -537,9 +679,50 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}°F</unitPattern>
 				<unitPattern count="other">{0}°F</unitPattern>
 			</unit>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0}Ml</unitPattern>
+				<unitPattern count="other">{0}Ml</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hl</displayName>
+				<unitPattern count="one">{0}hl</unitPattern>
+				<unitPattern count="other">{0}hl</unitPattern>
+			</unit>
 			<unit type="volume-liter">
 				<displayName>litre</displayName>
+				<unitPattern count="one">{0}l</unitPattern>
+				<unitPattern count="other">{0}l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0}dl</unitPattern>
+				<unitPattern count="other">{0}dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0}cl</unitPattern>
+				<unitPattern count="other">{0}cl</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>ml</displayName>
+				<unitPattern count="one">{0}ml</unitPattern>
+				<unitPattern count="other">{0}ml</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>US gal</displayName>
+				<unitPattern count="one">{0}galUS</unitPattern>
+				<unitPattern count="other">{0}galUS</unitPattern>
+				<perUnitPattern>{0}/galUS</perUnitPattern>
+			</unit>
+			<unit type="volume-gallon-imperial">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0}gal</unitPattern>
+				<unitPattern count="other">{0}gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 		</unitLength>
 	</units>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_150.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_150.xml
new file mode 100644
index 00000000000..609b39699b3
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_150.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11976 $"/>
+		<language type="en"/>
+		<territory type="150"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group>.</group>
+		</symbols>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencies>
+			<currency type="EUR">
+				<pattern>¤#,##0.00</pattern>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_AG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AG.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_AG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AG.xml
index 666bac2051a..96e2b504b22 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_AG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AG.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10712 $"/>
-		<generation date="$Date: 2014-08-01 12:07:43 -0500 (Fri, 01 Aug 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="AG"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AI.xml
new file mode 100644
index 00000000000..8a0dd74bd2c
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AI.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="en"/>
+		<territory type="AI"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="XCD">
+				<symbol>$</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_AS.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AS.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_AS.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AS.xml
index da797dcd91b..f4e022f6f35 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_AS.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AS.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="AS"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AT.xml
new file mode 100644
index 00000000000..850be8ad53a
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AT.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12347 $"/>
+		<language type="en"/>
+		<territory type="AT"/>
+	</identity>
+	<numbers>
+		<symbols numberSystem="latn">
+			<superscriptingExponent>·</superscriptingExponent>
+		</symbols>
+		<percentFormats numberSystem="latn">
+			<percentFormatLength>
+				<percentFormat>
+					<pattern>#,##0 %</pattern>
+				</percentFormat>
+			</percentFormatLength>
+		</percentFormats>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>¤ #,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AU.xml
new file mode 100644
index 00000000000..941bbc8ede0
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AU.xml
@@ -0,0 +1,760 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12413 $"/>
+		<language type="en"/>
+		<territory type="AU"/>
+	</identity>
+	<localeDisplayNames>
+		<languages>
+			<language type="bax">Bamum</language>
+			<language type="en_US">United States English</language>
+			<language type="ro_MD">Moldovan</language>
+		</languages>
+		<types>
+			<type key="calendar" type="dangi">Korean Calendar</type>
+			<type key="calendar" type="ethiopic">Ethiopian Calendar</type>
+		</types>
+	</localeDisplayNames>
+	<dates>
+		<calendars>
+			<calendar type="generic">
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="yMd">dd/MM/y</dateFormatItem>
+						<dateFormatItem id="yMEd">E, dd/MM/y</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">E, d/M – E, d/M</greatestDifference>
+							<greatestDifference id="M">E, d/M – E, d/M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">E, d MMM – E, d MMM y G</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">Jan.</month>
+							<month type="2">Feb.</month>
+							<month type="3">Mar.</month>
+							<month type="4">Apr.</month>
+							<month type="5">May</month>
+							<month type="6">Jun.</month>
+							<month type="7">Jul.</month>
+							<month type="8">Aug.</month>
+							<month type="9">Sep.</month>
+							<month type="10">Oct.</month>
+							<month type="11">Nov.</month>
+							<month type="12">Dec.</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="narrow">
+							<month type="1">Jan.</month>
+							<month type="2">Feb.</month>
+							<month type="3">Mar.</month>
+							<month type="4">Apr.</month>
+							<month type="5">May</month>
+							<month type="6">Jun.</month>
+							<month type="7">Jul.</month>
+							<month type="8">Aug.</month>
+							<month type="9">Sep.</month>
+							<month type="10">Oct.</month>
+							<month type="11">Nov.</month>
+							<month type="12">Dec.</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="abbreviated">
+							<day type="sun">Sun.</day>
+							<day type="mon">Mon.</day>
+							<day type="tue">Tue.</day>
+							<day type="wed">Wed.</day>
+							<day type="thu">Thu.</day>
+							<day type="fri">Fri.</day>
+							<day type="sat">Sat.</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">Su.</day>
+							<day type="mon">Mon.</day>
+							<day type="tue">Tu.</day>
+							<day type="wed">Wed.</day>
+							<day type="thu">Th.</day>
+							<day type="fri">Fri.</day>
+							<day type="sat">Sat.</day>
+						</dayWidth>
+					</dayContext>
+					<dayContext type="stand-alone">
+						<dayWidth type="narrow">
+							<day type="sun">Su.</day>
+							<day type="mon">M.</day>
+							<day type="tue">Tu.</day>
+							<day type="wed">W.</day>
+							<day type="thu">Th.</day>
+							<day type="fri">F.</day>
+							<day type="sat">Sa.</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">midnight</dayPeriod>
+							<dayPeriod type="am">am</dayPeriod>
+							<dayPeriod type="noon">midday</dayPeriod>
+							<dayPeriod type="pm">pm</dayPeriod>
+							<dayPeriod type="morning1">morning</dayPeriod>
+							<dayPeriod type="afternoon1">afternoon</dayPeriod>
+							<dayPeriod type="evening1">evening</dayPeriod>
+							<dayPeriod type="night1">night</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">midnight</dayPeriod>
+							<dayPeriod type="am">am</dayPeriod>
+							<dayPeriod type="noon">midday</dayPeriod>
+							<dayPeriod type="pm">pm</dayPeriod>
+							<dayPeriod type="morning1">morning</dayPeriod>
+							<dayPeriod type="afternoon1">afternoon</dayPeriod>
+							<dayPeriod type="evening1">evening</dayPeriod>
+							<dayPeriod type="night1">night</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">midnight</dayPeriod>
+							<dayPeriod type="am">am</dayPeriod>
+							<dayPeriod type="noon">midday</dayPeriod>
+							<dayPeriod type="pm">pm</dayPeriod>
+							<dayPeriod type="morning1">morning</dayPeriod>
+							<dayPeriod type="afternoon1">afternoon</dayPeriod>
+							<dayPeriod type="evening1">evening</dayPeriod>
+							<dayPeriod type="night1">night</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">am</dayPeriod>
+							<dayPeriod type="noon">midday</dayPeriod>
+							<dayPeriod type="pm">pm</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">am</dayPeriod>
+							<dayPeriod type="noon">midday</dayPeriod>
+							<dayPeriod type="pm">pm</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">am</dayPeriod>
+							<dayPeriod type="noon">midday</dayPeriod>
+							<dayPeriod type="pm">pm</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<dateFormats>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>d/M/yy</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="M">LL</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="japanese">
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="yMd">d/M/y</dateFormatItem>
+						<dateFormatItem id="yMEd">E, d/M/y</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="dayperiod">
+				<displayName>am/pm</displayName>
+			</field>
+			<field type="hour-short">
+				<displayName>h</displayName>
+			</field>
+		</fields>
+		<timeZoneNames>
+			<metazone type="Africa_Eastern">
+				<long>
+					<standard>Eastern Africa Time</standard>
+				</long>
+			</metazone>
+			<metazone type="Arabian">
+				<long>
+					<generic>Arabia Time</generic>
+					<standard>Arabia Standard Time</standard>
+					<daylight>Arabia Daylight Time</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Central">
+				<long>
+					<generic>Australian Central Time</generic>
+					<standard>Australian Central Standard Time</standard>
+					<daylight>Australian Central Daylight Time</daylight>
+				</long>
+				<short>
+					<generic>ACT</generic>
+					<standard>ACST</standard>
+					<daylight>ACDT</daylight>
+				</short>
+			</metazone>
+			<metazone type="Australia_CentralWestern">
+				<short>
+					<generic>ACWT</generic>
+					<standard>ACWST</standard>
+					<daylight>ACWDT</daylight>
+				</short>
+			</metazone>
+			<metazone type="Australia_Eastern">
+				<long>
+					<generic>Australian Eastern Time</generic>
+					<standard>Australian Eastern Standard Time</standard>
+					<daylight>Australian Eastern Daylight Time</daylight>
+				</long>
+				<short>
+					<generic>AET</generic>
+					<standard>AEST</standard>
+					<daylight>AEDT</daylight>
+				</short>
+			</metazone>
+			<metazone type="Australia_Western">
+				<long>
+					<generic>Australian Western Time</generic>
+					<standard>Australian Western Standard Time</standard>
+					<daylight>Australian Western Daylight Time</daylight>
+				</long>
+				<short>
+					<generic>AWT</generic>
+					<standard>AWST</standard>
+					<daylight>AWDT</daylight>
+				</short>
+			</metazone>
+			<metazone type="Cook">
+				<long>
+					<generic>Cook Island Time</generic>
+					<standard>Cook Island Standard Time</standard>
+					<daylight>Cook Island Summer Time</daylight>
+				</long>
+			</metazone>
+			<metazone type="Japan">
+				<long>
+					<generic>Japan Time</generic>
+					<standard>Japan Standard Time</standard>
+					<daylight>Japan Summer Time</daylight>
+				</long>
+			</metazone>
+			<metazone type="Korea">
+				<long>
+					<generic>Korea Time</generic>
+					<standard>Korean Standard Time</standard>
+					<daylight>Korean Summer Time</daylight>
+				</long>
+			</metazone>
+			<metazone type="Lord_Howe">
+				<short>
+					<generic>LHT</generic>
+					<standard>LHST</standard>
+					<daylight>LHDT</daylight>
+				</short>
+			</metazone>
+			<metazone type="Moscow">
+				<long>
+					<generic>Moscow Time</generic>
+					<standard>Moscow Standard Time</standard>
+					<daylight>Moscow Daylight Time</daylight>
+				</long>
+			</metazone>
+			<metazone type="New_Zealand">
+				<short>
+					<generic>NZT</generic>
+					<standard>NZST</standard>
+					<daylight>NZDT</daylight>
+				</short>
+			</metazone>
+			<metazone type="Samoa">
+				<long>
+					<generic>Samoa Time</generic>
+					<standard>Samoa Standard Time</standard>
+					<daylight>Samoa Summer Time</daylight>
+				</long>
+			</metazone>
+			<metazone type="Taipei">
+				<long>
+					<generic>Taipei Time</generic>
+					<standard>Taipei Standard Time</standard>
+					<daylight>Taipei Summer Time</daylight>
+				</long>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<symbols numberSystem="latn">
+			<exponential>e</exponential>
+		</symbols>
+		<currencies>
+			<currency type="AUD">
+				<symbol>$</symbol>
+			</currency>
+			<currency type="AWG">
+				<displayName>Aruba Guilder</displayName>
+				<displayName count="one">Aruba guilder</displayName>
+				<displayName count="other">Aruba guilders</displayName>
+			</currency>
+			<currency type="BAM">
+				<displayName>Bosnia-Herzegovina Convertible Marka</displayName>
+				<displayName count="one">Bosnia-Herzegovina convertible marka</displayName>
+				<displayName count="other">Bosnia-Herzegovina convertible marka</displayName>
+			</currency>
+			<currency type="BBD">
+				<displayName>Barbados Dollar</displayName>
+				<displayName count="one">Barbados dollar</displayName>
+				<displayName count="other">Barbados dollars</displayName>
+			</currency>
+			<currency type="BDT">
+				<symbol alt="narrow" draft="contributed">Tk</symbol>
+			</currency>
+			<currency type="BMD">
+				<displayName>Bermuda Dollar</displayName>
+				<displayName count="one">Bermuda dollar</displayName>
+				<displayName count="other">Bermuda dollars</displayName>
+			</currency>
+			<currency type="BOB">
+				<displayName>Boliviano</displayName>
+				<displayName count="one">boliviano</displayName>
+				<displayName count="other">bolivianos</displayName>
+				<symbol alt="narrow" draft="contributed">$b</symbol>
+			</currency>
+			<currency type="BRL">
+				<symbol draft="contributed">BRL</symbol>
+			</currency>
+			<currency type="CAD">
+				<symbol draft="contributed">CAD</symbol>
+			</currency>
+			<currency type="CNY">
+				<symbol draft="contributed">CNY</symbol>
+			</currency>
+			<currency type="CUP">
+				<symbol alt="narrow" draft="contributed">₱</symbol>
+			</currency>
+			<currency type="EGP">
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="EUR">
+				<displayName count="one">euro</displayName>
+				<displayName count="other">euro</displayName>
+				<symbol draft="contributed">EUR</symbol>
+			</currency>
+			<currency type="GBP">
+				<symbol draft="contributed">GBP</symbol>
+			</currency>
+			<currency type="GEL">
+				<displayName count="one">Georgian lari</displayName>
+				<displayName count="other">Georgian lari</displayName>
+				<symbol alt="variant" draft="contributed">GEL</symbol>
+			</currency>
+			<currency type="HKD">
+				<symbol draft="contributed">HKD</symbol>
+			</currency>
+			<currency type="ILS">
+				<displayName>Israeli Shekel</displayName>
+				<displayName count="one">Israeli shekel</displayName>
+				<displayName count="other">Israeli sheckles</displayName>
+				<symbol draft="contributed">ILS</symbol>
+			</currency>
+			<currency type="INR">
+				<symbol draft="contributed">INR</symbol>
+			</currency>
+			<currency type="ISK">
+				<symbol alt="narrow" draft="contributed">Kr</symbol>
+			</currency>
+			<currency type="JPY">
+				<symbol draft="contributed">JPY</symbol>
+			</currency>
+			<currency type="KRW">
+				<symbol draft="contributed">KRW</symbol>
+			</currency>
+			<currency type="KZT">
+				<displayName count="one">Kazakhstani tenge</displayName>
+				<displayName count="other">Kazakhstani tenge</displayName>
+			</currency>
+			<currency type="LAK">
+				<displayName count="one">Laotian kip</displayName>
+				<displayName count="other">Laotian kip</displayName>
+			</currency>
+			<currency type="MKD">
+				<displayName count="one">Macedonian denar</displayName>
+				<displayName count="other">Macedonian denar</displayName>
+			</currency>
+			<currency type="MXN">
+				<symbol draft="contributed">MXN</symbol>
+			</currency>
+			<currency type="NZD">
+				<symbol draft="contributed">NZD</symbol>
+			</currency>
+			<currency type="PGK">
+				<displayName count="one">Papua New Guinean kina</displayName>
+				<displayName count="other">Papua New Guinean kinas</displayName>
+			</currency>
+			<currency type="PYG">
+				<symbol alt="narrow" draft="contributed">Gs</symbol>
+			</currency>
+			<currency type="QAR">
+				<displayName>Qatari Riyal</displayName>
+				<displayName count="one">Qatari riyal</displayName>
+				<displayName count="other">Quatari riyals</displayName>
+			</currency>
+			<currency type="SCR">
+				<symbol draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="SEK">
+				<symbol alt="narrow" draft="contributed">Kr</symbol>
+			</currency>
+			<currency type="SRD">
+				<displayName>Suriname Dollar</displayName>
+				<displayName count="one">Suriname dollar</displayName>
+				<displayName count="other">Suriname dollars</displayName>
+			</currency>
+			<currency type="TRY">
+				<displayName count="one">Turkish lira</displayName>
+				<displayName count="other">Turkish lire</displayName>
+				<symbol alt="variant" draft="contributed">TRY</symbol>
+			</currency>
+			<currency type="TWD">
+				<symbol draft="contributed">TWD</symbol>
+			</currency>
+			<currency type="USD">
+				<symbol draft="contributed">USD</symbol>
+			</currency>
+			<currency type="UYU">
+				<displayName>Peso Uruguayo</displayName>
+				<symbol alt="narrow" draft="contributed">$U</symbol>
+			</currency>
+			<currency type="UZS">
+				<displayName count="one">Uzbekistani som</displayName>
+				<displayName count="other">Uzbekistani soms</displayName>
+			</currency>
+			<currency type="VND">
+				<displayName count="one">Vietnamese dong</displayName>
+				<displayName count="other">Vietnamese dongs</displayName>
+				<symbol draft="contributed">VND</symbol>
+			</currency>
+			<currency type="WST">
+				<displayName count="one">Samoan tala</displayName>
+				<displayName count="other">Samoan talas</displayName>
+			</currency>
+			<currency type="XAF">
+				<symbol draft="contributed">XAF</symbol>
+			</currency>
+			<currency type="XCD">
+				<symbol draft="contributed">XCD</symbol>
+			</currency>
+			<currency type="XOF">
+				<symbol draft="contributed">XOF</symbol>
+			</currency>
+			<currency type="XPF">
+				<symbol draft="contributed">CFP</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+	<units>
+		<unitLength type="long">
+			<unit type="energy-kilowatt-hour">
+				<displayName>kilowatt hours</displayName>
+				<unitPattern count="one">{0} kilowatt hour</unitPattern>
+				<unitPattern count="other">{0} kilowatt hours</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>kilometre</displayName>
+			</unit>
+			<unit type="length-decimeter">
+				<unitPattern count="one">decimetre</unitPattern>
+				<unitPattern count="other">{0} decimetres</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<perUnitPattern>{0} centimetre</perUnitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>micrometres</displayName>
+			</unit>
+			<unit type="mass-metric-ton">
+				<displayName>tonnes</displayName>
+				<unitPattern count="one">tonne</unitPattern>
+				<unitPattern count="other">{0} tonnes</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>degrees</displayName>
+				<unitPattern count="one">{0} degree</unitPattern>
+				<unitPattern count="other">{0} degrees</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} east</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} north</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} south</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} west</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<unitLength type="short">
+			<unit type="angle-degree">
+				<unitPattern count="one">{0} deg.</unitPattern>
+				<unitPattern count="other">{0} deg.</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>arcmin.</displayName>
+				<unitPattern count="one">{0} arcmin.</unitPattern>
+				<unitPattern count="other">{0} arcmin.</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>arcsec.</displayName>
+				<unitPattern count="one">{0} arcsec.</unitPattern>
+				<unitPattern count="other">{0} arcsec.</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>metres²</displayName>
+			</unit>
+			<unit type="concentr-milligram-per-deciliter">
+				<displayName>mg/dL</displayName>
+				<unitPattern count="one">{0} mg/dL</unitPattern>
+				<unitPattern count="other">{0} mg/dL</unitPattern>
+			</unit>
+			<unit type="concentr-millimole-per-liter">
+				<unitPattern count="one">{0} mmol/L</unitPattern>
+				<unitPattern count="other">{0} mmol/L</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<unitPattern count="one">{0} L/km</unitPattern>
+				<unitPattern count="other">{0} L/km</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100 km</displayName>
+				<unitPattern count="one">{0} L/100 km</unitPattern>
+				<unitPattern count="other">{0} L/100 km</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>miles/gal. US</displayName>
+				<unitPattern count="one">{0} m.p.g. US</unitPattern>
+				<unitPattern count="other">{0} m.p.g. US</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon-imperial">
+				<displayName>miles/gal.</displayName>
+				<unitPattern count="one">{0} m.p.g.</unitPattern>
+				<unitPattern count="other">{0} m.p.g.</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>C.</displayName>
+				<unitPattern count="one">{0} C.</unitPattern>
+				<unitPattern count="other">{0} C.</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<unitPattern count="one">{0} m.</unitPattern>
+				<unitPattern count="other">{0} m.</unitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<perUnitPattern>{0} phr</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>min.</displayName>
+				<unitPattern count="one">{0} min.</unitPattern>
+				<unitPattern count="other">{0} min.</unitPattern>
+				<perUnitPattern>{0}/min.</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>sec.</displayName>
+				<unitPattern count="one">{0} sec.</unitPattern>
+				<unitPattern count="other">{0} sec.</unitPattern>
+				<perUnitPattern>{0} ps.</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>millisec.</displayName>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>μsec.</displayName>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosec.</displayName>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>kWh</displayName>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} l.y.</unitPattern>
+				<unitPattern count="other">{0} l.y.</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>AU</displayName>
+				<unitPattern count="one">{0} AU</unitPattern>
+				<unitPattern count="other">{0} AU</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<unitPattern count="one">{0} fm</unitPattern>
+				<unitPattern count="other">{0} fm</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<unitPattern count="one">{0} CM</unitPattern>
+				<unitPattern count="other">{0} CM</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mb</displayName>
+				<unitPattern count="one">{0} mb</unitPattern>
+				<unitPattern count="other">{0} mb</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<unitPattern count="one">{0} km/h</unitPattern>
+				<unitPattern count="other">{0} km/h</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>metres/sec.</displayName>
+				<unitPattern count="one">{0} m/s.</unitPattern>
+				<unitPattern count="other">{0} m/s.</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<unitPattern count="one">{0} m.p.h.</unitPattern>
+				<unitPattern count="other">{0} m.p.h.</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>deg.</displayName>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hL</displayName>
+				<unitPattern count="one">{0} hL</unitPattern>
+				<unitPattern count="other">{0} hL</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<unitPattern count="one">{0} L</unitPattern>
+				<unitPattern count="other">{0} L</unitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0} dL</unitPattern>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="one">{0} cL</unitPattern>
+				<unitPattern count="other">{0} cL</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>mL</displayName>
+				<unitPattern count="one">{0} mL</unitPattern>
+				<unitPattern count="other">{0} mL</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<unitPattern count="one">{0} bus.</unitPattern>
+				<unitPattern count="other">{0} bus.</unitPattern>
+			</unit>
+		</unitLength>
+		<unitLength type="narrow">
+			<unit type="concentr-milligram-per-deciliter">
+				<displayName>mg/dL</displayName>
+				<unitPattern count="one">{0}mg/dL</unitPattern>
+				<unitPattern count="other">{0}mg/dL</unitPattern>
+			</unit>
+			<unit type="concentr-millimole-per-liter">
+				<displayName>mmol/L</displayName>
+				<unitPattern count="one">{0}mmol/L</unitPattern>
+				<unitPattern count="other">{0}mmol/L</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>L/km</displayName>
+				<unitPattern count="one">{0}L/km</unitPattern>
+				<unitPattern count="other">{0}L/km</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0}L/100km</unitPattern>
+				<unitPattern count="other">{0}L/100km</unitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>min.</displayName>
+				<unitPattern count="one">{0} min.</unitPattern>
+				<unitPattern count="other">{0} min.</unitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>sec.</displayName>
+				<unitPattern count="one">{0} s.</unitPattern>
+				<unitPattern count="other">{0} s.</unitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>msec.</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>metre</displayName>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>km/h</displayName>
+				<unitPattern count="one">{0} km/h</unitPattern>
+				<unitPattern count="other">{0} km/h</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>m.p.h.</displayName>
+				<unitPattern count="one">{0} m.p.h.</unitPattern>
+				<unitPattern count="other">{0} m.p.h.</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<unitPattern count="one">{0}°C</unitPattern>
+				<unitPattern count="other">{0}°C</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0}ML</unitPattern>
+				<unitPattern count="other">{0}ML</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hL</displayName>
+				<unitPattern count="one">{0}hL</unitPattern>
+				<unitPattern count="other">{0}hL</unitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0}dL</unitPattern>
+				<unitPattern count="other">{0}dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="one">{0}cL</unitPattern>
+				<unitPattern count="other">{0}cL</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>mL</displayName>
+				<unitPattern count="one">{0}mL</unitPattern>
+				<unitPattern count="other">{0}mL</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<unitPattern count="one">{0} bus.</unitPattern>
+				<unitPattern count="other">{0} bus.</unitPattern>
+			</unit>
+		</unitLength>
+	</units>
+	<listPatterns>
+		<listPattern>
+			<listPatternPart type="end">{0} and {1}</listPatternPart>
+		</listPattern>
+	</listPatterns>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_BB.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BB.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_BB.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BB.xml
index 26f62411d22..69ce3ee011d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_BB.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BB.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="BB"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_BE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BE.xml
similarity index 86%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_BE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BE.xml
index 4c52a462090..5f070741659 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_BE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BE.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11150 $"/>
-		<generation date="$Date: 2015-01-23 16:43:31 -0600 (Fri, 23 Jan 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="BE"/>
 	</identity>
@@ -62,7 +61,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>HH 'h' mm 'min' ss 's' zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_AI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BI.xml
similarity index 62%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_AI.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BI.xml
index 61696347750..752b8dd3982 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_AI.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BI.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10712 $"/>
-		<generation date="$Date: 2014-08-01 12:07:43 -0500 (Fri, 01 Aug 2014) $"/>
+		<version number="$Revision: 12347 $"/>
 		<language type="en"/>
-		<territory type="AI"/>
+		<territory type="BI"/>
 	</identity>
 	<numbers>
 		<currencies>
-			<currency type="XCD">
-				<symbol>$</symbol>
+			<currency type="BIF">
+				<symbol>FBu</symbol>
 			</currency>
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_BM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BM.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_BM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BM.xml
index e9f208eadbe..6d7b4606868 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_BM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BM.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="BM"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_BS.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BS.xml
similarity index 83%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_BS.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BS.xml
index 7a5a6b8beba..51cceb1d3df 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_BS.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BS.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="BS"/>
 	</identity>
@@ -31,3 +30,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</unitLength>
 	</units>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_BW.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BW.xml
similarity index 96%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_BW.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BW.xml
index 0d5111c3082..340a921f8c4 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_BW.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BW.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11150 $"/>
-		<generation date="$Date: 2015-01-23 16:43:31 -0600 (Fri, 23 Jan 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="BW"/>
 	</identity>
@@ -43,7 +42,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMEd">E, dd/MM/y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">dd MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E, dd MMM y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM" draft="unconfirmed">MMMM y G</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="MMMd">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_BZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BZ.xml
similarity index 98%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_BZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BZ.xml
index cce0b3adb95..7c06d5ee4cc 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_BZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BZ.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11150 $"/>
-		<generation date="$Date: 2015-01-23 16:43:31 -0600 (Fri, 23 Jan 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="BZ"/>
 	</identity>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_CA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CA.xml
similarity index 59%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_CA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CA.xml
index 67271fe2330..6d766b89185 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_CA.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CA.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11416 $"/>
-		<generation date="$Date: 2015-03-16 12:30:30 -0500 (Mon, 16 Mar 2015) $"/>
+		<version number="$Revision: 12291 $"/>
 		<language type="en"/>
 		<territory type="CA"/>
 	</identity>
@@ -33,6 +32,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<dateFormatLength type="short">
 						<dateFormat>
 							<pattern>r-MM-dd</pattern>
+							<pattern alt="variant">d/M/r</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -42,27 +42,38 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="GyMMMd">MMM d, r</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, MMM d, r(U)</dateFormatItem>
 						<dateFormatItem id="Md">MM-dd</dateFormatItem>
+						<dateFormatItem id="Md" alt="variant">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, MM-dd</dateFormatItem>
+						<dateFormatItem id="MEd" alt="variant">E, d/M</dateFormatItem>
 						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
 						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
-                        			<dateFormatItem id="UMd">U-MM-dd</dateFormatItem>
-                        			<dateFormatItem id="UMMMd">MMM d, U</dateFormatItem>
+						<dateFormatItem id="UMd">U-MM-dd</dateFormatItem>
+						<dateFormatItem id="UMd" alt="variant">d/M/U</dateFormatItem>
+						<dateFormatItem id="UMMMd">MMM d, U</dateFormatItem>
 						<dateFormatItem id="yMd">r-MM-dd</dateFormatItem>
+						<dateFormatItem id="yMd" alt="variant">d/M/r</dateFormatItem>
 						<dateFormatItem id="yyyyM">r-MM</dateFormatItem>
+						<dateFormatItem id="yyyyM" alt="variant">M/r</dateFormatItem>
 						<dateFormatItem id="yyyyMd">r-MM-dd</dateFormatItem>
+						<dateFormatItem id="yyyyMd" alt="variant">d/M/r</dateFormatItem>
 						<dateFormatItem id="yyyyMEd">E, r-MM-dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd" alt="variant">E, d/M/r</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">MMM d, r</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E, MMM d, r(U)</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Md">
 							<greatestDifference id="d">MM-dd – MM-dd</greatestDifference>
+							<greatestDifference id="d" alt="variant">d/M – d/M</greatestDifference>
 							<greatestDifference id="M">MM-dd – MM-dd</greatestDifference>
+							<greatestDifference id="M" alt="variant">d/M – d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
 							<greatestDifference id="d">E, MM-dd – E, MM-dd</greatestDifference>
+							<greatestDifference id="d" alt="variant">E, d/M – E, d/M</greatestDifference>
 							<greatestDifference id="M">E, MM-dd – E, MM-dd</greatestDifference>
+							<greatestDifference id="M" alt="variant">E, d/M – E, d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">MMM d – d</greatestDifference>
@@ -74,17 +85,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
 							<greatestDifference id="M">y-MM – y-MM</greatestDifference>
+							<greatestDifference id="M" alt="variant">M/y – M/y</greatestDifference>
 							<greatestDifference id="y">y-MM – y-MM</greatestDifference>
+							<greatestDifference id="y" alt="variant">M/y – M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
 							<greatestDifference id="d">y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="d" alt="variant">d/M/y – d/M/y</greatestDifference>
 							<greatestDifference id="M">y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="M" alt="variant">d/M/y – d/M/y</greatestDifference>
 							<greatestDifference id="y">y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="y" alt="variant">d/M/y – d/M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
 							<greatestDifference id="d">E, y-MM-dd – E, y-MM-dd</greatestDifference>
+							<greatestDifference id="d" alt="variant">E, d/M/y – E, d/M/y</greatestDifference>
 							<greatestDifference id="M">E, y-MM-dd – E, y-MM-dd</greatestDifference>
+							<greatestDifference id="M" alt="variant">E, d/M/y – E, d/M/y</greatestDifference>
 							<greatestDifference id="y">E, y-MM-dd – E, y-MM-dd</greatestDifference>
+							<greatestDifference id="y" alt="variant">E, d/M/y – E, d/M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
 							<greatestDifference id="d">MMM d – d, U</greatestDifference>
@@ -119,6 +138,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<dateFormatLength type="short">
 						<dateFormat>
 							<pattern>GGGGG y-MM-dd</pattern>
+							<pattern alt="variant">d/M/y GGGGG</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -128,23 +148,32 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
 						<dateFormatItem id="Md">MM-dd</dateFormatItem>
+						<dateFormatItem id="Md" alt="variant">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, MM-dd</dateFormatItem>
+						<dateFormatItem id="MEd" alt="variant">E, d/M</dateFormatItem>
 						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
 						<dateFormatItem id="yyyyM">GGGGG y-MM</dateFormatItem>
+						<dateFormatItem id="yyyyM" alt="variant">M/y GGGGG</dateFormatItem>
 						<dateFormatItem id="yyyyMd">GGGGG y-MM-dd</dateFormatItem>
+						<dateFormatItem id="yyyyMd" alt="variant">d/M/y GGGGG</dateFormatItem>
 						<dateFormatItem id="yyyyMEd">E, GGGGG y-MM-dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd" alt="variant">E, d/M/y GGGGG</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">MMM d, y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E, MMM d, y G</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Md">
 							<greatestDifference id="d">MM-dd – MM-dd</greatestDifference>
+							<greatestDifference id="d" alt="variant">d/M – d/M</greatestDifference>
 							<greatestDifference id="M">MM-dd – MM-dd</greatestDifference>
+							<greatestDifference id="M" alt="variant">d/M – d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
 							<greatestDifference id="d">E, MM-dd – E, MM-dd</greatestDifference>
+							<greatestDifference id="d" alt="variant">E, d/M – E, d/M</greatestDifference>
 							<greatestDifference id="M">E, MM-dd – E, MM-dd</greatestDifference>
+							<greatestDifference id="M" alt="variant">E, d/M – E, d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">MMM d – d</greatestDifference>
@@ -156,17 +185,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
 							<greatestDifference id="M">GGGGG y-MM – y-MM</greatestDifference>
+							<greatestDifference id="M" alt="variant">M/y – M/y GGGGG</greatestDifference>
 							<greatestDifference id="y">GGGGG y-MM – y-MM</greatestDifference>
+							<greatestDifference id="y" alt="variant">M/y – M/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
 							<greatestDifference id="d">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="d" alt="variant">d/M/y – d/M/y GGGGG</greatestDifference>
 							<greatestDifference id="M">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="M" alt="variant">d/M/y – d/M/y GGGGG</greatestDifference>
 							<greatestDifference id="y">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="y" alt="variant">d/M/y – d/M/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
 							<greatestDifference id="d">E, y-MM-dd – E, y-MM-dd</greatestDifference>
+							<greatestDifference id="d" alt="variant">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
 							<greatestDifference id="M">E, y-MM-dd – E, y-MM-dd</greatestDifference>
+							<greatestDifference id="M" alt="variant">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
 							<greatestDifference id="y">E, y-MM-dd – E, y-MM-dd</greatestDifference>
+							<greatestDifference id="y" alt="variant">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
 							<greatestDifference id="d">MMM d – d, y G</greatestDifference>
@@ -183,24 +220,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</calendar>
 			<calendar type="gregorian">
 				<dateFormats>
-                    			<dateFormatLength type="full">
-                        			<dateFormat>
-                            				<pattern>EEEE, MMMM d, y</pattern>
-                        			</dateFormat>
-                    			</dateFormatLength>
-                    			<dateFormatLength type="long">
-                        			<dateFormat>
-                            				<pattern>MMMM d, y</pattern>
-                        			</dateFormat>
-                    			</dateFormatLength>
-                    			<dateFormatLength type="medium">
-                        			<dateFormat>
-                            				<pattern>MMM d, y</pattern>
-                        			</dateFormat>
-                    			</dateFormatLength>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE, MMMM d, y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>MMMM d, y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>MMM d, y</pattern>
+						</dateFormat>
+					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
 							<pattern>y-MM-dd</pattern>
+							<pattern alt="variant">d/M/yy</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -209,25 +247,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
 						<dateFormatItem id="Md">MM-dd</dateFormatItem>
+						<dateFormatItem id="Md" alt="variant">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, MM-dd</dateFormatItem>
+						<dateFormatItem id="MEd" alt="variant">E, d/M</dateFormatItem>
 						<dateFormatItem id="MMdd">MM-dd</dateFormatItem>
+						<dateFormatItem id="MMdd" alt="variant">dd/MM</dateFormatItem>
 						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
 						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="yM">y-MM</dateFormatItem>
+						<dateFormatItem id="yM" alt="variant">M/y</dateFormatItem>
 						<dateFormatItem id="yMd">y-MM-dd</dateFormatItem>
+						<dateFormatItem id="yMd" alt="variant">d/M/y</dateFormatItem>
 						<dateFormatItem id="yMEd">E, y-MM-dd</dateFormatItem>
+						<dateFormatItem id="yMEd" alt="variant">E, d/M/y</dateFormatItem>
 						<dateFormatItem id="yMMMd">MMM d, y</dateFormatItem>
 						<dateFormatItem id="yMMMEd">E, MMM d, y</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Md">
 							<greatestDifference id="d">MM-dd – MM-dd</greatestDifference>
+							<greatestDifference id="d" alt="variant">d/M – d/M</greatestDifference>
 							<greatestDifference id="M">MM-dd – MM-dd</greatestDifference>
+							<greatestDifference id="M" alt="variant">d/M – d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
 							<greatestDifference id="d">E, MM-dd – E, MM-dd</greatestDifference>
+							<greatestDifference id="d" alt="variant">E, d/M – E, d/M</greatestDifference>
 							<greatestDifference id="M">E, MM-dd – E, MM-dd</greatestDifference>
+							<greatestDifference id="M" alt="variant">E, d/M – E, d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">MMM d – d</greatestDifference>
@@ -239,17 +287,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
 							<greatestDifference id="M">y-MM – y-MM</greatestDifference>
+							<greatestDifference id="M" alt="variant">M/y – M/y</greatestDifference>
 							<greatestDifference id="y">y-MM – y-MM</greatestDifference>
+							<greatestDifference id="y" alt="variant">M/y – M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
 							<greatestDifference id="d">y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="d" alt="variant">d/M/y – d/M/y</greatestDifference>
 							<greatestDifference id="M">y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="M" alt="variant">d/M/y – d/M/y</greatestDifference>
 							<greatestDifference id="y">y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="y" alt="variant">d/M/y – d/M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
 							<greatestDifference id="d">E, y-MM-dd – E, y-MM-dd</greatestDifference>
+							<greatestDifference id="d" alt="variant">E, d/M/y – E, d/M/y</greatestDifference>
 							<greatestDifference id="M">E, y-MM-dd – E, y-MM-dd</greatestDifference>
+							<greatestDifference id="M" alt="variant">E, d/M/y – E, d/M/y</greatestDifference>
 							<greatestDifference id="y">E, y-MM-dd – E, y-MM-dd</greatestDifference>
+							<greatestDifference id="y" alt="variant">E, d/M/y – E, d/M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
 							<greatestDifference id="d">MMM d – d, y</greatestDifference>
@@ -338,5 +394,108 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 		</currencies>
 	</numbers>
+	<units>
+		<unitLength type="short">
+			<unit type="concentr-milligram-per-deciliter">
+				<displayName>mg/dL</displayName>
+				<unitPattern count="one">{0} mg/dL</unitPattern>
+				<unitPattern count="other">{0} mg/dL</unitPattern>
+			</unit>
+			<unit type="concentr-millimole-per-liter">
+				<unitPattern count="one">{0} mmol/L</unitPattern>
+				<unitPattern count="other">{0} mmol/L</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<unitPattern count="one">{0} L/km</unitPattern>
+				<unitPattern count="other">{0} L/km</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100 km</displayName>
+				<unitPattern count="one">{0} L/100 km</unitPattern>
+				<unitPattern count="other">{0} L/100 km</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hL</displayName>
+				<unitPattern count="one">{0} hL</unitPattern>
+				<unitPattern count="other">{0} hL</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<unitPattern count="one">{0} L</unitPattern>
+				<unitPattern count="other">{0} L</unitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0} dL</unitPattern>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="one">{0} cL</unitPattern>
+				<unitPattern count="other">{0} cL</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>mL</displayName>
+				<unitPattern count="one">{0} mL</unitPattern>
+				<unitPattern count="other">{0} mL</unitPattern>
+			</unit>
+		</unitLength>
+		<unitLength type="narrow">
+			<unit type="concentr-milligram-per-deciliter">
+				<displayName>mg/dL</displayName>
+				<unitPattern count="one">{0}mg/dL</unitPattern>
+				<unitPattern count="other">{0}mg/dL</unitPattern>
+			</unit>
+			<unit type="concentr-millimole-per-liter">
+				<displayName>mmol/L</displayName>
+				<unitPattern count="one">{0}mmol/L</unitPattern>
+				<unitPattern count="other">{0}mmol/L</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>L/km</displayName>
+				<unitPattern count="one">{0}L/km</unitPattern>
+				<unitPattern count="other">{0}L/km</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0}L/100km</unitPattern>
+				<unitPattern count="other">{0}L/100km</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0}ML</unitPattern>
+				<unitPattern count="other">{0}ML</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hL</displayName>
+				<unitPattern count="one">{0}hL</unitPattern>
+				<unitPattern count="other">{0}hL</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<unitPattern count="one">{0}L</unitPattern>
+				<unitPattern count="other">{0}L</unitPattern>
+				<perUnitPattern>{0}/L</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0}dL</unitPattern>
+				<unitPattern count="other">{0}dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="one">{0}cL</unitPattern>
+				<unitPattern count="other">{0}cL</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>mL</displayName>
+				<unitPattern count="one">{0}mL</unitPattern>
+				<unitPattern count="other">{0}mL</unitPattern>
+			</unit>
+		</unitLength>
+	</units>
 </ldml>
 
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CC.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CC.xml
new file mode 100644
index 00000000000..c1fec120c29
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CC.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="en"/>
+		<territory type="CC"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="AUD">
+				<symbol>$</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/de_LI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CH.xml
similarity index 60%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/de_LI.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CH.xml
index 7096e94b8cb..f10610fa146 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/de_LI.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CH.xml
@@ -1,27 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="de"/>
-		<territory type="LI"/>
+		<version number="$Revision: 12347 $"/>
+		<language type="en"/>
+		<territory type="CH"/>
 	</identity>
 	<numbers>
 		<symbols numberSystem="latn">
-			<decimal>.</decimal>
-			<group>'</group>
+			<superscriptingExponent>·</superscriptingExponent>
 		</symbols>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
-					<pattern>¤ #,##0.00</pattern>
+					<pattern>¤ #,##0.00;¤-#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>¤ #,##0.00;¤-#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CK.xml
new file mode 100644
index 00000000000..4f31d37b66f
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CK.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="en"/>
+		<territory type="CK"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="NZD">
+				<symbol>$</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_CM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CM.xml
similarity index 54%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_CM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CM.xml
index 321501288c6..1a89a40f84d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_CM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CM.xml
@@ -1,17 +1,42 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="CM"/>
 	</identity>
 	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
 		<timeZoneNames>
 			<metazone type="Africa_Central">
 				<short>
@@ -38,3 +63,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</timeZoneNames>
 	</dates>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CX.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CX.xml
new file mode 100644
index 00000000000..c872793edc2
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CX.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="en"/>
+		<territory type="CX"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="AUD">
+				<symbol>$</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/tr_CY.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CY.xml
similarity index 63%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/tr_CY.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CY.xml
index 88a828ffb2e..3f180f61e5e 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/tr_CY.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CY.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="tr"/>
+		<version number="$Revision: 12347 $"/>
+		<language type="en"/>
 		<territory type="CY"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DE.xml
new file mode 100644
index 00000000000..4b0e03ba67b
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DE.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12347 $"/>
+		<language type="en"/>
+		<territory type="DE"/>
+	</identity>
+	<numbers>
+		<symbols numberSystem="latn">
+			<superscriptingExponent>·</superscriptingExponent>
+		</symbols>
+		<percentFormats numberSystem="latn">
+			<percentFormatLength>
+				<percentFormat>
+					<pattern>#,##0 %</pattern>
+				</percentFormat>
+			</percentFormatLength>
+		</percentFormats>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DG.xml
new file mode 100644
index 00000000000..ad49f8e0edb
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DG.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="en"/>
+		<territory type="DG"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DK.xml
new file mode 100644
index 00000000000..f60d42321ca
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DK.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12347 $"/>
+		<language type="en"/>
+		<territory type="DK"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="generic">
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="Ehm">E h.mm a</dateFormatItem>
+						<dateFormatItem id="EHm">E HH.mm</dateFormatItem>
+						<dateFormatItem id="Ehms">E h.mm.ss a</dateFormatItem>
+						<dateFormatItem id="EHms">E HH.mm.ss</dateFormatItem>
+						<dateFormatItem id="hm">h.mm a</dateFormatItem>
+						<dateFormatItem id="Hm">HH.mm</dateFormatItem>
+						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
+						<dateFormatItem id="Hms">HH.mm.ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h.mm.ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH.mm.ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h.mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH.mm v</dateFormatItem>
+						<dateFormatItem id="ms">mm.ss</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH.mm.ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH.mm.ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH.mm.ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH.mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="Ehm">E h.mm a</dateFormatItem>
+						<dateFormatItem id="EHm">E HH.mm</dateFormatItem>
+						<dateFormatItem id="Ehms">E h.mm.ss a</dateFormatItem>
+						<dateFormatItem id="EHms">E HH.mm.ss</dateFormatItem>
+						<dateFormatItem id="hm">h.mm a</dateFormatItem>
+						<dateFormatItem id="Hm">HH.mm</dateFormatItem>
+						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
+						<dateFormatItem id="Hms">HH.mm.ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h.mm.ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH.mm.ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h.mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH.mm v</dateFormatItem>
+						<dateFormatItem id="ms">mm.ss</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<symbols numberSystem="latn">
+			<timeSeparator>.</timeSeparator>
+		</symbols>
+		<percentFormats numberSystem="latn">
+			<percentFormatLength>
+				<percentFormat>
+					<pattern>#,##0 %</pattern>
+				</percentFormat>
+			</percentFormatLength>
+		</percentFormats>
+		<currencies>
+			<currency type="DKK">
+				<symbol>kr.</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_DM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DM.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_DM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DM.xml
index 2dde4ee23d0..54138e15de2 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_DM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DM.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10712 $"/>
-		<generation date="$Date: 2014-08-01 12:07:43 -0500 (Fri, 01 Aug 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="DM"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_ER.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ER.xml
similarity index 86%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_ER.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ER.xml
index 2e7758a6614..ba47a07bb58 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_ER.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ER.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="ER"/>
 	</identity>
@@ -45,3 +44,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FI.xml
new file mode 100644
index 00000000000..2be9bab30cd
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FI.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12347 $"/>
+		<language type="en"/>
+		<territory type="FI"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="generic">
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="Ehm">E h.mm a</dateFormatItem>
+						<dateFormatItem id="EHm">E H.mm</dateFormatItem>
+						<dateFormatItem id="Ehms">E h.mm.ss a</dateFormatItem>
+						<dateFormatItem id="EHms">E H.mm.ss</dateFormatItem>
+						<dateFormatItem id="hm">h.mm a</dateFormatItem>
+						<dateFormatItem id="Hm">H.mm</dateFormatItem>
+						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
+						<dateFormatItem id="Hms">H.mm.ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h.mm.ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">H.mm.ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h.mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">H.mm v</dateFormatItem>
+						<dateFormatItem id="ms">mm.ss</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>H.mm.ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>H.mm.ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>H.mm.ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>H.mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="Ehm">E h.mm a</dateFormatItem>
+						<dateFormatItem id="EHm">E H.mm</dateFormatItem>
+						<dateFormatItem id="Ehms">E h.mm.ss a</dateFormatItem>
+						<dateFormatItem id="EHms">E H.mm.ss</dateFormatItem>
+						<dateFormatItem id="hm">h.mm a</dateFormatItem>
+						<dateFormatItem id="Hm">H.mm</dateFormatItem>
+						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
+						<dateFormatItem id="Hms">H.mm.ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h.mm.ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">H.mm.ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h.mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">H.mm v</dateFormatItem>
+						<dateFormatItem id="ms">mm.ss</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<symbols numberSystem="latn">
+			<group> </group>
+			<timeSeparator>.</timeSeparator>
+		</symbols>
+		<percentFormats numberSystem="latn">
+			<percentFormatLength>
+				<percentFormat>
+					<pattern>#,##0 %</pattern>
+				</percentFormat>
+			</percentFormatLength>
+		</percentFormats>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_FJ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FJ.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_FJ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FJ.xml
index 23e3c806bdd..7e85bd0b29a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_FJ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FJ.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="FJ"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FK.xml
new file mode 100644
index 00000000000..4859d8008da
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FK.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="en"/>
+		<territory type="FK"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="FKP">
+				<symbol>£</symbol>
+			</currency>
+			<currency type="GBP">
+				<symbol>GB£</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_FM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FM.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_FM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FM.xml
index 785b9d28462..7694f4f4913 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_FM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FM.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="FM"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GB.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GB.xml
new file mode 100644
index 00000000000..e1e53309f12
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GB.xml
@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12217 $"/>
+		<language type="en"/>
+		<territory type="GB"/>
+	</identity>
+	<localeDisplayNames>
+		<languages>
+			<language type="nds_NL">West Low German</language>
+		</languages>
+		<keys>
+			<key type="colNormalization">Normalised Sorting</key>
+		</keys>
+		<types>
+			<type key="colNormalization" type="no">Sort Without Normalisation</type>
+			<type key="colNormalization" type="yes">Sort Unicode Normalised</type>
+		</types>
+	</localeDisplayNames>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">am</dayPeriod>
+							<dayPeriod type="pm">pm</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">am</dayPeriod>
+							<dayPeriod type="pm">pm</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">a</dayPeriod>
+							<dayPeriod type="pm">p</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">am</dayPeriod>
+							<dayPeriod type="pm">pm</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="year-short">
+				<displayName>yr</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">in {0} yr</relativeTimePattern>
+					<relativeTimePattern count="other">in {0} yr</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} yr ago</relativeTimePattern>
+					<relativeTimePattern count="other">{0} yr ago</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">in {0} yr</relativeTimePattern>
+					<relativeTimePattern count="other">in {0} yr</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} yr ago</relativeTimePattern>
+					<relativeTimePattern count="other">{0} yr ago</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-short">
+				<displayName>qtr</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">in {0} qtr</relativeTimePattern>
+					<relativeTimePattern count="other">in {0} qtr</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} qtr ago</relativeTimePattern>
+					<relativeTimePattern count="other">{0} qtr ago</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-narrow">
+				<displayName>qtr</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">in {0} qtr</relativeTimePattern>
+					<relativeTimePattern count="other">in {0} qtr</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} qtr ago</relativeTimePattern>
+					<relativeTimePattern count="other">{0} qtr ago</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-short">
+				<displayName>mo</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">in {0} mo</relativeTimePattern>
+					<relativeTimePattern count="other">in {0} mo</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} mo ago</relativeTimePattern>
+					<relativeTimePattern count="other">{0} mo ago</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-narrow">
+				<displayName>mo</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">in {0} mo</relativeTimePattern>
+					<relativeTimePattern count="other">in {0} mo</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} mo ago</relativeTimePattern>
+					<relativeTimePattern count="other">{0} mo ago</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-short">
+				<displayName>wk</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">in {0} wk</relativeTimePattern>
+					<relativeTimePattern count="other">in {0} wk</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} wk ago</relativeTimePattern>
+					<relativeTimePattern count="other">{0} wk ago</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-narrow">
+				<displayName>wk</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">in {0} wk</relativeTimePattern>
+					<relativeTimePattern count="other">in {0} wk</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} wk ago</relativeTimePattern>
+					<relativeTimePattern count="other">{0} wk ago</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="dayperiod">
+				<displayName>am/pm</displayName>
+			</field>
+			<field type="hour-short">
+				<displayName>hr</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">in {0} hr</relativeTimePattern>
+					<relativeTimePattern count="other">in {0} hr</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} hr ago</relativeTimePattern>
+					<relativeTimePattern count="other">{0} hr ago</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">in {0} hr</relativeTimePattern>
+					<relativeTimePattern count="other">in {0} hr</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} hr ago</relativeTimePattern>
+					<relativeTimePattern count="other">{0} hr ago</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-short">
+				<displayName>min</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">in {0} min</relativeTimePattern>
+					<relativeTimePattern count="other">in {0} min</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} min ago</relativeTimePattern>
+					<relativeTimePattern count="other">{0} min ago</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">in {0} min</relativeTimePattern>
+					<relativeTimePattern count="other">in {0} min</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} min ago</relativeTimePattern>
+					<relativeTimePattern count="other">{0} min ago</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-short">
+				<displayName>sec</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">in {0} sec</relativeTimePattern>
+					<relativeTimePattern count="other">in {0} sec</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} sec ago</relativeTimePattern>
+					<relativeTimePattern count="other">{0} sec ago</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">in {0} sec</relativeTimePattern>
+					<relativeTimePattern count="other">in {0} sec</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} sec ago</relativeTimePattern>
+					<relativeTimePattern count="other">{0} sec ago</relativeTimePattern>
+				</relativeTime>
+			</field>
+		</fields>
+		<timeZoneNames>
+			<zone type="Europe/London">
+				<short>
+					<daylight>BST</daylight>
+				</short>
+			</zone>
+			<metazone type="Europe_Central">
+				<short>
+					<generic>CET</generic>
+					<standard>CET</standard>
+					<daylight>CEST</daylight>
+				</short>
+			</metazone>
+			<metazone type="Europe_Eastern">
+				<short>
+					<generic>EET</generic>
+					<standard>EET</standard>
+					<daylight>EEST</daylight>
+				</short>
+			</metazone>
+			<metazone type="Europe_Western">
+				<short>
+					<generic>WET</generic>
+					<standard>WET</standard>
+					<daylight>WEST</daylight>
+				</short>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="ILR">
+				<displayName>Israeli Shekel (1980–1985)</displayName>
+				<displayName count="one">Israeli shekel (1980–1985)</displayName>
+				<displayName count="other">Israeli shekels (1980–1985)</displayName>
+			</currency>
+			<currency type="ILS">
+				<displayName>Israeli New Shekel</displayName>
+				<displayName count="one">Israeli new shekel</displayName>
+				<displayName count="other">Israeli new shekels</displayName>
+			</currency>
+		</currencies>
+	</numbers>
+	<units>
+		<unitLength type="long">
+			<unit type="mass-stone">
+				<displayName>stone</displayName>
+				<unitPattern count="one">{0} stone</unitPattern>
+				<unitPattern count="other">{0} stone</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>kelvin</displayName>
+				<unitPattern count="one">{0} kelvin</unitPattern>
+				<unitPattern count="other">{0} kelvin</unitPattern>
+			</unit>
+		</unitLength>
+		<unitLength type="short">
+			<unit type="duration-hour">
+				<perUnitPattern>{0}ph</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<perUnitPattern>{0}ps</perUnitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName>stone</displayName>
+			</unit>
+		</unitLength>
+	</units>
+	<listPatterns>
+		<listPattern>
+			<listPatternPart type="end">{0} and {1}</listPatternPart>
+		</listPattern>
+	</listPatterns>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GD.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GD.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GD.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GD.xml
index 9354098821c..17baf1ab943 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GD.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GD.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10712 $"/>
-		<generation date="$Date: 2014-08-01 12:07:43 -0500 (Fri, 01 Aug 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="GD"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GG.xml
new file mode 100644
index 00000000000..87137b4189e
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GG.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="en"/>
+		<territory type="GG"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="GBP">
+				<displayName>UK Pound</displayName>
+				<displayName count="one">UK pound</displayName>
+				<displayName count="other">UK pounds</displayName>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GH.xml
similarity index 86%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GH.xml
index f52ae0ce52e..a8b967f0140 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GH.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GH.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="GH"/>
 	</identity>
@@ -45,3 +44,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GI.xml
new file mode 100644
index 00000000000..a177eac3c56
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GI.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="en"/>
+		<territory type="GI"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="GBP">
+				<symbol>GB£</symbol>
+			</currency>
+			<currency type="GIP">
+				<symbol>£</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GM.xml
similarity index 86%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GM.xml
index fddd55d0a1a..a4c8c05649f 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GM.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="GM"/>
 	</identity>
@@ -45,3 +44,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GU.xml
similarity index 75%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GU.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GU.xml
index 5273a0e52e4..4a6ddf57a90 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GU.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GU.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="GU"/>
 	</identity>
@@ -21,3 +20,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</timeZoneNames>
 	</dates>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GY.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GY.xml
similarity index 66%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GY.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GY.xml
index 2e900394df8..fea5a9e5f24 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_GY.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GY.xml
@@ -1,16 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="GY"/>
 	</identity>
+	<dates>
+		<timeZoneNames>
+			<metazone type="Guyana">
+				<short>
+					<standard>GYT</standard>
+				</short>
+			</metazone>
+		</timeZoneNames>
+	</dates>
 	<numbers>
 		<currencies>
 			<currency type="GYD">
@@ -19,3 +27,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_HK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_HK.xml
similarity index 97%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_HK.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_HK.xml
index ab6a2d85bab..8a1b585e55f 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_HK.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_HK.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11150 $"/>
-		<generation date="$Date: 2015-01-23 16:43:31 -0600 (Fri, 23 Jan 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="HK"/>
 	</identity>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_IE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IE.xml
similarity index 80%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_IE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IE.xml
index 7640365588f..e1318d92cc4 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_IE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IE.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11150 $"/>
-		<generation date="$Date: 2015-01-23 16:43:31 -0600 (Fri, 23 Jan 2015) $"/>
+		<version number="$Revision: 11979 $"/>
 		<language type="en"/>
 		<territory type="IE"/>
 	</identity>
@@ -68,6 +67,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
 				<dateTimeFormats>
 					<availableFormats>
 						<dateFormatItem id="Md" draft="contributed">d/M</dateFormatItem>
@@ -99,5 +120,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</zone>
 		</timeZoneNames>
 	</dates>
+	<units>
+		<unitLength type="long">
+			<unit type="mass-stone">
+				<displayName>stone</displayName>
+				<unitPattern count="one">{0} stone</unitPattern>
+				<unitPattern count="other">{0} stone</unitPattern>
+			</unit>
+		</unitLength>
+		<unitLength type="short">
+			<unit type="mass-stone">
+				<displayName>stone</displayName>
+			</unit>
+		</unitLength>
+	</units>
 </ldml>
 
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IL.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IL.xml
new file mode 100644
index 00000000000..8f11e2701f5
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IL.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12347 $"/>
+		<language type="en"/>
+		<territory type="IL"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="generic">
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="EHm">E H:mm</dateFormatItem>
+						<dateFormatItem id="EHms">E H:mm:ss</dateFormatItem>
+						<dateFormatItem id="H">H</dateFormatItem>
+						<dateFormatItem id="Hm">H:mm</dateFormatItem>
+						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>H:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>H:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>H:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>H:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="EHm">E H:mm</dateFormatItem>
+						<dateFormatItem id="EHms">E H:mm:ss</dateFormatItem>
+						<dateFormatItem id="H">H</dateFormatItem>
+						<dateFormatItem id="Hm">H:mm</dateFormatItem>
+						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IM.xml
new file mode 100644
index 00000000000..2d061e1a6ab
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IM.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="en"/>
+		<territory type="IM"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="GBP">
+				<displayName>UK Pound</displayName>
+				<displayName count="one">UK pound</displayName>
+				<displayName count="other">UK pounds</displayName>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IN.xml
similarity index 96%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IN.xml
index 9cdc906ef1b..ce3e3d95187 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_IN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IN.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="IN"/>
 	</identity>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IO.xml
new file mode 100644
index 00000000000..6a89735f8fe
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IO.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="en"/>
+		<territory type="IO"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_JE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_JE.xml
new file mode 100644
index 00000000000..b459fe72825
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_JE.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="en"/>
+		<territory type="JE"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="GBP">
+				<displayName>UK Pound</displayName>
+				<displayName count="one">UK pound</displayName>
+				<displayName count="other">UK pounds</displayName>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_JM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_JM.xml
similarity index 96%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_JM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_JM.xml
index a7c4700576a..216f33b18eb 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_JM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_JM.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11093 $"/>
-		<generation date="$Date: 2015-01-02 21:36:02 -0600 (Fri, 02 Jan 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="JM"/>
 	</identity>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KE.xml
similarity index 57%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KE.xml
index bf8fa8911cf..9799b90270d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_KE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KE.xml
@@ -1,17 +1,42 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="KE"/>
 	</identity>
 	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
 		<timeZoneNames>
 			<metazone type="Africa_Central">
 				<short>
@@ -45,3 +70,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_KI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KI.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_KI.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KI.xml
index 36c02d4bb9e..274bdd34958 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_KI.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KI.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="KI"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_KN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KN.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_KN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KN.xml
index 8e19f579c1d..09ac69ef087 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_KN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KN.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10712 $"/>
-		<generation date="$Date: 2014-08-01 12:07:43 -0500 (Fri, 01 Aug 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="KN"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_KY.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KY.xml
similarity index 83%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_KY.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KY.xml
index 8645fb6d503..1ed8c01d1f9 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_KY.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KY.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="KY"/>
 	</identity>
@@ -31,3 +30,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</unitLength>
 	</units>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_LC.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_LC.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_LC.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_LC.xml
index ec6f72541e5..bb5b6f9640e 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_LC.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_LC.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10712 $"/>
-		<generation date="$Date: 2014-08-01 12:07:43 -0500 (Fri, 01 Aug 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="LC"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_LR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_LR.xml
similarity index 86%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_LR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_LR.xml
index db79f9543da..7a0ec0e68e0 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_LR.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_LR.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="LR"/>
 	</identity>
@@ -45,3 +44,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_LS.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_LS.xml
similarity index 86%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_LS.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_LS.xml
index 9dc2bafc650..05a84b83309 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_LS.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_LS.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="LS"/>
 	</identity>
@@ -45,3 +44,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MG.xml
similarity index 57%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MG.xml
index 98f09f4b86b..f5e72591f53 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MG.xml
@@ -1,17 +1,42 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="MG"/>
 	</identity>
 	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
 		<timeZoneNames>
 			<metazone type="Africa_Central">
 				<short>
@@ -45,3 +70,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MH.xml
similarity index 92%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MH.xml
index 4549e4d8520..320e6cd21dd 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MH.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MH.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="MH"/>
 	</identity>
@@ -72,3 +71,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</timeZoneNames>
 	</dates>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MO.xml
similarity index 83%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MO.xml
index 765982e9285..e6ac26bdbe3 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MO.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MO.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11150 $"/>
-		<generation date="$Date: 2015-01-23 16:43:31 -0600 (Fri, 23 Jan 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="MO"/>
 	</identity>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MP.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MP.xml
similarity index 92%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MP.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MP.xml
index 9521283c566..8bdd7c2970f 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MP.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MP.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="MP"/>
 	</identity>
@@ -72,3 +71,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</timeZoneNames>
 	</dates>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MS.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MS.xml
new file mode 100644
index 00000000000..0611197e729
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MS.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="en"/>
+		<territory type="MS"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="XCD">
+				<symbol>$</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MT.xml
similarity index 88%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MT.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MT.xml
index f1f9ae9840f..688ddca0d76 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MT.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MT.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11150 $"/>
-		<generation date="$Date: 2015-01-23 16:43:31 -0600 (Fri, 23 Jan 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="MT"/>
 	</identity>
@@ -80,6 +79,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
 				<dateTimeFormats>
 					<availableFormats>
 						<dateFormatItem id="MMMd">dd MMM</dateFormatItem>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MU.xml
similarity index 57%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MU.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MU.xml
index 23cc19daa88..3002d387dba 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MU.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MU.xml
@@ -1,17 +1,42 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="MU"/>
 	</identity>
 	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
 		<timeZoneNames>
 			<metazone type="Africa_Central">
 				<short>
@@ -45,3 +70,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MW.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MW.xml
similarity index 86%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MW.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MW.xml
index 6b8fd4bf2eb..8d289d33193 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MW.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MW.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="MW"/>
 	</identity>
@@ -45,3 +44,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MY.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MY.xml
similarity index 79%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MY.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MY.xml
index fea60767f54..e749f805c27 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_MY.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MY.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10301 $"/>
-		<generation date="$Date: 2014-05-14 00:17:36 -0500 (Wed, 14 May 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="MY"/>
 	</identity>
@@ -28,3 +27,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_NA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NA.xml
similarity index 86%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_NA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NA.xml
index 84b9f3f81af..4f336bc6b4e 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_NA.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NA.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="NA"/>
 	</identity>
@@ -45,3 +44,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NF.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NF.xml
new file mode 100644
index 00000000000..40c672070dd
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NF.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="en"/>
+		<territory type="NF"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="AUD">
+				<symbol>$</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_NG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NG.xml
similarity index 86%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_NG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NG.xml
index 68a72327707..03889c6d441 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_NG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NG.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="NG"/>
 	</identity>
@@ -45,3 +44,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_PY.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NL.xml
similarity index 58%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_PY.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NL.xml
index 92f26276da2..0374115999e 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_PY.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NL.xml
@@ -1,32 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="es"/>
-		<territory type="PY"/>
+		<version number="$Revision: 12347 $"/>
+		<language type="en"/>
+		<territory type="NL"/>
 	</identity>
 	<numbers>
-		<symbols numberSystem="latn">
-			<decimal>,</decimal>
-			<group>.</group>
-		</symbols>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤ #,##0.00;¤ -#,##0.00</pattern>
 				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
-		<currencies>
-			<currency type="PYG">
-				<symbol>₲</symbol>
-			</currency>
-		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NR.xml
new file mode 100644
index 00000000000..b6593afd93b
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NR.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="en"/>
+		<territory type="NR"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="AUD">
+				<symbol>$</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NU.xml
new file mode 100644
index 00000000000..fa0c1461935
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NU.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="en"/>
+		<territory type="NU"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="NZD">
+				<symbol>$</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_NZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NZ.xml
similarity index 96%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_NZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NZ.xml
index 90fb6e9dab1..04b108552d2 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_NZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NZ.xml
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11151 $"/>
-		<generation date="$Date: 2015-01-23 22:41:37 -0600 (Fri, 23 Jan 2015) $"/>
+		<version number="$Revision: 12295 $"/>
 		<language type="en"/>
 		<territory type="NZ"/>
 	</identity>
+	<localeDisplayNames>
+		<languages>
+			<language type="mi">Māori</language>
+		</languages>
+	</localeDisplayNames>
 	<dates>
 		<calendars>
 			<calendar type="generic">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_PG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PG.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_PG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PG.xml
index 65f23ad709e..a0eaf3951f3 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_PG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PG.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="PG"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_PH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PH.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_PH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PH.xml
index ba4f14f82d4..b9e505c705f 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_PH.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PH.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="PH"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_PK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PK.xml
similarity index 97%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_PK.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PK.xml
index f7b838394f2..3d1ea88d93b 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_PK.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PK.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11151 $"/>
-		<generation date="$Date: 2015-01-23 22:41:37 -0600 (Fri, 23 Jan 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="PK"/>
 	</identity>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PN.xml
new file mode 100644
index 00000000000..9f2c7f7619e
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PN.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="en"/>
+		<territory type="PN"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="NZD">
+				<symbol>$</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_PR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PR.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_PR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PR.xml
index 9e66e0f322a..a693b9b3cd2 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_PR.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PR.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="PR"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_PW.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PW.xml
similarity index 81%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_PW.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PW.xml
index b81aaa76034..f2c5c468d45 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_PW.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PW.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="PW"/>
 	</identity>
@@ -24,3 +23,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</unitLength>
 	</units>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_RW.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_RW.xml
similarity index 57%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_RW.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_RW.xml
index c14ea4d79a8..9376d780e11 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_RW.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_RW.xml
@@ -1,17 +1,42 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="RW"/>
 	</identity>
 	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
 		<timeZoneNames>
 			<metazone type="Africa_Central">
 				<short>
@@ -45,3 +70,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SB.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SB.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SB.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SB.xml
index 53e1398e35d..786687c37f2 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SB.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SB.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="SB"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SC.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SC.xml
new file mode 100644
index 00000000000..df22c97e555
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SC.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="en"/>
+		<territory type="SC"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="SCR">
+				<symbol>SR</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SD.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SD.xml
similarity index 84%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SD.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SD.xml
index ab6c6b3cf2a..db0cf3e07cf 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SD.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SD.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="SD"/>
 	</identity>
@@ -38,3 +37,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</timeZoneNames>
 	</dates>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SE.xml
new file mode 100644
index 00000000000..54ca2f7bd8f
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SE.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12347 $"/>
+		<language type="en"/>
+		<territory type="SE"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>G y-MM-dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="yyyyM">y-MM G</dateFormatItem>
+						<dateFormatItem id="yyyyMd">y-MM-dd G</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E y-MM-dd G</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<dateFormats>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>y-MM-dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="yM">y-MM</dateFormatItem>
+						<dateFormatItem id="yMd">y-MM-dd</dateFormatItem>
+						<dateFormatItem id="yMEd">E, y-MM-dd</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<symbols numberSystem="latn">
+			<group> </group>
+			<exponential>×10^</exponential>
+		</symbols>
+		<percentFormats numberSystem="latn">
+			<percentFormatLength>
+				<percentFormat>
+					<pattern>#,##0 %</pattern>
+				</percentFormat>
+			</percentFormatLength>
+		</percentFormats>
+		<currencies>
+			<currency type="SEK">
+				<symbol>kr</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SG.xml
similarity index 96%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SG.xml
index 27ae9dc70ba..02dc3b04272 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SG.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11151 $"/>
-		<generation date="$Date: 2015-01-23 22:41:37 -0600 (Fri, 23 Jan 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="SG"/>
 	</identity>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SH.xml
new file mode 100644
index 00000000000..86c1bc80dc2
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SH.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="en"/>
+		<territory type="SH"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="GBP">
+				<symbol>GB£</symbol>
+			</currency>
+			<currency type="SHP">
+				<symbol>£</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_VE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SI.xml
similarity index 53%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_VE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SI.xml
index 15e859155d4..64ea0e802a0 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_VE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SI.xml
@@ -1,32 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="es"/>
-		<territory type="VE"/>
+		<version number="$Revision: 12347 $"/>
+		<language type="en"/>
+		<territory type="SI"/>
 	</identity>
 	<numbers>
 		<symbols numberSystem="latn">
-			<decimal>,</decimal>
-			<group>.</group>
+			<exponential>e</exponential>
 		</symbols>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
-				<currencyFormat type="standard">
-					<pattern>¤#,##0.00;¤-#,##0.00</pattern>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
-		<currencies>
-			<currency type="VEF">
-				<symbol>Bs.</symbol>
-			</currency>
-		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SL.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SL.xml
similarity index 86%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SL.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SL.xml
index 4acdad75d71..9a1ada7b175 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SL.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SL.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="SL"/>
 	</identity>
@@ -45,3 +44,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SS.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SS.xml
similarity index 87%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SS.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SS.xml
index 280ad3dfea9..943fbca600f 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SS.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SS.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="SS"/>
 	</identity>
@@ -48,3 +47,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SX.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SX.xml
new file mode 100644
index 00000000000..52044804b41
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SX.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="en"/>
+		<territory type="SX"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="ANG">
+				<symbol>NAf.</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SZ.xml
similarity index 86%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SZ.xml
index 66ef5636311..657ddc56cda 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_SZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SZ.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="SZ"/>
 	</identity>
@@ -45,3 +44,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_TC.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TC.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_TC.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TC.xml
index faf44fc248c..cd095d05baa 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_TC.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TC.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="TC"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TK.xml
new file mode 100644
index 00000000000..1a875582fc8
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TK.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="en"/>
+		<territory type="TK"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="NZD">
+				<symbol>$</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_TO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TO.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_TO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TO.xml
index 9b932626e74..752813d9c5b 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_TO.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TO.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="TO"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_TT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TT.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_TT.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TT.xml
index 2ba7e8479a9..08be2905e55 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_TT.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TT.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="TT"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TV.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TV.xml
new file mode 100644
index 00000000000..3154cdea8f0
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TV.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="en"/>
+		<territory type="TV"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="AUD">
+				<symbol>$</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_TZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TZ.xml
similarity index 57%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_TZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TZ.xml
index dffba39a3d1..7e5d5960410 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_TZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TZ.xml
@@ -1,17 +1,42 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="TZ"/>
 	</identity>
 	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
 		<timeZoneNames>
 			<metazone type="Africa_Central">
 				<short>
@@ -45,3 +70,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_UG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_UG.xml
similarity index 57%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_UG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_UG.xml
index b2d29596498..f4142073977 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_UG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_UG.xml
@@ -1,17 +1,42 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="UG"/>
 	</identity>
 	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
 		<timeZoneNames>
 			<metazone type="Africa_Central">
 				<short>
@@ -45,3 +70,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_UM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_UM.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_UM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_UM.xml
index b3923800eb3..ace22bf4ab4 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_UM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_UM.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="UM"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_US.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_US.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_US.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_US.xml
index 5c3dc9d66b1..0f21f3beecb 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_US.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_US.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="US"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_US_POSIX.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_US_POSIX.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_US_POSIX.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_US_POSIX.xml
index f7fa9483049..512f884c5d5 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_US_POSIX.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_US_POSIX.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
@@ -14,8 +14,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		 being used, and multi-level UCA collation was expected.
 	-->
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="US"/>
 		<variant type="POSIX"/>
@@ -55,3 +54,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencyFormats>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_VC.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VC.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_VC.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VC.xml
index ada2dcafb2f..910b1aba819 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_VC.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VC.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10712 $"/>
-		<generation date="$Date: 2014-08-01 12:07:43 -0500 (Fri, 01 Aug 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="VC"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_VG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VG.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_VG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VG.xml
index 4fe895bc59e..fb5612dc905 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_VG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VG.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="VG"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_VI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VI.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_VI.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VI.xml
index d306421cd11..482bc861da6 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_VI.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VI.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="VI"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_VU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VU.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_VU.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VU.xml
index 5182f212057..f8f3f3105c4 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_VU.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VU.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="VU"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_WS.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_WS.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_WS.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_WS.xml
index ced05eeea49..d084012355c 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_WS.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_WS.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="WS"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_ZA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ZA.xml
similarity index 98%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_ZA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ZA.xml
index 3c4486a4e23..267700ae8e6 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_ZA.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ZA.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11151 $"/>
-		<generation date="$Date: 2015-01-23 22:41:37 -0600 (Fri, 23 Jan 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="ZA"/>
 	</identity>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_ZM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ZM.xml
similarity index 86%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_ZM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ZM.xml
index 68b3cddbf10..457402c1c23 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_ZM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ZM.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="ZM"/>
 	</identity>
@@ -45,3 +44,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_ZW.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ZW.xml
similarity index 98%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_ZW.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ZW.xml
index bfc817dc028..56ae8d06f72 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/en_ZW.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ZW.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11151 $"/>
-		<generation date="$Date: 2015-01-23 22:41:37 -0600 (Fri, 23 Jan 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="en"/>
 		<territory type="ZW"/>
 	</identity>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/eo.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eo.xml
similarity index 97%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/eo.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eo.xml
index 0493dd7a23c..cacc8b9cb29 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/eo.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eo.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2016 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11093 $"/>
-		<generation date="$Date: 2015-01-02 21:36:02 -0600 (Fri, 02 Jan 2015) $"/>
+		<version number="$Revision: 12354 $"/>
 		<language type="eo"/>
 	</identity>
 	<localeDisplayNames>
@@ -209,13 +208,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</scripts>
 		<territories>
 			<territory type="AD">Andoro</territory>
-			<territory type="AE">Unuiĝintaj Arabaj Emirlandos</territory>
+			<territory type="AE">Unuiĝintaj Arabaj Emirlandoj</territory>
 			<territory type="AF">Afganujo</territory>
 			<territory type="AG">Antigvo-Barbudo</territory>
 			<territory type="AI">Angvilo</territory>
 			<territory type="AL">Albanujo</territory>
 			<territory type="AM">Armenujo</territory>
-			<territory type="AN">Nederlandaj Antiloj</territory>
 			<territory type="AO">Angolo</territory>
 			<territory type="AQ">Antarkto</territory>
 			<territory type="AR">Argentino</territory>
@@ -437,10 +435,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ZZ" draft="unconfirmed">nekonata regiono</territory>
 		</territories>
 		<types>
-			<type type="gregorian" key="calendar" draft="unconfirmed">gregoria kalendaro</type>
-			<type type="iso8601" key="calendar" draft="unconfirmed">kalendaro ISO-8601</type>
-			<type type="latn" key="numbers" draft="unconfirmed">eŭropaj ciferoj</type>
-			<type type="standard" key="collation" draft="unconfirmed">norma ordigo</type>
+			<type key="calendar" type="gregorian" draft="unconfirmed">gregoria kalendaro</type>
+			<type key="calendar" type="iso8601" draft="unconfirmed">kalendaro ISO-8601</type>
+			<type key="collation" type="standard" draft="unconfirmed">norma ordigo</type>
+			<type key="numbers" type="latn" draft="unconfirmed">eŭropaj ciferoj</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric" draft="unconfirmed">metra</measurementSystemName>
@@ -721,14 +719,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">atm</dayPeriod>
+							<dayPeriod type="pm">ptm</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am" draft="unconfirmed">a</dayPeriod>
-							<dayPeriod type="noon" draft="unconfirmed">t</dayPeriod>
 							<dayPeriod type="pm" draft="unconfirmed">p</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">atm</dayPeriod>
-							<dayPeriod type="noon" draft="unconfirmed">tagmezo</dayPeriod>
 							<dayPeriod type="pm">ptm</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
@@ -1278,6 +1278,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</percentFormatLength>
 		</percentFormats>
 		<currencyFormats numberSystem="latn">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤ 0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤ 00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤ 000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤ 0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤ 00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤ 000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤ 0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤ 00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤ 000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤ 0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤ 00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤ 000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one" draft="unconfirmed">{0} {1}</unitPattern>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -1470,21 +1498,41 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</numbers>
 	<units>
 		<unitLength type="long">
-			<unit type="area-acre">
-				<displayName draft="unconfirmed">akreoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} akreo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} akreoj</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName draft="unconfirmed">kvadrataj kilometroj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} kvadrata kilometro</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} kvadrataj kilometroj</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName draft="unconfirmed">hektaroj</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} hektaro</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} hektaroj</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName draft="unconfirmed">kvadrataj metroj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} kvadrata metro</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} kvadrataj metroj</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName draft="unconfirmed">kvadrataj centimetroj</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} kvadrata centimetro</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} kvadrataj centimetroj</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<displayName draft="unconfirmed">kvadrataj mejloj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} kvadrata mejlo</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} kvadrataj mejloj</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName draft="unconfirmed">akreoj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} akreo</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} akreoj</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName draft="unconfirmed">kvadrataj jardoj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} kvadrata jardo</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} kvadrataj jardoj</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<displayName draft="unconfirmed">kvadrataj futoj</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} kvadrata futo</unitPattern>
@@ -1495,75 +1543,70 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} kvadrata colo</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} kvadrataj coloj</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="unconfirmed">kvadrataj kilometroj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} kvadrata kilometro</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} kvadrataj kilometroj</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName draft="unconfirmed">kvadrataj metroj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} kvadrata metro</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} kvadrataj metroj</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName draft="unconfirmed">kvadrataj mejloj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} kvadrata mejlo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} kvadrataj mejloj</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName draft="unconfirmed">kvadrataj jardoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} kvadrata jardo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} kvadrataj jardoj</unitPattern>
-			</unit>
-			<unit type="digital-bit">
-				<displayName draft="unconfirmed">bitoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} bito</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} bitoj</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName draft="unconfirmed">bajtoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} bajto</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} bajtoj</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName draft="unconfirmed">gigabitoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} gigabito</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} gigabitoj</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName draft="unconfirmed">gigabajtoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} gigabajto</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} gigabajtoj</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName draft="unconfirmed">kilobitoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} kilobito</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} kilobitoj</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName draft="unconfirmed">kilobajtoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} kilobajto</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} kilobajtoj</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName draft="unconfirmed">megabitoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} megabito</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} megabitoj</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName draft="unconfirmed">megabajtoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} megabajto</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} megabajtoj</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName draft="unconfirmed">terabajtoj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} terabajto</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} terabajtoj</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName draft="unconfirmed">terabitoj</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} terabito</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} terabitoj</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName draft="unconfirmed">terabajtoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} terabajto</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} terabajtoj</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName draft="unconfirmed">gigabajtoj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} gigabajto</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} gigabajtoj</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName draft="unconfirmed">gigabitoj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} gigabito</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} gigabitoj</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName draft="unconfirmed">megabajtoj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} megabajto</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} megabajtoj</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName draft="unconfirmed">megabitoj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} megabito</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} megabitoj</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName draft="unconfirmed">kilobajtoj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} kilobajto</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} kilobajtoj</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName draft="unconfirmed">kilobitoj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} kilobito</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} kilobitoj</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName draft="unconfirmed">bajtoj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} bajto</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} bajtoj</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName draft="unconfirmed">bitoj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} bito</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} bitoj</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="unconfirmed">jaroj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} jaro</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} jaroj</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="unconfirmed">monatoj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} monato</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} monatoj</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="unconfirmed">semajnoj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} semajno</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} semajnoj</unitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName draft="unconfirmed">tagoj</displayName>
@@ -1576,137 +1619,122 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other" draft="unconfirmed">{0} horoj</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0} por horo</perUnitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="unconfirmed">milisekundoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} milisekundo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} milisekundoj</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="unconfirmed">minutoj</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} minuto</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} minutoj</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="unconfirmed">monatoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} monato</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} monatoj</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="unconfirmed">sekundoj</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} sekundo</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} sekundoj</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0} por sekundo</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="unconfirmed">semajnoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} semajno</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} semajnoj</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="unconfirmed">jaroj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} jaro</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} jaroj</unitPattern>
-			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName draft="unconfirmed">astronomiaj unuoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} astronomia unuo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} astronomiaj unuoj</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="unconfirmed">centimetroj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} centimetro</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} centimetroj</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<displayName draft="unconfirmed">decimetroj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} decimetro</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} decimetroj</unitPattern>
-			</unit>
-			<unit type="length-fathom">
-				<displayName draft="unconfirmed">klaftoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} klafto</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} klaftoj</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="unconfirmed">futoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} futo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} futoj</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName draft="unconfirmed">stadioj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} stadio</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} stadioj</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="unconfirmed">coloj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} colo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} coloj</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="unconfirmed">milisekundoj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} milisekundo</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} milisekundoj</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="unconfirmed">kilometroj</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} kilometro</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} kilometroj</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<displayName draft="unconfirmed">lumjaroj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} lumjaro</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} lumjaroj</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName draft="unconfirmed">metroj</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} metro</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} metroj</unitPattern>
 			</unit>
-			<unit type="length-micrometer">
-				<displayName draft="unconfirmed">mikrometroj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} mikrometro</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} mikrometroj</unitPattern>
+			<unit type="length-decimeter">
+				<displayName draft="unconfirmed">decimetroj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} decimetro</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} decimetroj</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName draft="unconfirmed">mejloj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} mejlo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} mejloj</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="unconfirmed">centimetroj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} centimetro</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} centimetroj</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="unconfirmed">milimetroj</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} milimetro</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} milimetroj</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName draft="unconfirmed">mikrometroj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} mikrometro</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} mikrometroj</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName draft="unconfirmed">nanometroj</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} nanometro</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} nanometroj</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName draft="unconfirmed">marmejloj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} marmejlo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} marmejloj</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName draft="unconfirmed">parsekoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} parseko</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} parsekoj</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName draft="unconfirmed">pikometroj</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} pikometro</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} pikometroj</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="unconfirmed">mejloj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} mejlo</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} mejloj</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName draft="unconfirmed">jardoj</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} jardo</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} jardoj</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="unconfirmed">gramoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} gramo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} gramoj</unitPattern>
+			<unit type="length-foot">
+				<displayName draft="unconfirmed">futoj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} futo</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} futoj</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="unconfirmed">coloj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} colo</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} coloj</unitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName draft="unconfirmed">parsekoj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} parseko</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} parsekoj</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="unconfirmed">lumjaroj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} lumjaro</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} lumjaroj</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName draft="unconfirmed">astronomiaj unuoj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} astronomia unuo</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} astronomiaj unuoj</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName draft="unconfirmed">stadioj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} stadio</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} stadioj</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName draft="unconfirmed">klaftoj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} klafto</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} klaftoj</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName draft="unconfirmed">marmejloj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} marmejlo</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} marmejloj</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="unconfirmed">kilogramoj</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} kilogramo</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} kilogramoj</unitPattern>
 			</unit>
+			<unit type="mass-gram">
+				<displayName draft="unconfirmed">gramoj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} gramo</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} gramoj</unitPattern>
+			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName draft="unconfirmed">kilometroj en horo</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} kilometro en horo</unitPattern>
@@ -1724,25 +1752,38 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 		</unitLength>
 		<unitLength type="short">
+			<unit type="area-square-kilometer">
+				<displayName draft="unconfirmed">km²</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} km²</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} km²</unitPattern>
+			</unit>
 			<unit type="area-hectare">
 				<displayName draft="unconfirmed">ha</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} ha</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName draft="unconfirmed">m²</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} m²</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} m²</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName draft="unconfirmed">cm²</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} cm²</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} cm²</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="unconfirmed">km²</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} km²</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} km²</unitPattern>
+			<unit type="duration-year">
+				<displayName draft="unconfirmed">jaro</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} j.</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} j.</unitPattern>
 			</unit>
-			<unit type="area-square-meter">
-				<displayName draft="unconfirmed">m²</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} m²</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} m²</unitPattern>
+			<unit type="duration-month">
+				<displayName draft="unconfirmed">monato</displayName>
+				<unitPattern count="one">{0} mon.</unitPattern>
+				<unitPattern count="other">{0} mon.</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="unconfirmed">semajno</displayName>
 			</unit>
 			<unit type="duration-day">
 				<displayName draft="unconfirmed">tago</displayName>
@@ -1755,100 +1796,87 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other" draft="unconfirmed">{0} h.</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0}/h.</perUnitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="unconfirmed">milisekundo</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ms.</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ms.</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="unconfirmed">minuto</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} m.</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} m.</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="unconfirmed">monato</displayName>
-				<unitPattern count="one">{0} mon.</unitPattern>
-				<unitPattern count="other">{0} mon.</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="unconfirmed">sekundo</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} s.</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} s.</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0}/s.</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="unconfirmed">semajno</displayName>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="unconfirmed">jaro</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} j.</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} j.</unitPattern>
-			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName draft="unconfirmed">au</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} au</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} au</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="unconfirmed">cm</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} cm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<displayName draft="unconfirmed">dm</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} dm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} dm</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="unconfirmed">milisekundo</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} ms.</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} ms.</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="unconfirmed">km</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} km</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<displayName draft="unconfirmed">lj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} lj</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} lj</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName draft="unconfirmed">m</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} m</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} m</unitPattern>
 			</unit>
-			<unit type="length-micrometer">
-				<displayName draft="unconfirmed">µm</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} µm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} µm</unitPattern>
+			<unit type="length-decimeter">
+				<displayName draft="unconfirmed">dm</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} dm</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} dm</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName draft="unconfirmed">cm</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} cm</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="unconfirmed">mm</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} mm</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName draft="unconfirmed">µm</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} µm</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName draft="unconfirmed">nm</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} nm</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<displayName draft="unconfirmed">pc</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} pc</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName draft="unconfirmed">pm</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} pm</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} pm</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="unconfirmed">g</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} g</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} g</unitPattern>
+			<unit type="length-parsec">
+				<displayName draft="unconfirmed">pc</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} pc</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="unconfirmed">lj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} lj</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} lj</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName draft="unconfirmed">au</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} au</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} au</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="unconfirmed">kg</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} kg</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} kg</unitPattern>
 			</unit>
+			<unit type="mass-gram">
+				<displayName draft="unconfirmed">g</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} g</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} g</unitPattern>
+			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName draft="unconfirmed">km/h</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} km/h</unitPattern>
@@ -1870,25 +1898,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}°</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}°</unitPattern>
 			</unit>
+			<unit type="area-square-kilometer">
+				<displayName draft="unconfirmed">km²</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}km²</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}km²</unitPattern>
+			</unit>
 			<unit type="area-hectare">
 				<displayName draft="unconfirmed">ha</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}ha</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName draft="unconfirmed">m²</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}m²</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}m²</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName draft="unconfirmed">cm²</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}cm²</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}cm²</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="unconfirmed">km²</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}km²</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName draft="unconfirmed">m²</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}m²</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}m²</unitPattern>
+			<unit type="duration-year">
+				<displayName draft="unconfirmed">j.</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}j.</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}j.</unitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName draft="unconfirmed">t.</displayName>
@@ -1901,11 +1934,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other" draft="unconfirmed">{0}h.</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0}/h.</perUnitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="unconfirmed">ms.</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}ms.</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}ms.</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="unconfirmed">m.</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}m.</unitPattern>
@@ -1917,76 +1945,76 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other" draft="unconfirmed">{0}s.</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0}/s.</perUnitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName draft="unconfirmed">j.</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}j.</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}j.</unitPattern>
-			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName draft="unconfirmed">au</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}au</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}au</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="unconfirmed">cm</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}cm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}cm</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<displayName draft="unconfirmed">dm</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}dm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}dm</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="unconfirmed">ms.</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}ms.</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}ms.</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="unconfirmed">km</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}km</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<displayName draft="unconfirmed">lj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}lj</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}lj</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName draft="unconfirmed">m</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}m</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}m</unitPattern>
 			</unit>
-			<unit type="length-micrometer">
-				<displayName draft="unconfirmed">µm</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}µm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}µm</unitPattern>
+			<unit type="length-decimeter">
+				<displayName draft="unconfirmed">dm</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}dm</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}dm</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName draft="unconfirmed">cm</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}cm</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="unconfirmed">mm</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}mm</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName draft="unconfirmed">µm</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}µm</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName draft="unconfirmed">nm</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}nm</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}nm</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<displayName draft="unconfirmed">pc</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}pc</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName draft="unconfirmed">pm</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}pm</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}pm</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="unconfirmed">g</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}g</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}g</unitPattern>
+			<unit type="length-parsec">
+				<displayName draft="unconfirmed">pc</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}pc</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="unconfirmed">lj</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}lj</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}lj</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName draft="unconfirmed">au</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}au</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}au</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="unconfirmed">kg</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}kg</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}kg</unitPattern>
 			</unit>
+			<unit type="mass-gram">
+				<displayName draft="unconfirmed">g</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}g</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}g</unitPattern>
+			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName draft="unconfirmed">km/h</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}km/h</unitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eo_001.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eo_001.xml
new file mode 100644
index 00000000000..ce369e7bce5
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eo_001.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="eo"/>
+		<territory type="001"/>
+	</identity>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es.xml
similarity index 90%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es.xml
index 84a5235e3b2..d0d61379f47 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11321 $"/>
-		<generation date="$Date: 2015-02-26 14:20:05 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 12318 $"/>
 		<language type="es"/>
 	</identity>
 	<localeDisplayNames>
@@ -62,6 +61,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bez">bena</language>
 			<language type="bfd" draft="contributed">bafut</language>
 			<language type="bg">búlgaro</language>
+			<language type="bgn">baluchi occidental</language>
 			<language type="bho">bhojpuri</language>
 			<language type="bi">bislama</language>
 			<language type="bik">bicol</language>
@@ -107,7 +107,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="cs">checo</language>
 			<language type="csb">casubio</language>
 			<language type="cu">eslavo eclesiástico</language>
-			<language type="cv">chuvash</language>
+			<language type="cv">chuvasio</language>
 			<language type="cy">galés</language>
 			<language type="da">danés</language>
 			<language type="dak">dakota</language>
@@ -289,6 +289,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">laosiano</language>
 			<language type="lol">mongo</language>
 			<language type="loz">lozi</language>
+			<language type="lrc">lorí septentrional</language>
 			<language type="lt">lituano</language>
 			<language type="lu">luba-katanga</language>
 			<language type="lua">luba-lulua</language>
@@ -337,10 +338,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="my">birmano</language>
 			<language type="mye" draft="contributed">myene</language>
 			<language type="myv">erzya</language>
+			<language type="mzn">mazandaraní</language>
 			<language type="na">nauruano</language>
 			<language type="nap">napolitano</language>
 			<language type="naq">nama</language>
-			<language type="nb">bokmal noruego</language>
+			<language type="nb">noruego bokmal</language>
 			<language type="nd">ndebele septentrional</language>
 			<language type="nds">bajo alemán</language>
 			<language type="ne">nepalí</language>
@@ -351,7 +353,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nl">neerlandés</language>
 			<language type="nl_BE">flamenco</language>
 			<language type="nmg">kwasio</language>
-			<language type="nn">nynorsk noruego</language>
+			<language type="nn">noruego nynorsk</language>
 			<language type="nnh" draft="contributed">ngiemboon</language>
 			<language type="no">noruego</language>
 			<language type="nog">nogai</language>
@@ -420,6 +422,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">siciliano</language>
 			<language type="sco">escocés</language>
 			<language type="sd">sindhi</language>
+			<language type="sdh">kurdo meridional</language>
 			<language type="se">sami septentrional</language>
 			<language type="see" draft="contributed">seneca</language>
 			<language type="seh">sena</language>
@@ -456,9 +459,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sus">susu</language>
 			<language type="sux">sumerio</language>
 			<language type="sv">sueco</language>
-			<language type="sw">swahili</language>
+			<language type="sw">suajili</language>
+			<language type="sw_CD">suajili del Congo</language>
 			<language type="swb">comorense</language>
-			<language type="swc" draft="contributed">swahili del Congo</language>
 			<language type="syc">siríaco clásico</language>
 			<language type="syr">siriaco</language>
 			<language type="ta">tamil</language>
@@ -514,7 +517,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">walamo</language>
 			<language type="war">waray</language>
 			<language type="was">washo</language>
-			<language type="wo">wólof</language>
+			<language type="wbp">warlpiri</language>
+			<language type="wo">wolof</language>
 			<language type="xal">kalmyk</language>
 			<language type="xh">xhosa</language>
 			<language type="xog">soga</language>
@@ -666,7 +670,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="001">Mundo</territory>
 			<territory type="002">África</territory>
 			<territory type="003">América del Norte</territory>
-			<territory type="005">Suramérica</territory>
+			<territory type="005">Sudamérica</territory>
 			<territory type="009">Oceanía</territory>
 			<territory type="011">África occidental</territory>
 			<territory type="013">Centroamérica</territory>
@@ -701,7 +705,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguila</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antillas Neerlandesas</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antártida</territory>
 			<territory type="AR">Argentina</territory>
@@ -751,7 +754,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CU">Cuba</territory>
 			<territory type="CV">Cabo Verde</territory>
 			<territory type="CW">Curazao</territory>
-			<territory type="CX">Isla de Navidad (Christmas)</territory>
+			<territory type="CX">Isla de Navidad</territory>
 			<territory type="CY">Chipre</territory>
 			<territory type="CZ">República Checa</territory>
 			<territory type="DE">Alemania</territory>
@@ -804,7 +807,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="HR">Croacia</territory>
 			<territory type="HT">Haití</territory>
 			<territory type="HU">Hungría</territory>
-			<territory type="IC">islas Canarias</territory>
+			<territory type="IC">Canarias</territory>
 			<territory type="ID">Indonesia</territory>
 			<territory type="IE">Irlanda</territory>
 			<territory type="IL">Israel</territory>
@@ -892,7 +895,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="PS">Territorios Palestinos</territory>
 			<territory type="PS" alt="short">Palestina</territory>
 			<territory type="PT">Portugal</territory>
-			<territory type="PW">Palau</territory>
+			<territory type="PW">Palaos</territory>
 			<territory type="PY">Paraguay</territory>
 			<territory type="QA">Catar</territory>
 			<territory type="QO">Territorios alejados de Oceanía</territory>
@@ -1010,6 +1013,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">Orden numérico</key>
 			<key type="colStrength" draft="contributed">Intensidad de orden</key>
 			<key type="currency">moneda</key>
+			<key type="hc">ciclo horario (12 o 24 horas)</key>
+			<key type="lb">salto de línea</key>
+			<key type="ms">sistema de medición</key>
 			<key type="numbers">números</key>
 			<key type="timezone" draft="contributed">Zona horaria</key>
 			<key type="va" draft="contributed">Variante local</key>
@@ -1017,95 +1023,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x" draft="contributed">Uso privado</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">dígitos indoarábigos</type>
-			<type type="arabext" key="numbers">dígitos indoarábigos extendidos</type>
-			<type type="armn" key="numbers">números en armenio</type>
-			<type type="armnlow" key="numbers">números en minúscula en armenio</type>
-			<type type="beng" key="numbers">dígitos en bengalí</type>
-			<type type="big5han" key="collation">orden del chino tradicional - Big5</type>
-			<type type="buddhist" key="calendar">calendario budista</type>
-			<type type="chinese" key="calendar">calendario chino</type>
-			<type type="coptic" key="calendar">calendario cóptico</type>
-			<type type="dangi" key="calendar">calendario dangi</type>
-			<type type="deva" key="numbers">dígitos en devanagari</type>
-			<type type="dictionary" key="collation">orden de clasificación del diccionario</type>
-			<type type="ducet" key="collation">orden de clasificación de Unicode predeterminado</type>
-			<type type="ethi" key="numbers">números en etíope</type>
-			<type type="ethiopic" key="calendar">calendario etíope</type>
-			<type type="ethiopic-amete-alem" key="calendar">calendario etíope Amete Alem</type>
-			<type type="finance" key="numbers" draft="contributed">Números financieros</type>
-			<type type="fullwide" key="numbers">dígitos de ancho completo</type>
-			<type type="gb2312han" key="collation">orden del chino simplificado - GB2312</type>
-			<type type="geor" key="numbers">números en georgiano</type>
-			<type type="gregorian" key="calendar">calendario gregoriano</type>
-			<type type="grek" key="numbers">números en griego</type>
-			<type type="greklow" key="numbers">números en griego en minúscula</type>
-			<type type="gujr" key="numbers">dígitos en gujarati</type>
-			<type type="guru" key="numbers">dígitos en gurmuji</type>
-			<type type="hanidec" key="numbers">números decimales en chino</type>
-			<type type="hans" key="numbers">números en chino simplificado</type>
-			<type type="hansfin" key="numbers">números financieros en chino simplificado</type>
-			<type type="hant" key="numbers">números en chino tradicional</type>
-			<type type="hantfin" key="numbers">números financieros en chino tradicional</type>
-			<type type="hebr" key="numbers">números en hebreo</type>
-			<type type="hebrew" key="calendar">calendario hebreo</type>
-			<type type="identical" key="colStrength" draft="contributed">Ordenar todo</type>
-			<type type="indian" key="calendar">calendario nacional hindú</type>
-			<type type="islamic" key="calendar">calendario islámico</type>
-			<type type="islamic-civil" key="calendar">calendario civil islámico</type>
-			<type type="iso8601" key="calendar">calendario ISO-8601</type>
-			<type type="japanese" key="calendar">calendario japonés</type>
-			<type type="jpan" key="numbers">números en japonés</type>
-			<type type="jpanfin" key="numbers">números financieros en japonés</type>
-			<type type="khmr" key="numbers">dígitos en jemer</type>
-			<type type="knda" key="numbers">dígitos en kannada</type>
-			<type type="laoo" key="numbers">dígitos en lao</type>
-			<type type="latn" key="numbers">dígitos occidentales</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">Ordenar empezando por minúsculas</type>
-			<type type="mlym" key="numbers">dígitos en malayalam</type>
-			<type type="mong" key="numbers">dígitos en mongol</type>
-			<type type="mymr" key="numbers">dígitos en birmano</type>
-			<type type="native" key="numbers" draft="contributed">Dígitos nativos</type>
-			<type type="no" key="colBackwards" draft="contributed">Ordenar acentos normalmente</type>
-			<type type="no" key="colCaseFirst" draft="contributed">Ordenar siguiendo orden normal de mayúsculas y minúsculas</type>
-			<type type="no" key="colCaseLevel" draft="contributed">Ordenar sin distinguir entre mayúsculas y minúsculas</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">Ordenar caracteres kana por separado</type>
-			<type type="no" key="colNormalization" draft="contributed">Ordenar sin normalización</type>
-			<type type="no" key="colNumeric" draft="contributed">Ordenar dígitos individualmente</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">Ordenar símbolos</type>
-			<type type="orya" key="numbers">dígitos en oriya</type>
-			<type type="persian" key="calendar">calendario persa</type>
-			<type type="phonebook" key="collation">orden de listín telefónico</type>
-			<type type="phonetic" key="collation" draft="contributed">Orden de clasificación fonético</type>
-			<type type="pinyin" key="collation">orden pinyin</type>
-			<type type="primary" key="colStrength" draft="contributed">Ordenar solo letras base</type>
-			<type type="quaternary" key="colStrength" draft="contributed">Ordenar acentos/mayúsculas y minúsculas/ancho/kana</type>
-			<type type="reformed" key="collation">orden de clasificación reformado</type>
-			<type type="roc" key="calendar">calendario de la República de China</type>
-			<type type="roman" key="numbers">números romanos</type>
-			<type type="romanlow" key="numbers">números romanos en minúscula</type>
-			<type type="search" key="collation">búsqueda de uso general</type>
-			<type type="searchjl" key="collation" draft="contributed">Buscar por consonante inicial de hangul</type>
-			<type type="secondary" key="colStrength" draft="contributed">Ordenar acentos</type>
-			<type type="shifted" key="colAlternate" draft="contributed">Ordenar ignorando símbolos</type>
-			<type type="standard" key="collation">orden estándar</type>
-			<type type="stroke" key="collation">orden de los trazos</type>
-			<type type="taml" key="numbers">números en tamil tradicional</type>
-			<type type="tamldec" key="numbers">dígitos en tamil</type>
-			<type type="telu" key="numbers">dígitos en telugu</type>
-			<type type="tertiary" key="colStrength" draft="contributed">Ordenar acentos/mayúsculas y minúsculas/ancho</type>
-			<type type="thai" key="numbers">dígitos en tailandés</type>
-			<type type="tibt" key="numbers">dígitos en tibetano</type>
-			<type type="traditional" key="collation">orden tradicional</type>
-			<type type="traditional" key="numbers" draft="contributed">Números tradicionales</type>
-			<type type="unihan" key="collation">orden de clasificación de trazos radicales</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">Ordenar empezando por mayúsculas</type>
-			<type type="vaii" key="numbers" draft="contributed">Dígitos vai</type>
-			<type type="yes" key="colBackwards" draft="contributed">Ordenar acentos con inversión</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">Ordenar distinguiendo entre mayúsculas y minúsculas</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">Ordenar diferenciando caracteres kana</type>
-			<type type="yes" key="colNormalization" draft="contributed">Ordenar con normalización Unicode</type>
-			<type type="yes" key="colNumeric" draft="contributed">Ordenar dígitos numéricamente</type>
+			<type key="calendar" type="buddhist">calendario budista</type>
+			<type key="calendar" type="chinese">calendario chino</type>
+			<type key="calendar" type="coptic">calendario cóptico</type>
+			<type key="calendar" type="dangi">calendario dangi</type>
+			<type key="calendar" type="ethiopic">calendario etíope</type>
+			<type key="calendar" type="ethiopic-amete-alem">calendario etíope Amete Alem</type>
+			<type key="calendar" type="gregorian">calendario gregoriano</type>
+			<type key="calendar" type="hebrew">calendario hebreo</type>
+			<type key="calendar" type="indian">calendario nacional hindú</type>
+			<type key="calendar" type="islamic">calendario islámico</type>
+			<type key="calendar" type="islamic-civil">calendario civil islámico</type>
+			<type key="calendar" type="iso8601">calendario ISO-8601</type>
+			<type key="calendar" type="japanese">calendario japonés</type>
+			<type key="calendar" type="persian">calendario persa</type>
+			<type key="calendar" type="roc">calendario de la República de China</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">Ordenar símbolos</type>
+			<type key="colAlternate" type="shifted" draft="contributed">Ordenar ignorando símbolos</type>
+			<type key="colBackwards" type="no" draft="contributed">Ordenar acentos normalmente</type>
+			<type key="colBackwards" type="yes" draft="contributed">Ordenar acentos con inversión</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">Ordenar empezando por minúsculas</type>
+			<type key="colCaseFirst" type="no" draft="contributed">Ordenar siguiendo orden normal de mayúsculas y minúsculas</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">Ordenar empezando por mayúsculas</type>
+			<type key="colCaseLevel" type="no" draft="contributed">Ordenar sin distinguir entre mayúsculas y minúsculas</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">Ordenar distinguiendo entre mayúsculas y minúsculas</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">Ordenar caracteres kana por separado</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">Ordenar diferenciando caracteres kana</type>
+			<type key="collation" type="big5han">orden del chino tradicional - Big5</type>
+			<type key="collation" type="dictionary">orden de clasificación del diccionario</type>
+			<type key="collation" type="ducet">orden de clasificación de Unicode predeterminado</type>
+			<type key="collation" type="gb2312han">orden del chino simplificado - GB2312</type>
+			<type key="collation" type="phonebook">orden de listín telefónico</type>
+			<type key="collation" type="phonetic" draft="contributed">Orden de clasificación fonético</type>
+			<type key="collation" type="pinyin">orden pinyin</type>
+			<type key="collation" type="reformed">orden de clasificación reformado</type>
+			<type key="collation" type="search">búsqueda de uso general</type>
+			<type key="collation" type="searchjl" draft="contributed">Buscar por consonante inicial de hangul</type>
+			<type key="collation" type="standard">orden estándar</type>
+			<type key="collation" type="stroke">orden de los trazos</type>
+			<type key="collation" type="traditional">orden tradicional</type>
+			<type key="collation" type="unihan">orden de clasificación de trazos radicales</type>
+			<type key="colNormalization" type="no" draft="contributed">Ordenar sin normalización</type>
+			<type key="colNormalization" type="yes" draft="contributed">Ordenar con normalización Unicode</type>
+			<type key="colNumeric" type="no" draft="contributed">Ordenar dígitos individualmente</type>
+			<type key="colNumeric" type="yes" draft="contributed">Ordenar dígitos numéricamente</type>
+			<type key="colStrength" type="identical" draft="contributed">Ordenar todo</type>
+			<type key="colStrength" type="primary" draft="contributed">Ordenar solo letras base</type>
+			<type key="colStrength" type="quaternary" draft="contributed">Ordenar acentos/mayúsculas y minúsculas/ancho/kana</type>
+			<type key="colStrength" type="secondary" draft="contributed">Ordenar acentos</type>
+			<type key="colStrength" type="tertiary" draft="contributed">Ordenar acentos/mayúsculas y minúsculas/ancho</type>
+			<type key="hc" type="h11">sistema de 12 horas (0–11)</type>
+			<type key="hc" type="h12">sistema de 12 horas (1–12)</type>
+			<type key="hc" type="h23">sistema de 24 horas (0–23)</type>
+			<type key="hc" type="h24">sistema de 24 horas (1–24)</type>
+			<type key="lb" type="loose">salto de línea flexible</type>
+			<type key="lb" type="normal">salto de línea normal</type>
+			<type key="lb" type="strict">salto de línea estricto</type>
+			<type key="ms" type="metric">sistema métrico</type>
+			<type key="ms" type="uksystem">sistema imperial</type>
+			<type key="ms" type="ussystem">sistema estadounidense</type>
+			<type key="numbers" type="arab">dígitos indoarábigos</type>
+			<type key="numbers" type="arabext">dígitos indoarábigos extendidos</type>
+			<type key="numbers" type="armn">números en armenio</type>
+			<type key="numbers" type="armnlow">números en minúscula en armenio</type>
+			<type key="numbers" type="beng">dígitos en bengalí</type>
+			<type key="numbers" type="deva">dígitos en devanagari</type>
+			<type key="numbers" type="ethi">números en etíope</type>
+			<type key="numbers" type="finance" draft="contributed">Números financieros</type>
+			<type key="numbers" type="fullwide">dígitos de ancho completo</type>
+			<type key="numbers" type="geor">números en georgiano</type>
+			<type key="numbers" type="grek">números en griego</type>
+			<type key="numbers" type="greklow">números en griego en minúscula</type>
+			<type key="numbers" type="gujr">dígitos en gujarati</type>
+			<type key="numbers" type="guru">dígitos en gurmuji</type>
+			<type key="numbers" type="hanidec">números decimales en chino</type>
+			<type key="numbers" type="hans">números en chino simplificado</type>
+			<type key="numbers" type="hansfin">números financieros en chino simplificado</type>
+			<type key="numbers" type="hant">números en chino tradicional</type>
+			<type key="numbers" type="hantfin">números financieros en chino tradicional</type>
+			<type key="numbers" type="hebr">números en hebreo</type>
+			<type key="numbers" type="jpan">números en japonés</type>
+			<type key="numbers" type="jpanfin">números financieros en japonés</type>
+			<type key="numbers" type="khmr">dígitos en jemer</type>
+			<type key="numbers" type="knda">dígitos en kannada</type>
+			<type key="numbers" type="laoo">dígitos en lao</type>
+			<type key="numbers" type="latn">dígitos occidentales</type>
+			<type key="numbers" type="mlym">dígitos en malayalam</type>
+			<type key="numbers" type="mong">dígitos en mongol</type>
+			<type key="numbers" type="mymr">dígitos en birmano</type>
+			<type key="numbers" type="native" draft="contributed">Dígitos nativos</type>
+			<type key="numbers" type="orya">dígitos en oriya</type>
+			<type key="numbers" type="roman">números romanos</type>
+			<type key="numbers" type="romanlow">números romanos en minúscula</type>
+			<type key="numbers" type="taml">números en tamil tradicional</type>
+			<type key="numbers" type="tamldec">dígitos en tamil</type>
+			<type key="numbers" type="telu">dígitos en telugu</type>
+			<type key="numbers" type="thai">dígitos en tailandés</type>
+			<type key="numbers" type="tibt">dígitos en tibetano</type>
+			<type key="numbers" type="traditional" draft="contributed">Números tradicionales</type>
+			<type key="numbers" type="vaii" draft="contributed">Dígitos vai</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">BGN</transformName>
@@ -1126,7 +1142,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</measurementSystemNames>
 		<codePatterns>
 			<codePattern type="language">Idioma: {0}</codePattern>
-			<codePattern type="script">Alfabeto: {0}</codePattern>
+			<codePattern type="script">Sistema de escritura: {0}</codePattern>
 			<codePattern type="territory">Región: {0}</codePattern>
 		</codePatterns>
 	</localeDisplayNames>
@@ -1153,8 +1169,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</contextTransformUsage>
 	</contextTransforms>
 	<characters>
-		<exemplarCharacters>[a á b c d e é f g h i í j k l m n ñ o ó p q r s t u ú ü v w x y z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[ª à ă â å ä ã ā æ ç è ĕ ê ë ē ì ĭ î ï ī º ò ŏ ô ö ø ō œ ù ŭ û ū ÿ]</exemplarCharacters>
+		<exemplarCharacters>[a á b c d e é f g h i í ï j k l m n ñ o ó p q r s t u ú ü v w x y ý z]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[ª à ă â å ä ã ā æ ç è ĕ ê ë ē ì ĭ î ī º ò ŏ ô ö ø ō œ ù ŭ û ū ÿ]</exemplarCharacters>
 		<exemplarCharacters type="index">[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]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‐ – — , ; \: ! ¡ ? ¿ . … ' ‘ ’ &quot; “ ” « » ( ) \[ \] § @ * / \\ \&amp; # † ‡ ′ ″]</exemplarCharacters>
 		<ellipsis type="final">{0}…</ellipsis>
@@ -1252,12 +1268,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern>dd/MM/y G</pattern>
+							<pattern>d/M/y G</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>dd/MM/yy GGGGG</pattern>
+							<pattern>d/M/yy G</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -1284,6 +1300,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -1366,19 +1383,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">d/M–d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, d/M–E, d/M</greatestDifference>
-							<greatestDifference id="M">E, d/M–E, d/M</greatestDifference>
+							<greatestDifference id="d">E, d/M – E, d/M</greatestDifference>
+							<greatestDifference id="M">E, d/M – E, d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
 							<greatestDifference id="M">MMM–MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">d–d 'de' MMM</greatestDifference>
-							<greatestDifference id="M">d 'de' MMM–d 'de' MMM</greatestDifference>
+							<greatestDifference id="M">d 'de' MMM – d 'de' MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d 'de' MMM–E, d 'de' MMM</greatestDifference>
-							<greatestDifference id="M">E, d 'de' MMM–E, d 'de' MMM</greatestDifference>
+							<greatestDifference id="d">E, d 'de' MMM – E, d 'de' MMM</greatestDifference>
+							<greatestDifference id="M">E, d 'de' MMM – E, d 'de' MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
 							<greatestDifference id="y">y–y G</greatestDifference>
@@ -1393,27 +1410,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="y">d/M/y–d/M/y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, d/M/y–E, d/M/y G</greatestDifference>
-							<greatestDifference id="M">E, d/M/y–E, d/M/y G</greatestDifference>
-							<greatestDifference id="y">E, d/M/y–E, d/M/y G</greatestDifference>
+							<greatestDifference id="d">E, d/M/y – E, d/M/y G</greatestDifference>
+							<greatestDifference id="M">E, d/M/y – E, d/M/y G</greatestDifference>
+							<greatestDifference id="y">E, d/M/y – E, d/M/y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
 							<greatestDifference id="M">MMM–MMM 'de' y G</greatestDifference>
-							<greatestDifference id="y">MMM 'de' y–MMM 'de' y G</greatestDifference>
+							<greatestDifference id="y">MMM 'de' y – MMM 'de' y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
 							<greatestDifference id="d">d–d 'de' MMM 'de' y G</greatestDifference>
-							<greatestDifference id="M">d 'de' MMM–d 'de' MMM y G</greatestDifference>
-							<greatestDifference id="y">d 'de' MMM 'de' y–d 'de' MMM 'de' y G</greatestDifference>
+							<greatestDifference id="M">d 'de' MMM – d 'de' MMM y G</greatestDifference>
+							<greatestDifference id="y">d 'de' MMM 'de' y – d 'de' MMM 'de' y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d 'de' MMM–E, d 'de' MMM 'de' y G</greatestDifference>
-							<greatestDifference id="M">E, d 'de' MMM–E, d 'de' MMM 'de' y G</greatestDifference>
-							<greatestDifference id="y">E, d 'de' MMM 'de' y–E, d 'de' MMM 'de' y G</greatestDifference>
+							<greatestDifference id="d">E, d 'de' MMM – E, d 'de' MMM 'de' y G</greatestDifference>
+							<greatestDifference id="M">E, d 'de' MMM – E, d 'de' MMM 'de' y G</greatestDifference>
+							<greatestDifference id="y">E, d 'de' MMM 'de' y – E, d 'de' MMM 'de' y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
 							<greatestDifference id="M">MMMM–MMMM 'de' y G</greatestDifference>
-							<greatestDifference id="y">MMMM 'de' y–MMMM 'de' y G</greatestDifference>
+							<greatestDifference id="y">MMMM 'de' y – MMMM 'de' y G</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -1466,18 +1483,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</monthContext>
 					<monthContext type="stand-alone">
 						<monthWidth type="abbreviated">
-							<month type="1">Ene.</month>
-							<month type="2">Feb.</month>
-							<month type="3">Mar.</month>
-							<month type="4">Abr.</month>
-							<month type="5">May.</month>
-							<month type="6">Jun.</month>
-							<month type="7">Jul.</month>
-							<month type="8">Ago.</month>
-							<month type="9">Sept.</month>
-							<month type="10">Oct.</month>
-							<month type="11">Nov.</month>
-							<month type="12">Dic.</month>
+							<month type="1">ene.</month>
+							<month type="2">feb.</month>
+							<month type="3">mar.</month>
+							<month type="4">abr.</month>
+							<month type="5">may.</month>
+							<month type="6">jun.</month>
+							<month type="7">jul.</month>
+							<month type="8">ago.</month>
+							<month type="9">sept.</month>
+							<month type="10">oct.</month>
+							<month type="11">nov.</month>
+							<month type="12">dic.</month>
 						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">E</month>
@@ -1494,18 +1511,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="12">D</month>
 						</monthWidth>
 						<monthWidth type="wide">
-							<month type="1">Enero</month>
-							<month type="2">Febrero</month>
-							<month type="3">Marzo</month>
-							<month type="4">Abril</month>
-							<month type="5">Mayo</month>
-							<month type="6">Junio</month>
-							<month type="7">Julio</month>
-							<month type="8">Agosto</month>
-							<month type="9">Septiembre</month>
-							<month type="10">Octubre</month>
-							<month type="11">Noviembre</month>
-							<month type="12">Diciembre</month>
+							<month type="1">enero</month>
+							<month type="2">febrero</month>
+							<month type="3">marzo</month>
+							<month type="4">abril</month>
+							<month type="5">mayo</month>
+							<month type="6">junio</month>
+							<month type="7">julio</month>
+							<month type="8">agosto</month>
+							<month type="9">septiembre</month>
+							<month type="10">octubre</month>
+							<month type="11">noviembre</month>
+							<month type="12">diciembre</month>
 						</monthWidth>
 					</monthContext>
 				</months>
@@ -1550,13 +1567,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dayContext>
 					<dayContext type="stand-alone">
 						<dayWidth type="abbreviated">
-							<day type="sun">Dom.</day>
-							<day type="mon">Lun.</day>
-							<day type="tue">Mar.</day>
-							<day type="wed">Mié.</day>
-							<day type="thu">Jue.</day>
-							<day type="fri">Vie.</day>
-							<day type="sat">Sáb.</day>
+							<day type="sun">dom.</day>
+							<day type="mon">lun.</day>
+							<day type="tue">mar.</day>
+							<day type="wed">mié.</day>
+							<day type="thu">jue.</day>
+							<day type="fri">vie.</day>
+							<day type="sat">sáb.</day>
 						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun">D</day>
@@ -1577,13 +1594,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<day type="sat">SA</day>
 						</dayWidth>
 						<dayWidth type="wide">
-							<day type="sun">Domingo</day>
-							<day type="mon">Lunes</day>
-							<day type="tue">Martes</day>
-							<day type="wed">Miércoles</day>
-							<day type="thu">Jueves</day>
-							<day type="fri">Viernes</day>
-							<day type="sat">Sábado</day>
+							<day type="sun">domingo</day>
+							<day type="mon">lunes</day>
+							<day type="tue">martes</day>
+							<day type="wed">miércoles</day>
+							<day type="thu">jueves</day>
+							<day type="fri">viernes</day>
+							<day type="sat">sábado</day>
 						</dayWidth>
 					</dayContext>
 				</days>
@@ -1595,6 +1612,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<quarter type="3">T3</quarter>
 							<quarter type="4">T4</quarter>
 						</quarterWidth>
+						<quarterWidth type="narrow">
+							<quarter type="1">1</quarter>
+							<quarter type="2">2</quarter>
+							<quarter type="3">3</quarter>
+							<quarter type="4">4</quarter>
+						</quarterWidth>
 						<quarterWidth type="wide">
 							<quarter type="1">1.er trimestre</quarter>
 							<quarter type="2">2.º trimestre</quarter>
@@ -1603,25 +1626,83 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</quarterWidth>
 					</quarterContext>
 					<quarterContext type="stand-alone">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">T1</quarter>
+							<quarter type="2">T2</quarter>
+							<quarter type="3">T3</quarter>
+							<quarter type="4">T4</quarter>
+						</quarterWidth>
 						<quarterWidth type="narrow">
 							<quarter type="1">1</quarter>
 							<quarter type="2">2</quarter>
 							<quarter type="3">3</quarter>
 							<quarter type="4">4</quarter>
 						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1">1.er trimestre</quarter>
+							<quarter type="2">2.º trimestre</quarter>
+							<quarter type="3">3.er trimestre</quarter>
+							<quarter type="4">4.º trimestre</quarter>
+						</quarterWidth>
 					</quarterContext>
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">a. m.</dayPeriod>
+							<dayPeriod type="noon">del mediodía</dayPeriod>
+							<dayPeriod type="pm">p. m.</dayPeriod>
+							<dayPeriod type="morning1">de la madrugada</dayPeriod>
+							<dayPeriod type="morning2">de la mañana</dayPeriod>
+							<dayPeriod type="evening1">de la tarde</dayPeriod>
+							<dayPeriod type="night1">de la noche</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">a.m.</dayPeriod>
-							<dayPeriod type="noon">m.</dayPeriod>
-							<dayPeriod type="pm">p.m.</dayPeriod>
+							<dayPeriod type="am">a. m.</dayPeriod>
+							<dayPeriod type="noon">del mediodía</dayPeriod>
+							<dayPeriod type="pm">p. m.</dayPeriod>
+							<dayPeriod type="morning1">de la madrugada</dayPeriod>
+							<dayPeriod type="morning2">de la mañana</dayPeriod>
+							<dayPeriod type="evening1">de la tarde</dayPeriod>
+							<dayPeriod type="night1">de la noche</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">a. m.</dayPeriod>
+							<dayPeriod type="noon">del mediodía</dayPeriod>
+							<dayPeriod type="pm">p. m.</dayPeriod>
+							<dayPeriod type="morning1">de la madrugada</dayPeriod>
+							<dayPeriod type="morning2">de la mañana</dayPeriod>
+							<dayPeriod type="evening1">de la tarde</dayPeriod>
+							<dayPeriod type="night1">de la noche</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">a. m.</dayPeriod>
+							<dayPeriod type="noon">mediodía</dayPeriod>
+							<dayPeriod type="pm">p. m.</dayPeriod>
+							<dayPeriod type="morning1">madrugada</dayPeriod>
+							<dayPeriod type="morning2">mañana</dayPeriod>
+							<dayPeriod type="evening1">tarde</dayPeriod>
+							<dayPeriod type="night1">noche</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">a. m.</dayPeriod>
+							<dayPeriod type="noon">mediodía</dayPeriod>
+							<dayPeriod type="pm">p. m.</dayPeriod>
+							<dayPeriod type="morning1">madrugada</dayPeriod>
+							<dayPeriod type="morning2">mañana</dayPeriod>
+							<dayPeriod type="evening1">tarde</dayPeriod>
+							<dayPeriod type="night1">noche</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">a. m.</dayPeriod>
 							<dayPeriod type="noon">mediodía</dayPeriod>
 							<dayPeriod type="pm">p. m.</dayPeriod>
+							<dayPeriod type="morning1">madrugada</dayPeriod>
+							<dayPeriod type="morning2">mañana</dayPeriod>
+							<dayPeriod type="evening1">tarde</dayPeriod>
+							<dayPeriod type="night1">noche</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1765,7 +1846,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="d">d–d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a–h a</greatestDifference>
+							<greatestDifference id="a">h a – h a</greatestDifference>
 							<greatestDifference id="h">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
@@ -1781,7 +1862,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="m">H:mm–H:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a–h:mm a v</greatestDifference>
+							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
@@ -1790,7 +1871,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="m">H:mm–H:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a–h a v</greatestDifference>
+							<greatestDifference id="a">h a – h a v</greatestDifference>
 							<greatestDifference id="h">h–h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
@@ -1804,19 +1885,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">d/M–d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, d/M–E, d/M</greatestDifference>
-							<greatestDifference id="M">E, d/M–E, d/M</greatestDifference>
+							<greatestDifference id="d">E, d/M – E, d/M</greatestDifference>
+							<greatestDifference id="M">E, d/M – E, d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
 							<greatestDifference id="M">MMM–MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">d–d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM–d MMM</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d MMM–E, d MMM</greatestDifference>
-							<greatestDifference id="M">E, d MMM–E, d MMM</greatestDifference>
+							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMMd">
 							<greatestDifference id="d">d–d 'de' MMMM</greatestDifference>
@@ -1839,27 +1920,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="y">d/M/y–d/M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, d/M/y–E, d/M/y</greatestDifference>
-							<greatestDifference id="M">E, d/M/y–E, d/M/y</greatestDifference>
-							<greatestDifference id="y">E, d/M/y–E, d/M/y</greatestDifference>
+							<greatestDifference id="d">E, d/M/y – E, d/M/y</greatestDifference>
+							<greatestDifference id="M">E, d/M/y – E, d/M/y</greatestDifference>
+							<greatestDifference id="y">E, d/M/y – E, d/M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
 							<greatestDifference id="M">MMM–MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y–MMM y</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
 							<greatestDifference id="d">d–d MMM y</greatestDifference>
-							<greatestDifference id="M">d MMM–d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM y–d MMM y</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d MMM–E, d MMM y</greatestDifference>
-							<greatestDifference id="M">E, d MMM–E, d MMM y</greatestDifference>
-							<greatestDifference id="y">E, d MMM y–E, d MMM y</greatestDifference>
+							<greatestDifference id="d">E, d MMM – E, d MMM y</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM y</greatestDifference>
+							<greatestDifference id="y">E, d MMM y – E, d MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
 							<greatestDifference id="M">MMMM–MMMM 'de' y</greatestDifference>
-							<greatestDifference id="y">MMMM 'de' y–MMMM 'de' y</greatestDifference>
+							<greatestDifference id="y">MMMM 'de' y – MMMM 'de' y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMMd">
 							<greatestDifference id="d">d–d 'de' MMMM 'de' y</greatestDifference>
@@ -1925,10 +2006,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</calendars>
 		<fields>
 			<field type="era">
-				<displayName>Era</displayName>
+				<displayName>era</displayName>
 			</field>
 			<field type="year">
-				<displayName>Año</displayName>
+				<displayName>año</displayName>
 				<relative type="-1">el año pasado</relative>
 				<relative type="0">este año</relative>
 				<relative type="1">el próximo año</relative>
@@ -1943,6 +2024,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>a</displayName>
+				<relative type="-1">el año pasado</relative>
+				<relative type="0">este año</relative>
+				<relative type="1">el próximo año</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">dentro de {0} a</relativeTimePattern>
 					<relativeTimePattern count="other">dentro de {0} a</relativeTimePattern>
@@ -1954,6 +2038,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>a</displayName>
+				<relative type="-1">el año pasado</relative>
+				<relative type="0">este año</relative>
+				<relative type="1">el próximo año</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">dentro de {0} a</relativeTimePattern>
 					<relativeTimePattern count="other">dentro de {0} a</relativeTimePattern>
@@ -1964,7 +2051,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="quarter">
-				<displayName>Trimestre</displayName>
+				<displayName>trimestre</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">dentro de {0} trimestre</relativeTimePattern>
 					<relativeTimePattern count="other">dentro de {0} trimestres</relativeTimePattern>
@@ -1997,7 +2084,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="month">
-				<displayName>Mes</displayName>
+				<displayName>mes</displayName>
 				<relative type="-1">el mes pasado</relative>
 				<relative type="0">este mes</relative>
 				<relative type="1">el próximo mes</relative>
@@ -2012,6 +2099,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>m</displayName>
+				<relative type="-1">el mes pasado</relative>
+				<relative type="0">este mes</relative>
+				<relative type="1">el próximo mes</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">dentro de {0} m</relativeTimePattern>
 					<relativeTimePattern count="other">dentro de {0} m</relativeTimePattern>
@@ -2023,6 +2113,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>m</displayName>
+				<relative type="-1">el mes pasado</relative>
+				<relative type="0">este mes</relative>
+				<relative type="1">el próximo mes</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">dentro de {0} m</relativeTimePattern>
 					<relativeTimePattern count="other">dentro de {0} m</relativeTimePattern>
@@ -2033,7 +2126,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="week">
-				<displayName>Semana</displayName>
+				<displayName>semana</displayName>
 				<relative type="-1">la semana pasada</relative>
 				<relative type="0">esta semana</relative>
 				<relative type="1">la próxima semana</relative>
@@ -2069,7 +2162,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day">
-				<displayName>Día</displayName>
+				<displayName>día</displayName>
 				<relative type="-2">anteayer</relative>
 				<relative type="-1">ayer</relative>
 				<relative type="0">hoy</relative>
@@ -2086,6 +2179,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>d</displayName>
+				<relative type="-2">anteayer</relative>
+				<relative type="-1">ayer</relative>
+				<relative type="0">hoy</relative>
+				<relative type="1">mañana</relative>
+				<relative type="2">pasado mañana</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">dentro de {0} día</relativeTimePattern>
 					<relativeTimePattern count="other">dentro de {0} días</relativeTimePattern>
@@ -2097,6 +2195,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>d</displayName>
+				<relative type="-2">anteayer</relative>
+				<relative type="-1">ayer</relative>
+				<relative type="0">hoy</relative>
+				<relative type="1">mañana</relative>
+				<relative type="2">pasado mañana</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">dentro de {0} día</relativeTimePattern>
 					<relativeTimePattern count="other">dentro de {0} días</relativeTimePattern>
@@ -2107,7 +2210,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="weekday">
-				<displayName>Día de la semana</displayName>
+				<displayName>día de la semana</displayName>
 			</field>
 			<field type="sun">
 				<relative type="-1">el domingo pasado</relative>
@@ -2218,7 +2321,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>a. m./p. m.</displayName>
 			</field>
 			<field type="hour">
-				<displayName>Hora</displayName>
+				<displayName>hora</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">dentro de {0} hora</relativeTimePattern>
 					<relativeTimePattern count="other">dentro de {0} horas</relativeTimePattern>
@@ -2251,7 +2354,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="minute">
-				<displayName>Minuto</displayName>
+				<displayName>minuto</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">dentro de {0} minuto</relativeTimePattern>
 					<relativeTimePattern count="other">dentro de {0} minutos</relativeTimePattern>
@@ -2284,7 +2387,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="second">
-				<displayName>Segundo</displayName>
+				<displayName>segundo</displayName>
 				<relative type="0">ahora</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">dentro de {0} segundo</relativeTimePattern>
@@ -2318,7 +2421,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>Zona horaria</displayName>
+				<displayName>zona horaria</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
@@ -2330,7 +2433,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<regionFormat type="standard">horario estándar de {0}</regionFormat>
 			<fallbackFormat>{1} ({0})</fallbackFormat>
 			<zone type="Etc/Unknown">
-				<exemplarCity>Ciudad desconocida</exemplarCity>
+				<exemplarCity>ciudad desconocida</exemplarCity>
 			</zone>
 			<zone type="Europe/Andorra">
 				<exemplarCity>Andorra</exemplarCity>
@@ -3196,6 +3299,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
 			</zone>
@@ -3280,6 +3386,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Chitá</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Yakutsk</exemplarCity>
 			</zone>
@@ -3298,6 +3407,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadán</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolimsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamchatka</exemplarCity>
 			</zone>
@@ -3662,9 +3774,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic draft="contributed">hora de Apia</generic>
-					<standard draft="contributed">hora estándar de Apia</standard>
-					<daylight draft="contributed">horario de verano de Apia</daylight>
+					<generic>hora de Apia</generic>
+					<standard>hora estándar de Apia</standard>
+					<daylight>horario de verano de Apia</daylight>
 				</long>
 			</metazone>
 			<metazone type="Aqtau">
@@ -3829,12 +3941,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Christmas">
 				<long>
-					<standard>hora de la isla Christmas</standard>
+					<standard>hora de la Isla de Navidad</standard>
 				</long>
 			</metazone>
 			<metazone type="Cocos">
 				<long>
-					<standard>hora de las islas Cocos</standard>
+					<standard>hora de las Islas Cocos</standard>
 				</long>
 			</metazone>
 			<metazone type="Colombia">
@@ -3846,9 +3958,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Cook">
 				<long>
-					<generic>hora de las islas Cook</generic>
-					<standard>hora estándar de las islas Cook</standard>
-					<daylight>hora de verano media de las islas Cook</daylight>
+					<generic>hora de las Islas Cook</generic>
+					<standard>hora estándar de las Islas Cook</standard>
+					<daylight>hora de verano media de las Islas Cook</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cuba">
@@ -4547,7 +4659,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<otherNumberingSystems>
 			<native draft="contributed">latn</native>
 		</otherNumberingSystems>
-		<minimumGroupingDigits draft="contributed">1</minimumGroupingDigits>
+		<minimumGroupingDigits>2</minimumGroupingDigits>
 		<symbols numberSystem="latn">
 			<decimal>,</decimal>
 			<group>.</group>
@@ -4648,6 +4760,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">0 K ¤</pattern>
+					<pattern type="1000" count="other">0 K ¤</pattern>
+					<pattern type="10000" count="one">00 K ¤</pattern>
+					<pattern type="10000" count="other">00 K ¤</pattern>
+					<pattern type="100000" count="one">000 K ¤</pattern>
+					<pattern type="100000" count="other">000 K ¤</pattern>
+					<pattern type="1000000" count="one">0 M ¤</pattern>
+					<pattern type="1000000" count="other">0 M ¤</pattern>
+					<pattern type="10000000" count="one">00 M ¤</pattern>
+					<pattern type="10000000" count="other">00 M ¤</pattern>
+					<pattern type="100000000" count="one">000 M ¤</pattern>
+					<pattern type="100000000" count="other">000 M ¤</pattern>
+					<pattern type="1000000000" count="one">0000 M ¤</pattern>
+					<pattern type="1000000000" count="other">0000 M ¤</pattern>
+					<pattern type="10000000000" count="one">00 MRD ¤</pattern>
+					<pattern type="10000000000" count="other">00 MRD ¤</pattern>
+					<pattern type="100000000000" count="one">000 MRD ¤</pattern>
+					<pattern type="100000000000" count="other">000 MRD ¤</pattern>
+					<pattern type="1000000000000" count="one">0 B ¤</pattern>
+					<pattern type="1000000000000" count="other">0 B ¤</pattern>
+					<pattern type="10000000000000" count="one">00 B ¤</pattern>
+					<pattern type="10000000000000" count="other">00 B ¤</pattern>
+					<pattern type="100000000000000" count="one">000 B ¤</pattern>
+					<pattern type="100000000000000" count="other">000 B ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4679,7 +4819,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>ALL</symbol>
 			</currency>
 			<currency type="AMD">
-				<displayName>dram armenio</displayName>
+				<displayName>dram</displayName>
 				<displayName count="one">dram</displayName>
 				<displayName count="other">drams</displayName>
 				<symbol>AMD</symbol>
@@ -4688,13 +4828,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>florín de las Antillas Neerlandesas</displayName>
 				<displayName count="one">florín de las Antillas Neerlandesas</displayName>
 				<displayName count="other">florines de las Antillas Neerlandesas</displayName>
-				<symbol draft="provisional">ANG</symbol>
+				<symbol draft="contributed">ANG</symbol>
 			</currency>
 			<currency type="AOA">
 				<displayName>kuanza</displayName>
 				<displayName count="one">kuanza</displayName>
 				<displayName count="other">kuanzas</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>kwanza angoleño (1977–1990)</displayName>
@@ -4759,6 +4900,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">marco convertible de Bosnia-Herzegovina</displayName>
 				<displayName count="other">marcos convertibles de Bosnia-Herzegovina</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>dólar barbadense</displayName>
@@ -4831,6 +4973,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">boliviano</displayName>
 				<displayName count="other">bolivianos</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOP">
 				<displayName>peso boliviano</displayName>
@@ -4897,6 +5040,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">pula</displayName>
 				<displayName count="other">pulas</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>nuevo rublo bielorruso (1994–1999)</displayName>
@@ -4999,6 +5143,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">peso cubano convertible</displayName>
 				<displayName count="other">pesos cubanos convertibles</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>peso cubano</displayName>
@@ -5023,6 +5168,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">corona checa</displayName>
 				<displayName count="other">coronas checas</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>ostmark de Alemania del Este</displayName>
@@ -5045,6 +5191,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">corona danesa</displayName>
 				<displayName count="other">coronas danesas</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>peso dominicano</displayName>
@@ -5079,9 +5226,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">libra egipcia</displayName>
 				<displayName count="other">libras egipcias</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">EGP</symbol>
 			</currency>
 			<currency type="ERN">
-				<displayName>nakfa eritreo</displayName>
+				<displayName>nakfa</displayName>
 				<displayName count="one">nakfa</displayName>
 				<displayName count="other">nakfas</displayName>
 				<symbol>ERN</symbol>
@@ -5112,6 +5260,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>euro</displayName>
 				<displayName count="one">euro</displayName>
 				<displayName count="other">euros</displayName>
+				<symbol draft="contributed">€</symbol>
+				<symbol alt="narrow" draft="contributed">€</symbol>
 			</currency>
 			<currency type="FIM">
 				<displayName>marco finlandés</displayName>
@@ -5130,6 +5280,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">libra malvinense</displayName>
 				<displayName count="other">libras malvinenses</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>franco francés</displayName>
@@ -5151,6 +5302,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">lari</displayName>
 				<displayName count="other">laris</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>cedi ghanés (1979–2007)</displayName>
@@ -5179,6 +5331,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">franco guineano</displayName>
 				<displayName count="other">francos guineanos</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>syli guineano</displayName>
@@ -5198,6 +5351,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">quetzal guatemalteco</displayName>
 				<displayName count="other">quetzales guatemaltecos</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>escudo de Guinea Portuguesa</displayName>
@@ -5224,6 +5378,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">lempira hondureño</displayName>
 				<displayName count="other">lempiras hondureños</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>dinar croata</displayName>
@@ -5235,11 +5390,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">kuna</displayName>
 				<displayName count="other">kunas</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>gourde haitiano</displayName>
-				<displayName count="one" draft="contributed">gourde haitiano</displayName>
-				<displayName count="other" draft="contributed">gourdes haitianos</displayName>
+				<displayName count="one">gourde haitiano</displayName>
+				<displayName count="other">gourdes haitianos</displayName>
 				<symbol>HTG</symbol>
 			</currency>
 			<currency type="HUF">
@@ -5247,12 +5403,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">forinto húngaro</displayName>
 				<displayName count="other">forintos húngaros</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>rupia indonesia</displayName>
 				<displayName count="one">rupia indonesia</displayName>
 				<displayName count="other">rupias indonesias</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>libra irlandesa</displayName>
@@ -5295,6 +5453,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">corona islandesa</displayName>
 				<displayName count="other">coronas islandesas</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>lira italiana</displayName>
@@ -5345,12 +5504,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">franco comorense</displayName>
 				<displayName count="other">francos comorenses</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>won norcoreano</displayName>
 				<displayName count="one">won norcoreano</displayName>
 				<displayName count="other">wons norcoreanos</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>won surcoreano</displayName>
@@ -5391,12 +5552,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">libra libanesa</displayName>
 				<displayName count="other">libras libanesas</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>rupia esrilanquesa</displayName>
 				<displayName count="one">rupia esrilanquesa</displayName>
 				<displayName count="other">rupias esrilanquesas</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>dólar liberiano</displayName>
@@ -5473,6 +5636,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ariari</displayName>
 				<displayName count="other">ariaris</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>franco malgache</displayName>
@@ -5491,6 +5655,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">kiat</displayName>
 				<displayName count="other">kiats</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>tugrik</displayName>
@@ -5501,8 +5666,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="MOP">
 				<displayName>pataca de Macao</displayName>
-				<displayName count="one" draft="contributed">pataca de Macao</displayName>
-				<displayName count="other" draft="contributed">patacas de Macao</displayName>
+				<displayName count="one">pataca de Macao</displayName>
+				<displayName count="other">patacas de Macao</displayName>
 				<symbol>MOP</symbol>
 			</currency>
 			<currency type="MRO">
@@ -5526,6 +5691,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">rupia mauriciana</displayName>
 				<displayName count="other">rupias mauricianas</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>rufiya</displayName>
@@ -5561,6 +5727,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ringit</displayName>
 				<displayName count="other">ringits</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>escudo mozambiqueño</displayName>
@@ -5600,6 +5767,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">córdoba nicaragüense</displayName>
 				<displayName count="other">córdobas nicaragüenses</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>florín neerlandés</displayName>
@@ -5611,12 +5779,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">corona noruega</displayName>
 				<displayName count="other">coronas noruegas</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>rupia nepalí</displayName>
 				<displayName count="one">rupia nepalí</displayName>
 				<displayName count="other">rupias nepalíes</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>dólar neozelandés</displayName>
@@ -5671,12 +5841,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">rupia pakistaní</displayName>
 				<displayName count="other">rupias pakistaníes</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>esloti</displayName>
 				<displayName count="one">esloti</displayName>
 				<displayName count="other">eslotis</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>zloty polaco (1950–1995)</displayName>
@@ -5726,6 +5898,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">rublo ruso</displayName>
 				<displayName count="other">rublos rusos</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>rublo ruso (1991–1998)</displayName>
@@ -5737,6 +5910,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">franco ruandés</displayName>
 				<displayName count="other">francos ruandeses</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>rial saudí</displayName>
@@ -5778,6 +5952,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">corona sueca</displayName>
 				<displayName count="other">coronas suecas</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>dólar singapurense</displayName>
@@ -5791,6 +5966,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">libra de Santa Elena</displayName>
 				<displayName count="other">libras de Santa Elena</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>tólar esloveno</displayName>
@@ -5836,6 +6012,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dobra</displayName>
 				<displayName count="other">dobras</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>rublo soviético</displayName>
@@ -5852,6 +6029,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">libra siria</displayName>
 				<displayName count="other">libras sirias</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>lilangeni</displayName>
@@ -5864,14 +6042,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">bat</displayName>
 				<displayName count="other">bats</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>rublo tayiko</displayName>
 			</currency>
 			<currency type="TJS">
 				<displayName>somoni tayiko</displayName>
-				<displayName count="one" draft="contributed">somoni tayiko</displayName>
-				<displayName count="other" draft="contributed">somonis tayikos</displayName>
+				<displayName count="one">somoni tayiko</displayName>
+				<displayName count="other">somonis tayikos</displayName>
 				<symbol>TJS</symbol>
 			</currency>
 			<currency type="TMM">
@@ -5896,6 +6075,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">paanga</displayName>
 				<displayName count="other">paangas</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>escudo timorense</displayName>
@@ -5911,11 +6091,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">liras turcas</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>dólar de Trinidad y Tobago</displayName>
-				<displayName count="one" draft="contributed">dólar de Trinidad y Tobago</displayName>
-				<displayName count="other" draft="contributed">dólares de Trinidad y Tobago</displayName>
+				<displayName count="one">dólar de Trinidad y Tobago</displayName>
+				<displayName count="other">dólares de Trinidad y Tobago</displayName>
 				<symbol>TTD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -6003,6 +6184,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">bolívar venezolano</displayName>
 				<displayName count="other">bolívares venezolanos</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>dong</displayName>
@@ -6064,6 +6246,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dólar del Caribe Oriental</displayName>
 				<displayName count="other">dólares del Caribe Oriental</displayName>
 				<symbol>XCD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>derechos especiales de giro</displayName>
@@ -6113,7 +6296,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="XXX">
 				<displayName>moneda desconocida</displayName>
-				<displayName count="one">(unidad de moneda desconocida)</displayName>
+				<displayName count="one">(moneda desconocida)</displayName>
 				<displayName count="other">(moneda desconocida)</displayName>
 			</currency>
 			<currency type="YDD">
@@ -6144,6 +6327,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">rand</displayName>
 				<displayName count="other">rands</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>kwacha zambiano (1968–2012)</displayName>
@@ -6154,6 +6338,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>kuacha zambiano</displayName>
 				<displayName count="one">kuacha zambiano</displayName>
 				<displayName count="other">kuachas zambianos</displayName>
+				<symbol draft="contributed">ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>nuevo zaire zaireño</displayName>
@@ -6188,6 +6374,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} metro por segundo al cuadrado</unitPattern>
 				<unitPattern count="other">{0} metros por segundo al cuadrado</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>revoluciones</displayName>
+				<unitPattern count="one">{0} revolución</unitPattern>
+				<unitPattern count="other">{0} revoluciones</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radianes</displayName>
+				<unitPattern count="one">{0} radián</unitPattern>
+				<unitPattern count="other">{0} radianes</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>grados</displayName>
+				<unitPattern count="one">{0} grado</unitPattern>
+				<unitPattern count="other">{0} grados</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>minutos de arco</displayName>
 				<unitPattern count="one">{0} minuto de arco</unitPattern>
@@ -6198,30 +6399,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} segundo de arco</unitPattern>
 				<unitPattern count="other">{0} segundos de arco</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>grados</displayName>
-				<unitPattern count="one">{0} grado</unitPattern>
-				<unitPattern count="other">{0} grados</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radianes</displayName>
-				<unitPattern count="one">{0} radián</unitPattern>
-				<unitPattern count="other">{0} radianes</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>acres</displayName>
-				<unitPattern count="one">{0} acre</unitPattern>
-				<unitPattern count="other">{0} acres</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>kilómetros cuadrados</displayName>
+				<unitPattern count="one">{0} kilómetro cuadrado</unitPattern>
+				<unitPattern count="other">{0} kilómetros cuadrados</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hectáreas</displayName>
 				<unitPattern count="one">{0} hectárea</unitPattern>
 				<unitPattern count="other">{0} hectáreas</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>metros cuadrados</displayName>
+				<unitPattern count="one">{0} metro cuadrado</unitPattern>
+				<unitPattern count="other">{0} metros cuadrados</unitPattern>
+				<perUnitPattern>{0} por metro cuadrado</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>centímetros cuadrados</displayName>
 				<unitPattern count="one">{0} centímetro cuadrado</unitPattern>
 				<unitPattern count="other">{0} centímetros cuadrados</unitPattern>
+				<perUnitPattern>{0} por centímetro cuadrado</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>millas cuadradas</displayName>
+				<unitPattern count="one">{0} milla cuadrada</unitPattern>
+				<unitPattern count="other">{0} millas cuadradas</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acres</displayName>
+				<unitPattern count="one">{0} acre</unitPattern>
+				<unitPattern count="other">{0} acres</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yardas cuadradas</displayName>
+				<unitPattern count="one">{0} yarda cuadrada</unitPattern>
+				<unitPattern count="other">{0} yardas cuadradas</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>pies cuadrados</displayName>
@@ -6232,91 +6445,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>pulgadas cuadradas</displayName>
 				<unitPattern count="one">{0} pulgada cuadrada</unitPattern>
 				<unitPattern count="other">{0} pulgadas cuadradas</unitPattern>
+				<perUnitPattern>{0} por pulgada cuadrada</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kilómetros cuadrados</displayName>
-				<unitPattern count="one">{0} kilómetro cuadrado</unitPattern>
-				<unitPattern count="other">{0} kilómetros cuadrados</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>metros cuadrados</displayName>
-				<unitPattern count="one">{0} metro cuadrado</unitPattern>
-				<unitPattern count="other">{0} metros cuadrados</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>millas cuadradas</displayName>
-				<unitPattern count="one">{0} milla cuadrada</unitPattern>
-				<unitPattern count="other">{0} millas cuadradas</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yardas cuadradas</displayName>
-				<unitPattern count="one">{0} yarda cuadrada</unitPattern>
-				<unitPattern count="other">{0} yardas cuadradas</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>quilates</displayName>
+				<unitPattern count="one">{0} quilate</unitPattern>
+				<unitPattern count="other">{0} quilates</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litros por kilómetro</displayName>
 				<unitPattern count="one">{0} litro por kilómetro</unitPattern>
 				<unitPattern count="other">{0} litros por kilómetro</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>litros por 100 kilómetros</displayName>
+				<unitPattern count="one">{0} litro por 100 kilómetros</unitPattern>
+				<unitPattern count="other">{0} litros por 100 kilómetros</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>millas por galón</displayName>
 				<unitPattern count="one">{0} milla por galón</unitPattern>
 				<unitPattern count="other">{0} millas por galón</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bits</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bits</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bytes</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} bytes</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabits</displayName>
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="other">{0} gigabits</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabytes</displayName>
-				<unitPattern count="one">{0} gigabyte</unitPattern>
-				<unitPattern count="other">{0} gigabytes</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobits</displayName>
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="other">{0} kilobits</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobytes</displayName>
-				<unitPattern count="one">{0} kilobyte</unitPattern>
-				<unitPattern count="other">{0} kilobytes</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabits</displayName>
-				<unitPattern count="one">{0} megabit</unitPattern>
-				<unitPattern count="other">{0} megabits</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabytes</displayName>
-				<unitPattern count="one">{0} megabyte</unitPattern>
-				<unitPattern count="other">{0} megabytes</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabits</displayName>
-				<unitPattern count="one">{0} terabit</unitPattern>
-				<unitPattern count="other">{0} terabits</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabytes</displayName>
 				<unitPattern count="one">{0} terabyte</unitPattern>
 				<unitPattern count="other">{0} terabytes</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabits</displayName>
+				<unitPattern count="one">{0} terabit</unitPattern>
+				<unitPattern count="other">{0} terabits</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabytes</displayName>
+				<unitPattern count="one">{0} gigabyte</unitPattern>
+				<unitPattern count="other">{0} gigabytes</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabits</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="other">{0} gigabits</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabytes</displayName>
+				<unitPattern count="one">{0} megabyte</unitPattern>
+				<unitPattern count="other">{0} megabytes</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabits</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="other">{0} megabits</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobytes</displayName>
+				<unitPattern count="one">{0} kilobyte</unitPattern>
+				<unitPattern count="other">{0} kilobytes</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobits</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="other">{0} kilobits</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bytes</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} bytes</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bits</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bits</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>siglos</displayName>
+				<unitPattern count="one">{0} siglo</unitPattern>
+				<unitPattern count="other">{0} siglos</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>años</displayName>
+				<unitPattern count="one">{0} año</unitPattern>
+				<unitPattern count="other">{0} años</unitPattern>
+				<perUnitPattern>{0} por año</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>meses</displayName>
+				<unitPattern count="one">{0} mes</unitPattern>
+				<unitPattern count="other">{0} meses</unitPattern>
+				<perUnitPattern>{0} por mes</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>semanas</displayName>
+				<unitPattern count="one">{0} semana</unitPattern>
+				<unitPattern count="other">{0} semanas</unitPattern>
+				<perUnitPattern>{0} por semana</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>días</displayName>
 				<unitPattern count="one">{0} día</unitPattern>
 				<unitPattern count="other">{0} días</unitPattern>
+				<perUnitPattern>{0} por día</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>horas</displayName>
@@ -6324,30 +6552,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} horas</unitPattern>
 				<perUnitPattern>{0} por hora</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>microsegundos</displayName>
-				<unitPattern count="one">{0} microsegundo</unitPattern>
-				<unitPattern count="other">{0} microsegundos</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milisegundos</displayName>
-				<unitPattern count="one">{0} milisegundo</unitPattern>
-				<unitPattern count="other">{0} milisegundos</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>minutos</displayName>
 				<unitPattern count="one">{0} minuto</unitPattern>
 				<unitPattern count="other">{0} minutos</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>meses</displayName>
-				<unitPattern count="one">{0} mes</unitPattern>
-				<unitPattern count="other">{0} meses</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanosegundos</displayName>
-				<unitPattern count="one">{0} nanosegundo</unitPattern>
-				<unitPattern count="other">{0} nanosegundos</unitPattern>
+				<perUnitPattern>{0} por minuto</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>segundos</displayName>
@@ -6355,15 +6564,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} segundos</unitPattern>
 				<perUnitPattern>{0} por segundo</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>semanas</displayName>
-				<unitPattern count="one">{0} semana</unitPattern>
-				<unitPattern count="other">{0} semanas</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milisegundos</displayName>
+				<unitPattern count="one">{0} milisegundo</unitPattern>
+				<unitPattern count="other">{0} milisegundos</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>años</displayName>
-				<unitPattern count="one">{0} año</unitPattern>
-				<unitPattern count="other">{0} años</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>microsegundos</displayName>
+				<unitPattern count="one">{0} microsegundo</unitPattern>
+				<unitPattern count="other">{0} microsegundos</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosegundos</displayName>
+				<unitPattern count="one">{0} nanosegundo</unitPattern>
+				<unitPattern count="other">{0} nanosegundos</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amperios</displayName>
@@ -6385,6 +6599,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} voltio</unitPattern>
 				<unitPattern count="other">{0} voltios</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilocalorías</displayName>
+				<unitPattern count="one">{0} kilocaloría</unitPattern>
+				<unitPattern count="other">{0} kilocalorías</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>calorías</displayName>
 				<unitPattern count="one">{0} caloría</unitPattern>
@@ -6395,226 +6614,225 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} caloría</unitPattern>
 				<unitPattern count="other">{0} calorías</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>julios</displayName>
-				<unitPattern count="one">{0} julio</unitPattern>
-				<unitPattern count="other">{0} julios</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilocalorías</displayName>
-				<unitPattern count="one">{0} kilocaloría</unitPattern>
-				<unitPattern count="other">{0} kilocalorías</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojulios</displayName>
 				<unitPattern count="one">{0} kilojulio</unitPattern>
 				<unitPattern count="other">{0} kilojulios</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>julios</displayName>
+				<unitPattern count="one">{0} julio</unitPattern>
+				<unitPattern count="other">{0} julios</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
-				<displayName>kilovatios hora</displayName>
-				<unitPattern count="one">{0} kilovatio hora</unitPattern>
-				<unitPattern count="other">{0} kilovatios hora</unitPattern>
+				<displayName>kilovatios-hora</displayName>
+				<unitPattern count="one">{0} kilovatio-hora</unitPattern>
+				<unitPattern count="other">{0} kilovatios-hora</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
 				<displayName>gigahercios</displayName>
 				<unitPattern count="one">{0} gigahercio</unitPattern>
 				<unitPattern count="other">{0} gigahercios</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hercios</displayName>
-				<unitPattern count="one">{0} hercio</unitPattern>
-				<unitPattern count="other">{0} hercios</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megahercios</displayName>
+				<unitPattern count="one">{0} megahercio</unitPattern>
+				<unitPattern count="other">{0} megahercios</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kilohercios</displayName>
 				<unitPattern count="one">{0} kilohercio</unitPattern>
 				<unitPattern count="other">{0} kilohercios</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megahercios</displayName>
-				<unitPattern count="one">{0} megahercio</unitPattern>
-				<unitPattern count="other">{0} megahercios</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hercios</displayName>
+				<unitPattern count="one">{0} hercio</unitPattern>
+				<unitPattern count="other">{0} hercios</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>unidades astronómicas</displayName>
-				<unitPattern count="one">{0} unidad astronómica</unitPattern>
-				<unitPattern count="other">{0} unidades astronómicas</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilómetros</displayName>
+				<unitPattern count="one">{0} kilómetro</unitPattern>
+				<unitPattern count="other">{0} kilómetros</unitPattern>
+				<perUnitPattern>{0} por kilómetro</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>centímetros</displayName>
-				<unitPattern count="one">{0} centímetro</unitPattern>
-				<unitPattern count="other">{0} centímetros</unitPattern>
+			<unit type="length-meter">
+				<displayName>metros</displayName>
+				<unitPattern count="one">{0} metro</unitPattern>
+				<unitPattern count="other">{0} metros</unitPattern>
+				<perUnitPattern>{0} por metro</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>decímetros</displayName>
 				<unitPattern count="one">{0} decímetro</unitPattern>
 				<unitPattern count="other">{0} decímetros</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>pies</displayName>
-				<unitPattern count="one">{0} pie</unitPattern>
-				<unitPattern count="other">{0} pies</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>pulgadas</displayName>
-				<unitPattern count="one">{0} pulgada</unitPattern>
-				<unitPattern count="other">{0} pulgadas</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilómetros</displayName>
-				<unitPattern count="one">{0} kilómetro</unitPattern>
-				<unitPattern count="other">{0} kilómetros</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>años luz</displayName>
-				<unitPattern count="one">{0} año luz</unitPattern>
-				<unitPattern count="other">{0} años luz</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metros</displayName>
-				<unitPattern count="one">{0} metro</unitPattern>
-				<unitPattern count="other">{0} metros</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>micrómetros</displayName>
-				<unitPattern count="one">{0} micrómetro</unitPattern>
-				<unitPattern count="other">{0} micrómetros</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>millas</displayName>
-				<unitPattern count="one">{0} milla</unitPattern>
-				<unitPattern count="other">{0} millas</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>centímetros</displayName>
+				<unitPattern count="one">{0} centímetro</unitPattern>
+				<unitPattern count="other">{0} centímetros</unitPattern>
+				<perUnitPattern>{0} por centímetro</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>milímetros</displayName>
 				<unitPattern count="one">{0} milímetro</unitPattern>
 				<unitPattern count="other">{0} milímetros</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>micrómetros</displayName>
+				<unitPattern count="one">{0} micrómetro</unitPattern>
+				<unitPattern count="other">{0} micrómetros</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanómetros</displayName>
 				<unitPattern count="one">{0} nanómetro</unitPattern>
 				<unitPattern count="other">{0} nanómetros</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>millas náuticas</displayName>
-				<unitPattern count="one">{0} milla náutica</unitPattern>
-				<unitPattern count="other">{0} millas náuticas</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsecs</displayName>
-				<unitPattern count="one">{0} parsec</unitPattern>
-				<unitPattern count="other">{0} parsecs</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>picómetros</displayName>
 				<unitPattern count="one">{0} picómetro</unitPattern>
 				<unitPattern count="other">{0} picómetros</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>millas</displayName>
+				<unitPattern count="one">{0} milla</unitPattern>
+				<unitPattern count="other">{0} millas</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yardas</displayName>
 				<unitPattern count="one">{0} yarda</unitPattern>
 				<unitPattern count="other">{0} yardas</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>pies</displayName>
+				<unitPattern count="one">{0} pie</unitPattern>
+				<unitPattern count="other">{0} pies</unitPattern>
+				<perUnitPattern>{0} por pie</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>pulgadas</displayName>
+				<unitPattern count="one">{0} pulgada</unitPattern>
+				<unitPattern count="other">{0} pulgadas</unitPattern>
+				<perUnitPattern>{0} por pulgada</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsecs</displayName>
+				<unitPattern count="one">{0} parsec</unitPattern>
+				<unitPattern count="other">{0} parsecs</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>años luz</displayName>
+				<unitPattern count="one">{0} año luz</unitPattern>
+				<unitPattern count="other">{0} años luz</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>unidades astronómicas</displayName>
+				<unitPattern count="one">{0} unidad astronómica</unitPattern>
+				<unitPattern count="other">{0} unidades astronómicas</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>millas náuticas</displayName>
+				<unitPattern count="one">{0} milla náutica</unitPattern>
+				<unitPattern count="other">{0} millas náuticas</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>millas escandinavas</displayName>
+				<unitPattern count="one">{0} milla escandinava</unitPattern>
+				<unitPattern count="other">{0} millas escandinavas</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>luxes</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
 				<unitPattern count="other">{0} luxes</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>quilates</displayName>
-				<unitPattern count="one">{0} quilate</unitPattern>
-				<unitPattern count="other">{0} quilates</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gramos</displayName>
-				<unitPattern count="one">{0} gramo</unitPattern>
-				<unitPattern count="other">{0} gramos</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogramos</displayName>
-				<unitPattern count="one">{0} kilogramo</unitPattern>
-				<unitPattern count="other">{0} kilogramos</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>toneladas métricas</displayName>
 				<unitPattern count="one">{0} tonelada métrica</unitPattern>
 				<unitPattern count="other">{0} toneladas métricas</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>microgramos</displayName>
-				<unitPattern count="one">{0} microgramo</unitPattern>
-				<unitPattern count="other">{0} microgramos</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogramos</displayName>
+				<unitPattern count="one">{0} kilogramo</unitPattern>
+				<unitPattern count="other">{0} kilogramos</unitPattern>
+				<perUnitPattern>{0} por kilogramo</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gramos</displayName>
+				<unitPattern count="one">{0} gramo</unitPattern>
+				<unitPattern count="other">{0} gramos</unitPattern>
+				<perUnitPattern>{0} por gramo</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>miligramos</displayName>
 				<unitPattern count="one">{0} miligramo</unitPattern>
 				<unitPattern count="other">{0} miligramos</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>onzas</displayName>
-				<unitPattern count="one">{0} onza</unitPattern>
-				<unitPattern count="other">{0} onzas</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>onzas troy</displayName>
-				<unitPattern count="one">{0} onza troy</unitPattern>
-				<unitPattern count="other">{0} onzas troy</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>libras</displayName>
-				<unitPattern count="one">{0} libra</unitPattern>
-				<unitPattern count="other">{0} libras</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>microgramos</displayName>
+				<unitPattern count="one">{0} microgramo</unitPattern>
+				<unitPattern count="other">{0} microgramos</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>toneladas</displayName>
 				<unitPattern count="one">{0} tonelada</unitPattern>
 				<unitPattern count="other">{0} toneladas</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>libras</displayName>
+				<unitPattern count="one">{0} libra</unitPattern>
+				<unitPattern count="other">{0} libras</unitPattern>
+				<perUnitPattern>{0} por libra</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>onzas</displayName>
+				<unitPattern count="one">{0} onza</unitPattern>
+				<unitPattern count="other">{0} onzas</unitPattern>
+				<perUnitPattern>{0} por onza</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>onzas troy</displayName>
+				<unitPattern count="one">{0} onza troy</unitPattern>
+				<unitPattern count="other">{0} onzas troy</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>quilates</displayName>
+				<unitPattern count="one">{0} quilate</unitPattern>
+				<unitPattern count="other">{0} quilates</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigavatios</displayName>
 				<unitPattern count="one">{0} gigavatio</unitPattern>
 				<unitPattern count="other">{0} gigavatios</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>caballos de vapor</displayName>
-				<unitPattern count="one">{0} caballo de vapor</unitPattern>
-				<unitPattern count="other">{0} caballos de vapor</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilovatios</displayName>
-				<unitPattern count="one">{0} kilovatio</unitPattern>
-				<unitPattern count="other">{0} kilovatios</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>megavatios</displayName>
 				<unitPattern count="one">{0} megavatio</unitPattern>
 				<unitPattern count="other">{0} megavatios</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>milivatios</displayName>
-				<unitPattern count="one">{0} milivatio</unitPattern>
-				<unitPattern count="other">{0} milivatios</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilovatios</displayName>
+				<unitPattern count="one">{0} kilovatio</unitPattern>
+				<unitPattern count="other">{0} kilovatios</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>vatios</displayName>
 				<unitPattern count="one">{0} vatio</unitPattern>
 				<unitPattern count="other">{0} vatios</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>milivatios</displayName>
+				<unitPattern count="one">{0} milivatio</unitPattern>
+				<unitPattern count="other">{0} milivatios</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>caballos de vapor</displayName>
+				<unitPattern count="one">{0} caballo de vapor</unitPattern>
+				<unitPattern count="other">{0} caballos de vapor</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hectopascales</displayName>
 				<unitPattern count="one">{0} hectopascal</unitPattern>
 				<unitPattern count="other">{0} hectopascales</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>pulgadas de mercurio</displayName>
-				<unitPattern count="one">{0} pulgada de mercurio</unitPattern>
-				<unitPattern count="other">{0} pulgadas de mercurio</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>milibares</displayName>
-				<unitPattern count="one">{0} milibar</unitPattern>
-				<unitPattern count="other">{0} milibares</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>milímetros de mercurio</displayName>
 				<unitPattern count="one">{0} milímetro de mercurio</unitPattern>
@@ -6625,10 +6843,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} libra por pulgada cuadrada</unitPattern>
 				<unitPattern count="other">{0} libras por pulgada cuadrada</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>quilates</displayName>
-				<unitPattern count="one">{0} quilate</unitPattern>
-				<unitPattern count="other">{0} quilates</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>pulgadas de mercurio</displayName>
+				<unitPattern count="one">{0} pulgada de mercurio</unitPattern>
+				<unitPattern count="other">{0} pulgadas de mercurio</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>milibares</displayName>
+				<unitPattern count="one">{0} milibar</unitPattern>
+				<unitPattern count="other">{0} milibares</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilómetros por hora</displayName>
@@ -6645,6 +6868,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} milla por hora</unitPattern>
 				<unitPattern count="other">{0} millas por hora</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>nudos</displayName>
+				<unitPattern count="one">{0} nudo</unitPattern>
+				<unitPattern count="other">{0} nudos</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>grados Celsius</displayName>
 				<unitPattern count="one">{0} grado Celsius</unitPattern>
@@ -6660,31 +6893,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kelvin</unitPattern>
 				<unitPattern count="other">{0} kelvin</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>acres pies</displayName>
-				<unitPattern count="one">{0} acre pie</unitPattern>
-				<unitPattern count="other">{0} acres pies</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>centilitros</displayName>
-				<unitPattern count="one">{0} centilitro</unitPattern>
-				<unitPattern count="other">{0} centilitros</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>centímetros cúbicos</displayName>
-				<unitPattern count="one">{0} centímetro cúbico</unitPattern>
-				<unitPattern count="other">{0} centímetros cúbicos</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>pies cúbicos</displayName>
-				<unitPattern count="one">{0} pie cúbico</unitPattern>
-				<unitPattern count="other">{0} pies cúbicos</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>pulgadas cúbicas</displayName>
-				<unitPattern count="one">{0} pulgada cúbica</unitPattern>
-				<unitPattern count="other">{0} pulgadas cúbicas</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kilómetros cúbicos</displayName>
 				<unitPattern count="one">{0} kilómetro cúbico</unitPattern>
@@ -6694,6 +6902,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>metros cúbicos</displayName>
 				<unitPattern count="one">{0} metro cúbico</unitPattern>
 				<unitPattern count="other">{0} metros cúbicos</unitPattern>
+				<perUnitPattern>{0} por metro cúbico</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>centímetros cúbicos</displayName>
+				<unitPattern count="one">{0} centímetro cúbico</unitPattern>
+				<unitPattern count="other">{0} centímetros cúbicos</unitPattern>
+				<perUnitPattern>{0} por centímetro cúbico</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>millas cúbicas</displayName>
@@ -6705,25 +6920,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yarda cúbica</unitPattern>
 				<unitPattern count="other">{0} yardas cúbicas</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>tazas</displayName>
-				<unitPattern count="one">{0} taza</unitPattern>
-				<unitPattern count="other">{0} tazas</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>pies cúbicos</displayName>
+				<unitPattern count="one">{0} pie cúbico</unitPattern>
+				<unitPattern count="other">{0} pies cúbicos</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>decilitros</displayName>
-				<unitPattern count="one">{0} decilitro</unitPattern>
-				<unitPattern count="other">{0} decilitros</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>pulgadas cúbicas</displayName>
+				<unitPattern count="one">{0} pulgada cúbica</unitPattern>
+				<unitPattern count="other">{0} pulgadas cúbicas</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>onzas fluidas</displayName>
-				<unitPattern count="one">{0} onza fluida</unitPattern>
-				<unitPattern count="other">{0} onzas fluidas</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>galones</displayName>
-				<unitPattern count="one">{0} galón</unitPattern>
-				<unitPattern count="other">{0} galones</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megalitros</displayName>
+				<unitPattern count="one">{0} megalitro</unitPattern>
+				<unitPattern count="other">{0} megalitros</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hectolitros</displayName>
@@ -6734,27 +6944,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>litros</displayName>
 				<unitPattern count="one">{0} litro</unitPattern>
 				<unitPattern count="other">{0} litros</unitPattern>
+				<perUnitPattern>{0} por litro</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalitros</displayName>
-				<unitPattern count="one">{0} megalitro</unitPattern>
-				<unitPattern count="other">{0} megalitros</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>decilitros</displayName>
+				<unitPattern count="one">{0} decilitro</unitPattern>
+				<unitPattern count="other">{0} decilitros</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centilitros</displayName>
+				<unitPattern count="one">{0} centilitro</unitPattern>
+				<unitPattern count="other">{0} centilitros</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mililitros</displayName>
 				<unitPattern count="one">{0} mililitro</unitPattern>
 				<unitPattern count="other">{0} mililitros</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pintas</displayName>
-				<unitPattern count="one">{0} pinta</unitPattern>
-				<unitPattern count="other">{0} pintas</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>pintas métricas</displayName>
+				<unitPattern count="one">{0} pinta métrica</unitPattern>
+				<unitPattern count="other">{0} pintas métricas</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>tazas métricas</displayName>
+				<unitPattern count="one">{0} taza métrica</unitPattern>
+				<unitPattern count="other">{0} tazas métricas</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acres-pies</displayName>
+				<unitPattern count="one">{0} acre-pie</unitPattern>
+				<unitPattern count="other">{0} acres-pies</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galones</displayName>
+				<unitPattern count="one">{0} galón</unitPattern>
+				<unitPattern count="other">{0} galones</unitPattern>
+				<perUnitPattern>{0} por galón</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>cuartos</displayName>
 				<unitPattern count="one">{0} cuarto</unitPattern>
 				<unitPattern count="other">{0} cuartos</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pintas</displayName>
+				<unitPattern count="one">{0} pinta</unitPattern>
+				<unitPattern count="other">{0} pintas</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>tazas</displayName>
+				<unitPattern count="one">{0} taza</unitPattern>
+				<unitPattern count="other">{0} tazas</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>onzas fluidas</displayName>
+				<unitPattern count="one">{0} onza fluida</unitPattern>
+				<unitPattern count="other">{0} onzas fluidas</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>cucharadas</displayName>
 				<unitPattern count="one">{0} cucharada</unitPattern>
@@ -6765,6 +7012,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} cucharadita</unitPattern>
 				<unitPattern count="other">{0} cucharaditas</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} O</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -6780,6 +7033,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="one">{0} rev</unitPattern>
+				<unitPattern count="other">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>grad.</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>arcmin</displayName>
 				<unitPattern count="one">{0} arcmin</unitPattern>
@@ -6790,30 +7058,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} arcsec</unitPattern>
 				<unitPattern count="other">{0} arcsec</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>grad.</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ac</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ha</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ac</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ft²</displayName>
@@ -6824,91 +7104,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>in²</displayName>
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>c</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
 				<unitPattern count="other">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mi/gal</displayName>
 				<unitPattern count="one">{0} mi/gal</unitPattern>
 				<unitPattern count="other">{0} mi/gal</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>b</displayName>
-				<unitPattern count="one">{0} b</unitPattern>
-				<unitPattern count="other">{0} b</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>B</displayName>
-				<unitPattern count="one">{0} B</unitPattern>
-				<unitPattern count="other">{0} B</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>B</displayName>
+				<unitPattern count="one">{0} B</unitPattern>
+				<unitPattern count="other">{0} B</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>b</displayName>
+				<unitPattern count="one">{0} b</unitPattern>
+				<unitPattern count="other">{0} b</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>sig.</displayName>
+				<unitPattern count="one">{0} sig.</unitPattern>
+				<unitPattern count="other">{0} sig.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>a</displayName>
+				<unitPattern count="one">{0} a</unitPattern>
+				<unitPattern count="other">{0} a</unitPattern>
+				<perUnitPattern>{0}/a</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>m.</displayName>
+				<unitPattern count="one">{0} m.</unitPattern>
+				<unitPattern count="other">{0} m.</unitPattern>
+				<perUnitPattern>{0}/m.</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>sem.</displayName>
+				<unitPattern count="one">{0} sem.</unitPattern>
+				<unitPattern count="other">{0} sem.</unitPattern>
+				<perUnitPattern>{0}/sem.</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>d</displayName>
 				<unitPattern count="one">{0} d</unitPattern>
 				<unitPattern count="other">{0} d</unitPattern>
+				<perUnitPattern>{0}/d</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>horas</displayName>
@@ -6916,30 +7211,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} h</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>m</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>s</displayName>
@@ -6947,15 +7223,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} s</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>sem</displayName>
-				<unitPattern count="one">{0} sem</unitPattern>
-				<unitPattern count="other">{0} sem</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>a</displayName>
-				<unitPattern count="one">{0} a</unitPattern>
-				<unitPattern count="other">{0} a</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>A</displayName>
@@ -6977,6 +7258,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -6987,21 +7273,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} cal</unitPattern>
 				<unitPattern count="other">{0} cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>J</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -7012,201 +7293,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ft</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>in</displayName>
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>a·l</displayName>
-				<unitPattern count="one">{0} a. l.</unitPattern>
-				<unitPattern count="other">{0} a. l.</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mi</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="one">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>M</displayName>
-				<unitPattern count="one">{0} M</unitPattern>
-				<unitPattern count="other">{0} M</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsecs</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
-				<displayName>yardas</displayName>
+				<displayName>yd</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ft</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>in</displayName>
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>a. l.</displayName>
+				<unitPattern count="one">{0} a. l.</unitPattern>
+				<unitPattern count="other">{0} a. l.</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>M</displayName>
+				<unitPattern count="one">{0} M</unitPattern>
+				<unitPattern count="other">{0} M</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>mi esc.</displayName>
+				<unitPattern count="one">{0} mi esc.</unitPattern>
+				<unitPattern count="other">{0} mi esc.</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>c</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>ton</displayName>
 				<unitPattern count="one">{0} ton</unitPattern>
 				<unitPattern count="other">{0} ton</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>c</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>CV</displayName>
-				<unitPattern count="one">{0} CV</unitPattern>
-				<unitPattern count="other">{0} CV</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>vatios</displayName>
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>CV</displayName>
+				<unitPattern count="one">{0} CV</unitPattern>
+				<unitPattern count="other">{0} CV</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mmHg</displayName>
 				<unitPattern count="one">{0} mmHg</unitPattern>
@@ -7217,10 +7502,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>c</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -7237,6 +7527,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0} °C</unitPattern>
@@ -7252,31 +7552,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -7286,6 +7561,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -7297,25 +7579,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>tazas</displayName>
-				<unitPattern count="one">{0} tza.</unitPattern>
-				<unitPattern count="other">{0} tza.</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -7326,46 +7603,93 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>l</displayName>
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="one">{0} Ml</unitPattern>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
 				<unitPattern count="one">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pintas</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mc</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>tazas</displayName>
+				<unitPattern count="one">{0} tza.</unitPattern>
+				<unitPattern count="other">{0} tza.</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
-				<displayName>cdas.</displayName>
-				<unitPattern count="one">{0} cd.</unitPattern>
-				<unitPattern count="other">{0} cdas.</unitPattern>
+				<displayName>cda</displayName>
+				<unitPattern count="one">{0} cda</unitPattern>
+				<unitPattern count="other">{0} cda</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
-				<displayName>cdtas.</displayName>
-				<unitPattern count="one">{0} cdta.</unitPattern>
-				<unitPattern count="other">{0} cdtas.</unitPattern>
+				<displayName>cdta</displayName>
+				<unitPattern count="one">{0} cdta</unitPattern>
+				<unitPattern count="other">{0} cdta</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} O</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<unitPattern count="one" draft="contributed">{0}G</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}'</unitPattern>
 				<unitPattern count="other">{0}'</unitPattern>
@@ -7374,26 +7698,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}&quot;</unitPattern>
 				<unitPattern count="other">{0}&quot;</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0}ac</unitPattern>
-				<unitPattern count="other">{0}ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0}km²</unitPattern>
+				<unitPattern count="other">{0}km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0}ha</unitPattern>
 				<unitPattern count="other">{0}ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0}ft²</unitPattern>
-				<unitPattern count="other">{0}ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0}km²</unitPattern>
-				<unitPattern count="other">{0}km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0}m²</unitPattern>
 				<unitPattern count="other">{0}m²</unitPattern>
@@ -7402,6 +7714,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}mi²</unitPattern>
 				<unitPattern count="other">{0}mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0}ac</unitPattern>
+				<unitPattern count="other">{0}ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0}ft²</unitPattern>
+				<unitPattern count="other">{0}ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100km</displayName>
+				<unitPattern count="one">{0}l/100km</unitPattern>
+				<unitPattern count="other">{0}l/100km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>a</displayName>
+				<unitPattern count="one">{0}a</unitPattern>
+				<unitPattern count="other">{0}a</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0}m</unitPattern>
+				<unitPattern count="other">{0}m</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>sem</displayName>
+				<unitPattern count="one">{0}sem</unitPattern>
+				<unitPattern count="other">{0}sem</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>d</displayName>
 				<unitPattern count="one">{0}d</unitPattern>
@@ -7412,66 +7752,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}h</unitPattern>
 				<unitPattern count="other">{0}h</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0}ms</unitPattern>
-				<unitPattern count="other">{0}ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0}min</unitPattern>
 				<unitPattern count="other">{0}min</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>m</displayName>
-				<unitPattern count="one">{0}m</unitPattern>
-				<unitPattern count="other">{0}m</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>s</displayName>
 				<unitPattern count="one">{0}s</unitPattern>
 				<unitPattern count="other">{0}s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>sem</displayName>
-				<unitPattern count="one">{0}sem</unitPattern>
-				<unitPattern count="other">{0}sem</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>a</displayName>
-				<unitPattern count="one">{0}a</unitPattern>
-				<unitPattern count="other">{0}a</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0}cm</unitPattern>
-				<unitPattern count="other">{0}cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0}ft</unitPattern>
-				<unitPattern count="other">{0}ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0}in</unitPattern>
-				<unitPattern count="other">{0}in</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0}ms</unitPattern>
+				<unitPattern count="other">{0}ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
 				<unitPattern count="one">{0}km</unitPattern>
 				<unitPattern count="other">{0}km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0}a.l.</unitPattern>
-				<unitPattern count="other">{0}a.l.</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>m</displayName>
 				<unitPattern count="one">{0}m</unitPattern>
 				<unitPattern count="other">{0}m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0}mi</unitPattern>
-				<unitPattern count="other">{0}mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0}cm</unitPattern>
+				<unitPattern count="other">{0}cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -7482,31 +7791,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}pm</unitPattern>
 				<unitPattern count="other">{0}pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0}mi</unitPattern>
+				<unitPattern count="other">{0}mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0}yd</unitPattern>
 				<unitPattern count="other">{0}yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0}g</unitPattern>
-				<unitPattern count="other">{0}g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0}ft</unitPattern>
+				<unitPattern count="other">{0}ft</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0}in</unitPattern>
+				<unitPattern count="other">{0}in</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0}a.l.</unitPattern>
+				<unitPattern count="other">{0}a.l.</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="one">{0}kg</unitPattern>
 				<unitPattern count="other">{0}kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0}oz</unitPattern>
-				<unitPattern count="other">{0}oz</unitPattern>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0}g</unitPattern>
+				<unitPattern count="other">{0}g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0}lb</unitPattern>
 				<unitPattern count="other">{0}lb</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0}hp</unitPattern>
-				<unitPattern count="other">{0}hp</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0}oz</unitPattern>
+				<unitPattern count="other">{0}oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0}kW</unitPattern>
@@ -7516,6 +7837,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}W</unitPattern>
 				<unitPattern count="other">{0}W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0}hp</unitPattern>
+				<unitPattern count="other">{0}hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0}hPa</unitPattern>
 				<unitPattern count="other">{0}hPa</unitPattern>
@@ -7563,6 +7888,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}l</unitPattern>
 				<unitPattern count="other">{0}l</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}O</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_419.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_419.xml
new file mode 100644
index 00000000000..dd8252a7698
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_419.xml
@@ -0,0 +1,597 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12197 $"/>
+		<language type="es"/>
+		<territory type="419"/>
+	</identity>
+	<localeDisplayNames>
+		<languages>
+			<language type="en_GB" alt="short">inglés (R. U.)</language>
+			<language type="eu" draft="contributed">vasco</language>
+			<language type="luo">luo</language>
+			<language type="ps" alt="variant" draft="contributed">pashtún</language>
+			<language type="sw">swahili</language>
+			<language type="sw_CD">swahili del Congo</language>
+			<language type="ug" alt="variant" draft="contributed">uighur</language>
+			<language type="vai">vai</language>
+		</languages>
+		<territories>
+			<territory type="035" draft="provisional">Asia sudoriental</territory>
+			<territory type="GB" alt="short">R. U.</territory>
+			<territory type="IC" draft="provisional">islas Canarias</territory>
+			<territory type="QO" draft="provisional">Islas Ultramarinas</territory>
+		</territories>
+		<keys>
+			<key type="ms" draft="contributed">sm</key>
+		</keys>
+		<types>
+			<type key="numbers" type="knda" draft="contributed">números en kannada</type>
+			<type key="numbers" type="laoo" draft="contributed">números en lao</type>
+		</types>
+		<codePatterns>
+			<codePattern type="script">Alfabeto: {0}</codePattern>
+		</codePatterns>
+	</localeDisplayNames>
+	<dates>
+		<calendars>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>dd/MM/yy GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="GyMMM">MMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d 'de' MMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="MMMd">d 'de' MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, d 'de' MMM</dateFormatItem>
+						<dateFormatItem id="yMEd">E d/M/y G</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">E, d/M–E, d/M</greatestDifference>
+							<greatestDifference id="M">E, d/M–E, d/M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="M">d 'de' MMM–d 'de' MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">E, d 'de' MMM–E, d 'de' MMM</greatestDifference>
+							<greatestDifference id="M">E, d 'de' MMM–E, d 'de' MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M" draft="contributed">M/y – M/y GGGGG</greatestDifference>
+							<greatestDifference id="y" draft="contributed">M/y – M/y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d" draft="contributed">d/M/y – d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d/M/y – d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="y" draft="contributed">d/M/y – d/M/y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d" draft="contributed">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="y" draft="contributed">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">ene.</month>
+							<month type="2">feb.</month>
+							<month type="3">mar.</month>
+							<month type="4">abr.</month>
+							<month type="5">may.</month>
+							<month type="6">jun.</month>
+							<month type="7">jul.</month>
+							<month type="8">ago.</month>
+							<month type="9">sep.</month>
+							<month type="10">oct.</month>
+							<month type="11">nov.</month>
+							<month type="12">dic.</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">e</month>
+							<month type="2" draft="contributed">f</month>
+							<month type="3" draft="contributed">m</month>
+							<month type="4" draft="contributed">a</month>
+							<month type="5" draft="contributed">m</month>
+							<month type="6" draft="contributed">j</month>
+							<month type="7" draft="contributed">j</month>
+							<month type="8" draft="contributed">a</month>
+							<month type="9" draft="contributed">s</month>
+							<month type="10" draft="contributed">o</month>
+							<month type="11" draft="contributed">n</month>
+							<month type="12" draft="contributed">d</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">ene.</month>
+							<month type="2">feb.</month>
+							<month type="3">mar.</month>
+							<month type="4">abr.</month>
+							<month type="5">may.</month>
+							<month type="6">jun.</month>
+							<month type="7">jul.</month>
+							<month type="8">ago.</month>
+							<month type="9">sep.</month>
+							<month type="10">oct.</month>
+							<month type="11">nov.</month>
+							<month type="12">dic.</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="provisional">e</month>
+							<month type="2" draft="provisional">f</month>
+							<month type="3" draft="provisional">m</month>
+							<month type="4" draft="provisional">a</month>
+							<month type="5" draft="provisional">m</month>
+							<month type="6" draft="provisional">j</month>
+							<month type="7" draft="provisional">j</month>
+							<month type="8" draft="provisional">a</month>
+							<month type="9" draft="provisional">s</month>
+							<month type="10" draft="provisional">o</month>
+							<month type="11" draft="provisional">n</month>
+							<month type="12" draft="provisional">d</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="narrow">
+							<day type="sun">d</day>
+							<day type="mon">l</day>
+							<day type="tue">m</day>
+							<day type="wed">m</day>
+							<day type="thu">j</day>
+							<day type="fri">v</day>
+							<day type="sat">s</day>
+						</dayWidth>
+					</dayContext>
+					<dayContext type="stand-alone">
+						<dayWidth type="narrow">
+							<day type="sun">D</day>
+							<day type="mon">L</day>
+							<day type="tue">M</day>
+							<day type="wed">M</day>
+							<day type="thu">J</day>
+							<day type="fri">V</day>
+							<day type="sat">S</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am" draft="contributed">a.m.</dayPeriod>
+							<dayPeriod type="pm" draft="contributed">p.m.</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="noon" draft="contributed">m.</dayPeriod>
+							<dayPeriod type="morning1" draft="contributed">madrugada</dayPeriod>
+							<dayPeriod type="morning2" draft="contributed">mañana</dayPeriod>
+							<dayPeriod type="evening1" draft="contributed">tarde</dayPeriod>
+							<dayPeriod type="night1" draft="contributed">noche</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am" draft="contributed">a.m.</dayPeriod>
+							<dayPeriod type="pm" draft="contributed">p.m.</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am" draft="contributed">a.m.</dayPeriod>
+							<dayPeriod type="pm" draft="contributed">p.m.</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am" draft="contributed">a.m.</dayPeriod>
+							<dayPeriod type="pm" draft="contributed">p.m.</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am" draft="contributed">a.m.</dayPeriod>
+							<dayPeriod type="pm" draft="contributed">p.m.</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
+						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d 'de' MMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="H">HH</dateFormatItem>
+						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
+						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="MMMdd">dd-MMM</dateFormatItem>
+						<dateFormatItem id="yMEd" draft="contributed">E d/M/y</dateFormatItem>
+						<dateFormatItem id="yMMM" draft="contributed">MMMM 'de' y</dateFormatItem>
+						<dateFormatItem id="yMMMd" draft="contributed">d 'de' MMMM 'de' y</dateFormatItem>
+						<dateFormatItem id="yMMMEd" draft="contributed">E, d 'de' MMM 'de' y</dateFormatItem>
+						<dateFormatItem id="yQQQ" draft="contributed">QQQ 'de' y</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">h a–h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H" draft="contributed">HH – HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H" draft="contributed">HH:mm – HH:mm</greatestDifference>
+							<greatestDifference id="m" draft="contributed">HH:mm – HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">h:mm a–h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H" draft="contributed">HH:mm – HH:mm v</greatestDifference>
+							<greatestDifference id="m" draft="contributed">HH:mm – HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">h a–h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H" draft="contributed">HH – HH v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">E, d/M–E, d/M</greatestDifference>
+							<greatestDifference id="M">E, d/M–E, d/M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d" draft="contributed">d – d 'de' MMM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d 'de' MMM – d 'de' MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d" draft="contributed">E, d 'de' MMM – E, d 'de' MMM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E, d 'de' MMM – E, d 'de' MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">E, d/M/y–E, d/M/y</greatestDifference>
+							<greatestDifference id="M">E, d/M/y–E, d/M/y</greatestDifference>
+							<greatestDifference id="y">E, d/M/y–E, d/M/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="y" draft="contributed">MMM 'de' y – MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d" draft="contributed">d – d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d 'de' MMM – d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">d 'de' MMM 'de' y – d 'de' MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d" draft="contributed">E, d 'de' MMM – E, d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E, d 'de' MMM – E, d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">E, d 'de' MMM 'de' y – E, d 'de' MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="y">MMMM 'de' y–MMMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="dayperiod">
+				<displayName draft="contributed">a.m./p.m.</displayName>
+			</field>
+			<field type="zone">
+				<displayName>Zona horaria</displayName>
+			</field>
+		</fields>
+		<timeZoneNames>
+			<regionFormat type="daylight" draft="contributed">hora de verano de {0}</regionFormat>
+			<regionFormat type="standard" draft="contributed">hora estándar de {0}</regionFormat>
+			<zone type="Etc/Unknown">
+				<exemplarCity draft="contributed">Ciudad desconocida</exemplarCity>
+			</zone>
+			<zone type="America/St_Johns">
+				<exemplarCity draft="provisional">San Juan de Terranova</exemplarCity>
+			</zone>
+			<zone type="America/St_Kitts">
+				<exemplarCity draft="provisional">San Cristóbal</exemplarCity>
+			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity draft="contributed">Srednekolymsk</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wake">
+				<exemplarCity draft="provisional">Isla Wake</exemplarCity>
+			</zone>
+			<metazone type="Chamorro">
+				<long>
+					<standard draft="provisional">hora de Chamorro</standard>
+				</long>
+			</metazone>
+			<metazone type="Christmas">
+				<long>
+					<standard draft="provisional">hora de la isla Christmas</standard>
+				</long>
+			</metazone>
+			<metazone type="Cocos">
+				<long>
+					<standard draft="provisional">hora de las islas Cocos</standard>
+				</long>
+			</metazone>
+			<metazone type="Cook">
+				<long>
+					<generic>hora de las islas Cook</generic>
+					<standard>hora estándar de las islas Cook</standard>
+					<daylight>hora de verano media de las islas Cook</daylight>
+				</long>
+			</metazone>
+			<metazone type="Europe_Central">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+			<metazone type="Europe_Eastern">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+			<metazone type="Europe_Further_Eastern">
+				<long>
+					<standard draft="contributed">horario del lejano este de Europa</standard>
+				</long>
+			</metazone>
+			<metazone type="Europe_Western">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+			<metazone type="GMT">
+				<short>
+					<standard>∅∅∅</standard>
+				</short>
+			</metazone>
+			<metazone type="Hawaii_Aleutian">
+				<long>
+					<generic draft="provisional">hora de Hawái-Aleutianas</generic>
+					<standard draft="provisional">hora estándar de Hawái-Aleutianas</standard>
+					<daylight draft="provisional">hora de verano de Hawái-Aleutianas</daylight>
+				</long>
+			</metazone>
+			<metazone type="India">
+				<long>
+					<standard draft="provisional">hora de India</standard>
+				</long>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<minimumGroupingDigits draft="contributed">1</minimumGroupingDigits>
+		<symbols numberSystem="latn">
+			<decimal>.</decimal>
+			<group>,</group>
+		</symbols>
+		<decimalFormats numberSystem="latn">
+			<decimalFormatLength type="short">
+				<decimalFormat>
+					<pattern type="1000" count="one" draft="contributed">0</pattern>
+					<pattern type="1000" count="other" draft="contributed">0</pattern>
+					<pattern type="10000" count="one" draft="contributed">00k</pattern>
+					<pattern type="10000" count="other" draft="contributed">00k</pattern>
+					<pattern type="100000" count="one" draft="contributed">000k</pattern>
+					<pattern type="100000" count="other" draft="contributed">000k</pattern>
+					<pattern type="1000000000" count="one" draft="contributed">0k M</pattern>
+					<pattern type="1000000000" count="other" draft="contributed">0k M</pattern>
+					<pattern type="10000000000" count="one" draft="contributed">00k M</pattern>
+					<pattern type="10000000000" count="other" draft="contributed">00k M</pattern>
+					<pattern type="100000000000" count="one" draft="contributed">000k M</pattern>
+					<pattern type="100000000000" count="other" draft="contributed">000k M</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+		</decimalFormats>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>¤#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>¤#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencies>
+			<currency type="AMD">
+				<displayName draft="contributed">dram armenio</displayName>
+			</currency>
+			<currency type="BGN">
+				<displayName count="one">lev búlgaro</displayName>
+				<displayName count="other">leva búlgaros</displayName>
+			</currency>
+			<currency type="CAD">
+				<symbol>CAD</symbol>
+			</currency>
+			<currency type="EGP">
+				<symbol alt="narrow" draft="contributed">E£</symbol>
+			</currency>
+			<currency type="ERN">
+				<displayName draft="contributed">nafka</displayName>
+			</currency>
+			<currency type="EUR">
+				<symbol>EUR</symbol>
+			</currency>
+			<currency type="THB">
+				<symbol>THB</symbol>
+			</currency>
+			<currency type="USD">
+				<symbol>USD</symbol>
+			</currency>
+			<currency type="VEF">
+				<symbol alt="narrow" draft="contributed">BsF</symbol>
+			</currency>
+			<currency type="VND">
+				<symbol>VND</symbol>
+			</currency>
+			<currency type="XXX">
+				<displayName count="one">(unidad de moneda desconocida)</displayName>
+				<displayName count="other">(moneda desconocida)</displayName>
+			</currency>
+		</currencies>
+	</numbers>
+	<units>
+		<unitLength type="long">
+			<unit type="electric-ampere">
+				<displayName draft="provisional">amperes</displayName>
+				<unitPattern count="one" draft="provisional">{0} ampere</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} amperes</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName draft="provisional">miliamperes</displayName>
+				<unitPattern count="one" draft="provisional">{0} miliampere</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} miliamperes</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<unitPattern count="one" draft="provisional">{0} ohm</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} ohmios</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<unitPattern count="one" draft="provisional">{0} volt</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} voltios</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName draft="provisional">kilojoules</displayName>
+				<unitPattern count="one" draft="provisional">{0} kilojule</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} kilojules</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName draft="provisional">joules</displayName>
+				<unitPattern count="one" draft="provisional">{0} joule</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} joules</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName draft="provisional">kilovatios hora</displayName>
+				<unitPattern count="one" draft="provisional">{0} kilovatio hora</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} kilovatios hora</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName draft="provisional">caballos de fuerza</displayName>
+				<unitPattern count="one" draft="provisional">{0} caballo de vapor</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} caballos de fuerza</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<unitPattern count="one">{0} acre pie</unitPattern>
+				<unitPattern count="other">{0} acres pies</unitPattern>
+			</unit>
+		</unitLength>
+		<unitLength type="short">
+			<unit type="duration-year">
+				<displayName>aa.</displayName>
+				<unitPattern count="one">{0} a.</unitPattern>
+				<unitPattern count="other">{0} aa.</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mm.</displayName>
+				<unitPattern count="one">{0} m.</unitPattern>
+				<unitPattern count="other">{0} mm.</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>sems.</displayName>
+				<unitPattern count="one">{0} sem.</unitPattern>
+				<unitPattern count="other">{0} sems.</unitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>dd.</displayName>
+				<unitPattern count="one">{0} d.</unitPattern>
+				<unitPattern count="other">{0} dd.</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName draft="contributed">volts</displayName>
+			</unit>
+			<unit type="length-yard">
+				<displayName>yardas</displayName>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsecs</displayName>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>aa. l.</displayName>
+				<unitPattern count="one">{0} a. l.</unitPattern>
+				<unitPattern count="other">{0} aa. l.</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName draft="contributed">watts</displayName>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>pintas</displayName>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>cdas.</displayName>
+				<unitPattern count="one">{0} cda.</unitPattern>
+				<unitPattern count="other">{0} cdas.</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>cdtas.</displayName>
+				<unitPattern count="one">{0} cdta.</unitPattern>
+				<unitPattern count="other">{0} cdtas.</unitPattern>
+			</unit>
+		</unitLength>
+		<unitLength type="narrow">
+			<unit type="duration-year">
+				<displayName>a.</displayName>
+				<unitPattern count="one" draft="contributed">{0}a.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}aa.</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>m.</displayName>
+				<unitPattern count="one" draft="contributed">{0}m.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}mm.</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>sem.</displayName>
+				<unitPattern count="one" draft="contributed">{0}sem.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}sems.</unitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>d.</displayName>
+				<unitPattern count="one" draft="contributed">{0}d.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}dd.</unitPattern>
+			</unit>
+		</unitLength>
+	</units>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_AR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_AR.xml
new file mode 100644
index 00000000000..babccffa2fc
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_AR.xml
@@ -0,0 +1,350 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12217 $"/>
+		<language type="es"/>
+		<territory type="AR"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="generic">
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="MEd" draft="contributed">E d-M</dateFormatItem>
+						<dateFormatItem id="yyyyM" draft="contributed">M-y G</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback draft="unconfirmed">{0} a el {1}</intervalFormatFallback>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d" draft="unconfirmed">dd/MM – dd/MM</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">dd/MM – dd/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d" draft="unconfirmed">E dd/MM – E dd/MM</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E dd/MM – E dd/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="M" draft="unconfirmed">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d" draft="unconfirmed">E d 'al' E d 'de' MMM</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M" draft="unconfirmed">MM/y – MM/y G</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">MM/y – MM/y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d" draft="unconfirmed">dd/MM/y – dd/MM/y G</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">dd/MM/y – dd/MM/y G</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">dd/MM/y – dd/MM/y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d" draft="unconfirmed">E dd/MM/y – E dd/MM/y G</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E dd/MM/y – E dd/MM/y G</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">E dd/MM/y – E dd/MM/y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="y" draft="unconfirmed">MMM 'de' y 'a' MMM 'de' y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="M" draft="unconfirmed">d 'de' MMM 'al' d 'de' MMM 'de' y G</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d" draft="unconfirmed">E d 'al' E d 'de' MMM 'de' y G</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E d 'de' MMM 'al' E d 'de' MMM 'de' y G</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y G</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="noon" draft="contributed">mediodía</dayPeriod>
+							<dayPeriod type="morning1" draft="contributed">madrugada</dayPeriod>
+							<dayPeriod type="morning2" draft="contributed">mañana</dayPeriod>
+							<dayPeriod type="evening1" draft="contributed">tarde</dayPeriod>
+							<dayPeriod type="night1" draft="contributed">noche</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="noon" draft="contributed">mediodía</dayPeriod>
+							<dayPeriod type="morning1" draft="contributed">madrugada</dayPeriod>
+							<dayPeriod type="morning2" draft="contributed">mañana</dayPeriod>
+							<dayPeriod type="evening1" draft="contributed">tarde</dayPeriod>
+							<dayPeriod type="night1" draft="contributed">noche</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="noon">m.</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="GyMMMEd" draft="contributed">E, d 'de' MMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="hms" draft="contributed">hh:mm:ss</dateFormatItem>
+						<dateFormatItem id="Hmsv" draft="contributed">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="Hmv" draft="contributed">HH:mm v</dateFormatItem>
+						<dateFormatItem id="MEd" draft="contributed">E d-M</dateFormatItem>
+						<dateFormatItem id="yM" draft="contributed">M-y</dateFormatItem>
+						<dateFormatItem id="yMEd" draft="contributed">E, d/M/y</dateFormatItem>
+						<dateFormatItem id="yMMMd" draft="contributed">d 'de' MMM 'de' y</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback draft="contributed">{0} a el {1}</intervalFormatFallback>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H" draft="contributed">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="m" draft="contributed">HH:mm–HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H" draft="contributed">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="m" draft="contributed">HH:mm–HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H" draft="contributed">HH–HH v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d" draft="contributed">dd/MM – dd/MM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">dd/MM – dd/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d" draft="contributed">E dd/MM – E dd/MM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E dd/MM – E dd/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d" draft="contributed">dd – dd 'de' MM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d" draft="contributed">E d 'al' E d 'de' MMM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M" draft="contributed">MM/y – MM/y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">MM/y – MM/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d" draft="contributed">dd/MM/y – dd/MM/y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">dd/MM/y – dd/MM/y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">dd/MM/y – dd/MM/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d" draft="contributed">E, dd/MM/y – E, dd/MM/y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E, dd/MM/y – E, dd/MM/y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">E, dd/MM/y – E, dd/MM/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="y" draft="contributed">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="M" draft="contributed">d 'de' MMM 'al' d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d" draft="contributed">E, d 'al' E, d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E, d 'de' MMM 'al' E, d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">E, d 'de' MMM 'de' y 'al' E, d 'de' MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M" draft="contributed">MMMM 'al' MMMM 'de' y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">MMMM 'de' y 'al' MMMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="day-short">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">dentro de {0} días</relativeTimePattern>
+					<relativeTimePattern count="other">dentro de {0} días</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">hace {0} días</relativeTimePattern>
+					<relativeTimePattern count="other">hace {0} días</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">dentro de {0} días</relativeTimePattern>
+					<relativeTimePattern count="other">dentro de {0} días</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">hace {0} días</relativeTimePattern>
+					<relativeTimePattern count="other">hace {0} días</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-short">
+				<displayName draft="contributed">seg.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="contributed">dentro de {0} seg.</relativeTimePattern>
+					<relativeTimePattern count="other" draft="contributed">dentro de {0} seg.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="contributed">hace {0} seg.</relativeTimePattern>
+					<relativeTimePattern count="other" draft="contributed">hace {0} seg.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-narrow">
+				<displayName draft="contributed">seg.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="contributed">dentro de {0} seg.</relativeTimePattern>
+					<relativeTimePattern count="other" draft="contributed">dentro de {0} seg.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="contributed">hace {0} seg.</relativeTimePattern>
+					<relativeTimePattern count="other" draft="contributed">hace {0} seg.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="zone">
+				<displayName draft="contributed">zona horaria</displayName>
+			</field>
+		</fields>
+		<timeZoneNames>
+			<metazone type="Argentina">
+				<short>
+					<generic>ART</generic>
+					<standard>ART</standard>
+					<daylight>ARST</daylight>
+				</short>
+			</metazone>
+			<metazone type="Argentina_Western">
+				<short>
+					<generic>WART</generic>
+					<standard>WART</standard>
+					<daylight>WARST</daylight>
+				</short>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group>.</group>
+		</symbols>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern draft="contributed">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencies>
+			<currency type="ARS">
+				<symbol>$</symbol>
+			</currency>
+			<currency type="GEL">
+				<symbol alt="variant" draft="contributed">GEL</symbol>
+			</currency>
+			<currency type="USD">
+				<symbol>US$</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+	<units>
+		<unitLength type="long">
+			<unit type="duration-year">
+				<perUnitPattern draft="contributed">{0}/año</perUnitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName draft="contributed">amperios</displayName>
+				<unitPattern count="one" draft="contributed">{0} amperio</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} amperios</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName draft="contributed">miliamperios</displayName>
+				<unitPattern count="one" draft="contributed">{0} miliamperio</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} miliamperios</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<unitPattern count="one">{0} ohmio</unitPattern>
+				<unitPattern count="other">{0} ohmios</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<unitPattern count="one">{0} voltio</unitPattern>
+				<unitPattern count="other">{0} voltios</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName draft="contributed">kilojulios</displayName>
+				<unitPattern count="one" draft="contributed">{0} kilojulio</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kilojulios</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName draft="contributed">julios</displayName>
+				<unitPattern count="one" draft="contributed">{0} julio</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} julios</unitPattern>
+			</unit>
+		</unitLength>
+		<unitLength type="short">
+			<unit type="duration-century">
+				<displayName draft="contributed">s</displayName>
+				<unitPattern count="one" draft="contributed">{0} s</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} s</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="contributed">años</displayName>
+				<unitPattern count="one" draft="contributed">{0} año</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} años</unitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName draft="contributed">hs.</displayName>
+			</unit>
+			<unit type="duration-second">
+				<displayName draft="contributed">seg.</displayName>
+				<unitPattern count="one" draft="contributed">{0} seg.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} seg.</unitPattern>
+				<perUnitPattern draft="contributed">{0}/seg.</perUnitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName draft="contributed">voltios</displayName>
+			</unit>
+			<unit type="power-watt">
+				<displayName draft="contributed">vatios</displayName>
+			</unit>
+		</unitLength>
+		<unitLength type="narrow">
+			<unit type="duration-year">
+				<unitPattern count="one" draft="contributed">{0}a.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}a.</unitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName draft="contributed">seg.</displayName>
+				<unitPattern count="one" draft="contributed">{0}seg.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}seg.</unitPattern>
+			</unit>
+		</unitLength>
+	</units>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_BO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_BO.xml
similarity index 69%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_BO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_BO.xml
index b31c83734f8..4b9e1bccaa7 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_BO.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_BO.xml
@@ -1,16 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="es"/>
 		<territory type="BO"/>
 	</identity>
+	<dates>
+		<timeZoneNames>
+			<metazone type="Bolivia">
+				<short>
+					<standard>BOT</standard>
+				</short>
+			</metazone>
+		</timeZoneNames>
+	</dates>
 	<numbers>
 		<symbols numberSystem="latn">
 			<decimal>,</decimal>
@@ -23,3 +31,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_PH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_BR.xml
similarity index 62%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_PH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_BR.xml
index b7618b6d7fb..7928579d53d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_PH.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_BR.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12413 $"/>
 		<language type="es"/>
-		<territory type="PH"/>
+		<territory type="BR"/>
 	</identity>
 	<numbers>
 		<currencies>
-			<currency type="PHP">
-				<symbol>₱</symbol>
+			<currency type="BRL">
+				<symbol>R$</symbol>
 			</currency>
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_CL.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CL.xml
similarity index 53%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_CL.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CL.xml
index a4b84b08075..21277fb6224 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_CL.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CL.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 12128 $"/>
 		<language type="es"/>
 		<territory type="CL"/>
 	</identity>
@@ -16,8 +15,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="arn" draft="unconfirmed">mapudungun</language>
 		</languages>
 		<territories>
-			<territory type="005">Sudamérica</territory>
-			<territory type="AN" draft="unconfirmed">Antillas Holandesas</territory>
 			<territory type="AZ" draft="unconfirmed">Azerbayán</territory>
 			<territory type="BD" draft="unconfirmed">Bangladesh</territory>
 			<territory type="EH">Sahara Occidental</territory>
@@ -29,7 +26,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="currency" draft="unconfirmed">divisa</key>
 		</keys>
 		<types>
-			<type type="phonebook" key="collation">orden de directorio telefónico</type>
+			<type key="collation" type="phonebook">orden de directorio telefónico</type>
 		</types>
 	</localeDisplayNames>
 	<dates>
@@ -56,7 +53,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMEd">E dd-MM-y G</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatFallback draft="unconfirmed">{0} a el {1}</intervalFormatFallback>
+						<intervalFormatFallback draft="contributed">{0} a el {1}</intervalFormatFallback>
 						<intervalFormatItem id="H">
 							<greatestDifference id="H" draft="unconfirmed">H–H</greatestDifference>
 						</intervalFormatItem>
@@ -80,50 +77,91 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="H" draft="unconfirmed">H–H v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="unconfirmed">dd-MM – dd-MM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">dd-MM – dd-MM</greatestDifference>
+							<greatestDifference id="d" draft="contributed">dd-MM – dd-MM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">dd-MM – dd-MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="unconfirmed">E dd-MM – E dd-MM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E dd-MM – E dd-MM</greatestDifference>
+							<greatestDifference id="d" draft="contributed">E dd-MM – E dd-MM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E dd-MM – E dd-MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="M" draft="unconfirmed">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d 'al' E d 'de' MMM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
+							<greatestDifference id="d" draft="contributed">E d 'al' E d 'de' MMM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="unconfirmed">MM-y – MM-y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MM-y – MM-y G</greatestDifference>
+							<greatestDifference id="M" draft="contributed">MM-y – MM-y G</greatestDifference>
+							<greatestDifference id="y" draft="contributed">MM-y – MM-y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="unconfirmed">dd-MM-y – dd-MM-y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">dd-MM-y – dd-MM-y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">dd-MM-y – dd-MM-y G</greatestDifference>
+							<greatestDifference id="d" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
+							<greatestDifference id="M" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
+							<greatestDifference id="y" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="unconfirmed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E dd-MM-y – E dd-MM-y G</greatestDifference>
+							<greatestDifference id="d" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
+							<greatestDifference id="y" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="y" draft="unconfirmed">MMM 'de' y 'a' MMM 'de' y G</greatestDifference>
+							<greatestDifference id="y" draft="contributed">MMM 'de' y 'a' MMM 'de' y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="M" draft="unconfirmed">d 'de' MMM 'al' d 'de' MMM 'de' y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y G</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d 'de' MMM 'al' d 'de' MMM 'de' y G</greatestDifference>
+							<greatestDifference id="y" draft="contributed">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d 'al' E d 'de' MMM 'de' y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d 'de' MMM 'al' E d 'de' MMM 'de' y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y G</greatestDifference>
+							<greatestDifference id="d" draft="contributed">E d 'al' E d 'de' MMM 'de' y G</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E d 'de' MMM 'al' E d 'de' MMM 'de' y G</greatestDifference>
+							<greatestDifference id="y" draft="contributed">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y G</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="gregorian">
+				<months>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">ene.</month>
+							<month type="2" draft="contributed">feb.</month>
+							<month type="3" draft="contributed">mar.</month>
+							<month type="4" draft="contributed">abr.</month>
+							<month type="5" draft="contributed">may.</month>
+							<month type="6" draft="contributed">jun.</month>
+							<month type="7" draft="contributed">jul.</month>
+							<month type="8" draft="contributed">ago.</month>
+							<month type="9" draft="contributed">sept.</month>
+							<month type="10" draft="contributed">oct.</month>
+							<month type="11" draft="contributed">nov.</month>
+							<month type="12" draft="contributed">dic.</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="short">
+							<day type="sun" draft="contributed">do</day>
+							<day type="mon" draft="contributed">lu</day>
+							<day type="tue" draft="contributed">ma</day>
+							<day type="wed" draft="contributed">mi</day>
+							<day type="thu" draft="contributed">ju</day>
+							<day type="fri" draft="contributed">vi</day>
+							<day type="sat" draft="contributed">sá</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<quarters>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="wide">
+							<quarter type="1">1.° trimestre</quarter>
+							<quarter type="2">2.° trimestre</quarter>
+							<quarter type="3">3.° trimestre</quarter>
+							<quarter type="4">4.º trimestre</quarter>
+						</quarterWidth>
+					</quarterContext>
+				</quarters>
 				<dateFormats>
 					<dateFormatLength type="medium">
 						<dateFormat>
@@ -145,70 +183,79 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yMEd">E dd-MM-y</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatFallback draft="unconfirmed">{0} a el {1}</intervalFormatFallback>
+						<intervalFormatFallback draft="contributed">{0} a el {1}</intervalFormatFallback>
 						<intervalFormatItem id="H">
-							<greatestDifference id="H" draft="unconfirmed">H–H</greatestDifference>
+							<greatestDifference id="H" draft="contributed">H–H</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="h" draft="contributed">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="m" draft="contributed">h:mm–h:mm a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hm">
-							<greatestDifference id="H" draft="unconfirmed">H:mm–H:mm</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">H:mm–H:mm</greatestDifference>
+							<greatestDifference id="H" draft="contributed">H:mm–H:mm</greatestDifference>
+							<greatestDifference id="m" draft="contributed">H:mm–H:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H" draft="unconfirmed">H:mm–H:mm v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">H:mm–H:mm v</greatestDifference>
+							<greatestDifference id="H" draft="contributed">H:mm–H:mm v</greatestDifference>
+							<greatestDifference id="m" draft="contributed">H:mm–H:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
-							<greatestDifference id="H" draft="unconfirmed">H–H v</greatestDifference>
+							<greatestDifference id="H" draft="contributed">H–H v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="unconfirmed">dd-MM – dd-MM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">dd-MM – dd-MM</greatestDifference>
+							<greatestDifference id="d" draft="contributed">dd-MM – dd-MM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">dd-MM – dd-MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="unconfirmed">E dd-MM – E dd-MM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E dd-MM – E dd-MM</greatestDifference>
+							<greatestDifference id="d" draft="contributed">E dd-MM – E dd-MM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E dd-MM – E dd-MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="M" draft="unconfirmed">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d 'al' E d 'de' MMM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
+							<greatestDifference id="d" draft="contributed">E d 'al' E d 'de' MMM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="unconfirmed">MM-y – MM-y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MM-y – MM-y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">MM-y – MM-y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">MM-y – MM-y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="unconfirmed">dd-MM-y – dd-MM-y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">dd-MM-y – dd-MM-y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">dd-MM-y – dd-MM-y</greatestDifference>
+							<greatestDifference id="d" draft="contributed">dd-MM-y – dd-MM-y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">dd-MM-y – dd-MM-y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">dd-MM-y – dd-MM-y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="unconfirmed">E dd-MM-y – E dd-MM-y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E dd-MM-y – E dd-MM-y</greatestDifference>
+							<greatestDifference id="d" draft="contributed">E dd-MM-y – E dd-MM-y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E dd-MM-y – E dd-MM-y</greatestDifference>
 							<greatestDifference id="y" draft="unconfirmed">E dd-MM-y – E dd-MM-y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="y" draft="unconfirmed">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="M" draft="unconfirmed">d 'de' MMM 'al' d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d 'de' MMM 'al' d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d 'de' MMM 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="d" draft="contributed">E d 'al' E d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E d 'de' MMM 'al' E d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
 		</calendars>
+		<timeZoneNames>
+			<metazone type="Chile">
+				<short>
+					<generic>CLT</generic>
+					<standard>CLT</standard>
+					<daylight>CLST</daylight>
+				</short>
+			</metazone>
+		</timeZoneNames>
 	</dates>
 	<numbers>
 		<symbols numberSystem="latn">
@@ -224,6 +271,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencyFormats>
 		<currencies>
 			<currency type="CLP">
+				<displayName draft="contributed">Peso chileno</displayName>
 				<symbol>$</symbol>
 			</currency>
 			<currency type="USD">
@@ -231,5 +279,41 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 		</currencies>
 	</numbers>
+	<units>
+		<unitLength type="long">
+			<unit type="electric-ampere">
+				<displayName draft="contributed">amperios</displayName>
+				<unitPattern count="one" draft="contributed">{0} amperio</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} amperios</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName draft="contributed">miliamperios</displayName>
+				<unitPattern count="one" draft="contributed">{0} miliamperio</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} miliamperios</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<unitPattern count="one">{0} ohmio</unitPattern>
+				<unitPattern count="other">{0} ohmios</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<unitPattern count="one">{0} voltio</unitPattern>
+				<unitPattern count="other">{0} voltios</unitPattern>
+			</unit>
+		</unitLength>
+		<unitLength type="short">
+			<unit type="electric-volt">
+				<displayName draft="contributed">voltios</displayName>
+			</unit>
+			<unit type="power-watt">
+				<displayName draft="contributed">vatios</displayName>
+			</unit>
+		</unitLength>
+		<durationUnit type="hms">
+			<durationUnitPattern draft="contributed">hh:mm:ss</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="ms">
+			<durationUnitPattern draft="contributed">mm:ss</durationUnitPattern>
+		</durationUnit>
+	</units>
 </ldml>
 
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CO.xml
new file mode 100644
index 00000000000..e50bde0f150
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CO.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12217 $"/>
+		<language type="es"/>
+		<territory type="CO"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>d/MM/y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>d/MM/yy GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern draft="contributed">{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern draft="contributed">{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="GyMMMEd" draft="contributed">E, d MMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMM" draft="contributed">MMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd" draft="contributed">d 'de' MMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd" draft="contributed">EEE, d 'de' MMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ" draft="contributed">QQQ 'de' y G</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback draft="contributed">{0} ‘al’ {1}</intervalFormatFallback>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d" draft="contributed">d 'a' d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H" draft="unconfirmed">H–H</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H" draft="unconfirmed">H:mm–H:mm</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">H:mm–H:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H" draft="unconfirmed">H:mm–H:mm v</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">H:mm–H:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H" draft="unconfirmed">H–H v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M" draft="contributed">M 'a' M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d" draft="contributed">d/MM 'a' d/MM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d/MM 'al' d/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d" draft="contributed">E d/MM 'a' E d/MM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E d/MM 'al' E d/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M" draft="contributed">MMM 'a' MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d" draft="contributed">d 'a' d 'de' MMM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d" draft="contributed">E d 'al' E d 'de' MMM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y" draft="contributed">y 'a' y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M" draft="contributed">M/y 'a' M/y GGGGG</greatestDifference>
+							<greatestDifference id="y" draft="contributed">M/y 'al' M/y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d" draft="contributed">d/M/y 'a' d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d/M/y 'al' d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="y" draft="contributed">d/M/y 'al' d/M/y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d" draft="contributed">E, d/M/y 'a' E, d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E, d/M/y 'al' E, d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="y" draft="contributed">E, d/M/y 'al' E, d/M/y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M" draft="contributed">MMM 'a' MMM 'de' y G</greatestDifference>
+							<greatestDifference id="y" draft="contributed">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d" draft="contributed">d 'a' d 'de' MMM 'de' y G</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d 'de' MMM 'al' d 'de' MMM y G</greatestDifference>
+							<greatestDifference id="y" draft="contributed">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d" draft="contributed">E d 'de' MMM 'al' E d 'de' MMM 'de' y G</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E d 'de' MMM 'al' E d 'de' MMM 'de' y G</greatestDifference>
+							<greatestDifference id="y" draft="contributed">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M" draft="contributed">MMMM 'a' MMMM 'de' y G</greatestDifference>
+							<greatestDifference id="y" draft="contributed">MMMM 'de' y 'a' MMMM 'de' y G</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">ene.</month>
+							<month type="2" draft="contributed">feb.</month>
+							<month type="3" draft="contributed">mar.</month>
+							<month type="4" draft="contributed">abr.</month>
+							<month type="5" draft="contributed">may.</month>
+							<month type="6" draft="contributed">jun.</month>
+							<month type="7" draft="contributed">jul.</month>
+							<month type="8" draft="contributed">ago.</month>
+							<month type="9" draft="contributed">sept.</month>
+							<month type="10" draft="contributed">oct.</month>
+							<month type="11" draft="contributed">nov.</month>
+							<month type="12" draft="contributed">dic.</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="stand-alone">
+						<dayWidth type="narrow">
+							<day type="sun" draft="contributed">d</day>
+							<day type="mon" draft="contributed">l</day>
+							<day type="tue" draft="contributed">m</day>
+							<day type="wed" draft="contributed">m</day>
+							<day type="thu" draft="contributed">j</day>
+							<day type="fri" draft="contributed">v</day>
+							<day type="sat" draft="contributed">s</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<dayPeriods>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am" draft="provisional">a. m.</dayPeriod>
+							<dayPeriod type="noon" draft="provisional">m.</dayPeriod>
+							<dayPeriod type="pm" draft="provisional">p. m.</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<dateFormats>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>d/MM/y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>d/MM/yy</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>h:mm:ss a zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>h:mm:ss a z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>h:mm:ss a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>h:mm a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern draft="contributed">{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern draft="contributed">{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="GyMMM" draft="contributed">MMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd" draft="contributed">E, d MMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="MMMd" draft="contributed">d 'de' MMM</dateFormatItem>
+						<dateFormatItem id="MMMdd" draft="contributed">d 'de' MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd" draft="contributed">E, d 'de' MMM</dateFormatItem>
+						<dateFormatItem id="yMMM" draft="contributed">MMM 'de' y</dateFormatItem>
+						<dateFormatItem id="yMMMd" draft="contributed">d 'de' MMM 'de' y</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback draft="contributed">{0} ‘al’ {1}</intervalFormatFallback>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d" draft="contributed">d 'a' d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a" draft="contributed">h a 'a' h a</greatestDifference>
+							<greatestDifference id="h" draft="contributed">h 'a' h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H" draft="contributed">HH 'a' HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a" draft="contributed">h:mm a 'a' h:mm a</greatestDifference>
+							<greatestDifference id="h" draft="contributed">h:mm 'a' h:mm a</greatestDifference>
+							<greatestDifference id="m" draft="contributed">h:mm 'a' h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H" draft="contributed">HH:mm 'a' HH:mm</greatestDifference>
+							<greatestDifference id="m" draft="contributed">HH:mm 'a' HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a" draft="contributed">h:mm a 'a' h:mm a v</greatestDifference>
+							<greatestDifference id="h" draft="contributed">h:mm 'a' h:mm a v</greatestDifference>
+							<greatestDifference id="m" draft="contributed">h:mm 'a' h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H" draft="contributed">HH:mm 'a' HH:mm v</greatestDifference>
+							<greatestDifference id="m" draft="contributed">HH:mm 'a' HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a" draft="contributed">h a 'a' h a v</greatestDifference>
+							<greatestDifference id="h" draft="contributed">h 'a' h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H" draft="contributed">HH 'a' HH v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M" draft="contributed">M 'a' M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d" draft="contributed">d/MM 'a' d/MM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d/MM 'al' d/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d" draft="contributed">E d/MM 'a' E d/MM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E d/MM 'al' E d/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M" draft="contributed">MMM 'a' MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d" draft="contributed">d 'a' d 'de' MMM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d" draft="contributed">E d 'al' E d 'de' MMM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y" draft="contributed">y 'a' y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M" draft="contributed">MM/y 'a' MM/y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">MM/y 'al' MM/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d" draft="contributed">d/MM/y 'a' d/MM/y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d/MM/y 'al' d/MM/y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">d/MM/y 'al' d/MM/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d" draft="contributed">E d/MM/y 'a' E d/MM/y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E d/MM/y 'al' E d/MM/y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">E d/MM/y 'al' E d/MM/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M" draft="contributed">MMM 'a' MMM 'de' y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d" draft="contributed">d 'a' d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d 'de' MMM 'al' d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d" draft="contributed">E d 'al' E d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E d 'de' MMM 'al' E d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M" draft="contributed">MMMM 'a' MMMM 'de' y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">MMMM 'de' y 'a' MMMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="dayperiod">
+				<displayName draft="contributed">a. m./p. m.</displayName>
+			</field>
+		</fields>
+		<timeZoneNames>
+			<metazone type="Colombia">
+				<short>
+					<generic>COT</generic>
+					<standard>COT</standard>
+					<daylight>COST</daylight>
+				</short>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group>.</group>
+		</symbols>
+		<percentFormats numberSystem="latn">
+			<percentFormatLength>
+				<percentFormat>
+					<pattern draft="contributed">#,##0%</pattern>
+				</percentFormat>
+			</percentFormatLength>
+		</percentFormats>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern draft="contributed">¤ #,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencies>
+			<currency type="COP">
+				<symbol>$</symbol>
+			</currency>
+			<currency type="USD">
+				<symbol>US$</symbol>
+			</currency>
+		</currencies>
+		<miscPatterns numberSystem="latn">
+			<pattern type="range" draft="contributed">de {0} a {1}</pattern>
+		</miscPatterns>
+	</numbers>
+	<units>
+		<unitLength type="long">
+			<unit type="duration-month">
+				<perUnitPattern draft="contributed">{0}/mes</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<perUnitPattern draft="contributed">{0}/sem.</perUnitPattern>
+			</unit>
+		</unitLength>
+		<unitLength type="short">
+			<unit type="duration-year">
+				<displayName draft="contributed">a.</displayName>
+				<unitPattern count="one">{0} a.</unitPattern>
+				<unitPattern count="other">{0} a.</unitPattern>
+				<perUnitPattern draft="contributed">{0}/año</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">mes</displayName>
+				<unitPattern count="one" draft="contributed">{0} mes</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} meses</unitPattern>
+				<perUnitPattern draft="contributed">{0}/mes</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName draft="contributed">días</displayName>
+				<unitPattern count="one" draft="contributed">{0} día</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} días</unitPattern>
+				<perUnitPattern draft="contributed">{0}/día</perUnitPattern>
+			</unit>
+		</unitLength>
+		<unitLength type="narrow">
+			<unit type="duration-year">
+				<unitPattern count="one" draft="contributed">{0} a.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} a.</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">mes</displayName>
+				<unitPattern count="one" draft="contributed">{0} mes</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} meses</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<unitPattern count="one" draft="contributed">{0} sem.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} sems.</unitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName draft="contributed">día</displayName>
+				<unitPattern count="one" draft="contributed">{0} día</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} días</unitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<unitPattern count="one" draft="contributed">{0} h</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} h</unitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<unitPattern count="one" draft="contributed">{0} min</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} min</unitPattern>
+			</unit>
+			<unit type="duration-second">
+				<unitPattern count="one" draft="contributed">{0} s</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} s</unitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<unitPattern count="one" draft="contributed">{0} ms</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ms</unitPattern>
+			</unit>
+		</unitLength>
+	</units>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_CR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CR.xml
similarity index 70%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_CR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CR.xml
index cfd8c3e785f..36f5a3947bb 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_CR.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CR.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 12217 $"/>
 		<language type="es"/>
 		<territory type="CR"/>
 	</identity>
@@ -15,13 +14,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<fields>
 			<field type="day">
 				<relative type="-2">antier</relative>
+				<relative type="-1">ayer</relative>
+				<relative type="0">hoy</relative>
+				<relative type="1">mañana</relative>
+				<relative type="2">pasado mañana</relative>
 			</field>
 		</fields>
 	</dates>
 	<numbers>
 		<symbols numberSystem="latn">
 			<decimal>,</decimal>
-			<group>.</group>
+			<group> </group>
 		</symbols>
 		<currencies>
 			<currency type="CRC">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_CU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CU.xml
similarity index 76%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_CU.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CU.xml
index ae2605b9e50..b366d053bf0 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_CU.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CU.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="es"/>
 		<territory type="CU"/>
 	</identity>
@@ -22,3 +21,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_DO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_DO.xml
new file mode 100644
index 00000000000..1d8ddd32d26
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_DO.xml
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12217 $"/>
+		<language type="es"/>
+		<territory type="DO"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern draft="contributed">dd/MM/y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<quarters>
+					<quarterContext type="format">
+						<quarterWidth type="abbreviated">
+							<quarter type="1" draft="contributed">Q1</quarter>
+							<quarter type="2" draft="contributed">Q2</quarter>
+							<quarter type="3" draft="contributed">Q3</quarter>
+							<quarter type="4" draft="contributed">Q4</quarter>
+						</quarterWidth>
+					</quarterContext>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="abbreviated">
+							<quarter type="1" draft="contributed">Q1</quarter>
+							<quarter type="2" draft="contributed">Q2</quarter>
+							<quarter type="3" draft="contributed">Q3</quarter>
+							<quarter type="4" draft="contributed">Q4</quarter>
+						</quarterWidth>
+					</quarterContext>
+				</quarters>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="noon">mediodía</dayPeriod>
+							<dayPeriod type="morning1" draft="contributed">día</dayPeriod>
+							<dayPeriod type="morning2" draft="contributed">mañana</dayPeriod>
+							<dayPeriod type="evening1" draft="contributed">tarde</dayPeriod>
+							<dayPeriod type="night1" draft="contributed">noche</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="noon" draft="contributed">m.</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<eras>
+					<eraNames>
+						<era type="0" alt="variant" draft="contributed">antes de la Era Común</era>
+						<era type="1" alt="variant" draft="contributed">Era Común</era>
+					</eraNames>
+				</eras>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern draft="contributed">h:mm:ss a zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern draft="contributed">h:mm:ss a z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern draft="contributed">h:mm:ss a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern draft="contributed">h:mm a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="yMMMd" draft="contributed">d MMM 'de' y</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="era">
+				<displayName draft="contributed">Era</displayName>
+			</field>
+			<field type="year">
+				<displayName draft="contributed">Año</displayName>
+			</field>
+			<field type="quarter">
+				<displayName draft="contributed">Trimestre</displayName>
+			</field>
+			<field type="month">
+				<displayName draft="contributed">Mes</displayName>
+			</field>
+			<field type="week">
+				<displayName draft="contributed">Semana</displayName>
+			</field>
+			<field type="day">
+				<displayName draft="contributed">Día</displayName>
+			</field>
+			<field type="weekday">
+				<displayName draft="contributed">Día de la semana</displayName>
+			</field>
+			<field type="minute">
+				<displayName draft="contributed">Minuto</displayName>
+			</field>
+			<field type="second">
+				<displayName draft="contributed">Segundo</displayName>
+			</field>
+		</fields>
+	</dates>
+	<numbers>
+		<percentFormats numberSystem="latn">
+			<percentFormatLength>
+				<percentFormat>
+					<pattern draft="contributed">#,##0%</pattern>
+				</percentFormat>
+			</percentFormatLength>
+		</percentFormats>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern draft="contributed">¤#,##0.00;(¤#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencies>
+			<currency type="DOP">
+				<symbol>RD$</symbol>
+			</currency>
+			<currency type="USD">
+				<symbol>US$</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+	<units>
+		<unitLength type="long">
+			<unit type="electric-ampere">
+				<displayName draft="contributed">amperios</displayName>
+				<unitPattern count="one" draft="contributed">{0} amperio</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} amperios</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName draft="contributed">miliamperios</displayName>
+				<unitPattern count="one" draft="contributed">{0} miliamperio</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} miliamperios</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<unitPattern count="one">{0} ohmio</unitPattern>
+				<unitPattern count="other">{0} ohmios</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<unitPattern count="one">{0} voltio</unitPattern>
+				<unitPattern count="other">{0} voltios</unitPattern>
+			</unit>
+		</unitLength>
+		<unitLength type="short">
+			<unit type="duration-day">
+				<displayName draft="contributed">d.</displayName>
+			</unit>
+			<unit type="duration-second">
+				<displayName draft="contributed">seg.</displayName>
+				<unitPattern count="one" draft="contributed">{0} seg.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} seg.</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName draft="contributed">voltios</displayName>
+			</unit>
+			<unit type="power-watt">
+				<displayName draft="contributed">vatios</displayName>
+			</unit>
+		</unitLength>
+		<unitLength type="narrow">
+			<unit type="duration-month">
+				<unitPattern count="one" draft="contributed">{0}m.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}m.</unitPattern>
+			</unit>
+			<unit type="duration-day">
+				<unitPattern count="one" draft="contributed">{0}d.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}d.</unitPattern>
+			</unit>
+		</unitLength>
+	</units>
+	<listPatterns>
+		<listPattern type="unit-narrow">
+			<listPatternPart type="end" draft="contributed">{0} y {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-short">
+			<listPatternPart type="end" draft="contributed">{0} y {1}</listPatternPart>
+		</listPattern>
+	</listPatterns>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_EA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_EA.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_EA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_EA.xml
index 40cf9147dc6..5cadf4f7937 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_EA.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_EA.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="es"/>
 		<territory type="EA"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_EC.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_EC.xml
similarity index 97%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_EC.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_EC.xml
index 8a95f047ed8..f12b6c6b54d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_EC.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_EC.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="es"/>
 		<territory type="EC"/>
 	</identity>
@@ -155,6 +154,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</dateTimeFormats>
 			</calendar>
 		</calendars>
+		<timeZoneNames>
+			<metazone type="Ecuador">
+				<short>
+					<standard>ECT</standard>
+				</short>
+			</metazone>
+		</timeZoneNames>
 	</dates>
 	<numbers>
 		<symbols numberSystem="latn">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_ES.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_ES.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_ES.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_ES.xml
index 2e550856b80..d3ee60009be 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_ES.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_ES.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="es"/>
 		<territory type="ES"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_GQ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_GQ.xml
similarity index 81%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_GQ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_GQ.xml
index 8ab5dd86834..a710f5400a2 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_GQ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_GQ.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="es"/>
 		<territory type="GQ"/>
 	</identity>
@@ -26,3 +25,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_GT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_GT.xml
new file mode 100644
index 00000000000..01047d8efbc
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_GT.xml
@@ -0,0 +1,290 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12293 $"/>
+		<language type="es"/>
+		<territory type="GT"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>d/MM/y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>d/MM/yy GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<intervalFormats>
+						<intervalFormatFallback draft="contributed">{0} a el {1}</intervalFormatFallback>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d" draft="contributed">d/MM – d/MM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d/MM – d/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d" draft="contributed">E d/MM – E d/MM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E d/MM – E d/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="M" draft="contributed">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d" draft="contributed">E d 'al' E d 'de' MMM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M" draft="contributed">MM/y – MM/y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">MM/y – MM/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d" draft="contributed">d/MM/y – d/MM/y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d/MM/y – d/MM/y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">d/MM/y – d/MM/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d" draft="contributed">E d/MM/y – E d/MM/y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E d/MM/y – E d/MM/y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">E d/MM/y – E d/MM/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M" draft="contributed">MMM–MMM 'de' y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d" draft="contributed">d–d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d 'de' MMM 'al' d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d" draft="contributed">E d 'al' E d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E d 'de' MMM 'al' E d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<dateFormats>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>d/MM/y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>d/MM/yy</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<intervalFormats>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="h" draft="contributed">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="m" draft="contributed">h:mm–h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d" draft="contributed">d/MM – d/MM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d/MM – d/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d" draft="contributed">E d/MM – E d/MM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E d/MM – E d/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="M" draft="contributed">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d" draft="contributed">E d 'al' E d 'de' MMM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y" draft="contributed">y 'al' y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M" draft="contributed">MM/y – MM/y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">MM/y – MM/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d" draft="contributed">d/MM/y – d/MM/y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d/MM/y – d/MM/y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">d/MM/y – d/MM/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d" draft="contributed">E d/MM/y – E d/MM/y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E d/MM/y – E d/MM/y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">E d/MM/y – E d/MM/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="y" draft="contributed">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="M" draft="contributed">d 'de' MMM 'al' d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d" draft="contributed">E d 'al' E d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E d 'de' MMM 'al' E d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="day">
+				<relative type="-2">antier</relative>
+				<relative type="-1">ayer</relative>
+				<relative type="0">hoy</relative>
+				<relative type="1">mañana</relative>
+				<relative type="2">pasado mañana</relative>
+			</field>
+		</fields>
+	</dates>
+	<numbers>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="contributed">¤0K</pattern>
+					<pattern type="1000" count="other" draft="contributed">¤0K</pattern>
+					<pattern type="10000" count="one" draft="contributed">¤00K</pattern>
+					<pattern type="10000" count="other" draft="contributed">¤00K</pattern>
+					<pattern type="100000" count="one" draft="contributed">¤000K</pattern>
+					<pattern type="100000" count="other" draft="contributed">¤000K</pattern>
+					<pattern type="1000000" count="one" draft="contributed">¤0M</pattern>
+					<pattern type="1000000" count="other" draft="contributed">¤0M</pattern>
+					<pattern type="10000000" count="one" draft="contributed">¤00M</pattern>
+					<pattern type="10000000" count="other" draft="contributed">¤00M</pattern>
+					<pattern type="100000000" count="one" draft="contributed">¤000M</pattern>
+					<pattern type="100000000" count="other" draft="contributed">¤000M</pattern>
+					<pattern type="1000000000" count="one" draft="contributed">¤0000M</pattern>
+					<pattern type="1000000000" count="other" draft="contributed">¤0000M</pattern>
+					<pattern type="10000000000" count="one" draft="contributed">¤00MRD </pattern>
+					<pattern type="10000000000" count="other" draft="contributed">¤00MRD </pattern>
+					<pattern type="100000000000" count="one" draft="contributed">¤000MRD </pattern>
+					<pattern type="100000000000" count="other" draft="contributed">¤000MRD </pattern>
+					<pattern type="1000000000000" count="one" draft="contributed">¤0 B</pattern>
+					<pattern type="1000000000000" count="other" draft="contributed">¤0 B</pattern>
+					<pattern type="10000000000000" count="one" draft="contributed">¤00 B</pattern>
+					<pattern type="10000000000000" count="other" draft="contributed">¤00 B</pattern>
+					<pattern type="100000000000000" count="one" draft="contributed">¤000 B</pattern>
+					<pattern type="100000000000000" count="other" draft="contributed">¤000 B</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<unitPattern count="one" draft="contributed">{1} {0}</unitPattern>
+			<unitPattern count="other" draft="contributed">{1} {0}</unitPattern>
+		</currencyFormats>
+		<currencies>
+			<currency type="GTQ">
+				<displayName draft="contributed">quetzal</displayName>
+				<displayName count="one" draft="contributed">quetzal</displayName>
+				<displayName count="other" draft="contributed">quetzales</displayName>
+				<symbol>Q</symbol>
+			</currency>
+		</currencies>
+		<miscPatterns numberSystem="latn">
+			<pattern type="range" draft="contributed">{0} al {1}</pattern>
+		</miscPatterns>
+	</numbers>
+	<units>
+		<unitLength type="long">
+			<unit type="duration-year">
+				<perUnitPattern draft="contributed">{0} al año</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<perUnitPattern draft="contributed">{0} al mes</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<perUnitPattern draft="contributed">{0} al día</perUnitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName draft="contributed">amperios</displayName>
+				<unitPattern count="one" draft="contributed">{0} amperio</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} amperios</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName draft="contributed">miliamperios</displayName>
+				<unitPattern count="one" draft="contributed">{0} miliamperio</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} miliamperios</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<unitPattern count="one">{0} ohmio</unitPattern>
+				<unitPattern count="other">{0} ohmios</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<unitPattern count="one">{0} voltio</unitPattern>
+				<unitPattern count="other">{0} voltios</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName draft="contributed">kilojulios</displayName>
+				<unitPattern count="one" draft="contributed">{0} kilojulio</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kilojulios</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName draft="contributed">julios</displayName>
+				<unitPattern count="one" draft="contributed">{0} julio</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} julios</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="contributed">milla escandinava</displayName>
+			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} caballos de fuerza</unitPattern>
+				<unitPattern count="other">{0} caballos de fuerza</unitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<perUnitPattern draft="contributed">{0} por pie cúbico</perUnitPattern>
+			</unit>
+		</unitLength>
+		<unitLength type="short">
+			<unit type="concentr-karat">
+				<unitPattern count="one" draft="contributed">{0} ct</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ct</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName draft="contributed">voltios</displayName>
+			</unit>
+			<unit type="length-foot">
+				<displayName draft="contributed">pie</displayName>
+			</unit>
+			<unit type="power-watt">
+				<displayName draft="contributed">vatios</displayName>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName draft="contributed">acre pie</displayName>
+			</unit>
+		</unitLength>
+		<unitLength type="narrow">
+			<unit type="duration-hour">
+				<displayName draft="contributed">hora</displayName>
+			</unit>
+		</unitLength>
+	</units>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_HN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_HN.xml
similarity index 97%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_HN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_HN.xml
index b33cf55d6d5..901330bd757 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_HN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_HN.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 12217 $"/>
 		<language type="es"/>
 		<territory type="HN"/>
 	</identity>
@@ -176,6 +175,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<fields>
 			<field type="day">
 				<relative type="-2">antier</relative>
+				<relative type="-1">ayer</relative>
+				<relative type="0">hoy</relative>
+				<relative type="1">mañana</relative>
+				<relative type="2">pasado mañana</relative>
 			</field>
 		</fields>
 	</dates>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_IC.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_IC.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_IC.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_IC.xml
index d9183a302f5..b30b3016504 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_IC.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_IC.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="es"/>
 		<territory type="IC"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_MX.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_MX.xml
similarity index 93%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_MX.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_MX.xml
index 7d70ed82419..627be3c1a98 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_MX.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_MX.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 11994 $"/>
 		<language type="es"/>
 		<territory type="MX"/>
 	</identity>
@@ -20,7 +19,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Telu" draft="contributed">telugú</script>
 		</scripts>
 		<territories>
-			<territory type="005" draft="contributed">Sudamérica</territory>
 			<territory type="011" draft="contributed">África Occidental</territory>
 			<territory type="014" draft="contributed">África Oriental</territory>
 			<territory type="015" draft="contributed">África del Norte</territory>
@@ -38,14 +36,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="155" draft="contributed">Europa Occidental</territory>
 			<territory type="BD" draft="contributed">Bangladesh</territory>
 			<territory type="CC" draft="contributed">Islas Cocos (Keeling)</territory>
-			<territory type="CX" draft="contributed">Isla de Navidad</territory>
 			<territory type="GB" alt="short" draft="contributed">RU</territory>
 			<territory type="GG" draft="contributed">Guernsey</territory>
 			<territory type="HK" draft="contributed">Región Administrativa Especial de Hong Kong de la República Popular China</territory>
 			<territory type="IC" draft="contributed">Islas Canarias</territory>
 			<territory type="MO" draft="contributed">Región Administrativa Especial de Macao de la República Popular China</territory>
-			<territory type="PW" draft="contributed">Palaos</territory>
-			<territory type="QO" draft="contributed">Islas Ultramarinas</territory>
 			<territory type="TA" draft="contributed">Tristán de Acuña</territory>
 			<territory type="UM" draft="contributed">Islas Ultramarinas Menores de Estados Unidos</territory>
 			<territory type="VI" draft="contributed">Islas Vírgenes de los Estados Unidos</territory>
@@ -56,32 +51,32 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="currency" draft="contributed">Moneda</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers" draft="contributed">Dígitos en arábigo-índico</type>
-			<type type="arabext" key="numbers" draft="contributed">Dígitos en árabigo-índico extendido</type>
-			<type type="armn" key="numbers" draft="contributed">Números en armenio</type>
-			<type type="armnlow" key="numbers" draft="contributed">Números en armenio en minúscula</type>
-			<type type="ethi" key="numbers" draft="contributed">Números en etíope</type>
-			<type type="geor" key="numbers" draft="contributed">Números en georgiano</type>
-			<type type="gregorian" key="calendar" draft="contributed">Calendario gregoriano</type>
-			<type type="grek" key="numbers" draft="contributed">Números en griego</type>
-			<type type="greklow" key="numbers" draft="contributed">Números en griego en minúscula</type>
-			<type type="guru" key="numbers" draft="contributed">Dígitos en gurmuji</type>
-			<type type="hanidec" key="numbers" draft="contributed">Numeros decimales en chino</type>
-			<type type="hans" key="numbers" draft="contributed">Números en chino simplificado</type>
-			<type type="hansfin" key="numbers" draft="contributed">Números financieros en chino simplificado</type>
-			<type type="hant" key="numbers" draft="contributed">Números en chino tradicional</type>
-			<type type="hantfin" key="numbers" draft="contributed">Números financieros en chino tradicional</type>
-			<type type="hebr" key="numbers" draft="contributed">Números en hebreo</type>
-			<type type="jpanfin" key="numbers" draft="contributed">Números financieros en japonés</type>
-			<type type="laoo" key="numbers" draft="contributed">Dígitos en lao</type>
-			<type type="mlym" key="numbers" draft="contributed">Dígitos en malabar</type>
-			<type type="roc" key="calendar" draft="contributed">calendario minguo</type>
-			<type type="standard" key="collation" draft="contributed">Orden estándar</type>
-			<type type="taml" key="numbers" draft="contributed">Números en tamil</type>
-			<type type="tamldec" key="numbers" draft="contributed">Dígitos en tamil</type>
-			<type type="telu" key="numbers" draft="contributed">Dígitos en telugú</type>
-			<type type="tibt" key="numbers" draft="contributed">Dígitos en tibetano</type>
-			<type type="traditional" key="collation" draft="contributed">Orden tradicional</type>
+			<type key="calendar" type="gregorian" draft="contributed">Calendario gregoriano</type>
+			<type key="calendar" type="roc" draft="contributed">calendario minguo</type>
+			<type key="collation" type="standard" draft="contributed">Orden estándar</type>
+			<type key="collation" type="traditional" draft="contributed">Orden tradicional</type>
+			<type key="numbers" type="arab" draft="contributed">Dígitos en arábigo-índico</type>
+			<type key="numbers" type="arabext" draft="contributed">Dígitos en árabigo-índico extendido</type>
+			<type key="numbers" type="armn" draft="contributed">Números en armenio</type>
+			<type key="numbers" type="armnlow" draft="contributed">Números en armenio en minúscula</type>
+			<type key="numbers" type="ethi" draft="contributed">Números en etíope</type>
+			<type key="numbers" type="geor" draft="contributed">Números en georgiano</type>
+			<type key="numbers" type="grek" draft="contributed">Números en griego</type>
+			<type key="numbers" type="greklow" draft="contributed">Números en griego en minúscula</type>
+			<type key="numbers" type="guru" draft="contributed">Dígitos en gurmuji</type>
+			<type key="numbers" type="hanidec" draft="contributed">Numeros decimales en chino</type>
+			<type key="numbers" type="hans" draft="contributed">Números en chino simplificado</type>
+			<type key="numbers" type="hansfin" draft="contributed">Números financieros en chino simplificado</type>
+			<type key="numbers" type="hant" draft="contributed">Números en chino tradicional</type>
+			<type key="numbers" type="hantfin" draft="contributed">Números financieros en chino tradicional</type>
+			<type key="numbers" type="hebr" draft="contributed">Números en hebreo</type>
+			<type key="numbers" type="jpanfin" draft="contributed">Números financieros en japonés</type>
+			<type key="numbers" type="laoo" draft="contributed">Dígitos en lao</type>
+			<type key="numbers" type="mlym" draft="contributed">Dígitos en malabar</type>
+			<type key="numbers" type="taml" draft="contributed">Números en tamil</type>
+			<type key="numbers" type="tamldec" draft="contributed">Dígitos en tamil</type>
+			<type key="numbers" type="telu" draft="contributed">Dígitos en telugú</type>
+			<type key="numbers" type="tibt" draft="contributed">Dígitos en tibetano</type>
 		</types>
 	</localeDisplayNames>
 	<characters>
@@ -211,14 +206,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</quarterWidth>
 					</quarterContext>
 				</quarters>
-				<dayPeriods>
-					<dayPeriodContext type="format">
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="am" draft="contributed">a.m.</dayPeriod>
-							<dayPeriod type="pm" draft="contributed">p.m.</dayPeriod>
-						</dayPeriodWidth>
-					</dayPeriodContext>
-				</dayPeriods>
 				<dateFormats>
 					<dateFormatLength type="medium">
 						<dateFormat>
@@ -318,11 +305,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</calendar>
 		</calendars>
 		<fields>
-			<field type="era">
-				<displayName draft="contributed">era</displayName>
-			</field>
 			<field type="year">
-				<relative type="1" draft="contributed">el año próximo</relative>
+				<relative type="-1">el año pasado</relative>
+				<relative type="0">este año</relative>
+				<relative type="1">el año próximo</relative>
 			</field>
 			<field type="year-short">
 				<relativeTime type="future">
@@ -363,7 +349,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="month">
-				<relative type="1" draft="contributed">el mes próximo</relative>
+				<relative type="-1">el mes pasado</relative>
+				<relative type="0">este mes</relative>
+				<relative type="1">el mes próximo</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one" draft="contributed">en {0} mes</relativeTimePattern>
 					<relativeTimePattern count="other" draft="contributed">en {0} meses</relativeTimePattern>
@@ -386,7 +374,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="week">
-				<relative type="1" draft="contributed">la semana próxima</relative>
+				<relative type="-1">la semana pasada</relative>
+				<relative type="0">esta semana</relative>
+				<relative type="1">la semana próxima</relative>
 			</field>
 			<field type="week-short">
 				<relativeTime type="future">
@@ -406,6 +396,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day">
 				<relative type="-2">antier</relative>
+				<relative type="-1">ayer</relative>
+				<relative type="0">hoy</relative>
+				<relative type="1">mañana</relative>
+				<relative type="2">pasado mañana</relative>
 			</field>
 			<field type="day-short">
 				<relativeTime type="future">
@@ -424,16 +418,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="sun">
-				<relative type="1" draft="contributed">el domingo próximo</relative>
+				<relative type="-1">el domingo pasado</relative>
+				<relative type="0">este domingo</relative>
+				<relative type="1">el domingo próximo</relative>
 			</field>
 			<field type="mon">
-				<relative type="1" draft="contributed">el lunes próximo</relative>
+				<relative type="-1">el lunes pasado</relative>
+				<relative type="0">este lunes</relative>
+				<relative type="1">el lunes próximo</relative>
 			</field>
 			<field type="tue">
-				<relative type="1" draft="contributed">el martes próximo</relative>
+				<relative type="-1">el martes pasado</relative>
+				<relative type="0">este martes</relative>
+				<relative type="1">el martes próximo</relative>
 			</field>
 			<field type="wed">
-				<relative type="1" draft="contributed">el miércoles próximo</relative>
+				<relative type="-1">el miércoles pasado</relative>
+				<relative type="0">este miércoles</relative>
+				<relative type="1">el miércoles próximo</relative>
 			</field>
 			<field type="wed-short">
 				<relative type="-1" draft="contributed">el miér. pasado</relative>
@@ -441,10 +443,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1" draft="contributed">el próximo miér.</relative>
 			</field>
 			<field type="thu">
-				<relative type="1" draft="contributed">el jueves próximo</relative>
+				<relative type="-1">el jueves pasado</relative>
+				<relative type="0">este jueves</relative>
+				<relative type="1">el jueves próximo</relative>
 			</field>
 			<field type="fri">
-				<relative type="1" draft="contributed">el viernes próximo</relative>
+				<relative type="-1">el viernes pasado</relative>
+				<relative type="0">este viernes</relative>
+				<relative type="1">el viernes próximo</relative>
 			</field>
 			<field type="fri-short">
 				<relative type="-1" draft="contributed">el vier. pasado</relative>
@@ -452,10 +458,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1" draft="contributed">el próximo vier.</relative>
 			</field>
 			<field type="sat">
-				<relative type="1" draft="contributed">el sábado próximo</relative>
-			</field>
-			<field type="dayperiod">
-				<displayName draft="contributed">a.m./p.m.</displayName>
+				<relative type="-1">el sábado pasado</relative>
+				<relative type="0">este sábado</relative>
+				<relative type="1">el sábado próximo</relative>
 			</field>
 			<field type="hour-short">
 				<relativeTime type="future">
@@ -519,9 +524,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="America/Belem">
 				<exemplarCity draft="contributed">Belém</exemplarCity>
 			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity draft="contributed">San Juan de Terranova</exemplarCity>
-			</zone>
 			<zone type="Indian/Christmas">
 				<exemplarCity draft="contributed">Navidad</exemplarCity>
 			</zone>
@@ -544,9 +546,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<daylight draft="contributed">Hora de verano irlandesa</daylight>
 				</long>
 			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity draft="contributed">San Cristóbal</exemplarCity>
-			</zone>
 			<zone type="Asia/Pyongyang">
 				<exemplarCity draft="contributed">Piongyang</exemplarCity>
 			</zone>
@@ -1516,9 +1515,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other" draft="contributed">kwanzas angoleños</displayName>
 				<symbol draft="contributed">Kz</symbol>
 			</currency>
-			<currency type="ARA">
-				<symbol draft="contributed">ARA</symbol>
-			</currency>
 			<currency type="ARS">
 				<symbol draft="contributed">$a</symbol>
 				<symbol alt="narrow" draft="contributed">$a</symbol>
@@ -1539,33 +1535,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one" draft="contributed">dólar de Brunéi</displayName>
 				<displayName count="other" draft="contributed">dólares de Brunéi</displayName>
 			</currency>
-			<currency type="BOL">
-				<symbol draft="contributed">BOL</symbol>
-			</currency>
-			<currency type="BOP">
-				<symbol draft="contributed">BOP</symbol>
-			</currency>
-			<currency type="BOV">
-				<symbol draft="contributed">BOV</symbol>
-			</currency>
-			<currency type="BRB">
-				<symbol draft="contributed">BRB</symbol>
-			</currency>
-			<currency type="BRC">
-				<symbol draft="contributed">BRC</symbol>
-			</currency>
-			<currency type="BRE">
-				<symbol draft="contributed">BRE</symbol>
-			</currency>
-			<currency type="BRN">
-				<symbol draft="contributed">BRN</symbol>
-			</currency>
-			<currency type="BRR">
-				<symbol draft="contributed">BRR</symbol>
-			</currency>
-			<currency type="BRZ">
-				<symbol draft="contributed">BRZ</symbol>
-			</currency>
 			<currency type="BTN">
 				<displayName draft="contributed">ngultrum butanés</displayName>
 				<displayName count="one" draft="contributed">ngultrum butanés</displayName>
@@ -1579,30 +1548,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="BYR">
 				<symbol alt="narrow" draft="contributed">Br</symbol>
 			</currency>
-			<currency type="CLE">
-				<symbol draft="contributed">CLE</symbol>
-			</currency>
-			<currency type="CLF">
-				<symbol draft="contributed">CLF</symbol>
-			</currency>
 			<currency type="CNY">
 				<displayName draft="contributed">yuan chino</displayName>
 				<displayName count="one" draft="contributed">yuan chino</displayName>
 				<displayName count="other" draft="contributed">yuanes chinos</displayName>
 				<symbol draft="contributed">CN¥</symbol>
 			</currency>
-			<currency type="COU">
-				<symbol draft="contributed">COU</symbol>
-			</currency>
 			<currency type="DOP">
 				<symbol alt="narrow" draft="contributed">RD$</symbol>
 			</currency>
-			<currency type="ECS">
-				<symbol draft="contributed">ECS</symbol>
-			</currency>
-			<currency type="ECV">
-				<symbol draft="contributed">ECV</symbol>
-			</currency>
 			<currency type="ERN">
 				<displayName count="one" draft="contributed">nakfa eritreo</displayName>
 				<displayName count="other" draft="contributed">nakfas eritreos</displayName>
@@ -1708,9 +1662,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="MXN">
 				<symbol>$</symbol>
 			</currency>
-			<currency type="MXP">
-				<symbol draft="contributed">MXP</symbol>
-			</currency>
 			<currency type="MYR">
 				<displayName draft="contributed">ringgit malayo</displayName>
 				<displayName count="one" draft="contributed">ringgit malayo</displayName>
@@ -1726,15 +1677,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one" draft="contributed">naira nigeriano</displayName>
 				<displayName count="other" draft="contributed">nairas nigerianos</displayName>
 			</currency>
-			<currency type="NIC">
-				<symbol draft="contributed">NIC</symbol>
-			</currency>
-			<currency type="PEI">
-				<symbol draft="contributed">PEI</symbol>
-			</currency>
-			<currency type="PES">
-				<symbol draft="contributed">PES</symbol>
-			</currency>
 			<currency type="PGK">
 				<displayName draft="contributed">kina de Papúa Nueva Guinea</displayName>
 				<displayName count="one" draft="contributed">kina de Papúa Nueva Guinea</displayName>
@@ -1774,17 +1716,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one" draft="contributed">leone de Sierra Leona</displayName>
 				<displayName count="other" draft="contributed">leones de Sierra Leona</displayName>
 			</currency>
-			<currency type="SRG">
-				<symbol draft="contributed">SRG</symbol>
-			</currency>
 			<currency type="STD">
 				<displayName draft="contributed">dobra de Santo Tomé y Príncipe</displayName>
 				<displayName count="one" draft="contributed">dobra de Santo Tomé y Príncipe</displayName>
 				<displayName count="other" draft="contributed">dobras de Santo Tomé y Príncipe</displayName>
 			</currency>
-			<currency type="SVC">
-				<symbol draft="contributed">SVC</symbol>
-			</currency>
 			<currency type="SZL">
 				<displayName draft="contributed">lilangeni suazi</displayName>
 				<displayName count="one" draft="contributed">lilangeni suazi</displayName>
@@ -1813,15 +1749,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one" draft="contributed">grivna ucraniana</displayName>
 				<displayName count="other" draft="contributed">grivnas ucranianas</displayName>
 			</currency>
-			<currency type="USN">
-				<symbol draft="contributed">USN</symbol>
-			</currency>
-			<currency type="USS">
-				<symbol draft="contributed">USS</symbol>
-			</currency>
-			<currency type="UYI">
-				<symbol draft="contributed">UYI</symbol>
-			</currency>
 			<currency type="UZS">
 				<displayName draft="contributed">som uzbeko</displayName>
 				<displayName count="one" draft="contributed">som uzbeko</displayName>
@@ -1869,12 +1796,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} segundo</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} segundos</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName draft="contributed">joules</displayName>
-			</unit>
-			<unit type="energy-kilojoule">
-				<displayName draft="contributed">kilojoules</displayName>
-			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName draft="contributed">kilowatt-hora</displayName>
 				<unitPattern count="one" draft="contributed">kilowatt-hora</unitPattern>
@@ -1885,28 +1806,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} micrometro</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} micrometros</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName draft="contributed">millas naúticas</displayName>
-				<unitPattern count="one" draft="contributed">{0} milla naútica</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} millas naúticas</unitPattern>
-			</unit>
 			<unit type="length-parsec">
 				<displayName draft="contributed">pársecs</displayName>
 				<unitPattern count="one" draft="contributed">{0} pársec</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} pársecs</unitPattern>
 			</unit>
+			<unit type="length-nautical-mile">
+				<displayName draft="contributed">millas naúticas</displayName>
+				<unitPattern count="one" draft="contributed">{0} milla naútica</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} millas naúticas</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName draft="contributed">lux</displayName>
 			</unit>
 			<unit type="power-gigawatt">
 				<displayName draft="contributed">gigawatts</displayName>
 			</unit>
-			<unit type="power-kilowatt">
-				<displayName draft="contributed">kilowatts</displayName>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName draft="contributed">megawatts</displayName>
 			</unit>
+			<unit type="power-kilowatt">
+				<displayName draft="contributed">kilowatts</displayName>
+			</unit>
 			<unit type="power-milliwatt">
 				<displayName draft="contributed">miliwatts</displayName>
 				<unitPattern count="one" draft="contributed">{0} miliwatt</unitPattern>
@@ -1934,6 +1855,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} G</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<displayName draft="contributed">º</displayName>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one" draft="contributed">{0} min</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} min</unitPattern>
@@ -1943,23 +1867,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} s</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} s</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName draft="contributed">º</displayName>
+			<unit type="digital-byte">
+				<displayName draft="contributed">byte</displayName>
+				<unitPattern count="one" draft="contributed">{0} byte</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} byte</unitPattern>
 			</unit>
 			<unit type="digital-bit">
 				<displayName draft="contributed">bit</displayName>
 				<unitPattern count="one" draft="contributed">{0} bit</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} bit</unitPattern>
 			</unit>
-			<unit type="digital-byte">
-				<displayName draft="contributed">byte</displayName>
-				<unitPattern count="one" draft="contributed">{0} byte</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} byte</unitPattern>
-			</unit>
-			<unit type="duration-day">
-				<displayName draft="contributed">días</displayName>
-				<unitPattern count="one" draft="contributed">{0} día</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} días</unitPattern>
+			<unit type="duration-year">
+				<displayName draft="contributed">a</displayName>
+				<unitPattern count="one" draft="contributed">{0} a</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} a</unitPattern>
 			</unit>
 			<unit type="duration-month">
 				<displayName draft="contributed">meses</displayName>
@@ -1971,39 +1892,39 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} sem</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} sem</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">a</displayName>
-				<unitPattern count="one" draft="contributed">{0} a</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} a</unitPattern>
-			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName draft="contributed">ua</displayName>
-				<unitPattern count="one" draft="contributed">{0} ua</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ua</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName draft="contributed">al</displayName>
-				<unitPattern count="one" draft="contributed">{0} a. l.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} a. l.</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName draft="contributed">millas</displayName>
+			<unit type="duration-day">
+				<displayName draft="contributed">días</displayName>
+				<unitPattern count="one" draft="contributed">{0} día</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} días</unitPattern>
 			</unit>
 			<unit type="length-nanometer">
 				<displayName draft="contributed">Nm</displayName>
 				<unitPattern count="one" draft="contributed">{0} Nm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} Nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName draft="contributed">M</displayName>
-				<unitPattern count="one" draft="contributed">{0} M</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} M</unitPattern>
+			<unit type="length-mile">
+				<displayName draft="contributed">millas</displayName>
+			</unit>
+			<unit type="length-yard">
+				<displayName draft="contributed">yd</displayName>
 			</unit>
 			<unit type="length-parsec">
 				<displayName draft="contributed">pc</displayName>
 			</unit>
-			<unit type="length-yard">
-				<displayName draft="contributed">yd</displayName>
+			<unit type="length-light-year">
+				<displayName draft="contributed">al</displayName>
+				<unitPattern count="one" draft="contributed">{0} a. l.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} a. l.</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName draft="contributed">ua</displayName>
+				<unitPattern count="one" draft="contributed">{0} ua</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ua</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName draft="contributed">M</displayName>
+				<unitPattern count="one" draft="contributed">{0} M</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} M</unitPattern>
 			</unit>
 			<unit type="mass-ounce-troy">
 				<displayName draft="contributed">ozt</displayName>
@@ -2013,24 +1934,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="speed-kilometer-per-hour">
 				<displayName draft="contributed">km/hora</displayName>
 			</unit>
+			<unit type="volume-pint">
+				<displayName draft="contributed">pt</displayName>
+			</unit>
 			<unit type="volume-cup">
 				<displayName draft="contributed">tza.</displayName>
 				<unitPattern count="one" draft="contributed">{0} tza.</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} tzas.</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName draft="contributed">pt</displayName>
-			</unit>
-			<unit type="volume-tablespoon">
-				<unitPattern count="one" draft="contributed">{0} cda.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cdas.</unitPattern>
-			</unit>
 		</unitLength>
 		<unitLength type="narrow">
-			<unit type="duration-day">
-				<displayName draft="contributed">días</displayName>
-				<unitPattern count="one" draft="contributed">{0}d</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}d</unitPattern>
+			<unit type="duration-year">
+				<displayName draft="contributed">a</displayName>
+				<unitPattern count="one" draft="contributed">{0}a</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}a</unitPattern>
 			</unit>
 			<unit type="duration-month">
 				<displayName draft="contributed">m</displayName>
@@ -2042,10 +1959,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}sem</unitPattern>
 				<unitPattern count="other">{0}sem</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">a</displayName>
-				<unitPattern count="one" draft="contributed">{0}a</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}a</unitPattern>
+			<unit type="duration-day">
+				<displayName draft="contributed">días</displayName>
+				<unitPattern count="one" draft="contributed">{0}d</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}d</unitPattern>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_NI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_NI.xml
similarity index 69%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_NI.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_NI.xml
index b77ef382f90..7506149edcc 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_NI.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_NI.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 12217 $"/>
 		<language type="es"/>
 		<territory type="NI"/>
 	</identity>
@@ -15,6 +14,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<fields>
 			<field type="day">
 				<relative type="-2">antier</relative>
+				<relative type="-1">ayer</relative>
+				<relative type="0">hoy</relative>
+				<relative type="1">mañana</relative>
+				<relative type="2">pasado mañana</relative>
 			</field>
 		</fields>
 	</dates>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PA.xml
new file mode 100644
index 00000000000..a88e086849c
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PA.xml
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12217 $"/>
+		<language type="es"/>
+		<territory type="PA"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>MM/dd/y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>MM/dd/yy GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="Md">MM/dd</dateFormatItem>
+						<dateFormatItem id="MEd">E, MM/dd</dateFormatItem>
+						<dateFormatItem id="yM">MM/y</dateFormatItem>
+						<dateFormatItem id="yMd">MM/dd/y</dateFormatItem>
+						<dateFormatItem id="yMEd">E MM/dd/y</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback draft="contributed">{0} a el {1}</intervalFormatFallback>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="M" draft="contributed">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d" draft="contributed">E d 'al' E d 'de' MMM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y" draft="contributed">y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M" draft="contributed">MMM–MMM 'de' y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d" draft="contributed">d–d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d 'de' MMM 'al' d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d" draft="contributed">E d 'al' E d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E d 'de' MMM 'al' E d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">E</month>
+							<month type="2" draft="contributed">F</month>
+							<month type="3" draft="contributed">M</month>
+							<month type="4" draft="contributed">A</month>
+							<month type="5" draft="contributed">M</month>
+							<month type="6" draft="contributed">J</month>
+							<month type="7" draft="contributed">J</month>
+							<month type="8" draft="contributed">A</month>
+							<month type="9" draft="contributed">S</month>
+							<month type="10" draft="contributed">O</month>
+							<month type="11" draft="contributed">N</month>
+							<month type="12" draft="contributed">D</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">E</month>
+							<month type="2" draft="contributed">F</month>
+							<month type="3" draft="contributed">M</month>
+							<month type="4" draft="contributed">A</month>
+							<month type="5" draft="contributed">M</month>
+							<month type="6" draft="contributed">J</month>
+							<month type="7" draft="contributed">J</month>
+							<month type="8" draft="contributed">A</month>
+							<month type="9" draft="contributed">S</month>
+							<month type="10" draft="contributed">O</month>
+							<month type="11" draft="contributed">N</month>
+							<month type="12" draft="contributed">D</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<quarters>
+					<quarterContext type="format">
+						<quarterWidth type="wide">
+							<quarter type="1">1er. trimestre</quarter>
+							<quarter type="2">2do. trimestre</quarter>
+							<quarter type="3">3er. trimestre</quarter>
+							<quarter type="4">4.º trimestre</quarter>
+						</quarterWidth>
+					</quarterContext>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="wide">
+							<quarter type="1">1er. trimestre</quarter>
+							<quarter type="2">2do. trimestre</quarter>
+							<quarter type="3">3er. trimestre</quarter>
+							<quarter type="4">4.º trimestre</quarter>
+						</quarterWidth>
+					</quarterContext>
+				</quarters>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="noon">mediodía</dayPeriod>
+							<dayPeriod type="morning1">de la madrugada</dayPeriod>
+							<dayPeriod type="morning2">de la mañana</dayPeriod>
+							<dayPeriod type="evening1">de la tarde</dayPeriod>
+							<dayPeriod type="night1">de la noche</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="noon">mediodía</dayPeriod>
+							<dayPeriod type="morning1">de la madrugada</dayPeriod>
+							<dayPeriod type="morning2">de la mañana</dayPeriod>
+							<dayPeriod type="evening1">de la tarde</dayPeriod>
+							<dayPeriod type="night1">de la noche</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<dateFormats>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>MM/dd/y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>MM/dd/yy</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern draft="contributed">h:mm:ss a zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern draft="contributed">h:mm:ss a z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern draft="contributed">h:mm:ss a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern draft="contributed">h:mm a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="Md">MM/dd</dateFormatItem>
+						<dateFormatItem id="MEd">E, MM/dd</dateFormatItem>
+						<dateFormatItem id="yM">MM/y</dateFormatItem>
+						<dateFormatItem id="yMd">MM/dd/y</dateFormatItem>
+						<dateFormatItem id="yMEd">E MM/dd/y</dateFormatItem>
+						<dateFormatItem id="yMMM" draft="contributed">MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMd" draft="contributed">d MMM y</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="M" draft="contributed">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d" draft="contributed">E d 'al' E d 'de' MMM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M" draft="contributed">MM/y – MM/y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">MM/y – MM/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="y" draft="contributed">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="M" draft="contributed">d 'de' MMM 'al' d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d" draft="contributed">E d 'al' E d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E d 'de' MMM 'al' E d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="day">
+				<relative type="-2">antier</relative>
+				<relative type="-1">ayer</relative>
+				<relative type="0">hoy</relative>
+				<relative type="1">mañana</relative>
+				<relative type="2">pasado mañana</relative>
+			</field>
+		</fields>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="PAB">
+				<symbol>B/.</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_PE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PE.xml
similarity index 97%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_PE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PE.xml
index 2ce2a3c78a9..2cf214fde5a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_PE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PE.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="es"/>
 		<territory type="PE"/>
 	</identity>
@@ -222,6 +221,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</dateTimeFormats>
 			</calendar>
 		</calendars>
+		<timeZoneNames>
+			<metazone type="Peru">
+				<short>
+					<generic>PET</generic>
+					<standard>PET</standard>
+					<daylight>PEST</daylight>
+				</short>
+			</metazone>
+		</timeZoneNames>
 	</dates>
 	<numbers>
 		<currencies>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PH.xml
new file mode 100644
index 00000000000..4bcbc220b55
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PH.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="es"/>
+		<territory type="PH"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern draft="contributed">h:mm:ss a zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern draft="contributed">h:mm:ss a z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern draft="contributed">h:mm:ss a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern draft="contributed">h:mm a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="PHP">
+				<symbol>₱</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_PR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PR.xml
similarity index 93%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_PR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PR.xml
index c3625288474..d73b44b813a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_PR.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PR.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="es"/>
 		<territory type="PR"/>
 	</identity>
@@ -109,6 +108,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>h:mm:ss a zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>h:mm:ss a z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>h:mm:ss a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>h:mm a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
 				<dateTimeFormats>
 					<availableFormats>
 						<dateFormatItem id="Md">MM/dd</dateFormatItem>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PY.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PY.xml
new file mode 100644
index 00000000000..cd4d1d0d88e
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PY.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12217 $"/>
+		<language type="es"/>
+		<territory type="PY"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">ene.</month>
+							<month type="2" draft="contributed">feb.</month>
+							<month type="3" draft="contributed">mar.</month>
+							<month type="4" draft="contributed">abr.</month>
+							<month type="5" draft="contributed">may.</month>
+							<month type="6" draft="contributed">jun.</month>
+							<month type="7" draft="contributed">jul.</month>
+							<month type="8" draft="contributed">ago.</month>
+							<month type="9" draft="contributed">sept.</month>
+							<month type="10" draft="contributed">oct.</month>
+							<month type="11" draft="contributed">nov.</month>
+							<month type="12" draft="contributed">dic.</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">ene.</month>
+							<month type="2" draft="contributed">feb.</month>
+							<month type="3" draft="contributed">mar.</month>
+							<month type="4" draft="contributed">abr.</month>
+							<month type="5" draft="contributed">may.</month>
+							<month type="6" draft="contributed">jun.</month>
+							<month type="7" draft="contributed">jul.</month>
+							<month type="8" draft="contributed">ago.</month>
+							<month type="9" draft="contributed">sept.</month>
+							<month type="10" draft="contributed">oct.</month>
+							<month type="11" draft="contributed">nov.</month>
+							<month type="12" draft="contributed">dic.</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="short">
+							<day type="sun" draft="contributed">do</day>
+							<day type="mon" draft="contributed">lu</day>
+							<day type="tue" draft="contributed">ma</day>
+							<day type="wed" draft="contributed">mi</day>
+							<day type="thu" draft="contributed">ju</day>
+							<day type="fri" draft="contributed">vi</day>
+							<day type="sat" draft="contributed">sa</day>
+						</dayWidth>
+					</dayContext>
+					<dayContext type="stand-alone">
+						<dayWidth type="short">
+							<day type="sun" draft="contributed">Do</day>
+							<day type="mon" draft="contributed">Lu</day>
+							<day type="tue" draft="contributed">Ma</day>
+							<day type="wed" draft="contributed">Mi</day>
+							<day type="thu" draft="contributed">Ju</day>
+							<day type="fri" draft="contributed">Vi</day>
+							<day type="sat" draft="contributed">Sa</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="noon" draft="contributed">del mediodía</dayPeriod>
+							<dayPeriod type="morning1" draft="contributed">de la madrugada</dayPeriod>
+							<dayPeriod type="morning2" draft="contributed">de la mañana</dayPeriod>
+							<dayPeriod type="evening1" draft="contributed">de la tarde</dayPeriod>
+							<dayPeriod type="night1" draft="contributed">de la noche</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="noon" draft="contributed">m.</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<dateTimeFormats>
+					<intervalFormats>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a" draft="contributed">h a 'a' h a</greatestDifference>
+							<greatestDifference id="h" draft="contributed">h 'a' h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a" draft="contributed">h:mm a 'a' h:mm a</greatestDifference>
+							<greatestDifference id="h" draft="contributed">h:mm 'a' h:mm a</greatestDifference>
+							<greatestDifference id="m" draft="contributed">h:mm 'a' h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d" draft="contributed">d/M 'al' d/M</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d/M 'al' d/M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d" draft="contributed">d/M/y 'al' d/M/y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d/M/y 'al' d/M/y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">d/M/y 'al' d/M/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M" draft="contributed">MMM 'a' MMM y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="M" draft="contributed">d 'de' MMM 'al' d 'de' MMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M" draft="contributed">MMMM 'a' MMMM 'de' y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">MMMM 'de' y 'a' MMMM 'de' y</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="day">
+				<relative type="-2">antes de ayer</relative>
+				<relative type="-1">ayer</relative>
+				<relative type="0">hoy</relative>
+				<relative type="1">mañana</relative>
+				<relative type="2">pasado mañana</relative>
+			</field>
+			<field type="sun-narrow">
+				<relative type="-1" draft="contributed">el dom. pasado</relative>
+				<relative type="0" draft="contributed">este dom.</relative>
+				<relative type="1" draft="contributed">el próximo dom.</relative>
+			</field>
+			<field type="mon-narrow">
+				<relative type="-1" draft="contributed">el lun. pasado</relative>
+				<relative type="0" draft="contributed">este lun.</relative>
+				<relative type="1" draft="contributed">el próximo lun.</relative>
+			</field>
+			<field type="tue-narrow">
+				<relative type="-1" draft="contributed">el mar. pasado</relative>
+				<relative type="0" draft="contributed">este mar.</relative>
+				<relative type="1" draft="contributed">el próximo mar.</relative>
+			</field>
+			<field type="second-short">
+				<displayName draft="contributed">seg.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="contributed">dentro de {0} seg.</relativeTimePattern>
+					<relativeTimePattern count="other" draft="contributed">dentro de {0} seg.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="contributed">hace {0} seg.</relativeTimePattern>
+					<relativeTimePattern count="other" draft="contributed">hace {0} seg.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="contributed">dentro de {0} seg.</relativeTimePattern>
+					<relativeTimePattern count="other" draft="contributed">dentro de {0} seg.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="contributed">hace {0} seg.</relativeTimePattern>
+					<relativeTimePattern count="other" draft="contributed">hace {0} seg.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="zone">
+				<displayName draft="contributed">zona horaria</displayName>
+			</field>
+		</fields>
+	</dates>
+	<numbers>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group>.</group>
+		</symbols>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>¤ #,##0.00;¤ -#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencies>
+			<currency type="PYG">
+				<symbol>Gs.</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+	<units>
+		<unitLength type="long">
+			<unit type="duration-year">
+				<perUnitPattern draft="contributed">{0}/año</perUnitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName draft="contributed">amperios</displayName>
+				<unitPattern count="one" draft="contributed">{0} amperio</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} amperios</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName draft="contributed">miliamperios</displayName>
+				<unitPattern count="one" draft="contributed">{0} miliamperio</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} miliamperios</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<unitPattern count="one">{0} ohmio</unitPattern>
+				<unitPattern count="other">{0} ohmios</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<unitPattern count="one">{0} voltio</unitPattern>
+				<unitPattern count="other">{0} voltios</unitPattern>
+			</unit>
+		</unitLength>
+		<unitLength type="short">
+			<unit type="duration-year">
+				<displayName draft="contributed">años</displayName>
+				<unitPattern count="one" draft="contributed">{0} año</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} años</unitPattern>
+				<perUnitPattern draft="contributed">{0}/año</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">meses</displayName>
+				<unitPattern count="one" draft="contributed">{0} mes</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} meses</unitPattern>
+				<perUnitPattern draft="contributed">{0}/mes</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName draft="contributed">días</displayName>
+				<unitPattern count="one" draft="contributed">{0} día</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} días</unitPattern>
+				<perUnitPattern draft="contributed">{0}/día</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName draft="contributed">seg.</displayName>
+				<unitPattern count="one" draft="contributed">{0} seg.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} seg.</unitPattern>
+				<perUnitPattern draft="contributed">{0}/seg.</perUnitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName draft="contributed">voltios</displayName>
+			</unit>
+			<unit type="power-watt">
+				<displayName draft="contributed">vatios</displayName>
+			</unit>
+		</unitLength>
+		<unitLength type="narrow">
+			<unit type="duration-year">
+				<displayName draft="contributed">año</displayName>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">mes</displayName>
+			</unit>
+			<unit type="duration-day">
+				<displayName draft="contributed">día</displayName>
+			</unit>
+		</unitLength>
+	</units>
+	<listPatterns>
+		<listPattern type="unit-short">
+			<listPatternPart type="end" draft="contributed">{0} y {1}</listPatternPart>
+		</listPattern>
+	</listPatterns>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_SV.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_SV.xml
similarity index 69%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_SV.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_SV.xml
index 6d25b49d9d7..0db308a3e18 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_SV.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_SV.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 12217 $"/>
 		<language type="es"/>
 		<territory type="SV"/>
 	</identity>
@@ -15,6 +14,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<fields>
 			<field type="day">
 				<relative type="-2">antier</relative>
+				<relative type="-1">ayer</relative>
+				<relative type="0">hoy</relative>
+				<relative type="1">mañana</relative>
+				<relative type="2">pasado mañana</relative>
 			</field>
 		</fields>
 	</dates>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_US.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_US.xml
similarity index 79%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_US.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_US.xml
index f53847b1bb6..d0fdcf201ae 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_US.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_US.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 12217 $"/>
 		<language type="es"/>
 		<territory type="US"/>
 	</identity>
@@ -18,7 +17,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am">a</dayPeriod>
-							<dayPeriod type="noon">m</dayPeriod>
 							<dayPeriod type="pm">p</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
@@ -27,6 +25,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>h:mm:ss a zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>h:mm:ss a z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>h:mm:ss a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>h:mm a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
 			</calendar>
 		</calendars>
 		<timeZoneNames>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_UY.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_UY.xml
similarity index 93%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_UY.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_UY.xml
index d506288a9e4..37e8dcd4621 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/es_UY.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_UY.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11186 $"/>
-		<generation date="$Date: 2015-02-12 16:51:01 -0600 (Thu, 12 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="es"/>
 		<territory type="UY"/>
 	</identity>
@@ -78,6 +77,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</months>
 			</calendar>
 		</calendars>
+		<timeZoneNames>
+			<metazone type="Uruguay">
+				<short>
+					<generic>UYT</generic>
+					<standard>UYT</standard>
+					<daylight>UYST</daylight>
+				</short>
+			</metazone>
+		</timeZoneNames>
 	</dates>
 	<numbers>
 		<symbols numberSystem="latn">
@@ -104,3 +112,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_VE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_VE.xml
new file mode 100644
index 00000000000..afa85eb644b
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_VE.xml
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12217 $"/>
+		<language type="es"/>
+		<territory type="VE"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">ene.</month>
+							<month type="2" draft="contributed">feb.</month>
+							<month type="3" draft="contributed">mar.</month>
+							<month type="4" draft="contributed">abr.</month>
+							<month type="5" draft="contributed">may.</month>
+							<month type="6" draft="contributed">jun.</month>
+							<month type="7" draft="contributed">jul.</month>
+							<month type="8" draft="contributed">ago.</month>
+							<month type="9" draft="contributed">sept.</month>
+							<month type="10" draft="contributed">oct.</month>
+							<month type="11" draft="contributed">nov.</month>
+							<month type="12" draft="contributed">dic.</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">E</month>
+							<month type="2" draft="contributed">F</month>
+							<month type="3" draft="contributed">M</month>
+							<month type="4" draft="contributed">A</month>
+							<month type="5" draft="contributed">M</month>
+							<month type="6" draft="contributed">J</month>
+							<month type="7" draft="contributed">J</month>
+							<month type="8" draft="contributed">A</month>
+							<month type="9" draft="contributed">S</month>
+							<month type="10" draft="contributed">O</month>
+							<month type="11" draft="contributed">N</month>
+							<month type="12" draft="contributed">D</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">ene.</month>
+							<month type="2" draft="contributed">feb.</month>
+							<month type="3" draft="contributed">mar.</month>
+							<month type="4" draft="contributed">abr.</month>
+							<month type="5" draft="contributed">may.</month>
+							<month type="6" draft="contributed">jun.</month>
+							<month type="7" draft="contributed">jul.</month>
+							<month type="8" draft="contributed">ago.</month>
+							<month type="9" draft="contributed">sept.</month>
+							<month type="10" draft="contributed">oct.</month>
+							<month type="11" draft="contributed">nov.</month>
+							<month type="12" draft="contributed">dic.</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="short">
+							<day type="sun" draft="contributed">Do</day>
+							<day type="mon" draft="contributed">Lu</day>
+							<day type="tue" draft="contributed">Ma</day>
+							<day type="wed" draft="contributed">Mi</day>
+							<day type="thu" draft="contributed">Ju</day>
+							<day type="fri" draft="contributed">Vi</day>
+							<day type="sat" draft="contributed">Sa</day>
+						</dayWidth>
+					</dayContext>
+					<dayContext type="stand-alone">
+						<dayWidth type="short">
+							<day type="sun" draft="contributed">Do</day>
+							<day type="mon" draft="contributed">Lu</day>
+							<day type="tue" draft="contributed">Ma</day>
+							<day type="wed" draft="contributed">Mi</day>
+							<day type="thu" draft="contributed">Ju</day>
+							<day type="fri" draft="contributed">Vi</day>
+							<day type="sat" draft="contributed">Sa</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<quarters>
+					<quarterContext type="format">
+						<quarterWidth type="wide">
+							<quarter type="1" draft="contributed">1er trimestre</quarter>
+							<quarter type="2" draft="contributed">2do trimestre</quarter>
+							<quarter type="3" draft="contributed">3er trimestre</quarter>
+							<quarter type="4" draft="contributed">4to trimestre</quarter>
+						</quarterWidth>
+					</quarterContext>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="wide">
+							<quarter type="1" draft="contributed">1er trimestre</quarter>
+							<quarter type="2" draft="contributed">2do trimestre</quarter>
+							<quarter type="3" draft="contributed">3er trimestre</quarter>
+							<quarter type="4" draft="contributed">4to trimestre</quarter>
+						</quarterWidth>
+					</quarterContext>
+				</quarters>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am" draft="contributed">a. m.</dayPeriod>
+							<dayPeriod type="pm" draft="contributed">p. m.</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="noon" draft="contributed">m.</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern draft="contributed">h:mm:ss a zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern draft="contributed">h:mm:ss a z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern draft="contributed">h:mm:ss a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern draft="contributed">h:mm a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="yMMMd" draft="contributed">d MMM y</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="sun-narrow">
+				<relative type="-1" draft="contributed">el Do pasado</relative>
+				<relative type="0" draft="contributed">este Do</relative>
+				<relative type="1" draft="contributed">el próximo Do</relative>
+			</field>
+			<field type="mon-narrow">
+				<relative type="-1" draft="contributed">el Lu pasado</relative>
+				<relative type="0" draft="contributed">este Lu</relative>
+				<relative type="1" draft="contributed">el próximo Lu</relative>
+			</field>
+			<field type="tue-narrow">
+				<relative type="-1" draft="contributed">el Ma pasado</relative>
+				<relative type="0" draft="contributed">este Ma</relative>
+				<relative type="1" draft="contributed">el próximo Ma</relative>
+			</field>
+			<field type="wed-narrow">
+				<relative type="-1" draft="contributed">el Mi pasado</relative>
+				<relative type="0" draft="contributed">este Mi</relative>
+				<relative type="1" draft="contributed">el próximo Mi</relative>
+			</field>
+			<field type="thu-narrow">
+				<relative type="-1" draft="contributed">el Ju pasado</relative>
+				<relative type="0" draft="contributed">este Ju</relative>
+				<relative type="1" draft="contributed">el próximo Ju</relative>
+			</field>
+			<field type="fri-narrow">
+				<relative type="-1" draft="contributed">el Vi pasado</relative>
+				<relative type="0" draft="contributed">este Vi</relative>
+				<relative type="1" draft="contributed">el próximo Vi</relative>
+			</field>
+			<field type="sat-narrow">
+				<relative type="-1" draft="contributed">el Sa pasado</relative>
+				<relative type="0" draft="contributed">este Sa</relative>
+				<relative type="1" draft="contributed">el próximo Sa</relative>
+			</field>
+		</fields>
+		<timeZoneNames>
+			<metazone type="Venezuela">
+				<short>
+					<standard>VET</standard>
+				</short>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group>.</group>
+		</symbols>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>¤#,##0.00;¤-#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencies>
+			<currency type="VEF">
+				<symbol>Bs.</symbol>
+				<symbol alt="narrow">Bs.</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/et.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/et.xml
similarity index 77%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/et.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/et.xml
index eb0cbfeb3e2..879c8fb1321 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/et.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/et.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="et"/>
 	</identity>
 	<localeDisplayNames>
@@ -20,17 +19,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="aa">afari</language>
 			<language type="ab">abhaasi</language>
 			<language type="ace">atšehi</language>
-			<language type="ach">akoli</language>
+			<language type="ach">atšoli</language>
 			<language type="ada">adangme</language>
 			<language type="ady">adõgee</language>
 			<language type="ae">avesta</language>
+			<language type="aeb">Tuneesia araabia</language>
 			<language type="af">afrikaani</language>
 			<language type="afh">afrihili</language>
 			<language type="agq">aghemi</language>
 			<language type="ain">ainu</language>
 			<language type="ak">akani</language>
 			<language type="akk">akadi</language>
+			<language type="akz">alabama</language>
 			<language type="ale">aleuudi</language>
+			<language type="aln">geegi</language>
 			<language type="alt">altai</language>
 			<language type="am">amhari</language>
 			<language type="an">aragoni</language>
@@ -39,11 +41,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ar">araabia</language>
 			<language type="ar_001">araabia (tänapäevane)</language>
 			<language type="arc">aramea</language>
-			<language type="arn">araukaani</language>
+			<language type="arn">mapudunguni</language>
+			<language type="aro">araona</language>
 			<language type="arp">arapaho</language>
+			<language type="arq">Alžeeria araabia</language>
 			<language type="arw">aravaki</language>
+			<language type="ary">Maroko araabia</language>
+			<language type="arz">Egiptuse araabia</language>
 			<language type="as">assami</language>
-			<language type="asa">asa</language>
+			<language type="asa">asu</language>
+			<language type="ase">Ameerika viipekeel</language>
 			<language type="ast">astuuria</language>
 			<language type="av">avaari</language>
 			<language type="awa">avadhi</language>
@@ -53,26 +60,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ba">baškiiri</language>
 			<language type="bal">belutši</language>
 			<language type="ban">bali</language>
+			<language type="bar">baieri</language>
 			<language type="bas">basa</language>
 			<language type="bax">bamuni</language>
+			<language type="bbc">bataki</language>
 			<language type="bbj">ghomala</language>
 			<language type="be">valgevene</language>
 			<language type="bej">bedža</language>
 			<language type="bem">bemba</language>
+			<language type="bew">betavi</language>
 			<language type="bez">bena</language>
 			<language type="bfd">bafuti</language>
+			<language type="bfq">badaga</language>
 			<language type="bg">bulgaaria</language>
+			<language type="bgn">läänebelutši</language>
 			<language type="bho">bhodžpuri</language>
 			<language type="bi">bislama</language>
 			<language type="bik">bikoli</language>
 			<language type="bin">edo</language>
-			<language type="bkm">itaŋikomi</language>
-			<language type="bla">siksika</language>
+			<language type="bjn">bandžari</language>
+			<language type="bkm">komi (Aafrika)</language>
+			<language type="bla">mustjalaindiaani</language>
 			<language type="bm">bambara</language>
 			<language type="bn">bengali</language>
 			<language type="bo">tiibeti</language>
+			<language type="bpy">bišnuprija</language>
+			<language type="bqi">bahtiari</language>
 			<language type="br">bretooni</language>
 			<language type="bra">bradži</language>
+			<language type="brh">brahui</language>
 			<language type="brx">bodo</language>
 			<language type="bs">bosnia</language>
 			<language type="bss">akoose</language>
@@ -84,11 +100,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ca">katalaani</language>
 			<language type="cad">kado</language>
 			<language type="car">kariibi</language>
-			<language type="cay">cayuga</language>
+			<language type="cay">kajuka</language>
 			<language type="cch">atsami</language>
 			<language type="ce">tšetšeeni</language>
 			<language type="ceb">sebu</language>
-			<language type="cgg">chiga</language>
+			<language type="cgg">tšiga</language>
 			<language type="ch">tšamorro</language>
 			<language type="chb">tšibtša</language>
 			<language type="chg">tšagatai</language>
@@ -99,9 +115,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="chp">tšipevai</language>
 			<language type="chr">tšerokii</language>
 			<language type="chy">šaieeni</language>
-			<language type="ckb">sorani kurdi</language>
+			<language type="ckb">sorani</language>
 			<language type="co">korsika</language>
 			<language type="cop">kopti</language>
+			<language type="cps">kapisnoni</language>
 			<language type="cr">krii</language>
 			<language type="crh">krimmitatari</language>
 			<language type="cs">tšehhi</language>
@@ -112,9 +129,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="da">taani</language>
 			<language type="dak">siuu</language>
 			<language type="dar">dargi</language>
-			<language type="dav">taita</language>
+			<language type="dav">davida</language>
 			<language type="de">saksa</language>
-			<language type="de_CH">saksa (kõrgsaksa)</language>
+			<language type="de_AT">Austria saksa</language>
+			<language type="de_CH">Šveitsi ülemsaksa</language>
 			<language type="del">delavari</language>
 			<language type="den">sleivi</language>
 			<language type="dgr">dogribi</language>
@@ -122,43 +140,57 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="dje">zarma</language>
 			<language type="doi">dogri</language>
 			<language type="dsb">alamsorbi</language>
+			<language type="dtp">keskdusuni</language>
 			<language type="dua">duala</language>
 			<language type="dum">keskhollandi</language>
 			<language type="dv">maldiivi</language>
-			<language type="dyo">jola-fonyi</language>
+			<language type="dyo">fonji</language>
 			<language type="dyu">djula</language>
 			<language type="dz">dzongkha</language>
-			<language type="dzg">dazaga</language>
+			<language type="dzg">daza</language>
 			<language type="ebu">embu</language>
 			<language type="ee">eve</language>
 			<language type="efi">efiki</language>
-			<language type="egy">muinasegiptuse</language>
+			<language type="egl">emiilia</language>
+			<language type="egy">egiptuse</language>
 			<language type="eka">ekadžuki</language>
 			<language type="el">kreeka</language>
 			<language type="elx">eelami</language>
 			<language type="en">inglise</language>
-			<language type="en_GB">inglise (Briti)</language>
-			<language type="en_US">inglise (USA)</language>
-			<language type="en_US" alt="short">inglise (USA)</language>
+			<language type="en_AU">Austraalia inglise</language>
+			<language type="en_CA">Kanada inglise</language>
+			<language type="en_GB">Briti inglise</language>
+			<language type="en_GB" alt="short">Briti inglise</language>
+			<language type="en_US">Ameerika inglise</language>
+			<language type="en_US" alt="short">USA inglise</language>
 			<language type="enm">keskinglise</language>
 			<language type="eo">esperanto</language>
 			<language type="es">hispaania</language>
-			<language type="es_ES">hispaania (Euroopa)</language>
+			<language type="es_419">Ladina-Ameerika hispaania</language>
+			<language type="es_ES">Euroopa hispaania</language>
+			<language type="es_MX">Mehhiko hispaania</language>
+			<language type="esu">keskjupiki</language>
 			<language type="et">eesti</language>
 			<language type="eu">baski</language>
 			<language type="ewo">evondo</language>
+			<language type="ext">estremenju</language>
 			<language type="fa">pärsia</language>
 			<language type="fan">fangi</language>
 			<language type="fat">fanti</language>
-			<language type="ff">fulbe</language>
+			<language type="ff">fula</language>
 			<language type="fi">soome</language>
-			<language type="fil">filipino</language>
+			<language type="fil">filipiini</language>
+			<language type="fit">meä</language>
 			<language type="fj">fidži</language>
 			<language type="fo">fääri</language>
 			<language type="fon">foni</language>
 			<language type="fr">prantsuse</language>
+			<language type="fr_CA">Kanada prantsuse</language>
+			<language type="fr_CH">Šveitsi prantsuse</language>
+			<language type="frc">cajun’i</language>
 			<language type="frm">keskprantsuse</language>
 			<language type="fro">vanaprantsuse</language>
+			<language type="frp">frankoprovansi</language>
 			<language type="frr">põhjafriisi</language>
 			<language type="frs">idafriisi</language>
 			<language type="fur">friuuli</language>
@@ -166,12 +198,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ga">iiri</language>
 			<language type="gaa">gaa</language>
 			<language type="gag">gagauusi</language>
+			<language type="gan">kani</language>
 			<language type="gay">gajo</language>
 			<language type="gba">gbaja</language>
 			<language type="gd">gaeli</language>
 			<language type="gez">etioopia</language>
 			<language type="gil">kiribati</language>
 			<language type="gl">galeegi</language>
+			<language type="glk">gilaki</language>
 			<language type="gmh">keskülemsaksa</language>
 			<language type="gn">guaranii</language>
 			<language type="goh">vanaülemsaksa</language>
@@ -182,6 +216,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="grc">vanakreeka</language>
 			<language type="gsw">šveitsisaksa</language>
 			<language type="gu">gudžarati</language>
+			<language type="guc">vajuu</language>
+			<language type="gur">farefare</language>
 			<language type="guz">gusii</language>
 			<language type="gv">mänksi</language>
 			<language type="gwi">gvitšini</language>
@@ -190,12 +226,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="haw">havai</language>
 			<language type="he">heebrea</language>
 			<language type="hi">hindi</language>
+			<language type="hif">Fidži hindi</language>
 			<language type="hil">hiligainoni</language>
 			<language type="hit">heti</language>
 			<language type="hmn">hmongi</language>
-			<language type="ho">motu</language>
+			<language type="ho">hirimotu</language>
 			<language type="hr">horvaadi</language>
 			<language type="hsb">ülemsorbi</language>
+			<language type="hsn">sjangi</language>
 			<language type="ht">haiti</language>
 			<language type="hu">ungari</language>
 			<language type="hup">hupa</language>
@@ -207,7 +245,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="id">indoneesia</language>
 			<language type="ie">interlingue</language>
 			<language type="ig">ibo</language>
-			<language type="ii">sichuani jii</language>
+			<language type="ii">Sichuani jii</language>
 			<language type="ik">injupiaki</language>
 			<language type="ilo">iloko</language>
 			<language type="inh">inguši</language>
@@ -215,12 +253,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="is">islandi</language>
 			<language type="it">itaalia</language>
 			<language type="iu">inuktituti</language>
+			<language type="izh">isuri</language>
 			<language type="ja">jaapani</language>
-			<language type="jbo">lojbani</language>
+			<language type="jam">Jamaica kreoolkeel</language>
+			<language type="jbo">ložban</language>
 			<language type="jgo">ngomba</language>
-			<language type="jmc">machame</language>
+			<language type="jmc">matšame</language>
 			<language type="jpr">juudipärsia</language>
 			<language type="jrb">juudiaraabia</language>
+			<language type="jut">jüüti</language>
 			<language type="jv">jaava</language>
 			<language type="ka">gruusia</language>
 			<language type="kaa">karakalpaki</language>
@@ -231,20 +272,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="kaw">kaavi</language>
 			<language type="kbd">kabardi-tšerkessi</language>
 			<language type="kbl">kanembu</language>
-			<language type="kcg">tyapi</language>
+			<language type="kcg">tjapi</language>
 			<language type="kde">makonde</language>
 			<language type="kea">kabuverdianu</language>
 			<language type="kfo">koro</language>
 			<language type="kg">kongo</language>
+			<language type="kgp">kaingangi</language>
 			<language type="kha">khasi</language>
-			<language type="kho">saki</language>
+			<language type="kho">saka</language>
 			<language type="khq">koyra chiini</language>
+			<language type="khw">khovari</language>
 			<language type="ki">kikuju</language>
-			<language type="kj">ambo</language>
+			<language type="kiu">kõrmandžki</language>
+			<language type="kj">kvanjama</language>
 			<language type="kk">kasahhi</language>
 			<language type="kkj">kako</language>
 			<language type="kl">grööni</language>
-			<language type="kln">kaljenjin</language>
+			<language type="kln">kalendžini</language>
 			<language type="km">khmeeri</language>
 			<language type="kmb">mbundu</language>
 			<language type="kn">kannada</language>
@@ -255,12 +299,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="kpe">kpelle</language>
 			<language type="kr">kanuri</language>
 			<language type="krc">karatšai-balkaari</language>
+			<language type="kri">krio</language>
+			<language type="krj">kinaraia</language>
 			<language type="krl">karjala</language>
-			<language type="kru">oraoni</language>
+			<language type="kru">kuruhhi</language>
 			<language type="ks">kašmiiri</language>
-			<language type="ksb">shambala</language>
+			<language type="ksb">šambala</language>
 			<language type="ksf">bafia</language>
-			<language type="ksh">cologniani</language>
+			<language type="ksh">kölni</language>
 			<language type="ku">kurdi</language>
 			<language type="kum">kumõki</language>
 			<language type="kut">kutenai</language>
@@ -276,23 +322,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lez">lesgi</language>
 			<language type="lg">ganda</language>
 			<language type="li">limburgi</language>
+			<language type="lij">liguuri</language>
+			<language type="liv">liivi</language>
 			<language type="lkt">lakota</language>
+			<language type="lmo">lombardi</language>
 			<language type="ln">lingala</language>
 			<language type="lo">lao</language>
 			<language type="lol">mongo</language>
 			<language type="loz">lozi</language>
+			<language type="lrc">põhjaluri</language>
 			<language type="lt">leedu</language>
+			<language type="ltg">latgali</language>
 			<language type="lu">luba</language>
-			<language type="lua">luba-lulua</language>
+			<language type="lua">lulua</language>
 			<language type="lui">luisenjo</language>
 			<language type="lun">lunda</language>
 			<language type="luo">luo</language>
 			<language type="lus">lušei</language>
-			<language type="luy">luyia</language>
+			<language type="luy">luhja</language>
 			<language type="lv">läti</language>
+			<language type="lzh">klassikaline hiina</language>
+			<language type="lzz">lazi</language>
 			<language type="mad">madura</language>
 			<language type="maf">mafa</language>
-			<language type="mag">magali</language>
+			<language type="mag">magahi</language>
 			<language type="mai">maithili</language>
 			<language type="mak">makassari</language>
 			<language type="man">malinke</language>
@@ -306,7 +359,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mg">malagassi</language>
 			<language type="mga">keskiiri</language>
 			<language type="mgh">makhuwa-meetto</language>
-			<language type="mgo" draft="contributed">meta’</language>
+			<language type="mgo">meta</language>
 			<language type="mh">maršalli</language>
 			<language type="mi">maoori</language>
 			<language type="mic">mikmaki</language>
@@ -319,6 +372,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="moh">mohoogi</language>
 			<language type="mos">more</language>
 			<language type="mr">marathi</language>
+			<language type="mrj">mäemari</language>
 			<language type="ms">malai</language>
 			<language type="mt">malta</language>
 			<language type="mua">mundangi</language>
@@ -326,28 +380,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mus">maskogi</language>
 			<language type="mwl">miranda</language>
 			<language type="mwr">marvari</language>
+			<language type="mwv">mentavei</language>
 			<language type="my">birma</language>
-			<language type="mye">myene</language>
+			<language type="mye">mjene</language>
 			<language type="myv">ersa</language>
+			<language type="mzn">mazandaraani</language>
 			<language type="na">nauru</language>
+			<language type="nan">lõunamini</language>
 			<language type="nap">napoli</language>
 			<language type="naq">nama</language>
 			<language type="nb">norra bokmål</language>
 			<language type="nd">põhjandebele</language>
 			<language type="nds">alamsaksa</language>
+			<language type="nds_NL">Hollandi alamsaksa</language>
 			<language type="ne">nepali</language>
 			<language type="new">nevari</language>
 			<language type="ng">ndonga</language>
 			<language type="nia">niasi</language>
 			<language type="niu">niue</language>
+			<language type="njo">ao</language>
 			<language type="nl">hollandi</language>
 			<language type="nl_BE">flaami</language>
 			<language type="nmg">kwasio</language>
-			<language type="nn">norra nynorsk</language>
+			<language type="nn">uusnorra</language>
 			<language type="nnh">ngiembooni</language>
 			<language type="no">norra</language>
 			<language type="nog">nogai</language>
 			<language type="non">vanapõhjala</language>
+			<language type="nov">noviaal</language>
 			<language type="nqo">nkoo</language>
 			<language type="nr">lõunandebele</language>
 			<language type="nso">pedi</language>
@@ -372,63 +432,82 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="pam">pampanga</language>
 			<language type="pap">papiamento</language>
 			<language type="pau">belau</language>
+			<language type="pcd">pikardi</language>
+			<language type="pdc">Pennsylvania saksa</language>
+			<language type="pdt">mennoniidisaksa</language>
 			<language type="peo">vanapärsia</language>
+			<language type="pfl">Pfalzi</language>
 			<language type="phn">foiniikia</language>
 			<language type="pi">paali</language>
 			<language type="pl">poola</language>
+			<language type="pms">piemonte</language>
+			<language type="pnt">pontose</language>
 			<language type="pon">poonpei</language>
+			<language type="prg">preisi</language>
 			<language type="pro">vanaprovansi</language>
 			<language type="ps">puštu</language>
 			<language type="pt">portugali</language>
-			<language type="pt_PT">portugali (Euroopa)</language>
+			<language type="pt_BR">Brasiilia portugali</language>
+			<language type="pt_PT">Euroopa portugali</language>
 			<language type="qu">ketšua</language>
-			<language type="quc">k’iche’</language>
+			<language type="quc">kitše</language>
 			<language type="raj">radžastani</language>
 			<language type="rap">rapanui</language>
 			<language type="rar">rarotonga</language>
-			<language type="rm">retoromaani</language>
+			<language type="rgn">romanja</language>
+			<language type="rif">riifi</language>
+			<language type="rm">romanši</language>
 			<language type="rn">rundi</language>
 			<language type="ro">rumeenia</language>
 			<language type="ro_MD">moldova</language>
 			<language type="rof">rombo</language>
 			<language type="rom">mustlaskeel</language>
 			<language type="root">root</language>
+			<language type="rtm">rotuma</language>
 			<language type="ru">vene</language>
+			<language type="rue">russiini</language>
+			<language type="rug">roviana</language>
 			<language type="rup">aromuuni</language>
 			<language type="rw">ruanda</language>
-			<language type="rwk">rwa</language>
+			<language type="rwk">rvaa</language>
 			<language type="sa">sanskriti</language>
 			<language type="sad">sandave</language>
 			<language type="sah">jakuudi</language>
-			<language type="sam">samaaria aramea</language>
+			<language type="sam">Samaaria aramea</language>
 			<language type="saq">samburu</language>
 			<language type="sas">sasaki</language>
 			<language type="sat">santali</language>
-			<language type="sba">ngembay</language>
+			<language type="saz">sauraštra</language>
+			<language type="sba">ngambai</language>
 			<language type="sbp">sangu</language>
-			<language type="sc">sardiinia</language>
+			<language type="sc">sardi</language>
 			<language type="scn">sitsiilia</language>
 			<language type="sco">šoti</language>
 			<language type="sd">sindhi</language>
+			<language type="sdh">lõunakurdi</language>
 			<language type="se">põhjasaami</language>
-			<language type="see">seneca</language>
+			<language type="see">seneka</language>
 			<language type="seh">sena</language>
+			<language type="sei">seri</language>
 			<language type="sel">sölkupi</language>
 			<language type="ses">koyraboro senni</language>
 			<language type="sg">sango</language>
 			<language type="sga">vanaiiri</language>
+			<language type="sgs">žemaidi</language>
 			<language type="sh">serbia-horvaadi</language>
-			<language type="shi">tachelhiti</language>
+			<language type="shi">šilha</language>
 			<language type="shn">šani</language>
 			<language type="shu">Tšaadi araabia</language>
 			<language type="si">singali</language>
 			<language type="sid">sidamo</language>
 			<language type="sk">slovaki</language>
 			<language type="sl">sloveeni</language>
+			<language type="sli">alamsileesia</language>
+			<language type="sly">selajari</language>
 			<language type="sm">samoa</language>
 			<language type="sma">lõunasaami</language>
-			<language type="smj">lule saami</language>
-			<language type="smn">inari saami</language>
+			<language type="smj">Lule saami</language>
+			<language type="smn">Inari saami</language>
 			<language type="sms">koltasaami</language>
 			<language type="sn">šona</language>
 			<language type="snk">soninke</language>
@@ -441,17 +520,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ss">svaasi</language>
 			<language type="ssy">saho</language>
 			<language type="st">lõunasotho</language>
+			<language type="stq">saterfriisi</language>
 			<language type="su">sunda</language>
 			<language type="suk">sukuma</language>
 			<language type="sus">susu</language>
 			<language type="sux">sumeri</language>
 			<language type="sv">rootsi</language>
 			<language type="sw">suahiili</language>
+			<language type="sw_CD">Kongo suahiili</language>
 			<language type="swb">komoori</language>
-			<language type="swc">Kongo suahiili</language>
-			<language type="syc">klassikaline süüria</language>
+			<language type="syc">vanasüüria</language>
 			<language type="syr">süüria</language>
+			<language type="szl">sileesia</language>
 			<language type="ta">tamili</language>
+			<language type="tcy">tulu</language>
 			<language type="te">telugu</language>
 			<language type="tem">temne</language>
 			<language type="teo">teso</language>
@@ -464,59 +546,74 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="tiv">tivi</language>
 			<language type="tk">türkmeeni</language>
 			<language type="tkl">tokelau</language>
+			<language type="tkr">tsahhi</language>
 			<language type="tl">tagalogi</language>
 			<language type="tlh">klingoni</language>
 			<language type="tli">tlingiti</language>
+			<language type="tly">talõši</language>
 			<language type="tmh">tamašeki</language>
 			<language type="tn">tsvana</language>
 			<language type="to">tonga</language>
 			<language type="tog">tšitonga</language>
 			<language type="tpi">uusmelaneesia</language>
 			<language type="tr">türgi</language>
+			<language type="tru">turojo</language>
 			<language type="trv">taroko</language>
 			<language type="ts">tsonga</language>
+			<language type="tsd">tsakoonia</language>
 			<language type="tsi">tšimši</language>
 			<language type="tt">tatari</language>
+			<language type="ttt">lõunataadi</language>
 			<language type="tum">tumbuka</language>
 			<language type="tvl">tuvalu</language>
 			<language type="tw">tvii</language>
 			<language type="twq">taswaqi</language>
 			<language type="ty">tahiti</language>
 			<language type="tyv">tõva</language>
-			<language type="tzm">Kesk-Maroko tamazighti</language>
+			<language type="tzm">tamasikti</language>
 			<language type="udm">udmurdi</language>
 			<language type="ug">uiguuri</language>
 			<language type="uga">ugariti</language>
 			<language type="uk">ukraina</language>
 			<language type="umb">umbundu</language>
-			<language type="und">määramata</language>
+			<language type="und">määramata keel</language>
 			<language type="ur">urdu</language>
 			<language type="uz">usbeki</language>
 			<language type="vai">vai</language>
 			<language type="ve">venda</language>
+			<language type="vec">veneti</language>
+			<language type="vep">vepsa</language>
 			<language type="vi">vietnami</language>
+			<language type="vls">lääneflaami</language>
+			<language type="vmf">Maini frangi</language>
 			<language type="vo">volapüki</language>
 			<language type="vot">vadja</language>
-			<language type="vun">vunjo</language>
+			<language type="vro">võru</language>
+			<language type="vun">vundžo</language>
 			<language type="wa">vallooni</language>
 			<language type="wae">walseri</language>
-			<language type="wal">volamo</language>
+			<language type="wal">volaita</language>
 			<language type="war">varai</language>
 			<language type="was">vašo</language>
+			<language type="wbp">varlpiri</language>
 			<language type="wo">volofi</language>
+			<language type="wuu">uu</language>
 			<language type="xal">kalmõki</language>
 			<language type="xh">koosa</language>
+			<language type="xmf">megreli</language>
 			<language type="xog">soga</language>
 			<language type="yao">jao</language>
 			<language type="yap">japi</language>
 			<language type="yav">yangbeni</language>
-			<language type="ybb">yemba</language>
+			<language type="ybb">jemba</language>
 			<language type="yi">jidiši</language>
 			<language type="yo">joruba</language>
+			<language type="yrl">njengatu</language>
 			<language type="yue">kantoni</language>
 			<language type="za">tšuangi</language>
 			<language type="zap">sapoteegi</language>
-			<language type="zbl">blissümbolid</language>
+			<language type="zbl">Blissi sümbolid</language>
+			<language type="zea">zeelandi</language>
 			<language type="zen">zenaga</language>
 			<language type="zgh">tamasikti (Maroko)</language>
 			<language type="zh">hiina</language>
@@ -528,117 +625,175 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="zza">zaza</language>
 		</languages>
 		<scripts>
+			<script type="Afak">afaka</script>
+			<script type="Aghb">albaani</script>
+			<script type="Ahom">ahomi</script>
 			<script type="Arab">araabia</script>
 			<script type="Arab" alt="variant">pärsia-araabia</script>
+			<script type="Armi">vanaaramea</script>
 			<script type="Armn">armeenia</script>
-			<script type="Avst" draft="unconfirmed">avesta</script>
+			<script type="Avst">avesta</script>
 			<script type="Bali">bali</script>
+			<script type="Bamu">bamumi</script>
+			<script type="Bass">bassa</script>
 			<script type="Batk">bataki</script>
 			<script type="Beng">bengali</script>
 			<script type="Blis">Blissi sümbolid</script>
 			<script type="Bopo">bopomofo</script>
-			<script type="Brah">brahmi</script>
+			<script type="Brah">braahmi</script>
 			<script type="Brai">punktkiri</script>
 			<script type="Bugi">bugi</script>
 			<script type="Buhd">buhidi</script>
+			<script type="Cakm">tšaakma</script>
 			<script type="Cans">Kanada põlisrahvaste ühtlustatud silpkiri</script>
-			<script type="Cham">tšami</script>
+			<script type="Cari">kaaria</script>
+			<script type="Cham">tšaami</script>
 			<script type="Cher">tšerokii</script>
-			<script type="Cirt">cirth</script>
+			<script type="Cirt">Cirthi</script>
 			<script type="Copt">kopti</script>
-			<script type="Cprt">muinasküprose</script>
+			<script type="Cprt">Küprose silpkiri</script>
 			<script type="Cyrl">kirillitsa</script>
-			<script type="Cyrs">kirikuslaavi kirillitsa</script>
+			<script type="Cyrs">kürilliline kirikuslaavi</script>
 			<script type="Deva">devanaagari</script>
-			<script type="Dsrt">deseret</script>
+			<script type="Dsrt">desereti</script>
+			<script type="Dupl">Duployé kiirkiri</script>
 			<script type="Egyd">egiptuse demootiline</script>
 			<script type="Egyh">egiptuse hieraatiline</script>
 			<script type="Egyp">egiptuse hieroglüüfkiri</script>
+			<script type="Elba">Elbasani</script>
 			<script type="Ethi">etioopia</script>
-			<script type="Geok">gruusia hutsuri</script>
+			<script type="Geok">hutsuri</script>
 			<script type="Geor">gruusia</script>
 			<script type="Glag">glagoolitsa</script>
 			<script type="Goth">gooti</script>
+			<script type="Gran">grantha</script>
 			<script type="Grek">kreeka</script>
 			<script type="Gujr">gudžarati</script>
 			<script type="Guru">gurmukhi</script>
-			<script type="Hang">hanguli</script>
-			<script type="Hani">hiina han</script>
+			<script type="Hang">korea</script>
+			<script type="Hani">hani</script>
 			<script type="Hano">hanunoo</script>
 			<script type="Hans">hiina lihtsustatud</script>
-			<script type="Hans" alt="stand-alone">lihtsustatud han</script>
+			<script type="Hans" alt="stand-alone">lihtsustatud hani</script>
 			<script type="Hant">hiina traditsiooniline</script>
-			<script type="Hant" alt="stand-alone">traditsiooniline han</script>
+			<script type="Hant" alt="stand-alone">traditsiooniline hani</script>
+			<script type="Hatr">Hatra</script>
 			<script type="Hebr">heebrea</script>
 			<script type="Hira">hiragana</script>
-			<script type="Hrkt">katakana või hiragana</script>
+			<script type="Hluw">Anatoolia hieroglüüfkiri</script>
+			<script type="Hmng">phahau-hmongi kiri</script>
+			<script type="Hrkt">jaapani silpkirjad</script>
 			<script type="Hung">vanaungari</script>
-			<script type="Inds">induse</script>
+			<script type="Inds">Induse</script>
 			<script type="Ital">vanaitali</script>
 			<script type="Java">jaava</script>
 			<script type="Jpan">jaapani</script>
-			<script type="Kali">kaja li</script>
+			<script type="Jurc">tšurtšeni</script>
+			<script type="Kali">kaja-lii</script>
 			<script type="Kana">katakana</script>
 			<script type="Khar">kharoshthi</script>
 			<script type="Khmr">khmeeri</script>
+			<script type="Khoj">hodžki</script>
 			<script type="Knda">kannada</script>
-			<script type="Kore">koreani</script>
+			<script type="Kore">korea segakiri</script>
+			<script type="Kpel">kpelle</script>
+			<script type="Kthi">kaithi</script>
+			<script type="Lana">tai-thami</script>
 			<script type="Laoo">lao</script>
 			<script type="Latf">ladina fraktuurkiri</script>
-			<script type="Latg">ladina keldi kiri</script>
+			<script type="Latg">ladina gaeli</script>
 			<script type="Latn">ladina</script>
 			<script type="Lepc">leptša</script>
 			<script type="Limb">limbu</script>
-			<script type="Lina">lineaar-A</script>
-			<script type="Linb">lineaar-B</script>
-			<script type="Lydi" draft="unconfirmed">lüüdi</script>
+			<script type="Lina">lineaarkiri A</script>
+			<script type="Linb">lineaarkiri B</script>
+			<script type="Lisu">lisu</script>
+			<script type="Loma">loma</script>
+			<script type="Lyci">lüükia</script>
+			<script type="Lydi">lüüdia</script>
+			<script type="Mahj">mahaadžani</script>
 			<script type="Mand">mandea</script>
+			<script type="Mani">mani</script>
 			<script type="Maya">maaja hieroglüüfkiri</script>
+			<script type="Mend">mende</script>
+			<script type="Merc">meroe kursiivkiri</script>
 			<script type="Mero">meroe</script>
 			<script type="Mlym">malajalami</script>
+			<script type="Modi">modi</script>
 			<script type="Mong">mongoli</script>
+			<script type="Moon">Mooni</script>
+			<script type="Mroo">mruu</script>
+			<script type="Mtei">meitei</script>
+			<script type="Mult">Multani</script>
 			<script type="Mymr">birma</script>
+			<script type="Narb">Põhja-Araabia</script>
+			<script type="Nbat">Nabatea</script>
+			<script type="Nkgb">nasi</script>
 			<script type="Nkoo">nkoo</script>
+			<script type="Nshu">nüšu</script>
 			<script type="Ogam">ogam</script>
-			<script type="Orkh">orhoni</script>
+			<script type="Olck">santali</script>
+			<script type="Orkh">Orhoni</script>
 			<script type="Orya">oria</script>
-			<script type="Osma">osmanja</script>
+			<script type="Osma">osmani</script>
+			<script type="Palm">Palmyra</script>
 			<script type="Perm">vanapermi</script>
-			<script type="Phag">phags-pa</script>
+			<script type="Phag">phakpa</script>
+			<script type="Phli">pahlavi raidkiri</script>
+			<script type="Phlp">pahlavi psalmikiri</script>
+			<script type="Phlv">pahlavi raamatukiri</script>
 			<script type="Phnx">foiniikia</script>
 			<script type="Plrd">Pollardi miao</script>
+			<script type="Prti">partia raidkiri</script>
+			<script type="Rjng">redžangi</script>
 			<script type="Roro">rongorongo</script>
 			<script type="Runr">ruunikiri</script>
+			<script type="Samr">Samaaria</script>
 			<script type="Sara">sarati</script>
-			<script type="Shaw">Shaw tähestik</script>
+			<script type="Sarb">Lõuna-Araabia</script>
+			<script type="Saur">sauraštra</script>
+			<script type="Sgnw">viipekiri</script>
+			<script type="Shaw">Shaw’ kiri</script>
+			<script type="Shrd">šaarada</script>
+			<script type="Sidd">siddhami</script>
+			<script type="Sind">hudavadi</script>
 			<script type="Sinh">singali</script>
-			<script type="Sylo">silotinagri</script>
-			<script type="Syrc">assüüria</script>
-			<script type="Syre">assüüria estrangelo</script>
-			<script type="Syrj">lääneassüüria</script>
-			<script type="Syrn">idaassüüria</script>
-			<script type="Tagb">tagbanwa</script>
-			<script type="Tale">tai le</script>
-			<script type="Talu">lihtsustatud tai lue</script>
+			<script type="Sora">sora</script>
+			<script type="Sund">sunda</script>
+			<script type="Sylo">siloti</script>
+			<script type="Syrc">süüria</script>
+			<script type="Syre">süüria estrangelo</script>
+			<script type="Syrj">läänesüüria</script>
+			<script type="Syrn">idasüüria</script>
+			<script type="Tagb">tagbanva</script>
+			<script type="Takr">taakri</script>
+			<script type="Tale">tai-löö</script>
+			<script type="Talu">uus tai-lõõ</script>
 			<script type="Taml">tamili</script>
+			<script type="Tang">tanguudi</script>
+			<script type="Tavt">tai-vieti</script>
 			<script type="Telu">telugu</script>
-			<script type="Teng">tengwar</script>
+			<script type="Teng">Tengwari</script>
 			<script type="Tfng">tifinagi</script>
 			<script type="Tglg">tagalogi</script>
-			<script type="Thaa">thaana</script>
+			<script type="Thaa">taana</script>
 			<script type="Thai">tai</script>
 			<script type="Tibt">tiibeti</script>
+			<script type="Tirh">tirhuta</script>
 			<script type="Ugar">ugariti</script>
 			<script type="Vaii">vai</script>
-			<script type="Visp">häälduskiri</script>
+			<script type="Visp">nähtava kõne</script>
+			<script type="Wara">hoo</script>
+			<script type="Wole">voleai</script>
 			<script type="Xpeo">vanapärsia</script>
-			<script type="Xsux">sumeri kiilkiri</script>
+			<script type="Xsux">sumeri-akadi kiilkiri</script>
 			<script type="Yiii">jii</script>
 			<script type="Zinh">päritud</script>
+			<script type="Zmth">matemaatiline tähistus</script>
 			<script type="Zsym">sümbolid</script>
 			<script type="Zxxx">kirjakeeleta</script>
 			<script type="Zyyy">üldine</script>
-			<script type="Zzzz">määramata</script>
+			<script type="Zzzz">määramata kiri</script>
 		</scripts>
 		<territories>
 			<territory type="001">maailm</territory>
@@ -652,16 +807,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="015">Põhja-Aafrika</territory>
 			<territory type="017">Kesk-Aafrika</territory>
 			<territory type="018">Lõuna-Aafrika</territory>
-			<territory type="019">Ameerika maailmajagu</territory>
+			<territory type="019">Ameerika</territory>
 			<territory type="021">Ameerika põhjaosa</territory>
-			<territory type="029">Kariibi meri</territory>
+			<territory type="029">Kariibi piirkond</territory>
 			<territory type="030">Ida-Aasia</territory>
 			<territory type="034">Lõuna-Aasia</territory>
 			<territory type="035">Kagu-Aasia</territory>
 			<territory type="039">Lõuna-Euroopa</territory>
 			<territory type="053">Australaasia</territory>
 			<territory type="054">Melaneesia</territory>
-			<territory type="057">Mikroneesia</territory>
+			<territory type="057">Mikroneesia (piirkond)</territory>
 			<territory type="061">Polüneesia</territory>
 			<territory type="142">Aasia</territory>
 			<territory type="143">Kesk-Aasia</territory>
@@ -679,7 +834,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albaania</territory>
 			<territory type="AM">Armeenia</territory>
-			<territory type="AN">Hollandi Antillid</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antarktis</territory>
 			<territory type="AR">Argentina</territory>
@@ -715,8 +869,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CD">Kongo DV</territory>
 			<territory type="CD" alt="variant">Kongo-Kinshasa</territory>
 			<territory type="CF">Kesk-Aafrika Vabariik</territory>
-			<territory type="CG">Kongo-Brazzaville</territory>
-			<territory type="CG" alt="variant">Kongo (Vabariik)</territory>
+			<territory type="CG">Kongo Vabariik</territory>
+			<territory type="CG" alt="variant">Kongo-Brazzaville</territory>
 			<territory type="CH">Šveits</territory>
 			<territory type="CI">Côte d’Ivoire</territory>
 			<territory type="CI" alt="variant">Elevandiluurannik</territory>
@@ -752,13 +906,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="FI">Soome</territory>
 			<territory type="FJ">Fidži</territory>
 			<territory type="FK">Falklandi saared</territory>
-			<territory type="FK" alt="variant">Falklandi saared (Malviini saared)</territory>
-			<territory type="FM">Mikroneesia Liiduriigid</territory>
+			<territory type="FK" alt="variant">Malviini saared</territory>
+			<territory type="FM">Mikroneesia</territory>
 			<territory type="FO">Fääri saared</territory>
 			<territory type="FR">Prantsusmaa</territory>
 			<territory type="GA">Gabon</territory>
 			<territory type="GB">Suurbritannia</territory>
-			<territory type="GB" alt="short">Suurbritannia</territory>
+			<territory type="GB" alt="short">ÜK</territory>
 			<territory type="GD">Grenada</territory>
 			<territory type="GE">Gruusia</territory>
 			<territory type="GF">Prantsuse Guajaana</territory>
@@ -776,7 +930,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GU">Guam</territory>
 			<territory type="GW">Guinea-Bissau</territory>
 			<territory type="GY">Guyana</territory>
-			<territory type="HK">Hongkong - Hiina erihalduspiirkond</territory>
+			<territory type="HK">Hongkongi erihalduspiirkond</territory>
 			<territory type="HK" alt="short">Hongkong</territory>
 			<territory type="HM">Heardi ja McDonaldi saared</territory>
 			<territory type="HN">Honduras</territory>
@@ -798,7 +952,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="JM">Jamaica</territory>
 			<territory type="JO">Jordaania</territory>
 			<territory type="JP">Jaapan</territory>
-			<territory type="KE">Kenya</territory>
+			<territory type="KE">Keenia</territory>
 			<territory type="KG">Kõrgõzstan</territory>
 			<territory type="KH">Kambodža</territory>
 			<territory type="KI">Kiribati</territory>
@@ -824,14 +978,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="MC">Monaco</territory>
 			<territory type="MD">Moldova</territory>
 			<territory type="ME">Montenegro</territory>
-			<territory type="MF">Saint Martin</territory>
+			<territory type="MF">Saint-Martin</territory>
 			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Marshalli saared</territory>
+			<territory type="MH">Marshalli Saared</territory>
 			<territory type="MK">Makedoonia</territory>
+			<territory type="MK" alt="variant">Makedoonia Vabariik</territory>
 			<territory type="ML">Mali</territory>
 			<territory type="MM">Myanmar (Birma)</territory>
 			<territory type="MN">Mongoolia</territory>
-			<territory type="MO">Macau - Hiina erihalduspiirkond</territory>
+			<territory type="MO">Macau erihalduspiirkond</territory>
 			<territory type="MO" alt="short">Macau</territory>
 			<territory type="MP">Põhja-Mariaanid</territory>
 			<territory type="MQ">Martinique</territory>
@@ -909,6 +1064,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="TJ">Tadžikistan</territory>
 			<territory type="TK">Tokelau</territory>
 			<territory type="TL">Ida-Timor</territory>
+			<territory type="TL" alt="variant">Timor-Leste</territory>
 			<territory type="TM">Türkmenistan</territory>
 			<territory type="TN">Tuneesia</territory>
 			<territory type="TO">Tonga</territory>
@@ -943,19 +1099,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</territories>
 		<variants>
 			<variant type="1901">saksa traditsiooniline kirjaviis</variant>
-			<variant type="1994">standardiseeritud Resia ortograafia</variant>
+			<variant type="1994">normitud Resia kirjaviis</variant>
 			<variant type="1996">saksa reformitud kirjaviis</variant>
-			<variant type="1606NICT">hiline kesk-prantsuse kuni 1606</variant>
+			<variant type="1606NICT">hiliskeskprantsuse (kuni 1606)</variant>
 			<variant type="1694ACAD">varajane moodne prantsuse</variant>
 			<variant type="1959ACAD">akadeemiline</variant>
-			<variant type="AREVELA">ida-armeenia</variant>
-			<variant type="AREVMDA">lääne-armeenia</variant>
+			<variant type="ALALC97">ALA-LC latinisatsioon (1997)</variant>
+			<variant type="AREVELA">idaarmeenia</variant>
+			<variant type="AREVMDA">läänearmeenia</variant>
 			<variant type="BAKU1926">ühtlustatud türgi-ladina tähestik</variant>
 			<variant type="BISKE">San Giorgio/Bila murre</variant>
 			<variant type="BOONT">boontlingi</variant>
+			<variant type="EKAVSK">štokavi e-line murrak</variant>
 			<variant type="FONIPA">IPA foneetika</variant>
 			<variant type="FONUPA">UPA foneetika</variant>
-			<variant type="KKCOR">üldlevinud ortograafia</variant>
+			<variant type="HEPBURN">Hepburni latinisatsioon</variant>
+			<variant type="IJEKAVSK">štokavi ije-line murrak</variant>
+			<variant type="KKCOR">üldlevinud kirjaviis</variant>
+			<variant type="KSCOR">normitud kirjaviis</variant>
 			<variant type="LIPAW">Resia Lipovaz’i murre</variant>
 			<variant type="MONOTON">monotoonne</variant>
 			<variant type="NEDIS">Natisone murre</variant>
@@ -974,125 +1135,159 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<variant type="UCCOR">ühtlustatud ortograafia</variant>
 			<variant type="UCRCOR">ühtlustatud redigeeritud ortograafia</variant>
 			<variant type="VALENCIA">valentsia</variant>
-			<variant type="WADEGILE">Wade-Giles</variant>
+			<variant type="WADEGILE">Wade’i-Gilesi latinisatsioon</variant>
 		</variants>
 		<keys>
 			<key type="calendar">kalender</key>
-			<key type="colAlternate">Sortimine sümboleid eirates</key>
-			<key type="colBackwards">Vastupidine sortimine rõhumärkide alusel</key>
-			<key type="colCaseFirst">Suur-/väiketähtede järjestus</key>
-			<key type="colCaseLevel">Tõstutundlik sortimine</key>
-			<key type="colHiraganaQuaternary">Sortimine kana kirjasüsteemi alusel</key>
-			<key type="collation">Sortimisjärjestus</key>
-			<key type="colNormalization">Normeeritud sortimine</key>
-			<key type="colNumeric">Sortimine numbrite alusel</key>
-			<key type="colStrength">Sortimisalus</key>
+			<key type="colAlternate">sümbolite eiramine järjestuses</key>
+			<key type="colBackwards">diakriitikute pöördjärjestus</key>
+			<key type="colCaseFirst">suur- ja väiketähe järjestus</key>
+			<key type="colCaseLevel">järjestuse tõstutundlikkus</key>
+			<key type="colHiraganaQuaternary">kana kirja järjestus</key>
+			<key type="collation">sortimisjärjestus</key>
+			<key type="colNormalization">normaliseeritud järjestus</key>
+			<key type="colNumeric">numbrite järjestus</key>
+			<key type="colStrength">järjestuskaalud</key>
 			<key type="currency">vääring</key>
-			<key type="numbers">Numbrid</key>
-			<key type="timezone">Ajavöönd</key>
-			<key type="va">Lokaadi variant</key>
-			<key type="variableTop">Sümbolite alusel sortimine</key>
-			<key type="x">Erakasutus</key>
+			<key type="hc">12 või 24 tunni süsteem</key>
+			<key type="lb">reavahetuse laad</key>
+			<key type="ms">mõõdustik</key>
+			<key type="numbers">numbrid</key>
+			<key type="timezone">ajavöönd</key>
+			<key type="va">lokaadi variant</key>
+			<key type="variableTop">sümbolite alusel järjestamine</key>
+			<key type="x">erakasutus</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Araabia-indic numbrid</type>
-			<type type="arabext" key="numbers">Laiendatud araabia-indic numbrid</type>
-			<type type="armn" key="numbers">Armeenia numbrid</type>
-			<type type="armnlow" key="numbers">Armeenia numbrid väikeste tähtedega</type>
-			<type type="beng" key="numbers">Bengali numbrid</type>
-			<type type="big5han" key="collation">hiina traditsiooniline - big5</type>
-			<type type="buddhist" key="calendar">budistlik kalender</type>
-			<type type="chinese" key="calendar">Hiina kalender</type>
-			<type type="coptic" key="calendar">Kopti kalender</type>
-			<type type="dangi" key="calendar">dangi kalender</type>
-			<type type="deva" key="numbers">Devanagari numbrid</type>
-			<type type="dictionary" key="collation">Sõnastiku sortimisjärjestus</type>
-			<type type="ducet" key="collation">Unicode’i sortimise vaikejärjestus</type>
-			<type type="eor" key="collation" draft="unconfirmed">sortimisjärjestuse mitmekeelne Euroopa dokumendid</type>
-			<type type="ethi" key="numbers">Etioopia numbrid</type>
-			<type type="ethiopic" key="calendar">Etioopia kalender</type>
-			<type type="ethiopic-amete-alem" key="calendar">Etioopia amete alemi kalender</type>
-			<type type="finance" key="numbers">Finantsarvud</type>
-			<type type="fullwide" key="numbers">Täislaiusega numbrid</type>
-			<type type="gb2312han" key="collation">hiina lihtsustatud - GB2312</type>
-			<type type="geor" key="numbers">Gruusia numbrid</type>
-			<type type="gregorian" key="calendar">Gregoriuse kalender</type>
-			<type type="grek" key="numbers">Kreeka numbrid</type>
-			<type type="greklow" key="numbers">Kreeka väiketähelised numbrid</type>
-			<type type="gujr" key="numbers">Gudžarati numbrid</type>
-			<type type="guru" key="numbers">Gurmukhi numbrid</type>
-			<type type="hanidec" key="numbers">Hiina kümnendnumbrid</type>
-			<type type="hans" key="numbers">Lihtsustatud hiina keele numbrid</type>
-			<type type="hansfin" key="numbers">Lihtsustatud hiina keele finantsnumbrid</type>
-			<type type="hant" key="numbers">Traditsioonilise hiina keele numbrid</type>
-			<type type="hantfin" key="numbers">Traditsioonilise hiina keele finantsnumbrid</type>
-			<type type="hebr" key="numbers">Heebrea numbrid</type>
-			<type type="hebrew" key="calendar">juudi kalender</type>
-			<type type="identical" key="colStrength">Sordi kõik</type>
-			<type type="indian" key="calendar">India rahvuslik</type>
-			<type type="islamic" key="calendar">islamikalender</type>
-			<type type="islamic-civil" key="calendar">islami ilmalik kalender</type>
-			<type type="iso8601" key="calendar">ISO-8601 kalender</type>
-			<type type="japanese" key="calendar">Jaapani kalender</type>
-			<type type="jpan" key="numbers">Jaapani numbrid</type>
-			<type type="jpanfin" key="numbers">Jaapani rahandusnumeraalid</type>
-			<type type="khmr" key="numbers">Khmeri numbrid</type>
-			<type type="knda" key="numbers">Kannada numbrid</type>
-			<type type="laoo" key="numbers">Lao numbrid</type>
-			<type type="latn" key="numbers">Ladina numbrid</type>
-			<type type="lower" key="colCaseFirst">Järjestus alates väiketähtedest</type>
-			<type type="mlym" key="numbers">Malayalami numbrid</type>
-			<type type="mong" key="numbers">Mongoolia numbrid</type>
-			<type type="mymr" key="numbers">Myanmari numbrid</type>
-			<type type="native" key="numbers">Kohalik numbrisüsteem</type>
-			<type type="no" key="colBackwards">Tavajärjestuses rõhumärkide alusel</type>
-			<type type="no" key="colCaseFirst">Tõstutundlikkuse alusel sortimine</type>
-			<type type="no" key="colCaseLevel">Tõstutundlikkuseta sortimine</type>
-			<type type="no" key="colHiraganaQuaternary">Kana-kirjasüsteemi eraldi sortimine</type>
-			<type type="no" key="colNormalization">Normeerimata sortimine</type>
-			<type type="no" key="colNumeric">Numbrite eraldi sortimine</type>
-			<type type="non-ignorable" key="colAlternate">Sümbolite sortimine</type>
-			<type type="orya" key="numbers">Oria numbrid</type>
-			<type type="persian" key="calendar">Pärsia kalender</type>
-			<type type="phonebook" key="collation">telefoniraamat</type>
-			<type type="phonetic" key="collation">Foneetiline sortimisjärjestus</type>
-			<type type="pinyin" key="collation">hiina lihtsustatud - pinyin järjekorras</type>
-			<type type="primary" key="colStrength">Ainult põhitähestiku alusel sortimine</type>
-			<type type="quaternary" key="colStrength">Rõhumärkide/algustähe/laiuse/kana-süsteemi alusel sortimine</type>
-			<type type="reformed" key="collation">Reformitud sortimisjärjestus</type>
-			<type type="roc" key="calendar">Hiina Vabariigi kalender</type>
-			<type type="roman" key="numbers">Rooma numbrid</type>
-			<type type="romanlow" key="numbers">Rooma numbrid väikeste tähtedega</type>
-			<type type="search" key="collation">Üldeesmärgiline otsing</type>
-			<type type="searchjl" key="collation">Otsing hanguli alguskonsonandi alusel</type>
-			<type type="secondary" key="colStrength">Rõhumärkide sortimine</type>
-			<type type="shifted" key="colAlternate">Sordi sümboleid eirates</type>
-			<type type="standard" key="collation">Standardne sortimisjärjestus</type>
-			<type type="stroke" key="collation">elementide kirjutamise järjekorras</type>
-			<type type="taml" key="numbers">Tamili numbrid</type>
-			<type type="tamldec" key="numbers">Tamili numbrid</type>
-			<type type="telu" key="numbers">Telugu numbrid</type>
-			<type type="tertiary" key="colStrength">Rõhumärkide/algustähe/laiuse alusel sortimine</type>
-			<type type="thai" key="numbers">Tai numbrid</type>
-			<type type="tibt" key="numbers">Tiibeti numbrid</type>
-			<type type="traditional" key="collation">traditsiooniline</type>
-			<type type="traditional" key="numbers">Traditsiooniline numbrisüsteem</type>
-			<type type="unihan" key="collation">Radikaal-kriipsude sortimisjärjestus</type>
-			<type type="upper" key="colCaseFirst">Järjestus alates suurtähtedest</type>
-			<type type="vaii" key="numbers">Vai numbrisüsteem</type>
-			<type type="yes" key="colBackwards">Vastupidine sortimine rõhumärkide alusel</type>
-			<type type="yes" key="colCaseLevel">Tõstutundlikkuse alusel sortimine</type>
-			<type type="yes" key="colHiraganaQuaternary">Kana-kirjasüsteemi sortimine eraldi</type>
-			<type type="yes" key="colNormalization">Normeeritud Unicode’i alusel sortimine</type>
-			<type type="yes" key="colNumeric">Numbrite alusel sortimine</type>
+			<type key="calendar" type="buddhist">budistlik kalender</type>
+			<type key="calendar" type="chinese">Hiina kalender</type>
+			<type key="calendar" type="coptic">kopti kalender</type>
+			<type key="calendar" type="dangi">dangi kalender</type>
+			<type key="calendar" type="ethiopic">Etioopia kalender</type>
+			<type key="calendar" type="ethiopic-amete-alem">Etioopia amete alemi kalender</type>
+			<type key="calendar" type="gregorian">Gregoriuse kalender</type>
+			<type key="calendar" type="hebrew">juudi kalender</type>
+			<type key="calendar" type="indian">India rahvuslik kalender</type>
+			<type key="calendar" type="islamic">islamikalender</type>
+			<type key="calendar" type="islamic-civil">islami ilmalik kalender</type>
+			<type key="calendar" type="iso8601">ISO-8601 kalender</type>
+			<type key="calendar" type="japanese">Jaapani kalender</type>
+			<type key="calendar" type="persian">Pärsia kalender</type>
+			<type key="calendar" type="roc">Hiina Vabariigi kalender</type>
+			<type key="colAlternate" type="non-ignorable">järjesta sümbolid</type>
+			<type key="colAlternate" type="shifted">eira järjestuses sümboleid</type>
+			<type key="colBackwards" type="no">diakriitikud tavajärjestuses</type>
+			<type key="colBackwards" type="yes">diakriitikud pöördjärjestuses</type>
+			<type key="colCaseFirst" type="lower">väiketäht järjestuses eespool</type>
+			<type key="colCaseFirst" type="no">harilik järjestus</type>
+			<type key="colCaseFirst" type="upper">suurtäht järjestuses eespool</type>
+			<type key="colCaseLevel" type="no">tõstutundetu järjestus</type>
+			<type key="colCaseLevel" type="yes">tõstutundlik järjestus</type>
+			<type key="colHiraganaQuaternary" type="no">järjesta kana eraldi</type>
+			<type key="colHiraganaQuaternary" type="yes">järjesta kana erinevalt</type>
+			<type key="collation" type="big5han">hiina traditsiooniline sortimisjärjestus (Big5)</type>
+			<type key="collation" type="compat">varasem sortimisjärjestus (ühilduvuse jaoks)</type>
+			<type key="collation" type="dictionary">sõnastiku sortimisjärjestus</type>
+			<type key="collation" type="ducet">Unicode’i sortimise vaikejärjestus</type>
+			<type key="collation" type="emoji">emoji sortimisjärjestus</type>
+			<type key="collation" type="eor">Euroopa järjestusreeglid</type>
+			<type key="collation" type="gb2312han">hiina lihtsustatud sortimisjärjestus (GB2312)</type>
+			<type key="collation" type="phonebook">telefoniraamatu sortimisjärjestus</type>
+			<type key="collation" type="phonetic">foneetiline sortimisjärjestus</type>
+			<type key="collation" type="pinyin">pinyin’i sortimisjärjestus</type>
+			<type key="collation" type="reformed">reformitud sortimisjärjestus</type>
+			<type key="collation" type="search">üldeesmärgiline otsing</type>
+			<type key="collation" type="searchjl">otsing korea alguskonsonandi järgi</type>
+			<type key="collation" type="standard">standardne sortimisjärjestus</type>
+			<type key="collation" type="stroke">kriipsude sortimisjärjestus</type>
+			<type key="collation" type="traditional">traditsiooniline sortimisjärjestus</type>
+			<type key="collation" type="unihan">võtmete-kriipsude sortimisjärjestus</type>
+			<type key="collation" type="zhuyin">zhuyin’i sortimisjärjestus</type>
+			<type key="colNormalization" type="no">järjesta normaliseerimata</type>
+			<type key="colNormalization" type="yes">järjesta Unicode’i normaliseerimisega</type>
+			<type key="colNumeric" type="no">järjesta numbrid eraldi</type>
+			<type key="colNumeric" type="yes">järjesta numbrid arvuliselt</type>
+			<type key="colStrength" type="identical">järjesta kõik</type>
+			<type key="colStrength" type="primary">järjesta ainult alustähed</type>
+			<type key="colStrength" type="quaternary">järjesta diakriitikud, algustähed, laius ja kana kiri</type>
+			<type key="colStrength" type="secondary">järjesta diakriitikud</type>
+			<type key="colStrength" type="tertiary">järjesta diakriitikud, algustähed ja laius</type>
+			<type key="hc" type="h11">12-tunnine süsteem (0–11)</type>
+			<type key="hc" type="h12">12-tunnine süsteem (1–12)</type>
+			<type key="hc" type="h23">24-tunnine süsteem (0–23)</type>
+			<type key="hc" type="h24">24-tunnine süsteem (1–24)</type>
+			<type key="lb" type="loose">paindlik reavahetuse laad</type>
+			<type key="lb" type="normal">harilik reavahetuse laad</type>
+			<type key="lb" type="strict">jäik reavahetuse laad</type>
+			<type key="ms" type="metric">meetermõõdustik</type>
+			<type key="ms" type="uksystem">inglise mõõdustik</type>
+			<type key="ms" type="ussystem">USA mõõdustik</type>
+			<type key="numbers" type="arab">idaaraabia numbrid</type>
+			<type key="numbers" type="arabext">laiendatud idaaraabia numbrid</type>
+			<type key="numbers" type="armn">armeenia numbrid</type>
+			<type key="numbers" type="armnlow">väiketähelised armeenia numbrid</type>
+			<type key="numbers" type="bali">bali numbrid</type>
+			<type key="numbers" type="beng">bengali numbrid</type>
+			<type key="numbers" type="brah">braahmi numbrid</type>
+			<type key="numbers" type="cakm">tšaakma numbrid</type>
+			<type key="numbers" type="cham">tšaami numbrid</type>
+			<type key="numbers" type="deva">devanaagari numbrid</type>
+			<type key="numbers" type="ethi">etioopia numbrid</type>
+			<type key="numbers" type="finance">finantsnumbrid</type>
+			<type key="numbers" type="fullwide">täislaiusega numbrid</type>
+			<type key="numbers" type="geor">gruusia numbrid</type>
+			<type key="numbers" type="grek">kreeka numbrid</type>
+			<type key="numbers" type="greklow">väiketähelised kreeka numbrid</type>
+			<type key="numbers" type="gujr">gudžarati numbrid</type>
+			<type key="numbers" type="guru">gurmukhi numbrid</type>
+			<type key="numbers" type="hanidec">hiina kümnendnumbrid</type>
+			<type key="numbers" type="hans">lihtsustatud hiina keele numbrid</type>
+			<type key="numbers" type="hansfin">lihtsustatud hiina keele finantsnumbrid</type>
+			<type key="numbers" type="hant">traditsioonilise hiina keele numbrid</type>
+			<type key="numbers" type="hantfin">traditsioonilise hiina keele finantsnumbrid</type>
+			<type key="numbers" type="hebr">heebrea numbrid</type>
+			<type key="numbers" type="java">jaava numbrid</type>
+			<type key="numbers" type="jpan">jaapani numbrid</type>
+			<type key="numbers" type="jpanfin">jaapani finantsnumbrid</type>
+			<type key="numbers" type="kali">kaja-lii numbrid</type>
+			<type key="numbers" type="khmr">khmeeri numbrid</type>
+			<type key="numbers" type="knda">kannada numbrid</type>
+			<type key="numbers" type="laoo">lao numbrid</type>
+			<type key="numbers" type="latn">araabia numbrid</type>
+			<type key="numbers" type="lepc">leptša numbrid</type>
+			<type key="numbers" type="limb">limbu numbrid</type>
+			<type key="numbers" type="mlym">malajalami numbrid</type>
+			<type key="numbers" type="mong">mongoli numbrid</type>
+			<type key="numbers" type="mtei">meitei numbrid</type>
+			<type key="numbers" type="mymr">birma numbrid</type>
+			<type key="numbers" type="native">kohalikud numbrid</type>
+			<type key="numbers" type="nkoo">nkoo numbrid</type>
+			<type key="numbers" type="olck">santali numbrid</type>
+			<type key="numbers" type="orya">oria numbrid</type>
+			<type key="numbers" type="osma">osmani numbrid</type>
+			<type key="numbers" type="roman">Rooma numbrid</type>
+			<type key="numbers" type="romanlow">väiketähelised Rooma numbrid</type>
+			<type key="numbers" type="saur">sauraštra numbrid</type>
+			<type key="numbers" type="shrd">šaarada numbrid</type>
+			<type key="numbers" type="sora">sora numbrid</type>
+			<type key="numbers" type="sund">sunda numbrid</type>
+			<type key="numbers" type="takr">taakri numbrid</type>
+			<type key="numbers" type="talu">uue tai-lõõ numbrid</type>
+			<type key="numbers" type="taml">traditsioonilised tamili numbrid</type>
+			<type key="numbers" type="tamldec">tamili numbrid</type>
+			<type key="numbers" type="telu">telugu numbrid</type>
+			<type key="numbers" type="thai">tai numbrid</type>
+			<type key="numbers" type="tibt">tiibeti numbrid</type>
+			<type key="numbers" type="traditional">traditsioonilised numbrid</type>
+			<type key="numbers" type="vaii">vai numbrid</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN">BGN</transformName>
 			<transformName type="Numeric">Numbriline</transformName>
 			<transformName type="Tone">Toon</transformName>
 			<transformName type="UNGEGN">UNGEGN</transformName>
-			<transformName type="x-Accents">Aktsendid</transformName>
-			<transformName type="x-Fullwidth">Täislai</transformName>
+			<transformName type="x-Accents">Diakriitikud</transformName>
+			<transformName type="x-Fullwidth">Täislaius</transformName>
 			<transformName type="x-Halfwidth">Poolaius</transformName>
 			<transformName type="x-Jamo">Jamo</transformName>
 			<transformName type="x-Pinyin">Pinyin</transformName>
@@ -1101,12 +1296,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<measurementSystemNames>
 			<measurementSystemName type="metric">meetermõõdustik</measurementSystemName>
 			<measurementSystemName type="UK">inglise mõõdustik</measurementSystemName>
-			<measurementSystemName type="US">inglise mõõdustik</measurementSystemName>
+			<measurementSystemName type="US">USA mõõdustik</measurementSystemName>
 		</measurementSystemNames>
 		<codePatterns>
 			<codePattern type="language">Keel: {0}</codePattern>
-			<codePattern type="script">Skript: {0}</codePattern>
-			<codePattern type="territory">Regioon: {0}</codePattern>
+			<codePattern type="script">Kiri: {0}</codePattern>
+			<codePattern type="territory">Piirkond: {0}</codePattern>
 		</codePatterns>
 	</localeDisplayNames>
 	<characters>
@@ -1155,12 +1350,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, 'kell' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, 'kell' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
@@ -1175,6 +1370,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -1226,8 +1422,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hm">
-							<greatestDifference id="H">HH.mm–HH.mm</greatestDifference>
-							<greatestDifference id="m">HH.mm–HH.mm</greatestDifference>
+							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
 							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
@@ -1235,7 +1431,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H">HH.mm–HH.mm v</greatestDifference>
+							<greatestDifference id="H">HH:mm–HH:mm v</greatestDifference>
 							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
@@ -1253,19 +1449,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">dd.MM–dd.MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd.MM–E, dd.MM</greatestDifference>
-							<greatestDifference id="M">E, dd.MM–E, dd.MM</greatestDifference>
+							<greatestDifference id="d">E, dd.MM – E, dd.MM</greatestDifference>
+							<greatestDifference id="M">E, dd.MM – E, dd.MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
 							<greatestDifference id="M">MMM–MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">d.–d. MMM</greatestDifference>
-							<greatestDifference id="M">d. MMM–d. MMM</greatestDifference>
+							<greatestDifference id="M">d. MMM – d. MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d. MMM–E, d. MMM</greatestDifference>
-							<greatestDifference id="M">E, d. MMM–E, d. MMM</greatestDifference>
+							<greatestDifference id="d">E, d. MMM – E, d. MMM</greatestDifference>
+							<greatestDifference id="M">E, d. MMM – E, d. MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
 							<greatestDifference id="y">y–y G</greatestDifference>
@@ -1280,23 +1476,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="y">dd.MM.y–dd.MM.y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, dd.MM.y–E, dd.MM.y G</greatestDifference>
-							<greatestDifference id="M">E, dd.MM.y–E, dd.MM.y G</greatestDifference>
-							<greatestDifference id="y">E, dd.MM.y–E, dd.MM.y G</greatestDifference>
+							<greatestDifference id="d">E, dd.MM.y – E, dd.MM.y G</greatestDifference>
+							<greatestDifference id="M">E, dd.MM.y – E, dd.MM.y G</greatestDifference>
+							<greatestDifference id="y">E, dd.MM.y – E, dd.MM.y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
 							<greatestDifference id="M">MMM–MMM y G</greatestDifference>
-							<greatestDifference id="y">MMM y–MMM y G</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
 							<greatestDifference id="d">d.–d. MMM y G</greatestDifference>
-							<greatestDifference id="M">d. MMM–d. MMM y G</greatestDifference>
-							<greatestDifference id="y">d. MMM y–d. MMM y G</greatestDifference>
+							<greatestDifference id="M">d. MMM – d. MMM y G</greatestDifference>
+							<greatestDifference id="y">d. MMM y – d. MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d. MMM–E, d. MMM y G</greatestDifference>
-							<greatestDifference id="M">E, d. MMM–E, d. MMM y G</greatestDifference>
-							<greatestDifference id="y">E, d. MMM y–E, d. MMM y G</greatestDifference>
+							<greatestDifference id="d">E, d. MMM – E, d. MMM y G</greatestDifference>
+							<greatestDifference id="M">E, d. MMM – E, d. MMM y G</greatestDifference>
+							<greatestDifference id="y">E, d. MMM y – E, d. MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
 							<greatestDifference id="M">MMMM–MMMM y G</greatestDifference>
@@ -1519,39 +1715,61 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am">e.k.</dayPeriod>
-							<dayPeriod type="pm">p.k.</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">keskööl</dayPeriod>
 							<dayPeriod type="am">a</dayPeriod>
 							<dayPeriod type="noon">n</dayPeriod>
 							<dayPeriod type="pm">p</dayPeriod>
+							<dayPeriod type="morning1">hommikul</dayPeriod>
+							<dayPeriod type="afternoon1">pärastlõunal</dayPeriod>
+							<dayPeriod type="evening1">õhtul</dayPeriod>
+							<dayPeriod type="night1">öösel</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">keskööl</dayPeriod>
 							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="noon">keskpäev</dayPeriod>
+							<dayPeriod type="noon">keskpäeval</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">hommikul</dayPeriod>
+							<dayPeriod type="afternoon1">pärastlõunal</dayPeriod>
+							<dayPeriod type="evening1">õhtul</dayPeriod>
+							<dayPeriod type="night1">öösel</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">kesköö</dayPeriod>
+							<dayPeriod type="am" draft="provisional">AM</dayPeriod>
+							<dayPeriod type="noon">keskpäev</dayPeriod>
+							<dayPeriod type="pm" draft="provisional">PM</dayPeriod>
+							<dayPeriod type="morning1">hommik</dayPeriod>
+							<dayPeriod type="afternoon1">pärastlõuna</dayPeriod>
+							<dayPeriod type="evening1">õhtu</dayPeriod>
+							<dayPeriod type="night1">öö</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
-						<era type="0">enne meie aega</era>
+						<era type="0">enne Kristust</era>
 						<era type="0" alt="variant">enne meie ajaarvamist</era>
-						<era type="1">meie aja järgi</era>
+						<era type="1">pärast Kristust</era>
 						<era type="1" alt="variant">meie ajaarvamise järgi</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0">e.m.a.</era>
-						<era type="0" alt="variant">EMA</era>
-						<era type="1">m.a.j.</era>
-						<era type="1" alt="variant">MA</era>
+						<era type="0">eKr</era>
+						<era type="0" alt="variant">e.m.a</era>
+						<era type="1">pKr</era>
+						<era type="1" alt="variant">m.a.j</era>
 					</eraAbbr>
 					<eraNarrow>
-						<era type="0">e.m.a.</era>
-						<era type="0" alt="variant" draft="unconfirmed">ema</era>
-						<era type="1">m.a.j.</era>
-						<era type="1" alt="variant" draft="unconfirmed">maj</era>
+						<era type="0">eKr</era>
+						<era type="0" alt="variant">e.m.a</era>
+						<era type="1">pKr</era>
+						<era type="1" alt="variant">m.a.j</era>
 					</eraNarrow>
 				</eras>
 				<dateFormats>
@@ -1625,8 +1843,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
-						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="Ehms">E h:mm.ss a</dateFormatItem>
+						<dateFormatItem id="EHms">E HH:mm.ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
@@ -1637,6 +1855,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm.ss a</dateFormatItem>
 						<dateFormatItem id="Hms">H:mm.ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm.ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm.ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">M</dateFormatItem>
 						<dateFormatItem id="Md">d.M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.M</dateFormatItem>
@@ -1650,7 +1872,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">M.y</dateFormatItem>
 						<dateFormatItem id="yMd">d.M.y</dateFormatItem>
-						<dateFormatItem id="yMEd">E, d.M y</dateFormatItem>
+						<dateFormatItem id="yMEd">E, d.M.y</dateFormatItem>
 						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMd">d. MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMEd">E, d. MMMM y</dateFormatItem>
@@ -1679,8 +1901,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hm">
-							<greatestDifference id="H">HH.mm–HH.mm</greatestDifference>
-							<greatestDifference id="m">HH.mm–HH.mm</greatestDifference>
+							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
 							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
@@ -1688,7 +1910,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H">HH.mm–HH.mm v</greatestDifference>
+							<greatestDifference id="H">HH:mm–HH:mm v</greatestDifference>
 							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
@@ -1706,19 +1928,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">dd.MM–dd.MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd.MM–E, dd.MM</greatestDifference>
-							<greatestDifference id="M">E, dd.MM–E, dd.MM</greatestDifference>
+							<greatestDifference id="d">E, dd.MM – E, dd.MM</greatestDifference>
+							<greatestDifference id="M">E, dd.MM – E, dd.MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
 							<greatestDifference id="M">MMM–MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">d.–d. MMM</greatestDifference>
-							<greatestDifference id="M">d. MMM–d. MMM</greatestDifference>
+							<greatestDifference id="M">d. MMM – d. MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d. MMM–E, d. MMM</greatestDifference>
-							<greatestDifference id="M">E, d. MMM–E, d. MMM</greatestDifference>
+							<greatestDifference id="d">E, d. MMM – E, d. MMM</greatestDifference>
+							<greatestDifference id="M">E, d. MMM – E, d. MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
 							<greatestDifference id="y">y–y</greatestDifference>
@@ -1733,23 +1955,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="y">dd.MM.y–dd.MM.y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, dd.MM.y–E, dd.MM.y</greatestDifference>
-							<greatestDifference id="M">E, dd.MM.y–E, dd.MM.y</greatestDifference>
-							<greatestDifference id="y">E, dd.MM.y–E, dd.MM.y</greatestDifference>
+							<greatestDifference id="d">E, dd.MM.y – E, dd.MM.y</greatestDifference>
+							<greatestDifference id="M">E, dd.MM.y – E, dd.MM.y</greatestDifference>
+							<greatestDifference id="y">E, dd.MM.y – E, dd.MM.y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
 							<greatestDifference id="M">MMM–MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y–MMM y</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
 							<greatestDifference id="d">d.–d. MMM y</greatestDifference>
-							<greatestDifference id="M">d. MMM–d. MMM y</greatestDifference>
-							<greatestDifference id="y">d. MMM y–d. MMM y</greatestDifference>
+							<greatestDifference id="M">d. MMM – d. MMM y</greatestDifference>
+							<greatestDifference id="y">d. MMM y – d. MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d. MMM–E, d. MMM y</greatestDifference>
-							<greatestDifference id="M">E, d. MMM–E, d. MMM y</greatestDifference>
-							<greatestDifference id="y">E, d. MMM y–E, d. MMM y</greatestDifference>
+							<greatestDifference id="d">E, d. MMM – E, d. MMM y</greatestDifference>
+							<greatestDifference id="M">E, d. MMM – E, d. MMM y</greatestDifference>
+							<greatestDifference id="y">E, d. MMM y – E, d. MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
 							<greatestDifference id="M">MMMM–MMMM y</greatestDifference>
@@ -1800,7 +2022,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="quarter">
-				<displayName>Kvartal</displayName>
+				<displayName>kvartal</displayName>
+				<relative type="-1">eelmine kvartal</relative>
+				<relative type="0">käesolev kvartal</relative>
+				<relative type="1">järgmine kvartal</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} kvartali pärast</relativeTimePattern>
 					<relativeTimePattern count="other">{0} kvartali pärast</relativeTimePattern>
@@ -1812,6 +2037,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>kv</displayName>
+				<relative type="-1">eelmine kv</relative>
+				<relative type="0">käesolev kv</relative>
+				<relative type="1">järgmine kv</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} kv pärast</relativeTimePattern>
 					<relativeTimePattern count="other">{0} kv pärast</relativeTimePattern>
@@ -1823,6 +2051,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>kv</displayName>
+				<relative type="-1">eelmine kv</relative>
+				<relative type="0">käesolev kv</relative>
+				<relative type="1">järgmine kv</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} kv</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} kv</relativeTimePattern>
@@ -2067,23 +2298,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="hour-short">
 				<displayName>t</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} h pärast</relativeTimePattern>
-					<relativeTimePattern count="other">{0} h pärast</relativeTimePattern>
+					<relativeTimePattern count="one">{0} t pärast</relativeTimePattern>
+					<relativeTimePattern count="other">{0} t pärast</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} h tagasi</relativeTimePattern>
-					<relativeTimePattern count="other">{0} h tagasi</relativeTimePattern>
+					<relativeTimePattern count="one">{0} t tagasi</relativeTimePattern>
+					<relativeTimePattern count="other">{0} t tagasi</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-narrow">
 				<displayName>t</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} h pärast</relativeTimePattern>
-					<relativeTimePattern count="other">{0} h pärast</relativeTimePattern>
+					<relativeTimePattern count="one">{0} t pärast</relativeTimePattern>
+					<relativeTimePattern count="other">{0} t pärast</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} h tagasi</relativeTimePattern>
-					<relativeTimePattern count="other">{0} h tagasi</relativeTimePattern>
+					<relativeTimePattern count="one">{0} t tagasi</relativeTimePattern>
+					<relativeTimePattern count="other">{0} t tagasi</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute">
@@ -2134,12 +2365,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="second-short">
 				<displayName>sek</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} s pärast</relativeTimePattern>
-					<relativeTimePattern count="other">{0} s pärast</relativeTimePattern>
+					<relativeTimePattern count="one">{0} sek pärast</relativeTimePattern>
+					<relativeTimePattern count="other">{0} sek pärast</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} s tagasi</relativeTimePattern>
-					<relativeTimePattern count="other">{0} s tagasi</relativeTimePattern>
+					<relativeTimePattern count="one">{0} sek tagasi</relativeTimePattern>
+					<relativeTimePattern count="other">{0} sek tagasi</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second-narrow">
@@ -2158,7 +2389,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 		</fields>
 		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
+			<hourFormat>+HH:mm;−HH:mm</hourFormat>
 			<gmtFormat>GMT{0}</gmtFormat>
 			<gmtZeroFormat>GMT</gmtZeroFormat>
 			<regionFormat>({0})</regionFormat>
@@ -2166,7 +2397,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<regionFormat type="standard">{0} (+0)</regionFormat>
 			<fallbackFormat>{1} ({0})</fallbackFormat>
 			<zone type="Etc/Unknown">
-				<exemplarCity>määramata</exemplarCity>
+				<exemplarCity>määramata linn</exemplarCity>
 			</zone>
 			<zone type="Europe/Andorra">
 				<exemplarCity>Andorra</exemplarCity>
@@ -2184,7 +2415,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Anguilla</exemplarCity>
 			</zone>
 			<zone type="Europe/Tirane">
-				<exemplarCity>Tirane</exemplarCity>
+				<exemplarCity>Tirana</exemplarCity>
 			</zone>
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Jerevan</exemplarCity>
@@ -2223,7 +2454,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>McMurdo</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Rio Gallegos</exemplarCity>
+				<exemplarCity>Río Gallegos</exemplarCity>
 			</zone>
 			<zone type="America/Mendoza">
 				<exemplarCity>Mendoza</exemplarCity>
@@ -2250,10 +2481,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Jujuy</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tucuman</exemplarCity>
+				<exemplarCity>Tucumán</exemplarCity>
 			</zone>
 			<zone type="America/Cordoba">
-				<exemplarCity>Cordoba</exemplarCity>
+				<exemplarCity>Córdoba</exemplarCity>
 			</zone>
 			<zone type="America/Buenos_Aires">
 				<exemplarCity>Buenos Aires</exemplarCity>
@@ -2307,10 +2538,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Aruba</exemplarCity>
 			</zone>
 			<zone type="Europe/Mariehamn">
-				<exemplarCity>Mariehamn</exemplarCity>
+				<exemplarCity>Maarianhamina</exemplarCity>
 			</zone>
 			<zone type="Asia/Baku">
-				<exemplarCity>Baku</exemplarCity>
+				<exemplarCity>Bakuu</exemplarCity>
 			</zone>
 			<zone type="Europe/Sarajevo">
 				<exemplarCity>Sarajevo</exemplarCity>
@@ -2331,7 +2562,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Sofia</exemplarCity>
 			</zone>
 			<zone type="Asia/Bahrain">
-				<exemplarCity>Bahrain</exemplarCity>
+				<exemplarCity>Bahrein</exemplarCity>
 			</zone>
 			<zone type="Africa/Bujumbura">
 				<exemplarCity>Bujumbura</exemplarCity>
@@ -2355,7 +2586,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Kralendijk</exemplarCity>
 			</zone>
 			<zone type="America/Eirunepe">
-				<exemplarCity>Eirunepe</exemplarCity>
+				<exemplarCity>Eirunepé</exemplarCity>
 			</zone>
 			<zone type="America/Rio_Branco">
 				<exemplarCity>Rio Branco</exemplarCity>
@@ -2370,22 +2601,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Manaus</exemplarCity>
 			</zone>
 			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiaba</exemplarCity>
+				<exemplarCity>Cuiabá</exemplarCity>
 			</zone>
 			<zone type="America/Santarem">
-				<exemplarCity>Santarem</exemplarCity>
+				<exemplarCity>Santarém</exemplarCity>
 			</zone>
 			<zone type="America/Campo_Grande">
 				<exemplarCity>Campo Grande</exemplarCity>
 			</zone>
 			<zone type="America/Belem">
-				<exemplarCity>Belem</exemplarCity>
+				<exemplarCity>Belém</exemplarCity>
 			</zone>
 			<zone type="America/Araguaina">
-				<exemplarCity>Araguaina</exemplarCity>
+				<exemplarCity>Araguaína</exemplarCity>
 			</zone>
 			<zone type="America/Sao_Paulo">
-				<exemplarCity>Sao Paulo</exemplarCity>
+				<exemplarCity>São Paulo</exemplarCity>
 			</zone>
 			<zone type="America/Bahia">
 				<exemplarCity>Bahia</exemplarCity>
@@ -2394,7 +2625,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Fortaleza</exemplarCity>
 			</zone>
 			<zone type="America/Maceio">
-				<exemplarCity>Maceio</exemplarCity>
+				<exemplarCity>Maceió</exemplarCity>
 			</zone>
 			<zone type="America/Recife">
 				<exemplarCity>Recife</exemplarCity>
@@ -2496,7 +2727,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Blanc-Sablon</exemplarCity>
 			</zone>
 			<zone type="America/St_Johns">
-				<exemplarCity>St. John’s</exemplarCity>
+				<exemplarCity>Saint John’s</exemplarCity>
 			</zone>
 			<zone type="Indian/Cocos">
 				<exemplarCity>Cocos</exemplarCity>
@@ -2532,13 +2763,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Douala</exemplarCity>
 			</zone>
 			<zone type="Asia/Urumqi">
-				<exemplarCity>Urumqi</exemplarCity>
+				<exemplarCity>Ürümqi</exemplarCity>
 			</zone>
 			<zone type="Asia/Shanghai">
 				<exemplarCity>Shanghai</exemplarCity>
 			</zone>
 			<zone type="America/Bogota">
-				<exemplarCity>Bogota</exemplarCity>
+				<exemplarCity>Bogotá</exemplarCity>
 			</zone>
 			<zone type="America/Costa_Rica">
 				<exemplarCity>Costa Rica</exemplarCity>
@@ -2556,7 +2787,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Jõulusaar</exemplarCity>
 			</zone>
 			<zone type="Asia/Nicosia">
-				<exemplarCity>Nicosia</exemplarCity>
+				<exemplarCity>Nikosia</exemplarCity>
 			</zone>
 			<zone type="Europe/Prague">
 				<exemplarCity>Praha</exemplarCity>
@@ -2583,7 +2814,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Alžiir</exemplarCity>
 			</zone>
 			<zone type="Pacific/Galapagos">
-				<exemplarCity>Galapagos</exemplarCity>
+				<exemplarCity>Galápagos</exemplarCity>
 			</zone>
 			<zone type="America/Guayaquil">
 				<exemplarCity>Guayaquil</exemplarCity>
@@ -2610,7 +2841,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Madrid</exemplarCity>
 			</zone>
 			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>Addis Ababa</exemplarCity>
+				<exemplarCity>Addis Abeba</exemplarCity>
 			</zone>
 			<zone type="Europe/Helsinki">
 				<exemplarCity>Helsingi</exemplarCity>
@@ -2649,7 +2880,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Grenada</exemplarCity>
 			</zone>
 			<zone type="Asia/Tbilisi">
-				<exemplarCity>Tbilisi</exemplarCity>
+				<exemplarCity>Thbilisi</exemplarCity>
 			</zone>
 			<zone type="America/Cayenne">
 				<exemplarCity>Cayenne</exemplarCity>
@@ -2691,7 +2922,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Ateena</exemplarCity>
 			</zone>
 			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>South Georgia</exemplarCity>
+				<exemplarCity>Lõuna-Georgia</exemplarCity>
 			</zone>
 			<zone type="America/Guatemala">
 				<exemplarCity>Guatemala</exemplarCity>
@@ -2706,7 +2937,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Guyana</exemplarCity>
 			</zone>
 			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Hong Kong</exemplarCity>
+				<exemplarCity>Hongkong</exemplarCity>
 			</zone>
 			<zone type="America/Tegucigalpa">
 				<exemplarCity>Tegucigalpa</exemplarCity>
@@ -2757,7 +2988,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Teheran</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Reykjavik">
-				<exemplarCity>Reykjavik</exemplarCity>
+				<exemplarCity>Reykjavík</exemplarCity>
 			</zone>
 			<zone type="Europe/Rome">
 				<exemplarCity>Rooma</exemplarCity>
@@ -2796,13 +3027,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Comoro</exemplarCity>
 			</zone>
 			<zone type="America/St_Kitts">
-				<exemplarCity>St. Kitts</exemplarCity>
+				<exemplarCity>Saint Kitts</exemplarCity>
 			</zone>
 			<zone type="Asia/Pyongyang">
 				<exemplarCity>Pyongyang</exemplarCity>
 			</zone>
 			<zone type="Asia/Seoul">
-				<exemplarCity>Seoul</exemplarCity>
+				<exemplarCity>Soul</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuwait">
 				<exemplarCity>Kuveit</exemplarCity>
@@ -2817,7 +3048,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Oral</exemplarCity>
 			</zone>
 			<zone type="Asia/Aqtobe">
-				<exemplarCity>Aqtobe</exemplarCity>
+				<exemplarCity>Aktöbe</exemplarCity>
 			</zone>
 			<zone type="Asia/Qyzylorda">
 				<exemplarCity>Kõzõlorda</exemplarCity>
@@ -2832,7 +3063,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Beirut</exemplarCity>
 			</zone>
 			<zone type="America/St_Lucia">
-				<exemplarCity>St. Lucia</exemplarCity>
+				<exemplarCity>Saint Lucia</exemplarCity>
 			</zone>
 			<zone type="Europe/Vaduz">
 				<exemplarCity>Vaduz</exemplarCity>
@@ -2865,7 +3096,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Monaco</exemplarCity>
 			</zone>
 			<zone type="Europe/Chisinau">
-				<exemplarCity>Chisinau</exemplarCity>
+				<exemplarCity>Chișinău</exemplarCity>
 			</zone>
 			<zone type="Europe/Podgorica">
 				<exemplarCity>Podgorica</exemplarCity>
@@ -2889,7 +3120,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Bamako</exemplarCity>
 			</zone>
 			<zone type="Asia/Rangoon">
-				<exemplarCity>Rangoon</exemplarCity>
+				<exemplarCity>Yangon</exemplarCity>
 			</zone>
 			<zone type="Asia/Hovd">
 				<exemplarCity>Hovd</exemplarCity>
@@ -2898,7 +3129,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Ulaanbaatar</exemplarCity>
 			</zone>
 			<zone type="Asia/Choibalsan">
-				<exemplarCity>Choibalsan</exemplarCity>
+				<exemplarCity>Tšojbalsan</exemplarCity>
 			</zone>
 			<zone type="Asia/Macau">
 				<exemplarCity>Macau</exemplarCity>
@@ -2937,7 +3168,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Hermosillo</exemplarCity>
 			</zone>
 			<zone type="America/Mazatlan">
-				<exemplarCity>Mazatlan</exemplarCity>
+				<exemplarCity>Mazatlán</exemplarCity>
 			</zone>
 			<zone type="America/Chihuahua">
 				<exemplarCity>Chihuahua</exemplarCity>
@@ -2952,16 +3183,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Monterrey</exemplarCity>
 			</zone>
 			<zone type="America/Mexico_City">
-				<exemplarCity>Mexico City</exemplarCity>
+				<exemplarCity>México</exemplarCity>
 			</zone>
 			<zone type="America/Matamoros">
 				<exemplarCity>Matamoros</exemplarCity>
 			</zone>
 			<zone type="America/Merida">
-				<exemplarCity>Merida</exemplarCity>
+				<exemplarCity>Mérida</exemplarCity>
 			</zone>
 			<zone type="America/Cancun">
-				<exemplarCity>Cancun</exemplarCity>
+				<exemplarCity>Cancún</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuala_Lumpur">
 				<exemplarCity>Kuala Lumpur</exemplarCity>
@@ -2997,7 +3228,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Oslo</exemplarCity>
 			</zone>
 			<zone type="Asia/Katmandu">
-				<exemplarCity>Kathmandu</exemplarCity>
+				<exemplarCity>Katmandu</exemplarCity>
 			</zone>
 			<zone type="Pacific/Nauru">
 				<exemplarCity>Nauru</exemplarCity>
@@ -3012,7 +3243,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Auckland</exemplarCity>
 			</zone>
 			<zone type="Asia/Muscat">
-				<exemplarCity>Muscat</exemplarCity>
+				<exemplarCity>Masqaţ</exemplarCity>
 			</zone>
 			<zone type="America/Panama">
 				<exemplarCity>Panama</exemplarCity>
@@ -3032,6 +3263,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
 			</zone>
@@ -3116,6 +3350,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Tšita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Jakutsk</exemplarCity>
 			</zone>
@@ -3123,7 +3360,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Vladivostok</exemplarCity>
 			</zone>
 			<zone type="Asia/Khandyga">
-				<exemplarCity>Khandyga</exemplarCity>
+				<exemplarCity>Handõga</exemplarCity>
 			</zone>
 			<zone type="Asia/Sakhalin">
 				<exemplarCity>Sahhalin</exemplarCity>
@@ -3134,6 +3371,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolõmsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamtšatka</exemplarCity>
 			</zone>
@@ -3144,7 +3384,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Kigali</exemplarCity>
 			</zone>
 			<zone type="Asia/Riyadh">
-				<exemplarCity>Riyadh</exemplarCity>
+				<exemplarCity>Ar-Riyāḑ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Guadalcanal">
 				<exemplarCity>Guadalcanal</exemplarCity>
@@ -3162,7 +3402,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Singapur</exemplarCity>
 			</zone>
 			<zone type="Atlantic/St_Helena">
-				<exemplarCity>St. Helena</exemplarCity>
+				<exemplarCity>Saint Helena</exemplarCity>
 			</zone>
 			<zone type="Europe/Ljubljana">
 				<exemplarCity>Ljubljana</exemplarCity>
@@ -3231,7 +3471,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Dili</exemplarCity>
 			</zone>
 			<zone type="Asia/Ashgabat">
-				<exemplarCity>Asgabat</exemplarCity>
+				<exemplarCity>Aşgabat</exemplarCity>
 			</zone>
 			<zone type="Africa/Tunis">
 				<exemplarCity>Tunis</exemplarCity>
@@ -3240,7 +3480,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Tongatapu</exemplarCity>
 			</zone>
 			<zone type="Europe/Istanbul">
-				<exemplarCity>Istanbul</exemplarCity>
+				<exemplarCity>İstanbul</exemplarCity>
 			</zone>
 			<zone type="America/Port_of_Spain">
 				<exemplarCity>Port of Spain</exemplarCity>
@@ -3375,7 +3615,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Vatikan</exemplarCity>
 			</zone>
 			<zone type="America/St_Vincent">
-				<exemplarCity>St. Vincent</exemplarCity>
+				<exemplarCity>Saint Vincent</exemplarCity>
 			</zone>
 			<zone type="America/Caracas">
 				<exemplarCity>Caracas</exemplarCity>
@@ -3384,7 +3624,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Tortola</exemplarCity>
 			</zone>
 			<zone type="America/St_Thomas">
-				<exemplarCity>St. Thomas</exemplarCity>
+				<exemplarCity>Saint Thomas</exemplarCity>
 			</zone>
 			<zone type="Asia/Saigon">
 				<exemplarCity>Ho Chi Minh</exemplarCity>
@@ -3422,7 +3662,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Afghanistan">
 				<long>
-					<standard>Afganistaani aeg</standard>
+					<standard>Afganistani aeg</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Central">
@@ -3454,6 +3694,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<daylight>Alaska suveaeg</daylight>
 				</long>
 			</metazone>
+			<metazone type="Almaty">
+				<long>
+					<generic>Almatõ aeg</generic>
+					<standard>Almatõ standardaeg</standard>
+					<daylight>Almatõ suveaeg</daylight>
+				</long>
+			</metazone>
 			<metazone type="Amazon">
 				<long>
 					<generic>Amazonase aeg</generic>
@@ -3503,6 +3750,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<daylight>Apia suveaeg</daylight>
 				</long>
 			</metazone>
+			<metazone type="Aqtau">
+				<long>
+					<generic>Aktau aeg</generic>
+					<standard>Aktau standardaeg</standard>
+					<daylight>Aktau suveaeg</daylight>
+				</long>
+			</metazone>
+			<metazone type="Aqtobe">
+				<long>
+					<generic>Aktöbe aeg</generic>
+					<standard>Aktöbe standardaeg</standard>
+					<daylight>Aktöbe suveaeg</daylight>
+				</long>
+			</metazone>
 			<metazone type="Arabian">
 				<long>
 					<generic>Araabia aeg</generic>
@@ -3754,7 +4015,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="French_Southern">
 				<long>
-					<standard>Prantsuse Lõunaalade ja Antarktika aeg</standard>
+					<standard>Prantsuse Antarktiliste ja Lõunaalade aeg</standard>
 				</long>
 			</metazone>
 			<metazone type="Galapagos">
@@ -3894,7 +4155,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Kamchatka">
 				<long>
-					<generic>Kamtšatka aeg</generic>
+					<generic>Petropavlovsk-Kamtšatski aeg</generic>
 					<standard>Kamtšatka standardaeg</standard>
 					<daylight>Kamtšatka suveaeg</daylight>
 				</long>
@@ -3964,7 +4225,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Maldives">
 				<long>
-					<standard>Maldiivide aeg</standard>
+					<standard>Maldiivi aeg</standard>
 				</long>
 			</metazone>
 			<metazone type="Marquesas">
@@ -3974,7 +4235,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Marshall_Islands">
 				<long>
-					<standard>Marshalli saarte aeg</standard>
+					<standard>Marshalli Saarte aeg</standard>
 				</long>
 			</metazone>
 			<metazone type="Mauritius">
@@ -4117,9 +4378,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Philippines">
 				<long>
-					<generic>Filipiinide aeg</generic>
-					<standard>Filipiinide standardaeg</standard>
-					<daylight>Filipiinide suveaeg</daylight>
+					<generic>Filipiini aeg</generic>
+					<standard>Filipiini standardaeg</standard>
+					<daylight>Filipiini suveaeg</daylight>
 				</long>
 			</metazone>
 			<metazone type="Phoenix_Islands">
@@ -4144,6 +4405,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<standard>Pohnpei aeg</standard>
 				</long>
 			</metazone>
+			<metazone type="Qyzylorda">
+				<long>
+					<generic>Kõzõlorda aeg</generic>
+					<standard>Kõzõlorda standardaeg</standard>
+					<daylight>Kõzõlorda suveaeg</daylight>
+				</long>
+			</metazone>
 			<metazone type="Reunion">
 				<long>
 					<standard>Réunioni aeg</standard>
@@ -4177,7 +4445,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Seychelles">
 				<long>
-					<standard>Seišellide aeg</standard>
+					<standard>Seišelli aeg</standard>
 				</long>
 			</metazone>
 			<metazone type="Singapore">
@@ -4187,7 +4455,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Solomon">
 				<long>
-					<standard>Saalomoni saarte aeg</standard>
+					<standard>Saalomoni Saarte aeg</standard>
 				</long>
 			</metazone>
 			<metazone type="South_Georgia">
@@ -4327,20 +4595,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<otherNumberingSystems>
 			<native draft="contributed">latn</native>
 		</otherNumberingSystems>
-		<minimumGroupingDigits draft="contributed">3</minimumGroupingDigits>
+		<minimumGroupingDigits>2</minimumGroupingDigits>
 		<symbols numberSystem="latn">
 			<decimal>,</decimal>
 			<group> </group>
 			<list>;</list>
 			<percentSign>%</percentSign>
 			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
+			<minusSign>−</minusSign>
 			<exponential>×10^</exponential>
 			<superscriptingExponent>×</superscriptingExponent>
 			<perMille>‰</perMille>
 			<infinity>∞</infinity>
 			<nan>NaN</nan>
-			<timeSeparator draft="contributed">.</timeSeparator>
+			<timeSeparator draft="contributed">:</timeSeparator>
 		</symbols>
 		<decimalFormats numberSystem="latn">
 			<decimalFormatLength>
@@ -4428,12 +4696,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0 tuh ¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0 tuh ¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00 tuh ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00 tuh ¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000 tuh ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000 tuh ¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0 mln ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0 mln ¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00 mln ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00 mln ¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000 mln ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000 mln ¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0 mld ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0 mld ¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00 mld ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00 mld ¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000 mld ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000 mld ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0 trl ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0 trl ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00 trl ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00 trl ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000 trl ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000 trl ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencies>
 			<currency type="ADP">
 				<displayName>Andorra peseeta</displayName>
+				<displayName count="one">Andorra peseeta</displayName>
+				<displayName count="other">Andorra peseetat</displayName>
 			</currency>
 			<currency type="AED">
 				<displayName>Araabia Ühendemiraatide dirhem</displayName>
@@ -4442,7 +4740,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>AED</symbol>
 			</currency>
 			<currency type="AFA">
-				<displayName>Afganistani afgaani, 1927-2002</displayName>
+				<displayName>Afganistani afgaani (1927–2002)</displayName>
+				<displayName count="one">Afganistani afgaani (1927–2002)</displayName>
+				<displayName count="other">Afganistani afgaanit (1927–2002)</displayName>
 			</currency>
 			<currency type="AFN">
 				<displayName>Afganistani afgaani</displayName>
@@ -4450,6 +4750,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">Afganistani afgaanit</displayName>
 				<symbol>AFN</symbol>
 			</currency>
+			<currency type="ALK">
+				<displayName>Albaania lekk (1946–1965)</displayName>
+				<displayName count="one">Albaania lekk (1946–1965)</displayName>
+				<displayName count="other">Albaania lekki (1946–1965)</displayName>
+			</currency>
 			<currency type="ALL">
 				<displayName>Albaania lekk</displayName>
 				<displayName count="one">Albaania lekk</displayName>
@@ -4475,19 +4780,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>AOA</symbol>
 			</currency>
 			<currency type="AOK">
-				<displayName>Angola kvanza, 1977-1990</displayName>
+				<displayName>Angola kvanza (1977–1990)</displayName>
+				<displayName count="one">Angola kvanza (1977–1990)</displayName>
+				<displayName count="other">Angola kvanzat (1977–1990)</displayName>
 			</currency>
 			<currency type="AON">
-				<displayName>Angola kvanza, 1990-2000</displayName>
+				<displayName>Angola kvanza (1990–2000)</displayName>
+				<displayName count="one">Angola kvanza (1990–2000)</displayName>
+				<displayName count="other">Angola kvanzat (1990–2000)</displayName>
 			</currency>
 			<currency type="AOR">
-				<displayName>Angola reformitud kvanza, 1995-1999</displayName>
+				<displayName>Angola reformitud kvanza, 1995–1999</displayName>
 			</currency>
 			<currency type="ARA">
 				<displayName>Argentina austral</displayName>
 			</currency>
+			<currency type="ARM">
+				<displayName>Argentina peeso (1881–1970)</displayName>
+				<displayName count="one">Argentina peeso (1881–1970)</displayName>
+				<displayName count="other">Argentina peesot (1881–1970)</displayName>
+			</currency>
 			<currency type="ARP">
-				<displayName>Argentina peeso, 1983-1985</displayName>
+				<displayName>Argentina peeso (1983–1985)</displayName>
+				<displayName count="one">Argentina peeso (1983–1985)</displayName>
+				<displayName count="other">Argentina peesot (1983–1985)</displayName>
 			</currency>
 			<currency type="ARS">
 				<displayName>Argentina peeso</displayName>
@@ -4498,6 +4814,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="ATS">
 				<displayName>Austria šilling</displayName>
+				<displayName count="one">Austria šilling</displayName>
+				<displayName count="other">Austria šillingit</displayName>
 			</currency>
 			<currency type="AUD">
 				<displayName>Austraalia dollar</displayName>
@@ -4507,13 +4825,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="AWG">
-				<displayName>Aruba guilder</displayName>
-				<displayName count="one">Aruba guilder</displayName>
-				<displayName count="other">Aruba guilderit</displayName>
+				<displayName>Aruba kulden</displayName>
+				<displayName count="one">Aruba kulden</displayName>
+				<displayName count="other">Aruba kuldnat</displayName>
 				<symbol>AWG</symbol>
 			</currency>
 			<currency type="AZM">
-				<displayName>Aserbaidžaani manat, 1993-2006</displayName>
+				<displayName>Aserbaidžaani manat (1993–2006)</displayName>
+				<displayName count="one">Aserbaidžaani manat (1993–2006)</displayName>
+				<displayName count="other">Aserbaidžaani manatit (1993–2006)</displayName>
 			</currency>
 			<currency type="AZN">
 				<displayName>Aserbaidžaani manat</displayName>
@@ -4522,14 +4842,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>AZN</symbol>
 			</currency>
 			<currency type="BAD">
-				<displayName>Bosnia-Hertsegoviina dinaar</displayName>
+				<displayName>Bosnia ja Hertsegoviina dinaar (1992–1994)</displayName>
+				<displayName count="one">Bosnia ja Hertsegoviina dinaar (1992–1994)</displayName>
+				<displayName count="other">Bosnia ja Hertsegoviina dinaari (1992–1994)</displayName>
 			</currency>
 			<currency type="BAM">
-				<displayName>Bosnia-Hertsegoviina mark</displayName>
-				<displayName count="one">Bosnia-Hertsegoviina mark</displayName>
-				<displayName count="other">Bosnia-Hertsegoviina marka</displayName>
+				<displayName>Bosnia ja Hertsegoviina konverteeritav mark</displayName>
+				<displayName count="one">Bosnia ja Hertsegoviina konverteeritav mark</displayName>
+				<displayName count="other">Bosnia ja Hertsegoviina konverteeritavat marka</displayName>
 				<symbol>BAM</symbol>
 			</currency>
+			<currency type="BAN">
+				<displayName>Bosnia ja Hertsegoviina uus dinaar (1994–1997)</displayName>
+				<displayName count="one">Bosnia ja Hertsegoviina uus dinaar (1994–1997)</displayName>
+				<displayName count="other">Bosnia ja Hertsegoviina uut dinaari (1994–1997)</displayName>
+			</currency>
 			<currency type="BBD">
 				<displayName>Barbadose dollar</displayName>
 				<displayName count="one">Barbadose dollar</displayName>
@@ -4546,9 +4873,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="BEC">
 				<displayName>Belgia konverteeritav frank</displayName>
+				<displayName count="one">Belgia konverteeritav frank</displayName>
+				<displayName count="other">Belgia konverteeritavat franki</displayName>
 			</currency>
 			<currency type="BEF">
 				<displayName>Belgia frank</displayName>
+				<displayName count="one">Belgia frank</displayName>
+				<displayName count="other">Belgia franki</displayName>
 			</currency>
 			<currency type="BEL">
 				<displayName>Belgia arveldusfrank</displayName>
@@ -4562,6 +4893,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">Bulgaaria leevi</displayName>
 				<symbol>BGN</symbol>
 			</currency>
+			<currency type="BGO">
+				<displayName>Bulgaaria leev (1879–1952)</displayName>
+				<displayName count="one">Bulgaaria leev (1879–1952)</displayName>
+				<displayName count="other">Bulgaaria leevi (1879–1952)</displayName>
+			</currency>
 			<currency type="BHD">
 				<displayName>Bahreini dinaar</displayName>
 				<displayName count="one">Bahreini dinaar</displayName>
@@ -4589,17 +4925,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BOB">
-				<displayName>Bolivia boliviaano</displayName>
-				<displayName count="one">Bolivia boliviaano</displayName>
-				<displayName count="other">Bolivia boliviaanot</displayName>
+				<displayName>Boliivia boliviaano</displayName>
+				<displayName count="one">Boliivia boliviaano</displayName>
+				<displayName count="other">Boliivia boliviaanot</displayName>
 				<symbol>BOB</symbol>
 			</currency>
+			<currency type="BOL">
+				<displayName>Boliivia boliviaano (1863–1963)</displayName>
+				<displayName count="one">Boliivia boliviaano (1863–1963)</displayName>
+				<displayName count="other">Boliivia boliviaanot (1863–1963)</displayName>
+			</currency>
 			<currency type="BOP">
 				<displayName>Boliivia peeso</displayName>
+				<displayName count="one">Boliivia peeso</displayName>
+				<displayName count="other">Boliivia peesot</displayName>
+			</currency>
+			<currency type="BRB">
+				<displayName>Brasiilia uus kruseiro (1967–1986)</displayName>
+				<displayName count="one">Brasiilia uus kruseiro (1967–1986)</displayName>
+				<displayName count="other">Brasiilia uut kruseirot (1967–1986)</displayName>
 			</currency>
 			<currency type="BRC">
 				<displayName>Brasiilia krusado</displayName>
 			</currency>
+			<currency type="BRE">
+				<displayName>Brasiilia kruseiro (1990–1993)</displayName>
+				<displayName count="one">Brasiilia kruseiro (1990–1993)</displayName>
+				<displayName count="other">Brasiilia kruseirot (1990–1993)</displayName>
+			</currency>
 			<currency type="BRL">
 				<displayName>Brasiilia reaal</displayName>
 				<displayName count="one">Brasiilia reaal</displayName>
@@ -4607,6 +4960,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>R$</symbol>
 				<symbol alt="narrow" draft="contributed">R$</symbol>
 			</currency>
+			<currency type="BRR">
+				<displayName>Brasiilia kruseiro (1993–1994)</displayName>
+				<displayName count="one">Brasiilia kruseiro (1993–1994)</displayName>
+				<displayName count="other">Brasiilia kruseirot (1993–1994)</displayName>
+			</currency>
+			<currency type="BRZ">
+				<displayName>Brasiilia kruseiro (1942–1967)</displayName>
+				<displayName count="one">Brasiilia kruseiro (1942–1967)</displayName>
+				<displayName count="other">Brasiilia kruseirot (1942–1967)</displayName>
+			</currency>
 			<currency type="BSD">
 				<displayName>Bahama dollar</displayName>
 				<displayName count="one">Bahama dollar</displayName>
@@ -4622,6 +4985,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="BUK">
 				<displayName>Birma kjatt</displayName>
+				<displayName count="one">Birma kjatt</displayName>
+				<displayName count="other">Birma kjatti</displayName>
 			</currency>
 			<currency type="BWP">
 				<displayName>Botswana pula</displayName>
@@ -4630,7 +4995,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>BWP</symbol>
 			</currency>
 			<currency type="BYB">
-				<displayName>Valgevene uus rubla, 1994-1999</displayName>
+				<displayName>Valgevene uus rubla (1994–1999)</displayName>
+				<displayName count="one">Valgevene uus rubla (1994–1999)</displayName>
+				<displayName count="other">Valgevene uut rubla (1994–1999)</displayName>
 			</currency>
 			<currency type="BYR">
 				<displayName>Valgevene rubla</displayName>
@@ -4640,9 +5007,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">р.</symbol>
 			</currency>
 			<currency type="BZD">
-				<displayName>Belize dollar</displayName>
-				<displayName count="one">Belize dollar</displayName>
-				<displayName count="other">Belize dollarit</displayName>
+				<displayName>Belize’i dollar</displayName>
+				<displayName count="one">Belize’i dollar</displayName>
+				<displayName count="other">Belize’i dollarit</displayName>
 				<symbol>BZD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -4665,6 +5032,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">Šveitsi franki</displayName>
 				<symbol>CHF</symbol>
 			</currency>
+			<currency type="CLE">
+				<displayName>Tšiili eskuudo</displayName>
+				<displayName count="one">Tšiili eskuudo</displayName>
+				<displayName count="other">Tšiili eskuudot</displayName>
+			</currency>
 			<currency type="CLP">
 				<displayName>Tšiili peeso</displayName>
 				<displayName count="one">Tšiili peeso</displayName>
@@ -4680,21 +5052,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
 			<currency type="COP">
-				<displayName>Kolumbia peeso</displayName>
-				<displayName count="one">Kolumbia peeso</displayName>
-				<displayName count="other">Kolumbia peesot</displayName>
+				<displayName>Colombia peeso</displayName>
+				<displayName count="one">Colombia peeso</displayName>
+				<displayName count="other">Colombia peesot</displayName>
 				<symbol>COP</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CRC">
-				<displayName>Costa Rica colón</displayName>
-				<displayName count="one">Costa Rica colón</displayName>
-				<displayName count="other">Costa Rica colóni</displayName>
+				<displayName>Costa Rica koloon</displayName>
+				<displayName count="one">Costa Rica koloon</displayName>
+				<displayName count="other">Costa Rica kolooni</displayName>
 				<symbol>CRC</symbol>
 				<symbol alt="narrow" draft="contributed">₡</symbol>
 			</currency>
 			<currency type="CSD">
-				<displayName>Serbia vana dinaar</displayName>
+				<displayName>Serbia dinaar (2002–2006)</displayName>
+				<displayName count="one">Serbia dinaar (2002–2006)</displayName>
+				<displayName count="other">Serbia dinaari (2002–2006)</displayName>
 			</currency>
 			<currency type="CUC">
 				<displayName>Kuuba konverteeritav peeso</displayName>
@@ -4710,13 +5084,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CVE">
-				<displayName>Roheneemesaarte eskuudo</displayName>
-				<displayName count="one">Roheneemesaarte eskuudo</displayName>
-				<displayName count="other">Roheneemesaarte eskuudot</displayName>
+				<displayName>Cabo Verde eskuudo</displayName>
+				<displayName count="one">Cabo Verde eskuudo</displayName>
+				<displayName count="other">Cabo Verde eskuudot</displayName>
 				<symbol>CVE</symbol>
 			</currency>
 			<currency type="CYP">
 				<displayName>Küprose nael</displayName>
+				<displayName count="one">Küprose nael</displayName>
+				<displayName count="other">Küprose naela</displayName>
 			</currency>
 			<currency type="CZK">
 				<displayName>Tšehhi kroon</displayName>
@@ -4724,8 +5100,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">Tšehhi krooni</displayName>
 				<symbol>CZK</symbol>
 			</currency>
+			<currency type="DDM">
+				<displayName>Ida-Saksa mark</displayName>
+				<displayName count="one">Ida-Saksa mark</displayName>
+				<displayName count="other">Ida-Saksa marka</displayName>
+			</currency>
 			<currency type="DEM">
 				<displayName>Saksa mark</displayName>
+				<displayName count="one">Saksa mark</displayName>
+				<displayName count="other">Saksa marka</displayName>
 			</currency>
 			<currency type="DJF">
 				<displayName>Djibouti frank</displayName>
@@ -4754,6 +5137,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="ECS">
 				<displayName>Ecuadori sukre</displayName>
+				<displayName count="one">Ecuadori sukre</displayName>
+				<displayName count="other">Ecuadori sukret</displayName>
 			</currency>
 			<currency type="EEK">
 				<displayName>Eesti kroon</displayName>
@@ -4777,6 +5162,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="ESP">
 				<displayName>Hispaania peseeta</displayName>
+				<displayName count="one">Hispaania peseeta</displayName>
+				<displayName count="other">Hispaania peseetat</displayName>
 			</currency>
 			<currency type="ETB">
 				<displayName>Etioopia birr</displayName>
@@ -4793,6 +5180,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="FIM">
 				<displayName>Soome mark</displayName>
+				<displayName count="one">Soome mark</displayName>
+				<displayName count="other">Soome marka</displayName>
 			</currency>
 			<currency type="FJD">
 				<displayName>Fidži dollar</displayName>
@@ -4809,6 +5198,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="FRF">
 				<displayName>Prantsuse frank</displayName>
+				<displayName count="one">Prantsuse frank</displayName>
+				<displayName count="other">Prantsuse franki</displayName>
 			</currency>
 			<currency type="GBP">
 				<displayName>Suurbritannia naelsterling</displayName>
@@ -4824,12 +5215,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>GEL</symbol>
 			</currency>
 			<currency type="GHC">
-				<displayName>Ghana sedi</displayName>
+				<displayName>Ghana sedi (1979–2007)</displayName>
+				<displayName count="one">Ghana sedi (1979–2007)</displayName>
+				<displayName count="other">Ghana sedit (1979–2007)</displayName>
 			</currency>
 			<currency type="GHS">
-				<displayName>Ghana cedi</displayName>
-				<displayName count="one">Ghana cedi</displayName>
-				<displayName count="other">Ghana cedit</displayName>
+				<displayName>Ghana sedi</displayName>
+				<displayName count="one">Ghana sedi</displayName>
+				<displayName count="other">Ghana sedit</displayName>
 				<symbol>GHS</symbol>
 			</currency>
 			<currency type="GIP">
@@ -4856,15 +5249,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="GRD">
 				<displayName>Kreeka drahm</displayName>
+				<displayName count="one">Kreeka drahm</displayName>
+				<displayName count="other">Kreeka drahmi</displayName>
 			</currency>
 			<currency type="GTQ">
-				<displayName>Guatemala ketsal</displayName>
-				<displayName count="one">Guatemala ketsal</displayName>
-				<displayName count="other">Guatemala ketsalit</displayName>
+				<displayName>Guatemala ketsaal</displayName>
+				<displayName count="one">Guatemala ketsaal</displayName>
+				<displayName count="other">Guatemala ketsaali</displayName>
 				<symbol>GTQ</symbol>
 			</currency>
+			<currency type="GWE">
+				<displayName>Portugali Guinea eskuudo</displayName>
+				<displayName count="one">Portugali Guinea eskuudo</displayName>
+				<displayName count="other">Portugali Guinea eskuudot</displayName>
+			</currency>
 			<currency type="GWP">
 				<displayName>Guinea-Bissau peeso</displayName>
+				<displayName count="one">Guinea-Bissau peeso</displayName>
+				<displayName count="other">Guinea-Bissau peesot</displayName>
 			</currency>
 			<currency type="GYD">
 				<displayName>Guyana dollar</displayName>
@@ -4886,10 +5288,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">Hondurase lempiirat</displayName>
 				<symbol>HNL</symbol>
 			</currency>
+			<currency type="HRD">
+				<displayName>Horvaatia dinaar</displayName>
+				<displayName count="one">Horvaatia dinaar</displayName>
+				<displayName count="other">Horvaatia dinaari</displayName>
+			</currency>
 			<currency type="HRK">
 				<displayName>Horvaatia kuna</displayName>
 				<displayName count="one">Horvaatia kuna</displayName>
-				<displayName count="other">Horvaatia kunat</displayName>
+				<displayName count="other">Horvaatia kuna</displayName>
 				<symbol>HRK</symbol>
 			</currency>
 			<currency type="HTG">
@@ -4912,9 +5319,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="IEP">
 				<displayName>Iiri nael</displayName>
+				<displayName count="one">Iiri nael</displayName>
+				<displayName count="other">Iiri naela</displayName>
 			</currency>
 			<currency type="ILP">
 				<displayName>Iisraeli nael</displayName>
+				<displayName count="one">Iisraeli nael</displayName>
+				<displayName count="other">Iisraeli naela</displayName>
+			</currency>
+			<currency type="ILR">
+				<displayName>Iisraeli seekel (1980–1985)</displayName>
+				<displayName count="one">Iisraeli seekel (1980–1985)</displayName>
+				<displayName count="other">Iisraeli seekelit (1980–1985)</displayName>
 			</currency>
 			<currency type="ILS">
 				<displayName>Iisraeli uus seekel</displayName>
@@ -4942,6 +5358,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">Iraani riaali</displayName>
 				<symbol>IRR</symbol>
 			</currency>
+			<currency type="ISJ">
+				<displayName>Islandi kroon (1918–1981)</displayName>
+				<displayName count="one">Islandi kroon (1918–1981)</displayName>
+				<displayName count="other">Islandi krooni (1918–1981)</displayName>
+			</currency>
 			<currency type="ISK">
 				<displayName>Islandi kroon</displayName>
 				<displayName count="one">Islandi kroon</displayName>
@@ -4950,6 +5371,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="ITL">
 				<displayName>Itaalia liir</displayName>
+				<displayName count="one">Itaalia liir</displayName>
+				<displayName count="other">Itaalia liiri</displayName>
 			</currency>
 			<currency type="JMD">
 				<displayName>Jamaica dollar</displayName>
@@ -4972,9 +5395,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
 			<currency type="KES">
-				<displayName>Kenya šilling</displayName>
-				<displayName count="one">Kenya šilling</displayName>
-				<displayName count="other">Kenya šillingit</displayName>
+				<displayName>Keenia šilling</displayName>
+				<displayName count="one">Keenia šilling</displayName>
+				<displayName count="other">Keenia šillingit</displayName>
 				<symbol>KES</symbol>
 			</currency>
 			<currency type="KGS">
@@ -4991,9 +5414,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">៛</symbol>
 			</currency>
 			<currency type="KMF">
-				<displayName>Komooride frank</displayName>
-				<displayName count="one">Komooride frank</displayName>
-				<displayName count="other">Komooride franki</displayName>
+				<displayName>Komoori frank</displayName>
+				<displayName count="one">Komoori frank</displayName>
+				<displayName count="other">Komoori franki</displayName>
 				<symbol>KMF</symbol>
 			</currency>
 			<currency type="KPW">
@@ -5002,6 +5425,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">Põhja-Korea vonni</displayName>
 				<symbol>KPW</symbol>
 			</currency>
+			<currency type="KRO">
+				<displayName>Lõuna-Korea vonn (1945–1953)</displayName>
+				<displayName count="one">Lõuna-Korea vonn (1945–1953)</displayName>
+				<displayName count="other">Lõuna-Korea vonni (1945–1953)</displayName>
+			</currency>
 			<currency type="KRW">
 				<displayName>Lõuna-Korea vonn</displayName>
 				<displayName count="one">Lõuna-Korea vonn</displayName>
@@ -5016,9 +5444,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>KWD</symbol>
 			</currency>
 			<currency type="KYD">
-				<displayName>Caymani saarte dollar</displayName>
-				<displayName count="one">Caymani saarte dollar</displayName>
-				<displayName count="other">Caymani saarte dollarit</displayName>
+				<displayName>Kaimanisaarte dollar</displayName>
+				<displayName count="one">Kaimanisaarte dollar</displayName>
+				<displayName count="other">Kaimanisaarte dollarit</displayName>
 				<symbol>KYD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -5057,6 +5485,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="LSL">
 				<displayName>Lesotho loti</displayName>
+				<displayName count="one">Lesotho loti</displayName>
+				<displayName count="other">Lesotho lotit</displayName>
 			</currency>
 			<currency type="LTL">
 				<displayName>Leedu litt</displayName>
@@ -5064,8 +5494,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">Leedu litti</displayName>
 				<symbol>LTL</symbol>
 			</currency>
+			<currency type="LUC">
+				<displayName>Luksemburgi konverteeritav frank</displayName>
+				<displayName count="one">Luksemburgi konverteeritav frank</displayName>
+				<displayName count="other">Luksemburgi konverteeritavat franki</displayName>
+			</currency>
 			<currency type="LUF">
 				<displayName>Luksemburgi frank</displayName>
+				<displayName count="one">Luksemburgi frank</displayName>
+				<displayName count="other">Luksemburgi franki</displayName>
 			</currency>
 			<currency type="LVL">
 				<displayName>Läti latt</displayName>
@@ -5073,6 +5510,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">Läti latti</displayName>
 				<symbol>LVL</symbol>
 			</currency>
+			<currency type="LVR">
+				<displayName>Läti rubla</displayName>
+				<displayName count="one">Läti rubla</displayName>
+				<displayName count="other">Läti rubla</displayName>
+			</currency>
 			<currency type="LYD">
 				<displayName>Liibüa dinaar</displayName>
 				<displayName count="one">Liibüa dinaar</displayName>
@@ -5085,6 +5527,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">Maroko dirhemit</displayName>
 				<symbol>MAD</symbol>
 			</currency>
+			<currency type="MAF">
+				<displayName>Maroko frank</displayName>
+				<displayName count="one">Maroko frank</displayName>
+				<displayName count="other">Maroko franki</displayName>
+			</currency>
+			<currency type="MCF">
+				<displayName>Monaco frank</displayName>
+				<displayName count="one">Monaco frank</displayName>
+				<displayName count="other">Monaco franki</displayName>
+			</currency>
 			<currency type="MDL">
 				<displayName>Moldova leu</displayName>
 				<displayName count="one">Moldova leu</displayName>
@@ -5092,17 +5544,32 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>MDL</symbol>
 			</currency>
 			<currency type="MGA">
-				<displayName>Madagaskari ariary</displayName>
-				<displayName count="one">Madagaskari ariary</displayName>
-				<displayName count="other">Madagaskari ariaryt</displayName>
+				<displayName>Madagaskari ariari</displayName>
+				<displayName count="one">Madagaskari ariari</displayName>
+				<displayName count="other">Madagaskari ariarit</displayName>
 				<symbol>MGA</symbol>
 			</currency>
+			<currency type="MGF">
+				<displayName>Madagaskar frank</displayName>
+				<displayName count="one">Madagaskar frank</displayName>
+				<displayName count="other">Madagaskar franki</displayName>
+			</currency>
 			<currency type="MKD">
-				<displayName>Makedoonia denaar</displayName>
-				<displayName count="one">Makedoonia denaar</displayName>
-				<displayName count="other">Makedoonia denaari</displayName>
+				<displayName>Makedoonia dinaar</displayName>
+				<displayName count="one">Makedoonia dinaar</displayName>
+				<displayName count="other">Makedoonia dinaari</displayName>
 				<symbol>MKD</symbol>
 			</currency>
+			<currency type="MKN">
+				<displayName>Makedoonia dinaar (1992–1993)</displayName>
+				<displayName count="one">Makedoonia dinaar (1992–1993)</displayName>
+				<displayName count="other">Makedoonia dinaari (1992–1993)</displayName>
+			</currency>
+			<currency type="MLF">
+				<displayName>Mali frank</displayName>
+				<displayName count="one">Mali frank</displayName>
+				<displayName count="other">Mali franki</displayName>
+			</currency>
 			<currency type="MMK">
 				<displayName>Myanmari kjatt</displayName>
 				<displayName count="one">Myanmari kjatt</displayName>
@@ -5117,9 +5584,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">₮</symbol>
 			</currency>
 			<currency type="MOP">
-				<displayName>Macao pataka</displayName>
-				<displayName count="one">Macao pataka</displayName>
-				<displayName count="other">Macao patakat</displayName>
+				<displayName>Macau pataaka</displayName>
+				<displayName count="one">Macau pataaka</displayName>
+				<displayName count="other">Macau pataakat</displayName>
 				<symbol>MOP</symbol>
 			</currency>
 			<currency type="MRO">
@@ -5130,6 +5597,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="MTL">
 				<displayName>Malta liir</displayName>
+				<displayName count="one">Malta liir</displayName>
+				<displayName count="other">Malta liiri</displayName>
+			</currency>
+			<currency type="MTP">
+				<displayName>Malta nael</displayName>
+				<displayName count="one">Malta nael</displayName>
+				<displayName count="other">Malta naela</displayName>
 			</currency>
 			<currency type="MUR">
 				<displayName>Mauritiuse ruupia</displayName>
@@ -5137,10 +5611,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">Mauritiuse ruupiat</displayName>
 				<symbol>MUR</symbol>
 			</currency>
+			<currency type="MVP">
+				<displayName>Maldiivi ruupia (1947–1981)</displayName>
+				<displayName count="one">Maldiivi ruupia (1947–1981)</displayName>
+				<displayName count="other">Maldiivi ruupiat (1947–1981)</displayName>
+			</currency>
 			<currency type="MVR">
-				<displayName>Maldiivide ruupia</displayName>
-				<displayName count="one">Maldiivide ruupia</displayName>
-				<displayName count="other">Maldiivide ruupiat</displayName>
+				<displayName>Maldiivi ruupia</displayName>
+				<displayName count="one">Maldiivi ruupia</displayName>
+				<displayName count="other">Maldiivi ruupiat</displayName>
 				<symbol>MVR</symbol>
 			</currency>
 			<currency type="MWK">
@@ -5157,7 +5636,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="MXP">
-				<displayName>Mehhiko peeso, 1861-1990</displayName>
+				<displayName>Mehhiko peeso (1861–1992)</displayName>
+				<displayName count="one">Mehhiko peeso (1861–1992)</displayName>
+				<displayName count="other">Mehhiko peesot (1861–1992)</displayName>
 			</currency>
 			<currency type="MYR">
 				<displayName>Malaisia ringgit</displayName>
@@ -5165,6 +5646,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">Malaisia ringgitit</displayName>
 				<symbol>MYR</symbol>
 			</currency>
+			<currency type="MZE">
+				<displayName>Mosambiigi eskuudo</displayName>
+				<displayName count="one">Mosambiigi eskuudo</displayName>
+				<displayName count="other">Mosambiigi eskuudot</displayName>
+			</currency>
+			<currency type="MZM">
+				<displayName>Mosambiigi metikal (1980–2006)</displayName>
+				<displayName count="one">Mosambiigi metikal (1980–2006)</displayName>
+				<displayName count="other">Mosambiigi metikali (1980–2006)</displayName>
+			</currency>
 			<currency type="MZN">
 				<displayName>Mosambiigi metikal</displayName>
 				<displayName count="one">Mosambiigi metikal</displayName>
@@ -5186,16 +5677,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">₦</symbol>
 			</currency>
 			<currency type="NIC">
-				<displayName>Nicaragua kordoba</displayName>
+				<displayName>Nicaragua kordoba (1988–1991)</displayName>
+				<displayName count="one">Nicaragua kordoba (1988–1991)</displayName>
+				<displayName count="other">Nicaragua kordobat (1988–1991)</displayName>
 			</currency>
 			<currency type="NIO">
-				<displayName>Nicaragua kuldkordoba</displayName>
-				<displayName count="one">Nicaragua kuldkordoba</displayName>
-				<displayName count="other">Nicaragua kuldkordobat</displayName>
+				<displayName>Nicaragua kordoba</displayName>
+				<displayName count="one">Nicaragua kordoba</displayName>
+				<displayName count="other">Nicaragua kordobad</displayName>
 				<symbol>NIO</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>Hollandi kulden</displayName>
+				<displayName count="one">Hollandi kulden</displayName>
+				<displayName count="other">Hollandi kuldnat</displayName>
 			</currency>
 			<currency type="NOK">
 				<displayName>Norra kroon</displayName>
@@ -5238,7 +5733,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>PEN</symbol>
 			</currency>
 			<currency type="PES">
-				<displayName>Peruu soll</displayName>
+				<displayName>Peruu soll (1863–1965)</displayName>
+				<displayName count="one">Peruu soll (1863–1965)</displayName>
+				<displayName count="other">Peruu solli (1863–1965)</displayName>
 			</currency>
 			<currency type="PGK">
 				<displayName>Paapua Uus-Guinea kina</displayName>
@@ -5247,9 +5744,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>PGK</symbol>
 			</currency>
 			<currency type="PHP">
-				<displayName>Filipiinide peeso</displayName>
-				<displayName count="one">Filipiinide peeso</displayName>
-				<displayName count="other">Filipiinide peesot</displayName>
+				<displayName>Filipiini peeso</displayName>
+				<displayName count="one">Filipiini peeso</displayName>
+				<displayName count="other">Filipiini peesot</displayName>
 				<symbol>PHP</symbol>
 				<symbol alt="narrow" draft="contributed">₱</symbol>
 			</currency>
@@ -5266,31 +5763,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>PLN</symbol>
 			</currency>
 			<currency type="PLZ">
-				<displayName>Poola zlott, 1950-1995</displayName>
+				<displayName>Poola zlott (1950–1995)</displayName>
+				<displayName count="one">Poola zlott (1950–1995)</displayName>
+				<displayName count="other">Poola zlotti (1950–1995)</displayName>
 			</currency>
 			<currency type="PTE">
 				<displayName>Portugali eskuudo</displayName>
+				<displayName count="one">Portugali eskuudo</displayName>
+				<displayName count="other">Portugali eskuudot</displayName>
 			</currency>
 			<currency type="PYG">
-				<displayName>Paraguai guaranii</displayName>
-				<displayName count="one">Paraguai guaranii</displayName>
-				<displayName count="other">Paraguai guaraniid</displayName>
+				<displayName>Paraguay guaranii</displayName>
+				<displayName count="one">Paraguay guaranii</displayName>
+				<displayName count="other">Paraguay guaraniid</displayName>
 				<symbol>PYG</symbol>
 				<symbol alt="narrow" draft="contributed">₲</symbol>
 			</currency>
 			<currency type="QAR">
-				<displayName>Quatari riaal</displayName>
-				<displayName count="one">Quatari riaal</displayName>
-				<displayName count="other">Quatari riaali</displayName>
+				<displayName>Katari riaal</displayName>
+				<displayName count="one">Katari riaal</displayName>
+				<displayName count="other">Katari riaali</displayName>
 				<symbol>QAR</symbol>
 			</currency>
+			<currency type="RHD">
+				<displayName>Rodeesia dollar</displayName>
+				<displayName count="one">Rodeesia dollar</displayName>
+				<displayName count="other">Rodeesia dollarit</displayName>
+			</currency>
 			<currency type="ROL">
-				<displayName>Rumeenia lei, -2005</displayName>
+				<displayName>Rumeenia leu (1952–2006)</displayName>
+				<displayName count="one">Rumeenia leu (1952–2006)</displayName>
+				<displayName count="other">Rumeenia leud (1952–2006)</displayName>
 			</currency>
 			<currency type="RON">
-				<displayName>Rumeenia lei</displayName>
-				<displayName count="one">Rumeenia lei</displayName>
-				<displayName count="other">Rumeenia leid</displayName>
+				<displayName>Rumeenia leu</displayName>
+				<displayName count="one">Rumeenia leu</displayName>
+				<displayName count="other">Rumeenia leud</displayName>
 				<symbol>RON</symbol>
 			</currency>
 			<currency type="RSD">
@@ -5306,7 +5814,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>RUB</symbol>
 			</currency>
 			<currency type="RUR">
-				<displayName>Venemaa rubla, 1991-1998</displayName>
+				<displayName>Venemaa rubla (1991–1998)</displayName>
 			</currency>
 			<currency type="RWF">
 				<displayName>Rwanda frank</displayName>
@@ -5315,24 +5823,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>RWF</symbol>
 			</currency>
 			<currency type="SAR">
-				<displayName>Saudi-Araabia riaal</displayName>
-				<displayName count="one">Saudi-Araabia riaal</displayName>
-				<displayName count="other">Saudi-Araabia riaali</displayName>
+				<displayName>Saudi Araabia riaal</displayName>
+				<displayName count="one">Saudi Araabia riaal</displayName>
+				<displayName count="other">Saudi Araabia riaali</displayName>
 				<symbol>SAR</symbol>
 			</currency>
 			<currency type="SBD">
-				<displayName>Saalomoni saarte dollar</displayName>
-				<displayName count="one">Saalomoni saarte dollar</displayName>
-				<displayName count="other">Saalomoni saarte dollarit</displayName>
+				<displayName>Saalomoni Saarte dollar</displayName>
+				<displayName count="one">Saalomoni Saarte dollar</displayName>
+				<displayName count="other">Saalomoni Saarte dollarit</displayName>
 				<symbol>SBD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SCR">
-				<displayName>Seišelli saarte ruupia</displayName>
-				<displayName count="one">Seišelli saarte ruupia</displayName>
-				<displayName count="other">Seišelli saarte ruupiat</displayName>
+				<displayName>Seišelli ruupia</displayName>
+				<displayName count="one">Seišelli ruupia</displayName>
+				<displayName count="other">Seišelli ruupiat</displayName>
 				<symbol>SCR</symbol>
 			</currency>
+			<currency type="SDD">
+				<displayName>Sudaani dinaar (1992–2007)</displayName>
+				<displayName count="one">Sudaani dinaar (1992–2007)</displayName>
+				<displayName count="other">Sudaani dinaari (1992–2007)</displayName>
+			</currency>
 			<currency type="SDG">
 				<displayName>Sudaani nael</displayName>
 				<displayName count="one">Sudaani nael</displayName>
@@ -5340,7 +5853,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>SDG</symbol>
 			</currency>
 			<currency type="SDP">
-				<displayName>Sudaani nael, 1957-1998</displayName>
+				<displayName>Sudaani nael (1957–1998)</displayName>
+				<displayName count="one">Sudaani nael (1957–1998)</displayName>
+				<displayName count="other">Sudaani naela (1957–1998)</displayName>
 			</currency>
 			<currency type="SEK">
 				<displayName>Rootsi kroon</displayName>
@@ -5363,11 +5878,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="SIT">
 				<displayName>Sloveenia tolar</displayName>
+				<displayName count="one">Sloveenia tolar</displayName>
+				<displayName count="other">Sloveenia tolarit</displayName>
 			</currency>
 			<currency type="SKK">
-				<displayName>Slovakkia kroon</displayName>
-				<displayName count="one">Slovakkia kroon</displayName>
-				<displayName count="other">Slovakkia krooni</displayName>
+				<displayName>Slovaki kroon</displayName>
+				<displayName count="one">Slovaki kroon</displayName>
+				<displayName count="other">Slovaki krooni</displayName>
 			</currency>
 			<currency type="SLL">
 				<displayName>Sierra Leone leoone</displayName>
@@ -5382,14 +5899,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>SOS</symbol>
 			</currency>
 			<currency type="SRD">
-				<displayName>Surinami dollar</displayName>
-				<displayName count="one">Surinami dollar</displayName>
-				<displayName count="other">Surinami dollarit</displayName>
+				<displayName>Suriname dollar</displayName>
+				<displayName count="one">Suriname dollar</displayName>
+				<displayName count="other">Suriname dollarit</displayName>
 				<symbol>SRD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SRG">
-				<displayName>Surinami kulden</displayName>
+				<displayName>Suriname kulden</displayName>
+				<displayName count="one">Suriname kulden</displayName>
+				<displayName count="other">Suriname kuldnat</displayName>
 			</currency>
 			<currency type="SSP">
 				<displayName>Lõuna-Sudaani nael</displayName>
@@ -5405,10 +5924,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>STD</symbol>
 			</currency>
 			<currency type="SUR">
-				<displayName>NSVL rubla</displayName>
+				<displayName>NSVL-i rubla</displayName>
 			</currency>
 			<currency type="SVC">
-				<displayName>Salvadori koloon</displayName>
+				<displayName>El Salvadori koloon</displayName>
+				<displayName count="one">El Salvadori koloon</displayName>
+				<displayName count="other">El Salvadori kolooni</displayName>
 			</currency>
 			<currency type="SYP">
 				<displayName>Süüria nael</displayName>
@@ -5427,6 +5948,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Tai baat</displayName>
 				<displayName count="other">Tai baati</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
+			</currency>
+			<currency type="TJR">
+				<displayName>Tadžikistani rubla</displayName>
+				<displayName count="one">Tadžikistani rubla</displayName>
+				<displayName count="other">Tadžikistani rubla</displayName>
 			</currency>
 			<currency type="TJS">
 				<displayName>Tadžikistani somoni</displayName>
@@ -5435,7 +5962,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>TJS</symbol>
 			</currency>
 			<currency type="TMM">
-				<displayName>Türkmenistani manat, 1993-2009</displayName>
+				<displayName>Türkmenistani manat (1993–2009)</displayName>
+				<displayName count="one">Türkmenistani manat (1993–2009)</displayName>
+				<displayName count="other">Türkmenistani manatit (1993–2009)</displayName>
 			</currency>
 			<currency type="TMT">
 				<displayName>Türkmenistani manat</displayName>
@@ -5457,14 +5986,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="TPE">
 				<displayName>Timori eskuudo</displayName>
+				<displayName count="one">Timori eskuudo</displayName>
+				<displayName count="other">Timori eskuudot</displayName>
 			</currency>
 			<currency type="TRL">
-				<displayName>Türgi liir</displayName>
+				<displayName>Türgi liir (1922–2005)</displayName>
+				<displayName count="one">Türgi liir (1922–2005)</displayName>
+				<displayName count="other">Türgi liiri (1922–2005)</displayName>
 			</currency>
 			<currency type="TRY">
-				<displayName>Türgi uus liir</displayName>
-				<displayName count="one">Türgi uus liir</displayName>
-				<displayName count="other">Türgi uut liiri</displayName>
+				<displayName>Türgi liir</displayName>
+				<displayName count="one">Türgi liir</displayName>
+				<displayName count="other">Türgi liiri</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
 			</currency>
@@ -5498,6 +6031,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="UAK">
 				<displayName>Ukraina karbovanets</displayName>
 			</currency>
+			<currency type="UGS">
+				<displayName>Uganda šilling (1966–1987)</displayName>
+				<displayName count="one">Uganda šilling (1966–1987)</displayName>
+				<displayName count="other">Uganda šillingit (1966–1987)</displayName>
+			</currency>
 			<currency type="UGX">
 				<displayName>Uganda šilling</displayName>
 				<displayName count="one">Uganda šilling</displayName>
@@ -5517,10 +6055,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="USS">
 				<displayName>USA sama päeva dollar</displayName>
 			</currency>
+			<currency type="UYP">
+				<displayName>Uruguay peeso (1975–1993)</displayName>
+				<displayName count="one">Uruguay peeso (1975–1993)</displayName>
+				<displayName count="other">Uruguay peesot (1975–1993)</displayName>
+			</currency>
 			<currency type="UYU">
-				<displayName>Uruguai peeso</displayName>
-				<displayName count="one">Uruguai peeso</displayName>
-				<displayName count="other">Uruguai peesot</displayName>
+				<displayName>Uruguay peeso</displayName>
+				<displayName count="one">Uruguay peeso</displayName>
+				<displayName count="other">Uruguay peesot</displayName>
 				<symbol>UYU</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -5531,13 +6074,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>UZS</symbol>
 			</currency>
 			<currency type="VEB">
-				<displayName>Venezuela bolívar (1871–2008)</displayName>
-				<displayName count="one">Venezuela bolívar (1871–2008)</displayName>
+				<displayName>Venezuela boliivar (1871–2008)</displayName>
+				<displayName count="one">Venezuela boliivar (1871–2008)</displayName>
 				<displayName count="other">Venezuela boliivarit (1871–2008)</displayName>
 			</currency>
 			<currency type="VEF">
-				<displayName>Venezuela bolívar</displayName>
-				<displayName count="one">Venezuela bolívar</displayName>
+				<displayName>Venezuela boliivar</displayName>
+				<displayName count="one">Venezuela boliivar</displayName>
 				<displayName count="other">Venezuela boliivarit</displayName>
 				<symbol>VEF</symbol>
 			</currency>
@@ -5548,6 +6091,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>₫</symbol>
 				<symbol alt="narrow" draft="contributed">₫</symbol>
 			</currency>
+			<currency type="VNN">
+				<displayName>Vietnami dong (1978–1985)</displayName>
+				<displayName count="one">Vietnami dong (1978–1985)</displayName>
+				<displayName count="other">Vietnami dongi (1978–1985)</displayName>
+			</currency>
 			<currency type="VUV">
 				<displayName>Vanuatu vatu</displayName>
 				<displayName count="one">Vanuatu vatu</displayName>
@@ -5555,26 +6103,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>VUV</symbol>
 			</currency>
 			<currency type="WST">
-				<displayName>Lääne-Samoa tala</displayName>
-				<displayName count="one">Lääne-Samoa tala</displayName>
-				<displayName count="other">Lääne-Samoa tala</displayName>
+				<displayName>Samoa taala</displayName>
+				<displayName count="one">Samoa taala</displayName>
+				<displayName count="other">Samoa taalat</displayName>
 				<symbol>WST</symbol>
 			</currency>
 			<currency type="XAF">
-				<displayName>CFA frank BEAC</displayName>
-				<displayName count="one">CFA frank BEAC</displayName>
-				<displayName count="other">CFA franki BEAC</displayName>
+				<displayName>Kesk-Aafrika CFA frank</displayName>
+				<displayName count="one">Kesk-Aafrika CFA frank</displayName>
+				<displayName count="other">Kesk-Aafrika CFA franki</displayName>
 				<symbol>FCFA</symbol>
 			</currency>
 			<currency type="XAG">
 				<displayName>hõbe</displayName>
-				<displayName count="one">hõbe</displayName>
-				<displayName count="other">hõbedat</displayName>
+				<displayName count="one">troiunts hõbedat</displayName>
+				<displayName count="other">troiuntsi hõbedat</displayName>
 			</currency>
 			<currency type="XAU">
 				<displayName>kuld</displayName>
-				<displayName count="one">kuld</displayName>
-				<displayName count="other">kulda</displayName>
+				<displayName count="one">troiunts kulda</displayName>
+				<displayName count="other">troiuntsi kulda</displayName>
 			</currency>
 			<currency type="XBA">
 				<displayName>EURCO</displayName>
@@ -5599,45 +6147,51 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="XEU">
 				<displayName>eküü</displayName>
+				<displayName count="one">eküü</displayName>
+				<displayName count="other">eküüd</displayName>
 			</currency>
 			<currency type="XFO">
 				<displayName>Prantsuse kuldfrank</displayName>
+				<displayName count="one">Prantsuse kuldfrank</displayName>
+				<displayName count="other">Prantsuse kuldfranki</displayName>
 			</currency>
 			<currency type="XFU">
 				<displayName>Prantsuse UIC-frank</displayName>
 			</currency>
 			<currency type="XOF">
-				<displayName>Aafrika ühisfrank BCEAO</displayName>
-				<displayName count="one">Aafrika ühisfrank BCEAO</displayName>
-				<displayName count="other">Aafrika ühisfranki BCEAO</displayName>
+				<displayName>Lääne-Aafrika CFA frank</displayName>
+				<displayName count="one">Lääne-Aafrika CFA frank</displayName>
+				<displayName count="other">Lääne-Aafrika CFA franki</displayName>
 				<symbol>CFA</symbol>
 			</currency>
 			<currency type="XPD">
 				<displayName>pallaadium</displayName>
-				<displayName count="one">pallaadium</displayName>
-				<displayName count="other">pallaadiumit</displayName>
+				<displayName count="one">troiunts pallaadiumit</displayName>
+				<displayName count="other">troiuntsi pallaadiumit</displayName>
 			</currency>
 			<currency type="XPF">
-				<displayName>Prantsuse Vaikse-Ookeani frank</displayName>
-				<displayName count="one">Prantsuse Vaikse-Ookeani frank</displayName>
-				<displayName count="other">Prantsuse Vaikse-Ookeani franki</displayName>
+				<displayName>CFP frank</displayName>
+				<displayName count="one">CFP frank</displayName>
+				<displayName count="other">CFP franki</displayName>
 				<symbol>CFPF</symbol>
 			</currency>
 			<currency type="XPT">
 				<displayName>plaatina</displayName>
-				<displayName count="one">plaatina</displayName>
-				<displayName count="other">plaatina</displayName>
+				<displayName count="one">troiunts plaatinat</displayName>
+				<displayName count="other">troiuntsi plaatinat</displayName>
 			</currency>
 			<currency type="XTS">
 				<displayName>vääringute testkood</displayName>
 			</currency>
 			<currency type="XXX">
 				<displayName>määramata rahaühik</displayName>
-				<displayName count="one">määramata rahaühik</displayName>
-				<displayName count="other">määramata rahaühikut</displayName>
+				<displayName count="one">(määramata rahaühik)</displayName>
+				<displayName count="other">(määramata rahaühikut)</displayName>
 			</currency>
 			<currency type="YDD">
 				<displayName>Jeemeni dinaar</displayName>
+				<displayName count="one">Jeemeni dinaar</displayName>
+				<displayName count="other">Jeemeni dinaari</displayName>
 			</currency>
 			<currency type="YER">
 				<displayName>Jeemeni riaal</displayName>
@@ -5646,15 +6200,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>YER</symbol>
 			</currency>
 			<currency type="YUM">
-				<displayName>Jugoslaavia uus dinaar</displayName>
+				<displayName>Jugoslaavia uus dinaar (1994–2002)</displayName>
+				<displayName count="one">Jugoslaavia uus dinaar (1994–2002)</displayName>
+				<displayName count="other">Jugoslaavia uut dinaari (1994–2002)</displayName>
 			</currency>
 			<currency type="YUN">
-				<displayName>Jugoslaavia konverteeritav dinaar</displayName>
+				<displayName>Jugoslaavia konverteeritav dinaar (1990–1992)</displayName>
+				<displayName count="one">Jugoslaavia konverteeritav dinaar (1990–1992)</displayName>
+				<displayName count="other">Jugoslaavia konverteeritavat dinaari (1990–1992)</displayName>
 			</currency>
 			<currency type="ZAR">
 				<displayName>Lõuna-Aafrika rand</displayName>
 				<displayName count="one">Lõuna-Aafrika rand</displayName>
-				<displayName count="other">LAVi randi</displayName>
+				<displayName count="other">Lõuna-Aafrika randi</displayName>
 				<symbol>ZAR</symbol>
 			</currency>
 			<currency type="ZMK">
@@ -5672,7 +6230,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Sairi zaire</displayName>
 			</currency>
 			<currency type="ZWD">
-				<displayName>Zimbabwe dollar</displayName>
+				<displayName>Zimbabwe dollar (1980–2008)</displayName>
+				<displayName count="one">Zimbabwe dollar (1980–2008)</displayName>
+				<displayName count="other">Zimbabwe dollarit (1980–2008)</displayName>
+			</currency>
+			<currency type="ZWL">
+				<displayName>Zimbabwe dollar (2009)</displayName>
+				<displayName count="one">Zimbabwe dollar (2009)</displayName>
+				<displayName count="other">Zimbabwe dollarit (2009)</displayName>
+			</currency>
+			<currency type="ZWR">
+				<displayName>Zimbabwe dollar (2008)</displayName>
+				<displayName count="one">Zimbabwe dollar (2008)</displayName>
+				<displayName count="other">Zimbabwe dollarit (2008)</displayName>
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
@@ -5686,49 +6256,76 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<compoundUnitPattern>{0} {1} kohta</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
-				<displayName>maa gravitatsioon</displayName>
-				<unitPattern count="one">{0} maa gravitatsiooni</unitPattern>
-				<unitPattern count="other">{0} maa gravitatsiooni</unitPattern>
+				<displayName>Maa raskuskiirendus</displayName>
+				<unitPattern count="one">{0} Maa raskuskiirendus</unitPattern>
+				<unitPattern count="other">{0} Maa raskuskiirendust</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
 				<displayName>meetrid sekundi ruudu kohta</displayName>
 				<unitPattern count="one">{0} meeter sekundi ruudu kohta</unitPattern>
 				<unitPattern count="other">{0} meetrit sekundi ruudu kohta</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName>kaareminut</displayName>
-				<unitPattern count="one">{0} kaareminut</unitPattern>
-				<unitPattern count="other">{0} kaareminut</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName>kaaresekund</displayName>
-				<unitPattern count="one">{0} kaaresekund</unitPattern>
-				<unitPattern count="other">{0} kaaresekund</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName>kraadi</displayName>
-				<unitPattern count="one">{0} kraad</unitPattern>
-				<unitPattern count="other">{0} kraadi</unitPattern>
+			<unit type="angle-revolution">
+				<displayName>täispööre</displayName>
+				<unitPattern count="one">{0} täispööre</unitPattern>
+				<unitPattern count="other">{0} täispööret</unitPattern>
 			</unit>
 			<unit type="angle-radian">
 				<displayName>radiaanid</displayName>
 				<unitPattern count="one">{0} radiaan</unitPattern>
 				<unitPattern count="other">{0} radiaani</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName>aakrid</displayName>
-				<unitPattern count="one">{0} aaker</unitPattern>
-				<unitPattern count="other">{0} aakrit</unitPattern>
+			<unit type="angle-degree">
+				<displayName>kraadid</displayName>
+				<unitPattern count="one">{0} kraad</unitPattern>
+				<unitPattern count="other">{0} kraadi</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>kaareminutid</displayName>
+				<unitPattern count="one">{0} kaareminut</unitPattern>
+				<unitPattern count="other">{0} kaareminutit</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>kaaresekundid</displayName>
+				<unitPattern count="one">{0} kaaresekund</unitPattern>
+				<unitPattern count="other">{0} kaaresekundit</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>ruutkilomeetrid</displayName>
+				<unitPattern count="one">{0} ruutkilomeeter</unitPattern>
+				<unitPattern count="other">{0} ruutkilomeetrit</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektarid</displayName>
 				<unitPattern count="one">{0} hektar</unitPattern>
 				<unitPattern count="other">{0} hektarit</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>ruutmeetrid</displayName>
+				<unitPattern count="one">{0} ruutmeeter</unitPattern>
+				<unitPattern count="other">{0} ruutmeetrit</unitPattern>
+				<perUnitPattern>{0} ruutmeetri kohta</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>ruutsentimeetrid</displayName>
 				<unitPattern count="one">{0} ruutsentimeeter</unitPattern>
 				<unitPattern count="other">{0} ruutsentimeetrit</unitPattern>
+				<perUnitPattern>{0} ruutsentimeetri kohta</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>ruutmiilid</displayName>
+				<unitPattern count="one">{0} ruutmiil</unitPattern>
+				<unitPattern count="other">{0} ruutmiili</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>aakrid</displayName>
+				<unitPattern count="one">{0} aaker</unitPattern>
+				<unitPattern count="other">{0} aakrit</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>ruutjardid</displayName>
+				<unitPattern count="one">{0} ruutjard</unitPattern>
+				<unitPattern count="other">{0} ruutjardi</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ruutjalad</displayName>
@@ -5739,139 +6336,140 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ruuttollid</displayName>
 				<unitPattern count="one">{0} ruuttoll</unitPattern>
 				<unitPattern count="other">{0} ruuttolli</unitPattern>
+				<perUnitPattern>{0} ruuttolli kohta</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>ruutkilomeetrid</displayName>
-				<unitPattern count="one">{0} ruutkilomeeter</unitPattern>
-				<unitPattern count="other">{0} ruutkilomeetrit</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>ruutmeetrid</displayName>
-				<unitPattern count="one">{0} ruutmeeter</unitPattern>
-				<unitPattern count="other">{0} ruutmeetrit</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>ruutmiili</displayName>
-				<unitPattern count="one">{0} ruutmiil</unitPattern>
-				<unitPattern count="other">{0} ruutmiili</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>ruutjardid</displayName>
-				<unitPattern count="one">{0} ruutjard</unitPattern>
-				<unitPattern count="other">{0} ruutjardi</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karaadid</displayName>
+				<unitPattern count="one">{0} karaat</unitPattern>
+				<unitPattern count="other">{0} karaati</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName>liitreid kilomeetri kohta</displayName>
+				<displayName>liitrid kilomeetri kohta</displayName>
 				<unitPattern count="one">{0} liiter kilomeetri kohta</unitPattern>
 				<unitPattern count="other">{0} liitrit kilomeetri kohta</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>liitrid 100 kilomeetri kohta</displayName>
+				<unitPattern count="one">liiter 100 kilomeetri kohta</unitPattern>
+				<unitPattern count="other">{0} liitrit 100 kilomeetri kohta</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
-				<displayName>miili galloni kohta</displayName>
+				<displayName>miilid galloni kohta</displayName>
 				<unitPattern count="one">{0} miil galloni kohta</unitPattern>
 				<unitPattern count="other">{0} miili galloni kohta</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bitid</displayName>
-				<unitPattern count="one">{0} bitt</unitPattern>
-				<unitPattern count="other">{0} bitti</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>baidid</displayName>
-				<unitPattern count="one">{0} bait</unitPattern>
-				<unitPattern count="other">{0} baiti</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabitid</displayName>
-				<unitPattern count="one">{0} gigabitt</unitPattern>
-				<unitPattern count="other">{0} gigabitti</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabaidid</displayName>
-				<unitPattern count="one">{0} gigabait</unitPattern>
-				<unitPattern count="other">{0} gigabaiti</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobitid</displayName>
-				<unitPattern count="one">{0} kilobitt</unitPattern>
-				<unitPattern count="other">{0} kilobitti</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobaidid</displayName>
-				<unitPattern count="one">{0} kilobait</unitPattern>
-				<unitPattern count="other">{0} kilobaiti</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabitid</displayName>
-				<unitPattern count="one">{0} megabitt</unitPattern>
-				<unitPattern count="other">{0} megabitti</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabaidid</displayName>
-				<unitPattern count="one">{0} megabait</unitPattern>
-				<unitPattern count="other">{0} megabaiti</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabitid</displayName>
-				<unitPattern count="one">{0} terabitt</unitPattern>
-				<unitPattern count="other">{0} terabitti</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabaidid</displayName>
 				<unitPattern count="one">{0} terabait</unitPattern>
 				<unitPattern count="other">{0} terabaiti</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabitid</displayName>
+				<unitPattern count="one">{0} terabitt</unitPattern>
+				<unitPattern count="other">{0} terabitti</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabaidid</displayName>
+				<unitPattern count="one">{0} gigabait</unitPattern>
+				<unitPattern count="other">{0} gigabaiti</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabitid</displayName>
+				<unitPattern count="one">{0} gigabitt</unitPattern>
+				<unitPattern count="other">{0} gigabitti</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabaidid</displayName>
+				<unitPattern count="one">{0} megabait</unitPattern>
+				<unitPattern count="other">{0} megabaiti</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabitid</displayName>
+				<unitPattern count="one">{0} megabitt</unitPattern>
+				<unitPattern count="other">{0} megabitti</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobaidid</displayName>
+				<unitPattern count="one">{0} kilobait</unitPattern>
+				<unitPattern count="other">{0} kilobaiti</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobitid</displayName>
+				<unitPattern count="one">{0} kilobitt</unitPattern>
+				<unitPattern count="other">{0} kilobitti</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>baidid</displayName>
+				<unitPattern count="one">{0} bait</unitPattern>
+				<unitPattern count="other">{0} baiti</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bitid</displayName>
+				<unitPattern count="one">{0} bitt</unitPattern>
+				<unitPattern count="other">{0} bitti</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>sajandid</displayName>
+				<unitPattern count="one">{0} sajand</unitPattern>
+				<unitPattern count="other">{0} sajandit</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>aastad</displayName>
+				<unitPattern count="one">{0} aasta</unitPattern>
+				<unitPattern count="other">{0} aastat</unitPattern>
+				<perUnitPattern>{0} aastas</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>kuud</displayName>
+				<unitPattern count="one">{0} kuu</unitPattern>
+				<unitPattern count="other">{0} kuud</unitPattern>
+				<perUnitPattern>{0} kuus</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>nädalad</displayName>
+				<unitPattern count="one">{0} nädal</unitPattern>
+				<unitPattern count="other">{0} nädalat</unitPattern>
+				<perUnitPattern>{0} nädalas</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
-				<displayName>ööpäeva</displayName>
+				<displayName>ööpäevad</displayName>
 				<unitPattern count="one">{0} ööpäev</unitPattern>
 				<unitPattern count="other">{0} ööpäeva</unitPattern>
+				<perUnitPattern>{0} ööpäevas</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName>tundi</displayName>
+				<displayName>tunnid</displayName>
 				<unitPattern count="one">{0} tund</unitPattern>
 				<unitPattern count="other">{0} tundi</unitPattern>
-				<perUnitPattern>{0}/h</perUnitPattern>
+				<perUnitPattern>{0} tunnis</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikrosekundid</displayName>
-				<unitPattern count="one">{0} mikrosekund</unitPattern>
-				<unitPattern count="other">{0} mikrosekundit</unitPattern>
+			<unit type="duration-minute">
+				<displayName>minutid</displayName>
+				<unitPattern count="one">{0} minut</unitPattern>
+				<unitPattern count="other">{0} minutit</unitPattern>
+				<perUnitPattern>{0} minutis</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>sekundid</displayName>
+				<unitPattern count="one">{0} sekund</unitPattern>
+				<unitPattern count="other">{0} sekundit</unitPattern>
+				<perUnitPattern>{0} sekundis</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>millisekundid</displayName>
 				<unitPattern count="one">{0} millisekund</unitPattern>
 				<unitPattern count="other">{0} millisekundit</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>minutid</displayName>
-				<unitPattern count="one">{0} minut</unitPattern>
-				<unitPattern count="other">{0} minutit</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>kuud</displayName>
-				<unitPattern count="one">{0} kuu</unitPattern>
-				<unitPattern count="other">{0} kuud</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>mikrosekundid</displayName>
+				<unitPattern count="one">{0} mikrosekund</unitPattern>
+				<unitPattern count="other">{0} mikrosekundit</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>nanosekundid</displayName>
 				<unitPattern count="one">{0} nanosekund</unitPattern>
 				<unitPattern count="other">{0} nanosekundit</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>sekundid</displayName>
-				<unitPattern count="one">{0} sekund</unitPattern>
-				<unitPattern count="other">{0} sekundit</unitPattern>
-				<perUnitPattern>{0}/s</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>nädalad</displayName>
-				<unitPattern count="one">{0} nädal</unitPattern>
-				<unitPattern count="other">{0} nädalat</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>aastad</displayName>
-				<unitPattern count="one">{0} aasta</unitPattern>
-				<unitPattern count="other">{0} aastat</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>amprid</displayName>
 				<unitPattern count="one">{0} amper</unitPattern>
@@ -5892,250 +6490,274 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} volt</unitPattern>
 				<unitPattern count="other">{0} volti</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokalorid</displayName>
+				<unitPattern count="one">{0} kilokalor</unitPattern>
+				<unitPattern count="other">{0} kilokalorit</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kalorid</displayName>
 				<unitPattern count="one">{0} kalor</unitPattern>
 				<unitPattern count="other">{0} kalorit</unitPattern>
 			</unit>
 			<unit type="energy-foodcalorie">
-				<displayName>Toidukalorid</displayName>
+				<displayName>toidukalorid</displayName>
 				<unitPattern count="one">{0} toidukalor</unitPattern>
 				<unitPattern count="other">{0} toidukalorit</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>džaulid</displayName>
-				<unitPattern count="one">{0} džaul</unitPattern>
-				<unitPattern count="other">{0} džauli</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokalorid</displayName>
-				<unitPattern count="one">{0} kilokalor</unitPattern>
-				<unitPattern count="other">{0} kilokalorit</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilodžaulid</displayName>
 				<unitPattern count="one">{0} kilodžaul</unitPattern>
 				<unitPattern count="other">{0} kilodžauli</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>džaulid</displayName>
+				<unitPattern count="one">{0} džaul</unitPattern>
+				<unitPattern count="other">{0} džauli</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilovatt-tunnid</displayName>
 				<unitPattern count="one">{0} kilovatt-tund</unitPattern>
 				<unitPattern count="other">{0} kilovatt-tundi</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
-				<displayName>gigaherts</displayName>
+				<displayName>gigahertsid</displayName>
 				<unitPattern count="one">{0} gigaherts</unitPattern>
 				<unitPattern count="other">{0} gigahertsi</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>herts</displayName>
-				<unitPattern count="one">{0} herts</unitPattern>
-				<unitPattern count="other">{0} hertsi</unitPattern>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<displayName>kiloherts</displayName>
-				<unitPattern count="one">{0} kiloherts</unitPattern>
-				<unitPattern count="other">{0} kilohertsi</unitPattern>
-			</unit>
 			<unit type="frequency-megahertz">
-				<displayName>megaherts</displayName>
+				<displayName>megahertsid</displayName>
 				<unitPattern count="one">{0} megaherts</unitPattern>
 				<unitPattern count="other">{0} megahertsi</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>astronoomilised ühikud</displayName>
-				<unitPattern count="one">{0} astronoomiline ühik</unitPattern>
-				<unitPattern count="other">{0} astronoomilist ühikut</unitPattern>
+			<unit type="frequency-kilohertz">
+				<displayName>kilohertsid</displayName>
+				<unitPattern count="one">{0} kiloherts</unitPattern>
+				<unitPattern count="other">{0} kilohertsi</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>sentimeetrid</displayName>
-				<unitPattern count="one">{0} sentimeeter</unitPattern>
-				<unitPattern count="other">{0} sentimeetrit</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hertsid</displayName>
+				<unitPattern count="one">{0} herts</unitPattern>
+				<unitPattern count="other">{0} hertsi</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>kilomeetrid</displayName>
+				<unitPattern count="one">{0} kilomeeter</unitPattern>
+				<unitPattern count="other">{0} kilomeetrit</unitPattern>
+				<perUnitPattern>{0} kilomeetri kohta</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>meetrid</displayName>
+				<unitPattern count="one">{0} meeter</unitPattern>
+				<unitPattern count="other">{0} meetrit</unitPattern>
+				<perUnitPattern>{0} meetri kohta</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>detsimeetrid</displayName>
 				<unitPattern count="one">{0} detsimeeter</unitPattern>
 				<unitPattern count="other">{0} detsimeetrit</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>jalg</displayName>
-				<unitPattern count="one">{0} jalg</unitPattern>
-				<unitPattern count="other">{0} jalga</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>tolli</displayName>
-				<unitPattern count="one">{0} toll</unitPattern>
-				<unitPattern count="other">{0} tolli</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilomeetrid</displayName>
-				<unitPattern count="one">{0} kilomeeter</unitPattern>
-				<unitPattern count="other">{0} kilomeetrit</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>valgusaastad</displayName>
-				<unitPattern count="one">{0} valgusaasta</unitPattern>
-				<unitPattern count="other">{0} valgusaastat</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>meetrid</displayName>
-				<unitPattern count="one">{0} meeter</unitPattern>
-				<unitPattern count="other">{0} meetrit</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>mikromeetrid</displayName>
-				<unitPattern count="one">{0} mikromeeter</unitPattern>
-				<unitPattern count="other">{0} mikromeetrit</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>miili</displayName>
-				<unitPattern count="one">{0} miil</unitPattern>
-				<unitPattern count="other">{0} miili</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>sentimeetrid</displayName>
+				<unitPattern count="one">{0} sentimeeter</unitPattern>
+				<unitPattern count="other">{0} sentimeetrit</unitPattern>
+				<perUnitPattern>{0} sentimeetri kohta</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>millimeetrid</displayName>
 				<unitPattern count="one">{0} millimeeter</unitPattern>
 				<unitPattern count="other">{0} millimeetrit</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikromeetrid</displayName>
+				<unitPattern count="one">{0} mikromeeter</unitPattern>
+				<unitPattern count="other">{0} mikromeetrit</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanomeetrid</displayName>
 				<unitPattern count="one">{0} nanomeeter</unitPattern>
 				<unitPattern count="other">{0} nanomeetrit</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>meremiilid</displayName>
-				<unitPattern count="one">{0} meremiil</unitPattern>
-				<unitPattern count="other">{0} meremiili</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsekid</displayName>
-				<unitPattern count="one">{0} parsek</unitPattern>
-				<unitPattern count="other">{0} parsekit</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pikomeetrid</displayName>
 				<unitPattern count="one">{0} pikomeeter</unitPattern>
 				<unitPattern count="other">{0} pikomeetrit</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>miilid</displayName>
+				<unitPattern count="one">{0} miil</unitPattern>
+				<unitPattern count="other">{0} miili</unitPattern>
+			</unit>
 			<unit type="length-yard">
-				<displayName>jardi</displayName>
+				<displayName>jardid</displayName>
 				<unitPattern count="one">{0} jard</unitPattern>
 				<unitPattern count="other">{0} jardi</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>jalad</displayName>
+				<unitPattern count="one">{0} jalg</unitPattern>
+				<unitPattern count="other">{0} jalga</unitPattern>
+				<perUnitPattern>{0} jala kohta</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>tollid</displayName>
+				<unitPattern count="one">{0} toll</unitPattern>
+				<unitPattern count="other">{0} tolli</unitPattern>
+				<perUnitPattern>{0} tolli kohta</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsekid</displayName>
+				<unitPattern count="one">{0} parsek</unitPattern>
+				<unitPattern count="other">{0} parsekit</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>valgusaastad</displayName>
+				<unitPattern count="one">{0} valgusaasta</unitPattern>
+				<unitPattern count="other">{0} valgusaastat</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>astronoomilised ühikud</displayName>
+				<unitPattern count="one">{0} astronoomiline ühik</unitPattern>
+				<unitPattern count="other">{0} astronoomilist ühikut</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>furlongid</displayName>
+				<unitPattern count="one">{0} furlong</unitPattern>
+				<unitPattern count="other">{0} furlongi</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>süllad</displayName>
+				<unitPattern count="one">{0} süld</unitPattern>
+				<unitPattern count="other">{0} sülda</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>meremiilid</displayName>
+				<unitPattern count="one">{0} meremiil</unitPattern>
+				<unitPattern count="other">{0} meremiili</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>Skandinaavia miilid</displayName>
+				<unitPattern count="one">{0} Skandinaavia miil</unitPattern>
+				<unitPattern count="other">{0} Skandinaavia miili</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>luks</displayName>
 				<unitPattern count="one">{0} luks</unitPattern>
 				<unitPattern count="other">{0} luksi</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karaadid</displayName>
-				<unitPattern count="one">{0} karaat</unitPattern>
-				<unitPattern count="other">{0} karaati</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>grammi</displayName>
-				<unitPattern count="one">{0} gramm</unitPattern>
-				<unitPattern count="other">{0} grammi</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogrammi</displayName>
-				<unitPattern count="one">{0} kilogramm</unitPattern>
-				<unitPattern count="other">{0} kilogrammi</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>tonnid</displayName>
 				<unitPattern count="one">{0} tonn</unitPattern>
 				<unitPattern count="other">{0} tonni</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mikrogrammid</displayName>
-				<unitPattern count="one">mikrogramm</unitPattern>
-				<unitPattern count="other">{0} mikrogrammi</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogrammid</displayName>
+				<unitPattern count="one">{0} kilogramm</unitPattern>
+				<unitPattern count="other">{0} kilogrammi</unitPattern>
+				<perUnitPattern>{0} kilogrammi kohta</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>grammid</displayName>
+				<unitPattern count="one">{0} gramm</unitPattern>
+				<unitPattern count="other">{0} grammi</unitPattern>
+				<perUnitPattern>{0} grammi kohta</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>milligrammid</displayName>
 				<unitPattern count="one">{0} milligramm</unitPattern>
 				<unitPattern count="other">{0} milligrammi</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>untsi</displayName>
-				<unitPattern count="one">{0} unts</unitPattern>
-				<unitPattern count="other">{0} untsi</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>trooja untsid</displayName>
-				<unitPattern count="one">{0} trooja unts</unitPattern>
-				<unitPattern count="other">{0} trooja untsi</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>naela</displayName>
-				<unitPattern count="one">{0} nael</unitPattern>
-				<unitPattern count="other">{0} naela</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>mikrogrammid</displayName>
+				<unitPattern count="one">mikrogramm</unitPattern>
+				<unitPattern count="other">{0} mikrogrammi</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>lühikesed tonnid</displayName>
-				<unitPattern count="one">{0} lühikene tonn</unitPattern>
+				<unitPattern count="one">{0} lühike tonn</unitPattern>
 				<unitPattern count="other">{0} lühikest tonni</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName>kivid</displayName>
+				<unitPattern count="one">{0} kivi</unitPattern>
+				<unitPattern count="other">{0} kivi</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>naelad</displayName>
+				<unitPattern count="one">{0} nael</unitPattern>
+				<unitPattern count="other">{0} naela</unitPattern>
+				<perUnitPattern>{0} naela kohta</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>untsid</displayName>
+				<unitPattern count="one">{0} unts</unitPattern>
+				<unitPattern count="other">{0} untsi</unitPattern>
+				<perUnitPattern>{0} untsi kohta</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>troiuntsid</displayName>
+				<unitPattern count="one">{0} troiunts</unitPattern>
+				<unitPattern count="other">{0} troiuntsi</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karaadid</displayName>
+				<unitPattern count="one">{0} karaat</unitPattern>
+				<unitPattern count="other">{0} karaati</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigavatid</displayName>
 				<unitPattern count="one">{0} gigavatt</unitPattern>
 				<unitPattern count="other">{0} gigavatti</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hobujõud</displayName>
-				<unitPattern count="one">{0} hobujõud</unitPattern>
-				<unitPattern count="other">{0} hobujõudu</unitPattern>
+			<unit type="power-megawatt">
+				<displayName>megavatid</displayName>
+				<unitPattern count="one">{0} megavatt</unitPattern>
+				<unitPattern count="other">{0} megavatti</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName>kilovatid</displayName>
 				<unitPattern count="one">{0} kilovatt</unitPattern>
 				<unitPattern count="other">{0} kilovatti</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<displayName>megavatid</displayName>
-				<unitPattern count="one">{0} megavatt</unitPattern>
-				<unitPattern count="other">{0} megavatti</unitPattern>
+			<unit type="power-watt">
+				<displayName>vatid</displayName>
+				<unitPattern count="one">{0} vatt</unitPattern>
+				<unitPattern count="other">{0} vatti</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<displayName>millivatid</displayName>
 				<unitPattern count="one">{0} millivatt</unitPattern>
 				<unitPattern count="other">{0} millivatti</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName>vatid</displayName>
-				<unitPattern count="one">{0} vatt</unitPattern>
-				<unitPattern count="other">{0} vatti</unitPattern>
+			<unit type="power-horsepower">
+				<displayName>hobujõud</displayName>
+				<unitPattern count="one">{0} hobujõud</unitPattern>
+				<unitPattern count="other">{0} hobujõudu</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hektopaskalid</displayName>
 				<unitPattern count="one">{0} hektopaskal</unitPattern>
 				<unitPattern count="other">{0} hektopaskalit</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>tolli elavhõbedasammast</displayName>
-				<unitPattern count="one">{0} toll elavhõbedasammast</unitPattern>
-				<unitPattern count="other">{0} tolli elavhõbedasammast</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>millibaari</displayName>
-				<unitPattern count="one">{0} millibaar</unitPattern>
-				<unitPattern count="other">{0} millibaari</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
-				<displayName>millimeetrit elavhõbedasammast</displayName>
+				<displayName>millimeetrid elavhõbedasammast</displayName>
 				<unitPattern count="one">{0} millimeeter elavhõbedasammast</unitPattern>
 				<unitPattern count="other">{0} millimeetrit elavhõbedasammast</unitPattern>
 			</unit>
 			<unit type="pressure-pound-per-square-inch">
-				<displayName>naela ruuttolli kohta</displayName>
+				<displayName>naelad ruuttolli kohta</displayName>
 				<unitPattern count="one">{0} nael ruuttolli kohta</unitPattern>
 				<unitPattern count="other">{0} naela ruuttolli kohta</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karaadid</displayName>
-				<unitPattern count="one">{0} karaat</unitPattern>
-				<unitPattern count="other">{0} karaati</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>tollid elavhõbedasammast</displayName>
+				<unitPattern count="one">{0} toll elavhõbedasammast</unitPattern>
+				<unitPattern count="other">{0} tolli elavhõbedasammast</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>millibaarid</displayName>
+				<unitPattern count="one">{0} millibaar</unitPattern>
+				<unitPattern count="other">{0} millibaari</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilomeetrid tunnis</displayName>
@@ -6148,50 +6770,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} meetrit sekundis</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<displayName>miili tunnis</displayName>
+				<displayName>miilid tunnis</displayName>
 				<unitPattern count="one">{0} miil tunnis</unitPattern>
 				<unitPattern count="other">{0} miili tunnis</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>sõlm</displayName>
+				<unitPattern count="one">{0} sõlm</unitPattern>
+				<unitPattern count="other">{0} sõlme</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
-				<displayName>Celsiuse kraadi</displayName>
+				<displayName>Celsiuse kraadid</displayName>
 				<unitPattern count="one">{0} Celsiuse kraad</unitPattern>
 				<unitPattern count="other">{0} Celsiuse kraadi</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
-				<displayName>Fahrenheiti kraadi</displayName>
+				<displayName>Fahrenheiti kraadid</displayName>
 				<unitPattern count="one">{0} Fahrenheiti kraad</unitPattern>
 				<unitPattern count="other">{0} Fahrenheiti kraadi</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
-				<displayName>kelvinit</displayName>
+				<displayName>kelvinid</displayName>
 				<unitPattern count="one">{0} kelvin</unitPattern>
 				<unitPattern count="other">{0} kelvinit</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>aaker-jalg</displayName>
-				<unitPattern count="one">{0} aaker-jalg</unitPattern>
-				<unitPattern count="other">{0} aaker-jalga</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>sentiliitrid</displayName>
-				<unitPattern count="one">{0} sentiliiter</unitPattern>
-				<unitPattern count="other">{0} sentiliitrit</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>kuupsentimeetrid</displayName>
-				<unitPattern count="one">{0} kuupsentimeeter</unitPattern>
-				<unitPattern count="other">{0} kuupsentimeetrit</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>kuupjalg</displayName>
-				<unitPattern count="one">{0} kuupjalg</unitPattern>
-				<unitPattern count="other">{0} kuupjalga</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>kuuptollid</displayName>
-				<unitPattern count="one">{0} kuuptoll</unitPattern>
-				<unitPattern count="other">{0} kuuptolli</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kuupkilomeetrid</displayName>
 				<unitPattern count="one">{0} kuupkilomeeter</unitPattern>
@@ -6201,9 +6808,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>kuupmeetrid</displayName>
 				<unitPattern count="one">{0} kuupmeeter</unitPattern>
 				<unitPattern count="other">{0} kuupmeetrit</unitPattern>
+				<perUnitPattern>{0} kuupmeetri kohta</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>kuupsentimeetrid</displayName>
+				<unitPattern count="one">{0} kuupsentimeeter</unitPattern>
+				<unitPattern count="other">{0} kuupsentimeetrit</unitPattern>
+				<perUnitPattern>{0} kuupsentimeetri kohta</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
-				<displayName>kuupmiili</displayName>
+				<displayName>kuupmiilid</displayName>
 				<unitPattern count="one">{0} kuupmiil</unitPattern>
 				<unitPattern count="other">{0} kuupmiili</unitPattern>
 			</unit>
@@ -6212,25 +6826,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kuupjard</unitPattern>
 				<unitPattern count="other">{0} kuupjardi</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>tassid</displayName>
-				<unitPattern count="one">{0} tass</unitPattern>
-				<unitPattern count="other">{0} tassi</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>kuupjalad</displayName>
+				<unitPattern count="one">{0} kuupjalg</unitPattern>
+				<unitPattern count="other">{0} kuupjalga</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>detsiliitrid</displayName>
-				<unitPattern count="one">{0} detsiliiter</unitPattern>
-				<unitPattern count="other">{0} detsiliitrit</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>kuuptollid</displayName>
+				<unitPattern count="one">{0} kuuptoll</unitPattern>
+				<unitPattern count="other">{0} kuuptolli</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>vedelike untsid</displayName>
-				<unitPattern count="one">{0} vedelike unts</unitPattern>
-				<unitPattern count="other">{0} vedelike untsi</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gallonid</displayName>
-				<unitPattern count="one">{0} gallon</unitPattern>
-				<unitPattern count="other">{0} gallonit</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megaliitrid</displayName>
+				<unitPattern count="one">{0} megaliiter</unitPattern>
+				<unitPattern count="other">{0} megaliitrit</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hektoliitrid</displayName>
@@ -6241,44 +6850,82 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>liitrid</displayName>
 				<unitPattern count="one">{0} liiter</unitPattern>
 				<unitPattern count="other">{0} liitrit</unitPattern>
+				<perUnitPattern>{0} liitri kohta</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megaliitrid</displayName>
-				<unitPattern count="one">{0} megaliiter</unitPattern>
-				<unitPattern count="other">{0} megaliitrit</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>detsiliitrid</displayName>
+				<unitPattern count="one">{0} detsiliiter</unitPattern>
+				<unitPattern count="other">{0} detsiliitrit</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>sentiliitrid</displayName>
+				<unitPattern count="one">{0} sentiliiter</unitPattern>
+				<unitPattern count="other">{0} sentiliitrit</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>milliliitrid</displayName>
 				<unitPattern count="one">{0} milliliiter</unitPattern>
 				<unitPattern count="other">{0} milliliitrit</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pindid</displayName>
-				<unitPattern count="one">{0} pint</unitPattern>
-				<unitPattern count="other">{0} pinti</unitPattern>
+			<unit type="volume-acre-foot">
+				<displayName>aakerjalad</displayName>
+				<unitPattern count="one">{0} aakerjalg</unitPattern>
+				<unitPattern count="other">{0} aakerjalga</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>buššelid</displayName>
+				<unitPattern count="one">{0} buššel</unitPattern>
+				<unitPattern count="other">{0} buššelit</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gallonid</displayName>
+				<unitPattern count="one">{0} gallon</unitPattern>
+				<unitPattern count="other">{0} gallonit</unitPattern>
+				<perUnitPattern>{0} galloni kohta</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>kvardid</displayName>
 				<unitPattern count="one">{0} kvart</unitPattern>
 				<unitPattern count="other">{0} kvarti</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pindid</displayName>
+				<unitPattern count="one">{0} pint</unitPattern>
+				<unitPattern count="other">{0} pinti</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>tassid</displayName>
+				<unitPattern count="one">{0} tass</unitPattern>
+				<unitPattern count="other">{0} tassi</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>vedelikuuntsid</displayName>
+				<unitPattern count="one">{0} vedelikuunts</unitPattern>
+				<unitPattern count="other">{0} vedelikuuntsi</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
-				<displayName>supilusikatäis</displayName>
-				<unitPattern count="one">{0} supilusikatäis</unitPattern>
-				<unitPattern count="other">{0} supilusikatäit</unitPattern>
+				<displayName>supilusikad</displayName>
+				<unitPattern count="one">{0} supilusikas</unitPattern>
+				<unitPattern count="other">{0} supilusikat</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
-				<displayName>teelusikatäis</displayName>
-				<unitPattern count="one">{0} teelusikatäis</unitPattern>
-				<unitPattern count="other">{0} teelusikatäit</unitPattern>
+				<displayName>teelusikad</displayName>
+				<unitPattern count="one">{0} teelusikas</unitPattern>
+				<unitPattern count="other">{0} teelusikat</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} idapikkust</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} põhjalaiust</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} lõunalaiust</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} läänepikkust</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
 				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
-				<displayName>maa gravitatsioon</displayName>
+				<displayName>Maa raskuskiirendus</displayName>
 				<unitPattern count="one">{0} G</unitPattern>
 				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
@@ -6287,43 +6934,65 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-radian">
+				<displayName>radiaanid</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>kraadid</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>kaareminut</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
 			</unit>
 			<unit type="angle-arc-second">
-				<displayName>kaaresekund</displayName>
+				<displayName>″</displayName>
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>kraadi</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radiaanid</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>aakrid</displayName>
-				<unitPattern count="one">{0} aaker</unitPattern>
-				<unitPattern count="other">{0} aakrit</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektarid</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>aakrid</displayName>
+				<unitPattern count="one">{0} aaker</unitPattern>
+				<unitPattern count="other">{0} aakrit</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>ruutjardid</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
-				<displayName>ruutjalga</displayName>
+				<displayName>ruutjalad</displayName>
 				<unitPattern count="one">{0} ft²</unitPattern>
 				<unitPattern count="other">{0} ft²</unitPattern>
 			</unit>
@@ -6331,139 +7000,140 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ruuttollid</displayName>
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>ruutjardid</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karaat</displayName>
+				<unitPattern count="one">{0} ct</unitPattern>
+				<unitPattern count="other">{0} ct</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName>liitrit/km</displayName>
-				<unitPattern count="one">{0} L/km</unitPattern>
-				<unitPattern count="other">{0} L/km</unitPattern>
+				<displayName>l/km</displayName>
+				<unitPattern count="one">{0} l/km</unitPattern>
+				<unitPattern count="other">{0} l/km</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100km</displayName>
+				<unitPattern count="one">{0} l/100km</unitPattern>
+				<unitPattern count="other">{0} l/100km</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>miil/gallon</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bitt</displayName>
-				<unitPattern count="one">{0} b</unitPattern>
-				<unitPattern count="other">{0} b</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bait</displayName>
-				<unitPattern count="one">{0} bait</unitPattern>
-				<unitPattern count="other">{0} baiti</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>TB</displayName>
+				<unitPattern count="one">{0} TB</unitPattern>
+				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>Tb</displayName>
 				<unitPattern count="one">{0} Tb</unitPattern>
 				<unitPattern count="other">{0} Tb</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>TB</displayName>
-				<unitPattern count="one">{0} TB</unitPattern>
-				<unitPattern count="other">{0} TB</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bait</displayName>
+				<unitPattern count="one">{0} bait</unitPattern>
+				<unitPattern count="other">{0} baiti</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bitt</displayName>
+				<unitPattern count="one">{0} b</unitPattern>
+				<unitPattern count="other">{0} b</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>saj</displayName>
+				<unitPattern count="one">{0} saj</unitPattern>
+				<unitPattern count="other">{0} saj</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>aastad</displayName>
+				<unitPattern count="one">{0} a</unitPattern>
+				<unitPattern count="other">{0} a</unitPattern>
+				<perUnitPattern>{0}/a</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>kuud</displayName>
+				<unitPattern count="one">{0} kuu</unitPattern>
+				<unitPattern count="other">{0} kuud</unitPattern>
+				<perUnitPattern>{0}/k</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>näd</displayName>
+				<unitPattern count="one">{0} näd</unitPattern>
+				<unitPattern count="other">{0} näd</unitPattern>
+				<perUnitPattern>{0}/näd</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
-				<displayName>ööpäeva</displayName>
+				<displayName>päevad</displayName>
 				<unitPattern count="one">{0} päev</unitPattern>
 				<unitPattern count="other">{0} päeva</unitPattern>
+				<perUnitPattern>{0}/ööp</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName>h</displayName>
-				<unitPattern count="one">{0} h</unitPattern>
-				<unitPattern count="other">{0} h</unitPattern>
-				<perUnitPattern>{0}/h</perUnitPattern>
+				<displayName>t</displayName>
+				<unitPattern count="one">{0} t</unitPattern>
+				<unitPattern count="other">{0} t</unitPattern>
+				<perUnitPattern>{0}/t</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>min</displayName>
+				<unitPattern count="one">{0} min</unitPattern>
+				<unitPattern count="other">{0} min</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>sek</displayName>
+				<unitPattern count="one">{0} sek</unitPattern>
+				<unitPattern count="other">{0} sek</unitPattern>
+				<perUnitPattern>{0}/sek</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
 			<unit type="duration-microsecond">
 				<displayName>μs</displayName>
 				<unitPattern count="one">{0} μs</unitPattern>
 				<unitPattern count="other">{0} μs</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>millisekundit</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
-			<unit type="duration-minute">
-				<displayName>min</displayName>
-				<unitPattern count="one">{0} min</unitPattern>
-				<unitPattern count="other">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>kuud</displayName>
-				<unitPattern count="one">{0} kuu</unitPattern>
-				<unitPattern count="other">{0} kuud</unitPattern>
-			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>ns</displayName>
 				<unitPattern count="one">{0} ns</unitPattern>
 				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>s</displayName>
-				<unitPattern count="one">{0} s</unitPattern>
-				<unitPattern count="other">{0} s</unitPattern>
-				<perUnitPattern>{0}/s</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>nädalad</displayName>
-				<unitPattern count="one">{0} nädal</unitPattern>
-				<unitPattern count="other">{0} nädalat</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>aastad</displayName>
-				<unitPattern count="one">{0} a</unitPattern>
-				<unitPattern count="other">{0} a</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>amprid</displayName>
 				<unitPattern count="one">{0} A</unitPattern>
@@ -6484,6 +7154,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -6494,21 +7169,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Cal</unitPattern>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>džaulid</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>džaulid</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kW-tund</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -6519,36 +7189,74 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>aü</displayName>
-				<unitPattern count="one">{0} aü</unitPattern>
-				<unitPattern count="other">{0} aü</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>meetrid</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>mm</displayName>
+				<unitPattern count="one">{0} mm</unitPattern>
+				<unitPattern count="other">{0} mm</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nm</displayName>
+				<unitPattern count="one">{0} nm</unitPattern>
+				<unitPattern count="other">{0} nm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>pm</displayName>
+				<unitPattern count="one">{0} pm</unitPattern>
+				<unitPattern count="other">{0} pm</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="one">{0} miil</unitPattern>
+				<unitPattern count="other">{0} miili</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>jardid</displayName>
+				<unitPattern count="one">{0} jard</unitPattern>
+				<unitPattern count="other">{0} jardi</unitPattern>
+			</unit>
 			<unit type="length-foot">
 				<displayName>ft</displayName>
 				<unitPattern count="one">{0} jalg</unitPattern>
@@ -6559,161 +7267,129 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} toll</unitPattern>
 				<unitPattern count="other">{0} tolli</unitPattern>
 			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
+			<unit type="length-parsec">
+				<displayName>parsekid</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
 			</unit>
 			<unit type="length-light-year">
 				<displayName>valgusaastad</displayName>
 				<unitPattern count="one">{0} valgusa.</unitPattern>
 				<unitPattern count="other">{0} valgusa.</unitPattern>
 			</unit>
-			<unit type="length-meter">
-				<displayName>meetrid</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
+			<unit type="length-astronomical-unit">
+				<displayName>aü</displayName>
+				<unitPattern count="one">{0} aü</unitPattern>
+				<unitPattern count="other">{0} aü</unitPattern>
 			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
+			<unit type="length-furlong">
+				<displayName>furlongid</displayName>
 			</unit>
-			<unit type="length-mile">
-				<displayName>mi</displayName>
-				<unitPattern count="one">{0} miil</unitPattern>
-				<unitPattern count="other">{0} miili</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>mm</displayName>
-				<unitPattern count="one">{0} mm</unitPattern>
-				<unitPattern count="other">{0} mm</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<displayName>nm</displayName>
-				<unitPattern count="one">{0} nm</unitPattern>
-				<unitPattern count="other">{0} nm</unitPattern>
+			<unit type="length-fathom">
+				<displayName>süllad</displayName>
 			</unit>
 			<unit type="length-nautical-mile">
 				<displayName>nmi</displayName>
 				<unitPattern count="one">{0} nmi</unitPattern>
 				<unitPattern count="other">{0} nmi</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<displayName>parsekid</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName>pm</displayName>
-				<unitPattern count="one">{0} pm</unitPattern>
-				<unitPattern count="other">{0} pm</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<displayName>jardi</displayName>
-				<unitPattern count="one">{0} jard</unitPattern>
-				<unitPattern count="other">{0} jardi</unitPattern>
-			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karaat</displayName>
-				<unitPattern count="one">{0} ct</unitPattern>
-				<unitPattern count="other">{0} ct</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>grammi</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>lüh t</displayName>
+				<unitPattern count="one">{0} lüh t</unitPattern>
+				<unitPattern count="other">{0} lüh t</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName>kivid</displayName>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
 			<unit type="mass-ounce">
 				<displayName>oz</displayName>
 				<unitPattern count="one">{0} oz</unitPattern>
 				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
 			</unit>
 			<unit type="mass-ounce-troy">
 				<displayName>oz t</displayName>
 				<unitPattern count="one">{0} oz t</unitPattern>
 				<unitPattern count="other">{0} oz t</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<displayName>lüh. tonnid</displayName>
-				<unitPattern count="one">{0} lüh. t</unitPattern>
-				<unitPattern count="other">{0} lüh. t</unitPattern>
+			<unit type="mass-carat">
+				<displayName>ct</displayName>
+				<unitPattern count="one">{0} ct</unitPattern>
+				<unitPattern count="other">{0} ct</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hj</displayName>
-				<unitPattern count="one">{0} hj</unitPattern>
-				<unitPattern count="other">{0} hj</unitPattern>
+			<unit type="power-megawatt">
+				<displayName>MW</displayName>
+				<unitPattern count="one">{0} MW</unitPattern>
+				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName>kW</displayName>
 				<unitPattern count="one">{0} kW</unitPattern>
 				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<displayName>MW</displayName>
-				<unitPattern count="one">{0} MW</unitPattern>
-				<unitPattern count="other">{0} MW</unitPattern>
+			<unit type="power-watt">
+				<displayName>vatid</displayName>
+				<unitPattern count="one">{0} W</unitPattern>
+				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<displayName>mW</displayName>
 				<unitPattern count="one">{0} mW</unitPattern>
 				<unitPattern count="other">{0} mW</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName>vatid</displayName>
-				<unitPattern count="one">{0} W</unitPattern>
-				<unitPattern count="other">{0} W</unitPattern>
+			<unit type="power-horsepower">
+				<displayName>hj</displayName>
+				<unitPattern count="one">{0} hj</unitPattern>
+				<unitPattern count="other">{0} hj</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>tolli elavhõbedasammast</displayName>
-				<unitPattern count="one">{0} toll Hg</unitPattern>
-				<unitPattern count="other">{0} tolli Hg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -6724,10 +7400,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karaat</displayName>
-				<unitPattern count="one">{0} ct</unitPattern>
-				<unitPattern count="other">{0} ct</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>in Hg</displayName>
+				<unitPattern count="one">{0} in Hg</unitPattern>
+				<unitPattern count="other">{0} in Hg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -6744,6 +7425,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0} °C</unitPattern>
@@ -6759,31 +7445,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>aaker ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>kuuptollid</displayName>
-				<unitPattern count="one">{0} toll³</unitPattern>
-				<unitPattern count="other">{0} tolli³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -6793,9 +7454,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
-				<displayName>kuupmiili</displayName>
+				<displayName>kuupmiilid</displayName>
 				<unitPattern count="one">{0} mi³</unitPattern>
 				<unitPattern count="other">{0} mi³</unitPattern>
 			</unit>
@@ -6804,25 +7472,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>tass</displayName>
-				<unitPattern count="one">{0} tass</unitPattern>
-				<unitPattern count="other">{0} tassi</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>kuuptollid</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -6833,27 +7496,57 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>liitrid</displayName>
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="one">{0} Ml</unitPattern>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
 				<unitPattern count="one">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pindid</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-acre-foot">
+				<displayName>aakerjalg</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>buššelid</displayName>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>kvart</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pindid</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>tass</displayName>
+				<unitPattern count="one">{0} tass</unitPattern>
+				<unitPattern count="other">{0} tassi</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>spl</displayName>
 				<unitPattern count="one">{0} spl</unitPattern>
@@ -6864,6 +7557,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} tl</unitPattern>
 				<unitPattern count="other">{0} tl</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} ip</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} pl</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} ll</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} lp</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -6873,6 +7572,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}G</unitPattern>
 				<unitPattern count="other">{0}G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -6881,104 +7584,88 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} aaker</unitPattern>
-				<unitPattern count="other">{0} aakrit</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
-				<unitPattern count="one">{0}ha</unitPattern>
-				<unitPattern count="other">{0}ha</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0}km²</unitPattern>
-				<unitPattern count="other">{0}km²</unitPattern>
+				<unitPattern count="one">{0} ha</unitPattern>
+				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
 			<unit type="area-square-meter">
-				<unitPattern count="one">{0}m²</unitPattern>
-				<unitPattern count="other">{0}m²</unitPattern>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
 			</unit>
 			<unit type="area-square-mile">
 				<unitPattern count="one">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
-			<unit type="duration-day">
-				<displayName>ööpäeva</displayName>
-				<unitPattern count="one">{0} p</unitPattern>
-				<unitPattern count="other">{0} p</unitPattern>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} aaker</unitPattern>
+				<unitPattern count="other">{0} aakrit</unitPattern>
 			</unit>
-			<unit type="duration-hour">
-				<displayName>h</displayName>
-				<unitPattern count="one">{0} h</unitPattern>
-				<unitPattern count="other">{0} h</unitPattern>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>millisekundit</displayName>
-				<unitPattern count="one">{0}ms</unitPattern>
-				<unitPattern count="other">{0}ms</unitPattern>
-			</unit>
-			<unit type="duration-minute">
-				<displayName>min</displayName>
-				<unitPattern count="one">{0} min</unitPattern>
-				<unitPattern count="other">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>kuud</displayName>
-				<unitPattern count="one">{0} k</unitPattern>
-				<unitPattern count="other">{0} k</unitPattern>
-			</unit>
-			<unit type="duration-second">
-				<displayName>s</displayName>
-				<unitPattern count="one">{0} s</unitPattern>
-				<unitPattern count="other">{0} s</unitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>nädalad</displayName>
-				<unitPattern count="one">{0} n</unitPattern>
-				<unitPattern count="other">{0} n</unitPattern>
+			<unit type="consumption-liter-per-100kilometers">
+				<unitPattern count="one">{0} l/100km</unitPattern>
+				<unitPattern count="other">{0} l/100km</unitPattern>
 			</unit>
 			<unit type="duration-year">
 				<displayName>a</displayName>
 				<unitPattern count="one">{0} a</unitPattern>
 				<unitPattern count="other">{0} a</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="duration-month">
+				<displayName>kuud</displayName>
+				<unitPattern count="one">{0} k</unitPattern>
+				<unitPattern count="other">{0} k</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0} jalg</unitPattern>
-				<unitPattern count="other">{0} jalga</unitPattern>
+			<unit type="duration-week">
+				<displayName>n</displayName>
+				<unitPattern count="one">{0} n</unitPattern>
+				<unitPattern count="other">{0} n</unitPattern>
 			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0} toll</unitPattern>
-				<unitPattern count="other">{0} tolli</unitPattern>
+			<unit type="duration-day">
+				<displayName>päev</displayName>
+				<unitPattern count="one">{0} p</unitPattern>
+				<unitPattern count="other">{0} p</unitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>t</displayName>
+				<unitPattern count="one">{0} t</unitPattern>
+				<unitPattern count="other">{0} t</unitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>min</displayName>
+				<unitPattern count="one">{0} min</unitPattern>
+				<unitPattern count="other">{0} min</unitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>s</displayName>
+				<unitPattern count="one">{0} s</unitPattern>
+				<unitPattern count="other">{0} s</unitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
 				<unitPattern count="one">{0} km</unitPattern>
 				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} valgusa.</unitPattern>
-				<unitPattern count="other">{0} valgusa.</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>m</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} miil</unitPattern>
-				<unitPattern count="other">{0} miili</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -6990,36 +7677,48 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} miil</unitPattern>
+				<unitPattern count="other">{0} miili</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} jard</unitPattern>
 				<unitPattern count="other">{0} jardi</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>gramm</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} jalg</unitPattern>
+				<unitPattern count="other">{0} jalga</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} toll</unitPattern>
+				<unitPattern count="other">{0} tolli</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} valgusa.</unitPattern>
+				<unitPattern count="other">{0} valgusa.</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="one">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
+			<unit type="mass-gram">
+				<displayName>gramm</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>lüh t</displayName>
+				<unitPattern count="one">{0} lüh t</unitPattern>
+				<unitPattern count="other">{0} lüh t</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} lb</unitPattern>
 				<unitPattern count="other">{0} lb</unitPattern>
 			</unit>
-			<unit type="mass-ton">
-				<displayName>lüh. tonnid</displayName>
-				<unitPattern count="one">{0} lüh. t</unitPattern>
-				<unitPattern count="other">{0} lüh. t</unitPattern>
-			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} hj</unitPattern>
-				<unitPattern count="other">{0} hj</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0}kW</unitPattern>
@@ -7029,6 +7728,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}W</unitPattern>
 				<unitPattern count="other">{0}W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} hj</unitPattern>
+				<unitPattern count="other">{0} hj</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
@@ -7043,12 +7746,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
-				<unitPattern count="one">{0}km/h</unitPattern>
-				<unitPattern count="other">{0}km/h</unitPattern>
+				<unitPattern count="one">{0} km/h</unitPattern>
+				<unitPattern count="other">{0} km/h</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
-				<unitPattern count="one">{0}m/s</unitPattern>
-				<unitPattern count="other">{0}m/s</unitPattern>
+				<unitPattern count="one">{0} m/s</unitPattern>
+				<unitPattern count="other">{0} m/s</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
 				<unitPattern count="one">{0} mi/h</unitPattern>
@@ -7056,8 +7759,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
-				<unitPattern count="one">{0} °</unitPattern>
-				<unitPattern count="other">{0} °</unitPattern>
+				<unitPattern count="one">{0} °C</unitPattern>
+				<unitPattern count="other">{0} °C</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
 				<displayName>°F</displayName>
@@ -7077,15 +7780,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
 		</durationUnit>
 		<durationUnit type="hms">
-			<durationUnitPattern>h:mm:ss</durationUnitPattern>
+			<durationUnitPattern>h:mm.ss</durationUnitPattern>
 		</durationUnit>
 		<durationUnit type="ms">
-			<durationUnitPattern>m:ss</durationUnitPattern>
+			<durationUnitPattern>m.ss</durationUnitPattern>
 		</durationUnit>
 	</units>
 	<listPatterns>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/et_EE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/et_EE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/et_EE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/et_EE.xml
index 1027e79e890..4eba2ec9861 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/et_EE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/et_EE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="et"/>
 		<territory type="EE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/eu.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eu.xml
similarity index 96%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/eu.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eu.xml
index 9928a235869..361239586b3 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/eu.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eu.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="eu"/>
 	</identity>
 	<localeDisplayNames>
@@ -222,7 +221,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="su">sundanera</language>
 			<language type="sv">suediera</language>
 			<language type="sw">swahili</language>
-			<language type="swc">Kongoko swahilia</language>
+			<language type="sw_CD">Kongoko swahilia</language>
 			<language type="ta">tamilera</language>
 			<language type="te">teluguera</language>
 			<language type="teo">tesoera</language>
@@ -348,7 +347,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angila</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Holandarren Antillak</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antartika</territory>
 			<territory type="AR">Argentina</territory>
@@ -637,95 +635,95 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">Erabilera pribatua</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Digitu arabiar-hindikoak</type>
-			<type type="arabext" key="numbers">Digitu arabiar-hindiko hedatuak</type>
-			<type type="armn" key="numbers">Zenbaki armeniarrak</type>
-			<type type="armnlow" key="numbers">Zenbaki armeniarrak minuskulaz</type>
-			<type type="beng" key="numbers">Digitu bengalarrak</type>
-			<type type="big5han" key="collation">Txinera tradizionalaren alfabetoa-Big5</type>
-			<type type="buddhist" key="calendar">Egutegi budista</type>
-			<type type="chinese" key="calendar">Txinatar egutegia</type>
-			<type type="coptic" key="calendar">Egutegi coptiarra</type>
-			<type type="dangi" key="calendar">Dangi egutegia</type>
-			<type type="deva" key="numbers">Digitu devanagariak</type>
-			<type type="dictionary" key="collation">Hurrenkera alfabetikoa</type>
-			<type type="ducet" key="collation">Unicode hurrenkera lehenetsia</type>
-			<type type="ethi" key="numbers">Zenbaki etiopiarrak</type>
-			<type type="ethiopic" key="calendar">Egutegi etiopiarra</type>
-			<type type="ethiopic-amete-alem" key="calendar">Amete Alem egutegi etiopiarra</type>
-			<type type="finance" key="numbers">Finantza-zenbakiak</type>
-			<type type="fullwide" key="numbers">Zabalera osoko digituak</type>
-			<type type="gb2312han" key="collation">Txinera sinplifikatuaren alfabetoa -GB2312</type>
-			<type type="geor" key="numbers">Zenbaki georgiarrak</type>
-			<type type="gregorian" key="calendar">Egutegi gregoriarra</type>
-			<type type="grek" key="numbers">Zenbaki grekoak</type>
-			<type type="greklow" key="numbers">Zenbaki grekoak minuskulaz</type>
-			<type type="gujr" key="numbers">Digitu gujaratarrak</type>
-			<type type="guru" key="numbers">Digitu gurmukhiak</type>
-			<type type="hanidec" key="numbers">Zenbaki hamartar txinatarrak</type>
-			<type type="hans" key="numbers">Zenbaki txinatar sinplifikatuak</type>
-			<type type="hansfin" key="numbers">Finantzetarako zenbaki txinatar sinplifikatuak</type>
-			<type type="hant" key="numbers">Zenbaki txinatar tradizionalak</type>
-			<type type="hantfin" key="numbers">Finantzetarako zenbaki txinatar tradizionalak</type>
-			<type type="hebr" key="numbers">Zenbaki hebrearrak</type>
-			<type type="hebrew" key="calendar">Hebrear egutegia</type>
-			<type type="identical" key="colStrength">Ordenatu guztiak</type>
-			<type type="indian" key="calendar">Indiar egutegia</type>
-			<type type="islamic" key="calendar">Islamiar egutegia</type>
-			<type type="islamic-civil" key="calendar">Islamiar egutegi zibila</type>
-			<type type="iso8601" key="calendar">ISO-8601 egutegia</type>
-			<type type="japanese" key="calendar">Japoniar egutegia</type>
-			<type type="jpan" key="numbers">Zenbaki japoniarrak</type>
-			<type type="jpanfin" key="numbers">Finantzetarako zenbaki japoniarrak</type>
-			<type type="khmr" key="numbers">Digitu khmerarrak</type>
-			<type type="knda" key="numbers">Digitu kannadarrak</type>
-			<type type="laoo" key="numbers">Digitu laostarrak</type>
-			<type type="latn" key="numbers">Digitu mendebaldarrak</type>
-			<type type="lower" key="colCaseFirst">Ordenatu minuskulak lehenik</type>
-			<type type="mlym" key="numbers">Digitu malayalamarrak</type>
-			<type type="mong" key="numbers">Digitu mongoliarrak</type>
-			<type type="mymr" key="numbers">Digitu birmaniarrak</type>
-			<type type="native" key="numbers">Zenbaki-sistema</type>
-			<type type="no" key="colBackwards">Ordenatu azentuak modu normalean</type>
-			<type type="no" key="colCaseFirst">Ordenatu maiuskulak modu normalean</type>
-			<type type="no" key="colCaseLevel">Ordenatu maiuskulak eta minuskulak bereizi gabe</type>
-			<type type="no" key="colHiraganaQuaternary">Ordenatu kanak bereizita</type>
-			<type type="no" key="colNormalization">Ordenatu arauak kontuan hartu gabe</type>
-			<type type="no" key="colNumeric">Ordenatu digituak banaka</type>
-			<type type="non-ignorable" key="colAlternate">Ordenatu ikurrak</type>
-			<type type="orya" key="numbers">Digitu oriyarrak</type>
-			<type type="persian" key="calendar">Egutegi persiarra</type>
-			<type type="phonebook" key="collation">Telefonoen zerrenda</type>
-			<type type="phonetic" key="collation">Ordenatzeko irizpide fonetikoa</type>
-			<type type="pinyin" key="collation">Pinyin hurrenkera</type>
-			<type type="primary" key="colStrength">Ordenatu oinarrizko hizkiak soilik</type>
-			<type type="quaternary" key="colStrength">Ordenatu azentuak / maiuskula eta minuskulak / zabalera / kanak</type>
-			<type type="reformed" key="collation">Erreformaren araberako hurrenkera</type>
-			<type type="roc" key="calendar">Txinako Errepublikako egutegia</type>
-			<type type="roman" key="numbers">Zenbaki erromatarrak</type>
-			<type type="romanlow" key="numbers">Zenbaki erromatarrak minuskulaz</type>
-			<type type="search" key="collation">Bilaketa orokorra</type>
-			<type type="searchjl" key="collation">Bilatu hangularen lehen kontsonantearen arabera</type>
-			<type type="secondary" key="colStrength">Ordenatu azentuak</type>
-			<type type="shifted" key="colAlternate">Ordenatu ikurrei ez ikusi eginda</type>
-			<type type="standard" key="collation">Ordenatzeko irizpide estandarra</type>
-			<type type="stroke" key="collation">Tarteen araberako hurrenkera</type>
-			<type type="taml" key="numbers">Zenbaki tamilar tradizionalak</type>
-			<type type="tamldec" key="numbers">Digitu tamilarrak</type>
-			<type type="telu" key="numbers">Digitu teluguarrak</type>
-			<type type="tertiary" key="colStrength">Ordenatu azentuak / maiuskula eta minuskulak / zabalera</type>
-			<type type="thai" key="numbers">Digitu thailandiarrak</type>
-			<type type="tibt" key="numbers">Digitu tibetarrak</type>
-			<type type="traditional" key="collation">Tradizionala</type>
-			<type type="traditional" key="numbers">Zenbaki tradizionalak</type>
-			<type type="unihan" key="collation">Radical trazuen hurrenkera</type>
-			<type type="upper" key="colCaseFirst">Ordenatu maiuskulak lehenik</type>
-			<type type="vaii" key="numbers">Vai digituak</type>
-			<type type="yes" key="colBackwards">Ordenatu azentuak alderantziz</type>
-			<type type="yes" key="colCaseLevel">Ordenatu maiuskulak eta minuskulak bereizita</type>
-			<type type="yes" key="colHiraganaQuaternary">Ordenatu kanak desberdin</type>
-			<type type="yes" key="colNormalization">Ordenatu Unicode arauen arabera</type>
-			<type type="yes" key="colNumeric">Ordenatu digituak zenbakien arabera</type>
+			<type key="calendar" type="buddhist">Egutegi budista</type>
+			<type key="calendar" type="chinese">Txinatar egutegia</type>
+			<type key="calendar" type="coptic">Egutegi coptiarra</type>
+			<type key="calendar" type="dangi">Dangi egutegia</type>
+			<type key="calendar" type="ethiopic">Egutegi etiopiarra</type>
+			<type key="calendar" type="ethiopic-amete-alem">Amete Alem egutegi etiopiarra</type>
+			<type key="calendar" type="gregorian">Egutegi gregoriarra</type>
+			<type key="calendar" type="hebrew">Hebrear egutegia</type>
+			<type key="calendar" type="indian">Indiar egutegia</type>
+			<type key="calendar" type="islamic">Islamiar egutegia</type>
+			<type key="calendar" type="islamic-civil">Islamiar egutegi zibila</type>
+			<type key="calendar" type="iso8601">ISO-8601 egutegia</type>
+			<type key="calendar" type="japanese">Japoniar egutegia</type>
+			<type key="calendar" type="persian">Egutegi persiarra</type>
+			<type key="calendar" type="roc">Txinako Errepublikako egutegia</type>
+			<type key="colAlternate" type="non-ignorable">Ordenatu ikurrak</type>
+			<type key="colAlternate" type="shifted">Ordenatu ikurrei ez ikusi eginda</type>
+			<type key="colBackwards" type="no">Ordenatu azentuak modu normalean</type>
+			<type key="colBackwards" type="yes">Ordenatu azentuak alderantziz</type>
+			<type key="colCaseFirst" type="lower">Ordenatu minuskulak lehenik</type>
+			<type key="colCaseFirst" type="no">Ordenatu maiuskulak modu normalean</type>
+			<type key="colCaseFirst" type="upper">Ordenatu maiuskulak lehenik</type>
+			<type key="colCaseLevel" type="no">Ordenatu maiuskulak eta minuskulak bereizi gabe</type>
+			<type key="colCaseLevel" type="yes">Ordenatu maiuskulak eta minuskulak bereizita</type>
+			<type key="colHiraganaQuaternary" type="no">Ordenatu kanak bereizita</type>
+			<type key="colHiraganaQuaternary" type="yes">Ordenatu kanak desberdin</type>
+			<type key="collation" type="big5han">Txinera tradizionalaren alfabetoa-Big5</type>
+			<type key="collation" type="dictionary">Hurrenkera alfabetikoa</type>
+			<type key="collation" type="ducet">Unicode hurrenkera lehenetsia</type>
+			<type key="collation" type="gb2312han">Txinera sinplifikatuaren alfabetoa -GB2312</type>
+			<type key="collation" type="phonebook">Telefonoen zerrenda</type>
+			<type key="collation" type="phonetic">Ordenatzeko irizpide fonetikoa</type>
+			<type key="collation" type="pinyin">Pinyin hurrenkera</type>
+			<type key="collation" type="reformed">Erreformaren araberako hurrenkera</type>
+			<type key="collation" type="search">Bilaketa orokorra</type>
+			<type key="collation" type="searchjl">Bilatu hangularen lehen kontsonantearen arabera</type>
+			<type key="collation" type="standard">Ordenatzeko irizpide estandarra</type>
+			<type key="collation" type="stroke">Tarteen araberako hurrenkera</type>
+			<type key="collation" type="traditional">Tradizionala</type>
+			<type key="collation" type="unihan">Radical trazuen hurrenkera</type>
+			<type key="colNormalization" type="no">Ordenatu arauak kontuan hartu gabe</type>
+			<type key="colNormalization" type="yes">Ordenatu Unicode arauen arabera</type>
+			<type key="colNumeric" type="no">Ordenatu digituak banaka</type>
+			<type key="colNumeric" type="yes">Ordenatu digituak zenbakien arabera</type>
+			<type key="colStrength" type="identical">Ordenatu guztiak</type>
+			<type key="colStrength" type="primary">Ordenatu oinarrizko hizkiak soilik</type>
+			<type key="colStrength" type="quaternary">Ordenatu azentuak / maiuskula eta minuskulak / zabalera / kanak</type>
+			<type key="colStrength" type="secondary">Ordenatu azentuak</type>
+			<type key="colStrength" type="tertiary">Ordenatu azentuak / maiuskula eta minuskulak / zabalera</type>
+			<type key="numbers" type="arab">Digitu arabiar-hindikoak</type>
+			<type key="numbers" type="arabext">Digitu arabiar-hindiko hedatuak</type>
+			<type key="numbers" type="armn">Zenbaki armeniarrak</type>
+			<type key="numbers" type="armnlow">Zenbaki armeniarrak minuskulaz</type>
+			<type key="numbers" type="beng">Digitu bengalarrak</type>
+			<type key="numbers" type="deva">Digitu devanagariak</type>
+			<type key="numbers" type="ethi">Zenbaki etiopiarrak</type>
+			<type key="numbers" type="finance">Finantza-zenbakiak</type>
+			<type key="numbers" type="fullwide">Zabalera osoko digituak</type>
+			<type key="numbers" type="geor">Zenbaki georgiarrak</type>
+			<type key="numbers" type="grek">Zenbaki grekoak</type>
+			<type key="numbers" type="greklow">Zenbaki grekoak minuskulaz</type>
+			<type key="numbers" type="gujr">Digitu gujaratarrak</type>
+			<type key="numbers" type="guru">Digitu gurmukhiak</type>
+			<type key="numbers" type="hanidec">Zenbaki hamartar txinatarrak</type>
+			<type key="numbers" type="hans">Zenbaki txinatar sinplifikatuak</type>
+			<type key="numbers" type="hansfin">Finantzetarako zenbaki txinatar sinplifikatuak</type>
+			<type key="numbers" type="hant">Zenbaki txinatar tradizionalak</type>
+			<type key="numbers" type="hantfin">Finantzetarako zenbaki txinatar tradizionalak</type>
+			<type key="numbers" type="hebr">Zenbaki hebrearrak</type>
+			<type key="numbers" type="jpan">Zenbaki japoniarrak</type>
+			<type key="numbers" type="jpanfin">Finantzetarako zenbaki japoniarrak</type>
+			<type key="numbers" type="khmr">Digitu khmerarrak</type>
+			<type key="numbers" type="knda">Digitu kannadarrak</type>
+			<type key="numbers" type="laoo">Digitu laostarrak</type>
+			<type key="numbers" type="latn">Digitu mendebaldarrak</type>
+			<type key="numbers" type="mlym">Digitu malayalamarrak</type>
+			<type key="numbers" type="mong">Digitu mongoliarrak</type>
+			<type key="numbers" type="mymr">Digitu birmaniarrak</type>
+			<type key="numbers" type="native">Zenbaki-sistema</type>
+			<type key="numbers" type="orya">Digitu oriyarrak</type>
+			<type key="numbers" type="roman">Zenbaki erromatarrak</type>
+			<type key="numbers" type="romanlow">Zenbaki erromatarrak minuskulaz</type>
+			<type key="numbers" type="taml">Zenbaki tamilar tradizionalak</type>
+			<type key="numbers" type="tamldec">Digitu tamilarrak</type>
+			<type key="numbers" type="telu">Digitu teluguarrak</type>
+			<type key="numbers" type="thai">Digitu thailandiarrak</type>
+			<type key="numbers" type="tibt">Digitu tibetarrak</type>
+			<type key="numbers" type="traditional">Zenbaki tradizionalak</type>
+			<type key="numbers" type="vaii">Vai digituak</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN">BGN bihurketa</transformName>
@@ -763,10 +761,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<moreInformation>?</moreInformation>
 	</characters>
 	<delimiters>
-		<quotationStart>&quot;</quotationStart>
-		<quotationEnd>&quot;</quotationEnd>
-		<alternateQuotationStart>&quot;</alternateQuotationStart>
-		<alternateQuotationEnd>&quot;</alternateQuotationEnd>
+		<quotationStart>“</quotationStart>
+		<quotationEnd>”</quotationEnd>
+		<alternateQuotationStart>“</alternateQuotationStart>
+		<alternateQuotationEnd>”</alternateQuotationEnd>
 	</delimiters>
 	<dates>
 		<calendars>
@@ -950,7 +948,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<intervalFormatItem id="yMMMEd">
 							<greatestDifference id="d">G y('e')'ko' MMMM dd, EEEE – MMMM dd, EEEE</greatestDifference>
 							<greatestDifference id="M">G y('e')'ko' MMMM dd, EEEE – MMMM dd, EEEE</greatestDifference>
-							<greatestDifference id="y">G y('e')'ko' MMMM dd, EEEE – MMMM dd, EEEE</greatestDifference>
+							<greatestDifference id="y">G y('e')'ko' MMMM dd, EEEE – y('e')'ko' MMMM dd, EEEE</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
 							<greatestDifference id="M">G y('e')'ko' MMMM – MMMM</greatestDifference>
@@ -1178,15 +1176,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am">g</dayPeriod>
-							<dayPeriod type="noon">e</dayPeriod>
 							<dayPeriod type="pm">a</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="noon">eguerdia</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">gauerdia</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">goizaldea</dayPeriod>
+							<dayPeriod type="morning2">goiza</dayPeriod>
+							<dayPeriod type="afternoon1">eguerdia</dayPeriod>
+							<dayPeriod type="afternoon2">arratsaldea</dayPeriod>
+							<dayPeriod type="evening1">iluntzea</dayPeriod>
+							<dayPeriod type="night1">gaua</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
@@ -1430,6 +1439,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>urtea</displayName>
+				<relative type="-1">aurreko urtea</relative>
+				<relative type="0">aurten</relative>
+				<relative type="1">hurrengo urtea</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} urte barru</relativeTimePattern>
 					<relativeTimePattern count="other">{0} urte barru</relativeTimePattern>
@@ -1441,6 +1453,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>urtea</displayName>
+				<relative type="-1">aurreko urtea</relative>
+				<relative type="0">aurten</relative>
+				<relative type="1">hurrengo urtea</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} urte barru</relativeTimePattern>
 					<relativeTimePattern count="other">{0} urte barru</relativeTimePattern>
@@ -4085,6 +4100,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0000 ¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0000 ¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00000 ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00000 ¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000000 ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000000 ¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0 M ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0 M ¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00 M ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00 M ¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000 M ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000 M ¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0000 M ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0000 M ¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00000 M ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00000 M ¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000000 M ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000000 M ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0 B ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0 B ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00 B ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00 B ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000 B ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000 B ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4933,6 +4976,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Thailandiako baht</displayName>
 				<displayName count="other">Thailandiako baht</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJS">
 				<displayName>Tajikistango somonia</displayName>
@@ -5114,6 +5158,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} metro segundo karratuko</unitPattern>
 				<unitPattern count="other">{0} metro segundo karratuko</unitPattern>
 			</unit>
+			<unit type="angle-radian">
+				<displayName>radian</displayName>
+				<unitPattern count="one">{0} radian</unitPattern>
+				<unitPattern count="other">{0} radian</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>gradu</displayName>
+				<unitPattern count="one">{0} gradu</unitPattern>
+				<unitPattern count="other">{0} gradu</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>minutu</displayName>
 				<unitPattern count="one">{0} minutu</unitPattern>
@@ -5124,31 +5178,41 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} segundo</unitPattern>
 				<unitPattern count="other">{0} segundo</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>gradu</displayName>
-				<unitPattern count="one">{0} gradu</unitPattern>
-				<unitPattern count="other">{0} gradu</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radian</displayName>
-				<unitPattern count="one">{0} radian</unitPattern>
-				<unitPattern count="other">{0} radian</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>akre</displayName>
-				<unitPattern count="one">{0} akre</unitPattern>
-				<unitPattern count="other">{0} akre</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>kilometro karratu</displayName>
+				<unitPattern count="one">{0} kilometro karratu</unitPattern>
+				<unitPattern count="other">{0} kilometro karratu</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektarea</displayName>
 				<unitPattern count="one">{0} hektarea</unitPattern>
 				<unitPattern count="other">{0} hektarea</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>metro karratu</displayName>
+				<unitPattern count="one">{0} metro karratu</unitPattern>
+				<unitPattern count="other">{0} metro karratu</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<displayName>milia karratu</displayName>
+				<unitPattern count="one">{0} milia karratu</unitPattern>
+				<unitPattern count="other">{0} milia karratu</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>akre</displayName>
+				<unitPattern count="one">{0} akre</unitPattern>
+				<unitPattern count="other">{0} akre</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yarda karratu</displayName>
+				<unitPattern count="one">{0} yarda karratu</unitPattern>
+				<unitPattern count="other">{0} yarda karratu</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<displayName>oin karratu</displayName>
 				<unitPattern count="one">{0} oin karratu</unitPattern>
@@ -5159,25 +5223,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} hazbete karratu</unitPattern>
 				<unitPattern count="other">{0} hazbete karratu</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kilometro karratu</displayName>
-				<unitPattern count="one">{0} kilometro karratu</unitPattern>
-				<unitPattern count="other">{0} kilometro karratu</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>metro karratu</displayName>
-				<unitPattern count="one">{0} metro karratu</unitPattern>
-				<unitPattern count="other">{0} metro karratu</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>milia karratu</displayName>
-				<unitPattern count="one">{0} milia karratu</unitPattern>
-				<unitPattern count="other">{0} milia karratu</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yarda karratu</displayName>
-				<unitPattern count="one">{0} yarda karratu</unitPattern>
-				<unitPattern count="other">{0} yarda karratu</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kilate</displayName>
+				<unitPattern count="one">{0} kilate</unitPattern>
+				<unitPattern count="other">{0} kilate</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litro kilometroko</displayName>
@@ -5189,55 +5238,70 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} milia galoiko</unitPattern>
 				<unitPattern count="other">{0} milia galoiko</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabit</displayName>
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="other">{0} gigabit</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabyte</displayName>
-				<unitPattern count="one">{0} gigabyte</unitPattern>
-				<unitPattern count="other">{0} gigabyte</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobit</displayName>
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="other">{0} kilobit</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobyte</displayName>
-				<unitPattern count="one">{0} kilobyte</unitPattern>
-				<unitPattern count="other">{0} kilobyte</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabit</displayName>
-				<unitPattern count="one">{0} megabit</unitPattern>
-				<unitPattern count="other">{0} megabit</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabyte</displayName>
-				<unitPattern count="one">{0} megabyte</unitPattern>
-				<unitPattern count="other">{0} megabyte</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>terabyte</displayName>
+				<unitPattern count="one">{0} terabyte</unitPattern>
+				<unitPattern count="other">{0} terabyte</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>terabit</displayName>
 				<unitPattern count="one">{0} terabit</unitPattern>
 				<unitPattern count="other">{0} terabit</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>terabyte</displayName>
-				<unitPattern count="one">{0} terabyte</unitPattern>
-				<unitPattern count="other">{0} terabyte</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>gigabyte</displayName>
+				<unitPattern count="one">{0} gigabyte</unitPattern>
+				<unitPattern count="other">{0} gigabyte</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabit</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="other">{0} gigabit</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabyte</displayName>
+				<unitPattern count="one">{0} megabyte</unitPattern>
+				<unitPattern count="other">{0} megabyte</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabit</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="other">{0} megabit</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobyte</displayName>
+				<unitPattern count="one">{0} kilobyte</unitPattern>
+				<unitPattern count="other">{0} kilobyte</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobit</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="other">{0} kilobit</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>urte</displayName>
+				<unitPattern count="one">{0} urte</unitPattern>
+				<unitPattern count="other">{0} urte</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>hilabete</displayName>
+				<unitPattern count="one">{0} hilabete</unitPattern>
+				<unitPattern count="other">{0} hilabete</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>aste</displayName>
+				<unitPattern count="one">{0} aste</unitPattern>
+				<unitPattern count="other">{0} aste</unitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>egun</displayName>
@@ -5250,46 +5314,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ordu</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikrosegundo</displayName>
-				<unitPattern count="one">{0} mikrosegundo</unitPattern>
-				<unitPattern count="other">{0} mikrosegundo</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milisegundo</displayName>
-				<unitPattern count="one">{0} milisegundo</unitPattern>
-				<unitPattern count="other">{0} milisegundo</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>minutu</displayName>
 				<unitPattern count="one">{0} minutu</unitPattern>
 				<unitPattern count="other">{0} minutu</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>hilabete</displayName>
-				<unitPattern count="one">{0} hilabete</unitPattern>
-				<unitPattern count="other">{0} hilabete</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanosegundo</displayName>
-				<unitPattern count="one">{0} nanosegundo</unitPattern>
-				<unitPattern count="other">{0} nanosegundo</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>segundo</displayName>
 				<unitPattern count="one">{0} segundo</unitPattern>
 				<unitPattern count="other">{0} segundo</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>aste</displayName>
-				<unitPattern count="one">{0} aste</unitPattern>
-				<unitPattern count="other">{0} aste</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milisegundo</displayName>
+				<unitPattern count="one">{0} milisegundo</unitPattern>
+				<unitPattern count="other">{0} milisegundo</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>urte</displayName>
-				<unitPattern count="one">{0} urte</unitPattern>
-				<unitPattern count="other">{0} urte</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>mikrosegundo</displayName>
+				<unitPattern count="one">{0} mikrosegundo</unitPattern>
+				<unitPattern count="other">{0} mikrosegundo</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosegundo</displayName>
+				<unitPattern count="one">{0} nanosegundo</unitPattern>
+				<unitPattern count="other">{0} nanosegundo</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ampere</displayName>
@@ -5311,6 +5360,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} volt</unitPattern>
 				<unitPattern count="other">{0} volt</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokaloria</displayName>
+				<unitPattern count="one">{0} kilokaloria</unitPattern>
+				<unitPattern count="other">{0} kilokaloria</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kaloria</displayName>
 				<unitPattern count="one">{0} kaloria</unitPattern>
@@ -5321,21 +5375,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kaloria</unitPattern>
 				<unitPattern count="other">{0} kaloria</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="one">{0} joule</unitPattern>
-				<unitPattern count="other">{0} joule</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokaloria</displayName>
-				<unitPattern count="one">{0} kilokaloria</unitPattern>
-				<unitPattern count="other">{0} kilokaloria</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojoule</displayName>
 				<unitPattern count="one">{0} kilojoule</unitPattern>
 				<unitPattern count="other">{0} kilojoule</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="one">{0} joule</unitPattern>
+				<unitPattern count="other">{0} joule</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilowatt-ordu</displayName>
 				<unitPattern count="one">{0} kilowatt-ordu</unitPattern>
@@ -5346,35 +5395,70 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} gigahertz</unitPattern>
 				<unitPattern count="other">{0} gigahertz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hertz</displayName>
-				<unitPattern count="one">{0} hertz</unitPattern>
-				<unitPattern count="other">{0} hertz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megahertz</displayName>
+				<unitPattern count="one">{0} megahertz</unitPattern>
+				<unitPattern count="other">{0} megahertz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kilohertz</displayName>
 				<unitPattern count="one">{0} kilohertz</unitPattern>
 				<unitPattern count="other">{0} kilohertz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megahertz</displayName>
-				<unitPattern count="one">{0} megahertz</unitPattern>
-				<unitPattern count="other">{0} megahertz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hertz</displayName>
+				<unitPattern count="one">{0} hertz</unitPattern>
+				<unitPattern count="other">{0} hertz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>unitate astronomiko</displayName>
-				<unitPattern count="one">{0} unitate astronomiko</unitPattern>
-				<unitPattern count="other">{0} unitate astronomiko</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometro</displayName>
+				<unitPattern count="one">{0} kilometro</unitPattern>
+				<unitPattern count="other">{0} kilometro</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>metro</displayName>
+				<unitPattern count="one">{0} metro</unitPattern>
+				<unitPattern count="other">{0} metro</unitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>dezimetro</displayName>
+				<unitPattern count="one">{0} dezimetro</unitPattern>
+				<unitPattern count="other">{0} dezimetro</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
 				<displayName>zentimetro</displayName>
 				<unitPattern count="one">{0} zentimetro</unitPattern>
 				<unitPattern count="other">{0} zentimetro</unitPattern>
 			</unit>
-			<unit type="length-decimeter">
-				<displayName>dezimetro</displayName>
-				<unitPattern count="one">{0} dezimetro</unitPattern>
-				<unitPattern count="other">{0} dezimetro</unitPattern>
+			<unit type="length-millimeter">
+				<displayName>milimetro</displayName>
+				<unitPattern count="one">{0} milimetro</unitPattern>
+				<unitPattern count="other">{0} milimetro</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikrometro</displayName>
+				<unitPattern count="one">{0} mikrometro</unitPattern>
+				<unitPattern count="other">{0} mikrometro</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nanometro</displayName>
+				<unitPattern count="one">{0} nanometro</unitPattern>
+				<unitPattern count="other">{0} nanometro</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>pikometro</displayName>
+				<unitPattern count="one">{0} pikometro</unitPattern>
+				<unitPattern count="other">{0} pikometro</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>milia</displayName>
+				<unitPattern count="one">{0} milia</unitPattern>
+				<unitPattern count="other">{0} milia</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>yarda</displayName>
+				<unitPattern count="one">{0} yarda</unitPattern>
+				<unitPattern count="other">{0} yarda</unitPattern>
 			</unit>
 			<unit type="length-foot">
 				<displayName>oin</displayName>
@@ -5386,96 +5470,66 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} hazbete</unitPattern>
 				<unitPattern count="other">{0} hazbete</unitPattern>
 			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometro</displayName>
-				<unitPattern count="one">{0} kilometro</unitPattern>
-				<unitPattern count="other">{0} kilometro</unitPattern>
+			<unit type="length-parsec">
+				<displayName>parsec</displayName>
+				<unitPattern count="one">{0} parsec</unitPattern>
+				<unitPattern count="other">{0} parsec</unitPattern>
 			</unit>
 			<unit type="length-light-year">
 				<displayName>argi-urte</displayName>
 				<unitPattern count="one">{0} argi-urte</unitPattern>
 				<unitPattern count="other">{0} argi-urte</unitPattern>
 			</unit>
-			<unit type="length-meter">
-				<displayName>metro</displayName>
-				<unitPattern count="one">{0} metro</unitPattern>
-				<unitPattern count="other">{0} metro</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>mikrometro</displayName>
-				<unitPattern count="one">{0} mikrometro</unitPattern>
-				<unitPattern count="other">{0} mikrometro</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>milia</displayName>
-				<unitPattern count="one">{0} milia</unitPattern>
-				<unitPattern count="other">{0} milia</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>milimetro</displayName>
-				<unitPattern count="one">{0} milimetro</unitPattern>
-				<unitPattern count="other">{0} milimetro</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<displayName>nanometro</displayName>
-				<unitPattern count="one">{0} nanometro</unitPattern>
-				<unitPattern count="other">{0} nanometro</unitPattern>
+			<unit type="length-astronomical-unit">
+				<displayName>unitate astronomiko</displayName>
+				<unitPattern count="one">{0} unitate astronomiko</unitPattern>
+				<unitPattern count="other">{0} unitate astronomiko</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
 				<displayName>milia nautiko</displayName>
 				<unitPattern count="one">{0} milia nautiko</unitPattern>
 				<unitPattern count="other">{0} milia nautiko</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<displayName>parsec</displayName>
-				<unitPattern count="one">{0} parsec</unitPattern>
-				<unitPattern count="other">{0} parsec</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName>pikometro</displayName>
-				<unitPattern count="one">{0} pikometro</unitPattern>
-				<unitPattern count="other">{0} pikometro</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<displayName>yarda</displayName>
-				<unitPattern count="one">{0} yarda</unitPattern>
-				<unitPattern count="other">{0} yarda</unitPattern>
-			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>kilate</displayName>
-				<unitPattern count="one">{0} kilate</unitPattern>
-				<unitPattern count="other">{0} kilate</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gramo</displayName>
-				<unitPattern count="one">{0} gramo</unitPattern>
-				<unitPattern count="other">{0} gramo</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogramo</displayName>
-				<unitPattern count="one">{0} kilogramo</unitPattern>
-				<unitPattern count="other">{0} kilogramo</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>tona</displayName>
 				<unitPattern count="one">{0} tona</unitPattern>
 				<unitPattern count="other">{0} tona</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mikrogramo</displayName>
-				<unitPattern count="one">{0} mikrogramo</unitPattern>
-				<unitPattern count="other">{0} mikrogramo</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogramo</displayName>
+				<unitPattern count="one">{0} kilogramo</unitPattern>
+				<unitPattern count="other">{0} kilogramo</unitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gramo</displayName>
+				<unitPattern count="one">{0} gramo</unitPattern>
+				<unitPattern count="other">{0} gramo</unitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>miligramo</displayName>
 				<unitPattern count="one">{0} miligramo</unitPattern>
 				<unitPattern count="other">{0} miligramo</unitPattern>
 			</unit>
+			<unit type="mass-microgram">
+				<displayName>mikrogramo</displayName>
+				<unitPattern count="one">{0} mikrogramo</unitPattern>
+				<unitPattern count="other">{0} mikrogramo</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>AEBetako tona</displayName>
+				<unitPattern count="one">{0} AEBetako tona</unitPattern>
+				<unitPattern count="other">{0} AEBetako tona</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>libra</displayName>
+				<unitPattern count="one">{0} libra</unitPattern>
+				<unitPattern count="other">{0} libra</unitPattern>
+			</unit>
 			<unit type="mass-ounce">
 				<displayName>ontza</displayName>
 				<unitPattern count="one">{0} ontza</unitPattern>
@@ -5486,61 +5540,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} troy ontza</unitPattern>
 				<unitPattern count="other">{0} troy ontza</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<displayName>libra</displayName>
-				<unitPattern count="one">{0} libra</unitPattern>
-				<unitPattern count="other">{0} libra</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<displayName>AEBetako tona</displayName>
-				<unitPattern count="one">{0} AEBetako tona</unitPattern>
-				<unitPattern count="other">{0} AEBetako tona</unitPattern>
+			<unit type="mass-carat">
+				<displayName>kilate</displayName>
+				<unitPattern count="one">{0} kilate</unitPattern>
+				<unitPattern count="other">{0} kilate</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigawatt</displayName>
 				<unitPattern count="one">{0} gigawatt</unitPattern>
 				<unitPattern count="other">{0} gigawatt</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>zaldi-potentzia</displayName>
-				<unitPattern count="one">{0} zaldi-potentzia</unitPattern>
-				<unitPattern count="other">{0} zaldi-potentzia</unitPattern>
+			<unit type="power-megawatt">
+				<displayName>megawatt</displayName>
+				<unitPattern count="one">{0} megawatt</unitPattern>
+				<unitPattern count="other">{0} megawatt</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName>kilowatt</displayName>
 				<unitPattern count="one">{0} kilowatt</unitPattern>
 				<unitPattern count="other">{0} kilowatt</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<displayName>megawatt</displayName>
-				<unitPattern count="one">{0} megawatt</unitPattern>
-				<unitPattern count="other">{0} megawatt</unitPattern>
+			<unit type="power-watt">
+				<displayName>watt</displayName>
+				<unitPattern count="one">{0} watt</unitPattern>
+				<unitPattern count="other">{0} watt</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<displayName>miliwatt</displayName>
 				<unitPattern count="one">{0} miliwatt</unitPattern>
 				<unitPattern count="other">{0} miliwatt</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName>watt</displayName>
-				<unitPattern count="one">{0} watt</unitPattern>
-				<unitPattern count="other">{0} watt</unitPattern>
+			<unit type="power-horsepower">
+				<displayName>zaldi-potentzia</displayName>
+				<unitPattern count="one">{0} zaldi-potentzia</unitPattern>
+				<unitPattern count="other">{0} zaldi-potentzia</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hektopascal</displayName>
 				<unitPattern count="one">{0} hektopascal</unitPattern>
 				<unitPattern count="other">{0} hektopascal</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>merkurio-hazbete</displayName>
-				<unitPattern count="one">{0} merkurio-hazbete</unitPattern>
-				<unitPattern count="other">{0} merkurio-hazbete</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>milibar</displayName>
-				<unitPattern count="one">{0} milibar</unitPattern>
-				<unitPattern count="other">{0} milibar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>merkurio-milimetro</displayName>
 				<unitPattern count="one">{0} merkurio-milimetro</unitPattern>
@@ -5551,10 +5590,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} libra hazbete karratuko</unitPattern>
 				<unitPattern count="other">{0} libra hazbete karratuko</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kilate</displayName>
-				<unitPattern count="one">{0} kilate</unitPattern>
-				<unitPattern count="other">{0} kilate</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>merkurio-hazbete</displayName>
+				<unitPattern count="one">{0} merkurio-hazbete</unitPattern>
+				<unitPattern count="other">{0} merkurio-hazbete</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>milibar</displayName>
+				<unitPattern count="one">{0} milibar</unitPattern>
+				<unitPattern count="other">{0} milibar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometro orduko</displayName>
@@ -5586,31 +5630,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kelvin gradu</unitPattern>
 				<unitPattern count="other">{0} kelvin gradu</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>akre-oin</displayName>
-				<unitPattern count="one">{0} akre-oin</unitPattern>
-				<unitPattern count="other">{0} akre-oin</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>zentilitro</displayName>
-				<unitPattern count="one">{0} zentilitro</unitPattern>
-				<unitPattern count="other">{0} zentilitro</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>zentimetro kubiko</displayName>
-				<unitPattern count="one">{0} zentimetro kubiko</unitPattern>
-				<unitPattern count="other">{0} zentimetro kubiko</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>oin kubiko</displayName>
-				<unitPattern count="one">{0} oin kubiko</unitPattern>
-				<unitPattern count="other">{0} oin kubiko</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>hazbete kubiko</displayName>
-				<unitPattern count="one">{0} hazbete kubiko</unitPattern>
-				<unitPattern count="other">{0} hazbete kubiko</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kilometro kubiko</displayName>
 				<unitPattern count="one">{0} kilometro kubiko</unitPattern>
@@ -5621,6 +5640,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} metro kubiko</unitPattern>
 				<unitPattern count="other">{0} metro kubiko</unitPattern>
 			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>zentimetro kubiko</displayName>
+				<unitPattern count="one">{0} zentimetro kubiko</unitPattern>
+				<unitPattern count="other">{0} zentimetro kubiko</unitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>milia kubiko</displayName>
 				<unitPattern count="one">{0} milia kubiko</unitPattern>
@@ -5631,25 +5655,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yarda kubiko</unitPattern>
 				<unitPattern count="other">{0} yarda kubiko</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>katilukada</displayName>
-				<unitPattern count="one">{0} katilukada</unitPattern>
-				<unitPattern count="other">{0} katilukada</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>oin kubiko</displayName>
+				<unitPattern count="one">{0} oin kubiko</unitPattern>
+				<unitPattern count="other">{0} oin kubiko</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dezilitro</displayName>
-				<unitPattern count="one">{0} dezilitro</unitPattern>
-				<unitPattern count="other">{0} dezilitro</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>hazbete kubiko</displayName>
+				<unitPattern count="one">{0} hazbete kubiko</unitPattern>
+				<unitPattern count="other">{0} hazbete kubiko</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>ontza likido</displayName>
-				<unitPattern count="one">{0} ontza likido</unitPattern>
-				<unitPattern count="other">{0} ontza likido</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>galoi</displayName>
-				<unitPattern count="one">{0} galoi</unitPattern>
-				<unitPattern count="other">{0} galoi</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megalitro</displayName>
+				<unitPattern count="one">{0} megalitro</unitPattern>
+				<unitPattern count="other">{0} megalitro</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hektolitro</displayName>
@@ -5661,26 +5680,51 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} litro</unitPattern>
 				<unitPattern count="other">{0} litro</unitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalitro</displayName>
-				<unitPattern count="one">{0} megalitro</unitPattern>
-				<unitPattern count="other">{0} megalitro</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dezilitro</displayName>
+				<unitPattern count="one">{0} dezilitro</unitPattern>
+				<unitPattern count="other">{0} dezilitro</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>zentilitro</displayName>
+				<unitPattern count="one">{0} zentilitro</unitPattern>
+				<unitPattern count="other">{0} zentilitro</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mililitro</displayName>
 				<unitPattern count="one">{0} mililitro</unitPattern>
 				<unitPattern count="other">{0} mililitro</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pinta</displayName>
-				<unitPattern count="one">{0} pinta</unitPattern>
-				<unitPattern count="other">{0} pinta</unitPattern>
+			<unit type="volume-acre-foot">
+				<displayName>akre-oin</displayName>
+				<unitPattern count="one">{0} akre-oin</unitPattern>
+				<unitPattern count="other">{0} akre-oin</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galoi</displayName>
+				<unitPattern count="one">{0} galoi</unitPattern>
+				<unitPattern count="other">{0} galoi</unitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>galoi-laurden</displayName>
 				<unitPattern count="one">{0} galoi-laurden</unitPattern>
 				<unitPattern count="other">{0} galoi-laurden</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pinta</displayName>
+				<unitPattern count="one">{0} pinta</unitPattern>
+				<unitPattern count="other">{0} pinta</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>katilukada</displayName>
+				<unitPattern count="one">{0} katilukada</unitPattern>
+				<unitPattern count="other">{0} katilukada</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>ontza likido</displayName>
+				<unitPattern count="one">{0} ontza likido</unitPattern>
+				<unitPattern count="other">{0} ontza likido</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>koilarakada</displayName>
 				<unitPattern count="one">{0} koilarakada</unitPattern>
@@ -5706,6 +5750,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>gradu</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>minutu</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
@@ -5716,31 +5770,41 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>gradu</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>akre</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektarea</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>akre</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<displayName>ft²</displayName>
 				<unitPattern count="one">{0} ft²</unitPattern>
@@ -5751,25 +5815,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
@@ -5781,55 +5830,70 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>TB</displayName>
+				<unitPattern count="one">{0} TB</unitPattern>
+				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>Tb</displayName>
 				<unitPattern count="one">{0} Tb</unitPattern>
 				<unitPattern count="other">{0} Tb</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>TB</displayName>
-				<unitPattern count="one">{0} TB</unitPattern>
-				<unitPattern count="other">{0} TB</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>urte</displayName>
+				<unitPattern count="one">{0} urte</unitPattern>
+				<unitPattern count="other">{0} urte</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>hilabete</displayName>
+				<unitPattern count="one">{0} hilabete</unitPattern>
+				<unitPattern count="other">{0} hilabete</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>aste</displayName>
+				<unitPattern count="one">{0} aste</unitPattern>
+				<unitPattern count="other">{0} aste</unitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>egun</displayName>
@@ -5842,46 +5906,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} h</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>miliseg.</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>hilabete</displayName>
-				<unitPattern count="one">{0} hilabete</unitPattern>
-				<unitPattern count="other">{0} hilabete</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>seg</displayName>
 				<unitPattern count="one">{0} s</unitPattern>
 				<unitPattern count="other">{0} s</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>aste</displayName>
-				<unitPattern count="one">{0} aste</unitPattern>
-				<unitPattern count="other">{0} aste</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>miliseg.</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>urte</displayName>
-				<unitPattern count="one">{0} urte</unitPattern>
-				<unitPattern count="other">{0} urte</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>A</displayName>
@@ -5903,6 +5952,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -5913,21 +5967,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Cal</unitPattern>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>J</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -5938,35 +5987,70 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>dm</displayName>
+				<unitPattern count="one">{0} dm</unitPattern>
+				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
 				<displayName>cm</displayName>
 				<unitPattern count="one">{0} cm</unitPattern>
 				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
-			<unit type="length-decimeter">
-				<displayName>dm</displayName>
-				<unitPattern count="one">{0} dm</unitPattern>
-				<unitPattern count="other">{0} dm</unitPattern>
+			<unit type="length-millimeter">
+				<displayName>mm</displayName>
+				<unitPattern count="one">{0} mm</unitPattern>
+				<unitPattern count="other">{0} mm</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nm</displayName>
+				<unitPattern count="one">{0} nm</unitPattern>
+				<unitPattern count="other">{0} nm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>pm</displayName>
+				<unitPattern count="one">{0} pm</unitPattern>
+				<unitPattern count="other">{0} pm</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>milia</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>yd</displayName>
+				<unitPattern count="one">{0} yd</unitPattern>
+				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
 			<unit type="length-foot">
 				<displayName>oin</displayName>
@@ -5978,96 +6062,66 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} in</unitPattern>
 				<unitPattern count="other">{0} in</unitPattern>
 			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
 			</unit>
 			<unit type="length-light-year">
 				<displayName>argi-urte</displayName>
 				<unitPattern count="one">{0} ly</unitPattern>
 				<unitPattern count="other">{0} ly</unitPattern>
 			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>milia</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>mm</displayName>
-				<unitPattern count="one">{0} mm</unitPattern>
-				<unitPattern count="other">{0} mm</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<displayName>nm</displayName>
-				<unitPattern count="one">{0} nm</unitPattern>
-				<unitPattern count="other">{0} nm</unitPattern>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
 				<displayName>nmi</displayName>
 				<unitPattern count="one">{0} nmi</unitPattern>
 				<unitPattern count="other">{0} nmi</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName>pm</displayName>
-				<unitPattern count="one">{0} pm</unitPattern>
-				<unitPattern count="other">{0} pm</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<displayName>yd</displayName>
-				<unitPattern count="one">{0} yd</unitPattern>
-				<unitPattern count="other">{0} yd</unitPattern>
-			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>CD</displayName>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>tn</displayName>
+				<unitPattern count="one">{0} tn</unitPattern>
+				<unitPattern count="other">{0} tn</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+			</unit>
 			<unit type="mass-ounce">
 				<displayName>oz</displayName>
 				<unitPattern count="one">{0} oz</unitPattern>
@@ -6078,61 +6132,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} oz t</unitPattern>
 				<unitPattern count="other">{0} oz t</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<displayName>tn</displayName>
-				<unitPattern count="one">{0} tn</unitPattern>
-				<unitPattern count="other">{0} tn</unitPattern>
+			<unit type="mass-carat">
+				<displayName>CD</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hp</displayName>
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
+			<unit type="power-megawatt">
+				<displayName>MW</displayName>
+				<unitPattern count="one">{0} MW</unitPattern>
+				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName>kW</displayName>
 				<unitPattern count="one">{0} kW</unitPattern>
 				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<displayName>MW</displayName>
-				<unitPattern count="one">{0} MW</unitPattern>
-				<unitPattern count="other">{0} MW</unitPattern>
+			<unit type="power-watt">
+				<displayName>W</displayName>
+				<unitPattern count="one">{0} W</unitPattern>
+				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<displayName>mW</displayName>
 				<unitPattern count="one">{0} mW</unitPattern>
 				<unitPattern count="other">{0} mW</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName>W</displayName>
-				<unitPattern count="one">{0} W</unitPattern>
-				<unitPattern count="other">{0} W</unitPattern>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mb</displayName>
-				<unitPattern count="one">{0} mb</unitPattern>
-				<unitPattern count="other">{0} mb</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -6143,10 +6182,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mb</displayName>
+				<unitPattern count="one">{0} mb</unitPattern>
+				<unitPattern count="other">{0} mb</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -6178,31 +6222,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -6213,6 +6232,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
 			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
 				<unitPattern count="one">{0} mi³</unitPattern>
@@ -6223,25 +6247,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>c</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -6253,26 +6272,51 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="one">{0} Ml</unitPattern>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
 				<unitPattern count="one">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>c</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>tbsp</displayName>
 				<unitPattern count="one">{0} tbsp</unitPattern>
@@ -6292,6 +6336,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} G</unitPattern>
 				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -6300,26 +6348,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} m²</unitPattern>
 				<unitPattern count="other">{0} m²</unitPattern>
@@ -6328,6 +6364,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>urte</displayName>
+				<unitPattern count="one">{0} urte</unitPattern>
+				<unitPattern count="other">{0} urte</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>hilabete</displayName>
+				<unitPattern count="one">{0} hil.</unitPattern>
+				<unitPattern count="other">{0} hil.</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>aste</displayName>
+				<unitPattern count="one">{0} aste</unitPattern>
+				<unitPattern count="other">{0} aste</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>egun</displayName>
 				<unitPattern count="one">{0} egun</unitPattern>
@@ -6338,66 +6397,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} h</unitPattern>
 				<unitPattern count="other">{0} h</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>mseg.</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>hilabete</displayName>
-				<unitPattern count="one">{0} hil.</unitPattern>
-				<unitPattern count="other">{0} hil.</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>seg</displayName>
 				<unitPattern count="one">{0} s</unitPattern>
 				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>aste</displayName>
-				<unitPattern count="one">{0} aste</unitPattern>
-				<unitPattern count="other">{0} aste</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>urte</displayName>
-				<unitPattern count="one">{0} urte</unitPattern>
-				<unitPattern count="other">{0} urte</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>mseg.</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
 				<unitPattern count="one">{0} km</unitPattern>
 				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} ly</unitPattern>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>metro</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -6408,31 +6436,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>gramo</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="one">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
+			<unit type="mass-gram">
+				<displayName>gramo</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} lb</unitPattern>
 				<unitPattern count="other">{0} lb</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} kW</unitPattern>
@@ -6442,6 +6482,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/eu_ES.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eu_ES.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/eu_ES.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eu_ES.xml
index acf227b959e..b10b62c92ea 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/eu_ES.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eu_ES.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="eu"/>
 		<territory type="ES"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ewo.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ewo.xml
similarity index 95%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ewo.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ewo.xml
index bb9389ad8ff..02401455ef1 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ewo.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ewo.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="ewo"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angíyə</territory>
 			<territory type="AL">Aləbánia</territory>
 			<territory type="AM">Arəménia</territory>
-			<territory type="AN">Anətíyə Nɛdəlánia</territory>
 			<territory type="AO">Angolá</territory>
 			<territory type="AR">Arəhenətína</territory>
 			<territory type="AS">Bəsamóa yá Amə́rəka</territory>
@@ -449,6 +447,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">kíkíríg</dayPeriod>
+							<dayPeriod type="pm">ngəgógəle</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">kíkíríg</dayPeriod>
 							<dayPeriod type="pm">ngəgógəle</dayPeriod>
@@ -601,6 +603,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">0K ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -780,3 +798,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ewo_CM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ewo_CM.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ewo_CM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ewo_CM.xml
index 1f4230a398a..e675c5610d4 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ewo_CM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ewo_CM.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ewo"/>
 		<territory type="CM"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fa.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fa.xml
similarity index 79%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fa.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fa.xml
index af2467f4976..4f2b188d363 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fa.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fa.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="fa"/>
 	</identity>
 	<localeDisplayNames>
@@ -49,24 +48,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="arz">عربی مصری</language>
 			<language type="as">آسامی</language>
 			<language type="asa">آسو</language>
-			<language type="ast" draft="unconfirmed">آستوری</language>
+			<language type="ast">آستوری</language>
 			<language type="av">آواری</language>
 			<language type="ay">آیمارایی</language>
 			<language type="az">ترکی آذربایجانی</language>
 			<language type="az" alt="short">آذری</language>
 			<language type="az" alt="variant">آذربایجانی</language>
-			<language type="azb">ترکی آذربایجانی ایران</language>
+			<language type="az_Arab">ترکی آذری جنوبی</language>
 			<language type="ba">باشغیری</language>
 			<language type="bal">بلوچی</language>
 			<language type="ban">بالیایی</language>
 			<language type="bar">باواریایی</language>
 			<language type="bas">باسایی</language>
 			<language type="bax">بمونی</language>
-			<language type="be">بلوروسی</language>
+			<language type="be">بلاروسی</language>
 			<language type="bej">بجایی</language>
 			<language type="bem">بمبایی</language>
 			<language type="bez">بنایی</language>
 			<language type="bg">بلغاری</language>
+			<language type="bgn">بلوچی غربی</language>
 			<language type="bho">بوجپوری</language>
 			<language type="bi">بیسلاما</language>
 			<language type="bik">بیکولی</language>
@@ -75,7 +75,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bn">بنگالی</language>
 			<language type="bo">تبتی</language>
 			<language type="bqi">لری بختیاری</language>
-			<language type="br">برتانیایی</language>
+			<language type="br">برتون</language>
 			<language type="bra" draft="contributed">براج</language>
 			<language type="brh">براهویی</language>
 			<language type="brx">بودویی</language>
@@ -107,14 +107,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="csb">کاشوبی</language>
 			<language type="cu">اسلاوی کلیسایی</language>
 			<language type="cv">چوواشی</language>
-			<language type="cy">ویلزی</language>
+			<language type="cy">ولزی</language>
 			<language type="da">دانمارکی</language>
 			<language type="dak">داکوتایی</language>
 			<language type="dar">دارقینی</language>
 			<language type="dav">تایتا</language>
 			<language type="de">آلمانی</language>
 			<language type="de_AT">آلمانی اتریش</language>
-			<language type="de_CH">آلمانی علیای سوئیس</language>
+			<language type="de_CH">آلمانی معیار سوئیس</language>
 			<language type="del">دلاواری</language>
 			<language type="dgr" draft="contributed">دوگریب</language>
 			<language type="din">دینکایی</language>
@@ -151,6 +151,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="eu">باسکی</language>
 			<language type="ewo" draft="contributed">اواندو</language>
 			<language type="fa">فارسی</language>
+			<language type="fa_AF">دری</language>
 			<language type="fan">فانکی</language>
 			<language type="fat">فانتیایی</language>
 			<language type="ff">فولایی</language>
@@ -162,7 +163,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="fr">فرانسوی</language>
 			<language type="fr_CA">فرانسوی کانادا</language>
 			<language type="fr_CH">فرانسوی سوئیس</language>
-			<language type="frc" draft="unconfirmed">فرانسوی کادین</language>
+			<language type="frc">فرانسوی کادین</language>
 			<language type="frm">فرانسوی میانه</language>
 			<language type="fro">فرانسوی باستان</language>
 			<language type="frr">فریزی شمالی</language>
@@ -171,7 +172,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="fy">فریزی غربی</language>
 			<language type="ga">ایرلندی</language>
 			<language type="gaa">گایی</language>
-			<language type="gag">گاگاوز</language>
+			<language type="gag">گاگائوزیایی</language>
 			<language type="gay">گایویی</language>
 			<language type="gba">گبایایی</language>
 			<language type="gbz">دری زرتشتی</language>
@@ -180,7 +181,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="gil">گیلبرتی</language>
 			<language type="gl">گالیسیایی</language>
 			<language type="glk">گیلکی</language>
-			<language type="gmh">آلمانی علیای میانه</language>
+			<language type="gmh">آلمانی معیار میانه</language>
 			<language type="gn">گوارانی</language>
 			<language type="goh">آلمانی علیای باستان</language>
 			<language type="gon">گوندی</language>
@@ -224,7 +225,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="it">ایتالیایی</language>
 			<language type="iu">اینوکتیتوت</language>
 			<language type="ja">ژاپنی</language>
-			<language type="jbo" draft="contributed">لوجبان</language>
+			<language type="jbo">لوجبان</language>
 			<language type="jgo">نگومبا</language>
 			<language type="jmc">ماچامه‌ای</language>
 			<language type="jpr">فارسی یهودی</language>
@@ -248,14 +249,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="khq">کوجراچینی</language>
 			<language type="khw">کهوار</language>
 			<language type="ki">کیکویویی</language>
-			<language type="kiu">زازاکی</language>
+			<language type="kiu">کرمانجی</language>
 			<language type="kj">کوانیاما</language>
 			<language type="kk">قزاقی</language>
 			<language type="kl">گرینلندی</language>
 			<language type="kln">کالنجین</language>
 			<language type="km">خمری</language>
 			<language type="kmb">کیمبوندویی</language>
-			<language type="kn">کاناده‌ای</language>
+			<language type="kn">کانارا</language>
 			<language type="ko">کره‌ای</language>
 			<language type="koi">کومی پرمیاک</language>
 			<language type="kok">کنکانی</language>
@@ -272,11 +273,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="kv">کومیایی</language>
 			<language type="kw">کرنوالی</language>
 			<language type="ky">قرقیزی</language>
-			<language type="la">لاتینی</language>
+			<language type="la">لاتین</language>
 			<language type="lad">لادینو</language>
 			<language type="lag">لانگی</language>
 			<language type="lah">لاهندا</language>
-			<language type="lam" draft="contributed">لامبا</language>
+			<language type="lam">لامبا</language>
 			<language type="lb">لوگزامبورگی</language>
 			<language type="lez">لزگی</language>
 			<language type="lg">گاندایی</language>
@@ -286,10 +287,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">لائوسی</language>
 			<language type="lol">مونگویی</language>
 			<language type="loz">لوزیایی</language>
+			<language type="lrc">لری شمالی</language>
 			<language type="lt">لیتوانیایی</language>
 			<language type="lu">لوبایی‐کاتانگا</language>
 			<language type="lua">لوبایی‐لولوا</language>
-			<language type="lui" draft="contributed">لویسنو</language>
+			<language type="lui">لویسنو</language>
 			<language type="lun">لوندایی</language>
 			<language type="luo">لوئویی</language>
 			<language type="lus">لوشه‌ای</language>
@@ -299,11 +301,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mad">مادورایی</language>
 			<language type="mag">ماگاهیایی</language>
 			<language type="mai">مایدیلی</language>
-			<language type="mak" draft="contributed">ماکاسار</language>
+			<language type="mak">ماکاسار</language>
 			<language type="man">ماندینگویی</language>
 			<language type="mas">ماسایی</language>
 			<language type="mdf">مکشایی</language>
-			<language type="mdr" draft="contributed">ماندار</language>
+			<language type="mdr">ماندار</language>
 			<language type="men">منده‌ای</language>
 			<language type="mer">مرویی</language>
 			<language type="mfe">موریسین</language>
@@ -328,15 +330,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mua">ماندانگی</language>
 			<language type="mul">چندین زبان</language>
 			<language type="mus">کریکی</language>
-			<language type="mwr" draft="contributed">مارواری</language>
+			<language type="mwr">مارواری</language>
 			<language type="my">برمه‌ای</language>
 			<language type="myv">ارزیایی</language>
+			<language type="mzn">مازندرانی</language>
 			<language type="na">نائورویی</language>
 			<language type="nap">ناپلی</language>
 			<language type="naq">نامایی</language>
-			<language type="nb">بوکسمال نروژی</language>
+			<language type="nb">نروژی بوک‌مُل</language>
 			<language type="nd">انده‌بله‌ای شمالی</language>
 			<language type="nds">آلمانی سفلی</language>
+			<language type="nds_NL">ساکسونی سفلی</language>
 			<language type="ne">نپالی</language>
 			<language type="new">نواریایی</language>
 			<language type="ng">اندونگایی</language>
@@ -345,7 +349,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nl">هلندی</language>
 			<language type="nl_BE">فلمنگی</language>
 			<language type="nmg">کوازیو</language>
-			<language type="nn">نرس جدید نروژی</language>
+			<language type="nn">نروژی نی‌نُشک</language>
 			<language type="no">نروژی</language>
 			<language type="nog">نغایی</language>
 			<language type="non">نرس باستان</language>
@@ -389,7 +393,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="qu">کچوایی</language>
 			<language type="quc">کیچه‌</language>
 			<language type="raj">راجستانی</language>
-			<language type="rap" draft="contributed">راپانویی</language>
+			<language type="rap">راپانویی</language>
 			<language type="rar">راروتونگایی</language>
 			<language type="rm">رومانش</language>
 			<language type="rn">روندیایی</language>
@@ -399,25 +403,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="rom">رومانویی</language>
 			<language type="root">ریشه</language>
 			<language type="ru">روسی</language>
+			<language type="rup">آرومانی</language>
 			<language type="rw">کینیارواندایی</language>
 			<language type="rwk">روایی</language>
-			<language type="sa">سنسکریت</language>
+			<language type="sa">سانسکریت</language>
 			<language type="sad">سانداوه‌ای</language>
 			<language type="sah">یاقوتی</language>
 			<language type="sam">آرامی سامری</language>
 			<language type="saq">سامبورو</language>
 			<language type="sas">ساساکی</language>
 			<language type="sat">سانتالی</language>
-			<language type="sbp">سانگو</language>
+			<language type="sbp">سانگویی</language>
 			<language type="sc">ساردینیایی</language>
 			<language type="scn">سیسیلی</language>
 			<language type="sco">اسکاتلندی</language>
 			<language type="sd">سندی</language>
+			<language type="sdh">کردی جنوبی</language>
 			<language type="se">سامی شمالی</language>
 			<language type="seh">سنا</language>
 			<language type="sel">سلکوپی</language>
 			<language type="ses">کویرابورا سنی</language>
-			<language type="sg">سانگویی</language>
+			<language type="sg">سانگو</language>
 			<language type="sga">ایرلندی باستان</language>
 			<language type="sh">صرب و کرواتی</language>
 			<language type="shi">تاچل‌هیت</language>
@@ -426,7 +432,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="si">سینهالی</language>
 			<language type="sid">سیدامویی</language>
 			<language type="sk">اسلواکی</language>
-			<language type="sl">اسلووینیایی</language>
+			<language type="sl">اسلوونیایی</language>
+			<language type="sli">سیلزیایی سفلی</language>
 			<language type="sm">ساموآیی</language>
 			<language type="sma">سامی جنوبی</language>
 			<language type="smj">لوله سامی</language>
@@ -448,10 +455,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">سومری</language>
 			<language type="sv">سوئدی</language>
 			<language type="sw">سواحلی</language>
+			<language type="sw_CD">سواحلی کنگویی</language>
 			<language type="swb">کوموری</language>
-			<language type="swc">سواحلی کنگویی</language>
 			<language type="syc">سریانی کلاسیک</language>
 			<language type="syr">سریانی</language>
+			<language type="szl">سیلزیایی</language>
 			<language type="ta">تامیلی</language>
 			<language type="te">تلوگویی</language>
 			<language type="tem">تمنه‌ای</language>
@@ -501,7 +509,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wa">والونی</language>
 			<language type="wal" draft="contributed">والامو</language>
 			<language type="war">وارایی</language>
-			<language type="was" draft="contributed">واشویی</language>
+			<language type="was">واشویی</language>
+			<language type="wbp">وارلپیری</language>
 			<language type="wo">ولوفی</language>
 			<language type="xal">قلموقی</language>
 			<language type="xh">خوسایی</language>
@@ -513,7 +522,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="yue">کانتونی</language>
 			<language type="za">چوانگی</language>
 			<language type="zap">زاپوتکی</language>
-			<language type="zen" draft="contributed">زناگا</language>
+			<language type="zen">زناگا</language>
 			<language type="zgh">آمازیغی معیار مراکش</language>
 			<language type="zh">چینی</language>
 			<language type="zh_Hans">چینی ساده‌شده</language>
@@ -521,7 +530,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="zu">زولویی</language>
 			<language type="zun">زونیایی</language>
 			<language type="zxx">بدون محتوای زبانی</language>
-			<language type="zza" draft="contributed">زازایی</language>
+			<language type="zza">زازایی</language>
 		</languages>
 		<scripts>
 			<script type="Aghb">آلبانیایی قفقازی</script>
@@ -533,7 +542,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Bali">بالیایی</script>
 			<script type="Batk">باتاکی</script>
 			<script type="Beng">بنگالی</script>
-			<script type="Blis" draft="contributed">نمادهای بلیس</script>
+			<script type="Blis">نمادهای بلیس</script>
 			<script type="Bopo">بوپوموفو</script>
 			<script type="Brah">براهمی</script>
 			<script type="Brai">بریل</script>
@@ -548,8 +557,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Cprt">قبرسی</script>
 			<script type="Cyrl">سیریلی</script>
 			<script type="Deva">دوناگری</script>
-			<script type="Dsrt" draft="contributed">دیسرتی</script>
-			<script type="Egyh" draft="contributed">کاهنی مصری</script>
+			<script type="Dsrt">دیسرتی</script>
+			<script type="Egyh">کاهنی مصری</script>
 			<script type="Egyp">هیروگلیف مصری</script>
 			<script type="Ethi">اتیوپیایی</script>
 			<script type="Geok" draft="contributed">گرجی خوتسوری</script>
@@ -579,7 +588,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Kana">کاتاکانا</script>
 			<script type="Khmr">خمری</script>
 			<script type="Khoj">خواجکی</script>
-			<script type="Knda">کاناده‌ای</script>
+			<script type="Knda">کانارا</script>
 			<script type="Kore">کره‌ای</script>
 			<script type="Kthi" draft="contributed">کثی</script>
 			<script type="Lana" draft="contributed">لانایی</script>
@@ -588,8 +597,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Latg">لاتینی گیلی</script>
 			<script type="Latn">لاتینی</script>
 			<script type="Limb" draft="contributed">لیمبایی</script>
-			<script type="Lina" draft="contributed">خطی الف</script>
-			<script type="Linb" draft="contributed">خطی ب</script>
+			<script type="Lina">خطی الف</script>
+			<script type="Linb">خطی ب</script>
 			<script type="Lyci" draft="contributed">لسیایی</script>
 			<script type="Lydi" draft="contributed">لدیایی</script>
 			<script type="Mand">منده‌ای</script>
@@ -637,7 +646,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Tibt">تبتی</script>
 			<script type="Ugar">اوگاریتی</script>
 			<script type="Vaii">ویایی</script>
-			<script type="Visp" draft="contributed">گفتار قابل مشاهده</script>
+			<script type="Visp">گفتار قابل مشاهده</script>
 			<script type="Xpeo">فارسی باستان</script>
 			<script type="Xsux">میخی سومری‐اکدی</script>
 			<script type="Yiii">یی</script>
@@ -687,7 +696,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">آنگویلا</territory>
 			<territory type="AL">آلبانی</territory>
 			<territory type="AM">ارمنستان</territory>
-			<territory type="AN">آنتیل هلند</territory>
 			<territory type="AO">آنگولا</territory>
 			<territory type="AQ">جنوبگان</territory>
 			<territory type="AR">آرژانتین</territory>
@@ -710,11 +718,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BM">برمودا</territory>
 			<territory type="BN">برونئی</territory>
 			<territory type="BO">بولیوی</territory>
-			<territory type="BQ">بونیر</territory>
+			<territory type="BQ">جزایر کارائیب هلند</territory>
 			<territory type="BR">برزیل</territory>
 			<territory type="BS">باهاما</territory>
 			<territory type="BT">بوتان</territory>
-			<territory type="BV">جزیره بووه</territory>
+			<territory type="BV">جزیرهٔ بووه</territory>
 			<territory type="BW">بوتسوانا</territory>
 			<territory type="BY">بلاروس</territory>
 			<territory type="BZ">بلیز</territory>
@@ -917,7 +925,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="TH">تایلند</territory>
 			<territory type="TJ">تاجیکستان</territory>
 			<territory type="TK">توکلائو</territory>
-			<territory type="TL">تیمور شرقی</territory>
+			<territory type="TL">تیمور-لسته</territory>
+			<territory type="TL" alt="variant">تیمور شرقی</territory>
 			<territory type="TM">ترکمنستان</territory>
 			<territory type="TN">تونس</territory>
 			<territory type="TO">تونگا</territory>
@@ -929,7 +938,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="UA">اوکراین</territory>
 			<territory type="UG">اوگاندا</territory>
 			<territory type="UM">جزایر دورافتادهٔ ایالات متحده</territory>
-			<territory type="US">ایالات متحدهٔ امریکا</territory>
+			<territory type="US">ایالات متحده</territory>
 			<territory type="US" alt="short">ایالات متحده</territory>
 			<territory type="UY">اروگوئه</territory>
 			<territory type="UZ">ازبکستان</territory>
@@ -974,6 +983,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric">مرتب‌سازی عددی</key>
 			<key type="colStrength">قدرت مرتب‌سازی</key>
 			<key type="currency">واحد پول</key>
+			<key type="hc">دور ساعت (۱۲ در مقابل ۲۴)</key>
+			<key type="lb">شیوهٔ اعمال سرخط</key>
+			<key type="ms">دستگاه اندازه‌گیری</key>
 			<key type="numbers">اعداد</key>
 			<key type="timezone">منطقه زمانی</key>
 			<key type="va">متغیر محلی</key>
@@ -981,101 +993,112 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">استفادهٔ خصوصی</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">ارقام عربی</type>
-			<type type="arabext" key="numbers">ارقام فارسی</type>
-			<type type="armn" key="numbers">اعداد ارمنی</type>
-			<type type="armnlow" key="numbers">اعداد ارمنی با حروف کوچک</type>
-			<type type="bali" key="numbers">ارقام بالیایی</type>
-			<type type="beng" key="numbers">ارقام بنگالی</type>
-			<type type="big5han" key="collation">ترتیب چینی سنتی - Big5</type>
-			<type type="buddhist" key="calendar">تقویم بودایی</type>
-			<type type="chinese" key="calendar">تقویم چینی</type>
-			<type type="coptic" key="calendar">تقویم قبطی</type>
-			<type type="dangi" key="calendar">تقویم دانگی</type>
-			<type type="deva" key="numbers">ارقام دوناگری</type>
-			<type type="dictionary" key="collation">ترتیب فرهنگ لغت</type>
-			<type type="ducet" key="collation">ترتیب پیش‌فرض یونی‌کد</type>
-			<type type="ethi" key="numbers">اعداد اتیوپیایی</type>
-			<type type="ethiopic" key="calendar">تقویم اتیوپیایی</type>
-			<type type="ethiopic-amete-alem" key="calendar">تقویم اتیوپیایی عامت عالم</type>
-			<type type="finance" key="numbers">سیستم عددی مالی</type>
-			<type type="fullwide" key="numbers">ارقام تمام‌عرض</type>
-			<type type="gb2312han" key="collation">ترتیب چینی ساده‌شده - GB2312</type>
-			<type type="geor" key="numbers">اعداد گرجی</type>
-			<type type="gregorian" key="calendar">تقویم میلادی</type>
-			<type type="grek" key="numbers">اعداد یونانی</type>
-			<type type="greklow" key="numbers">اعداد یونانی با حروف کوچک</type>
-			<type type="gujr" key="numbers">ارقام گجراتی</type>
-			<type type="guru" key="numbers">ارقام گورومخی</type>
-			<type type="hanidec" key="numbers">اعداد دهدهی چینی</type>
-			<type type="hans" key="numbers">اعداد چینی ساده‌شده</type>
-			<type type="hansfin" key="numbers">اعداد مالی چینی ساده‌شده</type>
-			<type type="hant" key="numbers">اعداد چینی سنتی</type>
-			<type type="hantfin" key="numbers">اعداد مالی چینی سنتی</type>
-			<type type="hebr" key="numbers">اعداد عبری</type>
-			<type type="hebrew" key="calendar">تقویم عبری</type>
-			<type type="identical" key="colStrength">مرتب‌سازی همه</type>
-			<type type="indian" key="calendar">تقویم ملی هند</type>
-			<type type="islamic" key="calendar">تقویم هجری قمری</type>
-			<type type="islamic-civil" key="calendar">تقویم هجری قمری جدولی مدنی</type>
-			<type type="islamic-rgsa" key="calendar">قویم هجری قمری هلالی عربستان سعودی</type>
-			<type type="islamic-tbla" key="calendar">تقویم هجری قمری جدولی نجومی</type>
-			<type type="islamic-umalqura" key="calendar">تقویم هجری قمری ام‌القری</type>
-			<type type="iso8601" key="calendar">تقویم ایزو ۸۶۰۱</type>
-			<type type="japanese" key="calendar">تقویم ژاپنی</type>
-			<type type="java" key="numbers">ارقام جاوه‌ای</type>
-			<type type="jpan" key="numbers">اعداد ژاپنی</type>
-			<type type="jpanfin" key="numbers">اعداد مالی ژاپنی</type>
-			<type type="khmr" key="numbers">ارقام خمری</type>
-			<type type="knda" key="numbers">ارقام کاناده‌ای</type>
-			<type type="laoo" key="numbers">ارقام لائوسی</type>
-			<type type="latn" key="numbers">ارقام غربی</type>
-			<type type="lower" key="colCaseFirst">ابتدا مرتب‌سازی حروف کوچک</type>
-			<type type="mlym" key="numbers">ارقام مالایالامی</type>
-			<type type="mong" key="numbers">ارقام مغولی</type>
-			<type type="mymr" key="numbers">ارقام میانماری</type>
-			<type type="mymrshan" key="numbers">ارقام شان میانماری</type>
-			<type type="native" key="numbers">ارقام بومی</type>
-			<type type="no" key="colBackwards">مرتب‌سازی آکسان‌ها به صورت معمولی</type>
-			<type type="no" key="colCaseFirst">مرتب‌سازی به ترتیب معمولی بزرگ و کوچکی حروف</type>
-			<type type="no" key="colCaseLevel">مرتب‌سازی بدون توجه به کوچک و بزرگی حروف</type>
-			<type type="no" key="colHiraganaQuaternary">مرتب‌سازی بر اساس سیستم کانا به صورت جداگانه</type>
-			<type type="no" key="colNormalization">مرتب‌سازی بدون عادی‌سازی</type>
-			<type type="no" key="colNumeric">مرتب‌سازی ارقام بصورت مجزا</type>
-			<type type="non-ignorable" key="colAlternate">مرتب‌سازی نمادها</type>
-			<type type="orya" key="numbers">ارقام اوریه‌ای</type>
-			<type type="persian" key="calendar">تقویم هجری شمسی</type>
-			<type type="phonebook" key="collation">ترتیب دفتر تلفن</type>
-			<type type="phonetic" key="collation">مرتب کردن بر اساس آوایی</type>
-			<type type="pinyin" key="collation">ترتیب پین‌یین</type>
-			<type type="primary" key="colStrength">مرتب‌سازی فقط حروف پایه</type>
-			<type type="quaternary" key="colStrength">مرتب‌سازی بر اساس آکسان/اندازه حروف/عرض/کانا</type>
-			<type type="reformed" key="collation">ترتیب اصلاح‌شده</type>
-			<type type="roc" key="calendar">تقویم جمهوری چین (تایوان)</type>
-			<type type="roman" key="numbers">اعداد رومی</type>
-			<type type="romanlow" key="numbers">اعداد رومی با حروف کوچک</type>
-			<type type="search" key="collation">جستجوی عمومی</type>
-			<type type="searchjl" key="collation">جستجو با صامت اول هانگول</type>
-			<type type="secondary" key="colStrength">مرتب‌سازی آکسان‌ها</type>
-			<type type="shifted" key="colAlternate">مرتب‌سازی با نادیده گرفتن نمادها</type>
-			<type type="standard" key="collation">ترتیب استاندارد</type>
-			<type type="stroke" key="collation">ترتیب حرکتی</type>
-			<type type="taml" key="numbers">اعداد سنتی تامیلی</type>
-			<type type="tamldec" key="numbers">ارقام تامیلی</type>
-			<type type="telu" key="numbers">ارقام تلوگویی</type>
-			<type type="tertiary" key="colStrength">مرتب‌سازی بر اساس آکسان/اندازه حرف/عرض</type>
-			<type type="thai" key="numbers">ارقام تایلندی</type>
-			<type type="tibt" key="numbers">ارقام تبتی</type>
-			<type type="traditional" key="collation">ترتیب سنتی</type>
-			<type type="traditional" key="numbers">سیستم اعداد سنتی</type>
-			<type type="unihan" key="collation">ترتیب رادیکالی-حرکتی</type>
-			<type type="upper" key="colCaseFirst">مرتب‌سازی بر اساس حرف بزرگ در ابتدا</type>
-			<type type="vaii" key="numbers">ارقام وایی</type>
-			<type type="yes" key="colBackwards">مرتب‌سازی معکوس براساس آکسان</type>
-			<type type="yes" key="colCaseLevel">مرتب‌سازی با حساسیت به اندازه حروف</type>
-			<type type="yes" key="colHiraganaQuaternary">مرتب‌سازی کانا به صورت متفاوت</type>
-			<type type="yes" key="colNormalization">مرتب‌سازی یونیکد نرمال شده</type>
-			<type type="yes" key="colNumeric">مرتب‌سازی شماره‌ها با سیستم عددی</type>
+			<type key="calendar" type="buddhist">تقویم بودایی</type>
+			<type key="calendar" type="chinese">تقویم چینی</type>
+			<type key="calendar" type="coptic">تقویم قبطی</type>
+			<type key="calendar" type="dangi">تقویم دانگی</type>
+			<type key="calendar" type="ethiopic">تقویم اتیوپیایی</type>
+			<type key="calendar" type="ethiopic-amete-alem">تقویم اتیوپیایی عامت عالم</type>
+			<type key="calendar" type="gregorian">تقویم میلادی</type>
+			<type key="calendar" type="hebrew">تقویم عبری</type>
+			<type key="calendar" type="indian">تقویم ملی هند</type>
+			<type key="calendar" type="islamic">تقویم هجری قمری</type>
+			<type key="calendar" type="islamic-civil">تقویم هجری قمری جدولی مدنی</type>
+			<type key="calendar" type="islamic-rgsa">قویم هجری قمری هلالی عربستان سعودی</type>
+			<type key="calendar" type="islamic-tbla">تقویم هجری قمری جدولی نجومی</type>
+			<type key="calendar" type="islamic-umalqura">تقویم هجری قمری ام‌القری</type>
+			<type key="calendar" type="iso8601">تقویم ایزو ۸۶۰۱</type>
+			<type key="calendar" type="japanese">تقویم ژاپنی</type>
+			<type key="calendar" type="persian">تقویم هجری شمسی</type>
+			<type key="calendar" type="roc">تقویم جمهوری چین (تایوان)</type>
+			<type key="colAlternate" type="non-ignorable">مرتب‌سازی نمادها</type>
+			<type key="colAlternate" type="shifted">مرتب‌سازی با نادیده گرفتن نمادها</type>
+			<type key="colBackwards" type="no">مرتب‌سازی آکسان‌ها به صورت معمولی</type>
+			<type key="colBackwards" type="yes">مرتب‌سازی معکوس براساس آکسان</type>
+			<type key="colCaseFirst" type="lower">ابتدا مرتب‌سازی حروف کوچک</type>
+			<type key="colCaseFirst" type="no">مرتب‌سازی به ترتیب معمولی بزرگ و کوچکی حروف</type>
+			<type key="colCaseFirst" type="upper">مرتب‌سازی بر اساس حرف بزرگ در ابتدا</type>
+			<type key="colCaseLevel" type="no">مرتب‌سازی بدون توجه به کوچک و بزرگی حروف</type>
+			<type key="colCaseLevel" type="yes">مرتب‌سازی با حساسیت به اندازه حروف</type>
+			<type key="colHiraganaQuaternary" type="no">مرتب‌سازی بر اساس سیستم کانا به صورت جداگانه</type>
+			<type key="colHiraganaQuaternary" type="yes">مرتب‌سازی کانا به صورت متفاوت</type>
+			<type key="collation" type="big5han">ترتیب چینی سنتی - Big5</type>
+			<type key="collation" type="dictionary">ترتیب فرهنگ لغت</type>
+			<type key="collation" type="ducet">ترتیب پیش‌فرض یونی‌کد</type>
+			<type key="collation" type="emoji">ترتیب ایموجی</type>
+			<type key="collation" type="gb2312han">ترتیب چینی ساده‌شده - GB2312</type>
+			<type key="collation" type="phonebook">ترتیب دفتر تلفن</type>
+			<type key="collation" type="phonetic">مرتب کردن بر اساس آوایی</type>
+			<type key="collation" type="pinyin">ترتیب پین‌یین</type>
+			<type key="collation" type="reformed">ترتیب اصلاح‌شده</type>
+			<type key="collation" type="search">جستجوی عمومی</type>
+			<type key="collation" type="searchjl">جستجو با صامت اول هانگول</type>
+			<type key="collation" type="standard">ترتیب استاندارد</type>
+			<type key="collation" type="stroke">ترتیب حرکتی</type>
+			<type key="collation" type="traditional">ترتیب سنتی</type>
+			<type key="collation" type="unihan">ترتیب رادیکالی-حرکتی</type>
+			<type key="colNormalization" type="no">مرتب‌سازی بدون عادی‌سازی</type>
+			<type key="colNormalization" type="yes">مرتب‌سازی یونیکد نرمال‌شده</type>
+			<type key="colNumeric" type="no">مرتب‌سازی ارقام بصورت مجزا</type>
+			<type key="colNumeric" type="yes">مرتب‌سازی شماره‌ها با سیستم عددی</type>
+			<type key="colStrength" type="identical">مرتب‌سازی همه</type>
+			<type key="colStrength" type="primary">مرتب‌سازی فقط حروف پایه</type>
+			<type key="colStrength" type="quaternary">مرتب‌سازی بر اساس آکسان/اندازه حروف/عرض/کانا</type>
+			<type key="colStrength" type="secondary">مرتب‌سازی آکسان‌ها</type>
+			<type key="colStrength" type="tertiary">مرتب‌سازی بر اساس آکسان/اندازه حرف/عرض</type>
+			<type key="hc" type="h11">سیستم ۱۲ ساعته (۰ تا ۱۱)</type>
+			<type key="hc" type="h12">سیستم ۱۲ ساعته (۱ تا ۱۲)</type>
+			<type key="hc" type="h23">سیستم ۲۴ ساعته (۰ تا ۲۳)</type>
+			<type key="hc" type="h24">سیستم ۲۴ ساعته (۱ تا ۲۴)</type>
+			<type key="lb" type="loose">شیوهٔ ضعیف اعمال سرخط</type>
+			<type key="lb" type="normal">شیوهٔ عادی اعمال سرخط</type>
+			<type key="lb" type="strict">شیوهٔ قوی اعمال سرخط</type>
+			<type key="ms" type="metric">دستگاه متریک</type>
+			<type key="ms" type="uksystem">دستگاه اندازه‌گیری بریتانیایی</type>
+			<type key="ms" type="ussystem">دستگاه اندازه‌گیری امریکایی</type>
+			<type key="numbers" type="arab">ارقام عربی</type>
+			<type key="numbers" type="arabext">ارقام فارسی</type>
+			<type key="numbers" type="armn">اعداد ارمنی</type>
+			<type key="numbers" type="armnlow">اعداد ارمنی با حروف کوچک</type>
+			<type key="numbers" type="bali">ارقام بالیایی</type>
+			<type key="numbers" type="beng">ارقام بنگالی</type>
+			<type key="numbers" type="deva">ارقام دوناگری</type>
+			<type key="numbers" type="ethi">اعداد اتیوپیایی</type>
+			<type key="numbers" type="finance">سیستم عددی مالی</type>
+			<type key="numbers" type="fullwide">ارقام تمام‌عرض</type>
+			<type key="numbers" type="geor">اعداد گرجی</type>
+			<type key="numbers" type="grek">اعداد یونانی</type>
+			<type key="numbers" type="greklow">اعداد یونانی با حروف کوچک</type>
+			<type key="numbers" type="gujr">ارقام گجراتی</type>
+			<type key="numbers" type="guru">ارقام گورومخی</type>
+			<type key="numbers" type="hanidec">اعداد دهدهی چینی</type>
+			<type key="numbers" type="hans">اعداد چینی ساده‌شده</type>
+			<type key="numbers" type="hansfin">اعداد مالی چینی ساده‌شده</type>
+			<type key="numbers" type="hant">اعداد چینی سنتی</type>
+			<type key="numbers" type="hantfin">اعداد مالی چینی سنتی</type>
+			<type key="numbers" type="hebr">اعداد عبری</type>
+			<type key="numbers" type="java">ارقام جاوه‌ای</type>
+			<type key="numbers" type="jpan">اعداد ژاپنی</type>
+			<type key="numbers" type="jpanfin">اعداد مالی ژاپنی</type>
+			<type key="numbers" type="khmr">ارقام خمری</type>
+			<type key="numbers" type="knda">ارقام کاناده‌ای</type>
+			<type key="numbers" type="laoo">ارقام لائوسی</type>
+			<type key="numbers" type="latn">ارقام غربی</type>
+			<type key="numbers" type="mlym">ارقام مالایالامی</type>
+			<type key="numbers" type="mong">ارقام مغولی</type>
+			<type key="numbers" type="mymr">ارقام میانماری</type>
+			<type key="numbers" type="mymrshan">ارقام شان میانماری</type>
+			<type key="numbers" type="native">ارقام بومی</type>
+			<type key="numbers" type="orya">ارقام اوریه‌ای</type>
+			<type key="numbers" type="roman">اعداد رومی</type>
+			<type key="numbers" type="romanlow">اعداد رومی با حروف کوچک</type>
+			<type key="numbers" type="taml">اعداد سنتی تامیلی</type>
+			<type key="numbers" type="tamldec">ارقام تامیلی</type>
+			<type key="numbers" type="telu">ارقام تلوگویی</type>
+			<type key="numbers" type="thai">ارقام تایلندی</type>
+			<type key="numbers" type="tibt">ارقام تبتی</type>
+			<type key="numbers" type="traditional">سیستم اعداد سنتی</type>
+			<type key="numbers" type="vaii">ارقام وایی</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN">BGN</transformName>
@@ -1152,7 +1175,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern>EEEE d MMMM y G</pattern>
+							<pattern>G y MMMM d, EEEE</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
@@ -1194,6 +1217,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -1223,6 +1247,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E d MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y MMMM</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">QQQQ y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
 					</availableFormats>
@@ -1279,7 +1304,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">E M/d تا E M/d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL تا LLL</greatestDifference>
+							<greatestDifference id="M">MMM تا MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">d تا d LLL</greatestDifference>
@@ -1540,42 +1565,88 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">نیمه‌شب</dayPeriod>
+							<dayPeriod type="am">ق.ظ.</dayPeriod>
+							<dayPeriod type="noon">ظهر</dayPeriod>
+							<dayPeriod type="pm">ب.ظ.</dayPeriod>
+							<dayPeriod type="morning1">صبح</dayPeriod>
+							<dayPeriod type="afternoon1">عصر</dayPeriod>
+							<dayPeriod type="evening1">عصر</dayPeriod>
+							<dayPeriod type="night1">شب</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">ن</dayPeriod>
 							<dayPeriod type="am">ق</dayPeriod>
 							<dayPeriod type="noon">ظ</dayPeriod>
 							<dayPeriod type="pm">ب</dayPeriod>
+							<dayPeriod type="morning1">ص</dayPeriod>
+							<dayPeriod type="afternoon1">ب</dayPeriod>
+							<dayPeriod type="evening1">ع</dayPeriod>
+							<dayPeriod type="night1">ش</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="afternoon">عصر</dayPeriod>
+							<dayPeriod type="midnight">نیمه‌شب</dayPeriod>
 							<dayPeriod type="am">قبل‌ازظهر</dayPeriod>
-							<dayPeriod type="earlyMorning">بامداد</dayPeriod>
-							<dayPeriod type="midDay">بعدازظهر</dayPeriod>
-							<dayPeriod type="morning">صبح</dayPeriod>
-							<dayPeriod type="night">شب</dayPeriod>
 							<dayPeriod type="noon">ظهر</dayPeriod>
 							<dayPeriod type="pm">بعدازظهر</dayPeriod>
-							<dayPeriod type="weeHours">نیمه‌شب</dayPeriod>
+							<dayPeriod type="morning1">صبح</dayPeriod>
+							<dayPeriod type="afternoon1">عصر</dayPeriod>
+							<dayPeriod type="evening1">عصر</dayPeriod>
+							<dayPeriod type="night1">شب</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">نیمه‌شب</dayPeriod>
+							<dayPeriod type="am">ق.ظ.</dayPeriod>
+							<dayPeriod type="noon">ظ</dayPeriod>
+							<dayPeriod type="pm">ب.ظ.</dayPeriod>
+							<dayPeriod type="morning1">صبح</dayPeriod>
+							<dayPeriod type="afternoon1">عصر</dayPeriod>
+							<dayPeriod type="evening1">سر شب</dayPeriod>
+							<dayPeriod type="night1">شب</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">نیمه‌شب</dayPeriod>
+							<dayPeriod type="am">ق.ظ.</dayPeriod>
+							<dayPeriod type="noon">ظهر</dayPeriod>
+							<dayPeriod type="pm">ب.ظ.</dayPeriod>
+							<dayPeriod type="morning1">صبح</dayPeriod>
+							<dayPeriod type="afternoon1">عصر</dayPeriod>
+							<dayPeriod type="evening1">سر شب</dayPeriod>
+							<dayPeriod type="night1">شب</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">نیمه‌شب</dayPeriod>
+							<dayPeriod type="am">قبل‌ازظهر</dayPeriod>
+							<dayPeriod type="noon">ظهر</dayPeriod>
+							<dayPeriod type="pm">بعدازظهر</dayPeriod>
+							<dayPeriod type="morning1">صبح</dayPeriod>
+							<dayPeriod type="afternoon1">عصر</dayPeriod>
+							<dayPeriod type="evening1">سر شب</dayPeriod>
+							<dayPeriod type="night1">شب</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
 						<era type="0">قبل از میلاد</era>
-						<era type="0" alt="variant">قبل از عصر حاضر</era>
+						<era type="0" alt="variant">قبل از دوران مشترک</era>
 						<era type="1">میلادی</era>
-						<era type="1" alt="variant">عصر حاضر</era>
+						<era type="1" alt="variant">دوران مشترک</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">ق.م.</era>
-						<era type="0" alt="variant">قبل از عصر حاضر</era>
+						<era type="0" alt="variant">ق.د.م</era>
 						<era type="1">م.</era>
-						<era type="1" alt="variant">عصر حاضر</era>
+						<era type="1" alt="variant">د.م.</era>
 					</eraAbbr>
 					<eraNarrow>
 						<era type="0">ق</era>
-						<era type="0" alt="variant" draft="unconfirmed">قبل از عصر حاضر</era>
+						<era type="0" alt="variant">ق.د.م</era>
 						<era type="1">م</era>
-						<era type="1" alt="variant" draft="unconfirmed">عصر حاضر</era>
+						<era type="1" alt="variant">د.م.</era>
 					</eraNarrow>
 				</eras>
 				<dateFormats>
@@ -1662,6 +1733,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">H:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
 						<dateFormatItem id="MEd">E M/d</dateFormatItem>
@@ -1907,18 +1982,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="12">ذیحجهٔ</month>
 						</monthWidth>
 						<monthWidth type="narrow">
-							<month type="1">م</month>
-							<month type="2">ص</month>
-							<month type="3">ر</month>
-							<month type="4">ر</month>
-							<month type="5">ج</month>
-							<month type="6">ج</month>
-							<month type="7">ر</month>
-							<month type="8">ش</month>
-							<month type="9">ر</month>
-							<month type="10">ش</month>
-							<month type="11">ذ</month>
-							<month type="12">ذ</month>
+							<month type="1">1</month>
+							<month type="2">2</month>
+							<month type="3">3</month>
+							<month type="4">4</month>
+							<month type="5">5</month>
+							<month type="6">6</month>
+							<month type="7">7</month>
+							<month type="8">8</month>
+							<month type="9">9</month>
+							<month type="10">10</month>
+							<month type="11">11</month>
+							<month type="12">12</month>
 						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">محرم</month>
@@ -1951,18 +2026,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="12">ذیحجه</month>
 						</monthWidth>
 						<monthWidth type="narrow">
-							<month type="1">م</month>
-							<month type="2">ص</month>
-							<month type="3">ر</month>
-							<month type="4">ر</month>
-							<month type="5">ج</month>
-							<month type="6">ج</month>
-							<month type="7">ر</month>
-							<month type="8">ش</month>
-							<month type="9">ر</month>
-							<month type="10">ش</month>
-							<month type="11">ذ</month>
-							<month type="12">ذ</month>
+							<month type="1">1</month>
+							<month type="2">2</month>
+							<month type="3">3</month>
+							<month type="4">4</month>
+							<month type="5">5</month>
+							<month type="6">6</month>
+							<month type="7">7</month>
+							<month type="8">8</month>
+							<month type="9">9</month>
+							<month type="10">10</month>
+							<month type="11">11</month>
+							<month type="12">12</month>
 						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">محرم</month>
@@ -1991,7 +2066,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern>EEEE d MMMM y GGGG</pattern>
+							<pattern>EEEE d MMMM y G</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
@@ -2001,18 +2076,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern>y/M/d G</pattern>
+							<pattern>d MMM y G</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>yy/M/d G</pattern>
+							<pattern>y/M/d G</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
 				<dateTimeFormats>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -2034,7 +2110,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMMMd">d LLLL</dateFormatItem>
 						<dateFormatItem id="MMMMEd">E d LLLL</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
+						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yM">y/M</dateFormatItem>
 						<dateFormatItem id="yMEd">E y/M/d</dateFormatItem>
 						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
@@ -2043,10 +2119,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
 						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
+						<dateFormatItem id="yyyyM">y/M G</dateFormatItem>
+						<dateFormatItem id="yyyyMd">y/M/d G</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E y/M/d G</dateFormatItem>
 						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E d MMM y G</dateFormatItem>
-						<dateFormatItem id="yyyyQQQ">QQQQ y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y MMMM</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
 					</availableFormats>
 				</dateTimeFormats>
@@ -2172,6 +2252,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>سال</displayName>
+				<relative type="-1">سال گذشته</relative>
+				<relative type="0">امسال</relative>
+				<relative type="1">سال آینده</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} سال بعد</relativeTimePattern>
 					<relativeTimePattern count="other">{0} سال بعد</relativeTimePattern>
@@ -2183,6 +2266,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>سال</displayName>
+				<relative type="-1">سال گذشته</relative>
+				<relative type="0">امسال</relative>
+				<relative type="1">سال آینده</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} سال بعد</relativeTimePattern>
 					<relativeTimePattern count="other">{0} سال بعد</relativeTimePattern>
@@ -2194,35 +2280,44 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter">
 				<displayName>سه‌ماهه</displayName>
+				<relative type="-1">سه‌ماههٔ گذشته</relative>
+				<relative type="0">سه‌ماههٔ کنونی</relative>
+				<relative type="1">سه‌ماههٔ آینده</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} سه‌ماهه بعد</relativeTimePattern>
-					<relativeTimePattern count="other">{0} سه‌ماهه بعد</relativeTimePattern>
+					<relativeTimePattern count="one">{0} سه‌ماههٔ بعد</relativeTimePattern>
+					<relativeTimePattern count="other">{0} سه‌ماههٔ بعد</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} سه‌ماهه پیش</relativeTimePattern>
-					<relativeTimePattern count="other">{0} سه‌ماهه پیش</relativeTimePattern>
+					<relativeTimePattern count="one">{0} سه‌ماههٔ پیش</relativeTimePattern>
+					<relativeTimePattern count="other">{0} سه‌ماههٔ پیش</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-short">
 				<displayName>سه‌ماهه</displayName>
+				<relative type="-1">سه‌ماههٔ گذشته</relative>
+				<relative type="0">سه‌ماههٔ کنونی</relative>
+				<relative type="1">سه‌ماههٔ آینده</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} سه‌ماهه بعد</relativeTimePattern>
-					<relativeTimePattern count="other">{0} سه‌ماهه بعد</relativeTimePattern>
+					<relativeTimePattern count="one">{0} سه‌ماههٔ بعد</relativeTimePattern>
+					<relativeTimePattern count="other">{0} سه‌ماههٔ بعد</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} سه‌ماهه پیش</relativeTimePattern>
-					<relativeTimePattern count="other">{0} سه‌ماهه پیش</relativeTimePattern>
+					<relativeTimePattern count="one">{0} سه‌ماههٔ پیش</relativeTimePattern>
+					<relativeTimePattern count="other">{0} سه‌ماههٔ پیش</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-narrow">
 				<displayName>سه‌ماهه</displayName>
+				<relative type="-1">سه‌ماههٔ گذشته</relative>
+				<relative type="0">سه‌ماههٔ کنونی</relative>
+				<relative type="1">سه‌ماههٔ آینده</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} سه‌ماهه بعد</relativeTimePattern>
-					<relativeTimePattern count="other">{0} سه‌ماهه بعد</relativeTimePattern>
+					<relativeTimePattern count="one">{0} سه‌ماههٔ بعد</relativeTimePattern>
+					<relativeTimePattern count="other">{0} سه‌ماههٔ بعد</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} سه‌ماهه پیش</relativeTimePattern>
-					<relativeTimePattern count="other">{0} سه‌ماهه پیش</relativeTimePattern>
+					<relativeTimePattern count="one">{0} سه‌ماههٔ پیش</relativeTimePattern>
+					<relativeTimePattern count="other">{0} سه‌ماههٔ پیش</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month">
@@ -2241,6 +2336,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>ماه</displayName>
+				<relative type="-1">ماه پیش</relative>
+				<relative type="0">این ماه</relative>
+				<relative type="1">ماه آینده</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ماه بعد</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ماه بعد</relativeTimePattern>
@@ -2252,6 +2350,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>ماه</displayName>
+				<relative type="-1">ماه پیش</relative>
+				<relative type="0">این ماه</relative>
+				<relative type="1">ماه آینده</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ماه بعد</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ماه بعد</relativeTimePattern>
@@ -2277,6 +2378,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>هفته</displayName>
+				<relative type="-1">هفتهٔ گذشته</relative>
+				<relative type="0">این هفته</relative>
+				<relative type="1">هفتهٔ آینده</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} هفته بعد</relativeTimePattern>
 					<relativeTimePattern count="other">{0} هفته بعد</relativeTimePattern>
@@ -2288,6 +2392,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>هفته</displayName>
+				<relative type="-1">هفتهٔ گذشته</relative>
+				<relative type="0">این هفته</relative>
+				<relative type="1">هفتهٔ آینده</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} هفته بعد</relativeTimePattern>
 					<relativeTimePattern count="other">{0} هفته بعد</relativeTimePattern>
@@ -2315,6 +2422,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>روز</displayName>
+				<relative type="-2">پریروز</relative>
+				<relative type="-1">دیروز</relative>
+				<relative type="0">امروز</relative>
+				<relative type="1">فردا</relative>
+				<relative type="2">پس‌فردا</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} روز بعد</relativeTimePattern>
 					<relativeTimePattern count="other">{0} روز بعد</relativeTimePattern>
@@ -2326,6 +2438,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>روز</displayName>
+				<relative type="-2">پریروز</relative>
+				<relative type="-1">دیروز</relative>
+				<relative type="0">امروز</relative>
+				<relative type="1">فردا</relative>
+				<relative type="2">پس‌فردا</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} روز بعد</relativeTimePattern>
 					<relativeTimePattern count="other">{0} روز بعد</relativeTimePattern>
@@ -2526,6 +2643,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="second-short">
 				<displayName>ثانیه</displayName>
+				<relative type="0">اکنون</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ثانیه بعد</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ثانیه بعد</relativeTimePattern>
@@ -2537,6 +2655,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="second-narrow">
 				<displayName>ثانیه</displayName>
+				<relative type="0">اکنون</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ثانیه بعد</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ثانیه بعد</relativeTimePattern>
@@ -2552,8 +2671,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</fields>
 		<timeZoneNames>
 			<hourFormat>+HH:mm;−HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<gmtZeroFormat>GMT</gmtZeroFormat>
+			<gmtFormat>{0} گرینویچ</gmtFormat>
+			<gmtZeroFormat>گرینویچ</gmtZeroFormat>
 			<regionFormat>وقت {0}</regionFormat>
 			<regionFormat type="daylight">وقت تابستانی {0}</regionFormat>
 			<regionFormat type="standard">وقت عادی {0}</regionFormat>
@@ -2748,7 +2867,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>کرالندیک</exemplarCity>
 			</zone>
 			<zone type="America/Eirunepe">
-				<exemplarCity draft="contributed">ایرونپه</exemplarCity>
+				<exemplarCity>ایرونپه</exemplarCity>
 			</zone>
 			<zone type="America/Rio_Branco">
 				<exemplarCity>ریوبرانکو</exemplarCity>
@@ -2757,7 +2876,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>پورتوولیو</exemplarCity>
 			</zone>
 			<zone type="America/Boa_Vista">
-				<exemplarCity>بوئاویشتا</exemplarCity>
+				<exemplarCity>بوئاویستا</exemplarCity>
 			</zone>
 			<zone type="America/Manaus">
 				<exemplarCity>ماناوس</exemplarCity>
@@ -2835,7 +2954,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>ادمونتون</exemplarCity>
 			</zone>
 			<zone type="America/Swift_Current">
-				<exemplarCity>سوئیفت‌کرنت</exemplarCity>
+				<exemplarCity>سویفت‌کارنت</exemplarCity>
 			</zone>
 			<zone type="America/Cambridge_Bay">
 				<exemplarCity>کمبریج‌بی</exemplarCity>
@@ -3039,7 +3158,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>لندن</exemplarCity>
 			</zone>
 			<zone type="America/Grenada">
-				<exemplarCity>گرانادا</exemplarCity>
+				<exemplarCity>گرنادا</exemplarCity>
 			</zone>
 			<zone type="Asia/Tbilisi">
 				<exemplarCity>تفلیس</exemplarCity>
@@ -3060,13 +3179,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>تول</exemplarCity>
 			</zone>
 			<zone type="America/Godthab">
-				<exemplarCity>گودهوب</exemplarCity>
+				<exemplarCity>نووک</exemplarCity>
 			</zone>
 			<zone type="America/Scoresbysund">
 				<exemplarCity>اسکورسبیسوند</exemplarCity>
 			</zone>
 			<zone type="America/Danmarkshavn">
-				<exemplarCity>دانمارک‌شاون</exemplarCity>
+				<exemplarCity>دانمارکس‌هاون</exemplarCity>
 			</zone>
 			<zone type="Africa/Banjul">
 				<exemplarCity>بانجول</exemplarCity>
@@ -3425,6 +3544,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>پورت‌مورزبی</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>بوگنویل</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>مانیل</exemplarCity>
 			</zone>
@@ -3509,6 +3631,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>ایرکوتسک</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>چیتا</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>یاکوتسک</exemplarCity>
 			</zone>
@@ -3527,6 +3652,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>ماگادان</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>اسردنکولیمسک</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>کامچاتکا</exemplarCity>
 			</zone>
@@ -3823,7 +3951,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Africa_Southern">
 				<long>
-					<standard>وقت جنوب افریقا</standard>
+					<standard>وقت عادی جنوب افریقا</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Western">
@@ -4011,7 +4139,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Chamorro">
 				<long>
-					<standard>وقت چامورو</standard>
+					<standard>وقت عادی چامورو</standard>
 				</long>
 			</metazone>
 			<metazone type="Chatham">
@@ -4745,13 +4873,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<native>arabext</native>
 		</otherNumberingSystems>
 		<minimumGroupingDigits draft="contributed">1</minimumGroupingDigits>
+		<symbols numberSystem="arab">
+			<decimal draft="contributed">٫</decimal>
+			<group draft="contributed">٬</group>
+			<list>؛</list>
+			<percentSign>٪</percentSign>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>؉</perMille>
+			<infinity>∞</infinity>
+			<timeSeparator draft="contributed">:</timeSeparator>
+		</symbols>
 		<symbols numberSystem="arabext">
 			<decimal>٫</decimal>
 			<group>٬</group>
 			<list>؛</list>
 			<percentSign>٪</percentSign>
-			<plusSign>‎+‎</plusSign> <!-- includes LRM before and after sign -->
-			<minusSign>‎−</minusSign> <!-- includes LRM before sign (2212) -->
+			<plusSign>‎+‎</plusSign>
+			<minusSign>‎−</minusSign>
 			<exponential>×۱۰^</exponential>
 			<superscriptingExponent>×</superscriptingExponent>
 			<perMille>؉</perMille>
@@ -4764,13 +4902,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<group>,</group>
 			<list>;</list>
 			<percentSign>%</percentSign>
-			<plusSign>‎+</plusSign> <!-- includes LRM before sign -->
-			<minusSign>‎−</minusSign> <!-- includes LRM before sign (2212) -->
+			<plusSign>‎+</plusSign>
+			<minusSign>‎−</minusSign>
 			<exponential>E</exponential>
 			<superscriptingExponent>×</superscriptingExponent>
 			<perMille>‰</perMille>
 			<infinity>∞</infinity>
-			<nan>NaN</nan>
+			<nan>ناعدد</nan>
 			<timeSeparator>:</timeSeparator>
 		</symbols>
 		<decimalFormats numberSystem="arabext">
@@ -4806,40 +4944,40 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern type="10000000000" count="other">00 میلیارد</pattern>
 					<pattern type="100000000000" count="one">000 میلیارد</pattern>
 					<pattern type="100000000000" count="other">000 میلیارد</pattern>
-					<pattern type="1000000000000" count="one">0 هزار میلیارد</pattern>
-					<pattern type="1000000000000" count="other">0 هزار میلیارد</pattern>
-					<pattern type="10000000000000" count="one">00 هزار میلیارد</pattern>
-					<pattern type="10000000000000" count="other">00 هزار میلیارد</pattern>
-					<pattern type="100000000000000" count="one">000 هزار میلیارد</pattern>
-					<pattern type="100000000000000" count="other">000 هزار میلیارد</pattern>
+					<pattern type="1000000000000" count="one">0 هزارمیلیارد</pattern>
+					<pattern type="1000000000000" count="other">0 هزارمیلیارد</pattern>
+					<pattern type="10000000000000" count="one">00 هزارمیلیارد</pattern>
+					<pattern type="10000000000000" count="other">00 هزارمیلیارد</pattern>
+					<pattern type="100000000000000" count="one">000 هزارمیلیارد</pattern>
+					<pattern type="100000000000000" count="other">000 هزارمیلیارد</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
 			<decimalFormatLength type="short">
 				<decimalFormat>
-					<pattern type="1000" count="one">0K</pattern>
-					<pattern type="1000" count="other">0K</pattern>
-					<pattern type="10000" count="one">00K</pattern>
-					<pattern type="10000" count="other">00K</pattern>
-					<pattern type="100000" count="one">000K</pattern>
-					<pattern type="100000" count="other">000K</pattern>
-					<pattern type="1000000" count="one">0M</pattern>
-					<pattern type="1000000" count="other">0M</pattern>
-					<pattern type="10000000" count="one">00M</pattern>
-					<pattern type="10000000" count="other">00M</pattern>
-					<pattern type="100000000" count="one">000M</pattern>
-					<pattern type="100000000" count="other">000M</pattern>
-					<pattern type="1000000000" count="one">0G</pattern>
-					<pattern type="1000000000" count="other">0G</pattern>
-					<pattern type="10000000000" count="one">00G</pattern>
-					<pattern type="10000000000" count="other">00G</pattern>
-					<pattern type="100000000000" count="one">000G</pattern>
-					<pattern type="100000000000" count="other">000G</pattern>
-					<pattern type="1000000000000" count="one">0T</pattern>
-					<pattern type="1000000000000" count="other">0T</pattern>
-					<pattern type="10000000000000" count="one">00T</pattern>
-					<pattern type="10000000000000" count="other">00T</pattern>
-					<pattern type="100000000000000" count="one">000T</pattern>
-					<pattern type="100000000000000" count="other">000T</pattern>
+					<pattern type="1000" count="one">0 هزار</pattern>
+					<pattern type="1000" count="other">0 هزار</pattern>
+					<pattern type="10000" count="one">00 هزار</pattern>
+					<pattern type="10000" count="other">00 هزار</pattern>
+					<pattern type="100000" count="one">000 هزار</pattern>
+					<pattern type="100000" count="other">000 هزار</pattern>
+					<pattern type="1000000" count="one">0 میلیون</pattern>
+					<pattern type="1000000" count="other">0 میلیون</pattern>
+					<pattern type="10000000" count="one">00 میلیون</pattern>
+					<pattern type="10000000" count="other">00 میلیون</pattern>
+					<pattern type="100000000" count="one">000 م</pattern>
+					<pattern type="100000000" count="other">000 م</pattern>
+					<pattern type="1000000000" count="one">0 م</pattern>
+					<pattern type="1000000000" count="other">0 م</pattern>
+					<pattern type="10000000000" count="one">00 م</pattern>
+					<pattern type="10000000000" count="other">00 م</pattern>
+					<pattern type="100000000000" count="one">000 میلیارد</pattern>
+					<pattern type="100000000000" count="other">000 میلیارد</pattern>
+					<pattern type="1000000000000" count="one">0 تریلیون</pattern>
+					<pattern type="1000000000000" count="other">0 تریلیون</pattern>
+					<pattern type="10000000000000" count="one">00 ت</pattern>
+					<pattern type="10000000000000" count="other">00 ت</pattern>
+					<pattern type="100000000000000" count="one">000 ت</pattern>
+					<pattern type="100000000000000" count="other">000 ت</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
@@ -4871,6 +5009,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</percentFormat>
 			</percentFormatLength>
 		</percentFormats>
+		<currencyFormats numberSystem="arabext">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>‎¤#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
@@ -4880,6 +5025,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>‎¤#,##0.00;‎(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">0 هزار ¤</pattern>
+					<pattern type="1000" count="other">0 هزار ¤</pattern>
+					<pattern type="10000" count="one">00 هزار ¤</pattern>
+					<pattern type="10000" count="other">00 هزار ¤</pattern>
+					<pattern type="100000" count="one">000 هزار ¤</pattern>
+					<pattern type="100000" count="other">000 هزار ¤</pattern>
+					<pattern type="1000000" count="one">0 میلیون ¤</pattern>
+					<pattern type="1000000" count="other">0 میلیون ¤</pattern>
+					<pattern type="10000000" count="one">00 میلیون ¤</pattern>
+					<pattern type="10000000" count="other">00 میلیون ¤</pattern>
+					<pattern type="100000000" count="one">000 میلیون ¤</pattern>
+					<pattern type="100000000" count="other">000 میلیون ¤</pattern>
+					<pattern type="1000000000" count="one">0 میلیارد ¤</pattern>
+					<pattern type="1000000000" count="other">0 میلیارد ¤</pattern>
+					<pattern type="10000000000" count="one">00 میلیارد ¤</pattern>
+					<pattern type="10000000000" count="other">00 میلیارد ¤</pattern>
+					<pattern type="100000000000" count="one">000 میلیارد ¤</pattern>
+					<pattern type="100000000000" count="other">000 میلیارد ¤</pattern>
+					<pattern type="1000000000000" count="one">0 هزارمیلیارد ¤</pattern>
+					<pattern type="1000000000000" count="other">0 هزارمیلیارد ¤</pattern>
+					<pattern type="10000000000000" count="one">00 هزارمیلیارد ¤</pattern>
+					<pattern type="10000000000000" count="other">00 هزارمیلیارد ¤</pattern>
+					<pattern type="100000000000000" count="one">000 هزارمیلیارد ¤</pattern>
+					<pattern type="100000000000000" count="other">000 هزارمیلیارد ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4889,6 +5062,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="AED">
 				<displayName>درهم امارات متحدهٔ عربی</displayName>
+				<displayName count="one">درهم امارات متحدهٔ عربی</displayName>
+				<displayName count="other">درهم امارات متحدهٔ عربی</displayName>
+				<symbol draft="contributed">AED</symbol>
 			</currency>
 			<currency type="AFA">
 				<displayName>افغانی افغانستان (۱۹۲۷ تا ۲۰۰۲)</displayName>
@@ -4901,74 +5077,138 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="ALL">
 				<displayName>لک آلبانی</displayName>
+				<displayName count="one">لک آلبانی</displayName>
+				<displayName count="other">لک آلبانی</displayName>
+				<symbol draft="contributed">ALL</symbol>
 			</currency>
 			<currency type="AMD">
-				<displayName>درم ارمنستان</displayName>
+				<displayName>درام ارمنستان</displayName>
+				<displayName count="one">درام ارمنستان</displayName>
+				<displayName count="other">درام ارمنستان</displayName>
+				<symbol draft="contributed">AMD</symbol>
 			</currency>
 			<currency type="ANG">
 				<displayName>گیلدر آنتیل هلند</displayName>
+				<displayName count="one">گیلدر آنتیل هلند</displayName>
+				<displayName count="other">گیلدر آنتیل هلند</displayName>
+				<symbol draft="contributed">ANG</symbol>
 			</currency>
 			<currency type="AOA">
 				<displayName>کوانزای آنگولا</displayName>
+				<displayName count="one">کوانزای آنگولا</displayName>
+				<displayName count="other">کوانزای آنگولا</displayName>
+				<symbol draft="contributed">AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="ARP">
 				<displayName>پزوی آرژانتین (۱۹۸۳ تا ۱۹۸۵)‏</displayName>
 			</currency>
 			<currency type="ARS">
 				<displayName>پزوی آرژانتین</displayName>
+				<displayName count="one">پزوی آرژانتین</displayName>
+				<displayName count="other">پزوی آرژانتین</displayName>
+				<symbol draft="contributed">ARS</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="ATS">
 				<displayName>شیلینگ اتریش</displayName>
+				<displayName count="one">شیلینگ اتریش</displayName>
+				<displayName count="other">شیلینگ اتریش</displayName>
 			</currency>
 			<currency type="AUD">
 				<displayName>دلار استرالیا</displayName>
+				<displayName count="one">دلار استرالیا</displayName>
+				<displayName count="other">دلار استرالیا</displayName>
+				<symbol draft="contributed">A$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="AWG">
 				<displayName>فلورین آروبا</displayName>
+				<displayName count="one">فلورین آروبا</displayName>
+				<displayName count="other">فلورین آروبا</displayName>
+				<symbol draft="contributed">AWG</symbol>
 			</currency>
 			<currency type="AZM">
 				<displayName>منات جمهوری آذربایجان (۱۹۹۳ تا ۲۰۰۶)</displayName>
 			</currency>
 			<currency type="AZN">
 				<displayName>منات جمهوری آذربایجان</displayName>
+				<displayName count="one">منات جمهوری آذربایجان</displayName>
+				<displayName count="other">منات جمهوری آذربایجان</displayName>
+				<symbol draft="contributed">AZN</symbol>
 			</currency>
 			<currency type="BAD">
 				<displayName>دینار بوسنی و هرزگوین (۱۹۹۲ تا ۱۹۹۴)</displayName>
 			</currency>
 			<currency type="BAM">
 				<displayName>مارک تبدیل‌پذیر بوسنی و هرزگوین</displayName>
+				<displayName count="one">مارک تبدیل‌پذیر بوسنی و هرزگوین</displayName>
+				<displayName count="other">مارک تبدیل‌پذیر بوسنی و هرزگوین</displayName>
+				<symbol draft="contributed">BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>دلار باربادوس</displayName>
+				<displayName count="one">دلار باربادوس</displayName>
+				<displayName count="other">دلار باربادوس</displayName>
+				<symbol draft="contributed">BBD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BDT">
 				<displayName>تاکای بنگلادش</displayName>
+				<displayName count="one">تاکای بنگلادش</displayName>
+				<displayName count="other">تاکای بنگلادش</displayName>
+				<symbol draft="contributed">BDT</symbol>
+				<symbol alt="narrow" draft="contributed">৳</symbol>
 			</currency>
 			<currency type="BEF">
 				<displayName>فرانک بلژیک</displayName>
+				<displayName count="one">فرانک بلژیک</displayName>
+				<displayName count="other">فرانک بلژیک</displayName>
 			</currency>
 			<currency type="BEL">
 				<displayName>فرانک بلژیک (مالی)</displayName>
+				<displayName count="one">فرانک بلژیک (مالی)</displayName>
+				<displayName count="other">فرانک بلژیک (مالی)</displayName>
 			</currency>
 			<currency type="BGN">
 				<displayName>لف بلغارستان</displayName>
+				<displayName count="one">لف بلغارستان</displayName>
+				<displayName count="other">لف بلغارستان</displayName>
+				<symbol draft="contributed">BGN</symbol>
 			</currency>
 			<currency type="BHD">
 				<displayName>دینار بحرین</displayName>
+				<displayName count="one">دینار بحرین</displayName>
+				<displayName count="other">دینار بحرین</displayName>
+				<symbol draft="contributed">BHD</symbol>
 			</currency>
 			<currency type="BIF">
 				<displayName>فرانک بوروندی</displayName>
+				<displayName count="one">فرانک بوروندی</displayName>
+				<displayName count="other">فرانک بوروندی</displayName>
+				<symbol draft="contributed">BIF</symbol>
 			</currency>
 			<currency type="BMD">
 				<displayName>دلار برمودا</displayName>
 				<displayName count="one">دلار برمودا</displayName>
 				<displayName count="other">دلار برمودا</displayName>
+				<symbol draft="contributed">BMD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BND">
 				<displayName>دلار برونئی</displayName>
+				<displayName count="one">دلار برونئی</displayName>
+				<displayName count="other">دلار برونئی</displayName>
+				<symbol draft="contributed">BND</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BOB">
 				<displayName>بولیویانوی بولیوی</displayName>
+				<displayName count="one">بولیویانوی بولیوی</displayName>
+				<displayName count="other">بولیویانوی بولیوی</displayName>
+				<symbol draft="contributed">BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOP">
 				<displayName>پزوی بولیوی</displayName>
@@ -4977,39 +5217,71 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>رئال برزیل</displayName>
 				<displayName count="one">رئال برزیل</displayName>
 				<displayName count="other">رئال برزیل</displayName>
+				<symbol draft="contributed">R$</symbol>
+				<symbol alt="narrow" draft="contributed">R$</symbol>
 			</currency>
 			<currency type="BSD">
 				<displayName>دلار باهاما</displayName>
+				<displayName count="one">دلار باهاما</displayName>
+				<displayName count="other">دلار باهاما</displayName>
+				<symbol draft="contributed">BSD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BTN">
 				<displayName>انگولتروم بوتان</displayName>
+				<displayName count="one">انگولتروم بوتان</displayName>
+				<displayName count="other">انگولتروم بوتان</displayName>
+				<symbol draft="contributed">BTN</symbol>
 			</currency>
 			<currency type="BWP">
 				<displayName>پولای بوتسوانا</displayName>
+				<displayName count="one">پولای بوتسوانا</displayName>
+				<displayName count="other">پولای بوتسوانا</displayName>
+				<symbol draft="contributed">BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>روبل جدید بیلوروسی (۱۹۹۴ تا ۱۹۹۹)</displayName>
 			</currency>
 			<currency type="BYR">
 				<displayName>روبل بیلوروسی</displayName>
+				<displayName count="one">روبل بیلوروسی</displayName>
+				<displayName count="other">روبل بیلوروسی</displayName>
+				<symbol draft="contributed">BYR</symbol>
+				<symbol alt="narrow" draft="contributed">р.</symbol>
 			</currency>
 			<currency type="BZD">
 				<displayName>دلار بلیز</displayName>
+				<displayName count="one">دلار بلیز</displayName>
+				<displayName count="other">دلار بلیز</displayName>
+				<symbol draft="contributed">BZD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CAD">
 				<displayName>دلار کانادا</displayName>
 				<displayName count="one">دلار کانادا</displayName>
 				<displayName count="other">دلار کانادا</displayName>
 				<symbol>$CA</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CDF">
 				<displayName>فرانک کنگو</displayName>
+				<displayName count="one">فرانک کنگو</displayName>
+				<displayName count="other">فرانک کنگو</displayName>
+				<symbol draft="contributed">CDF</symbol>
 			</currency>
 			<currency type="CHF">
 				<displayName>فرانک سوئیس</displayName>
+				<displayName count="one">فرانک سوئیس</displayName>
+				<displayName count="other">فرانک سوئیس</displayName>
+				<symbol draft="contributed">CHF</symbol>
 			</currency>
 			<currency type="CLP">
 				<displayName>پزوی شیلی</displayName>
+				<displayName count="one">پزوی شیلی</displayName>
+				<displayName count="other">پزوی شیلی</displayName>
+				<symbol draft="contributed">CLP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CNY">
 				<displayName>یوآن چین</displayName>
@@ -5020,54 +5292,103 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="COP">
 				<displayName>پزوی کلمبیا</displayName>
+				<displayName count="one">پزوی کلمبیا</displayName>
+				<displayName count="other">پزوی کلمبیا</displayName>
+				<symbol draft="contributed">COP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CRC">
 				<displayName>کولون کاستاریکا</displayName>
+				<displayName count="one">کولون کاستاریکا</displayName>
+				<displayName count="other">کولون کاستاریکا</displayName>
+				<symbol draft="contributed">CRC</symbol>
+				<symbol alt="narrow" draft="contributed">₡</symbol>
 			</currency>
 			<currency type="CSD">
 				<displayName>دینار صربستان (۲۰۰۲ تا ۲۰۰۶)</displayName>
 			</currency>
 			<currency type="CUC">
 				<displayName>پزوی تبدیل‌پذیر کوبا</displayName>
+				<displayName count="one">پزوی تبدیل‌پذیر کوبا</displayName>
+				<displayName count="other">پزوی تبدیل‌پذیر کوبا</displayName>
+				<symbol draft="contributed">CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>پزوی کوبا</displayName>
+				<displayName count="one">پزوی کوبا</displayName>
+				<displayName count="other">پزوی کوبا</displayName>
+				<symbol draft="contributed">CUP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CVE">
 				<displayName>اسکودوی کیپ‌ورد</displayName>
+				<displayName count="one">اسکودوی کیپ‌ورد</displayName>
+				<displayName count="other">اسکودوی کیپ‌ورد</displayName>
+				<symbol draft="contributed">CVE</symbol>
 			</currency>
 			<currency type="CYP">
 				<displayName>پوند قبرس</displayName>
 			</currency>
 			<currency type="CZK">
 				<displayName>کورونای جمهوری چک</displayName>
+				<displayName count="one">کورونای جمهوری چک</displayName>
+				<displayName count="other">کورونای جمهوری چک</displayName>
+				<symbol draft="contributed">CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>مارک آلمان شرقی</displayName>
 			</currency>
 			<currency type="DEM">
 				<displayName>مارک آلمان</displayName>
+				<displayName count="one">مارک آلمان</displayName>
+				<displayName count="other">مارک آلمان</displayName>
 			</currency>
 			<currency type="DJF">
 				<displayName>فرانک جیبوتی</displayName>
+				<displayName count="one">فرانک جیبوتی</displayName>
+				<displayName count="other">فرانک جیبوتی</displayName>
+				<symbol draft="contributed">DJF</symbol>
 			</currency>
 			<currency type="DKK">
 				<displayName>کرون دانمارک</displayName>
+				<displayName count="one">کرون دانمارک</displayName>
+				<displayName count="other">کرون دانمارک</displayName>
+				<symbol draft="contributed">DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>پزوی جمهوری دومینیکن</displayName>
+				<displayName count="one">پزوی جمهوری دومینیکن</displayName>
+				<displayName count="other">پزوی جمهوری دومینیکن</displayName>
+				<symbol draft="contributed">DOP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="DZD">
 				<displayName>دینار الجزایر</displayName>
+				<displayName count="one">دینار الجزایر</displayName>
+				<displayName count="other">دینار الجزایر</displayName>
+				<symbol draft="contributed">DZD</symbol>
 			</currency>
 			<currency type="EGP">
 				<displayName>لیرهٔ مصر</displayName>
+				<displayName count="one">لیرهٔ مصر</displayName>
+				<displayName count="other">لیرهٔ مصر</displayName>
+				<symbol draft="contributed">EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>ناکفای اریتره</displayName>
+				<displayName count="one">ناکفای اریتره</displayName>
+				<displayName count="other">ناکفای اریتره</displayName>
+				<symbol draft="contributed">ERN</symbol>
 			</currency>
 			<currency type="ETB">
 				<displayName>بیر اتیوپی</displayName>
+				<displayName count="one">بیر اتیوپی</displayName>
+				<displayName count="other">بیر اتیوپی</displayName>
+				<symbol draft="contributed">ETB</symbol>
 			</currency>
 			<currency type="EUR">
 				<displayName>یورو</displayName>
@@ -5078,12 +5399,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="FJD">
 				<displayName>دلار فیجی</displayName>
+				<displayName count="one">دلار فیجی</displayName>
+				<displayName count="other">دلار فیجی</displayName>
+				<symbol draft="contributed">FJD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="FKP">
 				<displayName>پوند جزایر فالکلند</displayName>
+				<displayName count="one">پوند جزایر فالکلند</displayName>
+				<displayName count="other">پوند جزایر فالکلند</displayName>
+				<symbol draft="contributed">FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>فرانک فرانسه</displayName>
+				<displayName count="one">فرانک فرانسه</displayName>
+				<displayName count="other">فرانک فرانسه</displayName>
 			</currency>
 			<currency type="GBP">
 				<displayName>پوند بریتانیا</displayName>
@@ -5094,59 +5425,110 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="GEL">
 				<displayName>لاری گرجستان</displayName>
+				<displayName count="one">لاری گرجستان</displayName>
+				<displayName count="other">لاری گرجستان</displayName>
+				<symbol draft="contributed">GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHS">
 				<displayName>سدی غنا</displayName>
+				<displayName count="one">سدی غنا</displayName>
+				<displayName count="other">سدی غنا</displayName>
+				<symbol draft="contributed">GHS</symbol>
 			</currency>
 			<currency type="GIP">
 				<displayName>پوند جبل‌الطارق</displayName>
+				<displayName count="one">پوند جبل‌الطارق</displayName>
+				<displayName count="other">پوند جبل‌الطارق</displayName>
+				<symbol draft="contributed">GIP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GMD">
 				<displayName>دالاسی گامبیا</displayName>
+				<displayName count="one">دالاسی گامبیا</displayName>
+				<displayName count="other">دالاسی گامبیا</displayName>
+				<symbol draft="contributed">GMD</symbol>
 			</currency>
 			<currency type="GNF">
 				<displayName>فرانک گینه</displayName>
+				<displayName count="one">فرانک گینه</displayName>
+				<displayName count="other">فرانک گینه</displayName>
+				<symbol draft="contributed">GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GRD">
 				<displayName>دراخمای یونان</displayName>
 			</currency>
 			<currency type="GTQ">
 				<displayName>کتزال گواتمالا</displayName>
+				<displayName count="one">کتزال گواتمالا</displayName>
+				<displayName count="other">کتزال گواتمالا</displayName>
+				<symbol draft="contributed">GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWP">
 				<displayName>پزوی گینهٔ بیسائو</displayName>
 			</currency>
 			<currency type="GYD">
-				<displayName>دلار گویان</displayName>
+				<displayName>دلار گویانا</displayName>
+				<displayName count="one">دلار گویانا</displayName>
+				<displayName count="other">دلار گویانا</displayName>
+				<symbol draft="contributed">GYD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="HKD">
 				<displayName>دلار هنگ‌کنگ</displayName>
+				<displayName count="one">دلار هنگ‌کنگ</displayName>
+				<displayName count="other">دلار هنگ‌کنگ</displayName>
 				<symbol>$HK</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="HNL">
 				<displayName>لمپیرای هندوراس</displayName>
+				<displayName count="one">لمپیرای هندوراس</displayName>
+				<displayName count="other">لمپیرای هندوراس</displayName>
+				<symbol draft="contributed">HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>دینار کرواسی</displayName>
 			</currency>
 			<currency type="HRK">
 				<displayName>کونای کرواسی</displayName>
+				<displayName count="one">کونای کرواسی</displayName>
+				<displayName count="other">کونای کرواسی</displayName>
+				<symbol draft="contributed">HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>گورد هائیتی</displayName>
+				<displayName count="one">گورد هائیتی</displayName>
+				<displayName count="other">گورد هائیتی</displayName>
+				<symbol draft="contributed">HTG</symbol>
 			</currency>
 			<currency type="HUF">
 				<displayName>فورینت مجارستان</displayName>
+				<displayName count="one">فورینت مجارستان</displayName>
+				<displayName count="other">فورینت مجارستان</displayName>
+				<symbol draft="contributed">HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>روپیهٔ اندونزی</displayName>
+				<displayName count="one">روپیهٔ اندونزی</displayName>
+				<displayName count="other">روپیهٔ اندونزی</displayName>
+				<symbol draft="contributed">IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>پوند ایرلند</displayName>
 			</currency>
 			<currency type="ILS">
 				<displayName>شقل جدید اسرائیل</displayName>
+				<displayName count="one">شقل جدید اسرائیل</displayName>
+				<displayName count="other">شقل جدید اسرائیل</displayName>
 				<symbol>₪</symbol>
+				<symbol alt="narrow" draft="contributed">₪</symbol>
 			</currency>
 			<currency type="INR">
 				<displayName>روپیهٔ هند</displayName>
@@ -5157,6 +5539,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="IQD">
 				<displayName>دینار عراق</displayName>
+				<displayName count="one">دینار عراق</displayName>
+				<displayName count="other">دینار عراق</displayName>
+				<symbol draft="contributed">IQD</symbol>
 			</currency>
 			<currency type="IRR">
 				<displayName>ریال ایران</displayName>
@@ -5166,15 +5551,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="ISK">
 				<displayName>کرونای ایسلند</displayName>
+				<displayName count="one">کرونای ایسلند</displayName>
+				<displayName count="other">کرونای ایسلند</displayName>
+				<symbol draft="contributed">ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>لیرهٔ ایتالیا</displayName>
 			</currency>
 			<currency type="JMD">
 				<displayName>دلار جامائیکا</displayName>
+				<displayName count="one">دلار جامائیکا</displayName>
+				<displayName count="other">دلار جامائیکا</displayName>
+				<symbol draft="contributed">JMD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="JOD">
 				<displayName>دینار اردن</displayName>
+				<displayName count="one">دینار اردن</displayName>
+				<displayName count="other">دینار اردن</displayName>
+				<symbol draft="contributed">JOD</symbol>
 			</currency>
 			<currency type="JPY">
 				<displayName>ین ژاپن</displayName>
@@ -5185,46 +5581,96 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="KES">
 				<displayName>شیلینگ کنیا</displayName>
+				<displayName count="one">شیلینگ کنیا</displayName>
+				<displayName count="other">شیلینگ کنیا</displayName>
+				<symbol draft="contributed">KES</symbol>
 			</currency>
 			<currency type="KGS">
 				<displayName>سوم قرقیزستان</displayName>
+				<displayName count="one">سوم قرقیزستان</displayName>
+				<displayName count="other">سوم قرقیزستان</displayName>
+				<symbol draft="contributed">KGS</symbol>
 			</currency>
 			<currency type="KHR">
 				<displayName>ری‌یل کامبوج</displayName>
+				<displayName count="one">ری‌یل کامبوج</displayName>
+				<displayName count="other">ری‌یل کامبوج</displayName>
+				<symbol draft="contributed">KHR</symbol>
+				<symbol alt="narrow" draft="contributed">៛</symbol>
 			</currency>
 			<currency type="KMF">
 				<displayName>فرانک کومورو</displayName>
+				<displayName count="one">فرانک کومورو</displayName>
+				<displayName count="other">فرانک کومورو</displayName>
+				<symbol draft="contributed">KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>وون کرهٔ شمالی</displayName>
+				<displayName count="one">وون کرهٔ شمالی</displayName>
+				<displayName count="other">وون کرهٔ شمالی</displayName>
+				<symbol draft="contributed">KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>وون کرهٔ جنوبی</displayName>
+				<displayName count="one">وون کرهٔ جنوبی</displayName>
+				<displayName count="other">وون کرهٔ جنوبی</displayName>
 				<symbol>₩</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KWD">
 				<displayName>دینار کویت</displayName>
+				<displayName count="one">دینار کویت</displayName>
+				<displayName count="other">دینار کویت</displayName>
+				<symbol draft="contributed">KWD</symbol>
 			</currency>
 			<currency type="KYD">
 				<displayName>دلار جزایر کِیمن</displayName>
+				<displayName count="one">دلار جزایر کِیمن</displayName>
+				<displayName count="other">دلار جزایر کِیمن</displayName>
+				<symbol draft="contributed">KYD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="KZT">
 				<displayName>تنگهٔ قزاقستان</displayName>
+				<displayName count="one">تنگهٔ قزاقستان</displayName>
+				<displayName count="other">تنگهٔ قزاقستان</displayName>
+				<symbol draft="contributed">KZT</symbol>
+				<symbol alt="narrow" draft="contributed">₸</symbol>
 			</currency>
 			<currency type="LAK">
 				<displayName>کیپ لائوس</displayName>
+				<displayName count="one">کیپ لائوس</displayName>
+				<displayName count="other">کیپ لائوس</displayName>
+				<symbol draft="contributed">LAK</symbol>
+				<symbol alt="narrow" draft="contributed">₭</symbol>
 			</currency>
 			<currency type="LBP">
 				<displayName>لیرهٔ لبنان</displayName>
+				<displayName count="one">لیرهٔ لبنان</displayName>
+				<displayName count="other">لیرهٔ لبنان</displayName>
+				<symbol draft="contributed">LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>روپیهٔ سری‌لانکا</displayName>
+				<displayName count="one">روپیهٔ سری‌لانکا</displayName>
+				<displayName count="other">روپیهٔ سری‌لانکا</displayName>
+				<symbol draft="contributed">LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>دلار لیبریا</displayName>
+				<displayName count="one">دلار لیبریا</displayName>
+				<displayName count="other">دلار لیبریا</displayName>
+				<symbol draft="contributed">LRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="LSL">
 				<displayName>لوتی لسوتو</displayName>
+				<displayName count="one">لوتی لسوتو</displayName>
+				<displayName count="other">لوتی لسوتو</displayName>
 			</currency>
 			<currency type="LTL">
 				<displayName>لیتاس لیتوانی</displayName>
@@ -5234,6 +5680,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="LUL">
 				<displayName>فرانک مالی لوگزامبورگ</displayName>
+				<displayName count="one">فرانک مالی لوگزامبورگ</displayName>
+				<displayName count="other">فرانک مالی لوگزامبورگ</displayName>
 			</currency>
 			<currency type="LVL">
 				<displayName>لاتس لتونی</displayName>
@@ -5243,39 +5691,69 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="LYD">
 				<displayName>دینار لیبی</displayName>
+				<displayName count="one">دینار لیبی</displayName>
+				<displayName count="other">دینار لیبی</displayName>
+				<symbol draft="contributed">LYD</symbol>
 			</currency>
 			<currency type="MAD">
 				<displayName>درهم مراکش</displayName>
+				<displayName count="one">درهم مراکش</displayName>
+				<displayName count="other">درهم مراکش</displayName>
+				<symbol draft="contributed">MAD</symbol>
 			</currency>
 			<currency type="MAF">
 				<displayName>فرانک مراکش</displayName>
 			</currency>
 			<currency type="MDL">
 				<displayName>لئوی مولداوی</displayName>
+				<displayName count="one">لئوی مولداوی</displayName>
+				<displayName count="other">لئوی مولداوی</displayName>
+				<symbol draft="contributed">MDL</symbol>
 			</currency>
 			<currency type="MGA">
 				<displayName>آریاری مالاگاسی</displayName>
+				<displayName count="one">آریاری مالاگاسی</displayName>
+				<displayName count="other">آریاری مالاگاسی</displayName>
+				<symbol draft="contributed">MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>فرانک ماداگاسکار</displayName>
 			</currency>
 			<currency type="MKD">
 				<displayName>دینار مقدونیه</displayName>
+				<displayName count="one">دینار مقدونیه</displayName>
+				<displayName count="other">دینار مقدونیه</displayName>
+				<symbol draft="contributed">MKD</symbol>
 			</currency>
 			<currency type="MLF">
 				<displayName>فرانک مالی</displayName>
 			</currency>
 			<currency type="MMK">
 				<displayName>کیات میانمار</displayName>
+				<displayName count="one">کیات میانمار</displayName>
+				<displayName count="other">کیات میانمار</displayName>
+				<symbol draft="contributed">MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>توگریک مغولستان</displayName>
+				<displayName count="one">توگریک مغولستان</displayName>
+				<displayName count="other">توگریک مغولستان</displayName>
+				<symbol draft="contributed">MNT</symbol>
+				<symbol alt="narrow" draft="contributed">₮</symbol>
 			</currency>
 			<currency type="MOP">
 				<displayName>پاتاکای ماکائو</displayName>
+				<displayName count="one">پاتاکای ماکائو</displayName>
+				<displayName count="other">پاتاکای ماکائو</displayName>
+				<symbol draft="contributed">MOP</symbol>
 			</currency>
 			<currency type="MRO">
 				<displayName>اوگوئیای موریتانی</displayName>
+				<displayName count="one">اوگوئیای موریتانی</displayName>
+				<displayName count="other">اوگوئیای موریتانی</displayName>
+				<symbol draft="contributed">MRO</symbol>
 			</currency>
 			<currency type="MTL">
 				<displayName>لیرهٔ مالت</displayName>
@@ -5285,94 +5763,181 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="MUR">
 				<displayName>روپیهٔ موریس</displayName>
+				<displayName count="one">روپیهٔ موریس</displayName>
+				<displayName count="other">روپیهٔ موریس</displayName>
+				<symbol draft="contributed">MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>روپیهٔ مالدیو</displayName>
+				<displayName count="one">روپیهٔ مالدیو</displayName>
+				<displayName count="other">روپیهٔ مالدیو</displayName>
+				<symbol draft="contributed">MVR</symbol>
 			</currency>
 			<currency type="MWK">
 				<displayName>کواچای مالاوی</displayName>
+				<displayName count="one">کواچای مالاوی</displayName>
+				<displayName count="other">کواچای مالاوی</displayName>
+				<symbol draft="contributed">MWK</symbol>
 			</currency>
 			<currency type="MXN">
 				<displayName>پزوی مکزیک</displayName>
+				<displayName count="one">پزوی مکزیک</displayName>
+				<displayName count="other">پزوی مکزیک</displayName>
 				<symbol>$MX</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="MXP">
 				<displayName>پزوی نقرهٔ مکزیک (۱۸۶۱ تا ۱۹۹۲)</displayName>
+				<displayName count="one">پزوی نقرهٔ مکزیک (۱۸۶۱ تا ۱۹۹۲)</displayName>
+				<displayName count="other">پزوی نقرهٔ مکزیک (۱۸۶۱ تا ۱۹۹۲)</displayName>
+				<symbol draft="contributed">MXP</symbol>
 			</currency>
 			<currency type="MYR">
 				<displayName>رینگیت مالزی</displayName>
+				<displayName count="one">رینگیت مالزی</displayName>
+				<displayName count="other">رینگیت مالزی</displayName>
+				<symbol draft="contributed">MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>اسکودوی موزامبیک</displayName>
 			</currency>
 			<currency type="MZN">
 				<displayName>متیکال موزامبیک</displayName>
+				<displayName count="one">متیکال موزامبیک</displayName>
+				<displayName count="other">متیکال موزامبیک</displayName>
+				<symbol draft="contributed">MZN</symbol>
 			</currency>
 			<currency type="NAD">
 				<displayName>دلار نامیبیا</displayName>
+				<displayName count="one">دلار نامیبیا</displayName>
+				<displayName count="other">دلار نامیبیا</displayName>
+				<symbol draft="contributed">NAD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="NGN">
 				<displayName>نایرای نیجریه</displayName>
+				<displayName count="one">نایرای نیجریه</displayName>
+				<displayName count="other">نایرای نیجریه</displayName>
+				<symbol draft="contributed">NGN</symbol>
+				<symbol alt="narrow" draft="contributed">₦</symbol>
 			</currency>
 			<currency type="NIO">
 				<displayName>کوردوبای نیکاراگوئه</displayName>
+				<displayName count="one">کوردوبای نیکاراگوئه</displayName>
+				<displayName count="other">کوردوبای نیکاراگوئه</displayName>
+				<symbol draft="contributed">NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>گیلدر هلند</displayName>
+				<displayName count="one">گیلدر هلند</displayName>
+				<displayName count="other">گیلدر هلند</displayName>
 			</currency>
 			<currency type="NOK">
 				<displayName>کرون نروژ</displayName>
+				<displayName count="one">کرون نروژ</displayName>
+				<displayName count="other">کرون نروژ</displayName>
+				<symbol draft="contributed">NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>روپیهٔ نپال</displayName>
+				<displayName count="one">روپیهٔ نپال</displayName>
+				<displayName count="other">روپیهٔ نپال</displayName>
+				<symbol draft="contributed">NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>دلار زلاند نو</displayName>
+				<displayName count="one">دلار زلاند نو</displayName>
+				<displayName count="other">دلار زلاند نو</displayName>
 				<symbol>$NZ</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="OMR">
 				<displayName>ریال عمان</displayName>
+				<displayName count="one">ریال عمان</displayName>
+				<displayName count="other">ریال عمان</displayName>
+				<symbol draft="contributed">OMR</symbol>
 			</currency>
 			<currency type="PAB">
 				<displayName>بالبوای پاناما</displayName>
+				<displayName count="one">بالبوای پاناما</displayName>
+				<displayName count="other">بالبوای پاناما</displayName>
+				<symbol draft="contributed">PAB</symbol>
 			</currency>
 			<currency type="PEN">
 				<displayName>نوئووسول پرو</displayName>
+				<displayName count="one">نوئووسول پرو</displayName>
+				<displayName count="other">نوئووسول پرو</displayName>
+				<symbol draft="contributed">PEN</symbol>
 			</currency>
 			<currency type="PGK">
 				<displayName>کینای پاپوا گینهٔ نو</displayName>
+				<displayName count="one">کینای پاپوا گینهٔ نو</displayName>
+				<displayName count="other">کینای پاپوا گینهٔ نو</displayName>
+				<symbol draft="contributed">PGK</symbol>
 			</currency>
 			<currency type="PHP">
 				<displayName>پزوی فیلیپین</displayName>
+				<displayName count="one">پزوی فیلیپین</displayName>
+				<displayName count="other">پزوی فیلیپین</displayName>
+				<symbol draft="contributed">PHP</symbol>
+				<symbol alt="narrow" draft="contributed">₱</symbol>
 			</currency>
 			<currency type="PKR">
 				<displayName>روپیهٔ پاکستان</displayName>
+				<displayName count="one">روپیهٔ پاکستان</displayName>
+				<displayName count="other">روپیهٔ پاکستان</displayName>
+				<symbol draft="contributed">PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>زواتی لهستان</displayName>
+				<displayName count="one">زواتی لهستان</displayName>
+				<displayName count="other">زواتی لهستان</displayName>
+				<symbol draft="contributed">PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PTE">
 				<displayName>اسکودوی پرتغال</displayName>
 			</currency>
 			<currency type="PYG">
 				<displayName>گوارانی پاراگوئه</displayName>
+				<displayName count="one">گوارانی پاراگوئه</displayName>
+				<displayName count="other">گوارانی پاراگوئه</displayName>
+				<symbol draft="contributed">PYG</symbol>
+				<symbol alt="narrow" draft="contributed">₲</symbol>
 			</currency>
 			<currency type="QAR">
 				<displayName>ریال قطر</displayName>
+				<displayName count="one">ریال قطر</displayName>
+				<displayName count="other">ریال قطر</displayName>
+				<symbol draft="contributed">QAR</symbol>
 			</currency>
 			<currency type="RHD">
 				<displayName>دلار رودزیا</displayName>
 			</currency>
 			<currency type="RON">
 				<displayName>لئوی رومانی</displayName>
+				<displayName count="one">لئوی رومانی</displayName>
+				<displayName count="other">لئوی رومانی</displayName>
+				<symbol draft="contributed">RON</symbol>
 			</currency>
 			<currency type="RSD">
 				<displayName>دینار صربستان</displayName>
+				<displayName count="one">دینار صربستان</displayName>
+				<displayName count="other">دینار صربستان</displayName>
+				<symbol draft="contributed">RSD</symbol>
 			</currency>
 			<currency type="RUB">
 				<displayName>روبل روسیه</displayName>
 				<displayName count="one">روبل روسیه</displayName>
 				<displayName count="other">روبل روسیه</displayName>
+				<symbol draft="contributed">RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 				<symbol alt="variant">₽</symbol>
 			</currency>
 			<currency type="RUR">
@@ -5380,79 +5945,149 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="RWF">
 				<displayName>فرانک رواندا</displayName>
+				<displayName count="one">فرانک رواندا</displayName>
+				<displayName count="other">فرانک رواندا</displayName>
+				<symbol draft="contributed">RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>ریال سعودی</displayName>
+				<displayName count="one">ریال سعودی</displayName>
+				<displayName count="other">ریال سعودی</displayName>
+				<symbol draft="contributed">SAR</symbol>
 			</currency>
 			<currency type="SBD">
 				<displayName>دلار جزایر سلیمان</displayName>
+				<displayName count="one">دلار جزایر سلیمان</displayName>
+				<displayName count="other">دلار جزایر سلیمان</displayName>
+				<symbol draft="contributed">SBD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SCR">
 				<displayName>روپیهٔ سیشل</displayName>
+				<displayName count="one">روپیهٔ سیشل</displayName>
+				<displayName count="other">روپیهٔ سیشل</displayName>
+				<symbol draft="contributed">SCR</symbol>
 			</currency>
 			<currency type="SDD">
 				<displayName>دینار سودان (۱۹۹۲ تا ۲۰۰۷)</displayName>
 			</currency>
 			<currency type="SDG">
 				<displayName>لیرهٔ سودان</displayName>
+				<displayName count="one">لیرهٔ سودان</displayName>
+				<displayName count="other">لیرهٔ سودان</displayName>
+				<symbol draft="contributed">SDG</symbol>
 			</currency>
 			<currency type="SEK">
 				<displayName>کرون سوئد</displayName>
+				<displayName count="one">کرون سوئد</displayName>
+				<displayName count="other">کرون سوئد</displayName>
+				<symbol draft="contributed">SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>دلار سنگاپور</displayName>
+				<displayName count="one">دلار سنگاپور</displayName>
+				<displayName count="other">دلار سنگاپور</displayName>
+				<symbol draft="contributed">SGD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SHP">
 				<displayName>پوند سنت هلن</displayName>
+				<displayName count="one">پوند سنت هلن</displayName>
+				<displayName count="other">پوند سنت هلن</displayName>
+				<symbol draft="contributed">SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SLL">
 				<displayName>لئون سیرالئون</displayName>
+				<displayName count="one">لئون سیرالئون</displayName>
+				<displayName count="other">لئون سیرالئون</displayName>
+				<symbol draft="contributed">SLL</symbol>
 			</currency>
 			<currency type="SOS">
 				<displayName>شیلینگ سومالی</displayName>
+				<displayName count="one">شیلینگ سومالی</displayName>
+				<displayName count="other">شیلینگ سومالی</displayName>
+				<symbol draft="contributed">SOS</symbol>
 			</currency>
 			<currency type="SRD">
 				<displayName>دلار سورینام</displayName>
+				<displayName count="one">دلار سورینام</displayName>
+				<displayName count="other">دلار سورینام</displayName>
+				<symbol draft="contributed">SRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SRG">
 				<displayName>گیلدر سورینام</displayName>
 			</currency>
 			<currency type="SSP">
 				<displayName>پوند سودان جنوبی</displayName>
+				<displayName count="one">پوند سودان جنوبی</displayName>
+				<displayName count="other">پوند سودان جنوبی</displayName>
+				<symbol draft="contributed">SSP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="STD">
 				<displayName>دوبرای سائوتومه و پرنسیپ</displayName>
+				<displayName count="one">دوبرای سائوتومه و پرنسیپ</displayName>
+				<displayName count="other">دوبرای سائوتومه و پرنسیپ</displayName>
+				<symbol draft="contributed">STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>روبل شوروی</displayName>
 			</currency>
 			<currency type="SYP">
 				<displayName>لیرهٔ سوریه</displayName>
+				<displayName count="one">لیرهٔ سوریه</displayName>
+				<displayName count="other">لیرهٔ سوریه</displayName>
+				<symbol draft="contributed">SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>لیلانگنی سوازیلند</displayName>
+				<displayName count="one">لیلانگنی سوازیلند</displayName>
+				<displayName count="other">لیلانگنی سوازیلند</displayName>
+				<symbol draft="contributed">SZL</symbol>
 			</currency>
 			<currency type="THB">
 				<displayName>بات تایلند</displayName>
+				<displayName count="one">بات تایلند</displayName>
+				<displayName count="other">بات تایلند</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>روبل تاجیکستان</displayName>
 			</currency>
 			<currency type="TJS">
 				<displayName>سامانی تاجیکستان</displayName>
+				<displayName count="one">سامانی تاجیکستان</displayName>
+				<displayName count="other">سامانی تاجیکستان</displayName>
+				<symbol draft="contributed">TJS</symbol>
 			</currency>
 			<currency type="TMM">
 				<displayName>منات ترکمنستان (۱۹۹۳ تا ۲۰۰۹)</displayName>
 			</currency>
 			<currency type="TMT">
 				<displayName>منات ترکمنستان</displayName>
+				<displayName count="one">منات ترکمنستان</displayName>
+				<displayName count="other">منات ترکمنستان</displayName>
+				<symbol draft="contributed">TMT</symbol>
 			</currency>
 			<currency type="TND">
 				<displayName>دینار تونس</displayName>
+				<displayName count="one">دینار تونس</displayName>
+				<displayName count="other">دینار تونس</displayName>
+				<symbol draft="contributed">TND</symbol>
 			</currency>
 			<currency type="TOP">
 				<displayName>پاآنگای تونگا</displayName>
+				<displayName count="one">پاآنگای تونگا</displayName>
+				<displayName count="other">پاآنگای تونگا</displayName>
+				<symbol draft="contributed">TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>اسکودوی تیمور</displayName>
@@ -5462,24 +6097,47 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="TRY">
 				<displayName>لیرهٔ ترکیه</displayName>
+				<displayName count="one">لیرهٔ ترکیه</displayName>
+				<displayName count="other">لیرهٔ ترکیه</displayName>
+				<symbol draft="contributed">TRY</symbol>
+				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>دلار ترینیداد و توباگو</displayName>
+				<displayName count="one">دلار ترینیداد و توباگو</displayName>
+				<displayName count="other">دلار ترینیداد و توباگو</displayName>
+				<symbol draft="contributed">TTD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="TWD">
 				<displayName>دلار جدید تایوان</displayName>
+				<displayName count="one">دلار جدید تایوان</displayName>
+				<displayName count="other">دلار جدید تایوان</displayName>
+				<symbol draft="contributed">NT$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="TZS">
 				<displayName>شیلینگ تانزانیا</displayName>
+				<displayName count="one">شیلینگ تانزانیا</displayName>
+				<displayName count="other">شیلینگ تانزانیا</displayName>
+				<symbol draft="contributed">TZS</symbol>
 			</currency>
 			<currency type="UAH">
 				<displayName>هریونیای اوکراین</displayName>
+				<displayName count="one">هریونیای اوکراین</displayName>
+				<displayName count="other">هریونیای اوکراین</displayName>
+				<symbol draft="contributed">UAH</symbol>
+				<symbol alt="narrow" draft="contributed">₴</symbol>
 			</currency>
 			<currency type="UGS">
 				<displayName>شیلینگ اوگاندا (۱۹۶۶ تا ۱۹۸۷)</displayName>
 			</currency>
 			<currency type="UGX">
 				<displayName>شیلینگ اوگاندا</displayName>
+				<displayName count="one">شیلینگ اوگاندا</displayName>
+				<displayName count="other">شیلینگ اوگاندا</displayName>
+				<symbol draft="contributed">UGX</symbol>
 			</currency>
 			<currency type="USD">
 				<displayName>دلار امریکا</displayName>
@@ -5490,31 +6148,62 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="USN">
 				<displayName>دلار امریکا (روز بعد)</displayName>
+				<displayName count="one">دلار امریکا (روز بعد)</displayName>
+				<displayName count="other">دلار امریکا (روز بعد)</displayName>
+				<symbol draft="contributed">USN</symbol>
 			</currency>
 			<currency type="USS">
 				<displayName>دلار امریکا (همان روز)</displayName>
+				<displayName count="one">دلار امریکا (همان روز)</displayName>
+				<displayName count="other">دلار امریکا (همان روز)</displayName>
+				<symbol draft="contributed">USS</symbol>
 			</currency>
 			<currency type="UYP">
 				<displayName>پزوی اوروگوئه (۱۹۷۵ تا ۱۹۹۳)</displayName>
 			</currency>
 			<currency type="UYU">
 				<displayName>پزوی اوروگوئه</displayName>
+				<displayName count="one">پزوی اوروگوئه</displayName>
+				<displayName count="other">پزوی اوروگوئه</displayName>
+				<symbol draft="contributed">UYU</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="UZS">
 				<displayName>سوم ازبکستان</displayName>
+				<displayName count="one">سوم ازبکستان</displayName>
+				<displayName count="other">سوم ازبکستان</displayName>
+				<symbol draft="contributed">UZS</symbol>
+			</currency>
+			<currency type="VEB">
+				<displayName>بولیوار ونزوئلا (۱۸۷۱ تا ۲۰۰۸)</displayName>
+				<displayName count="one">بولیوار ونزوئلا (۱۸۷۱ تا ۲۰۰۸)</displayName>
+				<displayName count="other">بولیوار ونزوئلا (۱۸۷۱ تا ۲۰۰۸)</displayName>
 			</currency>
 			<currency type="VEF">
 				<displayName>بولیوار ونزوئلا</displayName>
+				<displayName count="one">بولیوار ونزوئلا</displayName>
+				<displayName count="other">بولیوار ونزوئلا</displayName>
+				<symbol draft="contributed">VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>دانگ ویتنام</displayName>
+				<displayName count="one">دانگ ویتنام</displayName>
+				<displayName count="other">دانگ ویتنام</displayName>
 				<symbol>₫</symbol>
+				<symbol alt="narrow" draft="contributed">₫</symbol>
 			</currency>
 			<currency type="VUV">
 				<displayName>واتوی وانوواتو</displayName>
+				<displayName count="one">واتوی وانوواتو</displayName>
+				<displayName count="other">واتوی وانوواتو</displayName>
+				<symbol draft="contributed">VUV</symbol>
 			</currency>
 			<currency type="WST">
 				<displayName>تالای ساموا</displayName>
+				<displayName count="one">تالای ساموا</displayName>
+				<displayName count="other">تالای ساموا</displayName>
+				<symbol draft="contributed">WST</symbol>
 			</currency>
 			<currency type="XAF">
 				<displayName>فرانک CFA مرکز افریقا</displayName>
@@ -5530,7 +6219,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="XCD">
 				<displayName>دلار شرق کارائیب</displayName>
+				<displayName count="one">دلار شرق کارائیب</displayName>
+				<displayName count="other">دلار شرق کارائیب</displayName>
 				<symbol>$EC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XFO">
 				<displayName>فرانک طلای فرانسه</displayName>
@@ -5545,9 +6237,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>پالادیم</displayName>
 			</currency>
 			<currency type="XPF">
-				<displayName>فرانک CFP</displayName>
-				<displayName count="one">فرانک CFP</displayName>
-				<displayName count="other">فرانک CFP</displayName>
+				<displayName>فرانک اقیانوسیه</displayName>
+				<displayName count="one">فرانک اقیانوسیه</displayName>
+				<displayName count="other">فرانک اقیانوسیه</displayName>
 				<symbol>CFPF</symbol>
 			</currency>
 			<currency type="XPT">
@@ -5555,7 +6247,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="XXX">
 				<displayName>ارز نامشخص</displayName>
-				<displayName count="one">(ارز نامشخص)</displayName>
+				<displayName count="one">(واحد ارز نامشخص)</displayName>
 				<displayName count="other">(ارز نامشخص)</displayName>
 			</currency>
 			<currency type="YDD">
@@ -5563,15 +6255,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="YER">
 				<displayName>ریال یمن</displayName>
+				<displayName count="one">ریال یمن</displayName>
+				<displayName count="other">ریال یمن</displayName>
+				<symbol draft="contributed">YER</symbol>
 			</currency>
 			<currency type="ZAR">
 				<displayName>راند افریقای جنوبی</displayName>
+				<displayName count="one">راند افریقای جنوبی</displayName>
+				<displayName count="other">راند افریقای جنوبی</displayName>
+				<symbol draft="contributed">ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>کواچای زامبیا (۱۹۶۸ تا ۲۰۱۲)</displayName>
 			</currency>
 			<currency type="ZMW">
 				<displayName>کواچای زامبیا</displayName>
+				<displayName count="one">کواچای زامبیا</displayName>
+				<displayName count="other">کواچای زامبیا</displayName>
+				<symbol draft="contributed">ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZWD">
 				<displayName>دلار زیمبابوه (۱۹۸۰ تا ۲۰۰۸)</displayName>
@@ -5591,7 +6294,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 	<units>
 		<unitLength type="long">
 			<compoundUnit type="per">
-				<compoundUnitPattern>{0} بر {1}</compoundUnitPattern>
+				<compoundUnitPattern>{0} در {1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>نیروی جاذبه</displayName>
@@ -5603,6 +6306,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} متر بر مجذور ثانیه</unitPattern>
 				<unitPattern count="other">{0} متر بر مجذور ثانیه</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>دور</displayName>
+				<unitPattern count="one">{0} دور</unitPattern>
+				<unitPattern count="other">{0} دور</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>رادیان</displayName>
+				<unitPattern count="one">{0} رادیان</unitPattern>
+				<unitPattern count="other">{0} رادیان</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>درجه</displayName>
+				<unitPattern count="one">{0} درجه</unitPattern>
+				<unitPattern count="other">{0} درجه</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>دقیقهٔ قوسی</displayName>
 				<unitPattern count="one">{0} دقیقهٔ قوسی</unitPattern>
@@ -5613,30 +6331,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ثانیهٔ قوسی</unitPattern>
 				<unitPattern count="other">{0} ثانیهٔ قوسی</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>درجه</displayName>
-				<unitPattern count="one">{0} درجه</unitPattern>
-				<unitPattern count="other">{0} درجه</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>رادیان</displayName>
-				<unitPattern count="one">{0} رادیان</unitPattern>
-				<unitPattern count="other">{0} رادیان</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>جریب</displayName>
-				<unitPattern count="one">{0} جریب</unitPattern>
-				<unitPattern count="other">{0} جریب</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>کیلومتر مربع</displayName>
+				<unitPattern count="one">{0} کیلومتر مربع</unitPattern>
+				<unitPattern count="other">{0} کیلومتر مربع</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>هکتار</displayName>
 				<unitPattern count="one">{0} هکتار</unitPattern>
 				<unitPattern count="other">{0} هکتار</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>متر مربع</displayName>
+				<unitPattern count="one">{0} متر مربع</unitPattern>
+				<unitPattern count="other">{0} متر مربع</unitPattern>
+				<perUnitPattern>{0} در متر مربع</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>سانتی‌متر مربع</displayName>
 				<unitPattern count="one">{0} سانتی‌متر مربع</unitPattern>
 				<unitPattern count="other">{0} سانتی‌متر مربع</unitPattern>
+				<perUnitPattern>{0} در سانتی‌متر مربع</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>مایل مربع</displayName>
+				<unitPattern count="one">{0} مایل مربع</unitPattern>
+				<unitPattern count="other">{0} مایل مربع</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>جریب</displayName>
+				<unitPattern count="one">{0} جریب</unitPattern>
+				<unitPattern count="other">{0} جریب</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>یارد مربع</displayName>
+				<unitPattern count="one">{0} یارد مربع</unitPattern>
+				<unitPattern count="other">{0} یارد مربع</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>فوت مربع</displayName>
@@ -5647,91 +6377,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>اینچ مربع</displayName>
 				<unitPattern count="one">{0} اینچ مربع</unitPattern>
 				<unitPattern count="other">{0} اینچ مربع</unitPattern>
+				<perUnitPattern>{0} در اینچ مربع</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>کیلومتر مربع</displayName>
-				<unitPattern count="one">{0} کیلومتر مربع</unitPattern>
-				<unitPattern count="other">{0} کیلومتر مربع</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>متر مربع</displayName>
-				<unitPattern count="one">{0} متر مربع</unitPattern>
-				<unitPattern count="other">{0} متر مربع</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>مایل مربع</displayName>
-				<unitPattern count="one">{0} مایل مربع</unitPattern>
-				<unitPattern count="other">{0} مایل مربع</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>یارد مربع</displayName>
-				<unitPattern count="one">{0} یارد مربع</unitPattern>
-				<unitPattern count="other">{0} یارد مربع</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>عیار</displayName>
+				<unitPattern count="one">{0} عیار</unitPattern>
+				<unitPattern count="other">{0} عیار</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>لیتر در کیلومتر</displayName>
 				<unitPattern count="one">{0} لیتر در کیلومتر</unitPattern>
 				<unitPattern count="other">{0} لیتر در کیلومتر</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>لیتر در ۱۰۰ کیلومتر</displayName>
+				<unitPattern count="one">{0} لیتر در ۱۰۰ کیلومتر</unitPattern>
+				<unitPattern count="other">{0} لیتر در ۱۰۰ کیلومتر</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>مایل در گالن</displayName>
 				<unitPattern count="one">{0} مایل در گالن</unitPattern>
 				<unitPattern count="other">{0} مایل در گالن</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>بیت</displayName>
-				<unitPattern count="one">{0} بیت</unitPattern>
-				<unitPattern count="other">{0} بیت</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>بایت</displayName>
-				<unitPattern count="one">{0} بایت</unitPattern>
-				<unitPattern count="other">{0} بایت</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>گیگابیت</displayName>
-				<unitPattern count="one">{0} گیگابیت</unitPattern>
-				<unitPattern count="other">{0} گیگابیت</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>گیگابایت</displayName>
-				<unitPattern count="one">{0} گیگابایت</unitPattern>
-				<unitPattern count="other">{0} گیگابایت</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>کیلوبیت</displayName>
-				<unitPattern count="one">{0} کیلوبیت</unitPattern>
-				<unitPattern count="other">{0} کیلوبیت</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>کیلوبایت</displayName>
-				<unitPattern count="one">{0} کیلوبایت</unitPattern>
-				<unitPattern count="other">{0} کیلوبایت</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>مگابیت</displayName>
-				<unitPattern count="one">{0} مگابیت</unitPattern>
-				<unitPattern count="other">{0} مگابیت</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>مگابایت</displayName>
-				<unitPattern count="one">{0} مگابایت</unitPattern>
-				<unitPattern count="other">{0} مگابایت</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>ترابیت</displayName>
-				<unitPattern count="one">{0} ترابیت</unitPattern>
-				<unitPattern count="other">{0} ترابیت</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>ترابایت</displayName>
 				<unitPattern count="one">{0} ترابایت</unitPattern>
 				<unitPattern count="other">{0} ترابایت</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>ترابیت</displayName>
+				<unitPattern count="one">{0} ترابیت</unitPattern>
+				<unitPattern count="other">{0} ترابیت</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>گیگابایت</displayName>
+				<unitPattern count="one">{0} گیگابایت</unitPattern>
+				<unitPattern count="other">{0} گیگابایت</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>گیگابیت</displayName>
+				<unitPattern count="one">{0} گیگابیت</unitPattern>
+				<unitPattern count="other">{0} گیگابیت</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>مگابایت</displayName>
+				<unitPattern count="one">{0} مگابایت</unitPattern>
+				<unitPattern count="other">{0} مگابایت</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>مگابیت</displayName>
+				<unitPattern count="one">{0} مگابیت</unitPattern>
+				<unitPattern count="other">{0} مگابیت</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>کیلوبایت</displayName>
+				<unitPattern count="one">{0} کیلوبایت</unitPattern>
+				<unitPattern count="other">{0} کیلوبایت</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>کیلوبیت</displayName>
+				<unitPattern count="one">{0} کیلوبیت</unitPattern>
+				<unitPattern count="other">{0} کیلوبیت</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>بایت</displayName>
+				<unitPattern count="one">{0} بایت</unitPattern>
+				<unitPattern count="other">{0} بایت</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>بیت</displayName>
+				<unitPattern count="one">{0} بیت</unitPattern>
+				<unitPattern count="other">{0} بیت</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>سده</displayName>
+				<unitPattern count="one">{0} سده</unitPattern>
+				<unitPattern count="other">{0} سده</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>سال</displayName>
+				<unitPattern count="one">{0} سال</unitPattern>
+				<unitPattern count="other">{0} سال</unitPattern>
+				<perUnitPattern>{0} در سال</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ماه</displayName>
+				<unitPattern count="one">{0} ماه</unitPattern>
+				<unitPattern count="other">{0} ماه</unitPattern>
+				<perUnitPattern>{0} در ماه</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>هفته</displayName>
+				<unitPattern count="one">{0} هفته</unitPattern>
+				<unitPattern count="other">{0} هفته</unitPattern>
+				<perUnitPattern>{0} در هفته</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>روز</displayName>
 				<unitPattern count="one">{0} روز</unitPattern>
 				<unitPattern count="other">{0} روز</unitPattern>
+				<perUnitPattern>{0} در روز</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>ساعت</displayName>
@@ -5739,30 +6484,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ساعت</unitPattern>
 				<perUnitPattern>{0} در ساعت</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>میکروثانیه</displayName>
-				<unitPattern count="one">{0} میکروثانیه</unitPattern>
-				<unitPattern count="other">{0} میکروثانیه</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>میلی‌ثانیه</displayName>
-				<unitPattern count="one">{0} میلی‌ثانیه</unitPattern>
-				<unitPattern count="other">{0} میلی‌ثانیه</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>دقیقه</displayName>
 				<unitPattern count="one">{0} دقیقه</unitPattern>
 				<unitPattern count="other">{0} دقیقه</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>ماه</displayName>
-				<unitPattern count="one">{0} ماه</unitPattern>
-				<unitPattern count="other">{0} ماه</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>نانوثانیه</displayName>
-				<unitPattern count="one">{0} نانوثانیه</unitPattern>
-				<unitPattern count="other">{0} نانوثانیه</unitPattern>
+				<perUnitPattern>{0} در دقیقه</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>ثانیه</displayName>
@@ -5770,15 +6496,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ثانیه</unitPattern>
 				<perUnitPattern>{0} در ثانیه</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>هفته</displayName>
-				<unitPattern count="one">{0} هفته</unitPattern>
-				<unitPattern count="other">{0} هفته</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>میلی‌ثانیه</displayName>
+				<unitPattern count="one">{0} میلی‌ثانیه</unitPattern>
+				<unitPattern count="other">{0} میلی‌ثانیه</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>سال</displayName>
-				<unitPattern count="one">{0} سال</unitPattern>
-				<unitPattern count="other">{0} سال</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>میکروثانیه</displayName>
+				<unitPattern count="one">{0} میکروثانیه</unitPattern>
+				<unitPattern count="other">{0} میکروثانیه</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>نانوثانیه</displayName>
+				<unitPattern count="one">{0} نانوثانیه</unitPattern>
+				<unitPattern count="other">{0} نانوثانیه</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>آمپر</displayName>
@@ -5800,6 +6531,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ولت</unitPattern>
 				<unitPattern count="other">{0} ولت</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>کیلوکالری</displayName>
+				<unitPattern count="one">{0} کیلوکالری</unitPattern>
+				<unitPattern count="other">{0} کیلوکالری</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>کالری</displayName>
 				<unitPattern count="one">{0} کالری</unitPattern>
@@ -5810,21 +6546,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} کالری</unitPattern>
 				<unitPattern count="other">{0} کالری</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>ژول</displayName>
-				<unitPattern count="one">{0} ژول</unitPattern>
-				<unitPattern count="other">{0} ژول</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>کیلوکالری</displayName>
-				<unitPattern count="one">{0} کیلوکالری</unitPattern>
-				<unitPattern count="other">{0} کیلوکالری</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>کیلوژول</displayName>
 				<unitPattern count="one">{0} کیلوژول</unitPattern>
 				<unitPattern count="other">{0} کیلوژول</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>ژول</displayName>
+				<unitPattern count="one">{0} ژول</unitPattern>
+				<unitPattern count="other">{0} ژول</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>کیلووات‌ساعت</displayName>
 				<unitPattern count="one">{0} کیلووات‌ساعت</unitPattern>
@@ -5835,201 +6566,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} گیگاهرتز</unitPattern>
 				<unitPattern count="other">{0} گیگاهرتز</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>هرتز</displayName>
-				<unitPattern count="one">{0} هرتز</unitPattern>
-				<unitPattern count="other">{0} هرتز</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>مگاهرتز</displayName>
+				<unitPattern count="one">{0} مگاهرتز</unitPattern>
+				<unitPattern count="other">{0} مگاهرتز</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>کیلوهرتز</displayName>
 				<unitPattern count="one">{0} کیلوهرتز</unitPattern>
 				<unitPattern count="other">{0} کیلوهرتز</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>مگاهرتز</displayName>
-				<unitPattern count="one">{0} مگاهرتز</unitPattern>
-				<unitPattern count="other">{0} مگاهرتز</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>هرتز</displayName>
+				<unitPattern count="one">{0} هرتز</unitPattern>
+				<unitPattern count="other">{0} هرتز</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>واحد نجومی</displayName>
-				<unitPattern count="one">{0} واحد نجومی</unitPattern>
-				<unitPattern count="other">{0} واحد نجومی</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>کیلومتر</displayName>
+				<unitPattern count="one">{0} کیلومتر</unitPattern>
+				<unitPattern count="other">{0} کیلومتر</unitPattern>
+				<perUnitPattern>{0}/کیلومتر</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>سانتی‌متر</displayName>
-				<unitPattern count="one">{0} سانتی‌متر</unitPattern>
-				<unitPattern count="other">{0} سانتی‌متر</unitPattern>
+			<unit type="length-meter">
+				<displayName>متر</displayName>
+				<unitPattern count="one">{0} متر</unitPattern>
+				<unitPattern count="other">{0} متر</unitPattern>
+				<perUnitPattern>{0}/متر</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>دسی‌متر</displayName>
 				<unitPattern count="one">{0} دسی‌متر</unitPattern>
 				<unitPattern count="other">{0} دسی‌متر</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>فوت</displayName>
-				<unitPattern count="one">{0} فوت</unitPattern>
-				<unitPattern count="other">{0} فوت</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>اینچ</displayName>
-				<unitPattern count="one">{0} اینچ</unitPattern>
-				<unitPattern count="other">{0} اینچ</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>کیلومتر</displayName>
-				<unitPattern count="one">{0} کیلومتر</unitPattern>
-				<unitPattern count="other">{0} کیلومتر</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>سال نوری</displayName>
-				<unitPattern count="one">{0} سال نوری</unitPattern>
-				<unitPattern count="other">{0} سال نوری</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>متر</displayName>
-				<unitPattern count="one">{0} متر</unitPattern>
-				<unitPattern count="other">{0} متر</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>میکرومتر</displayName>
-				<unitPattern count="one">{0} میکرومتر</unitPattern>
-				<unitPattern count="other">{0} میکرومتر</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>مایل</displayName>
-				<unitPattern count="one">{0} مایل</unitPattern>
-				<unitPattern count="other">{0} مایل</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>سانتی‌متر</displayName>
+				<unitPattern count="one">{0} سانتی‌متر</unitPattern>
+				<unitPattern count="other">{0} سانتی‌متر</unitPattern>
+				<perUnitPattern>{0}/سانتی‌متر</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>میلی‌متر</displayName>
 				<unitPattern count="one">{0} میلی‌متر</unitPattern>
 				<unitPattern count="other">{0} میلی‌متر</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>میکرومتر</displayName>
+				<unitPattern count="one">{0} میکرومتر</unitPattern>
+				<unitPattern count="other">{0} میکرومتر</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>نانومتر</displayName>
 				<unitPattern count="one">{0} نانومتر</unitPattern>
 				<unitPattern count="other">{0} نانومتر</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>مایل دریایی</displayName>
-				<unitPattern count="one">{0} مایل دریایی</unitPattern>
-				<unitPattern count="other">{0} مایل دریایی</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>پارسک</displayName>
-				<unitPattern count="one">{0} پارسک</unitPattern>
-				<unitPattern count="other">{0} پارسک</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>پیکومتر</displayName>
 				<unitPattern count="one">{0} پیکومتر</unitPattern>
 				<unitPattern count="other">{0} پیکومتر</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>مایل</displayName>
+				<unitPattern count="one">{0} مایل</unitPattern>
+				<unitPattern count="other">{0} مایل</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>یارد</displayName>
 				<unitPattern count="one">{0} یارد</unitPattern>
 				<unitPattern count="other">{0} یارد</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>فوت</displayName>
+				<unitPattern count="one">{0} فوت</unitPattern>
+				<unitPattern count="other">{0} فوت</unitPattern>
+				<perUnitPattern>{0}/فوت</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>اینچ</displayName>
+				<unitPattern count="one">{0} اینچ</unitPattern>
+				<unitPattern count="other">{0} اینچ</unitPattern>
+				<perUnitPattern>{0}/اینچ</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>پارسک</displayName>
+				<unitPattern count="one">{0} پارسک</unitPattern>
+				<unitPattern count="other">{0} پارسک</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>سال نوری</displayName>
+				<unitPattern count="one">{0} سال نوری</unitPattern>
+				<unitPattern count="other">{0} سال نوری</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>واحد نجومی</displayName>
+				<unitPattern count="one">{0} واحد نجومی</unitPattern>
+				<unitPattern count="other">{0} واحد نجومی</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>مایل دریایی</displayName>
+				<unitPattern count="one">{0} مایل دریایی</unitPattern>
+				<unitPattern count="other">{0} مایل دریایی</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>مایل اسکاندیناوی</displayName>
+				<unitPattern count="one">{0} مایل اسکاندیناوی</unitPattern>
+				<unitPattern count="other">{0} مایل اسکاندیناوی</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>لوکس</displayName>
 				<unitPattern count="one">{0} لوکس</unitPattern>
 				<unitPattern count="other">{0} لوکس</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>قیراط</displayName>
-				<unitPattern count="one">{0} قیراط</unitPattern>
-				<unitPattern count="other">{0} قیراط</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>گرم</displayName>
-				<unitPattern count="one">{0} گرم</unitPattern>
-				<unitPattern count="other">{0} گرم</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>کیلوگرم</displayName>
-				<unitPattern count="one">{0} کیلوگرم</unitPattern>
-				<unitPattern count="other">{0} کیلوگرم</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>تن متریک</displayName>
 				<unitPattern count="one">{0} تن متریک</unitPattern>
 				<unitPattern count="other">{0} تن متریک</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>میکروگرم</displayName>
-				<unitPattern count="one">{0} میکروگرم</unitPattern>
-				<unitPattern count="other">{0} میکروگرم</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>کیلوگرم</displayName>
+				<unitPattern count="one">{0} کیلوگرم</unitPattern>
+				<unitPattern count="other">{0} کیلوگرم</unitPattern>
+				<perUnitPattern>{0} در کیلوگرم</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>گرم</displayName>
+				<unitPattern count="one">{0} گرم</unitPattern>
+				<unitPattern count="other">{0} گرم</unitPattern>
+				<perUnitPattern>{0} در گرم</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>میلی‌گرم</displayName>
 				<unitPattern count="one">{0} میلی‌گرم</unitPattern>
 				<unitPattern count="other">{0} میلی‌گرم</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>اونس</displayName>
-				<unitPattern count="one">{0} اونس</unitPattern>
-				<unitPattern count="other">{0} اونس</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>اونس تروا</displayName>
-				<unitPattern count="one">{0} اونس تروا</unitPattern>
-				<unitPattern count="other">{0} اونس تروا</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>پوند</displayName>
-				<unitPattern count="one">{0} پوند</unitPattern>
-				<unitPattern count="other">{0} پوند</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>میکروگرم</displayName>
+				<unitPattern count="one">{0} میکروگرم</unitPattern>
+				<unitPattern count="other">{0} میکروگرم</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>تن</displayName>
 				<unitPattern count="one">{0} تن</unitPattern>
 				<unitPattern count="other">{0} تن</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>پوند</displayName>
+				<unitPattern count="one">{0} پوند</unitPattern>
+				<unitPattern count="other">{0} پوند</unitPattern>
+				<perUnitPattern>{0} در پوند</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>اونس</displayName>
+				<unitPattern count="one">{0} اونس</unitPattern>
+				<unitPattern count="other">{0} اونس</unitPattern>
+				<perUnitPattern>{0} در اونس</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>اونس تروا</displayName>
+				<unitPattern count="one">{0} اونس تروا</unitPattern>
+				<unitPattern count="other">{0} اونس تروا</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>قیراط</displayName>
+				<unitPattern count="one">{0} قیراط</unitPattern>
+				<unitPattern count="other">{0} قیراط</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>گیگاوات</displayName>
 				<unitPattern count="one">{0} گیگاوات</unitPattern>
 				<unitPattern count="other">{0} گیگاوات</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>اسب بخار</displayName>
-				<unitPattern count="one">{0} اسب بخار</unitPattern>
-				<unitPattern count="other">{0} اسب بخار</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>کیلووات</displayName>
-				<unitPattern count="one">{0} کیلووات</unitPattern>
-				<unitPattern count="other">{0} کیلووات</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>مگاوات</displayName>
 				<unitPattern count="one">{0} مگاوات</unitPattern>
 				<unitPattern count="other">{0} مگاوات</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>میلی‌وات</displayName>
-				<unitPattern count="one">{0} میلی‌وات</unitPattern>
-				<unitPattern count="other">{0} میلی‌وات</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>کیلووات</displayName>
+				<unitPattern count="one">{0} کیلووات</unitPattern>
+				<unitPattern count="other">{0} کیلووات</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>وات</displayName>
 				<unitPattern count="one">{0} وات</unitPattern>
 				<unitPattern count="other">{0} وات</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>میلی‌وات</displayName>
+				<unitPattern count="one">{0} میلی‌وات</unitPattern>
+				<unitPattern count="other">{0} میلی‌وات</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>اسب بخار</displayName>
+				<unitPattern count="one">{0} اسب بخار</unitPattern>
+				<unitPattern count="other">{0} اسب بخار</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>هکتوپاسکال</displayName>
 				<unitPattern count="one">{0} هکتوپاسکال</unitPattern>
 				<unitPattern count="other">{0} هکتوپاسکال</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>اینچ جیوه</displayName>
-				<unitPattern count="one">{0} اینچ جیوه</unitPattern>
-				<unitPattern count="other">{0} اینچ جیوه</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>میلی‌بار</displayName>
-				<unitPattern count="one">{0} میلی‌بار</unitPattern>
-				<unitPattern count="other">{0} میلی‌بار</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>میلی‌متر جیوه</displayName>
 				<unitPattern count="one">{0} میلی‌متر جیوه</unitPattern>
@@ -6040,10 +6775,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} پوند در اینچ مربع</unitPattern>
 				<unitPattern count="other">{0} پوند در اینچ مربع</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>عیار</displayName>
-				<unitPattern count="one">{0} عیار</unitPattern>
-				<unitPattern count="other">{0} عیار</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>اینچ جیوه</displayName>
+				<unitPattern count="one">{0} اینچ جیوه</unitPattern>
+				<unitPattern count="other">{0} اینچ جیوه</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>میلی‌بار</displayName>
+				<unitPattern count="one">{0} میلی‌بار</unitPattern>
+				<unitPattern count="other">{0} میلی‌بار</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>کیلومتر در ساعت</displayName>
@@ -6060,6 +6800,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} مایل در ساعت</unitPattern>
 				<unitPattern count="other">{0} مایل در ساعت</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>گره</displayName>
+				<unitPattern count="one">{0} گره</unitPattern>
+				<unitPattern count="other">{0} گره</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>درجهٔ سلسیوس</displayName>
 				<unitPattern count="one">{0} درجهٔ سلسیوس</unitPattern>
@@ -6068,38 +6818,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="temperature-fahrenheit">
 				<displayName>درجهٔ فارنهایت</displayName>
 				<unitPattern count="one">{0} درجهٔ فارنهایت</unitPattern>
-				<unitPattern count="other">{0}°F</unitPattern>
+				<unitPattern count="other">{0} درجهٔ فارنهایت</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
 				<displayName>درجهٔ کلوین</displayName>
 				<unitPattern count="one">{0} درجهٔ کلوین</unitPattern>
 				<unitPattern count="other">{0} درجهٔ کلوین</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>جریب-فوت</displayName>
-				<unitPattern count="one">{0} جریب-فوت</unitPattern>
-				<unitPattern count="other">{0} جریب-فوت</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>سانتی‌لیتر</displayName>
-				<unitPattern count="one">{0} سانتی‌لیتر</unitPattern>
-				<unitPattern count="other">{0} سانتی‌لیتر</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>سانتی‌متر مکعب</displayName>
-				<unitPattern count="one">{0} سانتی‌متر مکعب</unitPattern>
-				<unitPattern count="other">{0} سانتی‌متر مکعب</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>فوت مکعب</displayName>
-				<unitPattern count="one">{0} فوت مکعب</unitPattern>
-				<unitPattern count="other">{0} فوت مکعب</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>اینچ مکعب</displayName>
-				<unitPattern count="one">{0} اینچ مکعب</unitPattern>
-				<unitPattern count="other">{0} اینچ مکعب</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>کیلومتر مکعب</displayName>
 				<unitPattern count="one">{0} کیلومتر مکعب</unitPattern>
@@ -6109,6 +6834,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>متر مکعب</displayName>
 				<unitPattern count="one">{0} متر مکعب</unitPattern>
 				<unitPattern count="other">{0} متر مکعب</unitPattern>
+				<perUnitPattern>{0} در متر مکعب</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>سانتی‌متر مکعب</displayName>
+				<unitPattern count="one">{0} سانتی‌متر مکعب</unitPattern>
+				<unitPattern count="other">{0} سانتی‌متر مکعب</unitPattern>
+				<perUnitPattern>{0} در سانتی‌متر مکعب</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>مایل مکعب</displayName>
@@ -6120,25 +6852,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} یارد مکعب</unitPattern>
 				<unitPattern count="other">{0} یارد مکعب</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>پیمانه</displayName>
-				<unitPattern count="one">{0} پیمانه</unitPattern>
-				<unitPattern count="other">{0} پیمانه</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>فوت مکعب</displayName>
+				<unitPattern count="one">{0} فوت مکعب</unitPattern>
+				<unitPattern count="other">{0} فوت مکعب</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>دسی‌لیتر</displayName>
-				<unitPattern count="one">{0} دسی‌لیتر</unitPattern>
-				<unitPattern count="other">{0} دسی‌لیتر</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>اینچ مکعب</displayName>
+				<unitPattern count="one">{0} اینچ مکعب</unitPattern>
+				<unitPattern count="other">{0} اینچ مکعب</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>اونس سیال</displayName>
-				<unitPattern count="one">{0} اونس سیال</unitPattern>
-				<unitPattern count="other">{0} اونس سیال</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>گالون</displayName>
-				<unitPattern count="one">{0} گالون</unitPattern>
-				<unitPattern count="other">{0} گالون</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>مگالیتر</displayName>
+				<unitPattern count="one">{0} مگالیتر</unitPattern>
+				<unitPattern count="other">{0} مگالیتر</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>هکتولیتر</displayName>
@@ -6149,27 +6876,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>لیتر</displayName>
 				<unitPattern count="one">{0} لیتر</unitPattern>
 				<unitPattern count="other">{0} لیتر</unitPattern>
+				<perUnitPattern>{0} در لیتر</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>مگالیتر</displayName>
-				<unitPattern count="one">{0} مگالیتر</unitPattern>
-				<unitPattern count="other">{0} مگالیتر</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>دسی‌لیتر</displayName>
+				<unitPattern count="one">{0} دسی‌لیتر</unitPattern>
+				<unitPattern count="other">{0} دسی‌لیتر</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>سانتی‌لیتر</displayName>
+				<unitPattern count="one">{0} سانتی‌لیتر</unitPattern>
+				<unitPattern count="other">{0} سانتی‌لیتر</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>میلی‌لیتر</displayName>
 				<unitPattern count="one">{0} میلی‌لیتر</unitPattern>
 				<unitPattern count="other">{0} میلی‌لیتر</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>پاینت</displayName>
-				<unitPattern count="one">{0} پاینت</unitPattern>
-				<unitPattern count="other">{0} پاینت</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>پاینت متریک</displayName>
+				<unitPattern count="one">{0} پاینت متریک</unitPattern>
+				<unitPattern count="other">{0} پاینت متریک</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>پیمانهٔ متریک</displayName>
+				<unitPattern count="one">{0} پیمانهٔ متریک</unitPattern>
+				<unitPattern count="other">{0} پیمانهٔ متریک</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>جریب فوت</displayName>
+				<unitPattern count="one">{0} جریب فوت</unitPattern>
+				<unitPattern count="other">{0} جریب فوت</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>گالن</displayName>
+				<unitPattern count="one">{0} گالن</unitPattern>
+				<unitPattern count="other">{0} گالن</unitPattern>
+				<perUnitPattern>{0} در گالن</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>کوارت</displayName>
 				<unitPattern count="one">{0} کوارت</unitPattern>
 				<unitPattern count="other">{0} کوارت</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>پاینت</displayName>
+				<unitPattern count="one">{0} پاینت</unitPattern>
+				<unitPattern count="other">{0} پاینت</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>پیمانه</displayName>
+				<unitPattern count="one">{0} پیمانه</unitPattern>
+				<unitPattern count="other">{0} پیمانه</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>اونس سیال</displayName>
+				<unitPattern count="one">{0} اونس سیال</unitPattern>
+				<unitPattern count="other">{0} اونس سیال</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>قاشق غذاخوری</displayName>
 				<unitPattern count="one">{0} قاشق غذاخوری</unitPattern>
@@ -6180,6 +6944,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} قاشق چای‌خوری</unitPattern>
 				<unitPattern count="other">{0} قاشق چای‌خوری</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} شرقی</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} شمالی</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} جنوبی</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} غربی</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -6195,40 +6965,67 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName>دقیقهٔ قوسی</displayName>
-				<unitPattern count="one">{0} دقیقهٔ قوسی</unitPattern>
-				<unitPattern count="other">{0} دقیقهٔ قوسی</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName>ثانیهٔ قوسی</displayName>
-				<unitPattern count="one">{0} ثانیهٔ قوسی</unitPattern>
-				<unitPattern count="other">{0} ثانیهٔ قوسی</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName>درجه</displayName>
-				<unitPattern count="one">{0} درجه</unitPattern>
-				<unitPattern count="other">{0} درجه</unitPattern>
+			<unit type="angle-revolution">
+				<displayName>دور</displayName>
+				<unitPattern count="one">{0} دور</unitPattern>
+				<unitPattern count="other">{0} دور</unitPattern>
 			</unit>
 			<unit type="angle-radian">
 				<displayName>رادیان</displayName>
 				<unitPattern count="one">{0} رادیان</unitPattern>
 				<unitPattern count="other">{0} رادیان</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName>جریب</displayName>
-				<unitPattern count="one">{0} جریب</unitPattern>
-				<unitPattern count="other">{0} جریب</unitPattern>
+			<unit type="angle-degree">
+				<displayName>درجه</displayName>
+				<unitPattern count="one">{0} درجه</unitPattern>
+				<unitPattern count="other">{0} درجه</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>دقیقهٔ قوسی</displayName>
+				<unitPattern count="one">{0} د.قوسی</unitPattern>
+				<unitPattern count="other">{0} د.قوسی</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>ثانیهٔ قوسی</displayName>
+				<unitPattern count="one">{0} ث.قوسی</unitPattern>
+				<unitPattern count="other">{0} ث.قوسی</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>کیلومتر مربع</displayName>
+				<unitPattern count="one">{0}‎ km²</unitPattern>
+				<unitPattern count="other">{0}‎ km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>هکتار</displayName>
 				<unitPattern count="one">{0} هکتار</unitPattern>
 				<unitPattern count="other">{0} هکتار</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>متر مربع</displayName>
+				<unitPattern count="one">{0} مترمربع</unitPattern>
+				<unitPattern count="other">{0} مترمربع</unitPattern>
+				<perUnitPattern>{0} در متر مربع</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>سانتی‌متر مربع</displayName>
-				<unitPattern count="one">{0} cm²</unitPattern>
-				<unitPattern count="other">{0} cm²</unitPattern>
+				<unitPattern count="one">{0}‎ cm²</unitPattern>
+				<unitPattern count="other">{0}‎ cm²</unitPattern>
+				<perUnitPattern>{0} در سانتی‌متر مربع</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>مایل مربع</displayName>
+				<unitPattern count="one">{0} مایل مربع</unitPattern>
+				<unitPattern count="other">{0} مایل مربع</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>جریب</displayName>
+				<unitPattern count="one">{0} جریب</unitPattern>
+				<unitPattern count="other">{0} جریب</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>یارد مربع</displayName>
+				<unitPattern count="one">{0} یارد مربع</unitPattern>
+				<unitPattern count="other">{0} یارد مربع</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>فوت مربع</displayName>
@@ -6239,91 +7036,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>اینچ مربع</displayName>
 				<unitPattern count="one">{0} اینچ مربع</unitPattern>
 				<unitPattern count="other">{0} اینچ مربع</unitPattern>
+				<perUnitPattern>{0} در اینچ مربع</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>کیلومتر مربع</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>متر مربع</displayName>
-				<unitPattern count="one">{0} مترمربع</unitPattern>
-				<unitPattern count="other">{0} مترمربع</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>مایل مربع</displayName>
-				<unitPattern count="one">{0} مایل مربع</unitPattern>
-				<unitPattern count="other">{0} مایل مربع</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>یارد مربع</displayName>
-				<unitPattern count="one">{0} یارد مربع</unitPattern>
-				<unitPattern count="other">{0} یارد مربع</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>عیار</displayName>
+				<unitPattern count="one">{0} عیار</unitPattern>
+				<unitPattern count="other">{0} عیار</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>لیتر/کیلومتر</displayName>
-				<unitPattern count="one">{0} L/km</unitPattern>
-				<unitPattern count="other">{0} L/km</unitPattern>
+				<unitPattern count="one">{0} ل./ک.م.</unitPattern>
+				<unitPattern count="other">{0} ل./ک.م.</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>لیتر/۱۰۰ کیلومتر</displayName>
+				<unitPattern count="one">{0} ل./۱۰۰ ک.م.</unitPattern>
+				<unitPattern count="other">{0} ل./۱۰۰ ک.م.</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>مایل/گالن</displayName>
 				<unitPattern count="one">{0} مایل در گالن</unitPattern>
 				<unitPattern count="other">{0} مایل در گالن</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>بیت</displayName>
-				<unitPattern count="one">{0} بیت</unitPattern>
-				<unitPattern count="other">{0} بیت</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>بایت</displayName>
-				<unitPattern count="one">{0} بایت</unitPattern>
-				<unitPattern count="other">{0} بایت</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>گیگابیت</displayName>
-				<unitPattern count="one">{0} گیگابیت</unitPattern>
-				<unitPattern count="other">{0} گیگابیت</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>گیگابایت</displayName>
-				<unitPattern count="one">{0} گیگابایت</unitPattern>
-				<unitPattern count="other">{0} گیگابایت</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>کیلوبیت</displayName>
-				<unitPattern count="one">{0} کیلوبیت</unitPattern>
-				<unitPattern count="other">{0} کیلوبیت</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>کیلوبایت</displayName>
-				<unitPattern count="one">{0} کیلوبایت</unitPattern>
-				<unitPattern count="other">{0} کیلوبایت</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>مگابیت</displayName>
-				<unitPattern count="one">{0} مگابیت</unitPattern>
-				<unitPattern count="other">{0} مگابیت</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>مگابایت</displayName>
-				<unitPattern count="one">{0} مگابایت</unitPattern>
-				<unitPattern count="other">{0} مگابایت</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>ترابایت</displayName>
+				<unitPattern count="one">{0} ترابایت</unitPattern>
+				<unitPattern count="other">{0} ترابایت</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>ترابیت</displayName>
 				<unitPattern count="one">{0} ترابیت</unitPattern>
 				<unitPattern count="other">{0} ترابیت</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>ترابایت</displayName>
-				<unitPattern count="one">{0} ترابایت</unitPattern>
-				<unitPattern count="other">{0} ترابایت</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>گیگابایت</displayName>
+				<unitPattern count="one">{0} گیگابایت</unitPattern>
+				<unitPattern count="other">{0} گیگابایت</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>گیگابیت</displayName>
+				<unitPattern count="one">{0} گیگابیت</unitPattern>
+				<unitPattern count="other">{0} گیگابیت</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>مگابایت</displayName>
+				<unitPattern count="one">{0} مگابایت</unitPattern>
+				<unitPattern count="other">{0} مگابایت</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>مگابیت</displayName>
+				<unitPattern count="one">{0} مگابیت</unitPattern>
+				<unitPattern count="other">{0} مگابیت</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>کیلوبایت</displayName>
+				<unitPattern count="one">{0} کیلوبایت</unitPattern>
+				<unitPattern count="other">{0} کیلوبایت</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>کیلوبیت</displayName>
+				<unitPattern count="one">{0} کیلوبیت</unitPattern>
+				<unitPattern count="other">{0} کیلوبیت</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>بایت</displayName>
+				<unitPattern count="one">{0} بایت</unitPattern>
+				<unitPattern count="other">{0} بایت</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>بیت</displayName>
+				<unitPattern count="one">{0} بیت</unitPattern>
+				<unitPattern count="other">{0} بیت</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>سده</displayName>
+				<unitPattern count="one">{0} سده</unitPattern>
+				<unitPattern count="other">{0} سده</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>سال</displayName>
+				<unitPattern count="one">{0} سال</unitPattern>
+				<unitPattern count="other">{0} سال</unitPattern>
+				<perUnitPattern>{0}/سال</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ماه</displayName>
+				<unitPattern count="one">{0} ماه</unitPattern>
+				<unitPattern count="other">{0} ماه</unitPattern>
+				<perUnitPattern>{0}/ماه</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>هفته</displayName>
+				<unitPattern count="one">{0} هفته</unitPattern>
+				<unitPattern count="other">{0} هفته</unitPattern>
+				<perUnitPattern>{0}/هفته</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>روز</displayName>
 				<unitPattern count="one">{0} روز</unitPattern>
 				<unitPattern count="other">{0} روز</unitPattern>
+				<perUnitPattern>{0}/روز</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>ساعت</displayName>
@@ -6331,47 +7143,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ساعت</unitPattern>
 				<perUnitPattern>{0} در ساعت</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>میکروثانیه</displayName>
-				<unitPattern count="one">{0} میکروثانیه</unitPattern>
-				<unitPattern count="other">{0} میکروثانیه</unitPattern>
+			<unit type="duration-minute">
+				<displayName>دقیقه</displayName>
+				<unitPattern count="one">{0} دقیقه</unitPattern>
+				<unitPattern count="other">{0} دقیقه</unitPattern>
+				<perUnitPattern>{0}/دقیقه</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>ثانیه</displayName>
+				<unitPattern count="one">{0} ثانیه</unitPattern>
+				<unitPattern count="other">{0} ثانیه</unitPattern>
+				<perUnitPattern>{0} در ثانیه</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>میلی‌ثانیه</displayName>
 				<unitPattern count="one">{0} میلی‌ثانیه</unitPattern>
 				<unitPattern count="other">{0} میلی‌ثانیه</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>دقیقه</displayName>
-				<unitPattern count="one">{0} دقیقه</unitPattern>
-				<unitPattern count="other">{0} دقیقه</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>ماه</displayName>
-				<unitPattern count="one">{0} ماه</unitPattern>
-				<unitPattern count="other">{0} ماه</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>میکروثانیه</displayName>
+				<unitPattern count="one">{0} میکروثانیه</unitPattern>
+				<unitPattern count="other">{0} میکروثانیه</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>نانوثانیه</displayName>
 				<unitPattern count="one">{0} نانوثانیه</unitPattern>
 				<unitPattern count="other">{0} نانوثانیه</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>ثانیه</displayName>
-				<unitPattern count="one">{0} ثانیه</unitPattern>
-				<unitPattern count="other">{0} ثانیه</unitPattern>
-				<perUnitPattern>{0}در ثانیه</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>هفته</displayName>
-				<unitPattern count="one">{0} هفته</unitPattern>
-				<unitPattern count="other">{0} هفته</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>سال</displayName>
-				<unitPattern count="one">{0} سال</unitPattern>
-				<unitPattern count="other">{0} سال</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>آمپر</displayName>
 				<unitPattern count="one">{0} آمپر</unitPattern>
@@ -6392,6 +7190,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ولت</unitPattern>
 				<unitPattern count="other">{0} ولت</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>ک.کالری</displayName>
+				<unitPattern count="one">{0} ک.کالری</unitPattern>
+				<unitPattern count="other">{0} ک.کالری</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -6399,218 +7202,237 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="energy-foodcalorie">
 				<displayName>کالری</displayName>
-				<unitPattern count="one">{0} Cal</unitPattern>
-				<unitPattern count="other">{0} Cal</unitPattern>
+				<unitPattern count="one">{0} کالری</unitPattern>
+				<unitPattern count="other">{0} کالری</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>ک.ژول</displayName>
+				<unitPattern count="one">{0} ک.ژول</unitPattern>
+				<unitPattern count="other">{0} ک.ژول</unitPattern>
 			</unit>
 			<unit type="energy-joule">
 				<displayName>ژول</displayName>
 				<unitPattern count="one">{0} ژول</unitPattern>
 				<unitPattern count="other">{0} ژول</unitPattern>
 			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>کیلوکالری</displayName>
-				<unitPattern count="one">{0} کیلوکالری</unitPattern>
-				<unitPattern count="other">{0} کیلوکالری</unitPattern>
-			</unit>
-			<unit type="energy-kilojoule">
-				<displayName>کیلوژول</displayName>
-				<unitPattern count="one">{0} کیلوژول</unitPattern>
-				<unitPattern count="other">{0} کیلوژول</unitPattern>
-			</unit>
 			<unit type="energy-kilowatt-hour">
-				<displayName>کیلووات‌ساعت</displayName>
-				<unitPattern count="one">{0} kWh</unitPattern>
-				<unitPattern count="other">{0} kWh</unitPattern>
+				<displayName>ک.وات‌ساعت</displayName>
+				<unitPattern count="one">{0} ک.وات‌ساعت</unitPattern>
+				<unitPattern count="other">{0} ک.وات‌ساعت</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
 				<displayName>گیگاهرتز</displayName>
 				<unitPattern count="one">{0} گیگاهرتز</unitPattern>
 				<unitPattern count="other">{0} گیگاهرتز</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>هرتز</displayName>
-				<unitPattern count="one">{0} هرتز</unitPattern>
-				<unitPattern count="other">{0} هرتز</unitPattern>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<displayName>کیلوهرتز</displayName>
-				<unitPattern count="one">{0} کیلوهرتز</unitPattern>
-				<unitPattern count="other">{0} کیلوهرتز</unitPattern>
-			</unit>
 			<unit type="frequency-megahertz">
 				<displayName>مگاهرتز</displayName>
 				<unitPattern count="one">{0} مگاهرتز</unitPattern>
 				<unitPattern count="other">{0} مگاهرتز</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>واحد نجومی</displayName>
-				<unitPattern count="one">{0} واحد نجومی</unitPattern>
-				<unitPattern count="other">{0} واحد نجومی</unitPattern>
+			<unit type="frequency-kilohertz">
+				<displayName>ک.هرتز</displayName>
+				<unitPattern count="one">{0} ک.هرتز</unitPattern>
+				<unitPattern count="other">{0} ک.هرتز</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>سانت</displayName>
-				<unitPattern count="one">{0} سانت</unitPattern>
-				<unitPattern count="other">{0} سانت</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>هرتز</displayName>
+				<unitPattern count="one">{0} هرتز</unitPattern>
+				<unitPattern count="other">{0} هرتز</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>کیلومتر</displayName>
+				<unitPattern count="one">{0} کیلومتر</unitPattern>
+				<unitPattern count="other">{0} کیلومتر</unitPattern>
+				<perUnitPattern>{0}/کیلومتر</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>متر</displayName>
+				<unitPattern count="one">{0} متر</unitPattern>
+				<unitPattern count="other">{0} متر</unitPattern>
+				<perUnitPattern>{0}/متر</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>دسی‌متر</displayName>
 				<unitPattern count="one">{0} دسی‌متر</unitPattern>
 				<unitPattern count="other">{0} دسی‌متر</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>فوت</displayName>
-				<unitPattern count="one">{0} فوت</unitPattern>
-				<unitPattern count="other">{0} فوت</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>سانت</displayName>
+				<unitPattern count="one">{0} سانت</unitPattern>
+				<unitPattern count="other">{0} سانت</unitPattern>
+				<perUnitPattern>{0}/سانت</perUnitPattern>
 			</unit>
-			<unit type="length-inch">
-				<displayName>اینچ</displayName>
-				<unitPattern count="one">{0} اینچ</unitPattern>
-				<unitPattern count="other">{0} اینچ</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>کیلومتر</displayName>
-				<unitPattern count="one">{0} کیلومتر</unitPattern>
-				<unitPattern count="other">{0} کیلومتر</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>سال نوری</displayName>
-				<unitPattern count="one">{0} سال نوری</unitPattern>
-				<unitPattern count="other">{0} سال نوری</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>متر</displayName>
-				<unitPattern count="one">{0} متر</unitPattern>
-				<unitPattern count="other">{0} متر</unitPattern>
+			<unit type="length-millimeter">
+				<displayName>م‌م</displayName>
+				<unitPattern count="one">{0} م‌م</unitPattern>
+				<unitPattern count="other">{0} م‌م</unitPattern>
 			</unit>
 			<unit type="length-micrometer">
 				<displayName>میکرومتر</displayName>
 				<unitPattern count="one">{0} میکرومتر</unitPattern>
 				<unitPattern count="other">{0} میکرومتر</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName>مایل</displayName>
-				<unitPattern count="one">{0} مایل</unitPattern>
-				<unitPattern count="other">{0} مایل</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>میلی‌متر</displayName>
-				<unitPattern count="one">{0} میلی‌متر</unitPattern>
-				<unitPattern count="other">{0} میلی‌متر</unitPattern>
-			</unit>
 			<unit type="length-nanometer">
 				<displayName>نانومتر</displayName>
 				<unitPattern count="one">{0} نانومتر</unitPattern>
 				<unitPattern count="other">{0} نانومتر</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>مایل دریایی</displayName>
-				<unitPattern count="one">{0} مایل دریایی</unitPattern>
-				<unitPattern count="other">{0} مایل دریایی</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>پارسک</displayName>
-				<unitPattern count="one">{0} پارسک</unitPattern>
-				<unitPattern count="other">{0} پارسک</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>پیکومتر</displayName>
 				<unitPattern count="one">{0} پیکومتر</unitPattern>
 				<unitPattern count="other">{0} پیکومتر</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>مایل</displayName>
+				<unitPattern count="one">{0} مایل</unitPattern>
+				<unitPattern count="other">{0} مایل</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>یارد</displayName>
 				<unitPattern count="one">{0} یارد</unitPattern>
 				<unitPattern count="other">{0} یارد</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>فوت</displayName>
+				<unitPattern count="one">{0} فوت</unitPattern>
+				<unitPattern count="other">{0} فوت</unitPattern>
+				<perUnitPattern>{0}/فوت</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>اینچ</displayName>
+				<unitPattern count="one">{0} اینچ</unitPattern>
+				<unitPattern count="other">{0} اینچ</unitPattern>
+				<perUnitPattern>{0}/اینچ</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>پارسک</displayName>
+				<unitPattern count="one">{0} پارسک</unitPattern>
+				<unitPattern count="other">{0} پارسک</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>سال نوری</displayName>
+				<unitPattern count="one">{0} سال نوری</unitPattern>
+				<unitPattern count="other">{0} سال نوری</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>واحد نجومی</displayName>
+				<unitPattern count="one">{0} واحد نجومی</unitPattern>
+				<unitPattern count="other">{0} واحد نجومی</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>مایل دریایی</displayName>
+				<unitPattern count="one">{0} مایل دریایی</unitPattern>
+				<unitPattern count="other">{0} مایل دریایی</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>مایل اسکاندیناوی</displayName>
+				<unitPattern count="one">{0}‎ smi</unitPattern>
+				<unitPattern count="other">{0}‎ smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>لوکس</displayName>
 				<unitPattern count="one">{0} لوکس</unitPattern>
 				<unitPattern count="other">{0} لوکس</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>قیراط</displayName>
-				<unitPattern count="one">{0} قیراط</unitPattern>
-				<unitPattern count="other">{0} قیراط</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>گرم</displayName>
-				<unitPattern count="one">{0} گرم</unitPattern>
-				<unitPattern count="other">{0} گرم</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>کیلوگرم</displayName>
-				<unitPattern count="one">{0} کیلوگرم</unitPattern>
-				<unitPattern count="other">{0} کیلوگرم</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>تن متریک</displayName>
 				<unitPattern count="one">{0} تن متریک</unitPattern>
 				<unitPattern count="other">{0} تن متریک</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>میکروگرم</displayName>
-				<unitPattern count="one">{0} میکروگرم</unitPattern>
-				<unitPattern count="other">{0} میکروگرم</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>کیلوگرم</displayName>
+				<unitPattern count="one">{0} کیلوگرم</unitPattern>
+				<unitPattern count="other">{0} کیلوگرم</unitPattern>
+				<perUnitPattern>{0} در کیلوگرم</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>گرم</displayName>
+				<unitPattern count="one">{0} گرم</unitPattern>
+				<unitPattern count="other">{0} گرم</unitPattern>
+				<perUnitPattern>{0} در گرم</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>میلی‌گرم</displayName>
 				<unitPattern count="one">{0} میلی‌گرم</unitPattern>
 				<unitPattern count="other">{0} میلی‌گرم</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>اونس</displayName>
-				<unitPattern count="one">{0} اونس</unitPattern>
-				<unitPattern count="other">{0} اونس</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>اونس تروا</displayName>
-				<unitPattern count="one">{0} اونس تروا</unitPattern>
-				<unitPattern count="other">{0} اونس تروا</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>پوند</displayName>
-				<unitPattern count="one">{0} پوند</unitPattern>
-				<unitPattern count="other">{0} پوند</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>میکروگرم</displayName>
+				<unitPattern count="one">{0} میکروگرم</unitPattern>
+				<unitPattern count="other">{0} میکروگرم</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>تن</displayName>
 				<unitPattern count="one">{0} تن</unitPattern>
 				<unitPattern count="other">{0} تن</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>پوند</displayName>
+				<unitPattern count="one">{0} پوند</unitPattern>
+				<unitPattern count="other">{0} پوند</unitPattern>
+				<perUnitPattern>{0} در پوند</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>اونس</displayName>
+				<unitPattern count="one">{0} اونس</unitPattern>
+				<unitPattern count="other">{0} اونس</unitPattern>
+				<perUnitPattern>{0} در اونس</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>اونس تروا</displayName>
+				<unitPattern count="one">{0} اونس تروا</unitPattern>
+				<unitPattern count="other">{0} اونس تروا</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>قیراط</displayName>
+				<unitPattern count="one">{0} قیراط</unitPattern>
+				<unitPattern count="other">{0} قیراط</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>گیگاوات</displayName>
 				<unitPattern count="one">{0} گیگاوات</unitPattern>
 				<unitPattern count="other">{0} گیگاوات</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>اسب بخار</displayName>
-				<unitPattern count="one">{0} اسب بخار</unitPattern>
-				<unitPattern count="other">{0} اسب بخار</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>کیلووات</displayName>
-				<unitPattern count="one">{0} کیلووات</unitPattern>
-				<unitPattern count="other">{0} کیلووات</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>مگاوات</displayName>
 				<unitPattern count="one">{0} مگاوات</unitPattern>
 				<unitPattern count="other">{0} مگاوات</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>میلی‌وات</displayName>
-				<unitPattern count="one">{0} میلی‌وات</unitPattern>
-				<unitPattern count="other">{0} میلی‌وات</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>ک.وات</displayName>
+				<unitPattern count="one">{0} ک.وات</unitPattern>
+				<unitPattern count="other">{0} ک.وات</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>وات</displayName>
 				<unitPattern count="one">{0} وات</unitPattern>
 				<unitPattern count="other">{0} وات</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>میلی‌وات</displayName>
+				<unitPattern count="one">{0} میلی‌وات</unitPattern>
+				<unitPattern count="other">{0} میلی‌وات</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>اسب بخار</displayName>
+				<unitPattern count="one">{0} اسب بخار</unitPattern>
+				<unitPattern count="other">{0} اسب بخار</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>هکتوپاسکال</displayName>
-				<unitPattern count="one">{0} hPa</unitPattern>
-				<unitPattern count="other">{0} hPa</unitPattern>
+				<unitPattern count="one">{0}‎ hPa</unitPattern>
+				<unitPattern count="other">{0}‎ hPa</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>میلی‌متر جیوه</displayName>
+				<unitPattern count="one">{0} م‌م جیوه</unitPattern>
+				<unitPattern count="other">{0} م‌م جیوه</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>پوند در اینچ مربع</displayName>
+				<unitPattern count="one">{0}‎ psi</unitPattern>
+				<unitPattern count="other">{0}‎ psi</unitPattern>
 			</unit>
 			<unit type="pressure-inch-hg">
 				<displayName>اینچ جیوه</displayName>
@@ -6622,25 +7444,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} میلی‌بار</unitPattern>
 				<unitPattern count="other">{0} میلی‌بار</unitPattern>
 			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<displayName>میلی‌متر جیوه</displayName>
-				<unitPattern count="one">{0} mm Hg</unitPattern>
-				<unitPattern count="other">{0} mm Hg</unitPattern>
-			</unit>
-			<unit type="pressure-pound-per-square-inch">
-				<displayName>پوند در اینچ مربع</displayName>
-				<unitPattern count="one">{0} psi</unitPattern>
-				<unitPattern count="other">{0} psi</unitPattern>
-			</unit>
-			<unit type="proportion-karat">
-				<displayName>عیار</displayName>
-				<unitPattern count="one">{0} عیار</unitPattern>
-				<unitPattern count="other">{0} عیار</unitPattern>
-			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>کیلومتر در ساعت</displayName>
-				<unitPattern count="one">{0} km/h</unitPattern>
-				<unitPattern count="other">{0} km/h</unitPattern>
+				<unitPattern count="one">{0}‎ km/h</unitPattern>
+				<unitPattern count="other">{0}‎ km/h</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
 				<displayName>متر در ثانیه</displayName>
@@ -6649,8 +7456,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="speed-mile-per-hour">
 				<displayName>مایل در ساعت</displayName>
-				<unitPattern count="one">{0} m/h</unitPattern>
-				<unitPattern count="other">{0} m/h</unitPattern>
+				<unitPattern count="one">{0}‎ mph</unitPattern>
+				<unitPattern count="other">{0}‎ mph</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>گره</displayName>
+				<unitPattern count="one">{0} گره</unitPattern>
+				<unitPattern count="other">{0} گره</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
 				<displayName>درجهٔ سلسیوس</displayName>
@@ -6667,40 +7484,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">‎{0} K</unitPattern>
 				<unitPattern count="other">‎{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>جریب فوت</displayName>
-				<unitPattern count="one">{0} جریب فوت</unitPattern>
-				<unitPattern count="other">{0} جریب فوت</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>سانتی‌لیتر</displayName>
-				<unitPattern count="one">{0} سانتی‌لیتر</unitPattern>
-				<unitPattern count="other">{0} سانتی‌لیتر</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>سانتی‌متر مکعب</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>فوت مکعب</displayName>
-				<unitPattern count="one">{0} فوت مکعب</unitPattern>
-				<unitPattern count="other">{0} فوت مکعب</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>اینچ مکعب</displayName>
-				<unitPattern count="one">{0} اینچ مکعب</unitPattern>
-				<unitPattern count="other">{0} اینچ مکعب</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>کیلومتر مکعب</displayName>
-				<unitPattern count="one">{0} km³</unitPattern>
-				<unitPattern count="other">{0} km³</unitPattern>
+				<unitPattern count="one">{0}‎ km³</unitPattern>
+				<unitPattern count="other">{0}‎ km³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-meter">
 				<displayName>متر مکعب</displayName>
 				<unitPattern count="one">{0} متر مکعب</unitPattern>
 				<unitPattern count="other">{0} متر مکعب</unitPattern>
+				<perUnitPattern>{0} در متر مکعب</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>سانتی‌متر مکعب</displayName>
+				<unitPattern count="one">{0}‎ cm³</unitPattern>
+				<unitPattern count="other">{0}‎ cm³</unitPattern>
+				<perUnitPattern>{0}‎ /cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>مایل مکعب</displayName>
@@ -6712,25 +7511,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} یارد مکعب</unitPattern>
 				<unitPattern count="other">{0} یارد مکعب</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>پیمانه</displayName>
-				<unitPattern count="one">{0} پیمانه</unitPattern>
-				<unitPattern count="other">{0} پیمانه</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>فوت مکعب</displayName>
+				<unitPattern count="one">{0} فوت مکعب</unitPattern>
+				<unitPattern count="other">{0} فوت مکعب</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>دسی‌لیتر</displayName>
-				<unitPattern count="one">{0} دسی‌لیتر</unitPattern>
-				<unitPattern count="other">{0} دسی‌لیتر</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>اینچ مکعب</displayName>
+				<unitPattern count="one">{0} اینچ مکعب</unitPattern>
+				<unitPattern count="other">{0} اینچ مکعب</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>اونس سیال</displayName>
-				<unitPattern count="one">{0}انس‌سیال</unitPattern>
-				<unitPattern count="other">{0}انس‌سیال</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>گالون</displayName>
-				<unitPattern count="one">{0} گالون</unitPattern>
-				<unitPattern count="other">{0} گالون</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>مگالیتر</displayName>
+				<unitPattern count="one">{0} مگالیتر</unitPattern>
+				<unitPattern count="other">{0} مگالیتر</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>هکتولیتر</displayName>
@@ -6741,37 +7535,80 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>لیتر</displayName>
 				<unitPattern count="one">{0} لیتر</unitPattern>
 				<unitPattern count="other">{0} لیتر</unitPattern>
+				<perUnitPattern>{0} در لیتر</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>مگالیتر</displayName>
-				<unitPattern count="one">{0} مگالیتر</unitPattern>
-				<unitPattern count="other">{0} مگالیتر</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>دسی‌لیتر</displayName>
+				<unitPattern count="one">{0} دسی‌لیتر</unitPattern>
+				<unitPattern count="other">{0} دسی‌لیتر</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>سانتی‌لیتر</displayName>
+				<unitPattern count="one">{0} سانتی‌لیتر</unitPattern>
+				<unitPattern count="other">{0} سانتی‌لیتر</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>میلی‌لیتر</displayName>
 				<unitPattern count="one">{0} میلی‌لیتر</unitPattern>
 				<unitPattern count="other">{0} میلی‌لیتر</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>پاینت</displayName>
-				<unitPattern count="one">{0} پاینت</unitPattern>
-				<unitPattern count="other">{0} پاینت</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>پاینت متریک</displayName>
+				<unitPattern count="one">{0} پاینت متریک</unitPattern>
+				<unitPattern count="other">{0} پاینت متریک</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>پیمانهٔ متریک</displayName>
+				<unitPattern count="one">{0} پیمانهٔ متریک</unitPattern>
+				<unitPattern count="other">{0} پیمانهٔ متریک</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>جریب فوت</displayName>
+				<unitPattern count="one">{0} جریب فوت</unitPattern>
+				<unitPattern count="other">{0} جریب فوت</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>گالن</displayName>
+				<unitPattern count="one">{0} گالن</unitPattern>
+				<unitPattern count="other">{0} گالن</unitPattern>
+				<perUnitPattern>{0} در گالن</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>کوارت</displayName>
 				<unitPattern count="one">{0} کوارت</unitPattern>
 				<unitPattern count="other">{0} کوارت</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>پاینت</displayName>
+				<unitPattern count="one">{0} پاینت</unitPattern>
+				<unitPattern count="other">{0} پاینت</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>پیمانه</displayName>
+				<unitPattern count="one">{0} پیمانه</unitPattern>
+				<unitPattern count="other">{0} پیمانه</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>اونس سیال</displayName>
+				<unitPattern count="one">{0}‎ fl oz</unitPattern>
+				<unitPattern count="other">{0}‎ fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
-				<displayName>قاشق غذاخوری</displayName>
+				<displayName>قاشق غ.</displayName>
 				<unitPattern count="one">{0} قاشق غ.</unitPattern>
 				<unitPattern count="other">{0} قاشق غ.</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
-				<displayName>قاشق چای‌خوری</displayName>
+				<displayName>قاشق چ.</displayName>
 				<unitPattern count="one">{0} قاشق چ.</unitPattern>
 				<unitPattern count="other">{0} قاشق چ.</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} شرقی</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} شمالی</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} جنوبی</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} غربی</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -6781,6 +7618,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}G</unitPattern>
 				<unitPattern count="other">{0}G</unitPattern>
 			</unit>
+			<unit type="angle-radian">
+				<displayName>رادیان</displayName>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>درجه</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -6789,30 +7634,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>درجه</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>رادیان</displayName>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0}جریب</unitPattern>
-				<unitPattern count="other">{0} جریب</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0}km²</unitPattern>
+				<unitPattern count="other">{0}km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0}ha</unitPattern>
 				<unitPattern count="other">{0}ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0}ft²</unitPattern>
-				<unitPattern count="other">{0}ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0}km²</unitPattern>
-				<unitPattern count="other">{0}km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0}m²</unitPattern>
 				<unitPattern count="other">{0}m²</unitPattern>
@@ -6821,74 +7650,128 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>بیت</displayName>
+			<unit type="area-acre">
+				<unitPattern count="one">{0}جریب</unitPattern>
+				<unitPattern count="other">{0} جریب</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>یارد مربع</displayName>
+				<unitPattern count="one">{0} یارد مربع</unitPattern>
+				<unitPattern count="other">{0} یارد مربع</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0}ft²</unitPattern>
+				<unitPattern count="other">{0}ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>لیتر/۱۰۰ کیلومتر</displayName>
+				<unitPattern count="one">{0} ل./۱۰۰ ک.م.</unitPattern>
+				<unitPattern count="other">{0} ل./۱۰۰ ک.م.</unitPattern>
 			</unit>
 			<unit type="digital-byte">
 				<displayName>بایت</displayName>
 			</unit>
+			<unit type="digital-bit">
+				<displayName>بیت</displayName>
+			</unit>
+			<unit type="duration-year">
+				<displayName>سال</displayName>
+				<unitPattern count="one">{0} سال</unitPattern>
+				<unitPattern count="other">{0} سال</unitPattern>
+				<perUnitPattern>{0}/سال</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ماه</displayName>
+				<unitPattern count="one">{0} ماه</unitPattern>
+				<unitPattern count="other">{0} ماه</unitPattern>
+				<perUnitPattern>{0}/ماه</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>هفته</displayName>
+				<unitPattern count="one">{0} هفته</unitPattern>
+				<unitPattern count="other">{0} هفته</unitPattern>
+				<perUnitPattern>{0}/هفته</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>روز</displayName>
 				<unitPattern count="one">{0} روز</unitPattern>
 				<unitPattern count="other">{0} روز</unitPattern>
+				<perUnitPattern>{0}/روز</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>ساعت</displayName>
 				<unitPattern count="one">{0} ساعت</unitPattern>
 				<unitPattern count="other">{0} ساعت</unitPattern>
+				<perUnitPattern>{0}/ساعت</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>میکروثانیه</displayName>
+			<unit type="duration-minute">
+				<displayName>دقیقه</displayName>
+				<unitPattern count="one">{0} دقیقه</unitPattern>
+				<unitPattern count="other">{0} دقیقه</unitPattern>
+				<perUnitPattern>{0}/دقیقه</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>ثانیه</displayName>
+				<unitPattern count="one">{0} ث</unitPattern>
+				<unitPattern count="other">{0} ث</unitPattern>
+				<perUnitPattern>{0}/ث</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>میلی‌ثانیه</displayName>
 				<unitPattern count="one">{0}ms</unitPattern>
 				<unitPattern count="other">{0}ms</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>دقیقه</displayName>
-				<unitPattern count="one">{0} دقیقه</unitPattern>
-				<unitPattern count="other">{0} دقیقه</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>ماه</displayName>
-				<unitPattern count="one">{0} ماه</unitPattern>
-				<unitPattern count="other">{0} ماه</unitPattern>
-			</unit>
-			<unit type="duration-second">
-				<displayName>ثانیه</displayName>
-				<unitPattern count="one">{0}ثانیه</unitPattern>
-				<unitPattern count="other">{0}ثانیه</unitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>هفته</displayName>
-				<unitPattern count="one">{0} هفته</unitPattern>
-				<unitPattern count="other">{0} هفته</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>سال</displayName>
-				<unitPattern count="one">{0} سال</unitPattern>
-				<unitPattern count="other">{0} سال</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>میکروثانیه</displayName>
 			</unit>
 			<unit type="frequency-gigahertz">
-				<displayName draft="unconfirmed">گ‌.هرتز</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گ.هرتز</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گ.هرتز</unitPattern>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<displayName draft="unconfirmed">ک.هرتز</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ک.هرتز</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ک.هرتز</unitPattern>
+				<displayName>گ‌.هرتز</displayName>
+				<unitPattern count="one">{0} گ.هرتز</unitPattern>
+				<unitPattern count="other">{0} گ.هرتز</unitPattern>
 			</unit>
 			<unit type="frequency-megahertz">
-				<displayName draft="unconfirmed">مگاهرتز</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مگاهرتز</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مگاهرتز</unitPattern>
+				<displayName>مگاهرتز</displayName>
+				<unitPattern count="one">{0} مگاهرتز</unitPattern>
+				<unitPattern count="other">{0} مگاهرتز</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>ک.هرتز</displayName>
+				<unitPattern count="one">{0} ک.هرتز</unitPattern>
+				<unitPattern count="other">{0} ک.هرتز</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>کیلومتر</displayName>
+				<unitPattern count="one">{0}km</unitPattern>
+				<unitPattern count="other">{0}km</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>متر</displayName>
+				<unitPattern count="one">{0} متر</unitPattern>
+				<unitPattern count="other">{0} متر</unitPattern>
+				<perUnitPattern>{0}/متر</perUnitPattern>
 			</unit>
 			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">‎{0}cm</unitPattern>
-				<unitPattern count="other">‎{0}cm</unitPattern>
+				<displayName>سانت</displayName>
+				<unitPattern count="one">{0} سانت</unitPattern>
+				<unitPattern count="other">{0} سانت</unitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>م‌م</displayName>
+				<unitPattern count="one">{0} م‌م</unitPattern>
+				<unitPattern count="other">{0} م‌م</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<unitPattern count="one">{0}pm</unitPattern>
+				<unitPattern count="other">{0}pm</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0}mi</unitPattern>
+				<unitPattern count="other">{0}mi</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>یارد</displayName>
+				<unitPattern count="one">{0} یارد</unitPattern>
+				<unitPattern count="other">{0} یارد</unitPattern>
 			</unit>
 			<unit type="length-foot">
 				<unitPattern count="one">{0}ft</unitPattern>
@@ -6898,58 +7781,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}in</unitPattern>
 				<unitPattern count="other">{0}in</unitPattern>
 			</unit>
-			<unit type="length-kilometer">
-				<displayName>کیلومتر</displayName>
-				<unitPattern count="one">{0}km</unitPattern>
-				<unitPattern count="other">{0}km</unitPattern>
+			<unit type="length-parsec">
+				<displayName>پارسک</displayName>
+				<unitPattern count="one">{0} پارسک</unitPattern>
+				<unitPattern count="other">{0} پارسک</unitPattern>
 			</unit>
 			<unit type="length-light-year">
 				<unitPattern count="one">{0}ly</unitPattern>
 				<unitPattern count="other">{0}ly</unitPattern>
 			</unit>
-			<unit type="length-meter">
-				<displayName>متر</displayName>
-				<unitPattern count="one">{0} متر</unitPattern>
-				<unitPattern count="other">{0} متر</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0}mi</unitPattern>
-				<unitPattern count="other">{0}mi</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>میلی‌متر</displayName>
-				<unitPattern count="one">{0}میلی‌متر</unitPattern>
-				<unitPattern count="other">{0}میلی‌متر</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<unitPattern count="one">{0}pm</unitPattern>
-				<unitPattern count="other">{0}pm</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<unitPattern count="one">{0}yd</unitPattern>
-				<unitPattern count="other">{0}yd</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>گرم</displayName>
-				<unitPattern count="one">{0} گرم</unitPattern>
-				<unitPattern count="other">{0} گرم</unitPattern>
+			<unit type="length-astronomical-unit">
+				<displayName>واحد نجومی</displayName>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>کیلوگرم</displayName>
 				<unitPattern count="one">{0}kg</unitPattern>
 				<unitPattern count="other">{0}kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0}oz</unitPattern>
-				<unitPattern count="other">{0}oz</unitPattern>
+			<unit type="mass-gram">
+				<displayName>گرم</displayName>
+				<unitPattern count="one">{0} گرم</unitPattern>
+				<unitPattern count="other">{0} گرم</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0}lb</unitPattern>
 				<unitPattern count="other">{0}lb</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0}hp</unitPattern>
-				<unitPattern count="other">{0}hp</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0}oz</unitPattern>
+				<unitPattern count="other">{0}oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0}kW</unitPattern>
@@ -6959,6 +7819,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}W</unitPattern>
 				<unitPattern count="other">{0}W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0}hp</unitPattern>
+				<unitPattern count="other">{0}hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0}hPa</unitPattern>
 				<unitPattern count="other">{0}hPa</unitPattern>
@@ -6973,8 +7837,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>کیلومتر/ساعت</displayName>
-				<unitPattern count="one">{0}km/h</unitPattern>
-				<unitPattern count="other">{0}km/h</unitPattern>
+				<unitPattern count="one">{0}‎ km/h</unitPattern>
+				<unitPattern count="other">{0}‎ km/h</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
 				<unitPattern count="one">{0}m/s</unitPattern>
@@ -7012,6 +7876,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} لیتر</unitPattern>
 				<unitPattern count="other">{0} لیتر</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} شرقی</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} شمالی</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} جنوبی</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} غربی</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fa_AF.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fa_AF.xml
similarity index 94%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fa_AF.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fa_AF.xml
index 13ff47a139c..43e3d6c60a2 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fa_AF.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fa_AF.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11217 $"/>
-		<generation date="$Date: 2015-02-17 23:51:09 -0600 (Tue, 17 Feb 2015) $"/>
+		<version number="$Revision: 12217 $"/>
 		<language type="fa"/>
 		<territory type="AF"/>
 	</identity>
@@ -125,7 +124,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</territories>
 	</localeDisplayNames>
 	<characters>
-		<exemplarCharacters type="auxiliary">[\u200C \u200D \u200E\u200F \u064E \u0650 \u064F \u0652 \u0656 \u0670 إ ټ ځ څ ډ ړ ږ ښ ك ګ ڼ ى ي]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[\u200E\u200F \u064E \u0650 \u064F \u0652 \u0656 \u0670 \u200C \u200D إ ټ ځ څ ډ ړ ږ ښ ك ګ ڼ ى ي]</exemplarCharacters>
 	</characters>
 	<dates>
 		<calendars>
@@ -134,8 +133,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<monthContext type="format">
 						<monthWidth type="abbreviated">
 							<month type="1">جنو</month>
-							<month type="5">مـی</month>
+							<month type="2">فبروری</month>
+							<month type="3">مارچ</month>
+							<month type="4">اپریل</month>
+							<month type="5">می</month>
+							<month type="6">جون</month>
 							<month type="7">جول</month>
+							<month type="8">اگست</month>
+							<month type="9">سپتمبر</month>
+							<month type="10">اکتوبر</month>
+							<month type="11">نومبر</month>
 							<month type="12">دسم</month>
 						</monthWidth>
 						<monthWidth type="wide">
@@ -256,3 +263,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fa_IR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fa_IR.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fa_IR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fa_IR.xml
index 934a6b3b8e3..5bf42115af3 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fa_IR.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fa_IR.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fa"/>
 		<territory type="IR"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ff.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff.xml
similarity index 92%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ff.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff.xml
index ded1a9b5c36..d3e6f83a515 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ff.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="ff"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anngiyaa</territory>
 			<territory type="AL">Albanii</territory>
 			<territory type="AM">Armenii</territory>
-			<territory type="AN">Antiiye Nederlanndeeje</territory>
 			<territory type="AO">Anngolaa</territory>
 			<territory type="AR">Arjantiin</territory>
 			<territory type="AS">Samowa Amerik</territory>
@@ -447,6 +445,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">subaka</dayPeriod>
+							<dayPeriod type="pm">kikiiɗe</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">subaka</dayPeriod>
 							<dayPeriod type="pm">kikiiɗe</dayPeriod>
@@ -583,6 +585,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0K ¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0K ¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00K ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K ¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000K ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K ¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0M ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M ¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00M ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M ¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000M ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M ¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0G ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G ¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00G ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G ¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000G ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0T ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00T ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000T ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ff_CM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_CM.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ff_CM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_CM.xml
index 4363da94a1f..051769e970a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ff_CM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_CM.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ff"/>
 		<territory type="CM"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ff_GN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_GN.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ff_GN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_GN.xml
index f94d81f9310..697fca97271 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ff_GN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_GN.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ff"/>
 		<territory type="GN"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_MR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_MR.xml
new file mode 100644
index 00000000000..6cad4e7d78c
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_MR.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="ff"/>
+		<territory type="MR"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>h:mm:ss a zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>h:mm:ss a z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>h:mm:ss a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>h:mm a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="MRO">
+				<symbol>UM</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ff_SN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_SN.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ff_SN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_SN.xml
index 991771e0cfd..e2509dea92b 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ff_SN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_SN.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ff"/>
 		<territory type="SN"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fi.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fi.xml
similarity index 88%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fi.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fi.xml
index 262920cb5da..3d87c4df5af 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fi.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fi.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11333 $"/>
-		<generation date="$Date: 2015-03-01 16:07:08 -0600 (Sun, 01 Mar 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="fi"/>
 	</identity>
 	<localeDisplayNames>
@@ -59,7 +58,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ay">aimara</language>
 			<language type="az">azeri</language>
 			<language type="az" alt="short">azeri</language>
-			<language type="azb">eteläazeri</language>
 			<language type="ba">baškiiri</language>
 			<language type="bal">belutši</language>
 			<language type="ban">bali</language>
@@ -76,6 +74,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bfd">fut</language>
 			<language type="bfq">badaga</language>
 			<language type="bg">bulgaria</language>
+			<language type="bgn">länsibelutši</language>
 			<language type="bho">bhodžpuri</language>
 			<language type="bi">bislama</language>
 			<language type="bik">bikol</language>
@@ -170,7 +169,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="eo">esperanto</language>
 			<language type="es">espanja</language>
 			<language type="es_419">amerikanespanja</language>
-			<language type="es_ES">espanjanespanja</language>
+			<language type="es_ES">euroopanespanja</language>
 			<language type="es_MX">meksikonespanja</language>
 			<language type="esu">alaskanjupik</language>
 			<language type="et">viro</language>
@@ -341,6 +340,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">lao</language>
 			<language type="lol">mongo</language>
 			<language type="loz">lozi</language>
+			<language type="lrc">pohjoisluri</language>
 			<language type="lt">liettua</language>
 			<language type="ltg">latgalli</language>
 			<language type="lu">katanganluba</language>
@@ -402,6 +402,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nb">norjan bokmål</language>
 			<language type="nd">pohjois-ndebele</language>
 			<language type="nds">alasaksa</language>
+			<language type="nds_NL">alankomaidenalasaksa</language>
 			<language type="ne">nepali</language>
 			<language type="new">newari</language>
 			<language type="ng">ndonga</language>
@@ -457,7 +458,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ps">paštu</language>
 			<language type="pt">portugali</language>
 			<language type="pt_BR">brasilianportugali</language>
-			<language type="pt_PT">portugalinportugali</language>
+			<language type="pt_PT">euroopanportugali</language>
 			<language type="qu">ketšua</language>
 			<language type="quc">kʼicheʼ</language>
 			<language type="qug">chimborazonylänköketšua</language>
@@ -495,6 +496,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sco">skotti</language>
 			<language type="sd">sindhi</language>
 			<language type="sdc">sassarinsardi</language>
+			<language type="sdh">eteläkurdi</language>
 			<language type="se">pohjoissaame</language>
 			<language type="see">seneca</language>
 			<language type="seh">sena</language>
@@ -537,8 +539,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">sumeri</language>
 			<language type="sv">ruotsi</language>
 			<language type="sw">swahili</language>
+			<language type="sw_CD">kingwana</language>
 			<language type="swb">komori</language>
-			<language type="swc">kingwana</language>
 			<language type="syc">muinaissyyria</language>
 			<language type="syr">syyria</language>
 			<language type="szl">sleesia</language>
@@ -605,6 +607,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">wolaitta</language>
 			<language type="war">waray</language>
 			<language type="was">washo</language>
+			<language type="wbp">warlpiri</language>
 			<language type="wo">wolof</language>
 			<language type="wuu">wu-kiina</language>
 			<language type="xal">kalmukki</language>
@@ -636,6 +639,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<scripts>
 			<script type="Afak">afaka</script>
 			<script type="Aghb">kaukasianalbanialainen</script>
+			<script type="Ahom">ahom</script>
 			<script type="Arab">arabialainen</script>
 			<script type="Arab" alt="variant">persialaisarabialainen</script>
 			<script type="Armi">valtakunnanaramealainen</script>
@@ -688,6 +692,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Hans" alt="stand-alone">kiinalainen yksinkertaistettu han</script>
 			<script type="Hant">perinteinen han</script>
 			<script type="Hant" alt="stand-alone">kiinalainen perinteinen han</script>
+			<script type="Hatr">hatralainen</script>
 			<script type="Hebr">heprealainen</script>
 			<script type="Hira">hiragana</script>
 			<script type="Hluw">anatolialaiset hieroglyfit</script>
@@ -735,6 +740,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Mroo">mro</script>
 			<script type="Mtei">meitei</script>
 			<script type="Mtei" alt="secondary">meitei mayek</script>
+			<script type="Mult">multanilainen</script>
 			<script type="Mymr">burmalainen</script>
 			<script type="Narb">muinaispohjoisarabialainen</script>
 			<script type="Nbat">nabatealainen</script>
@@ -846,7 +852,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Alankomaiden Antillit</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antarktis</territory>
 			<territory type="AR">Argentiina</territory>
@@ -1122,10 +1127,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<variant type="AREVELA">itäarmenialainen</variant>
 			<variant type="AREVMDA">länsiarmenialainen</variant>
 			<variant type="BAKU1926">yhtenäistetty turkkilainen latinalainen aakkosto</variant>
+			<variant type="BALANKA">aniin balankalaismurre</variant>
+			<variant type="BARLA">kapverdenkreolin barlaventolainen murreryhmä</variant>
 			<variant type="BAUDDHA">sanskriitin buddhalainen sekamuoto</variant>
 			<variant type="BISCAYAN">baskin biskajalaismurre</variant>
 			<variant type="BISKE">sloveenin resian San Giorgion/Bilan alamurre</variant>
+			<variant type="BOHORIC">sloveenin Bohorič-aakkosto</variant>
 			<variant type="BOONT">englannin boontling-murre</variant>
+			<variant type="DAJNKO">sloveenin Dajnko-aakkosto</variant>
+			<variant type="EKAVSK">serbian ekavialainen ääntämys</variant>
 			<variant type="EMODENG">varhaisnykyenglanti</variant>
 			<variant type="FONIPA">kansainvälinen foneettinen aakkosto IPA</variant>
 			<variant type="FONUPA">uralilainen foneettinen aakkosto UPA</variant>
@@ -1133,14 +1143,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<variant type="FONXSAMP">foneettinen X-SAMPA-merkistö</variant>
 			<variant type="HEPBURN">japanin Hepburn-latinaistus</variant>
 			<variant type="HOGNORSK">norjan högnorsk</variant>
+			<variant type="IJEKAVSK">serbian ijekavialainen ääntämiys</variant>
 			<variant type="ITIHASA">sanskriitin eeppinen muoto</variant>
 			<variant type="JAUER">retoromaanin jauer-murre</variant>
 			<variant type="JYUTPING">kantoninkiinan jyutping-latinaistus</variant>
 			<variant type="KKCOR">kornin yleiskirjoitus</variant>
+			<variant type="KOCIEWIE">puolan kociewielainen murre</variant>
 			<variant type="KSCOR">kornin standardikirjoitus</variant>
 			<variant type="LAUKIKA">klassinen sanskriitti</variant>
 			<variant type="LIPAW">sloveenin resian Lipovazin/Lipovecin alamurre</variant>
 			<variant type="LUNA1918">venäjän ortografia 1918</variant>
+			<variant type="METELKO">sloveenin Metelko-aakkosto</variant>
 			<variant type="MONOTON">monotoninen kreikka</variant>
 			<variant type="NDYUKA">ndyukan kreolimurre</variant>
 			<variant type="NEDIS">sloveenin natisonen murre</variant>
@@ -1161,6 +1174,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<variant type="SCOTLAND">skotlanninenglanti</variant>
 			<variant type="SCOUSE">englannin scouse-murre</variant>
 			<variant type="SOLBA">sloveenin resian Stolvizzan/Solbican alamurre</variant>
+			<variant type="SOTAV">kapverdenkreolin sotaventolainen murreryhmä</variant>
 			<variant type="SURMIRAN">retoromaanin surmiran-muoto</variant>
 			<variant type="SURSILV">retoromaanin sursilvan-muoto</variant>
 			<variant type="SUTSILV">retoromaanin sutsilvan-muoto</variant>
@@ -1168,6 +1182,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<variant type="UCCOR">kornin yhtenäiskirjoitus</variant>
 			<variant type="UCRCOR">kornin uusittu yhtenäiskirjoitus</variant>
 			<variant type="ULSTER">skotin ulster-murre</variant>
+			<variant type="UNIFON">englannin foneeminen unifon-aakkosto</variant>
 			<variant type="VAIDIKA">sanskriitin veda-murre</variant>
 			<variant type="VALENCIA">katalaanin valencian murre</variant>
 			<variant type="VALLADER">reoromaanin vallader-muoto</variant>
@@ -1185,6 +1200,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric">numeroiden lajittelu</key>
 			<key type="colStrength">lajittelun taso</key>
 			<key type="currency">valuutta</key>
+			<key type="hc">tuntijärjestelmä</key>
+			<key type="lb">rivinvaihtotyyli</key>
+			<key type="ms">mittajärjestelmä</key>
 			<key type="numbers">numerot</key>
 			<key type="timezone">aikavyöhyke</key>
 			<key type="va">maavalinnan muunnelma</key>
@@ -1192,121 +1210,133 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">yksityiskäyttö</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">arabialaiset numerot</type>
-			<type type="arabext" key="numbers">laajennetut arabialaiset numerot</type>
-			<type type="armn" key="numbers">armenialaiset numerot</type>
-			<type type="armnlow" key="numbers">armenialaiset piennumerot</type>
-			<type type="bali" key="numbers">balilaiset numerot</type>
-			<type type="beng" key="numbers">bengalilaiset numerot</type>
-			<type type="big5han" key="collation">perinteinen kiinalainen järjestys Big5</type>
-			<type type="brah" key="numbers">brahmilaiset numerot</type>
-			<type type="buddhist" key="calendar">buddhalainen kalenteri</type>
-			<type type="cakm" key="numbers">chakmalaiset numerot</type>
-			<type type="cham" key="numbers">cham-numerot</type>
-			<type type="chinese" key="calendar">kiinalainen kalenteri</type>
-			<type type="coptic" key="calendar">koptilainen kalenteri</type>
-			<type type="dangi" key="calendar">dangilainen kalenteri</type>
-			<type type="deva" key="numbers">devanagarinumerot</type>
-			<type type="dictionary" key="collation">sanakirjajärjestys</type>
-			<type type="ducet" key="collation">Unicoden oletusjärjestys</type>
-			<type type="eor" key="collation">yleiseurooppalainen lajittelujärjestys</type>
-			<type type="ethi" key="numbers">etiopialaiset numerot</type>
-			<type type="ethiopic" key="calendar">etiopialainen kalenteri</type>
-			<type type="ethiopic-amete-alem" key="calendar">etiopialainen amete alem -kalenteri</type>
-			<type type="finance" key="numbers">talousnumerot</type>
-			<type type="fullwide" key="numbers">ideografin levyiset numerot</type>
-			<type type="gb2312han" key="collation">yksinkertaistettu kiinalainen järjestys GB2312</type>
-			<type type="geor" key="numbers">georgialaiset numerot</type>
-			<type type="gregorian" key="calendar">gregoriaaninen kalenteri</type>
-			<type type="grek" key="numbers">kreikkalaiset numerot</type>
-			<type type="greklow" key="numbers">kreikkalaiset piennumerot</type>
-			<type type="gujr" key="numbers">gudžaratilaiset numerot</type>
-			<type type="guru" key="numbers">gurmukhilaiset numerot</type>
-			<type type="hanidec" key="numbers">kiinalaiset desimaalinumerot</type>
-			<type type="hans" key="numbers">yksinkertaistetut kiinalaiset numerot</type>
-			<type type="hansfin" key="numbers">yksinkertaistetut kiinalaiset talousnumerot</type>
-			<type type="hant" key="numbers">perinteiset kiinalaiset numerot</type>
-			<type type="hantfin" key="numbers">perinteiset kiinalaiset talousnumerot</type>
-			<type type="hebr" key="numbers">heprealaiset numerot</type>
-			<type type="hebrew" key="calendar">juutalainen kalenteri</type>
-			<type type="identical" key="colStrength">kaikkien merkkien lajittelu</type>
-			<type type="indian" key="calendar">intialainen kalenteri</type>
-			<type type="islamic" key="calendar">islamilainen kalenteri</type>
-			<type type="islamic-civil" key="calendar">islamilainen siviilikalenteri, perjantai-epookki</type>
-			<type type="islamic-rgsa" key="calendar">islamilainen saudiarabialainen kalenteri</type>
-			<type type="islamic-tbla" key="calendar">islamilainen matemaattinen kalenteri, torstai-epookki</type>
-			<type type="islamic-umalqura" key="calendar">islamilainen Umm al-Qura -kalenteri</type>
-			<type type="iso8601" key="calendar">ISO 8601 -kalenteri</type>
-			<type type="japanese" key="calendar">japanilainen kalenteri</type>
-			<type type="java" key="numbers">jaavalaiset numerot</type>
-			<type type="jpan" key="numbers">japanilaiset numerot</type>
-			<type type="jpanfin" key="numbers">japanilaiset talousnumerot</type>
-			<type type="kali" key="numbers">kayah li -numerot</type>
-			<type type="khmr" key="numbers">khmeriläiset numerot</type>
-			<type type="knda" key="numbers">kannadalaiset numerot</type>
-			<type type="lana" key="numbers">taithamin hora-numerot</type>
-			<type type="lanatham" key="numbers">taithamin tham-numerot</type>
-			<type type="laoo" key="numbers">laolaiset numerot</type>
-			<type type="latn" key="numbers">länsimaiset numerot</type>
-			<type type="lepc" key="numbers">lepchanumerot</type>
-			<type type="limb" key="numbers">limbunumerot</type>
-			<type type="lower" key="colCaseFirst">pienet kirjaimet edeltävät isoja</type>
-			<type type="mlym" key="numbers">malajalamilaiset numerot</type>
-			<type type="mong" key="numbers">mongolialaiset numerot</type>
-			<type type="mtei" key="numbers">meetei mayek -numerot</type>
-			<type type="mymr" key="numbers">burmalaiset numerot</type>
-			<type type="mymrshan" key="numbers">myanmarin shan-numerot</type>
-			<type type="native" key="numbers">kielen omat numerot</type>
-			<type type="nkoo" key="numbers">n’ko-numerot</type>
-			<type type="no" key="colBackwards">painomerkkien normaali lajittelu</type>
-			<type type="no" key="colCaseFirst">isojen ja pienten kirjainten normaalijärjestys</type>
-			<type type="no" key="colCaseLevel">isojen ja pienten kirjainten lajittelu yhdessä</type>
-			<type type="no" key="colHiraganaQuaternary">kana-merkkien lajittelu erillisinä</type>
-			<type type="no" key="colNormalization">lajittelu ilman normalisoinrtia</type>
-			<type type="no" key="colNumeric">numero-numerolta lajittelu</type>
-			<type type="non-ignorable" key="colAlternate">symbolit huomioiva lajittelu</type>
-			<type type="olck" key="numbers">ol chiki -numerot</type>
-			<type type="orya" key="numbers">orijalaiset numerot</type>
-			<type type="osma" key="numbers">osmanjalaiset numerot</type>
-			<type type="persian" key="calendar">persialainen kalenteri</type>
-			<type type="phonebook" key="collation">puhelinluettelojärjestys</type>
-			<type type="phonetic" key="collation">äänteellinen järjestys</type>
-			<type type="pinyin" key="collation">pinyin-järjestys</type>
-			<type type="primary" key="colStrength">vain peruskirjainten lajittelu</type>
-			<type type="quaternary" key="colStrength">painomerkit ja aakkoslajit tai merkkileveydet ja kana-merkit huomioiva lajittelu</type>
-			<type type="reformed" key="collation">uudistettu järjestys</type>
-			<type type="roc" key="calendar">Kiinan tasavallan kalenteri</type>
-			<type type="roman" key="numbers">roomalaiset numerot</type>
-			<type type="romanlow" key="numbers">roomalaiset piennumerot</type>
-			<type type="saur" key="numbers">saurashtra-numerot</type>
-			<type type="search" key="collation">yleishakujärjestys</type>
-			<type type="searchjl" key="collation">haku hangul-alkukonsonantin mukaan</type>
-			<type type="secondary" key="colStrength">painomerkit huomioiva lajittelu</type>
-			<type type="shifted" key="colAlternate">symbolit ohittava lajittelu</type>
-			<type type="shrd" key="numbers">šarida-numerot</type>
-			<type type="sora" key="numbers">sora sompeng -numerot</type>
-			<type type="standard" key="collation">normaalijärjestys</type>
-			<type type="stroke" key="collation">piirtojärjestys</type>
-			<type type="sund" key="numbers">sundalaiset numerot</type>
-			<type type="takr" key="numbers">takri-numerot</type>
-			<type type="talu" key="numbers">uudet tai lue -numerot</type>
-			<type type="taml" key="numbers">perinteiset tamilinumerot</type>
-			<type type="tamldec" key="numbers">tamilinumerot</type>
-			<type type="telu" key="numbers">telugulaiset numerot</type>
-			<type type="tertiary" key="colStrength">painomerkit ja aakkoslajit tai merkkileveydet huomioiva lajittelu</type>
-			<type type="thai" key="numbers">thainumerot</type>
-			<type type="tibt" key="numbers">tiibetiläiset numerot</type>
-			<type type="traditional" key="collation">perinteinen järjestys</type>
-			<type type="traditional" key="numbers">perinteiset numerot</type>
-			<type type="unihan" key="collation">radikaali- ja piirtojärjestys</type>
-			<type type="upper" key="colCaseFirst">isot kirjaimet edeltävät pieniä</type>
-			<type type="vaii" key="numbers">vai-numerot</type>
-			<type type="yes" key="colBackwards">painomerkkien käänteinen lajittelu</type>
-			<type type="yes" key="colCaseLevel">isojen ja pienten kirjainten lajittelu erikseen</type>
-			<type type="yes" key="colHiraganaQuaternary">kana-merkkien lajittelu tyypin mukaan</type>
-			<type type="yes" key="colNormalization">lajittelu Unicode-normalisoituna</type>
-			<type type="yes" key="colNumeric">numeroden lajittelu lukuina</type>
-			<type type="zhuyin" key="collation">zhuyin-järjestys</type>
+			<type key="calendar" type="buddhist">buddhalainen kalenteri</type>
+			<type key="calendar" type="chinese">kiinalainen kalenteri</type>
+			<type key="calendar" type="coptic">koptilainen kalenteri</type>
+			<type key="calendar" type="dangi">dangilainen kalenteri</type>
+			<type key="calendar" type="ethiopic">etiopialainen kalenteri</type>
+			<type key="calendar" type="ethiopic-amete-alem">etiopialainen amete alem -kalenteri</type>
+			<type key="calendar" type="gregorian">gregoriaaninen kalenteri</type>
+			<type key="calendar" type="hebrew">juutalainen kalenteri</type>
+			<type key="calendar" type="indian">intialainen kalenteri</type>
+			<type key="calendar" type="islamic">islamilainen kalenteri</type>
+			<type key="calendar" type="islamic-civil">islamilainen siviilikalenteri, perjantai-epookki</type>
+			<type key="calendar" type="islamic-rgsa">islamilainen saudiarabialainen kalenteri</type>
+			<type key="calendar" type="islamic-tbla">islamilainen matemaattinen kalenteri, torstai-epookki</type>
+			<type key="calendar" type="islamic-umalqura">islamilainen Umm al-Qura -kalenteri</type>
+			<type key="calendar" type="iso8601">ISO 8601 -kalenteri</type>
+			<type key="calendar" type="japanese">japanilainen kalenteri</type>
+			<type key="calendar" type="persian">persialainen kalenteri</type>
+			<type key="calendar" type="roc">Kiinan tasavallan kalenteri</type>
+			<type key="colAlternate" type="non-ignorable">symbolit huomioiva lajittelu</type>
+			<type key="colAlternate" type="shifted">symbolit ohittava lajittelu</type>
+			<type key="colBackwards" type="no">painomerkkien normaali lajittelu</type>
+			<type key="colBackwards" type="yes">painomerkkien käänteinen lajittelu</type>
+			<type key="colCaseFirst" type="lower">pienet kirjaimet edeltävät isoja</type>
+			<type key="colCaseFirst" type="no">isojen ja pienten kirjainten normaalijärjestys</type>
+			<type key="colCaseFirst" type="upper">isot kirjaimet edeltävät pieniä</type>
+			<type key="colCaseLevel" type="no">isojen ja pienten kirjainten lajittelu yhdessä</type>
+			<type key="colCaseLevel" type="yes">isojen ja pienten kirjainten lajittelu erikseen</type>
+			<type key="colHiraganaQuaternary" type="no">kana-merkkien lajittelu erillisinä</type>
+			<type key="colHiraganaQuaternary" type="yes">kana-merkkien lajittelu tyypin mukaan</type>
+			<type key="collation" type="big5han">perinteinen kiinalainen järjestys Big5</type>
+			<type key="collation" type="compat">aiempi lajittelujärjestys yhteensopivuutta varten</type>
+			<type key="collation" type="dictionary">sanakirjajärjestys</type>
+			<type key="collation" type="ducet">Unicoden oletusjärjestys</type>
+			<type key="collation" type="emoji">emojien lajittelujärjestys</type>
+			<type key="collation" type="eor">yleiseurooppalainen lajittelujärjestys</type>
+			<type key="collation" type="gb2312han">yksinkertaistettu kiinalainen järjestys GB2312</type>
+			<type key="collation" type="phonebook">puhelinluettelojärjestys</type>
+			<type key="collation" type="phonetic">äänteellinen järjestys</type>
+			<type key="collation" type="pinyin">pinyin-järjestys</type>
+			<type key="collation" type="reformed">uudistettu järjestys</type>
+			<type key="collation" type="search">yleishakujärjestys</type>
+			<type key="collation" type="searchjl">haku hangul-alkukonsonantin mukaan</type>
+			<type key="collation" type="standard">normaalijärjestys</type>
+			<type key="collation" type="stroke">piirtojärjestys</type>
+			<type key="collation" type="traditional">perinteinen järjestys</type>
+			<type key="collation" type="unihan">radikaali- ja piirtojärjestys</type>
+			<type key="collation" type="zhuyin">zhuyin-järjestys</type>
+			<type key="colNormalization" type="no">lajittelu ilman normalisoinrtia</type>
+			<type key="colNormalization" type="yes">lajittelu Unicode-normalisoituna</type>
+			<type key="colNumeric" type="no">numero-numerolta lajittelu</type>
+			<type key="colNumeric" type="yes">numeroden lajittelu lukuina</type>
+			<type key="colStrength" type="identical">kaikkien merkkien lajittelu</type>
+			<type key="colStrength" type="primary">vain peruskirjainten lajittelu</type>
+			<type key="colStrength" type="quaternary">painomerkit ja aakkoslajit tai merkkileveydet ja kana-merkit huomioiva lajittelu</type>
+			<type key="colStrength" type="secondary">painomerkit huomioiva lajittelu</type>
+			<type key="colStrength" type="tertiary">painomerkit ja aakkoslajit tai merkkileveydet huomioiva lajittelu</type>
+			<type key="hc" type="h11">12 tunnin järjestelmä (0–11)</type>
+			<type key="hc" type="h12">12 tunnin järjestelmä (1–12)</type>
+			<type key="hc" type="h23">24 tunnin järjestelmä (0–23)</type>
+			<type key="hc" type="h24">24 tunnin järjestelmä (1–24)</type>
+			<type key="lb" type="loose">väljä rivinvaihto</type>
+			<type key="lb" type="normal">normaali rivinvaihto</type>
+			<type key="lb" type="strict">tarkka rivinvaihto</type>
+			<type key="ms" type="metric">metrijärjestelmä</type>
+			<type key="ms" type="uksystem">brittiläinen mittajärjestelmä</type>
+			<type key="ms" type="ussystem">yhdysvaltalainen mittajärjestelmä</type>
+			<type key="numbers" type="arab">arabialaiset numerot</type>
+			<type key="numbers" type="arabext">laajennetut arabialaiset numerot</type>
+			<type key="numbers" type="armn">armenialaiset numerot</type>
+			<type key="numbers" type="armnlow">armenialaiset piennumerot</type>
+			<type key="numbers" type="bali">balilaiset numerot</type>
+			<type key="numbers" type="beng">bengalilaiset numerot</type>
+			<type key="numbers" type="brah">brahmilaiset numerot</type>
+			<type key="numbers" type="cakm">chakmalaiset numerot</type>
+			<type key="numbers" type="cham">cham-numerot</type>
+			<type key="numbers" type="deva">devanagarinumerot</type>
+			<type key="numbers" type="ethi">etiopialaiset numerot</type>
+			<type key="numbers" type="finance">talousnumerot</type>
+			<type key="numbers" type="fullwide">ideografin levyiset numerot</type>
+			<type key="numbers" type="geor">georgialaiset numerot</type>
+			<type key="numbers" type="grek">kreikkalaiset numerot</type>
+			<type key="numbers" type="greklow">kreikkalaiset piennumerot</type>
+			<type key="numbers" type="gujr">gudžaratilaiset numerot</type>
+			<type key="numbers" type="guru">gurmukhilaiset numerot</type>
+			<type key="numbers" type="hanidec">kiinalaiset desimaalinumerot</type>
+			<type key="numbers" type="hans">yksinkertaistetut kiinalaiset numerot</type>
+			<type key="numbers" type="hansfin">yksinkertaistetut kiinalaiset talousnumerot</type>
+			<type key="numbers" type="hant">perinteiset kiinalaiset numerot</type>
+			<type key="numbers" type="hantfin">perinteiset kiinalaiset talousnumerot</type>
+			<type key="numbers" type="hebr">heprealaiset numerot</type>
+			<type key="numbers" type="java">jaavalaiset numerot</type>
+			<type key="numbers" type="jpan">japanilaiset numerot</type>
+			<type key="numbers" type="jpanfin">japanilaiset talousnumerot</type>
+			<type key="numbers" type="kali">kayah li -numerot</type>
+			<type key="numbers" type="khmr">khmeriläiset numerot</type>
+			<type key="numbers" type="knda">kannadalaiset numerot</type>
+			<type key="numbers" type="lana">taithamin hora-numerot</type>
+			<type key="numbers" type="lanatham">taithamin tham-numerot</type>
+			<type key="numbers" type="laoo">laolaiset numerot</type>
+			<type key="numbers" type="latn">länsimaiset numerot</type>
+			<type key="numbers" type="lepc">lepchanumerot</type>
+			<type key="numbers" type="limb">limbunumerot</type>
+			<type key="numbers" type="mlym">malajalamilaiset numerot</type>
+			<type key="numbers" type="mong">mongolialaiset numerot</type>
+			<type key="numbers" type="mtei">meetei mayek -numerot</type>
+			<type key="numbers" type="mymr">burmalaiset numerot</type>
+			<type key="numbers" type="mymrshan">myanmarin shan-numerot</type>
+			<type key="numbers" type="native">kielen omat numerot</type>
+			<type key="numbers" type="nkoo">n’ko-numerot</type>
+			<type key="numbers" type="olck">ol chiki -numerot</type>
+			<type key="numbers" type="orya">orijalaiset numerot</type>
+			<type key="numbers" type="osma">osmanjalaiset numerot</type>
+			<type key="numbers" type="roman">roomalaiset numerot</type>
+			<type key="numbers" type="romanlow">roomalaiset piennumerot</type>
+			<type key="numbers" type="saur">saurashtra-numerot</type>
+			<type key="numbers" type="shrd">šarida-numerot</type>
+			<type key="numbers" type="sora">sora sompeng -numerot</type>
+			<type key="numbers" type="sund">sundalaiset numerot</type>
+			<type key="numbers" type="takr">takri-numerot</type>
+			<type key="numbers" type="talu">uudet tai lue -numerot</type>
+			<type key="numbers" type="taml">perinteiset tamilinumerot</type>
+			<type key="numbers" type="tamldec">tamilinumerot</type>
+			<type key="numbers" type="telu">telugulaiset numerot</type>
+			<type key="numbers" type="thai">thainumerot</type>
+			<type key="numbers" type="tibt">tiibetiläiset numerot</type>
+			<type key="numbers" type="traditional">perinteiset numerot</type>
+			<type key="numbers" type="vaii">vai-numerot</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN">BGN-latinaistus</transformName>
@@ -1524,6 +1554,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">ccc d. MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd" draft="contributed">d. MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm.ss</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
@@ -1853,24 +1884,72 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">keskiyö</dayPeriod>
 							<dayPeriod type="am">ap.</dayPeriod>
+							<dayPeriod type="noon">keskip.</dayPeriod>
 							<dayPeriod type="pm">ip.</dayPeriod>
+							<dayPeriod type="morning1">aamu</dayPeriod>
+							<dayPeriod type="morning2">aamup.</dayPeriod>
+							<dayPeriod type="afternoon1">iltap.</dayPeriod>
+							<dayPeriod type="evening1">ilta</dayPeriod>
+							<dayPeriod type="night1">yö</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">ky.</dayPeriod>
 							<dayPeriod type="am">ap.</dayPeriod>
 							<dayPeriod type="noon">kp.</dayPeriod>
 							<dayPeriod type="pm">ip.</dayPeriod>
+							<dayPeriod type="morning1">aamu</dayPeriod>
+							<dayPeriod type="morning2">ap.</dayPeriod>
+							<dayPeriod type="afternoon1">ip.</dayPeriod>
+							<dayPeriod type="evening1">ilta</dayPeriod>
+							<dayPeriod type="night1">yö</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">keskiyöllä</dayPeriod>
 							<dayPeriod type="am">ap.</dayPeriod>
-							<dayPeriod type="noon">keskipäivä</dayPeriod>
+							<dayPeriod type="noon">keskipäivällä</dayPeriod>
 							<dayPeriod type="pm">ip.</dayPeriod>
+							<dayPeriod type="morning1">aamulla</dayPeriod>
+							<dayPeriod type="morning2">aamupäivällä</dayPeriod>
+							<dayPeriod type="afternoon1">iltapäivällä</dayPeriod>
+							<dayPeriod type="evening1">illalla</dayPeriod>
+							<dayPeriod type="night1">yöllä</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
-						<dayPeriodWidth type="wide">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">keskiyö</dayPeriod>
 							<dayPeriod type="am">ap.</dayPeriod>
+							<dayPeriod type="noon">keskip.</dayPeriod>
 							<dayPeriod type="pm">ip.</dayPeriod>
+							<dayPeriod type="morning1">aamu</dayPeriod>
+							<dayPeriod type="morning2">aamup.</dayPeriod>
+							<dayPeriod type="afternoon1">iltap.</dayPeriod>
+							<dayPeriod type="evening1">ilta</dayPeriod>
+							<dayPeriod type="night1">yö</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">ky.</dayPeriod>
+							<dayPeriod type="am">ap.</dayPeriod>
+							<dayPeriod type="noon">kp.</dayPeriod>
+							<dayPeriod type="pm">ip.</dayPeriod>
+							<dayPeriod type="morning1">aamu</dayPeriod>
+							<dayPeriod type="morning2">ap.</dayPeriod>
+							<dayPeriod type="afternoon1">ip.</dayPeriod>
+							<dayPeriod type="evening1">ilta</dayPeriod>
+							<dayPeriod type="night1">yö</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">keskiyö</dayPeriod>
+							<dayPeriod type="am">ap.</dayPeriod>
+							<dayPeriod type="noon">keskipäivä</dayPeriod>
+							<dayPeriod type="pm">ip.</dayPeriod>
+							<dayPeriod type="morning1">aamu</dayPeriod>
+							<dayPeriod type="morning2">aamupäivä</dayPeriod>
+							<dayPeriod type="afternoon1">iltapäivä</dayPeriod>
+							<dayPeriod type="evening1">ilta</dayPeriod>
+							<dayPeriod type="night1">yö</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1961,7 +2040,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d.</dateFormatItem>
 						<dateFormatItem id="Ehm">E h.mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E H.mm</dateFormatItem>
@@ -1987,6 +2066,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">ccc d. MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
 						<dateFormatItem id="ms">m.ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">L.y</dateFormatItem>
@@ -2213,9 +2293,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</months>
 			</calendar>
 			<calendar type="japanese">
-				<!-- need some non-empty element here to make inheritance work,
-					 this copy of generic dateFormats above is smaller than root japanese eras
-				-->
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
@@ -2268,17 +2345,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>v</displayName>
+				<relative type="-1">viime v</relative>
+				<relative type="0">tänä v</relative>
+				<relative type="1">ensi v</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} vuoden päästä</relativeTimePattern>
-					<relativeTimePattern count="other">{0} vuoden päästä</relativeTimePattern>
+					<relativeTimePattern count="one">{0} v päästä</relativeTimePattern>
+					<relativeTimePattern count="other">{0} v päästä</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} vuotta sitten</relativeTimePattern>
-					<relativeTimePattern count="other">{0} vuotta sitten</relativeTimePattern>
+					<relativeTimePattern count="one">{0} v sitten</relativeTimePattern>
+					<relativeTimePattern count="other">{0} v sitten</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="year-narrow">
 				<displayName>v</displayName>
+				<relative type="-1">viime v</relative>
+				<relative type="0">tänä v</relative>
+				<relative type="1">ensi v</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} v päästä</relativeTimePattern>
 					<relativeTimePattern count="other">{0} v päästä</relativeTimePattern>
@@ -2290,6 +2373,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter">
 				<displayName>neljännesvuosi</displayName>
+				<relative type="-1">viime neljännesvuonna</relative>
+				<relative type="0">tänä neljännesvuonna</relative>
+				<relative type="1">ensi neljännesvuonna</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} neljännesvuoden päästä</relativeTimePattern>
 					<relativeTimePattern count="other">{0} neljännesvuoden päästä</relativeTimePattern>
@@ -2301,6 +2387,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>neljännes</displayName>
+				<relative type="-1">viime neljänneksenä</relative>
+				<relative type="0">tänä neljänneksenä</relative>
+				<relative type="1">ensi neljänneksenä</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} neljänneksen päästä</relativeTimePattern>
 					<relativeTimePattern count="other">{0} neljänneksen päästä</relativeTimePattern>
@@ -2312,6 +2401,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>nelj.</displayName>
+				<relative type="-1">viime nelj.</relative>
+				<relative type="0">tänä nelj.</relative>
+				<relative type="1">ensi nelj.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} nelj. päästä</relativeTimePattern>
 					<relativeTimePattern count="other">{0} nelj. päästä</relativeTimePattern>
@@ -2337,6 +2429,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>kk</displayName>
+				<relative type="-1">viime kk</relative>
+				<relative type="0">tässä kk</relative>
+				<relative type="1">ensi kk</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} kk päästä</relativeTimePattern>
 					<relativeTimePattern count="other">{0} kk päästä</relativeTimePattern>
@@ -2348,6 +2443,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>kk</displayName>
+				<relative type="-1">viime kk</relative>
+				<relative type="0">tässä kk</relative>
+				<relative type="1">ensi kk</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} kk päästä</relativeTimePattern>
 					<relativeTimePattern count="other">{0} kk päästä</relativeTimePattern>
@@ -2373,6 +2471,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>vk</displayName>
+				<relative type="-1">viime vk</relative>
+				<relative type="0">tällä vk</relative>
+				<relative type="1">ensi vk</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} vk päästä</relativeTimePattern>
 					<relativeTimePattern count="other">{0} vk päästä</relativeTimePattern>
@@ -2384,6 +2485,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>vk</displayName>
+				<relative type="-1">viime vk</relative>
+				<relative type="0">tällä vk</relative>
+				<relative type="1">ensi vk</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} vk päästä</relativeTimePattern>
 					<relativeTimePattern count="other">{0} vk päästä</relativeTimePattern>
@@ -2411,6 +2515,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>pv</displayName>
+				<relative type="-2">toissap.</relative>
+				<relative type="-1">eilen</relative>
+				<relative type="0">tänään</relative>
+				<relative type="1">huom.</relative>
+				<relative type="2">ylihuom.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} pv päästä</relativeTimePattern>
 					<relativeTimePattern count="other">{0} pv päästä</relativeTimePattern>
@@ -2422,6 +2531,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>pv</displayName>
+				<relative type="-2">toissap.</relative>
+				<relative type="-1">eilen</relative>
+				<relative type="0">tänään</relative>
+				<relative type="1">huom.</relative>
+				<relative type="2">ylihuom.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} pv päästä</relativeTimePattern>
 					<relativeTimePattern count="other">{0} pv päästä</relativeTimePattern>
@@ -2622,6 +2736,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="second-short">
 				<displayName>s</displayName>
+				<relative type="0">nyt</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} s päästä</relativeTimePattern>
 					<relativeTimePattern count="other">{0} s päästä</relativeTimePattern>
@@ -2633,6 +2748,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="second-narrow">
 				<displayName>s</displayName>
+				<relative type="0">nyt</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} s päästä</relativeTimePattern>
 					<relativeTimePattern count="other">{0} s päästä</relativeTimePattern>
@@ -2658,19 +2774,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>tuntematon</exemplarCity>
 			</zone>
 			<zone type="Europe/Andorra">
-				<exemplarCity draft="contributed">Andorra</exemplarCity>
+				<exemplarCity>Andorra</exemplarCity>
 			</zone>
 			<zone type="Asia/Dubai">
-				<exemplarCity draft="contributed">Dubai</exemplarCity>
+				<exemplarCity>Dubai</exemplarCity>
 			</zone>
 			<zone type="Asia/Kabul">
-				<exemplarCity draft="contributed">Kabul</exemplarCity>
+				<exemplarCity>Kabul</exemplarCity>
 			</zone>
 			<zone type="America/Antigua">
-				<exemplarCity draft="contributed">Antigua</exemplarCity>
+				<exemplarCity>Antigua</exemplarCity>
 			</zone>
 			<zone type="America/Anguilla">
-				<exemplarCity draft="contributed">Anguilla</exemplarCity>
+				<exemplarCity>Anguilla</exemplarCity>
 			</zone>
 			<zone type="Europe/Tirane">
 				<exemplarCity>Tirana</exemplarCity>
@@ -2679,64 +2795,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Jerevan</exemplarCity>
 			</zone>
 			<zone type="Africa/Luanda">
-				<exemplarCity draft="contributed">Luanda</exemplarCity>
+				<exemplarCity>Luanda</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Rothera">
-				<exemplarCity draft="contributed">Rothera</exemplarCity>
+				<exemplarCity>Rothera</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Palmer">
-				<exemplarCity draft="contributed">Palmer</exemplarCity>
+				<exemplarCity>Palmer</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Troll">
-				<exemplarCity draft="contributed">Troll</exemplarCity>
+				<exemplarCity>Troll</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Syowa">
-				<exemplarCity draft="contributed">Syowa</exemplarCity>
+				<exemplarCity>Syowa</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Mawson">
-				<exemplarCity draft="contributed">Mawson</exemplarCity>
+				<exemplarCity>Mawson</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Davis">
-				<exemplarCity draft="contributed">Davis</exemplarCity>
+				<exemplarCity>Davis</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Vostok">
-				<exemplarCity draft="contributed">Vostok</exemplarCity>
+				<exemplarCity>Vostok</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Casey">
-				<exemplarCity draft="contributed">Casey</exemplarCity>
+				<exemplarCity>Casey</exemplarCity>
 			</zone>
 			<zone type="Antarctica/DumontDUrville">
 				<exemplarCity>Dumont d’Urville</exemplarCity>
 			</zone>
 			<zone type="Antarctica/McMurdo">
-				<exemplarCity draft="contributed">McMurdo</exemplarCity>
+				<exemplarCity>McMurdo</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity draft="contributed">Rio Gallegos</exemplarCity>
+				<exemplarCity>Rio Gallegos</exemplarCity>
 			</zone>
 			<zone type="America/Mendoza">
-				<exemplarCity draft="contributed">Mendoza</exemplarCity>
+				<exemplarCity>Mendoza</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/San_Juan">
-				<exemplarCity draft="contributed">San Juan</exemplarCity>
+				<exemplarCity>San Juan</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity draft="contributed">Ushuaia</exemplarCity>
+				<exemplarCity>Ushuaia</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity draft="contributed">La Rioja</exemplarCity>
+				<exemplarCity>La Rioja</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/San_Luis">
-				<exemplarCity draft="contributed">San Luis</exemplarCity>
+				<exemplarCity>San Luis</exemplarCity>
 			</zone>
 			<zone type="America/Catamarca">
-				<exemplarCity draft="contributed">Catamarca</exemplarCity>
+				<exemplarCity>Catamarca</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Salta">
-				<exemplarCity draft="contributed">Salta</exemplarCity>
+				<exemplarCity>Salta</exemplarCity>
 			</zone>
 			<zone type="America/Jujuy">
-				<exemplarCity draft="contributed">Jujuy</exemplarCity>
+				<exemplarCity>Jujuy</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Tucuman">
 				<exemplarCity>Tucumán</exemplarCity>
@@ -2745,119 +2861,119 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Córdoba</exemplarCity>
 			</zone>
 			<zone type="America/Buenos_Aires">
-				<exemplarCity draft="contributed">Buenos Aires</exemplarCity>
+				<exemplarCity>Buenos Aires</exemplarCity>
 			</zone>
 			<zone type="Pacific/Pago_Pago">
-				<exemplarCity draft="contributed">Pago Pago</exemplarCity>
+				<exemplarCity>Pago Pago</exemplarCity>
 			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Wien</exemplarCity>
 			</zone>
 			<zone type="Australia/Perth">
-				<exemplarCity draft="contributed">Perth</exemplarCity>
+				<exemplarCity>Perth</exemplarCity>
 			</zone>
 			<zone type="Australia/Eucla">
-				<exemplarCity draft="contributed">Eucla</exemplarCity>
+				<exemplarCity>Eucla</exemplarCity>
 			</zone>
 			<zone type="Australia/Darwin">
-				<exemplarCity draft="contributed">Darwin</exemplarCity>
+				<exemplarCity>Darwin</exemplarCity>
 			</zone>
 			<zone type="Australia/Adelaide">
-				<exemplarCity draft="contributed">Adelaide</exemplarCity>
+				<exemplarCity>Adelaide</exemplarCity>
 			</zone>
 			<zone type="Australia/Broken_Hill">
-				<exemplarCity draft="contributed">Broken Hill</exemplarCity>
+				<exemplarCity>Broken Hill</exemplarCity>
 			</zone>
 			<zone type="Australia/Currie">
-				<exemplarCity draft="contributed">Currie</exemplarCity>
+				<exemplarCity>Currie</exemplarCity>
 			</zone>
 			<zone type="Australia/Melbourne">
-				<exemplarCity draft="contributed">Melbourne</exemplarCity>
+				<exemplarCity>Melbourne</exemplarCity>
 			</zone>
 			<zone type="Australia/Hobart">
-				<exemplarCity draft="contributed">Hobart</exemplarCity>
+				<exemplarCity>Hobart</exemplarCity>
 			</zone>
 			<zone type="Australia/Lindeman">
-				<exemplarCity draft="contributed">Lindeman</exemplarCity>
+				<exemplarCity>Lindeman</exemplarCity>
 			</zone>
 			<zone type="Australia/Sydney">
-				<exemplarCity draft="contributed">Sydney</exemplarCity>
+				<exemplarCity>Sydney</exemplarCity>
 			</zone>
 			<zone type="Australia/Brisbane">
-				<exemplarCity draft="contributed">Brisbane</exemplarCity>
+				<exemplarCity>Brisbane</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Macquarie">
 				<exemplarCity>Macquariensaari</exemplarCity>
 			</zone>
 			<zone type="Australia/Lord_Howe">
-				<exemplarCity draft="contributed">Lord Howe</exemplarCity>
+				<exemplarCity>Lord Howe</exemplarCity>
 			</zone>
 			<zone type="America/Aruba">
-				<exemplarCity draft="contributed">Aruba</exemplarCity>
+				<exemplarCity>Aruba</exemplarCity>
 			</zone>
 			<zone type="Europe/Mariehamn">
 				<exemplarCity>Maarianhamina</exemplarCity>
 				<exemplarCity alt="secondary">Mariehamn</exemplarCity>
 			</zone>
 			<zone type="Asia/Baku">
-				<exemplarCity draft="contributed">Baku</exemplarCity>
+				<exemplarCity>Baku</exemplarCity>
 			</zone>
 			<zone type="Europe/Sarajevo">
-				<exemplarCity draft="contributed">Sarajevo</exemplarCity>
+				<exemplarCity>Sarajevo</exemplarCity>
 			</zone>
 			<zone type="America/Barbados">
-				<exemplarCity draft="contributed">Barbados</exemplarCity>
+				<exemplarCity>Barbados</exemplarCity>
 			</zone>
 			<zone type="Asia/Dhaka">
-				<exemplarCity draft="contributed">Dhaka</exemplarCity>
+				<exemplarCity>Dhaka</exemplarCity>
 			</zone>
 			<zone type="Europe/Brussels">
 				<exemplarCity>Bryssel</exemplarCity>
 			</zone>
 			<zone type="Africa/Ouagadougou">
-				<exemplarCity draft="contributed">Ouagadougou</exemplarCity>
+				<exemplarCity>Ouagadougou</exemplarCity>
 			</zone>
 			<zone type="Europe/Sofia">
-				<exemplarCity draft="contributed">Sofia</exemplarCity>
+				<exemplarCity>Sofia</exemplarCity>
 			</zone>
 			<zone type="Asia/Bahrain">
-				<exemplarCity draft="contributed">Bahrain</exemplarCity>
+				<exemplarCity>Bahrain</exemplarCity>
 			</zone>
 			<zone type="Africa/Bujumbura">
-				<exemplarCity draft="contributed">Bujumbura</exemplarCity>
+				<exemplarCity>Bujumbura</exemplarCity>
 			</zone>
 			<zone type="Africa/Porto-Novo">
-				<exemplarCity draft="contributed">Porto-Novo</exemplarCity>
+				<exemplarCity>Porto-Novo</exemplarCity>
 			</zone>
 			<zone type="America/St_Barthelemy">
 				<exemplarCity>Saint-Barthélemy</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Bermuda">
-				<exemplarCity draft="contributed">Bermuda</exemplarCity>
+				<exemplarCity>Bermuda</exemplarCity>
 			</zone>
 			<zone type="Asia/Brunei">
-				<exemplarCity draft="contributed">Brunei</exemplarCity>
+				<exemplarCity>Brunei</exemplarCity>
 			</zone>
 			<zone type="America/La_Paz">
-				<exemplarCity draft="contributed">La Paz</exemplarCity>
+				<exemplarCity>La Paz</exemplarCity>
 			</zone>
 			<zone type="America/Kralendijk">
-				<exemplarCity draft="contributed">Kralendijk</exemplarCity>
+				<exemplarCity>Kralendijk</exemplarCity>
 			</zone>
 			<zone type="America/Eirunepe">
 				<exemplarCity>Eirunepé</exemplarCity>
 			</zone>
 			<zone type="America/Rio_Branco">
-				<exemplarCity draft="contributed">Rio Branco</exemplarCity>
+				<exemplarCity>Rio Branco</exemplarCity>
 			</zone>
 			<zone type="America/Porto_Velho">
-				<exemplarCity draft="contributed">Porto Velho</exemplarCity>
+				<exemplarCity>Porto Velho</exemplarCity>
 			</zone>
 			<zone type="America/Boa_Vista">
-				<exemplarCity draft="contributed">Boa Vista</exemplarCity>
+				<exemplarCity>Boa Vista</exemplarCity>
 			</zone>
 			<zone type="America/Manaus">
-				<exemplarCity draft="contributed">Manaus</exemplarCity>
+				<exemplarCity>Manaus</exemplarCity>
 			</zone>
 			<zone type="America/Cuiaba">
 				<exemplarCity>Cuiabá</exemplarCity>
@@ -2866,10 +2982,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Santarém</exemplarCity>
 			</zone>
 			<zone type="America/Campo_Grande">
-				<exemplarCity draft="contributed">Campo Grande</exemplarCity>
+				<exemplarCity>Campo Grande</exemplarCity>
 			</zone>
 			<zone type="America/Belem">
-				<exemplarCity draft="contributed">Belem</exemplarCity>
+				<exemplarCity>Belem</exemplarCity>
 			</zone>
 			<zone type="America/Araguaina">
 				<exemplarCity>Araguaína</exemplarCity>
@@ -2878,112 +2994,112 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>São Paulo</exemplarCity>
 			</zone>
 			<zone type="America/Bahia">
-				<exemplarCity draft="contributed">Bahia</exemplarCity>
+				<exemplarCity>Bahia</exemplarCity>
 			</zone>
 			<zone type="America/Fortaleza">
-				<exemplarCity draft="contributed">Fortaleza</exemplarCity>
+				<exemplarCity>Fortaleza</exemplarCity>
 			</zone>
 			<zone type="America/Maceio">
 				<exemplarCity>Maceió</exemplarCity>
 			</zone>
 			<zone type="America/Recife">
-				<exemplarCity draft="contributed">Recife</exemplarCity>
+				<exemplarCity>Recife</exemplarCity>
 			</zone>
 			<zone type="America/Noronha">
-				<exemplarCity draft="contributed">Noronha</exemplarCity>
+				<exemplarCity>Noronha</exemplarCity>
 			</zone>
 			<zone type="America/Nassau">
-				<exemplarCity draft="contributed">Nassau</exemplarCity>
+				<exemplarCity>Nassau</exemplarCity>
 			</zone>
 			<zone type="Asia/Thimphu">
-				<exemplarCity draft="contributed">Thimphu</exemplarCity>
+				<exemplarCity>Thimphu</exemplarCity>
 			</zone>
 			<zone type="Africa/Gaborone">
-				<exemplarCity draft="contributed">Gaborone</exemplarCity>
+				<exemplarCity>Gaborone</exemplarCity>
 			</zone>
 			<zone type="Europe/Minsk">
-				<exemplarCity draft="contributed">Minsk</exemplarCity>
+				<exemplarCity>Minsk</exemplarCity>
 			</zone>
 			<zone type="America/Belize">
-				<exemplarCity draft="contributed">Belize</exemplarCity>
+				<exemplarCity>Belize</exemplarCity>
 			</zone>
 			<zone type="America/Dawson">
-				<exemplarCity draft="contributed">Dawson</exemplarCity>
+				<exemplarCity>Dawson</exemplarCity>
 			</zone>
 			<zone type="America/Whitehorse">
-				<exemplarCity draft="contributed">Whitehorse</exemplarCity>
+				<exemplarCity>Whitehorse</exemplarCity>
 			</zone>
 			<zone type="America/Inuvik">
-				<exemplarCity draft="contributed">Inuvik</exemplarCity>
+				<exemplarCity>Inuvik</exemplarCity>
 			</zone>
 			<zone type="America/Vancouver">
-				<exemplarCity draft="contributed">Vancouver</exemplarCity>
+				<exemplarCity>Vancouver</exemplarCity>
 			</zone>
 			<zone type="America/Dawson_Creek">
-				<exemplarCity draft="contributed">Dawson Creek</exemplarCity>
+				<exemplarCity>Dawson Creek</exemplarCity>
 			</zone>
 			<zone type="America/Creston">
-				<exemplarCity draft="contributed">Creston</exemplarCity>
+				<exemplarCity>Creston</exemplarCity>
 			</zone>
 			<zone type="America/Yellowknife">
-				<exemplarCity draft="contributed">Yellowknife</exemplarCity>
+				<exemplarCity>Yellowknife</exemplarCity>
 			</zone>
 			<zone type="America/Edmonton">
-				<exemplarCity draft="contributed">Edmonton</exemplarCity>
+				<exemplarCity>Edmonton</exemplarCity>
 			</zone>
 			<zone type="America/Swift_Current">
-				<exemplarCity draft="contributed">Swift Current</exemplarCity>
+				<exemplarCity>Swift Current</exemplarCity>
 			</zone>
 			<zone type="America/Cambridge_Bay">
-				<exemplarCity draft="contributed">Cambridge Bay</exemplarCity>
+				<exemplarCity>Cambridge Bay</exemplarCity>
 			</zone>
 			<zone type="America/Regina">
-				<exemplarCity draft="contributed">Regina</exemplarCity>
+				<exemplarCity>Regina</exemplarCity>
 			</zone>
 			<zone type="America/Winnipeg">
-				<exemplarCity draft="contributed">Winnipeg</exemplarCity>
+				<exemplarCity>Winnipeg</exemplarCity>
 			</zone>
 			<zone type="America/Resolute">
-				<exemplarCity draft="contributed">Resolute</exemplarCity>
+				<exemplarCity>Resolute</exemplarCity>
 			</zone>
 			<zone type="America/Rainy_River">
-				<exemplarCity draft="contributed">Rainy River</exemplarCity>
+				<exemplarCity>Rainy River</exemplarCity>
 			</zone>
 			<zone type="America/Rankin_Inlet">
-				<exemplarCity draft="contributed">Rankin Inlet</exemplarCity>
+				<exemplarCity>Rankin Inlet</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>Atikokan</exemplarCity>
 			</zone>
 			<zone type="America/Thunder_Bay">
-				<exemplarCity draft="contributed">Thunder Bay</exemplarCity>
+				<exemplarCity>Thunder Bay</exemplarCity>
 			</zone>
 			<zone type="America/Nipigon">
-				<exemplarCity draft="contributed">Nipigon</exemplarCity>
+				<exemplarCity>Nipigon</exemplarCity>
 			</zone>
 			<zone type="America/Toronto">
-				<exemplarCity draft="contributed">Toronto</exemplarCity>
+				<exemplarCity>Toronto</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
-				<exemplarCity draft="contributed">Iqaluit</exemplarCity>
+				<exemplarCity>Iqaluit</exemplarCity>
 			</zone>
 			<zone type="America/Pangnirtung">
-				<exemplarCity draft="contributed">Pangnirtung</exemplarCity>
+				<exemplarCity>Pangnirtung</exemplarCity>
 			</zone>
 			<zone type="America/Moncton">
-				<exemplarCity draft="contributed">Moncton</exemplarCity>
+				<exemplarCity>Moncton</exemplarCity>
 			</zone>
 			<zone type="America/Halifax">
-				<exemplarCity draft="contributed">Halifax</exemplarCity>
+				<exemplarCity>Halifax</exemplarCity>
 			</zone>
 			<zone type="America/Goose_Bay">
-				<exemplarCity draft="contributed">Goose Bay</exemplarCity>
+				<exemplarCity>Goose Bay</exemplarCity>
 			</zone>
 			<zone type="America/Glace_Bay">
-				<exemplarCity draft="contributed">Glace Bay</exemplarCity>
+				<exemplarCity>Glace Bay</exemplarCity>
 			</zone>
 			<zone type="America/Blanc-Sablon">
-				<exemplarCity draft="contributed">Blanc-Sablon</exemplarCity>
+				<exemplarCity>Blanc-Sablon</exemplarCity>
 			</zone>
 			<zone type="America/St_Johns">
 				<exemplarCity>St. John’s</exemplarCity>
@@ -2992,25 +3108,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Kookossaaret</exemplarCity>
 			</zone>
 			<zone type="Africa/Kinshasa">
-				<exemplarCity draft="contributed">Kinshasa</exemplarCity>
+				<exemplarCity>Kinshasa</exemplarCity>
 			</zone>
 			<zone type="Africa/Lubumbashi">
-				<exemplarCity draft="contributed">Lubumbashi</exemplarCity>
+				<exemplarCity>Lubumbashi</exemplarCity>
 			</zone>
 			<zone type="Africa/Bangui">
-				<exemplarCity draft="contributed">Bangui</exemplarCity>
+				<exemplarCity>Bangui</exemplarCity>
 			</zone>
 			<zone type="Africa/Brazzaville">
-				<exemplarCity draft="contributed">Brazzaville</exemplarCity>
+				<exemplarCity>Brazzaville</exemplarCity>
 			</zone>
 			<zone type="Europe/Zurich">
 				<exemplarCity>Zürich</exemplarCity>
 			</zone>
 			<zone type="Africa/Abidjan">
-				<exemplarCity draft="contributed">Abidjan</exemplarCity>
+				<exemplarCity>Abidjan</exemplarCity>
 			</zone>
 			<zone type="Pacific/Rarotonga">
-				<exemplarCity draft="contributed">Rarotonga</exemplarCity>
+				<exemplarCity>Rarotonga</exemplarCity>
 			</zone>
 			<zone type="Pacific/Easter">
 				<exemplarCity>Pääsiäissaari</exemplarCity>
@@ -3019,19 +3135,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Santiago de Chile</exemplarCity>
 			</zone>
 			<zone type="Africa/Douala">
-				<exemplarCity draft="contributed">Douala</exemplarCity>
+				<exemplarCity>Douala</exemplarCity>
 			</zone>
 			<zone type="Asia/Urumqi">
 				<exemplarCity>Ürümqi</exemplarCity>
 			</zone>
 			<zone type="Asia/Shanghai">
-				<exemplarCity draft="contributed">Shanghai</exemplarCity>
+				<exemplarCity>Shanghai</exemplarCity>
 			</zone>
 			<zone type="America/Bogota">
 				<exemplarCity>Bogotá</exemplarCity>
 			</zone>
 			<zone type="America/Costa_Rica">
-				<exemplarCity draft="contributed">Costa Rica</exemplarCity>
+				<exemplarCity>Costa Rica</exemplarCity>
 			</zone>
 			<zone type="America/Havana">
 				<exemplarCity>Havanna</exemplarCity>
@@ -3052,22 +3168,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Praha</exemplarCity>
 			</zone>
 			<zone type="Europe/Busingen">
-				<exemplarCity draft="contributed">Busingen</exemplarCity>
+				<exemplarCity>Busingen</exemplarCity>
 			</zone>
 			<zone type="Europe/Berlin">
 				<exemplarCity>Berliini</exemplarCity>
 			</zone>
 			<zone type="Africa/Djibouti">
-				<exemplarCity draft="contributed">Djibouti</exemplarCity>
+				<exemplarCity>Djibouti</exemplarCity>
 			</zone>
 			<zone type="Europe/Copenhagen">
 				<exemplarCity>Kööpenhamina</exemplarCity>
 			</zone>
 			<zone type="America/Dominica">
-				<exemplarCity draft="contributed">Dominica</exemplarCity>
+				<exemplarCity>Dominica</exemplarCity>
 			</zone>
 			<zone type="America/Santo_Domingo">
-				<exemplarCity draft="contributed">Santo Domingo</exemplarCity>
+				<exemplarCity>Santo Domingo</exemplarCity>
 			</zone>
 			<zone type="Africa/Algiers">
 				<exemplarCity>Alger</exemplarCity>
@@ -3076,7 +3192,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Galapagos</exemplarCity>
 			</zone>
 			<zone type="America/Guayaquil">
-				<exemplarCity draft="contributed">Guayaquil</exemplarCity>
+				<exemplarCity>Guayaquil</exemplarCity>
 			</zone>
 			<zone type="Europe/Tallinn">
 				<exemplarCity>Tallinna</exemplarCity>
@@ -3094,22 +3210,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Kanariansaaret</exemplarCity>
 			</zone>
 			<zone type="Africa/Ceuta">
-				<exemplarCity draft="contributed">Ceuta</exemplarCity>
+				<exemplarCity>Ceuta</exemplarCity>
 			</zone>
 			<zone type="Europe/Madrid">
-				<exemplarCity draft="contributed">Madrid</exemplarCity>
+				<exemplarCity>Madrid</exemplarCity>
 			</zone>
 			<zone type="Africa/Addis_Ababa">
 				<exemplarCity>Addis Abeba</exemplarCity>
 			</zone>
 			<zone type="Europe/Helsinki">
-				<exemplarCity draft="contributed">Helsinki</exemplarCity>
+				<exemplarCity>Helsinki</exemplarCity>
 			</zone>
 			<zone type="Pacific/Fiji">
 				<exemplarCity>Fidži</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Stanley">
-				<exemplarCity draft="contributed">Stanley</exemplarCity>
+				<exemplarCity>Stanley</exemplarCity>
 			</zone>
 			<zone type="Pacific/Truk">
 				<exemplarCity>Chuuk</exemplarCity>
@@ -3118,7 +3234,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Pohnpei</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kosrae">
-				<exemplarCity draft="contributed">Kosrae</exemplarCity>
+				<exemplarCity>Kosrae</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Faeroe">
 				<exemplarCity>Färsaaret</exemplarCity>
@@ -3127,7 +3243,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Pariisi</exemplarCity>
 			</zone>
 			<zone type="Africa/Libreville">
-				<exemplarCity draft="contributed">Libreville</exemplarCity>
+				<exemplarCity>Libreville</exemplarCity>
 			</zone>
 			<zone type="Europe/London">
 				<long>
@@ -3136,25 +3252,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Lontoo</exemplarCity>
 			</zone>
 			<zone type="America/Grenada">
-				<exemplarCity draft="contributed">Grenada</exemplarCity>
+				<exemplarCity>Grenada</exemplarCity>
 			</zone>
 			<zone type="Asia/Tbilisi">
-				<exemplarCity draft="contributed">Tbilisi</exemplarCity>
+				<exemplarCity>Tbilisi</exemplarCity>
 			</zone>
 			<zone type="America/Cayenne">
-				<exemplarCity draft="contributed">Cayenne</exemplarCity>
+				<exemplarCity>Cayenne</exemplarCity>
 			</zone>
 			<zone type="Europe/Guernsey">
-				<exemplarCity draft="contributed">Guernsey</exemplarCity>
+				<exemplarCity>Guernsey</exemplarCity>
 			</zone>
 			<zone type="Africa/Accra">
-				<exemplarCity draft="contributed">Accra</exemplarCity>
+				<exemplarCity>Accra</exemplarCity>
 			</zone>
 			<zone type="Europe/Gibraltar">
-				<exemplarCity draft="contributed">Gibraltar</exemplarCity>
+				<exemplarCity>Gibraltar</exemplarCity>
 			</zone>
 			<zone type="America/Thule">
-				<exemplarCity draft="contributed">Thule</exemplarCity>
+				<exemplarCity>Thule</exemplarCity>
 				<exemplarCity alt="secondary">Qaanaaq</exemplarCity>
 			</zone>
 			<zone type="America/Godthab">
@@ -3166,19 +3282,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity alt="secondary">Scoresbysund</exemplarCity>
 			</zone>
 			<zone type="America/Danmarkshavn">
-				<exemplarCity draft="contributed">Danmarkshavn</exemplarCity>
+				<exemplarCity>Danmarkshavn</exemplarCity>
 			</zone>
 			<zone type="Africa/Banjul">
-				<exemplarCity draft="contributed">Banjul</exemplarCity>
+				<exemplarCity>Banjul</exemplarCity>
 			</zone>
 			<zone type="Africa/Conakry">
-				<exemplarCity draft="contributed">Conakry</exemplarCity>
+				<exemplarCity>Conakry</exemplarCity>
 			</zone>
 			<zone type="America/Guadeloupe">
-				<exemplarCity draft="contributed">Guadeloupe</exemplarCity>
+				<exemplarCity>Guadeloupe</exemplarCity>
 			</zone>
 			<zone type="Africa/Malabo">
-				<exemplarCity draft="contributed">Malabo</exemplarCity>
+				<exemplarCity>Malabo</exemplarCity>
 			</zone>
 			<zone type="Europe/Athens">
 				<exemplarCity>Ateena</exemplarCity>
@@ -3187,52 +3303,52 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Etelä-Georgia</exemplarCity>
 			</zone>
 			<zone type="America/Guatemala">
-				<exemplarCity draft="contributed">Guatemala</exemplarCity>
+				<exemplarCity>Guatemala</exemplarCity>
 			</zone>
 			<zone type="Pacific/Guam">
-				<exemplarCity draft="contributed">Guam</exemplarCity>
+				<exemplarCity>Guam</exemplarCity>
 			</zone>
 			<zone type="Africa/Bissau">
-				<exemplarCity draft="contributed">Bissau</exemplarCity>
+				<exemplarCity>Bissau</exemplarCity>
 			</zone>
 			<zone type="America/Guyana">
-				<exemplarCity draft="contributed">Guyana</exemplarCity>
+				<exemplarCity>Guyana</exemplarCity>
 			</zone>
 			<zone type="Asia/Hong_Kong">
 				<exemplarCity>Hongkong</exemplarCity>
 			</zone>
 			<zone type="America/Tegucigalpa">
-				<exemplarCity draft="contributed">Tegucigalpa</exemplarCity>
+				<exemplarCity>Tegucigalpa</exemplarCity>
 			</zone>
 			<zone type="Europe/Zagreb">
-				<exemplarCity draft="contributed">Zagreb</exemplarCity>
+				<exemplarCity>Zagreb</exemplarCity>
 			</zone>
 			<zone type="America/Port-au-Prince">
-				<exemplarCity draft="contributed">Port-au-Prince</exemplarCity>
+				<exemplarCity>Port-au-Prince</exemplarCity>
 			</zone>
 			<zone type="Europe/Budapest">
-				<exemplarCity draft="contributed">Budapest</exemplarCity>
+				<exemplarCity>Budapest</exemplarCity>
 			</zone>
 			<zone type="Asia/Jakarta">
-				<exemplarCity draft="contributed">Jakarta</exemplarCity>
+				<exemplarCity>Jakarta</exemplarCity>
 			</zone>
 			<zone type="Asia/Pontianak">
-				<exemplarCity draft="contributed">Pontianak</exemplarCity>
+				<exemplarCity>Pontianak</exemplarCity>
 			</zone>
 			<zone type="Asia/Makassar">
-				<exemplarCity draft="contributed">Makassar</exemplarCity>
+				<exemplarCity>Makassar</exemplarCity>
 			</zone>
 			<zone type="Asia/Jayapura">
-				<exemplarCity draft="contributed">Jayapura</exemplarCity>
+				<exemplarCity>Jayapura</exemplarCity>
 			</zone>
 			<zone type="Europe/Dublin">
 				<long>
 					<daylight>Irlannin kesäaika</daylight>
 				</long>
-				<exemplarCity draft="contributed">Dublin</exemplarCity>
+				<exemplarCity>Dublin</exemplarCity>
 			</zone>
 			<zone type="Asia/Jerusalem">
-				<exemplarCity draft="contributed">Jerusalem</exemplarCity>
+				<exemplarCity>Jerusalem</exemplarCity>
 			</zone>
 			<zone type="Europe/Isle_of_Man">
 				<exemplarCity>Mansaari</exemplarCity>
@@ -3241,7 +3357,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Kalkutta</exemplarCity>
 			</zone>
 			<zone type="Indian/Chagos">
-				<exemplarCity draft="contributed">Chagos</exemplarCity>
+				<exemplarCity>Chagos</exemplarCity>
 			</zone>
 			<zone type="Asia/Baghdad">
 				<exemplarCity>Bagdad</exemplarCity>
@@ -3256,34 +3372,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Rooma</exemplarCity>
 			</zone>
 			<zone type="Europe/Jersey">
-				<exemplarCity draft="contributed">Jersey</exemplarCity>
+				<exemplarCity>Jersey</exemplarCity>
 			</zone>
 			<zone type="America/Jamaica">
 				<exemplarCity>Jamaika</exemplarCity>
 			</zone>
 			<zone type="Asia/Amman">
-				<exemplarCity draft="contributed">Amman</exemplarCity>
+				<exemplarCity>Amman</exemplarCity>
 			</zone>
 			<zone type="Asia/Tokyo">
 				<exemplarCity>Tokio</exemplarCity>
 			</zone>
 			<zone type="Africa/Nairobi">
-				<exemplarCity draft="contributed">Nairobi</exemplarCity>
+				<exemplarCity>Nairobi</exemplarCity>
 			</zone>
 			<zone type="Asia/Bishkek">
 				<exemplarCity>Biškek</exemplarCity>
 			</zone>
 			<zone type="Asia/Phnom_Penh">
-				<exemplarCity draft="contributed">Phnom Penh</exemplarCity>
+				<exemplarCity>Phnom Penh</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity draft="contributed">Enderbury</exemplarCity>
+				<exemplarCity>Enderbury</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
-				<exemplarCity draft="contributed">Kiritimati</exemplarCity>
+				<exemplarCity>Kiritimati</exemplarCity>
 			</zone>
 			<zone type="Pacific/Tarawa">
-				<exemplarCity draft="contributed">Tarawa</exemplarCity>
+				<exemplarCity>Tarawa</exemplarCity>
 			</zone>
 			<zone type="Indian/Comoro">
 				<exemplarCity>Komorit</exemplarCity>
@@ -3298,10 +3414,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Soul</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuwait">
-				<exemplarCity draft="contributed">Kuwait</exemplarCity>
+				<exemplarCity>Kuwait</exemplarCity>
 			</zone>
 			<zone type="America/Cayman">
-				<exemplarCity draft="contributed">Cayman</exemplarCity>
+				<exemplarCity>Cayman</exemplarCity>
 			</zone>
 			<zone type="Asia/Aqtau">
 				<exemplarCity>Aqtaw</exemplarCity>
@@ -3316,28 +3432,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Qızılorda</exemplarCity>
 			</zone>
 			<zone type="Asia/Almaty">
-				<exemplarCity draft="contributed">Almaty</exemplarCity>
+				<exemplarCity>Almaty</exemplarCity>
 			</zone>
 			<zone type="Asia/Vientiane">
-				<exemplarCity draft="contributed">Vientiane</exemplarCity>
+				<exemplarCity>Vientiane</exemplarCity>
 			</zone>
 			<zone type="Asia/Beirut">
-				<exemplarCity draft="contributed">Beirut</exemplarCity>
+				<exemplarCity>Beirut</exemplarCity>
 			</zone>
 			<zone type="America/St_Lucia">
 				<exemplarCity>Saint Lucia</exemplarCity>
 			</zone>
 			<zone type="Europe/Vaduz">
-				<exemplarCity draft="contributed">Vaduz</exemplarCity>
+				<exemplarCity>Vaduz</exemplarCity>
 			</zone>
 			<zone type="Asia/Colombo">
-				<exemplarCity draft="contributed">Colombo</exemplarCity>
+				<exemplarCity>Colombo</exemplarCity>
 			</zone>
 			<zone type="Africa/Monrovia">
-				<exemplarCity draft="contributed">Monrovia</exemplarCity>
+				<exemplarCity>Monrovia</exemplarCity>
 			</zone>
 			<zone type="Africa/Maseru">
-				<exemplarCity draft="contributed">Maseru</exemplarCity>
+				<exemplarCity>Maseru</exemplarCity>
 			</zone>
 			<zone type="Europe/Vilnius">
 				<exemplarCity>Vilna</exemplarCity>
@@ -3349,43 +3465,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Riika</exemplarCity>
 			</zone>
 			<zone type="Africa/Tripoli">
-				<exemplarCity draft="contributed">Tripoli</exemplarCity>
+				<exemplarCity>Tripoli</exemplarCity>
 			</zone>
 			<zone type="Africa/Casablanca">
-				<exemplarCity draft="contributed">Casablanca</exemplarCity>
+				<exemplarCity>Casablanca</exemplarCity>
 			</zone>
 			<zone type="Europe/Monaco">
-				<exemplarCity draft="contributed">Monaco</exemplarCity>
+				<exemplarCity>Monaco</exemplarCity>
 			</zone>
 			<zone type="Europe/Chisinau">
 				<exemplarCity>Chişinău</exemplarCity>
 			</zone>
 			<zone type="Europe/Podgorica">
-				<exemplarCity draft="contributed">Podgorica</exemplarCity>
+				<exemplarCity>Podgorica</exemplarCity>
 			</zone>
 			<zone type="America/Marigot">
-				<exemplarCity draft="contributed">Marigot</exemplarCity>
+				<exemplarCity>Marigot</exemplarCity>
 			</zone>
 			<zone type="Indian/Antananarivo">
-				<exemplarCity draft="contributed">Antananarivo</exemplarCity>
+				<exemplarCity>Antananarivo</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kwajalein">
-				<exemplarCity draft="contributed">Kwajalein</exemplarCity>
+				<exemplarCity>Kwajalein</exemplarCity>
 			</zone>
 			<zone type="Pacific/Majuro">
-				<exemplarCity draft="contributed">Majuro</exemplarCity>
+				<exemplarCity>Majuro</exemplarCity>
 			</zone>
 			<zone type="Europe/Skopje">
-				<exemplarCity draft="contributed">Skopje</exemplarCity>
+				<exemplarCity>Skopje</exemplarCity>
 			</zone>
 			<zone type="Africa/Bamako">
-				<exemplarCity draft="contributed">Bamako</exemplarCity>
+				<exemplarCity>Bamako</exemplarCity>
 			</zone>
 			<zone type="Asia/Rangoon">
 				<exemplarCity>Yangon</exemplarCity>
 			</zone>
 			<zone type="Asia/Hovd">
-				<exemplarCity draft="contributed">Hovd</exemplarCity>
+				<exemplarCity>Hovd</exemplarCity>
 			</zone>
 			<zone type="Asia/Ulaanbaatar">
 				<exemplarCity>Ulan Bator</exemplarCity>
@@ -3397,58 +3513,58 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Macao</exemplarCity>
 			</zone>
 			<zone type="Pacific/Saipan">
-				<exemplarCity draft="contributed">Saipan</exemplarCity>
+				<exemplarCity>Saipan</exemplarCity>
 			</zone>
 			<zone type="America/Martinique">
-				<exemplarCity draft="contributed">Martinique</exemplarCity>
+				<exemplarCity>Martinique</exemplarCity>
 			</zone>
 			<zone type="Africa/Nouakchott">
-				<exemplarCity draft="contributed">Nouakchott</exemplarCity>
+				<exemplarCity>Nouakchott</exemplarCity>
 			</zone>
 			<zone type="America/Montserrat">
-				<exemplarCity draft="contributed">Montserrat</exemplarCity>
+				<exemplarCity>Montserrat</exemplarCity>
 			</zone>
 			<zone type="Europe/Malta">
-				<exemplarCity draft="contributed">Malta</exemplarCity>
+				<exemplarCity>Malta</exemplarCity>
 			</zone>
 			<zone type="Indian/Mauritius">
-				<exemplarCity draft="contributed">Mauritius</exemplarCity>
+				<exemplarCity>Mauritius</exemplarCity>
 			</zone>
 			<zone type="Indian/Maldives">
 				<exemplarCity>Malediivit</exemplarCity>
 			</zone>
 			<zone type="Africa/Blantyre">
-				<exemplarCity draft="contributed">Blantyre</exemplarCity>
+				<exemplarCity>Blantyre</exemplarCity>
 			</zone>
 			<zone type="America/Tijuana">
-				<exemplarCity draft="contributed">Tijuana</exemplarCity>
+				<exemplarCity>Tijuana</exemplarCity>
 			</zone>
 			<zone type="America/Santa_Isabel">
-				<exemplarCity draft="contributed">Santa Isabel</exemplarCity>
+				<exemplarCity>Santa Isabel</exemplarCity>
 			</zone>
 			<zone type="America/Hermosillo">
-				<exemplarCity draft="contributed">Hermosillo</exemplarCity>
+				<exemplarCity>Hermosillo</exemplarCity>
 			</zone>
 			<zone type="America/Mazatlan">
 				<exemplarCity>Mazatlán</exemplarCity>
 			</zone>
 			<zone type="America/Chihuahua">
-				<exemplarCity draft="contributed">Chihuahua</exemplarCity>
+				<exemplarCity>Chihuahua</exemplarCity>
 			</zone>
 			<zone type="America/Bahia_Banderas">
 				<exemplarCity>Bahía de Banderas</exemplarCity>
 			</zone>
 			<zone type="America/Ojinaga">
-				<exemplarCity draft="contributed">Ojinaga</exemplarCity>
+				<exemplarCity>Ojinaga</exemplarCity>
 			</zone>
 			<zone type="America/Monterrey">
-				<exemplarCity draft="contributed">Monterrey</exemplarCity>
+				<exemplarCity>Monterrey</exemplarCity>
 			</zone>
 			<zone type="America/Mexico_City">
 				<exemplarCity>Ciudad de México</exemplarCity>
 			</zone>
 			<zone type="America/Matamoros">
-				<exemplarCity draft="contributed">Matamoros</exemplarCity>
+				<exemplarCity>Matamoros</exemplarCity>
 			</zone>
 			<zone type="America/Merida">
 				<exemplarCity>Mérida</exemplarCity>
@@ -3457,64 +3573,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Cancún</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuala_Lumpur">
-				<exemplarCity draft="contributed">Kuala Lumpur</exemplarCity>
+				<exemplarCity>Kuala Lumpur</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuching">
-				<exemplarCity draft="contributed">Kuching</exemplarCity>
+				<exemplarCity>Kuching</exemplarCity>
 			</zone>
 			<zone type="Africa/Maputo">
-				<exemplarCity draft="contributed">Maputo</exemplarCity>
+				<exemplarCity>Maputo</exemplarCity>
 			</zone>
 			<zone type="Africa/Windhoek">
-				<exemplarCity draft="contributed">Windhoek</exemplarCity>
+				<exemplarCity>Windhoek</exemplarCity>
 			</zone>
 			<zone type="Pacific/Noumea">
 				<exemplarCity>Nouméa</exemplarCity>
 			</zone>
 			<zone type="Africa/Niamey">
-				<exemplarCity draft="contributed">Niamey</exemplarCity>
+				<exemplarCity>Niamey</exemplarCity>
 			</zone>
 			<zone type="Pacific/Norfolk">
-				<exemplarCity draft="contributed">Norfolk</exemplarCity>
+				<exemplarCity>Norfolk</exemplarCity>
 			</zone>
 			<zone type="Africa/Lagos">
-				<exemplarCity draft="contributed">Lagos</exemplarCity>
+				<exemplarCity>Lagos</exemplarCity>
 			</zone>
 			<zone type="America/Managua">
-				<exemplarCity draft="contributed">Managua</exemplarCity>
+				<exemplarCity>Managua</exemplarCity>
 			</zone>
 			<zone type="Europe/Amsterdam">
-				<exemplarCity draft="contributed">Amsterdam</exemplarCity>
+				<exemplarCity>Amsterdam</exemplarCity>
 			</zone>
 			<zone type="Europe/Oslo">
-				<exemplarCity draft="contributed">Oslo</exemplarCity>
+				<exemplarCity>Oslo</exemplarCity>
 			</zone>
 			<zone type="Asia/Katmandu">
 				<exemplarCity>Kathmandu</exemplarCity>
 			</zone>
 			<zone type="Pacific/Nauru">
-				<exemplarCity draft="contributed">Nauru</exemplarCity>
+				<exemplarCity>Nauru</exemplarCity>
 			</zone>
 			<zone type="Pacific/Niue">
-				<exemplarCity draft="contributed">Niue</exemplarCity>
+				<exemplarCity>Niue</exemplarCity>
 			</zone>
 			<zone type="Pacific/Chatham">
 				<exemplarCity>Chathamsaaret</exemplarCity>
 			</zone>
 			<zone type="Pacific/Auckland">
-				<exemplarCity draft="contributed">Auckland</exemplarCity>
+				<exemplarCity>Auckland</exemplarCity>
 			</zone>
 			<zone type="Asia/Muscat">
-				<exemplarCity draft="contributed">Muscat</exemplarCity>
+				<exemplarCity>Muscat</exemplarCity>
 			</zone>
 			<zone type="America/Panama">
-				<exemplarCity draft="contributed">Panama</exemplarCity>
+				<exemplarCity>Panama</exemplarCity>
 			</zone>
 			<zone type="America/Lima">
-				<exemplarCity draft="contributed">Lima</exemplarCity>
+				<exemplarCity>Lima</exemplarCity>
 			</zone>
 			<zone type="Pacific/Tahiti">
-				<exemplarCity draft="contributed">Tahiti</exemplarCity>
+				<exemplarCity>Tahiti</exemplarCity>
 			</zone>
 			<zone type="Pacific/Marquesas">
 				<exemplarCity>Marquesassaaret</exemplarCity>
@@ -3523,49 +3639,52 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Gambiersaaret</exemplarCity>
 			</zone>
 			<zone type="Pacific/Port_Moresby">
-				<exemplarCity draft="contributed">Port Moresby</exemplarCity>
+				<exemplarCity>Port Moresby</exemplarCity>
+			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bougainville</exemplarCity>
 			</zone>
 			<zone type="Asia/Manila">
-				<exemplarCity draft="contributed">Manila</exemplarCity>
+				<exemplarCity>Manila</exemplarCity>
 			</zone>
 			<zone type="Asia/Karachi">
-				<exemplarCity draft="contributed">Karachi</exemplarCity>
+				<exemplarCity>Karachi</exemplarCity>
 			</zone>
 			<zone type="Europe/Warsaw">
 				<exemplarCity>Varsova</exemplarCity>
 			</zone>
 			<zone type="America/Miquelon">
-				<exemplarCity draft="contributed">Miquelon</exemplarCity>
+				<exemplarCity>Miquelon</exemplarCity>
 			</zone>
 			<zone type="Pacific/Pitcairn">
-				<exemplarCity draft="contributed">Pitcairn</exemplarCity>
+				<exemplarCity>Pitcairn</exemplarCity>
 			</zone>
 			<zone type="America/Puerto_Rico">
-				<exemplarCity draft="contributed">Puerto Rico</exemplarCity>
+				<exemplarCity>Puerto Rico</exemplarCity>
 			</zone>
 			<zone type="Asia/Gaza">
-				<exemplarCity draft="contributed">Gaza</exemplarCity>
+				<exemplarCity>Gaza</exemplarCity>
 			</zone>
 			<zone type="Asia/Hebron">
-				<exemplarCity draft="contributed">Hebron</exemplarCity>
+				<exemplarCity>Hebron</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Azores">
 				<exemplarCity>Azorit</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Madeira">
-				<exemplarCity draft="contributed">Madeira</exemplarCity>
+				<exemplarCity>Madeira</exemplarCity>
 			</zone>
 			<zone type="Europe/Lisbon">
 				<exemplarCity>Lissabon</exemplarCity>
 			</zone>
 			<zone type="Pacific/Palau">
-				<exemplarCity draft="contributed">Palau</exemplarCity>
+				<exemplarCity>Palau</exemplarCity>
 			</zone>
 			<zone type="America/Asuncion">
 				<exemplarCity>Asunción</exemplarCity>
 			</zone>
 			<zone type="Asia/Qatar">
-				<exemplarCity draft="contributed">Qatar</exemplarCity>
+				<exemplarCity>Qatar</exemplarCity>
 			</zone>
 			<zone type="Indian/Reunion">
 				<exemplarCity>Réunion</exemplarCity>
@@ -3577,43 +3696,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Belgrad</exemplarCity>
 			</zone>
 			<zone type="Europe/Kaliningrad">
-				<exemplarCity draft="contributed">Kaliningrad</exemplarCity>
+				<exemplarCity>Kaliningrad</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
-				<exemplarCity draft="contributed">Simferopol</exemplarCity>
+				<exemplarCity>Simferopol</exemplarCity>
 			</zone>
 			<zone type="Europe/Moscow">
 				<exemplarCity>Moskova</exemplarCity>
 			</zone>
 			<zone type="Europe/Volgograd">
-				<exemplarCity draft="contributed">Volgograd</exemplarCity>
+				<exemplarCity>Volgograd</exemplarCity>
 			</zone>
 			<zone type="Europe/Samara">
-				<exemplarCity draft="contributed">Samara</exemplarCity>
+				<exemplarCity>Samara</exemplarCity>
 			</zone>
 			<zone type="Asia/Yekaterinburg">
 				<exemplarCity>Jekaterinburg</exemplarCity>
 			</zone>
 			<zone type="Asia/Omsk">
-				<exemplarCity draft="contributed">Omsk</exemplarCity>
+				<exemplarCity>Omsk</exemplarCity>
 			</zone>
 			<zone type="Asia/Novosibirsk">
-				<exemplarCity draft="contributed">Novosibirsk</exemplarCity>
+				<exemplarCity>Novosibirsk</exemplarCity>
 			</zone>
 			<zone type="Asia/Novokuznetsk">
-				<exemplarCity draft="contributed">Novokuznetsk</exemplarCity>
+				<exemplarCity>Novokuznetsk</exemplarCity>
 			</zone>
 			<zone type="Asia/Krasnoyarsk">
 				<exemplarCity>Krasnojarsk</exemplarCity>
 			</zone>
 			<zone type="Asia/Irkutsk">
-				<exemplarCity draft="contributed">Irkutsk</exemplarCity>
+				<exemplarCity>Irkutsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Tšita</exemplarCity>
 			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Jakutsk</exemplarCity>
 			</zone>
 			<zone type="Asia/Vladivostok">
-				<exemplarCity draft="contributed">Vladivostok</exemplarCity>
+				<exemplarCity>Vladivostok</exemplarCity>
 			</zone>
 			<zone type="Asia/Khandyga">
 				<exemplarCity>Handyga</exemplarCity>
@@ -3622,25 +3744,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Sahalin</exemplarCity>
 			</zone>
 			<zone type="Asia/Ust-Nera">
-				<exemplarCity draft="contributed">Ust-Nera</exemplarCity>
+				<exemplarCity>Ust-Nera</exemplarCity>
 			</zone>
 			<zone type="Asia/Magadan">
-				<exemplarCity draft="contributed">Magadan</exemplarCity>
+				<exemplarCity>Magadan</exemplarCity>
+			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolymsk</exemplarCity>
 			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamtšatka</exemplarCity>
 			</zone>
 			<zone type="Asia/Anadyr">
-				<exemplarCity draft="contributed">Anadyr</exemplarCity>
+				<exemplarCity>Anadyr</exemplarCity>
 			</zone>
 			<zone type="Africa/Kigali">
-				<exemplarCity draft="contributed">Kigali</exemplarCity>
+				<exemplarCity>Kigali</exemplarCity>
 			</zone>
 			<zone type="Asia/Riyadh">
 				<exemplarCity>Riad</exemplarCity>
 			</zone>
 			<zone type="Pacific/Guadalcanal">
-				<exemplarCity draft="contributed">Guadalcanal</exemplarCity>
+				<exemplarCity>Guadalcanal</exemplarCity>
 			</zone>
 			<zone type="Indian/Mahe">
 				<exemplarCity>Mahé</exemplarCity>
@@ -3652,43 +3777,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Tukholma</exemplarCity>
 			</zone>
 			<zone type="Asia/Singapore">
-				<exemplarCity draft="contributed">Singapore</exemplarCity>
+				<exemplarCity>Singapore</exemplarCity>
 			</zone>
 			<zone type="Atlantic/St_Helena">
 				<exemplarCity>Saint Helena</exemplarCity>
 			</zone>
 			<zone type="Europe/Ljubljana">
-				<exemplarCity draft="contributed">Ljubljana</exemplarCity>
+				<exemplarCity>Ljubljana</exemplarCity>
 			</zone>
 			<zone type="Arctic/Longyearbyen">
-				<exemplarCity draft="contributed">Longyearbyen</exemplarCity>
+				<exemplarCity>Longyearbyen</exemplarCity>
 			</zone>
 			<zone type="Europe/Bratislava">
-				<exemplarCity draft="contributed">Bratislava</exemplarCity>
+				<exemplarCity>Bratislava</exemplarCity>
 			</zone>
 			<zone type="Africa/Freetown">
-				<exemplarCity draft="contributed">Freetown</exemplarCity>
+				<exemplarCity>Freetown</exemplarCity>
 			</zone>
 			<zone type="Europe/San_Marino">
-				<exemplarCity draft="contributed">San Marino</exemplarCity>
+				<exemplarCity>San Marino</exemplarCity>
 			</zone>
 			<zone type="Africa/Dakar">
-				<exemplarCity draft="contributed">Dakar</exemplarCity>
+				<exemplarCity>Dakar</exemplarCity>
 			</zone>
 			<zone type="Africa/Mogadishu">
-				<exemplarCity draft="contributed">Mogadishu</exemplarCity>
+				<exemplarCity>Mogadishu</exemplarCity>
 			</zone>
 			<zone type="America/Paramaribo">
-				<exemplarCity draft="contributed">Paramaribo</exemplarCity>
+				<exemplarCity>Paramaribo</exemplarCity>
 			</zone>
 			<zone type="Africa/Juba">
-				<exemplarCity draft="contributed">Juba</exemplarCity>
+				<exemplarCity>Juba</exemplarCity>
 			</zone>
 			<zone type="Africa/Sao_Tome">
 				<exemplarCity>São Tomé</exemplarCity>
 			</zone>
 			<zone type="America/El_Salvador">
-				<exemplarCity draft="contributed">El Salvador</exemplarCity>
+				<exemplarCity>El Salvador</exemplarCity>
 			</zone>
 			<zone type="America/Lower_Princes">
 				<exemplarCity>Lower Prince’s Quarter</exemplarCity>
@@ -3697,10 +3822,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Damaskos</exemplarCity>
 			</zone>
 			<zone type="Africa/Mbabane">
-				<exemplarCity draft="contributed">Mbabane</exemplarCity>
+				<exemplarCity>Mbabane</exemplarCity>
 			</zone>
 			<zone type="America/Grand_Turk">
-				<exemplarCity draft="contributed">Grand Turk</exemplarCity>
+				<exemplarCity>Grand Turk</exemplarCity>
 			</zone>
 			<zone type="Africa/Ndjamena">
 				<exemplarCity>N’Djamena</exemplarCity>
@@ -3712,40 +3837,40 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Lomé</exemplarCity>
 			</zone>
 			<zone type="Asia/Bangkok">
-				<exemplarCity draft="contributed">Bangkok</exemplarCity>
+				<exemplarCity>Bangkok</exemplarCity>
 			</zone>
 			<zone type="Asia/Dushanbe">
 				<exemplarCity>Dušanbe</exemplarCity>
 			</zone>
 			<zone type="Pacific/Fakaofo">
-				<exemplarCity draft="contributed">Fakaofo</exemplarCity>
+				<exemplarCity>Fakaofo</exemplarCity>
 			</zone>
 			<zone type="Asia/Dili">
-				<exemplarCity draft="contributed">Dili</exemplarCity>
+				<exemplarCity>Dili</exemplarCity>
 			</zone>
 			<zone type="Asia/Ashgabat">
 				<exemplarCity>Ašgabat</exemplarCity>
 			</zone>
 			<zone type="Africa/Tunis">
-				<exemplarCity draft="contributed">Tunis</exemplarCity>
+				<exemplarCity>Tunis</exemplarCity>
 			</zone>
 			<zone type="Pacific/Tongatapu">
-				<exemplarCity draft="contributed">Tongatapu</exemplarCity>
+				<exemplarCity>Tongatapu</exemplarCity>
 			</zone>
 			<zone type="Europe/Istanbul">
-				<exemplarCity draft="contributed">Istanbul</exemplarCity>
+				<exemplarCity>Istanbul</exemplarCity>
 			</zone>
 			<zone type="America/Port_of_Spain">
-				<exemplarCity draft="contributed">Port of Spain</exemplarCity>
+				<exemplarCity>Port of Spain</exemplarCity>
 			</zone>
 			<zone type="Pacific/Funafuti">
-				<exemplarCity draft="contributed">Funafuti</exemplarCity>
+				<exemplarCity>Funafuti</exemplarCity>
 			</zone>
 			<zone type="Asia/Taipei">
-				<exemplarCity draft="contributed">Taipei</exemplarCity>
+				<exemplarCity>Taipei</exemplarCity>
 			</zone>
 			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity draft="contributed">Dar es Salaam</exemplarCity>
+				<exemplarCity>Dar es Salaam</exemplarCity>
 			</zone>
 			<zone type="Europe/Uzhgorod">
 				<exemplarCity>Užgorod</exemplarCity>
@@ -3757,52 +3882,52 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Zaporižžja</exemplarCity>
 			</zone>
 			<zone type="Africa/Kampala">
-				<exemplarCity draft="contributed">Kampala</exemplarCity>
+				<exemplarCity>Kampala</exemplarCity>
 			</zone>
 			<zone type="Pacific/Midway">
-				<exemplarCity draft="contributed">Midway</exemplarCity>
+				<exemplarCity>Midway</exemplarCity>
 			</zone>
 			<zone type="Pacific/Johnston">
-				<exemplarCity draft="contributed">Johnston</exemplarCity>
+				<exemplarCity>Johnston</exemplarCity>
 			</zone>
 			<zone type="Pacific/Wake">
-				<exemplarCity draft="contributed">Wake</exemplarCity>
+				<exemplarCity>Wake</exemplarCity>
 			</zone>
 			<zone type="America/Adak">
-				<exemplarCity draft="contributed">Adak</exemplarCity>
+				<exemplarCity>Adak</exemplarCity>
 			</zone>
 			<zone type="America/Nome">
-				<exemplarCity draft="contributed">Nome</exemplarCity>
+				<exemplarCity>Nome</exemplarCity>
 			</zone>
 			<zone type="Pacific/Honolulu">
-				<exemplarCity draft="contributed">Honolulu</exemplarCity>
+				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
 			<zone type="America/Anchorage">
-				<exemplarCity draft="contributed">Anchorage</exemplarCity>
+				<exemplarCity>Anchorage</exemplarCity>
 			</zone>
 			<zone type="America/Yakutat">
-				<exemplarCity draft="contributed">Yakutat</exemplarCity>
+				<exemplarCity>Yakutat</exemplarCity>
 			</zone>
 			<zone type="America/Sitka">
-				<exemplarCity draft="contributed">Sitka</exemplarCity>
+				<exemplarCity>Sitka</exemplarCity>
 			</zone>
 			<zone type="America/Juneau">
-				<exemplarCity draft="contributed">Juneau</exemplarCity>
+				<exemplarCity>Juneau</exemplarCity>
 			</zone>
 			<zone type="America/Metlakatla">
-				<exemplarCity draft="contributed">Metlakatla</exemplarCity>
+				<exemplarCity>Metlakatla</exemplarCity>
 			</zone>
 			<zone type="America/Los_Angeles">
-				<exemplarCity draft="contributed">Los Angeles</exemplarCity>
+				<exemplarCity>Los Angeles</exemplarCity>
 			</zone>
 			<zone type="America/Boise">
-				<exemplarCity draft="contributed">Boise</exemplarCity>
+				<exemplarCity>Boise</exemplarCity>
 			</zone>
 			<zone type="America/Phoenix">
-				<exemplarCity draft="contributed">Phoenix</exemplarCity>
+				<exemplarCity>Phoenix</exemplarCity>
 			</zone>
 			<zone type="America/Denver">
-				<exemplarCity draft="contributed">Denver</exemplarCity>
+				<exemplarCity>Denver</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/Beulah">
 				<exemplarCity>Beulah, Pohjois-Dakota</exemplarCity>
@@ -3814,10 +3939,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Center, Pohjois-Dakota</exemplarCity>
 			</zone>
 			<zone type="America/Chicago">
-				<exemplarCity draft="contributed">Chicago</exemplarCity>
+				<exemplarCity>Chicago</exemplarCity>
 			</zone>
 			<zone type="America/Menominee">
-				<exemplarCity draft="contributed">Menominee</exemplarCity>
+				<exemplarCity>Menominee</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Vincennes">
 				<exemplarCity>Vincennes, Indiana</exemplarCity>
@@ -3838,10 +3963,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Marengo, Indiana</exemplarCity>
 			</zone>
 			<zone type="America/Indianapolis">
-				<exemplarCity draft="contributed">Indianapolis</exemplarCity>
+				<exemplarCity>Indianapolis</exemplarCity>
 			</zone>
 			<zone type="America/Louisville">
-				<exemplarCity draft="contributed">Louisville</exemplarCity>
+				<exemplarCity>Louisville</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Vevay">
 				<exemplarCity>Vevay, Indiana</exemplarCity>
@@ -3850,16 +3975,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Monticello, Kentucky</exemplarCity>
 			</zone>
 			<zone type="America/Detroit">
-				<exemplarCity draft="contributed">Detroit</exemplarCity>
+				<exemplarCity>Detroit</exemplarCity>
 			</zone>
 			<zone type="America/New_York">
-				<exemplarCity draft="contributed">New York</exemplarCity>
+				<exemplarCity>New York</exemplarCity>
 			</zone>
 			<zone type="America/Montevideo">
-				<exemplarCity draft="contributed">Montevideo</exemplarCity>
+				<exemplarCity>Montevideo</exemplarCity>
 			</zone>
 			<zone type="Asia/Samarkand">
-				<exemplarCity draft="contributed">Samarkand</exemplarCity>
+				<exemplarCity>Samarkand</exemplarCity>
 			</zone>
 			<zone type="Asia/Tashkent">
 				<exemplarCity>Taškent</exemplarCity>
@@ -3871,10 +3996,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Saint Vincent</exemplarCity>
 			</zone>
 			<zone type="America/Caracas">
-				<exemplarCity draft="contributed">Caracas</exemplarCity>
+				<exemplarCity>Caracas</exemplarCity>
 			</zone>
 			<zone type="America/Tortola">
-				<exemplarCity draft="contributed">Tortola</exemplarCity>
+				<exemplarCity>Tortola</exemplarCity>
 			</zone>
 			<zone type="America/St_Thomas">
 				<exemplarCity>Saint Thomas</exemplarCity>
@@ -3883,28 +4008,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Hồ Chí Minhin kaupunki</exemplarCity>
 			</zone>
 			<zone type="Pacific/Efate">
-				<exemplarCity draft="contributed">Efate</exemplarCity>
+				<exemplarCity>Efate</exemplarCity>
 			</zone>
 			<zone type="Pacific/Wallis">
-				<exemplarCity draft="contributed">Wallis</exemplarCity>
+				<exemplarCity>Wallis</exemplarCity>
 			</zone>
 			<zone type="Pacific/Apia">
-				<exemplarCity draft="contributed">Apia</exemplarCity>
+				<exemplarCity>Apia</exemplarCity>
 			</zone>
 			<zone type="Asia/Aden">
-				<exemplarCity draft="contributed">Aden</exemplarCity>
+				<exemplarCity>Aden</exemplarCity>
 			</zone>
 			<zone type="Indian/Mayotte">
-				<exemplarCity draft="contributed">Mayotte</exemplarCity>
+				<exemplarCity>Mayotte</exemplarCity>
 			</zone>
 			<zone type="Africa/Johannesburg">
-				<exemplarCity draft="contributed">Johannesburg</exemplarCity>
+				<exemplarCity>Johannesburg</exemplarCity>
 			</zone>
 			<zone type="Africa/Lusaka">
-				<exemplarCity draft="contributed">Lusaka</exemplarCity>
+				<exemplarCity>Lusaka</exemplarCity>
 			</zone>
 			<zone type="Africa/Harare">
-				<exemplarCity draft="contributed">Harare</exemplarCity>
+				<exemplarCity>Harare</exemplarCity>
 			</zone>
 			<metazone type="Acre">
 				<long>
@@ -4242,7 +4367,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
 				<long>
-					<standard draft="contributed">Itäisemmän Euroopan aika</standard>
+					<standard>Itäisemmän Euroopan aika</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
@@ -4971,6 +5096,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">0 t'.' ¤</pattern>
+					<pattern type="1000" count="other">0 t'.' ¤</pattern>
+					<pattern type="10000" count="one">00 t'.' ¤</pattern>
+					<pattern type="10000" count="other">00 t'.' ¤</pattern>
+					<pattern type="100000" count="one">000 t'.' ¤</pattern>
+					<pattern type="100000" count="other">000 t'.' ¤</pattern>
+					<pattern type="1000000" count="one">0 milj'.' ¤</pattern>
+					<pattern type="1000000" count="other">0 milj'.' ¤</pattern>
+					<pattern type="10000000" count="one">00 milj'.' ¤</pattern>
+					<pattern type="10000000" count="other">00 milj'.' ¤</pattern>
+					<pattern type="100000000" count="one">000 milj'.' ¤</pattern>
+					<pattern type="100000000" count="other">000 milj'.' ¤</pattern>
+					<pattern type="1000000000" count="one">0 mrd'.' ¤</pattern>
+					<pattern type="1000000000" count="other">0 mrd'.' ¤</pattern>
+					<pattern type="10000000000" count="one">00 mrd'.' ¤</pattern>
+					<pattern type="10000000000" count="other">00 mrd'.' ¤</pattern>
+					<pattern type="100000000000" count="one">000 mrd'.' ¤</pattern>
+					<pattern type="100000000000" count="other">000 mrd'.' ¤</pattern>
+					<pattern type="1000000000000" count="one">0 bilj'.' ¤</pattern>
+					<pattern type="1000000000000" count="other">0 bilj'.' ¤</pattern>
+					<pattern type="10000000000000" count="one">00 bilj'.' ¤</pattern>
+					<pattern type="10000000000000" count="other">00 bilj'.' ¤</pattern>
+					<pattern type="100000000000000" count="one">000 bilj'.' ¤</pattern>
+					<pattern type="100000000000000" count="other">000 bilj'.' ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -5028,6 +5181,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Angolan kwanza</displayName>
 				<displayName count="other">Angolan kwanzaa</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>Angolan kwanza (1977–1991)</displayName>
@@ -5120,6 +5274,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Bosnia-Hertsegovinan vaihdettava markka</displayName>
 				<displayName count="other">Bosnia-Hertsegovinan vaihdettavaa markkaa</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BAN">
 				<displayName>Bosnia-Hertsegovinan uusi dinaari (1994–1997)</displayName>
@@ -5214,6 +5369,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Bolivian boliviano</displayName>
 				<displayName count="other">Bolivian bolivianoa</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOL">
 				<displayName>Bolivian boliviano (1863–1963)</displayName>
@@ -5300,6 +5456,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Botswanan pula</displayName>
 				<displayName count="other">Botswanan pulaa</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>Valko-Venäjän uusi rupla (1994–1999)</displayName>
@@ -5421,13 +5578,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Kuuban vaihdettava peso</displayName>
 				<displayName count="other">Kuuban vaihdettavaa pesoa</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>Kuuban peso</displayName>
 				<displayName count="one">Kuuban peso</displayName>
 				<displayName count="other">Kuuban pesoa</displayName>
 				<symbol>CUP</symbol>
-				<symbol alt="narrow" draft="provisional">$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CVE">
 				<displayName>Kap Verden escudo</displayName>
@@ -5446,6 +5604,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Tšekin koruna</displayName>
 				<displayName count="other">Tšekin korunaa</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>Itä-Saksan markka</displayName>
@@ -5470,6 +5629,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Tanskan kruunu</displayName>
 				<displayName count="other">Tanskan kruunua</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Dominikaanisen tasavallan peso</displayName>
@@ -5507,6 +5667,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Egyptin punta</displayName>
 				<displayName count="other">Egyptin puntaa</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>Eritrean nakfa</displayName>
@@ -5563,6 +5724,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Falklandinsaarten punta</displayName>
 				<displayName count="other">Falklandinsaarten puntaa</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>Ranskan frangi</displayName>
@@ -5588,6 +5750,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Georgian lari</displayName>
 				<displayName count="other">Georgian laria</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>Ghanan cedi (1979–2007)</displayName>
@@ -5619,6 +5782,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Guinean frangi</displayName>
 				<displayName count="other">Guinean frangia</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>Guinean syli</displayName>
@@ -5643,6 +5807,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Guatemalan quetzal</displayName>
 				<displayName count="other">Guatemalan quetzalia</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>Portugalin Guinean escudo</displayName>
@@ -5675,6 +5840,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Hondurasin lempira</displayName>
 				<displayName count="other">Hondurasin lempiraa</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>Kroatian dinaari</displayName>
@@ -5687,6 +5853,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Kroatian kuna</displayName>
 				<displayName count="other">Kroatian kunaa</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>Haitin gourde</displayName>
@@ -5699,12 +5866,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Unkarin forintti</displayName>
 				<displayName count="other">Unkarin forinttia</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>Indonesian rupia</displayName>
 				<displayName count="one">Indonesian rupia</displayName>
 				<displayName count="other">Indonesian rupiaa</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>Irlannin punta</displayName>
@@ -5761,6 +5930,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Islannin kruunu</displayName>
 				<displayName count="other">Islannin kruunua</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>Italian liira</displayName>
@@ -5812,12 +5982,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Komorien frangi</displayName>
 				<displayName count="other">Komorien frangia</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>Pohjois-Korean won</displayName>
 				<displayName count="one">Pohjois-Korean won</displayName>
 				<displayName count="other">Pohjois-Korean wonia</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRH">
 				<displayName>Etelä-Korean hwan (1953–1962)</displayName>
@@ -5856,6 +6028,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Kazakstanin tenge</displayName>
 				<displayName count="other">Kazakstanin tengeä</displayName>
 				<symbol>KZT</symbol>
+				<symbol alt="narrow" draft="contributed">₸</symbol>
 			</currency>
 			<currency type="LAK">
 				<displayName>Laosin kip</displayName>
@@ -5869,12 +6042,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Libanonin punta</displayName>
 				<displayName count="other">Libanonin puntaa</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>Sri Lankan rupia</displayName>
 				<displayName count="one">Sri Lankan rupia</displayName>
 				<displayName count="other">Sri Lankan rupiaa</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>Liberian dollari</displayName>
@@ -5972,6 +6147,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Madagaskarin ariary</displayName>
 				<displayName count="other">Madagaskarin ariarya</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>Madagaskarin frangi</displayName>
@@ -6002,6 +6178,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Myanmarin kyat</displayName>
 				<displayName count="other">Myanmarin kyatia</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>Mongolian tugrik</displayName>
@@ -6039,6 +6216,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Mauritiuksen rupia</displayName>
 				<displayName count="other">Mauritiuksen rupiaa</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVP">
 				<displayName>Malediivien rupia (1947–1981)</displayName>
@@ -6082,6 +6260,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Malesian ringgit</displayName>
 				<displayName count="other">Malesian ringgitiä</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>Mosambikin escudo</displayName>
@@ -6126,6 +6305,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Nicaraguan cordoba</displayName>
 				<displayName count="other">Nicaraguan cordobaa</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>Alankomaiden guldeni</displayName>
@@ -6138,12 +6318,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Norjan kruunu</displayName>
 				<displayName count="other">Norjan kruunua</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>Nepalin rupia</displayName>
 				<displayName count="one">Nepalin rupia</displayName>
 				<displayName count="other">Nepalin rupiaa</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>Uuden-Seelannin dollari</displayName>
@@ -6200,12 +6382,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Pakistanin rupia</displayName>
 				<displayName count="other">Pakistanin rupiaa</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>Puolan zloty</displayName>
 				<displayName count="one">Puolan zloty</displayName>
 				<displayName count="other">Puolan zlotya</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>Puolan zloty (1950–1995)</displayName>
@@ -6261,6 +6445,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Venäjän rupla</displayName>
 				<displayName count="other">Venäjän ruplaa</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>Venäjän rupla (1991–1998)</displayName>
@@ -6273,6 +6458,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Ruandan frangi</displayName>
 				<displayName count="other">Ruandan frangia</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>Saudi-Arabian rial</displayName>
@@ -6316,6 +6502,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Ruotsin kruunu</displayName>
 				<displayName count="other">Ruotsin kruunua</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>Singaporen dollari</displayName>
@@ -6329,6 +6516,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Saint Helenan punta</displayName>
 				<displayName count="other">Saint Helenan puntaa</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>Slovenian tolar</displayName>
@@ -6379,6 +6567,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">São Tomén ja Príncipen dobra</displayName>
 				<displayName count="other">São Tomén ja Príncipen dobraa</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>Neuvostoliiton rupla</displayName>
@@ -6397,6 +6586,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Syyrian punta</displayName>
 				<displayName count="other">Syyrian puntaa</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>Swazimaan lilangeni</displayName>
@@ -6409,6 +6599,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Thaimaan baht</displayName>
 				<displayName count="other">Thaimaan bahtia</displayName>
 				<symbol>THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>Tadžikistanin rupla</displayName>
@@ -6445,6 +6636,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Tongan pa’anga</displayName>
 				<displayName count="other">Tongan pa’angaa</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>Timorin escudo</displayName>
@@ -6464,6 +6656,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">Turkin liiraa</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Trinidadin ja Tobagon dollari</displayName>
@@ -6565,6 +6758,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Venezuelan bolivar</displayName>
 				<displayName count="other">Venezuelan bolivaria</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>Vietnamin dong</displayName>
@@ -6599,14 +6793,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="XAG">
 				<displayName>hopea</displayName>
-				<displayName count="one">hopeayksikkö</displayName>
-				<displayName count="other">hopeayksikköä</displayName>
+				<displayName count="one">troy-unssi hopeaa</displayName>
+				<displayName count="other">troy-unssia hopeaa</displayName>
 				<symbol>XAG</symbol>
 			</currency>
 			<currency type="XAU">
 				<displayName>kulta</displayName>
-				<displayName count="one">kultayksikkö</displayName>
-				<displayName count="other">kultayksikköä</displayName>
+				<displayName count="one">troy-unssi kultaa</displayName>
+				<displayName count="other">troy-unssia kultaa</displayName>
 				<symbol>XAU</symbol>
 			</currency>
 			<currency type="XBA">
@@ -6638,6 +6832,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Itä-Karibian dollari</displayName>
 				<displayName count="other">Itä-Karibian dollaria</displayName>
 				<symbol>XCD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>erityisnosto-oikeus (SDR)</displayName>
@@ -6655,6 +6850,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Ranskan kultafrangi</displayName>
 				<displayName count="one">Ranskan kultafrangi</displayName>
 				<displayName count="other">Ranskan kultafrangia</displayName>
+				<symbol>XFO</symbol>
 			</currency>
 			<currency type="XFU">
 				<displayName>Ranskan UIC-frangi</displayName>
@@ -6670,8 +6866,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="XPD">
 				<displayName>palladium</displayName>
-				<displayName count="one">palladiumyksikkö</displayName>
-				<displayName count="other">palladiumyksikköä</displayName>
+				<displayName count="one">troy-unssi palladiumia</displayName>
+				<displayName count="other">troy-unssia palladiumia</displayName>
 				<symbol>XPD</symbol>
 			</currency>
 			<currency type="XPF">
@@ -6682,8 +6878,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="XPT">
 				<displayName>platina</displayName>
-				<displayName count="one">platinayksikkö</displayName>
-				<displayName count="other">platinayksikköä</displayName>
+				<displayName count="one">troy-unssi platinaa</displayName>
+				<displayName count="other">troy-unssia platinaa</displayName>
 				<symbol>XPT</symbol>
 			</currency>
 			<currency type="XRE">
@@ -6763,6 +6959,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Etelä-Afrikan randi</displayName>
 				<displayName count="other">Etelä-Afrikan randia</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>Sambian kwacha (1968–2012)</displayName>
@@ -6775,6 +6972,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Sambian kwacha</displayName>
 				<displayName count="other">Sambian kwachaa</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>Zairen uusi zaire (1993–1998)</displayName>
@@ -6827,6 +7025,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} metri per sekunti toiseen</unitPattern>
 				<unitPattern count="other">{0} metriä per sekunti toiseen</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>kierros</displayName>
+				<unitPattern count="one">{0} kierros</unitPattern>
+				<unitPattern count="other">{0} kierrosta</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radiaanit</displayName>
+				<unitPattern count="one">{0} radiaani</unitPattern>
+				<unitPattern count="other">{0} radiaania</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>asteet</displayName>
+				<unitPattern count="one">{0} aste</unitPattern>
+				<unitPattern count="other">{0} astetta</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>kulmaminuutit</displayName>
 				<unitPattern count="one">{0} kulmaminuutti</unitPattern>
@@ -6837,30 +7050,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kulmasekunti</unitPattern>
 				<unitPattern count="other">{0} kulmasekuntia</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>asteet</displayName>
-				<unitPattern count="one">{0} aste</unitPattern>
-				<unitPattern count="other">{0} astetta</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radiaanit</displayName>
-				<unitPattern count="one">{0} radiaani</unitPattern>
-				<unitPattern count="other">{0} radiaania</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>eekkerit</displayName>
-				<unitPattern count="one">{0} eekkeri</unitPattern>
-				<unitPattern count="other">{0} eekkeriä</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>neliökilometrit</displayName>
+				<unitPattern count="one">{0} neliökilometri</unitPattern>
+				<unitPattern count="other">{0} neliökilometriä</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hehtaarit</displayName>
 				<unitPattern count="one">{0} hehtaari</unitPattern>
 				<unitPattern count="other">{0} hehtaaria</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>neliömetrit</displayName>
+				<unitPattern count="one">{0} neliömetri</unitPattern>
+				<unitPattern count="other">{0} neliömetriä</unitPattern>
+				<perUnitPattern>{0} / neliömetri</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>neliösenttimetrit</displayName>
 				<unitPattern count="one">{0} neliösenttimetri</unitPattern>
 				<unitPattern count="other">{0} neliösenttimetriä</unitPattern>
+				<perUnitPattern>{0} / neliösenttimetri</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>neliömailit</displayName>
+				<unitPattern count="one">{0} neliömaili</unitPattern>
+				<unitPattern count="other">{0} neliömailia</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>eekkerit</displayName>
+				<unitPattern count="one">{0} eekkeri</unitPattern>
+				<unitPattern count="other">{0} eekkeriä</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>neliöjaardit</displayName>
+				<unitPattern count="one">{0} neliöjaardi</unitPattern>
+				<unitPattern count="other">{0} neliöjaardia</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>neliöjalat</displayName>
@@ -6871,91 +7096,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>neliötuumat</displayName>
 				<unitPattern count="one">{0} neliötuuma</unitPattern>
 				<unitPattern count="other">{0} neliötuumaa</unitPattern>
+				<perUnitPattern>{0} / neliötuuma</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>neliökilometrit</displayName>
-				<unitPattern count="one">{0} neliökilometri</unitPattern>
-				<unitPattern count="other">{0} neliökilometriä</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>neliömetrit</displayName>
-				<unitPattern count="one">{0} neliömetri</unitPattern>
-				<unitPattern count="other">{0} neliömetriä</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>neliömailit</displayName>
-				<unitPattern count="one">{0} neliömaili</unitPattern>
-				<unitPattern count="other">{0} neliömailia</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>neliöjaardit</displayName>
-				<unitPattern count="one">{0} neliöjaardi</unitPattern>
-				<unitPattern count="other">{0} neliöjaardia</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karaatit</displayName>
+				<unitPattern count="one">{0} karaatti</unitPattern>
+				<unitPattern count="other">{0} karaattia</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litrat per kilometri</displayName>
 				<unitPattern count="one">{0} litra per kilometri</unitPattern>
 				<unitPattern count="other">{0} litraa per kilometri</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>litrat per 100 kilometriä</displayName>
+				<unitPattern count="one">{0} litra per 100 km</unitPattern>
+				<unitPattern count="other">{0} litraa per 100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mailit per gallona</displayName>
 				<unitPattern count="one">{0} maili per gallona</unitPattern>
 				<unitPattern count="other">{0} mailia per gallona</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bitit</displayName>
-				<unitPattern count="one">{0} bitti</unitPattern>
-				<unitPattern count="other">{0} bittiä</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>tavut</displayName>
-				<unitPattern count="one">{0} tavu</unitPattern>
-				<unitPattern count="other">{0} tavua</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabitit</displayName>
-				<unitPattern count="one">{0} gigabitti</unitPattern>
-				<unitPattern count="other">{0} gigabittiä</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigatavut</displayName>
-				<unitPattern count="one">{0} gigatavu</unitPattern>
-				<unitPattern count="other">{0} gigatavua</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobitit</displayName>
-				<unitPattern count="one">{0} kilobitti</unitPattern>
-				<unitPattern count="other">{0} kilobittiä</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilotavut</displayName>
-				<unitPattern count="one">{0} kilotavu</unitPattern>
-				<unitPattern count="other">{0} kilotavua</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabitit</displayName>
-				<unitPattern count="one">{0} megabitti</unitPattern>
-				<unitPattern count="other">{0} megabittiä</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megatavut</displayName>
-				<unitPattern count="one">{0} megatavu</unitPattern>
-				<unitPattern count="other">{0} megatavua</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabitit</displayName>
-				<unitPattern count="one">{0} terabitti</unitPattern>
-				<unitPattern count="other">{0} terabittiä</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>teratavut</displayName>
 				<unitPattern count="one">{0} teratavu</unitPattern>
 				<unitPattern count="other">{0} teratavua</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabitit</displayName>
+				<unitPattern count="one">{0} terabitti</unitPattern>
+				<unitPattern count="other">{0} terabittiä</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigatavut</displayName>
+				<unitPattern count="one">{0} gigatavu</unitPattern>
+				<unitPattern count="other">{0} gigatavua</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabitit</displayName>
+				<unitPattern count="one">{0} gigabitti</unitPattern>
+				<unitPattern count="other">{0} gigabittiä</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megatavut</displayName>
+				<unitPattern count="one">{0} megatavu</unitPattern>
+				<unitPattern count="other">{0} megatavua</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabitit</displayName>
+				<unitPattern count="one">{0} megabitti</unitPattern>
+				<unitPattern count="other">{0} megabittiä</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilotavut</displayName>
+				<unitPattern count="one">{0} kilotavu</unitPattern>
+				<unitPattern count="other">{0} kilotavua</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobitit</displayName>
+				<unitPattern count="one">{0} kilobitti</unitPattern>
+				<unitPattern count="other">{0} kilobittiä</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>tavut</displayName>
+				<unitPattern count="one">{0} tavu</unitPattern>
+				<unitPattern count="other">{0} tavua</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bitit</displayName>
+				<unitPattern count="one">{0} bitti</unitPattern>
+				<unitPattern count="other">{0} bittiä</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>vuosisadat</displayName>
+				<unitPattern count="one">{0} vuosisata</unitPattern>
+				<unitPattern count="other">{0} vuosisataa</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>vuodet</displayName>
+				<unitPattern count="one">{0} vuosi</unitPattern>
+				<unitPattern count="other">{0} vuotta</unitPattern>
+				<perUnitPattern>{0} vuodessa</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>kuukaudet</displayName>
+				<unitPattern count="one">{0} kuukausi</unitPattern>
+				<unitPattern count="other">{0} kuukautta</unitPattern>
+				<perUnitPattern>{0} kuukaudessa</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>viikot</displayName>
+				<unitPattern count="one">{0} viikko</unitPattern>
+				<unitPattern count="other">{0} viikkoa</unitPattern>
+				<perUnitPattern>{0} viikossa</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>päivät</displayName>
 				<unitPattern count="one">{0} päivä</unitPattern>
 				<unitPattern count="other">{0} päivää</unitPattern>
+				<perUnitPattern>{0} päivässä</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>tunnit</displayName>
@@ -6963,30 +7203,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} tuntia</unitPattern>
 				<perUnitPattern>{0} tunnissa</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikrosekunnit</displayName>
-				<unitPattern count="one">{0} mikrosekunti</unitPattern>
-				<unitPattern count="other">{0} mikrosekuntia</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>millisekunnit</displayName>
-				<unitPattern count="one">{0} millisekunti</unitPattern>
-				<unitPattern count="other">{0} millisekuntia</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>minuutit</displayName>
 				<unitPattern count="one">{0} minuutti</unitPattern>
 				<unitPattern count="other">{0} minuuttia</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>kuukaudet</displayName>
-				<unitPattern count="one">{0} kuukausi</unitPattern>
-				<unitPattern count="other">{0} kuukautta</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanosekunnit</displayName>
-				<unitPattern count="one">{0} nanosekunti</unitPattern>
-				<unitPattern count="other">{0} nanosekuntia</unitPattern>
+				<perUnitPattern>{0} minuutissa</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sekunnit</displayName>
@@ -6994,15 +7215,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} sekuntia</unitPattern>
 				<perUnitPattern>{0} sekunnissa</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>viikot</displayName>
-				<unitPattern count="one">{0} viikko</unitPattern>
-				<unitPattern count="other">{0} viikkoa</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>millisekunnit</displayName>
+				<unitPattern count="one">{0} millisekunti</unitPattern>
+				<unitPattern count="other">{0} millisekuntia</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>vuodet</displayName>
-				<unitPattern count="one">{0} vuosi</unitPattern>
-				<unitPattern count="other">{0} vuotta</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>mikrosekunnit</displayName>
+				<unitPattern count="one">{0} mikrosekunti</unitPattern>
+				<unitPattern count="other">{0} mikrosekuntia</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosekunnit</displayName>
+				<unitPattern count="one">{0} nanosekunti</unitPattern>
+				<unitPattern count="other">{0} nanosekuntia</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ampeerit</displayName>
@@ -7024,6 +7250,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} voltti</unitPattern>
 				<unitPattern count="other">{0} volttia</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokalorit</displayName>
+				<unitPattern count="one">{0} kilokalori</unitPattern>
+				<unitPattern count="other">{0} kilokaloria</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kalorit</displayName>
 				<unitPattern count="one">{0} kalori</unitPattern>
@@ -7034,21 +7265,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kilokalori</unitPattern>
 				<unitPattern count="other">{0} kilokaloria</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joulet</displayName>
-				<unitPattern count="one">{0} joule</unitPattern>
-				<unitPattern count="other">{0} joulea</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokalorit</displayName>
-				<unitPattern count="one">{0} kilokalori</unitPattern>
-				<unitPattern count="other">{0} kilokaloria</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojoulet</displayName>
 				<unitPattern count="one">{0} kilojoule</unitPattern>
 				<unitPattern count="other">{0} kilojoulea</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joulet</displayName>
+				<unitPattern count="one">{0} joule</unitPattern>
+				<unitPattern count="other">{0} joulea</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilowattitunnit</displayName>
 				<unitPattern count="one">{0} kilowattitunti</unitPattern>
@@ -7059,216 +7285,220 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} gigahertsi</unitPattern>
 				<unitPattern count="other">{0} gigahertsiä</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hertsit</displayName>
-				<unitPattern count="one">{0} hertsi</unitPattern>
-				<unitPattern count="other">{0} hertsiä</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megahertsit</displayName>
+				<unitPattern count="one">{0} megahertsi</unitPattern>
+				<unitPattern count="other">{0} megahertsiä</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kilohertsit</displayName>
 				<unitPattern count="one">{0} kilohertsi</unitPattern>
 				<unitPattern count="other">{0} kilohertsiä</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megahertsit</displayName>
-				<unitPattern count="one">{0} megahertsi</unitPattern>
-				<unitPattern count="other">{0} megahertsiä</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hertsit</displayName>
+				<unitPattern count="one">{0} hertsi</unitPattern>
+				<unitPattern count="other">{0} hertsiä</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>astronomiset yksiköt</displayName>
-				<unitPattern count="one">{0} astronominen yksikkö</unitPattern>
-				<unitPattern count="other">{0} astronomista yksikköä</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometrit</displayName>
+				<unitPattern count="one">{0} kilometri</unitPattern>
+				<unitPattern count="other">{0} kilometriä</unitPattern>
+				<perUnitPattern>{0} / kilometri</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>senttimetrit</displayName>
-				<unitPattern count="one">{0} senttimetri</unitPattern>
-				<unitPattern count="other">{0} senttimetriä</unitPattern>
+			<unit type="length-meter">
+				<displayName>metrit</displayName>
+				<unitPattern count="one">{0} metri</unitPattern>
+				<unitPattern count="other">{0} metriä</unitPattern>
+				<perUnitPattern>{0} / metri</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>desimetrit</displayName>
 				<unitPattern count="one">{0} desimetri</unitPattern>
 				<unitPattern count="other">{0} desimetriä</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName>sylet</displayName>
-				<unitPattern count="one">syli</unitPattern>
-				<unitPattern count="other">{0} syltä</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>jalat</displayName>
-				<unitPattern count="one">{0} jalka</unitPattern>
-				<unitPattern count="other">{0} jalkaa</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>furlongit</displayName>
-				<unitPattern count="one">{0} furlong</unitPattern>
-				<unitPattern count="other">{0} furlongia</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>tuumat</displayName>
-				<unitPattern count="one">{0} tuuma</unitPattern>
-				<unitPattern count="other">{0} tuumaa</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometrit</displayName>
-				<unitPattern count="one">{0} kilometri</unitPattern>
-				<unitPattern count="other">{0} kilometriä</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>valovuodet</displayName>
-				<unitPattern count="one">{0} valovuosi</unitPattern>
-				<unitPattern count="other">{0} valovuotta</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metrit</displayName>
-				<unitPattern count="one">{0} metri</unitPattern>
-				<unitPattern count="other">{0} metriä</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>mikrometrit</displayName>
-				<unitPattern count="one">{0} mikrometri</unitPattern>
-				<unitPattern count="other">{0} mikrometriä</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mailit</displayName>
-				<unitPattern count="one">{0} maili</unitPattern>
-				<unitPattern count="other">{0} mailia</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>senttimetrit</displayName>
+				<unitPattern count="one">{0} senttimetri</unitPattern>
+				<unitPattern count="other">{0} senttimetriä</unitPattern>
+				<perUnitPattern>{0} / senttimetri</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>millimetrit</displayName>
 				<unitPattern count="one">{0} millimetri</unitPattern>
 				<unitPattern count="other">{0} millimetriä</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikrometrit</displayName>
+				<unitPattern count="one">{0} mikrometri</unitPattern>
+				<unitPattern count="other">{0} mikrometriä</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanometrit</displayName>
 				<unitPattern count="one">{0} nanometri</unitPattern>
 				<unitPattern count="other">{0} nanometriä</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>meripeninkulmat</displayName>
-				<unitPattern count="one">{0} meripeninkulma</unitPattern>
-				<unitPattern count="other">{0} meripeninkulmaa</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsekit</displayName>
-				<unitPattern count="one">{0} parsek</unitPattern>
-				<unitPattern count="other">{0} parsekia</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pikometrit</displayName>
 				<unitPattern count="one">{0} pikometri</unitPattern>
 				<unitPattern count="other">{0} pikometriä</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mailit</displayName>
+				<unitPattern count="one">{0} maili</unitPattern>
+				<unitPattern count="other">{0} mailia</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>jaardit</displayName>
 				<unitPattern count="one">{0} jaardi</unitPattern>
 				<unitPattern count="other">{0} jaardia</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>jalat</displayName>
+				<unitPattern count="one">{0} jalka</unitPattern>
+				<unitPattern count="other">{0} jalkaa</unitPattern>
+				<perUnitPattern>{0} / jalka</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>tuumat</displayName>
+				<unitPattern count="one">{0} tuuma</unitPattern>
+				<unitPattern count="other">{0} tuumaa</unitPattern>
+				<perUnitPattern>{0} / tuuma</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsekit</displayName>
+				<unitPattern count="one">{0} parsek</unitPattern>
+				<unitPattern count="other">{0} parsekia</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>valovuodet</displayName>
+				<unitPattern count="one">{0} valovuosi</unitPattern>
+				<unitPattern count="other">{0} valovuotta</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>astronomiset yksiköt</displayName>
+				<unitPattern count="one">{0} astronominen yksikkö</unitPattern>
+				<unitPattern count="other">{0} astronomista yksikköä</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>furlongit</displayName>
+				<unitPattern count="one">{0} furlong</unitPattern>
+				<unitPattern count="other">{0} furlongia</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>sylet</displayName>
+				<unitPattern count="one">syli</unitPattern>
+				<unitPattern count="other">{0} syltä</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>meripeninkulmat</displayName>
+				<unitPattern count="one">{0} meripeninkulma</unitPattern>
+				<unitPattern count="other">{0} meripeninkulmaa</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>peninkulmat</displayName>
+				<unitPattern count="one">{0} peninkulma</unitPattern>
+				<unitPattern count="other">{0} peninkulmaa</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>luksit</displayName>
 				<unitPattern count="one">{0} luksi</unitPattern>
 				<unitPattern count="other">{0} luksia</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karaatit</displayName>
-				<unitPattern count="one">{0} karaatti</unitPattern>
-				<unitPattern count="other">{0} karaattia</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>grammat</displayName>
-				<unitPattern count="one">{0} gramma</unitPattern>
-				<unitPattern count="other">{0} grammaa</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogrammat</displayName>
-				<unitPattern count="one">{0} kilogramma</unitPattern>
-				<unitPattern count="other">{0} kilogrammaa</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>tonnit</displayName>
 				<unitPattern count="one">{0} tonni</unitPattern>
 				<unitPattern count="other">{0} tonnia</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mikrogrammat</displayName>
-				<unitPattern count="one">{0} mikrogramma</unitPattern>
-				<unitPattern count="other">{0} mikrogrammaa</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogrammat</displayName>
+				<unitPattern count="one">{0} kilogramma</unitPattern>
+				<unitPattern count="other">{0} kilogrammaa</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>grammat</displayName>
+				<unitPattern count="one">{0} gramma</unitPattern>
+				<unitPattern count="other">{0} grammaa</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>milligrammat</displayName>
 				<unitPattern count="one">{0} milligramma</unitPattern>
 				<unitPattern count="other">{0} milligrammaa</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>unssit</displayName>
-				<unitPattern count="one">{0} unssi</unitPattern>
-				<unitPattern count="other">{0} unssia</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>troy-unssit</displayName>
-				<unitPattern count="one">{0} troy-unssi</unitPattern>
-				<unitPattern count="other">{0} troy-unssia</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>paunat</displayName>
-				<unitPattern count="one">{0} pauna</unitPattern>
-				<unitPattern count="other">{0} paunaa</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>stonet</displayName>
-				<unitPattern count="one">{0} stone</unitPattern>
-				<unitPattern count="other">{0} stonea</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>mikrogrammat</displayName>
+				<unitPattern count="one">{0} mikrogramma</unitPattern>
+				<unitPattern count="other">{0} mikrogrammaa</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>US-tonnit</displayName>
 				<unitPattern count="one">{0} US-tonni</unitPattern>
 				<unitPattern count="other">{0} US-tonnia</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName>stonet</displayName>
+				<unitPattern count="one">{0} stone</unitPattern>
+				<unitPattern count="other">{0} stonea</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>paunat</displayName>
+				<unitPattern count="one">{0} pauna</unitPattern>
+				<unitPattern count="other">{0} paunaa</unitPattern>
+				<perUnitPattern>{0} / pauna</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>unssit</displayName>
+				<unitPattern count="one">{0} unssi</unitPattern>
+				<unitPattern count="other">{0} unssia</unitPattern>
+				<perUnitPattern>{0} / unssi</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>troy-unssit</displayName>
+				<unitPattern count="one">{0} troy-unssi</unitPattern>
+				<unitPattern count="other">{0} troy-unssia</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karaatit</displayName>
+				<unitPattern count="one">{0} karaatti</unitPattern>
+				<unitPattern count="other">{0} karaattia</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigawatit</displayName>
 				<unitPattern count="one">{0} gigawatti</unitPattern>
 				<unitPattern count="other">{0} gigawattia</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hevosvoimat</displayName>
-				<unitPattern count="one">{0} hevosvoima</unitPattern>
-				<unitPattern count="other">{0} hevosvoimaa</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilowatit</displayName>
-				<unitPattern count="one">{0} kilowatti</unitPattern>
-				<unitPattern count="other">{0} kilowattia</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>megawatit</displayName>
 				<unitPattern count="one">{0} megawatti</unitPattern>
 				<unitPattern count="other">{0} megawattia</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>milliwatit</displayName>
-				<unitPattern count="one">{0} milliwatti</unitPattern>
-				<unitPattern count="other">{0} milliwattia</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilowatit</displayName>
+				<unitPattern count="one">{0} kilowatti</unitPattern>
+				<unitPattern count="other">{0} kilowattia</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watit</displayName>
 				<unitPattern count="one">{0} watti</unitPattern>
 				<unitPattern count="other">{0} wattia</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>milliwatit</displayName>
+				<unitPattern count="one">{0} milliwatti</unitPattern>
+				<unitPattern count="other">{0} milliwattia</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hevosvoimat</displayName>
+				<unitPattern count="one">{0} hevosvoima</unitPattern>
+				<unitPattern count="other">{0} hevosvoimaa</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hehtopascalit</displayName>
 				<unitPattern count="one">{0} hehtopascal</unitPattern>
 				<unitPattern count="other">{0} hehtopascalia</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>elohopeatuumat</displayName>
-				<unitPattern count="one">{0} tuuma elohopeaa</unitPattern>
-				<unitPattern count="other">{0} tuumaa elohopeaa</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>millibaarit</displayName>
-				<unitPattern count="one">{0} millibaari</unitPattern>
-				<unitPattern count="other">{0} millibaaria</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>elohopeamillimetrit</displayName>
 				<unitPattern count="one">{0} millimetri elohopeaa</unitPattern>
@@ -7279,10 +7509,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} pauna neliötuumaa kohti</unitPattern>
 				<unitPattern count="other">{0} paunaa neliötuumaa kohti</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karaatit</displayName>
-				<unitPattern count="one">{0} karaatti</unitPattern>
-				<unitPattern count="other">{0} karaattia</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>elohopeatuumat</displayName>
+				<unitPattern count="one">{0} tuuma elohopeaa</unitPattern>
+				<unitPattern count="other">{0} tuumaa elohopeaa</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>millibaarit</displayName>
+				<unitPattern count="one">{0} millibaari</unitPattern>
+				<unitPattern count="other">{0} millibaaria</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometrit tunnissa</displayName>
@@ -7299,6 +7534,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} maili tunnissa</unitPattern>
 				<unitPattern count="other">{0} mailia tunnissa</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>solmu</displayName>
+				<unitPattern count="one">{0} solmu</unitPattern>
+				<unitPattern count="other">{0} solmua</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>celsiusasteet</displayName>
 				<unitPattern count="one">{0} celsiusaste</unitPattern>
@@ -7314,36 +7559,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kelvin</unitPattern>
 				<unitPattern count="other">{0} kelviniä</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>eekkerijalat</displayName>
-				<unitPattern count="one">{0} eekkerijalka</unitPattern>
-				<unitPattern count="other">{0} eekkerijalkaa</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>bushelit</displayName>
-				<unitPattern count="one">{0} busheli</unitPattern>
-				<unitPattern count="other">{0} bushelia</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>senttilitrat</displayName>
-				<unitPattern count="one">{0} senttilitra</unitPattern>
-				<unitPattern count="other">{0} senttilitraa</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>kuutiosenttimetrit</displayName>
-				<unitPattern count="one">{0} kuutiosenttimetri</unitPattern>
-				<unitPattern count="other">{0} kuutiosenttimetriä</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>kuutiojalat</displayName>
-				<unitPattern count="one">{0} kuutiojalka</unitPattern>
-				<unitPattern count="other">{0} kuutiojalkaa</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>kuutiotuumat</displayName>
-				<unitPattern count="one">{0} kuutiotuuma</unitPattern>
-				<unitPattern count="other">{0} kuutiotuumaa</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kuutiokilometrit</displayName>
 				<unitPattern count="one">{0} kuutiokilometri</unitPattern>
@@ -7353,6 +7568,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>kuutiometrit</displayName>
 				<unitPattern count="one">{0} kuutiometri</unitPattern>
 				<unitPattern count="other">{0} kuutiometriä</unitPattern>
+				<perUnitPattern>{0} / kuutiometri</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>kuutiosenttimetrit</displayName>
+				<unitPattern count="one">{0} kuutiosenttimetri</unitPattern>
+				<unitPattern count="other">{0} kuutiosenttimetriä</unitPattern>
+				<perUnitPattern>{0} / kuutiosenttimetri</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>kuutiomailit</displayName>
@@ -7364,25 +7586,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kuutiojaardi</unitPattern>
 				<unitPattern count="other">{0} kuutiojaardia</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>kupit</displayName>
-				<unitPattern count="one">{0} kuppi</unitPattern>
-				<unitPattern count="other">{0} kuppia</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>kuutiojalat</displayName>
+				<unitPattern count="one">{0} kuutiojalka</unitPattern>
+				<unitPattern count="other">{0} kuutiojalkaa</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>desilitrat</displayName>
-				<unitPattern count="one">{0} desilitra</unitPattern>
-				<unitPattern count="other">{0} desilitraa</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>kuutiotuumat</displayName>
+				<unitPattern count="one">{0} kuutiotuuma</unitPattern>
+				<unitPattern count="other">{0} kuutiotuumaa</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>nesteunssit</displayName>
-				<unitPattern count="one">{0} nesteunssi</unitPattern>
-				<unitPattern count="other">{0} nesteunssia</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gallonat</displayName>
-				<unitPattern count="one">{0} gallona</unitPattern>
-				<unitPattern count="other">{0} gallonaa</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megalitrat</displayName>
+				<unitPattern count="one">{0} megalitra</unitPattern>
+				<unitPattern count="other">{0} megalitraa</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hehtolitrat</displayName>
@@ -7393,27 +7610,69 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>litrat</displayName>
 				<unitPattern count="one">{0} litra</unitPattern>
 				<unitPattern count="other">{0} litraa</unitPattern>
+				<perUnitPattern>{0} litrassa</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalitrat</displayName>
-				<unitPattern count="one">{0} megalitra</unitPattern>
-				<unitPattern count="other">{0} megalitraa</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>desilitrat</displayName>
+				<unitPattern count="one">{0} desilitra</unitPattern>
+				<unitPattern count="other">{0} desilitraa</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>senttilitrat</displayName>
+				<unitPattern count="one">{0} senttilitra</unitPattern>
+				<unitPattern count="other">{0} senttilitraa</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>millilitrat</displayName>
 				<unitPattern count="one">{0} millilitra</unitPattern>
 				<unitPattern count="other">{0} millilitraa</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pintit</displayName>
-				<unitPattern count="one">{0} pint</unitPattern>
-				<unitPattern count="other">{0} pinttiä</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>tuopit</displayName>
+				<unitPattern count="one">{0} tuoppi</unitPattern>
+				<unitPattern count="other">{0} tuoppia</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>teekupit</displayName>
+				<unitPattern count="one">{0} teekuppi</unitPattern>
+				<unitPattern count="other">{0} teekuppia</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>eekkerijalat</displayName>
+				<unitPattern count="one">{0} eekkerijalka</unitPattern>
+				<unitPattern count="other">{0} eekkerijalkaa</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>bushelit</displayName>
+				<unitPattern count="one">{0} busheli</unitPattern>
+				<unitPattern count="other">{0} bushelia</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gallonat</displayName>
+				<unitPattern count="one">{0} gallona</unitPattern>
+				<unitPattern count="other">{0} gallonaa</unitPattern>
+				<perUnitPattern>{0} / gallona</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>neljännesgallonat</displayName>
 				<unitPattern count="one">{0} neljännesgallona</unitPattern>
 				<unitPattern count="other">{0} neljännesgallonaa</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pintit</displayName>
+				<unitPattern count="one">{0} pint</unitPattern>
+				<unitPattern count="other">{0} pinttiä</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>kupit</displayName>
+				<unitPattern count="one">{0} kuppi</unitPattern>
+				<unitPattern count="other">{0} kuppia</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>nesteunssit</displayName>
+				<unitPattern count="one">{0} nesteunssi</unitPattern>
+				<unitPattern count="other">{0} nesteunssia</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>ruokalusikat</displayName>
 				<unitPattern count="one">{0} ruokalusikka</unitPattern>
@@ -7424,6 +7683,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} teelusikka</unitPattern>
 				<unitPattern count="other">{0} teelusikkaa</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}I</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}P</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}L</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -7439,6 +7704,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="one">{0} rev</unitPattern>
+				<unitPattern count="other">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>′</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
@@ -7449,30 +7729,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>°</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ac</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ha</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ac</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ft²</displayName>
@@ -7483,91 +7775,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>in²</displayName>
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>ka</displayName>
+				<unitPattern count="one">{0} ka</unitPattern>
+				<unitPattern count="other">{0} ka</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
 				<unitPattern count="other">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>b</displayName>
-				<unitPattern count="one">{0} b</unitPattern>
-				<unitPattern count="other">{0} b</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>t</displayName>
-				<unitPattern count="one">{0} t</unitPattern>
-				<unitPattern count="other">{0} t</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>Gt</displayName>
-				<unitPattern count="one">{0} Gt</unitPattern>
-				<unitPattern count="other">{0} Gt</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kt</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>Mt</displayName>
-				<unitPattern count="one">{0} Mt</unitPattern>
-				<unitPattern count="other">{0} Mt</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>Tt</displayName>
 				<unitPattern count="one">{0} Tt</unitPattern>
 				<unitPattern count="other">{0} Tt</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>Gt</displayName>
+				<unitPattern count="one">{0} Gt</unitPattern>
+				<unitPattern count="other">{0} Gt</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>Mt</displayName>
+				<unitPattern count="one">{0} Mt</unitPattern>
+				<unitPattern count="other">{0} Mt</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kt</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>t</displayName>
+				<unitPattern count="one">{0} t</unitPattern>
+				<unitPattern count="other">{0} t</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>b</displayName>
+				<unitPattern count="one">{0} b</unitPattern>
+				<unitPattern count="other">{0} b</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>vs</displayName>
+				<unitPattern count="one">{0} vs</unitPattern>
+				<unitPattern count="other">{0} vs</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>v</displayName>
+				<unitPattern count="one">{0} v</unitPattern>
+				<unitPattern count="other">{0} v</unitPattern>
+				<perUnitPattern>{0}/v</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>kk</displayName>
+				<unitPattern count="one">{0} kk</unitPattern>
+				<unitPattern count="other">{0} kk</unitPattern>
+				<perUnitPattern>{0}/kk</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>vk</displayName>
+				<unitPattern count="one">{0} vk</unitPattern>
+				<unitPattern count="other">{0} vk</unitPattern>
+				<perUnitPattern>{0}/vk</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>pv</displayName>
 				<unitPattern count="one">{0} pv</unitPattern>
 				<unitPattern count="other">{0} pv</unitPattern>
+				<perUnitPattern>{0}/pv</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>t</displayName>
@@ -7575,30 +7882,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} t</unitPattern>
 				<perUnitPattern>{0}/t</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>kk</displayName>
-				<unitPattern count="one">{0} kk</unitPattern>
-				<unitPattern count="other">{0} kk</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sek</displayName>
@@ -7606,15 +7894,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} s</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>vk</displayName>
-				<unitPattern count="one">{0} vk</unitPattern>
-				<unitPattern count="other">{0} vk</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>v</displayName>
-				<unitPattern count="one">{0} v</unitPattern>
-				<unitPattern count="other">{0} v</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>A</displayName>
@@ -7636,6 +7929,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -7646,21 +7944,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kcal</unitPattern>
 				<unitPattern count="other">{0} kcal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>J</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -7671,216 +7964,220 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName>fm</displayName>
-				<unitPattern count="one">{0} fm</unitPattern>
-				<unitPattern count="other">{0} fm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>ft</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>fur</displayName>
-				<unitPattern count="one">{0} fur</unitPattern>
-				<unitPattern count="other">{0} fur</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>in</displayName>
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>vv</displayName>
-				<unitPattern count="one">{0} vv</unitPattern>
-				<unitPattern count="other">{0} vv</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mi</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="one">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>mpk</displayName>
-				<unitPattern count="one">{0} mpk</unitPattern>
-				<unitPattern count="other">{0} mpk</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yd</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ft</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>in</displayName>
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>vv</displayName>
+				<unitPattern count="one">{0} vv</unitPattern>
+				<unitPattern count="other">{0} vv</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>fur</displayName>
+				<unitPattern count="one">{0} fur</unitPattern>
+				<unitPattern count="other">{0} fur</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>fm</displayName>
+				<unitPattern count="one">{0} fm</unitPattern>
+				<unitPattern count="other">{0} fm</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>mpk</displayName>
+				<unitPattern count="one">{0} mpk</unitPattern>
+				<unitPattern count="other">{0} mpk</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>pnk</displayName>
+				<unitPattern count="one">{0} pnk</unitPattern>
+				<unitPattern count="other">{0} pnk</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>ka</displayName>
-				<unitPattern count="one">{0} ka</unitPattern>
-				<unitPattern count="other">{0} ka</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>st</displayName>
-				<unitPattern count="one">{0} st</unitPattern>
-				<unitPattern count="other">{0} st</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>US-tn</displayName>
 				<unitPattern count="one">{0} US-tn</unitPattern>
 				<unitPattern count="other">{0} US-tn</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName>st</displayName>
+				<unitPattern count="one">{0} st</unitPattern>
+				<unitPattern count="other">{0} st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>ka</displayName>
+				<unitPattern count="one">{0} ka</unitPattern>
+				<unitPattern count="other">{0} ka</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hv</displayName>
-				<unitPattern count="one">{0} hv</unitPattern>
-				<unitPattern count="other">{0} hv</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>W</displayName>
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hv</displayName>
+				<unitPattern count="one">{0} hv</unitPattern>
+				<unitPattern count="other">{0} hv</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -7891,10 +8188,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>ka</displayName>
-				<unitPattern count="one">{0} ka</unitPattern>
-				<unitPattern count="other">{0} ka</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -7911,6 +8213,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0} °C</unitPattern>
@@ -7926,36 +8238,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>bu</displayName>
-				<unitPattern count="one">{0} bu</unitPattern>
-				<unitPattern count="other">{0} bu</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -7965,6 +8247,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -7976,25 +8265,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>kp</displayName>
-				<unitPattern count="one">{0} kp</unitPattern>
-				<unitPattern count="other">{0} kp</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -8005,27 +8289,69 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>l</displayName>
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="one">{0} Ml</unitPattern>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
 				<unitPattern count="one">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>tp</displayName>
+				<unitPattern count="one">{0} tp</unitPattern>
+				<unitPattern count="other">{0} tp</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>tkp</displayName>
+				<unitPattern count="one">{0} tkp</unitPattern>
+				<unitPattern count="other">{0} tkp</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>bu</displayName>
+				<unitPattern count="one">{0} bu</unitPattern>
+				<unitPattern count="other">{0} bu</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>kp</displayName>
+				<unitPattern count="one">{0} kp</unitPattern>
+				<unitPattern count="other">{0} kp</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>rkl</displayName>
 				<unitPattern count="one">{0} rkl</unitPattern>
@@ -8036,6 +8362,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} tl</unitPattern>
 				<unitPattern count="other">{0} tl</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}I</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}P</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}L</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -8051,6 +8383,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}m/s²</unitPattern>
 				<unitPattern count="other">{0}m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="one">{0}rev</unitPattern>
+				<unitPattern count="other">{0}rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0}rad</unitPattern>
+				<unitPattern count="other">{0}rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>′</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
@@ -8061,30 +8408,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>°</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0}rad</unitPattern>
-				<unitPattern count="other">{0}rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ac</displayName>
-				<unitPattern count="one">{0}ac</unitPattern>
-				<unitPattern count="other">{0}ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0}km²</unitPattern>
+				<unitPattern count="other">{0}km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ha</displayName>
 				<unitPattern count="one">{0}ha</unitPattern>
 				<unitPattern count="other">{0}ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0}m²</unitPattern>
+				<unitPattern count="other">{0}m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0}cm²</unitPattern>
 				<unitPattern count="other">{0}cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0}mi²</unitPattern>
+				<unitPattern count="other">{0}mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ac</displayName>
+				<unitPattern count="one">{0}ac</unitPattern>
+				<unitPattern count="other">{0}ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0}yd²</unitPattern>
+				<unitPattern count="other">{0}yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ft²</displayName>
@@ -8095,91 +8454,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>in²</displayName>
 				<unitPattern count="one">{0}in²</unitPattern>
 				<unitPattern count="other">{0}in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0}km²</unitPattern>
-				<unitPattern count="other">{0}km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0}m²</unitPattern>
-				<unitPattern count="other">{0}m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">{0}mi²</unitPattern>
-				<unitPattern count="other">{0}mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0}yd²</unitPattern>
-				<unitPattern count="other">{0}yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>ka</displayName>
+				<unitPattern count="one">{0}ka</unitPattern>
+				<unitPattern count="other">{0}ka</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0}l/km</unitPattern>
 				<unitPattern count="other">{0}l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100km</displayName>
+				<unitPattern count="one">{0}l/100km</unitPattern>
+				<unitPattern count="other">{0}l/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="one">{0}mpg</unitPattern>
 				<unitPattern count="other">{0}mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>b</displayName>
-				<unitPattern count="one">{0}b</unitPattern>
-				<unitPattern count="other">{0}b</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>t</displayName>
-				<unitPattern count="one">{0}t</unitPattern>
-				<unitPattern count="other">{0}t</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0}Gb</unitPattern>
-				<unitPattern count="other">{0}Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>Gt</displayName>
-				<unitPattern count="one">{0}Gt</unitPattern>
-				<unitPattern count="other">{0}Gt</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0}kb</unitPattern>
-				<unitPattern count="other">{0}kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kt</displayName>
-				<unitPattern count="one">{0}kt</unitPattern>
-				<unitPattern count="other">{0}kt</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0}Mb</unitPattern>
-				<unitPattern count="other">{0}Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>Mt</displayName>
-				<unitPattern count="one">{0}Mt</unitPattern>
-				<unitPattern count="other">{0}Mt</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0}Tb</unitPattern>
-				<unitPattern count="other">{0}Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>Tt</displayName>
 				<unitPattern count="one">{0}Tt</unitPattern>
 				<unitPattern count="other">{0}Tt</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0}Tb</unitPattern>
+				<unitPattern count="other">{0}Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>Gt</displayName>
+				<unitPattern count="one">{0}Gt</unitPattern>
+				<unitPattern count="other">{0}Gt</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0}Gb</unitPattern>
+				<unitPattern count="other">{0}Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>Mt</displayName>
+				<unitPattern count="one">{0}Mt</unitPattern>
+				<unitPattern count="other">{0}Mt</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0}Mb</unitPattern>
+				<unitPattern count="other">{0}Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kt</displayName>
+				<unitPattern count="one">{0}kt</unitPattern>
+				<unitPattern count="other">{0}kt</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0}kb</unitPattern>
+				<unitPattern count="other">{0}kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>t</displayName>
+				<unitPattern count="one">{0}t</unitPattern>
+				<unitPattern count="other">{0}t</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>b</displayName>
+				<unitPattern count="one">{0}b</unitPattern>
+				<unitPattern count="other">{0}b</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>vs</displayName>
+				<unitPattern count="one">{0} vs</unitPattern>
+				<unitPattern count="other">{0} vs</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>v</displayName>
+				<unitPattern count="one">{0}v</unitPattern>
+				<unitPattern count="other">{0}v</unitPattern>
+				<perUnitPattern>{0}/v</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>kk</displayName>
+				<unitPattern count="one">{0}kk</unitPattern>
+				<unitPattern count="other">{0}kk</unitPattern>
+				<perUnitPattern>{0}/kk</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>vk</displayName>
+				<unitPattern count="one">{0}vk</unitPattern>
+				<unitPattern count="other">{0}vk</unitPattern>
+				<perUnitPattern>{0}/vk</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>pv</displayName>
 				<unitPattern count="one">{0}pv</unitPattern>
 				<unitPattern count="other">{0}pv</unitPattern>
+				<perUnitPattern>{0}/pv</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>t</displayName>
@@ -8187,30 +8561,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0}t</unitPattern>
 				<perUnitPattern>{0}/t</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0}μs</unitPattern>
-				<unitPattern count="other">{0}μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0}ms</unitPattern>
-				<unitPattern count="other">{0}ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0}min</unitPattern>
 				<unitPattern count="other">{0}min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>kk</displayName>
-				<unitPattern count="one">{0}kk</unitPattern>
-				<unitPattern count="other">{0}kk</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="one">{0}ns</unitPattern>
-				<unitPattern count="other">{0}ns</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>s</displayName>
@@ -8218,15 +8573,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0}s</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>vk</displayName>
-				<unitPattern count="one">{0}vk</unitPattern>
-				<unitPattern count="other">{0}vk</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0}ms</unitPattern>
+				<unitPattern count="other">{0}ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>v</displayName>
-				<unitPattern count="one">{0}v</unitPattern>
-				<unitPattern count="other">{0}v</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0}μs</unitPattern>
+				<unitPattern count="other">{0}μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0}ns</unitPattern>
+				<unitPattern count="other">{0}ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>A</displayName>
@@ -8248,6 +8608,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}V</unitPattern>
 				<unitPattern count="other">{0}V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0}kcal</unitPattern>
+				<unitPattern count="other">{0}kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0}cal</unitPattern>
@@ -8258,21 +8623,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}kcal</unitPattern>
 				<unitPattern count="other">{0}kcal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>J</displayName>
-				<unitPattern count="one">{0}J</unitPattern>
-				<unitPattern count="other">{0}J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0}kcal</unitPattern>
-				<unitPattern count="other">{0}kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0}kJ</unitPattern>
 				<unitPattern count="other">{0}kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0}J</unitPattern>
+				<unitPattern count="other">{0}J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0}kWh</unitPattern>
@@ -8283,216 +8643,220 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}GHz</unitPattern>
 				<unitPattern count="other">{0}GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0}Hz</unitPattern>
-				<unitPattern count="other">{0}Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0}MHz</unitPattern>
+				<unitPattern count="other">{0}MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0}kHz</unitPattern>
 				<unitPattern count="other">{0}kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0}MHz</unitPattern>
-				<unitPattern count="other">{0}MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0}Hz</unitPattern>
+				<unitPattern count="other">{0}Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0}au</unitPattern>
-				<unitPattern count="other">{0}au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0}km</unitPattern>
+				<unitPattern count="other">{0}km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0}cm</unitPattern>
-				<unitPattern count="other">{0}cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0}m</unitPattern>
+				<unitPattern count="other">{0}m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0}dm</unitPattern>
 				<unitPattern count="other">{0}dm</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName>fm</displayName>
-				<unitPattern count="one">{0}fm</unitPattern>
-				<unitPattern count="other">{0}fm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>ft</displayName>
-				<unitPattern count="one">{0}′</unitPattern>
-				<unitPattern count="other">{0}′</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>fur</displayName>
-				<unitPattern count="one">{0}fur</unitPattern>
-				<unitPattern count="other">{0}fur</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>in</displayName>
-				<unitPattern count="one">{0}″</unitPattern>
-				<unitPattern count="other">{0}″</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0}km</unitPattern>
-				<unitPattern count="other">{0}km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>vv</displayName>
-				<unitPattern count="one">{0}vv</unitPattern>
-				<unitPattern count="other">{0}vv</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-				<unitPattern count="one">{0}m</unitPattern>
-				<unitPattern count="other">{0}m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0}µm</unitPattern>
-				<unitPattern count="other">{0}µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mi</displayName>
-				<unitPattern count="one">{0}mi</unitPattern>
-				<unitPattern count="other">{0}mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0}cm</unitPattern>
+				<unitPattern count="other">{0}cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="one">{0}mm</unitPattern>
 				<unitPattern count="other">{0}mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0}µm</unitPattern>
+				<unitPattern count="other">{0}µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0}nm</unitPattern>
 				<unitPattern count="other">{0}nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>mpk</displayName>
-				<unitPattern count="one">{0}mpk</unitPattern>
-				<unitPattern count="other">{0}mpk</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0}pc</unitPattern>
-				<unitPattern count="other">{0}pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0}pm</unitPattern>
 				<unitPattern count="other">{0}pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="one">{0}mi</unitPattern>
+				<unitPattern count="other">{0}mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yd</displayName>
 				<unitPattern count="one">{0}yd</unitPattern>
 				<unitPattern count="other">{0}yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ft</displayName>
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="other">{0}′</unitPattern>
+				<perUnitPattern>{0}/′</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>in</displayName>
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+				<perUnitPattern>{0}/″</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0}pc</unitPattern>
+				<unitPattern count="other">{0}pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>vv</displayName>
+				<unitPattern count="one">{0}vv</unitPattern>
+				<unitPattern count="other">{0}vv</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0}au</unitPattern>
+				<unitPattern count="other">{0}au</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>fur</displayName>
+				<unitPattern count="one">{0}fur</unitPattern>
+				<unitPattern count="other">{0}fur</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>fm</displayName>
+				<unitPattern count="one">{0}fm</unitPattern>
+				<unitPattern count="other">{0}fm</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>mpk</displayName>
+				<unitPattern count="one">{0}mpk</unitPattern>
+				<unitPattern count="other">{0}mpk</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>pnk</displayName>
+				<unitPattern count="one">{0} pnk</unitPattern>
+				<unitPattern count="other">{0} pnk</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0}lx</unitPattern>
 				<unitPattern count="other">{0}lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>ka</displayName>
-				<unitPattern count="one">{0}ka</unitPattern>
-				<unitPattern count="other">{0}ka</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0}g</unitPattern>
-				<unitPattern count="other">{0}g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0}kg</unitPattern>
-				<unitPattern count="other">{0}kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0}t</unitPattern>
 				<unitPattern count="other">{0}t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0}μg</unitPattern>
-				<unitPattern count="other">{0}μg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0}kg</unitPattern>
+				<unitPattern count="other">{0}kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0}g</unitPattern>
+				<unitPattern count="other">{0}g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0}mg</unitPattern>
 				<unitPattern count="other">{0}mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="one">{0}oz</unitPattern>
-				<unitPattern count="other">{0}oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="one">{0}oz t</unitPattern>
-				<unitPattern count="other">{0}oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="one">{0}lb</unitPattern>
-				<unitPattern count="other">{0}lb</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>st</displayName>
-				<unitPattern count="one">{0}st</unitPattern>
-				<unitPattern count="other">{0}st</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0}μg</unitPattern>
+				<unitPattern count="other">{0}μg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>US-tn</displayName>
 				<unitPattern count="one">{0}US-tn</unitPattern>
 				<unitPattern count="other">{0}US-tn</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName>st</displayName>
+				<unitPattern count="one">{0}st</unitPattern>
+				<unitPattern count="other">{0}st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0}lb</unitPattern>
+				<unitPattern count="other">{0}lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0}oz</unitPattern>
+				<unitPattern count="other">{0}oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0}oz t</unitPattern>
+				<unitPattern count="other">{0}oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>ka</displayName>
+				<unitPattern count="one">{0}ka</unitPattern>
+				<unitPattern count="other">{0}ka</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0}GW</unitPattern>
 				<unitPattern count="other">{0}GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hv</displayName>
-				<unitPattern count="one">{0}hv</unitPattern>
-				<unitPattern count="other">{0}hv</unitPattern>
+			<unit type="power-megawatt">
+				<displayName>MW</displayName>
+				<unitPattern count="one">{0}MW</unitPattern>
+				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName>kW</displayName>
 				<unitPattern count="one">{0}kW</unitPattern>
 				<unitPattern count="other">{0}kW</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<displayName>MW</displayName>
-				<unitPattern count="one">{0}GW</unitPattern>
-				<unitPattern count="other">{0}GW</unitPattern>
+			<unit type="power-watt">
+				<displayName>W</displayName>
+				<unitPattern count="one">{0}W</unitPattern>
+				<unitPattern count="other">{0}W</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<displayName>mW</displayName>
 				<unitPattern count="one">{0}mW</unitPattern>
 				<unitPattern count="other">{0}mW</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName>W</displayName>
-				<unitPattern count="one">{0}W</unitPattern>
-				<unitPattern count="other">{0}W</unitPattern>
+			<unit type="power-horsepower">
+				<displayName>hv</displayName>
+				<unitPattern count="one">{0}hv</unitPattern>
+				<unitPattern count="other">{0}hv</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0}hPa</unitPattern>
 				<unitPattern count="other">{0}hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0}″ Hg</unitPattern>
-				<unitPattern count="other">{0}″ Hg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0}mbar</unitPattern>
-				<unitPattern count="other">{0}mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0}mm Hg</unitPattern>
@@ -8503,10 +8867,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}psi</unitPattern>
 				<unitPattern count="other">{0}psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>ka</displayName>
-				<unitPattern count="one">{0}ka</unitPattern>
-				<unitPattern count="other">{0}ka</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0}″ Hg</unitPattern>
+				<unitPattern count="other">{0}″ Hg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0}mbar</unitPattern>
+				<unitPattern count="other">{0}mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -8523,6 +8892,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}mi/h</unitPattern>
 				<unitPattern count="other">{0}mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0}°</unitPattern>
@@ -8538,36 +8917,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}K</unitPattern>
 				<unitPattern count="other">{0}K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0}ac ft</unitPattern>
-				<unitPattern count="other">{0}ac ft</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>bu</displayName>
-				<unitPattern count="one">{0}bu</unitPattern>
-				<unitPattern count="other">{0}bu</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0}cl</unitPattern>
-				<unitPattern count="other">{0}cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0}cm³</unitPattern>
-				<unitPattern count="other">{0}cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0}ft³</unitPattern>
-				<unitPattern count="other">{0}ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0}in³</unitPattern>
-				<unitPattern count="other">{0}in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0}km³</unitPattern>
@@ -8576,7 +8925,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-cubic-meter">
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0}m³</unitPattern>
-				<unitPattern count="other">{0}m³</unitPattern>
+				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0}cm³</unitPattern>
+				<unitPattern count="other">{0}cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -8588,25 +8944,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}yd³</unitPattern>
 				<unitPattern count="other">{0}yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>kp</displayName>
-				<unitPattern count="one">{0}kp</unitPattern>
-				<unitPattern count="other">{0}kp</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0}ft³</unitPattern>
+				<unitPattern count="other">{0}ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0}dl</unitPattern>
-				<unitPattern count="other">{0}dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0}in³</unitPattern>
+				<unitPattern count="other">{0}in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0}fl oz</unitPattern>
-				<unitPattern count="other">{0}fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0}gal</unitPattern>
-				<unitPattern count="other">{0}gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0}Ml</unitPattern>
+				<unitPattern count="other">{0}Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -8617,27 +8968,69 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>l</displayName>
 				<unitPattern count="one">{0}l</unitPattern>
 				<unitPattern count="other">{0}l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="one">{0}Ml</unitPattern>
-				<unitPattern count="other">{0}Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0}dl</unitPattern>
+				<unitPattern count="other">{0}dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0}cl</unitPattern>
+				<unitPattern count="other">{0}cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
 				<unitPattern count="one">{0}ml</unitPattern>
 				<unitPattern count="other">{0}ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="one">{0}pt</unitPattern>
-				<unitPattern count="other">{0}pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>tp</displayName>
+				<unitPattern count="one">{0} tp</unitPattern>
+				<unitPattern count="other">{0} tp</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>tkp</displayName>
+				<unitPattern count="one">{0} tkp</unitPattern>
+				<unitPattern count="other">{0} tkp</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0}ac ft</unitPattern>
+				<unitPattern count="other">{0}ac ft</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>bu</displayName>
+				<unitPattern count="one">{0}bu</unitPattern>
+				<unitPattern count="other">{0}bu</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0}gal</unitPattern>
+				<unitPattern count="other">{0}gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="one">{0}qt</unitPattern>
 				<unitPattern count="other">{0}qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0}pt</unitPattern>
+				<unitPattern count="other">{0}pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>kp</displayName>
+				<unitPattern count="one">{0}kp</unitPattern>
+				<unitPattern count="other">{0}kp</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0}fl oz</unitPattern>
+				<unitPattern count="other">{0}fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>rkl</displayName>
 				<unitPattern count="one">{0}rkl</unitPattern>
@@ -8648,6 +9041,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}tl</unitPattern>
 				<unitPattern count="other">{0}tl</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}I</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}P</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}L</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h.mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fi_FI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fi_FI.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fi_FI.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fi_FI.xml
index a1324d8c3c1..88f01156216 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fi_FI.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fi_FI.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fi"/>
 		<territory type="FI"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fil.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fil.xml
similarity index 79%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fil.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fil.xml
index d4cd330d16b..3fc2c90e911 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fil.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fil.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="fil"/>
 	</identity>
 	<localeDisplayNames>
@@ -36,6 +35,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bem">Bemba</language>
 			<language type="bez">Bena</language>
 			<language type="bg">Bulgarian</language>
+			<language type="bgn">Kanlurang Balochi</language>
 			<language type="bm">Bambara</language>
 			<language type="bn">Bengali</language>
 			<language type="bo">Tibetan</language>
@@ -43,15 +43,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="brx">Bodo</language>
 			<language type="bs">Bosnian</language>
 			<language type="ca">Catalan</language>
+			<language type="ce">Chechen</language>
 			<language type="cgg">Chiga</language>
 			<language type="chr">Cherokee</language>
-			<language type="ckb">Sorani Kurdish</language>
+			<language type="ckb">Central Kurdish</language>
 			<language type="co">Corsican</language>
 			<language type="cs">Czech</language>
+			<language type="cv">Chuvash</language>
 			<language type="cy">Welsh</language>
 			<language type="da">Danish</language>
 			<language type="dav">Taita</language>
 			<language type="de">German</language>
+			<language type="de_AT">Austrian German</language>
+			<language type="de_CH">Swiss High German</language>
 			<language type="dje">Zarma</language>
 			<language type="dsb">Lower Sorbian</language>
 			<language type="dua">Duala</language>
@@ -65,15 +69,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="en">Ingles</language>
 			<language type="en_AU">Ingles ng Australya</language>
 			<language type="en_CA">Ingles sa Canada</language>
-			<language type="en_GB">Ingles (UK)</language>
-			<language type="en_GB" alt="short">Ingles (U.K.)</language>
+			<language type="en_GB">Ingles ng British</language>
+			<language type="en_GB" alt="short">Ingles ng UK</language>
 			<language type="en_US">Ingles (US)</language>
-			<language type="en_US" alt="short">Ingles (U.S.)</language>
+			<language type="en_US" alt="short">Ingles sa US</language>
 			<language type="eo">Esperanto</language>
-			<language type="es">Spanish</language>
-			<language type="es_419">Latin American Spanish</language>
+			<language type="es">Espanyol</language>
+			<language type="es_419">Latin American na Espanyol</language>
 			<language type="es_ES">European Spanish</language>
-			<language type="es_MX">Mexican Spanish</language>
+			<language type="es_MX">Espanyol ng Mehiko</language>
 			<language type="et">Estonian</language>
 			<language type="eu">Basque</language>
 			<language type="fa">Persian</language>
@@ -84,7 +88,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="fr">French</language>
 			<language type="fr_CA">Canadian French</language>
 			<language type="fr_CH">Swiss French</language>
-			<language type="fy">Western Frisian</language>
+			<language type="fy">Kanlurang Frisian</language>
 			<language type="ga">Irish</language>
 			<language type="gaa">Ga</language>
 			<language type="gag">Gagauz</language>
@@ -146,6 +150,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ln">Lingala</language>
 			<language type="lo">Lao</language>
 			<language type="loz">Lozi</language>
+			<language type="lrc">Hilagang Luri</language>
 			<language type="lt">Lithuanian</language>
 			<language type="lu">Luba-Katanga</language>
 			<language type="lua">Luba-Lulua</language>
@@ -168,9 +173,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mt">Maltese</language>
 			<language type="mua">Mundang</language>
 			<language type="my">Burmese</language>
+			<language type="mzn">Mazanderani</language>
 			<language type="naq">Nama</language>
 			<language type="nb">Norwegian Bokmal</language>
-			<language type="nd">North Ndebele</language>
+			<language type="nd">Hilagang Ndebele</language>
+			<language type="nds">Low German</language>
+			<language type="nds_NL">Low Saxon</language>
 			<language type="ne">Nepali</language>
 			<language type="nl">Dutch</language>
 			<language type="nl_BE">Flemish</language>
@@ -191,7 +199,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ps">Pashto</language>
 			<language type="ps" alt="variant">Pushto</language>
 			<language type="pt">Portuges</language>
-			<language type="pt_BR">Brazilian Portuguese</language>
+			<language type="pt_BR">Portuges ng Brasil</language>
 			<language type="pt_PT">European Portuguese</language>
 			<language type="qu">Quechua</language>
 			<language type="quc">Kʼicheʼ</language>
@@ -207,7 +215,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="saq">Samburu</language>
 			<language type="sbp">Sangu</language>
 			<language type="sd">Sindhi</language>
-			<language type="se">Northern Sami</language>
+			<language type="sdh">Katimugang Kurdish</language>
+			<language type="se">Hilagang Sami</language>
 			<language type="seh">Sena</language>
 			<language type="ses">Koyraboro Senni</language>
 			<language type="sg">Sango</language>
@@ -217,7 +226,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sk">Slovak</language>
 			<language type="sl">Slovenian</language>
 			<language type="sm">Samoan</language>
-			<language type="sma">Southern Sami</language>
+			<language type="sma">Katimugang Sami</language>
 			<language type="smj">Lule Sami</language>
 			<language type="smn">Inari Sami</language>
 			<language type="sms">Skolt Sami</language>
@@ -230,8 +239,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="su">Sundanese</language>
 			<language type="sv">Swedish</language>
 			<language type="sw">Swahili</language>
+			<language type="sw_CD">Swahili (Congo)</language>
 			<language type="swb">Comorian</language>
-			<language type="swc">Swahili (Congo)</language>
 			<language type="ta">Tamil</language>
 			<language type="te">Telugu</language>
 			<language type="teo">Teso</language>
@@ -263,6 +272,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ve">Venda</language>
 			<language type="vi">Vietnamese</language>
 			<language type="vun">Vunjo</language>
+			<language type="wbp">Warlpiri</language>
 			<language type="wo">Wolof</language>
 			<language type="xh">Xhosa</language>
 			<language type="xog">Soga</language>
@@ -272,6 +282,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="zgh">Standard Moroccan Tamazight</language>
 			<language type="zh">Chinese</language>
 			<language type="zh_Hans">Simplified Chinese</language>
+			<language type="zh_Hant" draft="provisional">Chinese (Traditional)</language>
 			<language type="zu">Zulu</language>
 			<language type="zxx">Walang nilalaman na ukol sa wika</language>
 		</languages>
@@ -291,10 +302,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Guru">Gurmukhi</script>
 			<script type="Hang">Hangul</script>
 			<script type="Hani">Han</script>
-			<script type="Hans">Simplified</script>
-			<script type="Hans" alt="stand-alone">Simplified Han</script>
-			<script type="Hant">Traditional</script>
-			<script type="Hant" alt="stand-alone">Traditional Han</script>
+			<script type="Hans">Pinasimple</script>
+			<script type="Hans" alt="stand-alone">Pinasimpleng Han</script>
+			<script type="Hant">Tradisyonal</script>
+			<script type="Hant" alt="stand-alone">Tradisyonal na Han</script>
 			<script type="Hebr">Hebrew</script>
 			<script type="Hira">Hiragana</script>
 			<script type="Jpan">Japanese</script>
@@ -323,7 +334,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="001">Mundo</territory>
 			<territory type="002">Africa</territory>
 			<territory type="003">Hilagang Amerika</territory>
-			<territory type="005">South America</territory>
+			<territory type="005">Timog Amerika</territory>
 			<territory type="009">Oceania</territory>
 			<territory type="011">Kanlurang Africa</territory>
 			<territory type="013">Gitnang Amerika</territory>
@@ -332,7 +343,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="017">Gitnang Africa</territory>
 			<territory type="018">Katimugang Africa</territory>
 			<territory type="019">Americas</territory>
-			<territory type="021">Rehiyon ng Hilagang Amerika</territory>
+			<territory type="021">Northern America</territory>
 			<territory type="029">Carribbean</territory>
 			<territory type="030">Silangang Asya</territory>
 			<territory type="034">Katimugang Asya</territory>
@@ -358,7 +369,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Netherlands Antilles</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antarctica</territory>
 			<territory type="AR">Argentina</territory>
@@ -395,7 +405,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CD" alt="variant">Congo (DRC)</territory>
 			<territory type="CF">Central African Republic</territory>
 			<territory type="CG">Congo - Brazzaville</territory>
-			<territory type="CG" alt="variant">Congo (Republic)</territory>
+			<territory type="CG" alt="variant">Congo (Republika)</territory>
 			<territory type="CH">Switzerland</territory>
 			<territory type="CI">Côte d’Ivoire</territory>
 			<territory type="CI" alt="variant">Ivory Coast</territory>
@@ -483,8 +493,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="KI">Kiribati</territory>
 			<territory type="KM">Comoros</territory>
 			<territory type="KN">Saint Kitts and Nevis</territory>
-			<territory type="KP">North Korea</territory>
-			<territory type="KR">South Korea</territory>
+			<territory type="KP">Hilagang Korea</territory>
+			<territory type="KR">Timog Korea</territory>
 			<territory type="KW">Kuwait</territory>
 			<territory type="KY">Cayman Islands</territory>
 			<territory type="KZ">Kazakhstan</territory>
@@ -638,6 +648,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric">Numeric na Pag-uuri-uri</key>
 			<key type="colStrength">Lakas ng Pag-uuri-uri</key>
 			<key type="currency">Pera</key>
+			<key type="hc">Siklo ng Oras (12 laban sa 24)</key>
+			<key type="lb">Estilo ng Putol ng Linya</key>
+			<key type="ms">Sistema ng Pagsukat</key>
 			<key type="numbers">Mga Numero</key>
 			<key type="timezone">Time Zone</key>
 			<key type="va">Lokal na Variant</key>
@@ -645,95 +658,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">Pribadong Paggamit</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Arabic-Indic na Mga Digit</type>
-			<type type="arabext" key="numbers">Extendend Arabic-Indic na Mga Digit</type>
-			<type type="armn" key="numbers">Armenian na Mga Numeral</type>
-			<type type="armnlow" key="numbers">Armenian Lowercase Numerals</type>
-			<type type="beng" key="numbers">Bengali na Mga Digit</type>
-			<type type="big5han" key="collation">Pagkakasunod-sunod ng Pag-uuri ng Tradisyunal na Chinese - Big5</type>
-			<type type="buddhist" key="calendar">Kalendaryo ng Buddhist</type>
-			<type type="chinese" key="calendar">Kalendaryong Chinese</type>
-			<type type="coptic" key="calendar">Coptic Calendar</type>
-			<type type="dangi" key="calendar">Dangi na Kalendaryo</type>
-			<type type="deva" key="numbers">Devanagari na Mga Digit</type>
-			<type type="dictionary" key="collation">Pagkakasunud-sunod ng Pag-uuri ng Diksyunaryo</type>
-			<type type="ducet" key="collation">Default na Pagkakasunud-sunod ng Ayos ng Unicode</type>
-			<type type="ethi" key="numbers">Mga Numeral ng Ethiopia</type>
-			<type type="ethiopic" key="calendar">Kalendaryo ng Ethiopia</type>
-			<type type="ethiopic-amete-alem" key="calendar">Kalendaryong Ethiopic Amete Alem</type>
-			<type type="finance" key="numbers">Mga Pampinansyang Numeral</type>
-			<type type="fullwide" key="numbers">Full Width Digits</type>
-			<type type="gb2312han" key="collation">Pagkakasunud-sunod ng Pag-uuri ng Pinasimpleng Chinese - GB2312</type>
-			<type type="geor" key="numbers">Georgian na Mga Numeral</type>
-			<type type="gregorian" key="calendar">Gregorian na Kalendaryo</type>
-			<type type="grek" key="numbers">Greek na Mga Numeral</type>
-			<type type="greklow" key="numbers">Greek Lowercase Numerals</type>
-			<type type="gujr" key="numbers">Gujarati na Mga Digit</type>
-			<type type="guru" key="numbers">Gurmukhi na Mga Digit</type>
-			<type type="hanidec" key="numbers">Chinese Decimal na Mga Numeral</type>
-			<type type="hans" key="numbers">Simplified Chinese na Mga Numeral</type>
-			<type type="hansfin" key="numbers">Simplified Chinese na Mga Numeral para sa Pananalapi</type>
-			<type type="hant" key="numbers">Traditional Chinese na Mga Numeral</type>
-			<type type="hantfin" key="numbers">Traditional Chinese na Mga Numeral para sa Pananalapi</type>
-			<type type="hebr" key="numbers">Hebrew na Mga Numeral</type>
-			<type type="hebrew" key="calendar">Hebrew na Kalendaryo</type>
-			<type type="identical" key="colStrength">Pag-uri-uriin Lahat</type>
-			<type type="indian" key="calendar">Pambansang Kalendaryong Indian</type>
-			<type type="islamic" key="calendar">Kalendaryong Islamic</type>
-			<type type="islamic-civil" key="calendar">Kalendaryong Islamic-Civil</type>
-			<type type="iso8601" key="calendar">ISO-8601 na Kalendaryo</type>
-			<type type="japanese" key="calendar">Kalendaryong Japanese</type>
-			<type type="jpan" key="numbers">Japanese na Mga Numeral</type>
-			<type type="jpanfin" key="numbers">Japanese na Mga Numeral para sa Pananalapi</type>
-			<type type="khmr" key="numbers">Khmer na Mga Digit</type>
-			<type type="knda" key="numbers">Kannada na Mga Digit</type>
-			<type type="laoo" key="numbers">Lao na Mga Digit</type>
-			<type type="latn" key="numbers">Western Digits</type>
-			<type type="lower" key="colCaseFirst">Lowercase Muna ang Pag-uri-uriin</type>
-			<type type="mlym" key="numbers">Malayalam na Mga Digit</type>
-			<type type="mong" key="numbers">Mongolian Digits</type>
-			<type type="mymr" key="numbers">Myanmar na Mga Digit</type>
-			<type type="native" key="numbers">Mga Native na Digit</type>
-			<type type="no" key="colBackwards">Pag-uri-uriin ang Mga Accent nang Normal</type>
-			<type type="no" key="colCaseFirst">Pag-uri-uriin ang Ayos ng Normal na Case</type>
-			<type type="no" key="colCaseLevel">Pag-uri-uriin ang Hindi Case Sensitive</type>
-			<type type="no" key="colHiraganaQuaternary">Pag-uri-uriin ang Kana nang Hiwalay</type>
-			<type type="no" key="colNormalization">Pag-uri-uriin nang Walang Pag-normalize</type>
-			<type type="no" key="colNumeric">Pag-uri-uriin ang Mga Digit nang Indibidwal</type>
-			<type type="non-ignorable" key="colAlternate">Pag-uri-uriin ang Mga Simbolo</type>
-			<type type="orya" key="numbers">Oriya na Mga Digit</type>
-			<type type="persian" key="calendar">Kalendaryong Persian</type>
-			<type type="phonebook" key="collation">Pagkakasunud-sunod ng Pag-uuri ng Phonebook</type>
-			<type type="phonetic" key="collation">Phonetic na Ayos ng Pag-uuri-uri</type>
-			<type type="pinyin" key="collation">Pagkakasunud-sunod ng Pag-uuri ng Pinyin</type>
-			<type type="primary" key="colStrength">Mga Base na Titik Lang ang Pag-uri-uriin</type>
-			<type type="quaternary" key="colStrength">Pag-uri-uriin ang Mga Accent/Case/Lapad/Kana</type>
-			<type type="reformed" key="collation">Pagkakasunud-sunod ng Pag-uuri ng Na-reform</type>
-			<type type="roc" key="calendar">Kalendaryong Minguo</type>
-			<type type="roman" key="numbers">Mga Roman Numeral</type>
-			<type type="romanlow" key="numbers">Roman Lowercase Numerals</type>
-			<type type="search" key="collation">Pangkalahatang Paghahanap</type>
-			<type type="searchjl" key="collation">Maghanap Ayon sa Unang Katinig ng Hangul</type>
-			<type type="secondary" key="colStrength">Pag-uri-uriin ang Mga Accent</type>
-			<type type="shifted" key="colAlternate">Pag-uri-uriin ang Mga Ignoring Symbol</type>
-			<type type="standard" key="collation">Karaniwang Pagkakasunud-sunod ng Ayos</type>
-			<type type="stroke" key="collation">Pagkakasunud-sunod ng Pag-uuri ng Stroke</type>
-			<type type="taml" key="numbers">Tamil na Mga Numeral</type>
-			<type type="tamldec" key="numbers">Tamil na Mga Digit</type>
-			<type type="telu" key="numbers">Telugu na Mga Digit</type>
-			<type type="tertiary" key="colStrength">Pag-uri-uriin ang Mga Accent/Case/Lapad</type>
-			<type type="thai" key="numbers">Thai na Mga Digit</type>
-			<type type="tibt" key="numbers">Tibetan na Mga Digit</type>
-			<type type="traditional" key="collation">Tradisyunal na Pagkakasunud-sunod ng Pag-uuri</type>
-			<type type="traditional" key="numbers">Mga Tradisyunal na Numeral</type>
-			<type type="unihan" key="collation">Pagkakasunud-sunod ng Pag-uuri ng Radical-Stroke</type>
-			<type type="upper" key="colCaseFirst">Uppercase Muna ang Pag-uri-uriin</type>
-			<type type="vaii" key="numbers">Mga Vai na Digit</type>
-			<type type="yes" key="colBackwards">Pag-uri-uriin ang Mga Accent nang Baliktad</type>
-			<type type="yes" key="colCaseLevel">Pag-uri-uriin ang Case Sensitive</type>
-			<type type="yes" key="colHiraganaQuaternary">Pag-uri-uriin ang Kana nang Naiiba</type>
-			<type type="yes" key="colNormalization">Pag-uri-uriin ang Unicode nang Normalized</type>
-			<type type="yes" key="colNumeric">Pag-uri-uriin ang Mga Digit nang Numerical</type>
+			<type key="calendar" type="buddhist">Kalendaryo ng Buddhist</type>
+			<type key="calendar" type="chinese">Kalendaryong Chinese</type>
+			<type key="calendar" type="coptic">Coptic Calendar</type>
+			<type key="calendar" type="dangi">Dangi na Kalendaryo</type>
+			<type key="calendar" type="ethiopic">Kalendaryo ng Ethiopia</type>
+			<type key="calendar" type="ethiopic-amete-alem">Kalendaryong Ethiopic Amete Alem</type>
+			<type key="calendar" type="gregorian">Gregorian na Kalendaryo</type>
+			<type key="calendar" type="hebrew">Hebrew na Kalendaryo</type>
+			<type key="calendar" type="indian">Pambansang Kalendaryong Indian</type>
+			<type key="calendar" type="islamic">Kalendaryong Islamic</type>
+			<type key="calendar" type="islamic-civil">Kalendaryong Islamic-Civil</type>
+			<type key="calendar" type="iso8601">ISO-8601 na Kalendaryo</type>
+			<type key="calendar" type="japanese">Kalendaryong Japanese</type>
+			<type key="calendar" type="persian">Kalendaryong Persian</type>
+			<type key="calendar" type="roc">Kalendaryong Minguo</type>
+			<type key="colAlternate" type="non-ignorable">Pag-uri-uriin ang Mga Simbolo</type>
+			<type key="colAlternate" type="shifted">Pag-uri-uriin ang Mga Ignoring Symbol</type>
+			<type key="colBackwards" type="no">Pag-uri-uriin ang Mga Accent nang Normal</type>
+			<type key="colBackwards" type="yes">Pag-uri-uriin ang Mga Accent nang Baliktad</type>
+			<type key="colCaseFirst" type="lower">Lowercase Muna ang Pag-uri-uriin</type>
+			<type key="colCaseFirst" type="no">Pag-uri-uriin ang Ayos ng Normal na Case</type>
+			<type key="colCaseFirst" type="upper">Uppercase Muna ang Pag-uri-uriin</type>
+			<type key="colCaseLevel" type="no">Pag-uri-uriin ang Hindi Case Sensitive</type>
+			<type key="colCaseLevel" type="yes">Pag-uri-uriin ang Case Sensitive</type>
+			<type key="colHiraganaQuaternary" type="no">Pag-uri-uriin ang Kana nang Hiwalay</type>
+			<type key="colHiraganaQuaternary" type="yes">Pag-uri-uriin ang Kana nang Naiiba</type>
+			<type key="collation" type="big5han">Pagkakasunod-sunod ng Pag-uuri ng Tradisyunal na Chinese - Big5</type>
+			<type key="collation" type="dictionary">Pagkakasunud-sunod ng Pag-uuri ng Diksyunaryo</type>
+			<type key="collation" type="ducet">Default na Pagkakasunud-sunod ng Ayos ng Unicode</type>
+			<type key="collation" type="gb2312han">Pagkakasunud-sunod ng Pag-uuri ng Pinasimpleng Chinese - GB2312</type>
+			<type key="collation" type="phonebook">Pagkakasunud-sunod ng Pag-uuri ng Phonebook</type>
+			<type key="collation" type="phonetic">Phonetic na Ayos ng Pag-uuri-uri</type>
+			<type key="collation" type="pinyin">Pagkakasunud-sunod ng Pag-uuri ng Pinyin</type>
+			<type key="collation" type="reformed">Pagkakasunud-sunod ng Pag-uuri ng Na-reform</type>
+			<type key="collation" type="search">Pangkalahatang Paghahanap</type>
+			<type key="collation" type="searchjl">Maghanap Ayon sa Unang Katinig ng Hangul</type>
+			<type key="collation" type="standard">Karaniwang Pagkakasunud-sunod ng Ayos</type>
+			<type key="collation" type="stroke">Pagkakasunud-sunod ng Pag-uuri ng Stroke</type>
+			<type key="collation" type="traditional">Tradisyunal na Pagkakasunud-sunod ng Pag-uuri</type>
+			<type key="collation" type="unihan">Pagkakasunud-sunod ng Pag-uuri ng Radical-Stroke</type>
+			<type key="colNormalization" type="no">Pag-uri-uriin nang Walang Pag-normalize</type>
+			<type key="colNormalization" type="yes">Pag-uri-uriin ang Unicode nang Normalized</type>
+			<type key="colNumeric" type="no">Pag-uri-uriin ang Mga Digit nang Indibidwal</type>
+			<type key="colNumeric" type="yes">Pag-uri-uriin ang Mga Digit nang Numerical</type>
+			<type key="colStrength" type="identical">Pag-uri-uriin Lahat</type>
+			<type key="colStrength" type="primary">Mga Base na Titik Lang ang Pag-uri-uriin</type>
+			<type key="colStrength" type="quaternary">Pag-uri-uriin ang Mga Accent/Case/Lapad/Kana</type>
+			<type key="colStrength" type="secondary">Pag-uri-uriin ang Mga Accent</type>
+			<type key="colStrength" type="tertiary">Pag-uri-uriin ang Mga Accent/Case/Lapad</type>
+			<type key="hc" type="h11">12 Oras na Sistema (0–11)</type>
+			<type key="hc" type="h12">12 Oras na Sistema (1–12)</type>
+			<type key="hc" type="h23">24 na Oras na Sistema (0–23)</type>
+			<type key="hc" type="h24">24 na Oras na Sistema (1–24)</type>
+			<type key="lb" type="loose">Loose na Estilo ng Putol ng Linya</type>
+			<type key="lb" type="normal">Normal na Estilo ng Putol ng Linya</type>
+			<type key="lb" type="strict">Mahigpit na Estilo ng Putol ng Linya</type>
+			<type key="ms" type="metric">Metrikong Sistema</type>
+			<type key="ms" type="uksystem">Sistemang Imperial na Pagsukat</type>
+			<type key="ms" type="ussystem">Sistema ng Pagsukat sa US</type>
+			<type key="numbers" type="arab">Arabic-Indic na Mga Digit</type>
+			<type key="numbers" type="arabext">Extendend Arabic-Indic na Mga Digit</type>
+			<type key="numbers" type="armn">Mga Armenian Numeral</type>
+			<type key="numbers" type="armnlow">Armenian Lowercase Numerals</type>
+			<type key="numbers" type="beng">Mga Bengali Digit</type>
+			<type key="numbers" type="deva">Mga Devanagari Digit</type>
+			<type key="numbers" type="ethi">Mga Ethiopic Numeral</type>
+			<type key="numbers" type="finance">Mga Pampinansyang Numeral</type>
+			<type key="numbers" type="fullwide">Mga Full-Width Digit</type>
+			<type key="numbers" type="geor">Georgian na Mga Numeral</type>
+			<type key="numbers" type="grek">Greek na Mga Numeral</type>
+			<type key="numbers" type="greklow">Greek Lowercase Numerals</type>
+			<type key="numbers" type="gujr">Mga Gujarati Digit</type>
+			<type key="numbers" type="guru">Mga Gurmukhi Digit</type>
+			<type key="numbers" type="hanidec">Mga Chinese Decimal na Numeral</type>
+			<type key="numbers" type="hans">Simplified Chinese na Mga Numeral</type>
+			<type key="numbers" type="hansfin">Simplified Chinese na Mga Numeral para sa Pananalapi</type>
+			<type key="numbers" type="hant">Traditional Chinese na Mga Numeral</type>
+			<type key="numbers" type="hantfin">Traditional Chinese na Mga Numeral para sa Pananalapi</type>
+			<type key="numbers" type="hebr">Mga Hebrew Numeral</type>
+			<type key="numbers" type="jpan">Mga Japanese Numeral</type>
+			<type key="numbers" type="jpanfin">Mga Japanese Numeral sa Pananalapi</type>
+			<type key="numbers" type="khmr">Mga Khmer na Digit</type>
+			<type key="numbers" type="knda">Mga Kannada na Digit</type>
+			<type key="numbers" type="laoo">Mga Lao na Digit</type>
+			<type key="numbers" type="latn">Mga Kanluraning Digit</type>
+			<type key="numbers" type="mlym">Mga Malayalam na Digit</type>
+			<type key="numbers" type="mong">Mongolian Digits</type>
+			<type key="numbers" type="mymr">Mga Myanmar na Digit</type>
+			<type key="numbers" type="native">Mga Native na Digit</type>
+			<type key="numbers" type="orya">Mga Oriya na Digit</type>
+			<type key="numbers" type="roman">Mga Roman Numeral</type>
+			<type key="numbers" type="romanlow">Roman Lowercase Numerals</type>
+			<type key="numbers" type="taml">Tamil na Mga Numeral</type>
+			<type key="numbers" type="tamldec">Mga Tamil na Digit</type>
+			<type key="numbers" type="telu">Mga Telugu na Digit</type>
+			<type key="numbers" type="thai">Mga Thai na Digit</type>
+			<type key="numbers" type="tibt">Mga Tibetan na Digit</type>
+			<type key="numbers" type="traditional">Mga Tradisyunal na Numeral</type>
+			<type key="numbers" type="vaii">Mga Vai na Digit</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN">BGN</transformName>
@@ -748,7 +771,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<transformName type="x-Publishing">Publishing</transformName>
 		</transformNames>
 		<measurementSystemNames>
-			<measurementSystemName type="metric">Metric</measurementSystemName>
+			<measurementSystemName type="metric">Metriko</measurementSystemName>
 			<measurementSystemName type="UK">UK</measurementSystemName>
 			<measurementSystemName type="US">US</measurementSystemName>
 		</measurementSystemNames>
@@ -762,6 +785,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<exemplarCharacters>[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]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[á à â é è ê í ì î ó ò ô ú ù û]</exemplarCharacters>
 		<exemplarCharacters type="index">[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]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐ – — , ; \: ! ? . … ' ‘ ’ &quot; “ ” ( ) \[ \] § * / \&amp; # ′ ″]</exemplarCharacters>
 		<ellipsis type="final">{0}…</ellipsis>
 		<ellipsis type="initial">…{0}</ellipsis>
 		<ellipsis type="medial">{0}…{1}</ellipsis>
@@ -824,6 +848,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -972,18 +997,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="12">Dis</month>
 						</monthWidth>
 						<monthWidth type="narrow">
-							<month type="1">E</month>
-							<month type="2">P</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">H</month>
-							<month type="7">H</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
+							<month type="1">Ene</month>
+							<month type="2">Peb</month>
+							<month type="3">Mar</month>
+							<month type="4">Abr</month>
+							<month type="5">May</month>
+							<month type="6">Hun</month>
+							<month type="7">Hul</month>
+							<month type="8">Ago</month>
+							<month type="9">Set</month>
+							<month type="10">Okt</month>
+							<month type="11">Nob</month>
+							<month type="12">Dis</month>
 						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">Enero</month>
@@ -1021,13 +1046,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="3">M</month>
 							<month type="4">A</month>
 							<month type="5">M</month>
-							<month type="6">H</month>
-							<month type="7">H</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
+							<month type="6">Hun</month>
+							<month type="7">Hul</month>
+							<month type="8">Ago</month>
+							<month type="9">Set</month>
+							<month type="10">Okt</month>
+							<month type="11">Nob</month>
+							<month type="12">Dis</month>
 						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">Enero</month>
@@ -1057,13 +1082,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<day type="sat">Sab</day>
 						</dayWidth>
 						<dayWidth type="narrow">
-							<day type="sun">L</day>
-							<day type="mon">L</day>
-							<day type="tue">M</day>
-							<day type="wed">M</day>
-							<day type="thu">H</day>
-							<day type="fri">B</day>
-							<day type="sat">S</day>
+							<day type="sun">Lin</day>
+							<day type="mon">Lun</day>
+							<day type="tue">Mar</day>
+							<day type="wed">Miy</day>
+							<day type="thu">Huw</day>
+							<day type="fri">Biy</day>
+							<day type="sat">Sab</day>
 						</dayWidth>
 						<dayWidth type="short">
 							<day type="sun">Li</day>
@@ -1095,13 +1120,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<day type="sat">Sab</day>
 						</dayWidth>
 						<dayWidth type="narrow">
-							<day type="sun">L</day>
-							<day type="mon">L</day>
-							<day type="tue">M</day>
-							<day type="wed">M</day>
-							<day type="thu">H</day>
-							<day type="fri">B</day>
-							<day type="sat">S</day>
+							<day type="sun">Lin</day>
+							<day type="mon">Lun</day>
+							<day type="tue">Mar</day>
+							<day type="wed">Miy</day>
+							<day type="thu">Huw</day>
+							<day type="fri">Biy</day>
+							<day type="sat">Sab</day>
 						</dayWidth>
 						<dayWidth type="short">
 							<day type="sun">Li</day>
@@ -1168,18 +1193,72 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">hatinggabi</dayPeriod>
 							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">tanghaling-tapat</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">nang umaga</dayPeriod>
+							<dayPeriod type="morning2">madaling-araw</dayPeriod>
+							<dayPeriod type="afternoon1">tanghali</dayPeriod>
+							<dayPeriod type="evening1">ng hapon</dayPeriod>
+							<dayPeriod type="night1">ng gabi</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">a</dayPeriod>
-							<dayPeriod type="noon">tanghali</dayPeriod>
-							<dayPeriod type="pm">p</dayPeriod>
+							<dayPeriod type="midnight">hatinggabi</dayPeriod>
+							<dayPeriod type="am">am</dayPeriod>
+							<dayPeriod type="noon">tanghaling-tapat</dayPeriod>
+							<dayPeriod type="pm">pm</dayPeriod>
+							<dayPeriod type="morning1">umaga</dayPeriod>
+							<dayPeriod type="morning2">madaling-araw</dayPeriod>
+							<dayPeriod type="afternoon1">tanghali</dayPeriod>
+							<dayPeriod type="evening1">hapon</dayPeriod>
+							<dayPeriod type="night1">gabi</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">hatinggabi</dayPeriod>
 							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="noon">tanghali</dayPeriod>
+							<dayPeriod type="noon">tanghaling-tapat</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">nang umaga</dayPeriod>
+							<dayPeriod type="morning2">madaling-araw</dayPeriod>
+							<dayPeriod type="afternoon1">ng tanghali</dayPeriod>
+							<dayPeriod type="evening1">ng hapon</dayPeriod>
+							<dayPeriod type="night1">ng gabi</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">hatinggabi</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">tanghaling-tapat</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">umaga</dayPeriod>
+							<dayPeriod type="morning2">madaling-araw</dayPeriod>
+							<dayPeriod type="afternoon1">tanghali</dayPeriod>
+							<dayPeriod type="evening1">hapon</dayPeriod>
+							<dayPeriod type="night1">gabi</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">hatinggabi</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">tanghaling-tapat</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">umaga</dayPeriod>
+							<dayPeriod type="morning2">madaling-araw</dayPeriod>
+							<dayPeriod type="afternoon1">tanghali</dayPeriod>
+							<dayPeriod type="evening1">hapon</dayPeriod>
+							<dayPeriod type="night1">gabi</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">hatinggabi</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">tanghaling-tapat</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">umaga</dayPeriod>
+							<dayPeriod type="morning2">madaling-araw</dayPeriod>
+							<dayPeriod type="afternoon1">tanghali</dayPeriod>
+							<dayPeriod type="evening1">hapon</dayPeriod>
+							<dayPeriod type="night1">gabi</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1271,15 +1350,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">G y</dateFormatItem>
-						<dateFormatItem id="GyMMM">G y MMM</dateFormatItem>
-						<dateFormatItem id="GyMMMd">G y MMM d</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">G y MMM d, E</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
 						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">HH</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
 						<dateFormatItem id="MEd">E, M/d</dateFormatItem>
@@ -1407,7 +1490,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Era</displayName>
 			</field>
 			<field type="year">
-				<displayName>Taon</displayName>
+				<displayName>taon</displayName>
 				<relative type="-1">nakaraang taon</relative>
 				<relative type="0">ngayong taon</relative>
 				<relative type="1">susunod na taon</relative>
@@ -1421,7 +1504,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="year-short">
-				<displayName>yr.</displayName>
+				<displayName>taon</displayName>
+				<relative type="-1">nakaraang taon</relative>
+				<relative type="0">ngayong taon</relative>
+				<relative type="1">susunod na taon</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">sa {0} taon</relativeTimePattern>
 					<relativeTimePattern count="other">sa {0} (na) taon</relativeTimePattern>
@@ -1432,7 +1518,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="year-narrow">
-				<displayName>yr.</displayName>
+				<displayName>taon</displayName>
+				<relative type="-1">nakaraang taon</relative>
+				<relative type="0">ngayong taon</relative>
+				<relative type="1">susunod na taon</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">sa {0} taon</relativeTimePattern>
 					<relativeTimePattern count="other">sa {0} (na) taon</relativeTimePattern>
@@ -1444,6 +1533,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter">
 				<displayName>Quarter</displayName>
+				<relative type="-1">nakaraang quarter</relative>
+				<relative type="0">ngayong quarter</relative>
+				<relative type="1">susunod na quarter</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">sa {0} quarter</relativeTimePattern>
 					<relativeTimePattern count="other">sa {0} (na) quarter</relativeTimePattern>
@@ -1455,6 +1547,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>qtr.</displayName>
+				<relative type="-1">nakaraang quarter</relative>
+				<relative type="0">ngayong quarter</relative>
+				<relative type="1">susunod na quarter</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">sa {0} (na) quarter</relativeTimePattern>
 					<relativeTimePattern count="other">sa {0} (na) quarter</relativeTimePattern>
@@ -1466,6 +1561,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>qtr.</displayName>
+				<relative type="-1">nakaraang quarter</relative>
+				<relative type="0">ngayong quarter</relative>
+				<relative type="1">susunod na quarter</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">sa {0} quarter</relativeTimePattern>
 					<relativeTimePattern count="other">sa {0} (na) quarter</relativeTimePattern>
@@ -1476,7 +1574,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="month">
-				<displayName>Buwan</displayName>
+				<displayName>buwan</displayName>
 				<relative type="-1">nakaraang buwan</relative>
 				<relative type="0">ngayong buwan</relative>
 				<relative type="1">susunod na buwan</relative>
@@ -1490,7 +1588,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="month-short">
-				<displayName>mo.</displayName>
+				<displayName>buwan</displayName>
+				<relative type="-1">nakaraang buwan</relative>
+				<relative type="0">ngayong buwan</relative>
+				<relative type="1">susunod na buwan</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">sa {0} buwan</relativeTimePattern>
 					<relativeTimePattern count="other">sa {0} (na) buwan</relativeTimePattern>
@@ -1501,7 +1602,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="month-narrow">
-				<displayName>mo.</displayName>
+				<displayName>buwan</displayName>
+				<relative type="-1">nakaraang buwan</relative>
+				<relative type="0">ngayong buwan</relative>
+				<relative type="1">susunod na buwan</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">sa {0} buwan</relativeTimePattern>
 					<relativeTimePattern count="other">sa {0} (na) buwan</relativeTimePattern>
@@ -1512,7 +1616,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="week">
-				<displayName>Linggo</displayName>
+				<displayName>linggo</displayName>
+				<relative type="-1">nakalipas na linggo</relative>
+				<relative type="0">sa linggong ito</relative>
+				<relative type="1">susunod na linggo</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">sa {0} linggo</relativeTimePattern>
+					<relativeTimePattern count="other">sa {0} (na) linggo</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} linggo ang nakalipas</relativeTimePattern>
+					<relativeTimePattern count="other">{0} (na) linggo ang nakalipas</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-short">
+				<displayName>linggo</displayName>
 				<relative type="-1">nakaraang linggo</relative>
 				<relative type="0">ngayong linggo</relative>
 				<relative type="1">susunod na linggo</relative>
@@ -1525,19 +1643,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">{0} (na) linggo ang nakalipas</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="week-short">
-				<displayName>wk.</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">sa {0} linggo</relativeTimePattern>
-					<relativeTimePattern count="other">sa {0} (na) linggo</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} linggo ang nakalipas</relativeTimePattern>
-					<relativeTimePattern count="other">{0} (na) linggo ang nakalipas</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="week-narrow">
-				<displayName>wk.</displayName>
+				<displayName>linggo</displayName>
+				<relative type="-1">nakaraang linggo</relative>
+				<relative type="0">ngayong linggo</relative>
+				<relative type="1">susunod na linggo</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">sa {0} linggo</relativeTimePattern>
 					<relativeTimePattern count="other">sa {0} (na) linggo</relativeTimePattern>
@@ -1548,7 +1658,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day">
-				<displayName>Araw</displayName>
+				<displayName>araw</displayName>
 				<relative type="-2">Araw bago ang kahapon</relative>
 				<relative type="-1">kahapon</relative>
 				<relative type="0">ngayong araw</relative>
@@ -1564,33 +1674,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day-short">
-				<displayName>Araw</displayName>
+				<displayName>araw</displayName>
+				<relative type="-2">Araw bago ang kahapon</relative>
+				<relative type="-1">kahapon</relative>
+				<relative type="0">ngayong araw</relative>
+				<relative type="1">bukas</relative>
+				<relative type="2">Samakalawa</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">sa {0} araw</relativeTimePattern>
+					<relativeTimePattern count="one">sa {0} (na) araw</relativeTimePattern>
 					<relativeTimePattern count="other">sa {0} (na) araw</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} araw ang nakalipas</relativeTimePattern>
-					<relativeTimePattern count="other">{0} (na) araw nakalipas</relativeTimePattern>
+					<relativeTimePattern count="one">{0} (na) araw ang nakalipas</relativeTimePattern>
+					<relativeTimePattern count="other">{0} (na) araw ang nakalipas</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day-narrow">
-				<displayName>Araw</displayName>
+				<displayName>araw</displayName>
+				<relative type="-2">Araw bago ang kahapon</relative>
+				<relative type="-1">kahapon</relative>
+				<relative type="0">ngayong araw</relative>
+				<relative type="1">bukas</relative>
+				<relative type="2">Samakalawa</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">sa {0} araw</relativeTimePattern>
 					<relativeTimePattern count="other">sa {0} (na) araw</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} araw ang nakalipas</relativeTimePattern>
-					<relativeTimePattern count="other">{0} (na) araw nakalipas</relativeTimePattern>
+					<relativeTimePattern count="other">{0} (na) araw ang nakalipas</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="weekday">
-				<displayName>Araw ng Linggo</displayName>
+				<displayName>araw ng linggo</displayName>
 			</field>
 			<field type="sun">
-				<relative type="-1">nakaraang Linggo</relative>
-				<relative type="0">ngayong Linggo</relative>
+				<relative type="-1">lumipas na Linggo</relative>
+				<relative type="0">sa Linggo</relative>
 				<relative type="1">susunod na Linggo</relative>
 			</field>
 			<field type="sun-short">
@@ -1697,7 +1817,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>AM/PM</displayName>
 			</field>
 			<field type="hour">
-				<displayName>Oras</displayName>
+				<displayName>oras</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">sa {0} oras</relativeTimePattern>
 					<relativeTimePattern count="other">sa {0} (na) oras</relativeTimePattern>
@@ -1708,18 +1828,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="hour-short">
-				<displayName>hr.</displayName>
+				<displayName>oras</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">sa {0} oras</relativeTimePattern>
 					<relativeTimePattern count="other">sa {0} (na) oras</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} oras nakalipas</relativeTimePattern>
-					<relativeTimePattern count="other">{0} (na) oras nakalipas</relativeTimePattern>
+					<relativeTimePattern count="one">{0} oras ang nakalipas</relativeTimePattern>
+					<relativeTimePattern count="other">{0} (na) oras ang nakalipas</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-narrow">
-				<displayName>hr.</displayName>
+				<displayName>oras</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">sa {0} oras</relativeTimePattern>
 					<relativeTimePattern count="other">sa {0} (na) oras</relativeTimePattern>
@@ -1730,14 +1850,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="minute">
-				<displayName>Minuto</displayName>
+				<displayName>minuto</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">sa {0} minuto</relativeTimePattern>
 					<relativeTimePattern count="other">sa {0} (na) minuto</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} minuto ang nakalipas</relativeTimePattern>
-					<relativeTimePattern count="other">sa {0} (na) minuto</relativeTimePattern>
+					<relativeTimePattern count="other">{0} (na) minuto ang nakalipas</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute-short">
@@ -1763,7 +1883,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="second">
-				<displayName>Segundo</displayName>
+				<displayName>segundo</displayName>
 				<relative type="0">ngayon</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">sa {0} segundo</relativeTimePattern>
@@ -1797,16 +1917,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>Time Zone</displayName>
+				<displayName>time zone</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
 			<hourFormat>+HH:mm;-HH:mm</hourFormat>
 			<gmtFormat>GMT{0}</gmtFormat>
 			<gmtZeroFormat>GMT</gmtZeroFormat>
-			<regionFormat>Oras sa {0}</regionFormat>
+			<regionFormat>{0}</regionFormat>
 			<regionFormat type="daylight">Daylight Time ng {0}</regionFormat>
-			<regionFormat type="standard">Standard Time ng {0}</regionFormat>
+			<regionFormat type="standard">{0} (+0)</regionFormat>
 			<fallbackFormat>{1} ({0})</fallbackFormat>
 			<zone type="Etc/Unknown">
 				<exemplarCity>Di-kilalang Lungsod</exemplarCity>
@@ -2334,7 +2454,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Athens</exemplarCity>
 			</zone>
 			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>South Georgia</exemplarCity>
+				<exemplarCity>Timog Georgia</exemplarCity>
 			</zone>
 			<zone type="America/Guatemala">
 				<exemplarCity>Guatemala</exemplarCity>
@@ -2377,7 +2497,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</zone>
 			<zone type="Europe/Dublin">
 				<long>
-					<daylight>Standard Time ng Ireland</daylight>
+					<daylight>Standard na Oras sa Ireland</daylight>
 				</long>
 				<exemplarCity>Dublin</exemplarCity>
 			</zone>
@@ -2675,6 +2795,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Maynila</exemplarCity>
 			</zone>
@@ -2759,6 +2882,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Chita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Yakutsk</exemplarCity>
 			</zone>
@@ -2777,6 +2903,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolymsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamchatka</exemplarCity>
 			</zone>
@@ -3058,71 +3187,71 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</zone>
 			<metazone type="Afghanistan">
 				<long>
-					<standard>Oras ng Afghanistan</standard>
+					<standard>Oras sa Afghanistan</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Central">
 				<long>
-					<standard>Oras ng Gitnang Africa</standard>
+					<standard>Oras sa Gitnang Africa</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Eastern">
 				<long>
-					<standard>Oras ng Silangang Afica</standard>
+					<standard>Oras sa Silangang Africa</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Southern">
 				<long>
-					<standard>Oras ng Timog Africa</standard>
+					<standard>Oras sa Timog Africa</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Oras ng Kanlurang Africa</generic>
-					<standard>Standard Time ng Kanlurang Africa</standard>
+					<generic>Oras sa Kanlurang Africa</generic>
+					<standard>Standard na Oras sa Kanlurang Africa</standard>
 					<daylight>Oras sa Tag-init ng Kanlurang Africa</daylight>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
 				<long>
-					<generic>Oras ng Alaska</generic>
-					<standard>Standard Time ng Alaska</standard>
-					<daylight>Daylight Time ng Alaska</daylight>
+					<generic>Oras sa Alaska</generic>
+					<standard>Standard na Oras sa Alaska</standard>
+					<daylight>Daylight Time sa Alaska</daylight>
 				</long>
 			</metazone>
 			<metazone type="Amazon">
 				<long>
-					<generic>Oras ng Amazon</generic>
-					<standard>Standard Time ng Amazon</standard>
+					<generic>Oras sa Amazon</generic>
+					<standard>Standard na Oras sa Amazon</standard>
 					<daylight>Oras sa Tag-init ng Amazon</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Central">
 				<long>
-					<generic>Central Time ng Hilagang Amerika</generic>
-					<standard>Central Standard Time ng Hilagang Amerika</standard>
-					<daylight>Central Daylight Time ng Hilagang Amerika</daylight>
+					<generic>Sentral na Oras</generic>
+					<standard>Sentral na Standard na Oras</standard>
+					<daylight>Sentral na Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
-					<generic>Eastern Time ng Hilagang Amerika</generic>
-					<standard>Eastern Standard Time ng Hilagang Amerika</standard>
-					<daylight>Eastern Daylight Time ng Hilagang Amerika</daylight>
+					<generic>Eastern Time</generic>
+					<standard>Eastern na Standard na Oras</standard>
+					<daylight>Eastern Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
-					<generic>Oras sa Bundok ng Hilagang Amerika</generic>
-					<standard>Standard Time sa Bundok ng Hilagang Amerika</standard>
-					<daylight>Daylight Time sa Bundok ng Hilagang Amerika</daylight>
+					<generic>Oras sa Bundok</generic>
+					<standard>Standard na Oras sa Bundok</standard>
+					<daylight>Daylight Time sa Bundok</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
-					<generic>Pacific Time ng Hilagang Amerika</generic>
-					<standard>Pacific Standard Time ng Hilagang Amerika</standard>
-					<daylight>Pacific Daylight Time ng Hilagang Amerika</daylight>
+					<generic>Oras sa Pasipiko</generic>
+					<standard>Standard na Oras sa Pasipiko</standard>
+					<daylight>Daylight Time sa Pasipiko</daylight>
 				</long>
 			</metazone>
 			<metazone type="Anadyr">
@@ -3134,44 +3263,44 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic>Apia Time</generic>
+					<generic>Oras sa Apia</generic>
 					<standard>Apia Standard Time</standard>
 					<daylight>Apia Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Arabian">
 				<long>
-					<generic>Oras ng Arabia</generic>
-					<standard>Standard Time ng Arabia</standard>
-					<daylight>Daylight Time ng Arabia</daylight>
+					<generic>Oras sa Arabia</generic>
+					<standard>Standard na Oras sa Arabia</standard>
+					<daylight>Daylight Time sa Arabia</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina">
 				<long>
-					<generic>Oras ng Argentina</generic>
-					<standard>Standard Time ng Argentina</standard>
+					<generic>Oras sa Argentina</generic>
+					<standard>Standard na Oras sa Argentina</standard>
 					<daylight>Oras sa Tag-init ng Argentina</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina_Western">
 				<long>
-					<generic>Oras ng Kanlurang Argentina</generic>
-					<standard>Standard Time ng Kanlurang Argentina</standard>
+					<generic>Oras sa Kanlurang Argentina</generic>
+					<standard>Standard na Oras sa Kanlurang Argentina</standard>
 					<daylight>Oras sa Tag-init ng Kanlurang Argentina</daylight>
 				</long>
 			</metazone>
 			<metazone type="Armenia">
 				<long>
-					<generic>Oras ng Armenia</generic>
-					<standard>Standard Time ng Armenia</standard>
+					<generic>Oras sa Armenia</generic>
+					<standard>Standard na Oras sa Armenia</standard>
 					<daylight>Oras sa Tag-init ng Armenia</daylight>
 				</long>
 			</metazone>
 			<metazone type="Atlantic">
 				<long>
-					<generic>Oras ng Atlantic</generic>
-					<standard>Standard Time ng Atlantiko</standard>
-					<daylight>Daylight Time ng Atlantiko</daylight>
+					<generic>Oras sa Atlantiko</generic>
+					<standard>Standard na Oras sa Atlantiko</standard>
+					<daylight>Daylight Time sa Atlantiko</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Central">
@@ -3199,44 +3328,44 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Oras ng Kanlurang Australya</generic>
 					<standard>Standard Time ng Kanlurang Australya</standard>
-					<daylight>Daylight Time ng Kanlurang Australya</daylight>
+					<daylight>Daylight Time sa Kanlurang Australya</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azerbaijan">
 				<long>
-					<generic>Oras ng Azerbaijan</generic>
-					<standard>Standard Time ng Azerbaijan</standard>
+					<generic>Oras sa Azerbaijan</generic>
+					<standard>Standard na Oras sa Azerbaijan</standard>
 					<daylight>Oras sa Tag-init ng Azerbaijan</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azores">
 				<long>
-					<generic>Oras ng Azores</generic>
-					<standard>Standard Time ng Azores</standard>
+					<generic>Oras sa Azores</generic>
+					<standard>Standard na Oras sa Azores</standard>
 					<daylight>Oras sa Tag-init ng Azores</daylight>
 				</long>
 			</metazone>
 			<metazone type="Bangladesh">
 				<long>
-					<generic>Oras ng Bangladesh</generic>
-					<standard>Standard Time ng Bangladesh</standard>
+					<generic>Oras sa Bangladesh</generic>
+					<standard>Standard na Oras sa Bangladesh</standard>
 					<daylight>Oras sa Tag-init ng Bangladesh</daylight>
 				</long>
 			</metazone>
 			<metazone type="Bhutan">
 				<long>
-					<standard>Oras ng Bhutan</standard>
+					<standard>Oras sa Bhutan</standard>
 				</long>
 			</metazone>
 			<metazone type="Bolivia">
 				<long>
-					<standard>Oras ng Bolivia</standard>
+					<standard>Oras sa Bolivia</standard>
 				</long>
 			</metazone>
 			<metazone type="Brasilia">
 				<long>
-					<generic>Oras ng Brasilia</generic>
-					<standard>Standard Time ng Brasilia</standard>
+					<generic>Oras sa Brasilia</generic>
+					<standard>Standard na Oras sa Brasilia</standard>
 					<daylight>Oras sa Tag-init ng Brasilia</daylight>
 				</long>
 			</metazone>
@@ -3247,83 +3376,83 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Cape_Verde">
 				<long>
-					<generic>Oras ng Cape Verde</generic>
-					<standard>Standard Time ng Cape Verde</standard>
+					<generic>Oras sa Cape Verde</generic>
+					<standard>Standard na Oras sa Cape Verde</standard>
 					<daylight>Oras sa Tag-init ng Cape Verde</daylight>
 				</long>
 			</metazone>
 			<metazone type="Chamorro">
 				<long>
-					<standard>Oras ng Chamorro</standard>
+					<standard>Standard na Oras sa Chamorro</standard>
 				</long>
 			</metazone>
 			<metazone type="Chatham">
 				<long>
-					<generic>Oras ng Chatham</generic>
-					<standard>Standard Time ng Chatham</standard>
-					<daylight>Daylight Time ng Chatham</daylight>
+					<generic>Oras sa Chatham</generic>
+					<standard>Standard na Oras sa Chatham</standard>
+					<daylight>Daylight Time sa Chatham</daylight>
 				</long>
 			</metazone>
 			<metazone type="Chile">
 				<long>
-					<generic>Oras ng Chile</generic>
-					<standard>Standard Time ng Chile</standard>
+					<generic>Oras sa Chile</generic>
+					<standard>Standard na Oras sa Chile</standard>
 					<daylight>Oras sa Tag-init ng Chile</daylight>
 				</long>
 			</metazone>
 			<metazone type="China">
 				<long>
-					<generic>Oras ng China</generic>
-					<standard>Standard Time ng China</standard>
-					<daylight>Daylight Time ng China</daylight>
+					<generic>Oras sa China</generic>
+					<standard>Standard na Oras sa China</standard>
+					<daylight>Daylight Time sa China</daylight>
 				</long>
 			</metazone>
 			<metazone type="Choibalsan">
 				<long>
-					<generic>Oras ng Choibalsan</generic>
-					<standard>Standard Time ng Choibalsan</standard>
+					<generic>Oras sa Choibalsan</generic>
+					<standard>Standard na Oras sa Choibalsan</standard>
 					<daylight>Oras sa Tag-init ng Choibalsan</daylight>
 				</long>
 			</metazone>
 			<metazone type="Christmas">
 				<long>
-					<standard>Oras ng Christmas Island</standard>
+					<standard>Oras sa Christmas Island</standard>
 				</long>
 			</metazone>
 			<metazone type="Cocos">
 				<long>
-					<standard>Oras ng Cocos Islands</standard>
+					<standard>Oras sa Cocos Islands</standard>
 				</long>
 			</metazone>
 			<metazone type="Colombia">
 				<long>
-					<generic>Oras ng Colombia</generic>
-					<standard>Standard Time ng Colombia</standard>
+					<generic>Oras sa Colombia</generic>
+					<standard>Standard na Oras sa Colombia</standard>
 					<daylight>Oras sa Tag-init ng Colombia</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cook">
 				<long>
-					<generic>Oras ng Cook Islands</generic>
-					<standard>Standard Time ng Cook Islands</standard>
-					<daylight>Oras sa ng Cook Islands sa Kalahit ng Tag-init</daylight>
+					<generic>Oras sa Cook Islands</generic>
+					<standard>Standard na Oras sa Cook Islands</standard>
+					<daylight>Oras sa Kalahati ng Tag-init ng Cook Islands</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cuba">
 				<long>
-					<generic>Cuba Time</generic>
-					<standard>Standard Time ng Cuba</standard>
-					<daylight>Daylight Time ng Cuba</daylight>
+					<generic>Oras sa Cuba</generic>
+					<standard>Standard na Oras sa Cuba</standard>
+					<daylight>Daylight Time sa Cuba</daylight>
 				</long>
 			</metazone>
 			<metazone type="Davis">
 				<long>
-					<standard>Oras ng Davis</standard>
+					<standard>Oras sa Davis</standard>
 				</long>
 			</metazone>
 			<metazone type="DumontDUrville">
 				<long>
-					<standard>Oras ng Dumont-d’Urville</standard>
+					<standard>Oras sa Dumont-d’Urville</standard>
 				</long>
 			</metazone>
 			<metazone type="East_Timor">
@@ -3333,86 +3462,86 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Easter">
 				<long>
-					<generic>Oras ng Easter Island</generic>
-					<standard>Standard Time ng Easter Island</standard>
+					<generic>Oras sa Easter Island</generic>
+					<standard>Standard na Oras sa Easter Island</standard>
 					<daylight>Oras sa Tag-init ng Easter Island</daylight>
 				</long>
 			</metazone>
 			<metazone type="Ecuador">
 				<long>
-					<standard>Oras ng Ecuador</standard>
+					<standard>Oras sa Ecuador</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Central">
 				<long>
-					<generic>Oras ng Gitnang Europe</generic>
-					<standard>Standard Time ng Gitnang Europe</standard>
+					<generic>Oras sa Gitnang Europe</generic>
+					<standard>Standard na Oras sa Gitnang Europe</standard>
 					<daylight>Oras sa Tag-init ng Gitnang Europe</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Eastern">
 				<long>
-					<generic>Oras ng Silangang Europe</generic>
-					<standard>Standard Time ng Silangang Europe</standard>
+					<generic>Oras sa Silangang Europe</generic>
+					<standard>Standard na Oras sa Silangang Europe</standard>
 					<daylight>Oras sa Tag-init ng Silangang Europe</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
 				<long>
-					<standard>Further-eastern Europe Time</standard>
+					<standard>Oras sa Pinaka-silangang Europe</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
 				<long>
-					<generic>Oras ng Kanlurang Europe</generic>
-					<standard>Standard Time ng Kanlurang Europe</standard>
+					<generic>Oras sa Kanlurang Europe</generic>
+					<standard>Standard na Oras sa Kanlurang Europe</standard>
 					<daylight>Oras sa Tag-init ng Kanlurang Europe</daylight>
 				</long>
 			</metazone>
 			<metazone type="Falkland">
 				<long>
-					<generic>Oras ng Falkland Islands</generic>
-					<standard>Standard Time ng Falkland Islands</standard>
+					<generic>Oras sa Falkland Islands</generic>
+					<standard>Standard na Oras sa Falkland Islands</standard>
 					<daylight>Oras sa Tag-init ng Falkland Islands</daylight>
 				</long>
 			</metazone>
 			<metazone type="Fiji">
 				<long>
-					<generic>Oras ng Fiji</generic>
-					<standard>Standard Time ng Fiji</standard>
+					<generic>Oras sa Fiji</generic>
+					<standard>Standard na Oras sa Fiji</standard>
 					<daylight>Oras sa Tag-init ng Fiji</daylight>
 				</long>
 			</metazone>
 			<metazone type="French_Guiana">
 				<long>
-					<standard>Oras ng French Guiana</standard>
+					<standard>Oras sa French Guiana</standard>
 				</long>
 			</metazone>
 			<metazone type="French_Southern">
 				<long>
-					<standard>Oras sa Katimugan ng France at Antartiko</standard>
+					<standard>Oras sa Katimugang France at Antartiko</standard>
 				</long>
 			</metazone>
 			<metazone type="Galapagos">
 				<long>
-					<standard>Oras ng Galapagos</standard>
+					<standard>Oras sa Galapagos</standard>
 				</long>
 			</metazone>
 			<metazone type="Gambier">
 				<long>
-					<standard>Oras ng Gambier</standard>
+					<standard>Oras sa Gambier</standard>
 				</long>
 			</metazone>
 			<metazone type="Georgia">
 				<long>
-					<generic>Oras ng Georgia</generic>
-					<standard>Standard Time ng Georgia</standard>
+					<generic>Oras sa Georgia</generic>
+					<standard>Standard na Oras sa Georgia</standard>
 					<daylight>Oras sa Tag-init ng Georgia</daylight>
 				</long>
 			</metazone>
 			<metazone type="Gilbert_Islands">
 				<long>
-					<standard>Oras ng Gilbert Islands</standard>
+					<standard>Oras sa Gilbert Islands</standard>
 				</long>
 			</metazone>
 			<metazone type="GMT">
@@ -3422,57 +3551,57 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Greenland_Eastern">
 				<long>
-					<generic>Oras ng Silangang Greenland</generic>
-					<standard>Standard Time ng Silangang Greenland</standard>
+					<generic>Oras sa Silangang Greenland</generic>
+					<standard>Standard na Oras sa Silangang Greenland</standard>
 					<daylight>Oras sa Tag-init ng Silangang Greenland</daylight>
 				</long>
 			</metazone>
 			<metazone type="Greenland_Western">
 				<long>
-					<generic>Oras ng Kanlurang Greenland</generic>
-					<standard>Standard Time ng Kanlurang Greenland</standard>
+					<generic>Oras sa Kanlurang Greenland</generic>
+					<standard>Standard na Oras sa Kanlurang Greenland</standard>
 					<daylight>Oras sa Tag-init ng Kanlurang Greenland</daylight>
 				</long>
 			</metazone>
 			<metazone type="Gulf">
 				<long>
-					<standard>Oras ng Gulf</standard>
+					<standard>Oras sa Gulf</standard>
 				</long>
 			</metazone>
 			<metazone type="Guyana">
 				<long>
-					<standard>Oras ng Guyana</standard>
+					<standard>Oras sa Guyana</standard>
 				</long>
 			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
-					<generic>Oras ng Hawaii-Aleutian</generic>
-					<standard>Standard Time ng Hawaii-Aleutian</standard>
+					<generic>Oras sa Hawaii-Aleutian</generic>
+					<standard>Standard na Oras sa Hawaii-Aleutian</standard>
 					<daylight>Oras sa Tag-init ng Hawaii-Aleutian</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>
-					<generic>Oras ng Hong Kong</generic>
-					<standard>Standard Time ng Hong Kong</standard>
+					<generic>Oras sa Hong Kong</generic>
+					<standard>Standard na Oras sa Hong Kong</standard>
 					<daylight>Oras sa Tag-init ng Hong Kong</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hovd">
 				<long>
-					<generic>Time ng Hovd</generic>
-					<standard>Standard TIme ng Hovd</standard>
+					<generic>Oras sa Hovd</generic>
+					<standard>Standard na Oras sa Hovd</standard>
 					<daylight>Oras sa Tag-init ng Hovd</daylight>
 				</long>
 			</metazone>
 			<metazone type="India">
 				<long>
-					<standard>Standard Time ng India</standard>
+					<standard>Standard na Oras sa Bhutan</standard>
 				</long>
 			</metazone>
 			<metazone type="Indian_Ocean">
 				<long>
-					<standard>Oras ng Indian Ocean</standard>
+					<standard>Oras sa Indian Ocean</standard>
 				</long>
 			</metazone>
 			<metazone type="Indochina">
@@ -3497,30 +3626,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Iran">
 				<long>
-					<generic>Oras ng Iran</generic>
-					<standard>Standard Time ng Iran</standard>
-					<daylight>Daylight Time ng Iran</daylight>
+					<generic>Oras sa Iran</generic>
+					<standard>Standard na Oras sa Iran</standard>
+					<daylight>Daylight Time sa Iran</daylight>
 				</long>
 			</metazone>
 			<metazone type="Irkutsk">
 				<long>
-					<generic>Oras ng Irkutsk</generic>
-					<standard>Standard Time ng Irkutsk</standard>
+					<generic>Oras sa Irkutsk</generic>
+					<standard>Standard na Oras sa Irkutsk</standard>
 					<daylight>Oras sa Tag-init ng Irkutsk</daylight>
 				</long>
 			</metazone>
 			<metazone type="Israel">
 				<long>
-					<generic>Oras ng Israel</generic>
-					<standard>Standard Time ng Israel</standard>
-					<daylight>Daylight Time ng Israel</daylight>
+					<generic>Oras sa Israel</generic>
+					<standard>Standard na Oras sa Israel</standard>
+					<daylight>Daylight Time sa Israel</daylight>
 				</long>
 			</metazone>
 			<metazone type="Japan">
 				<long>
-					<generic>Oras ng Japan</generic>
-					<standard>Standard Time ng Japan</standard>
-					<daylight>Daylight Time ng Japan</daylight>
+					<generic>Oras sa Japan</generic>
+					<standard>Standard na Oras sa Japan</standard>
+					<daylight>Daylight Time sa Japan</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kamchatka">
@@ -3532,59 +3661,59 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Kazakhstan_Eastern">
 				<long>
-					<standard>Oras ng Silangang Kazakhstan</standard>
+					<standard>Oras sa Silangang Kazakhstan</standard>
 				</long>
 			</metazone>
 			<metazone type="Kazakhstan_Western">
 				<long>
-					<standard>Oras ng Kanlurang Kazakhstan</standard>
+					<standard>Oras sa Kanlurang Kazakhstan</standard>
 				</long>
 			</metazone>
 			<metazone type="Korea">
 				<long>
-					<generic>Oras ng Korea</generic>
-					<standard>Standard Time ng Korea</standard>
-					<daylight>Daylight Time ng Korea</daylight>
+					<generic>Oras sa Korea</generic>
+					<standard>Standard na Oras sa Korea</standard>
+					<daylight>Daylight Time sa Korea</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kosrae">
 				<long>
-					<standard>Oras ng Kosrae</standard>
+					<standard>Oras sa Kosrae</standard>
 				</long>
 			</metazone>
 			<metazone type="Krasnoyarsk">
 				<long>
-					<generic>Oras ng Krasnoyarsk</generic>
-					<standard>Standard Time ng Krasnoyarsk</standard>
+					<generic>Oras sa Krasnoyarsk</generic>
+					<standard>Standard na Oras sa Krasnoyarsk</standard>
 					<daylight>Oras sa Tag-init ng Krasnoyarsk</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kyrgystan">
 				<long>
-					<standard>Oras ng Kyrgystan</standard>
+					<standard>Oras sa Kyrgystan</standard>
 				</long>
 			</metazone>
 			<metazone type="Line_Islands">
 				<long>
-					<standard>Oras ng Line Islands</standard>
+					<standard>Oras sa Line Islands</standard>
 				</long>
 			</metazone>
 			<metazone type="Lord_Howe">
 				<long>
-					<generic>Oras ng Lord Howe</generic>
-					<standard>Standard Time ng Lord Howe</standard>
-					<daylight>Daylight Time ng Lord Howe</daylight>
+					<generic>Oras sa Lord Howe</generic>
+					<standard>Standard na Oras sa Lord Howe</standard>
+					<daylight>Daylight Time sa Lorde Howe</daylight>
 				</long>
 			</metazone>
 			<metazone type="Macquarie">
 				<long>
-					<standard>Oras ng Macquarie Island</standard>
+					<standard>Oras sa Macquarie Island</standard>
 				</long>
 			</metazone>
 			<metazone type="Magadan">
 				<long>
-					<generic>Oras ng Magadan</generic>
-					<standard>Standard Time ng Magadan</standard>
+					<generic>Oras sa Magadan</generic>
+					<standard>Standard na Oras sa Magadan</standard>
 					<daylight>Oras sa Tag-init ng Magadan</daylight>
 				</long>
 			</metazone>
@@ -3595,56 +3724,56 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Maldives">
 				<long>
-					<standard>Oras ng Maldives</standard>
+					<standard>Oras sa Maldives</standard>
 				</long>
 			</metazone>
 			<metazone type="Marquesas">
 				<long>
-					<standard>Oras ng Marquesas</standard>
+					<standard>Oras sa Marquesas</standard>
 				</long>
 			</metazone>
 			<metazone type="Marshall_Islands">
 				<long>
-					<standard>Oras ng Marshall Islands</standard>
+					<standard>Oras sa Marshall Islands</standard>
 				</long>
 			</metazone>
 			<metazone type="Mauritius">
 				<long>
-					<generic>Oras ng Mauritius</generic>
-					<standard>Standard Time ng Mauritius</standard>
+					<generic>Oras sa Mauritius</generic>
+					<standard>Standard na Oras sa Mauritius</standard>
 					<daylight>Oras sa Tag-init ng Mauritius</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mawson">
 				<long>
-					<standard>Oras ng Mawson</standard>
+					<standard>Oras sa Mawson</standard>
 				</long>
 			</metazone>
 			<metazone type="Mexico_Northwest">
 				<long>
-					<generic>Oras ng Hilagang-kanlurang Mexico</generic>
-					<standard>Standard Time ng Hilagang-kanlurang Mexico</standard>
-					<daylight>Daylight Time ng Hilagang-kanlurang Mexico</daylight>
+					<generic>Oras sa Hilagang-kanlurang Mexico</generic>
+					<standard>Standard na Oras sa Hilagang-kanlurang Mexico</standard>
+					<daylight>Daylight Time sa Hilagang-kanlurang Mexico</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
-					<generic>Pacific Time ng Mexico</generic>
-					<standard>Pacific Standard Time ng Mexico</standard>
-					<daylight>Pacific Daylight Time ng Mexico</daylight>
+					<generic>Oras sa Pasipiko ng Mexico</generic>
+					<standard>Standard na Oras sa Pasipiko ng Mexico</standard>
+					<daylight>Daylight Time sa Pasipiko ng Mexico</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mongolia">
 				<long>
-					<generic>Oras ng Ulan Bator</generic>
-					<standard>Standard Time ng Ulan Bator</standard>
+					<generic>Oras sa Ulan Bator</generic>
+					<standard>Standard na Oras sa Ulan Bator</standard>
 					<daylight>Oras sa Tag-init ng Ulan Bator</daylight>
 				</long>
 			</metazone>
 			<metazone type="Moscow">
 				<long>
-					<generic>Oras ng Moscow</generic>
-					<standard>Standard Time ng Moscow</standard>
+					<generic>Oras sa Moscow</generic>
+					<standard>Standard na Oras sa Moscow</standard>
 					<daylight>Oras sa Tag-init ng Moscow</daylight>
 				</long>
 			</metazone>
@@ -3655,124 +3784,124 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Nauru">
 				<long>
-					<standard>Oras ng Nauru</standard>
+					<standard>Oras sa Nauru</standard>
 				</long>
 			</metazone>
 			<metazone type="Nepal">
 				<long>
-					<standard>Oras ng Nepal</standard>
+					<standard>Oras sa Nepal</standard>
 				</long>
 			</metazone>
 			<metazone type="New_Caledonia">
 				<long>
-					<generic>Oras ng New Caledonia</generic>
-					<standard>Standard Time ng New Caledonia</standard>
+					<generic>Oras sa New Caledonia</generic>
+					<standard>Standard na Oras sa New Caledonia</standard>
 					<daylight>Oras sa Tag-init ng New Caledonia</daylight>
 				</long>
 			</metazone>
 			<metazone type="New_Zealand">
 				<long>
-					<generic>Oras ng New Zealand</generic>
-					<standard>Standard Time ng New Zealand</standard>
-					<daylight>Daylight Time ng New Zealand</daylight>
+					<generic>Oras sa New Zealand</generic>
+					<standard>Standard na Oras sa New Zealand</standard>
+					<daylight>Daylight Time sa New Zealand</daylight>
 				</long>
 			</metazone>
 			<metazone type="Newfoundland">
 				<long>
-					<generic>Oras ng Newfoundland</generic>
-					<standard>Standard Time ng Newfoundland</standard>
-					<daylight>Daylight Time ng Newfoundland</daylight>
+					<generic>Oras sa Newfoundland</generic>
+					<standard>Standard na Oras sa Newfoundland</standard>
+					<daylight>Daylight Time sa Newfoundland</daylight>
 				</long>
 			</metazone>
 			<metazone type="Niue">
 				<long>
-					<standard>Oras ng Niue</standard>
+					<standard>Oras sa Niue</standard>
 				</long>
 			</metazone>
 			<metazone type="Norfolk">
 				<long>
-					<standard>Oras ng Norfolk Island</standard>
+					<standard>Oras sa Norfolk Island</standard>
 				</long>
 			</metazone>
 			<metazone type="Noronha">
 				<long>
-					<generic>Oras ng Fernando de Noronha</generic>
-					<standard>Standard Time ng Fernando de Noronha</standard>
+					<generic>Oras sa Fernando de Noronha</generic>
+					<standard>Standard na Oras sa Fernando de Noronha</standard>
 					<daylight>Oras sa Tag-init ng Fernando de Noronha</daylight>
 				</long>
 			</metazone>
 			<metazone type="Novosibirsk">
 				<long>
-					<generic>Oras ng Novosibirsk</generic>
-					<standard>Standard Time ng Novosibirsk</standard>
+					<generic>Oras sa Novosibirsk</generic>
+					<standard>Standard na Oras sa Novosibirsk</standard>
 					<daylight>Oras sa Tag-init ng Novosibirsk</daylight>
 				</long>
 			</metazone>
 			<metazone type="Omsk">
 				<long>
-					<generic>Oras ng Omsk</generic>
-					<standard>Standard Time ng Omsk</standard>
+					<generic>Oras sa Omsk</generic>
+					<standard>Standard na Oras sa Omsk</standard>
 					<daylight>Oras sa Tag-init ng Omsk</daylight>
 				</long>
 			</metazone>
 			<metazone type="Pakistan">
 				<long>
-					<generic>Oras ng Pakistan</generic>
-					<standard>Standard Time ng Pakistan</standard>
+					<generic>Oras sa Pakistan</generic>
+					<standard>Standard na Oras sa Pakistan</standard>
 					<daylight>Oras sa Tag-init ng Pakistan</daylight>
 				</long>
 			</metazone>
 			<metazone type="Palau">
 				<long>
-					<standard>Oras ng Palau</standard>
+					<standard>Oras sa Palau</standard>
 				</long>
 			</metazone>
 			<metazone type="Papua_New_Guinea">
 				<long>
-					<standard>Oras ng Papua New Guinea</standard>
+					<standard>Oras sa Papua New Guinea</standard>
 				</long>
 			</metazone>
 			<metazone type="Paraguay">
 				<long>
-					<generic>Oras ng Paraguay</generic>
-					<standard>Standard Time ng Paraguay</standard>
+					<generic>Oras sa Paraguay</generic>
+					<standard>Standard na Oras sa Paraguay</standard>
 					<daylight>Oras sa Tag-init ng Paraguay</daylight>
 				</long>
 			</metazone>
 			<metazone type="Peru">
 				<long>
-					<generic>Oras ng Peru</generic>
-					<standard>Standard Time ng Peru</standard>
+					<generic>Oras sa Peru</generic>
+					<standard>Standard na Oras sa Peru</standard>
 					<daylight>Oras sa Tag-init ng Peru</daylight>
 				</long>
 			</metazone>
 			<metazone type="Philippines">
 				<long>
-					<generic>Oras ng Pilipinas</generic>
-					<standard>Standard Time ng Pilipinas</standard>
+					<generic>Oras sa Pilipinas</generic>
+					<standard>Standard na Oras sa Pilipinas</standard>
 					<daylight>Oras sa Tag-init ng Pilipinas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Phoenix_Islands">
 				<long>
-					<standard>Oras ng Phoenix Islands</standard>
+					<standard>Oras sa Phoenix Islands</standard>
 				</long>
 			</metazone>
 			<metazone type="Pierre_Miquelon">
 				<long>
-					<generic>Oras ng Saint Pierre and Miquelon</generic>
-					<standard>Standard Time ng Saint Pierre and Miquelon</standard>
-					<daylight>Daylight Time ng Saint Pierre and Miquelon</daylight>
+					<generic>Oras sa Saint Pierre and Miquelon</generic>
+					<standard>Standard na Oras sa Saint Pierre and Miquelon</standard>
+					<daylight>Daylight Time sa Saint Pierre and Miquelon</daylight>
 				</long>
 			</metazone>
 			<metazone type="Pitcairn">
 				<long>
-					<standard>Oras ng Pitcairn</standard>
+					<standard>Oras sa Pitcairn</standard>
 				</long>
 			</metazone>
 			<metazone type="Ponape">
 				<long>
-					<standard>Oras ng Ponape</standard>
+					<standard>Oras sa Ponape</standard>
 				</long>
 			</metazone>
 			<metazone type="Reunion">
@@ -3782,13 +3911,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Rothera">
 				<long>
-					<standard>Oras ng Rothera</standard>
+					<standard>Oras sa Rothera</standard>
 				</long>
 			</metazone>
 			<metazone type="Sakhalin">
 				<long>
-					<generic>Oras ng Sakhalin</generic>
-					<standard>Standard Time ng Sakhalin</standard>
+					<generic>Oras sa Sakhalin</generic>
+					<standard>Standard na Oras sa Sakhalin</standard>
 					<daylight>Oras sa Tag-init ng Sakhalin</daylight>
 				</long>
 			</metazone>
@@ -3801,153 +3930,153 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Samoa">
 				<long>
-					<generic>Oras ng Samoa</generic>
-					<standard>Standard Time ng Samoa</standard>
-					<daylight>Daylight Time ng Samoa</daylight>
+					<generic>Oras sa Samoa</generic>
+					<standard>Standard na Oras sa Samoa</standard>
+					<daylight>Daylight Time sa Samoa</daylight>
 				</long>
 			</metazone>
 			<metazone type="Seychelles">
 				<long>
-					<standard>Oras ng Seychelles</standard>
+					<standard>Oras sa Seychelles</standard>
 				</long>
 			</metazone>
 			<metazone type="Singapore">
 				<long>
-					<standard>Standard Time ng Singapore</standard>
+					<standard>Standard na Oras sa Singapore</standard>
 				</long>
 			</metazone>
 			<metazone type="Solomon">
 				<long>
-					<standard>Oras ng Solomon Islands</standard>
+					<standard>Oras sa Solomon Islands</standard>
 				</long>
 			</metazone>
 			<metazone type="South_Georgia">
 				<long>
-					<standard>Oras ng South Georgia</standard>
+					<standard>Oras sa Timog Georgia</standard>
 				</long>
 			</metazone>
 			<metazone type="Suriname">
 				<long>
-					<standard>Oras ng Suriname</standard>
+					<standard>Oras sa Suriname</standard>
 				</long>
 			</metazone>
 			<metazone type="Syowa">
 				<long>
-					<standard>Oras ng Syowa</standard>
+					<standard>Oras sa Syowa</standard>
 				</long>
 			</metazone>
 			<metazone type="Tahiti">
 				<long>
-					<standard>Oras ng Tahiti</standard>
+					<standard>Oras sa Tahiti</standard>
 				</long>
 			</metazone>
 			<metazone type="Taipei">
 				<long>
-					<generic>Oras ng Taipei</generic>
-					<standard>Standard Time ng Taipei</standard>
-					<daylight>Daylight Time ng Taipei</daylight>
+					<generic>Oras sa Taipei</generic>
+					<standard>Standard na Oras sa Taipei</standard>
+					<daylight>Daylight Time sa Taipei</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tajikistan">
 				<long>
-					<standard>Oras ng Tajikistan</standard>
+					<standard>Oras sa Tajikistan</standard>
 				</long>
 			</metazone>
 			<metazone type="Tokelau">
 				<long>
-					<standard>Oras ng Tokelau</standard>
+					<standard>Oras sa Tokelau</standard>
 				</long>
 			</metazone>
 			<metazone type="Tonga">
 				<long>
-					<generic>Oras ng Tonga</generic>
-					<standard>Standard Time ng Tonga</standard>
+					<generic>Oras sa Tonga</generic>
+					<standard>Standard na Oras sa Tonga</standard>
 					<daylight>Oras sa Tag-init ng Tonga</daylight>
 				</long>
 			</metazone>
 			<metazone type="Truk">
 				<long>
-					<standard>Oras ng Chuuk</standard>
+					<standard>Oras sa Chuuk</standard>
 				</long>
 			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
-					<generic>Oras ng Turkmenistan</generic>
-					<standard>Standard Time ng Turkmenistan</standard>
+					<generic>Oras sa Turkmenistan</generic>
+					<standard>Standard na Oras sa Turkmenistan</standard>
 					<daylight>Oras sa Tag-init ng Turkmenistan</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tuvalu">
 				<long>
-					<standard>Oras ng Tuvalu</standard>
+					<standard>Oras sa Tuvalu</standard>
 				</long>
 			</metazone>
 			<metazone type="Uruguay">
 				<long>
-					<generic>Oras ng Uruguay</generic>
-					<standard>Standard Time ng Uruguay</standard>
+					<generic>Oras sa Uruguay</generic>
+					<standard>Standard na Oras sa Uruguay</standard>
 					<daylight>Oras sa Tag-init ng Uruguay</daylight>
 				</long>
 			</metazone>
 			<metazone type="Uzbekistan">
 				<long>
-					<generic>Oras ng Uzbekistan</generic>
-					<standard>Standard Time ng Uzbekistan</standard>
+					<generic>Oras sa Uzbekistan</generic>
+					<standard>Standard na Oras sa Uzbekistan</standard>
 					<daylight>Oras sa Tag-init ng Uzbekistan</daylight>
 				</long>
 			</metazone>
 			<metazone type="Vanuatu">
 				<long>
-					<generic>Oras ng Vanuatu</generic>
-					<standard>Standard Time ng Vanuatu</standard>
+					<generic>Oras sa Vanuatu</generic>
+					<standard>Standard na Oras sa Vanuatu</standard>
 					<daylight>Oras sa Tag-init ng Vanuatu</daylight>
 				</long>
 			</metazone>
 			<metazone type="Venezuela">
 				<long>
-					<standard>Oras ng Venezuela</standard>
+					<standard>Oras sa Venezuela</standard>
 				</long>
 			</metazone>
 			<metazone type="Vladivostok">
 				<long>
-					<generic>Oras ng Vladivostok</generic>
-					<standard>Standard Time ng Vladivostok</standard>
+					<generic>Oras sa Vladivostok</generic>
+					<standard>Standard na Oras sa Vladivostok</standard>
 					<daylight>Oras sa Tag-init ng Vladivostok</daylight>
 				</long>
 			</metazone>
 			<metazone type="Volgograd">
 				<long>
-					<generic>Oras ng Volgograd</generic>
-					<standard>Standard Time ng Volgograd</standard>
+					<generic>Oras sa Volgograd</generic>
+					<standard>Standard na Oras sa Volgograd</standard>
 					<daylight>Oras sa Tag-init ng Volgograd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Vostok">
 				<long>
-					<standard>Oras ng Vostok</standard>
+					<standard>Oras sa Vostok</standard>
 				</long>
 			</metazone>
 			<metazone type="Wake">
 				<long>
-					<standard>Oras ng Wake Island</standard>
+					<standard>Oras sa Wake Island</standard>
 				</long>
 			</metazone>
 			<metazone type="Wallis">
 				<long>
-					<standard>Oras ng Wallis and Futuna</standard>
+					<standard>Oras sa Wallis and Futuna</standard>
 				</long>
 			</metazone>
 			<metazone type="Yakutsk">
 				<long>
-					<generic>Oras ng Yakutsk</generic>
-					<standard>Standard Time ng Yakutsk</standard>
+					<generic>Oras sa Yakutsk</generic>
+					<standard>Standard na Oras sa Yakutsk</standard>
 					<daylight>Oras sa Tag-init ng Yakutsk</daylight>
 				</long>
 			</metazone>
 			<metazone type="Yekaterinburg">
 				<long>
-					<generic>Oras ng Yekaterinburg</generic>
-					<standard>Standard Time ng Yekaterinburg</standard>
+					<generic>Oras sa Yekaterinburg</generic>
+					<standard>Standard na Oras sa Yekaterinburg</standard>
 					<daylight>Oras sa Tag-init ng Yekaterinburg</daylight>
 				</long>
 			</metazone>
@@ -3982,29 +4111,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<decimalFormatLength type="long">
 				<decimalFormat>
 					<pattern type="1000" count="one">0 libo</pattern>
-					<pattern type="1000" count="other">0 libo</pattern>
+					<pattern type="1000" count="other">0 na libo</pattern>
 					<pattern type="10000" count="one">00 libo</pattern>
-					<pattern type="10000" count="other">00 libo</pattern>
+					<pattern type="10000" count="other">00 na libo</pattern>
 					<pattern type="100000" count="one">000 libo</pattern>
-					<pattern type="100000" count="other">000 libo</pattern>
+					<pattern type="100000" count="other">000 na libo</pattern>
 					<pattern type="1000000" count="one">0 milyon</pattern>
-					<pattern type="1000000" count="other">0 milyon</pattern>
+					<pattern type="1000000" count="other">0 na milyon</pattern>
 					<pattern type="10000000" count="one">00 milyon</pattern>
-					<pattern type="10000000" count="other">00 milyon</pattern>
+					<pattern type="10000000" count="other">00 na milyon</pattern>
 					<pattern type="100000000" count="one">000 milyon</pattern>
-					<pattern type="100000000" count="other">000 milyon</pattern>
+					<pattern type="100000000" count="other">000 na milyon</pattern>
 					<pattern type="1000000000" count="one">0 bilyon</pattern>
-					<pattern type="1000000000" count="other">0 bilyon</pattern>
+					<pattern type="1000000000" count="other">0 na bilyon</pattern>
 					<pattern type="10000000000" count="one">00 bilyon</pattern>
-					<pattern type="10000000000" count="other">00 bilyon</pattern>
+					<pattern type="10000000000" count="other">00 na bilyon</pattern>
 					<pattern type="100000000000" count="one">000 bilyon</pattern>
-					<pattern type="100000000000" count="other">000 bilyon</pattern>
+					<pattern type="100000000000" count="other">000 na bilyon</pattern>
 					<pattern type="1000000000000" count="one">0 trilyon</pattern>
-					<pattern type="1000000000000" count="other">0 trilyon</pattern>
+					<pattern type="1000000000000" count="other">0 na trilyon</pattern>
 					<pattern type="10000000000000" count="one">00 trilyon</pattern>
-					<pattern type="10000000000000" count="other">00 trilyon</pattern>
+					<pattern type="10000000000000" count="other">00 na trilyon</pattern>
 					<pattern type="100000000000000" count="one">000 trilyon</pattern>
-					<pattern type="100000000000000" count="other">000 trilyon</pattern>
+					<pattern type="100000000000000" count="other">000 na trilyon</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
 			<decimalFormatLength type="short">
@@ -4059,6 +4188,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">¤0K</pattern>
+					<pattern type="1000" count="other">¤0K</pattern>
+					<pattern type="10000" count="one">¤00K</pattern>
+					<pattern type="10000" count="other">¤00K</pattern>
+					<pattern type="100000" count="one">¤000K</pattern>
+					<pattern type="100000" count="other">¤000K</pattern>
+					<pattern type="1000000" count="one">¤0M</pattern>
+					<pattern type="1000000" count="other">¤0M</pattern>
+					<pattern type="10000000" count="one">¤00M</pattern>
+					<pattern type="10000000" count="other">¤00M</pattern>
+					<pattern type="100000000" count="one">¤000M</pattern>
+					<pattern type="100000000" count="other">¤000M</pattern>
+					<pattern type="1000000000" count="one">¤0B</pattern>
+					<pattern type="1000000000" count="other">¤0B</pattern>
+					<pattern type="10000000000" count="one">¤00B</pattern>
+					<pattern type="10000000000" count="other">¤00B</pattern>
+					<pattern type="100000000000" count="one">¤000B</pattern>
+					<pattern type="100000000000" count="other">¤000B</pattern>
+					<pattern type="1000000000000" count="one">¤0T</pattern>
+					<pattern type="1000000000000" count="other">¤0T</pattern>
+					<pattern type="10000000000000" count="one">¤00T</pattern>
+					<pattern type="10000000000000" count="other">¤00T</pattern>
+					<pattern type="100000000000000" count="one">¤000T</pattern>
+					<pattern type="100000000000000" count="other">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4067,6 +4224,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>United Arab Emirates Dirham</displayName>
 				<displayName count="one">UAE dirham</displayName>
 				<displayName count="other">UAE dirhams</displayName>
+				<symbol draft="contributed">AED</symbol>
 			</currency>
 			<currency type="AFN">
 				<displayName>Afghan Afghani</displayName>
@@ -4084,22 +4242,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Armenian Dram</displayName>
 				<displayName count="one">Armenian dram</displayName>
 				<displayName count="other">Armenian drams</displayName>
+				<symbol draft="contributed">AMD</symbol>
 			</currency>
 			<currency type="ANG">
-				<displayName>Netherlands Antillean Guilder</displayName>
-				<displayName count="one">Netherlands Antillean guilder</displayName>
-				<displayName count="other">Netherlands Antillean guilders</displayName>
+				<displayName>Antillean Guilder ng Netherlands</displayName>
+				<displayName count="one">Antillean guilder ng Netherlands</displayName>
+				<displayName count="other">Antillean guilders ng Netherlands</displayName>
 				<symbol>ANG</symbol>
 			</currency>
 			<currency type="AOA">
 				<displayName>Angolan Kwanza</displayName>
 				<displayName count="one">Angolan kwanza</displayName>
 				<displayName count="other">Angolan kwanzas</displayName>
+				<symbol draft="contributed">AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="ARS">
-				<displayName>Argentine Peso</displayName>
-				<displayName count="one">Argentine peso</displayName>
-				<displayName count="other">Argentine pesos</displayName>
+				<displayName>Piso ng Argentina</displayName>
+				<displayName count="one">piso ng Argentina</displayName>
+				<displayName count="other">piso ng Argentina</displayName>
 				<symbol>ARS</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -4108,23 +4269,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dolyar ng Australya</displayName>
 				<displayName count="other">dolyares ng Australya</displayName>
 				<symbol>A$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="AWG">
-				<displayName>Aruban Florin</displayName>
-				<displayName count="one">Aruban florin</displayName>
-				<displayName count="other">Aruban florin</displayName>
+				<displayName>Florin ng Aruba</displayName>
+				<displayName count="one">florin ng Aruba</displayName>
+				<displayName count="other">florin ng Aruba</displayName>
 				<symbol>AWG</symbol>
 			</currency>
 			<currency type="AZN">
 				<displayName>Azerbaijani Manat</displayName>
 				<displayName count="one">Azerbaijani manat</displayName>
 				<displayName count="other">Azerbaijani manats</displayName>
+				<symbol draft="contributed">AZN</symbol>
 			</currency>
 			<currency type="BAM">
 				<displayName>Bosnia-Herzegovina Convertible Mark</displayName>
 				<displayName count="one">Bosnia-Herzegovina convertible mark</displayName>
 				<displayName count="other">Bosnia-Herzegovina convertible marks</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>Dolyar ng Barbados</displayName>
@@ -4150,11 +4314,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Bahraini Dinar</displayName>
 				<displayName count="one">Bahraini dinar</displayName>
 				<displayName count="other">Bahraini dinars</displayName>
+				<symbol draft="contributed">BHD</symbol>
 			</currency>
 			<currency type="BIF">
 				<displayName>Burundian Franc</displayName>
 				<displayName count="one">Burundian franc</displayName>
 				<displayName count="other">Burundian francs</displayName>
+				<symbol draft="contributed">BIF</symbol>
 			</currency>
 			<currency type="BMD">
 				<displayName>Dolyar ng Bermuda</displayName>
@@ -4171,15 +4337,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BOB">
-				<displayName>Bolivian Boliviano</displayName>
-				<displayName count="one">Bolivian boliviano</displayName>
-				<displayName count="other">Bolivian bolivianos</displayName>
+				<displayName>Boliviano ng Bolivia</displayName>
+				<displayName count="one">boliviano ng Bolivia</displayName>
+				<displayName count="other">bolivianos ng Bolivia</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BRL">
-				<displayName>Brazilian Real</displayName>
-				<displayName count="one">Brazilian real</displayName>
-				<displayName count="other">Brazilian reals</displayName>
+				<displayName>Real ng Barzil</displayName>
+				<displayName count="one">real ng Brazil</displayName>
+				<displayName count="other">reals ng Brazil</displayName>
 				<symbol>R$</symbol>
 				<symbol alt="narrow" draft="contributed">R$</symbol>
 			</currency>
@@ -4200,6 +4367,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Botswanan Pula</displayName>
 				<displayName count="one">Botswanan pula</displayName>
 				<displayName count="other">Botswanan pulas</displayName>
+				<symbol draft="contributed">BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYR">
 				<displayName>Belarusian Ruble</displayName>
@@ -4226,6 +4395,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Congolese Franc</displayName>
 				<displayName count="one">Congolese franc</displayName>
 				<displayName count="other">Congolese francs</displayName>
+				<symbol draft="contributed">CDF</symbol>
 			</currency>
 			<currency type="CHF">
 				<displayName>Swiss Franc</displayName>
@@ -4255,9 +4425,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CRC">
-				<displayName>Costa Rican Colón</displayName>
-				<displayName count="one">Costa Rican colón</displayName>
-				<displayName count="other">Costa Rican colóns</displayName>
+				<displayName>Colón ng Costa Rica</displayName>
+				<displayName count="one">colón ng Costa Rica</displayName>
+				<displayName count="other">colóns ng Costa Rica</displayName>
 				<symbol>CRC</symbol>
 				<symbol alt="narrow" draft="contributed">₡</symbol>
 			</currency>
@@ -4266,6 +4436,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Convertible na piso ng Cuba</displayName>
 				<displayName count="other">Convertible na Piso ng Cuba</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>Piso ng Cuba</displayName>
@@ -4278,12 +4449,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Cape Verdean Escudo</displayName>
 				<displayName count="one">Cape Verdean escudo</displayName>
 				<displayName count="other">Cape Verdean escudos</displayName>
+				<symbol draft="contributed">CVE</symbol>
 			</currency>
 			<currency type="CZK">
 				<displayName>Czech Republic Koruna</displayName>
 				<displayName count="one">Czech Republic koruna</displayName>
 				<displayName count="other">Czech Republic korunas</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DEM">
 				<displayName draft="contributed">Deutsche Marks</displayName>
@@ -4292,12 +4465,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Djiboutian Franc</displayName>
 				<displayName count="one">Djiboutian franc</displayName>
 				<displayName count="other">Djiboutian francs</displayName>
+				<symbol draft="contributed">DJF</symbol>
 			</currency>
 			<currency type="DKK">
-				<displayName>Denmark Krone</displayName>
+				<displayName>Danish Krone</displayName>
 				<displayName count="one">Danish krone</displayName>
 				<displayName count="other">Danish kroner</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Piso ng Dominican</displayName>
@@ -4310,6 +4485,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Algerian Dinar</displayName>
 				<displayName count="one">Algerian dinar</displayName>
 				<displayName count="other">Algerian dinars</displayName>
+				<symbol draft="contributed">DZD</symbol>
 			</currency>
 			<currency type="EEK">
 				<displayName draft="contributed">Estonian Kroon</displayName>
@@ -4318,16 +4494,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Egyptian Pound</displayName>
 				<displayName count="one">Egyptian pound</displayName>
 				<displayName count="other">Egyptian pounds</displayName>
+				<symbol draft="contributed">EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>Eritrean Nakfa</displayName>
 				<displayName count="one">Eritrean nakfa</displayName>
 				<displayName count="other">Eritrean nakfas</displayName>
+				<symbol draft="contributed">ERN</symbol>
 			</currency>
 			<currency type="ETB">
 				<displayName>Ethiopian Birr</displayName>
 				<displayName count="one">Ethiopian birr</displayName>
 				<displayName count="other">Ethiopian birrs</displayName>
+				<symbol draft="contributed">ETB</symbol>
 			</currency>
 			<currency type="EUR">
 				<displayName>Euro</displayName>
@@ -4340,12 +4520,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Dolyar ng Fiji</displayName>
 				<displayName count="one">dolyar ng Fiji</displayName>
 				<displayName count="other">dolyares ng Fiji</displayName>
+				<symbol draft="contributed">FJD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="FKP">
-				<displayName>Falkland Islands Pound</displayName>
-				<displayName count="one">Falkland Islands pound</displayName>
-				<displayName count="other">Falkland Islands pounds</displayName>
+				<displayName>Pound ng Falkland Islands</displayName>
+				<displayName count="one">pound ng Falkland Islands</displayName>
+				<displayName count="other">pounds ng Falkland Islands</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName draft="contributed">French Franc</displayName>
@@ -4361,11 +4544,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Georgian Lari</displayName>
 				<displayName count="one">Georgian lari</displayName>
 				<displayName count="other">Georgian laris</displayName>
+				<symbol draft="contributed">GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHS">
 				<displayName>Ghanaian Cedi</displayName>
 				<displayName count="one">Ghanaian cedi</displayName>
-				<displayName count="other">Ghanaian CediGhanaian cedis</displayName>
+				<displayName count="other">Ghanian cedis</displayName>
+				<symbol draft="contributed">GHS</symbol>
 			</currency>
 			<currency type="GIP">
 				<displayName>Gibraltar Pound</displayName>
@@ -4378,17 +4564,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Gambian Dalasi</displayName>
 				<displayName count="one">Gambian dalasi</displayName>
 				<displayName count="other">Gambian dalasis</displayName>
+				<symbol draft="contributed">GMD</symbol>
 			</currency>
 			<currency type="GNF">
 				<displayName>Guinean Franc</displayName>
 				<displayName count="one">Guinean franc</displayName>
 				<displayName count="other">Guinean francs</displayName>
+				<symbol draft="contributed">GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GTQ">
-				<displayName>Guatemalan Quetzal</displayName>
-				<displayName count="one">Guatemalan quetzal</displayName>
-				<displayName count="other">Guatemalan quetzals</displayName>
+				<displayName>Quetzal ng Guatemala</displayName>
+				<displayName count="one">quetzal ng Guatemala</displayName>
+				<displayName count="other">quetzals ng Guatemala</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GYD">
 				<displayName>Dolyar ng Guyanese</displayName>
@@ -4405,21 +4595,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="HNL">
-				<displayName>Honduran Lempira</displayName>
-				<displayName count="one">Honduran lempira</displayName>
-				<displayName count="other">Honduran lempiras</displayName>
+				<displayName>Lempira ng Honduras</displayName>
+				<displayName count="one">lempira ng Honduras</displayName>
+				<displayName count="other">lempiras ng Honduras</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRK">
 				<displayName>Croatian Kuna</displayName>
 				<displayName count="one">Croatian kuna</displayName>
 				<displayName count="other">Croatian kunas</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
-				<displayName>Haitian Gourde</displayName>
-				<displayName count="one">Haitian gourde</displayName>
-				<displayName count="other">Haitian gourdes</displayName>
+				<displayName>Gourde ng Haiti</displayName>
+				<displayName count="one">gourde ng Haiti</displayName>
+				<displayName count="other">gourdes ng Haiti</displayName>
 				<symbol>HTG</symbol>
 			</currency>
 			<currency type="HUF">
@@ -4427,18 +4619,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Hungarian forint</displayName>
 				<displayName count="other">Hungarian forints</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>Indonesian Rupiah</displayName>
 				<displayName count="one">Indonesian rupiah</displayName>
 				<displayName count="other">Indonesian rupiahs</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="ILS">
 				<displayName>Israeli New Sheqel</displayName>
 				<displayName count="one">Israeli new sheqel</displayName>
 				<displayName count="other">Israeli new sheqels</displayName>
 				<symbol>₪</symbol>
+				<symbol alt="narrow" draft="contributed">₪</symbol>
 			</currency>
 			<currency type="INR">
 				<displayName>Indian Rupee</displayName>
@@ -4451,6 +4646,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Iraqi Dinar</displayName>
 				<displayName count="one">Iraqi dinar</displayName>
 				<displayName count="other">Iraqi dinars</displayName>
+				<symbol draft="contributed">IQD</symbol>
 			</currency>
 			<currency type="IRR">
 				<displayName>Iranian Rial</displayName>
@@ -4463,6 +4659,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Icelandic króna</displayName>
 				<displayName count="other">Icelandic krónur</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="JMD">
 				<displayName>Dolyar ng Jamaica</displayName>
@@ -4475,6 +4672,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Jordanian Dinar</displayName>
 				<displayName count="one">Jordanian dinar</displayName>
 				<displayName count="other">Jordanian dinars</displayName>
+				<symbol draft="contributed">JOD</symbol>
 			</currency>
 			<currency type="JPY">
 				<displayName>Japanese Yen</displayName>
@@ -4487,11 +4685,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Kenyan Shilling</displayName>
 				<displayName count="one">Kenyan shilling</displayName>
 				<displayName count="other">Kenyan shillings</displayName>
+				<symbol draft="contributed">KES</symbol>
 			</currency>
 			<currency type="KGS">
 				<displayName>Kyrgystani Som</displayName>
 				<displayName count="one">Kyrgystani som</displayName>
 				<displayName count="other">Kyrgystani soms</displayName>
+				<symbol draft="contributed">KGS</symbol>
 			</currency>
 			<currency type="KHR">
 				<displayName>Cambodian Riel</displayName>
@@ -4504,17 +4704,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Comorian Franc</displayName>
 				<displayName count="one">Comorian franc</displayName>
 				<displayName count="other">Comorian francs</displayName>
+				<symbol draft="contributed">KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
-				<displayName>North Korean Won</displayName>
-				<displayName count="one">North Korean won</displayName>
-				<displayName count="other">North Korean won</displayName>
+				<displayName>Won ng Hilagang Korea</displayName>
+				<displayName count="one">won ng Hilagang Korea</displayName>
+				<displayName count="other">won ng Hilagang Korea</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
-				<displayName>South Korean Won</displayName>
-				<displayName count="one">South Korean won</displayName>
-				<displayName count="other">South Korean won</displayName>
+				<displayName>Won ng Timog Korea</displayName>
+				<displayName count="one">won ng Timog Korea</displayName>
+				<displayName count="other">won ng Timog Korea</displayName>
 				<symbol>₩</symbol>
 				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
@@ -4522,6 +4725,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Kuwaiti Dinar</displayName>
 				<displayName count="one">Kuwaiti dinar</displayName>
 				<displayName count="other">Kuwaiti dinars</displayName>
+				<symbol draft="contributed">KWD</symbol>
 			</currency>
 			<currency type="KYD">
 				<displayName>Dolyar ng Cayman Islands</displayName>
@@ -4534,6 +4738,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Kazakhstani Tenge</displayName>
 				<displayName count="one">Kazakhstani tenge</displayName>
 				<displayName count="other">Kazakhstani tenges</displayName>
+				<symbol draft="contributed">KZT</symbol>
+				<symbol alt="narrow" draft="contributed">₸</symbol>
 			</currency>
 			<currency type="LAK">
 				<displayName>Laotian Kip</displayName>
@@ -4543,20 +4749,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">₭</symbol>
 			</currency>
 			<currency type="LBP">
-				<displayName>Lebanese Pound</displayName>
-				<displayName count="one">Lebanese pound</displayName>
-				<displayName count="other">Lebanese pounds</displayName>
+				<displayName>Pound ng Lebanon</displayName>
+				<displayName count="one">pound ng Lebanon</displayName>
+				<displayName count="other">pounds ng Lebanon</displayName>
+				<symbol draft="contributed">LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>Sri Lankan Rupee</displayName>
 				<displayName count="one">Sri Lankan rupee</displayName>
 				<displayName count="other">Sri Lankan rupees</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>Dolyar ng Liberia</displayName>
 				<displayName count="one">dolyar ng Liberia</displayName>
 				<displayName count="other">dolyares ng Liberia</displayName>
+				<symbol draft="contributed">LRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="LSL">
 				<displayName>Lesotho Loti</displayName>
@@ -4577,11 +4788,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Libyan Dinar</displayName>
 				<displayName count="one">Libyan dinar</displayName>
 				<displayName count="other">Libyan dinars</displayName>
+				<symbol draft="contributed">LYD</symbol>
 			</currency>
 			<currency type="MAD">
 				<displayName>Moroccan Dirham</displayName>
 				<displayName count="one">Moroccan dirham</displayName>
 				<displayName count="other">Moroccan dirhams</displayName>
+				<symbol draft="contributed">MAD</symbol>
 			</currency>
 			<currency type="MDL">
 				<displayName>Moldovan Leu</displayName>
@@ -4593,6 +4806,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Malagasy Ariary</displayName>
 				<displayName count="one">Malagasy Ariary</displayName>
 				<displayName count="other">Malagasy Ariaries</displayName>
+				<symbol draft="contributed">MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MKD">
 				<displayName>Macedonian Denar</displayName>
@@ -4605,6 +4820,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Myanmar kyat</displayName>
 				<displayName count="other">Myanmar kyats</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>Mongolian Tugrik</displayName>
@@ -4623,11 +4839,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Mauritanian Ouguiya</displayName>
 				<displayName count="one">Mauritanian ouguiya</displayName>
 				<displayName count="other">Mauritanian ouguiyas</displayName>
+				<symbol draft="contributed">MRO</symbol>
 			</currency>
 			<currency type="MUR">
 				<displayName>Mauritian Rupee</displayName>
 				<displayName count="one">Mauritian rupee</displayName>
 				<displayName count="other">Mauritian rupees</displayName>
+				<symbol draft="contributed">MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>Maldivian Rufiyaa</displayName>
@@ -4639,11 +4858,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Malawian Kwacha</displayName>
 				<displayName count="one">Malawian Kwacha</displayName>
 				<displayName count="other">Malawian Kwachas</displayName>
+				<symbol draft="contributed">MWK</symbol>
 			</currency>
 			<currency type="MXN">
 				<displayName>Piso ng Mexico</displayName>
 				<displayName count="one">piso ng Mexico</displayName>
-				<displayName count="other">Piso ng Mexico</displayName>
+				<displayName count="other">piso ng Mexico</displayName>
 				<symbol>MX$</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -4652,55 +4872,66 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Malaysian ringgit</displayName>
 				<displayName count="other">Malaysian ringgits</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZN">
 				<displayName>Mozambican Metical</displayName>
 				<displayName count="one">Mozambican metical</displayName>
 				<displayName count="other">Mozambican meticals</displayName>
+				<symbol draft="contributed">MZN</symbol>
 			</currency>
 			<currency type="NAD">
 				<displayName>Dolyar ng Namibia</displayName>
 				<displayName count="one">dolyar ng Namibia</displayName>
 				<displayName count="other">dolyares ng Namibia</displayName>
+				<symbol draft="contributed">NAD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="NGN">
 				<displayName>Nigerian Naira</displayName>
 				<displayName count="one">Nigerian naira</displayName>
 				<displayName count="other">Nigerian nairas</displayName>
+				<symbol draft="contributed">NGN</symbol>
+				<symbol alt="narrow" draft="contributed">₦</symbol>
 			</currency>
 			<currency type="NIO">
-				<displayName>Nicaraguan Córdoba</displayName>
-				<displayName count="one">Nicaraguan córdoba</displayName>
+				<displayName>Córdoba ng Nicaragua</displayName>
+				<displayName count="one">córdoba ng Nicaragua</displayName>
 				<displayName count="other">Nicaraguan córdobas</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NOK">
 				<displayName>Norwegian Krone</displayName>
 				<displayName count="one">Norwegian krone</displayName>
 				<displayName count="other">Norwegian kroner</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>Nepalese Rupee</displayName>
 				<displayName count="one">Nepalese rupee</displayName>
 				<displayName count="other">Nepalese rupees</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>Dolyar ng New Zealand</displayName>
 				<displayName count="one">dolyares ng New Zealand</displayName>
 				<displayName count="other">dolyares ng New Zealand</displayName>
 				<symbol>NZ$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="OMR">
 				<displayName>Omani Rial</displayName>
 				<displayName count="one">Omani rial</displayName>
 				<displayName count="other">Omani rials</displayName>
+				<symbol draft="contributed">OMR</symbol>
 			</currency>
 			<currency type="PAB">
-				<displayName>Panamanian Balboa</displayName>
-				<displayName count="one">Panamanian balboa</displayName>
-				<displayName count="other">Panamanian balboas</displayName>
+				<displayName>Balboa ng Panama</displayName>
+				<displayName count="one">balboa ng Panama</displayName>
+				<displayName count="other">Balboas ng Panama</displayName>
 				<symbol>PAB</symbol>
 			</currency>
 			<currency type="PEN">
@@ -4713,6 +4944,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Papua New Guinean Kina</displayName>
 				<displayName count="one">Papua New Guinean kina</displayName>
 				<displayName count="other">Papua New Guinean kina</displayName>
+				<symbol draft="contributed">PGK</symbol>
 			</currency>
 			<currency type="PHP">
 				<displayName>Piso ng Pilipinas</displayName>
@@ -4726,12 +4958,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Pakistani rupee</displayName>
 				<displayName count="other">Pakistani rupees</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>Polish Zloty</displayName>
 				<displayName count="one">Polish zloty</displayName>
 				<displayName count="other">Polish zlotys</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PYG">
 				<displayName>Paraguayan Guarani</displayName>
@@ -4744,6 +4978,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Qatari Rial</displayName>
 				<displayName count="one">Qatari rial</displayName>
 				<displayName count="other">Qatari rials</displayName>
+				<symbol draft="contributed">QAR</symbol>
 			</currency>
 			<currency type="RON">
 				<displayName>Romanian Leu</displayName>
@@ -4762,37 +4997,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Russian ruble</displayName>
 				<displayName count="other">Russian rubles</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RWF">
 				<displayName>Rwandan Franc</displayName>
 				<displayName count="one">Rwandan franc</displayName>
 				<displayName count="other">Rwandan francs</displayName>
+				<symbol draft="contributed">RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>Saudi Riyal</displayName>
 				<displayName count="one">Saudi riyal</displayName>
 				<displayName count="other">Saudi riyals</displayName>
+				<symbol draft="contributed">SAR</symbol>
 			</currency>
 			<currency type="SBD">
 				<displayName>Dolyar ng Solomon Islands</displayName>
 				<displayName count="one">dolyar ng Solomon Islands</displayName>
 				<displayName count="other">dolyar ng Solomon Islands</displayName>
+				<symbol draft="contributed">SBD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SCR">
 				<displayName>Seychellois Rupee</displayName>
 				<displayName count="one">Seychellois rupee</displayName>
 				<displayName count="other">Seychellois rupees</displayName>
+				<symbol draft="contributed">SCR</symbol>
 			</currency>
 			<currency type="SDG">
-				<displayName>Sudanese Pound</displayName>
-				<displayName count="one">Sudanese pound</displayName>
+				<displayName>Pound ng Sudan</displayName>
+				<displayName count="one">pound ng Sudan</displayName>
 				<displayName count="other">Sudanese pounds</displayName>
+				<symbol draft="contributed">SDG</symbol>
 			</currency>
 			<currency type="SEK">
 				<displayName>Swedish Krona</displayName>
 				<displayName count="one">Swedish krona</displayName>
 				<displayName count="other">Swedish kronor</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>Dolyar ng Singapore</displayName>
@@ -4805,6 +5049,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Saint Helena Pound</displayName>
 				<displayName count="one">Saint Helena pound</displayName>
 				<displayName count="other">Saint Helena pounds</displayName>
+				<symbol draft="contributed">SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName draft="contributed">Slovenian Tolar</displayName>
@@ -4816,11 +5062,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Sierra Leonean Leone</displayName>
 				<displayName count="one">Sierra Leonean leone</displayName>
 				<displayName count="other">Sierra Leonean leones</displayName>
+				<symbol draft="contributed">SLL</symbol>
 			</currency>
 			<currency type="SOS">
 				<displayName>Somali Shilling</displayName>
 				<displayName count="one">Somali shilling</displayName>
 				<displayName count="other">Somali shillings</displayName>
+				<symbol draft="contributed">SOS</symbol>
 			</currency>
 			<currency type="SRD">
 				<displayName>Dolyar ng Suriname</displayName>
@@ -4830,55 +5078,71 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SSP">
-				<displayName>South Sudanese Pound</displayName>
-				<displayName count="one">South Sudanese pound</displayName>
-				<displayName count="other">South Sudanese pounds</displayName>
+				<displayName>Pound ng Timog Sudan</displayName>
+				<displayName count="one">Pound ng Timog Sudan</displayName>
+				<displayName count="other">pounds ng Timog Sudan</displayName>
+				<symbol draft="contributed">SSP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="STD">
-				<displayName>Sao Tome and Principe Dobra</displayName>
-				<displayName count="one">Sao Tome and Principe dobra</displayName>
-				<displayName count="other">Sao Tome and Principe dobras</displayName>
+				<displayName>São Tomé &amp; Príncipe Dobra</displayName>
+				<displayName count="one">São Tomé &amp; Príncipe dobra</displayName>
+				<displayName count="other">São Tomé &amp; Príncipe dobras</displayName>
+				<symbol draft="contributed">STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SYP">
 				<displayName>Syrian Pound</displayName>
 				<displayName count="one">Syrian pound</displayName>
 				<displayName count="other">Syrian pounds</displayName>
+				<symbol draft="contributed">SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>Swazi Lilangeni</displayName>
 				<displayName count="one">Swazi lilangeni</displayName>
 				<displayName count="other">Swazi emalangeni</displayName>
+				<symbol draft="contributed">SZL</symbol>
 			</currency>
 			<currency type="THB">
 				<displayName>Thai Baht</displayName>
 				<displayName count="one">Thai baht</displayName>
 				<displayName count="other">Thai baht</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJS">
 				<displayName>Tajikistani Somoni</displayName>
 				<displayName count="one">Tajikistani somoni</displayName>
 				<displayName count="other">Tajikistani somonis</displayName>
+				<symbol draft="contributed">TJS</symbol>
 			</currency>
 			<currency type="TMT">
 				<displayName>Turkmenistani Manat</displayName>
 				<displayName count="one">Turkmenistani manat</displayName>
 				<displayName count="other">Turkmenistani manat</displayName>
+				<symbol draft="contributed">TMT</symbol>
 			</currency>
 			<currency type="TND">
 				<displayName>Tunisian Dinar</displayName>
 				<displayName count="one">Tunisian dinar</displayName>
 				<displayName count="other">Tunisian dinars</displayName>
+				<symbol draft="contributed">TND</symbol>
 			</currency>
 			<currency type="TOP">
 				<displayName>Tongan Paʻanga</displayName>
 				<displayName count="one">Tongan paʻanga</displayName>
 				<displayName count="other">Tongan paʻanga</displayName>
+				<symbol draft="contributed">TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TRY">
 				<displayName>Turkish Lira</displayName>
 				<displayName count="one">Turkish lira</displayName>
 				<displayName count="other">Turkish Lira</displayName>
+				<symbol draft="contributed">TRY</symbol>
+				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Dolyar ng Trinidad and Tobago</displayName>
@@ -4898,6 +5162,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Tanzanian Shilling</displayName>
 				<displayName count="one">Tanzanian shilling</displayName>
 				<displayName count="other">Tanzanian shillings</displayName>
+				<symbol draft="contributed">TZS</symbol>
 			</currency>
 			<currency type="UAH">
 				<displayName>Ukrainian Hryvnia</displayName>
@@ -4910,6 +5175,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Ugandan Shilling</displayName>
 				<displayName count="one">Ugandan shilling</displayName>
 				<displayName count="other">Ugandan shillings</displayName>
+				<symbol draft="contributed">UGX</symbol>
 			</currency>
 			<currency type="USD">
 				<displayName>Dolyar ng US</displayName>
@@ -4929,15 +5195,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Uzbekistan Som</displayName>
 				<displayName count="one">Uzbekistan som</displayName>
 				<displayName count="other">Uzbekistan som</displayName>
+				<symbol draft="contributed">UZS</symbol>
 			</currency>
 			<currency type="VEB">
 				<displayName>Venezuelan Bolívar (1871–2008)</displayName>
 			</currency>
 			<currency type="VEF">
-				<displayName>Venezuelan Bolívar</displayName>
-				<displayName count="one">Venezuelan bolívar</displayName>
-				<displayName count="other">Venezuelan bolívars</displayName>
+				<displayName>Bolívar ng Venezuela</displayName>
+				<displayName count="one">bolívar ng Venezuela</displayName>
+				<displayName count="other">bolívars ng Venezuela</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>Vietnamese Dong</displayName>
@@ -4950,11 +5218,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Vanuatu Vatu</displayName>
 				<displayName count="one">Vanuatu vatu</displayName>
 				<displayName count="other">Vanuatu vatus</displayName>
+				<symbol draft="contributed">VUV</symbol>
 			</currency>
 			<currency type="WST">
 				<displayName>Samoan Tala</displayName>
 				<displayName count="one">Samoan tala</displayName>
 				<displayName count="other">Samoan tala</displayName>
+				<symbol draft="contributed">WST</symbol>
 			</currency>
 			<currency type="XAF">
 				<displayName>CFA Franc BEAC</displayName>
@@ -4967,11 +5237,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dolyar ng Silangang Caribbean</displayName>
 				<displayName count="other">dolyares ng Silangang Caribbean</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XOF">
-				<displayName>CFA Franc BCEAO</displayName>
-				<displayName count="one">CFA franc BCEAO</displayName>
-				<displayName count="other">CFA francs BCEAO</displayName>
+				<displayName>CFA Franc ng Kanlurang Africa</displayName>
+				<displayName count="one">CFA franc ng Kanlurang Africa</displayName>
+				<displayName count="other">CFA francs ng Kanlurang Africa</displayName>
 				<symbol>CFA</symbol>
 			</currency>
 			<currency type="XPF">
@@ -4989,11 +5260,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Yemeni Rial</displayName>
 				<displayName count="one">Yemeni rial</displayName>
 				<displayName count="other">Yemeni rials</displayName>
+				<symbol draft="contributed">YER</symbol>
 			</currency>
 			<currency type="ZAR">
-				<displayName>South African Rand</displayName>
-				<displayName count="one">South African rand</displayName>
-				<displayName count="other">South African rand</displayName>
+				<displayName>Rand ng Timog Africa</displayName>
+				<displayName count="one">rand ng Timog Africa</displayName>
+				<displayName count="other">rand ng Timog Africa</displayName>
+				<symbol draft="contributed">ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>Zambian Kwacha (1968–2012)</displayName>
@@ -5002,6 +5276,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Zambian Kwacha</displayName>
 				<displayName count="one">Zambian kwacha</displayName>
 				<displayName count="other">Zambian kwachas</displayName>
+				<symbol draft="contributed">ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
@@ -5012,7 +5288,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 	<units>
 		<unitLength type="long">
 			<compoundUnit type="per">
-				<compoundUnitPattern>{0} bawat {1}</compoundUnitPattern>
+				<compoundUnitPattern>{0} kada {1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>g-force</displayName>
@@ -5022,454 +5298,491 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="acceleration-meter-per-second-squared">
 				<displayName>metro kada segundo kwadrado</displayName>
 				<unitPattern count="one">{0} metro kada segundo kwadrado</unitPattern>
-				<unitPattern count="other">{0} metro kada segundo kwadrado</unitPattern>
+				<unitPattern count="other">{0} na metro kada segundo kwadrado</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName>arcminutes</displayName>
-				<unitPattern count="one">{0} minute</unitPattern>
-				<unitPattern count="other">{0} minutes</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName>arcseconds</displayName>
-				<unitPattern count="one">{0} second</unitPattern>
-				<unitPattern count="other">{0} seconds</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName>degrees</displayName>
-				<unitPattern count="one">{0} degree</unitPattern>
-				<unitPattern count="other">{0} degrees</unitPattern>
+			<unit type="angle-revolution">
+				<displayName>pag-ikot</displayName>
+				<unitPattern count="one">{0} pag-ikot</unitPattern>
+				<unitPattern count="other">{0} na pag-ikot</unitPattern>
 			</unit>
 			<unit type="angle-radian">
 				<displayName>radians</displayName>
 				<unitPattern count="one">{0} radian</unitPattern>
-				<unitPattern count="other">{0} radians</unitPattern>
+				<unitPattern count="other">{0} na radian</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>degrees</displayName>
+				<unitPattern count="one">{0} degree</unitPattern>
+				<unitPattern count="other">{0} na degree</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>arcminutes</displayName>
+				<unitPattern count="one">{0} arcminute</unitPattern>
+				<unitPattern count="other">{0} na arcminute</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>arcseconds</displayName>
+				<unitPattern count="one">{0} arcsecond</unitPattern>
+				<unitPattern count="other">{0} na arcsecond</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>kilometro kwadrado</displayName>
+				<unitPattern count="one">{0} kilometro kwadrado</unitPattern>
+				<unitPattern count="other">{0} na kilometro kwadrado</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>hektarya</displayName>
+				<unitPattern count="one">{0} hektarya</unitPattern>
+				<unitPattern count="other">{0} na hektarya</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>metro kwadrado</displayName>
+				<unitPattern count="one">{0} metro kwadrado</unitPattern>
+				<unitPattern count="other">{0} na metro kwadrado</unitPattern>
+				<perUnitPattern>{0} kada metro kwadrado</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>sentimetro kwadrado</displayName>
+				<unitPattern count="one">{0} sentimetro kwadrado</unitPattern>
+				<unitPattern count="other">{0} na sentimetro kwadrado</unitPattern>
+				<perUnitPattern>{0} kada sentimetro kwadrado</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>milya kwadrado</displayName>
+				<unitPattern count="one">{0} milya kwadrado</unitPattern>
+				<unitPattern count="other">{0} na milya kwadrado</unitPattern>
 			</unit>
 			<unit type="area-acre">
 				<displayName>acres</displayName>
 				<unitPattern count="one">{0} acre</unitPattern>
 				<unitPattern count="other">{0} acres</unitPattern>
 			</unit>
-			<unit type="area-hectare">
-				<displayName>hektarya</displayName>
-				<unitPattern count="one">{0} ektarya</unitPattern>
-				<unitPattern count="other">{0} ektarya</unitPattern>
-			</unit>
-			<unit type="area-square-centimeter">
-				<displayName>sentimetro kwadrado</displayName>
-				<unitPattern count="one">{0} sentimetro kwadrado</unitPattern>
-				<unitPattern count="other">{0} sentimetro kwadrado</unitPattern>
+			<unit type="area-square-yard">
+				<displayName>yardang parisukat</displayName>
+				<unitPattern count="one">{0} yardang parisukat</unitPattern>
+				<unitPattern count="other">{0} na yardang parisukat</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>talampakan parisukat</displayName>
 				<unitPattern count="one">{0} talampakan parisukat</unitPattern>
-				<unitPattern count="other">{0} talampakan parisukat</unitPattern>
+				<unitPattern count="other">{0} na talampakan parisukat</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
 				<displayName>pulgada kwadrado</displayName>
 				<unitPattern count="one">{0} pulgada kwadrado</unitPattern>
-				<unitPattern count="other">{0} pulgada kwadrado</unitPattern>
+				<unitPattern count="other">{0} na pulgada kwadrado</unitPattern>
+				<perUnitPattern>{0} kada pulgada kwadrado</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kilometro kwadrado</displayName>
-				<unitPattern count="one">{0} kilometro kwadrado</unitPattern>
-				<unitPattern count="other">{0} square kilometer</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>metro kwadrado</displayName>
-				<unitPattern count="one">{0} metro kwadrado</unitPattern>
-				<unitPattern count="other">{0} square meter</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>milya kwadrado</displayName>
-				<unitPattern count="one">{0} milya parisukat</unitPattern>
-				<unitPattern count="other">{0} milya parisukat</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yarda parisukat</displayName>
-				<unitPattern count="one">{0} yarda parisukat</unitPattern>
-				<unitPattern count="other">{0} yarda parisukat</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="other">{0} na karat</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litro kada kilometro</displayName>
-				<unitPattern count="one">{0} litro kada kilometro</unitPattern>
+				<unitPattern count="one">{0} litro kada kilometro</unitPattern>
 				<unitPattern count="other">{0} litro kada kilometro</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>litro kada 100 kilometro</displayName>
+				<unitPattern count="one">{0} litro kada 100 kilometro</unitPattern>
+				<unitPattern count="other">{0} na litro kada 100 kilometer</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>milya kada galon</displayName>
-				<unitPattern count="one">{0} milya kada galon</unitPattern>
-				<unitPattern count="other">{0} milya kada galon</unitPattern>
-			</unit>
-			<unit type="digital-bit">
-				<displayName>bits</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bits</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bytes</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabits</displayName>
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="other">{0} gigabits</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabytes</displayName>
-				<unitPattern count="one">{0} gigabyte</unitPattern>
-				<unitPattern count="other">{0} gigabytes</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobits</displayName>
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="other">{0} kilobits</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobytes</displayName>
-				<unitPattern count="one">{0} kilobyte</unitPattern>
-				<unitPattern count="other">{0} kilobytes</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabits</displayName>
-				<unitPattern count="one">{0} megabit</unitPattern>
-				<unitPattern count="other">{0} megabits</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabytes</displayName>
-				<unitPattern count="one">{0} megabyte</unitPattern>
-				<unitPattern count="other">{0} megabytes</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabits</displayName>
-				<unitPattern count="one">{0} terabit</unitPattern>
-				<unitPattern count="other">{0} terabits</unitPattern>
+				<unitPattern count="one">{0} milya kada galon</unitPattern>
+				<unitPattern count="other">{0} na milya kada galon</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabytes</displayName>
 				<unitPattern count="one">{0} terabyte</unitPattern>
-				<unitPattern count="other">{0} terabytes</unitPattern>
+				<unitPattern count="other">{0} na terabyte</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabits</displayName>
+				<unitPattern count="one">{0} terabit</unitPattern>
+				<unitPattern count="other">{0} na terabit</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabytes</displayName>
+				<unitPattern count="one">{0} gigabyte</unitPattern>
+				<unitPattern count="other">{0} na gigabyte</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabits</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="other">{0} na gigabit</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabytes</displayName>
+				<unitPattern count="one">{0} megabyte</unitPattern>
+				<unitPattern count="other">{0} na megabyte</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabits</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="other">{0} na megabit</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobytes</displayName>
+				<unitPattern count="one">{0} kilobyte</unitPattern>
+				<unitPattern count="other">{0} na kilobyte</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobits</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="other">{0} na kilobit</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bytes</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} na byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bits</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} na bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>mga siglo</displayName>
+				<unitPattern count="one">{0} siglo</unitPattern>
+				<unitPattern count="other">{0} siglo</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>mga taon</displayName>
+				<unitPattern count="one">{0} taon</unitPattern>
+				<unitPattern count="other">{0} na taon</unitPattern>
+				<perUnitPattern>{0} kada taon</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mga buwan</displayName>
+				<unitPattern count="one">{0} buwan</unitPattern>
+				<unitPattern count="other">{0} buwan</unitPattern>
+				<perUnitPattern>{0} kada buwan</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>mga linggo</displayName>
+				<unitPattern count="one">{0} linggo</unitPattern>
+				<unitPattern count="other">{0} na linggo</unitPattern>
+				<perUnitPattern>{0} kada linggo</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>araw</displayName>
 				<unitPattern count="one">{0} araw</unitPattern>
-				<unitPattern count="other">{0} araw</unitPattern>
+				<unitPattern count="other">{0} na araw</unitPattern>
+				<perUnitPattern>{0} kada araw</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName>oras</displayName>
+				<displayName>mga oras</displayName>
 				<unitPattern count="one">{0} oras</unitPattern>
-				<unitPattern count="other">{0} oras</unitPattern>
+				<unitPattern count="other">{0} na oras</unitPattern>
 				<perUnitPattern>{0} kada oras</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikrosegundo</displayName>
-				<unitPattern count="one">{0} mikrosegundo</unitPattern>
-				<unitPattern count="other">{0} mikrosegundo</unitPattern>
+			<unit type="duration-minute">
+				<displayName>mga minuto</displayName>
+				<unitPattern count="one">{0} minuto</unitPattern>
+				<unitPattern count="other">{0} na minuto</unitPattern>
+				<perUnitPattern>{0} kada minuto</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>mga segundo</displayName>
+				<unitPattern count="one">{0} segundo</unitPattern>
+				<unitPattern count="other">{0} na segundo</unitPattern>
+				<perUnitPattern>{0} kada segundo</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>milisegundo</displayName>
 				<unitPattern count="one">{0} milisegundo</unitPattern>
 				<unitPattern count="other">{0} milisegundo</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>minuto</displayName>
-				<unitPattern count="one">{0} minuto</unitPattern>
-				<unitPattern count="other">{0} minuto</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>buwan</displayName>
-				<unitPattern count="one">{0} buwan</unitPattern>
-				<unitPattern count="other">{0} buwan</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>mikrosegundo</displayName>
+				<unitPattern count="one">{0} mikrosegundo</unitPattern>
+				<unitPattern count="other">{0} mikrosegundo</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>nanosegundo</displayName>
 				<unitPattern count="one">{0} nanosegundo</unitPattern>
 				<unitPattern count="other">{0} nanosegundo</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>segundo</displayName>
-				<unitPattern count="one">{0} segundo</unitPattern>
-				<unitPattern count="other">{0} segundo</unitPattern>
-				<perUnitPattern>{0} kada segundo</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>linggo</displayName>
-				<unitPattern count="one">{0} linggo</unitPattern>
-				<unitPattern count="other">{0} linggo</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>taon</displayName>
-				<unitPattern count="one">{0} taon</unitPattern>
-				<unitPattern count="other">{0} taon</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>amperes</displayName>
 				<unitPattern count="one">{0} ampere</unitPattern>
-				<unitPattern count="other">{0} amperes</unitPattern>
+				<unitPattern count="other">{0} na ampere</unitPattern>
 			</unit>
 			<unit type="electric-milliampere">
 				<displayName>milliamperes</displayName>
 				<unitPattern count="one">{0} milliampere</unitPattern>
-				<unitPattern count="other">{0} milliamperes</unitPattern>
+				<unitPattern count="other">{0} na milliampere</unitPattern>
 			</unit>
 			<unit type="electric-ohm">
 				<displayName>ohms</displayName>
 				<unitPattern count="one">{0} ohm</unitPattern>
-				<unitPattern count="other">{0} ohms</unitPattern>
+				<unitPattern count="other">{0} na ohm</unitPattern>
 			</unit>
 			<unit type="electric-volt">
 				<displayName>volts</displayName>
 				<unitPattern count="one">{0} volt</unitPattern>
-				<unitPattern count="other">{0} volts</unitPattern>
-			</unit>
-			<unit type="energy-calorie">
-				<displayName>calories</displayName>
-				<unitPattern count="one">{0} calorie</unitPattern>
-				<unitPattern count="other">{0} calories</unitPattern>
-			</unit>
-			<unit type="energy-foodcalorie">
-				<displayName>Calories</displayName>
-				<unitPattern count="one">{0} Calorie</unitPattern>
-				<unitPattern count="other">{0} Calories</unitPattern>
-			</unit>
-			<unit type="energy-joule">
-				<displayName>joules</displayName>
-				<unitPattern count="one">{0} joule</unitPattern>
-				<unitPattern count="other">{0} joules</unitPattern>
+				<unitPattern count="other">{0} na volt</unitPattern>
 			</unit>
 			<unit type="energy-kilocalorie">
 				<displayName>kilocalories</displayName>
 				<unitPattern count="one">{0} kilocalorie</unitPattern>
-				<unitPattern count="other">{0} kilocalories</unitPattern>
+				<unitPattern count="other">{0} na kilocalorie</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>calories</displayName>
+				<unitPattern count="one">{0} calorie</unitPattern>
+				<unitPattern count="other">{0} na calories</unitPattern>
+			</unit>
+			<unit type="energy-foodcalorie">
+				<displayName>Calories</displayName>
+				<unitPattern count="one">{0} Calorie</unitPattern>
+				<unitPattern count="other">{0} na Calories</unitPattern>
 			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojoules</displayName>
 				<unitPattern count="one">{0} kilojoule</unitPattern>
-				<unitPattern count="other">{0} kilojoules</unitPattern>
+				<unitPattern count="other">{0} na kilojoule</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>joules</displayName>
+				<unitPattern count="one">{0} joule</unitPattern>
+				<unitPattern count="other">{0} na joules</unitPattern>
 			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilowatt-hours</displayName>
 				<unitPattern count="one">{0} kilowatt hour</unitPattern>
-				<unitPattern count="other">{0} kilowatt-hours</unitPattern>
+				<unitPattern count="other">{0} na kilowatt-hour</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
 				<displayName>gigahertz</displayName>
 				<unitPattern count="one">{0} gigahertz</unitPattern>
-				<unitPattern count="other">{0} gigahertz</unitPattern>
+				<unitPattern count="other">{0} na gigahertz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hertz</displayName>
-				<unitPattern count="one">{0} hertz</unitPattern>
-				<unitPattern count="other">{0} hertz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megahertz</displayName>
+				<unitPattern count="one">{0} na megahertz</unitPattern>
+				<unitPattern count="other">{0} megahertz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kilohertz</displayName>
 				<unitPattern count="one">{0} kilohertz</unitPattern>
-				<unitPattern count="other">{0} kilohertz</unitPattern>
+				<unitPattern count="other">{0} na kilohertz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megahertz</displayName>
-				<unitPattern count="one">{0} megahertz</unitPattern>
-				<unitPattern count="other">{0} megahertz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hertz</displayName>
+				<unitPattern count="one">{0} hertz</unitPattern>
+				<unitPattern count="other">{0} na hertz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>astronomical units</displayName>
-				<unitPattern count="one">{0} astronomical unit</unitPattern>
-				<unitPattern count="other">{0} astronomical units</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometro</displayName>
+				<unitPattern count="one">{0} kilometro</unitPattern>
+				<unitPattern count="other">{0} na kilometro</unitPattern>
+				<perUnitPattern>{0} kada kilometro</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>metro</displayName>
+				<unitPattern count="one">{0} metro</unitPattern>
+				<unitPattern count="other">{0} na metro</unitPattern>
+				<perUnitPattern>{0} kada metro</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>decimetro</displayName>
+				<unitPattern count="one">{0} decimetro</unitPattern>
+				<unitPattern count="other">{0} na decimetro</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
 				<displayName>sentimetro</displayName>
 				<unitPattern count="one">{0} sentimetro</unitPattern>
 				<unitPattern count="other">{0} sentimetro</unitPattern>
+				<perUnitPattern>{0} kada sentimetro</perUnitPattern>
 			</unit>
-			<unit type="length-decimeter">
-				<displayName>decimetro</displayName>
-				<unitPattern count="one">{0} decimetro</unitPattern>
-				<unitPattern count="other">{0} decimetro</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>talampakan</displayName>
-				<unitPattern count="one">{0} talampakan</unitPattern>
-				<unitPattern count="other">{0} talampakan</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>pulgada</displayName>
-				<unitPattern count="one">{0} pulgada</unitPattern>
-				<unitPattern count="other">{0} pulgada</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometro</displayName>
-				<unitPattern count="one">{0} kilometro</unitPattern>
-				<unitPattern count="other">{0} kilometro</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>light year</displayName>
-				<unitPattern count="one">{0} light year</unitPattern>
-				<unitPattern count="other">{0} light year</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metro</displayName>
-				<unitPattern count="one">{0} metro</unitPattern>
-				<unitPattern count="other">{0} metro</unitPattern>
+			<unit type="length-millimeter">
+				<displayName>milimetro</displayName>
+				<unitPattern count="one">{0} milimetro</unitPattern>
+				<unitPattern count="other">{0} na milimetro</unitPattern>
 			</unit>
 			<unit type="length-micrometer">
 				<displayName>micrometro</displayName>
 				<unitPattern count="one">{0} micrometro</unitPattern>
 				<unitPattern count="other">{0} micrometro</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName>milya</displayName>
-				<unitPattern count="one">{0} milya</unitPattern>
-				<unitPattern count="other">{0} milya</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>milimetro</displayName>
-				<unitPattern count="one">{0} milimetro</unitPattern>
-				<unitPattern count="other">{0} milimetro</unitPattern>
-			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanometro</displayName>
 				<unitPattern count="one">{0} nanometro</unitPattern>
 				<unitPattern count="other">{0} nanometro</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nautical miles</displayName>
-				<unitPattern count="one">{0} nautical mile</unitPattern>
-				<unitPattern count="other">{0} nautical miles</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsecs</displayName>
-				<unitPattern count="one">{0} parsec</unitPattern>
-				<unitPattern count="other">{0} parsecs</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>picometer</displayName>
 				<unitPattern count="one">{0} picometer</unitPattern>
 				<unitPattern count="other">{0} picometer</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>milya</displayName>
+				<unitPattern count="one">{0} milya</unitPattern>
+				<unitPattern count="other">{0} na milya</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yarda</displayName>
 				<unitPattern count="one">{0} yarda</unitPattern>
-				<unitPattern count="other">{0} yarda</unitPattern>
+				<unitPattern count="other">{0} na yarda</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>talampakan</displayName>
+				<unitPattern count="one">{0} talampakan</unitPattern>
+				<unitPattern count="other">{0} na talampakan</unitPattern>
+				<perUnitPattern>{0} kada talampakan</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>pulgada</displayName>
+				<unitPattern count="one">{0} pulgada</unitPattern>
+				<unitPattern count="other">{0} na pulgada</unitPattern>
+				<perUnitPattern>{0} kada pulgada</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsecs</displayName>
+				<unitPattern count="one">{0} parsec</unitPattern>
+				<unitPattern count="other">{0} parsecs</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>light year</displayName>
+				<unitPattern count="one">{0} light year</unitPattern>
+				<unitPattern count="other">{0} na light year</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>astronomical units</displayName>
+				<unitPattern count="one">{0} astronomical unit</unitPattern>
+				<unitPattern count="other">{0} na astronomical units</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nautical miles</displayName>
+				<unitPattern count="one">{0} nautical mile</unitPattern>
+				<unitPattern count="other">{0} nautical miles</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>milya-scandinavian</displayName>
+				<unitPattern count="one">{0} milya-scandinavian</unitPattern>
+				<unitPattern count="other">{0} na milya-scandinavian</unitPattern>
 			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
-				<unitPattern count="other">{0} lux</unitPattern>
+				<unitPattern count="other">{0} na lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="other">{0} karat</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gramo</displayName>
-				<unitPattern count="one">{0} gramo</unitPattern>
-				<unitPattern count="other">{0} gramo</unitPattern>
+			<unit type="mass-metric-ton">
+				<displayName>toneladang metriko</displayName>
+				<unitPattern count="one">{0} toneladang metriko</unitPattern>
+				<unitPattern count="other">{0} na toneladang metriko</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kilo</displayName>
 				<unitPattern count="one">{0} kilo</unitPattern>
 				<unitPattern count="other">{0} kilo</unitPattern>
+				<perUnitPattern>{0} kada kilo</perUnitPattern>
 			</unit>
-			<unit type="mass-metric-ton">
-				<displayName>metrikong tonelada</displayName>
-				<unitPattern count="one">{0} metrikong tonelada</unitPattern>
-				<unitPattern count="other">{0} metrikong tonelada</unitPattern>
-			</unit>
-			<unit type="mass-microgram">
-				<displayName>micrograms</displayName>
-				<unitPattern count="one">{0} microgram</unitPattern>
-				<unitPattern count="other">{0} micrograms</unitPattern>
+			<unit type="mass-gram">
+				<displayName>gramo</displayName>
+				<unitPattern count="one">{0} gramo</unitPattern>
+				<unitPattern count="other">{0} na gramo</unitPattern>
+				<perUnitPattern>{0} kada gramo</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>milligrams</displayName>
 				<unitPattern count="one">{0} milligram</unitPattern>
 				<unitPattern count="other">{0} milligrams</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ounce</displayName>
-				<unitPattern count="one">{0} ounce</unitPattern>
-				<unitPattern count="other">{0} ounce</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>troy ounces</displayName>
-				<unitPattern count="one">{0} troy ounce</unitPattern>
-				<unitPattern count="other">{0} troy ounces</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>pound</displayName>
-				<unitPattern count="one">{0} pound</unitPattern>
-				<unitPattern count="other">{0} pound</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>micrograms</displayName>
+				<unitPattern count="one">{0} microgram</unitPattern>
+				<unitPattern count="other">{0} micrograms</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tonelada</displayName>
 				<unitPattern count="one">{0} tonelada</unitPattern>
 				<unitPattern count="other">{0} tonelada</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>libra</displayName>
+				<unitPattern count="one">{0} libra</unitPattern>
+				<unitPattern count="other">{0} na libra</unitPattern>
+				<perUnitPattern>{0} kada libra</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>onsa</displayName>
+				<unitPattern count="one">{0} onsa</unitPattern>
+				<unitPattern count="other">{0} na onsa</unitPattern>
+				<perUnitPattern>{0} kada onsa</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>troy na onsa</displayName>
+				<unitPattern count="one">{0} troy na onsa</unitPattern>
+				<unitPattern count="other">{0} na troy na onsa</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="other">{0} karat</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigawatts</displayName>
 				<unitPattern count="one">{0} gigawatt</unitPattern>
-				<unitPattern count="other">{0} gigawatts</unitPattern>
+				<unitPattern count="other">{0} na gigawatt</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>horsepower</displayName>
-				<unitPattern count="one">{0} horsepower</unitPattern>
-				<unitPattern count="other">{0} horsepower</unitPattern>
+			<unit type="power-megawatt">
+				<displayName>megawatts</displayName>
+				<unitPattern count="one">{0} megawatt</unitPattern>
+				<unitPattern count="other">{0} na megawatt</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName>kilowatts</displayName>
 				<unitPattern count="one">{0} kilowatt</unitPattern>
 				<unitPattern count="other">{0} kilowatts</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<displayName>megawatts</displayName>
-				<unitPattern count="one">{0} megawatt</unitPattern>
-				<unitPattern count="other">{0} megawatts</unitPattern>
+			<unit type="power-watt">
+				<displayName>watts</displayName>
+				<unitPattern count="one">{0} watt</unitPattern>
+				<unitPattern count="other">{0} na watt</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<displayName>milliwatts</displayName>
 				<unitPattern count="one">{0} milliwatt</unitPattern>
-				<unitPattern count="other">{0} milliwatts</unitPattern>
+				<unitPattern count="other">{0} na milliwatt</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName>watts</displayName>
-				<unitPattern count="one">{0} watt</unitPattern>
-				<unitPattern count="other">{0} watts</unitPattern>
+			<unit type="power-horsepower">
+				<displayName>horsepower</displayName>
+				<unitPattern count="one">{0} horsepower</unitPattern>
+				<unitPattern count="other">{0} horsepower</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
-				<displayName>hectopascal</displayName>
+				<displayName>hectopascals</displayName>
 				<unitPattern count="one">{0} hectopascal</unitPattern>
-				<unitPattern count="other">{0} hectopascal</unitPattern>
+				<unitPattern count="other">{0} na hectopascal</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>milimetro ng asoge</displayName>
+				<unitPattern count="one">{0} millimetro ng mercury</unitPattern>
+				<unitPattern count="other">{0} na milimetro ng asoge</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>libra kada pulgadang parisukat</displayName>
+				<unitPattern count="one">{0} libra kada pulgadang parisukat</unitPattern>
+				<unitPattern count="other">{0} na libra kada pulgadang parisukat</unitPattern>
 			</unit>
 			<unit type="pressure-inch-hg">
-				<displayName>inch of mercury</displayName>
+				<displayName>pulgada ng asoge</displayName>
 				<unitPattern count="one">{0} pulgada ng asoge</unitPattern>
-				<unitPattern count="other">{0} inch of mercury</unitPattern>
+				<unitPattern count="other">{0} na pulgada ng asoge</unitPattern>
 			</unit>
 			<unit type="pressure-millibar">
 				<displayName>millibar</displayName>
 				<unitPattern count="one">{0} millibar</unitPattern>
-				<unitPattern count="other">{0} millibar</unitPattern>
-			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<displayName>milimetro ng asoge</displayName>
-				<unitPattern count="one">{0} milimetro ng asoge</unitPattern>
-				<unitPattern count="other">{0} milimetro ng asoge</unitPattern>
-			</unit>
-			<unit type="pressure-pound-per-square-inch">
-				<displayName>libra kada isang pulgadang parisukat</displayName>
-				<unitPattern count="one">{0} libra bawa't isang pulgadang parisukat</unitPattern>
-				<unitPattern count="other">{0} libra bawa't isang pulgadang parisukat</unitPattern>
-			</unit>
-			<unit type="proportion-karat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="other">{0} karat</unitPattern>
+				<unitPattern count="other">{0} na millibar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometro kada oras</displayName>
 				<unitPattern count="one">{0} kilometro kada oras</unitPattern>
-				<unitPattern count="other">{0} kilometro kada oras</unitPattern>
+				<unitPattern count="other">{0} na kilometro kada oras</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
 				<displayName>metro kada segundo</displayName>
@@ -5481,6 +5794,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} milya kada oras</unitPattern>
 				<unitPattern count="other">{0} milya kada oras</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>knot</displayName>
+				<unitPattern count="one">{0} knot</unitPattern>
+				<unitPattern count="other">{0} na knot</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>degrees Celsius</displayName>
 				<unitPattern count="one">{0} degree Celsius</unitPattern>
@@ -5496,20 +5819,32 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} degree kelvin</unitPattern>
 				<unitPattern count="other">{0} degrees kelvin</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>acre-feet</displayName>
-				<unitPattern count="one">{0} acre-foot</unitPattern>
-				<unitPattern count="other">{0} acre-feet</unitPattern>
+			<unit type="volume-cubic-kilometer">
+				<displayName>kubiko kilometro</displayName>
+				<unitPattern count="one">{0} kubiko kilometro</unitPattern>
+				<unitPattern count="other">{0} kubiko kilometro</unitPattern>
 			</unit>
-			<unit type="volume-centiliter">
-				<displayName>sentilitro</displayName>
-				<unitPattern count="one">{0} sentilitro</unitPattern>
-				<unitPattern count="other">{0} sentilitro</unitPattern>
+			<unit type="volume-cubic-meter">
+				<displayName>kubiko metro</displayName>
+				<unitPattern count="one">{0} kubiko metro</unitPattern>
+				<unitPattern count="other">{0} na metro kubiko</unitPattern>
+				<perUnitPattern>{0} kada metro kubiko</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-centimeter">
 				<displayName>kubiko sentimetro</displayName>
 				<unitPattern count="one">{0} kubiko sentimetro</unitPattern>
-				<unitPattern count="other">{0} kubiko sentimetro</unitPattern>
+				<unitPattern count="other">{0} na sentimetro kubiko</unitPattern>
+				<perUnitPattern>{0} kada sentimetro kubiko</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>kubiko milya</displayName>
+				<unitPattern count="one">{0} kubiko milya</unitPattern>
+				<unitPattern count="other">{0} kubiko milya</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>kubiko yarda</displayName>
+				<unitPattern count="one">{0} kubiko yarda</unitPattern>
+				<unitPattern count="other">{0} kubiko yarda</unitPattern>
 			</unit>
 			<unit type="volume-cubic-foot">
 				<displayName>kubiko talampakan</displayName>
@@ -5521,45 +5856,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kubiko pulgada</unitPattern>
 				<unitPattern count="other">{0} kubiko pulgada</unitPattern>
 			</unit>
-			<unit type="volume-cubic-kilometer">
-				<displayName>kubiko kilometro</displayName>
-				<unitPattern count="one">{0} kubiko kilometro</unitPattern>
-				<unitPattern count="other">{0} kubiko kilometro</unitPattern>
-			</unit>
-			<unit type="volume-cubic-meter">
-				<displayName>kubiko metro</displayName>
-				<unitPattern count="one">{0} kubiko metro</unitPattern>
-				<unitPattern count="other">{0} kubiko metro</unitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<displayName>kubiko milya</displayName>
-				<unitPattern count="one">{0} kubiko milya</unitPattern>
-				<unitPattern count="other">{0} kubiko milya</unitPattern>
-			</unit>
-			<unit type="volume-cubic-yard">
-				<displayName>kubiko yarda</displayName>
-				<unitPattern count="one">{0} kubiko yarda</unitPattern>
-				<unitPattern count="other">{0} kubiko yarda</unitPattern>
-			</unit>
-			<unit type="volume-cup">
-				<displayName>tasa</displayName>
-				<unitPattern count="one">{0} tasa</unitPattern>
-				<unitPattern count="other">{0} tasa</unitPattern>
-			</unit>
-			<unit type="volume-deciliter">
-				<displayName>decilitro</displayName>
-				<unitPattern count="one">{0} decilitro</unitPattern>
-				<unitPattern count="other">{0} decilitro</unitPattern>
-			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fluid ounces</displayName>
-				<unitPattern count="one">{0} fluid ounce</unitPattern>
-				<unitPattern count="other">{0} fluid ounces</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>galon</displayName>
-				<unitPattern count="one">{0} galon</unitPattern>
-				<unitPattern count="other">{0} galon</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megalitro</displayName>
+				<unitPattern count="one">{0} megalitro</unitPattern>
+				<unitPattern count="other">{0} megalitro</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hektolitro</displayName>
@@ -5569,38 +5869,81 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-liter">
 				<displayName>litro</displayName>
 				<unitPattern count="one">{0} litro</unitPattern>
-				<unitPattern count="other">{0} litro</unitPattern>
+				<unitPattern count="other">{0} na litro</unitPattern>
+				<perUnitPattern>{0} kada litro</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalitro</displayName>
-				<unitPattern count="one">{0} megalitro</unitPattern>
-				<unitPattern count="other">{0} megalitro</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>decilitro</displayName>
+				<unitPattern count="one">{0} decilitro</unitPattern>
+				<unitPattern count="other">{0} na decilitro</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>sentilitro</displayName>
+				<unitPattern count="one">{0} sentilitro</unitPattern>
+				<unitPattern count="other">{0} sentilitro</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mililitro</displayName>
 				<unitPattern count="one">{0} mililitro</unitPattern>
 				<unitPattern count="other">{0} mililitro</unitPattern>
 			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>metric pints</displayName>
+				<unitPattern count="one">{0} metric pint</unitPattern>
+				<unitPattern count="other">{0} na metric pint</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>metric cups</displayName>
+				<unitPattern count="one">{0} metric cup</unitPattern>
+				<unitPattern count="other">{0} na metric cup</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acre-feet</displayName>
+				<unitPattern count="one">{0} acre-foot</unitPattern>
+				<unitPattern count="other">{0} acre-feet</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galon</displayName>
+				<unitPattern count="one">{0} galon</unitPattern>
+				<unitPattern count="other">{0} na galon</unitPattern>
+				<perUnitPattern>{0} kada galon</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>quarts</displayName>
+				<unitPattern count="one">{0} quart</unitPattern>
+				<unitPattern count="other">{0} na quarts</unitPattern>
+			</unit>
 			<unit type="volume-pint">
 				<displayName>pints</displayName>
 				<unitPattern count="one">{0} pint</unitPattern>
 				<unitPattern count="other">{0} pints</unitPattern>
 			</unit>
-			<unit type="volume-quart">
-				<displayName>quarts</displayName>
-				<unitPattern count="one">{0} quart</unitPattern>
-				<unitPattern count="other">{0} quarts</unitPattern>
+			<unit type="volume-cup">
+				<displayName>tasa</displayName>
+				<unitPattern count="one">{0} tasa</unitPattern>
+				<unitPattern count="other">{0} na tasa</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fluid ounces</displayName>
+				<unitPattern count="one">{0} fluid ounce</unitPattern>
+				<unitPattern count="other">{0} na fluid ounce</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>kutsara</displayName>
 				<unitPattern count="one">{0} kutsara</unitPattern>
-				<unitPattern count="other">{0} kutsara</unitPattern>
+				<unitPattern count="other">{0} na kutsara</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
 				<displayName>kutsarita</displayName>
 				<unitPattern count="one">{0} kutsarita</unitPattern>
-				<unitPattern count="other">{0} kutsarita</unitPattern>
+				<unitPattern count="other">{0} na kutsarita</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}H</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}T</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}K</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -5616,40 +5959,67 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName>arcmins</displayName>
-				<unitPattern count="one">{0} min</unitPattern>
-				<unitPattern count="other">{0} arcmins</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName>arcsecs</displayName>
-				<unitPattern count="one">{0} sec</unitPattern>
-				<unitPattern count="other">{0} secs</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName>degrees</displayName>
-				<unitPattern count="one">{0} deg</unitPattern>
-				<unitPattern count="other">{0} deg</unitPattern>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="one">{0} rev</unitPattern>
+				<unitPattern count="other">{0} na rev</unitPattern>
 			</unit>
 			<unit type="angle-radian">
 				<displayName>radians</displayName>
 				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
+				<unitPattern count="other">{0} na rad</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName>acres</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="angle-degree">
+				<displayName>degrees</displayName>
+				<unitPattern count="one">{0} deg</unitPattern>
+				<unitPattern count="other">{0} na deg</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>arcmins</displayName>
+				<unitPattern count="one">{0} arcmin</unitPattern>
+				<unitPattern count="other">{0} na arcmin</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>arcsecs</displayName>
+				<unitPattern count="one">{0} arcsec</unitPattern>
+				<unitPattern count="other">{0} na arcsec</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektarya</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>metro²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0} kada m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0} kada cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>sq mile</displayName>
+				<unitPattern count="one">{0} sq mi</unitPattern>
+				<unitPattern count="other">{0} sq mi</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acres</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yarda²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>sq feet</displayName>
@@ -5660,122 +6030,118 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>pulgada²</displayName>
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0} kada in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>meter²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>sq mile</displayName>
-				<unitPattern count="one">{0} sq mi</unitPattern>
-				<unitPattern count="other">{0} sq mi</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yarda²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litro/km</displayName>
 				<unitPattern count="one">{0} L/km</unitPattern>
 				<unitPattern count="other">{0} L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} na L/100km</unitPattern>
+				<unitPattern count="other">{0} na L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
-				<displayName>milya kada galon</displayName>
+				<displayName>milya/gal</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
-				<unitPattern count="other">{0} mpg</unitPattern>
-			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gbit</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GByte</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kbit</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kByte</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mbit</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MByte</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tbit</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} na mpg</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TByte</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tbit</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GByte</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gbit</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MByte</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mbit</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kByte</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kbit</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>siglo</displayName>
+				<unitPattern count="one">{0} siglo</unitPattern>
+				<unitPattern count="other">{0} siglo</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>taon</displayName>
+				<unitPattern count="one">{0} taon</unitPattern>
+				<unitPattern count="other">{0} taon</unitPattern>
+				<perUnitPattern>{0}/taon</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>buwan</displayName>
+				<unitPattern count="one">{0} buwan</unitPattern>
+				<unitPattern count="other">{0} buwan</unitPattern>
+				<perUnitPattern>{0}/buwan</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>linggo</displayName>
+				<unitPattern count="one">{0} linggo</unitPattern>
+				<unitPattern count="other">{0} na linggo</unitPattern>
+				<perUnitPattern>{0}/linggo</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>araw</displayName>
 				<unitPattern count="one">{0} araw</unitPattern>
 				<unitPattern count="other">{0} araw</unitPattern>
+				<perUnitPattern>{0}/araw</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>oras</displayName>
-				<unitPattern count="one">{0} hr</unitPattern>
-				<unitPattern count="other">{0} hrs</unitPattern>
-				<perUnitPattern>{0}/h</perUnitPattern>
-			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μseg</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>miliseg</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
+				<unitPattern count="one">{0} oras</unitPattern>
+				<unitPattern count="other">{0} na oras</unitPattern>
+				<perUnitPattern>{0} kada oras</perUnitPattern>
 			</unit>
 			<unit type="duration-minute">
 				<displayName>min.</displayName>
 				<unitPattern count="one">{0} min.</unitPattern>
 				<unitPattern count="other">{0} min.</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>buwan</displayName>
-				<unitPattern count="one">{0} mth</unitPattern>
-				<unitPattern count="other">{0} mths</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanoseg</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>seg.</displayName>
@@ -5783,15 +6149,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} seg.</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>linggo</displayName>
-				<unitPattern count="one">{0} wk</unitPattern>
-				<unitPattern count="other">{0} wks</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>miliseg</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>taon</displayName>
-				<unitPattern count="one">{0} yr</unitPattern>
-				<unitPattern count="other">{0} yrs</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μseg</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanoseg</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amp</displayName>
@@ -5813,6 +6184,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -5823,21 +6199,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Cal</unitPattern>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joules</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojoule</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joules</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kW-hour</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -5848,201 +6219,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>metro</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>talampakan</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>pulgada</displayName>
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>light yr</displayName>
-				<unitPattern count="one">{0} ly</unitPattern>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metro</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µmetro</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>milya</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="one">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µmetro</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsecs</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
-				<unitPattern count="other">{0} pm</unitPattern>
+				<unitPattern count="other">{0} na pm</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>milya</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
 			</unit>
 			<unit type="length-yard">
 				<displayName>yarda</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
-				<unitPattern count="other">{0} yd</unitPattern>
+				<unitPattern count="other">{0} na yd</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>talampakan</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>pulgada</displayName>
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsecs</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} na pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>light yrs</displayName>
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="other">{0} na ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} na nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
 			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">{0} KD</unitPattern>
-				<unitPattern count="other">{0} KD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gramo</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gramo</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz troy</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>pound</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tonelada</displayName>
 				<unitPattern count="one">{0} tn</unitPattern>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>libra</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lbs</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz troy</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} KD</unitPattern>
+				<unitPattern count="other">{0} KD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hp</displayName>
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watts</displayName>
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>in Hg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mb</unitPattern>
-				<unitPattern count="other">{0} mb</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>milimetro ng asoge</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -6053,10 +6428,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>in Hg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mb</unitPattern>
+				<unitPattern count="other">{0} mb</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/hr</displayName>
@@ -6064,7 +6444,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} kph</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
-				<displayName>meter/sec</displayName>
+				<displayName>metro/seg</displayName>
 				<unitPattern count="one">{0} m/s</unitPattern>
 				<unitPattern count="other">{0} m/s</unitPattern>
 			</unit>
@@ -6073,6 +6453,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mph</unitPattern>
 				<unitPattern count="other">{0} mph</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>deg. C</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -6088,31 +6478,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}°K</unitPattern>
 				<unitPattern count="other">{0}°K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>acre ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cL</displayName>
-				<unitPattern count="one">{0} cL</unitPattern>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>talampakan³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>pulgada³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -6122,6 +6487,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -6133,25 +6505,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>tasa</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>talampakan³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="one">{0} dL</unitPattern>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>pulgada³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -6160,29 +6527,66 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="volume-liter">
 				<displayName>litro</displayName>
-				<unitPattern count="one">{0} l</unitPattern>
-				<unitPattern count="other">{0} l</unitPattern>
+				<unitPattern count="one">{0} L</unitPattern>
+				<unitPattern count="other">{0} L</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="one">{0} ML</unitPattern>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0} dL</unitPattern>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="one">{0} cL</unitPattern>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
 				<unitPattern count="one">{0} mL</unitPattern>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pints</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} na mpt</unitPattern>
+				<unitPattern count="other">{0} na mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} na mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acre ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} na gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qts</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pints</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>tasa</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>tbsp</displayName>
 				<unitPattern count="one">{0} tbsp</unitPattern>
@@ -6193,6 +6597,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} tsp</unitPattern>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}H</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}T</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}K</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -6202,6 +6612,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}G</unitPattern>
 				<unitPattern count="other">{0}G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -6210,26 +6624,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0}ac</unitPattern>
-				<unitPattern count="other">{0}ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0}km²</unitPattern>
+				<unitPattern count="other">{0}km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0}ha</unitPattern>
 				<unitPattern count="other">{0}ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0}ft²</unitPattern>
-				<unitPattern count="other">{0}ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0}km²</unitPattern>
-				<unitPattern count="other">{0}km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} m²</unitPattern>
 				<unitPattern count="other">{0} m²</unitPattern>
@@ -6238,28 +6640,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}mi²</unitPattern>
 				<unitPattern count="other">{0}mi²</unitPattern>
 			</unit>
-			<unit type="duration-day">
-				<displayName>araw</displayName>
-				<unitPattern count="one">{0} araw</unitPattern>
-				<unitPattern count="other">{0}d</unitPattern>
+			<unit type="area-acre">
+				<unitPattern count="one">{0}ac</unitPattern>
+				<unitPattern count="other">{0}ac</unitPattern>
 			</unit>
-			<unit type="duration-hour">
-				<displayName>oras</displayName>
-				<unitPattern count="one">{0}h</unitPattern>
-				<unitPattern count="other">{0}h</unitPattern>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0}ft²</unitPattern>
+				<unitPattern count="other">{0}ft²</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>mseg</displayName>
-				<unitPattern count="one">{0}ms</unitPattern>
-				<unitPattern count="other">{0}ms</unitPattern>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0}L/100km</unitPattern>
+				<unitPattern count="other">{0}L/100km</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>min.</displayName>
-				<unitPattern count="one">{0}m</unitPattern>
-				<unitPattern count="other">{0}m</unitPattern>
+			<unit type="duration-year">
+				<displayName>taon</displayName>
+				<unitPattern count="one">{0}taon</unitPattern>
+				<unitPattern count="other">{0}taon</unitPattern>
 			</unit>
 			<unit type="duration-month">
 				<displayName>buwan</displayName>
+				<unitPattern count="one">{0}buwan</unitPattern>
+				<unitPattern count="other">{0} buwan</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>linggo</displayName>
+				<unitPattern count="one">{0}linggo</unitPattern>
+				<unitPattern count="other">{0}linggo</unitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>araw</displayName>
+				<unitPattern count="one">{0} araw</unitPattern>
+				<unitPattern count="other">{0} na araw</unitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>oras</displayName>
+				<unitPattern count="one">{0} oras</unitPattern>
+				<unitPattern count="other">{0} oras</unitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>min.</displayName>
 				<unitPattern count="one">{0}m</unitPattern>
 				<unitPattern count="other">{0}m</unitPattern>
 			</unit>
@@ -6268,46 +6688,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}s</unitPattern>
 				<unitPattern count="other">{0}s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>wk</displayName>
-				<unitPattern count="one">{0}w</unitPattern>
-				<unitPattern count="other">{0}w</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>yr</displayName>
-				<unitPattern count="one">{0}y</unitPattern>
-				<unitPattern count="other">{0}y</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0}cm</unitPattern>
-				<unitPattern count="other">{0}cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0}′</unitPattern>
-				<unitPattern count="other">{0}′</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0}″</unitPattern>
-				<unitPattern count="other">{0}″</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>mseg</displayName>
+				<unitPattern count="one">{0}ms</unitPattern>
+				<unitPattern count="other">{0}ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
 				<unitPattern count="one">{0}km</unitPattern>
 				<unitPattern count="other">{0}km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0}ly</unitPattern>
-				<unitPattern count="other">{0}ly</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>metro</displayName>
 				<unitPattern count="one">{0}m</unitPattern>
 				<unitPattern count="other">{0}m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0}mi</unitPattern>
-				<unitPattern count="other">{0}mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0}cm</unitPattern>
+				<unitPattern count="other">{0}cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -6318,31 +6717,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}pm</unitPattern>
 				<unitPattern count="other">{0}pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0}mi</unitPattern>
+				<unitPattern count="other">{0}mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0}yd</unitPattern>
 				<unitPattern count="other">{0}yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>gramo</displayName>
-				<unitPattern count="one">{0}g</unitPattern>
-				<unitPattern count="other">{0}g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="other">{0}′</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0}ly</unitPattern>
+				<unitPattern count="other">{0}ly</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="one">{0}kg</unitPattern>
 				<unitPattern count="other">{0}kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0}oz</unitPattern>
-				<unitPattern count="other">{0}oz</unitPattern>
+			<unit type="mass-gram">
+				<displayName>gramo</displayName>
+				<unitPattern count="one">{0}g</unitPattern>
+				<unitPattern count="other">{0}g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0}#</unitPattern>
 				<unitPattern count="other">{0}#</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0}hp</unitPattern>
-				<unitPattern count="other">{0}hp</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0}oz</unitPattern>
+				<unitPattern count="other">{0}oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0}kW</unitPattern>
@@ -6352,6 +6763,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}W</unitPattern>
 				<unitPattern count="other">{0}W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0}hp</unitPattern>
+				<unitPattern count="other">{0}hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0}hPa</unitPattern>
 				<unitPattern count="other">{0}hPa</unitPattern>
@@ -6379,8 +6794,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="temperature-celsius">
 				<displayName>⁰C</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
+				<unitPattern count="one">{0}°C</unitPattern>
+				<unitPattern count="other">{0}°C</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
 				<unitPattern count="one">{0}°F</unitPattern>
@@ -6396,9 +6811,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="volume-liter">
 				<displayName>litro</displayName>
-				<unitPattern count="one">{0}l</unitPattern>
-				<unitPattern count="other">{0}l</unitPattern>
+				<unitPattern count="one">{0}L</unitPattern>
+				<unitPattern count="other">{0}L</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}H</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}T</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}K</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
@@ -6424,10 +6845,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<listPatternPart type="2">{0}, {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-narrow">
-			<listPatternPart type="start">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle">{0}, {1}</listPatternPart>
-			<listPatternPart type="end">{0}, {1}</listPatternPart>
-			<listPatternPart type="2">{0}, {1}</listPatternPart>
+			<listPatternPart type="start">{0} {1}</listPatternPart>
+			<listPatternPart type="middle">{0} {1}</listPatternPart>
+			<listPatternPart type="end">{0} {1}</listPatternPart>
+			<listPatternPart type="2">{0} {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-short">
 			<listPatternPart type="start">{0}, {1}</listPatternPart>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fil_PH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fil_PH.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fil_PH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fil_PH.xml
index 524d3180770..58f59626fea 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fil_PH.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fil_PH.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fil"/>
 		<territory type="PH"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fo.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fo.xml
new file mode 100644
index 00000000000..3b9dc755d0a
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fo.xml
@@ -0,0 +1,6625 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12293 $"/>
+		<language type="fo"/>
+	</identity>
+	<localeDisplayNames>
+		<localeDisplayPattern>
+			<localePattern>{0} ({1})</localePattern>
+			<localeSeparator>{0}, {1}</localeSeparator>
+			<localeKeyTypePattern>{0}: {1}</localeKeyTypePattern>
+		</localeDisplayPattern>
+		<languages>
+			<language type="ab">abkhasiskt</language>
+			<language type="af">afrikaans</language>
+			<language type="agq">aghem</language>
+			<language type="ak">akan</language>
+			<language type="am">amhariskt</language>
+			<language type="ar">arabiskt</language>
+			<language type="arn">mapuche</language>
+			<language type="as">assamesiskt</language>
+			<language type="asa">asu</language>
+			<language type="ay" draft="contributed">aymara</language>
+			<language type="az">aserbajdsjanskt</language>
+			<language type="az" alt="short">azeri</language>
+			<language type="ba">bashkir</language>
+			<language type="be">hvitarussiskt</language>
+			<language type="bem">bemba</language>
+			<language type="bez">bena</language>
+			<language type="bg">bulgarskt</language>
+			<language type="bgn">vestur balochi</language>
+			<language type="bm">bambara</language>
+			<language type="bn">bengalskt</language>
+			<language type="bo">tibetskt</language>
+			<language type="br">bretonskt</language>
+			<language type="brx">bodo</language>
+			<language type="bs">bosniskt</language>
+			<language type="bss" draft="contributed">bakossi</language>
+			<language type="ca">katalani</language>
+			<language type="ce">tjetjenskt</language>
+			<language type="cgg">chiga</language>
+			<language type="chr">cherokee</language>
+			<language type="ckb">miðkurdiskt</language>
+			<language type="co">korsikanskt</language>
+			<language type="cs">kekkiskt</language>
+			<language type="cv">chuvash</language>
+			<language type="cy">walisiskt</language>
+			<language type="da">danskt</language>
+			<language type="dav">taita</language>
+			<language type="de">týskt</language>
+			<language type="de_CH">høgt týskt (Sveis)</language>
+			<language type="dje">sarma</language>
+			<language type="dsb">lágt sorbian</language>
+			<language type="dua">duala</language>
+			<language type="dv" draft="contributed">divehi</language>
+			<language type="dyo">jola-fonyi</language>
+			<language type="dz">dzongkha</language>
+			<language type="ebu">embu</language>
+			<language type="ee">ewe</language>
+			<language type="efi" draft="contributed">efik</language>
+			<language type="el">grikskt</language>
+			<language type="en">enskt</language>
+			<language type="en_GB" alt="short">enskt (UK)</language>
+			<language type="en_US" alt="short">enskt (USA)</language>
+			<language type="eo">esperanto</language>
+			<language type="es">spanskt</language>
+			<language type="et">estiskt</language>
+			<language type="eu">baskiskt</language>
+			<language type="fa">persiskt</language>
+			<language type="fi">finskt</language>
+			<language type="fil">filipiniskt</language>
+			<language type="fj">fijimál</language>
+			<language type="fo">føroyskt</language>
+			<language type="fr">franskt</language>
+			<language type="fy">vestur frísiskt</language>
+			<language type="ga">írskt</language>
+			<language type="gag">gagauz</language>
+			<language type="gd" draft="contributed">skotskt gæliskt</language>
+			<language type="gl">galisiskt</language>
+			<language type="gn">guarani</language>
+			<language type="gsw">týskt (Sveis)</language>
+			<language type="gu">gujarati</language>
+			<language type="guz">gusii</language>
+			<language type="gv">manx</language>
+			<language type="ha">hausa</language>
+			<language type="haw">hawaiianskt</language>
+			<language type="he">hebraiskt</language>
+			<language type="hi">hindi</language>
+			<language type="hr">kroatiskt</language>
+			<language type="hsb">ovara sorbian</language>
+			<language type="ht">haitiskt</language>
+			<language type="hu">ungarskt</language>
+			<language type="hy">armenskt</language>
+			<language type="ia" draft="contributed">interlingua</language>
+			<language type="id">indonesiskt</language>
+			<language type="ie" draft="contributed">interlingue</language>
+			<language type="ig">igbo</language>
+			<language type="ii">sichuan yi</language>
+			<language type="is">íslendskt</language>
+			<language type="it">italskt</language>
+			<language type="iu">inuktitut</language>
+			<language type="ja">japanskt</language>
+			<language type="jgo">ngomba</language>
+			<language type="jmc">machame</language>
+			<language type="jv">javanskt</language>
+			<language type="ka">georgiskt</language>
+			<language type="kab">kabyle</language>
+			<language type="kam">kamba</language>
+			<language type="kde">makonde</language>
+			<language type="kea">grønhøvdaoyggjarskt</language>
+			<language type="khq">koyra chiini</language>
+			<language type="ki">kikuyu</language>
+			<language type="kk">kazakh</language>
+			<language type="kl">kalaallisut</language>
+			<language type="kln">kalenjin</language>
+			<language type="km">khmer</language>
+			<language type="kn">kannada</language>
+			<language type="ko">koreanskt</language>
+			<language type="koi">komi-permyak</language>
+			<language type="kok">konkani</language>
+			<language type="ks">kashmiri</language>
+			<language type="ksb">shambala</language>
+			<language type="ksf">bafia</language>
+			<language type="ku">kurdiskt</language>
+			<language type="kw">corniskt</language>
+			<language type="ky">kyrgyz</language>
+			<language type="la">latín</language>
+			<language type="lag">langi</language>
+			<language type="lah" draft="contributed">lahnda</language>
+			<language type="lb">luksemborgskt</language>
+			<language type="lg">ganda</language>
+			<language type="lkt">lakota</language>
+			<language type="ln">lingala</language>
+			<language type="lo">laoskt</language>
+			<language type="lrc">norður luri</language>
+			<language type="lt">litaviskt</language>
+			<language type="lu">luba-katanga</language>
+			<language type="luo">luo</language>
+			<language type="luy">luyia</language>
+			<language type="lv">lettiskt</language>
+			<language type="mas">masai</language>
+			<language type="mer">meru</language>
+			<language type="mfe">morisyen</language>
+			<language type="mg">malagassiskt</language>
+			<language type="mgh">makhuwa-meetto</language>
+			<language type="mgo">metaʼ</language>
+			<language type="mi">maori</language>
+			<language type="mk">makedónskt</language>
+			<language type="ml">malayalam</language>
+			<language type="mn">mongolskt</language>
+			<language type="moh">mohawk</language>
+			<language type="mr">marathi</language>
+			<language type="ms">malaiiskt</language>
+			<language type="mt">maltiskt</language>
+			<language type="mua">mundang</language>
+			<language type="my">burmesiskt</language>
+			<language type="mzn">mazanderani</language>
+			<language type="naq">nama</language>
+			<language type="nb">norskt bókmál</language>
+			<language type="nd">norður ndebele</language>
+			<language type="nds">lágt týskt</language>
+			<language type="nds_NL">lágt saksiskt</language>
+			<language type="ne">nepalskt</language>
+			<language type="nl">hálendskt</language>
+			<language type="nl_BE">flamskt</language>
+			<language type="nmg">kwasio</language>
+			<language type="nn">nýnorskt</language>
+			<language type="no" draft="contributed">norskt</language>
+			<language type="nqo">nʼko</language>
+			<language type="nus">nuer</language>
+			<language type="ny" draft="contributed">nyanja</language>
+			<language type="nyn">nyankole</language>
+			<language type="oc" draft="contributed">occitan</language>
+			<language type="om">oromo</language>
+			<language type="or">oriya</language>
+			<language type="os" draft="contributed">ossetiskt</language>
+			<language type="pa">punjabi</language>
+			<language type="pl">pólskt</language>
+			<language type="ps">pashto</language>
+			<language type="pt">portugiskiskt</language>
+			<language type="pt_BR">portugiskiskt (Brasilia)</language>
+			<language type="pt_PT">portugiskiskt (Evropa)</language>
+			<language type="qu">quechua</language>
+			<language type="quc">kʼicheʼ</language>
+			<language type="rm">retoromanskt</language>
+			<language type="rn">rundi</language>
+			<language type="ro">rumenskt</language>
+			<language type="ro_MD">moldaviskt</language>
+			<language type="rof">rombo</language>
+			<language type="ru">russiskt</language>
+			<language type="rw">kinyarwanda</language>
+			<language type="rwk">rwa</language>
+			<language type="sa">sanskrit</language>
+			<language type="saq">samburu</language>
+			<language type="sbp">sangu</language>
+			<language type="sd">sindhi</language>
+			<language type="sdh">suður kurdiskt</language>
+			<language type="se">norður sámiskt</language>
+			<language type="seh">sena</language>
+			<language type="ses">koyraboro senni</language>
+			<language type="sg">sango</language>
+			<language type="sh" draft="contributed">serbokroatiskt</language>
+			<language type="shi">tachelhit</language>
+			<language type="si">singalesiskt</language>
+			<language type="sk">slovakiskt</language>
+			<language type="sl">slovenskt</language>
+			<language type="sm" draft="contributed">samoiskt</language>
+			<language type="sma">suður sámiskt</language>
+			<language type="smj">lule sámiskt</language>
+			<language type="smn">inari sami</language>
+			<language type="sms">skolt sámiskt</language>
+			<language type="sn">shona</language>
+			<language type="so">somaliskt</language>
+			<language type="sq">albanskt</language>
+			<language type="sr">serbiskt</language>
+			<language type="ss" draft="contributed">swatiskt</language>
+			<language type="st" draft="contributed">sesotho</language>
+			<language type="su">sundanesiskt</language>
+			<language type="sv">svenskt</language>
+			<language type="sw">swahili</language>
+			<language type="sw_CD">kongo svahili</language>
+			<language type="swb" draft="contributed">shimaoré</language>
+			<language type="ta">tamilskt</language>
+			<language type="te">telugu</language>
+			<language type="teo">teso</language>
+			<language type="tet" draft="contributed">tetum</language>
+			<language type="tg">tajik</language>
+			<language type="th">tailendskt</language>
+			<language type="ti">tigrinya</language>
+			<language type="tk">turkmenskt</language>
+			<language type="tl" draft="contributed">tagalog</language>
+			<language type="tlh" draft="contributed">klingonskt</language>
+			<language type="tn" draft="contributed">tswana</language>
+			<language type="to">tonganskt</language>
+			<language type="tpi" draft="contributed">tok pisin</language>
+			<language type="tr">turkiskt</language>
+			<language type="ts" draft="contributed">tsonga</language>
+			<language type="tt">tatar</language>
+			<language type="tw" draft="contributed">twi</language>
+			<language type="twq">tasawaq</language>
+			<language type="ty" draft="contributed">tahitiskt</language>
+			<language type="tzm">miðatlasfjøll tamazight</language>
+			<language type="ug">uyghur</language>
+			<language type="uk">ukrainskt</language>
+			<language type="und">ókent mál</language>
+			<language type="ur">urdu</language>
+			<language type="uz">usbekiskt</language>
+			<language type="vai">vai</language>
+			<language type="ve" draft="contributed">venda</language>
+			<language type="vi">vjetnamesiskt</language>
+			<language type="vun">vunjo</language>
+			<language type="wbp">warlpiri</language>
+			<language type="wo">wolof</language>
+			<language type="xh">xhosa</language>
+			<language type="xog">soga</language>
+			<language type="yi" draft="contributed">jiddiskt</language>
+			<language type="yo">yoruba</language>
+			<language type="yue" draft="contributed">kantonesískt</language>
+			<language type="zgh">vanligt marokanskt tamazight</language>
+			<language type="zh">kinesiskt</language>
+			<language type="zh_Hans">einkult kinesiskt</language>
+			<language type="zh_Hant">vanligt kinesiskt</language>
+			<language type="zu">sulu</language>
+			<language type="zxx">einki málsligt innihald</language>
+		</languages>
+		<scripts>
+			<script type="Arab">arabisk</script>
+			<script type="Armn">armenskt</script>
+			<script type="Beng">bengali</script>
+			<script type="Bopo">bopomofo</script>
+			<script type="Brai">blindaskrift</script>
+			<script type="Cyrl">kyrilliskt</script>
+			<script type="Deva">devanagari</script>
+			<script type="Ethi">etiopiskt</script>
+			<script type="Geor">georgianskt</script>
+			<script type="Grek">grikskt</script>
+			<script type="Gujr">gujarati</script>
+			<script type="Guru">gurmukhi</script>
+			<script type="Hang">hangul</script>
+			<script type="Hani">han</script>
+			<script type="Hans">einkult</script>
+			<script type="Hans" alt="stand-alone">einkult han</script>
+			<script type="Hant">vanligt</script>
+			<script type="Hant" alt="stand-alone">vanligt han</script>
+			<script type="Hebr">hebraiskt</script>
+			<script type="Hira">hiragana</script>
+			<script type="Jpan">japanskt</script>
+			<script type="Kana">katakana</script>
+			<script type="Khmr">khmer</script>
+			<script type="Knda">kannada</script>
+			<script type="Kore">koreanskt</script>
+			<script type="Laoo">lao</script>
+			<script type="Latn">latínskt</script>
+			<script type="Mlym">malayalam</script>
+			<script type="Mong">mongolsk</script>
+			<script type="Mymr">myanmarskt</script>
+			<script type="Orya">oriya</script>
+			<script type="Sinh">sinhala</script>
+			<script type="Taml">tamilskt</script>
+			<script type="Telu">telugu</script>
+			<script type="Thaa">thaana</script>
+			<script type="Thai">tailendskt</script>
+			<script type="Tibt">tibetskt</script>
+			<script type="Zsym">tekin</script>
+			<script type="Zxxx">óskriva</script>
+			<script type="Zyyy">vanlig</script>
+			<script type="Zzzz">ókend skrift</script>
+		</scripts>
+		<territories>
+			<territory type="001">heimur</territory>
+			<territory type="002">Afrika</territory>
+			<territory type="003">Norðuramerika</territory>
+			<territory type="005">Suðuramerika</territory>
+			<territory type="009">Osiania</territory>
+			<territory type="011">Vesturafrika</territory>
+			<territory type="013">Miðamerika</territory>
+			<territory type="014">Eysturafrika</territory>
+			<territory type="015">Norðurafrika</territory>
+			<territory type="017">Miðafrika</territory>
+			<territory type="018">sunnari partur av Afrika</territory>
+			<territory type="019">Amerika</territory>
+			<territory type="021">Amerika norðanfyri Meksiko</territory>
+			<territory type="029">Karibia</territory>
+			<territory type="030">Eysturasia</territory>
+			<territory type="034">Suðurasia</territory>
+			<territory type="035">Útsynningsasia</territory>
+			<territory type="039">Suðurevropa</territory>
+			<territory type="053">Avstralasia</territory>
+			<territory type="054">Melanesia</territory>
+			<territory type="057">Mikronesi øki</territory>
+			<territory type="061">Polynesia</territory>
+			<territory type="142">Asia</territory>
+			<territory type="143">Miðasia</territory>
+			<territory type="145">Vesturasia</territory>
+			<territory type="150">Evropa</territory>
+			<territory type="151">Eysturevropa</territory>
+			<territory type="154">Norðurevropa</territory>
+			<territory type="155">Vesturevropa</territory>
+			<territory type="419">Latínamerika</territory>
+			<territory type="AC">Ascension</territory>
+			<territory type="AD">Andorra</territory>
+			<territory type="AE">Sameindu Emirríkini</territory>
+			<territory type="AF">Afganistan</territory>
+			<territory type="AG">Antigua &amp; Barbuda</territory>
+			<territory type="AI">Anguilla</territory>
+			<territory type="AL">Albania</territory>
+			<territory type="AM">Armenia</territory>
+			<territory type="AO">Angola</territory>
+			<territory type="AQ">Antarktis</territory>
+			<territory type="AR">Argentina</territory>
+			<territory type="AS">Amerikanska Samoa</territory>
+			<territory type="AT">Eysturríki</territory>
+			<territory type="AU">Avstralia</territory>
+			<territory type="AW">Aruba</territory>
+			<territory type="AX">Áland</territory>
+			<territory type="AZ">Aserbadjan</territory>
+			<territory type="BA">Bosnia-Hersegovina</territory>
+			<territory type="BB">Barbados</territory>
+			<territory type="BD">Bangladesj</territory>
+			<territory type="BE">Belgia</territory>
+			<territory type="BF">Burkina Faso</territory>
+			<territory type="BG">Bulgaria</territory>
+			<territory type="BH">Barein</territory>
+			<territory type="BI">Burundi</territory>
+			<territory type="BJ">Benin</territory>
+			<territory type="BL">St-Barthélemy</territory>
+			<territory type="BM">Bermuda</territory>
+			<territory type="BN">Brunei</territory>
+			<territory type="BO">Bolivia</territory>
+			<territory type="BQ">Niðurlonds Karibia</territory>
+			<territory type="BR">Brasil</territory>
+			<territory type="BS">Bahamaoyggjar</territory>
+			<territory type="BT">Butan</territory>
+			<territory type="BV">Bouvetoyggj</territory>
+			<territory type="BW">Botsvana</territory>
+			<territory type="BY">Hvítarussland</territory>
+			<territory type="BZ">Belis</territory>
+			<territory type="CA">Kanada</territory>
+			<territory type="CC">Kokosoyggjar</territory>
+			<territory type="CD">Kongo, Dem. Lýðveldið</territory>
+			<territory type="CF">Miðafrikalýðveldið</territory>
+			<territory type="CG">Kongo</territory>
+			<territory type="CH">Sveis</territory>
+			<territory type="CI">Fílabeinsstrondin</territory>
+			<territory type="CK">Cooksoyggjar</territory>
+			<territory type="CL">Kili</territory>
+			<territory type="CM">Kamerun</territory>
+			<territory type="CN">Kina</territory>
+			<territory type="CO">Kolombia</territory>
+			<territory type="CP">Clipperton</territory>
+			<territory type="CR">Kosta Rika</territory>
+			<territory type="CU">Kuba</territory>
+			<territory type="CV">Grønhøvdaoyggjar</territory>
+			<territory type="CW">Curaçao</territory>
+			<territory type="CX">Jólaoyggjin</territory>
+			<territory type="CY">Kýpros</territory>
+			<territory type="CZ">Kekkia</territory>
+			<territory type="DE">Týskland</territory>
+			<territory type="DG">Diego Garcia</territory>
+			<territory type="DJ">Djibuti</territory>
+			<territory type="DK">Danmark</territory>
+			<territory type="DM">Dominika</territory>
+			<territory type="DO">Dominikalýðveldið</territory>
+			<territory type="DZ">Algeria</territory>
+			<territory type="EA">Ceuta og Melilla</territory>
+			<territory type="EC">Ekvador</territory>
+			<territory type="EE">Estland</territory>
+			<territory type="EG">Egyptaland</territory>
+			<territory type="EH">Vestursahara</territory>
+			<territory type="ER">Eritrea</territory>
+			<territory type="ES">Spania</territory>
+			<territory type="ET">Etiopia</territory>
+			<territory type="EU">Evropasamveldið</territory>
+			<territory type="FI">Finnland</territory>
+			<territory type="FJ">Fiji</territory>
+			<territory type="FK">Falklandsoyggjar</territory>
+			<territory type="FM">Mikronesiasamveldið</territory>
+			<territory type="FO">Føroyar</territory>
+			<territory type="FR">Frakland</territory>
+			<territory type="GA">Gabon</territory>
+			<territory type="GB">Stórabretland</territory>
+			<territory type="GB" alt="short">UK</territory>
+			<territory type="GD">Grenada</territory>
+			<territory type="GE">Georgia</territory>
+			<territory type="GF">Franska Gujana</territory>
+			<territory type="GG">Guernsey</territory>
+			<territory type="GH">Gana</territory>
+			<territory type="GI">Gibraltar</territory>
+			<territory type="GL">Grønland</territory>
+			<territory type="GM">Gambia</territory>
+			<territory type="GN">Guinea</territory>
+			<territory type="GP">Guadeloupe</territory>
+			<territory type="GQ">Ekvatorguinea</territory>
+			<territory type="GR">Grikkaland</territory>
+			<territory type="GS">Suðurgeorgia og Suðursandwichoyggjar</territory>
+			<territory type="GT">Guatemala</territory>
+			<territory type="GU">Guam</territory>
+			<territory type="GW">Guinea-Bissau</territory>
+			<territory type="GY">Gujana</territory>
+			<territory type="HK">Hong Kong SAR Kina</territory>
+			<territory type="HK" alt="short">Hong Kong</territory>
+			<territory type="HM">Heard og McDonaldoyggjar</territory>
+			<territory type="HN">Honduras</territory>
+			<territory type="HR">Kroatia</territory>
+			<territory type="HT">Haiti</territory>
+			<territory type="HU">Ungarn</territory>
+			<territory type="IC">Kanariuoyggjar</territory>
+			<territory type="ID">Indonesia</territory>
+			<territory type="IE">Írland</territory>
+			<territory type="IL">Ísrael</territory>
+			<territory type="IM">Isle of Man</territory>
+			<territory type="IN">India</territory>
+			<territory type="IO">Stóra Bretlands Indiahavoyggjar</territory>
+			<territory type="IQ">Irak</territory>
+			<territory type="IR">Iran</territory>
+			<territory type="IS">Ísland</territory>
+			<territory type="IT">Italia</territory>
+			<territory type="JE">Jersey</territory>
+			<territory type="JM">Jamaika</territory>
+			<territory type="JO">Jordan</territory>
+			<territory type="JP">Japan</territory>
+			<territory type="KE">Kenja</territory>
+			<territory type="KG">Kirgisia</territory>
+			<territory type="KH">Kambodja</territory>
+			<territory type="KI">Kiribati</territory>
+			<territory type="KM">Komoroyggjar</territory>
+			<territory type="KN">St. Kitts &amp; Nevis</territory>
+			<territory type="KP">Norðurkorea</territory>
+			<territory type="KR">Suðurkorea</territory>
+			<territory type="KW">Kuvait</territory>
+			<territory type="KY">Caymanoyggjar</territory>
+			<territory type="KZ">Kasakstan</territory>
+			<territory type="LA">Laos</territory>
+			<territory type="LB">Libanon</territory>
+			<territory type="LC">St. Lusia</territory>
+			<territory type="LI">Liktinstein</territory>
+			<territory type="LK">Sri Lanka</territory>
+			<territory type="LR">Liberia</territory>
+			<territory type="LS">Lesoto</territory>
+			<territory type="LT">Litava</territory>
+			<territory type="LU">Luksemborg</territory>
+			<territory type="LV">Lettland</territory>
+			<territory type="LY">Libya</territory>
+			<territory type="MA">Marokko</territory>
+			<territory type="MC">Monako</territory>
+			<territory type="MD">Moldova</territory>
+			<territory type="ME">Montenegro</territory>
+			<territory type="MF">St-Martin</territory>
+			<territory type="MG">Madagaskar</territory>
+			<territory type="MH">Marshalloyggjar</territory>
+			<territory type="MK">Makedónia</territory>
+			<territory type="MK" alt="variant">Makedónia (FJM)</territory>
+			<territory type="ML">Mali</territory>
+			<territory type="MM">Myanmar (Burma)</territory>
+			<territory type="MN">Mongolia</territory>
+			<territory type="MO">Makao SAR Kina</territory>
+			<territory type="MO" alt="short">Makao</territory>
+			<territory type="MP">Norðaru Mariuoyggjar</territory>
+			<territory type="MQ">Martinique</territory>
+			<territory type="MR">Móritania</territory>
+			<territory type="MS">Montserrat</territory>
+			<territory type="MT">Malta</territory>
+			<territory type="MU">Móritius</territory>
+			<territory type="MV">Maldivoyggjar</territory>
+			<territory type="MW">Malavi</territory>
+			<territory type="MX">Meksiko</territory>
+			<territory type="MY">Malaisia</territory>
+			<territory type="MZ">Mosambik</territory>
+			<territory type="NA">Namibia</territory>
+			<territory type="NC">Nýkaledónia</territory>
+			<territory type="NE">Niger</territory>
+			<territory type="NF">Norfolksoyggj</territory>
+			<territory type="NG">Nigeria</territory>
+			<territory type="NI">Nikaragua</territory>
+			<territory type="NL">Niðurlond</territory>
+			<territory type="NO">Noreg</territory>
+			<territory type="NP">Nepal</territory>
+			<territory type="NR">Nauru</territory>
+			<territory type="NU">Niue</territory>
+			<territory type="NZ">Nýsæland</territory>
+			<territory type="OM">Oman</territory>
+			<territory type="PA">Panama</territory>
+			<territory type="PE">Peru</territory>
+			<territory type="PF">Franska Polynesia</territory>
+			<territory type="PG">Papua Nýguinea</territory>
+			<territory type="PH">Filipsoyggjar</territory>
+			<territory type="PK">Pakistan</territory>
+			<territory type="PL">Pólland</territory>
+			<territory type="PM">Saint Pierre og Miquelon</territory>
+			<territory type="PN">Pitcairnoyggjar</territory>
+			<territory type="PR">Puerto Riko</territory>
+			<territory type="PS">Palestinskt landøki</territory>
+			<territory type="PS" alt="short">Palestina</territory>
+			<territory type="PT">Portugal</territory>
+			<territory type="PW">Palau</territory>
+			<territory type="PY">Paraguai</territory>
+			<territory type="QA">Katar</territory>
+			<territory type="QO">fjarskoti Osiania</territory>
+			<territory type="RE">Réunion</territory>
+			<territory type="RO">Rumenia</territory>
+			<territory type="RS">Serbia</territory>
+			<territory type="RU">Russland</territory>
+			<territory type="RW">Ruanda</territory>
+			<territory type="SA">Saudiarabia</territory>
+			<territory type="SB">Salomonoyggjar</territory>
+			<territory type="SC">Seyskelloyggjar</territory>
+			<territory type="SD">Sudan</territory>
+			<territory type="SE">Svøríki</territory>
+			<territory type="SG">Singapor</territory>
+			<territory type="SH">St. Helena</territory>
+			<territory type="SI">Slovenia</territory>
+			<territory type="SJ">Svalbard &amp; Jan Mayen</territory>
+			<territory type="SK">Slovakia</territory>
+			<territory type="SL">Sierra Leona</territory>
+			<territory type="SM">San Marino</territory>
+			<territory type="SN">Senegal</territory>
+			<territory type="SO">Somalia</territory>
+			<territory type="SR">Surinam</territory>
+			<territory type="SS">Suðursudan</territory>
+			<territory type="ST">Sao Tome &amp; Prinsipi</territory>
+			<territory type="SV">El Salvador</territory>
+			<territory type="SX">Sint Maarten</territory>
+			<territory type="SY">Sýria</territory>
+			<territory type="SZ">Svasiland</territory>
+			<territory type="TA">Tristan da Cunha</territory>
+			<territory type="TC">Turks- og Caicosoyggjar</territory>
+			<territory type="TD">Kjad</territory>
+			<territory type="TF">Fronsku sunnaru landaøki</territory>
+			<territory type="TG">Togo</territory>
+			<territory type="TH">Tailand</territory>
+			<territory type="TJ">Tadsjikistan</territory>
+			<territory type="TK">Tokelau</territory>
+			<territory type="TL">Eysturtimor</territory>
+			<territory type="TM">Turkmenistan</territory>
+			<territory type="TN">Tunesia</territory>
+			<territory type="TO">Tonga</territory>
+			<territory type="TR">Turkaland</territory>
+			<territory type="TT">Trinidad &amp; Tobago</territory>
+			<territory type="TV">Tuvalu</territory>
+			<territory type="TW">Taivan</territory>
+			<territory type="TZ">Tansania</territory>
+			<territory type="UA">Ukraina</territory>
+			<territory type="UG">Uganda</territory>
+			<territory type="UM">Sambandsríki Amerikas fjarskotnu oyggjar</territory>
+			<territory type="US">Sambandsríki Amerika</territory>
+			<territory type="US" alt="short">USA</territory>
+			<territory type="UY">Uruguai</territory>
+			<territory type="UZ">Usbekistan</territory>
+			<territory type="VA">Vatikanbýur</territory>
+			<territory type="VC">St. Vinsent &amp; Grenadinoyggjar</territory>
+			<territory type="VE">Venesuela</territory>
+			<territory type="VG">Stóra Bretlands Jomfrúoyggjar</territory>
+			<territory type="VI">Sambandsríki Amerikas Jomfrúoyggjar</territory>
+			<territory type="VN">Vjetnam</territory>
+			<territory type="VU">Vanuatu</territory>
+			<territory type="WF">Wallis- og Futunaoyggjar</territory>
+			<territory type="WS">Samoa</territory>
+			<territory type="XK">Kosovo</territory>
+			<territory type="YE">Jemen</territory>
+			<territory type="YT">Mayotte</territory>
+			<territory type="ZA">Suðurafrika</territory>
+			<territory type="ZM">Sambia</territory>
+			<territory type="ZW">Simbabvi</territory>
+			<territory type="ZZ">ókent øki</territory>
+		</territories>
+		<variants>
+			<variant type="MONOTON" draft="contributed">monotonísk</variant>
+			<variant type="PINYIN" draft="contributed">pinyin</variant>
+			<variant type="POLYTON" draft="contributed">polytonísk</variant>
+			<variant type="WADEGILE" draft="contributed">Wade-Giles</variant>
+		</variants>
+		<keys>
+			<key type="calendar">kalendari</key>
+			<key type="collation">raðskipan</key>
+			<key type="currency">gjaldoyra</key>
+			<key type="hc">klokkuskipan (12 ímóti 24)</key>
+			<key type="lb">reglubrot stílur</key>
+			<key type="ms">mátingareind</key>
+			<key type="numbers">tøl</key>
+		</keys>
+		<types>
+			<type key="calendar" type="buddhist">buddistiskur kalendari</type>
+			<type key="calendar" type="chinese">kinesiskur kalendari</type>
+			<type key="calendar" type="dangi">dangi kalendari</type>
+			<type key="calendar" type="ethiopic">etiopiskur kalendari</type>
+			<type key="calendar" type="gregorian">Gregorianskur kalendari</type>
+			<type key="calendar" type="hebrew">hebraiskur kalendari</type>
+			<type key="calendar" type="islamic">islamiskur kalendari</type>
+			<type key="calendar" type="iso8601">ISO-8601 kalendari</type>
+			<type key="calendar" type="japanese">japanskur kalendari</type>
+			<type key="calendar" type="persian">persiskur kalendari</type>
+			<type key="calendar" type="roc">minguo kalendari</type>
+			<type key="collation" type="ducet">forsett Unicode raðskipan</type>
+			<type key="collation" type="eor" draft="contributed">röðina fyrir fjöltyngi evrópskum skjölum</type>
+			<type key="collation" type="search">vanlig leiting</type>
+			<type key="collation" type="standard">vanlig raðskipan</type>
+			<type key="hc" type="h11">12 tímar klokkuskipan (0–11)</type>
+			<type key="hc" type="h12">12 tímar klokkuskipan (1–12)</type>
+			<type key="hc" type="h23">24 tímar klokkuskipan (0–23)</type>
+			<type key="hc" type="h24">24 tímar klokkuskipan (1–24)</type>
+			<type key="lb" type="loose">leysur reglubrot stílur</type>
+			<type key="lb" type="normal">vanligur reglubrot stílur</type>
+			<type key="lb" type="strict">strangur reglubrot stílur</type>
+			<type key="ms" type="metric">metralag</type>
+			<type key="ms" type="uksystem">mátingareind (Imperial)</type>
+			<type key="ms" type="ussystem">mátingareind (USA)</type>
+			<type key="numbers" type="arab">arabisk tøl</type>
+			<type key="numbers" type="arabext">víðkað arabisk tøl</type>
+			<type key="numbers" type="armn">armensk tøl</type>
+			<type key="numbers" type="armnlow">armensk tøl (smáir bókstavir)</type>
+			<type key="numbers" type="beng">bengalisk tøl</type>
+			<type key="numbers" type="deva">devanagarik tøl</type>
+			<type key="numbers" type="ethi">etiopisk tøl</type>
+			<type key="numbers" type="fullwide">tøl í fullari longd</type>
+			<type key="numbers" type="geor">gregoriansk tøl</type>
+			<type key="numbers" type="grek">grikskt tøl</type>
+			<type key="numbers" type="greklow">grikskt tøl (smáir bókstavir)</type>
+			<type key="numbers" type="gujr">gujaratik tøl</type>
+			<type key="numbers" type="guru">gurmukhik tøl</type>
+			<type key="numbers" type="hanidec">kinesisk desimal tøl</type>
+			<type key="numbers" type="hans">einkul kinesisk tøl</type>
+			<type key="numbers" type="hansfin">einkul kinesisk fíggjarlig tøl</type>
+			<type key="numbers" type="hant">vanlig kinesisk tøl</type>
+			<type key="numbers" type="hantfin">vanlig kinesisk fíggjarlig tøl</type>
+			<type key="numbers" type="hebr">hebraisk tøl</type>
+			<type key="numbers" type="jpan">japanskt tøl</type>
+			<type key="numbers" type="jpanfin">japanskt fíggjarlig tøl</type>
+			<type key="numbers" type="khmr">khmer tøl</type>
+			<type key="numbers" type="knda">kannada tøl</type>
+			<type key="numbers" type="laoo">lao tøl</type>
+			<type key="numbers" type="latn">vesturlendsk tøl</type>
+			<type key="numbers" type="mlym">malayalam tøl</type>
+			<type key="numbers" type="mymr">myanmarsk tøl</type>
+			<type key="numbers" type="orya">oriya tøl</type>
+			<type key="numbers" type="roman">rómartøl</type>
+			<type key="numbers" type="romanlow">rómartøl (smáir bókstavir)</type>
+			<type key="numbers" type="taml">vanlig tamilsk tøl</type>
+			<type key="numbers" type="tamldec">tamilsk tøl</type>
+			<type key="numbers" type="telu">telugu tøl</type>
+			<type key="numbers" type="thai">tailendsk tøl</type>
+			<type key="numbers" type="tibt">tibetsk tøl</type>
+		</types>
+		<measurementSystemNames>
+			<measurementSystemName type="metric">metralagið</measurementSystemName>
+			<measurementSystemName type="UK">UK</measurementSystemName>
+			<measurementSystemName type="US">US</measurementSystemName>
+		</measurementSystemNames>
+		<codePatterns>
+			<codePattern type="language">Mál: {0}</codePattern>
+			<codePattern type="script">Skrift: {0}</codePattern>
+			<codePattern type="territory">Øki: {0}</codePattern>
+		</codePatterns>
+	</localeDisplayNames>
+	<characters>
+		<exemplarCharacters>[a á b d ð e f g h i í j k l m n o ó p r s t u ú v y ý æ ø]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[c q w x z]</exemplarCharacters>
+		<exemplarCharacters type="index" draft="contributed">[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 Æ Ø]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐ – , ; \: ! ? . … ' ‘ ’ &quot; “ ” ( ) \[ \] § @ * / \&amp; # † ′ ″]</exemplarCharacters>
+		<ellipsis type="final">{0}…</ellipsis>
+		<ellipsis type="initial">…{0}</ellipsis>
+		<ellipsis type="medial">{0}…{1}</ellipsis>
+		<ellipsis type="word-final">{0} …</ellipsis>
+		<ellipsis type="word-initial">… {0}</ellipsis>
+		<ellipsis type="word-medial">{0} … {1}</ellipsis>
+		<moreInformation>?</moreInformation>
+	</characters>
+	<delimiters>
+		<quotationStart>“</quotationStart>
+		<quotationEnd>”</quotationEnd>
+		<alternateQuotationStart>‘</alternateQuotationStart>
+		<alternateQuotationEnd>’</alternateQuotationEnd>
+	</delimiters>
+	<dates>
+		<calendars>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE, dd. MMMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d. MMMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>d. MMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>dd.MM.y GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} 'kl'. {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} 'kl'. {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="d">d.</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
+						<dateFormatItem id="Ed">E d.</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E d. MMM y G</dateFormatItem>
+						<dateFormatItem id="h" draft="contributed">h a</dateFormatItem>
+						<dateFormatItem id="H" draft="contributed">HH</dateFormatItem>
+						<dateFormatItem id="hm" draft="contributed">h:mm a</dateFormatItem>
+						<dateFormatItem id="Hm" draft="contributed">HH:mm</dateFormatItem>
+						<dateFormatItem id="hms" draft="contributed">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hms" draft="contributed">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="M">L</dateFormatItem>
+						<dateFormatItem id="Md">dd.MM</dateFormatItem>
+						<dateFormatItem id="MEd">E dd.MM</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E d. MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
+						<dateFormatItem id="ms" draft="contributed">mm:ss</dateFormatItem>
+						<dateFormatItem id="y">y G</dateFormatItem>
+						<dateFormatItem id="yM">MM.y</dateFormatItem>
+						<dateFormatItem id="yMd">dd.MM.y</dateFormatItem>
+						<dateFormatItem id="yMEd">E dd.MM.y</dateFormatItem>
+						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMd">d. MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMEd">E d. MMM y</dateFormatItem>
+						<dateFormatItem id="yQQQ">QQQ 'í' y</dateFormatItem>
+						<dateFormatItem id="yQQQQ">QQQQ 'í' y</dateFormatItem>
+						<dateFormatItem id="yyyy">y G</dateFormatItem>
+						<dateFormatItem id="yyyyM">MM.y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMd">dd.MM.y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E dd.MM.y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">d. MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">E d. MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">MMMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">QQQ 'í' y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">QQQQ 'í' y G</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d.–d.</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a" draft="contributed">h a – h a</greatestDifference>
+							<greatestDifference id="h" draft="contributed">h–h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H" draft="contributed">HH–HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a" draft="contributed">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h" draft="contributed">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="m" draft="contributed">h:mm–h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H" draft="contributed">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="m" draft="contributed">HH:mm–HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a" draft="contributed">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h" draft="contributed">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="m" draft="contributed">h:mm–h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H" draft="contributed">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="m" draft="contributed">HH:mm–HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a" draft="contributed">h a – h a v</greatestDifference>
+							<greatestDifference id="h" draft="contributed">h–h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H" draft="contributed">HH–HH v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">MM–MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">dd.MM–dd.MM</greatestDifference>
+							<greatestDifference id="M">dd.MM–dd.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">E dd.MM–E dd.MM</greatestDifference>
+							<greatestDifference id="M">E dd.MM–E dd.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">MMM–MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">d.–d. MMM</greatestDifference>
+							<greatestDifference id="M">d. MMM–d. MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">E d. MMM–E d. MMM</greatestDifference>
+							<greatestDifference id="M">E d. MMM–E d. MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">y–y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">MM.y–MM.y GGGGG</greatestDifference>
+							<greatestDifference id="y">MM.y–MM.y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">dd.MM.y–dd.MM.y GGGGG</greatestDifference>
+							<greatestDifference id="M">dd.MM.y–dd.MM.y GGGGG</greatestDifference>
+							<greatestDifference id="y">dd.MM.y–dd.MM.y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">E dd.MM.y–E dd.MM.y GGGGG</greatestDifference>
+							<greatestDifference id="M">E dd.MM.y–E dd.MM.y GGGGG</greatestDifference>
+							<greatestDifference id="y">E dd.MM.y–E dd.MM.y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">MMM–MMM y G</greatestDifference>
+							<greatestDifference id="y">MMM y–MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">d.–d. MMM y G</greatestDifference>
+							<greatestDifference id="M">d. MMM–d. MMM y G</greatestDifference>
+							<greatestDifference id="y">d. MMM y–d. MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">E d. MMM–E d. MMM y</greatestDifference>
+							<greatestDifference id="M">E d. MMM–E d. MMM y</greatestDifference>
+							<greatestDifference id="y">E d. MMM y–E d. MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">MMMM–MMMM y G</greatestDifference>
+							<greatestDifference id="y">MMMM y–MMMM y G</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">jan.</month>
+							<month type="2">feb.</month>
+							<month type="3">mar.</month>
+							<month type="4">apr.</month>
+							<month type="5">mai</month>
+							<month type="6">jun.</month>
+							<month type="7">jul.</month>
+							<month type="8">aug.</month>
+							<month type="9">sep.</month>
+							<month type="10">okt.</month>
+							<month type="11">nov.</month>
+							<month type="12">des.</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">J</month>
+							<month type="2">F</month>
+							<month type="3">M</month>
+							<month type="4">A</month>
+							<month type="5">M</month>
+							<month type="6">J</month>
+							<month type="7">J</month>
+							<month type="8">A</month>
+							<month type="9">S</month>
+							<month type="10">O</month>
+							<month type="11">N</month>
+							<month type="12">D</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">januar</month>
+							<month type="2">februar</month>
+							<month type="3">mars</month>
+							<month type="4">apríl</month>
+							<month type="5">mai</month>
+							<month type="6">juni</month>
+							<month type="7">juli</month>
+							<month type="8">august</month>
+							<month type="9">september</month>
+							<month type="10">oktober</month>
+							<month type="11">november</month>
+							<month type="12">desember</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">jan</month>
+							<month type="2">feb</month>
+							<month type="3">mar</month>
+							<month type="4">apr</month>
+							<month type="5">mai</month>
+							<month type="6">jun</month>
+							<month type="7">jul</month>
+							<month type="8">aug</month>
+							<month type="9">sep</month>
+							<month type="10">okt</month>
+							<month type="11">nov</month>
+							<month type="12">des</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">J</month>
+							<month type="2">F</month>
+							<month type="3">M</month>
+							<month type="4">A</month>
+							<month type="5">M</month>
+							<month type="6">J</month>
+							<month type="7">J</month>
+							<month type="8">A</month>
+							<month type="9">S</month>
+							<month type="10">O</month>
+							<month type="11">N</month>
+							<month type="12">D</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">januar</month>
+							<month type="2">februar</month>
+							<month type="3">mars</month>
+							<month type="4">apríl</month>
+							<month type="5">mai</month>
+							<month type="6">juni</month>
+							<month type="7">juli</month>
+							<month type="8">august</month>
+							<month type="9">september</month>
+							<month type="10">oktober</month>
+							<month type="11">november</month>
+							<month type="12">desember</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="abbreviated">
+							<day type="sun">sun.</day>
+							<day type="mon">mán.</day>
+							<day type="tue">týs.</day>
+							<day type="wed">mik.</day>
+							<day type="thu">hós.</day>
+							<day type="fri">frí.</day>
+							<day type="sat">ley.</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun">S</day>
+							<day type="mon">M</day>
+							<day type="tue">T</day>
+							<day type="wed">M</day>
+							<day type="thu">H</day>
+							<day type="fri">F</day>
+							<day type="sat">L</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">su.</day>
+							<day type="mon">má.</day>
+							<day type="tue">tý.</day>
+							<day type="wed">mi.</day>
+							<day type="thu">hó.</day>
+							<day type="fri">fr.</day>
+							<day type="sat">le.</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun">sunnudagur</day>
+							<day type="mon">mánadagur</day>
+							<day type="tue">týsdagur</day>
+							<day type="wed">mikudagur</day>
+							<day type="thu">hósdagur</day>
+							<day type="fri">fríggjadagur</day>
+							<day type="sat">leygardagur</day>
+						</dayWidth>
+					</dayContext>
+					<dayContext type="stand-alone">
+						<dayWidth type="abbreviated">
+							<day type="sun">sun</day>
+							<day type="mon">mán</day>
+							<day type="tue">týs</day>
+							<day type="wed">mik</day>
+							<day type="thu">hós</day>
+							<day type="fri">frí</day>
+							<day type="sat">ley</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun">S</day>
+							<day type="mon">M</day>
+							<day type="tue">T</day>
+							<day type="wed">M</day>
+							<day type="thu">H</day>
+							<day type="fri">F</day>
+							<day type="sat">L</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">su</day>
+							<day type="mon">má</day>
+							<day type="tue">tý</day>
+							<day type="wed">mi</day>
+							<day type="thu">hó</day>
+							<day type="fri">fr</day>
+							<day type="sat">le</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun">sunnudagur</day>
+							<day type="mon">mánadagur</day>
+							<day type="tue">týsdagur</day>
+							<day type="wed">mikudagur</day>
+							<day type="thu">hósdagur</day>
+							<day type="fri">fríggjadagur</day>
+							<day type="sat">leygardagur</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<quarters>
+					<quarterContext type="format">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">1. ársfj.</quarter>
+							<quarter type="2">2. ársfj.</quarter>
+							<quarter type="3">3. ársfj.</quarter>
+							<quarter type="4">4. ársfj.</quarter>
+						</quarterWidth>
+						<quarterWidth type="narrow">
+							<quarter type="1">1</quarter>
+							<quarter type="2">2</quarter>
+							<quarter type="3">3</quarter>
+							<quarter type="4">4</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1">1. ársfjórðingur</quarter>
+							<quarter type="2">2. ársfjórðingur</quarter>
+							<quarter type="3">3. ársfjórðingur</quarter>
+							<quarter type="4">4. ársfjórðingur</quarter>
+						</quarterWidth>
+					</quarterContext>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">1. ársfj.</quarter>
+							<quarter type="2">2. ársfj.</quarter>
+							<quarter type="3">3. ársfj.</quarter>
+							<quarter type="4">4. ársfj.</quarter>
+						</quarterWidth>
+						<quarterWidth type="narrow">
+							<quarter type="1">1</quarter>
+							<quarter type="2">2</quarter>
+							<quarter type="3">3</quarter>
+							<quarter type="4">4</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1">1. ársfjórðingur</quarter>
+							<quarter type="2">2. ársfjórðingur</quarter>
+							<quarter type="3">3. ársfjórðingur</quarter>
+							<quarter type="4">4. ársfjórðingur</quarter>
+						</quarterWidth>
+					</quarterContext>
+				</quarters>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<eras>
+					<eraNames>
+						<era type="0">fyri Krist</era>
+						<era type="0" alt="variant">fyri okkara tíðarrokning</era>
+						<era type="1">eftir Krist</era>
+						<era type="1" alt="variant">okkara tíðarrokning</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">f.Kr.</era>
+						<era type="0" alt="variant">f.o.tíðr.</era>
+						<era type="1">e.Kr.</era>
+						<era type="1" alt="variant">o.tíðr.</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0" draft="contributed">fKr</era>
+						<era type="0" alt="variant" draft="contributed">flt</era>
+						<era type="1" draft="contributed">eKr</era>
+						<era type="1" alt="variant" draft="contributed">lt</era>
+					</eraNarrow>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE, d. MMMM y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d. MMMM y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>dd.MM.y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>dd.MM.yy</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} 'kl'. {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} 'kl'. {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="d">d.</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
+						<dateFormatItem id="Ed">E d.</dateFormatItem>
+						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
+						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
+						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E d. MMM y G</dateFormatItem>
+						<dateFormatItem id="h">h a</dateFormatItem>
+						<dateFormatItem id="H">HH</dateFormatItem>
+						<dateFormatItem id="hm">h:mm a</dateFormatItem>
+						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
+						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
+						<dateFormatItem id="M">LL</dateFormatItem>
+						<dateFormatItem id="Md">dd.MM</dateFormatItem>
+						<dateFormatItem id="MEd">E dd.MM</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E d. MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
+						<dateFormatItem id="ms">mm:ss</dateFormatItem>
+						<dateFormatItem id="y">y</dateFormatItem>
+						<dateFormatItem id="yM">MM.y</dateFormatItem>
+						<dateFormatItem id="yMd">dd.MM.y</dateFormatItem>
+						<dateFormatItem id="yMEd">E dd.MM.y</dateFormatItem>
+						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMd">d. MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMEd">E d. MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
+						<dateFormatItem id="yQQQ">QQQ 'í' y</dateFormatItem>
+						<dateFormatItem id="yQQQQ">QQQQ 'í' y</dateFormatItem>
+					</availableFormats>
+					<appendItems>
+						<appendItem request="Timezone">{0} {1}</appendItem>
+					</appendItems>
+					<intervalFormats>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d.–d.</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">h a–h a</greatestDifference>
+							<greatestDifference id="h">h–h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">h:mm a–h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">h:mm a–h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">h a–h a v</greatestDifference>
+							<greatestDifference id="h">h–h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">MM–MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">dd.MM–dd.MM</greatestDifference>
+							<greatestDifference id="M">dd.MM–dd.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">E dd.MM–E dd.MM</greatestDifference>
+							<greatestDifference id="M">E dd.MM–E dd.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">MMM–MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">d.–d. MMM</greatestDifference>
+							<greatestDifference id="M">d. MMM–d. MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">E d. MMM–E d. MMM</greatestDifference>
+							<greatestDifference id="M">E d. MMM–E d. MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">MM.y–MM.y</greatestDifference>
+							<greatestDifference id="y">MM.y–MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">dd.MM.y–dd.MM.y</greatestDifference>
+							<greatestDifference id="M">dd.MM.y–dd.MM.y</greatestDifference>
+							<greatestDifference id="y">dd.MM.y–dd.MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">E dd.MM.y–E dd.MM.y</greatestDifference>
+							<greatestDifference id="M">E dd.MM.y–E dd.MM.y</greatestDifference>
+							<greatestDifference id="y">E dd.MM.y–E dd.MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">MMM–MMM y</greatestDifference>
+							<greatestDifference id="y">MMM y–MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">d.–d. MMM y</greatestDifference>
+							<greatestDifference id="M">dd. MMM–dd. MMM y</greatestDifference>
+							<greatestDifference id="y">dd. MMM y–dd. MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">E dd. MMM–E dd. MMM y</greatestDifference>
+							<greatestDifference id="M">E dd. MMM–E dd. MMM y</greatestDifference>
+							<greatestDifference id="y">E dd. MMM y–E dd. MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">MMMM–MMMM y</greatestDifference>
+							<greatestDifference id="y">MMMM y–MMMM y</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="era">
+				<displayName>tíðarrokning</displayName>
+			</field>
+			<field type="year">
+				<displayName>ár</displayName>
+				<relative type="-1">í fjør</relative>
+				<relative type="0">í ár</relative>
+				<relative type="1">næsta ár</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">um {0} ár</relativeTimePattern>
+					<relativeTimePattern count="other">um {0} ár</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} ár síðan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ár síðan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-short">
+				<displayName>ár</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">um {0} ár</relativeTimePattern>
+					<relativeTimePattern count="other">um {0} ár</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} ár síðan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ár síðan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-narrow">
+				<displayName>ár</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">um {0} ár</relativeTimePattern>
+					<relativeTimePattern count="other">um {0} ár</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} ár síðan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ár síðan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter">
+				<displayName>ársfjórðingur</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">um {0} ársfjórðing</relativeTimePattern>
+					<relativeTimePattern count="other">um {0} ársfjórðingar</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} ársfjórðing síðan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ársfjórðingar síðan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-short">
+				<displayName>ársfj.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">um {0} ársfj.</relativeTimePattern>
+					<relativeTimePattern count="other">um {0} ársfj.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} ársfj. síðan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ársfj. síðan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-narrow">
+				<displayName>ársfj.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">um {0} ársfj.</relativeTimePattern>
+					<relativeTimePattern count="other">um {0} ársfj.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} ársfj. síðan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ársfj. síðan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month">
+				<displayName>mánaður</displayName>
+				<relative type="-1">seinasta mánað</relative>
+				<relative type="0">henda mánaðin</relative>
+				<relative type="1">næsta mánað</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">um {0} mánað</relativeTimePattern>
+					<relativeTimePattern count="other">um {0} mánaðir</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} mánað síðan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} mánaðir síðan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-short">
+				<displayName>mnð.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">um {0} mnð.</relativeTimePattern>
+					<relativeTimePattern count="other">um {0} mnð.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} mnð. síðan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} mnð. síðan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-narrow">
+				<displayName>mnð.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">um {0} mnð.</relativeTimePattern>
+					<relativeTimePattern count="other">um {0} mnð.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} mnð. síðan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} mnð. síðan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week">
+				<displayName>vika</displayName>
+				<relative type="-1">seinastu viku</relative>
+				<relative type="0">hesu viku</relative>
+				<relative type="1">næstu viku</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">um {0} viku</relativeTimePattern>
+					<relativeTimePattern count="other">um {0} vikur</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} vika síðan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} vikur síðan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-short">
+				<displayName>vi.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">um {0} vi.</relativeTimePattern>
+					<relativeTimePattern count="other">um {0} vi.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} vi. síðan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} vi. síðan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-narrow">
+				<displayName>v.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">um {0} v.</relativeTimePattern>
+					<relativeTimePattern count="other">um {0} v.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} v. síðan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} v. síðan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day">
+				<displayName>dagur</displayName>
+				<relative type="-2">fyrradagin</relative>
+				<relative type="-1">í gjár</relative>
+				<relative type="0">í dag</relative>
+				<relative type="1">í morgin</relative>
+				<relative type="2">í ovurmorgin</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">um {0} dag</relativeTimePattern>
+					<relativeTimePattern count="other">um {0} dagar</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} dagur síðan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} dagar síðan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-short">
+				<displayName>da.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">um {0} da.</relativeTimePattern>
+					<relativeTimePattern count="other">um {0} da.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} da. síðan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} da. síðan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-narrow">
+				<displayName>d.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">um {0} d.</relativeTimePattern>
+					<relativeTimePattern count="other">um {0} d.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} d. síðan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} d. síðan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="weekday">
+				<displayName>gerandisdagur</displayName>
+			</field>
+			<field type="sun">
+				<relative type="-1">seinasta sunnudag</relative>
+				<relative type="0">næsta sunnudag</relative>
+				<relative type="1">sunnudagin í næstu viku</relative>
+			</field>
+			<field type="sun-short">
+				<relative type="-1">seinasta sun.</relative>
+				<relative type="0">næsta sun.</relative>
+				<relative type="1">sun. í næstu viku</relative>
+			</field>
+			<field type="sun-narrow">
+				<relative type="-1">seinasta su.</relative>
+				<relative type="0">næsta su.</relative>
+				<relative type="1">su. í næstu viku</relative>
+			</field>
+			<field type="mon">
+				<relative type="-1">seinasta mánadag</relative>
+				<relative type="0">næsta mánadag</relative>
+				<relative type="1">mánadagin í næstu viku</relative>
+			</field>
+			<field type="mon-short">
+				<relative type="-1">seinasta mán.</relative>
+				<relative type="0">næsta mán.</relative>
+				<relative type="1">mán. í næstu viku</relative>
+			</field>
+			<field type="mon-narrow">
+				<relative type="-1">seinasta má.</relative>
+				<relative type="0">næsta má.</relative>
+				<relative type="1">má. í næstu viku</relative>
+			</field>
+			<field type="tue">
+				<relative type="-1">seinasta týsdag</relative>
+				<relative type="0">næsta týsdag</relative>
+				<relative type="1">týsdagin í næstu viku</relative>
+			</field>
+			<field type="tue-short">
+				<relative type="-1">seinasta týs.</relative>
+				<relative type="0">næsta týs.</relative>
+				<relative type="1">týs. í næstu viku</relative>
+			</field>
+			<field type="tue-narrow">
+				<relative type="-1">seinasta tý.</relative>
+				<relative type="0">næsta tý.</relative>
+				<relative type="1">tý. í næstu viku</relative>
+			</field>
+			<field type="wed">
+				<relative type="-1">seinasta mikudag</relative>
+				<relative type="0">næsta mikudag</relative>
+				<relative type="1">mikudagin í næstu viku</relative>
+			</field>
+			<field type="wed-short">
+				<relative type="-1">seinasta mik.</relative>
+				<relative type="0">næsta mik.</relative>
+				<relative type="1">mik. í næstu viku</relative>
+			</field>
+			<field type="wed-narrow">
+				<relative type="-1">seinasta mi.</relative>
+				<relative type="0">næsta mi.</relative>
+				<relative type="1">mi. í næstu viku</relative>
+			</field>
+			<field type="thu">
+				<relative type="-1">seinasta hósdag</relative>
+				<relative type="0">næsta hósdag</relative>
+				<relative type="1">hósdagin í næstu viku</relative>
+			</field>
+			<field type="thu-short">
+				<relative type="-1">seinasta hós.</relative>
+				<relative type="0">næsta hós.</relative>
+				<relative type="1">hós. í næstu viku</relative>
+			</field>
+			<field type="thu-narrow">
+				<relative type="-1">seinasta hó.</relative>
+				<relative type="0">næsta hó.</relative>
+				<relative type="1">hó. í næstu viku</relative>
+			</field>
+			<field type="fri">
+				<relative type="-1">seinasta fríggjadag</relative>
+				<relative type="0">næsta fríggjadag</relative>
+				<relative type="1">fríggjadagin í næstu viku</relative>
+			</field>
+			<field type="fri-short">
+				<relative type="-1">seinasta frí.</relative>
+				<relative type="0">næsta frí.</relative>
+				<relative type="1">frí. í næstu viku</relative>
+			</field>
+			<field type="fri-narrow">
+				<relative type="-1">seinasta fr.</relative>
+				<relative type="0">næsta fr.</relative>
+				<relative type="1">fr. í næstu viku</relative>
+			</field>
+			<field type="sat">
+				<relative type="-1">seinasta leygardag</relative>
+				<relative type="0">næsta leygardag</relative>
+				<relative type="1">leygardagin í næstu viku</relative>
+			</field>
+			<field type="sat-short">
+				<relative type="-1">seinasta ley.</relative>
+				<relative type="0">næsta ley.</relative>
+				<relative type="1">ley. í næstu viku</relative>
+			</field>
+			<field type="sat-narrow">
+				<relative type="-1">seinasta le.</relative>
+				<relative type="0">næsta le.</relative>
+				<relative type="1">le. í næstu viku</relative>
+			</field>
+			<field type="dayperiod">
+				<displayName>AM/PM</displayName>
+			</field>
+			<field type="hour">
+				<displayName>tími</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">um {0} tíma</relativeTimePattern>
+					<relativeTimePattern count="other">um {0} tímar</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} tími síðan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} tímar síðan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-short">
+				<displayName>t.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">um {0} t.</relativeTimePattern>
+					<relativeTimePattern count="other">um {0} t.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} t. síðan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} t. síðan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-narrow">
+				<displayName>t.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">um {0} t.</relativeTimePattern>
+					<relativeTimePattern count="other">um {0} t.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} t. síðan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} t. síðan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute">
+				<displayName>minuttur</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">um {0} minutt</relativeTimePattern>
+					<relativeTimePattern count="other">um {0} minuttir</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} minutt síðan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} minuttir síðan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-short">
+				<displayName>min.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">um {0} min.</relativeTimePattern>
+					<relativeTimePattern count="other">um {0} min.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} min. síðan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} min. síðan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-narrow">
+				<displayName>m.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">um {0} m.</relativeTimePattern>
+					<relativeTimePattern count="other">um {0} m.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} m. síðan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} m. síðan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second">
+				<displayName>sekund</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">um {0} sekund</relativeTimePattern>
+					<relativeTimePattern count="other">um {0} sekund</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} sekund síðan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} sekund síðan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-short">
+				<displayName>sek.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">um {0} sek.</relativeTimePattern>
+					<relativeTimePattern count="other">um {0} sek.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} sek. síðan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} sek. síðan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-narrow">
+				<displayName>s.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">um {0} s.</relativeTimePattern>
+					<relativeTimePattern count="other">um {0} s.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} s. síðan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} s. síðan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="zone">
+				<displayName>tíðarøki</displayName>
+			</field>
+		</fields>
+		<timeZoneNames>
+			<hourFormat>+HH:mm;-HH:mm</hourFormat>
+			<gmtFormat>GMT{0}</gmtFormat>
+			<gmtZeroFormat>GMT</gmtZeroFormat>
+			<regionFormat>{0} tíð</regionFormat>
+			<regionFormat type="daylight">{0} summartíð</regionFormat>
+			<regionFormat type="standard">{0} vanlig tíð</regionFormat>
+			<fallbackFormat>{1} ({0})</fallbackFormat>
+			<zone type="Etc/Unknown">
+				<exemplarCity>ókendur býur</exemplarCity>
+			</zone>
+			<zone type="Europe/Andorra">
+				<exemplarCity>Andorra</exemplarCity>
+			</zone>
+			<zone type="Asia/Dubai">
+				<exemplarCity>Dubai</exemplarCity>
+			</zone>
+			<zone type="Asia/Kabul">
+				<exemplarCity>Kabul</exemplarCity>
+			</zone>
+			<zone type="America/Antigua">
+				<exemplarCity>Antigua</exemplarCity>
+			</zone>
+			<zone type="America/Anguilla">
+				<exemplarCity>Anguilla</exemplarCity>
+			</zone>
+			<zone type="Europe/Tirane">
+				<exemplarCity>Tirane</exemplarCity>
+			</zone>
+			<zone type="Asia/Yerevan">
+				<exemplarCity>Yerevan</exemplarCity>
+			</zone>
+			<zone type="Africa/Luanda">
+				<exemplarCity>Luanda</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Rothera">
+				<exemplarCity>Rothera</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Palmer">
+				<exemplarCity>Palmer</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Troll">
+				<exemplarCity>Troll</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Syowa">
+				<exemplarCity>Syowa</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Mawson">
+				<exemplarCity>Mawson</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Davis">
+				<exemplarCity>Davis</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Vostok">
+				<exemplarCity>Vostok</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Casey">
+				<exemplarCity>Casey</exemplarCity>
+			</zone>
+			<zone type="Antarctica/DumontDUrville">
+				<exemplarCity>Dumont d’Urville</exemplarCity>
+			</zone>
+			<zone type="Antarctica/McMurdo">
+				<exemplarCity>McMurdo</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Rio_Gallegos">
+				<exemplarCity>Rio Gallegos</exemplarCity>
+			</zone>
+			<zone type="America/Mendoza">
+				<exemplarCity>Mendoza</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/San_Juan">
+				<exemplarCity>San Juan</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Ushuaia">
+				<exemplarCity>Ushuaia</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/La_Rioja">
+				<exemplarCity>La Rioja</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/San_Luis">
+				<exemplarCity>San Luis</exemplarCity>
+			</zone>
+			<zone type="America/Catamarca">
+				<exemplarCity>Catamarca</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Salta">
+				<exemplarCity>Salta</exemplarCity>
+			</zone>
+			<zone type="America/Jujuy">
+				<exemplarCity>Jujuy</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Tucuman">
+				<exemplarCity>Tucuman</exemplarCity>
+			</zone>
+			<zone type="America/Cordoba">
+				<exemplarCity>Cordoba</exemplarCity>
+			</zone>
+			<zone type="America/Buenos_Aires">
+				<exemplarCity>Buenos Aires</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pago_Pago">
+				<exemplarCity>Pago Pago</exemplarCity>
+			</zone>
+			<zone type="Europe/Vienna">
+				<exemplarCity>Wien</exemplarCity>
+			</zone>
+			<zone type="Australia/Perth">
+				<exemplarCity>Perth</exemplarCity>
+			</zone>
+			<zone type="Australia/Eucla">
+				<exemplarCity>Eucla</exemplarCity>
+			</zone>
+			<zone type="Australia/Darwin">
+				<exemplarCity>Darwin</exemplarCity>
+			</zone>
+			<zone type="Australia/Adelaide">
+				<exemplarCity>Adelaide</exemplarCity>
+			</zone>
+			<zone type="Australia/Broken_Hill">
+				<exemplarCity>Broken Hill</exemplarCity>
+			</zone>
+			<zone type="Australia/Currie">
+				<exemplarCity>Currie</exemplarCity>
+			</zone>
+			<zone type="Australia/Melbourne">
+				<exemplarCity>Melbourne</exemplarCity>
+			</zone>
+			<zone type="Australia/Hobart">
+				<exemplarCity>Hobart</exemplarCity>
+			</zone>
+			<zone type="Australia/Lindeman">
+				<exemplarCity>Lindeman</exemplarCity>
+			</zone>
+			<zone type="Australia/Sydney">
+				<exemplarCity>Sydney</exemplarCity>
+			</zone>
+			<zone type="Australia/Brisbane">
+				<exemplarCity>Brisbane</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Macquarie">
+				<exemplarCity>Macquarie</exemplarCity>
+			</zone>
+			<zone type="Australia/Lord_Howe">
+				<exemplarCity>Lord Howe</exemplarCity>
+			</zone>
+			<zone type="America/Aruba">
+				<exemplarCity>Aruba</exemplarCity>
+			</zone>
+			<zone type="Europe/Mariehamn">
+				<exemplarCity>Mariehamn</exemplarCity>
+			</zone>
+			<zone type="Asia/Baku">
+				<exemplarCity>Baku</exemplarCity>
+			</zone>
+			<zone type="Europe/Sarajevo">
+				<exemplarCity>Sarajevo</exemplarCity>
+			</zone>
+			<zone type="America/Barbados">
+				<exemplarCity>Barbados</exemplarCity>
+			</zone>
+			<zone type="Asia/Dhaka">
+				<exemplarCity>Dhaka</exemplarCity>
+			</zone>
+			<zone type="Europe/Brussels">
+				<exemplarCity>Bruxelles</exemplarCity>
+			</zone>
+			<zone type="Africa/Ouagadougou">
+				<exemplarCity>Ouagadougou</exemplarCity>
+			</zone>
+			<zone type="Europe/Sofia">
+				<exemplarCity>Sofia</exemplarCity>
+			</zone>
+			<zone type="Asia/Bahrain">
+				<exemplarCity>Barein</exemplarCity>
+			</zone>
+			<zone type="Africa/Bujumbura">
+				<exemplarCity>Bujumbura</exemplarCity>
+			</zone>
+			<zone type="Africa/Porto-Novo">
+				<exemplarCity>Porto-Novo</exemplarCity>
+			</zone>
+			<zone type="America/St_Barthelemy">
+				<exemplarCity>St-Barthélemy</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Bermuda">
+				<exemplarCity>Bermuda</exemplarCity>
+			</zone>
+			<zone type="Asia/Brunei">
+				<exemplarCity>Brunei</exemplarCity>
+			</zone>
+			<zone type="America/La_Paz">
+				<exemplarCity>La Paz</exemplarCity>
+			</zone>
+			<zone type="America/Kralendijk">
+				<exemplarCity>Kralendijk</exemplarCity>
+			</zone>
+			<zone type="America/Eirunepe">
+				<exemplarCity>Eirunepe</exemplarCity>
+			</zone>
+			<zone type="America/Rio_Branco">
+				<exemplarCity>Rio Branco</exemplarCity>
+			</zone>
+			<zone type="America/Porto_Velho">
+				<exemplarCity>Porto Velho</exemplarCity>
+			</zone>
+			<zone type="America/Boa_Vista">
+				<exemplarCity>Boa Vista</exemplarCity>
+			</zone>
+			<zone type="America/Manaus">
+				<exemplarCity>Manaus</exemplarCity>
+			</zone>
+			<zone type="America/Cuiaba">
+				<exemplarCity>Cuiaba</exemplarCity>
+			</zone>
+			<zone type="America/Santarem">
+				<exemplarCity>Santarem</exemplarCity>
+			</zone>
+			<zone type="America/Campo_Grande">
+				<exemplarCity>Campo Grande</exemplarCity>
+			</zone>
+			<zone type="America/Belem">
+				<exemplarCity>Belem</exemplarCity>
+			</zone>
+			<zone type="America/Araguaina">
+				<exemplarCity>Araguaina</exemplarCity>
+			</zone>
+			<zone type="America/Sao_Paulo">
+				<exemplarCity>Sao Paulo</exemplarCity>
+			</zone>
+			<zone type="America/Bahia">
+				<exemplarCity>Bahia</exemplarCity>
+			</zone>
+			<zone type="America/Fortaleza">
+				<exemplarCity>Fortaleza</exemplarCity>
+			</zone>
+			<zone type="America/Maceio">
+				<exemplarCity>Maceio</exemplarCity>
+			</zone>
+			<zone type="America/Recife">
+				<exemplarCity>Recife</exemplarCity>
+			</zone>
+			<zone type="America/Noronha">
+				<exemplarCity>Noronha</exemplarCity>
+			</zone>
+			<zone type="America/Nassau">
+				<exemplarCity>Nassau</exemplarCity>
+			</zone>
+			<zone type="Asia/Thimphu">
+				<exemplarCity>Thimphu</exemplarCity>
+			</zone>
+			<zone type="Africa/Gaborone">
+				<exemplarCity>Gaborone</exemplarCity>
+			</zone>
+			<zone type="Europe/Minsk">
+				<exemplarCity>Minsk</exemplarCity>
+			</zone>
+			<zone type="America/Belize">
+				<exemplarCity>Belis</exemplarCity>
+			</zone>
+			<zone type="America/Dawson">
+				<exemplarCity>Dawson</exemplarCity>
+			</zone>
+			<zone type="America/Whitehorse">
+				<exemplarCity>Whitehorse</exemplarCity>
+			</zone>
+			<zone type="America/Inuvik">
+				<exemplarCity>Inuvik</exemplarCity>
+			</zone>
+			<zone type="America/Vancouver">
+				<exemplarCity>Vancouver</exemplarCity>
+			</zone>
+			<zone type="America/Dawson_Creek">
+				<exemplarCity>Dawson Creek</exemplarCity>
+			</zone>
+			<zone type="America/Creston">
+				<exemplarCity>Creston</exemplarCity>
+			</zone>
+			<zone type="America/Yellowknife">
+				<exemplarCity>Yellowknife</exemplarCity>
+			</zone>
+			<zone type="America/Edmonton">
+				<exemplarCity>Edmonton</exemplarCity>
+			</zone>
+			<zone type="America/Swift_Current">
+				<exemplarCity>Swift Current</exemplarCity>
+			</zone>
+			<zone type="America/Cambridge_Bay">
+				<exemplarCity>Cambridge Bay</exemplarCity>
+			</zone>
+			<zone type="America/Regina">
+				<exemplarCity>Regina</exemplarCity>
+			</zone>
+			<zone type="America/Winnipeg">
+				<exemplarCity>Winnipeg</exemplarCity>
+			</zone>
+			<zone type="America/Resolute">
+				<exemplarCity>Resolute</exemplarCity>
+			</zone>
+			<zone type="America/Rainy_River">
+				<exemplarCity>Rainy River</exemplarCity>
+			</zone>
+			<zone type="America/Rankin_Inlet">
+				<exemplarCity>Rankin Inlet</exemplarCity>
+			</zone>
+			<zone type="America/Coral_Harbour">
+				<exemplarCity>Atikokan</exemplarCity>
+			</zone>
+			<zone type="America/Thunder_Bay">
+				<exemplarCity>Thunder Bay</exemplarCity>
+			</zone>
+			<zone type="America/Nipigon">
+				<exemplarCity>Nipigon</exemplarCity>
+			</zone>
+			<zone type="America/Toronto">
+				<exemplarCity>Toronto</exemplarCity>
+			</zone>
+			<zone type="America/Iqaluit">
+				<exemplarCity>Iqaluit</exemplarCity>
+			</zone>
+			<zone type="America/Pangnirtung">
+				<exemplarCity>Pangnirtung</exemplarCity>
+			</zone>
+			<zone type="America/Moncton">
+				<exemplarCity>Moncton</exemplarCity>
+			</zone>
+			<zone type="America/Halifax">
+				<exemplarCity>Halifax</exemplarCity>
+			</zone>
+			<zone type="America/Goose_Bay">
+				<exemplarCity>Goose Bay</exemplarCity>
+			</zone>
+			<zone type="America/Glace_Bay">
+				<exemplarCity>Glace Bay</exemplarCity>
+			</zone>
+			<zone type="America/Blanc-Sablon">
+				<exemplarCity>Blanc-Sablon</exemplarCity>
+			</zone>
+			<zone type="America/St_Johns">
+				<exemplarCity>St. John’s</exemplarCity>
+			</zone>
+			<zone type="Indian/Cocos">
+				<exemplarCity>Cocos</exemplarCity>
+			</zone>
+			<zone type="Africa/Kinshasa">
+				<exemplarCity>Kinshasa</exemplarCity>
+			</zone>
+			<zone type="Africa/Lubumbashi">
+				<exemplarCity>Lubumbashi</exemplarCity>
+			</zone>
+			<zone type="Africa/Bangui">
+				<exemplarCity>Bangui</exemplarCity>
+			</zone>
+			<zone type="Africa/Brazzaville">
+				<exemplarCity>Brazzaville</exemplarCity>
+			</zone>
+			<zone type="Europe/Zurich">
+				<exemplarCity>Zürich</exemplarCity>
+			</zone>
+			<zone type="Africa/Abidjan">
+				<exemplarCity>Abidjan</exemplarCity>
+			</zone>
+			<zone type="Pacific/Rarotonga">
+				<exemplarCity>Rarotonga</exemplarCity>
+			</zone>
+			<zone type="Pacific/Easter">
+				<exemplarCity>Easter</exemplarCity>
+			</zone>
+			<zone type="America/Santiago">
+				<exemplarCity>Santiago</exemplarCity>
+			</zone>
+			<zone type="Africa/Douala">
+				<exemplarCity>Douala</exemplarCity>
+			</zone>
+			<zone type="Asia/Urumqi">
+				<exemplarCity>Urumqi</exemplarCity>
+			</zone>
+			<zone type="Asia/Shanghai">
+				<exemplarCity>Shanghai</exemplarCity>
+			</zone>
+			<zone type="America/Bogota">
+				<exemplarCity>Bogota</exemplarCity>
+			</zone>
+			<zone type="America/Costa_Rica">
+				<exemplarCity>Kosta Rika</exemplarCity>
+			</zone>
+			<zone type="America/Havana">
+				<exemplarCity>Havana</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Cape_Verde">
+				<exemplarCity>Grønhøvdaoyggjar</exemplarCity>
+			</zone>
+			<zone type="America/Curacao">
+				<exemplarCity>Curaçao</exemplarCity>
+			</zone>
+			<zone type="Indian/Christmas">
+				<exemplarCity>Christmas</exemplarCity>
+			</zone>
+			<zone type="Asia/Nicosia">
+				<exemplarCity>Nicosia</exemplarCity>
+			</zone>
+			<zone type="Europe/Prague">
+				<exemplarCity>Prag</exemplarCity>
+			</zone>
+			<zone type="Europe/Busingen">
+				<exemplarCity>Busingen</exemplarCity>
+			</zone>
+			<zone type="Europe/Berlin">
+				<exemplarCity>Berlin</exemplarCity>
+			</zone>
+			<zone type="Africa/Djibouti">
+				<exemplarCity>Djibuti</exemplarCity>
+			</zone>
+			<zone type="Europe/Copenhagen">
+				<exemplarCity>Keypmannahavn</exemplarCity>
+			</zone>
+			<zone type="America/Dominica">
+				<exemplarCity>Dominica</exemplarCity>
+			</zone>
+			<zone type="America/Santo_Domingo">
+				<exemplarCity>Santo Domingo</exemplarCity>
+			</zone>
+			<zone type="Africa/Algiers">
+				<exemplarCity>Algiers</exemplarCity>
+			</zone>
+			<zone type="Pacific/Galapagos">
+				<exemplarCity>Galapagos</exemplarCity>
+			</zone>
+			<zone type="America/Guayaquil">
+				<exemplarCity>Guayaquil</exemplarCity>
+			</zone>
+			<zone type="Europe/Tallinn">
+				<exemplarCity>Tallinn</exemplarCity>
+			</zone>
+			<zone type="Africa/Cairo">
+				<exemplarCity>Cairo</exemplarCity>
+			</zone>
+			<zone type="Africa/El_Aaiun">
+				<exemplarCity>El Aaiun</exemplarCity>
+			</zone>
+			<zone type="Africa/Asmera">
+				<exemplarCity>Asmara</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Canary">
+				<exemplarCity>Canary</exemplarCity>
+			</zone>
+			<zone type="Africa/Ceuta">
+				<exemplarCity>Ceuta</exemplarCity>
+			</zone>
+			<zone type="Europe/Madrid">
+				<exemplarCity>Madrid</exemplarCity>
+			</zone>
+			<zone type="Africa/Addis_Ababa">
+				<exemplarCity>Addis Ababa</exemplarCity>
+			</zone>
+			<zone type="Europe/Helsinki">
+				<exemplarCity>Helsinki</exemplarCity>
+			</zone>
+			<zone type="Pacific/Fiji">
+				<exemplarCity>Fiji</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Stanley">
+				<exemplarCity>Stanley</exemplarCity>
+			</zone>
+			<zone type="Pacific/Truk">
+				<exemplarCity>Chuuk</exemplarCity>
+			</zone>
+			<zone type="Pacific/Ponape">
+				<exemplarCity>Pohnpei</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kosrae">
+				<exemplarCity>Kosrae</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Faeroe">
+				<exemplarCity>Føroyar</exemplarCity>
+			</zone>
+			<zone type="Europe/Paris">
+				<exemplarCity>Paris</exemplarCity>
+			</zone>
+			<zone type="Africa/Libreville">
+				<exemplarCity>Libreville</exemplarCity>
+			</zone>
+			<zone type="Europe/London">
+				<long>
+					<daylight>Stóra Bretland summartíð</daylight>
+				</long>
+				<exemplarCity>London</exemplarCity>
+			</zone>
+			<zone type="America/Grenada">
+				<exemplarCity>Grenada</exemplarCity>
+			</zone>
+			<zone type="Asia/Tbilisi">
+				<exemplarCity>Tbilisi</exemplarCity>
+			</zone>
+			<zone type="America/Cayenne">
+				<exemplarCity>Cayenne</exemplarCity>
+			</zone>
+			<zone type="Europe/Guernsey">
+				<exemplarCity>Guernsey</exemplarCity>
+			</zone>
+			<zone type="Africa/Accra">
+				<exemplarCity>Accra</exemplarCity>
+			</zone>
+			<zone type="Europe/Gibraltar">
+				<exemplarCity>Gibraltar</exemplarCity>
+			</zone>
+			<zone type="America/Thule">
+				<exemplarCity>Thule</exemplarCity>
+			</zone>
+			<zone type="America/Godthab">
+				<exemplarCity>Nuuk</exemplarCity>
+			</zone>
+			<zone type="America/Scoresbysund">
+				<exemplarCity>Ittoqqortoormiit</exemplarCity>
+			</zone>
+			<zone type="America/Danmarkshavn">
+				<exemplarCity>Danmarkshavn</exemplarCity>
+			</zone>
+			<zone type="Africa/Banjul">
+				<exemplarCity>Banjul</exemplarCity>
+			</zone>
+			<zone type="Africa/Conakry">
+				<exemplarCity>Conakry</exemplarCity>
+			</zone>
+			<zone type="America/Guadeloupe">
+				<exemplarCity>Guadeloupe</exemplarCity>
+			</zone>
+			<zone type="Africa/Malabo">
+				<exemplarCity>Malabo</exemplarCity>
+			</zone>
+			<zone type="Europe/Athens">
+				<exemplarCity>Aten</exemplarCity>
+			</zone>
+			<zone type="Atlantic/South_Georgia">
+				<exemplarCity>Suðurgeorgiaoyggjar</exemplarCity>
+			</zone>
+			<zone type="America/Guatemala">
+				<exemplarCity>Guatemala</exemplarCity>
+			</zone>
+			<zone type="Pacific/Guam">
+				<exemplarCity>Guam</exemplarCity>
+			</zone>
+			<zone type="Africa/Bissau">
+				<exemplarCity>Bissau</exemplarCity>
+			</zone>
+			<zone type="America/Guyana">
+				<exemplarCity>Guyana</exemplarCity>
+			</zone>
+			<zone type="Asia/Hong_Kong">
+				<exemplarCity>Hong Kong</exemplarCity>
+			</zone>
+			<zone type="America/Tegucigalpa">
+				<exemplarCity>Tegucigalpa</exemplarCity>
+			</zone>
+			<zone type="Europe/Zagreb">
+				<exemplarCity>Zagreb</exemplarCity>
+			</zone>
+			<zone type="America/Port-au-Prince">
+				<exemplarCity>Port-au-Prince</exemplarCity>
+			</zone>
+			<zone type="Europe/Budapest">
+				<exemplarCity>Budapest</exemplarCity>
+			</zone>
+			<zone type="Asia/Jakarta">
+				<exemplarCity>Jakarta</exemplarCity>
+			</zone>
+			<zone type="Asia/Pontianak">
+				<exemplarCity>Pontianak</exemplarCity>
+			</zone>
+			<zone type="Asia/Makassar">
+				<exemplarCity>Makassar</exemplarCity>
+			</zone>
+			<zone type="Asia/Jayapura">
+				<exemplarCity>Jayapura</exemplarCity>
+			</zone>
+			<zone type="Europe/Dublin">
+				<long>
+					<daylight>Írsk vanlig tíð</daylight>
+				</long>
+				<exemplarCity>Dublin</exemplarCity>
+			</zone>
+			<zone type="Asia/Jerusalem">
+				<exemplarCity>Jerusalem</exemplarCity>
+			</zone>
+			<zone type="Europe/Isle_of_Man">
+				<exemplarCity>Isle of Man</exemplarCity>
+			</zone>
+			<zone type="Asia/Calcutta">
+				<exemplarCity>Kolkata</exemplarCity>
+			</zone>
+			<zone type="Indian/Chagos">
+				<exemplarCity>Chagos</exemplarCity>
+			</zone>
+			<zone type="Asia/Baghdad">
+				<exemplarCity>Baghdad</exemplarCity>
+			</zone>
+			<zone type="Asia/Tehran">
+				<exemplarCity>Teheran</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Reykjavik">
+				<exemplarCity>Reykjavík</exemplarCity>
+			</zone>
+			<zone type="Europe/Rome">
+				<exemplarCity>Rom</exemplarCity>
+			</zone>
+			<zone type="Europe/Jersey">
+				<exemplarCity>Jersey</exemplarCity>
+			</zone>
+			<zone type="America/Jamaica">
+				<exemplarCity>Jamaika</exemplarCity>
+			</zone>
+			<zone type="Asia/Amman">
+				<exemplarCity>Amman</exemplarCity>
+			</zone>
+			<zone type="Asia/Tokyo">
+				<exemplarCity>Tokyo</exemplarCity>
+			</zone>
+			<zone type="Africa/Nairobi">
+				<exemplarCity>Nairobi</exemplarCity>
+			</zone>
+			<zone type="Asia/Bishkek">
+				<exemplarCity>Bishkek</exemplarCity>
+			</zone>
+			<zone type="Asia/Phnom_Penh">
+				<exemplarCity>Phnom Penh</exemplarCity>
+			</zone>
+			<zone type="Pacific/Enderbury">
+				<exemplarCity>Enderbury</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kiritimati">
+				<exemplarCity>Kiritimati</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tarawa">
+				<exemplarCity>Tarawa</exemplarCity>
+			</zone>
+			<zone type="Indian/Comoro">
+				<exemplarCity>Comoro</exemplarCity>
+			</zone>
+			<zone type="America/St_Kitts">
+				<exemplarCity>St. Kitts</exemplarCity>
+			</zone>
+			<zone type="Asia/Pyongyang">
+				<exemplarCity>Pyongyang</exemplarCity>
+			</zone>
+			<zone type="Asia/Seoul">
+				<exemplarCity>Seoul</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuwait">
+				<exemplarCity>Kuvait</exemplarCity>
+			</zone>
+			<zone type="America/Cayman">
+				<exemplarCity>Cayman</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtau">
+				<exemplarCity>Aqtau</exemplarCity>
+			</zone>
+			<zone type="Asia/Oral">
+				<exemplarCity>Oral</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtobe">
+				<exemplarCity>Aqtobe</exemplarCity>
+			</zone>
+			<zone type="Asia/Qyzylorda">
+				<exemplarCity>Qyzylorda</exemplarCity>
+			</zone>
+			<zone type="Asia/Almaty">
+				<exemplarCity>Almaty</exemplarCity>
+			</zone>
+			<zone type="Asia/Vientiane">
+				<exemplarCity>Vientiane</exemplarCity>
+			</zone>
+			<zone type="Asia/Beirut">
+				<exemplarCity>Beirut</exemplarCity>
+			</zone>
+			<zone type="America/St_Lucia">
+				<exemplarCity>St. Lucia</exemplarCity>
+			</zone>
+			<zone type="Europe/Vaduz">
+				<exemplarCity>Vaduz</exemplarCity>
+			</zone>
+			<zone type="Asia/Colombo">
+				<exemplarCity>Colombo</exemplarCity>
+			</zone>
+			<zone type="Africa/Monrovia">
+				<exemplarCity>Monrovia</exemplarCity>
+			</zone>
+			<zone type="Africa/Maseru">
+				<exemplarCity>Maseru</exemplarCity>
+			</zone>
+			<zone type="Europe/Vilnius">
+				<exemplarCity>Vilnius</exemplarCity>
+			</zone>
+			<zone type="Europe/Luxembourg">
+				<exemplarCity>Luksemborg</exemplarCity>
+			</zone>
+			<zone type="Europe/Riga">
+				<exemplarCity>Riga</exemplarCity>
+			</zone>
+			<zone type="Africa/Tripoli">
+				<exemplarCity>Tripoli</exemplarCity>
+			</zone>
+			<zone type="Africa/Casablanca">
+				<exemplarCity>Casablanca</exemplarCity>
+			</zone>
+			<zone type="Europe/Monaco">
+				<exemplarCity>Monako</exemplarCity>
+			</zone>
+			<zone type="Europe/Chisinau">
+				<exemplarCity>Chisinau</exemplarCity>
+			</zone>
+			<zone type="Europe/Podgorica">
+				<exemplarCity>Podgorica</exemplarCity>
+			</zone>
+			<zone type="America/Marigot">
+				<exemplarCity>Marigot</exemplarCity>
+			</zone>
+			<zone type="Indian/Antananarivo">
+				<exemplarCity>Antananarivo</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kwajalein">
+				<exemplarCity>Kwajalein</exemplarCity>
+			</zone>
+			<zone type="Pacific/Majuro">
+				<exemplarCity>Majuro</exemplarCity>
+			</zone>
+			<zone type="Europe/Skopje">
+				<exemplarCity>Skopje</exemplarCity>
+			</zone>
+			<zone type="Africa/Bamako">
+				<exemplarCity>Bamako</exemplarCity>
+			</zone>
+			<zone type="Asia/Rangoon">
+				<exemplarCity>Rangoon</exemplarCity>
+			</zone>
+			<zone type="Asia/Hovd">
+				<exemplarCity>Hovd</exemplarCity>
+			</zone>
+			<zone type="Asia/Ulaanbaatar">
+				<exemplarCity>Ulaanbaatar</exemplarCity>
+			</zone>
+			<zone type="Asia/Choibalsan">
+				<exemplarCity>Choibalsan</exemplarCity>
+			</zone>
+			<zone type="Asia/Macau">
+				<exemplarCity>Makao</exemplarCity>
+			</zone>
+			<zone type="Pacific/Saipan">
+				<exemplarCity>Saipan</exemplarCity>
+			</zone>
+			<zone type="America/Martinique">
+				<exemplarCity>Martinique</exemplarCity>
+			</zone>
+			<zone type="Africa/Nouakchott">
+				<exemplarCity>Nouakchott</exemplarCity>
+			</zone>
+			<zone type="America/Montserrat">
+				<exemplarCity>Montserrat</exemplarCity>
+			</zone>
+			<zone type="Europe/Malta">
+				<exemplarCity>Malta</exemplarCity>
+			</zone>
+			<zone type="Indian/Mauritius">
+				<exemplarCity>Móritius</exemplarCity>
+			</zone>
+			<zone type="Indian/Maldives">
+				<exemplarCity>Maldivoyggjar</exemplarCity>
+			</zone>
+			<zone type="Africa/Blantyre">
+				<exemplarCity>Blantyre</exemplarCity>
+			</zone>
+			<zone type="America/Tijuana">
+				<exemplarCity>Tijuana</exemplarCity>
+			</zone>
+			<zone type="America/Santa_Isabel">
+				<exemplarCity>Santa Isabel</exemplarCity>
+			</zone>
+			<zone type="America/Hermosillo">
+				<exemplarCity>Hermosillo</exemplarCity>
+			</zone>
+			<zone type="America/Mazatlan">
+				<exemplarCity>Mazatlan</exemplarCity>
+			</zone>
+			<zone type="America/Chihuahua">
+				<exemplarCity>Chihuahua</exemplarCity>
+			</zone>
+			<zone type="America/Bahia_Banderas">
+				<exemplarCity>Bahia Banderas</exemplarCity>
+			</zone>
+			<zone type="America/Ojinaga">
+				<exemplarCity>Ojinaga</exemplarCity>
+			</zone>
+			<zone type="America/Monterrey">
+				<exemplarCity>Monterrey</exemplarCity>
+			</zone>
+			<zone type="America/Mexico_City">
+				<exemplarCity>Mexico City</exemplarCity>
+			</zone>
+			<zone type="America/Matamoros">
+				<exemplarCity>Matamoros</exemplarCity>
+			</zone>
+			<zone type="America/Merida">
+				<exemplarCity>Merida</exemplarCity>
+			</zone>
+			<zone type="America/Cancun">
+				<exemplarCity>Cancun</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuala_Lumpur">
+				<exemplarCity>Kuala Lumpur</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuching">
+				<exemplarCity>Kuching</exemplarCity>
+			</zone>
+			<zone type="Africa/Maputo">
+				<exemplarCity>Maputo</exemplarCity>
+			</zone>
+			<zone type="Africa/Windhoek">
+				<exemplarCity>Windhoek</exemplarCity>
+			</zone>
+			<zone type="Pacific/Noumea">
+				<exemplarCity>Noumea</exemplarCity>
+			</zone>
+			<zone type="Africa/Niamey">
+				<exemplarCity>Niamey</exemplarCity>
+			</zone>
+			<zone type="Pacific/Norfolk">
+				<exemplarCity>Norfolk</exemplarCity>
+			</zone>
+			<zone type="Africa/Lagos">
+				<exemplarCity>Lagos</exemplarCity>
+			</zone>
+			<zone type="America/Managua">
+				<exemplarCity>Managua</exemplarCity>
+			</zone>
+			<zone type="Europe/Amsterdam">
+				<exemplarCity>Amsterdam</exemplarCity>
+			</zone>
+			<zone type="Europe/Oslo">
+				<exemplarCity>Oslo</exemplarCity>
+			</zone>
+			<zone type="Asia/Katmandu">
+				<exemplarCity>Kathmandu</exemplarCity>
+			</zone>
+			<zone type="Pacific/Nauru">
+				<exemplarCity>Nauru</exemplarCity>
+			</zone>
+			<zone type="Pacific/Niue">
+				<exemplarCity>Niue</exemplarCity>
+			</zone>
+			<zone type="Pacific/Chatham">
+				<exemplarCity>Chatham</exemplarCity>
+			</zone>
+			<zone type="Pacific/Auckland">
+				<exemplarCity>Auckland</exemplarCity>
+			</zone>
+			<zone type="Asia/Muscat">
+				<exemplarCity>Muscat</exemplarCity>
+			</zone>
+			<zone type="America/Panama">
+				<exemplarCity>Panama</exemplarCity>
+			</zone>
+			<zone type="America/Lima">
+				<exemplarCity>Lima</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tahiti">
+				<exemplarCity>Tahiti</exemplarCity>
+			</zone>
+			<zone type="Pacific/Marquesas">
+				<exemplarCity>Marquesas</exemplarCity>
+			</zone>
+			<zone type="Pacific/Gambier">
+				<exemplarCity>Gambier</exemplarCity>
+			</zone>
+			<zone type="Pacific/Port_Moresby">
+				<exemplarCity>Port Moresby</exemplarCity>
+			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bougainville</exemplarCity>
+			</zone>
+			<zone type="Asia/Manila">
+				<exemplarCity>Manila</exemplarCity>
+			</zone>
+			<zone type="Asia/Karachi">
+				<exemplarCity>Karachi</exemplarCity>
+			</zone>
+			<zone type="Europe/Warsaw">
+				<exemplarCity>Varsjava</exemplarCity>
+			</zone>
+			<zone type="America/Miquelon">
+				<exemplarCity>Miquelon</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pitcairn">
+				<exemplarCity>Pitcairn</exemplarCity>
+			</zone>
+			<zone type="America/Puerto_Rico">
+				<exemplarCity>Puerto Riko</exemplarCity>
+			</zone>
+			<zone type="Asia/Gaza">
+				<exemplarCity>Gasa</exemplarCity>
+			</zone>
+			<zone type="Asia/Hebron">
+				<exemplarCity>Hebron</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Azores">
+				<exemplarCity>Azorurnar</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Madeira">
+				<exemplarCity>Madeira</exemplarCity>
+			</zone>
+			<zone type="Europe/Lisbon">
+				<exemplarCity>Lissabon</exemplarCity>
+			</zone>
+			<zone type="Pacific/Palau">
+				<exemplarCity>Palau</exemplarCity>
+			</zone>
+			<zone type="America/Asuncion">
+				<exemplarCity>Asunción</exemplarCity>
+			</zone>
+			<zone type="Asia/Qatar">
+				<exemplarCity>Qatar</exemplarCity>
+			</zone>
+			<zone type="Indian/Reunion">
+				<exemplarCity>Réunion</exemplarCity>
+			</zone>
+			<zone type="Europe/Bucharest">
+				<exemplarCity>Bukarest</exemplarCity>
+			</zone>
+			<zone type="Europe/Belgrade">
+				<exemplarCity>Beograd</exemplarCity>
+			</zone>
+			<zone type="Europe/Kaliningrad">
+				<exemplarCity>Kaliningrad</exemplarCity>
+			</zone>
+			<zone type="Europe/Simferopol">
+				<exemplarCity>Simferopol</exemplarCity>
+			</zone>
+			<zone type="Europe/Moscow">
+				<exemplarCity>Moskva</exemplarCity>
+			</zone>
+			<zone type="Europe/Volgograd">
+				<exemplarCity>Volgograd</exemplarCity>
+			</zone>
+			<zone type="Europe/Samara">
+				<exemplarCity>Samara</exemplarCity>
+			</zone>
+			<zone type="Asia/Yekaterinburg">
+				<exemplarCity>Yekaterinburg</exemplarCity>
+			</zone>
+			<zone type="Asia/Omsk">
+				<exemplarCity>Omsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Novosibirsk">
+				<exemplarCity>Novosibirsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Novokuznetsk">
+				<exemplarCity>Novokuznetsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Krasnoyarsk">
+				<exemplarCity>Krasnoyarsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Irkutsk">
+				<exemplarCity>Irkutsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Chita</exemplarCity>
+			</zone>
+			<zone type="Asia/Yakutsk">
+				<exemplarCity>Yakutsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Vladivostok">
+				<exemplarCity>Vladivostok</exemplarCity>
+			</zone>
+			<zone type="Asia/Khandyga">
+				<exemplarCity>Khandyga</exemplarCity>
+			</zone>
+			<zone type="Asia/Sakhalin">
+				<exemplarCity>Sakhalin</exemplarCity>
+			</zone>
+			<zone type="Asia/Ust-Nera">
+				<exemplarCity>Ust-Nera</exemplarCity>
+			</zone>
+			<zone type="Asia/Magadan">
+				<exemplarCity>Magadan</exemplarCity>
+			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolymsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Kamchatka">
+				<exemplarCity>Kamchatka</exemplarCity>
+			</zone>
+			<zone type="Asia/Anadyr">
+				<exemplarCity>Anadyr</exemplarCity>
+			</zone>
+			<zone type="Africa/Kigali">
+				<exemplarCity>Kigali</exemplarCity>
+			</zone>
+			<zone type="Asia/Riyadh">
+				<exemplarCity>Riyadh</exemplarCity>
+			</zone>
+			<zone type="Pacific/Guadalcanal">
+				<exemplarCity>Guadalcanal</exemplarCity>
+			</zone>
+			<zone type="Indian/Mahe">
+				<exemplarCity>Mahe</exemplarCity>
+			</zone>
+			<zone type="Africa/Khartoum">
+				<exemplarCity>Khartoum</exemplarCity>
+			</zone>
+			<zone type="Europe/Stockholm">
+				<exemplarCity>Stokkhólm</exemplarCity>
+			</zone>
+			<zone type="Asia/Singapore">
+				<exemplarCity>Singapor</exemplarCity>
+			</zone>
+			<zone type="Atlantic/St_Helena">
+				<exemplarCity>St. Helena</exemplarCity>
+			</zone>
+			<zone type="Europe/Ljubljana">
+				<exemplarCity>Ljubljana</exemplarCity>
+			</zone>
+			<zone type="Arctic/Longyearbyen">
+				<exemplarCity>Longyearbyen</exemplarCity>
+			</zone>
+			<zone type="Europe/Bratislava">
+				<exemplarCity>Bratislava</exemplarCity>
+			</zone>
+			<zone type="Africa/Freetown">
+				<exemplarCity>Freetown</exemplarCity>
+			</zone>
+			<zone type="Europe/San_Marino">
+				<exemplarCity>San Marino</exemplarCity>
+			</zone>
+			<zone type="Africa/Dakar">
+				<exemplarCity>Dakar</exemplarCity>
+			</zone>
+			<zone type="Africa/Mogadishu">
+				<exemplarCity>Mogadishu</exemplarCity>
+			</zone>
+			<zone type="America/Paramaribo">
+				<exemplarCity>Paramaribo</exemplarCity>
+			</zone>
+			<zone type="Africa/Juba">
+				<exemplarCity>Juba</exemplarCity>
+			</zone>
+			<zone type="Africa/Sao_Tome">
+				<exemplarCity>Sao Tome</exemplarCity>
+			</zone>
+			<zone type="America/El_Salvador">
+				<exemplarCity>El Salvador</exemplarCity>
+			</zone>
+			<zone type="America/Lower_Princes">
+				<exemplarCity>Lower Prince’s Quarter</exemplarCity>
+			</zone>
+			<zone type="Asia/Damascus">
+				<exemplarCity>Damascus</exemplarCity>
+			</zone>
+			<zone type="Africa/Mbabane">
+				<exemplarCity>Mbabane</exemplarCity>
+			</zone>
+			<zone type="America/Grand_Turk">
+				<exemplarCity>Grand Turk</exemplarCity>
+			</zone>
+			<zone type="Africa/Ndjamena">
+				<exemplarCity>Ndjamena</exemplarCity>
+			</zone>
+			<zone type="Indian/Kerguelen">
+				<exemplarCity>Kerguelen</exemplarCity>
+			</zone>
+			<zone type="Africa/Lome">
+				<exemplarCity>Lome</exemplarCity>
+			</zone>
+			<zone type="Asia/Bangkok">
+				<exemplarCity>Bangkok</exemplarCity>
+			</zone>
+			<zone type="Asia/Dushanbe">
+				<exemplarCity>Dushanbe</exemplarCity>
+			</zone>
+			<zone type="Pacific/Fakaofo">
+				<exemplarCity>Fakaofo</exemplarCity>
+			</zone>
+			<zone type="Asia/Dili">
+				<exemplarCity>Dili</exemplarCity>
+			</zone>
+			<zone type="Asia/Ashgabat">
+				<exemplarCity>Ashgabat</exemplarCity>
+			</zone>
+			<zone type="Africa/Tunis">
+				<exemplarCity>Tunis</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tongatapu">
+				<exemplarCity>Tongatapu</exemplarCity>
+			</zone>
+			<zone type="Europe/Istanbul">
+				<exemplarCity>Istanbul</exemplarCity>
+			</zone>
+			<zone type="America/Port_of_Spain">
+				<exemplarCity>Port of Spain</exemplarCity>
+			</zone>
+			<zone type="Pacific/Funafuti">
+				<exemplarCity>Funafuti</exemplarCity>
+			</zone>
+			<zone type="Asia/Taipei">
+				<exemplarCity>Taipei</exemplarCity>
+			</zone>
+			<zone type="Africa/Dar_es_Salaam">
+				<exemplarCity>Dar es Salaam</exemplarCity>
+			</zone>
+			<zone type="Europe/Uzhgorod">
+				<exemplarCity>Uzhgorod</exemplarCity>
+			</zone>
+			<zone type="Europe/Kiev">
+				<exemplarCity>Kiev</exemplarCity>
+			</zone>
+			<zone type="Europe/Zaporozhye">
+				<exemplarCity>Zaporozhye</exemplarCity>
+			</zone>
+			<zone type="Africa/Kampala">
+				<exemplarCity>Kampala</exemplarCity>
+			</zone>
+			<zone type="Pacific/Midway">
+				<exemplarCity>Midway</exemplarCity>
+			</zone>
+			<zone type="Pacific/Johnston">
+				<exemplarCity>Johnston</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wake">
+				<exemplarCity>Wake</exemplarCity>
+			</zone>
+			<zone type="America/Adak">
+				<exemplarCity>Adak</exemplarCity>
+			</zone>
+			<zone type="America/Nome">
+				<exemplarCity>Nome</exemplarCity>
+			</zone>
+			<zone type="Pacific/Honolulu">
+				<exemplarCity>Honolulu</exemplarCity>
+			</zone>
+			<zone type="America/Anchorage">
+				<exemplarCity>Anchorage</exemplarCity>
+			</zone>
+			<zone type="America/Yakutat">
+				<exemplarCity>Yakutat</exemplarCity>
+			</zone>
+			<zone type="America/Sitka">
+				<exemplarCity>Sitka</exemplarCity>
+			</zone>
+			<zone type="America/Juneau">
+				<exemplarCity>Juneau</exemplarCity>
+			</zone>
+			<zone type="America/Metlakatla">
+				<exemplarCity>Metlakatla</exemplarCity>
+			</zone>
+			<zone type="America/Los_Angeles">
+				<exemplarCity>Los Angeles</exemplarCity>
+			</zone>
+			<zone type="America/Boise">
+				<exemplarCity>Boise</exemplarCity>
+			</zone>
+			<zone type="America/Phoenix">
+				<exemplarCity>Phoenix</exemplarCity>
+			</zone>
+			<zone type="America/Denver">
+				<exemplarCity>Denver</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Beulah">
+				<exemplarCity>Beulah, North Dakota</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/New_Salem">
+				<exemplarCity>New Salem, North Dakota</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Center">
+				<exemplarCity>Center, North Dakota</exemplarCity>
+			</zone>
+			<zone type="America/Chicago">
+				<exemplarCity>Chicago</exemplarCity>
+			</zone>
+			<zone type="America/Menominee">
+				<exemplarCity>Menominee</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Vincennes">
+				<exemplarCity>Vincennes, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Petersburg">
+				<exemplarCity>Petersburg, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Tell_City">
+				<exemplarCity>Tell City, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Knox">
+				<exemplarCity>Knox, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Winamac">
+				<exemplarCity>Winamac, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Marengo">
+				<exemplarCity>Marengo, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indianapolis">
+				<exemplarCity>Indianapolis</exemplarCity>
+			</zone>
+			<zone type="America/Louisville">
+				<exemplarCity>Louisville</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Vevay">
+				<exemplarCity>Vevay, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Kentucky/Monticello">
+				<exemplarCity>Monticello, Kentucky</exemplarCity>
+			</zone>
+			<zone type="America/Detroit">
+				<exemplarCity>Detroit</exemplarCity>
+			</zone>
+			<zone type="America/New_York">
+				<exemplarCity>New York</exemplarCity>
+			</zone>
+			<zone type="America/Montevideo">
+				<exemplarCity>Montevideo</exemplarCity>
+			</zone>
+			<zone type="Asia/Samarkand">
+				<exemplarCity>Samarkand</exemplarCity>
+			</zone>
+			<zone type="Asia/Tashkent">
+				<exemplarCity>Tashkent</exemplarCity>
+			</zone>
+			<zone type="Europe/Vatican">
+				<exemplarCity>Vatikanið</exemplarCity>
+			</zone>
+			<zone type="America/St_Vincent">
+				<exemplarCity>St. Vincent</exemplarCity>
+			</zone>
+			<zone type="America/Caracas">
+				<exemplarCity>Caracas</exemplarCity>
+			</zone>
+			<zone type="America/Tortola">
+				<exemplarCity>Tortola</exemplarCity>
+			</zone>
+			<zone type="America/St_Thomas">
+				<exemplarCity>St. Thomas</exemplarCity>
+			</zone>
+			<zone type="Asia/Saigon">
+				<exemplarCity>Ho Chi Minh</exemplarCity>
+			</zone>
+			<zone type="Pacific/Efate">
+				<exemplarCity>Efate</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wallis">
+				<exemplarCity>Wallis</exemplarCity>
+			</zone>
+			<zone type="Pacific/Apia">
+				<exemplarCity>Apia</exemplarCity>
+			</zone>
+			<zone type="Asia/Aden">
+				<exemplarCity>Aden</exemplarCity>
+			</zone>
+			<zone type="Indian/Mayotte">
+				<exemplarCity>Mayotte</exemplarCity>
+			</zone>
+			<zone type="Africa/Johannesburg">
+				<exemplarCity>Johannesburg</exemplarCity>
+			</zone>
+			<zone type="Africa/Lusaka">
+				<exemplarCity>Lusaka</exemplarCity>
+			</zone>
+			<zone type="Africa/Harare">
+				<exemplarCity>Harare</exemplarCity>
+			</zone>
+			<metazone type="Afghanistan">
+				<long>
+					<standard>Afganistan tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Central">
+				<long>
+					<standard>Miðafrika tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Eastern">
+				<long>
+					<standard>Eysturafrika tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Southern">
+				<long>
+					<standard>Suðurafrika vanlig tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Western">
+				<long>
+					<generic>Vesturafrika tíð</generic>
+					<standard>Vesturafrika vanlig tíð</standard>
+					<daylight>Vesturafrika summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Alaska">
+				<long>
+					<generic>Alaska tíð</generic>
+					<standard>Alaska vanlig tíð</standard>
+					<daylight>Alaska summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Amazon">
+				<long>
+					<generic>Amasona tíð</generic>
+					<standard>Amasona vanlig tíð</standard>
+					<daylight>Amasona summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Central">
+				<long>
+					<generic>Central tíð</generic>
+					<standard>Central vanlig tíð</standard>
+					<daylight>Central summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Eastern">
+				<long>
+					<generic>Eastern tíð</generic>
+					<standard>Eastern vanlig tíð</standard>
+					<daylight>Eastern summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Mountain">
+				<long>
+					<generic>Mountain tíð</generic>
+					<standard>Mountain vanlig tíð</standard>
+					<daylight>Mountain summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Pacific">
+				<long>
+					<generic>Pacific tíð</generic>
+					<standard>Pacific vanlig tíð</standard>
+					<daylight>Pacific summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Apia">
+				<long>
+					<generic>Apia tíð</generic>
+					<standard>Apia vanlig tíð</standard>
+					<daylight>Apia summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Arabian">
+				<long>
+					<generic>Arabisk tíð</generic>
+					<standard>Arabisk vanlig tíð</standard>
+					<daylight>Arabisk summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Argentina">
+				<long>
+					<generic>Argentina tíð</generic>
+					<standard>Argentina vanlig tíð</standard>
+					<daylight>Argentina summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Argentina_Western">
+				<long>
+					<generic>Vestur Argentina tíð</generic>
+					<standard>Vestur Argentina vanlig tíð</standard>
+					<daylight>Vestur Argentina summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Armenia">
+				<long>
+					<generic>Armenia tíð</generic>
+					<standard>Armenia vanlig tíð</standard>
+					<daylight>Armenia summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Atlantic">
+				<long>
+					<generic>Atlantic tíð</generic>
+					<standard>Atlantic vanlig tíð</standard>
+					<daylight>Atlantic summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Central">
+				<long>
+					<generic>mið Avstralia tíð</generic>
+					<standard>mið Avstralia vanlig tíð</standard>
+					<daylight>mið Avstralia summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_CentralWestern">
+				<long>
+					<generic>miðvestur Avstralia tíð</generic>
+					<standard>miðvestur Avstralia vanlig tíð</standard>
+					<daylight>miðvestur Avstralia summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Eastern">
+				<long>
+					<generic>eystur Avstralia tíð</generic>
+					<standard>eystur Avstralia vanlig tíð</standard>
+					<daylight>eystur Avstralia summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Western">
+				<long>
+					<generic>vestur Avstralia tíð</generic>
+					<standard>vestur Avstralia vanlig tíð</standard>
+					<daylight>vestur Avstralia summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Azerbaijan">
+				<long>
+					<generic>Aserbadjan tíð</generic>
+					<standard>Aserbadjan vanlig tíð</standard>
+					<daylight>Aserbadjan summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Azores">
+				<long>
+					<generic>Azorurnar tíð</generic>
+					<standard>Azorurnar vanlig tíð</standard>
+					<daylight>Azorurnar summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Bangladesh">
+				<long>
+					<generic>Bangladesj tíð</generic>
+					<standard>Bangladesj vanlig tíð</standard>
+					<daylight>Bangladesj summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Bhutan">
+				<long>
+					<standard>Butan tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Bolivia">
+				<long>
+					<standard>Bolivia tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Brasilia">
+				<long>
+					<generic>Brasilia tíð</generic>
+					<standard>Brasilia vanlig tíð</standard>
+					<daylight>Brasilia summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Brunei">
+				<long>
+					<standard>Brunei Darussalam tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Cape_Verde">
+				<long>
+					<generic>Grønhøvdaoyggjar tíð</generic>
+					<standard>Grønhøvdaoyggjar vanlig tíð</standard>
+					<daylight>Grønhøvdaoyggjar summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Chamorro">
+				<long>
+					<standard>Chamorro vanlig tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Chatham">
+				<long>
+					<generic>Chatham tíð</generic>
+					<standard>Chatham vanlig tíð</standard>
+					<daylight>Chatham summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Chile">
+				<long>
+					<generic>Kili tíð</generic>
+					<standard>Kili vanlig tíð</standard>
+					<daylight>Kili summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="China">
+				<long>
+					<generic>Kina tíð</generic>
+					<standard>Kina vanlig tíð</standard>
+					<daylight>Kina summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Choibalsan">
+				<long>
+					<generic>Choibalsan tíð</generic>
+					<standard>Choibalsan vanlig tíð</standard>
+					<daylight>Choibalsan summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Christmas">
+				<long>
+					<standard>Jólaoyggj tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Cocos">
+				<long>
+					<standard>Kokosoyggjar tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Colombia">
+				<long>
+					<generic>Kolombia tíð</generic>
+					<standard>Kolombia vanlig tíð</standard>
+					<daylight>Kolombia summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cook">
+				<long>
+					<generic>Cooksoyggjar tíð</generic>
+					<standard>Cooksoyggjar vanlig tíð</standard>
+					<daylight>Cooksoyggjar summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cuba">
+				<long>
+					<generic>Cuba tíð</generic>
+					<standard>Cuba vanlig tíð</standard>
+					<daylight>Cuba summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Davis">
+				<long>
+					<standard>Davis tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="DumontDUrville">
+				<long>
+					<standard>Dumont-d’Urville tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="East_Timor">
+				<long>
+					<standard>Eysturtimor tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Easter">
+				<long>
+					<generic>Páskaoyggin tíð</generic>
+					<standard>Páskaoyggin vanlig tíð</standard>
+					<daylight>Páskaoyggin summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Ecuador">
+				<long>
+					<standard>Ekvador tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Europe_Central">
+				<long>
+					<generic>Miðevropa tíð</generic>
+					<standard>Miðevropa vanlig tíð</standard>
+					<daylight>Miðevropa summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Europe_Eastern">
+				<long>
+					<generic>Eysturevropa tíð</generic>
+					<standard>Eysturevropa vanlig tíð</standard>
+					<daylight>Eysturevropa summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Europe_Further_Eastern">
+				<long>
+					<standard>longri Eysturevropa tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Europe_Western">
+				<long>
+					<generic>Vesturevropa tíð</generic>
+					<standard>Vesturevropa vanlig tíð</standard>
+					<daylight>Vesturevropa summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Falkland">
+				<long>
+					<generic>Falklandsoyggjar tíð</generic>
+					<standard>Falklandsoyggjar vanlig tíð</standard>
+					<daylight>Falklandsoyggjar summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Fiji">
+				<long>
+					<generic>Fiji tíð</generic>
+					<standard>Fiji vanlig tíð</standard>
+					<daylight>Fiji summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="French_Guiana">
+				<long>
+					<standard>Franska Gujana tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="French_Southern">
+				<long>
+					<standard>Fronsku sunnaru landaøki og Antarktis tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Galapagos">
+				<long>
+					<standard>Galapagos tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Gambier">
+				<long>
+					<standard>Gambier tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Georgia">
+				<long>
+					<generic>Georgia tíð</generic>
+					<standard>Georgia vanlig tíð</standard>
+					<daylight>Georgia summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Gilbert_Islands">
+				<long>
+					<standard>Gilbertoyggjar tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="GMT">
+				<long>
+					<standard>Greenwich Mean tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Greenland_Eastern">
+				<long>
+					<generic>Eystur grønlendsk tíð</generic>
+					<standard>Eystur grønlendsk vanlig tíð</standard>
+					<daylight>Eystur grønlendsk summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Greenland_Western">
+				<long>
+					<generic>Vestur grønlendsk tíð</generic>
+					<standard>Vestur grønlendsk vanlig tíð</standard>
+					<daylight>Vestur grønlendsk summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Gulf">
+				<long>
+					<standard>Gulf vanlig tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Guyana">
+				<long>
+					<standard>Gujana tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Hawaii_Aleutian">
+				<long>
+					<generic>Hawaii-Aleutian tíð</generic>
+					<standard>Hawaii-Aleutian vanlig tíð</standard>
+					<daylight>Hawaii-Aleutian summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Hong_Kong">
+				<long>
+					<generic>Hong Kong tíð</generic>
+					<standard>Hong Kong vanlig tíð</standard>
+					<daylight>Hong Kong summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Hovd">
+				<long>
+					<generic>Hovd tíð</generic>
+					<standard>Hovd vanlig tíð</standard>
+					<daylight>Hovd summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="India">
+				<long>
+					<standard>India tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Indian_Ocean">
+				<long>
+					<standard>Indiahav tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Indochina">
+				<long>
+					<standard>Indokina tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Central">
+				<long>
+					<standard>Mið Indonesia tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Eastern">
+				<long>
+					<standard>Eystur Indonesia tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Western">
+				<long>
+					<standard>Vestur Indonesia tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Iran">
+				<long>
+					<generic>Iran tíð</generic>
+					<standard>Iran vanlig tíð</standard>
+					<daylight>Iran summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Irkutsk">
+				<long>
+					<generic>Irkutsk tíð</generic>
+					<standard>Irkutsk vanlig tíð</standard>
+					<daylight>Irkutsk summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Israel">
+				<long>
+					<generic>Ísrael tíð</generic>
+					<standard>Ísrael vanlig tíð</standard>
+					<daylight>Ísrael summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Japan">
+				<long>
+					<generic>Japan tíð</generic>
+					<standard>Japan vanlig tíð</standard>
+					<daylight>Japan summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Eastern">
+				<long>
+					<standard>Eystur Kasakstan tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Western">
+				<long>
+					<standard>Vestur Kasakstan tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Korea">
+				<long>
+					<generic>Korea tíð</generic>
+					<standard>Korea vanlig tíð</standard>
+					<daylight>Korea summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kosrae">
+				<long>
+					<standard>Kosrae tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Krasnoyarsk">
+				<long>
+					<generic>Krasnoyarsk tíð</generic>
+					<standard>Krasnoyarsk vanlig tíð</standard>
+					<daylight>Krasnoyarsk summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kyrgystan">
+				<long>
+					<standard>Kirgisia tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Line_Islands">
+				<long>
+					<standard>Lineoyggjar tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Lord_Howe">
+				<long>
+					<generic>Lord Howe tíð</generic>
+					<standard>Lord Howe vanlig tíð</standard>
+					<daylight>Lord Howe summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Macquarie">
+				<long>
+					<standard>Macquariesoyggj tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Magadan">
+				<long>
+					<generic>Magadan tíð</generic>
+					<standard>Magadan vanlig tíð</standard>
+					<daylight>Magadan summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Malaysia">
+				<long>
+					<standard>Malaisia tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Maldives">
+				<long>
+					<standard>Maldivoyggjar tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Marquesas">
+				<long>
+					<standard>Marquesas tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Marshall_Islands">
+				<long>
+					<standard>Marshalloyggjar tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Mauritius">
+				<long>
+					<generic>Móritius tíð</generic>
+					<standard>Móritius vanlig tíð</standard>
+					<daylight>Móritius summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mawson">
+				<long>
+					<standard>Mawson tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Mexico_Northwest">
+				<long>
+					<generic>Northwest Mexico tíð</generic>
+					<standard>Northwest Mexico vanlig tíð</standard>
+					<daylight>Northwest Mexico summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mexico_Pacific">
+				<long>
+					<generic>Mexican Pacific tíð</generic>
+					<standard>Mexican Pacific vanlig tíð</standard>
+					<daylight>Mexican Pacific summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mongolia">
+				<long>
+					<generic>Ulan Bator tíð</generic>
+					<standard>Ulan Bator vanlig tíð</standard>
+					<daylight>Ulan Bator summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Moscow">
+				<long>
+					<generic>Moskva tíð</generic>
+					<standard>Moskva vanlig tíð</standard>
+					<daylight>Moskva summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Myanmar">
+				<long>
+					<standard>Myanmar (Burma) tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Nauru">
+				<long>
+					<standard>Nauru tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Nepal">
+				<long>
+					<standard>Nepal tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="New_Caledonia">
+				<long>
+					<generic>Nýkaledónia tíð</generic>
+					<standard>Nýkaledónia vanlig tíð</standard>
+					<daylight>Nýkaledónia summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="New_Zealand">
+				<long>
+					<generic>Nýsæland tíð</generic>
+					<standard>Nýsæland vanlig tíð</standard>
+					<daylight>Nýsæland summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Newfoundland">
+				<long>
+					<generic>Newfoundland tíð</generic>
+					<standard>Newfoundland vanlig tíð</standard>
+					<daylight>Newfoundland summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Niue">
+				<long>
+					<standard>Niue tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Norfolk">
+				<long>
+					<standard>Norfolksoyggj tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Noronha">
+				<long>
+					<generic>Fernando de Noronha tíð</generic>
+					<standard>Fernando de Noronha vanlig tíð</standard>
+					<daylight>Fernando de Noronha summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Novosibirsk">
+				<long>
+					<generic>Novosibirsk tíð</generic>
+					<standard>Novosibirsk vanlig tíð</standard>
+					<daylight>Novosibirsk summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Omsk">
+				<long>
+					<generic>Omsk tíð</generic>
+					<standard>Omsk vanlig tíð</standard>
+					<daylight>Omsk summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pakistan">
+				<long>
+					<generic>Pakistan tíð</generic>
+					<standard>Pakistan vanlig tíð</standard>
+					<daylight>Pakistan summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Palau">
+				<long>
+					<standard>Palau tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Papua_New_Guinea">
+				<long>
+					<standard>Papua Nýguinea tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Paraguay">
+				<long>
+					<generic>Paraguai tíð</generic>
+					<standard>Paraguai vanlig tíð</standard>
+					<daylight>Paraguai summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Peru">
+				<long>
+					<generic>Peru tíð</generic>
+					<standard>Peru vanlig tíð</standard>
+					<daylight>Peru summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Philippines">
+				<long>
+					<generic>Filipsoyggjar tíð</generic>
+					<standard>Filipsoyggjar vanlig tíð</standard>
+					<daylight>Filipsoyggjar summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Phoenix_Islands">
+				<long>
+					<standard>Phoenixoyggjar tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Pierre_Miquelon">
+				<long>
+					<generic>St. Pierre &amp; Miquelon tíð</generic>
+					<standard>St. Pierre &amp; Miquelon vanlig tíð</standard>
+					<daylight>St. Pierre &amp; Miquelon summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pitcairn">
+				<long>
+					<standard>Pitcairnoyggjar tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Ponape">
+				<long>
+					<standard>Ponape tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Reunion">
+				<long>
+					<standard>Réunion tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Rothera">
+				<long>
+					<standard>Rothera tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Sakhalin">
+				<long>
+					<generic>Sakhalin tíð</generic>
+					<standard>Sakhalin vanlig tíð</standard>
+					<daylight>Sakhalin summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Samoa">
+				<long>
+					<generic>Samoa tíð</generic>
+					<standard>Samoa vanlig tíð</standard>
+					<daylight>Samoa summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Seychelles">
+				<long>
+					<standard>Seyskelloyggjar tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Singapore">
+				<long>
+					<standard>Singapor tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Solomon">
+				<long>
+					<standard>Salomonoyggjar tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="South_Georgia">
+				<long>
+					<standard>Suðurgeorgiaoyggjar tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Suriname">
+				<long>
+					<standard>Surinam tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Syowa">
+				<long>
+					<standard>Syowa tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Tahiti">
+				<long>
+					<standard>Tahiti tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Taipei">
+				<long>
+					<generic>Taipei tíð</generic>
+					<standard>Taipei vanlig tíð</standard>
+					<daylight>Taipei summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Tajikistan">
+				<long>
+					<standard>Tadsjikistan tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Tokelau">
+				<long>
+					<standard>Tokelau tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Tonga">
+				<long>
+					<generic>Tonga tíð</generic>
+					<standard>Tonga vanlig tíð</standard>
+					<daylight>Tonga summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Truk">
+				<long>
+					<standard>Chuuk tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Turkmenistan">
+				<long>
+					<generic>Turkmenistan tíð</generic>
+					<standard>Turkmenistan vanlig tíð</standard>
+					<daylight>Turkmenistan summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Tuvalu">
+				<long>
+					<standard>Tuvalu tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Uruguay">
+				<long>
+					<generic>Uruguai tíð</generic>
+					<standard>Uruguai vanlig tíð</standard>
+					<daylight>Uruguai summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Uzbekistan">
+				<long>
+					<generic>Usbekistan tíð</generic>
+					<standard>Usbekistan vanlig tíð</standard>
+					<daylight>Usbekistan summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Vanuatu">
+				<long>
+					<generic>Vanuatu tíð</generic>
+					<standard>Vanuatu vanlig tíð</standard>
+					<daylight>Vanuatu summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Venezuela">
+				<long>
+					<standard>Venesuela tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Vladivostok">
+				<long>
+					<generic>Vladivostok tíð</generic>
+					<standard>Vladivostok vanlig tíð</standard>
+					<daylight>Vladivostok summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Volgograd">
+				<long>
+					<generic>Volgograd tíð</generic>
+					<standard>Volgograd vanlig tíð</standard>
+					<daylight>Volgograd summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Vostok">
+				<long>
+					<standard>Vostok tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Wake">
+				<long>
+					<standard>Wakeoyggj tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Wallis">
+				<long>
+					<standard>Wallis- og Futunaoyggjar tíð</standard>
+				</long>
+			</metazone>
+			<metazone type="Yakutsk">
+				<long>
+					<generic>Yakutsk tíð</generic>
+					<standard>Yakutsk vanlig tíð</standard>
+					<daylight>Yakutsk summartíð</daylight>
+				</long>
+			</metazone>
+			<metazone type="Yekaterinburg">
+				<long>
+					<generic>Yekaterinburg tíð</generic>
+					<standard>Yekaterinburg vanlig tíð</standard>
+					<daylight>Yekaterinburg summartíð</daylight>
+				</long>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<defaultNumberingSystem draft="contributed">latn</defaultNumberingSystem>
+		<otherNumberingSystems>
+			<native draft="contributed">latn</native>
+		</otherNumberingSystems>
+		<minimumGroupingDigits draft="contributed">1</minimumGroupingDigits>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group>.</group>
+			<list draft="contributed">;</list>
+			<percentSign>%</percentSign>
+			<plusSign draft="contributed">+</plusSign>
+			<minusSign draft="contributed">−</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+			<timeSeparator draft="contributed">:</timeSeparator>
+		</symbols>
+		<decimalFormats numberSystem="latn">
+			<decimalFormatLength>
+				<decimalFormat>
+					<pattern draft="contributed">#,##0.###</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+			<decimalFormatLength type="long">
+				<decimalFormat>
+					<pattern type="1000" count="one">0 túsund</pattern>
+					<pattern type="1000" count="other">0 túsund</pattern>
+					<pattern type="10000" count="one">00 túsund</pattern>
+					<pattern type="10000" count="other">00 túsund</pattern>
+					<pattern type="100000" count="one">000 túsund</pattern>
+					<pattern type="100000" count="other">000 túsund</pattern>
+					<pattern type="1000000" count="one">0 millión</pattern>
+					<pattern type="1000000" count="other">0 milliónir</pattern>
+					<pattern type="10000000" count="one">00 milliónir</pattern>
+					<pattern type="10000000" count="other">00 milliónir</pattern>
+					<pattern type="100000000" count="one">000 milliónir</pattern>
+					<pattern type="100000000" count="other">000 milliónir</pattern>
+					<pattern type="1000000000" count="one">0 milliard</pattern>
+					<pattern type="1000000000" count="other">0 milliardir</pattern>
+					<pattern type="10000000000" count="one">00 milliardir</pattern>
+					<pattern type="10000000000" count="other">00 milliardir</pattern>
+					<pattern type="100000000000" count="one">000 milliardir</pattern>
+					<pattern type="100000000000" count="other">000 milliardir</pattern>
+					<pattern type="1000000000000" count="one">0 billión</pattern>
+					<pattern type="1000000000000" count="other">0 billiónir</pattern>
+					<pattern type="10000000000000" count="one">00 billiónir</pattern>
+					<pattern type="10000000000000" count="other">00 billiónir</pattern>
+					<pattern type="100000000000000" count="one">000 billiónir</pattern>
+					<pattern type="100000000000000" count="other">000 billiónir</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+			<decimalFormatLength type="short">
+				<decimalFormat>
+					<pattern type="1000" count="one">0 tús'.'</pattern>
+					<pattern type="1000" count="other">0 tús'.'</pattern>
+					<pattern type="10000" count="one">00 tús'.'</pattern>
+					<pattern type="10000" count="other">00 tús'.'</pattern>
+					<pattern type="100000" count="one">000 tús'.'</pattern>
+					<pattern type="100000" count="other">000 tús'.'</pattern>
+					<pattern type="1000000" count="one">0 mió'.'</pattern>
+					<pattern type="1000000" count="other">0 mió'.'</pattern>
+					<pattern type="10000000" count="one">00 mió'.'</pattern>
+					<pattern type="10000000" count="other">00 mió'.'</pattern>
+					<pattern type="100000000" count="one">000 mió'.'</pattern>
+					<pattern type="100000000" count="other">000 mió'.'</pattern>
+					<pattern type="1000000000" count="one">0 mia'.'</pattern>
+					<pattern type="1000000000" count="other">0 mia'.'</pattern>
+					<pattern type="10000000000" count="one">00 mia'.'</pattern>
+					<pattern type="10000000000" count="other">00 mia'.'</pattern>
+					<pattern type="100000000000" count="one">000 mia'.'</pattern>
+					<pattern type="100000000000" count="other">000 mia'.'</pattern>
+					<pattern type="1000000000000" count="one">0 bió'.'</pattern>
+					<pattern type="1000000000000" count="other">0 bió'.'</pattern>
+					<pattern type="10000000000000" count="one">00 bió'.'</pattern>
+					<pattern type="10000000000000" count="other">00 bió'.'</pattern>
+					<pattern type="100000000000000" count="one">000 bió'.'</pattern>
+					<pattern type="100000000000000" count="other">000 bió'.'</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+		</decimalFormats>
+		<scientificFormats numberSystem="latn">
+			<scientificFormatLength>
+				<scientificFormat>
+					<pattern>#E0</pattern>
+				</scientificFormat>
+			</scientificFormatLength>
+		</scientificFormats>
+		<percentFormats numberSystem="latn">
+			<percentFormatLength>
+				<percentFormat>
+					<pattern>#,##0 %</pattern>
+				</percentFormat>
+			</percentFormatLength>
+		</percentFormats>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">0 tús'.' ¤</pattern>
+					<pattern type="1000" count="other">0 tús'.' ¤</pattern>
+					<pattern type="10000" count="one">00 tús'.' ¤</pattern>
+					<pattern type="10000" count="other">00 tús'.' ¤</pattern>
+					<pattern type="100000" count="one">000 tús'.' ¤</pattern>
+					<pattern type="100000" count="other">000 tús'.' ¤</pattern>
+					<pattern type="1000000" count="one">0 mió'.' ¤</pattern>
+					<pattern type="1000000" count="other">0 mió'.' ¤</pattern>
+					<pattern type="10000000" count="one">00 mió'.' ¤</pattern>
+					<pattern type="10000000" count="other">00 mió'.' ¤</pattern>
+					<pattern type="100000000" count="one">000 mió'.' ¤</pattern>
+					<pattern type="100000000" count="other">000 mió'.' ¤</pattern>
+					<pattern type="1000000000" count="one">0 mia'.' ¤</pattern>
+					<pattern type="1000000000" count="other">0 mia'.' ¤</pattern>
+					<pattern type="10000000000" count="one">00 mia'.' ¤</pattern>
+					<pattern type="10000000000" count="other">00 mia'.' ¤</pattern>
+					<pattern type="100000000000" count="one">000 mia'.' ¤</pattern>
+					<pattern type="100000000000" count="other">000 mia'.' ¤</pattern>
+					<pattern type="1000000000000" count="one">0 bió'.' ¤</pattern>
+					<pattern type="1000000000000" count="other">0 bió'.' ¤</pattern>
+					<pattern type="10000000000000" count="one">00 bió'.' ¤</pattern>
+					<pattern type="10000000000000" count="other">00 bió'.' ¤</pattern>
+					<pattern type="100000000000000" count="one">000 bió'.' ¤</pattern>
+					<pattern type="100000000000000" count="other">000 bió'.' ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<unitPattern count="one">{0} {1}</unitPattern>
+			<unitPattern count="other">{0} {1}</unitPattern>
+		</currencyFormats>
+		<currencies>
+			<currency type="AED">
+				<displayName>Sameindu Emirríkini dirham</displayName>
+				<displayName count="one">Sameindu Emirríkini dirham</displayName>
+				<displayName count="other">Sameindu Emirríkini dirham</displayName>
+				<symbol draft="contributed">AED</symbol>
+			</currency>
+			<currency type="AFN">
+				<displayName>Afganistan afghani</displayName>
+				<displayName count="one">Afganistan afghani</displayName>
+				<displayName count="other">Afganistan afghani</displayName>
+				<symbol draft="contributed">AFN</symbol>
+			</currency>
+			<currency type="ALL">
+				<displayName>Albania lek</displayName>
+				<displayName count="one">Albania lek</displayName>
+				<displayName count="other">Albania lek</displayName>
+				<symbol draft="contributed">ALL</symbol>
+			</currency>
+			<currency type="AMD">
+				<displayName>Armenia dram</displayName>
+				<displayName count="one">Armenia dram</displayName>
+				<displayName count="other">Armenia dram</displayName>
+				<symbol draft="contributed">AMD</symbol>
+			</currency>
+			<currency type="ANG">
+				<displayName>Niðurlonds Karibia gyllin</displayName>
+				<displayName count="one">Niðurlonds Karibia gyllin</displayName>
+				<displayName count="other">Niðurlonds Karibia gyllin</displayName>
+				<symbol draft="contributed">ANG</symbol>
+			</currency>
+			<currency type="AOA">
+				<displayName>Angola kwanza</displayName>
+				<displayName count="one">Angola kwanza</displayName>
+				<displayName count="other">Angola kwanza</displayName>
+				<symbol draft="contributed">AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
+			</currency>
+			<currency type="ARS">
+				<displayName>Argentina peso</displayName>
+				<displayName count="one">Argentina peso</displayName>
+				<displayName count="other">Argentina peso</displayName>
+				<symbol draft="contributed">ARS</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="AUD">
+				<displayName>Avstralskur dollari</displayName>
+				<displayName count="one">Avstralskur dollari</displayName>
+				<displayName count="other">Avstralskir dollarar</displayName>
+				<symbol draft="contributed">A$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="AWG">
+				<displayName>Aruba florin</displayName>
+				<displayName count="one">Aruba florin</displayName>
+				<displayName count="other">Aruba florin</displayName>
+				<symbol draft="contributed">AWG</symbol>
+			</currency>
+			<currency type="AZN">
+				<displayName>Aserbadjan manat</displayName>
+				<displayName count="one">Aserbadjan manat</displayName>
+				<displayName count="other">Aserbadjan manat</displayName>
+				<symbol draft="contributed">AZN</symbol>
+			</currency>
+			<currency type="BAM">
+				<displayName>Bosnia-Hersegovina mark (kann vekslast)</displayName>
+				<displayName count="one">Bosnia-Hersegovina mark (kann vekslast)</displayName>
+				<displayName count="other">Bosnia-Hersegovina mark (kann vekslast)</displayName>
+				<symbol draft="contributed">BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
+			</currency>
+			<currency type="BBD">
+				<displayName>Barbados dollari</displayName>
+				<displayName count="one">Barbados dollari</displayName>
+				<displayName count="other">Barbados dollarar</displayName>
+				<symbol draft="contributed">BBD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BDT">
+				<displayName>Bangladesj taka</displayName>
+				<displayName count="one">Bangladesj taka</displayName>
+				<displayName count="other">Bangladesj taka</displayName>
+				<symbol draft="contributed">BDT</symbol>
+				<symbol alt="narrow" draft="contributed">৳</symbol>
+			</currency>
+			<currency type="BGN">
+				<displayName>Bulgaria lev</displayName>
+				<displayName count="one">Bulgaria lev</displayName>
+				<displayName count="other">Bulgaria lev</displayName>
+				<symbol draft="contributed">BGN</symbol>
+			</currency>
+			<currency type="BHD">
+				<displayName>Barein dinar</displayName>
+				<displayName count="one">Barein dinar</displayName>
+				<displayName count="other">Barein dinar</displayName>
+				<symbol draft="contributed">BHD</symbol>
+			</currency>
+			<currency type="BIF">
+				<displayName>Burundi frankur</displayName>
+				<displayName count="one">Burundi frankur</displayName>
+				<displayName count="other">Burundi frankar</displayName>
+				<symbol draft="contributed">BIF</symbol>
+			</currency>
+			<currency type="BMD">
+				<displayName>Bermuda dollari</displayName>
+				<displayName count="one">Bermuda dollari</displayName>
+				<displayName count="other">Bermuda dollarar</displayName>
+				<symbol draft="contributed">BMD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BND">
+				<displayName>Brunei dollari</displayName>
+				<displayName count="one">Brunei dollari</displayName>
+				<displayName count="other">Brunei dollarar</displayName>
+				<symbol draft="contributed">BND</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BOB">
+				<displayName>Bolivia boliviano</displayName>
+				<displayName count="one">Bolivia boliviano</displayName>
+				<displayName count="other">Bolivia boliviano</displayName>
+				<symbol draft="contributed">BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
+			</currency>
+			<currency type="BRL">
+				<displayName>Brasilianskur real</displayName>
+				<displayName count="one">Brasilianskur real</displayName>
+				<displayName count="other">Brasilianskir real</displayName>
+				<symbol draft="contributed">R$</symbol>
+				<symbol alt="narrow" draft="contributed">R$</symbol>
+			</currency>
+			<currency type="BSD">
+				<displayName>Bahamaoyggjar dollari</displayName>
+				<displayName count="one">Bahamaoyggjar dollari</displayName>
+				<displayName count="other">Bahamaoyggjar dollarar</displayName>
+				<symbol draft="contributed">BSD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BTN">
+				<displayName>Butan ngultrum</displayName>
+				<displayName count="one">Butan ngultrum</displayName>
+				<displayName count="other">Butan ngultrum</displayName>
+				<symbol draft="contributed">BTN</symbol>
+			</currency>
+			<currency type="BWP">
+				<displayName>Botsvana pula</displayName>
+				<displayName count="one">Botsvana pula</displayName>
+				<displayName count="other">Botsvana pula</displayName>
+				<symbol draft="contributed">BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
+			</currency>
+			<currency type="BYR">
+				<displayName>Hvítarussland ruble</displayName>
+				<displayName count="one">Hvítarussland ruble</displayName>
+				<displayName count="other">Hvítarussland ruble</displayName>
+				<symbol draft="contributed">BYR</symbol>
+				<symbol alt="narrow" draft="contributed">р.</symbol>
+			</currency>
+			<currency type="BZD">
+				<displayName>Belis dollari</displayName>
+				<displayName count="one">Belis dollari</displayName>
+				<displayName count="other">Belis dollarar</displayName>
+				<symbol draft="contributed">BZD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CAD">
+				<displayName>Kanada dollari</displayName>
+				<displayName count="one">Kanada dollari</displayName>
+				<displayName count="other">Kanada dollarar</displayName>
+				<symbol draft="contributed">CA$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CDF">
+				<displayName>Kongo frankur</displayName>
+				<displayName count="one">Kongo frankur</displayName>
+				<displayName count="other">Kongo frankar</displayName>
+				<symbol draft="contributed">CDF</symbol>
+			</currency>
+			<currency type="CHF">
+				<displayName>sveisiskur frankur</displayName>
+				<displayName count="one">sveisiskur frankur</displayName>
+				<displayName count="other">sveisiskir frankar</displayName>
+				<symbol draft="contributed">CHF</symbol>
+			</currency>
+			<currency type="CLP">
+				<displayName>Kili peso</displayName>
+				<displayName count="one">Kili peso</displayName>
+				<displayName count="other">Kili peso</displayName>
+				<symbol draft="contributed">CLP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CNY">
+				<displayName>kinesiskur yuan</displayName>
+				<displayName count="one">kinesiskur yuan</displayName>
+				<displayName count="other">kinesiskir yuan</displayName>
+				<symbol draft="contributed">CN¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
+			</currency>
+			<currency type="COP">
+				<displayName>Kolombia peso</displayName>
+				<displayName count="one">Kolombia peso</displayName>
+				<displayName count="other">Kolombia peso</displayName>
+				<symbol draft="contributed">COP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CRC">
+				<displayName>Kosta Rika colón</displayName>
+				<displayName count="one">Kosta Rika colón</displayName>
+				<displayName count="other">Kosta Rika colón</displayName>
+				<symbol draft="contributed">CRC</symbol>
+				<symbol alt="narrow" draft="contributed">₡</symbol>
+			</currency>
+			<currency type="CUC">
+				<displayName>Kuba peso (sum kann vekslast)</displayName>
+				<displayName count="one">Kuba peso (sum kann vekslast)</displayName>
+				<displayName count="other">Kuba peso (sum kann vekslast)</displayName>
+				<symbol draft="contributed">CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CUP">
+				<displayName>Kuba peso</displayName>
+				<displayName count="one">Kuba peso</displayName>
+				<displayName count="other">Kuba peso</displayName>
+				<symbol draft="contributed">CUP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CVE">
+				<displayName>Grønhøvdaoyggjar escudo</displayName>
+				<displayName count="one">Grønhøvdaoyggjar escudo</displayName>
+				<displayName count="other">Grønhøvdaoyggjar escudo</displayName>
+				<symbol draft="contributed">CVE</symbol>
+			</currency>
+			<currency type="CZK">
+				<displayName>Kekkia koruna</displayName>
+				<displayName count="one">Kekkia koruna</displayName>
+				<displayName count="other">Kekkia koruna</displayName>
+				<symbol draft="contributed">CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
+			</currency>
+			<currency type="DJF">
+				<displayName>Djibuti frankur</displayName>
+				<displayName count="one">Djibuti frankur</displayName>
+				<displayName count="other">Djibuti frankar</displayName>
+				<symbol draft="contributed">DJF</symbol>
+			</currency>
+			<currency type="DKK">
+				<displayName>donsk króna</displayName>
+				<displayName count="one">donsk króna</displayName>
+				<displayName count="other">danskar krónur</displayName>
+				<symbol>kr</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="DOP">
+				<displayName>Dominika peso</displayName>
+				<displayName count="one">Dominika peso</displayName>
+				<displayName count="other">Dominika peso</displayName>
+				<symbol draft="contributed">DOP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="DZD">
+				<displayName>Algeria dinar</displayName>
+				<displayName count="one">Algeria dinar</displayName>
+				<displayName count="other">Algeria dinar</displayName>
+				<symbol draft="contributed">DZD</symbol>
+			</currency>
+			<currency type="EGP">
+				<displayName>Egyptaland pund</displayName>
+				<displayName count="one">Egyptaland pund</displayName>
+				<displayName count="other">Egyptaland pund</displayName>
+				<symbol draft="contributed">EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
+			</currency>
+			<currency type="ERN">
+				<displayName>Eritrea nakfa</displayName>
+				<displayName count="one">Eritrea nakfa</displayName>
+				<displayName count="other">Eritrea nakfa</displayName>
+				<symbol draft="contributed">ERN</symbol>
+			</currency>
+			<currency type="ETB">
+				<displayName>Etiopia birr</displayName>
+				<displayName count="one">Etiopia birr</displayName>
+				<displayName count="other">Etiopia birr</displayName>
+				<symbol draft="contributed">ETB</symbol>
+			</currency>
+			<currency type="EUR">
+				<displayName>Evra</displayName>
+				<displayName count="one">evra</displayName>
+				<displayName count="other">evrur</displayName>
+				<symbol draft="contributed">€</symbol>
+				<symbol alt="narrow" draft="contributed">€</symbol>
+			</currency>
+			<currency type="FJD">
+				<displayName>Fiji dollari</displayName>
+				<displayName count="one">Fiji dollari</displayName>
+				<displayName count="other">Fiji dollarar</displayName>
+				<symbol draft="contributed">FJD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="FKP">
+				<displayName>Falklandsoyggjar pund</displayName>
+				<displayName count="one">Falklandsoyggjar pund</displayName>
+				<displayName count="other">Falklandsoyggjar pund</displayName>
+				<symbol draft="contributed">FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="GBP">
+				<displayName>bretsk pund</displayName>
+				<displayName count="one">bretsk pund</displayName>
+				<displayName count="other">bretsk pund</displayName>
+				<symbol draft="contributed">£</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="GEL">
+				<displayName>Georgia lari</displayName>
+				<displayName count="one">Georgia lari</displayName>
+				<displayName count="other">Georgia lari</displayName>
+				<symbol draft="contributed">GEL</symbol>
+			</currency>
+			<currency type="GHS">
+				<displayName>Gana cedi</displayName>
+				<displayName count="one">Gana cedi</displayName>
+				<displayName count="other">Gana cedi</displayName>
+				<symbol draft="contributed">GHS</symbol>
+			</currency>
+			<currency type="GIP">
+				<displayName>Gibraltar pund</displayName>
+				<displayName count="one">Gibraltar pund</displayName>
+				<displayName count="other">Gibraltar pund</displayName>
+				<symbol draft="contributed">GIP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="GMD">
+				<displayName>Gambia dalasi</displayName>
+				<displayName count="one">Gambia dalasi</displayName>
+				<displayName count="other">Gambia dalasi</displayName>
+				<symbol draft="contributed">GMD</symbol>
+			</currency>
+			<currency type="GNF">
+				<displayName>Guinea frankur</displayName>
+				<displayName count="one">Guinea frankur</displayName>
+				<displayName count="other">Guinea frankar</displayName>
+				<symbol draft="contributed">GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
+			</currency>
+			<currency type="GTQ">
+				<displayName>Guatemala quetzal</displayName>
+				<displayName count="one">Guatemala quetzal</displayName>
+				<displayName count="other">Guatemala quetzal</displayName>
+				<symbol draft="contributed">GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
+			</currency>
+			<currency type="GYD">
+				<displayName>Gujana dollari</displayName>
+				<displayName count="one">Gujana dollari</displayName>
+				<displayName count="other">Gujana dollarar</displayName>
+				<symbol draft="contributed">GYD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="HKD">
+				<displayName>Hong Kong dollari</displayName>
+				<displayName count="one">Hong Kong dollari</displayName>
+				<displayName count="other">Hong Kong dollarar</displayName>
+				<symbol draft="contributed">HK$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="HNL">
+				<displayName>Honduras lempira</displayName>
+				<displayName count="one">Honduras lempira</displayName>
+				<displayName count="other">Honduras lempira</displayName>
+				<symbol draft="contributed">HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
+			</currency>
+			<currency type="HRK">
+				<displayName>Kroatia kuna</displayName>
+				<displayName count="one">Kroatia kuna</displayName>
+				<displayName count="other">Kroatia kuna</displayName>
+				<symbol draft="contributed">HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
+			</currency>
+			<currency type="HTG">
+				<displayName>Haiti gourde</displayName>
+				<displayName count="one">Haiti gourde</displayName>
+				<displayName count="other">Haiti gourde</displayName>
+				<symbol draft="contributed">HTG</symbol>
+			</currency>
+			<currency type="HUF">
+				<displayName>Ungarn forint</displayName>
+				<displayName count="one">Ungarn forint</displayName>
+				<displayName count="other">Ungarn forint</displayName>
+				<symbol draft="contributed">HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
+			</currency>
+			<currency type="IDR">
+				<displayName>Indonesia rupiah</displayName>
+				<displayName count="one">Indonesia rupiah</displayName>
+				<displayName count="other">Indonesia rupiah</displayName>
+				<symbol draft="contributed">IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
+			</currency>
+			<currency type="ILS">
+				<displayName>Ísrael new sheqel</displayName>
+				<displayName count="one">Ísrael new sheqel</displayName>
+				<displayName count="other">Ísrael new sheqel</displayName>
+				<symbol draft="contributed">₪</symbol>
+				<symbol alt="narrow" draft="contributed">₪</symbol>
+			</currency>
+			<currency type="INR">
+				<displayName>indiskir rupis</displayName>
+				<displayName count="one">indiskur rupi</displayName>
+				<displayName count="other">indiskir rupis</displayName>
+				<symbol draft="contributed">₹</symbol>
+				<symbol alt="narrow" draft="contributed">₹</symbol>
+			</currency>
+			<currency type="IQD">
+				<displayName>Irak dinar</displayName>
+				<displayName count="one">Irak dinar</displayName>
+				<displayName count="other">Irak dinar</displayName>
+				<symbol draft="contributed">IQD</symbol>
+			</currency>
+			<currency type="IRR">
+				<displayName>iranskir rials</displayName>
+				<displayName count="one">iranskur rial</displayName>
+				<displayName count="other">iranskir rials</displayName>
+				<symbol draft="contributed">IRR</symbol>
+			</currency>
+			<currency type="ISK">
+				<displayName>íslendsk króna</displayName>
+				<displayName count="one">íslendsk króna</displayName>
+				<displayName count="other">íslendskar krónur</displayName>
+				<symbol draft="contributed">ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="JMD">
+				<displayName>Jamaika dollari</displayName>
+				<displayName count="one">Jamaika dollari</displayName>
+				<displayName count="other">Jamaika dollarar</displayName>
+				<symbol draft="contributed">JMD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="JOD">
+				<displayName>Jordan dinar</displayName>
+				<displayName count="one">Jordan dinar</displayName>
+				<displayName count="other">Jordan dinar</displayName>
+				<symbol draft="contributed">JOD</symbol>
+			</currency>
+			<currency type="JPY">
+				<displayName>japanskur yen</displayName>
+				<displayName count="one">japanskur yen</displayName>
+				<displayName count="other">japanskir yen</displayName>
+				<symbol draft="contributed">JP¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
+			</currency>
+			<currency type="KES">
+				<displayName>kenjanskur skillingur</displayName>
+				<displayName count="one">kenjanskur skillingur</displayName>
+				<displayName count="other">kenjanskir skillingar</displayName>
+				<symbol draft="contributed">KES</symbol>
+			</currency>
+			<currency type="KGS">
+				<displayName>Kirgisia som</displayName>
+				<displayName count="one">Kirgisia som</displayName>
+				<displayName count="other">Kirgisia som</displayName>
+				<symbol draft="contributed">KGS</symbol>
+			</currency>
+			<currency type="KHR">
+				<displayName>Kambodja riel</displayName>
+				<displayName count="one">Kambodja riel</displayName>
+				<displayName count="other">Kambodja riel</displayName>
+				<symbol draft="contributed">KHR</symbol>
+				<symbol alt="narrow" draft="contributed">៛</symbol>
+			</currency>
+			<currency type="KMF">
+				<displayName>Komoroyggjar frankur</displayName>
+				<displayName count="one">Komoroyggjar frankur</displayName>
+				<displayName count="other">Komoroyggjar frankar</displayName>
+				<symbol draft="contributed">KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
+			</currency>
+			<currency type="KPW">
+				<displayName>Norðurkorea won</displayName>
+				<displayName count="one">Norðurkorea won</displayName>
+				<displayName count="other">Norðurkorea won</displayName>
+				<symbol draft="contributed">KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
+			</currency>
+			<currency type="KRW">
+				<displayName>Suðurkorea won</displayName>
+				<displayName count="one">Suðurkorea won</displayName>
+				<displayName count="other">Suðurkorea won</displayName>
+				<symbol draft="contributed">₩</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
+			</currency>
+			<currency type="KWD">
+				<displayName>Kuvait dinar</displayName>
+				<displayName count="one">Kuvait dinar</displayName>
+				<displayName count="other">Kuvait dinar</displayName>
+				<symbol draft="contributed">KWD</symbol>
+			</currency>
+			<currency type="KYD">
+				<displayName>Caymanoyggjar dollari</displayName>
+				<displayName count="one">Caymanoyggjar dollari</displayName>
+				<displayName count="other">Caymanoyggjar dollarar</displayName>
+				<symbol draft="contributed">KYD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="KZT">
+				<displayName>Kasakstan tenge</displayName>
+				<displayName count="one">Kasakstan tenge</displayName>
+				<displayName count="other">Kasakstan tenge</displayName>
+				<symbol draft="contributed">KZT</symbol>
+				<symbol alt="narrow" draft="contributed">₸</symbol>
+			</currency>
+			<currency type="LAK">
+				<displayName>Laos kip</displayName>
+				<displayName count="one">Laos kip</displayName>
+				<displayName count="other">Laos kip</displayName>
+				<symbol draft="contributed">LAK</symbol>
+				<symbol alt="narrow" draft="contributed">₭</symbol>
+			</currency>
+			<currency type="LBP">
+				<displayName>Libanon pund</displayName>
+				<displayName count="one">Libanon pund</displayName>
+				<displayName count="other">Libanon pund</displayName>
+				<symbol draft="contributed">LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
+			</currency>
+			<currency type="LKR">
+				<displayName>Sri Lanka rupi</displayName>
+				<displayName count="one">Sri Lanka rupi</displayName>
+				<displayName count="other">Sri Lanka rupis</displayName>
+				<symbol draft="contributed">LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="LRD">
+				<displayName>Liberia dollari</displayName>
+				<displayName count="one">Liberia dollari</displayName>
+				<displayName count="other">Liberia dollarar</displayName>
+				<symbol draft="contributed">LRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="LYD">
+				<displayName>Libya dinar</displayName>
+				<displayName count="one">Libya dinar</displayName>
+				<displayName count="other">Libya dinar</displayName>
+				<symbol draft="contributed">LYD</symbol>
+			</currency>
+			<currency type="MAD">
+				<displayName>Marokko dirham</displayName>
+				<displayName count="one">Marokko dirham</displayName>
+				<displayName count="other">Marokko dirham</displayName>
+				<symbol draft="contributed">MAD</symbol>
+			</currency>
+			<currency type="MDL">
+				<displayName>Moldova leu</displayName>
+				<displayName count="one">Moldova leu</displayName>
+				<displayName count="other">Moldova leu</displayName>
+				<symbol draft="contributed">MDL</symbol>
+			</currency>
+			<currency type="MGA">
+				<displayName>Madagaskar ariary</displayName>
+				<displayName count="one">Madagaskar ariary</displayName>
+				<displayName count="other">Madagaskar ariary</displayName>
+				<symbol draft="contributed">MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
+			</currency>
+			<currency type="MKD">
+				<displayName>Makedónia denar</displayName>
+				<displayName count="one">Makedónia denar</displayName>
+				<displayName count="other">Makedónia denar</displayName>
+				<symbol draft="contributed">MKD</symbol>
+			</currency>
+			<currency type="MMK">
+				<displayName>Myanmar (Burma) kyat</displayName>
+				<displayName count="one">Myanmar (Burma) kyat</displayName>
+				<displayName count="other">Myanmar (Burma) kyat</displayName>
+				<symbol draft="contributed">MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
+			</currency>
+			<currency type="MNT">
+				<displayName>Mongolia tugrik</displayName>
+				<displayName count="one">Mongolia tugrik</displayName>
+				<displayName count="other">Mongolia tugrik</displayName>
+				<symbol draft="contributed">MNT</symbol>
+				<symbol alt="narrow" draft="contributed">₮</symbol>
+			</currency>
+			<currency type="MOP">
+				<displayName>Makao pataca</displayName>
+				<displayName count="one">Makao pataca</displayName>
+				<displayName count="other">Makao pataca</displayName>
+				<symbol draft="contributed">MOP</symbol>
+			</currency>
+			<currency type="MRO">
+				<displayName>Móritania ouguiya</displayName>
+				<displayName count="one">Móritania ouguiya</displayName>
+				<displayName count="other">Móritania ouguiya</displayName>
+				<symbol draft="contributed">MRO</symbol>
+			</currency>
+			<currency type="MUR">
+				<displayName>Móritius rupi</displayName>
+				<displayName count="one">Móritius rupi</displayName>
+				<displayName count="other">Móritius rupi</displayName>
+				<symbol draft="contributed">MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="MVR">
+				<displayName>Maldivoyggjar rufiyaa</displayName>
+				<displayName count="one">Maldivoyggjar rufiyaa</displayName>
+				<displayName count="other">Maldivoyggjar rufiyaa</displayName>
+				<symbol draft="contributed">MVR</symbol>
+			</currency>
+			<currency type="MWK">
+				<displayName>Malavi kwacha</displayName>
+				<displayName count="one">Malavi kwacha</displayName>
+				<displayName count="other">Malavi kwacha</displayName>
+				<symbol draft="contributed">MWK</symbol>
+			</currency>
+			<currency type="MXN">
+				<displayName>Meksiko peso</displayName>
+				<displayName count="one">Meksiko peso</displayName>
+				<displayName count="other">Meksiko peso</displayName>
+				<symbol draft="contributed">MX$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="MYR">
+				<displayName>Malaisia ringgit</displayName>
+				<displayName count="one">Malaisia ringgit</displayName>
+				<displayName count="other">Malaisia ringgit</displayName>
+				<symbol draft="contributed">MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
+			</currency>
+			<currency type="MZN">
+				<displayName>Mosambik metical</displayName>
+				<displayName count="one">Mosambik metical</displayName>
+				<displayName count="other">Mosambik metical</displayName>
+				<symbol draft="contributed">MZN</symbol>
+			</currency>
+			<currency type="NAD">
+				<displayName>Namibia dollari</displayName>
+				<displayName count="one">Namibia dollari</displayName>
+				<displayName count="other">Namibia dollarar</displayName>
+				<symbol draft="contributed">NAD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="NGN">
+				<displayName>Nigeria naira</displayName>
+				<displayName count="one">Nigeria naira</displayName>
+				<displayName count="other">Nigeria naira</displayName>
+				<symbol draft="contributed">NGN</symbol>
+				<symbol alt="narrow" draft="contributed">₦</symbol>
+			</currency>
+			<currency type="NIO">
+				<displayName>Nikaragua córdoba</displayName>
+				<displayName count="one">Nikaragua córdoba</displayName>
+				<displayName count="other">Nikaragua córdoba</displayName>
+				<symbol draft="contributed">NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
+			</currency>
+			<currency type="NOK">
+				<displayName>norsk króna</displayName>
+				<displayName count="one">norsk króna</displayName>
+				<displayName count="other">norskar krónur</displayName>
+				<symbol draft="contributed">NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="NPR">
+				<displayName>Nepal rupi</displayName>
+				<displayName count="one">Nepal rupi</displayName>
+				<displayName count="other">Nepal rupis</displayName>
+				<symbol draft="contributed">NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="NZD">
+				<displayName>Nýsæland dollari</displayName>
+				<displayName count="one">Nýsæland dollari</displayName>
+				<displayName count="other">Nýsæland dollarar</displayName>
+				<symbol draft="contributed">NZ$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="OMR">
+				<displayName>Oman rial</displayName>
+				<displayName count="one">Oman rial</displayName>
+				<displayName count="other">Oman rial</displayName>
+				<symbol draft="contributed">OMR</symbol>
+			</currency>
+			<currency type="PAB">
+				<displayName>Panama balboa</displayName>
+				<displayName count="one">Panama balboa</displayName>
+				<displayName count="other">Panama balboa</displayName>
+				<symbol draft="contributed">PAB</symbol>
+			</currency>
+			<currency type="PEN">
+				<displayName>Peru nuevo sol</displayName>
+				<displayName count="one">Peru nuevo sol</displayName>
+				<displayName count="other">Peru nuevo sol</displayName>
+				<symbol draft="contributed">PEN</symbol>
+			</currency>
+			<currency type="PGK">
+				<displayName>Papua Nýguinea kina</displayName>
+				<displayName count="one">Papua Nýguinea kina</displayName>
+				<displayName count="other">Papua Nýguinea kina</displayName>
+				<symbol draft="contributed">PGK</symbol>
+			</currency>
+			<currency type="PHP">
+				<displayName>Filipsoyggjar peso</displayName>
+				<displayName count="one">Filipsoyggjar peso</displayName>
+				<displayName count="other">Filipsoyggjar peso</displayName>
+				<symbol draft="contributed">PHP</symbol>
+				<symbol alt="narrow" draft="contributed">₱</symbol>
+			</currency>
+			<currency type="PKR">
+				<displayName>Pakistan rupi</displayName>
+				<displayName count="one">Pakistan rupi</displayName>
+				<displayName count="other">Pakistan rupis</displayName>
+				<symbol draft="contributed">PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="PLN">
+				<displayName>Pólland zloty</displayName>
+				<displayName count="one">Pólland zloty</displayName>
+				<displayName count="other">Pólland zloty</displayName>
+				<symbol draft="contributed">PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
+			</currency>
+			<currency type="PYG">
+				<displayName>Paraguai guarani</displayName>
+				<displayName count="one">Paraguai guarani</displayName>
+				<displayName count="other">Paraguai guarani</displayName>
+				<symbol draft="contributed">PYG</symbol>
+				<symbol alt="narrow" draft="contributed">₲</symbol>
+			</currency>
+			<currency type="QAR">
+				<displayName>Katar rial</displayName>
+				<displayName count="one">Katar rial</displayName>
+				<displayName count="other">Katar rial</displayName>
+				<symbol draft="contributed">QAR</symbol>
+			</currency>
+			<currency type="RON">
+				<displayName>Rumenia leu</displayName>
+				<displayName count="one">Rumenia leu</displayName>
+				<displayName count="other">Rumenia leu</displayName>
+				<symbol draft="contributed">RON</symbol>
+			</currency>
+			<currency type="RSD">
+				<displayName>Serbia dinar</displayName>
+				<displayName count="one">Serbia dinar</displayName>
+				<displayName count="other">Serbia dinar</displayName>
+				<symbol draft="contributed">RSD</symbol>
+			</currency>
+			<currency type="RUB">
+				<displayName>Russland ruble</displayName>
+				<displayName count="one">Russland ruble</displayName>
+				<displayName count="other">Russland ruble</displayName>
+				<symbol draft="contributed">RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
+			</currency>
+			<currency type="RWF">
+				<displayName>Ruanda frankur</displayName>
+				<displayName count="one">Ruanda frankur</displayName>
+				<displayName count="other">Ruanda frankar</displayName>
+				<symbol draft="contributed">RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
+			</currency>
+			<currency type="SAR">
+				<displayName>Saudiarabia riyal</displayName>
+				<displayName count="one">Saudiarabia riyal</displayName>
+				<displayName count="other">Saudiarabia riyal</displayName>
+				<symbol draft="contributed">SAR</symbol>
+			</currency>
+			<currency type="SBD">
+				<displayName>Salomonoyggjar dollari</displayName>
+				<displayName count="one">Salomonoyggjar dollari</displayName>
+				<displayName count="other">Salomonoyggjar dollarar</displayName>
+				<symbol draft="contributed">SBD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="SCR">
+				<displayName>Seyskelloyggjar rupi</displayName>
+				<displayName count="one">Seyskelloyggjar rupi</displayName>
+				<displayName count="other">Seyskelloyggjar rupi</displayName>
+				<symbol draft="contributed">SCR</symbol>
+			</currency>
+			<currency type="SDG">
+				<displayName>Sudan pund</displayName>
+				<displayName count="one">Sudan pund</displayName>
+				<displayName count="other">Sudan pund</displayName>
+				<symbol draft="contributed">SDG</symbol>
+			</currency>
+			<currency type="SEK">
+				<displayName>svensk króna</displayName>
+				<displayName count="one">svensk króna</displayName>
+				<displayName count="other">svenskar krónur</displayName>
+				<symbol draft="contributed">SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="SGD">
+				<displayName>Singapor dollari</displayName>
+				<displayName count="one">Singapor dollari</displayName>
+				<displayName count="other">Singapor dollarar</displayName>
+				<symbol draft="contributed">SGD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="SHP">
+				<displayName>St. Helena pund</displayName>
+				<displayName count="one">St. Helena pund</displayName>
+				<displayName count="other">St. Helena pund</displayName>
+				<symbol draft="contributed">SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="SLL">
+				<displayName>Sierra Leona leone</displayName>
+				<displayName count="one">Sierra Leona leone</displayName>
+				<displayName count="other">Sierra Leona leone</displayName>
+				<symbol draft="contributed">SLL</symbol>
+			</currency>
+			<currency type="SOS">
+				<displayName>Somalia skillingur</displayName>
+				<displayName count="one">Somalia skillingur</displayName>
+				<displayName count="other">Somalia skillingar</displayName>
+				<symbol draft="contributed">SOS</symbol>
+			</currency>
+			<currency type="SRD">
+				<displayName>Surinam dollari</displayName>
+				<displayName count="one">Surinam dollari</displayName>
+				<displayName count="other">Surinam dollarar</displayName>
+				<symbol draft="contributed">SRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="SSP">
+				<displayName>Suðursudan pund</displayName>
+				<displayName count="one">Suðursudan pund</displayName>
+				<displayName count="other">Suðursudan pund</displayName>
+				<symbol draft="contributed">SSP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="STD">
+				<displayName>Sao Tome &amp; Prinsipi dobra</displayName>
+				<displayName count="one">Sao Tome &amp; Prinsipi dobra</displayName>
+				<displayName count="other">Sao Tome &amp; Prinsipi dobra</displayName>
+				<symbol draft="contributed">STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
+			</currency>
+			<currency type="SYP">
+				<displayName>Sýria pund</displayName>
+				<displayName count="one">Sýria pund</displayName>
+				<displayName count="other">Sýria pund</displayName>
+				<symbol draft="contributed">SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="SZL">
+				<displayName>Svasiland lilangeni</displayName>
+				<displayName count="one">Svasiland lilangeni</displayName>
+				<displayName count="other">Svasiland lilangeni</displayName>
+				<symbol draft="contributed">SZL</symbol>
+			</currency>
+			<currency type="THB">
+				<displayName>Tailand baht</displayName>
+				<displayName count="one">Tailand baht</displayName>
+				<displayName count="other">Tailand baht</displayName>
+				<symbol draft="contributed">THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
+			</currency>
+			<currency type="TJS">
+				<displayName>Tadsjikistan somoni</displayName>
+				<displayName count="one">Tadsjikistan somoni</displayName>
+				<displayName count="other">Tadsjikistan somoni</displayName>
+				<symbol draft="contributed">TJS</symbol>
+			</currency>
+			<currency type="TMT">
+				<displayName>Turkmenistan manat</displayName>
+				<displayName count="one">Turkmenistan manat</displayName>
+				<displayName count="other">Turkmenistan manat</displayName>
+				<symbol draft="contributed">TMT</symbol>
+			</currency>
+			<currency type="TND">
+				<displayName>Tunesia dinar</displayName>
+				<displayName count="one">Tunesia dinar</displayName>
+				<displayName count="other">Tunesia dinar</displayName>
+				<symbol draft="contributed">TND</symbol>
+			</currency>
+			<currency type="TOP">
+				<displayName>Tonga paʻanga</displayName>
+				<displayName count="one">Tonga paʻanga</displayName>
+				<displayName count="other">Tonga paʻanga</displayName>
+				<symbol draft="contributed">TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
+			</currency>
+			<currency type="TRY">
+				<displayName>Turkaland liri</displayName>
+				<displayName count="one">Turkaland liri</displayName>
+				<displayName count="other">Turkaland lirir</displayName>
+				<symbol draft="contributed">TRY</symbol>
+				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
+			</currency>
+			<currency type="TTD">
+				<displayName>Trinidad &amp; Tobago dollari</displayName>
+				<displayName count="one">Trinidad &amp; Tobago dollari</displayName>
+				<displayName count="other">Trinidad &amp; Tobago dollarar</displayName>
+				<symbol draft="contributed">TTD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="TWD">
+				<displayName>Taivan new dollari</displayName>
+				<displayName count="one">Taivan new dollari</displayName>
+				<displayName count="other">Taivan new dollarar</displayName>
+				<symbol draft="contributed">NT$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="TZS">
+				<displayName>Tansania skillingur</displayName>
+				<displayName count="one">Tansania skillingur</displayName>
+				<displayName count="other">Tansania skillingar</displayName>
+				<symbol draft="contributed">TZS</symbol>
+			</currency>
+			<currency type="UAH">
+				<displayName>Ukraina hryvnia</displayName>
+				<displayName count="one">Ukraina hryvnia</displayName>
+				<displayName count="other">Ukraina hryvnia</displayName>
+				<symbol draft="contributed">UAH</symbol>
+				<symbol alt="narrow" draft="contributed">₴</symbol>
+			</currency>
+			<currency type="UGX">
+				<displayName>Uganda skillingur</displayName>
+				<displayName count="one">Uganda skillingur</displayName>
+				<displayName count="other">Uganda skillingar</displayName>
+				<symbol draft="contributed">UGX</symbol>
+			</currency>
+			<currency type="USD">
+				<displayName>US dollari</displayName>
+				<displayName count="one">US dollari</displayName>
+				<displayName count="other">US dollarar</displayName>
+				<symbol draft="contributed">US$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="UYU">
+				<displayName>Uruguai peso</displayName>
+				<displayName count="one">Uruguai peso</displayName>
+				<displayName count="other">Uruguai peso</displayName>
+				<symbol draft="contributed">UYU</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="UZS">
+				<displayName>Usbekistan som</displayName>
+				<displayName count="one">Usbekistan som</displayName>
+				<displayName count="other">Usbekistan som</displayName>
+				<symbol draft="contributed">UZS</symbol>
+			</currency>
+			<currency type="VEF">
+				<displayName>Venesuela bolívar</displayName>
+				<displayName count="one">Venesuela bolívar</displayName>
+				<displayName count="other">Venesuela bolívar</displayName>
+				<symbol draft="contributed">VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
+			</currency>
+			<currency type="VND">
+				<displayName>Vjetnam dong</displayName>
+				<displayName count="one">Vjetnam dong</displayName>
+				<displayName count="other">Vjetnam dong</displayName>
+				<symbol draft="contributed">₫</symbol>
+				<symbol alt="narrow" draft="contributed">₫</symbol>
+			</currency>
+			<currency type="VUV">
+				<displayName>Vanuatu vatu</displayName>
+				<displayName count="one">Vanuatu vatu</displayName>
+				<displayName count="other">Vanuatu vatu</displayName>
+				<symbol draft="contributed">VUV</symbol>
+			</currency>
+			<currency type="WST">
+				<displayName>Samoa tala</displayName>
+				<displayName count="one">Samoa tala</displayName>
+				<displayName count="other">Samoa tala</displayName>
+				<symbol draft="contributed">WST</symbol>
+			</currency>
+			<currency type="XAF">
+				<displayName>Miðafrika CFA frankur</displayName>
+				<displayName count="one">Miðafrika CFA frankur</displayName>
+				<displayName count="other">Miðafrika CFA frankar</displayName>
+				<symbol draft="contributed">FCFA</symbol>
+			</currency>
+			<currency type="XAG">
+				<displayName draft="contributed">unse sølv</displayName>
+				<displayName count="one" draft="contributed">unse sølv</displayName>
+				<displayName count="other" draft="contributed">unse sølv</displayName>
+			</currency>
+			<currency type="XAU">
+				<displayName draft="contributed">unse guld</displayName>
+				<displayName count="one" draft="contributed">unse guld</displayName>
+				<displayName count="other" draft="contributed">unse guld</displayName>
+			</currency>
+			<currency type="XCD">
+				<displayName>Eystur Karibia dollari</displayName>
+				<displayName count="one">Eystur Karibia dollari</displayName>
+				<displayName count="other">Eystur Karibia dollarar</displayName>
+				<symbol draft="contributed">EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="XOF">
+				<displayName>Vesturafrika CFA frankur</displayName>
+				<displayName count="one">Vesturafrika CFA frankur</displayName>
+				<displayName count="other">Vesturafrika CFA frankar</displayName>
+				<symbol draft="contributed">CFA</symbol>
+			</currency>
+			<currency type="XPD">
+				<displayName draft="contributed">unse palladium</displayName>
+				<displayName count="one" draft="contributed">unse palladium</displayName>
+				<displayName count="other" draft="contributed">unse palladium</displayName>
+			</currency>
+			<currency type="XPF">
+				<displayName>CFP frankur</displayName>
+				<displayName count="one">CFP frankur</displayName>
+				<displayName count="other">CFP frankar</displayName>
+				<symbol draft="contributed">CFPF</symbol>
+			</currency>
+			<currency type="XPT">
+				<displayName draft="contributed">unse platin</displayName>
+				<displayName count="one" draft="contributed">unse platin</displayName>
+				<displayName count="other" draft="contributed">unse platin</displayName>
+			</currency>
+			<currency type="XXX">
+				<displayName>ókent gjaldoyra</displayName>
+				<displayName count="one">(ókent gjaldoyra)</displayName>
+				<displayName count="other">(ókent gjaldoyra)</displayName>
+			</currency>
+			<currency type="YER">
+				<displayName>Jemen rial</displayName>
+				<displayName count="one">Jemen rial</displayName>
+				<displayName count="other">Jemen rial</displayName>
+				<symbol draft="contributed">YER</symbol>
+			</currency>
+			<currency type="ZAR">
+				<displayName>Suðurafrika rand</displayName>
+				<displayName count="one">Suðurafrika rand</displayName>
+				<displayName count="other">Suðurafrika rand</displayName>
+				<symbol draft="contributed">ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
+			</currency>
+			<currency type="ZMW">
+				<displayName>Sambia kwacha</displayName>
+				<displayName count="one">Sambia kwacha</displayName>
+				<displayName count="other">Sambia kwacha</displayName>
+				<symbol draft="contributed">ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
+			</currency>
+		</currencies>
+		<miscPatterns numberSystem="latn">
+			<pattern type="atLeast">{0} ella meira</pattern>
+			<pattern type="range">{0}–{1}</pattern>
+		</miscPatterns>
+	</numbers>
+	<units>
+		<unitLength type="long">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0} á {1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<displayName>G-kreftir</displayName>
+				<unitPattern count="one">{0} G-kraft</unitPattern>
+				<unitPattern count="other">{0} G-kreftir</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-second-squared">
+				<displayName>metrar um sekundi²</displayName>
+				<unitPattern count="one">{0} metur um sekundi²</unitPattern>
+				<unitPattern count="other">{0} metrar um sekundi²</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>snúningar</displayName>
+				<unitPattern count="one">{0} snúningur</unitPattern>
+				<unitPattern count="other">{0} snúningar</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radian</displayName>
+				<unitPattern count="one">{0} radian</unitPattern>
+				<unitPattern count="other">{0} radianir</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>stig</displayName>
+				<unitPattern count="one">{0} stig</unitPattern>
+				<unitPattern count="other">{0} stig</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>bogaminuttir</displayName>
+				<unitPattern count="one">{0} bogaminuttur</unitPattern>
+				<unitPattern count="other">{0} bogaminuttir</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>bogasekundir</displayName>
+				<unitPattern count="one">{0} bogasekund</unitPattern>
+				<unitPattern count="other">{0} bogasekundir</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>ferkilometrar</displayName>
+				<unitPattern count="one">{0} ferkilometur</unitPattern>
+				<unitPattern count="other">{0} ferkilometrar</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>hektarar</displayName>
+				<unitPattern count="one">{0} hektari</unitPattern>
+				<unitPattern count="other">{0} hektarar</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>fermetrar</displayName>
+				<unitPattern count="one">{0} fermetur</unitPattern>
+				<unitPattern count="other">{0} fermetrar</unitPattern>
+				<perUnitPattern>{0} fyri hvønn fermetur</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>fersentimetrar</displayName>
+				<unitPattern count="one">{0} fersentimetur</unitPattern>
+				<unitPattern count="other">{0} fersentimetrar</unitPattern>
+				<perUnitPattern>{0} fyri hvønn fersentimetur</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>fermíl</displayName>
+				<unitPattern count="one">{0} fermíl</unitPattern>
+				<unitPattern count="other">{0} fermíl</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ekrur</displayName>
+				<unitPattern count="one">{0} ekra</unitPattern>
+				<unitPattern count="other">{0} ekrur</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>feryards</displayName>
+				<unitPattern count="one">{0} feryard</unitPattern>
+				<unitPattern count="other">{0} feryards</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>ferføtur</displayName>
+				<unitPattern count="one">{0} ferfót</unitPattern>
+				<unitPattern count="other">{0} ferføtur</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>fertummar</displayName>
+				<unitPattern count="one">{0} fertummi</unitPattern>
+				<unitPattern count="other">{0} fertummar</unitPattern>
+				<perUnitPattern>{0} fyri hvønn fertumma</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="other">{0} karat</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>litrar fyri hvønn kilometrar</displayName>
+				<unitPattern count="one">{0} litur fyri hvønn kilometrar</unitPattern>
+				<unitPattern count="other">{0} litrar fyri hvønn kilometrar</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>litrar fyri hvørjar 100 kilometrar</displayName>
+				<unitPattern count="one">{0} litur fyri hvørjar 100 kilometrar</unitPattern>
+				<unitPattern count="other">{0} litrar fyri hvørjar 100 kilometrar</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>míl fyri hvønn gallon</displayName>
+				<unitPattern count="one">{0} míl fyri hvønn gallon</unitPattern>
+				<unitPattern count="other">{0} míl fyri hvønn gallon</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<displayName>terabýt</displayName>
+				<unitPattern count="one">{0} terabýt</unitPattern>
+				<unitPattern count="other">{0} terabýt</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabit</displayName>
+				<unitPattern count="one">{0} terabit</unitPattern>
+				<unitPattern count="other">{0} terabit</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabýt</displayName>
+				<unitPattern count="one">{0} gigabýt</unitPattern>
+				<unitPattern count="other">{0} gigabýt</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabit</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="other">{0} gigabit</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabýt</displayName>
+				<unitPattern count="one">{0} megabýt</unitPattern>
+				<unitPattern count="other">{0} megabýt</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabit</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="other">{0} megabit</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobýt</displayName>
+				<unitPattern count="one">{0} kilobýt</unitPattern>
+				<unitPattern count="other">{0} kilobýt</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobit</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="other">{0} kilobit</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>být</displayName>
+				<unitPattern count="one">{0} být</unitPattern>
+				<unitPattern count="other">{0} být</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>øldir</displayName>
+				<unitPattern count="one">{0} øld</unitPattern>
+				<unitPattern count="other">{0} øldir</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ár</displayName>
+				<unitPattern count="one">{0} ár</unitPattern>
+				<unitPattern count="other">{0} ár</unitPattern>
+				<perUnitPattern>{0} um ári</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mánaðir</displayName>
+				<unitPattern count="one">{0} mánaður</unitPattern>
+				<unitPattern count="other">{0} mánaðir</unitPattern>
+				<perUnitPattern>{0} um mánan</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>vikur</displayName>
+				<unitPattern count="one">{0} vika</unitPattern>
+				<unitPattern count="other">{0} vikur</unitPattern>
+				<perUnitPattern>{0} um vikuna</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>dagar</displayName>
+				<unitPattern count="one">{0} dagur</unitPattern>
+				<unitPattern count="other">{0} dagar</unitPattern>
+				<perUnitPattern>{0} um dagin</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>tímar</displayName>
+				<unitPattern count="one">{0} tími</unitPattern>
+				<unitPattern count="other">{0} tímar</unitPattern>
+				<perUnitPattern>{0} um tíman</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>minuttir</displayName>
+				<unitPattern count="one">{0} minuttur</unitPattern>
+				<unitPattern count="other">{0} minuttir</unitPattern>
+				<perUnitPattern>{0} um minuttin</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>sekundir</displayName>
+				<unitPattern count="one">{0} sekund</unitPattern>
+				<unitPattern count="other">{0} sekundir</unitPattern>
+				<perUnitPattern>{0} um sekundi</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>millisekundir</displayName>
+				<unitPattern count="one">{0} millisekund</unitPattern>
+				<unitPattern count="other">{0} millisekundir</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>mikrosekundir</displayName>
+				<unitPattern count="one">{0} mikrosekund</unitPattern>
+				<unitPattern count="other">{0} mikrosekundir</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosekundir</displayName>
+				<unitPattern count="one">{0} nanosekund</unitPattern>
+				<unitPattern count="other">{0} nanosekundir</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName>amperur</displayName>
+				<unitPattern count="one">{0} ampera</unitPattern>
+				<unitPattern count="other">{0} amperur</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>milliamperur</displayName>
+				<unitPattern count="one">{0} milliampera</unitPattern>
+				<unitPattern count="other">{0} milliamperur</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<displayName>ohm</displayName>
+				<unitPattern count="one">{0} ohm</unitPattern>
+				<unitPattern count="other">{0} ohm</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>volt</displayName>
+				<unitPattern count="one">{0} volt</unitPattern>
+				<unitPattern count="other">{0} volt</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokaloriur</displayName>
+				<unitPattern count="one">{0} kilokaloria</unitPattern>
+				<unitPattern count="other">{0} kilokaloriur</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>kaloriur</displayName>
+				<unitPattern count="one">{0} kaloria</unitPattern>
+				<unitPattern count="other">{0} kaloriur</unitPattern>
+			</unit>
+			<unit type="energy-foodcalorie">
+				<displayName>kostkaloriur</displayName>
+				<unitPattern count="one">{0} kostkaloria</unitPattern>
+				<unitPattern count="other">{0} kostkaloriur</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>kilojoule</displayName>
+				<unitPattern count="one">{0} kilojoule</unitPattern>
+				<unitPattern count="other">{0} kilojoule</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="one">{0} joule</unitPattern>
+				<unitPattern count="other">{0} joule</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>kilowatttímar</displayName>
+				<unitPattern count="one">{0} kilowatttími</unitPattern>
+				<unitPattern count="other">{0} kilowatttímar</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<displayName>gigahertz</displayName>
+				<unitPattern count="one">{0} gigahertz</unitPattern>
+				<unitPattern count="other">{0} gigahertz</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<displayName>megahertz</displayName>
+				<unitPattern count="one">{0} megahertz</unitPattern>
+				<unitPattern count="other">{0} megahertz</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>kilohertz</displayName>
+				<unitPattern count="one">{0} kilohertz</unitPattern>
+				<unitPattern count="other">{0} kilohertz</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<displayName>hertz</displayName>
+				<unitPattern count="one">{0} hertz</unitPattern>
+				<unitPattern count="other">{0} hertz</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>kilometrar</displayName>
+				<unitPattern count="one">{0} kilometur</unitPattern>
+				<unitPattern count="other">{0} kilometrar</unitPattern>
+				<perUnitPattern>{0} fyri hvønn kilometur</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>metrar</displayName>
+				<unitPattern count="one">{0} metur</unitPattern>
+				<unitPattern count="other">{0} metrar</unitPattern>
+				<perUnitPattern>{0} fyri hvønn metur</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>desimetrar</displayName>
+				<unitPattern count="one">{0} desimetur</unitPattern>
+				<unitPattern count="other">{0} desimetrar</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>sentimetrar</displayName>
+				<unitPattern count="one">{0} sentimetur</unitPattern>
+				<unitPattern count="other">{0} sentimetrar</unitPattern>
+				<perUnitPattern>{0} fyri hvønn sentimetur</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>millimetrar</displayName>
+				<unitPattern count="one">{0} millimetur</unitPattern>
+				<unitPattern count="other">{0} millimetrar</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikrometrar</displayName>
+				<unitPattern count="one">{0} mikrometur</unitPattern>
+				<unitPattern count="other">{0} mikrometrar</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nanometrar</displayName>
+				<unitPattern count="one">{0} nanometur</unitPattern>
+				<unitPattern count="other">{0} nanometrar</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>picometrar</displayName>
+				<unitPattern count="one">{0} picometur</unitPattern>
+				<unitPattern count="other">{0} picometrar</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>míl</displayName>
+				<unitPattern count="one">{0} míl</unitPattern>
+				<unitPattern count="other">{0} míl</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>yards</displayName>
+				<unitPattern count="one">{0} yard</unitPattern>
+				<unitPattern count="other">{0} yards</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>føtur</displayName>
+				<unitPattern count="one">{0} fótur</unitPattern>
+				<unitPattern count="other">{0} føtur</unitPattern>
+				<perUnitPattern>{0}/fót</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>tummar</displayName>
+				<unitPattern count="one">{0} tummi</unitPattern>
+				<unitPattern count="other">{0} tummar</unitPattern>
+				<perUnitPattern>{0} fyri hvønn tumma</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsecs</displayName>
+				<unitPattern count="one">{0} parsec</unitPattern>
+				<unitPattern count="other">{0} parsecs</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ljósár</displayName>
+				<unitPattern count="one">{0} ljósár</unitPattern>
+				<unitPattern count="other">{0} ljósár</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>stjørnufrøðilig eindir</displayName>
+				<unitPattern count="one">{0} stjørnufrøðilig eind</unitPattern>
+				<unitPattern count="other">{0} stjørnufrøðiligar eindir</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>sjómíl</displayName>
+				<unitPattern count="one">{0} sjómíl</unitPattern>
+				<unitPattern count="other">{0} sjómíl</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>skandinaviskt míl</displayName>
+				<unitPattern count="one">{0} skandinaviskt míl</unitPattern>
+				<unitPattern count="other">{0} skandinaviskt míl</unitPattern>
+			</unit>
+			<unit type="light-lux">
+				<displayName>luks</displayName>
+				<unitPattern count="one">{0} luks</unitPattern>
+				<unitPattern count="other">{0} luks</unitPattern>
+			</unit>
+			<unit type="mass-metric-ton">
+				<displayName>tons</displayName>
+				<unitPattern count="one">{0} tons</unitPattern>
+				<unitPattern count="other">{0} tons</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>kilogramm</displayName>
+				<unitPattern count="one">{0} kilogramm</unitPattern>
+				<unitPattern count="other">{0} kilogramm</unitPattern>
+				<perUnitPattern>{0} fyri hvørt kilogramm</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gramm</displayName>
+				<unitPattern count="one">{0} gramm</unitPattern>
+				<unitPattern count="other">{0} gramm</unitPattern>
+				<perUnitPattern>{0} fyri hvørt gramm</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>milligramm</displayName>
+				<unitPattern count="one">{0} milligramm</unitPattern>
+				<unitPattern count="other">{0} milligramm</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>mikrogramm</displayName>
+				<unitPattern count="one">{0} mikrogramm</unitPattern>
+				<unitPattern count="other">{0} mikrogramm</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>stutt tons</displayName>
+				<unitPattern count="one">{0} stutt tons</unitPattern>
+				<unitPattern count="other">{0} stutt tons</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>pund</displayName>
+				<unitPattern count="one">{0} pund</unitPattern>
+				<unitPattern count="other">{0} pund</unitPattern>
+				<perUnitPattern>{0} fyri hvørt pund</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>unsur</displayName>
+				<unitPattern count="one">{0} unsa</unitPattern>
+				<unitPattern count="other">{0} unsur</unitPattern>
+				<perUnitPattern>{0} fyri hvørja unsu</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>troy unsur</displayName>
+				<unitPattern count="one">{0} troy unsa</unitPattern>
+				<unitPattern count="other">{0} troy unsur</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="other">{0} karat</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<displayName>gigawatt</displayName>
+				<unitPattern count="one">{0} gigawatt</unitPattern>
+				<unitPattern count="other">{0} gigawatt</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>megawatt</displayName>
+				<unitPattern count="one">{0} megawatt</unitPattern>
+				<unitPattern count="other">{0} megawatt</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>kilowatt</displayName>
+				<unitPattern count="one">{0} kilowatt</unitPattern>
+				<unitPattern count="other">{0} kilowatt</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>watt</displayName>
+				<unitPattern count="one">{0} watt</unitPattern>
+				<unitPattern count="other">{0} watt</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>milliwatt</displayName>
+				<unitPattern count="one">{0} milliwatt</unitPattern>
+				<unitPattern count="other">{0} milliwatt</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hestakreftur</displayName>
+				<unitPattern count="one">{0} hestakraft</unitPattern>
+				<unitPattern count="other">{0} hestakreftur</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<displayName>hektopascal</displayName>
+				<unitPattern count="one">{0} hektopascal</unitPattern>
+				<unitPattern count="other">{0} hektopascal</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>millimetrar av kviksilvur</displayName>
+				<unitPattern count="one">{0} millimetur av kviksilvur</unitPattern>
+				<unitPattern count="other">{0} millimetrar av kviksilvur</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>psi</displayName>
+				<unitPattern count="one">{0} psi</unitPattern>
+				<unitPattern count="other">{0} psi</unitPattern>
+			</unit>
+			<unit type="pressure-inch-hg">
+				<displayName>tummar av kviksilvur</displayName>
+				<unitPattern count="one">{0} tummi av kviksilvur</unitPattern>
+				<unitPattern count="other">{0} tummar av kviksilvur</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>millibar</displayName>
+				<unitPattern count="one">{0} millibar</unitPattern>
+				<unitPattern count="other">{0} millibar</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>kilometrar um tíman</displayName>
+				<unitPattern count="one">{0} kilometur um tíman</unitPattern>
+				<unitPattern count="other">{0} kilometrar um tíman</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>metrar um sekundi</displayName>
+				<unitPattern count="one">{0} metur um sekundi</unitPattern>
+				<unitPattern count="other">{0} metrar um sekundi</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>míl um tíman</displayName>
+				<unitPattern count="one">{0} míl/t</unitPattern>
+				<unitPattern count="other">{0} míl/t</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>sjómíl um tíman</displayName>
+				<unitPattern count="one">{0} sjómíl um tíman</unitPattern>
+				<unitPattern count="other">{0} sjómíl um tíman</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>stig Celsius</displayName>
+				<unitPattern count="one">{0} stig Celsius</unitPattern>
+				<unitPattern count="other">{0} stig Celsius</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName>stig Fahrenheit</displayName>
+				<unitPattern count="one">{0} stig Fahrenheit</unitPattern>
+				<unitPattern count="other">{0} stig Fahrenheit</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>Kelvin</displayName>
+				<unitPattern count="one">{0} Kelvin</unitPattern>
+				<unitPattern count="other">{0} Kelvin</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>kubikkkilometrar</displayName>
+				<unitPattern count="one">{0} kubikkkilometur</unitPattern>
+				<unitPattern count="other">{0} kubikkkilometrar</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>kubikkmetrar</displayName>
+				<unitPattern count="one">{0} kubikkmetur</unitPattern>
+				<unitPattern count="other">{0} kubikkmetrar</unitPattern>
+				<perUnitPattern>{0} fyri hvønn kubikkmetur</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>kubikksentimetrar</displayName>
+				<unitPattern count="one">{0} kubikksentimetur</unitPattern>
+				<unitPattern count="other">{0} kubikksentimetrar</unitPattern>
+				<perUnitPattern>{0} fyri hvønn kubikksentimetur</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>kubikkmíl</displayName>
+				<unitPattern count="one">{0} kubikkmíl</unitPattern>
+				<unitPattern count="other">{0} kubikkmíl</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>kubikkyards</displayName>
+				<unitPattern count="one">{0} kubikkyard</unitPattern>
+				<unitPattern count="other">{0} kubikkyards</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>kubikkføtur</displayName>
+				<unitPattern count="one">{0} kubikkfótur</unitPattern>
+				<unitPattern count="other">{0} kubikkføtur</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>kubikktummar</displayName>
+				<unitPattern count="one">{0} kubikktummi</unitPattern>
+				<unitPattern count="other">{0} kubikktummar</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>megalitrar</displayName>
+				<unitPattern count="one">{0} megalitur</unitPattern>
+				<unitPattern count="other">{0} megalitrar</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hektolitrar</displayName>
+				<unitPattern count="one">{0} hektolitur</unitPattern>
+				<unitPattern count="other">{0} hektolitrar</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>litrar</displayName>
+				<unitPattern count="one">{0} litur</unitPattern>
+				<unitPattern count="other">{0} litrar</unitPattern>
+				<perUnitPattern>{0} fyri hvønn litur</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>desilitrar</displayName>
+				<unitPattern count="one">{0} desilitur</unitPattern>
+				<unitPattern count="other">{0} desilitrar</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>sentilitrar</displayName>
+				<unitPattern count="one">{0} sentilitur</unitPattern>
+				<unitPattern count="other">{0} sentilitrar</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>millilitrar</displayName>
+				<unitPattern count="one">{0} millilitur</unitPattern>
+				<unitPattern count="other">{0} millilitrar</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>metralag pints</displayName>
+				<unitPattern count="one">{0} metralag pint</unitPattern>
+				<unitPattern count="other">{0} metralag pints</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>metralag koppar</displayName>
+				<unitPattern count="one">{0} metralag koppur</unitPattern>
+				<unitPattern count="other">{0} metralag koppar</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ekraføtur</displayName>
+				<unitPattern count="one">{0} ekrafótur</unitPattern>
+				<unitPattern count="other">{0} ekraføtur</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gallons</displayName>
+				<unitPattern count="one">{0} gallon</unitPattern>
+				<unitPattern count="other">{0} gallons</unitPattern>
+				<perUnitPattern>{0} fyri hvønn gallon</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>quarts</displayName>
+				<unitPattern count="one">{0} quart</unitPattern>
+				<unitPattern count="other">{0} quarts</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>pints</displayName>
+				<unitPattern count="one">{0} pint</unitPattern>
+				<unitPattern count="other">{0} pints</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>koppar</displayName>
+				<unitPattern count="one">{0} koppur</unitPattern>
+				<unitPattern count="other">{0} koppar</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>flótandi unsur</displayName>
+				<unitPattern count="one">{0} flótandi unsa</unitPattern>
+				<unitPattern count="other">{0} flótandi unsur</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>súpiskeiðir</displayName>
+				<unitPattern count="one">{0} súpiskeið</unitPattern>
+				<unitPattern count="other">{0} súpiskeiðir</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>teskeiðir</displayName>
+				<unitPattern count="one">{0} teskeið</unitPattern>
+				<unitPattern count="other">{0} teskeiðir</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}V</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<unitLength type="short">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<displayName>G</displayName>
+				<unitPattern count="one">{0} G</unitPattern>
+				<unitPattern count="other">{0} G</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-second-squared">
+				<displayName>m/s²</displayName>
+				<unitPattern count="one">{0} m/s²</unitPattern>
+				<unitPattern count="other">{0} m/s²</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>snúningar</displayName>
+				<unitPattern count="one">{0} snú.</unitPattern>
+				<unitPattern count="other">{0} snú.</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>stig</displayName>
+				<unitPattern count="one">{0} stig</unitPattern>
+				<unitPattern count="other">{0} stig</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>bogamin.</displayName>
+				<unitPattern count="one">{0} bogamin.</unitPattern>
+				<unitPattern count="other">{0} bogamin.</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>bogasek.</displayName>
+				<unitPattern count="one">{0} bogasek.</unitPattern>
+				<unitPattern count="other">{0} bogasek.</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>ha</displayName>
+				<unitPattern count="one">{0} ha</unitPattern>
+				<unitPattern count="other">{0} ha</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>cm²</displayName>
+				<unitPattern count="one">{0} cm²</unitPattern>
+				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>míl²</displayName>
+				<unitPattern count="one">{0} míl²</unitPattern>
+				<unitPattern count="other">{0} míl²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ekrur</displayName>
+				<unitPattern count="one">{0} ekra</unitPattern>
+				<unitPattern count="other">{0} ekrur</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yards²</displayName>
+				<unitPattern count="one">{0} yard²</unitPattern>
+				<unitPattern count="other">{0} yards²</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>føtur²</displayName>
+				<unitPattern count="one">{0} fót²</unitPattern>
+				<unitPattern count="other">{0} føtur²</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>tum.²</displayName>
+				<unitPattern count="one">{0} tum.²</unitPattern>
+				<unitPattern count="other">{0} tum.²</unitPattern>
+				<perUnitPattern>{0}/tum.²</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="other">{0} karat</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>l/km</displayName>
+				<unitPattern count="one">{0} l/km</unitPattern>
+				<unitPattern count="other">{0} l/km</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>míl/gallon</displayName>
+				<unitPattern count="one">{0} míl/gallon</unitPattern>
+				<unitPattern count="other">{0} míl/gallon</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<displayName>TB</displayName>
+				<unitPattern count="one">{0} TB</unitPattern>
+				<unitPattern count="other">{0} TB</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>KB</displayName>
+				<unitPattern count="one">{0} KB</unitPattern>
+				<unitPattern count="other">{0} KB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>být</displayName>
+				<unitPattern count="one">{0} být</unitPattern>
+				<unitPattern count="other">{0} být</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>ø.</displayName>
+				<unitPattern count="one">{0} ø.</unitPattern>
+				<unitPattern count="other">{0} ø.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ár</displayName>
+				<unitPattern count="one">{0} ár</unitPattern>
+				<unitPattern count="other">{0} ár</unitPattern>
+				<perUnitPattern>{0}/ár</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mán.</displayName>
+				<unitPattern count="one">{0} mán.</unitPattern>
+				<unitPattern count="other">{0} mán.</unitPattern>
+				<perUnitPattern>{0}/m.</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>vikur</displayName>
+				<unitPattern count="one">{0} vi.</unitPattern>
+				<unitPattern count="other">{0} vi.</unitPattern>
+				<perUnitPattern>{0}/vi.</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>dagar</displayName>
+				<unitPattern count="one">{0} d.</unitPattern>
+				<unitPattern count="other">{0} d.</unitPattern>
+				<perUnitPattern>{0}/d.</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>tímar</displayName>
+				<unitPattern count="one">{0} t.</unitPattern>
+				<unitPattern count="other">{0} t.</unitPattern>
+				<perUnitPattern>{0}/t.</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>min.</displayName>
+				<unitPattern count="one">{0} min.</unitPattern>
+				<unitPattern count="other">{0} min.</unitPattern>
+				<perUnitPattern>{0}/min.</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>sek.</displayName>
+				<unitPattern count="one">{0} sek.</unitPattern>
+				<unitPattern count="other">{0} sek.</unitPattern>
+				<perUnitPattern>{0}/sek.</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>millisek.</displayName>
+				<unitPattern count="one">{0} ms.</unitPattern>
+				<unitPattern count="other">{0} ms.</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>mikrosek.</displayName>
+				<unitPattern count="one">{0} μs.</unitPattern>
+				<unitPattern count="other">{0} μs.</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName>amperur</displayName>
+				<unitPattern count="one">{0} A</unitPattern>
+				<unitPattern count="other">{0} A</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>milliamperur</displayName>
+				<unitPattern count="one">{0} mA</unitPattern>
+				<unitPattern count="other">{0} mA</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<displayName>ohm</displayName>
+				<unitPattern count="one">{0} Ω</unitPattern>
+				<unitPattern count="other">{0} Ω</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>volt</displayName>
+				<unitPattern count="one">{0} V</unitPattern>
+				<unitPattern count="other">{0} V</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>kal.</displayName>
+				<unitPattern count="one">{0} kal.</unitPattern>
+				<unitPattern count="other">{0} kal.</unitPattern>
+			</unit>
+			<unit type="energy-foodcalorie">
+				<displayName>kostkaloriur</displayName>
+				<unitPattern count="one">{0} kostkaloria</unitPattern>
+				<unitPattern count="other">{0} kostkaloriur</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>kilojoule</displayName>
+				<unitPattern count="one">{0} kJ</unitPattern>
+				<unitPattern count="other">{0} kJ</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>kWh</displayName>
+				<unitPattern count="one">{0} kWh</unitPattern>
+				<unitPattern count="other">{0} kWh</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<displayName>GHz</displayName>
+				<unitPattern count="one">{0} GHz</unitPattern>
+				<unitPattern count="other">{0} GHz</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>kHz</displayName>
+				<unitPattern count="one">{0} kHz</unitPattern>
+				<unitPattern count="other">{0} kHz</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>dm</displayName>
+				<unitPattern count="one">{0} dm</unitPattern>
+				<unitPattern count="other">{0} dm</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>mm</displayName>
+				<unitPattern count="one">{0} mm</unitPattern>
+				<unitPattern count="other">{0} mm</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nm</displayName>
+				<unitPattern count="one">{0} nm</unitPattern>
+				<unitPattern count="other">{0} nm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>pm</displayName>
+				<unitPattern count="one">{0} pm</unitPattern>
+				<unitPattern count="other">{0} pm</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>míl</displayName>
+				<unitPattern count="one">{0} míl</unitPattern>
+				<unitPattern count="other">{0} míl</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>yd</displayName>
+				<unitPattern count="one">{0} yd</unitPattern>
+				<unitPattern count="other">{0} yd</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>føtur</displayName>
+				<unitPattern count="one">{0} fótur</unitPattern>
+				<unitPattern count="other">{0} føtur</unitPattern>
+				<perUnitPattern>{0}/fót</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>tum.</displayName>
+				<unitPattern count="one">{0} tum.</unitPattern>
+				<unitPattern count="other">{0} tum.</unitPattern>
+				<perUnitPattern>{0}/tum.</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ljósár</displayName>
+				<unitPattern count="one">{0} ljósár</unitPattern>
+				<unitPattern count="other">{0} ljósár</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>sm</displayName>
+				<unitPattern count="one">{0} sm</unitPattern>
+				<unitPattern count="other">{0} sm</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>sk. míl</displayName>
+				<unitPattern count="one">{0} sk. míl</unitPattern>
+				<unitPattern count="other">{0} sk. míl</unitPattern>
+			</unit>
+			<unit type="light-lux">
+				<displayName>luks</displayName>
+				<unitPattern count="one">{0} lx</unitPattern>
+				<unitPattern count="other">{0} lx</unitPattern>
+			</unit>
+			<unit type="mass-metric-ton">
+				<displayName>t</displayName>
+				<unitPattern count="one">{0} t</unitPattern>
+				<unitPattern count="other">{0} t</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gramm</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>mg</displayName>
+				<unitPattern count="one">{0} mg</unitPattern>
+				<unitPattern count="other">{0} mg</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>stutt t</displayName>
+				<unitPattern count="one">{0} stutt t</unitPattern>
+				<unitPattern count="other">{0} stutt t</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>pund</displayName>
+				<unitPattern count="one">{0} pund</unitPattern>
+				<unitPattern count="other">{0} pund</unitPattern>
+				<perUnitPattern>{0}/pund</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>unsur</displayName>
+				<unitPattern count="one">{0} unsa</unitPattern>
+				<unitPattern count="other">{0} unsur</unitPattern>
+				<perUnitPattern>{0}/unsu</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>troy unsur</displayName>
+				<unitPattern count="one">{0} troy unsa</unitPattern>
+				<unitPattern count="other">{0} troy unsur</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<displayName>gigawatt</displayName>
+				<unitPattern count="one">{0} GW</unitPattern>
+				<unitPattern count="other">{0} GW</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>MW</displayName>
+				<unitPattern count="one">{0} MW</unitPattern>
+				<unitPattern count="other">{0} MW</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>watt</displayName>
+				<unitPattern count="one">{0} W</unitPattern>
+				<unitPattern count="other">{0} W</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hestakreftur</displayName>
+				<unitPattern count="one">{0} hk</unitPattern>
+				<unitPattern count="other">{0} hk</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<displayName>hPa</displayName>
+				<unitPattern count="one">{0} hPa</unitPattern>
+				<unitPattern count="other">{0} hPa</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>mmHg</displayName>
+				<unitPattern count="one">{0} mmHg</unitPattern>
+				<unitPattern count="other">{0} mmHg</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>psi</displayName>
+				<unitPattern count="one">{0} psi</unitPattern>
+				<unitPattern count="other">{0} psi</unitPattern>
+			</unit>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mb</displayName>
+				<unitPattern count="one">{0} mb</unitPattern>
+				<unitPattern count="other">{0} mb</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>km/t</displayName>
+				<unitPattern count="one">{0} km/t</unitPattern>
+				<unitPattern count="other">{0} km/t</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>m/s</displayName>
+				<unitPattern count="one">{0} m/s</unitPattern>
+				<unitPattern count="other">{0} m/s</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>míl/t</displayName>
+				<unitPattern count="one">{0} míl/t</unitPattern>
+				<unitPattern count="other">{0} míl/t</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>smíl/t</displayName>
+				<unitPattern count="one">{0} smíl/t</unitPattern>
+				<unitPattern count="other">{0} smíl/t</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>°C</displayName>
+				<unitPattern count="one">{0}°C</unitPattern>
+				<unitPattern count="other">{0}°C</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName>°F</displayName>
+				<unitPattern count="one">{0}°F</unitPattern>
+				<unitPattern count="other">{0}°F</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>K</displayName>
+				<unitPattern count="one">{0} K</unitPattern>
+				<unitPattern count="other">{0} K</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>km³</displayName>
+				<unitPattern count="one">{0} km³</unitPattern>
+				<unitPattern count="other">{0} km³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>m³</displayName>
+				<unitPattern count="one">{0} m³</unitPattern>
+				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>míl³</displayName>
+				<unitPattern count="one">{0} míl³</unitPattern>
+				<unitPattern count="other">{0} míl³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>yards³</displayName>
+				<unitPattern count="one">{0} yard³</unitPattern>
+				<unitPattern count="other">{0} yards³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>føtur³</displayName>
+				<unitPattern count="one">{0} fótur³</unitPattern>
+				<unitPattern count="other">{0} føtur³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>tum.³</displayName>
+				<unitPattern count="one">{0} tum.³</unitPattern>
+				<unitPattern count="other">{0} tum.³</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hl</displayName>
+				<unitPattern count="one">{0} hl</unitPattern>
+				<unitPattern count="other">{0} hl</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>l</displayName>
+				<unitPattern count="one">{0} l</unitPattern>
+				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>ml</displayName>
+				<unitPattern count="one">{0} ml</unitPattern>
+				<unitPattern count="other">{0} ml</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>metralag pints</displayName>
+				<unitPattern count="one">{0} metralag pint</unitPattern>
+				<unitPattern count="other">{0} metralag pints</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>metralag koppar</displayName>
+				<unitPattern count="one">{0} metralag koppur</unitPattern>
+				<unitPattern count="other">{0} metralag koppar</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ekraføtur</displayName>
+				<unitPattern count="one">{0} ekrafótur</unitPattern>
+				<unitPattern count="other">{0} ekraføtur</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gallons</displayName>
+				<unitPattern count="one">{0} gallon</unitPattern>
+				<unitPattern count="other">{0} gallons</unitPattern>
+				<perUnitPattern>{0}/gallon</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>quarts</displayName>
+				<unitPattern count="one">{0} quart</unitPattern>
+				<unitPattern count="other">{0} quarts</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>pints</displayName>
+				<unitPattern count="one">{0} pint</unitPattern>
+				<unitPattern count="other">{0} pints</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>koppar</displayName>
+				<unitPattern count="one">{0} koppur</unitPattern>
+				<unitPattern count="other">{0} koppar</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>flótandi unsur</displayName>
+				<unitPattern count="one">{0} flótandi unsa</unitPattern>
+				<unitPattern count="other">{0} flótandi unsur</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>súpisk.</displayName>
+				<unitPattern count="one">{0} súpisk.</unitPattern>
+				<unitPattern count="other">{0} súpisk.</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>tesk.</displayName>
+				<unitPattern count="one">{0} tesk.</unitPattern>
+				<unitPattern count="other">{0} tesk.</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}V</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<unitLength type="narrow">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<unitPattern count="one" draft="contributed">{0}G</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}G</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<unitPattern count="one" draft="contributed">{0}′</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}′</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<unitPattern count="one" draft="contributed">{0}″</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one" draft="contributed">{0}km²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}km²</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<unitPattern count="one" draft="contributed">{0}ha</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}ha</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<unitPattern count="one" draft="contributed">{0}m²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}m²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100km</displayName>
+				<unitPattern count="one">{0}l/100km</unitPattern>
+				<unitPattern count="other">{0}l/100km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ár</displayName>
+				<unitPattern count="one">{0}ár</unitPattern>
+				<unitPattern count="other">{0}ár</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>m.</displayName>
+				<unitPattern count="one">{0}m.</unitPattern>
+				<unitPattern count="other">{0}m.</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>v.</displayName>
+				<unitPattern count="one">{0}v.</unitPattern>
+				<unitPattern count="other">{0}v.</unitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>d.</displayName>
+				<unitPattern count="one">{0}d.</unitPattern>
+				<unitPattern count="other">{0}d.</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/d</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>t.</displayName>
+				<unitPattern count="one">{0}t.</unitPattern>
+				<unitPattern count="other">{0}t.</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/t.</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>m.</displayName>
+				<unitPattern count="one">{0}m.</unitPattern>
+				<unitPattern count="other">{0}m.</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/min</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>s.</displayName>
+				<unitPattern count="one">{0}s.</unitPattern>
+				<unitPattern count="other">{0}s.</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/s</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>ms.</displayName>
+				<unitPattern count="one">{0}ms.</unitPattern>
+				<unitPattern count="other">{0}ms.</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName draft="unconfirmed">ns</displayName>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0}km</unitPattern>
+				<unitPattern count="other">{0}km</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0}m</unitPattern>
+				<unitPattern count="other">{0}m</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0}cm</unitPattern>
+				<unitPattern count="other">{0}cm</unitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>mm</displayName>
+				<unitPattern count="one">{0}mm</unitPattern>
+				<unitPattern count="other">{0}mm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<unitPattern count="one" draft="contributed">{0}pm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}pm</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0}kg</unitPattern>
+				<unitPattern count="other">{0}kg</unitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0}g</unitPattern>
+				<unitPattern count="other">{0}g</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<unitPattern count="one" draft="contributed">{0}kW</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}kW</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<unitPattern count="one" draft="contributed">{0}W</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}W</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<unitPattern count="one" draft="contributed">{0}hPa</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}hPa</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<unitPattern count="one" draft="contributed">{0}mbar</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}mbar</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>km/t</displayName>
+				<unitPattern count="one">{0}km/t</unitPattern>
+				<unitPattern count="other">{0}km/t</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<unitPattern count="one" draft="contributed">{0}m/s</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}m/s</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<unitPattern count="one" draft="contributed">{0}°F</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°F</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<unitPattern count="one" draft="contributed">{0}km³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}km³</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>l</displayName>
+				<unitPattern count="one">{0}l</unitPattern>
+				<unitPattern count="other">{0}l</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}V</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<durationUnit type="hm">
+			<durationUnitPattern>h:mm</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="hms">
+			<durationUnitPattern>h:mm:ss</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="ms">
+			<durationUnitPattern>m:ss</durationUnitPattern>
+		</durationUnit>
+	</units>
+	<listPatterns>
+		<listPattern>
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0} og {1}</listPatternPart>
+			<listPatternPart type="2">{0} og {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0} og {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-narrow">
+			<listPatternPart type="start">{0} {1}</listPatternPart>
+			<listPatternPart type="middle">{0} {1}</listPatternPart>
+			<listPatternPart type="end">{0} {1}</listPatternPart>
+			<listPatternPart type="2">{0} {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-short">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
+		</listPattern>
+	</listPatterns>
+	<posix>
+		<messages>
+			<yesstr>já:j</yesstr>
+			<nostr>nei:n</nostr>
+		</messages>
+	</posix>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fo_DK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fo_DK.xml
new file mode 100644
index 00000000000..20565205d5a
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fo_DK.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="fo"/>
+		<territory type="DK"/>
+	</identity>
+	<numbers>
+		<currencies>
+			<currency type="DKK">
+				<symbol>kr.</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fo_FO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fo_FO.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fo_FO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fo_FO.xml
index 24d42393837..b49fd7bb577 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fo_FO.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fo_FO.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fo"/>
 		<territory type="FO"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr.xml
similarity index 80%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr.xml
index a2d4eb05266..1ceae8588a8 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11346 $"/>
-		<generation date="$Date: 2015-03-05 00:47:17 -0600 (Thu, 05 Mar 2015) $"/>
+		<version number="$Revision: 12379 $"/>
 		<language type="fr"/>
 	</identity>
 	<localeDisplayNames>
@@ -42,7 +41,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ar">arabe</language>
 			<language type="ar_001">arabe standard moderne</language>
 			<language type="arc">araméen</language>
-			<language type="arn">araukan</language>
+			<language type="arn">mapuche</language>
 			<language type="aro" draft="unconfirmed">araona</language>
 			<language type="arp">arapaho</language>
 			<language type="arq" draft="unconfirmed">arabe algérien</language>
@@ -50,7 +49,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ary" draft="unconfirmed">arabe marocain</language>
 			<language type="arz" draft="unconfirmed">arabe égyptien</language>
 			<language type="as">assamais</language>
-			<language type="asa" draft="contributed">assou</language>
+			<language type="asa">assou</language>
 			<language type="ase" draft="unconfirmed">langue des signes américaine</language>
 			<language type="ast">asturien</language>
 			<language type="av">avar</language>
@@ -59,7 +58,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ay">aymara</language>
 			<language type="az">azéri</language>
 			<language type="az" alt="short">azéri</language>
-			<language type="azb" draft="unconfirmed">azéri méridional</language>
 			<language type="ba">bachkir</language>
 			<language type="bal">baloutchi</language>
 			<language type="ban">balinais</language>
@@ -76,6 +74,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bfd">bafut</language>
 			<language type="bfq" draft="unconfirmed">badaga</language>
 			<language type="bg">bulgare</language>
+			<language type="bgn">baloutchi occidental</language>
 			<language type="bho">bhojpuri</language>
 			<language type="bi">bichelamar</language>
 			<language type="bik">bikol</language>
@@ -199,7 +198,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="fy">frison occidental</language>
 			<language type="ga">irlandais</language>
 			<language type="gaa">ga</language>
-			<language type="gag" draft="contributed">gagaouze</language>
+			<language type="gag">gagaouze</language>
 			<language type="gan" draft="unconfirmed">gan</language>
 			<language type="gay">gayo</language>
 			<language type="gba">gbaya</language>
@@ -239,7 +238,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="hr">croate</language>
 			<language type="hsb">haut-sorabe</language>
 			<language type="hsn" draft="unconfirmed">xiang</language>
-			<language type="ht">haïtien</language>
+			<language type="ht">créole haïtien</language>
 			<language type="hu">hongrois</language>
 			<language type="hup">hupa</language>
 			<language type="hy">arménien</language>
@@ -260,7 +259,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="iu">inuktitut</language>
 			<language type="izh" draft="unconfirmed">ingrien</language>
 			<language type="ja">japonais</language>
-			<language type="jam" draft="unconfirmed">créole anglais jamaïcain</language>
+			<language type="jam" draft="unconfirmed">créole jamaïcain</language>
 			<language type="jbo">lojban</language>
 			<language type="jgo">ngomba</language>
 			<language type="jmc">machame</language>
@@ -337,6 +336,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">lao</language>
 			<language type="lol">mongo</language>
 			<language type="loz">lozi</language>
+			<language type="lrc">lori du Nord</language>
 			<language type="lt">lituanien</language>
 			<language type="ltg" draft="unconfirmed">latgalien</language>
 			<language type="lu">luba-katanga</language>
@@ -390,7 +390,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="my">birman</language>
 			<language type="mye">myènè</language>
 			<language type="myv">erzya</language>
-			<language type="mzn" draft="unconfirmed">mazandérani</language>
+			<language type="mzn">mazandérani</language>
 			<language type="na">nauruan</language>
 			<language type="nan" draft="unconfirmed">minnan</language>
 			<language type="nap">napolitain</language>
@@ -398,6 +398,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nb">norvégien bokmål</language>
 			<language type="nd">ndébélé du Nord</language>
 			<language type="nds">bas-allemand</language>
+			<language type="nds_NL">bas-saxon néerlandais</language>
 			<language type="ne">népalais</language>
 			<language type="new">newari</language>
 			<language type="ng">ndonga</language>
@@ -492,6 +493,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sco">écossais</language>
 			<language type="sd">sindhi</language>
 			<language type="sdc" draft="unconfirmed">sarde sassarais</language>
+			<language type="sdh">kurde du Sud</language>
 			<language type="se">sami du Nord</language>
 			<language type="see" draft="contributed">seneca</language>
 			<language type="seh">sena</language>
@@ -534,8 +536,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">sumérien</language>
 			<language type="sv">suédois</language>
 			<language type="sw">swahili</language>
+			<language type="sw_CD">swahili du Congo</language>
 			<language type="swb">comorien</language>
-			<language type="swc">swahili du Congo</language>
 			<language type="syc">syriaque classique</language>
 			<language type="syr">syriaque</language>
 			<language type="szl" draft="unconfirmed">silésien</language>
@@ -564,7 +566,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="tog">tonga nyasa</language>
 			<language type="tpi">tok pisin</language>
 			<language type="tr">turc</language>
-			<language type="tru" draft="unconfirmed">touroyo</language>
+			<language type="tru" draft="unconfirmed">turoyo</language>
 			<language type="trv" draft="contributed">taroko</language>
 			<language type="ts">tsonga</language>
 			<language type="tsd" draft="unconfirmed">tsakonien</language>
@@ -603,8 +605,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">walamo</language>
 			<language type="war">waray</language>
 			<language type="was">washo</language>
+			<language type="wbp">warlpiri</language>
 			<language type="wo">wolof</language>
-			<language type="wuu" draft="unconfirmed">chinois wu</language>
+			<language type="wuu" draft="unconfirmed">wu</language>
 			<language type="xal">kalmouk</language>
 			<language type="xh">xhosa</language>
 			<language type="xmf" draft="unconfirmed">mingrélien</language>
@@ -633,6 +636,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</languages>
 		<scripts>
 			<script type="Afak" draft="unconfirmed">afaka</script>
+			<script type="Aghb" draft="unconfirmed">aghbanie</script>
+			<script type="Ahom" draft="unconfirmed">ahom</script>
 			<script type="Arab">arabe</script>
 			<script type="Arab" alt="variant">arabo-persan</script>
 			<script type="Armi">araméen impérial</script>
@@ -665,6 +670,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Egyd">démotique égyptien</script>
 			<script type="Egyh">hiératique égyptien</script>
 			<script type="Egyp">hiéroglyphes égyptiens</script>
+			<script type="Elba" draft="unconfirmed">elbasan</script>
 			<script type="Ethi">éthiopique</script>
 			<script type="Geok">géorgien khoutsouri</script>
 			<script type="Geor">géorgien</script>
@@ -681,9 +687,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Hans" alt="stand-alone">sinogrammes simplifiés</script>
 			<script type="Hant">traditionnel</script>
 			<script type="Hant" alt="stand-alone">sinogrammes traditionnels</script>
+			<script type="Hatr" draft="unconfirmed">hatran</script>
 			<script type="Hebr">hébreu</script>
 			<script type="Hira">hiragana</script>
-			<script type="Hluw" draft="unconfirmed">hiéroglyphes anatoliens</script>
+			<script type="Hluw" draft="unconfirmed">hiéroglyphes hittites</script>
 			<script type="Hmng">pahawh hmong</script>
 			<script type="Hrkt">katakana ou hiragana</script>
 			<script type="Hung">ancien hongrois</script>
@@ -714,6 +721,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Loma" draft="unconfirmed">loma</script>
 			<script type="Lyci">lycien</script>
 			<script type="Lydi">lydien</script>
+			<script type="Mahj" draft="unconfirmed">mahajani</script>
 			<script type="Mand">mandéen</script>
 			<script type="Mani">manichéen</script>
 			<script type="Maya">hiéroglyphes mayas</script>
@@ -721,10 +729,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Merc" draft="unconfirmed">méroïtique cursif</script>
 			<script type="Mero">méroïtique</script>
 			<script type="Mlym">malayalam</script>
+			<script type="Modi" draft="unconfirmed">modi</script>
 			<script type="Mong">mongol</script>
 			<script type="Moon">moon</script>
 			<script type="Mroo" draft="unconfirmed">mro</script>
 			<script type="Mtei">meitei mayek</script>
+			<script type="Mult" draft="unconfirmed">multani</script>
 			<script type="Mymr">birman</script>
 			<script type="Narb" draft="unconfirmed">nord-arabique</script>
 			<script type="Nbat" draft="unconfirmed">nabatéen</script>
@@ -736,7 +746,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Orkh">orkhon</script>
 			<script type="Orya">oriya</script>
 			<script type="Osma">osmanais</script>
-			<script type="Palm" draft="unconfirmed">palmyrénien</script>
+			<script type="Palm" draft="unconfirmed">palmyrène</script>
+			<script type="Pauc" draft="unconfirmed">pau-cin-hau</script>
 			<script type="Perm">ancien permien</script>
 			<script type="Phag">phags pa</script>
 			<script type="Phli">pehlevi des inscriptions</script>
@@ -745,6 +756,54 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Phnx">phénicien</script>
 			<script type="Plrd">phonétique de Pollard</script>
 			<script type="Prti">parthe des inscriptions</script>
+			<script type="Qaaa" draft="unconfirmed">utilisation privée (Qaaa)</script>
+			<script type="Qaab" draft="unconfirmed">utilisation privée (Qaab)</script>
+			<script type="Qaac" draft="unconfirmed">utilisation privée (Qaac)</script>
+			<script type="Qaad" draft="unconfirmed">utilisation privée (Qaad)</script>
+			<script type="Qaae" draft="unconfirmed">utilisation privée (Qaae)</script>
+			<script type="Qaaf" draft="unconfirmed">utilisation privée (Qaaf)</script>
+			<script type="Qaag" draft="unconfirmed">utilisation privée (Qaag)</script>
+			<script type="Qaah" draft="unconfirmed">utilisation privée (Qaah)</script>
+			<script type="Qaak" draft="unconfirmed">utilisation privée (Qaak)</script>
+			<script type="Qaal" draft="unconfirmed">utilisation privée (Qaal)</script>
+			<script type="Qaam" draft="unconfirmed">utilisation privée (Qaam)</script>
+			<script type="Qaan" draft="unconfirmed">utilisation privée (Qaan)</script>
+			<script type="Qaao" draft="unconfirmed">utilisation privée (Qaao)</script>
+			<script type="Qaap" draft="unconfirmed">utilisation privée (Qaap)</script>
+			<script type="Qaaq" draft="unconfirmed">utilisation privée (Qaaq)</script>
+			<script type="Qaar" draft="unconfirmed">utilisation privée (Qaar)</script>
+			<script type="Qaas" draft="unconfirmed">utilisation privée (Qaas)</script>
+			<script type="Qaat" draft="unconfirmed">utilisation privée (Qaat)</script>
+			<script type="Qaau" draft="unconfirmed">utilisation privée (Qaau)</script>
+			<script type="Qaav" draft="unconfirmed">utilisation privée (Qaav)</script>
+			<script type="Qaaw" draft="unconfirmed">utilisation privée (Qaaw)</script>
+			<script type="Qaax" draft="unconfirmed">utilisation privée (Qaax)</script>
+			<script type="Qaay" draft="unconfirmed">utilisation privée (Qaay)</script>
+			<script type="Qaaz" draft="unconfirmed">utilisation privée (Qaaz)</script>
+			<script type="Qaba" draft="unconfirmed">utilisation privée (Qaba)</script>
+			<script type="Qabb" draft="unconfirmed">utilisation privée (Qabb)</script>
+			<script type="Qabc" draft="unconfirmed">utilisation privée (Qabc)</script>
+			<script type="Qabd" draft="unconfirmed">utilisation privée (Qabd)</script>
+			<script type="Qabe" draft="unconfirmed">utilisation privée (Qabe)</script>
+			<script type="Qabf" draft="unconfirmed">utilisation privée (Qabf)</script>
+			<script type="Qabg" draft="unconfirmed">utilisation privée (Qabg)</script>
+			<script type="Qabh" draft="unconfirmed">utilisation privée (Qabh)</script>
+			<script type="Qabi" draft="unconfirmed">utilisation privée (Qabi)</script>
+			<script type="Qabj" draft="unconfirmed">utilisation privée (Qabj)</script>
+			<script type="Qabk" draft="unconfirmed">utilisation privée (Qabk)</script>
+			<script type="Qabl" draft="unconfirmed">utilisation privée (Qabl)</script>
+			<script type="Qabm" draft="unconfirmed">utilisation privée (Qabm)</script>
+			<script type="Qabn" draft="unconfirmed">utilisation privée (Qabn)</script>
+			<script type="Qabo" draft="unconfirmed">utilisation privée (Qabo)</script>
+			<script type="Qabp" draft="unconfirmed">utilisation privée (Qabp)</script>
+			<script type="Qabq" draft="unconfirmed">utilisation privée (Qabq)</script>
+			<script type="Qabr" draft="unconfirmed">utilisation privée (Qabr)</script>
+			<script type="Qabs" draft="unconfirmed">utilisation privée (Qabs)</script>
+			<script type="Qabt" draft="unconfirmed">utilisation privée (Qabt)</script>
+			<script type="Qabu" draft="unconfirmed">utilisation privée (Qabu)</script>
+			<script type="Qabv" draft="unconfirmed">utilisation privée (Qabv)</script>
+			<script type="Qabw" draft="unconfirmed">utilisation privée (Qabw)</script>
+			<script type="Qabx" draft="unconfirmed">utilisation privée (Qabx)</script>
 			<script type="Rjng">rejang</script>
 			<script type="Roro">rongorongo</script>
 			<script type="Runr">runique</script>
@@ -755,7 +814,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Sgnw">écriture des signes</script>
 			<script type="Shaw">shavien</script>
 			<script type="Shrd" draft="unconfirmed">charada</script>
-			<script type="Sind" draft="unconfirmed">sindhî</script>
+			<script type="Sidd" draft="unconfirmed">siddham</script>
+			<script type="Sind" draft="unconfirmed">sindhi</script>
 			<script type="Sinh">cinghalais</script>
 			<script type="Sora" draft="unconfirmed">sora sompeng</script>
 			<script type="Sund">sundanais</script>
@@ -821,7 +881,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="143">Asie centrale</territory>
 			<territory type="145">Asie occidentale</territory>
 			<territory type="150">Europe</territory>
-			<territory type="151">Europe orientale</territory>
+			<territory type="151">Europe de l’Est</territory>
 			<territory type="154">Europe septentrionale</territory>
 			<territory type="155">Europe occidentale</territory>
 			<territory type="419">Amérique latine</territory>
@@ -833,7 +893,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albanie</territory>
 			<territory type="AM">Arménie</territory>
-			<territory type="AN">Antilles néerlandaises</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antarctique</territory>
 			<territory type="AR">Argentine</territory>
@@ -983,7 +1042,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="MK">Macédoine</territory>
 			<territory type="MK" alt="variant">Macédoine (ARYM)</territory>
 			<territory type="ML">Mali</territory>
-			<territory type="MM">Myanmar</territory>
+			<territory type="MM">Myanmar (Birmanie)</territory>
 			<territory type="MN">Mongolie</territory>
 			<territory type="MO">R.A.S. chinoise de Macao</territory>
 			<territory type="MO" alt="short">Macao</territory>
@@ -1061,7 +1120,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="TG">Togo</territory>
 			<territory type="TH">Thaïlande</territory>
 			<territory type="TJ">Tadjikistan</territory>
-			<territory type="TK">Tokelau</territory>
+			<territory type="TK">Tokélaou</territory>
 			<territory type="TL">Timor oriental</territory>
 			<territory type="TL" alt="variant">Timor-Oriental</territory>
 			<territory type="TM">Turkménistan</territory>
@@ -1108,22 +1167,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<variant type="AREVELA">arménien oriental</variant>
 			<variant type="AREVMDA">arménien occidental</variant>
 			<variant type="BAKU1926">alphabet latin altaïque unifié</variant>
+			<variant type="BALANKA" draft="unconfirmed">dialecte balanka d’Anii</variant>
+			<variant type="BARLA" draft="unconfirmed">groupe dialectal capverdien barlavento</variant>
 			<variant type="BAUDDHA" draft="unconfirmed">variante hybride bouddhiste</variant>
 			<variant type="BISCAYAN" draft="unconfirmed">biscayen</variant>
 			<variant type="BISKE">dialecte de San Giorgio / Bila</variant>
 			<variant type="BOHORIC" draft="unconfirmed">alphabet Bohorič</variant>
 			<variant type="BOONT">dialecte boontling</variant>
 			<variant type="DAJNKO" draft="unconfirmed">alphabet Dajnko</variant>
-			<variant type="EMODENG" draft="unconfirmed">anglais moderne ancien</variant>
+			<variant type="EKAVSK" draft="unconfirmed">prononciation serbe ékavienne</variant>
+			<variant type="EMODENG" draft="unconfirmed">ancien anglais moderne</variant>
 			<variant type="FONIPA">alphabet phonétique international</variant>
 			<variant type="FONUPA">alphabet phonétique ouralique</variant>
 			<variant type="FONXSAMP" draft="unconfirmed">alphabet phonétique X-SAMPA</variant>
 			<variant type="HEPBURN" draft="unconfirmed">romanisation Hepburn</variant>
 			<variant type="HOGNORSK" draft="unconfirmed">dialecte høgnorsk</variant>
+			<variant type="IJEKAVSK" draft="unconfirmed">prononciation serbe ijékavienne</variant>
 			<variant type="ITIHASA" draft="unconfirmed">variante épique</variant>
 			<variant type="JAUER" draft="unconfirmed">dialecte jauer</variant>
 			<variant type="JYUTPING" draft="unconfirmed">romanisation Jyutping</variant>
 			<variant type="KKCOR" draft="unconfirmed">orthographe commune</variant>
+			<variant type="KOCIEWIE" draft="unconfirmed">dialecte polonais kociewiacy</variant>
 			<variant type="KSCOR" draft="unconfirmed">orthographe standard</variant>
 			<variant type="LAUKIKA" draft="unconfirmed">variante classique</variant>
 			<variant type="LIPAW">dialecte lipovaz de Resia</variant>
@@ -1149,6 +1213,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<variant type="SCOTLAND">anglais standard écossais</variant>
 			<variant type="SCOUSE">dialecte scouse</variant>
 			<variant type="SOLBA">dialecte de Stolvizza / Solbica</variant>
+			<variant type="SOTAV" draft="unconfirmed">groupe dialectal capverdien sotavento</variant>
 			<variant type="SURMIRAN" draft="unconfirmed">idiome surmiran</variant>
 			<variant type="SURSILV" draft="unconfirmed">idiome sursilvan</variant>
 			<variant type="SUTSILV" draft="unconfirmed">idiome sutsilvan</variant>
@@ -1156,6 +1221,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<variant type="UCCOR" draft="unconfirmed">orthographe unifiée</variant>
 			<variant type="UCRCOR" draft="unconfirmed">orthographe révisée unifiée</variant>
 			<variant type="ULSTER" draft="unconfirmed">orthographe de l’Ulster</variant>
+			<variant type="UNIFON" draft="unconfirmed">alphabet phonétique Unifon</variant>
 			<variant type="VAIDIKA" draft="unconfirmed">variante védique</variant>
 			<variant type="VALENCIA">valencien</variant>
 			<variant type="VALLADER" draft="unconfirmed">idiome vallader</variant>
@@ -1173,6 +1239,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">Tri numérique</key>
 			<key type="colStrength" draft="contributed">Priorité du tri</key>
 			<key type="currency">devise</key>
+			<key type="hc">système horaire (12 ou 24 heures)</key>
+			<key type="lb">style de saut de ligne</key>
+			<key type="ms">système de mesure</key>
 			<key type="numbers">nombres</key>
 			<key type="timezone" draft="contributed">Fuseau horaire</key>
 			<key type="va" draft="contributed">Variante locale</key>
@@ -1180,121 +1249,133 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">Usage privé</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">chiffres arabes</type>
-			<type type="arabext" key="numbers">chiffres arabes étendus</type>
-			<type type="armn" key="numbers">chiffres arméniens</type>
-			<type type="armnlow" key="numbers">chiffres arméniens minuscules</type>
-			<type type="bali" key="numbers" draft="unconfirmed">chiffres balinais</type>
-			<type type="beng" key="numbers">chiffres bengalis</type>
-			<type type="big5han" key="collation">Ordre chinois traditionnel - Big5</type>
-			<type type="brah" key="numbers" draft="unconfirmed">chiffres brahmis</type>
-			<type type="buddhist" key="calendar">calendrier bouddhiste</type>
-			<type type="cakm" key="numbers" draft="unconfirmed">chiffres chakmas</type>
-			<type type="cham" key="numbers" draft="unconfirmed">chiffres chams</type>
-			<type type="chinese" key="calendar">calendrier chinois</type>
-			<type type="coptic" key="calendar">Calendrier copte</type>
-			<type type="dangi" key="calendar">calendrier dangi</type>
-			<type type="deva" key="numbers">chiffres devanagaris</type>
-			<type type="dictionary" key="collation">Ordre du dictionnaire</type>
-			<type type="ducet" key="collation">ordre de tri Unicode par défaut</type>
-			<type type="eor" key="collation" draft="unconfirmed">ordre de tri multilingue européen</type>
-			<type type="ethi" key="numbers">chiffres éthiopiens</type>
-			<type type="ethiopic" key="calendar">calendrier éthiopien</type>
-			<type type="ethiopic-amete-alem" key="calendar">Calendrier éthiopien Amete Alem</type>
-			<type type="finance" key="numbers" draft="contributed">Chiffres financiers</type>
-			<type type="fullwide" key="numbers">chiffres pleine chasse</type>
-			<type type="gb2312han" key="collation">Ordre chinois simplifié - GB2312</type>
-			<type type="geor" key="numbers">chiffres géorgiens</type>
-			<type type="gregorian" key="calendar">calendrier grégorien</type>
-			<type type="grek" key="numbers">chiffres grecs</type>
-			<type type="greklow" key="numbers">chiffres grecs minuscules</type>
-			<type type="gujr" key="numbers">chiffres goudjarâtîs</type>
-			<type type="guru" key="numbers">chiffres gourmoukhîs</type>
-			<type type="hanidec" key="numbers">nombres décimaux chinois</type>
-			<type type="hans" key="numbers">chiffres en chinois simplifié</type>
-			<type type="hansfin" key="numbers">chiffres financiers en chinois simplifié</type>
-			<type type="hant" key="numbers">chiffres en chinois traditionnel</type>
-			<type type="hantfin" key="numbers">chiffres financiers en chinois traditionnel</type>
-			<type type="hebr" key="numbers">chiffres hébreux</type>
-			<type type="hebrew" key="calendar">calendrier hébraïque</type>
-			<type type="identical" key="colStrength" draft="contributed">Tout trier</type>
-			<type type="indian" key="calendar">Calendrier indien</type>
-			<type type="islamic" key="calendar">calendrier musulman</type>
-			<type type="islamic-civil" key="calendar">calendrier musulman (tabulaire, époque civile)</type>
-			<type type="islamic-rgsa" key="calendar" draft="unconfirmed">calendrier musulman (observé, Arabie Saoudite)</type>
-			<type type="islamic-tbla" key="calendar">calendrier musulman (tabulaire, époque astronomique)</type>
-			<type type="islamic-umalqura" key="calendar" draft="unconfirmed">calendrier musulman (calculé, Umm al-Qura)</type>
-			<type type="iso8601" key="calendar">calendrier ISO 8601</type>
-			<type type="japanese" key="calendar">calendrier japonais</type>
-			<type type="java" key="numbers" draft="unconfirmed">chiffres javanais</type>
-			<type type="jpan" key="numbers">chiffres japonais</type>
-			<type type="jpanfin" key="numbers">chiffres japonais financiers</type>
-			<type type="kali" key="numbers" draft="unconfirmed">chiffres kayah li</type>
-			<type type="khmr" key="numbers">chiffres khmers</type>
-			<type type="knda" key="numbers">chiffres en kannada</type>
-			<type type="lana" key="numbers" draft="unconfirmed">chiffres lannas horas</type>
-			<type type="lanatham" key="numbers" draft="unconfirmed">chiffres lannas thams</type>
-			<type type="laoo" key="numbers">chiffres laotiens</type>
-			<type type="latn" key="numbers">chiffres occidentaux</type>
-			<type type="lepc" key="numbers" draft="unconfirmed">chiffres lepchas</type>
-			<type type="limb" key="numbers" draft="unconfirmed">chiffres limbous</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">Trier avec les minuscules d’abord</type>
-			<type type="mlym" key="numbers">chiffres malayâlams</type>
-			<type type="mong" key="numbers" draft="contributed">chiffres mongols</type>
-			<type type="mtei" key="numbers" draft="unconfirmed">chiffres meitei-mayeks</type>
-			<type type="mymr" key="numbers">chiffres birmans</type>
-			<type type="mymrshan" key="numbers" draft="unconfirmed">chiffres birmans shans</type>
-			<type type="native" key="numbers" draft="contributed">Chiffres natifs</type>
-			<type type="nkoo" key="numbers" draft="unconfirmed">chiffres n’kos</type>
-			<type type="no" key="colBackwards" draft="contributed">Trier les caractères accentués normalement</type>
-			<type type="no" key="colCaseFirst" draft="contributed">Trier sans ordre lié à la casse</type>
-			<type type="no" key="colCaseLevel" draft="contributed">Trier sans tenir compte de la casse</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">Trier les caractères Kana séparément</type>
-			<type type="no" key="colNormalization" draft="contributed">Trier sans normalisation</type>
-			<type type="no" key="colNumeric" draft="contributed">Trier les chiffres individuellement</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">Trier les symboles</type>
-			<type type="olck" key="numbers" draft="unconfirmed">chiffres ol-tchikis</type>
-			<type type="orya" key="numbers">chiffres oriyas</type>
-			<type type="osma" key="numbers" draft="unconfirmed">chiffres osmanyas</type>
-			<type type="persian" key="calendar">calendrier persan</type>
-			<type type="phonebook" key="collation">Ordre de l’annuaire</type>
-			<type type="phonetic" key="collation" draft="contributed">Ordre de tri phonétique</type>
-			<type type="pinyin" key="collation">Ordre pinyin</type>
-			<type type="primary" key="colStrength" draft="contributed">Ne trier que les lettres de base</type>
-			<type type="quaternary" key="colStrength" draft="contributed">Trier en tenant compte des caractères accentués, de la casse, de la largeur et des caractères Kana</type>
-			<type type="reformed" key="collation">Ordre réformé</type>
-			<type type="roc" key="calendar">calendrier républicain chinois</type>
-			<type type="roman" key="numbers">chiffres romains</type>
-			<type type="romanlow" key="numbers">chiffres romains minuscules</type>
-			<type type="saur" key="numbers" draft="unconfirmed">chiffres saurashtras</type>
-			<type type="search" key="collation">recherche générique</type>
-			<type type="searchjl" key="collation" draft="contributed">Rechercher par consonne initiale en hangeul</type>
-			<type type="secondary" key="colStrength" draft="contributed">Trier en tenant compte des caractères accentués</type>
-			<type type="shifted" key="colAlternate" draft="contributed">Trier en ignorant les symboles</type>
-			<type type="shrd" key="numbers" draft="unconfirmed">chiffres sharadas</type>
-			<type type="sora" key="numbers" draft="unconfirmed">chiffres sora-sompengs</type>
-			<type type="standard" key="collation">ordre de tri standard</type>
-			<type type="stroke" key="collation">Ordre des traits</type>
-			<type type="sund" key="numbers" draft="unconfirmed">chiffres soundanais</type>
-			<type type="takr" key="numbers" draft="unconfirmed">chiffres takris</type>
-			<type type="talu" key="numbers" draft="unconfirmed">chiffres néo-taï-luës</type>
-			<type type="taml" key="numbers">chiffres tamouls</type>
-			<type type="tamldec" key="numbers">chiffres tamouls</type>
-			<type type="telu" key="numbers">chiffres télougous</type>
-			<type type="tertiary" key="colStrength" draft="contributed">Trier en tenant compte des caractères accentués, de la casse et de la largeur</type>
-			<type type="thai" key="numbers">chiffres thaïs</type>
-			<type type="tibt" key="numbers">chiffres tibétains</type>
-			<type type="traditional" key="collation">Ordre traditionnel</type>
-			<type type="traditional" key="numbers" draft="contributed">Chiffres traditionnels</type>
-			<type type="unihan" key="collation">Ordre de tri radical-traits</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">Trier avec les majuscules d’abord</type>
-			<type type="vaii" key="numbers" draft="contributed">Chiffres en vaï</type>
-			<type type="yes" key="colBackwards" draft="contributed">Trier les caractères accentués dans l’ordre inverse</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">Trier en tenant compte de la casse</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">Trier les caractères Kana différemment</type>
-			<type type="yes" key="colNormalization" draft="contributed">Trier avec normalisation Unicode</type>
-			<type type="yes" key="colNumeric" draft="contributed">Trier les chiffres par ordre numérique</type>
-			<type type="zhuyin" key="collation" draft="unconfirmed">ordre zhuyin</type>
+			<type key="calendar" type="buddhist">calendrier bouddhiste</type>
+			<type key="calendar" type="chinese">calendrier chinois</type>
+			<type key="calendar" type="coptic">Calendrier copte</type>
+			<type key="calendar" type="dangi">calendrier dangi</type>
+			<type key="calendar" type="ethiopic">calendrier éthiopien</type>
+			<type key="calendar" type="ethiopic-amete-alem">Calendrier éthiopien Amete Alem</type>
+			<type key="calendar" type="gregorian">calendrier grégorien</type>
+			<type key="calendar" type="hebrew">calendrier hébraïque</type>
+			<type key="calendar" type="indian">Calendrier indien</type>
+			<type key="calendar" type="islamic">calendrier musulman</type>
+			<type key="calendar" type="islamic-civil">calendrier musulman (tabulaire, époque civile)</type>
+			<type key="calendar" type="islamic-rgsa" draft="unconfirmed">calendrier musulman (observé, Arabie Saoudite)</type>
+			<type key="calendar" type="islamic-tbla">calendrier musulman (tabulaire, époque astronomique)</type>
+			<type key="calendar" type="islamic-umalqura" draft="unconfirmed">calendrier musulman (calculé, Umm al-Qura)</type>
+			<type key="calendar" type="iso8601">calendrier ISO 8601</type>
+			<type key="calendar" type="japanese">calendrier japonais</type>
+			<type key="calendar" type="persian">calendrier persan</type>
+			<type key="calendar" type="roc">calendrier républicain chinois</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">Trier les symboles</type>
+			<type key="colAlternate" type="shifted" draft="contributed">Trier en ignorant les symboles</type>
+			<type key="colBackwards" type="no" draft="contributed">Trier les caractères accentués normalement</type>
+			<type key="colBackwards" type="yes" draft="contributed">Trier les caractères accentués dans l’ordre inverse</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">Trier avec les minuscules d’abord</type>
+			<type key="colCaseFirst" type="no" draft="contributed">Trier sans ordre lié à la casse</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">Trier avec les majuscules d’abord</type>
+			<type key="colCaseLevel" type="no" draft="contributed">Trier sans tenir compte de la casse</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">Trier en tenant compte de la casse</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">Trier les caractères Kana séparément</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">Trier les caractères Kana différemment</type>
+			<type key="collation" type="big5han">Ordre chinois traditionnel - Big5</type>
+			<type key="collation" type="compat" draft="unconfirmed">ancien ordre de tri pour compatibilité</type>
+			<type key="collation" type="dictionary">Ordre du dictionnaire</type>
+			<type key="collation" type="ducet">ordre de tri Unicode par défaut</type>
+			<type key="collation" type="emoji" draft="unconfirmed">ordre des émojis</type>
+			<type key="collation" type="eor" draft="unconfirmed">ordre multilingue européen</type>
+			<type key="collation" type="gb2312han">Ordre chinois simplifié - GB2312</type>
+			<type key="collation" type="phonebook">Ordre de l’annuaire</type>
+			<type key="collation" type="phonetic" draft="contributed">Ordre de tri phonétique</type>
+			<type key="collation" type="pinyin">Ordre pinyin</type>
+			<type key="collation" type="reformed">Ordre réformé</type>
+			<type key="collation" type="search">recherche générique</type>
+			<type key="collation" type="searchjl" draft="contributed">rechercher par consonne initiale en hangeul</type>
+			<type key="collation" type="standard">ordre de tri standard</type>
+			<type key="collation" type="stroke">Ordre des traits</type>
+			<type key="collation" type="traditional">Ordre traditionnel</type>
+			<type key="collation" type="unihan">Ordre de tri radical-traits</type>
+			<type key="collation" type="zhuyin" draft="contributed">ordre zhuyin</type>
+			<type key="colNormalization" type="no" draft="contributed">Trier sans normalisation</type>
+			<type key="colNormalization" type="yes" draft="contributed">Trier avec normalisation Unicode</type>
+			<type key="colNumeric" type="no" draft="contributed">Trier les chiffres individuellement</type>
+			<type key="colNumeric" type="yes" draft="contributed">Trier les chiffres par ordre numérique</type>
+			<type key="colStrength" type="identical" draft="contributed">Tout trier</type>
+			<type key="colStrength" type="primary" draft="contributed">Ne trier que les lettres de base</type>
+			<type key="colStrength" type="quaternary" draft="contributed">Trier en tenant compte des caractères accentués, de la casse, de la largeur et des caractères Kana</type>
+			<type key="colStrength" type="secondary" draft="contributed">Trier en tenant compte des caractères accentués</type>
+			<type key="colStrength" type="tertiary" draft="contributed">Trier en tenant compte des caractères accentués, de la casse et de la largeur</type>
+			<type key="hc" type="h11">système horaire de 12 heures (0–11)</type>
+			<type key="hc" type="h12">système horaire de 12 heures (1–12)</type>
+			<type key="hc" type="h23">système horaire de 24 heures (0–23)</type>
+			<type key="hc" type="h24">système horaire de 24 heures (1–24)</type>
+			<type key="lb" type="loose">style de saut de ligne permissif</type>
+			<type key="lb" type="normal">style de saut de ligne normal</type>
+			<type key="lb" type="strict">style de saut de ligne strict</type>
+			<type key="ms" type="metric">système métrique</type>
+			<type key="ms" type="uksystem">système impérial</type>
+			<type key="ms" type="ussystem">système américain</type>
+			<type key="numbers" type="arab">chiffres arabes</type>
+			<type key="numbers" type="arabext">chiffres arabes étendus</type>
+			<type key="numbers" type="armn">chiffres arméniens</type>
+			<type key="numbers" type="armnlow">chiffres arméniens minuscules</type>
+			<type key="numbers" type="bali" draft="unconfirmed">chiffres balinais</type>
+			<type key="numbers" type="beng">chiffres bengalis</type>
+			<type key="numbers" type="brah" draft="unconfirmed">chiffres brahmis</type>
+			<type key="numbers" type="cakm" draft="unconfirmed">chiffres chakmas</type>
+			<type key="numbers" type="cham" draft="unconfirmed">chiffres chams</type>
+			<type key="numbers" type="deva">chiffres devanagaris</type>
+			<type key="numbers" type="ethi">chiffres éthiopiens</type>
+			<type key="numbers" type="finance" draft="contributed">Chiffres financiers</type>
+			<type key="numbers" type="fullwide">chiffres pleine chasse</type>
+			<type key="numbers" type="geor">chiffres géorgiens</type>
+			<type key="numbers" type="grek">chiffres grecs</type>
+			<type key="numbers" type="greklow">chiffres grecs minuscules</type>
+			<type key="numbers" type="gujr">chiffres goudjarâtîs</type>
+			<type key="numbers" type="guru">chiffres gourmoukhîs</type>
+			<type key="numbers" type="hanidec">nombres décimaux chinois</type>
+			<type key="numbers" type="hans">chiffres en chinois simplifié</type>
+			<type key="numbers" type="hansfin">chiffres financiers en chinois simplifié</type>
+			<type key="numbers" type="hant">chiffres en chinois traditionnel</type>
+			<type key="numbers" type="hantfin">chiffres financiers en chinois traditionnel</type>
+			<type key="numbers" type="hebr">chiffres hébreux</type>
+			<type key="numbers" type="java" draft="unconfirmed">chiffres javanais</type>
+			<type key="numbers" type="jpan">chiffres japonais</type>
+			<type key="numbers" type="jpanfin">chiffres japonais financiers</type>
+			<type key="numbers" type="kali" draft="unconfirmed">chiffres kayah li</type>
+			<type key="numbers" type="khmr">chiffres khmers</type>
+			<type key="numbers" type="knda">chiffres en kannada</type>
+			<type key="numbers" type="lana" draft="unconfirmed">chiffres lannas horas</type>
+			<type key="numbers" type="lanatham" draft="unconfirmed">chiffres lannas thams</type>
+			<type key="numbers" type="laoo">chiffres laotiens</type>
+			<type key="numbers" type="latn">chiffres occidentaux</type>
+			<type key="numbers" type="lepc" draft="unconfirmed">chiffres lepchas</type>
+			<type key="numbers" type="limb" draft="unconfirmed">chiffres limbous</type>
+			<type key="numbers" type="mlym">chiffres malayâlams</type>
+			<type key="numbers" type="mong" draft="contributed">chiffres mongols</type>
+			<type key="numbers" type="mtei" draft="unconfirmed">chiffres meitei-mayeks</type>
+			<type key="numbers" type="mymr">chiffres birmans</type>
+			<type key="numbers" type="mymrshan" draft="unconfirmed">chiffres birmans shans</type>
+			<type key="numbers" type="native" draft="contributed">Chiffres natifs</type>
+			<type key="numbers" type="nkoo" draft="unconfirmed">chiffres n’kos</type>
+			<type key="numbers" type="olck" draft="unconfirmed">chiffres ol-tchikis</type>
+			<type key="numbers" type="orya">chiffres oriyas</type>
+			<type key="numbers" type="osma" draft="unconfirmed">chiffres osmanyas</type>
+			<type key="numbers" type="roman">chiffres romains</type>
+			<type key="numbers" type="romanlow">chiffres romains minuscules</type>
+			<type key="numbers" type="saur" draft="unconfirmed">chiffres saurashtras</type>
+			<type key="numbers" type="shrd" draft="unconfirmed">chiffres sharadas</type>
+			<type key="numbers" type="sora" draft="unconfirmed">chiffres sora-sompengs</type>
+			<type key="numbers" type="sund" draft="unconfirmed">chiffres soundanais</type>
+			<type key="numbers" type="takr" draft="unconfirmed">chiffres takris</type>
+			<type key="numbers" type="talu" draft="unconfirmed">chiffres néo-taï-luës</type>
+			<type key="numbers" type="taml">chiffres tamouls</type>
+			<type key="numbers" type="tamldec">chiffres tamouls</type>
+			<type key="numbers" type="telu">chiffres télougous</type>
+			<type key="numbers" type="thai">chiffres thaïs</type>
+			<type key="numbers" type="tibt">chiffres tibétains</type>
+			<type key="numbers" type="traditional" draft="contributed">Chiffres traditionnels</type>
+			<type key="numbers" type="vaii" draft="contributed">Chiffres en vaï</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">BGN</transformName>
@@ -1634,6 +1715,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">U</dateFormatItem>
 						<dateFormatItem id="yMd">d/M/y</dateFormatItem>
@@ -1644,6 +1726,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">MMM U</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">d MMM U</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E d MMM U</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">MMMM U</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">QQQ U</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">QQQQ U</dateFormatItem>
 					</availableFormats>
@@ -2084,6 +2167,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -2101,6 +2185,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
@@ -2259,18 +2344,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</monthContext>
 					<monthContext type="stand-alone">
 						<monthWidth type="abbreviated">
-							<month type="1">Janv.</month>
-							<month type="2">Févr.</month>
-							<month type="3">Mars</month>
-							<month type="4">Avr.</month>
-							<month type="5">Mai</month>
-							<month type="6">Juin</month>
-							<month type="7">Juil.</month>
-							<month type="8">Août</month>
-							<month type="9">Sept.</month>
-							<month type="10">Oct.</month>
-							<month type="11">Nov.</month>
-							<month type="12">Déc.</month>
+							<month type="1">janv.</month>
+							<month type="2">févr.</month>
+							<month type="3">mars</month>
+							<month type="4">avr.</month>
+							<month type="5">mai</month>
+							<month type="6">juin</month>
+							<month type="7">juil.</month>
+							<month type="8">août</month>
+							<month type="9">sept.</month>
+							<month type="10">oct.</month>
+							<month type="11">nov.</month>
+							<month type="12">déc.</month>
 						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">J</month>
@@ -2287,18 +2372,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="12">D</month>
 						</monthWidth>
 						<monthWidth type="wide">
-							<month type="1">Janvier</month>
-							<month type="2">Février</month>
-							<month type="3">Mars</month>
-							<month type="4">Avril</month>
-							<month type="5">Mai</month>
-							<month type="6">Juin</month>
-							<month type="7">Juillet</month>
-							<month type="8">Août</month>
-							<month type="9">Septembre</month>
-							<month type="10">Octobre</month>
-							<month type="11">Novembre</month>
-							<month type="12">Décembre</month>
+							<month type="1">janvier</month>
+							<month type="2">février</month>
+							<month type="3">mars</month>
+							<month type="4">avril</month>
+							<month type="5">mai</month>
+							<month type="6">juin</month>
+							<month type="7">juillet</month>
+							<month type="8">août</month>
+							<month type="9">septembre</month>
+							<month type="10">octobre</month>
+							<month type="11">novembre</month>
+							<month type="12">décembre</month>
 						</monthWidth>
 					</monthContext>
 				</months>
@@ -2343,13 +2428,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dayContext>
 					<dayContext type="stand-alone">
 						<dayWidth type="abbreviated">
-							<day type="sun">Dim.</day>
-							<day type="mon">Lun.</day>
-							<day type="tue">Mar.</day>
-							<day type="wed">Mer.</day>
-							<day type="thu">Jeu.</day>
-							<day type="fri">Ven.</day>
-							<day type="sat">Sam.</day>
+							<day type="sun">dim.</day>
+							<day type="mon">lun.</day>
+							<day type="tue">mar.</day>
+							<day type="wed">mer.</day>
+							<day type="thu">jeu.</day>
+							<day type="fri">ven.</day>
+							<day type="sat">sam.</day>
 						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun">D</day>
@@ -2361,22 +2446,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<day type="sat">S</day>
 						</dayWidth>
 						<dayWidth type="short">
-							<day type="sun">Di</day>
-							<day type="mon">Lu</day>
-							<day type="tue">Ma</day>
-							<day type="wed">Me</day>
-							<day type="thu">Je</day>
-							<day type="fri">Ve</day>
-							<day type="sat">Sa</day>
+							<day type="sun">di</day>
+							<day type="mon">lu</day>
+							<day type="tue">ma</day>
+							<day type="wed">me</day>
+							<day type="thu">je</day>
+							<day type="fri">ve</day>
+							<day type="sat">sa</day>
 						</dayWidth>
 						<dayWidth type="wide">
-							<day type="sun">Dimanche</day>
-							<day type="mon">Lundi</day>
-							<day type="tue">Mardi</day>
-							<day type="wed">Mercredi</day>
-							<day type="thu">Jeudi</day>
-							<day type="fri">Vendredi</day>
-							<day type="sat">Samedi</day>
+							<day type="sun">dimanche</day>
+							<day type="mon">lundi</day>
+							<day type="tue">mardi</day>
+							<day type="wed">mercredi</day>
+							<day type="thu">jeudi</day>
+							<day type="fri">vendredi</day>
+							<day type="sat">samedi</day>
 						</dayWidth>
 					</dayContext>
 				</days>
@@ -2425,49 +2510,75 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="afternoon" draft="unconfirmed">ap.m.</dayPeriod>
-							<dayPeriod type="am" draft="contributed">AM</dayPeriod>
-							<dayPeriod type="pm" draft="contributed">PM</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="afternoon" draft="unconfirmed">ap.-m.</dayPeriod>
-							<dayPeriod type="am" draft="contributed">a</dayPeriod>
-							<dayPeriod type="morning">matin</dayPeriod>
-							<dayPeriod type="night">soir</dayPeriod>
-							<dayPeriod type="noon">midi</dayPeriod>
-							<dayPeriod type="pm" draft="contributed">p</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="afternoon">après-midi</dayPeriod>
+							<dayPeriod type="midnight">min.</dayPeriod>
 							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="morning">matin</dayPeriod>
-							<dayPeriod type="night">soir</dayPeriod>
 							<dayPeriod type="noon">midi</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">mat.</dayPeriod>
+							<dayPeriod type="afternoon1">ap.m.</dayPeriod>
+							<dayPeriod type="evening1">soir</dayPeriod>
+							<dayPeriod type="night1">nuit</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">min.</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">midi</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">mat.</dayPeriod>
+							<dayPeriod type="afternoon1">ap.m.</dayPeriod>
+							<dayPeriod type="evening1">soir</dayPeriod>
+							<dayPeriod type="night1">nuit</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">minuit</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">midi</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">du matin</dayPeriod>
+							<dayPeriod type="afternoon1">de l’après-midi</dayPeriod>
+							<dayPeriod type="evening1">du soir</dayPeriod>
+							<dayPeriod type="night1">de nuit</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="afternoon" draft="unconfirmed">ap.m.</dayPeriod>
-							<dayPeriod type="am" draft="unconfirmed">av.m.</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">ap.m.</dayPeriod>
+							<dayPeriod type="midnight">min.</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">midi</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">mat.</dayPeriod>
+							<dayPeriod type="afternoon1">ap.m.</dayPeriod>
+							<dayPeriod type="evening1">soir</dayPeriod>
+							<dayPeriod type="night1">nuit</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">min.</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">midi</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">mat.</dayPeriod>
+							<dayPeriod type="afternoon1">ap.m.</dayPeriod>
+							<dayPeriod type="evening1">soir</dayPeriod>
+							<dayPeriod type="night1">nuit</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="afternoon" draft="unconfirmed">après-midi</dayPeriod>
-							<dayPeriod type="am" draft="unconfirmed">avant-midi</dayPeriod>
-							<dayPeriod type="morning" draft="unconfirmed">matin</dayPeriod>
-							<dayPeriod type="night" draft="unconfirmed">soir</dayPeriod>
-							<dayPeriod type="noon" draft="unconfirmed">midi</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">après-midi</dayPeriod>
+							<dayPeriod type="midnight">minuit</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">midi</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">matin</dayPeriod>
+							<dayPeriod type="afternoon1">après-midi</dayPeriod>
+							<dayPeriod type="evening1">soir</dayPeriod>
+							<dayPeriod type="night1">nuit</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
 						<era type="0">avant Jésus-Christ</era>
-						<era type="0" alt="variant">AEC</era>
+						<era type="0" alt="variant">avant l’ère commune</era>
 						<era type="1">après Jésus-Christ</era>
-						<era type="1" alt="variant">EC</era>
+						<era type="1" alt="variant">de l’ère commune</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">av. J.-C.</era>
@@ -2529,17 +2640,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1} 'à' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1} 'à' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1} 'à' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
@@ -2549,7 +2660,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="E" draft="contributed">E</dateFormatItem>
+						<dateFormatItem id="E">E</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
@@ -2570,16 +2681,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
 						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">E d/M</dateFormatItem>
+						<dateFormatItem id="Md">dd/MM</dateFormatItem>
+						<dateFormatItem id="MEd">E dd/MM</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M/y</dateFormatItem>
-						<dateFormatItem id="yMd">d/M/y</dateFormatItem>
-						<dateFormatItem id="yMEd">E d/M/y</dateFormatItem>
+						<dateFormatItem id="yM">MM/y</dateFormatItem>
+						<dateFormatItem id="yMd">dd/MM/y</dateFormatItem>
+						<dateFormatItem id="yMEd">E dd/MM/y</dateFormatItem>
 						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMEd">E d MMM y</dateFormatItem>
@@ -2588,7 +2700,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
 					</availableFormats>
 					<appendItems>
-						<appendItem request="Timezone" draft="contributed">{0} {1}</appendItem>
+						<appendItem request="Timezone">{0} {1}</appendItem>
 					</appendItems>
 					<intervalFormats>
 						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
@@ -2654,11 +2766,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
 							<greatestDifference id="M">MM/y – MM/y</greatestDifference>
-							<greatestDifference id="y">M/y – M/y</greatestDifference>
+							<greatestDifference id="y">MM/y – MM/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d/M/y – d/M/y</greatestDifference>
-							<greatestDifference id="M">d/M/y – d/M/y</greatestDifference>
+							<greatestDifference id="d">dd/MM/y – dd/MM/y</greatestDifference>
+							<greatestDifference id="M">dd/MM/y – dd/MM/y</greatestDifference>
 							<greatestDifference id="y">dd/MM/y – dd/MM/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
@@ -3039,6 +3151,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -3050,6 +3163,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
 						<dateFormatItem id="yyyyM">M/y GGGGG</dateFormatItem>
@@ -3066,12 +3180,720 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</calendar>
 			<calendar type="japanese">
 				<eras>
+					<eraNames>
+						<era type="0" draft="unconfirmed">Taika (645–650)</era>
+						<era type="1" draft="unconfirmed">Hakuchi (650–671)</era>
+						<era type="2" draft="unconfirmed">Hakuhō (672–686)</era>
+						<era type="3" draft="unconfirmed">Shuchō (686–701)</era>
+						<era type="4" draft="unconfirmed">Taihō (701–704)</era>
+						<era type="5" draft="unconfirmed">Keiun (704–708)</era>
+						<era type="6" draft="unconfirmed">Wadō (708–715)</era>
+						<era type="7" draft="unconfirmed">Reiki (715–717)</era>
+						<era type="8" draft="unconfirmed">Yōrō (717–724)</era>
+						<era type="9" draft="unconfirmed">Jinki (724–729)</era>
+						<era type="10" draft="unconfirmed">Tempyō (729–749)</era>
+						<era type="11" draft="unconfirmed">Tempyō-kampō (749-749)</era>
+						<era type="12" draft="unconfirmed">Tempyō-shōhō (749-757)</era>
+						<era type="13" draft="unconfirmed">Tempyō-hōji (757-765)</era>
+						<era type="14" draft="unconfirmed">Temphō-jingo (765-767)</era>
+						<era type="15" draft="unconfirmed">Jingo-keiun (767-770)</era>
+						<era type="16" draft="unconfirmed">Hōki (770–780)</era>
+						<era type="17" draft="unconfirmed">Ten-ō (781-782)</era>
+						<era type="18" draft="unconfirmed">Enryaku (782–806)</era>
+						<era type="19" draft="unconfirmed">Daidō (806–810)</era>
+						<era type="20" draft="unconfirmed">Kōnin (810–824)</era>
+						<era type="21" draft="unconfirmed">Tenchō (824–834)</era>
+						<era type="22" draft="unconfirmed">Jōwa (834–848)</era>
+						<era type="23" draft="unconfirmed">Kajō (848–851)</era>
+						<era type="24" draft="unconfirmed">Ninju (851–854)</era>
+						<era type="25" draft="unconfirmed">Saikō (854–857)</era>
+						<era type="26" draft="unconfirmed">Ten-an (857-859)</era>
+						<era type="27" draft="unconfirmed">Jōgan (859–877)</era>
+						<era type="28" draft="unconfirmed">Gangyō (877–885)</era>
+						<era type="29" draft="unconfirmed">Ninna (885–889)</era>
+						<era type="30" draft="unconfirmed">Kanpyō (889–898)</era>
+						<era type="31" draft="unconfirmed">Shōtai (898–901)</era>
+						<era type="32" draft="unconfirmed">Engi (901–923)</era>
+						<era type="33" draft="unconfirmed">Enchō (923–931)</era>
+						<era type="34" draft="unconfirmed">Jōhei (931–938)</era>
+						<era type="35" draft="unconfirmed">Tengyō (938–947)</era>
+						<era type="36" draft="unconfirmed">Tenryaku (947–957)</era>
+						<era type="37" draft="unconfirmed">Tentoku (957–961)</era>
+						<era type="38" draft="unconfirmed">Ōwa (961–964)</era>
+						<era type="39" draft="unconfirmed">Kōhō (964–968)</era>
+						<era type="40" draft="unconfirmed">Anna (968–970)</era>
+						<era type="41" draft="unconfirmed">Tenroku (970–973)</era>
+						<era type="42" draft="unconfirmed">Ten’en (973–976)</era>
+						<era type="43" draft="unconfirmed">Jōgen (976–978)</era>
+						<era type="44" draft="unconfirmed">Tengen (978–983)</era>
+						<era type="45" draft="unconfirmed">Eikan (983–985)</era>
+						<era type="46" draft="unconfirmed">Kanna (985–987)</era>
+						<era type="47" draft="unconfirmed">Eien (987–989)</era>
+						<era type="48" draft="unconfirmed">Eiso (989–990)</era>
+						<era type="49" draft="unconfirmed">Shōryaku (990–995)</era>
+						<era type="50" draft="unconfirmed">Chōtoku (995–999)</era>
+						<era type="51" draft="unconfirmed">Chōhō (999–1004)</era>
+						<era type="52" draft="unconfirmed">Kankō (1004–1012)</era>
+						<era type="53" draft="unconfirmed">Chōwa (1012–1017)</era>
+						<era type="54" draft="unconfirmed">Kannin (1017–1021)</era>
+						<era type="55" draft="unconfirmed">Jian (1021–1024)</era>
+						<era type="56" draft="unconfirmed">Manju (1024–1028)</era>
+						<era type="57" draft="unconfirmed">Chōgen (1028–1037)</era>
+						<era type="58" draft="unconfirmed">Chōryaku (1037–1040)</era>
+						<era type="59" draft="unconfirmed">Chōkyū (1040–1044)</era>
+						<era type="60" draft="unconfirmed">Kantoku (1044–1046)</era>
+						<era type="61" draft="unconfirmed">Eishō (1046–1053)</era>
+						<era type="62" draft="unconfirmed">Tengi (1053–1058)</era>
+						<era type="63" draft="unconfirmed">Kōhei (1058–1065)</era>
+						<era type="64" draft="unconfirmed">Jiryaku (1065–1069)</era>
+						<era type="65" draft="unconfirmed">Enkyū (1069–1074)</era>
+						<era type="66" draft="unconfirmed">Shōho (1074–1077)</era>
+						<era type="67" draft="unconfirmed">Shōryaku (1077–1081)</era>
+						<era type="68" draft="unconfirmed">Eihō (1081–1084)</era>
+						<era type="69" draft="unconfirmed">Ōtoku (1084–1087)</era>
+						<era type="70" draft="unconfirmed">Kanji (1087–1094)</era>
+						<era type="71" draft="unconfirmed">Kahō (1094–1096)</era>
+						<era type="72" draft="unconfirmed">Eichō (1096–1097)</era>
+						<era type="73" draft="unconfirmed">Jōtoku (1097–1099)</era>
+						<era type="74" draft="unconfirmed">Kōwa (1099–1104)</era>
+						<era type="75" draft="unconfirmed">Chōji (1104–1106)</era>
+						<era type="76" draft="unconfirmed">Kashō (1106–1108)</era>
+						<era type="77" draft="unconfirmed">Tennin (1108–1110)</era>
+						<era type="78" draft="unconfirmed">Ten-ei (1110-1113)</era>
+						<era type="79" draft="unconfirmed">Eikyū (1113–1118)</era>
+						<era type="80" draft="unconfirmed">Gen’ei (1118–1120)</era>
+						<era type="81" draft="unconfirmed">Hōan (1120–1124)</era>
+						<era type="82" draft="unconfirmed">Tenji (1124–1126)</era>
+						<era type="83" draft="unconfirmed">Daiji (1126–1131)</era>
+						<era type="84" draft="unconfirmed">Tenshō (1131–1132)</era>
+						<era type="85" draft="unconfirmed">Chōshō (1132–1135)</era>
+						<era type="86" draft="unconfirmed">Hōen (1135–1141)</era>
+						<era type="87" draft="unconfirmed">Eiji (1141–1142)</era>
+						<era type="88" draft="unconfirmed">Kōji (1142–1144)</era>
+						<era type="89" draft="unconfirmed">Ten’yō (1144–1145)</era>
+						<era type="90" draft="unconfirmed">Kyūan (1145–1151)</era>
+						<era type="91" draft="unconfirmed">Ninpei (1151–1154)</era>
+						<era type="92" draft="unconfirmed">Kyūju (1154–1156)</era>
+						<era type="93" draft="unconfirmed">Hōgen (1156–1159)</era>
+						<era type="94" draft="unconfirmed">Heiji (1159–1160)</era>
+						<era type="95" draft="unconfirmed">Eiryaku (1160–1161)</era>
+						<era type="96" draft="unconfirmed">Ōho (1161–1163)</era>
+						<era type="97" draft="unconfirmed">Chōkan (1163–1165)</era>
+						<era type="98" draft="unconfirmed">Eiman (1165–1166)</era>
+						<era type="99" draft="unconfirmed">Nin’an (1166–1169)</era>
+						<era type="100" draft="unconfirmed">Kaō (1169–1171)</era>
+						<era type="101" draft="unconfirmed">Shōan (1171–1175)</era>
+						<era type="102" draft="unconfirmed">Angen (1175–1177)</era>
+						<era type="103" draft="unconfirmed">Jishō (1177–1181)</era>
+						<era type="104" draft="unconfirmed">Yōwa (1181–1182)</era>
+						<era type="105" draft="unconfirmed">Juei (1182–1184)</era>
+						<era type="106" draft="unconfirmed">Genryaku (1184–1185)</era>
+						<era type="107" draft="unconfirmed">Bunji (1185–1190)</era>
+						<era type="108" draft="unconfirmed">Kenkyū (1190–1199)</era>
+						<era type="109" draft="unconfirmed">Shōji (1199–1201)</era>
+						<era type="110" draft="unconfirmed">Kennin (1201–1204)</era>
+						<era type="111" draft="unconfirmed">Genkyū (1204–1206)</era>
+						<era type="112" draft="unconfirmed">Ken’ei (1206–1207)</era>
+						<era type="113" draft="unconfirmed">Jōgen (1207–1211)</era>
+						<era type="114" draft="unconfirmed">Kenryaku (1211–1213)</era>
+						<era type="115" draft="unconfirmed">Kenpō (1213–1219)</era>
+						<era type="116" draft="unconfirmed">Jōkyū (1219–1222)</era>
+						<era type="117" draft="unconfirmed">Jōō (1222–1224)</era>
+						<era type="118" draft="unconfirmed">Gennin (1224–1225)</era>
+						<era type="119" draft="unconfirmed">Karoku (1225–1227)</era>
+						<era type="120" draft="unconfirmed">Antei (1227–1229)</era>
+						<era type="121" draft="unconfirmed">Kanki (1229–1232)</era>
+						<era type="122" draft="unconfirmed">Jōei (1232–1233)</era>
+						<era type="123" draft="unconfirmed">Tenpuku (1233–1234)</era>
+						<era type="124" draft="unconfirmed">Bunryaku (1234–1235)</era>
+						<era type="125" draft="unconfirmed">Katei (1235–1238)</era>
+						<era type="126" draft="unconfirmed">Ryakunin (1238–1239)</era>
+						<era type="127" draft="unconfirmed">En’ō (1239–1240)</era>
+						<era type="128" draft="unconfirmed">Ninji (1240–1243)</era>
+						<era type="129" draft="unconfirmed">Kangen (1243–1247)</era>
+						<era type="130" draft="unconfirmed">Hōji (1247–1249)</era>
+						<era type="131" draft="unconfirmed">Kenchō (1249–1256)</era>
+						<era type="132" draft="unconfirmed">Kōgen (1256–1257)</era>
+						<era type="133" draft="unconfirmed">Shōka (1257–1259)</era>
+						<era type="134" draft="unconfirmed">Shōgen (1259–1260)</era>
+						<era type="135" draft="unconfirmed">Bun’ō (1260–1261)</era>
+						<era type="136" draft="unconfirmed">Kōchō (1261–1264)</era>
+						<era type="137" draft="unconfirmed">Bun’ei (1264–1275)</era>
+						<era type="138" draft="unconfirmed">Kenji (1275–1278)</era>
+						<era type="139" draft="unconfirmed">Kōan (1278–1288)</era>
+						<era type="140" draft="unconfirmed">Shōō (1288–1293)</era>
+						<era type="141" draft="unconfirmed">Einin (1293–1299)</era>
+						<era type="142" draft="unconfirmed">Shōan (1299–1302)</era>
+						<era type="143" draft="unconfirmed">Kengen (1302–1303)</era>
+						<era type="144" draft="unconfirmed">Kagen (1303–1306)</era>
+						<era type="145" draft="unconfirmed">Tokuji (1306–1308)</era>
+						<era type="146" draft="unconfirmed">Enkyō (1308–1311)</era>
+						<era type="147" draft="unconfirmed">Ōchō (1311–1312)</era>
+						<era type="148" draft="unconfirmed">Shōwa (1312–1317)</era>
+						<era type="149" draft="unconfirmed">Bunpō (1317–1319)</era>
+						<era type="150" draft="unconfirmed">Genō (1319–1321)</era>
+						<era type="151" draft="unconfirmed">Genkō (1321–1324)</era>
+						<era type="152" draft="unconfirmed">Shōchū (1324–1326)</era>
+						<era type="153" draft="unconfirmed">Karyaku (1326–1329)</era>
+						<era type="154" draft="unconfirmed">Gentoku (1329–1331)</era>
+						<era type="155" draft="unconfirmed">Genkō (1331–1334)</era>
+						<era type="156" draft="unconfirmed">Kemmu (1334–1336)</era>
+						<era type="157" draft="unconfirmed">Engen (1336–1340)</era>
+						<era type="158" draft="unconfirmed">Kōkoku (1340–1346)</era>
+						<era type="159" draft="unconfirmed">Shōhei (1346–1370)</era>
+						<era type="160" draft="unconfirmed">Kentoku (1370–1372)</era>
+						<era type="161" draft="unconfirmed">Bunchū (1372–1375)</era>
+						<era type="162" draft="unconfirmed">Tenju (1375–1379)</era>
+						<era type="163" draft="unconfirmed">Kōryaku (1379–1381)</era>
+						<era type="164" draft="unconfirmed">Kōwa (1381–1384)</era>
+						<era type="165" draft="unconfirmed">Genchū (1384–1392)</era>
+						<era type="166" draft="unconfirmed">Meitoku (1384–1387)</era>
+						<era type="167" draft="unconfirmed">Kakei (1387–1389)</era>
+						<era type="168" draft="unconfirmed">Kōō (1389–1390)</era>
+						<era type="169" draft="unconfirmed">Meitoku (1390–1394)</era>
+						<era type="170" draft="unconfirmed">Ōei (1394–1428)</era>
+						<era type="171" draft="unconfirmed">Shōchō (1428–1429)</era>
+						<era type="172" draft="unconfirmed">Eikyō (1429–1441)</era>
+						<era type="173" draft="unconfirmed">Kakitsu (1441–1444)</era>
+						<era type="174" draft="unconfirmed">Bun’an (1444–1449)</era>
+						<era type="175" draft="unconfirmed">Hōtoku (1449–1452)</era>
+						<era type="176" draft="unconfirmed">Kyōtoku (1452–1455)</era>
+						<era type="177" draft="unconfirmed">Kōshō (1455–1457)</era>
+						<era type="178" draft="unconfirmed">Chōroku (1457–1460)</era>
+						<era type="179" draft="unconfirmed">Kanshō (1460–1466)</era>
+						<era type="180" draft="unconfirmed">Bunshō (1466–1467)</era>
+						<era type="181" draft="unconfirmed">Ōnin (1467–1469)</era>
+						<era type="182" draft="unconfirmed">Bunmei (1469–1487)</era>
+						<era type="183" draft="unconfirmed">Chōkyō (1487–1489)</era>
+						<era type="184" draft="unconfirmed">Entoku (1489–1492)</era>
+						<era type="185" draft="unconfirmed">Meiō (1492–1501)</era>
+						<era type="186" draft="unconfirmed">Bunki (1501–1504)</era>
+						<era type="187" draft="unconfirmed">Eishō (1504–1521)</era>
+						<era type="188" draft="unconfirmed">Taiei (1521–1528)</era>
+						<era type="189" draft="unconfirmed">Kyōroku (1528–1532)</era>
+						<era type="190" draft="unconfirmed">Tenbun (1532–1555)</era>
+						<era type="191" draft="unconfirmed">Kōji (1555–1558)</era>
+						<era type="192" draft="unconfirmed">Eiroku (1558–1570)</era>
+						<era type="193" draft="unconfirmed">Genki (1570–1573)</era>
+						<era type="194" draft="unconfirmed">Tenshō (1573–1592)</era>
+						<era type="195" draft="unconfirmed">Bunroku (1592–1596)</era>
+						<era type="196" draft="unconfirmed">Keichō (1596–1615)</era>
+						<era type="197" draft="unconfirmed">Genna (1615–1624)</era>
+						<era type="198" draft="unconfirmed">Kan’ei (1624–1644)</era>
+						<era type="199" draft="unconfirmed">Shōho (1644–1648)</era>
+						<era type="200" draft="unconfirmed">Keian (1648–1652)</era>
+						<era type="201" draft="unconfirmed">Jōō (1652–1655)</era>
+						<era type="202" draft="unconfirmed">Meireki (1655–1658)</era>
+						<era type="203" draft="unconfirmed">Manji (1658–1661)</era>
+						<era type="204" draft="unconfirmed">Kanbun (1661–1673)</era>
+						<era type="205" draft="unconfirmed">Enpō (1673–1681)</era>
+						<era type="206" draft="unconfirmed">Tenna (1681–1684)</era>
+						<era type="207" draft="unconfirmed">Jōkyō (1684–1688)</era>
+						<era type="208" draft="unconfirmed">Genroku (1688–1704)</era>
+						<era type="209" draft="unconfirmed">Hōei (1704–1711)</era>
+						<era type="210" draft="unconfirmed">Shōtoku (1711–1716)</era>
+						<era type="211" draft="unconfirmed">Kyōhō (1716–1736)</era>
+						<era type="212" draft="unconfirmed">Genbun (1736–1741)</era>
+						<era type="213" draft="unconfirmed">Kanpō (1741–1744)</era>
+						<era type="214" draft="unconfirmed">Enkyō (1744–1748)</era>
+						<era type="215" draft="unconfirmed">Kan’en (1748–1751)</era>
+						<era type="216" draft="unconfirmed">Hōryaku (1751–1764)</era>
+						<era type="217" draft="unconfirmed">Meiwa (1764–1772)</era>
+						<era type="218" draft="unconfirmed">An’ei (1772–1781)</era>
+						<era type="219" draft="unconfirmed">Tenmei (1781–1789)</era>
+						<era type="220" draft="unconfirmed">Kansei (1789–1801)</era>
+						<era type="221" draft="unconfirmed">Kyōwa (1801–1804)</era>
+						<era type="222" draft="unconfirmed">Bunka (1804–1818)</era>
+						<era type="223" draft="unconfirmed">Bunsei (1818–1830)</era>
+						<era type="224" draft="unconfirmed">Tenpō (1830–1844)</era>
+						<era type="225" draft="unconfirmed">Kōka (1844–1848)</era>
+						<era type="226" draft="unconfirmed">Kaei (1848–1854)</era>
+						<era type="227" draft="unconfirmed">Ansei (1854–1860)</era>
+						<era type="228" draft="unconfirmed">Man’en (1860–1861)</era>
+						<era type="229" draft="unconfirmed">Bunkyū (1861–1864)</era>
+						<era type="230" draft="unconfirmed">Genji (1864–1865)</era>
+						<era type="231" draft="unconfirmed">Keiō (1865–1868)</era>
+						<era type="232" draft="unconfirmed">Meiji</era>
+						<era type="233" draft="unconfirmed">Taishō</era>
+						<era type="234" draft="unconfirmed">Shōwa</era>
+						<era type="235" draft="unconfirmed">Heisei</era>
+					</eraNames>
 					<eraAbbr>
+						<era type="0" draft="unconfirmed">Taika (645–650)</era>
+						<era type="1" draft="unconfirmed">Hakuchi (650–671)</era>
+						<era type="2" draft="unconfirmed">Hakuhō (672–686)</era>
+						<era type="3" draft="unconfirmed">Shuchō (686–701)</era>
+						<era type="4" draft="unconfirmed">Taihō (701–704)</era>
+						<era type="5" draft="unconfirmed">Keiun (704–708)</era>
+						<era type="6" draft="unconfirmed">Wadō (708–715)</era>
+						<era type="7" draft="unconfirmed">Reiki (715–717)</era>
+						<era type="8" draft="unconfirmed">Yōrō (717–724)</era>
+						<era type="9" draft="unconfirmed">Jinki (724–729)</era>
+						<era type="10" draft="unconfirmed">Tenpyō (729–749)</era>
+						<era type="11" draft="unconfirmed">Tenpyō-kampō (749-749)</era>
+						<era type="12" draft="unconfirmed">Tenpyō-shōhō (749-757)</era>
+						<era type="13" draft="unconfirmed">Tenpyō-hōji (757-765)</era>
+						<era type="14" draft="unconfirmed">Tenpyō-jingo (765-767)</era>
+						<era type="15" draft="unconfirmed">Jingo-keiun (767-770)</era>
+						<era type="16" draft="unconfirmed">Hōki (770–780)</era>
+						<era type="17" draft="unconfirmed">Ten-ō (781-782)</era>
+						<era type="18" draft="unconfirmed">Enryaku (782–806)</era>
+						<era type="19" draft="unconfirmed">Daidō (806–810)</era>
+						<era type="20" draft="unconfirmed">Kōnin (810–824)</era>
+						<era type="21" draft="unconfirmed">Tenchō (824–834)</era>
+						<era type="22" draft="unconfirmed">Jōwa (834–848)</era>
+						<era type="23" draft="unconfirmed">Kajō (848–851)</era>
+						<era type="24" draft="unconfirmed">Ninju (851–854)</era>
+						<era type="25" draft="unconfirmed">Saikō (854–857)</era>
+						<era type="26" draft="unconfirmed">Ten-an (857-859)</era>
+						<era type="27" draft="unconfirmed">Jōgan (859–877)</era>
+						<era type="28" draft="unconfirmed">Gangyō (877–885)</era>
+						<era type="29" draft="unconfirmed">Ninna (885–889)</era>
+						<era type="30" draft="unconfirmed">Kanpyō (889–898)</era>
+						<era type="31" draft="unconfirmed">Shōtai (898–901)</era>
+						<era type="32" draft="unconfirmed">Engi (901–923)</era>
+						<era type="33" draft="unconfirmed">Enchō (923–931)</era>
+						<era type="34" draft="unconfirmed">Jōhei (931–938)</era>
+						<era type="35" draft="unconfirmed">Tengyō (938–947)</era>
+						<era type="36" draft="unconfirmed">Tenryaku (947–957)</era>
+						<era type="37" draft="unconfirmed">Tentoku (957–961)</era>
+						<era type="38" draft="unconfirmed">Ōwa (961–964)</era>
+						<era type="39" draft="unconfirmed">Kōhō (964–968)</era>
+						<era type="40" draft="unconfirmed">Anna (968–970)</era>
+						<era type="41" draft="unconfirmed">Tenroku (970–973)</era>
+						<era type="42" draft="unconfirmed">Ten’en (973–976)</era>
+						<era type="43" draft="unconfirmed">Jōgen (976–978)</era>
+						<era type="44" draft="unconfirmed">Tengen (978–983)</era>
+						<era type="45" draft="unconfirmed">Eikan (983–985)</era>
+						<era type="46" draft="unconfirmed">Kanna (985–987)</era>
+						<era type="47" draft="unconfirmed">Eien (987–989)</era>
+						<era type="48" draft="unconfirmed">Eiso (989–990)</era>
+						<era type="49" draft="unconfirmed">Shōryaku (990–995)</era>
+						<era type="50" draft="unconfirmed">Chōtoku (995–999)</era>
+						<era type="51" draft="unconfirmed">Chōhō (999–1004)</era>
+						<era type="52" draft="unconfirmed">Kankō (1004–1012)</era>
+						<era type="53" draft="unconfirmed">Chōwa (1012–1017)</era>
+						<era type="54" draft="unconfirmed">Kannin (1017–1021)</era>
+						<era type="55" draft="unconfirmed">Jian (1021–1024)</era>
+						<era type="56" draft="unconfirmed">Manju (1024–1028)</era>
+						<era type="57" draft="unconfirmed">Chōgen (1028–1037)</era>
+						<era type="58" draft="unconfirmed">Chōryaku (1037–1040)</era>
+						<era type="59" draft="unconfirmed">Chōkyū (1040–1044)</era>
+						<era type="60" draft="unconfirmed">Kantoku (1044–1046)</era>
+						<era type="61" draft="unconfirmed">Eishō (1046–1053)</era>
+						<era type="62" draft="unconfirmed">Tengi (1053–1058)</era>
+						<era type="63" draft="unconfirmed">Kōhei (1058–1065)</era>
+						<era type="64" draft="unconfirmed">Jiryaku (1065–1069)</era>
+						<era type="65" draft="unconfirmed">Enkyū (1069–1074)</era>
+						<era type="66" draft="unconfirmed">Shōho (1074–1077)</era>
+						<era type="67" draft="unconfirmed">Shōryaku (1077–1081)</era>
+						<era type="68" draft="unconfirmed">Eihō (1081–1084)</era>
+						<era type="69" draft="unconfirmed">Ōtoku (1084–1087)</era>
+						<era type="70" draft="unconfirmed">Kanji (1087–1094)</era>
+						<era type="71" draft="unconfirmed">Kahō (1094–1096)</era>
+						<era type="72" draft="unconfirmed">Eichō (1096–1097)</era>
+						<era type="73" draft="unconfirmed">Jōtoku (1097–1099)</era>
+						<era type="74" draft="unconfirmed">Kōwa (1099–1104)</era>
+						<era type="75" draft="unconfirmed">Chōji (1104–1106)</era>
+						<era type="76" draft="unconfirmed">Kashō (1106–1108)</era>
+						<era type="77" draft="unconfirmed">Tennin (1108–1110)</era>
+						<era type="78" draft="unconfirmed">Ten-ei (1110-1113)</era>
+						<era type="79" draft="unconfirmed">Eikyū (1113–1118)</era>
+						<era type="80" draft="unconfirmed">Gen’ei (1118–1120)</era>
+						<era type="81" draft="unconfirmed">Hōan (1120–1124)</era>
+						<era type="82" draft="unconfirmed">Tenji (1124–1126)</era>
+						<era type="83" draft="unconfirmed">Daiji (1126–1131)</era>
+						<era type="84" draft="unconfirmed">Tenshō (1131–1132)</era>
+						<era type="85" draft="unconfirmed">Chōshō (1132–1135)</era>
+						<era type="86" draft="unconfirmed">Hōen (1135–1141)</era>
+						<era type="87" draft="unconfirmed">Eiji (1141–1142)</era>
+						<era type="88" draft="unconfirmed">Kōji (1142–1144)</era>
+						<era type="89" draft="unconfirmed">Ten’yō (1144–1145)</era>
+						<era type="90" draft="unconfirmed">Kyūan (1145–1151)</era>
+						<era type="91" draft="unconfirmed">Ninpei (1151–1154)</era>
+						<era type="92" draft="unconfirmed">Kyūju (1154–1156)</era>
+						<era type="93" draft="unconfirmed">Hōgen (1156–1159)</era>
+						<era type="94" draft="unconfirmed">Heiji (1159–1160)</era>
+						<era type="95" draft="unconfirmed">Eiryaku (1160–1161)</era>
+						<era type="96" draft="unconfirmed">Ōho (1161–1163)</era>
+						<era type="97" draft="unconfirmed">Chōkan (1163–1165)</era>
+						<era type="98" draft="unconfirmed">Eiman (1165–1166)</era>
+						<era type="99" draft="unconfirmed">Nin’an (1166–1169)</era>
+						<era type="100" draft="unconfirmed">Kaō (1169–1171)</era>
+						<era type="101" draft="unconfirmed">Shōan (1171–1175)</era>
+						<era type="102" draft="unconfirmed">Angen (1175–1177)</era>
+						<era type="103" draft="unconfirmed">Jishō (1177–1181)</era>
+						<era type="104" draft="unconfirmed">Yōwa (1181–1182)</era>
+						<era type="105" draft="unconfirmed">Juei (1182–1184)</era>
+						<era type="106" draft="unconfirmed">Genryaku (1184–1185)</era>
+						<era type="107" draft="unconfirmed">Bunji (1185–1190)</era>
+						<era type="108" draft="unconfirmed">Kenkyū (1190–1199)</era>
+						<era type="109" draft="unconfirmed">Shōji (1199–1201)</era>
+						<era type="110" draft="unconfirmed">Kennin (1201–1204)</era>
+						<era type="111" draft="unconfirmed">Genkyū (1204–1206)</era>
+						<era type="112" draft="unconfirmed">Ken’ei (1206–1207)</era>
+						<era type="113" draft="unconfirmed">Jōgen (1207–1211)</era>
+						<era type="114" draft="unconfirmed">Kenryaku (1211–1213)</era>
+						<era type="115" draft="unconfirmed">Kenpō (1213–1219)</era>
+						<era type="116" draft="unconfirmed">Jōkyū (1219–1222)</era>
+						<era type="117" draft="unconfirmed">Jōō (1222–1224)</era>
+						<era type="118" draft="unconfirmed">Gennin (1224–1225)</era>
+						<era type="119" draft="unconfirmed">Karoku (1225–1227)</era>
+						<era type="120" draft="unconfirmed">Antei (1227–1229)</era>
+						<era type="121" draft="unconfirmed">Kanki (1229–1232)</era>
+						<era type="122" draft="unconfirmed">Jōei (1232–1233)</era>
+						<era type="123" draft="unconfirmed">Tenpuku (1233–1234)</era>
+						<era type="124" draft="unconfirmed">Bunryaku (1234–1235)</era>
+						<era type="125" draft="unconfirmed">Katei (1235–1238)</era>
+						<era type="126" draft="unconfirmed">Ryakunin (1238–1239)</era>
+						<era type="127" draft="unconfirmed">En’ō (1239–1240)</era>
+						<era type="128" draft="unconfirmed">Ninji (1240–1243)</era>
+						<era type="129" draft="unconfirmed">Kangen (1243–1247)</era>
+						<era type="130" draft="unconfirmed">Hōji (1247–1249)</era>
+						<era type="131" draft="unconfirmed">Kenchō (1249–1256)</era>
+						<era type="132" draft="unconfirmed">Kōgen (1256–1257)</era>
+						<era type="133" draft="unconfirmed">Shōka (1257–1259)</era>
+						<era type="134" draft="unconfirmed">Shōgen (1259–1260)</era>
+						<era type="135" draft="unconfirmed">Bun’ō (1260–1261)</era>
+						<era type="136" draft="unconfirmed">Kōchō (1261–1264)</era>
+						<era type="137" draft="unconfirmed">Bun’ei (1264–1275)</era>
+						<era type="138" draft="unconfirmed">Kenji (1275–1278)</era>
+						<era type="139" draft="unconfirmed">Kōan (1278–1288)</era>
+						<era type="140" draft="unconfirmed">Shōō (1288–1293)</era>
+						<era type="141" draft="unconfirmed">Einin (1293–1299)</era>
+						<era type="142" draft="unconfirmed">Shōan (1299–1302)</era>
+						<era type="143" draft="unconfirmed">Kengen (1302–1303)</era>
+						<era type="144" draft="unconfirmed">Kagen (1303–1306)</era>
+						<era type="145" draft="unconfirmed">Tokuji (1306–1308)</era>
+						<era type="146" draft="unconfirmed">Enkyō (1308–1311)</era>
+						<era type="147" draft="unconfirmed">Ōchō (1311–1312)</era>
+						<era type="148" draft="unconfirmed">Shōwa (1312–1317)</era>
+						<era type="149" draft="unconfirmed">Bunpō (1317–1319)</era>
+						<era type="150" draft="unconfirmed">Genō (1319–1321)</era>
+						<era type="151" draft="unconfirmed">Genkō (1321–1324)</era>
+						<era type="152" draft="unconfirmed">Shōchū (1324–1326)</era>
+						<era type="153" draft="unconfirmed">Karyaku (1326–1329)</era>
+						<era type="154" draft="unconfirmed">Gentoku (1329–1331)</era>
+						<era type="155" draft="unconfirmed">Genkō (1331–1334)</era>
+						<era type="156" draft="unconfirmed">Kenmu (1334–1336)</era>
+						<era type="157" draft="unconfirmed">Engen (1336–1340)</era>
+						<era type="158" draft="unconfirmed">Kōkoku (1340–1346)</era>
+						<era type="159" draft="unconfirmed">Shōhei (1346–1370)</era>
+						<era type="160" draft="unconfirmed">Kentoku (1370–1372)</era>
+						<era type="161" draft="unconfirmed">Bunchū (1372–1375)</era>
+						<era type="162" draft="unconfirmed">Tenju (1375–1379)</era>
+						<era type="163" draft="unconfirmed">Kōryaku (1379–1381)</era>
+						<era type="164" draft="unconfirmed">Kōwa (1381–1384)</era>
+						<era type="165" draft="unconfirmed">Genchū (1384–1392)</era>
+						<era type="166" draft="unconfirmed">Meitoku (1384–1387)</era>
+						<era type="167" draft="unconfirmed">Kakei (1387–1389)</era>
+						<era type="168" draft="unconfirmed">Kōō (1389–1390)</era>
+						<era type="169" draft="unconfirmed">Meitoku (1390–1394)</era>
+						<era type="170" draft="unconfirmed">Ōei (1394–1428)</era>
+						<era type="171" draft="unconfirmed">Shōchō (1428–1429)</era>
+						<era type="172" draft="unconfirmed">Eikyō (1429–1441)</era>
+						<era type="173" draft="unconfirmed">Kakitsu (1441–1444)</era>
+						<era type="174" draft="unconfirmed">Bun’an (1444–1449)</era>
+						<era type="175" draft="unconfirmed">Hōtoku (1449–1452)</era>
+						<era type="176" draft="unconfirmed">Kyōtoku (1452–1455)</era>
+						<era type="177" draft="unconfirmed">Kōshō (1455–1457)</era>
+						<era type="178" draft="unconfirmed">Chōroku (1457–1460)</era>
+						<era type="179" draft="unconfirmed">Kanshō (1460–1466)</era>
+						<era type="180" draft="unconfirmed">Bunshō (1466–1467)</era>
+						<era type="181" draft="unconfirmed">Ōnin (1467–1469)</era>
+						<era type="182" draft="unconfirmed">Bunmei (1469–1487)</era>
+						<era type="183" draft="unconfirmed">Chōkyō (1487–1489)</era>
+						<era type="184" draft="unconfirmed">Entoku (1489–1492)</era>
+						<era type="185" draft="unconfirmed">Meiō (1492–1501)</era>
+						<era type="186" draft="unconfirmed">Bunki (1501–1504)</era>
+						<era type="187" draft="unconfirmed">Eishō (1504–1521)</era>
+						<era type="188" draft="unconfirmed">Taiei (1521–1528)</era>
+						<era type="189" draft="unconfirmed">Kyōroku (1528–1532)</era>
+						<era type="190" draft="unconfirmed">Tenbun (1532–1555)</era>
+						<era type="191" draft="unconfirmed">Kōji (1555–1558)</era>
+						<era type="192" draft="unconfirmed">Eiroku (1558–1570)</era>
+						<era type="193" draft="unconfirmed">Genki (1570–1573)</era>
+						<era type="194" draft="unconfirmed">Tenshō (1573–1592)</era>
+						<era type="195" draft="unconfirmed">Bunroku (1592–1596)</era>
+						<era type="196" draft="unconfirmed">Keichō (1596–1615)</era>
+						<era type="197" draft="unconfirmed">Genna (1615–1624)</era>
+						<era type="198" draft="unconfirmed">Kan’ei (1624–1644)</era>
+						<era type="199" draft="unconfirmed">Shōho (1644–1648)</era>
+						<era type="200" draft="unconfirmed">Keian (1648–1652)</era>
+						<era type="201" draft="unconfirmed">Jōō (1652–1655)</era>
+						<era type="202" draft="unconfirmed">Meireki (1655–1658)</era>
+						<era type="203" draft="unconfirmed">Manji (1658–1661)</era>
+						<era type="204" draft="unconfirmed">Kanbun (1661–1673)</era>
+						<era type="205" draft="unconfirmed">Enpō (1673–1681)</era>
+						<era type="206" draft="unconfirmed">Tenna (1681–1684)</era>
+						<era type="207" draft="unconfirmed">Jōkyō (1684–1688)</era>
+						<era type="208" draft="unconfirmed">Genroku (1688–1704)</era>
+						<era type="209" draft="unconfirmed">Hōei (1704–1711)</era>
+						<era type="210" draft="unconfirmed">Shōtoku (1711–1716)</era>
+						<era type="211" draft="unconfirmed">Kyōhō (1716–1736)</era>
+						<era type="212" draft="unconfirmed">Genbun (1736–1741)</era>
+						<era type="213" draft="unconfirmed">Kanpō (1741–1744)</era>
+						<era type="214" draft="unconfirmed">Enkyō (1744–1748)</era>
+						<era type="215" draft="unconfirmed">Kan’en (1748–1751)</era>
+						<era type="216" draft="unconfirmed">Hōreki (1751–1764)</era>
+						<era type="217" draft="unconfirmed">Meiwa (1764–1772)</era>
+						<era type="218" draft="unconfirmed">An’ei (1772–1781)</era>
+						<era type="219" draft="unconfirmed">Tenmei (1781–1789)</era>
+						<era type="220" draft="unconfirmed">Kansei (1789–1801)</era>
+						<era type="221" draft="unconfirmed">Kyōwa (1801–1804)</era>
+						<era type="222" draft="unconfirmed">Bunka (1804–1818)</era>
+						<era type="223" draft="unconfirmed">Bunsei (1818–1830)</era>
+						<era type="224" draft="unconfirmed">Tenpō (1830–1844)</era>
+						<era type="225" draft="unconfirmed">Kōka (1844–1848)</era>
+						<era type="226" draft="unconfirmed">Kaei (1848–1854)</era>
+						<era type="227" draft="unconfirmed">Ansei (1854–1860)</era>
+						<era type="228" draft="unconfirmed">Man’en (1860–1861)</era>
+						<era type="229" draft="unconfirmed">Bunkyū (1861–1864)</era>
+						<era type="230" draft="unconfirmed">Genji (1864–1865)</era>
+						<era type="231" draft="unconfirmed">Keiō (1865–1868)</era>
 						<era type="232" draft="unconfirmed">Meiji</era>
 						<era type="233" draft="unconfirmed">Taishō</era>
 						<era type="234" draft="unconfirmed">Shōwa</era>
 						<era type="235" draft="unconfirmed">Heisei</era>
 					</eraAbbr>
+					<eraNarrow>
+						<era type="0" draft="unconfirmed">Taika (645–650)</era>
+						<era type="1" draft="unconfirmed">Hakuchi (650–671)</era>
+						<era type="2" draft="unconfirmed">Hakuhō (672–686)</era>
+						<era type="3" draft="unconfirmed">Shuchō (686–701)</era>
+						<era type="4" draft="unconfirmed">Taihō (701–704)</era>
+						<era type="5" draft="unconfirmed">Keiun (704–708)</era>
+						<era type="6" draft="unconfirmed">Wadō (708–715)</era>
+						<era type="7" draft="unconfirmed">Reiki (715–717)</era>
+						<era type="8" draft="unconfirmed">Yōrō (717–724)</era>
+						<era type="9" draft="unconfirmed">Jinki (724–729)</era>
+						<era type="10" draft="unconfirmed">Tenpyō (729–749)</era>
+						<era type="11" draft="unconfirmed">Tenpyō-kampō (749-749)</era>
+						<era type="12" draft="unconfirmed">Tenpyō-shōhō (749-757)</era>
+						<era type="13" draft="unconfirmed">Tenpyō-hōji (757-765)</era>
+						<era type="14" draft="unconfirmed">Tenpyō-jingo (765-767)</era>
+						<era type="15" draft="unconfirmed">Jingo-keiun (767-770)</era>
+						<era type="16" draft="unconfirmed">Hōki (770–780)</era>
+						<era type="17" draft="unconfirmed">Ten-ō (781-782)</era>
+						<era type="18" draft="unconfirmed">Enryaku (782–806)</era>
+						<era type="19" draft="unconfirmed">Daidō (806–810)</era>
+						<era type="20" draft="unconfirmed">Kōnin (810–824)</era>
+						<era type="21" draft="unconfirmed">Tenchō (824–834)</era>
+						<era type="22" draft="unconfirmed">Jōwa (834–848)</era>
+						<era type="23" draft="unconfirmed">Kajō (848–851)</era>
+						<era type="24" draft="unconfirmed">Ninju (851–854)</era>
+						<era type="25" draft="unconfirmed">Saikō (854–857)</era>
+						<era type="26" draft="unconfirmed">Ten-an (857-859)</era>
+						<era type="27" draft="unconfirmed">Jōgan (859–877)</era>
+						<era type="28" draft="unconfirmed">Gangyō (877–885)</era>
+						<era type="29" draft="unconfirmed">Ninna (885–889)</era>
+						<era type="30" draft="unconfirmed">Kanpyō (889–898)</era>
+						<era type="31" draft="unconfirmed">Shōtai (898–901)</era>
+						<era type="32" draft="unconfirmed">Engi (901–923)</era>
+						<era type="33" draft="unconfirmed">Enchō (923–931)</era>
+						<era type="34" draft="unconfirmed">Jōhei (931–938)</era>
+						<era type="35" draft="unconfirmed">Tengyō (938–947)</era>
+						<era type="36" draft="unconfirmed">Tenryaku (947–957)</era>
+						<era type="37" draft="unconfirmed">Tentoku (957–961)</era>
+						<era type="38" draft="unconfirmed">Ōwa (961–964)</era>
+						<era type="39" draft="unconfirmed">Kōhō (964–968)</era>
+						<era type="40" draft="unconfirmed">Anna (968–970)</era>
+						<era type="41" draft="unconfirmed">Tenroku (970–973)</era>
+						<era type="42" draft="unconfirmed">Ten’en (973–976)</era>
+						<era type="43" draft="unconfirmed">Jōgen (976–978)</era>
+						<era type="44" draft="unconfirmed">Tengen (978–983)</era>
+						<era type="45" draft="unconfirmed">Eikan (983–985)</era>
+						<era type="46" draft="unconfirmed">Kanna (985–987)</era>
+						<era type="47" draft="unconfirmed">Eien (987–989)</era>
+						<era type="48" draft="unconfirmed">Eiso (989–990)</era>
+						<era type="49" draft="unconfirmed">Shōryaku (990–995)</era>
+						<era type="50" draft="unconfirmed">Chōtoku (995–999)</era>
+						<era type="51" draft="unconfirmed">Chōhō (999–1004)</era>
+						<era type="52" draft="unconfirmed">Kankō (1004–1012)</era>
+						<era type="53" draft="unconfirmed">Chōwa (1012–1017)</era>
+						<era type="54" draft="unconfirmed">Kannin (1017–1021)</era>
+						<era type="55" draft="unconfirmed">Jian (1021–1024)</era>
+						<era type="56" draft="unconfirmed">Manju (1024–1028)</era>
+						<era type="57" draft="unconfirmed">Chōgen (1028–1037)</era>
+						<era type="58" draft="unconfirmed">Chōryaku (1037–1040)</era>
+						<era type="59" draft="unconfirmed">Chōkyū (1040–1044)</era>
+						<era type="60" draft="unconfirmed">Kantoku (1044–1046)</era>
+						<era type="61" draft="unconfirmed">Eishō (1046–1053)</era>
+						<era type="62" draft="unconfirmed">Tengi (1053–1058)</era>
+						<era type="63" draft="unconfirmed">Kōhei (1058–1065)</era>
+						<era type="64" draft="unconfirmed">Jiryaku (1065–1069)</era>
+						<era type="65" draft="unconfirmed">Enkyū (1069–1074)</era>
+						<era type="66" draft="unconfirmed">Shōho (1074–1077)</era>
+						<era type="67" draft="unconfirmed">Shōryaku (1077–1081)</era>
+						<era type="68" draft="unconfirmed">Eihō (1081–1084)</era>
+						<era type="69" draft="unconfirmed">Ōtoku (1084–1087)</era>
+						<era type="70" draft="unconfirmed">Kanji (1087–1094)</era>
+						<era type="71" draft="unconfirmed">Kahō (1094–1096)</era>
+						<era type="72" draft="unconfirmed">Eichō (1096–1097)</era>
+						<era type="73" draft="unconfirmed">Jōtoku (1097–1099)</era>
+						<era type="74" draft="unconfirmed">Kōwa (1099–1104)</era>
+						<era type="75" draft="unconfirmed">Chōji (1104–1106)</era>
+						<era type="76" draft="unconfirmed">Kashō (1106–1108)</era>
+						<era type="77" draft="unconfirmed">Tennin (1108–1110)</era>
+						<era type="78" draft="unconfirmed">Ten-ei (1110-1113)</era>
+						<era type="79" draft="unconfirmed">Eikyū (1113–1118)</era>
+						<era type="80" draft="unconfirmed">Gen’ei (1118–1120)</era>
+						<era type="81" draft="unconfirmed">Hōan (1120–1124)</era>
+						<era type="82" draft="unconfirmed">Tenji (1124–1126)</era>
+						<era type="83" draft="unconfirmed">Daiji (1126–1131)</era>
+						<era type="84" draft="unconfirmed">Tenshō (1131–1132)</era>
+						<era type="85" draft="unconfirmed">Chōshō (1132–1135)</era>
+						<era type="86" draft="unconfirmed">Hōen (1135–1141)</era>
+						<era type="87" draft="unconfirmed">Eiji (1141–1142)</era>
+						<era type="88" draft="unconfirmed">Kōji (1142–1144)</era>
+						<era type="89" draft="unconfirmed">Ten’yō (1144–1145)</era>
+						<era type="90" draft="unconfirmed">Kyūan (1145–1151)</era>
+						<era type="91" draft="unconfirmed">Ninpei (1151–1154)</era>
+						<era type="92" draft="unconfirmed">Kyūju (1154–1156)</era>
+						<era type="93" draft="unconfirmed">Hōgen (1156–1159)</era>
+						<era type="94" draft="unconfirmed">Heiji (1159–1160)</era>
+						<era type="95" draft="unconfirmed">Eiryaku (1160–1161)</era>
+						<era type="96" draft="unconfirmed">Ōho (1161–1163)</era>
+						<era type="97" draft="unconfirmed">Chōkan (1163–1165)</era>
+						<era type="98" draft="unconfirmed">Eiman (1165–1166)</era>
+						<era type="99" draft="unconfirmed">Nin’an (1166–1169)</era>
+						<era type="100" draft="unconfirmed">Kaō (1169–1171)</era>
+						<era type="101" draft="unconfirmed">Shōan (1171–1175)</era>
+						<era type="102" draft="unconfirmed">Angen (1175–1177)</era>
+						<era type="103" draft="unconfirmed">Jishō (1177–1181)</era>
+						<era type="104" draft="unconfirmed">Yōwa (1181–1182)</era>
+						<era type="105" draft="unconfirmed">Juei (1182–1184)</era>
+						<era type="106" draft="unconfirmed">Genryaku (1184–1185)</era>
+						<era type="107" draft="unconfirmed">Bunji (1185–1190)</era>
+						<era type="108" draft="unconfirmed">Kenkyū (1190–1199)</era>
+						<era type="109" draft="unconfirmed">Shōji (1199–1201)</era>
+						<era type="110" draft="unconfirmed">Kennin (1201–1204)</era>
+						<era type="111" draft="unconfirmed">Genkyū (1204–1206)</era>
+						<era type="112" draft="unconfirmed">Ken’ei (1206–1207)</era>
+						<era type="113" draft="unconfirmed">Jōgen (1207–1211)</era>
+						<era type="114" draft="unconfirmed">Kenryaku (1211–1213)</era>
+						<era type="115" draft="unconfirmed">Kenpō (1213–1219)</era>
+						<era type="116" draft="unconfirmed">Jōkyū (1219–1222)</era>
+						<era type="117" draft="unconfirmed">Jōō (1222–1224)</era>
+						<era type="118" draft="unconfirmed">Gennin (1224–1225)</era>
+						<era type="119" draft="unconfirmed">Karoku (1225–1227)</era>
+						<era type="120" draft="unconfirmed">Antei (1227–1229)</era>
+						<era type="121" draft="unconfirmed">Kanki (1229–1232)</era>
+						<era type="122" draft="unconfirmed">Jōei (1232–1233)</era>
+						<era type="123" draft="unconfirmed">Tenpuku (1233–1234)</era>
+						<era type="124" draft="unconfirmed">Bunryaku (1234–1235)</era>
+						<era type="125" draft="unconfirmed">Katei (1235–1238)</era>
+						<era type="126" draft="unconfirmed">Ryakunin (1238–1239)</era>
+						<era type="127" draft="unconfirmed">En’ō (1239–1240)</era>
+						<era type="128" draft="unconfirmed">Ninji (1240–1243)</era>
+						<era type="129" draft="unconfirmed">Kangen (1243–1247)</era>
+						<era type="130" draft="unconfirmed">Hōji (1247–1249)</era>
+						<era type="131" draft="unconfirmed">Kenchō (1249–1256)</era>
+						<era type="132" draft="unconfirmed">Kōgen (1256–1257)</era>
+						<era type="133" draft="unconfirmed">Shōka (1257–1259)</era>
+						<era type="134" draft="unconfirmed">Shōgen (1259–1260)</era>
+						<era type="135" draft="unconfirmed">Bun’ō (1260–1261)</era>
+						<era type="136" draft="unconfirmed">Kōchō (1261–1264)</era>
+						<era type="137" draft="unconfirmed">Bun’ei (1264–1275)</era>
+						<era type="138" draft="unconfirmed">Kenji (1275–1278)</era>
+						<era type="139" draft="unconfirmed">Kōan (1278–1288)</era>
+						<era type="140" draft="unconfirmed">Shōō (1288–1293)</era>
+						<era type="141" draft="unconfirmed">Einin (1293–1299)</era>
+						<era type="142" draft="unconfirmed">Shōan (1299–1302)</era>
+						<era type="143" draft="unconfirmed">Kengen (1302–1303)</era>
+						<era type="144" draft="unconfirmed">Kagen (1303–1306)</era>
+						<era type="145" draft="unconfirmed">Tokuji (1306–1308)</era>
+						<era type="146" draft="unconfirmed">Enkyō (1308–1311)</era>
+						<era type="147" draft="unconfirmed">Ōchō (1311–1312)</era>
+						<era type="148" draft="unconfirmed">Shōwa (1312–1317)</era>
+						<era type="149" draft="unconfirmed">Bunpō (1317–1319)</era>
+						<era type="150" draft="unconfirmed">Genō (1319–1321)</era>
+						<era type="151" draft="unconfirmed">Genkō (1321–1324)</era>
+						<era type="152" draft="unconfirmed">Shōchū (1324–1326)</era>
+						<era type="153" draft="unconfirmed">Karyaku (1326–1329)</era>
+						<era type="154" draft="unconfirmed">Gentoku (1329–1331)</era>
+						<era type="155" draft="unconfirmed">Genkō (1331–1334)</era>
+						<era type="156" draft="unconfirmed">Kenmu (1334–1336)</era>
+						<era type="157" draft="unconfirmed">Engen (1336–1340)</era>
+						<era type="158" draft="unconfirmed">Kōkoku (1340–1346)</era>
+						<era type="159" draft="unconfirmed">Shōhei (1346–1370)</era>
+						<era type="160" draft="unconfirmed">Kentoku (1370–1372)</era>
+						<era type="161" draft="unconfirmed">Bunchū (1372–1375)</era>
+						<era type="162" draft="unconfirmed">Tenju (1375–1379)</era>
+						<era type="163" draft="unconfirmed">Kōryaku (1379–1381)</era>
+						<era type="164" draft="unconfirmed">Kōwa (1381–1384)</era>
+						<era type="165" draft="unconfirmed">Genchū (1384–1392)</era>
+						<era type="166" draft="unconfirmed">Meitoku (1384–1387)</era>
+						<era type="167" draft="unconfirmed">Kakei (1387–1389)</era>
+						<era type="168" draft="unconfirmed">Kōō (1389–1390)</era>
+						<era type="169" draft="unconfirmed">Meitoku (1390–1394)</era>
+						<era type="170" draft="unconfirmed">Ōei (1394–1428)</era>
+						<era type="171" draft="unconfirmed">Shōchō (1428–1429)</era>
+						<era type="172" draft="unconfirmed">Eikyō (1429–1441)</era>
+						<era type="173" draft="unconfirmed">Kakitsu (1441–1444)</era>
+						<era type="174" draft="unconfirmed">Bun’an (1444–1449)</era>
+						<era type="175" draft="unconfirmed">Hōtoku (1449–1452)</era>
+						<era type="176" draft="unconfirmed">Kyōtoku (1452–1455)</era>
+						<era type="177" draft="unconfirmed">Kōshō (1455–1457)</era>
+						<era type="178" draft="unconfirmed">Chōroku (1457–1460)</era>
+						<era type="179" draft="unconfirmed">Kanshō (1460–1466)</era>
+						<era type="180" draft="unconfirmed">Bunshō (1466–1467)</era>
+						<era type="181" draft="unconfirmed">Ōnin (1467–1469)</era>
+						<era type="182" draft="unconfirmed">Bunmei (1469–1487)</era>
+						<era type="183" draft="unconfirmed">Chōkyō (1487–1489)</era>
+						<era type="184" draft="unconfirmed">Entoku (1489–1492)</era>
+						<era type="185" draft="unconfirmed">Meiō (1492–1501)</era>
+						<era type="186" draft="unconfirmed">Bunki (1501–1504)</era>
+						<era type="187" draft="unconfirmed">Eishō (1504–1521)</era>
+						<era type="188" draft="unconfirmed">Taiei (1521–1528)</era>
+						<era type="189" draft="unconfirmed">Kyōroku (1528–1532)</era>
+						<era type="190" draft="unconfirmed">Tenbun (1532–1555)</era>
+						<era type="191" draft="unconfirmed">Kōji (1555–1558)</era>
+						<era type="192" draft="unconfirmed">Eiroku (1558–1570)</era>
+						<era type="193" draft="unconfirmed">Genki (1570–1573)</era>
+						<era type="194" draft="unconfirmed">Tenshō (1573–1592)</era>
+						<era type="195" draft="unconfirmed">Bunroku (1592–1596)</era>
+						<era type="196" draft="unconfirmed">Keichō (1596–1615)</era>
+						<era type="197" draft="unconfirmed">Genna (1615–1624)</era>
+						<era type="198" draft="unconfirmed">Kan’ei (1624–1644)</era>
+						<era type="199" draft="unconfirmed">Shōho (1644–1648)</era>
+						<era type="200" draft="unconfirmed">Keian (1648–1652)</era>
+						<era type="201" draft="unconfirmed">Jōō (1652–1655)</era>
+						<era type="202" draft="unconfirmed">Meireki (1655–1658)</era>
+						<era type="203" draft="unconfirmed">Manji (1658–1661)</era>
+						<era type="204" draft="unconfirmed">Kanbun (1661–1673)</era>
+						<era type="205" draft="unconfirmed">Enpō (1673–1681)</era>
+						<era type="206" draft="unconfirmed">Tenna (1681–1684)</era>
+						<era type="207" draft="unconfirmed">Jōkyō (1684–1688)</era>
+						<era type="208" draft="unconfirmed">Genroku (1688–1704)</era>
+						<era type="209" draft="unconfirmed">Hōei (1704–1711)</era>
+						<era type="210" draft="unconfirmed">Shōtoku (1711–1716)</era>
+						<era type="211" draft="unconfirmed">Kyōhō (1716–1736)</era>
+						<era type="212" draft="unconfirmed">Genbun (1736–1741)</era>
+						<era type="213" draft="unconfirmed">Kanpō (1741–1744)</era>
+						<era type="214" draft="unconfirmed">Enkyō (1744–1748)</era>
+						<era type="215" draft="unconfirmed">Kan’en (1748–1751)</era>
+						<era type="216" draft="unconfirmed">Hōreki (1751–1764)</era>
+						<era type="217" draft="unconfirmed">Meiwa (1764–1772)</era>
+						<era type="218" draft="unconfirmed">An’ei (1772–1781)</era>
+						<era type="219" draft="unconfirmed">Tenmei (1781–1789)</era>
+						<era type="220" draft="unconfirmed">Kansei (1789–1801)</era>
+						<era type="221" draft="unconfirmed">Kyōwa (1801–1804)</era>
+						<era type="222" draft="unconfirmed">Bunka (1804–1818)</era>
+						<era type="223" draft="unconfirmed">Bunsei (1818–1830)</era>
+						<era type="224" draft="unconfirmed">Tenpō (1830–1844)</era>
+						<era type="225" draft="unconfirmed">Kōka (1844–1848)</era>
+						<era type="226" draft="unconfirmed">Kaei (1848–1854)</era>
+						<era type="227" draft="unconfirmed">Ansei (1854–1860)</era>
+						<era type="228" draft="unconfirmed">Man’en (1860–1861)</era>
+						<era type="229" draft="unconfirmed">Bunkyū (1861–1864)</era>
+						<era type="230" draft="unconfirmed">Genji (1864–1865)</era>
+						<era type="231" draft="unconfirmed">Keiō (1865–1868)</era>
+						<era type="232" draft="unconfirmed">M</era>
+						<era type="233" draft="unconfirmed">T</era>
+						<era type="234" draft="unconfirmed">S</era>
+						<era type="235" draft="unconfirmed">H</era>
+					</eraNarrow>
 				</eras>
 				<!-- need some non-empty element here to make inheritance work,
 					 this copy of generic dateFormats above is smaller than root japanese eras
@@ -3121,6 +3943,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E" draft="unconfirmed">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -3132,6 +3955,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
 						<dateFormatItem id="yyyyM">M/y GGGGG</dateFormatItem>
@@ -3181,7 +4005,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="year-short">
-				<displayName>a</displayName>
+				<displayName>ann.</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">dans {0} a</relativeTimePattern>
 					<relativeTimePattern count="other">dans {0} a</relativeTimePattern>
@@ -3194,16 +4018,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="year-narrow">
 				<displayName>a</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="contributed">+{0} a</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">+{0} a</relativeTimePattern>
+					<relativeTimePattern count="one">+{0} a</relativeTimePattern>
+					<relativeTimePattern count="other">+{0} a</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="contributed">-{0} a</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">-{0} a</relativeTimePattern>
+					<relativeTimePattern count="one">-{0} a</relativeTimePattern>
+					<relativeTimePattern count="other">-{0} a</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter">
 				<displayName>trimestre</displayName>
+				<relative type="-1" draft="unconfirmed">le trimestre dernier</relative>
+				<relative type="0" draft="unconfirmed">ce trimestre-ci</relative>
+				<relative type="1" draft="unconfirmed">le trimestre prochain</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">dans {0} trimestre</relativeTimePattern>
 					<relativeTimePattern count="other">dans {0} trimestres</relativeTimePattern>
@@ -3215,6 +4042,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>trim.</displayName>
+				<relative type="-1" draft="unconfirmed">le trim. dern.</relative>
+				<relative type="0" draft="unconfirmed">ce trim.</relative>
+				<relative type="1" draft="unconfirmed">le trim. proch.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">dans {0} trim.</relativeTimePattern>
 					<relativeTimePattern count="other">dans {0} trim.</relativeTimePattern>
@@ -3226,13 +4056,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>trim.</displayName>
+				<relative type="-1" draft="unconfirmed">tr dern</relative>
+				<relative type="0" draft="unconfirmed">ce tr</relative>
+				<relative type="1" draft="unconfirmed">tr proch</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="contributed">+{0} trim.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">+{0} trim.</relativeTimePattern>
+					<relativeTimePattern count="one">+{0} trim.</relativeTimePattern>
+					<relativeTimePattern count="other">+{0} trim.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="contributed">-{0} trim.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">-{0} trim.</relativeTimePattern>
+					<relativeTimePattern count="one">-{0} trim.</relativeTimePattern>
+					<relativeTimePattern count="other">-{0} trim.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month">
@@ -3261,14 +4094,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="month-narrow">
-				<displayName draft="contributed">m</displayName>
+				<displayName>m.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="contributed">+{0} m.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">+{0} m.</relativeTimePattern>
+					<relativeTimePattern count="one">+{0} m.</relativeTimePattern>
+					<relativeTimePattern count="other">+{0} m.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="contributed">-{0} m.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">-{0} m.</relativeTimePattern>
+					<relativeTimePattern count="one">-{0} m.</relativeTimePattern>
+					<relativeTimePattern count="other">-{0} m.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week">
@@ -3299,12 +4132,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="week-narrow">
 				<displayName>sem.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="contributed">+{0} sem.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">+{0} sem.</relativeTimePattern>
+					<relativeTimePattern count="one">+{0} sem.</relativeTimePattern>
+					<relativeTimePattern count="other">+{0} sem.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="contributed">-{0} sem.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">-{0} sem.</relativeTimePattern>
+					<relativeTimePattern count="one">-{0} sem.</relativeTimePattern>
+					<relativeTimePattern count="other">-{0} sem.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day">
@@ -3337,12 +4170,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="day-narrow">
 				<displayName>j</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="contributed">+{0} j</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">+{0} j</relativeTimePattern>
+					<relativeTimePattern count="one">+{0} j</relativeTimePattern>
+					<relativeTimePattern count="other">+{0} j</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="contributed">-{0} j</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">-{0} j</relativeTimePattern>
+					<relativeTimePattern count="one">-{0} j</relativeTimePattern>
+					<relativeTimePattern count="other">-{0} j</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="weekday">
@@ -3359,9 +4192,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">dim. prochain</relative>
 			</field>
 			<field type="sun-narrow">
-				<relative type="-1" draft="contributed">dim dernier</relative>
-				<relative type="0" draft="contributed">ce dim</relative>
-				<relative type="1" draft="contributed">dim prochain</relative>
+				<relative type="-1">dim dern</relative>
+				<relative type="0">ce dim</relative>
+				<relative type="1">dim proch</relative>
 			</field>
 			<field type="mon">
 				<relative type="-1">lundi dernier</relative>
@@ -3374,9 +4207,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">lun. prochain</relative>
 			</field>
 			<field type="mon-narrow">
-				<relative type="-1" draft="contributed">lun dernier</relative>
-				<relative type="0" draft="contributed">ce lun</relative>
-				<relative type="1" draft="contributed">lun prochain</relative>
+				<relative type="-1">lun dern</relative>
+				<relative type="0">ce lun</relative>
+				<relative type="1">lun proch</relative>
 			</field>
 			<field type="tue">
 				<relative type="-1">mardi dernier</relative>
@@ -3389,9 +4222,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">mar. prochain</relative>
 			</field>
 			<field type="tue-narrow">
-				<relative type="-1" draft="contributed">mar dernier</relative>
-				<relative type="0" draft="contributed">ce mar</relative>
-				<relative type="1" draft="contributed">mar prochain</relative>
+				<relative type="-1">mar dern</relative>
+				<relative type="0">ce mar</relative>
+				<relative type="1">mar proch</relative>
 			</field>
 			<field type="wed">
 				<relative type="-1">mercredi dernier</relative>
@@ -3404,9 +4237,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">mer. prochain</relative>
 			</field>
 			<field type="wed-narrow">
-				<relative type="-1" draft="contributed">mer dernier</relative>
-				<relative type="0" draft="contributed">ce mer</relative>
-				<relative type="1" draft="contributed">mer prochain</relative>
+				<relative type="-1">mer dern</relative>
+				<relative type="0">ce mer</relative>
+				<relative type="1">mer proch</relative>
 			</field>
 			<field type="thu">
 				<relative type="-1">jeudi dernier</relative>
@@ -3419,9 +4252,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">jeu. prochain</relative>
 			</field>
 			<field type="thu-narrow">
-				<relative type="-1" draft="contributed">jeu dernier</relative>
-				<relative type="0" draft="contributed">ce jeu</relative>
-				<relative type="1" draft="contributed">jeu prochain</relative>
+				<relative type="-1">jeu dern</relative>
+				<relative type="0">ce jeu</relative>
+				<relative type="1">jeu proch</relative>
 			</field>
 			<field type="fri">
 				<relative type="-1">vendredi dernier</relative>
@@ -3434,9 +4267,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">ven. prochain</relative>
 			</field>
 			<field type="fri-narrow">
-				<relative type="-1" draft="contributed">ven dernier</relative>
-				<relative type="0" draft="contributed">ce ven</relative>
-				<relative type="1" draft="contributed">ven prochain</relative>
+				<relative type="-1">ven dern</relative>
+				<relative type="0">ce ven</relative>
+				<relative type="1">ven proch</relative>
 			</field>
 			<field type="sat">
 				<relative type="-1">samedi dernier</relative>
@@ -3449,9 +4282,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">sam. prochain</relative>
 			</field>
 			<field type="sat-narrow">
-				<relative type="-1" draft="contributed">sam dernier</relative>
-				<relative type="0" draft="contributed">ce sam</relative>
-				<relative type="1" draft="contributed">sam prochain</relative>
+				<relative type="-1">sam dern</relative>
+				<relative type="0">ce sam</relative>
+				<relative type="1">sam proch</relative>
 			</field>
 			<field type="dayperiod">
 				<displayName>cadran</displayName>
@@ -3481,12 +4314,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="hour-narrow">
 				<displayName>h</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="contributed">+{0} h</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">+{0} h</relativeTimePattern>
+					<relativeTimePattern count="one">+{0}h</relativeTimePattern>
+					<relativeTimePattern count="other">+{0}h</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="contributed">-{0} h</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">-{0} h</relativeTimePattern>
+					<relativeTimePattern count="one">−{0}h</relativeTimePattern>
+					<relativeTimePattern count="other">−{0}h</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute">
@@ -3514,12 +4347,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="minute-narrow">
 				<displayName>min</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="contributed">+{0} min</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">+{0} min</relativeTimePattern>
+					<relativeTimePattern count="one">+{0} min</relativeTimePattern>
+					<relativeTimePattern count="other">+{0} min</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="contributed">-{0} min</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">-{0} min</relativeTimePattern>
+					<relativeTimePattern count="one">-{0} min</relativeTimePattern>
+					<relativeTimePattern count="other">-{0} min</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second">
@@ -3548,12 +4381,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="second-narrow">
 				<displayName>s</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="contributed">+{0} s</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">+{0} s</relativeTimePattern>
+					<relativeTimePattern count="one">+{0} s</relativeTimePattern>
+					<relativeTimePattern count="other">+{0} s</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="contributed">-{0} s</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">-{0} s</relativeTimePattern>
+					<relativeTimePattern count="one">-{0} s</relativeTimePattern>
+					<relativeTimePattern count="other">-{0} s</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="zone">
@@ -3569,7 +4402,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<regionFormat type="standard">{0} (heure standard)</regionFormat>
 			<fallbackFormat>{1} ({0})</fallbackFormat>
 			<zone type="Etc/Unknown">
-				<exemplarCity>zone inconnue</exemplarCity>
+				<exemplarCity>ville inconnue</exemplarCity>
 			</zone>
 			<zone type="Europe/Andorra">
 				<exemplarCity>Andorre</exemplarCity>
@@ -3602,7 +4435,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Palmer</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Troll">
-				<exemplarCity draft="contributed">Troll</exemplarCity>
+				<exemplarCity>Troll</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Syowa">
 				<exemplarCity>Showa</exemplarCity>
@@ -4259,7 +5092,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Riga</exemplarCity>
 			</zone>
 			<zone type="Africa/Tripoli">
-				<exemplarCity>Tripoli [Libye]</exemplarCity>
+				<exemplarCity>Tripoli (Libye)</exemplarCity>
 			</zone>
 			<zone type="Africa/Casablanca">
 				<exemplarCity>Casablanca</exemplarCity>
@@ -4435,6 +5268,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manille</exemplarCity>
 			</zone>
@@ -4519,6 +5355,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkoutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Tchita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Iakoutsk</exemplarCity>
 			</zone>
@@ -4537,6 +5376,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolymsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamtchatka</exemplarCity>
 			</zone>
@@ -4715,13 +5557,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Denver</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/Beulah">
-				<exemplarCity>Beulah [Dakota du Nord]</exemplarCity>
+				<exemplarCity>Beulah (Dakota du Nord)</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>New Salem [Dakota du Nord]</exemplarCity>
+				<exemplarCity>New Salem (Dakota du Nord)</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Center [Dakota du Nord]</exemplarCity>
+				<exemplarCity>Center (Dakota du Nord)</exemplarCity>
 			</zone>
 			<zone type="America/Chicago">
 				<exemplarCity>Chicago</exemplarCity>
@@ -5048,8 +5890,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="Chatham">
 				<long>
 					<generic>heure des îles Chatham</generic>
-					<standard>heure normale des Îles Chatham</standard>
-					<daylight>heure d’été des Îles Chatham</daylight>
+					<standard>heure normale des îles Chatham</standard>
+					<daylight>heure d’été des îles Chatham</daylight>
 				</long>
 			</metazone>
 			<metazone type="Chile">
@@ -5147,7 +5989,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
 				<long>
-					<standard draft="contributed">heure de Kaliningrad</standard>
+					<standard>heure de Kaliningrad</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
@@ -5769,6 +6611,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<native draft="contributed">latn</native>
 		</otherNumberingSystems>
 		<minimumGroupingDigits draft="contributed">1</minimumGroupingDigits>
+		<symbols numberSystem="arab">
+			<decimal draft="unconfirmed">٫</decimal>
+			<group draft="unconfirmed">٬</group>
+			<list draft="unconfirmed">؛</list>
+			<percentSign draft="unconfirmed">٪</percentSign>
+			<plusSign draft="unconfirmed">‏+</plusSign>
+			<minusSign draft="unconfirmed">‏−</minusSign>
+			<exponential draft="unconfirmed">اس</exponential>
+			<superscriptingExponent draft="unconfirmed">×</superscriptingExponent>
+			<perMille draft="unconfirmed">؉</perMille>
+			<infinity draft="unconfirmed">∞</infinity>
+			<nan draft="unconfirmed">NaN</nan>
+			<timeSeparator draft="unconfirmed">:</timeSeparator>
+		</symbols>
+		<symbols numberSystem="arabext">
+			<decimal draft="unconfirmed">٫</decimal>
+			<group draft="unconfirmed">٬</group>
+			<list draft="unconfirmed">؛</list>
+			<percentSign draft="unconfirmed">٪</percentSign>
+			<plusSign draft="unconfirmed">‎+</plusSign>
+			<minusSign draft="unconfirmed">‎−</minusSign>
+			<exponential draft="unconfirmed">×۱۰^</exponential>
+			<superscriptingExponent draft="unconfirmed">×</superscriptingExponent>
+			<perMille draft="unconfirmed">؉</perMille>
+			<infinity draft="unconfirmed">∞</infinity>
+			<nan draft="unconfirmed">NaN</nan>
+		</symbols>
 		<symbols numberSystem="latn">
 			<decimal>,</decimal>
 			<group> </group>
@@ -5793,9 +6662,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<decimalFormat>
 					<pattern type="1000" count="one">0 millier</pattern>
 					<pattern type="1000" count="other">0 mille</pattern>
-					<pattern type="10000" count="one">00 millier</pattern>
+					<pattern type="10000" count="one">00 mille</pattern>
 					<pattern type="10000" count="other">00 mille</pattern>
-					<pattern type="100000" count="one">000 millier</pattern>
+					<pattern type="100000" count="one">000 mille</pattern>
 					<pattern type="100000" count="other">000 mille</pattern>
 					<pattern type="1000000" count="one">0 million</pattern>
 					<pattern type="1000000" count="other">0 millions</pattern>
@@ -5869,6 +6738,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">0 k ¤</pattern>
+					<pattern type="1000" count="other">0 k ¤</pattern>
+					<pattern type="10000" count="one">00 k ¤</pattern>
+					<pattern type="10000" count="other">00 k ¤</pattern>
+					<pattern type="100000" count="one">000 k ¤</pattern>
+					<pattern type="100000" count="other">000 k ¤</pattern>
+					<pattern type="1000000" count="one">0 M ¤</pattern>
+					<pattern type="1000000" count="other">0 M ¤</pattern>
+					<pattern type="10000000" count="one">00 M ¤</pattern>
+					<pattern type="10000000" count="other">00 M ¤</pattern>
+					<pattern type="100000000" count="one">000 M ¤</pattern>
+					<pattern type="100000000" count="other">000 M ¤</pattern>
+					<pattern type="1000000000" count="one">0 Md ¤</pattern>
+					<pattern type="1000000000" count="other">0 Md ¤</pattern>
+					<pattern type="10000000000" count="one">00 Md ¤</pattern>
+					<pattern type="10000000000" count="other">00 Md ¤</pattern>
+					<pattern type="100000000000" count="one">000 Md ¤</pattern>
+					<pattern type="100000000000" count="other">000 Md ¤</pattern>
+					<pattern type="1000000000000" count="one">0 Bn ¤</pattern>
+					<pattern type="1000000000000" count="other">0 Bn ¤</pattern>
+					<pattern type="10000000000000" count="one">00 Bn ¤</pattern>
+					<pattern type="10000000000000" count="other">00 Bn ¤</pattern>
+					<pattern type="100000000000000" count="one">000 Bn ¤</pattern>
+					<pattern type="100000000000000" count="other">000 Bn ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -5924,6 +6821,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">kwanza angolais</displayName>
 				<displayName count="other">kwanzas angolais</displayName>
 				<symbol draft="contributed">AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>kwanza angolais (1977–1990)</displayName>
@@ -6014,6 +6912,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">mark convertible bosniaque</displayName>
 				<displayName count="other">marks convertibles bosniaques</displayName>
 				<symbol draft="contributed">BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>dollar barbadien</displayName>
@@ -6087,6 +6986,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">boliviano bolivien</displayName>
 				<displayName count="other">bolivianos boliviens</displayName>
 				<symbol draft="contributed">BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOL">
 				<displayName draft="unconfirmed">boliviano bolivien (1863–1963)</displayName>
@@ -6173,6 +7073,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">pula botswanais</displayName>
 				<displayName count="other">pulas botswanais</displayName>
 				<symbol draft="contributed">BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>nouveau rouble biélorusse (1994–1999)</displayName>
@@ -6289,6 +7190,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">peso cubain convertible</displayName>
 				<displayName count="other">pesos cubains convertibles</displayName>
 				<symbol draft="contributed">CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>peso cubain</displayName>
@@ -6314,6 +7216,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">couronne tchèque</displayName>
 				<displayName count="other">couronnes tchèques</displayName>
 				<symbol draft="contributed">CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>mark est-allemand</displayName>
@@ -6336,6 +7239,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">couronne danoise</displayName>
 				<displayName count="other">couronnes danoises</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>peso dominicain</displayName>
@@ -6372,6 +7276,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">livre égyptienne</displayName>
 				<displayName count="other">livres égyptiennes</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">£E</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>nafka érythréen</displayName>
@@ -6424,6 +7329,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">livre des îles Malouines</displayName>
 				<displayName count="other">livres des îles Malouines</displayName>
 				<symbol>£FK</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>franc français</displayName>
@@ -6449,6 +7355,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">lari géorgien</displayName>
 				<displayName count="other">lari géorgiens</displayName>
 				<symbol draft="contributed">GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>cédi</displayName>
@@ -6479,6 +7386,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">franc guinéen</displayName>
 				<displayName count="other">francs guinéens</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>syli guinéen</displayName>
@@ -6501,6 +7409,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">quetzal guatémaltèque</displayName>
 				<displayName count="other">quetzals guatémaltèques</displayName>
 				<symbol draft="contributed">GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>escudo de Guinée portugaise</displayName>
@@ -6531,6 +7440,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">lempira hondurien</displayName>
 				<displayName count="other">lempiras honduriens</displayName>
 				<symbol draft="contributed">HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>dinar croate</displayName>
@@ -6542,6 +7452,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">kuna croate</displayName>
 				<displayName count="other">kunas croates</displayName>
 				<symbol draft="contributed">HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>gourde haïtienne</displayName>
@@ -6554,12 +7465,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">forint hongrois</displayName>
 				<displayName count="other">forints hongrois</displayName>
 				<symbol draft="contributed">HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>roupie indonésienne</displayName>
 				<displayName count="one">roupie indonésienne</displayName>
 				<displayName count="other">roupies indonésiennes</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>livre irlandaise</displayName>
@@ -6610,6 +7523,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">couronne islandaise</displayName>
 				<displayName count="other">couronnes islandaises</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>lire italienne</displayName>
@@ -6661,12 +7575,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">franc comorien</displayName>
 				<displayName count="other">francs comoriens</displayName>
 				<symbol draft="contributed">KMF</symbol>
+				<symbol alt="narrow" draft="contributed">FC</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>won nord-coréen</displayName>
 				<displayName count="one">won nord-coréen</displayName>
 				<displayName count="other">wons nord-coréens</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRH">
 				<displayName draft="unconfirmed">hwan sud-coréen (1953–1962)</displayName>
@@ -6719,12 +7635,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">livre libanaise</displayName>
 				<displayName count="other">livres libanaises</displayName>
 				<symbol>£LB</symbol>
+				<symbol alt="narrow" draft="contributed">£L</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>roupie srilankaise</displayName>
 				<displayName count="one">roupie srilankaise</displayName>
 				<displayName count="other">roupies srilankaises</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>dollar libérien</displayName>
@@ -6805,6 +7723,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ariary malgache</displayName>
 				<displayName count="other">ariarys malgaches</displayName>
 				<symbol draft="contributed">MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>franc malgache</displayName>
@@ -6828,6 +7747,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">kyat myanmarais</displayName>
 				<displayName count="other">kyats myanmarais</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>tugrik mongol</displayName>
@@ -6864,6 +7784,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">roupie mauricienne</displayName>
 				<displayName count="other">roupies mauriciennes</displayName>
 				<symbol draft="contributed">MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVP">
 				<displayName draft="unconfirmed">roupie maldivienne</displayName>
@@ -6907,6 +7828,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ringgit malais</displayName>
 				<displayName count="other">ringgits malais</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>escudo mozambicain</displayName>
@@ -6951,6 +7873,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">córdoba oro nicaraguayen</displayName>
 				<displayName count="other">córdobas oro nicaraguayens</displayName>
 				<symbol draft="contributed">NIO</symbol>
+				<symbol alt="narrow" draft="contributed">$C</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>florin néerlandais</displayName>
@@ -6962,12 +7885,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">couronne norvégienne</displayName>
 				<displayName count="other">couronnes norvégiennes</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>roupie népalaise</displayName>
 				<displayName count="one">roupie népalaise</displayName>
 				<displayName count="other">roupies népalaises</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>dollar néo-zélandais</displayName>
@@ -7024,12 +7949,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">roupie pakistanaise</displayName>
 				<displayName count="other">roupies pakistanaises</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>zloty polonais</displayName>
 				<displayName count="one">zloty polonais</displayName>
 				<displayName count="other">zlotys polonais</displayName>
 				<symbol draft="contributed">PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>zloty (1950–1995)</displayName>
@@ -7082,6 +8009,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">rouble russe</displayName>
 				<displayName count="other">roubles russes</displayName>
 				<symbol draft="contributed">RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>rouble russe (1991–1998)</displayName>
@@ -7093,6 +8021,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">franc rwandais</displayName>
 				<displayName count="other">francs rwandais</displayName>
 				<symbol draft="contributed">RWF</symbol>
+				<symbol alt="narrow" draft="contributed">FR</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>rial saoudien</displayName>
@@ -7136,6 +8065,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">couronne suédoise</displayName>
 				<displayName count="other">couronnes suédoises</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>dollar de Singapour</displayName>
@@ -7149,6 +8079,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">livre de Sainte-Hélène</displayName>
 				<displayName count="other">livres de Sainte-Hélène</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>tolar slovène</displayName>
@@ -7197,6 +8128,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dobra santoméen</displayName>
 				<displayName count="other">dobras santoméens</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>rouble soviétique</displayName>
@@ -7214,6 +8146,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">livre syrienne</displayName>
 				<displayName count="other">livres syriennes</displayName>
 				<symbol draft="contributed">SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>lilangeni swazi</displayName>
@@ -7225,7 +8158,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>baht thaïlandais</displayName>
 				<displayName count="one">baht thaïlandais</displayName>
 				<displayName count="other">bahts thaïlandais</displayName>
-				<symbol>฿</symbol>
+				<symbol>THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>rouble tadjik</displayName>
@@ -7260,6 +8194,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">pa’anga tongan</displayName>
 				<displayName count="other">pa’angas tongans</displayName>
 				<symbol draft="contributed">TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>escudo timorais</displayName>
@@ -7279,6 +8214,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">livres turques</displayName>
 				<symbol draft="contributed">TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">LT</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>dollar trinidadien</displayName>
@@ -7379,6 +8315,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">bolivar vénézuélien</displayName>
 				<displayName count="other">bolivars vénézuéliens</displayName>
 				<symbol draft="contributed">VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>dông vietnamien</displayName>
@@ -7452,6 +8389,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dollar des Caraïbes orientales</displayName>
 				<displayName count="other">dollars des Caraïbes orientales</displayName>
 				<symbol draft="contributed">XCD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>droit de tirage spécial</displayName>
@@ -7526,8 +8464,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="XXX">
 				<displayName>devise inconnue ou non valide</displayName>
-				<displayName count="one">(devise inconnue ou non valide)</displayName>
-				<displayName count="other">(devise inconnue ou non valide)</displayName>
+				<displayName count="one">devise inconnue</displayName>
+				<displayName count="other">devises inconnues</displayName>
 				<symbol draft="unconfirmed">XXX</symbol>
 			</currency>
 			<currency type="YDD">
@@ -7568,6 +8506,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">rand sud-africain</displayName>
 				<displayName count="other">rands sud-africains</displayName>
 				<symbol draft="contributed">ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>kwacha zambien (1968–2012)</displayName>
@@ -7580,6 +8519,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">kwacha zambien</displayName>
 				<displayName count="other">kwachas zambiens</displayName>
 				<symbol draft="contributed">ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">Kw</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>nouveau zaïre zaïrien</displayName>
@@ -7613,8 +8553,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
-			<pattern type="atLeast" draft="contributed">au moins {0}</pattern>
-			<pattern type="range" draft="contributed">{0}–{1}</pattern>
+			<pattern type="atLeast">au moins {0}</pattern>
+			<pattern type="range">{0}–{1}</pattern>
 		</miscPatterns>
 	</numbers>
 	<units>
@@ -7632,40 +8572,67 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mètre par seconde carrée</unitPattern>
 				<unitPattern count="other">{0} mètres par seconde carrée</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName draft="contributed">minutes d’arc</displayName>
-				<unitPattern count="one">{0} minute d’arc</unitPattern>
-				<unitPattern count="other">{0} minutes d’arc</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName draft="contributed">secondes d’arc</displayName>
-				<unitPattern count="one">{0} seconde d’angle</unitPattern>
-				<unitPattern count="other">{0} secondes d’angle</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName>degrés</displayName>
-				<unitPattern count="one">{0} degré</unitPattern>
-				<unitPattern count="other">{0} degrés</unitPattern>
+			<unit type="angle-revolution">
+				<displayName>tour</displayName>
+				<unitPattern count="one">{0} tour</unitPattern>
+				<unitPattern count="other">{0} tours</unitPattern>
 			</unit>
 			<unit type="angle-radian">
 				<displayName>radians</displayName>
 				<unitPattern count="one">{0} radian</unitPattern>
 				<unitPattern count="other">{0} radians</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName>acres anglo-saxonnes</displayName>
-				<unitPattern count="one">{0} acre anglo-saxonne</unitPattern>
-				<unitPattern count="other">{0} acres anglo-saxonnes</unitPattern>
+			<unit type="angle-degree">
+				<displayName>degrés</displayName>
+				<unitPattern count="one">{0} degré</unitPattern>
+				<unitPattern count="other">{0} degrés</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>minutes d’arc</displayName>
+				<unitPattern count="one">{0} minute d’arc</unitPattern>
+				<unitPattern count="other">{0} minutes d’arc</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>secondes d’arc</displayName>
+				<unitPattern count="one">{0} seconde d’arc</unitPattern>
+				<unitPattern count="other">{0} secondes d’arc</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>kilomètres carrés</displayName>
+				<unitPattern count="one">{0} kilomètre carré</unitPattern>
+				<unitPattern count="other">{0} kilomètres carrés</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hectares</displayName>
 				<unitPattern count="one">{0} hectare</unitPattern>
 				<unitPattern count="other">{0} hectares</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>mètres carrés</displayName>
+				<unitPattern count="one">{0} mètre carré</unitPattern>
+				<unitPattern count="other">{0} mètres carrés</unitPattern>
+				<perUnitPattern>{0} par mètre carré</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>centimètres carrés</displayName>
 				<unitPattern count="one">{0} centimètre carré</unitPattern>
 				<unitPattern count="other">{0} centimètres carrés</unitPattern>
+				<perUnitPattern>{0} par centimètre carré</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>miles carrés</displayName>
+				<unitPattern count="one">{0} mile carré</unitPattern>
+				<unitPattern count="other">{0} miles carrés</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acres anglo-saxonnes</displayName>
+				<unitPattern count="one">{0} acre anglo-saxonne</unitPattern>
+				<unitPattern count="other">{0} acres anglo-saxonnes</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yards carrés</displayName>
+				<unitPattern count="one">{0} yard carré</unitPattern>
+				<unitPattern count="other">{0} yards carrés</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>pieds carrés</displayName>
@@ -7676,122 +8643,118 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>pouces carrés</displayName>
 				<unitPattern count="one">{0} pouce carré</unitPattern>
 				<unitPattern count="other">{0} pouces carrés</unitPattern>
+				<perUnitPattern>{0} par pouce carré</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kilomètres carrés</displayName>
-				<unitPattern count="one">{0} kilomètre carré</unitPattern>
-				<unitPattern count="other">{0} kilomètres carrés</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>mètres carrés</displayName>
-				<unitPattern count="one">{0} mètre carré</unitPattern>
-				<unitPattern count="other">{0} mètres carrés</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>miles carrés</displayName>
-				<unitPattern count="one">{0} mille anglais carré</unitPattern>
-				<unitPattern count="other">{0} milles anglais carrés</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yards carrés</displayName>
-				<unitPattern count="one">{0} yard carré</unitPattern>
-				<unitPattern count="other">{0} yards carrés</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>carats</displayName>
+				<unitPattern count="one">{0} carat</unitPattern>
+				<unitPattern count="other">{0} carats</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName draft="contributed">litres au kilomètre</displayName>
-				<unitPattern count="one" draft="contributed">{0} litre au kilomètre</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} litres au kilomètre</unitPattern>
+				<displayName>litres au kilomètre</displayName>
+				<unitPattern count="one">{0} litre au kilomètre</unitPattern>
+				<unitPattern count="other">{0} litres au kilomètre</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>litres aux 100 km</displayName>
+				<unitPattern count="one">{0} litre aux 100 km</unitPattern>
+				<unitPattern count="other">{0} litres aux 100 km</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
-				<displayName draft="contributed">miles par gallon</displayName>
-				<unitPattern count="one" draft="contributed">{0} mile par gallon</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} miles par gallon</unitPattern>
-			</unit>
-			<unit type="digital-bit">
-				<displayName>bits</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bits</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>octets</displayName>
-				<unitPattern count="one">{0} octet</unitPattern>
-				<unitPattern count="other">{0} octets</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabits</displayName>
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="other">{0} gigabits</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigaoctets</displayName>
-				<unitPattern count="one">{0} gigaoctet</unitPattern>
-				<unitPattern count="other">{0} gigaoctets</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobits</displayName>
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="other">{0} kilobits</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilooctets</displayName>
-				<unitPattern count="one">{0} kilooctet</unitPattern>
-				<unitPattern count="other">{0} kilooctets</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>mégabits</displayName>
-				<unitPattern count="one">{0} mégabit</unitPattern>
-				<unitPattern count="other">{0} mégabits</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>mégaoctets</displayName>
-				<unitPattern count="one">{0} mégaoctet</unitPattern>
-				<unitPattern count="other">{0} mégaoctets</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>térabits</displayName>
-				<unitPattern count="one">{0} térabit</unitPattern>
-				<unitPattern count="other">{0} térabits</unitPattern>
+				<displayName>miles par gallon</displayName>
+				<unitPattern count="one">{0} mile par gallon</unitPattern>
+				<unitPattern count="other">{0} miles par gallon</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
 				<displayName>téraoctets</displayName>
 				<unitPattern count="one">{0} téraoctet</unitPattern>
 				<unitPattern count="other">{0} téraoctets</unitPattern>
 			</unit>
-			<unit type="duration-day">
-				<displayName>jours</displayName>
-				<unitPattern count="one">{0} jour</unitPattern>
-				<unitPattern count="other">{0} jours</unitPattern>
+			<unit type="digital-terabit">
+				<displayName>térabits</displayName>
+				<unitPattern count="one">{0} térabit</unitPattern>
+				<unitPattern count="other">{0} térabits</unitPattern>
 			</unit>
-			<unit type="duration-hour">
-				<displayName>heures</displayName>
-				<unitPattern count="one">{0} heure</unitPattern>
-				<unitPattern count="other">{0} heures</unitPattern>
-				<perUnitPattern draft="contributed">{0} par heure</perUnitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>gigaoctets</displayName>
+				<unitPattern count="one">{0} gigaoctet</unitPattern>
+				<unitPattern count="other">{0} gigaoctets</unitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>microsecondes</displayName>
-				<unitPattern count="one">{0} microseconde</unitPattern>
-				<unitPattern count="other">{0} microsecondes</unitPattern>
+			<unit type="digital-gigabit">
+				<displayName>gigabits</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="other">{0} gigabits</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>millisecondes</displayName>
-				<unitPattern count="one">{0} milliseconde</unitPattern>
-				<unitPattern count="other">{0} millisecondes</unitPattern>
+			<unit type="digital-megabyte">
+				<displayName>mégaoctets</displayName>
+				<unitPattern count="one">{0} mégaoctet</unitPattern>
+				<unitPattern count="other">{0} mégaoctets</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>minutes</displayName>
-				<unitPattern count="one">{0} minute</unitPattern>
-				<unitPattern count="other">{0} minutes</unitPattern>
+			<unit type="digital-megabit">
+				<displayName>mégabits</displayName>
+				<unitPattern count="one">{0} mégabit</unitPattern>
+				<unitPattern count="other">{0} mégabits</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilooctets</displayName>
+				<unitPattern count="one">{0} kilooctet</unitPattern>
+				<unitPattern count="other">{0} kilooctets</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobits</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="other">{0} kilobits</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>octets</displayName>
+				<unitPattern count="one">{0} octet</unitPattern>
+				<unitPattern count="other">{0} octets</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bits</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bits</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>siècles</displayName>
+				<unitPattern count="one">{0} siècle</unitPattern>
+				<unitPattern count="other">{0} siècles</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ans</displayName>
+				<unitPattern count="one">{0} an</unitPattern>
+				<unitPattern count="other">{0} ans</unitPattern>
+				<perUnitPattern>{0} par an</perUnitPattern>
 			</unit>
 			<unit type="duration-month">
 				<displayName>mois</displayName>
 				<unitPattern count="one">{0} mois</unitPattern>
 				<unitPattern count="other">{0} mois</unitPattern>
+				<perUnitPattern>{0} par mois</perUnitPattern>
 			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanosecondes</displayName>
-				<unitPattern count="one">{0} nanoseconde</unitPattern>
-				<unitPattern count="other">{0} nanosecondes</unitPattern>
+			<unit type="duration-week">
+				<displayName>semaines</displayName>
+				<unitPattern count="one">{0} semaine</unitPattern>
+				<unitPattern count="other">{0} semaines</unitPattern>
+				<perUnitPattern>{0} par semaine</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>jours</displayName>
+				<unitPattern count="one">{0} jour</unitPattern>
+				<unitPattern count="other">{0} jours</unitPattern>
+				<perUnitPattern>{0} par jour</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>heures</displayName>
+				<unitPattern count="one">{0} heure</unitPattern>
+				<unitPattern count="other">{0} heures</unitPattern>
+				<perUnitPattern>{0} par heure</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>minutes</displayName>
+				<unitPattern count="one">{0} minute</unitPattern>
+				<unitPattern count="other">{0} minutes</unitPattern>
+				<perUnitPattern>{0} par minute</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>secondes</displayName>
@@ -7799,15 +8762,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} secondes</unitPattern>
 				<perUnitPattern>{0} par seconde</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>semaines</displayName>
-				<unitPattern count="one">{0} semaine</unitPattern>
-				<unitPattern count="other">{0} semaines</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>millisecondes</displayName>
+				<unitPattern count="one">{0} milliseconde</unitPattern>
+				<unitPattern count="other">{0} millisecondes</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>ans</displayName>
-				<unitPattern count="one">{0} an</unitPattern>
-				<unitPattern count="other">{0} ans</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>microsecondes</displayName>
+				<unitPattern count="one">{0} microseconde</unitPattern>
+				<unitPattern count="other">{0} microsecondes</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosecondes</displayName>
+				<unitPattern count="one">{0} nanoseconde</unitPattern>
+				<unitPattern count="other">{0} nanosecondes</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ampères</displayName>
@@ -7829,6 +8797,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} volt</unitPattern>
 				<unitPattern count="other">{0} volts</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilocalories</displayName>
+				<unitPattern count="one">{0} kilocalorie</unitPattern>
+				<unitPattern count="other">{0} kilocalories</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>calories</displayName>
 				<unitPattern count="one">{0} calorie</unitPattern>
@@ -7839,21 +8812,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kilocalorie</unitPattern>
 				<unitPattern count="other">{0} kilocalories</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joules</displayName>
-				<unitPattern count="one">{0} joule</unitPattern>
-				<unitPattern count="other">{0} joules</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilocalories</displayName>
-				<unitPattern count="one">{0} kilocalorie</unitPattern>
-				<unitPattern count="other">{0} kilocalories</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojoules</displayName>
 				<unitPattern count="one">{0} kilojoule</unitPattern>
 				<unitPattern count="other">{0} kilojoules</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joules</displayName>
+				<unitPattern count="one">{0} joule</unitPattern>
+				<unitPattern count="other">{0} joules</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilowattheures</displayName>
 				<unitPattern count="one">{0} kilowattheure</unitPattern>
@@ -7864,216 +8832,220 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} gigahertz</unitPattern>
 				<unitPattern count="other">{0} gigahertz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hertz</displayName>
-				<unitPattern count="one">{0} hertz</unitPattern>
-				<unitPattern count="other">{0} hertz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>mégahertz</displayName>
+				<unitPattern count="one">{0} mégahertz</unitPattern>
+				<unitPattern count="other">{0} mégahertz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kilohertz</displayName>
 				<unitPattern count="one">{0} kilohertz</unitPattern>
 				<unitPattern count="other">{0} kilohertz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>mégahertz</displayName>
-				<unitPattern count="one">{0} mégahertz</unitPattern>
-				<unitPattern count="other">{0} mégahertz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hertz</displayName>
+				<unitPattern count="one">{0} hertz</unitPattern>
+				<unitPattern count="other">{0} hertz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>unités astronomiques</displayName>
-				<unitPattern count="one">{0} unité astronomique</unitPattern>
-				<unitPattern count="other">{0} unités astronomiques</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilomètres</displayName>
+				<unitPattern count="one">{0} kilomètre</unitPattern>
+				<unitPattern count="other">{0} kilomètres</unitPattern>
+				<perUnitPattern>{0} par kilomètre</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>centimètres</displayName>
-				<unitPattern count="one">{0} centimètre</unitPattern>
-				<unitPattern count="other">{0} centimètres</unitPattern>
+			<unit type="length-meter">
+				<displayName>mètres</displayName>
+				<unitPattern count="one">{0} mètre</unitPattern>
+				<unitPattern count="other">{0} mètres</unitPattern>
+				<perUnitPattern>{0} par mètre</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>décimètres</displayName>
 				<unitPattern count="one">{0} décimètre</unitPattern>
 				<unitPattern count="other">{0} décimètres</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName draft="unconfirmed">fathoms</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} fathom</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} fathoms</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>pieds</displayName>
-				<unitPattern count="one">{0} pied</unitPattern>
-				<unitPattern count="other">{0} pieds</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName draft="unconfirmed">sillons</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} sillon</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} sillons</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>pouces</displayName>
-				<unitPattern count="one">{0} pouce</unitPattern>
-				<unitPattern count="other">{0} pouces</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilomètres</displayName>
-				<unitPattern count="one">{0} kilomètre</unitPattern>
-				<unitPattern count="other">{0} kilomètres</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>années-lumière</displayName>
-				<unitPattern count="one">{0} année-lumière</unitPattern>
-				<unitPattern count="other">{0} années-lumière</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>mètres</displayName>
-				<unitPattern count="one">{0} mètre</unitPattern>
-				<unitPattern count="other">{0} mètres</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>micromètres</displayName>
-				<unitPattern count="one">{0} micromètre</unitPattern>
-				<unitPattern count="other">{0} micromètres</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName draft="contributed">milles anglais</displayName>
-				<unitPattern count="one">{0} mille anglais</unitPattern>
-				<unitPattern count="other">{0} milles anglais</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>centimètres</displayName>
+				<unitPattern count="one">{0} centimètre</unitPattern>
+				<unitPattern count="other">{0} centimètres</unitPattern>
+				<perUnitPattern>{0} par centimètre</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>millimètres</displayName>
 				<unitPattern count="one">{0} millimètre</unitPattern>
 				<unitPattern count="other">{0} millimètres</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>micromètres</displayName>
+				<unitPattern count="one">{0} micromètre</unitPattern>
+				<unitPattern count="other">{0} micromètres</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanomètres</displayName>
 				<unitPattern count="one">{0} nanomètre</unitPattern>
 				<unitPattern count="other">{0} nanomètres</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>milles marins</displayName>
-				<unitPattern count="one">{0} mille marin</unitPattern>
-				<unitPattern count="other">{0} milles marins</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsecs</displayName>
-				<unitPattern count="one">{0} parsec</unitPattern>
-				<unitPattern count="other">{0} parsecs</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>picomètres</displayName>
 				<unitPattern count="one">{0} picomètre</unitPattern>
 				<unitPattern count="other">{0} picomètres</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="contributed">milles anglais</displayName>
+				<unitPattern count="one">{0} mille anglais</unitPattern>
+				<unitPattern count="other">{0} milles anglais</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yards</displayName>
 				<unitPattern count="one">{0} yard</unitPattern>
 				<unitPattern count="other">{0} yards</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>pieds</displayName>
+				<unitPattern count="one">{0} pied</unitPattern>
+				<unitPattern count="other">{0} pieds</unitPattern>
+				<perUnitPattern>{0} par pied</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>pouces</displayName>
+				<unitPattern count="one">{0} pouce</unitPattern>
+				<unitPattern count="other">{0} pouces</unitPattern>
+				<perUnitPattern>{0} par pouce</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsecs</displayName>
+				<unitPattern count="one">{0} parsec</unitPattern>
+				<unitPattern count="other">{0} parsecs</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>années-lumière</displayName>
+				<unitPattern count="one">{0} année-lumière</unitPattern>
+				<unitPattern count="other">{0} années-lumière</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>unités astronomiques</displayName>
+				<unitPattern count="one">{0} unité astronomique</unitPattern>
+				<unitPattern count="other">{0} unités astronomiques</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName draft="unconfirmed">sillons</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} sillon</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} sillons</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName draft="unconfirmed">brasses</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} brasse</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} brasses</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>milles marins</displayName>
+				<unitPattern count="one">{0} mille marin</unitPattern>
+				<unitPattern count="other">{0} milles marins</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>milles scandinaves</displayName>
+				<unitPattern count="one">{0} mille scandinave</unitPattern>
+				<unitPattern count="other">{0} milles scandinaves</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>carats</displayName>
-				<unitPattern count="one">{0} carat</unitPattern>
-				<unitPattern count="other">{0} carats</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>grammes</displayName>
-				<unitPattern count="one">{0} gramme</unitPattern>
-				<unitPattern count="other">{0} grammes</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogrammes</displayName>
-				<unitPattern count="one">{0} kilogramme</unitPattern>
-				<unitPattern count="other">{0} kilogrammes</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>tonnes</displayName>
 				<unitPattern count="one">{0} tonne</unitPattern>
 				<unitPattern count="other">{0} tonnes</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>microgrammes</displayName>
-				<unitPattern count="one">{0} microgramme</unitPattern>
-				<unitPattern count="other">{0} microgrammes</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogrammes</displayName>
+				<unitPattern count="one">{0} kilogramme</unitPattern>
+				<unitPattern count="other">{0} kilogrammes</unitPattern>
+				<perUnitPattern>{0} par kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>grammes</displayName>
+				<unitPattern count="one">{0} gramme</unitPattern>
+				<unitPattern count="other">{0} grammes</unitPattern>
+				<perUnitPattern>{0} par gramme</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>milligrammes</displayName>
 				<unitPattern count="one">{0} milligramme</unitPattern>
 				<unitPattern count="other">{0} milligrammes</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>onces</displayName>
-				<unitPattern count="one">{0} once</unitPattern>
-				<unitPattern count="other">{0} onces</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>onces troy</displayName>
-				<unitPattern count="one">{0} once troy</unitPattern>
-				<unitPattern count="other">{0} onces troy</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>livres</displayName>
-				<unitPattern count="one">{0} livre</unitPattern>
-				<unitPattern count="other">{0} livres</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="contributed">stones</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} stone</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} stone</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>microgrammes</displayName>
+				<unitPattern count="one">{0} microgramme</unitPattern>
+				<unitPattern count="other">{0} microgrammes</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tonnes courtes</displayName>
 				<unitPattern count="one">{0} tonne courte</unitPattern>
 				<unitPattern count="other">{0} tonnes courtes</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName draft="contributed">stones</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} stone</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} stone</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>livres</displayName>
+				<unitPattern count="one">{0} livre</unitPattern>
+				<unitPattern count="other">{0} livres</unitPattern>
+				<perUnitPattern>{0} par livre</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>onces</displayName>
+				<unitPattern count="one">{0} once</unitPattern>
+				<unitPattern count="other">{0} onces</unitPattern>
+				<perUnitPattern>{0} par once</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>onces troy</displayName>
+				<unitPattern count="one">{0} once troy</unitPattern>
+				<unitPattern count="other">{0} onces troy</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>carats</displayName>
+				<unitPattern count="one">{0} carat</unitPattern>
+				<unitPattern count="other">{0} carats</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigawatts</displayName>
 				<unitPattern count="one">{0} gigawatt</unitPattern>
 				<unitPattern count="other">{0} gigawatts</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>chevaux-vapeur</displayName>
-				<unitPattern count="one">{0} cheval-vapeur</unitPattern>
-				<unitPattern count="other">{0} chevaux-vapeur</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilowatts</displayName>
-				<unitPattern count="one">{0} kilowatt</unitPattern>
-				<unitPattern count="other">{0} kilowatts</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>mégawatts</displayName>
 				<unitPattern count="one">{0} mégawatt</unitPattern>
 				<unitPattern count="other">{0} mégawatts</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>milliwatts</displayName>
-				<unitPattern count="one">{0} milliwatt</unitPattern>
-				<unitPattern count="other">{0} milliwatts</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilowatts</displayName>
+				<unitPattern count="one">{0} kilowatt</unitPattern>
+				<unitPattern count="other">{0} kilowatts</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watts</displayName>
 				<unitPattern count="one">{0} watt</unitPattern>
 				<unitPattern count="other">{0} watts</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>milliwatts</displayName>
+				<unitPattern count="one">{0} milliwatt</unitPattern>
+				<unitPattern count="other">{0} milliwatts</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>chevaux-vapeur</displayName>
+				<unitPattern count="one">{0} cheval-vapeur</unitPattern>
+				<unitPattern count="other">{0} chevaux-vapeur</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hectopascals</displayName>
 				<unitPattern count="one">{0} hectopascal</unitPattern>
 				<unitPattern count="other">{0} hectopascals</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>pouces de mercure</displayName>
-				<unitPattern count="one">{0} pouce de mercure</unitPattern>
-				<unitPattern count="other">{0} pouces de mercure</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>millibars</displayName>
-				<unitPattern count="one">{0} millibar</unitPattern>
-				<unitPattern count="other">{0} millibars</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>millimètres de mercure</displayName>
 				<unitPattern count="one">{0} millimètre de mercure</unitPattern>
@@ -8084,13 +9056,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} livre par pouce carré</unitPattern>
 				<unitPattern count="other">{0} livres par pouce carré</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>carats</displayName>
-				<unitPattern count="one">{0} carat</unitPattern>
-				<unitPattern count="other">{0} carats</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>pouces de mercure</displayName>
+				<unitPattern count="one">{0} pouce de mercure</unitPattern>
+				<unitPattern count="other">{0} pouces de mercure</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>millibars</displayName>
+				<unitPattern count="one">{0} millibar</unitPattern>
+				<unitPattern count="other">{0} millibars</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName draft="contributed">kilomètres par heure</displayName>
+				<displayName>kilomètres par heure</displayName>
 				<unitPattern count="one">{0} kilomètre par heure</unitPattern>
 				<unitPattern count="other">{0} kilomètres par heure</unitPattern>
 			</unit>
@@ -8104,6 +9081,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mille anglais par heure</unitPattern>
 				<unitPattern count="other">{0} milles anglais par heure</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>nœuds</displayName>
+				<unitPattern count="one">{0} nœud</unitPattern>
+				<unitPattern count="other">{0} nœuds</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>degrés</displayName>
+				<unitPattern count="one">{0} degré</unitPattern>
+				<unitPattern count="other">{0} degrés</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>degrés Celsius</displayName>
 				<unitPattern count="one">{0} degré Celsius</unitPattern>
@@ -8119,36 +9106,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kelvin</unitPattern>
 				<unitPattern count="other">{0} kelvins</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>acres-pieds</displayName>
-				<unitPattern count="one">{0} acre-pied</unitPattern>
-				<unitPattern count="other">{0} acres-pieds</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName draft="unconfirmed">boisseaux</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} boisseau</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} boisseaux</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>centilitres</displayName>
-				<unitPattern count="one">{0} centilitre</unitPattern>
-				<unitPattern count="other">{0} centilitres</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>centimètres cubes</displayName>
-				<unitPattern count="one">{0} centimètre cube</unitPattern>
-				<unitPattern count="other">{0} centimètres cubes</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>pieds cubes</displayName>
-				<unitPattern count="one">{0} pied cube</unitPattern>
-				<unitPattern count="other">{0} pieds cubes</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>pouces cubes</displayName>
-				<unitPattern count="one">{0} pouce cube</unitPattern>
-				<unitPattern count="other">{0} pouces cubes</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kilomètres cubes</displayName>
 				<unitPattern count="one">{0} kilomètre cube</unitPattern>
@@ -8158,6 +9115,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>mètres cubes</displayName>
 				<unitPattern count="one">{0} mètre cube</unitPattern>
 				<unitPattern count="other">{0} mètres cubes</unitPattern>
+				<perUnitPattern>{0} par mètre cube</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>centimètres cubes</displayName>
+				<unitPattern count="one">{0} centimètre cube</unitPattern>
+				<unitPattern count="other">{0} centimètres cubes</unitPattern>
+				<perUnitPattern>{0} par centimètre cube</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName draft="contributed">milles anglais cubes</displayName>
@@ -8169,25 +9133,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yard cube</unitPattern>
 				<unitPattern count="other">{0} yards cubes</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>tasses</displayName>
-				<unitPattern count="one">{0} tasse</unitPattern>
-				<unitPattern count="other">{0} tasses</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>pieds cubes</displayName>
+				<unitPattern count="one">{0} pied cube</unitPattern>
+				<unitPattern count="other">{0} pieds cubes</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>décilitres</displayName>
-				<unitPattern count="one">{0} décilitre</unitPattern>
-				<unitPattern count="other">{0} décilitres</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>pouces cubes</displayName>
+				<unitPattern count="one">{0} pouce cube</unitPattern>
+				<unitPattern count="other">{0} pouces cubes</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>onces liquides</displayName>
-				<unitPattern count="one">{0} once liquide</unitPattern>
-				<unitPattern count="other">{0} onces liquides</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gallons</displayName>
-				<unitPattern count="one">{0} gallon</unitPattern>
-				<unitPattern count="other">{0} gallons</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>mégalitres</displayName>
+				<unitPattern count="one">{0} mégalitre</unitPattern>
+				<unitPattern count="other">{0} mégalitres</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hectolitres</displayName>
@@ -8198,27 +9157,69 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>litres</displayName>
 				<unitPattern count="one">{0} litre</unitPattern>
 				<unitPattern count="other">{0} litres</unitPattern>
+				<perUnitPattern>{0} par litre</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>mégalitres</displayName>
-				<unitPattern count="one">{0} mégalitre</unitPattern>
-				<unitPattern count="other">{0} mégalitres</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>décilitres</displayName>
+				<unitPattern count="one">{0} décilitre</unitPattern>
+				<unitPattern count="other">{0} décilitres</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centilitres</displayName>
+				<unitPattern count="one">{0} centilitre</unitPattern>
+				<unitPattern count="other">{0} centilitres</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>millilitres</displayName>
 				<unitPattern count="one">{0} millilitre</unitPattern>
 				<unitPattern count="other">{0} millilitres</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pintes</displayName>
-				<unitPattern count="one">{0} pinte</unitPattern>
-				<unitPattern count="other">{0} pintes</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>pintes métriques</displayName>
+				<unitPattern count="one">{0} pinte métrique</unitPattern>
+				<unitPattern count="other">{0} pintes métriques</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>tasses métriques</displayName>
+				<unitPattern count="one">{0} tasse métrique</unitPattern>
+				<unitPattern count="other">{0} tasses métriques</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acres-pieds</displayName>
+				<unitPattern count="one">{0} acre-pied</unitPattern>
+				<unitPattern count="other">{0} acres-pieds</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName draft="unconfirmed">boisseaux</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} boisseau</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} boisseaux</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gallons</displayName>
+				<unitPattern count="one">{0} gallon</unitPattern>
+				<unitPattern count="other">{0} gallons</unitPattern>
+				<perUnitPattern>{0} par gallon</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>quarts</displayName>
 				<unitPattern count="one">{0} quart</unitPattern>
 				<unitPattern count="other">{0} quarts</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pintes</displayName>
+				<unitPattern count="one">{0} pinte</unitPattern>
+				<unitPattern count="other">{0} pintes</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>tasses</displayName>
+				<unitPattern count="one">{0} tasse</unitPattern>
+				<unitPattern count="other">{0} tasses</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>onces liquides</displayName>
+				<unitPattern count="one">{0} once liquide</unitPattern>
+				<unitPattern count="other">{0} onces liquides</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>cuillères à soupe</displayName>
 				<unitPattern count="one">{0} cuillère à soupe</unitPattern>
@@ -8229,13 +9230,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} cuillère à café</unitPattern>
 				<unitPattern count="other">{0} cuillères à café</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} est</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} nord</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} sud</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} ouest</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
 				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
-				<displayName draft="contributed">G</displayName>
+				<displayName>G</displayName>
 				<unitPattern count="one">{0} G</unitPattern>
 				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
@@ -8244,6 +9251,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>tr</displayName>
+				<unitPattern count="one">{0} tr</unitPattern>
+				<unitPattern count="other">{0} tr</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>′</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
@@ -8254,30 +9276,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>°</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ac</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ha</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ac</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>pi²</displayName>
@@ -8288,91 +9322,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>po²</displayName>
 				<unitPattern count="one">{0} po²</unitPattern>
 				<unitPattern count="other">{0} po²</unitPattern>
+				<perUnitPattern>{0}/po²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>ct</displayName>
+				<unitPattern count="one">{0} ct</unitPattern>
+				<unitPattern count="other">{0} ct</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName>L/km</displayName>
-				<unitPattern count="one">{0} L/km</unitPattern>
-				<unitPattern count="other">{0} L/km</unitPattern>
+				<displayName>l/km</displayName>
+				<unitPattern count="one">{0} l/km</unitPattern>
+				<unitPattern count="other">{0} l/km</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mi/gal</displayName>
 				<unitPattern count="one">{0} mi/gal</unitPattern>
 				<unitPattern count="other">{0} mi/gal</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>octet</displayName>
-				<unitPattern count="one">{0} octet</unitPattern>
-				<unitPattern count="other">{0} octet</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>Go</displayName>
-				<unitPattern count="one">{0} Go</unitPattern>
-				<unitPattern count="other">{0} Go</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>ko</displayName>
-				<unitPattern count="one">{0} ko</unitPattern>
-				<unitPattern count="other">{0} ko</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>Mo</displayName>
-				<unitPattern count="one">{0} Mo</unitPattern>
-				<unitPattern count="other">{0} Mo</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>To</displayName>
+				<unitPattern count="one">{0} To</unitPattern>
+				<unitPattern count="other">{0} To</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>Tb</displayName>
 				<unitPattern count="one">{0} Tb</unitPattern>
 				<unitPattern count="other">{0} Tb</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>To</displayName>
-				<unitPattern count="one">{0} To</unitPattern>
-				<unitPattern count="other">{0} To</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>Go</displayName>
+				<unitPattern count="one">{0} Go</unitPattern>
+				<unitPattern count="other">{0} Go</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>Mo</displayName>
+				<unitPattern count="one">{0} Mo</unitPattern>
+				<unitPattern count="other">{0} Mo</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>ko</displayName>
+				<unitPattern count="one">{0} ko</unitPattern>
+				<unitPattern count="other">{0} ko</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>octet</displayName>
+				<unitPattern count="one">{0} octet</unitPattern>
+				<unitPattern count="other">{0} octet</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>si</displayName>
+				<unitPattern count="one">{0} si</unitPattern>
+				<unitPattern count="other">{0} si</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ans</displayName>
+				<unitPattern count="one">{0} an</unitPattern>
+				<unitPattern count="other">{0} ans</unitPattern>
+				<perUnitPattern>{0}/an</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/mois</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>sem.</displayName>
+				<unitPattern count="one">{0} sem.</unitPattern>
+				<unitPattern count="other">{0} sem.</unitPattern>
+				<perUnitPattern>{0}/sem</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>j</displayName>
 				<unitPattern count="one">{0} j</unitPattern>
 				<unitPattern count="other">{0} j</unitPattern>
+				<perUnitPattern>{0}/j</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>h</displayName>
@@ -8380,30 +9429,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} h</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>m</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>s</displayName>
@@ -8411,15 +9441,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} s</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>sem.</displayName>
-				<unitPattern count="one">{0} sem.</unitPattern>
-				<unitPattern count="other">{0} sem.</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>ans</displayName>
-				<unitPattern count="one">{0} an</unitPattern>
-				<unitPattern count="other">{0} ans</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>A</displayName>
@@ -8441,6 +9476,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -8451,21 +9491,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kcal</unitPattern>
 				<unitPattern count="other">{0} kcal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>J</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -8476,216 +9511,220 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>ua</displayName>
-				<unitPattern count="one">{0} ua</unitPattern>
-				<unitPattern count="other">{0} ua</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName draft="unconfirmed">fat</displayName>
-				<unitPattern count="one">{0} fat</unitPattern>
-				<unitPattern count="other">{0} fat</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>pi</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName draft="unconfirmed">sil</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} sil</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} sil</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>po</displayName>
-				<unitPattern count="one">{0} po</unitPattern>
-				<unitPattern count="other">{0} po</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName draft="contributed">a.l.</displayName>
-				<unitPattern count="one">{0} a.l.</unitPattern>
-				<unitPattern count="other">{0} a.l.</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mi</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="one">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yd</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>pi</displayName>
+				<unitPattern count="one">{0} pi</unitPattern>
+				<unitPattern count="other">{0} pi</unitPattern>
+				<perUnitPattern>{0}/pi</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>po</displayName>
+				<unitPattern count="one">{0} po</unitPattern>
+				<unitPattern count="other">{0} po</unitPattern>
+				<perUnitPattern>{0}/po</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>al</displayName>
+				<unitPattern count="one">{0} al</unitPattern>
+				<unitPattern count="other">{0} al</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ua</displayName>
+				<unitPattern count="one">{0} ua</unitPattern>
+				<unitPattern count="other">{0} ua</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName draft="unconfirmed">sil</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} sil</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} sil</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName draft="unconfirmed">fat</displayName>
+				<unitPattern count="one">{0} fat</unitPattern>
+				<unitPattern count="other">{0} fat</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>ct</displayName>
-				<unitPattern count="one">{0} ct</unitPattern>
-				<unitPattern count="other">{0} ct</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="unconfirmed">st</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} st</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} st</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>sh tn</displayName>
 				<unitPattern count="one">{0} sh tn</unitPattern>
 				<unitPattern count="other">{0} sh tn</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName draft="unconfirmed">st</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} st</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>ct</displayName>
+				<unitPattern count="one">{0} ct</unitPattern>
+				<unitPattern count="other">{0} ct</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>ch</displayName>
-				<unitPattern count="one">{0} ch</unitPattern>
-				<unitPattern count="other">{0} ch</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>W</displayName>
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>ch</displayName>
+				<unitPattern count="one">{0} ch</unitPattern>
+				<unitPattern count="other">{0} ch</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -8696,10 +9735,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} lb/po²</unitPattern>
 				<unitPattern count="other">{0} lb/po²</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>ct</displayName>
-				<unitPattern count="one">{0} ct</unitPattern>
-				<unitPattern count="other">{0} ct</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -8707,7 +9751,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} km/h</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
-				<displayName draft="contributed">m/s</displayName>
+				<displayName>m/s</displayName>
 				<unitPattern count="one">{0} m/s</unitPattern>
 				<unitPattern count="other">{0} m/s</unitPattern>
 			</unit>
@@ -8716,6 +9760,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>nd</displayName>
+				<unitPattern count="one">{0} nd</unitPattern>
+				<unitPattern count="other">{0} nd</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0} °C</unitPattern>
@@ -8731,36 +9785,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac pi</displayName>
-				<unitPattern count="one">{0} ac pi</unitPattern>
-				<unitPattern count="other">{0} ac pi</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName draft="unconfirmed">boisseaux</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} bu</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} bu</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>pi³</displayName>
-				<unitPattern count="one">{0} pi³</unitPattern>
-				<unitPattern count="other">{0} pi³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>po³</displayName>
-				<unitPattern count="one">{0} po³</unitPattern>
-				<unitPattern count="other">{0} po³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -8770,6 +9794,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -8781,25 +9812,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>tasses</displayName>
-				<unitPattern count="one">{0} tasse</unitPattern>
-				<unitPattern count="other">{0} tasses</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>pi³</displayName>
+				<unitPattern count="one">{0} pi³</unitPattern>
+				<unitPattern count="other">{0} pi³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>po³</displayName>
+				<unitPattern count="one">{0} po³</unitPattern>
+				<unitPattern count="other">{0} po³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -8807,30 +9833,72 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} hl</unitPattern>
 			</unit>
 			<unit type="volume-liter">
-				<displayName>L</displayName>
-				<unitPattern count="one">{0} L</unitPattern>
-				<unitPattern count="other">{0} L</unitPattern>
+				<displayName>l</displayName>
+				<unitPattern count="one">{0} l</unitPattern>
+				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="one">{0} Ml</unitPattern>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
 				<unitPattern count="one">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pte</displayName>
-				<unitPattern count="one">{0} pte</unitPattern>
-				<unitPattern count="other">{0} pte</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>tm</displayName>
+				<unitPattern count="one">{0} tm</unitPattern>
+				<unitPattern count="other">{0} tm</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac pi</displayName>
+				<unitPattern count="one">{0} ac pi</unitPattern>
+				<unitPattern count="other">{0} ac pi</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName draft="unconfirmed">boisseaux</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} bu</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} bu</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pte</displayName>
+				<unitPattern count="one">{0} pte</unitPattern>
+				<unitPattern count="other">{0} pte</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>tasses</displayName>
+				<unitPattern count="one">{0} tasse</unitPattern>
+				<unitPattern count="other">{0} tasses</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>c. à s.</displayName>
 				<unitPattern count="one">{0} c. à s.</unitPattern>
@@ -8841,6 +9909,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} c. à c.</unitPattern>
 				<unitPattern count="other">{0} c. à c.</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} O</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -8856,6 +9930,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}m/s²</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName draft="unconfirmed">tr</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}tr</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}tr</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName draft="unconfirmed">′</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
@@ -8866,101 +9955,127 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>°</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0}ac</unitPattern>
-				<unitPattern count="other">{0}ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0}km²</unitPattern>
+				<unitPattern count="other">{0}km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0}ha</unitPattern>
 				<unitPattern count="other">{0}ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<unitPattern count="one">{0}m²</unitPattern>
+				<unitPattern count="other">{0}m²</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/m²</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<perUnitPattern draft="unconfirmed">{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<unitPattern count="one">{0}mi²</unitPattern>
+				<unitPattern count="other">{0}mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0}ac</unitPattern>
+				<unitPattern count="other">{0}ac</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<displayName>pi²</displayName>
 				<unitPattern count="one">{0}pi²</unitPattern>
 				<unitPattern count="other">{0}pi²</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0}km²</unitPattern>
-				<unitPattern count="other">{0}km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<unitPattern count="one">{0}m²</unitPattern>
-				<unitPattern count="other">{0}m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<unitPattern count="one">{0}mi²</unitPattern>
-				<unitPattern count="other">{0}mi²</unitPattern>
+			<unit type="area-square-inch">
+				<perUnitPattern draft="unconfirmed">{0}/po²</perUnitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100km</displayName>
+				<unitPattern count="one">{0}l/100km</unitPattern>
+				<unitPattern count="other">{0}l/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mi/gal</displayName>
 			</unit>
-			<unit type="digital-bit">
-				<displayName draft="unconfirmed">bit</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}bit</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName draft="unconfirmed">octet</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} octet</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} octet</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName draft="unconfirmed">Gb</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}Gb</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName draft="unconfirmed">Go</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}Go</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}Go</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName draft="unconfirmed">kb</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}kb</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName draft="unconfirmed">ko</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}ko</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}ko</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName draft="unconfirmed">Mb</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}Mb</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName draft="unconfirmed">Mo</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}Mo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}Mo</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName draft="unconfirmed">Tb</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}Tb</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName draft="unconfirmed">To</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}To</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}To</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName draft="unconfirmed">Tb</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}Tb</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName draft="unconfirmed">Go</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}Go</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}Go</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName draft="unconfirmed">Gb</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}Gb</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName draft="unconfirmed">Mo</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}Mo</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}Mo</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName draft="unconfirmed">Mb</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}Mb</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName draft="unconfirmed">ko</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}ko</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}ko</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName draft="unconfirmed">kb</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}kb</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName draft="unconfirmed">octet</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}octet</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}octet</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName draft="unconfirmed">bit</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}bit</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="unconfirmed">si</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}si</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}si</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>a</displayName>
+				<unitPattern count="one">{0}a</unitPattern>
+				<unitPattern count="other">{0}a</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/a</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0}m</unitPattern>
+				<unitPattern count="other">{0}m</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/mo</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>sem</displayName>
+				<unitPattern count="one">{0}sem</unitPattern>
+				<unitPattern count="other">{0}sem</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/sem</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>j</displayName>
 				<unitPattern count="one">{0}j</unitPattern>
 				<unitPattern count="other">{0}j</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/d</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>h</displayName>
@@ -8968,30 +10083,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0}h</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName draft="unconfirmed">μs</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}µs</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}µs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0}ms</unitPattern>
-				<unitPattern count="other">{0}ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0}m</unitPattern>
 				<unitPattern count="other">{0}m</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>m</displayName>
-				<unitPattern count="one">{0}m</unitPattern>
-				<unitPattern count="other">{0}m</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName draft="unconfirmed">ns</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}ns</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}ns</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>s</displayName>
@@ -8999,167 +10095,182 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0}s</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>sem</displayName>
-				<unitPattern count="one">{0}sem</unitPattern>
-				<unitPattern count="other">{0}sem</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0}ms</unitPattern>
+				<unitPattern count="other">{0}ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>a</displayName>
-				<unitPattern count="one">{0}a</unitPattern>
-				<unitPattern count="other">{0}a</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName draft="unconfirmed">μs</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}µs</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}µs</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>ua</displayName>
-				<unitPattern count="one">{0}ua</unitPattern>
-				<unitPattern count="other">{0}ua</unitPattern>
+			<unit type="duration-nanosecond">
+				<displayName draft="unconfirmed">ns</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}ns</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}ns</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0}cm</unitPattern>
-				<unitPattern count="other">{0}cm</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0}km</unitPattern>
+				<unitPattern count="other">{0}km</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/km</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0}m</unitPattern>
+				<unitPattern count="other">{0}m</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName draft="unconfirmed">dm</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}dm</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}dm</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName draft="unconfirmed">fat</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}fat</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}fat</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="unconfirmed">pi</displayName>
-				<unitPattern count="one">{0}′</unitPattern>
-				<unitPattern count="other">{0}′</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName draft="unconfirmed">sil</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}sil</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}sil</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="unconfirmed">po</displayName>
-				<unitPattern count="one">{0}″</unitPattern>
-				<unitPattern count="other">{0}″</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0}km</unitPattern>
-				<unitPattern count="other">{0}km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName draft="unconfirmed">al</displayName>
-				<unitPattern count="one">{0}a.l.</unitPattern>
-				<unitPattern count="other">{0}a.l.</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-				<unitPattern count="one">{0}m</unitPattern>
-				<unitPattern count="other">{0}m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName draft="unconfirmed">µm</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}µm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName draft="unconfirmed">mi</displayName>
-				<unitPattern count="one">{0}mi</unitPattern>
-				<unitPattern count="other">{0}mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0}cm</unitPattern>
+				<unitPattern count="other">{0}cm</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="one">{0}mm</unitPattern>
 				<unitPattern count="other">{0}mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName draft="unconfirmed">µm</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}µm</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName draft="unconfirmed">nm</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}nm</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName draft="unconfirmed">nmi</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}nmi</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName draft="unconfirmed">pc</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}pc</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName draft="unconfirmed">pm</displayName>
 				<unitPattern count="one">{0}pm</unitPattern>
 				<unitPattern count="other">{0}pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="unconfirmed">mi</displayName>
+				<unitPattern count="one">{0}mi</unitPattern>
+				<unitPattern count="other">{0}mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
-				<displayName draft="unconfirmed">vg</displayName>
+				<displayName draft="unconfirmed">yd</displayName>
 				<unitPattern count="one">{0}yd</unitPattern>
 				<unitPattern count="other">{0}yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName draft="unconfirmed">pi</displayName>
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="other">{0}′</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/pi</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="unconfirmed">po</displayName>
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/po</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName draft="unconfirmed">pc</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}pc</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="unconfirmed">a.l.</displayName>
+				<unitPattern count="one">{0}a.l.</unitPattern>
+				<unitPattern count="other">{0}a.l.</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ua</displayName>
+				<unitPattern count="one">{0}ua</unitPattern>
+				<unitPattern count="other">{0}ua</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName draft="unconfirmed">sil</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}sil</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}sil</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName draft="unconfirmed">fat</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}fat</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}fat</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName draft="unconfirmed">nmi</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}nmi</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="unconfirmed">smi</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}smi</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 			</unit>
-			<unit type="mass-carat">
-				<displayName draft="unconfirmed">ct</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}ct</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}ct</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0}g</unitPattern>
-				<unitPattern count="other">{0}g</unitPattern>
+			<unit type="mass-metric-ton">
+				<displayName draft="unconfirmed">t</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}t</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}t</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="one">{0}kg</unitPattern>
 				<unitPattern count="other">{0}kg</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/kg</perUnitPattern>
 			</unit>
-			<unit type="mass-metric-ton">
-				<displayName draft="unconfirmed">t</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} t</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} t</unitPattern>
-			</unit>
-			<unit type="mass-microgram">
-				<displayName draft="unconfirmed">µg</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}µg</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}µg</unitPattern>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0}g</unitPattern>
+				<unitPattern count="other">{0}g</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName draft="unconfirmed">mg</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}mg</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="unconfirmed">oz</displayName>
-				<unitPattern count="one">{0}oz</unitPattern>
-				<unitPattern count="other">{0}oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName draft="unconfirmed">oz t</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}oz t</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName draft="unconfirmed">lb</displayName>
-				<unitPattern count="one">{0}lb</unitPattern>
-				<unitPattern count="other">{0}lb</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="unconfirmed">st</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}st</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}st</unitPattern>
+			<unit type="mass-microgram">
+				<displayName draft="unconfirmed">µg</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}µg</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>sh tn</displayName>
 				<unitPattern count="one">{0} sh tn</unitPattern>
 				<unitPattern count="other">{0} sh tn</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0}ch</unitPattern>
-				<unitPattern count="other">{0}ch</unitPattern>
+			<unit type="mass-stone">
+				<displayName draft="unconfirmed">st</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}st</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName draft="unconfirmed">lb</displayName>
+				<unitPattern count="one">{0}lb</unitPattern>
+				<unitPattern count="other">{0}lb</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName draft="unconfirmed">oz</displayName>
+				<unitPattern count="one">{0}oz</unitPattern>
+				<unitPattern count="other">{0}oz</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName draft="unconfirmed">oz t</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}oz t</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName draft="unconfirmed">ct</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}ct</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}ct</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0}kW</unitPattern>
@@ -9169,21 +10280,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}W</unitPattern>
 				<unitPattern count="other">{0}W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0}ch</unitPattern>
+				<unitPattern count="other">{0}ch</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="unconfirmed">hPa</displayName>
 				<unitPattern count="one">{0}hPa</unitPattern>
 				<unitPattern count="other">{0}hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName draft="unconfirmed">″Hg</displayName>
-				<unitPattern count="one">{0}inHg</unitPattern>
-				<unitPattern count="other">{0}inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName draft="unconfirmed">mbar</displayName>
-				<unitPattern count="one">{0}mbar</unitPattern>
-				<unitPattern count="other">{0}mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName draft="unconfirmed">mmHg</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}mmHg</unitPattern>
@@ -9194,6 +10299,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}lb/po²</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}lb/po²</unitPattern>
 			</unit>
+			<unit type="pressure-inch-hg">
+				<displayName draft="unconfirmed">″Hg</displayName>
+				<unitPattern count="one">{0}inHg</unitPattern>
+				<unitPattern count="other">{0}inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName draft="unconfirmed">mbar</displayName>
+				<unitPattern count="one">{0}mbar</unitPattern>
+				<unitPattern count="other">{0}mbar</unitPattern>
+			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
 				<unitPattern count="one">{0}km/h</unitPattern>
@@ -9209,10 +10324,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}mi/h</unitPattern>
 				<unitPattern count="other">{0}mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName draft="unconfirmed">nd</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}nd</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}nd</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName draft="unconfirmed">°</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}°</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
+				<unitPattern count="one">{0}°C</unitPattern>
+				<unitPattern count="other">{0}°C</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
 				<displayName draft="unconfirmed">°F</displayName>
@@ -9224,36 +10349,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}K</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName draft="unconfirmed">ac pi</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}ac pi</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}ac pi</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName draft="unconfirmed">boisseau</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}bu</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}bu</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0}cl</unitPattern>
-				<unitPattern count="other">{0}cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0}cm³</unitPattern>
-				<unitPattern count="other">{0}cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>pi³</displayName>
-				<unitPattern count="one">{0}pi³</unitPattern>
-				<unitPattern count="other">{0}pi³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>po³</displayName>
-				<unitPattern count="one">{0}po³</unitPattern>
-				<unitPattern count="other">{0}po³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0}km³</unitPattern>
@@ -9263,6 +10358,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0}m³</unitPattern>
 				<unitPattern count="other">{0}m³</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0}cm³</unitPattern>
+				<unitPattern count="other">{0}cm³</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -9274,25 +10376,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}yd³</unitPattern>
 				<unitPattern count="other">{0}yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName draft="unconfirmed">tasse</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}ta</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}ta</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>pi³</displayName>
+				<unitPattern count="one">{0}pi³</unitPattern>
+				<unitPattern count="other">{0}pi³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0}dl</unitPattern>
-				<unitPattern count="other">{0}dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>po³</displayName>
+				<unitPattern count="one">{0}po³</unitPattern>
+				<unitPattern count="other">{0}po³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0}fl oz</unitPattern>
-				<unitPattern count="other">{0}fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0}gal</unitPattern>
-				<unitPattern count="other">{0}gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0}Ml</unitPattern>
+				<unitPattern count="other">{0}Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -9300,29 +10397,71 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0}hl</unitPattern>
 			</unit>
 			<unit type="volume-liter">
-				<displayName>L</displayName>
-				<unitPattern count="one">{0}L</unitPattern>
-				<unitPattern count="other">{0}L</unitPattern>
+				<displayName>l</displayName>
+				<unitPattern count="one">{0}l</unitPattern>
+				<unitPattern count="other">{0}l</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="one">{0}Ml</unitPattern>
-				<unitPattern count="other">{0}Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0}dl</unitPattern>
+				<unitPattern count="other">{0}dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0}cl</unitPattern>
+				<unitPattern count="other">{0}cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
 				<unitPattern count="one">{0}ml</unitPattern>
 				<unitPattern count="other">{0}ml</unitPattern>
 			</unit>
+			<unit type="volume-pint-metric">
+				<displayName draft="unconfirmed">mpt</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}mpt</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName draft="unconfirmed">tm</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}tm</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}tm</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName draft="unconfirmed">ac pi</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}ac pi</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}ac pi</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName draft="unconfirmed">boisseau</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}bu</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}bu</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0}gal</unitPattern>
+				<unitPattern count="other">{0}gal</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/gal</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName draft="unconfirmed">qt</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}qt</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}qt</unitPattern>
+			</unit>
 			<unit type="volume-pint">
-				<displayName draft="unconfirmed">pinte</displayName>
+				<displayName draft="unconfirmed">pte</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}pte</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}pte</unitPattern>
 			</unit>
-			<unit type="volume-quart">
-				<displayName draft="unconfirmed">quart</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}qt</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}qt</unitPattern>
+			<unit type="volume-cup">
+				<displayName draft="unconfirmed">ta</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}ta</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}ta</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0}fl oz</unitPattern>
+				<unitPattern count="other">{0}fl oz</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
 				<displayName draft="unconfirmed">CàS</displayName>
@@ -9334,6 +10473,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}CàC</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}CàC</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}O</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>hh:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_BE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BE.xml
similarity index 96%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_BE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BE.xml
index 194bb929ef2..2da4752942c 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_BE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BE.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="BE"/>
 	</identity>
@@ -156,9 +155,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="d" draft="unconfirmed">E d 'au' E d MMM</greatestDifference>
 							<greatestDifference id="M" draft="unconfirmed">E d MMM 'au' E d MMM</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="y" draft="unconfirmed">MM/y – MM/y</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
 							<greatestDifference id="d" draft="unconfirmed">d/MM/y – d/MM/y</greatestDifference>
 							<greatestDifference id="M" draft="unconfirmed">d/MM/y – d/MM/y</greatestDifference>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_BF.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BF.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_BF.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BF.xml
index b4480e432df..2215e2b3f9b 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_BF.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BF.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="BF"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_BI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BI.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_BI.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BI.xml
index edf0f7fbfba..836dd1a4ba9 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_BI.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BI.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="BI"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_BJ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BJ.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_BJ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BJ.xml
index 1d5f7ef3ef1..bafef01ed48 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_BJ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BJ.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="BJ"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_BL.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BL.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_BL.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BL.xml
index 7c49aab3ccf..636c4197963 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_BL.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BL.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="BL"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_CA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CA.xml
similarity index 56%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_CA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CA.xml
index 171198cfaff..6ebb67c831b 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_CA.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CA.xml
@@ -1,36 +1,45 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 12413 $"/>
 		<language type="fr"/>
 		<territory type="CA"/>
 	</identity>
 	<localeDisplayNames>
 		<languages>
-			<language type="luo" draft="contributed">luo</language>
+			<language type="arn">araukan</language>
+			<language type="luo">luo</language>
+			<language type="mgo" draft="contributed">Meta’</language>
+			<language type="nds" draft="contributed">bas allemand</language>
 		</languages>
 		<scripts>
 			<script type="Deva" draft="contributed">devanagari</script>
 			<script type="Gujr" draft="contributed">gujarati</script>
 		</scripts>
 		<territories>
-			<territory type="BY" draft="contributed">Bélarus</territory>
+			<territory type="151">Europe orientale</territory>
+			<territory type="BY">Bélarus</territory>
 			<territory type="CC" draft="contributed">Îles Cocos (Keeling)</territory>
-			<territory type="FM" draft="contributed">Micronésie</territory>
-			<territory type="VC" draft="contributed">Saint-Vincent-et-les Grenadines</territory>
+			<territory type="FM">Micronésie</territory>
+			<territory type="MF">Saint-Martin (France)</territory>
+			<territory type="MM">Myanmar</territory>
+			<territory type="SX">Saint-Martin (Pays-Bas)</territory>
+			<territory type="TK">Tokelau</territory>
+			<territory type="VC">Saint-Vincent-et-les Grenadines</territory>
 		</territories>
 		<types>
-			<type type="dictionary" key="collation" draft="contributed">Ordre de tri du dictionnaire</type>
-			<type type="ethiopic-amete-alem" key="calendar" draft="contributed">Calendrier éthiopien de l’An de grâce</type>
-			<type type="mong" key="numbers" draft="contributed">Chiffres mongols</type>
-			<type type="reformed" key="collation" draft="contributed">Ordre de tri réformé</type>
-			<type type="taml" key="numbers" draft="contributed">chiffres tamouls traditionnels</type>
+			<type key="calendar" type="ethiopic-amete-alem" draft="contributed">Calendrier éthiopien de l’An de grâce</type>
+			<type key="collation" type="dictionary" draft="contributed">Ordre de tri du dictionnaire</type>
+			<type key="collation" type="reformed" draft="contributed">Ordre de tri réformé</type>
+			<type key="collation" type="searchjl" draft="contributed">Rechercher par consonne initiale en hangeul</type>
+			<type key="numbers" type="gujr" draft="contributed">chiffres gujaratis</type>
+			<type key="numbers" type="mong" draft="contributed">Chiffres mongols</type>
+			<type key="numbers" type="taml">chiffres tamouls traditionnels</type>
 		</types>
 		<transformNames>
 			<transformName type="x-Accents" draft="unconfirmed">accents</transformName>
@@ -90,60 +99,36 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="gregorian">
-				<months>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1" draft="contributed">janv.</month>
-							<month type="2" draft="contributed">févr.</month>
-							<month type="3" draft="contributed">mars</month>
-							<month type="4" draft="contributed">avr.</month>
-							<month type="5" draft="contributed">mai</month>
-							<month type="6" draft="contributed">juin</month>
-							<month type="7" draft="contributed">juil.</month>
-							<month type="8" draft="contributed">août</month>
-							<month type="9" draft="contributed">sept.</month>
-							<month type="10" draft="contributed">oct.</month>
-							<month type="11" draft="contributed">nov.</month>
-							<month type="12" draft="contributed">déc.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1" draft="contributed">janvier</month>
-							<month type="2" draft="contributed">février</month>
-							<month type="3" draft="contributed">mars</month>
-							<month type="4" draft="contributed">avril</month>
-							<month type="5" draft="contributed">mai</month>
-							<month type="6" draft="contributed">juin</month>
-							<month type="7" draft="contributed">juillet</month>
-							<month type="8" draft="contributed">août</month>
-							<month type="9" draft="contributed">septembre</month>
-							<month type="10" draft="contributed">octobre</month>
-							<month type="11" draft="contributed">novembre</month>
-							<month type="12" draft="contributed">décembre</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="stand-alone">
-						<dayWidth type="abbreviated">
-							<day type="sun" draft="contributed">dim.</day>
-							<day type="mon" draft="contributed">lun.</day>
-							<day type="tue" draft="contributed">mar.</day>
-							<day type="wed" draft="contributed">mer.</day>
-							<day type="thu" draft="contributed">jeu.</day>
-							<day type="fri" draft="contributed">ven.</day>
-							<day type="sat" draft="contributed">sam.</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun" draft="contributed">dimanche</day>
-							<day type="mon" draft="contributed">lundi</day>
-							<day type="tue" draft="contributed">mardi</day>
-							<day type="wed" draft="contributed">mercredi</day>
-							<day type="thu" draft="contributed">jeudi</day>
-							<day type="fri" draft="contributed">vendredi</day>
-							<day type="sat" draft="contributed">samedi</day>
-						</dayWidth>
-					</dayContext>
-				</days>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">min.</dayPeriod>
+							<dayPeriod type="noon">midi</dayPeriod>
+							<dayPeriod type="morning1">mat.</dayPeriod>
+							<dayPeriod type="afternoon1">après-midi</dayPeriod>
+							<dayPeriod type="evening1">soir</dayPeriod>
+							<dayPeriod type="night1">du matin</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">minuit</dayPeriod>
+							<dayPeriod type="am">a</dayPeriod>
+							<dayPeriod type="noon">midi</dayPeriod>
+							<dayPeriod type="pm">p</dayPeriod>
+							<dayPeriod type="morning1">mat.</dayPeriod>
+							<dayPeriod type="afternoon1">après-midi</dayPeriod>
+							<dayPeriod type="evening1">soir</dayPeriod>
+							<dayPeriod type="night1">nuit</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">minuit</dayPeriod>
+							<dayPeriod type="noon">midi</dayPeriod>
+							<dayPeriod type="morning1">du matin</dayPeriod>
+							<dayPeriod type="afternoon1">de l’après-midi</dayPeriod>
+							<dayPeriod type="evening1">du soir</dayPeriod>
+							<dayPeriod type="night1">du matin</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
 				<dateFormats>
 					<dateFormatLength type="short">
 						<dateFormat>
@@ -152,6 +137,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateFormatLength>
 				</dateFormats>
 				<dateTimeFormats>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Md">M-d</dateFormatItem>
 						<dateFormatItem id="MEd">E M-d</dateFormatItem>
@@ -166,8 +156,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<intervalFormatItem id="d">
 							<greatestDifference id="d">d – d</greatestDifference>
 						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a" draft="contributed">h 'h' a – h 'h' a</greatestDifference>
+							<greatestDifference id="h" draft="contributed">h 'h' – h 'h' a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H" draft="contributed">H 'h' – H 'h'</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a" draft="contributed">h 'h' a – h 'h' a v</greatestDifference>
+							<greatestDifference id="h" draft="contributed">h 'h' – h 'h' a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H" draft="contributed">H 'h' – H 'h' v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
 							<greatestDifference id="d">MM-dd – MM-dd</greatestDifference>
@@ -224,35 +225,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">Il y a {0} ans</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="month">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">Dans {0} mois</relativeTimePattern>
-					<relativeTimePattern count="other">Dans {0} mois</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Il y a {0} mois</relativeTimePattern>
-					<relativeTimePattern count="other">Il y a {0} mois</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="week">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">Dans {0} semaine</relativeTimePattern>
-					<relativeTimePattern count="other">Dans {0} semaines</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Il y a {0} semaine</relativeTimePattern>
-					<relativeTimePattern count="other">Il y a {0} semaines</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="day">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">Dans {0} jour</relativeTimePattern>
-					<relativeTimePattern count="other">Dans {0} jours</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Il y a {0} jour</relativeTimePattern>
-					<relativeTimePattern count="other">Il y a {0} jours</relativeTimePattern>
-				</relativeTime>
+			<field type="year-short">
+				<displayName>a</displayName>
 			</field>
 			<field type="day-short">
 				<relativeTime type="future">
@@ -260,14 +234,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">dans {0} j</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="hour">
+			<field type="hour-narrow">
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Dans {0} heure</relativeTimePattern>
-					<relativeTimePattern count="other">Dans {0} heures</relativeTimePattern>
+					<relativeTimePattern count="one">+{0} h</relativeTimePattern>
+					<relativeTimePattern count="other">+{0} h</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">Il y a {0} heure</relativeTimePattern>
-					<relativeTimePattern count="other">Il y a {0} heures</relativeTimePattern>
+					<relativeTimePattern count="one">-{0} h</relativeTimePattern>
+					<relativeTimePattern count="other">-{0} h</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute">
@@ -280,28 +254,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">Il y a {0} minutes</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="second">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">Dans {0} seconde</relativeTimePattern>
-					<relativeTimePattern count="other">Dans {0} secondes</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Il y a {0} seconde</relativeTimePattern>
-					<relativeTimePattern count="other">Il y a {0} secondes</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="second-narrow">
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="contributed">+ {0} s</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">+{0} s</relativeTimePattern>
+					<relativeTimePattern count="one">+ {0} s</relativeTimePattern>
+					<relativeTimePattern count="other">+{0} s</relativeTimePattern>
 				</relativeTime>
 			</field>
 		</fields>
 		<timeZoneNames>
-			<regionFormat type="daylight" draft="contributed">{0} (heure avancée)</regionFormat>
-			<regionFormat type="standard" draft="contributed">{0} (heure normale)</regionFormat>
+			<regionFormat type="daylight">{0} (heure avancée)</regionFormat>
+			<regionFormat type="standard">{0} (heure normale)</regionFormat>
 			<zone type="America/Barbados">
-				<exemplarCity draft="contributed">Barbade (La)</exemplarCity>
+				<exemplarCity>Barbade (La)</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Faeroe">
 				<exemplarCity draft="contributed">Îles Féroé</exemplarCity>
@@ -317,22 +281,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</long>
 			</zone>
 			<zone type="America/St_Kitts">
-				<exemplarCity draft="contributed">Saint-Christophe-et-Niévès</exemplarCity>
+				<exemplarCity>Saint-Christophe-et-Niévès</exemplarCity>
 			</zone>
 			<zone type="America/Cayman">
-				<exemplarCity draft="contributed">Îles Caïmans</exemplarCity>
+				<exemplarCity>Îles Caïmans</exemplarCity>
+			</zone>
+			<zone type="Africa/Tripoli">
+				<exemplarCity>Tripoli [Libye]</exemplarCity>
 			</zone>
 			<zone type="Africa/Ndjamena">
-				<exemplarCity draft="contributed">Ndjamena</exemplarCity>
+				<exemplarCity>Ndjamena</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Beulah">
+				<exemplarCity>Beulah [Dakota du Nord]</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity draft="contributed">New Salem, Dakota du Nord</exemplarCity>
+				<exemplarCity>New Salem, Dakota du Nord</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Center">
+				<exemplarCity>Center [Dakota du Nord]</exemplarCity>
 			</zone>
 			<zone type="Europe/Vatican">
-				<exemplarCity draft="contributed">Vatican</exemplarCity>
+				<exemplarCity>Vatican</exemplarCity>
 			</zone>
 			<zone type="America/St_Thomas">
-				<exemplarCity draft="contributed">Saint Thomas</exemplarCity>
+				<exemplarCity>Saint Thomas</exemplarCity>
 			</zone>
 			<metazone type="Acre">
 				<long>
@@ -343,7 +316,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Africa_Central">
 				<long>
-					<standard draft="contributed">heure d’Afrique centrale</standard>
+					<standard>heure d’Afrique centrale</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Eastern">
@@ -353,21 +326,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Africa_Southern">
 				<long>
-					<standard draft="contributed">heure normale d’Afrique du Sud</standard>
+					<standard>heure normale d’Afrique du Sud</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic draft="contributed">heure d’Afrique de l’Ouest</generic>
-					<standard draft="contributed">heure normale d’Afrique de l’Ouest</standard>
-					<daylight draft="contributed">heure avancée d’Afrique de l’Ouest</daylight>
+					<generic>heure d’Afrique de l’Ouest</generic>
+					<standard>heure normale d’Afrique de l’Ouest</standard>
+					<daylight>heure avancée d’Afrique de l’Ouest</daylight>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
 				<long>
-					<generic draft="contributed">heure de l’Alaska</generic>
-					<standard draft="contributed">heure normale de l’Alaska</standard>
-					<daylight draft="contributed">heure avancée de l’Alaska</daylight>
+					<generic>heure de l’Alaska</generic>
+					<standard>heure normale de l’Alaska</standard>
+					<daylight>heure avancée de l’Alaska</daylight>
 				</long>
 			</metazone>
 			<metazone type="Almaty">
@@ -379,16 +352,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Amazon">
 				<long>
-					<generic draft="contributed">heure de l’Amazonie</generic>
-					<standard draft="contributed">heure normale de l’Amazonie</standard>
-					<daylight draft="contributed">heure avancée de l’Amazonie</daylight>
+					<generic>heure de l’Amazonie</generic>
+					<standard>heure normale de l’Amazonie</standard>
+					<daylight>heure avancée de l’Amazonie</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Central">
 				<long>
-					<generic draft="contributed">heure du Centre</generic>
-					<standard draft="contributed">heure normale du Centre</standard>
-					<daylight draft="contributed">heure avancée du Centre</daylight>
+					<generic>heure du Centre</generic>
+					<standard>heure normale du Centre</standard>
+					<daylight>heure avancée du Centre</daylight>
 				</long>
 				<short>
 					<generic>HC</generic>
@@ -398,9 +371,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
-					<generic draft="contributed">heure de l’Est</generic>
-					<standard draft="contributed">heure normale de l’Est</standard>
-					<daylight draft="contributed">heure avancée de l’Est</daylight>
+					<generic>heure de l’Est</generic>
+					<standard>heure normale de l’Est</standard>
+					<daylight>heure avancée de l’Est</daylight>
 				</long>
 				<short>
 					<generic>HE</generic>
@@ -410,9 +383,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
-					<generic draft="contributed">heure des Rocheuses</generic>
-					<standard draft="contributed">heure normale des Rocheuses</standard>
-					<daylight draft="contributed">heure avancée des Rocheuses</daylight>
+					<generic>heure des Rocheuses</generic>
+					<standard>heure normale des Rocheuses</standard>
+					<daylight>heure avancée des Rocheuses</daylight>
 				</long>
 				<short>
 					<generic>HR</generic>
@@ -422,9 +395,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
-					<generic draft="contributed">heure du Pacifique</generic>
-					<standard draft="contributed">heure normale du Pacifique</standard>
-					<daylight draft="contributed">heure avancée du Pacifique</daylight>
+					<generic>heure du Pacifique</generic>
+					<standard>heure normale du Pacifique</standard>
+					<daylight>heure avancée du Pacifique</daylight>
 				</long>
 				<short>
 					<generic>HP</generic>
@@ -441,9 +414,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic draft="contributed">heure d’Apia</generic>
-					<standard draft="contributed">heure normale d’Apia</standard>
-					<daylight draft="contributed">heure avancée d’Apia</daylight>
+					<generic>heure d’Apia</generic>
+					<standard>heure normale d’Apia</standard>
+					<daylight>heure avancée d’Apia</daylight>
 				</long>
 			</metazone>
 			<metazone type="Aqtau">
@@ -462,16 +435,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Arabian">
 				<long>
-					<generic draft="contributed">heure de l’Arabie</generic>
-					<standard draft="contributed">heure normale de l’Arabie</standard>
-					<daylight draft="contributed">heure avancée de l’Arabie</daylight>
+					<generic>heure de l’Arabie</generic>
+					<standard>heure normale de l’Arabie</standard>
+					<daylight>heure avancée de l’Arabie</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina">
 				<long>
-					<generic draft="contributed">heure de l’Argentine</generic>
-					<standard draft="contributed">heure normale d’Argentine</standard>
-					<daylight draft="contributed">heure avancée de l’Argentine</daylight>
+					<generic>heure de l’Argentine</generic>
+					<standard>heure normale d’Argentine</standard>
+					<daylight>heure avancée de l’Argentine</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina_Western">
@@ -483,170 +456,170 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Armenia">
 				<long>
-					<generic draft="contributed">heure de l’Arménie</generic>
-					<standard draft="contributed">heure normale de l’Arménie</standard>
-					<daylight draft="contributed">heure avancée d’Arménie</daylight>
+					<generic>heure de l’Arménie</generic>
+					<standard>heure normale de l’Arménie</standard>
+					<daylight>heure avancée d’Arménie</daylight>
 				</long>
 			</metazone>
 			<metazone type="Atlantic">
 				<long>
-					<generic draft="contributed">heure de l’Atlantique</generic>
-					<standard draft="contributed">heure normale de l’Atlantique</standard>
-					<daylight draft="contributed">heure avancée de l’Atlantique</daylight>
+					<generic>heure de l’Atlantique</generic>
+					<standard>heure normale de l’Atlantique</standard>
+					<daylight>heure avancée de l’Atlantique</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
-					<generic draft="contributed">heure du centre de l’Australie</generic>
-					<standard draft="contributed">heure normale du centre de l’Australie</standard>
-					<daylight draft="contributed">heure avancée du centre de l’Australie</daylight>
+					<generic>heure du centre de l’Australie</generic>
+					<standard>heure normale du centre de l’Australie</standard>
+					<daylight>heure avancée du centre de l’Australie</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_CentralWestern">
 				<long>
-					<generic draft="contributed">heure du centre-ouest de l’Australie</generic>
-					<standard draft="contributed">heure normale du centre-ouest de l’Australie</standard>
-					<daylight draft="contributed">heure avancée du centre-ouest de l’Australie</daylight>
+					<generic>heure du centre-ouest de l’Australie</generic>
+					<standard>heure normale du centre-ouest de l’Australie</standard>
+					<daylight>heure avancée du centre-ouest de l’Australie</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Eastern">
 				<long>
-					<generic draft="contributed">heure de l’Est de l’Australie</generic>
-					<standard draft="contributed">heure normale de l’Est de l’Australie</standard>
-					<daylight draft="contributed">heure avancée de l’Est de l’Australie</daylight>
+					<generic>heure de l’Est de l’Australie</generic>
+					<standard>heure normale de l’Est de l’Australie</standard>
+					<daylight>heure avancée de l’Est de l’Australie</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Western">
 				<long>
-					<generic draft="contributed">heure de l’Ouest de l’Australie</generic>
-					<standard draft="contributed">heure normale de l’Ouest de l’Australie</standard>
-					<daylight draft="contributed">heure avancée de l’Ouest de l’Australie</daylight>
+					<generic>heure de l’Ouest de l’Australie</generic>
+					<standard>heure normale de l’Ouest de l’Australie</standard>
+					<daylight>heure avancée de l’Ouest de l’Australie</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azerbaijan">
 				<long>
-					<generic draft="contributed">heure de l’Azerbaïdjan</generic>
-					<standard draft="contributed">heure normale de l’Azerbaïdjan</standard>
-					<daylight draft="contributed">heure avancée d’Azerbaïdjan</daylight>
+					<generic>heure de l’Azerbaïdjan</generic>
+					<standard>heure normale de l’Azerbaïdjan</standard>
+					<daylight>heure avancée d’Azerbaïdjan</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azores">
 				<long>
-					<generic draft="contributed">heure des Açores</generic>
-					<standard draft="contributed">heure normale des Açores</standard>
-					<daylight draft="contributed">heure avancée des Açores</daylight>
+					<generic>heure des Açores</generic>
+					<standard>heure normale des Açores</standard>
+					<daylight>heure avancée des Açores</daylight>
 				</long>
 			</metazone>
 			<metazone type="Bangladesh">
 				<long>
-					<generic draft="contributed">heure du Bangladesh</generic>
-					<standard draft="contributed">heure normale du Bangladesh</standard>
-					<daylight draft="contributed">heure avancée du Bangladesh</daylight>
+					<generic>heure du Bangladesh</generic>
+					<standard>heure normale du Bangladesh</standard>
+					<daylight>heure avancée du Bangladesh</daylight>
 				</long>
 			</metazone>
 			<metazone type="Brasilia">
 				<long>
-					<generic draft="contributed">heure de Brasilia</generic>
-					<standard draft="contributed">heure normale de Brasilia</standard>
-					<daylight draft="contributed">heure avancée de Brasilia</daylight>
+					<generic>heure de Brasilia</generic>
+					<standard>heure normale de Brasilia</standard>
+					<daylight>heure avancée de Brasilia</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cape_Verde">
 				<long>
-					<generic draft="contributed">heure du Cap-Vert</generic>
-					<standard draft="contributed">heure normale du Cap-Vert</standard>
-					<daylight draft="contributed">heure avancée du Cap-Vert</daylight>
+					<generic>heure du Cap-Vert</generic>
+					<standard>heure normale du Cap-Vert</standard>
+					<daylight>heure avancée du Cap-Vert</daylight>
 				</long>
 			</metazone>
 			<metazone type="Chatham">
 				<long>
-					<generic draft="contributed">heure des îles Chatham</generic>
-					<standard draft="contributed">heure normale des Îles Chatham</standard>
-					<daylight draft="contributed">heure avancée des Îles Chatham</daylight>
+					<generic>heure des îles Chatham</generic>
+					<standard>heure normale des Îles Chatham</standard>
+					<daylight>heure avancée des Îles Chatham</daylight>
 				</long>
 			</metazone>
 			<metazone type="Chile">
 				<long>
-					<generic draft="contributed">heure du Chili</generic>
-					<standard draft="contributed">heure normale du Chili</standard>
-					<daylight draft="contributed">heure avancée du Chili</daylight>
+					<generic>heure du Chili</generic>
+					<standard>heure normale du Chili</standard>
+					<daylight>heure avancée du Chili</daylight>
 				</long>
 			</metazone>
 			<metazone type="China">
 				<long>
-					<generic draft="contributed">heure de Chine</generic>
-					<standard draft="contributed">heure normale de Chine</standard>
-					<daylight draft="contributed">heure avancée de Chine</daylight>
+					<generic>heure de Chine</generic>
+					<standard>heure normale de Chine</standard>
+					<daylight>heure avancée de Chine</daylight>
 				</long>
 			</metazone>
 			<metazone type="Choibalsan">
 				<long>
-					<generic draft="contributed">heure de Choibalsan</generic>
-					<standard draft="contributed">heure normale de Choibalsan</standard>
-					<daylight draft="contributed">heure avancée de Choibalsan</daylight>
+					<generic>heure de Choibalsan</generic>
+					<standard>heure normale de Choibalsan</standard>
+					<daylight>heure avancée de Choibalsan</daylight>
 				</long>
 			</metazone>
 			<metazone type="Colombia">
 				<long>
-					<generic draft="contributed">heure de Colombie</generic>
-					<standard draft="contributed">heure normale de Colombie</standard>
-					<daylight draft="contributed">heure avancée de Colombie</daylight>
+					<generic>heure de Colombie</generic>
+					<standard>heure normale de Colombie</standard>
+					<daylight>heure avancée de Colombie</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cook">
 				<long>
-					<generic draft="contributed">heure des îles Cook</generic>
-					<standard draft="contributed">heure normale des îles Cook</standard>
-					<daylight draft="contributed">heure avancée des îles Cook</daylight>
+					<generic>heure des îles Cook</generic>
+					<standard>heure normale des îles Cook</standard>
+					<daylight>heure avancée des îles Cook</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cuba">
 				<long>
-					<generic draft="contributed">heure de Cuba</generic>
-					<standard draft="contributed">heure normale de Cuba</standard>
-					<daylight draft="contributed">heure avancée de Cuba</daylight>
+					<generic>heure de Cuba</generic>
+					<standard>heure normale de Cuba</standard>
+					<daylight>heure avancée de Cuba</daylight>
 				</long>
 			</metazone>
 			<metazone type="Easter">
 				<long>
-					<generic draft="contributed">heure de l’île de Pâques</generic>
-					<standard draft="contributed">heure normale de l’île de Pâques</standard>
-					<daylight draft="contributed">heure avancée de l’île de Pâques</daylight>
+					<generic>heure de l’île de Pâques</generic>
+					<standard>heure normale de l’île de Pâques</standard>
+					<daylight>heure avancée de l’île de Pâques</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Central">
 				<long>
-					<generic draft="contributed">heure d’Europe centrale</generic>
-					<standard draft="contributed">heure normale d’Europe centrale</standard>
-					<daylight draft="contributed">heure avancée d’Europe centrale</daylight>
+					<generic>heure d’Europe centrale</generic>
+					<standard>heure normale d’Europe centrale</standard>
+					<daylight>heure avancée d’Europe centrale</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Eastern">
 				<long>
-					<generic draft="contributed">heure d’Europe de l’Est</generic>
-					<standard draft="contributed">heure normale d’Europe de l’Est</standard>
-					<daylight draft="contributed">heure avancée d’Europe de l’Est</daylight>
+					<generic>heure d’Europe de l’Est</generic>
+					<standard>heure normale d’Europe de l’Est</standard>
+					<daylight>heure avancée d’Europe de l’Est</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
 				<long>
-					<generic draft="contributed">heure d’Europe de l’Ouest</generic>
-					<standard draft="contributed">heure normale d’Europe de l’Ouest</standard>
-					<daylight draft="contributed">heure avancée d’Europe de l’Ouest</daylight>
+					<generic>heure d’Europe de l’Ouest</generic>
+					<standard>heure normale d’Europe de l’Ouest</standard>
+					<daylight>heure avancée d’Europe de l’Ouest</daylight>
 				</long>
 			</metazone>
 			<metazone type="Falkland">
 				<long>
-					<generic draft="contributed">heure des îles Malouines</generic>
-					<standard draft="contributed">heure normale des îles Malouines</standard>
-					<daylight draft="contributed">heure avancée des îles Malouines</daylight>
+					<generic>heure des îles Malouines</generic>
+					<standard>heure normale des îles Malouines</standard>
+					<daylight>heure avancée des îles Malouines</daylight>
 				</long>
 			</metazone>
 			<metazone type="Fiji">
 				<long>
-					<generic draft="contributed">heure des îles Fidji</generic>
-					<standard draft="contributed">heure normale des îles Fidji</standard>
-					<daylight draft="contributed">heure avancée des îles Fidji</daylight>
+					<generic>heure des îles Fidji</generic>
+					<standard>heure normale des îles Fidji</standard>
+					<daylight>heure avancée des îles Fidji</daylight>
 				</long>
 			</metazone>
 			<metazone type="French_Guiana">
@@ -656,51 +629,51 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Georgia">
 				<long>
-					<generic draft="contributed">heure de la Géorgie</generic>
-					<standard draft="contributed">heure normale de la Géorgie</standard>
-					<daylight draft="contributed">heure avancée de Géorgie</daylight>
+					<generic>heure de la Géorgie</generic>
+					<standard>heure normale de la Géorgie</standard>
+					<daylight>heure avancée de Géorgie</daylight>
 				</long>
 			</metazone>
 			<metazone type="Greenland_Eastern">
 				<long>
-					<generic draft="contributed">heure de l’Est du Groenland</generic>
-					<standard draft="contributed">heure normale de l’Est du Groenland</standard>
-					<daylight draft="contributed">heure avancée de l’Est du Groenland</daylight>
+					<generic>heure de l’Est du Groenland</generic>
+					<standard>heure normale de l’Est du Groenland</standard>
+					<daylight>heure avancée de l’Est du Groenland</daylight>
 				</long>
 			</metazone>
 			<metazone type="Greenland_Western">
 				<long>
-					<generic draft="contributed">heure de l’Ouest du Groenland</generic>
-					<standard draft="contributed">heure normale de l’Ouest du Groenland</standard>
-					<daylight draft="contributed">heure avancée de l’Ouest du Groenland</daylight>
+					<generic>heure de l’Ouest du Groenland</generic>
+					<standard>heure normale de l’Ouest du Groenland</standard>
+					<daylight>heure avancée de l’Ouest du Groenland</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
-					<generic draft="contributed">heure d’Hawaï-Aléoutiennes</generic>
-					<standard draft="contributed">heure normale d’Hawaï-Aléoutiennes</standard>
-					<daylight draft="contributed">heure avancée d’Hawaï-Aléoutiennes</daylight>
+					<generic>heure d’Hawaï-Aléoutiennes</generic>
+					<standard>heure normale d’Hawaï-Aléoutiennes</standard>
+					<daylight>heure avancée d’Hawaï-Aléoutiennes</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>
-					<generic draft="contributed">heure de Hong Kong</generic>
-					<standard draft="contributed">heure normale de Hong Kong</standard>
-					<daylight draft="contributed">heure avancée de Hong Kong</daylight>
+					<generic>heure de Hong Kong</generic>
+					<standard>heure normale de Hong Kong</standard>
+					<daylight>heure avancée de Hong Kong</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hovd">
 				<long>
-					<generic draft="contributed">heure de Hovd</generic>
-					<standard draft="contributed">heure normale de Hovd</standard>
-					<daylight draft="contributed">heure avancée de Hovd</daylight>
+					<generic>heure de Hovd</generic>
+					<standard>heure normale de Hovd</standard>
+					<daylight>heure avancée de Hovd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Iran">
 				<long>
-					<generic draft="contributed">heure de l’Iran</generic>
-					<standard draft="contributed">heure normale d’Iran</standard>
-					<daylight draft="contributed">heure avancée d’Iran</daylight>
+					<generic>heure de l’Iran</generic>
+					<standard>heure normale d’Iran</standard>
+					<daylight>heure avancée d’Iran</daylight>
 				</long>
 			</metazone>
 			<metazone type="Irkutsk">
@@ -712,16 +685,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Israel">
 				<long>
-					<generic draft="contributed">heure d’Israël</generic>
-					<standard draft="contributed">heure normale d’Israël</standard>
-					<daylight draft="contributed">heure avancée d’Israël</daylight>
+					<generic>heure d’Israël</generic>
+					<standard>heure normale d’Israël</standard>
+					<daylight>heure avancée d’Israël</daylight>
 				</long>
 			</metazone>
 			<metazone type="Japan">
 				<long>
-					<generic draft="contributed">heure du Japon</generic>
-					<standard draft="contributed">heure normale du Japon</standard>
-					<daylight draft="contributed">heure avancée du Japon</daylight>
+					<generic>heure du Japon</generic>
+					<standard>heure normale du Japon</standard>
+					<daylight>heure avancée du Japon</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kamchatka">
@@ -733,9 +706,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Korea">
 				<long>
-					<generic draft="contributed">heure de la Corée</generic>
-					<standard draft="contributed">heure normale de la Corée</standard>
-					<daylight draft="contributed">heure avancée de Corée</daylight>
+					<generic>heure de la Corée</generic>
+					<standard>heure normale de la Corée</standard>
+					<daylight>heure avancée de Corée</daylight>
 				</long>
 			</metazone>
 			<metazone type="Krasnoyarsk">
@@ -747,9 +720,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Lord_Howe">
 				<long>
-					<generic draft="contributed">heure de Lord Howe</generic>
-					<standard draft="contributed">heure normale de Lord Howe</standard>
-					<daylight draft="contributed">heure avancée de Lord Howe</daylight>
+					<generic>heure de Lord Howe</generic>
+					<standard>heure normale de Lord Howe</standard>
+					<daylight>heure avancée de Lord Howe</daylight>
 				</long>
 			</metazone>
 			<metazone type="Macau">
@@ -768,30 +741,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Mauritius">
 				<long>
-					<generic draft="contributed">heure de Maurice</generic>
-					<standard draft="contributed">heure normale de Maurice</standard>
-					<daylight draft="contributed">heure avancée de Maurice</daylight>
+					<generic>heure de Maurice</generic>
+					<standard>heure normale de Maurice</standard>
+					<daylight>heure avancée de Maurice</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mexico_Northwest">
 				<long>
-					<generic draft="contributed">heure du Nord-Ouest du Mexique</generic>
-					<standard draft="contributed">heure normale du Nord-Ouest du Mexique</standard>
-					<daylight draft="contributed">heure avancée du Nord-Ouest du Mexique</daylight>
+					<generic>heure du Nord-Ouest du Mexique</generic>
+					<standard>heure normale du Nord-Ouest du Mexique</standard>
+					<daylight>heure avancée du Nord-Ouest du Mexique</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
-					<generic draft="contributed">heure du Pacifique mexicain</generic>
-					<standard draft="contributed">heure normale du Pacifique mexicain</standard>
-					<daylight draft="contributed">heure avancée du Pacifique mexicain</daylight>
+					<generic>heure du Pacifique mexicain</generic>
+					<standard>heure normale du Pacifique mexicain</standard>
+					<daylight>heure avancée du Pacifique mexicain</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mongolia">
 				<long>
-					<generic draft="contributed">heure d’Oulan-Bator</generic>
-					<standard draft="contributed">heure normale d’Oulan-Bator</standard>
-					<daylight draft="contributed">heure avancée d’Oulan-Bator</daylight>
+					<generic>heure d’Oulan-Bator</generic>
+					<standard>heure normale d’Oulan-Bator</standard>
+					<daylight>heure avancée d’Oulan-Bator</daylight>
 				</long>
 			</metazone>
 			<metazone type="Moscow">
@@ -803,23 +776,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="New_Caledonia">
 				<long>
-					<generic draft="contributed">heure de la Nouvelle-Calédonie</generic>
-					<standard draft="contributed">heure normale de la Nouvelle-Calédonie</standard>
-					<daylight draft="contributed">heure avancée de Nouvelle-Calédonie</daylight>
+					<generic>heure de la Nouvelle-Calédonie</generic>
+					<standard>heure normale de la Nouvelle-Calédonie</standard>
+					<daylight>heure avancée de Nouvelle-Calédonie</daylight>
 				</long>
 			</metazone>
 			<metazone type="New_Zealand">
 				<long>
-					<generic draft="contributed">heure de la Nouvelle-Zélande</generic>
-					<standard draft="contributed">heure normale de la Nouvelle-Zélande</standard>
-					<daylight draft="contributed">heure avancée de la Nouvelle-Zélande</daylight>
+					<generic>heure de la Nouvelle-Zélande</generic>
+					<standard>heure normale de la Nouvelle-Zélande</standard>
+					<daylight>heure avancée de la Nouvelle-Zélande</daylight>
 				</long>
 			</metazone>
 			<metazone type="Newfoundland">
 				<long>
-					<generic draft="contributed">heure de Terre-Neuve</generic>
-					<standard draft="contributed">heure normale de Terre-Neuve</standard>
-					<daylight draft="contributed">heure avancée de Terre-Neuve</daylight>
+					<generic>heure de Terre-Neuve</generic>
+					<standard>heure normale de Terre-Neuve</standard>
+					<daylight>heure avancée de Terre-Neuve</daylight>
 				</long>
 				<short>
 					<generic>HT</generic>
@@ -829,9 +802,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Noronha">
 				<long>
-					<generic draft="contributed">heure de Fernando de Noronha</generic>
-					<standard draft="contributed">heure normale de Fernando de Noronha</standard>
-					<daylight draft="contributed">heure avancée de Fernando de Noronha</daylight>
+					<generic>heure de Fernando de Noronha</generic>
+					<standard>heure normale de Fernando de Noronha</standard>
+					<daylight>heure avancée de Fernando de Noronha</daylight>
 				</long>
 			</metazone>
 			<metazone type="Novosibirsk">
@@ -850,37 +823,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Pakistan">
 				<long>
-					<generic draft="contributed">heure du Pakistan</generic>
-					<standard draft="contributed">heure normale du Pakistan</standard>
-					<daylight draft="contributed">heure avancée du Pakistan</daylight>
+					<generic>heure du Pakistan</generic>
+					<standard>heure normale du Pakistan</standard>
+					<daylight>heure avancée du Pakistan</daylight>
 				</long>
 			</metazone>
 			<metazone type="Paraguay">
 				<long>
-					<generic draft="contributed">heure du Paraguay</generic>
-					<standard draft="contributed">heure normale du Paraguay</standard>
-					<daylight draft="contributed">heure avancée du Paraguay</daylight>
+					<generic>heure du Paraguay</generic>
+					<standard>heure normale du Paraguay</standard>
+					<daylight>heure avancée du Paraguay</daylight>
 				</long>
 			</metazone>
 			<metazone type="Peru">
 				<long>
-					<generic draft="contributed">heure du Pérou</generic>
-					<standard draft="contributed">heure normale du Pérou</standard>
-					<daylight draft="contributed">heure avancée du Pérou</daylight>
+					<generic>heure du Pérou</generic>
+					<standard>heure normale du Pérou</standard>
+					<daylight>heure avancée du Pérou</daylight>
 				</long>
 			</metazone>
 			<metazone type="Philippines">
 				<long>
-					<generic draft="contributed">heure des Philippines</generic>
-					<standard draft="contributed">heure normale des Philippines</standard>
-					<daylight draft="contributed">heure avancée des Philippines</daylight>
+					<generic>heure des Philippines</generic>
+					<standard>heure normale des Philippines</standard>
+					<daylight>heure avancée des Philippines</daylight>
 				</long>
 			</metazone>
 			<metazone type="Pierre_Miquelon">
 				<long>
-					<generic draft="contributed">heure de Saint-Pierre-et-Miquelon</generic>
-					<standard draft="contributed">heure normale de Saint-Pierre-et-Miquelon</standard>
-					<daylight draft="contributed">heure avancée de Saint-Pierre-et-Miquelon</daylight>
+					<generic>heure de Saint-Pierre-et-Miquelon</generic>
+					<standard>heure normale de Saint-Pierre-et-Miquelon</standard>
+					<daylight>heure avancée de Saint-Pierre-et-Miquelon</daylight>
 				</long>
 			</metazone>
 			<metazone type="Sakhalin">
@@ -892,23 +865,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Samoa">
 				<long>
-					<generic draft="contributed">heure des Samoa</generic>
-					<standard draft="contributed">heure normale des Samoa</standard>
-					<daylight draft="contributed">heure avancée des Samoa</daylight>
+					<generic>heure des Samoa</generic>
+					<standard>heure normale des Samoa</standard>
+					<daylight>heure avancée des Samoa</daylight>
 				</long>
 			</metazone>
 			<metazone type="Taipei">
 				<long>
-					<generic draft="contributed">heure de Taipei</generic>
-					<standard draft="contributed">heure normale de Taipei</standard>
-					<daylight draft="contributed">heure avancée de Taipei</daylight>
+					<generic>heure de Taipei</generic>
+					<standard>heure normale de Taipei</standard>
+					<daylight>heure avancée de Taipei</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tonga">
 				<long>
-					<generic draft="contributed">heure des Tonga</generic>
-					<standard draft="contributed">heure normale des Tonga</standard>
-					<daylight draft="contributed">heure avancée de Tonga</daylight>
+					<generic>heure des Tonga</generic>
+					<standard>heure normale des Tonga</standard>
+					<daylight>heure avancée de Tonga</daylight>
 				</long>
 			</metazone>
 			<metazone type="Turkmenistan">
@@ -920,23 +893,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Uruguay">
 				<long>
-					<generic draft="contributed">heure de l’Uruguay</generic>
-					<standard draft="contributed">heure normale de l’Uruguay</standard>
-					<daylight draft="contributed">heure avancée de l’Uruguay</daylight>
+					<generic>heure de l’Uruguay</generic>
+					<standard>heure normale de l’Uruguay</standard>
+					<daylight>heure avancée de l’Uruguay</daylight>
 				</long>
 			</metazone>
 			<metazone type="Uzbekistan">
 				<long>
-					<generic draft="contributed">heure de l’Ouzbékistan</generic>
-					<standard draft="contributed">heure normale de l’Ouzbékistan</standard>
-					<daylight draft="contributed">heure avancée de l’Ouzbékistan</daylight>
+					<generic>heure de l’Ouzbékistan</generic>
+					<standard>heure normale de l’Ouzbékistan</standard>
+					<daylight>heure avancée de l’Ouzbékistan</daylight>
 				</long>
 			</metazone>
 			<metazone type="Vanuatu">
 				<long>
-					<generic draft="contributed">heure du Vanuatu</generic>
-					<standard draft="contributed">heure normale du Vanuatu</standard>
-					<daylight draft="contributed">heure avancée de Vanuatu</daylight>
+					<generic>heure du Vanuatu</generic>
+					<standard>heure normale du Vanuatu</standard>
+					<daylight>heure avancée de Vanuatu</daylight>
 				</long>
 			</metazone>
 			<metazone type="Vladivostok">
@@ -948,29 +921,45 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Volgograd">
 				<long>
-					<generic draft="contributed">heure de Volgograd</generic>
-					<standard draft="contributed">heure normale de Volgograd</standard>
-					<daylight draft="contributed">heure avancée de Volgograd</daylight>
+					<generic>heure de Volgograd</generic>
+					<standard>heure normale de Volgograd</standard>
+					<daylight>heure avancée de Volgograd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Yakutsk">
 				<long>
-					<generic draft="contributed">heure de Iakoutsk</generic>
-					<standard draft="contributed">heure normale de Iakoutsk</standard>
-					<daylight draft="contributed">heure avancée de Iakoutsk</daylight>
+					<generic>heure de Iakoutsk</generic>
+					<standard>heure normale de Iakoutsk</standard>
+					<daylight>heure avancée de Iakoutsk</daylight>
 				</long>
 			</metazone>
 			<metazone type="Yekaterinburg">
 				<long>
-					<generic draft="contributed">heure d’Ekaterinbourg</generic>
-					<standard draft="contributed">heure normale d’Ekaterinbourg</standard>
-					<daylight draft="contributed">heure avancée d’Ekaterinbourg</daylight>
+					<generic>heure d’Ekaterinbourg</generic>
+					<standard>heure normale d’Ekaterinbourg</standard>
+					<daylight>heure avancée d’Ekaterinbourg</daylight>
 				</long>
 			</metazone>
 		</timeZoneNames>
 	</dates>
 	<numbers>
 		<decimalFormats numberSystem="latn">
+			<decimalFormatLength type="long">
+				<decimalFormat>
+					<pattern type="1000000000" count="one">0 milliard</pattern>
+					<pattern type="1000000000" count="other">0 milliards</pattern>
+					<pattern type="10000000000" count="one">00 milliard</pattern>
+					<pattern type="10000000000" count="other">00 milliards</pattern>
+					<pattern type="100000000000" count="one">000 milliard</pattern>
+					<pattern type="100000000000" count="other">000 milliards</pattern>
+					<pattern type="1000000000000" count="one">0 billion</pattern>
+					<pattern type="1000000000000" count="other">0 billions</pattern>
+					<pattern type="10000000000000" count="one">00 billion</pattern>
+					<pattern type="10000000000000" count="other">00 billions</pattern>
+					<pattern type="100000000000000" count="one">000 billion</pattern>
+					<pattern type="100000000000000" count="other">000 billions</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
 			<decimalFormatLength type="short">
 				<decimalFormat>
 					<pattern type="1000000000" count="one" draft="contributed">0 G</pattern>
@@ -988,6 +977,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000000" count="one">0 mn ¤</pattern>
+					<pattern type="1000000" count="other">0 mns ¤</pattern>
+					<pattern type="10000000" count="one">00 mn ¤</pattern>
+					<pattern type="10000000" count="other">00 mns ¤</pattern>
+					<pattern type="100000000" count="one">000 mn ¤</pattern>
+					<pattern type="100000000" count="other">000 mns ¤</pattern>
+					<pattern type="1000000000" count="one">0 md ¤</pattern>
+					<pattern type="1000000000" count="other">0 mds ¤</pattern>
+					<pattern type="10000000000" count="one">00 md ¤</pattern>
+					<pattern type="10000000000" count="other">00 mds ¤</pattern>
+					<pattern type="100000000000" count="one">000 md ¤</pattern>
+					<pattern type="100000000000" count="other">000 mds ¤</pattern>
+					<pattern type="1000000000000" count="one">0 bn ¤</pattern>
+					<pattern type="1000000000000" count="other">0 bns ¤</pattern>
+					<pattern type="10000000000000" count="one">00 bn ¤</pattern>
+					<pattern type="10000000000000" count="other">00 bns ¤</pattern>
+					<pattern type="100000000000000" count="one">000 bn ¤</pattern>
+					<pattern type="100000000000000" count="other">000 bns ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencies>
 			<currency type="ARS">
 				<symbol draft="contributed">ARS</symbol>
@@ -1023,9 +1036,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol draft="contributed">FJD</symbol>
 			</currency>
 			<currency type="FKP">
-				<displayName draft="contributed">livre des Îles Malouines</displayName>
-				<displayName count="one" draft="contributed">livre des Îles Malouines</displayName>
-				<displayName count="other" draft="contributed">livres des Îles Malouines</displayName>
+				<displayName>livre des Îles Malouines</displayName>
+				<displayName count="one">livre des Îles Malouines</displayName>
+				<displayName count="other">livres des Îles Malouines</displayName>
 				<symbol draft="contributed">FKP</symbol>
 			</currency>
 			<currency type="GBP">
@@ -1040,12 +1053,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="ILS">
 				<symbol draft="contributed">ILS</symbol>
 			</currency>
-			<currency type="INR">
-				<symbol draft="contributed">INR</symbol>
-			</currency>
 			<currency type="JPY">
 				<symbol draft="contributed">¥</symbol>
 			</currency>
+			<currency type="KMF">
+				<symbol alt="narrow" draft="contributed">CF</symbol>
+			</currency>
 			<currency type="KRW">
 				<symbol draft="contributed">KRW</symbol>
 			</currency>
@@ -1058,6 +1071,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="NAD">
 				<symbol draft="contributed">NAD</symbol>
 			</currency>
+			<currency type="NIO">
+				<symbol alt="narrow" draft="contributed">C$</symbol>
+			</currency>
 			<currency type="NZD">
 				<symbol draft="contributed">$ NZ</symbol>
 			</currency>
@@ -1067,11 +1083,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="SGD">
 				<symbol draft="contributed">$ SG</symbol>
 			</currency>
-			<currency type="THB">
-				<symbol draft="contributed">THB</symbol>
+			<currency type="SRD">
+				<symbol draft="contributed">SRD</symbol>
+			</currency>
+			<currency type="TOP">
+				<displayName draft="contributed">pa’anga</displayName>
+				<displayName count="one" draft="contributed">pa’anga</displayName>
+				<displayName count="other" draft="contributed">pa’angas</displayName>
+			</currency>
+			<currency type="TRY">
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
-				<displayName draft="contributed">dollar de Trinité-et-Tobago</displayName>
+				<displayName>dollar de Trinité-et-Tobago</displayName>
 				<symbol draft="contributed">TTD</symbol>
 			</currency>
 			<currency type="USD">
@@ -1092,6 +1116,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="XPF">
 				<symbol draft="contributed">XPF</symbol>
 			</currency>
+			<currency type="XXX">
+				<displayName>Devise inconnue</displayName>
+				<displayName count="one">(devise inconnue)</displayName>
+				<displayName count="other">(devise inconnue)</displayName>
+			</currency>
+			<currency type="ZMW">
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
+			</currency>
 		</currencies>
 	</numbers>
 	<units>
@@ -1099,46 +1131,62 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="acceleration-g-force">
 				<displayName draft="contributed">force G</displayName>
 			</unit>
-			<unit type="area-acre">
-				<displayName draft="contributed">acres</displayName>
-				<unitPattern count="one" draft="contributed">{0} acre</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} acres</unitPattern>
+			<unit type="angle-arc-second">
+				<unitPattern count="one" draft="contributed">{0} seconde d’angle</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} secondes d’angle</unitPattern>
 			</unit>
 			<unit type="area-square-mile">
 				<displayName draft="contributed">milles carrés</displayName>
 				<unitPattern count="one" draft="contributed">{0} mille carré</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} milles carrés</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<displayName draft="contributed">acres</displayName>
+				<unitPattern count="one" draft="contributed">{0} acre</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} acres</unitPattern>
+			</unit>
 			<unit type="area-square-yard">
 				<displayName draft="contributed">verges carrées</displayName>
 				<unitPattern count="one" draft="contributed">{0} verge carrée</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} verges carrées</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<unitPattern count="one" draft="provisional">{0} litre au 100 kilomètres</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} litres au 100 kilomètres</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
-				<displayName draft="contributed">milles au gallon</displayName>
-				<unitPattern count="one" draft="contributed">{0} mille au gallon</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} milles au gallon</unitPattern>
+				<displayName>milles au gallon</displayName>
+				<unitPattern count="one">{0} mille au gallon</unitPattern>
+				<unitPattern count="other">{0} milles au gallon</unitPattern>
 			</unit>
 			<unit type="duration-second">
 				<perUnitPattern draft="contributed">{0} à la seconde</perUnitPattern>
 			</unit>
 			<unit type="length-mile">
-				<displayName draft="contributed">mille</displayName>
-				<unitPattern count="one" draft="contributed">{0} mille</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} milles</unitPattern>
+				<displayName>mille</displayName>
+				<unitPattern count="one">{0} mille</unitPattern>
+				<unitPattern count="other">{0} milles</unitPattern>
 			</unit>
 			<unit type="length-yard">
 				<displayName draft="contributed">verges</displayName>
 				<unitPattern count="one" draft="contributed">{0} verge</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} verges</unitPattern>
 			</unit>
+			<unit type="mass-kilogram">
+				<perUnitPattern draft="contributed">{0} par kilogramme</perUnitPattern>
+			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName draft="contributed">kilomètres à l’heure</displayName>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<displayName draft="contributed">milles à l’heure</displayName>
-				<unitPattern count="one" draft="contributed">{0} mille à l’heure</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} milles à l’heure</unitPattern>
+				<displayName>milles à l’heure</displayName>
+				<unitPattern count="one">{0} mille à l’heure</unitPattern>
+				<unitPattern count="other">{0} milles à l’heure</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName draft="provisional">°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName draft="contributed">milles cubes</displayName>
@@ -1150,16 +1198,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} verge cube</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} verges cubes</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName draft="contributed">chopine</displayName>
-				<unitPattern count="one" draft="contributed">{0} chopine</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} chopines</unitPattern>
-			</unit>
 			<unit type="volume-quart">
 				<displayName draft="contributed">pintes</displayName>
 				<unitPattern count="one" draft="contributed">{0} pinte</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} pintes</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>chopine</displayName>
+				<unitPattern count="one">{0} chopine</unitPattern>
+				<unitPattern count="other">{0} chopines</unitPattern>
+			</unit>
 			<unit type="volume-teaspoon">
 				<displayName draft="contributed">cuillères à thé</displayName>
 				<unitPattern count="one" draft="contributed">{0} cuillère à thé</unitPattern>
@@ -1167,95 +1215,100 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 		</unitLength>
 		<unitLength type="short">
-			<unit type="area-square-foot">
-				<unitPattern count="one" draft="contributed">{0} pi²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pi²</unitPattern>
-			</unit>
 			<unit type="area-square-yard">
 				<displayName draft="contributed">vg²</displayName>
 				<unitPattern count="one" draft="contributed">{0} vg²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} vg²</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<unitPattern count="one" draft="contributed">{0} ua</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ua</unitPattern>
+			<unit type="area-square-foot">
+				<unitPattern count="one" draft="contributed">{0} pi²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} pi²</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one" draft="contributed">{0} pi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pi</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName draft="contributed">al</displayName>
-				<unitPattern count="one" draft="contributed">{0} al</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} al</unitPattern>
-			</unit>
-			<unit type="length-nautical-mile">
-				<displayName draft="contributed">NM</displayName>
-				<unitPattern count="one" draft="contributed">{0} NM</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} NM</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>carats</displayName>
 			</unit>
 			<unit type="length-yard">
 				<displayName draft="contributed">vg</displayName>
 				<unitPattern count="one" draft="contributed">{0} vg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} vg</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<unitPattern count="one" draft="contributed">{0} pi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} pi</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<unitPattern count="one" draft="contributed">{0} ua</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ua</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName draft="contributed">NM</displayName>
+				<unitPattern count="one" draft="contributed">{0} NM</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} NM</unitPattern>
+			</unit>
 			<unit type="mass-ton">
 				<displayName draft="contributed">tc</displayName>
 				<unitPattern count="one" draft="contributed">{0} tc</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} tc</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName draft="contributed">carats</displayName>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName draft="contributed">cL</displayName>
-				<unitPattern count="one" draft="contributed">{0} cL</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<unitPattern count="one" draft="contributed">{0} pi³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pi³</unitPattern>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName draft="contributed">psi</displayName>
+				<unitPattern count="one" draft="contributed">{0} psi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} psi</unitPattern>
 			</unit>
 			<unit type="volume-cubic-yard">
 				<displayName draft="contributed">vg³</displayName>
 				<unitPattern count="one" draft="contributed">{0} vg³</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} vg³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName draft="contributed">dL</displayName>
-				<unitPattern count="one" draft="contributed">{0} dL</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} dL</unitPattern>
-			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName draft="contributed">oz liq.</displayName>
-				<unitPattern count="one" draft="contributed">{0} oz liq.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} oz liq.</unitPattern>
-			</unit>
-			<unit type="volume-hectoliter">
-				<displayName draft="contributed">hL</displayName>
-				<unitPattern count="one" draft="contributed">{0} hL</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} hL</unitPattern>
+			<unit type="volume-cubic-foot">
+				<unitPattern count="one" draft="contributed">{0} pi³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} pi³</unitPattern>
 			</unit>
 			<unit type="volume-megaliter">
 				<displayName draft="contributed">ML</displayName>
 				<unitPattern count="one" draft="contributed">{0} ML</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ML</unitPattern>
 			</unit>
+			<unit type="volume-hectoliter">
+				<displayName draft="contributed">hL</displayName>
+				<unitPattern count="one" draft="contributed">{0} hL</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} hL</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName draft="contributed">L</displayName>
+				<unitPattern count="one" draft="contributed">{0} L</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} L</unitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName draft="contributed">dL</displayName>
+				<unitPattern count="one" draft="contributed">{0} dL</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName draft="contributed">cL</displayName>
+				<unitPattern count="one" draft="contributed">{0} cL</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cL</unitPattern>
+			</unit>
 			<unit type="volume-milliliter">
 				<displayName draft="contributed">mL</displayName>
 				<unitPattern count="one" draft="contributed">{0} mL</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName draft="contributed">chop</displayName>
-				<unitPattern count="one" draft="contributed">{0} chop</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} chop</unitPattern>
-			</unit>
 			<unit type="volume-quart">
 				<displayName draft="contributed">pte</displayName>
 				<unitPattern count="one" draft="contributed">{0} pte</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} pte</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>chop</displayName>
+				<unitPattern count="one">{0} chop</unitPattern>
+				<unitPattern count="other">{0} chop</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>oz liq.</displayName>
+				<unitPattern count="one">{0} oz liq.</unitPattern>
+				<unitPattern count="other">{0} oz liq.</unitPattern>
+			</unit>
 			<unit type="volume-teaspoon">
 				<displayName draft="contributed">c. à t.</displayName>
 				<unitPattern count="one" draft="contributed">{0} c. à t.</unitPattern>
@@ -1263,10 +1316,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 		</unitLength>
 		<unitLength type="narrow">
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName draft="provisional">L/100 km</displayName>
+				<unitPattern count="one" draft="provisional">{0} L/100 km</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} L/100 km</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<unitPattern count="one" draft="contributed">{0} °C</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} °C</unitPattern>
 			</unit>
+			<unit type="volume-liter">
+				<displayName draft="contributed">L</displayName>
+				<unitPattern count="one" draft="contributed">{0}L</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}L</unitPattern>
+			</unit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern draft="contributed">h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_CD.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CD.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_CD.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CD.xml
index 239f0cdf24c..d433d83f4d4 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_CD.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CD.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="CD"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_CF.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CF.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_CF.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CF.xml
index c630f9311a9..3f92cbe53bc 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_CF.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CF.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="CF"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_CG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CG.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_CG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CG.xml
index c5d0cd5391d..69b1da4b08c 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_CG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CG.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="CG"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_CH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CH.xml
similarity index 96%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_CH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CH.xml
index dd249193f55..25ba71596f0 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_CH.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CH.xml
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="CH"/>
 	</identity>
 	<localeDisplayNames>
+		<languages>
+			<language type="sdh" draft="contributed">kurde méridional</language>
+		</languages>
 		<territories>
 			<territory type="057" draft="unconfirmed">Région micronésienne</territory>
 			<territory type="MK" alt="variant" draft="unconfirmed">A.R. yougoslave de Macédoine</territory>
@@ -222,6 +224,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<symbols numberSystem="latn">
 			<decimal>.</decimal>
 		</symbols>
+		<percentFormats numberSystem="latn">
+			<percentFormatLength>
+				<percentFormat>
+					<pattern draft="contributed">#,##0%</pattern>
+				</percentFormat>
+			</percentFormatLength>
+		</percentFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_CI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CI.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_CI.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CI.xml
index 0a13228a5b2..017eb2adbd0 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_CI.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CI.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="CI"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_CM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CM.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_CM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CM.xml
index 8ab7f2c20a8..8bfbe657a69 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_CM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CM.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="CM"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_DJ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_DJ.xml
new file mode 100644
index 00000000000..14a1e28f41b
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_DJ.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="fr"/>
+		<territory type="DJ"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>h:mm:ss a zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>h:mm:ss a z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>h:mm:ss a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>h:mm a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="DJF">
+				<symbol>Fdj</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_DZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_DZ.xml
new file mode 100644
index 00000000000..f246d5187c1
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_DZ.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="fr"/>
+		<territory type="DZ"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>h:mm:ss a zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>h:mm:ss a z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>h:mm:ss a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>h:mm a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="DZD">
+				<symbol>DA</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_FR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_FR.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_FR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_FR.xml
index 302f7e2f5b0..ba77e5d7c95 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_FR.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_FR.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="FR"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_GA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GA.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_GA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GA.xml
index ed53200de83..28d305e6663 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_GA.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GA.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="GA"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ne_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GF.xml
similarity index 66%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ne_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GF.xml
index 6c1c54380ed..7fc4d8d779b 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ne_IN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GF.xml
@@ -6,16 +6,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11172 $"/>
-		<generation date="$Date: 2015-02-10 17:22:07 -0600 (Tue, 10 Feb 2015) $"/>
-		<language type="ne"/>
-		<territory type="IN"/>
+		<version number="$Revision: 11914 $"/>
+		<language type="fr"/>
+		<territory type="GF"/>
 	</identity>
 	<dates>
 		<timeZoneNames>
-			<metazone type="India">
+			<metazone type="French_Guiana">
 				<short>
-					<standard>IST</standard>
+					<standard>GFT</standard>
 				</short>
 			</metazone>
 		</timeZoneNames>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_GN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GN.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_GN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GN.xml
index 98ead9ccbd8..f625ee88ebd 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_GN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GN.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="GN"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_GP.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GP.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_GP.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GP.xml
index bdfa5a46b94..6a12d63dc52 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_GP.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GP.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="GP"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_GQ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GQ.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_GQ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GQ.xml
index d45ea59700c..f289788f3a3 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_GQ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GQ.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="GQ"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_HT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_HT.xml
new file mode 100644
index 00000000000..ed493ccf454
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_HT.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11994 $"/>
+		<language type="fr"/>
+		<territory type="HT"/>
+	</identity>
+	<dates>
+		<fields>
+			<field type="day-short">
+				<displayName draft="contributed">jr.</displayName>
+			</field>
+			<field type="day-narrow">
+				<displayName draft="contributed">jr.</displayName>
+			</field>
+			<field type="sun-narrow">
+				<relative type="-1" draft="contributed">dim dernier</relative>
+				<relative type="0" draft="contributed">ce dim</relative>
+				<relative type="1" draft="contributed">dim prochain</relative>
+			</field>
+			<field type="mon-narrow">
+				<relative type="-1" draft="contributed">lun dernier</relative>
+				<relative type="0" draft="contributed">ce lun</relative>
+				<relative type="1" draft="contributed">lun prochain</relative>
+			</field>
+			<field type="tue-narrow">
+				<relative type="-1" draft="contributed">mar dernier</relative>
+				<relative type="0" draft="contributed">ce mar</relative>
+				<relative type="1" draft="contributed">mar prochain</relative>
+			</field>
+			<field type="wed-narrow">
+				<relative type="-1" draft="contributed">mer dernier</relative>
+				<relative type="0" draft="contributed">ce mer</relative>
+				<relative type="1" draft="contributed">mer prochain</relative>
+			</field>
+			<field type="thu-narrow">
+				<relative type="-1" draft="contributed">jeu dernier</relative>
+				<relative type="0" draft="contributed">ce jeu</relative>
+				<relative type="1" draft="contributed">jeu prochain</relative>
+			</field>
+			<field type="fri-narrow">
+				<relative type="-1" draft="contributed">ven dernier</relative>
+				<relative type="0" draft="contributed">ce ven</relative>
+				<relative type="1" draft="contributed">ven prochain</relative>
+			</field>
+			<field type="sat-narrow">
+				<relative type="-1" draft="contributed">sam dernier</relative>
+				<relative type="0" draft="contributed">ce sam</relative>
+				<relative type="1" draft="contributed">sam prochain</relative>
+			</field>
+			<field type="hour-short">
+				<displayName draft="contributed">hr</displayName>
+			</field>
+			<field type="hour-narrow">
+				<displayName draft="contributed">hr</displayName>
+			</field>
+			<field type="minute-short">
+				<displayName draft="contributed">min.</displayName>
+			</field>
+			<field type="minute-narrow">
+				<displayName draft="contributed">min.</displayName>
+			</field>
+			<field type="second-narrow">
+				<displayName draft="contributed">sec.</displayName>
+			</field>
+		</fields>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="HTG">
+				<symbol>G</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+	<units>
+		<unitLength type="long">
+			<unit type="area-hectare">
+				<displayName draft="contributed">carreau</displayName>
+				<unitPattern count="one" draft="contributed">{0}carreau</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}carreaux</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<perUnitPattern draft="contributed">{0} pour chaque metre cube</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<perUnitPattern draft="contributed">{0} pour chaque centimetre cube</perUnitPattern>
+			</unit>
+		</unitLength>
+		<unitLength type="short">
+			<unit type="duration-century">
+				<displayName draft="contributed">sec</displayName>
+			</unit>
+			<unit type="mass-gram">
+				<unitPattern count="one" draft="contributed">{0}gr</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}gr</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName draft="contributed">kr</displayName>
+				<unitPattern count="one" draft="contributed">{0}kr</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}kr</unitPattern>
+			</unit>
+		</unitLength>
+		<unitLength type="narrow">
+			<unit type="mass-gram">
+				<displayName draft="contributed">gr.</displayName>
+			</unit>
+		</unitLength>
+	</units>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_KM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_KM.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_KM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_KM.xml
index 846f945d1ff..3ec9f6e5b18 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_KM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_KM.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="KM"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_LU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_LU.xml
similarity index 78%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_LU.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_LU.xml
index d47640615d4..2131ce14b93 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_LU.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_LU.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="LU"/>
 	</identity>
@@ -25,3 +24,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MA.xml
new file mode 100644
index 00000000000..065cb7e6234
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MA.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="fr"/>
+		<territory type="MA"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">jan.</month>
+							<month type="2" draft="contributed">fév.</month>
+							<month type="3" draft="contributed">mar.</month>
+							<month type="4" draft="contributed">avr.</month>
+							<month type="5" draft="contributed">mai</month>
+							<month type="6" draft="contributed">jui.</month>
+							<month type="7" draft="contributed">juil.</month>
+							<month type="8" draft="contributed">août</month>
+							<month type="9" draft="contributed">sept.</month>
+							<month type="10" draft="contributed">oct.</month>
+							<month type="11" draft="contributed">nov.</month>
+							<month type="12" draft="contributed">déc.</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">jan.</month>
+							<month type="2" draft="contributed">fév.</month>
+							<month type="3" draft="contributed">mar.</month>
+							<month type="4" draft="contributed">avr.</month>
+							<month type="5" draft="contributed">mai</month>
+							<month type="6" draft="contributed">jui.</month>
+							<month type="7" draft="contributed">juil.</month>
+							<month type="8" draft="contributed">août</month>
+							<month type="9" draft="contributed">sept.</month>
+							<month type="10" draft="contributed">oct.</month>
+							<month type="11" draft="contributed">nov.</month>
+							<month type="12" draft="contributed">déc.</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am" draft="contributed">a.m.</dayPeriod>
+							<dayPeriod type="pm" draft="contributed">p.m.</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<symbols numberSystem="latn">
+			<group draft="contributed">.</group>
+		</symbols>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_MC.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MC.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_MC.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MC.xml
index cb89a3cd08c..a18c327d5b4 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_MC.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MC.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="MC"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_MF.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MF.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_MF.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MF.xml
index 24939ac9efb..0ae4d4718a9 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_MF.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MF.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="MF"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_MG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MG.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_MG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MG.xml
index 35de875bcbf..b4c4f2ed772 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_MG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MG.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="MG"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_ML.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_ML.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_ML.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_ML.xml
index e2ae105d906..5fe8bb19598 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_ML.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_ML.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="ML"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_MQ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MQ.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_MQ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MQ.xml
index eee2710c79f..a68029a2d3d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_MQ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MQ.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="MQ"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MR.xml
new file mode 100644
index 00000000000..00eeeac49c6
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MR.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="fr"/>
+		<territory type="MR"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>h:mm:ss a zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>h:mm:ss a z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>h:mm:ss a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>h:mm a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="MRO">
+				<symbol>UM</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_MU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MU.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_MU.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MU.xml
index 375d7df586b..51f59a9035d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_MU.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MU.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="MU"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_NC.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_NC.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_NC.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_NC.xml
index aa07b4ac9ed..57e9aefa53c 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_NC.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_NC.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="NC"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_NE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_NE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_NE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_NE.xml
index f20d59f2726..f05458810bb 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_NE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_NE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="NE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_PF.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_PF.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_PF.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_PF.xml
index 9bbf5e220a3..474028f5ff6 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_PF.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_PF.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="PF"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_PM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_PM.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_PM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_PM.xml
index 7883b6a9130..42dc6d711e6 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_PM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_PM.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="PM"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_RE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_RE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_RE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_RE.xml
index cdd471bd585..d967b126059 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_RE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_RE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="RE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_RW.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_RW.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_RW.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_RW.xml
index 51be6a20818..81ddfe66a43 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_RW.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_RW.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="RW"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_SC.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_SC.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_SC.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_SC.xml
index 964715550af..3c98d8412d7 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_SC.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_SC.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="SC"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_SN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_SN.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_SN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_SN.xml
index 9aacf4c57b9..9877461033a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_SN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_SN.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="SN"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_SY.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_SY.xml
new file mode 100644
index 00000000000..1b5a8f37267
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_SY.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="fr"/>
+		<territory type="SY"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>h:mm:ss a zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>h:mm:ss a z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>h:mm:ss a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>h:mm a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="SYP">
+				<symbol>LS</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_TD.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_TD.xml
new file mode 100644
index 00000000000..c397699e31a
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_TD.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="fr"/>
+		<territory type="TD"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>h:mm:ss a zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>h:mm:ss a z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>h:mm:ss a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>h:mm a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_TG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_TG.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_TG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_TG.xml
index da88a40fc74..459af7b03d4 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_TG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_TG.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="TG"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_TN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_TN.xml
new file mode 100644
index 00000000000..548cfb19d50
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_TN.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="fr"/>
+		<territory type="TN"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>h:mm:ss a zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>h:mm:ss a z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>h:mm:ss a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>h:mm a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="TND">
+				<symbol>DT</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_VU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_VU.xml
new file mode 100644
index 00000000000..facefde2aae
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_VU.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="fr"/>
+		<territory type="VU"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>h:mm:ss a zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>h:mm:ss a z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>h:mm:ss a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>h:mm a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="VUV">
+				<symbol>VT</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_WF.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_WF.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_WF.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_WF.xml
index 50d74348a15..6ca537be4df 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_WF.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_WF.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="WF"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_YT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_YT.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_YT.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_YT.xml
index 44c551e1078..e4089a84465 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fr_YT.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_YT.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fr"/>
 		<territory type="YT"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fur.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fur.xml
similarity index 96%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fur.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fur.xml
index a1abea2f21b..66accdf4e18 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fur.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fur.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11093 $"/>
-		<generation date="$Date: 2015-01-02 21:36:02 -0600 (Fri, 02 Jan 2015) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="fur"/>
 	</identity>
 	<localeDisplayNames>
@@ -303,7 +302,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI" draft="contributed">Anguilla</territory>
 			<territory type="AL" draft="contributed">Albanie</territory>
 			<territory type="AM" draft="contributed">Armenie</territory>
-			<territory type="AN" draft="contributed">Antilis olandesis</territory>
 			<territory type="AO" draft="contributed">Angola</territory>
 			<territory type="AQ" draft="contributed">Antartic</territory>
 			<territory type="AR" draft="contributed">Argjentine</territory>
@@ -580,24 +578,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="currency" draft="contributed">monede</key>
 		</keys>
 		<types>
-			<type type="big5han" key="collation" draft="contributed">ordin cinês tradizionâl - Big5</type>
-			<type type="buddhist" key="calendar" draft="contributed">calendari budist</type>
-			<type type="chinese" key="calendar" draft="contributed">calendari cinês</type>
-			<type type="ducet" key="collation" draft="contributed">ordenament predeterminât Unicode</type>
-			<type type="gb2312han" key="collation" draft="contributed">ordin cinês semplificât - GB2312</type>
-			<type type="gregorian" key="calendar" draft="contributed">calendari gregorian</type>
-			<type type="hebrew" key="calendar" draft="contributed">calendari ebreu</type>
-			<type type="indian" key="calendar" draft="contributed">calendari nazionâl indian</type>
-			<type type="islamic" key="calendar" draft="contributed">calendari islamic</type>
-			<type type="islamic-civil" key="calendar" draft="contributed">calendari islamic civîl</type>
-			<type type="japanese" key="calendar" draft="contributed">calendari gjaponês</type>
-			<type type="latn" key="numbers" draft="contributed">numars ocidentâi</type>
-			<type type="phonebook" key="collation" draft="contributed">ordin elenc telefonic</type>
-			<type type="pinyin" key="collation" draft="contributed">ordin pinyin</type>
-			<type type="roc" key="calendar" draft="contributed">calendari de Republiche di Cine</type>
-			<type type="search" key="collation" draft="contributed">ricercje par fins gjenerâi</type>
-			<type type="stroke" key="collation" draft="contributed">ordin segns</type>
-			<type type="traditional" key="collation" draft="contributed">ordin tradizionâl</type>
+			<type key="calendar" type="buddhist" draft="contributed">calendari budist</type>
+			<type key="calendar" type="chinese" draft="contributed">calendari cinês</type>
+			<type key="calendar" type="gregorian" draft="contributed">calendari gregorian</type>
+			<type key="calendar" type="hebrew" draft="contributed">calendari ebreu</type>
+			<type key="calendar" type="indian" draft="contributed">calendari nazionâl indian</type>
+			<type key="calendar" type="islamic" draft="contributed">calendari islamic</type>
+			<type key="calendar" type="islamic-civil" draft="contributed">calendari islamic civîl</type>
+			<type key="calendar" type="japanese" draft="contributed">calendari gjaponês</type>
+			<type key="calendar" type="roc" draft="contributed">calendari de Republiche di Cine</type>
+			<type key="collation" type="big5han" draft="contributed">ordin cinês tradizionâl - Big5</type>
+			<type key="collation" type="ducet" draft="contributed">ordenament predeterminât Unicode</type>
+			<type key="collation" type="gb2312han" draft="contributed">ordin cinês semplificât - GB2312</type>
+			<type key="collation" type="phonebook" draft="contributed">ordin elenc telefonic</type>
+			<type key="collation" type="pinyin" draft="contributed">ordin pinyin</type>
+			<type key="collation" type="search" draft="contributed">ricercje par fins gjenerâi</type>
+			<type key="collation" type="stroke" draft="contributed">ordin segns</type>
+			<type key="collation" type="traditional" draft="contributed">ordin tradizionâl</type>
+			<type key="numbers" type="latn" draft="contributed">numars ocidentâi</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric" draft="contributed">metric</measurementSystemName>
@@ -956,6 +954,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am" draft="contributed">a.</dayPeriod>
+							<dayPeriod type="pm" draft="contributed">p.</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am" draft="contributed">a.</dayPeriod>
 							<dayPeriod type="pm" draft="contributed">p.</dayPeriod>
@@ -1366,6 +1368,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern draft="contributed">¤ #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤ 0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤ 00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤ 000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤ 0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤ 00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤ 000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤ 0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤ 00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤ 000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤ 0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤ 00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤ 000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
 			<unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -1622,6 +1652,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</numbers>
 	<units>
 		<unitLength type="long">
+			<unit type="duration-year">
+				<displayName draft="contributed">agns</displayName>
+				<unitPattern count="one">{0} an</unitPattern>
+				<unitPattern count="other">{0} agns</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">mês</displayName>
+				<unitPattern count="one">{0} mês</unitPattern>
+				<unitPattern count="other">{0} mês</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="contributed">setemanis</displayName>
+				<unitPattern count="one">{0} setemane</unitPattern>
+				<unitPattern count="other">{0} setemanis</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="contributed">zornadis</displayName>
 				<unitPattern count="one">{0} zornade</unitPattern>
@@ -1637,28 +1682,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} minût</unitPattern>
 				<unitPattern count="other">{0} minûts</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">mês</displayName>
-				<unitPattern count="one">{0} mês</unitPattern>
-				<unitPattern count="other">{0} mês</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="contributed">seconts</displayName>
 				<unitPattern count="one">{0} secont</unitPattern>
 				<unitPattern count="other">{0} seconts</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">setemanis</displayName>
-				<unitPattern count="one">{0} setemane</unitPattern>
-				<unitPattern count="other">{0} setemanis</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">agns</displayName>
-				<unitPattern count="one">{0} an</unitPattern>
-				<unitPattern count="other">{0} agns</unitPattern>
-			</unit>
 		</unitLength>
 		<unitLength type="short">
+			<unit type="duration-year">
+				<displayName draft="contributed">agns</displayName>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">mês</displayName>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="contributed">setemanis</displayName>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="contributed">zornadis</displayName>
 			</unit>
@@ -1668,18 +1707,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="duration-minute">
 				<displayName draft="contributed">minûts</displayName>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">mês</displayName>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="contributed">seconts</displayName>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">setemanis</displayName>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">agns</displayName>
-			</unit>
 		</unitLength>
 	</units>
 	<listPatterns>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fur_IT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fur_IT.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fur_IT.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fur_IT.xml
index 7764abed76b..d5c82184da5 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fur_IT.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fur_IT.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fur"/>
 		<territory type="IT"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fy.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fy.xml
similarity index 95%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fy.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fy.xml
index 5edd5f38ca2..6c1ed86b38f 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fy.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fy.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11093 $"/>
-		<generation date="$Date: 2015-01-02 21:36:02 -0600 (Fri, 02 Jan 2015) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="fy"/>
 	</identity>
 	<localeDisplayNames>
@@ -452,8 +451,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux" draft="contributed">Soemerysk</language>
 			<language type="sv" draft="contributed">Zweeds</language>
 			<language type="sw" draft="contributed">Swahili</language>
+			<language type="sw_CD">Congo Swahili</language>
 			<language type="swb" draft="contributed">Shimaore</language>
-			<language type="swc" draft="contributed">Congo Swahili</language>
 			<language type="syc" draft="contributed">Klassiek Syrysk</language>
 			<language type="syr" draft="contributed">Syrysk</language>
 			<language type="ta" draft="contributed">Tamil</language>
@@ -734,7 +733,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI" draft="contributed">Anguilla</territory>
 			<territory type="AL" draft="contributed">Albanië</territory>
 			<territory type="AM" draft="contributed">Armenië</territory>
-			<territory type="AN" draft="contributed">Nederlânske Antillen</territory>
 			<territory type="AO" draft="contributed">Angola</territory>
 			<territory type="AQ" draft="contributed">Antarctica</territory>
 			<territory type="AR" draft="contributed">Argentinië</territory>
@@ -1078,95 +1076,95 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x" draft="contributed">Privégebruik</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers" draft="contributed">Arabysk-Indyske sifers</type>
-			<type type="arabext" key="numbers" draft="contributed">Utwreide Arabysk-Indyske sifers</type>
-			<type type="armn" key="numbers" draft="contributed">Armeense sifers</type>
-			<type type="armnlow" key="numbers" draft="contributed">Kleine Armeense sifers</type>
-			<type type="bali" key="numbers" draft="contributed">Balinese sifers</type>
-			<type type="beng" key="numbers" draft="contributed">Bengaalse sifers</type>
-			<type type="big5han" key="collation" draft="contributed">Tradisjonele-Sineeske soartear oarder - Big5</type>
-			<type type="buddhist" key="calendar" draft="contributed">Boeddhistyske kalinder</type>
-			<type type="chinese" key="calendar" draft="contributed">Sineeske kalinder</type>
-			<type type="coptic" key="calendar" draft="contributed">Koptyske kalinder</type>
-			<type type="deva" key="numbers" draft="contributed">Devanagari sifers</type>
-			<type type="dictionary" key="collation" draft="contributed">Wurdboeksortearfolgorde</type>
-			<type type="ducet" key="collation" draft="contributed">Standert Unikoade-sortearfolgorde</type>
-			<type type="ethi" key="numbers" draft="contributed">Ethiopyske sifers</type>
-			<type type="ethiopic" key="calendar" draft="contributed">Ethiopyske kalinder</type>
-			<type type="ethiopic-amete-alem" key="calendar" draft="contributed">Ethiopyske Amete Alem-kalinder</type>
-			<type type="finance" key="numbers" draft="contributed">Finansjele sifers</type>
-			<type type="fullwide" key="numbers" draft="contributed">sifers met volledige breedte</type>
-			<type type="gb2312han" key="collation" draft="contributed">Ferienfâldigde-Sineeske sortearfolgorde - GB2312</type>
-			<type type="geor" key="numbers" draft="contributed">Georgyske sifers</type>
-			<type type="gregorian" key="calendar" draft="contributed">Gregoriaanske kalinder</type>
-			<type type="grek" key="numbers" draft="contributed">Griekse sifers</type>
-			<type type="greklow" key="numbers" draft="contributed">Kleine Griekse sifers</type>
-			<type type="gujr" key="numbers" draft="contributed">Gujarati sifers</type>
-			<type type="guru" key="numbers" draft="contributed">Gurmukhi sifers</type>
-			<type type="hanidec" key="numbers" draft="contributed">Sineeske desimale tallen</type>
-			<type type="hans" key="numbers" draft="contributed">Ferienfâldigde Sineeske sifers</type>
-			<type type="hansfin" key="numbers" draft="contributed">Ferienfâldigde Sineeske finansjele sifers</type>
-			<type type="hant" key="numbers" draft="contributed">Traditjonele Sineeske sifers</type>
-			<type type="hantfin" key="numbers" draft="contributed">Traditjonele Sineeske finansjele sifers</type>
-			<type type="hebr" key="numbers" draft="contributed">Hebreeuwse sifers</type>
-			<type type="hebrew" key="calendar" draft="contributed">Hebreeuwse kalinder</type>
-			<type type="identical" key="colStrength" draft="contributed">Alles sortearje</type>
-			<type type="indian" key="calendar" draft="contributed">Indiase natjonale kalinder</type>
-			<type type="islamic" key="calendar" draft="contributed">Islamityske kalinder</type>
-			<type type="islamic-civil" key="calendar" draft="contributed">Islamityske kalinder (cyclysk)</type>
-			<type type="japanese" key="calendar" draft="contributed">Japanske kalinder</type>
-			<type type="java" key="numbers" draft="contributed">Javaanske sifers</type>
-			<type type="jpan" key="numbers" draft="contributed">Japanske sifers</type>
-			<type type="jpanfin" key="numbers" draft="contributed">Japanske finansjele sifers</type>
-			<type type="khmr" key="numbers" draft="contributed">Khmer sifers</type>
-			<type type="knda" key="numbers" draft="contributed">Kannada sifers</type>
-			<type type="laoo" key="numbers" draft="contributed">Laotiaanske sifers</type>
-			<type type="latn" key="numbers" draft="contributed">Westerse sifers</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">Eerst sortearje op kleine letters</type>
-			<type type="mlym" key="numbers" draft="contributed">Malayalam sifers</type>
-			<type type="mong" key="numbers" draft="contributed">Mongoolse sifers</type>
-			<type type="mymr" key="numbers" draft="contributed">Myanmarese sifers</type>
-			<type type="native" key="numbers" draft="contributed">Binnenlânse sifers</type>
-			<type type="no" key="colBackwards" draft="contributed">Normaal sortearje neffens accenten</type>
-			<type type="no" key="colCaseFirst" draft="contributed">Sortearfolgorde algemien haadletterbrûkme</type>
-			<type type="no" key="colCaseLevel" draft="contributed">Net haadlettergefoelich sortearje</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">Kana apart sortearje</type>
-			<type type="no" key="colNormalization" draft="contributed">Sûnder normalisaasje sortearje</type>
-			<type type="no" key="colNumeric" draft="contributed">Sifers apart sortearje</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">Symbolen sortearje</type>
-			<type type="orya" key="numbers" draft="contributed">Oriya sifers</type>
-			<type type="persian" key="calendar" draft="contributed">Perzyske kalinder</type>
-			<type type="phonebook" key="collation" draft="contributed">Telefoanboeksortearfolgorde</type>
-			<type type="phonetic" key="collation" draft="contributed">Fonetyske sortearfolgorde</type>
-			<type type="pinyin" key="collation" draft="contributed">Pinyinvolgorde</type>
-			<type type="primary" key="colStrength" draft="contributed">Allime sortearje neffens letters</type>
-			<type type="quaternary" key="colStrength" draft="contributed">sortearje neffens aksinten/haadletterbrûkme/breedte/Kana</type>
-			<type type="reformed" key="collation" draft="contributed">Hersjoen sortearfolgorde</type>
-			<type type="roc" key="calendar" draft="contributed">Kalinder fan de Sineeske Republyk</type>
-			<type type="roman" key="numbers" draft="contributed">Romeinske sifers</type>
-			<type type="romanlow" key="numbers" draft="contributed">Lytse Romeinske sifers</type>
-			<type type="search" key="collation" draft="contributed">Algemien sykje</type>
-			<type type="searchjl" key="collation" draft="contributed">Sykje op earste Hangul-medeklinker</type>
-			<type type="secondary" key="colStrength" draft="contributed">Sortearje op accenten</type>
-			<type type="shifted" key="colAlternate" draft="contributed">Sortearje zonder symbolen</type>
-			<type type="standard" key="collation" draft="contributed">standert sortearfolgorde</type>
-			<type type="stroke" key="collation" draft="contributed">Streeksortearfolgorde</type>
-			<type type="taml" key="numbers" draft="contributed">Tradisjonele Tamil sifers</type>
-			<type type="tamldec" key="numbers" draft="contributed">Tamil sifers</type>
-			<type type="telu" key="numbers" draft="contributed">Telugu sifers</type>
-			<type type="tertiary" key="colStrength" draft="contributed">sortearje neffens aksinten/haadletterbrûkme/breedte</type>
-			<type type="thai" key="numbers" draft="contributed">Thaise sifers</type>
-			<type type="tibt" key="numbers" draft="contributed">Tibetaanske sifers</type>
-			<type type="traditional" key="collation" draft="contributed">Tradisjonele sortearfolgorde</type>
-			<type type="traditional" key="numbers" draft="contributed">Tradisjonele sifers</type>
-			<type type="unihan" key="collation" draft="contributed">Sortearfolgorde radicalen/strepen</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">Eerst sortearje op haadletters</type>
-			<type type="vaii" key="numbers" draft="contributed">Vai-sifers</type>
-			<type type="yes" key="colBackwards" draft="contributed">Omgekeerd sortearje op accenten</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">Hoofdlettergevoelig sortearje</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">Kana oars sortearje</type>
-			<type type="yes" key="colNormalization" draft="contributed">Unicode genormaliseerd sortearje</type>
-			<type type="yes" key="colNumeric" draft="contributed">Sifers numeryk sortearje</type>
+			<type key="calendar" type="buddhist" draft="contributed">Boeddhistyske kalinder</type>
+			<type key="calendar" type="chinese" draft="contributed">Sineeske kalinder</type>
+			<type key="calendar" type="coptic" draft="contributed">Koptyske kalinder</type>
+			<type key="calendar" type="ethiopic" draft="contributed">Ethiopyske kalinder</type>
+			<type key="calendar" type="ethiopic-amete-alem" draft="contributed">Ethiopyske Amete Alem-kalinder</type>
+			<type key="calendar" type="gregorian" draft="contributed">Gregoriaanske kalinder</type>
+			<type key="calendar" type="hebrew" draft="contributed">Hebreeuwse kalinder</type>
+			<type key="calendar" type="indian" draft="contributed">Indiase natjonale kalinder</type>
+			<type key="calendar" type="islamic" draft="contributed">Islamityske kalinder</type>
+			<type key="calendar" type="islamic-civil" draft="contributed">Islamityske kalinder (cyclysk)</type>
+			<type key="calendar" type="japanese" draft="contributed">Japanske kalinder</type>
+			<type key="calendar" type="persian" draft="contributed">Perzyske kalinder</type>
+			<type key="calendar" type="roc" draft="contributed">Kalinder fan de Sineeske Republyk</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">Symbolen sortearje</type>
+			<type key="colAlternate" type="shifted" draft="contributed">Sortearje zonder symbolen</type>
+			<type key="colBackwards" type="no" draft="contributed">Normaal sortearje neffens accenten</type>
+			<type key="colBackwards" type="yes" draft="contributed">Omgekeerd sortearje op accenten</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">Eerst sortearje op kleine letters</type>
+			<type key="colCaseFirst" type="no" draft="contributed">Sortearfolgorde algemien haadletterbrûkme</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">Eerst sortearje op haadletters</type>
+			<type key="colCaseLevel" type="no" draft="contributed">Net haadlettergefoelich sortearje</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">Hoofdlettergevoelig sortearje</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">Kana apart sortearje</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">Kana oars sortearje</type>
+			<type key="collation" type="big5han" draft="contributed">Tradisjonele-Sineeske soartear oarder - Big5</type>
+			<type key="collation" type="dictionary" draft="contributed">Wurdboeksortearfolgorde</type>
+			<type key="collation" type="ducet" draft="contributed">Standert Unikoade-sortearfolgorde</type>
+			<type key="collation" type="gb2312han" draft="contributed">Ferienfâldigde-Sineeske sortearfolgorde - GB2312</type>
+			<type key="collation" type="phonebook" draft="contributed">Telefoanboeksortearfolgorde</type>
+			<type key="collation" type="phonetic" draft="contributed">Fonetyske sortearfolgorde</type>
+			<type key="collation" type="pinyin" draft="contributed">Pinyinvolgorde</type>
+			<type key="collation" type="reformed" draft="contributed">Hersjoen sortearfolgorde</type>
+			<type key="collation" type="search" draft="contributed">Algemien sykje</type>
+			<type key="collation" type="searchjl" draft="contributed">Sykje op earste Hangul-medeklinker</type>
+			<type key="collation" type="standard" draft="contributed">standert sortearfolgorde</type>
+			<type key="collation" type="stroke" draft="contributed">Streeksortearfolgorde</type>
+			<type key="collation" type="traditional" draft="contributed">Tradisjonele sortearfolgorde</type>
+			<type key="collation" type="unihan" draft="contributed">Sortearfolgorde radicalen/strepen</type>
+			<type key="colNormalization" type="no" draft="contributed">Sûnder normalisaasje sortearje</type>
+			<type key="colNormalization" type="yes" draft="contributed">Unicode genormaliseerd sortearje</type>
+			<type key="colNumeric" type="no" draft="contributed">Sifers apart sortearje</type>
+			<type key="colNumeric" type="yes" draft="contributed">Sifers numeryk sortearje</type>
+			<type key="colStrength" type="identical" draft="contributed">Alles sortearje</type>
+			<type key="colStrength" type="primary" draft="contributed">Allime sortearje neffens letters</type>
+			<type key="colStrength" type="quaternary" draft="contributed">sortearje neffens aksinten/haadletterbrûkme/breedte/Kana</type>
+			<type key="colStrength" type="secondary" draft="contributed">Sortearje op accenten</type>
+			<type key="colStrength" type="tertiary" draft="contributed">sortearje neffens aksinten/haadletterbrûkme/breedte</type>
+			<type key="numbers" type="arab" draft="contributed">Arabysk-Indyske sifers</type>
+			<type key="numbers" type="arabext" draft="contributed">Utwreide Arabysk-Indyske sifers</type>
+			<type key="numbers" type="armn" draft="contributed">Armeense sifers</type>
+			<type key="numbers" type="armnlow" draft="contributed">Kleine Armeense sifers</type>
+			<type key="numbers" type="bali" draft="contributed">Balinese sifers</type>
+			<type key="numbers" type="beng" draft="contributed">Bengaalse sifers</type>
+			<type key="numbers" type="deva" draft="contributed">Devanagari sifers</type>
+			<type key="numbers" type="ethi" draft="contributed">Ethiopyske sifers</type>
+			<type key="numbers" type="finance" draft="contributed">Finansjele sifers</type>
+			<type key="numbers" type="fullwide" draft="contributed">sifers met volledige breedte</type>
+			<type key="numbers" type="geor" draft="contributed">Georgyske sifers</type>
+			<type key="numbers" type="grek" draft="contributed">Griekse sifers</type>
+			<type key="numbers" type="greklow" draft="contributed">Kleine Griekse sifers</type>
+			<type key="numbers" type="gujr" draft="contributed">Gujarati sifers</type>
+			<type key="numbers" type="guru" draft="contributed">Gurmukhi sifers</type>
+			<type key="numbers" type="hanidec" draft="contributed">Sineeske desimale tallen</type>
+			<type key="numbers" type="hans" draft="contributed">Ferienfâldigde Sineeske sifers</type>
+			<type key="numbers" type="hansfin" draft="contributed">Ferienfâldigde Sineeske finansjele sifers</type>
+			<type key="numbers" type="hant" draft="contributed">Traditjonele Sineeske sifers</type>
+			<type key="numbers" type="hantfin" draft="contributed">Traditjonele Sineeske finansjele sifers</type>
+			<type key="numbers" type="hebr" draft="contributed">Hebreeuwse sifers</type>
+			<type key="numbers" type="java" draft="contributed">Javaanske sifers</type>
+			<type key="numbers" type="jpan" draft="contributed">Japanske sifers</type>
+			<type key="numbers" type="jpanfin" draft="contributed">Japanske finansjele sifers</type>
+			<type key="numbers" type="khmr" draft="contributed">Khmer sifers</type>
+			<type key="numbers" type="knda" draft="contributed">Kannada sifers</type>
+			<type key="numbers" type="laoo" draft="contributed">Laotiaanske sifers</type>
+			<type key="numbers" type="latn" draft="contributed">Westerse sifers</type>
+			<type key="numbers" type="mlym" draft="contributed">Malayalam sifers</type>
+			<type key="numbers" type="mong" draft="contributed">Mongoolse sifers</type>
+			<type key="numbers" type="mymr" draft="contributed">Myanmarese sifers</type>
+			<type key="numbers" type="native" draft="contributed">Binnenlânse sifers</type>
+			<type key="numbers" type="orya" draft="contributed">Oriya sifers</type>
+			<type key="numbers" type="roman" draft="contributed">Romeinske sifers</type>
+			<type key="numbers" type="romanlow" draft="contributed">Lytse Romeinske sifers</type>
+			<type key="numbers" type="taml" draft="contributed">Tradisjonele Tamil sifers</type>
+			<type key="numbers" type="tamldec" draft="contributed">Tamil sifers</type>
+			<type key="numbers" type="telu" draft="contributed">Telugu sifers</type>
+			<type key="numbers" type="thai" draft="contributed">Thaise sifers</type>
+			<type key="numbers" type="tibt" draft="contributed">Tibetaanske sifers</type>
+			<type key="numbers" type="traditional" draft="contributed">Tradisjonele sifers</type>
+			<type key="numbers" type="vaii" draft="contributed">Vai-sifers</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">BGN</transformName>
@@ -1345,6 +1343,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 							</cyclicNameWidth>
 						</cyclicNameContext>
 					</cyclicNameSet>
+					<cyclicNameSet type="solarTerms">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="wide">
+								<cyclicName type="1" draft="unconfirmed">begjin fan de maitiid</cyclicName>
+								<cyclicName type="2" draft="unconfirmed">reinwetter</cyclicName>
+								<cyclicName type="3" draft="unconfirmed">ynsekten ûntweitsje</cyclicName>
+								<cyclicName type="4" draft="unconfirmed">maitiidpunt</cyclicName>
+								<cyclicName type="5" draft="unconfirmed">ljocht en helder</cyclicName>
+								<cyclicName type="7" draft="unconfirmed">begjien fan de simmer</cyclicName>
+								<cyclicName type="10" draft="unconfirmed">simmerpunt</cyclicName>
+								<cyclicName type="11" draft="unconfirmed">waarm</cyclicName>
+								<cyclicName type="12" draft="unconfirmed">hjit</cyclicName>
+								<cyclicName type="13" draft="unconfirmed">begjin fan de hjerst</cyclicName>
+								<cyclicName type="14" draft="unconfirmed">ein fan de hjittens</cyclicName>
+								<cyclicName type="15" draft="unconfirmed">wite dauwe</cyclicName>
+								<cyclicName type="16" draft="unconfirmed">hjerstpunt</cyclicName>
+								<cyclicName type="17" draft="unconfirmed">kâlde dauwe</cyclicName>
+								<cyclicName type="18" draft="unconfirmed">earste froast</cyclicName>
+								<cyclicName type="19" draft="unconfirmed">begjin fan de winter</cyclicName>
+								<cyclicName type="20" draft="unconfirmed">lichte snie</cyclicName>
+								<cyclicName type="21" draft="unconfirmed">swiere snie</cyclicName>
+								<cyclicName type="22" draft="unconfirmed">winterpunt</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
 					<cyclicNameSet type="years">
 						<cyclicNameContext type="format">
 							<cyclicNameWidth type="abbreviated">
@@ -1847,6 +1870,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</months>
 			</calendar>
 			<calendar type="generic">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">M01</month>
+							<month type="2" draft="unconfirmed">M02</month>
+							<month type="3" draft="unconfirmed">M03</month>
+							<month type="4" draft="unconfirmed">M04</month>
+							<month type="5" draft="unconfirmed">M05</month>
+							<month type="6" draft="unconfirmed">M06</month>
+							<month type="7" draft="unconfirmed">M07</month>
+							<month type="8" draft="unconfirmed">M08</month>
+							<month type="9" draft="unconfirmed">M09</month>
+							<month type="10" draft="unconfirmed">M10</month>
+							<month type="11" draft="unconfirmed">M11</month>
+							<month type="12" draft="unconfirmed">M12</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="narrow">
+							<month type="1" draft="unconfirmed">1</month>
+							<month type="2" draft="unconfirmed">2</month>
+							<month type="3" draft="unconfirmed">3</month>
+							<month type="4" draft="unconfirmed">4</month>
+							<month type="5" draft="unconfirmed">5</month>
+							<month type="6" draft="unconfirmed">6</month>
+							<month type="7" draft="unconfirmed">7</month>
+							<month type="8" draft="unconfirmed">8</month>
+							<month type="9" draft="unconfirmed">9</month>
+							<month type="10" draft="unconfirmed">10</month>
+							<month type="11" draft="unconfirmed">11</month>
+							<month type="12" draft="unconfirmed">12</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<eras>
+					<eraAbbr>
+						<era type="0" draft="unconfirmed">ERA0</era>
+						<era type="1" draft="unconfirmed">ERA1</era>
+					</eraAbbr>
+				</eras>
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
@@ -2031,7 +2094,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="2" draft="contributed">feb.</month>
 							<month type="3" draft="contributed">mrt.</month>
 							<month type="4" draft="contributed">apr.</month>
-							<month type="5" draft="contributed">mai</month>
+							<month type="5" draft="contributed">mai.</month>
 							<month type="6" draft="contributed">jun.</month>
 							<month type="7" draft="contributed">jul.</month>
 							<month type="8" draft="contributed">aug.</month>
@@ -2237,16 +2300,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="noon" draft="contributed">12 oere ‘s middeis</dayPeriod>
+							<dayPeriod type="am" draft="contributed">AM</dayPeriod>
+							<dayPeriod type="pm" draft="contributed">PM</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am" draft="contributed">AM</dayPeriod>
-							<dayPeriod type="noon" draft="contributed">n</dayPeriod>
 							<dayPeriod type="pm" draft="contributed">PM</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am" draft="contributed">AM</dayPeriod>
-							<dayPeriod type="noon" draft="contributed">12 oere ‘s middeis</dayPeriod>
 							<dayPeriod type="pm" draft="contributed">PM</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
@@ -2348,6 +2410,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d" draft="contributed">d</dateFormatItem>
+						<dateFormatItem id="E" draft="unconfirmed">ccc</dateFormatItem>
 						<dateFormatItem id="Ed" draft="contributed">E d</dateFormatItem>
 						<dateFormatItem id="Ehm" draft="contributed">E h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm" draft="contributed">E HH:mm</dateFormatItem>
@@ -2363,6 +2426,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm" draft="contributed">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms" draft="contributed">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms" draft="contributed">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv" draft="unconfirmed">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv" draft="unconfirmed">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv" draft="unconfirmed">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv" draft="unconfirmed">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M" draft="contributed">L</dateFormatItem>
 						<dateFormatItem id="Md" draft="contributed">d-M</dateFormatItem>
 						<dateFormatItem id="MEd" draft="contributed">E d-M</dateFormatItem>
@@ -3077,6 +3144,48 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other" draft="contributed">{0} jier lyn</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="quarter">
+				<displayName draft="unconfirmed">Fearnsjier</displayName>
+				<relative type="-1" draft="unconfirmed">foarich fearnsjier</relative>
+				<relative type="0" draft="unconfirmed">dit fearnsjier</relative>
+				<relative type="1" draft="unconfirmed">folgjend fearnsjier</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">oer {0} fearnsjier</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">oer {0} fearnsjier</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} fearnsjier lyn</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} fearnsjier lyn</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-short">
+				<displayName draft="unconfirmed">fearnsjier</displayName>
+				<relative type="-1" draft="unconfirmed">foarich fearnsjier</relative>
+				<relative type="0" draft="unconfirmed">dit fearnsjier</relative>
+				<relative type="1" draft="unconfirmed">folgjend fearnsjier</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">oer {0} fearnsjier</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">oer {0} fearnsjier</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} fearnsjier lyn</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} fearnsjier lyn</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-narrow">
+				<displayName draft="unconfirmed">fearnsjier</displayName>
+				<relative type="-1" draft="unconfirmed">foarich fearnsjier</relative>
+				<relative type="0" draft="unconfirmed">dit fearnsjier</relative>
+				<relative type="1" draft="unconfirmed">folgjend fearnsjier</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">oer {0} fearnsjier</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">oer {0} fearnsjier</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} fearnsjier lyn</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} fearnsjier lyn</relativeTimePattern>
+				</relativeTime>
+			</field>
 			<field type="month">
 				<displayName draft="contributed">Moanne</displayName>
 				<relative type="-1" draft="contributed">foarige moanne</relative>
@@ -3313,6 +3422,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Africa/Addis_Ababa">
 				<exemplarCity draft="contributed">Addis Abeba</exemplarCity>
 			</zone>
+			<zone type="Europe/Helsinki">
+				<exemplarCity draft="unconfirmed">Helsinky</exemplarCity>
+			</zone>
 			<zone type="Pacific/Truk">
 				<exemplarCity draft="contributed">Chuuk</exemplarCity>
 			</zone>
@@ -3402,6 +3514,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Europe/Luxembourg">
 				<exemplarCity draft="contributed">Luxemburg</exemplarCity>
 			</zone>
+			<zone type="Europe/Monaco">
+				<exemplarCity draft="unconfirmed">Monako</exemplarCity>
+			</zone>
 			<zone type="Indian/Maldives">
 				<exemplarCity draft="contributed">Maldiven</exemplarCity>
 			</zone>
@@ -3420,6 +3535,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Noumea">
 				<exemplarCity draft="contributed">Nouméa</exemplarCity>
 			</zone>
+			<zone type="Europe/Amsterdam">
+				<exemplarCity draft="unconfirmed">Amsterdam</exemplarCity>
+			</zone>
 			<zone type="Asia/Katmandu">
 				<exemplarCity draft="contributed">Kathmandu</exemplarCity>
 			</zone>
@@ -4508,6 +4626,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</timeZoneNames>
 	</dates>
 	<numbers>
+		<defaultNumberingSystem draft="unconfirmed">latn</defaultNumberingSystem>
+		<otherNumberingSystems>
+			<native draft="unconfirmed">latn</native>
+		</otherNumberingSystems>
+		<minimumGroupingDigits draft="unconfirmed">1</minimumGroupingDigits>
 		<symbols numberSystem="latn">
 			<decimal draft="contributed">,</decimal>
 			<group draft="contributed">.</group>
@@ -4520,6 +4643,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<perMille draft="contributed">‰</perMille>
 			<infinity draft="contributed">∞</infinity>
 			<nan draft="contributed">NaN</nan>
+			<timeSeparator draft="unconfirmed">:</timeSeparator>
 		</symbols>
 		<decimalFormats numberSystem="latn">
 			<decimalFormatLength>
@@ -4607,6 +4731,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤ 0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤ 00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤ 000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤ 0 mln'.'</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0 mln'.'</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤ 00 mln'.'</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00 mln'.'</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤ 000 mln'.'</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000 mln'.'</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤ 0 mld'.'</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0 mld'.'</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤ 00 mld'.'</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00 mld'.'</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤ 000 mld'.'</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000 mld'.'</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤ 0 bln'.'</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0 bln'.'</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤ 00 bln'.'</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00 bln'.'</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤ 000 bln'.'</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000 bln'.'</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
 			<unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -5092,6 +5244,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one" draft="contributed">Brits pûn</displayName>
 				<displayName count="other" draft="contributed">Brits pûn</displayName>
 				<symbol draft="contributed">£</symbol>
+				<symbol alt="narrow" draft="unconfirmed">£</symbol>
 			</currency>
 			<currency type="GEK">
 				<displayName draft="contributed">Georgyske kupon larit</displayName>
@@ -5203,6 +5356,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName draft="contributed">Ierske pûn</displayName>
 				<displayName count="one" draft="contributed">Ierske pûn</displayName>
 				<displayName count="other" draft="contributed">Ierske pûn</displayName>
+				<symbol draft="unconfirmed">IEP</symbol>
 			</currency>
 			<currency type="ILP">
 				<displayName draft="contributed">Israëlysk pûn</displayName>
@@ -5930,21 +6084,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName draft="contributed">Europeeske gearfoege ienheid</displayName>
 				<displayName count="one" draft="contributed">Europeeske gearfoege ienheid</displayName>
 				<displayName count="other" draft="contributed">Europeeske gearfoege ienheid</displayName>
+				<symbol draft="unconfirmed">XBA</symbol>
 			</currency>
 			<currency type="XBB">
 				<displayName draft="contributed">Europeeske monetaire ienheid</displayName>
 				<displayName count="one" draft="contributed">Europeeske monetaire ienheid</displayName>
 				<displayName count="other" draft="contributed">Europeeske monetaire ienheid</displayName>
+				<symbol draft="unconfirmed">XBB</symbol>
 			</currency>
 			<currency type="XBC">
 				<displayName draft="contributed">Europeeske rekkenienheid (XBC)</displayName>
 				<displayName count="one" draft="contributed">Europeeske rekkenienheid (XBC)</displayName>
 				<displayName count="other" draft="contributed">Europeeske rekkenienheid (XBC)</displayName>
+				<symbol draft="unconfirmed">XBC</symbol>
 			</currency>
 			<currency type="XBD">
 				<displayName draft="contributed">Europeeske rekkenienheid (XBD)</displayName>
 				<displayName count="one" draft="contributed">Europeeske rekkenienheid (XBD)</displayName>
 				<displayName count="other" draft="contributed">Europeeske rekkenienheid (XBD)</displayName>
+				<symbol draft="unconfirmed">XBD</symbol>
 			</currency>
 			<currency type="XCD">
 				<displayName draft="contributed">East-Karibyske dollar</displayName>
@@ -5966,11 +6124,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName draft="contributed">Franse gouden franc</displayName>
 				<displayName count="one" draft="contributed">Franse gouden franc</displayName>
 				<displayName count="other" draft="contributed">Franse gouden franc</displayName>
+				<symbol draft="unconfirmed">XFO</symbol>
 			</currency>
 			<currency type="XFU">
 				<displayName draft="contributed">Franse UIC-franc</displayName>
 				<displayName count="one" draft="contributed">Franse UIC-franc</displayName>
 				<displayName count="other" draft="contributed">Franse UIC-franc</displayName>
+				<symbol draft="unconfirmed">XFU</symbol>
 			</currency>
 			<currency type="XOF">
 				<displayName draft="contributed">CFA-franc BCEAO</displayName>
@@ -5998,6 +6158,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName draft="contributed">RINET-fondsen</displayName>
 				<displayName count="one" draft="contributed">RINET-fondsen</displayName>
 				<displayName count="other" draft="contributed">RINET-fondsen</displayName>
+				<symbol draft="unconfirmed">XRE</symbol>
 			</currency>
 			<currency type="XSU">
 				<displayName draft="contributed">Sucre</displayName>
@@ -6008,16 +6169,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName draft="contributed">Valutacode voor testdoeleinden</displayName>
 				<displayName count="one" draft="contributed">Valutacode voor testdoeleinden</displayName>
 				<displayName count="other" draft="contributed">Valutacode voor testdoeleinden</displayName>
+				<symbol draft="unconfirmed">XTS</symbol>
 			</currency>
 			<currency type="XUA">
 				<displayName draft="contributed">ADB-rekkenienheid</displayName>
 				<displayName count="one" draft="contributed">ADB-rekkenienheid</displayName>
 				<displayName count="other" draft="contributed">ADB-rekkenienheid</displayName>
+				<symbol draft="unconfirmed">XUA</symbol>
 			</currency>
 			<currency type="XXX">
 				<displayName draft="contributed">Unbekende muntienheid</displayName>
 				<displayName count="one" draft="contributed">Unbekende muntienheid</displayName>
 				<displayName count="other" draft="contributed">Unbekende muntienheid</displayName>
+				<symbol draft="unconfirmed">XXX</symbol>
 			</currency>
 			<currency type="YDD">
 				<displayName draft="contributed">Jemenityske dinar</displayName>
@@ -6110,6 +6274,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} G-kracht</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} G-krachten</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<displayName draft="contributed">booggraden</displayName>
+				<unitPattern count="one" draft="contributed">{0} booggraad</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} booggraden</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName draft="contributed">boogminuten</displayName>
 				<unitPattern count="one" draft="contributed">{0} boogminút</unitPattern>
@@ -6120,31 +6289,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} boogsekonde</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} boogsekonden</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName draft="contributed">booggraden</displayName>
-				<unitPattern count="one" draft="contributed">{0} booggraad</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} booggraden</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="contributed">ares</displayName>
-				<unitPattern count="one" draft="contributed">{0} are</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ares</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName draft="contributed">fjouwerkante kilometer</displayName>
+				<unitPattern count="one" draft="contributed">{0} fjouwerkante kilometer</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fjouwerkante kilometer</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName draft="contributed">hektare</displayName>
 				<unitPattern count="one" draft="contributed">{0} hektare</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} hektare</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<displayName draft="contributed">fjouwerkante foet</displayName>
-				<unitPattern count="one" draft="contributed">{0} fjouwerkante foet</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fjouwerkante foet</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="contributed">fjouwerkante kilometer</displayName>
-				<unitPattern count="one" draft="contributed">{0} fjouwerkante kilometer</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fjouwerkante kilometer</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<displayName draft="contributed">fjouwerkante meter</displayName>
 				<unitPattern count="one" draft="contributed">{0} fjouwerkante meter</unitPattern>
@@ -6155,6 +6309,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} fjouwerkante myl</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} fjouwerkante myl</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<displayName draft="contributed">ares</displayName>
+				<unitPattern count="one" draft="contributed">{0} are</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ares</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName draft="contributed">fjouwerkante foet</displayName>
+				<unitPattern count="one" draft="contributed">{0} fjouwerkante foet</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fjouwerkante foet</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="contributed">jier</displayName>
+				<unitPattern count="one" draft="contributed">{0} jier</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} jier</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">moanneen</displayName>
+				<unitPattern count="one" draft="contributed">{0} moanne</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} moanneen</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="contributed">wiken</displayName>
+				<unitPattern count="one" draft="contributed">{0} wike</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} wiken</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="contributed">deien</displayName>
 				<unitPattern count="one" draft="contributed">{0} dei</unitPattern>
@@ -6165,70 +6344,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} oere</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} oere</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="contributed">millisekonden</displayName>
-				<unitPattern count="one" draft="contributed">{0} millisekonde</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} millisekonden</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="contributed">minuten</displayName>
 				<unitPattern count="one" draft="contributed">{0} minút</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} minuten</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">moanneen</displayName>
-				<unitPattern count="one" draft="contributed">{0} moanne</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} moanneen</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="contributed">sekonden</displayName>
 				<unitPattern count="one" draft="contributed">{0} sekonde</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} sekonden</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">wiken</displayName>
-				<unitPattern count="one" draft="contributed">{0} wike</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} wiken</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">jier</displayName>
-				<unitPattern count="one" draft="contributed">{0} jier</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} jier</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">sentimeter</displayName>
-				<unitPattern count="one" draft="contributed">{0} sentimeter</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} sentimeter</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="contributed">foet</displayName>
-				<unitPattern count="one" draft="contributed">{0} foet</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} foet</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="contributed">tommen</displayName>
-				<unitPattern count="one" draft="contributed">{0} tomme</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} tommen</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="contributed">millisekonden</displayName>
+				<unitPattern count="one" draft="contributed">{0} millisekonde</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} millisekonden</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="contributed">kilometer</displayName>
 				<unitPattern count="one" draft="contributed">{0} kilometer</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kilometer</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<displayName draft="contributed">ljochtjier</displayName>
-				<unitPattern count="one" draft="contributed">{0} ljochtjier</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ljochtjier</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName draft="contributed">meter</displayName>
 				<unitPattern count="one" draft="contributed">{0} meter</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} meter</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName draft="contributed">myl</displayName>
-				<unitPattern count="one" draft="contributed">{0} myl</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} myl</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="contributed">sentimeter</displayName>
+				<unitPattern count="one" draft="contributed">{0} sentimeter</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} sentimeter</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="contributed">millimeter</displayName>
@@ -6240,35 +6384,50 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} pikometer</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} pikometer</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="contributed">myl</displayName>
+				<unitPattern count="one" draft="contributed">{0} myl</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} myl</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName draft="contributed">yards</displayName>
 				<unitPattern count="one" draft="contributed">{0} yard</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} yards</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="contributed">gram</displayName>
-				<unitPattern count="one" draft="contributed">{0} gram</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} gram</unitPattern>
+			<unit type="length-foot">
+				<displayName draft="contributed">foet</displayName>
+				<unitPattern count="one" draft="contributed">{0} foet</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} foet</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="contributed">tommen</displayName>
+				<unitPattern count="one" draft="contributed">{0} tomme</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} tommen</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="contributed">ljochtjier</displayName>
+				<unitPattern count="one" draft="contributed">{0} ljochtjier</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ljochtjier</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="contributed">kilogram</displayName>
 				<unitPattern count="one" draft="contributed">{0} kilogram</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kilogram</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="contributed">oz</displayName>
-				<unitPattern count="one" draft="contributed">{0} oz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} oz</unitPattern>
+			<unit type="mass-gram">
+				<displayName draft="contributed">gram</displayName>
+				<unitPattern count="one" draft="contributed">{0} gram</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} gram</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<displayName draft="contributed">lb</displayName>
 				<unitPattern count="one" draft="contributed">{0} lb</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} lb</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="contributed">hynstekrêften</displayName>
-				<unitPattern count="one" draft="contributed">{0} hynstekrêft</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} hynstekrêften</unitPattern>
+			<unit type="mass-ounce">
+				<displayName draft="contributed">oz</displayName>
+				<unitPattern count="one" draft="contributed">{0} oz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName draft="contributed">kilowatt</displayName>
@@ -6280,6 +6439,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} watt</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} watt</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<displayName draft="contributed">hynstekrêften</displayName>
+				<unitPattern count="one" draft="contributed">{0} hynstekrêft</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} hynstekrêften</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="contributed">hektopaskal</displayName>
 				<unitPattern count="one" draft="contributed">{0} hektopaskal</unitPattern>
@@ -6345,6 +6509,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} G</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<displayName draft="contributed">booggraden</displayName>
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName draft="contributed">boogminuten</displayName>
 				<unitPattern count="one" draft="contributed">{0}′</unitPattern>
@@ -6355,31 +6524,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0}″</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName draft="contributed">booggraden</displayName>
-				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="contributed">ares</displayName>
-				<unitPattern count="one" draft="contributed">{0} are</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ares</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName draft="contributed">fjouwerkante kilometer</displayName>
+				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName draft="contributed">hektare</displayName>
 				<unitPattern count="one" draft="contributed">{0} ha</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<displayName draft="contributed">fjouwerkante foet</displayName>
-				<unitPattern count="one" draft="contributed">{0} ft²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="contributed">fjouwerkante kilometer</displayName>
-				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<displayName draft="contributed">fjouwerkante meter</displayName>
 				<unitPattern count="one" draft="contributed">{0} m²</unitPattern>
@@ -6390,6 +6544,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} mi²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<displayName draft="contributed">ares</displayName>
+				<unitPattern count="one" draft="contributed">{0} are</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ares</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName draft="contributed">fjouwerkante foet</displayName>
+				<unitPattern count="one" draft="contributed">{0} ft²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ft²</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="contributed">jier</displayName>
+				<unitPattern count="one" draft="contributed">{0} jr</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} jr</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">moanneen</displayName>
+				<unitPattern count="one" draft="contributed">{0} mn</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mn</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="contributed">wiken</displayName>
+				<unitPattern count="one" draft="contributed">{0} wk</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} wkn</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="contributed">deien</displayName>
 				<unitPattern count="one" draft="contributed">{0} dei</unitPattern>
@@ -6400,70 +6579,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} oere</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} oere</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="contributed">millisekonden</displayName>
-				<unitPattern count="one" draft="contributed">{0} ms</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="contributed">minuten</displayName>
 				<unitPattern count="one" draft="contributed">{0} min</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} min</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">moanneen</displayName>
-				<unitPattern count="one" draft="contributed">{0} mn</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mn</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="contributed">sekonden</displayName>
 				<unitPattern count="one" draft="contributed">{0} sek.</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} sek.</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">wiken</displayName>
-				<unitPattern count="one" draft="contributed">{0} wk</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} wkn</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">jier</displayName>
-				<unitPattern count="one" draft="contributed">{0} jr</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} jr</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">sentimeter</displayName>
-				<unitPattern count="one" draft="contributed">{0} sm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} sm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="contributed">foet</displayName>
-				<unitPattern count="one" draft="contributed">{0} ft</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="contributed">tommen</displayName>
-				<unitPattern count="one" draft="contributed">{0} tm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} tm</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="contributed">millisekonden</displayName>
+				<unitPattern count="one" draft="contributed">{0} ms</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="contributed">kilometer</displayName>
 				<unitPattern count="one" draft="contributed">{0} km</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<displayName draft="contributed">ljochtjier</displayName>
-				<unitPattern count="one" draft="contributed">{0} lj</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} lj</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName draft="contributed">meter</displayName>
 				<unitPattern count="one" draft="contributed">{0} m</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName draft="contributed">myl</displayName>
-				<unitPattern count="one" draft="contributed">{0} mi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="contributed">sentimeter</displayName>
+				<unitPattern count="one" draft="contributed">{0} sm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} sm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="contributed">millimeter</displayName>
@@ -6475,35 +6619,50 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} pm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="contributed">myl</displayName>
+				<unitPattern count="one" draft="contributed">{0} mi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName draft="contributed">yards</displayName>
 				<unitPattern count="one" draft="contributed">{0} yd</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="contributed">gram</displayName>
-				<unitPattern count="one" draft="contributed">{0} g</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} g</unitPattern>
+			<unit type="length-foot">
+				<displayName draft="contributed">foet</displayName>
+				<unitPattern count="one" draft="contributed">{0} ft</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ft</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="contributed">tommen</displayName>
+				<unitPattern count="one" draft="contributed">{0} tm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} tm</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="contributed">ljochtjier</displayName>
+				<unitPattern count="one" draft="contributed">{0} lj</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} lj</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="contributed">kilogram</displayName>
 				<unitPattern count="one" draft="contributed">{0} kg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="contributed">oz</displayName>
-				<unitPattern count="one" draft="contributed">{0} oz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} oz</unitPattern>
+			<unit type="mass-gram">
+				<displayName draft="contributed">gram</displayName>
+				<unitPattern count="one" draft="contributed">{0} g</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<displayName draft="contributed">lb</displayName>
 				<unitPattern count="one" draft="contributed">{0} lb</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} lb</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="contributed">hynstekrêften</displayName>
-				<unitPattern count="one" draft="contributed">{0} pk</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pk</unitPattern>
+			<unit type="mass-ounce">
+				<displayName draft="contributed">oz</displayName>
+				<unitPattern count="one" draft="contributed">{0} oz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName draft="contributed">kilowatt</displayName>
@@ -6515,6 +6674,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} W</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<displayName draft="contributed">hynstekrêften</displayName>
+				<unitPattern count="one" draft="contributed">{0} pk</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} pk</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="contributed">hektopaskal</displayName>
 				<unitPattern count="one" draft="contributed">{0} hPa</unitPattern>
@@ -6579,6 +6743,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} G</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one" draft="contributed">{0}′</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}′</unitPattern>
@@ -6587,26 +6755,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0}″</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one" draft="contributed">{0} acre</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} acres</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one" draft="contributed">{0} ha</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one" draft="contributed">{0} ft²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one" draft="contributed">{0} m²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} m²</unitPattern>
@@ -6615,6 +6771,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} mi²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one" draft="contributed">{0} acre</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} acres</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one" draft="contributed">{0} ft²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ft²</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<unitPattern count="one" draft="contributed">{0} jr</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} jr</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<unitPattern count="one" draft="contributed">{0} m</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} m</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<unitPattern count="one" draft="contributed">{0} w</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} w</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<unitPattern count="one" draft="contributed">{0} d</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} d</unitPattern>
@@ -6623,57 +6799,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} u</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} u</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<unitPattern count="one" draft="contributed">{0} ms</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<unitPattern count="one" draft="contributed">{0} m</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} m</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<unitPattern count="one" draft="contributed">{0} m</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} m</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<unitPattern count="one" draft="contributed">{0} s</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<unitPattern count="one" draft="contributed">{0} w</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} w</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<unitPattern count="one" draft="contributed">{0} jr</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} jr</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<unitPattern count="one" draft="contributed">{0} cm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one" draft="contributed">{0} ft</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one" draft="contributed">{0}&quot;</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}&quot;</unitPattern>
+			<unit type="duration-millisecond">
+				<unitPattern count="one" draft="contributed">{0} ms</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<unitPattern count="one" draft="contributed">{0} km</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one" draft="contributed">{0} lj</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} lj</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<unitPattern count="one" draft="contributed">{0} m</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one" draft="contributed">{0} mi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<unitPattern count="one" draft="contributed">{0} cm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<unitPattern count="one" draft="contributed">{0} mm</unitPattern>
@@ -6683,29 +6831,41 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} pm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one" draft="contributed">{0} mi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one" draft="contributed">{0} yd</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<unitPattern count="one" draft="contributed">{0} g</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one" draft="contributed">{0} ft</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ft</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one" draft="contributed">{0}&quot;</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}&quot;</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one" draft="contributed">{0} lj</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} lj</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<unitPattern count="one" draft="contributed">{0} kg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one" draft="contributed">{0} oz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} oz</unitPattern>
+			<unit type="mass-gram">
+				<unitPattern count="one" draft="contributed">{0} g</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one" draft="contributed">{0} lb</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} lb</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one" draft="contributed">{0} pk</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pk</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one" draft="contributed">{0} oz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one" draft="contributed">{0} kW</unitPattern>
@@ -6715,6 +6875,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} W</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one" draft="contributed">{0} pk</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} pk</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one" draft="contributed">{0} hPa</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} hPa</unitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fy_NL.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fy_NL.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fy_NL.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fy_NL.xml
index ec661d8eb0e..42eae923d27 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/fy_NL.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fy_NL.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="fy"/>
 		<territory type="NL"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ga.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ga.xml
similarity index 93%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ga.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ga.xml
index 3637fdb19b7..06994c5f690 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ga.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ga.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="ga"/>
 	</identity>
 	<localeDisplayNames>
@@ -36,6 +35,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="av">Aváiris</language>
 			<language type="ay">Aidhmiris</language>
 			<language type="az">Asarbaiseáinis</language>
+			<language type="az" alt="short">Asairis</language>
 			<language type="ba">Baiscíris</language>
 			<language type="ban">Bailís</language>
 			<language type="bar">Baváiris</language>
@@ -50,7 +50,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bua">Buiriáitis</language>
 			<language type="bug">Buiginis</language>
 			<language type="ca">Catalóinis</language>
-			<language type="ce">Sisinis</language>
+			<language type="ce">Seisnis</language>
 			<language type="ceb">Seabúáinis</language>
 			<language type="ch">Seamóiris</language>
 			<language type="chm">Mairis</language>
@@ -199,6 +199,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nb">Ioruais Bokmål</language>
 			<language type="nd">Ndeibéilis an Tuaiscirt</language>
 			<language type="nds">Gearmáinis Íochtarach</language>
+			<language type="nds_NL">Sacsainis Íochtarach</language>
 			<language type="ne">Neipeailis</language>
 			<language type="ng">Ndongais</language>
 			<language type="niu">Níobhais</language>
@@ -262,7 +263,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">Suiméiris</language>
 			<language type="sv">Sualainnis</language>
 			<language type="sw">Svahaílis</language>
-			<language type="swc">Svahaílis an Chongó</language>
+			<language type="sw_CD">Svahaílis an Chongó</language>
 			<language type="syr">Siricis</language>
 			<language type="szl">Siléisis</language>
 			<language type="ta">Tamailis</language>
@@ -430,7 +431,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angaíle</territory>
 			<territory type="AL">An Albáin</territory>
 			<territory type="AM">An Airméin</territory>
-			<territory type="AN">Aintillí na hÍsiltíre</territory>
 			<territory type="AO">Angóla</territory>
 			<territory type="AQ">An Antartaice</territory>
 			<territory type="AR">An Airgintín</territory>
@@ -706,59 +706,73 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="calendar">Féilire</key>
 			<key type="collation">Ord Sórtála</key>
 			<key type="currency">Airgeadra</key>
+			<key type="hc">Timthriall Uaire (12 vs 24)</key>
+			<key type="lb">Stíl Briseadh Líne</key>
+			<key type="ms">Córas Tomhais</key>
 			<key type="numbers">Uimhreacha</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Digití Ind-Arabacha</type>
-			<type type="arabext" key="numbers">Digití Ind-Arabacha Breisithe</type>
-			<type type="armn" key="numbers">Uimhreacha Airméanacha</type>
-			<type type="bali" key="numbers">Digití Bailíocha</type>
-			<type type="beng" key="numbers">Digití Beangálacha</type>
-			<type type="big5han" key="collation" draft="unconfirmed">Ord sórtála Síneach traidisiúnta - Big5</type>
-			<type type="buddhist" key="calendar">Féilire Búdaíoch</type>
-			<type type="chinese" key="calendar">Féilire Síneach</type>
-			<type type="coptic" key="calendar">Féilire Coptach</type>
-			<type type="deva" key="numbers">Digití Déiveanágracha</type>
-			<type type="ducet" key="collation">Ord Réamhshocraithe Sórtála Unicode</type>
-			<type type="ethi" key="numbers">Uimhreacha Aetóipice</type>
-			<type type="ethiopic" key="calendar">Féilire Aetóipice</type>
-			<type type="fullwide" key="numbers">Digití Lánleithid</type>
-			<type type="gb2312han" key="collation" draft="unconfirmed">Ord sórtála Síneach simplithe - GB 2312</type>
-			<type type="geor" key="numbers">Uimhreacha Seoirseacha</type>
-			<type type="gregorian" key="calendar">Féilire Ghréagóra</type>
-			<type type="grek" key="numbers">Uimhreacha Gréagacha</type>
-			<type type="gujr" key="numbers">Digití Gúisearátacha</type>
-			<type type="guru" key="numbers">Digití Gurmúcacha</type>
-			<type type="hanidec" key="numbers">Uimhreacha Deachúlacha Síneacha</type>
-			<type type="hebr" key="numbers">Uimhreacha Eabhracha</type>
-			<type type="hebrew" key="calendar">Féilire na nEabhrach</type>
-			<type type="islamic" key="calendar">Féilire Ioslámach</type>
-			<type type="islamic-civil" key="calendar" draft="unconfirmed">Féilire Ioslamach Sibhialta</type>
-			<type type="iso8601" key="calendar">Féilire ISO-8601</type>
-			<type type="japanese" key="calendar">Féilire Seapánach</type>
-			<type type="java" key="numbers">Digití Iávacha</type>
-			<type type="jpan" key="numbers">Uimhreacha Seapánacha</type>
-			<type type="khmr" key="numbers">Digití Ciméaracha</type>
-			<type type="knda" key="numbers">Digití Cannadacha</type>
-			<type type="laoo" key="numbers">Digití Laosacha</type>
-			<type type="latn" key="numbers">Digití Iartharacha</type>
-			<type type="mlym" key="numbers">Digití Mailéalamacha</type>
-			<type type="mymr" key="numbers">Digití Maenmaracha</type>
-			<type type="orya" key="numbers">Digití Oiríseacha</type>
-			<type type="persian" key="calendar">Féilire Peirseach</type>
-			<type type="phonebook" key="collation" draft="unconfirmed">Ord sórtála an eolaire teileafóin</type>
-			<type type="pinyin" key="collation" draft="unconfirmed">Ord sórtála pinyin</type>
-			<type type="roc" key="calendar">Féilire Téavánach</type>
-			<type type="roman" key="numbers">Uimhreacha Rómhánacha</type>
-			<type type="search" key="collation">Cuardach Ilfhóinteach</type>
-			<type type="standard" key="collation">Ord Caighdeánach Sórtála</type>
-			<type type="stroke" key="collation" draft="unconfirmed">Ord sórtála stríce</type>
-			<type type="taml" key="numbers">Uimhreacha Traidisiúnta Tamalacha</type>
-			<type type="tamldec" key="numbers">Digití Tamalacha</type>
-			<type type="telu" key="numbers">Digití Teileagúcha</type>
-			<type type="thai" key="numbers">Digití Téalannacha</type>
-			<type type="tibt" key="numbers">Digití Tibéadacha</type>
-			<type type="traditional" key="collation" draft="unconfirmed">Ord sórtála traidisiúnta</type>
+			<type key="calendar" type="buddhist">Féilire Búdaíoch</type>
+			<type key="calendar" type="chinese">Féilire Síneach</type>
+			<type key="calendar" type="coptic">Féilire Coptach</type>
+			<type key="calendar" type="dangi">Féilire Dangi</type>
+			<type key="calendar" type="ethiopic">Féilire Aetóipice</type>
+			<type key="calendar" type="gregorian">Féilire Ghréagóra</type>
+			<type key="calendar" type="hebrew">Féilire na nEabhrach</type>
+			<type key="calendar" type="islamic">Féilire Ioslámach</type>
+			<type key="calendar" type="islamic-civil" draft="unconfirmed">Féilire Ioslamach Sibhialta</type>
+			<type key="calendar" type="iso8601">Féilire ISO-8601</type>
+			<type key="calendar" type="japanese">Féilire Seapánach</type>
+			<type key="calendar" type="persian">Féilire Peirseach</type>
+			<type key="calendar" type="roc">Féilire Téavánach</type>
+			<type key="collation" type="big5han" draft="unconfirmed">Ord sórtála Síneach traidisiúnta - Big5</type>
+			<type key="collation" type="ducet">Ord Réamhshocraithe Sórtála Unicode</type>
+			<type key="collation" type="gb2312han" draft="unconfirmed">Ord sórtála Síneach simplithe - GB 2312</type>
+			<type key="collation" type="phonebook" draft="unconfirmed">Ord sórtála an eolaire teileafóin</type>
+			<type key="collation" type="pinyin" draft="unconfirmed">Ord sórtála pinyin</type>
+			<type key="collation" type="search">Cuardach Ilfhóinteach</type>
+			<type key="collation" type="standard">Ord Caighdeánach Sórtála</type>
+			<type key="collation" type="stroke" draft="unconfirmed">Ord sórtála stríce</type>
+			<type key="collation" type="traditional" draft="unconfirmed">Ord sórtála traidisiúnta</type>
+			<type key="hc" type="h11">Córas 12 Uair (0–11)</type>
+			<type key="hc" type="h12">Córas 12 Uair (1–12)</type>
+			<type key="hc" type="h23">Córas 24 Uair (0–23)</type>
+			<type key="hc" type="h24">Córas 24 Uair (1–24)</type>
+			<type key="lb" type="loose">Stíl Briseadh Líne Scaoilte</type>
+			<type key="lb" type="normal">Stíl Gnáthbhriseadh Líne</type>
+			<type key="lb" type="strict">Stíl Briseadh Líne Docht</type>
+			<type key="ms" type="metric">Córas Méadrach</type>
+			<type key="ms" type="uksystem">Córas Impiriúil Tomhais</type>
+			<type key="ms" type="ussystem">Córas SAM Tomhais</type>
+			<type key="numbers" type="arab">Digití Ind-Arabacha</type>
+			<type key="numbers" type="arabext">Digití Ind-Arabacha Breisithe</type>
+			<type key="numbers" type="armn">Uimhreacha Airméanacha</type>
+			<type key="numbers" type="bali">Digití Bailíocha</type>
+			<type key="numbers" type="beng">Digití Beangálacha</type>
+			<type key="numbers" type="deva">Digití Déiveanágracha</type>
+			<type key="numbers" type="ethi">Uimhreacha Aetóipice</type>
+			<type key="numbers" type="fullwide">Digití Lánleithid</type>
+			<type key="numbers" type="geor">Uimhreacha Seoirseacha</type>
+			<type key="numbers" type="grek">Uimhreacha Gréagacha</type>
+			<type key="numbers" type="gujr">Digití Gúisearátacha</type>
+			<type key="numbers" type="guru">Digití Gurmúcacha</type>
+			<type key="numbers" type="hanidec">Uimhreacha Deachúlacha Síneacha</type>
+			<type key="numbers" type="hebr">Uimhreacha Eabhracha</type>
+			<type key="numbers" type="java">Digití Iávacha</type>
+			<type key="numbers" type="jpan">Uimhreacha Seapánacha</type>
+			<type key="numbers" type="khmr">Digití Ciméaracha</type>
+			<type key="numbers" type="knda">Digití Cannadacha</type>
+			<type key="numbers" type="laoo">Digití Laosacha</type>
+			<type key="numbers" type="latn">Digití Iartharacha</type>
+			<type key="numbers" type="mlym">Digití Mailéalamacha</type>
+			<type key="numbers" type="mymr">Digití Maenmaracha</type>
+			<type key="numbers" type="orya">Digití Oiríseacha</type>
+			<type key="numbers" type="roman">Uimhreacha Rómhánacha</type>
+			<type key="numbers" type="taml">Uimhreacha Traidisiúnta Tamalacha</type>
+			<type key="numbers" type="tamldec">Digití Tamalacha</type>
+			<type key="numbers" type="telu">Digití Teileagúcha</type>
+			<type key="numbers" type="thai">Digití Téalannacha</type>
+			<type key="numbers" type="tibt">Digití Tibéadacha</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Méadrach</measurementSystemName>
@@ -837,6 +851,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -1137,14 +1152,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">a.m.</dayPeriod>
+							<dayPeriod type="pm">p.m.</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">a</dayPeriod>
+							<dayPeriod type="pm">p</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">a.m.</dayPeriod>
+							<dayPeriod type="pm">p.m.</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">a.m.</dayPeriod>
+							<dayPeriod type="pm">p.m.</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am">a</dayPeriod>
-							<dayPeriod type="noon">ml</dayPeriod>
 							<dayPeriod type="pm">p</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">a.m.</dayPeriod>
-							<dayPeriod type="noon">meán lae</dayPeriod>
 							<dayPeriod type="pm">p.m.</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
@@ -1252,12 +1283,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">LL</dateFormatItem>
 						<dateFormatItem id="Md">dd/MM</dateFormatItem>
 						<dateFormatItem id="MEd">E dd/MM</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">MM/y</dateFormatItem>
@@ -1266,6 +1302,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMEd">E d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
 						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
 					</availableFormats>
@@ -1396,6 +1433,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>bl.</displayName>
+				<relative type="-1">anuraidh</relative>
+				<relative type="0">an bhl. seo</relative>
+				<relative type="1">an bhl. seo chugainn</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">i gceann {0} bl.</relativeTimePattern>
 					<relativeTimePattern count="two">i gceann {0} bhl.</relativeTimePattern>
@@ -1413,6 +1453,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>bl.</displayName>
+				<relative type="-1">anuraidh</relative>
+				<relative type="0">an bhl. seo</relative>
+				<relative type="1">an bhl. seo chugainn</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} bhl.</relativeTimePattern>
 					<relativeTimePattern count="two">+{0} bhl.</relativeTimePattern>
@@ -1430,6 +1473,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter">
 				<displayName>Ráithe</displayName>
+				<relative type="-1">an ráithe seo caite</relative>
+				<relative type="0">an ráithe seo</relative>
+				<relative type="1">an ráithe seo chugainn</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">i gceann {0} ráithe</relativeTimePattern>
 					<relativeTimePattern count="two">i gceann {0} ráithe</relativeTimePattern>
@@ -1447,6 +1493,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>ráithe</displayName>
+				<relative type="-1">an ráithe seo caite</relative>
+				<relative type="0">an ráithe seo</relative>
+				<relative type="1">an ráithe seo chugainn</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">i gceann {0} ráithe</relativeTimePattern>
 					<relativeTimePattern count="two">i gceann {0} ráithe</relativeTimePattern>
@@ -1464,6 +1513,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>ráithe</displayName>
+				<relative type="-1">an ráithe seo caite</relative>
+				<relative type="0">an ráithe seo</relative>
+				<relative type="1">an ráithe seo chugainn</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} R</relativeTimePattern>
 					<relativeTimePattern count="two">+{0} R</relativeTimePattern>
@@ -1501,6 +1553,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>mí</displayName>
+				<relative type="-1">an mhí seo caite</relative>
+				<relative type="0">an mhí seo</relative>
+				<relative type="1">an mhí seo chugainn</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">i gceann {0} mhí</relativeTimePattern>
 					<relativeTimePattern count="two">i gceann {0} mhí</relativeTimePattern>
@@ -1518,6 +1573,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>mí</displayName>
+				<relative type="-1">an mhí seo caite</relative>
+				<relative type="0">an mhí seo</relative>
+				<relative type="1">an mhí seo chugainn</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} mhí</relativeTimePattern>
 					<relativeTimePattern count="two">+{0} mhí</relativeTimePattern>
@@ -1555,6 +1613,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>scht.</displayName>
+				<relative type="-1">an tscht. seo caite</relative>
+				<relative type="0">an tscht. seo</relative>
+				<relative type="1">an tscht. seo chugainn</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">i gceann {0} scht.</relativeTimePattern>
 					<relativeTimePattern count="two">i gceann {0} shcht.</relativeTimePattern>
@@ -1572,6 +1633,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>scht.</displayName>
+				<relative type="-1">an tscht. seo caite</relative>
+				<relative type="0">an tscht. seo</relative>
+				<relative type="1">an tscht. seo chugainn</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} scht.</relativeTimePattern>
 					<relativeTimePattern count="two">+{0} scht.</relativeTimePattern>
@@ -1611,6 +1675,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>Lá</displayName>
+				<relative type="-2">arú inné</relative>
+				<relative type="-1">inné</relative>
+				<relative type="0">inniu</relative>
+				<relative type="1">amárach</relative>
+				<relative type="2">arú amárach</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">i gceann {0} lá</relativeTimePattern>
 					<relativeTimePattern count="two">i gceann {0} lá</relativeTimePattern>
@@ -1628,6 +1697,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>Lá</displayName>
+				<relative type="-2">arú inné</relative>
+				<relative type="-1">inné</relative>
+				<relative type="0">inniu</relative>
+				<relative type="1">amárach</relative>
+				<relative type="2">arú amárach</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} lá</relativeTimePattern>
 					<relativeTimePattern count="two">+{0} lá</relativeTimePattern>
@@ -1648,108 +1722,108 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="sun">
 				<relative type="-1">an Domhnach seo caite</relative>
-				<relative type="0">an Domhnach seo chugainn</relative>
+				<relative type="0">an Domhnach seo</relative>
 				<relative type="1">an Domhnach seo chugainn</relative>
 			</field>
 			<field type="sun-short">
 				<relative type="-1">an Domh. seo caite</relative>
-				<relative type="0">an Domh. seo chugainn</relative>
+				<relative type="0">an Domh. seo</relative>
 				<relative type="1">an Domh. seo chugainn</relative>
 			</field>
 			<field type="sun-narrow">
 				<relative type="-1">an Domh seo caite</relative>
-				<relative type="0">an Domh seo chugainn</relative>
-				<relative type="1">an Domh seo chugainn</relative>
+				<relative type="0">an Domh seo</relative>
+				<relative type="1">an Domh seo chug.</relative>
 			</field>
 			<field type="mon">
 				<relative type="-1">an Luan seo caite</relative>
-				<relative type="0">an Luan seo chugainn</relative>
+				<relative type="0">an Luan seo</relative>
 				<relative type="1">an Luan seo chugainn</relative>
 			</field>
 			<field type="mon-short">
 				<relative type="-1">an Luan seo caite</relative>
-				<relative type="0">an Luan seo chugainn</relative>
+				<relative type="0">an Luan seo</relative>
 				<relative type="1">an Luan seo chugainn</relative>
 			</field>
 			<field type="mon-narrow">
 				<relative type="-1">an Luan seo caite</relative>
-				<relative type="0">an Luan seo chugainn</relative>
-				<relative type="1">an Luan seo chugainn</relative>
+				<relative type="0">an Luan seo</relative>
+				<relative type="1">an Luan seo chug.</relative>
 			</field>
 			<field type="tue">
 				<relative type="-1">an Mháirt seo caite</relative>
-				<relative type="0">an Mháirt seo chugainn</relative>
+				<relative type="0">an Mháirt seo</relative>
 				<relative type="1">an Mháirt seo chugainn</relative>
 			</field>
 			<field type="tue-short">
 				<relative type="-1">an Mháirt seo caite</relative>
-				<relative type="0">an Mháirt seo chugainn</relative>
+				<relative type="0">an Mháirt seo</relative>
 				<relative type="1">an Mháirt seo chugainn</relative>
 			</field>
 			<field type="tue-narrow">
 				<relative type="-1">an Mháirt seo caite</relative>
-				<relative type="0">an Mháirt seo chugainn</relative>
-				<relative type="1">an Mháirt seo chugainn</relative>
+				<relative type="0">an Mháirt seo</relative>
+				<relative type="1">an Mháirt seo chug.</relative>
 			</field>
 			<field type="wed">
 				<relative type="-1">an Chéadaoin seo caite</relative>
-				<relative type="0">an Chéadaoin seo chugainn</relative>
+				<relative type="0">an Chéadaoin seo</relative>
 				<relative type="1">an Chéadaoin seo chugainn</relative>
 			</field>
 			<field type="wed-short">
 				<relative type="-1">an Chéad. seo caite</relative>
-				<relative type="0">an Chéad. seo chugainn</relative>
+				<relative type="0">an Chéad. seo</relative>
 				<relative type="1">an Chéad. seo chugainn</relative>
 			</field>
 			<field type="wed-narrow">
 				<relative type="-1">an Chéad. seo caite</relative>
-				<relative type="0">an Chéad. seo chugainn</relative>
-				<relative type="1">an Chéad. seo chugainn</relative>
+				<relative type="0">an Chéad. seo</relative>
+				<relative type="1">an Chéad seo chug.</relative>
 			</field>
 			<field type="thu">
 				<relative type="-1">an Déardaoin seo caite</relative>
-				<relative type="0">an Déardaoin seo chugainn</relative>
+				<relative type="0">an Déardaoin seo</relative>
 				<relative type="1">an Déardaoin seo chugainn</relative>
 			</field>
 			<field type="thu-short">
 				<relative type="-1">an Déar. seo caite</relative>
-				<relative type="0">an Déar. seo chugainn</relative>
+				<relative type="0">an Déar. seo</relative>
 				<relative type="1">an Déar. seo chugainn</relative>
 			</field>
 			<field type="thu-narrow">
 				<relative type="-1">an Déar. seo caite</relative>
-				<relative type="0">an Déar. seo chugainn</relative>
-				<relative type="1">an Déar. seo chugainn</relative>
+				<relative type="0">an Déar. seo</relative>
+				<relative type="1">an Déar. seo chug.</relative>
 			</field>
 			<field type="fri">
 				<relative type="-1">an Aoine seo caite</relative>
-				<relative type="0">an Aoine seo chugainn</relative>
+				<relative type="0">an Aoine seo</relative>
 				<relative type="1">an Aoine seo chugainn</relative>
 			</field>
 			<field type="fri-short">
 				<relative type="-1">an Aoine seo caite</relative>
-				<relative type="0">an Aoine seo chugainn</relative>
+				<relative type="0">an Aoine seo</relative>
 				<relative type="1">an Aoine seo chugainn</relative>
 			</field>
 			<field type="fri-narrow">
 				<relative type="-1">an Aoine seo caite</relative>
-				<relative type="0">an Aoine seo chugainn</relative>
-				<relative type="1">an Aoine seo chugainn</relative>
+				<relative type="0">an Aoine seo</relative>
+				<relative type="1">an Aoine seo chug.</relative>
 			</field>
 			<field type="sat">
 				<relative type="-1">an Satharn seo caite</relative>
-				<relative type="0">an Satharn seo chugainn</relative>
+				<relative type="0">an Satharn seo</relative>
 				<relative type="1">an Satharn seo chugainn</relative>
 			</field>
 			<field type="sat-short">
 				<relative type="-1">an Sath. seo caite</relative>
-				<relative type="0">an Sath. seo chugainn</relative>
+				<relative type="0">an Sath. seo</relative>
 				<relative type="1">an Sath. seo chugainn</relative>
 			</field>
 			<field type="sat-narrow">
 				<relative type="-1">an Sath seo caite</relative>
-				<relative type="0">an Sath seo chugainn</relative>
-				<relative type="1">an Sath seo chugainn</relative>
+				<relative type="0">an Sath seo</relative>
+				<relative type="1">an Sath seo chug.</relative>
 			</field>
 			<field type="dayperiod">
 				<displayName>a.m./p.m.</displayName>
@@ -1858,6 +1932,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="second">
 				<displayName>Soicind</displayName>
+				<relative type="0">anois</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">i gceann {0} soicind</relativeTimePattern>
 					<relativeTimePattern count="two">i gceann {0} shoicind</relativeTimePattern>
@@ -1875,6 +1950,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="second-short">
 				<displayName>soic.</displayName>
+				<relative type="0">anois</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">i gceann {0} soic.</relativeTimePattern>
 					<relativeTimePattern count="two">i gceann {0} shoic.</relativeTimePattern>
@@ -1892,6 +1968,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="second-narrow">
 				<displayName>s</displayName>
+				<relative type="0">anois</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} s</relativeTimePattern>
 					<relativeTimePattern count="two">+{0} s</relativeTimePattern>
@@ -2792,6 +2869,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Mainile</exemplarCity>
 			</zone>
@@ -2876,6 +2956,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Chita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Iacútsc</exemplarCity>
 			</zone>
@@ -2894,6 +2977,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolymsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamchatka</exemplarCity>
 			</zone>
@@ -3263,6 +3349,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<daylight>Am Samhraidh Anadyr</daylight>
 				</long>
 			</metazone>
+			<metazone type="Apia">
+				<long>
+					<generic>Am Apia</generic>
+					<standard>Am Caighdeánach Apia</standard>
+					<daylight>Am Samhraidh Apia</daylight>
+				</long>
+			</metazone>
 			<metazone type="Aqtau">
 				<long>
 					<generic>Am Aqtau</generic>
@@ -3510,6 +3603,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<daylight>EEST</daylight>
 				</short>
 			</metazone>
+			<metazone type="Europe_Further_Eastern">
+				<long>
+					<standard>Am Chianoirthear na hEorpa</standard>
+				</long>
+			</metazone>
 			<metazone type="Europe_Western">
 				<long>
 					<generic>Am Iarthar na hEorpa</generic>
@@ -4315,6 +4413,70 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">¤0k</pattern>
+					<pattern type="1000" count="two">¤0k</pattern>
+					<pattern type="1000" count="few">¤0k</pattern>
+					<pattern type="1000" count="many">¤0k</pattern>
+					<pattern type="1000" count="other">¤0k</pattern>
+					<pattern type="10000" count="one">¤00k</pattern>
+					<pattern type="10000" count="two">¤00k</pattern>
+					<pattern type="10000" count="few">¤00k</pattern>
+					<pattern type="10000" count="many">¤00k</pattern>
+					<pattern type="10000" count="other">¤00k</pattern>
+					<pattern type="100000" count="one">¤000k</pattern>
+					<pattern type="100000" count="two">¤000k</pattern>
+					<pattern type="100000" count="few">¤000k</pattern>
+					<pattern type="100000" count="many">¤000k</pattern>
+					<pattern type="100000" count="other">¤000k</pattern>
+					<pattern type="1000000" count="one">¤0M</pattern>
+					<pattern type="1000000" count="two">¤0M</pattern>
+					<pattern type="1000000" count="few">¤0M</pattern>
+					<pattern type="1000000" count="many">¤0M</pattern>
+					<pattern type="1000000" count="other">¤0M</pattern>
+					<pattern type="10000000" count="one">¤00M</pattern>
+					<pattern type="10000000" count="two">¤00M</pattern>
+					<pattern type="10000000" count="few">¤00M</pattern>
+					<pattern type="10000000" count="many">¤00M</pattern>
+					<pattern type="10000000" count="other">¤00M</pattern>
+					<pattern type="100000000" count="one">¤000M</pattern>
+					<pattern type="100000000" count="two">¤000M</pattern>
+					<pattern type="100000000" count="few">¤000M</pattern>
+					<pattern type="100000000" count="many">¤000M</pattern>
+					<pattern type="100000000" count="other">¤000M</pattern>
+					<pattern type="1000000000" count="one">¤0B</pattern>
+					<pattern type="1000000000" count="two">¤0B</pattern>
+					<pattern type="1000000000" count="few">¤0B</pattern>
+					<pattern type="1000000000" count="many">¤0B</pattern>
+					<pattern type="1000000000" count="other">¤0B</pattern>
+					<pattern type="10000000000" count="one">¤00B</pattern>
+					<pattern type="10000000000" count="two">¤00B</pattern>
+					<pattern type="10000000000" count="few">¤00B</pattern>
+					<pattern type="10000000000" count="many">¤00B</pattern>
+					<pattern type="10000000000" count="other">¤00B</pattern>
+					<pattern type="100000000000" count="one">¤000B</pattern>
+					<pattern type="100000000000" count="two">¤000B</pattern>
+					<pattern type="100000000000" count="few">¤000B</pattern>
+					<pattern type="100000000000" count="many">¤000B</pattern>
+					<pattern type="100000000000" count="other">¤000B</pattern>
+					<pattern type="1000000000000" count="one">¤0T</pattern>
+					<pattern type="1000000000000" count="two">¤0T</pattern>
+					<pattern type="1000000000000" count="few">¤0T</pattern>
+					<pattern type="1000000000000" count="many">¤0T</pattern>
+					<pattern type="1000000000000" count="other">¤0T</pattern>
+					<pattern type="10000000000000" count="one">¤00T</pattern>
+					<pattern type="10000000000000" count="two">¤00T</pattern>
+					<pattern type="10000000000000" count="few">¤00T</pattern>
+					<pattern type="10000000000000" count="many">¤00T</pattern>
+					<pattern type="10000000000000" count="other">¤00T</pattern>
+					<pattern type="100000000000000" count="one">¤000T</pattern>
+					<pattern type="100000000000000" count="two">¤000T</pattern>
+					<pattern type="100000000000000" count="few">¤000T</pattern>
+					<pattern type="100000000000000" count="many">¤000T</pattern>
+					<pattern type="100000000000000" count="other">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="two">{0} {1}</unitPattern>
 			<unitPattern count="few">{0} {1}</unitPattern>
@@ -4395,6 +4557,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">kwanza Angóla</displayName>
 				<displayName count="other">kwanza Angóla</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>Kwanza Angólach (1977–1990)</displayName>
@@ -4492,6 +4655,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">marg inmhalartaithe na Boisnia-Heirseagaivéine</displayName>
 				<displayName count="other">marg inmhalartaithe na Boisnia-Heirseagaivéine</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BAN">
 				<symbol>BAN</symbol>
@@ -4598,6 +4762,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">mboliviano</displayName>
 				<displayName count="other">boliviano</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOL">
 				<symbol>BOL</symbol>
@@ -4720,6 +4885,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">bpula na Botsuáine</displayName>
 				<displayName count="other">pula na Botsuáine</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>Rúbal Nua na Bealarúise (1994–1999)</displayName>
@@ -4860,6 +5026,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">bpeso inmhalartaithe Chúba</displayName>
 				<displayName count="other">peso inmhalartaithe Chúba</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>Peso Chúba</displayName>
@@ -4897,6 +5064,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">koruna Phoblacht na Seice</displayName>
 				<displayName count="other">koruna Phoblacht na Seice</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>Ostmark na hOirGhearmáine</displayName>
@@ -4921,6 +5089,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">gcoróin na Danmhairge</displayName>
 				<displayName count="other">coróin na Danmhairge</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Peso na Poblachta Doiminicí</displayName>
@@ -4960,6 +5129,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">bpunt na hÉigipte</displayName>
 				<displayName count="other">punt na hÉigipte</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>Nakfa na hEiritré</displayName>
@@ -5026,6 +5196,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">bpunt Oileáin Fháclainne</displayName>
 				<displayName count="other">punt Oileáin Fháclainne</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>Franc Francach</displayName>
@@ -5097,6 +5268,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">bhfranc na Guine</displayName>
 				<displayName count="other">franc na Guine</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>Syli Guine</displayName>
@@ -5117,6 +5289,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">quetzal Ghuatamala</displayName>
 				<displayName count="other">quetzal Ghuatamala</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>Escudo na Guine Portaingéalaí</displayName>
@@ -5152,6 +5325,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">lempira Hondúras</displayName>
 				<displayName count="other">lempira Hondúras</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>Dínear na Cróite</displayName>
@@ -5164,6 +5338,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">kuna na Cróite</displayName>
 				<displayName count="other">kuna na Cróite</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>Gourde Háítí</displayName>
@@ -5182,6 +5357,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">bhforint na hUngáire</displayName>
 				<displayName count="other">forint na hUngáire</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>Rupiah na hIndinéise</displayName>
@@ -5191,6 +5367,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">rupiah na hIndinéise</displayName>
 				<displayName count="other">rupiah na hIndinéise</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>Punt Éireannach</displayName>
@@ -5244,6 +5421,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">króna na hÍoslainne</displayName>
 				<displayName count="other">króna na hÍoslainne</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>Lira na hIodáile</displayName>
@@ -5319,6 +5497,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">bhfranc Oileáin Chomóra</displayName>
 				<displayName count="other">franc Oileáin Chomóra</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>Won na Cóiré Thuaidh</displayName>
@@ -5328,6 +5507,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">won na Cóiré Thuaidh</displayName>
 				<displayName count="other">won na Cóiré Thuaidh</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRH">
 				<symbol>KRH</symbol>
@@ -5392,6 +5572,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">bpunt na Liobáine</displayName>
 				<displayName count="other">punt na Liobáine</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>Rúipí Shrí Lanca</displayName>
@@ -5401,6 +5582,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">rúipí Shrí Lanca</displayName>
 				<displayName count="other">rúipí Shrí Lanca</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>Dollar na Libéire</displayName>
@@ -5486,6 +5668,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">n-ariary Mhadagascar</displayName>
 				<displayName count="other">ariary Mhadagascar</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>Franc Madagascar</displayName>
@@ -5513,6 +5696,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">kyat Mhaenmar</displayName>
 				<displayName count="other">kyat Mhaenmar</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>Tugrik na Mongóile</displayName>
@@ -5568,6 +5752,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">rúipí Oileán Mhuirís</displayName>
 				<displayName count="other">rúipí Oileán Mhuirís</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVP">
 				<displayName>Rúipí Oileáin Mhaildíve</displayName>
@@ -5626,6 +5811,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">ringgit na Malaeisia</displayName>
 				<displayName count="other">ringgit na Malaeisia</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>Escudo Mósaimbíce</displayName>
@@ -5679,6 +5865,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">gcórdoba Nicearagua</displayName>
 				<displayName count="other">córdoba Nicearagua</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>Guilder Ísiltíreach</displayName>
@@ -5691,6 +5878,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">gcoróin na hIorua</displayName>
 				<displayName count="other">coróin na hIorua</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>Rúipí Neipeal</displayName>
@@ -5700,6 +5888,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">rúipí Neipeal</displayName>
 				<displayName count="other">rúipí Neipeal</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>Dollar na Nua-Shéalainne</displayName>
@@ -5778,6 +5967,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">rúipí na Pacastáine</displayName>
 				<displayName count="other">rúipí na Pacastáine</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>Zloty na Polainne</displayName>
@@ -5787,6 +5977,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">zloty na Polainne</displayName>
 				<displayName count="other">zloty na Polainne</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>Zloty Polannach (1950–1995)</displayName>
@@ -5854,6 +6045,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">rúbal na Rúise</displayName>
 				<displayName count="other">rúbal na Rúise</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>Rúbal na Rúise (1991–1998)</displayName>
@@ -5873,6 +6065,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">bhfranc Ruanda</displayName>
 				<displayName count="other">franc Ruanda</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>Riyal na hAraibe Sádaí</displayName>
@@ -5937,6 +6130,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">gcoróin na Sualainne</displayName>
 				<displayName count="other">coróin na Sualainne</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>Dollar Shingeapór</displayName>
@@ -5956,6 +6150,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">bpunt San Héilin</displayName>
 				<displayName count="other">punt San Héilin</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>Tolar na Slóivéine</displayName>
@@ -6030,6 +6225,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">ndobra São Tomé agus Príncipe</displayName>
 				<displayName count="other">dobra São Tomé agus Príncipe</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>Rúbal an Aontais Shóivéadaigh</displayName>
@@ -6057,6 +6253,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">bpunt na Siria</displayName>
 				<displayName count="other">punt na Siria</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>Lilangeni na Suasalainne</displayName>
@@ -6075,6 +6272,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">mbaht na Téalainne</displayName>
 				<displayName count="other">baht na Téalainne</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>Rúbal na Táidsíceastáine</displayName>
@@ -6117,6 +6315,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">bpaʻanga Thonga</displayName>
 				<displayName count="other">paʻanga Thonga</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>Escudo Tíomóir</displayName>
@@ -6139,6 +6338,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">lira na Tuirce</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Dollar Oileán na Tríonóide agus Tobága</displayName>
@@ -6267,6 +6467,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">mbolívar Veiniséala</displayName>
 				<displayName count="other">bolívar Veiniséala</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>Dong Vítneam</displayName>
@@ -6344,6 +6545,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">ndollar na Cairibe Thoir</displayName>
 				<displayName count="other">dollar na Cairibe Thoir</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>Cearta Speisialta Tarraingthe</displayName>
@@ -6439,6 +6641,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">rand na hAfraice Theas</displayName>
 				<displayName count="other">rand na hAfraice Theas</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>Kwacha Saimbiach (1968–2012)</displayName>
@@ -6451,6 +6654,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">kwacha na Saimbia</displayName>
 				<displayName count="other">kwacha na Saimbia</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>Zaire Nua Sáíreach</displayName>
@@ -6470,6 +6674,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</numbers>
 	<units>
 		<unitLength type="long">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0} sa {1}</compoundUnitPattern>
+			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>g-fhórsa</displayName>
 				<unitPattern count="one">{0} g-fhórsa</unitPattern>
@@ -6486,6 +6693,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} méadar sa soicind cearnaithe</unitPattern>
 				<unitPattern count="other">{0} méadar sa soicind cearnaithe</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>imrothlú</displayName>
+				<unitPattern count="one">{0} imrothlú</unitPattern>
+				<unitPattern count="two">{0} imrothlú</unitPattern>
+				<unitPattern count="few">{0} imrothlú</unitPattern>
+				<unitPattern count="many">{0} n-imrothlú</unitPattern>
+				<unitPattern count="other">{0} imrothlú</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>raidiain</displayName>
+				<unitPattern count="one">{0} raidian</unitPattern>
+				<unitPattern count="two">{0} raidian</unitPattern>
+				<unitPattern count="few">{0} raidian</unitPattern>
+				<unitPattern count="many">{0} raidian</unitPattern>
+				<unitPattern count="other">{0} raidian</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>céimeanna</displayName>
+				<unitPattern count="one">{0} chéim</unitPattern>
+				<unitPattern count="two">{0} chéim</unitPattern>
+				<unitPattern count="few">{0} chéim</unitPattern>
+				<unitPattern count="many">{0} gcéim</unitPattern>
+				<unitPattern count="other">{0} céim</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>nóiméid stua</displayName>
 				<unitPattern count="one">{0} nóiméad stua</unitPattern>
@@ -6502,29 +6733,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} soicind stua</unitPattern>
 				<unitPattern count="other">{0} soicind stua</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>céimeanna</displayName>
-				<unitPattern count="one">{0} chéim</unitPattern>
-				<unitPattern count="two">{0} chéim</unitPattern>
-				<unitPattern count="few">{0} chéim</unitPattern>
-				<unitPattern count="many">{0} gcéim</unitPattern>
-				<unitPattern count="other">{0} céim</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>raidiain</displayName>
-				<unitPattern count="one">{0} raidian</unitPattern>
-				<unitPattern count="two">{0} raidian</unitPattern>
-				<unitPattern count="few">{0} raidian</unitPattern>
-				<unitPattern count="many">{0} raidian</unitPattern>
-				<unitPattern count="other">{0} raidian</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>acraí</displayName>
-				<unitPattern count="one">{0} acra</unitPattern>
-				<unitPattern count="two">{0} acra</unitPattern>
-				<unitPattern count="few">{0} acra</unitPattern>
-				<unitPattern count="many">{0} n-acra</unitPattern>
-				<unitPattern count="other">{0} acra</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>ciliméadair chearnacha</displayName>
+				<unitPattern count="one">{0} chiliméadar cearnach</unitPattern>
+				<unitPattern count="two">{0} chiliméadar chearnacha</unitPattern>
+				<unitPattern count="few">{0} chiliméadar chearnacha</unitPattern>
+				<unitPattern count="many">{0} gciliméadar chearnacha</unitPattern>
+				<unitPattern count="other">{0} ciliméadar cearnach</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>heicteáir</displayName>
@@ -6534,6 +6749,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} heicteár</unitPattern>
 				<unitPattern count="other">{0} heicteár</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>méadair chearnacha</displayName>
+				<unitPattern count="one">{0} mhéadar cearnach</unitPattern>
+				<unitPattern count="two">{0} mhéadar chearnacha</unitPattern>
+				<unitPattern count="few">{0} mhéadar chearnacha</unitPattern>
+				<unitPattern count="many">{0} méadar chearnacha</unitPattern>
+				<unitPattern count="other">{0} méadar cearnach</unitPattern>
+				<perUnitPattern>{0} sa mhéadar cearnach</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>ceintiméadair chearnacha</displayName>
 				<unitPattern count="one">{0} cheintiméadar cearnach</unitPattern>
@@ -6541,6 +6765,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} cheintiméadar chearnacha</unitPattern>
 				<unitPattern count="many">{0} gceintiméadar chearnacha</unitPattern>
 				<unitPattern count="other">{0} ceintiméadar cearnach</unitPattern>
+				<perUnitPattern>{0} sa cheintiméadar cearnach</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mílte cearnacha</displayName>
+				<unitPattern count="one">{0} mhíle cearnach</unitPattern>
+				<unitPattern count="two">{0} mhíle chearnacha</unitPattern>
+				<unitPattern count="few">{0} mhíle chearnacha</unitPattern>
+				<unitPattern count="many">{0} míle chearnacha</unitPattern>
+				<unitPattern count="other">{0} míle cearnach</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acraí</displayName>
+				<unitPattern count="one">{0} acra</unitPattern>
+				<unitPattern count="two">{0} acra</unitPattern>
+				<unitPattern count="few">{0} acra</unitPattern>
+				<unitPattern count="many">{0} n-acra</unitPattern>
+				<unitPattern count="other">{0} acra</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>slata cearnacha</displayName>
+				<unitPattern count="one">{0} slat chearnach</unitPattern>
+				<unitPattern count="two">{0} shlat chearnacha</unitPattern>
+				<unitPattern count="few">{0} shlat chearnacha</unitPattern>
+				<unitPattern count="many">{0} slat chearnacha</unitPattern>
+				<unitPattern count="other">{0} slat chearnach</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>troithe cearnacha</displayName>
@@ -6557,38 +6806,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} orlach chearnacha</unitPattern>
 				<unitPattern count="many">{0} orlach chearnacha</unitPattern>
 				<unitPattern count="other">{0} orlach cearnach</unitPattern>
+				<perUnitPattern>{0} san orlach cearnach</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>ciliméadair chearnacha</displayName>
-				<unitPattern count="one">{0} chiliméadar cearnach</unitPattern>
-				<unitPattern count="two">{0} chiliméadar chearnacha</unitPattern>
-				<unitPattern count="few">{0} chiliméadar chearnacha</unitPattern>
-				<unitPattern count="many">{0} gciliméadar chearnacha</unitPattern>
-				<unitPattern count="other">{0} ciliméadar cearnach</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>méadair chearnacha</displayName>
-				<unitPattern count="one">{0} mhéadar cearnach</unitPattern>
-				<unitPattern count="two">{0} mhéadar chearnacha</unitPattern>
-				<unitPattern count="few">{0} mhéadar chearnacha</unitPattern>
-				<unitPattern count="many">{0} méadar chearnacha</unitPattern>
-				<unitPattern count="other">{0} méadar cearnach</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mílte cearnacha</displayName>
-				<unitPattern count="one">{0} mhíle cearnach</unitPattern>
-				<unitPattern count="two">{0} mhíle chearnacha</unitPattern>
-				<unitPattern count="few">{0} mhíle chearnacha</unitPattern>
-				<unitPattern count="many">{0} míle chearnacha</unitPattern>
-				<unitPattern count="other">{0} míle cearnach</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>slata cearnacha</displayName>
-				<unitPattern count="one">{0} slat chearnach</unitPattern>
-				<unitPattern count="two">{0} shlat chearnacha</unitPattern>
-				<unitPattern count="few">{0} shlat chearnacha</unitPattern>
-				<unitPattern count="many">{0} slat chearnacha</unitPattern>
-				<unitPattern count="other">{0} slat chearnach</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>carait óir</displayName>
+				<unitPattern count="one">{0} charat óir</unitPattern>
+				<unitPattern count="two">{0} charat óir</unitPattern>
+				<unitPattern count="few">{0} charat óir</unitPattern>
+				<unitPattern count="many">{0} gcarat óir</unitPattern>
+				<unitPattern count="other">{0} carat óir</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>lítir sa chiliméadar</displayName>
@@ -6598,6 +6824,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} lítear sa chiliméadar</unitPattern>
 				<unitPattern count="other">{0} lítear sa chiliméadar</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>lítir sa 100 ciliméadar</displayName>
+				<unitPattern count="one">{0} lítear sa 100 ciliméadar</unitPattern>
+				<unitPattern count="two">{0} lítear sa 100 ciliméadar</unitPattern>
+				<unitPattern count="few">{0} lítear sa 100 ciliméadar</unitPattern>
+				<unitPattern count="many">{0} lítear sa 100 ciliméadar</unitPattern>
+				<unitPattern count="other">{0} lítear sa 100 ciliméadar</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mílte an galún</displayName>
 				<unitPattern count="one">{0} mhíle an galún</unitPattern>
@@ -6606,78 +6840,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} míle an galún</unitPattern>
 				<unitPattern count="other">{0} míle an galún</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>giotáin</displayName>
-				<unitPattern count="one">{0} ghiotán</unitPattern>
-				<unitPattern count="two">{0} ghiotán</unitPattern>
-				<unitPattern count="few">{0} ghiotán</unitPattern>
-				<unitPattern count="many">{0} ngiotán</unitPattern>
-				<unitPattern count="other">{0} giotán</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bearta</displayName>
-				<unitPattern count="one">{0} bheart</unitPattern>
-				<unitPattern count="two">{0} bheart</unitPattern>
-				<unitPattern count="few">{0} bheart</unitPattern>
-				<unitPattern count="many">{0} mbeart</unitPattern>
-				<unitPattern count="other">{0} beart</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigighiotáin</displayName>
-				<unitPattern count="one">{0} ghigighiotán</unitPattern>
-				<unitPattern count="two">{0} ghigighiotán</unitPattern>
-				<unitPattern count="few">{0} ghigighiotán</unitPattern>
-				<unitPattern count="many">{0} ngigighiotán</unitPattern>
-				<unitPattern count="other">{0} gigighiotán</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigibhearta</displayName>
-				<unitPattern count="one">{0} ghigibheart</unitPattern>
-				<unitPattern count="two">{0} ghigibheart</unitPattern>
-				<unitPattern count="few">{0} ghigibheart</unitPattern>
-				<unitPattern count="many">{0} ngigibheart</unitPattern>
-				<unitPattern count="other">{0} gigibheart</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>cilighiotáin</displayName>
-				<unitPattern count="one">{0} chilighiotán</unitPattern>
-				<unitPattern count="two">{0} chilighiotán</unitPattern>
-				<unitPattern count="few">{0} chilighiotán</unitPattern>
-				<unitPattern count="many">{0} gcilighiotán</unitPattern>
-				<unitPattern count="other">{0} cilighiotán</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>cilibhearta</displayName>
-				<unitPattern count="one">{0} chilibheart</unitPattern>
-				<unitPattern count="two">{0} chilibheart</unitPattern>
-				<unitPattern count="few">{0} chilibheart</unitPattern>
-				<unitPattern count="many">{0} gcilibheart</unitPattern>
-				<unitPattern count="other">{0} cilibheart</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>meigighiotáin</displayName>
-				<unitPattern count="one">{0} mheigighiotán</unitPattern>
-				<unitPattern count="two">{0} mheigighiotán</unitPattern>
-				<unitPattern count="few">{0} mheigighiotán</unitPattern>
-				<unitPattern count="many">{0} meigighiotán</unitPattern>
-				<unitPattern count="other">{0} meigighiotán</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>meigibhearta</displayName>
-				<unitPattern count="one">{0} mheigibheart</unitPattern>
-				<unitPattern count="two">{0} mheigibheart</unitPattern>
-				<unitPattern count="few">{0} mheigibheart</unitPattern>
-				<unitPattern count="many">{0} meigibheart</unitPattern>
-				<unitPattern count="other">{0} meigibheart</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>teirighiotáin</displayName>
-				<unitPattern count="one">{0} teirighiotán</unitPattern>
-				<unitPattern count="two">{0} theirighiotán</unitPattern>
-				<unitPattern count="few">{0} theirighiotán</unitPattern>
-				<unitPattern count="many">{0} dteirighiotán</unitPattern>
-				<unitPattern count="other">{0} teirighiotán</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>teiribhearta</displayName>
 				<unitPattern count="one">{0} teiribheart</unitPattern>
@@ -6686,6 +6848,113 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} dteiribheart</unitPattern>
 				<unitPattern count="other">{0} teiribheart</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>teirighiotáin</displayName>
+				<unitPattern count="one">{0} teirighiotán</unitPattern>
+				<unitPattern count="two">{0} theirighiotán</unitPattern>
+				<unitPattern count="few">{0} theirighiotán</unitPattern>
+				<unitPattern count="many">{0} dteirighiotán</unitPattern>
+				<unitPattern count="other">{0} teirighiotán</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigibhearta</displayName>
+				<unitPattern count="one">{0} ghigibheart</unitPattern>
+				<unitPattern count="two">{0} ghigibheart</unitPattern>
+				<unitPattern count="few">{0} ghigibheart</unitPattern>
+				<unitPattern count="many">{0} ngigibheart</unitPattern>
+				<unitPattern count="other">{0} gigibheart</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigighiotáin</displayName>
+				<unitPattern count="one">{0} ghigighiotán</unitPattern>
+				<unitPattern count="two">{0} ghigighiotán</unitPattern>
+				<unitPattern count="few">{0} ghigighiotán</unitPattern>
+				<unitPattern count="many">{0} ngigighiotán</unitPattern>
+				<unitPattern count="other">{0} gigighiotán</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>meigibhearta</displayName>
+				<unitPattern count="one">{0} mheigibheart</unitPattern>
+				<unitPattern count="two">{0} mheigibheart</unitPattern>
+				<unitPattern count="few">{0} mheigibheart</unitPattern>
+				<unitPattern count="many">{0} meigibheart</unitPattern>
+				<unitPattern count="other">{0} meigibheart</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>meigighiotáin</displayName>
+				<unitPattern count="one">{0} mheigighiotán</unitPattern>
+				<unitPattern count="two">{0} mheigighiotán</unitPattern>
+				<unitPattern count="few">{0} mheigighiotán</unitPattern>
+				<unitPattern count="many">{0} meigighiotán</unitPattern>
+				<unitPattern count="other">{0} meigighiotán</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>cilibhearta</displayName>
+				<unitPattern count="one">{0} chilibheart</unitPattern>
+				<unitPattern count="two">{0} chilibheart</unitPattern>
+				<unitPattern count="few">{0} chilibheart</unitPattern>
+				<unitPattern count="many">{0} gcilibheart</unitPattern>
+				<unitPattern count="other">{0} cilibheart</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>cilighiotáin</displayName>
+				<unitPattern count="one">{0} chilighiotán</unitPattern>
+				<unitPattern count="two">{0} chilighiotán</unitPattern>
+				<unitPattern count="few">{0} chilighiotán</unitPattern>
+				<unitPattern count="many">{0} gcilighiotán</unitPattern>
+				<unitPattern count="other">{0} cilighiotán</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bearta</displayName>
+				<unitPattern count="one">{0} bheart</unitPattern>
+				<unitPattern count="two">{0} bheart</unitPattern>
+				<unitPattern count="few">{0} bheart</unitPattern>
+				<unitPattern count="many">{0} mbeart</unitPattern>
+				<unitPattern count="other">{0} beart</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>giotáin</displayName>
+				<unitPattern count="one">{0} ghiotán</unitPattern>
+				<unitPattern count="two">{0} ghiotán</unitPattern>
+				<unitPattern count="few">{0} ghiotán</unitPattern>
+				<unitPattern count="many">{0} ngiotán</unitPattern>
+				<unitPattern count="other">{0} giotán</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>céadta bliain</displayName>
+				<unitPattern count="one">{0} chéad bliain</unitPattern>
+				<unitPattern count="two">{0} chéad bliain</unitPattern>
+				<unitPattern count="few">{0} chéad bliain</unitPattern>
+				<unitPattern count="many">{0} gcéad bliain</unitPattern>
+				<unitPattern count="other">{0} céad bliain</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>blianta</displayName>
+				<unitPattern count="one">{0} bhliain</unitPattern>
+				<unitPattern count="two">{0} bhliain</unitPattern>
+				<unitPattern count="few">{0} bliana</unitPattern>
+				<unitPattern count="many">{0} mbliana</unitPattern>
+				<unitPattern count="other">{0} bliain</unitPattern>
+				<perUnitPattern>{0} sa bhliain</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>míonna</displayName>
+				<unitPattern count="one">{0} mhí</unitPattern>
+				<unitPattern count="two">{0} mhí</unitPattern>
+				<unitPattern count="few">{0} mhí</unitPattern>
+				<unitPattern count="many">{0} mí</unitPattern>
+				<unitPattern count="other">{0} mí</unitPattern>
+				<perUnitPattern>{0} sa mhí</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>seachtainí</displayName>
+				<unitPattern count="one">{0} seachtain</unitPattern>
+				<unitPattern count="two">{0} sheachtain</unitPattern>
+				<unitPattern count="few">{0} seachtaine</unitPattern>
+				<unitPattern count="many">{0} seachtaine</unitPattern>
+				<unitPattern count="other">{0} seachtain</unitPattern>
+				<perUnitPattern>{0} sa tseachtain</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>laethanta</displayName>
 				<unitPattern count="one">{0} lá</unitPattern>
@@ -6693,6 +6962,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} lá</unitPattern>
 				<unitPattern count="many">{0} lá</unitPattern>
 				<unitPattern count="other">{0} lá</unitPattern>
+				<perUnitPattern>{0} sa lá</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>uaireanta</displayName>
@@ -6703,22 +6973,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} uair</unitPattern>
 				<perUnitPattern>{0} san uair</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>micreashoicindí</displayName>
-				<unitPattern count="one">{0} mhicreashoicind</unitPattern>
-				<unitPattern count="two">{0} mhicreashoicind</unitPattern>
-				<unitPattern count="few">{0} mhicreashoicind</unitPattern>
-				<unitPattern count="many">{0} micreashoicind</unitPattern>
-				<unitPattern count="other">{0} micreashoicind</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milleasoicindí</displayName>
-				<unitPattern count="one">{0} mhilleasoicind</unitPattern>
-				<unitPattern count="two">{0} mhilleasoicind</unitPattern>
-				<unitPattern count="few">{0} mhilleasoicind</unitPattern>
-				<unitPattern count="many">{0} milleasoicind</unitPattern>
-				<unitPattern count="other">{0} milleasoicind</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>nóiméid</displayName>
 				<unitPattern count="one">{0} nóiméad</unitPattern>
@@ -6726,22 +6980,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} nóiméad</unitPattern>
 				<unitPattern count="many">{0} nóiméad</unitPattern>
 				<unitPattern count="other">{0} nóiméad</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>míonna</displayName>
-				<unitPattern count="one">{0} mhí</unitPattern>
-				<unitPattern count="two">{0} mhí</unitPattern>
-				<unitPattern count="few">{0} mhí</unitPattern>
-				<unitPattern count="many">{0} mí</unitPattern>
-				<unitPattern count="other">{0} mí</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanashoicindí</displayName>
-				<unitPattern count="one">{0} nanashoicind</unitPattern>
-				<unitPattern count="two">{0} nanashoicind</unitPattern>
-				<unitPattern count="few">{0} nanashoicind</unitPattern>
-				<unitPattern count="many">{0} nanashoicind</unitPattern>
-				<unitPattern count="other">{0} nanashoicind</unitPattern>
+				<perUnitPattern>{0} sa nóiméad</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>soicindí</displayName>
@@ -6752,21 +6991,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} soicind</unitPattern>
 				<perUnitPattern>{0} sa soicind</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>seachtainí</displayName>
-				<unitPattern count="one">{0} seachtain</unitPattern>
-				<unitPattern count="two">{0} sheachtain</unitPattern>
-				<unitPattern count="few">{0} seachtaine</unitPattern>
-				<unitPattern count="many">{0} seachtaine</unitPattern>
-				<unitPattern count="other">{0} seachtain</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milleasoicindí</displayName>
+				<unitPattern count="one">{0} mhilleasoicind</unitPattern>
+				<unitPattern count="two">{0} mhilleasoicind</unitPattern>
+				<unitPattern count="few">{0} mhilleasoicind</unitPattern>
+				<unitPattern count="many">{0} milleasoicind</unitPattern>
+				<unitPattern count="other">{0} milleasoicind</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>blianta</displayName>
-				<unitPattern count="one">{0} bhliain</unitPattern>
-				<unitPattern count="two">{0} bhliain</unitPattern>
-				<unitPattern count="few">{0} bliana</unitPattern>
-				<unitPattern count="many">{0} mbliana</unitPattern>
-				<unitPattern count="other">{0} bliain</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>micreashoicindí</displayName>
+				<unitPattern count="one">{0} mhicreashoicind</unitPattern>
+				<unitPattern count="two">{0} mhicreashoicind</unitPattern>
+				<unitPattern count="few">{0} mhicreashoicind</unitPattern>
+				<unitPattern count="many">{0} micreashoicind</unitPattern>
+				<unitPattern count="other">{0} micreashoicind</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanashoicindí</displayName>
+				<unitPattern count="one">{0} nanashoicind</unitPattern>
+				<unitPattern count="two">{0} nanashoicind</unitPattern>
+				<unitPattern count="few">{0} nanashoicind</unitPattern>
+				<unitPattern count="many">{0} nanashoicind</unitPattern>
+				<unitPattern count="other">{0} nanashoicind</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>aimpéir</displayName>
@@ -6800,6 +7047,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} volta</unitPattern>
 				<unitPattern count="other">{0} volta</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>cileacalraí</displayName>
+				<unitPattern count="one">{0} chileacalra</unitPattern>
+				<unitPattern count="two">{0} chileacalra</unitPattern>
+				<unitPattern count="few">{0} chileacalra</unitPattern>
+				<unitPattern count="many">{0} gcileacalra</unitPattern>
+				<unitPattern count="other">{0} cileacalra</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>calraí</displayName>
 				<unitPattern count="one">{0} chalra</unitPattern>
@@ -6816,22 +7071,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} gCalra</unitPattern>
 				<unitPattern count="other">{0} Calra</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>giúil</displayName>
-				<unitPattern count="one">{0} ghiúl</unitPattern>
-				<unitPattern count="two">{0} ghiúl</unitPattern>
-				<unitPattern count="few">{0} ghiúl</unitPattern>
-				<unitPattern count="many">{0} ngiúl</unitPattern>
-				<unitPattern count="other">{0} giúl</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>cileacalraí</displayName>
-				<unitPattern count="one">{0} chileacalra</unitPattern>
-				<unitPattern count="two">{0} chileacalra</unitPattern>
-				<unitPattern count="few">{0} chileacalra</unitPattern>
-				<unitPattern count="many">{0} gcileacalra</unitPattern>
-				<unitPattern count="other">{0} cileacalra</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>ciligiúil</displayName>
 				<unitPattern count="one">{0} chiligiúl</unitPattern>
@@ -6840,6 +7079,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} gciligiúl</unitPattern>
 				<unitPattern count="other">{0} ciligiúl</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>giúil</displayName>
+				<unitPattern count="one">{0} ghiúl</unitPattern>
+				<unitPattern count="two">{0} ghiúl</unitPattern>
+				<unitPattern count="few">{0} ghiúl</unitPattern>
+				<unitPattern count="many">{0} ngiúl</unitPattern>
+				<unitPattern count="other">{0} giúl</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>cileavatuaireanta</displayName>
 				<unitPattern count="one">{0} chileavatuair</unitPattern>
@@ -6856,13 +7103,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ngigiheirts</unitPattern>
 				<unitPattern count="other">{0} gigiheirts</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>heirts</displayName>
-				<unitPattern count="one">{0} heirts</unitPattern>
-				<unitPattern count="two">{0} heirts</unitPattern>
-				<unitPattern count="few">{0} heirts</unitPattern>
-				<unitPattern count="many">{0} heirts</unitPattern>
-				<unitPattern count="other">{0} heirts</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>meigiheirts</displayName>
+				<unitPattern count="one">{0} mheigiheirts</unitPattern>
+				<unitPattern count="two">{0} mheigiheirts</unitPattern>
+				<unitPattern count="few">{0} mheigiheirts</unitPattern>
+				<unitPattern count="many">{0} meigiheirts</unitPattern>
+				<unitPattern count="other">{0} meigiheirts</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>ciliheirts</displayName>
@@ -6872,29 +7119,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} gciliheirts</unitPattern>
 				<unitPattern count="other">{0} ciliheirts</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>meigiheirts</displayName>
-				<unitPattern count="one">{0} mheigiheirts</unitPattern>
-				<unitPattern count="two">{0} mheigiheirts</unitPattern>
-				<unitPattern count="few">{0} mheigiheirts</unitPattern>
-				<unitPattern count="many">{0} meigiheirts</unitPattern>
-				<unitPattern count="other">{0} meigiheirts</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>heirts</displayName>
+				<unitPattern count="one">{0} heirts</unitPattern>
+				<unitPattern count="two">{0} heirts</unitPattern>
+				<unitPattern count="few">{0} heirts</unitPattern>
+				<unitPattern count="many">{0} heirts</unitPattern>
+				<unitPattern count="other">{0} heirts</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>aonaid réalteolaíocha</displayName>
-				<unitPattern count="one">{0} aonad réalteolaíoch</unitPattern>
-				<unitPattern count="two">{0} aonad réalteolaíoch</unitPattern>
-				<unitPattern count="few">{0} aonad réalteolaíoch</unitPattern>
-				<unitPattern count="many">{0} n-aonad réalteolaíoch</unitPattern>
-				<unitPattern count="other">{0} aonad réalteolaíoch</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>ciliméadair</displayName>
+				<unitPattern count="one">{0} chiliméadar</unitPattern>
+				<unitPattern count="two">{0} chiliméadar</unitPattern>
+				<unitPattern count="few">{0} chiliméadar</unitPattern>
+				<unitPattern count="many">{0} gciliméadar</unitPattern>
+				<unitPattern count="other">{0} ciliméadar</unitPattern>
+				<perUnitPattern>{0} sa chiliméadar</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>ceintiméadair</displayName>
-				<unitPattern count="one">{0} cheintiméadar</unitPattern>
-				<unitPattern count="two">{0} cheintiméadar</unitPattern>
-				<unitPattern count="few">{0} cheintiméadar</unitPattern>
-				<unitPattern count="many">{0} gceintiméadar</unitPattern>
-				<unitPattern count="other">{0} ceintiméadar</unitPattern>
+			<unit type="length-meter">
+				<displayName>méadair</displayName>
+				<unitPattern count="one">{0} mhéadar</unitPattern>
+				<unitPattern count="two">{0} mhéadar</unitPattern>
+				<unitPattern count="few">{0} mhéadar</unitPattern>
+				<unitPattern count="many">{0} méadar</unitPattern>
+				<unitPattern count="other">{0} méadar</unitPattern>
+				<perUnitPattern>{0} sa mhéadar</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>deiciméadair</displayName>
@@ -6904,77 +7153,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ndeiciméadar</unitPattern>
 				<unitPattern count="other">{0} deiciméadar</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName>feánna</displayName>
-				<unitPattern count="one">{0} fheá</unitPattern>
-				<unitPattern count="two">{0} fheá</unitPattern>
-				<unitPattern count="few">{0} fheá</unitPattern>
-				<unitPattern count="many">{0} bhfeá</unitPattern>
-				<unitPattern count="other">{0} feá</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>troithe</displayName>
-				<unitPattern count="one">{0} troigh</unitPattern>
-				<unitPattern count="two">{0} throigh</unitPattern>
-				<unitPattern count="few">{0} throigh</unitPattern>
-				<unitPattern count="many">{0} dtroigh</unitPattern>
-				<unitPattern count="other">{0} troigh</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>staideanna</displayName>
-				<unitPattern count="one">{0} staid</unitPattern>
-				<unitPattern count="two">{0} staid</unitPattern>
-				<unitPattern count="few">{0} staid</unitPattern>
-				<unitPattern count="many">{0} staid</unitPattern>
-				<unitPattern count="other">{0} staid</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>orlaí</displayName>
-				<unitPattern count="one">{0} orlach</unitPattern>
-				<unitPattern count="two">{0} orlach</unitPattern>
-				<unitPattern count="few">{0} orlach</unitPattern>
-				<unitPattern count="many">{0} n-orlach</unitPattern>
-				<unitPattern count="other">{0} orlach</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>ciliméadair</displayName>
-				<unitPattern count="one">{0} chiliméadar</unitPattern>
-				<unitPattern count="two">{0} chiliméadar</unitPattern>
-				<unitPattern count="few">{0} chiliméadar</unitPattern>
-				<unitPattern count="many">{0} gciliméadar</unitPattern>
-				<unitPattern count="other">{0} ciliméadar</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>solasbhlianta</displayName>
-				<unitPattern count="one">{0} solasbhliain</unitPattern>
-				<unitPattern count="two">{0} sholasbhliain</unitPattern>
-				<unitPattern count="few">{0} sholasbhliain</unitPattern>
-				<unitPattern count="many">{0} solasbhliain</unitPattern>
-				<unitPattern count="other">{0} solasbhliain</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>méadair</displayName>
-				<unitPattern count="one">{0} mhéadar</unitPattern>
-				<unitPattern count="two">{0} mhéadar</unitPattern>
-				<unitPattern count="few">{0} mhéadar</unitPattern>
-				<unitPattern count="many">{0} méadar</unitPattern>
-				<unitPattern count="other">{0} méadar</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>micriméadair</displayName>
-				<unitPattern count="one">{0} mhicriméadar</unitPattern>
-				<unitPattern count="two">{0} mhicriméadar</unitPattern>
-				<unitPattern count="few">{0} mhicriméadar</unitPattern>
-				<unitPattern count="many">{0} micriméadar</unitPattern>
-				<unitPattern count="other">{0} micriméadar</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mílte</displayName>
-				<unitPattern count="one">{0} mhíle</unitPattern>
-				<unitPattern count="two">{0} mhíle</unitPattern>
-				<unitPattern count="few">{0} mhíle</unitPattern>
-				<unitPattern count="many">{0} míle</unitPattern>
-				<unitPattern count="other">{0} míle</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>ceintiméadair</displayName>
+				<unitPattern count="one">{0} cheintiméadar</unitPattern>
+				<unitPattern count="two">{0} cheintiméadar</unitPattern>
+				<unitPattern count="few">{0} cheintiméadar</unitPattern>
+				<unitPattern count="many">{0} gceintiméadar</unitPattern>
+				<unitPattern count="other">{0} ceintiméadar</unitPattern>
+				<perUnitPattern>{0} sa cheintiméadar</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>milliméadair</displayName>
@@ -6984,6 +7170,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} milliméadar</unitPattern>
 				<unitPattern count="other">{0} milliméadar</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>micriméadair</displayName>
+				<unitPattern count="one">{0} mhicriméadar</unitPattern>
+				<unitPattern count="two">{0} mhicriméadar</unitPattern>
+				<unitPattern count="few">{0} mhicriméadar</unitPattern>
+				<unitPattern count="many">{0} micriméadar</unitPattern>
+				<unitPattern count="other">{0} micriméadar</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanaiméadair</displayName>
 				<unitPattern count="one">{0} nanaiméadar</unitPattern>
@@ -6992,22 +7186,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} nanaiméadar</unitPattern>
 				<unitPattern count="other">{0} nanaiméadar</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>muirmhílte</displayName>
-				<unitPattern count="one">{0} mhuirmhíle</unitPattern>
-				<unitPattern count="two">{0} mhuirmhíle</unitPattern>
-				<unitPattern count="few">{0} mhuirmhíle</unitPattern>
-				<unitPattern count="many">{0} muirmhíle</unitPattern>
-				<unitPattern count="other">{0} muirmhíle</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsoiceanna</displayName>
-				<unitPattern count="one">{0} pharsoic</unitPattern>
-				<unitPattern count="two">{0} pharsoic</unitPattern>
-				<unitPattern count="few">{0} pharsoic</unitPattern>
-				<unitPattern count="many">{0} bparsoic</unitPattern>
-				<unitPattern count="other">{0} parsoic</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>piciméadair</displayName>
 				<unitPattern count="one">{0} phiciméadar</unitPattern>
@@ -7016,6 +7194,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} bpiciméadar</unitPattern>
 				<unitPattern count="other">{0} piciméadar</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mílte</displayName>
+				<unitPattern count="one">{0} mhíle</unitPattern>
+				<unitPattern count="two">{0} mhíle</unitPattern>
+				<unitPattern count="few">{0} mhíle</unitPattern>
+				<unitPattern count="many">{0} míle</unitPattern>
+				<unitPattern count="other">{0} míle</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>slata</displayName>
 				<unitPattern count="one">{0} slat</unitPattern>
@@ -7024,6 +7210,80 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} slat</unitPattern>
 				<unitPattern count="other">{0} slat</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>troithe</displayName>
+				<unitPattern count="one">{0} troigh</unitPattern>
+				<unitPattern count="two">{0} throigh</unitPattern>
+				<unitPattern count="few">{0} throigh</unitPattern>
+				<unitPattern count="many">{0} dtroigh</unitPattern>
+				<unitPattern count="other">{0} troigh</unitPattern>
+				<perUnitPattern>{0} sa troigh</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>orlaí</displayName>
+				<unitPattern count="one">{0} orlach</unitPattern>
+				<unitPattern count="two">{0} orlach</unitPattern>
+				<unitPattern count="few">{0} orlach</unitPattern>
+				<unitPattern count="many">{0} n-orlach</unitPattern>
+				<unitPattern count="other">{0} orlach</unitPattern>
+				<perUnitPattern>{0} san orlach</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsoiceanna</displayName>
+				<unitPattern count="one">{0} pharsoic</unitPattern>
+				<unitPattern count="two">{0} pharsoic</unitPattern>
+				<unitPattern count="few">{0} pharsoic</unitPattern>
+				<unitPattern count="many">{0} bparsoic</unitPattern>
+				<unitPattern count="other">{0} parsoic</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>solasbhlianta</displayName>
+				<unitPattern count="one">{0} solasbhliain</unitPattern>
+				<unitPattern count="two">{0} sholasbhliain</unitPattern>
+				<unitPattern count="few">{0} sholasbhliain</unitPattern>
+				<unitPattern count="many">{0} solasbhliain</unitPattern>
+				<unitPattern count="other">{0} solasbhliain</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>aonaid réalteolaíocha</displayName>
+				<unitPattern count="one">{0} aonad réalteolaíoch</unitPattern>
+				<unitPattern count="two">{0} aonad réalteolaíoch</unitPattern>
+				<unitPattern count="few">{0} aonad réalteolaíoch</unitPattern>
+				<unitPattern count="many">{0} n-aonad réalteolaíoch</unitPattern>
+				<unitPattern count="other">{0} aonad réalteolaíoch</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>staideanna</displayName>
+				<unitPattern count="one">{0} staid</unitPattern>
+				<unitPattern count="two">{0} staid</unitPattern>
+				<unitPattern count="few">{0} staid</unitPattern>
+				<unitPattern count="many">{0} staid</unitPattern>
+				<unitPattern count="other">{0} staid</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>feánna</displayName>
+				<unitPattern count="one">{0} fheá</unitPattern>
+				<unitPattern count="two">{0} fheá</unitPattern>
+				<unitPattern count="few">{0} fheá</unitPattern>
+				<unitPattern count="many">{0} bhfeá</unitPattern>
+				<unitPattern count="other">{0} feá</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>muirmhílte</displayName>
+				<unitPattern count="one">{0} mhuirmhíle</unitPattern>
+				<unitPattern count="two">{0} mhuirmhíle</unitPattern>
+				<unitPattern count="few">{0} mhuirmhíle</unitPattern>
+				<unitPattern count="many">{0} muirmhíle</unitPattern>
+				<unitPattern count="other">{0} muirmhíle</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>míle Lochlannach</displayName>
+				<unitPattern count="one">{0} mhíle Lochlannach</unitPattern>
+				<unitPattern count="two">{0} mhíle Lochlannacha</unitPattern>
+				<unitPattern count="few">{0} mhíle Lochlannacha</unitPattern>
+				<unitPattern count="many">{0} míle Lochlannacha</unitPattern>
+				<unitPattern count="other">{0} míle Lochlannach</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lucsa</displayName>
 				<unitPattern count="one">{0} lucsa</unitPattern>
@@ -7032,30 +7292,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} lucsa</unitPattern>
 				<unitPattern count="other">{0} lucsa</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>carait</displayName>
-				<unitPattern count="one">{0} charat</unitPattern>
-				<unitPattern count="two">{0} charat</unitPattern>
-				<unitPattern count="few">{0} charat</unitPattern>
-				<unitPattern count="many">{0} gcarat</unitPattern>
-				<unitPattern count="other">{0} carat</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>graim</displayName>
-				<unitPattern count="one">{0} ghram</unitPattern>
-				<unitPattern count="two">{0} ghram</unitPattern>
-				<unitPattern count="few">{0} ghram</unitPattern>
-				<unitPattern count="many">{0} ngram</unitPattern>
-				<unitPattern count="other">{0} gram</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>cileagraim</displayName>
-				<unitPattern count="one">{0} chileagram</unitPattern>
-				<unitPattern count="two">{0} chileagram</unitPattern>
-				<unitPattern count="few">{0} chileagram</unitPattern>
-				<unitPattern count="many">{0} gcileagram</unitPattern>
-				<unitPattern count="other">{0} cileagram</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>tonnaí méadracha</displayName>
 				<unitPattern count="one">{0} tonna méadrach</unitPattern>
@@ -7064,13 +7300,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} dtonna mhéadracha</unitPattern>
 				<unitPattern count="other">{0} tonna méadrach</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>micreagraim</displayName>
-				<unitPattern count="one">{0} mhicreagram</unitPattern>
-				<unitPattern count="two">{0} mhicreagram</unitPattern>
-				<unitPattern count="few">{0} mhicreagram</unitPattern>
-				<unitPattern count="many">{0} micreagram</unitPattern>
-				<unitPattern count="other">{0} micreagram</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>cileagraim</displayName>
+				<unitPattern count="one">{0} chileagram</unitPattern>
+				<unitPattern count="two">{0} chileagram</unitPattern>
+				<unitPattern count="few">{0} chileagram</unitPattern>
+				<unitPattern count="many">{0} gcileagram</unitPattern>
+				<unitPattern count="other">{0} cileagram</unitPattern>
+				<perUnitPattern>{0} sa chileagram</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>graim</displayName>
+				<unitPattern count="one">{0} ghram</unitPattern>
+				<unitPattern count="two">{0} ghram</unitPattern>
+				<unitPattern count="few">{0} ghram</unitPattern>
+				<unitPattern count="many">{0} ngram</unitPattern>
+				<unitPattern count="other">{0} gram</unitPattern>
+				<perUnitPattern>{0} sa ghram</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>milleagraim</displayName>
@@ -7080,37 +7326,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} milleagram</unitPattern>
 				<unitPattern count="other">{0} milleagram</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>unsaí</displayName>
-				<unitPattern count="one">{0} unsa</unitPattern>
-				<unitPattern count="two">{0} unsa</unitPattern>
-				<unitPattern count="few">{0} unsa</unitPattern>
-				<unitPattern count="many">{0} n-unsa</unitPattern>
-				<unitPattern count="other">{0} unsa</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>unsaí troí</displayName>
-				<unitPattern count="one">{0} unsa troí</unitPattern>
-				<unitPattern count="two">{0} unsa troí</unitPattern>
-				<unitPattern count="few">{0} unsa troí</unitPattern>
-				<unitPattern count="many">{0} n-unsa troí</unitPattern>
-				<unitPattern count="other">{0} unsa troí</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>puint</displayName>
-				<unitPattern count="one">{0} phunt</unitPattern>
-				<unitPattern count="two">{0} phunt</unitPattern>
-				<unitPattern count="few">{0} phunt</unitPattern>
-				<unitPattern count="many">{0} bpunt</unitPattern>
-				<unitPattern count="other">{0} punt</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>clocha</displayName>
-				<unitPattern count="one">{0} chloch</unitPattern>
-				<unitPattern count="two">{0} chloch</unitPattern>
-				<unitPattern count="few">{0} chloch</unitPattern>
-				<unitPattern count="many">{0} gcloch</unitPattern>
-				<unitPattern count="other">{0} cloch</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>micreagraim</displayName>
+				<unitPattern count="one">{0} mhicreagram</unitPattern>
+				<unitPattern count="two">{0} mhicreagram</unitPattern>
+				<unitPattern count="few">{0} mhicreagram</unitPattern>
+				<unitPattern count="many">{0} micreagram</unitPattern>
+				<unitPattern count="other">{0} micreagram</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tonnaí gearra</displayName>
@@ -7120,6 +7342,48 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} dtonna ghearra</unitPattern>
 				<unitPattern count="other">{0} tonna gearr</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName>clocha</displayName>
+				<unitPattern count="one">{0} chloch</unitPattern>
+				<unitPattern count="two">{0} chloch</unitPattern>
+				<unitPattern count="few">{0} chloch</unitPattern>
+				<unitPattern count="many">{0} gcloch</unitPattern>
+				<unitPattern count="other">{0} cloch</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>puint</displayName>
+				<unitPattern count="one">{0} phunt</unitPattern>
+				<unitPattern count="two">{0} phunt</unitPattern>
+				<unitPattern count="few">{0} phunt</unitPattern>
+				<unitPattern count="many">{0} bpunt</unitPattern>
+				<unitPattern count="other">{0} punt</unitPattern>
+				<perUnitPattern>{0} sa phunt</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>unsaí</displayName>
+				<unitPattern count="one">{0} unsa</unitPattern>
+				<unitPattern count="two">{0} unsa</unitPattern>
+				<unitPattern count="few">{0} unsa</unitPattern>
+				<unitPattern count="many">{0} n-unsa</unitPattern>
+				<unitPattern count="other">{0} unsa</unitPattern>
+				<perUnitPattern>{0} san unsa</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>unsaí troí</displayName>
+				<unitPattern count="one">{0} unsa troí</unitPattern>
+				<unitPattern count="two">{0} unsa troí</unitPattern>
+				<unitPattern count="few">{0} unsa troí</unitPattern>
+				<unitPattern count="many">{0} n-unsa troí</unitPattern>
+				<unitPattern count="other">{0} unsa troí</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>carait</displayName>
+				<unitPattern count="one">{0} charat</unitPattern>
+				<unitPattern count="two">{0} charat</unitPattern>
+				<unitPattern count="few">{0} charat</unitPattern>
+				<unitPattern count="many">{0} gcarat</unitPattern>
+				<unitPattern count="other">{0} carat</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigeavatanna</displayName>
 				<unitPattern count="one">{0} ghigeavata</unitPattern>
@@ -7128,22 +7392,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ngigeavata</unitPattern>
 				<unitPattern count="other">{0} gigeavata</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>each-chumhacht</displayName>
-				<unitPattern count="one">{0} each-chumhacht</unitPattern>
-				<unitPattern count="two">{0} each-chumhacht</unitPattern>
-				<unitPattern count="few">{0} each-chumhacht</unitPattern>
-				<unitPattern count="many">{0} n-each-chumhacht</unitPattern>
-				<unitPattern count="other">{0} each-chumhacht</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>cileavatanna</displayName>
-				<unitPattern count="one">{0} chileavata</unitPattern>
-				<unitPattern count="two">{0} chileavata</unitPattern>
-				<unitPattern count="few">{0} chileavata</unitPattern>
-				<unitPattern count="many">{0} gcileavata</unitPattern>
-				<unitPattern count="other">{0} cileavata</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>meigeavatanna</displayName>
 				<unitPattern count="one">{0} mheigeavata</unitPattern>
@@ -7152,13 +7400,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} meigeavata</unitPattern>
 				<unitPattern count="other">{0} meigeavata</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>milleavatanna</displayName>
-				<unitPattern count="one">{0} mhilleavata</unitPattern>
-				<unitPattern count="two">{0} mhilleavata</unitPattern>
-				<unitPattern count="few">{0} mhilleavata</unitPattern>
-				<unitPattern count="many">{0} milleavata</unitPattern>
-				<unitPattern count="other">{0} milleavata</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>cileavatanna</displayName>
+				<unitPattern count="one">{0} chileavata</unitPattern>
+				<unitPattern count="two">{0} chileavata</unitPattern>
+				<unitPattern count="few">{0} chileavata</unitPattern>
+				<unitPattern count="many">{0} gcileavata</unitPattern>
+				<unitPattern count="other">{0} cileavata</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>vatanna</displayName>
@@ -7168,6 +7416,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} vata</unitPattern>
 				<unitPattern count="other">{0} vata</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>milleavatanna</displayName>
+				<unitPattern count="one">{0} mhilleavata</unitPattern>
+				<unitPattern count="two">{0} mhilleavata</unitPattern>
+				<unitPattern count="few">{0} mhilleavata</unitPattern>
+				<unitPattern count="many">{0} milleavata</unitPattern>
+				<unitPattern count="other">{0} milleavata</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>each-chumhacht</displayName>
+				<unitPattern count="one">{0} each-chumhacht</unitPattern>
+				<unitPattern count="two">{0} each-chumhacht</unitPattern>
+				<unitPattern count="few">{0} each-chumhacht</unitPattern>
+				<unitPattern count="many">{0} n-each-chumhacht</unitPattern>
+				<unitPattern count="other">{0} each-chumhacht</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>heicteapascail</displayName>
 				<unitPattern count="one">{0} heicteapascal</unitPattern>
@@ -7176,22 +7440,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} heicteapascal</unitPattern>
 				<unitPattern count="other">{0} heicteapascal</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>orlaí mearcair</displayName>
-				<unitPattern count="one">{0} orlach mearcair</unitPattern>
-				<unitPattern count="two">{0} orlach mearcair</unitPattern>
-				<unitPattern count="few">{0} orlach mearcair</unitPattern>
-				<unitPattern count="many">{0} n-orlach mearcair</unitPattern>
-				<unitPattern count="other">{0} orlach mearcair</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>milleabair</displayName>
-				<unitPattern count="one">{0} mhilleabar</unitPattern>
-				<unitPattern count="two">{0} mhilleabar</unitPattern>
-				<unitPattern count="few">{0} mhilleabar</unitPattern>
-				<unitPattern count="many">{0} milleabar</unitPattern>
-				<unitPattern count="other">{0} milleabar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>milliméadair mhearcair</displayName>
 				<unitPattern count="one">{0} mhilliméadar mearcair</unitPattern>
@@ -7208,13 +7456,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} bpunt san orlach cearnach</unitPattern>
 				<unitPattern count="other">{0} punt san orlach cearnach</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>carait óir</displayName>
-				<unitPattern count="one">{0} charat óir</unitPattern>
-				<unitPattern count="two">{0} charat óir</unitPattern>
-				<unitPattern count="few">{0} charat óir</unitPattern>
-				<unitPattern count="many">{0} gcarat óir</unitPattern>
-				<unitPattern count="other">{0} carat óir</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>orlaí mearcair</displayName>
+				<unitPattern count="one">{0} orlach mearcair</unitPattern>
+				<unitPattern count="two">{0} orlach mearcair</unitPattern>
+				<unitPattern count="few">{0} orlach mearcair</unitPattern>
+				<unitPattern count="many">{0} n-orlach mearcair</unitPattern>
+				<unitPattern count="other">{0} orlach mearcair</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>milleabair</displayName>
+				<unitPattern count="one">{0} mhilleabar</unitPattern>
+				<unitPattern count="two">{0} mhilleabar</unitPattern>
+				<unitPattern count="few">{0} mhilleabar</unitPattern>
+				<unitPattern count="many">{0} milleabar</unitPattern>
+				<unitPattern count="other">{0} milleabar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>ciliméadair san uair</displayName>
@@ -7240,6 +7496,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} míle san uair</unitPattern>
 				<unitPattern count="other">{0} míle san uair</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>muirmhíle san uair</displayName>
+				<unitPattern count="one">{0} mhuirmhíle san uair</unitPattern>
+				<unitPattern count="two">{0} mhuirmhíle san uair</unitPattern>
+				<unitPattern count="few">{0} mhuirmhíle san uair</unitPattern>
+				<unitPattern count="many">{0} muirmhíle san uair</unitPattern>
+				<unitPattern count="other">{0} muirmhíle san uair</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="two">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>céimeanna Celsius</displayName>
 				<unitPattern count="one">{0} chéim Celsius</unitPattern>
@@ -7264,54 +7536,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} gcéim cheilvin</unitPattern>
 				<unitPattern count="other">{0} céim cheilvin</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>acra-troithe</displayName>
-				<unitPattern count="one">{0} acra-troigh</unitPattern>
-				<unitPattern count="two">{0} acra-troigh</unitPattern>
-				<unitPattern count="few">{0} acra-troigh</unitPattern>
-				<unitPattern count="many">{0} n-acra-troigh</unitPattern>
-				<unitPattern count="other">{0} acra-troigh</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>buiséil</displayName>
-				<unitPattern count="one">{0} bhuiséal</unitPattern>
-				<unitPattern count="two">{0} bhuiséal</unitPattern>
-				<unitPattern count="few">{0} bhuiséal</unitPattern>
-				<unitPattern count="many">{0} mbuiséal</unitPattern>
-				<unitPattern count="other">{0} buiséal</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>ceintilítir</displayName>
-				<unitPattern count="one">{0} cheintilítear</unitPattern>
-				<unitPattern count="two">{0} cheintilítear</unitPattern>
-				<unitPattern count="few">{0} cheintilítear</unitPattern>
-				<unitPattern count="many">{0} gceintilítear</unitPattern>
-				<unitPattern count="other">{0} ceintilítear</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>ceintiméadair chiúbacha</displayName>
-				<unitPattern count="one">{0} cheintiméadar ciúbach</unitPattern>
-				<unitPattern count="two">{0} cheintiméadar chiúbacha</unitPattern>
-				<unitPattern count="few">{0} cheintiméadar chiúbacha</unitPattern>
-				<unitPattern count="many">{0} gceintiméadar chiúbacha</unitPattern>
-				<unitPattern count="other">{0} ceintiméadar ciúbach</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>troithe ciúbacha</displayName>
-				<unitPattern count="one">{0} troigh chiúbach</unitPattern>
-				<unitPattern count="two">{0} throigh chiúbacha</unitPattern>
-				<unitPattern count="few">{0} throigh chiúbacha</unitPattern>
-				<unitPattern count="many">{0} dtroigh chiúbacha</unitPattern>
-				<unitPattern count="other">{0} troigh chiúbach</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>orlaí ciúbacha</displayName>
-				<unitPattern count="one">{0} orlach ciúbach</unitPattern>
-				<unitPattern count="two">{0} orlach chiúbacha</unitPattern>
-				<unitPattern count="few">{0} orlach chiúbacha</unitPattern>
-				<unitPattern count="many">{0} n-orlach chiúbacha</unitPattern>
-				<unitPattern count="other">{0} orlach ciúbach</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>ciliméadair chiúbacha</displayName>
 				<unitPattern count="one">{0} chiliméadar ciúbach</unitPattern>
@@ -7327,6 +7551,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mhéadar chiúbacha</unitPattern>
 				<unitPattern count="many">{0} méadar chiúbacha</unitPattern>
 				<unitPattern count="other">{0} méadar ciúbach</unitPattern>
+				<perUnitPattern>{0} sa mhéadar ciúbach</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>ceintiméadair chiúbacha</displayName>
+				<unitPattern count="one">{0} cheintiméadar ciúbach</unitPattern>
+				<unitPattern count="two">{0} cheintiméadar chiúbacha</unitPattern>
+				<unitPattern count="few">{0} cheintiméadar chiúbacha</unitPattern>
+				<unitPattern count="many">{0} gceintiméadar chiúbacha</unitPattern>
+				<unitPattern count="other">{0} ceintiméadar ciúbach</unitPattern>
+				<perUnitPattern>{0} sa cheintiméadar ciúbach</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mílte ciúbacha</displayName>
@@ -7344,37 +7578,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} slat chiúbacha</unitPattern>
 				<unitPattern count="other">{0} slat chiúbach</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>cupáin</displayName>
-				<unitPattern count="one">{0} chupán</unitPattern>
-				<unitPattern count="two">{0} chupán</unitPattern>
-				<unitPattern count="few">{0} chupán</unitPattern>
-				<unitPattern count="many">{0} gcupán</unitPattern>
-				<unitPattern count="other">{0} cupán</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>troithe ciúbacha</displayName>
+				<unitPattern count="one">{0} troigh chiúbach</unitPattern>
+				<unitPattern count="two">{0} throigh chiúbacha</unitPattern>
+				<unitPattern count="few">{0} throigh chiúbacha</unitPattern>
+				<unitPattern count="many">{0} dtroigh chiúbacha</unitPattern>
+				<unitPattern count="other">{0} troigh chiúbach</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>deicilítir</displayName>
-				<unitPattern count="one">{0} deicilítear</unitPattern>
-				<unitPattern count="two">{0} dheicilítear</unitPattern>
-				<unitPattern count="few">{0} dheicilítear</unitPattern>
-				<unitPattern count="many">{0} ndeicilítear</unitPattern>
-				<unitPattern count="other">{0} deicilítear</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>orlaí ciúbacha</displayName>
+				<unitPattern count="one">{0} orlach ciúbach</unitPattern>
+				<unitPattern count="two">{0} orlach chiúbacha</unitPattern>
+				<unitPattern count="few">{0} orlach chiúbacha</unitPattern>
+				<unitPattern count="many">{0} n-orlach chiúbacha</unitPattern>
+				<unitPattern count="other">{0} orlach ciúbach</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>unsaí leachtacha</displayName>
-				<unitPattern count="one">{0} unsa leachtach</unitPattern>
-				<unitPattern count="two">{0} unsa leachtacha</unitPattern>
-				<unitPattern count="few">{0} unsa leachtacha</unitPattern>
-				<unitPattern count="many">{0} n-unsa leachtacha</unitPattern>
-				<unitPattern count="other">{0} unsa leachtach</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>galúin</displayName>
-				<unitPattern count="one">{0} ghalún</unitPattern>
-				<unitPattern count="two">{0} ghalún</unitPattern>
-				<unitPattern count="few">{0} ghalún</unitPattern>
-				<unitPattern count="many">{0} ngalún</unitPattern>
-				<unitPattern count="other">{0} galún</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>meigilítir</displayName>
+				<unitPattern count="one">{0} mheigilítear</unitPattern>
+				<unitPattern count="two">{0} mheigilítear</unitPattern>
+				<unitPattern count="few">{0} mheigilítear</unitPattern>
+				<unitPattern count="many">{0} meigilítear</unitPattern>
+				<unitPattern count="other">{0} meigilítear</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>heictilítir</displayName>
@@ -7391,14 +7617,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} lítear</unitPattern>
 				<unitPattern count="many">{0} lítear</unitPattern>
 				<unitPattern count="other">{0} lítear</unitPattern>
+				<perUnitPattern>{0} sa lítear</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>meigilítir</displayName>
-				<unitPattern count="one">{0} mheigilítear</unitPattern>
-				<unitPattern count="two">{0} mheigilítear</unitPattern>
-				<unitPattern count="few">{0} mheigilítear</unitPattern>
-				<unitPattern count="many">{0} meigilítear</unitPattern>
-				<unitPattern count="other">{0} meigilítear</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>deicilítir</displayName>
+				<unitPattern count="one">{0} deicilítear</unitPattern>
+				<unitPattern count="two">{0} dheicilítear</unitPattern>
+				<unitPattern count="few">{0} dheicilítear</unitPattern>
+				<unitPattern count="many">{0} ndeicilítear</unitPattern>
+				<unitPattern count="other">{0} deicilítear</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>ceintilítir</displayName>
+				<unitPattern count="one">{0} cheintilítear</unitPattern>
+				<unitPattern count="two">{0} cheintilítear</unitPattern>
+				<unitPattern count="few">{0} cheintilítear</unitPattern>
+				<unitPattern count="many">{0} gceintilítear</unitPattern>
+				<unitPattern count="other">{0} ceintilítear</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>millilítir</displayName>
@@ -7408,13 +7643,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} millilítear</unitPattern>
 				<unitPattern count="other">{0} millilítear</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>piontaí</displayName>
-				<unitPattern count="one">{0} phionta</unitPattern>
-				<unitPattern count="two">{0} phionta</unitPattern>
-				<unitPattern count="few">{0} phionta</unitPattern>
-				<unitPattern count="many">{0} bpionta</unitPattern>
-				<unitPattern count="other">{0} pionta</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>piontaí méadracha</displayName>
+				<unitPattern count="one">{0} phionta méadrach</unitPattern>
+				<unitPattern count="two">{0} phionta mhéadracha</unitPattern>
+				<unitPattern count="few">{0} phionta mhéadracha</unitPattern>
+				<unitPattern count="many">{0} bpionta mhéadracha</unitPattern>
+				<unitPattern count="other">{0} pionta méadrach</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>cupáin mhéadracha</displayName>
+				<unitPattern count="one">{0} chupán méadrach</unitPattern>
+				<unitPattern count="two">{0} chupán mhéadracha</unitPattern>
+				<unitPattern count="few">{0} chupán mhéadracha</unitPattern>
+				<unitPattern count="many">{0} gcupán mhéadracha</unitPattern>
+				<unitPattern count="other">{0} cupán méadrach</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acra-troithe</displayName>
+				<unitPattern count="one">{0} acra-troigh</unitPattern>
+				<unitPattern count="two">{0} acra-troigh</unitPattern>
+				<unitPattern count="few">{0} acra-troigh</unitPattern>
+				<unitPattern count="many">{0} n-acra-troigh</unitPattern>
+				<unitPattern count="other">{0} acra-troigh</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>buiséil</displayName>
+				<unitPattern count="one">{0} bhuiséal</unitPattern>
+				<unitPattern count="two">{0} bhuiséal</unitPattern>
+				<unitPattern count="few">{0} bhuiséal</unitPattern>
+				<unitPattern count="many">{0} mbuiséal</unitPattern>
+				<unitPattern count="other">{0} buiséal</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galúin</displayName>
+				<unitPattern count="one">{0} ghalún</unitPattern>
+				<unitPattern count="two">{0} ghalún</unitPattern>
+				<unitPattern count="few">{0} ghalún</unitPattern>
+				<unitPattern count="many">{0} ngalún</unitPattern>
+				<unitPattern count="other">{0} galún</unitPattern>
+				<perUnitPattern>{0} sa ghalún</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>cáirt</displayName>
@@ -7424,6 +7692,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} gcárt</unitPattern>
 				<unitPattern count="other">{0} cárt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>piontaí</displayName>
+				<unitPattern count="one">{0} phionta</unitPattern>
+				<unitPattern count="two">{0} phionta</unitPattern>
+				<unitPattern count="few">{0} phionta</unitPattern>
+				<unitPattern count="many">{0} bpionta</unitPattern>
+				<unitPattern count="other">{0} pionta</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cupáin</displayName>
+				<unitPattern count="one">{0} chupán</unitPattern>
+				<unitPattern count="two">{0} chupán</unitPattern>
+				<unitPattern count="few">{0} chupán</unitPattern>
+				<unitPattern count="many">{0} gcupán</unitPattern>
+				<unitPattern count="other">{0} cupán</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>unsaí leachtacha</displayName>
+				<unitPattern count="one">{0} unsa leachtach</unitPattern>
+				<unitPattern count="two">{0} unsa leachtacha</unitPattern>
+				<unitPattern count="few">{0} unsa leachtacha</unitPattern>
+				<unitPattern count="many">{0} n-unsa leachtacha</unitPattern>
+				<unitPattern count="other">{0} unsa leachtach</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>spúnóga boird</displayName>
 				<unitPattern count="one">{0} spúnóg bhoird</unitPattern>
@@ -7440,8 +7732,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} dtaespúnóg</unitPattern>
 				<unitPattern count="other">{0} taespúnóg</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}O</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}T</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}D</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}I</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>g-fhórsa</displayName>
 				<unitPattern count="one">{0} G</unitPattern>
@@ -7458,6 +7759,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>imr</displayName>
+				<unitPattern count="one">{0} imr</unitPattern>
+				<unitPattern count="two">{0} imr</unitPattern>
+				<unitPattern count="few">{0} imr</unitPattern>
+				<unitPattern count="many">{0} imr</unitPattern>
+				<unitPattern count="other">{0} imr</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>raidiain</displayName>
+				<unitPattern count="one">{0} raid</unitPattern>
+				<unitPattern count="two">{0} raid</unitPattern>
+				<unitPattern count="few">{0} raid</unitPattern>
+				<unitPattern count="many">{0} raid</unitPattern>
+				<unitPattern count="other">{0} raid</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>céimeanna</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="two">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>nóiméid stua</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
@@ -7474,29 +7799,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>céimeanna</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="two">{0}°</unitPattern>
-				<unitPattern count="few">{0}°</unitPattern>
-				<unitPattern count="many">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>raidiain</displayName>
-				<unitPattern count="one">{0} raid</unitPattern>
-				<unitPattern count="two">{0} raid</unitPattern>
-				<unitPattern count="few">{0} raid</unitPattern>
-				<unitPattern count="many">{0} raid</unitPattern>
-				<unitPattern count="other">{0} raid</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>acraí</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="two">{0} ac</unitPattern>
-				<unitPattern count="few">{0} ac</unitPattern>
-				<unitPattern count="many">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="two">{0} km²</unitPattern>
+				<unitPattern count="few">{0} km²</unitPattern>
+				<unitPattern count="many">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>heicteáir</displayName>
@@ -7506,6 +7815,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="two">{0} m²</unitPattern>
+				<unitPattern count="few">{0} m²</unitPattern>
+				<unitPattern count="many">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
@@ -7513,6 +7831,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} cm²</unitPattern>
 				<unitPattern count="many">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mílte²</displayName>
+				<unitPattern count="one">{0} mhíle²</unitPattern>
+				<unitPattern count="two">{0} mhíle²</unitPattern>
+				<unitPattern count="few">{0} mhíle²</unitPattern>
+				<unitPattern count="many">{0} míle²</unitPattern>
+				<unitPattern count="other">{0} míle²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acraí</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="two">{0} ac</unitPattern>
+				<unitPattern count="few">{0} ac</unitPattern>
+				<unitPattern count="many">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>slata²</displayName>
+				<unitPattern count="one">{0} sl²</unitPattern>
+				<unitPattern count="two">{0} sl²</unitPattern>
+				<unitPattern count="few">{0} sl²</unitPattern>
+				<unitPattern count="many">{0} sl²</unitPattern>
+				<unitPattern count="other">{0} sl²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>tr²</displayName>
@@ -7529,38 +7872,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} or²</unitPattern>
 				<unitPattern count="many">{0} or²</unitPattern>
 				<unitPattern count="other">{0} or²</unitPattern>
+				<perUnitPattern>{0}/or²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="two">{0} km²</unitPattern>
-				<unitPattern count="few">{0} km²</unitPattern>
-				<unitPattern count="many">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="two">{0} m²</unitPattern>
-				<unitPattern count="few">{0} m²</unitPattern>
-				<unitPattern count="many">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mílte²</displayName>
-				<unitPattern count="one">{0} mhíle²</unitPattern>
-				<unitPattern count="two">{0} mhíle²</unitPattern>
-				<unitPattern count="few">{0} mhíle²</unitPattern>
-				<unitPattern count="many">{0} míle²</unitPattern>
-				<unitPattern count="other">{0} míle²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>slata²</displayName>
-				<unitPattern count="one">{0} sl²</unitPattern>
-				<unitPattern count="two">{0} sl²</unitPattern>
-				<unitPattern count="few">{0} sl²</unitPattern>
-				<unitPattern count="many">{0} sl²</unitPattern>
-				<unitPattern count="other">{0} sl²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="two">{0} kt</unitPattern>
+				<unitPattern count="few">{0} kt</unitPattern>
+				<unitPattern count="many">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>lítir/km</displayName>
@@ -7570,6 +7890,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} l/km</unitPattern>
 				<unitPattern count="other">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100km</displayName>
+				<unitPattern count="one">{0} l/100km</unitPattern>
+				<unitPattern count="two">{0} l/100km</unitPattern>
+				<unitPattern count="few">{0} l/100km</unitPattern>
+				<unitPattern count="many">{0} l/100km</unitPattern>
+				<unitPattern count="other">{0} l/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mílte/gal</displayName>
 				<unitPattern count="one">{0} mhíle/gal</unitPattern>
@@ -7578,78 +7906,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} míle/gal</unitPattern>
 				<unitPattern count="other">{0} míle/gal</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>giotán</displayName>
-				<unitPattern count="one">{0} ghiotán</unitPattern>
-				<unitPattern count="two">{0} ghiotán</unitPattern>
-				<unitPattern count="few">{0} ghiotán</unitPattern>
-				<unitPattern count="many">{0} ngiotán</unitPattern>
-				<unitPattern count="other">{0} giotán</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bearta</displayName>
-				<unitPattern count="one">{0} bheart</unitPattern>
-				<unitPattern count="two">{0} bheart</unitPattern>
-				<unitPattern count="few">{0} bheart</unitPattern>
-				<unitPattern count="many">{0} mbeart</unitPattern>
-				<unitPattern count="other">{0} beart</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="two">{0} Gb</unitPattern>
-				<unitPattern count="few">{0} Gb</unitPattern>
-				<unitPattern count="many">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="two">{0} GB</unitPattern>
-				<unitPattern count="few">{0} GB</unitPattern>
-				<unitPattern count="many">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="two">{0} kb</unitPattern>
-				<unitPattern count="few">{0} kb</unitPattern>
-				<unitPattern count="many">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="two">{0} kB</unitPattern>
-				<unitPattern count="few">{0} kB</unitPattern>
-				<unitPattern count="many">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="two">{0} Mb</unitPattern>
-				<unitPattern count="few">{0} Mb</unitPattern>
-				<unitPattern count="many">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="two">{0} MB</unitPattern>
-				<unitPattern count="few">{0} MB</unitPattern>
-				<unitPattern count="many">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="two">{0} Tb</unitPattern>
-				<unitPattern count="few">{0} Tb</unitPattern>
-				<unitPattern count="many">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
@@ -7658,6 +7914,113 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="two">{0} Tb</unitPattern>
+				<unitPattern count="few">{0} Tb</unitPattern>
+				<unitPattern count="many">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="two">{0} GB</unitPattern>
+				<unitPattern count="few">{0} GB</unitPattern>
+				<unitPattern count="many">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="two">{0} Gb</unitPattern>
+				<unitPattern count="few">{0} Gb</unitPattern>
+				<unitPattern count="many">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="two">{0} MB</unitPattern>
+				<unitPattern count="few">{0} MB</unitPattern>
+				<unitPattern count="many">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="two">{0} Mb</unitPattern>
+				<unitPattern count="few">{0} Mb</unitPattern>
+				<unitPattern count="many">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="two">{0} kB</unitPattern>
+				<unitPattern count="few">{0} kB</unitPattern>
+				<unitPattern count="many">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="two">{0} kb</unitPattern>
+				<unitPattern count="few">{0} kb</unitPattern>
+				<unitPattern count="many">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bearta</displayName>
+				<unitPattern count="one">{0} bheart</unitPattern>
+				<unitPattern count="two">{0} bheart</unitPattern>
+				<unitPattern count="few">{0} bheart</unitPattern>
+				<unitPattern count="many">{0} mbeart</unitPattern>
+				<unitPattern count="other">{0} beart</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>giotán</displayName>
+				<unitPattern count="one">{0} ghiotán</unitPattern>
+				<unitPattern count="two">{0} ghiotán</unitPattern>
+				<unitPattern count="few">{0} ghiotán</unitPattern>
+				<unitPattern count="many">{0} ngiotán</unitPattern>
+				<unitPattern count="other">{0} giotán</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>c</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="two">{0} c</unitPattern>
+				<unitPattern count="few">{0} c</unitPattern>
+				<unitPattern count="many">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>blianta</displayName>
+				<unitPattern count="one">{0} bhl</unitPattern>
+				<unitPattern count="two">{0} bhl</unitPattern>
+				<unitPattern count="few">{0} bl</unitPattern>
+				<unitPattern count="many">{0} mbl</unitPattern>
+				<unitPattern count="other">{0} bl</unitPattern>
+				<perUnitPattern>{0}/bl</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>míonna</displayName>
+				<unitPattern count="one">{0} mhí</unitPattern>
+				<unitPattern count="two">{0} mhí</unitPattern>
+				<unitPattern count="few">{0} mhí</unitPattern>
+				<unitPattern count="many">{0} mí</unitPattern>
+				<unitPattern count="other">{0} mí</unitPattern>
+				<perUnitPattern>{0}/mí</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>scht</displayName>
+				<unitPattern count="one">{0} scht</unitPattern>
+				<unitPattern count="two">{0} scht</unitPattern>
+				<unitPattern count="few">{0} scht</unitPattern>
+				<unitPattern count="many">{0} scht</unitPattern>
+				<unitPattern count="other">{0} scht</unitPattern>
+				<perUnitPattern>{0}/scht</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>lá</displayName>
 				<unitPattern count="one">{0} lá</unitPattern>
@@ -7665,6 +8028,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} lá</unitPattern>
 				<unitPattern count="many">{0} lá</unitPattern>
 				<unitPattern count="other">{0} lá</unitPattern>
+				<perUnitPattern>{0}/lá</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>uair</displayName>
@@ -7675,22 +8039,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} u</unitPattern>
 				<perUnitPattern>{0}/u</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="two">{0} μs</unitPattern>
-				<unitPattern count="few">{0} μs</unitPattern>
-				<unitPattern count="many">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>msoic</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="two">{0} ms</unitPattern>
-				<unitPattern count="few">{0} ms</unitPattern>
-				<unitPattern count="many">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>nóim</displayName>
 				<unitPattern count="one">{0} nóim</unitPattern>
@@ -7698,22 +8046,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} nóim</unitPattern>
 				<unitPattern count="many">{0} nóim</unitPattern>
 				<unitPattern count="other">{0} nóim</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>míonna</displayName>
-				<unitPattern count="one">{0} mhí</unitPattern>
-				<unitPattern count="two">{0} mhí</unitPattern>
-				<unitPattern count="few">{0} mhí</unitPattern>
-				<unitPattern count="many">{0} mí</unitPattern>
-				<unitPattern count="other">{0} mí</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="two">{0} ns</unitPattern>
-				<unitPattern count="few">{0} ns</unitPattern>
-				<unitPattern count="many">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/nóim</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>soic</displayName>
@@ -7724,21 +8057,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} soic</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>scht</displayName>
-				<unitPattern count="one">{0} scht</unitPattern>
-				<unitPattern count="two">{0} scht</unitPattern>
-				<unitPattern count="few">{0} scht</unitPattern>
-				<unitPattern count="many">{0} scht</unitPattern>
-				<unitPattern count="other">{0} scht</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>msoic</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="two">{0} ms</unitPattern>
+				<unitPattern count="few">{0} ms</unitPattern>
+				<unitPattern count="many">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>blianta</displayName>
-				<unitPattern count="one">{0} bhl</unitPattern>
-				<unitPattern count="two">{0} bhl</unitPattern>
-				<unitPattern count="few">{0} bl</unitPattern>
-				<unitPattern count="many">{0} mbl</unitPattern>
-				<unitPattern count="other">{0} bl</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="two">{0} μs</unitPattern>
+				<unitPattern count="few">{0} μs</unitPattern>
+				<unitPattern count="many">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="two">{0} ns</unitPattern>
+				<unitPattern count="few">{0} ns</unitPattern>
+				<unitPattern count="many">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>aimpéir</displayName>
@@ -7772,6 +8113,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="two">{0} kcal</unitPattern>
+				<unitPattern count="few">{0} kcal</unitPattern>
+				<unitPattern count="many">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -7788,22 +8137,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} Cal</unitPattern>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>giúil</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="two">{0} J</unitPattern>
-				<unitPattern count="few">{0} J</unitPattern>
-				<unitPattern count="many">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="two">{0} kcal</unitPattern>
-				<unitPattern count="few">{0} kcal</unitPattern>
-				<unitPattern count="many">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>ciligiúl</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
@@ -7812,6 +8145,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>giúil</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="two">{0} J</unitPattern>
+				<unitPattern count="few">{0} J</unitPattern>
+				<unitPattern count="many">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kW-uair</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -7828,13 +8169,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="two">{0} Hz</unitPattern>
-				<unitPattern count="few">{0} Hz</unitPattern>
-				<unitPattern count="many">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="two">{0} MHz</unitPattern>
+				<unitPattern count="few">{0} MHz</unitPattern>
+				<unitPattern count="many">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
@@ -7844,29 +8185,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="two">{0} MHz</unitPattern>
-				<unitPattern count="few">{0} MHz</unitPattern>
-				<unitPattern count="many">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="two">{0} Hz</unitPattern>
+				<unitPattern count="few">{0} Hz</unitPattern>
+				<unitPattern count="many">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>AR</displayName>
-				<unitPattern count="one">{0} AR</unitPattern>
-				<unitPattern count="two">{0} AR</unitPattern>
-				<unitPattern count="few">{0} AR</unitPattern>
-				<unitPattern count="many">{0} AR</unitPattern>
-				<unitPattern count="other">{0} AR</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="two">{0} km</unitPattern>
+				<unitPattern count="few">{0} km</unitPattern>
+				<unitPattern count="many">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="two">{0} cm</unitPattern>
-				<unitPattern count="few">{0} cm</unitPattern>
-				<unitPattern count="many">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>méadair</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="two">{0} m</unitPattern>
+				<unitPattern count="few">{0} m</unitPattern>
+				<unitPattern count="many">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
@@ -7876,72 +8219,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName>feánna</displayName>
-			</unit>
-			<unit type="length-foot">
-				<displayName>troithe</displayName>
-				<unitPattern count="one">{0} tr.</unitPattern>
-				<unitPattern count="two">{0} thr.</unitPattern>
-				<unitPattern count="few">{0} thr.</unitPattern>
-				<unitPattern count="many">{0} dtr.</unitPattern>
-				<unitPattern count="other">{0} tr.</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>staideanna</displayName>
-				<unitPattern count="one">{0} st</unitPattern>
-				<unitPattern count="two">{0} st</unitPattern>
-				<unitPattern count="few">{0} st</unitPattern>
-				<unitPattern count="many">{0} st</unitPattern>
-				<unitPattern count="other">{0} st</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>orlaí</displayName>
-				<unitPattern count="one">{0} or.</unitPattern>
-				<unitPattern count="two">{0} or.</unitPattern>
-				<unitPattern count="few">{0} or.</unitPattern>
-				<unitPattern count="many">{0} n-or.</unitPattern>
-				<unitPattern count="other">{0} or.</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="two">{0} km</unitPattern>
-				<unitPattern count="few">{0} km</unitPattern>
-				<unitPattern count="many">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>solasbhl.</displayName>
-				<unitPattern count="one">{0} sbh</unitPattern>
-				<unitPattern count="two">{0} sbh</unitPattern>
-				<unitPattern count="few">{0} sbh</unitPattern>
-				<unitPattern count="many">{0} sbh</unitPattern>
-				<unitPattern count="other">{0} sbh</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>méadair</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="two">{0} m</unitPattern>
-				<unitPattern count="few">{0} m</unitPattern>
-				<unitPattern count="many">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µméadair</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="two">{0} µm</unitPattern>
-				<unitPattern count="few">{0} µm</unitPattern>
-				<unitPattern count="many">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mílte</displayName>
-				<unitPattern count="one">{0} mhíle</unitPattern>
-				<unitPattern count="two">{0} mhíle</unitPattern>
-				<unitPattern count="few">{0} mhíle</unitPattern>
-				<unitPattern count="many">{0} míle</unitPattern>
-				<unitPattern count="other">{0} míle</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="two">{0} cm</unitPattern>
+				<unitPattern count="few">{0} cm</unitPattern>
+				<unitPattern count="many">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -7951,6 +8236,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µméadair</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="two">{0} µm</unitPattern>
+				<unitPattern count="few">{0} µm</unitPattern>
+				<unitPattern count="many">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
@@ -7959,22 +8252,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>muirmh.</displayName>
-				<unitPattern count="one">{0} mhuirmh.</unitPattern>
-				<unitPattern count="two">{0} mhuirmh.</unitPattern>
-				<unitPattern count="few">{0} mhuirmh.</unitPattern>
-				<unitPattern count="many">{0} muirmh.</unitPattern>
-				<unitPattern count="other">{0} muirmh.</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="two">{0} pc</unitPattern>
-				<unitPattern count="few">{0} pc</unitPattern>
-				<unitPattern count="many">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
@@ -7983,6 +8260,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mílte</displayName>
+				<unitPattern count="one">{0} mhíle</unitPattern>
+				<unitPattern count="two">{0} mhíle</unitPattern>
+				<unitPattern count="few">{0} mhíle</unitPattern>
+				<unitPattern count="many">{0} míle</unitPattern>
+				<unitPattern count="other">{0} míle</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>slata</displayName>
 				<unitPattern count="one">{0} sl.</unitPattern>
@@ -7991,6 +8276,75 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} sl.</unitPattern>
 				<unitPattern count="other">{0} sl.</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>troithe</displayName>
+				<unitPattern count="one">{0} tr.</unitPattern>
+				<unitPattern count="two">{0} thr.</unitPattern>
+				<unitPattern count="few">{0} thr.</unitPattern>
+				<unitPattern count="many">{0} dtr.</unitPattern>
+				<unitPattern count="other">{0} tr.</unitPattern>
+				<perUnitPattern>{0}/tr.</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>orlaí</displayName>
+				<unitPattern count="one">{0} or.</unitPattern>
+				<unitPattern count="two">{0} or.</unitPattern>
+				<unitPattern count="few">{0} or.</unitPattern>
+				<unitPattern count="many">{0} n-or.</unitPattern>
+				<unitPattern count="other">{0} or.</unitPattern>
+				<perUnitPattern>{0}/or.</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="two">{0} pc</unitPattern>
+				<unitPattern count="few">{0} pc</unitPattern>
+				<unitPattern count="many">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>solasbhl.</displayName>
+				<unitPattern count="one">{0} sbh</unitPattern>
+				<unitPattern count="two">{0} sbh</unitPattern>
+				<unitPattern count="few">{0} sbh</unitPattern>
+				<unitPattern count="many">{0} sbh</unitPattern>
+				<unitPattern count="other">{0} sbh</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>AR</displayName>
+				<unitPattern count="one">{0} AR</unitPattern>
+				<unitPattern count="two">{0} AR</unitPattern>
+				<unitPattern count="few">{0} AR</unitPattern>
+				<unitPattern count="many">{0} AR</unitPattern>
+				<unitPattern count="other">{0} AR</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>staideanna</displayName>
+				<unitPattern count="one">{0} st</unitPattern>
+				<unitPattern count="two">{0} st</unitPattern>
+				<unitPattern count="few">{0} st</unitPattern>
+				<unitPattern count="many">{0} st</unitPattern>
+				<unitPattern count="other">{0} st</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>feánna</displayName>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>muirmh.</displayName>
+				<unitPattern count="one">{0} mhuirmh.</unitPattern>
+				<unitPattern count="two">{0} mhuirmh.</unitPattern>
+				<unitPattern count="few">{0} mhuirmh.</unitPattern>
+				<unitPattern count="many">{0} muirmh.</unitPattern>
+				<unitPattern count="other">{0} muirmh.</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>míle Lochl.</displayName>
+				<unitPattern count="one">{0} míle Lch</unitPattern>
+				<unitPattern count="two">{0} mhíle Lch</unitPattern>
+				<unitPattern count="few">{0} mhíle Lch</unitPattern>
+				<unitPattern count="many">{0} míle Lch</unitPattern>
+				<unitPattern count="other">{0} míle Lch</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lucsa</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
@@ -7999,30 +8353,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>carait</displayName>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="two">{0} CD</unitPattern>
-				<unitPattern count="few">{0} CD</unitPattern>
-				<unitPattern count="many">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>graim</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="two">{0} g</unitPattern>
-				<unitPattern count="few">{0} g</unitPattern>
-				<unitPattern count="many">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="two">{0} kg</unitPattern>
-				<unitPattern count="few">{0} kg</unitPattern>
-				<unitPattern count="many">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
@@ -8031,13 +8361,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="two">{0} µg</unitPattern>
-				<unitPattern count="few">{0} µg</unitPattern>
-				<unitPattern count="many">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="two">{0} kg</unitPattern>
+				<unitPattern count="few">{0} kg</unitPattern>
+				<unitPattern count="many">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>graim</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="two">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="many">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
@@ -8047,37 +8387,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>unsa</displayName>
-				<unitPattern count="one">{0} unsa</unitPattern>
-				<unitPattern count="two">{0} unsa</unitPattern>
-				<unitPattern count="few">{0} unsa</unitPattern>
-				<unitPattern count="many">{0} n-unsa</unitPattern>
-				<unitPattern count="other">{0} unsa</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>unsa t</displayName>
-				<unitPattern count="one">{0} unsa t</unitPattern>
-				<unitPattern count="two">{0} unsa t</unitPattern>
-				<unitPattern count="few">{0} unsa t</unitPattern>
-				<unitPattern count="many">{0} n-unsa t</unitPattern>
-				<unitPattern count="other">{0} unsa t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>puint</displayName>
-				<unitPattern count="one">{0} phunt</unitPattern>
-				<unitPattern count="two">{0} phunt</unitPattern>
-				<unitPattern count="few">{0} phunt</unitPattern>
-				<unitPattern count="many">{0} bpunt</unitPattern>
-				<unitPattern count="other">{0} punt</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>clocha</displayName>
-				<unitPattern count="one">{0} chl.</unitPattern>
-				<unitPattern count="two">{0} chl.</unitPattern>
-				<unitPattern count="few">{0} chl.</unitPattern>
-				<unitPattern count="many">{0} gcl.</unitPattern>
-				<unitPattern count="other">{0} cloch</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="two">{0} µg</unitPattern>
+				<unitPattern count="few">{0} µg</unitPattern>
+				<unitPattern count="many">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tonnaí gearra</displayName>
@@ -8087,6 +8403,48 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} t.g.</unitPattern>
 				<unitPattern count="other">{0} t.g.</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName>clocha</displayName>
+				<unitPattern count="one">{0} chl.</unitPattern>
+				<unitPattern count="two">{0} chl.</unitPattern>
+				<unitPattern count="few">{0} chl.</unitPattern>
+				<unitPattern count="many">{0} gcl.</unitPattern>
+				<unitPattern count="other">{0} cl.</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>puint</displayName>
+				<unitPattern count="one">{0} phunt</unitPattern>
+				<unitPattern count="two">{0} phunt</unitPattern>
+				<unitPattern count="few">{0} phunt</unitPattern>
+				<unitPattern count="many">{0} bpunt</unitPattern>
+				<unitPattern count="other">{0} punt</unitPattern>
+				<perUnitPattern>{0}/punt</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>unsa</displayName>
+				<unitPattern count="one">{0} unsa</unitPattern>
+				<unitPattern count="two">{0} unsa</unitPattern>
+				<unitPattern count="few">{0} unsa</unitPattern>
+				<unitPattern count="many">{0} n-unsa</unitPattern>
+				<unitPattern count="other">{0} unsa</unitPattern>
+				<perUnitPattern>{0}/unsa</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>unsa t</displayName>
+				<unitPattern count="one">{0} unsa t</unitPattern>
+				<unitPattern count="two">{0} unsa t</unitPattern>
+				<unitPattern count="few">{0} unsa t</unitPattern>
+				<unitPattern count="many">{0} n-unsa t</unitPattern>
+				<unitPattern count="other">{0} unsa t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>carait</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="two">{0} CD</unitPattern>
+				<unitPattern count="few">{0} CD</unitPattern>
+				<unitPattern count="many">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
@@ -8095,22 +8453,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>ec</displayName>
-				<unitPattern count="one">{0} ec</unitPattern>
-				<unitPattern count="two">{0} ec</unitPattern>
-				<unitPattern count="few">{0} ec</unitPattern>
-				<unitPattern count="many">{0} ec</unitPattern>
-				<unitPattern count="other">{0} ec</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="two">{0} kW</unitPattern>
-				<unitPattern count="few">{0} kW</unitPattern>
-				<unitPattern count="many">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
@@ -8119,13 +8461,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="two">{0} mW</unitPattern>
-				<unitPattern count="few">{0} mW</unitPattern>
-				<unitPattern count="many">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="two">{0} kW</unitPattern>
+				<unitPattern count="few">{0} kW</unitPattern>
+				<unitPattern count="many">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>vataí</displayName>
@@ -8135,6 +8477,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="two">{0} mW</unitPattern>
+				<unitPattern count="few">{0} mW</unitPattern>
+				<unitPattern count="many">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>ec</displayName>
+				<unitPattern count="one">{0} ec</unitPattern>
+				<unitPattern count="two">{0} ec</unitPattern>
+				<unitPattern count="few">{0} ec</unitPattern>
+				<unitPattern count="many">{0} ec</unitPattern>
+				<unitPattern count="other">{0} ec</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
@@ -8143,22 +8501,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>orlaí Hg</displayName>
-				<unitPattern count="one">{0} or. Hg</unitPattern>
-				<unitPattern count="two">{0} or. Hg</unitPattern>
-				<unitPattern count="few">{0} or. Hg</unitPattern>
-				<unitPattern count="many">{0} n-or. Hg</unitPattern>
-				<unitPattern count="other">{0} or. Hg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="two">{0} mbar</unitPattern>
-				<unitPattern count="few">{0} mbar</unitPattern>
-				<unitPattern count="many">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -8175,13 +8517,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} psoc</unitPattern>
 				<unitPattern count="other">{0} psoc</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="two">{0} kt</unitPattern>
-				<unitPattern count="few">{0} kt</unitPattern>
-				<unitPattern count="many">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>orlaí Hg</displayName>
+				<unitPattern count="one">{0} or. Hg</unitPattern>
+				<unitPattern count="two">{0} or. Hg</unitPattern>
+				<unitPattern count="few">{0} or. Hg</unitPattern>
+				<unitPattern count="many">{0} n-or. Hg</unitPattern>
+				<unitPattern count="other">{0} or. Hg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="two">{0} mbar</unitPattern>
+				<unitPattern count="few">{0} mbar</unitPattern>
+				<unitPattern count="many">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/uair</displayName>
@@ -8207,6 +8557,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} msu</unitPattern>
 				<unitPattern count="other">{0} msu</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>muirmh/u</displayName>
+				<unitPattern count="one">{0} mhuirmh/u</unitPattern>
+				<unitPattern count="two">{0} mhuirmh/u</unitPattern>
+				<unitPattern count="few">{0} mhuirmh/u</unitPattern>
+				<unitPattern count="many">{0} muirmh/u</unitPattern>
+				<unitPattern count="other">{0} muirmh/u</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="two">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -8231,49 +8597,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>acra-tr</displayName>
-				<unitPattern count="one">{0} ac tr</unitPattern>
-				<unitPattern count="two">{0} ac tr</unitPattern>
-				<unitPattern count="few">{0} ac tr</unitPattern>
-				<unitPattern count="many">{0} ac tr</unitPattern>
-				<unitPattern count="other">{0} ac tr</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>buiséil</displayName>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="two">{0} cl</unitPattern>
-				<unitPattern count="few">{0} cl</unitPattern>
-				<unitPattern count="many">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="two">{0} cm³</unitPattern>
-				<unitPattern count="few">{0} cm³</unitPattern>
-				<unitPattern count="many">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>tr³</displayName>
-				<unitPattern count="one">{0} tr³</unitPattern>
-				<unitPattern count="two">{0} tr³</unitPattern>
-				<unitPattern count="few">{0} tr³</unitPattern>
-				<unitPattern count="many">{0} tr³</unitPattern>
-				<unitPattern count="other">{0} tr³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>orlach³</displayName>
-				<unitPattern count="one">{0} or³</unitPattern>
-				<unitPattern count="two">{0} or³</unitPattern>
-				<unitPattern count="few">{0} or³</unitPattern>
-				<unitPattern count="many">{0} or³</unitPattern>
-				<unitPattern count="other">{0} or³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -8289,6 +8612,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} m³</unitPattern>
 				<unitPattern count="many">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="two">{0} cm³</unitPattern>
+				<unitPattern count="few">{0} cm³</unitPattern>
+				<unitPattern count="many">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>míle³</displayName>
@@ -8306,37 +8639,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} sl³</unitPattern>
 				<unitPattern count="other">{0} sl³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>cupáin</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="two">{0} c</unitPattern>
-				<unitPattern count="few">{0} c</unitPattern>
-				<unitPattern count="many">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>tr³</displayName>
+				<unitPattern count="one">{0} tr³</unitPattern>
+				<unitPattern count="two">{0} tr³</unitPattern>
+				<unitPattern count="few">{0} tr³</unitPattern>
+				<unitPattern count="many">{0} tr³</unitPattern>
+				<unitPattern count="other">{0} tr³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="two">{0} dl</unitPattern>
-				<unitPattern count="few">{0} dl</unitPattern>
-				<unitPattern count="many">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>orlach³</displayName>
+				<unitPattern count="one">{0} or³</unitPattern>
+				<unitPattern count="two">{0} or³</unitPattern>
+				<unitPattern count="few">{0} or³</unitPattern>
+				<unitPattern count="many">{0} or³</unitPattern>
+				<unitPattern count="other">{0} or³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>unsaí leacht.</displayName>
-				<unitPattern count="one">{0} unsa l.</unitPattern>
-				<unitPattern count="two">{0} unsa l.</unitPattern>
-				<unitPattern count="few">{0} unsa l.</unitPattern>
-				<unitPattern count="many">{0} n-unsa l.</unitPattern>
-				<unitPattern count="other">{0} unsa l.</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>galúin</displayName>
-				<unitPattern count="one">{0} ghal.</unitPattern>
-				<unitPattern count="two">{0} ghal.</unitPattern>
-				<unitPattern count="few">{0} ghal.</unitPattern>
-				<unitPattern count="many">{0} ngal.</unitPattern>
-				<unitPattern count="other">{0} gal.</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="two">{0} Ml</unitPattern>
+				<unitPattern count="few">{0} Ml</unitPattern>
+				<unitPattern count="many">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -8353,14 +8678,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} l</unitPattern>
 				<unitPattern count="many">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="one">{0} Ml</unitPattern>
-				<unitPattern count="two">{0} Ml</unitPattern>
-				<unitPattern count="few">{0} Ml</unitPattern>
-				<unitPattern count="many">{0} Ml</unitPattern>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="two">{0} dl</unitPattern>
+				<unitPattern count="few">{0} dl</unitPattern>
+				<unitPattern count="many">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="one">{0} cL</unitPattern>
+				<unitPattern count="two">{0} cL</unitPattern>
+				<unitPattern count="few">{0} cL</unitPattern>
+				<unitPattern count="many">{0} cL</unitPattern>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
@@ -8370,13 +8704,41 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>piontaí</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="two">{0} pt</unitPattern>
-				<unitPattern count="few">{0} pt</unitPattern>
-				<unitPattern count="many">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="two">{0} mpt</unitPattern>
+				<unitPattern count="few">{0} mpt</unitPattern>
+				<unitPattern count="many">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>cupán méadr.</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="two">{0} mc</unitPattern>
+				<unitPattern count="few">{0} mc</unitPattern>
+				<unitPattern count="many">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acra-tr</displayName>
+				<unitPattern count="one">{0} ac tr</unitPattern>
+				<unitPattern count="two">{0} ac tr</unitPattern>
+				<unitPattern count="few">{0} ac tr</unitPattern>
+				<unitPattern count="many">{0} ac tr</unitPattern>
+				<unitPattern count="other">{0} ac tr</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>buiséil</displayName>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galúin</displayName>
+				<unitPattern count="one">{0} ghal.</unitPattern>
+				<unitPattern count="two">{0} ghal.</unitPattern>
+				<unitPattern count="few">{0} ghal.</unitPattern>
+				<unitPattern count="many">{0} ngal.</unitPattern>
+				<unitPattern count="other">{0} gal.</unitPattern>
+				<perUnitPattern>{0}/gal.</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>cáirt</displayName>
@@ -8386,6 +8748,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} gcárt</unitPattern>
 				<unitPattern count="other">{0} cárt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>piontaí</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="two">{0} pt</unitPattern>
+				<unitPattern count="few">{0} pt</unitPattern>
+				<unitPattern count="many">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cupáin</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="two">{0} c</unitPattern>
+				<unitPattern count="few">{0} c</unitPattern>
+				<unitPattern count="many">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>unsaí leacht.</displayName>
+				<unitPattern count="one">{0} unsa l.</unitPattern>
+				<unitPattern count="two">{0} unsa l.</unitPattern>
+				<unitPattern count="few">{0} unsa l.</unitPattern>
+				<unitPattern count="many">{0} n-unsa l.</unitPattern>
+				<unitPattern count="other">{0} unsa l.</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>spbh</displayName>
 				<unitPattern count="one">{0} spbh</unitPattern>
@@ -8402,8 +8788,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} tsp</unitPattern>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}O</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}T</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}D</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}I</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>g-fhórsa</displayName>
 				<unitPattern count="one">{0}G</unitPattern>
@@ -8420,6 +8815,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}m/s²</unitPattern>
 				<unitPattern count="other">{0}m/s²</unitPattern>
 			</unit>
+			<unit type="angle-radian">
+				<displayName>raid</displayName>
+				<unitPattern count="one">{0}raid</unitPattern>
+				<unitPattern count="two">{0}raid</unitPattern>
+				<unitPattern count="few">{0}raid</unitPattern>
+				<unitPattern count="many">{0}raid</unitPattern>
+				<unitPattern count="other">{0}raid</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>céim</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="two">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>nóim. stua</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
@@ -8436,22 +8847,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>céim</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="two">{0}°</unitPattern>
-				<unitPattern count="few">{0}°</unitPattern>
-				<unitPattern count="many">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>raid</displayName>
-				<unitPattern count="one">{0}raid</unitPattern>
-				<unitPattern count="two">{0}raid</unitPattern>
-				<unitPattern count="few">{0}raid</unitPattern>
-				<unitPattern count="many">{0}raid</unitPattern>
-				<unitPattern count="other">{0}raid</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} m²</unitPattern>
 				<unitPattern count="two">{0} m²</unitPattern>
@@ -8459,6 +8854,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} m²</unitPattern>
 				<unitPattern count="other">{0} m²</unitPattern>
 			</unit>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="one">{0}kt</unitPattern>
+				<unitPattern count="two">{0}kt</unitPattern>
+				<unitPattern count="few">{0}kt</unitPattern>
+				<unitPattern count="many">{0}kt</unitPattern>
+				<unitPattern count="other">{0}kt</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0}l/km</unitPattern>
@@ -8467,6 +8870,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}l/km</unitPattern>
 				<unitPattern count="other">{0}l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100km</displayName>
+				<unitPattern count="one">{0}l/100km</unitPattern>
+				<unitPattern count="two">{0}l/100km</unitPattern>
+				<unitPattern count="few">{0}l/100km</unitPattern>
+				<unitPattern count="many">{0}l/100km</unitPattern>
+				<unitPattern count="other">{0}l/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mílte/gal</displayName>
 				<unitPattern count="one">{0}míle/g</unitPattern>
@@ -8475,69 +8886,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}míle/g</unitPattern>
 				<unitPattern count="other">{0}míle/g</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>giotán</displayName>
-				<unitPattern count="one">{0} ghiot.</unitPattern>
-				<unitPattern count="two">{0} ghiot.</unitPattern>
-				<unitPattern count="few">{0} ghiot.</unitPattern>
-				<unitPattern count="many">{0} ngiot.</unitPattern>
-				<unitPattern count="other">{0} giot.</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bearta</displayName>
-				<unitPattern count="one">{0}B</unitPattern>
-				<unitPattern count="two">{0}B</unitPattern>
-				<unitPattern count="few">{0}B</unitPattern>
-				<unitPattern count="many">{0}B</unitPattern>
-				<unitPattern count="other">{0}B</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0}Gb</unitPattern>
-				<unitPattern count="two">{0}Gb</unitPattern>
-				<unitPattern count="few">{0}Gb</unitPattern>
-				<unitPattern count="many">{0}Gb</unitPattern>
-				<unitPattern count="other">{0}Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0}GB</unitPattern>
-				<unitPattern count="two">{0}GB</unitPattern>
-				<unitPattern count="few">{0}GB</unitPattern>
-				<unitPattern count="many">{0}GB</unitPattern>
-				<unitPattern count="other">{0}GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0}kb</unitPattern>
-				<unitPattern count="two">{0}kb</unitPattern>
-				<unitPattern count="few">{0}kb</unitPattern>
-				<unitPattern count="many">{0}kb</unitPattern>
-				<unitPattern count="other">{0}kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0}kB</unitPattern>
-				<unitPattern count="two">{0}kB</unitPattern>
-				<unitPattern count="few">{0}kB</unitPattern>
-				<unitPattern count="many">{0}kB</unitPattern>
-				<unitPattern count="other">{0}kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0}Mb</unitPattern>
-				<unitPattern count="two">{0}Mb</unitPattern>
-				<unitPattern count="few">{0}Mb</unitPattern>
-				<unitPattern count="many">{0}Mb</unitPattern>
-				<unitPattern count="other">{0}Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0}MB</unitPattern>
-				<unitPattern count="two">{0}MB</unitPattern>
-				<unitPattern count="few">{0}MB</unitPattern>
-				<unitPattern count="many">{0}MB</unitPattern>
-				<unitPattern count="other">{0}MB</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>TB</displayName>
+				<unitPattern count="one">{0}TB</unitPattern>
+				<unitPattern count="two">{0}TB</unitPattern>
+				<unitPattern count="few">{0}TB</unitPattern>
+				<unitPattern count="many">{0}TB</unitPattern>
+				<unitPattern count="other">{0}TB</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>Tb</displayName>
@@ -8547,13 +8902,93 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}Tb</unitPattern>
 				<unitPattern count="other">{0}Tb</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>TB</displayName>
-				<unitPattern count="one">{0}TB</unitPattern>
-				<unitPattern count="two">{0}TB</unitPattern>
-				<unitPattern count="few">{0}TB</unitPattern>
-				<unitPattern count="many">{0}TB</unitPattern>
-				<unitPattern count="other">{0}TB</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0}GB</unitPattern>
+				<unitPattern count="two">{0}GB</unitPattern>
+				<unitPattern count="few">{0}GB</unitPattern>
+				<unitPattern count="many">{0}GB</unitPattern>
+				<unitPattern count="other">{0}GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0}Gb</unitPattern>
+				<unitPattern count="two">{0}Gb</unitPattern>
+				<unitPattern count="few">{0}Gb</unitPattern>
+				<unitPattern count="many">{0}Gb</unitPattern>
+				<unitPattern count="other">{0}Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0}MB</unitPattern>
+				<unitPattern count="two">{0}MB</unitPattern>
+				<unitPattern count="few">{0}MB</unitPattern>
+				<unitPattern count="many">{0}MB</unitPattern>
+				<unitPattern count="other">{0}MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0}Mb</unitPattern>
+				<unitPattern count="two">{0}Mb</unitPattern>
+				<unitPattern count="few">{0}Mb</unitPattern>
+				<unitPattern count="many">{0}Mb</unitPattern>
+				<unitPattern count="other">{0}Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0}kB</unitPattern>
+				<unitPattern count="two">{0}kB</unitPattern>
+				<unitPattern count="few">{0}kB</unitPattern>
+				<unitPattern count="many">{0}kB</unitPattern>
+				<unitPattern count="other">{0}kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0}kb</unitPattern>
+				<unitPattern count="two">{0}kb</unitPattern>
+				<unitPattern count="few">{0}kb</unitPattern>
+				<unitPattern count="many">{0}kb</unitPattern>
+				<unitPattern count="other">{0}kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bearta</displayName>
+				<unitPattern count="one">{0}B</unitPattern>
+				<unitPattern count="two">{0}B</unitPattern>
+				<unitPattern count="few">{0}B</unitPattern>
+				<unitPattern count="many">{0}B</unitPattern>
+				<unitPattern count="other">{0}B</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>giotán</displayName>
+				<unitPattern count="one">{0} ghiot.</unitPattern>
+				<unitPattern count="two">{0} ghiot.</unitPattern>
+				<unitPattern count="few">{0} ghiot.</unitPattern>
+				<unitPattern count="many">{0} ngiot.</unitPattern>
+				<unitPattern count="other">{0} giot.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>bl</displayName>
+				<unitPattern count="one">{0}b</unitPattern>
+				<unitPattern count="two">{0}b</unitPattern>
+				<unitPattern count="few">{0}b</unitPattern>
+				<unitPattern count="many">{0}b</unitPattern>
+				<unitPattern count="other">{0}b</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mí</displayName>
+				<unitPattern count="one">{0}m</unitPattern>
+				<unitPattern count="two">{0}m</unitPattern>
+				<unitPattern count="few">{0}m</unitPattern>
+				<unitPattern count="many">{0}m</unitPattern>
+				<unitPattern count="other">{0}m</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>scht</displayName>
+				<unitPattern count="one">{0}s</unitPattern>
+				<unitPattern count="two">{0}s</unitPattern>
+				<unitPattern count="few">{0}s</unitPattern>
+				<unitPattern count="many">{0}s</unitPattern>
+				<unitPattern count="other">{0}s</unitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>lá</displayName>
@@ -8571,21 +9006,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}u</unitPattern>
 				<unitPattern count="other">{0}u</unitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<unitPattern count="one">{0}μs</unitPattern>
-				<unitPattern count="two">{0}μs</unitPattern>
-				<unitPattern count="few">{0}μs</unitPattern>
-				<unitPattern count="many">{0}μs</unitPattern>
-				<unitPattern count="other">{0}μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0}ms</unitPattern>
-				<unitPattern count="two">{0}ms</unitPattern>
-				<unitPattern count="few">{0}ms</unitPattern>
-				<unitPattern count="many">{0}ms</unitPattern>
-				<unitPattern count="other">{0}ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>nóim</displayName>
 				<unitPattern count="one">{0}n</unitPattern>
@@ -8594,21 +9014,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}n</unitPattern>
 				<unitPattern count="other">{0}n</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>mí</displayName>
-				<unitPattern count="one">{0}m</unitPattern>
-				<unitPattern count="two">{0}m</unitPattern>
-				<unitPattern count="few">{0}m</unitPattern>
-				<unitPattern count="many">{0}m</unitPattern>
-				<unitPattern count="other">{0}m</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<unitPattern count="one">{0}ns</unitPattern>
-				<unitPattern count="two">{0}ns</unitPattern>
-				<unitPattern count="few">{0}ns</unitPattern>
-				<unitPattern count="many">{0}ns</unitPattern>
-				<unitPattern count="other">{0}ns</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>soic</displayName>
 				<unitPattern count="one">{0}s</unitPattern>
@@ -8617,21 +9022,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}s</unitPattern>
 				<unitPattern count="other">{0}s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>scht</displayName>
-				<unitPattern count="one">{0}s</unitPattern>
-				<unitPattern count="two">{0}s</unitPattern>
-				<unitPattern count="few">{0}s</unitPattern>
-				<unitPattern count="many">{0}s</unitPattern>
-				<unitPattern count="other">{0}s</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0}ms</unitPattern>
+				<unitPattern count="two">{0}ms</unitPattern>
+				<unitPattern count="few">{0}ms</unitPattern>
+				<unitPattern count="many">{0}ms</unitPattern>
+				<unitPattern count="other">{0}ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>bl</displayName>
-				<unitPattern count="one">{0}b</unitPattern>
-				<unitPattern count="two">{0}b</unitPattern>
-				<unitPattern count="few">{0}b</unitPattern>
-				<unitPattern count="many">{0}b</unitPattern>
-				<unitPattern count="other">{0}b</unitPattern>
+			<unit type="duration-microsecond">
+				<unitPattern count="one">{0}μs</unitPattern>
+				<unitPattern count="two">{0}μs</unitPattern>
+				<unitPattern count="few">{0}μs</unitPattern>
+				<unitPattern count="many">{0}μs</unitPattern>
+				<unitPattern count="other">{0}μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<unitPattern count="one">{0}ns</unitPattern>
+				<unitPattern count="two">{0}ns</unitPattern>
+				<unitPattern count="few">{0}ns</unitPattern>
+				<unitPattern count="many">{0}ns</unitPattern>
+				<unitPattern count="other">{0}ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>aimpéir</displayName>
@@ -8665,6 +9076,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}V</unitPattern>
 				<unitPattern count="other">{0}V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0}kcal</unitPattern>
+				<unitPattern count="two">{0}kcal</unitPattern>
+				<unitPattern count="few">{0}kcal</unitPattern>
+				<unitPattern count="many">{0}kcal</unitPattern>
+				<unitPattern count="other">{0}kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0}cal</unitPattern>
@@ -8681,22 +9100,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}Cal</unitPattern>
 				<unitPattern count="other">{0}Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>giúil</displayName>
-				<unitPattern count="one">{0}J</unitPattern>
-				<unitPattern count="two">{0}J</unitPattern>
-				<unitPattern count="few">{0}J</unitPattern>
-				<unitPattern count="many">{0}J</unitPattern>
-				<unitPattern count="other">{0}J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0}kcal</unitPattern>
-				<unitPattern count="two">{0}kcal</unitPattern>
-				<unitPattern count="few">{0}kcal</unitPattern>
-				<unitPattern count="many">{0}kcal</unitPattern>
-				<unitPattern count="other">{0}kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0}kJ</unitPattern>
@@ -8705,6 +9108,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}kJ</unitPattern>
 				<unitPattern count="other">{0}kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>giúil</displayName>
+				<unitPattern count="one">{0}J</unitPattern>
+				<unitPattern count="two">{0}J</unitPattern>
+				<unitPattern count="few">{0}J</unitPattern>
+				<unitPattern count="many">{0}J</unitPattern>
+				<unitPattern count="other">{0}J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kW-uair</displayName>
 				<unitPattern count="one">{0}kWh</unitPattern>
@@ -8721,13 +9132,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}GHz</unitPattern>
 				<unitPattern count="other">{0}GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0}Hz</unitPattern>
-				<unitPattern count="two">{0}Hz</unitPattern>
-				<unitPattern count="few">{0}Hz</unitPattern>
-				<unitPattern count="many">{0}Hz</unitPattern>
-				<unitPattern count="other">{0}Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0}MHz</unitPattern>
+				<unitPattern count="two">{0}MHz</unitPattern>
+				<unitPattern count="few">{0}MHz</unitPattern>
+				<unitPattern count="many">{0}MHz</unitPattern>
+				<unitPattern count="other">{0}MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
@@ -8737,64 +9148,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}kHz</unitPattern>
 				<unitPattern count="other">{0}kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0}MHz</unitPattern>
-				<unitPattern count="two">{0}MHz</unitPattern>
-				<unitPattern count="few">{0}MHz</unitPattern>
-				<unitPattern count="many">{0}MHz</unitPattern>
-				<unitPattern count="other">{0}MHz</unitPattern>
-			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>AR</displayName>
-				<unitPattern count="one">{0}AR</unitPattern>
-				<unitPattern count="two">{0}AR</unitPattern>
-				<unitPattern count="few">{0}AR</unitPattern>
-				<unitPattern count="many">{0}AR</unitPattern>
-				<unitPattern count="other">{0}AR</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0}cm</unitPattern>
-				<unitPattern count="two">{0}cm</unitPattern>
-				<unitPattern count="few">{0}cm</unitPattern>
-				<unitPattern count="many">{0}cm</unitPattern>
-				<unitPattern count="other">{0}cm</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<displayName>dm</displayName>
-				<unitPattern count="one">{0}dm</unitPattern>
-				<unitPattern count="two">{0}dm</unitPattern>
-				<unitPattern count="few">{0}dm</unitPattern>
-				<unitPattern count="many">{0}dm</unitPattern>
-				<unitPattern count="other">{0}dm</unitPattern>
-			</unit>
-			<unit type="length-fathom">
-				<displayName>feá</displayName>
-			</unit>
-			<unit type="length-foot">
-				<displayName>tr</displayName>
-				<unitPattern count="one">{0}′</unitPattern>
-				<unitPattern count="two">{0}′</unitPattern>
-				<unitPattern count="few">{0}′</unitPattern>
-				<unitPattern count="many">{0}′</unitPattern>
-				<unitPattern count="other">{0}′</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>staid</displayName>
-				<unitPattern count="one">{0}st</unitPattern>
-				<unitPattern count="two">{0}st</unitPattern>
-				<unitPattern count="few">{0}st</unitPattern>
-				<unitPattern count="many">{0}st</unitPattern>
-				<unitPattern count="other">{0}st</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>orlaí</displayName>
-				<unitPattern count="one">{0}″</unitPattern>
-				<unitPattern count="two">{0}″</unitPattern>
-				<unitPattern count="few">{0}″</unitPattern>
-				<unitPattern count="many">{0}″</unitPattern>
-				<unitPattern count="other">{0}″</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0}Hz</unitPattern>
+				<unitPattern count="two">{0}Hz</unitPattern>
+				<unitPattern count="few">{0}Hz</unitPattern>
+				<unitPattern count="many">{0}Hz</unitPattern>
+				<unitPattern count="other">{0}Hz</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
@@ -8804,14 +9164,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}km</unitPattern>
 				<unitPattern count="other">{0}km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<displayName>sbh</displayName>
-				<unitPattern count="one">{0}sbh</unitPattern>
-				<unitPattern count="two">{0}sbh</unitPattern>
-				<unitPattern count="few">{0}sbh</unitPattern>
-				<unitPattern count="many">{0}sbh</unitPattern>
-				<unitPattern count="other">{0}sbh</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>méadar</displayName>
 				<unitPattern count="one">{0}m</unitPattern>
@@ -8820,13 +9172,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}m</unitPattern>
 				<unitPattern count="other">{0}m</unitPattern>
 			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0}µm</unitPattern>
-				<unitPattern count="two">{0}µm</unitPattern>
-				<unitPattern count="few">{0}µm</unitPattern>
-				<unitPattern count="many">{0}µm</unitPattern>
-				<unitPattern count="other">{0}µm</unitPattern>
+			<unit type="length-decimeter">
+				<displayName>dm</displayName>
+				<unitPattern count="one">{0}dm</unitPattern>
+				<unitPattern count="two">{0}dm</unitPattern>
+				<unitPattern count="few">{0}dm</unitPattern>
+				<unitPattern count="many">{0}dm</unitPattern>
+				<unitPattern count="other">{0}dm</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0}cm</unitPattern>
+				<unitPattern count="two">{0}cm</unitPattern>
+				<unitPattern count="few">{0}cm</unitPattern>
+				<unitPattern count="many">{0}cm</unitPattern>
+				<unitPattern count="other">{0}cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -8836,6 +9196,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}mm</unitPattern>
 				<unitPattern count="other">{0}mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0}µm</unitPattern>
+				<unitPattern count="two">{0}µm</unitPattern>
+				<unitPattern count="few">{0}µm</unitPattern>
+				<unitPattern count="many">{0}µm</unitPattern>
+				<unitPattern count="other">{0}µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0}nm</unitPattern>
@@ -8844,21 +9212,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}nm</unitPattern>
 				<unitPattern count="other">{0}nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<unitPattern count="one">{0}mmh.</unitPattern>
-				<unitPattern count="two">{0}mmh.</unitPattern>
-				<unitPattern count="few">{0}mmh.</unitPattern>
-				<unitPattern count="many">{0}mmh.</unitPattern>
-				<unitPattern count="other">{0}mmh.</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0}pc</unitPattern>
-				<unitPattern count="two">{0}pc</unitPattern>
-				<unitPattern count="few">{0}pc</unitPattern>
-				<unitPattern count="many">{0}pc</unitPattern>
-				<unitPattern count="other">{0}pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0}pm</unitPattern>
@@ -8875,6 +9228,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}sl</unitPattern>
 				<unitPattern count="other">{0}sl</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>tr</displayName>
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="two">{0}′</unitPattern>
+				<unitPattern count="few">{0}′</unitPattern>
+				<unitPattern count="many">{0}′</unitPattern>
+				<unitPattern count="other">{0}′</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>orlaí</displayName>
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="two">{0}″</unitPattern>
+				<unitPattern count="few">{0}″</unitPattern>
+				<unitPattern count="many">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0}pc</unitPattern>
+				<unitPattern count="two">{0}pc</unitPattern>
+				<unitPattern count="few">{0}pc</unitPattern>
+				<unitPattern count="many">{0}pc</unitPattern>
+				<unitPattern count="other">{0}pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>sbh</displayName>
+				<unitPattern count="one">{0}sbh</unitPattern>
+				<unitPattern count="two">{0}sbh</unitPattern>
+				<unitPattern count="few">{0}sbh</unitPattern>
+				<unitPattern count="many">{0}sbh</unitPattern>
+				<unitPattern count="other">{0}sbh</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>AR</displayName>
+				<unitPattern count="one">{0}AR</unitPattern>
+				<unitPattern count="two">{0}AR</unitPattern>
+				<unitPattern count="few">{0}AR</unitPattern>
+				<unitPattern count="many">{0}AR</unitPattern>
+				<unitPattern count="other">{0}AR</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>staid</displayName>
+				<unitPattern count="one">{0}st</unitPattern>
+				<unitPattern count="two">{0}st</unitPattern>
+				<unitPattern count="few">{0}st</unitPattern>
+				<unitPattern count="many">{0}st</unitPattern>
+				<unitPattern count="other">{0}st</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>feá</displayName>
+			</unit>
+			<unit type="length-nautical-mile">
+				<unitPattern count="one">{0}mmh.</unitPattern>
+				<unitPattern count="two">{0}mmh.</unitPattern>
+				<unitPattern count="few">{0}mmh.</unitPattern>
+				<unitPattern count="many">{0}mmh.</unitPattern>
+				<unitPattern count="other">{0}mmh.</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lucsa</displayName>
 				<unitPattern count="one">{0}lx</unitPattern>
@@ -8883,30 +9294,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}lx</unitPattern>
 				<unitPattern count="other">{0}lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>carat</displayName>
-				<unitPattern count="one">{0}CD</unitPattern>
-				<unitPattern count="two">{0}CD</unitPattern>
-				<unitPattern count="few">{0}CD</unitPattern>
-				<unitPattern count="many">{0}CD</unitPattern>
-				<unitPattern count="other">{0}CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gram</displayName>
-				<unitPattern count="one">{0}g</unitPattern>
-				<unitPattern count="two">{0}g</unitPattern>
-				<unitPattern count="few">{0}g</unitPattern>
-				<unitPattern count="many">{0}g</unitPattern>
-				<unitPattern count="other">{0}g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0}kg</unitPattern>
-				<unitPattern count="two">{0}kg</unitPattern>
-				<unitPattern count="few">{0}kg</unitPattern>
-				<unitPattern count="many">{0}kg</unitPattern>
-				<unitPattern count="other">{0}kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0}t</unitPattern>
@@ -8915,13 +9302,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}t</unitPattern>
 				<unitPattern count="other">{0}t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0}µg</unitPattern>
-				<unitPattern count="two">{0}µg</unitPattern>
-				<unitPattern count="few">{0}µg</unitPattern>
-				<unitPattern count="many">{0}µg</unitPattern>
-				<unitPattern count="other">{0}µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0}kg</unitPattern>
+				<unitPattern count="two">{0}kg</unitPattern>
+				<unitPattern count="few">{0}kg</unitPattern>
+				<unitPattern count="many">{0}kg</unitPattern>
+				<unitPattern count="other">{0}kg</unitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="one">{0}g</unitPattern>
+				<unitPattern count="two">{0}g</unitPattern>
+				<unitPattern count="few">{0}g</unitPattern>
+				<unitPattern count="many">{0}g</unitPattern>
+				<unitPattern count="other">{0}g</unitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
@@ -8931,9 +9326,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}mg</unitPattern>
 				<unitPattern count="other">{0}mg</unitPattern>
 			</unit>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0}µg</unitPattern>
+				<unitPattern count="two">{0}µg</unitPattern>
+				<unitPattern count="few">{0}µg</unitPattern>
+				<unitPattern count="many">{0}µg</unitPattern>
+				<unitPattern count="other">{0}µg</unitPattern>
+			</unit>
 			<unit type="mass-stone">
 				<displayName>cloch</displayName>
 			</unit>
+			<unit type="mass-carat">
+				<displayName>carat</displayName>
+				<unitPattern count="one">{0}CD</unitPattern>
+				<unitPattern count="two">{0}CD</unitPattern>
+				<unitPattern count="few">{0}CD</unitPattern>
+				<unitPattern count="many">{0}CD</unitPattern>
+				<unitPattern count="other">{0}CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0}GW</unitPattern>
@@ -8942,13 +9353,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}GW</unitPattern>
 				<unitPattern count="other">{0}GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>ec</displayName>
-				<unitPattern count="one">{0}ec</unitPattern>
-				<unitPattern count="two">{0}ec</unitPattern>
-				<unitPattern count="few">{0}ec</unitPattern>
-				<unitPattern count="many">{0}ec</unitPattern>
-				<unitPattern count="other">{0}ec</unitPattern>
+			<unit type="power-megawatt">
+				<displayName>MW</displayName>
+				<unitPattern count="one">{0}MW</unitPattern>
+				<unitPattern count="two">{0}MW</unitPattern>
+				<unitPattern count="few">{0}MW</unitPattern>
+				<unitPattern count="many">{0}MW</unitPattern>
+				<unitPattern count="other">{0}MW</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName>kW</displayName>
@@ -8958,13 +9369,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}kW</unitPattern>
 				<unitPattern count="other">{0}kW</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<displayName>MW</displayName>
-				<unitPattern count="one">{0}MW</unitPattern>
-				<unitPattern count="two">{0}MW</unitPattern>
-				<unitPattern count="few">{0}MW</unitPattern>
-				<unitPattern count="many">{0}MW</unitPattern>
-				<unitPattern count="other">{0}MW</unitPattern>
+			<unit type="power-watt">
+				<displayName>vataí</displayName>
+				<unitPattern count="one">{0}W</unitPattern>
+				<unitPattern count="two">{0}W</unitPattern>
+				<unitPattern count="few">{0}W</unitPattern>
+				<unitPattern count="many">{0}W</unitPattern>
+				<unitPattern count="other">{0}W</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<displayName>mW</displayName>
@@ -8974,13 +9385,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}mW</unitPattern>
 				<unitPattern count="other">{0}mW</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName>vataí</displayName>
-				<unitPattern count="one">{0}W</unitPattern>
-				<unitPattern count="two">{0}W</unitPattern>
-				<unitPattern count="few">{0}W</unitPattern>
-				<unitPattern count="many">{0}W</unitPattern>
-				<unitPattern count="other">{0}W</unitPattern>
+			<unit type="power-horsepower">
+				<displayName>ec</displayName>
+				<unitPattern count="one">{0}ec</unitPattern>
+				<unitPattern count="two">{0}ec</unitPattern>
+				<unitPattern count="few">{0}ec</unitPattern>
+				<unitPattern count="many">{0}ec</unitPattern>
+				<unitPattern count="other">{0}ec</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
@@ -8990,22 +9401,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}hPa</unitPattern>
 				<unitPattern count="other">{0}hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>orlaí Hg</displayName>
-				<unitPattern count="one">{0}&quot; Hg</unitPattern>
-				<unitPattern count="two">{0}&quot; Hg</unitPattern>
-				<unitPattern count="few">{0}&quot; Hg</unitPattern>
-				<unitPattern count="many">{0}&quot; Hg</unitPattern>
-				<unitPattern count="other">{0}&quot; Hg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0}mb</unitPattern>
-				<unitPattern count="two">{0}mb</unitPattern>
-				<unitPattern count="few">{0}mb</unitPattern>
-				<unitPattern count="many">{0}mb</unitPattern>
-				<unitPattern count="other">{0}mb</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0}mmHg</unitPattern>
@@ -9022,13 +9417,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}psoc</unitPattern>
 				<unitPattern count="other">{0}psoc</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="one">{0}kt</unitPattern>
-				<unitPattern count="two">{0}kt</unitPattern>
-				<unitPattern count="few">{0}kt</unitPattern>
-				<unitPattern count="many">{0}kt</unitPattern>
-				<unitPattern count="other">{0}kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>orlaí Hg</displayName>
+				<unitPattern count="one">{0}&quot; Hg</unitPattern>
+				<unitPattern count="two">{0}&quot; Hg</unitPattern>
+				<unitPattern count="few">{0}&quot; Hg</unitPattern>
+				<unitPattern count="many">{0}&quot; Hg</unitPattern>
+				<unitPattern count="other">{0}&quot; Hg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0}mb</unitPattern>
+				<unitPattern count="two">{0}mb</unitPattern>
+				<unitPattern count="few">{0}mb</unitPattern>
+				<unitPattern count="many">{0}mb</unitPattern>
+				<unitPattern count="other">{0}mb</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/u</displayName>
@@ -9078,8 +9481,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}K</unitPattern>
 				<unitPattern count="other">{0}K</unitPattern>
 			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
+			<unit type="volume-cubic-kilometer">
+				<displayName>km³</displayName>
+				<unitPattern count="one">{0}km³</unitPattern>
+				<unitPattern count="two">{0}km³</unitPattern>
+				<unitPattern count="few">{0}km³</unitPattern>
+				<unitPattern count="many">{0}km³</unitPattern>
+				<unitPattern count="other">{0}km³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>m³</displayName>
+				<unitPattern count="one">{0}m³</unitPattern>
+				<unitPattern count="two">{0}m³</unitPattern>
+				<unitPattern count="few">{0}m³</unitPattern>
+				<unitPattern count="many">{0}m³</unitPattern>
+				<unitPattern count="other">{0}m³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-centimeter">
 				<displayName>cm³</displayName>
@@ -9089,6 +9505,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}cm³</unitPattern>
 				<unitPattern count="other">{0}cm³</unitPattern>
 			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>míle³</displayName>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>sl³</displayName>
+				<unitPattern count="one">{0}sl³</unitPattern>
+				<unitPattern count="two">{0}sl³</unitPattern>
+				<unitPattern count="few">{0}sl³</unitPattern>
+				<unitPattern count="many">{0}sl³</unitPattern>
+				<unitPattern count="other">{0}sl³</unitPattern>
+			</unit>
 			<unit type="volume-cubic-foot">
 				<displayName>tr³</displayName>
 				<unitPattern count="one">{0}tr³</unitPattern>
@@ -9105,40 +9532,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}or³</unitPattern>
 				<unitPattern count="other">{0}or³</unitPattern>
 			</unit>
-			<unit type="volume-cubic-kilometer">
-				<displayName>km³</displayName>
-				<unitPattern count="one">{0}km³</unitPattern>
-				<unitPattern count="two">{0}km³</unitPattern>
-				<unitPattern count="few">{0}km³</unitPattern>
-				<unitPattern count="many">{0}km³</unitPattern>
-				<unitPattern count="other">{0}km³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-meter">
-				<displayName>m³</displayName>
-				<unitPattern count="one">{0}m³</unitPattern>
-				<unitPattern count="two">{0}m³</unitPattern>
-				<unitPattern count="few">{0}m³</unitPattern>
-				<unitPattern count="many">{0}m³</unitPattern>
-				<unitPattern count="other">{0}m³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<displayName>míle³</displayName>
-			</unit>
-			<unit type="volume-cubic-yard">
-				<displayName>sl³</displayName>
-				<unitPattern count="one">{0}sl³</unitPattern>
-				<unitPattern count="two">{0}sl³</unitPattern>
-				<unitPattern count="few">{0}sl³</unitPattern>
-				<unitPattern count="many">{0}sl³</unitPattern>
-				<unitPattern count="other">{0}sl³</unitPattern>
-			</unit>
-			<unit type="volume-cup">
-				<displayName>cupán</displayName>
-				<unitPattern count="one">{0}c</unitPattern>
-				<unitPattern count="two">{0}c</unitPattern>
-				<unitPattern count="few">{0}c</unitPattern>
-				<unitPattern count="many">{0}c</unitPattern>
-				<unitPattern count="other">{0}c</unitPattern>
+			<unit type="volume-liter">
+				<displayName>lítir</displayName>
+				<unitPattern count="one">{0}l</unitPattern>
+				<unitPattern count="two">{0}l</unitPattern>
+				<unitPattern count="few">{0}l</unitPattern>
+				<unitPattern count="many">{0}l</unitPattern>
+				<unitPattern count="other">{0}l</unitPattern>
 			</unit>
 			<unit type="volume-deciliter">
 				<displayName>dl</displayName>
@@ -9148,14 +9548,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}dl</unitPattern>
 				<unitPattern count="other">{0}dl</unitPattern>
 			</unit>
-			<unit type="volume-liter">
-				<displayName>lítir</displayName>
-				<unitPattern count="one">{0}l</unitPattern>
-				<unitPattern count="two">{0}l</unitPattern>
-				<unitPattern count="few">{0}l</unitPattern>
-				<unitPattern count="many">{0}l</unitPattern>
-				<unitPattern count="other">{0}l</unitPattern>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
 			</unit>
+			<unit type="volume-cup">
+				<displayName>cupán</displayName>
+				<unitPattern count="one">{0}c</unitPattern>
+				<unitPattern count="two">{0}c</unitPattern>
+				<unitPattern count="few">{0}c</unitPattern>
+				<unitPattern count="many">{0}c</unitPattern>
+				<unitPattern count="other">{0}c</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}O</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}T</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}D</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}I</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ga_IE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ga_IE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ga_IE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ga_IE.xml
index 95112ab23d8..3c6921664e5 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ga_IE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ga_IE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ga"/>
 		<territory type="IE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gd.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gd.xml
similarity index 83%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gd.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gd.xml
index 889352e4475..9964024cab1 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gd.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gd.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="gd"/>
 	</identity>
 	<localeDisplayNames>
@@ -19,20 +18,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<languages>
 			<language type="aa">Afar</language>
 			<language type="ab">Abchasais</language>
+			<language type="ace">Basa Acèh</language>
+			<language type="ach">Acoli</language>
+			<language type="ada">Adangme</language>
+			<language type="ady">Adyghe</language>
 			<language type="ae">Avestanais</language>
 			<language type="aeb">Arabais Thuiniseach</language>
 			<language type="af">Afraganais</language>
+			<language type="afh">Afrihili</language>
 			<language type="agq">Aghem</language>
+			<language type="ain">Ainu</language>
 			<language type="ak">Akan</language>
+			<language type="akk">Acadais</language>
+			<language type="akz">Alabama</language>
 			<language type="ale">Aleutais</language>
+			<language type="aln">Albàinis Ghegeach</language>
 			<language type="am">Amtharais</language>
 			<language type="an">Aragonais</language>
 			<language type="ang">Seann-Bheurla</language>
+			<language type="anp">Angika</language>
 			<language type="ar">Arabais</language>
 			<language type="ar_001">Nuadh-Arabais Stannardach</language>
 			<language type="arc">Aramais</language>
 			<language type="arn">Mapuche</language>
+			<language type="aro">Araona</language>
+			<language type="arp">Arapaho</language>
 			<language type="arq">Arabais Aildireach</language>
+			<language type="arw">Arawak</language>
 			<language type="ary">Arabais Mhorocach</language>
 			<language type="arz">Arabais Èipheiteach</language>
 			<language type="as">Asamais</language>
@@ -40,50 +52,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ase">Cainnt-shanais na h-Aimeireaga</language>
 			<language type="ast">Astùrais</language>
 			<language type="av">Avarais</language>
+			<language type="avk">Kotava</language>
+			<language type="awa">Awadhi</language>
+			<language type="ay">Aymara</language>
 			<language type="az">Asarbaideànais</language>
 			<language type="az" alt="short">Azeri</language>
-			<language type="azb">Asarbaideànais Dheasach</language>
 			<language type="ba">Bashkir</language>
 			<language type="bal">Baluchì</language>
+			<language type="ban">Cànan Bali</language>
+			<language type="bas">Basaa</language>
+			<language type="bax">Bamun</language>
+			<language type="bbc">Batak Toba</language>
+			<language type="bbj">Ghomala</language>
 			<language type="be">Bealaruisis</language>
+			<language type="bej">Beja</language>
 			<language type="bem">Bemba</language>
+			<language type="bew">Betawi</language>
 			<language type="bez">Bena</language>
+			<language type="bfd">Bafut</language>
+			<language type="bfq">Badaga</language>
 			<language type="bg">Bulgarais</language>
+			<language type="bgn">Balochi Shiarach</language>
+			<language type="bho">Bhojpuri</language>
 			<language type="bi">Bislama</language>
+			<language type="bik">Bikol</language>
+			<language type="bin">Bini</language>
+			<language type="bjn">Banjar</language>
+			<language type="bkm">Kom</language>
+			<language type="bla">Siksika</language>
 			<language type="bm">Bambara</language>
 			<language type="bn">Beangailis</language>
 			<language type="bo">Tibeitis</language>
+			<language type="bpy">Bishnupriya</language>
+			<language type="bqi">Bakhtiari</language>
 			<language type="br">Breatnais</language>
+			<language type="bra">Braj</language>
+			<language type="brh">Brahui</language>
 			<language type="brx">Bodo</language>
 			<language type="bs">Bosnais</language>
+			<language type="bss">Akoose</language>
+			<language type="bua">Buriat</language>
+			<language type="bug">Cànan nam Bugis</language>
+			<language type="bum">Bulu</language>
+			<language type="byn">Blin</language>
+			<language type="byv">Medumba</language>
 			<language type="ca">Catalanais</language>
+			<language type="cad">Caddo</language>
+			<language type="car">Carib</language>
+			<language type="cay">Cayuga</language>
+			<language type="cch">Atsam</language>
 			<language type="ce">Deideanais</language>
+			<language type="ceb">Cebuano</language>
 			<language type="cgg">Chiga</language>
 			<language type="ch">Chamorro</language>
+			<language type="chb">Chibcha</language>
+			<language type="chg">Chagatai</language>
+			<language type="chk">Cànan Chuuk</language>
+			<language type="chm">Mari</language>
+			<language type="chn">Chinuk Wawa</language>
+			<language type="cho">Choctaw</language>
+			<language type="chp">Chipewyan</language>
 			<language type="chr">Cherokee</language>
+			<language type="chy">Cheyenne</language>
 			<language type="ckb">Cùrdais Soranî</language>
 			<language type="co">Corsais</language>
 			<language type="cop">Coptais</language>
+			<language type="cps">Capiznon</language>
+			<language type="cr">Cree</language>
 			<language type="crh">Turcais Chriomach</language>
 			<language type="cs">Seacais</language>
 			<language type="csb">Caisiubais</language>
 			<language type="cu">Slàbhais na h-Eaglaise</language>
+			<language type="cv">Chuvash</language>
 			<language type="cy">Cuimris</language>
 			<language type="da">Danmhairgis</language>
+			<language type="dak">Dakota</language>
+			<language type="dar">Dargwa</language>
 			<language type="dav">Taita</language>
 			<language type="de">Gearmailtis</language>
 			<language type="de_AT">Gearmailtis na h-Ostaire</language>
 			<language type="de_CH">Àrd-Ghearmailtis na h-Eilbheise</language>
+			<language type="del">Delaware</language>
+			<language type="den">Slavey</language>
+			<language type="dgr">Dogrib</language>
+			<language type="din">Dinka</language>
 			<language type="dje">Zarma</language>
+			<language type="doi">Dogri</language>
 			<language type="dsb">Sòrbais Ìochdarach</language>
+			<language type="dtp">Dusun Mheadhanach</language>
 			<language type="dua">Duala</language>
 			<language type="dum">Meadhan-Dhuitsis</language>
 			<language type="dv">Divehi</language>
 			<language type="dyo">Jola-Fonyi</language>
+			<language type="dyu">Dyula</language>
 			<language type="dz">Dzongkha</language>
+			<language type="dzg">Dazaga</language>
 			<language type="ebu">Embu</language>
 			<language type="ee">Ewe</language>
+			<language type="efi">Efik</language>
 			<language type="egy">Èipheitis Àrsaidh</language>
+			<language type="eka">Ekajuk</language>
 			<language type="el">Greugais</language>
 			<language type="elx">Elamais</language>
 			<language type="en">Beurla</language>
@@ -99,104 +167,187 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="es_419">Spàinntis na h-Aimeireaga Laidinneach</language>
 			<language type="es_ES">Spàinntis Eòrpach</language>
 			<language type="es_MX">Spàinntis Mheagsagach</language>
+			<language type="esu">Yupik Mheadhanach</language>
 			<language type="et">Eastoinis</language>
 			<language type="eu">Basgais</language>
-			<language type="fa">Farsaidh</language>
+			<language type="ewo">Ewondo</language>
+			<language type="ext">Cànan na h-Extremadura</language>
+			<language type="fa">Peirsis</language>
+			<language type="fan">Fang</language>
+			<language type="fat">Fanti</language>
+			<language type="ff">Fulah</language>
 			<language type="fi">Fionnlannais</language>
 			<language type="fil">Filipinis</language>
+			<language type="fit">Meänkieli</language>
 			<language type="fj">Fìdis</language>
 			<language type="fo">Fàrothais</language>
+			<language type="fon">Fon</language>
 			<language type="fr">Fraingis</language>
 			<language type="fr_CA">Fraingis Chanada</language>
 			<language type="fr_CH">Fraingis Eilbheiseach</language>
+			<language type="frc">Fraingis nan Cajun</language>
 			<language type="frm">Meadhan-Fhraingis</language>
 			<language type="fro">Seann-Fhraingis</language>
+			<language type="frp">Arpitan</language>
 			<language type="frr">Frìoslannais Thuathach</language>
 			<language type="frs">Frìoslannais Earach</language>
 			<language type="fur">Friùilis</language>
-			<language type="fy">Frìoslannais Siarach</language>
+			<language type="fy">Frìoslannais Shiarach</language>
 			<language type="ga">Gaeilge</language>
+			<language type="gaa">Ga</language>
 			<language type="gag">Gagauz</language>
+			<language type="gan">Gan</language>
+			<language type="gay">Gayo</language>
+			<language type="gba">Gbaya</language>
+			<language type="gbz">Dari Zoroastrach</language>
 			<language type="gd">Gàidhlig</language>
 			<language type="gez">Ge’ez</language>
 			<language type="gil">Ciribeasais</language>
 			<language type="gl">Gailìsis</language>
+			<language type="glk">Gilaki</language>
 			<language type="gmh">Meadhan-Àrd-Gearmailtis</language>
 			<language type="gn">Guaraní</language>
 			<language type="goh">Seann-Àrd-Gearmailtis</language>
+			<language type="gom">Konkani Goa</language>
+			<language type="gon">Gondi</language>
+			<language type="gor">Gorontalo</language>
 			<language type="got">Gotais</language>
+			<language type="grb">Grebo</language>
 			<language type="grc">Greugais Àrsaidh</language>
 			<language type="gsw">Gearmailtis Eilbheiseach</language>
 			<language type="gu">Gujarati</language>
+			<language type="guc">Wayuu</language>
+			<language type="gur">Frafra</language>
 			<language type="guz">Gusii</language>
 			<language type="gv">Gaelg</language>
+			<language type="gwi">Gwichʼin</language>
 			<language type="ha">Hausa</language>
+			<language type="hai">Haida</language>
+			<language type="hak">Hakka</language>
 			<language type="haw">Cànan Hawai’i</language>
 			<language type="he">Eabhra</language>
 			<language type="hi">Hindis</language>
 			<language type="hif">Hindis Fhìditheach</language>
+			<language type="hil">Hiligaynon</language>
+			<language type="hit">Cànan Het</language>
+			<language type="hmn">Hmong</language>
 			<language type="ho">Hiri Motu</language>
 			<language type="hr">Cròthaisis</language>
 			<language type="hsb">Sòrbais Uachdarach</language>
+			<language type="hsn">Xiang</language>
 			<language type="ht">Crìtheol Haidhti</language>
 			<language type="hu">Ungairis</language>
+			<language type="hup">Hupa</language>
 			<language type="hy">Airmeinis</language>
+			<language type="hz">Herero</language>
 			<language type="ia">Interlingua</language>
+			<language type="iba">Iban</language>
+			<language type="ibb">Ibibio</language>
 			<language type="id">Innd-Innsis</language>
 			<language type="ie">Interlingue</language>
 			<language type="ig">Igbo</language>
 			<language type="ii">Yi Sichuan</language>
 			<language type="ik">Inupiaq</language>
+			<language type="ilo">Iloko</language>
+			<language type="inh">Ingush</language>
 			<language type="io">Ido</language>
 			<language type="is">Innis Tìlis</language>
 			<language type="it">Eadailtis</language>
 			<language type="iu">Inuktitut</language>
 			<language type="ja">Seapanais</language>
 			<language type="jam">Beurla Crìtheolach Diameuga</language>
-			<language type="jbo" draft="unconfirmed">Lojban</language>
+			<language type="jbo">Lojban</language>
 			<language type="jgo">Ngomba</language>
 			<language type="jmc">Machame</language>
 			<language type="jpr">Peirsis Iùdhach</language>
 			<language type="jrb">Arabais Iùdhach</language>
 			<language type="jv">Deàbhanais</language>
 			<language type="ka">Cairtbheilis</language>
+			<language type="kaa">Kara-Kalpak</language>
 			<language type="kab">Kabyle</language>
+			<language type="kac">Kachin</language>
+			<language type="kaj">Jju</language>
 			<language type="kam">Kamba</language>
+			<language type="kaw">Kawi</language>
+			<language type="kbl">Kanembu</language>
+			<language type="kcg">Tyap</language>
 			<language type="kde">Makonde</language>
 			<language type="kea">Kabuverdianu</language>
+			<language type="ken">Kenyang</language>
+			<language type="kfo">Koro</language>
+			<language type="kg">Kongo</language>
+			<language type="kgp">Kaingang</language>
+			<language type="kha">Khasi</language>
+			<language type="kho">Cànan Khotan</language>
 			<language type="khq">Koyra Chiini</language>
+			<language type="khw">Khowar</language>
 			<language type="ki">Kikuyu</language>
+			<language type="kiu">Kirmanjki</language>
+			<language type="kj">Kuanyama</language>
 			<language type="kk">Casachais</language>
+			<language type="kkj">Kako</language>
 			<language type="kl">Kalaallisut</language>
 			<language type="kln">Kalenjin</language>
 			<language type="km">Cmèar</language>
+			<language type="kmb">Kimbundu</language>
 			<language type="kn">Kannada</language>
 			<language type="ko">Coirèanais</language>
 			<language type="koi">Komi-Permyak</language>
 			<language type="kok">Konkani</language>
+			<language type="kpe">Kpelle</language>
+			<language type="kr">Kanuri</language>
+			<language type="krc">Karachay-Balkar</language>
+			<language type="kri">Krio</language>
+			<language type="krj">Kinaray-a</language>
+			<language type="kru">Kurukh</language>
 			<language type="ks">Caismiris</language>
 			<language type="ksb">Shambala</language>
 			<language type="ksf">Bafia</language>
 			<language type="ku">Cùrdais</language>
+			<language type="kum">Kumyk</language>
+			<language type="kut">Kutenai</language>
+			<language type="kv">Komi</language>
 			<language type="kw">Còrnais</language>
 			<language type="ky">Cìorgasais</language>
 			<language type="la">Laideann</language>
 			<language type="lad">Ladino</language>
 			<language type="lag">Langi</language>
+			<language type="lah">Lahnda</language>
+			<language type="lam">Lamba</language>
 			<language type="lb">Lugsamburgais</language>
+			<language type="lfn">Lingua Franca Nova</language>
 			<language type="lg">Ganda</language>
+			<language type="li">Cànan Limburg</language>
 			<language type="lij">Liogùrais</language>
 			<language type="lkt">Lakhóta</language>
 			<language type="lmo">Lombardais</language>
 			<language type="ln">Lingala</language>
 			<language type="lo">Làtho</language>
+			<language type="lol">Mongo</language>
+			<language type="loz">Lozi</language>
+			<language type="lrc">Luri Thuathach</language>
 			<language type="lt">Liotuainis</language>
 			<language type="lu">Luba-Katanga</language>
+			<language type="lua">Luba-Lulua</language>
+			<language type="lui">Luiseño</language>
+			<language type="lun">Lunda</language>
 			<language type="luo">Luo</language>
+			<language type="lus">Mizo</language>
 			<language type="luy">Luyia</language>
 			<language type="lv">Laitbheis</language>
 			<language type="lzh">Sìnis an Litreachais</language>
+			<language type="lzz">Laz</language>
+			<language type="mad">Cànan Madhura</language>
+			<language type="maf">Mafa</language>
+			<language type="mag">Magahi</language>
+			<language type="mai">Maithili</language>
+			<language type="mak">Makasar</language>
+			<language type="man">Mandingo</language>
 			<language type="mas">Maasai</language>
+			<language type="mde">Maba</language>
+			<language type="mdf">Moksha</language>
+			<language type="mdr">Mandar</language>
+			<language type="men">Mende</language>
 			<language type="mer">Meru</language>
 			<language type="mfe">Morisyen</language>
 			<language type="mg">Malagasais</language>
@@ -205,82 +356,141 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mgo">Meta’</language>
 			<language type="mh">Marshallais</language>
 			<language type="mi">Māori</language>
+			<language type="mic">Mi’kmaq</language>
+			<language type="min">Minangkabau</language>
 			<language type="mk">Masadonais</language>
 			<language type="ml">Malayalam</language>
 			<language type="mn">Mongolais</language>
+			<language type="mnc">Manchu</language>
+			<language type="mni">Manipuri</language>
 			<language type="moh">Mohawk</language>
+			<language type="mos">Mossi</language>
 			<language type="mr">Marathi</language>
+			<language type="mrj">Mari Shiarach</language>
 			<language type="ms">Malaidhis</language>
 			<language type="mt">Maltais</language>
 			<language type="mua">Mundang</language>
 			<language type="mul">Iomadh cànan</language>
+			<language type="mus">Creek</language>
+			<language type="mwr">Marwari</language>
+			<language type="mwv">Mentawai</language>
 			<language type="my">Burmais</language>
+			<language type="mye">Myene</language>
+			<language type="myv">Erzya</language>
+			<language type="mzn">Mazanderani</language>
 			<language type="na">Nabhru</language>
+			<language type="nan">Min Nan</language>
 			<language type="naq">Nama</language>
 			<language type="nb">Bokmål na Nirribhidh</language>
 			<language type="nd">Ndebele Thuathach</language>
-			<language type="ne">Neapàilis</language>
-			<language type="niu" draft="unconfirmed">Cànan Niue</language>
+			<language type="nds">Gearmailtis Ìochdarach</language>
+			<language type="nds_NL">Sagsannais Ìochdarach</language>
+			<language type="ne">Neapàlais</language>
+			<language type="new">Newari</language>
+			<language type="ng">Ndonga</language>
+			<language type="nia">Nias</language>
+			<language type="niu">Cànan Niue</language>
+			<language type="njo">Ao Naga</language>
 			<language type="nl">Duitsis</language>
 			<language type="nl_BE">Flannrais</language>
 			<language type="nmg">Kwasio</language>
 			<language type="nn">Nynorsk na Nirribhidh</language>
+			<language type="nnh">Ngiemboon</language>
 			<language type="no">Nirribhis</language>
+			<language type="nog">Nogai</language>
 			<language type="non">Seann-Lochlannais</language>
+			<language type="nov">Novial</language>
 			<language type="nqo">N’Ko</language>
 			<language type="nr">Ndebele Dheasach</language>
 			<language type="nso">Leasotais Thuathach</language>
 			<language type="nus">Nuer</language>
+			<language type="nv">Navajo</language>
+			<language type="nwc">Newari Chlasaigeach</language>
 			<language type="ny">Chichewa</language>
+			<language type="nym">Nyamwezi</language>
 			<language type="nyn">Nyankole</language>
+			<language type="nyo">Nyoro</language>
+			<language type="nzi">Nzima</language>
 			<language type="oc">Ogsatanais</language>
+			<language type="oj">Ojibwa</language>
 			<language type="om">Oromo</language>
-			<language type="or">Oriya</language>
+			<language type="or">Odia</language>
 			<language type="os">Ossetic</language>
+			<language type="osa">Osage</language>
 			<language type="ota">Turcais Otomanach</language>
 			<language type="pa">Panjabi</language>
+			<language type="pag">Pangasinan</language>
+			<language type="pal">Pahlavi</language>
+			<language type="pam">Pampanga</language>
+			<language type="pap">Papiamento</language>
 			<language type="pau">Palabhais</language>
+			<language type="pcd">Picard</language>
 			<language type="pdc">Gearmailtis Phennsylvania</language>
+			<language type="pdt">Plautdietsch</language>
 			<language type="peo">Seann-Pheirsis</language>
+			<language type="phn">Phenicis</language>
 			<language type="pi">Pali</language>
 			<language type="pl">Pòlainnis</language>
+			<language type="pms">Piedmontese</language>
+			<language type="pon">Cànan Pohnpei</language>
 			<language type="prg">Pruisis</language>
-			<language type="ps">Pachtu</language>
+			<language type="pro">Seann-Phrovençal</language>
+			<language type="ps">Pashto</language>
 			<language type="pt">Portagailis</language>
 			<language type="pt_BR">Portagailis Bhraisileach</language>
 			<language type="pt_PT">Portagailis Eòrpach</language>
 			<language type="qu">Ceatsua</language>
 			<language type="quc">K’iche’</language>
+			<language type="qug">Quichua Àrd-tìr Chimborazo</language>
+			<language type="raj">Rajasthani</language>
 			<language type="rap">Rapa Nui</language>
+			<language type="rar">Cànan Rarotonga</language>
+			<language type="rgn">Romagnol</language>
 			<language type="rm">Rumains</language>
 			<language type="rn">Kirundi</language>
 			<language type="ro">Romàinis</language>
 			<language type="ro_MD">Moldobhais</language>
 			<language type="rof">Rombo</language>
 			<language type="rom">Romanais</language>
+			<language type="root">Root</language>
 			<language type="ru">Ruisis</language>
+			<language type="rue">Rusyn</language>
+			<language type="rug">Roviana</language>
 			<language type="rw">Kinyarwanda</language>
 			<language type="rwk">Rwa</language>
 			<language type="sa">Sanskrit</language>
+			<language type="sad">Sandawe</language>
 			<language type="sah">Sachais</language>
 			<language type="sam">Aramais Shamaritanach</language>
 			<language type="saq">Samburu</language>
+			<language type="sas">Sasak</language>
+			<language type="sat">Santali</language>
+			<language type="saz">Saurashtra</language>
+			<language type="sba">Ngambay</language>
 			<language type="sbp">Sangu</language>
 			<language type="sc">Sàrdais</language>
 			<language type="scn">Sisilis</language>
 			<language type="sco">Albais</language>
 			<language type="sd">Sindhi</language>
+			<language type="sdc">Sassarese</language>
+			<language type="sdh">Cùrdais Dheasach</language>
 			<language type="se">Sàmais Thuathach</language>
+			<language type="see">Seneca</language>
 			<language type="seh">Sena</language>
+			<language type="sei">Seri</language>
+			<language type="sel">Selkup</language>
 			<language type="ses">Koyraboro Senni</language>
 			<language type="sg">Sango</language>
 			<language type="sga">Seann-Ghaeilge</language>
-			<language type="sh" draft="unconfirmed">Sèirb-Chròthaisis</language>
+			<language type="sh">Sèirb-Chròthaisis</language>
 			<language type="shi">Tachelhit</language>
+			<language type="shn">Shan</language>
 			<language type="shu">Arabais Seàdach</language>
 			<language type="si">Sinhala</language>
+			<language type="sid">Sidamo</language>
 			<language type="sk">Slòbhacais</language>
 			<language type="sl">Slòbhainis</language>
+			<language type="sly">Selayar</language>
 			<language type="sm">Samothais</language>
 			<language type="sma">Sàmais Dheasach</language>
 			<language type="smj">Sàmais Lule</language>
@@ -291,81 +501,147 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="so">Somàilis</language>
 			<language type="sq">Albàinis</language>
 			<language type="sr">Sèirbis</language>
+			<language type="srn">Sranan Tongo</language>
+			<language type="srr">Serer</language>
+			<language type="ss">Swati</language>
+			<language type="ssy">Saho</language>
 			<language type="st">Leasotach Dheasach</language>
 			<language type="su">Cànan Sunda</language>
+			<language type="suk">Sukuma</language>
+			<language type="sus">Susu</language>
+			<language type="sux">Cànan Sumer</language>
 			<language type="sv">Suainis</language>
 			<language type="sw">Kiswahili</language>
+			<language type="sw_CD">Kiswahili na Congo</language>
 			<language type="swb">Comorais</language>
-			<language type="swc">Kiswahili na Congo</language>
 			<language type="syc">Suraidheac Chlasaigeach</language>
 			<language type="syr">Suraidheac</language>
 			<language type="ta">Taimilis</language>
+			<language type="tcy">Tulu</language>
 			<language type="te">Telugu</language>
+			<language type="tem">Timne</language>
 			<language type="teo">Teso</language>
+			<language type="ter">Terêna</language>
 			<language type="tet">Tetum</language>
 			<language type="tg">Taidigis</language>
 			<language type="th">Tàidh</language>
 			<language type="ti">Tigrinya</language>
+			<language type="tig">Tigre</language>
+			<language type="tiv">Tiv</language>
 			<language type="tk">Turcmanais</language>
 			<language type="tkl">Tokelau</language>
+			<language type="tkr">Tsakhur</language>
 			<language type="tl">Tagalog</language>
+			<language type="tlh">Klingon</language>
+			<language type="tli">Tlingit</language>
+			<language type="tly">Talysh</language>
+			<language type="tmh">Tamashek</language>
+			<language type="tn">Tswana</language>
 			<language type="to">Tongais</language>
 			<language type="tog">Nyasa Tonga</language>
 			<language type="tpi">Tok Pisin</language>
 			<language type="tr">Turcais</language>
+			<language type="tru">Turoyo</language>
+			<language type="trv">Taroko</language>
 			<language type="ts">Tsonga</language>
+			<language type="tsi">Tsimshian</language>
 			<language type="tt">Tatarais</language>
+			<language type="ttt">Tati</language>
+			<language type="tum">Tumbuka</language>
+			<language type="tvl">Tubhalu</language>
+			<language type="tw">Twi</language>
 			<language type="twq">Tasawaq</language>
+			<language type="ty">Cànan Tahiti</language>
+			<language type="tyv">Cànan Tuva</language>
 			<language type="tzm">Tamazight Meadhan na h-Atlas</language>
+			<language type="udm">Udmurt</language>
 			<language type="ug">Ùigiurais</language>
 			<language type="uk">Ucràinis</language>
+			<language type="umb">Umbundu</language>
 			<language type="und">Cànan neo-aithnichte</language>
 			<language type="ur">Ùrdu</language>
 			<language type="uz">Usbagais</language>
 			<language type="vai">Vai</language>
 			<language type="ve">Venda</language>
+			<language type="vep">Veps</language>
 			<language type="vi">Bhiet-Namais</language>
 			<language type="vls">Flannrais Siarach</language>
 			<language type="vo">Volapük</language>
+			<language type="vro">Võro</language>
 			<language type="vun">Vunjo</language>
+			<language type="wa">Walloon</language>
+			<language type="wae">Gearmailtis Wallis</language>
+			<language type="wal">Wolaytta</language>
+			<language type="war">Waray</language>
+			<language type="was">Washo</language>
+			<language type="wbp">Warlpiri</language>
 			<language type="wo">Wolof</language>
+			<language type="wuu">Wu</language>
+			<language type="xal">Kalmyk</language>
 			<language type="xh">Xhosa</language>
 			<language type="xog">Soga</language>
+			<language type="yao">Yao</language>
+			<language type="yap">Cànan Yap</language>
+			<language type="yav">Yangben</language>
+			<language type="ybb">Yemba</language>
 			<language type="yi">Iùdhais</language>
 			<language type="yo">Ioruba</language>
+			<language type="yrl">Nheengatu</language>
 			<language type="yue">Cantonais</language>
+			<language type="za">Zhuang</language>
+			<language type="zap">Zapotec</language>
+			<language type="zbl">Comharran Bliss</language>
+			<language type="zea">Cànan Zeeland</language>
+			<language type="zen">Zenaga</language>
 			<language type="zgh">Tamazight Stannardach Moroco</language>
 			<language type="zh">Sìnis</language>
 			<language type="zh_Hans">Sìnis Shimplichte</language>
 			<language type="zh_Hant">Sìnis Thradaiseanta</language>
 			<language type="zu">Zulu</language>
-			<language type="zxx">Susbaint nach eil ‘na chànan</language>
+			<language type="zun">Zuñi</language>
+			<language type="zxx">Susbaint nach eil ’na chànan</language>
+			<language type="zza">Zazaki</language>
 		</languages>
 		<scripts>
+			<script type="Afak">Afaka</script>
 			<script type="Aghb">Albàinis Chabhcasach</script>
+			<script type="Ahom">Ahom</script>
 			<script type="Arab">Arabais</script>
 			<script type="Armi">Aramais impireil</script>
 			<script type="Armn">Airmeinis</script>
 			<script type="Avst">Avestanais</script>
 			<script type="Bali">Bali</script>
+			<script type="Bamu">Bamum</script>
+			<script type="Bass">Bassa Vah</script>
+			<script type="Batk">Batak</script>
 			<script type="Beng">Beangailis</script>
+			<script type="Blis">Comharran Bliss</script>
 			<script type="Bopo">Bopomofo</script>
+			<script type="Brah">Brahmi</script>
 			<script type="Brai">Braille</script>
+			<script type="Buhd">Buhid</script>
+			<script type="Cakm">Chakma</script>
 			<script type="Cans">Sgrìobhadh Lideach Aonaichte nan Tùsanach Canadach</script>
+			<script type="Cham">Cham</script>
+			<script type="Cher">Cherokee</script>
+			<script type="Cirt">Cirth</script>
 			<script type="Copt">Coptais</script>
 			<script type="Cprt">Cìoprasais</script>
 			<script type="Cyrl">Cirilis</script>
 			<script type="Cyrs">Cirilis Seann-Slàbhais na h-Eaglaise</script>
 			<script type="Deva">Devanagari</script>
+			<script type="Dsrt">Deseret</script>
 			<script type="Egyp">Sealbh-sgrìobhadh Èipheiteach</script>
 			<script type="Ethi">Ge’ez</script>
 			<script type="Geor">Cairtbheilis</script>
 			<script type="Goth">Gotais</script>
+			<script type="Gran">Grantha</script>
 			<script type="Grek">Greugais</script>
 			<script type="Gujr">Gujarati</script>
 			<script type="Guru">Gurmukhi</script>
 			<script type="Hang">Hangul</script>
 			<script type="Hani">Han</script>
+			<script type="Hano">Hanunoo</script>
 			<script type="Hans">Simplichte</script>
 			<script type="Hans" alt="stand-alone">Han simplichte</script>
 			<script type="Hant">Tradaiseanta</script>
@@ -373,41 +649,91 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Hebr">Eabhra</script>
 			<script type="Hira">Hiragana</script>
 			<script type="Hluw">Dealbh-sgrìobhadh Anatolach</script>
+			<script type="Hmng">Pahawh Hmong</script>
 			<script type="Hrkt">Katakana no Hiragana</script>
 			<script type="Hung">Seann-Ungarais</script>
 			<script type="Ital">Seann-Eadailtis</script>
 			<script type="Java">Deàbhanais</script>
 			<script type="Jpan">Seapanais</script>
+			<script type="Jurc">Jurchen</script>
+			<script type="Kali">Kayah Li</script>
 			<script type="Kana">Katakana</script>
+			<script type="Khar">Kharoshthi</script>
 			<script type="Khmr">Cmèar</script>
+			<script type="Khoj">Khojki</script>
 			<script type="Knda">Kannada</script>
 			<script type="Kore">Coirèanais</script>
+			<script type="Kpel">Kpelle</script>
+			<script type="Kthi">Kaithi</script>
+			<script type="Lana">Lanna</script>
 			<script type="Laoo">Làtho</script>
 			<script type="Latf">Laideann fraktur</script>
 			<script type="Latg">Laideann Ghàidhealach</script>
 			<script type="Latn">Laideann</script>
+			<script type="Lepc">Lepcha</script>
+			<script type="Limb">Limbu</script>
+			<script type="Lina">Linear A</script>
+			<script type="Linb">Linear B</script>
+			<script type="Loma">Loma</script>
+			<script type="Mahj">Mahajani</script>
 			<script type="Maya">Dealbh-sgrìobhadh Mayach</script>
+			<script type="Mend">Mende</script>
 			<script type="Mlym">Malayalam</script>
+			<script type="Modi">Modi</script>
 			<script type="Mong">Mongolais</script>
+			<script type="Mroo">Mro</script>
+			<script type="Mtei">Meitei Mayek</script>
+			<script type="Mult">Multani</script>
 			<script type="Mymr">Miànmar</script>
 			<script type="Narb">Seann-Arabach Thuathach</script>
+			<script type="Nkgb">Naxi Geba</script>
+			<script type="Nkoo">N’ko</script>
+			<script type="Nshu">Nüshu</script>
 			<script type="Ogam">Ogham-chraobh</script>
+			<script type="Olck">Ol Chiki</script>
+			<script type="Orkh">Orkhon</script>
 			<script type="Orya">Oriya</script>
+			<script type="Osma">Osmanya</script>
+			<script type="Pauc">Pau Cin Hau</script>
+			<script type="Phag">Phags-pa</script>
 			<script type="Prti">Partais snaidh-sgrìobhte</script>
+			<script type="Qaac">Qaac</script>
+			<script type="Rjng">Rejang</script>
+			<script type="Roro">Rongorongo</script>
 			<script type="Runr">Rùn-sgrìobhadh</script>
+			<script type="Sara">Sarati</script>
 			<script type="Sarb">Seann-Arabais Dheasach</script>
-			<script type="Sinh">Sinealais</script>
+			<script type="Saur">Saurashtra</script>
+			<script type="Shrd">Sharada</script>
+			<script type="Sidd">Siddham</script>
+			<script type="Sind">Khudawadi</script>
+			<script type="Sinh">Sinhala</script>
+			<script type="Sora">Sora Sompeng</script>
+			<script type="Sund">Sunda</script>
+			<script type="Sylo">Syloti Nagri</script>
 			<script type="Syrc">Suraidheac</script>
 			<script type="Syrj">Suraidheac Siarach</script>
 			<script type="Syrn">Suraidheac Earach</script>
+			<script type="Tagb">Tagbanwa</script>
+			<script type="Takr">Takri</script>
+			<script type="Tale">Tai Le</script>
+			<script type="Talu">Tai Lue Ùr</script>
 			<script type="Taml">Taimil</script>
+			<script type="Tang">Tangut</script>
+			<script type="Tavt">Tai Viet</script>
 			<script type="Telu">Telugu</script>
+			<script type="Teng">Tengwar</script>
 			<script type="Tfng">Tifinagh</script>
 			<script type="Tglg">Tagalog</script>
 			<script type="Thaa">Thaana</script>
 			<script type="Thai">Tàidh</script>
 			<script type="Tibt">Tibeitis</script>
+			<script type="Tirh">Tirhuta</script>
+			<script type="Vaii">Vai</script>
+			<script type="Wara">Varang Kshiti</script>
+			<script type="Wole">Woleai</script>
 			<script type="Xpeo">Seann-Pheirsis</script>
+			<script type="Yiii">Yi</script>
 			<script type="Zmth">Gnìomhairean matamataig</script>
 			<script type="Zsym">Samhlaidhean</script>
 			<script type="Zxxx">Gun sgrìobhadh</script>
@@ -454,7 +780,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albàinia</territory>
 			<territory type="AM">Airmeinia</territory>
-			<territory type="AN">Eileanan Aintilia nan Tìrean Ìsle</territory>
 			<territory type="AO">Angòla</territory>
 			<territory type="AQ">An Antartaig</territory>
 			<territory type="AR">An Argantain</territory>
@@ -488,7 +813,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CA">Canada</territory>
 			<territory type="CC">Na h-Eileanan Cocos (Keeling)</territory>
 			<territory type="CD">Congo - Kinshasa</territory>
-			<territory type="CD" alt="variant">A’ Chongo (Poblachd Dheamocratach)</territory>
+			<territory type="CD" alt="variant">A’ Chongo (PDC)</territory>
 			<territory type="CF">Poblachd Meadhan Afraga</territory>
 			<territory type="CG">A’ Chongo - Brazzaville</territory>
 			<territory type="CG" alt="variant">A’ Chongo (Poblachd)</territory>
@@ -605,7 +930,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="MK">A’ Mhasadon</territory>
 			<territory type="MK" alt="variant">A’ Mhasadon (FYROM)</territory>
 			<territory type="ML">Màili</territory>
-			<territory type="MM">Miànmar (Burma)</territory>
+			<territory type="MM">Miànmar</territory>
 			<territory type="MN">Dùthaich nam Mongol</territory>
 			<territory type="MO">Macàthu SAR na Sìne</territory>
 			<territory type="MO" alt="short">Macàthu</territory>
@@ -696,7 +1021,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="TZ">An Tansan</territory>
 			<territory type="UA">An Ucràin</territory>
 			<territory type="UG">Uganda</territory>
-			<territory type="UM">Meanbh-Eileanan Iomallach nan Stàitean Aonaichte</territory>
+			<territory type="UM">Meanbh-Eileanan Iomallach nan SA</territory>
 			<territory type="US">Na Stàitean Aonaichte</territory>
 			<territory type="US" alt="short">SA</territory>
 			<territory type="UY">Uruguaidh</territory>
@@ -719,86 +1044,121 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ZZ">Roinn-dùthcha neo-aithnichte</territory>
 		</territories>
 		<variants>
-			<variant type="SCOTLAND" draft="unconfirmed">Beurla Bhun-Tomhasach na h-Alba</variant>
+			<variant type="SCOTLAND">Beurla Bhun-Tomhasach na h-Alba</variant>
 		</variants>
 		<keys>
 			<key type="calendar">Mìosachan</key>
 			<key type="collation">Òrdugh an t-seòrsachaidh</key>
 			<key type="currency">Airgeadra</key>
+			<key type="hc">Cearcall an ama (12 no 24 uair)</key>
+			<key type="lb">Stoidhle nam brisidhean-loidhe</key>
+			<key type="ms">Siostam tomhais</key>
 			<key type="numbers">Àireamhan</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Àireamhan Arabach-Innseanach</type>
-			<type type="arabext" key="numbers">Àireamhan Arabach-Innseanach leudaichte</type>
-			<type type="armn" key="numbers">Àireamhan na h-Airmeinise</type>
-			<type type="armnlow" key="numbers">Àireamhan beaga na h-Airmeinise</type>
-			<type type="bali" key="numbers">Àireamhan Bali</type>
-			<type type="beng" key="numbers">Àireamhan na Beangailise</type>
-			<type type="big5han" key="collation">Òrdugh seòrsachaidh na Sìnise Tradaiseanta - Big5</type>
-			<type type="buddhist" key="calendar">Am Mìosachan Budach</type>
-			<type type="chinese" key="calendar">Am Mìosachan Sìneach</type>
-			<type type="coptic" key="calendar">Am Mìosachan Coptach</type>
-			<type type="dangi" key="calendar">Mìosachan Dangi</type>
-			<type type="deva" key="numbers">Àireamhan Devanagari</type>
-			<type type="dictionary" key="collation">Òrdugh seòrsachaidh an fhaclair</type>
-			<type type="ducet" key="collation">Òrdugh seòrsachaidh Unicode bunaiteach</type>
-			<type type="eor" key="collation">Òrdugh seòrsachaidh Eòrpach</type>
-			<type type="ethi" key="numbers">Àireamhan Itiopach</type>
-			<type type="ethiopic" key="calendar">Mìosachan na h-Itioipe</type>
-			<type type="ethiopic-amete-alem" key="calendar">Mìosachan Itiopach Amete Alem</type>
-			<type type="fullwide" key="numbers">Àireamhan làn-leud</type>
-			<type type="gb2312han" key="collation">Òrdugh seòrsachaidh na Sìnise Simplichte - GB2312</type>
-			<type type="geor" key="numbers">Àireamhan na Cairtbheilise</type>
-			<type type="gregorian" key="calendar">Am Mìosachan Griogarach</type>
-			<type type="grek" key="numbers">Àireamhan na Greugaise</type>
-			<type type="greklow" key="numbers">Àireamhan beaga na Greugaise</type>
-			<type type="gujr" key="numbers">Àireamhan Gujarati</type>
-			<type type="guru" key="numbers">Àireamhan Gurmukhi</type>
-			<type type="hanidec" key="numbers">Àireamhan deicheach na Sìnise</type>
-			<type type="hans" key="numbers">Àireamhan na Sìnise Shimplichte</type>
-			<type type="hansfin" key="numbers">Àireamhan ionmhasail na Sìnise Shimplichte</type>
-			<type type="hant" key="numbers">Àireamhan na Sìnise Thradaiseanta</type>
-			<type type="hantfin" key="numbers">Àireamhan ionmhasail na Sìnise Thradaiseanta</type>
-			<type type="hebr" key="numbers">Àireamhan na h-Eabhra</type>
-			<type type="hebrew" key="calendar">Am Mìosachan Eabhrach</type>
-			<type type="indian" key="calendar">Mìosachan Nàiseanta nan Innseachan</type>
-			<type type="islamic" key="calendar">Am Mìosachan Ioslamach</type>
-			<type type="islamic-civil" key="calendar">Am Mìosachan Ioslamach (clàrach, linn sìobhalta)</type>
-			<type type="islamic-rgsa" key="calendar">Am Mìosachan Ioslamach (arabia nan Sabhd, sealladh)</type>
-			<type type="islamic-tbla" key="calendar">Am Mìosachan Ioslamach (clàrach, linn reul-eòlach)</type>
-			<type type="islamic-umalqura" key="calendar">Am Mìosachan Ioslamach (Umm al-Qura)</type>
-			<type type="iso8601" key="calendar">Mìosachan ISO-8601</type>
-			<type type="japanese" key="calendar">Am Mìosachan Seapanach</type>
-			<type type="java" key="numbers">Àireamhan na Deàbhanaise</type>
-			<type type="jpan" key="numbers">Àireamhan na Seapanaise</type>
-			<type type="jpanfin" key="numbers">Àireamhan ionmhasail na Seapanaise</type>
-			<type type="khmr" key="numbers">Àireamhan Cmèar</type>
-			<type type="knda" key="numbers">Àireamhan Kannada</type>
-			<type type="laoo" key="numbers">Àireamhan Làtho</type>
-			<type type="latn" key="numbers">Àireamhan Siarach</type>
-			<type type="mlym" key="numbers">Aìreamhan Malayalam</type>
-			<type type="mong" key="numbers">Àireamhan na Mongolaise</type>
-			<type type="mymr" key="numbers">Àireamhan Miànmar</type>
-			<type type="orya" key="numbers">Àireamhan Oriya</type>
-			<type type="persian" key="calendar">Am Mìosachan Pearsach</type>
-			<type type="phonebook" key="collation">Òrdugh seòrsachaidh nan leabhraichean-fòn</type>
-			<type type="pinyin" key="collation">Òrdugh seòrsachaidh Pinyin</type>
-			<type type="reformed" key="collation">Òrdugh seòrsachaidh ath-leasaichte</type>
-			<type type="roc" key="calendar">Mìosachan Poblachd na Sìne</type>
-			<type type="roman" key="numbers">Àireamhan Ròmanach</type>
-			<type type="romanlow" key="numbers">Àireamhan beaga Ròmanach</type>
-			<type type="search" key="collation">Lorg coitcheann</type>
-			<type type="searchjl" key="collation">Lorg leis a’ chiad chonnrag Hangul</type>
-			<type type="standard" key="collation">Òrdugh seòrsachaidh stannardach</type>
-			<type type="stroke" key="collation">Òrdugh nan stràcan</type>
-			<type type="taml" key="numbers">Àireamhan na Taimilise Tradaiseanta</type>
-			<type type="tamldec" key="numbers">Àireamhan na Taimilise</type>
-			<type type="telu" key="numbers">Àireamhan Telugu</type>
-			<type type="thai" key="numbers">Àireamhan Tàidh</type>
-			<type type="tibt" key="numbers">Àireamhan na Tibeitise</type>
-			<type type="traditional" key="collation">Òrdugh seòrsachaidh tradaiseanta</type>
-			<type type="unihan" key="collation">Òrdugh an fhreumha ‘s nan stràcan</type>
-			<type type="zhuyin" key="collation">Òrdugh seòrsachaidh Zhuyin</type>
+			<type key="calendar" type="buddhist">Am Mìosachan Budach</type>
+			<type key="calendar" type="chinese">Am Mìosachan Sìneach</type>
+			<type key="calendar" type="coptic">Am Mìosachan Coptach</type>
+			<type key="calendar" type="dangi">Mìosachan Dangi</type>
+			<type key="calendar" type="ethiopic">Mìosachan na h-Itioipe</type>
+			<type key="calendar" type="ethiopic-amete-alem">Mìosachan Itiopach Amete Alem</type>
+			<type key="calendar" type="gregorian">Am Mìosachan Griogarach</type>
+			<type key="calendar" type="hebrew">Am Mìosachan Eabhrach</type>
+			<type key="calendar" type="indian">Mìosachan Nàiseanta nan Innseachan</type>
+			<type key="calendar" type="islamic">Am Mìosachan Ioslamach</type>
+			<type key="calendar" type="islamic-civil">Am Mìosachan Ioslamach (clàrach, linn sìobhalta)</type>
+			<type key="calendar" type="islamic-rgsa">Am Mìosachan Ioslamach (Aràibia nan Sabhd, sealladh)</type>
+			<type key="calendar" type="islamic-tbla">Am Mìosachan Ioslamach (clàrach, linn reul-eòlach)</type>
+			<type key="calendar" type="islamic-umalqura">Am Mìosachan Ioslamach (Umm al-Qura)</type>
+			<type key="calendar" type="iso8601">Mìosachan ISO-8601</type>
+			<type key="calendar" type="japanese">Am Mìosachan Seapanach</type>
+			<type key="calendar" type="persian">Am Mìosachan Pearsach</type>
+			<type key="calendar" type="roc">Mìosachan Poblachd na Sìne</type>
+			<type key="collation" type="big5han">Òrdugh seòrsachaidh na Sìnise Tradaiseanta - Big5</type>
+			<type key="collation" type="compat">Òrdugh seòrsachaidh roimhe a chum co-chòrdalachd</type>
+			<type key="collation" type="dictionary">Òrdugh seòrsachaidh an fhaclair</type>
+			<type key="collation" type="ducet">Òrdugh seòrsachaidh Unicode bunaiteach</type>
+			<type key="collation" type="emoji">Òrdugh seòrsachaidh Emoji</type>
+			<type key="collation" type="eor">Òrdugh seòrsachaidh Eòrpach</type>
+			<type key="collation" type="gb2312han">Òrdugh seòrsachaidh na Sìnise Simplichte - GB2312</type>
+			<type key="collation" type="phonebook">Òrdugh seòrsachaidh nan leabhraichean-fòn</type>
+			<type key="collation" type="pinyin">Òrdugh seòrsachaidh Pinyin</type>
+			<type key="collation" type="reformed">Òrdugh seòrsachaidh ath-leasaichte</type>
+			<type key="collation" type="search">Lorg coitcheann</type>
+			<type key="collation" type="searchjl">Lorg leis a’ chiad chonnrag Hangul</type>
+			<type key="collation" type="standard">Òrdugh seòrsachaidh stannardach</type>
+			<type key="collation" type="stroke">Òrdugh nan stràcan</type>
+			<type key="collation" type="traditional">Òrdugh seòrsachaidh tradaiseanta</type>
+			<type key="collation" type="unihan">Òrdugh an fhreumha ’s nan stràcan</type>
+			<type key="collation" type="zhuyin">Òrdugh seòrsachaidh Zhuyin</type>
+			<type key="hc" type="h11">Cleoc 12 uair a thìde (0–11)</type>
+			<type key="hc" type="h12">Cleoc 12 uair a thìde (1–12)</type>
+			<type key="hc" type="h23">Cleoc 24 uair a thìde (0–23)</type>
+			<type key="hc" type="h24">Cleoc 24 uair a thìde (1–24)</type>
+			<type key="lb" type="loose">Brisidhean-loidhe fuasgailte</type>
+			<type key="lb" type="normal">Brisidhean-loidhe àbhaisteach</type>
+			<type key="lb" type="strict">Brisidhean-loidhe teanna</type>
+			<type key="ms" type="metric">Tomhas meatrach</type>
+			<type key="ms" type="uksystem">Tomhas impireil</type>
+			<type key="ms" type="ussystem">Tomhas nan Stàitean Aonaichte</type>
+			<type key="numbers" type="arab">Àireamhan Arabach-Innseanach</type>
+			<type key="numbers" type="arabext">Àireamhan Arabach-Innseanach leudaichte</type>
+			<type key="numbers" type="armn">Àireamhan na h-Airmeinise</type>
+			<type key="numbers" type="armnlow">Àireamhan beaga na h-Airmeinise</type>
+			<type key="numbers" type="bali">Àireamhan Bali</type>
+			<type key="numbers" type="beng">Àireamhan na Beangailise</type>
+			<type key="numbers" type="brah">Àireamhan Brahmi</type>
+			<type key="numbers" type="cakm">Àireamhan Chakma</type>
+			<type key="numbers" type="cham">Àireamhan Cham</type>
+			<type key="numbers" type="deva">Àireamhan Devanagari</type>
+			<type key="numbers" type="ethi">Àireamhan Itiopach</type>
+			<type key="numbers" type="fullwide">Àireamhan làn-leud</type>
+			<type key="numbers" type="geor">Àireamhan na Cairtbheilise</type>
+			<type key="numbers" type="grek">Àireamhan na Greugaise</type>
+			<type key="numbers" type="greklow">Àireamhan beaga na Greugaise</type>
+			<type key="numbers" type="gujr">Àireamhan Gujarati</type>
+			<type key="numbers" type="guru">Àireamhan Gurmukhi</type>
+			<type key="numbers" type="hanidec">Àireamhan deicheach na Sìnise</type>
+			<type key="numbers" type="hans">Àireamhan na Sìnise Shimplichte</type>
+			<type key="numbers" type="hansfin">Àireamhan ionmhasail na Sìnise Shimplichte</type>
+			<type key="numbers" type="hant">Àireamhan na Sìnise Thradaiseanta</type>
+			<type key="numbers" type="hantfin">Àireamhan ionmhasail na Sìnise Thradaiseanta</type>
+			<type key="numbers" type="hebr">Àireamhan na h-Eabhra</type>
+			<type key="numbers" type="java">Àireamhan na Deàbhanaise</type>
+			<type key="numbers" type="jpan">Àireamhan na Seapanaise</type>
+			<type key="numbers" type="jpanfin">Àireamhan ionmhasail na Seapanaise</type>
+			<type key="numbers" type="kali">Àireamhan Kayah Li</type>
+			<type key="numbers" type="khmr">Àireamhan Cmèar</type>
+			<type key="numbers" type="knda">Àireamhan Kannada</type>
+			<type key="numbers" type="lana">Àireamhan Tai Tham Hora</type>
+			<type key="numbers" type="lanatham">Àireamhan Tai Tham Tham</type>
+			<type key="numbers" type="laoo">Àireamhan Làtho</type>
+			<type key="numbers" type="latn">Àireamhan Siarach</type>
+			<type key="numbers" type="lepc">Àireamhan Lepcha</type>
+			<type key="numbers" type="limb">Àireamhan Limbu</type>
+			<type key="numbers" type="mlym">Àireamhan Malayalam</type>
+			<type key="numbers" type="mong">Àireamhan na Mongolaise</type>
+			<type key="numbers" type="mtei">Àireamhan Meetei Mayek</type>
+			<type key="numbers" type="mymr">Àireamhan Miànmar</type>
+			<type key="numbers" type="mymrshan">Àireamhan Shan Miànmar</type>
+			<type key="numbers" type="nkoo">Àireamhan N’Ko</type>
+			<type key="numbers" type="olck">Àireamhan Ol Chiki</type>
+			<type key="numbers" type="orya">Àireamhan Oriya</type>
+			<type key="numbers" type="osma">Àireamhan Osmanya</type>
+			<type key="numbers" type="roman">Àireamhan Ròmanach</type>
+			<type key="numbers" type="romanlow">Àireamhan beaga Ròmanach</type>
+			<type key="numbers" type="saur">Àireamhan Saurashtra</type>
+			<type key="numbers" type="shrd">Àireamhan Sharada</type>
+			<type key="numbers" type="sora">Àireamhan Sora Sompeng</type>
+			<type key="numbers" type="sund">Àireamhan Sunda</type>
+			<type key="numbers" type="takr">Àireamhan Takri</type>
+			<type key="numbers" type="talu">Àireamhan Tai Lue Ùr</type>
+			<type key="numbers" type="taml">Àireamhan na Taimilise Tradaiseanta</type>
+			<type key="numbers" type="tamldec">Àireamhan na Taimilise</type>
+			<type key="numbers" type="telu">Àireamhan Telugu</type>
+			<type key="numbers" type="thai">Àireamhan Tàidh</type>
+			<type key="numbers" type="tibt">Àireamhan na Tibeitise</type>
+			<type key="numbers" type="vaii">Àireamhan Vai</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN">BGN</transformName>
@@ -844,6 +1204,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</delimiters>
 	<dates>
 		<calendars>
+			<calendar type="buddhist">
+				<dateTimeFormats>
+					<intervalFormats>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH – HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">HH:mm – HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm – HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm – HH:mm v</greatestDifference>
+							<greatestDifference id="m">HH:mm – HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH – HH v</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
 			<calendar type="generic">
 				<dateFormats>
 					<dateFormatLength type="full">
@@ -890,6 +1271,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
 						<dateFormatItem id="Gy">G y</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
@@ -898,14 +1280,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
-						<dateFormatItem id="MMdd" draft="unconfirmed">dd/MM</dateFormatItem>
+						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
 						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yMEd">E, d/M/y</dateFormatItem>
-						<dateFormatItem id="yMM" draft="unconfirmed">MM/y</dateFormatItem>
+						<dateFormatItem id="yMM">MM/y</dateFormatItem>
 						<dateFormatItem id="yMMM">LLL y</dateFormatItem>
 						<dateFormatItem id="yMMMM">LLLL y</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
@@ -915,6 +1297,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">LLL y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">MMMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
 					</availableFormats>
@@ -923,21 +1306,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<intervalFormatItem id="d">
 							<greatestDifference id="d">d – d</greatestDifference>
 						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">ha – ha</greatestDifference>
+							<greatestDifference id="h">h – ha</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH – HH</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="a">h:mma – h:mma</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mma</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mma</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hm">
-							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="H">HH:mm – HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm – HH:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="a">h:mma – h:mma v</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mma v</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mma v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="H">HH:mm – HH:mm v</greatestDifference>
+							<greatestDifference id="m">HH:mm – HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">ha – ha v</greatestDifference>
+							<greatestDifference id="h">h – ha v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH – HH v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M – M</greatestDifference>
@@ -1212,14 +1611,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">m</dayPeriod>
+							<dayPeriod type="pm">f</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">m</dayPeriod>
+							<dayPeriod type="pm">f</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">m</dayPeriod>
+							<dayPeriod type="pm">f</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">m</dayPeriod>
+							<dayPeriod type="pm">f</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am">m</dayPeriod>
-							<dayPeriod type="noon">f</dayPeriod>
 							<dayPeriod type="pm">f</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">m</dayPeriod>
-							<dayPeriod type="noon">meadhan-latha</dayPeriod>
 							<dayPeriod type="pm">f</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
@@ -1227,15 +1642,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<eras>
 					<eraNames>
 						<era type="0">Ro Chrìosta</era>
-						<era type="0" alt="variant">RLC</era>
 						<era type="1">An dèidh Chrìosta</era>
-						<era type="1" alt="variant">LC</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0" draft="unconfirmed">RC</era>
-						<era type="0" alt="variant">RLC</era>
-						<era type="1" draft="unconfirmed">AD</era>
-						<era type="1" alt="variant">LC</era>
+						<era type="0">RC</era>
+						<era type="1">AD</era>
 					</eraAbbr>
 					<eraNarrow>
 						<era type="0">R</era>
@@ -1325,6 +1736,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mma v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
@@ -1447,6 +1862,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="roc">
+				<eras>
+					<eraNames>
+						<era type="0">Ro Ph. na Sìne</era>
+						<era type="1">Mínguó</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">Ro PnS</era>
+						<era type="1">Mínguó</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0">Ro PnS</era>
+						<era type="1">Mínguó</era>
+					</eraNarrow>
+				</eras>
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
@@ -1492,14 +1921,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">an ceann {0} bliadhna</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">o chionn {0} bhliadhna</relativeTimePattern>
-					<relativeTimePattern count="two">o chionn {0} bhliadhna</relativeTimePattern>
-					<relativeTimePattern count="few">o chionn {0} bliadhnaichean</relativeTimePattern>
-					<relativeTimePattern count="other">o chionn {0} bliadhna</relativeTimePattern>
+					<relativeTimePattern count="one">{0} bhliadhna air ais</relativeTimePattern>
+					<relativeTimePattern count="two">{0} bhliadhna air ais</relativeTimePattern>
+					<relativeTimePattern count="few">{0} bhliadhnaichean air ais</relativeTimePattern>
+					<relativeTimePattern count="other">{0} bliadhna air ais</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="year-short">
 				<displayName>blia.</displayName>
+				<relative type="-2">a-bhòn-uiridh</relative>
+				<relative type="-1">an-uiridh</relative>
+				<relative type="0">am bliadhna</relative>
+				<relative type="1">an ath-bhliadhna</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">an {0} bhlia.</relativeTimePattern>
 					<relativeTimePattern count="two">an {0} bhlia.</relativeTimePattern>
@@ -1515,21 +1948,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>bl.</displayName>
+				<relative type="-2">a-bh-uir.</relative>
+				<relative type="-1">an-uir.</relative>
+				<relative type="0">am bl.</relative>
+				<relative type="1">an ath-bhl.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">+{0} bl.</relativeTimePattern>
-					<relativeTimePattern count="two">+{0} bl.</relativeTimePattern>
+					<relativeTimePattern count="one">+{0} bhl.</relativeTimePattern>
+					<relativeTimePattern count="two">+{0} bhl.</relativeTimePattern>
 					<relativeTimePattern count="few">+{0} bl.</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} bl.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} bl.</relativeTimePattern>
-					<relativeTimePattern count="two">-{0} bl.</relativeTimePattern>
+					<relativeTimePattern count="one">-{0} bhl.</relativeTimePattern>
+					<relativeTimePattern count="two">-{0} bhl.</relativeTimePattern>
 					<relativeTimePattern count="few">-{0} bl.</relativeTimePattern>
 					<relativeTimePattern count="other">-{0} bl.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter">
 				<displayName>cairteal</displayName>
+				<relative type="-1">an cairteal seo chaidh</relative>
+				<relative type="0">an cairteal seo</relative>
+				<relative type="1">an ath-chairteal</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">an ceann {0} chairteil</relativeTimePattern>
 					<relativeTimePattern count="two">an ceann {0} chairteil</relativeTimePattern>
@@ -1545,6 +1985,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>cairt.</displayName>
+				<relative type="-1">an cairt. sa chaidh</relative>
+				<relative type="0">an cairt. seo</relative>
+				<relative type="1">an ath-chairt.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">an {0} chairt.</relativeTimePattern>
 					<relativeTimePattern count="two">an {0} chairt.</relativeTimePattern>
@@ -1560,6 +2003,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>c.</displayName>
+				<relative type="-1">c. ch.</relative>
+				<relative type="0">an c. seo</relative>
+				<relative type="1">ath-ch.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} c.</relativeTimePattern>
 					<relativeTimePattern count="two">+{0} c.</relativeTimePattern>
@@ -1585,38 +2031,44 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">an ceann {0} mìosa</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">o chionn {0} mhìosa</relativeTimePattern>
-					<relativeTimePattern count="two">o chionn {0} mhìosa</relativeTimePattern>
-					<relativeTimePattern count="few">o chionn {0} mìosan</relativeTimePattern>
-					<relativeTimePattern count="other">o chionn {0} mìosa</relativeTimePattern>
+					<relativeTimePattern count="one">{0} mhìos air ais</relativeTimePattern>
+					<relativeTimePattern count="two">{0} mhìos air ais</relativeTimePattern>
+					<relativeTimePattern count="few">{0} mìosan air ais</relativeTimePattern>
+					<relativeTimePattern count="other">{0} mìos air ais</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month-short">
 				<displayName>mìos</displayName>
+				<relative type="-1">am mìos sa chaidh</relative>
+				<relative type="0">am mìos seo</relative>
+				<relative type="1">an ath-mhìos</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">an {0} mìos.</relativeTimePattern>
-					<relativeTimePattern count="two">an {0} mìos.</relativeTimePattern>
+					<relativeTimePattern count="one">an {0} mhìos.</relativeTimePattern>
+					<relativeTimePattern count="two">an {0} mhìos.</relativeTimePattern>
 					<relativeTimePattern count="few">an {0} mìos.</relativeTimePattern>
 					<relativeTimePattern count="other">an {0} mìos.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">o {0} mìos.</relativeTimePattern>
-					<relativeTimePattern count="two">o {0} mìos.</relativeTimePattern>
+					<relativeTimePattern count="one">o {0} mhìos.</relativeTimePattern>
+					<relativeTimePattern count="two">o {0} mhìos.</relativeTimePattern>
 					<relativeTimePattern count="few">o {0} mìos.</relativeTimePattern>
 					<relativeTimePattern count="other">o {0} mìos.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month-narrow">
 				<displayName>mì.</displayName>
+				<relative type="-1">mì. ch.</relative>
+				<relative type="0">am mì. seo</relative>
+				<relative type="1">ath-mhì.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">+{0} mì.</relativeTimePattern>
-					<relativeTimePattern count="two">+{0} mì.</relativeTimePattern>
+					<relativeTimePattern count="one">+{0} mhì.</relativeTimePattern>
+					<relativeTimePattern count="two">+{0} mhì.</relativeTimePattern>
 					<relativeTimePattern count="few">+{0} mì.</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} mì.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} mì.</relativeTimePattern>
-					<relativeTimePattern count="two">-{0} mì.</relativeTimePattern>
+					<relativeTimePattern count="one">-{0} mhì.</relativeTimePattern>
+					<relativeTimePattern count="two">-{0} mhì.</relativeTimePattern>
 					<relativeTimePattern count="few">-{0} mì.</relativeTimePattern>
 					<relativeTimePattern count="other">-{0} mì.</relativeTimePattern>
 				</relativeTime>
@@ -1633,14 +2085,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">an ceann {0} seachdain</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">o chionn {0} seachdain</relativeTimePattern>
-					<relativeTimePattern count="two">o chionn {0} sheachdain</relativeTimePattern>
-					<relativeTimePattern count="few">o chionn {0} seachdainean</relativeTimePattern>
-					<relativeTimePattern count="other">o chionn {0} seachdain</relativeTimePattern>
+					<relativeTimePattern count="one">{0} seachdain air ais</relativeTimePattern>
+					<relativeTimePattern count="two">{0} sheachdain air ais</relativeTimePattern>
+					<relativeTimePattern count="few">{0} seachdainean air ais</relativeTimePattern>
+					<relativeTimePattern count="other">{0} seachdain air ais</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week-short">
 				<displayName>seachd.</displayName>
+				<relative type="-1">seachd. sa chaidh</relative>
+				<relative type="0">an t-seachd. seo</relative>
+				<relative type="1">an ath-sheachd.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">an {0} sheachd.</relativeTimePattern>
 					<relativeTimePattern count="two">an {0} sheachd.</relativeTimePattern>
@@ -1656,6 +2111,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>sn.</displayName>
+				<relative type="-1">sn. ch.</relative>
+				<relative type="0">an t-sn. seo</relative>
+				<relative type="1">ath-shn.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} sn.</relativeTimePattern>
 					<relativeTimePattern count="two">+{0} sn.</relativeTimePattern>
@@ -1684,14 +2142,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">an ceann {0} latha</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">o chionn {0} latha</relativeTimePattern>
-					<relativeTimePattern count="two">o chionn {0} latha</relativeTimePattern>
-					<relativeTimePattern count="few">o chionn {0} làithean</relativeTimePattern>
-					<relativeTimePattern count="other">o chionn {0} latha</relativeTimePattern>
+					<relativeTimePattern count="one">{0} latha air ais</relativeTimePattern>
+					<relativeTimePattern count="two">{0} latha air ais</relativeTimePattern>
+					<relativeTimePattern count="few">{0} làithean air ais</relativeTimePattern>
+					<relativeTimePattern count="other">{0} latha air ais</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day-short">
 				<displayName>là</displayName>
+				<relative type="-2">a-bhòin-dè</relative>
+				<relative type="-1">an-dè</relative>
+				<relative type="0">an-diugh</relative>
+				<relative type="1">a-màireach</relative>
+				<relative type="2">an-earar</relative>
+				<relative type="3">an-eararais</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">an {0} là</relativeTimePattern>
 					<relativeTimePattern count="two">an {0} là</relativeTimePattern>
@@ -1707,6 +2171,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>là</displayName>
+				<relative type="-2">a-bhòin-dè</relative>
+				<relative type="-1">an-dè</relative>
+				<relative type="0">an-diugh</relative>
+				<relative type="1">a-màireach</relative>
+				<relative type="2">an-earar</relative>
+				<relative type="3">an-eararais</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} là</relativeTimePattern>
 					<relativeTimePattern count="two">+{0} là</relativeTimePattern>
@@ -1840,10 +2310,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">an ceann {0} uair a thìde</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">o chionn {0} uair a thìde</relativeTimePattern>
-					<relativeTimePattern count="two">o chionn {0} uair a thìde</relativeTimePattern>
-					<relativeTimePattern count="few">o chionn {0} uairean a thìde</relativeTimePattern>
-					<relativeTimePattern count="other">o chionn {0} uair a thìde</relativeTimePattern>
+					<relativeTimePattern count="one">{0} uair a thìde air ais</relativeTimePattern>
+					<relativeTimePattern count="two">{0} uair a thìde air ais</relativeTimePattern>
+					<relativeTimePattern count="few">{0} uairean a thìde air ais</relativeTimePattern>
+					<relativeTimePattern count="other">{0} uair a thìde air ais</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-short">
@@ -1885,10 +2355,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">an ceann {0} mionaid</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">o chionn {0} mhionaid</relativeTimePattern>
-					<relativeTimePattern count="two">o chionn {0} mhionaid</relativeTimePattern>
-					<relativeTimePattern count="few">o chionn {0} mionaidean</relativeTimePattern>
-					<relativeTimePattern count="other">o chionn {0} mionaid</relativeTimePattern>
+					<relativeTimePattern count="one">{0} mhionaid air ais</relativeTimePattern>
+					<relativeTimePattern count="two">{0} mhionaid air ais</relativeTimePattern>
+					<relativeTimePattern count="few">{0} mionaidean air ais</relativeTimePattern>
+					<relativeTimePattern count="other">{0} mionaid air ais</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute-short">
@@ -1923,6 +2393,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="second">
 				<displayName>diog</displayName>
+				<relative type="0">an-dràsta</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">an ceann {0} diog</relativeTimePattern>
 					<relativeTimePattern count="two">an ceann {0} dhiog</relativeTimePattern>
@@ -1930,14 +2401,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">an ceann {0} diog</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">o chionn {0} diog</relativeTimePattern>
-					<relativeTimePattern count="two">o chionn {0} dhiog</relativeTimePattern>
-					<relativeTimePattern count="few">o chionn {0} diogan</relativeTimePattern>
-					<relativeTimePattern count="other">o chionn {0} diog</relativeTimePattern>
+					<relativeTimePattern count="one">{0} diog air ais</relativeTimePattern>
+					<relativeTimePattern count="two">{0} dhiog air ais</relativeTimePattern>
+					<relativeTimePattern count="few">{0} diogan air ais</relativeTimePattern>
+					<relativeTimePattern count="other">{0} diog air ais</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second-short">
 				<displayName>diog</displayName>
+				<relative type="0">an-dràsta</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">an {0} diog</relativeTimePattern>
 					<relativeTimePattern count="two">an {0} dhiog</relativeTimePattern>
@@ -1953,6 +2425,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="second-narrow">
 				<displayName>d</displayName>
+				<relative type="0">an-dràsta</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} d</relativeTimePattern>
 					<relativeTimePattern count="two">+{0} d</relativeTimePattern>
@@ -2454,7 +2927,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</zone>
 			<zone type="Europe/London">
 				<long>
-					<daylight>Tìde Samhraidh Bhreatainn</daylight>
+					<daylight>Tìde samhraidh Bhreatainn</daylight>
 				</long>
 				<short>
 					<daylight>TSB</daylight>
@@ -2553,7 +3026,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<daylight>Bun-àm na h-Èireann</daylight>
 				</long>
 				<short>
-					<daylight draft="unconfirmed">TSÈ (Èirinn)</daylight>
+					<daylight>TSÈ (Èirinn)</daylight>
 				</short>
 				<exemplarCity>Baile Àtha Cliath</exemplarCity>
 			</zone>
@@ -2851,6 +3324,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
 			</zone>
@@ -2935,6 +3411,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Chita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Yakutsk</exemplarCity>
 			</zone>
@@ -2953,6 +3432,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolymsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamchatka</exemplarCity>
 			</zone>
@@ -3101,6 +3583,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Nome</exemplarCity>
 			</zone>
 			<zone type="Pacific/Honolulu">
+				<short>
+					<generic>HST</generic>
+					<standard>HST</standard>
+					<daylight>HDT</daylight>
+				</short>
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
 			<zone type="America/Anchorage">
@@ -3256,7 +3743,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Africa_Southern">
 				<long>
-					<standard>Bun-àm Afraga a Deas</standard>
+					<standard>Àm Afraga a Deas</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Western">
@@ -3272,6 +3759,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<standard>Bun-àm Alaska</standard>
 					<daylight>Tìde samhraidh Alaska</daylight>
 				</long>
+				<short>
+					<generic draft="contributed">AKT</generic>
+					<standard draft="contributed">AKST</standard>
+					<daylight draft="contributed">AKDT</daylight>
+				</short>
 			</metazone>
 			<metazone type="Almaty">
 				<long>
@@ -3293,6 +3785,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<standard>Bun-àm Meadhan Aimeireaga a Tuath</standard>
 					<daylight>Tìde samhraidh Meadhan Aimeireaga a Tuath</daylight>
 				</long>
+				<short>
+					<generic draft="contributed">CT</generic>
+					<standard draft="contributed">CST</standard>
+					<daylight draft="contributed">CDT</daylight>
+				</short>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
@@ -3300,6 +3797,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<standard>Bun-àm Aimeireaga a Tuath an Ear</standard>
 					<daylight>Tìde samhraidh Aimeireaga a Tuath an Ear</daylight>
 				</long>
+				<short>
+					<generic draft="contributed">ET</generic>
+					<standard draft="contributed">EST</standard>
+					<daylight draft="contributed">EDT</daylight>
+				</short>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
@@ -3307,6 +3809,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<standard>Bun-àm Monadh Aimeireaga a Tuath</standard>
 					<daylight>Tìde samhraidh Monadh Aimeireaga a Tuath</daylight>
 				</long>
+				<short>
+					<generic draft="contributed">MT</generic>
+					<standard draft="contributed">MST</standard>
+					<daylight draft="contributed">MDT</daylight>
+				</short>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
@@ -3314,6 +3821,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<standard>Bun-àm a’ Chuain Sèimh</standard>
 					<daylight>Tìde samhraidh a’ Chuain Sèimh</daylight>
 				</long>
+				<short>
+					<generic draft="contributed">PT</generic>
+					<standard draft="contributed">PST</standard>
+					<daylight draft="contributed">PDT</daylight>
+				</short>
 			</metazone>
 			<metazone type="Anadyr">
 				<long>
@@ -3377,6 +3889,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<standard>Bun-àm a’ Chuain Siar</standard>
 					<daylight>Tìde samhraidh a’ Chuain Siar</daylight>
 				</long>
+				<short>
+					<generic draft="contributed">AT</generic>
+					<standard draft="contributed">AST</standard>
+					<daylight draft="contributed">ADT</daylight>
+				</short>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
@@ -3559,9 +4076,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<daylight>Tìde samhraidh Meadhan na Roinn-Eòrpa</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">CET</generic>
-					<standard draft="unconfirmed">CET</standard>
-					<daylight draft="unconfirmed">CEST</daylight>
+					<generic draft="contributed">CET</generic>
+					<standard draft="contributed">CET</standard>
+					<daylight draft="contributed">CEST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Europe_Eastern">
@@ -3571,9 +4088,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<daylight>Tìde samhraidh na Roinn-Eòrpa an Ear</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">EET</generic>
-					<standard draft="unconfirmed">EET</standard>
-					<daylight draft="unconfirmed">EEST</daylight>
+					<generic draft="contributed">EET</generic>
+					<standard draft="contributed">EET</standard>
+					<daylight draft="contributed">EEST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
@@ -3588,9 +4105,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<daylight>Tìde samhraidh na Roinn-Eòrpa an Iar</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">WET</generic>
-					<standard draft="unconfirmed">WET</standard>
-					<daylight draft="unconfirmed">WEST</daylight>
+					<generic draft="contributed">WET</generic>
+					<standard draft="contributed">WET</standard>
+					<daylight draft="contributed">WEST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Falkland">
@@ -3644,7 +4161,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<standard>Greenwich Mean Time</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">GMT</standard>
+					<standard draft="contributed">GMT</standard>
 				</short>
 			</metazone>
 			<metazone type="Greenland_Eastern">
@@ -3678,10 +4195,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
-					<generic>Àm nan Eileanan Hawai’i ‘s Aleutach</generic>
-					<standard>Bun-àm nan Eileanan Hawai’i ‘s Aleutach</standard>
-					<daylight>Tìde Samhraidh nan Eileanan Hawai’i ‘s Aleutach</daylight>
+					<generic>Àm nan Eileanan Hawai’i ’s Aleutach</generic>
+					<standard>Bun-àm nan Eileanan Hawai’i ’s Aleutach</standard>
+					<daylight>Tìde Samhraidh nan Eileanan Hawai’i ’s Aleutach</daylight>
 				</long>
+				<short>
+					<generic draft="contributed">HAT</generic>
+					<standard draft="contributed">HAST</standard>
+					<daylight draft="contributed">HADT</daylight>
+				</short>
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>
@@ -3849,7 +4371,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Marshall_Islands">
 				<long>
-					<standard>Eileanan Mharshall</standard>
+					<standard>Àm Eileanan Mharshall</standard>
 				</long>
 			</metazone>
 			<metazone type="Mauritius">
@@ -4026,9 +4548,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Qyzylorda">
 				<long>
-					<generic>Àm Qyzylorda</generic>
-					<standard>Bun-àm Qyzylorda</standard>
-					<daylight>Tìde samhraidh Qyzylorda</daylight>
+					<generic>Àm Qızılorda</generic>
+					<standard>Bun-àm Qızılorda</standard>
+					<daylight>Tìde samhraidh Qızılorda</daylight>
 				</long>
 			</metazone>
 			<metazone type="Reunion">
@@ -4215,10 +4737,258 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<native draft="contributed">latn</native>
 		</otherNumberingSystems>
 		<minimumGroupingDigits draft="contributed">1</minimumGroupingDigits>
+		<symbols numberSystem="arab">
+			<decimal>٫</decimal>
+			<group>٬</group>
+			<list>؛</list>
+			<percentSign>٪</percentSign>
+			<plusSign>‏+</plusSign>
+			<minusSign>‏-</minusSign>
+			<exponential>اس</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>؉</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+			<timeSeparator draft="contributed">:</timeSeparator>
+		</symbols>
+		<symbols numberSystem="arabext">
+			<decimal>٫</decimal>
+			<group>٬</group>
+			<list>؛</list>
+			<percentSign>٪</percentSign>
+			<plusSign>‎+‎</plusSign>
+			<minusSign>‎-‎</minusSign>
+			<exponential>×۱۰^</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>؉</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="bali">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="beng">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="brah">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="cakm">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="cham">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="deva">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="fullwide">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="gujr">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="guru">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="hanidec">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="java">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="kali">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="khmr">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="knda">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="lana">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="lanatham">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="laoo">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
 		<symbols numberSystem="latn">
 			<decimal>.</decimal>
 			<group>,</group>
-			<list draft="unconfirmed">;</list>
+			<list>;</list>
 			<percentSign>%</percentSign>
 			<plusSign>+</plusSign>
 			<minusSign>-</minusSign>
@@ -4229,6 +4999,299 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<nan>NaN</nan>
 			<timeSeparator draft="contributed">:</timeSeparator>
 		</symbols>
+		<symbols numberSystem="lepc">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="limb">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="mlym">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="mong">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="mtei">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="mymr">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="mymrshan">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="nkoo">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="olck">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="orya">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="osma">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="saur">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="shrd">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="sora">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="sund">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="takr">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="talu">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="tamldec">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="telu">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="thai">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="tibt">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="vaii">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<decimalFormats numberSystem="fullwide">
+			<decimalFormatLength>
+				<decimalFormat>
+					<pattern>#,##0.###</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+		</decimalFormats>
 		<decimalFormats numberSystem="latn">
 			<decimalFormatLength>
 				<decimalFormat>
@@ -4245,8 +5308,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern type="10000" count="two">00 mhìle</pattern>
 					<pattern type="10000" count="few">00 mìle</pattern>
 					<pattern type="10000" count="other">00 mìle</pattern>
-					<pattern type="100000" count="one">000 mìle</pattern>
-					<pattern type="100000" count="two">000 mìle</pattern>
+					<pattern type="100000" count="one">000 mhìle</pattern>
+					<pattern type="100000" count="two">000 mhìle</pattern>
 					<pattern type="100000" count="few">000 mìle</pattern>
 					<pattern type="100000" count="other">000 mìle</pattern>
 					<pattern type="1000000" count="one">0 mhillean</pattern>
@@ -4257,8 +5320,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern type="10000000" count="two">00 mhillean</pattern>
 					<pattern type="10000000" count="few">00 millean</pattern>
 					<pattern type="10000000" count="other">00 millean</pattern>
-					<pattern type="100000000" count="one">000 millean</pattern>
-					<pattern type="100000000" count="two">000 millean</pattern>
+					<pattern type="100000000" count="one">000 mhillean</pattern>
+					<pattern type="100000000" count="two">000 mhillean</pattern>
 					<pattern type="100000000" count="few">000 millean</pattern>
 					<pattern type="100000000" count="other">000 millean</pattern>
 					<pattern type="1000000000" count="one">0 bhillean</pattern>
@@ -4271,8 +5334,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern type="10000000000" count="other">00 billean</pattern>
 					<pattern type="100000000000" count="one">000 billean</pattern>
 					<pattern type="100000000000" count="two">000 billean</pattern>
-					<pattern type="100000000000" count="few">000 billean</pattern>
-					<pattern type="100000000000" count="other">000 billean</pattern>
+					<pattern type="100000000000" count="few">000 bhillean</pattern>
+					<pattern type="100000000000" count="other">000 bhillean</pattern>
 					<pattern type="1000000000000" count="one">0 trillean</pattern>
 					<pattern type="1000000000000" count="two">0 thrillean</pattern>
 					<pattern type="1000000000000" count="few">0 trillean</pattern>
@@ -4281,9 +5344,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern type="10000000000000" count="two">00 thrillean</pattern>
 					<pattern type="10000000000000" count="few">00 trillean</pattern>
 					<pattern type="10000000000000" count="other">00 trillean</pattern>
-					<pattern type="100000000000000" count="one">000T</pattern>
-					<pattern type="100000000000000" count="two">000T</pattern>
-					<pattern type="100000000000000" count="few">000T</pattern>
+					<pattern type="100000000000000" count="one">000 trillean</pattern>
+					<pattern type="100000000000000" count="two">000 thrillean</pattern>
+					<pattern type="100000000000000" count="few">000 trillean</pattern>
 					<pattern type="100000000000000" count="other">000 trillean</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
@@ -4340,6 +5403,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<scientificFormats numberSystem="fullwide">
+			<scientificFormatLength>
+				<scientificFormat>
+					<pattern>#E0</pattern>
+				</scientificFormat>
+			</scientificFormatLength>
+		</scientificFormats>
 		<scientificFormats numberSystem="latn">
 			<scientificFormatLength>
 				<scientificFormat>
@@ -4347,6 +5417,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</scientificFormat>
 			</scientificFormatLength>
 		</scientificFormats>
+		<percentFormats numberSystem="fullwide">
+			<percentFormatLength>
+				<percentFormat>
+					<pattern>#,##0%</pattern>
+				</percentFormat>
+			</percentFormatLength>
+		</percentFormats>
 		<percentFormats numberSystem="latn">
 			<percentFormatLength>
 				<percentFormat>
@@ -4354,6 +5431,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</percentFormat>
 			</percentFormatLength>
 		</percentFormats>
+		<currencyFormats numberSystem="fullwide">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>¤#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<unitPattern count="one">{0} {1}</unitPattern>
+			<unitPattern count="two">{0} {1}</unitPattern>
+			<unitPattern count="few">{0} {1}</unitPattern>
+			<unitPattern count="other">{0} {1}</unitPattern>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
@@ -4363,6 +5454,58 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">¤0K</pattern>
+					<pattern type="1000" count="two">¤0K</pattern>
+					<pattern type="1000" count="few">¤0K</pattern>
+					<pattern type="1000" count="other">¤0K</pattern>
+					<pattern type="10000" count="one">¤00K</pattern>
+					<pattern type="10000" count="two">¤00K</pattern>
+					<pattern type="10000" count="few">¤00K</pattern>
+					<pattern type="10000" count="other">¤00K</pattern>
+					<pattern type="100000" count="one">¤000K</pattern>
+					<pattern type="100000" count="two">¤000K</pattern>
+					<pattern type="100000" count="few">¤000K</pattern>
+					<pattern type="100000" count="other">¤000K</pattern>
+					<pattern type="1000000" count="one">¤0M</pattern>
+					<pattern type="1000000" count="two">¤0M</pattern>
+					<pattern type="1000000" count="few">¤0M</pattern>
+					<pattern type="1000000" count="other">¤0M</pattern>
+					<pattern type="10000000" count="one">¤00M</pattern>
+					<pattern type="10000000" count="two">¤00M</pattern>
+					<pattern type="10000000" count="few">¤00M</pattern>
+					<pattern type="10000000" count="other">¤00M</pattern>
+					<pattern type="100000000" count="one">¤000M</pattern>
+					<pattern type="100000000" count="two">¤000M</pattern>
+					<pattern type="100000000" count="few">¤000M</pattern>
+					<pattern type="100000000" count="other">¤000M</pattern>
+					<pattern type="1000000000" count="one">¤0B</pattern>
+					<pattern type="1000000000" count="two">¤0B</pattern>
+					<pattern type="1000000000" count="few">¤0B</pattern>
+					<pattern type="1000000000" count="other">¤0B</pattern>
+					<pattern type="10000000000" count="one">¤00B</pattern>
+					<pattern type="10000000000" count="two">¤00B</pattern>
+					<pattern type="10000000000" count="few">¤00B</pattern>
+					<pattern type="10000000000" count="other">¤00B</pattern>
+					<pattern type="100000000000" count="one">¤000B</pattern>
+					<pattern type="100000000000" count="two">¤000B</pattern>
+					<pattern type="100000000000" count="few">¤000B</pattern>
+					<pattern type="100000000000" count="other">¤000B</pattern>
+					<pattern type="1000000000000" count="one">¤0T</pattern>
+					<pattern type="1000000000000" count="two">¤0T</pattern>
+					<pattern type="1000000000000" count="few">¤0T</pattern>
+					<pattern type="1000000000000" count="other">¤0T</pattern>
+					<pattern type="10000000000000" count="one">¤00T</pattern>
+					<pattern type="10000000000000" count="two">¤00T</pattern>
+					<pattern type="10000000000000" count="few">¤00T</pattern>
+					<pattern type="10000000000000" count="other">¤00T</pattern>
+					<pattern type="100000000000000" count="one">¤000T</pattern>
+					<pattern type="100000000000000" count="two">¤000T</pattern>
+					<pattern type="100000000000000" count="few">¤000T</pattern>
+					<pattern type="100000000000000" count="other">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="two">{0} {1}</unitPattern>
 			<unitPattern count="few">{0} {1}</unitPattern>
@@ -4440,6 +5583,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">kwanza Angòlach</displayName>
 				<displayName count="other">kwanza Angòlach</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>Kwanza Angòlach (1977–1991)</displayName>
@@ -4562,6 +5706,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">mark iompachail Bhosna agus Hearsagobhana</displayName>
 				<displayName count="other">mark iompachail Bhosna agus Hearsagobhana</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BAN">
 				<displayName>Dinar ùr Bhosna agus Hearsagobhana (1994–1997)</displayName>
@@ -4686,6 +5831,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">boliviano Boilibhiach</displayName>
 				<displayName count="other">boliviano Boilibhiach</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOL">
 				<displayName>Boliviano Boilibhiach (1863–1963)</displayName>
@@ -4800,6 +5946,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">pula Botsuanach</displayName>
 				<displayName count="other">pula Botsuanach</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>Rùbal ùr Bealaruiseach (1994–1999)</displayName>
@@ -4959,6 +6106,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">pesothan iompachail Cùbach</displayName>
 				<displayName count="other">peso iompachail Cùbach</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>Peso Cùbach</displayName>
@@ -4992,6 +6140,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">koruna Seiceach</displayName>
 				<displayName count="other">koruna Seiceach</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>Mark na Gearmailte an Ear</displayName>
@@ -5024,6 +6173,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">kroner Danmhairgeach</displayName>
 				<displayName count="other">krone Danmhairgeach</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Peso Doiminiceach</displayName>
@@ -5073,6 +6223,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">puinnd Èipheiteach</displayName>
 				<displayName count="other">punnd Èipheiteach</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>Nakfa Eartrach</displayName>
@@ -5148,6 +6299,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">puinnd Fhàclannach</displayName>
 				<displayName count="other">punnd Fàclannach</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>Franc Frangach</displayName>
@@ -5222,6 +6374,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">franc Ginitheach</displayName>
 				<displayName count="other">franc Ginitheach</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>Syli Ginitheach</displayName>
@@ -5254,6 +6407,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">quetzal Guatamalach</displayName>
 				<displayName count="other">quetzal Guatamalach</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>Escudo Gini na Portagaile</displayName>
@@ -5296,6 +6450,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lempira Hondùrach</displayName>
 				<displayName count="other">lempira Hondùrach</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>Dinar Cròthaiseach</displayName>
@@ -5312,6 +6467,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">kuna Cròthaiseach</displayName>
 				<displayName count="other">kuna Cròthaiseach</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>Gourde Haidhteach</displayName>
@@ -5328,6 +6484,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">forint Ungaireach</displayName>
 				<displayName count="other">forint Ungaireach</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>Rupiah Innd-Innseach</displayName>
@@ -5336,6 +6493,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">rupiah Innd-Innseach</displayName>
 				<displayName count="other">rupiah Innd-Innseach</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>Punnd Èireannach</displayName>
@@ -5410,6 +6568,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">krónur Innis Tìleach</displayName>
 				<displayName count="other">króna Innis Tìleach</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>Lira Eadailteach</displayName>
@@ -5477,6 +6636,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">franc Comorosach</displayName>
 				<displayName count="other">franc Comorosach</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>Won Choirèa a Tuath</displayName>
@@ -5485,6 +6645,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">won Choirèa a Tuath</displayName>
 				<displayName count="other">won Choirèa a Tuath</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRH">
 				<displayName>Hwan Choirèa a Deas (1953–1962)</displayName>
@@ -5553,6 +6714,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">puinnd Leabanach</displayName>
 				<displayName count="other">punnd Leabanach</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>Rupee Sri Lancach</displayName>
@@ -5561,6 +6723,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">rupee Sri Lancach</displayName>
 				<displayName count="other">rupee Sri Lancach</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>Dolar Libèireach</displayName>
@@ -5586,6 +6749,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">litas Liotuaineach</displayName>
 				<displayName count="other">litas Liotuaineach</displayName>
 				<symbol>LTL</symbol>
+				<symbol alt="narrow" draft="contributed">Lt</symbol>
 			</currency>
 			<currency type="LTT">
 				<displayName>Talonas Liotuaineach</displayName>
@@ -5626,6 +6790,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lats Laitbheach</displayName>
 				<displayName count="other">lats Laitbheach</displayName>
 				<symbol>LVL</symbol>
+				<symbol alt="narrow" draft="contributed">Ls</symbol>
 			</currency>
 			<currency type="LVR">
 				<displayName>Rùbal Laitbheach</displayName>
@@ -5690,6 +6855,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">ariary Madagasgarach</displayName>
 				<displayName count="other">ariary Madagasgarach</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>Franc Madagasgarach</displayName>
@@ -5730,6 +6896,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">kyat Miànmarach</displayName>
 				<displayName count="other">kyat Miànmarach</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>Tugrik Mongolach</displayName>
@@ -5779,6 +6946,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">rupee Moiriseasach</displayName>
 				<displayName count="other">rupee Moiriseasach</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVP">
 				<displayName>Rupee Maladaibheach</displayName>
@@ -5836,6 +7004,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">ringgit Malaidheach</displayName>
 				<displayName count="other">ringgit Malaidheach</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>Escudo Mòsaimbiceach</displayName>
@@ -5894,6 +7063,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">córdoba Niocaragach</displayName>
 				<displayName count="other">córdoba Niocaragach</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>Gulden Duitseach</displayName>
@@ -5910,6 +7080,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">kroner Nirribheach</displayName>
 				<displayName count="other">krone Nirribheach</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>Rupee Neapàlach</displayName>
@@ -5918,6 +7089,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">rupee Neapàlach</displayName>
 				<displayName count="other">rupee Neapàlach</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>Dolar Shealainn Nuaidh</displayName>
@@ -5992,6 +7164,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">rupee Pagastànach</displayName>
 				<displayName count="other">rupee Pagastànach</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>Złoty Pòlainneach</displayName>
@@ -6000,6 +7173,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">złoty Pòlainneach</displayName>
 				<displayName count="other">złoty Pòlainneach</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>Złoty Pòlainneach (1950–1995)</displayName>
@@ -6073,6 +7247,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">rùbalan Ruiseach</displayName>
 				<displayName count="other">rùbal Ruiseach</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>Rùbal Ruiseach (1991–1998)</displayName>
@@ -6090,6 +7265,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">franc Rubhandach</displayName>
 				<displayName count="other">franc Rubhandach</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>Riyal Sabhdach</displayName>
@@ -6147,6 +7323,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">kronor Suaineach</displayName>
 				<displayName count="other">krona Suaineach</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>Dolar Singeapòrach</displayName>
@@ -6164,6 +7341,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">puinnd Eilean Naomh Eilidh</displayName>
 				<displayName count="other">punnd Eilean Naomh Eilidh</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>Tolar Slòbhaineach</displayName>
@@ -6225,11 +7403,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="STD">
 				<displayName>Dobra São Tomé agus Príncipe</displayName>
-				<displayName count="one">dhobra São Tomé agus Príncipe</displayName>
-				<displayName count="two">dobra São Tomé agus Príncipe</displayName>
+				<displayName count="one">dobra São Tomé agus Príncipe</displayName>
+				<displayName count="two">dhobra São Tomé agus Príncipe</displayName>
 				<displayName count="few">dobra São Tomé agus Príncipe</displayName>
 				<displayName count="other">dobra São Tomé agus Príncipe</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>Rùbal Sovietach</displayName>
@@ -6254,6 +7433,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">puinnd Shiridheach</displayName>
 				<displayName count="other">punnd Siridheach</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>Lilangeni Suasaidheach</displayName>
@@ -6270,6 +7450,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">baht Tàidheach</displayName>
 				<displayName count="other">baht Tàidheach</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>Rùbal Taidigeach</displayName>
@@ -6318,6 +7499,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">paʻanga Tongach</displayName>
 				<displayName count="other">paʻanga Tongach</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>Escudo Tìomorach</displayName>
@@ -6343,6 +7525,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">lira Turcach</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Dolar Thrianaid agus Thobago</displayName>
@@ -6476,6 +7659,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">bolívar Bheinisealach</displayName>
 				<displayName count="other">bolívar Bheinisealach</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>Dong Bhiet-Namach</displayName>
@@ -6504,7 +7688,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="WST">
 				<displayName>Tala Samothach</displayName>
-				<displayName count="one">thala Samothach</displayName>
+				<displayName count="one">tala Samothach</displayName>
 				<displayName count="two">thala Samothach</displayName>
 				<displayName count="few">tala Samothach</displayName>
 				<displayName count="other">tala Samothach</displayName>
@@ -6573,6 +7757,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dolaran Caraibeach earach</displayName>
 				<displayName count="other">dolar Caraibeach earach</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>Còir tarraing shònraichte</displayName>
@@ -6741,6 +7926,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">rand Afraga a Deas</displayName>
 				<displayName count="other">rand Afraga a Deas</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>Kwacha Sàimbitheach (1968–2012)</displayName>
@@ -6757,6 +7943,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">kwacha Sàimbitheach</displayName>
 				<displayName count="other">kwacha Sàimbitheach</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>Zaïre ùr Zaïreach (1993–1998)</displayName>
@@ -6799,6 +7986,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>ZWR</symbol>
 			</currency>
 		</currencies>
+		<miscPatterns numberSystem="fullwide">
+			<pattern type="atLeast">{0}+</pattern>
+			<pattern type="range">{0}–{1}</pattern>
+		</miscPatterns>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
 			<pattern type="range">{0}–{1}</pattern>
@@ -6806,6 +7997,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</numbers>
 	<units>
 		<unitLength type="long">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0} / {1}</compoundUnitPattern>
+			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>forsa-g</displayName>
 				<unitPattern count="one">{0} fhorsa-g</unitPattern>
@@ -6814,11 +8008,32 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} forsa-g</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
-				<displayName>meatair gach diog ceàrnagach</displayName>
-				<unitPattern count="one">{0} mheatair gach diog ceàrnagach</unitPattern>
-				<unitPattern count="two">{0} mheatair gach diog ceàrnagach</unitPattern>
-				<unitPattern count="few">{0} meatairean gach diog ceàrnagach</unitPattern>
-				<unitPattern count="other">{0} meatair gach diog ceàrnagach</unitPattern>
+				<displayName>meatair san diog cheàrnagach</displayName>
+				<unitPattern count="one">{0} mheatair san diog cheàrnagach</unitPattern>
+				<unitPattern count="two">{0} mheatair san diog cheàrnagach</unitPattern>
+				<unitPattern count="few">{0} meatairean san diog cheàrnagach</unitPattern>
+				<unitPattern count="other">{0} meatair san diog cheàrnagach</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>cuairt</displayName>
+				<unitPattern count="one">{0} chuairt</unitPattern>
+				<unitPattern count="two">{0} chuairt</unitPattern>
+				<unitPattern count="few">{0} cuairtean</unitPattern>
+				<unitPattern count="other">{0} cuairt</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rèidean</displayName>
+				<unitPattern count="one">{0} rèidean</unitPattern>
+				<unitPattern count="two">{0} rèidean</unitPattern>
+				<unitPattern count="few">{0} rèideanan</unitPattern>
+				<unitPattern count="other">{0} rèidean</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>ceum</displayName>
+				<unitPattern count="one">{0} cheum</unitPattern>
+				<unitPattern count="two">{0} cheum</unitPattern>
+				<unitPattern count="few">{0} ceuman</unitPattern>
+				<unitPattern count="other">{0} ceum</unitPattern>
 			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>àrc-mhionaid</displayName>
@@ -6834,26 +8049,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} àrc-dhiogan</unitPattern>
 				<unitPattern count="other">{0} àrc-dhiog</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>ceum</displayName>
-				<unitPattern count="one">{0} cheum</unitPattern>
-				<unitPattern count="two">{0} cheum</unitPattern>
-				<unitPattern count="few">{0} ceuman</unitPattern>
-				<unitPattern count="other">{0} ceum</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rèidean</displayName>
-				<unitPattern count="one">{0} rèidean</unitPattern>
-				<unitPattern count="two">{0} rèidean</unitPattern>
-				<unitPattern count="few">{0} rèideanan</unitPattern>
-				<unitPattern count="other">{0} rèidean</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>acair</displayName>
-				<unitPattern count="one">{0} acair</unitPattern>
-				<unitPattern count="two">{0} acair</unitPattern>
-				<unitPattern count="few">{0} acraichean</unitPattern>
-				<unitPattern count="other">{0} acair</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>cilemeatair ceàrnagach</displayName>
+				<unitPattern count="one">{0} chilemeatair ceàrnagach</unitPattern>
+				<unitPattern count="two">{0} chilemeatair ceàrnagach</unitPattern>
+				<unitPattern count="few">{0} cilemeatairean ceàrnagach</unitPattern>
+				<unitPattern count="other">{0} cilemeatair ceàrnagach</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>heactair</displayName>
@@ -6862,12 +8063,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} heactairean</unitPattern>
 				<unitPattern count="other">{0} heactair</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>meatair ceàrnagach</displayName>
+				<unitPattern count="one">{0} mheatair ceàrnagach</unitPattern>
+				<unitPattern count="two">{0} mheatair ceàrnagach</unitPattern>
+				<unitPattern count="few">{0} meatairean ceàrnagach</unitPattern>
+				<unitPattern count="other">{0} meatair ceàrnagach</unitPattern>
+				<perUnitPattern>{0} sa mheatair cheàrnagach</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>ceudameatair ceàrnagach</displayName>
 				<unitPattern count="one">{0} cheudameatair ceàrnagach</unitPattern>
 				<unitPattern count="two">{0} cheudameatair ceàrnagach</unitPattern>
 				<unitPattern count="few">{0} ceudameatairean ceàrnagach</unitPattern>
 				<unitPattern count="other">{0} ceudameatair ceàrnagach</unitPattern>
+				<perUnitPattern>{0} sa cheudameatair cheàrnagach</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mìle cheàrnagach</displayName>
+				<unitPattern count="one">{0} mhìle cheàrnagach</unitPattern>
+				<unitPattern count="two">{0} mhìle cheàrnagach</unitPattern>
+				<unitPattern count="few">{0} mìltean ceàrnagach</unitPattern>
+				<unitPattern count="other">{0} mìle cheàrnagach</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acair</displayName>
+				<unitPattern count="one">{0} acair</unitPattern>
+				<unitPattern count="two">{0} acair</unitPattern>
+				<unitPattern count="few">{0} acraichean</unitPattern>
+				<unitPattern count="other">{0} acair</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>slat cheàrnagach</displayName>
+				<unitPattern count="one">{0} shlat cheàrnagach</unitPattern>
+				<unitPattern count="two">{0} shlat cheàrnagach</unitPattern>
+				<unitPattern count="few">{0} slatan ceàrnagach</unitPattern>
+				<unitPattern count="other">{0} slat cheàrnagach</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>troigh cheàrnagach</displayName>
@@ -6882,111 +8113,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two">{0} òirleach cheàrnagach</unitPattern>
 				<unitPattern count="few">{0} òirlich cheàrnagach</unitPattern>
 				<unitPattern count="other">{0} òirleach cheàrnagach</unitPattern>
+				<perUnitPattern>{0} san òirleach cheàrnagach</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>cilemeatair ceàrnagach</displayName>
-				<unitPattern count="one">{0} chilemeatair ceàrnagach</unitPattern>
-				<unitPattern count="two">{0} chilemeatair ceàrnagach</unitPattern>
-				<unitPattern count="few">{0} cilemeatairean ceàrnagach</unitPattern>
-				<unitPattern count="other">{0} cilemeatair ceàrnagach</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>meatair ceàrnagach</displayName>
-				<unitPattern count="one">{0} mheatair ceàrnagach</unitPattern>
-				<unitPattern count="two">{0} mheatair ceàrnagach</unitPattern>
-				<unitPattern count="few">{0} meatairean ceàrnagach</unitPattern>
-				<unitPattern count="other">{0} meatair ceàrnagach</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mìle cheàrnagach</displayName>
-				<unitPattern count="one">{0} mhìle cheàrnagach</unitPattern>
-				<unitPattern count="two">{0} mhìle cheàrnagach</unitPattern>
-				<unitPattern count="few">{0} mìltean ceàrnagach</unitPattern>
-				<unitPattern count="other">{0} mìle cheàrnagach</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>slat cheàrnagach</displayName>
-				<unitPattern count="one">{0} shlat cheàrnagach</unitPattern>
-				<unitPattern count="two">{0} shlat cheàrnagach</unitPattern>
-				<unitPattern count="few">{0} slatan ceàrnagach</unitPattern>
-				<unitPattern count="other">{0} slat cheàrnagach</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="two">{0} karat</unitPattern>
+				<unitPattern count="few">{0} karat</unitPattern>
+				<unitPattern count="other">{0} karat</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName>liotair gach cilemeatair</displayName>
-				<unitPattern count="one">{0} liotair gach cilemeatair</unitPattern>
-				<unitPattern count="two">{0} liotair gach cilemeatair</unitPattern>
-				<unitPattern count="few">{0} liotairean gach cilemeatair</unitPattern>
-				<unitPattern count="other">{0} liotair gach cilemeatair</unitPattern>
+				<displayName>liotair sa chilemeatair</displayName>
+				<unitPattern count="one">{0} liotair sa chilemeatair</unitPattern>
+				<unitPattern count="two">{0} liotair sa chilemeatair</unitPattern>
+				<unitPattern count="few">{0} liotairean sa chilemeatair</unitPattern>
+				<unitPattern count="other">{0} liotair sa chilemeatair</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>liotair sa 100 chilemeatair</displayName>
+				<unitPattern count="one">{0} liotair sa 100 chilemeatair</unitPattern>
+				<unitPattern count="two">{0} liotair sa 100 chilemeatair</unitPattern>
+				<unitPattern count="few">{0} liotairean sa 100 chilemeatair</unitPattern>
+				<unitPattern count="other">{0} liotair sa 100 chilemeatair</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
-				<displayName>mìle gach galain</displayName>
-				<unitPattern count="one">{0} mhìle gach galain</unitPattern>
-				<unitPattern count="two">{0} mhìle gach galain</unitPattern>
-				<unitPattern count="few">{0} mìltean gach galain</unitPattern>
-				<unitPattern count="other">{0} mìle gach galain</unitPattern>
-			</unit>
-			<unit type="digital-bit">
-				<displayName>biod</displayName>
-				<unitPattern count="one">{0} bhiod</unitPattern>
-				<unitPattern count="two">{0} bhiod</unitPattern>
-				<unitPattern count="few">{0} biodan</unitPattern>
-				<unitPattern count="other">{0} biod</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>baidht</displayName>
-				<unitPattern count="one">{0} bhaidht</unitPattern>
-				<unitPattern count="two">{0} bhaidht</unitPattern>
-				<unitPattern count="few">{0} baidht</unitPattern>
-				<unitPattern count="other">{0} baidht</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>giga-biod</displayName>
-				<unitPattern count="one">{0} ghiga-biod</unitPattern>
-				<unitPattern count="two">{0} ghiga-biod</unitPattern>
-				<unitPattern count="few">{0} giga-biodan</unitPattern>
-				<unitPattern count="other">{0} giga-biod</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>giga-baidht</displayName>
-				<unitPattern count="one">{0} ghiga-baidht</unitPattern>
-				<unitPattern count="two">{0} ghiga-baidht</unitPattern>
-				<unitPattern count="few">{0} giga-baidht</unitPattern>
-				<unitPattern count="other">{0} giga-baidht</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>cilebiod</displayName>
-				<unitPattern count="one">{0} chilebiod</unitPattern>
-				<unitPattern count="two">{0} chilebiod</unitPattern>
-				<unitPattern count="few">{0} cilebiodan</unitPattern>
-				<unitPattern count="other">{0} cilebiod</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>cileabaidht</displayName>
-				<unitPattern count="one">{0} chileabaidht</unitPattern>
-				<unitPattern count="two">{0} chileabaidht</unitPattern>
-				<unitPattern count="few">{0} cileabaidht</unitPattern>
-				<unitPattern count="other">{0} cileabaidht</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>meaga-biod</displayName>
-				<unitPattern count="one">{0} mheaga-biod</unitPattern>
-				<unitPattern count="two">{0} mheaga-biod</unitPattern>
-				<unitPattern count="few">{0} meaga-biodan</unitPattern>
-				<unitPattern count="other">{0} meaga-biod</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>meaga-baidht</displayName>
-				<unitPattern count="one">{0} mheaga-baidht</unitPattern>
-				<unitPattern count="two">{0} mheaga-baidht</unitPattern>
-				<unitPattern count="few">{0} meaga-baidht</unitPattern>
-				<unitPattern count="other">{0} meaga-baidht</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>tera-biod</displayName>
-				<unitPattern count="one">{0} tera-biod</unitPattern>
-				<unitPattern count="two">{0} thera-biod</unitPattern>
-				<unitPattern count="few">{0} tera-biodan</unitPattern>
-				<unitPattern count="other">{0} tera-biod</unitPattern>
+				<displayName>mìle sa ghalan</displayName>
+				<unitPattern count="one">{0} mhìle sa ghalan</unitPattern>
+				<unitPattern count="two">{0} mhìle sa ghalan</unitPattern>
+				<unitPattern count="few">{0} mìltean sa ghalan</unitPattern>
+				<unitPattern count="other">{0} mìle sa ghalan</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
 				<displayName>tera-baidht</displayName>
@@ -6995,12 +8150,107 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} tera-baidht</unitPattern>
 				<unitPattern count="other">{0} tera-baidht</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>tera-biod</displayName>
+				<unitPattern count="one">{0} tera-biod</unitPattern>
+				<unitPattern count="two">{0} thera-biod</unitPattern>
+				<unitPattern count="few">{0} tera-biodan</unitPattern>
+				<unitPattern count="other">{0} tera-biod</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>giga-baidht</displayName>
+				<unitPattern count="one">{0} ghiga-baidht</unitPattern>
+				<unitPattern count="two">{0} ghiga-baidht</unitPattern>
+				<unitPattern count="few">{0} giga-baidht</unitPattern>
+				<unitPattern count="other">{0} giga-baidht</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>giga-biod</displayName>
+				<unitPattern count="one">{0} ghiga-biod</unitPattern>
+				<unitPattern count="two">{0} ghiga-biod</unitPattern>
+				<unitPattern count="few">{0} giga-biodan</unitPattern>
+				<unitPattern count="other">{0} giga-biod</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>meaga-baidht</displayName>
+				<unitPattern count="one">{0} mheaga-baidht</unitPattern>
+				<unitPattern count="two">{0} mheaga-baidht</unitPattern>
+				<unitPattern count="few">{0} meaga-baidht</unitPattern>
+				<unitPattern count="other">{0} meaga-baidht</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>meaga-biod</displayName>
+				<unitPattern count="one">{0} mheaga-biod</unitPattern>
+				<unitPattern count="two">{0} mheaga-biod</unitPattern>
+				<unitPattern count="few">{0} meaga-biodan</unitPattern>
+				<unitPattern count="other">{0} meaga-biod</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>cileabaidht</displayName>
+				<unitPattern count="one">{0} chileabaidht</unitPattern>
+				<unitPattern count="two">{0} chileabaidht</unitPattern>
+				<unitPattern count="few">{0} cileabaidht</unitPattern>
+				<unitPattern count="other">{0} cileabaidht</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>cilebiod</displayName>
+				<unitPattern count="one">{0} chilebiod</unitPattern>
+				<unitPattern count="two">{0} chilebiod</unitPattern>
+				<unitPattern count="few">{0} cilebiodan</unitPattern>
+				<unitPattern count="other">{0} cilebiod</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>baidht</displayName>
+				<unitPattern count="one">{0} bhaidht</unitPattern>
+				<unitPattern count="two">{0} bhaidht</unitPattern>
+				<unitPattern count="few">{0} baidht</unitPattern>
+				<unitPattern count="other">{0} baidht</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>biod</displayName>
+				<unitPattern count="one">{0} bhiod</unitPattern>
+				<unitPattern count="two">{0} bhiod</unitPattern>
+				<unitPattern count="few">{0} biodan</unitPattern>
+				<unitPattern count="other">{0} biod</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>linn</displayName>
+				<unitPattern count="one">{0} linn</unitPattern>
+				<unitPattern count="two">{0} linn</unitPattern>
+				<unitPattern count="few">{0} linntean</unitPattern>
+				<unitPattern count="other">{0} linn</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>bliadhna</displayName>
+				<unitPattern count="one">{0} bhliadhna</unitPattern>
+				<unitPattern count="two">{0} bhliadhna</unitPattern>
+				<unitPattern count="few">{0} bliadhnaichean</unitPattern>
+				<unitPattern count="other">{0} bliadhna</unitPattern>
+				<perUnitPattern>{0} sa bhliadhna</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mìos</displayName>
+				<unitPattern count="one">{0} mhìos</unitPattern>
+				<unitPattern count="two">{0} mhìos</unitPattern>
+				<unitPattern count="few">{0} mìosan</unitPattern>
+				<unitPattern count="other">{0} mìos</unitPattern>
+				<perUnitPattern>{0} sa mhìos</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>seachdain</displayName>
+				<unitPattern count="one">{0} seachdain</unitPattern>
+				<unitPattern count="two">{0} sheachdain</unitPattern>
+				<unitPattern count="few">{0} seachdainean</unitPattern>
+				<unitPattern count="other">{0} seachdain</unitPattern>
+				<perUnitPattern>{0} san t-seachdain</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>latha</displayName>
 				<unitPattern count="one">{0} latha</unitPattern>
 				<unitPattern count="two">{0} latha</unitPattern>
 				<unitPattern count="few">{0} làithean</unitPattern>
 				<unitPattern count="other">{0} latha</unitPattern>
+				<perUnitPattern>{0} san latha</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>uair a thìde</displayName>
@@ -7008,14 +8258,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two">{0} uair a thìde</unitPattern>
 				<unitPattern count="few">{0} uairean a thìde</unitPattern>
 				<unitPattern count="other">{0} uair a thìde</unitPattern>
-				<perUnitPattern>{0} gach uair</perUnitPattern>
+				<perUnitPattern>{0} san uair</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>micreo-diog</displayName>
-				<unitPattern count="one">{0} mhicreo-diog</unitPattern>
-				<unitPattern count="two">{0} mhicreo-diog</unitPattern>
-				<unitPattern count="few">{0} micreo-diogan</unitPattern>
-				<unitPattern count="other">{0} micreo-diog</unitPattern>
+			<unit type="duration-minute">
+				<displayName>mionaid</displayName>
+				<unitPattern count="one">{0} mhionaid</unitPattern>
+				<unitPattern count="two">{0} mhionaid</unitPattern>
+				<unitPattern count="few">{0} mionaidean</unitPattern>
+				<unitPattern count="other">{0} mionaid</unitPattern>
+				<perUnitPattern>{0} sa mhionaid</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>diog</displayName>
+				<unitPattern count="one">{0} diog</unitPattern>
+				<unitPattern count="two">{0} dhiog</unitPattern>
+				<unitPattern count="few">{0} diogan</unitPattern>
+				<unitPattern count="other">{0} diog</unitPattern>
+				<perUnitPattern>{0} san diog</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>mille-dhiog</displayName>
@@ -7024,19 +8283,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mille-dhiogan</unitPattern>
 				<unitPattern count="other">{0} mille-dhiog</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>mionaid</displayName>
-				<unitPattern count="one">{0} mhionaid</unitPattern>
-				<unitPattern count="two">{0} mhionaid</unitPattern>
-				<unitPattern count="few">{0} mionaidean</unitPattern>
-				<unitPattern count="other">{0} mionaid</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>mìos</displayName>
-				<unitPattern count="one">{0} mhìos</unitPattern>
-				<unitPattern count="two">{0} mhìos</unitPattern>
-				<unitPattern count="few">{0} mìosan</unitPattern>
-				<unitPattern count="other">{0} mìos</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>micreo-diog</displayName>
+				<unitPattern count="one">{0} mhicreo-diog</unitPattern>
+				<unitPattern count="two">{0} mhicreo-diog</unitPattern>
+				<unitPattern count="few">{0} micreo-diogan</unitPattern>
+				<unitPattern count="other">{0} micreo-diog</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>nano-dhiog</displayName>
@@ -7045,28 +8297,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} nano-dhiogan</unitPattern>
 				<unitPattern count="other">{0} nano-dhiog</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>diog</displayName>
-				<unitPattern count="one">{0} diog</unitPattern>
-				<unitPattern count="two">{0} dhiog</unitPattern>
-				<unitPattern count="few">{0} diogan</unitPattern>
-				<unitPattern count="other">{0} diog</unitPattern>
-				<perUnitPattern>{0} gach diog</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>seachdain</displayName>
-				<unitPattern count="one">{0} seachdain</unitPattern>
-				<unitPattern count="two">{0} sheachdain</unitPattern>
-				<unitPattern count="few">{0} seachdainean</unitPattern>
-				<unitPattern count="other">{0} seachdain</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>bliadhna</displayName>
-				<unitPattern count="one">{0} bhliadhna</unitPattern>
-				<unitPattern count="two">{0} bhliadhna</unitPattern>
-				<unitPattern count="few">{0} bliadhnaichean</unitPattern>
-				<unitPattern count="other">{0} bliadhna</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>ampère</displayName>
 				<unitPattern count="one">{0} ampère</unitPattern>
@@ -7095,6 +8325,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} volt</unitPattern>
 				<unitPattern count="other">{0} volt</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>cileacalaraidh</displayName>
+				<unitPattern count="one">{0} chileacalaraidh</unitPattern>
+				<unitPattern count="two">{0} chileacalaraidh</unitPattern>
+				<unitPattern count="few">{0} cileacalaraidhean</unitPattern>
+				<unitPattern count="other">{0} cileacalaraidh</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>calaraidh</displayName>
 				<unitPattern count="one">{0} chalaraidh</unitPattern>
@@ -7109,20 +8346,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} calaraidhean bidhe</unitPattern>
 				<unitPattern count="other">{0} calaraidh bidhe</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="one">{0} joule</unitPattern>
-				<unitPattern count="two">{0} joule</unitPattern>
-				<unitPattern count="few">{0} joule</unitPattern>
-				<unitPattern count="other">{0} joule</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>cileacalaraidh</displayName>
-				<unitPattern count="one">{0} chileacalaraidh</unitPattern>
-				<unitPattern count="two">{0} chileacalaraidh</unitPattern>
-				<unitPattern count="few">{0} cileacalaraidhean</unitPattern>
-				<unitPattern count="other">{0} cileacalaraidh</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>cilea-joule</displayName>
 				<unitPattern count="one">{0} chilea-joule</unitPattern>
@@ -7130,6 +8353,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} cilea-joule</unitPattern>
 				<unitPattern count="other">{0} cilea-joule</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="one">{0} joule</unitPattern>
+				<unitPattern count="two">{0} joule</unitPattern>
+				<unitPattern count="few">{0} joule</unitPattern>
+				<unitPattern count="other">{0} joule</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>cilea-watt san uair</displayName>
 				<unitPattern count="one">{0} chilea-watt san uair</unitPattern>
@@ -7144,12 +8374,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} giga-hertz</unitPattern>
 				<unitPattern count="other">{0} giga-hertz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hertz</displayName>
-				<unitPattern count="one">{0} hertz</unitPattern>
-				<unitPattern count="two">{0} hertz</unitPattern>
-				<unitPattern count="few">{0} hertz</unitPattern>
-				<unitPattern count="other">{0} hertz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>meaga-hertz</displayName>
+				<unitPattern count="one">{0} mheaga-hertz</unitPattern>
+				<unitPattern count="two">{0} mheaga-hertz</unitPattern>
+				<unitPattern count="few">{0} meaga-hertz</unitPattern>
+				<unitPattern count="other">{0} meaga-hertz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>cile-hertz</displayName>
@@ -7158,26 +8388,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} cile-hertz</unitPattern>
 				<unitPattern count="other">{0} cile-hertz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>meaga-hertz</displayName>
-				<unitPattern count="one">{0} mheaga-hertz</unitPattern>
-				<unitPattern count="two">{0} mheaga-hertz</unitPattern>
-				<unitPattern count="few">{0} meaga-hertz</unitPattern>
-				<unitPattern count="other">{0} meaga-hertz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hertz</displayName>
+				<unitPattern count="one">{0} hertz</unitPattern>
+				<unitPattern count="two">{0} hertz</unitPattern>
+				<unitPattern count="few">{0} hertz</unitPattern>
+				<unitPattern count="other">{0} hertz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>aonad reul-eòlach</displayName>
-				<unitPattern count="one">{0} aonad reul-eòlach</unitPattern>
-				<unitPattern count="two">{0} aonad reul-eòlach</unitPattern>
-				<unitPattern count="few">{0} aonadan reul-eòlach</unitPattern>
-				<unitPattern count="other">{0} aonad reul-eòlach</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>cilemeatair</displayName>
+				<unitPattern count="one">{0} chilemeatair</unitPattern>
+				<unitPattern count="two">{0} chilemeatair</unitPattern>
+				<unitPattern count="few">{0} cilemeatairean</unitPattern>
+				<unitPattern count="other">{0} cilemeatair</unitPattern>
+				<perUnitPattern>{0} sa chilemeatair</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>ceudameatair</displayName>
-				<unitPattern count="one">{0} cheudameatair</unitPattern>
-				<unitPattern count="two">{0} cheudameatair</unitPattern>
-				<unitPattern count="few">{0} ceudameatairean</unitPattern>
-				<unitPattern count="other">{0} ceudameatair</unitPattern>
+			<unit type="length-meter">
+				<displayName>meatair</displayName>
+				<unitPattern count="one">{0} mheatair</unitPattern>
+				<unitPattern count="two">{0} mheatair</unitPattern>
+				<unitPattern count="few">{0} meatairean</unitPattern>
+				<unitPattern count="other">{0} meatair</unitPattern>
+				<perUnitPattern>{0} sa mheatair</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>deicheamh-meatair</displayName>
@@ -7186,68 +8418,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} deicheamh-meatairean</unitPattern>
 				<unitPattern count="other">{0} deicheamh-meatair</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName>aitheamh</displayName>
-				<unitPattern count="one">{0} aitheamh</unitPattern>
-				<unitPattern count="two">{0} aitheamh</unitPattern>
-				<unitPattern count="few">{0} aitheamhan</unitPattern>
-				<unitPattern count="other">{0} aitheamh</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>troigh</displayName>
-				<unitPattern count="one">{0} troigh</unitPattern>
-				<unitPattern count="two">{0} throigh</unitPattern>
-				<unitPattern count="few">{0} troighean</unitPattern>
-				<unitPattern count="other">{0} troigh</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>stàid Shasannach</displayName>
-				<unitPattern count="one">{0} stàid Shasannach</unitPattern>
-				<unitPattern count="two">{0} stàid Shasannach</unitPattern>
-				<unitPattern count="few">{0} stàidean Sasannach</unitPattern>
-				<unitPattern count="other">{0} stàid Shasannach</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>òirleach</displayName>
-				<unitPattern count="one">{0} òirleach</unitPattern>
-				<unitPattern count="two">{0} òirleach</unitPattern>
-				<unitPattern count="few">{0} òirlich</unitPattern>
-				<unitPattern count="other">{0} òirleach</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>cilemeatair</displayName>
-				<unitPattern count="one">{0} chilemeatair</unitPattern>
-				<unitPattern count="two">{0} chilemeatair</unitPattern>
-				<unitPattern count="few">{0} cilemeatairean</unitPattern>
-				<unitPattern count="other">{0} cilemeatair</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>bliadhna solais</displayName>
-				<unitPattern count="one">{0} bhliadhna solais</unitPattern>
-				<unitPattern count="two">{0} bhliadhna solais</unitPattern>
-				<unitPattern count="few">{0} bliadhnaichean solais</unitPattern>
-				<unitPattern count="other">{0} bliadhna solais</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>meatair</displayName>
-				<unitPattern count="one">{0} mheatair</unitPattern>
-				<unitPattern count="two">{0} mheatair</unitPattern>
-				<unitPattern count="few">{0} meatairean</unitPattern>
-				<unitPattern count="other">{0} meatair</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>micreo-mheatair</displayName>
-				<unitPattern count="one">{0} mhicreo-mheatair</unitPattern>
-				<unitPattern count="two">{0} mhicreo-mheatair</unitPattern>
-				<unitPattern count="few">{0} micreo-mheatairean</unitPattern>
-				<unitPattern count="other">{0} micreo-mheatair</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mìle</displayName>
-				<unitPattern count="one">{0} mhìle</unitPattern>
-				<unitPattern count="two">{0} mhìle</unitPattern>
-				<unitPattern count="few">{0} mìltean</unitPattern>
-				<unitPattern count="other">{0} mìle</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>ceudameatair</displayName>
+				<unitPattern count="one">{0} cheudameatair</unitPattern>
+				<unitPattern count="two">{0} cheudameatair</unitPattern>
+				<unitPattern count="few">{0} ceudameatairean</unitPattern>
+				<unitPattern count="other">{0} ceudameatair</unitPattern>
+				<perUnitPattern>{0} sa cheudameatair</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mille-mheatair</displayName>
@@ -7256,6 +8433,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mille-mheatairean</unitPattern>
 				<unitPattern count="other">{0} mille-mheatair</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>micreo-mheatair</displayName>
+				<unitPattern count="one">{0} mhicreo-mheatair</unitPattern>
+				<unitPattern count="two">{0} mhicreo-mheatair</unitPattern>
+				<unitPattern count="few">{0} micreo-mheatairean</unitPattern>
+				<unitPattern count="other">{0} micreo-mheatair</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nano-mheatair</displayName>
 				<unitPattern count="one">{0} nano-mheatair</unitPattern>
@@ -7263,20 +8447,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} nano-mheatairean</unitPattern>
 				<unitPattern count="other">{0} nano-mheatair</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>mìle mara</displayName>
-				<unitPattern count="one">{0} mhìle mara</unitPattern>
-				<unitPattern count="two">{0} mhìle mara</unitPattern>
-				<unitPattern count="few">{0} mìltean mara</unitPattern>
-				<unitPattern count="other">{0} mìle mara</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsec</displayName>
-				<unitPattern count="one">{0} pharsec</unitPattern>
-				<unitPattern count="two">{0} pharsec</unitPattern>
-				<unitPattern count="few">{0} parsec</unitPattern>
-				<unitPattern count="other">{0} parsec</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>piceo-mheatair</displayName>
 				<unitPattern count="one">{0} phiceo-mheatair</unitPattern>
@@ -7284,6 +8454,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} piceo-mheatairean</unitPattern>
 				<unitPattern count="other">{0} piceo-mheatair</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mìle</displayName>
+				<unitPattern count="one">{0} mhìle</unitPattern>
+				<unitPattern count="two">{0} mhìle</unitPattern>
+				<unitPattern count="few">{0} mìltean</unitPattern>
+				<unitPattern count="other">{0} mìle</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>slat</displayName>
 				<unitPattern count="one">{0} slat</unitPattern>
@@ -7291,6 +8468,71 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} slatan</unitPattern>
 				<unitPattern count="other">{0} slat</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>troigh</displayName>
+				<unitPattern count="one">{0} troigh</unitPattern>
+				<unitPattern count="two">{0} throigh</unitPattern>
+				<unitPattern count="few">{0} troighean</unitPattern>
+				<unitPattern count="other">{0} troigh</unitPattern>
+				<perUnitPattern>{0} san troigh</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>òirleach</displayName>
+				<unitPattern count="one">{0} òirleach</unitPattern>
+				<unitPattern count="two">{0} òirleach</unitPattern>
+				<unitPattern count="few">{0} òirlich</unitPattern>
+				<unitPattern count="other">{0} òirleach</unitPattern>
+				<perUnitPattern>{0} san òirleach</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsec</displayName>
+				<unitPattern count="one">{0} pharsec</unitPattern>
+				<unitPattern count="two">{0} pharsec</unitPattern>
+				<unitPattern count="few">{0} parsec</unitPattern>
+				<unitPattern count="other">{0} parsec</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>bliadhna solais</displayName>
+				<unitPattern count="one">{0} bhliadhna solais</unitPattern>
+				<unitPattern count="two">{0} bhliadhna solais</unitPattern>
+				<unitPattern count="few">{0} bliadhnaichean solais</unitPattern>
+				<unitPattern count="other">{0} bliadhna solais</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>aonad reul-eòlach</displayName>
+				<unitPattern count="one">{0} aonad reul-eòlach</unitPattern>
+				<unitPattern count="two">{0} aonad reul-eòlach</unitPattern>
+				<unitPattern count="few">{0} aonadan reul-eòlach</unitPattern>
+				<unitPattern count="other">{0} aonad reul-eòlach</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>stàid Shasannach</displayName>
+				<unitPattern count="one">{0} stàid Shasannach</unitPattern>
+				<unitPattern count="two">{0} stàid Shasannach</unitPattern>
+				<unitPattern count="few">{0} stàidean Sasannach</unitPattern>
+				<unitPattern count="other">{0} stàid Shasannach</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>aitheamh</displayName>
+				<unitPattern count="one">{0} aitheamh</unitPattern>
+				<unitPattern count="two">{0} aitheamh</unitPattern>
+				<unitPattern count="few">{0} aitheamhan</unitPattern>
+				<unitPattern count="other">{0} aitheamh</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>mìle mara</displayName>
+				<unitPattern count="one">{0} mhìle mara</unitPattern>
+				<unitPattern count="two">{0} mhìle mara</unitPattern>
+				<unitPattern count="few">{0} mìltean mara</unitPattern>
+				<unitPattern count="other">{0} mìle mara</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>mìle Lochlannach</displayName>
+				<unitPattern count="one">{0} mhìle Lochlannach</unitPattern>
+				<unitPattern count="two">{0} mhìle Lochlannach</unitPattern>
+				<unitPattern count="few">{0} mìltean Lochlannach</unitPattern>
+				<unitPattern count="other">{0} mìle Lochlannach</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
@@ -7298,27 +8540,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} lux</unitPattern>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>carat</displayName>
-				<unitPattern count="one">{0} charat</unitPattern>
-				<unitPattern count="two">{0} charat</unitPattern>
-				<unitPattern count="few">{0} carataichean</unitPattern>
-				<unitPattern count="other">{0} carat</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>grama</displayName>
-				<unitPattern count="one">{0} ghrama</unitPattern>
-				<unitPattern count="two">{0} ghrama</unitPattern>
-				<unitPattern count="few">{0} gramaichean</unitPattern>
-				<unitPattern count="other">{0} grama</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>cileagram</displayName>
-				<unitPattern count="one">{0} chileagram</unitPattern>
-				<unitPattern count="two">{0} chileagram</unitPattern>
-				<unitPattern count="few">{0} cileagramaichean</unitPattern>
-				<unitPattern count="other">{0} cileagram</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>tunna meatrach</displayName>
 				<unitPattern count="one">{0} tunna meatrach</unitPattern>
@@ -7326,12 +8547,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} tunnaichean meatrach</unitPattern>
 				<unitPattern count="other">{0} tunna meatrach</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>micreo-ghrama</displayName>
-				<unitPattern count="one">{0} mhicreo-ghrama</unitPattern>
-				<unitPattern count="two">{0} mhicreo-ghrama</unitPattern>
-				<unitPattern count="few">{0} micreo-ghramaichean</unitPattern>
-				<unitPattern count="other">{0} micreo-ghrama</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>cileagram</displayName>
+				<unitPattern count="one">{0} chileagram</unitPattern>
+				<unitPattern count="two">{0} chileagram</unitPattern>
+				<unitPattern count="few">{0} cileagramaichean</unitPattern>
+				<unitPattern count="other">{0} cileagram</unitPattern>
+				<perUnitPattern>{0} sa chileagram</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>grama</displayName>
+				<unitPattern count="one">{0} ghrama</unitPattern>
+				<unitPattern count="two">{0} ghrama</unitPattern>
+				<unitPattern count="few">{0} gramaichean</unitPattern>
+				<unitPattern count="other">{0} grama</unitPattern>
+				<perUnitPattern>{0} sa ghrama</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mille-ghrama</displayName>
@@ -7340,33 +8570,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mille-ghramaichean</unitPattern>
 				<unitPattern count="other">{0} mille-ghrama</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>unnsa</displayName>
-				<unitPattern count="one">{0} unnsa</unitPattern>
-				<unitPattern count="two">{0} unnsa</unitPattern>
-				<unitPattern count="few">{0} unnsachan</unitPattern>
-				<unitPattern count="other">{0} unnsa</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>unnsa tròidh</displayName>
-				<unitPattern count="one">{0} unnsa tròidh</unitPattern>
-				<unitPattern count="two">{0} unnsa tròidh</unitPattern>
-				<unitPattern count="few">{0} unnsachan tròidh</unitPattern>
-				<unitPattern count="other">{0} unnsa tròidh</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>punnd</displayName>
-				<unitPattern count="one">{0} phunnd</unitPattern>
-				<unitPattern count="two">{0} phunnd</unitPattern>
-				<unitPattern count="few">{0} puinnd</unitPattern>
-				<unitPattern count="other">{0} punnd</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>clach</displayName>
-				<unitPattern count="one">{0} chlach</unitPattern>
-				<unitPattern count="two">{0} chlach</unitPattern>
-				<unitPattern count="few">{0} clachan</unitPattern>
-				<unitPattern count="other">{0} clach</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>micreo-ghrama</displayName>
+				<unitPattern count="one">{0} mhicreo-ghrama</unitPattern>
+				<unitPattern count="two">{0} mhicreo-ghrama</unitPattern>
+				<unitPattern count="few">{0} micreo-ghramaichean</unitPattern>
+				<unitPattern count="other">{0} micreo-ghrama</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tunna</displayName>
@@ -7375,6 +8584,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} tunnaichean</unitPattern>
 				<unitPattern count="other">{0} tunna</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName>clach</displayName>
+				<unitPattern count="one">{0} chlach</unitPattern>
+				<unitPattern count="two">{0} chlach</unitPattern>
+				<unitPattern count="few">{0} clachan</unitPattern>
+				<unitPattern count="other">{0} clach</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>punnd</displayName>
+				<unitPattern count="one">{0} phunnd</unitPattern>
+				<unitPattern count="two">{0} phunnd</unitPattern>
+				<unitPattern count="few">{0} puinnd</unitPattern>
+				<unitPattern count="other">{0} punnd</unitPattern>
+				<perUnitPattern>{0} sa phunnd</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>unnsa</displayName>
+				<unitPattern count="one">{0} unnsa</unitPattern>
+				<unitPattern count="two">{0} unnsa</unitPattern>
+				<unitPattern count="few">{0} unnsachan</unitPattern>
+				<unitPattern count="other">{0} unnsa</unitPattern>
+				<perUnitPattern>{0} san unnsa</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>unnsa tròidh</displayName>
+				<unitPattern count="one">{0} unnsa tròidh</unitPattern>
+				<unitPattern count="two">{0} unnsa tròidh</unitPattern>
+				<unitPattern count="few">{0} unnsachan tròidh</unitPattern>
+				<unitPattern count="other">{0} unnsa tròidh</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>carat</displayName>
+				<unitPattern count="one">{0} charat</unitPattern>
+				<unitPattern count="two">{0} charat</unitPattern>
+				<unitPattern count="few">{0} carataichean</unitPattern>
+				<unitPattern count="other">{0} carat</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>giga-watt</displayName>
 				<unitPattern count="one">{0} ghiga-watt</unitPattern>
@@ -7382,20 +8628,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} giga-watt</unitPattern>
 				<unitPattern count="other">{0} giga-watt</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>cumhachd-eich</displayName>
-				<unitPattern count="one">{0} chumhachd-eich</unitPattern>
-				<unitPattern count="two">{0} chumhachd-eich</unitPattern>
-				<unitPattern count="few">{0} cumhachdan-eich</unitPattern>
-				<unitPattern count="other">{0} cumhachd-eich</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>cilea-watt</displayName>
-				<unitPattern count="one">{0} chilea-watt</unitPattern>
-				<unitPattern count="two">{0} chilea-watt</unitPattern>
-				<unitPattern count="few">{0} cilea-watt</unitPattern>
-				<unitPattern count="other">{0} cilea-watt</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>meaga-watt</displayName>
 				<unitPattern count="one">{0} mheaga-watt</unitPattern>
@@ -7403,12 +8635,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} meaga-watt</unitPattern>
 				<unitPattern count="other">{0} meaga-watt</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mille-watt</displayName>
-				<unitPattern count="one">{0} mhille-watt</unitPattern>
-				<unitPattern count="two">{0} mhille-watt</unitPattern>
-				<unitPattern count="few">{0} mille-watt</unitPattern>
-				<unitPattern count="other">{0} mille-watt</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>cilea-watt</displayName>
+				<unitPattern count="one">{0} chilea-watt</unitPattern>
+				<unitPattern count="two">{0} chilea-watt</unitPattern>
+				<unitPattern count="few">{0} cilea-watt</unitPattern>
+				<unitPattern count="other">{0} cilea-watt</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watt</displayName>
@@ -7417,6 +8649,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} watt</unitPattern>
 				<unitPattern count="other">{0} watt</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mille-watt</displayName>
+				<unitPattern count="one">{0} mhille-watt</unitPattern>
+				<unitPattern count="two">{0} mhille-watt</unitPattern>
+				<unitPattern count="few">{0} mille-watt</unitPattern>
+				<unitPattern count="other">{0} mille-watt</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>cumhachd-eich</displayName>
+				<unitPattern count="one">{0} chumhachd-eich</unitPattern>
+				<unitPattern count="two">{0} chumhachd-eich</unitPattern>
+				<unitPattern count="few">{0} cumhachdan-eich</unitPattern>
+				<unitPattern count="other">{0} cumhachd-eich</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>heacta pascal</displayName>
 				<unitPattern count="one">{0} heacta pascal</unitPattern>
@@ -7424,12 +8670,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} heacta pascal</unitPattern>
 				<unitPattern count="other">{0} heacta pascal</unitPattern>
 			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>mille-mheatair de dh’airgead-beò</displayName>
+				<unitPattern count="one">{0} mhille-mheatair de dh’airgead-beò</unitPattern>
+				<unitPattern count="two">{0} mhille-mheatair de dh’airgead-beò</unitPattern>
+				<unitPattern count="few">{0} mille-mheatairean de dh’airgead-beò</unitPattern>
+				<unitPattern count="other">{0} mille-mheatair de dh’airgead-beò</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>punnd san òirleach cheàrnagach</displayName>
+				<unitPattern count="one">{0} phunnd san òirleach cheàrnagach</unitPattern>
+				<unitPattern count="two">{0} phunnd san òirleach cheàrnagach</unitPattern>
+				<unitPattern count="few">{0} puinnd san òirleach cheàrnagach</unitPattern>
+				<unitPattern count="other">{0} punnd san òirleach cheàrnagach</unitPattern>
+			</unit>
 			<unit type="pressure-inch-hg">
 				<displayName>òirleach de dh’airgead-beò</displayName>
-				<unitPattern count="one">{0} òirleach de dh'airgead-beò</unitPattern>
-				<unitPattern count="two">{0} òirleach de dh'airgead-beò</unitPattern>
-				<unitPattern count="few">{0} òirlich de dh'airgead-beò</unitPattern>
-				<unitPattern count="other">{0} òirleach de dh'airgead-beò</unitPattern>
+				<unitPattern count="one">{0} òirleach de dh’airgead-beò</unitPattern>
+				<unitPattern count="two">{0} òirleach de dh’airgead-beò</unitPattern>
+				<unitPattern count="few">{0} òirlich de dh’airgead-beò</unitPattern>
+				<unitPattern count="other">{0} òirleach de dh’airgead-beò</unitPattern>
 			</unit>
 			<unit type="pressure-millibar">
 				<displayName>mille-bhàr</displayName>
@@ -7438,47 +8698,40 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mille-bhàraichean</unitPattern>
 				<unitPattern count="other">{0} mille-bhàr</unitPattern>
 			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<displayName>mille-mheatair de dh’airgead-beò</displayName>
-				<unitPattern count="one">{0} mhille-mheatair de dh'airgead-beò</unitPattern>
-				<unitPattern count="two">{0} mhille-mheatair de dh'airgead-beò</unitPattern>
-				<unitPattern count="few">{0} mille-mheatairean de dh'airgead-beò</unitPattern>
-				<unitPattern count="other">{0} mille-mheatair de dh'airgead-beò</unitPattern>
-			</unit>
-			<unit type="pressure-pound-per-square-inch">
-				<displayName>punnd gach òirleach cheàrnagach</displayName>
-				<unitPattern count="one">{0} phunnd gach òirleach cheàrnagach</unitPattern>
-				<unitPattern count="two">{0} phunnd gach òirleach cheàrnagach</unitPattern>
-				<unitPattern count="few">{0} puinnd gach òirleach cheàrnagach</unitPattern>
-				<unitPattern count="other">{0} punnd gach òirleach cheàrnagach</unitPattern>
-			</unit>
-			<unit type="proportion-karat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="two">{0} karat</unitPattern>
-				<unitPattern count="few">{0} karat</unitPattern>
-				<unitPattern count="other">{0} karat</unitPattern>
-			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName>cilemeatair gach uair</displayName>
-				<unitPattern count="one">{0} chilemeatair gach uair</unitPattern>
-				<unitPattern count="two">{0} chilemeatair gach uair</unitPattern>
-				<unitPattern count="few">{0} cilemeatairean gach uair</unitPattern>
-				<unitPattern count="other">{0} cilemeatair gach uair</unitPattern>
+				<displayName>cilemeatair san uair</displayName>
+				<unitPattern count="one">{0} chilemeatair san uair</unitPattern>
+				<unitPattern count="two">{0} chilemeatair san uair</unitPattern>
+				<unitPattern count="few">{0} cilemeatairean san uair</unitPattern>
+				<unitPattern count="other">{0} cilemeatair san uair</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
-				<displayName>meatair gach diog</displayName>
-				<unitPattern count="one">{0} mheatair gach diog</unitPattern>
-				<unitPattern count="two">{0} mheatair gach diog</unitPattern>
-				<unitPattern count="few">{0} meatairean gach diog</unitPattern>
-				<unitPattern count="other">{0} meatair gach diog</unitPattern>
+				<displayName>meatair san diog</displayName>
+				<unitPattern count="one">{0} mheatair san diog</unitPattern>
+				<unitPattern count="two">{0} mheatair san diog</unitPattern>
+				<unitPattern count="few">{0} meatairean san diog</unitPattern>
+				<unitPattern count="other">{0} meatair san diog</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<displayName>mìle gach uair</displayName>
-				<unitPattern count="one">{0} mhìle gach uair</unitPattern>
-				<unitPattern count="two">{0} mhìle gach uair</unitPattern>
-				<unitPattern count="few">{0} mìltean gach uair</unitPattern>
-				<unitPattern count="other">{0} mìle gach uair</unitPattern>
+				<displayName>mìle san uair</displayName>
+				<unitPattern count="one">{0} mhìle san uair</unitPattern>
+				<unitPattern count="two">{0} mhìle san uair</unitPattern>
+				<unitPattern count="few">{0} mìltean san uair</unitPattern>
+				<unitPattern count="other">{0} mìle san uair</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>mìle mara san uair</displayName>
+				<unitPattern count="one">{0} mhìle mara san uair</unitPattern>
+				<unitPattern count="two">{0} mhìle mara san uair</unitPattern>
+				<unitPattern count="few">{0} mìltean mara san uair</unitPattern>
+				<unitPattern count="other">{0} mìle mara san uair</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="two">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
 				<displayName>ceum Celsius</displayName>
@@ -7501,48 +8754,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ceuman Kelvin</unitPattern>
 				<unitPattern count="other">{0} ceum Kelvin</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>acair-throigh</displayName>
-				<unitPattern count="one">{0} acair-throigh</unitPattern>
-				<unitPattern count="two">{0} acair-throigh</unitPattern>
-				<unitPattern count="few">{0} acair-throighean</unitPattern>
-				<unitPattern count="other">{0} acair-throigh</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>buiseal</displayName>
-				<unitPattern count="one">{0} bhuiseal</unitPattern>
-				<unitPattern count="two">{0} bhuiseal</unitPattern>
-				<unitPattern count="few">{0} buisealan</unitPattern>
-				<unitPattern count="other">{0} buiseal</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>ceudailiotair</displayName>
-				<unitPattern count="one">{0} cheudailiotair</unitPattern>
-				<unitPattern count="two">{0} cheudailiotair</unitPattern>
-				<unitPattern count="few">{0} ceudailiotairean</unitPattern>
-				<unitPattern count="other">{0} ceudailiotair</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>ceudameatair ciùbach</displayName>
-				<unitPattern count="one">{0} cheudameatair ciùbach</unitPattern>
-				<unitPattern count="two">{0} cheudameatair ciùbach</unitPattern>
-				<unitPattern count="few">{0} ceudameatairean ciùbach</unitPattern>
-				<unitPattern count="other">{0} ceudameatair ciùbach</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>troigh chiùbach</displayName>
-				<unitPattern count="one">{0} troigh chiùbach</unitPattern>
-				<unitPattern count="two">{0} throigh chiùbach</unitPattern>
-				<unitPattern count="few">{0} troighean ciùbach</unitPattern>
-				<unitPattern count="other">{0} troigh chiùbach</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>òirleach chiùbach</displayName>
-				<unitPattern count="one">{0} òirleach chiùbach</unitPattern>
-				<unitPattern count="two">{0} òirleach chiùbach</unitPattern>
-				<unitPattern count="few">{0} òirlich chiùbach</unitPattern>
-				<unitPattern count="other">{0} òirleach chiùbach</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>cilemeatair ciùbach</displayName>
 				<unitPattern count="one">{0} chilemeatair ciùbach</unitPattern>
@@ -7556,6 +8767,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two">{0} mheatair ciùbach</unitPattern>
 				<unitPattern count="few">{0} meatairean ciùbach</unitPattern>
 				<unitPattern count="other">{0} meatair ciùbach</unitPattern>
+				<perUnitPattern>{0} sa mheatair chiùbach</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>ceudameatair ciùbach</displayName>
+				<unitPattern count="one">{0} cheudameatair ciùbach</unitPattern>
+				<unitPattern count="two">{0} cheudameatair ciùbach</unitPattern>
+				<unitPattern count="few">{0} ceudameatairean ciùbach</unitPattern>
+				<unitPattern count="other">{0} ceudameatair ciùbach</unitPattern>
+				<perUnitPattern>{0} sa cheudameatair chiùbach</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mìle chiùbach</displayName>
@@ -7571,33 +8791,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} slatan ciùbach</unitPattern>
 				<unitPattern count="other">{0} slat chiùbach</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>cupa</displayName>
-				<unitPattern count="one">{0} chupa</unitPattern>
-				<unitPattern count="two">{0} chupa</unitPattern>
-				<unitPattern count="few">{0} cupannan</unitPattern>
-				<unitPattern count="other">{0} cupa</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>troigh chiùbach</displayName>
+				<unitPattern count="one">{0} troigh chiùbach</unitPattern>
+				<unitPattern count="two">{0} throigh chiùbach</unitPattern>
+				<unitPattern count="few">{0} troighean ciùbach</unitPattern>
+				<unitPattern count="other">{0} troigh chiùbach</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>deicheamh-liotair</displayName>
-				<unitPattern count="one">{0} deicheamh-liotair</unitPattern>
-				<unitPattern count="two">{0} dheicheamh-liotair</unitPattern>
-				<unitPattern count="few">{0} deicheamh-liotairean</unitPattern>
-				<unitPattern count="other">{0} deicheamh-liotair</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>òirleach chiùbach</displayName>
+				<unitPattern count="one">{0} òirleach chiùbach</unitPattern>
+				<unitPattern count="two">{0} òirleach chiùbach</unitPattern>
+				<unitPattern count="few">{0} òirlich chiùbach</unitPattern>
+				<unitPattern count="other">{0} òirleach chiùbach</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>unnsa-dighe</displayName>
-				<unitPattern count="one">{0} unnsa-dighe</unitPattern>
-				<unitPattern count="two">{0} unnsa-dighe</unitPattern>
-				<unitPattern count="few">{0} unnsachan-dighe</unitPattern>
-				<unitPattern count="other">{0} unnsa-dighe</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>galan</displayName>
-				<unitPattern count="one">{0} ghalan</unitPattern>
-				<unitPattern count="two">{0} ghalan</unitPattern>
-				<unitPattern count="few">{0} galanan</unitPattern>
-				<unitPattern count="other">{0} galan</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>meaga-liotair</displayName>
+				<unitPattern count="one">{0} mheaga-liotair</unitPattern>
+				<unitPattern count="two">{0} mheaga-liotair</unitPattern>
+				<unitPattern count="few">{0} meaga-liotairean</unitPattern>
+				<unitPattern count="other">{0} meaga-liotair</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>heactailiotair</displayName>
@@ -7612,13 +8825,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two">{0} liotair</unitPattern>
 				<unitPattern count="few">{0} liotairean</unitPattern>
 				<unitPattern count="other">{0} liotair</unitPattern>
+				<perUnitPattern>{0} san liotair</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>meaga-liotair</displayName>
-				<unitPattern count="one">{0} mheaga-liotair</unitPattern>
-				<unitPattern count="two">{0} mheaga-liotair</unitPattern>
-				<unitPattern count="few">{0} meaga-liotairean</unitPattern>
-				<unitPattern count="other">{0} meaga-liotair</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>deicheamh-liotair</displayName>
+				<unitPattern count="one">{0} deicheamh-liotair</unitPattern>
+				<unitPattern count="two">{0} dheicheamh-liotair</unitPattern>
+				<unitPattern count="few">{0} deicheamh-liotairean</unitPattern>
+				<unitPattern count="other">{0} deicheamh-liotair</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>ceudailiotair</displayName>
+				<unitPattern count="one">{0} cheudailiotair</unitPattern>
+				<unitPattern count="two">{0} cheudailiotair</unitPattern>
+				<unitPattern count="few">{0} ceudailiotairean</unitPattern>
+				<unitPattern count="other">{0} ceudailiotair</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mille-liotair</displayName>
@@ -7627,12 +8848,41 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mille-liotairean</unitPattern>
 				<unitPattern count="other">{0} mille-liotair</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pinnt</displayName>
-				<unitPattern count="one">{0} phinnt</unitPattern>
-				<unitPattern count="two">{0} phinnt</unitPattern>
-				<unitPattern count="few">{0} pinntean</unitPattern>
-				<unitPattern count="other">{0} pinnt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>pinnt meatrach</displayName>
+				<unitPattern count="one">{0} phinnt meatrach</unitPattern>
+				<unitPattern count="two">{0} phinnt meatrach</unitPattern>
+				<unitPattern count="few">{0} pinntean meatrach</unitPattern>
+				<unitPattern count="other">{0} pinnt meatrach</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>cupa meatrach</displayName>
+				<unitPattern count="one">{0} chupa meatrach</unitPattern>
+				<unitPattern count="two">{0} chupa meatrach</unitPattern>
+				<unitPattern count="few">{0} cupannan meatrach</unitPattern>
+				<unitPattern count="other">{0} cupa meatrach</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acair-throigh</displayName>
+				<unitPattern count="one">{0} acair-throigh</unitPattern>
+				<unitPattern count="two">{0} acair-throigh</unitPattern>
+				<unitPattern count="few">{0} acair-throighean</unitPattern>
+				<unitPattern count="other">{0} acair-throigh</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>buiseal</displayName>
+				<unitPattern count="one">{0} bhuiseal</unitPattern>
+				<unitPattern count="two">{0} bhuiseal</unitPattern>
+				<unitPattern count="few">{0} buisealan</unitPattern>
+				<unitPattern count="other">{0} buiseal</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galan</displayName>
+				<unitPattern count="one">{0} ghalan</unitPattern>
+				<unitPattern count="two">{0} ghalan</unitPattern>
+				<unitPattern count="few">{0} galanan</unitPattern>
+				<unitPattern count="other">{0} galan</unitPattern>
+				<perUnitPattern>{0} sa ghalan</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>càrt</displayName>
@@ -7641,6 +8891,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} càrtan</unitPattern>
 				<unitPattern count="other">{0} càrt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pinnt</displayName>
+				<unitPattern count="one">{0} phinnt</unitPattern>
+				<unitPattern count="two">{0} phinnt</unitPattern>
+				<unitPattern count="few">{0} pinntean</unitPattern>
+				<unitPattern count="other">{0} pinnt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cupa</displayName>
+				<unitPattern count="one">{0} chupa</unitPattern>
+				<unitPattern count="two">{0} chupa</unitPattern>
+				<unitPattern count="few">{0} cupannan</unitPattern>
+				<unitPattern count="other">{0} cupa</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>unnsa-dighe</displayName>
+				<unitPattern count="one">{0} unnsa-dighe</unitPattern>
+				<unitPattern count="two">{0} unnsa-dighe</unitPattern>
+				<unitPattern count="few">{0} unnsachan-dighe</unitPattern>
+				<unitPattern count="other">{0} unnsa-dighe</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>spàin-bhùird</displayName>
 				<unitPattern count="one">{0} spàin-bhùird</unitPattern>
@@ -7655,8 +8926,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} spàinean-teatha</unitPattern>
 				<unitPattern count="other">{0} spàin-teatha</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}T</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}D</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}I</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>forsa-g</displayName>
 				<unitPattern count="one">{0} G</unitPattern>
@@ -7671,6 +8951,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>cuairt</displayName>
+				<unitPattern count="one">{0} chuairt</unitPattern>
+				<unitPattern count="two">{0} chuairt</unitPattern>
+				<unitPattern count="few">{0} cuairtean</unitPattern>
+				<unitPattern count="other">{0} cuairt</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rèidean</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="two">{0} rad</unitPattern>
+				<unitPattern count="few">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>ceum</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="two">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>àrc-mhion.</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
@@ -7685,26 +8986,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>ceum</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="two">{0}°</unitPattern>
-				<unitPattern count="few">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rèidean</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="two">{0} rad</unitPattern>
-				<unitPattern count="few">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>acair</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="two">{0} ac</unitPattern>
-				<unitPattern count="few">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="two">{0} km²</unitPattern>
+				<unitPattern count="few">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>heactair</displayName>
@@ -7713,12 +9000,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>meatair²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="two">{0} m²</unitPattern>
+				<unitPattern count="few">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="two">{0} cm²</unitPattern>
 				<unitPattern count="few">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mìle²</displayName>
+				<unitPattern count="one">{0} mì²</unitPattern>
+				<unitPattern count="two">{0} mì²</unitPattern>
+				<unitPattern count="few">{0} mì²</unitPattern>
+				<unitPattern count="other">{0} mì²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acair</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="two">{0} ac</unitPattern>
+				<unitPattern count="few">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>slat²</displayName>
+				<unitPattern count="one">{0} shlat²</unitPattern>
+				<unitPattern count="two">{0} shlat²</unitPattern>
+				<unitPattern count="few">{0} slat²</unitPattern>
+				<unitPattern count="other">{0} slat²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>troigh²</displayName>
@@ -7733,34 +9050,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two">{0} òirl²</unitPattern>
 				<unitPattern count="few">{0} òirl²</unitPattern>
 				<unitPattern count="other">{0} òirl²</unitPattern>
+				<perUnitPattern>{0}/òirl²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="two">{0} km²</unitPattern>
-				<unitPattern count="few">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>meatair²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="two">{0} m²</unitPattern>
-				<unitPattern count="few">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mìle²</displayName>
-				<unitPattern count="one">{0} mì²</unitPattern>
-				<unitPattern count="two">{0} mì²</unitPattern>
-				<unitPattern count="few">{0} mì²</unitPattern>
-				<unitPattern count="other">{0} mì²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>slat²</displayName>
-				<unitPattern count="one">{0} shlat²</unitPattern>
-				<unitPattern count="two">{0} shlat²</unitPattern>
-				<unitPattern count="few">{0} slat²</unitPattern>
-				<unitPattern count="other">{0} slat²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="two">{0} kt</unitPattern>
+				<unitPattern count="few">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liotair/km</displayName>
@@ -7769,6 +9066,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} L/km</unitPattern>
 				<unitPattern count="other">{0} L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} L/100km</unitPattern>
+				<unitPattern count="two">{0} L/100km</unitPattern>
+				<unitPattern count="few">{0} L/100km</unitPattern>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mìle/gal</displayName>
 				<unitPattern count="one">{0} mì/g</unitPattern>
@@ -7776,69 +9080,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mì/g</unitPattern>
 				<unitPattern count="other">{0} mì/g</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>biod</displayName>
-				<unitPattern count="one">{0} b</unitPattern>
-				<unitPattern count="two">{0} b</unitPattern>
-				<unitPattern count="few">{0} b</unitPattern>
-				<unitPattern count="other">{0} b</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>baidht</displayName>
-				<unitPattern count="one">{0} B</unitPattern>
-				<unitPattern count="two">{0} B</unitPattern>
-				<unitPattern count="few">{0} B</unitPattern>
-				<unitPattern count="other">{0} B</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="two">{0} Gb</unitPattern>
-				<unitPattern count="few">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="two">{0} GB</unitPattern>
-				<unitPattern count="few">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="two">{0} kb</unitPattern>
-				<unitPattern count="few">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="two">{0} kB</unitPattern>
-				<unitPattern count="few">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="two">{0} Mb</unitPattern>
-				<unitPattern count="few">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="two">{0} MB</unitPattern>
-				<unitPattern count="few">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="two">{0} Tb</unitPattern>
-				<unitPattern count="few">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
@@ -7846,12 +9087,107 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="two">{0} Tb</unitPattern>
+				<unitPattern count="few">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="two">{0} GB</unitPattern>
+				<unitPattern count="few">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="two">{0} Gb</unitPattern>
+				<unitPattern count="few">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="two">{0} MB</unitPattern>
+				<unitPattern count="few">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="two">{0} Mb</unitPattern>
+				<unitPattern count="few">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="two">{0} kB</unitPattern>
+				<unitPattern count="few">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="two">{0} kb</unitPattern>
+				<unitPattern count="few">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>baidht</displayName>
+				<unitPattern count="one">{0} B</unitPattern>
+				<unitPattern count="two">{0} B</unitPattern>
+				<unitPattern count="few">{0} B</unitPattern>
+				<unitPattern count="other">{0} B</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>biod</displayName>
+				<unitPattern count="one">{0} b</unitPattern>
+				<unitPattern count="two">{0} b</unitPattern>
+				<unitPattern count="few">{0} b</unitPattern>
+				<unitPattern count="other">{0} b</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>li</displayName>
+				<unitPattern count="one">{0} li</unitPattern>
+				<unitPattern count="two">{0} li</unitPattern>
+				<unitPattern count="few">{0} li</unitPattern>
+				<unitPattern count="other">{0} li</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>bliadhna</displayName>
+				<unitPattern count="one">{0} bhlia</unitPattern>
+				<unitPattern count="two">{0} bhlia</unitPattern>
+				<unitPattern count="few">{0} blia</unitPattern>
+				<unitPattern count="other">{0} blia</unitPattern>
+				<perUnitPattern>{0}/bl</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mìos</displayName>
+				<unitPattern count="one">{0} mhìos</unitPattern>
+				<unitPattern count="two">{0} mhìos</unitPattern>
+				<unitPattern count="few">{0} mìos</unitPattern>
+				<unitPattern count="other">{0} mìos</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>seachd</displayName>
+				<unitPattern count="one">{0} shn</unitPattern>
+				<unitPattern count="two">{0} shn</unitPattern>
+				<unitPattern count="few">{0} sn</unitPattern>
+				<unitPattern count="other">{0} sn</unitPattern>
+				<perUnitPattern>{0}/sn</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>latha</displayName>
 				<unitPattern count="one">{0} là</unitPattern>
 				<unitPattern count="two">{0} là</unitPattern>
 				<unitPattern count="few">{0} là</unitPattern>
 				<unitPattern count="other">{0} là</unitPattern>
+				<perUnitPattern>{0}/là</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>uair</displayName>
@@ -7861,40 +9197,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} uair</unitPattern>
 				<perUnitPattern>{0}/uair</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μ-diog</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="two">{0} μs</unitPattern>
-				<unitPattern count="few">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>m-dhiog</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="two">{0} ms</unitPattern>
-				<unitPattern count="few">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>mion</displayName>
 				<unitPattern count="one">{0} mhion</unitPattern>
 				<unitPattern count="two">{0} mhion</unitPattern>
 				<unitPattern count="few">{0} mion</unitPattern>
 				<unitPattern count="other">{0} mion</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>mìos</displayName>
-				<unitPattern count="one">{0} mhìos</unitPattern>
-				<unitPattern count="two">{0} mhìos</unitPattern>
-				<unitPattern count="few">{0} mìos</unitPattern>
-				<unitPattern count="other">{0} mìos</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>n-dhiog</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="two">{0} ns</unitPattern>
-				<unitPattern count="few">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/mion</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>diog</displayName>
@@ -7904,19 +9213,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} diog</unitPattern>
 				<perUnitPattern>{0}/d</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>seachd</displayName>
-				<unitPattern count="one">{0} s</unitPattern>
-				<unitPattern count="two">{0} s</unitPattern>
-				<unitPattern count="few">{0} s</unitPattern>
-				<unitPattern count="other">{0} s</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>m-dhiog</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="two">{0} ms</unitPattern>
+				<unitPattern count="few">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>bliadhna</displayName>
-				<unitPattern count="one">{0} bhlia</unitPattern>
-				<unitPattern count="two">{0} bhlia</unitPattern>
-				<unitPattern count="few">{0} blia</unitPattern>
-				<unitPattern count="other">{0} blia</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μ-diog</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="two">{0} μs</unitPattern>
+				<unitPattern count="few">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>n-dhiog</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="two">{0} ns</unitPattern>
+				<unitPattern count="few">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amp</displayName>
@@ -7946,6 +9262,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="two">{0} kcal</unitPattern>
+				<unitPattern count="few">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -7960,20 +9283,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} Cal</unitPattern>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="two">{0} J</unitPattern>
-				<unitPattern count="few">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="two">{0} kcal</unitPattern>
-				<unitPattern count="few">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>cilea-joule</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
@@ -7981,6 +9290,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="two">{0} J</unitPattern>
+				<unitPattern count="few">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kW san uair</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -7995,12 +9311,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="two">{0} Hz</unitPattern>
-				<unitPattern count="few">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="two">{0} MHz</unitPattern>
+				<unitPattern count="few">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
@@ -8009,26 +9325,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="two">{0} MHz</unitPattern>
-				<unitPattern count="few">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="two">{0} Hz</unitPattern>
+				<unitPattern count="few">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="two">{0} au</unitPattern>
-				<unitPattern count="few">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="two">{0} km</unitPattern>
+				<unitPattern count="few">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="two">{0} cm</unitPattern>
-				<unitPattern count="few">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>meatair</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="two">{0} m</unitPattern>
+				<unitPattern count="few">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
@@ -8037,68 +9355,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName>aitheamh</displayName>
-				<unitPattern count="one">{0} aith</unitPattern>
-				<unitPattern count="two">{0} aith</unitPattern>
-				<unitPattern count="few">{0} aith</unitPattern>
-				<unitPattern count="other">{0} aith</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>troigh</displayName>
-				<unitPattern count="one">{0} troigh</unitPattern>
-				<unitPattern count="two">{0} throigh</unitPattern>
-				<unitPattern count="few">{0} troigh</unitPattern>
-				<unitPattern count="other">{0} troigh</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>stàid</displayName>
-				<unitPattern count="one">{0} stàid</unitPattern>
-				<unitPattern count="two">{0} stàid</unitPattern>
-				<unitPattern count="few">{0} stàid</unitPattern>
-				<unitPattern count="other">{0} stàid</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>òirleach</displayName>
-				<unitPattern count="one">{0} òirl</unitPattern>
-				<unitPattern count="two">{0} òirl</unitPattern>
-				<unitPattern count="few">{0} òirl</unitPattern>
-				<unitPattern count="other">{0} òirl</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="two">{0} km</unitPattern>
-				<unitPattern count="few">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ly</displayName>
-				<unitPattern count="one">{0} ly</unitPattern>
-				<unitPattern count="two">{0} ly</unitPattern>
-				<unitPattern count="few">{0} ly</unitPattern>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>meatair</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="two">{0} m</unitPattern>
-				<unitPattern count="few">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µ-mheatair</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="two">{0} µm</unitPattern>
-				<unitPattern count="few">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mìle</displayName>
-				<unitPattern count="one">{0} mì</unitPattern>
-				<unitPattern count="two">{0} mì</unitPattern>
-				<unitPattern count="few">{0} mì</unitPattern>
-				<unitPattern count="other">{0} mì</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="two">{0} cm</unitPattern>
+				<unitPattern count="few">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -8107,6 +9370,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µ-mheatair</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="two">{0} µm</unitPattern>
+				<unitPattern count="few">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
@@ -8114,20 +9384,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="two">{0} nmi</unitPattern>
-				<unitPattern count="few">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsec</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="two">{0} pc</unitPattern>
-				<unitPattern count="few">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
@@ -8135,6 +9391,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mìle</displayName>
+				<unitPattern count="one">{0} mì</unitPattern>
+				<unitPattern count="two">{0} mì</unitPattern>
+				<unitPattern count="few">{0} mì</unitPattern>
+				<unitPattern count="other">{0} mì</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>slat</displayName>
 				<unitPattern count="one">{0} slat</unitPattern>
@@ -8142,6 +9405,71 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} slat</unitPattern>
 				<unitPattern count="other">{0} slat</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>troigh</displayName>
+				<unitPattern count="one">{0} troigh</unitPattern>
+				<unitPattern count="two">{0} throigh</unitPattern>
+				<unitPattern count="few">{0} troigh</unitPattern>
+				<unitPattern count="other">{0} troigh</unitPattern>
+				<perUnitPattern>{0}/troigh</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>òirleach</displayName>
+				<unitPattern count="one">{0} òirl</unitPattern>
+				<unitPattern count="two">{0} òirl</unitPattern>
+				<unitPattern count="few">{0} òirl</unitPattern>
+				<unitPattern count="other">{0} òirl</unitPattern>
+				<perUnitPattern>{0}/òirl</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsec</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="two">{0} pc</unitPattern>
+				<unitPattern count="few">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ly</displayName>
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="two">{0} ly</unitPattern>
+				<unitPattern count="few">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="two">{0} au</unitPattern>
+				<unitPattern count="few">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>stàid</displayName>
+				<unitPattern count="one">{0} stàid</unitPattern>
+				<unitPattern count="two">{0} stàid</unitPattern>
+				<unitPattern count="few">{0} stàid</unitPattern>
+				<unitPattern count="other">{0} stàid</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>aitheamh</displayName>
+				<unitPattern count="one">{0} aith</unitPattern>
+				<unitPattern count="two">{0} aith</unitPattern>
+				<unitPattern count="few">{0} aith</unitPattern>
+				<unitPattern count="other">{0} aith</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="two">{0} nmi</unitPattern>
+				<unitPattern count="few">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="two">{0} smi</unitPattern>
+				<unitPattern count="few">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
@@ -8149,27 +9477,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>carat</displayName>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="two">{0} CD</unitPattern>
-				<unitPattern count="few">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>grama</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="two">{0} g</unitPattern>
-				<unitPattern count="few">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="two">{0} kg</unitPattern>
-				<unitPattern count="few">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
@@ -8177,12 +9484,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="two">{0} µg</unitPattern>
-				<unitPattern count="few">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="two">{0} kg</unitPattern>
+				<unitPattern count="few">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>grama</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="two">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
@@ -8191,33 +9507,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>unnsa</displayName>
-				<unitPattern count="one">{0} unnsa</unitPattern>
-				<unitPattern count="two">{0} unnsa</unitPattern>
-				<unitPattern count="few">{0} unnsa</unitPattern>
-				<unitPattern count="other">{0} unnsa</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>unnsa tròidh</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="two">{0} oz t</unitPattern>
-				<unitPattern count="few">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>punnd</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="two">{0} lb</unitPattern>
-				<unitPattern count="few">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>clach</displayName>
-				<unitPattern count="one">{0} chlach</unitPattern>
-				<unitPattern count="two">{0} chlach</unitPattern>
-				<unitPattern count="few">{0} clach</unitPattern>
-				<unitPattern count="other">{0} clach</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="two">{0} µg</unitPattern>
+				<unitPattern count="few">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tunna</displayName>
@@ -8226,6 +9521,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} tn</unitPattern>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName>clach</displayName>
+				<unitPattern count="one">{0} chlach</unitPattern>
+				<unitPattern count="two">{0} chlach</unitPattern>
+				<unitPattern count="few">{0} clach</unitPattern>
+				<unitPattern count="other">{0} clach</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>punnd</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="two">{0} lb</unitPattern>
+				<unitPattern count="few">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>unnsa</displayName>
+				<unitPattern count="one">{0} unnsa</unitPattern>
+				<unitPattern count="two">{0} unnsa</unitPattern>
+				<unitPattern count="few">{0} unnsa</unitPattern>
+				<unitPattern count="other">{0} unnsa</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>unnsa tròidh</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="two">{0} oz t</unitPattern>
+				<unitPattern count="few">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>carat</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="two">{0} CD</unitPattern>
+				<unitPattern count="few">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
@@ -8233,20 +9565,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hp</displayName>
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="two">{0} hp</unitPattern>
-				<unitPattern count="few">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="two">{0} kW</unitPattern>
-				<unitPattern count="few">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
@@ -8254,12 +9572,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="two">{0} mW</unitPattern>
-				<unitPattern count="few">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="two">{0} kW</unitPattern>
+				<unitPattern count="few">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watt</displayName>
@@ -8268,6 +9586,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="two">{0} mW</unitPattern>
+				<unitPattern count="few">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="two">{0} hp</unitPattern>
+				<unitPattern count="few">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
@@ -8275,20 +9607,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>in Hg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="two">{0} inHg</unitPattern>
-				<unitPattern count="few">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbàr</displayName>
-				<unitPattern count="one">{0} mbàr</unitPattern>
-				<unitPattern count="two">{0} mbàr</unitPattern>
-				<unitPattern count="few">{0} mbàr</unitPattern>
-				<unitPattern count="other">{0} mbàr</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -8303,12 +9621,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="two">{0} kt</unitPattern>
-				<unitPattern count="few">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>in Hg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="two">{0} inHg</unitPattern>
+				<unitPattern count="few">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbàr</displayName>
+				<unitPattern count="one">{0} mbàr</unitPattern>
+				<unitPattern count="two">{0} mbàr</unitPattern>
+				<unitPattern count="few">{0} mbàr</unitPattern>
+				<unitPattern count="other">{0} mbàr</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/uair</displayName>
@@ -8331,6 +9656,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mì/h</unitPattern>
 				<unitPattern count="other">{0} mì/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="two">{0} kn</unitPattern>
+				<unitPattern count="few">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="two">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>ceum C</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -8346,53 +9685,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0}°F</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
-				<displayName>ceum K</displayName>
-				<unitPattern count="one">{0}°K</unitPattern>
-				<unitPattern count="two">{0}°K</unitPattern>
-				<unitPattern count="few">{0}°K</unitPattern>
-				<unitPattern count="other">{0}°K</unitPattern>
-			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>acair-throigh</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="two">{0} ac ft</unitPattern>
-				<unitPattern count="few">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>buiseal</displayName>
-				<unitPattern count="one">{0} bu</unitPattern>
-				<unitPattern count="two">{0} bu</unitPattern>
-				<unitPattern count="few">{0} bu</unitPattern>
-				<unitPattern count="other">{0} bu</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>c-liotair</displayName>
-				<unitPattern count="one">{0} cL</unitPattern>
-				<unitPattern count="two">{0} cL</unitPattern>
-				<unitPattern count="few">{0} cL</unitPattern>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="two">{0} cm³</unitPattern>
-				<unitPattern count="few">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>troigh³</displayName>
-				<unitPattern count="one">{0} troigh³</unitPattern>
-				<unitPattern count="two">{0} throigh³</unitPattern>
-				<unitPattern count="few">{0} troigh³</unitPattern>
-				<unitPattern count="other">{0} troigh³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>òirl³</displayName>
-				<unitPattern count="one">{0} òirl³</unitPattern>
-				<unitPattern count="two">{0} òirl³</unitPattern>
-				<unitPattern count="few">{0} òirl³</unitPattern>
-				<unitPattern count="other">{0} òirl³</unitPattern>
+				<displayName>K</displayName>
+				<unitPattern count="one">{0} K</unitPattern>
+				<unitPattern count="two">{0} K</unitPattern>
+				<unitPattern count="few">{0} K</unitPattern>
+				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
@@ -8407,6 +9704,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two">{0} m³</unitPattern>
 				<unitPattern count="few">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="two">{0} cm³</unitPattern>
+				<unitPattern count="few">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mì³</displayName>
@@ -8422,33 +9728,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} slat³</unitPattern>
 				<unitPattern count="other">{0} slat³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>cupa</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="two">{0} c</unitPattern>
-				<unitPattern count="few">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>troigh³</displayName>
+				<unitPattern count="one">{0} troigh³</unitPattern>
+				<unitPattern count="two">{0} throigh³</unitPattern>
+				<unitPattern count="few">{0} troigh³</unitPattern>
+				<unitPattern count="other">{0} troigh³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="one">{0} dL</unitPattern>
-				<unitPattern count="two">{0} dL</unitPattern>
-				<unitPattern count="few">{0} dL</unitPattern>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>òirl³</displayName>
+				<unitPattern count="one">{0} òirl³</unitPattern>
+				<unitPattern count="two">{0} òirl³</unitPattern>
+				<unitPattern count="few">{0} òirl³</unitPattern>
+				<unitPattern count="other">{0} òirl³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="two">{0} fl oz</unitPattern>
-				<unitPattern count="few">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="two">{0} gal</unitPattern>
-				<unitPattern count="few">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="two">{0} ML</unitPattern>
+				<unitPattern count="few">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -8463,13 +9762,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two">{0} l</unitPattern>
 				<unitPattern count="few">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="one">{0} ML</unitPattern>
-				<unitPattern count="two">{0} ML</unitPattern>
-				<unitPattern count="few">{0} ML</unitPattern>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0} dL</unitPattern>
+				<unitPattern count="two">{0} dL</unitPattern>
+				<unitPattern count="few">{0} dL</unitPattern>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>c-liotair</displayName>
+				<unitPattern count="one">{0} cL</unitPattern>
+				<unitPattern count="two">{0} cL</unitPattern>
+				<unitPattern count="few">{0} cL</unitPattern>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
@@ -8478,12 +9785,41 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mL</unitPattern>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pinnt</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="two">{0} pt</unitPattern>
-				<unitPattern count="few">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="two">{0} mpt</unitPattern>
+				<unitPattern count="few">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="two">{0} mc</unitPattern>
+				<unitPattern count="few">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acair-throigh</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="two">{0} ac ft</unitPattern>
+				<unitPattern count="few">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>buiseal</displayName>
+				<unitPattern count="one">{0} bu</unitPattern>
+				<unitPattern count="two">{0} bu</unitPattern>
+				<unitPattern count="few">{0} bu</unitPattern>
+				<unitPattern count="other">{0} bu</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="two">{0} gal</unitPattern>
+				<unitPattern count="few">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>càrt</displayName>
@@ -8492,6 +9828,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} càrt</unitPattern>
 				<unitPattern count="other">{0} càrt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pinnt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="two">{0} pt</unitPattern>
+				<unitPattern count="few">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cupa</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="two">{0} c</unitPattern>
+				<unitPattern count="few">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="two">{0} fl oz</unitPattern>
+				<unitPattern count="few">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>spàin</displayName>
 				<unitPattern count="one">{0} spàin</unitPattern>
@@ -8506,169 +9863,260 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} sp-t</unitPattern>
 				<unitPattern count="other">{0} sp-t</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}T</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}D</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}I</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+			</compoundUnit>
 			<unit type="acceleration-g-force">
+				<displayName>forsa-g</displayName>
 				<unitPattern count="one">{0}G</unitPattern>
 				<unitPattern count="two">{0}G</unitPattern>
 				<unitPattern count="few">{0}G</unitPattern>
 				<unitPattern count="other">{0}G</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
+				<displayName>m/s²</displayName>
 				<unitPattern count="one">{0}m/s²</unitPattern>
 				<unitPattern count="two">{0}m/s²</unitPattern>
 				<unitPattern count="few">{0}m/s²</unitPattern>
 				<unitPattern count="other">{0}m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>cuairt</displayName>
+				<unitPattern count="one">{0}cuairt</unitPattern>
+				<unitPattern count="two">{0}cuairt</unitPattern>
+				<unitPattern count="few">{0}cuairt</unitPattern>
+				<unitPattern count="other">{0}cuairt</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0}rad</unitPattern>
+				<unitPattern count="two">{0}rad</unitPattern>
+				<unitPattern count="few">{0}rad</unitPattern>
+				<unitPattern count="other">{0}rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>ceum</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="two">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
+				<displayName>àrc-m</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="two">{0}′</unitPattern>
 				<unitPattern count="few">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
 			</unit>
 			<unit type="angle-arc-second">
+				<displayName>àrc-d</displayName>
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="two">{0}″</unitPattern>
 				<unitPattern count="few">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="two">{0}°</unitPattern>
-				<unitPattern count="few">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<unitPattern count="one">{0}rad</unitPattern>
-				<unitPattern count="two">{0}rad</unitPattern>
-				<unitPattern count="few">{0}rad</unitPattern>
-				<unitPattern count="other">{0}rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0}ac</unitPattern>
-				<unitPattern count="two">{0}ac</unitPattern>
-				<unitPattern count="few">{0}ac</unitPattern>
-				<unitPattern count="other">{0}ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0}km²</unitPattern>
+				<unitPattern count="two">{0}km²</unitPattern>
+				<unitPattern count="few">{0}km²</unitPattern>
+				<unitPattern count="other">{0}km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
+				<displayName>heactair</displayName>
 				<unitPattern count="one">{0}ha</unitPattern>
 				<unitPattern count="two">{0}ha</unitPattern>
 				<unitPattern count="few">{0}ha</unitPattern>
 				<unitPattern count="other">{0}ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>meatair²</displayName>
+				<unitPattern count="one">{0}m²</unitPattern>
+				<unitPattern count="two">{0}m²</unitPattern>
+				<unitPattern count="few">{0}m²</unitPattern>
+				<unitPattern count="other">{0}m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
+				<displayName>cm²</displayName>
 				<unitPattern count="one">{0}cm²</unitPattern>
 				<unitPattern count="two">{0}cm²</unitPattern>
 				<unitPattern count="few">{0}cm²</unitPattern>
 				<unitPattern count="other">{0}cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mì²</displayName>
+				<unitPattern count="one">{0}mì²</unitPattern>
+				<unitPattern count="two">{0}mì²</unitPattern>
+				<unitPattern count="few">{0}mì²</unitPattern>
+				<unitPattern count="other">{0}mì²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acair</displayName>
+				<unitPattern count="one">{0}ac</unitPattern>
+				<unitPattern count="two">{0}ac</unitPattern>
+				<unitPattern count="few">{0}ac</unitPattern>
+				<unitPattern count="other">{0}ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>slat²</displayName>
+				<unitPattern count="one">{0}yd²</unitPattern>
+				<unitPattern count="two">{0}yd²</unitPattern>
+				<unitPattern count="few">{0}yd²</unitPattern>
+				<unitPattern count="other">{0}yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
+				<displayName>ft²</displayName>
 				<unitPattern count="one">{0}ft²</unitPattern>
 				<unitPattern count="two">{0}ft²</unitPattern>
 				<unitPattern count="few">{0}ft²</unitPattern>
 				<unitPattern count="other">{0}ft²</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
+				<displayName>in²</displayName>
 				<unitPattern count="one">{0}in²</unitPattern>
 				<unitPattern count="two">{0}in²</unitPattern>
 				<unitPattern count="few">{0}in²</unitPattern>
 				<unitPattern count="other">{0}in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0}km²</unitPattern>
-				<unitPattern count="two">{0}km²</unitPattern>
-				<unitPattern count="few">{0}km²</unitPattern>
-				<unitPattern count="other">{0}km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<unitPattern count="one">{0}m²</unitPattern>
-				<unitPattern count="two">{0}m²</unitPattern>
-				<unitPattern count="few">{0}m²</unitPattern>
-				<unitPattern count="other">{0}m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<unitPattern count="one">{0}mì²</unitPattern>
-				<unitPattern count="two">{0}mì²</unitPattern>
-				<unitPattern count="few">{0}mì²</unitPattern>
-				<unitPattern count="other">{0}mì²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<unitPattern count="one">{0}yd²</unitPattern>
-				<unitPattern count="two">{0}yd²</unitPattern>
-				<unitPattern count="few">{0}yd²</unitPattern>
-				<unitPattern count="other">{0}yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0}kt</unitPattern>
+				<unitPattern count="two">{0}kt</unitPattern>
+				<unitPattern count="few">{0}kt</unitPattern>
+				<unitPattern count="other">{0}kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
+				<displayName>L/km</displayName>
 				<unitPattern count="one">{0}L/km</unitPattern>
 				<unitPattern count="two">{0}L/km</unitPattern>
 				<unitPattern count="few">{0}L/km</unitPattern>
 				<unitPattern count="other">{0}L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0}L/100km</unitPattern>
+				<unitPattern count="two">{0}L/100km</unitPattern>
+				<unitPattern count="few">{0}L/100km</unitPattern>
+				<unitPattern count="other">{0}L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
-				<unitPattern count="one">{0}mpg</unitPattern>
-				<unitPattern count="two">{0}mpg</unitPattern>
-				<unitPattern count="few">{0}mpg</unitPattern>
-				<unitPattern count="other">{0}mpg</unitPattern>
+				<displayName>mì/g</displayName>
+				<unitPattern count="one">{0}mì/g</unitPattern>
+				<unitPattern count="two">{0}mì/g</unitPattern>
+				<unitPattern count="few">{0}mì/g</unitPattern>
+				<unitPattern count="other">{0}mì/g</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<unitPattern count="one">{0}b</unitPattern>
-				<unitPattern count="two">{0}b</unitPattern>
-				<unitPattern count="few">{0}b</unitPattern>
-				<unitPattern count="other">{0}b</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<unitPattern count="one">{0}B</unitPattern>
-				<unitPattern count="two">{0}B</unitPattern>
-				<unitPattern count="few">{0}B</unitPattern>
-				<unitPattern count="other">{0}B</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<unitPattern count="one">{0}Gb</unitPattern>
-				<unitPattern count="two">{0}Gb</unitPattern>
-				<unitPattern count="few">{0}Gb</unitPattern>
-				<unitPattern count="other">{0}Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<unitPattern count="one">{0}GB</unitPattern>
-				<unitPattern count="two">{0}GB</unitPattern>
-				<unitPattern count="few">{0}GB</unitPattern>
-				<unitPattern count="other">{0}GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<unitPattern count="one">{0}kb</unitPattern>
-				<unitPattern count="two">{0}kb</unitPattern>
-				<unitPattern count="few">{0}kb</unitPattern>
-				<unitPattern count="other">{0}kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<unitPattern count="one">{0}kB</unitPattern>
-				<unitPattern count="two">{0}kB</unitPattern>
-				<unitPattern count="few">{0}kB</unitPattern>
-				<unitPattern count="other">{0}kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<unitPattern count="one">{0}Mb</unitPattern>
-				<unitPattern count="two">{0}Mb</unitPattern>
-				<unitPattern count="few">{0}Mb</unitPattern>
-				<unitPattern count="other">{0}Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<unitPattern count="one">{0}MB</unitPattern>
-				<unitPattern count="two">{0}MB</unitPattern>
-				<unitPattern count="few">{0}MB</unitPattern>
-				<unitPattern count="other">{0}MB</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>TB</displayName>
+				<unitPattern count="one">{0}TB</unitPattern>
+				<unitPattern count="two">{0}TB</unitPattern>
+				<unitPattern count="few">{0}TB</unitPattern>
+				<unitPattern count="other">{0}TB</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
 				<unitPattern count="one">{0}Tb</unitPattern>
 				<unitPattern count="two">{0}Tb</unitPattern>
 				<unitPattern count="few">{0}Tb</unitPattern>
 				<unitPattern count="other">{0}Tb</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<unitPattern count="one">{0}TB</unitPattern>
-				<unitPattern count="two">{0}TB</unitPattern>
-				<unitPattern count="few">{0}TB</unitPattern>
-				<unitPattern count="other">{0}TB</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0}GB</unitPattern>
+				<unitPattern count="two">{0}GB</unitPattern>
+				<unitPattern count="few">{0}GB</unitPattern>
+				<unitPattern count="other">{0}GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0}Gb</unitPattern>
+				<unitPattern count="two">{0}Gb</unitPattern>
+				<unitPattern count="few">{0}Gb</unitPattern>
+				<unitPattern count="other">{0}Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0}MB</unitPattern>
+				<unitPattern count="two">{0}MB</unitPattern>
+				<unitPattern count="few">{0}MB</unitPattern>
+				<unitPattern count="other">{0}MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0}Mb</unitPattern>
+				<unitPattern count="two">{0}Mb</unitPattern>
+				<unitPattern count="few">{0}Mb</unitPattern>
+				<unitPattern count="other">{0}Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0}kB</unitPattern>
+				<unitPattern count="two">{0}kB</unitPattern>
+				<unitPattern count="few">{0}kB</unitPattern>
+				<unitPattern count="other">{0}kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0}kb</unitPattern>
+				<unitPattern count="two">{0}kb</unitPattern>
+				<unitPattern count="few">{0}kb</unitPattern>
+				<unitPattern count="other">{0}kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>baidht</displayName>
+				<unitPattern count="one">{0}B</unitPattern>
+				<unitPattern count="two">{0}B</unitPattern>
+				<unitPattern count="few">{0}B</unitPattern>
+				<unitPattern count="other">{0}B</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>biod</displayName>
+				<unitPattern count="one">{0}b</unitPattern>
+				<unitPattern count="two">{0}b</unitPattern>
+				<unitPattern count="few">{0}b</unitPattern>
+				<unitPattern count="other">{0}b</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>li</displayName>
+				<unitPattern count="one">{0}li</unitPattern>
+				<unitPattern count="two">{0}li</unitPattern>
+				<unitPattern count="few">{0}li</unitPattern>
+				<unitPattern count="other">{0}li</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>blia</displayName>
+				<unitPattern count="one">{0}bl</unitPattern>
+				<unitPattern count="two">{0}bl</unitPattern>
+				<unitPattern count="few">{0}bl</unitPattern>
+				<unitPattern count="other">{0}bl</unitPattern>
+				<perUnitPattern>{0}/bl</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mìos</displayName>
+				<unitPattern count="one">{0}m</unitPattern>
+				<unitPattern count="two">{0}m</unitPattern>
+				<unitPattern count="few">{0}m</unitPattern>
+				<unitPattern count="other">{0}m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>s</displayName>
+				<unitPattern count="one">{0}s</unitPattern>
+				<unitPattern count="two">{0}s</unitPattern>
+				<unitPattern count="few">{0}s</unitPattern>
+				<unitPattern count="other">{0}s</unitPattern>
+				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>là</displayName>
@@ -8676,6 +10124,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two">{0}là</unitPattern>
 				<unitPattern count="few">{0}là</unitPattern>
 				<unitPattern count="other">{0}là</unitPattern>
+				<perUnitPattern>{0}/là</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>uair</displayName>
@@ -8683,12 +10132,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two">{0}u</unitPattern>
 				<unitPattern count="few">{0}u</unitPattern>
 				<unitPattern count="other">{0}u</unitPattern>
+				<perUnitPattern>{0}/u</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<unitPattern count="one">{0}μs</unitPattern>
-				<unitPattern count="two">{0}μs</unitPattern>
-				<unitPattern count="few">{0}μs</unitPattern>
-				<unitPattern count="other">{0}μs</unitPattern>
+			<unit type="duration-minute">
+				<displayName>mion</displayName>
+				<unitPattern count="one">{0}m</unitPattern>
+				<unitPattern count="two">{0}m</unitPattern>
+				<unitPattern count="few">{0}m</unitPattern>
+				<unitPattern count="other">{0}m</unitPattern>
+				<perUnitPattern>{0}/mion</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>diog</displayName>
+				<unitPattern count="one">{0}d</unitPattern>
+				<unitPattern count="two">{0}d</unitPattern>
+				<unitPattern count="few">{0}d</unitPattern>
+				<unitPattern count="other">{0}d</unitPattern>
+				<perUnitPattern>{0}/d</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>ms</displayName>
@@ -8697,175 +10157,117 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0}ms</unitPattern>
 				<unitPattern count="other">{0}ms</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>mion</displayName>
-				<unitPattern count="one">{0}m</unitPattern>
-				<unitPattern count="two">{0}m</unitPattern>
-				<unitPattern count="few">{0}m</unitPattern>
-				<unitPattern count="other">{0}m</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>mìos</displayName>
-				<unitPattern count="one">{0}m</unitPattern>
-				<unitPattern count="two">{0}m</unitPattern>
-				<unitPattern count="few">{0}m</unitPattern>
-				<unitPattern count="other">{0}m</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0}μs</unitPattern>
+				<unitPattern count="two">{0}μs</unitPattern>
+				<unitPattern count="few">{0}μs</unitPattern>
+				<unitPattern count="other">{0}μs</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
 				<unitPattern count="one">{0}ns</unitPattern>
 				<unitPattern count="two">{0}ns</unitPattern>
 				<unitPattern count="few">{0}ns</unitPattern>
 				<unitPattern count="other">{0}ns</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>diog</displayName>
-				<unitPattern count="one">{0}d</unitPattern>
-				<unitPattern count="two">{0}d</unitPattern>
-				<unitPattern count="few">{0}d</unitPattern>
-				<unitPattern count="other">{0}d</unitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>s</displayName>
-				<unitPattern count="one">{0}s</unitPattern>
-				<unitPattern count="two">{0}s</unitPattern>
-				<unitPattern count="few">{0}s</unitPattern>
-				<unitPattern count="other">{0}s</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>blia</displayName>
-				<unitPattern count="one">{0}bl</unitPattern>
-				<unitPattern count="two">{0}bl</unitPattern>
-				<unitPattern count="few">{0}bl</unitPattern>
-				<unitPattern count="other">{0}bl</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
+				<displayName>amp</displayName>
 				<unitPattern count="one">{0}A</unitPattern>
 				<unitPattern count="two">{0}A</unitPattern>
 				<unitPattern count="few">{0}A</unitPattern>
 				<unitPattern count="other">{0}A</unitPattern>
 			</unit>
 			<unit type="electric-milliampere">
+				<displayName>mA</displayName>
 				<unitPattern count="one">{0}mA</unitPattern>
 				<unitPattern count="two">{0}mA</unitPattern>
 				<unitPattern count="few">{0}mA</unitPattern>
 				<unitPattern count="other">{0}mA</unitPattern>
 			</unit>
 			<unit type="electric-ohm">
+				<displayName>ohm</displayName>
 				<unitPattern count="one">{0}Ω</unitPattern>
 				<unitPattern count="two">{0}Ω</unitPattern>
 				<unitPattern count="few">{0}Ω</unitPattern>
 				<unitPattern count="other">{0}Ω</unitPattern>
 			</unit>
 			<unit type="electric-volt">
+				<displayName>volt</displayName>
 				<unitPattern count="one">{0}V</unitPattern>
 				<unitPattern count="two">{0}V</unitPattern>
 				<unitPattern count="few">{0}V</unitPattern>
 				<unitPattern count="other">{0}V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0}kcal</unitPattern>
+				<unitPattern count="two">{0}kcal</unitPattern>
+				<unitPattern count="few">{0}kcal</unitPattern>
+				<unitPattern count="other">{0}kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
+				<displayName>cal</displayName>
 				<unitPattern count="one">{0}cal</unitPattern>
 				<unitPattern count="two">{0}cal</unitPattern>
 				<unitPattern count="few">{0}cal</unitPattern>
 				<unitPattern count="other">{0}cal</unitPattern>
 			</unit>
 			<unit type="energy-foodcalorie">
+				<displayName>Cal</displayName>
 				<unitPattern count="one">{0}Cal</unitPattern>
 				<unitPattern count="two">{0}Cal</unitPattern>
 				<unitPattern count="few">{0}Cal</unitPattern>
 				<unitPattern count="other">{0}Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<unitPattern count="one">{0}J</unitPattern>
-				<unitPattern count="two">{0}J</unitPattern>
-				<unitPattern count="few">{0}J</unitPattern>
-				<unitPattern count="other">{0}J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<unitPattern count="one">{0}kcal</unitPattern>
-				<unitPattern count="two">{0}kcal</unitPattern>
-				<unitPattern count="few">{0}kcal</unitPattern>
-				<unitPattern count="other">{0}kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
+				<displayName>kJ</displayName>
 				<unitPattern count="one">{0}kJ</unitPattern>
 				<unitPattern count="two">{0}kJ</unitPattern>
 				<unitPattern count="few">{0}kJ</unitPattern>
 				<unitPattern count="other">{0}kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="one">{0}J</unitPattern>
+				<unitPattern count="two">{0}J</unitPattern>
+				<unitPattern count="few">{0}J</unitPattern>
+				<unitPattern count="other">{0}J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
+				<displayName>kWh</displayName>
 				<unitPattern count="one">{0}kWh</unitPattern>
 				<unitPattern count="two">{0}kWh</unitPattern>
 				<unitPattern count="few">{0}kWh</unitPattern>
 				<unitPattern count="other">{0}kWh</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
+				<displayName>GHz</displayName>
 				<unitPattern count="one">{0}GHz</unitPattern>
 				<unitPattern count="two">{0}GHz</unitPattern>
 				<unitPattern count="few">{0}GHz</unitPattern>
 				<unitPattern count="other">{0}GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<unitPattern count="one">{0}Hz</unitPattern>
-				<unitPattern count="two">{0}Hz</unitPattern>
-				<unitPattern count="few">{0}Hz</unitPattern>
-				<unitPattern count="other">{0}Hz</unitPattern>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<unitPattern count="one">{0}kHz</unitPattern>
-				<unitPattern count="two">{0}kHz</unitPattern>
-				<unitPattern count="few">{0}kHz</unitPattern>
-				<unitPattern count="other">{0}kHz</unitPattern>
-			</unit>
 			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
 				<unitPattern count="one">{0}MHz</unitPattern>
 				<unitPattern count="two">{0}MHz</unitPattern>
 				<unitPattern count="few">{0}MHz</unitPattern>
 				<unitPattern count="other">{0}MHz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<unitPattern count="one">{0}au</unitPattern>
-				<unitPattern count="two">{0}au</unitPattern>
-				<unitPattern count="few">{0}au</unitPattern>
-				<unitPattern count="other">{0}au</unitPattern>
+			<unit type="frequency-kilohertz">
+				<displayName>kHz</displayName>
+				<unitPattern count="one">{0}kHz</unitPattern>
+				<unitPattern count="two">{0}kHz</unitPattern>
+				<unitPattern count="few">{0}kHz</unitPattern>
+				<unitPattern count="other">{0}kHz</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0}cm</unitPattern>
-				<unitPattern count="two">{0}cm</unitPattern>
-				<unitPattern count="few">{0}cm</unitPattern>
-				<unitPattern count="other">{0}cm</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<unitPattern count="one">{0}dm</unitPattern>
-				<unitPattern count="two">{0}dm</unitPattern>
-				<unitPattern count="few">{0}dm</unitPattern>
-				<unitPattern count="other">{0}dm</unitPattern>
-			</unit>
-			<unit type="length-fathom">
-				<displayName>fm</displayName>
-				<unitPattern count="one">{0}fm</unitPattern>
-				<unitPattern count="two">{0}fm</unitPattern>
-				<unitPattern count="few">{0}fm</unitPattern>
-				<unitPattern count="other">{0}fm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0}′</unitPattern>
-				<unitPattern count="two">{0}′</unitPattern>
-				<unitPattern count="few">{0}′</unitPattern>
-				<unitPattern count="other">{0}′</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>stàid</displayName>
-				<unitPattern count="one">{0}stàid</unitPattern>
-				<unitPattern count="two">{0}stàid</unitPattern>
-				<unitPattern count="few">{0}stàid</unitPattern>
-				<unitPattern count="other">{0}stàid</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0}″</unitPattern>
-				<unitPattern count="two">{0}″</unitPattern>
-				<unitPattern count="few">{0}″</unitPattern>
-				<unitPattern count="other">{0}″</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0}Hz</unitPattern>
+				<unitPattern count="two">{0}Hz</unitPattern>
+				<unitPattern count="few">{0}Hz</unitPattern>
+				<unitPattern count="other">{0}Hz</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
@@ -8873,12 +10275,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two">{0}km</unitPattern>
 				<unitPattern count="few">{0}km</unitPattern>
 				<unitPattern count="other">{0}km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0}ly</unitPattern>
-				<unitPattern count="two">{0}ly</unitPattern>
-				<unitPattern count="few">{0}ly</unitPattern>
-				<unitPattern count="other">{0}ly</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
 			<unit type="length-meter">
 				<displayName>meatair</displayName>
@@ -8886,18 +10283,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two">{0}m</unitPattern>
 				<unitPattern count="few">{0}m</unitPattern>
 				<unitPattern count="other">{0}m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
-			<unit type="length-micrometer">
-				<unitPattern count="one">{0}µm</unitPattern>
-				<unitPattern count="two">{0}µm</unitPattern>
-				<unitPattern count="few">{0}µm</unitPattern>
-				<unitPattern count="other">{0}µm</unitPattern>
+			<unit type="length-decimeter">
+				<displayName>dm</displayName>
+				<unitPattern count="one">{0}dm</unitPattern>
+				<unitPattern count="two">{0}dm</unitPattern>
+				<unitPattern count="few">{0}dm</unitPattern>
+				<unitPattern count="other">{0}dm</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0}mì</unitPattern>
-				<unitPattern count="two">{0}mì</unitPattern>
-				<unitPattern count="few">{0}mì</unitPattern>
-				<unitPattern count="other">{0}mì</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0}cm</unitPattern>
+				<unitPattern count="two">{0}cm</unitPattern>
+				<unitPattern count="few">{0}cm</unitPattern>
+				<unitPattern count="other">{0}cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -8906,54 +10307,119 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0}mm</unitPattern>
 				<unitPattern count="other">{0}mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0}µm</unitPattern>
+				<unitPattern count="two">{0}µm</unitPattern>
+				<unitPattern count="few">{0}µm</unitPattern>
+				<unitPattern count="other">{0}µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
+				<displayName>nm</displayName>
 				<unitPattern count="one">{0}nm</unitPattern>
 				<unitPattern count="two">{0}nm</unitPattern>
 				<unitPattern count="few">{0}nm</unitPattern>
 				<unitPattern count="other">{0}nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<unitPattern count="one">{0}nmi</unitPattern>
-				<unitPattern count="two">{0}nmi</unitPattern>
-				<unitPattern count="few">{0}nmi</unitPattern>
-				<unitPattern count="other">{0}nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<unitPattern count="one">{0}pc</unitPattern>
-				<unitPattern count="two">{0}pc</unitPattern>
-				<unitPattern count="few">{0}pc</unitPattern>
-				<unitPattern count="other">{0}pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
+				<displayName>pm</displayName>
 				<unitPattern count="one">{0}pm</unitPattern>
 				<unitPattern count="two">{0}pm</unitPattern>
 				<unitPattern count="few">{0}pm</unitPattern>
 				<unitPattern count="other">{0}pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mì</displayName>
+				<unitPattern count="one">{0}mì</unitPattern>
+				<unitPattern count="two">{0}mì</unitPattern>
+				<unitPattern count="few">{0}mì</unitPattern>
+				<unitPattern count="other">{0}mì</unitPattern>
+			</unit>
 			<unit type="length-yard">
+				<displayName>slat</displayName>
 				<unitPattern count="one">{0}yd</unitPattern>
 				<unitPattern count="two">{0}yd</unitPattern>
 				<unitPattern count="few">{0}yd</unitPattern>
 				<unitPattern count="other">{0}yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>troigh</displayName>
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="two">{0}′</unitPattern>
+				<unitPattern count="few">{0}′</unitPattern>
+				<unitPattern count="other">{0}′</unitPattern>
+				<perUnitPattern>{0}/troigh</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>òirl</displayName>
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="two">{0}″</unitPattern>
+				<unitPattern count="few">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+				<perUnitPattern>{0}/òirl</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsec</displayName>
+				<unitPattern count="one">{0}pc</unitPattern>
+				<unitPattern count="two">{0}pc</unitPattern>
+				<unitPattern count="few">{0}pc</unitPattern>
+				<unitPattern count="other">{0}pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ly</displayName>
+				<unitPattern count="one">{0}ly</unitPattern>
+				<unitPattern count="two">{0}ly</unitPattern>
+				<unitPattern count="few">{0}ly</unitPattern>
+				<unitPattern count="other">{0}ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0}au</unitPattern>
+				<unitPattern count="two">{0}au</unitPattern>
+				<unitPattern count="few">{0}au</unitPattern>
+				<unitPattern count="other">{0}au</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>stàid</displayName>
+				<unitPattern count="one">{0}stàid</unitPattern>
+				<unitPattern count="two">{0}stàid</unitPattern>
+				<unitPattern count="few">{0}stàid</unitPattern>
+				<unitPattern count="other">{0}stàid</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>aitheamh</displayName>
+				<unitPattern count="one">{0}fm</unitPattern>
+				<unitPattern count="two">{0}fm</unitPattern>
+				<unitPattern count="few">{0}fm</unitPattern>
+				<unitPattern count="other">{0}fm</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0}nmi</unitPattern>
+				<unitPattern count="two">{0}nmi</unitPattern>
+				<unitPattern count="few">{0}nmi</unitPattern>
+				<unitPattern count="other">{0}nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0}smi</unitPattern>
+				<unitPattern count="two">{0}smi</unitPattern>
+				<unitPattern count="few">{0}smi</unitPattern>
+				<unitPattern count="other">{0}smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
+				<displayName>lux</displayName>
 				<unitPattern count="one">{0}lx</unitPattern>
 				<unitPattern count="two">{0}lx</unitPattern>
 				<unitPattern count="few">{0}lx</unitPattern>
 				<unitPattern count="other">{0}lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<unitPattern count="one">{0}CD</unitPattern>
-				<unitPattern count="two">{0}CD</unitPattern>
-				<unitPattern count="few">{0}CD</unitPattern>
-				<unitPattern count="other">{0}CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>grama</displayName>
-				<unitPattern count="one">{0}g</unitPattern>
-				<unitPattern count="two">{0}g</unitPattern>
-				<unitPattern count="few">{0}g</unitPattern>
-				<unitPattern count="other">{0}g</unitPattern>
+			<unit type="mass-metric-ton">
+				<displayName>t</displayName>
+				<unitPattern count="one">{0}t</unitPattern>
+				<unitPattern count="two">{0}t</unitPattern>
+				<unitPattern count="few">{0}t</unitPattern>
+				<unitPattern count="other">{0}t</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
@@ -8961,42 +10427,36 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two">{0}kg</unitPattern>
 				<unitPattern count="few">{0}kg</unitPattern>
 				<unitPattern count="other">{0}kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
 			</unit>
-			<unit type="mass-metric-ton">
-				<unitPattern count="one">{0}t</unitPattern>
-				<unitPattern count="two">{0}t</unitPattern>
-				<unitPattern count="few">{0}t</unitPattern>
-				<unitPattern count="other">{0}t</unitPattern>
-			</unit>
-			<unit type="mass-microgram">
-				<unitPattern count="one">{0}µg</unitPattern>
-				<unitPattern count="two">{0}µg</unitPattern>
-				<unitPattern count="few">{0}µg</unitPattern>
-				<unitPattern count="other">{0}µg</unitPattern>
+			<unit type="mass-gram">
+				<displayName>grama</displayName>
+				<unitPattern count="one">{0}g</unitPattern>
+				<unitPattern count="two">{0}g</unitPattern>
+				<unitPattern count="few">{0}g</unitPattern>
+				<unitPattern count="other">{0}g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
+				<displayName>mg</displayName>
 				<unitPattern count="one">{0}mg</unitPattern>
 				<unitPattern count="two">{0}mg</unitPattern>
 				<unitPattern count="few">{0}mg</unitPattern>
 				<unitPattern count="other">{0}mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0}oz</unitPattern>
-				<unitPattern count="two">{0}oz</unitPattern>
-				<unitPattern count="few">{0}oz</unitPattern>
-				<unitPattern count="other">{0}oz</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0}µg</unitPattern>
+				<unitPattern count="two">{0}µg</unitPattern>
+				<unitPattern count="few">{0}µg</unitPattern>
+				<unitPattern count="other">{0}µg</unitPattern>
 			</unit>
-			<unit type="mass-ounce-troy">
-				<unitPattern count="one">{0}oz t</unitPattern>
-				<unitPattern count="two">{0}oz t</unitPattern>
-				<unitPattern count="few">{0}oz t</unitPattern>
-				<unitPattern count="other">{0}oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<unitPattern count="one">{0}lb</unitPattern>
-				<unitPattern count="two">{0}lb</unitPattern>
-				<unitPattern count="few">{0}lb</unitPattern>
-				<unitPattern count="other">{0}lb</unitPattern>
+			<unit type="mass-ton">
+				<displayName>tn</displayName>
+				<unitPattern count="one">{0}tn</unitPattern>
+				<unitPattern count="two">{0}tn</unitPattern>
+				<unitPattern count="few">{0}tn</unitPattern>
+				<unitPattern count="other">{0}tn</unitPattern>
 			</unit>
 			<unit type="mass-stone">
 				<displayName>clach</displayName>
@@ -9005,83 +10465,112 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0}clach</unitPattern>
 				<unitPattern count="other">{0}clach</unitPattern>
 			</unit>
-			<unit type="mass-ton">
-				<unitPattern count="one">{0}tn</unitPattern>
-				<unitPattern count="two">{0}tn</unitPattern>
-				<unitPattern count="few">{0}tn</unitPattern>
-				<unitPattern count="other">{0}tn</unitPattern>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0}lb</unitPattern>
+				<unitPattern count="two">{0}lb</unitPattern>
+				<unitPattern count="few">{0}lb</unitPattern>
+				<unitPattern count="other">{0}lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0}oz</unitPattern>
+				<unitPattern count="two">{0}oz</unitPattern>
+				<unitPattern count="few">{0}oz</unitPattern>
+				<unitPattern count="other">{0}oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0}oz t</unitPattern>
+				<unitPattern count="two">{0}oz t</unitPattern>
+				<unitPattern count="few">{0}oz t</unitPattern>
+				<unitPattern count="other">{0}oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>carat</displayName>
+				<unitPattern count="one">{0}CD</unitPattern>
+				<unitPattern count="two">{0}CD</unitPattern>
+				<unitPattern count="few">{0}CD</unitPattern>
+				<unitPattern count="other">{0}CD</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
+				<displayName>GW</displayName>
 				<unitPattern count="one">{0}GW</unitPattern>
 				<unitPattern count="two">{0}GW</unitPattern>
 				<unitPattern count="few">{0}GW</unitPattern>
 				<unitPattern count="other">{0}GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0}hp</unitPattern>
-				<unitPattern count="two">{0}hp</unitPattern>
-				<unitPattern count="few">{0}hp</unitPattern>
-				<unitPattern count="other">{0}hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<unitPattern count="one">{0}kW</unitPattern>
-				<unitPattern count="two">{0}kW</unitPattern>
-				<unitPattern count="few">{0}kW</unitPattern>
-				<unitPattern count="other">{0}kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
+				<displayName>MW</displayName>
 				<unitPattern count="one">{0}MW</unitPattern>
 				<unitPattern count="two">{0}MW</unitPattern>
 				<unitPattern count="few">{0}MW</unitPattern>
 				<unitPattern count="other">{0}MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<unitPattern count="one">{0}mW</unitPattern>
-				<unitPattern count="two">{0}mW</unitPattern>
-				<unitPattern count="few">{0}mW</unitPattern>
-				<unitPattern count="other">{0}mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0}kW</unitPattern>
+				<unitPattern count="two">{0}kW</unitPattern>
+				<unitPattern count="few">{0}kW</unitPattern>
+				<unitPattern count="other">{0}kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
+				<displayName>watt</displayName>
 				<unitPattern count="one">{0}W</unitPattern>
 				<unitPattern count="two">{0}W</unitPattern>
 				<unitPattern count="few">{0}W</unitPattern>
 				<unitPattern count="other">{0}W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0}mW</unitPattern>
+				<unitPattern count="two">{0}mW</unitPattern>
+				<unitPattern count="few">{0}mW</unitPattern>
+				<unitPattern count="other">{0}mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="one">{0}hp</unitPattern>
+				<unitPattern count="two">{0}hp</unitPattern>
+				<unitPattern count="few">{0}hp</unitPattern>
+				<unitPattern count="other">{0}hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
+				<displayName>hPa</displayName>
 				<unitPattern count="one">{0}hPa</unitPattern>
 				<unitPattern count="two">{0}hPa</unitPattern>
 				<unitPattern count="few">{0}hPa</unitPattern>
 				<unitPattern count="other">{0}hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<unitPattern count="one">{0}&quot; Hg</unitPattern>
-				<unitPattern count="two">{0}&quot; Hg</unitPattern>
-				<unitPattern count="few">{0}&quot; Hg</unitPattern>
-				<unitPattern count="other">{0}&quot; Hg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<unitPattern count="one">{0}mb</unitPattern>
-				<unitPattern count="two">{0}mb</unitPattern>
-				<unitPattern count="few">{0}mb</unitPattern>
-				<unitPattern count="other">{0}mb</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
+				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0}mm Hg</unitPattern>
 				<unitPattern count="two">{0}mm Hg</unitPattern>
 				<unitPattern count="few">{0}mm Hg</unitPattern>
 				<unitPattern count="other">{0}mm Hg</unitPattern>
 			</unit>
 			<unit type="pressure-pound-per-square-inch">
+				<displayName>psi</displayName>
 				<unitPattern count="one">{0}psi</unitPattern>
 				<unitPattern count="two">{0}psi</unitPattern>
 				<unitPattern count="few">{0}psi</unitPattern>
 				<unitPattern count="other">{0}psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<unitPattern count="one">{0}kt</unitPattern>
-				<unitPattern count="two">{0}kt</unitPattern>
-				<unitPattern count="few">{0}kt</unitPattern>
-				<unitPattern count="other">{0}kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>″ Hg</displayName>
+				<unitPattern count="one">{0}″ Hg</unitPattern>
+				<unitPattern count="two">{0}″ Hg</unitPattern>
+				<unitPattern count="few">{0}″ Hg</unitPattern>
+				<unitPattern count="other">{0}″ Hg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbàr</displayName>
+				<unitPattern count="one">{0}mb</unitPattern>
+				<unitPattern count="two">{0}mb</unitPattern>
+				<unitPattern count="few">{0}mb</unitPattern>
+				<unitPattern count="other">{0}mb</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -9091,17 +10580,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0}km/h</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
+				<displayName>m/s</displayName>
 				<unitPattern count="one">{0}m/s</unitPattern>
 				<unitPattern count="two">{0}m/s</unitPattern>
 				<unitPattern count="few">{0}m/s</unitPattern>
 				<unitPattern count="other">{0}m/s</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
+				<displayName>mì/h</displayName>
 				<unitPattern count="one">{0}mì/h</unitPattern>
 				<unitPattern count="two">{0}mì/h</unitPattern>
 				<unitPattern count="few">{0}mì/h</unitPattern>
 				<unitPattern count="other">{0}mì/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0}kn</unitPattern>
+				<unitPattern count="two">{0}kn</unitPattern>
+				<unitPattern count="few">{0}kn</unitPattern>
+				<unitPattern count="other">{0}kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="two">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -9110,18 +10615,129 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0}°C</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
+				<displayName>°F</displayName>
 				<unitPattern count="one">{0}°F</unitPattern>
 				<unitPattern count="two">{0}°F</unitPattern>
 				<unitPattern count="few">{0}°F</unitPattern>
 				<unitPattern count="other">{0}°F</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
-				<unitPattern count="one">{0}°K</unitPattern>
-				<unitPattern count="two">{0}°K</unitPattern>
-				<unitPattern count="few">{0}°K</unitPattern>
-				<unitPattern count="other">{0}°K</unitPattern>
+				<displayName>K</displayName>
+				<unitPattern count="one">{0}K</unitPattern>
+				<unitPattern count="two">{0}K</unitPattern>
+				<unitPattern count="few">{0}K</unitPattern>
+				<unitPattern count="other">{0}K</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>km³</displayName>
+				<unitPattern count="one">{0}km³</unitPattern>
+				<unitPattern count="two">{0}km³</unitPattern>
+				<unitPattern count="few">{0}km³</unitPattern>
+				<unitPattern count="other">{0}km³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>m³</displayName>
+				<unitPattern count="one">{0}m³</unitPattern>
+				<unitPattern count="two">{0}m³</unitPattern>
+				<unitPattern count="few">{0}m³</unitPattern>
+				<unitPattern count="other">{0}m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0}cm³</unitPattern>
+				<unitPattern count="two">{0}cm³</unitPattern>
+				<unitPattern count="few">{0}cm³</unitPattern>
+				<unitPattern count="other">{0}cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>mì³</displayName>
+				<unitPattern count="one">{0}mì³</unitPattern>
+				<unitPattern count="two">{0}mì³</unitPattern>
+				<unitPattern count="few">{0}mì³</unitPattern>
+				<unitPattern count="other">{0}mì³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>yd³</displayName>
+				<unitPattern count="one">{0}yd³</unitPattern>
+				<unitPattern count="two">{0}yd³</unitPattern>
+				<unitPattern count="few">{0}yd³</unitPattern>
+				<unitPattern count="other">{0}yd³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0}ft³</unitPattern>
+				<unitPattern count="two">{0}ft³</unitPattern>
+				<unitPattern count="few">{0}ft³</unitPattern>
+				<unitPattern count="other">{0}ft³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0}in³</unitPattern>
+				<unitPattern count="two">{0}in³</unitPattern>
+				<unitPattern count="few">{0}in³</unitPattern>
+				<unitPattern count="other">{0}in³</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0}ML</unitPattern>
+				<unitPattern count="two">{0}ML</unitPattern>
+				<unitPattern count="few">{0}ML</unitPattern>
+				<unitPattern count="other">{0}ML</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hL</displayName>
+				<unitPattern count="one">{0}hL</unitPattern>
+				<unitPattern count="two">{0}hL</unitPattern>
+				<unitPattern count="few">{0}hL</unitPattern>
+				<unitPattern count="other">{0}hL</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>liotair</displayName>
+				<unitPattern count="one">{0}l</unitPattern>
+				<unitPattern count="two">{0}l</unitPattern>
+				<unitPattern count="few">{0}l</unitPattern>
+				<unitPattern count="other">{0}l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0}dL</unitPattern>
+				<unitPattern count="two">{0}dL</unitPattern>
+				<unitPattern count="few">{0}dL</unitPattern>
+				<unitPattern count="other">{0}dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="one">{0}cL</unitPattern>
+				<unitPattern count="two">{0}cL</unitPattern>
+				<unitPattern count="few">{0}cL</unitPattern>
+				<unitPattern count="other">{0}cL</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>mL</displayName>
+				<unitPattern count="one">{0}mL</unitPattern>
+				<unitPattern count="two">{0}mL</unitPattern>
+				<unitPattern count="few">{0}mL</unitPattern>
+				<unitPattern count="other">{0}mL</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0}mpt</unitPattern>
+				<unitPattern count="two">{0}mpt</unitPattern>
+				<unitPattern count="few">{0}mpt</unitPattern>
+				<unitPattern count="other">{0}mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0}mc</unitPattern>
+				<unitPattern count="two">{0}mc</unitPattern>
+				<unitPattern count="few">{0}mc</unitPattern>
+				<unitPattern count="other">{0}mc</unitPattern>
 			</unit>
 			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
 				<unitPattern count="one">{0}ac ft</unitPattern>
 				<unitPattern count="two">{0}ac ft</unitPattern>
 				<unitPattern count="few">{0}ac ft</unitPattern>
@@ -9134,127 +10750,62 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0}bu</unitPattern>
 				<unitPattern count="other">{0}bu</unitPattern>
 			</unit>
-			<unit type="volume-centiliter">
-				<unitPattern count="one">{0}cL</unitPattern>
-				<unitPattern count="two">{0}cL</unitPattern>
-				<unitPattern count="few">{0}cL</unitPattern>
-				<unitPattern count="other">{0}cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<unitPattern count="one">{0}cm³</unitPattern>
-				<unitPattern count="two">{0}cm³</unitPattern>
-				<unitPattern count="few">{0}cm³</unitPattern>
-				<unitPattern count="other">{0}cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<unitPattern count="one">{0}ft³</unitPattern>
-				<unitPattern count="two">{0}ft³</unitPattern>
-				<unitPattern count="few">{0}ft³</unitPattern>
-				<unitPattern count="other">{0}ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<unitPattern count="one">{0}in³</unitPattern>
-				<unitPattern count="two">{0}in³</unitPattern>
-				<unitPattern count="few">{0}in³</unitPattern>
-				<unitPattern count="other">{0}in³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-kilometer">
-				<unitPattern count="one">{0}km³</unitPattern>
-				<unitPattern count="two">{0}km³</unitPattern>
-				<unitPattern count="few">{0}km³</unitPattern>
-				<unitPattern count="other">{0}km³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-meter">
-				<unitPattern count="one">{0}m³</unitPattern>
-				<unitPattern count="two">{0}m³</unitPattern>
-				<unitPattern count="few">{0}m³</unitPattern>
-				<unitPattern count="other">{0}m³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<unitPattern count="one">{0}mì³</unitPattern>
-				<unitPattern count="two">{0}mì³</unitPattern>
-				<unitPattern count="few">{0}mì³</unitPattern>
-				<unitPattern count="other">{0}mì³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-yard">
-				<unitPattern count="one">{0}yd³</unitPattern>
-				<unitPattern count="two">{0}yd³</unitPattern>
-				<unitPattern count="few">{0}yd³</unitPattern>
-				<unitPattern count="other">{0}yd³</unitPattern>
-			</unit>
-			<unit type="volume-cup">
-				<unitPattern count="one">{0}c</unitPattern>
-				<unitPattern count="two">{0}c</unitPattern>
-				<unitPattern count="few">{0}c</unitPattern>
-				<unitPattern count="other">{0}c</unitPattern>
-			</unit>
-			<unit type="volume-deciliter">
-				<unitPattern count="one">{0}dL</unitPattern>
-				<unitPattern count="two">{0}dL</unitPattern>
-				<unitPattern count="few">{0}dL</unitPattern>
-				<unitPattern count="other">{0}dL</unitPattern>
-			</unit>
-			<unit type="volume-fluid-ounce">
-				<unitPattern count="one">{0}fl oz</unitPattern>
-				<unitPattern count="two">{0}fl oz</unitPattern>
-				<unitPattern count="few">{0}fl oz</unitPattern>
-				<unitPattern count="other">{0}fl oz</unitPattern>
-			</unit>
 			<unit type="volume-gallon">
+				<displayName>gal</displayName>
 				<unitPattern count="one">{0}gal</unitPattern>
 				<unitPattern count="two">{0}gal</unitPattern>
 				<unitPattern count="few">{0}gal</unitPattern>
 				<unitPattern count="other">{0}gal</unitPattern>
-			</unit>
-			<unit type="volume-hectoliter">
-				<unitPattern count="one">{0}hL</unitPattern>
-				<unitPattern count="two">{0}hL</unitPattern>
-				<unitPattern count="few">{0}hL</unitPattern>
-				<unitPattern count="other">{0}hL</unitPattern>
-			</unit>
-			<unit type="volume-liter">
-				<displayName>liotair</displayName>
-				<unitPattern count="one">{0}l</unitPattern>
-				<unitPattern count="two">{0}l</unitPattern>
-				<unitPattern count="few">{0}l</unitPattern>
-				<unitPattern count="other">{0}l</unitPattern>
-			</unit>
-			<unit type="volume-megaliter">
-				<unitPattern count="one">{0}ML</unitPattern>
-				<unitPattern count="two">{0}ML</unitPattern>
-				<unitPattern count="few">{0}ML</unitPattern>
-				<unitPattern count="other">{0}ML</unitPattern>
-			</unit>
-			<unit type="volume-milliliter">
-				<unitPattern count="one">{0}mL</unitPattern>
-				<unitPattern count="two">{0}mL</unitPattern>
-				<unitPattern count="few">{0}mL</unitPattern>
-				<unitPattern count="other">{0}mL</unitPattern>
-			</unit>
-			<unit type="volume-pint">
-				<unitPattern count="one">{0}pt</unitPattern>
-				<unitPattern count="two">{0}pt</unitPattern>
-				<unitPattern count="few">{0}pt</unitPattern>
-				<unitPattern count="other">{0}pt</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
+				<displayName>càrt</displayName>
 				<unitPattern count="one">{0}càrt</unitPattern>
 				<unitPattern count="two">{0}càrt</unitPattern>
 				<unitPattern count="few">{0}càrt</unitPattern>
 				<unitPattern count="other">{0}càrt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0}pt</unitPattern>
+				<unitPattern count="two">{0}pt</unitPattern>
+				<unitPattern count="few">{0}pt</unitPattern>
+				<unitPattern count="other">{0}pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cupa</displayName>
+				<unitPattern count="one">{0}c</unitPattern>
+				<unitPattern count="two">{0}c</unitPattern>
+				<unitPattern count="few">{0}c</unitPattern>
+				<unitPattern count="other">{0}c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0}fl oz</unitPattern>
+				<unitPattern count="two">{0}fl oz</unitPattern>
+				<unitPattern count="few">{0}fl oz</unitPattern>
+				<unitPattern count="other">{0}fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
+				<displayName>sp</displayName>
 				<unitPattern count="one">{0}sp</unitPattern>
 				<unitPattern count="two">{0}sp</unitPattern>
 				<unitPattern count="few">{0}sp</unitPattern>
 				<unitPattern count="other">{0}sp</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
+				<displayName>sp-t</displayName>
 				<unitPattern count="one">{0}sp-t</unitPattern>
 				<unitPattern count="two">{0}sp-t</unitPattern>
 				<unitPattern count="few">{0}sp-t</unitPattern>
 				<unitPattern count="other">{0}sp-t</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}T</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}D</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}I</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
@@ -9288,8 +10839,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<listPattern type="unit-short">
 			<listPatternPart type="start">{0}, {1}</listPatternPart>
 			<listPatternPart type="middle">{0}, {1}</listPatternPart>
-			<listPatternPart type="end">{0} ‘s {1}</listPatternPart>
-			<listPatternPart type="2">{0} ‘s {1}</listPatternPart>
+			<listPatternPart type="end">{0} ’s {1}</listPatternPart>
+			<listPatternPart type="2">{0} ’s {1}</listPatternPart>
 		</listPattern>
 	</listPatterns>
 	<posix>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gd_GB.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gd_GB.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gd_GB.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gd_GB.xml
index b6b19c94a36..a429b422f65 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gd_GB.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gd_GB.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="gd"/>
 		<territory type="GB"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gl.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gl.xml
similarity index 90%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gl.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gl.xml
index bc86bc59312..6f7e5cb1dfa 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gl.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gl.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12376 $"/>
 		<language type="gl"/>
 	</identity>
 	<localeDisplayNames>
@@ -20,7 +19,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ab">abkhazo</language>
 			<language type="ach">acoli</language>
 			<language type="af">afrikaans</language>
-			<language type="agq">aghem</language>
+			<language type="agq">agq</language>
 			<language type="ak">akán</language>
 			<language type="am">amárico</language>
 			<language type="an">aragonés</language>
@@ -37,21 +36,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ba">baskir</language>
 			<language type="be">bielorruso</language>
 			<language type="bem">bemba</language>
-			<language type="bez">bena</language>
+			<language type="bez">bez</language>
 			<language type="bg">búlgaro</language>
-			<language type="bm">bambara</language>
+			<language type="bgn">Baluchi occidental</language>
+			<language type="bm">bm</language>
 			<language type="bn">bengalí</language>
 			<language type="bo">tibetano</language>
 			<language type="br">bretón</language>
-			<language type="brx">bodo</language>
+			<language type="brx">brx</language>
 			<language type="bs">bosnio</language>
 			<language type="ca">catalán</language>
+			<language type="ce">Checheno</language>
 			<language type="cgg">kiga</language>
 			<language type="chr">cheroqui</language>
 			<language type="ckb">curdo soraní</language>
 			<language type="co">corso</language>
 			<language type="cs">checo</language>
 			<language type="cu">eslavo eclesiástico</language>
+			<language type="cv">Chuvash</language>
 			<language type="cy">galés</language>
 			<language type="da">dinamarqués</language>
 			<language type="dav">taita</language>
@@ -59,7 +61,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="de_AT">alemán de austria</language>
 			<language type="de_CH">alto alemán suízo</language>
 			<language type="dje">zarma</language>
-			<language type="dsb">baixo sorabio</language>
+			<language type="dsb">dsb</language>
 			<language type="dua">duala</language>
 			<language type="dv">divehi</language>
 			<language type="dyo">jola-fonyi</language>
@@ -87,7 +89,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="fi">finés</language>
 			<language type="fil">filipino</language>
 			<language type="fj">fixiano</language>
-			<language type="fo" draft="contributed">faroés</language>
+			<language type="fo">faroés</language>
 			<language type="fr">francés</language>
 			<language type="fr_CA">francés canadiano</language>
 			<language type="fr_CH">francés suízo</language>
@@ -100,7 +102,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="gn">guaraní</language>
 			<language type="grc">grego antigo</language>
 			<language type="gsw">alemán suízo</language>
-			<language type="gu" draft="contributed">guxaratiano</language>
+			<language type="gu">guxaratiano</language>
 			<language type="guz">gusii</language>
 			<language type="gv">manx</language>
 			<language type="ha">hausa</language>
@@ -108,7 +110,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="he">hebreo</language>
 			<language type="hi">hindi</language>
 			<language type="hr">croata</language>
-			<language type="hsb">alto sorabio</language>
+			<language type="hsb">hsb</language>
 			<language type="ht">haitiano</language>
 			<language type="hu">húngaro</language>
 			<language type="hy">armenio</language>
@@ -118,10 +120,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ii">yi sichuanés</language>
 			<language type="is">islandés</language>
 			<language type="it">italiano</language>
-			<language type="iu">inuit</language>
+			<language type="iu">iu</language>
 			<language type="ja">xaponés</language>
 			<language type="jgo">ngomba</language>
-			<language type="jmc">machame</language>
+			<language type="jmc">mapache</language>
 			<language type="jv">xavanés</language>
 			<language type="ka">xeorxiano</language>
 			<language type="kab">kabile</language>
@@ -129,11 +131,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="kde">makonde</language>
 			<language type="kea">caboverdiano</language>
 			<language type="kg">kongo</language>
-			<language type="khq">koyra chiini</language>
+			<language type="khq">koyra Chiini</language>
 			<language type="ki">kikuyu</language>
 			<language type="kk">casaco</language>
-			<language type="kl">groenlandés</language>
-			<language type="kln">kalenjin</language>
+			<language type="kl">kl</language>
+			<language type="kln">kln</language>
 			<language type="km">cambodiano</language>
 			<language type="kn">kannada</language>
 			<language type="ko">coreano</language>
@@ -143,18 +145,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ksb">shambala</language>
 			<language type="ksf">bafia</language>
 			<language type="ku">kurdo</language>
-			<language type="kw">córnico</language>
+			<language type="kw">kw</language>
 			<language type="ky">quirguiz</language>
 			<language type="la">latín</language>
-			<language type="lag">langi</language>
+			<language type="lag">Langi</language>
 			<language type="lb">luxemburgués</language>
 			<language type="lg">ganda</language>
-			<language type="lkt">lakota</language>
+			<language type="lkt">Lakota</language>
 			<language type="ln">lingala</language>
 			<language type="lo">laotiano</language>
 			<language type="loz">lozi</language>
+			<language type="lrc">Lurí do norte</language>
 			<language type="lt">lituano</language>
-			<language type="lu">luba-katanga</language>
+			<language type="lu">luba-Katanga</language>
 			<language type="lua">luba-lulua</language>
 			<language type="luo">luo</language>
 			<language type="luy">luyia</language>
@@ -163,8 +166,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mer">meru</language>
 			<language type="mfe">crioulo mauritano</language>
 			<language type="mg">malgaxe</language>
-			<language type="mgh">makhuwa-meetto</language>
-			<language type="mgo">meta’</language>
+			<language type="mgh">mgh</language>
+			<language type="mgo">mgo</language>
 			<language type="mi">maorí</language>
 			<language type="mk">macedonio</language>
 			<language type="ml">malabar</language>
@@ -176,25 +179,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mua">mundang</language>
 			<language type="mul">varias linguas</language>
 			<language type="my">birmano</language>
-			<language type="naq">nama</language>
+			<language type="mzn">Mazandaraní</language>
+			<language type="naq">naq</language>
 			<language type="nb">noruegués bokmal</language>
 			<language type="nd">ndebele do norte</language>
+			<language type="nds">Baixo alemán</language>
+			<language type="nds_NL">Baixo saxón</language>
 			<language type="ne">nepalí</language>
 			<language type="nl">holandés</language>
 			<language type="nl_BE">flamenco</language>
-			<language type="nmg">kwasio</language>
+			<language type="nmg">nmg</language>
 			<language type="nn">noruegués nynorsk</language>
 			<language type="no">noruegués</language>
-			<language type="nqo">n’ko</language>
+			<language type="nqo">nqo</language>
 			<language type="nso">sesotho sa leboa</language>
-			<language type="nus">nuer</language>
+			<language type="nus">nus</language>
 			<language type="ny">chewa</language>
 			<language type="nyn">nyankole</language>
 			<language type="oc">occitano</language>
 			<language type="om">oromo</language>
 			<language type="or">oriya</language>
 			<language type="os">osetio</language>
-			<language type="pa" draft="contributed">punjabi</language>
+			<language type="pa">punjabi</language>
 			<language type="pl">polaco</language>
 			<language type="ps">paxtún</language>
 			<language type="pt">portugués</language>
@@ -205,18 +211,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="rm">romanche</language>
 			<language type="rn">rundi</language>
 			<language type="ro">romanés</language>
-			<language type="ro_MD" draft="provisional">romanés moldavo</language>
 			<language type="rof">rombo</language>
 			<language type="ru">ruso</language>
 			<language type="rw">ruandés</language>
-			<language type="rwk">rwa</language>
+			<language type="rwk">rwk</language>
 			<language type="sa">sánscrito</language>
-			<language type="saq">samburu</language>
-			<language type="sbp">sangu</language>
+			<language type="saq">saq</language>
+			<language type="sbp">sbp</language>
 			<language type="sd">sindhi</language>
+			<language type="sdh">Kurdo meridional</language>
 			<language type="se">sami do norte</language>
 			<language type="seh">sena</language>
-			<language type="ses">koyraboro senni</language>
+			<language type="ses">ses</language>
 			<language type="sg">sango</language>
 			<language type="sh">serbocroata</language>
 			<language type="shi">tachelhit</language>
@@ -224,10 +230,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sk">eslovaco</language>
 			<language type="sl">esloveno</language>
 			<language type="sm">samoano</language>
-			<language type="sma">saami do sur</language>
-			<language type="smj">saami lule</language>
-			<language type="smn">saami inari</language>
-			<language type="sms">saami skolt</language>
+			<language type="sma">sma</language>
+			<language type="smj">smj</language>
+			<language type="smn">smn</language>
+			<language type="sms">sms</language>
 			<language type="sn">shona</language>
 			<language type="so">somalí</language>
 			<language type="sq">albanés</language>
@@ -237,7 +243,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="su">sondanés</language>
 			<language type="sv">sueco</language>
 			<language type="sw">swahili</language>
-			<language type="swc">suahili congolés</language>
+			<language type="sw_CD">swc</language>
 			<language type="ta">tamil</language>
 			<language type="te">telugu</language>
 			<language type="teo">teso</language>
@@ -256,18 +262,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="tt">tártaro</language>
 			<language type="tum">tumbuka</language>
 			<language type="tw" draft="unconfirmed">twi</language>
-			<language type="twq">tasawaq</language>
+			<language type="twq">twq</language>
 			<language type="ty">tahitiano</language>
-			<language type="tzm">tamazight marroquí central</language>
+			<language type="tzm">tzm</language>
 			<language type="ug">uigur</language>
 			<language type="uk">ucraíno</language>
-			<language type="und">lingua descoñecida ou non válida</language>
+			<language type="und">Lingua descoñecida</language>
 			<language type="ur">urdú</language>
 			<language type="uz">uzbeco</language>
 			<language type="vai">vai</language>
 			<language type="ve">venda</language>
 			<language type="vi">vietnamita</language>
 			<language type="vun">vunjo</language>
+			<language type="wbp">Warlpiri</language>
 			<language type="wo">wólof</language>
 			<language type="xh">xhosa</language>
 			<language type="xog">soga</language>
@@ -364,7 +371,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguila</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN" draft="contributed">Antillas Holandesas</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antártida</territory>
 			<territory type="AR">Arxentina</territory>
@@ -372,7 +378,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AT">Austria</territory>
 			<territory type="AU">Australia</territory>
 			<territory type="AW">Aruba</territory>
-			<territory type="AX">Åland</territory>
+			<territory type="AX">Illas Aland</territory>
 			<territory type="AZ">Acerbaixán</territory>
 			<territory type="BA">Bosnia e Hercegovina</territory>
 			<territory type="BB">Barbados</territory>
@@ -396,7 +402,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BY">Bielorrusia</territory>
 			<territory type="BZ">Belice</territory>
 			<territory type="CA">Canadá</territory>
-			<territory type="CC">Illas Cocos</territory>
+			<territory type="CC">Illas Cocos (Keeling)</territory>
 			<territory type="CD">República Democrática do Congo</territory>
 			<territory type="CD" alt="variant">Congo (RDC)</territory>
 			<territory type="CF">República Centroafricana</territory>
@@ -435,7 +441,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ET">Etiopía</territory>
 			<territory type="EU">Unión Europea</territory>
 			<territory type="FI">Finlandia</territory>
-			<territory type="FJ">Fidxi</territory>
+			<territory type="FJ">Fixi</territory>
 			<territory type="FK">Illas Malvinas</territory>
 			<territory type="FK" alt="variant">Illas Malvinas (Falkland)</territory>
 			<territory type="FM">Micronesia</territory>
@@ -459,7 +465,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GS">Xeorxia do Sur e Illas Sandwich</territory>
 			<territory type="GT">Guatemala</territory>
 			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinea-Bisau</territory>
+			<territory type="GW">Guinea-Bissau</territory>
 			<territory type="GY">Güiana</territory>
 			<territory type="HK">Hong Kong RAE de China</territory>
 			<territory type="HK" alt="short">Hong Kong</territory>
@@ -479,7 +485,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="IR">Irán</territory>
 			<territory type="IS">Islandia</territory>
 			<territory type="IT">Italia</territory>
-			<territory type="JE">Illa de Jersey</territory>
+			<territory type="JE">Jersey</territory>
 			<territory type="JM">Xamaica</territory>
 			<territory type="JO">Xordania</territory>
 			<territory type="JP">Xapón</territory>
@@ -488,33 +494,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="KH">Cambodia</territory>
 			<territory type="KI">Kiribati</territory>
 			<territory type="KM">Comores</territory>
-			<territory type="KN">Saint Kitts e Nevis</territory>
+			<territory type="KN">San Cristovo e Nevis</territory>
 			<territory type="KP">Corea do Norte</territory>
 			<territory type="KR">Corea do Sur</territory>
 			<territory type="KW">Kuwait</territory>
 			<territory type="KY">Illas Caimán</territory>
-			<territory type="KZ">Casaquistán</territory>
+			<territory type="KZ">Kazakhstan</territory>
 			<territory type="LA">Laos</territory>
 			<territory type="LB">Líbano</territory>
 			<territory type="LC">Santa Lucía</territory>
 			<territory type="LI">Liechtenstein</territory>
 			<territory type="LK">Sri Lanka</territory>
 			<territory type="LR">Liberia</territory>
-			<territory type="LS">Lesoto</territory>
+			<territory type="LS">Lesotho</territory>
 			<territory type="LT">Lituania</territory>
 			<territory type="LU">Luxemburgo</territory>
 			<territory type="LV">Letonia</territory>
 			<territory type="LY">Libia</territory>
 			<territory type="MA">Marrocos</territory>
 			<territory type="MC">Mónaco</territory>
-			<territory type="MD">Moldavia</territory>
+			<territory type="MD">Moldova</territory>
 			<territory type="ME">Montenegro</territory>
 			<territory type="MF">San Martiño</territory>
 			<territory type="MG">Madagascar</territory>
 			<territory type="MH">Illas Marshall</territory>
-			<territory type="MK">República de Macedonia</territory>
+			<territory type="MK">Macedonia</territory>
 			<territory type="MK" alt="variant">Macedonia (ARIM)</territory>
-			<territory type="ML">Malí</territory>
+			<territory type="ML">Mali</territory>
 			<territory type="MM">Myanmar (Birmania)</territory>
 			<territory type="MN">Mongolia</territory>
 			<territory type="MO">Macau RAE de China</territory>
@@ -522,7 +528,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="MP">Illas Marianas do norte</territory>
 			<territory type="MQ">Martinica</territory>
 			<territory type="MR">Mauritania</territory>
-			<territory type="MS">Illa Montserrat</territory>
+			<territory type="MS">Montserrat</territory>
 			<territory type="MT">Malta</territory>
 			<territory type="MU">Mauricio</territory>
 			<territory type="MV">Maldivas</territory>
@@ -541,7 +547,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="NP">Nepal</territory>
 			<territory type="NR">Nauru</territory>
 			<territory type="NU">Niue</territory>
-			<territory type="NZ">Nova Zelandia</territory>
+			<territory type="NZ">Nova Celandia</territory>
 			<territory type="OM">Omán</territory>
 			<territory type="PA">Panamá</territory>
 			<territory type="PE">Perú</territory>
@@ -556,7 +562,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="PS">Territorios palestinos</territory>
 			<territory type="PS" alt="short">Palestina</territory>
 			<territory type="PT">Portugal</territory>
-			<territory type="PW">Rep. das Palaus</territory>
+			<territory type="PW">Palau</territory>
 			<territory type="PY">Paraguai</territory>
 			<territory type="QA">Qatar</territory>
 			<territory type="QO">Oceanía Distante</territory>
@@ -582,7 +588,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="SR">Surinam</territory>
 			<territory type="SS">Sudán do sur</territory>
 			<territory type="ST">San Tomé e Príncipe</territory>
-			<territory type="SV">O Salvador</territory>
+			<territory type="SV">El Salvador</territory>
 			<territory type="SX">Sint Maarten</territory>
 			<territory type="SY">Siria</territory>
 			<territory type="SZ">Suacilandia</territory>
@@ -593,9 +599,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="TG">Togo</territory>
 			<territory type="TH">Tailandia</territory>
 			<territory type="TJ">Taxiquistán</territory>
-			<territory type="TK">Toquelau</territory>
+			<territory type="TK">Tokelau</territory>
 			<territory type="TL">Timor Leste</territory>
-			<territory type="TM">Turcomenistán</territory>
+			<territory type="TM">Turkmenistán</territory>
 			<territory type="TN">Tunisia</territory>
 			<territory type="TO">Tonga</territory>
 			<territory type="TR">Turquía</territory>
@@ -607,7 +613,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="UG">Uganda</territory>
 			<territory type="UM">Illas Menores Distantes dos EUA.</territory>
 			<territory type="US">Estados Unidos de América</territory>
-			<territory type="US" alt="short" draft="provisional">EUA</territory>
+			<territory type="US" alt="short">EUA</territory>
 			<territory type="UY">Uruguai</territory>
 			<territory type="UZ">Uzbekistán</territory>
 			<territory type="VA">Cidade do Vaticano</territory>
@@ -639,6 +645,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric">Clasificación numérica</key>
 			<key type="colStrength">Forza de clasificación</key>
 			<key type="currency">Moeda</key>
+			<key type="hc">Ciclo horario (12 vs. 24)</key>
+			<key type="lb">Estilo de quebra de liña</key>
+			<key type="ms">Sistema de unidades</key>
 			<key type="numbers">Números</key>
 			<key type="timezone">Fuso horario</key>
 			<key type="va">Variante local</key>
@@ -646,96 +655,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">Uso privado</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Díxitos do árabe oriental</type>
-			<type type="arabext" key="numbers">Díxitos arábicos orientais</type>
-			<type type="armn" key="numbers">Números armenios</type>
-			<type type="armnlow" key="numbers">Números armenios en minúscula</type>
-			<type type="beng" key="numbers">Díxitos bengalís</type>
-			<type type="big5han" key="collation">Orde de clasificación chinesa tradicional - Big5</type>
-			<type type="buddhist" key="calendar">Calendario budista</type>
-			<type type="chinese" key="calendar">Calendario chinés</type>
-			<type type="coptic" key="calendar">Calendario cóptico</type>
-			<type type="dangi" key="calendar">Calendario dangi</type>
-			<type type="deva" key="numbers">Díxitos devanagari</type>
-			<type type="dictionary" key="collation">Criterio de ordenación do dicionario</type>
-			<type type="ducet" key="collation">Criterio de ordenación Unicode predeterminado</type>
-			<type type="ethi" key="numbers">Números etíopes</type>
-			<type type="ethiopic" key="calendar">Calendario etíope</type>
-			<type type="ethiopic-amete-alem" key="calendar">Calendario Amete Alem etíope</type>
-			<type type="finance" key="numbers">Números financeiros</type>
-			<type type="fullwide" key="numbers">Díxitos de ancho completo</type>
-			<type type="gb2312han" key="collation">orde de clasifcación chinesa simplificada - GB2312</type>
-			<type type="geor" key="numbers">Números xeorxianos</type>
-			<type type="gregorian" key="calendar">Calendario gregoriano</type>
-			<type type="grek" key="numbers">Números gregos</type>
-			<type type="greklow" key="numbers">Números gregos en minúscula</type>
-			<type type="gujr" key="numbers">Díxitos guxarati</type>
-			<type type="guru" key="numbers">Díxitos do gurmukhi</type>
-			<type type="hanidec" key="numbers">Números decimais chineses</type>
-			<type type="hans" key="numbers">Números chineses simplificados</type>
-			<type type="hansfin" key="numbers">Números financeiros chineses simplificados</type>
-			<type type="hant" key="numbers">Números do chinés tradicional</type>
-			<type type="hantfin" key="numbers">Números financeiros do chinés tradicional</type>
-			<type type="hebr" key="numbers">Números hebreos</type>
-			<type type="hebrew" key="calendar">Calendario hebreo</type>
-			<type type="identical" key="colStrength">Clasificar todo</type>
-			<type type="indian" key="calendar">Calendario nacional indio</type>
-			<type type="islamic" key="calendar">Calendario islámico</type>
-			<type type="islamic-civil" key="calendar">Calendario islámico (civil, tabular)</type>
-			<type type="islamic-rgsa" key="calendar">Calendario islámico (Arabia Saudita,</type>
-			<type type="iso8601" key="calendar">Calendario ISO-8601</type>
-			<type type="japanese" key="calendar">Calendario xaponés</type>
-			<type type="jpan" key="numbers">Números xaponeses</type>
-			<type type="jpanfin" key="numbers">Números financeiros xaponeses</type>
-			<type type="khmr" key="numbers">Díxitos do camboxano</type>
-			<type type="knda" key="numbers">Díxitos do kannadés</type>
-			<type type="laoo" key="numbers">Díxitos laosianos</type>
-			<type type="latn" key="numbers">Díxitos occidentais</type>
-			<type type="lower" key="colCaseFirst">Clasificar primeiro as minúsculas</type>
-			<type type="mlym" key="numbers">Díxitos malabares</type>
-			<type type="mong" key="numbers">Díxitos mongoles</type>
-			<type type="mymr" key="numbers">Díxitos birmanos</type>
-			<type type="native" key="numbers">Díxitos orixinais</type>
-			<type type="no" key="colBackwards">Clasificar acentos con normalidade</type>
-			<type type="no" key="colCaseFirst">Clasificar orde de maiúsculas e minúsculas normal</type>
-			<type type="no" key="colCaseLevel">Clasificar sen distinguir entre maiúsculas e minúsculas</type>
-			<type type="no" key="colHiraganaQuaternary">Clasificar Kana por separado</type>
-			<type type="no" key="colNormalization">Clasificar sen normalización</type>
-			<type type="no" key="colNumeric">Clasificar díxitos individualmente</type>
-			<type type="non-ignorable" key="colAlternate">Clasificar símbolos</type>
-			<type type="orya" key="numbers">Díxitos oriya</type>
-			<type type="persian" key="calendar">Calendario persa</type>
-			<type type="phonebook" key="collation">orde de clasificación da guía telefónica</type>
-			<type type="phonetic" key="collation">Orde de clasificación fonética</type>
-			<type type="pinyin" key="collation">Orde de clasificación pinyin</type>
-			<type type="primary" key="colStrength">Clasificar só letras de base</type>
-			<type type="quaternary" key="colStrength">Clasificar acentos/maiúsculas e minúsculas/ancho/kana</type>
-			<type type="reformed" key="collation">Criterio de ordenación reformado</type>
-			<type type="roc" key="calendar">Calendario Minguo</type>
-			<type type="roman" key="numbers">Números romanos</type>
-			<type type="romanlow" key="numbers">Números romanos en minúsculas</type>
-			<type type="search" key="collation">Busca de uso xeral</type>
-			<type type="searchjl" key="collation">Clasificar por consonante inicial hangul</type>
-			<type type="secondary" key="colStrength">Clasificar acentos</type>
-			<type type="shifted" key="colAlternate">Clasificar ignorando símbolos</type>
-			<type type="standard" key="collation">Criterio de ordenación estándar</type>
-			<type type="stroke" key="collation">Orde de clasificación polo número de trazos</type>
-			<type type="taml" key="numbers">Números támil</type>
-			<type type="tamldec" key="numbers">Díxitos do támil</type>
-			<type type="telu" key="numbers">Díxitos do telugú</type>
-			<type type="tertiary" key="colStrength">Clasificar acentos/maiúsculas e minúsculas/ancho</type>
-			<type type="thai" key="numbers">Díxitos tailandeses</type>
-			<type type="tibt" key="numbers">Díxitos tibetanos</type>
-			<type type="traditional" key="collation">Orde de clasificación tradicional</type>
-			<type type="traditional" key="numbers">Numeros tradicionais</type>
-			<type type="unihan" key="collation">Criterio de ordenación radical-trazo</type>
-			<type type="upper" key="colCaseFirst">Clasificar primeiro as maiúsculas</type>
-			<type type="vaii" key="numbers">Díxitos Vai</type>
-			<type type="yes" key="colBackwards">Clasificar acentos invertidos</type>
-			<type type="yes" key="colCaseLevel">Clasificar distinguindo entre maiúsculas e minúsculas</type>
-			<type type="yes" key="colHiraganaQuaternary">Clasificar Kana de modo diferente</type>
-			<type type="yes" key="colNormalization">Clasificar Unicode normalizado</type>
-			<type type="yes" key="colNumeric">Clasificar díxitos numericamente</type>
+			<type key="calendar" type="buddhist">Calendario budista</type>
+			<type key="calendar" type="chinese">Calendario chinés</type>
+			<type key="calendar" type="coptic">Calendario cóptico</type>
+			<type key="calendar" type="dangi">Calendario dangi</type>
+			<type key="calendar" type="ethiopic">Calendario etíope</type>
+			<type key="calendar" type="ethiopic-amete-alem">Calendario Amete Alem etíope</type>
+			<type key="calendar" type="gregorian">Calendario gregoriano</type>
+			<type key="calendar" type="hebrew">Calendario hebreo</type>
+			<type key="calendar" type="indian">Calendario nacional indio</type>
+			<type key="calendar" type="islamic">Calendario islámico</type>
+			<type key="calendar" type="islamic-civil">Calendario islámico (civil, tabular)</type>
+			<type key="calendar" type="islamic-rgsa">Calendario islámico (Arabia Saudita,</type>
+			<type key="calendar" type="iso8601">Calendario ISO-8601</type>
+			<type key="calendar" type="japanese">Calendario xaponés</type>
+			<type key="calendar" type="persian">Calendario persa</type>
+			<type key="calendar" type="roc">Calendario Minguo</type>
+			<type key="colAlternate" type="non-ignorable">Clasificar símbolos</type>
+			<type key="colAlternate" type="shifted">Clasificar ignorando símbolos</type>
+			<type key="colBackwards" type="no">Clasificar acentos con normalidade</type>
+			<type key="colBackwards" type="yes">Clasificar acentos invertidos</type>
+			<type key="colCaseFirst" type="lower">Clasificar primeiro as minúsculas</type>
+			<type key="colCaseFirst" type="no">Clasificar orde de maiúsculas e minúsculas normal</type>
+			<type key="colCaseFirst" type="upper">Clasificar primeiro as maiúsculas</type>
+			<type key="colCaseLevel" type="no">Clasificar sen distinguir entre maiúsculas e minúsculas</type>
+			<type key="colCaseLevel" type="yes">Clasificar distinguindo entre maiúsculas e minúsculas</type>
+			<type key="colHiraganaQuaternary" type="no">Clasificar Kana por separado</type>
+			<type key="colHiraganaQuaternary" type="yes">Clasificar Kana de modo diferente</type>
+			<type key="collation" type="big5han">Orde de clasificación chinesa tradicional - Big5</type>
+			<type key="collation" type="dictionary">Criterio de ordenación do dicionario</type>
+			<type key="collation" type="ducet">Criterio de ordenación Unicode predeterminado</type>
+			<type key="collation" type="gb2312han">orde de clasifcación chinesa simplificada - GB2312</type>
+			<type key="collation" type="phonebook">orde de clasificación da guía telefónica</type>
+			<type key="collation" type="phonetic">Orde de clasificación fonética</type>
+			<type key="collation" type="pinyin">Orde de clasificación pinyin</type>
+			<type key="collation" type="reformed">Criterio de ordenación reformado</type>
+			<type key="collation" type="search">Busca de uso xeral</type>
+			<type key="collation" type="searchjl">Clasificar por consonante inicial hangul</type>
+			<type key="collation" type="standard">Criterio de ordenación estándar</type>
+			<type key="collation" type="stroke">Orde de clasificación polo número de trazos</type>
+			<type key="collation" type="traditional">Orde de clasificación tradicional</type>
+			<type key="collation" type="unihan">Criterio de ordenación radical-trazo</type>
+			<type key="colNormalization" type="no">Clasificar sen normalización</type>
+			<type key="colNormalization" type="yes">Clasificar Unicode normalizado</type>
+			<type key="colNumeric" type="no">Clasificar díxitos individualmente</type>
+			<type key="colNumeric" type="yes">Clasificar díxitos numericamente</type>
+			<type key="colStrength" type="identical">Clasificar todo</type>
+			<type key="colStrength" type="primary">Clasificar só letras de base</type>
+			<type key="colStrength" type="quaternary">Clasificar acentos/maiúsculas e minúsculas/ancho/kana</type>
+			<type key="colStrength" type="secondary">Clasificar acentos</type>
+			<type key="colStrength" type="tertiary">Clasificar acentos/maiúsculas e minúsculas/ancho</type>
+			<type key="hc" type="h11">Sistema de 12 horas (0–11)</type>
+			<type key="hc" type="h12">Sistema de 12 horas (1–12)</type>
+			<type key="hc" type="h23">Sistema de 24 horas (0–23)</type>
+			<type key="hc" type="h24">Sistema de 24 horas (1–24)</type>
+			<type key="lb" type="loose">Estilo de quebra de liña separada</type>
+			<type key="lb" type="normal">Estilo de quebra de liña normal</type>
+			<type key="lb" type="strict">Estilo de quebra de liña estrita</type>
+			<type key="ms" type="metric">Sistema métrico</type>
+			<type key="ms" type="uksystem">Sistema imperial de unidades</type>
+			<type key="ms" type="ussystem">Sistema de unidades dos EUA</type>
+			<type key="numbers" type="arab">Díxitos do árabe oriental</type>
+			<type key="numbers" type="arabext">Díxitos arábicos orientais</type>
+			<type key="numbers" type="armn">Números armenios</type>
+			<type key="numbers" type="armnlow">Números armenios en minúscula</type>
+			<type key="numbers" type="beng">Díxitos bengalís</type>
+			<type key="numbers" type="deva">Díxitos devanagari</type>
+			<type key="numbers" type="ethi">Números etíopes</type>
+			<type key="numbers" type="finance">Números financeiros</type>
+			<type key="numbers" type="fullwide">Díxitos de ancho completo</type>
+			<type key="numbers" type="geor">Números xeorxianos</type>
+			<type key="numbers" type="grek">Números gregos</type>
+			<type key="numbers" type="greklow">Números gregos en minúscula</type>
+			<type key="numbers" type="gujr">Díxitos guxarati</type>
+			<type key="numbers" type="guru">Díxitos do gurmukhi</type>
+			<type key="numbers" type="hanidec">Números decimais chineses</type>
+			<type key="numbers" type="hans">Números chineses simplificados</type>
+			<type key="numbers" type="hansfin">Números financeiros chineses simplificados</type>
+			<type key="numbers" type="hant">Números do chinés tradicional</type>
+			<type key="numbers" type="hantfin">Números financeiros do chinés tradicional</type>
+			<type key="numbers" type="hebr">Números hebreos</type>
+			<type key="numbers" type="jpan">Números xaponeses</type>
+			<type key="numbers" type="jpanfin">Números financeiros xaponeses</type>
+			<type key="numbers" type="khmr">Díxitos do camboxano</type>
+			<type key="numbers" type="knda">Díxitos do kannadés</type>
+			<type key="numbers" type="laoo">Díxitos laosianos</type>
+			<type key="numbers" type="latn">Díxitos occidentais</type>
+			<type key="numbers" type="mlym">Díxitos malabares</type>
+			<type key="numbers" type="mong">Díxitos mongoles</type>
+			<type key="numbers" type="mymr">Díxitos birmanos</type>
+			<type key="numbers" type="native">Díxitos orixinais</type>
+			<type key="numbers" type="orya">Díxitos oriya</type>
+			<type key="numbers" type="roman">Números romanos</type>
+			<type key="numbers" type="romanlow">Números romanos en minúsculas</type>
+			<type key="numbers" type="taml">Números támil</type>
+			<type key="numbers" type="tamldec">Díxitos do támil</type>
+			<type key="numbers" type="telu">Díxitos do telugú</type>
+			<type key="numbers" type="thai">Díxitos tailandeses</type>
+			<type key="numbers" type="tibt">Díxitos tibetanos</type>
+			<type key="numbers" type="traditional">Numeros tradicionais</type>
+			<type key="numbers" type="vaii">Díxitos Vai</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN">BGN</transformName>
@@ -827,6 +846,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">G y</dateFormatItem>
 						<dateFormatItem id="GyMMM">G y MMM</dateFormatItem>
@@ -866,6 +886,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">G MMM y</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">G d, MMM y</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">G E, d MMM y</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">MMMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">G QQQ y</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">G y QQQQ</dateFormatItem>
 					</availableFormats>
@@ -1061,7 +1082,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<dayContext type="format">
 						<dayWidth type="abbreviated">
 							<day type="sun">dom</day>
-							<day type="mon">lun</day>
+							<day type="mon">luns</day>
 							<day type="tue">mar</day>
 							<day type="wed">mér</day>
 							<day type="thu">xov</day>
@@ -1150,10 +1171,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<quarter type="4">4</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
-							<quarter type="1">1o trimestre</quarter>
-							<quarter type="2">2o trimestre</quarter>
-							<quarter type="3">3o trimestre</quarter>
-							<quarter type="4">4o trimestre</quarter>
+							<quarter type="1">1º trimestre</quarter>
+							<quarter type="2">2º trimestre</quarter>
+							<quarter type="3">3º trimestre</quarter>
+							<quarter type="4">4º trimestre</quarter>
 						</quarterWidth>
 					</quarterContext>
 					<quarterContext type="stand-alone">
@@ -1170,28 +1191,76 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<quarter type="4">4</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
-							<quarter type="1">1o trimestre</quarter>
+							<quarter type="1">1º trimestre</quarter>
 							<quarter type="2">2º trimestre</quarter>
-							<quarter type="3">3o trimestre</quarter>
-							<quarter type="4">4o trimestre</quarter>
+							<quarter type="3">3º trimestre</quarter>
+							<quarter type="4">4º trimestre</quarter>
 						</quarterWidth>
 					</quarterContext>
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">da noite</dayPeriod>
 							<dayPeriod type="am">a.m.</dayPeriod>
 							<dayPeriod type="pm">p.m.</dayPeriod>
+							<dayPeriod type="morning1">da mañá</dayPeriod>
+							<dayPeriod type="morning2">da mañá</dayPeriod>
+							<dayPeriod type="afternoon1">da mediodía</dayPeriod>
+							<dayPeriod type="evening1">da tarde</dayPeriod>
+							<dayPeriod type="night1">da noite</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">a</dayPeriod>
-							<dayPeriod type="noon">m</dayPeriod>
-							<dayPeriod type="pm">p</dayPeriod>
+							<dayPeriod type="midnight">da noite</dayPeriod>
+							<dayPeriod type="am">a.m.</dayPeriod>
+							<dayPeriod type="pm">p.m.</dayPeriod>
+							<dayPeriod type="morning1">da mañá</dayPeriod>
+							<dayPeriod type="morning2">da mañá</dayPeriod>
+							<dayPeriod type="afternoon1">da mediodía</dayPeriod>
+							<dayPeriod type="evening1">da tarde</dayPeriod>
+							<dayPeriod type="night1">da noite</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">da noite</dayPeriod>
 							<dayPeriod type="am">a.m.</dayPeriod>
-							<dayPeriod type="noon">mediodía</dayPeriod>
 							<dayPeriod type="pm">p.m.</dayPeriod>
+							<dayPeriod type="morning1">da mañá</dayPeriod>
+							<dayPeriod type="morning2">da mañá</dayPeriod>
+							<dayPeriod type="afternoon1">da mediodía</dayPeriod>
+							<dayPeriod type="evening1">da tarde</dayPeriod>
+							<dayPeriod type="night1">da noite</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">medianoite</dayPeriod>
+							<dayPeriod type="am">a.m.</dayPeriod>
+							<dayPeriod type="pm">p.m.</dayPeriod>
+							<dayPeriod type="morning1">madrugada</dayPeriod>
+							<dayPeriod type="morning2">mañá</dayPeriod>
+							<dayPeriod type="afternoon1">mediodía</dayPeriod>
+							<dayPeriod type="evening1">tarde</dayPeriod>
+							<dayPeriod type="night1">noite</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">medianoite</dayPeriod>
+							<dayPeriod type="am">a.m.</dayPeriod>
+							<dayPeriod type="pm">p.m.</dayPeriod>
+							<dayPeriod type="morning1">madrugada</dayPeriod>
+							<dayPeriod type="morning2">mañá</dayPeriod>
+							<dayPeriod type="afternoon1">mediodía</dayPeriod>
+							<dayPeriod type="evening1">tarde</dayPeriod>
+							<dayPeriod type="night1">noite</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">medianoite</dayPeriod>
+							<dayPeriod type="am">a.m.</dayPeriod>
+							<dayPeriod type="pm">p.m.</dayPeriod>
+							<dayPeriod type="morning1">madrugada</dayPeriod>
+							<dayPeriod type="morning2">mañá</dayPeriod>
+							<dayPeriod type="afternoon1">mediodía</dayPeriod>
+							<dayPeriod type="evening1">tarde</dayPeriod>
+							<dayPeriod type="night1">noite</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1290,6 +1359,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d-M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d-M</dateFormatItem>
@@ -1433,6 +1506,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>Ano</displayName>
+				<relative type="-1">ano pasado</relative>
+				<relative type="0">este ano</relative>
+				<relative type="1">seguinte ano</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">En {0} anos</relativeTimePattern>
 					<relativeTimePattern count="other">En {0} anos</relativeTimePattern>
@@ -1444,6 +1520,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>Ano</displayName>
+				<relative type="-1">ano pasado</relative>
+				<relative type="0">este ano</relative>
+				<relative type="1">seguinte ano</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">En {0} anos</relativeTimePattern>
 					<relativeTimePattern count="other">En {0} anos</relativeTimePattern>
@@ -1455,6 +1534,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter">
 				<displayName>Trimestre</displayName>
+				<relative type="-1">trimestre pasado</relative>
+				<relative type="0">este trimestre</relative>
+				<relative type="1">seguinte trimestre</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">En {0} trimestre</relativeTimePattern>
 					<relativeTimePattern count="other">En {0} trimestres</relativeTimePattern>
@@ -1466,6 +1548,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>trim.</displayName>
+				<relative type="-1">trim. pasado</relative>
+				<relative type="0">este trim.</relative>
+				<relative type="1">trim. seguinte</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">En {0} trim.</relativeTimePattern>
 					<relativeTimePattern count="other">En {0} trim.</relativeTimePattern>
@@ -1477,6 +1562,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>trim.</displayName>
+				<relative type="-1">trim. pasado</relative>
+				<relative type="0">este trim.</relative>
+				<relative type="1">trim. seguinte</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">En {0} trim.</relativeTimePattern>
 					<relativeTimePattern count="other">En {0} trim.</relativeTimePattern>
@@ -1502,6 +1590,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>Mes</displayName>
+				<relative type="-1">m. pasado</relative>
+				<relative type="0">este m.</relative>
+				<relative type="1">m. seguinte</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">En {0} m.</relativeTimePattern>
 					<relativeTimePattern count="other">En {0} m.</relativeTimePattern>
@@ -1530,6 +1621,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>sem.</displayName>
+				<relative type="-1">sem. pasada</relative>
+				<relative type="0">esta sem.</relative>
+				<relative type="1">sem. seguinte</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">En {0} sem.</relativeTimePattern>
 					<relativeTimePattern count="other">En {0} sem.</relativeTimePattern>
@@ -1642,6 +1736,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="thu-short">
 				<relative type="-1">xov. pasado</relative>
+				<relative type="0">este xov.</relative>
 				<relative type="1">próximo xov.</relative>
 			</field>
 			<field type="thu-narrow">
@@ -4049,10 +4144,38 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
-					<pattern>¤#,##0.00</pattern>
+					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
+					<pattern>#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤0k M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0k M</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤00k M</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00k M</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤000k M</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000k M</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤0 B</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0 B</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤00 B</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00 B</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤000 B</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000 B</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
@@ -4462,6 +4585,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">lari xeorxiano</displayName>
 				<displayName count="other">laris xeorxianos</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHS">
 				<displayName>Cedi de Gana</displayName>
@@ -4917,7 +5041,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="PYG">
 				<displayName>Guaraní paraguaio</displayName>
-				<displayName count="one">Guaraní paraguaio</displayName>
+				<displayName count="one">guaraní paraguaio</displayName>
 				<displayName count="other">guaranís paraguaios</displayName>
 				<symbol>PYG</symbol>
 				<symbol alt="narrow" draft="contributed">₲</symbol>
@@ -5058,6 +5182,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">baht tailandés</displayName>
 				<displayName count="other">bahts tailandeses</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJS">
 				<displayName>Somoni taxico</displayName>
@@ -5080,7 +5205,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="TOP">
 				<displayName>Paʻanga de Tonga</displayName>
 				<displayName count="one">paʻanga de Tonga</displayName>
-				<displayName count="other">Paʻanga de Tonga</displayName>
+				<displayName count="other">pa’anga de Tonga</displayName>
 				<symbol>TOP</symbol>
 			</currency>
 			<currency type="TRY">
@@ -5249,6 +5374,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</numbers>
 	<units>
 		<unitLength type="long">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0} por {1}</compoundUnitPattern>
+			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>forza G</displayName>
 				<unitPattern count="one">{0} forza G</unitPattern>
@@ -5259,6 +5387,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} metro por segundo cadrado</unitPattern>
 				<unitPattern count="other">{0} metros por segundo cadrado</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>revolución</displayName>
+				<unitPattern count="one">{0} revolución</unitPattern>
+				<unitPattern count="other">{0} revolucións</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radiáns</displayName>
+				<unitPattern count="one">{0} radián</unitPattern>
+				<unitPattern count="other">{0} radiáns</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>graos</displayName>
+				<unitPattern count="one">{0} grao</unitPattern>
+				<unitPattern count="other">{0} graos</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>arcominutos</displayName>
 				<unitPattern count="one">{0} arcominuto</unitPattern>
@@ -5269,30 +5412,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} arcosegundo</unitPattern>
 				<unitPattern count="other">{0} arcosegundos</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>grados</displayName>
-				<unitPattern count="one">{0} grado</unitPattern>
-				<unitPattern count="other">{0} grados</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radiáns</displayName>
-				<unitPattern count="one">{0} radián</unitPattern>
-				<unitPattern count="other">{0} radiáns</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>acres</displayName>
-				<unitPattern count="one">{0} acre</unitPattern>
-				<unitPattern count="other">{0} acres</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>quilómetros cadrados</displayName>
+				<unitPattern count="one">{0} quilómetro cadrado</unitPattern>
+				<unitPattern count="other">{0} quilómetros cadrados</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hectáreas</displayName>
 				<unitPattern count="one">{0} hectárea</unitPattern>
 				<unitPattern count="other">{0} hectáreas</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>metros cadrados</displayName>
+				<unitPattern count="one">{0} metro cadrado</unitPattern>
+				<unitPattern count="other">{0} metros cadrados</unitPattern>
+				<perUnitPattern>{0} por metro cadrado</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>centímetros cadrados</displayName>
 				<unitPattern count="one">{0} centímetro cadrado</unitPattern>
 				<unitPattern count="other">{0} centímetros cadrados</unitPattern>
+				<perUnitPattern>{0} por centímetro cadrado</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>millas cadradas</displayName>
+				<unitPattern count="one">{0} milla cadrada</unitPattern>
+				<unitPattern count="other">{0} millas cadradas</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acres</displayName>
+				<unitPattern count="one">{0} acre</unitPattern>
+				<unitPattern count="other">{0} acres</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>iardas cadradas</displayName>
+				<unitPattern count="one">{0} iarda cadrada</unitPattern>
+				<unitPattern count="other">{0} iardas cadradas</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>pés cadrados</displayName>
@@ -5303,91 +5458,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>polgadas cadradas</displayName>
 				<unitPattern count="one">{0} polgada cadrada</unitPattern>
 				<unitPattern count="other">{0} polgadas cadradas</unitPattern>
+				<perUnitPattern>{0} por polgada cadrada</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>quilómetros cadrados</displayName>
-				<unitPattern count="one">{0} quilómetro cadrado</unitPattern>
-				<unitPattern count="other">{0} quilómetros cadrados</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>metros cadrados</displayName>
-				<unitPattern count="one">{0} metro cadrado</unitPattern>
-				<unitPattern count="other">{0} metros cadrados</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>millas cadradas</displayName>
-				<unitPattern count="one">{0} milla cadrada</unitPattern>
-				<unitPattern count="other">{0} millas cadradas</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>iardas cadradas</displayName>
-				<unitPattern count="one">{0} iarda cadrada</unitPattern>
-				<unitPattern count="other">{0} iardas cadradas</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>quilates</displayName>
+				<unitPattern count="one">{0} quilate</unitPattern>
+				<unitPattern count="other">{0} quilates</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litros por quilómetro</displayName>
 				<unitPattern count="one">{0} litro por quilómetro</unitPattern>
 				<unitPattern count="other">{0} litros por quilómetro</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>litros por 100 quilómetros</displayName>
+				<unitPattern count="one">{0} litro por 100 quilómetros</unitPattern>
+				<unitPattern count="other">{0} litros por 100 quilómetros</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>millas por galón</displayName>
 				<unitPattern count="one">{0} milla por galón</unitPattern>
 				<unitPattern count="other">{0} millas por galón</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bits</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bits</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bytes</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} bytes</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabits</displayName>
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="other">{0} gigabits</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabytes</displayName>
-				<unitPattern count="one">{0} gigabyte</unitPattern>
-				<unitPattern count="other">{0} gigabytes</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobits</displayName>
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="other">{0} kilobits</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobytes</displayName>
-				<unitPattern count="one">{0} kilobyte</unitPattern>
-				<unitPattern count="other">{0} kilobytes</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabits</displayName>
-				<unitPattern count="one">{0} megabit</unitPattern>
-				<unitPattern count="other">{0} megabits</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabytes</displayName>
-				<unitPattern count="one">{0} megabyte</unitPattern>
-				<unitPattern count="other">{0} megabytes</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabits</displayName>
-				<unitPattern count="one">{0} terabit</unitPattern>
-				<unitPattern count="other">{0} terabits</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabyte</displayName>
 				<unitPattern count="one">{0} terabyte</unitPattern>
 				<unitPattern count="other">{0} terabytes</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabits</displayName>
+				<unitPattern count="one">{0} terabit</unitPattern>
+				<unitPattern count="other">{0} terabits</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>xigabytes</displayName>
+				<unitPattern count="one">{0} xigabyte</unitPattern>
+				<unitPattern count="other">{0} xigabytes</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>xigabits</displayName>
+				<unitPattern count="one">{0} xigabit</unitPattern>
+				<unitPattern count="other">{0} xigabits</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabytes</displayName>
+				<unitPattern count="one">{0} megabyte</unitPattern>
+				<unitPattern count="other">{0} megabytes</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabits</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="other">{0} megabits</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobytes</displayName>
+				<unitPattern count="one">{0} kilobyte</unitPattern>
+				<unitPattern count="other">{0} kilobytes</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobits</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="other">{0} kilobits</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bytes</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} bytes</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bits</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bits</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>séculos</displayName>
+				<unitPattern count="one">{0} século</unitPattern>
+				<unitPattern count="other">{0} séculos</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>anos</displayName>
+				<unitPattern count="one">{0} ano</unitPattern>
+				<unitPattern count="other">{0} anos</unitPattern>
+				<perUnitPattern>{0} por ano</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>meses</displayName>
+				<unitPattern count="one">{0} mes</unitPattern>
+				<unitPattern count="other">{0} meses</unitPattern>
+				<perUnitPattern>{0} por mes</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>semanas</displayName>
+				<unitPattern count="one">{0} semana</unitPattern>
+				<unitPattern count="other">{0} semanas</unitPattern>
+				<perUnitPattern>{0} por semana</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>días</displayName>
 				<unitPattern count="one">{0} día</unitPattern>
 				<unitPattern count="other">{0} días</unitPattern>
+				<perUnitPattern>{0} por día</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>horas</displayName>
@@ -5395,30 +5565,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} horas</unitPattern>
 				<perUnitPattern>{0} por hora</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>microsegundos</displayName>
-				<unitPattern count="one">{0} microsegundo</unitPattern>
-				<unitPattern count="other">{0} microsegundos</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milisegundos</displayName>
-				<unitPattern count="one">{0} milisegundo</unitPattern>
-				<unitPattern count="other">{0} milisegundos</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>minutos</displayName>
 				<unitPattern count="one">{0} minuto</unitPattern>
 				<unitPattern count="other">{0} minutos</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>meses</displayName>
-				<unitPattern count="one">{0} mes</unitPattern>
-				<unitPattern count="other">{0} meses</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanosegundos</displayName>
-				<unitPattern count="one">{0} nanosegundo</unitPattern>
-				<unitPattern count="other">{0} nanosegundos</unitPattern>
+				<perUnitPattern>{0} por minuto</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>segundos</displayName>
@@ -5426,15 +5577,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} segundos</unitPattern>
 				<perUnitPattern>{0} por segundo</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>semanas</displayName>
-				<unitPattern count="one">{0} semana</unitPattern>
-				<unitPattern count="other">{0} semanas</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milisegundos</displayName>
+				<unitPattern count="one">{0} milisegundo</unitPattern>
+				<unitPattern count="other">{0} milisegundos</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>anos</displayName>
-				<unitPattern count="one">{0} ano</unitPattern>
-				<unitPattern count="other">{0} anos</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>microsegundos</displayName>
+				<unitPattern count="one">{0} microsegundo</unitPattern>
+				<unitPattern count="other">{0} microsegundos</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosegundos</displayName>
+				<unitPattern count="one">{0} nanosegundo</unitPattern>
+				<unitPattern count="other">{0} nanosegundos</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amperios</displayName>
@@ -5456,6 +5612,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} volt</unitPattern>
 				<unitPattern count="other">{0} volts</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>quilocalorías</displayName>
+				<unitPattern count="one">{0} quilocaloría</unitPattern>
+				<unitPattern count="other">{0} quilocalorías</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>calorías</displayName>
 				<unitPattern count="one">{0} caloría</unitPattern>
@@ -5466,226 +5627,225 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Caloría</unitPattern>
 				<unitPattern count="other">{0} Calorías</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joules</displayName>
-				<unitPattern count="one">{0} joule</unitPattern>
-				<unitPattern count="other">{0} joules</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>quilocalorías</displayName>
-				<unitPattern count="one">{0} quilocaloría</unitPattern>
-				<unitPattern count="other">{0} quilocalorías</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>quilojoules</displayName>
 				<unitPattern count="one">{0} quilojoule</unitPattern>
 				<unitPattern count="other">{0} quilojoules</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joules</displayName>
+				<unitPattern count="one">{0} joule</unitPattern>
+				<unitPattern count="other">{0} joules</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>quilowatts/hora</displayName>
 				<unitPattern count="one">{0} quilowatt/hora</unitPattern>
 				<unitPattern count="other">{0} quilowatts/hora</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
-				<displayName>gigahertz</displayName>
-				<unitPattern count="one">{0} gigahertz</unitPattern>
-				<unitPattern count="other">{0} gigahertz</unitPattern>
-			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hertz</displayName>
-				<unitPattern count="one">{0} hertz</unitPattern>
-				<unitPattern count="other">{0} hertz</unitPattern>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<displayName>kilohertz</displayName>
-				<unitPattern count="one">{0} kilohertz</unitPattern>
-				<unitPattern count="other">{0} kilohertz</unitPattern>
+				<displayName>xigahertz</displayName>
+				<unitPattern count="one">{0} xigahertz</unitPattern>
+				<unitPattern count="other">{0} xigahertz</unitPattern>
 			</unit>
 			<unit type="frequency-megahertz">
 				<displayName>megahertz</displayName>
 				<unitPattern count="one">{0} megahertz</unitPattern>
 				<unitPattern count="other">{0} megahertz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>unidades astronómicas</displayName>
-				<unitPattern count="one">{0} unidad astronómica</unitPattern>
-				<unitPattern count="other">{0} unidades astronómicas</unitPattern>
+			<unit type="frequency-kilohertz">
+				<displayName>kilohertz</displayName>
+				<unitPattern count="one">{0} kilohertz</unitPattern>
+				<unitPattern count="other">{0} kilohertz</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>centímetros</displayName>
-				<unitPattern count="one">{0} centímetro</unitPattern>
-				<unitPattern count="other">{0} centímetros</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hertz</displayName>
+				<unitPattern count="one">{0} hertz</unitPattern>
+				<unitPattern count="other">{0} hertz</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>quilómetros</displayName>
+				<unitPattern count="one">{0} quilómetro</unitPattern>
+				<unitPattern count="other">{0} quilómetros</unitPattern>
+				<perUnitPattern>{0} por quilómetro</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>metros</displayName>
+				<unitPattern count="one">{0} metro</unitPattern>
+				<unitPattern count="other">{0} metros</unitPattern>
+				<perUnitPattern>{0} por metro</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>decímetros</displayName>
 				<unitPattern count="one">{0} decímetro</unitPattern>
 				<unitPattern count="other">{0} decímetros</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>pé</displayName>
-				<unitPattern count="one">{0} pé</unitPattern>
-				<unitPattern count="other">{0} pés</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>polgada</displayName>
-				<unitPattern count="one">{0} polgada</unitPattern>
-				<unitPattern count="other">{0} polgadas</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>quilómetros</displayName>
-				<unitPattern count="one">{0} quilómetro</unitPattern>
-				<unitPattern count="other">{0} quilómetros</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>anos luz</displayName>
-				<unitPattern count="one">{0} ano luz</unitPattern>
-				<unitPattern count="other">{0} anos luz</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metros</displayName>
-				<unitPattern count="one">{0} metro</unitPattern>
-				<unitPattern count="other">{0} metros</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>micrómetros</displayName>
-				<unitPattern count="one">{0} micrómetro</unitPattern>
-				<unitPattern count="other">{0} micrómetros</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>millas</displayName>
-				<unitPattern count="one">{0} milla</unitPattern>
-				<unitPattern count="other">{0} millas</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>centímetros</displayName>
+				<unitPattern count="one">{0} centímetro</unitPattern>
+				<unitPattern count="other">{0} centímetros</unitPattern>
+				<perUnitPattern>{0} por centímetro</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>milímetros</displayName>
 				<unitPattern count="one">{0} milímetro</unitPattern>
 				<unitPattern count="other">{0} milímetros</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>micrómetros</displayName>
+				<unitPattern count="one">{0} micrómetro</unitPattern>
+				<unitPattern count="other">{0} micrómetros</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanómetros</displayName>
 				<unitPattern count="one">{0} nanómetro</unitPattern>
 				<unitPattern count="other">{0} nanómetros</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>millas náuticas</displayName>
-				<unitPattern count="one">{0} milla náutica</unitPattern>
-				<unitPattern count="other">{0} millas náuticas</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pársecs</displayName>
-				<unitPattern count="one">{0} pársec</unitPattern>
-				<unitPattern count="other">{0} pársecs</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>picómetros</displayName>
 				<unitPattern count="one">{0} picómetro</unitPattern>
 				<unitPattern count="other">{0} picómetros</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>millas</displayName>
+				<unitPattern count="one">{0} milla</unitPattern>
+				<unitPattern count="other">{0} millas</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>iardas</displayName>
 				<unitPattern count="one">{0} iarda</unitPattern>
 				<unitPattern count="other">{0} iardas</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>pé</displayName>
+				<unitPattern count="one">{0} pé</unitPattern>
+				<unitPattern count="other">{0} pés</unitPattern>
+				<perUnitPattern>{0} por pé</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>polgada</displayName>
+				<unitPattern count="one">{0} polgada</unitPattern>
+				<unitPattern count="other">{0} polgadas</unitPattern>
+				<perUnitPattern>{0} por polgada</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pársecs</displayName>
+				<unitPattern count="one">{0} pársec</unitPattern>
+				<unitPattern count="other">{0} pársecs</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>anos luz</displayName>
+				<unitPattern count="one">{0} ano luz</unitPattern>
+				<unitPattern count="other">{0} anos luz</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>unidades astronómicas</displayName>
+				<unitPattern count="one">{0} unidad astronómica</unitPattern>
+				<unitPattern count="other">{0} unidades astronómicas</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>millas náuticas</displayName>
+				<unitPattern count="one">{0} milla náutica</unitPattern>
+				<unitPattern count="other">{0} millas náuticas</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>milla escandinava</displayName>
+				<unitPattern count="one">{0} milla escandinava</unitPattern>
+				<unitPattern count="other">{0} millas escandinavas</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>quilates</displayName>
-				<unitPattern count="one">{0} quilate</unitPattern>
-				<unitPattern count="other">{0} quilates</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gramos</displayName>
-				<unitPattern count="one">{0} gramo</unitPattern>
-				<unitPattern count="other">{0} gramos</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>quilogramos</displayName>
-				<unitPattern count="one">{0} quilogramo</unitPattern>
-				<unitPattern count="other">{0} quilogramos</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>toneladas métricas</displayName>
 				<unitPattern count="one">{0} tonelada métrica</unitPattern>
 				<unitPattern count="other">{0} toneladas métricas</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>microgramos</displayName>
-				<unitPattern count="one">{0} microgramo</unitPattern>
-				<unitPattern count="other">{0} microgramos</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>quilogramos</displayName>
+				<unitPattern count="one">{0} quilogramo</unitPattern>
+				<unitPattern count="other">{0} quilogramos</unitPattern>
+				<perUnitPattern>{0} por quilogramo</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gramos</displayName>
+				<unitPattern count="one">{0} gramo</unitPattern>
+				<unitPattern count="other">{0} gramos</unitPattern>
+				<perUnitPattern>{0} por gramo</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>miligramos</displayName>
 				<unitPattern count="one">{0} miligramo</unitPattern>
 				<unitPattern count="other">{0} miligramos</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>onzas</displayName>
-				<unitPattern count="one">{0} onza</unitPattern>
-				<unitPattern count="other">{0} onzas</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>onzas troy</displayName>
-				<unitPattern count="one">{0} onza troy</unitPattern>
-				<unitPattern count="other">{0} onzas troy</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>libras</displayName>
-				<unitPattern count="one">{0} libra</unitPattern>
-				<unitPattern count="other">{0} libras</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>microgramos</displayName>
+				<unitPattern count="one">{0} microgramo</unitPattern>
+				<unitPattern count="other">{0} microgramos</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>toneladas</displayName>
 				<unitPattern count="one">{0} tonelada</unitPattern>
 				<unitPattern count="other">{0} toneladas</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>libras</displayName>
+				<unitPattern count="one">{0} libra</unitPattern>
+				<unitPattern count="other">{0} libras</unitPattern>
+				<perUnitPattern>{0} por libra</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>onzas</displayName>
+				<unitPattern count="one">{0} onza</unitPattern>
+				<unitPattern count="other">{0} onzas</unitPattern>
+				<perUnitPattern>{0} por onza</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>onzas troy</displayName>
+				<unitPattern count="one">{0} onza troy</unitPattern>
+				<unitPattern count="other">{0} onzas troy</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>quilates</displayName>
+				<unitPattern count="one">{0} quilate</unitPattern>
+				<unitPattern count="other">{0} quilates</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
-				<displayName>gigawatts</displayName>
-				<unitPattern count="one">{0} gigawatt</unitPattern>
-				<unitPattern count="other">{0} gigawatts</unitPattern>
-			</unit>
-			<unit type="power-horsepower">
-				<displayName>cabalo de potencia</displayName>
-				<unitPattern count="one">{0} cabalo de potencia</unitPattern>
-				<unitPattern count="other">{0} cabalos de potencia</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>quilowatts</displayName>
-				<unitPattern count="one">{0} quilowatt</unitPattern>
-				<unitPattern count="other">{0} quilowatts</unitPattern>
+				<displayName>xigawatts</displayName>
+				<unitPattern count="one">{0} xigawatt</unitPattern>
+				<unitPattern count="other">{0} xigawatts</unitPattern>
 			</unit>
 			<unit type="power-megawatt">
 				<displayName>megawatts</displayName>
 				<unitPattern count="one">{0} megawatt</unitPattern>
 				<unitPattern count="other">{0} megawatts</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>milliwatts</displayName>
-				<unitPattern count="one">{0} milliwatt</unitPattern>
-				<unitPattern count="other">{0} milliwatts</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>quilowatts</displayName>
+				<unitPattern count="one">{0} quilowatt</unitPattern>
+				<unitPattern count="other">{0} quilowatts</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watts</displayName>
 				<unitPattern count="one">{0} watt</unitPattern>
 				<unitPattern count="other">{0} watts</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>milliwatts</displayName>
+				<unitPattern count="one">{0} milliwatt</unitPattern>
+				<unitPattern count="other">{0} milliwatts</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>cabalo de potencia</displayName>
+				<unitPattern count="one">{0} cabalo de potencia</unitPattern>
+				<unitPattern count="other">{0} cabalos de potencia</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hectopascais</displayName>
 				<unitPattern count="one">{0} hectopascal</unitPattern>
 				<unitPattern count="other">{0} hectopascais</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>polgadas de mercurio</displayName>
-				<unitPattern count="one">{0} polgada de mercurio</unitPattern>
-				<unitPattern count="other">{0} polgadas de mercurio</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>milibares</displayName>
-				<unitPattern count="one">{0} milibar</unitPattern>
-				<unitPattern count="other">{0} milibares</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>milímetros de mercurio</displayName>
 				<unitPattern count="one">{0} milímetro de mercurio</unitPattern>
@@ -5696,10 +5856,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} libra por polgada cadrada</unitPattern>
 				<unitPattern count="other">{0} libras por polgada cadrada</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>quilates</displayName>
-				<unitPattern count="one">{0} quilate</unitPattern>
-				<unitPattern count="other">{0} quilates</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>polgadas de mercurio</displayName>
+				<unitPattern count="one">{0} polgada de mercurio</unitPattern>
+				<unitPattern count="other">{0} polgadas de mercurio</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>milibares</displayName>
+				<unitPattern count="one">{0} milibar</unitPattern>
+				<unitPattern count="other">{0} milibares</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>quilómetros por hora</displayName>
@@ -5716,45 +5881,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} milla por hora</unitPattern>
 				<unitPattern count="other">{0} millas por hora</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>nó</displayName>
+				<unitPattern count="one">{0} nó</unitPattern>
+				<unitPattern count="other">{0} nós</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
-				<displayName>grados Celsius</displayName>
-				<unitPattern count="one">{0} grado Celsius</unitPattern>
-				<unitPattern count="other">{0} grados Celsius</unitPattern>
+				<displayName>graos Celsius</displayName>
+				<unitPattern count="one">{0} grao Celsius</unitPattern>
+				<unitPattern count="other">{0} graos Celsius</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
-				<displayName>grados Fahrenheit</displayName>
-				<unitPattern count="one">{0} grado Fahrenheit</unitPattern>
-				<unitPattern count="other">{0} grados Fahrenheit</unitPattern>
+				<displayName>graos Fahrenheit</displayName>
+				<unitPattern count="one">{0} grao Fahrenheit</unitPattern>
+				<unitPattern count="other">{0} graos Fahrenheit</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
-				<displayName>grados Kelvin</displayName>
-				<unitPattern count="one">{0} grado Kelvin</unitPattern>
-				<unitPattern count="other">{0} grados Kelvin</unitPattern>
-			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>acres pés</displayName>
-				<unitPattern count="one">{0} acre pé</unitPattern>
-				<unitPattern count="other">{0} acres pés</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>centilitros</displayName>
-				<unitPattern count="one">{0} centilitro</unitPattern>
-				<unitPattern count="other">{0} centilitros</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>centímetros cúbicos</displayName>
-				<unitPattern count="one">{0} centímetro cúbico</unitPattern>
-				<unitPattern count="other">{0} centímetros cúbicos</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>pés cúbicos</displayName>
-				<unitPattern count="one">{0} pé cúbico</unitPattern>
-				<unitPattern count="other">{0} pés cúbicos</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>polgadas cúbicas</displayName>
-				<unitPattern count="one">{0} polgada cúbica</unitPattern>
-				<unitPattern count="other">{0} polgadas cúbicas</unitPattern>
+				<displayName>graos Kelvin</displayName>
+				<unitPattern count="one">{0} grao Kelvin</unitPattern>
+				<unitPattern count="other">{0} graos Kelvin</unitPattern>
 			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>quilómetros cúbicos</displayName>
@@ -5765,6 +5915,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>metros cúbicos</displayName>
 				<unitPattern count="one">{0} metro cúbico</unitPattern>
 				<unitPattern count="other">{0} metros cúbicos</unitPattern>
+				<perUnitPattern>{0} por metro cúbico</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>centímetros cúbicos</displayName>
+				<unitPattern count="one">{0} centímetro cúbico</unitPattern>
+				<unitPattern count="other">{0} centímetros cúbicos</unitPattern>
+				<perUnitPattern>{0} por centímetro cúbico</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>millas cúbicas</displayName>
@@ -5776,25 +5933,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} iarda cúbica</unitPattern>
 				<unitPattern count="other">{0} iardas cúbicas</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>cuncas</displayName>
-				<unitPattern count="one">{0} cunca</unitPattern>
-				<unitPattern count="other">{0} cuncas</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>pés cúbicos</displayName>
+				<unitPattern count="one">{0} pé cúbico</unitPattern>
+				<unitPattern count="other">{0} pés cúbicos</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>decilitros</displayName>
-				<unitPattern count="one">{0} decilitro</unitPattern>
-				<unitPattern count="other">{0} decilitros</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>polgadas cúbicas</displayName>
+				<unitPattern count="one">{0} polgada cúbica</unitPattern>
+				<unitPattern count="other">{0} polgadas cúbicas</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>onzas líquidas</displayName>
-				<unitPattern count="one">{0} onza líquida</unitPattern>
-				<unitPattern count="other">{0} onzas líquidas</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>galóns</displayName>
-				<unitPattern count="one">{0} galón</unitPattern>
-				<unitPattern count="other">{0} galóns</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megalitros</displayName>
+				<unitPattern count="one">{0} megalitro</unitPattern>
+				<unitPattern count="other">{0} megalitros</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hectolitros</displayName>
@@ -5805,27 +5957,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>litros</displayName>
 				<unitPattern count="one">{0} litro</unitPattern>
 				<unitPattern count="other">{0} litros</unitPattern>
+				<perUnitPattern>{0} por litro</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalitros</displayName>
-				<unitPattern count="one">{0} megalitro</unitPattern>
-				<unitPattern count="other">{0} megalitros</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>decilitros</displayName>
+				<unitPattern count="one">{0} decilitro</unitPattern>
+				<unitPattern count="other">{0} decilitros</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centilitros</displayName>
+				<unitPattern count="one">{0} centilitro</unitPattern>
+				<unitPattern count="other">{0} centilitros</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mililitros</displayName>
 				<unitPattern count="one">{0} mililitro</unitPattern>
 				<unitPattern count="other">{0} mililitros</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pintas</displayName>
-				<unitPattern count="one">{0} pinta</unitPattern>
-				<unitPattern count="other">{0} pintas</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>pintas métricas</displayName>
+				<unitPattern count="one">{0} pinta métrica</unitPattern>
+				<unitPattern count="other">{0} pintas métricas</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>cuncas métricas</displayName>
+				<unitPattern count="one">{0} cunca métrica</unitPattern>
+				<unitPattern count="other">{0} cuncas métricas</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acres pés</displayName>
+				<unitPattern count="one">{0} acre pé</unitPattern>
+				<unitPattern count="other">{0} acres pés</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galóns</displayName>
+				<unitPattern count="one">{0} galón</unitPattern>
+				<unitPattern count="other">{0} galóns</unitPattern>
+				<perUnitPattern>{0} por galón</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>cuartos</displayName>
 				<unitPattern count="one">{0} cuarto</unitPattern>
 				<unitPattern count="other">{0} cuartos</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pintas</displayName>
+				<unitPattern count="one">{0} pinta</unitPattern>
+				<unitPattern count="other">{0} pintas</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cuncas</displayName>
+				<unitPattern count="one">{0} cunca</unitPattern>
+				<unitPattern count="other">{0} cuncas</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>onzas líquidas</displayName>
+				<unitPattern count="one">{0} onza líquida</unitPattern>
+				<unitPattern count="other">{0} onzas líquidas</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>culleradas</displayName>
 				<unitPattern count="one">{0} cullerada</unitPattern>
@@ -5836,8 +6025,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} culleriña</unitPattern>
 				<unitPattern count="other">{0} culleriñas</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} L</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} O</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>forzas G</displayName>
 				<unitPattern count="one">{0} G</unitPattern>
@@ -5848,6 +6046,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="one">{0} rev</unitPattern>
+				<unitPattern count="other">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radiáns</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>º</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>arcomin</displayName>
 				<unitPattern count="one">{0} arcomin</unitPattern>
@@ -5858,30 +6071,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} arcoseg</unitPattern>
 				<unitPattern count="other">{0} arcoseg</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>º</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radiáns</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>acres</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hectáreas</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>metros²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0} por m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0} por cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>millas²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acres</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>iardas²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>pé²</displayName>
@@ -5892,91 +6117,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>polgadas²</displayName>
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0} por in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>metros²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>millas²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>iardas²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>quilates</displayName>
+				<unitPattern count="one">{0} ct</unitPattern>
+				<unitPattern count="other">{0} ct</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litros/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
 				<unitPattern count="other">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100 km</displayName>
+				<unitPattern count="one">{0} L/100 km</unitPattern>
+				<unitPattern count="other">{0} L/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>millas/galón</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>séc.</displayName>
+				<unitPattern count="one">{0} séc.</unitPattern>
+				<unitPattern count="other">{0} séc.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>anos</displayName>
+				<unitPattern count="one">{0} ano</unitPattern>
+				<unitPattern count="other">{0} anos</unitPattern>
+				<perUnitPattern>{0}/ano</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>meses</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>semanas</displayName>
+				<unitPattern count="one">{0} sem</unitPattern>
+				<unitPattern count="other">{0} sem</unitPattern>
+				<perUnitPattern>{0}/sem.</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>días</displayName>
 				<unitPattern count="one">{0} día</unitPattern>
 				<unitPattern count="other">{0} días</unitPattern>
+				<perUnitPattern>{0}/d</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>horas</displayName>
@@ -5984,30 +6224,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} horas</unitPattern>
 				<perUnitPattern>{0} ph</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>miliseg</displayName>
-				<unitPattern count="one">{0} miliseg</unitPattern>
-				<unitPattern count="other">{0} miliseg</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>meses</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanoseg.</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>seg</displayName>
@@ -6015,15 +6236,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} seg</unitPattern>
 				<perUnitPattern>{0} ps</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>semanas</displayName>
-				<unitPattern count="one">{0} sem</unitPattern>
-				<unitPattern count="other">{0} sem</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>miliseg</displayName>
+				<unitPattern count="one">{0} miliseg</unitPattern>
+				<unitPattern count="other">{0} miliseg</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>anos</displayName>
-				<unitPattern count="one">{0} ano</unitPattern>
-				<unitPattern count="other">{0} anos</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanoseg.</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amp</displayName>
@@ -6045,6 +6271,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -6055,21 +6286,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Cal</unitPattern>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joules</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>quilojoule</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joules</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kW/h</displayName>
 				<unitPattern count="one">{0} kW/h</unitPattern>
@@ -6080,201 +6306,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>ua</displayName>
-				<unitPattern count="one">{0} ua</unitPattern>
-				<unitPattern count="other">{0} ua</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>quilóm</displayName>
+				<unitPattern count="one">{0} quilóm</unitPattern>
+				<unitPattern count="other">{0} quilóm</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cent</displayName>
-				<unitPattern count="one">{0} cent</unitPattern>
-				<unitPattern count="other">{0} cent</unitPattern>
+			<unit type="length-meter">
+				<displayName>met</displayName>
+				<unitPattern count="one">{0} met</unitPattern>
+				<unitPattern count="other">{0} met</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>pé</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>polgadas</displayName>
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>quilóm</displayName>
-				<unitPattern count="one">{0} quilóm</unitPattern>
-				<unitPattern count="other">{0} quilóm</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>anos luz</displayName>
-				<unitPattern count="one">{0} al</unitPattern>
-				<unitPattern count="other">{0} al</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>met</displayName>
-				<unitPattern count="one">{0} met</unitPattern>
-				<unitPattern count="other">{0} met</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>millas</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cent</displayName>
+				<unitPattern count="one">{0} cent</unitPattern>
+				<unitPattern count="other">{0} cent</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>milím</displayName>
 				<unitPattern count="one">{0} milím</unitPattern>
 				<unitPattern count="other">{0} milím</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pársecs</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>millas</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>iardas</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>pé</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>polgadas</displayName>
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pársecs</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>anos luz</displayName>
+				<unitPattern count="one">{0} al</unitPattern>
+				<unitPattern count="other">{0} al</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ua</displayName>
+				<unitPattern count="one">{0} ua</unitPattern>
+				<unitPattern count="other">{0} ua</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>quilate</displayName>
-				<unitPattern count="one">{0} ct</unitPattern>
-				<unitPattern count="other">{0} ct</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gramos</displayName>
-				<unitPattern count="one">{0} gram</unitPattern>
-				<unitPattern count="other">{0} gram</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>quilog</displayName>
-				<unitPattern count="one">{0} quilog</unitPattern>
-				<unitPattern count="other">{0} quilog</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>tm</displayName>
 				<unitPattern count="one">{0} tm</unitPattern>
 				<unitPattern count="other">{0} tm</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>quilog</displayName>
+				<unitPattern count="one">{0} quilog</unitPattern>
+				<unitPattern count="other">{0} quilog</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gramos</displayName>
+				<unitPattern count="one">{0} gram</unitPattern>
+				<unitPattern count="other">{0} gram</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>onza troy</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>libras</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>toneladas</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>libras</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>onza troy</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>quilate</displayName>
+				<unitPattern count="one">{0} ct</unitPattern>
+				<unitPattern count="other">{0} ct</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hp</displayName>
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watts</displayName>
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>in Hg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -6285,15 +6515,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>quilates</displayName>
-				<unitPattern count="one">{0} ct</unitPattern>
-				<unitPattern count="other">{0} ct</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>in Hg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/hora</displayName>
-				<unitPattern count="one">{0} km por hora</unitPattern>
-				<unitPattern count="other">{0} km por hora</unitPattern>
+				<unitPattern count="one">{0} km/h</unitPattern>
+				<unitPattern count="other">{0} km/h</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
 				<displayName>metros/seg</displayName>
@@ -6305,6 +6540,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>g. Celsius</displayName>
 				<unitPattern count="one">{0} g Celsius</unitPattern>
@@ -6320,31 +6565,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>acres pés</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>pés³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>polgadas³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -6354,6 +6574,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -6365,25 +6592,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>cuncas</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>pés³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>polgadas³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -6394,27 +6616,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>lit</displayName>
 				<unitPattern count="one">{0} lit</unitPattern>
 				<unitPattern count="other">{0} lit</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="one">{0} Ml</unitPattern>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
 				<unitPattern count="one">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pintas</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acres pés</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>cuartos</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pintas</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cuncas</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>tbsp</displayName>
 				<unitPattern count="one">{0} tbsp</unitPattern>
@@ -6425,12 +6684,41 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} tsp</unitPattern>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} L</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} O</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+			</compoundUnit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100 km</displayName>
+				<unitPattern count="one">{0} L/100 km</unitPattern>
+				<unitPattern count="other">{0} L/100 km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>anos</displayName>
+				<unitPattern count="one">{0} a</unitPattern>
+				<unitPattern count="other">{0} a</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mes</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>sem</displayName>
+				<unitPattern count="one">{0} s</unitPattern>
+				<unitPattern count="other">{0} s</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>días</displayName>
 				<unitPattern count="one">{0} d</unitPattern>
@@ -6441,40 +6729,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} h</unitPattern>
 				<unitPattern count="other">{0} h</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>miliseg</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>mes</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>seg</displayName>
 				<unitPattern count="one">{0} s</unitPattern>
 				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>sem</displayName>
-				<unitPattern count="one">{0} s</unitPattern>
-				<unitPattern count="other">{0} s</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>anos</displayName>
-				<unitPattern count="one">{0} a</unitPattern>
-				<unitPattern count="other">{0} a</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>miliseg</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
@@ -6486,21 +6754,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="one">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="one">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
 				<unitPattern count="one">{0} km/h</unitPattern>
@@ -6520,6 +6793,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} L</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} O</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gl_ES.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gl_ES.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gl_ES.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gl_ES.xml
index 9ddb7526852..7df96d4f2e4 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gl_ES.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gl_ES.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="gl"/>
 		<territory type="ES"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gsw.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw.xml
similarity index 97%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gsw.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw.xml
index 640cadb4d03..819337becd2 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gsw.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11093 $"/>
-		<generation date="$Date: 2015-01-02 21:36:02 -0600 (Fri, 02 Jan 2015) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="gsw"/>
 	</identity>
 	<localeDisplayNames>
@@ -625,7 +624,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albaanie</territory>
 			<territory type="AM">Armeenie</territory>
-			<territory type="AN">Niderländischi Antille</territory>
 			<territory type="AO">Angoola</territory>
 			<territory type="AQ">Antarktis</territory>
 			<territory type="AR">Argentiinie</territory>
@@ -914,21 +912,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="currency">Wäährig</key>
 		</keys>
 		<types>
-			<type type="big5han" key="collation">Tradizionells Chineesisch - Big5</type>
-			<type type="buddhist" key="calendar">Buddhischtisch Kaländer</type>
-			<type type="chinese" key="calendar">Chineesisch Kaländer</type>
-			<type type="gb2312han" key="collation">Veräifachts Chineesisch - GB2312</type>
-			<type type="gregorian" key="calendar">Gregoriaanisch Kaländer</type>
-			<type type="hebrew" key="calendar">Hebrääisch Kaländer</type>
-			<type type="indian" key="calendar">Indisch Nationaalkaländer</type>
-			<type type="islamic" key="calendar">Islaamisch Kaländer</type>
-			<type type="islamic-civil" key="calendar">Bürgerlich islaamisch Kaländer</type>
-			<type type="japanese" key="calendar">Japaanisch Kaländer</type>
-			<type type="phonebook" key="collation">Telifonbuech-Sortiirregle</type>
-			<type type="pinyin" key="collation">Pinyin-Sortiirregle</type>
-			<type type="roc" key="calendar">Kaländer vor Republik Chiina</type>
-			<type type="stroke" key="collation">Strichfolg</type>
-			<type type="traditional" key="collation">Tradizionelli Sortiir-Regle</type>
+			<type key="calendar" type="buddhist">Buddhischtisch Kaländer</type>
+			<type key="calendar" type="chinese">Chineesisch Kaländer</type>
+			<type key="calendar" type="gregorian">Gregoriaanisch Kaländer</type>
+			<type key="calendar" type="hebrew">Hebrääisch Kaländer</type>
+			<type key="calendar" type="indian">Indisch Nationaalkaländer</type>
+			<type key="calendar" type="islamic">Islaamisch Kaländer</type>
+			<type key="calendar" type="islamic-civil">Bürgerlich islaamisch Kaländer</type>
+			<type key="calendar" type="japanese">Japaanisch Kaländer</type>
+			<type key="calendar" type="roc">Kaländer vor Republik Chiina</type>
+			<type key="collation" type="big5han">Tradizionells Chineesisch - Big5</type>
+			<type key="collation" type="gb2312han">Veräifachts Chineesisch - GB2312</type>
+			<type key="collation" type="phonebook">Telifonbuech-Sortiirregle</type>
+			<type key="collation" type="pinyin">Pinyin-Sortiirregle</type>
+			<type key="collation" type="stroke">Strichfolg</type>
+			<type key="collation" type="traditional">Tradizionelli Sortiir-Regle</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metrisch</measurementSystemName>
@@ -1005,9 +1003,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="d">d</dateFormatItem>
 						<dateFormatItem id="Ed">E d.</dateFormatItem>
 						<dateFormatItem id="H">H</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
+						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
+						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d.M.</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.M.</dateFormatItem>
@@ -1232,8 +1229,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am" draft="unconfirmed">v.m.</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">n.m.</dayPeriod>
+							<dayPeriod type="am" draft="contributed">v.m.</dayPeriod>
+							<dayPeriod type="pm" draft="contributed">n.m.</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">vorm.</dayPeriod>
@@ -1316,9 +1313,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="d">d</dateFormatItem>
 						<dateFormatItem id="Ed">E d.</dateFormatItem>
 						<dateFormatItem id="H">H</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
+						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
+						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d.M.</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.M.</dateFormatItem>
@@ -1989,6 +1985,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0 tsd ¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0 tsd ¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00 tsd ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00 tsd ¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000 tsd ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000 tsd ¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0 Mio ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0 Mio ¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00 Mio ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00 Mio ¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000 Mio ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000 Mio ¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0 Mrd ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0 Mrd ¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00 Mrd ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00 Mrd ¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000 Mrd ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000 Mrd ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0 Bio ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0 Bio ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00 Bio ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00 Bio ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000 Bio ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000 Bio ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -3338,6 +3362,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}-fachi Erdbeschlünigung</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}-fachi Erdbeschlünigung</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<displayName draft="provisional">Grad</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} Grad</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} Grad</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName draft="provisional">Winkelminute</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} Winkelminute</unitPattern>
@@ -3348,31 +3377,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} Winkelsekunde</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} Winkelsekunde</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName draft="provisional">Grad</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} Grad</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} Grad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="provisional">Acre</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} Acre</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} Acre</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName draft="provisional">Quadratkilometer</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} Quadratkilometer</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} Quadratkilometer</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName draft="provisional">Hektar</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} Hektar</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} Hektar</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<displayName draft="provisional">Quadratfuess</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} Quadratfuess</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} Quadratfuess</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="provisional">Quadratkilometer</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} Quadratkilometer</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} Quadratkilometer</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<displayName draft="provisional">Quadratmeter</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} Quadratmeter</unitPattern>
@@ -3383,6 +3397,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} Quadratmeile</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} Quadratmeile</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<displayName draft="provisional">Acre</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} Acre</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} Acre</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName draft="provisional">Quadratfuess</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} Quadratfuess</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} Quadratfuess</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="provisional">Jahr</displayName>
+				<unitPattern count="one">{0} Jahr</unitPattern>
+				<unitPattern count="other">{0} Jahr</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="provisional">Mönet</displayName>
+				<unitPattern count="one">{0} Monet</unitPattern>
+				<unitPattern count="other">{0} Mönet</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="provisional">Wuche</displayName>
+				<unitPattern count="one">{0} Wuche</unitPattern>
+				<unitPattern count="other">{0} Wuche</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">Tääg</displayName>
 				<unitPattern count="one">{0} Taag</unitPattern>
@@ -3393,70 +3432,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Schtund</unitPattern>
 				<unitPattern count="other">{0} Schtunde</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="provisional">Millisekunde</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} Millisekunde</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} Millisekunde</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="provisional">Minuute</displayName>
 				<unitPattern count="one">{0} Minuute</unitPattern>
 				<unitPattern count="other">{0} Minuute</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">Mönet</displayName>
-				<unitPattern count="one">{0} Monet</unitPattern>
-				<unitPattern count="other">{0} Mönet</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="provisional">Sekunde</displayName>
 				<unitPattern count="one">{0} Sekunde</unitPattern>
 				<unitPattern count="other">{0} Sekunde</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">Wuche</displayName>
-				<unitPattern count="one">{0} Wuche</unitPattern>
-				<unitPattern count="other">{0} Wuche</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">Jahr</displayName>
-				<unitPattern count="one">{0} Jahr</unitPattern>
-				<unitPattern count="other">{0} Jahr</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="provisional">Zentimeter</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} Zentimeter</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} Zentimeter</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="provisional">Fuess</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} Fuess</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} Fuess</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="provisional">Zoll</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} Zoll</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} Zoll</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="provisional">Millisekunde</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} Millisekunde</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} Millisekunde</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="provisional">Kilometer</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} Kilometer</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} Kilometer</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<displayName draft="provisional">Liechtjahr</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} Liechtjahr</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} Liechtjahr</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName draft="provisional">Meter</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} Meter</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} Meter</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName draft="provisional">Meile</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} Meile</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} Meile</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="provisional">Zentimeter</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} Zentimeter</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} Zentimeter</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="provisional">Millimeter</displayName>
@@ -3468,35 +3472,50 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} Pikometer</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} Pikometer</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="provisional">Meile</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} Meile</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} Meile</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName draft="provisional">Yard</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} Yard</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} Yard</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="provisional">Gramm</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} Gramm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} Gramm</unitPattern>
+			<unit type="length-foot">
+				<displayName draft="provisional">Fuess</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} Fuess</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} Fuess</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="provisional">Zoll</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} Zoll</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} Zoll</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="provisional">Liechtjahr</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} Liechtjahr</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} Liechtjahr</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="provisional">Kilogramm</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} Kilogramm</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} Kilogramm</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="provisional">Unze</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} Unze</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} Unze</unitPattern>
+			<unit type="mass-gram">
+				<displayName draft="provisional">Gramm</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} Gramm</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} Gramm</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<displayName draft="provisional">Pfund</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} Pfund</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} Pfund</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="provisional">Pferdestärke</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} Pferdestärke</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} Pferdestärke</unitPattern>
+			<unit type="mass-ounce">
+				<displayName draft="provisional">Unze</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} Unze</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} Unze</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName draft="provisional">Kilowatt</displayName>
@@ -3508,6 +3527,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} Watt</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} Watt</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<displayName draft="provisional">Pferdestärke</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} Pferdestärke</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} Pferdestärke</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="provisional">Hektopascal</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} Hektopascal</unitPattern>
@@ -3573,6 +3597,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} G</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<displayName draft="provisional">Grad</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}°</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName draft="provisional">Winkelminute</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}′</unitPattern>
@@ -3583,31 +3612,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}″</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName draft="provisional">Grad</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}°</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="provisional">Acre</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName draft="provisional">Quadratkilometer</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} km²</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName draft="provisional">Hektar</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} ha</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<displayName draft="provisional">Quadratfuess</displayName>
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="provisional">Quadratkilometer</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} km²</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<displayName draft="provisional">Quadratmeter</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} m²</unitPattern>
@@ -3618,6 +3632,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<displayName draft="provisional">Acre</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName draft="provisional">Quadratfuess</displayName>
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="provisional">Jahr</displayName>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="provisional">Mönet</displayName>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="provisional">Wuche</displayName>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">Tääg</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} d</unitPattern>
@@ -3628,64 +3661,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} h</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} h</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="provisional">Millisekunde</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ms</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="provisional">Minuute</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} min</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} min</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">Mönet</displayName>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="provisional">Sekunde</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} s</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">Wuche</displayName>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">Jahr</displayName>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="provisional">Zentimeter</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} cm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="provisional">Fuess</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} Fuess</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} Fuess</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="provisional">Zoll</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} Zoll</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} Zoll</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="provisional">Millisekunde</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} ms</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="provisional">Kilometer</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} km</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<displayName draft="provisional">Liechtjahr</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} Liechtjahr</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} Liechtjahr</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName draft="provisional">Meter</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} m</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName draft="provisional">Meile</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="provisional">Zentimeter</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} cm</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="provisional">Millimeter</displayName>
@@ -3697,35 +3701,50 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} pm</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="provisional">Meile</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName draft="provisional">Yard</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="provisional">Gramm</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} g</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} g</unitPattern>
+			<unit type="length-foot">
+				<displayName draft="provisional">Fuess</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} Fuess</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} Fuess</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="provisional">Zoll</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} Zoll</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} Zoll</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="provisional">Liechtjahr</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} Liechtjahr</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} Liechtjahr</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="provisional">Kilogramm</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} kg</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="provisional">Unze</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} Unze</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} Unze</unitPattern>
+			<unit type="mass-gram">
+				<displayName draft="provisional">Gramm</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} g</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<displayName draft="provisional">Pfund</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} Pfund</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} Pfund</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="provisional">Pferdestärke</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} PS</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} PS</unitPattern>
+			<unit type="mass-ounce">
+				<displayName draft="provisional">Unze</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} Unze</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} Unze</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName draft="provisional">Kilowatt</displayName>
@@ -3737,6 +3756,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} W</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<displayName draft="provisional">Pferdestärke</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} PS</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} PS</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="provisional">Hektopascal</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} hPa</unitPattern>
@@ -3801,6 +3825,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}G</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one" draft="unconfirmed">{0}°</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one" draft="unconfirmed">{0}′</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}′</unitPattern>
@@ -3809,26 +3837,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}″</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one" draft="unconfirmed">{0}°</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one" draft="unconfirmed">{0}km²</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one" draft="unconfirmed">{0}ha</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one" draft="unconfirmed">{0}km²</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one" draft="unconfirmed">{0}m²</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}m²</unitPattern>
@@ -3837,6 +3853,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<unitPattern count="one" draft="unconfirmed">{0}d</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}d</unitPattern>
@@ -3845,10 +3869,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}h</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}h</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<unitPattern count="one" draft="unconfirmed">{0}ms</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<unitPattern count="one" draft="unconfirmed">{0}m</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}m</unitPattern>
@@ -3857,33 +3877,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}s</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}s</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<unitPattern count="one" draft="unconfirmed">{0}cm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one" draft="unconfirmed">{0} Fuess</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} Fuess</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one" draft="unconfirmed">{0} Zoll</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} Zoll</unitPattern>
+			<unit type="duration-millisecond">
+				<unitPattern count="one" draft="unconfirmed">{0}ms</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<unitPattern count="one" draft="unconfirmed">{0}km</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one" draft="unconfirmed">{0} Liechtjahr</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} Liechtjahr</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<unitPattern count="one" draft="unconfirmed">{0}m</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<unitPattern count="one" draft="unconfirmed">{0}cm</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<unitPattern count="one" draft="unconfirmed">{0}mm</unitPattern>
@@ -3893,29 +3901,41 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}pm</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<unitPattern count="one" draft="unconfirmed">{0}g</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one" draft="unconfirmed">{0} Fuess</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} Fuess</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one" draft="unconfirmed">{0} Zoll</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} Zoll</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one" draft="unconfirmed">{0} Liechtjahr</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} Liechtjahr</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<unitPattern count="one" draft="unconfirmed">{0}kg</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one" draft="unconfirmed">{0} Unze</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} Unze</unitPattern>
+			<unit type="mass-gram">
+				<unitPattern count="one" draft="unconfirmed">{0}g</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one" draft="unconfirmed">{0} Pfund</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} Pfund</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one" draft="unconfirmed">{0} PS</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} PS</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one" draft="unconfirmed">{0} Unze</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} Unze</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one" draft="unconfirmed">{0}kW</unitPattern>
@@ -3925,6 +3945,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}W</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one" draft="unconfirmed">{0} PS</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} PS</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one" draft="unconfirmed">{0}hPa</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}hPa</unitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gsw_CH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw_CH.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gsw_CH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw_CH.xml
index 1f96637859f..4deab805987 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gsw_CH.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw_CH.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="gsw"/>
 		<territory type="CH"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gsw_FR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw_FR.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gsw_FR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw_FR.xml
index 3567910169f..6035d99a19a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gsw_FR.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw_FR.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10301 $"/>
-		<generation date="$Date: 2014-05-14 00:17:36 -0500 (Wed, 14 May 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="gsw"/>
 		<territory type="FR"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gsw_LI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw_LI.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gsw_LI.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw_LI.xml
index 6aa9a692499..75a085a473b 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gsw_LI.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw_LI.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="gsw"/>
 		<territory type="LI"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gu.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gu.xml
similarity index 90%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gu.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gu.xml
index 21419677931..4b2d6929bcb 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gu.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gu.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="gu"/>
 	</identity>
 	<localeDisplayNames>
@@ -39,7 +38,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ar">અરબી</language>
 			<language type="ar_001">મોડર્ન સ્ટાન્ડર્ડ અરબી</language>
 			<language type="arc">અર્માઇક</language>
-			<language type="arn">એરોકૈનિયન</language>
+			<language type="arn">મેપુચે</language>
 			<language type="arp">અરાપાહો</language>
 			<language type="arq">આલ્જેરિયન અરબી</language>
 			<language type="arw">અરાવક</language>
@@ -53,7 +52,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ay">આયમારા</language>
 			<language type="az">અઝરબૈજાની</language>
 			<language type="az" alt="short">અઝેરી</language>
-			<language type="azb">દક્ષિણ ઝરબૈજાની</language>
 			<language type="ba">બશ્કીર</language>
 			<language type="bal">બલૂચી</language>
 			<language type="ban">બાલિનીસ</language>
@@ -64,6 +62,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bem">બેમ્બા</language>
 			<language type="bez">બેના</language>
 			<language type="bg">બલ્ગેરિયન</language>
+			<language type="bgn">પશ્ચિમી બાલોચી</language>
 			<language type="bho">ભોજપુરી</language>
 			<language type="bi">બિસ્લામા</language>
 			<language type="bik">બિકોલ</language>
@@ -98,7 +97,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="chp">શિપેવ્યાન</language>
 			<language type="chr">શેરોકી</language>
 			<language type="chy">શેયેન્ન</language>
-			<language type="ckb">સોરાની કુર્દિશ</language>
+			<language type="ckb">સેન્ટ્રલ કુર્દિશ</language>
 			<language type="co">કોર્સિકન</language>
 			<language type="cop">કોપ્ટિક</language>
 			<language type="cr">ક્રી</language>
@@ -168,7 +167,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="frr">નોર્ધર્ન ફ્રિશિયન</language>
 			<language type="frs">પૂર્વ ફ્રિશિયન</language>
 			<language type="fur">ફ્રિયુલિયાન</language>
-			<language type="fy">પશ્ચિમી ફ્રિશિયન</language>
+			<language type="fy">પશ્ચિમી ફ્રિસિયન</language>
 			<language type="ga">આઇરિશ</language>
 			<language type="gaa">Ga</language>
 			<language type="gag">ગાગાઝ</language>
@@ -287,6 +286,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">લાઓથિયન</language>
 			<language type="lol">મોગો</language>
 			<language type="loz">લોઝી</language>
+			<language type="lrc">ઉત્તરીય લુરી</language>
 			<language type="lt">લિથુનિયન</language>
 			<language type="lu">લ્યૂબા કટાંગા</language>
 			<language type="lua">લ્યૂબા-લુલુઆ</language>
@@ -333,12 +333,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mwr">મારવાડી</language>
 			<language type="my">બર્મીઝ</language>
 			<language type="myv">એર્ઝયા</language>
+			<language type="mzn">મઝાન્દેરાની</language>
 			<language type="na">નાઉરૂ</language>
 			<language type="nap">નેપોલિટાન</language>
 			<language type="naq">નમા</language>
 			<language type="nb">નોર્વેજીયન બોકમાલ</language>
-			<language type="nd">ઉતર દેબેલ</language>
+			<language type="nd">ઉત્તર દેબેલ</language>
 			<language type="nds">લો જર્મન</language>
+			<language type="nds_NL">લો સેક્સોન</language>
 			<language type="ne">નેપાળી</language>
 			<language type="new">નેવાડી</language>
 			<language type="ng">ડોન્ગા</language>
@@ -414,6 +416,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">સિસિલિયાન</language>
 			<language type="sco">સ્કોટ્સ</language>
 			<language type="sd">સિંધી</language>
+			<language type="sdh">સર્ઘન કુર્દીશ</language>
 			<language type="se">ઉત્તરીય સામી</language>
 			<language type="seh">સેના</language>
 			<language type="sel">સેલ્કપ</language>
@@ -448,8 +451,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">સુમેરિયન</language>
 			<language type="sv">સ્વીડિશ</language>
 			<language type="sw">સ્વાહિલી</language>
+			<language type="sw_CD">કોંગો સ્વાહિલી</language>
 			<language type="swb">કોમોરિયન</language>
-			<language type="swc">કોંગો સ્વાહિલી</language>
 			<language type="syc">પરંપરાગત સિરિએક</language>
 			<language type="syr">સિરિએક</language>
 			<language type="ta">તમિલ</language>
@@ -504,6 +507,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">વલામો</language>
 			<language type="war">વારે</language>
 			<language type="was">વાશો</language>
+			<language type="wbp">વાર્લ્પીરી</language>
 			<language type="wo">વોલોફ</language>
 			<language type="xal">કાલ્મિક</language>
 			<language type="xh">ખોસા</language>
@@ -517,7 +521,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="zap">ઝેપોટેક</language>
 			<language type="zbl">બ્લિસિમ્બોલ્સ</language>
 			<language type="zen">ઝેનાગા</language>
-			<language type="zgh">પ્રમાણભૂત મોરોક્કન ટમાઝિટ</language>
+			<language type="zgh">પ્રમાણભૂત મોરોક્કન તામાઝિગ્ટ</language>
 			<language type="zh">ચાઇનીઝ</language>
 			<language type="zh_Hans">સરળીકૃત ચાઇનીઝ</language>
 			<language type="zh_Hant">પારંપરિક ચાઇનીઝ</language>
@@ -620,6 +624,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Phnx">ફોનિશિયન</script>
 			<script type="Plrd">પોલાર્ડ ફોનેટિક</script>
 			<script type="Prti">ઇન્સ્ક્રિપ્શનલ પાર્થિયન</script>
+			<script type="Qaae">Qaae</script>
 			<script type="Rjng">રીજાંગ</script>
 			<script type="Roro">રોંગોરોંગો</script>
 			<script type="Runr">રૂનિક</script>
@@ -655,7 +660,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Yiii">યી</script>
 			<script type="Zinh">વંશાગત</script>
 			<script type="Zmth">ગણિતીય સંકેતલિપિ</script>
-			<script type="Zsym">પ્રતીક લિપી</script>
+			<script type="Zsym">પ્રતીકો</script>
 			<script type="Zxxx">અલિખિત</script>
 			<script type="Zyyy">સામાન્ય</script>
 			<script type="Zzzz">અજ્ઞાત લિપિ</script>
@@ -665,23 +670,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="002">આફ્રિકા</territory>
 			<territory type="003">ઉત્તર અમેરિકા</territory>
 			<territory type="005">દક્ષિણ અમેરિકા</territory>
-			<territory type="009">ઓશિઆનિયા</territory>
+			<territory type="009">ઓશનિયા</territory>
 			<territory type="011">પશ્ચિમી આફ્રિકા</territory>
 			<territory type="013">મધ્ય અમેરિકા</territory>
 			<territory type="014">પૂર્વીય આફ્રિકા</territory>
 			<territory type="015">ઉત્તરીય આફ્રિકા</territory>
 			<territory type="017">મધ્ય આફ્રિકા</territory>
-			<territory type="018">દક્ષિણી આફ્રિકા</territory>
-			<territory type="019">અમેરિકાસ</territory>
+			<territory type="018">સધર્ન આફ્રિકા</territory>
+			<territory type="019">અમેરિકા</territory>
 			<territory type="021">ઉત્તરીય અમેરિકા</territory>
 			<territory type="029">કેરિબિયન</territory>
 			<territory type="030">પૂર્વીય એશિયા</territory>
-			<territory type="034">દક્ષિણી એશિયા</territory>
+			<territory type="034">સર્ધન એશિયા</territory>
 			<territory type="035">દક્ષિણપૂર્વ એશિયા</territory>
-			<territory type="039">દક્ષિણી યુરોપ</territory>
+			<territory type="039">સધર્ન યુરોપ</territory>
 			<territory type="053">ઓસ્ટ્રેલેશિયા</territory>
 			<territory type="054">મેલાનેશિયા</territory>
-			<territory type="057">માઇક્રોનેશિયન રીજન</territory>
+			<territory type="057">માઈક્રોનેશિયન ક્ષેત્ર</territory>
 			<territory type="061">પોલિનેશિયા</territory>
 			<territory type="142">એશિયા</territory>
 			<territory type="143">મધ્ય એશિયા</territory>
@@ -695,11 +700,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AD">ઍંડોરા</territory>
 			<territory type="AE">યુનાઇટેડ આરબ અમીરાત</territory>
 			<territory type="AF">અફઘાનિસ્તાન</territory>
-			<territory type="AG">એન્ટીગુઆ અને બરબુડા</territory>
+			<territory type="AG">એન્ટીગુઆ અને બર્મુડા</territory>
 			<territory type="AI">ઍંગ્વિલા</territory>
 			<territory type="AL">અલ્બેનિયા</territory>
 			<territory type="AM">આર્મેનિયા</territory>
-			<territory type="AN">નેધરલેંડ્સ એંટિલેસ</territory>
 			<territory type="AO">અંગોલા</territory>
 			<territory type="AQ">એન્ટાર્કટિકા</territory>
 			<territory type="AR">આર્જેન્ટીના</territory>
@@ -707,7 +711,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AT">ઑસ્ટ્રિયા</territory>
 			<territory type="AU">ઑસ્ટ્રેલિયા</territory>
 			<territory type="AW">અરુબા</territory>
-			<territory type="AX">એલેંડ આઇલેન્ડ્સ</territory>
+			<territory type="AX">એલેંડ ટાપુઓ</territory>
 			<territory type="AZ">અઝરબૈજાન</territory>
 			<territory type="BA">બોસ્નિયા અને હર્ઝેગોવિના</territory>
 			<territory type="BB">બાર્બાડોસ</territory>
@@ -718,7 +722,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BH">બેહરીન</territory>
 			<territory type="BI">બુરુંડી</territory>
 			<territory type="BJ">બેનિન</territory>
-			<territory type="BL">સેંટ બાર્થલેમી</territory>
+			<territory type="BL">સેન્ટ બાર્થેલેમી</territory>
 			<territory type="BM">બર્મુડા</territory>
 			<territory type="BN">બ્રુનેઇ</territory>
 			<territory type="BO">બોલિવિયા</territory>
@@ -734,7 +738,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CC">કોકોઝ (કીલીંગ) આઇલેન્ડ્સ</territory>
 			<territory type="CD">કોંગો - કિંશાસા</territory>
 			<territory type="CD" alt="variant">કોંગો (ડીઆરસી)</territory>
-			<territory type="CF">સેંટ્રલ આફ્રિકન રીપબ્લિક</territory>
+			<territory type="CF">સેન્ટ્રલ આફ્રિકન રીપબ્લિક</territory>
 			<territory type="CG">કોંગો - બ્રાઝાવિલે</territory>
 			<territory type="CG" alt="variant">કોંગો (પ્રજાસત્તાક)</territory>
 			<territory type="CH">સ્વિટ્ઝર્લૅન્ડ</territory>
@@ -771,10 +775,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="EU">યુરોપિયન સંઘ</territory>
 			<territory type="FI">ફિનલેન્ડ</territory>
 			<territory type="FJ">ફીજી</territory>
-			<territory type="FK">ફૉકલેન્ડ આઇલેન્ડ્સ</territory>
-			<territory type="FK" alt="variant">ફૉકલેન્ડ આઇલેન્ડ્સ (ઇસ્લાસ માલવિનસ)</territory>
+			<territory type="FK">ફૉકલેન્ડ ટાપુઓ</territory>
+			<territory type="FK" alt="variant">ફૉકલેન્ડ ટાપુઓ (ઇસ્લાસ માલવિનસ)</territory>
 			<territory type="FM">માઇક્રોનેશિયા</territory>
-			<territory type="FO">ફૅરો આઇલેન્ડ્સ</territory>
+			<territory type="FO">ફૅરો ટાપુઓ</territory>
 			<territory type="FR">ફ્રાંસ</territory>
 			<territory type="GA">ગેબન</territory>
 			<territory type="GB">યુનાઇટેડ કિંગડમ</territory>
@@ -803,9 +807,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="HR">ક્રોએશિયા</territory>
 			<territory type="HT">હૈતિ</territory>
 			<territory type="HU">હંગેરી</territory>
-			<territory type="IC">કૅનેરી આઇલેન્ડ્સ</territory>
+			<territory type="IC">કૅનેરી ટાપુઓ</territory>
 			<territory type="ID">ઇન્ડોનેશિયા</territory>
-			<territory type="IE">આયર્લેંડ</territory>
+			<territory type="IE">આયર્લેન્ડ</territory>
 			<territory type="IL">ઇઝરાઇલ</territory>
 			<territory type="IM">આઈલ ઓફ મૅન</territory>
 			<territory type="IN">ભારત</territory>
@@ -823,15 +827,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="KH">કંબોડિયા</territory>
 			<territory type="KI">કિરિબાટી</territory>
 			<territory type="KM">કોમોરસ</territory>
-			<territory type="KN">સેંટ કિટ્સ એંડ નેવિસ</territory>
+			<territory type="KN">સેન્ટ કિટ્સ અને નેવિસ</territory>
 			<territory type="KP">ઉત્તર કોરિયા</territory>
 			<territory type="KR">દક્ષિણ કોરિયા</territory>
 			<territory type="KW">કુવૈત</territory>
-			<territory type="KY">કેયમેન આઇલેન્ડ્સ</territory>
+			<territory type="KY">કેમેન ટાપુઓ</territory>
 			<territory type="KZ">કઝાકિસ્તાન</territory>
 			<territory type="LA">લાઓસ</territory>
 			<territory type="LB">લેબનોન</territory>
-			<territory type="LC">સેંટ લુસિયા</territory>
+			<territory type="LC">સેન્ટ લુસિયા</territory>
 			<territory type="LI">લૈચટેંસ્ટેઇન</territory>
 			<territory type="LK">શ્રીલંકા</territory>
 			<territory type="LR">લાઇબેરિયા</territory>
@@ -844,7 +848,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="MC">મોનાકો</territory>
 			<territory type="MD">મોલડોવા</territory>
 			<territory type="ME">મૉન્ટેંનેગ્રો</territory>
-			<territory type="MF">સેંટ માર્ટિન</territory>
+			<territory type="MF">સેન્ટ માર્ટિન</territory>
 			<territory type="MG">મેડાગાસ્કર</territory>
 			<territory type="MH">માર્શલ આઇલેન્ડ્સ</territory>
 			<territory type="MK">મેસેડોનિયા</territory>
@@ -868,7 +872,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="NA">નામિબિયા</territory>
 			<territory type="NC">ન્યુ સેલેડોનિયા</territory>
 			<territory type="NE">નાઇજર</territory>
-			<territory type="NF">નોરફૉક આઇલેન્ડ</territory>
+			<territory type="NF">નોરફૉક ટાપુ</territory>
 			<territory type="NG">નાઇજીરીયા</territory>
 			<territory type="NI">નિકારાગુઆ</territory>
 			<territory type="NL">નેધરલેન્ડ</territory>
@@ -885,7 +889,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="PH">ફિલીપાઇન્સ</territory>
 			<territory type="PK">પાકિસ્તાન</territory>
 			<territory type="PL">પોલેંડ</territory>
-			<territory type="PM">સેંટ પીએરે એન્ડ મિકીલોન</territory>
+			<territory type="PM">સેન્ટ પિયર અને મીક્વેલન</territory>
 			<territory type="PN">પીટકૈર્ન આઇલેન્ડ્સ</territory>
 			<territory type="PR">પ્યુઅર્ટો રિકો</territory>
 			<territory type="PS">પેલેસ્ટિનિયન ટેરિટરી</territory>
@@ -894,7 +898,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="PW">પલાઉ</territory>
 			<territory type="PY">પેરાગ્વે</territory>
 			<territory type="QA">કતાર</territory>
-			<territory type="QO">આઉટલાયિંગ ઓશનિયા</territory>
+			<territory type="QO">આઉટલાઈન્ગ ઓશનિયા</territory>
 			<territory type="RE">રીયુનિયન</territory>
 			<territory type="RO">રોમાનિયા</territory>
 			<territory type="RS">સર્બિયા</territory>
@@ -902,13 +906,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="RW">રવાંડા</territory>
 			<territory type="SA">સાઉદી અરેબિયા</territory>
 			<territory type="SB">સોલોમન આઇલેન્ડ્સ</territory>
-			<territory type="SC">શેશેલ્સ</territory>
+			<territory type="SC">સેશેલ્સ</territory>
 			<territory type="SD">સુદાન</territory>
 			<territory type="SE">સ્વીડન</territory>
 			<territory type="SG">સિંગાપુર</territory>
-			<territory type="SH">સેંટ હેલેના</territory>
+			<territory type="SH">સેન્ટ હેલેના</territory>
 			<territory type="SI">સ્લોવેનિયા</territory>
-			<territory type="SJ">સ્વાલબર્ડ એન્ડ જેન મેયન</territory>
+			<territory type="SJ">સ્વાલબર્ડ અને જેન મેયન</territory>
 			<territory type="SK">સ્લોવેકિયા</territory>
 			<territory type="SL">સીએરા લેઓન</territory>
 			<territory type="SM">સૅન મેરિનો</territory>
@@ -922,7 +926,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="SY">સીરિયા</territory>
 			<territory type="SZ">સ્વાઝિલેન્ડ</territory>
 			<territory type="TA">ત્રિસ્તાન દા કુન્હા</territory>
-			<territory type="TC">ટર્ક્સ એન્ડ કૈકોસ આઇલેન્ડ્સ</territory>
+			<territory type="TC">તુર્ક્સ અને કાઇકોસ ટાપુઓ</territory>
 			<territory type="TD">ચાડ</territory>
 			<territory type="TF">ફ્રેંચ સદર્ન ટેરિટરીઝ</territory>
 			<territory type="TG">ટોગો</territory>
@@ -935,7 +939,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="TN">ટ્યુનિશિયા</territory>
 			<territory type="TO">ટોંગા</territory>
 			<territory type="TR">તુર્કી</territory>
-			<territory type="TT">ત્રિનિદાદ અને ટોબેગો</territory>
+			<territory type="TT">ટ્રિનીદાદ અને ટોબેગો</territory>
 			<territory type="TV">તુવાલુ</territory>
 			<territory type="TW">તાઇવાન</territory>
 			<territory type="TZ">તાંઝાનિયા</territory>
@@ -947,13 +951,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="UY">ઉરુગ્વે</territory>
 			<territory type="UZ">ઉઝ્બેકિસ્તાન</territory>
 			<territory type="VA">વેટિકન સિટી</territory>
-			<territory type="VC">સેન્ટ વિન્સેન્ટ એન્ડ ગ્રેનેડીન્સ</territory>
+			<territory type="VC">સેન્ટ વિન્સેટ અને ગ્રેનેડીન્સ</territory>
 			<territory type="VE">વેનેઝુએલા</territory>
-			<territory type="VG">બ્રિટિશ વર્જિન આઇલેન્ડ્સ</territory>
-			<territory type="VI">યુ.એસ વર્જિન આઇલેન્ડ્સ</territory>
+			<territory type="VG">બ્રિટિશ વર્જિન ટાપુઓ</territory>
+			<territory type="VI">યુ.એસ. વર્જિન ટાપુઓ</territory>
 			<territory type="VN">વિયેતનામ</territory>
 			<territory type="VU">વાનુઆતુ</territory>
-			<territory type="WF">વૉલિસ એંડ ફ્યુચુના</territory>
+			<territory type="WF">વેલીસ અને ફ્યુટુના</territory>
 			<territory type="WS">સમોઆ</territory>
 			<territory type="XK">કોસોવો</territory>
 			<territory type="YE">યેમેન</territory>
@@ -979,6 +983,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric">આંકડાકીય સૉર્ટિંગ</key>
 			<key type="colStrength">સૉર્ટિંગ શક્તિ</key>
 			<key type="currency">ચલણ</key>
+			<key type="hc">કલાકનું આવર્તન (12 વિ.24)</key>
+			<key type="lb">રેખા વિરામ પ્રકાર</key>
+			<key type="ms">માપદંડ પદ્ધતિ</key>
 			<key type="numbers">આંકડાઓ</key>
 			<key type="timezone">સમય ઝોન</key>
 			<key type="va">લોકેલ વેરિએન્ટ</key>
@@ -986,95 +993,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">ખાનગી-ઉપયોગ</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">અરેબિક-ભારતીય અંકો</type>
-			<type type="arabext" key="numbers">વિસ્તૃત અરેબિક-ઇન્ડિક અંકો</type>
-			<type type="armn" key="numbers">અર્મેનિયન સંખ્યાઓ</type>
-			<type type="armnlow" key="numbers">અર્મેનિયન નાના અક્ષરની સંખ્યાઓ</type>
-			<type type="beng" key="numbers">બંગાળી અંકો</type>
-			<type type="big5han" key="collation">પરંપરાગત ચાઇનિઝ સોર્ટ ક્રમબદ્ધ</type>
-			<type type="buddhist" key="calendar">બુદ્ધિસ્ટ કેલેન્ડર</type>
-			<type type="chinese" key="calendar">ચાઇનિઝ કેલેન્ડર</type>
-			<type type="coptic" key="calendar">કોપ્ટિક કેલેન્ડર</type>
-			<type type="dangi" key="calendar">ડાંગી કેલેન્ડર</type>
-			<type type="deva" key="numbers">દેવનાગરી</type>
-			<type type="dictionary" key="collation">શબ્દકોશ અનુક્મ</type>
-			<type type="ducet" key="collation">ડિફોલ્ટ યુનિકોડ સૉર્ટ ક્રમ</type>
-			<type type="ethi" key="numbers">ઇથિયોપીક સંખ્યાઓ</type>
-			<type type="ethiopic" key="calendar">ઇથિઓપિક કેલેન્ડર</type>
-			<type type="ethiopic-amete-alem" key="calendar">ઇથિઓપિક એમેટ એલેમ કેલેન્ડર</type>
-			<type type="finance" key="numbers">નાણાકીય સંખ્યાઓ</type>
-			<type type="fullwide" key="numbers">પૂર્ણ પહોળાઈ અંકો</type>
-			<type type="gb2312han" key="collation">સરળીકૃત ચાઇનીઝ સૉર્ટ ક્રમ - GB2312</type>
-			<type type="geor" key="numbers">જ્યોર્જિઅન સંખ્યાઓ</type>
-			<type type="gregorian" key="calendar">ગ્રેગોરિઅન કેલેન્ડર</type>
-			<type type="grek" key="numbers">ગ્રિક સંખ્યાઓ</type>
-			<type type="greklow" key="numbers">ગ્રિક નાના અક્ષરની સંખ્યાઓ</type>
-			<type type="gujr" key="numbers">ગુજરાતી અંકો</type>
-			<type type="guru" key="numbers">ગુરમુખી અંકો</type>
-			<type type="hanidec" key="numbers">ચાઇનીઝ દશાંશ સંખ્યા</type>
-			<type type="hans" key="numbers">સરળીકૃત ચાઇનીઝ સંખ્યાઓ</type>
-			<type type="hansfin" key="numbers">સરળીકૃત ચાઇનીઝ નાણાકિય સંખ્યાઓ</type>
-			<type type="hant" key="numbers">પરંપરાગત ચાઇનીઝ સંખ્યાઓ</type>
-			<type type="hantfin" key="numbers">પરંપરાગત ચાઇનીઝ નાણાંકીય સંખ્યાઓ</type>
-			<type type="hebr" key="numbers">હિબ્રુ સંખ્યાઓ</type>
-			<type type="hebrew" key="calendar">હિબ્રુ કેલેન્ડર</type>
-			<type type="identical" key="colStrength">બધા સૉર્ટ કરો</type>
-			<type type="indian" key="calendar">ભારતીય રાષ્ટ્રીય કેલેન્ડર</type>
-			<type type="islamic" key="calendar">ઇસ્લામિક કેલેન્ડર</type>
-			<type type="islamic-civil" key="calendar">ઇસ્લામિક-નાગરિક કેલેન્ડર</type>
-			<type type="iso8601" key="calendar">ISO-8601 કેલેન્ડર</type>
-			<type type="japanese" key="calendar">જાપાનિઝ કેલેન્ડર</type>
-			<type type="jpan" key="numbers">જાપાનીઝ સંખ્યાઓ</type>
-			<type type="jpanfin" key="numbers">જાપાનીઝ નાણાકિય સંખ્યાઓ</type>
-			<type type="khmr" key="numbers">ખેમેર અંકો</type>
-			<type type="knda" key="numbers">કન્નડા અંકો</type>
-			<type type="laoo" key="numbers">લાઓ અંકો</type>
-			<type type="latn" key="numbers">પશ્ચિમી અંકો</type>
-			<type type="lower" key="colCaseFirst">પ્રથમ લોઅરકેસ સૉર્ટ કરો</type>
-			<type type="mlym" key="numbers">મલયાલમ અંકો</type>
-			<type type="mong" key="numbers">મોંગોલિયન અંકો</type>
-			<type type="mymr" key="numbers">મ્યાન્માર અંકો</type>
-			<type type="native" key="numbers">મૂળ અંકો</type>
-			<type type="no" key="colBackwards">ઉચ્ચારોને સામાન્ય રીતે સૉર્ટ કરો</type>
-			<type type="no" key="colCaseFirst">સામાન્ય કેસના ક્રમમાં સૉર્ટ કરો</type>
-			<type type="no" key="colCaseLevel">કેસ સંવેદીને સૉર્ટ કરો</type>
-			<type type="no" key="colHiraganaQuaternary">કાનાને અલગ સૉર્ટ કરો</type>
-			<type type="no" key="colNormalization">સામાન્યકૃત વિના સૉર્ટ કરો</type>
-			<type type="no" key="colNumeric">અંકોને અલગથી સૉર્ટ કરોવ્યક્તિગત રીતે ક્રમમાં ગોઠવો અંકો</type>
-			<type type="non-ignorable" key="colAlternate">પ્રતીકોને સૉર્ટ કરો</type>
-			<type type="orya" key="numbers">ઓરિયા અંકો</type>
-			<type type="persian" key="calendar">પર્શિયન કેલેન્ડર</type>
-			<type type="phonebook" key="collation">ફોનબુક અનુક્મ</type>
-			<type type="phonetic" key="collation">ધ્વન્યાત્મક સૉર્ટ ક્રમ</type>
-			<type type="pinyin" key="collation">પિનયિન અનુક્મ</type>
-			<type type="primary" key="colStrength">ફક્ત આધાર અક્ષરોને સૉર્ટ કરો</type>
-			<type type="quaternary" key="colStrength">ઉચ્ચારો/કેસ/પહોળાઈ/કાના સૉર્ટ કરો</type>
-			<type type="reformed" key="collation">પૂનર્સ્વરૂપિત અનુક્મ</type>
-			<type type="roc" key="calendar">મિંગુઓ કેલેન્ડર</type>
-			<type type="roman" key="numbers">રોમન સંખ્યાઓ</type>
-			<type type="romanlow" key="numbers">રોમન નાના અક્ષરની સંખ્યા</type>
-			<type type="search" key="collation">સામાન્ય-ઉદ્દેશ શોધ</type>
-			<type type="searchjl" key="collation">હંગુલ પ્રારંભિક વ્યંજન દ્વારા શોધો</type>
-			<type type="secondary" key="colStrength">ઉચ્ચારો સૉર્ટ કરો</type>
-			<type type="shifted" key="colAlternate">પ્રતીકોને અવગણીને સૉર્ટ કરો</type>
-			<type type="standard" key="collation">માનક સૉર્ટ ક્રમ</type>
-			<type type="stroke" key="collation">સ્ટ્રોક અનુક્મ</type>
-			<type type="taml" key="numbers">પારંપરિક તમિલ સંખ્યાઓ</type>
-			<type type="tamldec" key="numbers">તમિલ અંકો</type>
-			<type type="telu" key="numbers">તેલુગુ અંકો</type>
-			<type type="tertiary" key="colStrength">ઉચ્ચારો/કેસ/પહોળાઈ સૉર્ટ કરો</type>
-			<type type="thai" key="numbers">થાઇ અંકો</type>
-			<type type="tibt" key="numbers">તિબેટિયન અંકો</type>
-			<type type="traditional" key="collation">પરંપરાગત અનુક્મ</type>
-			<type type="traditional" key="numbers">પરંપરાગત અંકો</type>
-			<type type="unihan" key="collation">રેડિકલ-સ્ટ્રોક</type>
-			<type type="upper" key="colCaseFirst">પ્રથમ અપરકેસ સૉર્ટ કરો</type>
-			<type type="vaii" key="numbers">વાઇ અંકો</type>
-			<type type="yes" key="colBackwards">ઉચ્ચારોને વિપરીત સૉર્ટ કરો</type>
-			<type type="yes" key="colCaseLevel">કેસ સંવેદી સૉર્ટ કરો</type>
-			<type type="yes" key="colHiraganaQuaternary">કાનાને અલગ રીતે સૉર્ટ કરો</type>
-			<type type="yes" key="colNormalization">યુનિકોડ સામાન્યકૃતને સૉર્ટ કરો</type>
-			<type type="yes" key="colNumeric">અંકોને સંખ્યાત્મક રીતે સૉર્ટ કરો</type>
+			<type key="calendar" type="buddhist">બુદ્ધિસ્ટ કેલેન્ડર</type>
+			<type key="calendar" type="chinese">ચાઇનિઝ કેલેન્ડર</type>
+			<type key="calendar" type="coptic">કોપ્ટિક કેલેન્ડર</type>
+			<type key="calendar" type="dangi">ડાંગી કેલેન્ડર</type>
+			<type key="calendar" type="ethiopic">ઇથિઓપિક કેલેન્ડર</type>
+			<type key="calendar" type="ethiopic-amete-alem">ઇથિઓપિક એમેટ એલેમ કેલેન્ડર</type>
+			<type key="calendar" type="gregorian">ગ્રેગોરિઅન કેલેન્ડર</type>
+			<type key="calendar" type="hebrew">હિબ્રુ કેલેન્ડર</type>
+			<type key="calendar" type="indian">ભારતીય રાષ્ટ્રીય કેલેન્ડર</type>
+			<type key="calendar" type="islamic">ઇસ્લામિક કેલેન્ડર</type>
+			<type key="calendar" type="islamic-civil">ઇસ્લામિક-નાગરિક કેલેન્ડર</type>
+			<type key="calendar" type="iso8601">ISO-8601 કેલેન્ડર</type>
+			<type key="calendar" type="japanese">જાપાનિઝ કેલેન્ડર</type>
+			<type key="calendar" type="persian">પર્શિયન કેલેન્ડર</type>
+			<type key="calendar" type="roc">મિંગુઓ કેલેન્ડર</type>
+			<type key="colAlternate" type="non-ignorable">પ્રતીકોને સૉર્ટ કરો</type>
+			<type key="colAlternate" type="shifted">પ્રતીકોને અવગણીને સૉર્ટ કરો</type>
+			<type key="colBackwards" type="no">ઉચ્ચારોને સામાન્ય રીતે સૉર્ટ કરો</type>
+			<type key="colBackwards" type="yes">ઉચ્ચારોને વિપરીત સૉર્ટ કરો</type>
+			<type key="colCaseFirst" type="lower">પ્રથમ લોઅરકેસ સૉર્ટ કરો</type>
+			<type key="colCaseFirst" type="no">સામાન્ય કેસના ક્રમમાં સૉર્ટ કરો</type>
+			<type key="colCaseFirst" type="upper">પ્રથમ અપરકેસ સૉર્ટ કરો</type>
+			<type key="colCaseLevel" type="no">કેસ સંવેદીને સૉર્ટ કરો</type>
+			<type key="colCaseLevel" type="yes">કેસ સંવેદી સૉર્ટ કરો</type>
+			<type key="colHiraganaQuaternary" type="no">કાનાને અલગ સૉર્ટ કરો</type>
+			<type key="colHiraganaQuaternary" type="yes">કાનાને અલગ રીતે સૉર્ટ કરો</type>
+			<type key="collation" type="big5han">પરંપરાગત ચાઇનિઝ સોર્ટ ક્રમબદ્ધ</type>
+			<type key="collation" type="dictionary">શબ્દકોશ અનુક્મ</type>
+			<type key="collation" type="ducet">ડિફોલ્ટ યુનિકોડ સૉર્ટ ક્રમ</type>
+			<type key="collation" type="gb2312han">સરળીકૃત ચાઇનીઝ સૉર્ટ ક્રમ - GB2312</type>
+			<type key="collation" type="phonebook">ફોનબુક અનુક્મ</type>
+			<type key="collation" type="phonetic">ધ્વન્યાત્મક સૉર્ટ ક્રમ</type>
+			<type key="collation" type="pinyin">પિનયિન અનુક્મ</type>
+			<type key="collation" type="reformed">પૂનર્સ્વરૂપિત અનુક્મ</type>
+			<type key="collation" type="search">સામાન્ય-ઉદ્દેશ શોધ</type>
+			<type key="collation" type="searchjl">હંગુલ પ્રારંભિક વ્યંજન દ્વારા શોધો</type>
+			<type key="collation" type="standard">માનક સૉર્ટ ક્રમ</type>
+			<type key="collation" type="stroke">સ્ટ્રોક અનુક્મ</type>
+			<type key="collation" type="traditional">પરંપરાગત અનુક્મ</type>
+			<type key="collation" type="unihan">રેડિકલ-સ્ટ્રોક</type>
+			<type key="colNormalization" type="no">સામાન્યકૃત વિના સૉર્ટ કરો</type>
+			<type key="colNormalization" type="yes">યુનિકોડ સામાન્યકૃતને સૉર્ટ કરો</type>
+			<type key="colNumeric" type="no">અંકોને અલગથી સૉર્ટ કરોવ્યક્તિગત રીતે ક્રમમાં ગોઠવો અંકો</type>
+			<type key="colNumeric" type="yes">અંકોને સંખ્યાત્મક રીતે સૉર્ટ કરો</type>
+			<type key="colStrength" type="identical">બધા સૉર્ટ કરો</type>
+			<type key="colStrength" type="primary">ફક્ત આધાર અક્ષરોને સૉર્ટ કરો</type>
+			<type key="colStrength" type="quaternary">ઉચ્ચારો/કેસ/પહોળાઈ/કાના સૉર્ટ કરો</type>
+			<type key="colStrength" type="secondary">ઉચ્ચારો સૉર્ટ કરો</type>
+			<type key="colStrength" type="tertiary">ઉચ્ચારો/કેસ/પહોળાઈ સૉર્ટ કરો</type>
+			<type key="hc" type="h11">12 કલાકની સિસ્ટમ (0–11)</type>
+			<type key="hc" type="h12">12 કલાકની સિસ્ટમ (1–12)</type>
+			<type key="hc" type="h23">24 કલાકની સિસ્ટમ (0–23)</type>
+			<type key="hc" type="h24">24 કલાકની સિસ્ટમ (1–24)</type>
+			<type key="lb" type="loose">શિથિલ રેખા વિરામ પ્રકાર</type>
+			<type key="lb" type="normal">સામાન્ય રેખા વિરામ પ્રકાર</type>
+			<type key="lb" type="strict">ચુસ્ત રેખા વિરામ પ્રકાર</type>
+			<type key="ms" type="metric">દશાંશ પદ્ધતિ</type>
+			<type key="ms" type="uksystem">રજવાડું માપદંડ પદ્ધતિ</type>
+			<type key="ms" type="ussystem">અમેરિકન માપદંડ પદ્ધતિ</type>
+			<type key="numbers" type="arab">અરેબિક-ભારતીય અંકો</type>
+			<type key="numbers" type="arabext">વિસ્તૃત અરેબિક-ઇન્ડિક અંકો</type>
+			<type key="numbers" type="armn">અર્મેનિયન સંખ્યાઓ</type>
+			<type key="numbers" type="armnlow">અર્મેનિયન નાના અક્ષરની સંખ્યાઓ</type>
+			<type key="numbers" type="beng">બંગાળી અંકો</type>
+			<type key="numbers" type="deva">દેવનાગરી</type>
+			<type key="numbers" type="ethi">ઇથિયોપીક સંખ્યાઓ</type>
+			<type key="numbers" type="finance">નાણાકીય સંખ્યાઓ</type>
+			<type key="numbers" type="fullwide">પૂર્ણ પહોળાઈ અંકો</type>
+			<type key="numbers" type="geor">જ્યોર્જિઅન સંખ્યાઓ</type>
+			<type key="numbers" type="grek">ગ્રિક સંખ્યાઓ</type>
+			<type key="numbers" type="greklow">ગ્રિક નાના અક્ષરની સંખ્યાઓ</type>
+			<type key="numbers" type="gujr">ગુજરાતી અંકો</type>
+			<type key="numbers" type="guru">ગુરમુખી અંકો</type>
+			<type key="numbers" type="hanidec">ચાઇનીઝ દશાંશ સંખ્યા</type>
+			<type key="numbers" type="hans">સરળીકૃત ચાઇનીઝ સંખ્યાઓ</type>
+			<type key="numbers" type="hansfin">સરળીકૃત ચાઇનીઝ નાણાંકીય સંખ્યાઓ</type>
+			<type key="numbers" type="hant">પરંપરાગત ચાઇનીઝ સંખ્યાઓ</type>
+			<type key="numbers" type="hantfin">પરંપરાગત ચાઇનીઝ નાણાંકીય સંખ્યાઓ</type>
+			<type key="numbers" type="hebr">હિબ્રુ સંખ્યાઓ</type>
+			<type key="numbers" type="jpan">જાપાનીઝ સંખ્યાઓ</type>
+			<type key="numbers" type="jpanfin">જાપાનીઝ નાણાકીય સંખ્યાઓ</type>
+			<type key="numbers" type="khmr">ખેમેર અંકો</type>
+			<type key="numbers" type="knda">કન્નડા અંકો</type>
+			<type key="numbers" type="laoo">લાઓ અંકો</type>
+			<type key="numbers" type="latn">પશ્ચિમી અંકો</type>
+			<type key="numbers" type="mlym">મલયાલમ અંકો</type>
+			<type key="numbers" type="mong">મોંગોલિયન અંકો</type>
+			<type key="numbers" type="mymr">મ્યાન્માર અંકો</type>
+			<type key="numbers" type="native">મૂળ અંકો</type>
+			<type key="numbers" type="orya">ઓરિયા અંકો</type>
+			<type key="numbers" type="roman">રોમન સંખ્યાઓ</type>
+			<type key="numbers" type="romanlow">રોમન નાના અક્ષરની સંખ્યા</type>
+			<type key="numbers" type="taml">પારંપરિક તમિલ સંખ્યાઓ</type>
+			<type key="numbers" type="tamldec">તમિલ અંકો</type>
+			<type key="numbers" type="telu">તેલુગુ અંકો</type>
+			<type key="numbers" type="thai">થાઇ અંકો</type>
+			<type key="numbers" type="tibt">તિબેટિયન અંકો</type>
+			<type key="numbers" type="traditional">પરંપરાગત અંકો</type>
+			<type key="numbers" type="vaii">વાઇ અંકો</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN">BGN</transformName>
@@ -1095,7 +1112,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</measurementSystemNames>
 		<codePatterns>
 			<codePattern type="language">ભાષા: {0}</codePattern>
-			<codePattern type="script">સ્ક્રીપ્ટ: {0}</codePattern>
+			<codePattern type="script">સ્ક્રિપ્ટ: {0}</codePattern>
 			<codePattern type="territory">પ્રદેશ: {0}</codePattern>
 		</codePatterns>
 	</localeDisplayNames>
@@ -1166,6 +1183,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">G y</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM G y</dateFormatItem>
@@ -1245,7 +1263,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
 							<greatestDifference id="d">E, d/M–E, d/M</greatestDifference>
-							<greatestDifference id="M">E,d/M–E,d/M</greatestDifference>
+							<greatestDifference id="M">E, d/M – E, d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
 							<greatestDifference id="M">MMM–MMM</greatestDifference>
@@ -1255,34 +1273,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d MMM–E, d MMM</greatestDifference>
+							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
 							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
 							<greatestDifference id="y">G y–y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M/y – M/y</greatestDifference>
-							<greatestDifference id="y">M/y – M/y</greatestDifference>
+							<greatestDifference id="M">GGGG M/y – M/y</greatestDifference>
+							<greatestDifference id="y">GGGG M/y – M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d/M/y–d/M/y</greatestDifference>
-							<greatestDifference id="M">d/M/y–d/M/y</greatestDifference>
-							<greatestDifference id="y">d/M/y–d/M/y</greatestDifference>
+							<greatestDifference id="d">GGGG d/M/y–d/M/y</greatestDifference>
+							<greatestDifference id="M">GGGG d/M/y–d/M/y</greatestDifference>
+							<greatestDifference id="y">GGGG d/M/y–d/M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E,d/M/y– E,d/M/y</greatestDifference>
-							<greatestDifference id="M">E,d/M/y– E,d/M/y</greatestDifference>
-							<greatestDifference id="y">E,d/M/y–E,d/M/y</greatestDifference>
+							<greatestDifference id="d">GGGG E,d/M/y– E,d/M/y</greatestDifference>
+							<greatestDifference id="M">GGGG E,d/M/y– E,d/M/y</greatestDifference>
+							<greatestDifference id="y">GGGG E,d/M/y–E,d/M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM–MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
+							<greatestDifference id="M">G MMM–MMM y</greatestDifference>
+							<greatestDifference id="y">G y MMM – y MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d–d MMM,y</greatestDifference>
-							<greatestDifference id="M">d MMM–d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM,y–d MMM,y</greatestDifference>
+							<greatestDifference id="d">G d–d MMM,y</greatestDifference>
+							<greatestDifference id="M">G d MMM–d MMM y</greatestDifference>
+							<greatestDifference id="y">G d MMM,y–d MMM,y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
 							<greatestDifference id="d">E, d MMM–E, d MMM G y</greatestDifference>
@@ -1291,7 +1309,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
 							<greatestDifference id="M">MMMM–MMMM G y</greatestDifference>
-							<greatestDifference id="y">MMMM y – MMMM y</greatestDifference>
+							<greatestDifference id="y">G MMMM y – MMMM y</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -1307,7 +1325,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="5">મે</month>
 							<month type="6">જૂન</month>
 							<month type="7">જુલાઈ</month>
-							<month type="8">ઑગ</month>
+							<month type="8">ઑગસ્ટ</month>
 							<month type="9">સપ્ટે</month>
 							<month type="10">ઑક્ટો</month>
 							<month type="11">નવે</month>
@@ -1509,15 +1527,61 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">મધ્યરાત્રિ</dayPeriod>
 							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="noon">મધ્યાહ્ન</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">સવાર</dayPeriod>
+							<dayPeriod type="afternoon1">બપોર</dayPeriod>
+							<dayPeriod type="evening1">સાંજ</dayPeriod>
+							<dayPeriod type="night1">રાત્રિ</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">મ.રાત્રિ</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">સ</dayPeriod>
+							<dayPeriod type="afternoon1">બ</dayPeriod>
+							<dayPeriod type="evening1">સાં</dayPeriod>
+							<dayPeriod type="night1">રા</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">મધ્યરાત્રિ</dayPeriod>
 							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="noon">મધ્યાહ્ન</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">સવાર</dayPeriod>
+							<dayPeriod type="afternoon1">બપોર</dayPeriod>
+							<dayPeriod type="evening1">સાંજ</dayPeriod>
+							<dayPeriod type="night1">રાત્રિ</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">મધ્યરાત્રિ</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">સવાર</dayPeriod>
+							<dayPeriod type="afternoon1">બપોર</dayPeriod>
+							<dayPeriod type="evening1">સાંજ</dayPeriod>
+							<dayPeriod type="night1">રાત્રિ</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">મધ્યરાત્રિ</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">સવાર</dayPeriod>
+							<dayPeriod type="afternoon1">બપોર</dayPeriod>
+							<dayPeriod type="evening1">સાંજ</dayPeriod>
+							<dayPeriod type="night1">રાત્રિ</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">મધ્યરાત્રિ</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">સવાર</dayPeriod>
+							<dayPeriod type="afternoon1">બપોર</dayPeriod>
+							<dayPeriod type="evening1">સાંજ</dayPeriod>
+							<dayPeriod type="night1">રાત્રિ</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1529,10 +1593,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<era type="1" alt="variant">સામાન્ય યુગ</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0">ઈસુના જન્મ પહેલા</era>
-						<era type="0" alt="variant">સામાન્ય યુગ પહેલા</era>
-						<era type="1">ઇસવીસન</era>
-						<era type="1" alt="variant">સામાન્ય યુગ</era>
+						<era type="0">ઈ.સ.પૂર્વે</era>
+						<era type="0" alt="variant">સા.યુ.પ.</era>
+						<era type="1">ઈ.સ.</era>
+						<era type="1" alt="variant">સા.યુ.</era>
 					</eraAbbr>
 					<eraNarrow>
 						<era type="0">ઇ સ પુ</era>
@@ -1622,6 +1686,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
@@ -1743,6 +1811,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
+			<calendar type="indian">
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="Md">d/M</dateFormatItem>
+						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
+						<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
+						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
 		</calendars>
 		<fields>
 			<field type="era">
@@ -1763,7 +1843,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="year-short">
-				<displayName>વર્ષ</displayName>
+				<displayName>વ.</displayName>
+				<relative type="-1">ગયા વર્ષે</relative>
+				<relative type="0">આ વર્ષે</relative>
+				<relative type="1">આવતા વર્ષે</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} વર્ષમાં</relativeTimePattern>
 					<relativeTimePattern count="other">{0} વર્ષમાં</relativeTimePattern>
@@ -1774,29 +1857,32 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="year-narrow">
-				<displayName>વર્ષ</displayName>
+				<displayName>વ.</displayName>
+				<relative type="-1">ગયા વર્ષે</relative>
+				<relative type="0">આ વર્ષે</relative>
+				<relative type="1">આવતા વર્ષે</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">+{0} વર્ષ</relativeTimePattern>
+					<relativeTimePattern count="one">{0} વર્ષમાં</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} વર્ષ</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} વર્ષ</relativeTimePattern>
+					<relativeTimePattern count="one">{0} વર્ષ પહેલા</relativeTimePattern>
 					<relativeTimePattern count="other">-{0} વર્ષ</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter">
-				<displayName>ક્વાર્ટર</displayName>
+				<displayName>ત્રિમાસિક</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} ત્રિમાસમાં</relativeTimePattern>
-					<relativeTimePattern count="other">{0} ત્રિમાસમાં</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ત્રિમાસિકમાં</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ત્રિમાસિકમાં</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} ત્રિમાસ પહેલાં</relativeTimePattern>
-					<relativeTimePattern count="other">{0} ત્રિમાસ પહેલાં</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ત્રિમાસિક પહેલા</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ત્રિમાસિક પહેલા</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-short">
-				<displayName>ક્વા.</displayName>
+				<displayName>ત્રિમાસ.</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ત્રિમાસમાં</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ત્રિમાસમાં</relativeTimePattern>
@@ -1807,7 +1893,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="quarter-narrow">
-				<displayName>ક્વા.</displayName>
+				<displayName>ત્રિમાસ.</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} ત્રિમાસ</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} ત્રિમાસ</relativeTimePattern>
@@ -1833,6 +1919,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>મ.</displayName>
+				<relative type="-1">ગયા મહિને</relative>
+				<relative type="0">આ મહિને</relative>
+				<relative type="1">આવતા મહિને</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} મહિનામાં</relativeTimePattern>
 					<relativeTimePattern count="other">{0} મહિનામાં</relativeTimePattern>
@@ -1844,6 +1933,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>મ.</displayName>
+				<relative type="-1">ગયા મહિને</relative>
+				<relative type="0">આ મહિને</relative>
+				<relative type="1">આવતા મહિને</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} મહિના</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} મહિના</relativeTimePattern>
@@ -1869,6 +1961,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>અઠ.</displayName>
+				<relative type="-1">ગયા અઠવાડિયે</relative>
+				<relative type="0">આ અઠવાડિયે</relative>
+				<relative type="1">આવતા અઠવાડિયે</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} અઠવાડિયામાં</relativeTimePattern>
 					<relativeTimePattern count="other">{0} અઠવાડિયામાં</relativeTimePattern>
@@ -1880,6 +1975,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>અઠ.</displayName>
+				<relative type="-1">ગયા અઠવાડિયે</relative>
+				<relative type="0">આ અઠવાડિયે</relative>
+				<relative type="1">આવતા અઠવાડિયે</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} અઠવાડિયા</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} અઠવાડિયા</relativeTimePattern>
@@ -1901,29 +1999,39 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">{0} દિવસમાં</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} દિવસ પહેલા</relativeTimePattern>
+					<relativeTimePattern count="one">{0} દિવસ પહેલાં</relativeTimePattern>
 					<relativeTimePattern count="other">{0} દિવસ પહેલા</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day-short">
 				<displayName>દિ.</displayName>
+				<relative type="-2">ગયા પરમદિવસે</relative>
+				<relative type="-1">ગઈકાલે</relative>
+				<relative type="0">આજે</relative>
+				<relative type="1">આવતીકાલે</relative>
+				<relative type="2">પરમદિવસે</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} દિવસમાં</relativeTimePattern>
 					<relativeTimePattern count="other">{0} દિવસમાં</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} દિવસ પહેલા</relativeTimePattern>
+					<relativeTimePattern count="one">{0} દિવસ પહેલાં</relativeTimePattern>
 					<relativeTimePattern count="other">{0} દિવસ પહેલા</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day-narrow">
-				<displayName>દિ.</displayName>
+				<displayName>દિવસ</displayName>
+				<relative type="-2">ગયા પરમદિવસે</relative>
+				<relative type="-1">ગઈકાલે</relative>
+				<relative type="0">આજે</relative>
+				<relative type="1">આવતીકાલે</relative>
+				<relative type="2">પરમદિવસે</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} દિવસ</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} દિવસ</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} દિવસ</relativeTimePattern>
+					<relativeTimePattern count="one">{0} દિવસ પહેલાં</relativeTimePattern>
 					<relativeTimePattern count="other">-{0} દિવસ</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -2061,7 +2169,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="hour-narrow">
-				<displayName>ક</displayName>
+				<displayName>ક.</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} કલાકમાં</relativeTimePattern>
 					<relativeTimePattern count="other">{0} કલાકમાં</relativeTimePattern>
@@ -2094,7 +2202,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="minute-narrow">
-				<displayName>મિ</displayName>
+				<displayName>મિ.</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} મિનિટમાં</relativeTimePattern>
 					<relativeTimePattern count="other">{0} મિનિટમાં</relativeTimePattern>
@@ -2117,7 +2225,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="second-short">
-				<displayName>સેકન્ડ</displayName>
+				<displayName>સે.</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} સેકંડમાં</relativeTimePattern>
 					<relativeTimePattern count="other">{0} સેકંડમાં</relativeTimePattern>
@@ -2128,7 +2236,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="second-narrow">
-				<displayName>સે</displayName>
+				<displayName>સે.</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} સેકંડમાં</relativeTimePattern>
 					<relativeTimePattern count="other">{0} સેકંડમાં</relativeTimePattern>
@@ -2719,7 +2827,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</zone>
 			<zone type="Europe/Dublin">
 				<long>
-					<daylight>આઇરિશ ગ્રીષ્મ સમય</daylight>
+					<daylight>આઈરિશ માનક સમય</daylight>
 				</long>
 				<exemplarCity>ડબલિન</exemplarCity>
 			</zone>
@@ -3017,6 +3125,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>પોર્ટ મોર્સ્બી</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>બૌગેઈનવિલે</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>મનિલા</exemplarCity>
 			</zone>
@@ -3101,6 +3212,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>ઇર્કુત્સ્ક</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>ચિતા</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>યકુત્સક</exemplarCity>
 			</zone>
@@ -3119,6 +3233,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>મેગાડન</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>સ્રેડ્નેકોલીમ્સ્ક</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>કામચટ્કા</exemplarCity>
 			</zone>
@@ -3456,7 +3573,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="America_Central">
 				<long>
 					<generic>ઉત્તર અમેરિકન મધ્ય સમય</generic>
-					<standard>ઉત્તર અમેરિકન મધ્ય પ્રમાણભૂત સમય</standard>
+					<standard>ઉત્તર અમેરિકન કેન્દ્રિય પ્રમાણભૂત સમય</standard>
 					<daylight>ઉત્તર અમેરિકન મધ્ય દિવસ સમય</daylight>
 				</long>
 			</metazone>
@@ -3490,8 +3607,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic>અપિયા સમય</generic>
-					<standard>અપિયા માનક સમય</standard>
+					<generic>એપિયા સમય</generic>
+					<standard>એપિયા પ્રમાણભૂત સમય</standard>
 					<daylight>અપિયા દિવસ સમય</daylight>
 				</long>
 			</metazone>
@@ -3729,7 +3846,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
 				<long>
-					<standard>વધુ પૂર્વીય યુરોપીયન સમય</standard>
+					<standard>આગળનું-પૂર્વીય યુરોપીયન સમય</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
@@ -4361,6 +4478,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<native>gujr</native>
 		</otherNumberingSystems>
 		<minimumGroupingDigits draft="contributed">1</minimumGroupingDigits>
+		<symbols numberSystem="arab">
+			<decimal draft="contributed">٫</decimal>
+		</symbols>
 		<symbols numberSystem="latn">
 			<decimal>.</decimal>
 			<group>,</group>
@@ -4461,6 +4581,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##,##0.00;(¤#,##,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">¤0 હજાર</pattern>
+					<pattern type="1000" count="other">¤0 હજાર</pattern>
+					<pattern type="10000" count="one">¤00 હજાર</pattern>
+					<pattern type="10000" count="other">¤00 હજાર</pattern>
+					<pattern type="100000" count="one">¤0 લાખ</pattern>
+					<pattern type="100000" count="other">¤0 લાખ</pattern>
+					<pattern type="1000000" count="one">¤00 લાખ</pattern>
+					<pattern type="1000000" count="other">¤00 લાખ</pattern>
+					<pattern type="10000000" count="one">¤0 કરોડ</pattern>
+					<pattern type="10000000" count="other">¤0 કરોડ</pattern>
+					<pattern type="100000000" count="one">¤00 કરોડ</pattern>
+					<pattern type="100000000" count="other">¤00 કરોડ</pattern>
+					<pattern type="1000000000" count="one">¤0 અબજ</pattern>
+					<pattern type="1000000000" count="other">¤0 અબજ</pattern>
+					<pattern type="10000000000" count="one">¤00 અબજ</pattern>
+					<pattern type="10000000000" count="other">¤00 અબજ</pattern>
+					<pattern type="100000000000" count="one">¤0 નિખર્વ</pattern>
+					<pattern type="100000000000" count="other">¤0 નિખર્વ</pattern>
+					<pattern type="1000000000000" count="one">¤0 મહાપદ્મ</pattern>
+					<pattern type="1000000000000" count="other">¤0 મહાપદ્મ</pattern>
+					<pattern type="10000000000000" count="one">¤0 શંકુ</pattern>
+					<pattern type="10000000000000" count="other">¤0 શંકુ</pattern>
+					<pattern type="100000000000000" count="one">¤0 જલધિ</pattern>
+					<pattern type="100000000000000" count="other">¤0 જલધિ</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4500,6 +4648,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">અંગોલિયન ક્વાન્ઝા</displayName>
 				<displayName count="other">અંગોલિયન ક્વાન્ઝા</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="ARS">
 				<displayName>અર્જેન્ટીના પેસો</displayName>
@@ -4532,6 +4681,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">બોસ્નિયા અને હર્ઝેગોવિના રૂપાંતર યોગ્ય માર્ક</displayName>
 				<displayName count="other">બોસ્નિયા અને હર્ઝેગોવિના રૂપાંતર યોગ્ય માર્ક</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>બાર્બાડિયન ડોલર</displayName>
@@ -4584,6 +4734,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">બોલિવિયન બોલિવિયાનો</displayName>
 				<displayName count="other">બોલિવિયન બોલિવિયાનો</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BRL">
 				<displayName>બ્રાઝિલીયન રિઆલ</displayName>
@@ -4610,6 +4761,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">બોત્સવાનન પુલા</displayName>
 				<displayName count="other">બોત્સવાનન પુલા</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYR">
 				<displayName>બેલારુશિયન રૂબલ</displayName>
@@ -4677,6 +4829,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ક્યુબન રૂપાંતર યોગ્ય પેસો</displayName>
 				<displayName count="other">ક્યુબન રૂપાંતર યોગ્ય પેસો</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>ક્યુબન પેસો</displayName>
@@ -4696,6 +4849,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ચેક રીપબ્લિક કોરુના</displayName>
 				<displayName count="other">ચેક રીપબ્લિક કોરુના</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DJF">
 				<displayName>જિબુટિયન ફ્રેંક</displayName>
@@ -4708,6 +4862,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ડેનિશ ક્રોન</displayName>
 				<displayName count="other">ડેનિશ ક્રોન</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>ડોમિનિકન પેસો</displayName>
@@ -4727,6 +4882,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ઇજિપ્તિયન પાઉન્ડ</displayName>
 				<displayName count="other">ઇજિપ્તિયન પાઉન્ડ</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>એરિટ્રેયન નક્ફા</displayName>
@@ -4759,11 +4915,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ફૉકલેન્ડ આઇલેંડ્સ પાઉન્ડ</displayName>
 				<displayName count="other">ફૉકલેન્ડ આઇલેંડ્સ પાઉન્ડ</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GBP">
-				<displayName>બ્રિટિશ પાઉન્ડ સ્ટર્લિંગ</displayName>
-				<displayName count="one">બ્રિટિશ પાઉન્ડ સ્ટર્લિંગ</displayName>
-				<displayName count="other">બ્રિટિશ પાઉન્ડ સ્ટર્લિંગ</displayName>
+				<displayName>બ્રિટિશ પાઉન્ડ</displayName>
+				<displayName count="one">બ્રિટિશ પાઉન્ડ</displayName>
+				<displayName count="other">બ્રિટિશ પાઉન્ડ્સ</displayName>
 				<symbol>£</symbol>
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
@@ -4772,6 +4929,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">જ્યોર્જિઅન લારી</displayName>
 				<displayName count="other">જ્યોર્જિઅન લારી</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHS">
 				<displayName>ઘાનાઇયન સેડી</displayName>
@@ -4797,12 +4955,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ગિનીયન ફ્રેંક</displayName>
 				<displayName count="other">ગિનીયન ફ્રેંક</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GTQ">
 				<displayName>ગ્વાટેમાલા કુઇટ્ઝલ</displayName>
 				<displayName count="one">ગ્વાટેમાલા કુઇટ્ઝલ</displayName>
 				<displayName count="other">ગ્વાટેમાલા કુઇટ્ઝલ</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GYD">
 				<displayName>ગયાનિઝ ડોલર</displayName>
@@ -4823,12 +4983,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">હોન્ડ્યુરન લેમ્પિરા</displayName>
 				<displayName count="other">હોન્ડ્યુરન લેમ્પિરા</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRK">
 				<displayName>ક્રોએશિયન ક્યુના</displayName>
 				<displayName count="one">ક્રોએશિયન ક્યુના</displayName>
 				<displayName count="other">ક્રોએશિયન ક્યુના</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>હાઇટિઇન ગોર્ડ</displayName>
@@ -4841,12 +5003,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">હંગેરીયન ફોરિન્ત</displayName>
 				<displayName count="other">હંગેરીયન ફોરિન્ત</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>ઇન્ડોનેશિયન રૂપિયા</displayName>
 				<displayName count="one">ઇન્ડોનેશિયન રૂપિયા</displayName>
 				<displayName count="other">ઇન્ડોનેશિયન રૂપિયા</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="ILS">
 				<displayName>ઇઝરાયેલી ન્યુ શેકલ</displayName>
@@ -4879,6 +5043,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">આઇસલેન્ડિક ક્રોના</displayName>
 				<displayName count="other">આઇસલેન્ડિક ક્રોના</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="JMD">
 				<displayName>જમૈકિયન ડોલર</displayName>
@@ -4924,12 +5089,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">કોમોરિઅન ફ્રેંક</displayName>
 				<displayName count="other">કોમોરિઅન ફ્રેંક</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>ઉત્તર કોરિયન વન</displayName>
 				<displayName count="one">ઉત્તર કોરિયન વન</displayName>
 				<displayName count="other">ઉત્તર કોરિયન વન</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>દક્ષિણ કોરિયન વન</displayName>
@@ -4970,12 +5137,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">લેબેનિઝ પાઉન્ડ</displayName>
 				<displayName count="other">લેબેનિઝ પાઉન્ડ</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>શ્રી લંકન રૂપી</displayName>
 				<displayName count="one">શ્રી લંકન રૂપી</displayName>
 				<displayName count="other">શ્રી લંકન રૂપી</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>લિબેરિયન ડોલર</displayName>
@@ -5022,6 +5191,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">માલાગેસી અરીઆરી</displayName>
 				<displayName count="other">માલાગેસી અરીઆરી</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MKD">
 				<displayName>મેસેડોનિયન દિનાર</displayName>
@@ -5034,6 +5204,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">મ્યાંમાર ક્યાત</displayName>
 				<displayName count="other">મ્યાંમાર ક્યાત</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>મોંગોલિયન ટગરિક</displayName>
@@ -5059,6 +5230,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">મોરેશીઅન રૂપી</displayName>
 				<displayName count="other">મોરેશીઅન રૂપી</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">રૂ.</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>માલ્દિવિયન રુફિયા</displayName>
@@ -5084,6 +5256,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">મલેશિયન રિંગ્ગેટ</displayName>
 				<displayName count="other">મલેશિયન રિંગ્ગેટ</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZN">
 				<displayName>મોઝામ્બિકન મેટિકલ</displayName>
@@ -5110,18 +5283,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">નિકારાગુઅન કોર્ડોબા</displayName>
 				<displayName count="other">નિકારાગુઅન કોર્ડોબા</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NOK">
 				<displayName>નૉર્વેજિયન ક્રોન</displayName>
 				<displayName count="one">નૉર્વેજિયન ક્રોન</displayName>
 				<displayName count="other">નૉર્વેજિયન ક્રોન</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>નેપાલિઝ રૂપી</displayName>
 				<displayName count="one">નેપાલિઝ રૂપી</displayName>
 				<displayName count="other">નેપાલિઝ રૂપી</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>ન્યૂઝિલેંડ ડૉલર</displayName>
@@ -5166,12 +5342,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">પાકિસ્તાની રૂપી</displayName>
 				<displayName count="other">પાકિસ્તાની રૂપી</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>પોલિસ ઝ્લોટી</displayName>
 				<displayName count="one">પોલિસ ઝ્લોટી</displayName>
 				<displayName count="other">પોલિસ ઝ્લોટી</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PYG">
 				<displayName>પરાગ્વેયન ગુઆરાની</displayName>
@@ -5199,16 +5377,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>RSD</symbol>
 			</currency>
 			<currency type="RUB">
-				<displayName>રશિયન રબલ</displayName>
-				<displayName count="one">રશિયન રબલ</displayName>
-				<displayName count="other">રશિયન રબલ</displayName>
+				<displayName>રશિયન રૂબલ</displayName>
+				<displayName count="one">રશિયન રૂબલ</displayName>
+				<displayName count="other">રશિયન રૂબલ્સ</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RWF">
 				<displayName>રવાંડન ફ્રેંક</displayName>
 				<displayName count="one">રવાંડન ફ્રેંક</displayName>
 				<displayName count="other">રવાંડન ફ્રેંક</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>સાઉદી રિયાલ</displayName>
@@ -5240,6 +5420,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">સ્વીડિશ ક્રોના</displayName>
 				<displayName count="other">સ્વીડિશ ક્રોના</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>સિંગાપુર ડૉલર</displayName>
@@ -5253,6 +5434,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">સેંટ હેલેના પાઉન્ડ</displayName>
 				<displayName count="other">સેંટ હેલેના પાઉન્ડ</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SLL">
 				<displayName>સિએરા લિઓનિઅન લિઓન</displayName>
@@ -5285,12 +5467,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">સાઓ ટૉમ એન્ડ પ્રિંસાઇપ ડોબ્રા</displayName>
 				<displayName count="other">સાઓ ટૉમ એન્ડ પ્રિંસાઇપ ડોબ્રા</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SYP">
 				<displayName>સાઇરિયન પાઉન્ડ</displayName>
 				<displayName count="one">સાઇરિયન પાઉન્ડ</displayName>
 				<displayName count="other">સાઇરિયન પાઉન્ડ</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>સ્વાઝી લિલાન્ગેની</displayName>
@@ -5303,6 +5487,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">થાઇ બાહ્ત</displayName>
 				<displayName count="other">થાઇ બાહ્ત</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJS">
 				<displayName>તાજિકિસ્તાની સોમોની</displayName>
@@ -5327,6 +5512,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ટોંગન પ’અંગા</displayName>
 				<displayName count="other">ટોંગન પ’અંગા</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TRY">
 				<displayName>તુર્કિશ લિરા</displayName>
@@ -5334,6 +5520,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">તુર્કિશ લિરા</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>ત્રિનિદાદ અને ટોબેગો ડોલર</displayName>
@@ -5393,6 +5580,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">વેનેઝુએલન બોલિવર</displayName>
 				<displayName count="other">વેનેઝુએલન બોલિવર</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>વિયેતનામીસ ડોંગ</displayName>
@@ -5414,9 +5602,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>WST</symbol>
 			</currency>
 			<currency type="XAF">
-				<displayName>[CFA] ફ્રેંક [BEAC]</displayName>
-				<displayName count="one">[CFA] ફ્રેંક [BEAC]</displayName>
-				<displayName count="other">[CFA] ફ્રેંક [BEAC]</displayName>
+				<displayName>મધ્ય આફ્રિકન [CFA] ફ્રેંક</displayName>
+				<displayName count="one">મધ્ય આફ્રિકન [CFA] ફ્રેંક</displayName>
+				<displayName count="other">મધ્ય આફ્રિકન [CFA] ફ્રેંક્સ</displayName>
 				<symbol>FCFA</symbol>
 			</currency>
 			<currency type="XCD">
@@ -5424,11 +5612,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ઇસ્ટ કેરિબિયન ડોલર</displayName>
 				<displayName count="other">ઇસ્ટ કેરિબિયન ડોલર</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XOF">
-				<displayName>[CFA] ફ્રેંક [BCEAO]</displayName>
-				<displayName count="one">[CFA] ફ્રેંક [BCEAO]</displayName>
-				<displayName count="other">[CFA] ફ્રેંક [BCEAO]</displayName>
+				<displayName>પશ્ચિમી આફ્રિકન [CFA] ફ્રેંક</displayName>
+				<displayName count="one">પશ્ચિમી આફ્રિકન [CFA] ફ્રેંક</displayName>
+				<displayName count="other">પશ્ચિમી આફ્રિકન [CFA] ફ્રેંક્સ</displayName>
 				<symbol>CFA</symbol>
 			</currency>
 			<currency type="XPF">
@@ -5453,6 +5642,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">દક્ષિણ આફ્રિકી રેંડ</displayName>
 				<displayName count="other">દક્ષિણ આફ્રિકી રેંડ</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>ઝામ્બિયન ક્વાચા (1968–2012)</displayName>
@@ -5462,6 +5652,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ઝામ્બિયન ક્વાચા</displayName>
 				<displayName count="other">ઝામ્બિયન ક્વાચા</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
@@ -5484,6 +5675,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} મીટર પ્રતિ સેકન્ડ²</unitPattern>
 				<unitPattern count="other">{0} મીટર પ્રતિ સેકન્ડ²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>ક્રાંતિ</displayName>
+				<unitPattern count="one">{0} ક્રાંતિ</unitPattern>
+				<unitPattern count="other">{0} ક્રાંતિ</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>સમત્રિજ્યાકોણ</displayName>
+				<unitPattern count="one">{0} સમત્રિજ્યાકોણ</unitPattern>
+				<unitPattern count="other">{0} સમત્રિજ્યાકોણ</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>અંશ</displayName>
+				<unitPattern count="one">{0} અંશ</unitPattern>
+				<unitPattern count="other">{0} અંશ</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>ચાપમિનિટ</displayName>
 				<unitPattern count="one">{0} ચાપમિનિટ</unitPattern>
@@ -5494,30 +5700,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ચાપસેકન્ડ</unitPattern>
 				<unitPattern count="other">{0} ચાપસેકન્ડ</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>અંશ</displayName>
-				<unitPattern count="one">{0} અંશ</unitPattern>
-				<unitPattern count="other">{0} અંશ</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>સમત્રિજ્યાકોણ</displayName>
-				<unitPattern count="one">{0} સમત્રિજ્યાકોણ</unitPattern>
-				<unitPattern count="other">{0} સમત્રિજ્યાકોણ</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>એકર</displayName>
-				<unitPattern count="one">{0} એકર</unitPattern>
-				<unitPattern count="other">{0} એકર</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>ચોરસ કિલોમીટર</displayName>
+				<unitPattern count="one">{0} ચોરસ કિલોમીટર</unitPattern>
+				<unitPattern count="other">{0} ચોરસ કિલોમીટર</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>હેક્ટર</displayName>
 				<unitPattern count="one">{0} હેક્ટર</unitPattern>
 				<unitPattern count="other">{0} હેક્ટર</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>ચોરસ મીટર</displayName>
+				<unitPattern count="one">{0} ચોરસ મીટર</unitPattern>
+				<unitPattern count="other">{0} ચોરસ મીટર</unitPattern>
+				<perUnitPattern>{0} પ્રતિ ચોરસ મીટર</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>ચોરસ સેન્ટીમીટર</displayName>
 				<unitPattern count="one">{0} ચોરસ સેન્ટીમીટર</unitPattern>
 				<unitPattern count="other">{0} ચોરસ સેન્ટીમીટર</unitPattern>
+				<perUnitPattern>{0} પ્રતિ ચોરસ સેન્ટિમીટર</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>ચોરસ માઇલ</displayName>
+				<unitPattern count="one">{0} ચોરસ માઇલ</unitPattern>
+				<unitPattern count="other">{0} ચોરસ માઇલ</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>એકર</displayName>
+				<unitPattern count="one">{0} એકર</unitPattern>
+				<unitPattern count="other">{0} એકર</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>ચોરસ વાર</displayName>
+				<unitPattern count="one">{0} ચોરસ વાર</unitPattern>
+				<unitPattern count="other">{0} ચોરસ વાર</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ચોરસ ફૂટ</displayName>
@@ -5528,91 +5746,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ચોરસ ઇંચ</displayName>
 				<unitPattern count="one">{0} ચોરસ ઇંચ</unitPattern>
 				<unitPattern count="other">{0} ચોરસ ઇંચ</unitPattern>
+				<perUnitPattern>{0} પ્રતિ ચોરસ ઈંચ</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>ચોરસ કિલોમીટર</displayName>
-				<unitPattern count="one">{0} ચોરસ કિલોમીટર</unitPattern>
-				<unitPattern count="other">{0} ચોરસ કિલોમીટર</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>ચોરસ મીટર</displayName>
-				<unitPattern count="one">{0} ચોરસ મીટર</unitPattern>
-				<unitPattern count="other">{0} ચોરસ મીટર</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>ચોરસ માઇલ</displayName>
-				<unitPattern count="one">{0} ચોરસ માઇલ</unitPattern>
-				<unitPattern count="other">{0} ચોરસ માઇલ</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>ચોરસ વાર</displayName>
-				<unitPattern count="one">{0} ચોરસ વાર</unitPattern>
-				<unitPattern count="other">{0} ચોરસ વાર</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>કૅરેટ</displayName>
+				<unitPattern count="one">{0} કૅરેટ</unitPattern>
+				<unitPattern count="other">{0} કૅરેટ</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>લીટર પ્રતિ કિલોમીટર</displayName>
 				<unitPattern count="one">{0} લીટર પ્રતિ કિલોમીટર</unitPattern>
 				<unitPattern count="other">{0} લીટર પ્રતિ કિલોમીટર</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>લિટર પ્રતિ 100 કિલોમીટર</displayName>
+				<unitPattern count="one">{0} લિટર પ્રતિ 100 કિલોમીટર</unitPattern>
+				<unitPattern count="other">{0} લિટર પ્રતિ 100 કિલોમીટર</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>માઇલ પ્રતિ ગૅલન</displayName>
 				<unitPattern count="one">{0} માઇલ પ્રતિ ગૅલન</unitPattern>
 				<unitPattern count="other">{0} માઇલ પ્રતિ ગૅલન</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>બિટ</displayName>
-				<unitPattern count="one">{0} બિટ</unitPattern>
-				<unitPattern count="other">{0} બિટ</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>બાઇટ</displayName>
-				<unitPattern count="one">{0} બાઇટ</unitPattern>
-				<unitPattern count="other">{0} બાઇટ</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>ગીગાબિટ</displayName>
-				<unitPattern count="one">{0} ગીગાબિટ</unitPattern>
-				<unitPattern count="other">{0} ગીગાબિટ</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>ગીગાબાઇટ</displayName>
-				<unitPattern count="one">{0} ગીગાબાઇટ</unitPattern>
-				<unitPattern count="other">{0} ગીગાબાઇટ</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>કિલોબિટ</displayName>
-				<unitPattern count="one">{0} કિલોબિટ</unitPattern>
-				<unitPattern count="other">{0} કિલોબિટ</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>કિલોબાઇટ</displayName>
-				<unitPattern count="one">{0} કિલોબાઇટ</unitPattern>
-				<unitPattern count="other">{0} કિલોબાઇટ</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>મેગાબિટ</displayName>
-				<unitPattern count="one">{0} મેગાબિટ</unitPattern>
-				<unitPattern count="other">{0} મેગાબિટ</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>મેગાબાઇટ</displayName>
-				<unitPattern count="one">{0} મેગાબાઇટ</unitPattern>
-				<unitPattern count="other">{0} મેગાબાઇટ</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>ટેરાબિટ</displayName>
-				<unitPattern count="one">{0} ટેરાબિટ</unitPattern>
-				<unitPattern count="other">{0} ટેરાબિટ</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>ટેરાબાઇટ</displayName>
 				<unitPattern count="one">{0} ટેરાબાઇટ</unitPattern>
 				<unitPattern count="other">{0} ટેરાબાઇટ</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>ટેરાબિટ</displayName>
+				<unitPattern count="one">{0} ટેરાબિટ</unitPattern>
+				<unitPattern count="other">{0} ટેરાબિટ</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>ગીગાબાઇટ</displayName>
+				<unitPattern count="one">{0} ગીગાબાઇટ</unitPattern>
+				<unitPattern count="other">{0} ગીગાબાઇટ</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>ગીગાબિટ</displayName>
+				<unitPattern count="one">{0} ગીગાબિટ</unitPattern>
+				<unitPattern count="other">{0} ગીગાબિટ</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>મેગાબાઇટ</displayName>
+				<unitPattern count="one">{0} મેગાબાઇટ</unitPattern>
+				<unitPattern count="other">{0} મેગાબાઇટ</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>મેગાબિટ</displayName>
+				<unitPattern count="one">{0} મેગાબિટ</unitPattern>
+				<unitPattern count="other">{0} મેગાબિટ</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>કિલોબાઇટ</displayName>
+				<unitPattern count="one">{0} કિલોબાઇટ</unitPattern>
+				<unitPattern count="other">{0} કિલોબાઇટ</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>કિલોબિટ</displayName>
+				<unitPattern count="one">{0} કિલોબિટ</unitPattern>
+				<unitPattern count="other">{0} કિલોબિટ</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>બાઇટ</displayName>
+				<unitPattern count="one">{0} બાઇટ</unitPattern>
+				<unitPattern count="other">{0} બાઇટ</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>બિટ</displayName>
+				<unitPattern count="one">{0} બિટ</unitPattern>
+				<unitPattern count="other">{0} બિટ</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>સદીઓ</displayName>
+				<unitPattern count="one">{0} સદી</unitPattern>
+				<unitPattern count="other">{0} સદીઓ</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>વર્ષ</displayName>
+				<unitPattern count="one">{0} વર્ષ</unitPattern>
+				<unitPattern count="other">{0} વર્ષ</unitPattern>
+				<perUnitPattern>{0} પ્રતિ વર્ષ</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>મહિના</displayName>
+				<unitPattern count="one">{0} મહિનો</unitPattern>
+				<unitPattern count="other">{0} મહિના</unitPattern>
+				<perUnitPattern>{0} પ્રતિ મહિનો</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>અઠવાડિયા</displayName>
+				<unitPattern count="one">{0} અઠવાડિયું</unitPattern>
+				<unitPattern count="other">{0} અઠવાડિયા</unitPattern>
+				<perUnitPattern>{0} પ્રતિ અઠવાડિયું</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>દિવસ</displayName>
 				<unitPattern count="one">{0} દિવસ</unitPattern>
 				<unitPattern count="other">{0} દિવસ</unitPattern>
+				<perUnitPattern>{0} પ્રતિ દિવસ</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>કલાક</displayName>
@@ -5620,30 +5853,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} કલાક</unitPattern>
 				<perUnitPattern>{0} પ્રતિ કલાક</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>માઇક્રોસેકંડ</displayName>
-				<unitPattern count="one">{0} માઇક્રોસેકંડ</unitPattern>
-				<unitPattern count="other">{0} માઇક્રોસેકંડ</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>મિલિસેકન્ડ</displayName>
-				<unitPattern count="one">{0} મિલિસેકન્ડ</unitPattern>
-				<unitPattern count="other">{0} મિલિસેકન્ડ</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>મિનિટ</displayName>
 				<unitPattern count="one">{0} મિનિટ</unitPattern>
 				<unitPattern count="other">{0} મિનિટ</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>મહિના</displayName>
-				<unitPattern count="one">{0} મહિનો</unitPattern>
-				<unitPattern count="other">{0} મહિના</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>નેનોસેકંડ</displayName>
-				<unitPattern count="one">{0} નેનોસેકંડ</unitPattern>
-				<unitPattern count="other">{0} નેનોસેકંડ</unitPattern>
+				<perUnitPattern>{0} પ્રતિ મિનિટ</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>સેકંડ</displayName>
@@ -5651,15 +5865,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} સેકંડ</unitPattern>
 				<perUnitPattern>{0} પ્રતિ સેકંડ</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>અઠવાડિયા</displayName>
-				<unitPattern count="one">{0} અઠવાડિયું</unitPattern>
-				<unitPattern count="other">{0} અઠવાડિયા</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>મિલિસેકન્ડ</displayName>
+				<unitPattern count="one">{0} મિલિસેકન્ડ</unitPattern>
+				<unitPattern count="other">{0} મિલિસેકન્ડ</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>વર્ષ</displayName>
-				<unitPattern count="one">{0} વર્ષ</unitPattern>
-				<unitPattern count="other">{0} વર્ષ</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>માઇક્રોસેકંડ</displayName>
+				<unitPattern count="one">{0} માઇક્રોસેકંડ</unitPattern>
+				<unitPattern count="other">{0} માઇક્રોસેકંડ</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>નેનોસેકંડ</displayName>
+				<unitPattern count="one">{0} નેનોસેકંડ</unitPattern>
+				<unitPattern count="other">{0} નેનોસેકંડ</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>એમ્પીયર</displayName>
@@ -5681,6 +5900,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} વૉલ્ટ્</unitPattern>
 				<unitPattern count="other">{0} વૉલ્ટ્</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>કિલોકેલરી</displayName>
+				<unitPattern count="one">{0} કિલોકેલરી</unitPattern>
+				<unitPattern count="other">{0} કિલોકેલરી</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>કેલરી</displayName>
 				<unitPattern count="one">{0} કેલરી</unitPattern>
@@ -5691,21 +5915,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} કેલરી</unitPattern>
 				<unitPattern count="other">{0} કેલરી</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>જૂલ</displayName>
-				<unitPattern count="one">{0} જૂલ</unitPattern>
-				<unitPattern count="other">{0} જૂલ</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>કિલોકેલરી</displayName>
-				<unitPattern count="one">{0} કિલોકેલરી</unitPattern>
-				<unitPattern count="other">{0} કિલોકેલરી</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>કિલોજૂલ</displayName>
 				<unitPattern count="one">{0} કિલોજૂલ</unitPattern>
 				<unitPattern count="other">{0} કિલોજૂલ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>જૂલ</displayName>
+				<unitPattern count="one">{0} જૂલ</unitPattern>
+				<unitPattern count="other">{0} જૂલ</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>કિલોવૉટ-કલાક</displayName>
 				<unitPattern count="one">{0} કિલોવૉટ કલાક</unitPattern>
@@ -5716,201 +5935,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ગીગાહર્ટ્ઝ</unitPattern>
 				<unitPattern count="other">{0} ગીગાહર્ટ્ઝ</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>હર્ટ્ઝ</displayName>
-				<unitPattern count="one">{0} હર્ટ્ઝ</unitPattern>
-				<unitPattern count="other">{0} હર્ટ્ઝ</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>મેગાહર્ટ્ઝ</displayName>
+				<unitPattern count="one">{0} મેગાહર્ટ્ઝ</unitPattern>
+				<unitPattern count="other">{0} મેગાહર્ટ્ઝ</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>કિલોહર્ટ્ઝ</displayName>
 				<unitPattern count="one">{0} કિલોહર્ટ્ઝ</unitPattern>
 				<unitPattern count="other">{0} કિલોહર્ટ્ઝ</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>મેગાહર્ટ્ઝ</displayName>
-				<unitPattern count="one">{0} મેગાહર્ટ્ઝ</unitPattern>
-				<unitPattern count="other">{0} મેગાહર્ટ્ઝ</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>હર્ટ્ઝ</displayName>
+				<unitPattern count="one">{0} હર્ટ્ઝ</unitPattern>
+				<unitPattern count="other">{0} હર્ટ્ઝ</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>ખગોળીય યુનિટ</displayName>
-				<unitPattern count="one">{0} ખગોળીય યુનિટ</unitPattern>
-				<unitPattern count="other">{0} ખગોળીય યુનિટ</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>કિલોમીટર</displayName>
+				<unitPattern count="one">{0} કિલોમીટર</unitPattern>
+				<unitPattern count="other">{0} કિલોમીટર</unitPattern>
+				<perUnitPattern>{0} પ્રતિ કિલોમીટર</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>સેન્ટિમીટર</displayName>
-				<unitPattern count="one">{0} સેન્ટિમીટર</unitPattern>
-				<unitPattern count="other">{0} સેન્ટિમીટર</unitPattern>
+			<unit type="length-meter">
+				<displayName>મીટર</displayName>
+				<unitPattern count="one">{0} મીટર</unitPattern>
+				<unitPattern count="other">{0} મીટર</unitPattern>
+				<perUnitPattern>{0} પ્રતિ મીટર</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>ડેસિમીટર</displayName>
 				<unitPattern count="one">{0} ડેસિમીટર</unitPattern>
 				<unitPattern count="other">{0} ડેસિમીટર</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ફૂટ</displayName>
-				<unitPattern count="one">{0} ફૂટ</unitPattern>
-				<unitPattern count="other">{0} ફૂટ</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>ઇંચ</displayName>
-				<unitPattern count="one">{0} ઇંચ</unitPattern>
-				<unitPattern count="other">{0} ઇંચ</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>કિલોમીટર</displayName>
-				<unitPattern count="one">{0} કિલોમીટર</unitPattern>
-				<unitPattern count="other">{0} કિલોમીટર</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>પ્રકાશ વર્ષ</displayName>
-				<unitPattern count="one">{0} પ્રકાશ વર્ષ</unitPattern>
-				<unitPattern count="other">{0} પ્રકાશ વર્ષ</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>મીટર</displayName>
-				<unitPattern count="one">{0} મીટર</unitPattern>
-				<unitPattern count="other">{0} મીટર</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>માઇક્રોમીટર</displayName>
-				<unitPattern count="one">{0} માઇક્રોમીટર</unitPattern>
-				<unitPattern count="other">{0} માઇક્રોમીટર</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>માઇલ</displayName>
-				<unitPattern count="one">{0} માઇલ</unitPattern>
-				<unitPattern count="other">{0} માઇલ</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>સેન્ટિમીટર</displayName>
+				<unitPattern count="one">{0} સેન્ટિમીટર</unitPattern>
+				<unitPattern count="other">{0} સેન્ટિમીટર</unitPattern>
+				<perUnitPattern>{0} પ્રતિ સેન્ટિમીટર</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>મિલિમીટર</displayName>
 				<unitPattern count="one">{0} મિલિમીટર</unitPattern>
 				<unitPattern count="other">{0} મિલિમીટર</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>માઇક્રોમીટર</displayName>
+				<unitPattern count="one">{0} માઇક્રોમીટર</unitPattern>
+				<unitPattern count="other">{0} માઇક્રોમીટર</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>નેનોમીટર</displayName>
 				<unitPattern count="one">{0} નેનોમીટર</unitPattern>
 				<unitPattern count="other">{0} નેનોમીટર</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>નૉટિકલ માઇલ</displayName>
-				<unitPattern count="one">{0} નૉટિકલ માઇલ</unitPattern>
-				<unitPattern count="other">{0} નૉટિકલ માઇલ</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>પરસેક</displayName>
-				<unitPattern count="one">{0} પરસેક</unitPattern>
-				<unitPattern count="other">{0} પરસેક</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>પિસૉમીટર</displayName>
 				<unitPattern count="one">{0} પિસૉમીટર</unitPattern>
 				<unitPattern count="other">{0} પિસૉમીટર</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>માઇલ</displayName>
+				<unitPattern count="one">{0} માઇલ</unitPattern>
+				<unitPattern count="other">{0} માઇલ</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>વાર</displayName>
 				<unitPattern count="one">{0} વાર</unitPattern>
 				<unitPattern count="other">{0} વાર</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ફૂટ</displayName>
+				<unitPattern count="one">{0} ફૂટ</unitPattern>
+				<unitPattern count="other">{0} ફૂટ</unitPattern>
+				<perUnitPattern>{0} પ્રતિ ફૂટ</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>ઇંચ</displayName>
+				<unitPattern count="one">{0} ઇંચ</unitPattern>
+				<unitPattern count="other">{0} ઇંચ</unitPattern>
+				<perUnitPattern>{0} પ્રતિ ઈંચ</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>પરસેક</displayName>
+				<unitPattern count="one">{0} પરસેક</unitPattern>
+				<unitPattern count="other">{0} પરસેક</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>પ્રકાશ વર્ષ</displayName>
+				<unitPattern count="one">{0} પ્રકાશ વર્ષ</unitPattern>
+				<unitPattern count="other">{0} પ્રકાશ વર્ષ</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ખગોળીય યુનિટ</displayName>
+				<unitPattern count="one">{0} ખગોળીય યુનિટ</unitPattern>
+				<unitPattern count="other">{0} ખગોળીય યુનિટ</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>નૉટિકલ માઇલ</displayName>
+				<unitPattern count="one">{0} નૉટિકલ માઇલ</unitPattern>
+				<unitPattern count="other">{0} નૉટિકલ માઇલ</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>માઈલ સ્કૅન્ડિનેવિઅન</displayName>
+				<unitPattern count="one">{0} માઈલ-સ્કૅન્ડિનેવિઅન</unitPattern>
+				<unitPattern count="other">{0} માઈલ-સ્કૅન્ડિનેવિઅન</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>લક્સ</displayName>
 				<unitPattern count="one">{0} લક્સ</unitPattern>
 				<unitPattern count="other">{0} લક્સ</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>કેરેટ</displayName>
-				<unitPattern count="one">{0} કેરેટ</unitPattern>
-				<unitPattern count="other">{0} કેરેટ</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>ગ્રામ</displayName>
-				<unitPattern count="one">{0} ગ્રામ</unitPattern>
-				<unitPattern count="other">{0} ગ્રામ</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>કિલોગ્રામ</displayName>
-				<unitPattern count="one">{0} કિલોગ્રામ</unitPattern>
-				<unitPattern count="other">{0} કિલોગ્રામ</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>મેટ્રિક ટન</displayName>
 				<unitPattern count="one">{0} મેટ્રિક ટન</unitPattern>
 				<unitPattern count="other">{0} મેટ્રિક ટન</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>માઇક્રોગ્રામ</displayName>
-				<unitPattern count="one">{0} માઇક્રોગ્રામ</unitPattern>
-				<unitPattern count="other">{0} માઇક્રોગ્રામ</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>કિલોગ્રામ</displayName>
+				<unitPattern count="one">{0} કિલોગ્રામ</unitPattern>
+				<unitPattern count="other">{0} કિલોગ્રામ</unitPattern>
+				<perUnitPattern>{0} પ્રતિ કિલોગ્રામ</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>ગ્રામ</displayName>
+				<unitPattern count="one">{0} ગ્રામ</unitPattern>
+				<unitPattern count="other">{0} ગ્રામ</unitPattern>
+				<perUnitPattern>{0} પ્રતિ ગ્રામ</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>મિલિગ્રામ</displayName>
 				<unitPattern count="one">{0} મિલિગ્રામ</unitPattern>
 				<unitPattern count="other">{0} મિલિગ્રામ</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ઔંસ</displayName>
-				<unitPattern count="one">{0} ઔંસ</unitPattern>
-				<unitPattern count="other">{0} ઔંસ</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ટ્રોય ઔંસ</displayName>
-				<unitPattern count="one">{0} ટ્રોય ઔંસ</unitPattern>
-				<unitPattern count="other">{0} ટ્રોય ઔંસ</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>પાઉન્ડ</displayName>
-				<unitPattern count="one">{0} પાઉન્ડ</unitPattern>
-				<unitPattern count="other">{0} પાઉન્ડ</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>માઇક્રોગ્રામ</displayName>
+				<unitPattern count="one">{0} માઇક્રોગ્રામ</unitPattern>
+				<unitPattern count="other">{0} માઇક્રોગ્રામ</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>ટન</displayName>
 				<unitPattern count="one">{0} ટન</unitPattern>
 				<unitPattern count="other">{0} ટન</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>પાઉન્ડ</displayName>
+				<unitPattern count="one">{0} પાઉન્ડ</unitPattern>
+				<unitPattern count="other">{0} પાઉન્ડ</unitPattern>
+				<perUnitPattern>{0} પ્રતિ પાઉન્ડ</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ઔંસ</displayName>
+				<unitPattern count="one">{0} ઔંસ</unitPattern>
+				<unitPattern count="other">{0} ઔંસ</unitPattern>
+				<perUnitPattern>{0} પ્રતિ ઔંસ</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ટ્રોય ઔંસ</displayName>
+				<unitPattern count="one">{0} ટ્રોય ઔંસ</unitPattern>
+				<unitPattern count="other">{0} ટ્રોય ઔંસ</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>કેરેટ</displayName>
+				<unitPattern count="one">{0} કેરેટ</unitPattern>
+				<unitPattern count="other">{0} કેરેટ</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>ગીગાવૉટ</displayName>
 				<unitPattern count="one">{0} ગીગાવૉટ</unitPattern>
 				<unitPattern count="other">{0} ગીગાવૉટ</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>હોર્સપાવર</displayName>
-				<unitPattern count="one">{0} હોર્સપાવર</unitPattern>
-				<unitPattern count="other">{0} હોર્સપાવર</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>કિલોવૉટ</displayName>
-				<unitPattern count="one">{0} કિલોવૉટ</unitPattern>
-				<unitPattern count="other">{0} કિલોવૉટ</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>મેગાવૉટ</displayName>
 				<unitPattern count="one">{0} મેગાવૉટ</unitPattern>
 				<unitPattern count="other">{0} મેગાવૉટ</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>મિલિવૉટ</displayName>
-				<unitPattern count="one">{0} મિલિવૉટ</unitPattern>
-				<unitPattern count="other">{0} મિલિવૉટ</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>કિલોવૉટ</displayName>
+				<unitPattern count="one">{0} કિલોવૉટ</unitPattern>
+				<unitPattern count="other">{0} કિલોવૉટ</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>વૉટ</displayName>
 				<unitPattern count="one">{0} વૉટ</unitPattern>
 				<unitPattern count="other">{0} વૉટ</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>મિલિવૉટ</displayName>
+				<unitPattern count="one">{0} મિલિવૉટ</unitPattern>
+				<unitPattern count="other">{0} મિલિવૉટ</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>હોર્સપાવર</displayName>
+				<unitPattern count="one">{0} હોર્સપાવર</unitPattern>
+				<unitPattern count="other">{0} હોર્સપાવર</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>હેક્ટૉપાસ્કલ</displayName>
 				<unitPattern count="one">{0} હેક્ટૉપાસ્કલ</unitPattern>
 				<unitPattern count="other">{0} હેક્ટૉપાસ્કલ</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>પારાના ઇંચ</displayName>
-				<unitPattern count="one">{0} પારાના ઇંચ</unitPattern>
-				<unitPattern count="other">{0} પારાના ઇંચ</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>મિલિબાર</displayName>
-				<unitPattern count="one">{0} મિલિબાર</unitPattern>
-				<unitPattern count="other">{0} મિલિબાર</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>પારાનું મિલિમીટર</displayName>
 				<unitPattern count="one">{0} પારાનું મિલિમીટર</unitPattern>
@@ -5921,10 +6144,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} પાઉન્ડ પ્રતિ વર્ગ ઇંચ</unitPattern>
 				<unitPattern count="other">{0} પાઉન્ડ પ્રતિ વર્ગ ઇંચ</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>કૅરેટ</displayName>
-				<unitPattern count="one">{0} કૅરેટ</unitPattern>
-				<unitPattern count="other">{0} કૅરેટ</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>પારાના ઇંચ</displayName>
+				<unitPattern count="one">{0} પારાના ઇંચ</unitPattern>
+				<unitPattern count="other">{0} પારાના ઇંચ</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>મિલિબાર</displayName>
+				<unitPattern count="one">{0} મિલિબાર</unitPattern>
+				<unitPattern count="other">{0} મિલિબાર</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>કિલોમીટર પ્રતિ કલાક</displayName>
@@ -5941,6 +6169,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} માઇલ પ્રતિ કલાક</unitPattern>
 				<unitPattern count="other">{0} માઇલ પ્રતિ કલાક</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>નોટ</displayName>
+				<unitPattern count="one">{0} નોટ</unitPattern>
+				<unitPattern count="other">{0} નોટ</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>ડિગ્રી સેલ્સિયસ</displayName>
 				<unitPattern count="one">{0} ડિગ્રી સેલ્સિયસ</unitPattern>
@@ -5956,31 +6194,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} કેલ્વિન</unitPattern>
 				<unitPattern count="other">{0} કેલ્વિન</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>એકર-ફૂટ</displayName>
-				<unitPattern count="one">{0} એકર-ફૂટ</unitPattern>
-				<unitPattern count="other">{0} એકર-ફૂટ</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>સેન્ટિલીટર</displayName>
-				<unitPattern count="one">{0} સેન્ટિલીટર</unitPattern>
-				<unitPattern count="other">{0} સેન્ટિલીટર</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>ઘન સેન્ટિમીટર</displayName>
-				<unitPattern count="one">{0} ઘન સેન્ટિમીટર</unitPattern>
-				<unitPattern count="other">{0} ઘન સેન્ટિમીટર</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ઘન ફૂટ</displayName>
-				<unitPattern count="one">{0} ઘન ફૂટ</unitPattern>
-				<unitPattern count="other">{0} ઘન ફૂટ</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>ઘન ઇંચ</displayName>
-				<unitPattern count="one">{0} ઘન ઇંચ</unitPattern>
-				<unitPattern count="other">{0} ઘન ઇંચ</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>ઘન કિલોમીટર</displayName>
 				<unitPattern count="one">{0} ઘન કિલોમીટર</unitPattern>
@@ -5990,6 +6203,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ઘન મીટર</displayName>
 				<unitPattern count="one">{0} ઘન મીટર</unitPattern>
 				<unitPattern count="other">{0} ઘન મીટર</unitPattern>
+				<perUnitPattern>{0} પ્રતિ ઘન મીટર</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>ઘન સેન્ટિમીટર</displayName>
+				<unitPattern count="one">{0} ઘન સેન્ટિમીટર</unitPattern>
+				<unitPattern count="other">{0} ઘન સેન્ટિમીટર</unitPattern>
+				<perUnitPattern>{0} પ્રતિ ઘન સેન્ટિમીટર</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>ઘન માઇલ</displayName>
@@ -6001,25 +6221,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ઘન વાર</unitPattern>
 				<unitPattern count="other">{0} ઘન વાર</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>કપ</displayName>
-				<unitPattern count="one">{0} કપ</unitPattern>
-				<unitPattern count="other">{0} કપ</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ઘન ફૂટ</displayName>
+				<unitPattern count="one">{0} ઘન ફૂટ</unitPattern>
+				<unitPattern count="other">{0} ઘન ફૂટ</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>ડેસિલીટર</displayName>
-				<unitPattern count="one">{0} ડેસિલીટર</unitPattern>
-				<unitPattern count="other">{0} ડેસિલીટર</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>ઘન ઇંચ</displayName>
+				<unitPattern count="one">{0} ઘન ઇંચ</unitPattern>
+				<unitPattern count="other">{0} ઘન ઇંચ</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>પ્રવાહી ઔંસ</displayName>
-				<unitPattern count="one">{0} પ્રવાહી ઔંસ</unitPattern>
-				<unitPattern count="other">{0} પ્રવાહી ઔંસ</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>ગૅલન</displayName>
-				<unitPattern count="one">{0} ગૅલન</unitPattern>
-				<unitPattern count="other">{0} ગૅલન</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>મેગાલીટર</displayName>
+				<unitPattern count="one">{0} મેગાલીટર</unitPattern>
+				<unitPattern count="other">{0} મેગાલીટર</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>હેક્ટોલીટર</displayName>
@@ -6030,27 +6245,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>લિટર</displayName>
 				<unitPattern count="one">{0} લિટર</unitPattern>
 				<unitPattern count="other">{0} લિટર</unitPattern>
+				<perUnitPattern>{0} પ્રતિ લિટર</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>મેગાલીટર</displayName>
-				<unitPattern count="one">{0} મેગાલીટર</unitPattern>
-				<unitPattern count="other">{0} મેગાલીટર</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>ડેસિલીટર</displayName>
+				<unitPattern count="one">{0} ડેસિલીટર</unitPattern>
+				<unitPattern count="other">{0} ડેસિલીટર</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>સેન્ટિલીટર</displayName>
+				<unitPattern count="one">{0} સેન્ટિલીટર</unitPattern>
+				<unitPattern count="other">{0} સેન્ટિલીટર</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>મિલિલીટર</displayName>
 				<unitPattern count="one">{0} મિલિલીટર</unitPattern>
 				<unitPattern count="other">{0} મિલિલીટર</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>પિન્ટ</displayName>
-				<unitPattern count="one">{0} પિન્ટ</unitPattern>
-				<unitPattern count="other">{0} પિન્ટ</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>મેટ્રિક પિન્ટ</displayName>
+				<unitPattern count="one">{0} મેટ્રિક પિન્ટ</unitPattern>
+				<unitPattern count="other">{0} મેટ્રિક પિન્ટ</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>મેટ્રિક કપ</displayName>
+				<unitPattern count="one">{0} મેટ્રિક કપ</unitPattern>
+				<unitPattern count="other">{0} મેટ્રિક કપ</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>એકર-ફૂટ</displayName>
+				<unitPattern count="one">{0} એકર-ફૂટ</unitPattern>
+				<unitPattern count="other">{0} એકર-ફૂટ</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>ગૅલન</displayName>
+				<unitPattern count="one">{0} ગૅલન</unitPattern>
+				<unitPattern count="other">{0} ગૅલન</unitPattern>
+				<perUnitPattern>{0} પ્રતિ ગૅલન</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>ક્વાર્ટ</displayName>
 				<unitPattern count="one">{0} ક્વાર્ટ</unitPattern>
 				<unitPattern count="other">{0} ક્વાર્ટ</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>પિન્ટ</displayName>
+				<unitPattern count="one">{0} પિન્ટ</unitPattern>
+				<unitPattern count="other">{0} પિન્ટ</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>કપ</displayName>
+				<unitPattern count="one">{0} કપ</unitPattern>
+				<unitPattern count="other">{0} કપ</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>પ્રવાહી ઔંસ</displayName>
+				<unitPattern count="one">{0} પ્રવાહી ઔંસ</unitPattern>
+				<unitPattern count="other">{0} પ્રવાહી ઔંસ</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>ટેબલસ્પૂન</displayName>
 				<unitPattern count="one">{0} ટેબલસ્પૂન</unitPattern>
@@ -6061,6 +6313,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ટીસ્પૂન</unitPattern>
 				<unitPattern count="other">{0} ટીસ્પૂન</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}પૂર્વ</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}ઉત્તર</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}દક્ષિણ</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}પશ્ચિમ</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -6076,6 +6334,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>ક્રાંતિ</displayName>
+				<unitPattern count="one">{0} ક્રાંતિ</unitPattern>
+				<unitPattern count="other">{0} ક્રાંતિ</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>સમત્રિજ્યાકોણ</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>અંશ</displayName>
+				<unitPattern count="one">{0} અંશ</unitPattern>
+				<unitPattern count="other">{0} અંશ</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>ચાપમિનિટ</displayName>
 				<unitPattern count="one">{0} ચાપમિનિટ</unitPattern>
@@ -6086,30 +6359,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ચાપસેકન્ડ</unitPattern>
 				<unitPattern count="other">{0} ચાપસેકન્ડ</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>અંશ</displayName>
-				<unitPattern count="one">{0} અંશ</unitPattern>
-				<unitPattern count="other">{0} અંશ</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>સમત્રિજ્યાકોણ</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>એકર</displayName>
-				<unitPattern count="one">{0} એકર</unitPattern>
-				<unitPattern count="other">{0} એકર</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>ચોરસ કિમી</displayName>
+				<unitPattern count="one">{0} ચોરસ કિમી</unitPattern>
+				<unitPattern count="other">{0} ચોરસ કિમી</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>હેક્ટર</displayName>
 				<unitPattern count="one">{0} હેક્ટર</unitPattern>
 				<unitPattern count="other">{0} હેક્ટર</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>ચોરસ મીટર</displayName>
+				<unitPattern count="one">{0} ચોરસ મીટર</unitPattern>
+				<unitPattern count="other">{0} ચોરસ મીટર</unitPattern>
+				<perUnitPattern>{0} પ્રતિ ચો. મીટર</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>ચોરસ સેમી</displayName>
 				<unitPattern count="one">{0} ચોરસ સેમી</unitPattern>
 				<unitPattern count="other">{0} ચોરસ સેમી</unitPattern>
+				<perUnitPattern>{0} પ્રતિ ચો. સેમી</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>ચોરસ માઇલ</displayName>
+				<unitPattern count="one">{0} ચોરસ માઇલ</unitPattern>
+				<unitPattern count="other">{0} ચોરસ માઇલ</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>એકર</displayName>
+				<unitPattern count="one">{0} એકર</unitPattern>
+				<unitPattern count="other">{0} એકર</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>ચોરસ વાર</displayName>
+				<unitPattern count="one">{0} ચોરસ વાર</unitPattern>
+				<unitPattern count="other">{0} ચોરસ વાર</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ચોરસ ફૂટ</displayName>
@@ -6120,91 +6405,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ચોરસ ઇંચ</displayName>
 				<unitPattern count="one">{0} ચોરસ ઇંચ</unitPattern>
 				<unitPattern count="other">{0} ચોરસ ઇંચ</unitPattern>
+				<perUnitPattern>{0} પ્રતિ ચો. ઈંચ</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>ચોરસ કિમી</displayName>
-				<unitPattern count="one">{0} ચોરસ કિમી</unitPattern>
-				<unitPattern count="other">{0} ચોરસ કિમી</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>ચોરસ મીટર</displayName>
-				<unitPattern count="one">{0} ચોરસ મીટર</unitPattern>
-				<unitPattern count="other">{0} ચોરસ મીટર</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>ચોરસ માઇલ</displayName>
-				<unitPattern count="one">{0} ચોરસ માઇલ</unitPattern>
-				<unitPattern count="other">{0} ચોરસ માઇલ</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>ચોરસ વાર</displayName>
-				<unitPattern count="one">{0} ચોરસ વાર</unitPattern>
-				<unitPattern count="other">{0} ચોરસ વાર</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>કૅરેટ</displayName>
+				<unitPattern count="one">{0} કૅરેટ</unitPattern>
+				<unitPattern count="other">{0} કૅરેટ</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>લીટર/કિમી</displayName>
 				<unitPattern count="one">{0} લીટર/કિમી</unitPattern>
 				<unitPattern count="other">{0} લીટર/કિમી</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>લિ/100 કિમી</displayName>
+				<unitPattern count="one">{0} લિ/100 કિમી</unitPattern>
+				<unitPattern count="other">{0} લિ/100 કિમી</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>માઇલ/ગૅલન</displayName>
 				<unitPattern count="one">{0} માઇલ/ગૅલન</unitPattern>
 				<unitPattern count="other">{0} માઇલ/ગૅલન</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>બિટ</displayName>
-				<unitPattern count="one">{0} બિટ</unitPattern>
-				<unitPattern count="other">{0} બિટ</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>બાઇટ</displayName>
-				<unitPattern count="one">{0} બાઇટ</unitPattern>
-				<unitPattern count="other">{0} બાઇટ</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>ગીગાબિટ</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>ગીગાબિટ</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>બાઇટ</displayName>
+				<unitPattern count="one">{0} બાઇટ</unitPattern>
+				<unitPattern count="other">{0} બાઇટ</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>બિટ</displayName>
+				<unitPattern count="one">{0} બિટ</unitPattern>
+				<unitPattern count="other">{0} બિટ</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>સદી</displayName>
+				<unitPattern count="one">{0} સદી</unitPattern>
+				<unitPattern count="other">{0} સદી</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>વર્ષ</displayName>
+				<unitPattern count="one">{0} વર્ષ</unitPattern>
+				<unitPattern count="other">{0} વર્ષ</unitPattern>
+				<perUnitPattern>{0}/વર્ષ</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>મહિના</displayName>
+				<unitPattern count="one">{0} મહિનો</unitPattern>
+				<unitPattern count="other">{0} મહિના</unitPattern>
+				<perUnitPattern>{0}/માસ</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>અઠવાડિયા</displayName>
+				<unitPattern count="one">{0} અઠ.</unitPattern>
+				<unitPattern count="other">{0} અઠ.</unitPattern>
+				<perUnitPattern>{0} / અઠ.</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>દિવસ</displayName>
 				<unitPattern count="one">{0} દિવસ</unitPattern>
 				<unitPattern count="other">{0} દિવસ</unitPattern>
+				<perUnitPattern>{0}/ દિવસ</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>કલાક</displayName>
@@ -6212,30 +6512,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} કલાક</unitPattern>
 				<perUnitPattern>{0} પ્રતિ કલાક</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>મિલિસેકન્ડ</displayName>
-				<unitPattern count="one">{0} મિસે</unitPattern>
-				<unitPattern count="other">{0} મિસે</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>મિનિટ</displayName>
 				<unitPattern count="one">{0} મિનિટ</unitPattern>
 				<unitPattern count="other">{0} મિનિટ</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>મહિના</displayName>
-				<unitPattern count="one">{0} મહિનો</unitPattern>
-				<unitPattern count="other">{0} મહિના</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>નેનોસેકંડ</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/મિ.</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>સેકંડ</displayName>
@@ -6243,15 +6524,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} સેકંડ</unitPattern>
 				<perUnitPattern>{0} પ્રતિ સેકંડ</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>અઠવાડિયા</displayName>
-				<unitPattern count="one">{0} અઠ.</unitPattern>
-				<unitPattern count="other">{0} અઠ.</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>મિલિસેકન્ડ</displayName>
+				<unitPattern count="one">{0} મિસે</unitPattern>
+				<unitPattern count="other">{0} મિસે</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>વર્ષ</displayName>
-				<unitPattern count="one">{0} વર્ષ</unitPattern>
-				<unitPattern count="other">{0} વર્ષ</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>નેનોસેકંડ</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amp</displayName>
@@ -6273,6 +6559,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>કિલોકેલરી</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>કેલરી</displayName>
 				<unitPattern count="one">{0} Cal</unitPattern>
@@ -6283,21 +6574,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Cal</unitPattern>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>જૂલ</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>કિલોકેલરી</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>કિલોજૂલ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>જૂલ</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>કિલોવૉટ-કલાક</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -6308,201 +6594,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>ખગોળીય યુનિટ</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>કિમી</displayName>
+				<unitPattern count="one">{0} કિમી</unitPattern>
+				<unitPattern count="other">{0} કિમી</unitPattern>
+				<perUnitPattern>{0}/કિમી</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>સેમી</displayName>
-				<unitPattern count="one">{0} સેમી</unitPattern>
-				<unitPattern count="other">{0} સેમી</unitPattern>
+			<unit type="length-meter">
+				<displayName>મીટર</displayName>
+				<unitPattern count="one">{0} મી</unitPattern>
+				<unitPattern count="other">{0} મી</unitPattern>
+				<perUnitPattern>{0}/મી</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>ડેમી</displayName>
 				<unitPattern count="one">{0} ડેમી</unitPattern>
 				<unitPattern count="other">{0} ડેમી</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ફૂટ</displayName>
-				<unitPattern count="one">{0} ફૂટ</unitPattern>
-				<unitPattern count="other">{0} ફૂટ</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>ઇંચ</displayName>
-				<unitPattern count="one">{0} ઇંચ</unitPattern>
-				<unitPattern count="other">{0} ઇંચ</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>કિમી</displayName>
-				<unitPattern count="one">{0} કિમી</unitPattern>
-				<unitPattern count="other">{0} કિમી</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>પ્રકાશ વર્ષ</displayName>
-				<unitPattern count="one">{0} પ્રકાશ વર્ષ</unitPattern>
-				<unitPattern count="other">{0} પ્રકાશ વર્ષ</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>મીટર</displayName>
-				<unitPattern count="one">{0} મી</unitPattern>
-				<unitPattern count="other">{0} મી</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>માઇક્રોમીટર</displayName>
-				<unitPattern count="one">{0} µમી</unitPattern>
-				<unitPattern count="other">{0} µમી</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>માઇલ</displayName>
-				<unitPattern count="one">{0} માઇલ</unitPattern>
-				<unitPattern count="other">{0} માઇલ</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>સેમી</displayName>
+				<unitPattern count="one">{0} સેમી</unitPattern>
+				<unitPattern count="other">{0} સેમી</unitPattern>
+				<perUnitPattern>{0}/સેમી</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>મિમી</displayName>
 				<unitPattern count="one">{0} મિમી</unitPattern>
 				<unitPattern count="other">{0} મિમી</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>માઇક્રોમીટર</displayName>
+				<unitPattern count="one">{0} µમી</unitPattern>
+				<unitPattern count="other">{0} µમી</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>નેનોમીટર</displayName>
 				<unitPattern count="one">{0} નેનોમીટર</unitPattern>
 				<unitPattern count="other">{0} નેનોમીટર</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>નૉટિકલ માઇલ</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>પરસેક</displayName>
-				<unitPattern count="one">{0} પરસેક</unitPattern>
-				<unitPattern count="other">{0} પરસેક</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>પિસૉમીટર</displayName>
 				<unitPattern count="one">{0} પિસૉમીટર</unitPattern>
 				<unitPattern count="other">{0} પિસૉમીટર</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>માઇલ</displayName>
+				<unitPattern count="one">{0} માઇલ</unitPattern>
+				<unitPattern count="other">{0} માઇલ</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>વાર</displayName>
 				<unitPattern count="one">{0} વાર</unitPattern>
 				<unitPattern count="other">{0} વાર</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ફૂટ</displayName>
+				<unitPattern count="one">{0} ફૂટ</unitPattern>
+				<unitPattern count="other">{0} ફૂટ</unitPattern>
+				<perUnitPattern>{0}/ફૂટ</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>ઇંચ</displayName>
+				<unitPattern count="one">{0} ઇંચ</unitPattern>
+				<unitPattern count="other">{0} ઇંચ</unitPattern>
+				<perUnitPattern>{0}/ઈંચ</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>પરસેક</displayName>
+				<unitPattern count="one">{0} પરસેક</unitPattern>
+				<unitPattern count="other">{0} પરસેક</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>પ્રકાશ વર્ષ</displayName>
+				<unitPattern count="one">{0} પ્રકાશ વર્ષ</unitPattern>
+				<unitPattern count="other">{0} પ્રકાશ વર્ષ</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ખગોળીય યુનિટ</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>નૉટિકલ માઇલ</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>લક્સ</displayName>
 				<unitPattern count="one">{0} લક્સ</unitPattern>
 				<unitPattern count="other">{0} લક્સ</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>કેરેટ</displayName>
-				<unitPattern count="one">{0} કેરેટ</unitPattern>
-				<unitPattern count="other">{0} કેરેટ</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>ગ્રામ</displayName>
-				<unitPattern count="one">{0} ગ્રા</unitPattern>
-				<unitPattern count="other">{0} ગ્રા</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>કિગ્રા</displayName>
-				<unitPattern count="one">{0} કિગ્રા</unitPattern>
-				<unitPattern count="other">{0} કિગ્રા</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>મેટ્રિક ટન</displayName>
 				<unitPattern count="one">{0} મેટ્રિક ટન</unitPattern>
 				<unitPattern count="other">{0} મેટ્રિક ટન</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µગ્રામ</displayName>
-				<unitPattern count="one">{0} µગ્રામ</unitPattern>
-				<unitPattern count="other">{0} µગ્રામ</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>કિગ્રા</displayName>
+				<unitPattern count="one">{0} કિગ્રા</unitPattern>
+				<unitPattern count="other">{0} કિગ્રા</unitPattern>
+				<perUnitPattern>{0}/કિગ્રા</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>ગ્રામ</displayName>
+				<unitPattern count="one">{0} ગ્રા</unitPattern>
+				<unitPattern count="other">{0} ગ્રા</unitPattern>
+				<perUnitPattern>{0}/ગ્રામ</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>મિગ્રા</displayName>
 				<unitPattern count="one">{0} મિગ્રા</unitPattern>
 				<unitPattern count="other">{0} મિગ્રા</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ઔંસ</displayName>
-				<unitPattern count="one">{0} ઔંસ</unitPattern>
-				<unitPattern count="other">{0} ઔંસ</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ટ્રોય ઔંસ</displayName>
-				<unitPattern count="one">{0} ટ્રોય ઔંસ</unitPattern>
-				<unitPattern count="other">{0} ટ્રોય ઔંસ</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>પાઉન્ડ</displayName>
-				<unitPattern count="one">{0} પાઉન્ડ</unitPattern>
-				<unitPattern count="other">{0} પાઉન્ડ</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µગ્રામ</displayName>
+				<unitPattern count="one">{0} µગ્રામ</unitPattern>
+				<unitPattern count="other">{0} µગ્રામ</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>ટન</displayName>
 				<unitPattern count="one">{0} ટન</unitPattern>
 				<unitPattern count="other">{0} ટન</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>પાઉન્ડ</displayName>
+				<unitPattern count="one">{0} પાઉન્ડ</unitPattern>
+				<unitPattern count="other">{0} પાઉન્ડ</unitPattern>
+				<perUnitPattern>{0}/પાઉન્ડ</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ઔંસ</displayName>
+				<unitPattern count="one">{0} ઔંસ</unitPattern>
+				<unitPattern count="other">{0} ઔંસ</unitPattern>
+				<perUnitPattern>{0}/ઔંસ</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ટ્રોય ઔંસ</displayName>
+				<unitPattern count="one">{0} ટ્રોય ઔંસ</unitPattern>
+				<unitPattern count="other">{0} ટ્રોય ઔંસ</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>કેરેટ</displayName>
+				<unitPattern count="one">{0} કેરેટ</unitPattern>
+				<unitPattern count="other">{0} કેરેટ</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>ગીગાવૉટ</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>હોર્સપાવર</displayName>
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>કિલોવૉટ</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>મેગાવૉટ</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>મિલિવૉટ</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>કિલોવૉટ</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>વૉટ</displayName>
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>મિલિવૉટ</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>હોર્સપાવર</displayName>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>મિલિબાર</displayName>
-				<unitPattern count="one">{0} મિલિબાર</unitPattern>
-				<unitPattern count="other">{0} મિલિબાર</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -6513,10 +6803,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>કૅરેટ</displayName>
-				<unitPattern count="one">{0} કૅરેટ</unitPattern>
-				<unitPattern count="other">{0} કૅરેટ</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>મિલિબાર</displayName>
+				<unitPattern count="one">{0} મિલિબાર</unitPattern>
+				<unitPattern count="other">{0} મિલિબાર</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>કિમી/કલાક</displayName>
@@ -6533,6 +6828,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} માઇલ/કલાક</unitPattern>
 				<unitPattern count="other">{0} માઇલ/કલાક</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>ડિગ્રી સેલ્સિયસ</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -6548,31 +6853,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>એકર-ફૂટ</displayName>
-				<unitPattern count="one">{0} એકર-ફૂટ</unitPattern>
-				<unitPattern count="other">{0} એકર-ફૂટ</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>સેન્ટિલીટર</displayName>
-				<unitPattern count="one">{0} સેન્ટિલીટર</unitPattern>
-				<unitPattern count="other">{0} સેન્ટિલીટર</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>ઘન સેમી</displayName>
-				<unitPattern count="one">{0} ઘન સેમી</unitPattern>
-				<unitPattern count="other">{0} ઘન સેમી</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ઘન ફૂટ</displayName>
-				<unitPattern count="one">{0} ઘન ફૂટ</unitPattern>
-				<unitPattern count="other">{0} ઘન ફૂટ</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>ઘન ઇંચ</displayName>
-				<unitPattern count="one">{0} ઘન ઇંચ</unitPattern>
-				<unitPattern count="other">{0} ઘન ઇંચ</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>ઘન કિમી</displayName>
 				<unitPattern count="one">{0} ઘન કિમી</unitPattern>
@@ -6582,6 +6862,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ઘન મીટર</displayName>
 				<unitPattern count="one">{0} ઘન મીટર</unitPattern>
 				<unitPattern count="other">{0} ઘન મીટર</unitPattern>
+				<perUnitPattern>{0}/ઘન મી.</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>ઘન સેમી</displayName>
+				<unitPattern count="one">{0} ઘન સેમી</unitPattern>
+				<unitPattern count="other">{0} ઘન સેમી</unitPattern>
+				<perUnitPattern>{0}/ ઘન સેમી</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>ઘન માઇલ</displayName>
@@ -6593,25 +6880,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ઘન વાર</unitPattern>
 				<unitPattern count="other">{0} ઘન વાર</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>કપ</displayName>
-				<unitPattern count="one">{0} કપ</unitPattern>
-				<unitPattern count="other">{0} કપ</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ઘન ફૂટ</displayName>
+				<unitPattern count="one">{0} ઘન ફૂટ</unitPattern>
+				<unitPattern count="other">{0} ઘન ફૂટ</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>ડેસિલીટર</displayName>
-				<unitPattern count="one">{0} ડેસિલીટર</unitPattern>
-				<unitPattern count="other">{0} ડેસિલીટર</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>ઘન ઇંચ</displayName>
+				<unitPattern count="one">{0} ઘન ઇંચ</unitPattern>
+				<unitPattern count="other">{0} ઘન ઇંચ</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>પ્રવાહી ઔંસ</displayName>
-				<unitPattern count="one">{0} પ્રવાહી ઔંસ</unitPattern>
-				<unitPattern count="other">{0} પ્રવાહી ઔંસ</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>ગૅલન</displayName>
-				<unitPattern count="one">{0} ગૅલન</unitPattern>
-				<unitPattern count="other">{0} ગૅલન</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>મેગાલીટર</displayName>
+				<unitPattern count="one">{0} મેગાલીટર</unitPattern>
+				<unitPattern count="other">{0} મેગાલીટર</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>હેક્ટોલીટર</displayName>
@@ -6622,27 +6904,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>લિટર</displayName>
 				<unitPattern count="one">{0} લિ</unitPattern>
 				<unitPattern count="other">{0} લિ</unitPattern>
+				<perUnitPattern>{0}/લિ</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>મેગાલીટર</displayName>
-				<unitPattern count="one">{0} મેગાલીટર</unitPattern>
-				<unitPattern count="other">{0} મેગાલીટર</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>ડેસિલીટર</displayName>
+				<unitPattern count="one">{0} ડેસિલીટર</unitPattern>
+				<unitPattern count="other">{0} ડેસિલીટર</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>સેન્ટિલીટર</displayName>
+				<unitPattern count="one">{0} સેન્ટિલીટર</unitPattern>
+				<unitPattern count="other">{0} સેન્ટિલીટર</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>મિલિલીટર</displayName>
 				<unitPattern count="one">{0} મિલિલીટર</unitPattern>
 				<unitPattern count="other">{0} મિલિલીટર</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>પિન્ટ</displayName>
-				<unitPattern count="one">{0} પિન્ટ</unitPattern>
-				<unitPattern count="other">{0} પિન્ટ</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>મે.પિન્ટ</displayName>
+				<unitPattern count="one">{0} મે.પિન્ટ</unitPattern>
+				<unitPattern count="other">{0} મે.પિન્ટ</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>મે. કપ</displayName>
+				<unitPattern count="one">{0} મે. કપ</unitPattern>
+				<unitPattern count="other">{0} મે. કપ</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>એકર-ફૂટ</displayName>
+				<unitPattern count="one">{0} એકર-ફૂટ</unitPattern>
+				<unitPattern count="other">{0} એકર-ફૂટ</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>ગૅલન</displayName>
+				<unitPattern count="one">{0} ગૅલન</unitPattern>
+				<unitPattern count="other">{0} ગૅલન</unitPattern>
+				<perUnitPattern>{0}/ગૅલન</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>ક્વાર્ટ</displayName>
 				<unitPattern count="one">{0} ક્વાર્ટ</unitPattern>
 				<unitPattern count="other">{0} ક્વાર્ટ</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>પિન્ટ</displayName>
+				<unitPattern count="one">{0} પિન્ટ</unitPattern>
+				<unitPattern count="other">{0} પિન્ટ</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>કપ</displayName>
+				<unitPattern count="one">{0} કપ</unitPattern>
+				<unitPattern count="other">{0} કપ</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>પ્રવાહી ઔંસ</displayName>
+				<unitPattern count="one">{0} પ્રવાહી ઔંસ</unitPattern>
+				<unitPattern count="other">{0} પ્રવાહી ઔંસ</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>ટેબલસ્પૂન</displayName>
 				<unitPattern count="one">{0} ટેબલસ્પૂન</unitPattern>
@@ -6653,6 +6972,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ટીસ્પૂન</unitPattern>
 				<unitPattern count="other">{0} ટીસ્પૂન</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}પૂ</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}ઉ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}દ</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}પ</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -6662,6 +6987,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} G</unitPattern>
 				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<displayName>અંશ</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -6670,27 +7000,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>અંશ</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} m²</unitPattern>
 				<unitPattern count="other">{0} m²</unitPattern>
@@ -6699,6 +7016,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>લિ/100 કિમી</displayName>
+				<unitPattern count="one">{0}લિ/100કિમી</unitPattern>
+				<unitPattern count="other">{0}લિ/100કિમી</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>વર્ષ</displayName>
+				<unitPattern count="one">{0} વ</unitPattern>
+				<unitPattern count="other">{0} વ</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>મહિના</displayName>
+				<unitPattern count="one">{0} મ</unitPattern>
+				<unitPattern count="other">{0} મ</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>અઠવાડિયા</displayName>
+				<unitPattern count="one">{0} અઠ.</unitPattern>
+				<unitPattern count="other">{0} અઠ.</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>દિવસ</displayName>
 				<unitPattern count="one">{0} દિ</unitPattern>
@@ -6709,66 +7054,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ક</unitPattern>
 				<unitPattern count="other">{0} ક</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>મિલિસેકન્ડ</displayName>
-				<unitPattern count="one">{0} મિસે</unitPattern>
-				<unitPattern count="other">{0} મિસે</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>મિનિટ</displayName>
 				<unitPattern count="one">{0} મિ</unitPattern>
 				<unitPattern count="other">{0} મિ</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>મહિના</displayName>
-				<unitPattern count="one">{0} મ</unitPattern>
-				<unitPattern count="other">{0} મ</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>સેકંડ</displayName>
 				<unitPattern count="one">{0} સે</unitPattern>
 				<unitPattern count="other">{0} સે</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>અઠવાડિયા</displayName>
-				<unitPattern count="one">{0} અઠ.</unitPattern>
-				<unitPattern count="other">{0} અઠ.</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>વર્ષ</displayName>
-				<unitPattern count="one">{0} વ</unitPattern>
-				<unitPattern count="other">{0} વ</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>સેમી</displayName>
-				<unitPattern count="one">{0} સેમી</unitPattern>
-				<unitPattern count="other">{0} સેમી</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0} '</unitPattern>
-				<unitPattern count="other">{0} '</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0} &quot;</unitPattern>
-				<unitPattern count="other">{0} &quot;</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>મિલિસેકન્ડ</displayName>
+				<unitPattern count="one">{0} મિસે</unitPattern>
+				<unitPattern count="other">{0} મિસે</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>કિમી</displayName>
 				<unitPattern count="one">{0} કિમી</unitPattern>
 				<unitPattern count="other">{0} કિમી</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0}પ્રકાશવર્ષ</unitPattern>
-				<unitPattern count="other">{0}પ્રકાશવર્ષ</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>મીટર</displayName>
 				<unitPattern count="one">{0} મી</unitPattern>
 				<unitPattern count="other">{0} મી</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} માઇલ</unitPattern>
-				<unitPattern count="other">{0} માઇલ</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>સેમી</displayName>
+				<unitPattern count="one">{0} સેમી</unitPattern>
+				<unitPattern count="other">{0} સેમી</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>મિમી</displayName>
@@ -6779,31 +7093,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}પિસૉ.મી</unitPattern>
 				<unitPattern count="other">{0}પિસૉ.મી</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} માઇલ</unitPattern>
+				<unitPattern count="other">{0} માઇલ</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} વાર</unitPattern>
 				<unitPattern count="other">{0} વાર</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>ગ્રામ</displayName>
-				<unitPattern count="one">{0} ગ્રા</unitPattern>
-				<unitPattern count="other">{0} ગ્રા</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} '</unitPattern>
+				<unitPattern count="other">{0} '</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} &quot;</unitPattern>
+				<unitPattern count="other">{0} &quot;</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0}પ્રકાશવર્ષ</unitPattern>
+				<unitPattern count="other">{0}પ્રકાશવર્ષ</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>કિગ્રા</displayName>
 				<unitPattern count="one">{0} કિગ્રા</unitPattern>
 				<unitPattern count="other">{0} કિગ્રા</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} ઔંશ</unitPattern>
-				<unitPattern count="other">{0} ઔંશ</unitPattern>
+			<unit type="mass-gram">
+				<displayName>ગ્રામ</displayName>
+				<unitPattern count="one">{0} ગ્રા</unitPattern>
+				<unitPattern count="other">{0} ગ્રા</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} પાઉન્ડ</unitPattern>
 				<unitPattern count="other">{0} પાઉન્ડ</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} ઔંશ</unitPattern>
+				<unitPattern count="other">{0} ઔંશ</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} kW</unitPattern>
@@ -6813,6 +7139,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
@@ -6860,6 +7190,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} લિ</unitPattern>
 				<unitPattern count="other">{0} લિ</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}પૂ</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}ઉ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}દ</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}પ</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gu_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gu_IN.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gu_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gu_IN.xml
index 9619632ff56..14d6ddb53af 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gu_IN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gu_IN.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="gu"/>
 		<territory type="IN"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/guz.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/guz.xml
similarity index 94%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/guz.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/guz.xml
index bb9c8920f02..6fe5790f483 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/guz.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/guz.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12313 $"/>
 		<language type="guz"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antili za Uholanzi</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Ajentina</territory>
 			<territory type="AS">Samoa ya Marekani</territory>
@@ -448,9 +446,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">Ma</dayPeriod>
+							<dayPeriod type="pm">Mo</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">Ma/Mo</dayPeriod>
-							<dayPeriod type="pm">Mambia/Mog</dayPeriod>
+							<dayPeriod type="am">Mambia</dayPeriod>
+							<dayPeriod type="pm">Mog</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -489,22 +491,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -584,6 +586,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/guz_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/guz_KE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/guz_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/guz_KE.xml
index 48afe32eef7..7c667f9b6a2 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/guz_KE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/guz_KE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="guz"/>
 		<territory type="KE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gv.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gv.xml
similarity index 53%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gv.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gv.xml
index ab191719db0..51d443f7e07 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gv.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gv.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="gv"/>
 	</identity>
 	<localeDisplayNames>
@@ -63,8 +62,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="8">Luanistyn</month>
 							<month type="9">M-fouyir</month>
 							<month type="10">J-fouyir</month>
-							<month type="11">M.Houney</month>
-							<month type="12">M.Nollick</month>
+							<month type="11">M-Houney</month>
+							<month type="12">M-Nollick</month>
 						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">Jerrey-geuree</month>
@@ -106,6 +105,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</days>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">a.m.</dayPeriod>
+							<dayPeriod type="pm">p.m.</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">a.m.</dayPeriod>
 							<dayPeriod type="pm">p.m.</dayPeriod>
@@ -200,6 +203,71 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="two" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="few" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="many" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="two" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="few" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="many" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="two" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="few" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="many" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="two" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="few" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="many" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="two" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="few" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="many" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="two" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="few" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="many" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="two" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="few" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="many" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="two" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="few" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="many" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="two" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="few" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="many" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="two" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="few" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="many" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="two" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="few" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="many" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="two" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="few" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="many" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gv_IM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gv_IM.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gv_IM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gv_IM.xml
index 7f11f78f078..e61522064d6 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/gv_IM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gv_IM.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="gv"/>
 		<territory type="IM"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ha.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha.xml
similarity index 93%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ha.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha.xml
index 737e863894d..ef46566b86f 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ha.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12128 $"/>
 		<language type="ha"/>
 	</identity>
 	<localeDisplayNames>
@@ -131,7 +130,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angila</territory>
 			<territory type="AL">Albaniya</territory>
 			<territory type="AM">Armeniya</territory>
-			<territory type="AN">Antiya Na Holan</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Arjantiniya</territory>
 			<territory type="AS">Samowa Ta Amurka</territory>
@@ -546,22 +544,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
+							<pattern>h:mm:ss a zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
+							<pattern>h:mm:ss a z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
+							<pattern>h:mm:ss a</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>HH:mm</pattern>
+							<pattern>h:mm a</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -663,6 +661,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤ #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤ 0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤ 00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤ 000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤ 0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤ 00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤ 000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤ 0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤ 00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤ 000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤ 0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤ 00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤ 000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ha_Latn_GH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha_GH.xml
similarity index 71%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ha_Latn_GH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha_GH.xml
index c9024823582..b516ef961d2 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ha_Latn_GH.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha_GH.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ha"/>
-		<script type="Latn"/>
 		<territory type="GH"/>
 	</identity>
 	<numbers>
@@ -20,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha_NE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha_NE.xml
new file mode 100644
index 00000000000..d5f8b770712
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha_NE.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="ha"/>
+		<territory type="NE"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ha_Latn_NG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha_NG.xml
similarity index 65%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ha_Latn_NG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha_NG.xml
index 28ed62cab66..fea0dae02fd 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ha_Latn_NG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha_NG.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ha"/>
-		<script type="Latn"/>
 		<territory type="NG"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/haw.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/haw.xml
similarity index 85%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/haw.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/haw.xml
index 8f972c06849..9e2b84a3323 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/haw.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/haw.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="haw"/>
 	</identity>
 	<localeDisplayNames>
@@ -262,6 +261,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="USD">
@@ -271,6 +298,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</numbers>
 	<units>
 		<unitLength type="long">
+			<unit type="duration-year">
+				<displayName draft="provisional">makahiki</displayName>
+				<unitPattern count="one">{0} makahiki</unitPattern>
+				<unitPattern count="other">{0} makahiki</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="provisional">mahina</displayName>
+				<unitPattern count="one">{0} mahina</unitPattern>
+				<unitPattern count="other">{0} mahina</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="provisional">pule</displayName>
+				<unitPattern count="one">{0} pule</unitPattern>
+				<unitPattern count="other">{0} pule</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">lā</displayName>
 				<unitPattern count="one">{0} lā</unitPattern>
@@ -286,28 +328,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} minuke</unitPattern>
 				<unitPattern count="other">{0} minuke</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">mahina</displayName>
-				<unitPattern count="one">{0} mahina</unitPattern>
-				<unitPattern count="other">{0} mahina</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="provisional">kekona</displayName>
 				<unitPattern count="one">{0} kekona</unitPattern>
 				<unitPattern count="other">{0} kekona</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">pule</displayName>
-				<unitPattern count="one">{0} pule</unitPattern>
-				<unitPattern count="other">{0} pule</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">makahiki</displayName>
-				<unitPattern count="one">{0} makahiki</unitPattern>
-				<unitPattern count="other">{0} makahiki</unitPattern>
-			</unit>
 		</unitLength>
 		<unitLength type="short">
+			<unit type="duration-year">
+				<displayName draft="provisional">makahiki</displayName>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="provisional">mahina</displayName>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="provisional">pule</displayName>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">lā</displayName>
 			</unit>
@@ -317,18 +353,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="duration-minute">
 				<displayName draft="provisional">minuke</displayName>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">mahina</displayName>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="provisional">kekona</displayName>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">pule</displayName>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">makahiki</displayName>
-			</unit>
 		</unitLength>
 		<unitLength type="narrow">
 			<unit type="temperature-celsius">
@@ -342,3 +369,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</unitLength>
 	</units>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/haw_US.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/haw_US.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/haw_US.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/haw_US.xml
index c207bce25e3..246c7ded44f 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/haw_US.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/haw_US.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="haw"/>
 		<territory type="US"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/he.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/he.xml
similarity index 80%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/he.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/he.xml
index 6d310922c20..a2893d01f74 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/he.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/he.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="he"/>
 	</identity>
 	<localeDisplayNames>
@@ -39,7 +38,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ar">ערבית</language>
 			<language type="ar_001">ערבית ספרותית</language>
 			<language type="arc">ארמית</language>
-			<language type="arn" draft="contributed">אראוקנית</language>
+			<language type="arn">אראוקנית</language>
 			<language type="arp" draft="contributed">ארפהו</language>
 			<language type="arw" draft="contributed">ארוואק</language>
 			<language type="as">אסאמית</language>
@@ -63,6 +62,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bez">בנה</language>
 			<language type="bfd" draft="contributed">באפוט</language>
 			<language type="bg">בולגרית</language>
+			<language type="bgn" draft="provisional">בלוצ׳י (מערב)</language>
 			<language type="bho" draft="contributed">בוג׳פורי</language>
 			<language type="bi">ביסלמה</language>
 			<language type="bik" draft="contributed">ביקול</language>
@@ -290,6 +290,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">לאית</language>
 			<language type="lol" draft="contributed">מונגו</language>
 			<language type="loz" draft="contributed">לוזי</language>
+			<language type="lrc" draft="provisional">לורי צפונית</language>
 			<language type="lt">ליטאית</language>
 			<language type="lu">לובה-קטנגה</language>
 			<language type="lua" draft="contributed">לובה, לולואה</language>
@@ -338,12 +339,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="my">בורמזית</language>
 			<language type="mye" draft="contributed">מאיין</language>
 			<language type="myv" draft="contributed">ארזיה</language>
+			<language type="mzn" draft="provisional">מזנדראן</language>
 			<language type="na">נאורית</language>
 			<language type="nap">נפוליטנית</language>
 			<language type="naq">נאמה</language>
-			<language type="nb">‏נורבגית ספרותית</language>
+			<language type="nb">נורווגית ספרותית</language>
 			<language type="nd">צפון נדבלה</language>
 			<language type="nds">גרמנית תחתית</language>
+			<language type="nds_NL">סקסונית תחתית</language>
 			<language type="ne">נפאלית</language>
 			<language type="new" draft="contributed">נווארי</language>
 			<language type="ng" draft="contributed">נדונגה</language>
@@ -352,7 +355,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nl">הולנדית</language>
 			<language type="nl_BE">פלמית</language>
 			<language type="nmg">קוואסיו</language>
-			<language type="nn">נורבגית חדשה</language>
+			<language type="nn">נורווגית חדשה</language>
 			<language type="nnh" draft="contributed">נגיאמבון</language>
 			<language type="no">נורבגית</language>
 			<language type="nog" draft="contributed">נוגאי</language>
@@ -421,6 +424,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">סיציליאנית</language>
 			<language type="sco">סקוטית</language>
 			<language type="sd">סינדהית</language>
+			<language type="sdh">כורדית דרומית</language>
 			<language type="se">לאפית צפונית</language>
 			<language type="see" draft="contributed">סנקה</language>
 			<language type="seh">סנה</language>
@@ -458,8 +462,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">שומרית</language>
 			<language type="sv">שוודית</language>
 			<language type="sw">סווהילית</language>
+			<language type="sw_CD">סווהילי קונגולטזית</language>
 			<language type="swb" draft="provisional">קומורו</language>
-			<language type="swc">סווהילי קונגולטזית</language>
 			<language type="syc" draft="contributed">סירית קלאסית</language>
 			<language type="syr">סורית</language>
 			<language type="ta">טמילית</language>
@@ -515,7 +519,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal" draft="contributed">וולאמו</language>
 			<language type="war" draft="contributed">ווראי</language>
 			<language type="was" draft="contributed">וואשו</language>
-			<language type="wo" draft="contributed">ג׳ולוף</language>
+			<language type="wbp">וורלפירי</language>
+			<language type="wo">ג׳ולוף</language>
 			<language type="xal" draft="contributed">קלמיק</language>
 			<language type="xh">קסוסה</language>
 			<language type="xog">סוגה</language>
@@ -568,14 +573,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Hant">מסורתי</script>
 			<script type="Hant" alt="stand-alone">כתב האן מסורתי</script>
 			<script type="Hebr">עברי</script>
-			<script type="Hira" draft="contributed">הירגאנה</script>
+			<script type="Hira">הירגאנה</script>
 			<script type="Hung">הונגרי עתיק</script>
 			<script type="Inds">אינדוס</script>
 			<script type="Ital">איטלקי עתיק</script>
 			<script type="Java" draft="contributed">ג׳אוונזי</script>
 			<script type="Jpan">יפני</script>
-			<script type="Kana" draft="contributed">קטקאנה</script>
-			<script type="Khmr" draft="contributed">קמרית</script>
+			<script type="Kana">קטקאנה</script>
+			<script type="Khmr">קמרית</script>
 			<script type="Knda">קאנדה</script>
 			<script type="Kore">קוריאני</script>
 			<script type="Laoo">לאית</script>
@@ -646,7 +651,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">אנגילה</territory>
 			<territory type="AL">אלבניה</territory>
 			<territory type="AM">ארמניה</territory>
-			<territory type="AN">אנטילים הולנדיים</territory>
 			<territory type="AO">אנגולה</territory>
 			<territory type="AQ">אנטארקטיקה</territory>
 			<territory type="AR">ארגנטינה</territory>
@@ -864,7 +868,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="SS">דרום סודן</territory>
 			<territory type="ST">סאו טומה ופרינסיפה</territory>
 			<territory type="SV">אל סלבדור</territory>
-			<territory type="SX">סינט מארטן</territory>
+			<territory type="SX">סנט מארטן</territory>
 			<territory type="SY">סוריה</territory>
 			<territory type="SZ">סווזילנד</territory>
 			<territory type="TA">טריסטן דה קונה</territory>
@@ -931,6 +935,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">מיון לפי מספרים</key>
 			<key type="colStrength" draft="contributed">עוצמת המיון</key>
 			<key type="currency">מטבע</key>
+			<key type="hc">מחזור השעות (12 או 24)</key>
+			<key type="lb">סגנון מעבר שורה</key>
+			<key type="ms">מערכת מדידה</key>
 			<key type="numbers">מספרים</key>
 			<key type="timezone" draft="contributed">אזור זמן</key>
 			<key type="va" draft="contributed">משתנה אזור</key>
@@ -938,96 +945,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x" draft="contributed">שימוש פרטי</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">ספרות הינדיות</type>
-			<type type="arabext" key="numbers">ספרות הינדיות מורחבות</type>
-			<type type="armn" key="numbers">ספרות ארמניות</type>
-			<type type="armnlow" key="numbers">ספרות ארמניות קטנות</type>
-			<type type="beng" key="numbers">ספרות בנגליות</type>
-			<type type="big5han" key="collation">מיון סינית מסורתית</type>
-			<type type="buddhist" key="calendar">לוח שנה בודהיסטי</type>
-			<type type="chinese" key="calendar">לוח שנה סיני</type>
-			<type type="coptic" key="calendar" draft="contributed">לוח שנה קופטי</type>
-			<type type="dangi" key="calendar">לוח שנה קוריאני</type>
-			<type type="deva" key="numbers">ספרות של דוונגארי</type>
-			<type type="dictionary" key="collation" draft="contributed">סדר מיון במילון</type>
-			<type type="ducet" key="collation" draft="contributed">סדר מיון Unicode המוגדר כברירת מחדל</type>
-			<type type="ethi" key="numbers">ספרות אתיופיות</type>
-			<type type="ethiopic" key="calendar">לוח שנה אתיופי</type>
-			<type type="ethiopic-amete-alem" key="calendar" draft="contributed">לוח השנה אמטה אלם האתיופי</type>
-			<type type="finance" key="numbers" draft="contributed">ספרות פיננסיות</type>
-			<type type="fullwide" key="numbers">ספרות ברוחב מלא</type>
-			<type type="gb2312han" key="collation">מיון סינית מודרנית</type>
-			<type type="geor" key="numbers">ספרות גאורגיות</type>
-			<type type="gregorian" key="calendar">לוח שנה גרגוריאני</type>
-			<type type="grek" key="numbers">ספרות יווניות</type>
-			<type type="greklow" key="numbers">ספרות יווניות קטנות</type>
-			<type type="gujr" key="numbers">ספרות גוג׳רטיות</type>
-			<type type="guru" key="numbers">ספרות גורמוקיות</type>
-			<type type="hanidec" key="numbers">ספרות סיניות עשרוניות</type>
-			<type type="hans" key="numbers">ספרות סיניות מפושטות</type>
-			<type type="hansfin" key="numbers">ספרות פיננסיות סיניות מפושטות</type>
-			<type type="hant" key="numbers">ספרות סיניות מסורתיות</type>
-			<type type="hantfin" key="numbers">ספרות פיננסיות סיניות מסורתיות</type>
-			<type type="hebr" key="numbers">ספרות עבריות</type>
-			<type type="hebrew" key="calendar">לוח שנה עברי</type>
-			<type type="identical" key="colStrength" draft="contributed">מיין הכל</type>
-			<type type="indian" key="calendar" draft="contributed">לוח השנה ההודי הלאומי</type>
-			<type type="islamic" key="calendar">לוח שנה מוסלמי</type>
-			<type type="islamic-civil" key="calendar">לוח שנה מוסלמי-אזרחי</type>
-			<type type="islamic-tbla" key="calendar" draft="contributed">לוח שנה מוסלמי-אסטרולוגי</type>
-			<type type="iso8601" key="calendar">לוח שנה ISO-8601</type>
-			<type type="japanese" key="calendar">לוח שנה יפני</type>
-			<type type="jpan" key="numbers">ספרות יפניות</type>
-			<type type="jpanfin" key="numbers">ספרות פיננסיות יפניות</type>
-			<type type="khmr" key="numbers">ספרות חמריות</type>
-			<type type="knda" key="numbers">ספרות של קנאדה</type>
-			<type type="laoo" key="numbers">ספרות של לאוס</type>
-			<type type="latn" key="numbers">ספרות מערביות</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">מיין תחילה לפי אותיות קטנות</type>
-			<type type="mlym" key="numbers">ספרות של מליאלאם</type>
-			<type type="mong" key="numbers" draft="contributed">ספרות מונגוליות</type>
-			<type type="mymr" key="numbers">ספרות של מיאנמר</type>
-			<type type="native" key="numbers" draft="contributed">ספרות מקומיות</type>
-			<type type="no" key="colBackwards" draft="contributed">מיין הטעמות בצורה רגילה</type>
-			<type type="no" key="colCaseFirst" draft="contributed">מיין לפי סדר רישיות רגיל</type>
-			<type type="no" key="colCaseLevel" draft="contributed">מיין באופן שאינו תלוי רישיות</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">מיין קאנה בנפרד</type>
-			<type type="no" key="colNormalization" draft="contributed">מיין ללא נורמליזציה</type>
-			<type type="no" key="colNumeric" draft="contributed">מיין ספרות בנפרד</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">מיין סמלים</type>
-			<type type="orya" key="numbers">ספרות אוריה</type>
-			<type type="persian" key="calendar">לוח שנה פרסי</type>
-			<type type="phonebook" key="collation">מיון ספר טלפונים</type>
-			<type type="phonetic" key="collation" draft="contributed">סדר מיון פונטי</type>
-			<type type="pinyin" key="collation">מיון פיניין</type>
-			<type type="primary" key="colStrength" draft="contributed">מיין תוך התעלמות מהטעמות</type>
-			<type type="quaternary" key="colStrength" draft="contributed">מיין לפי הטעמות/רישיות/רוחב/קאנה</type>
-			<type type="reformed" key="collation" draft="contributed">סדר מיון מתוקן</type>
-			<type type="roc" key="calendar" draft="contributed">לוח השנה הסיני Minguo</type>
-			<type type="roman" key="numbers">ספרות רומיות</type>
-			<type type="romanlow" key="numbers">ספרות רומיות קטנות</type>
-			<type type="search" key="collation">חיפוש כללי</type>
-			<type type="searchjl" key="collation" draft="contributed">חפש לפי העיצור הראשון באותיות הנגול</type>
-			<type type="secondary" key="colStrength" draft="contributed">מיין לפי הטעמות</type>
-			<type type="shifted" key="colAlternate" draft="contributed">מיין תוך התעלמות מסמלים</type>
-			<type type="standard" key="collation">סדר מיון רגיל</type>
-			<type type="stroke" key="collation" draft="contributed">סדר מיון לפי ספירת תווים</type>
-			<type type="taml" key="numbers">ספרות טמיליות מסורתיות</type>
-			<type type="tamldec" key="numbers">ספרות טמיליות</type>
-			<type type="telu" key="numbers">ספרות טלוגו</type>
-			<type type="tertiary" key="colStrength" draft="contributed">מיין הטעמות/רישיות/רוחב</type>
-			<type type="thai" key="numbers">ספרות תאיות</type>
-			<type type="tibt" key="numbers">ספרות טיבטיות</type>
-			<type type="traditional" key="collation">מיון מסורתי</type>
-			<type type="traditional" key="numbers" draft="contributed">ספרות מסורתיות</type>
-			<type type="unihan" key="collation" draft="contributed">סדר מיון לפי ספירת תווים Radical-Stroke</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">מיין תחילה לפי אותיות רישיות</type>
-			<type type="vaii" key="numbers" draft="contributed">ספרות ואי</type>
-			<type type="yes" key="colBackwards" draft="contributed">מיין לפי הטעמות בסדר הפוך</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">מיין באופן תלוי רישיות</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">מיין קאנה אחרת</type>
-			<type type="yes" key="colNormalization" draft="contributed">מיין לפי Unicode מנורמל</type>
-			<type type="yes" key="colNumeric" draft="contributed">מיין ספרות לפי סדר מספרי</type>
+			<type key="calendar" type="buddhist">לוח שנה בודהיסטי</type>
+			<type key="calendar" type="chinese">לוח שנה סיני</type>
+			<type key="calendar" type="coptic" draft="contributed">לוח שנה קופטי</type>
+			<type key="calendar" type="dangi">לוח שנה קוריאני</type>
+			<type key="calendar" type="ethiopic">לוח שנה אתיופי</type>
+			<type key="calendar" type="ethiopic-amete-alem" draft="contributed">לוח השנה אמטה אלם האתיופי</type>
+			<type key="calendar" type="gregorian">לוח שנה גרגוריאני</type>
+			<type key="calendar" type="hebrew">לוח שנה עברי</type>
+			<type key="calendar" type="indian" draft="contributed">לוח השנה ההודי הלאומי</type>
+			<type key="calendar" type="islamic">לוח שנה מוסלמי</type>
+			<type key="calendar" type="islamic-civil">לוח שנה מוסלמי-אזרחי</type>
+			<type key="calendar" type="islamic-tbla">לוח שנה מוסלמי-אסטרולוגי</type>
+			<type key="calendar" type="iso8601">לוח שנה ISO-8601</type>
+			<type key="calendar" type="japanese">לוח שנה יפני</type>
+			<type key="calendar" type="persian">לוח שנה פרסי</type>
+			<type key="calendar" type="roc">לוח השנה הסיני Minguo</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">מיין סמלים</type>
+			<type key="colAlternate" type="shifted" draft="contributed">מיין תוך התעלמות מסמלים</type>
+			<type key="colBackwards" type="no" draft="contributed">מיין הטעמות בצורה רגילה</type>
+			<type key="colBackwards" type="yes" draft="contributed">מיין לפי הטעמות בסדר הפוך</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">מיין תחילה לפי אותיות קטנות</type>
+			<type key="colCaseFirst" type="no" draft="contributed">מיין לפי סדר רישיות רגיל</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">מיין תחילה לפי אותיות רישיות</type>
+			<type key="colCaseLevel" type="no" draft="contributed">מיין באופן שאינו תלוי רישיות</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">מיין באופן תלוי רישיות</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">מיין קאנה בנפרד</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">מיין קאנה אחרת</type>
+			<type key="collation" type="big5han">מיון סינית מסורתית</type>
+			<type key="collation" type="dictionary" draft="contributed">סדר מיון במילון</type>
+			<type key="collation" type="ducet" draft="contributed">סדר מיון Unicode המוגדר כברירת מחדל</type>
+			<type key="collation" type="gb2312han">מיון סינית מודרנית</type>
+			<type key="collation" type="phonebook">מיון ספר טלפונים</type>
+			<type key="collation" type="phonetic" draft="contributed">סדר מיון פונטי</type>
+			<type key="collation" type="pinyin">מיון פיניין</type>
+			<type key="collation" type="reformed" draft="contributed">סדר מיון מתוקן</type>
+			<type key="collation" type="search">חיפוש כללי</type>
+			<type key="collation" type="searchjl" draft="contributed">חפש לפי העיצור הראשון באותיות הנגול</type>
+			<type key="collation" type="standard">סדר מיון רגיל</type>
+			<type key="collation" type="stroke" draft="contributed">סדר מיון לפי ספירת תווים</type>
+			<type key="collation" type="traditional">מיון מסורתי</type>
+			<type key="collation" type="unihan" draft="contributed">סדר מיון לפי ספירת תווים Radical-Stroke</type>
+			<type key="colNormalization" type="no" draft="contributed">מיין ללא נורמליזציה</type>
+			<type key="colNormalization" type="yes" draft="contributed">מיין לפי Unicode מנורמל</type>
+			<type key="colNumeric" type="no" draft="contributed">מיין ספרות בנפרד</type>
+			<type key="colNumeric" type="yes" draft="contributed">מיין ספרות לפי סדר מספרי</type>
+			<type key="colStrength" type="identical" draft="contributed">מיין הכל</type>
+			<type key="colStrength" type="primary" draft="contributed">מיין תוך התעלמות מהטעמות</type>
+			<type key="colStrength" type="quaternary" draft="contributed">מיין לפי הטעמות/רישיות/רוחב/קאנה</type>
+			<type key="colStrength" type="secondary" draft="contributed">מיין לפי הטעמות</type>
+			<type key="colStrength" type="tertiary" draft="contributed">מיין הטעמות/רישיות/רוחב</type>
+			<type key="hc" type="h11">מערכת של 12 שעות (0–11)</type>
+			<type key="hc" type="h12">מערכת של 12 שעות (1–12)</type>
+			<type key="hc" type="h23">מערכת של 24 שעות (0–23)</type>
+			<type key="hc" type="h24">מערכת של 24 שעות (1–24)</type>
+			<type key="lb" type="loose" draft="provisional">מעבר שורה גמיש</type>
+			<type key="lb" type="normal" draft="provisional">מעבר שורה רגיל</type>
+			<type key="lb" type="strict" draft="provisional">מעבר שורה קשיח</type>
+			<type key="ms" type="metric">מערכת מטרית</type>
+			<type key="ms" type="uksystem">מערכת מדידה אימפריאלית</type>
+			<type key="ms" type="ussystem">מערכת מדידה אמריקאית</type>
+			<type key="numbers" type="arab">ספרות הינדיות</type>
+			<type key="numbers" type="arabext">ספרות הינדיות מורחבות</type>
+			<type key="numbers" type="armn">ספרות ארמניות</type>
+			<type key="numbers" type="armnlow">ספרות ארמניות קטנות</type>
+			<type key="numbers" type="beng">ספרות בנגליות</type>
+			<type key="numbers" type="deva">ספרות של דוונגארי</type>
+			<type key="numbers" type="ethi">ספרות אתיופיות</type>
+			<type key="numbers" type="finance" draft="contributed">ספרות פיננסיות</type>
+			<type key="numbers" type="fullwide">ספרות ברוחב מלא</type>
+			<type key="numbers" type="geor">ספרות גאורגיות</type>
+			<type key="numbers" type="grek">ספרות יווניות</type>
+			<type key="numbers" type="greklow">ספרות יווניות קטנות</type>
+			<type key="numbers" type="gujr">ספרות גוג׳רטיות</type>
+			<type key="numbers" type="guru">ספרות גורמוקיות</type>
+			<type key="numbers" type="hanidec">ספרות סיניות עשרוניות</type>
+			<type key="numbers" type="hans">ספרות סיניות מפושטות</type>
+			<type key="numbers" type="hansfin">ספרות פיננסיות סיניות מפושטות</type>
+			<type key="numbers" type="hant">ספרות סיניות מסורתיות</type>
+			<type key="numbers" type="hantfin">ספרות פיננסיות סיניות מסורתיות</type>
+			<type key="numbers" type="hebr">ספרות עבריות</type>
+			<type key="numbers" type="jpan">ספרות יפניות</type>
+			<type key="numbers" type="jpanfin">ספרות פיננסיות יפניות</type>
+			<type key="numbers" type="khmr">ספרות חמריות</type>
+			<type key="numbers" type="knda">ספרות של קנאדה</type>
+			<type key="numbers" type="laoo">ספרות של לאוס</type>
+			<type key="numbers" type="latn">ספרות מערביות</type>
+			<type key="numbers" type="mlym">ספרות של מליאלאם</type>
+			<type key="numbers" type="mong" draft="contributed">ספרות מונגוליות</type>
+			<type key="numbers" type="mymr">ספרות של מיאנמר</type>
+			<type key="numbers" type="native" draft="contributed">ספרות מקומיות</type>
+			<type key="numbers" type="orya">ספרות אוריה</type>
+			<type key="numbers" type="roman">ספרות רומיות</type>
+			<type key="numbers" type="romanlow">ספרות רומיות קטנות</type>
+			<type key="numbers" type="taml">ספרות טמיליות מסורתיות</type>
+			<type key="numbers" type="tamldec">ספרות טמיליות</type>
+			<type key="numbers" type="telu">ספרות טלוגו</type>
+			<type key="numbers" type="thai">ספרות תאיות</type>
+			<type key="numbers" type="tibt">ספרות טיבטיות</type>
+			<type key="numbers" type="traditional" draft="contributed">ספרות מסורתיות</type>
+			<type key="numbers" type="vaii" draft="contributed">ספרות ואי</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">מטבע BGN</transformName>
@@ -1071,10 +1088,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<moreInformation>?</moreInformation>
 	</characters>
 	<delimiters>
-		<quotationStart>״</quotationStart>
-		<quotationEnd>״</quotationEnd>
-		<alternateQuotationStart>׳</alternateQuotationStart>
-		<alternateQuotationEnd>׳</alternateQuotationEnd>
+		<quotationStart>”</quotationStart>
+		<quotationEnd>”</quotationEnd>
+		<alternateQuotationStart>’</alternateQuotationStart>
+		<alternateQuotationEnd>’</alternateQuotationEnd>
 	</delimiters>
 	<dates>
 		<calendars>
@@ -1124,6 +1141,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E ה-d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -1141,6 +1159,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d בMMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, d בMMM</dateFormatItem>
+						<dateFormatItem id="MMMMd" draft="provisional">MM d</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
@@ -1151,8 +1170,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">d בMMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E, d בMMM y G</dateFormatItem>
-						<dateFormatItem id="yyyyQQQ" draft="contributed">G y QQQ</dateFormatItem>
-						<dateFormatItem id="yyyyQQQQ" draft="contributed">G y QQQQ</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM" draft="provisional">G y MMMM</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">G y QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">G y QQQQ</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
@@ -1452,10 +1472,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<quarter type="4">רבעון 4</quarter>
 						</quarterWidth>
 						<quarterWidth type="narrow">
-							<quarter type="1">ר1</quarter>
-							<quarter type="2">ר2</quarter>
-							<quarter type="3">ר3</quarter>
-							<quarter type="4">ר4</quarter>
+							<quarter type="1">1</quarter>
+							<quarter type="2">2</quarter>
+							<quarter type="3">3</quarter>
+							<quarter type="4">4</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
 							<quarter type="1">רבעון 1</quarter>
@@ -1467,15 +1487,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">חצות</dayPeriod>
 							<dayPeriod type="am">לפנה״צ</dayPeriod>
-							<dayPeriod type="noon">בצהריים</dayPeriod>
 							<dayPeriod type="pm">אחה״צ</dayPeriod>
+							<dayPeriod type="morning1">בוקר</dayPeriod>
+							<dayPeriod type="afternoon1">צהריים</dayPeriod>
+							<dayPeriod type="afternoon2">אחר הצהריים</dayPeriod>
+							<dayPeriod type="evening1">ערב</dayPeriod>
+							<dayPeriod type="night1">לילה</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">חצות</dayPeriod>
 							<dayPeriod type="am">לפנה״צ</dayPeriod>
-							<dayPeriod type="noon">בצהריים</dayPeriod>
 							<dayPeriod type="pm">אחה״צ</dayPeriod>
+							<dayPeriod type="morning1">בוקר</dayPeriod>
+							<dayPeriod type="afternoon1">צהריים</dayPeriod>
+							<dayPeriod type="afternoon2">אחר הצהריים</dayPeriod>
+							<dayPeriod type="evening1">ערב</dayPeriod>
+							<dayPeriod type="night1">לילה</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">חצות</dayPeriod>
+							<dayPeriod type="morning1">בוקר</dayPeriod>
+							<dayPeriod type="afternoon1">צהריים</dayPeriod>
+							<dayPeriod type="afternoon2">אחר הצהריים</dayPeriod>
+							<dayPeriod type="evening1">ערב</dayPeriod>
+							<dayPeriod type="night1">לילה</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1487,7 +1527,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</eraNames>
 					<eraAbbr>
 						<era type="0">לפנה״ס</era>
+						<era type="0" alt="variant">BCE</era>
 						<era type="1">לספירה</era>
+						<era type="1" alt="variant">CE</era>
 					</eraAbbr>
 				</eras>
 				<dateFormats>
@@ -1573,12 +1615,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">H:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d.M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.M</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d בMMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, d בMMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d בMMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">M.y</dateFormatItem>
@@ -1750,7 +1797,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<monthContext type="stand-alone">
 						<monthWidth type="abbreviated">
 							<month type="1">תשרי</month>
-							<month type="2">חשוון</month>
+							<month type="2">חשון</month>
 							<month type="3">כסלו</month>
 							<month type="4">טבת</month>
 							<month type="5">שבט</month>
@@ -1782,7 +1829,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">תשרי</month>
-							<month type="2">חשון</month>
+							<month type="2">חשוון</month>
 							<month type="3">כסלו</month>
 							<month type="4">טבת</month>
 							<month type="5">שבט</month>
@@ -1830,8 +1877,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Ed" draft="provisional">E ה-d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMd">d MMMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">E, d MMMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d בMMMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d בMMMM y G</dateFormatItem>
 						<dateFormatItem id="M" draft="contributed">MMMM</dateFormatItem>
 						<dateFormatItem id="Md" draft="contributed">d בMMMM</dateFormatItem>
 						<dateFormatItem id="MEd" draft="contributed">E, d בMMMM</dateFormatItem>
@@ -1945,18 +1992,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="12">ד׳ו אל־חיג׳ה</month>
 						</monthWidth>
 						<monthWidth type="narrow">
-							<month type="1" draft="contributed">1</month>
-							<month type="2" draft="contributed">2</month>
-							<month type="3" draft="contributed">3</month>
-							<month type="4" draft="contributed">4</month>
-							<month type="5" draft="contributed">5</month>
-							<month type="6" draft="contributed">6</month>
-							<month type="7" draft="contributed">7</month>
-							<month type="8" draft="contributed">8</month>
-							<month type="9" draft="contributed">9</month>
-							<month type="10" draft="contributed">10</month>
-							<month type="11" draft="contributed">11</month>
-							<month type="12" draft="contributed">12</month>
+							<month type="1">1</month>
+							<month type="2">2</month>
+							<month type="3">3</month>
+							<month type="4">4</month>
+							<month type="5">5</month>
+							<month type="6">6</month>
+							<month type="7">7</month>
+							<month type="8">8</month>
+							<month type="9">9</month>
+							<month type="10">10</month>
+							<month type="11">11</month>
+							<month type="12">12</month>
 						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">מוחרם</month>
@@ -1985,22 +2032,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="8">שעבאן</month>
 							<month type="9">רמדאן</month>
 							<month type="10">שוואל</month>
-							<month type="11">ד׳ו אל-קעדה</month>
-							<month type="12">ד׳ו אל-חיג׳ה</month>
+							<month type="11">ד׳ו אל־קעדה</month>
+							<month type="12">ד׳ו אל־חיג׳ה</month>
 						</monthWidth>
 						<monthWidth type="narrow">
-							<month type="1" draft="contributed">1</month>
-							<month type="2" draft="contributed">2</month>
-							<month type="3" draft="contributed">3</month>
-							<month type="4" draft="contributed">4</month>
-							<month type="5" draft="contributed">5</month>
-							<month type="6" draft="contributed">6</month>
-							<month type="7" draft="contributed">7</month>
-							<month type="8" draft="contributed">8</month>
-							<month type="9" draft="contributed">9</month>
-							<month type="10" draft="contributed">10</month>
-							<month type="11" draft="contributed">11</month>
-							<month type="12" draft="contributed">12</month>
+							<month type="1">1</month>
+							<month type="2">2</month>
+							<month type="3">3</month>
+							<month type="4">4</month>
+							<month type="5">5</month>
+							<month type="6">6</month>
+							<month type="7">7</month>
+							<month type="8">8</month>
+							<month type="9">9</month>
+							<month type="10">10</month>
+							<month type="11">11</month>
+							<month type="12">12</month>
 						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">מוחרם</month>
@@ -2048,6 +2095,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E ה-d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -2064,6 +2112,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d בMMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, d בMMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d בMMMM</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
 						<dateFormatItem id="yyyyM">M/y</dateFormatItem>
@@ -2072,6 +2121,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">MMM y</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">d בMMM y</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E, d בMMM y</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM" draft="provisional">G y MMMM</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">QQQ y</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">QQQQ y</dateFormatItem>
 					</availableFormats>
@@ -2582,12 +2632,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 		</fields>
 		<timeZoneNames>
-			<hourFormat>+H:mm;-H:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<gmtZeroFormat draft="contributed">GMT</gmtZeroFormat>
+			<hourFormat>‎+HH:mm;-HH:mm‎</hourFormat>
+			<gmtFormat>GMT{0}‎</gmtFormat>
+			<gmtZeroFormat>GMT</gmtZeroFormat>
 			<regionFormat>שעון {0}</regionFormat>
 			<regionFormat type="daylight">שעון {0} (קיץ)</regionFormat>
-			<regionFormat type="standard" draft="contributed">שעון {0} (חורף)</regionFormat>
+			<regionFormat type="standard">שעון {0} (חורף)</regionFormat>
 			<fallbackFormat>{1} ({0})</fallbackFormat>
 			<zone type="Etc/Unknown">
 				<exemplarCity>עיר לא ידועה</exemplarCity>
@@ -2626,7 +2676,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>טרול</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Syowa">
-				<exemplarCity draft="contributed">שויה</exemplarCity>
+				<exemplarCity>שויה</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Mawson">
 				<exemplarCity>מאוסון</exemplarCity>
@@ -2704,7 +2754,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>ברוקן היל</exemplarCity>
 			</zone>
 			<zone type="Australia/Currie">
-				<exemplarCity draft="contributed">קרי</exemplarCity>
+				<exemplarCity>קרי</exemplarCity>
 			</zone>
 			<zone type="Australia/Melbourne">
 				<exemplarCity>מלבורן</exemplarCity>
@@ -2959,7 +3009,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>אורומקי</exemplarCity>
 			</zone>
 			<zone type="Asia/Shanghai">
-				<exemplarCity>אסיה/שנחאי</exemplarCity>
+				<exemplarCity>שנחאי</exemplarCity>
 			</zone>
 			<zone type="America/Bogota">
 				<exemplarCity>בוגוטה</exemplarCity>
@@ -3046,7 +3096,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>סטנלי</exemplarCity>
 			</zone>
 			<zone type="Pacific/Truk">
-				<exemplarCity draft="contributed">טרוק</exemplarCity>
+				<exemplarCity>טרוק</exemplarCity>
 			</zone>
 			<zone type="Pacific/Ponape">
 				<exemplarCity>פונפה</exemplarCity>
@@ -3211,7 +3261,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>אנדרבורי</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
-				<exemplarCity draft="contributed">קיריטימאטי</exemplarCity>
+				<exemplarCity>קיריטימאטי</exemplarCity>
 			</zone>
 			<zone type="Pacific/Tarawa">
 				<exemplarCity>טאראווה</exemplarCity>
@@ -3322,7 +3372,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>אולאאנבטאר</exemplarCity>
 			</zone>
 			<zone type="Asia/Choibalsan">
-				<exemplarCity draft="contributed">צ׳ואיבלסאן</exemplarCity>
+				<exemplarCity>צ׳ואיבלסאן</exemplarCity>
 			</zone>
 			<zone type="Asia/Macau">
 				<exemplarCity>מקאו</exemplarCity>
@@ -3430,7 +3480,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>ניווה</exemplarCity>
 			</zone>
 			<zone type="Pacific/Chatham">
-				<exemplarCity draft="contributed">צ׳אטהאם</exemplarCity>
+				<exemplarCity>צ׳אטהאם</exemplarCity>
 			</zone>
 			<zone type="Pacific/Auckland">
 				<exemplarCity>אוקלנד</exemplarCity>
@@ -3456,6 +3506,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>פורט מורסבי</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>בוגנוויל</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>מנילה</exemplarCity>
 			</zone>
@@ -3540,6 +3593,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>אירקוטסק</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>צ׳יטה</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>יקוטסק</exemplarCity>
 			</zone>
@@ -3558,6 +3614,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>מגדן</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>סרדנייקולימסק</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>קמצ׳טקה</exemplarCity>
 			</zone>
@@ -3817,13 +3876,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>אפטה</exemplarCity>
 			</zone>
 			<zone type="Pacific/Wallis">
-				<exemplarCity draft="contributed">ווליס</exemplarCity>
+				<exemplarCity>ווליס</exemplarCity>
 			</zone>
 			<zone type="Pacific/Apia">
 				<exemplarCity>אפיה</exemplarCity>
 			</zone>
 			<zone type="Asia/Aden">
-				<exemplarCity draft="contributed">עדן</exemplarCity>
+				<exemplarCity>עדן</exemplarCity>
 			</zone>
 			<zone type="Indian/Mayotte">
 				<exemplarCity>מאיוט</exemplarCity>
@@ -3901,7 +3960,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
-					<generic>שעון מערב ארה״ב (לוס אנג׳לס)</generic>
+					<generic>שעון מערב ארה״ב</generic>
 					<standard>שעון רגיל האוקיינוס השקט</standard>
 					<daylight>שעון קיץ, מערב ארה״ב (לוס אנג׳לס)</daylight>
 				</long>
@@ -4176,7 +4235,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Galapagos">
 				<long>
-					<standard draft="contributed">שעון איי גלאפגוס</standard>
+					<standard>שעון איי גלאפגוס</standard>
 				</long>
 			</metazone>
 			<metazone type="Gambier">
@@ -4227,9 +4286,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
-					<generic draft="contributed">שעון האיים האלאוטיים הוואי</generic>
-					<standard draft="contributed">שעון רגיל האיים האלאוטיים הוואי</standard>
-					<daylight draft="contributed">שעון קיץ האיים האלאוטיים הוואי</daylight>
+					<generic>שעון האיים האלאוטיים הוואי</generic>
+					<standard>שעון רגיל האיים האלאוטיים הוואי</standard>
+					<daylight>שעון קיץ האיים האלאוטיים הוואי</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hong_Kong">
@@ -4366,7 +4425,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Macquarie">
 				<long>
-					<standard draft="contributed">שעון מקווארי</standard>
+					<standard>שעון מקווארי</standard>
 				</long>
 			</metazone>
 			<metazone type="Magadan">
@@ -4524,7 +4583,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>שעון פרגוואי</generic>
 					<standard>שעון פרגוואי (חורף)</standard>
-					<daylight>שעון קיץ פרגוואי</daylight>
+					<daylight>שעון פרגוואי (קיץ)</daylight>
 				</long>
 			</metazone>
 			<metazone type="Peru">
@@ -4846,30 +4905,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern type="100000000" count="two">‏000 מיל׳</pattern>
 					<pattern type="100000000" count="many">‏000 מיל׳</pattern>
 					<pattern type="100000000" count="other">‏000 מיל׳</pattern>
-					<pattern type="1000000000" count="one">‏0 מלרד</pattern>
-					<pattern type="1000000000" count="two">‏0 מלרד</pattern>
-					<pattern type="1000000000" count="many">‏0 מלרד</pattern>
-					<pattern type="1000000000" count="other">‏0 מלרד</pattern>
-					<pattern type="10000000000" count="one">‏00 מלרד</pattern>
-					<pattern type="10000000000" count="two">‏00 מלרד</pattern>
-					<pattern type="10000000000" count="many">‏00 מלרד</pattern>
-					<pattern type="10000000000" count="other">‏00 מלרד</pattern>
-					<pattern type="100000000000" count="one">‏000 מלרד</pattern>
-					<pattern type="100000000000" count="two">‏000 מלרד</pattern>
-					<pattern type="100000000000" count="many">‏000 מלרד</pattern>
-					<pattern type="100000000000" count="other">‏000 מלרד</pattern>
-					<pattern type="1000000000000" count="one">‏0 ביל׳</pattern>
-					<pattern type="1000000000000" count="two">‏0 ביל׳</pattern>
-					<pattern type="1000000000000" count="many">‏0 ביל׳</pattern>
-					<pattern type="1000000000000" count="other">‏0 ביל׳</pattern>
-					<pattern type="10000000000000" count="one">‏00 ביל׳</pattern>
-					<pattern type="10000000000000" count="two">‏00 ביל׳</pattern>
-					<pattern type="10000000000000" count="many">‏00 ביל׳</pattern>
-					<pattern type="10000000000000" count="other">‏00 ביל׳</pattern>
-					<pattern type="100000000000000" count="one">‏000 ביל׳</pattern>
-					<pattern type="100000000000000" count="two">‏000 ביל׳</pattern>
-					<pattern type="100000000000000" count="many">‏000 ביל׳</pattern>
-					<pattern type="100000000000000" count="other">‏000 ביל׳</pattern>
+					<pattern type="1000000000" count="one">0B</pattern>
+					<pattern type="1000000000" count="two">0B</pattern>
+					<pattern type="1000000000" count="many">0B</pattern>
+					<pattern type="1000000000" count="other">0B</pattern>
+					<pattern type="10000000000" count="one">00B</pattern>
+					<pattern type="10000000000" count="two">00B</pattern>
+					<pattern type="10000000000" count="many">00B</pattern>
+					<pattern type="10000000000" count="other">00B</pattern>
+					<pattern type="100000000000" count="one">000B</pattern>
+					<pattern type="100000000000" count="two">000B</pattern>
+					<pattern type="100000000000" count="many">000B</pattern>
+					<pattern type="100000000000" count="other">000B</pattern>
+					<pattern type="1000000000000" count="one">0T</pattern>
+					<pattern type="1000000000000" count="two">0T</pattern>
+					<pattern type="1000000000000" count="many">0T</pattern>
+					<pattern type="1000000000000" count="other">0T</pattern>
+					<pattern type="10000000000000" count="one">00T</pattern>
+					<pattern type="10000000000000" count="two">00T</pattern>
+					<pattern type="10000000000000" count="many">00T</pattern>
+					<pattern type="10000000000000" count="other">00T</pattern>
+					<pattern type="100000000000000" count="one">000T</pattern>
+					<pattern type="100000000000000" count="two">000T</pattern>
+					<pattern type="100000000000000" count="many">000T</pattern>
+					<pattern type="100000000000000" count="other">000T</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
@@ -4896,6 +4955,58 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">¤ 0K</pattern>
+					<pattern type="1000" count="two">¤ 0K</pattern>
+					<pattern type="1000" count="many">¤0K</pattern>
+					<pattern type="1000" count="other">¤ 0K</pattern>
+					<pattern type="10000" count="one">¤00K</pattern>
+					<pattern type="10000" count="two">¤00K</pattern>
+					<pattern type="10000" count="many">¤00K</pattern>
+					<pattern type="10000" count="other">¤ 00K</pattern>
+					<pattern type="100000" count="one">¤000K</pattern>
+					<pattern type="100000" count="two">¤000K</pattern>
+					<pattern type="100000" count="many">¤000K</pattern>
+					<pattern type="100000" count="other">¤000K</pattern>
+					<pattern type="1000000" count="one">¤0M</pattern>
+					<pattern type="1000000" count="two">¤0M</pattern>
+					<pattern type="1000000" count="many">¤0M</pattern>
+					<pattern type="1000000" count="other">¤0M</pattern>
+					<pattern type="10000000" count="one">¤00M</pattern>
+					<pattern type="10000000" count="two">¤00M</pattern>
+					<pattern type="10000000" count="many">¤00M</pattern>
+					<pattern type="10000000" count="other">¤00M</pattern>
+					<pattern type="100000000" count="one">¤000M</pattern>
+					<pattern type="100000000" count="two">¤000M</pattern>
+					<pattern type="100000000" count="many">¤000M</pattern>
+					<pattern type="100000000" count="other">¤000M</pattern>
+					<pattern type="1000000000" count="one">¤0B</pattern>
+					<pattern type="1000000000" count="two">¤0B</pattern>
+					<pattern type="1000000000" count="many">¤0B</pattern>
+					<pattern type="1000000000" count="other">¤0B</pattern>
+					<pattern type="10000000000" count="one">¤00B</pattern>
+					<pattern type="10000000000" count="two">¤00B</pattern>
+					<pattern type="10000000000" count="many">¤00B</pattern>
+					<pattern type="10000000000" count="other">¤00B</pattern>
+					<pattern type="100000000000" count="one">¤000B</pattern>
+					<pattern type="100000000000" count="two">¤000B</pattern>
+					<pattern type="100000000000" count="many">¤000B</pattern>
+					<pattern type="100000000000" count="other">¤000B</pattern>
+					<pattern type="1000000000000" count="one">¤0T</pattern>
+					<pattern type="1000000000000" count="two">¤0T</pattern>
+					<pattern type="1000000000000" count="many">¤0T</pattern>
+					<pattern type="1000000000000" count="other">¤0T</pattern>
+					<pattern type="10000000000000" count="one">¤00T</pattern>
+					<pattern type="10000000000000" count="two">¤00T</pattern>
+					<pattern type="10000000000000" count="many">¤00T</pattern>
+					<pattern type="10000000000000" count="other">¤00T</pattern>
+					<pattern type="100000000000000" count="one">¤000T</pattern>
+					<pattern type="100000000000000" count="two">¤000T</pattern>
+					<pattern type="100000000000000" count="many">¤000T</pattern>
+					<pattern type="100000000000000" count="other">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="two">{0} {1}</unitPattern>
 			<unitPattern count="many">{0} {1}</unitPattern>
@@ -4952,6 +5063,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">קואנזה אנגולי</displayName>
 				<displayName count="other">קואנזה אנגולי</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AON">
 				<displayName>קואנזה חדש אנגולי (1990–2000)</displayName>
@@ -5012,6 +5124,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">מארק בר המרה של בוסניה־הרצגובינה</displayName>
 				<displayName count="other">מארק בר המרה של בוסניה־הרצגובינה</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>דולר ברבדיאני</displayName>
@@ -5089,6 +5202,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">בוליביאנו</displayName>
 				<displayName count="other">בוליביאנו</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOP">
 				<displayName>פזו בוליבי</displayName>
@@ -5132,6 +5246,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">פולה בוצוואני</displayName>
 				<displayName count="other">פולה בוצוואני</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYR">
 				<displayName>רובל בלרוסי</displayName>
@@ -5216,12 +5331,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>דינר סרבי ישן</displayName>
 			</currency>
 			<currency type="CUC">
-				<displayName draft="contributed">פזו קובני להמרה</displayName>
-				<displayName count="one" draft="contributed">פזו קובני להמרה</displayName>
-				<displayName count="two" draft="contributed">פזו קובני להמרה</displayName>
-				<displayName count="many" draft="contributed">פזו קובני להמרה</displayName>
-				<displayName count="other" draft="contributed">פזו קובני להמרה</displayName>
+				<displayName>פזו קובני להמרה</displayName>
+				<displayName count="one">פזו קובני להמרה</displayName>
+				<displayName count="two">פזו קובני להמרה</displayName>
+				<displayName count="many">פזו קובני להמרה</displayName>
+				<displayName count="other">פזו קובני להמרה</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>פזו קובני</displayName>
@@ -5250,6 +5366,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">קורונה צ׳כית</displayName>
 				<displayName count="other">קורונה צ׳כית</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>מרק מזרח גרמני</displayName>
@@ -5272,6 +5389,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">כתר דני</displayName>
 				<displayName count="other">כתר דני</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>פזו דומיניקני</displayName>
@@ -5303,6 +5421,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">לירה מצרית</displayName>
 				<displayName count="other">לירה מצרית</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>נאקפה אריתראי</displayName>
@@ -5357,6 +5476,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">לירה של איי פוקלנד</displayName>
 				<displayName count="other">לירה של איי פוקלנד</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>פרנק צרפתי</displayName>
@@ -5377,6 +5497,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">לרי גאורגי</displayName>
 				<displayName count="other">לרי גאורגי</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHS">
 				<displayName>סדי גאני</displayName>
@@ -5410,6 +5531,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">פרנק גינאי</displayName>
 				<displayName count="other">פרנק גינאי</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GRD">
 				<displayName draft="contributed">דרכמה</displayName>
@@ -5421,6 +5543,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">קצל גואטמלי</displayName>
 				<displayName count="other">קצל גואטמלי</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWP">
 				<displayName>פזו גינאי</displayName>
@@ -5450,6 +5573,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">למפירה הונדורי</displayName>
 				<displayName count="other">למפירה הונדורי</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRK">
 				<displayName>קונה קרואטי</displayName>
@@ -5458,6 +5582,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">קונה קרואטי</displayName>
 				<displayName count="other">קונה קרואטי</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>גורד האיטי</displayName>
@@ -5474,6 +5599,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">פורינט הונגרי</displayName>
 				<displayName count="other">פורינט הונגרי</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>רופיה אינדונזית</displayName>
@@ -5482,6 +5608,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">רופיה אינדונזית</displayName>
 				<displayName count="other">רופיה אינדונזית</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>לירה אירית</displayName>
@@ -5509,11 +5636,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">₹</symbol>
 			</currency>
 			<currency type="IQD">
-				<displayName>דינר עירקי</displayName>
-				<displayName count="one">דינר עירקי</displayName>
-				<displayName count="two">דינר עירקי</displayName>
-				<displayName count="many">דינר עירקי</displayName>
-				<displayName count="other">דינר עירקי</displayName>
+				<displayName>דינר עיראקי</displayName>
+				<displayName count="one">דינר עיראקי</displayName>
+				<displayName count="two">דינר עיראקי</displayName>
+				<displayName count="many">דינר עיראקי</displayName>
+				<displayName count="other">דינר עיראקי</displayName>
 				<symbol>IQD</symbol>
 			</currency>
 			<currency type="IRR">
@@ -5531,6 +5658,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">קרונה איסלנדית</displayName>
 				<displayName count="other">קרונה איסלנדית</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>לירה איטלקית</displayName>
@@ -5593,6 +5721,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">פרנק קומורואי</displayName>
 				<displayName count="other">פרנק קומורואי</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>וון צפון-קוריאני</displayName>
@@ -5601,6 +5730,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">וון צפון-קוריאני</displayName>
 				<displayName count="other">וון צפון-קוריאני</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>וון דרום-קוריאני</displayName>
@@ -5653,6 +5783,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">לירה לבנונית</displayName>
 				<displayName count="other">לירה לבנונית</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>רופי סרי לנקי</displayName>
@@ -5661,6 +5792,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">רופי סרי לנקי</displayName>
 				<displayName count="other">רופי סרי לנקי</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>דולר ליברי</displayName>
@@ -5723,6 +5855,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">אריארי מלגשי</displayName>
 				<displayName count="other">אריארי מלגשי</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>פרנק מדגסקארי</displayName>
@@ -5742,6 +5875,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">קיאט מיאנמרי</displayName>
 				<displayName count="other">קיאט מיאנמרי</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>טוגריק מונגולי</displayName>
@@ -5778,6 +5912,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">רופי מאוריציני</displayName>
 				<displayName count="other">רופי מאוריציני</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>רופיה מלדיבית</displayName>
@@ -5814,6 +5949,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">רינגיט מלזי</displayName>
 				<displayName count="other">רינגיט מלזי</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>אסקודו מוזמביקי</displayName>
@@ -5858,6 +5994,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">קורדובה ניקראגי</displayName>
 				<displayName count="other">קורדובה ניקראגי</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>גילדן הולנדי</displayName>
@@ -5869,6 +6006,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">כתר נורבגי</displayName>
 				<displayName count="other">כתר נורבגי</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>רופי נפאלי</displayName>
@@ -5877,6 +6015,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">רופי נפאלי</displayName>
 				<displayName count="other">רופי נפאלי</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>דולר ניו זילנדי</displayName>
@@ -5935,6 +6074,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">רופי פקיסטני</displayName>
 				<displayName count="other">רופי פקיסטני</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>זלוטי פולני</displayName>
@@ -5943,6 +6083,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">זלוטי פולני</displayName>
 				<displayName count="other">זלוטי פולני</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName draft="provisional">זלוטי (1950 – 1995)</displayName>
@@ -5993,6 +6134,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">רובל רוסי</displayName>
 				<displayName count="other">רובל רוסי</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 				<symbol alt="variant" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
@@ -6005,6 +6147,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">פרנק רואנדי</displayName>
 				<displayName count="other">פרנק רואנדי</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>ריאל סעודי</displayName>
@@ -6051,7 +6194,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="two">כתר שוודי</displayName>
 				<displayName count="many">כתר שוודי</displayName>
 				<displayName count="other">כתר שוודי</displayName>
-				<symbol draft="provisional">SEK</symbol>
+				<symbol draft="contributed">SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>דולר סינגפורי</displayName>
@@ -6069,6 +6213,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">פאונד סנט הלני</displayName>
 				<displayName count="other">פאונד סנט הלני</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>טולאר סלובני</displayName>
@@ -6120,6 +6265,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">דוברה של סן טומה ופרינסיפה</displayName>
 				<displayName count="other">דוברה של סן טומה ופרינסיפה</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>רובל סובייטי</displayName>
@@ -6138,6 +6284,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">לירה סורית</displayName>
 				<displayName count="other">לירה סורית</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>לילנגני סווזי</displayName>
@@ -6154,6 +6301,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">בהט תאילנדי</displayName>
 				<displayName count="other">בהט תאילנדי</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJS">
 				<displayName>סומוני טג׳קיסטני</displayName>
@@ -6189,6 +6337,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">פאנגה טונגי</displayName>
 				<displayName count="other">פאנגה טונגי</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>אסקודו טימוראי</displayName>
@@ -6294,6 +6443,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">בוליבר ונצואלי</displayName>
 				<displayName count="other">בוליבר ונצואלי</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>דונג וייטנאמי</displayName>
@@ -6341,6 +6491,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">דולר מזרח קריבי</displayName>
 				<displayName count="other">דולר מזרח קריבי</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>זכויות משיכה מיוחדות</displayName>
@@ -6349,11 +6500,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>פרנק זהב</displayName>
 			</currency>
 			<currency type="XOF">
-				<displayName draft="contributed">פרנק CFA BCEAO</displayName>
-				<displayName count="one" draft="contributed">פרנק CFA BCEAO</displayName>
-				<displayName count="two" draft="contributed">פרנק CFA BCEAO</displayName>
-				<displayName count="many" draft="contributed">פרנק CFA BCEAO</displayName>
-				<displayName count="other" draft="contributed">פרנק CFA BCEAO</displayName>
+				<displayName>פרנק CFA BCEAO</displayName>
+				<displayName count="one">פרנק CFA BCEAO</displayName>
+				<displayName count="two">פרנק CFA BCEAO</displayName>
+				<displayName count="many">פרנק CFA BCEAO</displayName>
+				<displayName count="other">פרנק CFA BCEAO</displayName>
 				<symbol>CFA</symbol>
 			</currency>
 			<currency type="XPD">
@@ -6407,6 +6558,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">ראנד דרום אפריקאי</displayName>
 				<displayName count="other">ראנד דרום אפריקאי</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>קוואצ׳ה זמבית (1968–2012)</displayName>
@@ -6418,6 +6570,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">קוואצ׳ה זמבית</displayName>
 				<displayName count="other">קוואצ׳ה זמבית</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>זאיר חדש</displayName>
@@ -6434,7 +6587,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 	<units>
 		<unitLength type="long">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0} לכל {1}</compoundUnitPattern>
+				<compoundUnitPattern>{0} לכל {1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>כוח ג׳י</displayName>
@@ -6444,25 +6597,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} כוחות ג׳י</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
-				<displayName draft="contributed">מטר לשנייה בריבוע</displayName>
-				<unitPattern count="one" draft="contributed">{0} מטר לשנייה בריבוע</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} מטר לשנייה בריבוע</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מטר לשנייה בריבוע</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מטר לשנייה בריבוע</unitPattern>
+				<displayName>מטר לשנייה בריבוע</displayName>
+				<unitPattern count="one">{0} מטר לשנייה בריבוע</unitPattern>
+				<unitPattern count="two">{0} מטר לשנייה בריבוע</unitPattern>
+				<unitPattern count="many">{0} מטר לשנייה בריבוע</unitPattern>
+				<unitPattern count="other">{0} מטר לשנייה בריבוע</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName draft="contributed">דקות קשת</displayName>
-				<unitPattern count="one" draft="contributed">דקה {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} דקות</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} דקות</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} דקות</unitPattern>
+			<unit type="angle-revolution">
+				<displayName>סיבוב</displayName>
+				<unitPattern count="one">סיבוב {0}</unitPattern>
+				<unitPattern count="two">{0} סיבובים</unitPattern>
+				<unitPattern count="many">{0} סיבובים</unitPattern>
+				<unitPattern count="other">{0} סיבובים</unitPattern>
 			</unit>
-			<unit type="angle-arc-second">
-				<displayName draft="contributed">שניות קשת</displayName>
-				<unitPattern count="one" draft="contributed">שנייה {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} שניות</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} שניות</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} שניות</unitPattern>
+			<unit type="angle-radian">
+				<displayName>רדיאנים</displayName>
+				<unitPattern count="one">רדיאן אחד</unitPattern>
+				<unitPattern count="two">שני רדיאנים</unitPattern>
+				<unitPattern count="many">{0} רדיאנים</unitPattern>
+				<unitPattern count="other">{0} רדיאנים</unitPattern>
 			</unit>
 			<unit type="angle-degree">
 				<displayName>מעלות</displayName>
@@ -6471,110 +6624,127 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} מעלות</unitPattern>
 				<unitPattern count="other">{0} מעלות</unitPattern>
 			</unit>
-			<unit type="angle-radian">
-				<displayName>רדיאנים</displayName>
-				<unitPattern count="one" draft="contributed">רדיאן אחד</unitPattern>
-				<unitPattern count="two" draft="contributed">שני רדיאנים</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} רדיאנים</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} רדיאנים</unitPattern>
+			<unit type="angle-arc-minute">
+				<displayName>דקות קשת</displayName>
+				<unitPattern count="one">דקת קשת {0}</unitPattern>
+				<unitPattern count="two">{0} דקות קשת</unitPattern>
+				<unitPattern count="many">{0} דקות קשת</unitPattern>
+				<unitPattern count="other">{0} דקות קשת</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName draft="contributed">אקר</displayName>
-				<unitPattern count="one" draft="contributed">אקר {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} אקר</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} אקר</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} אקר</unitPattern>
-			</unit>
-			<unit type="area-hectare">
-				<displayName>הקטאר</displayName>
-				<unitPattern count="one" draft="contributed">הקטאר {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} הקטאר</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} הקטאר</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} הקטאר</unitPattern>
-			</unit>
-			<unit type="area-square-centimeter">
-				<displayName>סנטימטר רבוע</displayName>
-				<unitPattern count="one">{0} סנטימטר רבוע</unitPattern>
-				<unitPattern count="two">{0} סנטימטר רבוע</unitPattern>
-				<unitPattern count="many">{0} סנטימטר רבוע</unitPattern>
-				<unitPattern count="other">{0} סנטימטר רבוע</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<displayName>רגל רבועה</displayName>
-				<unitPattern count="one" draft="contributed">רגל רבועה {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} רגל רבועה</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} רגל רבועה</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} רגל רבועה</unitPattern>
-			</unit>
-			<unit type="area-square-inch">
-				<displayName draft="contributed">אינצ׳ רבוע</displayName>
-				<unitPattern count="one" draft="contributed">{0} אינצ׳ רבוע</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} אינצ׳ רבוע</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} אינצ׳ רבוע</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} אינצ׳ רבוע</unitPattern>
+			<unit type="angle-arc-second">
+				<displayName>שניות קשת</displayName>
+				<unitPattern count="one">שניית קשת {0}</unitPattern>
+				<unitPattern count="two">{0} שניות קשת</unitPattern>
+				<unitPattern count="many">{0} שניות קשת</unitPattern>
+				<unitPattern count="other">{0} שניות קשת</unitPattern>
 			</unit>
 			<unit type="area-square-kilometer">
 				<displayName>קילומטר רבוע</displayName>
-				<unitPattern count="one" draft="contributed">קילומטר רבוע {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} קילומטר רבוע</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} קילומטר רבוע</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} קילומטר רבוע</unitPattern>
+				<unitPattern count="one">קילומטר רבוע {0}</unitPattern>
+				<unitPattern count="two">{0} קילומטר רבוע</unitPattern>
+				<unitPattern count="many">{0} קילומטר רבוע</unitPattern>
+				<unitPattern count="other">{0} קילומטר רבוע</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>הקטאר</displayName>
+				<unitPattern count="one">הקטאר {0}</unitPattern>
+				<unitPattern count="two">{0} הקטאר</unitPattern>
+				<unitPattern count="many">{0} הקטאר</unitPattern>
+				<unitPattern count="other">{0} הקטאר</unitPattern>
 			</unit>
 			<unit type="area-square-meter">
 				<displayName>מטר רבוע</displayName>
-				<unitPattern count="one" draft="contributed">מטר רבוע {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} מטר רבוע</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מטר רבוע</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מטר רבוע</unitPattern>
+				<unitPattern count="one">מטר רבוע {0}</unitPattern>
+				<unitPattern count="two">{0} מטר רבוע</unitPattern>
+				<unitPattern count="many">{0} מטר רבוע</unitPattern>
+				<unitPattern count="other">{0} מטר רבוע</unitPattern>
+				<perUnitPattern>{0}/מטר רבוע</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>סנטימטר רבוע</displayName>
+				<unitPattern count="one">סנטימטר רבוע {0}</unitPattern>
+				<unitPattern count="two">{0} סנטימטר רבוע</unitPattern>
+				<unitPattern count="many">{0} סנטימטר רבוע</unitPattern>
+				<unitPattern count="other">{0} סנטימטר רבוע</unitPattern>
+				<perUnitPattern>{0}/סנטימטר רבוע</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
 				<displayName>מייל רבוע</displayName>
-				<unitPattern count="one" draft="contributed">מייל רבוע {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} מייל רבוע</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מייל רבוע</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מייל רבוע</unitPattern>
+				<unitPattern count="one">מייל רבוע {0}</unitPattern>
+				<unitPattern count="two">{0} מייל רבוע</unitPattern>
+				<unitPattern count="many">{0} מייל רבוע</unitPattern>
+				<unitPattern count="other">{0} מייל רבוע</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>אקר</displayName>
+				<unitPattern count="one">אקר {0}</unitPattern>
+				<unitPattern count="two">{0} אקר</unitPattern>
+				<unitPattern count="many">{0} אקר</unitPattern>
+				<unitPattern count="other">{0} אקר</unitPattern>
 			</unit>
 			<unit type="area-square-yard">
 				<displayName>יארד רבוע</displayName>
-				<unitPattern count="one" draft="contributed">{0} יארד רבוע</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} יארד רבוע</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} יארד רבוע</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} יארד רבוע</unitPattern>
+				<unitPattern count="one">{0} יארד רבוע</unitPattern>
+				<unitPattern count="two">{0} יארד רבוע</unitPattern>
+				<unitPattern count="many">{0} יארד רבוע</unitPattern>
+				<unitPattern count="other">{0} יארד רבוע</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>רגל רבועה</displayName>
+				<unitPattern count="one">רגל רבועה {0}</unitPattern>
+				<unitPattern count="two">{0} רגל רבועה</unitPattern>
+				<unitPattern count="many">{0} רגל רבועה</unitPattern>
+				<unitPattern count="other">{0} רגל רבועה</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName draft="contributed">אינצ׳ רבוע</displayName>
+				<unitPattern count="one">{0} אינץ׳ רבוע</unitPattern>
+				<unitPattern count="two">{0} אינץ׳ רבוע</unitPattern>
+				<unitPattern count="many">{0} אינץ׳ רבוע</unitPattern>
+				<unitPattern count="other">{0} אינץ׳ רבוע</unitPattern>
+				<perUnitPattern>{0}/אינץ׳ רבוע</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>קראט</displayName>
+				<unitPattern count="one">קראט אחד</unitPattern>
+				<unitPattern count="two">{0} קראט</unitPattern>
+				<unitPattern count="many">{0} קראט</unitPattern>
+				<unitPattern count="other">{0} קראט</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ליטרים/קילומטר</displayName>
-				<unitPattern count="one" draft="contributed">{0} ליטר/קילומטר</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ליטרים/קילומטר</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ליטרים/קילומטר</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ליטרים/קילומטר</unitPattern>
+				<unitPattern count="one">{0} ליטר/קילומטר</unitPattern>
+				<unitPattern count="two">{0} ליטרים/קילומטר</unitPattern>
+				<unitPattern count="many">{0} ליטרים/קילומטר</unitPattern>
+				<unitPattern count="other">{0} ליטרים/קילומטר</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ליטר/100 ק״מ</displayName>
+				<unitPattern count="one">ליטר/100 ק״מ</unitPattern>
+				<unitPattern count="two">{0} ליטר/100 ק״מ</unitPattern>
+				<unitPattern count="many">{0} ליטר/100 ק״מ</unitPattern>
+				<unitPattern count="other">{0} ליטר/100 ק״מ</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>מייל/גלון</displayName>
-				<unitPattern count="one" draft="contributed">{0} מייל/גלון</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} מייל/גלון</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מייל/גלון</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מייל/גלון</unitPattern>
+				<unitPattern count="one">{0} מייל/גלון</unitPattern>
+				<unitPattern count="two">{0} מייל/גלון</unitPattern>
+				<unitPattern count="many">{0} מייל/גלון</unitPattern>
+				<unitPattern count="other">{0} מייל/גלון</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName draft="contributed">סיביות</displayName>
-				<unitPattern count="one" draft="contributed">{0} סיבית</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} סיביות</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} סיביות</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} סיביות</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>טרה-בתים</displayName>
+				<unitPattern count="one">טרה-בית {0}</unitPattern>
+				<unitPattern count="two">{0} טרה-בתים</unitPattern>
+				<unitPattern count="many">{0} טרה-בתים</unitPattern>
+				<unitPattern count="other">{0} טרה-בתים</unitPattern>
 			</unit>
-			<unit type="digital-byte">
-				<displayName draft="contributed">בתים</displayName>
-				<unitPattern count="one" draft="contributed">{0} בית</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} בתים</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} בתים</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} בתים</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName draft="contributed">גיגהסיביות</displayName>
-				<unitPattern count="one" draft="contributed">{0} גיגהסיבית</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} גיגהסיביות</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} גיגהסיביות</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} גיגהסיביות</unitPattern>
+			<unit type="digital-terabit">
+				<displayName>טרה-סיביות</displayName>
+				<unitPattern count="one">טרה-סיבית {0}</unitPattern>
+				<unitPattern count="two">{0} טרה-סיביות</unitPattern>
+				<unitPattern count="many">{0} טרה-סיביות</unitPattern>
+				<unitPattern count="other">{0} טרה-סיביות</unitPattern>
 			</unit>
 			<unit type="digital-gigabyte">
 				<displayName>ג׳יגה-בייט</displayName>
@@ -6583,12 +6753,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} ג׳יגה-בייט</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ג׳יגה-בייט</unitPattern>
 			</unit>
-			<unit type="digital-kilobit">
-				<displayName draft="contributed">קילוסיביות</displayName>
-				<unitPattern count="one" draft="contributed">{0} קילוסיבית</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} קילוסיביות</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} קילוסיביות</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} קילוסיביות</unitPattern>
+			<unit type="digital-gigabit">
+				<displayName draft="contributed">גיגהסיביות</displayName>
+				<unitPattern count="one" draft="contributed">{0} גיגהסיבית</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} גיגהסיביות</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} גיגהסיביות</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} גיגהסיביות</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>מגה-בתים</displayName>
+				<unitPattern count="one">מגה-בית {0}</unitPattern>
+				<unitPattern count="two">{0} מגה-בתים</unitPattern>
+				<unitPattern count="many">{0} מגה-בתים</unitPattern>
+				<unitPattern count="other">{0} מגה-בתים</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>מגה-סיביות</displayName>
+				<unitPattern count="one">מגה-סיבית {0}</unitPattern>
+				<unitPattern count="two">{0} מגה-סיביות</unitPattern>
+				<unitPattern count="many">{0} מגה-סיביות</unitPattern>
+				<unitPattern count="other">{0} מגה-סיביות</unitPattern>
 			</unit>
 			<unit type="digital-kilobyte">
 				<displayName draft="contributed">קילו-בייט</displayName>
@@ -6597,33 +6781,57 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} קילו-בייט</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} קילו-בייט</unitPattern>
 			</unit>
-			<unit type="digital-megabit">
-				<displayName draft="contributed">מגהסיביות</displayName>
-				<unitPattern count="one" draft="contributed">{0} מגהסיבית</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} מגהסיביות</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מגהסיביות</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מגהסיביות</unitPattern>
+			<unit type="digital-kilobit">
+				<displayName draft="contributed">קילוסיביות</displayName>
+				<unitPattern count="one" draft="contributed">{0} קילוסיבית</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} קילוסיביות</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} קילוסיביות</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} קילוסיביות</unitPattern>
 			</unit>
-			<unit type="digital-megabyte">
-				<displayName draft="contributed">מגה-בייט</displayName>
-				<unitPattern count="one" draft="contributed">{0} מגה-בייט</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} מגה-בייט</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מגה-בייט</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מגה-בייט</unitPattern>
+			<unit type="digital-byte">
+				<displayName>בתים</displayName>
+				<unitPattern count="one">בית {0}</unitPattern>
+				<unitPattern count="two">{0} בתים</unitPattern>
+				<unitPattern count="many">{0} בתים</unitPattern>
+				<unitPattern count="other">{0} בתים</unitPattern>
 			</unit>
-			<unit type="digital-terabit">
-				<displayName draft="contributed">טרהסיביות</displayName>
-				<unitPattern count="one" draft="contributed">{0} טרהסיבית</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} טרהסיביות</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} טרהסיביות</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} טרהסיביות</unitPattern>
+			<unit type="digital-bit">
+				<displayName>סיביות</displayName>
+				<unitPattern count="one">סיבית {0}</unitPattern>
+				<unitPattern count="two">{0} סיביות</unitPattern>
+				<unitPattern count="many">{0} סיביות</unitPattern>
+				<unitPattern count="other">{0} סיביות</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName draft="contributed">טרה-בייט</displayName>
-				<unitPattern count="one" draft="contributed">{0} טרה-בייט</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} טרה-בייט</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} טרה-בייט</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} טרה-בייט</unitPattern>
+			<unit type="duration-century">
+				<displayName>מאות</displayName>
+				<unitPattern count="one">מאה {0}</unitPattern>
+				<unitPattern count="two">{0} מאות</unitPattern>
+				<unitPattern count="many">{0} מאות</unitPattern>
+				<unitPattern count="other">{0} מאות</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>שנים</displayName>
+				<unitPattern count="one">שנה</unitPattern>
+				<unitPattern count="two">שנתיים</unitPattern>
+				<unitPattern count="many">{0} שנה</unitPattern>
+				<unitPattern count="other">{0} שנים</unitPattern>
+				<perUnitPattern draft="provisional">‏{0} לשנה</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>חודשים</displayName>
+				<unitPattern count="one">חודש</unitPattern>
+				<unitPattern count="two">חודשיים</unitPattern>
+				<unitPattern count="many">{0} חודשים</unitPattern>
+				<unitPattern count="other">{0} חודשים</unitPattern>
+				<perUnitPattern>‏{0} לחודש</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>שבועות</displayName>
+				<unitPattern count="one">שבוע</unitPattern>
+				<unitPattern count="two">שבועיים</unitPattern>
+				<unitPattern count="many">{0} שבועות</unitPattern>
+				<unitPattern count="other">{0} שבועות</unitPattern>
+				<perUnitPattern>{0}/שבוע</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>ימים</displayName>
@@ -6631,6 +6839,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two">יומיים</unitPattern>
 				<unitPattern count="many">{0} יום</unitPattern>
 				<unitPattern count="other">{0} ימים</unitPattern>
+				<perUnitPattern>{0}/יום</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>שעות</displayName>
@@ -6640,40 +6849,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} שעות</unitPattern>
 				<perUnitPattern>{0} לשעה</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName draft="contributed">מיליוניות שנייה</displayName>
-				<unitPattern count="one" draft="contributed">{0} מיליונית שנייה</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} מיליוניות שנייה</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מיליוניות שנייה</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מיליוניות שנייה</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>אלפיות השניה</displayName>
-				<unitPattern count="one" draft="contributed">אלפית שנייה {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} אלפיות שנייה</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} אלפיות שנייה</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} אלפיות שנייה</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>דקות</displayName>
 				<unitPattern count="one">דקה</unitPattern>
 				<unitPattern count="two">שתי דקות</unitPattern>
 				<unitPattern count="many">{0} דקות</unitPattern>
 				<unitPattern count="other">{0} דקות</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>חודשים</displayName>
-				<unitPattern count="one">חודש</unitPattern>
-				<unitPattern count="two">חודשיים</unitPattern>
-				<unitPattern count="many">{0} חודשים</unitPattern>
-				<unitPattern count="other">{0} חודשים</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName draft="contributed">ננו שניות</displayName>
-				<unitPattern count="one" draft="contributed">{0} ננו שנייה</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ננו שניות</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ננו שניות</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ננו שניות</unitPattern>
+				<perUnitPattern>{0}/דקה</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>שניות</displayName>
@@ -6683,131 +6865,140 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} שניות</unitPattern>
 				<perUnitPattern>{0} לשניה</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>שבועות</displayName>
-				<unitPattern count="one">שבוע</unitPattern>
-				<unitPattern count="two">שבועיים</unitPattern>
-				<unitPattern count="many">{0} שבועות</unitPattern>
-				<unitPattern count="other">{0} שבועות</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>אלפיות השניה</displayName>
+				<unitPattern count="one">אלפית שנייה {0}</unitPattern>
+				<unitPattern count="two">{0} אלפיות שנייה</unitPattern>
+				<unitPattern count="many">{0} אלפיות שנייה</unitPattern>
+				<unitPattern count="other">{0} אלפיות שנייה</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>שנים</displayName>
-				<unitPattern count="one">שנה</unitPattern>
-				<unitPattern count="two">שנתיים</unitPattern>
-				<unitPattern count="many">{0} שנה</unitPattern>
-				<unitPattern count="other">{0} שנים</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>מיליוניות שנייה</displayName>
+				<unitPattern count="one">{0} מיליונית שנייה</unitPattern>
+				<unitPattern count="two">{0} מיליוניות שנייה</unitPattern>
+				<unitPattern count="many">{0} מיליוניות שנייה</unitPattern>
+				<unitPattern count="other">{0} מיליוניות שנייה</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ננו שניות</displayName>
+				<unitPattern count="one">{0} ננו שנייה</unitPattern>
+				<unitPattern count="two">{0} ננו שניות</unitPattern>
+				<unitPattern count="many">{0} ננו שניות</unitPattern>
+				<unitPattern count="other">{0} ננו שניות</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
-				<displayName draft="contributed">אמפר</displayName>
-				<unitPattern count="one" draft="contributed">{0} אמפר</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} אמפר</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} אמפר</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} אמפר</unitPattern>
+				<displayName>אמפר</displayName>
+				<unitPattern count="one">אמפר {0}</unitPattern>
+				<unitPattern count="two">{0} אמפר</unitPattern>
+				<unitPattern count="many">{0} אמפר</unitPattern>
+				<unitPattern count="other">{0} אמפר</unitPattern>
 			</unit>
 			<unit type="electric-milliampere">
-				<displayName draft="contributed">מיליאמפר</displayName>
-				<unitPattern count="one" draft="contributed">{0} מיליאמפר</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} מיליאמפר</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מיליאמפר</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מיליאמפר</unitPattern>
+				<displayName>מיליאמפר</displayName>
+				<unitPattern count="one">מיליאמפר {0}</unitPattern>
+				<unitPattern count="two">{0} מיליאמפר</unitPattern>
+				<unitPattern count="many">{0} מיליאמפר</unitPattern>
+				<unitPattern count="other">{0} מיליאמפר</unitPattern>
 			</unit>
 			<unit type="electric-ohm">
-				<displayName draft="contributed">ohms</displayName>
-				<unitPattern count="one" draft="contributed">{0} ohm</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ohms</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ohms</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ohms</unitPattern>
+				<displayName>ohms</displayName>
+				<unitPattern count="one">{0} ohm</unitPattern>
+				<unitPattern count="two">{0} ohms</unitPattern>
+				<unitPattern count="many">{0} ohms</unitPattern>
+				<unitPattern count="other">{0} ohms</unitPattern>
 			</unit>
 			<unit type="electric-volt">
-				<displayName draft="contributed">וולט</displayName>
-				<unitPattern count="one" draft="contributed">{0} וולט</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} וולט</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} וולט</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} וולט</unitPattern>
-			</unit>
-			<unit type="energy-calorie">
-				<displayName>קלוריות</displayName>
-				<unitPattern count="one" draft="contributed">{0} קלוריה</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} קלוריות</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} קלוריות</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} קלוריות</unitPattern>
-			</unit>
-			<unit type="energy-foodcalorie">
-				<displayName>קלוריות</displayName>
-				<unitPattern count="one" draft="contributed">{0} קלוריה</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} קלוריות</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} קלוריות</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} קלוריות</unitPattern>
-			</unit>
-			<unit type="energy-joule">
-				<displayName>ג׳אול</displayName>
-				<unitPattern count="one" draft="contributed">{0} ג׳אול</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ג׳אול</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ג׳אול</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ג׳אול</unitPattern>
+				<displayName>וולט</displayName>
+				<unitPattern count="one">וולט {0}</unitPattern>
+				<unitPattern count="two">{0} וולט</unitPattern>
+				<unitPattern count="many">{0} וולט</unitPattern>
+				<unitPattern count="other">{0} וולט</unitPattern>
 			</unit>
 			<unit type="energy-kilocalorie">
 				<displayName>קילו קלוריות</displayName>
-				<unitPattern count="one" draft="contributed">{0} קילו קלוריה</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} קילו קלוריות</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} קילו קלוריות</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} קילו קלוריות</unitPattern>
+				<unitPattern count="one">קילו קלוריה {0}</unitPattern>
+				<unitPattern count="two">{0} קילו קלוריות</unitPattern>
+				<unitPattern count="many">{0} קילו קלוריות</unitPattern>
+				<unitPattern count="other">{0} קילו קלוריות</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>קלוריות</displayName>
+				<unitPattern count="one">קלוריה {0}</unitPattern>
+				<unitPattern count="two">{0} קלוריות</unitPattern>
+				<unitPattern count="many">{0} קלוריות</unitPattern>
+				<unitPattern count="other">{0} קלוריות</unitPattern>
+			</unit>
+			<unit type="energy-foodcalorie">
+				<displayName>קלוריות</displayName>
+				<unitPattern count="one">קלוריה {0}</unitPattern>
+				<unitPattern count="two">{0} קלוריות</unitPattern>
+				<unitPattern count="many">{0} קלוריות</unitPattern>
+				<unitPattern count="other">{0} קלוריות</unitPattern>
 			</unit>
 			<unit type="energy-kilojoule">
-				<displayName draft="contributed">קילו ג׳אול</displayName>
-				<unitPattern count="one" draft="contributed">{0} קילו ג׳אול</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} קילו ג׳אול</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} קילו ג׳אול</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} קילו ג׳אול</unitPattern>
+				<displayName>קילו ג׳אול</displayName>
+				<unitPattern count="one">קילו ג׳אול {0}</unitPattern>
+				<unitPattern count="two">{0} קילו ג׳אול</unitPattern>
+				<unitPattern count="many">{0} קילו ג׳אול</unitPattern>
+				<unitPattern count="other">{0} קילו ג׳אול</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>ג׳אול</displayName>
+				<unitPattern count="one">{0} ג׳אול</unitPattern>
+				<unitPattern count="two">{0} ג׳אול</unitPattern>
+				<unitPattern count="many">{0} ג׳אול</unitPattern>
+				<unitPattern count="other">{0} ג׳אול</unitPattern>
 			</unit>
 			<unit type="energy-kilowatt-hour">
-				<displayName draft="contributed">קילוואט־שעה</displayName>
-				<unitPattern count="one" draft="contributed">{0} קילוואט־שעה</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} קילוואט-שעה</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} קילוואט-שעה</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} קילוואט-שעה</unitPattern>
+				<displayName>קילוואט־שעה</displayName>
+				<unitPattern count="one">קילוואט־שעה {0}</unitPattern>
+				<unitPattern count="two">{0} קילוואט-שעה</unitPattern>
+				<unitPattern count="many">{0} קילוואט-שעה</unitPattern>
+				<unitPattern count="other">{0} קילוואט-שעה</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
-				<displayName draft="contributed">גיגהרץ</displayName>
-				<unitPattern count="one" draft="contributed">{0} גיגהרץ</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} גיגהרץ</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} גיגהרץ</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} גיגהרץ</unitPattern>
-			</unit>
-			<unit type="frequency-hertz">
-				<displayName draft="contributed">הרץ</displayName>
-				<unitPattern count="one" draft="contributed">{0} הרץ</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} הרץ</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} הרץ</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} הרץ</unitPattern>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<displayName draft="contributed">קילוהרץ</displayName>
-				<unitPattern count="one" draft="contributed">{0} קילוהרץ</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} קילוהרץ</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} קילוהרץ</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} קילוהרץ</unitPattern>
+				<displayName>ג׳יגה-הרץ</displayName>
+				<unitPattern count="one">ג׳יגה-הרץ {0}</unitPattern>
+				<unitPattern count="two">{0} ג׳יגה-הרץ</unitPattern>
+				<unitPattern count="many">{0} ג׳יגה-הרץ</unitPattern>
+				<unitPattern count="other">{0} ג׳יגה-הרץ</unitPattern>
 			</unit>
 			<unit type="frequency-megahertz">
-				<displayName draft="contributed">מגהרץ</displayName>
-				<unitPattern count="one" draft="contributed">{0} מגהרץ</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} מגהרץ</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מגהרץ</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מגהרץ</unitPattern>
+				<displayName>מגה-הרץ</displayName>
+				<unitPattern count="one">מגה-הרץ {0}</unitPattern>
+				<unitPattern count="two">{0} מגה-הרץ</unitPattern>
+				<unitPattern count="many">{0} מגה-הרץ</unitPattern>
+				<unitPattern count="other">{0} מגה-הרץ</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>יחידות אסטרונומיות</displayName>
-				<unitPattern count="one">יחידה אסטרונומית אחת</unitPattern>
-				<unitPattern count="two">שתי יחידת אסטרונומיות</unitPattern>
-				<unitPattern count="many">{0} יחידות אסטרונומיות</unitPattern>
-				<unitPattern count="other">{0} יחידות אסטרונומיות</unitPattern>
+			<unit type="frequency-kilohertz">
+				<displayName>קילו-הרץ</displayName>
+				<unitPattern count="one">קילו-הרץ {0}</unitPattern>
+				<unitPattern count="two">{0} קילו-הרץ</unitPattern>
+				<unitPattern count="many">{0} קילו-הרץ</unitPattern>
+				<unitPattern count="other">{0} קילו-הרץ</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>סנטימטרים</displayName>
-				<unitPattern count="one">סנטימטר אחד</unitPattern>
-				<unitPattern count="two">שני סנטימטרים</unitPattern>
-				<unitPattern count="many">{0} סנטימטר</unitPattern>
-				<unitPattern count="other">{0} סנטימטרים</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>הרץ</displayName>
+				<unitPattern count="one">הרץ {0}</unitPattern>
+				<unitPattern count="two">{0} הרץ</unitPattern>
+				<unitPattern count="many">{0} הרץ</unitPattern>
+				<unitPattern count="other">{0} הרץ</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>קילומטרים</displayName>
+				<unitPattern count="one">קילומטר {0}</unitPattern>
+				<unitPattern count="two">{0} ק״מ</unitPattern>
+				<unitPattern count="many">{0} ק״מ</unitPattern>
+				<unitPattern count="other">{0} ק״מ</unitPattern>
+				<perUnitPattern>{0}/ק״מ</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>מטרים</displayName>
+				<unitPattern count="one">מטר אחד</unitPattern>
+				<unitPattern count="two">שני מטר</unitPattern>
+				<unitPattern count="many">{0} מטר</unitPattern>
+				<unitPattern count="other">{0} מטרים</unitPattern>
+				<perUnitPattern>{0}/מטר</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>דצימטר</displayName>
@@ -6816,54 +7007,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} דצימטר</unitPattern>
 				<unitPattern count="other">{0} דצימטרים</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>רגל</displayName>
-				<unitPattern count="one" draft="contributed">רגל {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} רגל</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} רגל</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} רגל</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>אינץ׳</displayName>
-				<unitPattern count="one" draft="contributed">אינץ׳ {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} אינץ׳</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} אינץ׳</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} אינץ׳</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>קילומטרים</displayName>
-				<unitPattern count="one" draft="contributed">קילומטר {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} קילומטר</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} קילומטר</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} קילומטר</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>שנות אור</displayName>
-				<unitPattern count="one" draft="contributed">שנת אור {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} שנות אור</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} שנות אור</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} שנות אור</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>מטרים</displayName>
-				<unitPattern count="one">מטר אחד</unitPattern>
-				<unitPattern count="two">שני מטר</unitPattern>
-				<unitPattern count="many">{0} מטר</unitPattern>
-				<unitPattern count="other">{0} מטרים</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>מיקרומטר</displayName>
-				<unitPattern count="one">מיקרומטר אחד</unitPattern>
-				<unitPattern count="two">שני מיקרומטרים</unitPattern>
-				<unitPattern count="many">{0} מיקרומטר</unitPattern>
-				<unitPattern count="other">{0} מיקרומטרים</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>מייל</displayName>
-				<unitPattern count="one">{0} מייל</unitPattern>
-				<unitPattern count="two">{0} מייל</unitPattern>
-				<unitPattern count="many">{0} מייל</unitPattern>
-				<unitPattern count="other">{0} מייל</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>סנטימטרים</displayName>
+				<unitPattern count="one">סנטימטר אחד</unitPattern>
+				<unitPattern count="two">שני סנטימטרים</unitPattern>
+				<unitPattern count="many">{0} סנטימטר</unitPattern>
+				<unitPattern count="other">{0} סנטימטרים</unitPattern>
+				<perUnitPattern>{0}/סנטימטר</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>מילימטר</displayName>
@@ -6872,33 +7022,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} מילימטר</unitPattern>
 				<unitPattern count="other">{0} מילימטר</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>מיקרומטר</displayName>
+				<unitPattern count="one">מיקרומטר אחד</unitPattern>
+				<unitPattern count="two">שני מיקרומטרים</unitPattern>
+				<unitPattern count="many">{0} מיקרומטר</unitPattern>
+				<unitPattern count="other">{0} מיקרומטרים</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
-				<displayName draft="contributed">ננומטר</displayName>
-				<unitPattern count="one" draft="contributed">{0} ננומטר</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ננומטר</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ננומטר</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ננומטר</unitPattern>
-			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>מייל ימי</displayName>
-				<unitPattern count="one">{0} מייל ימי</unitPattern>
-				<unitPattern count="two">{0} מייל ימי</unitPattern>
-				<unitPattern count="many">{0} מייל ימי</unitPattern>
-				<unitPattern count="other">{0} מייל ימי</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName draft="contributed">פארסק</displayName>
-				<unitPattern count="one" draft="contributed">{0} פארסק</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} פארסק</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} פארסק</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} פארסק</unitPattern>
+				<displayName>ננומטר</displayName>
+				<unitPattern count="one">ננומטר {0}</unitPattern>
+				<unitPattern count="two">{0} ננומטר</unitPattern>
+				<unitPattern count="many">{0} ננומטר</unitPattern>
+				<unitPattern count="other">{0} ננומטר</unitPattern>
 			</unit>
 			<unit type="length-picometer">
-				<displayName draft="contributed">פיקומטר</displayName>
-				<unitPattern count="one" draft="contributed">פיקומטר {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} פיקומטר</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} פיקומטר</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} פיקומטר</unitPattern>
+				<displayName>פיקומטר</displayName>
+				<unitPattern count="one">פיקומטר {0}</unitPattern>
+				<unitPattern count="two">{0} פיקומטר</unitPattern>
+				<unitPattern count="many">{0} פיקומטר</unitPattern>
+				<unitPattern count="other">{0} פיקומטר</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>מייל</displayName>
+				<unitPattern count="one">{0} מייל</unitPattern>
+				<unitPattern count="two">{0} מייל</unitPattern>
+				<unitPattern count="many">{0} מייל</unitPattern>
+				<unitPattern count="other">{0} מייל</unitPattern>
 			</unit>
 			<unit type="length-yard">
 				<displayName>יארד</displayName>
@@ -6907,138 +7057,207 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} יארד</unitPattern>
 				<unitPattern count="other">{0} יארד</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>רגל</displayName>
+				<unitPattern count="one">רגל {0}</unitPattern>
+				<unitPattern count="two">{0} רגל</unitPattern>
+				<unitPattern count="many">{0} רגל</unitPattern>
+				<unitPattern count="other">{0} רגל</unitPattern>
+				<perUnitPattern>{0}/רגל</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>אינץ׳</displayName>
+				<unitPattern count="one">אינץ׳ {0}</unitPattern>
+				<unitPattern count="two">{0} אינץ׳</unitPattern>
+				<unitPattern count="many">{0} אינץ׳</unitPattern>
+				<unitPattern count="other">{0} אינץ׳</unitPattern>
+				<perUnitPattern>{0}/אינץ׳</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>פארסק</displayName>
+				<unitPattern count="one">פארסק {0}</unitPattern>
+				<unitPattern count="two">{0} פארסק</unitPattern>
+				<unitPattern count="many">{0} פארסק</unitPattern>
+				<unitPattern count="other">{0} פארסק</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>שנות אור</displayName>
+				<unitPattern count="one">שנת אור {0}</unitPattern>
+				<unitPattern count="two">{0} שנות אור</unitPattern>
+				<unitPattern count="many">{0} שנות אור</unitPattern>
+				<unitPattern count="other">{0} שנות אור</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>יחידות אסטרונומיות</displayName>
+				<unitPattern count="one">יחידה אסטרונומית אחת</unitPattern>
+				<unitPattern count="two">שתי יחידת אסטרונומיות</unitPattern>
+				<unitPattern count="many">{0} יחידות אסטרונומיות</unitPattern>
+				<unitPattern count="other">{0} יחידות אסטרונומיות</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>מייל ימי</displayName>
+				<unitPattern count="one">{0} מייל ימי</unitPattern>
+				<unitPattern count="two">{0} מייל ימי</unitPattern>
+				<unitPattern count="many">{0} מייל ימי</unitPattern>
+				<unitPattern count="other">{0} מייל ימי</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>מייל-סקנדינביה</displayName>
+				<unitPattern count="one">מייל-סקנדינביה {0}</unitPattern>
+				<unitPattern count="two">{0} מייל-סקנדינביה</unitPattern>
+				<unitPattern count="many">{0} מייל-סקנדינביה</unitPattern>
+				<unitPattern count="other">{0} מייל-סקנדינביה</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>לוקס</displayName>
-				<unitPattern count="one" draft="contributed">לוקס אחד</unitPattern>
-				<unitPattern count="two" draft="contributed">שני לוקס</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} לוקס</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} לוקס</unitPattern>
+				<unitPattern count="one">לוקס אחד</unitPattern>
+				<unitPattern count="two">{0} לוקס</unitPattern>
+				<unitPattern count="many">{0} לוקס</unitPattern>
+				<unitPattern count="other">{0} לוקס</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName draft="contributed">קרט</displayName>
-				<unitPattern count="one" draft="contributed">קרט אחד</unitPattern>
-				<unitPattern count="two" draft="contributed">שני קרט</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} קרט</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} קרט</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>גרם</displayName>
-				<unitPattern count="one" draft="contributed">גרם {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} גרם</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} גרם</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} גרם</unitPattern>
+			<unit type="mass-metric-ton">
+				<displayName>טון מטרי</displayName>
+				<unitPattern count="one">טון מטרי אחד</unitPattern>
+				<unitPattern count="two">שני טון מטרי</unitPattern>
+				<unitPattern count="many">{0} טון מטרי</unitPattern>
+				<unitPattern count="other">{0} טון מטרי</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>קילוגרם</displayName>
-				<unitPattern count="one" draft="contributed">קילוגרם {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} קילוגרם</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} קילוגרם</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} קילוגרם</unitPattern>
+				<unitPattern count="one">קילוגרם {0}</unitPattern>
+				<unitPattern count="two">{0} קילוגרם</unitPattern>
+				<unitPattern count="many">{0} קילוגרם</unitPattern>
+				<unitPattern count="other">{0} קילוגרם</unitPattern>
+				<perUnitPattern>{0}/קילוגרם</perUnitPattern>
 			</unit>
-			<unit type="mass-metric-ton">
-				<displayName draft="contributed">טון מטרי</displayName>
-				<unitPattern count="one" draft="contributed">טון מטרי אחד</unitPattern>
-				<unitPattern count="two" draft="contributed">שני טון מטרי</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} טון מטרי</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} טון מטרי</unitPattern>
-			</unit>
-			<unit type="mass-microgram">
-				<displayName>מיקרוגרם</displayName>
-				<unitPattern count="one" draft="contributed">מיקרוגרם אחד</unitPattern>
-				<unitPattern count="two" draft="contributed">שני מיקרוגרם</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מיקרוגרם</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מיקרוגרם</unitPattern>
+			<unit type="mass-gram">
+				<displayName>גרם</displayName>
+				<unitPattern count="one">גרם {0}</unitPattern>
+				<unitPattern count="two">{0} גרם</unitPattern>
+				<unitPattern count="many">{0} גרם</unitPattern>
+				<unitPattern count="other">{0} גרם</unitPattern>
+				<perUnitPattern>{0}/גרם</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>מיליגרם</displayName>
-				<unitPattern count="one" draft="contributed">מיליגרם אחד</unitPattern>
-				<unitPattern count="two" draft="contributed">שני מיליגרם</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מיליגרם</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מיליגרם</unitPattern>
+				<unitPattern count="one">מיליגרם אחד</unitPattern>
+				<unitPattern count="two">שני מיליגרם</unitPattern>
+				<unitPattern count="many">{0} מיליגרם</unitPattern>
+				<unitPattern count="other">{0} מיליגרם</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>מיקרוגרם</displayName>
+				<unitPattern count="one">מיקרוגרם אחד</unitPattern>
+				<unitPattern count="two">שני מיקרוגרם</unitPattern>
+				<unitPattern count="many">{0} מיקרוגרם</unitPattern>
+				<unitPattern count="other">{0} מיקרוגרם</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>טונות</displayName>
+				<unitPattern count="one">טון אחד</unitPattern>
+				<unitPattern count="two">שני טונות</unitPattern>
+				<unitPattern count="many">{0} טונות</unitPattern>
+				<unitPattern count="other">{0} טונות</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>פאונד</displayName>
+				<unitPattern count="one">פאונד אחד</unitPattern>
+				<unitPattern count="two">שני פאונד</unitPattern>
+				<unitPattern count="many">{0} פאונד</unitPattern>
+				<unitPattern count="other">{0} פאונד</unitPattern>
+				<perUnitPattern>{0}/פאונד</perUnitPattern>
 			</unit>
 			<unit type="mass-ounce">
 				<displayName>אונקיות</displayName>
-				<unitPattern count="one" draft="contributed">אונקיה {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} אונקיות</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} אונקיות</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} אונקיות</unitPattern>
+				<unitPattern count="one">אונקיה {0}</unitPattern>
+				<unitPattern count="two">{0} אונקיות</unitPattern>
+				<unitPattern count="many">{0} אונקיות</unitPattern>
+				<unitPattern count="other">{0} אונקיות</unitPattern>
+				<perUnitPattern>{0}/אונקיה</perUnitPattern>
 			</unit>
 			<unit type="mass-ounce-troy">
-				<displayName draft="contributed">אונקיות טרוי</displayName>
-				<unitPattern count="one" draft="contributed">אונקיית טרוי אחת</unitPattern>
-				<unitPattern count="two" draft="contributed">שתי אונקיות טרוי</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} אונקיות טרוי</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} אונקיות טרוי</unitPattern>
+				<displayName>אונקיות טרוי</displayName>
+				<unitPattern count="one">אונקיית טרוי אחת</unitPattern>
+				<unitPattern count="two">שתי אונקיות טרוי</unitPattern>
+				<unitPattern count="many">{0} אונקיות טרוי</unitPattern>
+				<unitPattern count="other">{0} אונקיות טרוי</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<displayName draft="contributed">ליבראות</displayName>
-				<unitPattern count="one" draft="contributed">ליברה {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ליבראות</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ליבראות</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ליבראות</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<displayName draft="contributed">טונות</displayName>
-				<unitPattern count="one" draft="contributed">טון אחד</unitPattern>
-				<unitPattern count="two" draft="contributed">שני טונות</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} טונות</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} טונות</unitPattern>
+			<unit type="mass-carat">
+				<displayName>קרט</displayName>
+				<unitPattern count="one">קרט אחד</unitPattern>
+				<unitPattern count="two">שני קרט</unitPattern>
+				<unitPattern count="many">{0} קרט</unitPattern>
+				<unitPattern count="other">{0} קרט</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
-				<displayName draft="contributed">ג׳יגה ואט</displayName>
-				<unitPattern count="one" draft="contributed">{0} ג׳יגה ואט</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ג׳יגה ואט</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ג׳יגה ואט</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ג׳יגה ואט</unitPattern>
-			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="contributed">כוח סוס</displayName>
-				<unitPattern count="one" draft="contributed">כוח סוס {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} כוח סוס</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} כוח סוס</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} כוח סוס</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName draft="contributed">קילוואט</displayName>
-				<unitPattern count="one" draft="contributed">קילוואט {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} קילוואט</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} קילוואט</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} קילוואט</unitPattern>
+				<displayName>ג׳יגה ואט</displayName>
+				<unitPattern count="one">ג׳יגה ואט {0}</unitPattern>
+				<unitPattern count="two">{0} ג׳יגה ואט</unitPattern>
+				<unitPattern count="many">{0} ג׳יגה ואט</unitPattern>
+				<unitPattern count="other">{0} ג׳יגה ואט</unitPattern>
 			</unit>
 			<unit type="power-megawatt">
-				<displayName draft="contributed">מגה ואט</displayName>
-				<unitPattern count="one" draft="contributed">{0} מגה ואט</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} מגה ואט</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מגה ואט</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מגה ואט</unitPattern>
+				<displayName>מגה ואט</displayName>
+				<unitPattern count="one">מגה ואט {0}</unitPattern>
+				<unitPattern count="two">{0} מגה ואט</unitPattern>
+				<unitPattern count="many">{0} מגה ואט</unitPattern>
+				<unitPattern count="other">{0} מגה ואט</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName draft="contributed">מיליוואט</displayName>
-				<unitPattern count="one" draft="contributed">{0} מיליוואט</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} מיליוואט</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מיליוואט</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מיליוואט</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>קילוואט</displayName>
+				<unitPattern count="one">קילוואט {0}</unitPattern>
+				<unitPattern count="two">{0} קילוואט</unitPattern>
+				<unitPattern count="many">{0} קילוואט</unitPattern>
+				<unitPattern count="other">{0} קילוואט</unitPattern>
 			</unit>
 			<unit type="power-watt">
-				<displayName draft="contributed">ואט</displayName>
-				<unitPattern count="one" draft="contributed">ואט {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ואט</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ואט</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ואט</unitPattern>
+				<displayName>ואט</displayName>
+				<unitPattern count="one">ואט {0}</unitPattern>
+				<unitPattern count="two">{0} ואט</unitPattern>
+				<unitPattern count="many">{0} ואט</unitPattern>
+				<unitPattern count="other">{0} ואט</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>מיליוואט</displayName>
+				<unitPattern count="one">מיליוואט {0}</unitPattern>
+				<unitPattern count="two">{0} מיליוואט</unitPattern>
+				<unitPattern count="many">{0} מיליוואט</unitPattern>
+				<unitPattern count="other">{0} מיליוואט</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>כוח סוס</displayName>
+				<unitPattern count="one">כוח סוס {0}</unitPattern>
+				<unitPattern count="two">{0} כוח סוס</unitPattern>
+				<unitPattern count="many">{0} כוח סוס</unitPattern>
+				<unitPattern count="other">{0} כוח סוס</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>הקטופסקל</displayName>
-				<unitPattern count="one" draft="contributed">הקטופסקל {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} הקטופסקל</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} הקטופסקל</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} הקטופסקל</unitPattern>
+				<unitPattern count="one">הקטופסקל {0}</unitPattern>
+				<unitPattern count="two">{0} הקטופסקל</unitPattern>
+				<unitPattern count="many">{0} הקטופסקל</unitPattern>
+				<unitPattern count="other">{0} הקטופסקל</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>מילימטר כספית</displayName>
+				<unitPattern count="one">מילימטר כספית אחד</unitPattern>
+				<unitPattern count="two">שני מילימטר כספית</unitPattern>
+				<unitPattern count="many">{0} מילימטר כספית</unitPattern>
+				<unitPattern count="other">{0} מילימטר כספית</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>פאונד לאינץ׳ רבוע</displayName>
+				<unitPattern count="one">פאונד אחד לאינץ׳ רבוע</unitPattern>
+				<unitPattern count="two">שני פאונד לאינץ׳ רבוע</unitPattern>
+				<unitPattern count="many">{0} פאונד לאינץ׳ רבוע</unitPattern>
+				<unitPattern count="other">{0} פאונד לאינץ׳ רבוע</unitPattern>
 			</unit>
 			<unit type="pressure-inch-hg">
 				<displayName>אינץ׳ כספית</displayName>
-				<unitPattern count="one" draft="contributed">אינץ׳ כספית {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} אינץ׳ כספית</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} אינץ׳ כספית</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} אינץ׳ כספית</unitPattern>
+				<unitPattern count="one">אינץ׳ כספית {0}</unitPattern>
+				<unitPattern count="two">{0} אינץ׳ כספית</unitPattern>
+				<unitPattern count="many">{0} אינץ׳ כספית</unitPattern>
+				<unitPattern count="other">{0} אינץ׳ כספית</unitPattern>
 			</unit>
 			<unit type="pressure-millibar">
 				<displayName>מיליבר</displayName>
@@ -7047,201 +7266,212 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} מיליבר</unitPattern>
 				<unitPattern count="other">{0} מיליבר</unitPattern>
 			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<displayName>מילימטר כספית</displayName>
-				<unitPattern count="one" draft="contributed">מילימטר כספית אחד</unitPattern>
-				<unitPattern count="two" draft="contributed">שני מילימטר כספית</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מילימטר כספית</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מילימטר כספית</unitPattern>
-			</unit>
-			<unit type="pressure-pound-per-square-inch">
-				<displayName draft="contributed">פאונד לאינץ׳ רבוע</displayName>
-				<unitPattern count="one" draft="contributed">פאונד אחד לאינץ׳ רבוע</unitPattern>
-				<unitPattern count="two" draft="contributed">שני פאונד לאינץ׳ רבוע</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} פאונד לאינץ׳ רבוע</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} פאונד לאינץ׳ רבוע</unitPattern>
-			</unit>
-			<unit type="proportion-karat">
-				<displayName>קראט</displayName>
-				<unitPattern count="one">קראט אחד</unitPattern>
-				<unitPattern count="two">שני קראט</unitPattern>
-				<unitPattern count="many">{0} קראט</unitPattern>
-				<unitPattern count="other">{0} קראט</unitPattern>
-			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName draft="contributed">קילומטר לשעה</displayName>
-				<unitPattern count="one" draft="contributed">{0} קילומטר לשעה</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} קילומטר לשעה</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} קילומטר לשעה</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} קילומטר לשעה</unitPattern>
+				<displayName>קילומטר לשעה</displayName>
+				<unitPattern count="one">{0} קילומטר לשעה</unitPattern>
+				<unitPattern count="two">{0} קילומטר לשעה</unitPattern>
+				<unitPattern count="many">{0} קילומטר לשעה</unitPattern>
+				<unitPattern count="other">{0} קילומטר לשעה</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
-				<displayName draft="contributed">מטר לשנייה</displayName>
-				<unitPattern count="one" draft="contributed">{0} מטר לשנייה</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} מטר לשנייה</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מטר לשנייה</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מטר לשנייה</unitPattern>
+				<displayName>מטר לשנייה</displayName>
+				<unitPattern count="one">{0} מטר לשנייה</unitPattern>
+				<unitPattern count="two">{0} מטר לשנייה</unitPattern>
+				<unitPattern count="many">{0} מטר לשנייה</unitPattern>
+				<unitPattern count="other">{0} מטר לשנייה</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
 				<displayName>מייל לשעה</displayName>
-				<unitPattern count="one" draft="contributed">{0} מייל לשעה</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} מייל לשעה</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מייל לשעה</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מייל לשעה</unitPattern>
+				<unitPattern count="one">{0} מייל לשעה</unitPattern>
+				<unitPattern count="two">{0} מייל לשעה</unitPattern>
+				<unitPattern count="many">{0} מייל לשעה</unitPattern>
+				<unitPattern count="other">{0} מייל לשעה</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>קשר</displayName>
+				<unitPattern count="one">קשר אחד</unitPattern>
+				<unitPattern count="two">שני קשר</unitPattern>
+				<unitPattern count="many">{0} קשר</unitPattern>
+				<unitPattern count="other">{0} קשר</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="two">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
 				<displayName>מעלות צלזיוס</displayName>
-				<unitPattern count="one" draft="contributed">מעלת צלזיוס {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} מעלות צלזיוס</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מעלות צלזיוס</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מעלות צלזיוס</unitPattern>
+				<unitPattern count="one">מעלת צלזיוס {0}</unitPattern>
+				<unitPattern count="two">{0} מעלות צלזיוס</unitPattern>
+				<unitPattern count="many">{0} מעלות צלזיוס</unitPattern>
+				<unitPattern count="other">{0} מעלות צלזיוס</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
 				<displayName>מעלות פרנהייט</displayName>
-				<unitPattern count="one" draft="contributed">מעלת פרנהייט {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} מעלות פרנהייט</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מעלות פרנהייט</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מעלות פרנהייט</unitPattern>
+				<unitPattern count="one">מעלת פרנהייט {0}</unitPattern>
+				<unitPattern count="two">{0} מעלות פרנהייט</unitPattern>
+				<unitPattern count="many">{0} מעלות פרנהייט</unitPattern>
+				<unitPattern count="other">{0} מעלות פרנהייט</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
 				<displayName>מעלות קלווין</displayName>
-				<unitPattern count="one" draft="contributed">קלווין אחד</unitPattern>
-				<unitPattern count="two" draft="contributed">שני קלווין</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} קלווין</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} קלווין</unitPattern>
-			</unit>
-			<unit type="volume-acre-foot">
-				<displayName draft="contributed">אקר-רגל</displayName>
-				<unitPattern count="one" draft="contributed">{0} אקר-רגל</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} אקר-רגל</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} אקר-רגל</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} אקר-רגל</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName draft="contributed">סנטיליטר</displayName>
-				<unitPattern count="one" draft="contributed">{0} סנטיליטר</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} סנטיליטר</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} סנטיליטר</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} סנטיליטר</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName draft="contributed">סנטימטר מעוקב</displayName>
-				<unitPattern count="one" draft="contributed">{0} סנטימטר מעוקב</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} סנטימטר מעוקב</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} סנטימטר מעוקב</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} סנטימטר מעוקב</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName draft="contributed">רגל מעוקב</displayName>
-				<unitPattern count="one" draft="contributed">{0} רגל מעוקב</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} רגל מעוקב</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} רגל מעוקב</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} רגל מעוקב</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName draft="contributed">אינצ׳ מעוקב</displayName>
-				<unitPattern count="one" draft="contributed">{0} אינצ׳ מעוקב</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} אינצ׳ מעוקב</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} אינצ׳ מעוקב</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} אינצ׳ מעוקב</unitPattern>
+				<unitPattern count="one">קלווין אחד</unitPattern>
+				<unitPattern count="two">שני קלווין</unitPattern>
+				<unitPattern count="many">{0} קלווין</unitPattern>
+				<unitPattern count="other">{0} קלווין</unitPattern>
 			</unit>
 			<unit type="volume-cubic-kilometer">
-				<displayName draft="contributed">קילומטר מעוקב</displayName>
-				<unitPattern count="one" draft="contributed">{0} קילומטר מעוקב</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} קילומטר מעוקב</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} קילומטר מעוקב</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} קילומטר מעוקב</unitPattern>
+				<displayName>קילומטר מעוקב</displayName>
+				<unitPattern count="one">קילומטר מעוקב {0}</unitPattern>
+				<unitPattern count="two">{0} קילומטר מעוקב</unitPattern>
+				<unitPattern count="many">{0} קילומטר מעוקב</unitPattern>
+				<unitPattern count="other">{0} קילומטר מעוקב</unitPattern>
 			</unit>
 			<unit type="volume-cubic-meter">
-				<displayName draft="contributed">מטר מעוקב</displayName>
-				<unitPattern count="one" draft="contributed">{0} מטר מעוקב</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} מטר מעוקב</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מטר מעוקב</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מטר מעוקב</unitPattern>
+				<displayName>מטר מעוקב</displayName>
+				<unitPattern count="one">מטר מעוקב {0}</unitPattern>
+				<unitPattern count="two">{0} מטר מעוקב</unitPattern>
+				<unitPattern count="many">{0} מטר מעוקב</unitPattern>
+				<unitPattern count="other">{0} מטר מעוקב</unitPattern>
+				<perUnitPattern>{0}/מטר מעוקב</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>סנטימטר מעוקב</displayName>
+				<unitPattern count="one">סנטימטר מעוקב {0}</unitPattern>
+				<unitPattern count="two">{0} סנטימטר מעוקב</unitPattern>
+				<unitPattern count="many">{0} סנטימטר מעוקב</unitPattern>
+				<unitPattern count="other">{0} סנטימטר מעוקב</unitPattern>
+				<perUnitPattern>{0}/סנטימטר מעוקב</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
-				<displayName draft="contributed">מייל מעוקב</displayName>
-				<unitPattern count="one" draft="contributed">{0} מייל מעוקב</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} מייל מעוקב</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מייל מעוקב</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מייל מעוקב</unitPattern>
+				<displayName>מייל מעוקב</displayName>
+				<unitPattern count="one">מייל מעוקב {0}</unitPattern>
+				<unitPattern count="two">{0} מייל מעוקב</unitPattern>
+				<unitPattern count="many">{0} מייל מעוקב</unitPattern>
+				<unitPattern count="other">{0} מייל מעוקב</unitPattern>
 			</unit>
 			<unit type="volume-cubic-yard">
-				<displayName draft="contributed">יארד מעוקב</displayName>
-				<unitPattern count="one" draft="contributed">{0} יארד מעוקב</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} יארד מעוקב</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} יארד מעוקב</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} יארד מעוקב</unitPattern>
+				<displayName>יארד מעוקב</displayName>
+				<unitPattern count="one">{0} יארד מעוקב</unitPattern>
+				<unitPattern count="two">{0} יארד מעוקב</unitPattern>
+				<unitPattern count="many">{0} יארד מעוקב</unitPattern>
+				<unitPattern count="other">{0} יארד מעוקב</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName draft="contributed">ספל</displayName>
-				<unitPattern count="one" draft="contributed">{0} ספל</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ספלים</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ספלים</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ספלים</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>רגל מעוקב</displayName>
+				<unitPattern count="one">רגל מעוקב {0}</unitPattern>
+				<unitPattern count="two">{0} רגל מעוקב</unitPattern>
+				<unitPattern count="many">{0} רגל מעוקב</unitPattern>
+				<unitPattern count="other">{0} רגל מעוקב</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName draft="contributed">דציליטר</displayName>
-				<unitPattern count="one" draft="contributed">{0} דציליטר</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} דציליטר</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} דציליטר</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} דציליטר</unitPattern>
-			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName draft="contributed">אונקיות נוזלים</displayName>
-				<unitPattern count="one" draft="contributed">{0} אונקיית נוזלים</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} אונקיות נוזלים</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} אונקיות נוזלים</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} אונקיות נוזלים</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName draft="contributed">גלונים</displayName>
-				<unitPattern count="one" draft="contributed">{0} גלון</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} גלונים</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} גלונים</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} גלונים</unitPattern>
-			</unit>
-			<unit type="volume-hectoliter">
-				<displayName draft="contributed">הקטוליטר</displayName>
-				<unitPattern count="one" draft="contributed">{0} הקטוליטר</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} הקטוליטר</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} הקטוליטר</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} הקטוליטר</unitPattern>
-			</unit>
-			<unit type="volume-liter">
-				<displayName draft="contributed">ליטרים</displayName>
-				<unitPattern count="one" draft="contributed">{0} ליטר</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ליטר</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ליטר</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ליטר</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>אינץ׳ מעוקב</displayName>
+				<unitPattern count="one">אינץ׳ מעוקב {0}</unitPattern>
+				<unitPattern count="two">{0} אינץ׳ מעוקב</unitPattern>
+				<unitPattern count="many">{0} אינץ׳ מעוקב</unitPattern>
+				<unitPattern count="other">{0} אינץ׳ מעוקב</unitPattern>
 			</unit>
 			<unit type="volume-megaliter">
-				<displayName draft="contributed">מגה ליטר</displayName>
-				<unitPattern count="one" draft="contributed">{0} מגה ליטר</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} מגה ליטר</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מגה ליטר</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מגה ליטר</unitPattern>
+				<displayName>מגה ליטר</displayName>
+				<unitPattern count="one">מגה ליטר {0}</unitPattern>
+				<unitPattern count="two">{0} מגה ליטר</unitPattern>
+				<unitPattern count="many">{0} מגה ליטר</unitPattern>
+				<unitPattern count="other">{0} מגה ליטר</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>הקטוליטר</displayName>
+				<unitPattern count="one">הקטוליטר {0}</unitPattern>
+				<unitPattern count="two">{0} הקטוליטר</unitPattern>
+				<unitPattern count="many">{0} הקטוליטר</unitPattern>
+				<unitPattern count="other">{0} הקטוליטר</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>ליטר</displayName>
+				<unitPattern count="one">ליטר {0}</unitPattern>
+				<unitPattern count="two">{0} ליטר</unitPattern>
+				<unitPattern count="many">{0} ליטר</unitPattern>
+				<unitPattern count="other">{0} ליטר</unitPattern>
+				<perUnitPattern>{0}/ליטר</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>דציליטר</displayName>
+				<unitPattern count="one">דציליטר {0}</unitPattern>
+				<unitPattern count="two">{0} דציליטר</unitPattern>
+				<unitPattern count="many">{0} דציליטר</unitPattern>
+				<unitPattern count="other">{0} דציליטר</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>סנטיליטר</displayName>
+				<unitPattern count="one">סנטיליטר {0}</unitPattern>
+				<unitPattern count="two">{0} סנטיליטר</unitPattern>
+				<unitPattern count="many">{0} סנטיליטר</unitPattern>
+				<unitPattern count="other">{0} סנטיליטר</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
-				<displayName draft="contributed">מיליליטר</displayName>
-				<unitPattern count="one" draft="contributed">{0} מיליליטר</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} מיליליטר</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מיליליטר</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מיליליטר</unitPattern>
+				<displayName>מיליליטר</displayName>
+				<unitPattern count="one">מיליליטר {0}</unitPattern>
+				<unitPattern count="two">{0} מיליליטר</unitPattern>
+				<unitPattern count="many">{0} מיליליטר</unitPattern>
+				<unitPattern count="other">{0} מיליליטר</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName draft="contributed">פינטות</displayName>
-				<unitPattern count="one" draft="contributed">{0} פינט</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} פינטות</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} פינטות</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} פינטות</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>פינט מטרי</displayName>
+				<unitPattern count="one">פינט מטרי {0}</unitPattern>
+				<unitPattern count="two">{0} פינט מטרי</unitPattern>
+				<unitPattern count="many">{0} פינט מטרי</unitPattern>
+				<unitPattern count="other">{0} פינט מטרי</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>כוס מידה מטרית</displayName>
+				<unitPattern count="one">כוס מידה מטרית {0}</unitPattern>
+				<unitPattern count="two">{0} כ׳ מידה מטרית</unitPattern>
+				<unitPattern count="many">{0} כ׳ מידה מטרית</unitPattern>
+				<unitPattern count="other">{0} כ׳ מידה מטרית</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>אקר-רגל</displayName>
+				<unitPattern count="one">אקר-רגל {0}</unitPattern>
+				<unitPattern count="two">{0} אקר-רגל</unitPattern>
+				<unitPattern count="many">{0} אקר-רגל</unitPattern>
+				<unitPattern count="other">{0} אקר-רגל</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>גלון</displayName>
+				<unitPattern count="one">גלון {0}</unitPattern>
+				<unitPattern count="two">{0} גלונים</unitPattern>
+				<unitPattern count="many">{0} גלונים</unitPattern>
+				<unitPattern count="other">{0} גלונים</unitPattern>
+				<perUnitPattern>{0}/גלון</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
-				<displayName draft="contributed">קווארטות</displayName>
-				<unitPattern count="one" draft="contributed">{0} קווארטה</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} קווארטות</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} קווארטות</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} קווארטות</unitPattern>
+				<displayName>קווארטות</displayName>
+				<unitPattern count="one">קווארטה {0}</unitPattern>
+				<unitPattern count="two">{0} קווארטות</unitPattern>
+				<unitPattern count="many">{0} קווארטות</unitPattern>
+				<unitPattern count="other">{0} קווארטות</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>פינט</displayName>
+				<unitPattern count="one">פינט {0}</unitPattern>
+				<unitPattern count="two">{0} פינט</unitPattern>
+				<unitPattern count="many">{0} פינט</unitPattern>
+				<unitPattern count="other">{0} פינט</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>כוסות</displayName>
+				<unitPattern count="one">כוס {0}</unitPattern>
+				<unitPattern count="two">{0} כוסות</unitPattern>
+				<unitPattern count="many">{0} כוסות</unitPattern>
+				<unitPattern count="other">{0} כוסות</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>אונקיות נוזלים</displayName>
+				<unitPattern count="one">אונקיית נוזלים {0}</unitPattern>
+				<unitPattern count="two">{0} אונקיות נוזלים</unitPattern>
+				<unitPattern count="many">{0} אונקיות נוזלים</unitPattern>
+				<unitPattern count="other">{0} אונקיות נוזלים</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>כפות</displayName>
@@ -7252,50 +7482,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="volume-teaspoon">
 				<displayName>כפיות</displayName>
-				<unitPattern count="one" draft="contributed">{0} כפית</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} כפיות</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} כפיות</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} כפיות</unitPattern>
+				<unitPattern count="one">כפית {0}</unitPattern>
+				<unitPattern count="two">{0} כפיות</unitPattern>
+				<unitPattern count="many">{0} כפיות</unitPattern>
+				<unitPattern count="other">{0} כפיות</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}מזרח</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}צפון</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}דרום</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}מערב</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>כוח ג׳י</displayName>
-				<unitPattern count="one" draft="contributed">{0} G</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} G</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} G</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} G</unitPattern>
+				<unitPattern count="one">{0} G</unitPattern>
+				<unitPattern count="two">{0} G</unitPattern>
+				<unitPattern count="many">{0} G</unitPattern>
+				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
-				<displayName draft="contributed">m/s²</displayName>
-				<unitPattern count="one" draft="contributed">{0} m/s²</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} m/s²</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} m/s²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} m/s²</unitPattern>
+				<displayName>m/s²</displayName>
+				<unitPattern count="one">{0} m/s²</unitPattern>
+				<unitPattern count="two">{0} m/s²</unitPattern>
+				<unitPattern count="many">{0} m/s²</unitPattern>
+				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName draft="contributed">דק׳ קשת</displayName>
-				<unitPattern count="one" draft="contributed">דקה {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} דקות</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} דקות</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} דקות</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName draft="contributed">שנ׳ קשת</displayName>
-				<unitPattern count="one" draft="contributed">שנייה {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} שניות</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} שניות</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} שניות</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName>מעלות</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="two">{0}°</unitPattern>
-				<unitPattern count="many">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
+			<unit type="angle-revolution">
+				<displayName>ס׳</displayName>
+				<unitPattern count="one">{0} ס׳</unitPattern>
+				<unitPattern count="two">{0} ס׳</unitPattern>
+				<unitPattern count="many">{0} ס׳</unitPattern>
+				<unitPattern count="other">{0} ס׳</unitPattern>
 			</unit>
 			<unit type="angle-radian">
 				<displayName>רדיאנים</displayName>
@@ -7304,40 +7526,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} π</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} π</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName draft="contributed">אקר</displayName>
-				<unitPattern count="one" draft="contributed">אקר {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} אקר</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} אקר</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} אקר</unitPattern>
+			<unit type="angle-degree">
+				<displayName>מעלות</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="two">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
-			<unit type="area-hectare">
-				<displayName>הקטאר</displayName>
-				<unitPattern count="one" draft="contributed">הקטאר {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} הקטאר</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} הקטאר</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} הקטאר</unitPattern>
+			<unit type="angle-arc-minute">
+				<displayName>דק׳ קשת</displayName>
+				<unitPattern count="one">ד׳ קשת {0}</unitPattern>
+				<unitPattern count="two">{0} דק׳ קשת</unitPattern>
+				<unitPattern count="many">{0} דק׳ קשת</unitPattern>
+				<unitPattern count="other">{0} דק׳ קשת</unitPattern>
 			</unit>
-			<unit type="area-square-centimeter">
-				<displayName>סמ״ר</displayName>
-				<unitPattern count="one">{0} סמ״ר</unitPattern>
-				<unitPattern count="two">{0} סמ״ר</unitPattern>
-				<unitPattern count="many">{0} סמ״ר</unitPattern>
-				<unitPattern count="other">{0} סמ״ר</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<displayName draft="contributed">ft²</displayName>
-				<unitPattern count="one" draft="contributed">רגל רבועה {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} רגל רבועה</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} רגל רבועה</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} רגל רבועה</unitPattern>
-			</unit>
-			<unit type="area-square-inch">
-				<displayName draft="contributed">in²</displayName>
-				<unitPattern count="one" draft="contributed">{0} in²</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} in²</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} in²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} in²</unitPattern>
+			<unit type="angle-arc-second">
+				<displayName>שנ׳ קשת</displayName>
+				<unitPattern count="one">שנ׳ קשת {0}</unitPattern>
+				<unitPattern count="two">{0} שנ׳ קשת</unitPattern>
+				<unitPattern count="many">{0} שנ׳ קשת</unitPattern>
+				<unitPattern count="other">{0} שנ׳ קשת</unitPattern>
 			</unit>
 			<unit type="area-square-kilometer">
 				<displayName>קמ״ר</displayName>
@@ -7346,103 +7554,92 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} קמ״ר</unitPattern>
 				<unitPattern count="other">{0} קמ״ר</unitPattern>
 			</unit>
+			<unit type="area-hectare">
+				<displayName>הקטאר</displayName>
+				<unitPattern count="one" draft="contributed">הקטאר {0}</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} הקטאר</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} הקטאר</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} הקטאר</unitPattern>
+			</unit>
 			<unit type="area-square-meter">
 				<displayName>מ״ר</displayName>
-				<unitPattern count="one" draft="contributed">מ״ר {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} מ״ר</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מ״ר</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מ״ר</unitPattern>
+				<unitPattern count="one">מ״ר {0}</unitPattern>
+				<unitPattern count="two">{0} מ״ר</unitPattern>
+				<unitPattern count="many">{0} מ״ר</unitPattern>
+				<unitPattern count="other">{0} מ״ר</unitPattern>
+				<perUnitPattern>{0}/מ״ר</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>סמ״ר</displayName>
+				<unitPattern count="one">{0} סמ״ר</unitPattern>
+				<unitPattern count="two">{0} סמ״ר</unitPattern>
+				<unitPattern count="many">{0} סמ״ר</unitPattern>
+				<unitPattern count="other">{0} סמ״ר</unitPattern>
+				<perUnitPattern>{0}/סמ״ר</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
-				<displayName draft="contributed">mi²</displayName>
+				<displayName>מייל רבוע</displayName>
 				<unitPattern count="one" draft="contributed">מייל רבוע {0}</unitPattern>
 				<unitPattern count="two" draft="contributed">{0} מייל רבוע</unitPattern>
 				<unitPattern count="many" draft="contributed">{0} מייל רבוע</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} מייל רבוע</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<displayName>אקר</displayName>
+				<unitPattern count="one" draft="contributed">אקר {0}</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} אקר</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} אקר</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} אקר</unitPattern>
+			</unit>
 			<unit type="area-square-yard">
-				<displayName draft="contributed">yd²</displayName>
-				<unitPattern count="one" draft="contributed">{0} yd²</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} yd²</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} yd²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} yd²</unitPattern>
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="two">{0} yd²</unitPattern>
+				<unitPattern count="many">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName draft="contributed">ft²</displayName>
+				<unitPattern count="one">{0} sq ft</unitPattern>
+				<unitPattern count="two">{0} sq ft</unitPattern>
+				<unitPattern count="many">{0} sq ft</unitPattern>
+				<unitPattern count="other">{0} sq ft</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>in²</displayName>
+				<unitPattern count="one">{0} in²</unitPattern>
+				<unitPattern count="two">{0} in²</unitPattern>
+				<unitPattern count="many">{0} in²</unitPattern>
+				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName draft="contributed">kt</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="two">{0} kt</unitPattern>
+				<unitPattern count="many">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ליטרים/ק״מ</displayName>
-				<unitPattern count="one" draft="contributed">{0} L/km</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} L/km</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} L/km</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} L/km</unitPattern>
+				<unitPattern count="one">{0} ל׳/ק״מ</unitPattern>
+				<unitPattern count="two">{0} ל׳/ק״מ</unitPattern>
+				<unitPattern count="many">{0} ל׳/ק״מ</unitPattern>
+				<unitPattern count="other">{0} ל׳/ק״מ</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ל׳/100 ק״מ</displayName>
+				<unitPattern count="one">ל׳ {0}/100 ק״מ</unitPattern>
+				<unitPattern count="two">{0} ל׳/100 ק״מ</unitPattern>
+				<unitPattern count="many">{0} ל׳/100 ק״מ</unitPattern>
+				<unitPattern count="other">{0} ל׳/100 ק״מ</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>מייל/גלון</displayName>
-				<unitPattern count="one">{0} מייל/גלון</unitPattern>
-				<unitPattern count="two">{0} מייל/גלון</unitPattern>
-				<unitPattern count="many">{0} מייל/גלון</unitPattern>
-				<unitPattern count="other">{0} מייל/גלון</unitPattern>
-			</unit>
-			<unit type="digital-bit">
-				<displayName draft="contributed">ביט</displayName>
-				<unitPattern count="one" draft="contributed">{0} ביט</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ביט</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ביט</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ביט</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName draft="contributed">בייט</displayName>
-				<unitPattern count="one" draft="contributed">{0} בייט</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} בייט</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} בייט</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} בייט</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName draft="contributed">Gbit</displayName>
-				<unitPattern count="one" draft="contributed">{0} Gb</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} Gb</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} Gb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName draft="contributed">GB</displayName>
-				<unitPattern count="one" draft="contributed">{0} GB</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} GB</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} GB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName draft="contributed">kb</displayName>
-				<unitPattern count="one" draft="contributed">{0} kb</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} kb</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} kb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName draft="contributed">kB</displayName>
-				<unitPattern count="one" draft="contributed">{0} kB</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} kB</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} kB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName draft="contributed">Mb</displayName>
-				<unitPattern count="one" draft="contributed">{0} Mb</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} Mb</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} Mb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName draft="contributed">MB</displayName>
-				<unitPattern count="one" draft="contributed">{0} MB</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} MB</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} MB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName draft="contributed">Tb</displayName>
-				<unitPattern count="one" draft="contributed">{0} Tb</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} Tb</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} Tb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Tb</unitPattern>
+				<unitPattern count="one">{0} mpg</unitPattern>
+				<unitPattern count="two">{0} mpg</unitPattern>
+				<unitPattern count="many">{0} mpg</unitPattern>
+				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
@@ -7451,12 +7648,107 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName draft="contributed">Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="two">{0} Tb</unitPattern>
+				<unitPattern count="many">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName draft="contributed">GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="two">{0} GB</unitPattern>
+				<unitPattern count="many">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gbit</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="two">{0} Gb</unitPattern>
+				<unitPattern count="many">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName draft="contributed">MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="two">{0} MB</unitPattern>
+				<unitPattern count="many">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mbit</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="two">{0} Mb</unitPattern>
+				<unitPattern count="many">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName draft="contributed">kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="two">{0} kB</unitPattern>
+				<unitPattern count="many">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName draft="contributed">kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="two">{0} kb</unitPattern>
+				<unitPattern count="many">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName draft="contributed">בייט</displayName>
+				<unitPattern count="one" draft="contributed">{0} בייט</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} בייט</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} בייט</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} בייט</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName draft="contributed">ביט</displayName>
+				<unitPattern count="one" draft="contributed">{0} ביט</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} ביט</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ביט</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ביט</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>מאות</displayName>
+				<unitPattern count="one">מאה {0}</unitPattern>
+				<unitPattern count="two">{0} מאות</unitPattern>
+				<unitPattern count="many">{0} מאות</unitPattern>
+				<unitPattern count="other">{0} מאות</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>שנים</displayName>
+				<unitPattern count="one">שנה</unitPattern>
+				<unitPattern count="two">שנתיים</unitPattern>
+				<unitPattern count="many">{0} שנה</unitPattern>
+				<unitPattern count="other">{0} שנים</unitPattern>
+				<perUnitPattern>{0}/שנה</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>חודשים</displayName>
+				<unitPattern count="one">חודש</unitPattern>
+				<unitPattern count="two">חודשיים</unitPattern>
+				<unitPattern count="many">{0} ח׳</unitPattern>
+				<unitPattern count="other">{0} ח׳</unitPattern>
+				<perUnitPattern>{0}/חודש</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>שבועות</displayName>
+				<unitPattern count="one">שבוע {0}</unitPattern>
+				<unitPattern count="two">שבועיים</unitPattern>
+				<unitPattern count="many">{0} שבועות</unitPattern>
+				<unitPattern count="other">{0} שבועות</unitPattern>
+				<perUnitPattern>{0}/שבוע</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ימים</displayName>
 				<unitPattern count="one">יום</unitPattern>
 				<unitPattern count="two">יומיים</unitPattern>
 				<unitPattern count="many">{0} ימ׳</unitPattern>
 				<unitPattern count="other">{0} ימ׳</unitPattern>
+				<perUnitPattern>{0}/יום</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>שע׳</displayName>
@@ -7466,40 +7758,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} שע׳</unitPattern>
 				<perUnitPattern>{0}/שעה</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName draft="contributed">μsecs</displayName>
-				<unitPattern count="one" draft="contributed">{0} μs</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} μs</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} μs</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="contributed">ms</displayName>
-				<unitPattern count="one" draft="contributed">{0} ms</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ms</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ms</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>דק׳</displayName>
 				<unitPattern count="one">דקה</unitPattern>
 				<unitPattern count="two">שתי דק׳</unitPattern>
 				<unitPattern count="many">{0} דק׳</unitPattern>
 				<unitPattern count="other">{0} דק׳</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>חודשים</displayName>
-				<unitPattern count="one">חודש</unitPattern>
-				<unitPattern count="two">חודשיים</unitPattern>
-				<unitPattern count="many">{0} ח׳</unitPattern>
-				<unitPattern count="other">{0} ח׳</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName draft="contributed">ננו שניות</displayName>
-				<unitPattern count="one" draft="contributed">{0} ns</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ns</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ns</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ns</unitPattern>
+				<perUnitPattern>{0}/דק׳</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>שנ׳</displayName>
@@ -7509,47 +7774,61 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} שנ׳</unitPattern>
 				<perUnitPattern>{0}/שנ׳</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>שבועות</displayName>
-				<unitPattern count="one" draft="contributed">שבוע {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} שבועות</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} שבועות</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} שבועות</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="two">{0} ms</unitPattern>
+				<unitPattern count="many">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>שנים</displayName>
-				<unitPattern count="one">שנה</unitPattern>
-				<unitPattern count="two">שנתיים</unitPattern>
-				<unitPattern count="many">{0} שנה</unitPattern>
-				<unitPattern count="other">{0} שנים</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μsecs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="two">{0} μs</unitPattern>
+				<unitPattern count="many">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ננו שניות</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="two">{0} ns</unitPattern>
+				<unitPattern count="many">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
-				<displayName draft="contributed">amps</displayName>
-				<unitPattern count="one" draft="contributed">{0} A</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} A</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} A</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} A</unitPattern>
+				<displayName>amps</displayName>
+				<unitPattern count="one">{0} A</unitPattern>
+				<unitPattern count="two">{0} A</unitPattern>
+				<unitPattern count="many">{0} A</unitPattern>
+				<unitPattern count="other">{0} A</unitPattern>
 			</unit>
 			<unit type="electric-milliampere">
-				<displayName draft="contributed">mA</displayName>
-				<unitPattern count="one" draft="contributed">{0} mA</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} mA</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} mA</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mA</unitPattern>
+				<displayName>mA</displayName>
+				<unitPattern count="one">{0} mA</unitPattern>
+				<unitPattern count="two">{0} mA</unitPattern>
+				<unitPattern count="many">{0} mA</unitPattern>
+				<unitPattern count="other">{0} mA</unitPattern>
 			</unit>
 			<unit type="electric-ohm">
-				<displayName draft="contributed">ohms</displayName>
-				<unitPattern count="one" draft="contributed">{0} Ω</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} Ω</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} Ω</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Ω</unitPattern>
+				<displayName>ohms</displayName>
+				<unitPattern count="one">{0} Ω</unitPattern>
+				<unitPattern count="two">{0} Ω</unitPattern>
+				<unitPattern count="many">{0} Ω</unitPattern>
+				<unitPattern count="other">{0} Ω</unitPattern>
 			</unit>
 			<unit type="electric-volt">
-				<displayName draft="contributed">וולט</displayName>
-				<unitPattern count="one" draft="contributed">{0} V</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} V</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} V</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} V</unitPattern>
+				<displayName>וולט</displayName>
+				<unitPattern count="one">{0} V</unitPattern>
+				<unitPattern count="two">{0} V</unitPattern>
+				<unitPattern count="many">{0} V</unitPattern>
+				<unitPattern count="other">{0} V</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="two">{0} kcal</unitPattern>
+				<unitPattern count="many">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
 			</unit>
 			<unit type="energy-calorie">
 				<displayName draft="contributed">cal</displayName>
@@ -7565,75 +7844,70 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} Cal</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName draft="contributed">ג׳אול</displayName>
-				<unitPattern count="one" draft="contributed">{0} J</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} J</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} J</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName draft="contributed">kcal</displayName>
-				<unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} kcal</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} kcal</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
-				<displayName draft="contributed">קילו ג׳אול</displayName>
-				<unitPattern count="one" draft="contributed">{0} kJ</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} kJ</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} kJ</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kJ</unitPattern>
+				<displayName>קילו ג׳אול</displayName>
+				<unitPattern count="one">{0} kJ</unitPattern>
+				<unitPattern count="two">{0} kJ</unitPattern>
+				<unitPattern count="many">{0} kJ</unitPattern>
+				<unitPattern count="other">{0} kJ</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>ג׳אול</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="two">{0} J</unitPattern>
+				<unitPattern count="many">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
 			</unit>
 			<unit type="energy-kilowatt-hour">
-				<displayName draft="contributed">קוט״ש</displayName>
+				<displayName>קוט״ש</displayName>
 				<unitPattern count="one" draft="contributed">{0} קוט״ש</unitPattern>
 				<unitPattern count="two" draft="contributed">{0} קוט״ש</unitPattern>
 				<unitPattern count="many" draft="contributed">{0} קוט״ש</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} קוט״ש</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
-				<displayName draft="contributed">GHz</displayName>
-				<unitPattern count="one" draft="contributed">{0} GHz</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} GHz</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} GHz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} GHz</unitPattern>
-			</unit>
-			<unit type="frequency-hertz">
-				<displayName draft="contributed">Hz</displayName>
-				<unitPattern count="one" draft="contributed">{0} Hz</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} Hz</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} Hz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Hz</unitPattern>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<displayName draft="contributed">kHz</displayName>
-				<unitPattern count="one" draft="contributed">{0} kHz</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} kHz</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} kHz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kHz</unitPattern>
+				<displayName>GHz</displayName>
+				<unitPattern count="one">{0} GHz</unitPattern>
+				<unitPattern count="two">{0} GHz</unitPattern>
+				<unitPattern count="many">{0} GHz</unitPattern>
+				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
 			<unit type="frequency-megahertz">
-				<displayName draft="contributed">MHz</displayName>
-				<unitPattern count="one" draft="contributed">{0} MHz</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} MHz</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} MHz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MHz</unitPattern>
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="two">{0} MHz</unitPattern>
+				<unitPattern count="many">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>י״א</displayName>
-				<unitPattern count="one">י״א אחת</unitPattern>
-				<unitPattern count="two">שתי י״א</unitPattern>
-				<unitPattern count="many">{0} י״א</unitPattern>
-				<unitPattern count="other">{0} י״א</unitPattern>
+			<unit type="frequency-kilohertz">
+				<displayName>kHz</displayName>
+				<unitPattern count="one">{0} kHz</unitPattern>
+				<unitPattern count="two">{0} kHz</unitPattern>
+				<unitPattern count="many">{0} kHz</unitPattern>
+				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>ס״מ</displayName>
-				<unitPattern count="one">ס״מ אחד</unitPattern>
-				<unitPattern count="two">שני ס״מ</unitPattern>
-				<unitPattern count="many">{0} ס״מ</unitPattern>
-				<unitPattern count="other">{0} ס״מ</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="two">{0} Hz</unitPattern>
+				<unitPattern count="many">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>ק״מ</displayName>
+				<unitPattern count="one">ק״מ {0}</unitPattern>
+				<unitPattern count="two">{0} ק״מ</unitPattern>
+				<unitPattern count="many">{0} ק״מ</unitPattern>
+				<unitPattern count="other">{0} ק״מ</unitPattern>
+				<perUnitPattern>{0}/ק״מ</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>מטרים</displayName>
+				<unitPattern count="one">מ׳ אחד</unitPattern>
+				<unitPattern count="two">שני מ׳</unitPattern>
+				<unitPattern count="many">{0} מ׳</unitPattern>
+				<unitPattern count="other">{0} מ׳</unitPattern>
+				<perUnitPattern>{0}/מ׳</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>ד״מ</displayName>
@@ -7642,54 +7916,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ד״מ</unitPattern>
 				<unitPattern count="other">{0} ד״מ</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>רגל</displayName>
-				<unitPattern count="one" draft="contributed">רגל {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} רגל</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} רגל</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} רגל</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>אינץ׳</displayName>
-				<unitPattern count="one" draft="contributed">אינץ׳ {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} אינץ׳</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} אינץ׳</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} אינץ׳</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>ק״מ</displayName>
-				<unitPattern count="one" draft="contributed">ק״מ {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ק״מ</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ק״מ</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ק״מ</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>שנות אור</displayName>
-				<unitPattern count="one" draft="contributed">שנת אור {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} שנות אור</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} שנות אור</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} שנות אור</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>מטרים</displayName>
-				<unitPattern count="one">מ׳ אחד</unitPattern>
-				<unitPattern count="two">שני מ׳</unitPattern>
-				<unitPattern count="many">{0} מ׳</unitPattern>
-				<unitPattern count="other">{0} מ׳</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName draft="contributed">µm</displayName>
-				<unitPattern count="one" draft="contributed">{0} µm</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} µm</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} µm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>מייל</displayName>
-				<unitPattern count="one">{0} מייל</unitPattern>
-				<unitPattern count="two">{0} מייל</unitPattern>
-				<unitPattern count="many">{0} מייל</unitPattern>
-				<unitPattern count="other">{0} מייל</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>ס״מ</displayName>
+				<unitPattern count="one">ס״מ אחד</unitPattern>
+				<unitPattern count="two">שני ס״מ</unitPattern>
+				<unitPattern count="many">{0} ס״מ</unitPattern>
+				<unitPattern count="other">{0} ס״מ</unitPattern>
+				<perUnitPattern>{0}/ס״מ</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>מ״מ</displayName>
@@ -7698,12 +7931,77 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} מ״מ</unitPattern>
 				<unitPattern count="other">{0} מ״מ</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="two">{0} µm</unitPattern>
+				<unitPattern count="many">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
-				<displayName draft="contributed">nm</displayName>
-				<unitPattern count="one" draft="contributed">{0} nm</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} nm</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} nm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} nm</unitPattern>
+				<displayName>nm</displayName>
+				<unitPattern count="one">{0} nm</unitPattern>
+				<unitPattern count="two">{0} nm</unitPattern>
+				<unitPattern count="many">{0} nm</unitPattern>
+				<unitPattern count="other">{0} nm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>pm</displayName>
+				<unitPattern count="one" draft="contributed">פיקומטר {0}</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} פיקומטר</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} פיקומטר</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} פיקומטר</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>מייל</displayName>
+				<unitPattern count="one">{0} מייל</unitPattern>
+				<unitPattern count="two">{0} מייל</unitPattern>
+				<unitPattern count="many">{0} מייל</unitPattern>
+				<unitPattern count="other">{0} מייל</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>יארד</displayName>
+				<unitPattern count="one">יארד {0}</unitPattern>
+				<unitPattern count="two">{0} יארד</unitPattern>
+				<unitPattern count="many">{0} יארד</unitPattern>
+				<unitPattern count="other">{0} יארד</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>רגל</displayName>
+				<unitPattern count="one" draft="contributed">רגל {0}</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} רגל</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} רגל</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} רגל</unitPattern>
+				<perUnitPattern draft="provisional">{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>אינץ׳</displayName>
+				<unitPattern count="one" draft="contributed">אינץ׳ {0}</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} אינץ׳</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} אינץ׳</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} אינץ׳</unitPattern>
+				<perUnitPattern draft="provisional">{0} in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName draft="contributed">pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="two">{0} pc</unitPattern>
+				<unitPattern count="many">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>שנות אור</displayName>
+				<unitPattern count="one">שנת אור {0}</unitPattern>
+				<unitPattern count="two">{0} שנות אור</unitPattern>
+				<unitPattern count="many">{0} שנות אור</unitPattern>
+				<unitPattern count="other">{0} שנות אור</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>י״א</displayName>
+				<unitPattern count="one">י״א אחת</unitPattern>
+				<unitPattern count="two">שתי י״א</unitPattern>
+				<unitPattern count="many">{0} י״א</unitPattern>
+				<unitPattern count="other">{0} י״א</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
 				<displayName>מ״י</displayName>
@@ -7712,61 +8010,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} מ״י</unitPattern>
 				<unitPattern count="other">{0} מ״י</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<displayName draft="contributed">pc</displayName>
-				<unitPattern count="one" draft="contributed">{0} pc</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} pc</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} pc</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pc</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName draft="contributed">pm</displayName>
-				<unitPattern count="one" draft="contributed">פיקומטר {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} פיקומטר</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} פיקומטר</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} פיקומטר</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<displayName>יארד</displayName>
-				<unitPattern count="one" draft="contributed">יארד {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} יארד</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} יארד</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} יארד</unitPattern>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="two">{0} smi</unitPattern>
+				<unitPattern count="many">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
 			</unit>
 			<unit type="light-lux">
-				<displayName draft="contributed">lx</displayName>
-				<unitPattern count="one" draft="contributed">{0} lx</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} lx</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} lx</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} lx</unitPattern>
+				<displayName>lux</displayName>
+				<unitPattern count="one">{0} lx</unitPattern>
+				<unitPattern count="two">{0} lx</unitPattern>
+				<unitPattern count="many">{0} lx</unitPattern>
+				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName draft="contributed">קרט</displayName>
-				<unitPattern count="one" draft="contributed">{0} CD</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} CD</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} CD</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>גרם</displayName>
-				<unitPattern count="one" draft="contributed">גר׳ {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} גר׳</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} גר׳</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} גר׳</unitPattern>
+			<unit type="mass-metric-ton">
+				<displayName>t</displayName>
+				<unitPattern count="one">{0} t</unitPattern>
+				<unitPattern count="two">{0} t</unitPattern>
+				<unitPattern count="many">{0} t</unitPattern>
+				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>ק״ג</displayName>
-				<unitPattern count="one" draft="contributed">ק״ג {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ק״ג</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ק״ג</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ק״ג</unitPattern>
+				<unitPattern count="one">ק״ג {0}</unitPattern>
+				<unitPattern count="two">{0} ק״ג</unitPattern>
+				<unitPattern count="many">{0} ק״ג</unitPattern>
+				<unitPattern count="other">{0} ק״ג</unitPattern>
+				<perUnitPattern>{0}/ק״ג</perUnitPattern>
 			</unit>
-			<unit type="mass-metric-ton">
-				<displayName draft="contributed">t</displayName>
-				<unitPattern count="one" draft="contributed">{0} t</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} t</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} t</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} t</unitPattern>
+			<unit type="mass-gram">
+				<displayName>גרם</displayName>
+				<unitPattern count="one">גר׳ {0}</unitPattern>
+				<unitPattern count="two">{0} גר׳</unitPattern>
+				<unitPattern count="many">{0} גר׳</unitPattern>
+				<unitPattern count="other">{0} גר׳</unitPattern>
+				<perUnitPattern>{0}/גר׳</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>מ״ג</displayName>
+				<unitPattern count="one">{0} מ״ג</unitPattern>
+				<unitPattern count="two">{0} מ״ג</unitPattern>
+				<unitPattern count="many">{0} מ״ג</unitPattern>
+				<unitPattern count="other">{0} מ״ג</unitPattern>
 			</unit>
 			<unit type="mass-microgram">
 				<displayName draft="contributed">מק״ג</displayName>
@@ -7775,96 +8061,112 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} מק״ג</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} מק״ג</unitPattern>
 			</unit>
-			<unit type="mass-milligram">
-				<displayName>מ״ג</displayName>
-				<unitPattern count="one" draft="contributed">{0} מ״ג</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} מ״ג</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מ״ג</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מ״ג</unitPattern>
+			<unit type="mass-ton">
+				<displayName>טון</displayName>
+				<unitPattern count="one">ט׳ {0}</unitPattern>
+				<unitPattern count="two">{0} ט׳</unitPattern>
+				<unitPattern count="many">{0} ט׳</unitPattern>
+				<unitPattern count="other">{0} ט׳</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>פאונד</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="two">{0} lbs</unitPattern>
+				<unitPattern count="many">{0} lbs</unitPattern>
+				<unitPattern count="other">{0} lbs</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
 			</unit>
 			<unit type="mass-ounce">
-				<displayName>אונק׳</displayName>
-				<unitPattern count="one" draft="contributed">אונקיה {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} אונקיות</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} אונקיות</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} אונקיות</unitPattern>
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="two">{0} oz</unitPattern>
+				<unitPattern count="many">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
 			</unit>
 			<unit type="mass-ounce-troy">
 				<displayName draft="contributed">oz t</displayName>
-				<unitPattern count="one" draft="contributed">{0} oz t</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} oz t</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} oz t</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} oz t</unitPattern>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="two">{0} oz t</unitPattern>
+				<unitPattern count="many">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<displayName draft="contributed">ליבראות</displayName>
-				<unitPattern count="one" draft="contributed">ליברה {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ליבראות</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ליבראות</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ליבראות</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<displayName draft="contributed">טון</displayName>
-				<unitPattern count="one" draft="contributed">{0} ט</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ט</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ט</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ט</unitPattern>
+			<unit type="mass-carat">
+				<displayName>קרט</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="two">{0} CD</unitPattern>
+				<unitPattern count="many">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
-				<displayName draft="contributed">GW</displayName>
-				<unitPattern count="one" draft="contributed">{0} GW</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} GW</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} GW</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} GW</unitPattern>
-			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="contributed">כ״ס</displayName>
-				<unitPattern count="one" draft="contributed">כ״ס {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} כ״ס</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} כ״ס</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} כ״ס</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName draft="contributed">kW</displayName>
-				<unitPattern count="one" draft="contributed">{0} kW</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} kW</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} kW</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kW</unitPattern>
+				<displayName>GW</displayName>
+				<unitPattern count="one">{0} GW</unitPattern>
+				<unitPattern count="two">{0} GW</unitPattern>
+				<unitPattern count="many">{0} GW</unitPattern>
+				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
 			<unit type="power-megawatt">
-				<displayName draft="contributed">MW</displayName>
-				<unitPattern count="one" draft="contributed">{0} MW</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} MW</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} MW</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MW</unitPattern>
+				<displayName>MW</displayName>
+				<unitPattern count="one">{0} MW</unitPattern>
+				<unitPattern count="two">{0} MW</unitPattern>
+				<unitPattern count="many">{0} MW</unitPattern>
+				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName draft="contributed">mW</displayName>
-				<unitPattern count="one" draft="contributed">{0} mW</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} mW</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} mW</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="two">{0} kW</unitPattern>
+				<unitPattern count="many">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
-				<displayName draft="contributed">ואט</displayName>
-				<unitPattern count="one" draft="contributed">{0} W</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} W</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} W</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} W</unitPattern>
+				<displayName>ואט</displayName>
+				<unitPattern count="one">{0} W</unitPattern>
+				<unitPattern count="two">{0} W</unitPattern>
+				<unitPattern count="many">{0} W</unitPattern>
+				<unitPattern count="other">{0} W</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="two">{0} mW</unitPattern>
+				<unitPattern count="many">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>כ״ס</displayName>
+				<unitPattern count="one">כ״ס {0}</unitPattern>
+				<unitPattern count="two">{0} כ״ס</unitPattern>
+				<unitPattern count="many">{0} כ״ס</unitPattern>
+				<unitPattern count="other">{0} כ״ס</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
-				<displayName draft="contributed">hPa</displayName>
-				<unitPattern count="one" draft="contributed">{0} hPa</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} hPa</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} hPa</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} hPa</unitPattern>
+				<displayName>hPa</displayName>
+				<unitPattern count="one">{0} hPa</unitPattern>
+				<unitPattern count="two">{0} hPa</unitPattern>
+				<unitPattern count="many">{0} hPa</unitPattern>
+				<unitPattern count="other">{0} hPa</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>mm Hg</displayName>
+				<unitPattern count="one">{0} mm Hg</unitPattern>
+				<unitPattern count="two">{0} mm Hg</unitPattern>
+				<unitPattern count="many">{0} mm Hg</unitPattern>
+				<unitPattern count="other">{0} mm Hg</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>psi</displayName>
+				<unitPattern count="one">{0} psi</unitPattern>
+				<unitPattern count="two">{0} psi</unitPattern>
+				<unitPattern count="many">{0} psi</unitPattern>
+				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
 			<unit type="pressure-inch-hg">
-				<displayName draft="contributed">inHg</displayName>
-				<unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} inHg</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} inHg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
+				<displayName>in Hg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="two">{0} inHg</unitPattern>
+				<unitPattern count="many">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
 			</unit>
 			<unit type="pressure-millibar">
 				<displayName>מ״ב</displayName>
@@ -7873,61 +8175,54 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} מ״ב</unitPattern>
 				<unitPattern count="other">{0} מ״ב</unitPattern>
 			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<displayName draft="contributed">mm Hg</displayName>
-				<unitPattern count="one" draft="contributed">{0} mm Hg</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} mm Hg</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} mm Hg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mm Hg</unitPattern>
-			</unit>
-			<unit type="pressure-pound-per-square-inch">
-				<displayName draft="contributed">psi</displayName>
-				<unitPattern count="one" draft="contributed">{0} psi</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} psi</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} psi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} psi</unitPattern>
-			</unit>
-			<unit type="proportion-karat">
-				<displayName draft="contributed">kt</displayName>
-				<unitPattern count="one" draft="contributed">{0} kt</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} kt</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} kt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kt</unitPattern>
-			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName draft="contributed">קמ״ש</displayName>
-				<unitPattern count="one" draft="contributed">{0} קמ״ש</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} קמ״ש</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} קמ״ש</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} קמ״ש</unitPattern>
+				<displayName>קמ״ש</displayName>
+				<unitPattern count="one">{0} קמ״ש</unitPattern>
+				<unitPattern count="two">{0} קמ״ש</unitPattern>
+				<unitPattern count="many">{0} קמ״ש</unitPattern>
+				<unitPattern count="other">{0} קמ״ש</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
-				<displayName draft="contributed">מ/ש</displayName>
-				<unitPattern count="one" draft="contributed">{0} מ/ש</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} מ/ש</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מ/ש</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מ/ש</unitPattern>
+				<displayName>מ׳/שנ׳</displayName>
+				<unitPattern count="one">{0} מ׳/שנ׳</unitPattern>
+				<unitPattern count="two">{0} מ׳/שנ׳</unitPattern>
+				<unitPattern count="many">{0} מ׳/שנ׳</unitPattern>
+				<unitPattern count="other">{0} מ׳/שנ׳</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<displayName draft="contributed">mph</displayName>
-				<unitPattern count="one" draft="contributed">{0} mph</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} mph</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} mph</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mph</unitPattern>
+				<displayName>mph</displayName>
+				<unitPattern count="one">{0} mph</unitPattern>
+				<unitPattern count="two">{0} mph</unitPattern>
+				<unitPattern count="many">{0} mph</unitPattern>
+				<unitPattern count="other">{0} mph</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="two">{0} kn</unitPattern>
+				<unitPattern count="many">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="two">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
-				<displayName draft="contributed">°C</displayName>
-				<unitPattern count="one" draft="contributed">{0}°C</unitPattern>
-				<unitPattern count="two" draft="contributed">{0}°C</unitPattern>
-				<unitPattern count="many" draft="contributed">{0}°C</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°C</unitPattern>
+				<displayName>°C</displayName>
+				<unitPattern count="one">{0}°C</unitPattern>
+				<unitPattern count="two">{0}°C</unitPattern>
+				<unitPattern count="many">{0}°C</unitPattern>
+				<unitPattern count="other">{0}°C</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
-				<displayName draft="contributed">°F</displayName>
-				<unitPattern count="one" draft="contributed">{0}°F</unitPattern>
-				<unitPattern count="two" draft="contributed">{0}°F</unitPattern>
-				<unitPattern count="many" draft="contributed">{0}°F</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°F</unitPattern>
+				<displayName>°F</displayName>
+				<unitPattern count="one">{0}°F</unitPattern>
+				<unitPattern count="two">{0}°F</unitPattern>
+				<unitPattern count="many">{0}°F</unitPattern>
+				<unitPattern count="other">{0}°F</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
 				<displayName draft="contributed">°K</displayName>
@@ -7936,75 +8231,78 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0}°K</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}°K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName draft="contributed">ac ft</displayName>
-				<unitPattern count="one" draft="contributed">{0} ac ft</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ac ft</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ac ft</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ac ft</unitPattern>
+			<unit type="volume-cubic-kilometer">
+				<displayName>קמ״ק</displayName>
+				<unitPattern count="one">קמ״ק {0}</unitPattern>
+				<unitPattern count="two">{0} קמ״ק</unitPattern>
+				<unitPattern count="many">{0} קמ״ק</unitPattern>
+				<unitPattern count="other">{0} קמ״ק</unitPattern>
 			</unit>
-			<unit type="volume-centiliter">
-				<displayName draft="contributed">cL</displayName>
-				<unitPattern count="one" draft="contributed">{0} cL</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} cL</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} cL</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cL</unitPattern>
+			<unit type="volume-cubic-meter">
+				<displayName>m³</displayName>
+				<unitPattern count="one">{0} m³</unitPattern>
+				<unitPattern count="two">{0} m³</unitPattern>
+				<unitPattern count="many">{0} m³</unitPattern>
+				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-centimeter">
 				<displayName draft="contributed">cm³</displayName>
-				<unitPattern count="one" draft="contributed">{0} cm³</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} cm³</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} cm³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName draft="contributed">ft³</displayName>
-				<unitPattern count="one" draft="contributed">{0} ft³</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ft³</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ft³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName draft="contributed">in³</displayName>
-				<unitPattern count="one" draft="contributed">{0} in³</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} in³</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} in³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} in³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-kilometer">
-				<displayName draft="contributed">קמ״ק</displayName>
-				<unitPattern count="one" draft="contributed">{0} קמ״ק</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} קמ״ק</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} קמ״ק</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} קמ״ק</unitPattern>
-			</unit>
-			<unit type="volume-cubic-meter">
-				<displayName draft="contributed">מ״ק</displayName>
-				<unitPattern count="one" draft="contributed">{0} מ״ק</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} מ״ק</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מ״ק</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מ״ק</unitPattern>
+				<unitPattern count="one">{0} סמ״ק</unitPattern>
+				<unitPattern count="two">{0} סמ״ק</unitPattern>
+				<unitPattern count="many">{0} סמ״ק</unitPattern>
+				<unitPattern count="other">{0} סמ״ק</unitPattern>
+				<perUnitPattern>{0}/סמ״ק</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
-				<displayName draft="contributed">mi³</displayName>
-				<unitPattern count="one" draft="contributed">{0} mi³</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} mi³</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} mi³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mi³</unitPattern>
+				<displayName>mi³</displayName>
+				<unitPattern count="one">{0} mi³</unitPattern>
+				<unitPattern count="two">{0} mi³</unitPattern>
+				<unitPattern count="many">{0} mi³</unitPattern>
+				<unitPattern count="other">{0} mi³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-yard">
-				<displayName draft="contributed">yd³</displayName>
-				<unitPattern count="one" draft="contributed">{0} yd³</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} yd³</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} yd³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} yd³</unitPattern>
+				<displayName>yd³</displayName>
+				<unitPattern count="one">{0} yd³</unitPattern>
+				<unitPattern count="two">{0} yd³</unitPattern>
+				<unitPattern count="many">{0} yd³</unitPattern>
+				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName draft="contributed">ספלים</displayName>
-				<unitPattern count="one" draft="contributed">{0} ספ׳</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ספ׳</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ספ׳</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ספ׳</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>feet³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="two">{0} ft³</unitPattern>
+				<unitPattern count="many">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="two">{0} in³</unitPattern>
+				<unitPattern count="many">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="two">{0} ML</unitPattern>
+				<unitPattern count="many">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hL</displayName>
+				<unitPattern count="one">{0} hL</unitPattern>
+				<unitPattern count="two">{0} hL</unitPattern>
+				<unitPattern count="many">{0} hL</unitPattern>
+				<unitPattern count="other">{0} hL</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>ליטר</displayName>
+				<unitPattern count="one">ל׳ {0}</unitPattern>
+				<unitPattern count="two">{0} ל׳</unitPattern>
+				<unitPattern count="many">{0} ל׳</unitPattern>
+				<unitPattern count="other">{0} ל׳</unitPattern>
+				<perUnitPattern>{0}/ל׳</perUnitPattern>
 			</unit>
 			<unit type="volume-deciliter">
 				<displayName draft="contributed">דצ״ל</displayName>
@@ -8013,61 +8311,76 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} דצ״ל</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} דצ״ל</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName draft="contributed">fl oz</displayName>
-				<unitPattern count="one" draft="contributed">{0} fl oz</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} fl oz</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} fl oz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fl oz</unitPattern>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="one">{0} cL</unitPattern>
+				<unitPattern count="two">{0} cL</unitPattern>
+				<unitPattern count="many">{0} cL</unitPattern>
+				<unitPattern count="other">{0} cL</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>מ״ל</displayName>
+				<unitPattern count="one">מ״ל {0}</unitPattern>
+				<unitPattern count="two">{0} מ״ל</unitPattern>
+				<unitPattern count="many">{0} מ״ל</unitPattern>
+				<unitPattern count="other">{0} מ״ל</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="two">{0} mpt</unitPattern>
+				<unitPattern count="many">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="two">{0} mc</unitPattern>
+				<unitPattern count="many">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName draft="contributed">ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="two">{0} ac ft</unitPattern>
+				<unitPattern count="many">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
 			</unit>
 			<unit type="volume-gallon">
-				<displayName draft="contributed">גלון</displayName>
+				<displayName>גלון</displayName>
 				<unitPattern count="one" draft="contributed">{0} גל׳</unitPattern>
 				<unitPattern count="two" draft="contributed">{0} גל׳</unitPattern>
 				<unitPattern count="many" draft="contributed">{0} גל׳</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} גל׳</unitPattern>
-			</unit>
-			<unit type="volume-hectoliter">
-				<displayName draft="contributed">hL</displayName>
-				<unitPattern count="one" draft="contributed">{0} hL</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} hL</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} hL</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} hL</unitPattern>
-			</unit>
-			<unit type="volume-liter">
-				<displayName draft="contributed">ליטר</displayName>
-				<unitPattern count="one" draft="contributed">{0} ל׳</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ל׳</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ל׳</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ל׳</unitPattern>
-			</unit>
-			<unit type="volume-megaliter">
-				<displayName draft="contributed">ML</displayName>
-				<unitPattern count="one" draft="contributed">{0} ML</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ML</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ML</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ML</unitPattern>
-			</unit>
-			<unit type="volume-milliliter">
-				<displayName draft="contributed">מ״ל</displayName>
-				<unitPattern count="one" draft="contributed">{0} מ״ל</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} מ״ל</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מ״ל</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מ״ל</unitPattern>
-			</unit>
-			<unit type="volume-pint">
-				<displayName draft="contributed">פינט</displayName>
-				<unitPattern count="one" draft="contributed">{0} pt</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} pt</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} pt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pt</unitPattern>
+				<perUnitPattern>{0}/גל׳</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
-				<displayName draft="contributed">qts</displayName>
-				<unitPattern count="one" draft="contributed">{0} qt</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} qt</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} qt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} qt</unitPattern>
+				<displayName>qts</displayName>
+				<unitPattern count="one">{0} qt</unitPattern>
+				<unitPattern count="two">{0} qt</unitPattern>
+				<unitPattern count="many">{0} qt</unitPattern>
+				<unitPattern count="other">{0} qt</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>פינט</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="two">{0} pt</unitPattern>
+				<unitPattern count="many">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>כוסות</displayName>
+				<unitPattern count="one">כ׳ {0}</unitPattern>
+				<unitPattern count="two">{0} כ׳</unitPattern>
+				<unitPattern count="many">{0} כ׳</unitPattern>
+				<unitPattern count="other">{0} כ׳</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="two">{0} fl oz</unitPattern>
+				<unitPattern count="many">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>כפות</displayName>
@@ -8083,10 +8396,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} כפי׳</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} כפי׳</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}מז׳</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}צפ׳</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}דר׳</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}מע׳</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<unitPattern count="one" draft="contributed">{0} G</unitPattern>
@@ -8094,6 +8413,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} G</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="two" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="many" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one" draft="contributed">דקה {0}</unitPattern>
 				<unitPattern count="two" draft="contributed">{0} דקות</unitPattern>
@@ -8106,17 +8431,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} שנ׳</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} שנ׳</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="two" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="many" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one" draft="contributed">אקר {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} אקר</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} אקר</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} אקר</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one" draft="contributed">קמ״ר {0}</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} קמ״ר</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} קמ״ר</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} קמ״ר</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one" draft="contributed">הקטאר {0}</unitPattern>
@@ -8124,18 +8443,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} הקטאר</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} הקטאר</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one" draft="contributed">רגל רבועה {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} רגל רבועה</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} רגל רבועה</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} רגל רבועה</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one" draft="contributed">קמ״ר {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} קמ״ר</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} קמ״ר</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} קמ״ר</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one" draft="contributed">מ״ר {0}</unitPattern>
 				<unitPattern count="two" draft="contributed">{0} מ״ר</unitPattern>
@@ -8148,6 +8455,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} מייל רבוע</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} מייל רבוע</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one" draft="contributed">אקר {0}</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} אקר</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} אקר</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} אקר</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one" draft="contributed">רגל רבועה {0}</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} רגל רבועה</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} רגל רבועה</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} רגל רבועה</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ל׳/100ק״מ</displayName>
+				<unitPattern count="one">{0}ל׳/100ק״מ</unitPattern>
+				<unitPattern count="two">{0}ל׳/100ק״מ</unitPattern>
+				<unitPattern count="many">{0}ל׳/100ק״מ</unitPattern>
+				<unitPattern count="other">{0}ל׳/100ק״מ</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>מייל/גלון</displayName>
 				<unitPattern count="one">{0} מייל/גלון</unitPattern>
@@ -8155,6 +8481,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} מייל/גלון</unitPattern>
 				<unitPattern count="other">{0} מייל/גלון</unitPattern>
 			</unit>
+			<unit type="duration-year">
+				<displayName>ש׳</displayName>
+				<unitPattern count="one" draft="contributed">שנה {0}</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} שנים</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} שנים</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} שנים</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ח׳</displayName>
+				<unitPattern count="one">ח׳ {0}</unitPattern>
+				<unitPattern count="two">{0} ח׳</unitPattern>
+				<unitPattern count="many">{0} ח׳</unitPattern>
+				<unitPattern count="other">{0} ח׳</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>שב׳</displayName>
+				<unitPattern count="one" draft="contributed">שבוע {0}</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} שבועות</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} שבועות</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} שבועות</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>יום</displayName>
 				<unitPattern count="one">י׳</unitPattern>
@@ -8169,13 +8516,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} שע׳</unitPattern>
 				<unitPattern count="other">{0} שע׳</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="contributed">ms</displayName>
-				<unitPattern count="one" draft="contributed">{0} ms</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ms</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ms</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>דק׳</displayName>
 				<unitPattern count="one">דקה</unitPattern>
@@ -8183,13 +8523,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} דק׳</unitPattern>
 				<unitPattern count="other">{0} דק׳</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>ח׳</displayName>
-				<unitPattern count="one" draft="contributed">חודש {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ח׳</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ח׳</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ח׳</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>שנ׳</displayName>
 				<unitPattern count="one">שניה</unitPattern>
@@ -8197,19 +8530,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} שנ׳</unitPattern>
 				<unitPattern count="other">{0} שנ׳</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>שב׳</displayName>
-				<unitPattern count="one" draft="contributed">שבוע {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} שבועות</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} שבועות</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} שבועות</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="two">{0} ms</unitPattern>
+				<unitPattern count="many">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>ש׳</displayName>
-				<unitPattern count="one" draft="contributed">שנה {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} שנים</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} שנים</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} שנים</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>ק״מ</displayName>
+				<unitPattern count="one">ק״מ {0}</unitPattern>
+				<unitPattern count="two">{0} ק״מ</unitPattern>
+				<unitPattern count="many">{0} ק״מ</unitPattern>
+				<unitPattern count="other">{0} ק״מ</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>מטר</displayName>
+				<unitPattern count="one">מ׳ אחד</unitPattern>
+				<unitPattern count="two">שני מ׳</unitPattern>
+				<unitPattern count="many">{0}מ׳</unitPattern>
+				<unitPattern count="other">{0}מ׳</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
 				<displayName>ס״מ</displayName>
@@ -8218,6 +8558,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ס״מ</unitPattern>
 				<unitPattern count="other">{0} ס״מ</unitPattern>
 			</unit>
+			<unit type="length-millimeter">
+				<displayName>מ״מ</displayName>
+				<unitPattern count="one">מ״מ {0}</unitPattern>
+				<unitPattern count="two">{0} מ״מ</unitPattern>
+				<unitPattern count="many">{0} מ״מ</unitPattern>
+				<unitPattern count="other">{0} מ״מ</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<unitPattern count="one" draft="contributed">פיקומטר {0}</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} פיקומטר</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} פיקומטר</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} פיקומטר</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one" draft="contributed">מייל {0}</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} מייל</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} מייל</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} מייל</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<unitPattern count="one" draft="contributed">יארד {0}</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} יארד</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} יארד</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} יארד</unitPattern>
+			</unit>
 			<unit type="length-foot">
 				<unitPattern count="one" draft="contributed">רגל {0}</unitPattern>
 				<unitPattern count="two" draft="contributed">{0} רגל</unitPattern>
@@ -8230,70 +8595,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} אינץ׳</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} אינץ׳</unitPattern>
 			</unit>
-			<unit type="length-kilometer">
-				<displayName>ק״מ</displayName>
-				<unitPattern count="one" draft="contributed">ק״מ {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ק״מ</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ק״מ</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ק״מ</unitPattern>
-			</unit>
 			<unit type="length-light-year">
 				<unitPattern count="one" draft="contributed">שנת אור {0}</unitPattern>
 				<unitPattern count="two" draft="contributed">{0} שנות אור</unitPattern>
 				<unitPattern count="many" draft="contributed">{0} שנות אור</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} שנות אור</unitPattern>
 			</unit>
-			<unit type="length-meter">
-				<displayName>מטר</displayName>
-				<unitPattern count="one">מ׳ אחד</unitPattern>
-				<unitPattern count="two">שני מ׳</unitPattern>
-				<unitPattern count="many">{0}מ׳</unitPattern>
-				<unitPattern count="other">{0}מ׳</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one" draft="contributed">מייל {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} מייל</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מייל</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מייל</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>מ״מ</displayName>
-				<unitPattern count="one" draft="contributed">מ״מ {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} מ״מ</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} מ״מ</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} מ״מ</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<unitPattern count="one" draft="contributed">פיקומטר {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} פיקומטר</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} פיקומטר</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} פיקומטר</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<unitPattern count="one" draft="contributed">יארד {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} יארד</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} יארד</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} יארד</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>ק״ג</displayName>
+				<unitPattern count="one">{0}kg</unitPattern>
+				<unitPattern count="two">{0}kg</unitPattern>
+				<unitPattern count="many">{0}kg</unitPattern>
+				<unitPattern count="other">{0}kg</unitPattern>
 			</unit>
 			<unit type="mass-gram">
 				<displayName>גרם</displayName>
-				<unitPattern count="one" draft="contributed">גר׳ {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} גר׳</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} גר׳</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} גר׳</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>ק״ג</displayName>
-				<unitPattern count="one">{0} ק״ג</unitPattern>
-				<unitPattern count="two">{0} ק״ג</unitPattern>
-				<unitPattern count="many">{0} ק״ג</unitPattern>
-				<unitPattern count="other">{0} ק״ג</unitPattern>
-			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one" draft="contributed">אונקיה {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} אונקיות</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} אונקיות</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} אונקיות</unitPattern>
+				<unitPattern count="one">{0}g</unitPattern>
+				<unitPattern count="two">{0}g</unitPattern>
+				<unitPattern count="many">{0}g</unitPattern>
+				<unitPattern count="other">{0}g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one" draft="contributed">ליברה {0}</unitPattern>
@@ -8301,11 +8621,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} ליבראות</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ליבראות</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one" draft="contributed">כ״ס {0}</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} כ״ס</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} כ״ס</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} כ״ס</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one" draft="contributed">אונקיה {0}</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} אונקיות</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} אונקיות</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} אונקיות</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one" draft="contributed">{0} kW</unitPattern>
@@ -8319,6 +8639,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} W</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one" draft="contributed">כ״ס {0}</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} כ״ס</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} כ״ס</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} כ״ס</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one" draft="contributed">{0} hPa</unitPattern>
 				<unitPattern count="two" draft="contributed">{0} hPa</unitPattern>
@@ -8338,11 +8664,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} מיליבר</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName draft="contributed">קמ״ש</displayName>
-				<unitPattern count="one" draft="contributed">{0} קמ״ש</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} קמ״ש</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} קמ״ש</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} קמ״ש</unitPattern>
+				<displayName>קמ״ש</displayName>
+				<unitPattern count="one">{0} קמ״ש</unitPattern>
+				<unitPattern count="two">{0} קמ״ש</unitPattern>
+				<unitPattern count="many">{0} קמ״ש</unitPattern>
+				<unitPattern count="other">{0} קמ״ש</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
 				<unitPattern count="one" draft="contributed">{0} מ/ש</unitPattern>
@@ -8357,7 +8683,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other" draft="contributed">{0} mph</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
-				<displayName draft="contributed">°C</displayName>
+				<displayName>°C</displayName>
 				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
 				<unitPattern count="two" draft="contributed">{0}°</unitPattern>
 				<unitPattern count="many" draft="contributed">{0}°</unitPattern>
@@ -8382,12 +8708,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other" draft="contributed">{0} mi³</unitPattern>
 			</unit>
 			<unit type="volume-liter">
-				<displayName draft="contributed">ליטר</displayName>
+				<displayName>ליטר</displayName>
 				<unitPattern count="one" draft="contributed">{0} ל׳</unitPattern>
 				<unitPattern count="two" draft="contributed">{0} ל׳</unitPattern>
 				<unitPattern count="many" draft="contributed">{0} ל׳</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ל׳</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="provisional">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="provisional">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="provisional">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="provisional">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/he_IL.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/he_IL.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/he_IL.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/he_IL.xml
index 924b1563126..da688f209f7 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/he_IL.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/he_IL.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="he"/>
 		<territory type="IL"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hi.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hi.xml
similarity index 92%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hi.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hi.xml
index d2dce44d899..1c77ddfc625 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hi.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hi.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="hi"/>
 	</identity>
 	<localeDisplayNames>
@@ -59,6 +58,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bem">बेम्बा</language>
 			<language type="bez">बेना</language>
 			<language type="bg">बुल्गारियाई</language>
+			<language type="bgn">पश्चिमी बलोची</language>
 			<language type="bho">भोजपुरी</language>
 			<language type="bi">बिस्लामा</language>
 			<language type="bik">बिकोल</language>
@@ -139,7 +139,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="eo">एस्पेरेंतो</language>
 			<language type="es">स्पेनी</language>
 			<language type="es_419">लैटिन अमेरिकी स्पेनी</language>
-			<language type="es_ES">यूरोपीय स्पेनी</language>
+			<language type="es_ES">यूरोपीय स्पेनिश</language>
 			<language type="es_MX">मैक्सिकन स्पेनिश</language>
 			<language type="et">एस्टोनियाई</language>
 			<language type="eu">बास्क</language>
@@ -210,7 +210,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ilo">इलोको</language>
 			<language type="inh">इंगुश</language>
 			<language type="io">इडौ</language>
-			<language type="is">आइसलैंडी</language>
+			<language type="is">आइसलैंडिक</language>
 			<language type="it">इतालवी</language>
 			<language type="iu">इनूकीटूत्</language>
 			<language type="ja">जापानी</language>
@@ -239,7 +239,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ki">किकुयू</language>
 			<language type="kj">क्वान्यामा</language>
 			<language type="kk">कज़ाख़</language>
-			<language type="kl">ग्रीनलैंडिक</language>
+			<language type="kl">कलालीसुत</language>
 			<language type="kln">कलेंजिन</language>
 			<language type="km">खमेर</language>
 			<language type="kmb">किम्बन्दु</language>
@@ -276,6 +276,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">लाओ</language>
 			<language type="lol">मोंगो</language>
 			<language type="loz">लोज़ी</language>
+			<language type="lrc">उत्तरी लूरी</language>
 			<language type="lt">लिथुआनियाई</language>
 			<language type="lu">ल्यूबा-कटांगा</language>
 			<language type="lua">ल्यूबा-लुलुआ</language>
@@ -321,12 +322,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mwr">मारवाड़ी</language>
 			<language type="my">बर्मीज़</language>
 			<language type="myv">एर्ज़या</language>
+			<language type="mzn">माज़न्देरानी</language>
 			<language type="na">नाउरू</language>
 			<language type="nap">नीपोलिटन</language>
 			<language type="naq">नामा</language>
 			<language type="nb">नॉर्वेजियाई बोकमाल</language>
 			<language type="nd">उत्तरी देबेल</language>
 			<language type="nds">निचला जर्मन</language>
+			<language type="nds_NL">निचली सैक्सन</language>
 			<language type="ne">नेपाली</language>
 			<language type="new">नेवाड़ी</language>
 			<language type="ng">डोन्गा</language>
@@ -402,6 +405,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">सिसिलियन</language>
 			<language type="sco">स्कॉट्स</language>
 			<language type="sd">सिंधी</language>
+			<language type="sdh">दक्षिणी कार्डिश</language>
 			<language type="se">नॉर्दन सामी</language>
 			<language type="seh">सेना</language>
 			<language type="sel">सेल्कप</language>
@@ -436,8 +440,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">सुमेरियन</language>
 			<language type="sv">स्वीडिश</language>
 			<language type="sw">स्वाहिली</language>
+			<language type="sw_CD">कांगो स्वाहिली</language>
 			<language type="swb" draft="provisional">कोमोरियन</language>
-			<language type="swc">कांगो स्वाहिली</language>
 			<language type="syc">क्लासिकल सिरिएक</language>
 			<language type="syr">सिरिएक</language>
 			<language type="ta">तमिल</language>
@@ -490,6 +494,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">वलामो</language>
 			<language type="war">वारै</language>
 			<language type="was">वाशो</language>
+			<language type="wbp">वॉल्पेरी</language>
 			<language type="wo">वोलोफ़</language>
 			<language type="xal">काल्मिक</language>
 			<language type="xh">ख़ोसा</language>
@@ -687,7 +692,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">एंग्विला</territory>
 			<territory type="AL">अल्बानिया</territory>
 			<territory type="AM">आर्मेनिया</territory>
-			<territory type="AN">नीदरलैंडी ऐंटील</territory>
 			<territory type="AO">अंगोला</territory>
 			<territory type="AQ">अंटार्कटिका</territory>
 			<territory type="AR">अर्जेंटीना</territory>
@@ -975,6 +979,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">संख्यात्मक वर्गीकरण</key>
 			<key type="colStrength" draft="contributed">वर्गीकरण सशक्तता</key>
 			<key type="currency">मुद्रा</key>
+			<key type="hc">घंटों का चक्र (12 बनाम 24)</key>
+			<key type="lb">पंक्ति विच्छेद शैली</key>
+			<key type="ms">मापन प्रणाली</key>
 			<key type="numbers">संख्याएँ</key>
 			<key type="timezone" draft="contributed">समय क्षेत्र</key>
 			<key type="va" draft="contributed">स्थानीय प्रकार</key>
@@ -982,95 +989,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x" draft="contributed">निजी-उपयोग</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">अरबी-भारतीय अंक</type>
-			<type type="arabext" key="numbers">विस्तृत अरबी-भारतीय अंक</type>
-			<type type="armn" key="numbers">आर्मेनियाई संख्याएँ</type>
-			<type type="armnlow" key="numbers">आर्मेनियाई लोअरकेस संख्याएँ</type>
-			<type type="beng" key="numbers">बंगाली अंक</type>
-			<type type="big5han" key="collation">पारम्पारिक चीनी वर्गीकरण</type>
-			<type type="buddhist" key="calendar">बौद्ध पंचांग</type>
-			<type type="chinese" key="calendar">चीनी पंचांग</type>
-			<type type="coptic" key="calendar" draft="contributed">कोप्टिक कैलेंडर</type>
-			<type type="dangi" key="calendar">दांगी कैलेंडर</type>
-			<type type="deva" key="numbers">देवनागरी अंक</type>
-			<type type="dictionary" key="collation" draft="contributed">शब्दकोश क्रम विन्यास</type>
-			<type type="ducet" key="collation">डिफ़ॉल्ट यूनिकोड सॉर्ट क्रम</type>
-			<type type="ethi" key="numbers">इथियोपिक संख्याएँ</type>
-			<type type="ethiopic" key="calendar">इथियोपिक कैलेंडर</type>
-			<type type="ethiopic-amete-alem" key="calendar" draft="contributed">इथियोपिक अमेते अलेम कैलेंडर</type>
-			<type type="finance" key="numbers" draft="contributed">वित्तीय अंक</type>
-			<type type="fullwide" key="numbers">पूर्ण चौड़ाई अंक</type>
-			<type type="gb2312han" key="collation">सरलीकृत चीनी वर्गीकरण</type>
-			<type type="geor" key="numbers">जॉर्जियन संख्याएँ</type>
-			<type type="gregorian" key="calendar">ग्रेगोरियन कैलेंडर</type>
-			<type type="grek" key="numbers">यूनानी संख्याएँ</type>
-			<type type="greklow" key="numbers">यूनानी लोअरकेस संख्याएँ</type>
-			<type type="gujr" key="numbers">गुजराती अंक</type>
-			<type type="guru" key="numbers">गुरमुखी अंक</type>
-			<type type="hanidec" key="numbers">चीनी दशमलव संख्याएँ</type>
-			<type type="hans" key="numbers">सरलीकृत चीनी संख्याएँ</type>
-			<type type="hansfin" key="numbers">सरलीकृत चीनी वित्तीय संख्याएँ</type>
-			<type type="hant" key="numbers">पारंपरिक चीनी संख्याएँ</type>
-			<type type="hantfin" key="numbers">पारंपरिक चीनी वित्तीय संख्याएँ</type>
-			<type type="hebr" key="numbers">हिब्रू संख्याएँ</type>
-			<type type="hebrew" key="calendar">हिब्रू पंचांग</type>
-			<type type="identical" key="colStrength" draft="contributed">सभी क्रमित करें</type>
-			<type type="indian" key="calendar">भारतीय राष्ट्रीय कैलेंडर</type>
-			<type type="islamic" key="calendar">इस्लामी पंचांग</type>
-			<type type="islamic-civil" key="calendar">इस्लामी नागरिक पंचांग</type>
-			<type type="iso8601" key="calendar">आईएसओ-8601 कैलेंडर</type>
-			<type type="japanese" key="calendar">जापानी पंचांग</type>
-			<type type="jpan" key="numbers">जापानी संख्याएँ</type>
-			<type type="jpanfin" key="numbers">जापानी वित्तीय संख्याएँ</type>
-			<type type="khmr" key="numbers">खमेर अंक</type>
-			<type type="knda" key="numbers">कन्नड़ अंक</type>
-			<type type="laoo" key="numbers">लाओ अंक</type>
-			<type type="latn" key="numbers">पश्चिमी अंक</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">पहले लोअरकेस क्रमित करें</type>
-			<type type="mlym" key="numbers">मलयालम अंक</type>
-			<type type="mong" key="numbers" draft="contributed">मंगोलियाई अंक</type>
-			<type type="mymr" key="numbers">म्यांमार अंक</type>
-			<type type="native" key="numbers" draft="contributed">स्थानीय अंक</type>
-			<type type="no" key="colBackwards" draft="contributed">उच्‍चारणों को सामान्‍य रूप से क्रमित करें</type>
-			<type type="no" key="colCaseFirst" draft="contributed">सामान्‍य केस क्रम में क्रमित करें</type>
-			<type type="no" key="colCaseLevel" draft="contributed">केस असंवेदी क्रमित करें</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">काना को अलग से क्रमित करें</type>
-			<type type="no" key="colNormalization" draft="contributed">बिना सामान्‍यीकरण के क्रमित करें</type>
-			<type type="no" key="colNumeric" draft="contributed">अंको को अलग-अलग क्रमित करें</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">प्रतीकों को क्रमित करें</type>
-			<type type="orya" key="numbers">उड़िया अंक</type>
-			<type type="persian" key="calendar">फ़ारसी कैलेंडर</type>
-			<type type="phonebook" key="collation">दूरभाष निर्देशिका वर्गीकरण</type>
-			<type type="phonetic" key="collation" draft="contributed">ध्‍वन्यात्मक क्रमित करने का क्रम</type>
-			<type type="pinyin" key="collation">पिनयीन वर्गीकरण</type>
-			<type type="primary" key="colStrength" draft="contributed">केवल आधार अक्षरों को क्रमित करें</type>
-			<type type="quaternary" key="colStrength" draft="contributed">उच्‍चारणों/केस/चौड़ाई/काना क्रमित करें</type>
-			<type type="reformed" key="collation" draft="contributed">पुनर्निर्मित क्रम विन्यास</type>
-			<type type="roc" key="calendar">चीनी गणतंत्र पंचांग</type>
-			<type type="roman" key="numbers">रोमन संख्याएँ</type>
-			<type type="romanlow" key="numbers">रोमन लोअरकेस संख्याएँ</type>
-			<type type="search" key="collation">सामान्य-उद्देश्य खोज</type>
-			<type type="searchjl" key="collation" draft="contributed">हांगुल आरंभिक व्‍यंजन द्वारा खोजें</type>
-			<type type="secondary" key="colStrength" draft="contributed">उच्‍चारण क्रमित करें</type>
-			<type type="shifted" key="colAlternate" draft="contributed">प्रतीकों पर ध्यान न देकर क्रमित करें</type>
-			<type type="standard" key="collation">मानक सॉर्ट क्रम</type>
-			<type type="stroke" key="collation">स्ट्रोक वर्गीकरण</type>
-			<type type="taml" key="numbers">पारंपरिक तमिल संख्याएँ</type>
-			<type type="tamldec" key="numbers">तमिल अंक</type>
-			<type type="telu" key="numbers">तेलुगू अंक</type>
-			<type type="tertiary" key="colStrength" draft="contributed">उच्‍चारणों/केस/चौड़ाई क्रमित करें</type>
-			<type type="thai" key="numbers">थाई अंक</type>
-			<type type="tibt" key="numbers">तिब्बती अंक</type>
-			<type type="traditional" key="collation">पारम्पारिक वर्गीकरण</type>
-			<type type="traditional" key="numbers" draft="contributed">परंपरागत अंक</type>
-			<type type="unihan" key="collation" draft="contributed">रेडिकल-स्ट्रोक क्रम विन्यास</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">पहले अपरकेस क्रमित करें</type>
-			<type type="vaii" key="numbers" draft="contributed">वाई अंक</type>
-			<type type="yes" key="colBackwards" draft="contributed">उच्‍चारण के उलट क्रमित करें</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">केस संवेदी को क्रमित करें</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">काना को भिन्‍न रूप में क्रमित करें</type>
-			<type type="yes" key="colNormalization" draft="contributed">यूनिकोड सामान्‍यीकृत क्रमित करें</type>
-			<type type="yes" key="colNumeric" draft="contributed">अंकों को अंकीय रूप से क्रमित करें</type>
+			<type key="calendar" type="buddhist">बौद्ध पंचांग</type>
+			<type key="calendar" type="chinese">चीनी पंचांग</type>
+			<type key="calendar" type="coptic" draft="contributed">कोप्टिक कैलेंडर</type>
+			<type key="calendar" type="dangi">दांगी कैलेंडर</type>
+			<type key="calendar" type="ethiopic">इथियोपिक कैलेंडर</type>
+			<type key="calendar" type="ethiopic-amete-alem" draft="contributed">इथियोपिक अमेते अलेम कैलेंडर</type>
+			<type key="calendar" type="gregorian">ग्रेगोरियन कैलेंडर</type>
+			<type key="calendar" type="hebrew">हिब्रू पंचांग</type>
+			<type key="calendar" type="indian">भारतीय राष्ट्रीय कैलेंडर</type>
+			<type key="calendar" type="islamic">इस्लामी पंचांग</type>
+			<type key="calendar" type="islamic-civil">इस्लामी नागरिक पंचांग</type>
+			<type key="calendar" type="iso8601">आईएसओ-8601 कैलेंडर</type>
+			<type key="calendar" type="japanese">जापानी पंचांग</type>
+			<type key="calendar" type="persian">फ़ारसी कैलेंडर</type>
+			<type key="calendar" type="roc">चीनी गणतंत्र पंचांग</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">प्रतीकों को क्रमित करें</type>
+			<type key="colAlternate" type="shifted" draft="contributed">प्रतीकों पर ध्यान न देकर क्रमित करें</type>
+			<type key="colBackwards" type="no" draft="contributed">उच्‍चारणों को सामान्‍य रूप से क्रमित करें</type>
+			<type key="colBackwards" type="yes" draft="contributed">उच्‍चारण के उलट क्रमित करें</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">पहले लोअरकेस क्रमित करें</type>
+			<type key="colCaseFirst" type="no" draft="contributed">सामान्‍य केस क्रम में क्रमित करें</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">पहले अपरकेस क्रमित करें</type>
+			<type key="colCaseLevel" type="no" draft="contributed">केस असंवेदी क्रमित करें</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">केस संवेदी को क्रमित करें</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">काना को अलग से क्रमित करें</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">काना को भिन्‍न रूप में क्रमित करें</type>
+			<type key="collation" type="big5han">पारम्पारिक चीनी वर्गीकरण</type>
+			<type key="collation" type="dictionary" draft="contributed">शब्दकोश क्रम विन्यास</type>
+			<type key="collation" type="ducet">डिफ़ॉल्ट यूनिकोड सॉर्ट क्रम</type>
+			<type key="collation" type="gb2312han">सरलीकृत चीनी वर्गीकरण</type>
+			<type key="collation" type="phonebook">दूरभाष निर्देशिका वर्गीकरण</type>
+			<type key="collation" type="phonetic" draft="contributed">ध्‍वन्यात्मक क्रमित करने का क्रम</type>
+			<type key="collation" type="pinyin">पिनयीन वर्गीकरण</type>
+			<type key="collation" type="reformed" draft="contributed">पुनर्निर्मित क्रम विन्यास</type>
+			<type key="collation" type="search">सामान्य-उद्देश्य खोज</type>
+			<type key="collation" type="searchjl" draft="contributed">हांगुल आरंभिक व्‍यंजन द्वारा खोजें</type>
+			<type key="collation" type="standard">मानक सॉर्ट क्रम</type>
+			<type key="collation" type="stroke">स्ट्रोक वर्गीकरण</type>
+			<type key="collation" type="traditional">पारम्पारिक वर्गीकरण</type>
+			<type key="collation" type="unihan" draft="contributed">रेडिकल-स्ट्रोक क्रम विन्यास</type>
+			<type key="colNormalization" type="no" draft="contributed">बिना सामान्‍यीकरण के क्रमित करें</type>
+			<type key="colNormalization" type="yes" draft="contributed">यूनिकोड सामान्‍यीकृत क्रमित करें</type>
+			<type key="colNumeric" type="no" draft="contributed">अंको को अलग-अलग क्रमित करें</type>
+			<type key="colNumeric" type="yes" draft="contributed">अंकों को अंकीय रूप से क्रमित करें</type>
+			<type key="colStrength" type="identical" draft="contributed">सभी क्रमित करें</type>
+			<type key="colStrength" type="primary" draft="contributed">केवल आधार अक्षरों को क्रमित करें</type>
+			<type key="colStrength" type="quaternary" draft="contributed">उच्‍चारणों/केस/चौड़ाई/काना क्रमित करें</type>
+			<type key="colStrength" type="secondary" draft="contributed">उच्‍चारण क्रमित करें</type>
+			<type key="colStrength" type="tertiary" draft="contributed">उच्‍चारणों/केस/चौड़ाई क्रमित करें</type>
+			<type key="hc" type="h11">12 घंटों की प्रणाली (0–11)</type>
+			<type key="hc" type="h12">12 घंटों की प्रणाली (1–12)</type>
+			<type key="hc" type="h23">24 घंटों की प्रणाली (0–23)</type>
+			<type key="hc" type="h24">24 घंटों की प्रणाली (1–24)</type>
+			<type key="lb" type="loose">ढीली पंक्ति विच्छेद शैली</type>
+			<type key="lb" type="normal">सामान्य पंक्ति विच्छेद शैली</type>
+			<type key="lb" type="strict">सख्त पंक्ति विच्छेद शैली</type>
+			<type key="ms" type="metric">मीट्रिक</type>
+			<type key="ms" type="uksystem">इम्पीरियल मापन प्रणाली</type>
+			<type key="ms" type="ussystem">अमेरिकी मापन प्रणाली</type>
+			<type key="numbers" type="arab">अरबी-भारतीय अंक</type>
+			<type key="numbers" type="arabext">विस्तृत अरबी-भारतीय अंक</type>
+			<type key="numbers" type="armn">आर्मेनियाई संख्याएँ</type>
+			<type key="numbers" type="armnlow">आर्मेनियाई लोअरकेस संख्याएँ</type>
+			<type key="numbers" type="beng">बंगाली अंक</type>
+			<type key="numbers" type="deva">देवनागरी अंक</type>
+			<type key="numbers" type="ethi">इथियोपिक संख्याएँ</type>
+			<type key="numbers" type="finance" draft="contributed">वित्तीय अंक</type>
+			<type key="numbers" type="fullwide">पूर्ण चौड़ाई अंक</type>
+			<type key="numbers" type="geor">जॉर्जियन संख्याएँ</type>
+			<type key="numbers" type="grek">यूनानी संख्याएँ</type>
+			<type key="numbers" type="greklow">यूनानी लोअरकेस संख्याएँ</type>
+			<type key="numbers" type="gujr">गुजराती अंक</type>
+			<type key="numbers" type="guru">गुरमुखी अंक</type>
+			<type key="numbers" type="hanidec">चीनी दशमलव संख्याएँ</type>
+			<type key="numbers" type="hans">सरलीकृत चीनी संख्याएँ</type>
+			<type key="numbers" type="hansfin">सरलीकृत चीनी वित्तीय संख्याएँ</type>
+			<type key="numbers" type="hant">पारंपरिक चीनी संख्याएँ</type>
+			<type key="numbers" type="hantfin">पारंपरिक चीनी वित्तीय संख्याएँ</type>
+			<type key="numbers" type="hebr">हिब्रू संख्याएँ</type>
+			<type key="numbers" type="jpan">जापानी संख्याएँ</type>
+			<type key="numbers" type="jpanfin">जापानी वित्तीय संख्याएँ</type>
+			<type key="numbers" type="khmr">खमेर अंक</type>
+			<type key="numbers" type="knda">कन्नड़ अंक</type>
+			<type key="numbers" type="laoo">लाओ अंक</type>
+			<type key="numbers" type="latn">पश्चिमी अंक</type>
+			<type key="numbers" type="mlym">मलयालम अंक</type>
+			<type key="numbers" type="mong" draft="contributed">मंगोलियाई अंक</type>
+			<type key="numbers" type="mymr">म्यांमार अंक</type>
+			<type key="numbers" type="native" draft="contributed">स्थानीय अंक</type>
+			<type key="numbers" type="orya">उड़िया अंक</type>
+			<type key="numbers" type="roman">रोमन संख्याएँ</type>
+			<type key="numbers" type="romanlow">रोमन लोअरकेस संख्याएँ</type>
+			<type key="numbers" type="taml">पारंपरिक तमिल संख्याएँ</type>
+			<type key="numbers" type="tamldec">तमिल अंक</type>
+			<type key="numbers" type="telu">तेलुगू अंक</type>
+			<type key="numbers" type="thai">थाई अंक</type>
+			<type key="numbers" type="tibt">तिब्बती अंक</type>
+			<type key="numbers" type="traditional" draft="contributed">परंपरागत अंक</type>
+			<type key="numbers" type="vaii" draft="contributed">वाई अंक</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">BGN</transformName>
@@ -1183,6 +1200,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">G y</dateFormatItem>
 						<dateFormatItem id="GyMMM">G y MMM</dateFormatItem>
@@ -1201,6 +1219,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">MMM</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd" draft="contributed">MMMM d</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">G y</dateFormatItem>
 						<dateFormatItem id="yyyy">G y</dateFormatItem>
@@ -1211,6 +1230,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">G MMM y</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">G d MMM y</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">G E, d MMM y</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM" draft="contributed">G y MMMM</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">QQQ G y</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">QQQQ G y</dateFormatItem>
 					</availableFormats>
@@ -1525,18 +1545,55 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight" draft="contributed">मध्यरात्रि</dayPeriod>
 							<dayPeriod type="am">पूर्व</dayPeriod>
 							<dayPeriod type="pm">अपर</dayPeriod>
+							<dayPeriod type="morning1" draft="contributed">सुबह</dayPeriod>
+							<dayPeriod type="afternoon1" draft="contributed">अपराह्न</dayPeriod>
+							<dayPeriod type="evening1" draft="contributed">शाम</dayPeriod>
+							<dayPeriod type="night1" draft="contributed">रात</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight" draft="contributed">आधी रात</dayPeriod>
 							<dayPeriod type="am">पू</dayPeriod>
-							<dayPeriod type="noon" draft="contributed">दोप</dayPeriod>
 							<dayPeriod type="pm">अ</dayPeriod>
+							<dayPeriod type="morning1" draft="contributed">सुबह</dayPeriod>
+							<dayPeriod type="afternoon1" draft="contributed">अपराह्न</dayPeriod>
+							<dayPeriod type="evening1" draft="contributed">शाम</dayPeriod>
+							<dayPeriod type="night1" draft="contributed">शाम</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight" draft="contributed">मध्यरात्रि</dayPeriod>
 							<dayPeriod type="am">पूर्वाह्न</dayPeriod>
-							<dayPeriod type="noon" draft="contributed">दोपहर</dayPeriod>
 							<dayPeriod type="pm">अपराह्न</dayPeriod>
+							<dayPeriod type="morning1" draft="contributed">सुबह</dayPeriod>
+							<dayPeriod type="afternoon1" draft="contributed">अपराह्न</dayPeriod>
+							<dayPeriod type="evening1" draft="contributed">शाम</dayPeriod>
+							<dayPeriod type="night1" draft="contributed">रात</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am" draft="provisional">पूर्व</dayPeriod>
+							<dayPeriod type="pm" draft="provisional">अपर</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">आधी रात</dayPeriod>
+							<dayPeriod type="am">पू</dayPeriod>
+							<dayPeriod type="pm">अ</dayPeriod>
+							<dayPeriod type="morning1">सुबह</dayPeriod>
+							<dayPeriod type="afternoon1">अपराह्न</dayPeriod>
+							<dayPeriod type="evening1">शाम</dayPeriod>
+							<dayPeriod type="night1">रात</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">आधी रात</dayPeriod>
+							<dayPeriod type="am">पूर्वाह्न</dayPeriod>
+							<dayPeriod type="pm">अपराह्न</dayPeriod>
+							<dayPeriod type="morning1">सुबह</dayPeriod>
+							<dayPeriod type="afternoon1">दोपहर</dayPeriod>
+							<dayPeriod type="evening1">शाम</dayPeriod>
+							<dayPeriod type="night1">रात</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1621,7 +1678,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
@@ -1637,6 +1694,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv" draft="contributed">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv" draft="contributed">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv" draft="contributed">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv" draft="contributed">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
@@ -1661,7 +1722,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
 					</availableFormats>
 					<appendItems>
-						<appendItem request="Timezone" draft="contributed">{0} {1}</appendItem>
+						<appendItem request="Timezone">{0} {1}</appendItem>
 					</appendItems>
 					<intervalFormats>
 						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
@@ -1715,12 +1776,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">MMM–MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d" draft="contributed">d MMM–d</greatestDifference>
+							<greatestDifference id="d">d MMM–d</greatestDifference>
 							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
 							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
-							<greatestDifference id="M" draft="contributed">E, d MMM – E, d MMM</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
 							<greatestDifference id="y">y–y</greatestDifference>
@@ -2182,6 +2243,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter">
 				<displayName>तिमाही</displayName>
+				<relative type="-1" draft="contributed">अंतिम तिमाही</relative>
+				<relative type="0" draft="contributed">इस तिमाही</relative>
+				<relative type="1" draft="contributed">अगली तिमाही</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} तिमाही में</relativeTimePattern>
 					<relativeTimePattern count="other">{0} तिमाहियों में</relativeTimePattern>
@@ -2193,6 +2257,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>तिमाही</displayName>
+				<relative type="-1" draft="contributed">अंतिम तिमाही</relative>
+				<relative type="0" draft="contributed">इस तिमाही</relative>
+				<relative type="1" draft="contributed">अगली तिमाही</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} तिमाही में</relativeTimePattern>
 					<relativeTimePattern count="other">{0} तिमाहियों में</relativeTimePattern>
@@ -2204,6 +2271,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>तिमाही</displayName>
+				<relative type="-1" draft="contributed">अंतिम तिमाही</relative>
+				<relative type="0" draft="contributed">इस तिमाही</relative>
+				<relative type="1" draft="contributed">अगली तिमाही</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ति. में</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ति. में</relativeTimePattern>
@@ -3413,6 +3483,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>पोर्ट मोरेस्बी</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity draft="contributed">बोगनविल</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>मनीला</exemplarCity>
 			</zone>
@@ -3497,6 +3570,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>इर्कुत्स्क</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>त्शिता</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>याकूत्स्क</exemplarCity>
 			</zone>
@@ -3515,6 +3591,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>मागादान</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>स्रेद्निकोलिमस्क</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>कमचत्का</exemplarCity>
 			</zone>
@@ -3735,7 +3814,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>वेवे, इंडियाना</exemplarCity>
 			</zone>
 			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>मोंटीसेलो, केंचुकी</exemplarCity>
+				<exemplarCity>मोंटीसेलो, केंटकी</exemplarCity>
 			</zone>
 			<zone type="America/Detroit">
 				<exemplarCity>डेट्रॉयट</exemplarCity>
@@ -4800,6 +4879,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="contributed">¤0 हज़ार</pattern>
+					<pattern type="1000" count="other" draft="contributed">¤0 हज़ार</pattern>
+					<pattern type="10000" count="one" draft="contributed">¤00 हज़ार</pattern>
+					<pattern type="10000" count="other" draft="contributed">¤00 हज़ार</pattern>
+					<pattern type="100000" count="one" draft="contributed">¤0 लाख</pattern>
+					<pattern type="100000" count="other" draft="contributed">¤0 लाख</pattern>
+					<pattern type="1000000" count="one" draft="contributed">¤00 लाख</pattern>
+					<pattern type="1000000" count="other" draft="contributed">¤00 लाख</pattern>
+					<pattern type="10000000" count="one" draft="contributed">¤0 क'.'</pattern>
+					<pattern type="10000000" count="other" draft="contributed">¤0 क'.'</pattern>
+					<pattern type="100000000" count="one" draft="contributed">¤00 क'.'</pattern>
+					<pattern type="100000000" count="other" draft="contributed">¤00 क'.'</pattern>
+					<pattern type="1000000000" count="one" draft="contributed">¤0 अ'.'</pattern>
+					<pattern type="1000000000" count="other" draft="contributed">¤0 अ'.'</pattern>
+					<pattern type="10000000000" count="one" draft="contributed">¤00 अ'.'</pattern>
+					<pattern type="10000000000" count="other" draft="contributed">¤00 अ'.'</pattern>
+					<pattern type="100000000000" count="one" draft="contributed">¤0 ख'.'</pattern>
+					<pattern type="100000000000" count="other" draft="contributed">¤0 ख'.'</pattern>
+					<pattern type="1000000000000" count="one" draft="contributed">¤00 ख'.'</pattern>
+					<pattern type="1000000000000" count="other" draft="contributed">¤00 ख'.'</pattern>
+					<pattern type="10000000000000" count="one" draft="contributed">¤0 नील</pattern>
+					<pattern type="10000000000000" count="other" draft="contributed">¤0 नील</pattern>
+					<pattern type="100000000000000" count="one" draft="contributed">¤00 नील</pattern>
+					<pattern type="100000000000000" count="other" draft="contributed">¤00 नील</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4842,6 +4949,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">अंगोला क्वांज़ा</displayName>
 				<displayName count="other">अंगोला क्वांज़ा</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="ARS">
 				<displayName>अर्जेंटीनी पेसो</displayName>
@@ -4874,6 +4982,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">बोस्निया हर्ज़ेगोविना परिवर्तनीय मार्क</displayName>
 				<displayName count="other">बोस्निया हर्ज़ेगोविना परिवर्तनीय मार्क</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>बार्बेडियन डॉलर</displayName>
@@ -4926,6 +5035,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">बोलिवियाई बोलिवियानो</displayName>
 				<displayName count="other">बोलिवियाई बोलिवियानो</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BRL">
 				<displayName>ब्राज़ीली रियाल</displayName>
@@ -4952,6 +5062,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">बोत्सवानियाई पुला</displayName>
 				<displayName count="other">बोत्सवानियाई पुला</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYR">
 				<displayName>बेलारूसी रूबल</displayName>
@@ -5022,6 +5133,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">क्यूबाई परिवर्तनीय पेसो</displayName>
 				<displayName count="other">क्यूबाई परिवर्तनीय पेसो</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>क्यूबाई पेसो</displayName>
@@ -5044,6 +5156,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">चेक गणराज्य कोरुना</displayName>
 				<displayName count="other">चेक गणराज्य कोरुना</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DEM">
 				<displayName draft="contributed">डच मार्क</displayName>
@@ -5059,6 +5172,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">डैनिश क्रोन</displayName>
 				<displayName count="other">डैनिश क्रोन</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>डोमिनिकन पेसो</displayName>
@@ -5081,6 +5195,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">मिस्र पाउंड</displayName>
 				<displayName count="other">मिस्र पाउंड</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>इरीट्रियन नाक्फ़ा</displayName>
@@ -5113,6 +5228,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">फ़ॉकलैंड द्वीपसमूह पाउंड</displayName>
 				<displayName count="other">फ़ॉकलैंड द्वीपसमूह पाउंड</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>फ़्रांसीसी फ़्रैंक</displayName>
@@ -5129,6 +5245,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">जॉर्जियन लारी</displayName>
 				<displayName count="other">जॉर्जियन लारी</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">ლ</symbol>
 			</currency>
 			<currency type="GHS">
 				<displayName>घानियन सेडी</displayName>
@@ -5154,12 +5271,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">गिनीयन फ़्रैंक</displayName>
 				<displayName count="other">गिनीयन फ़्रैंक</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GTQ">
 				<displayName>ग्वाटेमाला क्वेटज़ल</displayName>
 				<displayName count="one">ग्वाटेमाला क्वेटज़ल</displayName>
 				<displayName count="other">ग्वाटेमाला क्वेटज़ल</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GYD">
 				<displayName>गयानीज़ डॉलर</displayName>
@@ -5180,6 +5299,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">होंडुरन लेम्पिरा</displayName>
 				<displayName count="other">होंडुरन लेम्पिरा</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName draft="contributed">क्रोएशियन दिनार</displayName>
@@ -5189,6 +5309,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">क्रोएशियाई कुना</displayName>
 				<displayName count="other">क्रोएशियाई कुना</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>हैतियाई गर्ड</displayName>
@@ -5201,12 +5322,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">हंगेरियन फ़ोरिंट</displayName>
 				<displayName count="other">हंगेरियन फ़ोरिंट</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>इंडोनेशियाई रुपिया</displayName>
 				<displayName count="one">इंडोनेशियाई रुपिया</displayName>
 				<displayName count="other">इंडोनेशियाई रुपिये</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="ILS">
 				<displayName>इज़राइली न्यू शेकेल</displayName>
@@ -5239,6 +5362,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">आइसलैंडिक क्रोना</displayName>
 				<displayName count="other">आइसलैंडिक क्रोना</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>इतली का लीरा</displayName>
@@ -5287,12 +5411,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">कोमोरियन फ़्रैंक</displayName>
 				<displayName count="other">कोमोरियन फ़्रैंक</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>उत्तर कोरियाई वॉन</displayName>
 				<displayName count="one">उत्तर कोरियाई वॉन</displayName>
 				<displayName count="other">उत्तर कोरियाई वॉन</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>दक्षिण कोरियाई वॉन</displayName>
@@ -5333,12 +5459,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">लेबनानी पाउंड</displayName>
 				<displayName count="other">लेबनानी पाउंड</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>श्रीलंकाई रुपया</displayName>
 				<displayName count="one">श्रीलंकाई रुपया</displayName>
 				<displayName count="other">श्रीलंकाई रुपए</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>लाइबेरियाई डॉलर</displayName>
@@ -5388,6 +5516,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">मालागासी आरियरी</displayName>
 				<displayName count="other">मालागासी आरियरी</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MKD">
 				<displayName>मैसीडोनियन दिनार</displayName>
@@ -5400,6 +5529,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">म्यांमार क्याट</displayName>
 				<displayName count="other">म्यांमार क्याट</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>मंगोलियाई टगरिक</displayName>
@@ -5425,6 +5555,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">मॉरिशियन रुपया</displayName>
 				<displayName count="other">मॉरिशियन रुपया</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">₨</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>मालदीवी रुफ़िया</displayName>
@@ -5450,6 +5581,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">मलेशियाई रिंगित</displayName>
 				<displayName count="other">मलेशियाई रिंगित</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZN">
 				<displayName>मोज़ाम्बिकन मेटिकल</displayName>
@@ -5476,18 +5608,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">निकारागुअन कोरडोबा</displayName>
 				<displayName count="other">निकारागुअन कोरडोबा</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NOK">
 				<displayName>नॉर्वेजियन क्रोन</displayName>
 				<displayName count="one">नॉर्वेजियन क्रोन</displayName>
 				<displayName count="other">नॉर्वेजियन क्रोन</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>नेपाली रुपया</displayName>
 				<displayName count="one">नेपाली रुपया</displayName>
 				<displayName count="other">नेपाली रुपए</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>न्यूज़ीलैंड डॉलर</displayName>
@@ -5532,12 +5667,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">पाकिस्तानी रुपया</displayName>
 				<displayName count="other">पाकिस्तानी रुपए</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">₨</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>पोलिश ज़्लॉटी</displayName>
 				<displayName count="one">पोलिश ज़्लॉटी</displayName>
 				<displayName count="other">पोलिश ज़्लॉटी</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PYG">
 				<displayName>पैराग्वियन गुआरानी</displayName>
@@ -5572,12 +5709,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">रूसी रूबल</displayName>
 				<displayName count="other">रूसी रूबल</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RWF">
 				<displayName>रवांडाई फ़्रैंक</displayName>
 				<displayName count="one">रवांडाई फ़्रैंक</displayName>
 				<displayName count="other">रवांडाई फ़्रैंक</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>सउदी रियाल</displayName>
@@ -5615,6 +5754,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">स्वीडीश क्रोना</displayName>
 				<displayName count="other">स्वीडीश क्रोना</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>सिंगापुर डॉलर</displayName>
@@ -5628,6 +5768,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">सेंट हेलेना पाउंड</displayName>
 				<displayName count="other">सेंट हेलेना पाउंड</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName draft="contributed">स्लोवेनियाई तोलार</displayName>
@@ -5669,6 +5810,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">साओ तोम और प्रिंसिपे डोबरा</displayName>
 				<displayName count="other">साओ तोम और प्रिंसिपे डोबरा</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName draft="contributed">सोवियत रूबल</displayName>
@@ -5678,6 +5820,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">सीरियाई पाउंड</displayName>
 				<displayName count="other">सीरियाई पाउंड</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>स्वाज़ी लिलांजेनी</displayName>
@@ -5690,6 +5833,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">थाई बहत</displayName>
 				<displayName count="other">थाई बहत</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName draft="contributed">तजाखी रूबल</displayName>
@@ -5717,6 +5861,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">टोंगन पांगा</displayName>
 				<displayName count="other">टोंगन पांगा</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TRL">
 				<displayName draft="contributed">पुरानी तुर्की लीरा</displayName>
@@ -5727,6 +5872,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">तुर्की लीरा</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>त्रिनिदाद और टोबैगो डॉलर</displayName>
@@ -5795,6 +5941,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">वेनेज़ुएला बोलिवर</displayName>
 				<displayName count="other">वेनेज़ुएला बोलिवर</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>वियतनामी डोंग</displayName>
@@ -5826,9 +5973,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">पूर्वी कैरिबियाई डॉलर</displayName>
 				<displayName count="other">पूर्वी कैरिबियाई डॉलर</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XOF">
-				<displayName>[CFA] फ़्रैंक [BCEAO]</displayName>
+				<displayName>पश्चिमी अफ़्रीकी CFA फ्रैंक</displayName>
 				<displayName count="one">[CFA] फ़्रैंक [BCEAO]</displayName>
 				<displayName count="other">[CFA] फ़्रैंक [BCEAO]</displayName>
 				<symbol>CFA</symbol>
@@ -5855,6 +6003,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">दक्षिण अफ़्रीकी रैंड</displayName>
 				<displayName count="other">दक्षिण अफ़्रीकी रैंड</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName draft="contributed">ज़ाम्बियन क्वाचा (1968–2012)</displayName>
@@ -5864,6 +6013,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ज़ाम्बियन क्वाचा</displayName>
 				<displayName count="other">ज़ाम्बियन क्वाचा</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
@@ -5886,6 +6036,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} मीटर प्रति सेकंड वर्ग</unitPattern>
 				<unitPattern count="other">{0} मीटर प्रति सेकंड वर्ग</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName draft="contributed">घूर्णन</displayName>
+				<unitPattern count="one" draft="contributed">{0} घूर्णन</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} घूर्णन</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>रेडियन</displayName>
+				<unitPattern count="one">{0} रेडियन</unitPattern>
+				<unitPattern count="other">{0} रेडियन</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>अंश</displayName>
+				<unitPattern count="one">{0} अंश</unitPattern>
+				<unitPattern count="other">{0} अंश</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>आर्क मिनट</displayName>
 				<unitPattern count="one">{0} आर्क मिनट</unitPattern>
@@ -5896,30 +6061,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} आर्क सेकंड</unitPattern>
 				<unitPattern count="other">{0} आर्क सेकंड</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>अंश</displayName>
-				<unitPattern count="one">{0} अंश</unitPattern>
-				<unitPattern count="other">{0} अंश</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>रेडियन</displayName>
-				<unitPattern count="one">{0} रेडियन</unitPattern>
-				<unitPattern count="other">{0} रेडियन</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>एकड़</displayName>
-				<unitPattern count="one">{0} एकड़</unitPattern>
-				<unitPattern count="other">{0} एकड़</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>वर्ग किलोमीटर</displayName>
+				<unitPattern count="one">{0} वर्ग किलोमीटर</unitPattern>
+				<unitPattern count="other">{0} वर्ग किलोमीटर</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>हेक्टेयर</displayName>
 				<unitPattern count="one">{0} हेक्टेयर</unitPattern>
 				<unitPattern count="other">{0} हेक्टेयर</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>वर्ग मीटर</displayName>
+				<unitPattern count="one">{0} वर्ग मीटर</unitPattern>
+				<unitPattern count="other">{0} वर्ग मीटर</unitPattern>
+				<perUnitPattern draft="contributed">{0}/वर्ग मीटर</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>वर्ग सेंटीमीटर</displayName>
 				<unitPattern count="one">{0} वर्ग सेंटीमीटर</unitPattern>
 				<unitPattern count="other">{0} वर्ग सेंटीमीटर</unitPattern>
+				<perUnitPattern draft="contributed">{0}/वर्ग सेंटीमीटर</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>वर्ग मील</displayName>
+				<unitPattern count="one">{0} वर्ग मील</unitPattern>
+				<unitPattern count="other">{0} वर्ग मील</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>एकड़</displayName>
+				<unitPattern count="one">{0} एकड़</unitPattern>
+				<unitPattern count="other">{0} एकड़</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>वर्ग यार्ड</displayName>
+				<unitPattern count="one">{0} वर्ग यार्ड</unitPattern>
+				<unitPattern count="other">{0} वर्ग यार्ड</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>वर्गफ़ीट</displayName>
@@ -5930,91 +6107,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>वर्ग इंच</displayName>
 				<unitPattern count="one">{0} वर्ग इंच</unitPattern>
 				<unitPattern count="other">{0} वर्ग इंच</unitPattern>
+				<perUnitPattern draft="contributed">{0}/वर्ग इंच</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>वर्ग किलोमीटर</displayName>
-				<unitPattern count="one">{0} वर्ग किलोमीटर</unitPattern>
-				<unitPattern count="other">{0} वर्ग किलोमीटर</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>वर्ग मीटर</displayName>
-				<unitPattern count="one">{0} वर्ग मीटर</unitPattern>
-				<unitPattern count="other">{0} वर्ग मीटर</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>वर्ग मील</displayName>
-				<unitPattern count="one">{0} वर्ग मील</unitPattern>
-				<unitPattern count="other">{0} वर्ग मील</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>वर्ग यार्ड</displayName>
-				<unitPattern count="one">{0} वर्ग यार्ड</unitPattern>
-				<unitPattern count="other">{0} वर्ग यार्ड</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>कैरट</displayName>
+				<unitPattern count="one">{0} कैरट</unitPattern>
+				<unitPattern count="other">{0} कैरट</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>लीटर प्रति किलोमीटर</displayName>
 				<unitPattern count="one">{0} लीटर प्रति किलोमीटर</unitPattern>
 				<unitPattern count="other">{0} लीटर प्रति किलोमीटर</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName draft="contributed">लीटर प्रति 100 किलोमीटर</displayName>
+				<unitPattern count="one" draft="contributed">{0} लीटर प्रति 100 किलोमीटर</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} लीटर प्रति 100 किलोमीटर</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>मील प्रति गैलन</displayName>
 				<unitPattern count="one">{0} मील प्रति गैलन</unitPattern>
 				<unitPattern count="other">{0} मील प्रति गैलन</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>बिट</displayName>
-				<unitPattern count="one">{0} बिट</unitPattern>
-				<unitPattern count="other">{0} बिट</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>बाइट</displayName>
-				<unitPattern count="one">{0} बाइट</unitPattern>
-				<unitPattern count="other">{0} बाइट</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>गीगाबिट</displayName>
-				<unitPattern count="one">{0} गीगाबिट</unitPattern>
-				<unitPattern count="other">{0} गीगाबिट</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>गीगाबाइट</displayName>
-				<unitPattern count="one">{0} गीगाबाइट</unitPattern>
-				<unitPattern count="other">{0} गीगाबाइट</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>किलोबिट</displayName>
-				<unitPattern count="one">{0} किलोबिट</unitPattern>
-				<unitPattern count="other">{0} किलोबिट</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>किलोबाइट</displayName>
-				<unitPattern count="one">{0} किलोबाइट</unitPattern>
-				<unitPattern count="other">{0} किलोबाइट</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>मेगाबिट</displayName>
-				<unitPattern count="one">{0} मेगाबिट</unitPattern>
-				<unitPattern count="other">{0} मेगाबिट</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>मेगाबाइट</displayName>
-				<unitPattern count="one">{0} मेगाबाइट</unitPattern>
-				<unitPattern count="other">{0} मेगाबाइट</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>टेराबिट</displayName>
-				<unitPattern count="one">{0} टेराबिट</unitPattern>
-				<unitPattern count="other">{0} टेराबिट</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>टेराबाइट</displayName>
 				<unitPattern count="one">{0} टेराबाइट</unitPattern>
 				<unitPattern count="other">{0} टेराबाइट</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>टेराबिट</displayName>
+				<unitPattern count="one">{0} टेराबिट</unitPattern>
+				<unitPattern count="other">{0} टेराबिट</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>गीगाबाइट</displayName>
+				<unitPattern count="one">{0} गीगाबाइट</unitPattern>
+				<unitPattern count="other">{0} गीगाबाइट</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>गीगाबिट</displayName>
+				<unitPattern count="one">{0} गीगाबिट</unitPattern>
+				<unitPattern count="other">{0} गीगाबिट</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>मेगाबाइट</displayName>
+				<unitPattern count="one">{0} मेगाबाइट</unitPattern>
+				<unitPattern count="other">{0} मेगाबाइट</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>मेगाबिट</displayName>
+				<unitPattern count="one">{0} मेगाबिट</unitPattern>
+				<unitPattern count="other">{0} मेगाबिट</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>किलोबाइट</displayName>
+				<unitPattern count="one">{0} किलोबाइट</unitPattern>
+				<unitPattern count="other">{0} किलोबाइट</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>किलोबिट</displayName>
+				<unitPattern count="one">{0} किलोबिट</unitPattern>
+				<unitPattern count="other">{0} किलोबिट</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>बाइट</displayName>
+				<unitPattern count="one">{0} बाइट</unitPattern>
+				<unitPattern count="other">{0} बाइट</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>बिट</displayName>
+				<unitPattern count="one">{0} बिट</unitPattern>
+				<unitPattern count="other">{0} बिट</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="contributed">शताब्दियाँ</displayName>
+				<unitPattern count="one" draft="contributed">{0} शताब्दी</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} शताब्दियाँ</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>वर्ष</displayName>
+				<unitPattern count="one">{0} वर्ष</unitPattern>
+				<unitPattern count="other">{0} वर्ष</unitPattern>
+				<perUnitPattern draft="contributed">{0}/वर्ष</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>माह</displayName>
+				<unitPattern count="one">{0} माह</unitPattern>
+				<unitPattern count="other">{0} माह</unitPattern>
+				<perUnitPattern draft="contributed">{0}/माह</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>सप्ताह</displayName>
+				<unitPattern count="one">{0} सप्ताह</unitPattern>
+				<unitPattern count="other">{0} सप्ताह</unitPattern>
+				<perUnitPattern draft="contributed">{0}/सप्ताह</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>दिन</displayName>
 				<unitPattern count="one">{0} दिन</unitPattern>
 				<unitPattern count="other">{0} दिन</unitPattern>
+				<perUnitPattern draft="contributed">{0}/दिन</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>घंटे</displayName>
@@ -6022,30 +6214,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} घंटे</unitPattern>
 				<perUnitPattern>{0} प्रति घंटा</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>माइक्रोसेकंड</displayName>
-				<unitPattern count="one">{0} माइक्रोसेकंड</unitPattern>
-				<unitPattern count="other">{0} माइक्रोसेकंड</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>मिलीसेकंड</displayName>
-				<unitPattern count="one">{0} मिलीसेकंड</unitPattern>
-				<unitPattern count="other">{0} मिलीसेकंड</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>मिनट</displayName>
 				<unitPattern count="one">{0} मिनट</unitPattern>
 				<unitPattern count="other">{0} मिनट</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>माह</displayName>
-				<unitPattern count="one">{0} माह</unitPattern>
-				<unitPattern count="other">{0} माह</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>नैनो सेकंड</displayName>
-				<unitPattern count="one">{0} नैनो सेकंड</unitPattern>
-				<unitPattern count="other">{0} नैनो सेकंड</unitPattern>
+				<perUnitPattern draft="contributed">{0}/मिनट</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>सेकंड</displayName>
@@ -6053,15 +6226,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} सेकंड</unitPattern>
 				<perUnitPattern>{0} प्रति सेकंड</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>सप्ताह</displayName>
-				<unitPattern count="one">{0} सप्ताह</unitPattern>
-				<unitPattern count="other">{0} सप्ताह</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>मिलीसेकंड</displayName>
+				<unitPattern count="one">{0} मिलीसेकंड</unitPattern>
+				<unitPattern count="other">{0} मिलीसेकंड</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>वर्ष</displayName>
-				<unitPattern count="one">{0} वर्ष</unitPattern>
-				<unitPattern count="other">{0} वर्ष</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>माइक्रोसेकंड</displayName>
+				<unitPattern count="one">{0} माइक्रोसेकंड</unitPattern>
+				<unitPattern count="other">{0} माइक्रोसेकंड</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>नैनो सेकंड</displayName>
+				<unitPattern count="one">{0} नैनो सेकंड</unitPattern>
+				<unitPattern count="other">{0} नैनो सेकंड</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>एम्पीयर</displayName>
@@ -6083,6 +6261,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} वोल्ट</unitPattern>
 				<unitPattern count="other">{0} वोल्ट्स</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>किलो कैलोरी</displayName>
+				<unitPattern count="one">{0} किलो कैलोरी</unitPattern>
+				<unitPattern count="other">{0} किलो कैलोरी</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>कैलोरी</displayName>
 				<unitPattern count="one">{0} कैलोरी</unitPattern>
@@ -6093,21 +6276,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} कैलोरी</unitPattern>
 				<unitPattern count="other">{0} कैलोरी</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>जूल</displayName>
-				<unitPattern count="one">{0} जूल</unitPattern>
-				<unitPattern count="other">{0} जूल</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>किलो कैलोरी</displayName>
-				<unitPattern count="one">{0} किलो कैलोरी</unitPattern>
-				<unitPattern count="other">{0} किलो कैलोरी</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>किलो जूल</displayName>
 				<unitPattern count="one">{0} किलो जूल</unitPattern>
 				<unitPattern count="other">{0} किलो जूल</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>जूल</displayName>
+				<unitPattern count="one">{0} जूल</unitPattern>
+				<unitPattern count="other">{0} जूल</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>किलोवॉट घंटे</displayName>
 				<unitPattern count="one">{0} किलोवॉट घंटा</unitPattern>
@@ -6118,200 +6296,204 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} गीगाहर्ट्ज़</unitPattern>
 				<unitPattern count="other">{0} गीगाहर्ट्ज़</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>हर्ट्ज़</displayName>
-				<unitPattern count="one">{0} हर्ट्ज़</unitPattern>
-				<unitPattern count="other">{0} हर्ट्ज़</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>मेगाहर्ट्ज़</displayName>
+				<unitPattern count="one">{0} मेगाहर्ट्ज़</unitPattern>
+				<unitPattern count="other">{0} मेगाहर्ट्ज़</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>किलोहर्ट्ज़</displayName>
 				<unitPattern count="one">{0} किलोहर्ट्ज़</unitPattern>
 				<unitPattern count="other">{0} किलोहर्ट्ज़</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>मेगाहर्ट्ज़</displayName>
-				<unitPattern count="one">{0} मेगाहर्ट्ज़</unitPattern>
-				<unitPattern count="other">{0} मेगाहर्ट्ज़</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>हर्ट्ज़</displayName>
+				<unitPattern count="one">{0} हर्ट्ज़</unitPattern>
+				<unitPattern count="other">{0} हर्ट्ज़</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>खगोलीय इकाईयां</displayName>
-				<unitPattern count="one">{0} खगोलीय इकाई</unitPattern>
-				<unitPattern count="other">{0} खगोलीय इकाईयां</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>किलोमीटर</displayName>
+				<unitPattern count="one">{0} किलोमीटर</unitPattern>
+				<unitPattern count="other">{0} किलोमीटर</unitPattern>
+				<perUnitPattern draft="contributed">{0}/किलोमीटर</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>सेंटीमीटर</displayName>
-				<unitPattern count="one">{0} सेंटीमीटर</unitPattern>
-				<unitPattern count="other">{0} सेंटीमीटर</unitPattern>
+			<unit type="length-meter">
+				<displayName>मीटर</displayName>
+				<unitPattern count="one">{0} मीटर</unitPattern>
+				<unitPattern count="other">{0} मीटर</unitPattern>
+				<perUnitPattern draft="contributed">{0}/मीटर</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>डेसीमीटर</displayName>
 				<unitPattern count="one">{0} डेसीमीटर</unitPattern>
 				<unitPattern count="other">{0} डेसीमीटर</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>फ़ीट</displayName>
-				<unitPattern count="one">{0} फ़ुट</unitPattern>
-				<unitPattern count="other">{0} फ़ीट</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>इंच</displayName>
-				<unitPattern count="one">{0} इंच</unitPattern>
-				<unitPattern count="other">{0} इंच</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>किलोमीटर</displayName>
-				<unitPattern count="one">{0} किलोमीटर</unitPattern>
-				<unitPattern count="other">{0} किलोमीटर</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>प्रकाश वर्ष</displayName>
-				<unitPattern count="one">{0} प्रकाश वर्ष</unitPattern>
-				<unitPattern count="other">{0} प्रकाश वर्ष</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>मीटर</displayName>
-				<unitPattern count="one">{0} मीटर</unitPattern>
-				<unitPattern count="other">{0} मीटर</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>माइक्रोमीटर</displayName>
-				<unitPattern count="one">{0} माइक्रोमीटर</unitPattern>
-				<unitPattern count="other">{0} माइक्रोमीटर</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>मील</displayName>
-				<unitPattern count="one">{0} मील</unitPattern>
-				<unitPattern count="other">{0} मील</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>सेंटीमीटर</displayName>
+				<unitPattern count="one">{0} सेंटीमीटर</unitPattern>
+				<unitPattern count="other">{0} सेंटीमीटर</unitPattern>
+				<perUnitPattern draft="contributed">{0}/सेंटीमीटर</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>मिलीमीटर</displayName>
 				<unitPattern count="one">{0} मिलीमीटर</unitPattern>
 				<unitPattern count="other">{0} मिलीमीटर</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>माइक्रोमीटर</displayName>
+				<unitPattern count="one">{0} माइक्रोमीटर</unitPattern>
+				<unitPattern count="other">{0} माइक्रोमीटर</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>नैनोमीटर</displayName>
 				<unitPattern count="one">{0} नैनोमीटर</unitPattern>
 				<unitPattern count="other">{0} नैनोमीटर</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>नॉटिकल मील</displayName>
-				<unitPattern count="one">{0} नॉटिकल मील</unitPattern>
-				<unitPattern count="other">{0} नॉटिकल मील</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>पार्सेक</displayName>
-				<unitPattern count="one">{0} पार्सेक</unitPattern>
-				<unitPattern count="other">{0} पार्सेक</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>पिकोमीटर</displayName>
 				<unitPattern count="one">{0} पिकोमीटर</unitPattern>
 				<unitPattern count="other">{0} पिकोमीटर</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>मील</displayName>
+				<unitPattern count="one">{0} मील</unitPattern>
+				<unitPattern count="other">{0} मील</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>यार्ड</displayName>
 				<unitPattern count="one">{0} यार्ड</unitPattern>
 				<unitPattern count="other">{0} यार्ड</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>फ़ीट</displayName>
+				<unitPattern count="one">{0} फ़ुट</unitPattern>
+				<unitPattern count="other">{0} फ़ीट</unitPattern>
+				<perUnitPattern draft="contributed">{0}/फ़ीट</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>इंच</displayName>
+				<unitPattern count="one">{0} इंच</unitPattern>
+				<unitPattern count="other">{0} इंच</unitPattern>
+				<perUnitPattern draft="contributed">{0}/इंच</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>पार्सेक</displayName>
+				<unitPattern count="one">{0} पार्सेक</unitPattern>
+				<unitPattern count="other">{0} पार्सेक</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>प्रकाश वर्ष</displayName>
+				<unitPattern count="one">{0} प्रकाश वर्ष</unitPattern>
+				<unitPattern count="other">{0} प्रकाश वर्ष</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>खगोलीय इकाईयां</displayName>
+				<unitPattern count="one">{0} खगोलीय इकाई</unitPattern>
+				<unitPattern count="other">{0} खगोलीय इकाईयां</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>नॉटिकल मील</displayName>
+				<unitPattern count="one">{0} नॉटिकल मील</unitPattern>
+				<unitPattern count="other">{0} नॉटिकल मील</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="contributed">मील-स्कैण्डिनेवियन</displayName>
+				<unitPattern count="one" draft="contributed">{0} मील-स्कैण्डिनेवियन</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} मील-स्कैण्डिनेवियन</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>लक्स</displayName>
 				<unitPattern count="one">{0} लक्स</unitPattern>
 				<unitPattern count="other">{0} लक्स</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>कैरेट</displayName>
-				<unitPattern count="one">{0} कैरेट</unitPattern>
-				<unitPattern count="other">{0} कैरेट</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>ग्राम</displayName>
-				<unitPattern count="one">{0} ग्राम</unitPattern>
-				<unitPattern count="other">{0} ग्राम</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>किलोग्राम</displayName>
-				<unitPattern count="one">{0} किलोग्राम</unitPattern>
-				<unitPattern count="other">{0} किलोग्राम</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>मीट्रिक टन</displayName>
 				<unitPattern count="one">{0} मीट्रिक टन</unitPattern>
 				<unitPattern count="other">{0} मीट्रिक टन</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>माइक्रोग्राम</displayName>
-				<unitPattern count="one">{0} माइक्रोग्राम</unitPattern>
-				<unitPattern count="other">{0} माइक्रोग्राम</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>किलोग्राम</displayName>
+				<unitPattern count="one">{0} किलोग्राम</unitPattern>
+				<unitPattern count="other">{0} किलोग्राम</unitPattern>
+				<perUnitPattern>{0}/किलोग्राम</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>ग्राम</displayName>
+				<unitPattern count="one">{0} ग्राम</unitPattern>
+				<unitPattern count="other">{0} ग्राम</unitPattern>
+				<perUnitPattern>{0}/ग्राम</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>मिलीग्राम</displayName>
 				<unitPattern count="one">{0} मिलीग्राम</unitPattern>
 				<unitPattern count="other">{0} मिलीग्राम</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>औंस</displayName>
-				<unitPattern count="one">{0} औंस</unitPattern>
-				<unitPattern count="other">{0} औंस</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ट्राई औंस</displayName>
-				<unitPattern count="one">{0} ट्राई औंस</unitPattern>
-				<unitPattern count="other">{0} ट्राई औंस</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>पौंड</displayName>
-				<unitPattern count="one">{0} पौंड</unitPattern>
-				<unitPattern count="other">{0} पौंड</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>माइक्रोग्राम</displayName>
+				<unitPattern count="one">{0} माइक्रोग्राम</unitPattern>
+				<unitPattern count="other">{0} माइक्रोग्राम</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>टन</displayName>
 				<unitPattern count="one">{0} टन</unitPattern>
 				<unitPattern count="other">{0} टन</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>पौंड</displayName>
+				<unitPattern count="one">{0} पौंड</unitPattern>
+				<unitPattern count="other">{0} पौंड</unitPattern>
+				<perUnitPattern>{0}/पौंड</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>औंस</displayName>
+				<unitPattern count="one">{0} औंस</unitPattern>
+				<unitPattern count="other">{0} औंस</unitPattern>
+				<perUnitPattern>{0}/औंस</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ट्राई औंस</displayName>
+				<unitPattern count="one">{0} ट्राई औंस</unitPattern>
+				<unitPattern count="other">{0} ट्राई औंस</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>कैरेट</displayName>
+				<unitPattern count="one">{0} कैरेट</unitPattern>
+				<unitPattern count="other">{0} कैरेट</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>गिगावॉट</displayName>
 				<unitPattern count="one">{0} गिगावॉट</unitPattern>
 				<unitPattern count="other">{0} गिगावॉट</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>अश्वशक्ति</displayName>
-				<unitPattern count="one">{0} अश्वशक्ति</unitPattern>
-				<unitPattern count="other">{0} अश्वशक्ति</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>किलोवॉट</displayName>
-				<unitPattern count="one">{0} किलोवॉट</unitPattern>
-				<unitPattern count="other">{0} किलोवॉट</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>मेगावॉट</displayName>
 				<unitPattern count="one">{0} मेगावॉट</unitPattern>
 				<unitPattern count="other">{0} मेगावॉट</unitPattern>
 			</unit>
+			<unit type="power-kilowatt">
+				<displayName>किलोवॉट</displayName>
+				<unitPattern count="one">{0} किलोवॉट</unitPattern>
+				<unitPattern count="other">{0} किलोवॉट</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>वॉट</displayName>
+				<unitPattern count="one">{0} वॉट</unitPattern>
+				<unitPattern count="other">{0} वॉट</unitPattern>
+			</unit>
 			<unit type="power-milliwatt">
 				<displayName>मिलीवॉट</displayName>
 				<unitPattern count="one">{0} मिलीवॉट</unitPattern>
 				<unitPattern count="other">{0} मिलीवॉट</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName draft="contributed">वॉट</displayName>
-				<unitPattern count="one" draft="contributed">{0} वॉट</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} वॉट</unitPattern>
+			<unit type="power-horsepower">
+				<displayName>अश्वशक्ति</displayName>
+				<unitPattern count="one">{0} अश्वशक्ति</unitPattern>
+				<unitPattern count="other">{0} अश्वशक्ति</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
-				<displayName draft="contributed">हैक्टोपास्कल</displayName>
-				<unitPattern count="one" draft="contributed">{0} हैक्टोपास्कल</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} हैक्टोपास्कल</unitPattern>
-			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName draft="contributed">मर्करी इंच</displayName>
-				<unitPattern count="one" draft="contributed">{0} मर्करी इंच</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} मर्करी इंच</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName draft="contributed">मिलीबार</displayName>
-				<unitPattern count="one" draft="contributed">{0} मिलीबार</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} मिलीबार</unitPattern>
+				<displayName>हैक्टोपास्कल</displayName>
+				<unitPattern count="one">{0} हैक्टोपास्कल</unitPattern>
+				<unitPattern count="other">{0} हैक्टोपास्कल</unitPattern>
 			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>मर्क्यूरी मिलीमीटर</displayName>
@@ -6323,10 +6505,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} पाउंड प्रति वर्ग इंच</unitPattern>
 				<unitPattern count="other">{0} पाउंड प्रति वर्ग इंच</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>कैरट</displayName>
-				<unitPattern count="one">{0} कैरट</unitPattern>
-				<unitPattern count="other">{0} कैरट</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>मर्करी इंच</displayName>
+				<unitPattern count="one">{0} मर्करी इंच</unitPattern>
+				<unitPattern count="other">{0} मर्करी इंच</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>मिलीबार</displayName>
+				<unitPattern count="one">{0} मिलीबार</unitPattern>
+				<unitPattern count="other">{0} मिलीबार</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>किलोमीटर प्रति घंटा</displayName>
@@ -6343,10 +6530,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} मील प्रति घंटा</unitPattern>
 				<unitPattern count="other">{0} मील प्रति घंटा</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName draft="contributed">नॉट</displayName>
+				<unitPattern count="one" draft="contributed">{0} नॉट</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} नॉट</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
-				<displayName draft="contributed">डिग्री सेल्सियस</displayName>
-				<unitPattern count="one" draft="contributed">{0} डिग्री सेल्सियस</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} डिग्री सेल्सियस</unitPattern>
+				<displayName>डिग्री सेल्सियस</displayName>
+				<unitPattern count="one">{0} डिग्री सेल्सियस</unitPattern>
+				<unitPattern count="other">{0} डिग्री सेल्सियस</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
 				<displayName>डिग्री फ़ेरनहाइट</displayName>
@@ -6358,31 +6555,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} केल्विन</unitPattern>
 				<unitPattern count="other">{0} केल्विन</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>एकड़ फ़ीट</displayName>
-				<unitPattern count="one">{0} एकड़ फ़ूट</unitPattern>
-				<unitPattern count="other">{0} एकड़ फ़ीट</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>सेंटीलीटर</displayName>
-				<unitPattern count="one">{0} सेंटीलीटर</unitPattern>
-				<unitPattern count="other">{0} सेंटीलीटर</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>घन सेंटीमीटर</displayName>
-				<unitPattern count="one">{0} घन सेंटीमीटर</unitPattern>
-				<unitPattern count="other">{0} घन सेंटीमीटर</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>घन फ़ीट</displayName>
-				<unitPattern count="one">{0} घन फ़ीट</unitPattern>
-				<unitPattern count="other">{0} घन फ़ीट</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>घन इंच</displayName>
-				<unitPattern count="one">{0} घन इंच</unitPattern>
-				<unitPattern count="other">{0} घन इंच</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>घन किलोमीटर</displayName>
 				<unitPattern count="one">{0} घन किलोमीटर</unitPattern>
@@ -6392,6 +6564,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>घन मीटर</displayName>
 				<unitPattern count="one">{0} घन मीटर</unitPattern>
 				<unitPattern count="other">{0} घन मीटर</unitPattern>
+				<perUnitPattern draft="contributed">{0}/घन मीटर</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>घन सेंटीमीटर</displayName>
+				<unitPattern count="one">{0} घन सेंटीमीटर</unitPattern>
+				<unitPattern count="other">{0} घन सेंटीमीटर</unitPattern>
+				<perUnitPattern draft="contributed">{0}/घन सेंटीमीटर</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>घन मील</displayName>
@@ -6403,25 +6582,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} घन यार्ड</unitPattern>
 				<unitPattern count="other">{0} घन यार्ड</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>कप</displayName>
-				<unitPattern count="one">{0} कप</unitPattern>
-				<unitPattern count="other">{0} कप</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>घन फ़ीट</displayName>
+				<unitPattern count="one">{0} घन फ़ीट</unitPattern>
+				<unitPattern count="other">{0} घन फ़ीट</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>डेसीलीटर</displayName>
-				<unitPattern count="one">{0} डेसीलीटर</unitPattern>
-				<unitPattern count="other">{0} डेसीलीटर</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>घन इंच</displayName>
+				<unitPattern count="one">{0} घन इंच</unitPattern>
+				<unitPattern count="other">{0} घन इंच</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>फ़्लुड आउंस</displayName>
-				<unitPattern count="one">{0} फ़्लुड आउंस</unitPattern>
-				<unitPattern count="other">{0} फ़्लुड आउंस</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>गैलन</displayName>
-				<unitPattern count="one">{0} गैलन</unitPattern>
-				<unitPattern count="other">{0} गैलन</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>मेगालीटर</displayName>
+				<unitPattern count="one">{0} मेगालीटर</unitPattern>
+				<unitPattern count="other">{0} मेगालीटर</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>हैक्टोलीटर</displayName>
@@ -6432,27 +6606,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>लीटर</displayName>
 				<unitPattern count="one">{0} लीटर</unitPattern>
 				<unitPattern count="other">{0} लीटर</unitPattern>
+				<perUnitPattern>{0}/लीटर</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>मेगालीटर</displayName>
-				<unitPattern count="one">{0} मेगालीटर</unitPattern>
-				<unitPattern count="other">{0} मेगालीटर</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>डेसीलीटर</displayName>
+				<unitPattern count="one">{0} डेसीलीटर</unitPattern>
+				<unitPattern count="other">{0} डेसीलीटर</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>सेंटीलीटर</displayName>
+				<unitPattern count="one">{0} सेंटीलीटर</unitPattern>
+				<unitPattern count="other">{0} सेंटीलीटर</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>मिलीलीटर</displayName>
 				<unitPattern count="one">{0} मिलीलीटर</unitPattern>
 				<unitPattern count="other">{0} मिलीलीटर</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>पिंट</displayName>
-				<unitPattern count="one">{0} पिंट</unitPattern>
-				<unitPattern count="other">{0} पिंट</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName draft="contributed">मीट्रिक पिंट</displayName>
+				<unitPattern count="one" draft="contributed">{0} मीट्रिक पिंट</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} मीट्रिक पिंट</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName draft="contributed">मीट्रिक कप</displayName>
+				<unitPattern count="one" draft="contributed">{0} मीट्रिक कप</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} मीट्रिक कप</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>एकड़ फ़ीट</displayName>
+				<unitPattern count="one">{0} एकड़ फ़ूट</unitPattern>
+				<unitPattern count="other">{0} एकड़ फ़ीट</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>गैलन</displayName>
+				<unitPattern count="one">{0} गैलन</unitPattern>
+				<unitPattern count="other">{0} गैलन</unitPattern>
+				<perUnitPattern draft="contributed">{0}/गैलन</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>क्वार्ट</displayName>
 				<unitPattern count="one">{0} क्वार्ट</unitPattern>
 				<unitPattern count="other">{0} क्वार्ट</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>पिंट</displayName>
+				<unitPattern count="one">{0} पिंट</unitPattern>
+				<unitPattern count="other">{0} पिंट</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>कप</displayName>
+				<unitPattern count="one">{0} कप</unitPattern>
+				<unitPattern count="other">{0} कप</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>फ़्लूइड आउंस</displayName>
+				<unitPattern count="one">{0} फ़्लूइड आउंस</unitPattern>
+				<unitPattern count="other">{0} फ़्लूइड आउंस</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>टेबलस्पून</displayName>
 				<unitPattern count="one">{0} टेबलस्पून</unitPattern>
@@ -6463,6 +6674,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} टी स्पून</unitPattern>
 				<unitPattern count="other">{0} टी स्पून</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -6478,6 +6695,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} मीटर/से²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName draft="contributed">घूर्णन</displayName>
+				<unitPattern count="one" draft="contributed">{0} घूर्णन</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} घूर्णन</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>रेडियन</displayName>
+				<unitPattern count="one">{0} रेडियन</unitPattern>
+				<unitPattern count="other">{0} रेडियन</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>अंश</displayName>
+				<unitPattern count="one">{0} अंश</unitPattern>
+				<unitPattern count="other">{0} अंश</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>आर्क मिनट</displayName>
 				<unitPattern count="one">{0} आर्क मिनट</unitPattern>
@@ -6488,30 +6720,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} आर्क से.</unitPattern>
 				<unitPattern count="other">{0} आर्क से.</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>अंश</displayName>
-				<unitPattern count="one">{0} अंश</unitPattern>
-				<unitPattern count="other">{0} अंश</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>रेडियन</displayName>
-				<unitPattern count="one">{0} रेडियन</unitPattern>
-				<unitPattern count="other">{0} रेडियन</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>एकड़</displayName>
-				<unitPattern count="one">{0} एकड़</unitPattern>
-				<unitPattern count="other">{0} एकड़</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>वर्ग कि.मी.</displayName>
+				<unitPattern count="one">{0} वर्ग कि.मी.</unitPattern>
+				<unitPattern count="other">{0} वर्ग कि.मी.</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>हेक्टेयर</displayName>
 				<unitPattern count="one">{0} हे.</unitPattern>
 				<unitPattern count="other">{0} हे.</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>वर्ग मीटर</displayName>
+				<unitPattern count="one">{0} वर्ग मी.</unitPattern>
+				<unitPattern count="other">{0} वर्ग मी.</unitPattern>
+				<perUnitPattern draft="contributed">{0}/वर्ग मीटर</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>वर्ग सें.</displayName>
 				<unitPattern count="one">{0} व. सें.</unitPattern>
 				<unitPattern count="other">{0} व. सें.</unitPattern>
+				<perUnitPattern draft="contributed">{0}/वर्ग सें. मी.</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>वर्ग मील</displayName>
+				<unitPattern count="one">{0} वर्ग मील</unitPattern>
+				<unitPattern count="other">{0} वर्ग मील</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>एकड़</displayName>
+				<unitPattern count="one">{0} एकड़</unitPattern>
+				<unitPattern count="other">{0} एकड़</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>व. या.</displayName>
+				<unitPattern count="one">{0} व. या.</unitPattern>
+				<unitPattern count="other">{0} व. या.</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>व.फ़ी.</displayName>
@@ -6522,91 +6766,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>व. इं.</displayName>
 				<unitPattern count="one">{0} व. इं.</unitPattern>
 				<unitPattern count="other">{0} व. इं.</unitPattern>
+				<perUnitPattern draft="contributed">{0}/वर्ग इंच</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>वर्ग कि.मी.</displayName>
-				<unitPattern count="one">{0} वर्ग कि.मी.</unitPattern>
-				<unitPattern count="other">{0} वर्ग कि.मी.</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>वर्ग मीटर</displayName>
-				<unitPattern count="one">{0} वर्ग मी.</unitPattern>
-				<unitPattern count="other">{0} वर्ग मी.</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>वर्ग मील</displayName>
-				<unitPattern count="one">{0} वर्ग मील</unitPattern>
-				<unitPattern count="other">{0} वर्ग मील</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>व. या.</displayName>
-				<unitPattern count="one">{0} व. या.</unitPattern>
-				<unitPattern count="other">{0} व. या.</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>कैरट</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>लीटर/किमी</displayName>
 				<unitPattern count="one">{0} ली/किमी</unitPattern>
 				<unitPattern count="other">{0} ली/किमी</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName draft="contributed">ली./100 कि.मी.</displayName>
+				<unitPattern count="one" draft="contributed">{0} ली./100 कि.मी.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ली./100 कि.मी.</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>मील/गैलन</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>बिट</displayName>
-				<unitPattern count="one">{0} बिट</unitPattern>
-				<unitPattern count="other">{0} बिट</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>बाइट</displayName>
-				<unitPattern count="one">{0} बाइट</unitPattern>
-				<unitPattern count="other">{0} बाइट</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>बाइट</displayName>
+				<unitPattern count="one">{0} बाइट</unitPattern>
+				<unitPattern count="other">{0} बाइट</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>बिट</displayName>
+				<unitPattern count="one">{0} बिट</unitPattern>
+				<unitPattern count="other">{0} बिट</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="contributed">शता</displayName>
+				<unitPattern count="one" draft="contributed">{0} शता</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} शता</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>वर्ष</displayName>
+				<unitPattern count="one">{0} वर्ष</unitPattern>
+				<unitPattern count="other">{0} वर्ष</unitPattern>
+				<perUnitPattern draft="contributed">{0}/वर्ष</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>माह</displayName>
+				<unitPattern count="one">{0} माह</unitPattern>
+				<unitPattern count="other">{0} माह</unitPattern>
+				<perUnitPattern draft="contributed">{0}/माह</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>सप्ताह</displayName>
+				<unitPattern count="one">{0} सप्ताह</unitPattern>
+				<unitPattern count="other">{0} सप्ताह</unitPattern>
+				<perUnitPattern draft="contributed">{0}/सप्ताह</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>दिन</displayName>
 				<unitPattern count="one">{0} दिन</unitPattern>
 				<unitPattern count="other">{0} दिन</unitPattern>
+				<perUnitPattern draft="contributed">{0}/दिन</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>घंटे</displayName>
@@ -6614,30 +6873,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} घं.</unitPattern>
 				<perUnitPattern>{0} प्र. घं.</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>मा॰ सेक॰</displayName>
-				<unitPattern count="one">{0} मा॰ से॰</unitPattern>
-				<unitPattern count="other">{0} मा॰ से॰</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>मिलीसेकंड</displayName>
-				<unitPattern count="one">{0} मि.से.</unitPattern>
-				<unitPattern count="other">{0} मि.से.</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>मिनट</displayName>
 				<unitPattern count="one">{0} मि.</unitPattern>
 				<unitPattern count="other">{0} मि.</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>माह</displayName>
-				<unitPattern count="one">{0} माह</unitPattern>
-				<unitPattern count="other">{0} माह</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>नैनो से.</displayName>
-				<unitPattern count="one">{0} नैनो से.</unitPattern>
-				<unitPattern count="other">{0} नैनो से.</unitPattern>
+				<perUnitPattern draft="contributed">{0}/मिनट</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>सेकंड</displayName>
@@ -6645,15 +6885,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} सेक.</unitPattern>
 				<perUnitPattern>{0} प्र. से.</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>सप्ताह</displayName>
-				<unitPattern count="one">{0} सप्ताह</unitPattern>
-				<unitPattern count="other">{0} सप्ताह</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>मिलीसेकंड</displayName>
+				<unitPattern count="one">{0} मि.से.</unitPattern>
+				<unitPattern count="other">{0} मि.से.</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>वर्ष</displayName>
-				<unitPattern count="one">{0} वर्ष</unitPattern>
-				<unitPattern count="other">{0} वर्ष</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>मा॰ सेक॰</displayName>
+				<unitPattern count="one">{0} मा॰ से॰</unitPattern>
+				<unitPattern count="other">{0} मा॰ से॰</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>नैनो से.</displayName>
+				<unitPattern count="one">{0} नैनो से.</unitPattern>
+				<unitPattern count="other">{0} नैनो से.</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>एम्पी॰</displayName>
@@ -6671,10 +6916,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} Ω</unitPattern>
 			</unit>
 			<unit type="electric-volt">
-				<displayName>वोल्ट्स</displayName>
+				<displayName>वोल्ट</displayName>
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -6685,21 +6935,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Cal</unitPattern>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>जूल</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>किलो जूल</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>जूल</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -6710,216 +6955,225 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>खगो. इका.</displayName>
-				<unitPattern count="one">{0} खगो. इका.</unitPattern>
-				<unitPattern count="other">{0} खगो. इका.</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>कि.मी.</displayName>
+				<unitPattern count="one">{0} कि.मी.</unitPattern>
+				<unitPattern count="other">{0} कि.मी.</unitPattern>
+				<perUnitPattern draft="contributed">{0}/कि.मी.</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>सें.मी.</displayName>
-				<unitPattern count="one">{0} सें.मी.</unitPattern>
-				<unitPattern count="other">{0} सें.मी.</unitPattern>
+			<unit type="length-meter">
+				<displayName>मीटर</displayName>
+				<unitPattern count="one">{0} मी</unitPattern>
+				<unitPattern count="other">{0} मी</unitPattern>
+				<perUnitPattern draft="contributed">{0}/मी</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>डे.मी.</displayName>
 				<unitPattern count="one">{0} डे.मी.</unitPattern>
 				<unitPattern count="other">{0} डे.मी.</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>फ़ीट</displayName>
-				<unitPattern count="one">{0} फ़ीट</unitPattern>
-				<unitPattern count="other">{0} फ़ीट</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>इंच</displayName>
-				<unitPattern count="one">{0} इंच</unitPattern>
-				<unitPattern count="other">{0} इंच</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>कि.मी.</displayName>
-				<unitPattern count="one">{0} कि.मी.</unitPattern>
-				<unitPattern count="other">{0} कि.मी.</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>प्रकाश वर्ष</displayName>
-				<unitPattern count="one">{0} प्र.व.</unitPattern>
-				<unitPattern count="other">{0} प्र.व.</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>मीटर</displayName>
-				<unitPattern count="one">{0} मी</unitPattern>
-				<unitPattern count="other">{0} मी</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µ मा.मी.</displayName>
-				<unitPattern count="one">{0} µ मा.मी.</unitPattern>
-				<unitPattern count="other">{0} µ मा.मी.</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>मील</displayName>
-				<unitPattern count="one">{0} मील</unitPattern>
-				<unitPattern count="other">{0} मील</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>सें.मी.</displayName>
+				<unitPattern count="one">{0} सें.मी.</unitPattern>
+				<unitPattern count="other">{0} सें.मी.</unitPattern>
+				<perUnitPattern draft="contributed">{0}/सें.मी.</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>मि.मी.</displayName>
 				<unitPattern count="one">{0} मि.मी.</unitPattern>
 				<unitPattern count="other">{0} मि.मी.</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µ मा.मी.</displayName>
+				<unitPattern count="one">{0} µ मा.मी.</unitPattern>
+				<unitPattern count="other">{0} µ मा.मी.</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>नै.मी.</displayName>
 				<unitPattern count="one">{0} नै.मी.</unitPattern>
 				<unitPattern count="other">{0} नै.मी.</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>नॉ. मी.</displayName>
-				<unitPattern count="one">{0} नॉ. मी.</unitPattern>
-				<unitPattern count="other">{0} नॉ. मी.</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>पार्सेक</displayName>
-				<unitPattern count="one">{0} पार्सेक</unitPattern>
-				<unitPattern count="other">{0} पार्सेक</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>पि.मी.</displayName>
 				<unitPattern count="one">{0} पि.मी.</unitPattern>
 				<unitPattern count="other">{0} पि.मी.</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>मील</displayName>
+				<unitPattern count="one">{0} मील</unitPattern>
+				<unitPattern count="other">{0} मील</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>यार्ड</displayName>
 				<unitPattern count="one">{0} यार्ड</unitPattern>
 				<unitPattern count="other">{0} यार्ड</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>फ़ीट</displayName>
+				<unitPattern count="one">{0} फ़ीट</unitPattern>
+				<unitPattern count="other">{0} फ़ीट</unitPattern>
+				<perUnitPattern draft="contributed">{0}/फ़ीट</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>इंच</displayName>
+				<unitPattern count="one">{0} इंच</unitPattern>
+				<unitPattern count="other">{0} इंच</unitPattern>
+				<perUnitPattern draft="contributed">{0}/इंच</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>पार्सेक</displayName>
+				<unitPattern count="one">{0} पार्सेक</unitPattern>
+				<unitPattern count="other">{0} पार्सेक</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>प्रकाश वर्ष</displayName>
+				<unitPattern count="one">{0} प्र.व.</unitPattern>
+				<unitPattern count="other">{0} प्र.व.</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>खगो. इका.</displayName>
+				<unitPattern count="one">{0} खगो. इका.</unitPattern>
+				<unitPattern count="other">{0} खगो. इका.</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>नॉ. मी.</displayName>
+				<unitPattern count="one">{0} नॉ. मी.</unitPattern>
+				<unitPattern count="other">{0} नॉ. मी.</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="contributed">smi</displayName>
+				<unitPattern count="one" draft="contributed">{0} smi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>लक्स</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>कै॰</displayName>
-				<unitPattern count="one">{0} कै.</unitPattern>
-				<unitPattern count="other">{0} कै.</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>ग्राम</displayName>
-				<unitPattern count="one">{0} ग्रा.</unitPattern>
-				<unitPattern count="other">{0} ग्रा.</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>कि.ग्रा.</displayName>
-				<unitPattern count="one">{0} कि.ग्रा.</unitPattern>
-				<unitPattern count="other">{0} कि.ग्रा.</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>मीट्रिक टन</displayName>
 				<unitPattern count="one">{0} मीट्रिक टन</unitPattern>
 				<unitPattern count="other">{0} मीट्रिक टन</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>मा॰ग्रा॰</displayName>
-				<unitPattern count="one">{0} मा॰ग्रा॰</unitPattern>
-				<unitPattern count="other">{0} मा॰ग्रा॰</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>कि.ग्रा.</displayName>
+				<unitPattern count="one">{0} कि.ग्रा.</unitPattern>
+				<unitPattern count="other">{0} कि.ग्रा.</unitPattern>
+				<perUnitPattern>{0}/कि.ग्रा.</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>ग्राम</displayName>
+				<unitPattern count="one">{0} ग्रा.</unitPattern>
+				<unitPattern count="other">{0} ग्रा.</unitPattern>
+				<perUnitPattern>{0}/ग्रा.</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>मि.ग्रा.</displayName>
 				<unitPattern count="one">{0} मि.ग्रा.</unitPattern>
 				<unitPattern count="other">{0} मि.ग्रा.</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>औंस</displayName>
-				<unitPattern count="one">{0} औं.</unitPattern>
-				<unitPattern count="other">{0} औं.</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ट्राई औंस</displayName>
-				<unitPattern count="one">{0} ट्राई औंस</unitPattern>
-				<unitPattern count="other">{0} ट्राई औंस</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>पौंड</displayName>
-				<unitPattern count="one">{0} पौंड</unitPattern>
-				<unitPattern count="other">{0} पौंड</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>मा॰ग्रा॰</displayName>
+				<unitPattern count="one">{0} मा॰ग्रा॰</unitPattern>
+				<unitPattern count="other">{0} मा॰ग्रा॰</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>टन</displayName>
 				<unitPattern count="one">{0} टन</unitPattern>
 				<unitPattern count="other">{0} टन</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>पौंड</displayName>
+				<unitPattern count="one">{0} पौंड</unitPattern>
+				<unitPattern count="other">{0} पौंड</unitPattern>
+				<perUnitPattern>{0}/पौंड</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>औंस</displayName>
+				<unitPattern count="one">{0} औं.</unitPattern>
+				<unitPattern count="other">{0} औं.</unitPattern>
+				<perUnitPattern>{0}/औंस</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ट्राई औंस</displayName>
+				<unitPattern count="one">{0} ट्राई औंस</unitPattern>
+				<unitPattern count="other">{0} ट्राई औंस</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>कै॰</displayName>
+				<unitPattern count="one">{0} कै.</unitPattern>
+				<unitPattern count="other">{0} कै.</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hp</displayName>
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>वॉट</displayName>
+				<unitPattern count="one">{0} W</unitPattern>
+				<unitPattern count="other">{0} W</unitPattern>
+			</unit>
 			<unit type="power-milliwatt">
 				<displayName>mW</displayName>
 				<unitPattern count="one">{0} mW</unitPattern>
 				<unitPattern count="other">{0} mW</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName draft="contributed">वॉट</displayName>
-				<unitPattern count="one">{0} W</unitPattern>
-				<unitPattern count="other">{0} W</unitPattern>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
-				<displayName draft="contributed">hPa</displayName>
+				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>mm Hg</displayName>
+				<unitPattern count="one">{0} mm Hg</unitPattern>
+				<unitPattern count="other">{0} mm Hg</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>psi</displayName>
+				<unitPattern count="one">{0} psi</unitPattern>
+				<unitPattern count="other">{0} psi</unitPattern>
+			</unit>
 			<unit type="pressure-inch-hg">
-				<displayName draft="contributed">inHg</displayName>
+				<displayName>inHg</displayName>
 				<unitPattern count="one">{0} inHg</unitPattern>
 				<unitPattern count="other">{0} inHg</unitPattern>
 			</unit>
 			<unit type="pressure-millibar">
-				<displayName draft="contributed">mbar</displayName>
+				<displayName>mbar</displayName>
 				<unitPattern count="one">{0} mbar</unitPattern>
 				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<displayName draft="contributed">mm Hg</displayName>
-				<unitPattern count="one" draft="contributed">{0} mm Hg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mm Hg</unitPattern>
-			</unit>
-			<unit type="pressure-pound-per-square-inch">
-				<displayName draft="contributed">psi</displayName>
-				<unitPattern count="one" draft="contributed">{0} psi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} psi</unitPattern>
-			</unit>
-			<unit type="proportion-karat">
-				<displayName>कैरट</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
-			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>कि.मी./घं.</displayName>
 				<unitPattern count="one">{0} कि.मी. प्रति घं.</unitPattern>
@@ -6935,8 +7189,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} मी.प्र.घं.</unitPattern>
 				<unitPattern count="other">{0} मी.प्र.घं.</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName draft="contributed">नॉट</displayName>
+				<unitPattern count="one" draft="contributed">{0} नॉट</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} नॉट</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
-				<displayName draft="contributed">डिग्री सेल्सियस</displayName>
+				<displayName>डिग्री सेल्सियस</displayName>
 				<unitPattern count="one">{0}°से.</unitPattern>
 				<unitPattern count="other">{0}°से.</unitPattern>
 			</unit>
@@ -6950,31 +7214,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>एकड़ फ़ीट</displayName>
-				<unitPattern count="one">{0} ए.फ़ी.</unitPattern>
-				<unitPattern count="other">{0} ए.फ़ी.</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>सें.ली.</displayName>
-				<unitPattern count="one">{0} सें.ली.</unitPattern>
-				<unitPattern count="other">{0} सें.ली.</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>घन सें. मी.</displayName>
-				<unitPattern count="one">{0} घन सें. मी.</unitPattern>
-				<unitPattern count="other">{0} घन सें. मी.</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>घ. फ़ी.</displayName>
-				<unitPattern count="one">{0} घ. फ़ी.</unitPattern>
-				<unitPattern count="other">{0} घ. फ़ी.</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>घन इंच</displayName>
-				<unitPattern count="one">{0} घन इंच</unitPattern>
-				<unitPattern count="other">{0} घन इंच</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>घन कि.मी.</displayName>
 				<unitPattern count="one">{0} घन कि.मी.</unitPattern>
@@ -6984,6 +7223,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>घन मी.</displayName>
 				<unitPattern count="one">{0} घन मी.</unitPattern>
 				<unitPattern count="other">{0} घन मी.</unitPattern>
+				<perUnitPattern draft="contributed">{0}/घन मी.</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>घन सें. मी.</displayName>
+				<unitPattern count="one">{0} घन सें. मी.</unitPattern>
+				<unitPattern count="other">{0} घन सें. मी.</unitPattern>
+				<perUnitPattern draft="contributed">{0}/घन सें. मी.</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>घन मील</displayName>
@@ -6995,25 +7241,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} घन या.</unitPattern>
 				<unitPattern count="other">{0} घन या.</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>कप</displayName>
-				<unitPattern count="one">{0} कप</unitPattern>
-				<unitPattern count="other">{0} कप</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>घ. फ़ी.</displayName>
+				<unitPattern count="one">{0} घ. फ़ी.</unitPattern>
+				<unitPattern count="other">{0} घ. फ़ी.</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>डे.ली.</displayName>
-				<unitPattern count="one">{0} डे.ली.</unitPattern>
-				<unitPattern count="other">{0} डे.ली.</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>घन इंच</displayName>
+				<unitPattern count="one">{0} घन इंच</unitPattern>
+				<unitPattern count="other">{0} घन इंच</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>फ़्लुड आउंस</displayName>
-				<unitPattern count="one">{0} फ़्लुड आउंस</unitPattern>
-				<unitPattern count="other">{0} फ़्लुड आउंस</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>गैलन</displayName>
-				<unitPattern count="one">{0} गैलन</unitPattern>
-				<unitPattern count="other">{0} गैलन</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>मे. ली.</displayName>
+				<unitPattern count="one">{0} मे. ली.</unitPattern>
+				<unitPattern count="other">{0} मे. ली.</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>है.ली.</displayName>
@@ -7024,27 +7265,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>लीटर</displayName>
 				<unitPattern count="one">{0} ली.</unitPattern>
 				<unitPattern count="other">{0} ली.</unitPattern>
+				<perUnitPattern draft="contributed">{0}/ली.</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>मे. ली.</displayName>
-				<unitPattern count="one">{0} मे. ली.</unitPattern>
-				<unitPattern count="other">{0} मे. ली.</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>डे.ली.</displayName>
+				<unitPattern count="one">{0} डे.ली.</unitPattern>
+				<unitPattern count="other">{0} डे.ली.</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>सें.ली.</displayName>
+				<unitPattern count="one">{0} सें.ली.</unitPattern>
+				<unitPattern count="other">{0} सें.ली.</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>मि. ली.</displayName>
 				<unitPattern count="one">{0} मि. ली.</unitPattern>
 				<unitPattern count="other">{0} मि. ली.</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>पिंट</displayName>
-				<unitPattern count="one">{0} पिंट</unitPattern>
-				<unitPattern count="other">{0} पिंट</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName draft="contributed">मीट्रिक पिंट</displayName>
+				<unitPattern count="one" draft="contributed">{0} मीट्रिक पिंट</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} मीट्रिक पिंट</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName draft="contributed">मीट्रिक कप</displayName>
+				<unitPattern count="one" draft="contributed">{0} मीट्रिक कप</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} मीट्रिक कप</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>एकड़ फ़ीट</displayName>
+				<unitPattern count="one">{0} ए.फ़ी.</unitPattern>
+				<unitPattern count="other">{0} ए.फ़ी.</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>गैलन</displayName>
+				<unitPattern count="one">{0} गैलन</unitPattern>
+				<unitPattern count="other">{0} गैलन</unitPattern>
+				<perUnitPattern draft="contributed">{0}/गैलन</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>क्वार्ट</displayName>
 				<unitPattern count="one">{0} क्वार्ट</unitPattern>
 				<unitPattern count="other">{0} क्वार्ट</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>पिंट</displayName>
+				<unitPattern count="one">{0} पिंट</unitPattern>
+				<unitPattern count="other">{0} पिंट</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>कप</displayName>
+				<unitPattern count="one">{0} कप</unitPattern>
+				<unitPattern count="other">{0} कप</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>फ़्लूइड आउंस</displayName>
+				<unitPattern count="one">{0} फ़्लूइड आउंस</unitPattern>
+				<unitPattern count="other">{0} फ़्लूइड आउंस</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>टे. स्पून</displayName>
 				<unitPattern count="one">{0} टे. स्पून</unitPattern>
@@ -7055,6 +7333,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} टी स्पून</unitPattern>
 				<unitPattern count="other">{0} टी स्पून</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -7065,6 +7349,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}गु.</unitPattern>
 				<unitPattern count="other">{0}गु.</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -7073,26 +7361,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0}एकड़</unitPattern>
-				<unitPattern count="other">{0}एकड़</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0}हे.</unitPattern>
 				<unitPattern count="other">{0}हे.</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0}ft²</unitPattern>
-				<unitPattern count="other">{0}ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} वर्ग मी.</unitPattern>
 				<unitPattern count="other">{0} वर्ग मी.</unitPattern>
@@ -7101,6 +7377,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}वर्ग मील</unitPattern>
 				<unitPattern count="other">{0}वर्ग मील</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0}एकड़</unitPattern>
+				<unitPattern count="other">{0}एकड़</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0}ft²</unitPattern>
+				<unitPattern count="other">{0}ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName draft="contributed">ली./100 कि.मी.</displayName>
+				<unitPattern count="one" draft="contributed">{0}ली/100कि</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}ली/100कि</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>वर्ष</displayName>
+				<unitPattern count="one">{0}वर्ष</unitPattern>
+				<unitPattern count="other">{0}वर्ष</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>माह</displayName>
+				<unitPattern count="one">{0}माह</unitPattern>
+				<unitPattern count="other">{0}माह</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>सप्ताह</displayName>
+				<unitPattern count="one">{0} सप्ताह</unitPattern>
+				<unitPattern count="other">{0} सप्ताह</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>दिन</displayName>
 				<unitPattern count="one">{0}दिन</unitPattern>
@@ -7111,66 +7415,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}घं.</unitPattern>
 				<unitPattern count="other">{0}घं.</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>मि.से.</displayName>
-				<unitPattern count="one">{0} मि.से.</unitPattern>
-				<unitPattern count="other">{0} मि.से.</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>मिनट</displayName>
 				<unitPattern count="one">{0}मि.</unitPattern>
 				<unitPattern count="other">{0}मि.</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>माह</displayName>
-				<unitPattern count="one">{0}माह</unitPattern>
-				<unitPattern count="other">{0}माह</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>सेकंड</displayName>
 				<unitPattern count="one">{0}से.</unitPattern>
 				<unitPattern count="other">{0}से.</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>सप्ताह</displayName>
-				<unitPattern count="one">{0} सप्ताह</unitPattern>
-				<unitPattern count="other">{0} सप्ताह</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>वर्ष</displayName>
-				<unitPattern count="one">{0}वर्ष</unitPattern>
-				<unitPattern count="other">{0}वर्ष</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>सें.मी.</displayName>
-				<unitPattern count="one">{0} सें.मी.</unitPattern>
-				<unitPattern count="other">{0} सें.मी.</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0}′</unitPattern>
-				<unitPattern count="other">{0}′</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0}″</unitPattern>
-				<unitPattern count="other">{0}″</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>मि.से.</displayName>
+				<unitPattern count="one">{0} मि.से.</unitPattern>
+				<unitPattern count="other">{0} मि.से.</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>कि.मी.</displayName>
 				<unitPattern count="one">{0} कि.मी.</unitPattern>
 				<unitPattern count="other">{0} कि.मी.</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0}प्र.व.</unitPattern>
-				<unitPattern count="other">{0}प्र.व.</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>मीटर</displayName>
 				<unitPattern count="one">{0}मी</unitPattern>
 				<unitPattern count="other">{0}मी</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0}मील</unitPattern>
-				<unitPattern count="other">{0}मील</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>सें.मी.</displayName>
+				<unitPattern count="one">{0} सें.मी.</unitPattern>
+				<unitPattern count="other">{0} सें.मी.</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>मि.मी.</displayName>
@@ -7181,31 +7454,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}पि.मी.</unitPattern>
 				<unitPattern count="other">{0}पि.मी.</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0}मील</unitPattern>
+				<unitPattern count="other">{0}मील</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0}गज</unitPattern>
 				<unitPattern count="other">{0}गज</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>ग्राम</displayName>
-				<unitPattern count="one">{0} ग्रा.</unitPattern>
-				<unitPattern count="other">{0} ग्रा.</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="other">{0}′</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0}प्र.व.</unitPattern>
+				<unitPattern count="other">{0}प्र.व.</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>कि.ग्रा.</displayName>
 				<unitPattern count="one">{0} कि.ग्रा.</unitPattern>
 				<unitPattern count="other">{0} कि.ग्रा.</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0}औं.</unitPattern>
-				<unitPattern count="other">{0}औं.</unitPattern>
+			<unit type="mass-gram">
+				<displayName>ग्राम</displayName>
+				<unitPattern count="one">{0} ग्रा.</unitPattern>
+				<unitPattern count="other">{0} ग्रा.</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one" draft="contributed">{0}#</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}#</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0}एचपी</unitPattern>
-				<unitPattern count="other">{0}एचपी</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0}औं.</unitPattern>
+				<unitPattern count="other">{0}औं.</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0}कि.वॉ.</unitPattern>
@@ -7215,6 +7500,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}वॉ</unitPattern>
 				<unitPattern count="other">{0}वॉ</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0}एचपी</unitPattern>
+				<unitPattern count="other">{0}एचपी</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0}hPa</unitPattern>
 				<unitPattern count="other">{0}hPa</unitPattern>
@@ -7241,7 +7530,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0}mph</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
-				<displayName draft="contributed">°से.</displayName>
+				<displayName>°से.</displayName>
 				<unitPattern count="one">{0}°से.</unitPattern>
 				<unitPattern count="other">{0}°से.</unitPattern>
 			</unit>
@@ -7262,6 +7551,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}ली.</unitPattern>
 				<unitPattern count="other">{0}ली.</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hi_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hi_IN.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hi_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hi_IN.xml
index 21a20e001ca..1f17b3a986c 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hi_IN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hi_IN.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="hi"/>
 		<territory type="IN"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hr.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hr.xml
similarity index 93%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hr.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hr.xml
index 5ca41a0c785..b073f6ade7c 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hr.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hr.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="hr"/>
 	</identity>
 	<localeDisplayNames>
@@ -50,6 +49,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ay">aymara</language>
 			<language type="az">azerbajdžanski</language>
 			<language type="az" alt="short">azerski</language>
+			<language type="az_Arab" draft="contributed">južnoazerbajdžanski</language>
 			<language type="ba">baškirski</language>
 			<language type="bal">baluchi</language>
 			<language type="ban">balinezijski</language>
@@ -62,6 +62,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bez">bena</language>
 			<language type="bfd" draft="contributed">bafut</language>
 			<language type="bg">bugarski</language>
+			<language type="bgn" draft="contributed">zapadnobaludžijski</language>
 			<language type="bho">bhojpuri</language>
 			<language type="bi">bislama</language>
 			<language type="bik">bikol</language>
@@ -289,6 +290,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">laoski</language>
 			<language type="lol">mongo</language>
 			<language type="loz">lozi</language>
+			<language type="lrc" draft="contributed">sjevernolurski</language>
 			<language type="lt">litavski</language>
 			<language type="lu">luba-katanga</language>
 			<language type="lua">luba-lulua</language>
@@ -337,12 +339,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="my">burmanski</language>
 			<language type="mye" draft="contributed">myene</language>
 			<language type="myv">mordvinski</language>
+			<language type="mzn" draft="contributed">mazanderanski</language>
 			<language type="na">nauru</language>
 			<language type="nap">napolitanski</language>
 			<language type="naq">nama</language>
 			<language type="nb">književni norveški</language>
 			<language type="nd">sjeverni ndebele</language>
 			<language type="nds">donjonjemački</language>
+			<language type="nds_NL" draft="contributed">donjosaksonski</language>
 			<language type="ne">nepalski</language>
 			<language type="new">newari</language>
 			<language type="ng">ndonga</language>
@@ -420,6 +424,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">sicilijski</language>
 			<language type="sco">škotski</language>
 			<language type="sd">sindhi</language>
+			<language type="sdh" draft="contributed">južnokurdski</language>
 			<language type="se">južni sami</language>
 			<language type="see" draft="contributed">seneca</language>
 			<language type="seh">sena</language>
@@ -457,8 +462,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">sumerski</language>
 			<language type="sv">švedski</language>
 			<language type="sw">svahili</language>
+			<language type="sw_CD">kongoanski swahili</language>
 			<language type="swb">komorski</language>
-			<language type="swc">kongoanski swahili</language>
 			<language type="syc">klasični sirski</language>
 			<language type="syr">sirijski</language>
 			<language type="ta">tamilski</language>
@@ -513,6 +518,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">walamo</language>
 			<language type="war">waray</language>
 			<language type="was">washo</language>
+			<language type="wbp" draft="contributed">warlpiri</language>
 			<language type="wo">wolof</language>
 			<language type="xal">kalmyk</language>
 			<language type="xh">xhosa</language>
@@ -663,7 +669,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Sind" draft="contributed">khudawadi pismo</script>
 			<script type="Sinh">sinhaleško pismo</script>
 			<script type="Sora" draft="contributed">sora sompeng pismo</script>
-			<script type="Sund">sudansko pismo</script>
+			<script type="Sund">sundansko pismo</script>
 			<script type="Sylo">syloti nagri pismo</script>
 			<script type="Syrc">sirijsko pismo</script>
 			<script type="Syre">sirijsko estrangelo pismo</script>
@@ -738,7 +744,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angvila</territory>
 			<territory type="AL">Albanija</territory>
 			<territory type="AM">Armenija</territory>
-			<territory type="AN">Nizozemski Antili</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antarktika</territory>
 			<territory type="AR">Argentina</territory>
@@ -761,7 +766,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BM">Bermuda</territory>
 			<territory type="BN">Brunej</territory>
 			<territory type="BO">Bolivija</territory>
-			<territory type="BQ" draft="contributed">Karipski otoci Nizozemske</territory>
+			<territory type="BQ">Karipski otoci Nizozemske</territory>
 			<territory type="BR">Brazil</territory>
 			<territory type="BS">Bahami</territory>
 			<territory type="BT">Butan</territory>
@@ -957,7 +962,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="SS">Južni Sudan</territory>
 			<territory type="ST">Sveti Toma i Princip</territory>
 			<territory type="SV">Salvador</territory>
-			<territory type="SX" draft="contributed">Sint Maarten</territory>
+			<territory type="SX">Sint Maarten</territory>
 			<territory type="SY">Sirija</territory>
 			<territory type="SZ">Svazi</territory>
 			<territory type="TA">Tristan da Cunha</territory>
@@ -1054,6 +1059,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">Numeričko poredavanje</key>
 			<key type="colStrength" draft="contributed">Jačina poredavanja</key>
 			<key type="currency">valuta</key>
+			<key type="hc" draft="contributed">format vremena (12 ili 24)</key>
+			<key type="lb" draft="contributed">stil prijeloma retka</key>
+			<key type="ms" draft="contributed">sustav mjernih jedinica</key>
 			<key type="numbers">brojevi</key>
 			<key type="timezone" draft="contributed">Vremenska zona</key>
 			<key type="va" draft="contributed">Varijanta zemlje/jezika</key>
@@ -1061,96 +1069,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x" draft="contributed">Privatna upotreba</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">arapsko-indijske znamenke</type>
-			<type type="arabext" key="numbers">proširene arapsko-indijske znamenke</type>
-			<type type="armn" key="numbers">armenski brojevi</type>
-			<type type="armnlow" key="numbers">mali armenski brojevi</type>
-			<type type="beng" key="numbers">znamenke bengalskog pisma</type>
-			<type type="big5han" key="collation">razvrstavanje prema tradicionalnom kineskom - Big5</type>
-			<type type="buddhist" key="calendar">budistički kalendar</type>
-			<type type="chinese" key="calendar">kineski kalendar</type>
-			<type type="coptic" key="calendar">Koptski kalendar</type>
-			<type type="dangi" key="calendar">dangi kalendar</type>
-			<type type="deva" key="numbers">znamenke pisma devanagari</type>
-			<type type="dictionary" key="collation">rječničko razvrstavanje</type>
-			<type type="ducet" key="collation">Standardno Unicode razvrstavanje</type>
-			<type type="ethi" key="numbers">etiopski brojevi</type>
-			<type type="ethiopic" key="calendar">etiopski kalendar</type>
-			<type type="ethiopic-amete-alem" key="calendar">Etiopski kalendar &quot;Amete Alem&quot;</type>
-			<type type="finance" key="numbers" draft="contributed">Financijski brojevi</type>
-			<type type="fullwide" key="numbers">široke znamenke</type>
-			<type type="gb2312han" key="collation">razvrstavanje prema pojednostavljenom kineskom - GB2312</type>
-			<type type="geor" key="numbers">gruzijski brojevi</type>
-			<type type="gregorian" key="calendar">gregorijanski kalendar</type>
-			<type type="grek" key="numbers">grčki brojevi</type>
-			<type type="greklow" key="numbers">mali grčki brojevi</type>
-			<type type="gujr" key="numbers">gudžaratske znamenke</type>
-			<type type="guru" key="numbers">znamenke pisma gurmukhi</type>
-			<type type="hanidec" key="numbers">kineski decimalni brojevi</type>
-			<type type="hans" key="numbers">pojednostavljeni kineski brojevi</type>
-			<type type="hansfin" key="numbers">pojednostavljeni kineski financijski brojevi</type>
-			<type type="hant" key="numbers">tradicionalni kineski brojevi</type>
-			<type type="hantfin" key="numbers">tradicionalni kineski financijski brojevi</type>
-			<type type="hebr" key="numbers">hebrejski brojevi</type>
-			<type type="hebrew" key="calendar">hebrejski kalendar</type>
-			<type type="identical" key="colStrength" draft="contributed">Poredaj sve</type>
-			<type type="indian" key="calendar">indijski nacionalni kalendar</type>
-			<type type="islamic" key="calendar">islamski kalendar</type>
-			<type type="islamic-civil" key="calendar">islamski civilni kalendar</type>
-			<type type="iso8601" key="calendar">ISO-8601 kalendar</type>
-			<type type="japanese" key="calendar">japanski kalendar</type>
-			<type type="jpan" key="numbers">japanski brojevi</type>
-			<type type="jpanfin" key="numbers">japanski financijski brojevi</type>
-			<type type="khmr" key="numbers">khmerske znamenke</type>
-			<type type="knda" key="numbers">znamenke pisma kannada</type>
-			<type type="laoo" key="numbers">laoske znamenke</type>
-			<type type="latn" key="numbers">arapski brojevi</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">Prvo poredaj mala slova</type>
-			<type type="mlym" key="numbers">malajalamske znamenke</type>
-			<type type="mong" key="numbers">Mongolske znamenke</type>
-			<type type="mymr" key="numbers">mijanmarske znamenke</type>
-			<type type="native" key="numbers" draft="contributed">Izvorne znamenke</type>
-			<type type="no" key="colBackwards" draft="contributed">Poredaj naglaske normalno</type>
-			<type type="no" key="colCaseFirst" draft="contributed">Poredaj po normalnom poretku veličine slova</type>
-			<type type="no" key="colCaseLevel" draft="contributed">Poredaj zanemarujući veličinu</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">Poredaj pismo kana zasebno</type>
-			<type type="no" key="colNormalization" draft="contributed">Poredaj bez normalizacije</type>
-			<type type="no" key="colNumeric" draft="contributed">Poredaj znamenke pojedinačno</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">Poredaj simbole</type>
-			<type type="orya" key="numbers">orijske znamenke</type>
-			<type type="persian" key="calendar">perzijski kalendar</type>
-			<type type="phonebook" key="collation">razvrstavanje po abecedi</type>
-			<type type="phonetic" key="collation" draft="contributed">Fonetski poredak</type>
-			<type type="pinyin" key="collation">Pinyin razvrstavanje</type>
-			<type type="primary" key="colStrength" draft="contributed">Poredaj samo po osnovnim slovima</type>
-			<type type="quaternary" key="colStrength" draft="contributed">Poredaj po naglascima/veličini/širini/pismu kana</type>
-			<type type="reformed" key="collation">reformirano razvrstavanje</type>
-			<type type="roc" key="calendar">kalendar Republike Kine</type>
-			<type type="roman" key="numbers">rimski brojevi</type>
-			<type type="romanlow" key="numbers">mali rimski brojevi</type>
-			<type type="search" key="collation">Općenito pretraživanje</type>
-			<type type="searchjl" key="collation" draft="contributed">Pretraživanje po početnom suglasniku hangula</type>
-			<type type="secondary" key="colStrength" draft="contributed">Poredaj po naglasku</type>
-			<type type="shifted" key="colAlternate" draft="contributed">Poredaj zanemarujući simbole</type>
-			<type type="standard" key="collation">Standardno razvrstavanje</type>
-			<type type="stroke" key="collation">razvrstavanje po redoslijedu poteza za kineski</type>
-			<type type="taml" key="numbers">tamilski brojevi</type>
-			<type type="tamldec" key="numbers">tamilske znamenke</type>
-			<type type="telu" key="numbers">znamenke teluškog pisma</type>
-			<type type="tertiary" key="colStrength" draft="contributed">Poredaj po naglascima/veličini/širini</type>
-			<type type="thai" key="numbers">tajske znamenke</type>
-			<type type="tibt" key="numbers">tibetske znamenke</type>
-			<type type="traditional" key="collation">tradicionalno razvrstavanje</type>
-			<type type="traditional" key="numbers" draft="contributed">Tradicionalni brojevi</type>
-			<type type="unihan" key="collation">razvrstavanje prema korijenu i potezu</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">Poredaj prvo velika slova</type>
-			<type type="vaii" key="numbers" draft="contributed">Vai znamenke</type>
-			<type type="yes" key="colBackwards" draft="contributed">Poredaj naglaske obrnuto</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">Poredaj u skladu s veličinom slova</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">Poredaj pismo kana drugačije</type>
-			<type type="yes" key="colNormalization" draft="contributed">Poredaj unikod normalizirano</type>
-			<type type="yes" key="colNumeric" draft="contributed">Poredaj znamenke numerički</type>
-			<type type="zhuyin" key="collation" draft="contributed">zhuyin razvrstavanje</type>
+			<type key="calendar" type="buddhist">budistički kalendar</type>
+			<type key="calendar" type="chinese">kineski kalendar</type>
+			<type key="calendar" type="coptic">Koptski kalendar</type>
+			<type key="calendar" type="dangi">dangi kalendar</type>
+			<type key="calendar" type="ethiopic">etiopski kalendar</type>
+			<type key="calendar" type="ethiopic-amete-alem">Etiopski kalendar &quot;Amete Alem&quot;</type>
+			<type key="calendar" type="gregorian">gregorijanski kalendar</type>
+			<type key="calendar" type="hebrew">hebrejski kalendar</type>
+			<type key="calendar" type="indian">indijski nacionalni kalendar</type>
+			<type key="calendar" type="islamic">islamski kalendar</type>
+			<type key="calendar" type="islamic-civil">islamski civilni kalendar</type>
+			<type key="calendar" type="iso8601">ISO-8601 kalendar</type>
+			<type key="calendar" type="japanese">japanski kalendar</type>
+			<type key="calendar" type="persian">perzijski kalendar</type>
+			<type key="calendar" type="roc">kalendar Republike Kine</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">Poredaj simbole</type>
+			<type key="colAlternate" type="shifted" draft="contributed">Poredaj zanemarujući simbole</type>
+			<type key="colBackwards" type="no" draft="contributed">Poredaj naglaske normalno</type>
+			<type key="colBackwards" type="yes" draft="contributed">Poredaj naglaske obrnuto</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">Prvo poredaj mala slova</type>
+			<type key="colCaseFirst" type="no" draft="contributed">Poredaj po normalnom poretku veličine slova</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">Poredaj prvo velika slova</type>
+			<type key="colCaseLevel" type="no" draft="contributed">Poredaj zanemarujući veličinu</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">Poredaj u skladu s veličinom slova</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">Poredaj pismo kana zasebno</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">Poredaj pismo kana drugačije</type>
+			<type key="collation" type="big5han">razvrstavanje prema tradicionalnom kineskom - Big5</type>
+			<type key="collation" type="dictionary">rječničko razvrstavanje</type>
+			<type key="collation" type="ducet">Standardno Unicode razvrstavanje</type>
+			<type key="collation" type="gb2312han">razvrstavanje prema pojednostavljenom kineskom - GB2312</type>
+			<type key="collation" type="phonebook">razvrstavanje po abecedi</type>
+			<type key="collation" type="phonetic" draft="contributed">Fonetski poredak</type>
+			<type key="collation" type="pinyin">Pinyin razvrstavanje</type>
+			<type key="collation" type="reformed">reformirano razvrstavanje</type>
+			<type key="collation" type="search">Općenito pretraživanje</type>
+			<type key="collation" type="searchjl" draft="contributed">Pretraživanje po početnom suglasniku hangula</type>
+			<type key="collation" type="standard">standardno razvrstavanje</type>
+			<type key="collation" type="stroke">razvrstavanje po redoslijedu poteza za kineski</type>
+			<type key="collation" type="traditional">tradicionalno razvrstavanje</type>
+			<type key="collation" type="unihan">razvrstavanje prema korijenu i potezu</type>
+			<type key="collation" type="zhuyin" draft="contributed">zhuyin razvrstavanje</type>
+			<type key="colNormalization" type="no" draft="contributed">Poredaj bez normalizacije</type>
+			<type key="colNormalization" type="yes" draft="contributed">Poredaj unikod normalizirano</type>
+			<type key="colNumeric" type="no" draft="contributed">Poredaj znamenke pojedinačno</type>
+			<type key="colNumeric" type="yes" draft="contributed">Poredaj znamenke numerički</type>
+			<type key="colStrength" type="identical" draft="contributed">Poredaj sve</type>
+			<type key="colStrength" type="primary" draft="contributed">Poredaj samo po osnovnim slovima</type>
+			<type key="colStrength" type="quaternary" draft="contributed">Poredaj po naglascima/veličini/širini/pismu kana</type>
+			<type key="colStrength" type="secondary" draft="contributed">Poredaj po naglasku</type>
+			<type key="colStrength" type="tertiary" draft="contributed">Poredaj po naglascima/veličini/širini</type>
+			<type key="hc" type="h11" draft="contributed">12-satni format (0-11)</type>
+			<type key="hc" type="h12" draft="contributed">12-satni format (1-12)</type>
+			<type key="hc" type="h23" draft="contributed">24-satni format (0-23)</type>
+			<type key="hc" type="h24" draft="contributed">24-satni format (1-24)</type>
+			<type key="lb" type="loose" draft="contributed">slobodni stil prijeloma retka</type>
+			<type key="lb" type="normal" draft="contributed">normalni stil prijeloma retka</type>
+			<type key="lb" type="strict" draft="contributed">strogi stil prijeloma retka</type>
+			<type key="ms" type="metric" draft="contributed">metrički sustav</type>
+			<type key="ms" type="uksystem" draft="contributed">imperijalni sustav mjera</type>
+			<type key="ms" type="ussystem" draft="contributed">američki sustav mjera</type>
+			<type key="numbers" type="arab">arapsko-indijske znamenke</type>
+			<type key="numbers" type="arabext">proširene arapsko-indijske znamenke</type>
+			<type key="numbers" type="armn">armenski brojevi</type>
+			<type key="numbers" type="armnlow">mali armenski brojevi</type>
+			<type key="numbers" type="beng">znamenke bengalskog pisma</type>
+			<type key="numbers" type="deva">znamenke pisma devanagari</type>
+			<type key="numbers" type="ethi">etiopski brojevi</type>
+			<type key="numbers" type="finance" draft="contributed">Financijski brojevi</type>
+			<type key="numbers" type="fullwide">široke znamenke</type>
+			<type key="numbers" type="geor">gruzijski brojevi</type>
+			<type key="numbers" type="grek">grčki brojevi</type>
+			<type key="numbers" type="greklow">mali grčki brojevi</type>
+			<type key="numbers" type="gujr">gudžaratske znamenke</type>
+			<type key="numbers" type="guru">znamenke pisma gurmukhi</type>
+			<type key="numbers" type="hanidec">kineski decimalni brojevi</type>
+			<type key="numbers" type="hans">pojednostavljeni kineski brojevi</type>
+			<type key="numbers" type="hansfin">pojednostavljeni kineski financijski brojevi</type>
+			<type key="numbers" type="hant">tradicionalni kineski brojevi</type>
+			<type key="numbers" type="hantfin">tradicionalni kineski financijski brojevi</type>
+			<type key="numbers" type="hebr">hebrejski brojevi</type>
+			<type key="numbers" type="jpan">japanski brojevi</type>
+			<type key="numbers" type="jpanfin">japanski financijski brojevi</type>
+			<type key="numbers" type="khmr">khmerske znamenke</type>
+			<type key="numbers" type="knda">znamenke pisma kannada</type>
+			<type key="numbers" type="laoo">laoske znamenke</type>
+			<type key="numbers" type="latn">arapski brojevi</type>
+			<type key="numbers" type="mlym">malajalamske znamenke</type>
+			<type key="numbers" type="mong">Mongolske znamenke</type>
+			<type key="numbers" type="mymr">mijanmarske znamenke</type>
+			<type key="numbers" type="native" draft="contributed">Izvorne znamenke</type>
+			<type key="numbers" type="orya">orijske znamenke</type>
+			<type key="numbers" type="roman">rimski brojevi</type>
+			<type key="numbers" type="romanlow">mali rimski brojevi</type>
+			<type key="numbers" type="taml">tamilski brojevi</type>
+			<type key="numbers" type="tamldec">tamilske znamenke</type>
+			<type key="numbers" type="telu">znamenke teluškog pisma</type>
+			<type key="numbers" type="thai">tajske znamenke</type>
+			<type key="numbers" type="tibt">tibetske znamenke</type>
+			<type key="numbers" type="traditional" draft="contributed">Tradicionalni brojevi</type>
+			<type key="numbers" type="vaii" draft="contributed">Vai znamenke</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">BGN</transformName>
@@ -1389,7 +1407,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern>d. M. y. G</pattern>
+							<pattern>d. MMM y. G</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -1401,12 +1419,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
+							<pattern>{1} 'u' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
+							<pattern>{1} 'u' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
@@ -1421,6 +1439,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d.</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E, d.</dateFormatItem>
 						<dateFormatItem id="Gy">y. G</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLL y. G</dateFormatItem>
@@ -1502,7 +1521,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">E, dd.MM. – E, dd.MM.</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL–LLL</greatestDifference>
+							<greatestDifference id="M">LLL – LLL</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">d. – d. MMM</greatestDifference>
@@ -1530,7 +1549,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="y">E, dd.MM.y. – E, dd.MM.y. G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">LLL–LLL y. G</greatestDifference>
+							<greatestDifference id="M">LLL – LLL y. G</greatestDifference>
 							<greatestDifference id="y">LLL y. – LLL y. G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
@@ -1764,45 +1783,62 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="afternoon" draft="provisional">popodne</dayPeriod>
-							<dayPeriod type="earlyMorning" draft="provisional">ujutro</dayPeriod>
-							<dayPeriod type="evening" draft="provisional">navečer</dayPeriod>
-							<dayPeriod type="morning" draft="provisional">prijepodne</dayPeriod>
-							<dayPeriod type="night" draft="provisional">noću</dayPeriod>
+							<dayPeriod type="midnight" draft="contributed">ponoć</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
 							<dayPeriod type="noon" draft="contributed">podne</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1" draft="contributed">ujutro</dayPeriod>
+							<dayPeriod type="afternoon1" draft="contributed">popodne</dayPeriod>
+							<dayPeriod type="evening1" draft="contributed">navečer</dayPeriod>
+							<dayPeriod type="night1" draft="contributed">noću</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
-							<dayPeriod type="afternoon" draft="contributed">popodne</dayPeriod>
+							<dayPeriod type="midnight" draft="contributed">ponoć</dayPeriod>
 							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="earlyMorning" draft="contributed">ujutro</dayPeriod>
-							<dayPeriod type="evening" draft="contributed">navečer</dayPeriod>
-							<dayPeriod type="morning" draft="contributed">prijepodne</dayPeriod>
-							<dayPeriod type="night" draft="contributed">noću</dayPeriod>
-							<dayPeriod type="noon">P</dayPeriod>
+							<dayPeriod type="noon" draft="contributed">podne</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1" draft="contributed">ujutro</dayPeriod>
+							<dayPeriod type="afternoon1" draft="contributed">popodne</dayPeriod>
+							<dayPeriod type="evening1" draft="contributed">navečer</dayPeriod>
+							<dayPeriod type="night1" draft="contributed">noću</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight" draft="contributed">ponoć</dayPeriod>
 							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="noon">podne</dayPeriod>
+							<dayPeriod type="noon" draft="contributed">podne</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1" draft="contributed">ujutro</dayPeriod>
+							<dayPeriod type="afternoon1" draft="contributed">poslije podne</dayPeriod>
+							<dayPeriod type="evening1" draft="contributed">navečer</dayPeriod>
+							<dayPeriod type="night1" draft="contributed">noću</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="afternoon" draft="provisional">popodne</dayPeriod>
-							<dayPeriod type="earlyMorning" draft="provisional">ujutro</dayPeriod>
-							<dayPeriod type="evening" draft="provisional">navečer</dayPeriod>
-							<dayPeriod type="morning" draft="provisional">prijepodne</dayPeriod>
-							<dayPeriod type="night" draft="provisional">noću</dayPeriod>
-							<dayPeriod type="noon" draft="provisional">podne</dayPeriod>
+							<dayPeriod type="am" draft="contributed">AM</dayPeriod>
+							<dayPeriod type="pm" draft="contributed">PM</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am" draft="contributed">AM</dayPeriod>
+							<dayPeriod type="pm" draft="contributed">PM</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">ponoć</dayPeriod>
+							<dayPeriod type="am" draft="contributed">AM</dayPeriod>
+							<dayPeriod type="noon">podne</dayPeriod>
+							<dayPeriod type="pm" draft="contributed">PM</dayPeriod>
+							<dayPeriod type="morning1">jutro</dayPeriod>
+							<dayPeriod type="afternoon1">popodne</dayPeriod>
+							<dayPeriod type="evening1">večer</dayPeriod>
+							<dayPeriod type="night1">noć</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
-						<era type="0">Prije Krista</era>
+						<era type="0">prije Krista</era>
 						<era type="0" alt="variant">pr. n. e.</era>
-						<era type="1">Poslije Krista</era>
+						<era type="1">poslije Krista</era>
 						<era type="1" alt="variant">n.e.</era>
 					</eraNames>
 					<eraAbbr>
@@ -1899,6 +1935,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">hh:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv" draft="contributed">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv" draft="contributed">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv" draft="contributed">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv" draft="contributed">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L.</dateFormatItem>
 						<dateFormatItem id="Md">dd.MM.</dateFormatItem>
 						<dateFormatItem id="MEd">E, dd.MM.</dateFormatItem>
@@ -1925,7 +1965,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<appendItem request="Timezone">{0} {1}</appendItem>
 					</appendItems>
 					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
 						<intervalFormatItem id="d">
 							<greatestDifference id="d">dd. – dd.</greatestDifference>
 						</intervalFormatItem>
@@ -1934,7 +1974,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="h">h – h'h' a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
-							<greatestDifference id="H">HH–HH'h'</greatestDifference>
+							<greatestDifference id="H">HH – HH 'h'</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
@@ -2698,10 +2738,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</calendars>
 		<fields>
 			<field type="era">
-				<displayName>Era</displayName>
+				<displayName>era</displayName>
 			</field>
 			<field type="year">
-				<displayName>Godina</displayName>
+				<displayName>godina</displayName>
 				<relative type="-1">prošle godine</relative>
 				<relative type="0">ove godine</relative>
 				<relative type="1">sljedeće godine</relative>
@@ -2718,6 +2758,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>g.</displayName>
+				<relative type="-1">prošle god.</relative>
+				<relative type="0">ove god.</relative>
+				<relative type="1">sljedeće god.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">za {0} g.</relativeTimePattern>
 					<relativeTimePattern count="few">za {0} g.</relativeTimePattern>
@@ -2731,6 +2774,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>g.</displayName>
+				<relative type="-1">prošle g.</relative>
+				<relative type="0">ove g.</relative>
+				<relative type="1">sljedeće g.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} g.</relativeTimePattern>
 					<relativeTimePattern count="few">+{0} g.</relativeTimePattern>
@@ -2743,7 +2789,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="quarter">
-				<displayName>Kvartal</displayName>
+				<displayName>kvartal</displayName>
+				<relative type="-1">prošli kvartal</relative>
+				<relative type="0">ovaj kvartal</relative>
+				<relative type="1">sljedeći kvartal</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">za {0} kvartal</relativeTimePattern>
 					<relativeTimePattern count="few">za {0} kvartala</relativeTimePattern>
@@ -2757,6 +2806,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>kv.</displayName>
+				<relative type="-1">prošli kv.</relative>
+				<relative type="0">ovaj kv.</relative>
+				<relative type="1">sljedeći kv.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">za {0} kv.</relativeTimePattern>
 					<relativeTimePattern count="few">za {0} kv.</relativeTimePattern>
@@ -2770,6 +2822,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>kv.</displayName>
+				<relative type="-1">prošli kv.</relative>
+				<relative type="0">ovaj kv.</relative>
+				<relative type="1">sljedeći kv.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} kv.</relativeTimePattern>
 					<relativeTimePattern count="few">+{0} kv.</relativeTimePattern>
@@ -2782,7 +2837,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="month">
-				<displayName>Mjesec</displayName>
+				<displayName>mjesec</displayName>
 				<relative type="-1">prošli mjesec</relative>
 				<relative type="0">ovaj mjesec</relative>
 				<relative type="1">sljedeći mjesec</relative>
@@ -2799,6 +2854,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>mj.</displayName>
+				<relative type="-1">prošli mj.</relative>
+				<relative type="0">ovaj mj.</relative>
+				<relative type="1">sljedeći mj.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">za {0} mj.</relativeTimePattern>
 					<relativeTimePattern count="few">za {0} mj.</relativeTimePattern>
@@ -2812,6 +2870,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>m.</displayName>
+				<relative type="-1">prošli mj.</relative>
+				<relative type="0">ovaj mj.</relative>
+				<relative type="1">sljedeći mj.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} mj.</relativeTimePattern>
 					<relativeTimePattern count="few">+{0} mj.</relativeTimePattern>
@@ -2824,7 +2885,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="week">
-				<displayName>Tjedan</displayName>
+				<displayName>tjedan</displayName>
 				<relative type="-1">prošli tjedan</relative>
 				<relative type="0">ovaj tjedan</relative>
 				<relative type="1">sljedeći tjedan</relative>
@@ -2841,6 +2902,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>tj.</displayName>
+				<relative type="-1">prošli tj.</relative>
+				<relative type="0">ovaj tj.</relative>
+				<relative type="1">sljedeći tj.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">za {0} tj.</relativeTimePattern>
 					<relativeTimePattern count="few">za {0} tj.</relativeTimePattern>
@@ -2854,6 +2918,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>tj.</displayName>
+				<relative type="-1">prošli tj.</relative>
+				<relative type="0">ovaj tj.</relative>
+				<relative type="1">sljedeći tj.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} tj.</relativeTimePattern>
 					<relativeTimePattern count="few">+{0} tj.</relativeTimePattern>
@@ -2866,7 +2933,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day">
-				<displayName>Dan</displayName>
+				<displayName>dan</displayName>
 				<relative type="-2">prekjučer</relative>
 				<relative type="-1">jučer</relative>
 				<relative type="0">danas</relative>
@@ -2885,6 +2952,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>d.</displayName>
+				<relative type="-2">prekjučer</relative>
+				<relative type="-1">jučer</relative>
+				<relative type="0">danas</relative>
+				<relative type="1">sutra</relative>
+				<relative type="2">prekosutra</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">za {0} dan</relativeTimePattern>
 					<relativeTimePattern count="few">za {0} dana</relativeTimePattern>
@@ -2898,6 +2970,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>d.</displayName>
+				<relative type="-2">prekjučer</relative>
+				<relative type="-1">jučer</relative>
+				<relative type="0">danas</relative>
+				<relative type="1">sutra</relative>
+				<relative type="2">prekosutra</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">za {0} d</relativeTimePattern>
 					<relativeTimePattern count="few">za {0} d</relativeTimePattern>
@@ -2910,7 +2987,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="weekday">
-				<displayName>Dan u tjednu</displayName>
+				<displayName>dan u tjednu</displayName>
 			</field>
 			<field type="sun">
 				<relative type="-1">prošla nedjelja</relative>
@@ -3021,7 +3098,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>AM/PM</displayName>
 			</field>
 			<field type="hour">
-				<displayName>Sat</displayName>
+				<displayName>sat</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">za {0} sat</relativeTimePattern>
 					<relativeTimePattern count="few">za {0} sata</relativeTimePattern>
@@ -3060,7 +3137,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="minute">
-				<displayName>Minuta</displayName>
+				<displayName>minuta</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">za {0} minutu</relativeTimePattern>
 					<relativeTimePattern count="few">za {0} minute</relativeTimePattern>
@@ -3099,7 +3176,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="second">
-				<displayName>Sekunda</displayName>
+				<displayName>sekunda</displayName>
 				<relative type="0">sada</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">za {0} sekundu</relativeTimePattern>
@@ -3139,7 +3216,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>Vremenska zona</displayName>
+				<displayName>vremenska zona</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
@@ -4017,6 +4094,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity draft="contributed">Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
 			</zone>
@@ -4101,6 +4181,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity draft="contributed">Chita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Jakutsk</exemplarCity>
 			</zone>
@@ -4119,6 +4202,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity draft="contributed">Srednekolimsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamčatka</exemplarCity>
 			</zone>
@@ -5505,6 +5591,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="contributed">0000¤</pattern>
+					<pattern type="1000" count="few" draft="contributed">0000¤</pattern>
+					<pattern type="1000" count="other" draft="contributed">0000¤</pattern>
+					<pattern type="10000" count="one" draft="contributed">00 tis'.' ¤</pattern>
+					<pattern type="10000" count="few" draft="contributed">00 tis'.' ¤</pattern>
+					<pattern type="10000" count="other" draft="contributed">00 tis'.' ¤</pattern>
+					<pattern type="100000" count="one" draft="contributed">000 tis'.' ¤</pattern>
+					<pattern type="100000" count="few" draft="contributed">000 tis'.' ¤</pattern>
+					<pattern type="100000" count="other" draft="contributed">000 tis'.' ¤</pattern>
+					<pattern type="1000000" count="one" draft="contributed">0 mil'.' ¤</pattern>
+					<pattern type="1000000" count="few" draft="contributed">0 mil'.' ¤</pattern>
+					<pattern type="1000000" count="other" draft="contributed">0 mil'.' ¤</pattern>
+					<pattern type="10000000" count="one" draft="contributed">00 mil'.' ¤</pattern>
+					<pattern type="10000000" count="few" draft="contributed">00 mil'.' ¤</pattern>
+					<pattern type="10000000" count="other" draft="contributed">00 mil'.' ¤</pattern>
+					<pattern type="100000000" count="one" draft="contributed">000 mil'.' ¤</pattern>
+					<pattern type="100000000" count="few" draft="contributed">000 mil'.' ¤</pattern>
+					<pattern type="100000000" count="other" draft="contributed">000 mil'.' ¤</pattern>
+					<pattern type="1000000000" count="one" draft="contributed">0 mlr'.' ¤</pattern>
+					<pattern type="1000000000" count="few" draft="contributed">0 mlr'.' ¤</pattern>
+					<pattern type="1000000000" count="other" draft="contributed">0 mlr'.' ¤</pattern>
+					<pattern type="10000000000" count="one" draft="contributed">00 mlr'.' ¤</pattern>
+					<pattern type="10000000000" count="few" draft="contributed">00 mlr'.' ¤</pattern>
+					<pattern type="10000000000" count="other" draft="contributed">00 mlr'.' ¤</pattern>
+					<pattern type="100000000000" count="one" draft="contributed">000 mlr'.' ¤</pattern>
+					<pattern type="100000000000" count="few" draft="contributed">000 mlr'.' ¤</pattern>
+					<pattern type="100000000000" count="other" draft="contributed">000 mlr'.' ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="contributed">0 bil'.' ¤</pattern>
+					<pattern type="1000000000000" count="few" draft="contributed">0 bil'.' ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="contributed">0 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="contributed">00 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="few" draft="contributed">00 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="contributed">00 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="contributed">000 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="few" draft="contributed">000 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="contributed">000 bil'.' ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="few">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
@@ -5572,6 +5698,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">angolske kvanze</displayName>
 				<displayName count="other">angolskih kvanzi</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>angolska kvanza (1977.–1990.)</displayName>
@@ -5679,6 +5806,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">konvertibilne marke</displayName>
 				<displayName count="other">konvertibilnih maraka</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BAN">
 				<displayName draft="contributed">bosansko-hercegovački novi dinar</displayName>
@@ -5788,6 +5916,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">bolivijska bolivijana</displayName>
 				<displayName count="other">bolivijskih bolivijana</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOL">
 				<displayName draft="contributed">stari bolivijski bolivijano</displayName>
@@ -5888,6 +6017,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">bocvanske pule</displayName>
 				<displayName count="other">bocvanskih pula</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>bjeloruska nova rublja (1994–1999)</displayName>
@@ -6028,6 +6158,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">kubanska konvertibilna peza</displayName>
 				<displayName count="other">kubanskih konvertibilnih peza</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>kubanski pezo</displayName>
@@ -6057,6 +6188,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">češke krune</displayName>
 				<displayName count="other">čeških kruna</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>istočnonjemačka marka</displayName>
@@ -6085,6 +6217,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">danske krune</displayName>
 				<displayName count="other">danskih kruna</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>dominikanski pezo</displayName>
@@ -6128,6 +6261,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">egipatske funte</displayName>
 				<displayName count="other">egipatskih funti</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>eritrejska nakfa</displayName>
@@ -6194,6 +6328,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">falklandske funte</displayName>
 				<displayName count="other">falklandskih funti</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>francuski franak</displayName>
@@ -6223,6 +6358,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">gruzijska lara</displayName>
 				<displayName count="other">gruzijskih lara</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>ganski cedi (1979.–2007.)</displayName>
@@ -6259,6 +6395,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">gvinejska franka</displayName>
 				<displayName count="other">gvinejskih franaka</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>gvinejski syli</displayName>
@@ -6287,6 +6424,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">gvatemalska kvecala</displayName>
 				<displayName count="other">gvatemalskih kvecala</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>portugalski gvinejski eskudo</displayName>
@@ -6324,6 +6462,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">honduraške lempire</displayName>
 				<displayName count="other">honduraških lempira</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>hrvatski dinar</displayName>
@@ -6338,6 +6477,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">hrvatske kune</displayName>
 				<displayName count="other">hrvatskih kuna</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>haićanski gourd</displayName>
@@ -6352,6 +6492,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">mađarske forinte</displayName>
 				<displayName count="other">mađarskih forinti</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>indonezijska rupija</displayName>
@@ -6359,6 +6500,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">indonezijske rupije</displayName>
 				<displayName count="other">indonezijskih rupija</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>irska funta</displayName>
@@ -6424,6 +6566,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">islandske krune</displayName>
 				<displayName count="other">islandskih kruna</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>talijanska lira</displayName>
@@ -6483,6 +6626,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">komorska franka</displayName>
 				<displayName count="other">komorskih franaka</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>sjevernokorejski won</displayName>
@@ -6490,6 +6634,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">sjevernokorejska wona</displayName>
 				<displayName count="other">sjevernokorejskih wona</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRH">
 				<displayName draft="contributed">južnokorejski hvan</displayName>
@@ -6550,6 +6695,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">libanonske funte</displayName>
 				<displayName count="other">libanonskih funti</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>šrilankanska rupija</displayName>
@@ -6557,6 +6703,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">šrilankanske rupije</displayName>
 				<displayName count="other">šrilankanskih rupija</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>liberijski dolar</displayName>
@@ -6670,6 +6817,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">madagaskarska ariarija</displayName>
 				<displayName count="other">madagaskarskih ariarija</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>madagaskarski franak</displayName>
@@ -6705,6 +6853,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">mjanmarska kjata</displayName>
 				<displayName count="other">mjanmarskih kjata</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>mongolski tugrik</displayName>
@@ -6748,6 +6897,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">mauricijske rupije</displayName>
 				<displayName count="other">mauricijskih rupija</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVP">
 				<displayName draft="contributed">maldivijska rupija</displayName>
@@ -6798,6 +6948,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">malezijska ringita</displayName>
 				<displayName count="other">malezijskih ringita</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>mozambijski eskudo</displayName>
@@ -6849,6 +7000,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">nikaragvanske zlatne kordobe</displayName>
 				<displayName count="other">nikaragvanskih zlatnih kordoba</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>nizozemski gulden</displayName>
@@ -6863,6 +7015,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">norveške krune</displayName>
 				<displayName count="other">norveških kruna</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>nepalska rupija</displayName>
@@ -6870,6 +7023,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">nepalske rupije</displayName>
 				<displayName count="other">nepalskih rupija</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>novozelandski dolar</displayName>
@@ -6935,6 +7089,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">pakistanske rupije</displayName>
 				<displayName count="other">pakistanskih rupija</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>poljska zlota</displayName>
@@ -6942,6 +7097,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">poljske zlote</displayName>
 				<displayName count="other">poljskih zlota</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>poljska zlota (1950.–1995.)</displayName>
@@ -7006,6 +7162,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">ruske rublje</displayName>
 				<displayName count="other">ruskih rublji</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>ruska rublja (1991.–1998.)</displayName>
@@ -7021,6 +7178,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">ruandska franka</displayName>
 				<displayName count="other">ruandskih franaka</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>saudijski rial</displayName>
@@ -7071,6 +7229,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">švedske krune</displayName>
 				<displayName count="other">švedskih kruna</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>singapurski dolar</displayName>
@@ -7086,6 +7245,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">svetohelenske funte</displayName>
 				<displayName count="other">svetohelenskih funti</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>slovenski tolar</displayName>
@@ -7144,6 +7304,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dobre Svetog Tome i Principa</displayName>
 				<displayName count="other">dobri Svetog Tome i Principa</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>sovjetska rublja</displayName>
@@ -7165,6 +7326,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">sirijske funte</displayName>
 				<displayName count="other">sirijskih funti</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>svazi lilangeni</displayName>
@@ -7179,6 +7341,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">tajlandska bahta</displayName>
 				<displayName count="other">tajlandskih bahta</displayName>
 				<symbol>THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>tajikistanska rublja</displayName>
@@ -7221,6 +7384,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">tongaške pa’ange</displayName>
 				<displayName count="other">tongaških pa’angi</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>timorski eskudo</displayName>
@@ -7243,6 +7407,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">turskih lira</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>trininadtobaški dolar</displayName>
@@ -7360,6 +7525,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">venezuelanska bolivara</displayName>
 				<displayName count="other">venezuelanskih bolivara</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>vijetnamski dong</displayName>
@@ -7445,6 +7611,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">istočnokaripska dolara</displayName>
 				<displayName count="other">istočnokaripskih dolara</displayName>
 				<symbol>XCD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>posebna crtaća prava</displayName>
@@ -7592,6 +7759,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">južnoafrička randa</displayName>
 				<displayName count="other">južnoafričkih randa</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>zambijska kvača (1968–2012)</displayName>
@@ -7606,6 +7774,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">zambijske kvače</displayName>
 				<displayName count="other">zambijskih kvača</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>zairski novi zair</displayName>
@@ -7665,6 +7834,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} metra u sekundi na kvadrat</unitPattern>
 				<unitPattern count="other">{0} metara u sekundi na kvadrat</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName draft="contributed">okretaj</displayName>
+				<unitPattern count="one" draft="contributed">{0} okretaj</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} okretaja</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} okretaja</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radijani</displayName>
+				<unitPattern count="one">{0} radijan</unitPattern>
+				<unitPattern count="few">{0} radijana</unitPattern>
+				<unitPattern count="other">{0} radijana</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>stupnjevi</displayName>
+				<unitPattern count="one">{0} stupanj</unitPattern>
+				<unitPattern count="few">{0} stupnja</unitPattern>
+				<unitPattern count="other">{0} stupnjeva</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>minute</displayName>
 				<unitPattern count="one">{0} minuta</unitPattern>
@@ -7677,17 +7864,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} sekunde</unitPattern>
 				<unitPattern count="other">{0} sekundi</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>stupnjevi</displayName>
-				<unitPattern count="one">{0} stupanj</unitPattern>
-				<unitPattern count="few">{0} stupnja</unitPattern>
-				<unitPattern count="other">{0} stupnjeva</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>kvadratni kilometri</displayName>
+				<unitPattern count="one">{0} kvadratni kilometar</unitPattern>
+				<unitPattern count="few">{0} kvadratna kilometra</unitPattern>
+				<unitPattern count="other">{0} kvadratnih kilometara</unitPattern>
 			</unit>
-			<unit type="angle-radian">
-				<displayName>radijani</displayName>
-				<unitPattern count="one">{0} radijan</unitPattern>
-				<unitPattern count="few">{0} radijana</unitPattern>
-				<unitPattern count="other">{0} radijana</unitPattern>
+			<unit type="area-hectare">
+				<displayName>hektari</displayName>
+				<unitPattern count="one">{0} hektar</unitPattern>
+				<unitPattern count="few">{0} hektra</unitPattern>
+				<unitPattern count="other">{0} hektara</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>kvadratni metri</displayName>
+				<unitPattern count="one">{0} kvadratni metar</unitPattern>
+				<unitPattern count="few">{0} kvadratna metra</unitPattern>
+				<unitPattern count="other">{0} kvadratnih metara</unitPattern>
+				<perUnitPattern draft="contributed">{0}/m²</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>kvadratni centimetri</displayName>
+				<unitPattern count="one">{0} kvadratni centimetar</unitPattern>
+				<unitPattern count="few">{0} kvadratna centimetra</unitPattern>
+				<unitPattern count="other">{0} kvadratnih centimetara</unitPattern>
+				<perUnitPattern draft="contributed">{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>kvadratne milje</displayName>
+				<unitPattern count="one">{0} kvadratna milja</unitPattern>
+				<unitPattern count="few">{0} kvadratne milje</unitPattern>
+				<unitPattern count="other">{0} kvadratnih milja</unitPattern>
 			</unit>
 			<unit type="area-acre">
 				<displayName>katastarska jutra</displayName>
@@ -7695,17 +7902,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} katastarska jutra</unitPattern>
 				<unitPattern count="other">{0} katastarskih jutara</unitPattern>
 			</unit>
-			<unit type="area-hectare">
-				<displayName>hektari</displayName>
-				<unitPattern count="one">{0} hektar</unitPattern>
-				<unitPattern count="few">{0} hektara</unitPattern>
-				<unitPattern count="other">{0} hektara</unitPattern>
-			</unit>
-			<unit type="area-square-centimeter">
-				<displayName>kvadratni centimetri</displayName>
-				<unitPattern count="one">{0} kvadratni centimetar</unitPattern>
-				<unitPattern count="few">{0} kvadratna centimetra</unitPattern>
-				<unitPattern count="other">{0} kvadratnih centimetara</unitPattern>
+			<unit type="area-square-yard">
+				<displayName>kvadratni jardi</displayName>
+				<unitPattern count="one">{0} kvadratni jard</unitPattern>
+				<unitPattern count="few">{0} kvadratna jarda</unitPattern>
+				<unitPattern count="other">{0} kvadratnih jardi</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>kvadratne stope</displayName>
@@ -7718,30 +7919,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kvadratni inč</unitPattern>
 				<unitPattern count="few">{0} kvadratna inča</unitPattern>
 				<unitPattern count="other">{0} kvadratnih inča</unitPattern>
+				<perUnitPattern draft="contributed">{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kvadratni kilometri</displayName>
-				<unitPattern count="one">{0} kvadratni kilometar</unitPattern>
-				<unitPattern count="few">{0} kvadratna kilometra</unitPattern>
-				<unitPattern count="other">{0} kvadratnih kilometara</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>kvadratni metri</displayName>
-				<unitPattern count="one">{0} kvadratni metar</unitPattern>
-				<unitPattern count="few">{0} kvadratna metra</unitPattern>
-				<unitPattern count="other">{0} kvadratnih metara</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>kvadratne milje</displayName>
-				<unitPattern count="one">{0} kvadratna milja</unitPattern>
-				<unitPattern count="few">{0} kvadratne milje</unitPattern>
-				<unitPattern count="other">{0} kvadratnih milja</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>kvadratni jardi</displayName>
-				<unitPattern count="one">{0} kvadratni jard</unitPattern>
-				<unitPattern count="few">{0} kvadratna jarda</unitPattern>
-				<unitPattern count="other">{0} kvadratnih jardi</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karati</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="few">{0} karata</unitPattern>
+				<unitPattern count="other">{0} karata</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litre po kilometru</displayName>
@@ -7749,77 +7933,111 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} litre po kilometru</unitPattern>
 				<unitPattern count="other">{0} litara po kilometru</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>litre na 100 kilometara</displayName>
+				<unitPattern count="one">{0} litra na 100 kilometara</unitPattern>
+				<unitPattern count="few">{0} litre na 100 kilometara</unitPattern>
+				<unitPattern count="other">{0} litara na 100 kilometara</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>milje po galonu</displayName>
 				<unitPattern count="one">{0} milja po galonu</unitPattern>
 				<unitPattern count="few">{0} milje po galonu</unitPattern>
 				<unitPattern count="other">{0} milja po galonu</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bitovi</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="few">{0} bita</unitPattern>
-				<unitPattern count="other">{0} bitova</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bajtovi</displayName>
-				<unitPattern count="one">{0} bajt</unitPattern>
-				<unitPattern count="few">{0} bajta</unitPattern>
-				<unitPattern count="other">{0} bajtova</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabiti</displayName>
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="few">{0} gigabita</unitPattern>
-				<unitPattern count="other">{0} gigabita</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabajti</displayName>
-				<unitPattern count="one">{0} gigabajt</unitPattern>
-				<unitPattern count="few">{0} gigabajta</unitPattern>
-				<unitPattern count="other">{0} gigabajta</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobiti</displayName>
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="few">{0} kilobita</unitPattern>
-				<unitPattern count="other">{0} kilobita</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobajti</displayName>
-				<unitPattern count="one">{0} kilobajt</unitPattern>
-				<unitPattern count="few">{0} kilobajta</unitPattern>
-				<unitPattern count="other">{0} kilobajta</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabiti</displayName>
-				<unitPattern count="one">{0} megabit</unitPattern>
-				<unitPattern count="few">{0} megabita</unitPattern>
-				<unitPattern count="other">{0} megabita</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabajti</displayName>
-				<unitPattern count="one">{0} megabajt</unitPattern>
-				<unitPattern count="few">{0} megabajta</unitPattern>
-				<unitPattern count="other">{0} megabajta</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabiti</displayName>
-				<unitPattern count="one">{0} terabit</unitPattern>
-				<unitPattern count="few">{0} terabita</unitPattern>
-				<unitPattern count="other">{0} terabita</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabajti</displayName>
 				<unitPattern count="one">{0} terabajt</unitPattern>
 				<unitPattern count="few">{0} terabajta</unitPattern>
 				<unitPattern count="other">{0} terabajta</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabiti</displayName>
+				<unitPattern count="one">{0} terabit</unitPattern>
+				<unitPattern count="few">{0} terabita</unitPattern>
+				<unitPattern count="other">{0} terabita</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabajti</displayName>
+				<unitPattern count="one">{0} gigabajt</unitPattern>
+				<unitPattern count="few">{0} gigabajta</unitPattern>
+				<unitPattern count="other">{0} gigabajta</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabiti</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="few">{0} gigabita</unitPattern>
+				<unitPattern count="other">{0} gigabita</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabajti</displayName>
+				<unitPattern count="one">{0} megabajt</unitPattern>
+				<unitPattern count="few">{0} megabajta</unitPattern>
+				<unitPattern count="other">{0} megabajta</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabiti</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="few">{0} megabita</unitPattern>
+				<unitPattern count="other">{0} megabita</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobajti</displayName>
+				<unitPattern count="one">{0} kilobajt</unitPattern>
+				<unitPattern count="few">{0} kilobajta</unitPattern>
+				<unitPattern count="other">{0} kilobajta</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobiti</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="few">{0} kilobita</unitPattern>
+				<unitPattern count="other">{0} kilobita</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bajtovi</displayName>
+				<unitPattern count="one">{0} bajt</unitPattern>
+				<unitPattern count="few">{0} bajta</unitPattern>
+				<unitPattern count="other">{0} bajtova</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bitovi</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="few">{0} bita</unitPattern>
+				<unitPattern count="other">{0} bitova</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="contributed">stoljeća</displayName>
+				<unitPattern count="one" draft="contributed">{0} stoljeće</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} stoljeća</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} stoljeća</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>godine</displayName>
+				<unitPattern count="one">{0} godina</unitPattern>
+				<unitPattern count="few">{0} godine</unitPattern>
+				<unitPattern count="other">{0} godina</unitPattern>
+				<perUnitPattern draft="contributed">{0} godišnje</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mjeseci</displayName>
+				<unitPattern count="one">{0} mjesec</unitPattern>
+				<unitPattern count="few">{0} mjeseca</unitPattern>
+				<unitPattern count="other">{0} mjeseci</unitPattern>
+				<perUnitPattern draft="contributed">{0} mjesečno</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>tjedni</displayName>
+				<unitPattern count="one">{0} tjedan</unitPattern>
+				<unitPattern count="few">{0} tjedna</unitPattern>
+				<unitPattern count="other">{0} tjedana</unitPattern>
+				<perUnitPattern draft="contributed">{0} tjedno</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>dani</displayName>
 				<unitPattern count="one">{0} dan</unitPattern>
 				<unitPattern count="few">{0} dana</unitPattern>
 				<unitPattern count="other">{0} dana</unitPattern>
+				<perUnitPattern draft="contributed">{0} dnevno</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>sati</displayName>
@@ -7828,35 +8046,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} sati</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikrosekunde</displayName>
-				<unitPattern count="one">{0} mikrosekunda</unitPattern>
-				<unitPattern count="few">{0} mikrosekunde</unitPattern>
-				<unitPattern count="other">{0} mikrosekundi</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milisekunde</displayName>
-				<unitPattern count="one">{0} milisekunda</unitPattern>
-				<unitPattern count="few">{0} milisekunde</unitPattern>
-				<unitPattern count="other">{0} milisekundi</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>minute</displayName>
 				<unitPattern count="one">{0} minuta</unitPattern>
 				<unitPattern count="few">{0} minute</unitPattern>
 				<unitPattern count="other">{0} minuta</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>mjeseci</displayName>
-				<unitPattern count="one">{0} mjesec</unitPattern>
-				<unitPattern count="few">{0} mjeseca</unitPattern>
-				<unitPattern count="other">{0} mjeseci</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanosekunde</displayName>
-				<unitPattern count="one">{0} nanosekunda</unitPattern>
-				<unitPattern count="few">{0} nanosekunde</unitPattern>
-				<unitPattern count="other">{0} nanosekundi</unitPattern>
+				<perUnitPattern draft="contributed">{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sekunde</displayName>
@@ -7865,17 +8060,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} sekundi</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>tjedni</displayName>
-				<unitPattern count="one">{0} tjedan</unitPattern>
-				<unitPattern count="few">{0} tjedna</unitPattern>
-				<unitPattern count="other">{0} tjedana</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milisekunde</displayName>
+				<unitPattern count="one">{0} milisekunda</unitPattern>
+				<unitPattern count="few">{0} milisekunde</unitPattern>
+				<unitPattern count="other">{0} milisekundi</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>godine</displayName>
-				<unitPattern count="one">{0} godina</unitPattern>
-				<unitPattern count="few">{0} godine</unitPattern>
-				<unitPattern count="other">{0} godina</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>mikrosekunde</displayName>
+				<unitPattern count="one">{0} mikrosekunda</unitPattern>
+				<unitPattern count="few">{0} mikrosekunde</unitPattern>
+				<unitPattern count="other">{0} mikrosekundi</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosekunde</displayName>
+				<unitPattern count="one">{0} nanosekunda</unitPattern>
+				<unitPattern count="few">{0} nanosekunde</unitPattern>
+				<unitPattern count="other">{0} nanosekundi</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amperi</displayName>
@@ -7901,6 +8102,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} volta</unitPattern>
 				<unitPattern count="other">{0} volti</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokalorije</displayName>
+				<unitPattern count="one">{0} kilokalorija</unitPattern>
+				<unitPattern count="few">{0} kilokalorije</unitPattern>
+				<unitPattern count="other">{0} kilokalorija</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kalorije</displayName>
 				<unitPattern count="one">{0} kalorija</unitPattern>
@@ -7913,24 +8120,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kilokalorije</unitPattern>
 				<unitPattern count="other">{0} kilokalorija</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>džuli</displayName>
-				<unitPattern count="one">{0} džul</unitPattern>
-				<unitPattern count="few">{0} džula</unitPattern>
-				<unitPattern count="other">{0} džula</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokalorije</displayName>
-				<unitPattern count="one">{0} kilokalorija</unitPattern>
-				<unitPattern count="few">{0} kilokalorije</unitPattern>
-				<unitPattern count="other">{0} kilokalorija</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilodžuli</displayName>
 				<unitPattern count="one">{0} kilodžul</unitPattern>
 				<unitPattern count="few">{0} kilodžula</unitPattern>
 				<unitPattern count="other">{0} kilodžula</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>džuli</displayName>
+				<unitPattern count="one">{0} džul</unitPattern>
+				<unitPattern count="few">{0} džula</unitPattern>
+				<unitPattern count="other">{0} džula</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilovatsati</displayName>
 				<unitPattern count="one">{0} kilovatsat</unitPattern>
@@ -7943,11 +8144,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} gigaherca</unitPattern>
 				<unitPattern count="other">{0} gigaherca</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>herci</displayName>
-				<unitPattern count="one">{0} herc</unitPattern>
-				<unitPattern count="few">{0} herca</unitPattern>
-				<unitPattern count="other">{0} herca</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megaherci</displayName>
+				<unitPattern count="one">{0} megaherc</unitPattern>
+				<unitPattern count="few">{0} megaherca</unitPattern>
+				<unitPattern count="other">{0} megaherca</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kiloherci</displayName>
@@ -7955,23 +8156,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kiloherca</unitPattern>
 				<unitPattern count="other">{0} kiloherca</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megaherci</displayName>
-				<unitPattern count="one">{0} megaherc</unitPattern>
-				<unitPattern count="few">{0} megaherca</unitPattern>
-				<unitPattern count="other">{0} megaherca</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>herci</displayName>
+				<unitPattern count="one">{0} herc</unitPattern>
+				<unitPattern count="few">{0} herca</unitPattern>
+				<unitPattern count="other">{0} herca</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>astronomske jedinice</displayName>
-				<unitPattern count="one">{0} astronomska jedinica</unitPattern>
-				<unitPattern count="few">{0} astronomske jedinice</unitPattern>
-				<unitPattern count="other">{0} astronomskih jedinica</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometri</displayName>
+				<unitPattern count="one">{0} kilometar</unitPattern>
+				<unitPattern count="few">{0} kilometra</unitPattern>
+				<unitPattern count="other">{0} kilometara</unitPattern>
+				<perUnitPattern draft="contributed">{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>centimetri</displayName>
-				<unitPattern count="one">{0} centimetar</unitPattern>
-				<unitPattern count="few">{0} centimetra</unitPattern>
-				<unitPattern count="other">{0} centimetara</unitPattern>
+			<unit type="length-meter">
+				<displayName>metri</displayName>
+				<unitPattern count="one">{0} metar</unitPattern>
+				<unitPattern count="few">{0} metra</unitPattern>
+				<unitPattern count="other">{0} metara</unitPattern>
+				<perUnitPattern draft="contributed">{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>decimetri</displayName>
@@ -7979,59 +8182,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} decimetra</unitPattern>
 				<unitPattern count="other">{0} decimetara</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName draft="contributed">hvati</displayName>
-				<unitPattern count="one" draft="contributed">{0} hvat</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} hvata</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} hvati</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>stope</displayName>
-				<unitPattern count="one">{0} stopa</unitPattern>
-				<unitPattern count="few">{0} stope</unitPattern>
-				<unitPattern count="other">{0} stopa</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName draft="contributed">furlonzi</displayName>
-				<unitPattern count="one" draft="contributed">{0} furlong</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} furlonga</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} furlonga</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>inči</displayName>
-				<unitPattern count="one">{0} inč</unitPattern>
-				<unitPattern count="few">{0} inča</unitPattern>
-				<unitPattern count="other">{0} inča</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometri</displayName>
-				<unitPattern count="one">{0} kilometar</unitPattern>
-				<unitPattern count="few">{0} kilometra</unitPattern>
-				<unitPattern count="other">{0} kilometara</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>svjetlosne godine</displayName>
-				<unitPattern count="one">{0} svjetlosna godina</unitPattern>
-				<unitPattern count="few">{0} svjetlosne godine</unitPattern>
-				<unitPattern count="other">{0} svjetlosnih godina</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metri</displayName>
-				<unitPattern count="one">{0} metar</unitPattern>
-				<unitPattern count="few">{0} metra</unitPattern>
-				<unitPattern count="other">{0} metara</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>mikrometri</displayName>
-				<unitPattern count="one">{0} mikrometar</unitPattern>
-				<unitPattern count="few">{0} mikrometra</unitPattern>
-				<unitPattern count="other">{0} mikrometara</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>milje</displayName>
-				<unitPattern count="one">{0} milja</unitPattern>
-				<unitPattern count="few">{0} milje</unitPattern>
-				<unitPattern count="other">{0} milja</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>centimetri</displayName>
+				<unitPattern count="one">{0} centimetar</unitPattern>
+				<unitPattern count="few">{0} centimetra</unitPattern>
+				<unitPattern count="other">{0} centimetara</unitPattern>
+				<perUnitPattern draft="contributed">{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>milimetri</displayName>
@@ -8039,71 +8195,117 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} milimetra</unitPattern>
 				<unitPattern count="other">{0} milimetara</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikrometri</displayName>
+				<unitPattern count="one">{0} mikrometar</unitPattern>
+				<unitPattern count="few">{0} mikrometra</unitPattern>
+				<unitPattern count="other">{0} mikrometara</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanometri</displayName>
 				<unitPattern count="one">{0} nanometar</unitPattern>
 				<unitPattern count="few">{0} nanometra</unitPattern>
 				<unitPattern count="other">{0} nanometara</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nautičke milje</displayName>
-				<unitPattern count="one">{0} nautička milja</unitPattern>
-				<unitPattern count="few">{0} nautičke milje</unitPattern>
-				<unitPattern count="other">{0} nautičkih milja</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parseci</displayName>
-				<unitPattern count="one">{0} parsek</unitPattern>
-				<unitPattern count="few">{0} parseka</unitPattern>
-				<unitPattern count="other">{0} parseka</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pikometri</displayName>
 				<unitPattern count="one">{0} pikometar</unitPattern>
 				<unitPattern count="few">{0} pikometra</unitPattern>
 				<unitPattern count="other">{0} pikometara</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>milje</displayName>
+				<unitPattern count="one">{0} milja</unitPattern>
+				<unitPattern count="few">{0} milje</unitPattern>
+				<unitPattern count="other">{0} milja</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>jardi</displayName>
 				<unitPattern count="one">{0} jard</unitPattern>
 				<unitPattern count="few">{0} jarda</unitPattern>
 				<unitPattern count="other">{0} jardi</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>stope</displayName>
+				<unitPattern count="one">{0} stopa</unitPattern>
+				<unitPattern count="few">{0} stope</unitPattern>
+				<unitPattern count="other">{0} stopa</unitPattern>
+				<perUnitPattern draft="contributed">{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>inči</displayName>
+				<unitPattern count="one">{0} inč</unitPattern>
+				<unitPattern count="few">{0} inča</unitPattern>
+				<unitPattern count="other">{0} inča</unitPattern>
+				<perUnitPattern draft="contributed">{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parseci</displayName>
+				<unitPattern count="one">{0} parsek</unitPattern>
+				<unitPattern count="few">{0} parseka</unitPattern>
+				<unitPattern count="other">{0} parseka</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>svjetlosne godine</displayName>
+				<unitPattern count="one">{0} svjetlosna godina</unitPattern>
+				<unitPattern count="few">{0} svjetlosne godine</unitPattern>
+				<unitPattern count="other">{0} svjetlosnih godina</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>astronomske jedinice</displayName>
+				<unitPattern count="one">{0} astronomska jedinica</unitPattern>
+				<unitPattern count="few">{0} astronomske jedinice</unitPattern>
+				<unitPattern count="other">{0} astronomskih jedinica</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName draft="contributed">furlonzi</displayName>
+				<unitPattern count="one" draft="contributed">{0} furlong</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} furlonga</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} furlonga</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName draft="contributed">hvati</displayName>
+				<unitPattern count="one" draft="contributed">{0} hvat</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} hvata</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} hvati</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nautičke milje</displayName>
+				<unitPattern count="one">{0} nautička milja</unitPattern>
+				<unitPattern count="few">{0} nautičke milje</unitPattern>
+				<unitPattern count="other">{0} nautičkih milja</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="contributed">skandinavska milja</displayName>
+				<unitPattern count="one" draft="contributed">{0} skandinavska milja</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} skandinavske milje</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} skandinavskih milja</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>luksi</displayName>
 				<unitPattern count="one">{0} luks</unitPattern>
 				<unitPattern count="few">{0} luksa</unitPattern>
 				<unitPattern count="other">{0} luksa</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karati</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="few">{0} karata</unitPattern>
-				<unitPattern count="other">{0} karata</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>grami</displayName>
-				<unitPattern count="one">{0} gram</unitPattern>
-				<unitPattern count="few">{0} grama</unitPattern>
-				<unitPattern count="other">{0} grama</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogrami</displayName>
-				<unitPattern count="one">{0} kilogram</unitPattern>
-				<unitPattern count="few">{0} kilograma</unitPattern>
-				<unitPattern count="other">{0} kilograma</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>tone</displayName>
 				<unitPattern count="one">{0} tona</unitPattern>
 				<unitPattern count="few">{0} tone</unitPattern>
 				<unitPattern count="other">{0} tona</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mikrogrami</displayName>
-				<unitPattern count="one">{0} mikrogram</unitPattern>
-				<unitPattern count="few">{0} mikrograma</unitPattern>
-				<unitPattern count="other">{0} mikrograma</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogrami</displayName>
+				<unitPattern count="one">{0} kilogram</unitPattern>
+				<unitPattern count="few">{0} kilograma</unitPattern>
+				<unitPattern count="other">{0} kilograma</unitPattern>
+				<perUnitPattern draft="contributed">{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>grami</displayName>
+				<unitPattern count="one">{0} gram</unitPattern>
+				<unitPattern count="few">{0} grama</unitPattern>
+				<unitPattern count="other">{0} grama</unitPattern>
+				<perUnitPattern draft="contributed">{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>miligrami</displayName>
@@ -8111,29 +8313,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} miligrama</unitPattern>
 				<unitPattern count="other">{0} miligrama</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>unce</displayName>
-				<unitPattern count="one">{0} unca</unitPattern>
-				<unitPattern count="few">{0} unce</unitPattern>
-				<unitPattern count="other">{0} unci</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>troy unce</displayName>
-				<unitPattern count="one">{0} troy unca</unitPattern>
-				<unitPattern count="few">{0} troy unce</unitPattern>
-				<unitPattern count="other">{0} troy unci</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>funte</displayName>
-				<unitPattern count="one">{0} funta</unitPattern>
-				<unitPattern count="few">{0} funte</unitPattern>
-				<unitPattern count="other">{0} funti</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="contributed">kameni</displayName>
-				<unitPattern count="one" draft="contributed">{0} kamen</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kamena</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kamena</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>mikrogrami</displayName>
+				<unitPattern count="one">{0} mikrogram</unitPattern>
+				<unitPattern count="few">{0} mikrograma</unitPattern>
+				<unitPattern count="other">{0} mikrograma</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>kratke tone</displayName>
@@ -8141,35 +8325,55 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kratke tone</unitPattern>
 				<unitPattern count="other">{0} kratkih tona</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName draft="contributed">kameni</displayName>
+				<unitPattern count="one" draft="contributed">{0} kamen</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kamena</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kamena</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>funte</displayName>
+				<unitPattern count="one">{0} funta</unitPattern>
+				<unitPattern count="few">{0} funte</unitPattern>
+				<unitPattern count="other">{0} funti</unitPattern>
+				<perUnitPattern draft="contributed">{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>unce</displayName>
+				<unitPattern count="one">{0} unca</unitPattern>
+				<unitPattern count="few">{0} unce</unitPattern>
+				<unitPattern count="other">{0} unci</unitPattern>
+				<perUnitPattern draft="contributed">{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>troy unce</displayName>
+				<unitPattern count="one">{0} troy unca</unitPattern>
+				<unitPattern count="few">{0} troy unce</unitPattern>
+				<unitPattern count="other">{0} troy unci</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karati</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="few">{0} karata</unitPattern>
+				<unitPattern count="other">{0} karata</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigavati</displayName>
 				<unitPattern count="one">{0} gigavat</unitPattern>
 				<unitPattern count="few">{0} gigavata</unitPattern>
 				<unitPattern count="other">{0} gigavata</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>konjske snage</displayName>
-				<unitPattern count="one">{0} konjska snaga</unitPattern>
-				<unitPattern count="few">{0} konjske snage</unitPattern>
-				<unitPattern count="other">{0} konjskih snaga</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilovati</displayName>
-				<unitPattern count="one">{0} kilovat</unitPattern>
-				<unitPattern count="few">{0} kilovata</unitPattern>
-				<unitPattern count="other">{0} kilovata</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>megavati</displayName>
 				<unitPattern count="one">{0} megavat</unitPattern>
 				<unitPattern count="few">{0} megavata</unitPattern>
 				<unitPattern count="other">{0} megavata</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>milivati</displayName>
-				<unitPattern count="one">{0} milivat</unitPattern>
-				<unitPattern count="few">{0} milivata</unitPattern>
-				<unitPattern count="other">{0} milivata</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilovati</displayName>
+				<unitPattern count="one">{0} kilovat</unitPattern>
+				<unitPattern count="few">{0} kilovata</unitPattern>
+				<unitPattern count="other">{0} kilovata</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>vati</displayName>
@@ -8177,24 +8381,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} vata</unitPattern>
 				<unitPattern count="other">{0} vati</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>milivati</displayName>
+				<unitPattern count="one">{0} milivat</unitPattern>
+				<unitPattern count="few">{0} milivata</unitPattern>
+				<unitPattern count="other">{0} milivata</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>konjske snage</displayName>
+				<unitPattern count="one">{0} konjska snaga</unitPattern>
+				<unitPattern count="few">{0} konjske snage</unitPattern>
+				<unitPattern count="other">{0} konjskih snaga</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hektopaskali</displayName>
 				<unitPattern count="one">{0} hektopaskal</unitPattern>
 				<unitPattern count="few">{0} hektopaskala</unitPattern>
 				<unitPattern count="other">{0} hektopaskala</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inči žive</displayName>
-				<unitPattern count="one">{0} inč žive</unitPattern>
-				<unitPattern count="few">{0} inča žive</unitPattern>
-				<unitPattern count="other">{0} inča žive</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>milibari</displayName>
-				<unitPattern count="one">{0} milibar</unitPattern>
-				<unitPattern count="few">{0} milibara</unitPattern>
-				<unitPattern count="other">{0} milibara</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>milimetri živina stupca</displayName>
 				<unitPattern count="one">{0} milimetar živina stupca</unitPattern>
@@ -8207,11 +8411,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} funte po kvadratnom inču</unitPattern>
 				<unitPattern count="other">{0} funti po kvadratnom inču</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karati</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="few">{0} karata</unitPattern>
-				<unitPattern count="other">{0} karata</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inči žive</displayName>
+				<unitPattern count="one">{0} inč žive</unitPattern>
+				<unitPattern count="few">{0} inča žive</unitPattern>
+				<unitPattern count="other">{0} inča žive</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>milibari</displayName>
+				<unitPattern count="one">{0} milibar</unitPattern>
+				<unitPattern count="few">{0} milibara</unitPattern>
+				<unitPattern count="other">{0} milibara</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometri na sat</displayName>
@@ -8231,6 +8441,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} milje na sat</unitPattern>
 				<unitPattern count="other">{0} milja na sat</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName draft="contributed">čvor</displayName>
+				<unitPattern count="one" draft="contributed">{0} čvor</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} čvora</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} čvorova</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName draft="contributed">°</displayName>
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="few" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>Celzijevi stupnjevi</displayName>
 				<unitPattern count="one">{0} Celzijev stupanj</unitPattern>
@@ -8249,42 +8471,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kelvina</unitPattern>
 				<unitPattern count="other">{0} kelvina</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>aker-stope</displayName>
-				<unitPattern count="one">{0} aker-stopa</unitPattern>
-				<unitPattern count="few">{0} aker-stope</unitPattern>
-				<unitPattern count="other">{0} aker-stopi</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName draft="contributed">bušeli</displayName>
-				<unitPattern count="one" draft="contributed">{0} bušel</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} bušela</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} bušela</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>centilitri</displayName>
-				<unitPattern count="one">{0} centilitar</unitPattern>
-				<unitPattern count="few">{0} centilitra</unitPattern>
-				<unitPattern count="other">{0} centilitara</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>kubni centimetri</displayName>
-				<unitPattern count="one">{0} kubni centimetar</unitPattern>
-				<unitPattern count="few">{0} kubna centimetra</unitPattern>
-				<unitPattern count="other">{0} kubnih centimetara</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>kubne stope</displayName>
-				<unitPattern count="one">{0} kubna stopa</unitPattern>
-				<unitPattern count="few">{0} kubne stope</unitPattern>
-				<unitPattern count="other">{0} kubnih stopa</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>kubni inči</displayName>
-				<unitPattern count="one">{0} kubni inč</unitPattern>
-				<unitPattern count="few">{0} kubna inča</unitPattern>
-				<unitPattern count="other">{0} kubnih inča</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kubni kilometri</displayName>
 				<unitPattern count="one">{0} kubni kilometar</unitPattern>
@@ -8296,6 +8482,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kubni metar</unitPattern>
 				<unitPattern count="few">{0} kubna metra</unitPattern>
 				<unitPattern count="other">{0} kubnih metara</unitPattern>
+				<perUnitPattern draft="contributed">{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>kubni centimetri</displayName>
+				<unitPattern count="one">{0} kubni centimetar</unitPattern>
+				<unitPattern count="few">{0} kubna centimetra</unitPattern>
+				<unitPattern count="other">{0} kubnih centimetara</unitPattern>
+				<perUnitPattern draft="contributed">{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>kubne milje</displayName>
@@ -8309,29 +8503,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kubna jarda</unitPattern>
 				<unitPattern count="other">{0} kubnih jardi</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>šalice</displayName>
-				<unitPattern count="one">{0} šalica</unitPattern>
-				<unitPattern count="few">{0} šalice</unitPattern>
-				<unitPattern count="other">{0} šalica</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>kubne stope</displayName>
+				<unitPattern count="one">{0} kubna stopa</unitPattern>
+				<unitPattern count="few">{0} kubne stope</unitPattern>
+				<unitPattern count="other">{0} kubnih stopa</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>decilitri</displayName>
-				<unitPattern count="one">{0} decilitar</unitPattern>
-				<unitPattern count="few">{0} decilitra</unitPattern>
-				<unitPattern count="other">{0} decilitara</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>kubni inči</displayName>
+				<unitPattern count="one">{0} kubni inč</unitPattern>
+				<unitPattern count="few">{0} kubna inča</unitPattern>
+				<unitPattern count="other">{0} kubnih inča</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>tekuće unce</displayName>
-				<unitPattern count="one">{0} tekuća unca</unitPattern>
-				<unitPattern count="few">{0} tekuće unce</unitPattern>
-				<unitPattern count="other">{0} tekućih unci</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>galoni</displayName>
-				<unitPattern count="one">{0} galon</unitPattern>
-				<unitPattern count="few">{0} galona</unitPattern>
-				<unitPattern count="other">{0} galona</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megalitri</displayName>
+				<unitPattern count="one">{0} megalitar</unitPattern>
+				<unitPattern count="few">{0} megalitra</unitPattern>
+				<unitPattern count="other">{0} megalitara</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hektolitri</displayName>
@@ -8344,12 +8532,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} litra</unitPattern>
 				<unitPattern count="few">{0} litre</unitPattern>
 				<unitPattern count="other">{0} litara</unitPattern>
+				<perUnitPattern draft="contributed">{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalitri</displayName>
-				<unitPattern count="one">{0} megalitar</unitPattern>
-				<unitPattern count="few">{0} megalitra</unitPattern>
-				<unitPattern count="other">{0} megalitara</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>decilitri</displayName>
+				<unitPattern count="one">{0} decilitar</unitPattern>
+				<unitPattern count="few">{0} decilitra</unitPattern>
+				<unitPattern count="other">{0} decilitara</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centilitri</displayName>
+				<unitPattern count="one">{0} centilitar</unitPattern>
+				<unitPattern count="few">{0} centilitra</unitPattern>
+				<unitPattern count="other">{0} centilitara</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mililitri</displayName>
@@ -8357,11 +8552,36 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mililitra</unitPattern>
 				<unitPattern count="other">{0} mililitara</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pinte</displayName>
-				<unitPattern count="one">{0} pinta</unitPattern>
-				<unitPattern count="few">{0} pinte</unitPattern>
-				<unitPattern count="other">{0} pinti</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName draft="contributed">metričke pinte</displayName>
+				<unitPattern count="one" draft="contributed">{0} metrička pinta</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} metričke pinte</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} metričkih pinti</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName draft="contributed">metričke šalice</displayName>
+				<unitPattern count="one" draft="contributed">{0} metrička šalica</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} metričke šalice</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} metričkih šalica</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>aker-stope</displayName>
+				<unitPattern count="one">{0} aker-stopa</unitPattern>
+				<unitPattern count="few">{0} aker-stope</unitPattern>
+				<unitPattern count="other">{0} aker-stopi</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName draft="contributed">bušeli</displayName>
+				<unitPattern count="one" draft="contributed">{0} bušel</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} bušela</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} bušela</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galoni</displayName>
+				<unitPattern count="one">{0} galon</unitPattern>
+				<unitPattern count="few">{0} galona</unitPattern>
+				<unitPattern count="other">{0} galona</unitPattern>
+				<perUnitPattern draft="contributed">{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>četvrtine</displayName>
@@ -8369,6 +8589,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} četvrtine</unitPattern>
 				<unitPattern count="other">{0} četvrtina</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pinte</displayName>
+				<unitPattern count="one">{0} pinta</unitPattern>
+				<unitPattern count="few">{0} pinte</unitPattern>
+				<unitPattern count="other">{0} pinti</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>šalice</displayName>
+				<unitPattern count="one">{0} šalica</unitPattern>
+				<unitPattern count="few">{0} šalice</unitPattern>
+				<unitPattern count="other">{0} šalica</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>tekuće unce</displayName>
+				<unitPattern count="one">{0} tekuća unca</unitPattern>
+				<unitPattern count="few">{0} tekuće unce</unitPattern>
+				<unitPattern count="other">{0} tekućih unci</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>žlice</displayName>
 				<unitPattern count="one">{0} žlica</unitPattern>
@@ -8381,6 +8619,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} žličice</unitPattern>
 				<unitPattern count="other">{0} žličica</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">{0}I</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">{0}J</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0}Z</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -8398,6 +8642,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName draft="contributed">okr.</displayName>
+				<unitPattern count="one" draft="contributed">{0} okr.</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} okr.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} okr.</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="few">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
@@ -8410,23 +8672,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} s</unitPattern>
 				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>°</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="few">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="few">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>kj</displayName>
-				<unitPattern count="one">{0} kj</unitPattern>
-				<unitPattern count="few">{0} kj</unitPattern>
-				<unitPattern count="other">{0} kj</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="few">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ha</displayName>
@@ -8434,11 +8684,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="few">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern draft="contributed">{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="few">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern draft="contributed">{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="few">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>kj</displayName>
+				<unitPattern count="one">{0} kj</unitPattern>
+				<unitPattern count="few">{0} kj</unitPattern>
+				<unitPattern count="other">{0} kj</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="few">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ft²</displayName>
@@ -8451,30 +8727,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="few">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern draft="contributed">{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="few">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="few">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="few">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="few">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="few">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
@@ -8482,77 +8741,111 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} l/km</unitPattern>
 				<unitPattern count="other">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="few">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="few">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="few">{0} bita</unitPattern>
-				<unitPattern count="other">{0} bitova</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bajt</displayName>
-				<unitPattern count="one">{0} bajt</unitPattern>
-				<unitPattern count="few">{0} bajta</unitPattern>
-				<unitPattern count="other">{0} bajtova</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="few">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="few">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="few">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="few">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="few">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="few">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="few">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="few">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="few">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="few">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="few">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="few">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="few">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="few">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="few">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bajt</displayName>
+				<unitPattern count="one">{0} bajt</unitPattern>
+				<unitPattern count="few">{0} bajta</unitPattern>
+				<unitPattern count="other">{0} bajtova</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="few">{0} bita</unitPattern>
+				<unitPattern count="other">{0} bitova</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="contributed">st.</displayName>
+				<unitPattern count="one" draft="contributed">{0} st.</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} st.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} st.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>g.</displayName>
+				<unitPattern count="one">{0} g.</unitPattern>
+				<unitPattern count="few">{0} g.</unitPattern>
+				<unitPattern count="other">{0} g.</unitPattern>
+				<perUnitPattern draft="contributed">{0}/g.</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mj.</displayName>
+				<unitPattern count="one">{0} mj.</unitPattern>
+				<unitPattern count="few">{0} mj.</unitPattern>
+				<unitPattern count="other">{0} mj.</unitPattern>
+				<perUnitPattern draft="contributed">{0}/mj.</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>tj.</displayName>
+				<unitPattern count="one">{0} tj.</unitPattern>
+				<unitPattern count="few">{0} tj.</unitPattern>
+				<unitPattern count="other">{0} tj.</unitPattern>
+				<perUnitPattern draft="contributed">{0}/tj.</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>dani</displayName>
 				<unitPattern count="one">{0} dan</unitPattern>
 				<unitPattern count="few">{0} dana</unitPattern>
 				<unitPattern count="other">{0} dana</unitPattern>
+				<perUnitPattern draft="contributed">{0}/d.</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>h</displayName>
@@ -8561,35 +8854,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} h</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="few">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="few">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
 				<unitPattern count="few">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>mj.</displayName>
-				<unitPattern count="one">{0} mj.</unitPattern>
-				<unitPattern count="few">{0} mj.</unitPattern>
-				<unitPattern count="other">{0} mj.</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="few">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern draft="contributed">{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>s</displayName>
@@ -8598,17 +8868,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} s</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>tj.</displayName>
-				<unitPattern count="one">{0} tj.</unitPattern>
-				<unitPattern count="few">{0} tj.</unitPattern>
-				<unitPattern count="other">{0} tj.</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="few">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>g.</displayName>
-				<unitPattern count="one">{0} g.</unitPattern>
-				<unitPattern count="few">{0} g.</unitPattern>
-				<unitPattern count="other">{0} g.</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="few">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="few">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>A</displayName>
@@ -8634,6 +8910,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="few">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -8646,24 +8928,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kcal</unitPattern>
 				<unitPattern count="other">{0} kcal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>J</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="few">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="few">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="few">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="few">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -8676,11 +8952,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="few">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="few">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
@@ -8688,23 +8964,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="few">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="few">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="few">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="few">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern draft="contributed">{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="few">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="few">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern draft="contributed">{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
@@ -8712,59 +8990,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName draft="contributed">hv</displayName>
-				<unitPattern count="one" draft="contributed">{0} hv</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} hv</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} hv</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>stope</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="few">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName draft="contributed">furlonzi</displayName>
-				<unitPattern count="one" draft="contributed">{0} fur</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} fur</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fur</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>inči</displayName>
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="few">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="few">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>svjetlosne g.</displayName>
-				<unitPattern count="one">{0} ly</unitPattern>
-				<unitPattern count="few">{0} ly</unitPattern>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="few">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="few">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mi</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="few">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="few">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern draft="contributed">{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -8772,71 +9003,117 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="few">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="few">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="few">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="few">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="few">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="few">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>jardi</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="few">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>stope</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="few">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern draft="contributed">{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>inči</displayName>
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="few">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern draft="contributed">{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="few">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>svjetlosne g.</displayName>
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="few">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="few">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName draft="contributed">furlonzi</displayName>
+				<unitPattern count="one" draft="contributed">{0} fur</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} fur</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fur</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName draft="contributed">hv</displayName>
+				<unitPattern count="one" draft="contributed">{0} hv</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} hv</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} hv</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="few">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="contributed">smi</displayName>
+				<unitPattern count="one" draft="contributed">{0} smi</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} smi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="few">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>ct</displayName>
-				<unitPattern count="one">{0} ct</unitPattern>
-				<unitPattern count="few">{0} ct</unitPattern>
-				<unitPattern count="other">{0} ct</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="few">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="few">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="few">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="few">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="few">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern draft="contributed">{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern draft="contributed">{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
@@ -8844,29 +9121,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="few">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="few">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="few">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="contributed">st</displayName>
-				<unitPattern count="one" draft="contributed">{0} st</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} st</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} st</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="few">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tn</displayName>
@@ -8874,35 +9133,55 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} tn</unitPattern>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName draft="contributed">st</displayName>
+				<unitPattern count="one" draft="contributed">{0} st</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} st</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="few">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern draft="contributed">{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="few">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern draft="contributed">{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="few">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>ct</displayName>
+				<unitPattern count="one">{0} ct</unitPattern>
+				<unitPattern count="few">{0} ct</unitPattern>
+				<unitPattern count="other">{0} ct</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="few">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>KS</displayName>
-				<unitPattern count="one">{0} KS</unitPattern>
-				<unitPattern count="few">{0} KS</unitPattern>
-				<unitPattern count="other">{0} KS</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="few">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="few">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="few">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="few">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>W</displayName>
@@ -8910,24 +9189,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="few">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>KS</displayName>
+				<unitPattern count="one">{0} KS</unitPattern>
+				<unitPattern count="few">{0} KS</unitPattern>
+				<unitPattern count="other">{0} KS</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="few">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="few">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="few">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -8940,11 +9219,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="few">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="few">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="few">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -8964,6 +9249,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName draft="contributed">čv</displayName>
+				<unitPattern count="one" draft="contributed">{0} čv</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} čv</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} čv</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName draft="contributed">°</displayName>
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="few" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -8982,42 +9279,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="few">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName draft="contributed">bu</displayName>
-				<unitPattern count="one" draft="contributed">{0} bu</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} bu</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} bu</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="few">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="few">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="few">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="few">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -9029,6 +9290,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="few">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern draft="contributed">{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="few">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern draft="contributed">{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -9042,29 +9311,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>šalice</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="few">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="few">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="few">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="few">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="few">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="few">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="few">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -9077,12 +9340,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="few">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern draft="contributed">{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="one">{0} Ml</unitPattern>
-				<unitPattern count="few">{0} Ml</unitPattern>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="few">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="few">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
@@ -9090,11 +9360,36 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="few">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName draft="contributed">mpt</displayName>
+				<unitPattern count="one" draft="contributed">{0} mpt</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mpt</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName draft="contributed">m. šalica</displayName>
+				<unitPattern count="one" draft="contributed">{0} mc</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mc</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="few">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName draft="contributed">bu</displayName>
+				<unitPattern count="one" draft="contributed">{0} bu</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} bu</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} bu</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="few">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern draft="contributed">{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
@@ -9102,6 +9397,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="few">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>šalice</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="few">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="few">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>tbsp</displayName>
 				<unitPattern count="one">{0} tbsp</unitPattern>
@@ -9114,6 +9427,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} tsp</unitPattern>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">{0}I</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">{0}J</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0}Z</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -9129,6 +9448,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} m/s²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-radian">
+				<unitPattern count="one" draft="contributed">{0} rad</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} rad</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="few" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one" draft="contributed">{0}′</unitPattern>
 				<unitPattern count="few" draft="contributed">{0}′</unitPattern>
@@ -9139,31 +9468,41 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0}″</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="few" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<unitPattern count="one" draft="contributed">{0} rad</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} rad</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} kj</unitPattern>
-				<unitPattern count="few">{0} kj</unitPattern>
-				<unitPattern count="other">{0} kj</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} km²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one" draft="contributed">{0} ha</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} ha</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<unitPattern count="one" draft="contributed">{0} m²</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} m²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} m²</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<unitPattern count="one" draft="contributed">{0} cm²</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} cm²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} cm²</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<unitPattern count="one" draft="contributed">{0} mi²</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mi²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} kj</unitPattern>
+				<unitPattern count="few">{0} kj</unitPattern>
+				<unitPattern count="other">{0} kj</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<unitPattern count="one" draft="contributed">{0} yd²</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} yd²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} yd²</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<unitPattern count="one" draft="contributed">{0} ft²</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} ft²</unitPattern>
@@ -9174,85 +9513,94 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} in²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} in²</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<unitPattern count="one" draft="contributed">{0} m²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} m²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<unitPattern count="one" draft="contributed">{0} mi²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mi²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<unitPattern count="one" draft="contributed">{0} yd²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} yd²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<unitPattern count="one" draft="contributed">{0} kt</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kt</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="one" draft="contributed">{0} l/km</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} l/km</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0}l/100km</unitPattern>
+				<unitPattern count="few">{0}l/100km</unitPattern>
+				<unitPattern count="other">{0}l/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<unitPattern count="one" draft="contributed">{0} mpg</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} mpg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<unitPattern count="one" draft="contributed">{0} bit</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} bita</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} bitova</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<unitPattern count="one" draft="contributed">{0} bajt</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} bajta</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} bajtova</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<unitPattern count="one" draft="contributed">{0} Gb</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} Gb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<unitPattern count="one" draft="contributed">{0} GB</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} GB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<unitPattern count="one" draft="contributed">{0} kb</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<unitPattern count="one" draft="contributed">{0} kB</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<unitPattern count="one" draft="contributed">{0} Mb</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} Mb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<unitPattern count="one" draft="contributed">{0} MB</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} MB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MB</unitPattern>
+			<unit type="digital-terabyte">
+				<unitPattern count="one" draft="contributed">{0} TB</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} TB</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} TB</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<unitPattern count="one" draft="contributed">{0} Tb</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} Tb</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} Tb</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<unitPattern count="one" draft="contributed">{0} TB</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} TB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} TB</unitPattern>
+			<unit type="digital-gigabyte">
+				<unitPattern count="one" draft="contributed">{0} GB</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} GB</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<unitPattern count="one" draft="contributed">{0} Gb</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Gb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<unitPattern count="one" draft="contributed">{0} MB</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} MB</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<unitPattern count="one" draft="contributed">{0} Mb</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Mb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<unitPattern count="one" draft="contributed">{0} kB</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kB</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<unitPattern count="one" draft="contributed">{0} kb</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<unitPattern count="one" draft="contributed">{0} bajt</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} bajta</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} bajtova</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<unitPattern count="one" draft="contributed">{0} bit</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} bita</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} bitova</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>g.</displayName>
+				<unitPattern count="one">{0} g.</unitPattern>
+				<unitPattern count="few">{0} g.</unitPattern>
+				<unitPattern count="other">{0} g.</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mj.</displayName>
+				<unitPattern count="one">{0} mj.</unitPattern>
+				<unitPattern count="few">{0} mj.</unitPattern>
+				<unitPattern count="other">{0} mj.</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>tj.</displayName>
+				<unitPattern count="one">{0} tj.</unitPattern>
+				<unitPattern count="few">{0} tj.</unitPattern>
+				<unitPattern count="other">{0} tj.</unitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>d.</displayName>
@@ -9266,51 +9614,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} h</unitPattern>
 				<unitPattern count="other">{0} h</unitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<unitPattern count="one" draft="contributed">{0} μs</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} μs</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="few">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
 				<unitPattern count="few">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>mj.</displayName>
-				<unitPattern count="one">{0} mj.</unitPattern>
-				<unitPattern count="few">{0} mj.</unitPattern>
-				<unitPattern count="other">{0} mj.</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<unitPattern count="one" draft="contributed">{0} ns</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ns</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ns</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>s</displayName>
 				<unitPattern count="one">{0} s</unitPattern>
 				<unitPattern count="few">{0} s</unitPattern>
 				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>tj.</displayName>
-				<unitPattern count="one">{0} tj.</unitPattern>
-				<unitPattern count="few">{0} tj.</unitPattern>
-				<unitPattern count="other">{0} tj.</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="few">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>g.</displayName>
-				<unitPattern count="one">{0} g.</unitPattern>
-				<unitPattern count="few">{0} g.</unitPattern>
-				<unitPattern count="other">{0} g.</unitPattern>
+			<unit type="duration-microsecond">
+				<unitPattern count="one" draft="contributed">{0} μs</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} μs</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<unitPattern count="one" draft="contributed">{0} ns</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ns</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<unitPattern count="one" draft="contributed">{0} A</unitPattern>
@@ -9332,6 +9662,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} V</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kcal</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<unitPattern count="one" draft="contributed">{0} cal</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} cal</unitPattern>
@@ -9343,21 +9678,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kcal</unitPattern>
 				<unitPattern count="other">{0} kcal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<unitPattern count="one" draft="contributed">{0} J</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} J</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kcal</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<unitPattern count="one" draft="contributed">{0} kJ</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} kJ</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<unitPattern count="one" draft="contributed">{0} J</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} J</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<unitPattern count="one" draft="contributed">{0} kWh</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} kWh</unitPattern>
@@ -9368,58 +9698,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} GHz</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<unitPattern count="one" draft="contributed">{0} Hz</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} Hz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<unitPattern count="one" draft="contributed">{0} MHz</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} MHz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<unitPattern count="one" draft="contributed">{0} kHz</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} kHz</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<unitPattern count="one" draft="contributed">{0} MHz</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} MHz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MHz</unitPattern>
-			</unit>
-			<unit type="length-astronomical-unit">
-				<unitPattern count="one" draft="contributed">{0} au</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} au</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} au</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="few">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<unitPattern count="one" draft="contributed">{0} dm</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} dm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} dm</unitPattern>
-			</unit>
-			<unit type="length-fathom">
-				<displayName draft="contributed">hv</displayName>
-				<unitPattern count="one" draft="contributed">{0} hv</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} hv</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} hv</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one" draft="contributed">{0}′</unitPattern>
-				<unitPattern count="few" draft="contributed">{0}′</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}′</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName draft="contributed">fur</displayName>
-				<unitPattern count="one" draft="contributed">{0} fur</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} fur</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fur</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one" draft="contributed">{0}″</unitPattern>
-				<unitPattern count="few" draft="contributed">{0}″</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
+			<unit type="frequency-hertz">
+				<unitPattern count="one" draft="contributed">{0} Hz</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Hz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Hz</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
@@ -9427,26 +9719,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} km</unitPattern>
 				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one" draft="contributed">{0} ly</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ly</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ly</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>m</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
 				<unitPattern count="few">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-micrometer">
-				<unitPattern count="one" draft="contributed">{0} µm</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} µm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} µm</unitPattern>
+			<unit type="length-decimeter">
+				<unitPattern count="one" draft="contributed">{0} dm</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} dm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one" draft="contributed">{0} mi</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="few">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -9454,46 +9742,82 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<unitPattern count="one" draft="contributed">{0} µm</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} µm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<unitPattern count="one" draft="contributed">{0} nm</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} nm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<unitPattern count="one" draft="contributed">{0} nmi</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} nmi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<unitPattern count="one" draft="contributed">{0} pc</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} pc</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<unitPattern count="one" draft="contributed">{0} pm</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} pm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one" draft="contributed">{0} mi</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one" draft="contributed">{0} yd</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} yd</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<unitPattern count="one" draft="contributed">{0}′</unitPattern>
+				<unitPattern count="few" draft="contributed">{0}′</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}′</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one" draft="contributed">{0}″</unitPattern>
+				<unitPattern count="few" draft="contributed">{0}″</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<unitPattern count="one" draft="contributed">{0} pc</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} pc</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one" draft="contributed">{0} ly</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ly</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<unitPattern count="one" draft="contributed">{0} au</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} au</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} au</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName draft="contributed">fur</displayName>
+				<unitPattern count="one" draft="contributed">{0} fur</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} fur</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fur</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName draft="contributed">hv</displayName>
+				<unitPattern count="one" draft="contributed">{0} hv</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} hv</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} hv</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<unitPattern count="one" draft="contributed">{0} nmi</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} nmi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} nmi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<unitPattern count="one" draft="contributed">{0} lx</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} lx</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<unitPattern count="one" draft="contributed">{0} ct</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ct</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ct</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="few">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="mass-metric-ton">
+				<unitPattern count="one" draft="contributed">{0} t</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} t</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} t</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
@@ -9501,20 +9825,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-metric-ton">
-				<unitPattern count="one" draft="contributed">{0} t</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} t</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} t</unitPattern>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<unitPattern count="one" draft="contributed">{0} mg</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mg</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mg</unitPattern>
 			</unit>
 			<unit type="mass-microgram">
 				<unitPattern count="one" draft="contributed">{0} µg</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} µg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} µg</unitPattern>
 			</unit>
-			<unit type="mass-milligram">
-				<unitPattern count="one" draft="contributed">{0} mg</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mg</unitPattern>
+			<unit type="mass-ton">
+				<unitPattern count="one" draft="contributed">{0} tn</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} tn</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} tn</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName draft="contributed">st</displayName>
+				<unitPattern count="one" draft="contributed">{0} st</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} st</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<unitPattern count="one" draft="contributed">{0} lb</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} lb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} lb</unitPattern>
 			</unit>
 			<unit type="mass-ounce">
 				<unitPattern count="one" draft="contributed">{0} oz</unitPattern>
@@ -9526,67 +9867,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} oz t</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} oz t</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<unitPattern count="one" draft="contributed">{0} lb</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} lb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} lb</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="contributed">st</displayName>
-				<unitPattern count="one" draft="contributed">{0} st</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} st</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} st</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<unitPattern count="one" draft="contributed">{0} tn</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} tn</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} tn</unitPattern>
+			<unit type="mass-carat">
+				<unitPattern count="one" draft="contributed">{0} ct</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ct</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ct</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<unitPattern count="one" draft="contributed">{0} GW</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} GW</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one" draft="contributed">{0} KS</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} KS</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} KS</unitPattern>
+			<unit type="power-megawatt">
+				<unitPattern count="one" draft="contributed">{0} MW</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} MW</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} MW</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one" draft="contributed">{0} kW</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} kW</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kW</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<unitPattern count="one" draft="contributed">{0} MW</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} MW</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MW</unitPattern>
+			<unit type="power-watt">
+				<unitPattern count="one" draft="contributed">{0} W</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} W</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} W</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<unitPattern count="one" draft="contributed">{0} mW</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} mW</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mW</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<unitPattern count="one" draft="contributed">{0} W</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} W</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} W</unitPattern>
+			<unit type="power-horsepower">
+				<unitPattern count="one" draft="contributed">{0} KS</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} KS</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} KS</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one" draft="contributed">{0} hPa</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} hPa</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} inHg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<unitPattern count="one" draft="contributed">{0} mb</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mb</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<unitPattern count="one" draft="contributed">{0} mm Hg</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} mm Hg</unitPattern>
@@ -9597,10 +9917,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} psi</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<unitPattern count="one" draft="contributed">{0} kt</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} inHg</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<unitPattern count="one" draft="contributed">{0} mb</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mb</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -9634,37 +9959,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} K</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<unitPattern count="one" draft="contributed">{0} ac ft</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ac ft</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName draft="contributed">bu</displayName>
-				<unitPattern count="one" draft="contributed">{0} bu</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} bu</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} bu</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<unitPattern count="one" draft="contributed">{0} cl</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} cl</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<unitPattern count="one" draft="contributed">{0} cm³</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} cm³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<unitPattern count="one" draft="contributed">{0} ft³</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ft³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<unitPattern count="one" draft="contributed">{0} in³</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} in³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<unitPattern count="one" draft="contributed">{0} km³</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} km³</unitPattern>
@@ -9675,6 +9969,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} m³</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} m³</unitPattern>
 			</unit>
+			<unit type="volume-cubic-centimeter">
+				<unitPattern count="one" draft="contributed">{0} cm³</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} cm³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cm³</unitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<unitPattern count="one" draft="contributed">{0} mi³</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} mi³</unitPattern>
@@ -9685,25 +9984,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} yd³</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<unitPattern count="one" draft="contributed">{0} c</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} c</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<unitPattern count="one" draft="contributed">{0} ft³</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ft³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<unitPattern count="one" draft="contributed">{0} dl</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} dl</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<unitPattern count="one" draft="contributed">{0} in³</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} in³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<unitPattern count="one" draft="contributed">{0} fl oz</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} fl oz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<unitPattern count="one" draft="contributed">{0} gal</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} gal</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<unitPattern count="one" draft="contributed">{0} Ml</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Ml</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<unitPattern count="one" draft="contributed">{0} hl</unitPattern>
@@ -9716,26 +10010,57 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<unitPattern count="one" draft="contributed">{0} Ml</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} Ml</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<unitPattern count="one" draft="contributed">{0} dl</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} dl</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<unitPattern count="one" draft="contributed">{0} cl</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} cl</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<unitPattern count="one" draft="contributed">{0} ml</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} ml</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<unitPattern count="one" draft="contributed">{0} pt</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} pt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pt</unitPattern>
+			<unit type="volume-acre-foot">
+				<unitPattern count="one" draft="contributed">{0} ac ft</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ac ft</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName draft="contributed">bu</displayName>
+				<unitPattern count="one" draft="contributed">{0} bu</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} bu</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} bu</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<unitPattern count="one" draft="contributed">{0} gal</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} gal</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} gal</unitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<unitPattern count="one" draft="contributed">{0} qt</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} qt</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<unitPattern count="one" draft="contributed">{0} pt</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} pt</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<unitPattern count="one" draft="contributed">{0} c</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} c</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<unitPattern count="one" draft="contributed">{0} fl oz</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} fl oz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<unitPattern count="one" draft="contributed">{0} tbsp</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} tbsp</unitPattern>
@@ -9746,6 +10071,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} tsp</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">{0}I</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">{0}J</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0}Z</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hr_BA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hr_BA.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hr_BA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hr_BA.xml
index ec8d7ba5834..e37e6de5856 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hr_BA.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hr_BA.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="hr"/>
 		<territory type="BA"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hr_HR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hr_HR.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hr_HR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hr_HR.xml
index 97cbb4f698f..1b3441644d8 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hr_HR.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hr_HR.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="hr"/>
 		<territory type="HR"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hsb.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hsb.xml
similarity index 97%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hsb.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hsb.xml
index e4b79e1c674..aeb2d87ee16 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hsb.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hsb.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="hsb"/>
 	</identity>
 	<localeDisplayNames>
@@ -243,7 +242,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="su">sundanezišćina</language>
 			<language type="sv">šwedšćina</language>
 			<language type="sw">suahelšćina</language>
-			<language type="swc">kongoska suahelšćina</language>
+			<language type="sw_CD">kongoska suahelšćina</language>
 			<language type="ta">tamilšćina</language>
 			<language type="te">telugu</language>
 			<language type="teo">teso</language>
@@ -636,55 +635,55 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="numbers">ličby</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">arabsko-indiske cyfry</type>
-			<type type="arabext" key="numbers">rozšěrjene arabsko-indiske cyfry</type>
-			<type type="armn" key="numbers">armenske cyfry</type>
-			<type type="armnlow" key="numbers">armenske cyfry, małe pisane</type>
-			<type type="beng" key="numbers">bengalske cyfry</type>
-			<type type="buddhist" key="calendar">buddhistiska protyka</type>
-			<type type="chinese" key="calendar">chinska protyka</type>
-			<type type="dangi" key="calendar">dangi-protyka</type>
-			<type type="deva" key="numbers">devanagari-cyfry</type>
-			<type type="ducet" key="collation">rjadowanski slěd po Unicode</type>
-			<type type="ethi" key="numbers">etiopiske cyfry</type>
-			<type type="ethiopic" key="calendar">etiopiska protyka</type>
-			<type type="fullwide" key="numbers">połnošěroke cyfry</type>
-			<type type="geor" key="numbers">georgiske cyfry</type>
-			<type type="gregorian" key="calendar">gregorianska protyka</type>
-			<type type="grek" key="numbers">grjekske cyfry</type>
-			<type type="greklow" key="numbers">grjekske cyfry, małe pisane</type>
-			<type type="gujr" key="numbers">gujarati-cyfry</type>
-			<type type="guru" key="numbers">gurmukhi-cyfry</type>
-			<type type="hanidec" key="numbers">chinske decimalne ličby</type>
-			<type type="hans" key="numbers">zjednorjene chinske cyfry</type>
-			<type type="hansfin" key="numbers">zjednorjene chinske financne cyfry</type>
-			<type type="hant" key="numbers">tradicionalne chinske cyfry</type>
-			<type type="hantfin" key="numbers">tradicionalne chinske financne cyfry</type>
-			<type type="hebr" key="numbers">hebrejske cyfry</type>
-			<type type="hebrew" key="calendar">židowska protyka</type>
-			<type type="islamic" key="calendar">islamska protyka</type>
-			<type type="iso8601" key="calendar">protyka po iso-8601</type>
-			<type type="japanese" key="calendar">japanska protyka</type>
-			<type type="jpan" key="numbers">japanske cyfry</type>
-			<type type="jpanfin" key="numbers">japanske financne cyfry</type>
-			<type type="khmr" key="numbers">khmerske cyfry</type>
-			<type type="knda" key="numbers">kannadske cyfry</type>
-			<type type="laoo" key="numbers">laoske cyfry</type>
-			<type type="latn" key="numbers">arabske cyfry</type>
-			<type type="mlym" key="numbers">malayalamske cyfry</type>
-			<type type="mymr" key="numbers">burmaske cyfry</type>
-			<type type="orya" key="numbers">oriya-cyfry</type>
-			<type type="persian" key="calendar">persiska protyka</type>
-			<type type="roc" key="calendar">protyka republiki China</type>
-			<type type="roman" key="numbers">romske cyfry</type>
-			<type type="romanlow" key="numbers">romske cyfry, małe pisane</type>
-			<type type="search" key="collation">powšitkowne pytanje</type>
-			<type type="standard" key="collation">standardowy rjadowanski slěd</type>
-			<type type="taml" key="numbers">tradicionalne tamilske cyfry</type>
-			<type type="tamldec" key="numbers">tamilske cyfry</type>
-			<type type="telu" key="numbers">telugu-cyfry</type>
-			<type type="thai" key="numbers">thailandske cyfry</type>
-			<type type="tibt" key="numbers">tibetske cyfry</type>
+			<type key="calendar" type="buddhist">buddhistiska protyka</type>
+			<type key="calendar" type="chinese">chinska protyka</type>
+			<type key="calendar" type="dangi">dangi-protyka</type>
+			<type key="calendar" type="ethiopic">etiopiska protyka</type>
+			<type key="calendar" type="gregorian">gregorianska protyka</type>
+			<type key="calendar" type="hebrew">židowska protyka</type>
+			<type key="calendar" type="islamic">islamska protyka</type>
+			<type key="calendar" type="iso8601">protyka po iso-8601</type>
+			<type key="calendar" type="japanese">japanska protyka</type>
+			<type key="calendar" type="persian">persiska protyka</type>
+			<type key="calendar" type="roc">protyka republiki China</type>
+			<type key="collation" type="ducet">rjadowanski slěd po Unicode</type>
+			<type key="collation" type="search">powšitkowne pytanje</type>
+			<type key="collation" type="standard">standardowy rjadowanski slěd</type>
+			<type key="numbers" type="arab">arabsko-indiske cyfry</type>
+			<type key="numbers" type="arabext">rozšěrjene arabsko-indiske cyfry</type>
+			<type key="numbers" type="armn">armenske cyfry</type>
+			<type key="numbers" type="armnlow">armenske cyfry, małe pisane</type>
+			<type key="numbers" type="beng">bengalske cyfry</type>
+			<type key="numbers" type="deva">devanagari-cyfry</type>
+			<type key="numbers" type="ethi">etiopiske cyfry</type>
+			<type key="numbers" type="fullwide">połnošěroke cyfry</type>
+			<type key="numbers" type="geor">georgiske cyfry</type>
+			<type key="numbers" type="grek">grjekske cyfry</type>
+			<type key="numbers" type="greklow">grjekske cyfry, małe pisane</type>
+			<type key="numbers" type="gujr">gujarati-cyfry</type>
+			<type key="numbers" type="guru">gurmukhi-cyfry</type>
+			<type key="numbers" type="hanidec">chinske decimalne ličby</type>
+			<type key="numbers" type="hans">zjednorjene chinske cyfry</type>
+			<type key="numbers" type="hansfin">zjednorjene chinske financne cyfry</type>
+			<type key="numbers" type="hant">tradicionalne chinske cyfry</type>
+			<type key="numbers" type="hantfin">tradicionalne chinske financne cyfry</type>
+			<type key="numbers" type="hebr">hebrejske cyfry</type>
+			<type key="numbers" type="jpan">japanske cyfry</type>
+			<type key="numbers" type="jpanfin">japanske financne cyfry</type>
+			<type key="numbers" type="khmr">khmerske cyfry</type>
+			<type key="numbers" type="knda">kannadske cyfry</type>
+			<type key="numbers" type="laoo">laoske cyfry</type>
+			<type key="numbers" type="latn">arabske cyfry</type>
+			<type key="numbers" type="mlym">malayalamske cyfry</type>
+			<type key="numbers" type="mymr">burmaske cyfry</type>
+			<type key="numbers" type="orya">oriya-cyfry</type>
+			<type key="numbers" type="roman">romske cyfry</type>
+			<type key="numbers" type="romanlow">romske cyfry, małe pisane</type>
+			<type key="numbers" type="taml">tradicionalne tamilske cyfry</type>
+			<type key="numbers" type="tamldec">tamilske cyfry</type>
+			<type key="numbers" type="telu">telugu-cyfry</type>
+			<type key="numbers" type="thai">thailandske cyfry</type>
+			<type key="numbers" type="tibt">tibetske cyfry</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metriski</measurementSystemName>
@@ -1057,14 +1056,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">dopołdnja</dayPeriod>
+							<dayPeriod type="pm">popołdnju</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am">dop.</dayPeriod>
-							<dayPeriod type="noon">připołd.</dayPeriod>
 							<dayPeriod type="pm">pop.</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">dopołdnja</dayPeriod>
-							<dayPeriod type="noon">připołdnju</dayPeriod>
 							<dayPeriod type="pm">popołdnju</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
@@ -3187,6 +3188,58 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0 tys'.' ¤</pattern>
+					<pattern type="1000" count="two" draft="provisional">0 tys'.' ¤</pattern>
+					<pattern type="1000" count="few" draft="provisional">0 tys'.' ¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0 tys'.' ¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00 tys'.' ¤</pattern>
+					<pattern type="10000" count="two" draft="provisional">00 tys'.' ¤</pattern>
+					<pattern type="10000" count="few" draft="provisional">00 tys'.' ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00 tys'.' ¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000 tys'.' ¤</pattern>
+					<pattern type="100000" count="two" draft="provisional">000 tys'.' ¤</pattern>
+					<pattern type="100000" count="few" draft="provisional">000 tys'.' ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000 tys'.' ¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0 mio'.' ¤</pattern>
+					<pattern type="1000000" count="two" draft="provisional">0 mio'.' ¤</pattern>
+					<pattern type="1000000" count="few" draft="provisional">0 mio'.' ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0 mio'.' ¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00 mio'.' ¤</pattern>
+					<pattern type="10000000" count="two" draft="provisional">00 mio'.' ¤</pattern>
+					<pattern type="10000000" count="few" draft="provisional">00 mio'.' ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00 mio'.' ¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000 mio'.' ¤</pattern>
+					<pattern type="100000000" count="two" draft="provisional">000 mio'.' ¤</pattern>
+					<pattern type="100000000" count="few" draft="provisional">000 mio'.' ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000 mio'.' ¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0 mrd'.' ¤</pattern>
+					<pattern type="1000000000" count="two" draft="provisional">0 mrd'.' ¤</pattern>
+					<pattern type="1000000000" count="few" draft="provisional">0 mrd'.' ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0 mrd'.' ¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00 mrd'.' ¤</pattern>
+					<pattern type="10000000000" count="two" draft="provisional">00 mrd'.' ¤</pattern>
+					<pattern type="10000000000" count="few" draft="provisional">00 mrd'.' ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00 mrd'.' ¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000 mrd'.' ¤</pattern>
+					<pattern type="100000000000" count="two" draft="provisional">000 mrd'.' ¤</pattern>
+					<pattern type="100000000000" count="few" draft="provisional">000 mrd'.' ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000 mrd'.' ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0 bil'.' ¤</pattern>
+					<pattern type="1000000000000" count="two" draft="provisional">0 bil'.' ¤</pattern>
+					<pattern type="1000000000000" count="few" draft="provisional">0 bil'.' ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="two" draft="provisional">00 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="few" draft="provisional">00 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="two" draft="provisional">000 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="few" draft="provisional">000 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000 bil'.' ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="two">{0} {1}</unitPattern>
 			<unitPattern count="few">{0} {1}</unitPattern>
@@ -4520,6 +4573,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} metry na kwadratnu sekundu</unitPattern>
 				<unitPattern count="other">{0} metrow na kwadratnu sekundu</unitPattern>
 			</unit>
+			<unit type="angle-radian">
+				<displayName>radianty</displayName>
+				<unitPattern count="one">{0} radiant</unitPattern>
+				<unitPattern count="two">{0} radiantaj</unitPattern>
+				<unitPattern count="few">{0} radianty</unitPattern>
+				<unitPattern count="other">{0} radiantow</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>stopnje</displayName>
+				<unitPattern count="one">{0} stopjeń</unitPattern>
+				<unitPattern count="two">{0} stopnjej</unitPattern>
+				<unitPattern count="few">{0} stopnje</unitPattern>
+				<unitPattern count="other">{0} stopnjow</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>minuty</displayName>
 				<unitPattern count="one">{0} minuta</unitPattern>
@@ -4534,26 +4601,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} sekundy</unitPattern>
 				<unitPattern count="other">{0} sekundow</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>stopnje</displayName>
-				<unitPattern count="one">{0} stopjeń</unitPattern>
-				<unitPattern count="two">{0} stopnjej</unitPattern>
-				<unitPattern count="few">{0} stopnje</unitPattern>
-				<unitPattern count="other">{0} stopnjow</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radianty</displayName>
-				<unitPattern count="one">{0} radiant</unitPattern>
-				<unitPattern count="two">{0} radiantaj</unitPattern>
-				<unitPattern count="few">{0} radianty</unitPattern>
-				<unitPattern count="other">{0} radiantow</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>acry</displayName>
-				<unitPattern count="one">{0} acre</unitPattern>
-				<unitPattern count="two">{0} acraj</unitPattern>
-				<unitPattern count="few">{0} acry</unitPattern>
-				<unitPattern count="other">{0} acrow</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>kwadratne kilometry</displayName>
+				<unitPattern count="one">{0} kwadratny kilometer</unitPattern>
+				<unitPattern count="two">{0} kwadratnej kilometraj</unitPattern>
+				<unitPattern count="few">{0} kwadratne kilometry</unitPattern>
+				<unitPattern count="other">{0} kwadratnych kilometrow</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektary</displayName>
@@ -4562,6 +4615,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} hektary</unitPattern>
 				<unitPattern count="other">{0} hektarow</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>kwadratne metry</displayName>
+				<unitPattern count="one">{0} kwadratny meter</unitPattern>
+				<unitPattern count="two">{0} kwadratnej metraj</unitPattern>
+				<unitPattern count="few">{0} kwadratne metry</unitPattern>
+				<unitPattern count="other">{0} kwadratnych metrow</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>kwadratne centimetry</displayName>
 				<unitPattern count="one">{0} kwadratny centimeter</unitPattern>
@@ -4569,6 +4629,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kwadratne centimetry</unitPattern>
 				<unitPattern count="other">{0} kwadratnych centimetrow</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<displayName>kwadratne mile</displayName>
+				<unitPattern count="one">{0} kwadratna mila</unitPattern>
+				<unitPattern count="two">{0} kwadratnej mili</unitPattern>
+				<unitPattern count="few">{0} kwadratne mile</unitPattern>
+				<unitPattern count="other">{0} kwadratnych milow</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acry</displayName>
+				<unitPattern count="one">{0} acre</unitPattern>
+				<unitPattern count="two">{0} acraj</unitPattern>
+				<unitPattern count="few">{0} acry</unitPattern>
+				<unitPattern count="other">{0} acrow</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>kwadratne yardy</displayName>
+				<unitPattern count="one">{0} kwadratny yard</unitPattern>
+				<unitPattern count="two">{0} kwadratnej yardaj</unitPattern>
+				<unitPattern count="few">{0} kwadratne yardy</unitPattern>
+				<unitPattern count="other">{0} kwadratnych yardow</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<displayName>kwadratne stopy</displayName>
 				<unitPattern count="one">{0} kwadratna stopa</unitPattern>
@@ -4583,33 +4664,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kwadratne cóle</unitPattern>
 				<unitPattern count="other">{0} kwadratnych cólow</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kwadratne kilometry</displayName>
-				<unitPattern count="one">{0} kwadratny kilometer</unitPattern>
-				<unitPattern count="two">{0} kwadratnej kilometraj</unitPattern>
-				<unitPattern count="few">{0} kwadratne kilometry</unitPattern>
-				<unitPattern count="other">{0} kwadratnych kilometrow</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>kwadratne metry</displayName>
-				<unitPattern count="one">{0} kwadratny meter</unitPattern>
-				<unitPattern count="two">{0} kwadratnej metraj</unitPattern>
-				<unitPattern count="few">{0} kwadratne metry</unitPattern>
-				<unitPattern count="other">{0} kwadratnych metrow</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>kwadratne mile</displayName>
-				<unitPattern count="one">{0} kwadratna mila</unitPattern>
-				<unitPattern count="two">{0} kwadratnej mili</unitPattern>
-				<unitPattern count="few">{0} kwadratne mile</unitPattern>
-				<unitPattern count="other">{0} kwadratnych milow</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>kwadratne yardy</displayName>
-				<unitPattern count="one">{0} kwadratny yard</unitPattern>
-				<unitPattern count="two">{0} kwadratnej yardaj</unitPattern>
-				<unitPattern count="few">{0} kwadratne yardy</unitPattern>
-				<unitPattern count="other">{0} kwadratnych yardow</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karaty</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="two">{0} karataj</unitPattern>
+				<unitPattern count="few">{0} karaty</unitPattern>
+				<unitPattern count="other">{0} karatow</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litry na kilometer</displayName>
@@ -4625,61 +4685,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mile na galonu</unitPattern>
 				<unitPattern count="other">{0} milow na galonu</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bity</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="two">{0} bitaj</unitPattern>
-				<unitPattern count="few">{0} bity</unitPattern>
-				<unitPattern count="other">{0} bitow</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bytey</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="two">{0} byteaj</unitPattern>
-				<unitPattern count="few">{0} bytey</unitPattern>
-				<unitPattern count="other">{0} byteow</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabity</displayName>
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="two">{0} gigabitaj</unitPattern>
-				<unitPattern count="few">{0} gigabity</unitPattern>
-				<unitPattern count="other">{0} gigabitow</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabytey</displayName>
-				<unitPattern count="one">{0} gigabyte</unitPattern>
-				<unitPattern count="two">{0} gigabyteaj</unitPattern>
-				<unitPattern count="few">{0} gigabytey</unitPattern>
-				<unitPattern count="other">{0} gigabyteow</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobity</displayName>
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="two">{0} kilobitaj</unitPattern>
-				<unitPattern count="few">{0} kilobity</unitPattern>
-				<unitPattern count="other">{0} kilobitow</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobytey</displayName>
-				<unitPattern count="one">{0} kilobyte</unitPattern>
-				<unitPattern count="two">{0} kilobyteaj</unitPattern>
-				<unitPattern count="few">{0} kilobytey</unitPattern>
-				<unitPattern count="other">{0} kilobyteow</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabity</displayName>
-				<unitPattern count="one">{0} megabit</unitPattern>
-				<unitPattern count="two">{0} megabitaj</unitPattern>
-				<unitPattern count="few">{0} megabity</unitPattern>
-				<unitPattern count="other">{0} megabitow</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabytey</displayName>
-				<unitPattern count="one">{0} megabyte</unitPattern>
-				<unitPattern count="two">{0} megabyteaj</unitPattern>
-				<unitPattern count="few">{0} megabytey</unitPattern>
-				<unitPattern count="other">{0} megabyteow</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>terabytey</displayName>
+				<unitPattern count="one">{0} terabyte</unitPattern>
+				<unitPattern count="two">{0} terabyteaj</unitPattern>
+				<unitPattern count="few">{0} terabytey</unitPattern>
+				<unitPattern count="other">{0} terabyteow</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>terabity</displayName>
@@ -4688,12 +4699,82 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} terabity</unitPattern>
 				<unitPattern count="other">{0} terabitow</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>terabytey</displayName>
-				<unitPattern count="one">{0} terabyte</unitPattern>
-				<unitPattern count="two">{0} terabyteaj</unitPattern>
-				<unitPattern count="few">{0} terabytey</unitPattern>
-				<unitPattern count="other">{0} terabyteow</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>gigabytey</displayName>
+				<unitPattern count="one">{0} gigabyte</unitPattern>
+				<unitPattern count="two">{0} gigabyteaj</unitPattern>
+				<unitPattern count="few">{0} gigabytey</unitPattern>
+				<unitPattern count="other">{0} gigabyteow</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabity</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="two">{0} gigabitaj</unitPattern>
+				<unitPattern count="few">{0} gigabity</unitPattern>
+				<unitPattern count="other">{0} gigabitow</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabytey</displayName>
+				<unitPattern count="one">{0} megabyte</unitPattern>
+				<unitPattern count="two">{0} megabyteaj</unitPattern>
+				<unitPattern count="few">{0} megabytey</unitPattern>
+				<unitPattern count="other">{0} megabyteow</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabity</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="two">{0} megabitaj</unitPattern>
+				<unitPattern count="few">{0} megabity</unitPattern>
+				<unitPattern count="other">{0} megabitow</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobytey</displayName>
+				<unitPattern count="one">{0} kilobyte</unitPattern>
+				<unitPattern count="two">{0} kilobyteaj</unitPattern>
+				<unitPattern count="few">{0} kilobytey</unitPattern>
+				<unitPattern count="other">{0} kilobyteow</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobity</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="two">{0} kilobitaj</unitPattern>
+				<unitPattern count="few">{0} kilobity</unitPattern>
+				<unitPattern count="other">{0} kilobitow</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bytey</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="two">{0} byteaj</unitPattern>
+				<unitPattern count="few">{0} bytey</unitPattern>
+				<unitPattern count="other">{0} byteow</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bity</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="two">{0} bitaj</unitPattern>
+				<unitPattern count="few">{0} bity</unitPattern>
+				<unitPattern count="other">{0} bitow</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>lěta</displayName>
+				<unitPattern count="one">{0} lěto</unitPattern>
+				<unitPattern count="two">{0} lěće</unitPattern>
+				<unitPattern count="few">{0} lěta</unitPattern>
+				<unitPattern count="other">{0} lět</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>měsacy</displayName>
+				<unitPattern count="one">{0} měsac</unitPattern>
+				<unitPattern count="two">{0} měsacaj</unitPattern>
+				<unitPattern count="few">{0} měsacy</unitPattern>
+				<unitPattern count="other">{0} měsacow</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>tydźenje</displayName>
+				<unitPattern count="one">{0} tydźeń</unitPattern>
+				<unitPattern count="two">{0} tydźenjej</unitPattern>
+				<unitPattern count="few">{0} tydźenje</unitPattern>
+				<unitPattern count="other">{0} tydźenjow</unitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>dny</displayName>
@@ -4708,21 +4789,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two">{0} hodźinje</unitPattern>
 				<unitPattern count="few">{0} hodźiny</unitPattern>
 				<unitPattern count="other">{0} hodźinow</unitPattern>
-				<perUnitPattern>na hodźinu</perUnitPattern>
-			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikrosekundy</displayName>
-				<unitPattern count="one">{0} mikrosekunda</unitPattern>
-				<unitPattern count="two">{0} mikrosekundźe</unitPattern>
-				<unitPattern count="few">{0} mikrosekundy</unitPattern>
-				<unitPattern count="other">{0} mikrosekundow</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milisekundy</displayName>
-				<unitPattern count="one">{0} milisekunda</unitPattern>
-				<unitPattern count="two">{0} milisekundźe</unitPattern>
-				<unitPattern count="few">{0} milisekundy</unitPattern>
-				<unitPattern count="other">{0} milisekundow</unitPattern>
+				<perUnitPattern>{0} na hodźinu</perUnitPattern>
 			</unit>
 			<unit type="duration-minute">
 				<displayName>minuty</displayName>
@@ -4731,12 +4798,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} minuty</unitPattern>
 				<unitPattern count="other">{0} minutow</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>měsacy</displayName>
-				<unitPattern count="one">{0} měsac</unitPattern>
-				<unitPattern count="two">{0} měsacaj</unitPattern>
-				<unitPattern count="few">{0} měsacy</unitPattern>
-				<unitPattern count="other">{0} měsacow</unitPattern>
+			<unit type="duration-second">
+				<displayName>sekundy</displayName>
+				<unitPattern count="one">{0} sekunda</unitPattern>
+				<unitPattern count="two">{0} sekundźe</unitPattern>
+				<unitPattern count="few">{0} sekundy</unitPattern>
+				<unitPattern count="other">{0} sekundow</unitPattern>
+				<perUnitPattern>{0} na sekundu</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>milisekundy</displayName>
+				<unitPattern count="one">{0} milisekunda</unitPattern>
+				<unitPattern count="two">{0} milisekundźe</unitPattern>
+				<unitPattern count="few">{0} milisekundy</unitPattern>
+				<unitPattern count="other">{0} milisekundow</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>mikrosekundy</displayName>
+				<unitPattern count="one">{0} mikrosekunda</unitPattern>
+				<unitPattern count="two">{0} mikrosekundźe</unitPattern>
+				<unitPattern count="few">{0} mikrosekundy</unitPattern>
+				<unitPattern count="other">{0} mikrosekundow</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>nanosekundy</displayName>
@@ -4745,28 +4827,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} nanosekundy</unitPattern>
 				<unitPattern count="other">{0} nanosekundow</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>sekundy</displayName>
-				<unitPattern count="one">{0} sekunda</unitPattern>
-				<unitPattern count="two">{0} sekundźe</unitPattern>
-				<unitPattern count="few">{0} sekundy</unitPattern>
-				<unitPattern count="other">{0} sekundow</unitPattern>
-				<perUnitPattern>na sekundu</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>tydźenje</displayName>
-				<unitPattern count="one">{0} tydźeń</unitPattern>
-				<unitPattern count="two">{0} tydźenjej</unitPattern>
-				<unitPattern count="few">{0} tydźenje</unitPattern>
-				<unitPattern count="other">{0} tydźenjow</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>lěta</displayName>
-				<unitPattern count="one">{0} lěto</unitPattern>
-				<unitPattern count="two">{0} lěće</unitPattern>
-				<unitPattern count="few">{0} lěta</unitPattern>
-				<unitPattern count="other">{0} lět</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>ampery</displayName>
 				<unitPattern count="one">{0} ampere</unitPattern>
@@ -4795,6 +4855,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} volty</unitPattern>
 				<unitPattern count="other">{0} voltow</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokalorije</displayName>
+				<unitPattern count="one">{0} kilokalorija</unitPattern>
+				<unitPattern count="two">{0} kilokaloriji</unitPattern>
+				<unitPattern count="few">{0} kilokalorije</unitPattern>
+				<unitPattern count="other">{0} kilokalorijow</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kalorije</displayName>
 				<unitPattern count="one">{0} kalorija</unitPattern>
@@ -4809,20 +4876,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kilokalorije</unitPattern>
 				<unitPattern count="other">{0} kilokalorijow</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="one">{0} joule</unitPattern>
-				<unitPattern count="two">{0} joulej</unitPattern>
-				<unitPattern count="few">{0} joule</unitPattern>
-				<unitPattern count="other">{0} jouleow</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokalorije</displayName>
-				<unitPattern count="one">{0} kilokalorija</unitPattern>
-				<unitPattern count="two">{0} kilokaloriji</unitPattern>
-				<unitPattern count="few">{0} kilokalorije</unitPattern>
-				<unitPattern count="other">{0} kilokalorijow</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojoule</displayName>
 				<unitPattern count="one">{0} kilojoule</unitPattern>
@@ -4830,6 +4883,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kilojoule</unitPattern>
 				<unitPattern count="other">{0} kilojouleow</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="one">{0} joule</unitPattern>
+				<unitPattern count="two">{0} joulej</unitPattern>
+				<unitPattern count="few">{0} joule</unitPattern>
+				<unitPattern count="other">{0} jouleow</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilowattowe hodźiny</displayName>
 				<unitPattern count="one">{0} kilowattowa hodźina</unitPattern>
@@ -4844,12 +4904,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} gigahertzy</unitPattern>
 				<unitPattern count="other">{0} gigahertzow</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hertzy</displayName>
-				<unitPattern count="one">{0} hertz</unitPattern>
-				<unitPattern count="two">{0} hertzaj</unitPattern>
-				<unitPattern count="few">{0} hertzy</unitPattern>
-				<unitPattern count="other">{0} hertzow</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megahertzy</displayName>
+				<unitPattern count="one">{0} megahertz</unitPattern>
+				<unitPattern count="two">{0} megahertzaj</unitPattern>
+				<unitPattern count="few">{0} megahertzy</unitPattern>
+				<unitPattern count="other">{0} megahertzow</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kilohertzy</displayName>
@@ -4858,19 +4918,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kilohertzy</unitPattern>
 				<unitPattern count="other">{0} kilohertzow</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megahertzy</displayName>
-				<unitPattern count="one">{0} megahertz</unitPattern>
-				<unitPattern count="two">{0} megahertzaj</unitPattern>
-				<unitPattern count="few">{0} megahertzy</unitPattern>
-				<unitPattern count="other">{0} megahertzow</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hertzy</displayName>
+				<unitPattern count="one">{0} hertz</unitPattern>
+				<unitPattern count="two">{0} hertzaj</unitPattern>
+				<unitPattern count="few">{0} hertzy</unitPattern>
+				<unitPattern count="other">{0} hertzow</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>astronomiske jednotki</displayName>
-				<unitPattern count="one">{0} astronomiska jednotka</unitPattern>
-				<unitPattern count="two">{0} astronomiskej jednotce</unitPattern>
-				<unitPattern count="few">{0} astronomiske jednotki</unitPattern>
-				<unitPattern count="other">{0} astronomiskich jednotkow</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometry</displayName>
+				<unitPattern count="one">{0} kilometer</unitPattern>
+				<unitPattern count="two">{0} kilometraj</unitPattern>
+				<unitPattern count="few">{0} kilometry</unitPattern>
+				<unitPattern count="other">{0} kilometrow</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>metry</displayName>
+				<unitPattern count="one">{0} meter</unitPattern>
+				<unitPattern count="two">{0} metraj</unitPattern>
+				<unitPattern count="few">{0} metry</unitPattern>
+				<unitPattern count="other">{0} metrow</unitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>decimetry</displayName>
+				<unitPattern count="one">{0} decimeter</unitPattern>
+				<unitPattern count="two">{0} decimetraj</unitPattern>
+				<unitPattern count="few">{0} decimetry</unitPattern>
+				<unitPattern count="other">{0} decimetrow</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
 				<displayName>centimetry</displayName>
@@ -4879,12 +4953,47 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} centimetry</unitPattern>
 				<unitPattern count="other">{0} centimetrow</unitPattern>
 			</unit>
-			<unit type="length-decimeter">
-				<displayName>decimetry</displayName>
-				<unitPattern count="one">{0} decimeter</unitPattern>
-				<unitPattern count="two">{0} decimetraj</unitPattern>
-				<unitPattern count="few">{0} decimetry</unitPattern>
-				<unitPattern count="other">{0} decimetrow</unitPattern>
+			<unit type="length-millimeter">
+				<displayName>milimetry</displayName>
+				<unitPattern count="one">{0} milimeter</unitPattern>
+				<unitPattern count="two">{0} milimetraj</unitPattern>
+				<unitPattern count="few">{0} milimetry</unitPattern>
+				<unitPattern count="other">{0} milimetrow</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikrometry</displayName>
+				<unitPattern count="one">{0} mikrometer</unitPattern>
+				<unitPattern count="two">{0} mikrometraj</unitPattern>
+				<unitPattern count="few">{0} mikrometry</unitPattern>
+				<unitPattern count="other">{0} mikrometrow</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nanometry</displayName>
+				<unitPattern count="one">{0} nanometer</unitPattern>
+				<unitPattern count="two">{0} nanometraj</unitPattern>
+				<unitPattern count="few">{0} nanometry</unitPattern>
+				<unitPattern count="other">{0} nanometrow</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>pikometry</displayName>
+				<unitPattern count="one">{0} pikometer</unitPattern>
+				<unitPattern count="two">{0} pikometraj</unitPattern>
+				<unitPattern count="few">{0} pikometry</unitPattern>
+				<unitPattern count="other">{0} pikometrow</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>mile</displayName>
+				<unitPattern count="one">{0} mila</unitPattern>
+				<unitPattern count="two">{0} mili</unitPattern>
+				<unitPattern count="few">{0} mile</unitPattern>
+				<unitPattern count="other">{0} milow</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>yardy</displayName>
+				<unitPattern count="one">{0} yard</unitPattern>
+				<unitPattern count="two">{0} yardaj</unitPattern>
+				<unitPattern count="few">{0} yardy</unitPattern>
+				<unitPattern count="other">{0} yardow</unitPattern>
 			</unit>
 			<unit type="length-foot">
 				<displayName>stopy</displayName>
@@ -4900,12 +5009,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} cóle</unitPattern>
 				<unitPattern count="other">{0} cólow</unitPattern>
 			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometry</displayName>
-				<unitPattern count="one">{0} kilometer</unitPattern>
-				<unitPattern count="two">{0} kilometraj</unitPattern>
-				<unitPattern count="few">{0} kilometry</unitPattern>
-				<unitPattern count="other">{0} kilometrow</unitPattern>
+			<unit type="length-parsec">
+				<displayName>parsec</displayName>
+				<unitPattern count="one">{0} parsec</unitPattern>
+				<unitPattern count="two">{0} parsec</unitPattern>
+				<unitPattern count="few">{0} parsec</unitPattern>
+				<unitPattern count="other">{0} parsec</unitPattern>
 			</unit>
 			<unit type="length-light-year">
 				<displayName>swětłolěta</displayName>
@@ -4914,40 +5023,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} swětłolěta</unitPattern>
 				<unitPattern count="other">{0} swětłolět</unitPattern>
 			</unit>
-			<unit type="length-meter">
-				<displayName>metry</displayName>
-				<unitPattern count="one">{0} meter</unitPattern>
-				<unitPattern count="two">{0} metraj</unitPattern>
-				<unitPattern count="few">{0} metry</unitPattern>
-				<unitPattern count="other">{0} metrow</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>mikrometry</displayName>
-				<unitPattern count="one">{0} mikrometer</unitPattern>
-				<unitPattern count="two">{0} mikrometraj</unitPattern>
-				<unitPattern count="few">{0} mikrometry</unitPattern>
-				<unitPattern count="other">{0} mikrometrow</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mile</displayName>
-				<unitPattern count="one">{0} mila</unitPattern>
-				<unitPattern count="two">{0} mili</unitPattern>
-				<unitPattern count="few">{0} mile</unitPattern>
-				<unitPattern count="other">{0} milow</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>milimetry</displayName>
-				<unitPattern count="one">{0} milimeter</unitPattern>
-				<unitPattern count="two">{0} milimetraj</unitPattern>
-				<unitPattern count="few">{0} milimetry</unitPattern>
-				<unitPattern count="other">{0} milimetrow</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<displayName>nanometry</displayName>
-				<unitPattern count="one">{0} nanometer</unitPattern>
-				<unitPattern count="two">{0} nanometraj</unitPattern>
-				<unitPattern count="few">{0} nanometry</unitPattern>
-				<unitPattern count="other">{0} nanometrow</unitPattern>
+			<unit type="length-astronomical-unit">
+				<displayName>astronomiske jednotki</displayName>
+				<unitPattern count="one">{0} astronomiska jednotka</unitPattern>
+				<unitPattern count="two">{0} astronomiskej jednotce</unitPattern>
+				<unitPattern count="few">{0} astronomiske jednotki</unitPattern>
+				<unitPattern count="other">{0} astronomiskich jednotkow</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
 				<displayName>nawtiske mile</displayName>
@@ -4956,27 +5037,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} nawtiske mile</unitPattern>
 				<unitPattern count="other">{0} nawtiskich milow</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<displayName>parsec</displayName>
-				<unitPattern count="one">{0} parsec</unitPattern>
-				<unitPattern count="two">{0} parsec</unitPattern>
-				<unitPattern count="few">{0} parsec</unitPattern>
-				<unitPattern count="other">{0} parsec</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName>pikometry</displayName>
-				<unitPattern count="one">{0} pikometer</unitPattern>
-				<unitPattern count="two">{0} pikometraj</unitPattern>
-				<unitPattern count="few">{0} pikometry</unitPattern>
-				<unitPattern count="other">{0} pikometrow</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<displayName>yardy</displayName>
-				<unitPattern count="one">{0} yard</unitPattern>
-				<unitPattern count="two">{0} yardaj</unitPattern>
-				<unitPattern count="few">{0} yardy</unitPattern>
-				<unitPattern count="other">{0} yardow</unitPattern>
-			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
@@ -4984,27 +5044,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} lux</unitPattern>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karaty</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="two">{0} karataj</unitPattern>
-				<unitPattern count="few">{0} karaty</unitPattern>
-				<unitPattern count="other">{0} karatow</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gramy</displayName>
-				<unitPattern count="one">{0} gram</unitPattern>
-				<unitPattern count="two">{0} gramaj</unitPattern>
-				<unitPattern count="few">{0} gramy</unitPattern>
-				<unitPattern count="other">{0} gramow</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogramy</displayName>
-				<unitPattern count="one">{0} kilogram</unitPattern>
-				<unitPattern count="two">{0} kilogramaj</unitPattern>
-				<unitPattern count="few">{0} kilogramy</unitPattern>
-				<unitPattern count="other">{0} kilogramow</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>tony</displayName>
 				<unitPattern count="one">{0} tona</unitPattern>
@@ -5012,12 +5051,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} tony</unitPattern>
 				<unitPattern count="other">{0} tonow</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mikrogramy</displayName>
-				<unitPattern count="one">{0} mikrogram</unitPattern>
-				<unitPattern count="two">{0} mikrogramaj</unitPattern>
-				<unitPattern count="few">{0} mikrogramy</unitPattern>
-				<unitPattern count="other">{0} mikrogramow</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogramy</displayName>
+				<unitPattern count="one">{0} kilogram</unitPattern>
+				<unitPattern count="two">{0} kilogramaj</unitPattern>
+				<unitPattern count="few">{0} kilogramy</unitPattern>
+				<unitPattern count="other">{0} kilogramow</unitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gramy</displayName>
+				<unitPattern count="one">{0} gram</unitPattern>
+				<unitPattern count="two">{0} gramaj</unitPattern>
+				<unitPattern count="few">{0} gramy</unitPattern>
+				<unitPattern count="other">{0} gramow</unitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>miligramy</displayName>
@@ -5026,6 +5072,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} miligramy</unitPattern>
 				<unitPattern count="other">{0} miligramow</unitPattern>
 			</unit>
+			<unit type="mass-microgram">
+				<displayName>mikrogramy</displayName>
+				<unitPattern count="one">{0} mikrogram</unitPattern>
+				<unitPattern count="two">{0} mikrogramaj</unitPattern>
+				<unitPattern count="few">{0} mikrogramy</unitPattern>
+				<unitPattern count="other">{0} mikrogramow</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>ameriske tony</displayName>
+				<unitPattern count="one">{0} ameriska tona</unitPattern>
+				<unitPattern count="two">{0} ameriskej tonje</unitPattern>
+				<unitPattern count="few">{0} ameriske tony</unitPattern>
+				<unitPattern count="other">{0} ameriskich tonow</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>punty</displayName>
+				<unitPattern count="one">{0} punt</unitPattern>
+				<unitPattern count="two">{0} puntaj</unitPattern>
+				<unitPattern count="few">{0} punty</unitPattern>
+				<unitPattern count="other">{0} puntow</unitPattern>
+			</unit>
 			<unit type="mass-ounce">
 				<displayName>uncy</displayName>
 				<unitPattern count="one">{0} unca</unitPattern>
@@ -5040,19 +5107,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} troyske uncy</unitPattern>
 				<unitPattern count="other">{0} troyskich uncow</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<displayName>punty</displayName>
-				<unitPattern count="one">{0} punt</unitPattern>
-				<unitPattern count="two">{0} puntaj</unitPattern>
-				<unitPattern count="few">{0} punty</unitPattern>
-				<unitPattern count="other">{0} puntow</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<displayName>ameriske tony</displayName>
-				<unitPattern count="one">{0} ameriska tona</unitPattern>
-				<unitPattern count="two">{0} ameriskej tonje</unitPattern>
-				<unitPattern count="few">{0} ameriske tony</unitPattern>
-				<unitPattern count="other">{0} ameriskich tonow</unitPattern>
+			<unit type="mass-carat">
+				<displayName>karaty</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="two">{0} karataj</unitPattern>
+				<unitPattern count="few">{0} karaty</unitPattern>
+				<unitPattern count="other">{0} karatow</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigawatty</displayName>
@@ -5061,12 +5121,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} gigawatty</unitPattern>
 				<unitPattern count="other">{0} gigawattow</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>konjace mocy</displayName>
-				<unitPattern count="one">{0} konjaca móc</unitPattern>
-				<unitPattern count="two">{0} konjacej mocy</unitPattern>
-				<unitPattern count="few">{0} konjace mocy</unitPattern>
-				<unitPattern count="other">{0} konjacych mocow</unitPattern>
+			<unit type="power-megawatt">
+				<displayName>megawatty</displayName>
+				<unitPattern count="one">{0} megawatt</unitPattern>
+				<unitPattern count="two">{0} megawattaj</unitPattern>
+				<unitPattern count="few">{0} megawatty</unitPattern>
+				<unitPattern count="other">{0} megawattow</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName>kilowatty</displayName>
@@ -5075,12 +5135,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kilowatty</unitPattern>
 				<unitPattern count="other">{0} kilowattow</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<displayName>megawatty</displayName>
-				<unitPattern count="one">{0} megawatt</unitPattern>
-				<unitPattern count="two">{0} megawattaj</unitPattern>
-				<unitPattern count="few">{0} megawatty</unitPattern>
-				<unitPattern count="other">{0} megawattow</unitPattern>
+			<unit type="power-watt">
+				<displayName>watty</displayName>
+				<unitPattern count="one">{0} watt</unitPattern>
+				<unitPattern count="two">{0} wattaj</unitPattern>
+				<unitPattern count="few">{0} watty</unitPattern>
+				<unitPattern count="other">{0} wattow</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<displayName>miliwatty</displayName>
@@ -5089,12 +5149,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} miliwatty</unitPattern>
 				<unitPattern count="other">{0} miliwattow</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName>watty</displayName>
-				<unitPattern count="one">{0} watt</unitPattern>
-				<unitPattern count="two">{0} wattaj</unitPattern>
-				<unitPattern count="few">{0} watty</unitPattern>
-				<unitPattern count="other">{0} wattow</unitPattern>
+			<unit type="power-horsepower">
+				<displayName>konjace mocy</displayName>
+				<unitPattern count="one">{0} konjaca móc</unitPattern>
+				<unitPattern count="two">{0} konjacej mocy</unitPattern>
+				<unitPattern count="few">{0} konjace mocy</unitPattern>
+				<unitPattern count="other">{0} konjacych mocow</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hektopascale</displayName>
@@ -5103,20 +5163,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} hektopascale</unitPattern>
 				<unitPattern count="other">{0} hektopascalow</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>cóle žiwoslěbroweho stołpika</displayName>
-				<unitPattern count="one">{0} cól žiwoslěbroweho stołpika</unitPattern>
-				<unitPattern count="two">{0} cólej žiwoslěbroweho stołpika</unitPattern>
-				<unitPattern count="few">{0} cóle žiwoslěbroweho stołpika</unitPattern>
-				<unitPattern count="other">{0} cólow žiwoslěbroweho stołpika</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>milibary</displayName>
-				<unitPattern count="one">{0} milibar</unitPattern>
-				<unitPattern count="two">{0} milibaraj</unitPattern>
-				<unitPattern count="few">{0} milibary</unitPattern>
-				<unitPattern count="other">{0} milibarow</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>milimetry žiwoslěbroweho stołpika</displayName>
 				<unitPattern count="one">{0} milimeter žiwoslěbroweho stołpika</unitPattern>
@@ -5131,12 +5177,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} punty na kwadratny cól</unitPattern>
 				<unitPattern count="other">{0} puntow na kwadratny cól</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karaty</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="two">{0} karataj</unitPattern>
-				<unitPattern count="few">{0} karaty</unitPattern>
-				<unitPattern count="other">{0} karatow</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>cóle žiwoslěbroweho stołpika</displayName>
+				<unitPattern count="one">{0} cól žiwoslěbroweho stołpika</unitPattern>
+				<unitPattern count="two">{0} cólej žiwoslěbroweho stołpika</unitPattern>
+				<unitPattern count="few">{0} cóle žiwoslěbroweho stołpika</unitPattern>
+				<unitPattern count="other">{0} cólow žiwoslěbroweho stołpika</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>milibary</displayName>
+				<unitPattern count="one">{0} milibar</unitPattern>
+				<unitPattern count="two">{0} milibaraj</unitPattern>
+				<unitPattern count="few">{0} milibary</unitPattern>
+				<unitPattern count="other">{0} milibarow</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometry na hodźinu</displayName>
@@ -5180,41 +5233,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} stopnje Kelvina</unitPattern>
 				<unitPattern count="other">{0} stopnjow Kelvina</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>acre-stopy</displayName>
-				<unitPattern count="one">{0} acre-stopa</unitPattern>
-				<unitPattern count="two">{0} acre-stopje</unitPattern>
-				<unitPattern count="few">{0} acre-stopy</unitPattern>
-				<unitPattern count="other">{0} acre-stopow</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>centilitry</displayName>
-				<unitPattern count="one">{0} centiliter</unitPattern>
-				<unitPattern count="two">{0} centilitraj</unitPattern>
-				<unitPattern count="few">{0} centilitry</unitPattern>
-				<unitPattern count="other">{0} centilitrow</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>kubikne centimetry</displayName>
-				<unitPattern count="one">{0} kubikny centimeter</unitPattern>
-				<unitPattern count="two">{0} kubiknej centimetraj</unitPattern>
-				<unitPattern count="few">{0} kubikne centimetry</unitPattern>
-				<unitPattern count="other">{0} kubiknych centimetrow</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>kubikne stopy</displayName>
-				<unitPattern count="one">{0} kubikna stopa</unitPattern>
-				<unitPattern count="two">{0} kubiknej stopje</unitPattern>
-				<unitPattern count="few">{0} kubikne stopy</unitPattern>
-				<unitPattern count="other">{0} kubiknych stopow</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>kubikne cóle</displayName>
-				<unitPattern count="one">{0} kubikny cól</unitPattern>
-				<unitPattern count="two">{0} kubiknej cólej</unitPattern>
-				<unitPattern count="few">{0} kubikne cóle</unitPattern>
-				<unitPattern count="other">{0} kubiknych cólow</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kubikne kilometry</displayName>
 				<unitPattern count="one">{0} kubikny kilometer</unitPattern>
@@ -5229,6 +5247,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kubikne metry</unitPattern>
 				<unitPattern count="other">{0} kubiknych metrow</unitPattern>
 			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>kubikne centimetry</displayName>
+				<unitPattern count="one">{0} kubikny centimeter</unitPattern>
+				<unitPattern count="two">{0} kubiknej centimetraj</unitPattern>
+				<unitPattern count="few">{0} kubikne centimetry</unitPattern>
+				<unitPattern count="other">{0} kubiknych centimetrow</unitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>kubikne mile</displayName>
 				<unitPattern count="one">{0} kubikna mila</unitPattern>
@@ -5243,33 +5268,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kubikne yardy</unitPattern>
 				<unitPattern count="other">{0} kubiknych yardow</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>šalki</displayName>
-				<unitPattern count="one">{0} šalka</unitPattern>
-				<unitPattern count="two">{0} šalce</unitPattern>
-				<unitPattern count="few">{0} šalki</unitPattern>
-				<unitPattern count="other">{0} šalkow</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>kubikne stopy</displayName>
+				<unitPattern count="one">{0} kubikna stopa</unitPattern>
+				<unitPattern count="two">{0} kubiknej stopje</unitPattern>
+				<unitPattern count="few">{0} kubikne stopy</unitPattern>
+				<unitPattern count="other">{0} kubiknych stopow</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>decilitry</displayName>
-				<unitPattern count="one">{0} deciliter</unitPattern>
-				<unitPattern count="two">{0} decilitraj</unitPattern>
-				<unitPattern count="few">{0} decilitry</unitPattern>
-				<unitPattern count="other">{0} decilitrow</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>kubikne cóle</displayName>
+				<unitPattern count="one">{0} kubikny cól</unitPattern>
+				<unitPattern count="two">{0} kubiknej cólej</unitPattern>
+				<unitPattern count="few">{0} kubikne cóle</unitPattern>
+				<unitPattern count="other">{0} kubiknych cólow</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>běžite uncy</displayName>
-				<unitPattern count="one">{0} běžita unca</unitPattern>
-				<unitPattern count="two">{0} běžitej uncy</unitPattern>
-				<unitPattern count="few">{0} běžite uncy</unitPattern>
-				<unitPattern count="other">{0} běžitych uncow</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>galony</displayName>
-				<unitPattern count="one">{0} galona</unitPattern>
-				<unitPattern count="two">{0} galonje</unitPattern>
-				<unitPattern count="few">{0} galony</unitPattern>
-				<unitPattern count="other">{0} galonow</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megalitry</displayName>
+				<unitPattern count="one">{0} megaliter</unitPattern>
+				<unitPattern count="two">{0} megalitraj</unitPattern>
+				<unitPattern count="few">{0} megalitry</unitPattern>
+				<unitPattern count="other">{0} megalitrow</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hektolitry</displayName>
@@ -5285,12 +5303,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} litry</unitPattern>
 				<unitPattern count="other">{0} litrow</unitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalitry</displayName>
-				<unitPattern count="one">{0} megaliter</unitPattern>
-				<unitPattern count="two">{0} megalitraj</unitPattern>
-				<unitPattern count="few">{0} megalitry</unitPattern>
-				<unitPattern count="other">{0} megalitrow</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>decilitry</displayName>
+				<unitPattern count="one">{0} deciliter</unitPattern>
+				<unitPattern count="two">{0} decilitraj</unitPattern>
+				<unitPattern count="few">{0} decilitry</unitPattern>
+				<unitPattern count="other">{0} decilitrow</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centilitry</displayName>
+				<unitPattern count="one">{0} centiliter</unitPattern>
+				<unitPattern count="two">{0} centilitraj</unitPattern>
+				<unitPattern count="few">{0} centilitry</unitPattern>
+				<unitPattern count="other">{0} centilitrow</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mililitry</displayName>
@@ -5299,12 +5324,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mililitry</unitPattern>
 				<unitPattern count="other">{0} mililitrow</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pinty</displayName>
-				<unitPattern count="one">{0} pint</unitPattern>
-				<unitPattern count="two">{0} pintaj</unitPattern>
-				<unitPattern count="few">{0} pinty</unitPattern>
-				<unitPattern count="other">{0} pintow</unitPattern>
+			<unit type="volume-acre-foot">
+				<displayName>acre-stopy</displayName>
+				<unitPattern count="one">{0} acre-stopa</unitPattern>
+				<unitPattern count="two">{0} acre-stopje</unitPattern>
+				<unitPattern count="few">{0} acre-stopy</unitPattern>
+				<unitPattern count="other">{0} acre-stopow</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galony</displayName>
+				<unitPattern count="one">{0} galona</unitPattern>
+				<unitPattern count="two">{0} galonje</unitPattern>
+				<unitPattern count="few">{0} galony</unitPattern>
+				<unitPattern count="other">{0} galonow</unitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>quarty</displayName>
@@ -5313,6 +5345,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} quarty</unitPattern>
 				<unitPattern count="other">{0} quartow</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pinty</displayName>
+				<unitPattern count="one">{0} pint</unitPattern>
+				<unitPattern count="two">{0} pintaj</unitPattern>
+				<unitPattern count="few">{0} pinty</unitPattern>
+				<unitPattern count="other">{0} pintow</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>šalki</displayName>
+				<unitPattern count="one">{0} šalka</unitPattern>
+				<unitPattern count="two">{0} šalce</unitPattern>
+				<unitPattern count="few">{0} šalki</unitPattern>
+				<unitPattern count="other">{0} šalkow</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>běžite uncy</displayName>
+				<unitPattern count="one">{0} běžita unca</unitPattern>
+				<unitPattern count="two">{0} běžitej uncy</unitPattern>
+				<unitPattern count="few">{0} běžite uncy</unitPattern>
+				<unitPattern count="other">{0} běžitych uncow</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>łžicy</displayName>
 				<unitPattern count="one">{0} łžica</unitPattern>
@@ -5343,6 +5396,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="two">{0} rad</unitPattern>
+				<unitPattern count="few">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0} °</unitPattern>
+				<unitPattern count="two">{0} °</unitPattern>
+				<unitPattern count="few">{0} °</unitPattern>
+				<unitPattern count="other">{0} °</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>′</displayName>
 				<unitPattern count="one">{0} ′</unitPattern>
@@ -5357,26 +5424,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ″</unitPattern>
 				<unitPattern count="other">{0} ″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>°</displayName>
-				<unitPattern count="one">{0} °</unitPattern>
-				<unitPattern count="two">{0} °</unitPattern>
-				<unitPattern count="few">{0} °</unitPattern>
-				<unitPattern count="other">{0} °</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="two">{0} rad</unitPattern>
-				<unitPattern count="few">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ac</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="two">{0} ac</unitPattern>
-				<unitPattern count="few">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="two">{0} km²</unitPattern>
+				<unitPattern count="few">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ha</displayName>
@@ -5385,6 +5438,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="two">{0} m²</unitPattern>
+				<unitPattern count="few">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
@@ -5392,6 +5452,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="two">{0} mi²</unitPattern>
+				<unitPattern count="few">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ac</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="two">{0} ac</unitPattern>
+				<unitPattern count="few">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="two">{0} yd²</unitPattern>
+				<unitPattern count="few">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<displayName>ft²</displayName>
 				<unitPattern count="one">{0} ft²</unitPattern>
@@ -5406,33 +5487,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="two">{0} km²</unitPattern>
-				<unitPattern count="few">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="two">{0} m²</unitPattern>
-				<unitPattern count="few">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="two">{0} mi²</unitPattern>
-				<unitPattern count="few">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="two">{0} yd²</unitPattern>
-				<unitPattern count="few">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="two">{0} kt</unitPattern>
+				<unitPattern count="few">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
@@ -5448,61 +5508,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="two">{0} bit</unitPattern>
-				<unitPattern count="few">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="two">{0} byte</unitPattern>
-				<unitPattern count="few">{0} byte</unitPattern>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="two">{0} Gb</unitPattern>
-				<unitPattern count="few">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="two">{0} GB</unitPattern>
-				<unitPattern count="few">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="two">{0} kb</unitPattern>
-				<unitPattern count="few">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="two">{0} kB</unitPattern>
-				<unitPattern count="few">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="two">{0} Mb</unitPattern>
-				<unitPattern count="few">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="two">{0} MB</unitPattern>
-				<unitPattern count="few">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>TB</displayName>
+				<unitPattern count="one">{0} TB</unitPattern>
+				<unitPattern count="two">{0} TB</unitPattern>
+				<unitPattern count="few">{0} TB</unitPattern>
+				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>Tb</displayName>
@@ -5511,12 +5522,82 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} Tb</unitPattern>
 				<unitPattern count="other">{0} Tb</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>TB</displayName>
-				<unitPattern count="one">{0} TB</unitPattern>
-				<unitPattern count="two">{0} TB</unitPattern>
-				<unitPattern count="few">{0} TB</unitPattern>
-				<unitPattern count="other">{0} TB</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="two">{0} GB</unitPattern>
+				<unitPattern count="few">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="two">{0} Gb</unitPattern>
+				<unitPattern count="few">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="two">{0} MB</unitPattern>
+				<unitPattern count="few">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="two">{0} Mb</unitPattern>
+				<unitPattern count="few">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="two">{0} kB</unitPattern>
+				<unitPattern count="few">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="two">{0} kb</unitPattern>
+				<unitPattern count="few">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="two">{0} byte</unitPattern>
+				<unitPattern count="few">{0} byte</unitPattern>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="two">{0} bit</unitPattern>
+				<unitPattern count="few">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>l.</displayName>
+				<unitPattern count="one">{0} l.</unitPattern>
+				<unitPattern count="two">{0} l.</unitPattern>
+				<unitPattern count="few">{0} l.</unitPattern>
+				<unitPattern count="other">{0} l.</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>měs.</displayName>
+				<unitPattern count="one">{0} měs.</unitPattern>
+				<unitPattern count="two">{0} měs.</unitPattern>
+				<unitPattern count="few">{0} měs.</unitPattern>
+				<unitPattern count="other">{0} měs.</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>tydź.</displayName>
+				<unitPattern count="one">{0} tydź.</unitPattern>
+				<unitPattern count="two">{0} tydź.</unitPattern>
+				<unitPattern count="few">{0} tydź.</unitPattern>
+				<unitPattern count="other">{0} tydź.</unitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>dny</displayName>
@@ -5533,20 +5614,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} hodź.</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="two">{0} μs</unitPattern>
-				<unitPattern count="few">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="two">{0} ms</unitPattern>
-				<unitPattern count="few">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min.</displayName>
 				<unitPattern count="one">{0} min.</unitPattern>
@@ -5554,20 +5621,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} min.</unitPattern>
 				<unitPattern count="other">{0} min.</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>měs.</displayName>
-				<unitPattern count="one">{0} měs.</unitPattern>
-				<unitPattern count="two">{0} měs.</unitPattern>
-				<unitPattern count="few">{0} měs.</unitPattern>
-				<unitPattern count="other">{0} měs.</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="two">{0} ns</unitPattern>
-				<unitPattern count="few">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>sek.</displayName>
 				<unitPattern count="one">{0} sek.</unitPattern>
@@ -5576,19 +5629,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} sek.</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>tydź.</displayName>
-				<unitPattern count="one">{0} tydź.</unitPattern>
-				<unitPattern count="two">{0} tydź.</unitPattern>
-				<unitPattern count="few">{0} tydź.</unitPattern>
-				<unitPattern count="other">{0} tydź.</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="two">{0} ms</unitPattern>
+				<unitPattern count="few">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>l.</displayName>
-				<unitPattern count="one">{0} l.</unitPattern>
-				<unitPattern count="two">{0} l.</unitPattern>
-				<unitPattern count="few">{0} l.</unitPattern>
-				<unitPattern count="other">{0} l.</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="two">{0} μs</unitPattern>
+				<unitPattern count="few">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="two">{0} ns</unitPattern>
+				<unitPattern count="few">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>A</displayName>
@@ -5618,6 +5678,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="two">{0} kcal</unitPattern>
+				<unitPattern count="few">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -5632,20 +5699,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kcal</unitPattern>
 				<unitPattern count="other">{0} kcal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>J</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="two">{0} J</unitPattern>
-				<unitPattern count="few">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="two">{0} kcal</unitPattern>
-				<unitPattern count="few">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
@@ -5653,6 +5706,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="two">{0} J</unitPattern>
+				<unitPattern count="few">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -5667,12 +5727,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="two">{0} Hz</unitPattern>
-				<unitPattern count="few">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="two">{0} MHz</unitPattern>
+				<unitPattern count="few">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
@@ -5681,19 +5741,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="two">{0} MHz</unitPattern>
-				<unitPattern count="few">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="two">{0} Hz</unitPattern>
+				<unitPattern count="few">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="two">{0} au</unitPattern>
-				<unitPattern count="few">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="two">{0} km</unitPattern>
+				<unitPattern count="few">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="two">{0} m</unitPattern>
+				<unitPattern count="few">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>dm</displayName>
+				<unitPattern count="one">{0} dm</unitPattern>
+				<unitPattern count="two">{0} dm</unitPattern>
+				<unitPattern count="few">{0} dm</unitPattern>
+				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
 				<displayName>cm</displayName>
@@ -5702,12 +5776,47 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} cm</unitPattern>
 				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
-			<unit type="length-decimeter">
-				<displayName>dm</displayName>
-				<unitPattern count="one">{0} dm</unitPattern>
-				<unitPattern count="two">{0} dm</unitPattern>
-				<unitPattern count="few">{0} dm</unitPattern>
-				<unitPattern count="other">{0} dm</unitPattern>
+			<unit type="length-millimeter">
+				<displayName>mm</displayName>
+				<unitPattern count="one">{0} mm</unitPattern>
+				<unitPattern count="two">{0} mm</unitPattern>
+				<unitPattern count="few">{0} mm</unitPattern>
+				<unitPattern count="other">{0} mm</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>μm</displayName>
+				<unitPattern count="one">{0} μm</unitPattern>
+				<unitPattern count="two">{0} μm</unitPattern>
+				<unitPattern count="few">{0} μm</unitPattern>
+				<unitPattern count="other">{0} μm</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nm</displayName>
+				<unitPattern count="one">{0} nm</unitPattern>
+				<unitPattern count="two">{0} nm</unitPattern>
+				<unitPattern count="few">{0} nm</unitPattern>
+				<unitPattern count="other">{0} nm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>pm</displayName>
+				<unitPattern count="one">{0} pm</unitPattern>
+				<unitPattern count="two">{0} pm</unitPattern>
+				<unitPattern count="few">{0} pm</unitPattern>
+				<unitPattern count="other">{0} pm</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="two">{0} mi</unitPattern>
+				<unitPattern count="few">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>yd</displayName>
+				<unitPattern count="one">{0} yd</unitPattern>
+				<unitPattern count="two">{0} yd</unitPattern>
+				<unitPattern count="few">{0} yd</unitPattern>
+				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
 			<unit type="length-foot">
 				<displayName>ft</displayName>
@@ -5723,12 +5832,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} in</unitPattern>
 				<unitPattern count="other">{0} in</unitPattern>
 			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="two">{0} km</unitPattern>
-				<unitPattern count="few">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="two">{0} pc</unitPattern>
+				<unitPattern count="few">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
 			</unit>
 			<unit type="length-light-year">
 				<displayName>ly</displayName>
@@ -5737,40 +5846,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ly</unitPattern>
 				<unitPattern count="other">{0} ly</unitPattern>
 			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="two">{0} m</unitPattern>
-				<unitPattern count="few">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>μm</displayName>
-				<unitPattern count="one">{0} μm</unitPattern>
-				<unitPattern count="two">{0} μm</unitPattern>
-				<unitPattern count="few">{0} μm</unitPattern>
-				<unitPattern count="other">{0} μm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mi</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="two">{0} mi</unitPattern>
-				<unitPattern count="few">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>mm</displayName>
-				<unitPattern count="one">{0} mm</unitPattern>
-				<unitPattern count="two">{0} mm</unitPattern>
-				<unitPattern count="few">{0} mm</unitPattern>
-				<unitPattern count="other">{0} mm</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<displayName>nm</displayName>
-				<unitPattern count="one">{0} nm</unitPattern>
-				<unitPattern count="two">{0} nm</unitPattern>
-				<unitPattern count="few">{0} nm</unitPattern>
-				<unitPattern count="other">{0} nm</unitPattern>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="two">{0} au</unitPattern>
+				<unitPattern count="few">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
 				<displayName>nmi</displayName>
@@ -5779,27 +5860,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} nmi</unitPattern>
 				<unitPattern count="other">{0} nmi</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="two">{0} pc</unitPattern>
-				<unitPattern count="few">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName>pm</displayName>
-				<unitPattern count="one">{0} pm</unitPattern>
-				<unitPattern count="two">{0} pm</unitPattern>
-				<unitPattern count="few">{0} pm</unitPattern>
-				<unitPattern count="other">{0} pm</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<displayName>yd</displayName>
-				<unitPattern count="one">{0} yd</unitPattern>
-				<unitPattern count="two">{0} yd</unitPattern>
-				<unitPattern count="few">{0} yd</unitPattern>
-				<unitPattern count="other">{0} yd</unitPattern>
-			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
@@ -5807,27 +5867,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>Kt</displayName>
-				<unitPattern count="one">{0} Kt</unitPattern>
-				<unitPattern count="two">{0} Kt</unitPattern>
-				<unitPattern count="few">{0} Kt</unitPattern>
-				<unitPattern count="other">{0} Kt</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="two">{0} g</unitPattern>
-				<unitPattern count="few">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="two">{0} kg</unitPattern>
-				<unitPattern count="few">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
@@ -5835,12 +5874,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="two">{0} µg</unitPattern>
-				<unitPattern count="few">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="two">{0} kg</unitPattern>
+				<unitPattern count="few">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="two">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
@@ -5849,6 +5895,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="two">{0} µg</unitPattern>
+				<unitPattern count="few">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>am.tony</displayName>
+				<unitPattern count="one">{0} tn</unitPattern>
+				<unitPattern count="two">{0} tn</unitPattern>
+				<unitPattern count="few">{0} tn</unitPattern>
+				<unitPattern count="other">{0} tn</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="two">{0} lb</unitPattern>
+				<unitPattern count="few">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+			</unit>
 			<unit type="mass-ounce">
 				<displayName>oz</displayName>
 				<unitPattern count="one">{0} oz</unitPattern>
@@ -5863,19 +5930,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} oz. tr.</unitPattern>
 				<unitPattern count="other">{0} oz. tr.</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="two">{0} lb</unitPattern>
-				<unitPattern count="few">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<displayName>am.tony</displayName>
-				<unitPattern count="one">{0} tn</unitPattern>
-				<unitPattern count="two">{0} tn</unitPattern>
-				<unitPattern count="few">{0} tn</unitPattern>
-				<unitPattern count="other">{0} tn</unitPattern>
+			<unit type="mass-carat">
+				<displayName>Kt</displayName>
+				<unitPattern count="one">{0} Kt</unitPattern>
+				<unitPattern count="two">{0} Kt</unitPattern>
+				<unitPattern count="few">{0} Kt</unitPattern>
+				<unitPattern count="other">{0} Kt</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
@@ -5884,12 +5944,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>PS</displayName>
-				<unitPattern count="one">{0} PS</unitPattern>
-				<unitPattern count="two">{0} PS</unitPattern>
-				<unitPattern count="few">{0} PS</unitPattern>
-				<unitPattern count="other">{0} PS</unitPattern>
+			<unit type="power-megawatt">
+				<displayName>MW</displayName>
+				<unitPattern count="one">{0} MW</unitPattern>
+				<unitPattern count="two">{0} MW</unitPattern>
+				<unitPattern count="few">{0} MW</unitPattern>
+				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName>kW</displayName>
@@ -5898,12 +5958,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kW</unitPattern>
 				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<displayName>MW</displayName>
-				<unitPattern count="one">{0} MW</unitPattern>
-				<unitPattern count="two">{0} MW</unitPattern>
-				<unitPattern count="few">{0} MW</unitPattern>
-				<unitPattern count="other">{0} MW</unitPattern>
+			<unit type="power-watt">
+				<displayName>W</displayName>
+				<unitPattern count="one">{0} W</unitPattern>
+				<unitPattern count="two">{0} W</unitPattern>
+				<unitPattern count="few">{0} W</unitPattern>
+				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<displayName>mW</displayName>
@@ -5912,12 +5972,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mW</unitPattern>
 				<unitPattern count="other">{0} mW</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName>W</displayName>
-				<unitPattern count="one">{0} W</unitPattern>
-				<unitPattern count="two">{0} W</unitPattern>
-				<unitPattern count="few">{0} W</unitPattern>
-				<unitPattern count="other">{0} W</unitPattern>
+			<unit type="power-horsepower">
+				<displayName>PS</displayName>
+				<unitPattern count="one">{0} PS</unitPattern>
+				<unitPattern count="two">{0} PS</unitPattern>
+				<unitPattern count="few">{0} PS</unitPattern>
+				<unitPattern count="other">{0} PS</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
@@ -5926,20 +5986,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="two">{0} inHg</unitPattern>
-				<unitPattern count="few">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="two">{0} mbar</unitPattern>
-				<unitPattern count="few">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -5954,12 +6000,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="two">{0} kt</unitPattern>
-				<unitPattern count="few">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="two">{0} inHg</unitPattern>
+				<unitPattern count="few">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="two">{0} mbar</unitPattern>
+				<unitPattern count="few">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -6003,41 +6056,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="two">{0} ac ft</unitPattern>
-				<unitPattern count="few">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="two">{0} cl</unitPattern>
-				<unitPattern count="few">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="two">{0} cm³</unitPattern>
-				<unitPattern count="few">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="two">{0} ft³</unitPattern>
-				<unitPattern count="few">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="two">{0} in³</unitPattern>
-				<unitPattern count="few">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -6052,6 +6070,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
 			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="two">{0} cm³</unitPattern>
+				<unitPattern count="few">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
 				<unitPattern count="one">{0} mi³</unitPattern>
@@ -6066,33 +6091,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>š.</displayName>
-				<unitPattern count="one">{0} š.</unitPattern>
-				<unitPattern count="two">{0} š.</unitPattern>
-				<unitPattern count="few">{0} š.</unitPattern>
-				<unitPattern count="other">{0} š.</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="two">{0} ft³</unitPattern>
+				<unitPattern count="few">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="two">{0} dl</unitPattern>
-				<unitPattern count="few">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="two">{0} in³</unitPattern>
+				<unitPattern count="few">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl. oz.</displayName>
-				<unitPattern count="one">{0} fl. oz.</unitPattern>
-				<unitPattern count="two">{0} fl. oz.</unitPattern>
-				<unitPattern count="few">{0} fl. oz.</unitPattern>
-				<unitPattern count="other">{0} fl. oz.</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="two">{0} gal</unitPattern>
-				<unitPattern count="few">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="two">{0} Ml</unitPattern>
+				<unitPattern count="few">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -6108,12 +6126,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="one">{0} Ml</unitPattern>
-				<unitPattern count="two">{0} Ml</unitPattern>
-				<unitPattern count="few">{0} Ml</unitPattern>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="two">{0} dl</unitPattern>
+				<unitPattern count="few">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="two">{0} cl</unitPattern>
+				<unitPattern count="few">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
@@ -6122,12 +6147,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="two">{0} pt</unitPattern>
-				<unitPattern count="few">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="two">{0} ac ft</unitPattern>
+				<unitPattern count="few">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="two">{0} gal</unitPattern>
+				<unitPattern count="few">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
@@ -6136,6 +6168,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="two">{0} pt</unitPattern>
+				<unitPattern count="few">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>š.</displayName>
+				<unitPattern count="one">{0} š.</unitPattern>
+				<unitPattern count="two">{0} š.</unitPattern>
+				<unitPattern count="few">{0} š.</unitPattern>
+				<unitPattern count="other">{0} š.</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl. oz.</displayName>
+				<unitPattern count="one">{0} fl. oz.</unitPattern>
+				<unitPattern count="two">{0} fl. oz.</unitPattern>
+				<unitPattern count="few">{0} fl. oz.</unitPattern>
+				<unitPattern count="other">{0} fl. oz.</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>łž.</displayName>
 				<unitPattern count="one">{0} łž.</unitPattern>
@@ -6158,6 +6211,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} G</unitPattern>
 				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="two">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="two">{0}′</unitPattern>
@@ -6170,17 +6229,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="two">{0}°</unitPattern>
-				<unitPattern count="few">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="two">{0} ac</unitPattern>
-				<unitPattern count="few">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="two">{0} km²</unitPattern>
+				<unitPattern count="few">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} ha</unitPattern>
@@ -6188,18 +6241,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="two">{0} ft²</unitPattern>
-				<unitPattern count="few">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="two">{0} km²</unitPattern>
-				<unitPattern count="few">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} m²</unitPattern>
 				<unitPattern count="two">{0} m²</unitPattern>
@@ -6212,6 +6253,39 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="two">{0} ac</unitPattern>
+				<unitPattern count="few">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="two">{0} ft²</unitPattern>
+				<unitPattern count="few">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>l.</displayName>
+				<unitPattern count="one">{0} l.</unitPattern>
+				<unitPattern count="two">{0} l.</unitPattern>
+				<unitPattern count="few">{0} l.</unitPattern>
+				<unitPattern count="other">{0} l.</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>měs.</displayName>
+				<unitPattern count="one">{0} měs.</unitPattern>
+				<unitPattern count="two">{0} měs.</unitPattern>
+				<unitPattern count="few">{0} měs.</unitPattern>
+				<unitPattern count="other">{0} měs.</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>t.</displayName>
+				<unitPattern count="one">{0} t.</unitPattern>
+				<unitPattern count="two">{0} t.</unitPattern>
+				<unitPattern count="few">{0} t.</unitPattern>
+				<unitPattern count="other">{0} t.</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>d</displayName>
 				<unitPattern count="one">{0} d</unitPattern>
@@ -6226,13 +6300,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} h</unitPattern>
 				<unitPattern count="other">{0} h</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="two">{0} ms</unitPattern>
-				<unitPattern count="few">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
@@ -6240,13 +6307,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>měs.</displayName>
-				<unitPattern count="one">{0} měs.</unitPattern>
-				<unitPattern count="two">{0} měs.</unitPattern>
-				<unitPattern count="few">{0} měs.</unitPattern>
-				<unitPattern count="other">{0} měs.</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>s</displayName>
 				<unitPattern count="one">{0} s</unitPattern>
@@ -6254,38 +6314,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} s</unitPattern>
 				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>t.</displayName>
-				<unitPattern count="one">{0} t.</unitPattern>
-				<unitPattern count="two">{0} t.</unitPattern>
-				<unitPattern count="few">{0} t.</unitPattern>
-				<unitPattern count="other">{0} t.</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>l.</displayName>
-				<unitPattern count="one">{0} l.</unitPattern>
-				<unitPattern count="two">{0} l.</unitPattern>
-				<unitPattern count="few">{0} l.</unitPattern>
-				<unitPattern count="other">{0} l.</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="two">{0} cm</unitPattern>
-				<unitPattern count="few">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="two">{0} ft</unitPattern>
-				<unitPattern count="few">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="two">{0} in</unitPattern>
-				<unitPattern count="few">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="two">{0} ms</unitPattern>
+				<unitPattern count="few">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
@@ -6294,12 +6328,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} km</unitPattern>
 				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} ly</unitPattern>
-				<unitPattern count="two">{0} ly</unitPattern>
-				<unitPattern count="few">{0} ly</unitPattern>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>m</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
@@ -6307,11 +6335,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="two">{0} mi</unitPattern>
-				<unitPattern count="few">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="two">{0} cm</unitPattern>
+				<unitPattern count="few">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -6326,18 +6355,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="two">{0} mi</unitPattern>
+				<unitPattern count="few">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="two">{0} yd</unitPattern>
 				<unitPattern count="few">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="two">{0} g</unitPattern>
-				<unitPattern count="few">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="two">{0} ft</unitPattern>
+				<unitPattern count="few">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="two">{0} in</unitPattern>
+				<unitPattern count="few">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="two">{0} ly</unitPattern>
+				<unitPattern count="few">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
@@ -6346,11 +6392,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="two">{0} oz</unitPattern>
-				<unitPattern count="few">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="two">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} lb</unitPattern>
@@ -6358,11 +6405,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} lb</unitPattern>
 				<unitPattern count="other">{0} lb</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} PS</unitPattern>
-				<unitPattern count="two">{0} PS</unitPattern>
-				<unitPattern count="few">{0} PS</unitPattern>
-				<unitPattern count="other">{0} PS</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="two">{0} oz</unitPattern>
+				<unitPattern count="few">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} kW</unitPattern>
@@ -6376,6 +6423,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} PS</unitPattern>
+				<unitPattern count="two">{0} PS</unitPattern>
+				<unitPattern count="few">{0} PS</unitPattern>
+				<unitPattern count="other">{0} PS</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="two">{0} hPa</unitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hsb_DE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hsb_DE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hsb_DE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hsb_DE.xml
index f12a0d6b076..337076e4cae 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hsb_DE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hsb_DE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10671 $"/>
-		<generation date="$Date: 2014-07-23 17:52:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="hsb"/>
 		<territory type="DE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hu.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hu.xml
similarity index 92%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hu.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hu.xml
index 3b2f9aca382..dd977f8a801 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hu.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hu.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="hu"/>
 	</identity>
 	<localeDisplayNames>
@@ -62,6 +61,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bez">bena</language>
 			<language type="bfd" draft="contributed">bafut</language>
 			<language type="bg">bolgár</language>
+			<language type="bgn">nyugati beludzs</language>
 			<language type="bho">bodzspuri</language>
 			<language type="bi">bislama</language>
 			<language type="bik">bikol</language>
@@ -289,6 +289,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">laoszi</language>
 			<language type="lol">mongó</language>
 			<language type="loz">lozi</language>
+			<language type="lrc">északi luri</language>
 			<language type="lt">litván</language>
 			<language type="lu">luba-katanga</language>
 			<language type="lua">luba-lulua</language>
@@ -337,12 +338,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="my">burmai</language>
 			<language type="mye" draft="contributed">myene</language>
 			<language type="myv">erzjány</language>
+			<language type="mzn">mázanderáni</language>
 			<language type="na">naurui</language>
 			<language type="nap">nápolyi</language>
 			<language type="naq">nama</language>
 			<language type="nb">norvég bokmal</language>
 			<language type="nd">északi ndebele</language>
 			<language type="nds">alsónémet</language>
+			<language type="nds_NL">alsószász</language>
 			<language type="ne">nepáli</language>
 			<language type="new">nevari</language>
 			<language type="ng">ndonga</language>
@@ -419,6 +422,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">szicíliai</language>
 			<language type="sco">skót</language>
 			<language type="sd">szindhi</language>
+			<language type="sdh">dél-kurd</language>
 			<language type="se">északi számi</language>
 			<language type="see" draft="contributed">szeneka</language>
 			<language type="seh">szena</language>
@@ -456,8 +460,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">sumér</language>
 			<language type="sv">svéd</language>
 			<language type="sw">szuahéli</language>
+			<language type="sw_CD">kongói szuahéli</language>
 			<language type="swb">comorei</language>
-			<language type="swc">kongói szuahéli</language>
 			<language type="syc">klasszikus szír</language>
 			<language type="syr">szíriai</language>
 			<language type="ta">tamil</language>
@@ -492,7 +496,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="twq">szavák</language>
 			<language type="ty">tahiti</language>
 			<language type="tyv">tuvai</language>
-			<language type="tzm" draft="contributed">közép-marokkói tamazigt</language>
+			<language type="tzm">közép-marokkói tamazigt</language>
 			<language type="udm">udmurt</language>
 			<language type="ug">ujgur</language>
 			<language type="uga">ugariti</language>
@@ -512,6 +516,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">valamo</language>
 			<language type="war">varaó</language>
 			<language type="was">vasó</language>
+			<language type="wbp">warlpiri</language>
 			<language type="wo">volof</language>
 			<language type="xal">kalmük</language>
 			<language type="xh">hosza</language>
@@ -577,7 +582,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Hani">Han</script>
 			<script type="Hano">Hanunoo</script>
 			<script type="Hans">Egyszerűsített</script>
-			<script type="Hans" alt="stand-alone">Egyszerűsített Han</script>
+			<script type="Hans" alt="stand-alone">Egyszerűsített kínai</script>
 			<script type="Hant">Hagyományos</script>
 			<script type="Hant" alt="stand-alone">Hagyományos kínai</script>
 			<script type="Hebr">Héber</script>
@@ -703,13 +708,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="419">Latin-Amerika</territory>
 			<territory type="AC">Ascension-sziget</territory>
 			<territory type="AD">Andorra</territory>
-			<territory type="AE">Egyesült Arab Emirátus</territory>
+			<territory type="AE">Egyesült Arab Emírségek</territory>
 			<territory type="AF">Afganisztán</territory>
 			<territory type="AG">Antigua és Barbuda</territory>
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albánia</territory>
 			<territory type="AM">Örményország</territory>
-			<territory type="AN">Holland Antillák</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antarktisz</territory>
 			<territory type="AR">Argentína</territory>
@@ -779,7 +783,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ET">Etiópia</territory>
 			<territory type="EU">Európai Unió</territory>
 			<territory type="FI">Finnország</territory>
-			<territory type="FJ">Fidzsi-szigetek</territory>
+			<territory type="FJ">Fidzsi</territory>
 			<territory type="FK">Falkland-szigetek</territory>
 			<territory type="FK" alt="variant">Falkland-szigetek (Malvin-szigetek)</territory>
 			<territory type="FM">Mikronézia</territory>
@@ -803,7 +807,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GS">Déli-Georgia és Déli-Sandwich-szigetek</territory>
 			<territory type="GT">Guatemala</territory>
 			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinea-Bissau</territory>
+			<territory type="GW">Bissau-Guinea</territory>
 			<territory type="GY">Guyana</territory>
 			<territory type="HK">Hongkong SAR Kína</territory>
 			<territory type="HK" alt="short">Hongkong</territory>
@@ -1041,6 +1045,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">Numerikus rendezés</key>
 			<key type="colStrength" draft="contributed">Rendezés erőssége</key>
 			<key type="currency">Pénznem</key>
+			<key type="hc">Óraformátum (12 – 24)</key>
+			<key type="lb">Sortörés stílusa</key>
+			<key type="ms">Mértékegységrendszer</key>
 			<key type="numbers">Számok</key>
 			<key type="timezone" draft="contributed">Időzóna</key>
 			<key type="va" draft="contributed">Földrajzi helyvariáns</key>
@@ -1048,95 +1055,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">Privát használatra</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Arab-indiai számjegyek</type>
-			<type type="arabext" key="numbers">Kibővített arab-indiai számjegyek</type>
-			<type type="armn" key="numbers">Örmény számok</type>
-			<type type="armnlow" key="numbers">Örmény kisbetűs számok</type>
-			<type type="beng" key="numbers">Bengáli számjegyek</type>
-			<type type="big5han" key="collation">Hagyományos kínai sorrend - Big5</type>
-			<type type="buddhist" key="calendar">Buddhista naptár</type>
-			<type type="chinese" key="calendar">Kínai naptár</type>
-			<type type="coptic" key="calendar">Kopt naptár</type>
-			<type type="dangi" key="calendar">Dangi naptár</type>
-			<type type="deva" key="numbers">Dévanágari számjegyek</type>
-			<type type="dictionary" key="collation">Szótári rendezési sorrend</type>
-			<type type="ducet" key="collation">Alapértelmezett Unicode rendezési sorrend</type>
-			<type type="ethi" key="numbers">Etióp számok</type>
-			<type type="ethiopic" key="calendar">Etióp naptár</type>
-			<type type="ethiopic-amete-alem" key="calendar">Etióp amete alem naptár</type>
-			<type type="finance" key="numbers" draft="contributed">Pénzügyi számok</type>
-			<type type="fullwide" key="numbers">Teljes szélességű számjegyek</type>
-			<type type="gb2312han" key="collation">Egyszerűsített kínai sorrend - GB2312</type>
-			<type type="geor" key="numbers">Grúz számok</type>
-			<type type="gregorian" key="calendar">Gergely-naptár</type>
-			<type type="grek" key="numbers">Görög számok</type>
-			<type type="greklow" key="numbers">Görög kisbetűs számok</type>
-			<type type="gujr" key="numbers">Gudzsaráti számjegyek</type>
-			<type type="guru" key="numbers">Gurmuki számjegyek</type>
-			<type type="hanidec" key="numbers">Kínai tizedes számok</type>
-			<type type="hans" key="numbers">Egyszerűsített kínai számok</type>
-			<type type="hansfin" key="numbers">Egyszerűsített kínai pénzügyi számok</type>
-			<type type="hant" key="numbers">Hagyományos kínai számok</type>
-			<type type="hantfin" key="numbers">Hagyományos kínai pénzügyi számok</type>
-			<type type="hebr" key="numbers">Héber számok</type>
-			<type type="hebrew" key="calendar">Héber naptár</type>
-			<type type="identical" key="colStrength" draft="contributed">Összes rendezése</type>
-			<type type="indian" key="calendar">Indiai nemzeti naptár</type>
-			<type type="islamic" key="calendar">Iszlám naptár</type>
-			<type type="islamic-civil" key="calendar">Iszlám civil naptár</type>
-			<type type="iso8601" key="calendar">ISO-8601 naptár</type>
-			<type type="japanese" key="calendar">Japán naptár</type>
-			<type type="jpan" key="numbers">Japán számok</type>
-			<type type="jpanfin" key="numbers">Japán pénzügyi számok</type>
-			<type type="khmr" key="numbers">Khmer számjegyek</type>
-			<type type="knda" key="numbers">Kannada számjegyek</type>
-			<type type="laoo" key="numbers">Lao számjegyek</type>
-			<type type="latn" key="numbers">Nyugati számjegyek</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">Kisbetűs szavak rendezése előre</type>
-			<type type="mlym" key="numbers">Malajálam számjegyek</type>
-			<type type="mong" key="numbers">Mongol számjegyek</type>
-			<type type="mymr" key="numbers">Mianmari számjegyek</type>
-			<type type="native" key="numbers" draft="contributed">Natív számjegyek</type>
-			<type type="no" key="colBackwards" draft="contributed">Ékezetek normál rendezése</type>
-			<type type="no" key="colCaseFirst" draft="contributed">Kisbetűs-nagybetűs szavak normál rendezése</type>
-			<type type="no" key="colCaseLevel" draft="contributed">Kis- és nagybetűket meg nem különböztető rendezés</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">Kanák rendezése külön</type>
-			<type type="no" key="colNormalization" draft="contributed">Rendezés normalizálás nélkül</type>
-			<type type="no" key="colNumeric" draft="contributed">Számjegyek egyedi rendezése</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">Szimbólumok rendezése</type>
-			<type type="orya" key="numbers">Orija számjegyek</type>
-			<type type="persian" key="calendar">Perzsa naptár</type>
-			<type type="phonebook" key="collation">Telefonkönyv sorrend</type>
-			<type type="phonetic" key="collation" draft="contributed">Fonetikus rendezési sorrend</type>
-			<type type="pinyin" key="collation">Pinyin sorrend</type>
-			<type type="primary" key="colStrength" draft="contributed">Csak az alapbetűk rendezése</type>
-			<type type="quaternary" key="colStrength" draft="contributed">Ékezetek/kisbetű-nagybetű/szélesség/kanák rendezése</type>
-			<type type="reformed" key="collation">Átalakított rendezési elv</type>
-			<type type="roc" key="calendar">Kínai köztársasági naptár</type>
-			<type type="roman" key="numbers">Római számok</type>
-			<type type="romanlow" key="numbers">Római kisbetűs számok</type>
-			<type type="search" key="collation">Általános célú keresés</type>
-			<type type="searchjl" key="collation" draft="contributed">Keresés hangul kezdő mássalhangzó szerint</type>
-			<type type="secondary" key="colStrength" draft="contributed">Ékezetek rendezése</type>
-			<type type="shifted" key="colAlternate" draft="contributed">Rendezés szimbólumok figyelmen kívül hagyásával</type>
-			<type type="standard" key="collation">Normál rendezési sorrend</type>
-			<type type="stroke" key="collation">Vonássorrend</type>
-			<type type="taml" key="numbers">Tamil hagyományos számok</type>
-			<type type="tamldec" key="numbers">Tamil számjegyek</type>
-			<type type="telu" key="numbers">Telugu számjegyek</type>
-			<type type="tertiary" key="colStrength" draft="contributed">Ékezetek/kisbetű-nagybetű/szélesség rendezése</type>
-			<type type="thai" key="numbers">Thai számjegyek</type>
-			<type type="tibt" key="numbers">Tibeti számjegyek</type>
-			<type type="traditional" key="collation">Hagyományos</type>
-			<type type="traditional" key="numbers" draft="contributed">Hagyományos számok</type>
-			<type type="unihan" key="collation">Szótővonás rendezési sorrend</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">Nagybetűs szavak rendezése előre</type>
-			<type type="vaii" key="numbers" draft="contributed">Vai számjegyek</type>
-			<type type="yes" key="colBackwards" draft="contributed">Ékezetek szerinti fordított rendezés</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">Rendezés kisbetű-nagybetű szerint</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">Kanák megkülönböztető rendezése</type>
-			<type type="yes" key="colNormalization" draft="contributed">Unicode szerinti normalizált rendezés</type>
-			<type type="yes" key="colNumeric" draft="contributed">Számjegyek numerikus rendezése</type>
+			<type key="calendar" type="buddhist">Buddhista naptár</type>
+			<type key="calendar" type="chinese">Kínai naptár</type>
+			<type key="calendar" type="coptic">Kopt naptár</type>
+			<type key="calendar" type="dangi">Dangi naptár</type>
+			<type key="calendar" type="ethiopic">Etióp naptár</type>
+			<type key="calendar" type="ethiopic-amete-alem">Etióp amete alem naptár</type>
+			<type key="calendar" type="gregorian">Gergely-naptár</type>
+			<type key="calendar" type="hebrew">Héber naptár</type>
+			<type key="calendar" type="indian">Indiai nemzeti naptár</type>
+			<type key="calendar" type="islamic">Iszlám naptár</type>
+			<type key="calendar" type="islamic-civil">Iszlám civil naptár</type>
+			<type key="calendar" type="iso8601">ISO-8601 naptár</type>
+			<type key="calendar" type="japanese">Japán naptár</type>
+			<type key="calendar" type="persian">Perzsa naptár</type>
+			<type key="calendar" type="roc">Kínai köztársasági naptár</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">Szimbólumok rendezése</type>
+			<type key="colAlternate" type="shifted" draft="contributed">Rendezés szimbólumok figyelmen kívül hagyásával</type>
+			<type key="colBackwards" type="no" draft="contributed">Ékezetek normál rendezése</type>
+			<type key="colBackwards" type="yes" draft="contributed">Ékezetek szerinti fordított rendezés</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">Kisbetűs szavak rendezése előre</type>
+			<type key="colCaseFirst" type="no" draft="contributed">Kisbetűs-nagybetűs szavak normál rendezése</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">Nagybetűs szavak rendezése előre</type>
+			<type key="colCaseLevel" type="no" draft="contributed">Kis- és nagybetűket meg nem különböztető rendezés</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">Rendezés kisbetű-nagybetű szerint</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">Kanák rendezése külön</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">Kanák megkülönböztető rendezése</type>
+			<type key="collation" type="big5han">Hagyományos kínai sorrend - Big5</type>
+			<type key="collation" type="dictionary">Szótári rendezési sorrend</type>
+			<type key="collation" type="ducet">Alapértelmezett Unicode rendezési sorrend</type>
+			<type key="collation" type="gb2312han">Egyszerűsített kínai sorrend - GB2312</type>
+			<type key="collation" type="phonebook">Telefonkönyv sorrend</type>
+			<type key="collation" type="phonetic" draft="contributed">Fonetikus rendezési sorrend</type>
+			<type key="collation" type="pinyin">Pinyin sorrend</type>
+			<type key="collation" type="reformed">Átalakított rendezési elv</type>
+			<type key="collation" type="search">Általános célú keresés</type>
+			<type key="collation" type="searchjl" draft="contributed">Keresés hangul kezdő mássalhangzó szerint</type>
+			<type key="collation" type="standard">Normál rendezési sorrend</type>
+			<type key="collation" type="stroke">Vonássorrend</type>
+			<type key="collation" type="traditional">Hagyományos</type>
+			<type key="collation" type="unihan">Szótővonás rendezési sorrend</type>
+			<type key="colNormalization" type="no" draft="contributed">Rendezés normalizálás nélkül</type>
+			<type key="colNormalization" type="yes" draft="contributed">Unicode szerinti normalizált rendezés</type>
+			<type key="colNumeric" type="no" draft="contributed">Számjegyek egyedi rendezése</type>
+			<type key="colNumeric" type="yes" draft="contributed">Számjegyek numerikus rendezése</type>
+			<type key="colStrength" type="identical" draft="contributed">Összes rendezése</type>
+			<type key="colStrength" type="primary" draft="contributed">Csak az alapbetűk rendezése</type>
+			<type key="colStrength" type="quaternary" draft="contributed">Ékezetek/kisbetű-nagybetű/szélesség/kanák rendezése</type>
+			<type key="colStrength" type="secondary" draft="contributed">Ékezetek rendezése</type>
+			<type key="colStrength" type="tertiary" draft="contributed">Ékezetek/kisbetű-nagybetű/szélesség rendezése</type>
+			<type key="hc" type="h11">12 órás rendszer (0–11)</type>
+			<type key="hc" type="h12">12 órás rendszer (0–12)</type>
+			<type key="hc" type="h23">24 órás rendszer (0–23)</type>
+			<type key="hc" type="h24">24 órás rendszer (0–24)</type>
+			<type key="lb" type="loose">Tág stílusú sortörés</type>
+			<type key="lb" type="normal">Normál stílusú sortörés</type>
+			<type key="lb" type="strict">Szűk stílusú sortörés</type>
+			<type key="ms" type="metric">Méterrendszer</type>
+			<type key="ms" type="uksystem">Angolszász mértékegységrendszer</type>
+			<type key="ms" type="ussystem">Amerikai mértékegységrendszer</type>
+			<type key="numbers" type="arab">Arab-indiai számjegyek</type>
+			<type key="numbers" type="arabext">Kibővített arab-indiai számjegyek</type>
+			<type key="numbers" type="armn">Örmény számok</type>
+			<type key="numbers" type="armnlow">Örmény kisbetűs számok</type>
+			<type key="numbers" type="beng">Bengáli számjegyek</type>
+			<type key="numbers" type="deva">Dévanágari számjegyek</type>
+			<type key="numbers" type="ethi">Etióp számok</type>
+			<type key="numbers" type="finance" draft="contributed">Pénzügyi számok</type>
+			<type key="numbers" type="fullwide">Teljes szélességű számjegyek</type>
+			<type key="numbers" type="geor">Grúz számok</type>
+			<type key="numbers" type="grek">Görög számok</type>
+			<type key="numbers" type="greklow">Görög kisbetűs számok</type>
+			<type key="numbers" type="gujr">Gudzsaráti számjegyek</type>
+			<type key="numbers" type="guru">Gurmuki számjegyek</type>
+			<type key="numbers" type="hanidec">Kínai tizedes számok</type>
+			<type key="numbers" type="hans">Egyszerűsített kínai számok</type>
+			<type key="numbers" type="hansfin">Egyszerűsített kínai pénzügyi számok</type>
+			<type key="numbers" type="hant">Hagyományos kínai számok</type>
+			<type key="numbers" type="hantfin">Hagyományos kínai pénzügyi számok</type>
+			<type key="numbers" type="hebr">Héber számok</type>
+			<type key="numbers" type="jpan">Japán számok</type>
+			<type key="numbers" type="jpanfin">Japán pénzügyi számok</type>
+			<type key="numbers" type="khmr">Khmer számjegyek</type>
+			<type key="numbers" type="knda">Kannada számjegyek</type>
+			<type key="numbers" type="laoo">Lao számjegyek</type>
+			<type key="numbers" type="latn">Nyugati számjegyek</type>
+			<type key="numbers" type="mlym">Malajálam számjegyek</type>
+			<type key="numbers" type="mong">Mongol számjegyek</type>
+			<type key="numbers" type="mymr">Mianmari számjegyek</type>
+			<type key="numbers" type="native" draft="contributed">Natív számjegyek</type>
+			<type key="numbers" type="orya">Orija számjegyek</type>
+			<type key="numbers" type="roman">Római számok</type>
+			<type key="numbers" type="romanlow">Római kisbetűs számok</type>
+			<type key="numbers" type="taml">Tamil hagyományos számok</type>
+			<type key="numbers" type="tamldec">Tamil számjegyek</type>
+			<type key="numbers" type="telu">Telugu számjegyek</type>
+			<type key="numbers" type="thai">Thai számjegyek</type>
+			<type key="numbers" type="tibt">Tibeti számjegyek</type>
+			<type key="numbers" type="traditional" draft="contributed">Hagyományos számok</type>
+			<type key="numbers" type="vaii" draft="contributed">Vai számjegyek</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">BGN</transformName>
@@ -1435,6 +1452,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d., E</dateFormatItem>
 						<dateFormatItem id="Gy">G y.</dateFormatItem>
 						<dateFormatItem id="GyMMM">G y. MMM</dateFormatItem>
@@ -1776,15 +1794,79 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">éjfél</dayPeriod>
 							<dayPeriod type="am">de.</dayPeriod>
 							<dayPeriod type="noon">dél</dayPeriod>
 							<dayPeriod type="pm">du.</dayPeriod>
+							<dayPeriod type="morning1">reggel</dayPeriod>
+							<dayPeriod type="morning2">reggel</dayPeriod>
+							<dayPeriod type="afternoon1">délután</dayPeriod>
+							<dayPeriod type="evening1">este</dayPeriod>
+							<dayPeriod type="night1">éjszaka</dayPeriod>
+							<dayPeriod type="night2">éjszaka</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">éjfél</dayPeriod>
+							<dayPeriod type="am">de.</dayPeriod>
+							<dayPeriod type="noon">dél</dayPeriod>
+							<dayPeriod type="pm">du.</dayPeriod>
+							<dayPeriod type="morning1">reggel</dayPeriod>
+							<dayPeriod type="morning2">reggel</dayPeriod>
+							<dayPeriod type="afternoon1">délután</dayPeriod>
+							<dayPeriod type="evening1">délután</dayPeriod>
+							<dayPeriod type="night1">éjszaka</dayPeriod>
+							<dayPeriod type="night2">éjszaka</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">éjfél</dayPeriod>
 							<dayPeriod type="am">de.</dayPeriod>
 							<dayPeriod type="noon">dél</dayPeriod>
 							<dayPeriod type="pm">du.</dayPeriod>
+							<dayPeriod type="morning1">reggel</dayPeriod>
+							<dayPeriod type="morning2">reggel</dayPeriod>
+							<dayPeriod type="afternoon1">délután</dayPeriod>
+							<dayPeriod type="evening1">este</dayPeriod>
+							<dayPeriod type="night1">éjszaka</dayPeriod>
+							<dayPeriod type="night2">éjszaka</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">éjfél</dayPeriod>
+							<dayPeriod type="am">de.</dayPeriod>
+							<dayPeriod type="noon">dél</dayPeriod>
+							<dayPeriod type="pm">du.</dayPeriod>
+							<dayPeriod type="morning1">reggel</dayPeriod>
+							<dayPeriod type="morning2">délelőtt</dayPeriod>
+							<dayPeriod type="afternoon1">délután</dayPeriod>
+							<dayPeriod type="evening1">este</dayPeriod>
+							<dayPeriod type="night1">éjjel</dayPeriod>
+							<dayPeriod type="night2">hajnal</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">éjfél</dayPeriod>
+							<dayPeriod type="am">de.</dayPeriod>
+							<dayPeriod type="noon">dél</dayPeriod>
+							<dayPeriod type="pm">du.</dayPeriod>
+							<dayPeriod type="morning1">reggel</dayPeriod>
+							<dayPeriod type="morning2">délelőtt</dayPeriod>
+							<dayPeriod type="afternoon1">délután</dayPeriod>
+							<dayPeriod type="evening1">este</dayPeriod>
+							<dayPeriod type="night1">éjjel</dayPeriod>
+							<dayPeriod type="night2">hajnal</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">éjfél</dayPeriod>
+							<dayPeriod type="am">de.</dayPeriod>
+							<dayPeriod type="noon">dél</dayPeriod>
+							<dayPeriod type="pm">du.</dayPeriod>
+							<dayPeriod type="morning1">reggel</dayPeriod>
+							<dayPeriod type="morning2">délelőtt</dayPeriod>
+							<dayPeriod type="afternoon1">délután</dayPeriod>
+							<dayPeriod type="evening1">este</dayPeriod>
+							<dayPeriod type="night1">éjjel</dayPeriod>
+							<dayPeriod type="night2">hajnal</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1887,6 +1969,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">H:mm</dateFormatItem>
 						<dateFormatItem id="hms">a h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">M. d.</dateFormatItem>
 						<dateFormatItem id="MEd">M. d., E</dateFormatItem>
@@ -2152,18 +2238,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<months>
 					<monthContext type="format">
 						<monthWidth type="abbreviated">
-							<month type="1" draft="contributed">Moh.</month>
-							<month type="2" draft="contributed">Saf.</month>
-							<month type="3" draft="contributed">Rébi I</month>
-							<month type="4" draft="contributed">Rébi II</month>
-							<month type="5" draft="contributed">Dsem. I</month>
-							<month type="6" draft="contributed">Dsem. II</month>
-							<month type="7" draft="contributed">Red.</month>
-							<month type="8" draft="contributed">Sab.</month>
-							<month type="9" draft="contributed">Ram.</month>
-							<month type="10" draft="contributed">Sev.</month>
-							<month type="11" draft="contributed">Dsül k.</month>
-							<month type="12" draft="contributed">Dsül h.</month>
+							<month type="1">Moh.</month>
+							<month type="2">Saf.</month>
+							<month type="3">Réb. 1</month>
+							<month type="4">Réb. 2</month>
+							<month type="5">Dsem. I</month>
+							<month type="6">Dsem. II</month>
+							<month type="7">Red.</month>
+							<month type="8">Sab.</month>
+							<month type="9">Ram.</month>
+							<month type="10">Sev.</month>
+							<month type="11">Dsül k.</month>
+							<month type="12">Dsül h.</month>
 						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">Moharrem</month>
@@ -2218,9 +2304,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</eras>
 			</calendar>
 			<calendar type="japanese">
-				<!-- need some non-empty element here to make inheritance work,
-					 this copy of generic dateFormats above is smaller than root japanese eras
-				-->
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
@@ -2336,6 +2419,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>év</displayName>
+				<relative type="-1">előző év</relative>
+				<relative type="0">ez az év</relative>
+				<relative type="1">következő év</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} év múlva</relativeTimePattern>
 					<relativeTimePattern count="other">{0} év múlva</relativeTimePattern>
@@ -2347,6 +2433,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>év</displayName>
+				<relative type="-1">előző év</relative>
+				<relative type="0">ez az év</relative>
+				<relative type="1">következő év</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} év múlva</relativeTimePattern>
 					<relativeTimePattern count="other">{0} év múlva</relativeTimePattern>
@@ -2358,6 +2447,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter">
 				<displayName>negyedév</displayName>
+				<relative type="-1">előző negyedév</relative>
+				<relative type="0">ez a negyedév</relative>
+				<relative type="1">következő negyedév</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} negyedév múlva</relativeTimePattern>
 					<relativeTimePattern count="other">{0} negyedév múlva</relativeTimePattern>
@@ -2369,6 +2461,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>negyedév</displayName>
+				<relative type="-1">előző negyedév</relative>
+				<relative type="0">ez a negyedév</relative>
+				<relative type="1">következő negyedév</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} negyedév múlva</relativeTimePattern>
 					<relativeTimePattern count="other">{0} negyedév múlva</relativeTimePattern>
@@ -2380,6 +2475,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>negyedév</displayName>
+				<relative type="-1">előző negyedév</relative>
+				<relative type="0">ez a negyedév</relative>
+				<relative type="1">következő negyedév</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} negyedév múlva</relativeTimePattern>
 					<relativeTimePattern count="other">{0} negyedév múlva</relativeTimePattern>
@@ -2405,6 +2503,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>hónap</displayName>
+				<relative type="-1">előző hónap</relative>
+				<relative type="0">ez a hónap</relative>
+				<relative type="1">következő hónap</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} hónap múlva</relativeTimePattern>
 					<relativeTimePattern count="other">{0} hónap múlva</relativeTimePattern>
@@ -2416,6 +2517,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>hónap</displayName>
+				<relative type="-1">előző hónap</relative>
+				<relative type="0">ez a hónap</relative>
+				<relative type="1">következő hónap</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} hónap múlva</relativeTimePattern>
 					<relativeTimePattern count="other">{0} hónap múlva</relativeTimePattern>
@@ -2441,6 +2545,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>hét</displayName>
+				<relative type="-1">előző hét</relative>
+				<relative type="0">ez a hét</relative>
+				<relative type="1">következő hét</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} hét múlva</relativeTimePattern>
 					<relativeTimePattern count="other">{0} hét múlva</relativeTimePattern>
@@ -2452,6 +2559,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>hét</displayName>
+				<relative type="-1">előző hét</relative>
+				<relative type="0">ez a hét</relative>
+				<relative type="1">következő hét</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} hét múlva</relativeTimePattern>
 					<relativeTimePattern count="other">{0} hét múlva</relativeTimePattern>
@@ -2479,6 +2589,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>nap</displayName>
+				<relative type="-2">tegnapelőtt</relative>
+				<relative type="-1">tegnap</relative>
+				<relative type="0">ma</relative>
+				<relative type="1">holnap</relative>
+				<relative type="2">holnapután</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} nap múlva</relativeTimePattern>
 					<relativeTimePattern count="other">{0} nap múlva</relativeTimePattern>
@@ -2490,6 +2605,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>nap</displayName>
+				<relative type="-2">tegnapelőtt</relative>
+				<relative type="-1">tegnap</relative>
+				<relative type="0">ma</relative>
+				<relative type="1">holnap</relative>
+				<relative type="2">holnapután</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} nap múlva</relativeTimePattern>
 					<relativeTimePattern count="other">{0} nap múlva</relativeTimePattern>
@@ -3589,6 +3709,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity draft="contributed">Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
 			</zone>
@@ -3673,6 +3796,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkutszk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Csita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Jakutszk</exemplarCity>
 			</zone>
@@ -3691,6 +3817,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadán</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Szrednekolimszk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamcsatka</exemplarCity>
 			</zone>
@@ -4062,9 +4191,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic draft="contributed">apiai idő</generic>
-					<standard draft="contributed">apiai téli idő</standard>
-					<daylight draft="contributed">apiai nyári idő</daylight>
+					<generic>apiai idő</generic>
+					<standard>apiai téli idő</standard>
+					<daylight>apiai nyári idő</daylight>
 				</long>
 			</metazone>
 			<metazone type="Aqtau">
@@ -4311,7 +4440,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
 				<long>
-					<standard>kalinyingrádi idő</standard>
+					<standard>minszki idő</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
@@ -5045,7 +5174,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern draft="contributed">#,##0.00 ¤</pattern>
+					<pattern>#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">0 E ¤</pattern>
+					<pattern type="1000" count="other">0 E ¤</pattern>
+					<pattern type="10000" count="one">00 E ¤</pattern>
+					<pattern type="10000" count="other">00 E ¤</pattern>
+					<pattern type="100000" count="one">000 E ¤</pattern>
+					<pattern type="100000" count="other">000 E ¤</pattern>
+					<pattern type="1000000" count="one">0 M ¤</pattern>
+					<pattern type="1000000" count="other">0 M ¤</pattern>
+					<pattern type="10000000" count="one">00 M ¤</pattern>
+					<pattern type="10000000" count="other">00 M ¤</pattern>
+					<pattern type="100000000" count="one">000 M ¤</pattern>
+					<pattern type="100000000" count="other">000 M ¤</pattern>
+					<pattern type="1000000000" count="one">0 Mrd ¤</pattern>
+					<pattern type="1000000000" count="other">0 Mrd ¤</pattern>
+					<pattern type="10000000000" count="one">00 Mrd ¤</pattern>
+					<pattern type="10000000000" count="other">00 Mrd ¤</pattern>
+					<pattern type="100000000000" count="one">000 Mrd ¤</pattern>
+					<pattern type="100000000000" count="other">000 Mrd ¤</pattern>
+					<pattern type="1000000000000" count="one">0 B ¤</pattern>
+					<pattern type="1000000000000" count="other">0 B ¤</pattern>
+					<pattern type="10000000000000" count="one">00 B ¤</pattern>
+					<pattern type="10000000000000" count="other">00 B ¤</pattern>
+					<pattern type="100000000000000" count="one">000 B ¤</pattern>
+					<pattern type="100000000000000" count="other">000 B ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
@@ -5097,6 +5254,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">angolai kwanza</displayName>
 				<displayName count="other">angolai kwanza</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>Angolai kwanza (1977–1990)</displayName>
@@ -5169,6 +5327,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">bosznia-hercegovinai konvertibilis márka</displayName>
 				<displayName count="other">bosznia-hercegovinai konvertibilis márka</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>barbadosi dollár</displayName>
@@ -5241,6 +5400,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">bolíviai boliviano</displayName>
 				<displayName count="other">bolíviai boliviano</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOP">
 				<displayName>Bolíviai peso</displayName>
@@ -5305,6 +5465,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">botswanai pula</displayName>
 				<displayName count="other">botswanai pula</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>Fehérorosz új rubel (1994–1999)</displayName>
@@ -5393,6 +5554,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">kubai konvertibilis peso</displayName>
 				<displayName count="other">kubai konvertibilis peso</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>kubai peso</displayName>
@@ -5415,6 +5577,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">cseh korona</displayName>
 				<displayName count="other">cseh korona</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>Kelet-Német márka</displayName>
@@ -5433,6 +5596,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dán korona</displayName>
 				<displayName count="other">dán korona</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>dominikai peso</displayName>
@@ -5461,6 +5625,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">egyiptomi font</displayName>
 				<displayName count="other">egyiptomi font</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>eritreai nakfa</displayName>
@@ -5505,6 +5670,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">falkland-szigeteki font</displayName>
 				<displayName count="other">falkland-szigeteki font</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>Francia frank</displayName>
@@ -5524,6 +5690,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">grúz lari</displayName>
 				<displayName count="other">grúz lari</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>Ghánai cedi (1979–2007)</displayName>
@@ -5552,6 +5719,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">guineai frank</displayName>
 				<displayName count="other">guineai frank</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>Guineai syli</displayName>
@@ -5569,6 +5737,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">guatemalai quetzal</displayName>
 				<displayName count="other">guatemalai quetzal</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>Portugál guinea escudo</displayName>
@@ -5595,6 +5764,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">hodurasi lempira</displayName>
 				<displayName count="other">hodurasi lempira</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>Horvát dínár</displayName>
@@ -5604,6 +5774,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">horvát kuna</displayName>
 				<displayName count="other">horvát kuna</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>haiti gourde</displayName>
@@ -5615,13 +5786,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>magyar forint</displayName>
 				<displayName count="one">magyar forint</displayName>
 				<displayName count="other">magyar forint</displayName>
-				<symbol>HUF</symbol>
+				<symbol>Ft</symbol>
+				<symbol alt="narrow">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>indonéz rúpia</displayName>
 				<displayName count="one">indonéz rúpia</displayName>
 				<displayName count="other">indonéz rúpia</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>Ír font</displayName>
@@ -5660,6 +5833,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">izlandi korona</displayName>
 				<displayName count="other">izlandi korona</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>Olasz líra</displayName>
@@ -5708,12 +5882,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">comorei frank</displayName>
 				<displayName count="other">comorei frank</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>észak-koreai won</displayName>
 				<displayName count="one">észak-koreai won</displayName>
 				<displayName count="other">észak-koreai won</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>dél-koreai won</displayName>
@@ -5754,12 +5930,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">libanoni font</displayName>
 				<displayName count="other">libanoni font</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>Srí Lanka-i rúpia</displayName>
 				<displayName count="one">Srí Lanka-i rúpia</displayName>
 				<displayName count="other">Srí Lanka-i rúpia</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>libériai dollár</displayName>
@@ -5824,6 +6002,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">madagaszkári ariary</displayName>
 				<displayName count="other">madagaszkári ariary</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>Madagaszkári frank</displayName>
@@ -5842,6 +6021,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">mianmari kyat</displayName>
 				<displayName count="other">mianmari kyat</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>mongóliai tugrik</displayName>
@@ -5873,6 +6053,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">mauritiusi rúpia</displayName>
 				<displayName count="other">mauritiusi rúpia</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>maldív-szigeteki rufiyaa</displayName>
@@ -5904,6 +6085,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">malajziai ringgit</displayName>
 				<displayName count="other">malajziai ringgit</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>Mozambik escudo</displayName>
@@ -5939,6 +6121,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">nicaraguai córdoba</displayName>
 				<displayName count="other">nicaraguai córdoba</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>Holland forint</displayName>
@@ -5948,12 +6131,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">norvég korona</displayName>
 				<displayName count="other">norvég korona</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>nepáli rúpia</displayName>
 				<displayName count="one">nepáli rúpia</displayName>
 				<displayName count="other">nepáli rúpia</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>új-zélandi dollár</displayName>
@@ -6004,12 +6189,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">pakisztáni rúpia</displayName>
 				<displayName count="other">pakisztáni rúpia</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>lengyel zloty</displayName>
 				<displayName count="one">lengyel zloty</displayName>
 				<displayName count="other">lengyel zloty</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>Lengyel zloty (1950–1995)</displayName>
@@ -6057,6 +6244,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">orosz rubel</displayName>
 				<displayName count="other">orosz rubel</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>orosz rubel (1991–1998)</displayName>
@@ -6068,6 +6256,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ruandai frank</displayName>
 				<displayName count="other">ruandai frank</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>szaúdi riyal</displayName>
@@ -6109,6 +6298,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">svéd korona</displayName>
 				<displayName count="other">svéd korona</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>szingapúri dollár</displayName>
@@ -6122,6 +6312,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Szent Ilona-i font</displayName>
 				<displayName count="other">Szent Ilona-i font</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>Szlovén tolar</displayName>
@@ -6163,6 +6354,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">São Tomé és Príncipe-i dobra</displayName>
 				<displayName count="other">São Tomé és Príncipe-i dobra</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>Szovjet rubel</displayName>
@@ -6175,6 +6367,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">szíriai font</displayName>
 				<displayName count="other">szíriai font</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>szváziföldi lilangeni</displayName>
@@ -6187,6 +6380,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">thai baht</displayName>
 				<displayName count="other">thai baht</displayName>
 				<symbol>THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>Tádzsikisztáni rubel</displayName>
@@ -6219,6 +6413,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">tongai paanga</displayName>
 				<displayName count="other">tongai paanga</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>Timori escudo</displayName>
@@ -6234,6 +6429,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">török líra</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Trinidad és Tobago-i dollár</displayName>
@@ -6322,6 +6518,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">venezuelai bolivar</displayName>
 				<displayName count="other">venezuelai bolivar</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>vietnami dong</displayName>
@@ -6379,6 +6576,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">kelet-karibi dollár</displayName>
 				<displayName count="other">kelet-karibi dollár</displayName>
 				<symbol>XCD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>Special Drawing Rights</displayName>
@@ -6453,6 +6651,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dél-afrikai rand</displayName>
 				<displayName count="other">dél-afrikai rand</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>Zambiai kwacha (1968–2012)</displayName>
@@ -6463,6 +6662,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">zambiai kwacha</displayName>
 				<displayName count="other">zambiai kwacha</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>Zairei új zaire</displayName>
@@ -6495,15 +6695,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<compoundUnitPattern>{0} per {1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
-				<displayName>G gyorsulás</displayName>
-				<unitPattern count="one">{0} G gyorsulás</unitPattern>
-				<unitPattern count="other">{0} G gyorsulás</unitPattern>
+				<displayName>g gyorsulás</displayName>
+				<unitPattern count="one">{0} g gyorsulás</unitPattern>
+				<unitPattern count="other">{0} g gyorsulás</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
 				<displayName>méter per másodpercnégyzet</displayName>
 				<unitPattern count="one">{0} méter per másodpercnégyzet</unitPattern>
 				<unitPattern count="other">{0} méter per másodpercnégyzet</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>fordulat</displayName>
+				<unitPattern count="one">{0} fordulat</unitPattern>
+				<unitPattern count="other">{0} fordulat</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radián</displayName>
+				<unitPattern count="one">{0} radián</unitPattern>
+				<unitPattern count="other">{0} radián</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>fok</displayName>
+				<unitPattern count="one">{0} fok</unitPattern>
+				<unitPattern count="other">{0} fok</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>ívperc</displayName>
 				<unitPattern count="one">{0} ívperc</unitPattern>
@@ -6514,30 +6729,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ívmásodperc</unitPattern>
 				<unitPattern count="other">{0} ívmásodperc</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>fok</displayName>
-				<unitPattern count="one">{0} fok</unitPattern>
-				<unitPattern count="other">{0} fok</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radián</displayName>
-				<unitPattern count="one">{0} radián</unitPattern>
-				<unitPattern count="other">{0} radián</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>hold</displayName>
-				<unitPattern count="one">{0} hold</unitPattern>
-				<unitPattern count="other">{0} hold</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>négyzetkilométer</displayName>
+				<unitPattern count="one">{0} négyzetkilométer</unitPattern>
+				<unitPattern count="other">{0} négyzetkilométer</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektár</displayName>
 				<unitPattern count="one">{0} hektár</unitPattern>
 				<unitPattern count="other">{0} hektár</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>négyzetméter</displayName>
+				<unitPattern count="one">{0} négyzetméter</unitPattern>
+				<unitPattern count="other">{0} négyzetméter</unitPattern>
+				<perUnitPattern>{0}/négyzetméter</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>négyzetcentiméter</displayName>
 				<unitPattern count="one">{0} négyzetcentiméter</unitPattern>
 				<unitPattern count="other">{0} négyzetcentiméter</unitPattern>
+				<perUnitPattern>{0}/négyzetcentiméter</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>négyzetmérföld</displayName>
+				<unitPattern count="one">{0} négyzetmérföld</unitPattern>
+				<unitPattern count="other">{0} négyzetmérföld</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>hold</displayName>
+				<unitPattern count="one">{0} hold</unitPattern>
+				<unitPattern count="other">{0} hold</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>négyzetyard</displayName>
+				<unitPattern count="one">{0} négyzetyard</unitPattern>
+				<unitPattern count="other">{0} négyzetyard</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>négyzetláb</displayName>
@@ -6548,91 +6775,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>négyzethüvelyk</displayName>
 				<unitPattern count="one">{0} négyzethüvelyk</unitPattern>
 				<unitPattern count="other">{0} négyzethüvelyk</unitPattern>
+				<perUnitPattern>{0}/négyzethüvelyk</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>négyzetkilométer</displayName>
-				<unitPattern count="one">{0} négyzetkilométer</unitPattern>
-				<unitPattern count="other">{0} négyzetkilométer</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>négyzetméter</displayName>
-				<unitPattern count="one">{0} négyzetméter</unitPattern>
-				<unitPattern count="other">{0} négyzetméter</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>négyzetmérföld</displayName>
-				<unitPattern count="one">{0} négyzetmérföld</unitPattern>
-				<unitPattern count="other">{0} négyzetmérföld</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>négyzetyard</displayName>
-				<unitPattern count="one">{0} négyzetyard</unitPattern>
-				<unitPattern count="other">{0} négyzetyard</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karát</displayName>
+				<unitPattern count="one">{0} karát</unitPattern>
+				<unitPattern count="other">{0} karát</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liter per kilométer</displayName>
 				<unitPattern count="one">{0} liter per kilométer</unitPattern>
 				<unitPattern count="other">{0} liter per kilométer</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>liter/100 km</displayName>
+				<unitPattern count="one">{0} liter/100 km</unitPattern>
+				<unitPattern count="other">{0} liter/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mérföld per gallon</displayName>
 				<unitPattern count="one">{0} mérföld per gallon</unitPattern>
 				<unitPattern count="other">{0} mérföld per gallon</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bájt</displayName>
-				<unitPattern count="one">{0} bájt</unitPattern>
-				<unitPattern count="other">{0} bájt</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabit</displayName>
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="other">{0} gigabit</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabájt</displayName>
-				<unitPattern count="one">{0} gigabájt</unitPattern>
-				<unitPattern count="other">{0} gigabájt</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobit</displayName>
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="other">{0} kilobit</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobájt</displayName>
-				<unitPattern count="one">{0} kilobájt</unitPattern>
-				<unitPattern count="other">{0} kilobájt</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabit</displayName>
-				<unitPattern count="one">{0} megabit</unitPattern>
-				<unitPattern count="other">{0} megabit</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabájt</displayName>
-				<unitPattern count="one">{0} megabájt</unitPattern>
-				<unitPattern count="other">{0} megabájt</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabit</displayName>
-				<unitPattern count="one">{0} terabit</unitPattern>
-				<unitPattern count="other">{0} terabit</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabájt</displayName>
 				<unitPattern count="one">{0} terabájt</unitPattern>
 				<unitPattern count="other">{0} terabájt</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabit</displayName>
+				<unitPattern count="one">{0} terabit</unitPattern>
+				<unitPattern count="other">{0} terabit</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabájt</displayName>
+				<unitPattern count="one">{0} gigabájt</unitPattern>
+				<unitPattern count="other">{0} gigabájt</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabit</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="other">{0} gigabit</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabájt</displayName>
+				<unitPattern count="one">{0} megabájt</unitPattern>
+				<unitPattern count="other">{0} megabájt</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabit</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="other">{0} megabit</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobájt</displayName>
+				<unitPattern count="one">{0} kilobájt</unitPattern>
+				<unitPattern count="other">{0} kilobájt</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobit</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="other">{0} kilobit</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bájt</displayName>
+				<unitPattern count="one">{0} bájt</unitPattern>
+				<unitPattern count="other">{0} bájt</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>évszázad</displayName>
+				<unitPattern count="one">{0} évszázad</unitPattern>
+				<unitPattern count="other">{0} évszázad</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>év</displayName>
+				<unitPattern count="one">{0} év</unitPattern>
+				<unitPattern count="other">{0} év</unitPattern>
+				<perUnitPattern>{0}/év</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>hónap</displayName>
+				<unitPattern count="one">{0} hónap</unitPattern>
+				<unitPattern count="other">{0} hónap</unitPattern>
+				<perUnitPattern>{0}/hónap</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>hét</displayName>
+				<unitPattern count="one">{0} hét</unitPattern>
+				<unitPattern count="other">{0} hét</unitPattern>
+				<perUnitPattern>{0}/hét</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>nap</displayName>
 				<unitPattern count="one">{0} nap</unitPattern>
 				<unitPattern count="other">{0} nap</unitPattern>
+				<perUnitPattern>{0}/nap</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>óra</displayName>
@@ -6640,30 +6882,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} óra</unitPattern>
 				<perUnitPattern>{0}/óra</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikroszekundum</displayName>
-				<unitPattern count="one">{0} mikroszekundum</unitPattern>
-				<unitPattern count="other">{0} mikroszekundum</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ezredmásodperc</displayName>
-				<unitPattern count="one">{0} ezredmásodperc</unitPattern>
-				<unitPattern count="other">{0} ezredmásodperc</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>perc</displayName>
 				<unitPattern count="one">{0} perc</unitPattern>
 				<unitPattern count="other">{0} perc</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>hónap</displayName>
-				<unitPattern count="one">{0} hónap</unitPattern>
-				<unitPattern count="other">{0} hónap</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanoszekundum</displayName>
-				<unitPattern count="one">{0} nanoszekundum</unitPattern>
-				<unitPattern count="other">{0} nanoszekundum</unitPattern>
+				<perUnitPattern>{0}/perc</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>másodperc</displayName>
@@ -6671,15 +6894,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} másodperc</unitPattern>
 				<perUnitPattern>{0}/másodperc</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>hét</displayName>
-				<unitPattern count="one">{0} hét</unitPattern>
-				<unitPattern count="other">{0} hét</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ezredmásodperc</displayName>
+				<unitPattern count="one">{0} ezredmásodperc</unitPattern>
+				<unitPattern count="other">{0} ezredmásodperc</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>év</displayName>
-				<unitPattern count="one">{0} év</unitPattern>
-				<unitPattern count="other">{0} év</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>mikroszekundum</displayName>
+				<unitPattern count="one">{0} mikroszekundum</unitPattern>
+				<unitPattern count="other">{0} mikroszekundum</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanoszekundum</displayName>
+				<unitPattern count="one">{0} nanoszekundum</unitPattern>
+				<unitPattern count="other">{0} nanoszekundum</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amper</displayName>
@@ -6701,6 +6929,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} volt</unitPattern>
 				<unitPattern count="other">{0} volt</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokalória</displayName>
+				<unitPattern count="one">{0} kilokalória</unitPattern>
+				<unitPattern count="other">{0} kilokalória</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kalória</displayName>
 				<unitPattern count="one">{0} kalória</unitPattern>
@@ -6711,21 +6944,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kalória</unitPattern>
 				<unitPattern count="other">{0} kalória</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="one">{0} joule</unitPattern>
-				<unitPattern count="other">{0} joule</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokalória</displayName>
-				<unitPattern count="one">{0} kilokalória</unitPattern>
-				<unitPattern count="other">{0} kilokalória</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojoule</displayName>
 				<unitPattern count="one">{0} kilojoule</unitPattern>
 				<unitPattern count="other">{0} kilojoule</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="one">{0} joule</unitPattern>
+				<unitPattern count="other">{0} joule</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilowattóra</displayName>
 				<unitPattern count="one">{0} kilowattóra</unitPattern>
@@ -6736,201 +6964,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} gigahertz</unitPattern>
 				<unitPattern count="other">{0} gigahertz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hertz</displayName>
-				<unitPattern count="one">{0} hertz</unitPattern>
-				<unitPattern count="other">{0} hertz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megahertz</displayName>
+				<unitPattern count="one">{0} megahertz</unitPattern>
+				<unitPattern count="other">{0} megahertz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kilohertz</displayName>
 				<unitPattern count="one">{0} kilohertz</unitPattern>
 				<unitPattern count="other">{0} kilohertz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megahertz</displayName>
-				<unitPattern count="one">{0} megahertz</unitPattern>
-				<unitPattern count="other">{0} megahertz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hertz</displayName>
+				<unitPattern count="one">{0} hertz</unitPattern>
+				<unitPattern count="other">{0} hertz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>csillagászati egység</displayName>
-				<unitPattern count="one">{0} csillagászati egység</unitPattern>
-				<unitPattern count="other">{0} csillagászati egység</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilométer</displayName>
+				<unitPattern count="one">{0} kilométer</unitPattern>
+				<unitPattern count="other">{0} kilométer</unitPattern>
+				<perUnitPattern>{0}/kilométer</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>centiméter</displayName>
-				<unitPattern count="one">{0} centiméter</unitPattern>
-				<unitPattern count="other">{0} centiméter</unitPattern>
+			<unit type="length-meter">
+				<displayName>méter</displayName>
+				<unitPattern count="one">{0} méter</unitPattern>
+				<unitPattern count="other">{0} méter</unitPattern>
+				<perUnitPattern>{0}/méter</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>deciméter</displayName>
 				<unitPattern count="one">{0} deciméter</unitPattern>
 				<unitPattern count="other">{0} deciméter</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>láb</displayName>
-				<unitPattern count="one">{0} láb</unitPattern>
-				<unitPattern count="other">{0} láb</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>hüvelyk</displayName>
-				<unitPattern count="one">{0} hüvelyk</unitPattern>
-				<unitPattern count="other">{0} hüvelyk</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilométer</displayName>
-				<unitPattern count="one">{0} kilométer</unitPattern>
-				<unitPattern count="other">{0} kilométer</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>fényév</displayName>
-				<unitPattern count="one">{0} fényév</unitPattern>
-				<unitPattern count="other">{0} fényév</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>méter</displayName>
-				<unitPattern count="one">{0} méter</unitPattern>
-				<unitPattern count="other">{0} méter</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>mikrométer</displayName>
-				<unitPattern count="one">{0} mikrométer</unitPattern>
-				<unitPattern count="other">{0} mikrométer</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mérföld</displayName>
-				<unitPattern count="one">{0} mérföld</unitPattern>
-				<unitPattern count="other">{0} mérföld</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>centiméter</displayName>
+				<unitPattern count="one">{0} centiméter</unitPattern>
+				<unitPattern count="other">{0} centiméter</unitPattern>
+				<perUnitPattern>{0}/centimeter</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>milliméter</displayName>
 				<unitPattern count="one">{0} milliméter</unitPattern>
 				<unitPattern count="other">{0} milliméter</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikrométer</displayName>
+				<unitPattern count="one">{0} mikrométer</unitPattern>
+				<unitPattern count="other">{0} mikrométer</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanométer</displayName>
 				<unitPattern count="one">{0} nanométer</unitPattern>
 				<unitPattern count="other">{0} nanométer</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>tengeri mérföld</displayName>
-				<unitPattern count="one">{0} tengeri mérföld</unitPattern>
-				<unitPattern count="other">{0} tengeri mérföld</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parszek</displayName>
-				<unitPattern count="one">{0} parszek</unitPattern>
-				<unitPattern count="other">{0} parszek</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pikométer</displayName>
 				<unitPattern count="one">{0} pikométer</unitPattern>
 				<unitPattern count="other">{0} pikométer</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mérföld</displayName>
+				<unitPattern count="one">{0} mérföld</unitPattern>
+				<unitPattern count="other">{0} mérföld</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yard</displayName>
 				<unitPattern count="one">{0} yard</unitPattern>
 				<unitPattern count="other">{0} yard</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>láb</displayName>
+				<unitPattern count="one">{0} láb</unitPattern>
+				<unitPattern count="other">{0} láb</unitPattern>
+				<perUnitPattern>{0}/láb</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>hüvelyk</displayName>
+				<unitPattern count="one">{0} hüvelyk</unitPattern>
+				<unitPattern count="other">{0} hüvelyk</unitPattern>
+				<perUnitPattern>{0}/hüvelyk</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parszek</displayName>
+				<unitPattern count="one">{0} parszek</unitPattern>
+				<unitPattern count="other">{0} parszek</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>fényév</displayName>
+				<unitPattern count="one">{0} fényév</unitPattern>
+				<unitPattern count="other">{0} fényév</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>csillagászati egység</displayName>
+				<unitPattern count="one">{0} csillagászati egység</unitPattern>
+				<unitPattern count="other">{0} csillagászati egység</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>tengeri mérföld</displayName>
+				<unitPattern count="one">{0} tengeri mérföld</unitPattern>
+				<unitPattern count="other">{0} tengeri mérföld</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>svéd mérföld</displayName>
+				<unitPattern count="one">{0} svéd mérföld</unitPattern>
+				<unitPattern count="other">{0} svéd mérföld</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karát</displayName>
-				<unitPattern count="one">{0} karát</unitPattern>
-				<unitPattern count="other">{0} karát</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gramm</displayName>
-				<unitPattern count="one">{0} gramm</unitPattern>
-				<unitPattern count="other">{0} gramm</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogramm</displayName>
-				<unitPattern count="one">{0} kilogramm</unitPattern>
-				<unitPattern count="other">{0} kilogramm</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>metrikus tonna</displayName>
 				<unitPattern count="one">{0} metrikus tonna</unitPattern>
 				<unitPattern count="other">{0} metrikus tonna</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mikrogramm</displayName>
-				<unitPattern count="one">{0} mikrogramm</unitPattern>
-				<unitPattern count="other">{0} mikrogramm</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogramm</displayName>
+				<unitPattern count="one">{0} kilogramm</unitPattern>
+				<unitPattern count="other">{0} kilogramm</unitPattern>
+				<perUnitPattern>{0}/kilogramm</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gramm</displayName>
+				<unitPattern count="one">{0} gramm</unitPattern>
+				<unitPattern count="other">{0} gramm</unitPattern>
+				<perUnitPattern>{0}/gramm</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>milligramm</displayName>
 				<unitPattern count="one">{0} milligramm</unitPattern>
 				<unitPattern count="other">{0} milligramm</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>uncia</displayName>
-				<unitPattern count="one">{0} uncia</unitPattern>
-				<unitPattern count="other">{0} uncia</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>troy uncia</displayName>
-				<unitPattern count="one">{0} troy uncia</unitPattern>
-				<unitPattern count="other">{0} troy uncia</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>font</displayName>
-				<unitPattern count="one">{0} font</unitPattern>
-				<unitPattern count="other">{0} font</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>mikrogramm</displayName>
+				<unitPattern count="one">{0} mikrogramm</unitPattern>
+				<unitPattern count="other">{0} mikrogramm</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tonna</displayName>
 				<unitPattern count="one">{0} tonna</unitPattern>
 				<unitPattern count="other">{0} tonna</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>font</displayName>
+				<unitPattern count="one">{0} font</unitPattern>
+				<unitPattern count="other">{0} font</unitPattern>
+				<perUnitPattern>{0}/font</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>uncia</displayName>
+				<unitPattern count="one">{0} uncia</unitPattern>
+				<unitPattern count="other">{0} uncia</unitPattern>
+				<perUnitPattern>{0}/uncia</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>troy uncia</displayName>
+				<unitPattern count="one">{0} troy uncia</unitPattern>
+				<unitPattern count="other">{0} troy uncia</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karát</displayName>
+				<unitPattern count="one">{0} karát</unitPattern>
+				<unitPattern count="other">{0} karát</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigawatt</displayName>
 				<unitPattern count="one">{0} gigawatt</unitPattern>
 				<unitPattern count="other">{0} gigawatt</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>lóerő</displayName>
-				<unitPattern count="one">{0} lóerő</unitPattern>
-				<unitPattern count="other">{0} lóerő</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilowatt</displayName>
-				<unitPattern count="one">{0} kilowatt</unitPattern>
-				<unitPattern count="other">{0} kilowatt</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>megawatt</displayName>
 				<unitPattern count="one">{0} megawatt</unitPattern>
 				<unitPattern count="other">{0} megawatt</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>milliwatt</displayName>
-				<unitPattern count="one">{0} milliwatt</unitPattern>
-				<unitPattern count="other">{0} milliwatt</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilowatt</displayName>
+				<unitPattern count="one">{0} kilowatt</unitPattern>
+				<unitPattern count="other">{0} kilowatt</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watt</displayName>
 				<unitPattern count="one">{0} watt</unitPattern>
 				<unitPattern count="other">{0} watt</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>milliwatt</displayName>
+				<unitPattern count="one">{0} milliwatt</unitPattern>
+				<unitPattern count="other">{0} milliwatt</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>lóerő</displayName>
+				<unitPattern count="one">{0} lóerő</unitPattern>
+				<unitPattern count="other">{0} lóerő</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hektopascal</displayName>
 				<unitPattern count="one">{0} hektopascal</unitPattern>
 				<unitPattern count="other">{0} hektopascal</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>higanyhüvelyk</displayName>
-				<unitPattern count="one">{0} higanyhüvelyk</unitPattern>
-				<unitPattern count="other">{0} higanyhüvelyk</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>millibar</displayName>
-				<unitPattern count="one">{0} millibar</unitPattern>
-				<unitPattern count="other">{0} millibar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} higanymilliméter</unitPattern>
@@ -6941,10 +7173,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} font per négyzethüvelyk</unitPattern>
 				<unitPattern count="other">{0} font per négyzethüvelyk</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karát</displayName>
-				<unitPattern count="one">{0} karát</unitPattern>
-				<unitPattern count="other">{0} karát</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>higanyhüvelyk</displayName>
+				<unitPattern count="one">{0} higanyhüvelyk</unitPattern>
+				<unitPattern count="other">{0} higanyhüvelyk</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>millibar</displayName>
+				<unitPattern count="one">{0} millibar</unitPattern>
+				<unitPattern count="other">{0} millibar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilométer per óra</displayName>
@@ -6961,6 +7198,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mérföld per óra</unitPattern>
 				<unitPattern count="other">{0} mérföld per óra</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>csomó</displayName>
+				<unitPattern count="one">{0} csomó</unitPattern>
+				<unitPattern count="other">{0} csomó</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>Celsius-fok</displayName>
 				<unitPattern count="one">{0} Celsius-fok</unitPattern>
@@ -6976,31 +7223,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kelvin</unitPattern>
 				<unitPattern count="other">{0} kelvin</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>hold-láb</displayName>
-				<unitPattern count="one">{0} hold-láb</unitPattern>
-				<unitPattern count="other">{0} hold-láb</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>centiliter</displayName>
-				<unitPattern count="one">{0} centiliter</unitPattern>
-				<unitPattern count="other">{0} centiliter</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>köbcentiméter</displayName>
-				<unitPattern count="one">{0} köbcentiméter</unitPattern>
-				<unitPattern count="other">{0} köbcentiméter</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>köbláb</displayName>
-				<unitPattern count="one">{0} köbláb</unitPattern>
-				<unitPattern count="other">{0} köbláb</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>köbhüvelyk</displayName>
-				<unitPattern count="one">{0} köbhüvelyk</unitPattern>
-				<unitPattern count="other">{0} köbhüvelyk</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>köbkilométer</displayName>
 				<unitPattern count="one">{0} köbkilométer</unitPattern>
@@ -7010,6 +7232,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>köbméter</displayName>
 				<unitPattern count="one">{0} köbméter</unitPattern>
 				<unitPattern count="other">{0} köbméter</unitPattern>
+				<perUnitPattern>{0}/köbméter</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>köbcentiméter</displayName>
+				<unitPattern count="one">{0} köbcentiméter</unitPattern>
+				<unitPattern count="other">{0} köbcentiméter</unitPattern>
+				<perUnitPattern>{0}/köbcentiméter</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>köbmérföld</displayName>
@@ -7021,25 +7250,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} köbyard</unitPattern>
 				<unitPattern count="other">{0} köbyard</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>csésze</displayName>
-				<unitPattern count="one">{0} csésze</unitPattern>
-				<unitPattern count="other">{0} csésze</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>köbláb</displayName>
+				<unitPattern count="one">{0} köbláb</unitPattern>
+				<unitPattern count="other">{0} köbláb</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>deciliter</displayName>
-				<unitPattern count="one">{0} deciliter</unitPattern>
-				<unitPattern count="other">{0} deciliter</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>köbhüvelyk</displayName>
+				<unitPattern count="one">{0} köbhüvelyk</unitPattern>
+				<unitPattern count="other">{0} köbhüvelyk</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>folyadékuncia</displayName>
-				<unitPattern count="one">{0} folyadékuncia</unitPattern>
-				<unitPattern count="other">{0} folyadékuncia</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gallon</displayName>
-				<unitPattern count="one">{0} gallon</unitPattern>
-				<unitPattern count="other">{0} gallon</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megaliter</displayName>
+				<unitPattern count="one">{0} megaliter</unitPattern>
+				<unitPattern count="other">{0} megaliter</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hektoliter</displayName>
@@ -7050,27 +7274,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>liter</displayName>
 				<unitPattern count="one">{0} liter</unitPattern>
 				<unitPattern count="other">{0} liter</unitPattern>
+				<perUnitPattern>{0}/liter</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megaliter</displayName>
-				<unitPattern count="one">{0} megaliter</unitPattern>
-				<unitPattern count="other">{0} megaliter</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>deciliter</displayName>
+				<unitPattern count="one">{0} deciliter</unitPattern>
+				<unitPattern count="other">{0} deciliter</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centiliter</displayName>
+				<unitPattern count="one">{0} centiliter</unitPattern>
+				<unitPattern count="other">{0} centiliter</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>milliliter</displayName>
 				<unitPattern count="one">{0} milliliter</unitPattern>
 				<unitPattern count="other">{0} milliliter</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pint</displayName>
-				<unitPattern count="one">{0} pint</unitPattern>
-				<unitPattern count="other">{0} pint</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>metrikus pint</displayName>
+				<unitPattern count="one">{0} metrikus pint</unitPattern>
+				<unitPattern count="other">{0} metrikus pint</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>bögre</displayName>
+				<unitPattern count="one">{0} bögre</unitPattern>
+				<unitPattern count="other">{0} bögre</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>hold-láb</displayName>
+				<unitPattern count="one">{0} hold-láb</unitPattern>
+				<unitPattern count="other">{0} hold-láb</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gallon</displayName>
+				<unitPattern count="one">{0} gallon</unitPattern>
+				<unitPattern count="other">{0} gallon</unitPattern>
+				<perUnitPattern>{0}/gallon</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>quart</displayName>
 				<unitPattern count="one">{0} quart</unitPattern>
 				<unitPattern count="other">{0} quart</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pint</displayName>
+				<unitPattern count="one">{0} pint</unitPattern>
+				<unitPattern count="other">{0} pint</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>csésze</displayName>
+				<unitPattern count="one">{0} csésze</unitPattern>
+				<unitPattern count="other">{0} csésze</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>folyadékuncia</displayName>
+				<unitPattern count="one">{0} folyadékuncia</unitPattern>
+				<unitPattern count="other">{0} folyadékuncia</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>evőkanál</displayName>
 				<unitPattern count="one">{0} evőkanál</unitPattern>
@@ -7081,13 +7342,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kávéskanál</unitPattern>
 				<unitPattern count="other">{0} kávéskanál</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} K</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} É</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} D</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} Ny</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
 				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
-				<displayName>G gyorsulás</displayName>
+				<displayName>g gyorsulás</displayName>
 				<unitPattern count="one">{0} G</unitPattern>
 				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
@@ -7096,6 +7363,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>ford.</displayName>
+				<unitPattern count="one">{0} ford.</unitPattern>
+				<unitPattern count="other">{0} ford.</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>fok</displayName>
+				<unitPattern count="one">{0} fok</unitPattern>
+				<unitPattern count="other">{0} fok</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>ívperc</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
@@ -7106,30 +7388,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>fok</displayName>
-				<unitPattern count="one">{0} fok</unitPattern>
-				<unitPattern count="other">{0} fok</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>kh</displayName>
-				<unitPattern count="one">{0} kh</unitPattern>
-				<unitPattern count="other">{0} kh</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ha</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mf²</displayName>
+				<unitPattern count="one">{0} mf²</unitPattern>
+				<unitPattern count="other">{0} mf²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>kh</displayName>
+				<unitPattern count="one">{0} kh</unitPattern>
+				<unitPattern count="other">{0} kh</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ft²</displayName>
@@ -7140,91 +7434,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>in²</displayName>
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mf²</displayName>
-				<unitPattern count="one">{0} mf²</unitPattern>
-				<unitPattern count="other">{0} mf²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
 				<unitPattern count="other">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bájt</displayName>
-				<unitPattern count="one">{0} bájt</unitPattern>
-				<unitPattern count="other">{0} bájt</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bájt</displayName>
+				<unitPattern count="one">{0} bájt</unitPattern>
+				<unitPattern count="other">{0} bájt</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>sz.</displayName>
+				<unitPattern count="one">{0} sz.</unitPattern>
+				<unitPattern count="other">{0} sz.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>év</displayName>
+				<unitPattern count="one">{0} év</unitPattern>
+				<unitPattern count="other">{0} év</unitPattern>
+				<perUnitPattern>{0}/év</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>hónap</displayName>
+				<unitPattern count="one">{0} hónap</unitPattern>
+				<unitPattern count="other">{0} hónap</unitPattern>
+				<perUnitPattern>{0}/hó</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>hét</displayName>
+				<unitPattern count="one">{0} hét</unitPattern>
+				<unitPattern count="other">{0} hét</unitPattern>
+				<perUnitPattern>{0}/hét</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>nap</displayName>
 				<unitPattern count="one">{0} nap</unitPattern>
 				<unitPattern count="other">{0} nap</unitPattern>
+				<perUnitPattern>{0}/nap</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>h</displayName>
@@ -7232,30 +7541,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} h</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>hónap</displayName>
-				<unitPattern count="one">{0} hónap</unitPattern>
-				<unitPattern count="other">{0} hónap</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>s</displayName>
@@ -7263,15 +7553,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} s</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>hét</displayName>
-				<unitPattern count="one">{0} hét</unitPattern>
-				<unitPattern count="other">{0} hét</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>év</displayName>
-				<unitPattern count="one">{0} év</unitPattern>
-				<unitPattern count="other">{0} év</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>A</displayName>
@@ -7293,6 +7588,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -7303,21 +7603,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} cal</unitPattern>
 				<unitPattern count="other">{0} cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>J</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -7328,201 +7623,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>CsE</displayName>
-				<unitPattern count="one">{0} CsE</unitPattern>
-				<unitPattern count="other">{0} CsE</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>láb</displayName>
-				<unitPattern count="one">{0} láb</unitPattern>
-				<unitPattern count="other">{0} láb</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>hüvelyk</displayName>
-				<unitPattern count="one">{0} hüvelyk</unitPattern>
-				<unitPattern count="other">{0} hüvelyk</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>fényév</displayName>
-				<unitPattern count="one">{0} fényév</unitPattern>
-				<unitPattern count="other">{0} fényév</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mf</displayName>
-				<unitPattern count="one">{0} mf</unitPattern>
-				<unitPattern count="other">{0} mf</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="one">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mf</displayName>
+				<unitPattern count="one">{0} mf</unitPattern>
+				<unitPattern count="other">{0} mf</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yd</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>láb</displayName>
+				<unitPattern count="one">{0} láb</unitPattern>
+				<unitPattern count="other">{0} láb</unitPattern>
+				<perUnitPattern>{0}/láb</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>hüvelyk</displayName>
+				<unitPattern count="one">{0} hüvelyk</unitPattern>
+				<unitPattern count="other">{0} hüvelyk</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>fényév</displayName>
+				<unitPattern count="one">{0} fényév</unitPattern>
+				<unitPattern count="other">{0} fényév</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>CsE</displayName>
+				<unitPattern count="one">{0} CsE</unitPattern>
+				<unitPattern count="other">{0} CsE</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>mil</displayName>
+				<unitPattern count="one">{0} mil</unitPattern>
+				<unitPattern count="other">{0} mil</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>Kt</displayName>
-				<unitPattern count="one">{0} Kt</unitPattern>
-				<unitPattern count="other">{0} Kt</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tn</displayName>
 				<unitPattern count="one">{0} tn</unitPattern>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>Kt</displayName>
+				<unitPattern count="one">{0} Kt</unitPattern>
+				<unitPattern count="other">{0} Kt</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>LE</displayName>
-				<unitPattern count="one">{0} LE</unitPattern>
-				<unitPattern count="other">{0} LE</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>W</displayName>
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>LE</displayName>
+				<unitPattern count="one">{0} LE</unitPattern>
+				<unitPattern count="other">{0} LE</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mb</unitPattern>
-				<unitPattern count="other">{0} mb</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -7533,10 +7832,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mb</unitPattern>
+				<unitPattern count="other">{0} mb</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -7553,6 +7857,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mph</unitPattern>
 				<unitPattern count="other">{0} mph</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0} °C</unitPattern>
@@ -7568,31 +7882,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -7602,6 +7891,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -7613,25 +7909,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>cs.</displayName>
-				<unitPattern count="one">{0} cs.</unitPattern>
-				<unitPattern count="other">{0} cs.</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -7642,27 +7933,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>l</displayName>
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="one">{0} Ml</unitPattern>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
 				<unitPattern count="one">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>bg</displayName>
+				<unitPattern count="one">{0} bg</unitPattern>
+				<unitPattern count="other">{0} bg</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cs.</displayName>
+				<unitPattern count="one">{0} cs.</unitPattern>
+				<unitPattern count="other">{0} cs.</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>ek.</displayName>
 				<unitPattern count="one">{0} ek.</unitPattern>
@@ -7673,6 +8001,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kk.</unitPattern>
 				<unitPattern count="other">{0} kk.</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} K</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} É</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} D</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} Ny</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -7682,6 +8016,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} G</unitPattern>
 				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -7690,26 +8028,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} m²</unitPattern>
 				<unitPattern count="other">{0} m²</unitPattern>
@@ -7718,6 +8044,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>év</displayName>
+				<unitPattern count="one">{0} év</unitPattern>
+				<unitPattern count="other">{0} év</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>hónap</displayName>
+				<unitPattern count="one">{0} h.</unitPattern>
+				<unitPattern count="other">{0} h.</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>hét</displayName>
+				<unitPattern count="one">{0} hét</unitPattern>
+				<unitPattern count="other">{0} hét</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>nap</displayName>
 				<unitPattern count="one">{0} nap</unitPattern>
@@ -7728,66 +8082,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} h</unitPattern>
 				<unitPattern count="other">{0} h</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>hónap</displayName>
-				<unitPattern count="one">{0} h.</unitPattern>
-				<unitPattern count="other">{0} h.</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>s</displayName>
 				<unitPattern count="one">{0} s</unitPattern>
 				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>hét</displayName>
-				<unitPattern count="one">{0} hét</unitPattern>
-				<unitPattern count="other">{0} hét</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>év</displayName>
-				<unitPattern count="one">{0} év</unitPattern>
-				<unitPattern count="other">{0} év</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0} láb</unitPattern>
-				<unitPattern count="other">{0} láb</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0} hüvelyk</unitPattern>
-				<unitPattern count="other">{0} hüvelyk</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
 				<unitPattern count="one">{0} km</unitPattern>
 				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} fényév</unitPattern>
-				<unitPattern count="other">{0} fényév</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>m</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} mf</unitPattern>
-				<unitPattern count="other">{0} mf</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -7798,31 +8121,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} mf</unitPattern>
+				<unitPattern count="other">{0} mf</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} láb</unitPattern>
+				<unitPattern count="other">{0} láb</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} hüvelyk</unitPattern>
+				<unitPattern count="other">{0} hüvelyk</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} fényév</unitPattern>
+				<unitPattern count="other">{0} fényév</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="one">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} uncia</unitPattern>
-				<unitPattern count="other">{0} uncia</unitPattern>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} font</unitPattern>
 				<unitPattern count="other">{0} font</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} LE</unitPattern>
-				<unitPattern count="other">{0} LE</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} uncia</unitPattern>
+				<unitPattern count="other">{0} uncia</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} kW</unitPattern>
@@ -7832,6 +8167,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} LE</unitPattern>
+				<unitPattern count="other">{0} LE</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
@@ -7879,6 +8218,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} K</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} É</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} D</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} Ny</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hu_HU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hu_HU.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hu_HU.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hu_HU.xml
index 27563fdfad2..d0b7b97932d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hu_HU.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hu_HU.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="hu"/>
 		<territory type="HU"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hy.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hy.xml
similarity index 87%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hy.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hy.xml
index 6e53e4a2b5c..a3046c98222 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hy.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hy.xml
@@ -1,50 +1,71 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="hy"/>
 	</identity>
 	<localeDisplayNames>
 		<localeDisplayPattern>
 			<localePattern>{0} ({1})</localePattern>
 			<localeSeparator>{0}, {1}</localeSeparator>
-			<localeKeyTypePattern>{0}. {1}</localeKeyTypePattern>
+			<localeKeyTypePattern>{0}՝ {1}</localeKeyTypePattern>
 		</localeDisplayPattern>
 		<languages>
+			<language type="aa">աֆարերեն</language>
 			<language type="ab">աբխազերեն</language>
+			<language type="ace">աչեհերեն</language>
+			<language type="ach">ակոլերեն</language>
+			<language type="ada">ադանգմերեն</language>
+			<language type="ady">ադիղերեն</language>
+			<language type="aeb">թունիսական արաբերեն</language>
 			<language type="af">աֆրիկաանս</language>
 			<language type="agq">աղեմ</language>
+			<language type="ain">այներեն</language>
 			<language type="ak">աքաներեն</language>
+			<language type="akk">աքքադերեն</language>
 			<language type="am">ամհարերեն</language>
+			<language type="ang">հին անգլերեն</language>
 			<language type="ar">արաբերեն</language>
 			<language type="ar_001">ժամանակակից ստանդարտ արաբերեն</language>
+			<language type="arc">արամեերեն</language>
 			<language type="arn">մապուչի</language>
+			<language type="arq">ալժիրական արաբերեն</language>
+			<language type="arz">եգիպտական արաբերեն</language>
 			<language type="as">ասամերեն</language>
 			<language type="asa">ասու</language>
+			<language type="ase">ամերիկյան ժեստերի լեզու</language>
+			<language type="ast">աստուրերեն</language>
 			<language type="az">ադրբեջաներեն</language>
+			<language type="az" alt="short">ադրբեջաներեն</language>
 			<language type="ba">բաշկիրերեն</language>
 			<language type="be">բելառուսերեն</language>
 			<language type="bem">բեմբա</language>
 			<language type="bez">բենա</language>
 			<language type="bg">բուլղարերեն</language>
+			<language type="bgn">արևմտյան բելոչի</language>
 			<language type="bm">բամբարա</language>
 			<language type="bn">բենգալերեն</language>
 			<language type="bo">տիբեթերեն</language>
 			<language type="br">բրետոներեն</language>
 			<language type="brx">բոդո</language>
 			<language type="bs">բոսնիերեն</language>
+			<language type="bss">աքուզերեն</language>
 			<language type="ca">կատալաներեն</language>
+			<language type="ce">չեչեներեն</language>
+			<language type="ceb">կաբուաներեն</language>
 			<language type="cgg">չիգա</language>
 			<language type="chr">շերոկի</language>
 			<language type="ckb">սորանի (քրդերեն)</language>
 			<language type="co">կորսիկերեն</language>
+			<language type="cop">ղպտերեն</language>
+			<language type="crh">ղրիմյան թուրքերեն</language>
 			<language type="cs">չեխերեն</language>
+			<language type="cv">չուվաշերեն</language>
 			<language type="cy">ուելսերեն</language>
 			<language type="da">դանիերեն</language>
 			<language type="dav">թաիթա</language>
@@ -58,12 +79,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="dz">ջոնգքհա</language>
 			<language type="ebu">էմբու</language>
 			<language type="ee">էվե</language>
+			<language type="efi">էֆիկերեն</language>
+			<language type="egy">հին եգիպտերեն</language>
 			<language type="el">հունարեն</language>
 			<language type="en">անգլերեն</language>
-			<language type="en_AU">ավստրալական անգլերեն</language>
+			<language type="en_AU">ավստրալիական անգլերեն</language>
 			<language type="en_CA">կանադական անգլերեն</language>
 			<language type="en_GB">բրիտանական անգլերեն</language>
-			<language type="en_GB" alt="short">անգլերեն (ՄԹ)</language>
 			<language type="en_US">ամերիկյան անգլերեն</language>
 			<language type="en_US" alt="short">անգլերեն (ԱՄՆ)</language>
 			<language type="eo">էսպերանտո</language>
@@ -76,19 +98,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="fa">պարսկերեն</language>
 			<language type="fi">ֆիններեն</language>
 			<language type="fil">ֆիլիպիներեն</language>
+			<language type="fit">տորնադելեն ֆիններեն</language>
 			<language type="fj">ֆիջիերեն</language>
 			<language type="fo">ֆարյորերեն</language>
+			<language type="fon">ֆոներեն</language>
 			<language type="fr">ֆրանսերեն</language>
 			<language type="fr_CA">կանադական ֆրանսերեն</language>
 			<language type="fr_CH">շվեյցարական ֆրանսերեն</language>
+			<language type="fro">հին ֆրանսերեն</language>
+			<language type="frs">արևելյան ֆրիզերեն</language>
+			<language type="fur">ֆրիուլիերեն</language>
 			<language type="fy">արևմտյան ֆրիզերեն</language>
 			<language type="ga">իռլանդերեն</language>
+			<language type="gaa">գաերեն</language>
 			<language type="gag">գագաուզերեն</language>
+			<language type="gbz">զրադաշտական դարի</language>
 			<language type="gd" draft="unconfirmed">Գաելյան Շոտլանդերեն</language>
 			<language type="gl">գալիսերեն</language>
 			<language type="gn">գուարանի</language>
+			<language type="goh">հին բարձր գերմաներեն</language>
+			<language type="got">գոթերեն</language>
+			<language type="grc">հին հունարեն</language>
 			<language type="gsw">շվեյցարական գերմաներեն</language>
 			<language type="gu">գուջարաթի</language>
+			<language type="guc">վայու</language>
 			<language type="guz">գուսի</language>
 			<language type="gv">մեներեն</language>
 			<language type="ha">հաուսա</language>
@@ -97,6 +130,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="hi">հինդի</language>
 			<language type="hr">խորվաթերեն</language>
 			<language type="hsb">վերին սորբիերեն</language>
+			<language type="hsn">սյան չինարեն</language>
 			<language type="ht">հաիթերեն</language>
 			<language type="hu">հունգարերեն</language>
 			<language type="hy">հայերեն</language>
@@ -115,6 +149,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ka">վրացերեն</language>
 			<language type="kab">կաբիլերեն</language>
 			<language type="kam">կամբա</language>
+			<language type="kcg">տիապ</language>
 			<language type="kde">մակոնդե</language>
 			<language type="kea">կուբավերդիանու</language>
 			<language type="khq">կոյրա չինի</language>
@@ -140,6 +175,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lkt">լակոտա</language>
 			<language type="ln">լինգալա</language>
 			<language type="lo">լաոսերեն</language>
+			<language type="lrc">հյուսիսային լուրիերեն</language>
 			<language type="lt">լիտվերեն</language>
 			<language type="lu">լուբա-կատանգա</language>
 			<language type="luo">լուո</language>
@@ -157,10 +193,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mn">մոնղոլերեն</language>
 			<language type="moh">մոհավք</language>
 			<language type="mr">մարաթի</language>
+			<language type="mrj">արևմտյան մարիերեն</language>
 			<language type="ms">մալայերեն</language>
 			<language type="mt">մալթերեն</language>
 			<language type="mua">մունդանգ</language>
 			<language type="my">բիրմայերեն</language>
+			<language type="mzn">մազանդարաներեն</language>
 			<language type="naq">նամա</language>
 			<language type="nb">նորվեգերեն բուկմոլ</language>
 			<language type="nd">հյուսիսային նդեբելե</language>
@@ -170,36 +208,71 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nmg">կվասիո</language>
 			<language type="nn">նորվեգերեն նյունորսկ</language>
 			<language type="no" draft="unconfirmed">Նորվեգերեն</language>
+			<language type="non">հին նորվեգերեն</language>
 			<language type="nqo">նկո</language>
 			<language type="nus">նուեր</language>
 			<language type="nyn">նյանկոլե</language>
-			<language type="oc" draft="unconfirmed">Ակվիտաներեն</language>
+			<language type="oc">ակվիտաներեն</language>
+			<language type="oj">օջիբվա</language>
 			<language type="om">օրոմո</language>
 			<language type="or">օրիյա</language>
+			<language type="os">օսերեն</language>
+			<language type="osa">օսեյջի</language>
+			<language type="ota">օսմաներեն</language>
 			<language type="pa">փենջաբերեն</language>
+			<language type="pag">պանգասինաներեն</language>
+			<language type="pal">պահլավերեն</language>
+			<language type="pam">պանպանգաերեն</language>
+			<language type="pap">պապիամենտո</language>
+			<language type="pau">պալաուերեն</language>
+			<language type="pcd">պիկարդերեն</language>
+			<language type="pdc">փենսիլվանական գերմաներեն</language>
+			<language type="pdt">պլատագերմաներեն</language>
+			<language type="peo">հին պարսկերեն</language>
+			<language type="pfl">պալանտինների գերմաներեն</language>
+			<language type="phn">փյունիկերեն</language>
+			<language type="pi">պալի</language>
 			<language type="pl">լեհերեն</language>
+			<language type="pms">պիեմոնտերեն</language>
+			<language type="pnt">պոնտիկերեն</language>
+			<language type="pon">պոնպեերեն</language>
+			<language type="prg">պրուսերեն</language>
+			<language type="pro">հին պրովենսիալ</language>
 			<language type="ps">փուշթու</language>
 			<language type="pt">պորտուգալերեն</language>
 			<language type="pt_BR">բրազիլական պորտուգալերեն</language>
 			<language type="pt_PT">եվրոպական պորտուգալերեն</language>
 			<language type="qu">քեչուա</language>
 			<language type="quc">կիչե</language>
+			<language type="raj">ռաջաստաներեն</language>
+			<language type="rap">ռապանուի</language>
+			<language type="rar">ռարոտոնգան</language>
+			<language type="rgn">ռոմանիոլերեն</language>
+			<language type="rif">ռիֆերեն</language>
 			<language type="rm">ռոմանշերեն</language>
 			<language type="rn">ռունդի</language>
 			<language type="ro">ռումիներեն</language>
 			<language type="ro_MD">մոլդովերեն</language>
 			<language type="rof">ռոմբո</language>
+			<language type="rom">ռոմաներեն</language>
+			<language type="root">ռուտերեն</language>
+			<language type="rtm">ռոտուման</language>
 			<language type="ru">ռուսերեն</language>
+			<language type="rue">ռուսիներեն</language>
+			<language type="rug">ռովիանա</language>
+			<language type="rup">արոմաներեն</language>
 			<language type="rw">քինյարվանդա</language>
 			<language type="rwk">ռվա</language>
 			<language type="sa">սանսկրիտ</language>
 			<language type="saq">սամբուրու</language>
 			<language type="sbp">սանգու</language>
 			<language type="sd">սինդհի</language>
+			<language type="sdh">հարավային քրդերեն</language>
 			<language type="se">հյուսիսային սամի</language>
 			<language type="seh">սենա</language>
 			<language type="ses">կոյրաբորո սեննի</language>
 			<language type="sg">սանգո</language>
+			<language type="sga">հին իռլանդերեն</language>
 			<language type="sh" draft="unconfirmed">Սերբա-Խորվաթերեն</language>
 			<language type="shi">տաշելհիթ</language>
 			<language type="si">սինհալերեն</language>
@@ -213,44 +286,94 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="so">սոմալիերեն</language>
 			<language type="sq">ալբաներեն</language>
 			<language type="sr">սերբերեն</language>
-			<language type="st" draft="unconfirmed">Սեսոտո</language>
+			<language type="st">հյուսիսային սոտո</language>
 			<language type="su">սունդաներեն</language>
 			<language type="sv">շվեդերեն</language>
 			<language type="sw">սուահիլի</language>
-			<language type="swc">կոնգոյի սուահիլի</language>
+			<language type="sw_CD">կոնգոյի սուահիլի</language>
 			<language type="ta">թամիլերեն</language>
+			<language type="tcy">տուլու</language>
 			<language type="te">թելուգու</language>
+			<language type="tem">տիմնե</language>
 			<language type="teo">տեսո</language>
+			<language type="ter">տերենո</language>
+			<language type="tet">թեթում</language>
 			<language type="tg">տաջիկերեն</language>
 			<language type="th">թայերեն</language>
 			<language type="ti">թիգրինիա</language>
+			<language type="tig">տիգրե</language>
+			<language type="tiv">տիվերեն</language>
 			<language type="tk">թուրքմեներեն</language>
+			<language type="tkl">տոկելաու</language>
+			<language type="tkr">ցախուր</language>
+			<language type="tl">տագալերեն</language>
 			<language type="tlh" draft="unconfirmed">Կլինգոն</language>
-			<language type="to">տոնգա</language>
+			<language type="tli">տլինգիտ</language>
+			<language type="tly">թալիշերեն</language>
+			<language type="tmh">տամաշեկ</language>
+			<language type="tn">ցվանա</language>
+			<language type="to">տոնգերեն</language>
+			<language type="tpi">տոկ փիսին</language>
 			<language type="tr">թուրքերեն</language>
+			<language type="tru">տուրոյո</language>
+			<language type="trv">տարոկո</language>
+			<language type="ts">ցոնգա</language>
+			<language type="tsd">ցակոներեն</language>
+			<language type="tsi">ցիմշյան</language>
 			<language type="tt">թաթարերեն</language>
-			<language type="tw" draft="unconfirmed">Տուի</language>
+			<language type="tum">տումբուկա</language>
+			<language type="tvl">թուվալուերեն</language>
+			<language type="tw">տուի</language>
 			<language type="twq">տասավաք</language>
+			<language type="ty">թաիտերեն</language>
+			<language type="tyv">տուվերեն</language>
 			<language type="tzm">կենտրոնատլասյան թամազիխտ</language>
+			<language type="udm">ուդմուրտերեն</language>
 			<language type="ug">ույղուրերեն</language>
+			<language type="uga">ուգարիտերեն</language>
 			<language type="uk">ուկրաիներեն</language>
+			<language type="umb">ումբունդու</language>
 			<language type="und">անհայտ լեզու</language>
 			<language type="ur">ուրդու</language>
 			<language type="uz">ուզբեկերեն</language>
 			<language type="vai">վաի</language>
+			<language type="ve">վենդա</language>
+			<language type="vec">վենետիկերեն</language>
+			<language type="vep">վեպսկերեն</language>
 			<language type="vi">վիետնամերեն</language>
+			<language type="vls">արևմտյան ֆլամադերեն</language>
+			<language type="vo">վոլապյուկ</language>
+			<language type="vot">վոդերեն</language>
+			<language type="vro">վորո</language>
 			<language type="vun">վունջո</language>
+			<language type="wa">վալոներեն</language>
+			<language type="wae">վալսերեն</language>
+			<language type="wal">վոլայտա</language>
+			<language type="war">վարայերեն</language>
+			<language type="was">վաշո</language>
+			<language type="wbp">վարլպիրի</language>
 			<language type="wo">վոլոֆ</language>
+			<language type="wuu">վու չինարեն</language>
 			<language type="xh">քսոզա</language>
 			<language type="xog">սոգա</language>
-			<language type="yi" draft="unconfirmed">Իդիշ</language>
+			<language type="yao">յաո</language>
+			<language type="yap">յապսկերեն</language>
+			<language type="yav">յանգբեն</language>
+			<language type="ybb">յեմբաերեն</language>
+			<language type="yi">իդիշ</language>
 			<language type="yo">յորուբա</language>
+			<language type="za">ժուանգ</language>
+			<language type="zap">սապոտեկերեն</language>
+			<language type="zea">զեյլանդերեն</language>
+			<language type="zen">զենագա</language>
 			<language type="zgh">ստանդարտ մարոկական թամազիղտ</language>
 			<language type="zh">չինարեն</language>
 			<language type="zh_Hans">պարզեցված չինարեն</language>
 			<language type="zh_Hant">ավանդական չինարեն</language>
 			<language type="zu">զուլուսերեն</language>
+			<language type="zun">զունիերեն</language>
 			<language type="zxx">առանց լեզվային բովանդակության</language>
+			<language type="zza">զազաերեն</language>
 		</languages>
 		<scripts>
 			<script type="Arab">արաբական</script>
@@ -308,14 +431,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="017">Կենտրոնական Աֆրիկա</territory>
 			<territory type="018">Հարավային Աֆրիկա</territory>
 			<territory type="019">Ամերիկա</territory>
-			<territory type="021">Հյուսիսային Ամերիկա - Մեքսիկայից հյուսիս</territory>
+			<territory type="021">Հյուսիսային Ամերիկա - ԱՄՆ և Կանադա</territory>
 			<territory type="029">Կարիբյան կղզիներ</territory>
 			<territory type="030">Արևելյան Ասիա</territory>
 			<territory type="034">Հարավային Ասիա</territory>
 			<territory type="035">Հարավ-Արևելյան Ասիա</territory>
 			<territory type="039">Հարավային Եվրոպա</territory>
-			<territory type="053">Ավստրալասիա</territory>
-			<territory type="054">Մալանեզիա</territory>
+			<territory type="053">Ավստրալիա և Նոր Զելանդիա</territory>
+			<territory type="054">Մելանեզիա</territory>
 			<territory type="057">Միկրոնեզիայի տարածաշրջան</territory>
 			<territory type="061">Պոլինեզիա</territory>
 			<territory type="142">Ասիա</territory>
@@ -327,11 +450,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="155">Արևմտյան Եվրոպա</territory>
 			<territory type="419">Լատինական Ամերիկա</territory>
 			<territory type="AC">Համբարձման կղզի</territory>
-			<territory type="AD">Անդորա</territory>
-			<territory type="AE">Միացյալ Արաբական Էմիրություններ</territory>
+			<territory type="AD">Անդորրա</territory>
+			<territory type="AE">Արաբական Միացյալ Էմիրություններ</territory>
 			<territory type="AF">Աֆղանստան</territory>
 			<territory type="AG">Անտիգուա և Բարբուդա</territory>
-			<territory type="AI">Անգիլիա</territory>
+			<territory type="AI">Անգիլյա</territory>
 			<territory type="AL">Ալբանիա</territory>
 			<territory type="AM">Հայաստան</territory>
 			<territory type="AO">Անգոլա</territory>
@@ -352,16 +475,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BH">Բահրեյն</territory>
 			<territory type="BI">Բուրունդի</territory>
 			<territory type="BJ">Բենին</territory>
-			<territory type="BL">Սուրբ Բարթողոմեոսի կղզի</territory>
+			<territory type="BL">Սուրբ Բարդուղիմեոս</territory>
 			<territory type="BM">Բերմուդյան կղզիներ</territory>
 			<territory type="BN">Բրունեյ</territory>
 			<territory type="BO">Բոլիվիա</territory>
-			<territory type="BQ">Կարիբյան Նիդերլանդներ</territory>
+			<territory type="BQ">Կարիբյան Նիդեռլանդներ</territory>
 			<territory type="BR">Բրազիլիա</territory>
-			<territory type="BS">Բահամյան կղզիներ</territory>
+			<territory type="BS">Բահամներ</territory>
 			<territory type="BT">Բութան</territory>
 			<territory type="BV">Բուվե կղզի</territory>
-			<territory type="BW">Բոտսվանա</territory>
+			<territory type="BW">Բոթսվանա</territory>
 			<territory type="BY">Բելառուս</territory>
 			<territory type="BZ">Բելիզ</territory>
 			<territory type="CA">Կանադա</territory>
@@ -372,15 +495,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CG">Կոնգո - Բրազավիլ</territory>
 			<territory type="CG" alt="variant">Կոնգո (Կոնգոյի Հանրապետություն)</territory>
 			<territory type="CH">Շվեյցարիա</territory>
-			<territory type="CI">Փղոսկրի Ափ</territory>
-			<territory type="CI" alt="variant">Կոտ դ’Իվուար</territory>
+			<territory type="CI">Կոտ Դ՛իվուար</territory>
+			<territory type="CI" alt="variant">Փղոսկրի Ափ</territory>
 			<territory type="CK">Կուկի կղզիներ</territory>
 			<territory type="CL">Չիլի</territory>
 			<territory type="CM">Կամերուն</territory>
 			<territory type="CN">Չինաստան</territory>
 			<territory type="CO">Կոլումբիա</territory>
 			<territory type="CP">Քլիփերթոն կղզի</territory>
-			<territory type="CR">Կոստա-Ռիկա</territory>
+			<territory type="CR">Կոստա Ռիկա</territory>
 			<territory type="CU">Կուբա</territory>
 			<territory type="CV">Կաբո Վերդե</territory>
 			<territory type="CW">Կյուրասաո</territory>
@@ -405,14 +528,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="EU">Եվրոպական Միություն</territory>
 			<territory type="FI">Ֆինլանդիա</territory>
 			<territory type="FJ">Ֆիջի</territory>
-			<territory type="FK">Ֆոլկլենդյան կղզիներ</territory>
-			<territory type="FK" alt="variant">Ֆոլկլենդյան (Մալվինյան) կղզիներ</territory>
+			<territory type="FK">Ֆոլքլենդյան կղզիներ</territory>
+			<territory type="FK" alt="variant">Ֆոլքլենդյան (Մալվինյան) կղզիներ</territory>
 			<territory type="FM">Միկրոնեզիա</territory>
 			<territory type="FO">Ֆարերյան կղզիներ</territory>
 			<territory type="FR">Ֆրանսիա</territory>
 			<territory type="GA">Գաբոն</territory>
-			<territory type="GB">Միացյալ Թագավորություն</territory>
-			<territory type="GB" alt="short">Միացյալ Թագավորություն</territory>
+			<territory type="GB">Մեծ Բրիտանիա</territory>
+			<territory type="GB" alt="short">Բրիտանիա</territory>
 			<territory type="GD">Գրենադա</territory>
 			<territory type="GE">Վրաստան</territory>
 			<territory type="GF">Ֆրանսիական Գվիանա</territory>
@@ -449,7 +572,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="IS">Իսլանդիա</territory>
 			<territory type="IT">Իտալիա</territory>
 			<territory type="JE">Ջերսի</territory>
-			<territory type="JM">Ջամայկա</territory>
+			<territory type="JM">Ճամայկա</territory>
 			<territory type="JO">Հորդանան</territory>
 			<territory type="JP">Ճապոնիա</territory>
 			<territory type="KE">Քենիա</territory>
@@ -457,7 +580,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="KH">Կամբոջա</territory>
 			<territory type="KI">Կիրիբատի</territory>
 			<territory type="KM">Կոմորյան կղզիներ</territory>
-			<territory type="KN">Սենթ Քիթս և Նևիս</territory>
+			<territory type="KN">Սենթ Քիթս և Նեվիս</territory>
 			<territory type="KP">Հյուսիսային Կորեա</territory>
 			<territory type="KR">Հարավային Կորեա</territory>
 			<territory type="KW">Քուվեյթ</territory>
@@ -465,7 +588,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="KZ">Ղազախստան</territory>
 			<territory type="LA">Լաոս</territory>
 			<territory type="LB">Լիբանան</territory>
-			<territory type="LC">Սենթ Լյուսիա</territory>
+			<territory type="LC">Սենթ Լուսիա</territory>
 			<territory type="LI">Լիխտենշտեյն</territory>
 			<territory type="LK">Շրի Լանկա</territory>
 			<territory type="LR">Լիբերիա</territory>
@@ -474,7 +597,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="LU">Լյուքսեմբուրգ</territory>
 			<territory type="LV">Լատվիա</territory>
 			<territory type="LY">Լիբիա</territory>
-			<territory type="MA">Մարոկո</territory>
+			<territory type="MA">Մարոկկո</territory>
 			<territory type="MC">Մոնակո</territory>
 			<territory type="MD">Մոլդովա</territory>
 			<territory type="ME">Չեռնոգորիա</territory>
@@ -505,7 +628,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="NF">Նորֆոլկ կղզի</territory>
 			<territory type="NG">Նիգերիա</territory>
 			<territory type="NI">Նիկարագուա</territory>
-			<territory type="NL">Նիդերլանդեր</territory>
+			<territory type="NL">Նիդեռլանդներ</territory>
 			<territory type="NO">Նորվեգիա</territory>
 			<territory type="NP">Նեպալ</territory>
 			<territory type="NR">Նաուրու</territory>
@@ -519,7 +642,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="PH">Ֆիլիպիններ</territory>
 			<territory type="PK">Պակիստան</territory>
 			<territory type="PL">Լեհաստան</territory>
-			<territory type="PM">Սեն Պիեր և Միկելոն</territory>
+			<territory type="PM">Սեն Պիեռ և Միքելոն</territory>
 			<territory type="PN">Պիտկեռն կղզիներ</territory>
 			<territory type="PR">Պուերտո Ռիկո</territory>
 			<territory type="PS">Պաղեստինյան տարածքներ</territory>
@@ -542,21 +665,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="SG">Սինգապուր</territory>
 			<territory type="SH">Սուրբ Հեղինեի կղզի</territory>
 			<territory type="SI">Սլովենիա</territory>
-			<territory type="SJ">Սվալբարդ և Յան-Մայեն</territory>
+			<territory type="SJ">Սվալբարդ և Յան Մայեն</territory>
 			<territory type="SK">Սլովակիա</territory>
-			<territory type="SL">Սյերա-Լեոնե</territory>
+			<territory type="SL">Սիերա Լեոնե</territory>
 			<territory type="SM">Սան Մարինո</territory>
 			<territory type="SN">Սենեգալ</territory>
 			<territory type="SO">Սոմալի</territory>
 			<territory type="SR">Սուրինամ</territory>
 			<territory type="SS">Հարավային Սուդան</territory>
-			<territory type="ST">Սան Տոմե և Պրինսիպի</territory>
+			<territory type="ST">Սան Տոմե և Փրինսիփի</territory>
 			<territory type="SV">Սալվադոր</territory>
 			<territory type="SX">Սինտ Մարտեն</territory>
 			<territory type="SY">Սիրիա</territory>
 			<territory type="SZ">Սվազիլենդ</territory>
 			<territory type="TA">Տրիստան դա Կունյա</territory>
-			<territory type="TC">Տերկս և Կայկոս կղզիներ</territory>
+			<territory type="TC">Թըրքս և Կայկոս կղզիներ</territory>
 			<territory type="TD">Չադ</territory>
 			<territory type="TF">Ֆրանսիական Հարավային Տարածքներ</territory>
 			<territory type="TG">Տոգո</territory>
@@ -572,7 +695,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="TT">Տրինիդադ և Տոբագո</territory>
 			<territory type="TV">Տուվալու</territory>
 			<territory type="TW">Թայվան</territory>
-			<territory type="TZ">Տանզանիա</territory>
+			<territory type="TZ">Թանզանիա</territory>
 			<territory type="UA">Ուկրաինա</territory>
 			<territory type="UG">Ուգանդա</territory>
 			<territory type="UM">Արտաքին կղզիներ (ԱՄՆ)</territory>
@@ -581,7 +704,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="UY">Ուրուգվայ</territory>
 			<territory type="UZ">Ուզբեկստան</territory>
 			<territory type="VA">Վատիկան քաղաք-պետություն</territory>
-			<territory type="VC">Սենթ Վիսենտ և Գրենադիններ</territory>
+			<territory type="VC">Սենթ Վինսենթ և Գրենադիններ</territory>
 			<territory type="VE">Վենեսուելա</territory>
 			<territory type="VG">Բրիտանական Վիրջինյան կղզիներ</territory>
 			<territory type="VI">Ամերիկյան Վիրջինյան կղզիներ</territory>
@@ -605,68 +728,81 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="calendar">Տոմար</key>
 			<key type="collation">Տեսակավորման կարգ</key>
 			<key type="currency">արժույթ</key>
+			<key type="hc">Ժամանակային համակարգ (12 կամ 24)</key>
+			<key type="lb">տողանցման ոճ</key>
+			<key type="ms">չափման համակարգ</key>
 			<key type="numbers">թվեր</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">արաբա-հնդկական թվեր</type>
-			<type type="arabext" key="numbers">արաբա-հնդկական թվերի ընդլայնված համակարգ</type>
-			<type type="armn" key="numbers">հայկական թվեր</type>
-			<type type="armnlow" key="numbers">հայկական թվեր (փոքրատառ)</type>
-			<type type="beng" key="numbers">բենգալական թվեր</type>
-			<type type="buddhist" key="calendar">Բուդդայական տոմար</type>
-			<type type="chinese" key="calendar">Չինական տոմար</type>
-			<type type="dangi" key="calendar">Դանգիական տոմար</type>
-			<type type="deva" key="numbers">դեվանագարի թվեր</type>
-			<type type="ducet" key="collation">Սկզբնադիր տեսակավորման կարգ Unicode-ի համար</type>
-			<type type="ethi" key="numbers">եթովպական թվեր</type>
-			<type type="ethiopic" key="calendar">Եթովպիական տոմար</type>
-			<type type="fullwide" key="numbers">թվերի լայն ձևաչափ</type>
-			<type type="geor" key="numbers">վրացական թվեր</type>
-			<type type="gregorian" key="calendar">Գրիգորյան տոմար</type>
-			<type type="grek" key="numbers">հունական թվեր</type>
-			<type type="greklow" key="numbers">հունական թվեր (փոքրատառ)</type>
-			<type type="gujr" key="numbers">գուջարաթի թվեր</type>
-			<type type="guru" key="numbers">գուրմուխի թվեր</type>
-			<type type="hanidec" key="numbers">չինական տասնորդական թվեր</type>
-			<type type="hans" key="numbers">չինական պարզեցված թվեր</type>
-			<type type="hansfin" key="numbers">չինական պարզեցված ֆինանսական թվեր</type>
-			<type type="hant" key="numbers">չինական ավանդական թվեր</type>
-			<type type="hantfin" key="numbers">չինական ավանդական ֆինանսական թվեր</type>
-			<type type="hebr" key="numbers">եբրայերեն թվեր</type>
-			<type type="hebrew" key="calendar">Հրեական տոմար</type>
-			<type type="islamic" key="calendar">Իսլամական տոմար</type>
-			<type type="iso8601" key="calendar">ISO-8601 տոմար</type>
-			<type type="japanese" key="calendar">Ճապոնական տոմար</type>
-			<type type="jpan" key="numbers">ճապոնական թվեր</type>
-			<type type="jpanfin" key="numbers">ճապոնական ֆինանսական թվեր</type>
-			<type type="khmr" key="numbers">քմերական թվեր</type>
-			<type type="knda" key="numbers">կաննադա թվեր</type>
-			<type type="laoo" key="numbers">լաոսական թվեր</type>
-			<type type="latn" key="numbers">արևմտյան թվեր</type>
-			<type type="mlym" key="numbers">մալայալամ թվեր</type>
-			<type type="mymr" key="numbers">բիրմական թվեր</type>
-			<type type="orya" key="numbers">օրիյա թվեր</type>
-			<type type="persian" key="calendar">Պարսկական տոմար</type>
-			<type type="roc" key="calendar">Մինգուո տոմար</type>
-			<type type="roman" key="numbers">հռոմեական թվեր</type>
-			<type type="romanlow" key="numbers">հռոմեական թվեր (փոքրատառ)</type>
-			<type type="search" key="collation">Ընդհանուր որոնում</type>
-			<type type="standard" key="collation">Տեսակավորման ստանդարտ կարգ</type>
-			<type type="taml" key="numbers">թամիլական ավանդական թվեր</type>
-			<type type="tamldec" key="numbers">թամիլական թվեր</type>
-			<type type="telu" key="numbers">թելուգու թվեր</type>
-			<type type="thai" key="numbers">թայական թվեր</type>
-			<type type="tibt" key="numbers">տիբեթական թվեր</type>
+			<type key="calendar" type="buddhist">բուդդայական տոմար</type>
+			<type key="calendar" type="chinese">չինական տոմար</type>
+			<type key="calendar" type="dangi">դանգի տոմար</type>
+			<type key="calendar" type="ethiopic">եթովպիական տոմար</type>
+			<type key="calendar" type="gregorian">գրիգորյան տոմար</type>
+			<type key="calendar" type="hebrew">հրեական տոմար</type>
+			<type key="calendar" type="islamic">իսլամական տոմար</type>
+			<type key="calendar" type="iso8601">ISO-8601 տոմար</type>
+			<type key="calendar" type="japanese">ճապոնական տոմար</type>
+			<type key="calendar" type="persian">պարսկական տոմար</type>
+			<type key="calendar" type="roc">մինգուո տոմար</type>
+			<type key="collation" type="ducet">Unicode-ի ստանդարտ տեսակավորում</type>
+			<type key="collation" type="search">որոնում</type>
+			<type key="collation" type="standard">տեսակավորման ստանդարտ կարգ</type>
+			<type key="hc" type="h11">12-ժամյա համակարգ (0-11)</type>
+			<type key="hc" type="h12">12-ժամյա համակարգ (1-12)</type>
+			<type key="hc" type="h23">24-ժամյա համակարգ (0-23)</type>
+			<type key="hc" type="h24">24-ժամյա համակարգ (1-24)</type>
+			<type key="lb" type="loose">փափուկ տողանցում</type>
+			<type key="lb" type="normal">սովորական տողանցում</type>
+			<type key="lb" type="strict">կոշտ տողանցում</type>
+			<type key="ms" type="metric">մետրիկ համակարգ</type>
+			<type key="ms" type="uksystem">չափման բրիտանական համակարգ</type>
+			<type key="ms" type="ussystem">չափման ամերիկյան համակարգ</type>
+			<type key="numbers" type="arab">արաբա-հնդկական թվեր</type>
+			<type key="numbers" type="arabext">արաբա-հնդկական թվերի ընդլայնված համակարգ</type>
+			<type key="numbers" type="armn">հայկական թվեր</type>
+			<type key="numbers" type="armnlow">հայկական թվեր (փոքրատառ)</type>
+			<type key="numbers" type="beng">բենգալական թվեր</type>
+			<type key="numbers" type="deva">դեվանագարի թվեր</type>
+			<type key="numbers" type="ethi">եթովպական թվեր</type>
+			<type key="numbers" type="fullwide">թվերի լայն ձևաչափ</type>
+			<type key="numbers" type="geor">վրացական թվեր</type>
+			<type key="numbers" type="grek">հունական թվեր</type>
+			<type key="numbers" type="greklow">հունական թվեր (փոքրատառ)</type>
+			<type key="numbers" type="gujr">գուջարաթի թվեր</type>
+			<type key="numbers" type="guru">գուրմուխի թվեր</type>
+			<type key="numbers" type="hanidec">չինական տասնորդական թվեր</type>
+			<type key="numbers" type="hans">չինական պարզեցված թվեր</type>
+			<type key="numbers" type="hansfin">չինական պարզեցված ֆինանսական թվեր</type>
+			<type key="numbers" type="hant">չինական ավանդական թվեր</type>
+			<type key="numbers" type="hantfin">չինական ավանդական ֆինանսական թվեր</type>
+			<type key="numbers" type="hebr">եբրայերեն թվեր</type>
+			<type key="numbers" type="jpan">ճապոնական թվեր</type>
+			<type key="numbers" type="jpanfin">ճապոնական ֆինանսական թվեր</type>
+			<type key="numbers" type="khmr">քմերական թվեր</type>
+			<type key="numbers" type="knda">կաննադա թվեր</type>
+			<type key="numbers" type="laoo">լաոսական թվեր</type>
+			<type key="numbers" type="latn">արևմտյան թվեր</type>
+			<type key="numbers" type="mlym">մալայալամ թվեր</type>
+			<type key="numbers" type="mymr">բիրմական թվեր</type>
+			<type key="numbers" type="orya">օրիյա թվեր</type>
+			<type key="numbers" type="roman">հռոմեական թվեր</type>
+			<type key="numbers" type="romanlow">հռոմեական թվեր (փոքրատառ)</type>
+			<type key="numbers" type="taml">թամիլական ավանդական թվեր</type>
+			<type key="numbers" type="tamldec">թամիլական թվեր</type>
+			<type key="numbers" type="telu">թելուգու թվեր</type>
+			<type key="numbers" type="thai">թայական թվեր</type>
+			<type key="numbers" type="tibt">տիբեթական թվեր</type>
 		</types>
 		<measurementSystemNames>
-			<measurementSystemName type="metric">Մետրիկ</measurementSystemName>
+			<measurementSystemName type="metric">Մետրական</measurementSystemName>
 			<measurementSystemName type="UK">Անգլիական</measurementSystemName>
 			<measurementSystemName type="US">Ամերիկյան</measurementSystemName>
 		</measurementSystemNames>
 		<codePatterns>
-			<codePattern type="language">Լեզու. {0}</codePattern>
-			<codePattern type="script">Գիր. {0}</codePattern>
-			<codePattern type="territory">Շրջան. {0}</codePattern>
+			<codePattern type="language">Լեզու՝ {0}</codePattern>
+			<codePattern type="script">Գիր՝ {0}</codePattern>
+			<codePattern type="territory">Շրջան՝ {0}</codePattern>
 		</codePatterns>
 	</localeDisplayNames>
 	<characters>
@@ -1003,13 +1139,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<day type="sat">շբթ</day>
 						</dayWidth>
 						<dayWidth type="narrow">
-							<day type="sun">Կ</day>
-							<day type="mon">Ե</day>
-							<day type="tue">Ե</day>
-							<day type="wed">Չ</day>
-							<day type="thu">Հ</day>
+							<day type="sun">Կր</day>
+							<day type="mon">Եկ</day>
+							<day type="tue">Եր</day>
+							<day type="wed">Չր</day>
+							<day type="thu">Հգ</day>
 							<day type="fri">Ու</day>
-							<day type="sat">Շ</day>
+							<day type="sat">Շբ</day>
 						</dayWidth>
 						<dayWidth type="short">
 							<day type="sun">կիր</day>
@@ -1075,15 +1211,61 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">կգ․</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">կօ․</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">առվտ</dayPeriod>
+							<dayPeriod type="afternoon1">ցրկ</dayPeriod>
+							<dayPeriod type="evening1">երկ</dayPeriod>
+							<dayPeriod type="night1">գշր</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">կա</dayPeriod>
-							<dayPeriod type="noon">կ</dayPeriod>
-							<dayPeriod type="pm">կհ</dayPeriod>
+							<dayPeriod type="midnight">կգ․</dayPeriod>
+							<dayPeriod type="am">a</dayPeriod>
+							<dayPeriod type="noon">կօ․</dayPeriod>
+							<dayPeriod type="pm">p</dayPeriod>
+							<dayPeriod type="morning1">առվտ</dayPeriod>
+							<dayPeriod type="afternoon1">ցրկ</dayPeriod>
+							<dayPeriod type="evening1">երկ</dayPeriod>
+							<dayPeriod type="night1">գշր</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">կեսօրից առաջ</dayPeriod>
-							<dayPeriod type="noon">կեսօրին</dayPeriod>
-							<dayPeriod type="pm">կեսօրից հետո</dayPeriod>
+							<dayPeriod type="midnight">կեսգիշեր</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">կեսօր</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">առավոտյան</dayPeriod>
+							<dayPeriod type="afternoon1">կեսօրից հետո</dayPeriod>
+							<dayPeriod type="evening1">երեկոյան</dayPeriod>
+							<dayPeriod type="night1">գիշերը</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">կեսգիշեր</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">կեսօր</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">առավոտ</dayPeriod>
+							<dayPeriod type="afternoon1">ցերեկ</dayPeriod>
+							<dayPeriod type="evening1">երեկո</dayPeriod>
+							<dayPeriod type="night1">գիշեր</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">կեսգիշեր</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">կեսօր</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">առավոտ</dayPeriod>
+							<dayPeriod type="afternoon1">ցերեկ</dayPeriod>
+							<dayPeriod type="evening1">երեկո</dayPeriod>
+							<dayPeriod type="night1">գիշեր</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1189,6 +1371,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">d MMM, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">MM.y</dateFormatItem>
@@ -1197,11 +1380,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yMMM">yթ. LLL</dateFormatItem>
 						<dateFormatItem id="yMMMd">d MMM, yթ.</dateFormatItem>
 						<dateFormatItem id="yMMMEd">yթ. MMM d, E</dateFormatItem>
+						<dateFormatItem id="yMMMM">yթ․ MMMM</dateFormatItem>
 						<dateFormatItem id="yQQQ">y թ, QQQ</dateFormatItem>
 						<dateFormatItem id="yQQQQ">y թ, QQQQ</dateFormatItem>
 					</availableFormats>
 					<appendItems>
-						<appendItem request="Timezone">{0}, {1}</appendItem>
+						<appendItem request="Timezone">{0} {1}</appendItem>
 					</appendItems>
 					<intervalFormats>
 						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
@@ -1225,17 +1409,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="m">H:mm–H:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a – h:mm a, v</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a, v</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a, v</greatestDifference>
+							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hmv">
 							<greatestDifference id="H">H:mm–H:mm, v</greatestDifference>
 							<greatestDifference id="m">H:mm–H:mm, v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a, v</greatestDifference>
-							<greatestDifference id="h">h–h a, v</greatestDifference>
+							<greatestDifference id="a">h a – h a v</greatestDifference>
+							<greatestDifference id="h">h–h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
 							<greatestDifference id="H">H–H, v</greatestDifference>
@@ -1281,12 +1465,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
 							<greatestDifference id="M">MMM–MMM yթ.</greatestDifference>
-							<greatestDifference id="y">MMM y – MMM yթ.</greatestDifference>
+							<greatestDifference id="y">y MMM – y MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
 							<greatestDifference id="d">dd–dd MMM, yթ.</greatestDifference>
 							<greatestDifference id="M">dd MMM – dd MMM, yթ.</greatestDifference>
-							<greatestDifference id="y">dd MMM, y – dd MMM, yթ.</greatestDifference>
+							<greatestDifference id="y">dd MMM, yթ․ – dd MMM, yթ.</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
 							<greatestDifference id="d">E, d MMM – E, d MMM, yթ.</greatestDifference>
@@ -1295,7 +1479,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
 							<greatestDifference id="M">yթ. MMM – MMM</greatestDifference>
-							<greatestDifference id="y">MMM y – MMM yթ.</greatestDifference>
+							<greatestDifference id="y">MMM yթ․ – MMM yթ.</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -1390,6 +1574,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>ամս.</displayName>
+				<relative type="-1">անցյալ ամիս</relative>
+				<relative type="0">այս ամիս</relative>
+				<relative type="1">հաջորդ ամիս</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ամիս անց</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ամիս անց</relativeTimePattern>
@@ -1401,6 +1588,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>ամս.</displayName>
+				<relative type="-1">անցյալ ամիս</relative>
+				<relative type="0">այս ամիս</relative>
+				<relative type="1">հաջորդ ամիս</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ամիս անց</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ամիս անց</relativeTimePattern>
@@ -1464,6 +1654,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>Օր</displayName>
+				<relative type="-2">երեկ չէ առաջի օրը</relative>
+				<relative type="-1">երեկ</relative>
+				<relative type="0">այսօր</relative>
+				<relative type="1">վաղը</relative>
+				<relative type="2">վաղը չէ մյուս օրը</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} օրից</relativeTimePattern>
 					<relativeTimePattern count="other">{0} օրից</relativeTimePattern>
@@ -1475,6 +1670,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>Օր</displayName>
+				<relative type="-2">երեկ չէ առաջի օրը</relative>
+				<relative type="-1">երեկ</relative>
+				<relative type="0">այսօր</relative>
+				<relative type="1">վաղը</relative>
+				<relative type="2">վաղը չէ մյուս օրը</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} օրից</relativeTimePattern>
 					<relativeTimePattern count="other">{0} օրից</relativeTimePattern>
@@ -1578,9 +1778,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">հաջորդ ուր.</relative>
 			</field>
 			<field type="sat">
-				<relative type="-1">անցյալ շաբաթ</relative>
-				<relative type="0">այս շաբաթ</relative>
-				<relative type="1">հաջորդ շաբաթ</relative>
+				<relative type="-1">անցյալ շաբաթ օրը</relative>
+				<relative type="0">այս շաբաթ օրը</relative>
+				<relative type="1">հաջորդ շաբաթ օրը</relative>
 			</field>
 			<field type="sat-short">
 				<relative type="-1">անցյալ շբթ.</relative>
@@ -1723,7 +1923,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Անտիգուա</exemplarCity>
 			</zone>
 			<zone type="America/Anguilla">
-				<exemplarCity>Անգիլիա</exemplarCity>
+				<exemplarCity>Անգիլյա</exemplarCity>
 			</zone>
 			<zone type="Europe/Tirane">
 				<exemplarCity>Տիրանա</exemplarCity>
@@ -2308,7 +2508,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Ջերսի</exemplarCity>
 			</zone>
 			<zone type="America/Jamaica">
-				<exemplarCity>Ջամայկա</exemplarCity>
+				<exemplarCity>Ճամայկա</exemplarCity>
 			</zone>
 			<zone type="Asia/Amman">
 				<exemplarCity>Ամման</exemplarCity>
@@ -2356,13 +2556,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Ակտաու</exemplarCity>
 			</zone>
 			<zone type="Asia/Oral">
-				<exemplarCity>Օրալ</exemplarCity>
+				<exemplarCity>Ուրալսկ</exemplarCity>
 			</zone>
 			<zone type="Asia/Aqtobe">
 				<exemplarCity>Ակտոբե</exemplarCity>
 			</zone>
 			<zone type="Asia/Qyzylorda">
-				<exemplarCity>Քիզիլօրդա</exemplarCity>
+				<exemplarCity>Կիզիլորդա</exemplarCity>
 			</zone>
 			<zone type="Asia/Almaty">
 				<exemplarCity>Ալմաթի</exemplarCity>
@@ -2658,6 +2858,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Իրկուտսկ</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Չիտա</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Յակուտսկ</exemplarCity>
 			</zone>
@@ -2676,6 +2879,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Մագադան</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Սրեդնեկոլիմսկ</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Կամչատկա</exemplarCity>
 			</zone>
@@ -2998,16 +3204,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="America_Central">
 				<long>
-					<generic>Միջին ամերիկյան ժամանակ</generic>
-					<standard>Միջին ամերիկյան ստանդարտ ժամանակ</standard>
-					<daylight>Միջին ամերիկյան ամառային ժամանակ</daylight>
+					<generic>Կենտրոնական Ամերիկայի ժամանակ</generic>
+					<standard>Կենտրոնական Ամերիկայի ստանդարտ ժամանակ</standard>
+					<daylight>Կենտրոնական Ամերիկայի ամառային ժամանակ</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
-					<generic>Արևելաամերիկյան ժամանակ</generic>
-					<standard>Արևելաամերիկյան ստանդարտ ժամանակ</standard>
-					<daylight>Արևելաամերիկյան ամառային ժամանակ</daylight>
+					<generic>Արևելյան Ամերիկայի ժամանակ</generic>
+					<standard>Արևելյան Ամերիկայի ստանդարտ ժամանակ</standard>
+					<daylight>Արևելյան Ամերիկայի ամառային ժամանակ</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Mountain">
@@ -3237,16 +3443,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Europe_Central">
 				<long>
-					<generic>Կենտրոնաեվրոպական ժամանակ</generic>
-					<standard>Կենտրոնաեվրոպական ստանդարտ ժամանակ</standard>
-					<daylight>Կենտրոնաեվրոպական ամառային ժամանակ</daylight>
+					<generic>Կենտրոնական Եվրոպայի ժամանակ</generic>
+					<standard>Կենտրոնական Եվրոպայի ստանդարտ ժամանակ</standard>
+					<daylight>Կենտրոնական Եվրոպայի ամառային ժամանակ</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Eastern">
 				<long>
-					<generic>Արևելաեվրոպական ժամանակ</generic>
-					<standard>Արևելաեվրոպական ստանդարտ ժամանակ</standard>
-					<daylight>Արևելաեվրոպական ամառային ժամանակ</daylight>
+					<generic>Արևելյան Եվրոպայի ժամանակ</generic>
+					<standard>Արևելյան Եվրոպայի ստանդարտ ժամանակ</standard>
+					<daylight>Արևելյան Եվրոպայի ամառային ժամանակ</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
@@ -3256,9 +3462,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Europe_Western">
 				<long>
-					<generic>Արևմտաեվրոպական ժամանակ</generic>
-					<standard>Արևմտաեվրոպական ստանդարտ ժամանակ</standard>
-					<daylight>Արևմտաեվրոպական ամառային ժամանակ</daylight>
+					<generic>Արևմտյան Եվրոպայի ժամանակ</generic>
+					<standard>Արևմտյան Եվրոպայի ստանդարտ ժամանակ</standard>
+					<daylight>Արևմտյան Եվրոպայի ամառային ժամանակ</daylight>
 				</long>
 			</metazone>
 			<metazone type="Falkland">
@@ -3328,7 +3534,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Gulf">
 				<long>
-					<standard>Պարսից ծոցի ժամանակ</standard>
+					<standard>Պարսից ծոցի ստանդարտ ժամանակ</standard>
 				</long>
 			</metazone>
 			<metazone type="Guyana">
@@ -3359,7 +3565,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="India">
 				<long>
-					<standard>Հնդկաստանի ժամանակ</standard>
+					<standard>Հնդկաստանի ստանդարտ ժամանակ</standard>
 				</long>
 			</metazone>
 			<metazone type="Indian_Ocean">
@@ -3925,17 +4131,45 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<percentFormats numberSystem="latn">
 			<percentFormatLength>
 				<percentFormat>
-					<pattern>#0%</pattern>
+					<pattern>#,##0%</pattern>
 				</percentFormat>
 			</percentFormatLength>
 		</percentFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
-					<pattern>#0.00 ¤</pattern>
+					<pattern>¤ #,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern>#0.00 ¤</pattern>
+					<pattern>¤ #,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0 հզր ¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0 հզր ¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00 հզր ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00 հզր ¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000 հզր ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000 հզր ¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0 մլն ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0 մլն ¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00 մլն ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00 մլն ¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000 մլն ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000 մլն ¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0 մլրդ ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0 մլրդ ¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00 մլրդ ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00 մլրդ ¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000 մլրդ ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000 մլրդ ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0 տրլն ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0 տրլն ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00 տրլն ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00 տրլն ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000 տրլն ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000 տրլն ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
@@ -4155,6 +4389,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Կուբական փոխարկելի պեսո</displayName>
 				<displayName count="other">Կուբական փոխարկելի պեսո</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>Կուբական պեսո</displayName>
@@ -4281,6 +4516,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Գվատեմալական կետսալ</displayName>
 				<displayName count="other">Գվատեմալական կետսալ</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GYD">
 				<displayName>Գայանական դոլար</displayName>
@@ -4301,6 +4537,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Հոնդուրասական լեմպրիա</displayName>
 				<displayName count="other">Հոնդուրասական լեմպրիա</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRK">
 				<displayName>Խորվաթական կունա</displayName>
@@ -4585,6 +4822,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Նիկարագուական կորդոբա</displayName>
 				<displayName count="other">Նիկարագուական կորդոբա</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NOK">
 				<displayName>Նորվեգական կրոնա</displayName>
@@ -4778,6 +5016,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Թաիլանդական բատ</displayName>
 				<displayName count="other">Թաիլանդական բատ</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJS">
 				<displayName>Տաջիկական սոմոնի</displayName>
@@ -4899,6 +5138,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Արևելակարիբյան դոլար</displayName>
 				<displayName count="other">Արևելակարիբյան դոլար</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XOF">
 				<displayName>Աֆրիկական ֆինանսական համայնքի ֆրանկ BCEAO</displayName>
@@ -4961,6 +5201,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} մետր /վայրկյան քառակուսի</unitPattern>
 				<unitPattern count="other">{0} մետր /վայրկյան քառակուսի</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>պտույտ</displayName>
+				<unitPattern count="one">{0} պտույտ</unitPattern>
+				<unitPattern count="other">{0} պտույտ</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>ռադիան</displayName>
+				<unitPattern count="one">{0} ռադիան</unitPattern>
+				<unitPattern count="other">{0} ռադիան</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>աստիճան</displayName>
+				<unitPattern count="one">{0} աստիճան</unitPattern>
+				<unitPattern count="other">{0} աստիճան</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>արկրոպե</displayName>
 				<unitPattern count="one">{0} արկրոպե</unitPattern>
@@ -4971,31 +5226,41 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} արկվայրկյան</unitPattern>
 				<unitPattern count="other">{0} արկվայրկյան</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>աստիճան</displayName>
-				<unitPattern count="one">{0} աստիճան</unitPattern>
-				<unitPattern count="other">{0} աստիճան</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>ռադիան</displayName>
-				<unitPattern count="one">{0} ռադիան</unitPattern>
-				<unitPattern count="other">{0} ռադիան</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ակր</displayName>
-				<unitPattern count="one">{0} ակր</unitPattern>
-				<unitPattern count="other">{0} ակր</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>քառակուսի կիլոմետր</displayName>
+				<unitPattern count="one">{0} քառակուսի կիլոմետր</unitPattern>
+				<unitPattern count="other">{0} քառակուսի կիլոմետր</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>հեկտար</displayName>
 				<unitPattern count="one">{0} հեկտար</unitPattern>
 				<unitPattern count="other">{0} հեկտար</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>քառակուսի մետր</displayName>
+				<unitPattern count="one">{0} քառակուսի մետր</unitPattern>
+				<unitPattern count="other">{0} քառակուսի մետր</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>քառակուսի սանտիմետր</displayName>
 				<unitPattern count="one">{0} քառակուսի սանտիմետր</unitPattern>
 				<unitPattern count="other">{0} քառակուսի սանտիմետր</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<displayName>քառակուսի մղոն</displayName>
+				<unitPattern count="one">{0} քառակուսի մղոն</unitPattern>
+				<unitPattern count="other">{0} քառակուսի մղոն</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ակր</displayName>
+				<unitPattern count="one">{0} ակր</unitPattern>
+				<unitPattern count="other">{0} ակր</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>քառակուսի յարդ</displayName>
+				<unitPattern count="one">{0} քառակուսի յարդ</unitPattern>
+				<unitPattern count="other">{0} քառակուսի յարդ</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<displayName>քառակուսի ֆուտ</displayName>
 				<unitPattern count="one">{0} քառակուսի ֆուտ</unitPattern>
@@ -5006,160 +5271,165 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} քառակուսի դյույմ</unitPattern>
 				<unitPattern count="other">{0} քառակուսի դյույմ</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>քառակուսի կիլոմետր</displayName>
-				<unitPattern count="one">{0} քառակուսի կիլոմետր</unitPattern>
-				<unitPattern count="other">{0} քառակուսի կիլոմետր</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>քառակուսի մետր</displayName>
-				<unitPattern count="one">{0} քառակուսի մետր</unitPattern>
-				<unitPattern count="other">{0} քառակուսի մետր</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>քառակուսի մղոն</displayName>
-				<unitPattern count="one">{0} քառակուսի մղոն</unitPattern>
-				<unitPattern count="other">{0} քառակուսի մղոն</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>քառակուսի յարդ</displayName>
-				<unitPattern count="one">{0} քառակուսի յարդ</unitPattern>
-				<unitPattern count="other">{0} քառակուսի յարդ</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>կարատ</displayName>
+				<unitPattern count="one">{0} կարատ</unitPattern>
+				<unitPattern count="other">{0} կարատ</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>լիտր / կիլոմետր</displayName>
 				<unitPattern count="one">{0} լիտր / կիլոմետր</unitPattern>
 				<unitPattern count="other">{0} լիտր / կիլոմետր</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>լիտրեր 100 կիլոմետրում</displayName>
+				<unitPattern count="one">{0} լիտր 100 կիլոմետրում</unitPattern>
+				<unitPattern count="other">{0} լիտր 100 կիլոմետրում</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>մղոն / գալոն</displayName>
 				<unitPattern count="one">{0} մղոն / գալոն</unitPattern>
 				<unitPattern count="other">{0} մղոն / գալոն</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>բիթ</displayName>
-				<unitPattern count="one">{0} բիթ</unitPattern>
-				<unitPattern count="other">{0} բիթ</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>բայթ</displayName>
-				<unitPattern count="one">{0} բայթ</unitPattern>
-				<unitPattern count="other">{0} բայթ</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>գեգաբիթ</displayName>
-				<unitPattern count="one">{0} գեգաբիթ</unitPattern>
-				<unitPattern count="other">{0} գեգաբիթ</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>գեգաբայթ</displayName>
-				<unitPattern count="one">{0} գեգաբայթ</unitPattern>
-				<unitPattern count="other">{0} գեգաբայթ</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>կիլոբիթ</displayName>
-				<unitPattern count="one">{0} կիլոբիթ</unitPattern>
-				<unitPattern count="other">{0} կիլոբիթ</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>կիլոբայթ</displayName>
-				<unitPattern count="one">{0} կիլոբայթ</unitPattern>
-				<unitPattern count="other">{0} կիլոբայթ</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>մեգաբիթ</displayName>
-				<unitPattern count="one">{0} մեգաբիթ</unitPattern>
-				<unitPattern count="other">{0} մեգաբիթ</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>մեգաբայթ</displayName>
-				<unitPattern count="one">{0} մեգաբայթ</unitPattern>
-				<unitPattern count="other">{0} մեգաբայթ</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>տերաբիթ</displayName>
-				<unitPattern count="one">{0} տերաբիթ</unitPattern>
-				<unitPattern count="other">{0} տերաբիթ</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
-				<displayName>տերաբայթ</displayName>
+				<displayName>տերաբայթեր</displayName>
 				<unitPattern count="one">{0} տերաբայթ</unitPattern>
 				<unitPattern count="other">{0} տերաբայթ</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>տերաբիթեր</displayName>
+				<unitPattern count="one">{0} տերաբիթ</unitPattern>
+				<unitPattern count="other">{0} տերաբիթ</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>գիգաբայթեր</displayName>
+				<unitPattern count="one">{0} գիգաբայթ</unitPattern>
+				<unitPattern count="other">{0} գիգաբայթ</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>գիգաբիթեր</displayName>
+				<unitPattern count="one">{0} գիգաբիթ</unitPattern>
+				<unitPattern count="other">{0} գիգաբիթ</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>մեգաբայթեր</displayName>
+				<unitPattern count="one">{0} մեգաբայթ</unitPattern>
+				<unitPattern count="other">{0} մեգաբայթ</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>մեգաբիթեր</displayName>
+				<unitPattern count="one">{0} մեգաբիթ</unitPattern>
+				<unitPattern count="other">{0} մեգաբիթ</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>կիլոբայթեր</displayName>
+				<unitPattern count="one">{0} կիլոբայթ</unitPattern>
+				<unitPattern count="other">{0} կիլոբայթ</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>կիլոբիթեր</displayName>
+				<unitPattern count="one">{0} կիլոբիթ</unitPattern>
+				<unitPattern count="other">{0} կիլոբիթ</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>բայթեր</displayName>
+				<unitPattern count="one">{0} բայթ</unitPattern>
+				<unitPattern count="other">{0} բայթ</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>բիթեր</displayName>
+				<unitPattern count="one">{0} բիթ</unitPattern>
+				<unitPattern count="other">{0} բիթ</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>դարեր</displayName>
+				<unitPattern count="one">{0} դար</unitPattern>
+				<unitPattern count="other">{0} դար</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>տարիներ</displayName>
+				<unitPattern count="one">{0} տարի</unitPattern>
+				<unitPattern count="other">{0} տարի</unitPattern>
+				<perUnitPattern>տարեկան {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ամիսներ</displayName>
+				<unitPattern count="one">{0} ամիս</unitPattern>
+				<unitPattern count="other">{0} ամիս</unitPattern>
+				<perUnitPattern>ամսական {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>շաբաթներ</displayName>
+				<unitPattern count="one">{0} շաբաթ</unitPattern>
+				<unitPattern count="other">{0} շաբաթ</unitPattern>
+				<perUnitPattern>շաբաթական {0}</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
-				<displayName>օր</displayName>
+				<displayName>օրեր</displayName>
 				<unitPattern count="one">{0} օր</unitPattern>
 				<unitPattern count="other">{0} օր</unitPattern>
+				<perUnitPattern>օրական {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName>ժամ</displayName>
+				<displayName>ժամեր</displayName>
 				<unitPattern count="one">{0} ժամ</unitPattern>
 				<unitPattern count="other">{0} ժամ</unitPattern>
 				<perUnitPattern>{0} ժամում</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>միկրովայրկյան</displayName>
-				<unitPattern count="one">{0} միկրովայրկյան</unitPattern>
-				<unitPattern count="other">{0} միկրովայրկյան</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>միլիվայրկյան</displayName>
-				<unitPattern count="one">{0} միլիվայրկյան</unitPattern>
-				<unitPattern count="other">{0} միլիվայրկյան</unitPattern>
-			</unit>
 			<unit type="duration-minute">
-				<displayName>րոպե</displayName>
+				<displayName>րոպեներ</displayName>
 				<unitPattern count="one">{0} րոպե</unitPattern>
 				<unitPattern count="other">{0} րոպե</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>ամիս</displayName>
-				<unitPattern count="one">{0} ամիս</unitPattern>
-				<unitPattern count="other">{0} ամիս</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>նանովայրկյան</displayName>
-				<unitPattern count="one">{0} նանովայրկյան</unitPattern>
-				<unitPattern count="other">{0} նանովայրկյան</unitPattern>
+				<perUnitPattern>{0} րոպեում</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
-				<displayName>վայրկյան</displayName>
+				<displayName>վայրկյաններ</displayName>
 				<unitPattern count="one">{0} վայրկյան</unitPattern>
 				<unitPattern count="other">{0} վայրկյան</unitPattern>
 				<perUnitPattern>{0} վայրկյանում</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>շաբաթ</displayName>
-				<unitPattern count="one">{0} շաբաթ</unitPattern>
-				<unitPattern count="other">{0} շաբաթ</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>միլիվայրկյաններ</displayName>
+				<unitPattern count="one">{0} միլիվայրկյան</unitPattern>
+				<unitPattern count="other">{0} միլիվայրկյան</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>տարի</displayName>
-				<unitPattern count="one">{0} տարի</unitPattern>
-				<unitPattern count="other">{0} տարի</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>միկրովայրկյաններ</displayName>
+				<unitPattern count="one">{0} միկրովայրկյան</unitPattern>
+				<unitPattern count="other">{0} միկրովայրկյան</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>նանովայրկյաններ</displayName>
+				<unitPattern count="one">{0} նանովայրկյան</unitPattern>
+				<unitPattern count="other">{0} նանովայրկյան</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
-				<displayName>ամպեր</displayName>
+				<displayName>ամպերներ</displayName>
 				<unitPattern count="one">{0} ամպեր</unitPattern>
 				<unitPattern count="other">{0} ամպեր</unitPattern>
 			</unit>
 			<unit type="electric-milliampere">
-				<displayName>միլիամպեր</displayName>
+				<displayName>միլիամպերներ</displayName>
 				<unitPattern count="one">{0} միլիամպեր</unitPattern>
 				<unitPattern count="other">{0} միլիամպեր</unitPattern>
 			</unit>
 			<unit type="electric-ohm">
-				<displayName>օհմ</displayName>
+				<displayName>օհմեր</displayName>
 				<unitPattern count="one">{0} օհմ</unitPattern>
 				<unitPattern count="other">{0} օհմ</unitPattern>
 			</unit>
 			<unit type="electric-volt">
-				<displayName>վոլտ</displayName>
+				<displayName>վոլտեր</displayName>
 				<unitPattern count="one">{0} վոլտ</unitPattern>
 				<unitPattern count="other">{0} վոլտ</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>կիլոկալորիաներ</displayName>
+				<unitPattern count="one">{0} կիլոկալորիա</unitPattern>
+				<unitPattern count="other">{0} կիլոկալորիա</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
-				<displayName>կալորիա</displayName>
+				<displayName>կալորիաներ</displayName>
 				<unitPattern count="one">{0} կալորիա</unitPattern>
 				<unitPattern count="other">{0} կալորիա</unitPattern>
 			</unit>
@@ -5168,226 +5438,211 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Կալորիա</unitPattern>
 				<unitPattern count="other">{0} Կալորիա</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>ջոուլ</displayName>
-				<unitPattern count="one">{0} ջոուլ</unitPattern>
-				<unitPattern count="other">{0} ջոուլ</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>կիլոկալորիա</displayName>
-				<unitPattern count="one">{0} կիլոկալորիա</unitPattern>
-				<unitPattern count="other">{0} կիլոկալորիա</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
-				<displayName>կիլոջոուլ</displayName>
+				<displayName>կիլոջոուլներ</displayName>
 				<unitPattern count="one">{0} կիլոջոուլ</unitPattern>
 				<unitPattern count="other">{0} կիլոջոուլ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>ջոուլներ</displayName>
+				<unitPattern count="one">{0} ջոուլ</unitPattern>
+				<unitPattern count="other">{0} ջոուլ</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>կիլովատ / ժամ</displayName>
 				<unitPattern count="one">{0} կիլովատ / ժամ</unitPattern>
 				<unitPattern count="other">{0} կիլովատ / ժամ</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
-				<displayName>գեգահերց</displayName>
-				<unitPattern count="one">{0} գեգահերց</unitPattern>
-				<unitPattern count="other">{0} գեգահերց</unitPattern>
-			</unit>
-			<unit type="frequency-hertz">
-				<displayName>հերց</displayName>
-				<unitPattern count="one">{0} հերց</unitPattern>
-				<unitPattern count="other">{0} հերց</unitPattern>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<displayName>կիլոհերց</displayName>
-				<unitPattern count="one">{0} կիլոհերց</unitPattern>
-				<unitPattern count="other">{0} կիլոհերց</unitPattern>
+				<displayName>գիգահերցեր</displayName>
+				<unitPattern count="one">{0} գիգահերց</unitPattern>
+				<unitPattern count="other">{0} գիգահերց</unitPattern>
 			</unit>
 			<unit type="frequency-megahertz">
-				<displayName>մեգահերց</displayName>
+				<displayName>մեգահերցեր</displayName>
 				<unitPattern count="one">{0} մեգահերց</unitPattern>
 				<unitPattern count="other">{0} մեգահերց</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>աստղագիտական միավոր</displayName>
-				<unitPattern count="one">{0} աստղագիտական միավոր</unitPattern>
-				<unitPattern count="other">{0} աստղագիտական միավոր</unitPattern>
+			<unit type="frequency-kilohertz">
+				<displayName>կիլոհերցեր</displayName>
+				<unitPattern count="one">{0} կիլոհերց</unitPattern>
+				<unitPattern count="other">{0} կիլոհերց</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>սանտիմետր</displayName>
-				<unitPattern count="one">{0} սանտիմետր</unitPattern>
-				<unitPattern count="other">{0} սանտիմետր</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>հերցեր</displayName>
+				<unitPattern count="one">{0} հերց</unitPattern>
+				<unitPattern count="other">{0} հերց</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>կիլոմետրեր</displayName>
+				<unitPattern count="one">{0} կիլոմետր</unitPattern>
+				<unitPattern count="other">{0} կիլոմետր</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>մետրեր</displayName>
+				<unitPattern count="one">{0} մետր</unitPattern>
+				<unitPattern count="other">{0} մետր</unitPattern>
 			</unit>
 			<unit type="length-decimeter">
-				<displayName>դեցիմետր</displayName>
+				<displayName>դեցիմետրեր</displayName>
 				<unitPattern count="one">{0} դեցիմետր</unitPattern>
 				<unitPattern count="other">{0} դեցիմետր</unitPattern>
 			</unit>
+			<unit type="length-centimeter">
+				<displayName>սանտիմետրեր</displayName>
+				<unitPattern count="one">{0} սանտիմետր</unitPattern>
+				<unitPattern count="other">{0} սանտիմետր</unitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>միլիմետրեր</displayName>
+				<unitPattern count="one">{0} միլիմետր</unitPattern>
+				<unitPattern count="other">{0} միլիմետր</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>միկրոմետրեր</displayName>
+				<unitPattern count="one">{0} միկրոմետր</unitPattern>
+				<unitPattern count="other">{0} միկրոմետր</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>նանոմետրեր</displayName>
+				<unitPattern count="one">{0} նանոմետր</unitPattern>
+				<unitPattern count="other">{0} նանոմետր</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>պիկոմետրեր</displayName>
+				<unitPattern count="one">{0} պիկոմետր</unitPattern>
+				<unitPattern count="other">{0} պիկոմետր</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>մղոններ</displayName>
+				<unitPattern count="one">{0} մղոն</unitPattern>
+				<unitPattern count="other">{0} մղոն</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>յարդեր</displayName>
+				<unitPattern count="one">{0} յարդ</unitPattern>
+				<unitPattern count="other">{0} յարդ</unitPattern>
+			</unit>
 			<unit type="length-foot">
-				<displayName>ֆուտ</displayName>
+				<displayName>ֆուտեր</displayName>
 				<unitPattern count="one">{0} ֆուտ</unitPattern>
 				<unitPattern count="other">{0} ֆուտ</unitPattern>
 			</unit>
 			<unit type="length-inch">
-				<displayName>դյույմ</displayName>
+				<displayName>դյույմեր</displayName>
 				<unitPattern count="one">{0} դյույմ</unitPattern>
 				<unitPattern count="other">{0} դյույմ</unitPattern>
 			</unit>
-			<unit type="length-kilometer">
-				<displayName>կիլոմետր</displayName>
-				<unitPattern count="one">{0} կիլոմետր</unitPattern>
-				<unitPattern count="other">{0} կիլոմետր</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>լուսային տարի</displayName>
-				<unitPattern count="one">{0} լուսային տարի</unitPattern>
-				<unitPattern count="other">{0} լուսային տարի</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>մետր</displayName>
-				<unitPattern count="one">{0} մետր</unitPattern>
-				<unitPattern count="other">{0} մետր</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>միկրոմետր</displayName>
-				<unitPattern count="one">{0} միկրոմետր</unitPattern>
-				<unitPattern count="other">{0} միկրոմետր</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>մղոն</displayName>
-				<unitPattern count="one">{0} մղոն</unitPattern>
-				<unitPattern count="other">{0} մղոն</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>միլիմետր</displayName>
-				<unitPattern count="one">{0} միլիմետր</unitPattern>
-				<unitPattern count="other">{0} միլիմետր</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<displayName>նանոմետր</displayName>
-				<unitPattern count="one">{0} նանոմետր</unitPattern>
-				<unitPattern count="other">{0} նանոմետր</unitPattern>
-			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>ծովային մղոն</displayName>
-				<unitPattern count="one">{0} ծովային մղոն</unitPattern>
-				<unitPattern count="other">{0} ծովային մղոն</unitPattern>
-			</unit>
 			<unit type="length-parsec">
-				<displayName>պարսեկ</displayName>
+				<displayName>պարսեկներ</displayName>
 				<unitPattern count="one">{0} պարսեկ</unitPattern>
 				<unitPattern count="other">{0} պարսեկ</unitPattern>
 			</unit>
-			<unit type="length-picometer">
-				<displayName>պիկոմետր</displayName>
-				<unitPattern count="one">{0} պիկոմետր</unitPattern>
-				<unitPattern count="other">{0} պիկոմետր</unitPattern>
+			<unit type="length-light-year">
+				<displayName>լուսատարիներ</displayName>
+				<unitPattern count="one">{0} լուսատարի</unitPattern>
+				<unitPattern count="other">{0} լուսատարի</unitPattern>
 			</unit>
-			<unit type="length-yard">
-				<displayName>յարդ</displayName>
-				<unitPattern count="one">{0} յարդ</unitPattern>
-				<unitPattern count="other">{0} յարդ</unitPattern>
+			<unit type="length-astronomical-unit">
+				<displayName>աստղագիտական միավորներ</displayName>
+				<unitPattern count="one">{0} աստղագիտական միավոր</unitPattern>
+				<unitPattern count="other">{0} աստղագիտական միավոր</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>ծովային մղոններ</displayName>
+				<unitPattern count="one">{0} ծովային մղոն</unitPattern>
+				<unitPattern count="other">{0} ծովային մղոն</unitPattern>
 			</unit>
 			<unit type="light-lux">
 				<displayName>լյուքս</displayName>
 				<unitPattern count="one">{0} լյուքս</unitPattern>
 				<unitPattern count="other">{0} լյուքս</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>կարատ</displayName>
-				<unitPattern count="one">{0} կարատ</unitPattern>
-				<unitPattern count="other">{0} կարատ</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>գրամ</displayName>
-				<unitPattern count="one">{0} գրամ</unitPattern>
-				<unitPattern count="other">{0} գրամ</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>կիլոգրամ</displayName>
-				<unitPattern count="one">{0} կիլոգրամ</unitPattern>
-				<unitPattern count="other">{0} կիլոգրամ</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
-				<displayName>մետրիկ տոննա</displayName>
+				<displayName>մետրիկ տոննաներ</displayName>
 				<unitPattern count="one">{0} մետրիկ տոննա</unitPattern>
 				<unitPattern count="other">{0} մետրիկ տոննա</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>միկրոգրամ</displayName>
-				<unitPattern count="one">{0} միկրոգրամ</unitPattern>
-				<unitPattern count="other">{0} միկրոգրամ</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>կիլոգրամներ</displayName>
+				<unitPattern count="one">{0} կիլոգրամ</unitPattern>
+				<unitPattern count="other">{0} կիլոգրամ</unitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>գրամներ</displayName>
+				<unitPattern count="one">{0} գրամ</unitPattern>
+				<unitPattern count="other">{0} գրամ</unitPattern>
 			</unit>
 			<unit type="mass-milligram">
-				<displayName>միլիգրամ</displayName>
+				<displayName>միլիգրամներ</displayName>
 				<unitPattern count="one">{0} միլիգրամ</unitPattern>
 				<unitPattern count="other">{0} միլիգրամ</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ունց</displayName>
-				<unitPattern count="one">{0} ունց</unitPattern>
-				<unitPattern count="other">{0} ունց</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>միկրոգրամներ</displayName>
+				<unitPattern count="one">{0} միկրոգրամ</unitPattern>
+				<unitPattern count="other">{0} միկրոգրամ</unitPattern>
 			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>տրոյական ունց</displayName>
-				<unitPattern count="one">{0} տրոյական ունց</unitPattern>
-				<unitPattern count="other">{0} տրոյական ունց</unitPattern>
+			<unit type="mass-ton">
+				<displayName>տոննաներ</displayName>
+				<unitPattern count="one">{0} տոննա</unitPattern>
+				<unitPattern count="other">{0} տոննա</unitPattern>
 			</unit>
 			<unit type="mass-pound">
-				<displayName>ֆունտ</displayName>
+				<displayName>ֆունտեր</displayName>
 				<unitPattern count="one">{0} ֆունտ</unitPattern>
 				<unitPattern count="other">{0} ֆունտ</unitPattern>
 			</unit>
-			<unit type="mass-ton">
-				<displayName>տոննա</displayName>
-				<unitPattern count="one">{0} տոննա</unitPattern>
-				<unitPattern count="other">{0} տոննա</unitPattern>
+			<unit type="mass-ounce">
+				<displayName>ունցիաներ</displayName>
+				<unitPattern count="one">{0} ունցիա</unitPattern>
+				<unitPattern count="other">{0} ունցիա</unitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>տրոյական ունցիաներ</displayName>
+				<unitPattern count="one">{0} տրոյական ունցիա</unitPattern>
+				<unitPattern count="other">{0} տրոյական ունցիա</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>կարատներ</displayName>
+				<unitPattern count="one">{0} կարատ</unitPattern>
+				<unitPattern count="other">{0} կարատ</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<displayName>գեգավատ</displayName>
 				<unitPattern count="one">{0} գեգավատ</unitPattern>
 				<unitPattern count="other">{0} գեգավատ</unitPattern>
 			</unit>
+			<unit type="power-megawatt">
+				<displayName>մեգավատեր</displayName>
+				<unitPattern count="one">{0} մեգավատ</unitPattern>
+				<unitPattern count="other">{0} մեգավատ</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>կիլովատեր</displayName>
+				<unitPattern count="one">{0} կիլովատ</unitPattern>
+				<unitPattern count="other">{0} կիլովատ</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>վատեր</displayName>
+				<unitPattern count="one">{0} վատ</unitPattern>
+				<unitPattern count="other">{0} վատ</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>միլիվատեր</displayName>
+				<unitPattern count="one">{0} միլիվատ</unitPattern>
+				<unitPattern count="other">{0} միլիվատ</unitPattern>
+			</unit>
 			<unit type="power-horsepower">
 				<displayName>ձիաուժ</displayName>
 				<unitPattern count="one">{0} ձիաուժ</unitPattern>
 				<unitPattern count="other">{0} ձիաուժ</unitPattern>
 			</unit>
-			<unit type="power-kilowatt">
-				<displayName>կիլովատ</displayName>
-				<unitPattern count="one">{0} կիլովատ</unitPattern>
-				<unitPattern count="other">{0} կիլովատ</unitPattern>
-			</unit>
-			<unit type="power-megawatt">
-				<displayName>մեգավատ</displayName>
-				<unitPattern count="one">{0} մեգավատ</unitPattern>
-				<unitPattern count="other">{0} մեգավատ</unitPattern>
-			</unit>
-			<unit type="power-milliwatt">
-				<displayName>միլիվատ</displayName>
-				<unitPattern count="one">{0} միլիվատ</unitPattern>
-				<unitPattern count="other">{0} միլիվատ</unitPattern>
-			</unit>
-			<unit type="power-watt">
-				<displayName>վատ</displayName>
-				<unitPattern count="one">{0} վատ</unitPattern>
-				<unitPattern count="other">{0} վատ</unitPattern>
-			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>հեկտապասկալ</displayName>
 				<unitPattern count="one">{0} հեկտապասկալ</unitPattern>
 				<unitPattern count="other">{0} հեկտապասկալ</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>դյույմ սնդիկի սյուն</displayName>
-				<unitPattern count="one">{0} դյույմ սնդիկի սյուն</unitPattern>
-				<unitPattern count="other">{0} դյույմ սնդիկի սյուն</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>միլիբար</displayName>
-				<unitPattern count="one">{0} միլիբար</unitPattern>
-				<unitPattern count="other">{0} միլիբար</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>միլիմետր սնդիկի սյուն</displayName>
 				<unitPattern count="one">{0} միլիմետր սնդիկի սյուն</unitPattern>
@@ -5398,28 +5653,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ֆունտ ըստ քառակուսի դյույմի</unitPattern>
 				<unitPattern count="other">{0} ֆունտ ըստ քառակուսի դյույմի</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>կարատ</displayName>
-				<unitPattern count="one">{0} կարատ</unitPattern>
-				<unitPattern count="other">{0} կարատ</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>դյույմ սնդիկի սյուն</displayName>
+				<unitPattern count="one">{0} դյույմ սնդիկի սյուն</unitPattern>
+				<unitPattern count="other">{0} դյույմ սնդիկի սյուն</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>միլիբար</displayName>
+				<unitPattern count="one">{0} միլիբար</unitPattern>
+				<unitPattern count="other">{0} միլիբար</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName>կիլոմետր / ժամ</displayName>
-				<unitPattern count="one">{0} կիլոմետր / ժամ</unitPattern>
-				<unitPattern count="other">{0} կիլոմետր / ժամ</unitPattern>
+				<displayName>կիլոմետրեր ժամում</displayName>
+				<unitPattern count="one">{0} կիլոմետր ժամում</unitPattern>
+				<unitPattern count="other">{0} կիլոմետր ժամում</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
-				<displayName>մետր / վայրկյան</displayName>
-				<unitPattern count="one">{0} մետր / վայրկյան</unitPattern>
-				<unitPattern count="other">{0} մետր / վայրկյան</unitPattern>
+				<displayName>մետրեր վայրկյանում</displayName>
+				<unitPattern count="one">{0} մետր վայրկյանում</unitPattern>
+				<unitPattern count="other">{0} մետր վայրկյանում</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<displayName>մղոն / ժամ</displayName>
-				<unitPattern count="one">{0} մղոն / ժամ</unitPattern>
-				<unitPattern count="other">{0} մղոն / ժամ</unitPattern>
+				<displayName>մղոններ ժամում</displayName>
+				<unitPattern count="one">{0} մղոն ժամում</unitPattern>
+				<unitPattern count="other">{0} մղոն ժամում</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>հանգույցներ</displayName>
+				<unitPattern count="one">{0} հանգույց</unitPattern>
+				<unitPattern count="other">{0} հանգույց</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
-				<displayName>աստիճան ըստ Ցելսիուսի</displayName>
+				<displayName>աստիճաններ ըստ Ցելսիուսի</displayName>
 				<unitPattern count="one">{0} աստիճան ըստ Ցելսիուսի</unitPattern>
 				<unitPattern count="other">{0} աստիճան ըստ Ցելսիուսի</unitPattern>
 			</unit>
@@ -5433,31 +5703,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} աստիճան ըստ Կելվինի</unitPattern>
 				<unitPattern count="other">{0} աստիճան ըստ Կելվինի</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ակր ֆուտ</displayName>
-				<unitPattern count="one">{0} ակր ֆուտ</unitPattern>
-				<unitPattern count="other">{0} ակր ֆուտ</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>սանտիլիտր</displayName>
-				<unitPattern count="one">{0} սանտիլիտր</unitPattern>
-				<unitPattern count="other">{0} սանտիլիտր</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>խորանարդ սանտիմետր</displayName>
-				<unitPattern count="one">{0} խորանարդ սանտիմետր</unitPattern>
-				<unitPattern count="other">{0} խորանարդ սանտիմետր</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>խորանարդ ֆուտ</displayName>
-				<unitPattern count="one">{0} խորանարդ ֆուտ</unitPattern>
-				<unitPattern count="other">{0} խորանարդ ֆուտ</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>խորանարդ դյույմ</displayName>
-				<unitPattern count="one">{0} խորանարդ դյույմ</unitPattern>
-				<unitPattern count="other">{0} խորանարդ դյույմ</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>խորանարդ կիլոմետր</displayName>
 				<unitPattern count="one">{0} խորանարդ կիլոմետր</unitPattern>
@@ -5468,6 +5713,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} խորանարդ մետր</unitPattern>
 				<unitPattern count="other">{0} խորանարդ մետր</unitPattern>
 			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>խորանարդ սանտիմետր</displayName>
+				<unitPattern count="one">{0} խորանարդ սանտիմետր</unitPattern>
+				<unitPattern count="other">{0} խորանարդ սանտիմետր</unitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>խորանարդ մղոն</displayName>
 				<unitPattern count="one">{0} խորանարդ մղոն</unitPattern>
@@ -5478,56 +5728,81 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} խորանարդ յարդ</unitPattern>
 				<unitPattern count="other">{0} խորանարդ յարդ</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>բաժակ</displayName>
-				<unitPattern count="one">{0} բաժակ</unitPattern>
-				<unitPattern count="other">{0} բաժակ</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>խորանարդ ֆուտ</displayName>
+				<unitPattern count="one">{0} խորանարդ ֆուտ</unitPattern>
+				<unitPattern count="other">{0} խորանարդ ֆուտ</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>խորանարդ դյույմ</displayName>
+				<unitPattern count="one">{0} խորանարդ դյույմ</unitPattern>
+				<unitPattern count="other">{0} խորանարդ դյույմ</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>մեգալիտրեր</displayName>
+				<unitPattern count="one">{0} մեգալիտր</unitPattern>
+				<unitPattern count="other">{0} մեգալիտր</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>հեկտոլիտրեր</displayName>
+				<unitPattern count="one">{0} հեկտոլիտր</unitPattern>
+				<unitPattern count="other">{0} հեկտոլիտր</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>լիտրեր</displayName>
+				<unitPattern count="one">{0} լիտր</unitPattern>
+				<unitPattern count="other">{0} լիտր</unitPattern>
 			</unit>
 			<unit type="volume-deciliter">
 				<displayName>դեցիլիտր</displayName>
 				<unitPattern count="one">{0} դեցիլիտր</unitPattern>
 				<unitPattern count="other">{0} դեցիլիտր</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>հեղուկ ունց</displayName>
-				<unitPattern count="one">{0} հեղուկ ունց</unitPattern>
-				<unitPattern count="other">{0} հեղուկ ունց</unitPattern>
+			<unit type="volume-centiliter">
+				<displayName>սանտիլիտր</displayName>
+				<unitPattern count="one">{0} սանտիլիտր</unitPattern>
+				<unitPattern count="other">{0} սանտիլիտր</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>միլիլիտրեր</displayName>
+				<unitPattern count="one">{0} միլիլիտր</unitPattern>
+				<unitPattern count="other">{0} միլիլիտր</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>մետրիկ պինտեր</displayName>
+				<unitPattern count="one">{0} մետրիկ պինտ</unitPattern>
+				<unitPattern count="other">{0} մետրիկ պինտ</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ակր ֆուտ</displayName>
+				<unitPattern count="one">{0} ակր ֆուտ</unitPattern>
+				<unitPattern count="other">{0} ակր ֆուտ</unitPattern>
 			</unit>
 			<unit type="volume-gallon">
 				<displayName>գալոն</displayName>
 				<unitPattern count="one">{0} գալոն</unitPattern>
 				<unitPattern count="other">{0} գալոն</unitPattern>
 			</unit>
-			<unit type="volume-hectoliter">
-				<displayName>հեկտոլիտր</displayName>
-				<unitPattern count="one">{0} հեկտոլիտր</unitPattern>
-				<unitPattern count="other">{0} հեկտոլիտր</unitPattern>
-			</unit>
-			<unit type="volume-liter">
-				<displayName>լիտր</displayName>
-				<unitPattern count="one">{0} լիտր</unitPattern>
-				<unitPattern count="other">{0} լիտր</unitPattern>
-			</unit>
-			<unit type="volume-megaliter">
-				<displayName>մեգալիտր</displayName>
-				<unitPattern count="one">{0} մեգալիտր</unitPattern>
-				<unitPattern count="other">{0} մեգալիտր</unitPattern>
-			</unit>
-			<unit type="volume-milliliter">
-				<displayName>միլիլիտր</displayName>
-				<unitPattern count="one">{0} միլիլիտր</unitPattern>
-				<unitPattern count="other">{0} միլիլիտր</unitPattern>
-			</unit>
-			<unit type="volume-pint">
-				<displayName>պինտ</displayName>
-				<unitPattern count="one">{0} պինտ</unitPattern>
-				<unitPattern count="other">{0} պինտ</unitPattern>
-			</unit>
 			<unit type="volume-quart">
 				<displayName>քվարտ</displayName>
 				<unitPattern count="one">{0} քվարտ</unitPattern>
 				<unitPattern count="other">{0} քվարտ</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>պինտեր</displayName>
+				<unitPattern count="one">{0} պինտ</unitPattern>
+				<unitPattern count="other">{0} պինտ</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>բաժակ</displayName>
+				<unitPattern count="one">{0} բաժակ</unitPattern>
+				<unitPattern count="other">{0} բաժակ</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>հեղուկ ունցիաներ</displayName>
+				<unitPattern count="one">{0} հեղուկ ունցիա</unitPattern>
+				<unitPattern count="other">{0} հեղուկ ունցիա</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>ճաշի գդալ</displayName>
 				<unitPattern count="one">{0} ճաշի գդալ</unitPattern>
@@ -5538,6 +5813,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} թեյի գդալ</unitPattern>
 				<unitPattern count="other">{0} թեյի գդալ</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -5553,6 +5834,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} մ/վ²</unitPattern>
 				<unitPattern count="other">{0} մ/վ²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>պտ․</displayName>
+				<unitPattern count="one">{0} պտ․</unitPattern>
+				<unitPattern count="other">{0} պտ․</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>ռադիան</displayName>
+				<unitPattern count="one">{0} ռադ</unitPattern>
+				<unitPattern count="other">{0} ռադ</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>աստիճան</displayName>
+				<unitPattern count="one">{0} աստճ.</unitPattern>
+				<unitPattern count="other">{0} աստճ.</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>արկր.</displayName>
 				<unitPattern count="one">{0} արկր.</unitPattern>
@@ -5563,31 +5859,41 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} արկվրկ.</unitPattern>
 				<unitPattern count="other">{0} արկվրկ.</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>աստիճան</displayName>
-				<unitPattern count="one">{0} աստճ.</unitPattern>
-				<unitPattern count="other">{0} աստճ.</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>ռադիան</displayName>
-				<unitPattern count="one">{0} ռադ</unitPattern>
-				<unitPattern count="other">{0} ռադ</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ակր</displayName>
-				<unitPattern count="one">{0} ակր</unitPattern>
-				<unitPattern count="other">{0} ակր</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>կմ²</displayName>
+				<unitPattern count="one">{0} կմ²</unitPattern>
+				<unitPattern count="other">{0} կմ²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>հեկտար</displayName>
 				<unitPattern count="one">{0} հա</unitPattern>
 				<unitPattern count="other">{0} հա</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>մ²</displayName>
+				<unitPattern count="one">{0} մ²</unitPattern>
+				<unitPattern count="other">{0} մ²</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>քռ. սմ.</displayName>
 				<unitPattern count="one">{0} քռ. սմ.</unitPattern>
 				<unitPattern count="other">{0} քռ. սմ.</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<displayName>քռ. մղ.</displayName>
+				<unitPattern count="one">{0} քռ. մղ.</unitPattern>
+				<unitPattern count="other">{0} քռ. մղ.</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ակր</displayName>
+				<unitPattern count="one">{0} ակր</unitPattern>
+				<unitPattern count="other">{0} ակր</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>քռ. յդ.</displayName>
+				<unitPattern count="one">{0} քռ. յդ.</unitPattern>
+				<unitPattern count="other">{0} քռ. յդ.</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<displayName>քռ. ֆտ.</displayName>
 				<unitPattern count="one">{0} քռ. ֆտ.</unitPattern>
@@ -5598,138 +5904,138 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} քռ. դյմ.</unitPattern>
 				<unitPattern count="other">{0} քռ. դյմ.</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>կմ²</displayName>
-				<unitPattern count="one">{0} կմ²</unitPattern>
-				<unitPattern count="other">{0} կմ²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>մ²</displayName>
-				<unitPattern count="one">{0} մ²</unitPattern>
-				<unitPattern count="other">{0} մ²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>քռ. մղ.</displayName>
-				<unitPattern count="one">{0} քռ. մղ.</unitPattern>
-				<unitPattern count="other">{0} քռ. մղ.</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>քռ. յդ.</displayName>
-				<unitPattern count="one">{0} քռ. յդ.</unitPattern>
-				<unitPattern count="other">{0} քռ. յդ.</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>կար</displayName>
+				<unitPattern count="one">{0} կար</unitPattern>
+				<unitPattern count="other">{0} կար</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>լ/կմ</displayName>
 				<unitPattern count="one">{0} լ/կմ</unitPattern>
 				<unitPattern count="other">{0} լ/կմ</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>լ/100 կմ</displayName>
+				<unitPattern count="one">{0} լ/100 կմ</unitPattern>
+				<unitPattern count="other">{0} լ/100 կմ</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>մղ/գալ</displayName>
 				<unitPattern count="one">{0} մղ/գալ</unitPattern>
 				<unitPattern count="other">{0} մղ/գալ</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>բիթ</displayName>
-				<unitPattern count="one">{0} բիթ</unitPattern>
-				<unitPattern count="other">{0} բիթ</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>բայթ</displayName>
-				<unitPattern count="one">{0} բայթ</unitPattern>
-				<unitPattern count="other">{0} բայթ</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Գբ</displayName>
-				<unitPattern count="one">{0} Գբ</unitPattern>
-				<unitPattern count="other">{0} Գբ</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>ԳԲ</displayName>
-				<unitPattern count="one">{0} ԳԲ</unitPattern>
-				<unitPattern count="other">{0} ԳԲ</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>կբիթ</displayName>
-				<unitPattern count="one">{0} կբիթ</unitPattern>
-				<unitPattern count="other">{0} կբիթ</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>կԲ</displayName>
-				<unitPattern count="one">{0} կԲ</unitPattern>
-				<unitPattern count="other">{0} կԲ</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Մբիթ</displayName>
-				<unitPattern count="one">{0} Մբիթ</unitPattern>
-				<unitPattern count="other">{0} Մբիթ</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>Մբայթ</displayName>
-				<unitPattern count="one">{0} ՄԲ</unitPattern>
-				<unitPattern count="other">{0} ՄԲ</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Տբիթ</displayName>
-				<unitPattern count="one">{0} Տբիթ</unitPattern>
-				<unitPattern count="other">{0} Տբիթ</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>ՏԲ</displayName>
 				<unitPattern count="one">{0} ՏԲ</unitPattern>
 				<unitPattern count="other">{0} ՏԲ</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Տբիթ</displayName>
+				<unitPattern count="one">{0} Տբիթ</unitPattern>
+				<unitPattern count="other">{0} Տբիթ</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>ԳԲ</displayName>
+				<unitPattern count="one">{0} ԳԲ</unitPattern>
+				<unitPattern count="other">{0} ԳԲ</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Գբիթ</displayName>
+				<unitPattern count="one">{0} Գբիթ</unitPattern>
+				<unitPattern count="other">{0} Գբիթ</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>ՄԲ</displayName>
+				<unitPattern count="one">{0} ՄԲ</unitPattern>
+				<unitPattern count="other">{0} ՄԲ</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Մբիթ</displayName>
+				<unitPattern count="one">{0} Մբիթ</unitPattern>
+				<unitPattern count="other">{0} Մբիթ</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>կԲ</displayName>
+				<unitPattern count="one">{0} կԲ</unitPattern>
+				<unitPattern count="other">{0} կԲ</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>Կբիթ</displayName>
+				<unitPattern count="one">{0} Կբիթ</unitPattern>
+				<unitPattern count="other">{0} Կբիթ</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>Բ</displayName>
+				<unitPattern count="one">{0} Բ</unitPattern>
+				<unitPattern count="other">{0} Բ</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>բիթ</displayName>
+				<unitPattern count="one">{0} բիթ</unitPattern>
+				<unitPattern count="other">{0} բիթ</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>դ․</displayName>
+				<unitPattern count="one">{0} դ․</unitPattern>
+				<unitPattern count="other">{0} դ․</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>տ</displayName>
+				<unitPattern count="one">{0} տ</unitPattern>
+				<unitPattern count="other">{0} տ</unitPattern>
+				<perUnitPattern>{0}/տ</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ամս</displayName>
+				<unitPattern count="one">{0} ամս</unitPattern>
+				<unitPattern count="other">{0} ամս</unitPattern>
+				<perUnitPattern>{0}/ամս</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>շբթ</displayName>
+				<unitPattern count="one">{0} շբթ</unitPattern>
+				<unitPattern count="other">{0} շբթ</unitPattern>
+				<perUnitPattern>{0}/շբթ</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>օր</displayName>
 				<unitPattern count="one">{0} օր</unitPattern>
 				<unitPattern count="other">{0} օր</unitPattern>
+				<perUnitPattern>{0}/օր</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName>ժամ</displayName>
-				<unitPattern count="one">{0} ժ.</unitPattern>
-				<unitPattern count="other">{0} ժ.</unitPattern>
+				<displayName>ժ</displayName>
+				<unitPattern count="one">{0} ժ</unitPattern>
+				<unitPattern count="other">{0} ժ</unitPattern>
 				<perUnitPattern>{0}/ժ</perUnitPattern>
 			</unit>
+			<unit type="duration-minute">
+				<displayName>ր</displayName>
+				<unitPattern count="one">{0} ր</unitPattern>
+				<unitPattern count="other">{0} ր</unitPattern>
+				<perUnitPattern>{0}/ր</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>վրկ</displayName>
+				<unitPattern count="one">{0} վրկ</unitPattern>
+				<unitPattern count="other">{0} վրկ</unitPattern>
+				<perUnitPattern>{0}/վրկ</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>մվ</displayName>
+				<unitPattern count="one">{0} մվ</unitPattern>
+				<unitPattern count="other">{0} մվ</unitPattern>
+			</unit>
 			<unit type="duration-microsecond">
 				<displayName>մկվ</displayName>
 				<unitPattern count="one">{0} մկվ</unitPattern>
 				<unitPattern count="other">{0} մկվ</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>մվ</displayName>
-				<unitPattern count="one">{0} մվ</unitPattern>
-				<unitPattern count="other">{0}մվ</unitPattern>
-			</unit>
-			<unit type="duration-minute">
-				<displayName>րոպե</displayName>
-				<unitPattern count="one">{0} րպ.</unitPattern>
-				<unitPattern count="other">{0} րպ.</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>ամիս</displayName>
-				<unitPattern count="one">{0} ամս</unitPattern>
-				<unitPattern count="other">{0} ամս</unitPattern>
-			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>նվ</displayName>
 				<unitPattern count="one">{0} նվ</unitPattern>
 				<unitPattern count="other">{0} նվ</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>վրկ</displayName>
-				<unitPattern count="one">{0} վրկ</unitPattern>
-				<unitPattern count="other">{0} վրկ</unitPattern>
-				<perUnitPattern>{0}/վ</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>շաբաթ</displayName>
-				<unitPattern count="one">{0} շբթ.</unitPattern>
-				<unitPattern count="other">{0} շբթ.</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>տարի</displayName>
-				<unitPattern count="one">{0} տր.</unitPattern>
-				<unitPattern count="other">{0} տր.</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>Ա</displayName>
 				<unitPattern count="one">{0} Ա</unitPattern>
@@ -5741,7 +6047,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} մԱ</unitPattern>
 			</unit>
 			<unit type="electric-ohm">
-				<displayName>Օհմ</displayName>
+				<displayName>Ω</displayName>
 				<unitPattern count="one">{0} Ω</unitPattern>
 				<unitPattern count="other">{0} Ω</unitPattern>
 			</unit>
@@ -5750,6 +6056,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Վ</unitPattern>
 				<unitPattern count="other">{0} Վ</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>կկալ</displayName>
+				<unitPattern count="one">{0} կկալ</unitPattern>
+				<unitPattern count="other">{0} կկալ</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>կալ</displayName>
 				<unitPattern count="one">{0} կալ</unitPattern>
@@ -5760,21 +6071,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Կալ</unitPattern>
 				<unitPattern count="other">{0} Կալ</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>Ջ</displayName>
-				<unitPattern count="one">{0} Ջ</unitPattern>
-				<unitPattern count="other">{0} Ջ</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>կկալ</displayName>
-				<unitPattern count="one">{0} կկալ</unitPattern>
-				<unitPattern count="other">{0} կկալ</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>կՋ</displayName>
 				<unitPattern count="one">{0} կՋ</unitPattern>
 				<unitPattern count="other">{0} կՋ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>Ջ</displayName>
+				<unitPattern count="one">{0} Ջ</unitPattern>
+				<unitPattern count="other">{0} Ջ</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>կՎտ/Ժ</displayName>
 				<unitPattern count="one">{0} կՎտ/Ժ</unitPattern>
@@ -5785,201 +6091,197 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ԳՀց</unitPattern>
 				<unitPattern count="other">{0} ԳՀց</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Հց</displayName>
-				<unitPattern count="one">{0} Հց</unitPattern>
-				<unitPattern count="other">{0} Հց</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>ՄՀց</displayName>
+				<unitPattern count="one">{0} ՄՀց</unitPattern>
+				<unitPattern count="other">{0} ՄՀց</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>կՀց</displayName>
 				<unitPattern count="one">{0} կՀց</unitPattern>
 				<unitPattern count="other">{0} կՀց</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>ՄՀց</displayName>
-				<unitPattern count="one">{0} ՄՀց</unitPattern>
-				<unitPattern count="other">{0} ՄՀց</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Հց</displayName>
+				<unitPattern count="one">{0} Հց</unitPattern>
+				<unitPattern count="other">{0} Հց</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>ա.մ.</displayName>
-				<unitPattern count="one">{0} ա.մ.</unitPattern>
-				<unitPattern count="other">{0} ա.մ.</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>կմ</displayName>
+				<unitPattern count="one">{0} կմ</unitPattern>
+				<unitPattern count="other">{0} կմ</unitPattern>
+				<perUnitPattern>{0}/կմ</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>սմ</displayName>
-				<unitPattern count="one">{0} սմ</unitPattern>
-				<unitPattern count="other">{0} սմ</unitPattern>
+			<unit type="length-meter">
+				<displayName>մ</displayName>
+				<unitPattern count="one">{0} մ</unitPattern>
+				<unitPattern count="other">{0} մ</unitPattern>
+				<perUnitPattern>{0}/մ</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>դմ</displayName>
 				<unitPattern count="one">{0} դմ</unitPattern>
 				<unitPattern count="other">{0} դմ</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ֆուտ</displayName>
-				<unitPattern count="one">{0} ֆտ.</unitPattern>
-				<unitPattern count="other">{0} ֆտ.</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>դյույմ</displayName>
-				<unitPattern count="one">{0} դյմ.</unitPattern>
-				<unitPattern count="other">{0} դյմ.</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>կմ</displayName>
-				<unitPattern count="one">{0} կմ</unitPattern>
-				<unitPattern count="other">{0} կմ</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>լուսատարի</displayName>
-				<unitPattern count="one">{0} լ. տ.</unitPattern>
-				<unitPattern count="other">{0} լ. տ.</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>մետր</displayName>
-				<unitPattern count="one">{0} մ</unitPattern>
-				<unitPattern count="other">{0} մ</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>մկմ</displayName>
-				<unitPattern count="one">{0} մկմ</unitPattern>
-				<unitPattern count="other">{0} մկմ</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>մղոն</displayName>
-				<unitPattern count="one">{0} մղ</unitPattern>
-				<unitPattern count="other">{0} մղ</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>սմ</displayName>
+				<unitPattern count="one">{0} սմ</unitPattern>
+				<unitPattern count="other">{0} սմ</unitPattern>
+				<perUnitPattern>{0}/սմ</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>մմ</displayName>
 				<unitPattern count="one">{0} մմ</unitPattern>
 				<unitPattern count="other">{0} մմ</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>մկմ</displayName>
+				<unitPattern count="one">{0} մկմ</unitPattern>
+				<unitPattern count="other">{0} մկմ</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>նմ</displayName>
 				<unitPattern count="one">{0} նմ</unitPattern>
 				<unitPattern count="other">{0} նմ</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>ծմղ</displayName>
-				<unitPattern count="one">{0} ծմղ</unitPattern>
-				<unitPattern count="other">{0} ծմղ</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>պարսեկ</displayName>
-				<unitPattern count="one">{0} պկ</unitPattern>
-				<unitPattern count="other">{0} պկ</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>պմ</displayName>
 				<unitPattern count="one">{0} պմ</unitPattern>
 				<unitPattern count="other">{0} պմ</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>մղ</displayName>
+				<unitPattern count="one">{0} մղ</unitPattern>
+				<unitPattern count="other">{0} մղ</unitPattern>
+			</unit>
 			<unit type="length-yard">
-				<displayName>յարդ</displayName>
-				<unitPattern count="one">{0} յդ.</unitPattern>
-				<unitPattern count="other">{0} յդ.</unitPattern>
+				<displayName>յդ</displayName>
+				<unitPattern count="one">{0} յդ</unitPattern>
+				<unitPattern count="other">{0} յդ</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>ֆտ</displayName>
+				<unitPattern count="one">{0} ֆտ</unitPattern>
+				<unitPattern count="other">{0} ֆտ</unitPattern>
+				<perUnitPattern>{0}/ֆտ</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>դյմ</displayName>
+				<unitPattern count="one">{0} դյմ</unitPattern>
+				<unitPattern count="other">{0} դյմ</unitPattern>
+				<perUnitPattern>{0}/դյմ</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>պկ</displayName>
+				<unitPattern count="one">{0} պկ</unitPattern>
+				<unitPattern count="other">{0} պկ</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>լ․տ․</displayName>
+				<unitPattern count="one">{0} լ.տ.</unitPattern>
+				<unitPattern count="other">{0} լ.տ.</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ա.մ.</displayName>
+				<unitPattern count="one">{0} ա.մ.</unitPattern>
+				<unitPattern count="other">{0} ա.մ.</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>ծմղ</displayName>
+				<unitPattern count="one">{0} ծմղ</unitPattern>
+				<unitPattern count="other">{0} ծմղ</unitPattern>
 			</unit>
 			<unit type="light-lux">
 				<displayName>լք</displayName>
 				<unitPattern count="one">{0} լք</unitPattern>
 				<unitPattern count="other">{0} լք</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>կարատ</displayName>
-				<unitPattern count="one">{0} կտ.</unitPattern>
-				<unitPattern count="other">{0} կտ.</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>գրամ</displayName>
-				<unitPattern count="one">{0} գր</unitPattern>
-				<unitPattern count="other">{0} գր</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>կիլոգրամ</displayName>
-				<unitPattern count="one">{0} կգ</unitPattern>
-				<unitPattern count="other">{0} կգ</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>մ.տ.</displayName>
 				<unitPattern count="one">{0} մ.տ.</unitPattern>
 				<unitPattern count="other">{0} մ.տ.</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>մկգ</displayName>
-				<unitPattern count="one">{0} մկգ</unitPattern>
-				<unitPattern count="other">{0} մկգ</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>կգ</displayName>
+				<unitPattern count="one">{0} կգ</unitPattern>
+				<unitPattern count="other">{0} կգ</unitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>գ</displayName>
+				<unitPattern count="one">{0} գ</unitPattern>
+				<unitPattern count="other">{0} գ</unitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>մգ</displayName>
 				<unitPattern count="one">{0} մգ</unitPattern>
 				<unitPattern count="other">{0} մգ</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ունց</displayName>
-				<unitPattern count="one">{0} ունց</unitPattern>
-				<unitPattern count="other">{0} ունց</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>տր. ունց</displayName>
-				<unitPattern count="one">{0} տր. ունց</unitPattern>
-				<unitPattern count="other">{0} տր. ունց</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>ֆունտ</displayName>
-				<unitPattern count="one">{0} ֆն.</unitPattern>
-				<unitPattern count="other">{0} ֆն.</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>մկգ</displayName>
+				<unitPattern count="one">{0} մկգ</unitPattern>
+				<unitPattern count="other">{0} մկգ</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>տոննա</displayName>
 				<unitPattern count="one">{0} տ</unitPattern>
 				<unitPattern count="other">{0} տ</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>ֆունտ</displayName>
+				<unitPattern count="one">{0} ֆն.</unitPattern>
+				<unitPattern count="other">{0} ֆն.</unitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ունց․</displayName>
+				<unitPattern count="one">{0} ունց․</unitPattern>
+				<unitPattern count="other">{0} ունց․</unitPattern>
+				<perUnitPattern>{0}/ունց․</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>տր․ ունց․</displayName>
+				<unitPattern count="one">{0} տր. ունց․</unitPattern>
+				<unitPattern count="other">{0} տր. ունց․</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>կարատ</displayName>
+				<unitPattern count="one">{0} կտ.</unitPattern>
+				<unitPattern count="other">{0} կտ.</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>ԳՎտ</displayName>
 				<unitPattern count="one">{0} ԳՎտ</unitPattern>
 				<unitPattern count="other">{0} ԳՎտ</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>ձ/ու</displayName>
-				<unitPattern count="one">{0} ձ/ու</unitPattern>
-				<unitPattern count="other">{0} ձ/ու</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>կՎտ</displayName>
-				<unitPattern count="one">{0} կՎտ</unitPattern>
-				<unitPattern count="other">{0} կՎտ</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>ՄՎտ</displayName>
 				<unitPattern count="one">{0} ՄՎտ</unitPattern>
 				<unitPattern count="other">{0} ՄՎտ</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>մՎտ</displayName>
-				<unitPattern count="one">{0} մՎտ</unitPattern>
-				<unitPattern count="other">{0} մՎտ</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>կՎտ</displayName>
+				<unitPattern count="one">{0} կՎտ</unitPattern>
+				<unitPattern count="other">{0} կՎտ</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>Վտ</displayName>
 				<unitPattern count="one">{0} Վտ</unitPattern>
 				<unitPattern count="other">{0} Վտ</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>մՎտ</displayName>
+				<unitPattern count="one">{0} մՎտ</unitPattern>
+				<unitPattern count="other">{0} մՎտ</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>ձ/ու</displayName>
+				<unitPattern count="one">{0} ձ/ու</unitPattern>
+				<unitPattern count="other">{0} ձ/ու</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>հՊա</displayName>
 				<unitPattern count="one">{0} հՊա</unitPattern>
 				<unitPattern count="other">{0} հՊա</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>դյույմ ս.ս.</displayName>
-				<unitPattern count="one">{0} դյմ. ս.ս.</unitPattern>
-				<unitPattern count="other">{0} դյմ. ս.ս.</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>միլիբար</displayName>
-				<unitPattern count="one">{0} մբար</unitPattern>
-				<unitPattern count="other">{0} մբար</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>մմ ս.ս.</displayName>
 				<unitPattern count="one">{0} մմ ս.ս.</unitPattern>
@@ -5990,30 +6292,45 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ֆ.ք.դյմ</unitPattern>
 				<unitPattern count="other">{0} ֆ.ք.դյմ</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>կար</displayName>
-				<unitPattern count="one">{0} կար</unitPattern>
-				<unitPattern count="other">{0} կար</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>դյույմ ս.ս.</displayName>
+				<unitPattern count="one">{0} դյմ. ս.ս.</unitPattern>
+				<unitPattern count="other">{0} դյմ. ս.ս.</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>միլիբար</displayName>
+				<unitPattern count="one">{0} մբար</unitPattern>
+				<unitPattern count="other">{0} մբար</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName>կիլոմետր / ժամ</displayName>
+				<displayName>կմ/ժ</displayName>
 				<unitPattern count="one">{0} կմ/ժ</unitPattern>
 				<unitPattern count="other">{0} կմ/ժ</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
-				<displayName>մետր / վայրկյան</displayName>
+				<displayName>մ/վ</displayName>
 				<unitPattern count="one">{0} մ/վ</unitPattern>
 				<unitPattern count="other">{0} մ/վ</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<displayName>մղոն/ժամ</displayName>
+				<displayName>մղ/ժ</displayName>
 				<unitPattern count="one">{0} մղ/ժ</unitPattern>
 				<unitPattern count="other">{0} մղ/ժ</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>հնգ․</displayName>
+				<unitPattern count="one">{0} հնգ․</unitPattern>
+				<unitPattern count="other">{0} հնգ․</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
-				<displayName>աստ. ըստ Ցելսիուսի</displayName>
-				<unitPattern count="one">{0}°C</unitPattern>
-				<unitPattern count="other">{0}°C</unitPattern>
+				<displayName>°C</displayName>
+				<unitPattern count="one">{0} °C</unitPattern>
+				<unitPattern count="other">{0} °C</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
 				<displayName>աստ. Ֆարենհայթ</displayName>
@@ -6025,31 +6342,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ակր ֆտ.</displayName>
-				<unitPattern count="one">{0} ակր ֆտ.</unitPattern>
-				<unitPattern count="other">{0} ակր ֆտ.</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>սլ</displayName>
-				<unitPattern count="one">{0} սլ</unitPattern>
-				<unitPattern count="other">{0} սլ</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>սմ³</displayName>
-				<unitPattern count="one">{0} սմ³</unitPattern>
-				<unitPattern count="other">{0} սմ³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ֆտ³</displayName>
-				<unitPattern count="one">{0} ֆտ³</unitPattern>
-				<unitPattern count="other">{0} ֆտ³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>դյմ³</displayName>
-				<unitPattern count="one">{0} դյմ³</unitPattern>
-				<unitPattern count="other">{0} դյմ³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>կմ³</displayName>
 				<unitPattern count="one">{0} կմ³</unitPattern>
@@ -6059,6 +6351,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>մ³</displayName>
 				<unitPattern count="one">{0} մ³</unitPattern>
 				<unitPattern count="other">{0} մ³</unitPattern>
+				<perUnitPattern>{0}/մ³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>սմ³</displayName>
+				<unitPattern count="one">{0} սմ³</unitPattern>
+				<unitPattern count="other">{0} սմ³</unitPattern>
+				<perUnitPattern>{0}/սմ³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>մղ³</displayName>
@@ -6070,25 +6369,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} յդ³</unitPattern>
 				<unitPattern count="other">{0} յդ³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>բաժակ</displayName>
-				<unitPattern count="one">{0} բ.</unitPattern>
-				<unitPattern count="other">{0} բ.</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ֆտ³</displayName>
+				<unitPattern count="one">{0} ֆտ³</unitPattern>
+				<unitPattern count="other">{0} ֆտ³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>դլ</displayName>
-				<unitPattern count="one">{0} դլ</unitPattern>
-				<unitPattern count="other">{0} դլ</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>դյմ³</displayName>
+				<unitPattern count="one">{0} դյմ³</unitPattern>
+				<unitPattern count="other">{0} դյմ³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>հղ. ունց</displayName>
-				<unitPattern count="one">{0} հղ. ունց</unitPattern>
-				<unitPattern count="other">{0} հղ. ունց</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>գալ.</displayName>
-				<unitPattern count="one">{0} գալ.</unitPattern>
-				<unitPattern count="other">{0} գալ.</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Մլ</displayName>
+				<unitPattern count="one">{0} Մլ</unitPattern>
+				<unitPattern count="other">{0} Մլ</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>հլ</displayName>
@@ -6096,30 +6390,57 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} հլ</unitPattern>
 			</unit>
 			<unit type="volume-liter">
-				<displayName>լիտր</displayName>
-				<unitPattern count="one">{0} լ.</unitPattern>
-				<unitPattern count="other">{0} լ.</unitPattern>
+				<displayName>լ</displayName>
+				<unitPattern count="one">{0} լ</unitPattern>
+				<unitPattern count="other">{0} լ</unitPattern>
+				<perUnitPattern>{0}/լ</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Մլ</displayName>
-				<unitPattern count="one">{0} Մլ</unitPattern>
-				<unitPattern count="other">{0} Մլ</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>դլ</displayName>
+				<unitPattern count="one">{0} դլ</unitPattern>
+				<unitPattern count="other">{0} դլ</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>սլ</displayName>
+				<unitPattern count="one">{0} սլ</unitPattern>
+				<unitPattern count="other">{0} սլ</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>մլ</displayName>
 				<unitPattern count="one">{0} մլ</unitPattern>
 				<unitPattern count="other">{0} մլ</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>պտ.</displayName>
-				<unitPattern count="one">{0} պտ.</unitPattern>
-				<unitPattern count="other">{0} պտ.</unitPattern>
+			<unit type="volume-acre-foot">
+				<displayName>ակր ֆտ.</displayName>
+				<unitPattern count="one">{0} ակր ֆտ.</unitPattern>
+				<unitPattern count="other">{0} ակր ֆտ.</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>գալ.</displayName>
+				<unitPattern count="one">{0} գալ.</unitPattern>
+				<unitPattern count="other">{0} գալ.</unitPattern>
+				<perUnitPattern>{0}/գալ․</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>քտ.</displayName>
 				<unitPattern count="one">{0} քտ.</unitPattern>
 				<unitPattern count="other">{0} քտ.</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>պնտ․</displayName>
+				<unitPattern count="one">{0} պնտ․</unitPattern>
+				<unitPattern count="other">{0} պնտ․</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>բաժակ</displayName>
+				<unitPattern count="one">{0} բ.</unitPattern>
+				<unitPattern count="other">{0} բ.</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>հղ․ ունց․</displayName>
+				<unitPattern count="one">{0} հղ. ունց․</unitPattern>
+				<unitPattern count="other">{0} հղ. ունց․</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>ճգ.</displayName>
 				<unitPattern count="one">{0} ճգ.</unitPattern>
@@ -6130,6 +6451,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} թգ.</unitPattern>
 				<unitPattern count="other">{0} թգ.</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -6139,6 +6466,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}G</unitPattern>
 				<unitPattern count="other">{0}G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -6147,26 +6478,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0}ակր</unitPattern>
-				<unitPattern count="other">{0}ակր</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} կմ²</unitPattern>
+				<unitPattern count="other">{0} կմ²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0}հա</unitPattern>
 				<unitPattern count="other">{0}հա</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0}ֆտ²</unitPattern>
-				<unitPattern count="other">{0}ֆտ²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} կմ²</unitPattern>
-				<unitPattern count="other">{0} կմ²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} մ²</unitPattern>
 				<unitPattern count="other">{0} մ²</unitPattern>
@@ -6175,76 +6494,73 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}մղ²</unitPattern>
 				<unitPattern count="other">{0}մղ²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0}ակր</unitPattern>
+				<unitPattern count="other">{0}ակր</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0}ֆտ²</unitPattern>
+				<unitPattern count="other">{0}ֆտ²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>լ/100 կմ</displayName>
+				<unitPattern count="one">{0} լ/100 կմ</unitPattern>
+				<unitPattern count="other">{0} լ/100 կմ</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>տ</displayName>
+				<unitPattern count="one">{0} տ</unitPattern>
+				<unitPattern count="other">{0} տ</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ա</displayName>
+				<unitPattern count="one">{0} ա</unitPattern>
+				<unitPattern count="other">{0} ա</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>շ</displayName>
+				<unitPattern count="one">{0} շ</unitPattern>
+				<unitPattern count="other">{0} շ</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>օր</displayName>
-				<unitPattern count="one">{0}օ.</unitPattern>
-				<unitPattern count="other">{0}օ.</unitPattern>
+				<unitPattern count="one">{0} օր</unitPattern>
+				<unitPattern count="other">{0} օր</unitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName>ժամ</displayName>
-				<unitPattern count="one">{0} ժ.</unitPattern>
-				<unitPattern count="other">{0} ժ.</unitPattern>
+				<displayName>ժ</displayName>
+				<unitPattern count="one">{0} ժ</unitPattern>
+				<unitPattern count="other">{0} ժ</unitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>ր</displayName>
+				<unitPattern count="one">{0} ր</unitPattern>
+				<unitPattern count="other">{0} ր</unitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>վ</displayName>
+				<unitPattern count="one">{0} վ</unitPattern>
+				<unitPattern count="other">{0} վ</unitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>մվ</displayName>
-				<unitPattern count="one">{0}մվ</unitPattern>
-				<unitPattern count="other">{0}մվ</unitPattern>
-			</unit>
-			<unit type="duration-minute">
-				<displayName>ր.</displayName>
-				<unitPattern count="one">{0} ր.</unitPattern>
-				<unitPattern count="other">{0} ր.</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>ամս</displayName>
-				<unitPattern count="one">{0} ա.</unitPattern>
-				<unitPattern count="other">{0} ա.</unitPattern>
-			</unit>
-			<unit type="duration-second">
-				<displayName>վրկ</displayName>
-				<unitPattern count="one">{0} վ.</unitPattern>
-				<unitPattern count="other">{0} վ.</unitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>շբթ.</displayName>
-				<unitPattern count="one">{0} շ.</unitPattern>
-				<unitPattern count="other">{0} շ.</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>տր.</displayName>
-				<unitPattern count="one">{0}տ.</unitPattern>
-				<unitPattern count="other">{0}տ.</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>սմ</displayName>
-				<unitPattern count="one">{0} սմ</unitPattern>
-				<unitPattern count="other">{0} սմ</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0}′</unitPattern>
-				<unitPattern count="other">{0}′</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0}″</unitPattern>
-				<unitPattern count="other">{0}″</unitPattern>
+				<unitPattern count="one">{0} մվ</unitPattern>
+				<unitPattern count="other">{0} մվ</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>կմ</displayName>
 				<unitPattern count="one">{0} կմ</unitPattern>
 				<unitPattern count="other">{0} կմ</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} լ. տ.</unitPattern>
-				<unitPattern count="other">{0} լ. տ.</unitPattern>
-			</unit>
 			<unit type="length-meter">
-				<displayName>մետր</displayName>
+				<displayName>մ</displayName>
 				<unitPattern count="one">{0} մ</unitPattern>
 				<unitPattern count="other">{0} մ</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} մղ</unitPattern>
-				<unitPattern count="other">{0} մղ</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>սմ</displayName>
+				<unitPattern count="one">{0} սմ</unitPattern>
+				<unitPattern count="other">{0} սմ</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>մմ</displayName>
@@ -6255,31 +6571,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} պմ</unitPattern>
 				<unitPattern count="other">{0} պմ</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} մղ</unitPattern>
+				<unitPattern count="other">{0} մղ</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} յդ.</unitPattern>
 				<unitPattern count="other">{0} յդ.</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>գրամ</displayName>
-				<unitPattern count="one">{0} գր</unitPattern>
-				<unitPattern count="other">{0} գր</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="other">{0}′</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} լ. տ.</unitPattern>
+				<unitPattern count="other">{0} լ. տ.</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>կգ</displayName>
-				<unitPattern count="one">{0}կգ</unitPattern>
-				<unitPattern count="other">{0}կգ</unitPattern>
+				<unitPattern count="one">{0} կգ</unitPattern>
+				<unitPattern count="other">{0} կգ</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} ունց</unitPattern>
-				<unitPattern count="other">{0} ունց</unitPattern>
+			<unit type="mass-gram">
+				<displayName>գ</displayName>
+				<unitPattern count="one">{0} գ</unitPattern>
+				<unitPattern count="other">{0} գ</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0}#</unitPattern>
 				<unitPattern count="other">{0}#</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0}ձ/ու</unitPattern>
-				<unitPattern count="other">{0}ձ/ու</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} ունց</unitPattern>
+				<unitPattern count="other">{0} ունց</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0}կՎ</unitPattern>
@@ -6289,6 +6617,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}Վ</unitPattern>
 				<unitPattern count="other">{0}Վ</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0}ձ/ու</unitPattern>
+				<unitPattern count="other">{0}ձ/ու</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} հՊա</unitPattern>
 				<unitPattern count="other">{0} հՊա</unitPattern>
@@ -6303,8 +6635,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>կմ/ժ</displayName>
-				<unitPattern count="one">{0}կմ/ժ</unitPattern>
-				<unitPattern count="other">{0}կմ/ժ</unitPattern>
+				<unitPattern count="one">{0} կմ/ժ</unitPattern>
+				<unitPattern count="other">{0} կմ/ժ</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
 				<unitPattern count="one">{0}մ/վ</unitPattern>
@@ -6316,8 +6648,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
-				<unitPattern count="one">{0}°C</unitPattern>
-				<unitPattern count="other">{0}°C</unitPattern>
+				<unitPattern count="one">{0} °C</unitPattern>
+				<unitPattern count="other">{0} °C</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
 				<unitPattern count="one">{0}°F</unitPattern>
@@ -6332,10 +6664,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0}մղ³</unitPattern>
 			</unit>
 			<unit type="volume-liter">
-				<displayName>լիտր</displayName>
-				<unitPattern count="one">{0}լ.</unitPattern>
-				<unitPattern count="other">{0}լ.</unitPattern>
+				<displayName>լ</displayName>
+				<unitPattern count="one">{0} լ</unitPattern>
+				<unitPattern count="other">{0} լ</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hy_AM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hy_AM.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hy_AM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hy_AM.xml
index 7270fc77f58..1cf981d10e8 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/hy_AM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hy_AM.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="hy"/>
 		<territory type="AM"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/id.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/id.xml
similarity index 87%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/id.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/id.xml
index 59c4c36d321..9a1ee799a10 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/id.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/id.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="id"/>
 	</identity>
 	<localeDisplayNames>
@@ -56,7 +55,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ay">Aymara</language>
 			<language type="az">Azerbaijan</language>
 			<language type="az" alt="short">Azeri</language>
-			<language type="azb">Azerbaijani Selatan</language>
 			<language type="ba">Bashkir</language>
 			<language type="bal">Baluchi</language>
 			<language type="ban">Bali</language>
@@ -71,7 +69,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bew">Betawi</language>
 			<language type="bez">Bena</language>
 			<language type="bfd">Bafut</language>
-			<language type="bg">Bulgar</language>
+			<language type="bg">Bulgaria</language>
+			<language type="bgn">Balochi Barat</language>
 			<language type="bho">Bhojpuri</language>
 			<language type="bi">Bislama</language>
 			<language type="bik">Bikol</language>
@@ -125,8 +124,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="dar">Dargwa</language>
 			<language type="dav">Taita</language>
 			<language type="de">Jerman</language>
-			<language type="de_AT">Jerman Austria</language>
-			<language type="de_CH">Jerman Tinggi Swiss</language>
+			<language type="de_CH">Jerman Tinggi (Swiss)</language>
 			<language type="del">Delaware</language>
 			<language type="den">Slave</language>
 			<language type="dgr">Dogrib</language>
@@ -149,17 +147,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="el">Yunani</language>
 			<language type="elx">Elam</language>
 			<language type="en">Inggris</language>
-			<language type="en_AU">Inggris Australia</language>
-			<language type="en_CA">Inggris Kanada</language>
-			<language type="en_GB">Inggris Inggris</language>
-			<language type="en_GB" alt="short">Inggris U.K.</language>
-			<language type="en_US">Inggris Amerika</language>
-			<language type="en_US" alt="short">Inggris A.S.</language>
+			<language type="en_GB" alt="short">Inggris (U.K.)</language>
+			<language type="en_US" alt="short">Inggris (A.S.)</language>
 			<language type="enm">Inggris Abad Pertengahan</language>
 			<language type="eo">Esperanto</language>
 			<language type="es">Spanyol</language>
 			<language type="es_419">Spanyol Amerika Latin</language>
-			<language type="es_ES">Spanyol Eropa</language>
+			<language type="es_ES">Spanyol (Eropa)</language>
 			<language type="es_MX">Spanyol Meksiko</language>
 			<language type="et">Esti</language>
 			<language type="eu">Bask</language>
@@ -174,8 +168,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="fo">Faro</language>
 			<language type="fon">Fon</language>
 			<language type="fr">Prancis</language>
-			<language type="fr_CA">Prancis Kanada</language>
-			<language type="fr_CH">Prancis Swiss</language>
 			<language type="frm">Prancis Abad Pertengahan</language>
 			<language type="fro">Prancis Kuno</language>
 			<language type="frp">Arpitan</language>
@@ -201,7 +193,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="got">Gothik</language>
 			<language type="grb">Grebo</language>
 			<language type="grc">Yunani Kuno</language>
-			<language type="gsw">Jerman Swiss</language>
+			<language type="gsw">Jerman (Swiss)</language>
 			<language type="gu">Gujarati</language>
 			<language type="guz">Gusii</language>
 			<language type="gv">Manx</language>
@@ -226,7 +218,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ia">Interlingua</language>
 			<language type="iba">Iban</language>
 			<language type="ibb">Ibibio</language>
-			<language type="id">Bahasa Indonesia</language>
+			<language type="id">Indonesia</language>
 			<language type="ie">Interlingue</language>
 			<language type="ig">Igbo</language>
 			<language type="ii">Sichuan Yi</language>
@@ -306,6 +298,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">Lao</language>
 			<language type="lol">Mongo</language>
 			<language type="loz">Lozi</language>
+			<language type="lrc">Luri Utara</language>
 			<language type="lt">Lituavi</language>
 			<language type="lu">Luba-Katanga</language>
 			<language type="lua">Luba-Lulua</language>
@@ -332,7 +325,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mg">Malagasi</language>
 			<language type="mga">Irlandia Abad Pertengahan</language>
 			<language type="mgh">Makhuwa-Meetto</language>
-			<language type="mgo" draft="contributed">meta’</language>
+			<language type="mgo">meta’</language>
 			<language type="mh">Marshall</language>
 			<language type="mi">Maori</language>
 			<language type="mic">Mikmak</language>
@@ -353,9 +346,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mwl">Miranda</language>
 			<language type="mwr">Marwari</language>
 			<language type="mwv">Mentawai</language>
-			<language type="my">Burma</language>
+			<language type="my">Myanmar</language>
 			<language type="mye">Myene</language>
 			<language type="myv">Eryza</language>
+			<language type="mzn">Mazanderani</language>
 			<language type="na">Nauru</language>
 			<language type="nap">Neapolitan</language>
 			<language type="naq">Nama</language>
@@ -368,7 +362,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nia">Nias</language>
 			<language type="niu">Niuea</language>
 			<language type="nl">Belanda</language>
-			<language type="nl_BE">Flemish</language>
 			<language type="nmg">Kwasio</language>
 			<language type="nn">Nynorsk Norwegia</language>
 			<language type="nnh">Ngiemboon</language>
@@ -409,8 +402,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ps">Pashto</language>
 			<language type="ps" alt="variant">Pushto</language>
 			<language type="pt">Portugis</language>
-			<language type="pt_BR">Portugis Brasil</language>
-			<language type="pt_PT">Portugis Eropa</language>
+			<language type="pt_PT">Portugis (Eropa)</language>
 			<language type="qu">Quechua</language>
 			<language type="quc">Kʼicheʼ</language>
 			<language type="raj">Rajasthani</language>
@@ -441,6 +433,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">Sisilia</language>
 			<language type="sco">Skotlandia</language>
 			<language type="sd">Sindhi</language>
+			<language type="sdh">Kurdi Selatan</language>
 			<language type="se">Sami Utara</language>
 			<language type="see">Seneca</language>
 			<language type="seh">Sena</language>
@@ -481,8 +474,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">Sumeria</language>
 			<language type="sv">Swedia</language>
 			<language type="sw">Swahili</language>
+			<language type="sw_CD">Kongo Swahili</language>
 			<language type="swb">Komoria</language>
-			<language type="swc">Kongo Swahili</language>
 			<language type="syc">Suriah Klasik</language>
 			<language type="syr">Suriah</language>
 			<language type="szl">Silesia</language>
@@ -543,6 +536,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">Walamo</language>
 			<language type="war">Warai</language>
 			<language type="was">Washo</language>
+			<language type="wbp">Warlpiri</language>
 			<language type="wo">Wolof</language>
 			<language type="xal">Kalmuk</language>
 			<language type="xh">Xhosa</language>
@@ -559,9 +553,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="zbl">Blissymbol</language>
 			<language type="zen">Zenaga</language>
 			<language type="zgh">Tamazight Maroko Standar</language>
-			<language type="zh">China</language>
-			<language type="zh_Hans">China (Aksara Sederhana)</language>
-			<language type="zh_Hant">China (Aksara Tradisional)</language>
+			<language type="zh">Tionghoa</language>
+			<language type="zh_Hans">Tionghoa (Aksara Sederhana)</language>
+			<language type="zh_Hant">Tionghoa (Aksara Tradisional)</language>
 			<language type="zu">Zulu</language>
 			<language type="zun">Zuni</language>
 			<language type="zxx">Tidak ada konten linguistik</language>
@@ -739,30 +733,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="003">Amerika Utara</territory>
 			<territory type="005">Amerika Selatan</territory>
 			<territory type="009">Oseania</territory>
-			<territory type="011">Afrika Barat</territory>
+			<territory type="011">Afrika Bagian Barat</territory>
 			<territory type="013">Amerika Tengah</territory>
-			<territory type="014">Afrika Timur</territory>
-			<territory type="015">Afrika Utara</territory>
-			<territory type="017">Afrika Tengah</territory>
+			<territory type="014">Afrika Bagian Timur</territory>
+			<territory type="015">Afrika Bagian Utara</territory>
+			<territory type="017">Afrika Bagian Tengah</territory>
 			<territory type="018">Afrika Bagian Selatan</territory>
 			<territory type="019">Amerika</territory>
 			<territory type="021">Amerika Bagian Utara</territory>
 			<territory type="029">Kepulauan Karibia</territory>
-			<territory type="030">Asia Timur</territory>
-			<territory type="034">Asia Selatan</territory>
+			<territory type="030">Asia Bagian Timur</territory>
+			<territory type="034">Asia Bagian Selatan</territory>
 			<territory type="035">Asia Tenggara</territory>
-			<territory type="039">Eropa Selatan</territory>
+			<territory type="039">Eropa Bagian Selatan</territory>
 			<territory type="053">Australasia</territory>
 			<territory type="054">Melanesia</territory>
 			<territory type="057">Wilayah Mikronesia</territory>
 			<territory type="061">Polinesia</territory>
 			<territory type="142">Asia</territory>
 			<territory type="143">Asia Tengah</territory>
-			<territory type="145">Asia Barat</territory>
+			<territory type="145">Asia Bagian Barat</territory>
 			<territory type="150">Eropa</territory>
-			<territory type="151">Eropa Timur</territory>
-			<territory type="154">Eropa Utara</territory>
-			<territory type="155">Eropa Barat</territory>
+			<territory type="151">Eropa Bagian Timur</territory>
+			<territory type="154">Eropa Bagian Utara</territory>
+			<territory type="155">Eropa Bagian Barat</territory>
 			<territory type="419">Amerika Latin</territory>
 			<territory type="AC">Pulau Ascension</territory>
 			<territory type="AD">Andorra</territory>
@@ -772,7 +766,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antilla Belanda</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antarktika</territory>
 			<territory type="AR">Argentina</territory>
@@ -816,7 +809,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CK">Kepulauan Cook</territory>
 			<territory type="CL">Cile</territory>
 			<territory type="CM">Kamerun</territory>
-			<territory type="CN">China</territory>
+			<territory type="CN">Tiongkok</territory>
 			<territory type="CO">Kolombia</territory>
 			<territory type="CP">Pulau Clipperton</territory>
 			<territory type="CR">Kosta Rika</territory>
@@ -869,7 +862,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GU">Guam</territory>
 			<territory type="GW">Guinea-Bissau</territory>
 			<territory type="GY">Guyana</territory>
-			<territory type="HK">Hong Kong SAR China</territory>
+			<territory type="HK">Hong Kong SAR Tiongkok</territory>
 			<territory type="HK" alt="short">Hong Kong</territory>
 			<territory type="HM">Pulau Heard dan Kepulauan McDonald</territory>
 			<territory type="HN">Honduras</territory>
@@ -925,7 +918,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ML">Mali</territory>
 			<territory type="MM">Myanmar (Burma)</territory>
 			<territory type="MN">Mongolia</territory>
-			<territory type="MO">Makau SAR China</territory>
+			<territory type="MO">Makau SAR Tiongkok</territory>
 			<territory type="MO" alt="short">Makau</territory>
 			<territory type="MP">Kepulauan Mariana Utara</territory>
 			<territory type="MQ">Martinik</territory>
@@ -1101,11 +1094,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colCaseFirst">Pengurutan Huruf Besar/Huruf Kecil</key>
 			<key type="colCaseLevel">Penyortiran Peka Huruf Besar</key>
 			<key type="colHiraganaQuaternary">Penyortiran Kana</key>
-			<key type="collation">Urutan Sortir</key>
+			<key type="collation">Aturan Pengurutan</key>
 			<key type="colNormalization">Penyortiran Dinormalisasi</key>
 			<key type="colNumeric">Penyortiran Numerik</key>
 			<key type="colStrength">Kekuatan Penyortiran</key>
 			<key type="currency">Mata Uang</key>
+			<key type="hc">Siklus Jam (12 vs 24)</key>
+			<key type="lb">Gaya Pemisah Baris</key>
+			<key type="ms">Sistem Pengukuran</key>
 			<key type="numbers">Angka</key>
 			<key type="timezone">Zona Waktu</key>
 			<key type="va">Varian Lokal</key>
@@ -1113,112 +1109,122 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">Penggunaan Pribadi</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Angka Arab Timur</type>
-			<type type="arabext" key="numbers">Angka Arab Timur Diperluas</type>
-			<type type="armn" key="numbers">Angka Armenia</type>
-			<type type="armnlow" key="numbers">Angka Huruf Kecil Armenia</type>
-			<type type="bali" key="numbers">Angka Bali</type>
-			<type type="beng" key="numbers">Angka Bengali</type>
-			<type type="big5han" key="collation">Urutan Sortir China Tradisional - Big5</type>
-			<type type="buddhist" key="calendar">Kalender Buddha</type>
-			<type type="cham" key="numbers">Angka Cham</type>
-			<type type="chinese" key="calendar">Kalender China</type>
-			<type type="coptic" key="calendar">Kalender Koptik</type>
-			<type type="dangi" key="calendar">Kalender Dangi</type>
-			<type type="deva" key="numbers">Angka Devanagari</type>
-			<type type="dictionary" key="collation">Urutan Sortir Kamus</type>
-			<type type="ducet" key="collation">Urutan Sortir Unicode Default</type>
-			<type type="eor" key="collation">Aturan Pengurutan Eropa</type>
-			<type type="ethi" key="numbers">Angka Etiopia</type>
-			<type type="ethiopic" key="calendar">Kalender Etiopia</type>
-			<type type="ethiopic-amete-alem" key="calendar">Kalender Amete Alem Etiopia</type>
-			<type type="finance" key="numbers">Angka Finansial</type>
-			<type type="fullwide" key="numbers">Angka Lebar Penuh</type>
-			<type type="gb2312han" key="collation">Urutan Sortir China Aks. Sederhana - GB2312</type>
-			<type type="geor" key="numbers">Angka Georgia</type>
-			<type type="gregorian" key="calendar">Kalender Gregorian</type>
-			<type type="grek" key="numbers">Angka Yunani</type>
-			<type type="greklow" key="numbers">Angka Yunani Huruf Kecil</type>
-			<type type="gujr" key="numbers">Angka Gujarati</type>
-			<type type="guru" key="numbers">Angka Gurmukhi</type>
-			<type type="hanidec" key="numbers">Angka Desimal China</type>
-			<type type="hans" key="numbers">Angka China Sederhana</type>
-			<type type="hansfin" key="numbers">Angka Keuangan China Sederhana</type>
-			<type type="hant" key="numbers">Angka China Tradisional</type>
-			<type type="hantfin" key="numbers">Angka Keuangan China Tradisional</type>
-			<type type="hebr" key="numbers">Angka Ibrani</type>
-			<type type="hebrew" key="calendar">Kalender Ibrani</type>
-			<type type="identical" key="colStrength">Sortir Semua</type>
-			<type type="indian" key="calendar">Kalender Nasional India</type>
-			<type type="islamic" key="calendar">Kalender Islam</type>
-			<type type="islamic-civil" key="calendar">Kalender Sipil Islam</type>
-			<type type="islamic-rgsa" key="calendar">Kalender Islam (Arab Saudi, penglihatan)</type>
-			<type type="iso8601" key="calendar">Kalender ISO-8601</type>
-			<type type="japanese" key="calendar">Kalender Jepang</type>
-			<type type="java" key="numbers">Angka Jawa</type>
-			<type type="jpan" key="numbers">Angka Jepang</type>
-			<type type="jpanfin" key="numbers">Angka Keuangan Jepang</type>
-			<type type="kali" key="numbers">Angka Kayah Li</type>
-			<type type="khmr" key="numbers">Angka Khmer</type>
-			<type type="knda" key="numbers">Angka Kannada</type>
-			<type type="lana" key="numbers">Angka Tai Tham Hora</type>
-			<type type="lanatham" key="numbers">Angka Tai Tham Tham</type>
-			<type type="laoo" key="numbers">Angka Laos</type>
-			<type type="latn" key="numbers">Angka Latin</type>
-			<type type="lepc" key="numbers">Angka Lepcha</type>
-			<type type="limb" key="numbers">Angka Limbu</type>
-			<type type="lower" key="colCaseFirst">Sortir Huruf Kecil Dahulu</type>
-			<type type="mlym" key="numbers">Angka Malayalam</type>
-			<type type="mong" key="numbers">Angka Mongolia</type>
-			<type type="mtei" key="numbers">Angka Meetei Mayek</type>
-			<type type="mymr" key="numbers">Angka Myanmar</type>
-			<type type="mymrshan" key="numbers">Angka Myanmar Shan</type>
-			<type type="native" key="numbers">Digit Asli</type>
-			<type type="nkoo" key="numbers">Angka N’Ko</type>
-			<type type="no" key="colBackwards">Sortir Aksen Secara Normal</type>
-			<type type="no" key="colCaseFirst">Sortir Urutan Ukuran Huruf Normal</type>
-			<type type="no" key="colCaseLevel">Sortir Tidak Peka Huruf Besar</type>
-			<type type="no" key="colHiraganaQuaternary">Sortir Kana Secara Terpisah</type>
-			<type type="no" key="colNormalization">Sortir Tanpa Normalisasi</type>
-			<type type="no" key="colNumeric">Sortir Digit Satu Per Satu</type>
-			<type type="non-ignorable" key="colAlternate">Sortir Simbol</type>
-			<type type="olck" key="numbers">Angka Ol Chiki</type>
-			<type type="orya" key="numbers">Angka Oriya</type>
-			<type type="persian" key="calendar">Kalender Persia</type>
-			<type type="phonebook" key="collation">Urutan Sortir Buku Telepon</type>
-			<type type="phonetic" key="collation">Urutan Sortir Fonetik</type>
-			<type type="pinyin" key="collation">Urutan Sortir Pinyin</type>
-			<type type="primary" key="colStrength">Sortir Huruf Dasar Saja</type>
-			<type type="quaternary" key="colStrength">Sortir Aksen/Ukuran Huruf/Lebar/Kana</type>
-			<type type="reformed" key="collation">Urutan Sortir yang Diubah Bentuknya</type>
-			<type type="roc" key="calendar">Kalendar Minguo</type>
-			<type type="roman" key="numbers">Angka Romawi</type>
-			<type type="romanlow" key="numbers">Angka Huruf Kecil Romawi</type>
-			<type type="saur" key="numbers">Angka Saurashtra</type>
-			<type type="search" key="collation">Pencarian Tujuan Umum</type>
-			<type type="searchjl" key="collation">Pencarian Menurut Konsonan Awal Hangul</type>
-			<type type="secondary" key="colStrength">Sortir Aksen</type>
-			<type type="shifted" key="colAlternate">Sortir Abaikan Simbol</type>
-			<type type="standard" key="collation">Urutan Sortir Standar</type>
-			<type type="stroke" key="collation">Urutan Sortir Guratan</type>
-			<type type="sund" key="numbers">Angka Sunda</type>
-			<type type="talu" key="numbers">Angka Tai Lue Baru</type>
-			<type type="taml" key="numbers">Angka Tamil Tradisional</type>
-			<type type="tamldec" key="numbers">Angka Tamil</type>
-			<type type="telu" key="numbers">Angka Telugu</type>
-			<type type="tertiary" key="colStrength">Sortir Aksen/Ukuran Huruf/Lebar</type>
-			<type type="thai" key="numbers">Angka Thai</type>
-			<type type="tibt" key="numbers">Angka Tibet</type>
-			<type type="traditional" key="collation">Urutan Sortir Tradisional</type>
-			<type type="traditional" key="numbers">Angka Tradisional</type>
-			<type type="unihan" key="collation">Urutan Sortir Guratan Radikal</type>
-			<type type="upper" key="colCaseFirst">Sortir Huruf Besar Dahulu</type>
-			<type type="vaii" key="numbers">Angka Vai</type>
-			<type type="yes" key="colBackwards">Sortir Aksen Terbalik</type>
-			<type type="yes" key="colCaseLevel">Sortir Peka Huruf Besar</type>
-			<type type="yes" key="colHiraganaQuaternary">Sortir Kana Secara Berbeda</type>
-			<type type="yes" key="colNormalization">Sortir Unicode Dinormalisasi</type>
-			<type type="yes" key="colNumeric">Sortir Digit Secara Numerik</type>
+			<type key="calendar" type="buddhist">Kalender Buddha</type>
+			<type key="calendar" type="chinese">Kalender Tionghoa</type>
+			<type key="calendar" type="coptic">Kalender Koptik</type>
+			<type key="calendar" type="dangi">Kalender Dangi</type>
+			<type key="calendar" type="ethiopic">Kalender Etiopia</type>
+			<type key="calendar" type="ethiopic-amete-alem">Kalender Amete Alem Etiopia</type>
+			<type key="calendar" type="gregorian">Kalender Gregorian</type>
+			<type key="calendar" type="hebrew">Kalender Ibrani</type>
+			<type key="calendar" type="indian">Kalender Nasional India</type>
+			<type key="calendar" type="islamic">Kalender Islam</type>
+			<type key="calendar" type="islamic-civil">Kalender Sipil Islam</type>
+			<type key="calendar" type="islamic-rgsa">Kalender Islam (Arab Saudi, penglihatan)</type>
+			<type key="calendar" type="iso8601">Kalender ISO-8601</type>
+			<type key="calendar" type="japanese">Kalender Jepang</type>
+			<type key="calendar" type="persian">Kalender Persia</type>
+			<type key="calendar" type="roc">Kalendar Minguo</type>
+			<type key="colAlternate" type="non-ignorable">Sortir Simbol</type>
+			<type key="colAlternate" type="shifted">Sortir Abaikan Simbol</type>
+			<type key="colBackwards" type="no">Sortir Aksen Secara Normal</type>
+			<type key="colBackwards" type="yes">Sortir Aksen Terbalik</type>
+			<type key="colCaseFirst" type="lower">Sortir Huruf Kecil Dahulu</type>
+			<type key="colCaseFirst" type="no">Sortir Urutan Ukuran Huruf Normal</type>
+			<type key="colCaseFirst" type="upper">Sortir Huruf Besar Dahulu</type>
+			<type key="colCaseLevel" type="no">Sortir Tidak Peka Huruf Besar</type>
+			<type key="colCaseLevel" type="yes">Sortir Peka Huruf Besar</type>
+			<type key="colHiraganaQuaternary" type="no">Sortir Kana Secara Terpisah</type>
+			<type key="colHiraganaQuaternary" type="yes">Sortir Kana Secara Berbeda</type>
+			<type key="collation" type="big5han">Urutan Sortir Tionghoa Tradisional - Big5</type>
+			<type key="collation" type="dictionary">Urutan Sortir Kamus</type>
+			<type key="collation" type="ducet">Aturan Pengurutan Unicode Default</type>
+			<type key="collation" type="eor">Aturan Pengurutan Eropa</type>
+			<type key="collation" type="gb2312han">Urutan Sortir Tionghoa Aks. Sederhana - GB2312</type>
+			<type key="collation" type="phonebook">Urutan Sortir Buku Telepon</type>
+			<type key="collation" type="phonetic">Urutan Sortir Fonetik</type>
+			<type key="collation" type="pinyin">Urutan Sortir Pinyin</type>
+			<type key="collation" type="reformed">Urutan Sortir yang Diubah Bentuknya</type>
+			<type key="collation" type="search">Pencarian Tujuan Umum</type>
+			<type key="collation" type="searchjl">Pencarian Menurut Konsonan Awal Hangul</type>
+			<type key="collation" type="standard">Aturan Pengurutan Standar</type>
+			<type key="collation" type="stroke">Urutan Sortir Guratan</type>
+			<type key="collation" type="traditional">Urutan Sortir Tradisional</type>
+			<type key="collation" type="unihan">Urutan Sortir Guratan Radikal</type>
+			<type key="colNormalization" type="no">Sortir Tanpa Normalisasi</type>
+			<type key="colNormalization" type="yes">Sortir Unicode Dinormalisasi</type>
+			<type key="colNumeric" type="no">Sortir Digit Satu Per Satu</type>
+			<type key="colNumeric" type="yes">Sortir Digit Secara Numerik</type>
+			<type key="colStrength" type="identical">Sortir Semua</type>
+			<type key="colStrength" type="primary">Sortir Huruf Dasar Saja</type>
+			<type key="colStrength" type="quaternary">Sortir Aksen/Ukuran Huruf/Lebar/Kana</type>
+			<type key="colStrength" type="secondary">Sortir Aksen</type>
+			<type key="colStrength" type="tertiary">Sortir Aksen/Ukuran Huruf/Lebar</type>
+			<type key="hc" type="h11">Sistem 12 Jam (0–11)</type>
+			<type key="hc" type="h12">Sistem 12 Jam (1–12)</type>
+			<type key="hc" type="h23">Sistem 24 Jam (0–23)</type>
+			<type key="hc" type="h24">Sistem 24 Jam (1–24)</type>
+			<type key="lb" type="loose">Gaya Pemisah Baris Renggang</type>
+			<type key="lb" type="normal">Gaya Pemisah Baris Normal</type>
+			<type key="lb" type="strict">Gaya Pemisah Baris Rapat</type>
+			<type key="ms" type="metric">Sistem Metrik</type>
+			<type key="ms" type="uksystem">Sistem Pengukuran Imperial</type>
+			<type key="ms" type="ussystem">Sistem Pengukuran A.S.</type>
+			<type key="numbers" type="arab">Angka Arab Timur</type>
+			<type key="numbers" type="arabext">Angka Arab Timur Diperluas</type>
+			<type key="numbers" type="armn">Angka Armenia</type>
+			<type key="numbers" type="armnlow">Angka Huruf Kecil Armenia</type>
+			<type key="numbers" type="bali">Angka Bali</type>
+			<type key="numbers" type="beng">Angka Bengali</type>
+			<type key="numbers" type="cham">Angka Cham</type>
+			<type key="numbers" type="deva">Angka Devanagari</type>
+			<type key="numbers" type="ethi">Angka Etiopia</type>
+			<type key="numbers" type="finance">Angka Finansial</type>
+			<type key="numbers" type="fullwide">Angka Lebar Penuh</type>
+			<type key="numbers" type="geor">Angka Georgia</type>
+			<type key="numbers" type="grek">Angka Yunani</type>
+			<type key="numbers" type="greklow">Angka Yunani Huruf Kecil</type>
+			<type key="numbers" type="gujr">Angka Gujarati</type>
+			<type key="numbers" type="guru">Angka Gurmukhi</type>
+			<type key="numbers" type="hanidec">Angka Desimal Tionghoa</type>
+			<type key="numbers" type="hans">Angka Tionghoa Sederhana</type>
+			<type key="numbers" type="hansfin">Angka Keuangan Tionghoa Sederhana</type>
+			<type key="numbers" type="hant">Angka Tionghoa Tradisional</type>
+			<type key="numbers" type="hantfin">Angka Keuangan Tionghoa Tradisional</type>
+			<type key="numbers" type="hebr">Angka Ibrani</type>
+			<type key="numbers" type="java">Angka Jawa</type>
+			<type key="numbers" type="jpan">Angka Jepang</type>
+			<type key="numbers" type="jpanfin">Angka Keuangan Jepang</type>
+			<type key="numbers" type="kali">Angka Kayah Li</type>
+			<type key="numbers" type="khmr">Angka Khmer</type>
+			<type key="numbers" type="knda">Angka Kannada</type>
+			<type key="numbers" type="lana">Angka Tai Tham Hora</type>
+			<type key="numbers" type="lanatham">Angka Tai Tham Tham</type>
+			<type key="numbers" type="laoo">Angka Laos</type>
+			<type key="numbers" type="latn">Angka Latin</type>
+			<type key="numbers" type="lepc">Angka Lepcha</type>
+			<type key="numbers" type="limb">Angka Limbu</type>
+			<type key="numbers" type="mlym">Angka Malayalam</type>
+			<type key="numbers" type="mong">Angka Mongolia</type>
+			<type key="numbers" type="mtei">Angka Meetei Mayek</type>
+			<type key="numbers" type="mymr">Angka Myanmar</type>
+			<type key="numbers" type="mymrshan">Angka Myanmar Shan</type>
+			<type key="numbers" type="native">Digit Asli</type>
+			<type key="numbers" type="nkoo">Angka N’Ko</type>
+			<type key="numbers" type="olck">Angka Ol Chiki</type>
+			<type key="numbers" type="orya">Angka Oriya</type>
+			<type key="numbers" type="roman">Angka Romawi</type>
+			<type key="numbers" type="romanlow">Angka Huruf Kecil Romawi</type>
+			<type key="numbers" type="saur">Angka Saurashtra</type>
+			<type key="numbers" type="sund">Angka Sunda</type>
+			<type key="numbers" type="talu">Angka Tai Lue Baru</type>
+			<type key="numbers" type="taml">Angka Tamil Tradisional</type>
+			<type key="numbers" type="tamldec">Angka Tamil</type>
+			<type key="numbers" type="telu">Angka Telugu</type>
+			<type key="numbers" type="thai">Angka Thai</type>
+			<type key="numbers" type="tibt">Angka Tibet</type>
+			<type key="numbers" type="traditional">Angka Tradisional</type>
+			<type key="numbers" type="vaii">Angka Vai</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN">BGN</transformName>
@@ -1668,6 +1674,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 								<cyclicName type="18">embun beku turun</cyclicName>
 								<cyclicName type="20">mulai turun salju</cyclicName>
 							</cyclicNameWidth>
+							<cyclicNameWidth type="wide">
+								<cyclicName type="1">mulai musim semi</cyclicName>
+								<cyclicName type="2">air hujan</cyclicName>
+								<cyclicName type="3">serangga bangun</cyclicName>
+								<cyclicName type="4">ekuinoks musim semi</cyclicName>
+								<cyclicName type="6">hujan butiran</cyclicName>
+								<cyclicName type="7">mulai musim panas</cyclicName>
+								<cyclicName type="13">mulai musim gugur</cyclicName>
+								<cyclicName type="14">akhir panas</cyclicName>
+								<cyclicName type="15">embun putih</cyclicName>
+								<cyclicName type="16">ekuinoks musim gugur</cyclicName>
+								<cyclicName type="17">embun dingin</cyclicName>
+								<cyclicName type="18">embun beku turun</cyclicName>
+								<cyclicName type="20">mulai turun salju</cyclicName>
+							</cyclicNameWidth>
 						</cyclicNameContext>
 					</cyclicNameSet>
 				</cyclicNameSets>
@@ -1816,6 +1837,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -1844,6 +1866,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM" draft="contributed">MMMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
 					</availableFormats>
@@ -2157,15 +2180,67 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">tengah malam</dayPeriod>
 							<dayPeriod type="am">AM</dayPeriod>
 							<dayPeriod type="noon">tengah hari</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">pagi</dayPeriod>
+							<dayPeriod type="afternoon1">siang</dayPeriod>
+							<dayPeriod type="evening1">sore</dayPeriod>
+							<dayPeriod type="night1">malam</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">tengah malam</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">tengah hari</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">pagi</dayPeriod>
+							<dayPeriod type="afternoon1">siang</dayPeriod>
+							<dayPeriod type="evening1">sore</dayPeriod>
+							<dayPeriod type="night1">malam</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">tengah malam</dayPeriod>
 							<dayPeriod type="am">AM</dayPeriod>
 							<dayPeriod type="noon">tengah hari</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">pagi</dayPeriod>
+							<dayPeriod type="afternoon1">siang</dayPeriod>
+							<dayPeriod type="evening1">sore</dayPeriod>
+							<dayPeriod type="night1">malam</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">tengah malam</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">tengah hari</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">pagi</dayPeriod>
+							<dayPeriod type="afternoon1">siang</dayPeriod>
+							<dayPeriod type="evening1">sore</dayPeriod>
+							<dayPeriod type="night1">malam</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">tengah malam</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">tengah hari</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">pagi</dayPeriod>
+							<dayPeriod type="afternoon1">siang</dayPeriod>
+							<dayPeriod type="evening1">sore</dayPeriod>
+							<dayPeriod type="night1">malam</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">tengah malam</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">tengah hari</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">pagi</dayPeriod>
+							<dayPeriod type="afternoon1">siang</dayPeriod>
+							<dayPeriod type="evening1">sore</dayPeriod>
+							<dayPeriod type="night1">malam</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -2270,6 +2345,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH.mm</dateFormatItem>
 						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH.mm.ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h.mm.ss. a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH.mm.ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h.mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH.mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
@@ -2286,6 +2365,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMEd">E, d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
 						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
 					</availableFormats>
@@ -2352,7 +2432,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
-							<greatestDifference id="y">y–y</greatestDifference>
+							<greatestDifference id="y">y – y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
 							<greatestDifference id="M">M/y – M/y</greatestDifference>
@@ -2729,6 +2809,243 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="japanese">
+				<eras>
+					<eraAbbr>
+						<era type="0" draft="contributed">Taika (645–650)</era>
+						<era type="1" draft="contributed">Hakuchi (650–671)</era>
+						<era type="2" draft="contributed">Hakuhō (672–686)</era>
+						<era type="3" draft="contributed">Shuchō (686–701)</era>
+						<era type="4" draft="contributed">Taihō (701–704)</era>
+						<era type="5" draft="contributed">Keiun (704–708)</era>
+						<era type="6" draft="contributed">Wadō (708–715)</era>
+						<era type="7" draft="contributed">Reiki (715–717)</era>
+						<era type="8" draft="contributed">Yōrō (717–724)</era>
+						<era type="9" draft="contributed">Jinki (724–729)</era>
+						<era type="10" draft="contributed">Tempyō (729–749)</era>
+						<era type="11" draft="contributed">Tempyō-kampō (749-749)</era>
+						<era type="12" draft="contributed">Tempyō-shōhō (749-757)</era>
+						<era type="13" draft="contributed">Tempyō-hōji (757-765)</era>
+						<era type="14" draft="contributed">Temphō-jingo (765-767)</era>
+						<era type="15" draft="contributed">Jingo-keiun (767-770)</era>
+						<era type="16" draft="contributed">Hōki (770–780)</era>
+						<era type="17" draft="contributed">Ten-ō (781-782)</era>
+						<era type="18" draft="contributed">Enryaku (782–806)</era>
+						<era type="19" draft="contributed">Daidō (806–810)</era>
+						<era type="20" draft="contributed">Kōnin (810–824)</era>
+						<era type="21" draft="contributed">Tenchō (824–834)</era>
+						<era type="22" draft="contributed">Jōwa (834–848)</era>
+						<era type="23" draft="contributed">Kajō (848–851)</era>
+						<era type="24" draft="contributed">Ninju (851–854)</era>
+						<era type="25" draft="contributed">Saiko (854–857)</era>
+						<era type="26" draft="contributed">Tennan (857–859)</era>
+						<era type="27" draft="contributed">Jōgan (859–877)</era>
+						<era type="28" draft="contributed">Genkei (877–885)</era>
+						<era type="29" draft="contributed">Ninna (885–889)</era>
+						<era type="30" draft="contributed">Kampyō (889–898)</era>
+						<era type="31" draft="contributed">Shōtai (898–901)</era>
+						<era type="32" draft="contributed">Engi (901–923)</era>
+						<era type="33" draft="contributed">Enchō (923–931)</era>
+						<era type="34" draft="contributed">Shōhei (931–938)</era>
+						<era type="35" draft="contributed">Tengyō (938–947)</era>
+						<era type="36" draft="contributed">Tenryaku (947–957)</era>
+						<era type="37" draft="contributed">Tentoku (957–961)</era>
+						<era type="38" draft="contributed">Ōwa (961–964)</era>
+						<era type="39" draft="contributed">Kōhō (964–968)</era>
+						<era type="40" draft="contributed">Anna (968–970)</era>
+						<era type="41" draft="contributed">Tenroku (970–973)</era>
+						<era type="42" draft="contributed">Ten-en (973-976)</era>
+						<era type="43" draft="contributed">Jōgen (976–978)</era>
+						<era type="44" draft="contributed">Tengen (978–983)</era>
+						<era type="45" draft="contributed">Eikan (983–985)</era>
+						<era type="46" draft="contributed">Kanna (985–987)</era>
+						<era type="47" draft="contributed">Ei-en (987-989)</era>
+						<era type="48" draft="contributed">Eiso (989–990)</era>
+						<era type="49" draft="contributed">Shōryaku (990–995)</era>
+						<era type="50" draft="contributed">Chōtoku (995–999)</era>
+						<era type="51" draft="contributed">Chōhō (999–1004)</era>
+						<era type="52" draft="contributed">Kankō (1004–1012)</era>
+						<era type="53" draft="contributed">Chōwa (1012–1017)</era>
+						<era type="54" draft="contributed">Kannin (1017–1021)</era>
+						<era type="55" draft="contributed">Jian (1021–1024)</era>
+						<era type="56" draft="contributed">Manju (1024–1028)</era>
+						<era type="57" draft="contributed">Chōgen (1028–1037)</era>
+						<era type="58" draft="contributed">Chōryaku (1037–1040)</era>
+						<era type="59" draft="contributed">Chōkyū (1040–1044)</era>
+						<era type="60" draft="contributed">Kantoku (1044–1046)</era>
+						<era type="61" draft="contributed">Eishō (1046–1053)</era>
+						<era type="62" draft="contributed">Tengi (1053–1058)</era>
+						<era type="63" draft="contributed">Kōhei (1058–1065)</era>
+						<era type="64" draft="contributed">Jiryaku (1065–1069)</era>
+						<era type="65" draft="contributed">Enkyū (1069–1074)</era>
+						<era type="66" draft="contributed">Shōho (1074–1077)</era>
+						<era type="67" draft="contributed">Shōryaku (1077–1081)</era>
+						<era type="68" draft="contributed">Eiho (1081–1084)</era>
+						<era type="69" draft="contributed">Ōtoku (1084–1087)</era>
+						<era type="70" draft="contributed">Kanji (1087–1094)</era>
+						<era type="71" draft="contributed">Kaho (1094–1096)</era>
+						<era type="72" draft="contributed">Eichō (1096–1097)</era>
+						<era type="73" draft="contributed">Shōtoku (1097–1099)</era>
+						<era type="74" draft="contributed">Kōwa (1099–1104)</era>
+						<era type="75" draft="contributed">Chōji (1104–1106)</era>
+						<era type="76" draft="contributed">Kashō (1106–1108)</era>
+						<era type="77" draft="contributed">Tennin (1108–1110)</era>
+						<era type="78" draft="contributed">Ten-ei (1110-1113)</era>
+						<era type="79" draft="contributed">Eikyū (1113–1118)</era>
+						<era type="80" draft="contributed">Gen-ei (1118-1120)</era>
+						<era type="81" draft="contributed">Hoan (1120–1124)</era>
+						<era type="82" draft="contributed">Tenji (1124–1126)</era>
+						<era type="83" draft="contributed">Daiji (1126–1131)</era>
+						<era type="84" draft="contributed">Tenshō (1131–1132)</era>
+						<era type="85" draft="contributed">Chōshō (1132–1135)</era>
+						<era type="86" draft="contributed">Hoen (1135–1141)</era>
+						<era type="87" draft="contributed">Eiji (1141–1142)</era>
+						<era type="88" draft="contributed">Kōji (1142–1144)</era>
+						<era type="89" draft="contributed">Tenyō (1144–1145)</era>
+						<era type="90" draft="contributed">Kyūan (1145–1151)</era>
+						<era type="91" draft="contributed">Ninpei (1151–1154)</era>
+						<era type="92" draft="contributed">Kyūju (1154–1156)</era>
+						<era type="93" draft="contributed">Hogen (1156–1159)</era>
+						<era type="94" draft="contributed">Heiji (1159–1160)</era>
+						<era type="95" draft="contributed">Eiryaku (1160–1161)</era>
+						<era type="96" draft="contributed">Ōho (1161–1163)</era>
+						<era type="97" draft="contributed">Chōkan (1163–1165)</era>
+						<era type="98" draft="contributed">Eiman (1165–1166)</era>
+						<era type="99" draft="contributed">Nin-an (1166-1169)</era>
+						<era type="100" draft="contributed">Kaō (1169–1171)</era>
+						<era type="101" draft="contributed">Shōan (1171–1175)</era>
+						<era type="102" draft="contributed">Angen (1175–1177)</era>
+						<era type="103" draft="contributed">Jishō (1177–1181)</era>
+						<era type="104" draft="contributed">Yōwa (1181–1182)</era>
+						<era type="105" draft="contributed">Juei (1182–1184)</era>
+						<era type="106" draft="contributed">Genryuku (1184–1185)</era>
+						<era type="107" draft="contributed">Bunji (1185–1190)</era>
+						<era type="108" draft="contributed">Kenkyū (1190–1199)</era>
+						<era type="109" draft="contributed">Shōji (1199–1201)</era>
+						<era type="110" draft="contributed">Kennin (1201–1204)</era>
+						<era type="111" draft="contributed">Genkyū (1204–1206)</era>
+						<era type="112" draft="contributed">Ken-ei (1206-1207)</era>
+						<era type="113" draft="contributed">Shōgen (1207–1211)</era>
+						<era type="114" draft="contributed">Kenryaku (1211–1213)</era>
+						<era type="115" draft="contributed">Kenpō (1213–1219)</era>
+						<era type="116" draft="contributed">Shōkyū (1219–1222)</era>
+						<era type="117" draft="contributed">Jōō (1222–1224)</era>
+						<era type="118" draft="contributed">Gennin (1224–1225)</era>
+						<era type="119" draft="contributed">Karoku (1225–1227)</era>
+						<era type="120" draft="contributed">Antei (1227–1229)</era>
+						<era type="121" draft="contributed">Kanki (1229–1232)</era>
+						<era type="122" draft="contributed">Jōei (1232–1233)</era>
+						<era type="123" draft="contributed">Tempuku (1233–1234)</era>
+						<era type="124" draft="contributed">Bunryaku (1234–1235)</era>
+						<era type="125" draft="contributed">Katei (1235–1238)</era>
+						<era type="126" draft="contributed">Ryakunin (1238–1239)</era>
+						<era type="127" draft="contributed">En-ō (1239-1240)</era>
+						<era type="128" draft="contributed">Ninji (1240–1243)</era>
+						<era type="129" draft="contributed">Kangen (1243–1247)</era>
+						<era type="130" draft="contributed">Hōji (1247–1249)</era>
+						<era type="131" draft="contributed">Kenchō (1249–1256)</era>
+						<era type="132" draft="contributed">Kōgen (1256–1257)</era>
+						<era type="133" draft="contributed">Shōka (1257–1259)</era>
+						<era type="134" draft="contributed">Shōgen (1259–1260)</era>
+						<era type="135" draft="contributed">Bun-ō (1260-1261)</era>
+						<era type="136" draft="contributed">Kōchō (1261–1264)</era>
+						<era type="137" draft="contributed">Bun-ei (1264-1275)</era>
+						<era type="138" draft="contributed">Kenji (1275–1278)</era>
+						<era type="139" draft="contributed">Kōan (1278–1288)</era>
+						<era type="140" draft="contributed">Shōō (1288–1293)</era>
+						<era type="141" draft="contributed">Einin (1293–1299)</era>
+						<era type="142" draft="contributed">Shōan (1299–1302)</era>
+						<era type="143" draft="contributed">Kengen (1302–1303)</era>
+						<era type="144" draft="contributed">Kagen (1303–1306)</era>
+						<era type="145" draft="contributed">Tokuji (1306–1308)</era>
+						<era type="146" draft="contributed">Enkei (1308–1311)</era>
+						<era type="147" draft="contributed">Ōchō (1311–1312)</era>
+						<era type="148" draft="contributed">Shōwa (1312–1317)</era>
+						<era type="149" draft="contributed">Bunpō (1317–1319)</era>
+						<era type="150" draft="contributed">Genō (1319–1321)</era>
+						<era type="151" draft="contributed">Genkyō (1321–1324)</era>
+						<era type="152" draft="contributed">Shōchū (1324–1326)</era>
+						<era type="153" draft="contributed">Kareki (1326–1329)</era>
+						<era type="154" draft="contributed">Gentoku (1329–1331)</era>
+						<era type="155" draft="contributed">Genkō (1331–1334)</era>
+						<era type="156" draft="contributed">Kemmu (1334–1336)</era>
+						<era type="157" draft="contributed">Engen (1336–1340)</era>
+						<era type="158" draft="contributed">Kōkoku (1340–1346)</era>
+						<era type="159" draft="contributed">Shōhei (1346–1370)</era>
+						<era type="160" draft="contributed">Kentoku (1370–1372)</era>
+						<era type="162" draft="contributed">Tenju (1375–1379)</era>
+						<era type="163" draft="contributed">Kōryaku (1379–1381)</era>
+						<era type="164" draft="contributed">Kōwa (1381–1384)</era>
+						<era type="166" draft="contributed">Meitoku (1384–1387)</era>
+						<era type="167" draft="contributed">Kakei (1387–1389)</era>
+						<era type="168" draft="contributed">Kōō (1389–1390)</era>
+						<era type="169" draft="contributed">Meitoku (1390–1394)</era>
+						<era type="170" draft="contributed">Ōei (1394–1428)</era>
+						<era type="171" draft="contributed">Shōchō (1428–1429)</era>
+						<era type="172" draft="contributed">Eikyō (1429–1441)</era>
+						<era type="173" draft="contributed">Kakitsu (1441–1444)</era>
+						<era type="174" draft="contributed">Bun-an (1444-1449)</era>
+						<era type="176" draft="contributed">Kyōtoku (1452–1455)</era>
+						<era type="177" draft="contributed">Kōshō (1455–1457)</era>
+						<era type="178" draft="contributed">Chōroku (1457–1460)</era>
+						<era type="179" draft="contributed">Kanshō (1460–1466)</era>
+						<era type="180" draft="contributed">Bunshō (1466–1467)</era>
+						<era type="181" draft="contributed">Ōnin (1467–1469)</era>
+						<era type="182" draft="contributed">Bunmei (1469–1487)</era>
+						<era type="183" draft="contributed">Chōkyō (1487–1489)</era>
+						<era type="184" draft="contributed">Entoku (1489–1492)</era>
+						<era type="185" draft="contributed">Meiō (1492–1501)</era>
+						<era type="186" draft="contributed">Bunki (1501–1504)</era>
+						<era type="187" draft="contributed">Eishō (1504–1521)</era>
+						<era type="188" draft="contributed">Taiei (1521–1528)</era>
+						<era type="189" draft="contributed">Kyōroku (1528–1532)</era>
+						<era type="190" draft="contributed">Tenmon (1532–1555)</era>
+						<era type="191" draft="contributed">Kōji (1555–1558)</era>
+						<era type="192" draft="contributed">Eiroku (1558–1570)</era>
+						<era type="193" draft="contributed">Genki (1570–1573)</era>
+						<era type="194" draft="contributed">Tenshō (1573–1592)</era>
+						<era type="195" draft="contributed">Bunroku (1592–1596)</era>
+						<era type="196" draft="contributed">Keichō (1596–1615)</era>
+						<era type="197" draft="contributed">Genwa (1615–1624)</era>
+						<era type="198" draft="contributed">Kan-ei (1624-1644)</era>
+						<era type="199" draft="contributed">Shōho (1644–1648)</era>
+						<era type="200" draft="contributed">Keian (1648–1652)</era>
+						<era type="201" draft="contributed">Shōō (1652–1655)</era>
+						<era type="202" draft="contributed">Meiryaku (1655–1658)</era>
+						<era type="203" draft="contributed">Manji (1658–1661)</era>
+						<era type="204" draft="contributed">Kanbun (1661–1673)</era>
+						<era type="205" draft="contributed">Enpō (1673–1681)</era>
+						<era type="206" draft="contributed">Tenwa (1681–1684)</era>
+						<era type="207" draft="contributed">Jōkyō (1684–1688)</era>
+						<era type="208" draft="contributed">Genroku (1688–1704)</era>
+						<era type="209" draft="contributed">Hōei (1704–1711)</era>
+						<era type="210" draft="contributed">Shōtoku (1711–1716)</era>
+						<era type="211" draft="contributed">Kyōhō (1716–1736)</era>
+						<era type="212" draft="contributed">Genbun (1736–1741)</era>
+						<era type="213" draft="contributed">Kanpō (1741–1744)</era>
+						<era type="214" draft="contributed">Enkyō (1744–1748)</era>
+						<era type="215" draft="contributed">Kan-en (1748-1751)</era>
+						<era type="216" draft="contributed">Hōryaku (1751–1764)</era>
+						<era type="217" draft="contributed">Meiwa (1764–1772)</era>
+						<era type="218" draft="contributed">An-ei (1772-1781)</era>
+						<era type="219" draft="contributed">Tenmei (1781–1789)</era>
+						<era type="220" draft="contributed">Kansei (1789–1801)</era>
+						<era type="221" draft="contributed">Kyōwa (1801–1804)</era>
+						<era type="222" draft="contributed">Bunka (1804–1818)</era>
+						<era type="223" draft="contributed">Bunsei (1818–1830)</era>
+						<era type="224" draft="contributed">Tenpō (1830–1844)</era>
+						<era type="225" draft="contributed">Kōka (1844–1848)</era>
+						<era type="226" draft="contributed">Kaei (1848–1854)</era>
+						<era type="227" draft="contributed">Ansei (1854–1860)</era>
+						<era type="228" draft="contributed">Man-en (1860-1861)</era>
+						<era type="229" draft="contributed">Bunkyū (1861–1864)</era>
+						<era type="230" draft="contributed">Genji (1864–1865)</era>
+						<era type="231" draft="contributed">Keiō (1865–1868)</era>
+						<era type="232" draft="contributed">Meiji</era>
+						<era type="233" draft="contributed">Taishō</era>
+						<era type="234" draft="contributed">Shōwa</era>
+						<era type="235" draft="contributed">Heisei</era>
+					</eraAbbr>
+				</eras>
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
@@ -2956,10 +3273,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="year-narrow">
 				<displayName>thn.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">+{0} thn.</relativeTimePattern>
+					<relativeTimePattern count="other">Dalam {0} tahun</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other">-{0} thn.</relativeTimePattern>
+					<relativeTimePattern count="other">{0} tahun yang lalu</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter">
@@ -3023,7 +3340,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Minggu</displayName>
 				<relative type="-1">minggu lalu</relative>
 				<relative type="0">minggu ini</relative>
-				<relative type="1">minggu berikutnya</relative>
+				<relative type="1">minggu depan</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">Dalam {0} minggu</relativeTimePattern>
 				</relativeTime>
@@ -3762,7 +4079,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</zone>
 			<zone type="Europe/London">
 				<long>
-					<daylight>Musim Panas Inggris</daylight>
+					<daylight>Waktu Musim Panas Inggris</daylight>
 				</long>
 				<exemplarCity>London</exemplarCity>
 			</zone>
@@ -3855,7 +4172,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</zone>
 			<zone type="Europe/Dublin">
 				<long>
-					<daylight>Musim Panas Irlandia</daylight>
+					<daylight>Waktu Standar Irlandia</daylight>
 				</long>
 				<exemplarCity>Dublin</exemplarCity>
 			</zone>
@@ -4153,6 +4470,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
 			</zone>
@@ -4237,6 +4557,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Chita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Yakutsk</exemplarCity>
 			</zone>
@@ -4255,6 +4578,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolymsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamchatka</exemplarCity>
 			</zone>
@@ -4572,7 +4898,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Waktu Alaska</generic>
 					<standard>Waktu Standar Alaska</standard>
-					<daylight>Waktu Terang Alaska</daylight>
+					<daylight>Waktu Musim Panas Alaska</daylight>
 				</long>
 			</metazone>
 			<metazone type="Almaty">
@@ -4593,28 +4919,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Waktu Tengah</generic>
 					<standard>Waktu Standar Tengah</standard>
-					<daylight>Waktu Terang Hari Tengah</daylight>
+					<daylight>Waktu Musim Panas Tengah</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
 					<generic>Waktu Timur</generic>
 					<standard>Waktu Standar Timur</standard>
-					<daylight>Waktu Terang Hari Timur</daylight>
+					<daylight>Waktu Musim Panas Timur</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
 					<generic>Waktu Pegunungan</generic>
 					<standard>Waktu Standar Pegunungan</standard>
-					<daylight>Waktu Terang Hari Pegunungan</daylight>
+					<daylight>Waktu Musim Panas Pegunungan</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
 					<generic>Waktu Pasifik</generic>
 					<standard>Waktu Standar Pasifik</standard>
-					<daylight>Waktu Terang Hari Pasifik</daylight>
+					<daylight>Waktu Musim Panas Pasifik</daylight>
 				</long>
 			</metazone>
 			<metazone type="Anadyr">
@@ -4649,7 +4975,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Waktu Arab</generic>
 					<standard>Waktu Standar Arab</standard>
-					<daylight>Waktu Terang Arab</daylight>
+					<daylight>Waktu Musim Panas Arab</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina">
@@ -4677,35 +5003,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Waktu Atlantik</generic>
 					<standard>Waktu Standar Atlantik</standard>
-					<daylight>Waktu Terang Atlantik</daylight>
+					<daylight>Waktu Musim Panas Atlantik</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
 					<generic>Waktu Tengah Australia</generic>
 					<standard>Waktu Standar Tengah Australia</standard>
-					<daylight>Waktu Terang Tengah Australia</daylight>
+					<daylight>Waktu Musim Panas Tengah Australia</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_CentralWestern">
 				<long>
 					<generic>Waktu Barat Tengah Australia</generic>
 					<standard>Waktu Standar Barat Tengah Australia</standard>
-					<daylight>Waktu Terang Barat Tengah Australia</daylight>
+					<daylight>Waktu Musim Panas Barat Tengah Australia</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Eastern">
 				<long>
 					<generic>Waktu Timur Australia</generic>
 					<standard>Waktu Standar Timur Australia</standard>
-					<daylight>Waktu Terang Timur Australia</daylight>
+					<daylight>Waktu Musim Panas Timur Australia</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Western">
 				<long>
-					<generic>Waktu Australia Barat</generic>
+					<generic>Waktu Barat Australia</generic>
 					<standard>Waktu Standar Barat Australia</standard>
-					<daylight>Waktu Terang Barat Australia</daylight>
+					<daylight>Waktu Musim Panas Barat Australia</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azerbaijan">
@@ -4772,7 +5098,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Waktu Chatham</generic>
 					<standard>Waktu Standar Chatham</standard>
-					<daylight>Waktu Terang Chatham</daylight>
+					<daylight>Waktu Musim Panas Chatham</daylight>
 				</long>
 			</metazone>
 			<metazone type="Chile">
@@ -4784,9 +5110,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="China">
 				<long>
-					<generic>Waktu China</generic>
-					<standard>Waktu Standar China</standard>
-					<daylight>Waktu Terang China</daylight>
+					<generic>Waktu Tiongkok</generic>
+					<standard>Waktu Standar Tiongkok</standard>
+					<daylight>Waktu Terang Tiongkok</daylight>
 				</long>
 			</metazone>
 			<metazone type="Choibalsan">
@@ -4964,7 +5290,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Waktu Hawaii-Aleutian</generic>
 					<standard>Waktu Standar Hawaii-Aleutian</standard>
-					<daylight>Waktu Terang Hawaii-Aleutian</daylight>
+					<daylight>Waktu Musim Panas Hawaii-Aleutian</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hong_Kong">
@@ -5103,7 +5429,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Waktu Lord Howe</generic>
 					<standard>Waktu Standar Lord Howe</standard>
-					<daylight>Waktu Terang Lord Howe</daylight>
+					<daylight>Waktu Musim Panas Lord Howe</daylight>
 				</long>
 			</metazone>
 			<metazone type="Macau">
@@ -5211,14 +5537,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Waktu Selandia Baru</generic>
 					<standard>Waktu Standar Selandia Baru</standard>
-					<daylight>Waktu Terang Selandia Baru</daylight>
+					<daylight>Waktu Musim Panas Selandia Baru</daylight>
 				</long>
 			</metazone>
 			<metazone type="Newfoundland">
 				<long>
 					<generic>Waktu Newfoundland</generic>
 					<standard>Waktu Standar Newfoundland</standard>
-					<daylight>Waktu Siang Hari Newfoundland</daylight>
+					<daylight>Waktu Musim Panas Newfoundland</daylight>
 				</long>
 			</metazone>
 			<metazone type="Niue">
@@ -5520,7 +5846,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<perMille>‰</perMille>
 			<infinity>∞</infinity>
 			<nan>NaN</nan>
-			<timeSeparator draft="contributed">.</timeSeparator>
+			<timeSeparator>.</timeSeparator>
 		</symbols>
 		<decimalFormats numberSystem="latn">
 			<decimalFormatLength>
@@ -5584,6 +5910,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">¤0</pattern>
+					<pattern type="10000" count="other">¤00 rb</pattern>
+					<pattern type="100000" count="other">¤000 rb</pattern>
+					<pattern type="1000000" count="other">¤0 jt</pattern>
+					<pattern type="10000000" count="other">¤00 jt</pattern>
+					<pattern type="100000000" count="other">¤000 jt</pattern>
+					<pattern type="1000000000" count="other">¤0 M</pattern>
+					<pattern type="10000000000" count="other">¤00 M</pattern>
+					<pattern type="100000000000" count="other">¤000 M</pattern>
+					<pattern type="1000000000000" count="other">¤0 T</pattern>
+					<pattern type="10000000000000" count="other">¤00 T</pattern>
+					<pattern type="100000000000000" count="other">¤000 T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencies>
@@ -5625,6 +5967,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Kwanza Angola</displayName>
 				<displayName count="other">Kwanza Angola</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>Kwanza Angola (1977–1991)</displayName>
@@ -5700,6 +6043,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Mark Konvertibel Bosnia-Herzegovina</displayName>
 				<displayName count="other">Mark Konvertibel Bosnia-Herzegovina</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BAN">
 				<displayName>Dinar Baru Bosnia-Herzegovina (1994–1997)</displayName>
@@ -5774,6 +6118,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Boliviano</displayName>
 				<displayName count="other">Boliviano</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOL">
 				<displayName>Boliviano Bolivia (1863–1963)</displayName>
@@ -5843,6 +6188,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Pula Botswana</displayName>
 				<displayName count="other">Pula Botswana</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>Rubel Baru Belarus (1994–1999)</displayName>
@@ -5900,8 +6246,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CNY">
-				<displayName>Yuan China</displayName>
-				<displayName count="other">Yuan China</displayName>
+				<displayName>Yuan Tiongkok</displayName>
+				<displayName count="other">Yuan Tiongkok</displayName>
 				<symbol>CN¥</symbol>
 				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
@@ -5934,6 +6280,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Peso Konvertibel Kuba</displayName>
 				<displayName count="other">Peso Konvertibel Kuba</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>Peso Kuba</displayName>
@@ -5954,6 +6301,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Koruna Cheska</displayName>
 				<displayName count="other">Koruna Cheska</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>Mark Jerman Timur</displayName>
@@ -5972,6 +6320,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Krone Denmark</displayName>
 				<displayName count="other">Krone Denmark</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Peso Dominika</displayName>
@@ -6000,6 +6349,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Pound Mesir</displayName>
 				<displayName count="other">Pound Mesir</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>Nakfa Eritrea</displayName>
@@ -6043,6 +6393,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Pound Kepulauan Falkland</displayName>
 				<displayName count="other">Pound Kepulauan Falkland</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>Franc Prancis</displayName>
@@ -6088,6 +6439,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Franc Guinea</displayName>
 				<displayName count="other">Franc Guinea</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>Syli Guinea</displayName>
@@ -6105,6 +6457,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Quetzal Guatemala</displayName>
 				<displayName count="other">Quetzal Guatemala</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>Escudo Guinea Portugal</displayName>
@@ -6130,6 +6483,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Lempira Honduras</displayName>
 				<displayName count="other">Lempira Honduras</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>Dinar Kroasia</displayName>
@@ -6139,6 +6493,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Kuna Kroasia</displayName>
 				<displayName count="other">Kuna Kroasia</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>Gourde Haiti</displayName>
@@ -6149,11 +6504,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Forint Hungaria</displayName>
 				<displayName count="other">Forint Hungaria</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>Rupiah Indonesia</displayName>
 				<displayName count="other">Rupiah Indonesia</displayName>
 				<symbol>Rp</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>Pound Irlandia</displayName>
@@ -6197,6 +6554,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Krona Islandia</displayName>
 				<displayName count="other">Krona Islandia</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>Lira Italia</displayName>
@@ -6239,11 +6597,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Franc Komoro</displayName>
 				<displayName count="other">Franc Komoro</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>Won Korea Utara</displayName>
 				<displayName count="other">Won Korea Utara</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRH">
 				<displayName>Hwan Korea Selatan (1953–1962)</displayName>
@@ -6288,11 +6648,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Pound Lebanon</displayName>
 				<displayName count="other">Pound Lebanon</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>Rupee Sri Lanka</displayName>
 				<displayName count="other">Rupee Sri Lanka</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>Dolar Liberia</displayName>
@@ -6365,6 +6727,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Ariary Madagaskar</displayName>
 				<displayName count="other">Ariary Madagaskar</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>Franc Malagasi</displayName>
@@ -6388,6 +6751,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Kyat Myanmar</displayName>
 				<displayName count="other">Kyat Myanmar</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>Tugrik Mongolia</displayName>
@@ -6417,6 +6781,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Rupee Mauritius</displayName>
 				<displayName count="other">Rupee Mauritius</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVP">
 				<displayName>Rufiyaa Maladewa (1947–1981)</displayName>
@@ -6451,6 +6816,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Ringgit Malaysia</displayName>
 				<displayName count="other">Ringgit Malaysia</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>Escudo Mozambik</displayName>
@@ -6487,6 +6853,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Cordoba Nikaragua</displayName>
 				<displayName count="other">Cordoba Nikaragua</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>Guilder Belanda</displayName>
@@ -6496,11 +6863,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Krone Norwegia</displayName>
 				<displayName count="other">Krone Norwegia</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>Rupee Nepal</displayName>
 				<displayName count="other">Rupee Nepal</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>Dolar Selandia Baru</displayName>
@@ -6547,11 +6916,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Rupee Pakistan</displayName>
 				<displayName count="other">Rupee Pakistan</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>Polandia Zloty</displayName>
 				<displayName count="other">Polandia Zloty</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>Zloty Polandia (1950–1995)</displayName>
@@ -6596,6 +6967,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Rubel Rusia</displayName>
 				<displayName count="other">Rubel Rusia</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>Rubel Rusia (1991–1998)</displayName>
@@ -6606,6 +6978,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Franc Rwanda</displayName>
 				<displayName count="other">Franc Rwanda</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>Riyal Arab Saudi</displayName>
@@ -6642,6 +7015,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Krona Swedia</displayName>
 				<displayName count="other">Krona Swedia</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>Dolar Singapura</displayName>
@@ -6653,6 +7027,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Pound Saint Helena</displayName>
 				<displayName count="other">Pound Saint Helena</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>Tolar Slovenia</displayName>
@@ -6692,6 +7067,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Dobra Sao Tome dan Principe</displayName>
 				<displayName count="other">Dobra Sao Tome dan Principe</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>Rubel Soviet</displayName>
@@ -6705,6 +7081,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Pound Suriah</displayName>
 				<displayName count="other">Pound Suriah</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>Lilangeni Swaziland</displayName>
@@ -6715,6 +7092,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Baht Thailand</displayName>
 				<displayName count="other">Baht Thailand</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>Rubel Tajikistan</displayName>
@@ -6744,6 +7122,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Paʻanga Tonga</displayName>
 				<displayName count="other">Paʻanga Tonga</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>Escudo Timor</displayName>
@@ -6758,7 +7137,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Lira Turki</displayName>
 				<displayName count="other">Lira Turki</displayName>
 				<symbol>TRY</symbol>
-				<symbol alt="narrow" draft="provisional">₤</symbol>
+				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Dolar Trinidad dan Tobago</displayName>
@@ -6823,7 +7203,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="UYU">
 				<displayName>Peso Uruguay</displayName>
 				<displayName count="other">Peso Uruguay</displayName>
-				<symbol draft="provisional">$U</symbol>
+				<symbol draft="contributed">UYU</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="UZS">
@@ -6840,6 +7220,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Bolivar Venezuela</displayName>
 				<displayName count="other">Bolivar Venezuela</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>Dong Vietnam</displayName>
@@ -6895,6 +7276,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Dolar Karibia Timur</displayName>
 				<displayName count="other">Dolar Karibia Timur</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>Hak Khusus Menggambar</displayName>
@@ -6979,6 +7361,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Rand Afrika Selatan</displayName>
 				<displayName count="other">Rand Afrika Selatan</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>Kwacha Zambia (1968–2012)</displayName>
@@ -6989,6 +7372,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Kwacha Zambia</displayName>
 				<displayName count="other">Kwacha Zambia</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>Zaire Baru Zaire (1993–1998)</displayName>
@@ -7032,6 +7416,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>meter per detik persegi</displayName>
 				<unitPattern count="other">{0} meter per detik persegi</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>revolusi</displayName>
+				<unitPattern count="other">{0} revolusi</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radian</displayName>
+				<unitPattern count="other">{0} radian</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>derajat</displayName>
+				<unitPattern count="other">{0} derajat</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>menit busur</displayName>
 				<unitPattern count="other">{0} menit busur</unitPattern>
@@ -7040,25 +7436,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>detik busur</displayName>
 				<unitPattern count="other">{0} detik busur</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>derajat</displayName>
-				<unitPattern count="other">{0} derajat</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radian</displayName>
-				<unitPattern count="other">{0} radian</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>acre</displayName>
-				<unitPattern count="other">{0} acre</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>kilometer persegi</displayName>
+				<unitPattern count="other">{0} kilometer persegi</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektar</displayName>
 				<unitPattern count="other">{0} hektar</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>meter persegi</displayName>
+				<unitPattern count="other">{0} meter persegi</unitPattern>
+				<perUnitPattern>{0} per meter persegi</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>sentimeter persegi</displayName>
 				<unitPattern count="other">{0} sentimeter persegi</unitPattern>
+				<perUnitPattern>{0} per sentimeter persegi</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mil persegi</displayName>
+				<unitPattern count="other">{0} mil persegi</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acre</displayName>
+				<unitPattern count="other">{0} acre</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yard persegi</displayName>
+				<unitPattern count="other">{0} yard persegi</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>kaki persegi</displayName>
@@ -7067,112 +7473,114 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="area-square-inch">
 				<displayName>inci persegi</displayName>
 				<unitPattern count="other">{0} inci persegi</unitPattern>
+				<perUnitPattern>{0} per inci persegi</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kilometer persegi</displayName>
-				<unitPattern count="other">{0} kilometer persegi</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>meter persegi</displayName>
-				<unitPattern count="other">{0} meter persegi</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mil persegi</displayName>
-				<unitPattern count="other">{0} mil persegi</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yard persegi</displayName>
-				<unitPattern count="other">{0} yard persegi</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karat</displayName>
+				<unitPattern count="other">{0} karat</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liter per kilometer</displayName>
 				<unitPattern count="other">{0} liter per kilometer</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>liter per 100 kilometer</displayName>
+				<unitPattern count="other">{0} liter per 100 kilometer</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mil per galon</displayName>
 				<unitPattern count="other">{0} mil per galon</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabit</displayName>
-				<unitPattern count="other">{0} gigabit</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabyte</displayName>
-				<unitPattern count="other">{0} gigabyte</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobit</displayName>
-				<unitPattern count="other">{0} kilobit</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobyte</displayName>
-				<unitPattern count="other">{0} kilobyte</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabit</displayName>
-				<unitPattern count="other">{0} megabit</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabyte</displayName>
-				<unitPattern count="other">{0} megabyte</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabit</displayName>
-				<unitPattern count="other">{0} terabit</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabyte</displayName>
 				<unitPattern count="other">{0} terabyte</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabit</displayName>
+				<unitPattern count="other">{0} terabit</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabyte</displayName>
+				<unitPattern count="other">{0} gigabyte</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabit</displayName>
+				<unitPattern count="other">{0} gigabit</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabyte</displayName>
+				<unitPattern count="other">{0} megabyte</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabit</displayName>
+				<unitPattern count="other">{0} megabit</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobyte</displayName>
+				<unitPattern count="other">{0} kilobyte</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobit</displayName>
+				<unitPattern count="other">{0} kilobit</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>abad</displayName>
+				<unitPattern count="other">{0} abad</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>tahun</displayName>
+				<unitPattern count="other">{0} tahun</unitPattern>
+				<perUnitPattern>{0} per tahun</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>bulan</displayName>
+				<unitPattern count="other">{0} bulan</unitPattern>
+				<perUnitPattern>{0} per bulan</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>minggu</displayName>
+				<unitPattern count="other">{0} minggu</unitPattern>
+				<perUnitPattern>{0} per minggu</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>hari</displayName>
 				<unitPattern count="other">{0} hari</unitPattern>
+				<perUnitPattern>{0} per hari</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>jam</displayName>
 				<unitPattern count="other">{0} jam</unitPattern>
 				<perUnitPattern>{0} per jam</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikrodetik</displayName>
-				<unitPattern count="other">{0} mikrodetik</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milidetik</displayName>
-				<unitPattern count="other">{0} milidetik</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>menit</displayName>
 				<unitPattern count="other">{0} menit</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>bulan</displayName>
-				<unitPattern count="other">{0} bulan</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanodetik</displayName>
-				<unitPattern count="other">{0} nanodetik</unitPattern>
+				<perUnitPattern>{0} per menit</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>detik</displayName>
 				<unitPattern count="other">{0} detik</unitPattern>
 				<perUnitPattern>{0} per detik</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>minggu</displayName>
-				<unitPattern count="other">{0} minggu</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milidetik</displayName>
+				<unitPattern count="other">{0} milidetik</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>tahun</displayName>
-				<unitPattern count="other">{0} tahun</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>mikrodetik</displayName>
+				<unitPattern count="other">{0} mikrodetik</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanodetik</displayName>
+				<unitPattern count="other">{0} nanodetik</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ampere</displayName>
@@ -7190,6 +7598,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>volt</displayName>
 				<unitPattern count="other">{0} volt</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokalori</displayName>
+				<unitPattern count="other">{0} kilokalori</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kalori</displayName>
 				<unitPattern count="other">{0} kalori</unitPattern>
@@ -7198,18 +7610,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Kalori</displayName>
 				<unitPattern count="other">{0} Kalori</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="other">{0} joule</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokalori</displayName>
-				<unitPattern count="other">{0} kilokalori</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojoule</displayName>
 				<unitPattern count="other">{0} kilojoule</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="other">{0} joule</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilowatt-jam</displayName>
 				<unitPattern count="other">{0} kilowatt-jam</unitPattern>
@@ -7218,162 +7626,167 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>gigahertz</displayName>
 				<unitPattern count="other">{0} gigahertz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hertz</displayName>
-				<unitPattern count="other">{0} hertz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megahertz</displayName>
+				<unitPattern count="other">{0} megahertz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kilohertz</displayName>
 				<unitPattern count="other">{0} kilohertz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megahertz</displayName>
-				<unitPattern count="other">{0} megahertz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hertz</displayName>
+				<unitPattern count="other">{0} hertz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>satuan astronomi</displayName>
-				<unitPattern count="other">{0} satuan astronomi</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometer</displayName>
+				<unitPattern count="other">{0} kilometer</unitPattern>
+				<perUnitPattern>{0} per kilometer</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>sentimeter</displayName>
-				<unitPattern count="other">{0} sentimeter</unitPattern>
+			<unit type="length-meter">
+				<displayName>meter</displayName>
+				<unitPattern count="other">{0} meter</unitPattern>
+				<perUnitPattern>{0} per meter</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>desimeter</displayName>
 				<unitPattern count="other">{0} desimeter</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>kaki</displayName>
-				<unitPattern count="other">{0} kaki</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>inci</displayName>
-				<unitPattern count="other">{0} inci</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometer</displayName>
-				<unitPattern count="other">{0} kilometer</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>tahun cahaya</displayName>
-				<unitPattern count="other">{0} tahun cahaya</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>meter</displayName>
-				<unitPattern count="other">{0} meter</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>mikrometer</displayName>
-				<unitPattern count="other">{0} mikrometer</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mil</displayName>
-				<unitPattern count="other">{0} mil</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>sentimeter</displayName>
+				<unitPattern count="other">{0} sentimeter</unitPattern>
+				<perUnitPattern>{0} per sentimeter</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>milimeter</displayName>
 				<unitPattern count="other">{0} milimeter</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikrometer</displayName>
+				<unitPattern count="other">{0} mikrometer</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanometer</displayName>
 				<unitPattern count="other">{0} nanometer</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>mil laut</displayName>
-				<unitPattern count="other">{0} mil laut</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsec</displayName>
-				<unitPattern count="other">{0} parsec</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pikometer</displayName>
 				<unitPattern count="other">{0} pikometer</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mil</displayName>
+				<unitPattern count="other">{0} mil</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yard</displayName>
 				<unitPattern count="other">{0} yard</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>kaki</displayName>
+				<unitPattern count="other">{0} kaki</unitPattern>
+				<perUnitPattern>{0} per kaki</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>inci</displayName>
+				<unitPattern count="other">{0} inci</unitPattern>
+				<perUnitPattern>{0} per inci</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsec</displayName>
+				<unitPattern count="other">{0} parsec</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>tahun cahaya</displayName>
+				<unitPattern count="other">{0} tahun cahaya</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>satuan astronomi</displayName>
+				<unitPattern count="other">{0} satuan astronomi</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>mil laut</displayName>
+				<unitPattern count="other">{0} mil laut</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>mil skandinavia</displayName>
+				<unitPattern count="other">{0} mil skandinavia</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karat</displayName>
-				<unitPattern count="other">{0} karat</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gram</displayName>
-				<unitPattern count="other">{0} gram</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogram</displayName>
-				<unitPattern count="other">{0} kilogram</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>metrik ton</displayName>
 				<unitPattern count="other">{0} metrik ton</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mikrogram</displayName>
-				<unitPattern count="other">{0} mikrogram</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogram</displayName>
+				<unitPattern count="other">{0} kilogram</unitPattern>
+				<perUnitPattern>{0} per kilogram</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="other">{0} gram</unitPattern>
+				<perUnitPattern>{0} per gram</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>miligram</displayName>
 				<unitPattern count="other">{0} miligram</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ons</displayName>
-				<unitPattern count="other">{0} ons</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>troy ons</displayName>
-				<unitPattern count="other">{0} troy ons</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>pon</displayName>
-				<unitPattern count="other">{0} pon</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>mikrogram</displayName>
+				<unitPattern count="other">{0} mikrogram</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>ton</displayName>
 				<unitPattern count="other">{0} ton</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>pon</displayName>
+				<unitPattern count="other">{0} pon</unitPattern>
+				<perUnitPattern>{0} per pon</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ons</displayName>
+				<unitPattern count="other">{0} ons</unitPattern>
+				<perUnitPattern>{0} per ons</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>troy ons</displayName>
+				<unitPattern count="other">{0} troy ons</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karat</displayName>
+				<unitPattern count="other">{0} karat</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigawatt</displayName>
 				<unitPattern count="other">{0} gigawatt</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>daya kuda</displayName>
-				<unitPattern count="other">{0} daya kuda</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilowatt</displayName>
-				<unitPattern count="other">{0} kilowatt</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>megawatt</displayName>
 				<unitPattern count="other">{0} megawatt</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>miliwatt</displayName>
-				<unitPattern count="other">{0} miliwatt</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilowatt</displayName>
+				<unitPattern count="other">{0} kilowatt</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watt</displayName>
 				<unitPattern count="other">{0} watt</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>miliwatt</displayName>
+				<unitPattern count="other">{0} miliwatt</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>daya kuda</displayName>
+				<unitPattern count="other">{0} daya kuda</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hektopaskal</displayName>
 				<unitPattern count="other">{0} hektopaskal</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inci merkuri</displayName>
-				<unitPattern count="other">{0} inci merkuri</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>milibar</displayName>
-				<unitPattern count="other">{0} milibar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>milimeter merkuri</displayName>
 				<unitPattern count="other">{0} milimeter merkuri</unitPattern>
@@ -7382,9 +7795,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>pon per inci persegi</displayName>
 				<unitPattern count="other">{0} pon per inci persegi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karat</displayName>
-				<unitPattern count="other">{0} karat</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inci merkuri</displayName>
+				<unitPattern count="other">{0} inci merkuri</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>milibar</displayName>
+				<unitPattern count="other">{0} milibar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometer per jam</displayName>
@@ -7398,6 +7815,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>mil per jam</displayName>
 				<unitPattern count="other">{0} mil per jam</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>knot</displayName>
+				<unitPattern count="other">{0} knot</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>derajat Celsius</displayName>
 				<unitPattern count="other">{0} derajat Celsius</unitPattern>
@@ -7410,26 +7835,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>kelvin</displayName>
 				<unitPattern count="other">{0} kelvin</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>acre-feet</displayName>
-				<unitPattern count="other">{0} acre-feet</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>sentiliter</displayName>
-				<unitPattern count="other">{0} sentiliter</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>sentimeter kubik</displayName>
-				<unitPattern count="other">{0} sentimeter kubik</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>kaki kubik</displayName>
-				<unitPattern count="other">{0} kaki kubik</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>inci kubik</displayName>
-				<unitPattern count="other">{0} inci kubik</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kilometer kubik</displayName>
 				<unitPattern count="other">{0} kilometer kubik</unitPattern>
@@ -7437,6 +7842,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-cubic-meter">
 				<displayName>meter kubik</displayName>
 				<unitPattern count="other">{0} meter kubik</unitPattern>
+				<perUnitPattern>{0} per meter kubik</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>sentimeter kubik</displayName>
+				<unitPattern count="other">{0} sentimeter kubik</unitPattern>
+				<perUnitPattern>{0} per sentimeter kubik</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mil kubik</displayName>
@@ -7446,21 +7857,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>yard kubik</displayName>
 				<unitPattern count="other">{0} yard kubik</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>cup</displayName>
-				<unitPattern count="other">{0} cup</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>kaki kubik</displayName>
+				<unitPattern count="other">{0} kaki kubik</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>desiliter</displayName>
-				<unitPattern count="other">{0} desiliter</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>inci kubik</displayName>
+				<unitPattern count="other">{0} inci kubik</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fluid ounce</displayName>
-				<unitPattern count="other">{0} fluid ounce</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>galon</displayName>
-				<unitPattern count="other">{0} galon</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megaliter</displayName>
+				<unitPattern count="other">{0} megaliter</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hektoliter</displayName>
@@ -7469,23 +7876,53 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-liter">
 				<displayName>liter</displayName>
 				<unitPattern count="other">{0} liter</unitPattern>
+				<perUnitPattern>{0} per liter</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megaliter</displayName>
-				<unitPattern count="other">{0} megaliter</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>desiliter</displayName>
+				<unitPattern count="other">{0} desiliter</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>sentiliter</displayName>
+				<unitPattern count="other">{0} sentiliter</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mililiter</displayName>
 				<unitPattern count="other">{0} mililiter</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pint</displayName>
-				<unitPattern count="other">{0} pint</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>metric pint</displayName>
+				<unitPattern count="other">{0} metric pint</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>metric cup</displayName>
+				<unitPattern count="other">{0} metric cup</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acre-feet</displayName>
+				<unitPattern count="other">{0} acre-feet</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galon</displayName>
+				<unitPattern count="other">{0} galon</unitPattern>
+				<perUnitPattern>{0} per galon</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>quart</displayName>
 				<unitPattern count="other">{0} quart</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pint</displayName>
+				<unitPattern count="other">{0} pint</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cup</displayName>
+				<unitPattern count="other">{0} cup</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fluid ounce</displayName>
+				<unitPattern count="other">{0} fluid ounce</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>sendok makan</displayName>
 				<unitPattern count="other">{0} sendok makan</unitPattern>
@@ -7494,6 +7931,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>sendok teh</displayName>
 				<unitPattern count="other">{0} sendok teh</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}T</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}U</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}B</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -7507,6 +7950,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m/s²</displayName>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="other">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radian</displayName>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>derajat</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>mnt busur</displayName>
 				<unitPattern count="other">{0} mnt busur</unitPattern>
@@ -7515,25 +7970,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>dtk busur</displayName>
 				<unitPattern count="other">{0} dtk busur</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>derajat</displayName>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radian</displayName>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>acre</displayName>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektar</displayName>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>meter²</displayName>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0} per m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mil persegi</displayName>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acre</displayName>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yard²</displayName>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>kaki persegi</displayName>
@@ -7542,112 +8007,114 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="area-square-inch">
 				<displayName>inci²</displayName>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>meter²</displayName>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mil persegi</displayName>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yard²</displayName>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karat</displayName>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
 				<unitPattern count="other">{0} L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gbit</displayName>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>Gbyte</displayName>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kbit</displayName>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kByte</displayName>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mbit</displayName>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MByte</displayName>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tbit</displayName>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TByte</displayName>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tbit</displayName>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>Gbyte</displayName>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gbit</displayName>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MByte</displayName>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mbit</displayName>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kByte</displayName>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kbit</displayName>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>abad</displayName>
+				<unitPattern count="other">{0} abad</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>tahun</displayName>
+				<unitPattern count="other">{0} thn</unitPattern>
+				<perUnitPattern>{0}/thn</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>bulan</displayName>
+				<unitPattern count="other">{0} bln</unitPattern>
+				<perUnitPattern>{0}/bln</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>minggu</displayName>
+				<unitPattern count="other">{0} mgg</unitPattern>
+				<perUnitPattern>{0}/mgg</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>hari</displayName>
 				<unitPattern count="other">{0} hr</unitPattern>
+				<perUnitPattern>{0}/hr</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>jam</displayName>
 				<unitPattern count="other">{0} j</unitPattern>
 				<perUnitPattern>{0}/j</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μdtk</displayName>
-				<unitPattern count="other">{0} μd</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milidtk</displayName>
-				<unitPattern count="other">{0} md</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>mnt</displayName>
 				<unitPattern count="other">{0} mnt</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>bulan</displayName>
-				<unitPattern count="other">{0} bln</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanodtk</displayName>
-				<unitPattern count="other">{0} ndtk</unitPattern>
+				<perUnitPattern>{0}/mnt</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>dtk</displayName>
 				<unitPattern count="other">{0} dtk</unitPattern>
 				<perUnitPattern>{0}/dtk</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>minggu</displayName>
-				<unitPattern count="other">{0} mgg</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milidtk</displayName>
+				<unitPattern count="other">{0} md</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>tahun</displayName>
-				<unitPattern count="other">{0} thn</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μdtk</displayName>
+				<unitPattern count="other">{0} μd</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanodtk</displayName>
+				<unitPattern count="other">{0} ndtk</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amp</displayName>
@@ -7665,6 +8132,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>volt</displayName>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kkal</displayName>
+				<unitPattern count="other">{0} kkal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kal</displayName>
 				<unitPattern count="other">{0} kal</unitPattern>
@@ -7673,18 +8144,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Kal</displayName>
 				<unitPattern count="other">{0} Kal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kkal</displayName>
-				<unitPattern count="other">{0} kkal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojoule</displayName>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kW-jam</displayName>
 				<unitPattern count="other">{0} kWh</unitPattern>
@@ -7693,162 +8160,167 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>GHz</displayName>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>sa</displayName>
-				<unitPattern count="other">{0} sa</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>meter</displayName>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>kaki</displayName>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>inci</displayName>
-				<unitPattern count="other">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>thn cahaya</displayName>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>meter</displayName>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µmeter</displayName>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mil</displayName>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µmeter</displayName>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsec</displayName>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mil</displayName>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yard</displayName>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>kaki</displayName>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>inci</displayName>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsec</displayName>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>thn cahaya</displayName>
+				<unitPattern count="other">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>sa</displayName>
+				<unitPattern count="other">{0} sa</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karat</displayName>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gram</displayName>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ons</displayName>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>pon</displayName>
-				<unitPattern count="other">{0} lb</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>ton</displayName>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>pon</displayName>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ons</displayName>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karat</displayName>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hp</displayName>
-				<unitPattern count="other">{0} hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watt</displayName>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inci merkuri</displayName>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="other">{0} mm Hg</unitPattern>
@@ -7857,9 +8329,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>psi</displayName>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karat</displayName>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inci merkuri</displayName>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/jam</displayName>
@@ -7873,6 +8349,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>mi/h</displayName>
 				<unitPattern count="other">{0} mph</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="other">{0}°C</unitPattern>
@@ -7885,26 +8369,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>K</displayName>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cL</displayName>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>inci³</displayName>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="other">{0} km³</unitPattern>
@@ -7912,6 +8376,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-cubic-meter">
 				<displayName>m³</displayName>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -7921,21 +8391,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>yard³</displayName>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>cup</displayName>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>inci³</displayName>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -7944,23 +8410,53 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-liter">
 				<displayName>liter</displayName>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pint</displayName>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pint</displayName>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cup</displayName>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>sdm</displayName>
 				<unitPattern count="other">{0} sdm</unitPattern>
@@ -7969,6 +8465,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>sdt</displayName>
 				<unitPattern count="other">{0} sdt</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}T</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}U</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}B</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -7977,33 +8479,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="acceleration-g-force">
 				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="other">{0}′</unitPattern>
 			</unit>
 			<unit type="angle-arc-second">
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="other">{0} m²</unitPattern>
 			</unit>
 			<unit type="area-square-mile">
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="other">{0}L/100km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>thn</displayName>
+				<unitPattern count="other">{0} thn</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>bulan</displayName>
+				<unitPattern count="other">{0} bln</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>mgg</displayName>
+				<unitPattern count="other">{0} mgg</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>hari</displayName>
 				<unitPattern count="other">{0} hr</unitPattern>
@@ -8012,53 +8530,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>jam</displayName>
 				<unitPattern count="other">{0} j</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milidetik</displayName>
-				<unitPattern count="other">{0} md</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>mnt</displayName>
 				<unitPattern count="other">{0} mnt</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>bulan</displayName>
-				<unitPattern count="other">{0} bln</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>dtk</displayName>
 				<unitPattern count="other">{0} dtk</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>mgg</displayName>
-				<unitPattern count="other">{0} mgg</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>thn</displayName>
-				<unitPattern count="other">{0} thn</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="other">{0}″</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milidetik</displayName>
+				<unitPattern count="other">{0} md</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
 				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>meter</displayName>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -8067,25 +8561,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="length-picometer">
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>gram</displayName>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="other">{0} ft</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="other">{0} ly</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="other">{0} oz</unitPattern>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="other">{0} lb</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="other">{0} hp</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="other">{0} oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="other">{0} kW</unitPattern>
@@ -8093,6 +8596,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="power-watt">
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
@@ -8129,6 +8635,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>liter</displayName>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}T</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}U</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}B</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h.mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/id_ID.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/id_ID.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/id_ID.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/id_ID.xml
index 280fe4bab11..81d1bcc4b0f 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/id_ID.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/id_ID.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="id"/>
 		<territory type="ID"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ig.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ig.xml
similarity index 89%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ig.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ig.xml
index 5f782dd1eb2..65d3358567b 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ig.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ig.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="ig"/>
 	</identity>
 	<localeDisplayNames>
@@ -202,6 +201,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">A.M.</dayPeriod>
+							<dayPeriod type="pm">P.M.</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">A.M.</dayPeriod>
 							<dayPeriod type="pm">P.M.</dayPeriod>
@@ -338,6 +341,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="CVE">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ig_NG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ig_NG.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ig_NG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ig_NG.xml
index cd1f7748d69..7dc5bfc914f 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ig_NG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ig_NG.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ig"/>
 		<territory type="NG"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ii.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ii.xml
similarity index 78%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ii.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ii.xml
index 0c8ebb09909..ce32af987ee 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ii.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ii.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="ii"/>
 	</identity>
 	<localeDisplayNames>
@@ -51,8 +50,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ZZ">ꃅꄷꅉꀋꐚꌠ</territory>
 		</territories>
 		<types>
-			<type type="gregorian" key="calendar">ꄉꉻꃅꑍ</type>
-			<type type="islamic" key="calendar">ꑳꌦꇂꑍꉖ</type>
+			<type key="calendar" type="gregorian">ꄉꉻꃅꑍ</type>
+			<type key="calendar" type="islamic">ꑳꌦꇂꑍꉖ</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">ꂰꌬꌠ</measurementSystemName>
@@ -148,6 +147,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">ꎸꄑ</dayPeriod>
+							<dayPeriod type="pm">ꁯꋒ</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">ꎸꄑ</dayPeriod>
 							<dayPeriod type="pm">ꁯꋒ</dayPeriod>
@@ -160,6 +163,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<era type="1">ꃅꋊꊂ</era>
 					</eraAbbr>
 				</eras>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>h:mm:ss a zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>h:mm:ss a z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>h:mm:ss a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>h:mm a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
 			</calendar>
 		</calendars>
 		<fields>
@@ -213,6 +238,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<decimal>.</decimal>
 			<group>,</group>
 		</symbols>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencies>
 			<currency type="CNY">
 				<symbol>¥</symbol>
@@ -229,3 +272,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ii_CN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ii_CN.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ii_CN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ii_CN.xml
index 8a30469b8ba..2522e05d40d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ii_CN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ii_CN.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ii"/>
 		<territory type="CN"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/is.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/is.xml
similarity index 88%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/is.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/is.xml
index d358fafdf2b..b84a4809029 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/is.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/is.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="is"/>
 	</identity>
 	<localeDisplayNames>
@@ -60,6 +59,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bem">bemba</language>
 			<language type="bez">bena</language>
 			<language type="bg">búlgarska</language>
+			<language type="bgn">vesturbalotsí</language>
 			<language type="bho">bojpúrí</language>
 			<language type="bi">bíslama</language>
 			<language type="bik">bíkol</language>
@@ -135,11 +135,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="en_AU">áströlsk enska</language>
 			<language type="en_CA">kanadísk enska</language>
 			<language type="en_GB">bresk enska</language>
+			<language type="en_GB" alt="short">enska (bresk)</language>
 			<language type="en_US">bandarísk enska</language>
+			<language type="en_US" alt="short">enska (BNA)</language>
 			<language type="enm">miðenska</language>
 			<language type="eo">esperantó</language>
 			<language type="es">spænska</language>
-			<language type="es_419">rómanskamerísk spænska</language>
+			<language type="es_419">rómönsk-amerísk spænska</language>
 			<language type="es_ES">evrópsk spænska</language>
 			<language type="es_MX">mexíkósk spænska</language>
 			<language type="et">eistneska</language>
@@ -280,6 +282,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">laó</language>
 			<language type="lol">mongó</language>
 			<language type="loz">lozi</language>
+			<language type="lrc">norðurlúrí</language>
 			<language type="lt">litháíska</language>
 			<language type="lu">lúbakatanga</language>
 			<language type="lua">luba-lulua</language>
@@ -325,12 +328,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mwr">marvarí</language>
 			<language type="my">burmneska</language>
 			<language type="myv">ersja</language>
+			<language type="mzn">masanderaní</language>
 			<language type="na">nárúska</language>
 			<language type="nap">napólíska</language>
 			<language type="naq">nama</language>
 			<language type="nb">norskt bókmál</language>
 			<language type="nd">norður-ndebele</language>
 			<language type="nds">lágþýska; lágsaxneska</language>
+			<language type="nds_NL">lágsaxneska</language>
 			<language type="ne">nepalska</language>
 			<language type="new">nevarí</language>
 			<language type="ng">ndonga</language>
@@ -405,6 +410,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">sikileyska</language>
 			<language type="sco">skoska</language>
 			<language type="sd">sindí</language>
+			<language type="sdh">suðurkúrdíska</language>
 			<language type="se">norðursamíska</language>
 			<language type="seh">sena</language>
 			<language type="sel">selkúp</language>
@@ -440,8 +446,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">súmerska</language>
 			<language type="sv">sænska</language>
 			<language type="sw">svahílí</language>
+			<language type="sw_CD">Kongó-svahílí</language>
 			<language type="swb" draft="unconfirmed">shimaoríska</language>
-			<language type="swc">Kongó-svahílí</language>
 			<language type="syc">klassísk sýrlenska</language>
 			<language type="syr">sýrlenska</language>
 			<language type="ta">tamílska</language>
@@ -494,6 +500,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">valamó</language>
 			<language type="war">varaí</language>
 			<language type="was">vasjó</language>
+			<language type="wbp">varlpiri</language>
 			<language type="wo">volof</language>
 			<language type="xal">kalmúkska</language>
 			<language type="xh">sósa</language>
@@ -658,7 +665,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angvilla</territory>
 			<territory type="AL">Albanía</territory>
 			<territory type="AM">Armenía</territory>
-			<territory type="AN">Hollensku Antillur</territory>
 			<territory type="AO">Angóla</territory>
 			<territory type="AQ">Suðurskautslandið</territory>
 			<territory type="AR">Argentína</territory>
@@ -677,7 +683,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BH">Barein</territory>
 			<territory type="BI">Búrúndí</territory>
 			<territory type="BJ">Benín</territory>
-			<territory type="BL">Saint Barthélemy</territory>
+			<territory type="BL">Sankti Bartólómeusareyjar</territory>
 			<territory type="BM">Bermúdaeyjar</territory>
 			<territory type="BN">Brúnei</territory>
 			<territory type="BO">Bólivía</territory>
@@ -728,7 +734,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ET">Eþíópía</territory>
 			<territory type="EU">Evrópusambandið</territory>
 			<territory type="FI">Finnland</territory>
-			<territory type="FJ">Fídjieyjar</territory>
+			<territory type="FJ">Fídjíeyjar</territory>
 			<territory type="FK">Falklandseyjar</territory>
 			<territory type="FK" alt="variant">Falklandseyjar (Malvinas)</territory>
 			<territory type="FM">Míkrónesía</territory>
@@ -802,7 +808,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="MC">Mónakó</territory>
 			<territory type="MD">Moldóva</territory>
 			<territory type="ME">Svartfjallaland</territory>
-			<territory type="MF">Saint Martin</territory>
+			<territory type="MF">St. Martin</territory>
 			<territory type="MG">Madagaskar</territory>
 			<territory type="MH">Marshalleyjar</territory>
 			<territory type="MK">Makedónía</territory>
@@ -876,7 +882,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="SS">Suður-Súdan</territory>
 			<territory type="ST">Saó Tóme og Prinsípe</territory>
 			<territory type="SV">El Salvador</territory>
-			<territory type="SX">Sint Maarten</territory>
+			<territory type="SX">Sankti Martin</territory>
 			<territory type="SY">Sýrland</territory>
 			<territory type="SZ">Svasíland</territory>
 			<territory type="TA">Tristan da Cunha</territory>
@@ -939,6 +945,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric">Talnaröðun</key>
 			<key type="colStrength">Röðunarstyrkur</key>
 			<key type="currency">Gjaldmiðill</key>
+			<key type="hc">Tímakerfi (12 eða 24)</key>
+			<key type="lb">Línuskipting</key>
+			<key type="ms">Mælingakerfi</key>
 			<key type="numbers">Tölur</key>
 			<key type="timezone">Tímabelti</key>
 			<key type="va">Landsstaðalsafbrigði</key>
@@ -946,96 +955,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">Einkanotkun</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Arabískar-indverskar tölur</type>
-			<type type="arabext" key="numbers">Auknar arabískar-indverskar tölur</type>
-			<type type="armn" key="numbers">Armenskir tölustafir</type>
-			<type type="armnlow" key="numbers">Armenskar lágstafatölur</type>
-			<type type="beng" key="numbers">Bengalskar tölur</type>
-			<type type="big5han" key="collation" draft="contributed">hefðbundin kínversk röðun - Big5</type>
-			<type type="buddhist" key="calendar">Búddískt dagatal</type>
-			<type type="chinese" key="calendar">Kínverskt dagatal</type>
-			<type type="coptic" key="calendar">Koptískt tímatal</type>
-			<type type="dangi" key="calendar">Dangi dagatal</type>
-			<type type="deva" key="numbers">Devanagari tölur</type>
-			<type type="dictionary" key="collation">Orðabókarröð</type>
-			<type type="ducet" key="collation">Sjálfgefin Unicode-röðun</type>
-			<type type="eor" key="collation" draft="unconfirmed">röðina fyrir fjöltyngi evrópskum skjölum</type>
-			<type type="ethi" key="numbers">Eþíópískir tölustafir</type>
-			<type type="ethiopic" key="calendar">Eþíópískt dagatal</type>
-			<type type="ethiopic-amete-alem" key="calendar">Eþíópískt ‘amete alem’ tímatal</type>
-			<type type="finance" key="numbers">Viðskiptafræðileg töluorð</type>
-			<type type="fullwide" key="numbers">Tölur í fullri breidd</type>
-			<type type="gb2312han" key="collation" draft="contributed">einfölduð kínversk röðun - GB2312</type>
-			<type type="geor" key="numbers">Georgískir tölustafir</type>
-			<type type="gregorian" key="calendar">Gregorískt dagatal</type>
-			<type type="grek" key="numbers">Grískir tölustafir</type>
-			<type type="greklow" key="numbers">Grískar lágstafatölur</type>
-			<type type="gujr" key="numbers">Gujarati-tölur</type>
-			<type type="guru" key="numbers">Gurmukhi-tölur</type>
-			<type type="hanidec" key="numbers">Kínverskir tugatölustafir</type>
-			<type type="hans" key="numbers">Einfaldaðir kínverskir tölustafir</type>
-			<type type="hansfin" key="numbers">Einfaldaðar kínverskar fjármálatölur</type>
-			<type type="hant" key="numbers">Hefðbundnir kínverskir tölustafir</type>
-			<type type="hantfin" key="numbers">Hefðbundnar kínverskar fjármálatölur</type>
-			<type type="hebr" key="numbers">Hebreskir tölustafir</type>
-			<type type="hebrew" key="calendar">Hebreskt dagatal</type>
-			<type type="identical" key="colStrength">Raða öllu</type>
-			<type type="indian" key="calendar" draft="contributed">indverskt dagatal</type>
-			<type type="islamic" key="calendar">Íslamskt dagatal</type>
-			<type type="islamic-civil" key="calendar">Íslamskt borgaradagatal</type>
-			<type type="iso8601" key="calendar">ISO-8601 dagatal</type>
-			<type type="japanese" key="calendar">Japanskt dagatal</type>
-			<type type="jpan" key="numbers">Japanskir tölustafir</type>
-			<type type="jpanfin" key="numbers">Japanskar fjármálatölur</type>
-			<type type="khmr" key="numbers">Kmerískar tölur</type>
-			<type type="knda" key="numbers">Kannada-tölur</type>
-			<type type="laoo" key="numbers">Lao-tölur</type>
-			<type type="latn" key="numbers">Vestrænar tölur</type>
-			<type type="lower" key="colCaseFirst">Raða lágstöfum fyrst</type>
-			<type type="mlym" key="numbers">Malayalam-tölur</type>
-			<type type="mong" key="numbers">Mongólskar tölur</type>
-			<type type="mymr" key="numbers">Mjanmarskar tölur</type>
-			<type type="native" key="numbers">Upprunalegir tölustafir</type>
-			<type type="no" key="colBackwards">Raða áherslum eðlilega</type>
-			<type type="no" key="colCaseFirst">Raða eðlilega eftir hástöfum og lágstöfum</type>
-			<type type="no" key="colCaseLevel">Raða óháð hástöfum og lágstöfum</type>
-			<type type="no" key="colHiraganaQuaternary">Raða Kana sér</type>
-			<type type="no" key="colNormalization">Raða án stöðlunar</type>
-			<type type="no" key="colNumeric">Raða tölustöfum sér</type>
-			<type type="non-ignorable" key="colAlternate">Raða táknum</type>
-			<type type="orya" key="numbers">Oriya-tölur</type>
-			<type type="persian" key="calendar">Persneskt dagatal</type>
-			<type type="phonebook" key="collation">Símaskráarröðun</type>
-			<type type="phonetic" key="collation">Hljóðfræðileg röð</type>
-			<type type="pinyin" key="collation">Pinyin-röðun</type>
-			<type type="primary" key="colStrength">Raða aðeins grunnstöfum</type>
-			<type type="quaternary" key="colStrength">Raða áherslum/hástaf eða lágstaf/breidd/Kana</type>
-			<type type="reformed" key="collation">Endurbætt röð</type>
-			<type type="roc" key="calendar">Minguo dagatal</type>
-			<type type="roman" key="numbers">Rómverskir tölustafir</type>
-			<type type="romanlow" key="numbers">Rómverskar lágstafatölur</type>
-			<type type="search" key="collation">Almenn leit</type>
-			<type type="searchjl" key="collation">Leita eftir upphafssamhljóða í Hangul</type>
-			<type type="secondary" key="colStrength">Raða áherslum</type>
-			<type type="shifted" key="colAlternate">Raða óháð táknum</type>
-			<type type="standard" key="collation">Stöðluð röðun</type>
-			<type type="stroke" key="collation">Strikaröðun</type>
-			<type type="taml" key="numbers">Hefðbundnir tamílskir tölustafir</type>
-			<type type="tamldec" key="numbers">Tamílskar tölur</type>
-			<type type="telu" key="numbers">Telúgú-tölur</type>
-			<type type="tertiary" key="colStrength">Raða áherslum/hástaf eða lágstaf/breidd</type>
-			<type type="thai" key="numbers">Tælenskar tölur</type>
-			<type type="tibt" key="numbers">Tíbeskir tölustafir</type>
-			<type type="traditional" key="collation">Hefðbundin</type>
-			<type type="traditional" key="numbers">Hefðbundin tölutákn</type>
-			<type type="unihan" key="collation">Röðun eftir grunnstrikum</type>
-			<type type="upper" key="colCaseFirst">Raða hástöfum fyrst</type>
-			<type type="vaii" key="numbers">Vai-tölustafir</type>
-			<type type="yes" key="colBackwards">Raða öfugt eftir áherslum</type>
-			<type type="yes" key="colCaseLevel">Raða stafrétt</type>
-			<type type="yes" key="colHiraganaQuaternary">Raða Kana öðruvísi</type>
-			<type type="yes" key="colNormalization">Raða Unicode með stöðluðum hætti</type>
-			<type type="yes" key="colNumeric">Raða tölustöfum tölulega</type>
+			<type key="calendar" type="buddhist">Búddískt dagatal</type>
+			<type key="calendar" type="chinese">Kínverskt dagatal</type>
+			<type key="calendar" type="coptic">Koptískt tímatal</type>
+			<type key="calendar" type="dangi">Dangi dagatal</type>
+			<type key="calendar" type="ethiopic">Eþíópískt dagatal</type>
+			<type key="calendar" type="ethiopic-amete-alem">Eþíópískt ‘amete alem’ tímatal</type>
+			<type key="calendar" type="gregorian">Gregorískt dagatal</type>
+			<type key="calendar" type="hebrew">Hebreskt dagatal</type>
+			<type key="calendar" type="indian" draft="contributed">indverskt dagatal</type>
+			<type key="calendar" type="islamic">Íslamskt dagatal</type>
+			<type key="calendar" type="islamic-civil">Íslamskt borgaradagatal</type>
+			<type key="calendar" type="iso8601">ISO-8601 dagatal</type>
+			<type key="calendar" type="japanese">Japanskt dagatal</type>
+			<type key="calendar" type="persian">Persneskt dagatal</type>
+			<type key="calendar" type="roc">Minguo dagatal</type>
+			<type key="colAlternate" type="non-ignorable">Raða táknum</type>
+			<type key="colAlternate" type="shifted">Raða óháð táknum</type>
+			<type key="colBackwards" type="no">Raða áherslum eðlilega</type>
+			<type key="colBackwards" type="yes">Raða öfugt eftir áherslum</type>
+			<type key="colCaseFirst" type="lower">Raða lágstöfum fyrst</type>
+			<type key="colCaseFirst" type="no">Raða eðlilega eftir hástöfum og lágstöfum</type>
+			<type key="colCaseFirst" type="upper">Raða hástöfum fyrst</type>
+			<type key="colCaseLevel" type="no">Raða óháð hástöfum og lágstöfum</type>
+			<type key="colCaseLevel" type="yes">Raða stafrétt</type>
+			<type key="colHiraganaQuaternary" type="no">Raða Kana sér</type>
+			<type key="colHiraganaQuaternary" type="yes">Raða Kana öðruvísi</type>
+			<type key="collation" type="big5han" draft="contributed">hefðbundin kínversk röðun - Big5</type>
+			<type key="collation" type="dictionary">Orðabókarröð</type>
+			<type key="collation" type="ducet">Sjálfgefin Unicode-röðun</type>
+			<type key="collation" type="eor" draft="unconfirmed">röðina fyrir fjöltyngi evrópskum skjölum</type>
+			<type key="collation" type="gb2312han" draft="contributed">einfölduð kínversk röðun - GB2312</type>
+			<type key="collation" type="phonebook">Símaskráarröðun</type>
+			<type key="collation" type="phonetic">Hljóðfræðileg röð</type>
+			<type key="collation" type="pinyin">Pinyin-röðun</type>
+			<type key="collation" type="reformed">Endurbætt röð</type>
+			<type key="collation" type="search">Almenn leit</type>
+			<type key="collation" type="searchjl">Leita eftir upphafssamhljóða í Hangul</type>
+			<type key="collation" type="standard">Stöðluð röðun</type>
+			<type key="collation" type="stroke">Strikaröðun</type>
+			<type key="collation" type="traditional">Hefðbundin</type>
+			<type key="collation" type="unihan">Röðun eftir grunnstrikum</type>
+			<type key="colNormalization" type="no">Raða án stöðlunar</type>
+			<type key="colNormalization" type="yes">Raða Unicode með stöðluðum hætti</type>
+			<type key="colNumeric" type="no">Raða tölustöfum sér</type>
+			<type key="colNumeric" type="yes">Raða tölustöfum tölulega</type>
+			<type key="colStrength" type="identical">Raða öllu</type>
+			<type key="colStrength" type="primary">Raða aðeins grunnstöfum</type>
+			<type key="colStrength" type="quaternary">Raða áherslum/hástaf eða lágstaf/breidd/Kana</type>
+			<type key="colStrength" type="secondary">Raða áherslum</type>
+			<type key="colStrength" type="tertiary">Raða áherslum/hástaf eða lágstaf/breidd</type>
+			<type key="hc" type="h11">12 tíma kerfi (0–11)</type>
+			<type key="hc" type="h12">12 tíma kerfi (1–12)</type>
+			<type key="hc" type="h23">24 tíma kerfi (0–23)</type>
+			<type key="hc" type="h24">24 tíma kerfi (1–24)</type>
+			<type key="lb" type="loose">Laus línuskipting</type>
+			<type key="lb" type="normal">Venjuleg línuskipting</type>
+			<type key="lb" type="strict">Ströng línuskipting</type>
+			<type key="ms" type="metric">Metrakerfi</type>
+			<type key="ms" type="uksystem">Breskt mælingakerfi</type>
+			<type key="ms" type="ussystem">Bandarískt mælingakerfi</type>
+			<type key="numbers" type="arab">Arabískar-indverskar tölur</type>
+			<type key="numbers" type="arabext">Auknar arabískar-indverskar tölur</type>
+			<type key="numbers" type="armn">Armenskir tölustafir</type>
+			<type key="numbers" type="armnlow">Armenskar lágstafatölur</type>
+			<type key="numbers" type="beng">Bengalskar tölur</type>
+			<type key="numbers" type="deva">Devanagari tölur</type>
+			<type key="numbers" type="ethi">Eþíópískir tölustafir</type>
+			<type key="numbers" type="finance">Viðskiptafræðileg töluorð</type>
+			<type key="numbers" type="fullwide">Tölur í fullri breidd</type>
+			<type key="numbers" type="geor">Georgískir tölustafir</type>
+			<type key="numbers" type="grek">Grískir tölustafir</type>
+			<type key="numbers" type="greklow">Grískar lágstafatölur</type>
+			<type key="numbers" type="gujr">Gujarati-tölur</type>
+			<type key="numbers" type="guru">Gurmukhi-tölur</type>
+			<type key="numbers" type="hanidec">Kínverskir tugatölustafir</type>
+			<type key="numbers" type="hans">Einfaldaðir kínverskir tölustafir</type>
+			<type key="numbers" type="hansfin">Einfaldaðar kínverskar fjármálatölur</type>
+			<type key="numbers" type="hant">Hefðbundnir kínverskir tölustafir</type>
+			<type key="numbers" type="hantfin">Hefðbundnar kínverskar fjármálatölur</type>
+			<type key="numbers" type="hebr">Hebreskir tölustafir</type>
+			<type key="numbers" type="jpan">Japanskir tölustafir</type>
+			<type key="numbers" type="jpanfin">Japanskar fjármálatölur</type>
+			<type key="numbers" type="khmr">Kmerískar tölur</type>
+			<type key="numbers" type="knda">Kannada-tölur</type>
+			<type key="numbers" type="laoo">Lao-tölur</type>
+			<type key="numbers" type="latn">Vestrænar tölur</type>
+			<type key="numbers" type="mlym">Malayalam-tölur</type>
+			<type key="numbers" type="mong">Mongólskar tölur</type>
+			<type key="numbers" type="mymr">Mjanmarskar tölur</type>
+			<type key="numbers" type="native">Upprunalegir tölustafir</type>
+			<type key="numbers" type="orya">Oriya-tölur</type>
+			<type key="numbers" type="roman">Rómverskir tölustafir</type>
+			<type key="numbers" type="romanlow">Rómverskar lágstafatölur</type>
+			<type key="numbers" type="taml">Hefðbundnir tamílskir tölustafir</type>
+			<type key="numbers" type="tamldec">Tamílskar tölur</type>
+			<type key="numbers" type="telu">Telúgú-tölur</type>
+			<type key="numbers" type="thai">Tælenskar tölur</type>
+			<type key="numbers" type="tibt">Tíbeskir tölustafir</type>
+			<type key="numbers" type="traditional">Hefðbundin tölutákn</type>
+			<type key="numbers" type="vaii">Vai-tölustafir</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN">BGN</transformName>
@@ -1107,12 +1126,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern>{1} 'kl.' {0}</pattern>
+							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern>{1} 'kl.' {0}</pattern>
+							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
@@ -1127,6 +1146,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d.</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -1472,21 +1492,63 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">miðn.</dayPeriod>
+							<dayPeriod type="am">f.h.</dayPeriod>
+							<dayPeriod type="noon">hád.</dayPeriod>
+							<dayPeriod type="pm">e.h.</dayPeriod>
+							<dayPeriod type="morning1">að morgni</dayPeriod>
+							<dayPeriod type="afternoon1">síðd.</dayPeriod>
+							<dayPeriod type="evening1">að kv.</dayPeriod>
+							<dayPeriod type="night1">að nóttu</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">mn.</dayPeriod>
 							<dayPeriod type="am">f.</dayPeriod>
 							<dayPeriod type="noon">h.</dayPeriod>
 							<dayPeriod type="pm">e.</dayPeriod>
+							<dayPeriod type="morning1">mrg.</dayPeriod>
+							<dayPeriod type="afternoon1">sd.</dayPeriod>
+							<dayPeriod type="evening1">kv.</dayPeriod>
+							<dayPeriod type="night1">n.</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">miðnætti</dayPeriod>
 							<dayPeriod type="am">f.h.</dayPeriod>
 							<dayPeriod type="noon">hádegi</dayPeriod>
 							<dayPeriod type="pm">e.h.</dayPeriod>
+							<dayPeriod type="morning1">að morgni</dayPeriod>
+							<dayPeriod type="afternoon1">síðdegis</dayPeriod>
+							<dayPeriod type="evening1">að kvöldi</dayPeriod>
+							<dayPeriod type="night1">að nóttu</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">miðn.</dayPeriod>
+							<dayPeriod type="noon">hád.</dayPeriod>
+							<dayPeriod type="morning1">morg.</dayPeriod>
+							<dayPeriod type="afternoon1">síðd.</dayPeriod>
+							<dayPeriod type="evening1">kv.</dayPeriod>
+							<dayPeriod type="night1">nótt</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">mn.</dayPeriod>
+							<dayPeriod type="noon">hd.</dayPeriod>
+							<dayPeriod type="morning1">mrg.</dayPeriod>
+							<dayPeriod type="afternoon1">sd.</dayPeriod>
+							<dayPeriod type="evening1">kv.</dayPeriod>
+							<dayPeriod type="night1">n.</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="am" draft="unconfirmed">árdegi</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">síðdegi</dayPeriod>
+							<dayPeriod type="midnight">miðnætti</dayPeriod>
+							<dayPeriod type="am">f.h.</dayPeriod>
+							<dayPeriod type="noon">hádegi</dayPeriod>
+							<dayPeriod type="pm">e.h.</dayPeriod>
+							<dayPeriod type="morning1">morgunn</dayPeriod>
+							<dayPeriod type="afternoon1">eftir hádegi</dayPeriod>
+							<dayPeriod type="evening1">kvöld</dayPeriod>
+							<dayPeriod type="night1">nótt</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1505,9 +1567,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</eraAbbr>
 					<eraNarrow>
 						<era type="0" draft="contributed">f.k.</era>
-						<era type="0" alt="variant" draft="unconfirmed">flt</era>
+						<era type="0" alt="variant" draft="unconfirmed">f.v.t.</era>
 						<era type="1" draft="contributed">e.k.</era>
-						<era type="1" alt="variant" draft="unconfirmed">lt</era>
+						<era type="1" alt="variant" draft="unconfirmed">v.t.</era>
 					</eraNarrow>
 				</eras>
 				<dateFormats>
@@ -1557,12 +1619,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern>{1} 'kl.' {0}</pattern>
+							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern>{1} 'kl.' {0}</pattern>
+							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
@@ -1593,6 +1655,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d.M.</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.M.</dateFormatItem>
@@ -1737,6 +1803,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>ár</displayName>
+				<relative type="-1">á síðasta ári</relative>
+				<relative type="0">á þessu ári</relative>
+				<relative type="1">á næsta ári</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">eftir {0} ár</relativeTimePattern>
 					<relativeTimePattern count="other">eftir {0} ár</relativeTimePattern>
@@ -1748,6 +1817,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>ár</displayName>
+				<relative type="-1">á síðasta ári</relative>
+				<relative type="0">á þessu ári</relative>
+				<relative type="1">á næsta ári</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">eftir {0} ár</relativeTimePattern>
 					<relativeTimePattern count="other">eftir {0} ár</relativeTimePattern>
@@ -1759,6 +1831,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter">
 				<displayName>ársfjórðungur</displayName>
+				<relative type="-1">síðasti ársfjórðungur</relative>
+				<relative type="0">þessi ársfjórðungur</relative>
+				<relative type="1">næsti ársfjórðungur</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">eftir {0} ársfjórðung</relativeTimePattern>
 					<relativeTimePattern count="other">eftir {0} ársfjórðunga</relativeTimePattern>
@@ -1769,7 +1844,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="quarter-short">
-				<displayName>ársfjórðungur</displayName>
+				<displayName>ársfjórð.</displayName>
+				<relative type="-1">síðasti ársfj.</relative>
+				<relative type="0">þessi ársfj.</relative>
+				<relative type="1">næsti ársfj.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">eftir {0} ársfj.</relativeTimePattern>
 					<relativeTimePattern count="other">eftir {0} ársfj.</relativeTimePattern>
@@ -1780,7 +1858,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="quarter-narrow">
-				<displayName>ársfjórðungur</displayName>
+				<displayName>ársfj.</displayName>
+				<relative type="-1">síðasti ársfj.</relative>
+				<relative type="0">þessi ársfj.</relative>
+				<relative type="1">næsti ársfj.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">eftir {0} ársfj.</relativeTimePattern>
 					<relativeTimePattern count="other">eftir {0} ársfj.</relativeTimePattern>
@@ -1806,6 +1887,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>mán.</displayName>
+				<relative type="-1">í síðasta mán.</relative>
+				<relative type="0">í þessum mán.</relative>
+				<relative type="1">í næsta mán.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">eftir {0} mán.</relativeTimePattern>
 					<relativeTimePattern count="other">eftir {0} mán.</relativeTimePattern>
@@ -1817,6 +1901,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>mán.</displayName>
+				<relative type="-1">í síðasta mán.</relative>
+				<relative type="0">í þessum mán.</relative>
+				<relative type="1">í næsta mán.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">eftir {0} mán.</relativeTimePattern>
 					<relativeTimePattern count="other">eftir {0} mán.</relativeTimePattern>
@@ -1842,6 +1929,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>vika</displayName>
+				<relative type="-1">í síðustu viku</relative>
+				<relative type="0">í þessari viku</relative>
+				<relative type="1">í næstu viku</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">eftir {0} vikur</relativeTimePattern>
 					<relativeTimePattern count="other">eftir {0} vikur</relativeTimePattern>
@@ -1852,7 +1942,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="week-narrow">
-				<displayName>vika</displayName>
+				<displayName>v.</displayName>
+				<relative type="-1">í síðustu viku</relative>
+				<relative type="0">í þessari viku</relative>
+				<relative type="1">í næstu viku</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} viku</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} vikur</relativeTimePattern>
@@ -1880,6 +1973,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>dagur</displayName>
+				<relative type="-2">í fyrradag</relative>
+				<relative type="-1">í gær</relative>
+				<relative type="0">í dag</relative>
+				<relative type="1">á morgun</relative>
+				<relative type="2">eftir tvo daga</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">eftir {0} dag</relativeTimePattern>
 					<relativeTimePattern count="other">eftir {0} daga</relativeTimePattern>
@@ -1890,7 +1988,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day-narrow">
-				<displayName>dagur</displayName>
+				<displayName>d.</displayName>
+				<relative type="-2">í fyrradag</relative>
+				<relative type="-1">í gær</relative>
+				<relative type="0">í dag</relative>
+				<relative type="1">á morgun</relative>
+				<relative type="2">eftir tvo daga</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} dag</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} daga</relativeTimePattern>
@@ -1904,14 +2007,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>vikudagur</displayName>
 			</field>
 			<field type="sun">
-				<relative type="-1">sunnudagur í síðustu viku</relative>
+				<relative type="-1">síðasta sunnudag</relative>
 				<relative type="0">sunnudagur í þessari viku</relative>
-				<relative type="1">sunnudagur í næstu viku</relative>
+				<relative type="1">næsta sunnudag</relative>
 			</field>
 			<field type="sun-short">
 				<relative type="-1">síðasti sun.</relative>
 				<relative type="0">þessi sun.</relative>
-				<relative type="1">næstkomandi sun.</relative>
+				<relative type="1">næsta sun.</relative>
 			</field>
 			<field type="sun-narrow">
 				<relative type="-1">síðasti sun.</relative>
@@ -1919,14 +2022,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">nk. sun.</relative>
 			</field>
 			<field type="mon">
-				<relative type="-1">mánudagur í síðustu viku</relative>
+				<relative type="-1">síðasta mánudag</relative>
 				<relative type="0">mánudagur í þessari viku</relative>
-				<relative type="1">mánudagur í næstu viku</relative>
+				<relative type="1">næsta mánudag</relative>
 			</field>
 			<field type="mon-short">
-				<relative type="-1">síðasti mán.</relative>
+				<relative type="-1">síðasta mán.</relative>
 				<relative type="0">þessi mán.</relative>
-				<relative type="1">næstkomandi mán.</relative>
+				<relative type="1">næsta mán.</relative>
 			</field>
 			<field type="mon-narrow">
 				<relative type="-1">síðasti mán.</relative>
@@ -1934,9 +2037,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">nk. mán.</relative>
 			</field>
 			<field type="tue">
-				<relative type="-1">þriðjudagur í síðustu viku</relative>
+				<relative type="-1">síðasta þriðjudag</relative>
 				<relative type="0">þriðjudagur í þessari viku</relative>
-				<relative type="1">þriðjudagur í næstu viku</relative>
+				<relative type="1">næsta þriðjudag</relative>
 			</field>
 			<field type="tue-short">
 				<relative type="-1">síðasti þri.</relative>
@@ -2265,7 +2368,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Arúba</exemplarCity>
 			</zone>
 			<zone type="Europe/Mariehamn">
-				<exemplarCity>Mariehamn</exemplarCity>
+				<exemplarCity>Maríuhöfn</exemplarCity>
 			</zone>
 			<zone type="Asia/Baku">
 				<exemplarCity>Bakú</exemplarCity>
@@ -2298,7 +2401,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Porto-Novo</exemplarCity>
 			</zone>
 			<zone type="America/St_Barthelemy">
-				<exemplarCity>Saint Barthélemy</exemplarCity>
+				<exemplarCity>Sankti Bartólómeusareyjar</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Bermuda">
 				<exemplarCity>Bermúda</exemplarCity>
@@ -2493,7 +2596,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Urumqi</exemplarCity>
 			</zone>
 			<zone type="Asia/Shanghai">
-				<exemplarCity>Shanghai</exemplarCity>
+				<exemplarCity>Sjanghæ</exemplarCity>
 			</zone>
 			<zone type="America/Bogota">
 				<exemplarCity>Bogota</exemplarCity>
@@ -2574,7 +2677,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Helsinki</exemplarCity>
 			</zone>
 			<zone type="Pacific/Fiji">
-				<exemplarCity>Fídjieyjar</exemplarCity>
+				<exemplarCity>Fidjí</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Stanley">
 				<exemplarCity>Stanley</exemplarCity>
@@ -2847,7 +2950,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Bamako</exemplarCity>
 			</zone>
 			<zone type="Asia/Rangoon">
-				<exemplarCity>Rangoon</exemplarCity>
+				<exemplarCity>Rangún</exemplarCity>
 			</zone>
 			<zone type="Asia/Hovd">
 				<exemplarCity>Hovd</exemplarCity>
@@ -3342,7 +3445,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Tortóla</exemplarCity>
 			</zone>
 			<zone type="America/St_Thomas">
-				<exemplarCity>St. Thomas</exemplarCity>
+				<exemplarCity>Sankti Thomas</exemplarCity>
 			</zone>
 			<zone type="Asia/Saigon">
 				<exemplarCity>Ho Chi Minh-borg</exemplarCity>
@@ -3533,7 +3636,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Bangladesh">
 				<long>
-					<generic>Bangladesstími</generic>
+					<generic>Bangladess-tími</generic>
 					<standard>Staðaltími í Bangladess</standard>
 					<daylight>Sumartími í Bangladess</daylight>
 				</long>
@@ -3643,7 +3746,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="East_Timor">
 				<long>
-					<standard>Tími á Tímor-Leste</standard>
+					<standard>Tíminn á Tímor-Leste</standard>
 				</long>
 			</metazone>
 			<metazone type="Easter">
@@ -3727,7 +3830,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Gilbert_Islands">
 				<long>
-					<standard>Gilberteyjatími</standard>
+					<standard>Tími á Gilbert-eyjum</standard>
 				</long>
 			</metazone>
 			<metazone type="GMT">
@@ -3761,9 +3864,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
-					<generic>Tími á Hawaii og Aleútaeyjum</generic>
-					<standard>Staðaltími á Hawaí og Aleútaeyjum</standard>
-					<daylight>Sumartími á Hawaii og Aleútaeyjum</daylight>
+					<generic>Tími á Havaí og Aleúta</generic>
+					<standard>Staðaltími á Havaí og Aleúta</standard>
+					<daylight>Sumartími á Havaí og Aleúta</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hong_Kong">
@@ -3775,7 +3878,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Hovd">
 				<long>
-					<generic>Tími í Hovd</generic>
+					<generic>Hovd-tími</generic>
 					<standard>Staðaltími í Hovd</standard>
 					<daylight>Sumartími í Hovd</daylight>
 				</long>
@@ -3876,12 +3979,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Kyrgystan">
 				<long>
-					<standard>Kirgisistantími</standard>
+					<standard>Kirgistan-tími</standard>
 				</long>
 			</metazone>
 			<metazone type="Line_Islands">
 				<long>
-					<standard>Línueyjatími</standard>
+					<standard>Línueyja-tími</standard>
 				</long>
 			</metazone>
 			<metazone type="Lord_Howe">
@@ -3910,7 +4013,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Maldives">
 				<long>
-					<standard>Maldíveyjatími</standard>
+					<standard>Maldíveyja-tími</standard>
 				</long>
 			</metazone>
 			<metazone type="Marquesas">
@@ -3920,7 +4023,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Marshall_Islands">
 				<long>
-					<standard>Marshall-eyjatími</standard>
+					<standard>Tími á Marshall-eyjum</standard>
 				</long>
 			</metazone>
 			<metazone type="Mauritius">
@@ -3958,19 +4061,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Moscow">
 				<long>
-					<generic>Tími í Moskvu</generic>
+					<generic>Moskvutími</generic>
 					<standard>Staðaltími í Moskvu</standard>
 					<daylight>Sumartími í Moskvu</daylight>
 				</long>
 			</metazone>
 			<metazone type="Myanmar">
 				<long>
-					<standard>Mjanmartími</standard>
+					<standard>Mjanmar-tími</standard>
 				</long>
 			</metazone>
 			<metazone type="Nauru">
 				<long>
-					<standard>Nárútími</standard>
+					<standard>Nárú-tími</standard>
 				</long>
 			</metazone>
 			<metazone type="Nepal">
@@ -4025,7 +4128,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Omsk">
 				<long>
-					<generic>Tími í Omsk</generic>
+					<generic>Tíminn í Omsk</generic>
 					<standard>Staðaltími í Omsk</standard>
 					<daylight>Sumartími í Omsk</daylight>
 				</long>
@@ -4153,7 +4256,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Tahiti">
 				<long>
-					<standard>Tahítítími</standard>
+					<standard>Tahítí-tími</standard>
 				</long>
 			</metazone>
 			<metazone type="Taipei">
@@ -4165,12 +4268,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Tajikistan">
 				<long>
-					<standard>Tadsjíkistantími</standard>
+					<standard>Tadsjíkistan-tími</standard>
 				</long>
 			</metazone>
 			<metazone type="Tokelau">
 				<long>
-					<standard>Tókelátími</standard>
+					<standard>Tókelá-tími</standard>
 				</long>
 			</metazone>
 			<metazone type="Tonga">
@@ -4187,7 +4290,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
-					<generic>Túrkmenistantími</generic>
+					<generic>Túrkmenistan-tími</generic>
 					<standard>Staðaltími í Túrkmenistan</standard>
 					<daylight>Sumartími í Túrkmenistan</daylight>
 				</long>
@@ -4206,16 +4309,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Uzbekistan">
 				<long>
-					<generic>Úsbekistantími</generic>
+					<generic>Úsbekistan-tími</generic>
 					<standard>Staðaltími í Úsbekistan</standard>
 					<daylight>Sumartími í Úsbekistan</daylight>
 				</long>
 			</metazone>
 			<metazone type="Vanuatu">
 				<long>
-					<generic>Vanúatútími</generic>
-					<standard>Staðaltími í Vanúatú</standard>
-					<daylight>Sumartími í Vanúatú</daylight>
+					<generic>Vanúatú-tími</generic>
+					<standard>Staðaltími á Vanúatú</standard>
+					<daylight>Sumartími á Vanúatú</daylight>
 				</long>
 			</metazone>
 			<metazone type="Venezuela">
@@ -4244,7 +4347,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Wake">
 				<long>
-					<standard>Wake-eyjartími</standard>
+					<standard>Tími á Wake-eyju</standard>
 				</long>
 			</metazone>
 			<metazone type="Wallis">
@@ -4254,7 +4357,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Yakutsk">
 				<long>
-					<generic>Tími í Yakutsk</generic>
+					<generic>Tíminn í Yakutsk</generic>
 					<standard>Staðaltími í Yakutsk</standard>
 					<daylight>Sumartími í Yakutsk</daylight>
 				</long>
@@ -4374,6 +4477,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0 þ'.' ¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0 þ'.' ¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00 þ'.' ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00 þ'.' ¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000 þ'.' ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000 þ'.' ¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0 m'.' ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0 m'.' ¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00 m'.' ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00 m'.' ¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000 m'.' ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000 m'.' ¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0 ma'.' ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0 ma'.' ¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00 ma'.' ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00 ma'.' ¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000 ma'.' ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000 ma'.' ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0 bn ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0 bn ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00 bn ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00 bn ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000 bn ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000 bn ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4382,37 +4513,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Andorrskur peseti</displayName>
 			</currency>
 			<currency type="AED">
-				<displayName>Arabískt dírham</displayName>
+				<displayName>arabískt dírham</displayName>
 				<displayName count="one">arabískt dírham</displayName>
 				<displayName count="other">arabísk dírhöm</displayName>
 				<symbol>AED</symbol>
 			</currency>
 			<currency type="AFN">
-				<displayName>Afgani</displayName>
+				<displayName>afgani</displayName>
 				<displayName count="one">afgani</displayName>
 				<displayName count="other">afganar</displayName>
 				<symbol>AFN</symbol>
 			</currency>
 			<currency type="ALL">
-				<displayName>Albanskt lek</displayName>
+				<displayName>albanskt lek</displayName>
 				<displayName count="one">albanskt lek</displayName>
 				<displayName count="other">albönsk lek</displayName>
 				<symbol>ALL</symbol>
 			</currency>
 			<currency type="AMD">
-				<displayName>Armenskt dramm</displayName>
+				<displayName>armenskt dramm</displayName>
 				<displayName count="one">armenskt dramm</displayName>
 				<displayName count="other">armensk drömm</displayName>
 				<symbol>AMD</symbol>
 			</currency>
 			<currency type="ANG">
-				<displayName>Hollenskt Antillugyllini</displayName>
+				<displayName>hollenskt Antillugyllini</displayName>
 				<displayName count="one">hollenskt Antillugyllini</displayName>
 				<displayName count="other">hollensk Antillugyllini</displayName>
 				<symbol>ANG</symbol>
 			</currency>
 			<currency type="AOA">
-				<displayName>Angólsk kvansa</displayName>
+				<displayName>angólsk kvansa</displayName>
 				<displayName count="one">angólsk kvansa</displayName>
 				<displayName count="other">angólskar kvönsur</displayName>
 				<symbol>AOA</symbol>
@@ -4424,7 +4555,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Argentískur pesi (1983–1985)</displayName>
 			</currency>
 			<currency type="ARS">
-				<displayName>Argentínskur pesi</displayName>
+				<displayName>argentínskur pesi</displayName>
 				<displayName count="one">argentínskur pesi</displayName>
 				<displayName count="other">argentínskir pesar</displayName>
 				<symbol>ARS</symbol>
@@ -4434,39 +4565,39 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Austurrískur skildingur</displayName>
 			</currency>
 			<currency type="AUD">
-				<displayName>Ástralskur dalur</displayName>
+				<displayName>ástralskur dalur</displayName>
 				<displayName count="one">ástralskur dalur</displayName>
 				<displayName count="other">ástralskir dalir</displayName>
 				<symbol>AUD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="AWG">
-				<displayName>Arúbönsk flórína</displayName>
+				<displayName>arúbönsk flórína</displayName>
 				<displayName count="one">arúbönsk flórína</displayName>
 				<displayName count="other">arúbanskar flórínur</displayName>
 				<symbol>AWG</symbol>
 			</currency>
 			<currency type="AZN">
-				<displayName>Aserskt manat</displayName>
+				<displayName>aserskt manat</displayName>
 				<displayName count="one">aserskt manat</displayName>
 				<displayName count="other">asersk manöt</displayName>
 				<symbol>AZN</symbol>
 			</currency>
 			<currency type="BAM">
-				<displayName>Skiptanlegt Bosníu og Hersegóvínu-mark</displayName>
+				<displayName>skiptanlegt Bosníu og Hersegóvínu-mark</displayName>
 				<displayName count="one">skiptanlegt Bosníu og Hersegóvínu-mark</displayName>
 				<displayName count="other">skiptanleg Bosníu og Hersegóvínu-mörk</displayName>
 				<symbol>BAM</symbol>
 			</currency>
 			<currency type="BBD">
-				<displayName>Barbadoskur dalur</displayName>
+				<displayName>barbadoskur dalur</displayName>
 				<displayName count="one">barbadoskur dalur</displayName>
 				<displayName count="other">barbadoskir dalir</displayName>
 				<symbol>BBD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BDT">
-				<displayName>Bangladessk taka</displayName>
+				<displayName>bangladessk taka</displayName>
 				<displayName count="one">bangladessk taka</displayName>
 				<displayName count="other">bangladesskar tökur</displayName>
 				<symbol>BDT</symbol>
@@ -4479,19 +4610,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Lef</displayName>
 			</currency>
 			<currency type="BGN">
-				<displayName>Búlgarskt lef</displayName>
+				<displayName>búlgarskt lef</displayName>
 				<displayName count="one">búlgarskt lef</displayName>
 				<displayName count="other">búlgörsk lef</displayName>
 				<symbol>BGN</symbol>
 			</currency>
 			<currency type="BHD">
-				<displayName>Bareinskur denari</displayName>
+				<displayName>bareinskur denari</displayName>
 				<displayName count="one">bareinskur denari</displayName>
 				<displayName count="other">bareinskir denarar</displayName>
 				<symbol>BHD</symbol>
 			</currency>
 			<currency type="BIF">
-				<displayName>Búrúndískur franki</displayName>
+				<displayName>búrúndískur franki</displayName>
 				<displayName count="one">búrúndískur franki</displayName>
 				<displayName count="other">búrúndískir frankar</displayName>
 				<symbol>BIF</symbol>
@@ -4504,14 +4635,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BND">
-				<displayName>Brúneiskur dalur</displayName>
+				<displayName>brúneiskur dalur</displayName>
 				<displayName count="one">brúneiskur dalur</displayName>
 				<displayName count="other">brúneiskir dalir</displayName>
 				<symbol>BND</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BOB">
-				<displayName>Bólivíani</displayName>
+				<displayName>bólivíani</displayName>
 				<displayName count="one">bólivíani</displayName>
 				<displayName count="other">bólivíanar</displayName>
 				<symbol>BOB</symbol>
@@ -4523,7 +4654,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Bolivian Mvdol</displayName>
 			</currency>
 			<currency type="BRL">
-				<displayName>Brasilískt ríal</displayName>
+				<displayName>brasilískt ríal</displayName>
 				<displayName count="one">brasilískt ríal</displayName>
 				<displayName count="other">brasilísk ríöl</displayName>
 				<symbol>BRL</symbol>
@@ -4537,7 +4668,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BTN">
-				<displayName>Bútanskt núltrum</displayName>
+				<displayName>bútanskt núltrum</displayName>
 				<displayName count="one">bútanskt núltrum</displayName>
 				<displayName count="other">bútönsk núltrum</displayName>
 				<symbol>BTN</symbol>
@@ -4546,40 +4677,40 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Búrmverskt kjat</displayName>
 			</currency>
 			<currency type="BWP">
-				<displayName>Botsvönsk púla</displayName>
+				<displayName>botsvönsk púla</displayName>
 				<displayName count="one">botsvönsk púla</displayName>
 				<displayName count="other">botsvanskar púlur</displayName>
 				<symbol>BWP</symbol>
 			</currency>
 			<currency type="BYR">
-				<displayName>Hvítrússnesk rúbla</displayName>
+				<displayName>hvítrússnesk rúbla</displayName>
 				<displayName count="one">hvítrússnesk rúbla</displayName>
 				<displayName count="other">hvítrússneskar rúblur</displayName>
 				<symbol>BYR</symbol>
 				<symbol alt="narrow" draft="contributed">р.</symbol>
 			</currency>
 			<currency type="BZD">
-				<displayName>Belískur dalur</displayName>
+				<displayName>belískur dalur</displayName>
 				<displayName count="one">belískur dalur</displayName>
 				<displayName count="other">belískir dalir</displayName>
 				<symbol>BZD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CAD">
-				<displayName>Kanadískur dalur</displayName>
-				<displayName count="one">kanadískur dalur</displayName>
-				<displayName count="other">kanadískir dalir</displayName>
+				<displayName>Kanadadalur</displayName>
+				<displayName count="one">Kanadadalur</displayName>
+				<displayName count="other">Kanadadalir</displayName>
 				<symbol>CAD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CDF">
-				<displayName>Kongóskur franki</displayName>
+				<displayName>kongóskur franki</displayName>
 				<displayName count="one">kongóskur franki</displayName>
 				<displayName count="other">kongóskir frankar</displayName>
 				<symbol>CDF</symbol>
 			</currency>
 			<currency type="CHF">
-				<displayName>Svissneskur franki</displayName>
+				<displayName>svissneskur franki</displayName>
 				<displayName count="one">svissneskur franki</displayName>
 				<displayName count="other">svissneskir frankar</displayName>
 				<symbol>CHF</symbol>
@@ -4588,28 +4719,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Chilean Unidades de Fomento</displayName>
 			</currency>
 			<currency type="CLP">
-				<displayName>Síleskur pesi</displayName>
+				<displayName>síleskur pesi</displayName>
 				<displayName count="one">síleskur pesi</displayName>
 				<displayName count="other">síleskir pesar</displayName>
 				<symbol>CLP</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CNY">
-				<displayName>Kínverskt júan</displayName>
+				<displayName>kínverskt júan</displayName>
 				<displayName count="one">kínverskt júan</displayName>
 				<displayName count="other">kínversk júön</displayName>
 				<symbol>CN¥</symbol>
 				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
 			<currency type="COP">
-				<displayName>Kólumbískur pesi</displayName>
+				<displayName>kólumbískur pesi</displayName>
 				<displayName count="one">kólumbískur pesi</displayName>
 				<displayName count="other">kólumbískir pesar</displayName>
 				<symbol>COP</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CRC">
-				<displayName>Kostarískt kólon</displayName>
+				<displayName>kostarískt kólon</displayName>
 				<displayName count="one">kostarískt kólon</displayName>
 				<displayName count="other">kostarísk kólon</displayName>
 				<symbol>CRC</symbol>
@@ -4619,20 +4750,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Tékknesk króna, eldri</displayName>
 			</currency>
 			<currency type="CUC">
-				<displayName>Kúbverskur skiptanlegur pesi</displayName>
-				<displayName count="one">kúbverskur skiptanlegur pesi</displayName>
-				<displayName count="other">kúbverskir skiptanlegir pesar</displayName>
+				<displayName>kúbverskur skiptanlegur pesi</displayName>
+				<displayName count="one">kúbverskur skiptanlegur pesói</displayName>
+				<displayName count="other">kúbverskir skiptanlegir pesóar</displayName>
 				<symbol>CUC</symbol>
 			</currency>
 			<currency type="CUP">
-				<displayName>Kúbverskur pesi</displayName>
+				<displayName>kúbverskur pesi</displayName>
 				<displayName count="one">kúbverskur pesi</displayName>
 				<displayName count="other">kúbverskir pesar</displayName>
 				<symbol>CUP</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CVE">
-				<displayName>Grænhöfðeyskur skúti</displayName>
+				<displayName>grænhöfðeyskur skúti</displayName>
 				<displayName count="one">grænhöfðeyskur skúti</displayName>
 				<displayName count="other">grænhöfðeyskir skútar</displayName>
 				<symbol>CVE</symbol>
@@ -4641,7 +4772,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Kýpverskt pund</displayName>
 			</currency>
 			<currency type="CZK">
-				<displayName>Tékknesk króna</displayName>
+				<displayName>tékknesk króna</displayName>
 				<displayName count="one">tékknesk króna</displayName>
 				<displayName count="other">tékkneskar krónur</displayName>
 				<symbol>CZK</symbol>
@@ -4653,26 +4784,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Þýskt mark</displayName>
 			</currency>
 			<currency type="DJF">
-				<displayName>Djíbútískur franki</displayName>
+				<displayName>djíbútískur franki</displayName>
 				<displayName count="one">djíbútískur franki</displayName>
 				<displayName count="other">djíbútískir frankar</displayName>
 				<symbol>DJF</symbol>
 			</currency>
 			<currency type="DKK">
-				<displayName>Dönsk króna</displayName>
+				<displayName>dönsk króna</displayName>
 				<displayName count="one">dönsk króna</displayName>
 				<displayName count="other">danskar krónur</displayName>
 				<symbol>DKK</symbol>
 			</currency>
 			<currency type="DOP">
-				<displayName>Dóminískur pesi</displayName>
+				<displayName>dóminískur pesi</displayName>
 				<displayName count="one">dóminískur pesi</displayName>
 				<displayName count="other">dóminískir pesar</displayName>
 				<symbol>DOP</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="DZD">
-				<displayName>Alsírskur denari</displayName>
+				<displayName>alsírskur denari</displayName>
 				<displayName count="one">alsírskur denari</displayName>
 				<displayName count="other">alsírskir denarar</displayName>
 				<symbol>DZD</symbol>
@@ -4686,13 +4817,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other" draft="unconfirmed">eistnesku krónur</displayName>
 			</currency>
 			<currency type="EGP">
-				<displayName>Egypskt pund</displayName>
+				<displayName>egypskt pund</displayName>
 				<displayName count="one">egypskt pund</displayName>
 				<displayName count="other">egypsk pund</displayName>
 				<symbol>EGP</symbol>
 			</currency>
 			<currency type="ERN">
-				<displayName>Erítresk nakfa</displayName>
+				<displayName>erítresk nakfa</displayName>
 				<displayName count="one">erítresk nakfa</displayName>
 				<displayName count="other">erítreskar nökfur</displayName>
 				<symbol>ERN</symbol>
@@ -4701,13 +4832,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Spænskur peseti</displayName>
 			</currency>
 			<currency type="ETB">
-				<displayName>Eþíópískt birr</displayName>
+				<displayName>eþíópískt birr</displayName>
 				<displayName count="one">eþíópískt birr</displayName>
 				<displayName count="other">eþíópísk birr</displayName>
 				<symbol>ETB</symbol>
 			</currency>
 			<currency type="EUR">
-				<displayName>Evra</displayName>
+				<displayName>evra</displayName>
 				<displayName count="one">evra</displayName>
 				<displayName count="other">evrur</displayName>
 				<symbol>EUR</symbol>
@@ -4717,14 +4848,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Finnskt mark</displayName>
 			</currency>
 			<currency type="FJD">
-				<displayName>Fídjeyskur dalur</displayName>
-				<displayName count="one">fídjeyskur dalur</displayName>
-				<displayName count="other">fídjeyskir dalir</displayName>
+				<displayName>fidjeyskur dalur</displayName>
+				<displayName count="one">fidjeyskur dalur</displayName>
+				<displayName count="other">fidjeyskir dalir</displayName>
 				<symbol>FJD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="FKP">
-				<displayName>Falklenskt pund</displayName>
+				<displayName>falklenskt pund</displayName>
 				<displayName count="one">falklenskt pund</displayName>
 				<displayName count="other">falklensk pund</displayName>
 				<symbol>FKP</symbol>
@@ -4733,33 +4864,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Franskur franki</displayName>
 			</currency>
 			<currency type="GBP">
-				<displayName>Sterlingspund</displayName>
+				<displayName>sterlingspund</displayName>
 				<displayName count="one">sterlingspund</displayName>
 				<displayName count="other">sterlingspund</displayName>
 				<symbol>GBP</symbol>
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GEL">
-				<displayName>Georgískur lari</displayName>
+				<displayName>georgískur lari</displayName>
 				<displayName count="one">georgískur lari</displayName>
 				<displayName count="other">georgískir larar</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHS">
-				<displayName>Ganverskur sedi</displayName>
+				<displayName>ganverskur sedi</displayName>
 				<displayName count="one">ganverskur sedi</displayName>
 				<displayName count="other">ganverskir sedar</displayName>
 				<symbol>GHS</symbol>
 			</currency>
 			<currency type="GIP">
 				<displayName>Gíbraltarspund</displayName>
-				<displayName count="one">Gíbraltarspund</displayName>
+				<displayName count="one">Gíbraltarpund</displayName>
 				<displayName count="other">Gíbraltarspund</displayName>
 				<symbol>GIP</symbol>
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GMD">
-				<displayName>Gambískur dalasi</displayName>
+				<displayName>gambískur dalasi</displayName>
 				<displayName count="one">gambískur dalasi</displayName>
 				<displayName count="other">gambískir dalasar</displayName>
 				<symbol>GMD</symbol>
@@ -4774,7 +4906,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Drakma</displayName>
 			</currency>
 			<currency type="GTQ">
-				<displayName>Gvatemalskt kvesal</displayName>
+				<displayName>gvatemalskt kvesal</displayName>
 				<displayName count="one">gvatemalskt kvesal</displayName>
 				<displayName count="other">gvatemölsk kvesöl</displayName>
 				<symbol>GTQ</symbol>
@@ -4783,7 +4915,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Portúgalskur, gíneskur skúti</displayName>
 			</currency>
 			<currency type="GYD">
-				<displayName>Gvæjanskur dalur</displayName>
+				<displayName>gvæjanskur dalur</displayName>
 				<displayName count="one">gvæjanskur dalur</displayName>
 				<displayName count="other">gvæjanskir dalir</displayName>
 				<symbol>GYD</symbol>
@@ -4797,34 +4929,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="HNL">
-				<displayName>Hondúrsk lempíra</displayName>
+				<displayName>hondúrsk lempíra</displayName>
 				<displayName count="one">hondúrsk lempíra</displayName>
 				<displayName count="other">hondúrskar lempírur</displayName>
 				<symbol>HNL</symbol>
 			</currency>
 			<currency type="HRK">
-				<displayName>Króatísk kúna</displayName>
+				<displayName>króatísk kúna</displayName>
 				<displayName count="one">króatísk kúna</displayName>
 				<displayName count="other">króatískar kúnur</displayName>
 				<symbol>HRK</symbol>
 			</currency>
 			<currency type="HTG">
-				<displayName>Haítískur gúrdi</displayName>
+				<displayName>haítískur gúrdi</displayName>
 				<displayName count="one">haítískur gúrdi</displayName>
 				<displayName count="other">haítískir gúrdar</displayName>
 				<symbol>HTG</symbol>
 			</currency>
 			<currency type="HUF">
-				<displayName>Ungversk fórinta</displayName>
+				<displayName>ungversk fórinta</displayName>
 				<displayName count="one">ungversk fórinta</displayName>
 				<displayName count="other">ungverskar fórintur</displayName>
 				<symbol>HUF</symbol>
 			</currency>
 			<currency type="IDR">
-				<displayName>Indónesísk rúpía</displayName>
+				<displayName>indónesísk rúpía</displayName>
 				<displayName count="one">indónesísk rúpía</displayName>
 				<displayName count="other">indónesískar rúpíur</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>Írskt pund</displayName>
@@ -4833,33 +4966,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Ísraelskt pund</displayName>
 			</currency>
 			<currency type="ILS">
-				<displayName>Nýr ísraelskur sikill</displayName>
+				<displayName>nýr ísraelskur sikill</displayName>
 				<displayName count="one">nýr ísraelskur sikill</displayName>
 				<displayName count="other">nýir ísraelskir siklar</displayName>
 				<symbol>₪</symbol>
 				<symbol alt="narrow" draft="contributed">₪</symbol>
 			</currency>
 			<currency type="INR">
-				<displayName>Indversk rúpía</displayName>
+				<displayName>indversk rúpía</displayName>
 				<displayName count="one">indversk rúpía</displayName>
 				<displayName count="other">indverskar rúpíur</displayName>
 				<symbol>INR</symbol>
 				<symbol alt="narrow" draft="contributed">₹</symbol>
 			</currency>
 			<currency type="IQD">
-				<displayName>Írakskur denari</displayName>
+				<displayName>írakskur denari</displayName>
 				<displayName count="one">írakskur denari</displayName>
 				<displayName count="other">írakskir denarar</displayName>
 				<symbol>IQD</symbol>
 			</currency>
 			<currency type="IRR">
-				<displayName>Íranskt ríal</displayName>
+				<displayName>íranskt ríal</displayName>
 				<displayName count="one">íranskt ríal</displayName>
 				<displayName count="other">írönsk ríöl</displayName>
 				<symbol>IRR</symbol>
 			</currency>
 			<currency type="ISK">
-				<displayName>Íslensk króna</displayName>
+				<displayName>íslensk króna</displayName>
 				<displayName count="one">íslensk króna</displayName>
 				<displayName count="other">íslenskar krónur</displayName>
 				<symbol>ISK</symbol>
@@ -4868,104 +5001,104 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Ítölsk líra</displayName>
 			</currency>
 			<currency type="JMD">
-				<displayName>Jamaískur dalur</displayName>
+				<displayName>jamaískur dalur</displayName>
 				<displayName count="one">jamaískur dalur</displayName>
 				<displayName count="other">jamaískir dalir</displayName>
 				<symbol>JMD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="JOD">
-				<displayName>Jórdanskur denari</displayName>
+				<displayName>jórdanskur denari</displayName>
 				<displayName count="one">jórdanskur denari</displayName>
 				<displayName count="other">jórdanskir denarar</displayName>
 				<symbol>JOD</symbol>
 			</currency>
 			<currency type="JPY">
-				<displayName>Japanskt jen</displayName>
+				<displayName>japanskt jen</displayName>
 				<displayName count="one">japanskt jen</displayName>
 				<displayName count="other">japönsk jen</displayName>
 				<symbol>JP¥</symbol>
 				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
 			<currency type="KES">
-				<displayName>Kenískur skildingur</displayName>
+				<displayName>kenískur skildingur</displayName>
 				<displayName count="one">kenískur skildingur</displayName>
 				<displayName count="other">kenískir skildingar</displayName>
 				<symbol>KES</symbol>
 			</currency>
 			<currency type="KGS">
-				<displayName>Kirgiskt som</displayName>
+				<displayName>kirgiskt som</displayName>
 				<displayName count="one">kirgiskt som</displayName>
 				<displayName count="other">kirgisk som</displayName>
 				<symbol>KGS</symbol>
 			</currency>
 			<currency type="KHR">
-				<displayName>Kambódískt ríal</displayName>
+				<displayName>kambódískt ríal</displayName>
 				<displayName count="one">kambódískt ríal</displayName>
 				<displayName count="other">kambódísk ríöl</displayName>
 				<symbol>KHR</symbol>
 				<symbol alt="narrow" draft="contributed">៛</symbol>
 			</currency>
 			<currency type="KMF">
-				<displayName>Kómoreyskur franki</displayName>
+				<displayName>kómoreyskur franki</displayName>
 				<displayName count="one">kómoreyskur franki</displayName>
 				<displayName count="other">kómoreyskir frankar</displayName>
 				<symbol>KMF</symbol>
 			</currency>
 			<currency type="KPW">
-				<displayName>Norðurkóreskt vonn</displayName>
+				<displayName>norðurkóreskt vonn</displayName>
 				<displayName count="one">norðurkóreskt vonn</displayName>
 				<displayName count="other">norðurkóresk vonn</displayName>
 				<symbol>KPW</symbol>
 			</currency>
 			<currency type="KRW">
-				<displayName>Suðurkóreskt vonn</displayName>
+				<displayName>suðurkóreskt vonn</displayName>
 				<displayName count="one">suðurkóreskt vonn</displayName>
 				<displayName count="other">suðurkóresk vonn</displayName>
 				<symbol>KRW</symbol>
 				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KWD">
-				<displayName>Kúveiskur denari</displayName>
+				<displayName>kúveiskur denari</displayName>
 				<displayName count="one">kúveiskur denari</displayName>
 				<displayName count="other">kúveiskir denarar</displayName>
 				<symbol>KWD</symbol>
 			</currency>
 			<currency type="KYD">
-				<displayName>Caymaneyskur dalur</displayName>
+				<displayName>caymaneyskur dalur</displayName>
 				<displayName count="one">caymaneyskur dalur</displayName>
 				<displayName count="other">caymaneyskir dalir</displayName>
 				<symbol>KYD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="KZT">
-				<displayName>Kasakst tengi</displayName>
+				<displayName>kasakst tengi</displayName>
 				<displayName count="one">kasakst tengi</displayName>
 				<displayName count="other">kasöksk tengi</displayName>
 				<symbol>KZT</symbol>
 				<symbol alt="narrow" draft="contributed">₸</symbol>
 			</currency>
 			<currency type="LAK">
-				<displayName>Laoskt kip</displayName>
+				<displayName>laoskt kip</displayName>
 				<displayName count="one">laoskt kip</displayName>
 				<displayName count="other">laosk kip</displayName>
 				<symbol>LAK</symbol>
 				<symbol alt="narrow" draft="contributed">₭</symbol>
 			</currency>
 			<currency type="LBP">
-				<displayName>Líbanskt pund</displayName>
+				<displayName>líbanskt pund</displayName>
 				<displayName count="one">líbanskt pund</displayName>
 				<displayName count="other">líbönsk pund</displayName>
 				<symbol>LBP</symbol>
 			</currency>
 			<currency type="LKR">
-				<displayName>Srílönsk rúpía</displayName>
+				<displayName>srílönsk rúpía</displayName>
 				<displayName count="one">srílönsk rúpía</displayName>
 				<displayName count="other">srílanskar rúpíur</displayName>
 				<symbol>LKR</symbol>
 			</currency>
 			<currency type="LRD">
-				<displayName>Líberískur dalur</displayName>
+				<displayName>líberískur dalur</displayName>
 				<displayName count="one">líberískur dalur</displayName>
 				<displayName count="other">líberískir dalir</displayName>
 				<symbol>LRD</symbol>
@@ -4996,13 +5129,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Lettnesk rúbla</displayName>
 			</currency>
 			<currency type="LYD">
-				<displayName>Líbískur denari</displayName>
+				<displayName>líbískur denari</displayName>
 				<displayName count="one">líbískur denari</displayName>
 				<displayName count="other">líbískir denarar</displayName>
 				<symbol>LYD</symbol>
 			</currency>
 			<currency type="MAD">
-				<displayName>Marokkóskt dírham</displayName>
+				<displayName>marokkóskt dírham</displayName>
 				<displayName count="one">marokkóskt dírham</displayName>
 				<displayName count="other">marokkósk dírhöm</displayName>
 				<symbol>MAD</symbol>
@@ -5011,7 +5144,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Marokkóskur franki</displayName>
 			</currency>
 			<currency type="MDL">
-				<displayName>Moldavískt lei</displayName>
+				<displayName>moldavískt lei</displayName>
 				<displayName count="one">moldavískt lei</displayName>
 				<displayName count="other">moldavísk lei</displayName>
 				<symbol>MDL</symbol>
@@ -5026,7 +5159,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Madagaskur franki</displayName>
 			</currency>
 			<currency type="MKD">
-				<displayName>Makedónskur denari</displayName>
+				<displayName>makedónskur denari</displayName>
 				<displayName count="one">makedónskur denari</displayName>
 				<displayName count="other">makedónskir denarar</displayName>
 				<symbol>MKD</symbol>
@@ -5035,26 +5168,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Malískur franki</displayName>
 			</currency>
 			<currency type="MMK">
-				<displayName>Mjanmarskt kjat</displayName>
+				<displayName>mjanmarskt kjat</displayName>
 				<displayName count="one">mjanmarskt kjat</displayName>
 				<displayName count="other">mjanmörsk kjöt</displayName>
 				<symbol>MMK</symbol>
 			</currency>
 			<currency type="MNT">
-				<displayName>Mongólskur túríkur</displayName>
+				<displayName>mongólskur túríkur</displayName>
 				<displayName count="one">mongólskur túríkur</displayName>
 				<displayName count="other">mongólskir túríkar</displayName>
 				<symbol>MNT</symbol>
 				<symbol alt="narrow" draft="contributed">₮</symbol>
 			</currency>
 			<currency type="MOP">
-				<displayName>Makaópataka</displayName>
-				<displayName count="one">Makaópataka</displayName>
-				<displayName count="other">Makaópatökur</displayName>
+				<displayName>makaósk pataka</displayName>
+				<displayName count="one">makaósk pataka</displayName>
+				<displayName count="other">makaóskar patökur</displayName>
 				<symbol>MOP</symbol>
 			</currency>
 			<currency type="MRO">
-				<displayName>Máritönsk úgía</displayName>
+				<displayName>márítönsk úgía</displayName>
 				<displayName count="one">máritönsk úgía</displayName>
 				<displayName count="other">máritanskar úgíur</displayName>
 				<symbol>MRO</symbol>
@@ -5066,25 +5199,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Maltneskt pund</displayName>
 			</currency>
 			<currency type="MUR">
-				<displayName>Máritísk rúpía</displayName>
+				<displayName>máritísk rúpía</displayName>
 				<displayName count="one">máritísk rúpía</displayName>
 				<displayName count="other">máritískar rúpíur</displayName>
 				<symbol>MUR</symbol>
 			</currency>
 			<currency type="MVR">
-				<displayName>Maldíveysk rúpía</displayName>
+				<displayName>maldíveysk rúpía</displayName>
 				<displayName count="one">maldíveysk rúpía</displayName>
 				<displayName count="other">maldíveyskar rúpíur</displayName>
 				<symbol>MVR</symbol>
 			</currency>
 			<currency type="MWK">
-				<displayName>Malavísk kvaka</displayName>
+				<displayName>malavísk kvaka</displayName>
 				<displayName count="one">malavísk kvaka</displayName>
 				<displayName count="other">malavískar kvökur</displayName>
 				<symbol>MWK</symbol>
 			</currency>
 			<currency type="MXN">
-				<displayName>Mexíkóskur pesi</displayName>
+				<displayName>mexíkóskur pesi</displayName>
 				<displayName count="one">mexíkóskur pesi</displayName>
 				<displayName count="other">mexíkóskir pesar</displayName>
 				<symbol>MXN</symbol>
@@ -5097,7 +5230,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Mexíkóskur pesi, UDI</displayName>
 			</currency>
 			<currency type="MYR">
-				<displayName>Malasískt ringit</displayName>
+				<displayName>malasískt ringit</displayName>
 				<displayName count="one">malasískt ringit</displayName>
 				<displayName count="other">malasísk ringit</displayName>
 				<symbol>MYR</symbol>
@@ -5106,20 +5239,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Mósambískur skúti</displayName>
 			</currency>
 			<currency type="MZN">
-				<displayName>Mósambískt metikal</displayName>
+				<displayName>mósambískt metikal</displayName>
 				<displayName count="one">mósambískt metikal</displayName>
 				<displayName count="other">mósambísk metiköl</displayName>
 				<symbol>MZN</symbol>
 			</currency>
 			<currency type="NAD">
-				<displayName>Namibískur dalur</displayName>
+				<displayName>namibískur dalur</displayName>
 				<displayName count="one">namibískur dalur</displayName>
 				<displayName count="other">namibískir dalir</displayName>
 				<symbol>NAD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="NGN">
-				<displayName>Nígerísk næra</displayName>
+				<displayName>nígerísk næra</displayName>
 				<displayName count="one">nígerísk næra</displayName>
 				<displayName count="other">nígerískar nærur</displayName>
 				<symbol>NGN</symbol>
@@ -5131,7 +5264,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other" draft="unconfirmed">Níkaragskar kordóvur (1988–1991)</displayName>
 			</currency>
 			<currency type="NIO">
-				<displayName>Níkarögsk kordóva</displayName>
+				<displayName>níkaraögsk kordóva</displayName>
 				<displayName count="one">níkarögsk kordóva</displayName>
 				<displayName count="other">níkaragskar kordóvur</displayName>
 				<symbol>NIO</symbol>
@@ -5140,63 +5273,63 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Hollenskt gyllini</displayName>
 			</currency>
 			<currency type="NOK">
-				<displayName>Norsk króna</displayName>
+				<displayName>norsk króna</displayName>
 				<displayName count="one">norsk króna</displayName>
 				<displayName count="other">norskar krónur</displayName>
 				<symbol>NOK</symbol>
 			</currency>
 			<currency type="NPR">
-				<displayName>Nepölsk rúpía</displayName>
+				<displayName>nepölsk rúpía</displayName>
 				<displayName count="one">nepölsk rúpía</displayName>
 				<displayName count="other">nepalskar rúpíur</displayName>
 				<symbol>NPR</symbol>
 			</currency>
 			<currency type="NZD">
-				<displayName>Nýsjálenskur dalur</displayName>
+				<displayName>nýsjálenskur dalur</displayName>
 				<displayName count="one">nýsjálenskur dalur</displayName>
 				<displayName count="other">nýsjálenskir dalir</displayName>
 				<symbol>NZD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="OMR">
-				<displayName>Ómanskt ríal</displayName>
+				<displayName>ómanskt ríal</displayName>
 				<displayName count="one">ómanskt ríal</displayName>
 				<displayName count="other">ómönsk ríöl</displayName>
 				<symbol>OMR</symbol>
 			</currency>
 			<currency type="PAB">
-				<displayName>Balbói</displayName>
+				<displayName>balbói</displayName>
 				<displayName count="one">balbói</displayName>
 				<displayName count="other">balbóar</displayName>
 				<symbol>PAB</symbol>
 			</currency>
 			<currency type="PEN">
-				<displayName>Perúskt sól</displayName>
+				<displayName>perúskt sól</displayName>
 				<displayName count="one">perúskt sól</displayName>
 				<displayName count="other">perúsk sól</displayName>
 				<symbol>PEN</symbol>
 			</currency>
 			<currency type="PGK">
-				<displayName>Papúsk kína</displayName>
+				<displayName>papúsk kína</displayName>
 				<displayName count="one">papúsk kína</displayName>
 				<displayName count="other">papúskar kínur</displayName>
 				<symbol>PGK</symbol>
 			</currency>
 			<currency type="PHP">
-				<displayName>Filippseyskur pesi</displayName>
+				<displayName>filippseyskur pesi</displayName>
 				<displayName count="one">filippseyskur pesi</displayName>
 				<displayName count="other">filippseyskir pesar</displayName>
 				<symbol>PHP</symbol>
 				<symbol alt="narrow" draft="contributed">₱</symbol>
 			</currency>
 			<currency type="PKR">
-				<displayName>Pakistönsk rúpía</displayName>
+				<displayName>pakistönsk rúpía</displayName>
 				<displayName count="one">pakistönsk rúpía</displayName>
 				<displayName count="other">pakistanskar rúpíur</displayName>
 				<symbol>PKR</symbol>
 			</currency>
 			<currency type="PLN">
-				<displayName>Pólskt slot</displayName>
+				<displayName>pólskt slot</displayName>
 				<displayName count="one">pólskt slot</displayName>
 				<displayName count="other">pólsk slot</displayName>
 				<symbol>PLN</symbol>
@@ -5208,14 +5341,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Portúgalskur skúti</displayName>
 			</currency>
 			<currency type="PYG">
-				<displayName>Paragvæskt gvaraní</displayName>
+				<displayName>paragvæskt gvaraní</displayName>
 				<displayName count="one">paragvæskt gvaraní</displayName>
 				<displayName count="other">paragvæsk gvaraní</displayName>
 				<symbol>PYG</symbol>
 				<symbol alt="narrow" draft="contributed">₲</symbol>
 			</currency>
 			<currency type="QAR">
-				<displayName>Katarskt ríal</displayName>
+				<displayName>katarskt ríal</displayName>
 				<displayName count="one">katarskt ríal</displayName>
 				<displayName count="other">katörsk ríöl</displayName>
 				<symbol>QAR</symbol>
@@ -5226,19 +5359,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">Rúmenskt lei (1952–2006)</displayName>
 			</currency>
 			<currency type="RON">
-				<displayName>Rúmenskt lei</displayName>
+				<displayName>rúmenskt lei</displayName>
 				<displayName count="one">rúmenskt lei</displayName>
 				<displayName count="other">rúmensk lei</displayName>
 				<symbol>RON</symbol>
 			</currency>
 			<currency type="RSD">
-				<displayName>Serbneskur denari</displayName>
+				<displayName>serbneskur denari</displayName>
 				<displayName count="one">serbneskur denari</displayName>
 				<displayName count="other">serbneskir denarar</displayName>
 				<symbol>RSD</symbol>
 			</currency>
 			<currency type="RUB">
-				<displayName>Rússnesk rúbla</displayName>
+				<displayName>rússnesk rúbla</displayName>
 				<displayName count="one">rússnesk rúbla</displayName>
 				<displayName count="other">rússneskar rúblur</displayName>
 				<symbol>RUB</symbol>
@@ -5247,19 +5380,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Rússnesk rúbla (1991–1998)</displayName>
 			</currency>
 			<currency type="RWF">
-				<displayName>Rúandskur franki</displayName>
+				<displayName>rúandskur franki</displayName>
 				<displayName count="one">rúandskur franki</displayName>
 				<displayName count="other">rúandskir frankar</displayName>
 				<symbol>RWF</symbol>
 			</currency>
 			<currency type="SAR">
-				<displayName>Sádiarabískt ríal</displayName>
+				<displayName>sádíarabískt ríal</displayName>
 				<displayName count="one">sádiarabískt ríal</displayName>
 				<displayName count="other">sádiarabísk ríöl</displayName>
 				<symbol>SAR</symbol>
 			</currency>
 			<currency type="SBD">
-				<displayName>Salómonseyskur dalur</displayName>
+				<displayName>salómonseyskur dalur</displayName>
 				<displayName count="one">salómonseyskur dalur</displayName>
 				<displayName count="other">salómonseyskir dalir</displayName>
 				<symbol>SBD</symbol>
@@ -5275,7 +5408,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Súdanskur denari</displayName>
 			</currency>
 			<currency type="SDG">
-				<displayName>Súdanskt pund</displayName>
+				<displayName>súdanskt pund</displayName>
 				<displayName count="one">súdanskt pund</displayName>
 				<displayName count="other">súdönsk pund</displayName>
 				<symbol>SDG</symbol>
@@ -5284,20 +5417,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Súdanskt pund (1957–1998)</displayName>
 			</currency>
 			<currency type="SEK">
-				<displayName>Sænsk króna</displayName>
+				<displayName>sænsk króna</displayName>
 				<displayName count="one">sænsk króna</displayName>
 				<displayName count="other">sænskar krónur</displayName>
 				<symbol>SEK</symbol>
 			</currency>
 			<currency type="SGD">
-				<displayName>Singapúrskur dalur</displayName>
+				<displayName>singapúrskur dalur</displayName>
 				<displayName count="one">singapúrskur dalur</displayName>
 				<displayName count="other">singapúrskir dalir</displayName>
 				<symbol>SGD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SHP">
-				<displayName>Helenskt pund</displayName>
+				<displayName>helenskt pund</displayName>
 				<displayName count="one">helenskt pund</displayName>
 				<displayName count="other">helensk pund</displayName>
 				<symbol>SHP</symbol>
@@ -5309,13 +5442,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Slóvakísk króna</displayName>
 			</currency>
 			<currency type="SLL">
-				<displayName>Síerraleónsk ljóna</displayName>
+				<displayName>síerraleónsk ljóna</displayName>
 				<displayName count="one">síerraleónsk ljóna</displayName>
 				<displayName count="other">síerraleónskar ljónur</displayName>
 				<symbol>SLL</symbol>
 			</currency>
 			<currency type="SOS">
-				<displayName>Sómalískur skildingur</displayName>
+				<displayName>sómalískur skildingur</displayName>
 				<displayName count="one">sómalískur skildingur</displayName>
 				<displayName count="other">sómalískir skildingar</displayName>
 				<symbol>SOS</symbol>
@@ -5331,7 +5464,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Suriname Guilder</displayName>
 			</currency>
 			<currency type="SSP">
-				<displayName>Suðursúdanskt pund</displayName>
+				<displayName>suðursúdanskt pund</displayName>
 				<displayName count="one">suðursúdanskt pund</displayName>
 				<displayName count="other">suðursúdönsk pund</displayName>
 				<symbol>SSP</symbol>
@@ -5352,28 +5485,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">El Salvador Colon</displayName>
 			</currency>
 			<currency type="SYP">
-				<displayName>Sýrlenskt pund</displayName>
+				<displayName>sýrlenskt pund</displayName>
 				<displayName count="one">sýrlenskt pund</displayName>
 				<displayName count="other">sýrlensk pund</displayName>
 				<symbol>SYP</symbol>
 			</currency>
 			<currency type="SZL">
-				<displayName>Svasílenskur lílangeni</displayName>
+				<displayName>svasílenskur lílangeni</displayName>
 				<displayName count="one">svasílenskur lílangeni</displayName>
 				<displayName count="other">svasílenskir lílangenar</displayName>
 				<symbol>SZL</symbol>
 			</currency>
 			<currency type="THB">
-				<displayName>Taílenskt bat</displayName>
+				<displayName>taílenskt bat</displayName>
 				<displayName count="one">taílenskt bat</displayName>
 				<displayName count="other">taílensk böt</displayName>
 				<symbol>THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>Tadsjiksk rúbla</displayName>
 			</currency>
 			<currency type="TJS">
-				<displayName>Tadsjikskur sómóni</displayName>
+				<displayName>tadsjikskur sómóni</displayName>
 				<displayName count="one">tadsjikskur sómóni</displayName>
 				<displayName count="other">tadsjikskir sómónar</displayName>
 				<symbol>TJS</symbol>
@@ -5384,13 +5518,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">Túrkmenskt manat (1993–2009)</displayName>
 			</currency>
 			<currency type="TMT">
-				<displayName>Túrkmenskt manat</displayName>
+				<displayName>túrkmenskt manat</displayName>
 				<displayName count="one">túrkmenskt manat</displayName>
 				<displayName count="other">túrkmensk manöt</displayName>
 				<symbol>TMT</symbol>
 			</currency>
 			<currency type="TND">
-				<displayName>Túniskur denari</displayName>
+				<displayName>túnískur denari</displayName>
 				<displayName count="one">túniskur denari</displayName>
 				<displayName count="other">túniskir denarar</displayName>
 				<symbol>TND</symbol>
@@ -5400,6 +5534,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Tongapanga</displayName>
 				<displayName count="other">Tongapöngur</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>Tímorskur skúti</displayName>
@@ -5408,7 +5543,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Tyrknesk líra (1922–2005)</displayName>
 			</currency>
 			<currency type="TRY">
-				<displayName>Tyrknesk líra</displayName>
+				<displayName>tyrknesk líra</displayName>
 				<displayName count="one">tyrknesk líra</displayName>
 				<displayName count="other">tyrkneskar lírur</displayName>
 				<symbol>TRY</symbol>
@@ -5422,20 +5557,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="TWD">
-				<displayName>Taívanskur dalur</displayName>
+				<displayName>taívanskur dalur</displayName>
 				<displayName count="one">taívanskur dalur</displayName>
 				<displayName count="other">taívanskir dalir</displayName>
 				<symbol>TWD</symbol>
 				<symbol alt="narrow" draft="contributed">NT$</symbol>
 			</currency>
 			<currency type="TZS">
-				<displayName>Tansanískur skildingur</displayName>
+				<displayName>tansanískur skildingur</displayName>
 				<displayName count="one">tansanískur skildingur</displayName>
 				<displayName count="other">tansanískir skildingar</displayName>
 				<symbol>TZS</symbol>
 			</currency>
 			<currency type="UAH">
-				<displayName>Úkraínsk hrinja</displayName>
+				<displayName>úkraínsk hrinja</displayName>
 				<displayName count="one">úkraínsk hrinja</displayName>
 				<displayName count="other">úkraínskar hrinjur</displayName>
 				<symbol>UAH</symbol>
@@ -5445,9 +5580,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Ukrainian Karbovanetz</displayName>
 			</currency>
 			<currency type="UGX">
-				<displayName>Úgandskur skildingur</displayName>
+				<displayName>úgandskur skildingur</displayName>
 				<displayName count="one">úgandskur skildingur</displayName>
-				<displayName count="other">úgandskir skildingur</displayName>
+				<displayName count="other">úgandskir skildingar</displayName>
 				<symbol>UGX</symbol>
 			</currency>
 			<currency type="USD">
@@ -5464,14 +5599,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Bandaríkjadalur (sama dag)</displayName>
 			</currency>
 			<currency type="UYU">
-				<displayName>Úrúgvæskur pesi</displayName>
+				<displayName>úrúgvæskur pesi</displayName>
 				<displayName count="one">úrúgvæskur pesi</displayName>
 				<displayName count="other">úrúgvæskir pesar</displayName>
 				<symbol>UYU</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="UZS">
-				<displayName>Úsbekskt súm</displayName>
+				<displayName>úsbekskt súm</displayName>
 				<displayName count="one">úsbekskt súm</displayName>
 				<displayName count="other">úsbeksk súm</displayName>
 				<symbol>UZS</symbol>
@@ -5480,20 +5615,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Bolívar í Venesúela (1871–2008)</displayName>
 			</currency>
 			<currency type="VEF">
-				<displayName>Venesúelskur bólívari</displayName>
+				<displayName>venesúelskur bólívari</displayName>
 				<displayName count="one">venesúelskur bólívari</displayName>
 				<displayName count="other">venesúelskir bólívarar</displayName>
 				<symbol>VEF</symbol>
 			</currency>
 			<currency type="VND">
-				<displayName>Víetnamskt dong</displayName>
+				<displayName>víetnamskt dong</displayName>
 				<displayName count="one">víetnamskt dong</displayName>
 				<displayName count="other">víetnömsk dong</displayName>
 				<symbol>VND</symbol>
 				<symbol alt="narrow" draft="contributed">₫</symbol>
 			</currency>
 			<currency type="VUV">
-				<displayName>Vanúatúskt vatú</displayName>
+				<displayName>vanúatúskt vatú</displayName>
 				<displayName count="one">vanúatúskt vatú</displayName>
 				<displayName count="other">vanúatúsk vatú</displayName>
 				<symbol>VUV</symbol>
@@ -5505,7 +5640,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>WST</symbol>
 			</currency>
 			<currency type="XAF">
-				<displayName>Miðafrískur franki</displayName>
+				<displayName>miðafrískur franki</displayName>
 				<displayName count="one">miðafrískur franki</displayName>
 				<displayName count="other">miðafrískir frankar</displayName>
 				<symbol>FCFA</symbol>
@@ -5521,7 +5656,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other" draft="unconfirmed">unse gull</displayName>
 			</currency>
 			<currency type="XCD">
-				<displayName>Austurkarabískur dalur</displayName>
+				<displayName>austurkarabískur dalur</displayName>
 				<displayName count="one">austurkarabískur dalur</displayName>
 				<displayName count="other">austurkarabískir dalir</displayName>
 				<symbol>EC$</symbol>
@@ -5536,7 +5671,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Franskur franki, UIC</displayName>
 			</currency>
 			<currency type="XOF">
-				<displayName>Vesturafrískur franki</displayName>
+				<displayName>vesturafrískur franki</displayName>
 				<displayName count="one">vesturafrískur franki</displayName>
 				<displayName count="other">vesturafrískir frankar</displayName>
 				<symbol>CFA</symbol>
@@ -5547,7 +5682,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other" draft="unconfirmed">unse palladín</displayName>
 			</currency>
 			<currency type="XPF">
-				<displayName>Pólinesískur franki</displayName>
+				<displayName>pólinesískur franki</displayName>
 				<displayName count="one">pólinesískur franki</displayName>
 				<displayName count="other">pólinesískir frankar</displayName>
 				<symbol>CFPF</symbol>
@@ -5558,15 +5693,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other" draft="unconfirmed">unse platína</displayName>
 			</currency>
 			<currency type="XXX">
-				<displayName>Óþekktur gjaldmiðill</displayName>
-				<displayName count="one">(óþekktur gjaldmiðill)</displayName>
+				<displayName>óþekktur gjaldmiðill</displayName>
+				<displayName count="one">(óþekkt mynteining gjaldmiðils)</displayName>
 				<displayName count="other">(óþekktur gjaldmiðill)</displayName>
 			</currency>
 			<currency type="YDD">
 				<displayName>Jemenskur denari</displayName>
 			</currency>
 			<currency type="YER">
-				<displayName>Jemenskt ríal</displayName>
+				<displayName>jemenskt ríal</displayName>
 				<displayName count="one">jemenskt ríal</displayName>
 				<displayName count="other">jemensk ríöl</displayName>
 				<symbol>YER</symbol>
@@ -5578,7 +5713,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Rand (viðskipta)</displayName>
 			</currency>
 			<currency type="ZAR">
-				<displayName>Suðurafrískt rand</displayName>
+				<displayName>suðurafrískt rand</displayName>
 				<displayName count="one">suðurafrískt rand</displayName>
 				<displayName count="other">suðurafrísk rönd</displayName>
 				<symbol>ZAR</symbol>
@@ -5587,7 +5722,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Zambian Kwacha (1968–2012)</displayName>
 			</currency>
 			<currency type="ZMW">
-				<displayName>Sambísk kvaka</displayName>
+				<displayName>sambísk kvaka</displayName>
 				<displayName count="one">sambísk kvaka</displayName>
 				<displayName count="other">sambískar kvökur</displayName>
 				<symbol>ZMW</symbol>
@@ -5604,7 +5739,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 	<units>
 		<unitLength type="long">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0} á {1}</compoundUnitPattern>
+				<compoundUnitPattern>{0} á {1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>þyngdarhröðun</displayName>
@@ -5616,6 +5751,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} metri á sekúndu, á sekúndu</unitPattern>
 				<unitPattern count="other">{0} metrar á sekúndu, á sekúndu</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>snúningur</displayName>
+				<unitPattern count="one">{0} snúningur</unitPattern>
+				<unitPattern count="other">{0} snúningar</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>bogaeiningar</displayName>
+				<unitPattern count="one">{0} bogaeining</unitPattern>
+				<unitPattern count="other">{0} bogaeiningar</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>gráður</displayName>
+				<unitPattern count="one">{0} gráða</unitPattern>
+				<unitPattern count="other">{0} gráður</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>bogamínútur</displayName>
 				<unitPattern count="one">{0} bogamínúta</unitPattern>
@@ -5626,30 +5776,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} bogasekúnda</unitPattern>
 				<unitPattern count="other">{0} bogasekúndur</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>gráður</displayName>
-				<unitPattern count="one">{0} gráða</unitPattern>
-				<unitPattern count="other">{0} gráður</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>bogaeiningar</displayName>
-				<unitPattern count="one">{0} bogaeining</unitPattern>
-				<unitPattern count="other">{0} bogaeiningar</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ekrur</displayName>
-				<unitPattern count="one">{0} ekra</unitPattern>
-				<unitPattern count="other">{0} ekrur</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>ferkílómetrar</displayName>
+				<unitPattern count="one">{0} ferkílómetri</unitPattern>
+				<unitPattern count="other">{0} ferkílómetrar</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektarar</displayName>
 				<unitPattern count="one">{0} hektari</unitPattern>
 				<unitPattern count="other">{0} hektarar</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>fermetrar</displayName>
+				<unitPattern count="one">{0} fermetri</unitPattern>
+				<unitPattern count="other">{0} fermetrar</unitPattern>
+				<perUnitPattern>{0} á fermetra</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>fersentimetrar</displayName>
 				<unitPattern count="one">{0} fersentimetri</unitPattern>
 				<unitPattern count="other">{0} fersentimetrar</unitPattern>
+				<perUnitPattern>{0} á fersentimetra</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>fermílur</displayName>
+				<unitPattern count="one">{0} fermíla</unitPattern>
+				<unitPattern count="other">{0} fermílur</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ekrur</displayName>
+				<unitPattern count="one">{0} ekra</unitPattern>
+				<unitPattern count="other">{0} ekrur</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>feryardar</displayName>
+				<unitPattern count="one">{0} feryard</unitPattern>
+				<unitPattern count="other">{0} feryardar</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ferfet</displayName>
@@ -5660,91 +5822,101 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>fertommur</displayName>
 				<unitPattern count="one">{0} fertomma</unitPattern>
 				<unitPattern count="other">{0} fertommur</unitPattern>
+				<perUnitPattern>{0} á fertommu</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>ferkílómetrar</displayName>
-				<unitPattern count="one">{0} ferkílómetri</unitPattern>
-				<unitPattern count="other">{0} ferkílómetrar</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>fermetrar</displayName>
-				<unitPattern count="one">{0} fermetri</unitPattern>
-				<unitPattern count="other">{0} fermetrar</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>fermílur</displayName>
-				<unitPattern count="one">{0} fermíla</unitPattern>
-				<unitPattern count="other">{0} fermílur</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>feryardar</displayName>
-				<unitPattern count="one">{0} feryard</unitPattern>
-				<unitPattern count="other">{0} feryardar</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karöt</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="other">{0} karöt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>lítrar á kílómetra</displayName>
 				<unitPattern count="one">{0} lítri á kílómetra</unitPattern>
 				<unitPattern count="other">{0} lítrar á kílómetra</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>lítrar á 100 kílómetra</displayName>
+				<unitPattern count="one">{0} lítri á 100 kílómetra</unitPattern>
+				<unitPattern count="other">{0} lítrar á 100 kílómetra</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mílur á gallon</displayName>
 				<unitPattern count="one">{0} míla á gallon</unitPattern>
 				<unitPattern count="other">{0} mílur á gallon</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bitar</displayName>
-				<unitPattern count="one">{0} biti</unitPattern>
-				<unitPattern count="other">{0} bitar</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bæti</displayName>
-				<unitPattern count="one">{0} bæti</unitPattern>
-				<unitPattern count="other">{0} bæti</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gígabitar</displayName>
-				<unitPattern count="one">{0} gígabiti</unitPattern>
-				<unitPattern count="other">{0} gígabitar</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gígabæti</displayName>
-				<unitPattern count="one">{0} gígabæti</unitPattern>
-				<unitPattern count="other">{0} gígabæti</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kílóbitar</displayName>
-				<unitPattern count="one">{0} kílóbiti</unitPattern>
-				<unitPattern count="other">{0} kílóbitar</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kílóbæti</displayName>
-				<unitPattern count="one">{0} kílóbæti</unitPattern>
-				<unitPattern count="other">{0} kílóbæti</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabitar</displayName>
-				<unitPattern count="one">{0} megabiti</unitPattern>
-				<unitPattern count="other">{0} megabitar</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabæti</displayName>
-				<unitPattern count="one">{0} megabæti</unitPattern>
-				<unitPattern count="other">{0} megabæti</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabitar</displayName>
-				<unitPattern count="one">{0} terabiti</unitPattern>
-				<unitPattern count="other">{0} terabitar</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabæti</displayName>
 				<unitPattern count="one">{0} terabæti</unitPattern>
 				<unitPattern count="other">{0} terabæti</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabitar</displayName>
+				<unitPattern count="one">{0} terabiti</unitPattern>
+				<unitPattern count="other">{0} terabitar</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gígabæti</displayName>
+				<unitPattern count="one">{0} gígabæti</unitPattern>
+				<unitPattern count="other">{0} gígabæti</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gígabitar</displayName>
+				<unitPattern count="one">{0} gígabiti</unitPattern>
+				<unitPattern count="other">{0} gígabitar</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabæti</displayName>
+				<unitPattern count="one">{0} megabæti</unitPattern>
+				<unitPattern count="other">{0} megabæti</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabitar</displayName>
+				<unitPattern count="one">{0} megabiti</unitPattern>
+				<unitPattern count="other">{0} megabitar</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kílóbæti</displayName>
+				<unitPattern count="one">{0} kílóbæti</unitPattern>
+				<unitPattern count="other">{0} kílóbæti</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kílóbitar</displayName>
+				<unitPattern count="one">{0} kílóbiti</unitPattern>
+				<unitPattern count="other">{0} kílóbitar</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bæti</displayName>
+				<unitPattern count="one">{0} bæti</unitPattern>
+				<unitPattern count="other">{0} bæti</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bitar</displayName>
+				<unitPattern count="one">{0} biti</unitPattern>
+				<unitPattern count="other">{0} bitar</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ár</displayName>
+				<unitPattern count="one">{0} ár</unitPattern>
+				<unitPattern count="other">{0} ár</unitPattern>
+				<perUnitPattern>{0} á ári</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mánuðir</displayName>
+				<unitPattern count="one">{0} mánuður</unitPattern>
+				<unitPattern count="other">{0} mánuðir</unitPattern>
+				<perUnitPattern>{0} á mánuði</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>vikur</displayName>
+				<unitPattern count="one">{0} vika</unitPattern>
+				<unitPattern count="other">{0} vikur</unitPattern>
+				<perUnitPattern>{0} á viku</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>dagar</displayName>
 				<unitPattern count="one">{0} dagur</unitPattern>
 				<unitPattern count="other">{0} dagar</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} á dagur</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>klukkustundir</displayName>
@@ -5752,30 +5924,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} klukkustundir</unitPattern>
 				<perUnitPattern>{0} á klst.</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>míkrósekúndur</displayName>
-				<unitPattern count="one">{0} míkrósekúnda</unitPattern>
-				<unitPattern count="other">{0} míkrósekúndur</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>millisekúndur</displayName>
-				<unitPattern count="one">{0} millisekúnda</unitPattern>
-				<unitPattern count="other">{0} millisekúndur</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>mínútur</displayName>
 				<unitPattern count="one">{0} mínúta</unitPattern>
 				<unitPattern count="other">{0} mínútur</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>mánuðir</displayName>
-				<unitPattern count="one">{0} mánuður</unitPattern>
-				<unitPattern count="other">{0} mánuðir</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanósekúndur</displayName>
-				<unitPattern count="one">{0} nanósekúnda</unitPattern>
-				<unitPattern count="other">{0} nanósekúndur</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} á mínúta</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sekúndur</displayName>
@@ -5783,15 +5936,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} sekúndur</unitPattern>
 				<perUnitPattern>{0} á sekúndu</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>vikur</displayName>
-				<unitPattern count="one">{0} vika</unitPattern>
-				<unitPattern count="other">{0} vikur</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>millisekúndur</displayName>
+				<unitPattern count="one">{0} millisekúnda</unitPattern>
+				<unitPattern count="other">{0} millisekúndur</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>ár</displayName>
-				<unitPattern count="one">{0} ár</unitPattern>
-				<unitPattern count="other">{0} ár</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>míkrósekúndur</displayName>
+				<unitPattern count="one">{0} míkrósekúnda</unitPattern>
+				<unitPattern count="other">{0} míkrósekúndur</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanósekúndur</displayName>
+				<unitPattern count="one">{0} nanósekúnda</unitPattern>
+				<unitPattern count="other">{0} nanósekúndur</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amper</displayName>
@@ -5813,6 +5971,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} volt</unitPattern>
 				<unitPattern count="other">{0} volt</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kílókaloríur</displayName>
+				<unitPattern count="one">{0} kílókaloría</unitPattern>
+				<unitPattern count="other">{0} kílókaloríur</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kaloríur</displayName>
 				<unitPattern count="one">{0} kaloría</unitPattern>
@@ -5823,21 +5986,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} hitaeining</unitPattern>
 				<unitPattern count="other">{0} hitaeiningar</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>júl</displayName>
-				<unitPattern count="one">{0} júl</unitPattern>
-				<unitPattern count="other">{0} júl</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kílókaloríur</displayName>
-				<unitPattern count="one">{0} kílókaloría</unitPattern>
-				<unitPattern count="other">{0} kílókaloríur</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kílójúl</displayName>
 				<unitPattern count="one">{0} kílójúl</unitPattern>
 				<unitPattern count="other">{0} kílójúl</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>júl</displayName>
+				<unitPattern count="one">{0} júl</unitPattern>
+				<unitPattern count="other">{0} júl</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kílóvattstundir</displayName>
 				<unitPattern count="one">{0} kílóvattstund</unitPattern>
@@ -5848,201 +6006,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} gígahertz</unitPattern>
 				<unitPattern count="other">{0} gígahertz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hertz</displayName>
-				<unitPattern count="one">{0} hertz</unitPattern>
-				<unitPattern count="other">{0} hertz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megahertz</displayName>
+				<unitPattern count="one">{0} megahertz</unitPattern>
+				<unitPattern count="other">{0} megahertz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kílóhertz</displayName>
 				<unitPattern count="one">{0} kílóhertz</unitPattern>
 				<unitPattern count="other">{0} kílóhertz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megahertz</displayName>
-				<unitPattern count="one">{0} megahertz</unitPattern>
-				<unitPattern count="other">{0} megahertz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hertz</displayName>
+				<unitPattern count="one">{0} hertz</unitPattern>
+				<unitPattern count="other">{0} hertz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>stjarnfræðieiningar</displayName>
-				<unitPattern count="one">{0} stjarnfræðieining</unitPattern>
-				<unitPattern count="other">{0} stjarnfræðieiningar</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kílómetrar</displayName>
+				<unitPattern count="one">{0} kílómetri</unitPattern>
+				<unitPattern count="other">{0} kílómetrar</unitPattern>
+				<perUnitPattern>{0} á kílómetra</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>sentimetrar</displayName>
-				<unitPattern count="one">{0} sentimetri</unitPattern>
-				<unitPattern count="other">{0} sentimetrar</unitPattern>
+			<unit type="length-meter">
+				<displayName>metrar</displayName>
+				<unitPattern count="one">{0} metri</unitPattern>
+				<unitPattern count="other">{0} metrar</unitPattern>
+				<perUnitPattern>{0} á metra</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>desimetrar</displayName>
 				<unitPattern count="one">{0} desimetri</unitPattern>
 				<unitPattern count="other">{0} desimetrar</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>fet</displayName>
-				<unitPattern count="one">{0} fet</unitPattern>
-				<unitPattern count="other">{0} fet</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>tommur</displayName>
-				<unitPattern count="one">{0} tomma</unitPattern>
-				<unitPattern count="other">{0} tommur</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kílómetrar</displayName>
-				<unitPattern count="one">{0} kílómetri</unitPattern>
-				<unitPattern count="other">{0} kílómetrar</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ljósár</displayName>
-				<unitPattern count="one">{0} ljósár</unitPattern>
-				<unitPattern count="other">{0} ljósár</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metrar</displayName>
-				<unitPattern count="one">{0} metri</unitPattern>
-				<unitPattern count="other">{0} metrar</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>míkrómetrar</displayName>
-				<unitPattern count="one">{0} míkrómetri</unitPattern>
-				<unitPattern count="other">{0} míkrómetrar</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mílur</displayName>
-				<unitPattern count="one">{0} míla</unitPattern>
-				<unitPattern count="other">{0} mílur</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>sentimetrar</displayName>
+				<unitPattern count="one">{0} sentimetri</unitPattern>
+				<unitPattern count="other">{0} sentimetrar</unitPattern>
+				<perUnitPattern>{0} á sentimetra</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>millimetrar</displayName>
 				<unitPattern count="one">{0} millimetri</unitPattern>
 				<unitPattern count="other">{0} millimetrar</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>míkrómetrar</displayName>
+				<unitPattern count="one">{0} míkrómetri</unitPattern>
+				<unitPattern count="other">{0} míkrómetrar</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanómetrar</displayName>
 				<unitPattern count="one">{0} nanómetri</unitPattern>
 				<unitPattern count="other">{0} nanómetrar</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>sjómílur</displayName>
-				<unitPattern count="one">{0} sjómíla</unitPattern>
-				<unitPattern count="other">{0} sjómílur</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsek</displayName>
-				<unitPattern count="one">{0} parsek</unitPattern>
-				<unitPattern count="other">{0} parsek</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>píkómetrar</displayName>
 				<unitPattern count="one">{0} píkómetri</unitPattern>
 				<unitPattern count="other">{0} píkómetrar</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mílur</displayName>
+				<unitPattern count="one">{0} míla</unitPattern>
+				<unitPattern count="other">{0} mílur</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yardar</displayName>
 				<unitPattern count="one">{0} yard</unitPattern>
 				<unitPattern count="other">{0} yardar</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>fet</displayName>
+				<unitPattern count="one">{0} fet</unitPattern>
+				<unitPattern count="other">{0} fet</unitPattern>
+				<perUnitPattern>{0} á fet</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>tommur</displayName>
+				<unitPattern count="one">{0} tomma</unitPattern>
+				<unitPattern count="other">{0} tommur</unitPattern>
+				<perUnitPattern>{0} á tommu</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsek</displayName>
+				<unitPattern count="one">{0} parsek</unitPattern>
+				<unitPattern count="other">{0} parsek</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ljósár</displayName>
+				<unitPattern count="one">{0} ljósár</unitPattern>
+				<unitPattern count="other">{0} ljósár</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>stjarnfræðieiningar</displayName>
+				<unitPattern count="one">{0} stjarnfræðieining</unitPattern>
+				<unitPattern count="other">{0} stjarnfræðieiningar</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>sjómílur</displayName>
+				<unitPattern count="one">{0} sjómíla</unitPattern>
+				<unitPattern count="other">{0} sjómílur</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>sænsk míla</displayName>
+				<unitPattern count="one">{0} sænsk míla</unitPattern>
+				<unitPattern count="other">{0} sænskar mílur</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lúx</displayName>
 				<unitPattern count="one">{0} lúx</unitPattern>
 				<unitPattern count="other">{0} lúx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karöt</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="other">{0} karöt</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>grömm</displayName>
-				<unitPattern count="one">{0} gramm</unitPattern>
-				<unitPattern count="other">{0} grömm</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kílógrömm</displayName>
-				<unitPattern count="one">{0} kílógramm</unitPattern>
-				<unitPattern count="other">{0} kílógrömm</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>tonn</displayName>
 				<unitPattern count="one">{0} tonn</unitPattern>
 				<unitPattern count="other">{0} tonn</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>míkrógrömm</displayName>
-				<unitPattern count="one">{0} míkrógramm</unitPattern>
-				<unitPattern count="other">{0} míkrógrömm</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kílógrömm</displayName>
+				<unitPattern count="one">{0} kílógramm</unitPattern>
+				<unitPattern count="other">{0} kílógrömm</unitPattern>
+				<perUnitPattern>{0} á kílógramm</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>grömm</displayName>
+				<unitPattern count="one">{0} gramm</unitPattern>
+				<unitPattern count="other">{0} grömm</unitPattern>
+				<perUnitPattern>{0} á gramm</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>milligrömm</displayName>
 				<unitPattern count="one">{0} milligramm</unitPattern>
 				<unitPattern count="other">{0} milligrömm</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>únsur</displayName>
-				<unitPattern count="one">{0} únsa</unitPattern>
-				<unitPattern count="other">{0} únsur</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>troyesúnsur</displayName>
-				<unitPattern count="one">{0} troyesúnsa</unitPattern>
-				<unitPattern count="other">{0} troyesúnsur</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>pund</displayName>
-				<unitPattern count="one">{0} pund</unitPattern>
-				<unitPattern count="other">{0} pund</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>míkrógrömm</displayName>
+				<unitPattern count="one">{0} míkrógramm</unitPattern>
+				<unitPattern count="other">{0} míkrógrömm</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>bandarískt tonn</displayName>
 				<unitPattern count="one">{0} bandarískt tonn</unitPattern>
 				<unitPattern count="other">{0} bandarísk tonn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>pund</displayName>
+				<unitPattern count="one">{0} pund</unitPattern>
+				<unitPattern count="other">{0} pund</unitPattern>
+				<perUnitPattern>{0} á pund</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>únsur</displayName>
+				<unitPattern count="one">{0} únsa</unitPattern>
+				<unitPattern count="other">{0} únsur</unitPattern>
+				<perUnitPattern>{0} á únsu</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>troyesúnsur</displayName>
+				<unitPattern count="one">{0} troyesúnsa</unitPattern>
+				<unitPattern count="other">{0} troyesúnsur</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karöt</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="other">{0} karöt</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gígavött</displayName>
 				<unitPattern count="one">{0} gígavatt</unitPattern>
 				<unitPattern count="other">{0} gígavött</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hestöfl</displayName>
-				<unitPattern count="one">{0} hestafl</unitPattern>
-				<unitPattern count="other">{0} hestöfl</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kílóvött</displayName>
-				<unitPattern count="one">{0} kílóvatt</unitPattern>
-				<unitPattern count="other">{0} kílóvött</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>megavött</displayName>
 				<unitPattern count="one">{0} megavatt</unitPattern>
 				<unitPattern count="other">{0} megavött</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>millivött</displayName>
-				<unitPattern count="one">{0} millivatt</unitPattern>
-				<unitPattern count="other">{0} millivött</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kílóvött</displayName>
+				<unitPattern count="one">{0} kílóvatt</unitPattern>
+				<unitPattern count="other">{0} kílóvött</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>vött</displayName>
 				<unitPattern count="one">{0} vatt</unitPattern>
 				<unitPattern count="other">{0} vött</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>millivött</displayName>
+				<unitPattern count="one">{0} millivatt</unitPattern>
+				<unitPattern count="other">{0} millivött</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hestöfl</displayName>
+				<unitPattern count="one">{0} hestafl</unitPattern>
+				<unitPattern count="other">{0} hestöfl</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hektópasköl</displayName>
 				<unitPattern count="one">{0} hektópaskal</unitPattern>
 				<unitPattern count="other">{0} hektópasköl</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>tommur af kvikvasilfri</displayName>
-				<unitPattern count="one">{0} tomma af kvikasilfri</unitPattern>
-				<unitPattern count="other">{0} tommur af kvikvasilfri</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>millibör</displayName>
-				<unitPattern count="one">{0} millibar</unitPattern>
-				<unitPattern count="other">{0} millibör</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>millimetrar af kvikasilfri</displayName>
 				<unitPattern count="one">{0} millimetrar af kvikasilfri</unitPattern>
@@ -6053,10 +6215,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} pund á fertommu</unitPattern>
 				<unitPattern count="other">{0} pund á fertommu</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karöt</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="other">{0} karöt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>tommur af kvikvasilfri</displayName>
+				<unitPattern count="one">{0} tomma af kvikasilfri</unitPattern>
+				<unitPattern count="other">{0} tommur af kvikvasilfri</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>millibör</displayName>
+				<unitPattern count="one">{0} millibar</unitPattern>
+				<unitPattern count="other">{0} millibör</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kílómetrar á klukkustund</displayName>
@@ -6073,6 +6240,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} míla á klukkustund</unitPattern>
 				<unitPattern count="other">{0} mílur á klukkustund</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>hnútur</displayName>
+				<unitPattern count="one">{0} hútur</unitPattern>
+				<unitPattern count="other">{0} hnútar</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>gráður á Celsíus</displayName>
 				<unitPattern count="one">{0} gráða á Celsíus</unitPattern>
@@ -6088,31 +6265,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kelvin</unitPattern>
 				<unitPattern count="other">{0} kelvin</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ekrufet</displayName>
-				<unitPattern count="one">{0} ekrufet</unitPattern>
-				<unitPattern count="other">{0} ekrufet</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>sentilítrar</displayName>
-				<unitPattern count="one">{0} sentilítri</unitPattern>
-				<unitPattern count="other">{0} sentilítrar</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>rúmsentimetrar</displayName>
-				<unitPattern count="one">{0} rúmsentimetri</unitPattern>
-				<unitPattern count="other">{0} rúmsentimetrar</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>rúmfet</displayName>
-				<unitPattern count="one">{0} rúmfet</unitPattern>
-				<unitPattern count="other">{0} rúmfet</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>rúmtommur</displayName>
-				<unitPattern count="one">{0} rúmtomma</unitPattern>
-				<unitPattern count="other">{0} rúmtommur</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>rúmkílómetrar</displayName>
 				<unitPattern count="one">{0} rúmkílómetri</unitPattern>
@@ -6122,6 +6274,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>rúmmetrar</displayName>
 				<unitPattern count="one">{0} rúmmetri</unitPattern>
 				<unitPattern count="other">{0} rúmmetrar</unitPattern>
+				<perUnitPattern>{0} á rúmmetra</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>rúmsentimetrar</displayName>
+				<unitPattern count="one">{0} rúmsentimetri</unitPattern>
+				<unitPattern count="other">{0} rúmsentimetrar</unitPattern>
+				<perUnitPattern>{0} á rúmsentimetra</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>rúmmílur</displayName>
@@ -6133,25 +6292,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} rúmyard</unitPattern>
 				<unitPattern count="other">{0} rúmyardar</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>bollar</displayName>
-				<unitPattern count="one">{0} bolli</unitPattern>
-				<unitPattern count="other">{0} bollar</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>rúmfet</displayName>
+				<unitPattern count="one">{0} rúmfet</unitPattern>
+				<unitPattern count="other">{0} rúmfet</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>desilítrar</displayName>
-				<unitPattern count="one">{0} desilítri</unitPattern>
-				<unitPattern count="other">{0} desilítrar</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>rúmtommur</displayName>
+				<unitPattern count="one">{0} rúmtomma</unitPattern>
+				<unitPattern count="other">{0} rúmtommur</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>vökvaúnsur</displayName>
-				<unitPattern count="one">{0} vökvaúnsa</unitPattern>
-				<unitPattern count="other">{0} vökvaúnsur</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gallon</displayName>
-				<unitPattern count="one">{0} gallon</unitPattern>
-				<unitPattern count="other">{0} gallon</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megalítrar</displayName>
+				<unitPattern count="one">{0} megalítri</unitPattern>
+				<unitPattern count="other">{0} megalítrar</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hektólítrar</displayName>
@@ -6162,27 +6316,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>lítrar</displayName>
 				<unitPattern count="one">{0} lítri</unitPattern>
 				<unitPattern count="other">{0} lítrar</unitPattern>
+				<perUnitPattern>{0} á lítra</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalítrar</displayName>
-				<unitPattern count="one">{0} megalítri</unitPattern>
-				<unitPattern count="other">{0} megalítrar</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>desilítrar</displayName>
+				<unitPattern count="one">{0} desilítri</unitPattern>
+				<unitPattern count="other">{0} desilítrar</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>sentilítrar</displayName>
+				<unitPattern count="one">{0} sentilítri</unitPattern>
+				<unitPattern count="other">{0} sentilítrar</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>millilítrar</displayName>
 				<unitPattern count="one">{0} millilítri</unitPattern>
 				<unitPattern count="other">{0} millilítrar</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>hálfpottar</displayName>
-				<unitPattern count="one">{0} hálfpottur</unitPattern>
-				<unitPattern count="other">{0} hálfpottar</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>ástralskir bollar</displayName>
+				<unitPattern count="one">{0} ástralskur bolli</unitPattern>
+				<unitPattern count="other">{0} ástralskir bollar</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ekrufet</displayName>
+				<unitPattern count="one">{0} ekrufet</unitPattern>
+				<unitPattern count="other">{0} ekrufet</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gallon</displayName>
+				<unitPattern count="one">{0} gallon</unitPattern>
+				<unitPattern count="other">{0} gallon</unitPattern>
+				<perUnitPattern>{0} á gallon</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>kvartar</displayName>
 				<unitPattern count="one">{0} kvart</unitPattern>
 				<unitPattern count="other">{0} kvartar</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>hálfpottar</displayName>
+				<unitPattern count="one">{0} hálfpottur</unitPattern>
+				<unitPattern count="other">{0} hálfpottar</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>bollar</displayName>
+				<unitPattern count="one">{0} bolli</unitPattern>
+				<unitPattern count="other">{0} bollar</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>vökvaúnsur</displayName>
+				<unitPattern count="one">{0} vökvaúnsa</unitPattern>
+				<unitPattern count="other">{0} vökvaúnsur</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>matskeiðar</displayName>
 				<unitPattern count="one">{0} matskeið</unitPattern>
@@ -6193,10 +6384,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} teskeið</unitPattern>
 				<unitPattern count="other">{0} teskeiðar</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} austur</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} norður</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} suður</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}V</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>g-hröðun</displayName>
@@ -6208,6 +6405,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>sn.</displayName>
+				<unitPattern count="one">{0} sn.</unitPattern>
+				<unitPattern count="other">{0} sn.</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>gráður</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>bogamín.</displayName>
 				<unitPattern count="one">{0} bogamín.</unitPattern>
@@ -6218,30 +6430,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} bogasek.</unitPattern>
 				<unitPattern count="other">{0} bogasek.</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>gráður</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ekrur</displayName>
-				<unitPattern count="one">{0} ek.</unitPattern>
-				<unitPattern count="other">{0} ek.</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektarar</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>fermetrar</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>fermílur</displayName>
+				<unitPattern count="one">{0} fermíla</unitPattern>
+				<unitPattern count="other">{0} fermílur</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ekrur</displayName>
+				<unitPattern count="one">{0} ek.</unitPattern>
+				<unitPattern count="other">{0} ek.</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yardar²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ferfet</displayName>
@@ -6252,91 +6476,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>tommur²</displayName>
 				<unitPattern count="one">{0} t²</unitPattern>
 				<unitPattern count="other">{0} t²</unitPattern>
+				<perUnitPattern>{0}/t²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>fermetrar</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>fermílur</displayName>
-				<unitPattern count="one">{0} fermíla</unitPattern>
-				<unitPattern count="other">{0} fermílur</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yardar²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>lítrar/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
 				<unitPattern count="other">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mílur/gallon</displayName>
 				<unitPattern count="one">{0} mí./gal.</unitPattern>
 				<unitPattern count="other">{0} mí./gal.</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>biti</displayName>
-				<unitPattern count="one">{0} biti</unitPattern>
-				<unitPattern count="other">{0} bitar</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bæti</displayName>
-				<unitPattern count="one">{0} bæti</unitPattern>
-				<unitPattern count="other">{0} bæti</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bæti</displayName>
+				<unitPattern count="one">{0} bæti</unitPattern>
+				<unitPattern count="other">{0} bæti</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>biti</displayName>
+				<unitPattern count="one">{0} biti</unitPattern>
+				<unitPattern count="other">{0} bitar</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="unconfirmed">árh</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} árh</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} árh</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ár</displayName>
+				<unitPattern count="one">{0} ár</unitPattern>
+				<unitPattern count="other">{0} ár</unitPattern>
+				<perUnitPattern>{0}/ári</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mánuðir</displayName>
+				<unitPattern count="one">{0} mán.</unitPattern>
+				<unitPattern count="other">{0} mán.</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>vikur</displayName>
+				<unitPattern count="one">{0} vika</unitPattern>
+				<unitPattern count="other">{0} vikur</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/v</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>dagar</displayName>
 				<unitPattern count="one">{0} dagur</unitPattern>
 				<unitPattern count="other">{0} dagar</unitPattern>
+				<perUnitPattern>{0}/d.</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>klukkustundir</displayName>
@@ -6344,30 +6583,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} klst.</unitPattern>
 				<perUnitPattern>{0}/klst.</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μsek.</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>millisek.</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>mín.</displayName>
 				<unitPattern count="one">{0} mín.</unitPattern>
 				<unitPattern count="other">{0} mín.</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>mánuðir</displayName>
-				<unitPattern count="one">{0} mán.</unitPattern>
-				<unitPattern count="other">{0} mán.</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanósek.</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sek.</displayName>
@@ -6375,15 +6595,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} sek.</unitPattern>
 				<perUnitPattern>{0}/sek.</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>vikur</displayName>
-				<unitPattern count="one">{0} vika</unitPattern>
-				<unitPattern count="other">{0} vikur</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>millisek.</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>ár</displayName>
-				<unitPattern count="one">{0} ár</unitPattern>
-				<unitPattern count="other">{0} ár</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μsek.</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanósek.</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>A</displayName>
@@ -6405,6 +6630,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -6415,21 +6645,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kal</unitPattern>
 				<unitPattern count="other">{0} kal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>júl</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kílójúl</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>júl</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -6440,201 +6665,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>se</displayName>
-				<unitPattern count="one">{0} se</unitPattern>
-				<unitPattern count="other">{0} se</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>metrar</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>fet</displayName>
-				<unitPattern count="one">{0} fet</unitPattern>
-				<unitPattern count="other">{0} fet</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>tommur</displayName>
-				<unitPattern count="one">{0} t.</unitPattern>
-				<unitPattern count="other">{0} t.</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ljósár</displayName>
-				<unitPattern count="one">{0} ljósár</unitPattern>
-				<unitPattern count="other">{0} ljósár</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metrar</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µmetrar</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mílur</displayName>
-				<unitPattern count="one">{0} mí</unitPattern>
-				<unitPattern count="other">{0} mí</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="one">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µmetrar</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>sml</displayName>
-				<unitPattern count="one">{0} sml</unitPattern>
-				<unitPattern count="other">{0} sml</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsek</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mílur</displayName>
+				<unitPattern count="one">{0} mí</unitPattern>
+				<unitPattern count="other">{0} mí</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yardar</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>fet</displayName>
+				<unitPattern count="one">{0} fet</unitPattern>
+				<unitPattern count="other">{0} fet</unitPattern>
+				<perUnitPattern>{0}/fet</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>tommur</displayName>
+				<unitPattern count="one">{0} t.</unitPattern>
+				<unitPattern count="other">{0} t.</unitPattern>
+				<perUnitPattern>{0}/t.</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsek</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ljósár</displayName>
+				<unitPattern count="one">{0} ljósár</unitPattern>
+				<unitPattern count="other">{0} ljósár</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>se</displayName>
+				<unitPattern count="one">{0} se</unitPattern>
+				<unitPattern count="other">{0} se</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>sml</displayName>
+				<unitPattern count="one">{0} sml</unitPattern>
+				<unitPattern count="other">{0} sml</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>sæ. míl.</displayName>
+				<unitPattern count="one">{0} sæ. míl.</unitPattern>
+				<unitPattern count="other">{0} sæ. míl.</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lúx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karöt</displayName>
-				<unitPattern count="one">{0} kt.</unitPattern>
-				<unitPattern count="other">{0} kt.</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>grömm</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="mass-metric-ton">
+				<displayName>tn</displayName>
+				<unitPattern count="one">{0} tn</unitPattern>
+				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="one">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
 			</unit>
-			<unit type="mass-metric-ton">
-				<displayName>tonn</displayName>
-				<unitPattern count="one">{0} tn</unitPattern>
-				<unitPattern count="other">{0} tn</unitPattern>
-			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-gram">
+				<displayName>grömm</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>únsur</displayName>
-				<unitPattern count="one">{0} únsa</unitPattern>
-				<unitPattern count="other">{0} únsur</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>troyesoz</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>pund</displayName>
-				<unitPattern count="one">{0} p.</unitPattern>
-				<unitPattern count="other">{0} p.</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>BNA tonn</displayName>
 				<unitPattern count="one">{0} BNA tn</unitPattern>
 				<unitPattern count="other">{0} BNA tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>pund</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>únsur</displayName>
+				<unitPattern count="one">{0} únsa</unitPattern>
+				<unitPattern count="other">{0} únsur</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>troyesoz</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karöt</displayName>
+				<unitPattern count="one">{0} kt.</unitPattern>
+				<unitPattern count="other">{0} kt.</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hö</displayName>
-				<unitPattern count="one">{0} hö</unitPattern>
-				<unitPattern count="other">{0} hö</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>vött</displayName>
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hö</displayName>
+				<unitPattern count="one">{0} hö</unitPattern>
+				<unitPattern count="other">{0} hö</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbör</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -6645,10 +6874,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbör</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kílómetrar á klukkustund</displayName>
@@ -6665,6 +6899,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} míla/klst.</unitPattern>
 				<unitPattern count="other">{0} mílur/klst.</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>gráður á Celsíus</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -6680,20 +6924,32 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ekrufet</displayName>
-				<unitPattern count="one">{0} ekrufet</unitPattern>
-				<unitPattern count="other">{0} ekrufet</unitPattern>
+			<unit type="volume-cubic-kilometer">
+				<displayName>km³</displayName>
+				<unitPattern count="one">{0} km³</unitPattern>
+				<unitPattern count="other">{0} km³</unitPattern>
 			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
+			<unit type="volume-cubic-meter">
+				<displayName>m³</displayName>
+				<unitPattern count="one">{0} m³</unitPattern>
+				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-centimeter">
 				<displayName>cm³</displayName>
 				<unitPattern count="one">{0} cm³</unitPattern>
 				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>mí³</displayName>
+				<unitPattern count="one">{0} mí³</unitPattern>
+				<unitPattern count="other">{0} mí³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>yardar³</displayName>
+				<unitPattern count="one">{0} yd³</unitPattern>
+				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-foot">
 				<displayName>fet³</displayName>
@@ -6705,45 +6961,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} t³</unitPattern>
 				<unitPattern count="other">{0} t³</unitPattern>
 			</unit>
-			<unit type="volume-cubic-kilometer">
-				<displayName>km³</displayName>
-				<unitPattern count="one">{0} km³</unitPattern>
-				<unitPattern count="other">{0} km³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-meter">
-				<displayName>m³</displayName>
-				<unitPattern count="one">{0} m³</unitPattern>
-				<unitPattern count="other">{0} m³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<displayName>mí³</displayName>
-				<unitPattern count="one">{0} rúmmíla</unitPattern>
-				<unitPattern count="other">{0} rúmmílur</unitPattern>
-			</unit>
-			<unit type="volume-cubic-yard">
-				<displayName>yardar³</displayName>
-				<unitPattern count="one">{0} yd³</unitPattern>
-				<unitPattern count="other">{0} yd³</unitPattern>
-			</unit>
-			<unit type="volume-cup">
-				<displayName>bollar</displayName>
-				<unitPattern count="one">{0} bolli</unitPattern>
-				<unitPattern count="other">{0} bollar</unitPattern>
-			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
-			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -6754,27 +6975,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>lítrar</displayName>
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="one">{0} Ml</unitPattern>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
 				<unitPattern count="one">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>hálfp.</displayName>
-				<unitPattern count="one">{0} hálfp.</unitPattern>
-				<unitPattern count="other">{0} hálfp.</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>ástr. bolli</displayName>
+				<unitPattern count="one">{0} ástr. bolli</unitPattern>
+				<unitPattern count="other">{0} ástr. bollar</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ekrufet</displayName>
+				<unitPattern count="one">{0} ekrufet</unitPattern>
+				<unitPattern count="other">{0} ekrufet</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qts</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>hálfp.</displayName>
+				<unitPattern count="one">{0} hálfp.</unitPattern>
+				<unitPattern count="other">{0} hálfp.</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>bollar</displayName>
+				<unitPattern count="one">{0} bolli</unitPattern>
+				<unitPattern count="other">{0} bollar</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>msk</displayName>
 				<unitPattern count="one">{0} msk</unitPattern>
@@ -6785,15 +7043,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} tsk</unitPattern>
 				<unitPattern count="other">{0} tsk</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} A</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} V</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<unitPattern count="one" draft="contributed">{0}G</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one" draft="unconfirmed">{0}′</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}′</unitPattern>
@@ -6802,104 +7070,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}″</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} ek.</unitPattern>
-				<unitPattern count="other">{0} ek.</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one" draft="contributed">{0} ha</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one" draft="contributed">{0} ferfet</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ferfet</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one" draft="contributed">{0} m²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} m²</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/m²</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<perUnitPattern draft="unconfirmed">{0}/cm²</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
 				<unitPattern count="one">{0}mí²</unitPattern>
 				<unitPattern count="other">{0}mí²</unitPattern>
 			</unit>
-			<unit type="duration-day">
-				<displayName>dagur</displayName>
-				<unitPattern count="one">{0} d.</unitPattern>
-				<unitPattern count="other">{0} d.</unitPattern>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} ek.</unitPattern>
+				<unitPattern count="other">{0} ek.</unitPattern>
 			</unit>
-			<unit type="duration-hour">
-				<displayName>klukkustund</displayName>
-				<unitPattern count="one">{0} klst.</unitPattern>
-				<unitPattern count="other">{0} klst.</unitPattern>
+			<unit type="area-square-foot">
+				<unitPattern count="one" draft="contributed">{0} ferfet</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ferfet</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>millisek.</displayName>
-				<unitPattern count="one">{0}ms</unitPattern>
-				<unitPattern count="other">{0}ms</unitPattern>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100km</displayName>
+				<unitPattern count="one">{0}l/100km</unitPattern>
+				<unitPattern count="other">{0}l/100km</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>mín.</displayName>
-				<unitPattern count="one">{0} mín.</unitPattern>
-				<unitPattern count="other">{0} mín.</unitPattern>
+			<unit type="duration-century">
+				<displayName draft="unconfirmed">árh</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}árh</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}árh</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ár</displayName>
+				<unitPattern count="one">{0}á</unitPattern>
+				<unitPattern count="other">{0}á</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/ár</perUnitPattern>
 			</unit>
 			<unit type="duration-month">
 				<displayName>mánuður</displayName>
 				<unitPattern count="one">{0} mán.</unitPattern>
 				<unitPattern count="other">{0} mán.</unitPattern>
 			</unit>
+			<unit type="duration-week">
+				<displayName>vika</displayName>
+				<unitPattern count="one">{0} v.</unitPattern>
+				<unitPattern count="other">{0} v.</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/v</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>dagur</displayName>
+				<unitPattern count="one">{0} d.</unitPattern>
+				<unitPattern count="other">{0} d.</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/d.</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>klukkustund</displayName>
+				<unitPattern count="one">{0} klst.</unitPattern>
+				<unitPattern count="other">{0} klst.</unitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>mín.</displayName>
+				<unitPattern count="one">{0} mín.</unitPattern>
+				<unitPattern count="other">{0} mín.</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/min</perUnitPattern>
+			</unit>
 			<unit type="duration-second">
 				<displayName>sek.</displayName>
 				<unitPattern count="one">{0} sek.</unitPattern>
 				<unitPattern count="other">{0} sek.</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>vika</displayName>
-				<unitPattern count="one">{0} v.</unitPattern>
-				<unitPattern count="other">{0} v.</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>ár</displayName>
-				<unitPattern count="one">{0}á</unitPattern>
-				<unitPattern count="other">{0}á</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one" draft="contributed">{0} fet</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fet</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one" draft="contributed">{0}″</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>millisek.</displayName>
+				<unitPattern count="one">{0}ms</unitPattern>
+				<unitPattern count="other">{0}ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
 				<unitPattern count="one">{0} km</unitPattern>
 				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one" draft="contributed">{0} lj.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} lj.</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/km</perUnitPattern>
 			</unit>
 			<unit type="length-meter">
 				<displayName>metri</displayName>
 				<unitPattern count="one">{0}m</unitPattern>
 				<unitPattern count="other">{0}m</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/m</perUnitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} mí</unitPattern>
-				<unitPattern count="other">{0} mí</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0}cm</unitPattern>
+				<unitPattern count="other">{0}cm</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -6910,37 +7179,55 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} pm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} mí</unitPattern>
+				<unitPattern count="other">{0} mí</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one" draft="contributed">{0} fet</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fet</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one" draft="contributed">{0}″</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/tom</perUnitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one" draft="contributed">{0} lj.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} lj.</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="unconfirmed">sænskar mílur</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} sæ. míl</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} sæ. míl</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="one">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} únsa</unitPattern>
-				<unitPattern count="other">{0} únsur</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>pund</displayName>
-				<unitPattern count="one">{0} p.</unitPattern>
-				<unitPattern count="other">{0} p.</unitPattern>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>BNA tonn</displayName>
 				<unitPattern count="one">{0} BNA tn</unitPattern>
 				<unitPattern count="other">{0} BNA tn</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one" draft="contributed">{0} ek</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ek</unitPattern>
+			<unit type="mass-pound">
+				<displayName>pund</displayName>
+				<unitPattern count="one">{0} p.</unitPattern>
+				<unitPattern count="other">{0} p.</unitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} únsa</unitPattern>
+				<unitPattern count="other">{0} únsur</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one" draft="contributed">{0} kW</unitPattern>
@@ -6950,6 +7237,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} W</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one" draft="contributed">{0} ek</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ek</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one" draft="contributed">{0} hPa</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} hPa</unitPattern>
@@ -6989,6 +7280,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} km³</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} km³</unitPattern>
 			</unit>
+			<unit type="volume-cubic-meter">
+				<perUnitPattern draft="unconfirmed">{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<perUnitPattern draft="unconfirmed">{0}/cm³</perUnitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<unitPattern count="one">{0}mi³</unitPattern>
 				<unitPattern count="other">{0}mi³</unitPattern>
@@ -6998,6 +7295,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}A</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}V</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/is_IS.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/is_IS.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/is_IS.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/is_IS.xml
index ed6496b4369..5c28bc4347b 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/is_IS.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/is_IS.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="is"/>
 		<territory type="IS"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/it.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it.xml
similarity index 88%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/it.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it.xml
index 33d888704b9..420f80bfed3 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/it.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11306 $"/>
-		<generation date="$Date: 2015-02-24 13:34:05 -0600 (Tue, 24 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="it"/>
 	</identity>
 	<localeDisplayNames>
@@ -59,7 +58,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ay">aymara</language>
 			<language type="az">azerbaigiano</language>
 			<language type="az" alt="short">azero</language>
-			<language type="azb">azero meridionale</language>
 			<language type="ba">baschiro</language>
 			<language type="bal">beluci</language>
 			<language type="ban">balinese</language>
@@ -76,6 +74,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bfd" draft="contributed">bafut</language>
 			<language type="bfq">badaga</language>
 			<language type="bg">bulgaro</language>
+			<language type="bgn">beluci occidentale</language>
 			<language type="bho">bhojpuri</language>
 			<language type="bi">bislama</language>
 			<language type="bik">bicol</language>
@@ -93,7 +92,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="brh">brahui</language>
 			<language type="brx">bodo</language>
 			<language type="bs">bosniaco</language>
-			<language type="bss" draft="contributed">akoose</language>
+			<language type="bss">akoose</language>
 			<language type="bua">buriat</language>
 			<language type="bug">bugi</language>
 			<language type="bum" draft="contributed">bulu</language>
@@ -126,7 +125,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="cs">ceco</language>
 			<language type="csb">kashubian</language>
 			<language type="cu">slavo della Chiesa</language>
-			<language type="cv">chuvash</language>
+			<language type="cv">ciuvascio</language>
 			<language type="cy">gallese</language>
 			<language type="da">danese</language>
 			<language type="dak">dakota</language>
@@ -222,7 +221,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="gu">gujarati</language>
 			<language type="guc" draft="contributed">wayuu</language>
 			<language type="guz">gusii</language>
-			<language type="gv">manx</language>
+			<language type="gv">mannese</language>
 			<language type="gwi">gwichʼin</language>
 			<language type="ha">hausa</language>
 			<language type="hai">haida</language>
@@ -291,7 +290,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="kj">kuanyama</language>
 			<language type="kk">kazako</language>
 			<language type="kkj" draft="contributed">kako</language>
-			<language type="kl">kalaallisut</language>
+			<language type="kl">groenlandese</language>
 			<language type="kln">kalenjin</language>
 			<language type="km">khmer</language>
 			<language type="kmb">kimbundu</language>
@@ -333,6 +332,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">lao</language>
 			<language type="lol">lolo bantu</language>
 			<language type="loz">lozi</language>
+			<language type="lrc">luri settentrionale</language>
 			<language type="lt">lituano</language>
 			<language type="ltg" draft="contributed">letgallo</language>
 			<language type="lu">luba-katanga</language>
@@ -386,7 +386,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="my">birmano</language>
 			<language type="mye" draft="contributed">myene</language>
 			<language type="myv">erzya</language>
-			<language type="mzn" draft="contributed">mazandarani</language>
+			<language type="mzn">mazandarani</language>
 			<language type="na">nauru</language>
 			<language type="nan" draft="contributed">min nan</language>
 			<language type="nap">napoletano</language>
@@ -394,6 +394,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nb">norvegese bokmål</language>
 			<language type="nd">ndebele del nord</language>
 			<language type="nds">basso tedesco</language>
+			<language type="nds_NL" draft="contributed">basso tedesco olandese</language>
 			<language type="ne">nepalese</language>
 			<language type="new">newari</language>
 			<language type="ng">ndonga</language>
@@ -486,6 +487,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sco">scozzese</language>
 			<language type="sd">sindhi</language>
 			<language type="sdc" draft="contributed">sassarese</language>
+			<language type="sdh">curdo meridionale</language>
 			<language type="se">sami del nord</language>
 			<language type="see" draft="contributed">seneca</language>
 			<language type="seh">sena</language>
@@ -528,8 +530,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">sumero</language>
 			<language type="sv">svedese</language>
 			<language type="sw">swahili</language>
+			<language type="sw_CD">congo swahili</language>
 			<language type="swb">comoriano</language>
-			<language type="swc">congo swahili</language>
 			<language type="syc" draft="contributed">siriaco classico</language>
 			<language type="syr">siriaco</language>
 			<language type="szl" draft="contributed">slesiano</language>
@@ -595,6 +597,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">walamo</language>
 			<language type="war">waray</language>
 			<language type="was">washo</language>
+			<language type="wbp">warlpiri</language>
 			<language type="wo">wolof</language>
 			<language type="wuu" draft="contributed">wu</language>
 			<language type="xal">kalmyk</language>
@@ -625,6 +628,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</languages>
 		<scripts>
 			<script type="Afak" draft="contributed">afaka</script>
+			<script type="Aghb" draft="unconfirmed">albanese caucasico</script>
 			<script type="Arab">arabo</script>
 			<script type="Arab" alt="variant">arabo-persiano</script>
 			<script type="Armi" draft="contributed">aramaico imperiale</script>
@@ -670,9 +674,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Hani">han</script>
 			<script type="Hano">hanunoo</script>
 			<script type="Hans">semplificato</script>
-			<script type="Hans" alt="stand-alone">Han semplificato</script>
+			<script type="Hans" alt="stand-alone">han semplificato</script>
 			<script type="Hant">tradizionale</script>
-			<script type="Hant" alt="stand-alone">Han tradizionale</script>
+			<script type="Hant" alt="stand-alone">han tradizionale</script>
 			<script type="Hebr">ebraico</script>
 			<script type="Hira">hiragana</script>
 			<script type="Hluw" draft="contributed">geroglifici anatolici</script>
@@ -784,7 +788,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Zsym">simboli</script>
 			<script type="Zxxx">non scritto</script>
 			<script type="Zyyy">comune</script>
-			<script type="Zzzz">ignoto o non valido</script>
+			<script type="Zzzz">scrittura sconosciuta</script>
 		</scripts>
 		<territories>
 			<territory type="001">Mondo</territory>
@@ -795,7 +799,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="011">Africa occidentale</territory>
 			<territory type="013">America Centrale</territory>
 			<territory type="014">Africa orientale</territory>
-			<territory type="015">Africa del Nord</territory>
+			<territory type="015">Nordafrica</territory>
 			<territory type="017">Africa centrale</territory>
 			<territory type="018">Africa del Sud</territory>
 			<territory type="019">Americhe</territory>
@@ -817,7 +821,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="154">Europa settentrionale</territory>
 			<territory type="155">Europa occidentale</territory>
 			<territory type="419">America Latina</territory>
-			<territory type="AC">Isola di Ascensione</territory>
+			<territory type="AC">Isola Ascensione</territory>
 			<territory type="AD">Andorra</territory>
 			<territory type="AE">Emirati Arabi Uniti</territory>
 			<territory type="AF">Afghanistan</territory>
@@ -825,17 +829,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antille Olandesi</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antartide</territory>
 			<territory type="AR">Argentina</territory>
-			<territory type="AS">Samoa Americane</territory>
+			<territory type="AS">Samoa americane</territory>
 			<territory type="AT">Austria</territory>
 			<territory type="AU">Australia</territory>
 			<territory type="AW">Aruba</territory>
-			<territory type="AX">Isole Aland</territory>
+			<territory type="AX">Isole Åland</territory>
 			<territory type="AZ">Azerbaigian</territory>
-			<territory type="BA">Bosnia-Erzegovina</territory>
+			<territory type="BA">Bosnia ed Erzegovina</territory>
 			<territory type="BB">Barbados</territory>
 			<territory type="BD">Bangladesh</territory>
 			<territory type="BE">Belgio</territory>
@@ -857,12 +860,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BY">Bielorussia</territory>
 			<territory type="BZ">Belize</territory>
 			<territory type="CA">Canada</territory>
-			<territory type="CC">Isole Cocos</territory>
+			<territory type="CC">Isole Cocos (Keeling)</territory>
 			<territory type="CD">Congo - Kinshasa</territory>
 			<territory type="CD" alt="variant">Congo (RDC)</territory>
 			<territory type="CF">Repubblica Centrafricana</territory>
 			<territory type="CG">Congo-Brazzaville</territory>
-			<territory type="CG" alt="variant">Congo (repubblica)</territory>
+			<territory type="CG" alt="variant">Congo (Repubblica)</territory>
 			<territory type="CH">Svizzera</territory>
 			<territory type="CI">Costa d’Avorio</territory>
 			<territory type="CK">Isole Cook</territory>
@@ -875,7 +878,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CU">Cuba</territory>
 			<territory type="CV">Capo Verde</territory>
 			<territory type="CW">Curaçao</territory>
-			<territory type="CX">Isola di Christmas</territory>
+			<territory type="CX">Isola Christmas</territory>
 			<territory type="CY">Cipro</territory>
 			<territory type="CZ">Repubblica Ceca</territory>
 			<territory type="DE">Germania</territory>
@@ -889,7 +892,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="EC">Ecuador</territory>
 			<territory type="EE">Estonia</territory>
 			<territory type="EG">Egitto</territory>
-			<territory type="EH">Sahara Occidentale</territory>
+			<territory type="EH">Sahara occidentale</territory>
 			<territory type="ER">Eritrea</territory>
 			<territory type="ES">Spagna</territory>
 			<territory type="ET">Etiopia</territory>
@@ -897,16 +900,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="FI">Finlandia</territory>
 			<territory type="FJ">Figi</territory>
 			<territory type="FK">Isole Falkland</territory>
-			<territory type="FK" alt="variant">Isole Falkland (isole Malvine)</territory>
+			<territory type="FK" alt="variant">Isole Falkland (Isole Malvine)</territory>
 			<territory type="FM">Micronesia</territory>
-			<territory type="FO">Isole Faroe</territory>
+			<territory type="FO">Isole Fær Øer</territory>
 			<territory type="FR">Francia</territory>
 			<territory type="GA">Gabon</territory>
 			<territory type="GB">Regno Unito</territory>
 			<territory type="GB" alt="short">GB</territory>
 			<territory type="GD">Grenada</territory>
 			<territory type="GE">Georgia</territory>
-			<territory type="GF">Guiana Francese</territory>
+			<territory type="GF">Guyana francese</territory>
 			<territory type="GG">Guernsey</territory>
 			<territory type="GH">Ghana</territory>
 			<territory type="GI">Gibilterra</territory>
@@ -916,13 +919,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GP">Guadalupa</territory>
 			<territory type="GQ">Guinea Equatoriale</territory>
 			<territory type="GR">Grecia</territory>
-			<territory type="GS">Georgia del Sud e isole Sandwich meridionali</territory>
+			<territory type="GS">Georgia del Sud e isole Sandwich australi</territory>
 			<territory type="GT">Guatemala</territory>
 			<territory type="GU">Guam</territory>
 			<territory type="GW">Guinea-Bissau</territory>
 			<territory type="GY">Guyana</territory>
 			<territory type="HK">RAS di Hong Kong</territory>
-			<territory type="HK" alt="short">Hong-Kong</territory>
+			<territory type="HK" alt="short">Hong Kong</territory>
 			<territory type="HM">Isole Heard e McDonald</territory>
 			<territory type="HN">Honduras</territory>
 			<territory type="HR">Croazia</territory>
@@ -934,7 +937,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="IL">Israele</territory>
 			<territory type="IM">Isola di Man</territory>
 			<territory type="IN">India</territory>
-			<territory type="IO">Territorio Britannico dell’Oceano Indiano</territory>
+			<territory type="IO">Territorio britannico dell’Oceano Indiano</territory>
 			<territory type="IQ">Iraq</territory>
 			<territory type="IR">Iran</territory>
 			<territory type="IS">Islanda</territory>
@@ -973,13 +976,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="MG">Madagascar</territory>
 			<territory type="MH">Isole Marshall</territory>
 			<territory type="MK">Repubblica di Macedonia</territory>
-			<territory type="MK" alt="variant">Repubblica ex Jugoslava di Macedonia</territory>
+			<territory type="MK" alt="variant">Ex Repubblica Jugoslava di Macedonia</territory>
 			<territory type="ML">Mali</territory>
 			<territory type="MM">Myanmar (Birmania)</territory>
 			<territory type="MN">Mongolia</territory>
 			<territory type="MO">RAS di Macao</territory>
 			<territory type="MO" alt="short">Macao</territory>
-			<territory type="MP">Isole Marianne Settentrionali</territory>
+			<territory type="MP">Isole Marianne settentrionali</territory>
 			<territory type="MQ">Martinica</territory>
 			<territory type="MR">Mauritania</territory>
 			<territory type="MS">Montserrat</territory>
@@ -988,7 +991,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="MV">Maldive</territory>
 			<territory type="MW">Malawi</territory>
 			<territory type="MX">Messico</territory>
-			<territory type="MY">Malesia</territory>
+			<territory type="MY">Malaysia</territory>
 			<territory type="MZ">Mozambico</territory>
 			<territory type="NA">Namibia</territory>
 			<territory type="NC">Nuova Caledonia</territory>
@@ -1005,7 +1008,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="OM">Oman</territory>
 			<territory type="PA">Panamá</territory>
 			<territory type="PE">Perù</territory>
-			<territory type="PF">Polinesia Francese</territory>
+			<territory type="PF">Polinesia francese</territory>
 			<territory type="PG">Papua Nuova Guinea</territory>
 			<territory type="PH">Filippine</territory>
 			<territory type="PK">Pakistan</territory>
@@ -1020,13 +1023,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="PY">Paraguay</territory>
 			<territory type="QA">Qatar</territory>
 			<territory type="QO">Oceania lontana</territory>
-			<territory type="RE">Réunion</territory>
+			<territory type="RE">Riunione</territory>
 			<territory type="RO">Romania</territory>
 			<territory type="RS">Serbia</territory>
-			<territory type="RU">Federazione Russa</territory>
+			<territory type="RU">Russia</territory>
 			<territory type="RW">Ruanda</territory>
 			<territory type="SA">Arabia Saudita</territory>
-			<territory type="SB">Isole Solomon</territory>
+			<territory type="SB">Isole Salomone</territory>
 			<territory type="SC">Seychelles</territory>
 			<territory type="SD">Sudan</territory>
 			<territory type="SE">Svezia</territory>
@@ -1040,7 +1043,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="SN">Senegal</territory>
 			<territory type="SO">Somalia</territory>
 			<territory type="SR">Suriname</territory>
-			<territory type="SS">Sudan del Sud</territory>
+			<territory type="SS">Sud Sudan</territory>
 			<territory type="ST">São Tomé e Príncipe</territory>
 			<territory type="SV">El Salvador</territory>
 			<territory type="SX">Sint Maarten</territory>
@@ -1049,12 +1052,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="TA">Tristan da Cunha</territory>
 			<territory type="TC">Isole Turks e Caicos</territory>
 			<territory type="TD">Ciad</territory>
-			<territory type="TF">Territori australi francesi</territory>
+			<territory type="TF">Terre australi francesi</territory>
 			<territory type="TG">Togo</territory>
-			<territory type="TH">Tailandia</territory>
+			<territory type="TH">Thailandia</territory>
 			<territory type="TJ">Tagikistan</territory>
 			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Timor Est</territory>
+			<territory type="TL">Timor Leste</territory>
+			<territory type="TL" alt="variant">Timor Est</territory>
 			<territory type="TM">Turkmenistan</territory>
 			<territory type="TN">Tunisia</territory>
 			<territory type="TO">Tonga</territory>
@@ -1065,7 +1069,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="TZ">Tanzania</territory>
 			<territory type="UA">Ucraina</territory>
 			<territory type="UG">Uganda</territory>
-			<territory type="UM">Isole minori lontane dagli USA</territory>
+			<territory type="UM">Altre isole americane del Pacifico</territory>
 			<territory type="US">Stati Uniti</territory>
 			<territory type="US" alt="short">USA</territory>
 			<territory type="UY">Uruguay</territory>
@@ -1085,7 +1089,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ZA">Sudafrica</territory>
 			<territory type="ZM">Zambia</territory>
 			<territory type="ZW">Zimbabwe</territory>
-			<territory type="ZZ">Regione non valida o sconosciuta</territory>
+			<territory type="ZZ">Regione sconosciuta</territory>
 		</territories>
 		<variants>
 			<variant type="1901">ortografia tradizionale tedesca</variant>
@@ -1146,6 +1150,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric">Ordinamento numerico</key>
 			<key type="colStrength">Sicurezza ordinamento</key>
 			<key type="currency">Valuta</key>
+			<key type="hc">Sistema orario (12 o 24 ore)</key>
+			<key type="lb">Tipo di interruzione di riga</key>
+			<key type="ms" draft="contributed">Sistema di misurazione</key>
 			<key type="numbers">Numeri</key>
 			<key type="timezone">Fuso orario</key>
 			<key type="va">Variante lingua</key>
@@ -1153,121 +1160,131 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">Uso privato</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Cifre indo-arabe</type>
-			<type type="arabext" key="numbers">Cifre indo-arabe estese</type>
-			<type type="armn" key="numbers">Numeri armeni</type>
-			<type type="armnlow" key="numbers">Numeri armeni minuscoli</type>
-			<type type="bali" key="numbers">Cifre balinesi</type>
-			<type type="beng" key="numbers">Cifre bengalesi</type>
-			<type type="big5han" key="collation">cinese tradizionale</type>
-			<type type="brah" key="numbers">Cifre brahmi</type>
-			<type type="buddhist" key="calendar">Calendario buddista</type>
-			<type type="cakm" key="numbers">Cifre chakma</type>
-			<type type="cham" key="numbers">Cifre cham</type>
-			<type type="chinese" key="calendar">Calendario cinese</type>
-			<type type="coptic" key="calendar" draft="contributed">Calendario copto</type>
-			<type type="dangi" key="calendar">Calendario Dangi</type>
-			<type type="deva" key="numbers">Cifre devanagari</type>
-			<type type="dictionary" key="collation">Ordinamento dizionario</type>
-			<type type="ducet" key="collation">Ordinamento Unicode predefinito</type>
-			<type type="eor" key="collation" draft="contributed">eor</type>
-			<type type="ethi" key="numbers">Numeri etiopi</type>
-			<type type="ethiopic" key="calendar">Calendario etiope</type>
-			<type type="ethiopic-amete-alem" key="calendar">Calendario etiope Amete Alem</type>
-			<type type="finance" key="numbers">Numeri finanziari</type>
-			<type type="fullwide" key="numbers">Cifre a larghezza intera</type>
-			<type type="gb2312han" key="collation">cinese semplificato</type>
-			<type type="geor" key="numbers">Numeri georgiani</type>
-			<type type="gregorian" key="calendar">Calendario gregoriano</type>
-			<type type="grek" key="numbers">Numeri greci</type>
-			<type type="greklow" key="numbers">Numeri greci minuscoli</type>
-			<type type="gujr" key="numbers">Cifre gujarati</type>
-			<type type="guru" key="numbers">Cifre gurmukhi</type>
-			<type type="hanidec" key="numbers">Numeri decimali cinesi</type>
-			<type type="hans" key="numbers">Numeri in cinese semplificato</type>
-			<type type="hansfin" key="numbers">Numeri finanziari in cinese semplificato</type>
-			<type type="hant" key="numbers">Numeri in cinese tradizionale</type>
-			<type type="hantfin" key="numbers">Numeri finanziari in cinese tradizionale</type>
-			<type type="hebr" key="numbers">Numeri ebraici</type>
-			<type type="hebrew" key="calendar">Calendario ebraico</type>
-			<type type="identical" key="colStrength">Ordina tutto</type>
-			<type type="indian" key="calendar">calendario nazionale indiano</type>
-			<type type="islamic" key="calendar">Calendario islamico</type>
-			<type type="islamic-civil" key="calendar">calendario civile islamico</type>
-			<type type="islamic-rgsa" key="calendar">Calendario islamico (Arabia Saudita, osservazione)</type>
-			<type type="islamic-tbla" key="calendar">Calendario islamico (tabulare, era astronomica)</type>
-			<type type="islamic-umalqura" key="calendar">Calendario islamico (Umm al-Qura)</type>
-			<type type="iso8601" key="calendar">Calendario ISO-8601</type>
-			<type type="japanese" key="calendar">Calendario giapponese</type>
-			<type type="java" key="numbers">Cifre giavanesi</type>
-			<type type="jpan" key="numbers">Numeri giapponesi</type>
-			<type type="jpanfin" key="numbers">Numeri finanziari giapponesi</type>
-			<type type="kali" key="numbers">Cifre Kayah Li</type>
-			<type type="khmr" key="numbers">Cifre khmer</type>
-			<type type="knda" key="numbers">Cifre kannada</type>
-			<type type="lana" key="numbers">Cifre tai tham hora</type>
-			<type type="lanatham" key="numbers">Cifre tai tham tham</type>
-			<type type="laoo" key="numbers">Cifre lao</type>
-			<type type="latn" key="numbers">Cifre occidentali</type>
-			<type type="lepc" key="numbers">Cifre lepcha</type>
-			<type type="limb" key="numbers">Cifre limbu</type>
-			<type type="lower" key="colCaseFirst">Ordina prima lettere minuscole</type>
-			<type type="mlym" key="numbers">Cifre malayalam</type>
-			<type type="mong" key="numbers" draft="contributed">Numeri mongoli</type>
-			<type type="mtei" key="numbers">Cifre Meetei Mayek</type>
-			<type type="mymr" key="numbers">Cifre birmane</type>
-			<type type="mymrshan" key="numbers">Cifre shan birmane</type>
-			<type type="native" key="numbers" draft="contributed">Cifre native</type>
-			<type type="nkoo" key="numbers">Cifre N’Ko</type>
-			<type type="no" key="colBackwards">Ordina accenti normalmente</type>
-			<type type="no" key="colCaseFirst">Ordina lettere maiuscole/minuscole normalmente</type>
-			<type type="no" key="colCaseLevel">Ordina senza distinzione tra maiuscole e minuscole</type>
-			<type type="no" key="colHiraganaQuaternary">Ordina Kana separatamente</type>
-			<type type="no" key="colNormalization">Ordina senza normalizzazione</type>
-			<type type="no" key="colNumeric">Ordina cifre individualmente</type>
-			<type type="non-ignorable" key="colAlternate">Ordina simboli</type>
-			<type type="olck" key="numbers">Cifre Ol Chiki</type>
-			<type type="orya" key="numbers">Cifre oriya</type>
-			<type type="osma" key="numbers">Cifre osmanya</type>
-			<type type="persian" key="calendar">Calendario persiano</type>
-			<type type="phonebook" key="collation">ordine elenco telefonico</type>
-			<type type="phonetic" key="collation">Ordinamento fonetico</type>
-			<type type="pinyin" key="collation">ordine pinyin</type>
-			<type type="primary" key="colStrength">Ordina solo lettere di base</type>
-			<type type="quaternary" key="colStrength">Ordina accenti/lettere/larghezza/Kana</type>
-			<type type="reformed" key="collation">Ordinamento riformato</type>
-			<type type="roc" key="calendar">Calendario Minguo</type>
-			<type type="roman" key="numbers">Numeri romani</type>
-			<type type="romanlow" key="numbers">Numeri romani minuscoli</type>
-			<type type="saur" key="numbers">Cifre saurashtra</type>
-			<type type="search" key="collation">Ricerca generica</type>
-			<type type="searchjl" key="collation">Cerca per consonante hangul iniziale</type>
-			<type type="secondary" key="colStrength">Ordina accenti</type>
-			<type type="shifted" key="colAlternate">Ordina ignorando i simboli</type>
-			<type type="shrd" key="numbers">Cifre sharada</type>
-			<type type="sora" key="numbers">Cifre Sora Sompeng</type>
-			<type type="standard" key="collation">Ordinamento standard</type>
-			<type type="stroke" key="collation">ordine segni</type>
-			<type type="sund" key="numbers">Cifre sundanesi</type>
-			<type type="takr" key="numbers">Cifre takri</type>
-			<type type="talu" key="numbers">Cifre nuovo Tai Lue</type>
-			<type type="taml" key="numbers">Numeri tamil tradizionali</type>
-			<type type="tamldec" key="numbers">Cifre tamil</type>
-			<type type="telu" key="numbers">Cifre telugu</type>
-			<type type="tertiary" key="colStrength">Ordina accenti/lettere/larghezza</type>
-			<type type="thai" key="numbers">Cifre thailandesi</type>
-			<type type="tibt" key="numbers">Cifre tibetane</type>
-			<type type="traditional" key="collation">ordine tradizionale</type>
-			<type type="traditional" key="numbers">Numeri tradizionali</type>
-			<type type="unihan" key="collation">Ordinamento in base ai radicali</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">Ordina prima lettere minuscole</type>
-			<type type="vaii" key="numbers">Cifre Vai</type>
-			<type type="yes" key="colBackwards">Ordina accenti capovolti</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">Ordina distinzione tra maiuscole e minuscole</type>
-			<type type="yes" key="colHiraganaQuaternary">Ordina Kana diversamente</type>
-			<type type="yes" key="colNormalization">Ordina Unicode normalizzato</type>
-			<type type="yes" key="colNumeric">Ordina cifre numericamente</type>
-			<type type="zhuyin" key="collation">Ordinamento Zhuyin</type>
+			<type key="calendar" type="buddhist">Calendario buddista</type>
+			<type key="calendar" type="chinese">Calendario cinese</type>
+			<type key="calendar" type="coptic" draft="contributed">Calendario copto</type>
+			<type key="calendar" type="dangi">Calendario Dangi</type>
+			<type key="calendar" type="ethiopic">Calendario etiope</type>
+			<type key="calendar" type="ethiopic-amete-alem">Calendario etiope Amete Alem</type>
+			<type key="calendar" type="gregorian">Calendario gregoriano</type>
+			<type key="calendar" type="hebrew">Calendario ebraico</type>
+			<type key="calendar" type="indian">calendario nazionale indiano</type>
+			<type key="calendar" type="islamic">Calendario islamico</type>
+			<type key="calendar" type="islamic-civil">calendario civile islamico</type>
+			<type key="calendar" type="islamic-rgsa">Calendario islamico (Arabia Saudita, osservazione)</type>
+			<type key="calendar" type="islamic-tbla">Calendario islamico (tabulare, era astronomica)</type>
+			<type key="calendar" type="islamic-umalqura">Calendario islamico (Umm al-Qura)</type>
+			<type key="calendar" type="iso8601">Calendario ISO-8601</type>
+			<type key="calendar" type="japanese">Calendario giapponese</type>
+			<type key="calendar" type="persian">Calendario persiano</type>
+			<type key="calendar" type="roc">Calendario Minguo</type>
+			<type key="colAlternate" type="non-ignorable">Ordina simboli</type>
+			<type key="colAlternate" type="shifted">Ordina ignorando i simboli</type>
+			<type key="colBackwards" type="no">Ordina accenti normalmente</type>
+			<type key="colBackwards" type="yes">Ordina accenti capovolti</type>
+			<type key="colCaseFirst" type="lower">Ordina prima lettere minuscole</type>
+			<type key="colCaseFirst" type="no">Ordina lettere maiuscole/minuscole normalmente</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">Ordina prima lettere minuscole</type>
+			<type key="colCaseLevel" type="no">Ordina senza distinzione tra maiuscole e minuscole</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">Ordina distinzione tra maiuscole e minuscole</type>
+			<type key="colHiraganaQuaternary" type="no">Ordina Kana separatamente</type>
+			<type key="colHiraganaQuaternary" type="yes">Ordina Kana diversamente</type>
+			<type key="collation" type="big5han">cinese tradizionale</type>
+			<type key="collation" type="dictionary">Ordinamento dizionario</type>
+			<type key="collation" type="ducet">Ordinamento Unicode predefinito</type>
+			<type key="collation" type="eor" draft="contributed">eor</type>
+			<type key="collation" type="gb2312han">cinese semplificato</type>
+			<type key="collation" type="phonebook">ordine elenco telefonico</type>
+			<type key="collation" type="phonetic">Ordinamento fonetico</type>
+			<type key="collation" type="pinyin">ordine pinyin</type>
+			<type key="collation" type="reformed">Ordinamento riformato</type>
+			<type key="collation" type="search">Ricerca generica</type>
+			<type key="collation" type="searchjl">Cerca per consonante hangul iniziale</type>
+			<type key="collation" type="standard">Ordinamento standard</type>
+			<type key="collation" type="stroke">ordine segni</type>
+			<type key="collation" type="traditional">ordine tradizionale</type>
+			<type key="collation" type="unihan">Ordinamento in base ai radicali</type>
+			<type key="collation" type="zhuyin">Ordinamento Zhuyin</type>
+			<type key="colNormalization" type="no">Ordina senza normalizzazione</type>
+			<type key="colNormalization" type="yes">Ordina Unicode normalizzato</type>
+			<type key="colNumeric" type="no">Ordina cifre individualmente</type>
+			<type key="colNumeric" type="yes">Ordina cifre numericamente</type>
+			<type key="colStrength" type="identical">Ordina tutto</type>
+			<type key="colStrength" type="primary">Ordina solo lettere di base</type>
+			<type key="colStrength" type="quaternary">Ordina accenti/lettere/larghezza/Kana</type>
+			<type key="colStrength" type="secondary">Ordina accenti</type>
+			<type key="colStrength" type="tertiary">Ordina accenti/lettere/larghezza</type>
+			<type key="hc" type="h11">Sistema orario a 12 ore (0–11)</type>
+			<type key="hc" type="h12">Sistema orario a 12 ore (1–12)</type>
+			<type key="hc" type="h23">Sistema orario a 24 ore (0–23)</type>
+			<type key="hc" type="h24">Sistema orario a 24 ore (1–24)</type>
+			<type key="lb" type="loose">Interruzione di riga facoltativa</type>
+			<type key="lb" type="normal">Interruzione di riga normale</type>
+			<type key="lb" type="strict">Interruzione di riga forzata</type>
+			<type key="ms" type="metric" draft="contributed">Sistema metrico</type>
+			<type key="ms" type="uksystem">Sistema imperiale britannico</type>
+			<type key="ms" type="ussystem">Sistema consuetudinario statunitense</type>
+			<type key="numbers" type="arab">Cifre indo-arabe</type>
+			<type key="numbers" type="arabext">Cifre indo-arabe estese</type>
+			<type key="numbers" type="armn">Numeri armeni</type>
+			<type key="numbers" type="armnlow">Numeri armeni minuscoli</type>
+			<type key="numbers" type="bali">Cifre balinesi</type>
+			<type key="numbers" type="beng">Cifre bengalesi</type>
+			<type key="numbers" type="brah">Cifre brahmi</type>
+			<type key="numbers" type="cakm">Cifre chakma</type>
+			<type key="numbers" type="cham">Cifre cham</type>
+			<type key="numbers" type="deva">Cifre devanagari</type>
+			<type key="numbers" type="ethi">Numeri etiopi</type>
+			<type key="numbers" type="finance">Numeri finanziari</type>
+			<type key="numbers" type="fullwide">Cifre a larghezza intera</type>
+			<type key="numbers" type="geor">Numeri georgiani</type>
+			<type key="numbers" type="grek">Numeri greci</type>
+			<type key="numbers" type="greklow">Numeri greci minuscoli</type>
+			<type key="numbers" type="gujr">Cifre gujarati</type>
+			<type key="numbers" type="guru">Cifre gurmukhi</type>
+			<type key="numbers" type="hanidec">Numeri decimali cinesi</type>
+			<type key="numbers" type="hans">Numeri in cinese semplificato</type>
+			<type key="numbers" type="hansfin">Numeri finanziari in cinese semplificato</type>
+			<type key="numbers" type="hant">Numeri in cinese tradizionale</type>
+			<type key="numbers" type="hantfin">Numeri finanziari in cinese tradizionale</type>
+			<type key="numbers" type="hebr">Numeri ebraici</type>
+			<type key="numbers" type="java">Cifre giavanesi</type>
+			<type key="numbers" type="jpan">Numeri giapponesi</type>
+			<type key="numbers" type="jpanfin">Numeri finanziari giapponesi</type>
+			<type key="numbers" type="kali">Cifre Kayah Li</type>
+			<type key="numbers" type="khmr">Cifre khmer</type>
+			<type key="numbers" type="knda">Cifre kannada</type>
+			<type key="numbers" type="lana">Cifre tai tham hora</type>
+			<type key="numbers" type="lanatham">Cifre tai tham tham</type>
+			<type key="numbers" type="laoo">Cifre lao</type>
+			<type key="numbers" type="latn">Cifre occidentali</type>
+			<type key="numbers" type="lepc">Cifre lepcha</type>
+			<type key="numbers" type="limb">Cifre limbu</type>
+			<type key="numbers" type="mlym">Cifre malayalam</type>
+			<type key="numbers" type="mong" draft="contributed">Numeri mongoli</type>
+			<type key="numbers" type="mtei">Cifre Meetei Mayek</type>
+			<type key="numbers" type="mymr">Cifre birmane</type>
+			<type key="numbers" type="mymrshan">Cifre shan birmane</type>
+			<type key="numbers" type="native" draft="contributed">Cifre native</type>
+			<type key="numbers" type="nkoo">Cifre N’Ko</type>
+			<type key="numbers" type="olck">Cifre Ol Chiki</type>
+			<type key="numbers" type="orya">Cifre oriya</type>
+			<type key="numbers" type="osma">Cifre osmanya</type>
+			<type key="numbers" type="roman">Numeri romani</type>
+			<type key="numbers" type="romanlow">Numeri romani minuscoli</type>
+			<type key="numbers" type="saur">Cifre saurashtra</type>
+			<type key="numbers" type="shrd">Cifre sharada</type>
+			<type key="numbers" type="sora">Cifre Sora Sompeng</type>
+			<type key="numbers" type="sund">Cifre sundanesi</type>
+			<type key="numbers" type="takr">Cifre takri</type>
+			<type key="numbers" type="talu">Cifre nuovo Tai Lue</type>
+			<type key="numbers" type="taml">Numeri tamil tradizionali</type>
+			<type key="numbers" type="tamldec">Cifre tamil</type>
+			<type key="numbers" type="telu">Cifre telugu</type>
+			<type key="numbers" type="thai">Cifre thailandesi</type>
+			<type key="numbers" type="tibt">Cifre tibetane</type>
+			<type key="numbers" type="traditional">Numeri tradizionali</type>
+			<type key="numbers" type="vaii">Cifre Vai</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">BGN</transformName>
@@ -1322,9 +1339,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<ellipsis type="final">{0}…</ellipsis>
 		<ellipsis type="initial">…{0}</ellipsis>
 		<ellipsis type="medial" draft="contributed">{0}…{1}</ellipsis>
-		<ellipsis type="word-final" draft="contributed">{0} …</ellipsis>
+		<ellipsis type="word-final">{0} …</ellipsis>
 		<ellipsis type="word-initial">… {0}</ellipsis>
-		<ellipsis type="word-medial" draft="contributed">{0} … {1}</ellipsis>
+		<ellipsis type="word-medial">{0} … {1}</ellipsis>
 		<moreInformation>?</moreInformation>
 	</characters>
 	<delimiters>
@@ -1402,16 +1419,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1}, {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1}, {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -1429,6 +1447,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
@@ -1752,30 +1771,82 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">m.</dayPeriod>
-							<dayPeriod type="noon">n</dayPeriod>
-							<dayPeriod type="pm">p.</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">mezzanotte</dayPeriod>
 							<dayPeriod type="am">AM</dayPeriod>
 							<dayPeriod type="noon">mezzogiorno</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">mattina</dayPeriod>
+							<dayPeriod type="afternoon1">pomeriggio</dayPeriod>
+							<dayPeriod type="evening1">sera</dayPeriod>
+							<dayPeriod type="night1">notte</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">mezzanotte</dayPeriod>
+							<dayPeriod type="am">m.</dayPeriod>
+							<dayPeriod type="noon">mezzogiorno</dayPeriod>
+							<dayPeriod type="pm">p.</dayPeriod>
+							<dayPeriod type="morning1">mattina</dayPeriod>
+							<dayPeriod type="afternoon1">pomeriggio</dayPeriod>
+							<dayPeriod type="evening1">sera</dayPeriod>
+							<dayPeriod type="night1">notte</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">mezzanotte</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">mezzogiorno</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">mattina</dayPeriod>
+							<dayPeriod type="afternoon1">pomeriggio</dayPeriod>
+							<dayPeriod type="evening1">sera</dayPeriod>
+							<dayPeriod type="night1">notte</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">mezzanotte</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">mezzogiorno</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">mattina</dayPeriod>
+							<dayPeriod type="afternoon1">pomeriggio</dayPeriod>
+							<dayPeriod type="evening1">sera</dayPeriod>
+							<dayPeriod type="night1">notte</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">mezzanotte</dayPeriod>
+							<dayPeriod type="am">m.</dayPeriod>
+							<dayPeriod type="noon">mezzogiorno</dayPeriod>
+							<dayPeriod type="pm">p.</dayPeriod>
+							<dayPeriod type="morning1">mattina</dayPeriod>
+							<dayPeriod type="afternoon1">pomeriggio</dayPeriod>
+							<dayPeriod type="evening1">sera</dayPeriod>
+							<dayPeriod type="night1">notte</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">mezzanotte</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">mezzogiorno</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">mattina</dayPeriod>
+							<dayPeriod type="afternoon1">pomeriggio</dayPeriod>
+							<dayPeriod type="evening1">sera</dayPeriod>
+							<dayPeriod type="night1">notte</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
 						<era type="0">a.C.</era>
-						<era type="0" alt="variant" draft="contributed">BCE</era>
+						<era type="0" alt="variant">avanti Era Volgare</era>
 						<era type="1">d.C.</era>
-						<era type="1" alt="variant" draft="contributed">CE</era>
+						<era type="1" alt="variant">Era Volgare</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0">aC</era>
-						<era type="0" alt="variant">BCE</era>
-						<era type="1">dC</era>
-						<era type="1" alt="variant">CE</era>
+						<era type="0">a.C.</era>
+						<era type="0" alt="variant">a.E.V.</era>
+						<era type="1">d.C.</era>
+						<era type="1" alt="variant">E.V.</era>
 					</eraAbbr>
 					<eraNarrow>
 						<era type="0">aC</era>
@@ -1841,12 +1912,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1}, {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1}, {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
@@ -1877,6 +1948,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">M/y</dateFormatItem>
@@ -2033,7 +2105,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<calendar type="roc">
 				<eras>
 					<eraAbbr>
-						<era type="0">Prima della R.O.C.</era>
+						<era type="0">Prima di R.O.C.</era>
 						<era type="1">Minguo</era>
 					</eraAbbr>
 				</eras>
@@ -2041,10 +2113,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</calendars>
 		<fields>
 			<field type="era">
-				<displayName>Era</displayName>
+				<displayName>era</displayName>
 			</field>
 			<field type="year">
-				<displayName>Anno</displayName>
+				<displayName>anno</displayName>
 				<relative type="-1">anno scorso</relative>
 				<relative type="0">quest’anno</relative>
 				<relative type="1">anno prossimo</relative>
@@ -2080,7 +2152,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="quarter">
-				<displayName>Trimestre</displayName>
+				<displayName>trimestre</displayName>
+				<relative type="-1" draft="unconfirmed">trimestre scorso</relative>
+				<relative type="0" draft="unconfirmed">questo trimestre</relative>
+				<relative type="1" draft="unconfirmed">trimestre prossimo</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">tra {0} trimestre</relativeTimePattern>
 					<relativeTimePattern count="other">tra {0} trimestri</relativeTimePattern>
@@ -2092,6 +2167,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>trim.</displayName>
+				<relative type="-1" draft="unconfirmed">trim. scorso</relative>
+				<relative type="0" draft="unconfirmed">questo trim.</relative>
+				<relative type="1" draft="unconfirmed">trim. prossimo</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">tra {0} trim.</relativeTimePattern>
 					<relativeTimePattern count="other">tra {0} trim.</relativeTimePattern>
@@ -2103,6 +2181,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>trim.</displayName>
+				<relative type="-1" draft="unconfirmed">trim. scorso</relative>
+				<relative type="0" draft="unconfirmed">questo trim.</relative>
+				<relative type="1" draft="unconfirmed">trim. prossimo</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">tra {0} trim.</relativeTimePattern>
 					<relativeTimePattern count="other">tra {0} trim.</relativeTimePattern>
@@ -2113,7 +2194,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="month">
-				<displayName>Mese</displayName>
+				<displayName>mese</displayName>
 				<relative type="-1">mese scorso</relative>
 				<relative type="0">questo mese</relative>
 				<relative type="1">mese prossimo</relative>
@@ -2149,7 +2230,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="week">
-				<displayName>Settimana</displayName>
+				<displayName>settimana</displayName>
 				<relative type="-1">settimana scorsa</relative>
 				<relative type="0">questa settimana</relative>
 				<relative type="1">settimana prossima</relative>
@@ -2185,7 +2266,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day">
-				<displayName>Giorno</displayName>
+				<displayName>giorno</displayName>
 				<relative type="-2">l’altro ieri</relative>
 				<relative type="-1">ieri</relative>
 				<relative type="0">oggi</relative>
@@ -2223,7 +2304,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="weekday">
-				<displayName>Giorno della settimana</displayName>
+				<displayName>giorno della settimana</displayName>
 			</field>
 			<field type="sun">
 				<relative type="-1">domenica scorsa</relative>
@@ -2334,7 +2415,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>AM/PM</displayName>
 			</field>
 			<field type="hour">
-				<displayName>Ora</displayName>
+				<displayName>ora</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">tra {0} ora</relativeTimePattern>
 					<relativeTimePattern count="other">tra {0} ore</relativeTimePattern>
@@ -2367,7 +2448,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="minute">
-				<displayName>Minuto</displayName>
+				<displayName>minuto</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">tra {0} minuto</relativeTimePattern>
 					<relativeTimePattern count="other">tra {0} minuti</relativeTimePattern>
@@ -2434,7 +2515,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>Fuso orario</displayName>
+				<displayName>fuso orario</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
@@ -2911,7 +2992,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Kosrae</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Isole Faeroe</exemplarCity>
+				<exemplarCity>Isole Fær Øer</exemplarCity>
 			</zone>
 			<zone type="Europe/Paris">
 				<exemplarCity>Parigi</exemplarCity>
@@ -2921,7 +3002,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</zone>
 			<zone type="Europe/London">
 				<long>
-					<daylight>Ora legale Regno Unito</daylight>
+					<daylight>Ora legale del Regno Unito</daylight>
 				</long>
 				<exemplarCity>Londra</exemplarCity>
 			</zone>
@@ -3014,7 +3095,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</zone>
 			<zone type="Europe/Dublin">
 				<long>
-					<daylight>Ora legale Irlanda</daylight>
+					<daylight>Ora legale dell’Irlanda</daylight>
 				</long>
 				<exemplarCity>Dublino</exemplarCity>
 			</zone>
@@ -3312,6 +3393,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
 			</zone>
@@ -3396,6 +3480,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Čita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Jakutsk</exemplarCity>
 			</zone>
@@ -3414,6 +3501,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolymsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamchatka</exemplarCity>
 			</zone>
@@ -3565,7 +3655,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
 			<zone type="America/Anchorage">
-				<exemplarCity>Fuso orario Alaska</exemplarCity>
+				<exemplarCity>Anchorage</exemplarCity>
 			</zone>
 			<zone type="America/Yakutat">
 				<exemplarCity>Yakutat</exemplarCity>
@@ -3592,10 +3682,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Denver</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/Beulah">
-				<exemplarCity draft="contributed">Beulah, Dakota del nord</exemplarCity>
+				<exemplarCity>Beulah, Dakota del nord</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity draft="contributed">New Salem, Dakota del nord</exemplarCity>
+				<exemplarCity>New Salem, Dakota del nord</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/Center">
 				<exemplarCity>Center, Dakota del nord</exemplarCity>
@@ -3723,8 +3813,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="Alaska">
 				<long>
 					<generic>Ora dell’Alaska</generic>
-					<standard>Ora standard Alaska</standard>
-					<daylight>Ora legale Alaska</daylight>
+					<standard>Ora standard dell’Alaska</standard>
+					<daylight>Ora legale dell’Alaska</daylight>
 				</long>
 			</metazone>
 			<metazone type="Amazon">
@@ -3771,9 +3861,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic draft="contributed">Ora di Apia</generic>
-					<standard draft="contributed">Ora standard di Apia</standard>
-					<daylight draft="contributed">Ora legale di Apia</daylight>
+					<generic>Ora di Apia</generic>
+					<standard>Ora standard di Apia</standard>
+					<daylight>Ora legale di Apia</daylight>
 				</long>
 			</metazone>
 			<metazone type="Arabian">
@@ -3924,7 +4014,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Christmas">
 				<long>
-					<standard>Ora dell’Isola di Natale</standard>
+					<standard>Ora dell’Isola Christmas</standard>
 				</long>
 			</metazone>
 			<metazone type="Cocos">
@@ -4651,12 +4741,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern type="10000000000" count="other">00 miliardi</pattern>
 					<pattern type="100000000000" count="one">000 miliardi</pattern>
 					<pattern type="100000000000" count="other">000 miliardi</pattern>
-					<pattern type="1000000000000" count="one">0 mille di miliardi</pattern>
-					<pattern type="1000000000000" count="other">0 mila di miliardi</pattern>
-					<pattern type="10000000000000" count="one">00 mila di miliardi</pattern>
-					<pattern type="10000000000000" count="other">00 mila di miliardi</pattern>
-					<pattern type="100000000000000" count="one">000 mila di miliardi</pattern>
-					<pattern type="100000000000000" count="other">000 mila di miliardi</pattern>
+					<pattern type="1000000000000" count="one">0 mille miliardi</pattern>
+					<pattern type="1000000000000" count="other">0 mila miliardi</pattern>
+					<pattern type="10000000000000" count="one">00 mila miliardi</pattern>
+					<pattern type="10000000000000" count="other">00 mila miliardi</pattern>
+					<pattern type="100000000000000" count="one">000 mila miliardi</pattern>
+					<pattern type="100000000000000" count="other">000 mila miliardi</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
 			<decimalFormatLength type="short">
@@ -4711,6 +4801,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="contributed">0 ¤</pattern>
+					<pattern type="1000" count="other" draft="contributed">0 ¤</pattern>
+					<pattern type="10000" count="one" draft="contributed">00 ¤</pattern>
+					<pattern type="10000" count="other" draft="contributed">00 ¤</pattern>
+					<pattern type="100000" count="one" draft="contributed">000 ¤</pattern>
+					<pattern type="100000" count="other" draft="contributed">000 ¤</pattern>
+					<pattern type="1000000" count="one" draft="contributed">0 Mio ¤</pattern>
+					<pattern type="1000000" count="other" draft="contributed">0 Mio ¤</pattern>
+					<pattern type="10000000" count="one" draft="contributed">00 Mio ¤</pattern>
+					<pattern type="10000000" count="other" draft="contributed">00 Mio ¤</pattern>
+					<pattern type="100000000" count="one" draft="contributed">000 Mio ¤</pattern>
+					<pattern type="100000000" count="other" draft="contributed">000 Mio ¤</pattern>
+					<pattern type="1000000000" count="one" draft="contributed">0 Mrd ¤</pattern>
+					<pattern type="1000000000" count="other" draft="contributed">0 Mrd ¤</pattern>
+					<pattern type="10000000000" count="one" draft="contributed">00 Mrd ¤</pattern>
+					<pattern type="10000000000" count="other" draft="contributed">00 Mrd ¤</pattern>
+					<pattern type="100000000000" count="one" draft="contributed">000 Mrd ¤</pattern>
+					<pattern type="100000000000" count="other" draft="contributed">000 Mrd ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="contributed">0 Bln ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="contributed">0 Bln ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="contributed">00 Bln ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="contributed">00 Bln ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="contributed">000 Bln ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="contributed">000 Bln ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4746,9 +4864,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>AMD</symbol>
 			</currency>
 			<currency type="ANG">
-				<displayName>fiorino delle Antille Olandesi</displayName>
-				<displayName count="one">fiorino delle Antille Olandesi</displayName>
-				<displayName count="other">fiorini delle Antille Olandesi</displayName>
+				<displayName>fiorino delle Antille olandesi</displayName>
+				<displayName count="one">fiorino delle Antille olandesi</displayName>
+				<displayName count="other">fiorino delle Antille olandesi</displayName>
 				<symbol>ANG</symbol>
 			</currency>
 			<currency type="AOA">
@@ -4756,6 +4874,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">kwanza angolano</displayName>
 				<displayName count="other">kwanzas angolani</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>kwanza angolano (1977–1990)</displayName>
@@ -4808,17 +4927,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>dinar Bosnia-Herzegovina</displayName>
 			</currency>
 			<currency type="BAM">
-				<displayName>marco conv. Bosnia-Erzegovina</displayName>
-				<displayName count="one">marco bosniaco</displayName>
-				<displayName count="other">marchi bosniaci</displayName>
+				<displayName>marco convertibile della Bosnia-Herzegovina</displayName>
+				<displayName count="one">marco convertibile della Bosnia-Herzegovina</displayName>
+				<displayName count="other">marchi convertibili della Bosnia-Herzegovina</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>dollaro di Barbados</displayName>
 				<displayName count="one">dollaro di Barbados</displayName>
 				<displayName count="other">dollari di Barbados</displayName>
 				<symbol>BBD</symbol>
-				<symbol alt="narrow" draft="provisional">$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BDT">
 				<displayName>taka bangladese</displayName>
@@ -4864,20 +4984,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dollaro delle Bermuda</displayName>
 				<displayName count="other">dollari delle Bermuda</displayName>
 				<symbol>BMD</symbol>
-				<symbol alt="narrow" draft="provisional">$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BND">
 				<displayName>dollaro del Brunei</displayName>
 				<displayName count="one">dollaro del Brunei</displayName>
 				<displayName count="other">dollari del Brunei</displayName>
 				<symbol>BND</symbol>
-				<symbol alt="narrow" draft="provisional">$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BOB">
 				<displayName>boliviano</displayName>
 				<displayName count="one">boliviano</displayName>
 				<displayName count="other">boliviani</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">$b</symbol>
 			</currency>
 			<currency type="BOP">
 				<displayName>peso boliviano</displayName>
@@ -4912,12 +5033,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dollaro delle Bahamas</displayName>
 				<displayName count="other">dollari delle Bahamas</displayName>
 				<symbol>BSD</symbol>
-				<symbol alt="narrow" draft="provisional">$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BTN">
-				<displayName>ngultrum butanese</displayName>
-				<displayName count="one">ngultrum del Bhutan</displayName>
-				<displayName count="other">ngultrum del Bhutan</displayName>
+				<displayName>ngultrum bhutanese</displayName>
+				<displayName count="one">ngultrum bhutanese</displayName>
+				<displayName count="other">ngultrum bhutanesi</displayName>
 				<symbol>BTN</symbol>
 			</currency>
 			<currency type="BUK">
@@ -4928,6 +5049,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">pula del Botswana</displayName>
 				<displayName count="other">pula del Botswana</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>nuovo rublo bielorusso (1994–1999)</displayName>
@@ -4944,7 +5066,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dollaro del Belize</displayName>
 				<displayName count="other">dollari del Belize</displayName>
 				<symbol>BZD</symbol>
-				<symbol alt="narrow" draft="provisional">$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CAD">
 				<displayName>dollaro canadese</displayName>
@@ -4987,7 +5109,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">peso colombiano</displayName>
 				<displayName count="other">pesos colombiani</displayName>
 				<symbol>COP</symbol>
-				<symbol alt="narrow" draft="provisional">$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CRC">
 				<displayName>colón costaricano</displayName>
@@ -5003,22 +5125,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>corona forte cecoslovacca</displayName>
 			</currency>
 			<currency type="CUC">
-				<displayName draft="contributed">peso cubano convertibile</displayName>
+				<displayName>peso cubano convertibile</displayName>
 				<displayName count="one">peso cubano convertibile</displayName>
 				<displayName count="other">pesos cubani convertibili</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">CUC$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>peso cubano</displayName>
 				<displayName count="one">peso cubano</displayName>
 				<displayName count="other">pesos cubani</displayName>
 				<symbol>CUP</symbol>
-				<symbol alt="narrow" draft="provisional">$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CVE">
-				<displayName>escudo del Capo Verde</displayName>
-				<displayName count="one">escudo del Capo Verde</displayName>
-				<displayName count="other">escudo del Capo Verde</displayName>
+				<displayName>escudo capoverdiano</displayName>
+				<displayName count="one">escudo capoverdiano</displayName>
+				<displayName count="other">escudos capoverdiani</displayName>
 				<symbol>CVE</symbol>
 			</currency>
 			<currency type="CYP">
@@ -5029,6 +5152,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">corona ceca</displayName>
 				<displayName count="other">corone ceche</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>ostmark della Germania Orientale</displayName>
@@ -5037,9 +5161,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>marco tedesco</displayName>
 			</currency>
 			<currency type="DJF">
-				<displayName>franco gibutiano</displayName>
-				<displayName count="one">franco gibutiano</displayName>
-				<displayName count="other">franco gibutiano</displayName>
+				<displayName>franco di Gibuti</displayName>
+				<displayName count="one">franco di Gibuti</displayName>
+				<displayName count="other">franchi di Gibuti</displayName>
 				<symbol>DJF</symbol>
 			</currency>
 			<currency type="DKK">
@@ -5047,13 +5171,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">corona danese</displayName>
 				<displayName count="other">corone danesi</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>peso dominicano</displayName>
 				<displayName count="one">peso dominicano</displayName>
 				<displayName count="other">pesos dominicani</displayName>
 				<symbol>DOP</symbol>
-				<symbol alt="narrow" draft="provisional">$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="DZD">
 				<displayName>dinaro algerino</displayName>
@@ -5075,11 +5200,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">sterlina egiziana</displayName>
 				<displayName count="other">sterline egiziane</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">£E</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>nakfa eritreo</displayName>
-				<displayName count="one" draft="contributed">nakfa eritreo</displayName>
-				<displayName count="other" draft="contributed">nakfa eritrei</displayName>
+				<displayName count="one">nakfa eritreo</displayName>
+				<displayName count="other">nakfa eritrei</displayName>
 				<symbol>ERN</symbol>
 			</currency>
 			<currency type="ESA">
@@ -5092,9 +5218,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>peseta spagnola</displayName>
 			</currency>
 			<currency type="ETB">
-				<displayName>birr etiopico</displayName>
-				<displayName count="one" draft="contributed">birr etiopico</displayName>
-				<displayName count="other" draft="contributed">birr etiopici</displayName>
+				<displayName>birr etiope</displayName>
+				<displayName count="one">birr etiope</displayName>
+				<displayName count="other">birr etiopi</displayName>
 				<symbol>ETB</symbol>
 			</currency>
 			<currency type="EUR">
@@ -5112,21 +5238,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dollaro delle Figi</displayName>
 				<displayName count="other">dollari delle Figi</displayName>
 				<symbol>FJD</symbol>
-				<symbol alt="narrow" draft="provisional">$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="FKP">
 				<displayName>sterlina delle Falkland</displayName>
 				<displayName count="one">sterlina delle Falkland</displayName>
 				<displayName count="other">sterline delle Falkland</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>franco francese</displayName>
 			</currency>
 			<currency type="GBP">
-				<displayName>sterlina inglese</displayName>
-				<displayName count="one" draft="contributed">sterlina britannica</displayName>
-				<displayName count="other" draft="contributed">sterline britanniche</displayName>
+				<displayName>sterlina britannica</displayName>
+				<displayName count="one">sterlina britannica</displayName>
+				<displayName count="other">sterline britanniche</displayName>
 				<symbol>£</symbol>
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
@@ -5138,6 +5265,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">lari georgiano</displayName>
 				<displayName count="other">lari georgiani</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">ლ</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>cedi del Ghana</displayName>
@@ -5156,16 +5284,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GMD">
-				<displayName>dalasi del Gambia</displayName>
-				<displayName count="one" draft="contributed">dalasi del Gambia</displayName>
-				<displayName count="other" draft="contributed">dalasi del Gambia</displayName>
+				<displayName>dalasi gambiano</displayName>
+				<displayName count="one">dalasi gambiano</displayName>
+				<displayName count="other">dalasi gambiani</displayName>
 				<symbol>GMD</symbol>
 			</currency>
 			<currency type="GNF">
 				<displayName>franco della Guinea</displayName>
-				<displayName count="one" draft="contributed">franco della Guinea</displayName>
-				<displayName count="other" draft="contributed">franchi della Guinea</displayName>
+				<displayName count="one">franco della Guinea</displayName>
+				<displayName count="other">franchi della Guinea</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>syli della Guinea</displayName>
@@ -5181,6 +5310,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">quetzal guatemalteco</displayName>
 				<displayName count="other">quetzal guatemaltechi</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>escudo della Guinea portoghese</displayName>
@@ -5207,6 +5337,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">lempira honduregna</displayName>
 				<displayName count="other">lempire honduregne</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>dinaro croato</displayName>
@@ -5216,6 +5347,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">kuna croata</displayName>
 				<displayName count="other">kune croate</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>gourde haitiano</displayName>
@@ -5228,12 +5360,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">fiorino ungherese</displayName>
 				<displayName count="other">fiorini ungheresi</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>rupia indonesiana</displayName>
 				<displayName count="one">rupia indonesiana</displayName>
 				<displayName count="other">rupie indonesiane</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>sterlina irlandese</displayName>
@@ -5272,6 +5406,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">corona islandese</displayName>
 				<displayName count="other">corone islandesi</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<pattern>¤ #,##0.00</pattern>
@@ -5306,9 +5441,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>KES</symbol>
 			</currency>
 			<currency type="KGS">
-				<displayName>som Kirghiso</displayName>
-				<displayName count="one" draft="contributed">som Kirghiso</displayName>
-				<displayName count="other" draft="contributed">som Kirghisi</displayName>
+				<displayName>som kirghiso</displayName>
+				<displayName count="one">som kirghiso</displayName>
+				<displayName count="other">som kirghisi</displayName>
 				<symbol>KGS</symbol>
 			</currency>
 			<currency type="KHR">
@@ -5319,16 +5454,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">៛</symbol>
 			</currency>
 			<currency type="KMF">
-				<displayName>franco Comoriano</displayName>
-				<displayName count="one" draft="contributed">franco Comoriano</displayName>
-				<displayName count="other" draft="contributed">franchi Comoriani</displayName>
+				<displayName>franco comoriano</displayName>
+				<displayName count="one">franco comoriano</displayName>
+				<displayName count="other">franchi comoriani</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>won nordcoreano</displayName>
 				<displayName count="one">won nordcoreano</displayName>
 				<displayName count="other">won nordcoreani</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>won sudcoreano</displayName>
@@ -5345,8 +5482,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="KYD">
 				<displayName>dollaro delle Isole Cayman</displayName>
-				<displayName count="one" draft="contributed">dollaro delle Isole Cayman</displayName>
-				<displayName count="other" draft="contributed">dollari delle Isole Cayman</displayName>
+				<displayName count="one">dollaro delle Isole Cayman</displayName>
+				<displayName count="other">dollari delle Isole Cayman</displayName>
 				<symbol>KYD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -5369,12 +5506,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">lira libanese</displayName>
 				<displayName count="other">lire libanesi</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>rupia di Sri Lanka</displayName>
-				<displayName count="one">rupia singalese</displayName>
-				<displayName count="other">rupie singalesi</displayName>
+				<displayName count="one">rupia di Sri Lanka</displayName>
+				<displayName count="other">rupie di Sri Lanka</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>dollaro liberiano</displayName>
@@ -5439,14 +5578,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ariary malgascio</displayName>
 				<displayName count="other">ariary malgasci</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>franco malgascio</displayName>
 			</currency>
 			<currency type="MKD">
-				<displayName>dinaro macedone</displayName>
-				<displayName count="one">denaro macedone</displayName>
-				<displayName count="other">denari macedoni</displayName>
+				<displayName>denar macedone</displayName>
+				<displayName count="one">dinaro macedone</displayName>
+				<displayName count="other">dinari macedoni</displayName>
 				<symbol>MKD</symbol>
 			</currency>
 			<currency type="MLF">
@@ -5457,6 +5597,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">kyat di Myanmar</displayName>
 				<displayName count="other">kyat di Myanmar</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>tugrik mongolo</displayName>
@@ -5473,8 +5614,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="MRO">
 				<displayName>ouguiya della Mauritania</displayName>
-				<displayName count="one" draft="contributed">ouguiya della Mauritania</displayName>
-				<displayName count="other" draft="contributed">ouguiya della Mauritania</displayName>
+				<displayName count="one">ouguiya della Mauritania</displayName>
+				<displayName count="other">ouguiya della Mauritania</displayName>
 				<symbol>MRO</symbol>
 			</currency>
 			<currency type="MTL">
@@ -5488,6 +5629,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">rupia mauriziana</displayName>
 				<displayName count="other">rupie mauriziane</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>rufiyaa delle Maldive</displayName>
@@ -5515,10 +5657,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>unidad de inversion (UDI) messicana</displayName>
 			</currency>
 			<currency type="MYR">
-				<displayName>ringgit della Malesia</displayName>
+				<displayName>ringgit malese</displayName>
 				<displayName count="one">ringgit malese</displayName>
 				<displayName count="other">ringgit malesi</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>escudo del Mozambico</displayName>
@@ -5534,7 +5677,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dollaro namibiano</displayName>
 				<displayName count="other">dollari namibiani</displayName>
 				<symbol>NAD</symbol>
-				<symbol alt="narrow" draft="provisional">$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="NGN">
 				<displayName>naira nigeriana</displayName>
@@ -5553,6 +5696,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">córdoba nicaraguense</displayName>
 				<displayName count="other">córdoba nicaraguensi</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>fiorino olandese</displayName>
@@ -5562,28 +5706,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">corona norvegese</displayName>
 				<displayName count="other">corone norvegesi</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">NKr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>rupia nepalese</displayName>
 				<displayName count="one">rupia nepalese</displayName>
 				<displayName count="other">rupie nepalesi</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>dollaro neozelandese</displayName>
 				<displayName count="one">dollaro neozelandese</displayName>
 				<displayName count="other">dollari neozelandesi</displayName>
 				<symbol draft="contributed">NZ$</symbol>
-				<symbol alt="narrow" draft="provisional">$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="OMR">
-				<displayName>rial dell’Oman</displayName>
-				<displayName count="one">rial dell’Oman</displayName>
-				<displayName count="other">rial dell’Oman</displayName>
+				<displayName>rial omanita</displayName>
+				<displayName count="one">rial omanita</displayName>
+				<displayName count="other">rial omaniti</displayName>
 				<symbol>OMR</symbol>
 			</currency>
 			<currency type="PAB">
-				<displayName>balboa di Panama</displayName>
+				<displayName>balboa panamense</displayName>
 				<displayName count="one">balboa panamense</displayName>
 				<displayName count="other">balboa panamensi</displayName>
 				<symbol>PAB</symbol>
@@ -5592,38 +5738,40 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>inti peruviano</displayName>
 			</currency>
 			<currency type="PEN">
-				<displayName>sol nuevo peruviano</displayName>
-				<displayName count="one">nuevo sol peruviano</displayName>
-				<displayName count="other">nuevos soles peruviani</displayName>
+				<displayName>nuovo sol peruviano</displayName>
+				<displayName count="one">nuovo sol peruviano</displayName>
+				<displayName count="other">nuovi sol peruviani</displayName>
 				<symbol>PEN</symbol>
 			</currency>
 			<currency type="PES">
 				<displayName>sol peruviano</displayName>
 			</currency>
 			<currency type="PGK">
-				<displayName>kina della Papua Nuova Guinea</displayName>
+				<displayName>kina papuana</displayName>
 				<displayName count="one">kina papuana</displayName>
 				<displayName count="other">kina papuane</displayName>
 				<symbol>PGK</symbol>
 			</currency>
 			<currency type="PHP">
-				<displayName>peso delle Filippine</displayName>
+				<displayName>peso filippino</displayName>
 				<displayName count="one">peso filippino</displayName>
 				<displayName count="other">pesos filippini</displayName>
 				<symbol>PHP</symbol>
 				<symbol alt="narrow" draft="contributed">₱</symbol>
 			</currency>
 			<currency type="PKR">
-				<displayName>rupia del Pakistan</displayName>
+				<displayName>rupia pakistana</displayName>
 				<displayName count="one">rupia pakistana</displayName>
 				<displayName count="other">rupie pakistane</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>złoty polacco</displayName>
 				<displayName count="one">złoty polacco</displayName>
 				<displayName count="other">złoty polacchi</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>złoty Polacco (1950–1995)</displayName>
@@ -5634,16 +5782,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>escudo portoghese</displayName>
 			</currency>
 			<currency type="PYG">
-				<displayName>guaraní del Paraguay</displayName>
-				<displayName count="one">guaraní paraguaiano</displayName>
-				<displayName count="other">guaraní paraguaiani</displayName>
+				<displayName>guaraní paraguayano</displayName>
+				<displayName count="one">guaraní paraguayano</displayName>
+				<displayName count="other">guaraní paraguayani</displayName>
 				<symbol>PYG</symbol>
 				<symbol alt="narrow" draft="contributed">₲</symbol>
 			</currency>
 			<currency type="QAR">
-				<displayName>rial del Qatar</displayName>
-				<displayName count="one">rial del Qatar</displayName>
-				<displayName count="other">rial del Qatar</displayName>
+				<displayName>rial qatariano</displayName>
+				<displayName count="one">rial qatariano</displayName>
+				<displayName count="other">rial qatariani</displayName>
 				<symbol>QAR</symbol>
 			</currency>
 			<currency type="RHD">
@@ -5653,9 +5801,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>leu della Romania</displayName>
 			</currency>
 			<currency type="RON">
-				<displayName draft="contributed">leu rumeno</displayName>
-				<displayName count="one" draft="contributed">leu rumeno</displayName>
-				<displayName count="other" draft="contributed">lei rumeni</displayName>
+				<displayName>leu rumeno</displayName>
+				<displayName count="one">leu rumeno</displayName>
+				<displayName count="other">lei rumeni</displayName>
 				<symbol>RON</symbol>
 			</currency>
 			<currency type="RSD">
@@ -5669,6 +5817,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">rublo russo</displayName>
 				<displayName count="other">rubli russi</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>rublo della CSI</displayName>
@@ -5678,6 +5827,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">franco ruandese</displayName>
 				<displayName count="other">franchi ruandesi</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>riyal saudita</displayName>
@@ -5686,11 +5836,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>SAR</symbol>
 			</currency>
 			<currency type="SBD">
-				<displayName>dollaro delle Isole Solomon</displayName>
-				<displayName count="one" draft="contributed">dollaro delle Isole Solomon</displayName>
-				<displayName count="other" draft="contributed">dollari delle Isole Solomon</displayName>
+				<displayName>dollaro delle Isole Salomone</displayName>
+				<displayName count="one">dollaro delle Isole Salomone</displayName>
+				<displayName count="other">dollari delle Isole Salomone</displayName>
 				<symbol>SBD</symbol>
-				<symbol alt="narrow" draft="provisional">$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SCR">
 				<displayName>rupia delle Seychelles</displayName>
@@ -5712,19 +5862,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">corona svedese</displayName>
 				<displayName count="other">corone svedesi</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>dollaro di Singapore</displayName>
 				<displayName count="one">dollaro di Singapore</displayName>
 				<displayName count="other">dollari di Singapore</displayName>
 				<symbol>SGD</symbol>
-				<symbol alt="narrow" draft="provisional">$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SHP">
 				<displayName>sterlina di Sant’Elena</displayName>
 				<displayName count="one">sterlina di Sant’Elena</displayName>
 				<displayName count="other">sterline di Sant’Elena</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>tallero sloveno</displayName>
@@ -5734,8 +5886,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="SLL">
 				<displayName>leone della Sierra Leone</displayName>
-				<displayName count="one" draft="contributed">leone sierraleonese</displayName>
-				<displayName count="other" draft="contributed">leoni della Sierra Leone</displayName>
+				<displayName count="one">leone della Sierra Leone</displayName>
+				<displayName count="other">leoni della Sierra Leone</displayName>
 				<symbol>SLL</symbol>
 			</currency>
 			<currency type="SOS">
@@ -5745,9 +5897,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>SOS</symbol>
 			</currency>
 			<currency type="SRD">
-				<displayName>dollaro surinamese</displayName>
-				<displayName count="one">dollaro surinamese</displayName>
-				<displayName count="other">dollari surinamesi</displayName>
+				<displayName>dollaro del Suriname</displayName>
+				<displayName count="one">dollaro del Suriname</displayName>
+				<displayName count="other">dollari del Suriname</displayName>
 				<symbol>SRD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -5755,17 +5907,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>fiorino del Suriname</displayName>
 			</currency>
 			<currency type="SSP">
-				<displayName>sterlina sudsudanese</displayName>
-				<displayName count="one">sterlina sudsudanese</displayName>
-				<displayName count="other">sterline sudsudanesi</displayName>
+				<displayName>sterlina sud-sudanese</displayName>
+				<displayName count="one">sterlina sud-sudanese</displayName>
+				<displayName count="other">sterline sud-sudanesi</displayName>
 				<symbol>SSP</symbol>
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="STD">
 				<displayName>dobra di Sao Tomé e Principe</displayName>
-				<displayName count="one" draft="contributed">dobra di Sao Tomé e Principe</displayName>
-				<displayName count="other" draft="contributed">dobra di Sao Tomé e Principe</displayName>
+				<displayName count="one">dobra di Sao Tomé e Principe</displayName>
+				<displayName count="other">dobra di Sao Tomé e Principe</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>rublo sovietico</displayName>
@@ -5778,6 +5931,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">lira siriana</displayName>
 				<displayName count="other">lire siriane</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>lilangeni dello Swaziland</displayName>
@@ -5790,14 +5944,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">baht thailandese</displayName>
 				<displayName count="other">baht thailandesi</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>rublo del Tajikistan</displayName>
 			</currency>
 			<currency type="TJS">
-				<displayName>somoni del Tajikistan</displayName>
-				<displayName count="one" draft="contributed">somoni del Tajikistan</displayName>
-				<displayName count="other" draft="contributed">somoni del Tajikistan</displayName>
+				<displayName>somoni tagiko</displayName>
+				<displayName count="one">somoni tagiko</displayName>
+				<displayName count="other">somoni tagiki</displayName>
 				<symbol>TJS</symbol>
 			</currency>
 			<currency type="TMM">
@@ -5816,10 +5971,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>TND</symbol>
 			</currency>
 			<currency type="TOP">
-				<displayName>paʻanga di Tonga</displayName>
-				<displayName count="one" draft="contributed">paʻanga di Tonga</displayName>
-				<displayName count="other" draft="contributed">paʻanga di Tonga</displayName>
+				<displayName>paʻanga tongano</displayName>
+				<displayName count="one">paʻanga tongano</displayName>
+				<displayName count="other">paʻanga tongani</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>escudo di Timor</displayName>
@@ -5835,14 +5991,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">lire turche</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
-				<symbol alt="variant" draft="unconfirmed">TL</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>dollaro di Trinidad e Tobago</displayName>
 				<displayName count="one">dollaro di Trinidad e Tobago</displayName>
 				<displayName count="other">dollari di Trinidad e Tobago</displayName>
 				<symbol>TTD</symbol>
-				<symbol alt="narrow" draft="provisional">$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="TWD">
 				<displayName>nuovo dollaro taiwanese</displayName>
@@ -5853,8 +6009,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="TZS">
 				<displayName>scellino della Tanzania</displayName>
-				<displayName count="one" draft="contributed">scellino della Tanzania</displayName>
-				<displayName count="other" draft="contributed">scellini della Tanzania</displayName>
+				<displayName count="one">scellino della Tanzania</displayName>
+				<displayName count="other">scellini della Tanzania</displayName>
 				<symbol>TZS</symbol>
 			</currency>
 			<currency type="UAH">
@@ -5896,16 +6052,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>peso uruguaiano (1975–1993)</displayName>
 			</currency>
 			<currency type="UYU">
-				<displayName>peso uruguaiano</displayName>
-				<displayName count="one">peso uruguaiano</displayName>
-				<displayName count="other">pesos uruguaiani</displayName>
+				<displayName>peso uruguayano</displayName>
+				<displayName count="one">peso uruguayano</displayName>
+				<displayName count="other">pesos uruguayani</displayName>
 				<symbol>UYU</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="UZS">
-				<displayName>sum dell’Uzbekistan</displayName>
-				<displayName count="one" draft="contributed">sum dell’Uzbekistan</displayName>
-				<displayName count="other" draft="contributed">sum dell’Uzbekistan</displayName>
+				<displayName>sum uzbeco</displayName>
+				<displayName count="one">sum uzbeco</displayName>
+				<displayName count="other">sum uzbechi</displayName>
 				<symbol>UZS</symbol>
 			</currency>
 			<currency type="VEB">
@@ -5918,11 +6074,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">bolívar venezuelano</displayName>
 				<displayName count="other">bolívares venezuelani</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>dong vietnamita</displayName>
-				<displayName count="one" draft="contributed">dong vietnamita</displayName>
-				<displayName count="other" draft="contributed">dong vietnamiti</displayName>
+				<displayName count="one">dong vietnamita</displayName>
+				<displayName count="other">dong vietnamiti</displayName>
 				<symbol>₫</symbol>
 				<symbol alt="narrow" draft="contributed">₫</symbol>
 			</currency>
@@ -5933,7 +6090,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>VUV</symbol>
 			</currency>
 			<currency type="WST">
-				<displayName>tala della Samoa Occidentale</displayName>
+				<displayName>tala samoano</displayName>
 				<displayName count="one">tala samoano</displayName>
 				<displayName count="other">tala samoani</displayName>
 				<symbol>WST</symbol>
@@ -5963,10 +6120,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>unità di acconto europea (XBD)</displayName>
 			</currency>
 			<currency type="XCD">
-				<displayName>dollaro dei Caraibi Orientali</displayName>
-				<displayName count="one" draft="contributed">dollaro dei Caraibi orientali</displayName>
-				<displayName count="other" draft="contributed">dollari dei Caraibi orientali</displayName>
+				<displayName>dollaro dei Caraibi orientali</displayName>
+				<displayName count="one">dollaro dei Caraibi orientali</displayName>
+				<displayName count="other">dollari dei Caraibi orientali</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>diritti speciali di incasso</displayName>
@@ -6011,8 +6169,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="YER">
 				<displayName>riyal yemenita</displayName>
-				<displayName count="one" draft="contributed">rial yemenita</displayName>
-				<displayName count="other" draft="contributed">rial yemeniti</displayName>
+				<displayName count="one">rial yemenita</displayName>
+				<displayName count="other">rial yemeniti</displayName>
 				<symbol>YER</symbol>
 			</currency>
 			<currency type="YUD">
@@ -6032,6 +6190,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">rand sudafricano</displayName>
 				<displayName count="other">rand sudafricani</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>kwacha dello Zambia (1968–2012)</displayName>
@@ -6043,6 +6202,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">kwacha zambiano</displayName>
 				<displayName count="other">kwacha zambiani</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>nuovo zaire dello Zaire</displayName>
@@ -6077,40 +6237,67 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} metro al secondo quadrato</unitPattern>
 				<unitPattern count="other">{0} metri al secondo quadrato</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName>primi d’arco</displayName>
-				<unitPattern count="one">{0} primo d'arco</unitPattern>
-				<unitPattern count="other">{0} primi d'arco</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName>secondi d’arco</displayName>
-				<unitPattern count="one">{0} secondo d'arco</unitPattern>
-				<unitPattern count="other">{0} secondi d'arco</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName>gradi</displayName>
-				<unitPattern count="one">{0} grado</unitPattern>
-				<unitPattern count="other">{0} gradi</unitPattern>
+			<unit type="angle-revolution">
+				<displayName>rivoluzione</displayName>
+				<unitPattern count="one">{0} rivoluzione</unitPattern>
+				<unitPattern count="other">{0} rivoluzioni</unitPattern>
 			</unit>
 			<unit type="angle-radian">
 				<displayName>radianti</displayName>
 				<unitPattern count="one">{0} radiante</unitPattern>
 				<unitPattern count="other">{0} radianti</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName>acri</displayName>
-				<unitPattern count="one">{0} acro</unitPattern>
-				<unitPattern count="other">{0} acri</unitPattern>
+			<unit type="angle-degree">
+				<displayName>gradi</displayName>
+				<unitPattern count="one">{0} grado</unitPattern>
+				<unitPattern count="other">{0} gradi</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>primi d’arco</displayName>
+				<unitPattern count="one">{0} primo d’arco</unitPattern>
+				<unitPattern count="other">{0} primi d’arco</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>secondi d’arco</displayName>
+				<unitPattern count="one">{0} secondo d’arco</unitPattern>
+				<unitPattern count="other">{0} secondi d’arco</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>chilometri quadrati</displayName>
+				<unitPattern count="one">{0} chilometro quadrato</unitPattern>
+				<unitPattern count="other">{0} chilometri quadrati</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ettari</displayName>
 				<unitPattern count="one">{0} ettaro</unitPattern>
 				<unitPattern count="other">{0} ettari</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>metri quadrati</displayName>
+				<unitPattern count="one">{0} metro quadrato</unitPattern>
+				<unitPattern count="other">{0} metri quadrati</unitPattern>
+				<perUnitPattern>{0} per metro quadrato</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>centimetri quadrati</displayName>
 				<unitPattern count="one">{0} centimetro quadrato</unitPattern>
 				<unitPattern count="other">{0} centimetri quadrati</unitPattern>
+				<perUnitPattern>{0} per centimetro quadrato</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>miglia quadrate</displayName>
+				<unitPattern count="one">{0} miglio quadrato</unitPattern>
+				<unitPattern count="other">{0} miglia quadrate</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acri</displayName>
+				<unitPattern count="one">{0} acro</unitPattern>
+				<unitPattern count="other">{0} acri</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>iarde quadrate</displayName>
+				<unitPattern count="one">{0} iarda quadrata</unitPattern>
+				<unitPattern count="other">{0} iarde quadrate</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>piedi quadrati</displayName>
@@ -6121,91 +6308,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>pollici quadrati</displayName>
 				<unitPattern count="one">{0} pollice quadrato</unitPattern>
 				<unitPattern count="other">{0} pollici quadrati</unitPattern>
+				<perUnitPattern>{0} per pollice quadrato</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>chilometri quadrati</displayName>
-				<unitPattern count="one">{0} chilometro quadrato</unitPattern>
-				<unitPattern count="other">{0} chilometri quadrati</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>metri quadrati</displayName>
-				<unitPattern count="one">{0} metro quadrato</unitPattern>
-				<unitPattern count="other">{0} metri quadrati</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>miglia quadrate</displayName>
-				<unitPattern count="one">{0} miglio quadrato</unitPattern>
-				<unitPattern count="other">{0} miglia quadrate</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>iarde quadrate</displayName>
-				<unitPattern count="one">{0} iarda quadrata</unitPattern>
-				<unitPattern count="other">{0} iarde quadrate</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>carati</displayName>
+				<unitPattern count="one">{0} carato</unitPattern>
+				<unitPattern count="other">{0} carati</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litri per chilometro</displayName>
 				<unitPattern count="one">{0} litro per chilometro</unitPattern>
 				<unitPattern count="other">{0} litri per chilometro</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>litri per 100 chilometri</displayName>
+				<unitPattern count="one">{0} litro per 100 chilometri</unitPattern>
+				<unitPattern count="other">{0} litri per 100 chilometri</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>miglia per gallone</displayName>
 				<unitPattern count="one">{0} miglio per gallone</unitPattern>
 				<unitPattern count="other">{0} miglia per gallone</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabit</displayName>
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="other">{0} gigabit</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabyte</displayName>
-				<unitPattern count="one">{0} gigabyte</unitPattern>
-				<unitPattern count="other">{0} gigabyte</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobit</displayName>
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="other">{0} kilobit</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobyte</displayName>
-				<unitPattern count="one">{0} kilobyte</unitPattern>
-				<unitPattern count="other">{0} kilobyte</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabit</displayName>
-				<unitPattern count="one">{0} megabit</unitPattern>
-				<unitPattern count="other">{0} megabit</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabyte</displayName>
-				<unitPattern count="one">{0} megabyte</unitPattern>
-				<unitPattern count="other">{0} megabyte</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabit</displayName>
-				<unitPattern count="one">{0} terabit</unitPattern>
-				<unitPattern count="other">{0} terabit</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabyte</displayName>
 				<unitPattern count="one">{0} terabyte</unitPattern>
 				<unitPattern count="other">{0} terabyte</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabit</displayName>
+				<unitPattern count="one">{0} terabit</unitPattern>
+				<unitPattern count="other">{0} terabit</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabyte</displayName>
+				<unitPattern count="one">{0} gigabyte</unitPattern>
+				<unitPattern count="other">{0} gigabyte</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabit</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="other">{0} gigabit</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabyte</displayName>
+				<unitPattern count="one">{0} megabyte</unitPattern>
+				<unitPattern count="other">{0} megabyte</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabit</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="other">{0} megabit</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobyte</displayName>
+				<unitPattern count="one">{0} kilobyte</unitPattern>
+				<unitPattern count="other">{0} kilobyte</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobit</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="other">{0} kilobit</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>secoli</displayName>
+				<unitPattern count="one">{0} secolo</unitPattern>
+				<unitPattern count="other">{0} secoli</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>anni</displayName>
+				<unitPattern count="one">{0} anno</unitPattern>
+				<unitPattern count="other">{0} anni</unitPattern>
+				<perUnitPattern>{0} all’anno</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mesi</displayName>
+				<unitPattern count="one">{0} mese</unitPattern>
+				<unitPattern count="other">{0} mesi</unitPattern>
+				<perUnitPattern>{0} al mese</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>settimane</displayName>
+				<unitPattern count="one">{0} settimana</unitPattern>
+				<unitPattern count="other">{0} settimane</unitPattern>
+				<perUnitPattern>{0}/settimana</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>giorni</displayName>
 				<unitPattern count="one">{0} giorno</unitPattern>
 				<unitPattern count="other">{0} giorni</unitPattern>
+				<perUnitPattern>{0} al giorno</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>ore</displayName>
@@ -6213,30 +6415,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ore</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>microsecondi</displayName>
-				<unitPattern count="one">{0} microsecondo</unitPattern>
-				<unitPattern count="other">{0} microsecondi</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>millisecondi</displayName>
-				<unitPattern count="one">{0} millisecondo</unitPattern>
-				<unitPattern count="other">{0} millisecondi</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>minuti</displayName>
 				<unitPattern count="one">{0} minuto</unitPattern>
 				<unitPattern count="other">{0} minuti</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>mesi</displayName>
-				<unitPattern count="one">{0} mese</unitPattern>
-				<unitPattern count="other">{0} mesi</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanosecondi</displayName>
-				<unitPattern count="one">{0} nanosecondo</unitPattern>
-				<unitPattern count="other">{0} nanosecondi</unitPattern>
+				<perUnitPattern>{0} al minuto</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>secondi</displayName>
@@ -6244,15 +6427,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} secondi</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>settimane</displayName>
-				<unitPattern count="one">{0} settimana</unitPattern>
-				<unitPattern count="other">{0} settimane</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>millisecondi</displayName>
+				<unitPattern count="one">{0} millisecondo</unitPattern>
+				<unitPattern count="other">{0} millisecondi</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>anni</displayName>
-				<unitPattern count="one">{0} anno</unitPattern>
-				<unitPattern count="other">{0} anni</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>microsecondi</displayName>
+				<unitPattern count="one">{0} microsecondo</unitPattern>
+				<unitPattern count="other">{0} microsecondi</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosecondi</displayName>
+				<unitPattern count="one">{0} nanosecondo</unitPattern>
+				<unitPattern count="other">{0} nanosecondi</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ampere</displayName>
@@ -6274,6 +6462,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} volt</unitPattern>
 				<unitPattern count="other">{0} volt</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>chilocalorie</displayName>
+				<unitPattern count="one">{0} chilocaloria</unitPattern>
+				<unitPattern count="other">{0} chilocalorie</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>calorie</displayName>
 				<unitPattern count="one">{0} caloria</unitPattern>
@@ -6284,21 +6477,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} caloria</unitPattern>
 				<unitPattern count="other">{0} calorie</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="one">{0} joule</unitPattern>
-				<unitPattern count="other">{0} joule</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>chilocalorie</displayName>
-				<unitPattern count="one">{0} chilocaloria</unitPattern>
-				<unitPattern count="other">{0} chilocalorie</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojoule</displayName>
 				<unitPattern count="one">{0} kilojoule</unitPattern>
 				<unitPattern count="other">{0} kilojoule</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="one">{0} joule</unitPattern>
+				<unitPattern count="other">{0} joule</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>chilowattora</displayName>
 				<unitPattern count="one">{0} chilowattora</unitPattern>
@@ -6309,201 +6497,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} gigahertz</unitPattern>
 				<unitPattern count="other">{0} gigahertz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hertz</displayName>
-				<unitPattern count="one">{0} hertz</unitPattern>
-				<unitPattern count="other">{0} hertz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megahertz</displayName>
+				<unitPattern count="one">{0} megahertz</unitPattern>
+				<unitPattern count="other">{0} megahertz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kilohertz</displayName>
 				<unitPattern count="one">{0} kilohertz</unitPattern>
 				<unitPattern count="other">{0} kilohertz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megahertz</displayName>
-				<unitPattern count="one">{0} megahertz</unitPattern>
-				<unitPattern count="other">{0} megahertz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hertz</displayName>
+				<unitPattern count="one">{0} hertz</unitPattern>
+				<unitPattern count="other">{0} hertz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>unità astronomiche</displayName>
-				<unitPattern count="one">{0} unità astronomica</unitPattern>
-				<unitPattern count="other">{0} unità astronomiche</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>chilometri</displayName>
+				<unitPattern count="one">{0} chilometro</unitPattern>
+				<unitPattern count="other">{0} chilometri</unitPattern>
+				<perUnitPattern draft="contributed">{0} per chilometro</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>centimetri</displayName>
-				<unitPattern count="one">{0} centimetro</unitPattern>
-				<unitPattern count="other">{0} centimetri</unitPattern>
+			<unit type="length-meter">
+				<displayName>metri</displayName>
+				<unitPattern count="one">{0} metro</unitPattern>
+				<unitPattern count="other">{0} metri</unitPattern>
+				<perUnitPattern draft="contributed">{0} per metro</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>decimetri</displayName>
 				<unitPattern count="one">{0} decimetro</unitPattern>
 				<unitPattern count="other">{0} decimetri</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>piedi</displayName>
-				<unitPattern count="one">{0} piede</unitPattern>
-				<unitPattern count="other">{0} piedi</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>pollici</displayName>
-				<unitPattern count="one">{0} pollice</unitPattern>
-				<unitPattern count="other">{0} pollici</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>chilometri</displayName>
-				<unitPattern count="one">{0} chilometro</unitPattern>
-				<unitPattern count="other">{0} chilometri</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>anni luce</displayName>
-				<unitPattern count="one">{0} anno luce</unitPattern>
-				<unitPattern count="other">{0} anni luce</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metri</displayName>
-				<unitPattern count="one">{0} metro</unitPattern>
-				<unitPattern count="other">{0} metri</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>micrometri</displayName>
-				<unitPattern count="one">{0} micrometro</unitPattern>
-				<unitPattern count="other">{0} micrometri</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>miglia</displayName>
-				<unitPattern count="one">{0} miglio</unitPattern>
-				<unitPattern count="other">{0} miglia</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>centimetri</displayName>
+				<unitPattern count="one">{0} centimetro</unitPattern>
+				<unitPattern count="other">{0} centimetri</unitPattern>
+				<perUnitPattern>{0} per centimetro</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>millimetri</displayName>
 				<unitPattern count="one">{0} millimetro</unitPattern>
 				<unitPattern count="other">{0} millimetri</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>micrometri</displayName>
+				<unitPattern count="one">{0} micrometro</unitPattern>
+				<unitPattern count="other">{0} micrometri</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanometri</displayName>
 				<unitPattern count="one">{0} nanometro</unitPattern>
 				<unitPattern count="other">{0} nanometri</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>miglia nautiche</displayName>
-				<unitPattern count="one">{0} miglio nautico</unitPattern>
-				<unitPattern count="other">{0} miglia nautiche</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsec</displayName>
-				<unitPattern count="one">{0} parsec</unitPattern>
-				<unitPattern count="other">{0} parsec</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>picometri</displayName>
 				<unitPattern count="one">{0} picometro</unitPattern>
 				<unitPattern count="other">{0} picometri</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>miglia</displayName>
+				<unitPattern count="one">{0} miglio</unitPattern>
+				<unitPattern count="other">{0} miglia</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>iarde</displayName>
 				<unitPattern count="one">{0} iarda</unitPattern>
 				<unitPattern count="other">{0} iarde</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>piedi</displayName>
+				<unitPattern count="one">{0} piede</unitPattern>
+				<unitPattern count="other">{0} piedi</unitPattern>
+				<perUnitPattern>{0} per piede</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>pollici</displayName>
+				<unitPattern count="one">{0} pollice</unitPattern>
+				<unitPattern count="other">{0} pollici</unitPattern>
+				<perUnitPattern>{0} per pollice</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsec</displayName>
+				<unitPattern count="one">{0} parsec</unitPattern>
+				<unitPattern count="other">{0} parsec</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>anni luce</displayName>
+				<unitPattern count="one">{0} anno luce</unitPattern>
+				<unitPattern count="other">{0} anni luce</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>unità astronomiche</displayName>
+				<unitPattern count="one">{0} unità astronomica</unitPattern>
+				<unitPattern count="other">{0} unità astronomiche</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>miglia nautiche</displayName>
+				<unitPattern count="one">{0} miglio nautico</unitPattern>
+				<unitPattern count="other">{0} miglia nautiche</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>miglia scandinave</displayName>
+				<unitPattern count="one">{0} miglio scandinavo</unitPattern>
+				<unitPattern count="other">{0} miglia scandinave</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>carati</displayName>
-				<unitPattern count="one">{0} carato</unitPattern>
-				<unitPattern count="other">{0} carati</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>grammi</displayName>
-				<unitPattern count="one">{0} grammo</unitPattern>
-				<unitPattern count="other">{0} grammi</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>chilogrammi</displayName>
-				<unitPattern count="one">{0} chilogrammo</unitPattern>
-				<unitPattern count="other">{0} chilogrammi</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>tonnellate metriche</displayName>
 				<unitPattern count="one">{0} tonnellata metrica</unitPattern>
 				<unitPattern count="other">{0} tonnellate metriche</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>microgrammi</displayName>
-				<unitPattern count="one">{0} microgrammo</unitPattern>
-				<unitPattern count="other">{0} microgrammi</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>chilogrammi</displayName>
+				<unitPattern count="one">{0} chilogrammo</unitPattern>
+				<unitPattern count="other">{0} chilogrammi</unitPattern>
+				<perUnitPattern>{0} per chilogrammo</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>grammi</displayName>
+				<unitPattern count="one">{0} grammo</unitPattern>
+				<unitPattern count="other">{0} grammi</unitPattern>
+				<perUnitPattern>{0} per grammo</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>milligrammi</displayName>
 				<unitPattern count="one">{0} milligrammo</unitPattern>
 				<unitPattern count="other">{0} milligrammi</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>once</displayName>
-				<unitPattern count="one">{0} oncia</unitPattern>
-				<unitPattern count="other">{0} once</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>once troy</displayName>
-				<unitPattern count="one">{0} oncia troy</unitPattern>
-				<unitPattern count="other">{0} once troy</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>libbre</displayName>
-				<unitPattern count="one">{0} libbra</unitPattern>
-				<unitPattern count="other">{0} libbre</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>microgrammi</displayName>
+				<unitPattern count="one">{0} microgrammo</unitPattern>
+				<unitPattern count="other">{0} microgrammi</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tonnellate</displayName>
 				<unitPattern count="one">{0} tonnellata</unitPattern>
 				<unitPattern count="other">{0} tonnellate</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>libbre</displayName>
+				<unitPattern count="one">{0} libbra</unitPattern>
+				<unitPattern count="other">{0} libbre</unitPattern>
+				<perUnitPattern>{0} per libbra</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>once</displayName>
+				<unitPattern count="one">{0} oncia</unitPattern>
+				<unitPattern count="other">{0} once</unitPattern>
+				<perUnitPattern>{0} per oncia</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>once troy</displayName>
+				<unitPattern count="one">{0} oncia troy</unitPattern>
+				<unitPattern count="other">{0} once troy</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>carati</displayName>
+				<unitPattern count="one">{0} carato</unitPattern>
+				<unitPattern count="other">{0} carati</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigawatt</displayName>
 				<unitPattern count="one">{0} gigawatt</unitPattern>
 				<unitPattern count="other">{0} gigawatt</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>cavalli vapore</displayName>
-				<unitPattern count="one">{0} cavallo vapore</unitPattern>
-				<unitPattern count="other">{0} cavalli vapore</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilowatt</displayName>
-				<unitPattern count="one">{0} kilowatt</unitPattern>
-				<unitPattern count="other">{0} kilowatt</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>megawatt</displayName>
 				<unitPattern count="one">{0} megawatt</unitPattern>
 				<unitPattern count="other">{0} megawatt</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>milliwatt</displayName>
-				<unitPattern count="one">{0} milliwatt</unitPattern>
-				<unitPattern count="other">{0} milliwatt</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilowatt</displayName>
+				<unitPattern count="one">{0} kilowatt</unitPattern>
+				<unitPattern count="other">{0} kilowatt</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watt</displayName>
 				<unitPattern count="one">{0} watt</unitPattern>
 				<unitPattern count="other">{0} watt</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>milliwatt</displayName>
+				<unitPattern count="one">{0} milliwatt</unitPattern>
+				<unitPattern count="other">{0} milliwatt</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>cavalli vapore</displayName>
+				<unitPattern count="one">{0} cavallo vapore</unitPattern>
+				<unitPattern count="other">{0} cavalli vapore</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>ettopascal</displayName>
 				<unitPattern count="one">{0} ettopascal</unitPattern>
 				<unitPattern count="other">{0} ettopascal</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>pollici di mercurio</displayName>
-				<unitPattern count="one">{0} pollice di mercurio</unitPattern>
-				<unitPattern count="other">{0} pollici di mercurio</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>millibar</displayName>
-				<unitPattern count="one">{0} millibar</unitPattern>
-				<unitPattern count="other">{0} millibar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>millimetri di mercurio</displayName>
 				<unitPattern count="one">{0} millimetro di mercurio</unitPattern>
@@ -6514,10 +6706,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} libbra per pollice quadrato</unitPattern>
 				<unitPattern count="other">{0} libbre per pollice quadrato</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>carati</displayName>
-				<unitPattern count="one">{0} carato</unitPattern>
-				<unitPattern count="other">{0} carati</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>pollici di mercurio</displayName>
+				<unitPattern count="one">{0} pollice di mercurio</unitPattern>
+				<unitPattern count="other">{0} pollici di mercurio</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>millibar</displayName>
+				<unitPattern count="one">{0} millibar</unitPattern>
+				<unitPattern count="other">{0} millibar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>chilometri orari</displayName>
@@ -6534,6 +6731,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} miglio all’ora</unitPattern>
 				<unitPattern count="other">{0} miglia all’ora</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>nodo</displayName>
+				<unitPattern count="one">{0} nodo</unitPattern>
+				<unitPattern count="other">{0} nodi</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>gradi Celsius</displayName>
 				<unitPattern count="one">{0} grado Celsius</unitPattern>
@@ -6549,31 +6756,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Kelvin</unitPattern>
 				<unitPattern count="other">{0} Kelvin</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>acre-feet</displayName>
-				<unitPattern count="one">{0} acre-foot</unitPattern>
-				<unitPattern count="other">{0} acre-feet</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>centilitri</displayName>
-				<unitPattern count="one">{0} centilitro</unitPattern>
-				<unitPattern count="other">{0} centilitri</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>centimetri cubi</displayName>
-				<unitPattern count="one">{0} centimetro cubo</unitPattern>
-				<unitPattern count="other">{0} centimetri cubi</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>piedi cubi</displayName>
-				<unitPattern count="one">{0} piede cubo</unitPattern>
-				<unitPattern count="other">{0} piedi cubi</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>pollici cubi</displayName>
-				<unitPattern count="one">{0} pollice cubo</unitPattern>
-				<unitPattern count="other">{0} pollici cubi</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>chilometri cubi</displayName>
 				<unitPattern count="one">{0} chilometro cubo</unitPattern>
@@ -6583,6 +6765,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>metri cubi</displayName>
 				<unitPattern count="one">{0} metro cubo</unitPattern>
 				<unitPattern count="other">{0} metri cubi</unitPattern>
+				<perUnitPattern>{0} per metro cubo</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>centimetri cubi</displayName>
+				<unitPattern count="one">{0} centimetro cubo</unitPattern>
+				<unitPattern count="other">{0} centimetri cubi</unitPattern>
+				<perUnitPattern>{0} per centimetro cubo</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>miglia cube</displayName>
@@ -6594,25 +6783,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} iarda cubica</unitPattern>
 				<unitPattern count="other">{0} iarde cubiche</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>tazze</displayName>
-				<unitPattern count="one">{0} tazza</unitPattern>
-				<unitPattern count="other">{0} tazze</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>piedi cubi</displayName>
+				<unitPattern count="one">{0} piede cubo</unitPattern>
+				<unitPattern count="other">{0} piedi cubi</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>decilitri</displayName>
-				<unitPattern count="one">{0} decilitro</unitPattern>
-				<unitPattern count="other">{0} decilitri</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>pollici cubi</displayName>
+				<unitPattern count="one">{0} pollice cubo</unitPattern>
+				<unitPattern count="other">{0} pollici cubi</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>once fluide</displayName>
-				<unitPattern count="one">{0} oncia fluida</unitPattern>
-				<unitPattern count="other">{0} once fluide</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>galloni</displayName>
-				<unitPattern count="one">{0} gallone</unitPattern>
-				<unitPattern count="other">{0} galloni</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megalitri</displayName>
+				<unitPattern count="one">{0} megalitro</unitPattern>
+				<unitPattern count="other">{0} megalitri</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>ettolitri</displayName>
@@ -6623,27 +6807,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>litri</displayName>
 				<unitPattern count="one">{0} litro</unitPattern>
 				<unitPattern count="other">{0} litri</unitPattern>
+				<perUnitPattern>{0} per litro</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalitri</displayName>
-				<unitPattern count="one">{0} megalitro</unitPattern>
-				<unitPattern count="other">{0} megalitri</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>decilitri</displayName>
+				<unitPattern count="one">{0} decilitro</unitPattern>
+				<unitPattern count="other">{0} decilitri</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centilitri</displayName>
+				<unitPattern count="one">{0} centilitro</unitPattern>
+				<unitPattern count="other">{0} centilitri</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>millilitri</displayName>
 				<unitPattern count="one">{0} millilitro</unitPattern>
 				<unitPattern count="other">{0} millilitri</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pinte</displayName>
-				<unitPattern count="one">{0} pinta</unitPattern>
-				<unitPattern count="other">{0} pinte</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>pinte metriche</displayName>
+				<unitPattern count="one">{0} pinta metrica</unitPattern>
+				<unitPattern count="other">{0} pinte metriche</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>tazze metriche</displayName>
+				<unitPattern count="one">{0} tazza metrica</unitPattern>
+				<unitPattern count="other">{0} tazze metriche</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acre-feet</displayName>
+				<unitPattern count="one">{0} acre-foot</unitPattern>
+				<unitPattern count="other">{0} acre-feet</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galloni</displayName>
+				<unitPattern count="one">{0} gallone</unitPattern>
+				<unitPattern count="other">{0} galloni</unitPattern>
+				<perUnitPattern>{0} per gallone</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>quarti</displayName>
 				<unitPattern count="one">{0} quarto</unitPattern>
 				<unitPattern count="other">{0} quarti</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pinte</displayName>
+				<unitPattern count="one">{0} pinta</unitPattern>
+				<unitPattern count="other">{0} pinte</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>tazze</displayName>
+				<unitPattern count="one">{0} tazza</unitPattern>
+				<unitPattern count="other">{0} tazze</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>once fluide</displayName>
+				<unitPattern count="one">{0} oncia fluida</unitPattern>
+				<unitPattern count="other">{0} once fluide</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>cucchiai da tavola</displayName>
 				<unitPattern count="one">{0} cucchiaio da tavola</unitPattern>
@@ -6654,6 +6875,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} cucchiaio da tè</unitPattern>
 				<unitPattern count="other">{0} cucchiai da tè</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}O</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -6669,6 +6896,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>riv</displayName>
+				<unitPattern count="one">{0} riv</unitPattern>
+				<unitPattern count="other">{0} riv</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>′</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
@@ -6679,30 +6921,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>°</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>acri</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ettari</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acri</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>piedi quadrati</displayName>
@@ -6713,91 +6967,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>in²</displayName>
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
 				<unitPattern count="one">{0} L/km</unitPattern>
 				<unitPattern count="other">{0} L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} L/100km</unitPattern>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>sec.</displayName>
+				<unitPattern count="one">{0} sec.</unitPattern>
+				<unitPattern count="other">{0} secc.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>anni</displayName>
+				<unitPattern count="one">{0} anno</unitPattern>
+				<unitPattern count="other">{0} anni</unitPattern>
+				<perUnitPattern>{0}/anno</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mesi</displayName>
+				<unitPattern count="one">{0} mese</unitPattern>
+				<unitPattern count="other">{0} mesi</unitPattern>
+				<perUnitPattern>{0}/mese</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>settimane</displayName>
+				<unitPattern count="one">{0} settimana</unitPattern>
+				<unitPattern count="other">{0} settimane</unitPattern>
+				<perUnitPattern>{0}/settimana</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>giorni</displayName>
 				<unitPattern count="one">{0} giorno</unitPattern>
 				<unitPattern count="other">{0} giorni</unitPattern>
+				<perUnitPattern>{0}/giorno</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>ore</displayName>
@@ -6805,47 +7074,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} h</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
+			<unit type="duration-minute">
+				<displayName>min</displayName>
+				<unitPattern count="one">{0} min</unitPattern>
+				<unitPattern count="other">{0} min</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>s</displayName>
+				<unitPattern count="one">{0} s</unitPattern>
+				<unitPattern count="other">{0} s</unitPattern>
+				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>ms</displayName>
 				<unitPattern count="one">{0} ms</unitPattern>
 				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>min</displayName>
-				<unitPattern count="one">{0} min</unitPattern>
-				<unitPattern count="other">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>mesi</displayName>
-				<unitPattern count="one">{0} mese</unitPattern>
-				<unitPattern count="other">{0} mesi</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>ns</displayName>
 				<unitPattern count="one">{0} ns</unitPattern>
 				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>sec</displayName>
-				<unitPattern count="one">{0} sec</unitPattern>
-				<unitPattern count="other">{0} sec</unitPattern>
-				<perUnitPattern>{0}/s</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>settimane</displayName>
-				<unitPattern count="one">{0} settimana</unitPattern>
-				<unitPattern count="other">{0} settimane</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>anni</displayName>
-				<unitPattern count="one">{0} anno</unitPattern>
-				<unitPattern count="other">{0} anni</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>A</displayName>
 				<unitPattern count="one">{0} A</unitPattern>
@@ -6866,6 +7121,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -6876,21 +7136,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Cal</unitPattern>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>J</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -6901,201 +7156,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>metri</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>piedi</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>pollici</displayName>
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>anni luce</displayName>
-				<unitPattern count="one">{0} al</unitPattern>
-				<unitPattern count="other">{0} al</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metri</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>miglia</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="one">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>miglia</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>iarde</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>piedi</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>pollici</displayName>
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>anni luce</displayName>
+				<unitPattern count="one">{0} al</unitPattern>
+				<unitPattern count="other">{0} al</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>carati</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>grammi</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>grammi</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ozt</displayName>
-				<unitPattern count="one">{0} ozt</unitPattern>
-				<unitPattern count="other">{0} ozt</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tn</displayName>
 				<unitPattern count="one">{0} tn</unitPattern>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ozt</displayName>
+				<unitPattern count="one">{0} ozt</unitPattern>
+				<unitPattern count="other">{0} ozt</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>carati</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hp</displayName>
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>W</displayName>
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -7106,10 +7365,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -7126,6 +7390,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0} °C</unitPattern>
@@ -7141,31 +7415,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -7175,6 +7424,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -7186,25 +7442,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>c</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -7215,27 +7466,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>litri</displayName>
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="one">{0} Ml</unitPattern>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
 				<unitPattern count="one">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>c</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>tbsp</displayName>
 				<unitPattern count="one">{0} tbsp</unitPattern>
@@ -7246,6 +7534,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} tsp</unitPattern>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}O</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -7255,6 +7549,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0}G</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one" draft="contributed">{0}min</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}min</unitPattern>
@@ -7263,26 +7561,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0}s</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}s</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one" draft="contributed">{0}ac</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one" draft="contributed">{0}km²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one" draft="contributed">{0}ha</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one" draft="contributed">{0}ft²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one" draft="contributed">{0}km²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one" draft="contributed">{0}m²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}m²</unitPattern>
@@ -7291,6 +7577,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0}mi²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one" draft="contributed">{0}ac</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one" draft="contributed">{0}ft²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} L/100km</unitPattern>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>anno</displayName>
+				<unitPattern count="one">{0}anno</unitPattern>
+				<unitPattern count="other">{0}anni</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mese</displayName>
+				<unitPattern count="one">{0}mesi</unitPattern>
+				<unitPattern count="other">{0}mesi</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>sett.</displayName>
+				<unitPattern count="one">{0}sett.</unitPattern>
+				<unitPattern count="other">{0}sett.</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>giorno</displayName>
 				<unitPattern count="one">{0}gg</unitPattern>
@@ -7301,67 +7615,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}h</unitPattern>
 				<unitPattern count="other">{0}h</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0}ms</unitPattern>
-				<unitPattern count="other">{0}ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0}min</unitPattern>
 				<unitPattern count="other">{0}min</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>mese</displayName>
-				<unitPattern count="one" draft="contributed">{0}mesi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}mesi</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>s</displayName>
 				<unitPattern count="one">{0}s</unitPattern>
 				<unitPattern count="other">{0}s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>sett.</displayName>
-				<unitPattern count="one">{0}sett.</unitPattern>
-				<unitPattern count="other">{0}sett.</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>anno</displayName>
-				<unitPattern count="one">{0}anno</unitPattern>
-				<unitPattern count="other">{0}anni</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0}cm</unitPattern>
-				<unitPattern count="other">{0}cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one" draft="contributed">{0}ft</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one" draft="contributed">{0}″</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0}ms</unitPattern>
+				<unitPattern count="other">{0}ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
 				<unitPattern count="one">{0}km</unitPattern>
 				<unitPattern count="other">{0}km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<displayName>al</displayName>
-				<unitPattern count="one">{0}al</unitPattern>
-				<unitPattern count="other">{0}al</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>metro</displayName>
 				<unitPattern count="one">{0}m</unitPattern>
 				<unitPattern count="other">{0}m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one" draft="contributed">{0}mi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0}cm</unitPattern>
+				<unitPattern count="other">{0}cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -7372,31 +7654,44 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0}pm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one" draft="contributed">{0}mi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one" draft="contributed">{0}yd</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0}g</unitPattern>
-				<unitPattern count="other">{0}g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one" draft="contributed">{0}ft</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}ft</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one" draft="contributed">{0}″</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>al</displayName>
+				<unitPattern count="one">{0}al</unitPattern>
+				<unitPattern count="other">{0}al</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="one">{0}kg</unitPattern>
 				<unitPattern count="other">{0}kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one" draft="contributed">{0}oz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}oz</unitPattern>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0}g</unitPattern>
+				<unitPattern count="other">{0}g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one" draft="contributed">{0}lb</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}lb</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one" draft="contributed">{0}hp</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}hp</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one" draft="contributed">{0}oz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one" draft="contributed">{0}kW</unitPattern>
@@ -7406,6 +7701,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0}W</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one" draft="contributed">{0}hp</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one" draft="contributed">{0}hPa</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}hPa</unitPattern>
@@ -7433,8 +7732,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
-				<unitPattern count="one">{0}°C</unitPattern>
-				<unitPattern count="other">{0}°C</unitPattern>
+				<unitPattern count="one">{0} °C</unitPattern>
+				<unitPattern count="other">{0} °C</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
 				<unitPattern count="one" draft="contributed">{0}°F</unitPattern>
@@ -7453,6 +7752,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}l</unitPattern>
 				<unitPattern count="other">{0}l</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}O</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/it_CH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it_CH.xml
similarity index 89%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/it_CH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it_CH.xml
index 177474bf234..95f74ea5ab8 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/it_CH.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it_CH.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11171 $"/>
-		<generation date="$Date: 2015-02-10 11:03:58 -0600 (Tue, 10 Feb 2015) $"/>
+		<version number="$Revision: 12415 $"/>
 		<language type="it"/>
 		<territory type="CH"/>
 	</identity>
@@ -31,7 +30,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern>d-MMM-y G</pattern>
+							<pattern>d MMM y G</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -94,6 +93,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="gregorian">
+				<months>
+					<monthContext type="stand-alone">
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">gennaio</month>
+							<month type="2" draft="contributed">febbraio</month>
+							<month type="3" draft="contributed">marzo</month>
+							<month type="4" draft="contributed">aprile</month>
+							<month type="5" draft="contributed">maggio</month>
+							<month type="6" draft="contributed">giugno</month>
+							<month type="7" draft="contributed">luglio</month>
+							<month type="8" draft="contributed">agosto</month>
+							<month type="9" draft="contributed">settembre</month>
+							<month type="10" draft="contributed">ottobre</month>
+							<month type="11" draft="contributed">novembre</month>
+							<month type="12" draft="contributed">dicembre</month>
+						</monthWidth>
+					</monthContext>
+				</months>
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
@@ -102,7 +119,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern>d-MMM-y</pattern>
+							<pattern>d MMM y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/it_IT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it_IT.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/it_IT.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it_IT.xml
index 230d22fc93c..65f21096041 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/it_IT.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it_IT.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="it"/>
 		<territory type="IT"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/it_SM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it_SM.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/it_SM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it_SM.xml
index 7d70beb63bc..8769e30cb5c 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/it_SM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it_SM.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="it"/>
 		<territory type="SM"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ja.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ja.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ja.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ja.xml
index 8f0f8b164a6..fbb1898a101 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ja.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ja.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="ja"/>
 	</identity>
 	<localeDisplayNames>
@@ -59,11 +58,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ay">アイマラ語</language>
 			<language type="az">アゼルバイジャン語</language>
 			<language type="az" alt="short">アゼリー語</language>
-			<language type="azb" draft="contributed">南アゼルバイジャン語</language>
 			<language type="ba">バシキール語</language>
 			<language type="bal">バルーチー語</language>
 			<language type="ban">バリ語</language>
-			<language type="bar" draft="provisional">バイエルン・オーストリア語</language>
+			<language type="bar" draft="contributed">バイエルン・オーストリア語</language>
 			<language type="bas">バサ語</language>
 			<language type="bax">バムン語</language>
 			<language type="bbc" draft="contributed">トバ・バタク語</language>
@@ -76,6 +74,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bfd">バフット語</language>
 			<language type="bfq" draft="contributed">バダガ語</language>
 			<language type="bg">ブルガリア語</language>
+			<language type="bgn">西バローチー語</language>
 			<language type="bho">ボージュプリー語</language>
 			<language type="bi">ビスラマ語</language>
 			<language type="bik">ビコル語</language>
@@ -133,7 +132,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="dar">ダルガン語</language>
 			<language type="dav">タイタ語</language>
 			<language type="de">ドイツ語</language>
-			<language type="de_CH">標準ドイツ語(スイス)</language>
+			<language type="de_CH">標準ドイツ語 (スイス)</language>
 			<language type="del">デラウェア語</language>
 			<language type="den">スレイビー語</language>
 			<language type="dgr">ドグリブ語</language>
@@ -167,7 +166,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="enm">中英語</language>
 			<language type="eo">エスペラント語</language>
 			<language type="es">スペイン語</language>
-			<language type="es_ES">スペイン語(イベリア半島)</language>
+			<language type="es_ES">スペイン語 (イベリア半島)</language>
 			<language type="esu" draft="contributed">中央アラスカ・ユピック語</language>
 			<language type="et">エストニア語</language>
 			<language type="eu">バスク語</language>
@@ -263,7 +262,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="jrb">ユダヤ・アラビア語</language>
 			<language type="jut">ユトランド語</language>
 			<language type="jv">ジャワ語</language>
-			<language type="ka">グルジア語</language>
+			<language type="ka">ジョージア語</language>
 			<language type="kaa">カラカルパク語</language>
 			<language type="kab">カビル語</language>
 			<language type="kac">カチン語</language>
@@ -332,6 +331,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">ラオ語</language>
 			<language type="lol">モンゴ語</language>
 			<language type="loz">ロジ語</language>
+			<language type="lrc">北ロル語</language>
 			<language type="lt">リトアニア語</language>
 			<language type="ltg" draft="contributed">ラトガリア語</language>
 			<language type="lu">ルバ・カタンガ語</language>
@@ -407,7 +407,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="no">ノルウェー語</language>
 			<language type="nog">ノガイ語</language>
 			<language type="non">古ノルド語</language>
-			<language type="nov" draft="provisional">ノヴィアル</language>
+			<language type="nov" draft="contributed">ノヴィアル</language>
 			<language type="nqo">ンコ語</language>
 			<language type="nr">南ンデベレ語</language>
 			<language type="nso">北部ソト語</language>
@@ -448,7 +448,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ps">パシュトゥー語</language>
 			<language type="ps" alt="variant">パシュトゥ語</language>
 			<language type="pt">ポルトガル語</language>
-			<language type="pt_PT">ポルトガル語(イベリア半島)</language>
+			<language type="pt_PT">ポルトガル語 (イベリア半島)</language>
 			<language type="qu">ケチュア語</language>
 			<language type="quc">キチェ語</language>
 			<language type="qug" draft="contributed">チンボラソ高地ケチュア語</language>
@@ -486,6 +486,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sco">スコットランド語</language>
 			<language type="sd">シンド語</language>
 			<language type="sdc" draft="contributed">サッサリ・サルデーニャ語</language>
+			<language type="sdh">南部クルド語</language>
 			<language type="se">北サーミ語</language>
 			<language type="see">セネカ語</language>
 			<language type="seh">セナ語</language>
@@ -528,8 +529,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">シュメール語</language>
 			<language type="sv">スウェーデン語</language>
 			<language type="sw">スワヒリ語</language>
+			<language type="sw_CD">コンゴ・スワヒリ語</language>
 			<language type="swb">コモロ語</language>
-			<language type="swc">コンゴ・スワヒリ語</language>
 			<language type="syc">古典シリア語</language>
 			<language type="syr">シリア語</language>
 			<language type="szl">シレジア語</language>
@@ -597,6 +598,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">ウォライタ語</language>
 			<language type="war">ワライ語</language>
 			<language type="was">ワショ語</language>
+			<language type="wbp">ワルピリ語</language>
 			<language type="wo">ウォロフ語</language>
 			<language type="wuu">呉語</language>
 			<language type="xal">カルムイク語</language>
@@ -662,8 +664,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Egyp">エジプト聖刻文字</script>
 			<script type="Elba" draft="contributed">エルバサン文字</script>
 			<script type="Ethi">エチオピア文字</script>
-			<script type="Geok">グルジア文字(フツリ)</script>
-			<script type="Geor">グルジア文字</script>
+			<script type="Geok">ジョージア文字(フツリ)</script>
+			<script type="Geor">ジョージア文字</script>
 			<script type="Glag">グラゴル文字</script>
 			<script type="Goth">ゴート文字</script>
 			<script type="Gran">グランタ文字</script>
@@ -833,7 +835,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">アンギラ</territory>
 			<territory type="AL">アルバニア</territory>
 			<territory type="AM">アルメニア</territory>
-			<territory type="AN">オランダ領アンティル</territory>
 			<territory type="AO">アンゴラ</territory>
 			<territory type="AQ">南極</territory>
 			<territory type="AR">アルゼンチン</territory>
@@ -914,7 +915,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GB">イギリス</territory>
 			<territory type="GB" alt="short">英国</territory>
 			<territory type="GD">グレナダ</territory>
-			<territory type="GE">グルジア</territory>
+			<territory type="GE">ジョージア</territory>
 			<territory type="GF">仏領ギアナ</territory>
 			<territory type="GG">ガーンジー</territory>
 			<territory type="GH">ガーナ</territory>
@@ -1174,6 +1175,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">数値による並べ替え</key>
 			<key type="colStrength" draft="contributed">強度による並べ替え</key>
 			<key type="currency">通貨</key>
+			<key type="hc">時間制(12 / 24)</key>
+			<key type="lb">禁則処理</key>
+			<key type="ms">単位系</key>
 			<key type="numbers">数値書式</key>
 			<key type="timezone" draft="contributed">タイムゾーン</key>
 			<key type="va" draft="contributed">ロケールのバリアント</key>
@@ -1181,121 +1185,131 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">私用</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">アラビア・インド数字</type>
-			<type type="arabext" key="numbers">ペルシア数字</type>
-			<type type="armn" key="numbers">アルメニア数字</type>
-			<type type="armnlow" key="numbers">アルメニア数字(小文字)</type>
-			<type type="bali" key="numbers">バリ数字</type>
-			<type type="beng" key="numbers">ベンガル数字</type>
-			<type type="big5han" key="collation">繁体字中国語順(Big5)</type>
-			<type type="brah" key="numbers" draft="contributed">ブラーフミー数字</type>
-			<type type="buddhist" key="calendar">タイ仏教暦</type>
-			<type type="cakm" key="numbers" draft="contributed">チャクマ数字</type>
-			<type type="cham" key="numbers">チャム数字</type>
-			<type type="chinese" key="calendar">中国暦</type>
-			<type type="coptic" key="calendar">コプト暦</type>
-			<type type="dangi" key="calendar">ダンギ暦</type>
-			<type type="deva" key="numbers">デーヴァナーガリー数字</type>
-			<type type="dictionary" key="collation">辞書順</type>
-			<type type="ducet" key="collation">ユニコード照合順</type>
-			<type type="eor" key="collation" draft="contributed">ヨーロッパ言語文字の並べ替え規則</type>
-			<type type="ethi" key="numbers">エチオピア数字</type>
-			<type type="ethiopic" key="calendar">エチオピア暦</type>
-			<type type="ethiopic-amete-alem" key="calendar">エチオピア創世紀元暦</type>
-			<type type="finance" key="numbers">財務用漢数字</type>
-			<type type="fullwide" key="numbers">全角数字</type>
-			<type type="gb2312han" key="collation">簡体字中国語順(GB2312)</type>
-			<type type="geor" key="numbers">グルジア数字</type>
-			<type type="gregorian" key="calendar">西暦(グレゴリオ暦)</type>
-			<type type="grek" key="numbers">ギリシャ数字</type>
-			<type type="greklow" key="numbers">ギリシャ数字(小文字)</type>
-			<type type="gujr" key="numbers">グジャラート数字</type>
-			<type type="guru" key="numbers">グルムキー数字</type>
-			<type type="hanidec" key="numbers">漢数字(位取り記数法)</type>
-			<type type="hans" key="numbers">簡体漢数字</type>
-			<type type="hansfin" key="numbers">簡体大字</type>
-			<type type="hant" key="numbers">繁体漢数字</type>
-			<type type="hantfin" key="numbers">繁体大字</type>
-			<type type="hebr" key="numbers">ヘブライ数字</type>
-			<type type="hebrew" key="calendar">ユダヤ暦</type>
-			<type type="identical" key="colStrength" draft="contributed">すべてを区別して並べ替え</type>
-			<type type="indian" key="calendar">インド国定暦</type>
-			<type type="islamic" key="calendar">イスラム暦</type>
-			<type type="islamic-civil" key="calendar">イスラム歴(定周期、公民紀元)</type>
-			<type type="islamic-rgsa" key="calendar" draft="contributed">イスラム暦(サウジアラビア、月観測)</type>
-			<type type="islamic-tbla" key="calendar">イスラム歴(定周期、天文紀元)</type>
-			<type type="islamic-umalqura" key="calendar" draft="contributed">イスラム暦(ウンム・アルクラー)</type>
-			<type type="iso8601" key="calendar">ISO-8601</type>
-			<type type="japanese" key="calendar">和暦</type>
-			<type type="java" key="numbers">ジャワ数字</type>
-			<type type="jpan" key="numbers">漢数字</type>
-			<type type="jpanfin" key="numbers">大字</type>
-			<type type="kali" key="numbers">カヤー数字</type>
-			<type type="khmr" key="numbers">クメール数字</type>
-			<type type="knda" key="numbers">カンナダ数字</type>
-			<type type="lana" key="numbers">ラーンナー数字</type>
-			<type type="lanatham" key="numbers">ラーンナー・タム数字</type>
-			<type type="laoo" key="numbers">ラオ数字</type>
-			<type type="latn" key="numbers">算用数字</type>
-			<type type="lepc" key="numbers">レプチャ数字</type>
-			<type type="limb" key="numbers">リンブ数字</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">小文字優先で並べ替え</type>
-			<type type="mlym" key="numbers">マラヤーラム数字</type>
-			<type type="mong" key="numbers">モンゴル数字</type>
-			<type type="mtei" key="numbers">マニプリ数字</type>
-			<type type="mymr" key="numbers">ミャンマー数字</type>
-			<type type="mymrshan" key="numbers">ミャンマー・シャン数字</type>
-			<type type="native" key="numbers" draft="contributed">独自の記数法</type>
-			<type type="nkoo" key="numbers">ンコ数字</type>
-			<type type="no" key="colBackwards" draft="contributed">アクセント（順方向）で並べ替え</type>
-			<type type="no" key="colCaseFirst" draft="contributed">大文字小文字を通常の順序で並べ替え</type>
-			<type type="no" key="colCaseLevel" draft="contributed">大文字小文字を区別しないで並べ替え</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">仮名を区別しないで並べ替え</type>
-			<type type="no" key="colNormalization">正規化しないで並べ替え</type>
-			<type type="no" key="colNumeric" draft="contributed">数値を独立して並べ替え</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">記号で並べ替え</type>
-			<type type="olck" key="numbers">オルチキ数字</type>
-			<type type="orya" key="numbers">オリヤー数字</type>
-			<type type="osma" key="numbers" draft="contributed">オスマニア数字</type>
-			<type type="persian" key="calendar">ペルシア暦</type>
-			<type type="phonebook" key="collation">電話帳順</type>
-			<type type="phonetic" key="collation" draft="contributed">音声順による並べ替え</type>
-			<type type="pinyin" key="collation">ピンイン</type>
-			<type type="primary" key="colStrength" draft="contributed">基本文字のみで並べ替え</type>
-			<type type="quaternary" key="colStrength" draft="contributed">アクセント/大文字小文字/全角半角/仮名で並べ替え</type>
-			<type type="reformed" key="collation">リフォーム</type>
-			<type type="roc" key="calendar">中華民国暦</type>
-			<type type="roman" key="numbers">ローマ数字</type>
-			<type type="romanlow" key="numbers">ローマ数字(小文字)</type>
-			<type type="saur" key="numbers">サウラーシュトラ数字</type>
-			<type type="search" key="collation">汎用検索</type>
-			<type type="searchjl" key="collation">ハングル語頭子音による並べ替え</type>
-			<type type="secondary" key="colStrength" draft="contributed">アクセントで並べ替え</type>
-			<type type="shifted" key="colAlternate" draft="contributed">記号を無視して並べ替え</type>
-			<type type="shrd" key="numbers" draft="contributed">シャーラダー数字</type>
-			<type type="sora" key="numbers" draft="contributed">ソラ・ソンペン数字</type>
-			<type type="standard" key="collation">標準ソート順序</type>
-			<type type="stroke" key="collation">画数順</type>
-			<type type="sund" key="numbers">スンダ数字</type>
-			<type type="takr" key="numbers" draft="contributed">タークリー数字</type>
-			<type type="talu" key="numbers">新タイ・ルー数字</type>
-			<type type="taml" key="numbers">タミール数字</type>
-			<type type="tamldec" key="numbers">タミル数字</type>
-			<type type="telu" key="numbers">テルグ数字</type>
-			<type type="tertiary" key="colStrength" draft="contributed">アクセント/大文字小文字/全角半角で並べ替え</type>
-			<type type="thai" key="numbers">タイ数字</type>
-			<type type="tibt" key="numbers">チベット数字</type>
-			<type type="traditional" key="collation">トラディッショナル</type>
-			<type type="traditional" key="numbers" draft="contributed">従来の記数法</type>
-			<type type="unihan" key="collation">部首順</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">大文字優先で並べ替え</type>
-			<type type="vaii" key="numbers">ヴァイ文字の記数法</type>
-			<type type="yes" key="colBackwards" draft="contributed">アクセント（逆方向）で並べ替え</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">大文字小文字を区別して並べ替え</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">仮名を区別して並べ替え</type>
-			<type type="yes" key="colNormalization">Unicode 正規化で並べ替え</type>
-			<type type="yes" key="colNumeric" draft="contributed">数値を数値として並べ替え</type>
-			<type type="zhuyin" key="collation" draft="contributed">注音順</type>
+			<type key="calendar" type="buddhist">タイ仏教暦</type>
+			<type key="calendar" type="chinese">中国暦</type>
+			<type key="calendar" type="coptic">コプト暦</type>
+			<type key="calendar" type="dangi">ダンギ暦</type>
+			<type key="calendar" type="ethiopic">エチオピア暦</type>
+			<type key="calendar" type="ethiopic-amete-alem">エチオピア創世紀元暦</type>
+			<type key="calendar" type="gregorian">西暦(グレゴリオ暦)</type>
+			<type key="calendar" type="hebrew">ユダヤ暦</type>
+			<type key="calendar" type="indian">インド国定暦</type>
+			<type key="calendar" type="islamic">イスラム暦</type>
+			<type key="calendar" type="islamic-civil">イスラム歴(定周期、公民紀元)</type>
+			<type key="calendar" type="islamic-rgsa" draft="contributed">イスラム暦(サウジアラビア、月観測)</type>
+			<type key="calendar" type="islamic-tbla">イスラム歴(定周期、天文紀元)</type>
+			<type key="calendar" type="islamic-umalqura" draft="contributed">イスラム暦(ウンム・アルクラー)</type>
+			<type key="calendar" type="iso8601">ISO-8601</type>
+			<type key="calendar" type="japanese">和暦</type>
+			<type key="calendar" type="persian">ペルシア暦</type>
+			<type key="calendar" type="roc">中華民国暦</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">記号で並べ替え</type>
+			<type key="colAlternate" type="shifted" draft="contributed">記号を無視して並べ替え</type>
+			<type key="colBackwards" type="no" draft="contributed">アクセント（順方向）で並べ替え</type>
+			<type key="colBackwards" type="yes" draft="contributed">アクセント（逆方向）で並べ替え</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">小文字優先で並べ替え</type>
+			<type key="colCaseFirst" type="no" draft="contributed">大文字小文字を通常の順序で並べ替え</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">大文字優先で並べ替え</type>
+			<type key="colCaseLevel" type="no" draft="contributed">大文字小文字を区別しないで並べ替え</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">大文字小文字を区別して並べ替え</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">仮名を区別しないで並べ替え</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">仮名を区別して並べ替え</type>
+			<type key="collation" type="big5han">繁体字中国語順(Big5)</type>
+			<type key="collation" type="dictionary">辞書順</type>
+			<type key="collation" type="ducet">ユニコード照合順</type>
+			<type key="collation" type="eor" draft="contributed">ヨーロッパ言語文字の並べ替え規則</type>
+			<type key="collation" type="gb2312han">簡体字中国語順(GB2312)</type>
+			<type key="collation" type="phonebook">電話帳順</type>
+			<type key="collation" type="phonetic" draft="contributed">音声順による並べ替え</type>
+			<type key="collation" type="pinyin">ピンイン順</type>
+			<type key="collation" type="reformed">リフォーム</type>
+			<type key="collation" type="search">汎用検索</type>
+			<type key="collation" type="searchjl">ハングル語頭子音による並べ替え</type>
+			<type key="collation" type="standard">標準ソート順序</type>
+			<type key="collation" type="stroke">画数順</type>
+			<type key="collation" type="traditional">トラディッショナル</type>
+			<type key="collation" type="unihan">部首順</type>
+			<type key="collation" type="zhuyin" draft="contributed">注音順</type>
+			<type key="colNormalization" type="no">正規化しないで並べ替え</type>
+			<type key="colNormalization" type="yes">Unicode 正規化で並べ替え</type>
+			<type key="colNumeric" type="no" draft="contributed">数値を独立して並べ替え</type>
+			<type key="colNumeric" type="yes" draft="contributed">数値を数値として並べ替え</type>
+			<type key="colStrength" type="identical" draft="contributed">すべてを区別して並べ替え</type>
+			<type key="colStrength" type="primary" draft="contributed">基本文字のみで並べ替え</type>
+			<type key="colStrength" type="quaternary" draft="contributed">アクセント/大文字小文字/全角半角/仮名で並べ替え</type>
+			<type key="colStrength" type="secondary" draft="contributed">アクセントで並べ替え</type>
+			<type key="colStrength" type="tertiary" draft="contributed">アクセント/大文字小文字/全角半角で並べ替え</type>
+			<type key="hc" type="h11">12時間制(0〜11)</type>
+			<type key="hc" type="h12">12時間制(1〜12)</type>
+			<type key="hc" type="h23">24時間制(0〜23)</type>
+			<type key="hc" type="h24">24時間制(1〜24)</type>
+			<type key="lb" type="loose">禁則処理(弱)</type>
+			<type key="lb" type="normal">禁則処理(標準)</type>
+			<type key="lb" type="strict">禁則処理(強)</type>
+			<type key="ms" type="metric">メートル法</type>
+			<type key="ms" type="uksystem">ヤード・ポンド法</type>
+			<type key="ms" type="ussystem">米慣習単位</type>
+			<type key="numbers" type="arab">アラビア・インド数字</type>
+			<type key="numbers" type="arabext">ペルシア数字</type>
+			<type key="numbers" type="armn">アルメニア数字</type>
+			<type key="numbers" type="armnlow">アルメニア数字(小文字)</type>
+			<type key="numbers" type="bali">バリ数字</type>
+			<type key="numbers" type="beng">ベンガル数字</type>
+			<type key="numbers" type="brah" draft="contributed">ブラーフミー数字</type>
+			<type key="numbers" type="cakm" draft="contributed">チャクマ数字</type>
+			<type key="numbers" type="cham">チャム数字</type>
+			<type key="numbers" type="deva">デーヴァナーガリー数字</type>
+			<type key="numbers" type="ethi">エチオピア数字</type>
+			<type key="numbers" type="finance">財務用漢数字</type>
+			<type key="numbers" type="fullwide">全角数字</type>
+			<type key="numbers" type="geor">ジョージア数字</type>
+			<type key="numbers" type="grek">ギリシャ数字</type>
+			<type key="numbers" type="greklow">ギリシャ数字(小文字)</type>
+			<type key="numbers" type="gujr">グジャラート数字</type>
+			<type key="numbers" type="guru">グルムキー数字</type>
+			<type key="numbers" type="hanidec">漢数字(位取り記数法)</type>
+			<type key="numbers" type="hans">簡体漢数字</type>
+			<type key="numbers" type="hansfin">簡体大字</type>
+			<type key="numbers" type="hant">繁体漢数字</type>
+			<type key="numbers" type="hantfin">繁体大字</type>
+			<type key="numbers" type="hebr">ヘブライ数字</type>
+			<type key="numbers" type="java">ジャワ数字</type>
+			<type key="numbers" type="jpan">漢数字</type>
+			<type key="numbers" type="jpanfin">大字</type>
+			<type key="numbers" type="kali">カヤー数字</type>
+			<type key="numbers" type="khmr">クメール数字</type>
+			<type key="numbers" type="knda">カンナダ数字</type>
+			<type key="numbers" type="lana">ラーンナー数字</type>
+			<type key="numbers" type="lanatham">ラーンナー・タム数字</type>
+			<type key="numbers" type="laoo">ラオ数字</type>
+			<type key="numbers" type="latn">算用数字</type>
+			<type key="numbers" type="lepc">レプチャ数字</type>
+			<type key="numbers" type="limb">リンブ数字</type>
+			<type key="numbers" type="mlym">マラヤーラム数字</type>
+			<type key="numbers" type="mong">モンゴル数字</type>
+			<type key="numbers" type="mtei">マニプリ数字</type>
+			<type key="numbers" type="mymr">ミャンマー数字</type>
+			<type key="numbers" type="mymrshan">ミャンマー・シャン数字</type>
+			<type key="numbers" type="native" draft="contributed">独自の記数法</type>
+			<type key="numbers" type="nkoo">ンコ数字</type>
+			<type key="numbers" type="olck">オルチキ数字</type>
+			<type key="numbers" type="orya">オリヤー数字</type>
+			<type key="numbers" type="osma" draft="contributed">オスマニア数字</type>
+			<type key="numbers" type="roman">ローマ数字</type>
+			<type key="numbers" type="romanlow">ローマ数字(小文字)</type>
+			<type key="numbers" type="saur">サウラーシュトラ数字</type>
+			<type key="numbers" type="shrd" draft="contributed">シャーラダー数字</type>
+			<type key="numbers" type="sora" draft="contributed">ソラ・ソンペン数字</type>
+			<type key="numbers" type="sund">スンダ数字</type>
+			<type key="numbers" type="takr" draft="contributed">タークリー数字</type>
+			<type key="numbers" type="talu">新タイ・ルー数字</type>
+			<type key="numbers" type="taml">タミール数字</type>
+			<type key="numbers" type="tamldec">タミル数字</type>
+			<type key="numbers" type="telu">テルグ数字</type>
+			<type key="numbers" type="thai">タイ数字</type>
+			<type key="numbers" type="tibt">チベット数字</type>
+			<type key="numbers" type="traditional" draft="contributed">従来の記数法</type>
+			<type key="numbers" type="vaii">ヴァイ文字の記数法</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">BGN</transformName>
@@ -1321,10 +1335,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</codePatterns>
 	</localeDisplayNames>
 	<characters>
-		<exemplarCharacters>[々 ゝ ゞ ー-ヾ ぁ あ ァア ぃ い ィイ ぅ う ゥウ ヴ ぇ え ェエ ぉ お ォオ か ヵ カ がガ きキ ぎギ くク ぐグ け ヶ ケ げゲ こコ ごゴ さサ ざザ しシ じジ すス ずズ せセ ぜゼ そソ ぞゾ たタ だダ ちチ ぢヂ っ つ ッツ づヅ てテ でデ とト どド なナ にニ ぬヌ ねネ のノ はハ ばバ ぱパ ひヒ びビ ぴピ ふフ ぶブ ぷプ へヘ べベ ぺペ ほホ ぼボ ぽポ まマ みミ むム めメ もモ ゃ や ャヤ ゅ ゆ ュユ ょ よ ョヨ らラ りリ るル れレ ろロ ゎ わ ヮワ ゐヰ ゑヱ をヲ んン 一 丁 七 万-下 不 与 丑 且 世 丘 丙 両 並 中 丸 丹 主 久 乏 乗 乙 九 乱 乳 乾 亀 了 予 争 事 二 互 五 井 亜 亡 交 亥 亨 享-亭 人 仁 今 介 仏 仕 他 付 仙 代-以 仮 仰 仲 件 任 企 伊 伏-休 会 伝 伯 伴 伸 伺 似 但 位-佐 体 何 余 作 佳 併 使 例 侍 供 依 価 侮 侯 侵 便 係 促 俊 俗 保 信 修 俳 俵 俸 俺 倉 個 倍 倒 候 借 倣 値 倫 倹 偉 偏 停 健 側-偶 偽 傍 傑 傘 備 催 債 傷 傾 働 像 僕 僚 僧 儀 億 儒 償 優 元-兆 先 光 克 免 兎 児 党 入 全 八-六 共 兵 具 典 兼 内 円 冊 再 冒 冗 写 冠 冬 冷 准 凍 凝 凡 処 凶 凸-出 刀 刃 分-刈 刊 刑 列 初 判 別 利 到 制-券 刺 刻 則 削 前 剖 剛 剣 剤 副 剰 割 創 劇 力 功 加 劣 助 努 励 労 効 劾 勅 勇 勉 動 勘 務 勝 募 勢 勤 勧 勲 勺 匁 包 化 北 匠 匹-医 匿 十 千 升 午 半 卑-協 南 単 博 占 卯-危 即-卵 卸 厄 厘 厚 原 厳 去 参 又 及-収 叔 取 受 叙 口-句 叫 召 可 台 史 右 号 司 各 合 吉 同-向 君 吟 否 含 吸 吹 呈-告 周 味 呼 命 和 咲 哀 品 員 哲 唆 唇 唐 唯 唱 商 問 啓 善 喚 喜 喝 喪 喫 営 嗣 嘆 嘉 嘱 器 噴 嚇 囚 四 回 因 団 困 囲 図 固 国 圏 園 土 圧 在 地 坂 均 坊 坑 坪 垂 型 垣 埋 城 域 執 培 基 埼 堀 堂 堅 堕 堤 堪 報 場 塀 塁 塊 塑 塔 塗 塚 塩 塾 境 墓 増 墜 墨 墳 墾 壁 壇 壊 壌 士 壬 壮 声-売 変 夏 夕 外 多 夜 夢 大 天-夫 央 失 奇-奉 奏 契 奔 奥 奨 奪 奮 女 奴 好 如-妄 妊 妙 妥 妨 妹 妻 姉 始 姓 委 姫 姻 姿 威 娘 娠 娯 婆 婚 婦 婿 媒 嫁 嫌 嫡 嬢 子 孔 字 存 孝 季 孤 学 孫 宅 宇-安 完 宗-定 宜 宝 実 客-室 宮 宰 害-家 容 宿 寂 寄-密 富 寒 寛 寝 察 寡 寧 審 寮 寸 寺 対 寿 封 専 射 将 尉-尋 導 小 少 尚 就 尺 尼-局 居 屈 届 屋 展 属 層 履 屯 山 岐 岡 岩 岬 岳 岸 峠 峡 峰 島 崇 崎 崩 川 州 巡 巣 工-巨 差 己 巳 巻 市 布 帆 希 帝 帥 師 席 帯 帰 帳 常 帽 幅 幕 幣 干-年 幸 幹 幻-幾 庁 広 床 序 底 店 庚 府 度 座 庫 庭 庶-庸 廃 廉 廊 延 廷 建 弁 弊 式 弐 弓-引 弘 弟 弦 弧 弱 張 強 弾 当 形 彩 彫 彰 影 役 彼 往 征 径 待 律 後 徐 徒 従 得 御 復 循 微 徳 徴 徹 心 必 忌 忍 志-忙 応 忠 快 念 怒 怖 思 怠 急 性 怪 恋 恐 恒 恥 恨 恩 恭 息 恵 悔 悟 悠 患 悦 悩 悪 悲 悼 情 惑 惜 惨 惰 想 愁 愉 意 愚 愛 感 慈 態 慌 慎 慕 慢 慣 慨 慮 慰 慶 憂 憎 憤 憩 憲 憶 憾 懇 懐 懲 懸 戊 戌 成-戒 戦 戯 戸 戻 房 所 扇 扉 手 才 打 払 扱 扶 批 承 技 抄 把 抑 投 抗 折 抜 択 披 抱 抵 抹 押 抽 担 拍 拐 拒 拓 拘 拙 招 拝 拠 拡 括 拷 拾 持 指 挑 挙 挟 振 挿 捕 捜 捨 据 掃 授 掌 排 掘 掛 採 探 接 控 推 措 掲 描 提 揚 換 握 揮 援 揺 損 搬 搭 携 搾 摂 摘 摩 撃 撤 撮 撲 擁 操 擦 擬 支 改 攻 放 政 故 敏 救 敗 教 敢 散 敬 数 整 敵 敷 文 斉 斎 斗 料 斜 斤 斥 断 新 方 施 旅 旋 族 旗 既 日 旧-早 旬 昆 昇 昌 明 易 昔 星 映 春 昨 昭 是 昼 時 晩 普 景 晴 晶 暁 暇 暑 暖 暗 暦 暫 暮 暴 曇 曜 曲 更 書 曹 替 最 月 有 服 朕 朗 望 朝 期 木 未-札 朱 朴 机 朽 杉 材 村 束 条 来 杯 東 松 板 析 林 枚 果 枝 枠 枢 枯 架 柄 某 染 柔 柱 柳 査 栄 栓 校 株 核 根 格 栽 桃 案 桑 桜 桟 梅 械 棄 棋 棒 棚 棟 森 棺 植 検 業 極 楼 楽 概 構 様 槽 標 模 権 横 樹 橋 機 欄 欠 次 欧 欲 欺 款 歌 歓 止 正 武 歩 歯 歳 歴 死 殉-残 殖 殴 段 殺 殻 殿 母 毎 毒 比 毛 氏 民 気 水 氷 永 汁 求 汎 汗 汚 江 池 決 汽 沈 沖 没 沢 河 沸 油 治 沼 沿 況 泉 泊 泌 法 泡-泣 泥 注 泰 泳 洋 洗 洞 津 洪 活 派 流 浄 浅 浜 浦 浪 浮 浴 海 浸 消 涙 涯 液 涼 淑 淡 深 混 添 清 渇-渉 渋 渓 減 渡 渦 温 測 港 湖 湯 湾-満 源 準 溝 溶 滅 滋 滑 滝 滞 滴 漁 漂 漆 漏 演 漠 漢 漫 漬 漸 潔 潜 潟 潤 潮 澄 激 濁 濃 濫 濯 瀬 火 灯 灰 災 炉 炊 炎 炭 点 為 烈 無 焦 然 焼 煙 照 煩 煮 熟 熱 燃 燥 爆 爵 父 片 版 牙 牛 牧 物 牲 特 犠 犬 犯 状 狂 狩 独 狭 猛 猟 猪 猫 献 猶 猿 獄 獣 獲 玄 率 玉 王 珍 珠 班 現 球 理 琴 環 璽 瓶 甘 甚 生 産 用 田-申 男 町 画 界 畑 畔 留 畜 畝 略 番 異 畳 疎 疑 疫 疲 疾 病 症 痘 痛 痢 痴 療 癒 癖 癸 発 登 白 百 的 皆 皇 皮 皿 盆 益 盗 盛 盟 監 盤 目 盲 直 相 盾 省 看 県 真 眠 眺 眼 着 睡 督 瞬 矛 矢 知 短 矯 石 砂 研 砕 砲 破 硝 硫 硬 碁 碑 確 磁 磨 礁 礎 示 礼 社 祈 祉 祖 祚 祝 神 祥 票 祭 禁 禄 禅 禍-福 秀 私 秋 科 秒 秘 租 秩 称 移 程 税 稚 種 稲 稼 稿 穀 穂 積 穏 穫 穴 究 空 突 窃 窒 窓 窮 窯 立 竜 章 童 端 競 竹 笑 笛 符 第 筆 等 筋 筒 答 策 箇 算 管 箱 節 範 築 篤 簡 簿 籍 米 粉 粋 粒 粗 粘 粛 粧 精 糖 糧 糸 系 糾 紀 約 紅 紋 納 純 紙-紛 素-索 紫 累 細 紳 紹 紺 終 組 経 結 絞 絡 給 統 絵 絶 絹 継 続 維 綱 網 綿 緊 総 緑 緒 線 締 編 緩 緯 練 縁 縄 縛 縦 縫 縮 績 繁 繊 織 繕 繭 繰 缶 罪 置 罰 署 罷 羅 羊 美 群 義 羽 翁 翌 習 翻 翼 老 考 者 耐 耕 耗 耳 聖 聞 聴 職 肉 肌 肖 肝 肢 肥 肩 肪 肯 育 肺 胃 胆 背 胎 胞 胴 胸 能 脂 脅 脈 脚 脱 脳 脹 腐 腕 腰 腸 腹 膚 膜 膨 臓 臣 臨 自 臭 至 致 興 舌 舎 舗 舞 舟 航 般 舶 船 艇 艦 良 色 芋 芝 花 芳 芸 芽 苗 若 苦 英 茂 茎 茶 草 荒 荘 荷 菊 菌 菓 菜 華 落 葉 著 葬 蒸 蓄 蔵 薄 薦 薪-薬 藤 藩 藻 虎 虐 虚 虜 虞 虫 蚊 蚕 蛇 蛍 蛮 融 血 衆 行 術 街 衛 衝 衡 衣 表 衰 衷 袋 被 裁 裂 装 裏 裕 補 裸 製 複 褐 褒 襟 襲 西 要 覆 覇 見 規 視 覚 覧 親 観 角 解 触 言 訂 計 討 訓 託 記 訟 訪 設 許 訳 訴 診 証 詐 詔 評 詞 詠 試 詩 詰-詳 誇 誉 誌 認 誓 誕 誘 語 誠 誤 説 読 誰 課 調 談 請 論 諭 諮 諸 諾 謀 謁 謄 謙 講 謝 謡 謹 識 譜 警 議 譲 護 谷 豆 豊 豚 象 豪 貝 貞 負-貢 貧-販 貫 責 貯 貴 買 貸 費 貿 賀 賃 賄 資 賊 賓 賛 賜 賞 賠 賢 賦 質 購 贈 赤 赦 走 赴 起 超 越 趣 足 距 跡 路 跳 践 踊 踏 躍 身 車 軌 軍 軒 軟 転 軸 軽 較 載 輝 輩 輪 輸 轄 辛 辞 辰-農 辺 込 迅 迎 近 返 迫 迭 述 迷 追 退 送 逃 逆 透 逐 逓 途 通 逝 速 造 連 逮 週 進 逸 遂 遅 遇 遊 運 遍 過 道-違 遠 遣 適 遭 遮 遵 遷 選 遺 避 還 邦 邪 邸 郊 郎 郡 部 郭 郵 郷 都 酉 酌 配 酒 酔 酢 酪 酬 酵 酷 酸 醜 醸 釈 里-量 金 針 釣 鈍 鈴 鉄 鉛 鉢 鉱 銀 銃 銅 銑 銘 銭 鋭 鋳 鋼 錘 錠 錬 錯 録 鍛 鎖 鎮 鏡 鐘 鑑 長 門 閉 開 閏 閑 間 関 閣 閥 閲 闘 阪 防 阻 附 降 限 陛 院-陥 陪 陰 陳 陵 陶 陸 険 陽 隅 隆 隊 階 随 隔 際 障 隠 隣 隷 隻 雄-雇 雉 雌 雑 離 難 雨 雪 雰 雲 零 雷 電 需 震 霊 霜 霧 露 青 静 非 面 革 靴 韓 音 韻 響 頂 頃 項 順 預-頒 領 頭 頻 頼 題 額 顔 顕 願 類 顧 風 飛 食 飢 飯 飲 飼-飾 養 餓 館 首 香 馬 駄-駆 駐 騎 騒 験 騰 驚 骨 髄 高 髪 鬼 魂 魅 魔 魚 鮮 鯨 鳥 鳴 鶏 鹿 麗 麦 麻 黄 黒 黙 鼓 鼠 鼻 齢]</exemplarCharacters>
+		<exemplarCharacters>[々 ゝヽ ゞヾ ー ぁァ あア ぃィ いイ ぅゥ うウ ヴ ぇェ えエ ぉォ おオ ヵ かカ がガ きキ ぎギ くク ぐグ ヶ けケ げゲ こコ ごゴ さサ ざザ しシ じジ すス ずズ せセ ぜゼ そソ ぞゾ たタ だダ ちチ ぢヂ っッ つツ づヅ てテ でデ とト どド なナ にニ ぬヌ ねネ のノ はハ ばバ ぱパ ひヒ びビ ぴピ ふフ ぶブ ぷプ へヘ べベ ぺペ ほホ ぼボ ぽポ まマ みミ むム めメ もモ ゃャ やヤ ゅュ ゆユ ょョ よヨ らラ りリ るル れレ ろロ ゎヮ わワ ゐヰ ゑヱ をヲ んン 一 丁 七 万-下 不 与 丑 且 世 丘 丙 両 並 中 丸 丹 主 久 乏 乗 乙 九 乱 乳 乾 亀 了 予 争 事 二 互 五 井 亜 亡 交 亥 亨 享-亭 人 仁 今 介 仏 仕 他 付 仙 代-以 仮 仰 仲 件 任 企 伊 伏-休 会 伝 伯 伴 伸 伺 似 但 位-佐 体 何 余 作 佳 併 使 例 侍 供 依 価 侮 侯 侵 便 係 促 俊 俗 保 信 修 俳 俵 俸 俺 倉 個 倍 倒 候 借 倣 値 倫 倹 偉 偏 停 健 側-偶 偽 傍 傑 傘 備 催 債 傷 傾 働 像 僕 僚 僧 儀 億 儒 償 優 元-兆 先 光 克 免 兎 児 党 入 全 八-六 共 兵 具 典 兼 内 円 冊 再 冒 冗 写 冠 冬 冷 准 凍 凝 凡 処 凶 凸-出 刀 刃 分-刈 刊 刑 列 初 判 別 利 到 制-券 刺 刻 則 削 前 剖 剛 剣 剤 副 剰 割 創 劇 力 功 加 劣 助 努 励 労 効 劾 勅 勇 勉 動 勘 務 勝 募 勢 勤 勧 勲 勺 匁 包 化 北 匠 匹-医 匿 十 千 升 午 半 卑-協 南 単 博 占 卯-危 即-卵 卸 厄 厘 厚 原 厳 去 参 又 及-収 叔 取 受 叙 口-句 叫 召 可 台 史 右 号 司 各 合 吉 同-向 君 吟 否 含 吸 吹 呈-告 周 味 呼 命 和 咲 哀 品 員 哲 唆 唇 唐 唯 唱 商 問 啓 善 喚 喜 喝 喪 喫 営 嗣 嘆 嘉 嘱 器 噴 嚇 囚 四 回 因 団 困 囲 図 固 国 圏 園 土 圧 在 地 坂 均 坊 坑 坪 垂 型 垣 埋 城 域 執 培 基 埼 堀 堂 堅 堕 堤 堪 報 場 塀 塁 塊 塑 塔 塗 塚 塩 塾 境 墓 増 墜 墨 墳 墾 壁 壇 壊 壌 士 壬 壮 声-売 変 夏 夕 外 多 夜 夢 大 天-夫 央 失 奇-奉 奏 契 奔 奥 奨 奪 奮 女 奴 好 如-妄 妊 妙 妥 妨 妹 妻 姉 始 姓 委 姫 姻 姿 威 娘 娠 娯 婆 婚 婦 婿 媒 嫁 嫌 嫡 嬢 子 孔 字 存 孝 季 孤 学 孫 宅 宇-安 完 宗-定 宜 宝 実 客-室 宮 宰 害-家 容 宿 寂 寄-密 富 寒 寛 寝 察 寡 寧 審 寮 寸 寺 対 寿 封 専 射 将 尉-尋 導 小 少 尚 就 尺 尼-局 居 屈 届 屋 展 属 層 履 屯 山 岐 岡 岩 岬 岳 岸 峠 峡 峰 島 崇 崎 崩 川 州 巡 巣 工-巨 差 己 巳 巻 市 布 帆 希 帝 帥 師 席 帯 帰 帳 常 帽 幅 幕 幣 干-年 幸 幹 幻-幾 庁 広 床 序 底 店 庚 府 度 座 庫 庭 庶-庸 廃 廉 廊 延 廷 建 弁 弊 式 弐 弓-引 弘 弟 弦 弧 弱 張 強 弾 当 形 彩 彫 彰 影 役 彼 往 征 径 待 律 後 徐 徒 従 得 御 復 循 微 徳 徴 徹 心 必 忌 忍 志-忙 応 忠 快 念 怒 怖 思 怠 急 性 怪 恋 恐 恒 恥 恨 恩 恭 息 恵 悔 悟 悠 患 悦 悩 悪 悲 悼 情 惑 惜 惨 惰 想 愁 愉 意 愚 愛 感 慈 態 慌 慎 慕 慢 慣 慨 慮 慰 慶 憂 憎 憤 憩 憲 憶 憾 懇 懐 懲 懸 戊 戌 成-戒 戦 戯 戸 戻 房 所 扇 扉 手 才 打 払 扱 扶 批 承 技 抄 把 抑 投 抗 折 抜 択 披 抱 抵 抹 押 抽 担 拍 拐 拒 拓 拘 拙 招 拝 拠 拡 括 拷 拾 持 指 挑 挙 挟 振 挿 捕 捜 捨 据 掃 授 掌 排 掘 掛 採 探 接 控 推 措 掲 描 提 揚 換 握 揮 援 揺 損 搬 搭 携 搾 摂 摘 摩 撃 撤 撮 撲 擁 操 擦 擬 支 改 攻 放 政 故 敏 救 敗 教 敢 散 敬 数 整 敵 敷 文 斉 斎 斗 料 斜 斤 斥 断 新 方 施 旅 旋 族 旗 既 日 旧-早 旬 昆 昇 昌 明 易 昔 星 映 春 昨 昭 是 昼 時 晩 普 景 晴 晶 暁 暇 暑 暖 暗 暦 暫 暮 暴 曇 曜 曲 更 書 曹 替 最 月 有 服 朕 朗 望 朝 期 木 未-札 朱 朴 机 朽 杉 材 村 束 条 来 杯 東 松 板 析 林 枚 果 枝 枠 枢 枯 架 柄 某 染 柔 柱 柳 査 栄 栓 校 株 核 根 格 栽 桃 案 桑 桜 桟 梅 械 棄 棋 棒 棚 棟 森 棺 植 検 業 極 楼 楽 概 構 様 槽 標 模 権 横 樹 橋 機 欄 欠 次 欧 欲 欺 款 歌 歓 止 正 武 歩 歯 歳 歴 死 殉-残 殖 殴 段 殺 殻 殿 母 毎 毒 比 毛 氏 民 気 水 氷 永 汁 求 汎 汗 汚 江 池 決 汽 沈 沖 没 沢 河 沸 油 治 沼 沿 況 泉 泊 泌 法 泡-泣 泥 注 泰 泳 洋 洗 洞 津 洪 活 派 流 浄 浅 浜 浦 浪 浮 浴 海 浸 消 涙 涯 液 涼 淑 淡 深 混 添 清 渇-渉 渋 渓 減 渡 渦 温 測 港 湖 湯 湾-満 源 準 溝 溶 滅 滋 滑 滝 滞 滴 漁 漂 漆 漏 演 漠 漢 漫 漬 漸 潔 潜 潟 潤 潮 澄 激 濁 濃 濫 濯 瀬 火 灯 灰 災 炉 炊 炎 炭 点 為 烈 無 焦 然 焼 煙 照 煩 煮 熟 熱 燃 燥 爆 爵 父 片 版 牙 牛 牧 物 牲 特 犠 犬 犯 状 狂 狩 独 狭 猛 猟 猪 猫 献 猶 猿 獄 獣 獲 玄 率 玉 王 珍 珠 班 現 球 理 琴 環 璽 瓶 甘 甚 生 産 用 田-申 男 町 画 界 畑 畔 留 畜 畝 略 番 異 畳 疎 疑 疫 疲 疾 病 症 痘 痛 痢 痴 療 癒 癖 癸 発 登 白 百 的 皆 皇 皮 皿 盆 益 盗 盛 盟 監 盤 目 盲 直 相 盾 省 看 県 真 眠 眺 眼 着 睡 督 瞬 矛 矢 知 短 矯 石 砂 研 砕 砲 破 硝 硫 硬 碁 碑 確 磁 磨 礁 礎 示 礼 社 祈 祉 祖 祚 祝 神 祥 票 祭 禁 禄 禅 禍-福 秀 私 秋 科 秒 秘 租 秩 称 移 程 税 稚 種 稲 稼 稿 穀 穂 積 穏 穫 穴 究 空 突 窃 窒 窓 窮 窯 立 竜 章 童 端 競 竹 笑 笛 符 第 筆 等 筋 筒 答 策 箇 算 管 箱 節 範 築 篤 簡 簿 籍 米 粉 粋 粒 粗 粘 粛 粧 精 糖 糧 糸 系 糾 紀 約 紅 紋 納 純 紙-紛 素-索 紫 累 細 紳 紹 紺 終 組 経 結 絞 絡 給 統 絵 絶 絹 継 続 維 綱 網 綿 緊 総 緑 緒 線 締 編 緩 緯 練 縁 縄 縛 縦 縫 縮 績 繁 繊 織 繕 繭 繰 缶 罪 置 罰 署 罷 羅 羊 美 群 義 羽 翁 翌 習 翻 翼 老 考 者 耐 耕 耗 耳 聖 聞 聴 職 肉 肌 肖 肝 肢 肥 肩 肪 肯 育 肺 胃 胆 背 胎 胞 胴 胸 能 脂 脅 脈 脚 脱 脳 脹 腐 腕 腰 腸 腹 膚 膜 膨 臓 臣 臨 自 臭 至 致 興 舌 舎 舗 舞 舟 航 般 舶 船 艇 艦 良 色 芋 芝 花 芳 芸 芽 苗 若 苦 英 茂 茎 茶 草 荒 荘 荷 菊 菌 菓 菜 華 落 葉 著 葬 蒸 蓄 蔵 薄 薦 薪-薬 藤 藩 藻 虎 虐 虚 虜 虞 虫 蚊 蚕 蛇 蛍 蛮 融 血 衆 行 術 街 衛 衝 衡 衣 表 衰 衷 袋 被 裁 裂 装 裏 裕 補 裸 製 複 褐 褒 襟 襲 西 要 覆 覇 見 規 視 覚 覧 親 観 角 解 触 言 訂 計 討 訓 託 記 訟 訪 設 許 訳 訴 診 証 詐 詔 評 詞 詠 試 詩 詰-詳 誇 誉 誌 認 誓 誕 誘 語 誠 誤 説 読 誰 課 調 談 請 論 諭 諮 諸 諾 謀 謁 謄 謙 講 謝 謡 謹 識 譜 警 議 譲 護 谷 豆 豊 豚 象 豪 貝 貞 負-貢 貧-販 貫 責 貯 貴 買 貸 費 貿 賀 賃 賄 資 賊 賓 賛 賜 賞 賠 賢 賦 質 購 贈 赤 赦 走 赴 起 超 越 趣 足 距 跡 路 跳 践 踊 踏 躍 身 車 軌 軍 軒 軟 転 軸 軽 較 載 輝 輩 輪 輸 轄 辛 辞 辰-農 辺 込 迅 迎 近 返 迫 迭 述 迷 追 退 送 逃 逆 透 逐 逓 途 通 逝 速 造 連 逮 週 進 逸 遂 遅 遇 遊 運 遍 過 道-違 遠 遣 適 遭 遮 遵 遷 選 遺 避 還 邦 邪 邸 郊 郎 郡 部 郭 郵 郷 都 酉 酌 配 酒 酔 酢 酪 酬 酵 酷 酸 醜 醸 釈 里-量 金 針 釣 鈍 鈴 鉄 鉛 鉢 鉱 銀 銃 銅 銑 銘 銭 鋭 鋳 鋼 錘 錠 錬 錯 録 鍛 鎖 鎮 鏡 鐘 鑑 長 門 閉 開 閏 閑 間 関 閣 閥 閲 闘 阪 防 阻 附 降 限 陛 院-陥 陪 陰 陳 陵 陶 陸 険 陽 隅 隆 隊 階 随 隔 際 障 隠 隣 隷 隻 雄-雇 雉 雌 雑 離 難 雨 雪 雰 雲 零 雷 電 需 震 霊 霜 霧 露 青 静 非 面 革 靴 韓 音 韻 響 頂 頃 項 順 預-頒 領 頭 頻 頼 題 額 顔 顕 願 類 顧 風 飛 食 飢 飯 飲 飼-飾 養 餓 館 首 香 馬 駄-駆 駐 騎 騒 験 騰 驚 骨 髄 高 髪 鬼 魂 魅 魔 魚 鮮 鯨 鳥 鳴 鶏 鹿 麗 麦 麻 黄 黒 黙 鼓 鼠 鼻 齢]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[兌 拼 楔 錄 鳯]</exemplarCharacters>
 		<exemplarCharacters type="index" draft="contributed">[あ か さ た な は ま や ら わ]</exemplarCharacters>
-		<exemplarCharacters type="punctuation">[‾ _＿ \-－ ‐ — ― 〜 ・ ･ ,， 、､ ;； \:： !！ ?？ .． ‥ … 。｡ ＇ ‘ ’ &quot;＂ “ ” (（ )） \[［ \]］ \{｛ \}｝ 〈 〉 《 》 「｢ 」｣ 『 』 【 】 〔 〕 ‖ § ¶ @＠ *＊ /／ \\ ＼ \&amp;＆ #＃ %％ ‰ † ‡ ′ ″ 〃 ※]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[‾ _＿ \-－ ‐ — ― 〜 ・ ･ ,， 、､ ;； \:： !！ ?？ .． ‥ … 。｡ ＇ ‘ ’ &quot;＂ “ ” (（ )） \[［ \]］ \{｛ \}｝ 〈 〉 《 》 「｢ 」｣ 『 』 【 】 〔 〕 ‖ § ¶ @＠ *＊ /／ \\＼ \&amp;＆ #＃ %％ ‰ † ‡ ′ ″ 〃 ※]</exemplarCharacters>
 		<ellipsis type="final">{0}…</ellipsis>
 		<ellipsis type="initial">…{0}</ellipsis>
 		<ellipsis type="medial">{0}…{1}</ellipsis>
@@ -1397,6 +1411,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="MMMEd">M月d日(E)</dateFormatItem>
 						<dateFormatItem id="MMMEEEEd">M月d日EEEE</dateFormatItem>
+						<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">GGGGy年</dateFormatItem>
 						<dateFormatItem id="yyyy">GGGGy年</dateFormatItem>
@@ -1409,6 +1424,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMMd">GGGGy年M月d日</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd" draft="contributed">GGGGy年M月d日(E)</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEEEEd" draft="contributed">GGGGy年M月d日EEEE</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM" draft="contributed">GGGGy年M月</dateFormatItem>
 					</availableFormats>
 				</dateTimeFormats>
 			</calendar>
@@ -1699,6 +1715,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMMd">MMMd日</dateFormatItem>
 						<dateFormatItem id="MMMEd">MMMd日(E)</dateFormatItem>
 						<dateFormatItem id="MMMEEEEd">MMMd日EEEE</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMMd日</dateFormatItem>
 						<dateFormatItem id="y">U年</dateFormatItem>
 						<dateFormatItem id="yMd">U年M月d日</dateFormatItem>
 						<dateFormatItem id="yyyy">U年</dateFormatItem>
@@ -1710,6 +1727,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMMd">U年MMMd日</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">U年MMMd日(E)</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEEEEd">U年MMMd日EEEE</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">U年MMMM</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">U年QQQ</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">U年QQQQ</dateFormatItem>
 					</availableFormats>
@@ -2246,7 +2264,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>Gy/MM/dd</pattern>
+							<pattern>Gy/M/d</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -2273,6 +2291,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d日</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d日(E)</dateFormatItem>
 						<dateFormatItem id="EEEEd">d日EEEE</dateFormatItem>
 						<dateFormatItem id="Gy">Gy年</dateFormatItem>
@@ -2294,6 +2313,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="MMMEd">M月d日(E)</dateFormatItem>
 						<dateFormatItem id="MMMEEEEd">M月d日EEEE</dateFormatItem>
+						<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">Gy年</dateFormatItem>
 						<dateFormatItem id="yyyy">Gy年</dateFormatItem>
@@ -2305,6 +2325,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMMd">Gy年M月d日</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">Gy年M月d日(E)</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEEEEd">Gy年M月d日EEEE</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">Gy/QQQ</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">GyQQQQ</dateFormatItem>
 					</availableFormats>
@@ -2621,15 +2642,73 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">真夜中</dayPeriod>
 							<dayPeriod type="am">午前</dayPeriod>
 							<dayPeriod type="noon">正午</dayPeriod>
 							<dayPeriod type="pm">午後</dayPeriod>
+							<dayPeriod type="morning1">朝</dayPeriod>
+							<dayPeriod type="afternoon1">昼</dayPeriod>
+							<dayPeriod type="evening1">夕方</dayPeriod>
+							<dayPeriod type="night1">夜</dayPeriod>
+							<dayPeriod type="night2">夜中</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">真夜中</dayPeriod>
+							<dayPeriod type="am">午前</dayPeriod>
+							<dayPeriod type="noon">正午</dayPeriod>
+							<dayPeriod type="pm">午後</dayPeriod>
+							<dayPeriod type="morning1">朝</dayPeriod>
+							<dayPeriod type="afternoon1">昼</dayPeriod>
+							<dayPeriod type="evening1">夕方</dayPeriod>
+							<dayPeriod type="night1">夜</dayPeriod>
+							<dayPeriod type="night2">夜中</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">真夜中</dayPeriod>
 							<dayPeriod type="am">午前</dayPeriod>
 							<dayPeriod type="noon">正午</dayPeriod>
 							<dayPeriod type="pm">午後</dayPeriod>
+							<dayPeriod type="morning1">朝</dayPeriod>
+							<dayPeriod type="afternoon1">昼</dayPeriod>
+							<dayPeriod type="evening1">夕方</dayPeriod>
+							<dayPeriod type="night1">夜</dayPeriod>
+							<dayPeriod type="night2">夜中</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">真夜中</dayPeriod>
+							<dayPeriod type="am">午前</dayPeriod>
+							<dayPeriod type="noon">正午</dayPeriod>
+							<dayPeriod type="pm">午後</dayPeriod>
+							<dayPeriod type="morning1">朝</dayPeriod>
+							<dayPeriod type="afternoon1">昼</dayPeriod>
+							<dayPeriod type="evening1">夕方</dayPeriod>
+							<dayPeriod type="night1">夜</dayPeriod>
+							<dayPeriod type="night2">夜中</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">真夜中</dayPeriod>
+							<dayPeriod type="am">午前</dayPeriod>
+							<dayPeriod type="noon">正午</dayPeriod>
+							<dayPeriod type="pm">午後</dayPeriod>
+							<dayPeriod type="morning1">朝</dayPeriod>
+							<dayPeriod type="afternoon1">昼</dayPeriod>
+							<dayPeriod type="evening1">夕方</dayPeriod>
+							<dayPeriod type="night1">夜</dayPeriod>
+							<dayPeriod type="night2">夜中</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">真夜中</dayPeriod>
+							<dayPeriod type="am">午前</dayPeriod>
+							<dayPeriod type="noon">正午</dayPeriod>
+							<dayPeriod type="pm">午後</dayPeriod>
+							<dayPeriod type="morning1">朝</dayPeriod>
+							<dayPeriod type="afternoon1">昼</dayPeriod>
+							<dayPeriod type="evening1">夕方</dayPeriod>
+							<dayPeriod type="night1">夜</dayPeriod>
+							<dayPeriod type="night2">夜中</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -2750,6 +2829,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="MMMEd">M月d日(E)</dateFormatItem>
 						<dateFormatItem id="MMMEEEEd">M月d日EEEE</dateFormatItem>
+						<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y年</dateFormatItem>
 						<dateFormatItem id="yM">y/M</dateFormatItem>
@@ -2761,6 +2841,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yMMMd">y年M月d日</dateFormatItem>
 						<dateFormatItem id="yMMMEd">y年M月d日(E)</dateFormatItem>
 						<dateFormatItem id="yMMMEEEEd">y年M月d日EEEE</dateFormatItem>
+						<dateFormatItem id="yMMMM">y年M月</dateFormatItem>
 						<dateFormatItem id="yQQQ">y/QQQ</dateFormatItem>
 						<dateFormatItem id="yQQQQ">yQQQQ</dateFormatItem>
 					</availableFormats>
@@ -3222,6 +3303,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">M月</dateFormatItem>
 						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="MMMEd">M月d日(E)</dateFormatItem>
+						<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="y">Gy年</dateFormatItem>
 					</availableFormats>
 				</dateTimeFormats>
@@ -3723,7 +3805,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>Gyy/MM/dd</pattern>
+							<pattern>GGGGGy/M/d</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -3750,6 +3832,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d日</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d日(E)</dateFormatItem>
 						<dateFormatItem id="EEEEd">d日EEEE</dateFormatItem>
 						<dateFormatItem id="Gy">Gy年</dateFormatItem>
@@ -3771,6 +3854,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="MMMEd">M月d日(E)</dateFormatItem>
 						<dateFormatItem id="MMMEEEEd">M月d日EEEE</dateFormatItem>
+						<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">Gy年</dateFormatItem>
 						<dateFormatItem id="yyyy">Gy年</dateFormatItem>
@@ -3783,6 +3867,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMMd">Gy年M月d日</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">Gy年M月d日(E)</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEEEEd">Gy年M月d日EEEE</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">Gy/QQQ</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">GyQQQQ</dateFormatItem>
 					</availableFormats>
@@ -3923,6 +4008,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">M月</dateFormatItem>
 						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="MMMEd">M月d日(E)</dateFormatItem>
+						<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="y">Gy年</dateFormatItem>
 					</availableFormats>
 				</dateTimeFormats>
@@ -3946,6 +4032,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>年</displayName>
+				<relative type="-1">昨年</relative>
+				<relative type="0">今年</relative>
+				<relative type="1">翌年</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">{0} 年後</relativeTimePattern>
 				</relativeTime>
@@ -3955,6 +4044,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>年</displayName>
+				<relative type="-1">昨年</relative>
+				<relative type="0">今年</relative>
+				<relative type="1">翌年</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">{0} 年後</relativeTimePattern>
 				</relativeTime>
@@ -4003,6 +4095,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>月</displayName>
+				<relative type="-1">先月</relative>
+				<relative type="0">今月</relative>
+				<relative type="1">翌月</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">{0} か月後</relativeTimePattern>
 				</relativeTime>
@@ -4012,6 +4107,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>月</displayName>
+				<relative type="-1">先月</relative>
+				<relative type="0">今月</relative>
+				<relative type="1">翌月</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">{0} か月後</relativeTimePattern>
 				</relativeTime>
@@ -4033,6 +4131,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>週</displayName>
+				<relative type="-1">先週</relative>
+				<relative type="0">今週</relative>
+				<relative type="1">翌週</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">{0} 週間後</relativeTimePattern>
 				</relativeTime>
@@ -4042,6 +4143,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>週</displayName>
+				<relative type="-1">先週</relative>
+				<relative type="0">今週</relative>
+				<relative type="1">翌週</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">{0} 週間後</relativeTimePattern>
 				</relativeTime>
@@ -4065,6 +4169,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>日</displayName>
+				<relative type="-2">一昨日</relative>
+				<relative type="-1">昨日</relative>
+				<relative type="0">今日</relative>
+				<relative type="1">明日</relative>
+				<relative type="2">明後日</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">{0} 日後</relativeTimePattern>
 				</relativeTime>
@@ -4074,6 +4183,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>日</displayName>
+				<relative type="-2">一昨日</relative>
+				<relative type="-1">昨日</relative>
+				<relative type="0">今日</relative>
+				<relative type="1">明日</relative>
+				<relative type="2">明後日</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">{0} 日後</relativeTimePattern>
 				</relativeTime>
@@ -5153,6 +5267,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>ポートモレスビー</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>ブーゲンビル</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>マニラ</exemplarCity>
 			</zone>
@@ -5237,6 +5354,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>イルクーツク</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>チタ</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>ヤクーツク</exemplarCity>
 			</zone>
@@ -5255,6 +5375,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>マガダン</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>スレドネコリムスク</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>カムチャッカ</exemplarCity>
 			</zone>
@@ -5626,9 +5749,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic>アピーア時間</generic>
-					<standard>アピーア標準時</standard>
-					<daylight>アピーア夏時間</daylight>
+					<generic>アピア時間</generic>
+					<standard>アピア標準時</standard>
+					<daylight>アピア夏時間</daylight>
 				</long>
 			</metazone>
 			<metazone type="Aqtau">
@@ -5870,7 +5993,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
 				<long>
-					<standard draft="contributed">極東ヨーロッパ時間</standard>
+					<standard>極東ヨーロッパ時間</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
@@ -5916,9 +6039,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Georgia">
 				<long>
-					<generic>グルジア時間</generic>
-					<standard>グルジア標準時</standard>
-					<daylight>グルジア夏時間</daylight>
+					<generic>ジョージア時間</generic>
+					<standard>ジョージア標準時</standard>
+					<daylight>ジョージア夏時間</daylight>
 				</long>
 			</metazone>
 			<metazone type="Gilbert_Islands">
@@ -6528,7 +6651,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</decimalFormatLength>
 			<decimalFormatLength type="long">
 				<decimalFormat>
-					<pattern type="1000" count="other">0千</pattern>
+					<pattern type="1000" count="other">0</pattern>
 					<pattern type="10000" count="other">0万</pattern>
 					<pattern type="100000" count="other">00万</pattern>
 					<pattern type="1000000" count="other">000万</pattern>
@@ -6544,7 +6667,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</decimalFormatLength>
 			<decimalFormatLength type="short">
 				<decimalFormat>
-					<pattern type="1000" count="other">0千</pattern>
+					<pattern type="1000" count="other">0</pattern>
 					<pattern type="10000" count="other">0万</pattern>
 					<pattern type="100000" count="other">00万</pattern>
 					<pattern type="1000000" count="other">000万</pattern>
@@ -6582,6 +6705,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0</pattern>
+					<pattern type="10000" count="other">¤0万</pattern>
+					<pattern type="100000" count="other">¤00万</pattern>
+					<pattern type="1000000" count="other">¤000万</pattern>
+					<pattern type="10000000" count="other">¤0000万</pattern>
+					<pattern type="100000000" count="other">¤0億</pattern>
+					<pattern type="1000000000" count="other">¤00億</pattern>
+					<pattern type="10000000000" count="other">¤000億</pattern>
+					<pattern type="100000000000" count="other">¤0000億</pattern>
+					<pattern type="1000000000000" count="other">¤0兆</pattern>
+					<pattern type="10000000000000" count="other">¤00兆</pattern>
+					<pattern type="100000000000000" count="other">¤000兆</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="other">{0}{1}</unitPattern>
 		</currencyFormats>
 		<currencies>
@@ -6592,7 +6731,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="AED">
 				<displayName>アラブ首長国連邦ディルハム</displayName>
-				<displayName count="other">アラブ首長国連邦ディルハム</displayName>
+				<displayName count="other">UAE ディルハム</displayName>
 				<symbol draft="contributed">AED</symbol>
 			</currency>
 			<currency type="AFA">
@@ -6629,6 +6768,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>クワンザ</displayName>
 				<displayName count="other">クワンザ</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>アンゴラ クワンザ (1977–1991)</displayName>
@@ -6651,13 +6791,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol draft="contributed">ARA</symbol>
 			</currency>
 			<currency type="ARL">
-				<displayName draft="contributed">アルゼンチン・ペソ・レイ（1970-1983）</displayName>
-				<displayName count="other" draft="contributed">アルゼンチン・ペソ・レイ（1970-1983）</displayName>
+				<displayName draft="contributed">アルゼンチン・ペソ・レイ（1970–1983）</displayName>
+				<displayName count="other" draft="contributed">アルゼンチン・ペソ・レイ（1970–1983）</displayName>
 				<symbol draft="contributed">ARL</symbol>
 			</currency>
 			<currency type="ARM">
-				<displayName draft="contributed">アルゼンチン・ペソ（1881-1970）</displayName>
-				<displayName count="other" draft="contributed">アルゼンチン・ペソ（1881-1970）</displayName>
+				<displayName draft="contributed">アルゼンチン・ペソ（1881–1970）</displayName>
+				<displayName count="other" draft="contributed">アルゼンチン・ペソ（1881–1970）</displayName>
 				<symbol draft="contributed">ARM</symbol>
 			</currency>
 			<currency type="ARP">
@@ -6706,10 +6846,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ボスニア マルク (BAM)</displayName>
 				<displayName count="other">ボスニア マルク (BAM)</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BAN">
-				<displayName>ボスニア・ヘルツェゴビナ 新ディナール（1994-1997）</displayName>
-				<displayName count="other">ボスニア・ヘルツェゴビナ 新ディナール（1994-1997）</displayName>
+				<displayName>ボスニア・ヘルツェゴビナ 新ディナール（1994–1997）</displayName>
+				<displayName count="other">ボスニア・ヘルツェゴビナ 新ディナール（1994–1997）</displayName>
 				<symbol draft="contributed">BAN</symbol>
 			</currency>
 			<currency type="BBD">
@@ -6755,8 +6896,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>BGN</symbol>
 			</currency>
 			<currency type="BGO">
-				<displayName draft="contributed">ブルガリア レフ（1879-1952）</displayName>
-				<displayName count="other" draft="contributed">ブルガリア レフ（1879-1952）</displayName>
+				<displayName draft="contributed">ブルガリア レフ（1879–1952）</displayName>
+				<displayName count="other" draft="contributed">ブルガリア レフ（1879–1952）</displayName>
 				<symbol draft="contributed">BGO</symbol>
 			</currency>
 			<currency type="BHD">
@@ -6785,6 +6926,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ボリビア ボリビアーノ</displayName>
 				<displayName count="other">ボリビア ボリビアーノ</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOL">
 				<displayName>ボリビア ボリビアーノ (1863–1963)</displayName>
@@ -6833,8 +6975,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol draft="contributed">BRR</symbol>
 			</currency>
 			<currency type="BRZ">
-				<displayName draft="contributed">ブラジル クルゼイロ（1942-1967）</displayName>
-				<displayName count="other" draft="contributed">ブラジル クルゼイロ（1942-1967）</displayName>
+				<displayName draft="contributed">ブラジル クルゼイロ（1942–1967）</displayName>
+				<displayName count="other" draft="contributed">ブラジル クルゼイロ（1942–1967）</displayName>
 				<symbol draft="contributed">BRZ</symbol>
 			</currency>
 			<currency type="BSD">
@@ -6857,6 +6999,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ボツワナ プラ</displayName>
 				<displayName count="other">ボツワナ プラ</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>ベラルーシ 新ルーブル (1994–1999)</displayName>
@@ -6959,6 +7102,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>キューバ 兌換ペソ</displayName>
 				<displayName count="other">キューバ 兌換ペソ</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>キューバ ペソ</displayName>
@@ -6980,6 +7124,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>チェコ コルナ</displayName>
 				<displayName count="other">チェコ コルナ</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>東ドイツ マルク</displayName>
@@ -7000,6 +7145,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>デンマーク クローネ</displayName>
 				<displayName count="other">デンマーク クローネ</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>ドミニカ ペソ</displayName>
@@ -7031,6 +7177,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>エジプト ポンド</displayName>
 				<displayName count="other">エジプト ポンド</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>エリトリア ナクファ</displayName>
@@ -7079,6 +7226,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>フォークランド（マルビナス）諸島 ポンド</displayName>
 				<displayName count="other">フォークランド（マルビナス）諸島 ポンド</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>フランス フラン</displayName>
@@ -7092,14 +7240,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GEK">
-				<displayName>グルジア クーポン ラリ</displayName>
-				<displayName count="other">グルジア クーポン ラリ</displayName>
+				<displayName>ジョージア クーポン ラリ</displayName>
+				<displayName count="other">ジョージア クーポン ラリ</displayName>
 				<symbol draft="contributed">GEK</symbol>
 			</currency>
 			<currency type="GEL">
-				<displayName>グルジア ラリ</displayName>
-				<displayName count="other">グルジア ラリ</displayName>
+				<displayName>ジョージア ラリ</displayName>
+				<displayName count="other">ジョージア ラリ</displayName>
 				<symbol draft="contributed">GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>ガーナ セディ (1979–2007)</displayName>
@@ -7126,6 +7275,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ギニア フラン</displayName>
 				<displayName count="other">ギニア フラン</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>ギニア シリー</displayName>
@@ -7146,6 +7296,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>グアテマラ ケツァル</displayName>
 				<displayName count="other">グアテマラ ケツァル</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>ポルトガル領ギニア エスクード</displayName>
@@ -7173,6 +7324,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ホンジュラス レンピラ</displayName>
 				<displayName count="other">ホンジュラス レンピラ</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>クロアチア ディナール</displayName>
@@ -7183,6 +7335,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>クロアチア クーナ</displayName>
 				<displayName count="other">クロアチア クーナ</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>ハイチ グールド</displayName>
@@ -7193,11 +7346,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ハンガリー フォリント</displayName>
 				<displayName count="other">ハンガリー フォリント</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>インドネシア ルピア</displayName>
 				<displayName count="other">インドネシア ルピア</displayName>
 				<symbol draft="contributed">IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>アイリッシュ ポンド</displayName>
@@ -7245,6 +7400,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>アイスランド クローナ</displayName>
 				<displayName count="other">アイスランド クローナ</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>イタリア リラ</displayName>
@@ -7288,27 +7444,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>コモロ フラン</displayName>
 				<displayName count="other">コモロ フラン</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>北朝鮮 ウォン</displayName>
 				<displayName count="other">北朝鮮 ウォン</displayName>
 				<symbol draft="contributed">KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRH">
-				<displayName draft="contributed">韓国 ファン（1953-1962）</displayName>
-				<displayName count="other" draft="contributed">韓国 ファン（1953-1962）</displayName>
+				<displayName draft="contributed">韓国 ファン（1953–1962）</displayName>
+				<displayName count="other" draft="contributed">韓国 ファン（1953–1962）</displayName>
 				<symbol draft="contributed">KRH</symbol>
 			</currency>
 			<currency type="KRO">
-				<displayName draft="contributed">韓国 ウォン（1945-1953）</displayName>
-				<displayName count="other" draft="contributed">韓国 ウォン（1945-1953）</displayName>
+				<displayName draft="contributed">韓国 ウォン（1945–1953）</displayName>
+				<displayName count="other" draft="contributed">韓国 ウォン（1945–1953）</displayName>
 				<symbol draft="contributed">KRO</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>韓国 ウォン</displayName>
 				<displayName count="other">韓国 ウォン</displayName>
-				<symbol>￦</symbol>
-				<symbol alt="narrow" draft="contributed">₩</symbol>
+				<symbol>₩</symbol>
+				<symbol alt="narrow">₩</symbol>
 			</currency>
 			<currency type="KWD">
 				<displayName>クウェート ディナール</displayName>
@@ -7337,11 +7495,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>レバノン ポンド</displayName>
 				<displayName count="other">レバノン ポンド</displayName>
 				<symbol draft="contributed">LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>スリランカ ルピー</displayName>
 				<displayName count="other">スリランカ ルピー</displayName>
 				<symbol draft="contributed">LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>リベリア ドル</displayName>
@@ -7423,6 +7583,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>マダガスカル アリアリ</displayName>
 				<displayName count="other">マダガスカル アリアリ</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>マラガシ フラン</displayName>
@@ -7435,8 +7596,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>MKD</symbol>
 			</currency>
 			<currency type="MKN">
-				<displayName draft="contributed">マケドニア ディナール（1992-1993）</displayName>
-				<displayName count="other" draft="contributed">マケドニア ディナール（1992-1993）</displayName>
+				<displayName draft="contributed">マケドニア ディナール（1992–1993）</displayName>
+				<displayName count="other" draft="contributed">マケドニア ディナール（1992–1993）</displayName>
 				<symbol draft="contributed">MKN</symbol>
 			</currency>
 			<currency type="MLF">
@@ -7448,6 +7609,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ミャンマー チャット</displayName>
 				<displayName count="other">ミャンマー チャット</displayName>
 				<symbol draft="contributed">MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>モンゴル トグログ</displayName>
@@ -7479,6 +7641,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>モーリシャス ルピー</displayName>
 				<displayName count="other">モーリシャス ルピー</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVP">
 				<displayName draft="contributed">モルディブ諸島 ルピー</displayName>
@@ -7515,6 +7678,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>マレーシア リンギット</displayName>
 				<displayName count="other">マレーシア リンギット</displayName>
 				<symbol draft="contributed">MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>モザンピーク エスクード</displayName>
@@ -7552,6 +7716,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ニカラグア コルドバ オロ</displayName>
 				<displayName count="other">ニカラグア コルドバ オロ</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>オランダ ギルダー</displayName>
@@ -7562,11 +7727,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ノルウェー クローネ</displayName>
 				<displayName count="other">ノルウェー クローネ</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>ネパール ルピー</displayName>
 				<displayName count="other">ネパール ルピー</displayName>
 				<symbol draft="contributed">NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>ニュージーランド ドル</displayName>
@@ -7614,11 +7781,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>パキスタン ルピー</displayName>
 				<displayName count="other">パキスタン ルピー</displayName>
 				<symbol draft="contributed">PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>ポーランド ズウォティ</displayName>
 				<displayName count="other">ポーランド ズウォティ</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>ポーランド ズウォティ (1950–1995)</displayName>
@@ -7665,6 +7834,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ロシア ルーブル</displayName>
 				<displayName count="other">ロシア ルーブル</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>ロシア ルーブル (1991–1998)</displayName>
@@ -7675,6 +7845,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ルワンダ フラン</displayName>
 				<displayName count="other">ルワンダ フラン</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>サウジ リヤル</displayName>
@@ -7711,6 +7882,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>スウェーデン クローナ</displayName>
 				<displayName count="other">スウェーデン クローナ</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>シンガポール ドル</displayName>
@@ -7722,6 +7894,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>セントヘレナ島 ポンド</displayName>
 				<displayName count="other">セントヘレナ島 ポンド</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>スロベニア トラール</displayName>
@@ -7764,6 +7937,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>サントメ・プリンシペ ドブラ</displayName>
 				<displayName count="other">サントメ・プリンシペ ドブラ</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>ソ連 ルーブル</displayName>
@@ -7779,6 +7953,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>シリア ポンド</displayName>
 				<displayName count="other">シリア ポンド</displayName>
 				<symbol draft="contributed">SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>スワジランド リランゲニ</displayName>
@@ -7789,6 +7964,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>タイ バーツ</displayName>
 				<displayName count="other">タイ バーツ</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>タジキスタン ルーブル</displayName>
@@ -7819,6 +7995,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>トンガ パ・アンガ</displayName>
 				<displayName count="other">トンガ パ・アンガ</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>ティモール エスクード</displayName>
@@ -7835,6 +8012,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">新トルコリラ</displayName>
 				<symbol draft="contributed">TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>トリニダードトバゴ ドル</displayName>
@@ -7920,6 +8098,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ベネズエラ ボリバル</displayName>
 				<displayName count="other">ベネズエラ ボリバル</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>ベトナム ドン</displayName>
@@ -7928,8 +8107,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">₫</symbol>
 			</currency>
 			<currency type="VNN">
-				<displayName draft="contributed">ベトナム ドン（1978-1985）</displayName>
-				<displayName count="other" draft="contributed">ベトナム ドン（1978-1985）</displayName>
+				<displayName draft="contributed">ベトナム ドン（1978–1985）</displayName>
+				<displayName count="other" draft="contributed">ベトナム ドン（1978–1985）</displayName>
 				<symbol draft="contributed">VNN</symbol>
 			</currency>
 			<currency type="VUV">
@@ -7943,8 +8122,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>WST</symbol>
 			</currency>
 			<currency type="XAF">
-				<displayName>CFA フラン（BEAC）</displayName>
-				<displayName count="other">CFA フラン（BEAC）</displayName>
+				<displayName>中央アフリカ CFA フラン</displayName>
+				<displayName count="other">中央アフリカ CFA フラン</displayName>
 				<symbol>FCFA</symbol>
 			</currency>
 			<currency type="XAG">
@@ -7981,6 +8160,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>東カリブ ドル</displayName>
 				<displayName count="other">東カリブ ドル</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>特別引き出し権</displayName>
@@ -8003,8 +8183,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol draft="contributed">XFU</symbol>
 			</currency>
 			<currency type="XOF">
-				<displayName>CFA フラン（BCEAO）</displayName>
-				<displayName count="other">CFA フラン（BCEAO）</displayName>
+				<displayName>西アフリカ CFA フラン</displayName>
+				<displayName count="other">西アフリカ CFA フラン</displayName>
 				<symbol>CFA</symbol>
 			</currency>
 			<currency type="XPD">
@@ -8073,8 +8253,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol draft="contributed">YUN</symbol>
 			</currency>
 			<currency type="YUR">
-				<displayName draft="contributed">ユーゴスラビア 改革ディナール（1992-1993）</displayName>
-				<displayName count="other" draft="contributed">ユーゴスラビア 改革ディナール（1992-1993）</displayName>
+				<displayName draft="contributed">ユーゴスラビア 改革ディナール（1992–1993）</displayName>
+				<displayName count="other" draft="contributed">ユーゴスラビア 改革ディナール（1992–1993）</displayName>
 				<symbol draft="contributed">YUR</symbol>
 			</currency>
 			<currency type="ZAL">
@@ -8086,6 +8266,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>南アフリカ ランド</displayName>
 				<displayName count="other">南アフリカ ランド</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>ザンビア クワチャ (1968–2012)</displayName>
@@ -8096,6 +8277,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ザンビア クワチャ</displayName>
 				<displayName count="other">ザンビア クワチャ</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>ザイール 新ザイール (1993–1998)</displayName>
@@ -8131,7 +8313,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 	<units>
 		<unitLength type="long">
 			<compoundUnit type="per">
-				<compoundUnitPattern>毎{1} {0}</compoundUnitPattern>
+				<compoundUnitPattern>{0}毎{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>G フォース</displayName>
@@ -8141,6 +8323,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>メートル毎秒毎秒</displayName>
 				<unitPattern count="other">{0} メートル毎秒毎秒</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>回転</displayName>
+				<unitPattern count="other">{0} 回転</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>ラジアン</displayName>
+				<unitPattern count="other">{0} ラジアン</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>度</displayName>
+				<unitPattern count="other">{0} 度</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>分</displayName>
 				<unitPattern count="other">{0} 分</unitPattern>
@@ -8149,25 +8343,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>秒</displayName>
 				<unitPattern count="other">{0} 秒</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>度</displayName>
-				<unitPattern count="other">{0} 度</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>ラジアン</displayName>
-				<unitPattern count="other">{0} ラジアン</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>エーカー</displayName>
-				<unitPattern count="other">{0} エーカー</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>平方キロメートル</displayName>
+				<unitPattern count="other">{0} 平方キロメートル</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ヘクタール</displayName>
 				<unitPattern count="other">{0} ヘクタール</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>平方メートル</displayName>
+				<unitPattern count="other">{0} 平方メートル</unitPattern>
+				<perUnitPattern>{0}/平方メートル</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>平方センチメートル</displayName>
 				<unitPattern count="other">{0} 平方センチメートル</unitPattern>
+				<perUnitPattern>{0}/平方センチメートル</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>平方マイル</displayName>
+				<unitPattern count="other">{0} 平方マイル</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>エーカー</displayName>
+				<unitPattern count="other">{0} エーカー</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>平方ヤード</displayName>
+				<unitPattern count="other">{0} 平方ヤード</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>平方フィート</displayName>
@@ -8176,112 +8380,114 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="area-square-inch">
 				<displayName>平方インチ</displayName>
 				<unitPattern count="other">{0} 平方インチ</unitPattern>
+				<perUnitPattern>{0}/平方インチ</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>平方キロメートル</displayName>
-				<unitPattern count="other">{0} 平方キロメートル</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>平方メートル</displayName>
-				<unitPattern count="other">{0} 平方メートル</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>平方マイル</displayName>
-				<unitPattern count="other">{0} 平方マイル</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>平方ヤード</displayName>
-				<unitPattern count="other">{0} 平方ヤード</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>金</displayName>
+				<unitPattern count="other">{0} 金</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>リットル毎キロメートル</displayName>
 				<unitPattern count="other">{0} リットル毎キロメートル</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>リットル毎100キロメートル</displayName>
+				<unitPattern count="other">{0} リットル毎100キロメートル</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>マイル毎ガロン</displayName>
 				<unitPattern count="other">{0} マイル毎ガロン</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>ビット</displayName>
-				<unitPattern count="other">{0} ビット</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>バイト</displayName>
-				<unitPattern count="other">{0} バイト</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>ギガビット</displayName>
-				<unitPattern count="other">{0} ギガビット</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>ギガバイト</displayName>
-				<unitPattern count="other">{0} ギガバイト</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>キロビット</displayName>
-				<unitPattern count="other">{0} キロビット</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>キロバイト</displayName>
-				<unitPattern count="other">{0} キロバイト</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>メガビット</displayName>
-				<unitPattern count="other">{0} メガビット</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>メガバイト</displayName>
-				<unitPattern count="other">{0} メガバイト</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>テラビット</displayName>
-				<unitPattern count="other">{0} テラビット</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>テラバイト</displayName>
 				<unitPattern count="other">{0} テラバイト</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>テラビット</displayName>
+				<unitPattern count="other">{0} テラビット</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>ギガバイト</displayName>
+				<unitPattern count="other">{0} ギガバイト</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>ギガビット</displayName>
+				<unitPattern count="other">{0} ギガビット</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>メガバイト</displayName>
+				<unitPattern count="other">{0} メガバイト</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>メガビット</displayName>
+				<unitPattern count="other">{0} メガビット</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>キロバイト</displayName>
+				<unitPattern count="other">{0} キロバイト</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>キロビット</displayName>
+				<unitPattern count="other">{0} キロビット</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>バイト</displayName>
+				<unitPattern count="other">{0} バイト</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>ビット</displayName>
+				<unitPattern count="other">{0} ビット</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>世紀</displayName>
+				<unitPattern count="other">{0} 世紀</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>年</displayName>
+				<unitPattern count="other">{0} 年</unitPattern>
+				<perUnitPattern>{0}/年</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>か月</displayName>
+				<unitPattern count="other">{0} か月</unitPattern>
+				<perUnitPattern>{0}/月</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>週間</displayName>
+				<unitPattern count="other">{0} 週間</unitPattern>
+				<perUnitPattern>{0}/週</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>日</displayName>
 				<unitPattern count="other">{0} 日</unitPattern>
+				<perUnitPattern>{0}/日</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>時間</displayName>
 				<unitPattern count="other">{0} 時間</unitPattern>
 				<perUnitPattern>{0}/時間</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>マイクロ秒</displayName>
-				<unitPattern count="other">{0} マイクロ秒</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ミリ秒</displayName>
-				<unitPattern count="other">{0} ミリ秒</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>分</displayName>
 				<unitPattern count="other">{0} 分</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>か月</displayName>
-				<unitPattern count="other">{0} か月</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ナノ秒</displayName>
-				<unitPattern count="other">{0} ナノ秒</unitPattern>
+				<perUnitPattern>{0}/分</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>秒</displayName>
 				<unitPattern count="other">{0} 秒</unitPattern>
 				<perUnitPattern>{0}/秒</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>週間</displayName>
-				<unitPattern count="other">{0} 週間</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ミリ秒</displayName>
+				<unitPattern count="other">{0} ミリ秒</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>年</displayName>
-				<unitPattern count="other">{0} 年</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>マイクロ秒</displayName>
+				<unitPattern count="other">{0} マイクロ秒</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ナノ秒</displayName>
+				<unitPattern count="other">{0} ナノ秒</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>アンペア</displayName>
@@ -8299,26 +8505,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ボルト</displayName>
 				<unitPattern count="other">{0} ボルト</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>キロカロリー</displayName>
+				<unitPattern count="other">{0} キロカロリー</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
-				<displayName>熱力学カロリー</displayName>
-				<unitPattern count="other">{0} 熱力学カロリー</unitPattern>
+				<displayName>カロリー</displayName>
+				<unitPattern count="other">{0} カロリー</unitPattern>
 			</unit>
 			<unit type="energy-foodcalorie">
 				<displayName>カロリー</displayName>
 				<unitPattern count="other">{0} カロリー</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>ジュール</displayName>
-				<unitPattern count="other">{0} ジュール</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>キロカロリー</displayName>
-				<unitPattern count="other">{0} キロカロリー</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>キロジュール</displayName>
 				<unitPattern count="other">{0} キロジュール</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>ジュール</displayName>
+				<unitPattern count="other">{0} ジュール</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>キロワット時</displayName>
 				<unitPattern count="other">{0} キロワット時</unitPattern>
@@ -8327,174 +8533,179 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ギガヘルツ</displayName>
 				<unitPattern count="other">{0} ギガヘルツ</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>ヘルツ</displayName>
-				<unitPattern count="other">{0} ヘルツ</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>メガヘルツ</displayName>
+				<unitPattern count="other">{0} メガヘルツ</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>キロヘルツ</displayName>
 				<unitPattern count="other">{0} キロヘルツ</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>メガヘルツ</displayName>
-				<unitPattern count="other">{0} メガヘルツ</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>ヘルツ</displayName>
+				<unitPattern count="other">{0} ヘルツ</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>天文単位</displayName>
-				<unitPattern count="other">{0} 天文単位</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>キロメートル</displayName>
+				<unitPattern count="other">{0} キロメートル</unitPattern>
+				<perUnitPattern>{0}/キロメートル</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>センチメートル</displayName>
-				<unitPattern count="other">{0} センチメートル</unitPattern>
+			<unit type="length-meter">
+				<displayName>メートル</displayName>
+				<unitPattern count="other">{0} メートル</unitPattern>
+				<perUnitPattern>{0}/メートル</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>デシメートル</displayName>
 				<unitPattern count="other">{0} デシメートル</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName draft="contributed">ファゾム</displayName>
-				<unitPattern count="other" draft="contributed">{0} ファゾム</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>フィート</displayName>
-				<unitPattern count="other">{0} フィート</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName draft="contributed">ハロン</displayName>
-				<unitPattern count="other" draft="contributed">{0} ハロン</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>インチ</displayName>
-				<unitPattern count="other">{0} インチ</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>キロメートル</displayName>
-				<unitPattern count="other">{0} キロメートル</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>光年</displayName>
-				<unitPattern count="other">{0} 光年</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>メートル</displayName>
-				<unitPattern count="other">{0} メートル</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>マイクロメートル</displayName>
-				<unitPattern count="other">{0} マイクロメートル</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>マイル</displayName>
-				<unitPattern count="other">{0} マイル</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>センチメートル</displayName>
+				<unitPattern count="other">{0} センチメートル</unitPattern>
+				<perUnitPattern>{0}/センチメートル</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>ミリメートル</displayName>
 				<unitPattern count="other">{0} ミリメートル</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>マイクロメートル</displayName>
+				<unitPattern count="other">{0} マイクロメートル</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>ナノメートル</displayName>
 				<unitPattern count="other">{0} ナノメートル</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>海里</displayName>
-				<unitPattern count="other">{0} 海里</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>パーセク</displayName>
-				<unitPattern count="other">{0} パーセク</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>ピコメートル</displayName>
 				<unitPattern count="other">{0} ピコメートル</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>マイル</displayName>
+				<unitPattern count="other">{0} マイル</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>ヤード</displayName>
 				<unitPattern count="other">{0} ヤード</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>フィート</displayName>
+				<unitPattern count="other">{0} フィート</unitPattern>
+				<perUnitPattern>{0}/フィート</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>インチ</displayName>
+				<unitPattern count="other">{0} インチ</unitPattern>
+				<perUnitPattern>{0}/インチ</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>パーセク</displayName>
+				<unitPattern count="other">{0} パーセク</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>光年</displayName>
+				<unitPattern count="other">{0} 光年</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>天文単位</displayName>
+				<unitPattern count="other">{0} 天文単位</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName draft="contributed">ハロン</displayName>
+				<unitPattern count="other" draft="contributed">{0} ハロン</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName draft="contributed">ファゾム</displayName>
+				<unitPattern count="other" draft="contributed">{0} ファゾム</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>海里</displayName>
+				<unitPattern count="other">{0} 海里</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>スカンジナビアマイル</displayName>
+				<unitPattern count="other">{0} スカンジナビアマイル</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>ルクス</displayName>
 				<unitPattern count="other">{0} ルクス</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>カラット</displayName>
-				<unitPattern count="other">{0} カラット</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>グラム</displayName>
-				<unitPattern count="other">{0} グラム</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>キログラム</displayName>
-				<unitPattern count="other">{0} キログラム</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>メトリックトン</displayName>
 				<unitPattern count="other">{0} メトリックトン</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>マイクログラム</displayName>
-				<unitPattern count="other">{0} マイクログラム</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>キログラム</displayName>
+				<unitPattern count="other">{0} キログラム</unitPattern>
+				<perUnitPattern>{0}/キログラム</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>グラム</displayName>
+				<unitPattern count="other">{0} グラム</unitPattern>
+				<perUnitPattern>{0}/グラム</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>ミリグラム</displayName>
 				<unitPattern count="other">{0} ミリグラム</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>オンス</displayName>
-				<unitPattern count="other">{0} オンス</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>トロイオンス</displayName>
-				<unitPattern count="other">{0} トロイオンス</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>ポンド</displayName>
-				<unitPattern count="other">{0} ポンド</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="contributed">ストーン</displayName>
-				<unitPattern count="other" draft="contributed">{0} ストーン</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>マイクログラム</displayName>
+				<unitPattern count="other">{0} マイクログラム</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>トン</displayName>
 				<unitPattern count="other">{0} トン</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName draft="contributed">ストーン</displayName>
+				<unitPattern count="other" draft="contributed">{0} ストーン</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>ポンド</displayName>
+				<unitPattern count="other">{0} ポンド</unitPattern>
+				<perUnitPattern>{0}/ポンド</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>オンス</displayName>
+				<unitPattern count="other">{0} オンス</unitPattern>
+				<perUnitPattern>{0}/オンス</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>トロイオンス</displayName>
+				<unitPattern count="other">{0} トロイオンス</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>カラット</displayName>
+				<unitPattern count="other">{0} カラット</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>ギガワット</displayName>
 				<unitPattern count="other">{0} ギガワット</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>馬力</displayName>
-				<unitPattern count="other">{0} 馬力</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>キロワット</displayName>
-				<unitPattern count="other">{0} キロワット</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>メガワット</displayName>
 				<unitPattern count="other">{0} メガワット</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>ミリワット</displayName>
-				<unitPattern count="other">{0} ミリワット</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>キロワット</displayName>
+				<unitPattern count="other">{0} キロワット</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>ワット</displayName>
 				<unitPattern count="other">{0} ワット</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>ミリワット</displayName>
+				<unitPattern count="other">{0} ミリワット</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>馬力</displayName>
+				<unitPattern count="other">{0} 馬力</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>ヘクトパスカル</displayName>
 				<unitPattern count="other">{0} ヘクトパスカル</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>水銀柱インチ</displayName>
-				<unitPattern count="other">{0} 水銀柱インチ</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>ミリバール</displayName>
-				<unitPattern count="other">{0} ミリバール</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>水銀柱ミリメートル</displayName>
 				<unitPattern count="other">{0} 水銀柱ミリメートル</unitPattern>
@@ -8503,9 +8714,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>重量ポンド毎平方インチ</displayName>
 				<unitPattern count="other">{0} 重量ポンド毎平方インチ</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>金</displayName>
-				<unitPattern count="other">{0} 金</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>水銀柱インチ</displayName>
+				<unitPattern count="other">{0} 水銀柱インチ</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>ミリバール</displayName>
+				<unitPattern count="other">{0} ミリバール</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>キロメートル毎時</displayName>
@@ -8519,6 +8734,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>マイル毎時</displayName>
 				<unitPattern count="other">時速 {0} マイル</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>ノット</displayName>
+				<unitPattern count="other">{0} ノット</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>度</displayName>
+				<unitPattern count="other">{0}度</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>摂氏</displayName>
 				<unitPattern count="other">摂氏 {0} 度</unitPattern>
@@ -8531,30 +8754,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ケルビン</displayName>
 				<unitPattern count="other">{0} ケルビン</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>エーカーフィート</displayName>
-				<unitPattern count="other">{0} エーカーフィート</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName draft="contributed">ブッシェル</displayName>
-				<unitPattern count="other" draft="contributed">{0} ブッシェル</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>センチリットル</displayName>
-				<unitPattern count="other">{0} センチリットル</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>立方センチメートル</displayName>
-				<unitPattern count="other">{0} 立方センチメートル</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>立方フィート</displayName>
-				<unitPattern count="other">{0} 立方フィート</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>立方インチ</displayName>
-				<unitPattern count="other">{0} 立方インチ</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>立方キロメートル</displayName>
 				<unitPattern count="other">{0} 立方キロメートル</unitPattern>
@@ -8562,6 +8761,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-cubic-meter">
 				<displayName>立方メートル</displayName>
 				<unitPattern count="other">{0} 立方メートル</unitPattern>
+				<perUnitPattern>{0}/立方メートル</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>立方センチメートル</displayName>
+				<unitPattern count="other">{0} 立方センチメートル</unitPattern>
+				<perUnitPattern>{0}/立方センチメートル</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>立方マイル</displayName>
@@ -8571,21 +8776,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>立方ヤード</displayName>
 				<unitPattern count="other">{0} 立方ヤード</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>カップ</displayName>
-				<unitPattern count="other">{0} カップ</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>立方フィート</displayName>
+				<unitPattern count="other">{0} 立方フィート</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>デシリットル</displayName>
-				<unitPattern count="other">{0} デシリットル</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>立方インチ</displayName>
+				<unitPattern count="other">{0} 立方インチ</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>液量オンス</displayName>
-				<unitPattern count="other">{0} 液量オンス</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>ガロン</displayName>
-				<unitPattern count="other">{0} ガロン</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>メガリットル</displayName>
+				<unitPattern count="other">{0} メガリットル</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>ヘクトリットル</displayName>
@@ -8594,23 +8795,57 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-liter">
 				<displayName>リットル</displayName>
 				<unitPattern count="other">{0} リットル</unitPattern>
+				<perUnitPattern>{0}/リットル</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>メガリットル</displayName>
-				<unitPattern count="other">{0} メガリットル</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>デシリットル</displayName>
+				<unitPattern count="other">{0} デシリットル</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>センチリットル</displayName>
+				<unitPattern count="other">{0} センチリットル</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ミリリットル</displayName>
 				<unitPattern count="other">{0} ミリリットル</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>パイント</displayName>
-				<unitPattern count="other">{0} パイント</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>メトリックパイント</displayName>
+				<unitPattern count="other">{0} メトリックパイント</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>メトリックカップ</displayName>
+				<unitPattern count="other">{0} メトリックカップ</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>エーカーフィート</displayName>
+				<unitPattern count="other">{0} エーカーフィート</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName draft="contributed">ブッシェル</displayName>
+				<unitPattern count="other" draft="contributed">{0} ブッシェル</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>ガロン</displayName>
+				<unitPattern count="other">{0} ガロン</unitPattern>
+				<perUnitPattern>{0}/ガロン</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>クォート</displayName>
 				<unitPattern count="other">{0} クォート</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>パイント</displayName>
+				<unitPattern count="other">{0} パイント</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>カップ</displayName>
+				<unitPattern count="other">{0} カップ</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>液量オンス</displayName>
+				<unitPattern count="other">{0} 液量オンス</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>大さじ</displayName>
 				<unitPattern count="other">大さじ {0}</unitPattern>
@@ -8619,6 +8854,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>小さじ</displayName>
 				<unitPattern count="other">小さじ {0}</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">東経{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">北緯{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">南緯{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">西経{0}</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -8632,6 +8873,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>メートル毎秒毎秒</displayName>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName draft="provisional">rev</displayName>
+				<unitPattern count="other">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>ラジアン</displayName>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>度</displayName>
+				<unitPattern count="other">{0} 度</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>分</displayName>
 				<unitPattern count="other">{0} 分</unitPattern>
@@ -8640,25 +8893,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>秒</displayName>
 				<unitPattern count="other">{0} 秒</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>度</displayName>
-				<unitPattern count="other">{0} 度</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>ラジアン</displayName>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>エーカー</displayName>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ヘクタール</displayName>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>平方マイル</displayName>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>エーカー</displayName>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>平方ヤード</displayName>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>平方フィート</displayName>
@@ -8667,112 +8930,114 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="area-square-inch">
 				<displayName>平方インチ</displayName>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>平方マイル</displayName>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>平方ヤード</displayName>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>金</displayName>
+				<unitPattern count="other">{0} 金</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName>リットル毎キロメートル</displayName>
+				<displayName>L/km</displayName>
 				<unitPattern count="other">{0} L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
-				<displayName>マイル毎ガロン</displayName>
+				<displayName>マイル/ガロン</displayName>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>ビット</displayName>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>バイト</displayName>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>ギガビット</displayName>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>キロビット</displayName>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>KB</displayName>
-				<unitPattern count="other">{0} KB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>メガビット</displayName>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>テラビット</displayName>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>テラバイト</displayName>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>テラビット</displayName>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>ギガビット</displayName>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>メガビット</displayName>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>KB</displayName>
+				<unitPattern count="other">{0} KB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>キロビット</displayName>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>バイト</displayName>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>ビット</displayName>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="provisional">c</displayName>
+				<unitPattern count="other" draft="provisional">{0} c</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>年</displayName>
+				<unitPattern count="other">{0} 年</unitPattern>
+				<perUnitPattern>{0}/年</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>か月</displayName>
+				<unitPattern count="other">{0} か月</unitPattern>
+				<perUnitPattern>{0}/月</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>週間</displayName>
+				<unitPattern count="other">{0} 週間</unitPattern>
+				<perUnitPattern>{0}/週</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>日</displayName>
 				<unitPattern count="other">{0} 日</unitPattern>
+				<perUnitPattern>{0}/日</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>時間</displayName>
 				<unitPattern count="other">{0} 時間</unitPattern>
 				<perUnitPattern>{0}/時間</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>マイクロ秒</displayName>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ミリ秒</displayName>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>分</displayName>
 				<unitPattern count="other">{0} 分</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>か月</displayName>
-				<unitPattern count="other">{0} か月</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ナノ秒</displayName>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/分</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>秒</displayName>
 				<unitPattern count="other">{0} 秒</unitPattern>
 				<perUnitPattern>{0}/秒</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>週間</displayName>
-				<unitPattern count="other">{0} 週間</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ミリ秒</displayName>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>年</displayName>
-				<unitPattern count="other">{0} 年</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>マイクロ秒</displayName>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ナノ秒</displayName>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>アンペア</displayName>
@@ -8790,26 +9055,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ボルト</displayName>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
-				<displayName>熱力学カロリー</displayName>
-				<unitPattern count="other">{0} calth</unitPattern>
+				<displayName>cal</displayName>
+				<unitPattern count="other">{0} cal</unitPattern>
 			</unit>
 			<unit type="energy-foodcalorie">
 				<displayName>cal</displayName>
 				<unitPattern count="other">{0} cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>ジュール</displayName>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>キロジュール</displayName>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>ジュール</displayName>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>キロワット時</displayName>
 				<unitPattern count="other">{0} kWh</unitPattern>
@@ -8818,174 +9083,179 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ギガヘルツ</displayName>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>メガヘルツ</displayName>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>メガヘルツ</displayName>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>天文単位</displayName>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>デシメートル</displayName>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName draft="contributed">ファゾム</displayName>
-				<unitPattern count="other" draft="contributed">{0} fm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>フィート</displayName>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName draft="contributed">ハロン</displayName>
-				<unitPattern count="other" draft="contributed">{0} fur</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>インチ</displayName>
-				<unitPattern count="other">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>光年</displayName>
-				<unitPattern count="other">{0} 光年</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>マイクロメートル</displayName>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>マイル</displayName>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>マイクロメートル</displayName>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>ナノメートル</displayName>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>海里</displayName>
-				<unitPattern count="other">{0} 海里</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>パーセク</displayName>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>ピコメートル</displayName>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>マイル</displayName>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>ヤード</displayName>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>フィート</displayName>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>インチ</displayName>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>パーセク</displayName>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>光年</displayName>
+				<unitPattern count="other">{0} 光年</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>天文単位</displayName>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName draft="contributed">ハロン</displayName>
+				<unitPattern count="other" draft="contributed">{0} fur</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName draft="contributed">ファゾム</displayName>
+				<unitPattern count="other" draft="contributed">{0} fm</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>海里</displayName>
+				<unitPattern count="other">{0} 海里</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>スカンジナビアマイル</displayName>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>ルクス</displayName>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>カラット</displayName>
-				<unitPattern count="other">{0} ct</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>グラム</displayName>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>メトリックトン</displayName>
 				<unitPattern count="other">{0} MT</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>マイクログラム</displayName>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>グラム</displayName>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>オンス</displayName>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>トロイオンス</displayName>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>ポンド</displayName>
-				<unitPattern count="other">{0} lb</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="contributed">ストーン</displayName>
-				<unitPattern count="other" draft="contributed">{0} st</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>マイクログラム</displayName>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>トン</displayName>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName draft="contributed">ストーン</displayName>
+				<unitPattern count="other" draft="contributed">{0} st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>ポンド</displayName>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>オンス</displayName>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>トロイオンス</displayName>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>カラット</displayName>
+				<unitPattern count="other">{0} ct</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>ギガワット</displayName>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>馬力</displayName>
-				<unitPattern count="other">{0} 馬力</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>キロワット</displayName>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>メガワット</displayName>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>ミリワット</displayName>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>キロワット</displayName>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>ワット</displayName>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>ミリワット</displayName>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>馬力</displayName>
+				<unitPattern count="other">{0} 馬力</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>水銀柱インチ</displayName>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>ミリバール</displayName>
-				<unitPattern count="other">{0} mb</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>水銀柱ミリメートル</displayName>
 				<unitPattern count="other">{0} mm Hg</unitPattern>
@@ -8994,9 +9264,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>重量ポンド毎平方インチ</displayName>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>金</displayName>
-				<unitPattern count="other">{0} 金</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>水銀柱インチ</displayName>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>ミリバール</displayName>
+				<unitPattern count="other">{0} mb</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -9010,6 +9284,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>マイル毎時</displayName>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName draft="provisional">kn</displayName>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="other">{0}°C</unitPattern>
@@ -9022,30 +9304,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>K</displayName>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>エーカーフィート</displayName>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName draft="contributed">ブッシェル</displayName>
-				<unitPattern count="other" draft="contributed">{0} bu</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>センチリットル</displayName>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>立方フィート</displayName>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>立方インチ</displayName>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="other">{0} km³</unitPattern>
@@ -9053,6 +9311,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-cubic-meter">
 				<displayName>m³</displayName>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>立方マイル</displayName>
@@ -9062,21 +9326,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>立方ヤード</displayName>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>カップ</displayName>
-				<unitPattern count="other">{0} カップ</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>立方フィート</displayName>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>デシリットル</displayName>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>立方インチ</displayName>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>液量オンス</displayName>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>ガロン</displayName>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>メガリットル</displayName>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>ヘクトリットル</displayName>
@@ -9085,23 +9345,57 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-liter">
 				<displayName>リットル</displayName>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>メガリットル</displayName>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>デシリットル</displayName>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>センチリットル</displayName>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>パイント</displayName>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName draft="provisional">mpt</displayName>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName draft="provisional">mcup</displayName>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>エーカーフィート</displayName>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName draft="contributed">ブッシェル</displayName>
+				<unitPattern count="other" draft="contributed">{0} bu</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>ガロン</displayName>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>クォート</displayName>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>パイント</displayName>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>カップ</displayName>
+				<unitPattern count="other">{0} カップ</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>液量オンス</displayName>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>大さじ</displayName>
 				<unitPattern count="other">大さじ {0}</unitPattern>
@@ -9110,6 +9404,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>小さじ</displayName>
 				<unitPattern count="other">小さじ {0}</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="provisional">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="provisional">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="provisional">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="provisional">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -9121,80 +9421,99 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="acceleration-meter-per-second-squared">
 				<unitPattern count="other" draft="contributed">{0}m/s²</unitPattern>
 			</unit>
+			<unit type="angle-radian">
+				<unitPattern count="other" draft="contributed">{0}rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="other">{0}′</unitPattern>
 			</unit>
 			<unit type="angle-arc-second">
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<unitPattern count="other" draft="contributed">{0}rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="other">{0}ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="other">{0}km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="other">{0}ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<unitPattern count="other">{0}m²</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<unitPattern count="other" draft="contributed">{0}cm²</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<unitPattern count="other">{0}mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<unitPattern count="other">{0}ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<unitPattern count="other" draft="contributed">{0}yd²</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<unitPattern count="other">{0}ft²</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
 				<unitPattern count="other" draft="contributed">{0}in²</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="other">{0}km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<unitPattern count="other">{0}m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<unitPattern count="other">{0}mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<unitPattern count="other" draft="contributed">{0}yd²</unitPattern>
+			<unit type="concentr-karat">
+				<unitPattern count="other" draft="contributed">{0}K</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="other" draft="contributed">{0}L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="other">{0}L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<unitPattern count="other" draft="contributed">{0}mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<unitPattern count="other" draft="contributed">{0}b</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<unitPattern count="other" draft="contributed">{0}B</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<unitPattern count="other" draft="contributed">{0}Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<unitPattern count="other" draft="contributed">{0}GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<unitPattern count="other" draft="contributed">{0}kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<unitPattern count="other" draft="contributed">{0}KB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<unitPattern count="other" draft="contributed">{0}Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<unitPattern count="other" draft="contributed">{0}MB</unitPattern>
+			<unit type="digital-terabyte">
+				<unitPattern count="other" draft="contributed">{0}TB</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<unitPattern count="other" draft="contributed">{0}Tb</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<unitPattern count="other" draft="contributed">{0}TB</unitPattern>
+			<unit type="digital-gigabyte">
+				<unitPattern count="other" draft="contributed">{0}GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<unitPattern count="other" draft="contributed">{0}Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<unitPattern count="other" draft="contributed">{0}MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<unitPattern count="other" draft="contributed">{0}Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<unitPattern count="other" draft="contributed">{0}KB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<unitPattern count="other" draft="contributed">{0}kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<unitPattern count="other" draft="contributed">{0}B</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<unitPattern count="other" draft="contributed">{0}b</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>年</displayName>
+				<unitPattern count="other">{0}年</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>か月</displayName>
+				<unitPattern count="other">{0}か月</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>週間</displayName>
+				<unitPattern count="other">{0}週間</unitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>日</displayName>
@@ -9204,37 +9523,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>時間</displayName>
 				<unitPattern count="other">{0}時間</unitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName draft="contributed">µs</displayName>
-				<unitPattern count="other" draft="contributed">{0}μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="other">{0}ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>分</displayName>
 				<unitPattern count="other">{0}分</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>か月</displayName>
-				<unitPattern count="other">{0}か月</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName draft="contributed">ns</displayName>
-				<unitPattern count="other" draft="contributed">{0}ns</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>秒</displayName>
 				<unitPattern count="other">{0}秒</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>週間</displayName>
-				<unitPattern count="other">{0}週間</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="other">{0}ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>年</displayName>
-				<unitPattern count="other">{0}年</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName draft="contributed">µs</displayName>
+				<unitPattern count="other" draft="contributed">{0}μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName draft="contributed">ns</displayName>
+				<unitPattern count="other" draft="contributed">{0}ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<unitPattern count="other" draft="contributed">{0}A</unitPattern>
@@ -9248,118 +9555,125 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="electric-volt">
 				<unitPattern count="other" draft="contributed">{0}V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<unitPattern count="other" draft="contributed">{0}kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<unitPattern count="other" draft="contributed">{0}calth</unitPattern>
 			</unit>
 			<unit type="energy-foodcalorie">
 				<unitPattern count="other" draft="contributed">{0}cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<unitPattern count="other" draft="contributed">{0}J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<unitPattern count="other" draft="contributed">{0}kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<unitPattern count="other" draft="contributed">{0}kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<unitPattern count="other" draft="contributed">{0}J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<unitPattern count="other" draft="contributed">{0}kWh</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
 				<unitPattern count="other" draft="contributed">{0}GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<unitPattern count="other" draft="contributed">{0}Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<unitPattern count="other" draft="contributed">{0}MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<unitPattern count="other" draft="contributed">{0}kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<unitPattern count="other" draft="contributed">{0}MHz</unitPattern>
-			</unit>
-			<unit type="length-astronomical-unit">
-				<unitPattern count="other" draft="contributed">{0}au</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="other">{0}cm</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<unitPattern count="other" draft="contributed">{0}dm</unitPattern>
-			</unit>
-			<unit type="length-fathom">
-				<displayName draft="contributed">fm</displayName>
-				<unitPattern count="other" draft="contributed">{0}fm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="other">{0}′</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName draft="contributed">fur</displayName>
-				<unitPattern count="other" draft="contributed">{0}fur</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="other">{0}″</unitPattern>
+			<unit type="frequency-hertz">
+				<unitPattern count="other" draft="contributed">{0}Hz</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
 				<unitPattern count="other">{0}km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="other">{0}光年</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>m</displayName>
 				<unitPattern count="other">{0}m</unitPattern>
 			</unit>
-			<unit type="length-micrometer">
-				<unitPattern count="other" draft="contributed">{0}µm</unitPattern>
+			<unit type="length-decimeter">
+				<unitPattern count="other" draft="contributed">{0}dm</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="other">{0}マイル</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="other">{0}cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="other">{0}mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<unitPattern count="other" draft="contributed">{0}µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<unitPattern count="other" draft="contributed">{0}nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<unitPattern count="other" draft="contributed">{0}海里</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<unitPattern count="other" draft="contributed">{0}pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<unitPattern count="other">{0}pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="other">{0}マイル</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="other">{0}ヤード</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<unitPattern count="other">{0}′</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<unitPattern count="other" draft="contributed">{0}pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="other">{0}光年</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<unitPattern count="other" draft="contributed">{0}au</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName draft="contributed">fur</displayName>
+				<unitPattern count="other" draft="contributed">{0}fur</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName draft="contributed">fm</displayName>
+				<unitPattern count="other" draft="contributed">{0}fm</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<unitPattern count="other" draft="contributed">{0}海里</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<unitPattern count="other" draft="contributed">{0}lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<unitPattern count="other" draft="contributed">{0}ct</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="other">{0}g</unitPattern>
+			<unit type="mass-metric-ton">
+				<unitPattern count="other" draft="contributed">{0}MT</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="other">{0}kg</unitPattern>
 			</unit>
-			<unit type="mass-metric-ton">
-				<unitPattern count="other" draft="contributed">{0}MT</unitPattern>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="other">{0}g</unitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<unitPattern count="other" draft="contributed">{0}mg</unitPattern>
 			</unit>
 			<unit type="mass-microgram">
 				<unitPattern count="other" draft="contributed">{0}µg</unitPattern>
 			</unit>
-			<unit type="mass-milligram">
-				<unitPattern count="other" draft="contributed">{0}mg</unitPattern>
+			<unit type="mass-ton">
+				<unitPattern count="other" draft="contributed">{0}t</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName draft="contributed">st</displayName>
+				<unitPattern count="other" draft="contributed">{0}st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<unitPattern count="other">{0}lb</unitPattern>
 			</unit>
 			<unit type="mass-ounce">
 				<unitPattern count="other">{0}oz</unitPattern>
@@ -9367,52 +9681,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="mass-ounce-troy">
 				<unitPattern count="other" draft="contributed">{0}oz t</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<unitPattern count="other">{0}lb</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="contributed">st</displayName>
-				<unitPattern count="other" draft="contributed">{0}st</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<unitPattern count="other" draft="contributed">{0}t</unitPattern>
+			<unit type="mass-carat">
+				<unitPattern count="other" draft="contributed">{0}ct</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<unitPattern count="other" draft="contributed">{0}GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="other">{0}hp</unitPattern>
+			<unit type="power-megawatt">
+				<unitPattern count="other" draft="contributed">{0}MW</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="other">{0}kW</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<unitPattern count="other" draft="contributed">{0}MW</unitPattern>
+			<unit type="power-watt">
+				<unitPattern count="other">{0}W</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<unitPattern count="other" draft="contributed">{0}mW</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<unitPattern count="other">{0}W</unitPattern>
+			<unit type="power-horsepower">
+				<unitPattern count="other">{0}hp</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="contributed">hPa</displayName>
 				<unitPattern count="other">{0}hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<unitPattern count="other">{0}&quot; Hg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<unitPattern count="other">{0}mb</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<unitPattern count="other" draft="contributed">{0}mm Hg</unitPattern>
 			</unit>
 			<unit type="pressure-pound-per-square-inch">
 				<unitPattern count="other" draft="contributed">{0}psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<unitPattern count="other" draft="contributed">{0}K</unitPattern>
+			<unit type="pressure-inch-hg">
+				<unitPattern count="other">{0}&quot; Hg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<unitPattern count="other">{0}mb</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -9426,7 +9730,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
-				<unitPattern count="other">{0}°</unitPattern>
+				<unitPattern count="other">{0}°C</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
 				<unitPattern count="other">{0}°F</unitPattern>
@@ -9435,48 +9739,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>K</displayName>
 				<unitPattern count="other">{0}K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<unitPattern count="other" draft="contributed">{0}ac ft</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName draft="contributed">bu</displayName>
-				<unitPattern count="other" draft="contributed">{0}bu</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<unitPattern count="other" draft="contributed">{0}cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<unitPattern count="other" draft="contributed">{0}cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<unitPattern count="other" draft="contributed">{0}ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<unitPattern count="other" draft="contributed">{0}in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<unitPattern count="other">{0}km³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-meter">
 				<unitPattern count="other" draft="contributed">{0}m³</unitPattern>
 			</unit>
+			<unit type="volume-cubic-centimeter">
+				<unitPattern count="other" draft="contributed">{0}cm³</unitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<unitPattern count="other">{0}mi³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-yard">
 				<unitPattern count="other" draft="contributed">{0}yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<unitPattern count="other" draft="contributed">{0}カップ</unitPattern>
+			<unit type="volume-cubic-foot">
+				<unitPattern count="other" draft="contributed">{0}ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<unitPattern count="other" draft="contributed">{0}dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<unitPattern count="other" draft="contributed">{0}in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<unitPattern count="other" draft="contributed">{0}fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<unitPattern count="other" draft="contributed">{0}gal</unitPattern>
+			<unit type="volume-megaliter">
+				<unitPattern count="other" draft="contributed">{0}ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<unitPattern count="other" draft="contributed">{0}hL</unitPattern>
@@ -9485,24 +9770,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>l</displayName>
 				<unitPattern count="other">{0}l</unitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<unitPattern count="other" draft="contributed">{0}ML</unitPattern>
+			<unit type="volume-deciliter">
+				<unitPattern count="other" draft="contributed">{0}dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<unitPattern count="other" draft="contributed">{0}cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<unitPattern count="other" draft="contributed">{0}ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<unitPattern count="other" draft="contributed">{0}pt</unitPattern>
+			<unit type="volume-acre-foot">
+				<unitPattern count="other" draft="contributed">{0}ac ft</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName draft="contributed">bu</displayName>
+				<unitPattern count="other" draft="contributed">{0}bu</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<unitPattern count="other" draft="contributed">{0}gal</unitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<unitPattern count="other" draft="contributed">{0}qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<unitPattern count="other" draft="contributed">{0}pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<unitPattern count="other" draft="contributed">{0}カップ</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<unitPattern count="other" draft="contributed">{0}fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<unitPattern count="other" draft="contributed">大さじ{0}</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
 				<unitPattern count="other" draft="contributed">小さじ{0}</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="provisional">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="provisional">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="provisional">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="provisional">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ja_JP.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ja_JP.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ja_JP.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ja_JP.xml
index 8348de09bfc..d0435a12533 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ja_JP.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ja_JP.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ja"/>
 		<territory type="JP"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/jgo.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jgo.xml
similarity index 89%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/jgo.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jgo.xml
index 1cbfd7240a4..795325ed806 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/jgo.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jgo.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="jgo"/>
 	</identity>
 	<localeDisplayNames>
@@ -115,8 +114,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="numbers">Pɛnɔ́mba</key>
 		</keys>
 		<types>
-			<type type="gregorian" key="calendar">mɛlɛ́ꞌ-mɛkát</type>
-			<type type="latn" key="numbers">pɛnɔ́mba</type>
+			<type key="calendar" type="gregorian">mɛlɛ́ꞌ-mɛkát</type>
+			<type key="numbers" type="latn">pɛnɔ́mba</type>
 		</types>
 	</localeDisplayNames>
 	<characters>
@@ -342,6 +341,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</days>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">mbaꞌmbaꞌ</dayPeriod>
+							<dayPeriod type="pm">ŋka mbɔ́t nji</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">mbaꞌmbaꞌ</dayPeriod>
 							<dayPeriod type="pm">ŋka mbɔ́t nji</dayPeriod>
@@ -349,9 +352,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
-					<eraAbbr>
+					<eraNames>
 						<era type="0">tsɛttsɛt mɛŋguꞌ mi ɛ́ lɛɛnɛ Kɛlísɛtɔ gɔ ńɔ́</era>
 						<era type="1">tsɛttsɛt mɛŋguꞌ mi ɛ́ fúnɛ Kɛlísɛtɔ tɔ́ mɔ́</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">BCE</era>
+						<era type="1">CE</era>
 					</eraAbbr>
 				</eras>
 				<dateFormats>
@@ -463,7 +470,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day">
+				<relative type="-1">yesterday</relative>
 				<relative type="0">lɔꞋɔ</relative>
+				<relative type="1">tomorrow</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">Nǔu lɛ́Ꞌ {0}</relativeTimePattern>
 					<relativeTimePattern count="other">Nǔu lɛ́Ꞌ {0}</relativeTimePattern>
@@ -546,6 +555,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤ #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤ 0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤ 00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤ 000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤ 0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤ 00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤ 000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤ 0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤ 00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤ 000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤ 0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤ 00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤ 000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="CAD">
@@ -568,6 +605,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</numbers>
 	<units>
 		<unitLength type="long">
+			<unit type="duration-year">
+				<displayName draft="provisional">ŋguꞋ</displayName>
+				<unitPattern count="one">ŋguꞋ {0}</unitPattern>
+				<unitPattern count="other">ŋguꞋ {0}</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="provisional">pɛsaŋ</displayName>
+				<unitPattern count="one">pɛsaŋ {0}</unitPattern>
+				<unitPattern count="other">pɛsaŋ {0}</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">lɛ́Ꞌ</displayName>
 				<unitPattern count="one">{0} lɛ́Ꞌ</unitPattern>
@@ -583,18 +630,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} minút</unitPattern>
 				<unitPattern count="other">{0} minút</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">pɛsaŋ</displayName>
-				<unitPattern count="one">pɛsaŋ {0}</unitPattern>
-				<unitPattern count="other">pɛsaŋ {0}</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">ŋguꞋ</displayName>
-				<unitPattern count="one">ŋguꞋ {0}</unitPattern>
-				<unitPattern count="other">ŋguꞋ {0}</unitPattern>
-			</unit>
 		</unitLength>
 		<unitLength type="short">
+			<unit type="duration-year">
+				<displayName draft="provisional">ŋguꞋ</displayName>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="provisional">pɛsaŋ</displayName>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">lɛ́Ꞌ</displayName>
 			</unit>
@@ -604,12 +647,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="duration-minute">
 				<displayName draft="provisional">minút</displayName>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">pɛsaŋ</displayName>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">ŋguꞋ</displayName>
-			</unit>
 		</unitLength>
 	</units>
 	<listPatterns>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/jgo_CM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jgo_CM.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/jgo_CM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jgo_CM.xml
index 689b44c2cab..ac7ebb3b959 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/jgo_CM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jgo_CM.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="jgo"/>
 		<territory type="CM"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/jmc.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jmc.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/jmc.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jmc.xml
index 9f9e2586c62..36a473a4ce9 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/jmc.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jmc.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="jmc"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antili za Uholanzi</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Ajentina</territory>
 			<territory type="AS">Samoa ya Marekani</territory>
@@ -448,6 +446,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">utuko</dayPeriod>
+							<dayPeriod type="pm">kyiukonyi</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">utuko</dayPeriod>
 							<dayPeriod type="pm">kyiukonyi</dayPeriod>
@@ -489,22 +491,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -578,6 +580,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -758,3 +788,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/jmc_TZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jmc_TZ.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/jmc_TZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jmc_TZ.xml
index c328ec7f0a4..4c9db4cdf6b 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/jmc_TZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jmc_TZ.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="jmc"/>
 		<territory type="TZ"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ka.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ka.xml
similarity index 93%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ka.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ka.xml
index 24b8dbdecec..8621a3deca8 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ka.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ka.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11322 $"/>
-		<generation date="$Date: 2015-02-26 14:53:52 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="ka"/>
 	</identity>
 	<localeDisplayNames>
@@ -48,6 +47,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="awa">ავადი</language>
 			<language type="ay">აიმარა</language>
 			<language type="az">აზერბაიჯანული</language>
+			<language type="az" alt="short">აზერბაიჯანული</language>
 			<language type="ba">ბაშკირული</language>
 			<language type="bal">ბელუჯი</language>
 			<language type="ban">ბალინური</language>
@@ -58,6 +58,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bem">ბემბა</language>
 			<language type="bez">ბენა</language>
 			<language type="bg">ბულგარული</language>
+			<language type="bgn">დასავლეთ ბელუჯი</language>
 			<language type="bho">ბოჯპური</language>
 			<language type="bm">ბამბარა</language>
 			<language type="bn">ბენგალური</language>
@@ -239,6 +240,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">ლაოსური</language>
 			<language type="lol">მონგო</language>
 			<language type="loz">ლოზი</language>
+			<language type="lrc">ჩრდილოეთ ლური</language>
 			<language type="lt">ლიტვური</language>
 			<language type="lu">ლუბა-კატანგა</language>
 			<language type="lua" draft="unconfirmed">ლუბა-კასაი</language>
@@ -281,12 +283,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="my">ბირმული</language>
 			<language type="mye">მიენე</language>
 			<language type="myv">ერზია</language>
+			<language type="mzn">მაზანდერანული</language>
 			<language type="na">ნაურუ</language>
 			<language type="nap">ნეაპოლიტანური</language>
 			<language type="naq">ნამა</language>
 			<language type="nb">ნორვეგიული ბუკმოლი</language>
 			<language type="nd">ჩრდილოეთ ნდებელე</language>
-			<language type="nds" draft="unconfirmed">ქვემოგერმანული</language>
+			<language type="nds">ქვემოგერმანული</language>
+			<language type="nds_NL">ქვემოსაქსონური</language>
 			<language type="ne">ნეპალური</language>
 			<language type="new">ნევარი</language>
 			<language type="nl">ნიდერლანდური</language>
@@ -343,6 +347,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sc">სარდინიული</language>
 			<language type="scn">სიცილიური</language>
 			<language type="sd">სინდჰური</language>
+			<language type="sdh">სამხრეთ ქურთული</language>
 			<language type="se">ჩრდილოეთ საამური</language>
 			<language type="see">სენეკა</language>
 			<language type="seh">სენა</language>
@@ -371,8 +376,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">შუმერული</language>
 			<language type="sv">შვედური</language>
 			<language type="sw">სუაჰილი</language>
+			<language type="sw_CD">კონგოს სუაჰილი</language>
 			<language type="swb">კომორული</language>
-			<language type="swc">კონგოს სუაჰილი</language>
 			<language type="syc">კლასიკური სირიული</language>
 			<language type="syr">სირიული</language>
 			<language type="ta">ტამილური</language>
@@ -403,6 +408,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="vi">ვიეტნამური</language>
 			<language type="vun">ვუნჯო</language>
 			<language type="wal">ველაითა</language>
+			<language type="wbp">ვალპირი</language>
 			<language type="wo">ვოლოფური</language>
 			<language type="xal">ყალმუხური</language>
 			<language type="xh">ქჰოსა</language>
@@ -621,7 +627,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">ანგილია</territory>
 			<territory type="AL">ალბანეთი</territory>
 			<territory type="AM">სომხეთი</territory>
-			<territory type="AN" draft="contributed">ნიდერლანდების ანტილები</territory>
 			<territory type="AO">ანგოლა</territory>
 			<territory type="AQ">ანტარქტიკა</territory>
 			<territory type="AR">არგენტინა</territory>
@@ -951,90 +956,103 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="calendar">კალენდარი</key>
 			<key type="collation">დახარისხების თანმიმდევრობა</key>
 			<key type="currency">ვალუტა</key>
+			<key type="hc">დროის სისტემა (12 ან 24)</key>
+			<key type="lb">სტრიქონის წყვეტის სტილი</key>
+			<key type="ms">საზომი სისტემა</key>
 			<key type="numbers">რიცხვები</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">არაბულ-ინდური ციფრები</type>
-			<type type="arabext" key="numbers">გაფართოებული არაბულ-ინდური ციფრები</type>
-			<type type="armn" key="numbers">სომხური რიცხვები</type>
-			<type type="armnlow" key="numbers">სომხური ქვედა რეგისტრის რიცხვები</type>
-			<type type="bali" key="numbers" draft="unconfirmed">ბალიური ციფრები</type>
-			<type type="beng" key="numbers">ბენგალური ციფრები</type>
-			<type type="big5han" key="collation">ტრადიციული ჩინური</type>
-			<type type="buddhist" key="calendar">ბუდისტური კალენდარი</type>
-			<type type="cham" key="numbers" draft="unconfirmed">ჩამური ციფრები</type>
-			<type type="chinese" key="calendar">ჩინური კალენდარი</type>
-			<type type="coptic" key="calendar" draft="unconfirmed">კოპტური კალენდარი</type>
-			<type type="dangi" key="calendar">კალენდარი დანგი</type>
-			<type type="deva" key="numbers">დევანაგარის ციფრები</type>
-			<type type="dictionary" key="collation" draft="unconfirmed">ლექსიკონით</type>
-			<type type="ducet" key="collation">უნიკოდის ნაგულისხმევი დახარისხების თანმიმდევრობა</type>
-			<type type="ethi" key="numbers">ეთიოპიური რიცხვები</type>
-			<type type="ethiopic" key="calendar">ეთიოპიური კალენდარი</type>
-			<type type="ethiopic-amete-alem" key="calendar" draft="unconfirmed">ეთიოპიური ამეთე ალემი კალენდარი</type>
-			<type type="fullwide" key="numbers">სრულსიგანიანი ციფრები</type>
-			<type type="gb2312han" key="collation">გამარტივებული ჩინური</type>
-			<type type="geor" key="numbers">ქართული რიცხვები</type>
-			<type type="gregorian" key="calendar">გრიგორიანული კალენდარი</type>
-			<type type="grek" key="numbers">ბერძნული რიცხვები</type>
-			<type type="greklow" key="numbers">ბერძნული ქვედა რეგისტრის რიცხვები</type>
-			<type type="gujr" key="numbers">გუჯარათული ციფრები</type>
-			<type type="guru" key="numbers">გურმუხული ციფრები</type>
-			<type type="hanidec" key="numbers">ჩინური ათობითი რიცხვები</type>
-			<type type="hans" key="numbers">გამარტივებული ჩინური რიცხვები</type>
-			<type type="hansfin" key="numbers">გამარტივებული ჩინური ფინანსური რიცხვები</type>
-			<type type="hant" key="numbers">ტრადიციული ჩინური რიცხვები</type>
-			<type type="hantfin" key="numbers">ტრადიციული ჩინური ფინანსური რიცხვები</type>
-			<type type="hebr" key="numbers">ებრაული რიცხვები</type>
-			<type type="hebrew" key="calendar">ებრაული კალენდარი</type>
-			<type type="indian" key="calendar">ინდოეთის ეროვნული კალენდარი</type>
-			<type type="islamic" key="calendar">ისლამური კალენდარი</type>
-			<type type="islamic-civil" key="calendar">ისლამური სამოქალაქო კალენდარი</type>
-			<type type="iso8601" key="calendar">ISO-8601 კალენდარი</type>
-			<type type="japanese" key="calendar">იაპონური კალენდარი</type>
-			<type type="java" key="numbers" draft="unconfirmed">იავური ციფრები</type>
-			<type type="jpan" key="numbers">იაპონური რიცხვები</type>
-			<type type="jpanfin" key="numbers">იაპონური ფინანსური რიცხვები</type>
-			<type type="kali" key="numbers" draft="unconfirmed">კაიაჰ-ლისი ციფრები</type>
-			<type type="khmr" key="numbers">ქხმერული ციფრები</type>
-			<type type="knda" key="numbers">კანადური რიცხვები</type>
-			<type type="lana" key="numbers" draft="unconfirmed">ტაი თამის ჰორასი ციფრები</type>
-			<type type="lanatham" key="numbers" draft="unconfirmed">ტაი თამის თამისი ციფრები</type>
-			<type type="laoo" key="numbers">ლაოსური ციფრები</type>
-			<type type="latn" key="numbers">დასავლური ციფრები</type>
-			<type type="lepc" key="numbers" draft="unconfirmed">რონგ-რინგის ციფრები</type>
-			<type type="limb" key="numbers">ლიმბური ციფრები</type>
-			<type type="mlym" key="numbers">მალაიალამური ციფრები</type>
-			<type type="mong" key="numbers">მონღოლური ციფრები</type>
-			<type type="mtei" key="numbers" draft="unconfirmed">მანიპური ციფრები</type>
-			<type type="mymr" key="numbers">მიანმური ციფრები</type>
-			<type type="mymrshan" key="numbers" draft="unconfirmed">მიანმური შანი ციფრები</type>
-			<type type="nkoo" key="numbers" draft="unconfirmed">ნკოური ციფრები</type>
-			<type type="olck" key="numbers" draft="unconfirmed">ოლ-ჩიკის ციფრები</type>
-			<type type="orya" key="numbers">ორიული ციფრები</type>
-			<type type="persian" key="calendar">სპარსული კალენდარი</type>
-			<type type="phonebook" key="collation" draft="unconfirmed">ტელეფონის წიგნით</type>
-			<type type="pinyin" key="collation" draft="unconfirmed">პინ-ინი</type>
-			<type type="reformed" key="collation" draft="unconfirmed">რეფორმირებული</type>
-			<type type="roc" key="calendar">ჩინეთის რესპუბლიკის კალენდარი</type>
-			<type type="roman" key="numbers">რომაული ციფრები</type>
-			<type type="romanlow" key="numbers">რომაული ქვედა რეგისტრის რიცხვები</type>
-			<type type="saur" key="numbers">საურაშტრული ციფრები</type>
-			<type type="search" key="collation">ზოგადი დანიშნულების ძიება</type>
-			<type type="searchjl" key="collation" draft="unconfirmed">ჰანგულის პირველი თანხმოვნით</type>
-			<type type="standard" key="collation">სტანდარტული დახარისხების თანმიმდევრობა</type>
-			<type type="stroke" key="collation" draft="unconfirmed">შტრიხით</type>
-			<type type="sund" key="numbers">სუნდანური ციფრები</type>
-			<type type="talu" key="numbers">ახალი ტაი ლიუსი ციფრები</type>
-			<type type="taml" key="numbers">ტრადიციული ტამილური რიცხვები</type>
-			<type type="tamldec" key="numbers">ტამილური ციფრები</type>
-			<type type="telu" key="numbers">ტელუგუს ციფრები</type>
-			<type type="thai" key="numbers">ტაილანდური ციფრები</type>
-			<type type="tibt" key="numbers">ტიბეტური ციფრები</type>
-			<type type="traditional" key="collation">ტრადიციული</type>
-			<type type="unihan" key="collation" draft="unconfirmed">ძირითადი შტრიხით</type>
-			<type type="vaii" key="numbers" draft="unconfirmed">ვაიური ციფრები</type>
-			<type type="zhuyin" key="collation" draft="unconfirmed">ჟუინი</type>
+			<type key="calendar" type="buddhist">ბუდისტური კალენდარი</type>
+			<type key="calendar" type="chinese">ჩინური კალენდარი</type>
+			<type key="calendar" type="coptic" draft="unconfirmed">კოპტური კალენდარი</type>
+			<type key="calendar" type="dangi">კალენდარი დანგი</type>
+			<type key="calendar" type="ethiopic">ეთიოპიური კალენდარი</type>
+			<type key="calendar" type="ethiopic-amete-alem" draft="unconfirmed">ეთიოპიური ამეთე ალემი კალენდარი</type>
+			<type key="calendar" type="gregorian">გრიგორიანული კალენდარი</type>
+			<type key="calendar" type="hebrew">ებრაული კალენდარი</type>
+			<type key="calendar" type="indian">ინდოეთის ეროვნული კალენდარი</type>
+			<type key="calendar" type="islamic">ისლამური კალენდარი</type>
+			<type key="calendar" type="islamic-civil">ისლამური სამოქალაქო კალენდარი</type>
+			<type key="calendar" type="iso8601">ISO-8601 კალენდარი</type>
+			<type key="calendar" type="japanese">იაპონური კალენდარი</type>
+			<type key="calendar" type="persian">სპარსული კალენდარი</type>
+			<type key="calendar" type="roc">ჩინეთის რესპუბლიკის კალენდარი</type>
+			<type key="collation" type="big5han">ტრადიციული ჩინური</type>
+			<type key="collation" type="dictionary" draft="unconfirmed">ლექსიკონით</type>
+			<type key="collation" type="ducet">უნიკოდის ნაგულისხმევი დახარისხების თანმიმდევრობა</type>
+			<type key="collation" type="gb2312han">გამარტივებული ჩინური</type>
+			<type key="collation" type="phonebook" draft="unconfirmed">ტელეფონის წიგნით</type>
+			<type key="collation" type="pinyin" draft="unconfirmed">პინ-ინი</type>
+			<type key="collation" type="reformed" draft="unconfirmed">რეფორმირებული</type>
+			<type key="collation" type="search">ზოგადი დანიშნულების ძიება</type>
+			<type key="collation" type="searchjl" draft="unconfirmed">ჰანგულის პირველი თანხმოვნით</type>
+			<type key="collation" type="standard">სტანდარტული დახარისხების თანმიმდევრობა</type>
+			<type key="collation" type="stroke" draft="unconfirmed">შტრიხით</type>
+			<type key="collation" type="traditional">ტრადიციული</type>
+			<type key="collation" type="unihan" draft="unconfirmed">ძირითადი შტრიხით</type>
+			<type key="collation" type="zhuyin" draft="unconfirmed">ჟუინი</type>
+			<type key="hc" type="h11">12-საათიანი სისტემა (0-11)</type>
+			<type key="hc" type="h12">12-საათიანი სისტემა (1-12)</type>
+			<type key="hc" type="h23">24-საათიანი სისტემა (0-23)</type>
+			<type key="hc" type="h24">24-საათიანი სისტემა (1-24)</type>
+			<type key="lb" type="loose">სტრიქონის რბილი წყვეტის სტილი</type>
+			<type key="lb" type="normal">სტრიქონის ჩვეულებრივი წყვეტის სტილი</type>
+			<type key="lb" type="strict">სტრიქონის ზედმიწევნითი წყვეტის სტილი</type>
+			<type key="ms" type="metric">მეტრული სისტემა</type>
+			<type key="ms" type="uksystem">ბრიტანული საზომი სისტემა</type>
+			<type key="ms" type="ussystem">ამერიკული საზომი სისტემა</type>
+			<type key="numbers" type="arab">არაბულ-ინდური ციფრები</type>
+			<type key="numbers" type="arabext">გაფართოებული არაბულ-ინდური ციფრები</type>
+			<type key="numbers" type="armn">სომხური რიცხვები</type>
+			<type key="numbers" type="armnlow">სომხური ქვედა რეგისტრის რიცხვები</type>
+			<type key="numbers" type="bali" draft="unconfirmed">ბალიური ციფრები</type>
+			<type key="numbers" type="beng">ბენგალური ციფრები</type>
+			<type key="numbers" type="cham" draft="unconfirmed">ჩამური ციფრები</type>
+			<type key="numbers" type="deva">დევანაგარის ციფრები</type>
+			<type key="numbers" type="ethi">ეთიოპიური რიცხვები</type>
+			<type key="numbers" type="fullwide">სრულსიგანიანი ციფრები</type>
+			<type key="numbers" type="geor">ქართული რიცხვები</type>
+			<type key="numbers" type="grek">ბერძნული რიცხვები</type>
+			<type key="numbers" type="greklow">ბერძნული ქვედა რეგისტრის რიცხვები</type>
+			<type key="numbers" type="gujr">გუჯარათული ციფრები</type>
+			<type key="numbers" type="guru">გურმუხული ციფრები</type>
+			<type key="numbers" type="hanidec">ჩინური ათობითი რიცხვები</type>
+			<type key="numbers" type="hans">გამარტივებული ჩინური რიცხვები</type>
+			<type key="numbers" type="hansfin">გამარტივებული ჩინური ფინანსური რიცხვები</type>
+			<type key="numbers" type="hant">ტრადიციული ჩინური რიცხვები</type>
+			<type key="numbers" type="hantfin">ტრადიციული ჩინური ფინანსური რიცხვები</type>
+			<type key="numbers" type="hebr">ებრაული რიცხვები</type>
+			<type key="numbers" type="java" draft="unconfirmed">იავური ციფრები</type>
+			<type key="numbers" type="jpan">იაპონური რიცხვები</type>
+			<type key="numbers" type="jpanfin">იაპონური ფინანსური რიცხვები</type>
+			<type key="numbers" type="kali" draft="unconfirmed">კაიაჰ-ლისი ციფრები</type>
+			<type key="numbers" type="khmr">ქხმერული ციფრები</type>
+			<type key="numbers" type="knda">კანადური რიცხვები</type>
+			<type key="numbers" type="lana" draft="unconfirmed">ტაი თამის ჰორასი ციფრები</type>
+			<type key="numbers" type="lanatham" draft="unconfirmed">ტაი თამის თამისი ციფრები</type>
+			<type key="numbers" type="laoo">ლაოსური ციფრები</type>
+			<type key="numbers" type="latn">დასავლური ციფრები</type>
+			<type key="numbers" type="lepc" draft="unconfirmed">რონგ-რინგის ციფრები</type>
+			<type key="numbers" type="limb">ლიმბური ციფრები</type>
+			<type key="numbers" type="mlym">მალაიალამური ციფრები</type>
+			<type key="numbers" type="mong">მონღოლური ციფრები</type>
+			<type key="numbers" type="mtei" draft="unconfirmed">მანიპური ციფრები</type>
+			<type key="numbers" type="mymr">მიანმური ციფრები</type>
+			<type key="numbers" type="mymrshan" draft="unconfirmed">მიანმური შანი ციფრები</type>
+			<type key="numbers" type="nkoo" draft="unconfirmed">ნკოური ციფრები</type>
+			<type key="numbers" type="olck" draft="unconfirmed">ოლ-ჩიკის ციფრები</type>
+			<type key="numbers" type="orya">ორიული ციფრები</type>
+			<type key="numbers" type="roman">რომაული ციფრები</type>
+			<type key="numbers" type="romanlow">რომაული ქვედა რეგისტრის რიცხვები</type>
+			<type key="numbers" type="saur">საურაშტრული ციფრები</type>
+			<type key="numbers" type="sund">სუნდანური ციფრები</type>
+			<type key="numbers" type="talu">ახალი ტაი ლიუსი ციფრები</type>
+			<type key="numbers" type="taml">ტრადიციული ტამილური რიცხვები</type>
+			<type key="numbers" type="tamldec">ტამილური ციფრები</type>
+			<type key="numbers" type="telu">ტელუგუს ციფრები</type>
+			<type key="numbers" type="thai">ტაილანდური ციფრები</type>
+			<type key="numbers" type="tibt">ტიბეტური ციფრები</type>
+			<type key="numbers" type="vaii" draft="unconfirmed">ვაიური ციფრები</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">მეტრული</measurementSystemName>
@@ -1114,6 +1132,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM, y G</dateFormatItem>
@@ -1131,6 +1150,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
@@ -1140,6 +1160,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">MMM, y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">d MMM, y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E, d MMM, y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">MMMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">QQQ, y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">QQQQ, y G</dateFormatItem>
 					</availableFormats>
@@ -1454,19 +1475,66 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">შუაღამეს</dayPeriod>
 							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="noon" draft="unconfirmed">შუადღე</dayPeriod>
+							<dayPeriod type="noon">შუადღ.</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">დილ.</dayPeriod>
+							<dayPeriod type="afternoon1">ნაშუადღ.</dayPeriod>
+							<dayPeriod type="evening1">საღ.</dayPeriod>
+							<dayPeriod type="night1">ღამ.</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">შუაღამეს</dayPeriod>
+							<dayPeriod type="am">a</dayPeriod>
+							<dayPeriod type="noon">შუადღ.</dayPeriod>
+							<dayPeriod type="pm">p</dayPeriod>
+							<dayPeriod type="morning1">დილას</dayPeriod>
+							<dayPeriod type="afternoon1">ნაშუადღევს</dayPeriod>
+							<dayPeriod type="evening1">საღამოს</dayPeriod>
+							<dayPeriod type="night1">ღამით</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">შუაღამეს</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">შუადღეს</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">დილით</dayPeriod>
+							<dayPeriod type="afternoon1">ნაშუადღევს</dayPeriod>
+							<dayPeriod type="evening1">საღამოს</dayPeriod>
+							<dayPeriod type="night1">ღამით</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">შუაღამე</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">შუადღე</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">დილა</dayPeriod>
+							<dayPeriod type="afternoon1">ნაშუადღევი</dayPeriod>
+							<dayPeriod type="evening1">საღამო</dayPeriod>
+							<dayPeriod type="night1">ღამე</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">შუაღამე</dayPeriod>
 							<dayPeriod type="am">a</dayPeriod>
 							<dayPeriod type="noon">შუადღე</dayPeriod>
 							<dayPeriod type="pm">p</dayPeriod>
+							<dayPeriod type="morning1">დილა</dayPeriod>
+							<dayPeriod type="afternoon1">ნაშუადღევი</dayPeriod>
+							<dayPeriod type="evening1">საღამო</dayPeriod>
+							<dayPeriod type="night1">ღამე</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="midnight">შუაღამე</dayPeriod>
+							<dayPeriod type="am">შუადღემდე</dayPeriod>
 							<dayPeriod type="noon">შუადღე</dayPeriod>
-							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="pm">შუადღ. შემდეგ</dayPeriod>
+							<dayPeriod type="morning1">დილა</dayPeriod>
+							<dayPeriod type="afternoon1">ნაშუადღევი</dayPeriod>
+							<dayPeriod type="evening1">საღამო</dayPeriod>
+							<dayPeriod type="night1">ღამე</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1479,7 +1547,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</eraNames>
 					<eraAbbr>
 						<era type="0">ძვ. წ.</era>
+						<era type="0" alt="variant">ჩვ. ერამდე</era>
 						<era type="1">ახ. წ.</era>
+						<era type="1" alt="variant">ჩვ. ერა</era>
 					</eraAbbr>
 				</eras>
 				<dateFormats>
@@ -1495,7 +1565,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern>d MMM, y</pattern>
+							<pattern>d MMM. y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -1529,7 +1599,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
@@ -1539,7 +1609,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
@@ -1551,34 +1621,40 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="d">d</dateFormatItem>
 						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
-						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
-						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
-						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="Ehm">E, h:mm a</dateFormatItem>
+						<dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
+						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
-						<dateFormatItem id="GyMMM">MMM, y G</dateFormatItem>
-						<dateFormatItem id="GyMMMd">d MMM, y G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">E, d MMM, y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM. y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d MMM. y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d MMM. y G</dateFormatItem>
 						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">HH</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d.M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.M</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">M.y</dateFormatItem>
 						<dateFormatItem id="yMd">d.M.y</dateFormatItem>
 						<dateFormatItem id="yMEd">E, d.M.y</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM, y</dateFormatItem>
-						<dateFormatItem id="yMMMd">d MMM, y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">E, d MMM, y</dateFormatItem>
+						<dateFormatItem id="yMMM">MMM. y</dateFormatItem>
+						<dateFormatItem id="yMMMd">d MMM. y</dateFormatItem>
+						<dateFormatItem id="yMMMEd">E, d MMM. y</dateFormatItem>
+						<dateFormatItem id="yMMMM">MMMM, y</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ, y</dateFormatItem>
 						<dateFormatItem id="yQQQQ">QQQQ, y</dateFormatItem>
 					</availableFormats>
@@ -1667,17 +1743,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
 							<greatestDifference id="d">d–d MMM, y</greatestDifference>
-							<greatestDifference id="M">dd MM – dd MM, y</greatestDifference>
-							<greatestDifference id="y">dd MMM, y – d MMM, y</greatestDifference>
+							<greatestDifference id="M">dd MMM. – dd MMM. y</greatestDifference>
+							<greatestDifference id="y">dd MMM. y – d MMM. y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d MMM – E, d MMM, y</greatestDifference>
-							<greatestDifference id="M">E, d MMM – E, d MMM, y</greatestDifference>
-							<greatestDifference id="y">E, d MMM, y – E, d MMM, y</greatestDifference>
+							<greatestDifference id="d">E, d MMM. – E, d MMM. y</greatestDifference>
+							<greatestDifference id="M">E, d MMM. – E, d MMM. y</greatestDifference>
+							<greatestDifference id="y">E, d MMM. y – E, d MMM. y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MM – MM.y</greatestDifference>
-							<greatestDifference id="y">MM.y – MM.y</greatestDifference>
+							<greatestDifference id="M">MMMM – MMMM, y</greatestDifference>
+							<greatestDifference id="y">MMMM y – MMMM y</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -1974,6 +2050,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>წ.</displayName>
+				<relative type="-1">გასულ წელს</relative>
+				<relative type="0">ამ წელს</relative>
+				<relative type="1">მომავალ წელს</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} წელში</relativeTimePattern>
 					<relativeTimePattern count="other">{0} წელში</relativeTimePattern>
@@ -1985,6 +2064,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>წ.</displayName>
+				<relative type="-1">გასულ წელს</relative>
+				<relative type="0">ამ წელს</relative>
+				<relative type="1">მომავალ წელს</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} წელში</relativeTimePattern>
 					<relativeTimePattern count="other">{0} წელში</relativeTimePattern>
@@ -2043,6 +2125,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>თვე</displayName>
+				<relative type="-1">გასულ თვეს</relative>
+				<relative type="0">ამ თვეში</relative>
+				<relative type="1">მომავალ თვეს</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} თვეში</relativeTimePattern>
 					<relativeTimePattern count="other">{0} თვეში</relativeTimePattern>
@@ -2054,6 +2139,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>თვე</displayName>
+				<relative type="-1">გასულ თვეს</relative>
+				<relative type="0">ამ თვეში</relative>
+				<relative type="1">მომავალ თვეს</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} თვეში</relativeTimePattern>
 					<relativeTimePattern count="other">{0} თვეში</relativeTimePattern>
@@ -2079,6 +2167,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>კვ.</displayName>
+				<relative type="-1">გასულ კვირაში</relative>
+				<relative type="0">ამ კვირაში</relative>
+				<relative type="1">მომავალ კვირაში</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} კვირაში</relativeTimePattern>
 					<relativeTimePattern count="other">{0} კვირაში</relativeTimePattern>
@@ -2090,6 +2181,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>კვ.</displayName>
+				<relative type="-1">გასულ კვირაში</relative>
+				<relative type="0">ამ კვირაში</relative>
+				<relative type="1">მომავალ კვირაში</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} კვირაში</relativeTimePattern>
 					<relativeTimePattern count="other">{0} კვირაში</relativeTimePattern>
@@ -2117,6 +2211,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>დღე</displayName>
+				<relative type="-2">გუშინწინ</relative>
+				<relative type="-1">გუშინ</relative>
+				<relative type="0">დღეს</relative>
+				<relative type="1">ხვალ</relative>
+				<relative type="2">ზეგ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} დღეში</relativeTimePattern>
 					<relativeTimePattern count="other">{0} დღეში</relativeTimePattern>
@@ -2128,6 +2227,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>დღე</displayName>
+				<relative type="-2">გუშინწინ</relative>
+				<relative type="-1">გუშინ</relative>
+				<relative type="0">დღეს</relative>
+				<relative type="1">ხვალ</relative>
+				<relative type="2">ზეგ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} დღეში</relativeTimePattern>
 					<relativeTimePattern count="other">{0} დღეში</relativeTimePattern>
@@ -3227,6 +3331,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>პორტ მორსბი</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>ბუგენვილი</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>მანილა</exemplarCity>
 			</zone>
@@ -3311,6 +3418,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>ირკუტსკი</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>ჩიტა</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>იაკუტსკი</exemplarCity>
 			</zone>
@@ -3329,6 +3439,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>მაგადანი</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>სრედნეკოლიმსკი</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>კამჩატკა</exemplarCity>
 			</zone>
@@ -4591,6 +4704,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">0 ათ'.' ¤</pattern>
+					<pattern type="1000" count="other">0 ათ'.' ¤</pattern>
+					<pattern type="10000" count="one">00 ათ'.' ¤</pattern>
+					<pattern type="10000" count="other">00 ათ'.' ¤</pattern>
+					<pattern type="100000" count="one">000 ათ'.' ¤</pattern>
+					<pattern type="100000" count="other">000 ათ'.' ¤</pattern>
+					<pattern type="1000000" count="one">0 მლნ'.' ¤</pattern>
+					<pattern type="1000000" count="other">0 მლნ'.' ¤</pattern>
+					<pattern type="10000000" count="one">00 მლნ'.' ¤</pattern>
+					<pattern type="10000000" count="other">00 მლნ'.' ¤</pattern>
+					<pattern type="100000000" count="one">000 მლნ'.' ¤</pattern>
+					<pattern type="100000000" count="other">000 მლნ'.' ¤</pattern>
+					<pattern type="1000000000" count="one">0 მლრდ'.' ¤</pattern>
+					<pattern type="1000000000" count="other">0 მლრდ'.' ¤</pattern>
+					<pattern type="10000000000" count="one">00 მლრდ'.' ¤</pattern>
+					<pattern type="10000000000" count="other">00 მლრდ'.' ¤</pattern>
+					<pattern type="100000000000" count="one">000 მლრ'.' ¤</pattern>
+					<pattern type="100000000000" count="other">000 მლრ'.' ¤</pattern>
+					<pattern type="1000000000000" count="one">0 ტრლ'.' ¤</pattern>
+					<pattern type="1000000000000" count="other">0 ტრლ'.' ¤</pattern>
+					<pattern type="10000000000000" count="one">00 ტრლ'.' ¤</pattern>
+					<pattern type="10000000000000" count="other">00 ტრლ'.' ¤</pattern>
+					<pattern type="100000000000000" count="one">000 ტრლ'.' ¤</pattern>
+					<pattern type="100000000000000" count="other">000 ტრლ'.' ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4993,7 +5134,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ქართული ლარი</displayName>
 				<displayName count="one">ქართული ლარი</displayName>
 				<displayName count="other">ქართული ლარი</displayName>
-				<symbol>GEL</symbol>
+				<symbol>₾</symbol>
 			</currency>
 			<currency type="GHS">
 				<displayName>განური სედი</displayName>
@@ -5617,6 +5758,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ტაილანდური ბატი</displayName>
 				<displayName count="other">ტაილანდური ბატი</displayName>
 				<symbol>THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName draft="contributed">ტაჯიკური რუბლი</displayName>
@@ -5755,9 +5897,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>WST</symbol>
 			</currency>
 			<currency type="XAF">
-				<displayName>CFA ფრანკი (BEAC)</displayName>
-				<displayName count="one">CFA ფრანკი (BEAC)</displayName>
-				<displayName count="other">CFA ფრანკი (BEAC)</displayName>
+				<displayName>ცენტრალურ აფრიკული CFA ფრანკი</displayName>
+				<displayName count="one">ცენტრალურ აფრიკული CFA ფრანკი</displayName>
+				<displayName count="other">ცენტრალურ აფრიკული CFA ფრანკი</displayName>
 				<symbol>FCFA</symbol>
 			</currency>
 			<currency type="XAG">
@@ -5783,8 +5925,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="XOF">
 				<displayName>(CFA) ფრანკი (BCEAO)</displayName>
-				<displayName count="one">CFA ფრანკი (BCEAO)</displayName>
-				<displayName count="other">CFA ფრანკი (BCEAO)</displayName>
+				<displayName count="one">დასავლეთ აფრიკული CFA ფრანკი</displayName>
+				<displayName count="other">დასავლეთ აფრიკული CFA ფრანკი</displayName>
 				<symbol>CFA</symbol>
 			</currency>
 			<currency type="XPF">
@@ -5864,6 +6006,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} მ/წმ²</unitPattern>
 				<unitPattern count="other">{0} მ/წმ²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>ბრუნვა</displayName>
+				<unitPattern count="one">{0} ბრუნვა</unitPattern>
+				<unitPattern count="other">{0} ბრუნვა</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>რადიანი</displayName>
+				<unitPattern count="one">{0} რადიანი</unitPattern>
+				<unitPattern count="other">{0} რადიანი</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>გრადუსი</displayName>
+				<unitPattern count="one">{0} გრადუსი</unitPattern>
+				<unitPattern count="other">{0} გრადუსი</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>მინუტი</displayName>
 				<unitPattern count="one">{0} მინუტი</unitPattern>
@@ -5874,30 +6031,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} სეკუნდი</unitPattern>
 				<unitPattern count="other">{0} სეკუნდი</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>გრადუსი</displayName>
-				<unitPattern count="one">{0} გრადუსი</unitPattern>
-				<unitPattern count="other">{0} გრადუსი</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>რადიანი</displayName>
-				<unitPattern count="one">{0} რადიანი</unitPattern>
-				<unitPattern count="other">{0} რადიანი</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>აკრი</displayName>
-				<unitPattern count="one">{0} აკრი</unitPattern>
-				<unitPattern count="other">{0} აკრი</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>კვადრატული კილომეტრი</displayName>
+				<unitPattern count="one">{0} კვადრატული კილომეტრი</unitPattern>
+				<unitPattern count="other">{0} კვადრატული კილომეტრი</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ჰექტარი</displayName>
 				<unitPattern count="one">{0} ჰექტარი</unitPattern>
 				<unitPattern count="other">{0} ჰექტარი</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>კვადრატული მეტრი</displayName>
+				<unitPattern count="one">{0} კვადრატული მეტრი</unitPattern>
+				<unitPattern count="other">{0} კვადრატული მეტრი</unitPattern>
+				<perUnitPattern>{0} კვადრატულ მეტრში</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>კვადრატული სანტიმეტრი</displayName>
 				<unitPattern count="one">{0} კვადრატული სანტიმეტრი</unitPattern>
 				<unitPattern count="other">{0} კვადრატული სანტიმეტრი</unitPattern>
+				<perUnitPattern>{0} კვადრატულ სანტიმეტრში</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>კვადრატული მილი</displayName>
+				<unitPattern count="one">{0} კვადრატული მილი</unitPattern>
+				<unitPattern count="other">{0} კვადრატული მილი</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>აკრი</displayName>
+				<unitPattern count="one">{0} აკრი</unitPattern>
+				<unitPattern count="other">{0} აკრი</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>კვადრატული იარდი</displayName>
+				<unitPattern count="one">{0} კვადრატული იარდი</unitPattern>
+				<unitPattern count="other">{0} კვადრატული იარდი</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>კვადრატული ფუტი</displayName>
@@ -5908,91 +6077,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>კვადრატული დუიმი</displayName>
 				<unitPattern count="one">{0} კვადრატული დუიმი</unitPattern>
 				<unitPattern count="other">{0} კვადრატული დუიმი</unitPattern>
+				<perUnitPattern>{0} კვადრატულ დუიმში</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>კვადრატული კილომეტრი</displayName>
-				<unitPattern count="one">{0} კვადრატული კილომეტრი</unitPattern>
-				<unitPattern count="other">{0} კვადრატული კილომეტრი</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>კვადრატული მეტრი</displayName>
-				<unitPattern count="one">{0} კვადრატული მეტრი</unitPattern>
-				<unitPattern count="other">{0} კვადრატული მეტრი</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>კვადრატული მილი</displayName>
-				<unitPattern count="one">{0} კვადრატული მილი</unitPattern>
-				<unitPattern count="other">{0} კვადრატული მილი</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>კვადრატული იარდი</displayName>
-				<unitPattern count="one">{0} კვადრატული იარდი</unitPattern>
-				<unitPattern count="other">{0} კვადრატული იარდი</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>კარატი</displayName>
+				<unitPattern count="one">{0} კარატი</unitPattern>
+				<unitPattern count="other">{0} კარატი</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ლიტრი კილომეტრზე</displayName>
 				<unitPattern count="one">{0} ლიტრი კილომეტრზე</unitPattern>
 				<unitPattern count="other">{0} ლიტრი კილომეტრზე</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ლიტრი 100 კილომეტრში</displayName>
+				<unitPattern count="one">{0} ლიტრი 100 კილომეტრში</unitPattern>
+				<unitPattern count="other">{0} ლიტრი 100 კილომეტრში</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>მილი გალონზე</displayName>
 				<unitPattern count="one">{0} მილი გალონზე</unitPattern>
 				<unitPattern count="other">{0} მილი გალონზე</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>ბიტი</displayName>
-				<unitPattern count="one">{0} ბიტი</unitPattern>
-				<unitPattern count="other">{0} ბიტი</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>ბაიტი</displayName>
-				<unitPattern count="one">{0} ბაიტი</unitPattern>
-				<unitPattern count="other">{0} ბაიტი</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>გიგაბიტი</displayName>
-				<unitPattern count="one">{0} გიგაბიტი</unitPattern>
-				<unitPattern count="other">{0} გიგაბიტი</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>გიგაბაიტი</displayName>
-				<unitPattern count="one">{0} გიგაბაიტი</unitPattern>
-				<unitPattern count="other">{0} გიგაბაიტი</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>კილობიტი</displayName>
-				<unitPattern count="one">{0} კილობიტი</unitPattern>
-				<unitPattern count="other">{0} კილობიტი</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>კილობაიტი</displayName>
-				<unitPattern count="one">{0} კილობაიტი</unitPattern>
-				<unitPattern count="other">{0} კილობაიტი</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>მეგაბიტი</displayName>
-				<unitPattern count="one">{0} მეგაბიტი</unitPattern>
-				<unitPattern count="other">{0} მეგაბიტი</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>მეგაბაიტი</displayName>
-				<unitPattern count="one">{0} მეგაბაიტი</unitPattern>
-				<unitPattern count="other">{0} მეგაბაიტი</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>ტერაბიტი</displayName>
-				<unitPattern count="one">{0} ტერაბიტი</unitPattern>
-				<unitPattern count="other">{0} ტერაბიტი</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>ტერაბაიტი</displayName>
 				<unitPattern count="one">{0} ტერაბაიტი</unitPattern>
 				<unitPattern count="other">{0} ტერაბაიტი</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>ტერაბიტი</displayName>
+				<unitPattern count="one">{0} ტერაბიტი</unitPattern>
+				<unitPattern count="other">{0} ტერაბიტი</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>გიგაბაიტი</displayName>
+				<unitPattern count="one">{0} გიგაბაიტი</unitPattern>
+				<unitPattern count="other">{0} გიგაბაიტი</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>გიგაბიტი</displayName>
+				<unitPattern count="one">{0} გიგაბიტი</unitPattern>
+				<unitPattern count="other">{0} გიგაბიტი</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>მეგაბაიტი</displayName>
+				<unitPattern count="one">{0} მეგაბაიტი</unitPattern>
+				<unitPattern count="other">{0} მეგაბაიტი</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>მეგაბიტი</displayName>
+				<unitPattern count="one">{0} მეგაბიტი</unitPattern>
+				<unitPattern count="other">{0} მეგაბიტი</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>კილობაიტი</displayName>
+				<unitPattern count="one">{0} კილობაიტი</unitPattern>
+				<unitPattern count="other">{0} კილობაიტი</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>კილობიტი</displayName>
+				<unitPattern count="one">{0} კილობიტი</unitPattern>
+				<unitPattern count="other">{0} კილობიტი</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>ბაიტი</displayName>
+				<unitPattern count="one">{0} ბაიტი</unitPattern>
+				<unitPattern count="other">{0} ბაიტი</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>ბიტი</displayName>
+				<unitPattern count="one">{0} ბიტი</unitPattern>
+				<unitPattern count="other">{0} ბიტი</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>საუკუნე</displayName>
+				<unitPattern count="one">{0} საუკუნე</unitPattern>
+				<unitPattern count="other">{0} საუკუნე</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>წელი</displayName>
+				<unitPattern count="one">{0} წელი</unitPattern>
+				<unitPattern count="other">{0} წელი</unitPattern>
+				<perUnitPattern>{0} წელში</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>თვე</displayName>
+				<unitPattern count="one">{0} თვე</unitPattern>
+				<unitPattern count="other">{0} თვე</unitPattern>
+				<perUnitPattern>{0} თვეში</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>კვირა</displayName>
+				<unitPattern count="one">{0} კვირა</unitPattern>
+				<unitPattern count="other">{0} კვირა</unitPattern>
+				<perUnitPattern>{0} კვირაში</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>დღე</displayName>
 				<unitPattern count="one">{0} დღე</unitPattern>
 				<unitPattern count="other">{0} დღე</unitPattern>
+				<perUnitPattern>{0} დღეში</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>საათი</displayName>
@@ -6000,30 +6184,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} საათი</unitPattern>
 				<perUnitPattern>{0} საათში</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>მიკროწამი</displayName>
-				<unitPattern count="one">{0} მიკროწამი</unitPattern>
-				<unitPattern count="other">{0} მიკროწამი</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>მილიწამი</displayName>
-				<unitPattern count="one">{0} მილიწამი</unitPattern>
-				<unitPattern count="other">{0} მილიწამი</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>წუთი</displayName>
 				<unitPattern count="one">{0} წუთი</unitPattern>
 				<unitPattern count="other">{0} წუთი</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>თვე</displayName>
-				<unitPattern count="one">{0} თვე</unitPattern>
-				<unitPattern count="other">{0} თვე</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ნანოწამი</displayName>
-				<unitPattern count="one">{0} ნანოწამი</unitPattern>
-				<unitPattern count="other">{0} ნანოწამი</unitPattern>
+				<perUnitPattern>{0} წუთში</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>წამი</displayName>
@@ -6031,15 +6196,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} წამი</unitPattern>
 				<perUnitPattern>{0} წამში</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>კვირა</displayName>
-				<unitPattern count="one">{0} კვირა</unitPattern>
-				<unitPattern count="other">{0} კვირა</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>მილიწამი</displayName>
+				<unitPattern count="one">{0} მილიწამი</unitPattern>
+				<unitPattern count="other">{0} მილიწამი</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>წელი</displayName>
-				<unitPattern count="one">{0} წელი</unitPattern>
-				<unitPattern count="other">{0} წელი</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>მიკროწამი</displayName>
+				<unitPattern count="one">{0} მიკროწამი</unitPattern>
+				<unitPattern count="other">{0} მიკროწამი</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ნანოწამი</displayName>
+				<unitPattern count="one">{0} ნანოწამი</unitPattern>
+				<unitPattern count="other">{0} ნანოწამი</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ამპერი</displayName>
@@ -6061,6 +6231,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ვოლტი</unitPattern>
 				<unitPattern count="other">{0} ვოლტი</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>კილოკალორია</displayName>
+				<unitPattern count="one">{0} კილოკალორია</unitPattern>
+				<unitPattern count="other">{0} კილოკალორია</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>კალორია</displayName>
 				<unitPattern count="one">{0} კალორია</unitPattern>
@@ -6071,21 +6246,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} კალორია</unitPattern>
 				<unitPattern count="other">{0} კალორია</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>ჯოული</displayName>
-				<unitPattern count="one">{0} ჯოული</unitPattern>
-				<unitPattern count="other">{0} ჯოული</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>კილოკალორია</displayName>
-				<unitPattern count="one">{0} კილოკალორია</unitPattern>
-				<unitPattern count="other">{0} კილოკალორია</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>კილოჯოული</displayName>
 				<unitPattern count="one">{0} კილოჯოული</unitPattern>
 				<unitPattern count="other">{0} კილოჯოული</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>ჯოული</displayName>
+				<unitPattern count="one">{0} ჯოული</unitPattern>
+				<unitPattern count="other">{0} ჯოული</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>კილოვატ-საათი</displayName>
 				<unitPattern count="one">{0} კილოვატ-საათი</unitPattern>
@@ -6096,201 +6266,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} გიგაჰერცი</unitPattern>
 				<unitPattern count="other">{0} გიგაჰერცი</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>ჰერცი</displayName>
-				<unitPattern count="one">{0} ჰერცი</unitPattern>
-				<unitPattern count="other">{0} ჰერცი</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>მეგაჰერცი</displayName>
+				<unitPattern count="one">{0} მეგაჰერცი</unitPattern>
+				<unitPattern count="other">{0} მეგაჰერცი</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>კილოჰერცი</displayName>
 				<unitPattern count="one">{0} კილოჰერცი</unitPattern>
 				<unitPattern count="other">{0} კილოჰერცი</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>მეგაჰერცი</displayName>
-				<unitPattern count="one">{0} მეგაჰერცი</unitPattern>
-				<unitPattern count="other">{0} მეგაჰერცი</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>ჰერცი</displayName>
+				<unitPattern count="one">{0} ჰერცი</unitPattern>
+				<unitPattern count="other">{0} ჰერცი</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>ასტრონომიული ერთეული</displayName>
-				<unitPattern count="one">{0} ასტრონომიული ერთეული</unitPattern>
-				<unitPattern count="other">{0} ასტრონომიული ერთეული</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>კილომეტრი</displayName>
+				<unitPattern count="one">{0} კილომეტრი</unitPattern>
+				<unitPattern count="other">{0} კილომეტრი</unitPattern>
+				<perUnitPattern>{0} კილომეტრში</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>სანტიმეტრი</displayName>
-				<unitPattern count="one">{0} სანტიმეტრი</unitPattern>
-				<unitPattern count="other">{0} სანტიმეტრი</unitPattern>
+			<unit type="length-meter">
+				<displayName>მეტრი</displayName>
+				<unitPattern count="one">{0} მეტრი</unitPattern>
+				<unitPattern count="other">{0} მეტრი</unitPattern>
+				<perUnitPattern>{0} მეტრში</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>დეციმეტრი</displayName>
 				<unitPattern count="one">{0} დეციმეტრი</unitPattern>
 				<unitPattern count="other">{0} დეციმეტრი</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ფუტი</displayName>
-				<unitPattern count="one">{0} ფუტი</unitPattern>
-				<unitPattern count="other">{0} ფუტი</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>დუიმი</displayName>
-				<unitPattern count="one">{0} დუიმი</unitPattern>
-				<unitPattern count="other">{0} დუიმი</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>კილომეტრი</displayName>
-				<unitPattern count="one">{0} კილომეტრი</unitPattern>
-				<unitPattern count="other">{0} კილომეტრი</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>სინათლის წელი</displayName>
-				<unitPattern count="one">{0} სინათლის წელი</unitPattern>
-				<unitPattern count="other">{0} სინათლის წელი</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>მეტრი</displayName>
-				<unitPattern count="one">{0}მეტრი</unitPattern>
-				<unitPattern count="other">{0}მეტრი</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>მიკრომეტრი</displayName>
-				<unitPattern count="one">{0} მიკრომეტრი</unitPattern>
-				<unitPattern count="other">{0} მიკრომეტრი</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>მილი</displayName>
-				<unitPattern count="one">{0} მილი</unitPattern>
-				<unitPattern count="other">{0} მილი</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>სანტიმეტრი</displayName>
+				<unitPattern count="one">{0} სანტიმეტრი</unitPattern>
+				<unitPattern count="other">{0} სანტიმეტრი</unitPattern>
+				<perUnitPattern>{0} სანტიმეტრში</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>მილიმეტრი</displayName>
 				<unitPattern count="one">{0} მილიმეტრი</unitPattern>
 				<unitPattern count="other">{0} მილიმეტრი</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>მიკრომეტრი</displayName>
+				<unitPattern count="one">{0} მიკრომეტრი</unitPattern>
+				<unitPattern count="other">{0} მიკრომეტრი</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>ნანომეტრი</displayName>
 				<unitPattern count="one">{0} ნანომეტრი</unitPattern>
 				<unitPattern count="other">{0} ნანომეტრი</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>საზღვაო მილი</displayName>
-				<unitPattern count="one">{0} საზღვაო მილი</unitPattern>
-				<unitPattern count="other">{0} საზღვაო მილი</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>პარსეკი</displayName>
-				<unitPattern count="one">{0} პარსეკი</unitPattern>
-				<unitPattern count="other">{0} პარსეკი</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>პიკომეტრი</displayName>
 				<unitPattern count="one">{0} პიკომეტრი</unitPattern>
 				<unitPattern count="other">{0} პიკომეტრი</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>მილი</displayName>
+				<unitPattern count="one">{0} მილი</unitPattern>
+				<unitPattern count="other">{0} მილი</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>იარდი</displayName>
 				<unitPattern count="one">{0} იარდი</unitPattern>
 				<unitPattern count="other">{0} იარდი</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ფუტი</displayName>
+				<unitPattern count="one">{0} ფუტი</unitPattern>
+				<unitPattern count="other">{0} ფუტი</unitPattern>
+				<perUnitPattern>{0} ფუტში</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>დუიმი</displayName>
+				<unitPattern count="one">{0} დუიმი</unitPattern>
+				<unitPattern count="other">{0} დუიმი</unitPattern>
+				<perUnitPattern>{0} დუიმში</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>პარსეკი</displayName>
+				<unitPattern count="one">{0} პარსეკი</unitPattern>
+				<unitPattern count="other">{0} პარსეკი</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>სინათლის წელი</displayName>
+				<unitPattern count="one">{0} სინათლის წელი</unitPattern>
+				<unitPattern count="other">{0} სინათლის წელი</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ასტრონომიული ერთეული</displayName>
+				<unitPattern count="one">{0} ასტრონომიული ერთეული</unitPattern>
+				<unitPattern count="other">{0} ასტრონომიული ერთეული</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>საზღვაო მილი</displayName>
+				<unitPattern count="one">{0} საზღვაო მილი</unitPattern>
+				<unitPattern count="other">{0} საზღვაო მილი</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>სკანდინავიური მილი</displayName>
+				<unitPattern count="one">{0} სკანდინავიური მილი</unitPattern>
+				<unitPattern count="other">{0} სკანდინავიური მილი</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>ლუქსი</displayName>
 				<unitPattern count="one">{0} ლუქსი</unitPattern>
 				<unitPattern count="other">{0} ლუქსი</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>კარატი</displayName>
-				<unitPattern count="one">{0} კარატი</unitPattern>
-				<unitPattern count="other">{0} კარატი</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>გრამი</displayName>
-				<unitPattern count="one">{0} გრამი</unitPattern>
-				<unitPattern count="other">{0} გრამი</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>კილოგრამი</displayName>
-				<unitPattern count="one">{0} კილოგრამი</unitPattern>
-				<unitPattern count="other">{0} კილოგრამი</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>მეტრული ტონა</displayName>
 				<unitPattern count="one">{0} მეტრული ტონა</unitPattern>
 				<unitPattern count="other">{0} მეტრული ტონა</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>მიკროგრამი</displayName>
-				<unitPattern count="one">მიკროგრამი</unitPattern>
-				<unitPattern count="other">{0} მიკროგრამი</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>კილოგრამი</displayName>
+				<unitPattern count="one">{0} კილოგრამი</unitPattern>
+				<unitPattern count="other">{0} კილოგრამი</unitPattern>
+				<perUnitPattern>{0} კილოგრამში</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>გრამი</displayName>
+				<unitPattern count="one">{0} გრამი</unitPattern>
+				<unitPattern count="other">{0} გრამი</unitPattern>
+				<perUnitPattern>{0} გრამში</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>მილიგრამი</displayName>
 				<unitPattern count="one">{0} მილიგრამი</unitPattern>
 				<unitPattern count="other">{0} მილიგრამი</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>უნცია</displayName>
-				<unitPattern count="one">{0} უნცია</unitPattern>
-				<unitPattern count="other">{0} უნცია</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ტრუას უნცია</displayName>
-				<unitPattern count="one">{0} ტრუას უნცია</unitPattern>
-				<unitPattern count="other">{0} ტრუას უნცია</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>ფუნტი</displayName>
-				<unitPattern count="one">{0} ფუნტი</unitPattern>
-				<unitPattern count="other">{0} ფუნტი</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>მიკროგრამი</displayName>
+				<unitPattern count="one">მიკროგრამი</unitPattern>
+				<unitPattern count="other">{0} მიკროგრამი</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>ტონა</displayName>
 				<unitPattern count="one">{0} ტონა</unitPattern>
 				<unitPattern count="other">{0} ტ</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>ფუნტი</displayName>
+				<unitPattern count="one">{0} ფუნტი</unitPattern>
+				<unitPattern count="other">{0} ფუნტი</unitPattern>
+				<perUnitPattern>{0} ფუნტში</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>უნცია</displayName>
+				<unitPattern count="one">{0} უნცია</unitPattern>
+				<unitPattern count="other">{0} უნცია</unitPattern>
+				<perUnitPattern>{0} უნციაში</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ტრუას უნცია</displayName>
+				<unitPattern count="one">{0} ტრუას უნცია</unitPattern>
+				<unitPattern count="other">{0} ტრუას უნცია</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>კარატი</displayName>
+				<unitPattern count="one">{0} კარატი</unitPattern>
+				<unitPattern count="other">{0} კარატი</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>გიგავატი</displayName>
 				<unitPattern count="one">{0} გიგავატი</unitPattern>
 				<unitPattern count="other">{0} გიგავატი</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>ცხენის ძალა</displayName>
-				<unitPattern count="one">{0} ცხენის ძალა</unitPattern>
-				<unitPattern count="other">{0} ცხენის ძალა</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>კილოვატი</displayName>
-				<unitPattern count="one">{0} კილოვატი</unitPattern>
-				<unitPattern count="other">{0} კილოვატი</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>მეგავატი</displayName>
 				<unitPattern count="one">{0} მეგავატი</unitPattern>
 				<unitPattern count="other">{0} მეგავატი</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>მილივატი</displayName>
-				<unitPattern count="one">{0} მილივატი</unitPattern>
-				<unitPattern count="other">{0} მილივატი</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>კილოვატი</displayName>
+				<unitPattern count="one">{0} კილოვატი</unitPattern>
+				<unitPattern count="other">{0} კილოვატი</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>ვატი</displayName>
 				<unitPattern count="one">{0} ვატი</unitPattern>
 				<unitPattern count="other">{0} ვატი</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>მილივატი</displayName>
+				<unitPattern count="one">{0} მილივატი</unitPattern>
+				<unitPattern count="other">{0} მილივატი</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>ცხენის ძალა</displayName>
+				<unitPattern count="one">{0} ცხენის ძალა</unitPattern>
+				<unitPattern count="other">{0} ცხენის ძალა</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>ჰექტოპასკალი</displayName>
 				<unitPattern count="one">{0} ჰექტოპასკალი</unitPattern>
 				<unitPattern count="other">{0} ჰექტოპასკალი</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>ვერცხლისწყლის დუიმი</displayName>
-				<unitPattern count="one">{0} ვერცხლისწყლის დუიმი</unitPattern>
-				<unitPattern count="other">{0} ვერცხლისწყლის დუიმი</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>მილიბარი</displayName>
-				<unitPattern count="one">{0} მილიბარი</unitPattern>
-				<unitPattern count="other">{0} მილიბარი</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>მილიმეტრი ვერცხლისწყლის სვეტისა</displayName>
 				<unitPattern count="one">{0} მილიმეტრი ვერცხლისწყლის სვეტისა</unitPattern>
@@ -6301,10 +6475,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ფუნტი კვადრატულ დუიმზე</unitPattern>
 				<unitPattern count="other">{0} ფუნტი კვადრატულ დუიმზე</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>კარატი</displayName>
-				<unitPattern count="one">{0} კარატი</unitPattern>
-				<unitPattern count="other">{0} კარატი</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>ვერცხლისწყლის დუიმი</displayName>
+				<unitPattern count="one">{0} ვერცხლისწყლის დუიმი</unitPattern>
+				<unitPattern count="other">{0} ვერცხლისწყლის დუიმი</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>მილიბარი</displayName>
+				<unitPattern count="one">{0} მილიბარი</unitPattern>
+				<unitPattern count="other">{0} მილიბარი</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>კილომეტრი საათში</displayName>
@@ -6321,6 +6500,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} მილი საათში</unitPattern>
 				<unitPattern count="other">{0} მილი საათში</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>კვანძი</displayName>
+				<unitPattern count="one">{0} კვანძი</unitPattern>
+				<unitPattern count="other">{0} კვანძი</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>გრადუსი ცელსიუსით</displayName>
 				<unitPattern count="one">{0} გრადუსი ცელსიუსით</unitPattern>
@@ -6336,31 +6525,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} კელვინი</unitPattern>
 				<unitPattern count="other">{0} კელვინის გრადუსი</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>აკრი-ფუტი</displayName>
-				<unitPattern count="one">{0} აკრი-ფუტი</unitPattern>
-				<unitPattern count="other">{0} აკრი-ფუტი</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>სანტილიტრი</displayName>
-				<unitPattern count="one">{0} სანტილიტრი</unitPattern>
-				<unitPattern count="other">{0} სანტილიტრი</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>კუბური სანტიმენტრი</displayName>
-				<unitPattern count="one">{0} კუბური სანტიმენტრი</unitPattern>
-				<unitPattern count="other">{0} კუბური სანტიმენტრი</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>კუბური ფუტი</displayName>
-				<unitPattern count="one">{0} კუბური ფუტი</unitPattern>
-				<unitPattern count="other">{0} კუბური ფუტი</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>კუბური დუიმი</displayName>
-				<unitPattern count="one">{0} კუბური დუიმი</unitPattern>
-				<unitPattern count="other">{0} კუბური დუიმი</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>კუბური კილომეტრი</displayName>
 				<unitPattern count="one">{0} კუბური კილომეტრი</unitPattern>
@@ -6370,6 +6534,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>კუბური მეტრი</displayName>
 				<unitPattern count="one">{0} კუბური მეტრი</unitPattern>
 				<unitPattern count="other">{0} კუბური მეტრი</unitPattern>
+				<perUnitPattern>{0} კუბურ მეტრში</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>კუბური სანტიმენტრი</displayName>
+				<unitPattern count="one">{0} კუბური სანტიმენტრი</unitPattern>
+				<unitPattern count="other">{0} კუბური სანტიმენტრი</unitPattern>
+				<perUnitPattern>{0} კუბურ სანტიმეტრში</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>კუბური მილი</displayName>
@@ -6381,25 +6552,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} კუბური იარდი</unitPattern>
 				<unitPattern count="other">{0} კუბური იარდი</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>ჭიქა</displayName>
-				<unitPattern count="one">{0} ჭიქა</unitPattern>
-				<unitPattern count="other">{0} ჭიქა</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>კუბური ფუტი</displayName>
+				<unitPattern count="one">{0} კუბური ფუტი</unitPattern>
+				<unitPattern count="other">{0} კუბური ფუტი</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>დეცილიტრი</displayName>
-				<unitPattern count="one">{0} დეცილიტრი</unitPattern>
-				<unitPattern count="other">{0} დეცილიტრი</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>კუბური დუიმი</displayName>
+				<unitPattern count="one">{0} კუბური დუიმი</unitPattern>
+				<unitPattern count="other">{0} კუბური დუიმი</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>თხევადი უნცია</displayName>
-				<unitPattern count="one">{0} თხევადი უნცია</unitPattern>
-				<unitPattern count="other">{0} თხევადი უნცია</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>გალონი</displayName>
-				<unitPattern count="one">{0} გალონი</unitPattern>
-				<unitPattern count="other">{0} გალონი</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>მეგალიტრი</displayName>
+				<unitPattern count="one">{0} მეგალიტრი</unitPattern>
+				<unitPattern count="other">{0} მეგალიტრი</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>ჰექტოლიტრი</displayName>
@@ -6410,27 +6576,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ლიტრი</displayName>
 				<unitPattern count="one">{0} ლიტრი</unitPattern>
 				<unitPattern count="other">{0} ლიტრი</unitPattern>
+				<perUnitPattern>{0} ლიტრში</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>მეგალიტრი</displayName>
-				<unitPattern count="one">{0} მეგალიტრი</unitPattern>
-				<unitPattern count="other">{0} მეგალიტრი</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>დეცილიტრი</displayName>
+				<unitPattern count="one">{0} დეცილიტრი</unitPattern>
+				<unitPattern count="other">{0} დეცილიტრი</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>სანტილიტრი</displayName>
+				<unitPattern count="one">{0} სანტილიტრი</unitPattern>
+				<unitPattern count="other">{0} სანტილიტრი</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>მილილიტრი</displayName>
 				<unitPattern count="one">{0} მილილიტრი</unitPattern>
 				<unitPattern count="other">{0} მილილიტრი</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>პინტა</displayName>
-				<unitPattern count="one">{0} პინტა</unitPattern>
-				<unitPattern count="other">{0} პინტა</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>მეტრული პინტა</displayName>
+				<unitPattern count="one">{0} მეტრული პინტა</unitPattern>
+				<unitPattern count="other">{0} მეტრული პინტა</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>მეტრული ჭიქა</displayName>
+				<unitPattern count="one">{0} მეტრული ჭიქა</unitPattern>
+				<unitPattern count="other">{0} მეტრული ჭიქა</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>აკრი-ფუტი</displayName>
+				<unitPattern count="one">{0} აკრი-ფუტი</unitPattern>
+				<unitPattern count="other">{0} აკრი-ფუტი</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>გალონი</displayName>
+				<unitPattern count="one">{0} გალონი</unitPattern>
+				<unitPattern count="other">{0} გალონი</unitPattern>
+				<perUnitPattern>{0} გალონში</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>კვარტა</displayName>
 				<unitPattern count="one">{0} კვარტა</unitPattern>
 				<unitPattern count="other">{0} კვარტა</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>პინტა</displayName>
+				<unitPattern count="one">{0} პინტა</unitPattern>
+				<unitPattern count="other">{0} პინტა</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>ჭიქა</displayName>
+				<unitPattern count="one">{0} ჭიქა</unitPattern>
+				<unitPattern count="other">{0} ჭიქა</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>თხევადი უნცია</displayName>
+				<unitPattern count="one">{0} თხევადი უნცია</unitPattern>
+				<unitPattern count="other">{0} თხევადი უნცია</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>სუფრის კოვზი</displayName>
 				<unitPattern count="one">{0} სუფრის კოვზი</unitPattern>
@@ -6441,6 +6644,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ჩაის კოვზი</unitPattern>
 				<unitPattern count="other">{0} ჩაის კოვზი</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} აღმოსავლეთით</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} ჩრდილოეთით</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} სამხრეთით</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} დასავლეთით</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -6456,6 +6665,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} მ/წმ²</unitPattern>
 				<unitPattern count="other">{0} მ/წმ²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>ბრნ.</displayName>
+				<unitPattern count="one">{0} ბრნ.</unitPattern>
+				<unitPattern count="other">{0} ბრნ.</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>რადიანი</displayName>
+				<unitPattern count="one">{0} რად.</unitPattern>
+				<unitPattern count="other">{0} რად.</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>გრადუსი</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>მინუტი</displayName>
 				<unitPattern count="one">{0} მინუტი</unitPattern>
@@ -6466,30 +6690,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} სეკუნდი</unitPattern>
 				<unitPattern count="other">{0} სეკუნდი</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>გრადუსი</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>რადიანი</displayName>
-				<unitPattern count="one">{0} რად.</unitPattern>
-				<unitPattern count="other">{0} რად.</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>აკრი</displayName>
-				<unitPattern count="one">{0} აკრი</unitPattern>
-				<unitPattern count="other">{0} აკრი</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>კმ²</displayName>
+				<unitPattern count="one">{0} კმ²</unitPattern>
+				<unitPattern count="other">{0} კმ²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ჰა</displayName>
 				<unitPattern count="one">{0} ჰა</unitPattern>
 				<unitPattern count="other">{0} ჰა</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>მ²</displayName>
+				<unitPattern count="one">{0} მ²</unitPattern>
+				<unitPattern count="other">{0} მ²</unitPattern>
+				<perUnitPattern>{0}/მ²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>სმ²</displayName>
 				<unitPattern count="one">{0} სმ²</unitPattern>
 				<unitPattern count="other">{0} სმ²</unitPattern>
+				<perUnitPattern>{0}/სმ²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>მილი²</displayName>
+				<unitPattern count="one">{0} მილი²</unitPattern>
+				<unitPattern count="other">{0} მილი²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>აკრი</displayName>
+				<unitPattern count="one">{0} აკრი</unitPattern>
+				<unitPattern count="other">{0} აკრი</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>იარდი²</displayName>
+				<unitPattern count="one">{0} იარდი²</unitPattern>
+				<unitPattern count="other">{0} იარდი²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ფუტი²</displayName>
@@ -6500,91 +6736,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>დუიმი²</displayName>
 				<unitPattern count="one">{0} დუიმი²</unitPattern>
 				<unitPattern count="other">{0} დუიმი²</unitPattern>
+				<perUnitPattern>{0}/დუიმი²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>კმ²</displayName>
-				<unitPattern count="one">{0} კმ²</unitPattern>
-				<unitPattern count="other">{0} კმ²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>მ²</displayName>
-				<unitPattern count="one">{0} მ²</unitPattern>
-				<unitPattern count="other">{0} მ²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>მილი²</displayName>
-				<unitPattern count="one">{0} მილი²</unitPattern>
-				<unitPattern count="other">{0} მილი²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>იარდი²</displayName>
-				<unitPattern count="one">{0} იარდი²</unitPattern>
-				<unitPattern count="other">{0} იარდი²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>კარატი</displayName>
+				<unitPattern count="one">{0} კარ.</unitPattern>
+				<unitPattern count="other">{0} კარ.</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ლიტრი/კმ</displayName>
 				<unitPattern count="one">{0} ლ/კმ</unitPattern>
 				<unitPattern count="other">{0} ლ/კმ</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ლ/100კმ</displayName>
+				<unitPattern count="one">{0} ლ/100კმ</unitPattern>
+				<unitPattern count="other">{0} ლ/100კმ</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>მილი/გალ.</displayName>
 				<unitPattern count="one">{0} მილი/გალ.</unitPattern>
 				<unitPattern count="other">{0} მილი/გალ.</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>ბიტი</displayName>
-				<unitPattern count="one">{0} ბიტი</unitPattern>
-				<unitPattern count="other">{0} ბიტი</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>ბაიტი</displayName>
-				<unitPattern count="one">{0} ბაიტი</unitPattern>
-				<unitPattern count="other">{0} ბაიტი</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>გბიტი</displayName>
-				<unitPattern count="one">{0} გბიტი</unitPattern>
-				<unitPattern count="other">{0} გბიტი</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>გბაიტი</displayName>
-				<unitPattern count="one">{0} გბაიტი</unitPattern>
-				<unitPattern count="other">{0} გბაიტი</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>კბიტი</displayName>
-				<unitPattern count="one">{0} კბიტი</unitPattern>
-				<unitPattern count="other">{0} კბიტი</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>კილობაიტი</displayName>
-				<unitPattern count="one">{0} კბაიტი</unitPattern>
-				<unitPattern count="other">{0} კბაიტი</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>მბიტი</displayName>
-				<unitPattern count="one">{0} მბიტი</unitPattern>
-				<unitPattern count="other">{0} მბიტი</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>მბაიტი</displayName>
-				<unitPattern count="one">{0} მბაიტი</unitPattern>
-				<unitPattern count="other">{0} მბაიტი</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>ტბიტი</displayName>
-				<unitPattern count="one">{0} ტბიტი</unitPattern>
-				<unitPattern count="other">{0} ტბიტი</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>ტბაიტი</displayName>
 				<unitPattern count="one">{0} ტბაიტი</unitPattern>
 				<unitPattern count="other">{0} ტბაიტი</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>ტბიტი</displayName>
+				<unitPattern count="one">{0} ტბიტი</unitPattern>
+				<unitPattern count="other">{0} ტბიტი</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>გბაიტი</displayName>
+				<unitPattern count="one">{0} გბაიტი</unitPattern>
+				<unitPattern count="other">{0} გბაიტი</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>გბიტი</displayName>
+				<unitPattern count="one">{0} გბიტი</unitPattern>
+				<unitPattern count="other">{0} გბიტი</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>მბაიტი</displayName>
+				<unitPattern count="one">{0} მბაიტი</unitPattern>
+				<unitPattern count="other">{0} მბაიტი</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>მბიტი</displayName>
+				<unitPattern count="one">{0} მბიტი</unitPattern>
+				<unitPattern count="other">{0} მბიტი</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>კილობაიტი</displayName>
+				<unitPattern count="one">{0} კბაიტი</unitPattern>
+				<unitPattern count="other">{0} კბაიტი</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>კბიტი</displayName>
+				<unitPattern count="one">{0} კბიტი</unitPattern>
+				<unitPattern count="other">{0} კბიტი</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>ბაიტი</displayName>
+				<unitPattern count="one">{0} ბაიტი</unitPattern>
+				<unitPattern count="other">{0} ბაიტი</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>ბიტი</displayName>
+				<unitPattern count="one">{0} ბიტი</unitPattern>
+				<unitPattern count="other">{0} ბიტი</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>ს.</displayName>
+				<unitPattern count="one">{0} ს.</unitPattern>
+				<unitPattern count="other">{0} ს.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>წ</displayName>
+				<unitPattern count="one">{0} წ</unitPattern>
+				<unitPattern count="other">{0} წ</unitPattern>
+				<perUnitPattern>{0}/წ</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>თვე</displayName>
+				<unitPattern count="one">{0} თვე</unitPattern>
+				<unitPattern count="other">{0} თვე</unitPattern>
+				<perUnitPattern>{0}/თვე</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>კვრ</displayName>
+				<unitPattern count="one">{0} კვრ</unitPattern>
+				<unitPattern count="other">{0} კვრ</unitPattern>
+				<perUnitPattern>{0}/კვრ</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>დღე</displayName>
 				<unitPattern count="one">{0} დღე</unitPattern>
 				<unitPattern count="other">{0} დღე</unitPattern>
+				<perUnitPattern>{0}/დღე</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>სთ</displayName>
@@ -6592,30 +6843,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} სთ</unitPattern>
 				<perUnitPattern>{0}/სთ</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>მკწმ</displayName>
-				<unitPattern count="one">{0} მკწმ</unitPattern>
-				<unitPattern count="other">{0} მკწმ</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>მწმ</displayName>
-				<unitPattern count="one">{0} მწმ</unitPattern>
-				<unitPattern count="other">{0} მწმ</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>წთ</displayName>
 				<unitPattern count="one">{0} წთ</unitPattern>
 				<unitPattern count="other">{0} წთ</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>თვე</displayName>
-				<unitPattern count="one">{0} თვე</unitPattern>
-				<unitPattern count="other">{0} თვე</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ნწმ</displayName>
-				<unitPattern count="one">{0} ნწმ</unitPattern>
-				<unitPattern count="other">{0} ნწმ</unitPattern>
+				<perUnitPattern>{0}/წთ</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>წმ</displayName>
@@ -6623,15 +6855,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} წმ</unitPattern>
 				<perUnitPattern>{0}/წმ</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>კვრ</displayName>
-				<unitPattern count="one">{0} კვრ</unitPattern>
-				<unitPattern count="other">{0} კვრ</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>მწმ</displayName>
+				<unitPattern count="one">{0} მწმ</unitPattern>
+				<unitPattern count="other">{0} მწმ</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>წ</displayName>
-				<unitPattern count="one">{0} წ</unitPattern>
-				<unitPattern count="other">{0} წ</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>მკწმ</displayName>
+				<unitPattern count="one">{0} მკწმ</unitPattern>
+				<unitPattern count="other">{0} მკწმ</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ნწმ</displayName>
+				<unitPattern count="one">{0} ნწმ</unitPattern>
+				<unitPattern count="other">{0} ნწმ</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ამპ</displayName>
@@ -6653,6 +6890,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ვ</unitPattern>
 				<unitPattern count="other">{0} ვ</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>კკალ</displayName>
+				<unitPattern count="one">{0} კკალ</unitPattern>
+				<unitPattern count="other">{0} კკალ</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>კალ</displayName>
 				<unitPattern count="one">{0} კალ</unitPattern>
@@ -6663,21 +6905,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} კალ</unitPattern>
 				<unitPattern count="other">{0} კალ</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>ჯოული</displayName>
-				<unitPattern count="one">{0} ჯ</unitPattern>
-				<unitPattern count="other">{0} ჯ</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>კკალ</displayName>
-				<unitPattern count="one">{0} კკალ</unitPattern>
-				<unitPattern count="other">{0} კკალ</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>კჯ</displayName>
 				<unitPattern count="one">{0} კჯ</unitPattern>
 				<unitPattern count="other">{0} კჯ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>ჯოული</displayName>
+				<unitPattern count="one">{0} ჯ</unitPattern>
+				<unitPattern count="other">{0} ჯ</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>კვტსთ</displayName>
 				<unitPattern count="one">{0} კვტსთ</unitPattern>
@@ -6688,201 +6925,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} გჰც.</unitPattern>
 				<unitPattern count="other">{0} გჰც.</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>ჰც.</displayName>
-				<unitPattern count="one">{0} ჰც.</unitPattern>
-				<unitPattern count="other">{0} ჰც.</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>მჰც</displayName>
+				<unitPattern count="one">{0} მჰც</unitPattern>
+				<unitPattern count="other">{0} მჰც</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>კჰც.</displayName>
 				<unitPattern count="one">{0} კჰც.</unitPattern>
 				<unitPattern count="other">{0} კჰც.</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>მჰც</displayName>
-				<unitPattern count="one">{0} მჰც</unitPattern>
-				<unitPattern count="other">{0} მჰც</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>ჰც.</displayName>
+				<unitPattern count="one">{0} ჰც.</unitPattern>
+				<unitPattern count="other">{0} ჰც.</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>ა.ე.</displayName>
-				<unitPattern count="one">{0} ა.ე.</unitPattern>
-				<unitPattern count="other">{0} ა.ე.</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>კმ</displayName>
+				<unitPattern count="one">{0} კმ</unitPattern>
+				<unitPattern count="other">{0} კმ</unitPattern>
+				<perUnitPattern>{0}/კმ</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>სმ</displayName>
-				<unitPattern count="one">{0} სმ</unitPattern>
-				<unitPattern count="other">{0} სმ</unitPattern>
+			<unit type="length-meter">
+				<displayName>მ</displayName>
+				<unitPattern count="one">{0} მ</unitPattern>
+				<unitPattern count="other">{0} მ</unitPattern>
+				<perUnitPattern>{0}/მ</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>დმ</displayName>
 				<unitPattern count="one">{0} დმ</unitPattern>
 				<unitPattern count="other">{0} დმ</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ფტ</displayName>
-				<unitPattern count="one">{0} ფტ</unitPattern>
-				<unitPattern count="other">{0} ფტ</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>დუიმი</displayName>
-				<unitPattern count="one">{0} დუიმი</unitPattern>
-				<unitPattern count="other">{0} დუიმი</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>კმ</displayName>
-				<unitPattern count="one">{0} კმ</unitPattern>
-				<unitPattern count="other">{0} კმ</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>სწ</displayName>
-				<unitPattern count="one">{0} სწ</unitPattern>
-				<unitPattern count="other">{0} სწ</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>მ</displayName>
-				<unitPattern count="one">{0} მ</unitPattern>
-				<unitPattern count="other">{0} მ</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>მკმ</displayName>
-				<unitPattern count="one">{0} მკმ</unitPattern>
-				<unitPattern count="other">{0} მკმ</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>მილი</displayName>
-				<unitPattern count="one">{0} მილი</unitPattern>
-				<unitPattern count="other">{0} მილი</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>სმ</displayName>
+				<unitPattern count="one">{0} სმ</unitPattern>
+				<unitPattern count="other">{0} სმ</unitPattern>
+				<perUnitPattern>{0}/სმ</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>მმ</displayName>
 				<unitPattern count="one">{0} მმ</unitPattern>
 				<unitPattern count="other">{0} მმ</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>მკმ</displayName>
+				<unitPattern count="one">{0} მკმ</unitPattern>
+				<unitPattern count="other">{0} მკმ</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>ნმ</displayName>
 				<unitPattern count="one">{0} ნმ</unitPattern>
 				<unitPattern count="other">{0} ნმ</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>საზღვაო მილი</displayName>
-				<unitPattern count="one">{0} საზღვ. მილი</unitPattern>
-				<unitPattern count="other">{0} საზღვ. მილი</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>პს</displayName>
-				<unitPattern count="one">{0} პს</unitPattern>
-				<unitPattern count="other">{0} პს</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>პმ</displayName>
 				<unitPattern count="one">{0} პმ</unitPattern>
 				<unitPattern count="other">{0} პმ</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>მილი</displayName>
+				<unitPattern count="one">{0} მილი</unitPattern>
+				<unitPattern count="other">{0} მილი</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>იარდი</displayName>
 				<unitPattern count="one">{0} იარდი</unitPattern>
 				<unitPattern count="other">{0} იარდი</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ფტ</displayName>
+				<unitPattern count="one">{0} ფტ</unitPattern>
+				<unitPattern count="other">{0} ფტ</unitPattern>
+				<perUnitPattern>{0}/ფტ</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>დუიმი</displayName>
+				<unitPattern count="one">{0} დუიმი</unitPattern>
+				<unitPattern count="other">{0} დუიმი</unitPattern>
+				<perUnitPattern>{0}/დუიმი</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>პს</displayName>
+				<unitPattern count="one">{0} პს</unitPattern>
+				<unitPattern count="other">{0} პს</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>სწ</displayName>
+				<unitPattern count="one">{0} სწ</unitPattern>
+				<unitPattern count="other">{0} სწ</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ა.ე.</displayName>
+				<unitPattern count="one">{0} ა.ე.</unitPattern>
+				<unitPattern count="other">{0} ა.ე.</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>საზღვაო მილი</displayName>
+				<unitPattern count="one">{0} საზღვ. მილი</unitPattern>
+				<unitPattern count="other">{0} საზღვ. მილი</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>სკანდ. მილი</displayName>
+				<unitPattern count="one">{0} სკანდ. მილი</unitPattern>
+				<unitPattern count="other">{0} სკანდ. მილი</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>ლუქსი</displayName>
 				<unitPattern count="one">{0} ლუქსი</unitPattern>
 				<unitPattern count="other">{0} ლუქსი</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>კარატი</displayName>
-				<unitPattern count="one">{0} კარ.</unitPattern>
-				<unitPattern count="other">{0} კარ.</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>გრამი</displayName>
-				<unitPattern count="one">{0} გ</unitPattern>
-				<unitPattern count="other">{0} გ</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>კილოგრამი</displayName>
-				<unitPattern count="one">{0} კგ</unitPattern>
-				<unitPattern count="other">{0} კგ</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>მტ</displayName>
 				<unitPattern count="one">{0} მტ</unitPattern>
 				<unitPattern count="other">{0} მტ</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>მკგ</displayName>
-				<unitPattern count="one">{0} მკგ</unitPattern>
-				<unitPattern count="other">{0} მკგ</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>კილოგრამი</displayName>
+				<unitPattern count="one">{0} კგ</unitPattern>
+				<unitPattern count="other">{0} კგ</unitPattern>
+				<perUnitPattern>{0}/კგ</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>გრამი</displayName>
+				<unitPattern count="one">{0} გ</unitPattern>
+				<unitPattern count="other">{0} გ</unitPattern>
+				<perUnitPattern>{0}/გ</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>მგ</displayName>
 				<unitPattern count="one">{0} მგ</unitPattern>
 				<unitPattern count="other">{0} მგ</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>უნცია</displayName>
-				<unitPattern count="one">{0} უნც</unitPattern>
-				<unitPattern count="other">{0} უნც</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ტრუას უნცია</displayName>
-				<unitPattern count="one">{0} ტრ. უნც.</unitPattern>
-				<unitPattern count="other">{0} ტრ. უნც.</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>ფუნტი</displayName>
-				<unitPattern count="one">{0} ფნტ</unitPattern>
-				<unitPattern count="other">{0} ფნტ</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>მკგ</displayName>
+				<unitPattern count="one">{0} მკგ</unitPattern>
+				<unitPattern count="other">{0} მკგ</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>ტონა</displayName>
 				<unitPattern count="one">{0} ტ</unitPattern>
 				<unitPattern count="other">{0} ტ</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>ფუნტი</displayName>
+				<unitPattern count="one">{0} ფნტ</unitPattern>
+				<unitPattern count="other">{0} ფნტ</unitPattern>
+				<perUnitPattern>{0}/ფნტ</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>უნცია</displayName>
+				<unitPattern count="one">{0} უნც</unitPattern>
+				<unitPattern count="other">{0} უნც</unitPattern>
+				<perUnitPattern>{0}/უნც</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ტრუას უნცია</displayName>
+				<unitPattern count="one">{0} ტრ. უნც.</unitPattern>
+				<unitPattern count="other">{0} ტრ. უნც.</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>კარატი</displayName>
+				<unitPattern count="one">{0} კარ.</unitPattern>
+				<unitPattern count="other">{0} კარ.</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>გვტ</displayName>
 				<unitPattern count="one">{0} გვტ</unitPattern>
 				<unitPattern count="other">{0} გვტ</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>ცხ. ძ.</displayName>
-				<unitPattern count="one">{0} ცხ. ძ.</unitPattern>
-				<unitPattern count="other">{0} ცხ. ძ.</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>კვტ</displayName>
-				<unitPattern count="one">{0} კვტ</unitPattern>
-				<unitPattern count="other">{0} კვტ</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>მგვტ</displayName>
 				<unitPattern count="one">{0} მგვტ</unitPattern>
 				<unitPattern count="other">{0} მგვტ</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>მლვტ</displayName>
-				<unitPattern count="one">{0} მლვტ</unitPattern>
-				<unitPattern count="other">{0} მლვტ</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>კვტ</displayName>
+				<unitPattern count="one">{0} კვტ</unitPattern>
+				<unitPattern count="other">{0} კვტ</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>ვტ</displayName>
 				<unitPattern count="one">{0} ვტ</unitPattern>
 				<unitPattern count="other">{0} ვტ</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>მლვტ</displayName>
+				<unitPattern count="one">{0} მლვტ</unitPattern>
+				<unitPattern count="other">{0} მლვტ</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>ცხ. ძ.</displayName>
+				<unitPattern count="one">{0} ცხ. ძ.</unitPattern>
+				<unitPattern count="other">{0} ცხ. ძ.</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>ჰპა</displayName>
 				<unitPattern count="one">{0} ჰპა</unitPattern>
 				<unitPattern count="other">{0} ჰპა</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>ვრც. დმ.</displayName>
-				<unitPattern count="one">{0} ვრც. დმ.</unitPattern>
-				<unitPattern count="other">{0} ვრც. დმ.</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>მბარი</displayName>
-				<unitPattern count="one">{0} მბარი</unitPattern>
-				<unitPattern count="other">{0} მბარი</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>მმ ვწყ. სვ.</displayName>
 				<unitPattern count="one">{0} მმ ვწყ. სვ.</unitPattern>
@@ -6893,10 +7134,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ფნტ. კვ. დმ.</unitPattern>
 				<unitPattern count="other">{0} ფნტ. კვ. დმ.</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>კარატი</displayName>
-				<unitPattern count="one">{0} კარ.</unitPattern>
-				<unitPattern count="other">{0} კარ.</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>ვრც. დმ.</displayName>
+				<unitPattern count="one">{0} ვრც. დმ.</unitPattern>
+				<unitPattern count="other">{0} ვრც. დმ.</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>მბარი</displayName>
+				<unitPattern count="one">{0} მბარი</unitPattern>
+				<unitPattern count="other">{0} მბარი</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>კმ/სთ</displayName>
@@ -6913,6 +7159,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} მილი/სთ</unitPattern>
 				<unitPattern count="other">{0} მილი/სთ</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>კვძ.</displayName>
+				<unitPattern count="one">{0} კვძ.</unitPattern>
+				<unitPattern count="other">{0} კვძ.</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -6928,31 +7184,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>აკრ.ფტ.</displayName>
-				<unitPattern count="one">{0} აკრ.ფტ.</unitPattern>
-				<unitPattern count="other">{0} აკრ.ფტ.</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>სლ</displayName>
-				<unitPattern count="one">{0} სლ</unitPattern>
-				<unitPattern count="other">{0} სლ</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>სმ³</displayName>
-				<unitPattern count="one">{0} სმ³</unitPattern>
-				<unitPattern count="other">{0} სმ³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ფუტი³</displayName>
-				<unitPattern count="one">{0} ფტ³</unitPattern>
-				<unitPattern count="other">{0} ფტ³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>დუიმი³</displayName>
-				<unitPattern count="one">{0} დუიმი³</unitPattern>
-				<unitPattern count="other">{0} დუიმი³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>კუბური კილომეტრი</displayName>
 				<unitPattern count="one">{0} კმ³</unitPattern>
@@ -6962,6 +7193,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>მ³</displayName>
 				<unitPattern count="one">{0} მ³</unitPattern>
 				<unitPattern count="other">{0} მ³</unitPattern>
+				<perUnitPattern>{0}/მ³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>სმ³</displayName>
+				<unitPattern count="one">{0} სმ³</unitPattern>
+				<unitPattern count="other">{0} სმ³</unitPattern>
+				<perUnitPattern>{0}/სმ³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>კუბური მილი</displayName>
@@ -6973,25 +7211,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} იარდი³</unitPattern>
 				<unitPattern count="other">{0} იარდი³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>ჭიქა</displayName>
-				<unitPattern count="one">{0} ჭიქა</unitPattern>
-				<unitPattern count="other">{0} ჭიქა</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ფუტი³</displayName>
+				<unitPattern count="one">{0} ფტ³</unitPattern>
+				<unitPattern count="other">{0} ფტ³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>დლ</displayName>
-				<unitPattern count="one">{0} დლ</unitPattern>
-				<unitPattern count="other">{0} დლ</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>დუიმი³</displayName>
+				<unitPattern count="one">{0} დუიმი³</unitPattern>
+				<unitPattern count="other">{0} დუიმი³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>თხ. უნცია</displayName>
-				<unitPattern count="one">{0} თხ. უნცია</unitPattern>
-				<unitPattern count="other">{0} თხ. უნცია</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>გალონი</displayName>
-				<unitPattern count="one">{0} გალონი</unitPattern>
-				<unitPattern count="other">{0} გალონი</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>მეგალ.</displayName>
+				<unitPattern count="one">{0} მეგალ.</unitPattern>
+				<unitPattern count="other">{0} მეგალ.</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>ჰლ</displayName>
@@ -7002,27 +7235,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ლიტრი</displayName>
 				<unitPattern count="one">{0} ლ</unitPattern>
 				<unitPattern count="other">{0} ლ</unitPattern>
+				<perUnitPattern>{0}/ლ</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>მეგალ.</displayName>
-				<unitPattern count="one">{0} მეგალ.</unitPattern>
-				<unitPattern count="other">{0} მეგალ.</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>დლ</displayName>
+				<unitPattern count="one">{0} დლ</unitPattern>
+				<unitPattern count="other">{0} დლ</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>სლ</displayName>
+				<unitPattern count="one">{0} სლ</unitPattern>
+				<unitPattern count="other">{0} სლ</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>მილილ.</displayName>
 				<unitPattern count="one">{0} მილილ.</unitPattern>
 				<unitPattern count="other">{0} მილილ.</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>პინტა</displayName>
-				<unitPattern count="one">{0} პინტა</unitPattern>
-				<unitPattern count="other">{0} პინტა</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>მეტრ. პინტა</displayName>
+				<unitPattern count="one">{0} მეტრ. პინტა</unitPattern>
+				<unitPattern count="other">{0} მეტრ. პინტა</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>მეტრ. ჭიქა</displayName>
+				<unitPattern count="one">{0} მეტრ. ჭიქა</unitPattern>
+				<unitPattern count="other">{0} მეტრ. ჭიქა</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>აკრ.ფტ.</displayName>
+				<unitPattern count="one">{0} აკრ.ფტ.</unitPattern>
+				<unitPattern count="other">{0} აკრ.ფტ.</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>გალონი</displayName>
+				<unitPattern count="one">{0} გალონი</unitPattern>
+				<unitPattern count="other">{0} გალონი</unitPattern>
+				<perUnitPattern>{0}/გალონი</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>კვარტა</displayName>
 				<unitPattern count="one">{0} კვარტა</unitPattern>
 				<unitPattern count="other">{0} კვარტა</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>პინტა</displayName>
+				<unitPattern count="one">{0} პინტა</unitPattern>
+				<unitPattern count="other">{0} პინტა</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>ჭიქა</displayName>
+				<unitPattern count="one">{0} ჭიქა</unitPattern>
+				<unitPattern count="other">{0} ჭიქა</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>თხ. უნცია</displayName>
+				<unitPattern count="one">{0} თხ. უნცია</unitPattern>
+				<unitPattern count="other">{0} თხ. უნცია</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>ს. კოვზი</displayName>
 				<unitPattern count="one">{0} ს. კოვზი</unitPattern>
@@ -7033,6 +7303,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ჩ. კოვზი</unitPattern>
 				<unitPattern count="other">{0} ჩ. კოვზი</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}აღმ.</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}ჩრდ.</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} სამხრ.</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} დას.</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -7042,6 +7318,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ინ. ძ.</unitPattern>
 				<unitPattern count="other">{0} ინ. ძ.</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0} წთ</unitPattern>
 				<unitPattern count="other">{0} წთ</unitPattern>
@@ -7050,26 +7330,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} წმ</unitPattern>
 				<unitPattern count="other">{0} წმ</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} აკრი</unitPattern>
-				<unitPattern count="other">{0} აკრი</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} კმ²</unitPattern>
+				<unitPattern count="other">{0} კმ²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} ჰა</unitPattern>
 				<unitPattern count="other">{0} ჰა</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} ფტ²</unitPattern>
-				<unitPattern count="other">{0} ფტ²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} კმ²</unitPattern>
-				<unitPattern count="other">{0} კმ²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} მ²</unitPattern>
 				<unitPattern count="other">{0} მ²</unitPattern>
@@ -7078,6 +7346,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} მილი²</unitPattern>
 				<unitPattern count="other">{0} მილი²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} აკრი</unitPattern>
+				<unitPattern count="other">{0} აკრი</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ფტ²</unitPattern>
+				<unitPattern count="other">{0} ფტ²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ლ/100კმ</displayName>
+				<unitPattern count="one">{0}ლ/100კმ</unitPattern>
+				<unitPattern count="other">{0}ლ/100კმ</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>წ</displayName>
+				<unitPattern count="one">{0} წ</unitPattern>
+				<unitPattern count="other">{0} წ</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>თვე</displayName>
+				<unitPattern count="one">{0} თვე</unitPattern>
+				<unitPattern count="other">{0} თვე</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>კვრ</displayName>
+				<unitPattern count="one">{0} კვრ</unitPattern>
+				<unitPattern count="other">{0} კვრ</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>დღე</displayName>
 				<unitPattern count="one">{0} დღე</unitPattern>
@@ -7088,66 +7384,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}სთ</unitPattern>
 				<unitPattern count="other">{0}სთ</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>მწმ</displayName>
-				<unitPattern count="one">{0} მწმ</unitPattern>
-				<unitPattern count="other">{0} მწმ</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>წთ</displayName>
 				<unitPattern count="one">{0}წთ</unitPattern>
 				<unitPattern count="other">{0}წთ</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>თვე</displayName>
-				<unitPattern count="one">{0} თვე</unitPattern>
-				<unitPattern count="other">{0} თვე</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>წმ</displayName>
 				<unitPattern count="one">{0}წმ</unitPattern>
 				<unitPattern count="other">{0}წმ</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>კვრ</displayName>
-				<unitPattern count="one">{0} კვრ</unitPattern>
-				<unitPattern count="other">{0} კვრ</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>წ</displayName>
-				<unitPattern count="one">{0} წ</unitPattern>
-				<unitPattern count="other">{0} წ</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>სმ</displayName>
-				<unitPattern count="one">{0} სმ</unitPattern>
-				<unitPattern count="other">{0} სმ</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0} ფტ</unitPattern>
-				<unitPattern count="other">{0} ფტ</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0} დმ</unitPattern>
-				<unitPattern count="other">{0} დმ</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>მწმ</displayName>
+				<unitPattern count="one">{0} მწმ</unitPattern>
+				<unitPattern count="other">{0} მწმ</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>კმ</displayName>
 				<unitPattern count="one">{0} კმ</unitPattern>
 				<unitPattern count="other">{0} კმ</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} სწ</unitPattern>
-				<unitPattern count="other">{0} სწ</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>მ</displayName>
 				<unitPattern count="one">{0}მ</unitPattern>
 				<unitPattern count="other">{0}მ</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} მილი</unitPattern>
-				<unitPattern count="other">{0} მილი</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>სმ</displayName>
+				<unitPattern count="one">{0} სმ</unitPattern>
+				<unitPattern count="other">{0} სმ</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>მმ</displayName>
@@ -7158,31 +7423,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} პმ</unitPattern>
 				<unitPattern count="other">{0} პმ</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} მილი</unitPattern>
+				<unitPattern count="other">{0} მილი</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} იარდი</unitPattern>
 				<unitPattern count="other">{0} იარდი</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>გრამი</displayName>
-				<unitPattern count="one">{0}გ</unitPattern>
-				<unitPattern count="other">{0}გ</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} ფტ</unitPattern>
+				<unitPattern count="other">{0} ფტ</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} დმ</unitPattern>
+				<unitPattern count="other">{0} დმ</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} სწ</unitPattern>
+				<unitPattern count="other">{0} სწ</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>კგ</displayName>
 				<unitPattern count="one">{0}კგ</unitPattern>
 				<unitPattern count="other">{0}კგ</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} უნც</unitPattern>
-				<unitPattern count="other">{0} უნც</unitPattern>
+			<unit type="mass-gram">
+				<displayName>გრამი</displayName>
+				<unitPattern count="one">{0}გ</unitPattern>
+				<unitPattern count="other">{0}გ</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} ფნტ</unitPattern>
 				<unitPattern count="other">{0} ფნტ</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0}ცხ.ძ.</unitPattern>
-				<unitPattern count="other">{0}ცხ.ძ.</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} უნც</unitPattern>
+				<unitPattern count="other">{0} უნც</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} კვტ</unitPattern>
@@ -7192,6 +7469,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ვტ</unitPattern>
 				<unitPattern count="other">{0} ვტ</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0}ცხ.ძ.</unitPattern>
+				<unitPattern count="other">{0}ცხ.ძ.</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} ჰპა</unitPattern>
 				<unitPattern count="other">{0} ჰპა</unitPattern>
@@ -7239,6 +7520,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}ლ</unitPattern>
 				<unitPattern count="other">{0}ლ</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}აღმ.</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}ჩრდ.</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} სამხრ.</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} დას.</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ka_GE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ka_GE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ka_GE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ka_GE.xml
index fa4c14bafbd..63e6b8a8962 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ka_GE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ka_GE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ka"/>
 		<territory type="GE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kab.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kab.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kab.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kab.xml
index 077b817d8f4..692a09abf58 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kab.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kab.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11042 $"/>
-		<generation date="$Date: 2014-10-31 12:11:19 -0500 (Fri, 31 Oct 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="kab"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Ungiya</territory>
 			<territory type="AL">Lalbani</territory>
 			<territory type="AM">Arminya</territory>
-			<territory type="AN">Antilles n Tmura-Yessakesren</territory>
 			<territory type="AO">Ungula</territory>
 			<territory type="AR">Arjuntin</territory>
 			<territory type="AS">Samwa Tamarikanit</territory>
@@ -447,6 +445,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">n tufat</dayPeriod>
+							<dayPeriod type="pm">n tmeddit</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">n tufat</dayPeriod>
 							<dayPeriod type="pm">n tmeddit</dayPeriod>
@@ -488,22 +490,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
+							<pattern>h:mm:ss a zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
+							<pattern>h:mm:ss a z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
+							<pattern>h:mm:ss a</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>HH:mm</pattern>
+							<pattern>h:mm a</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -583,6 +585,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0K¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0K¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00K¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000K¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0M¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00M¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000M¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0G¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00G¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000G¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0T¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00T¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000T¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -760,3 +790,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kab_DZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kab_DZ.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kab_DZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kab_DZ.xml
index 8bcb671a56f..1f422dd8af5 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kab_DZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kab_DZ.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="kab"/>
 		<territory type="DZ"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kam.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kam.xml
similarity index 94%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kam.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kam.xml
index 36bff35fbff..7f7ea85f515 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kam.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kam.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="kam"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antili za Uholanzi</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Ajentina</territory>
 			<territory type="AS">Samoa ya Marekani</territory>
@@ -447,6 +445,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">Ĩyakwakya</dayPeriod>
+							<dayPeriod type="pm">Ĩyawĩoo</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">Ĩyakwakya</dayPeriod>
 							<dayPeriod type="pm">Ĩyawĩoo</dayPeriod>
@@ -488,22 +490,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -583,6 +585,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -760,3 +778,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kam_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kam_KE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kam_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kam_KE.xml
index f0c4d3d67e1..d699689f1d0 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kam_KE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kam_KE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="kam"/>
 		<territory type="KE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kde.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kde.xml
similarity index 94%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kde.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kde.xml
index 2e989d9e613..01c72075a32 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kde.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kde.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="kde"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angwila</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Almenia</territory>
-			<territory type="AN">Antili za Uholanzi</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Adyentina</territory>
 			<territory type="AS">Samoa ya Malekani</territory>
@@ -447,6 +445,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">Muhi</dayPeriod>
+							<dayPeriod type="pm">Chilo</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">Muhi</dayPeriod>
 							<dayPeriod type="pm">Chilo</dayPeriod>
@@ -488,22 +490,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -583,6 +585,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kde_TZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kde_TZ.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kde_TZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kde_TZ.xml
index 4d426a6c07d..7d9fe7ae77e 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kde_TZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kde_TZ.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="kde"/>
 		<territory type="TZ"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kea.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kea.xml
similarity index 95%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kea.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kea.xml
index 21480f4a133..3c47b8913f0 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kea.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kea.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11042 $"/>
-		<generation date="$Date: 2014-10-31 12:11:19 -0500 (Fri, 31 Oct 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="kea"/>
 	</identity>
 	<localeDisplayNames>
@@ -29,11 +28,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="asa">asu</language>
 			<language type="ay">aimara</language>
 			<language type="az">azerbaijanu</language>
+			<language type="az" alt="short">azeri</language>
 			<language type="ba">baxkir</language>
 			<language type="be">bielorusu</language>
 			<language type="bem">bemba</language>
 			<language type="bez">bena</language>
-			<language type="bg">bulgaru</language>
+			<language type="bg">búlgaru</language>
 			<language type="bm">bambara</language>
 			<language type="bn">bengali</language>
 			<language type="bo">tibetanu</language>
@@ -41,11 +41,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="brx">bodo</language>
 			<language type="bs">bosniu</language>
 			<language type="ca">katalãu</language>
+			<language type="ce">txetxenu</language>
 			<language type="cgg">xiga</language>
 			<language type="chr">xeroki</language>
-			<language type="ckb">kurdu sorani</language>
-			<language type="co">córsiku</language>
+			<language type="ckb">kurdu sentral</language>
+			<language type="co">kórsiku</language>
 			<language type="cs">txeku</language>
+			<language type="cv">txuvaxi</language>
 			<language type="cy">gales</language>
 			<language type="da">dinamarkes</language>
 			<language type="dav">taita</language>
@@ -63,7 +65,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="en">ingles</language>
 			<language type="en_AU">ingles australianu</language>
 			<language type="en_CA">ingles kanadianu</language>
-			<language type="en_GB">ingles britanuku</language>
+			<language type="en_GB">ingles britaniku</language>
 			<language type="en_GB" alt="short">ingles (R.U.)</language>
 			<language type="en_US">ingles merkanu</language>
 			<language type="en_US" alt="short">ingles (S.U.)</language>
@@ -100,7 +102,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ht">aitianu</language>
 			<language type="hu">úngaru</language>
 			<language type="hy">arméniu</language>
-			<language type="id">indoneziu</language>
+			<language type="id">indonéziu</language>
 			<language type="ig">ibo</language>
 			<language type="ii">nuosu</language>
 			<language type="is">islandes</language>
@@ -111,16 +113,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="jmc">matxame</language>
 			<language type="jv">javanes</language>
 			<language type="ka">jorjianu</language>
+			<language type="kab">kabila</language>
+			<language type="kam">kamba</language>
 			<language type="kea">kabuverdianu</language>
+			<language type="khq">koira txiini</language>
+			<language type="ki">kikuiu</language>
 			<language type="kk">kazak</language>
+			<language type="kl">groenlandes</language>
+			<language type="kln">kalenjin</language>
 			<language type="km">kmer</language>
 			<language type="kn">kanares</language>
-			<language type="ko">kureanu</language>
+			<language type="ko">korianu</language>
+			<language type="koi">komi-permiak</language>
+			<language type="kok">konkani</language>
 			<language type="ks">kaxmira</language>
+			<language type="ksf">bafia</language>
 			<language type="ku">kurdu</language>
+			<language type="kw">kórniku</language>
 			<language type="ky">kirgiz</language>
 			<language type="la">latin</language>
 			<language type="lb">luxemburges</language>
+			<language type="lg">luganda</language>
 			<language type="lo">lausianu</language>
 			<language type="lt">lituanes</language>
 			<language type="lv">letãu</language>
@@ -136,6 +149,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ne">nepales</language>
 			<language type="nl">olandes</language>
 			<language type="nl_BE">flamengu</language>
+			<language type="nmg">kuazio</language>
 			<language type="nn">norueges nynorsk</language>
 			<language type="om">oromo</language>
 			<language type="or">oriya</language>
@@ -153,16 +167,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="rw">kiniaruanda</language>
 			<language type="sa">sanskritu</language>
 			<language type="sd">sindi</language>
+			<language type="ses">koiraboro seni</language>
 			<language type="si">singales</language>
 			<language type="sk">slovaku</language>
 			<language type="sl">sloveniu</language>
+			<language type="smn">inari sami</language>
 			<language type="so">somali</language>
 			<language type="sq">albanes</language>
 			<language type="sr">sérviu</language>
 			<language type="su">sundanes</language>
 			<language type="sv">sueku</language>
 			<language type="sw">suaíli</language>
-			<language type="swc" draft="unconfirmed">suaíli di Kongu</language>
+			<language type="sw_CD">suaíli kongoles</language>
 			<language type="ta">tamil</language>
 			<language type="te">telugu</language>
 			<language type="tg">tajik</language>
@@ -172,6 +188,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="to">tonganes</language>
 			<language type="tr">turku</language>
 			<language type="tt">tatar</language>
+			<language type="tzm">tamazait di Atlas Sentral</language>
 			<language type="ug">uigur</language>
 			<language type="uk">ukranianu</language>
 			<language type="und">lingua diskonxedu</language>
@@ -188,14 +205,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="zxx">sem konteudo linguistiku</language>
 		</languages>
 		<scripts>
-			<script type="Arab">arabiku</script>
-			<script type="Armn">armeniu</script>
+			<script type="Arab">arábiku</script>
+			<script type="Armn">arméniu</script>
 			<script type="Beng">bengali</script>
 			<script type="Bopo">bopomofo</script>
 			<script type="Brai">braille</script>
-			<script type="Cyrl">siriliku</script>
+			<script type="Cyrl">siríliku</script>
 			<script type="Deva">devanagari</script>
-			<script type="Ethi">etiopiku</script>
+			<script type="Ethi">etiópiku</script>
 			<script type="Geor">jorjianu</script>
 			<script type="Grek">gregu</script>
 			<script type="Gujr">gujarati</script>
@@ -212,7 +229,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Kana">katakana</script>
 			<script type="Khmr">kmer</script>
 			<script type="Knda">kanares</script>
-			<script type="Kore">koreanu</script>
+			<script type="Kore">korianu</script>
 			<script type="Laoo">lausianu</script>
 			<script type="Latn">latinu</script>
 			<script type="Mlym">malaialam</script>
@@ -232,30 +249,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</scripts>
 		<territories>
 			<territory type="001">Mundu</territory>
-			<territory type="002">Afrika</territory>
+			<territory type="002">Áfrika</territory>
 			<territory type="003">Merka di Norti</territory>
 			<territory type="005">Merka di Sul</territory>
 			<territory type="009">Oseania</territory>
-			<territory type="011">Afrika Osidental</territory>
+			<territory type="011">Áfrika Osidental</territory>
 			<territory type="013">Merka Sentral</territory>
-			<territory type="014">Afrika Oriental</territory>
-			<territory type="015">Norti di Afrika</territory>
-			<territory type="017">Afrika Sentral</territory>
-			<territory type="018">Sul di Afrika</territory>
+			<territory type="014">Áfrika Oriental</territory>
+			<territory type="015">Norti di Áfrika</territory>
+			<territory type="017">Áfrika Sentral</territory>
+			<territory type="018">Sul di Áfrika</territory>
 			<territory type="019">Merkas</territory>
 			<territory type="021">Norti di Merka</territory>
 			<territory type="029">Karaibas</territory>
-			<territory type="030">Azia Oriental</territory>
-			<territory type="034">Sul di Azia</territory>
-			<territory type="035">Sudesti Aziatiku</territory>
+			<territory type="030">Ázia Oriental</territory>
+			<territory type="034">Sul di Ázia</territory>
+			<territory type="035">Sudesti Aziátiku</territory>
 			<territory type="039">Europa di Sul</territory>
-			<territory type="053">Australazia</territory>
-			<territory type="054">Melanezia</territory>
-			<territory type="057">Rejiãu di Mikronezia</territory>
-			<territory type="061">Polinezia</territory>
-			<territory type="142">Azia</territory>
-			<territory type="143">Azia Sentral</territory>
-			<territory type="145">Azia Osidental</territory>
+			<territory type="053">Australázia</territory>
+			<territory type="054">Melanézia</territory>
+			<territory type="057">Rejiãu di Mikronézia</territory>
+			<territory type="061">Polinézia</territory>
+			<territory type="142">Ázia</territory>
+			<territory type="143">Ázia Sentral</territory>
+			<territory type="145">Ázia Osidental</territory>
 			<territory type="150">Europa</territory>
 			<territory type="151">Europa Oriental</territory>
 			<territory type="154">Europa di Norti</territory>
@@ -269,7 +286,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angila</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antilhas Olandeza</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antartika</territory>
 			<territory type="AR">Arjentina</territory>
@@ -291,8 +307,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BL">Sãu Bartolomeu</territory>
 			<territory type="BM">Bermudas</territory>
 			<territory type="BN">Brunei</territory>
-			<territory type="BO">Bolivia</territory>
-			<territory type="BQ">Karaibas olandes</territory>
+			<territory type="BO">Bolívia</territory>
+			<territory type="BQ">Karaibas Olandezas</territory>
 			<territory type="BR">Brazil</territory>
 			<territory type="BS">Baamas</territory>
 			<territory type="BT">Butãu</territory>
@@ -314,7 +330,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CL">Xili</territory>
 			<territory type="CM">Kamarõis</territory>
 			<territory type="CN">Xina</territory>
-			<territory type="CO">Kulombia</territory>
+			<territory type="CO">Kolômbia</territory>
 			<territory type="CP">Ilha Kliperton</territory>
 			<territory type="CR">Kosta Rika</territory>
 			<territory type="CU">Kuba</territory>
@@ -342,6 +358,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="FI">Finlandia</territory>
 			<territory type="FJ">Fidji</territory>
 			<territory type="FK">Ilhas Malvinas</territory>
+			<territory type="FK" alt="variant">Ilhas Falkland (Ilhas Malvinas)</territory>
 			<territory type="FM">Mikronezia</territory>
 			<territory type="FO">Ilhas Faroe</territory>
 			<territory type="FR">Fransa</territory>
@@ -354,7 +371,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GG">Gernzi</territory>
 			<territory type="GH">Gana</territory>
 			<territory type="GI">Jibraltar</territory>
-			<territory type="GL">Gronelandia</territory>
+			<territory type="GL">Gronelándia</territory>
 			<territory type="GM">Gambia</territory>
 			<territory type="GN">Gine</territory>
 			<territory type="GP">Guadalupi</territory>
@@ -365,12 +382,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GU">Guam</territory>
 			<territory type="GW">Gine-Bisau</territory>
 			<territory type="GY">Giana</territory>
-			<territory type="HK">Rejiãu Administrativu Special di Ong Kong</territory>
-			<territory type="HK" alt="short">Ong Kong</territory>
+			<territory type="HK">Rejiãu Administrativu Special di Hong Kong</territory>
+			<territory type="HK" alt="short">Hong Kong</territory>
 			<territory type="HM">Ilha Heard i Ilhas McDonald</territory>
 			<territory type="HN">Onduras</territory>
 			<territory type="HR">Kroasia</territory>
-			<territory type="HT">Aiti</territory>
+			<territory type="HT">Aití</territory>
 			<territory type="HU">Ungria</territory>
 			<territory type="IC">Kanárias</territory>
 			<territory type="ID">Indonezia</territory>
@@ -431,7 +448,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="MU">Ilhas Maurisia</territory>
 			<territory type="MV">Maldivas</territory>
 			<territory type="MW">Malaui</territory>
-			<territory type="MX">Mexiku</territory>
+			<territory type="MX">Méxiku</territory>
 			<territory type="MY">Malazia</territory>
 			<territory type="MZ">Musambiki</territory>
 			<territory type="NA">Namibia</territory>
@@ -439,7 +456,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="NE">Nijer</territory>
 			<territory type="NF">Ilhas Norfolk</territory>
 			<territory type="NG">Nijeria</territory>
-			<territory type="NI">Nikaragua</territory>
+			<territory type="NI">Nikarágua</territory>
 			<territory type="NL">Olanda</territory>
 			<territory type="NO">Noruega</territory>
 			<territory type="NP">Nepal</territory>
@@ -447,7 +464,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="NU">Niue</territory>
 			<territory type="NZ">Nova Zilandia</territory>
 			<territory type="OM">Oman</territory>
-			<territory type="PA">Panama</territory>
+			<territory type="PA">Panamá</territory>
 			<territory type="PE">Peru</territory>
 			<territory type="PF">Polinezia Franseza</territory>
 			<territory type="PG">Papua-Nova Gine</territory>
@@ -462,7 +479,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="PW">Palau</territory>
 			<territory type="PY">Paraguai</territory>
 			<territory type="QA">Katar</territory>
-			<territory type="QO">Oseania Insular</territory>
+			<territory type="QO">Ilhas di Oseania</territory>
 			<territory type="RE">Runion</territory>
 			<territory type="RO">Romenia</territory>
 			<territory type="RS">Servia</territory>
@@ -517,7 +534,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="VC">Sãu Bisenti i Granadinas</territory>
 			<territory type="VE">Vinizuela</territory>
 			<territory type="VG">Ilhas Virjens Britanikas</territory>
-			<territory type="VI">Ilhas Virjens Merkanu</territory>
+			<territory type="VI">Ilhas Virjens Merkanas</territory>
 			<territory type="VN">Vietnam</territory>
 			<territory type="VU">Vanuatu</territory>
 			<territory type="WF">Ualis i Futuna</territory>
@@ -530,9 +547,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ZW">Zimbabui</territory>
 			<territory type="ZZ">Rejiãu Diskonxedu</territory>
 		</territories>
+		<keys>
+			<key type="calendar">Kalendáriu</key>
+		</keys>
 		<types>
-			<type type="gregorian" key="calendar">Kalendariu Gregorianu</type>
-			<type type="latn" key="numbers">Numerus Arabikus</type>
+			<type key="calendar" type="gregorian">Kalendáriu Gregorianu</type>
+			<type key="numbers" type="latn">Númerus Arábikus</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Metriku</measurementSystemName>
@@ -618,8 +638,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
 						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">HH</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
@@ -966,14 +984,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">am</dayPeriod>
+							<dayPeriod type="pm">pm</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am">a</dayPeriod>
-							<dayPeriod type="noon">m</dayPeriod>
 							<dayPeriod type="pm">p</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">am</dayPeriod>
-							<dayPeriod type="noon">mei-dia</dayPeriod>
 							<dayPeriod type="pm">pm</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
@@ -1071,8 +1091,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="GyMMMEd">E, d 'di' MMM 'di' y G</dateFormatItem>
 						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">HH</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
@@ -1752,6 +1770,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">0 mil ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00 mil ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000 mil ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0 M ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00 M ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000 M ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0 MM ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00 MM ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000 MM ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0 Bi ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00 Bi ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000 Bi ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencies>
@@ -2323,26 +2357,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>métru pur sigundu kuadradu</displayName>
 				<unitPattern count="other">{0} métru pur sigundu kuadradu</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>grau</displayName>
-				<unitPattern count="other">{0} grau</unitPattern>
-			</unit>
 			<unit type="angle-radian">
 				<displayName>radianu</displayName>
 				<unitPattern count="other">{0} radianu</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName>ákri</displayName>
-				<unitPattern count="other">{0} ákri</unitPattern>
+			<unit type="angle-degree">
+				<displayName>grau</displayName>
+				<unitPattern count="other">{0} grau</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>kilómetru kuadradu</displayName>
+				<unitPattern count="other">{0} kilómetru kuadradu</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ektar</displayName>
 				<unitPattern count="other">{0} ektar</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>métru kuadradu</displayName>
+				<unitPattern count="other">{0} métru kuadradu</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>sentímetru kuadradu</displayName>
 				<unitPattern count="other">{0} sentímetru kuadradu</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<displayName>milha kuadradu</displayName>
+				<unitPattern count="other">{0} milha kuadradu</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ákri</displayName>
+				<unitPattern count="other">{0} ákri</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>jarda kuadradu</displayName>
+				<unitPattern count="other">{0} jarda kuadradu</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<displayName>pé kuadradu</displayName>
 				<unitPattern count="other">{0} pé kuadradu</unitPattern>
@@ -2351,21 +2401,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>pulegada kuadradu</displayName>
 				<unitPattern count="other">{0} pulegada kuadradu</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kilómetru kuadradu</displayName>
-				<unitPattern count="other">{0} kilómetru kuadradu</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>métru kuadradu</displayName>
-				<unitPattern count="other">{0} métru kuadradu</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>milha kuadradu</displayName>
-				<unitPattern count="other">{0} milha kuadradu</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>jarda kuadradu</displayName>
-				<unitPattern count="other">{0} jarda kuadradu</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kilati</displayName>
+				<unitPattern count="other">{0} kilati</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litru pur kilómetru</displayName>
@@ -2375,45 +2413,57 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>milha pur galãu</displayName>
 				<unitPattern count="other">{0} milha pur galãu</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>jigabit</displayName>
-				<unitPattern count="other">{0} jigabit</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>jigabyte</displayName>
-				<unitPattern count="other">{0} jigabyte</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobit</displayName>
-				<unitPattern count="other">{0} kilobit</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobyte</displayName>
-				<unitPattern count="other">{0} kilobyte</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabit</displayName>
-				<unitPattern count="other">{0} megabit</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabyte</displayName>
-				<unitPattern count="other">{0} megabyte</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>terabyte</displayName>
+				<unitPattern count="other">{0} terabyte</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>terabit</displayName>
 				<unitPattern count="other">{0} terabit</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>terabyte</displayName>
-				<unitPattern count="other">{0} terabyte</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>jigabyte</displayName>
+				<unitPattern count="other">{0} jigabyte</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>jigabit</displayName>
+				<unitPattern count="other">{0} jigabit</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabyte</displayName>
+				<unitPattern count="other">{0} megabyte</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabit</displayName>
+				<unitPattern count="other">{0} megabit</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobyte</displayName>
+				<unitPattern count="other">{0} kilobyte</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobit</displayName>
+				<unitPattern count="other">{0} kilobit</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>anu</displayName>
+				<unitPattern count="other">{0} anu</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mes</displayName>
+				<unitPattern count="other">{0} mes</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>simana</displayName>
+				<unitPattern count="other">{0} simana</unitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>dia</displayName>
@@ -2424,50 +2474,66 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ora</unitPattern>
 				<perUnitPattern>{0} pur ora</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikrosigundu</displayName>
-				<unitPattern count="other">{0} mikrosigundu</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milisigundu</displayName>
-				<unitPattern count="other">{0} milisigundu</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>minutu</displayName>
 				<unitPattern count="other">{0} minutu</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>mes</displayName>
-				<unitPattern count="other">{0} mes</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanosigundu</displayName>
-				<unitPattern count="other">{0} nanosigundu</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>sigundu</displayName>
 				<unitPattern count="other">{0} sigundu</unitPattern>
 				<perUnitPattern>{0} pur sigundu</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>simana</displayName>
-				<unitPattern count="other">{0} simana</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milisigundu</displayName>
+				<unitPattern count="other">{0} milisigundu</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>anu</displayName>
-				<unitPattern count="other">{0} anu</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>mikrosigundu</displayName>
+				<unitPattern count="other">{0} mikrosigundu</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>unidadi astronómiku</displayName>
-				<unitPattern count="other">{0} unidadi astronómiku</unitPattern>
+			<unit type="duration-nanosecond">
+				<displayName>nanosigundu</displayName>
+				<unitPattern count="other">{0} nanosigundu</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>kilómetru</displayName>
+				<unitPattern count="other">{0} kilómetru</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>métru</displayName>
+				<unitPattern count="other">{0} métru</unitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>desímetru</displayName>
+				<unitPattern count="other">{0} desímetru</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
 				<displayName>sentímetru</displayName>
 				<unitPattern count="other">{0} sentímetru</unitPattern>
 			</unit>
-			<unit type="length-decimeter">
-				<displayName>desímetru</displayName>
-				<unitPattern count="other">{0} desímetru</unitPattern>
+			<unit type="length-millimeter">
+				<displayName>milímetru</displayName>
+				<unitPattern count="other">{0} milímetru</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikrómetru</displayName>
+				<unitPattern count="other">{0} mikrómetru</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nanómetru</displayName>
+				<unitPattern count="other">{0} nanómetru</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>pikómetru</displayName>
+				<unitPattern count="other">{0} pikómetru</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>milha</displayName>
+				<unitPattern count="other">{0} milha</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>jarda</displayName>
+				<unitPattern count="other">{0} jarda</unitPattern>
 			</unit>
 			<unit type="length-foot">
 				<displayName>pé</displayName>
@@ -2477,50 +2543,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>pulegada</displayName>
 				<unitPattern count="other">{0} pulegada</unitPattern>
 			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilómetru</displayName>
-				<unitPattern count="other">{0} kilómetru</unitPattern>
+			<unit type="length-parsec">
+				<displayName>parsek</displayName>
+				<unitPattern count="other">{0} parsek</unitPattern>
 			</unit>
 			<unit type="length-light-year">
 				<displayName>anu-lus</displayName>
 				<unitPattern count="other">{0} anu-lus</unitPattern>
 			</unit>
-			<unit type="length-meter">
-				<displayName>métru</displayName>
-				<unitPattern count="other">{0} métru</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>mikrómetru</displayName>
-				<unitPattern count="other">{0} mikrómetru</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>milha</displayName>
-				<unitPattern count="other">{0} milha</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>milímetru</displayName>
-				<unitPattern count="other">{0} milímetru</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<displayName>nanómetru</displayName>
-				<unitPattern count="other">{0} nanómetru</unitPattern>
+			<unit type="length-astronomical-unit">
+				<displayName>unidadi astronómiku</displayName>
+				<unitPattern count="other">{0} unidadi astronómiku</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
 				<displayName>milha náutiku</displayName>
 				<unitPattern count="other">{0} milha náutiku</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<displayName>parsek</displayName>
-				<unitPattern count="other">{0} parsek</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName>pikómetru</displayName>
-				<unitPattern count="other">{0} pikómetru</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<displayName>jarda</displayName>
-				<unitPattern count="other">{0} jarda</unitPattern>
-			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="other">{0} lux</unitPattern>
@@ -2528,10 +2566,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="power-watt">
 				<displayName>watt</displayName>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kilati</displayName>
-				<unitPattern count="other">{0} kilati</unitPattern>
-			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilómetru pur ora</displayName>
 				<unitPattern count="other">{0} kilómetru pur ora</unitPattern>
@@ -2544,26 +2578,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>milha pur ora</displayName>
 				<unitPattern count="other">{0} milha pur ora</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ákri-pé</displayName>
-				<unitPattern count="other">{0} ákri-pé</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>sentilitru</displayName>
-				<unitPattern count="other">{0} sentilitru</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>sentímetru kúbiku</displayName>
-				<unitPattern count="other">{0} sentímetru kúbiku</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>pé kúbiku</displayName>
-				<unitPattern count="other">{0} pé kúbiku</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>pulegada kúbiku</displayName>
-				<unitPattern count="other">{0} pulegada kúbiku</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kilómetru kúbiku</displayName>
 				<unitPattern count="other">{0} kilómetru kúbiku</unitPattern>
@@ -2572,6 +2586,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>métru kúbiku</displayName>
 				<unitPattern count="other">{0} métru kúbiku</unitPattern>
 			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>sentímetru kúbiku</displayName>
+				<unitPattern count="other">{0} sentímetru kúbiku</unitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>milha kúbiku</displayName>
 				<unitPattern count="other">{0} milha kúbiku</unitPattern>
@@ -2580,21 +2598,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>jarda kúbiku</displayName>
 				<unitPattern count="other">{0} jarda kúbiku</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>xávina</displayName>
-				<unitPattern count="other">{0} xávina</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>pé kúbiku</displayName>
+				<unitPattern count="other">{0} pé kúbiku</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>desilitru</displayName>
-				<unitPattern count="other">{0} desilitru</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>pulegada kúbiku</displayName>
+				<unitPattern count="other">{0} pulegada kúbiku</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>ónsa fluídu</displayName>
-				<unitPattern count="other">{0} ónsa fluídu</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>galãu</displayName>
-				<unitPattern count="other">{0} galãu</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megalitru</displayName>
+				<unitPattern count="other">{0} megalitru</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>ektolitru</displayName>
@@ -2604,22 +2618,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>litru</displayName>
 				<unitPattern count="other">{0} litru</unitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalitru</displayName>
-				<unitPattern count="other">{0} megalitru</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>desilitru</displayName>
+				<unitPattern count="other">{0} desilitru</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>sentilitru</displayName>
+				<unitPattern count="other">{0} sentilitru</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mililitru</displayName>
 				<unitPattern count="other">{0} mililitru</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pint</displayName>
-				<unitPattern count="other">{0} pint</unitPattern>
+			<unit type="volume-acre-foot">
+				<displayName>ákri-pé</displayName>
+				<unitPattern count="other">{0} ákri-pé</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galãu</displayName>
+				<unitPattern count="other">{0} galãu</unitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>kuart</displayName>
 				<unitPattern count="other">{0} kuart</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pint</displayName>
+				<unitPattern count="other">{0} pint</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>xávina</displayName>
+				<unitPattern count="other">{0} xávina</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>ónsa fluídu</displayName>
+				<unitPattern count="other">{0} ónsa fluídu</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>kudjer di sopa</displayName>
 				<unitPattern count="other">{0} kudjer di sopa</unitPattern>
@@ -2638,6 +2672,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m/s²</displayName>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>grau</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>arcmin</displayName>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -2646,26 +2688,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>arcsec</displayName>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>grau</displayName>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ac</displayName>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ha</displayName>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="other">{0} m²</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="other">{0} cm²</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ac</displayName>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="other">{0} yd²</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<displayName>ft²</displayName>
 				<unitPattern count="other">{0} ft²</unitPattern>
@@ -2674,21 +2724,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>in²</displayName>
 				<unitPattern count="other">{0} in²</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
@@ -2698,45 +2736,57 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>mpg</displayName>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>b</displayName>
-				<unitPattern count="other">{0} b</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>B</displayName>
-				<unitPattern count="other">{0} B</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>Kb</displayName>
-				<unitPattern count="other">{0} Kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>KB</displayName>
-				<unitPattern count="other">{0} KB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="other">{0} MB</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>TB</displayName>
+				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>Tb</displayName>
 				<unitPattern count="other">{0} Tb</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>TB</displayName>
-				<unitPattern count="other">{0} TB</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>KB</displayName>
+				<unitPattern count="other">{0} KB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>Kb</displayName>
+				<unitPattern count="other">{0} Kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>B</displayName>
+				<unitPattern count="other">{0} B</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>b</displayName>
+				<unitPattern count="other">{0} b</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>anu</displayName>
+				<unitPattern count="other">{0} anu</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mes</displayName>
+				<unitPattern count="other">{0} mes</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>sim.</displayName>
+				<unitPattern count="other">{0} sim.</unitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>dia</displayName>
@@ -2747,38 +2797,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} h</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min.</displayName>
 				<unitPattern count="other">{0} min.</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>mes</displayName>
-				<unitPattern count="other">{0} mes</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="other">{0} ns</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>sig.</displayName>
 				<unitPattern count="other">{0} sig.</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>sim.</displayName>
-				<unitPattern count="other">{0} sim.</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>anu</displayName>
-				<unitPattern count="other">{0} anu</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amp</displayName>
@@ -2796,6 +2834,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>volt</displayName>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="other">{0} cal</unitPattern>
@@ -2804,10 +2846,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Cal</displayName>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="other">{0} kJ</unitPattern>
@@ -2820,29 +2858,57 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>GHz</displayName>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>ua</displayName>
-				<unitPattern count="other">{0} ua</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="other">{0} km</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="other">{0} m</unitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>dm</displayName>
+				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
 				<displayName>cm</displayName>
 				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
-			<unit type="length-decimeter">
-				<displayName>dm</displayName>
-				<unitPattern count="other">{0} dm</unitPattern>
+			<unit type="length-millimeter">
+				<displayName>mm</displayName>
+				<unitPattern count="other">{0} mm</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nm</displayName>
+				<unitPattern count="other">{0} nm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>pm</displayName>
+				<unitPattern count="other">{0} pm</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>yd</displayName>
+				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
 			<unit type="length-foot">
 				<displayName>pé</displayName>
@@ -2852,72 +2918,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>in</displayName>
 				<unitPattern count="other">{0} in</unitPattern>
 			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="other">{0} km</unitPattern>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="other">{0} pc</unitPattern>
 			</unit>
 			<unit type="length-light-year">
 				<displayName>anu-lus</displayName>
 				<unitPattern count="other">{0} anu-lus</unitPattern>
 			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mi</displayName>
-				<unitPattern count="other">{0} mi</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>mm</displayName>
-				<unitPattern count="other">{0} mm</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<displayName>nm</displayName>
-				<unitPattern count="other">{0} nm</unitPattern>
+			<unit type="length-astronomical-unit">
+				<displayName>ua</displayName>
+				<unitPattern count="other">{0} ua</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
 				<displayName>nmi</displayName>
 				<unitPattern count="other">{0} nmi</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName>pm</displayName>
-				<unitPattern count="other">{0} pm</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<displayName>yd</displayName>
-				<unitPattern count="other">{0} yd</unitPattern>
-			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-gram">
+				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="other">{0} µg</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>tn</displayName>
+				<unitPattern count="other">{0} tn</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="other">{0} lb</unitPattern>
+			</unit>
 			<unit type="mass-ounce">
 				<displayName>oz</displayName>
 				<unitPattern count="other">{0} oz</unitPattern>
@@ -2926,46 +2969,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>oz t</displayName>
 				<unitPattern count="other">{0} oz t</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="other">{0} lb</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<displayName>tn</displayName>
-				<unitPattern count="other">{0} tn</unitPattern>
+			<unit type="mass-carat">
+				<unitPattern count="other">{0} CD</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watt</displayName>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="other">{0} mm Hg</unitPattern>
@@ -2974,9 +3004,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>psi</displayName>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -2994,26 +3028,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>K</displayName>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="other">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="other">{0} km³</unitPattern>
@@ -3022,6 +3036,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="other">{0} m³</unitPattern>
 			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="other">{0} cm³</unitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
 				<unitPattern count="other">{0} mi³</unitPattern>
@@ -3030,21 +3048,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>yd³</displayName>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>xáv.</displayName>
-				<unitPattern count="other">{0} xáv.</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="other">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -3054,22 +3068,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>l</displayName>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="other">{0} gal</unitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>xáv.</displayName>
+				<unitPattern count="other">{0} xáv.</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>k.sp.</displayName>
 				<unitPattern count="other">{0} k.sp.</unitPattern>
@@ -3080,6 +3114,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 		</unitLength>
 		<unitLength type="narrow">
+			<unit type="duration-year">
+				<displayName>anu</displayName>
+				<unitPattern count="other">{0} anu</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mes</displayName>
+				<unitPattern count="other">{0} mes</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>sim.</displayName>
+				<unitPattern count="other">{0} sim.</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>dia</displayName>
 				<unitPattern count="other">{0} dia</unitPattern>
@@ -3088,33 +3134,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ora</displayName>
 				<unitPattern count="other">{0} h</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min.</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} min.</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>mes</displayName>
-				<unitPattern count="other">{0} mes</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>sig.</displayName>
 				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>sim.</displayName>
-				<unitPattern count="other">{0} sim.</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>anu</displayName>
-				<unitPattern count="other">{0} anu</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
@@ -3124,17 +3154,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m</displayName>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="other">{0} cm</unitPattern>
+			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
+			<unit type="mass-gram">
+				<unitPattern count="other">{0} g</unitPattern>
+			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
 				<unitPattern count="other">{0} km/h</unitPattern>
@@ -3158,18 +3192,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<listPattern>
 			<listPatternPart type="start">{0}, {1}</listPatternPart>
 			<listPatternPart type="middle">{0}, {1}</listPatternPart>
-			<listPatternPart type="end">{0} y {1}</listPatternPart>
-			<listPatternPart type="2">{0} y {1}</listPatternPart>
+			<listPatternPart type="end">{0} i {1}</listPatternPart>
+			<listPatternPart type="2">{0} i {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit">
 			<listPatternPart type="start">{0}, {1}</listPatternPart>
 			<listPatternPart type="middle">{0}, {1}</listPatternPart>
-			<listPatternPart type="end">{0} y {1}</listPatternPart>
-			<listPatternPart type="2">{0} y {1}</listPatternPart>
+			<listPatternPart type="end">{0} i {1}</listPatternPart>
+			<listPatternPart type="2">{0} i {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-narrow">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-short">
 			<listPatternPart type="start">{0}, {1}</listPatternPart>
 			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
 		</listPattern>
 	</listPatterns>
 	<posix>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kea_CV.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kea_CV.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kea_CV.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kea_CV.xml
index e5798b7ff5c..5c43e7fd6f5 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kea_CV.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kea_CV.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="kea"/>
 		<territory type="CV"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/khq.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/khq.xml
similarity index 95%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/khq.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/khq.xml
index 534056c8390..f93290b79a5 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/khq.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/khq.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="khq"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angiiya</territory>
 			<territory type="AL">Albaani</territory>
 			<territory type="AM">Armeeni</territory>
-			<territory type="AN">Hollandu Antiiyey Laboo</territory>
 			<territory type="AO">Angoola</territory>
 			<territory type="AR">Argentine</territory>
 			<territory type="AS">Ameriki Samoa</territory>
@@ -447,6 +445,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">Adduha</dayPeriod>
+							<dayPeriod type="pm">Aluula</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">Adduha</dayPeriod>
 							<dayPeriod type="pm">Aluula</dayPeriod>
@@ -579,6 +581,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">0K¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -758,3 +776,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/khq_ML.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/khq_ML.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/khq_ML.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/khq_ML.xml
index b0ee19a5878..153e81ecc65 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/khq_ML.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/khq_ML.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="khq"/>
 		<territory type="ML"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ki.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ki.xml
similarity index 94%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ki.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ki.xml
index 1fedeb283cb..ba3355f0777 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ki.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ki.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="ki"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antili za Uholanzi</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Ajentina</territory>
 			<territory type="AS">Samoa ya Marekani</territory>
@@ -448,6 +446,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">Kiroko</dayPeriod>
+							<dayPeriod type="pm">Hwaĩ-inĩ</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">Kiroko</dayPeriod>
 							<dayPeriod type="pm">Hwaĩ-inĩ</dayPeriod>
@@ -489,22 +491,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -581,6 +583,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -758,3 +776,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ki_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ki_KE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ki_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ki_KE.xml
index d1a12257643..dd154fc81ae 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ki_KE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ki_KE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ki"/>
 		<territory type="KE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kk.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kk.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kk.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kk.xml
index e40e31e4a9b..f83c3ed79a7 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kk.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kk.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="kk"/>
 	</identity>
 	<localeDisplayNames>
@@ -18,244 +17,252 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</localeDisplayPattern>
 		<languages>
 			<language type="ab">абхаз тілі</language>
-			<language type="af">африкаанс</language>
-			<language type="agq">агхем</language>
-			<language type="ak">акан</language>
-			<language type="am">амхар</language>
+			<language type="af">африкаанс тілі</language>
+			<language type="agq">агхем тілі</language>
+			<language type="ak">акан тілі</language>
+			<language type="am">амхар тілі</language>
 			<language type="ar">араб тілі</language>
 			<language type="ar_001">қазіргі стандартты араб тілі</language>
-			<language type="arn">мапуче</language>
+			<language type="arn">мапуче тілі</language>
 			<language type="as">ассам тілі</language>
-			<language type="asa">асу</language>
+			<language type="asa">асу тілі</language>
 			<language type="ay" draft="unconfirmed">Аймара</language>
 			<language type="az">әзірбайжан тілі</language>
+			<language type="az" alt="short">әзери тілі</language>
 			<language type="ba">башқұрт тілі</language>
-			<language type="be">беларус тілі</language>
-			<language type="bem">бемба</language>
-			<language type="bez">бена</language>
+			<language type="be">беларусь тілі</language>
+			<language type="bem">бемба тілі</language>
+			<language type="bez">бена тілі</language>
 			<language type="bg">болгар тілі</language>
-			<language type="bm">бамбара</language>
+			<language type="bgn">батыс балучи тілі</language>
+			<language type="bm">бамбара тілі</language>
 			<language type="bn">бенгал тілі</language>
 			<language type="bo">тибет тілі</language>
 			<language type="br">бретон тілі</language>
 			<language type="brx">бодо тілі</language>
 			<language type="bs">босния тілі</language>
-			<language type="ca">каталан</language>
-			<language type="cgg">кига</language>
+			<language type="ca">каталан тілі</language>
+			<language type="ce">шешен тілі</language>
+			<language type="cgg">кига тілі</language>
 			<language type="chr">чероки тілі</language>
 			<language type="ckb">сорани тілі</language>
-			<language type="co">корсикан тілі</language>
+			<language type="co">корсика тілі</language>
 			<language type="cs">чех тілі</language>
-			<language type="cy">валлий</language>
-			<language type="da">дат</language>
-			<language type="dav">таита</language>
+			<language type="cv">чуваш тілі</language>
+			<language type="cy">валлий тілі</language>
+			<language type="da">дат тілі</language>
+			<language type="dav">таита тілі</language>
 			<language type="de">неміс тілі</language>
 			<language type="de_AT">австриялық неміс тілі</language>
-			<language type="de_CH">неміс тілінің швейцариялық диалекті</language>
-			<language type="dje">зарма</language>
+			<language type="de_CH">швейцариялық жоғарғы неміс тілі</language>
+			<language type="dje">зарма тілі</language>
 			<language type="dsb">төменгі лужица тілі</language>
-			<language type="dua">дуала</language>
+			<language type="dua">дуала тілі</language>
 			<language type="dv" draft="unconfirmed">Мальдив</language>
-			<language type="dyo">диола</language>
-			<language type="dz">дзонг-кэ</language>
-			<language type="ebu">ембу</language>
-			<language type="ee">эве</language>
+			<language type="dyo">диола тілі</language>
+			<language type="dz">дзонг-кэ тілі</language>
+			<language type="ebu">ембу тілі</language>
+			<language type="ee">эве тілі</language>
 			<language type="efi" draft="unconfirmed">эфик</language>
 			<language type="el">грек тілі</language>
 			<language type="en">ағылшын тілі</language>
 			<language type="en_AU">австралиялық ағылшын тілі</language>
 			<language type="en_CA">канадалық ағылшын тілі</language>
 			<language type="en_GB">британиялық ағылшын тілі</language>
-			<language type="en_GB" alt="short">ағылшын тілі (Біріккен Корольдік)</language>
 			<language type="en_US">американдық ағылшын тілі</language>
-			<language type="eo">эсперанто</language>
+			<language type="eo">эсперанто тілі</language>
 			<language type="es">испан тілі</language>
 			<language type="es_419">латын американдық испан тілі</language>
 			<language type="es_ES">ибериялық испан тілі</language>
 			<language type="es_MX">мексикалық испан тілі</language>
 			<language type="et">эстон тілі</language>
-			<language type="eu">баск</language>
+			<language type="eu">баск тілі</language>
 			<language type="fa">парсы тілі</language>
-			<language type="fi">фин</language>
-			<language type="fil">филиппин</language>
-			<language type="fj">фиджи</language>
-			<language type="fo">фарер</language>
+			<language type="fi">фин тілі</language>
+			<language type="fil">филиппин тілі</language>
+			<language type="fj">фиджи тілі</language>
+			<language type="fo">фарер тілі</language>
 			<language type="fr">француз тілі</language>
 			<language type="fr_CA">канадалық француз тілі</language>
 			<language type="fr_CH">швейцариялық француз тілі</language>
-			<language type="fy">батыс фриз</language>
+			<language type="fy">батыс фриз тілі</language>
 			<language type="ga">ирланд тілі</language>
-			<language type="gag">гагауз</language>
+			<language type="gag">гагауз тілі</language>
 			<language type="gd" draft="unconfirmed">Солтүстік Шотландия</language>
-			<language type="gl">гали</language>
-			<language type="gn">гуарани</language>
+			<language type="gl">галисия тілі</language>
+			<language type="gn">гуарани тілі</language>
 			<language type="gsw">швейцариялық неміс тілі</language>
-			<language type="gu">гуджарати</language>
-			<language type="guz">гусии</language>
-			<language type="gv">мэнс</language>
-			<language type="ha">хауса</language>
-			<language type="haw">гавай</language>
-			<language type="he">иврит</language>
-			<language type="hi">хинди</language>
-			<language type="hr">хорват</language>
-			<language type="hsb">жоғарғы лужица</language>
-			<language type="ht">гаитян</language>
-			<language type="hu">венгер</language>
+			<language type="gu">гуджарати тілі</language>
+			<language type="guz">гусии тілі</language>
+			<language type="gv">мэнс тілі</language>
+			<language type="ha">хауса тілі</language>
+			<language type="haw">гавайи тілі</language>
+			<language type="he">иврит тілі</language>
+			<language type="hi">хинди тілі</language>
+			<language type="hr">хорват тілі</language>
+			<language type="hsb">жоғарғы лужица тілі</language>
+			<language type="ht">гаити тілі</language>
+			<language type="hu">венгр тілі</language>
 			<language type="hy">армян тілі</language>
 			<language type="ia" draft="unconfirmed">интерлингва</language>
-			<language type="id">индонез тілі</language>
+			<language type="id">индонезия тілі</language>
 			<language type="ie" draft="unconfirmed">интерлингве</language>
-			<language type="ig">игбо</language>
+			<language type="ig">игбо тілі</language>
 			<language type="ii">сычуан и тілі</language>
-			<language type="is">исланд</language>
+			<language type="is">исланд тілі</language>
 			<language type="it">итальян тілі</language>
-			<language type="iu">инуктитут</language>
+			<language type="iu">инуктитут тілі</language>
 			<language type="ja">жапон тілі</language>
-			<language type="jgo">нгомба</language>
-			<language type="jmc">мачаме</language>
-			<language type="jv">ява</language>
+			<language type="jgo">нгомба тілі</language>
+			<language type="jmc">мачаме тілі</language>
+			<language type="jv">ява тілі</language>
 			<language type="ka">грузин тілі</language>
-			<language type="kab">кабил</language>
-			<language type="kam">камба</language>
-			<language type="kde">маконде</language>
-			<language type="kea">кабувердиана</language>
-			<language type="khq">койра чини</language>
-			<language type="ki">кикуйю</language>
+			<language type="kab">кабил тілі</language>
+			<language type="kam">камба тілі</language>
+			<language type="kde">маконде тілі</language>
+			<language type="kea">кабувердиана тілі</language>
+			<language type="khq">койра чини тілі</language>
+			<language type="ki">кикуйю тілі</language>
 			<language type="kk">қазақ тілі</language>
-			<language type="kl">калаалисут</language>
-			<language type="kln">каленжин</language>
-			<language type="km">кхмер</language>
-			<language type="kn">каннада</language>
+			<language type="kl">калаалисут тілі</language>
+			<language type="kln">каленжин тілі</language>
+			<language type="km">кхмер тілі</language>
+			<language type="kn">каннада тілі</language>
 			<language type="ko">кәріс тілі</language>
-			<language type="koi">коми-пермь тілі</language>
-			<language type="kok">конкани</language>
+			<language type="koi">коми-пермяк тілі</language>
+			<language type="kok">конкани тілі</language>
 			<language type="ks">кашмир тілі</language>
-			<language type="ksb">шамбала</language>
-			<language type="ksf">бафиа</language>
+			<language type="ksb">шамбала тілі</language>
+			<language type="ksf">бафиа тілі</language>
 			<language type="ku">күрд тілі</language>
-			<language type="kw">корниш</language>
+			<language type="kw">корн тілі</language>
 			<language type="ky">қырғыз тілі</language>
-			<language type="la">латын</language>
+			<language type="la">латын тілі</language>
 			<language type="lag">ланги тілі</language>
-			<language type="lb">люксембург</language>
-			<language type="lg">ганда</language>
-			<language type="lkt">лакота</language>
-			<language type="ln">лингала</language>
+			<language type="lb">люксембург тілі</language>
+			<language type="lg">ганда тілі</language>
+			<language type="lkt">лакота тілі</language>
+			<language type="ln">лингала тілі</language>
 			<language type="lo">лаос тілі</language>
+			<language type="lrc">солтүстік люри тілі</language>
 			<language type="lt">литва тілі</language>
-			<language type="lu">луба-катанга</language>
-			<language type="luo">луо</language>
-			<language type="luy">лухиа</language>
+			<language type="lu">луба-катанга тілі</language>
+			<language type="luo">луо тілі</language>
+			<language type="luy">лухиа тілі</language>
 			<language type="lv">латыш тілі</language>
-			<language type="mas">масай</language>
-			<language type="mer">меру</language>
-			<language type="mfe">морисиен</language>
-			<language type="mg">малагаси</language>
-			<language type="mgh">макуа-меетто</language>
-			<language type="mgo">мета</language>
-			<language type="mi">маори</language>
+			<language type="mas">масай тілі</language>
+			<language type="mer">меру тілі</language>
+			<language type="mfe">морисиен тілі</language>
+			<language type="mg">малагаси тілі</language>
+			<language type="mgh">макуа-меетто тілі</language>
+			<language type="mgo">мета тілі</language>
+			<language type="mi">маори тілі</language>
 			<language type="mk">македон тілі</language>
-			<language type="ml">малайялам</language>
+			<language type="ml">малаялам тілі</language>
 			<language type="mn">моңғол тілі</language>
-			<language type="moh">мохоки</language>
-			<language type="mr">маратхи</language>
-			<language type="ms">малай</language>
-			<language type="mt">мальта</language>
-			<language type="mua">мунданг</language>
-			<language type="my">бирман</language>
-			<language type="naq">нама</language>
-			<language type="nb">норвегиялық букмол</language>
-			<language type="nd">солтүстік ндебел</language>
-			<language type="ne">непал</language>
+			<language type="moh">могавк тілі</language>
+			<language type="mr">маратхи тілі</language>
+			<language type="ms">малай тілі</language>
+			<language type="mt">мальта тілі</language>
+			<language type="mua">мунданг тілі</language>
+			<language type="my">бирма тілі</language>
+			<language type="mzn">мазандеран тілі</language>
+			<language type="naq">нама тілі</language>
+			<language type="nb">норвегиялық букмол тілі</language>
+			<language type="nd">солтүстік ндебеле тілі</language>
+			<language type="nds">төменгі неміс тілі</language>
+			<language type="nds_NL">төменгі саксон тілі</language>
+			<language type="ne">непал тілі</language>
 			<language type="nl">нидерланд тілі</language>
 			<language type="nl_BE">фламанд тілі</language>
-			<language type="nmg">квасио</language>
-			<language type="nn">норвегиялық нинорск</language>
+			<language type="nmg">квасио тілі</language>
+			<language type="nn">норвегиялық нюнорск тілі</language>
 			<language type="no" draft="unconfirmed">норвег</language>
-			<language type="nqo">нко</language>
+			<language type="nqo">нко тілі</language>
 			<language type="nso" draft="unconfirmed">Солтүстік сотхо</language>
-			<language type="nus">нуер</language>
+			<language type="nus">нуэр тілі</language>
 			<language type="ny" draft="unconfirmed">ньянджа</language>
-			<language type="nyn">нианколе</language>
+			<language type="nyn">нианколе тілі</language>
 			<language type="oc" draft="unconfirmed">окситан</language>
-			<language type="om">оромо</language>
-			<language type="or">ория</language>
+			<language type="om">оромо тілі</language>
+			<language type="or">ория тілі</language>
 			<language type="os" draft="unconfirmed">осетин</language>
-			<language type="pa">пенджаб</language>
+			<language type="pa">пенджаб тілі</language>
 			<language type="pl">поляк тілі</language>
-			<language type="ps">пушту</language>
+			<language type="ps">пушту тілі</language>
 			<language type="pt">португал тілі</language>
 			<language type="pt_BR">бразилиялық португал тілі</language>
 			<language type="pt_PT">еуропалық португал тілі</language>
-			<language type="qu">кечуа</language>
-			<language type="quc">киче</language>
-			<language type="rm">романш</language>
-			<language type="rn">рунди</language>
-			<language type="ro">румын</language>
+			<language type="qu">кечуа тілі</language>
+			<language type="quc">киче тілі</language>
+			<language type="rm">романш тілі</language>
+			<language type="rn">рунди тілі</language>
+			<language type="ro">румын тілі</language>
 			<language type="ro_MD">молдован тілі</language>
-			<language type="rof">ромбо</language>
+			<language type="rof">ромбо тілі</language>
 			<language type="ru">орыс тілі</language>
-			<language type="rw">киньяруанда</language>
-			<language type="rwk">руа</language>
-			<language type="sa">санскрит</language>
+			<language type="rw">киньяруанда тілі</language>
+			<language type="rwk">руа тілі</language>
+			<language type="sa">санскрит тілі</language>
 			<language type="sah" draft="unconfirmed">якут</language>
-			<language type="saq">самбуру</language>
-			<language type="sbp">сангу</language>
-			<language type="sd">синдхи</language>
-			<language type="se">солтүстік сами</language>
-			<language type="seh">сена</language>
-			<language type="ses">койраборо сенни</language>
-			<language type="sg">санго</language>
+			<language type="saq">самбуру тілі</language>
+			<language type="sbp">сангу тілі</language>
+			<language type="sd">синдхи тілі</language>
+			<language type="sdh">оңтүстік күрд тілі</language>
+			<language type="se">солтүстік саам тілі</language>
+			<language type="seh">сена тілі</language>
+			<language type="ses">койраборо сенни тілі</language>
+			<language type="sg">санго тілі</language>
 			<language type="sh" draft="unconfirmed">сербхорват</language>
-			<language type="shi">ташелхит</language>
-			<language type="si">сингал</language>
-			<language type="sk">словак</language>
-			<language type="sl">словен</language>
-			<language type="sma">оңтүстік саами</language>
-			<language type="smj">луле саам</language>
-			<language type="smn">инари саам</language>
+			<language type="shi">ташелхит тілі</language>
+			<language type="si">сингал тілі</language>
+			<language type="sk">словак тілі</language>
+			<language type="sl">словен тілі</language>
+			<language type="sma">оңтүстік саам тілі</language>
+			<language type="smj">луле саам тілі</language>
+			<language type="smn">инари саам тілі</language>
 			<language type="sms">сколт саам</language>
-			<language type="sn">шона</language>
-			<language type="so">сомали</language>
-			<language type="sq">албан</language>
+			<language type="sn">шона тілі</language>
+			<language type="so">сомали тілі</language>
+			<language type="sq">албан тілі</language>
 			<language type="sr">серб тілі</language>
 			<language type="st" draft="unconfirmed">сесото</language>
-			<language type="su">судан</language>
-			<language type="sv">швед</language>
-			<language type="sw">суахили</language>
-			<language type="swc">конго суахили тілі</language>
-			<language type="ta">тамил</language>
-			<language type="te">телугу</language>
-			<language type="teo">тесо</language>
+			<language type="sv">швед тілі</language>
+			<language type="sw">суахили тілі</language>
+			<language type="sw_CD">конго суахили тілі</language>
+			<language type="ta">тамил тілі</language>
+			<language type="te">телугу тілі</language>
+			<language type="teo">тесо тілі</language>
 			<language type="tg">тәжік тілі</language>
-			<language type="th">тай</language>
-			<language type="ti">тигринья</language>
-			<language type="tk">түрікмен</language>
+			<language type="th">тай тілі</language>
+			<language type="ti">тигринья тілі</language>
+			<language type="tk">түрікмен тілі</language>
 			<language type="tlh" draft="unconfirmed">клингон</language>
-			<language type="to">тонган</language>
-			<language type="tr">түрік</language>
+			<language type="to">тонган тілі</language>
+			<language type="tr">түрік тілі</language>
 			<language type="tt">татар тілі</language>
 			<language type="tw" draft="unconfirmed">тви</language>
-			<language type="twq">тасавак</language>
+			<language type="twq">тасавак тілі</language>
 			<language type="tzm">орталық атлас тамасагихт тілі</language>
 			<language type="ug">ұйғыр тілі</language>
 			<language type="uk">украин тілі</language>
 			<language type="und">белгісіз тіл</language>
-			<language type="ur">урду</language>
-			<language type="uz">өзбек</language>
-			<language type="vai">вай</language>
-			<language type="vi">вьетнам</language>
-			<language type="vun">вунджо</language>
-			<language type="wo">волоф</language>
-			<language type="xh">ксоза</language>
-			<language type="xog">сога</language>
+			<language type="ur">урду тілі</language>
+			<language type="uz">өзбек тілі</language>
+			<language type="vai">вай тілі</language>
+			<language type="vi">вьетнам тілі</language>
+			<language type="vun">вунджо тілі</language>
+			<language type="wbp">вальбири тілі</language>
+			<language type="wo">волоф тілі</language>
+			<language type="xh">кхоса тілі</language>
+			<language type="xog">сога тілі</language>
 			<language type="yi" draft="unconfirmed">идиш</language>
-			<language type="yo">йоруба</language>
-			<language type="zgh">марокколық стандартты тамазигхт</language>
+			<language type="yo">йоруба тілі</language>
+			<language type="zgh">марокколық стандартты тамазигхт тілі</language>
 			<language type="zh">қытай тілі</language>
 			<language type="zh_Hans">жеңілдетілген қытай тілі</language>
 			<language type="zh_Hant">дәстүрлі қытай тілі</language>
-			<language type="zu">зулу</language>
+			<language type="zu">зулу тілі</language>
 			<language type="zxx">тілдік мазмұны жоқ</language>
 		</languages>
 		<scripts>
@@ -287,8 +294,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Laoo">лаос жазуы</script>
 			<script type="Latn">латын жазуы</script>
 			<script type="Mlym">малаялам жазуы</script>
-			<script type="Mong">монғол жазуы</script>
-			<script type="Mymr">маянмар жазуы</script>
+			<script type="Mong">моңғол жазуы</script>
+			<script type="Mymr">мьянма жазуы</script>
 			<script type="Orya">ория жазуы</script>
 			<script type="Sinh">сингаль жазуы</script>
 			<script type="Taml">тамиль жазуы</script>
@@ -299,7 +306,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Zsym">таңбалар</script>
 			<script type="Zxxx">жазусыз</script>
 			<script type="Zyyy">жалпы</script>
-			<script type="Zzzz">белгісіз жазба</script>
+			<script type="Zzzz">белгісіз жазу</script>
 		</scripts>
 		<territories>
 			<territory type="001">Әлем</territory>
@@ -313,7 +320,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="015">Солтүстік Африка</territory>
 			<territory type="017">Орталық Африка</territory>
 			<territory type="018">Оңтүстік Африка</territory>
-			<territory type="019">Америкалар</territory>
+			<territory type="019">Солтүстік және Оңтүстік Америка</territory>
 			<territory type="021">Американың солтүстігі</territory>
 			<territory type="029">Кариб</territory>
 			<territory type="030">Шығыс Азия</territory>
@@ -322,7 +329,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="039">Оңтүстік Еуропа</territory>
 			<territory type="053">Австралазия</territory>
 			<territory type="054">Меланезия</territory>
-			<territory type="057">Микронезия регионы</territory>
+			<territory type="057">Микронезия аймағы</territory>
 			<territory type="061">Полинезия</territory>
 			<territory type="142">Азия</territory>
 			<territory type="143">Орталық Азия</territory>
@@ -332,9 +339,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="154">Солтүстік Еуропа</territory>
 			<territory type="155">Батыс Еуропа</territory>
 			<territory type="419">Латын Америкасы</territory>
-			<territory type="AC">Ғибадат аралы</territory>
+			<territory type="AC">Әскенжін аралы</territory>
 			<territory type="AD">Андорра</territory>
-			<territory type="AE">Біріккен Араб Эмираттары</territory>
+			<territory type="AE">Біріккен Араб Әмірліктері</territory>
 			<territory type="AF">Ауғанстан</territory>
 			<territory type="AG">Антигуа мен Барбуда</territory>
 			<territory type="AI">Ангилья</territory>
@@ -343,12 +350,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AO">Ангола</territory>
 			<territory type="AQ">Антарктика</territory>
 			<territory type="AR">Аргентина</territory>
-			<territory type="AS">Американ Самоасы</territory>
+			<territory type="AS">Американдық Самоа</territory>
 			<territory type="AT">Австрия</territory>
 			<territory type="AU">Австралия</territory>
 			<territory type="AW">Аруба</territory>
 			<territory type="AX">Аланд аралдары</territory>
-			<territory type="AZ">Әзербайжан</territory>
+			<territory type="AZ">Әзірбайжан</territory>
 			<territory type="BA">Босния және Герцеговина</territory>
 			<territory type="BB">Барбадос</territory>
 			<territory type="BD">Бангладеш</territory>
@@ -371,7 +378,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BY">Беларусь</territory>
 			<territory type="BZ">Белиз</territory>
 			<territory type="CA">Канада</territory>
-			<territory type="CC">Кокос аралдары</territory>
+			<territory type="CC">Кокос (Килинг) аралдары</territory>
 			<territory type="CD">Конго</territory>
 			<territory type="CD" alt="variant">Конго Демократиялық Республикасы</territory>
 			<territory type="CF">Орталық Африка Республикасы</territory>
@@ -379,7 +386,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CG" alt="variant">Конго Республикасы</territory>
 			<territory type="CH">Швейцария</territory>
 			<territory type="CI">Кот-д’Ивуар</territory>
-			<territory type="CI" alt="variant">Піл сүйегі жағалауы Республикасы</territory>
+			<territory type="CI" alt="variant">Піл Сүйегі Жағалауы</territory>
 			<territory type="CK">Кук аралдары</territory>
 			<territory type="CL">Чили</territory>
 			<territory type="CM">Камерун</territory>
@@ -417,8 +424,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="FO">Фарер аралдары</territory>
 			<territory type="FR">Франция</territory>
 			<territory type="GA">Габон</territory>
-			<territory type="GB">Бірікккен Корольдік</territory>
-			<territory type="GB" alt="short">БК</territory>
+			<territory type="GB">Біріккен Корольдік</territory>
+			<territory type="GB" alt="short">Біріккен Корольдік</territory>
 			<territory type="GD">Гренада</territory>
 			<territory type="GE">Грузия</territory>
 			<territory type="GF">Француз Гвианасы</territory>
@@ -431,14 +438,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GP">Гваделупа</territory>
 			<territory type="GQ">Экваторлық Гвинея</territory>
 			<territory type="GR">Греция</territory>
-			<territory type="GS">Оңтүстік Георгия және Оңтүстік Сандвичев аралы</territory>
+			<territory type="GS">Оңтүстік Георгия және Оңтүстік Сандвич аралдары</territory>
 			<territory type="GT">Гватемала</territory>
 			<territory type="GU">Гуам</territory>
 			<territory type="GW">Гвинея-Бисау</territory>
 			<territory type="GY">Гайана</territory>
 			<territory type="HK">Қытай Халық Республикасының Гонг-Конг арнайы әкімшілік ауданы</territory>
 			<territory type="HK" alt="short">Гонконг</territory>
-			<territory type="HM">Херд аралы мен Макдональд аралы</territory>
+			<territory type="HM">Херд аралы мен Макдональд аралдары</territory>
 			<territory type="HN">Гондурас</territory>
 			<territory type="HR">Хорватия</territory>
 			<territory type="HT">Гаити</territory>
@@ -464,8 +471,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="KI">Кирибати</territory>
 			<territory type="KM">Комор</territory>
 			<territory type="KN">Сент-Китс және Невис</territory>
-			<territory type="KP">Оңтүстік Корея</territory>
-			<territory type="KR">Солтүстік Корея</territory>
+			<territory type="KP">Солтүстік Корея</territory>
+			<territory type="KR">Оңтүстік Корея</territory>
 			<territory type="KW">Кувейт</territory>
 			<territory type="KY">Кайман аралдары</territory>
 			<territory type="KZ">Қазақстан</territory>
@@ -479,7 +486,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="LT">Литва</territory>
 			<territory type="LU">Люксембург</territory>
 			<territory type="LV">Латвия</territory>
-			<territory type="LY">Либия</territory>
+			<territory type="LY">Ливия</territory>
 			<territory type="MA">Морокко</territory>
 			<territory type="MC">Монако</territory>
 			<territory type="MD">Молдова</territory>
@@ -511,7 +518,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="NF">Норфолк аралы</territory>
 			<territory type="NG">Нигерия</territory>
 			<territory type="NI">Никарагуа</territory>
-			<territory type="NL">Голландия</territory>
+			<territory type="NL">Нидерланд</territory>
 			<territory type="NO">Норвегия</territory>
 			<territory type="NP">Непал</territory>
 			<territory type="NR">Науру</territory>
@@ -522,7 +529,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="PE">Перу</territory>
 			<territory type="PF">Француз Полинезиясы</territory>
 			<territory type="PG">Папуа — Жаңа Гвинея</territory>
-			<territory type="PH">Филиппиндер</territory>
+			<territory type="PH">Филиппин</territory>
 			<territory type="PK">Пәкістан</territory>
 			<territory type="PL">Польша</territory>
 			<territory type="PM">Сен-Пьер және Микелон</territory>
@@ -562,9 +569,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="SY">Сирия</territory>
 			<territory type="SZ">Свазиленд</territory>
 			<territory type="TA">Тристан-да-Кунья</territory>
-			<territory type="TC">Туркс пен Кайкос</territory>
+			<territory type="TC">Теркс және Кайкос аралдары</territory>
 			<territory type="TD">Чад</territory>
-			<territory type="TF">Францияның солтүстік аймағы</territory>
+			<territory type="TF">Францияның оңтүстік аймақтары</territory>
 			<territory type="TG">Того</territory>
 			<territory type="TH">Тайланд</territory>
 			<territory type="TJ">Тәжікстан</territory>
@@ -581,13 +588,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="TZ">Танзания</territory>
 			<territory type="UA">Украина</territory>
 			<territory type="UG">Уганда</territory>
-			<territory type="UM">АҚШ-тың ішкі кіші аралдары</territory>
+			<territory type="UM">АҚШ-тың сыртқы кіші аралдары</territory>
 			<territory type="US">АҚШ</territory>
 			<territory type="US" alt="short">АҚШ</territory>
 			<territory type="UY">Уругвай</territory>
 			<territory type="UZ">Өзбекстан</territory>
 			<territory type="VA">Ватикан</territory>
-			<territory type="VC">Сент-Винсент және Гренадиндер</territory>
+			<territory type="VC">Сент-Винсент және Гренадин аралдары</territory>
 			<territory type="VE">Венесуэла</territory>
 			<territory type="VG">Британдық Виргин аралдары</territory>
 			<territory type="VI">АҚШ-тың Виргин аралдары</territory>
@@ -598,7 +605,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="XK">Косово</territory>
 			<territory type="YE">Йемен</territory>
 			<territory type="YT">Майотта</territory>
-			<territory type="ZA">Оңтүстік Африка республикасы</territory>
+			<territory type="ZA">Оңтүстік Африка Республикасы</territory>
 			<territory type="ZM">Замбия</territory>
 			<territory type="ZW">Зимбабве</territory>
 			<territory type="ZZ">Белгісіз аймақ</territory>
@@ -613,69 +620,82 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="calendar">Күнтізбе</key>
 			<key type="collation">Сұрыптау реті</key>
 			<key type="currency">Валюта</key>
+			<key type="hc">Уақыт пішімі (12 не 24)</key>
+			<key type="lb">Жолды тасымалдау стилі</key>
+			<key type="ms">Өлшемдер жүйесі</key>
 			<key type="numbers">Сандар</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Үнді-араб сандары</type>
-			<type type="arabext" key="numbers">Үнді-араб сандарының кеңейтілген жүйесі</type>
-			<type type="armn" key="numbers">Армян сандары</type>
-			<type type="armnlow" key="numbers">Кіші әріппен берілген армян сандары</type>
-			<type type="beng" key="numbers">Бенгал сандары</type>
-			<type type="buddhist" key="calendar">Будда күнтізбесі</type>
-			<type type="chinese" key="calendar">Қытай күнтізбесі</type>
-			<type type="dangi" key="calendar">Данги күнтізбесі</type>
-			<type type="deva" key="numbers">Деванагари сандары</type>
-			<type type="ducet" key="collation">Әдепкі уникод сұрыптау реті</type>
-			<type type="ethi" key="numbers">Эфиопия сандары</type>
-			<type type="ethiopic" key="calendar">Эфиопия күнтізбесі</type>
-			<type type="fullwide" key="numbers">Сандардың толық пішімі</type>
-			<type type="geor" key="numbers">Грузин сандары</type>
-			<type type="gregorian" key="calendar">Грегориандық күнтізбе</type>
-			<type type="grek" key="numbers">Грек сандары</type>
-			<type type="greklow" key="numbers">Кіші әріппен берілген грек сандары</type>
-			<type type="gujr" key="numbers">Гуджарати сандары</type>
-			<type type="guru" key="numbers">Гурмукхи сандары</type>
-			<type type="hanidec" key="numbers">Қытай ондық сандары</type>
-			<type type="hans" key="numbers">Қарапайым қытай сандары</type>
-			<type type="hansfin" key="numbers">Қаржы саласындағы қарапайым қытай сандары</type>
-			<type type="hant" key="numbers">Дәстүрлі қытай сандары</type>
-			<type type="hantfin" key="numbers">Қаржы саласындағы дәстүрлі қытай сандары</type>
-			<type type="hebr" key="numbers">Иврит сандары</type>
-			<type type="hebrew" key="calendar">Көне еврей күнтізбесі</type>
-			<type type="indian" key="calendar" draft="unconfirmed">Үндістанның ұлттық күнтізбесі</type>
-			<type type="islamic" key="calendar">Ислам күнтізбесі</type>
-			<type type="islamic-civil" key="calendar" draft="unconfirmed">Ислам азаматтық күнтізбесі</type>
-			<type type="iso8601" key="calendar">ISO-8601 күнтізбесі</type>
-			<type type="japanese" key="calendar">Жапон күнтізбесі</type>
-			<type type="jpan" key="numbers">Жапон сандары</type>
-			<type type="jpanfin" key="numbers">Қаржы саласындағы жапон сандары</type>
-			<type type="khmr" key="numbers">Кхмер сандары</type>
-			<type type="knda" key="numbers">Каннада сандары</type>
-			<type type="laoo" key="numbers">Лаос сандары</type>
-			<type type="latn" key="numbers">Батыс сандары</type>
-			<type type="mlym" key="numbers">Малаялам</type>
-			<type type="mymr" key="numbers">Мьянма сандары</type>
-			<type type="orya" key="numbers">Ория сандары</type>
-			<type type="persian" key="calendar">Парсы күнтізбесі</type>
-			<type type="roc" key="calendar">Мингуо күнтізбесі</type>
-			<type type="roman" key="numbers">Рим сандары</type>
-			<type type="romanlow" key="numbers">Кіші әріппен берілген рим сандары</type>
-			<type type="search" key="collation">Жалпы мақсаттағы іздеу</type>
-			<type type="standard" key="collation">Стандартты сұрыптау реті</type>
-			<type type="taml" key="numbers">Дәстүрлі тамил сандары</type>
-			<type type="tamldec" key="numbers">Тамил сандары</type>
-			<type type="telu" key="numbers">Телугу сандары</type>
-			<type type="thai" key="numbers">Тай сандары</type>
-			<type type="tibt" key="numbers">Тибет сандары</type>
+			<type key="calendar" type="buddhist">Будда күнтізбесі</type>
+			<type key="calendar" type="chinese">Қытай күнтізбесі</type>
+			<type key="calendar" type="dangi">Данги күнтізбесі</type>
+			<type key="calendar" type="ethiopic">Эфиопия күнтізбесі</type>
+			<type key="calendar" type="gregorian">Грегориандық күнтізбе</type>
+			<type key="calendar" type="hebrew">Көне еврей күнтізбесі</type>
+			<type key="calendar" type="indian" draft="unconfirmed">Үндістанның ұлттық күнтізбесі</type>
+			<type key="calendar" type="islamic">Ислам күнтізбесі</type>
+			<type key="calendar" type="islamic-civil" draft="unconfirmed">Ислам азаматтық күнтізбесі</type>
+			<type key="calendar" type="iso8601">ISO-8601 күнтізбесі</type>
+			<type key="calendar" type="japanese">Жапон күнтізбесі</type>
+			<type key="calendar" type="persian">Парсы күнтізбесі</type>
+			<type key="calendar" type="roc">Мингуо күнтізбесі</type>
+			<type key="collation" type="ducet">Әдепкі уникод сұрыптау реті</type>
+			<type key="collation" type="search">Жалпы мақсаттағы іздеу</type>
+			<type key="collation" type="standard">Стандартты сұрыптау реті</type>
+			<type key="hc" type="h11">12 сағаттық жүйе (0–11)</type>
+			<type key="hc" type="h12">12 сағаттық жүйе (1–12)</type>
+			<type key="hc" type="h23">24 сағаттық жүйе (0–23)</type>
+			<type key="hc" type="h24">24 сағаттық жүйе (1–24)</type>
+			<type key="lb" type="loose">Жолды тасымалдаудың еркін стилі</type>
+			<type key="lb" type="normal">Жолды тасымалдаудың қалыпты стилі</type>
+			<type key="lb" type="strict">Жолды тасымалдаудың қатаң стилі</type>
+			<type key="ms" type="metric">Метрлік жүйе</type>
+			<type key="ms" type="uksystem">Империялық өлшемдер жүйесі</type>
+			<type key="ms" type="ussystem">Американдық өлшемдер жүйесі</type>
+			<type key="numbers" type="arab">Үнді-араб сандары</type>
+			<type key="numbers" type="arabext">Үнді-араб сандарының кеңейтілген жүйесі</type>
+			<type key="numbers" type="armn">Армян сандары</type>
+			<type key="numbers" type="armnlow">Кіші әріппен берілген армян сандары</type>
+			<type key="numbers" type="beng">Бенгал сандары</type>
+			<type key="numbers" type="deva">Деванагари сандары</type>
+			<type key="numbers" type="ethi">Эфиопия сандары</type>
+			<type key="numbers" type="fullwide">Сандардың толық пішімі</type>
+			<type key="numbers" type="geor">Грузин сандары</type>
+			<type key="numbers" type="grek">Грек сандары</type>
+			<type key="numbers" type="greklow">Кіші әріппен берілген грек сандары</type>
+			<type key="numbers" type="gujr">Гуджарати сандары</type>
+			<type key="numbers" type="guru">Гурмукхи сандары</type>
+			<type key="numbers" type="hanidec">Қытай ондық сандары</type>
+			<type key="numbers" type="hans">Жеңілдетілген қытай сандары</type>
+			<type key="numbers" type="hansfin">Қаржы саласындағы жеңілдетілген қытай сандары</type>
+			<type key="numbers" type="hant">Дәстүрлі қытай сандары</type>
+			<type key="numbers" type="hantfin">Қаржы саласындағы дәстүрлі қытай сандары</type>
+			<type key="numbers" type="hebr">Иврит сандары</type>
+			<type key="numbers" type="jpan">Жапон сандары</type>
+			<type key="numbers" type="jpanfin">Қаржы саласындағы жапон сандары</type>
+			<type key="numbers" type="khmr">Кхмер сандары</type>
+			<type key="numbers" type="knda">Каннада сандары</type>
+			<type key="numbers" type="laoo">Лаос сандары</type>
+			<type key="numbers" type="latn">Батыс сандары</type>
+			<type key="numbers" type="mlym">Малаялам сандары</type>
+			<type key="numbers" type="mymr">Мьянма сандары</type>
+			<type key="numbers" type="orya">Ория сандары</type>
+			<type key="numbers" type="roman">Рим сандары</type>
+			<type key="numbers" type="romanlow">Кіші әріппен берілген рим сандары</type>
+			<type key="numbers" type="taml">Дәстүрлі тамил сандары</type>
+			<type key="numbers" type="tamldec">Тамил сандары</type>
+			<type key="numbers" type="telu">Телугу сандары</type>
+			<type key="numbers" type="thai">Тай сандары</type>
+			<type key="numbers" type="tibt">Тибет сандары</type>
 		</types>
 		<measurementSystemNames>
-			<measurementSystemName type="metric">метрикалық жүйе</measurementSystemName>
-			<measurementSystemName type="UK">БК</measurementSystemName>
-			<measurementSystemName type="US">АҚШ</measurementSystemName>
+			<measurementSystemName type="metric">Метрлік</measurementSystemName>
+			<measurementSystemName type="UK">Ағылшын</measurementSystemName>
+			<measurementSystemName type="US">Американдық</measurementSystemName>
 		</measurementSystemNames>
 		<codePatterns>
 			<codePattern type="language">Тіл: {0}</codePattern>
-			<codePattern type="script">Жазылуы: {0}</codePattern>
+			<codePattern type="script">Жазу: {0}</codePattern>
 			<codePattern type="territory">Аймақ: {0}</codePattern>
 		</codePatterns>
 	</localeDisplayNames>
@@ -693,10 +713,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<moreInformation>?</moreInformation>
 	</characters>
 	<delimiters>
-		<quotationStart>“</quotationStart>
-		<quotationEnd>&quot;</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
+		<quotationStart>«</quotationStart>
+		<quotationEnd>»</quotationEnd>
+		<alternateQuotationStart>“</alternateQuotationStart>
+		<alternateQuotationEnd>”</alternateQuotationEnd>
 	</delimiters>
 	<dates>
 		<calendars>
@@ -725,22 +745,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern>EEEE, d MMMM y 'ж'. G</pattern>
+							<pattern>G y 'ж'. d MMMM, EEEE</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
-							<pattern>d MMMM y 'ж'. G</pattern>
+							<pattern>G y 'ж'. d MMMM</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern>dd.MM.y G</pattern>
+							<pattern>G dd.MM.y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>dd.MM.y GGGGG</pattern>
+							<pattern>GGGGG dd.MM.y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -767,27 +787,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d, E</dateFormatItem>
-						<dateFormatItem id="Gy">G y</dateFormatItem>
-						<dateFormatItem id="GyMMM">G y MMM</dateFormatItem>
-						<dateFormatItem id="GyMMMd">G y MMM d</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">G y MMM d, E</dateFormatItem>
+						<dateFormatItem id="Gy">G y 'ж'.</dateFormatItem>
+						<dateFormatItem id="GyMMM">G y 'ж'. MMM</dateFormatItem>
+						<dateFormatItem id="GyMMMd">G y 'ж'. d MMM</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y 'ж'. d MMM, E</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">MM-dd</dateFormatItem>
-						<dateFormatItem id="MEd">MM-dd, E</dateFormatItem>
+						<dateFormatItem id="Md">dd.MM</dateFormatItem>
+						<dateFormatItem id="MEd">dd.MM, E</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
-						<dateFormatItem id="MMMEd">MMM d, E</dateFormatItem>
-						<dateFormatItem id="y">G y</dateFormatItem>
-						<dateFormatItem id="yyyy">G y</dateFormatItem>
-						<dateFormatItem id="yyyyM">GGGGG y-MM</dateFormatItem>
-						<dateFormatItem id="yyyyMd">GGGGG y-MM-dd</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">GGGGG y-MM-dd, E</dateFormatItem>
-						<dateFormatItem id="yyyyMMM">G y MMM</dateFormatItem>
-						<dateFormatItem id="yyyyMMMd">G y MMM d</dateFormatItem>
-						<dateFormatItem id="yyyyMMMEd">G y MMM d, E</dateFormatItem>
-						<dateFormatItem id="yyyyQQQ">G y QQQ</dateFormatItem>
-						<dateFormatItem id="yyyyQQQQ">G y QQQQ</dateFormatItem>
+						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">d MMM, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
+						<dateFormatItem id="y">G y 'ж'.</dateFormatItem>
+						<dateFormatItem id="yyyy">G y 'ж'.</dateFormatItem>
+						<dateFormatItem id="yyyyM">GGGGG MM.y</dateFormatItem>
+						<dateFormatItem id="yyyyMd">GGGGG dd.MM.y</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">GGGGG dd.MM.y, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">G y 'ж'. MMM</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">G y 'ж'. d MMM</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y 'ж'. d MMM, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y 'ж'. MMMM</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">G y 'ж'. QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">G y 'ж'. QQQQ</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
@@ -830,8 +853,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">dd.MM – dd.MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd.MM – E, dd.MM</greatestDifference>
-							<greatestDifference id="M">E, dd.MM – E, dd.MM</greatestDifference>
+							<greatestDifference id="d">dd.MM, E – dd.MM, E</greatestDifference>
+							<greatestDifference id="M">dd.MM, E – dd.MM, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
 							<greatestDifference id="M">MMM–MMM</greatestDifference>
@@ -841,43 +864,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d – E, d MMM</greatestDifference>
-							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
+							<greatestDifference id="d">d (E) – d (E) MMM</greatestDifference>
+							<greatestDifference id="M">d MMM, E – d MMM, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
-							<greatestDifference id="y">y–y G</greatestDifference>
+							<greatestDifference id="y">G y–y 'жж'.</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM.y – MM.y G</greatestDifference>
-							<greatestDifference id="y">MM.y – MM.y G</greatestDifference>
+							<greatestDifference id="M">GGGGG MM.y – MM.y</greatestDifference>
+							<greatestDifference id="y">GGGGG MM.y – MM.y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd.MM.y – dd.MM.y G</greatestDifference>
-							<greatestDifference id="M">dd.MM.y – dd.MM.y G</greatestDifference>
-							<greatestDifference id="y">dd.MM.y – dd.MM.y G</greatestDifference>
+							<greatestDifference id="d">GGGGG dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="M">GGGGG dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="y">GGGGG dd.MM.y – dd.MM.y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, dd.MM.y – E, dd.MM.y G</greatestDifference>
-							<greatestDifference id="M">E, dd.MM.y – E, dd.MM.y G</greatestDifference>
-							<greatestDifference id="y">E, dd.MM.y – E, dd.MM.y G</greatestDifference>
+							<greatestDifference id="d">GGGGG dd.MM.y, E – dd.MM.y, E</greatestDifference>
+							<greatestDifference id="M">GGGGG dd.MM.y, E – dd.MM.y, E</greatestDifference>
+							<greatestDifference id="y">GGGGG dd.MM.y, E – dd.MM.y, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM–MMM y 'ж'. G</greatestDifference>
-							<greatestDifference id="y">MMM y 'ж'. - MMM y 'ж'. G</greatestDifference>
+							<greatestDifference id="M">G y 'ж'. MMM–MMM</greatestDifference>
+							<greatestDifference id="y">G y 'ж'. MMM – y 'ж'. MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d–d MMM y 'ж'. G</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM y 'ж'. G</greatestDifference>
-							<greatestDifference id="y">d MMM y 'ж'. - d MMM y 'ж'. G</greatestDifference>
+							<greatestDifference id="d">G y 'ж'. d–d MMM</greatestDifference>
+							<greatestDifference id="M">G y 'ж'. d MMM – d MMM</greatestDifference>
+							<greatestDifference id="y">G y 'ж'. d MMM – y 'ж'. d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d – E, d MMM y 'ж'. G</greatestDifference>
-							<greatestDifference id="M">E, d MMM – E, d MMM y 'ж'. G</greatestDifference>
-							<greatestDifference id="y">E, d MMM y 'ж'. - E, d MMM y 'ж'. G</greatestDifference>
+							<greatestDifference id="d">G y 'ж'. d MMM, E – d MMM, E</greatestDifference>
+							<greatestDifference id="M">G y 'ж'. d MMM, E – d MMM, E</greatestDifference>
+							<greatestDifference id="y">G y 'ж'. d MMM, E – y 'ж'. d MMM, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MMMM – MMMM y G</greatestDifference>
-							<greatestDifference id="y">MMMM y – MMMM y G</greatestDifference>
+							<greatestDifference id="M">G y 'ж'. MMMM – MMMM</greatestDifference>
+							<greatestDifference id="y">G y 'ж'. MMMM – y 'ж'. MMMM</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -897,7 +920,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="9">қыр.</month>
 							<month type="10">қаз.</month>
 							<month type="11">қар.</month>
-							<month type="12">желт.</month>
+							<month type="12">жел.</month>
 						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">Қ</month>
@@ -930,18 +953,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</monthContext>
 					<monthContext type="stand-alone">
 						<monthWidth type="abbreviated">
-							<month type="1">қаң.</month>
-							<month type="2">ақп.</month>
-							<month type="3">нау.</month>
-							<month type="4">сәу.</month>
-							<month type="5">мам.</month>
-							<month type="6">мау.</month>
-							<month type="7">шіл.</month>
-							<month type="8">там.</month>
-							<month type="9">қыр.</month>
-							<month type="10">қаз.</month>
-							<month type="11">қар.</month>
-							<month type="12">желт.</month>
+							<month type="1">Қаң.</month>
+							<month type="2">Ақп.</month>
+							<month type="3">Нау.</month>
+							<month type="4">Сәу.</month>
+							<month type="5">Мам.</month>
+							<month type="6">Мау.</month>
+							<month type="7">Шіл.</month>
+							<month type="8">Там.</month>
+							<month type="9">Қыр.</month>
+							<month type="10">Қаз.</month>
+							<month type="11">Қар.</month>
+							<month type="12">Жел.</month>
 						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">Қ</month>
@@ -958,31 +981,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="12">Ж</month>
 						</monthWidth>
 						<monthWidth type="wide">
-							<month type="1">қаңтар</month>
-							<month type="2">ақпан</month>
-							<month type="3">наурыз</month>
-							<month type="4">сәуір</month>
-							<month type="5">мамыр</month>
-							<month type="6">маусым</month>
-							<month type="7">шілде</month>
-							<month type="8">тамыз</month>
-							<month type="9">қыркүйек</month>
-							<month type="10">қазан</month>
-							<month type="11">қараша</month>
-							<month type="12">желтоқсан</month>
+							<month type="1">Қаңтар</month>
+							<month type="2">Ақпан</month>
+							<month type="3">Наурыз</month>
+							<month type="4">Сәуір</month>
+							<month type="5">Мамыр</month>
+							<month type="6">Маусым</month>
+							<month type="7">Шілде</month>
+							<month type="8">Тамыз</month>
+							<month type="9">Қыркүйек</month>
+							<month type="10">Қазан</month>
+							<month type="11">Қараша</month>
+							<month type="12">Желтоқсан</month>
 						</monthWidth>
 					</monthContext>
 				</months>
 				<days>
 					<dayContext type="format">
 						<dayWidth type="abbreviated">
-							<day type="sun">жек</day>
-							<day type="mon">дүй</day>
-							<day type="tue">сей</day>
-							<day type="wed">сәр</day>
-							<day type="thu">бей</day>
-							<day type="fri">жұма</day>
-							<day type="sat">сен</day>
+							<day type="sun">Жс</day>
+							<day type="mon">Дс</day>
+							<day type="tue">Сс</day>
+							<day type="wed">Ср</day>
+							<day type="thu">Бс</day>
+							<day type="fri">Жм</day>
+							<day type="sat">Сб</day>
 						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun">Ж</day>
@@ -994,13 +1017,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<day type="sat">С</day>
 						</dayWidth>
 						<dayWidth type="short">
-							<day type="sun">жс</day>
-							<day type="mon">дс</day>
-							<day type="tue">сс</day>
-							<day type="wed">ср</day>
-							<day type="thu">бс</day>
-							<day type="fri">жм</day>
-							<day type="sat">сб</day>
+							<day type="sun">Жс</day>
+							<day type="mon">Дс</day>
+							<day type="tue">Сс</day>
+							<day type="wed">Ср</day>
+							<day type="thu">Бс</day>
+							<day type="fri">Жм</day>
+							<day type="sat">Сб</day>
 						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">жексенбі</day>
@@ -1014,13 +1037,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dayContext>
 					<dayContext type="stand-alone">
 						<dayWidth type="abbreviated">
-							<day type="sun">жек</day>
-							<day type="mon">дүй</day>
-							<day type="tue">сей</day>
-							<day type="wed">сәр</day>
-							<day type="thu">бей</day>
-							<day type="fri">жұма</day>
-							<day type="sat">сб.</day>
+							<day type="sun">Жс</day>
+							<day type="mon">Дс</day>
+							<day type="tue">Сс</day>
+							<day type="wed">Ср</day>
+							<day type="thu">Бс</day>
+							<day type="fri">Жм</day>
+							<day type="sat">Сб</day>
 						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun">Ж</day>
@@ -1032,78 +1055,130 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<day type="sat">С</day>
 						</dayWidth>
 						<dayWidth type="short">
-							<day type="sun">жс</day>
-							<day type="mon">дс</day>
-							<day type="tue">сс</day>
-							<day type="wed">ср</day>
-							<day type="thu">бс</day>
-							<day type="fri">жм</day>
-							<day type="sat">сб</day>
+							<day type="sun">Жс</day>
+							<day type="mon">Дс</day>
+							<day type="tue">Сс</day>
+							<day type="wed">Ср</day>
+							<day type="thu">Бс</day>
+							<day type="fri">Жм</day>
+							<day type="sat">Сб</day>
 						</dayWidth>
 						<dayWidth type="wide">
-							<day type="sun">жексенбі</day>
-							<day type="mon">дүйсенбі</day>
-							<day type="tue">сейсенбі</day>
-							<day type="wed">сәрсенбі</day>
-							<day type="thu">бейсенбі</day>
-							<day type="fri">жұма</day>
-							<day type="sat">сенбі</day>
+							<day type="sun">Жексенбі</day>
+							<day type="mon">Дүйсенбі</day>
+							<day type="tue">Сейсенбі</day>
+							<day type="wed">Сәрсенбі</day>
+							<day type="thu">Бейсенбі</day>
+							<day type="fri">Жұма</day>
+							<day type="sat">Сенбі</day>
 						</dayWidth>
 					</dayContext>
 				</days>
 				<quarters>
 					<quarterContext type="format">
 						<quarterWidth type="abbreviated">
-							<quarter type="1">Т1</quarter>
-							<quarter type="2">Т2</quarter>
-							<quarter type="3">Т3</quarter>
-							<quarter type="4">Т4</quarter>
+							<quarter type="1">І ш.</quarter>
+							<quarter type="2">ІІ ш.</quarter>
+							<quarter type="3">ІІІ ш.</quarter>
+							<quarter type="4">IV ш.</quarter>
 						</quarterWidth>
 						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
+							<quarter type="1">I</quarter>
+							<quarter type="2">II</quarter>
+							<quarter type="3">III</quarter>
+							<quarter type="4">IV</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
-							<quarter type="1">1-інші тоқсан</quarter>
-							<quarter type="2">2-інші тоқсан</quarter>
-							<quarter type="3">3-інші тоқсан</quarter>
-							<quarter type="4">4-інші тоқсан</quarter>
+							<quarter type="1">І ширек</quarter>
+							<quarter type="2">ІІ ширек</quarter>
+							<quarter type="3">ІІІ ширек</quarter>
+							<quarter type="4">IV ширек</quarter>
 						</quarterWidth>
 					</quarterContext>
 					<quarterContext type="stand-alone">
 						<quarterWidth type="abbreviated">
-							<quarter type="1">Т1</quarter>
-							<quarter type="2">Т2</quarter>
-							<quarter type="3">Т3</quarter>
-							<quarter type="4">Т4</quarter>
+							<quarter type="1">І ш.</quarter>
+							<quarter type="2">ІІ ш.</quarter>
+							<quarter type="3">ІІІ ш.</quarter>
+							<quarter type="4">IV ш.</quarter>
 						</quarterWidth>
 						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
+							<quarter type="1">I</quarter>
+							<quarter type="2">II</quarter>
+							<quarter type="3">III</quarter>
+							<quarter type="4">IV</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
-							<quarter type="1">1-інші тоқсан</quarter>
-							<quarter type="2">2-інші тоқсан</quarter>
-							<quarter type="3">3-інші тоқсан</quarter>
-							<quarter type="4">4-інші тоқсан</quarter>
+							<quarter type="1">І ширек</quarter>
+							<quarter type="2">ІІ ширек</quarter>
+							<quarter type="3">ІІІ ширек</quarter>
+							<quarter type="4">IV ширек</quarter>
 						</quarterWidth>
 					</quarterContext>
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">түн жарымы</dayPeriod>
+							<dayPeriod type="am">таңғы</dayPeriod>
+							<dayPeriod type="noon">түскі</dayPeriod>
+							<dayPeriod type="pm">түскі/кешкі</dayPeriod>
+							<dayPeriod type="morning1">таңғы</dayPeriod>
+							<dayPeriod type="afternoon1">түстен кейінгі</dayPeriod>
+							<dayPeriod type="evening1">кешкі</dayPeriod>
+							<dayPeriod type="night1">түнгі</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">тт</dayPeriod>
-							<dayPeriod type="noon">тс</dayPeriod>
-							<dayPeriod type="pm">кш</dayPeriod>
+							<dayPeriod type="midnight">түн жарымы</dayPeriod>
+							<dayPeriod type="am">таңғы</dayPeriod>
+							<dayPeriod type="noon">түскі</dayPeriod>
+							<dayPeriod type="pm">түскі/кешкі</dayPeriod>
+							<dayPeriod type="morning1">таңғы</dayPeriod>
+							<dayPeriod type="afternoon1">түстен кейінгі</dayPeriod>
+							<dayPeriod type="evening1">кешкі</dayPeriod>
+							<dayPeriod type="night1">түнгі</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">таңертеңгі</dayPeriod>
+							<dayPeriod type="midnight">түн жарымы</dayPeriod>
+							<dayPeriod type="am">таңғы</dayPeriod>
 							<dayPeriod type="noon">түскі</dayPeriod>
-							<dayPeriod type="pm">түстен кейінгі</dayPeriod>
+							<dayPeriod type="pm">түскі/кешкі</dayPeriod>
+							<dayPeriod type="morning1">таңғы</dayPeriod>
+							<dayPeriod type="afternoon1">түстен кейінгі</dayPeriod>
+							<dayPeriod type="evening1">кешкі</dayPeriod>
+							<dayPeriod type="night1">түнгі</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">түн жарымы</dayPeriod>
+							<dayPeriod type="am">таң</dayPeriod>
+							<dayPeriod type="noon">талтүс</dayPeriod>
+							<dayPeriod type="pm">түс/кеш</dayPeriod>
+							<dayPeriod type="morning1">таң</dayPeriod>
+							<dayPeriod type="afternoon1">түстен кейін</dayPeriod>
+							<dayPeriod type="evening1">кеш</dayPeriod>
+							<dayPeriod type="night1">түн</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">түн жарымы</dayPeriod>
+							<dayPeriod type="am">таң</dayPeriod>
+							<dayPeriod type="noon">талтүс</dayPeriod>
+							<dayPeriod type="pm">түс/кеш</dayPeriod>
+							<dayPeriod type="morning1">таң</dayPeriod>
+							<dayPeriod type="afternoon1">түстен кейін</dayPeriod>
+							<dayPeriod type="evening1">кеш</dayPeriod>
+							<dayPeriod type="night1">түн</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">түн жарымы</dayPeriod>
+							<dayPeriod type="am">таң</dayPeriod>
+							<dayPeriod type="noon">талтүс</dayPeriod>
+							<dayPeriod type="pm">түс/кеш</dayPeriod>
+							<dayPeriod type="morning1">таң</dayPeriod>
+							<dayPeriod type="afternoon1">түстен кейін</dayPeriod>
+							<dayPeriod type="evening1">кеш</dayPeriod>
+							<dayPeriod type="night1">түн</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1111,33 +1186,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<eraNames>
 						<era type="0">Біздің заманымызға дейін</era>
 						<era type="1">Біздің заманымыз</era>
-						<era type="1" alt="variant">Жаңа заман</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">б.з.д.</era>
 						<era type="1">б.з.</era>
-						<era type="1" alt="variant">ж.з.</era>
 					</eraAbbr>
 				</eras>
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern>EEEE, d MMMM y</pattern>
+							<pattern>y 'ж'. d MMMM, EEEE</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
-							<pattern>d MMMM y</pattern>
+							<pattern>y 'ж'. d MMMM</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern>y, dd-MMM</pattern>
+							<pattern>y 'ж'. dd MMM</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
+							<pattern>dd.MM.yy</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -1188,36 +1261,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="d">d</dateFormatItem>
 						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d, E</dateFormatItem>
-						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
+						<dateFormatItem id="Ehm">E, a h:mm</dateFormatItem>
 						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
-						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Ehms">E, a h:mm:ss</dateFormatItem>
 						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Gy">G y</dateFormatItem>
-						<dateFormatItem id="GyMMM">G y MMM</dateFormatItem>
-						<dateFormatItem id="GyMMMd">G y MMM d</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">G y MMM d, E</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
+						<dateFormatItem id="Gy">G y 'ж'.</dateFormatItem>
+						<dateFormatItem id="GyMMM">G y 'ж'. MMM</dateFormatItem>
+						<dateFormatItem id="GyMMMd">G y 'ж'. d MMM</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y 'ж'. d MMM, E</dateFormatItem>
+						<dateFormatItem id="h">a h</dateFormatItem>
 						<dateFormatItem id="H">HH</dateFormatItem>
-						<dateFormatItem id="hm">h:mm a</dateFormatItem>
+						<dateFormatItem id="hm">a h:mm</dateFormatItem>
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
-						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="hms">a h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">a h:mm:ss v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">a h:mm v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">dd-MM</dateFormatItem>
-						<dateFormatItem id="MEd">E, dd-MM</dateFormatItem>
+						<dateFormatItem id="Md">dd.MM</dateFormatItem>
+						<dateFormatItem id="MEd">dd.MM, E</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">d MMM, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">MM-y</dateFormatItem>
-						<dateFormatItem id="yMd">dd-MM-y</dateFormatItem>
-						<dateFormatItem id="yMEd">E, dd-MM-y</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">E, d MMM y</dateFormatItem>
-						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
-						<dateFormatItem id="yQQQQ">y QQQQ</dateFormatItem>
+						<dateFormatItem id="yM">MM.y</dateFormatItem>
+						<dateFormatItem id="yMd">dd.MM.y</dateFormatItem>
+						<dateFormatItem id="yMEd">dd.MM.y, E</dateFormatItem>
+						<dateFormatItem id="yMMM">y 'ж'. MMM</dateFormatItem>
+						<dateFormatItem id="yMMMd">y 'ж'. d MMM</dateFormatItem>
+						<dateFormatItem id="yMMMEd">y 'ж'. d MMM, E</dateFormatItem>
+						<dateFormatItem id="yMMMM">y 'ж'. MMMM</dateFormatItem>
+						<dateFormatItem id="yQQQ">y 'ж'. QQQ</dateFormatItem>
+						<dateFormatItem id="yQQQQ">y 'ж'. QQQQ</dateFormatItem>
 					</availableFormats>
 					<appendItems>
 						<appendItem request="Timezone">{0} {1}</appendItem>
@@ -1228,14 +1307,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="d">d–d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
+							<greatestDifference id="a">a h – a h</greatestDifference>
 							<greatestDifference id="h">a h–h</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
 							<greatestDifference id="H">HH–HH</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="a">a h:mm – a h:mm</greatestDifference>
 							<greatestDifference id="h">a h:mm–h:mm</greatestDifference>
 							<greatestDifference id="m">a h:mm–h:mm</greatestDifference>
 						</intervalFormatItem>
@@ -1244,7 +1323,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="a">a h:mm – a h:mm v</greatestDifference>
 							<greatestDifference id="h">a h:mm – h:mm v</greatestDifference>
 							<greatestDifference id="m">a h:mm – h:mm v</greatestDifference>
 						</intervalFormatItem>
@@ -1253,7 +1332,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
+							<greatestDifference id="a">a h – a h v</greatestDifference>
 							<greatestDifference id="h">a h – h v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
@@ -1267,8 +1346,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">dd.MM – dd.MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd.MM – E, dd.MM</greatestDifference>
-							<greatestDifference id="M">E, dd.MM – E, dd.MM</greatestDifference>
+							<greatestDifference id="d">dd.MM, E – dd.MM, E</greatestDifference>
+							<greatestDifference id="M">dd.MM, E – dd.MM, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
 							<greatestDifference id="M">MMM–MMM</greatestDifference>
@@ -1278,8 +1357,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d – E, d MMM</greatestDifference>
-							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
+							<greatestDifference id="d">d MMM, E – d MMM, E</greatestDifference>
+							<greatestDifference id="M">d MMM, E – d MMM, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
 							<greatestDifference id="y">y–y</greatestDifference>
@@ -1294,27 +1373,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="y">dd.MM.y – dd.MM.y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, dd.MM.y – E, dd.MM.y</greatestDifference>
-							<greatestDifference id="M">E, dd.MM.y – E, dd.MM.y</greatestDifference>
-							<greatestDifference id="y">E, dd.MM.y – E, dd.MM.y</greatestDifference>
+							<greatestDifference id="d">dd.MM.y, E – dd.MM.y, E</greatestDifference>
+							<greatestDifference id="M">dd.MM.y, E – dd.MM.y, E</greatestDifference>
+							<greatestDifference id="y">dd.MM.y, E – dd.MM.y, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM–MMM y 'ж'.</greatestDifference>
-							<greatestDifference id="y">MMM y 'ж'. - MMM y 'ж'.</greatestDifference>
+							<greatestDifference id="M">y 'ж'. MMM–MMM</greatestDifference>
+							<greatestDifference id="y">y 'ж'. MMM – y 'ж'. MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d–d MMM y 'ж'.</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM y 'ж'.</greatestDifference>
-							<greatestDifference id="y">d MMM y 'ж'. - d MMM y 'ж'.</greatestDifference>
+							<greatestDifference id="d">y 'ж'. d–d MMM</greatestDifference>
+							<greatestDifference id="M">y 'ж'. d MMM – d MMM</greatestDifference>
+							<greatestDifference id="y">y 'ж'. d MMM – y 'ж'. d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d – E, d MMM y 'ж'.</greatestDifference>
-							<greatestDifference id="M">E, d MMM – E, d MMM y 'ж'.</greatestDifference>
-							<greatestDifference id="y">E, d MMM y 'ж'. - E, d MMM y 'ж'.</greatestDifference>
+							<greatestDifference id="d">y 'ж'. d MMM, E – y 'ж'. d MMM, E</greatestDifference>
+							<greatestDifference id="M">y 'ж'. d MMM, E – d MMM, E</greatestDifference>
+							<greatestDifference id="y">y 'ж'. d MMM, E – y 'ж'. d MMM, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MMMM – MMMM y</greatestDifference>
-							<greatestDifference id="y">MMMM y – MMMM y</greatestDifference>
+							<greatestDifference id="M">y 'ж'. MMMM – MMMM</greatestDifference>
+							<greatestDifference id="y">y 'ж'. MMMM – y 'ж'. MMMM</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -1322,10 +1401,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</calendars>
 		<fields>
 			<field type="era">
-				<displayName>Кезең</displayName>
+				<displayName>дәуір</displayName>
 			</field>
 			<field type="year">
-				<displayName>Жыл</displayName>
+				<displayName>жыл</displayName>
 				<relative type="-1">былтырғы жыл</relative>
 				<relative type="0">биылғы жыл</relative>
 				<relative type="1">келесі жыл</relative>
@@ -1352,49 +1431,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="year-narrow">
 				<displayName>ж.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">+{0} ж.</relativeTimePattern>
-					<relativeTimePattern count="other">+{0} ж.</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ж. кейін</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ж. кейін</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} ж.</relativeTimePattern>
-					<relativeTimePattern count="other">-{0} ж.</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ж. бұрын</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ж. бұрын</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter">
-				<displayName>Тоқсан</displayName>
+				<displayName>ширек</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} тоқсаннан кейін</relativeTimePattern>
-					<relativeTimePattern count="other">{0} тоқсаннан кейін</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ширектен кейін</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ширектен кейін</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} тоқсан бұрын</relativeTimePattern>
-					<relativeTimePattern count="other">{0} тоқсан бұрын</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ширек бұрын</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ширек бұрын</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-short">
-				<displayName>тоқ.</displayName>
+				<displayName>ш.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} тоқ. кейін</relativeTimePattern>
-					<relativeTimePattern count="other">{0} тоқ. кейін</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ш. кейін</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ш. кейін</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} тоқ. бұрын</relativeTimePattern>
-					<relativeTimePattern count="other">{0} тоқ. бұрын</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ш. бұрын</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ш. бұрын</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-narrow">
-				<displayName>тоқ.</displayName>
+				<displayName>ш.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} тоқ.кейін</relativeTimePattern>
-					<relativeTimePattern count="other">{0} тоқ.кейін</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ш. кейін</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ш. кейін</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} тоқ. бұрын</relativeTimePattern>
-					<relativeTimePattern count="other">{0} тоқ.бұрын</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ш. бұрын</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ш. бұрын</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month">
-				<displayName>Ай</displayName>
+				<displayName>ай</displayName>
 				<relative type="-1">өткен ай</relative>
 				<relative type="0">осы ай</relative>
 				<relative type="1">келесі ай</relative>
@@ -1409,6 +1488,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>ай</displayName>
+				<relative type="-1">өткен ай</relative>
+				<relative type="0">осы ай</relative>
+				<relative type="1">келесі ай</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} айдан кейін</relativeTimePattern>
 					<relativeTimePattern count="other">{0} айдан кейін</relativeTimePattern>
@@ -1420,6 +1502,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>ай</displayName>
+				<relative type="-1">өткен ай</relative>
+				<relative type="0">осы ай</relative>
+				<relative type="1">келесі ай</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} айдан кейін</relativeTimePattern>
 					<relativeTimePattern count="other">{0} айдан кейін</relativeTimePattern>
@@ -1430,7 +1515,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="week">
-				<displayName>Апта</displayName>
+				<displayName>апта</displayName>
 				<relative type="-1">өткен апта</relative>
 				<relative type="0">осы апта</relative>
 				<relative type="1">келесі апта</relative>
@@ -1457,12 +1542,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="week-narrow">
 				<displayName>ап.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} ап.кейін</relativeTimePattern>
-					<relativeTimePattern count="other">{0} ап.кейін</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ап. кейін</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ап. кейін</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} ап.бұрын</relativeTimePattern>
-					<relativeTimePattern count="other">{0} ап.бұрын</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ап. бұрын</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ап. бұрын</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day">
@@ -1471,7 +1556,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="-1">кеше</relative>
 				<relative type="0">бүгін</relative>
 				<relative type="1">ертең</relative>
-				<relative type="2">арғы күні</relative>
+				<relative type="2">бүрсігүні</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} күннен кейін</relativeTimePattern>
 					<relativeTimePattern count="other">{0} күннен кейін</relativeTimePattern>
@@ -1482,7 +1567,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day-short">
-				<displayName>к</displayName>
+				<displayName>күн</displayName>
+				<relative type="-2">алдыңғы күні</relative>
+				<relative type="-1">кеше</relative>
+				<relative type="0">бүгін</relative>
+				<relative type="1">ертең</relative>
+				<relative type="2">бүрсігүні</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} күннен кейін</relativeTimePattern>
 					<relativeTimePattern count="other">{0} күннен кейін</relativeTimePattern>
@@ -1493,7 +1583,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day-narrow">
-				<displayName>к</displayName>
+				<displayName>күн</displayName>
+				<relative type="-2">алдыңғы күні</relative>
+				<relative type="-1">кеше</relative>
+				<relative type="0">бүгін</relative>
+				<relative type="1">ертең</relative>
+				<relative type="2">бүрсігүні</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} күннен кейін</relativeTimePattern>
 					<relativeTimePattern count="other">{0} күннен кейін</relativeTimePattern>
@@ -1504,7 +1599,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="weekday">
-				<displayName>Апта күні</displayName>
+				<displayName>апта күні</displayName>
 			</field>
 			<field type="sun">
 				<relative type="-1">өткен жексенбі</relative>
@@ -1512,14 +1607,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">келесі жексенбі</relative>
 			</field>
 			<field type="sun-short">
-				<relative type="-1">өткен жек</relative>
-				<relative type="0">осы жек</relative>
-				<relative type="1">келесі жек</relative>
+				<relative type="-1">өткен жек.</relative>
+				<relative type="0">осы жек.</relative>
+				<relative type="1">келесі жек.</relative>
 			</field>
 			<field type="sun-narrow">
-				<relative type="-1">өткен жк</relative>
-				<relative type="0">осы жк</relative>
-				<relative type="1">келесі жк</relative>
+				<relative type="-1">өткен жс</relative>
+				<relative type="0">осы жс</relative>
+				<relative type="1">келесі жс</relative>
 			</field>
 			<field type="mon">
 				<relative type="-1">өткен дүйсенбі</relative>
@@ -1527,9 +1622,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">келесі дүйсенбі</relative>
 			</field>
 			<field type="mon-short">
-				<relative type="-1">өткен дүй</relative>
-				<relative type="0">осы дүй</relative>
-				<relative type="1">келесі дүй</relative>
+				<relative type="-1">өткен дүй.</relative>
+				<relative type="0">осы дүй.</relative>
+				<relative type="1">келесі дүй.</relative>
 			</field>
 			<field type="mon-narrow">
 				<relative type="-1">өткен дс</relative>
@@ -1542,9 +1637,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">келесі сейсенбі</relative>
 			</field>
 			<field type="tue-short">
-				<relative type="-1">өткен сейс</relative>
-				<relative type="0">осы сейс</relative>
-				<relative type="1">келесі сейс</relative>
+				<relative type="-1">өткен сей.</relative>
+				<relative type="0">осы сей.</relative>
+				<relative type="1">келесі сей.</relative>
 			</field>
 			<field type="tue-narrow">
 				<relative type="-1">өткен сс</relative>
@@ -1557,9 +1652,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">келесі сәрсенбі</relative>
 			</field>
 			<field type="wed-short">
-				<relative type="-1">өткен сәрс</relative>
-				<relative type="0">осы сәрс</relative>
-				<relative type="1">келесі сәрс</relative>
+				<relative type="-1">өткен сәр.</relative>
+				<relative type="0">осы сәр.</relative>
+				<relative type="1">келесі сәр.</relative>
 			</field>
 			<field type="wed-narrow">
 				<relative type="-1">өткен ср</relative>
@@ -1572,9 +1667,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">келесі бейсенбі</relative>
 			</field>
 			<field type="thu-short">
-				<relative type="-1">өткен бейс</relative>
-				<relative type="0">осы бейс</relative>
-				<relative type="1">келесі бейс</relative>
+				<relative type="-1">өткен бей.</relative>
+				<relative type="0">осы бей.</relative>
+				<relative type="1">келесі бей.</relative>
 			</field>
 			<field type="thu-narrow">
 				<relative type="-1">өткен бс</relative>
@@ -1587,9 +1682,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">келесі жұма</relative>
 			</field>
 			<field type="fri-short">
-				<relative type="-1">өткен жұма</relative>
-				<relative type="0">осы жұма</relative>
-				<relative type="1">келесі жұма</relative>
+				<relative type="-1">өткен жұм.</relative>
+				<relative type="0">осы жұм.</relative>
+				<relative type="1">келесі жұм.</relative>
 			</field>
 			<field type="fri-narrow">
 				<relative type="-1">өткен жм</relative>
@@ -1602,9 +1697,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">келесі сенбі</relative>
 			</field>
 			<field type="sat-short">
-				<relative type="-1">өткен сен</relative>
-				<relative type="0">осы сен</relative>
-				<relative type="1">келесі сен</relative>
+				<relative type="-1">өткен сен.</relative>
+				<relative type="0">осы сен.</relative>
+				<relative type="1">келесі сен.</relative>
 			</field>
 			<field type="sat-narrow">
 				<relative type="-1">өткен сб</relative>
@@ -1612,10 +1707,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">келесі сб</relative>
 			</field>
 			<field type="dayperiod">
-				<displayName>таңертеңгі/түстен кейінгі/кешкі</displayName>
+				<displayName>таңғы/түскі/кешкі</displayName>
 			</field>
 			<field type="hour">
-				<displayName>Сағат</displayName>
+				<displayName>сағат</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} сағаттан кейін</relativeTimePattern>
 					<relativeTimePattern count="other">{0} сағаттан кейін</relativeTimePattern>
@@ -1628,27 +1723,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="hour-short">
 				<displayName>сағ.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} сағаттан кейін</relativeTimePattern>
-					<relativeTimePattern count="other">{0} сағаттан кейін</relativeTimePattern>
+					<relativeTimePattern count="one">{0} сағ. кейін</relativeTimePattern>
+					<relativeTimePattern count="other">{0} сағ. кейін</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} сағат бұрын</relativeTimePattern>
-					<relativeTimePattern count="other">{0} сағат бұрын</relativeTimePattern>
+					<relativeTimePattern count="one">{0} сағ. бұрын</relativeTimePattern>
+					<relativeTimePattern count="other">{0} сағ. бұрын</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-narrow">
-				<displayName>с</displayName>
+				<displayName>сағ.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} сағ.кейін</relativeTimePattern>
-					<relativeTimePattern count="other">{0} сағаттан кейін</relativeTimePattern>
+					<relativeTimePattern count="one">{0} сағ. кейін</relativeTimePattern>
+					<relativeTimePattern count="other">{0} сағ. кейін</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} сағ.бұрын</relativeTimePattern>
-					<relativeTimePattern count="other">{0} сағат бұрын</relativeTimePattern>
+					<relativeTimePattern count="one">{0} сағ. бұрын</relativeTimePattern>
+					<relativeTimePattern count="other">{0} сағ. бұрын</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute">
-				<displayName>Минут</displayName>
+				<displayName>минут</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} минуттан кейін</relativeTimePattern>
 					<relativeTimePattern count="other">{0} минуттан кейін</relativeTimePattern>
@@ -1661,27 +1756,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="minute-short">
 				<displayName>мин.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} минуттан кейін</relativeTimePattern>
-					<relativeTimePattern count="other">{0} минуттан кейін</relativeTimePattern>
+					<relativeTimePattern count="one">{0} мин. кейін</relativeTimePattern>
+					<relativeTimePattern count="other">{0} мин. кейін</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} минут бұрын</relativeTimePattern>
-					<relativeTimePattern count="other">{0} минут бұрын</relativeTimePattern>
+					<relativeTimePattern count="one">{0} мин. бұрын</relativeTimePattern>
+					<relativeTimePattern count="other">{0} мин. бұрын</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute-narrow">
-				<displayName>м</displayName>
+				<displayName>мин.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} мин.кейін</relativeTimePattern>
-					<relativeTimePattern count="other">{0} мин.кейін</relativeTimePattern>
+					<relativeTimePattern count="one">{0} мин. кейін</relativeTimePattern>
+					<relativeTimePattern count="other">{0} мин. кейін</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} мин.бұрын</relativeTimePattern>
-					<relativeTimePattern count="other">{0} минут бұрын</relativeTimePattern>
+					<relativeTimePattern count="one">{0} мин. бұрын</relativeTimePattern>
+					<relativeTimePattern count="other">{0} мин. бұрын</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second">
-				<displayName>Секунд</displayName>
+				<displayName>секунд</displayName>
 				<relative type="0">қазір</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} секундтан кейін</relativeTimePattern>
@@ -1695,42 +1790,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="second-short">
 				<displayName>сек.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} секундтан кейін</relativeTimePattern>
-					<relativeTimePattern count="other">{0} секундтан кейін</relativeTimePattern>
+					<relativeTimePattern count="one">{0} сек. кейін</relativeTimePattern>
+					<relativeTimePattern count="other">{0} сек. кейін</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} секунд бұрын</relativeTimePattern>
-					<relativeTimePattern count="other">{0} секунд бұрын</relativeTimePattern>
+					<relativeTimePattern count="one">{0} сек. бұрын</relativeTimePattern>
+					<relativeTimePattern count="other">{0} сек. бұрын</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second-narrow">
-				<displayName>с</displayName>
+				<displayName>сек.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} сек.кейін</relativeTimePattern>
-					<relativeTimePattern count="other">{0} сек.кейін</relativeTimePattern>
+					<relativeTimePattern count="one">{0} сек. кейін</relativeTimePattern>
+					<relativeTimePattern count="other">{0} сек. кейін</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} сек.бұрын</relativeTimePattern>
-					<relativeTimePattern count="other">{0} сек.бұрын</relativeTimePattern>
+					<relativeTimePattern count="one">{0} сек. бұрын</relativeTimePattern>
+					<relativeTimePattern count="other">{0} сек. бұрын</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>Уақыт белдеуі</displayName>
+				<displayName>уақыт белдеуі</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
 			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>ГОУ{0}</gmtFormat>
+			<gmtFormat>GMT{0}</gmtFormat>
 			<gmtZeroFormat>GMT</gmtZeroFormat>
 			<regionFormat>{0} уақыты</regionFormat>
-			<regionFormat type="daylight">{0} күндізгі уақыты</regionFormat>
+			<regionFormat type="daylight">{0} жазғы уақыты</regionFormat>
 			<regionFormat type="standard">{0} стандартты уақыты</regionFormat>
 			<fallbackFormat>{1} ({0})</fallbackFormat>
 			<zone type="Etc/Unknown">
-				<exemplarCity>Белгісіз</exemplarCity>
+				<exemplarCity>Белгісіз қала</exemplarCity>
 			</zone>
 			<zone type="Europe/Andorra">
-				<exemplarCity>Андора</exemplarCity>
+				<exemplarCity>Андорра</exemplarCity>
 			</zone>
 			<zone type="Asia/Dubai">
 				<exemplarCity>Дубай</exemplarCity>
@@ -1739,10 +1834,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Кабул</exemplarCity>
 			</zone>
 			<zone type="America/Antigua">
-				<exemplarCity>Антгуа</exemplarCity>
+				<exemplarCity>Антигуа</exemplarCity>
 			</zone>
 			<zone type="America/Anguilla">
-				<exemplarCity>Ангилиа</exemplarCity>
+				<exemplarCity>Ангилья</exemplarCity>
 			</zone>
 			<zone type="Europe/Tirane">
 				<exemplarCity>Тирана</exemplarCity>
@@ -1763,7 +1858,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Тролл</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Syowa">
-				<exemplarCity>Сева</exemplarCity>
+				<exemplarCity>Сёва</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Mawson">
 				<exemplarCity>Моусон</exemplarCity>
@@ -1781,31 +1876,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Дюмон-д’Юрвиль</exemplarCity>
 			</zone>
 			<zone type="Antarctica/McMurdo">
-				<exemplarCity>Мак Мердо</exemplarCity>
+				<exemplarCity>Мак-Мердо</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Рио Галлегос</exemplarCity>
+				<exemplarCity>Рио-Гальегос</exemplarCity>
 			</zone>
 			<zone type="America/Mendoza">
-				<exemplarCity>Мендоза</exemplarCity>
+				<exemplarCity>Мендоса</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/San_Juan">
 				<exemplarCity>Сан-Хуан</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>Ушуаиа</exemplarCity>
+				<exemplarCity>Ушуайя</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity>Ла Риоха</exemplarCity>
+				<exemplarCity>Ла-Риоха</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/San_Luis">
-				<exemplarCity>Сан Луис</exemplarCity>
+				<exemplarCity>Сан-Луис</exemplarCity>
 			</zone>
 			<zone type="America/Catamarca">
 				<exemplarCity>Катамарка</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Salta">
-				<exemplarCity>Салта</exemplarCity>
+				<exemplarCity>Сальта</exemplarCity>
 			</zone>
 			<zone type="America/Jujuy">
 				<exemplarCity>Жужуй</exemplarCity>
@@ -1817,7 +1912,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Кордоба</exemplarCity>
 			</zone>
 			<zone type="America/Buenos_Aires">
-				<exemplarCity>Буэнос Айрес</exemplarCity>
+				<exemplarCity>Буэнос-Айрес</exemplarCity>
 			</zone>
 			<zone type="Pacific/Pago_Pago">
 				<exemplarCity>Паго-Паго</exemplarCity>
@@ -1838,7 +1933,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Аделаида</exemplarCity>
 			</zone>
 			<zone type="Australia/Broken_Hill">
-				<exemplarCity>Брокен Хилл</exemplarCity>
+				<exemplarCity>Брокен-Хилл</exemplarCity>
 			</zone>
 			<zone type="Australia/Currie">
 				<exemplarCity>Керри</exemplarCity>
@@ -1862,7 +1957,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Маккуори</exemplarCity>
 			</zone>
 			<zone type="Australia/Lord_Howe">
-				<exemplarCity>Лорд Хау, арал</exemplarCity>
+				<exemplarCity>Лорд-Хау аралы</exemplarCity>
 			</zone>
 			<zone type="America/Aruba">
 				<exemplarCity>Аруба</exemplarCity>
@@ -1886,7 +1981,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Брюссель</exemplarCity>
 			</zone>
 			<zone type="Africa/Ouagadougou">
-				<exemplarCity>Уадагуду</exemplarCity>
+				<exemplarCity>Уагадугу</exemplarCity>
 			</zone>
 			<zone type="Europe/Sofia">
 				<exemplarCity>София</exemplarCity>
@@ -1904,7 +1999,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Сен-Бартелеми</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Bermuda">
-				<exemplarCity>Бермуда</exemplarCity>
+				<exemplarCity>Бермуд аралдары</exemplarCity>
 			</zone>
 			<zone type="Asia/Brunei">
 				<exemplarCity>Бруней</exemplarCity>
@@ -1919,13 +2014,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Эйрунепе</exemplarCity>
 			</zone>
 			<zone type="America/Rio_Branco">
-				<exemplarCity>Риу Бранку</exemplarCity>
+				<exemplarCity>Риу-Бранку</exemplarCity>
 			</zone>
 			<zone type="America/Porto_Velho">
 				<exemplarCity>Порту-Велью</exemplarCity>
 			</zone>
 			<zone type="America/Boa_Vista">
-				<exemplarCity>Бао Виста</exemplarCity>
+				<exemplarCity>Бао-Виста</exemplarCity>
 			</zone>
 			<zone type="America/Manaus">
 				<exemplarCity>Манаус</exemplarCity>
@@ -1937,7 +2032,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Сантарем</exemplarCity>
 			</zone>
 			<zone type="America/Campo_Grande">
-				<exemplarCity>Кампо Гранде</exemplarCity>
+				<exemplarCity>Кампу-Гранди</exemplarCity>
 			</zone>
 			<zone type="America/Belem">
 				<exemplarCity>Белем</exemplarCity>
@@ -1946,7 +2041,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Арагуаина</exemplarCity>
 			</zone>
 			<zone type="America/Sao_Paulo">
-				<exemplarCity>Сан Паулу</exemplarCity>
+				<exemplarCity>Сан-Паулу</exemplarCity>
 			</zone>
 			<zone type="America/Bahia">
 				<exemplarCity>Баия</exemplarCity>
@@ -1967,7 +2062,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Нассау</exemplarCity>
 			</zone>
 			<zone type="Asia/Thimphu">
-				<exemplarCity>Тимбу</exemplarCity>
+				<exemplarCity>Тхимпху</exemplarCity>
 			</zone>
 			<zone type="Africa/Gaborone">
 				<exemplarCity>Габороне</exemplarCity>
@@ -1979,7 +2074,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Белиз</exemplarCity>
 			</zone>
 			<zone type="America/Dawson">
-				<exemplarCity>Досон</exemplarCity>
+				<exemplarCity>Доусон</exemplarCity>
 			</zone>
 			<zone type="America/Whitehorse">
 				<exemplarCity>Уайтхорс</exemplarCity>
@@ -1991,7 +2086,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Ванкувер</exemplarCity>
 			</zone>
 			<zone type="America/Dawson_Creek">
-				<exemplarCity>Досон Крик</exemplarCity>
+				<exemplarCity>Досон-Крик</exemplarCity>
 			</zone>
 			<zone type="America/Creston">
 				<exemplarCity>Крестон</exemplarCity>
@@ -2003,10 +2098,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Эдмонтон</exemplarCity>
 			</zone>
 			<zone type="America/Swift_Current">
-				<exemplarCity>Свифт-Карент</exemplarCity>
+				<exemplarCity>Свифт-Керрент</exemplarCity>
 			</zone>
 			<zone type="America/Cambridge_Bay">
-				<exemplarCity>Кембридж Бей</exemplarCity>
+				<exemplarCity>Кембридж-Бей</exemplarCity>
 			</zone>
 			<zone type="America/Regina">
 				<exemplarCity>Регина</exemplarCity>
@@ -2024,7 +2119,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Ранкин-Инлет</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
-				<exemplarCity>Корал Харбор</exemplarCity>
+				<exemplarCity>Корал-Харбор</exemplarCity>
 			</zone>
 			<zone type="America/Thunder_Bay">
 				<exemplarCity>Тандер-Бей</exemplarCity>
@@ -2054,7 +2149,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Глейс-Бей</exemplarCity>
 			</zone>
 			<zone type="America/Blanc-Sablon">
-				<exemplarCity>Бланк Саблон</exemplarCity>
+				<exemplarCity>Бланк-Саблон</exemplarCity>
 			</zone>
 			<zone type="America/St_Johns">
 				<exemplarCity>Сент-Джонс</exemplarCity>
@@ -2072,7 +2167,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Банги</exemplarCity>
 			</zone>
 			<zone type="Africa/Brazzaville">
-				<exemplarCity>Браззавил</exemplarCity>
+				<exemplarCity>Браззавиль</exemplarCity>
 			</zone>
 			<zone type="Europe/Zurich">
 				<exemplarCity>Цюрих</exemplarCity>
@@ -2084,7 +2179,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Раротонга</exemplarCity>
 			</zone>
 			<zone type="Pacific/Easter">
-				<exemplarCity>Пасха арала</exemplarCity>
+				<exemplarCity>Пасха аралы</exemplarCity>
 			</zone>
 			<zone type="America/Santiago">
 				<exemplarCity>Сантьяго</exemplarCity>
@@ -2114,10 +2209,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Курасао</exemplarCity>
 			</zone>
 			<zone type="Indian/Christmas">
-				<exemplarCity>Кристмас аралдары</exemplarCity>
+				<exemplarCity>Кристмас</exemplarCity>
 			</zone>
 			<zone type="Asia/Nicosia">
-				<exemplarCity>Никосиа</exemplarCity>
+				<exemplarCity>Никосия</exemplarCity>
 			</zone>
 			<zone type="Europe/Prague">
 				<exemplarCity>Прага</exemplarCity>
@@ -2138,7 +2233,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Доминика</exemplarCity>
 			</zone>
 			<zone type="America/Santo_Domingo">
-				<exemplarCity>Санто Доминго</exemplarCity>
+				<exemplarCity>Санто-Доминго</exemplarCity>
 			</zone>
 			<zone type="Africa/Algiers">
 				<exemplarCity>Алжир</exemplarCity>
@@ -2156,10 +2251,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Каир</exemplarCity>
 			</zone>
 			<zone type="Africa/El_Aaiun">
-				<exemplarCity>Эл-Аюн</exemplarCity>
+				<exemplarCity>Эль-Аюн</exemplarCity>
 			</zone>
 			<zone type="Africa/Asmera">
-				<exemplarCity>Асмера</exemplarCity>
+				<exemplarCity>Асмара</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Canary">
 				<exemplarCity>Канар аралдары</exemplarCity>
@@ -2171,7 +2266,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Мадрид</exemplarCity>
 			</zone>
 			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>Аддис Абеба</exemplarCity>
+				<exemplarCity>Аддис-Абеба</exemplarCity>
 			</zone>
 			<zone type="Europe/Helsinki">
 				<exemplarCity>Хелсинки</exemplarCity>
@@ -2183,13 +2278,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Стенли</exemplarCity>
 			</zone>
 			<zone type="Pacific/Truk">
-				<exemplarCity>Трук</exemplarCity>
+				<exemplarCity>Чуук</exemplarCity>
 			</zone>
 			<zone type="Pacific/Ponape">
 				<exemplarCity>Понапе</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kosrae">
-				<exemplarCity>Косрае</exemplarCity>
+				<exemplarCity>Косраэ</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Faeroe">
 				<exemplarCity>Фарер аралдары</exemplarCity>
@@ -2198,11 +2293,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Париж</exemplarCity>
 			</zone>
 			<zone type="Africa/Libreville">
-				<exemplarCity>Либревил</exemplarCity>
+				<exemplarCity>Либревиль</exemplarCity>
 			</zone>
 			<zone type="Europe/London">
 				<long>
-					<daylight>Ұлыбританиялық жазғы уақыт</daylight>
+					<daylight>Ұлыбритания жазғы уақыты</daylight>
 				</long>
 				<exemplarCity>Лондон</exemplarCity>
 			</zone>
@@ -2234,7 +2329,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Скорсбиссун</exemplarCity>
 			</zone>
 			<zone type="America/Danmarkshavn">
-				<exemplarCity>Денмарксхавн</exemplarCity>
+				<exemplarCity>Данмарксхавн</exemplarCity>
 			</zone>
 			<zone type="Africa/Banjul">
 				<exemplarCity>Банжул</exemplarCity>
@@ -2252,7 +2347,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Афина</exemplarCity>
 			</zone>
 			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>Оңтүстік Джорджия</exemplarCity>
+				<exemplarCity>Оңтүстік Георгия</exemplarCity>
 			</zone>
 			<zone type="America/Guatemala">
 				<exemplarCity>Гватемала</exemplarCity>
@@ -2282,7 +2377,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Будапешт</exemplarCity>
 			</zone>
 			<zone type="Asia/Jakarta">
-				<exemplarCity>Жакарта</exemplarCity>
+				<exemplarCity>Джакарта</exemplarCity>
 			</zone>
 			<zone type="Asia/Pontianak">
 				<exemplarCity>Понтианак</exemplarCity>
@@ -2291,11 +2386,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Макассар</exemplarCity>
 			</zone>
 			<zone type="Asia/Jayapura">
-				<exemplarCity>Жайпур</exemplarCity>
+				<exemplarCity>Джаяпура</exemplarCity>
 			</zone>
 			<zone type="Europe/Dublin">
 				<long>
-					<daylight>Ирландиаялық жазғы уақыт</daylight>
+					<daylight>Ирландия жазғы уақыты</daylight>
 				</long>
 				<exemplarCity>Дублин</exemplarCity>
 			</zone>
@@ -2303,7 +2398,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Иерусалим</exemplarCity>
 			</zone>
 			<zone type="Europe/Isle_of_Man">
-				<exemplarCity>Мэн, арал</exemplarCity>
+				<exemplarCity>Мэн аралы</exemplarCity>
 			</zone>
 			<zone type="Asia/Calcutta">
 				<exemplarCity>Калькутта</exemplarCity>
@@ -2357,7 +2452,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Коморо</exemplarCity>
 			</zone>
 			<zone type="America/St_Kitts">
-				<exemplarCity>Сент Китс</exemplarCity>
+				<exemplarCity>Сент-Китс</exemplarCity>
 			</zone>
 			<zone type="Asia/Pyongyang">
 				<exemplarCity>Пхеньян</exemplarCity>
@@ -2402,7 +2497,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Коломбо</exemplarCity>
 			</zone>
 			<zone type="Africa/Monrovia">
-				<exemplarCity>Монравия</exemplarCity>
+				<exemplarCity>Монровия</exemplarCity>
 			</zone>
 			<zone type="Africa/Maseru">
 				<exemplarCity>Масеру</exemplarCity>
@@ -2420,7 +2515,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Триполи</exemplarCity>
 			</zone>
 			<zone type="Africa/Casablanca">
-				<exemplarCity>Кассабланка</exemplarCity>
+				<exemplarCity>Касабланка</exemplarCity>
 			</zone>
 			<zone type="Europe/Monaco">
 				<exemplarCity>Монако</exemplarCity>
@@ -2435,7 +2530,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Мариго</exemplarCity>
 			</zone>
 			<zone type="Indian/Antananarivo">
-				<exemplarCity>Антананариво</exemplarCity>
+				<exemplarCity>Антананариву</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kwajalein">
 				<exemplarCity>Кваджалейн</exemplarCity>
@@ -2474,7 +2569,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Нуакшот</exemplarCity>
 			</zone>
 			<zone type="America/Montserrat">
-				<exemplarCity>Монсеррат</exemplarCity>
+				<exemplarCity>Монтсеррат</exemplarCity>
 			</zone>
 			<zone type="Europe/Malta">
 				<exemplarCity>Мальта</exemplarCity>
@@ -2486,7 +2581,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Мальдив</exemplarCity>
 			</zone>
 			<zone type="Africa/Blantyre">
-				<exemplarCity>Блантаир</exemplarCity>
+				<exemplarCity>Блантайр</exemplarCity>
 			</zone>
 			<zone type="America/Tijuana">
 				<exemplarCity>Тихуана</exemplarCity>
@@ -2495,10 +2590,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Санта-Изабел</exemplarCity>
 			</zone>
 			<zone type="America/Hermosillo">
-				<exemplarCity>Эрмосилло</exemplarCity>
+				<exemplarCity>Эрмосильо</exemplarCity>
 			</zone>
 			<zone type="America/Mazatlan">
-				<exemplarCity>Мазалтан</exemplarCity>
+				<exemplarCity>Масатлан</exemplarCity>
 			</zone>
 			<zone type="America/Chihuahua">
 				<exemplarCity>Чиуауа</exemplarCity>
@@ -2585,13 +2680,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Таити</exemplarCity>
 			</zone>
 			<zone type="Pacific/Marquesas">
-				<exemplarCity>Маркиз аралдары</exemplarCity>
+				<exemplarCity>Маркиз</exemplarCity>
 			</zone>
 			<zone type="Pacific/Gambier">
 				<exemplarCity>Гамбье</exemplarCity>
 			</zone>
 			<zone type="Pacific/Port_Moresby">
-				<exemplarCity>Порт Морсби</exemplarCity>
+				<exemplarCity>Порт-Морсби</exemplarCity>
+			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Бугенвиль</exemplarCity>
 			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Манила</exemplarCity>
@@ -2630,7 +2728,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Палау</exemplarCity>
 			</zone>
 			<zone type="America/Asuncion">
-				<exemplarCity>Асунсион</exemplarCity>
+				<exemplarCity>Асунсьон</exemplarCity>
 			</zone>
 			<zone type="Asia/Qatar">
 				<exemplarCity>Катар</exemplarCity>
@@ -2677,6 +2775,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Иркутск</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Чита</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Якутск</exemplarCity>
 			</zone>
@@ -2695,6 +2796,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Магадан</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Среднеколымск</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Камчатка</exemplarCity>
 			</zone>
@@ -2768,7 +2872,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Мбабане</exemplarCity>
 			</zone>
 			<zone type="America/Grand_Turk">
-				<exemplarCity>Гранд Турк</exemplarCity>
+				<exemplarCity>Гранд-Тёрк</exemplarCity>
 			</zone>
 			<zone type="Africa/Ndjamena">
 				<exemplarCity>Нджамена</exemplarCity>
@@ -2801,10 +2905,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Тонгатапу</exemplarCity>
 			</zone>
 			<zone type="Europe/Istanbul">
-				<exemplarCity>Стамбул</exemplarCity>
+				<exemplarCity>Ыстамбұл</exemplarCity>
 			</zone>
 			<zone type="America/Port_of_Spain">
-				<exemplarCity>Испания порты</exemplarCity>
+				<exemplarCity>Порт-оф-Спейн</exemplarCity>
 			</zone>
 			<zone type="Pacific/Funafuti">
 				<exemplarCity>Фунафути</exemplarCity>
@@ -2876,10 +2980,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Бьюла, Солтүстік Дакота</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>Нью Салем</exemplarCity>
+				<exemplarCity>Нью-Салем, Солтүстік Дакота</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Солтүстік Дакота, Орталық</exemplarCity>
+				<exemplarCity>Сентер, Солтүстік Дакота</exemplarCity>
 			</zone>
 			<zone type="America/Chicago">
 				<exemplarCity>Чикаго</exemplarCity>
@@ -2891,7 +2995,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Винсенс, Индиана</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>Питерсберг</exemplarCity>
+				<exemplarCity>Питерсберг, Индиана</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Tell_City">
 				<exemplarCity>Телл-Сити, Индиана</exemplarCity>
@@ -2915,7 +3019,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Вивей, Индиана</exemplarCity>
 			</zone>
 			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>Монтиселло, Кентуки</exemplarCity>
+				<exemplarCity>Монтичелло, Кентуки</exemplarCity>
 			</zone>
 			<zone type="America/Detroit">
 				<exemplarCity>Детройт</exemplarCity>
@@ -2936,7 +3040,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Ватикан</exemplarCity>
 			</zone>
 			<zone type="America/St_Vincent">
-				<exemplarCity>Сент Винсент</exemplarCity>
+				<exemplarCity>Сент-Винсент</exemplarCity>
 			</zone>
 			<zone type="America/Caracas">
 				<exemplarCity>Каракас</exemplarCity>
@@ -2945,7 +3049,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Тортола</exemplarCity>
 			</zone>
 			<zone type="America/St_Thomas">
-				<exemplarCity>Сент Томас</exemplarCity>
+				<exemplarCity>Сент-Томас</exemplarCity>
 			</zone>
 			<zone type="Asia/Saigon">
 				<exemplarCity>Хошимин</exemplarCity>
@@ -2957,13 +3061,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Уоллис</exemplarCity>
 			</zone>
 			<zone type="Pacific/Apia">
-				<exemplarCity>Апия</exemplarCity>
+				<exemplarCity>Апиа</exemplarCity>
 			</zone>
 			<zone type="Asia/Aden">
 				<exemplarCity>Аден</exemplarCity>
 			</zone>
 			<zone type="Indian/Mayotte">
-				<exemplarCity>Майорка</exemplarCity>
+				<exemplarCity>Майотта</exemplarCity>
 			</zone>
 			<zone type="Africa/Johannesburg">
 				<exemplarCity>Йоханнесбург</exemplarCity>
@@ -2976,7 +3080,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</zone>
 			<metazone type="Afghanistan">
 				<long>
-					<standard>Ауғаныстан уақыты</standard>
+					<standard>Ауғанстан уақыты</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Central">
@@ -2997,15 +3101,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="Africa_Western">
 				<long>
 					<generic>Батыс Африка уақыты</generic>
-					<standard>Батыс Африка стандарт уақыты</standard>
-					<daylight>Батыс Африка жаздық уақыты</daylight>
+					<standard>Батыс Африка стандартты уақыты</standard>
+					<daylight>Батыс Африка жазғы уақыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
 				<long>
 					<generic>Аляска уақыты</generic>
 					<standard>Аляска стандартты уақыты</standard>
-					<daylight>Аляска күндізгі уақыты</daylight>
+					<daylight>Аляска жазғы уақыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="Amazon">
@@ -3017,30 +3121,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="America_Central">
 				<long>
-					<generic>Солтүстік Америка орталығының уақыты</generic>
-					<standard>Солтүстік Америка орталығының стандартты уақыты</standard>
-					<daylight>Солтүстік Америка орталығының күндізгі уақыты</daylight>
+					<generic>Солтүстік Америка орталық уақыты</generic>
+					<standard>Солтүстік Америка стандартты орталық уақыты</standard>
+					<daylight>Солтүстік Америка жазғы орталық уақыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
-					<generic>Оңтүстік Америка шығыс бөлігінің уақыты</generic>
-					<standard>Оңтүстік Америка шығыс бөлігінің стандартты уақыты</standard>
-					<daylight>Оңтүстік Америка шығыс бөлігінің күндізгі уақыты</daylight>
+					<generic>Солтүстік Америка шығыс уақыты</generic>
+					<standard>Солтүстік Америка стандартты шығыс уақыты</standard>
+					<daylight>Солтүстік Америка жазғы шығыс уақыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
-					<generic>Оңтүстік Америка таулы бөлігінің уақыты</generic>
-					<standard>Оңтүстік Америка таулы бөлігінің стандартты уақыты</standard>
-					<daylight>Оңтүстік Америка таулы бөлігінің күндізгі уақыты</daylight>
+					<generic>Солтүстік Америка тау уақыты</generic>
+					<standard>Солтүстік Америка стандартты тау уақыты</standard>
+					<daylight>Солтүстік Америка жазғы тау уақыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
-					<generic>Тынық мұхитындағы Оңтүстік Америка уақыты</generic>
-					<standard>Тынық мұхитындағы Оңтүстік Америка стандартты уақыты</standard>
-					<daylight>Тынық мұхитындағы Оңтүстік Америка жазғы уақыты</daylight>
+					<generic>Солтүстік Америка Тынық мұхиты уақыты</generic>
+					<standard>Солтүстік Америка стандартты Тынық мұхиты уақыты</standard>
+					<daylight>Солтүстік Америка жазғы Тынық мұхиты уақыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="Apia">
@@ -3054,7 +3158,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Сауд Арабиясы уақыты</generic>
 					<standard>Сауд Арабиясы стандартты уақыты</standard>
-					<daylight>Сауд Арабиясы күндізгі уақыты</daylight>
+					<daylight>Сауд Арабиясы жазғы уақыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina">
@@ -3082,35 +3186,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Атлантика уақыты</generic>
 					<standard>Атлантика стандартты уақыты</standard>
-					<daylight>Атлантикалық жаздық уақыт</daylight>
+					<daylight>Атлантика жазғы уақыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
 					<generic>Орталық Австралия уақыты</generic>
-					<standard>Австралияның орталық стандарт уақыты</standard>
-					<daylight>Австралиялық орталық жаздық уақыт</daylight>
+					<standard>Австралия стандартты орталық уақыты</standard>
+					<daylight>Австралия жазғы орталық уақыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_CentralWestern">
 				<long>
-					<generic>Орталық Австралиялық батыс уақыты</generic>
-					<standard>Орталық Австралиялық батыс стандарт уақыты</standard>
-					<daylight>Орталық Австралиялық батыс жаздық уақыты</daylight>
+					<generic>Австралия орталық-батыс уақыты</generic>
+					<standard>Австралия стандартты орталық-батыс уақыты</standard>
+					<daylight>Австралия жазғы орталық-батыс уақыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Eastern">
 				<long>
-					<generic>Шығыс Австралиялық уақыт</generic>
-					<standard>Шығыс Австралиялық стандарт уақыты</standard>
-					<daylight>Шығыс Австралиялық жаздық уақыт</daylight>
+					<generic>Австралия шығыс уақыты</generic>
+					<standard>Австралия стандартты шығыс уақыты</standard>
+					<daylight>Австралия жазғы шығыс уақыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Western">
 				<long>
-					<generic>Батыс Австралиялық уақыт</generic>
-					<standard>Батыс Австралиялық стандарт уақыты</standard>
-					<daylight>Батыс Австралиялық жаздық уақыт</daylight>
+					<generic>Австралия батыс уақыты</generic>
+					<standard>Австралия стандартты батыс уақыты</standard>
+					<daylight>Австралия жазғы батыс уақыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azerbaijan">
@@ -3165,7 +3269,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Chamorro">
 				<long>
-					<standard>Чаморро уақыты</standard>
+					<standard>Чаморро стандартты уақыты</standard>
 				</long>
 			</metazone>
 			<metazone type="Chatham">
@@ -3186,7 +3290,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Қытай уақыты</generic>
 					<standard>Қытай стандартты уақыты</standard>
-					<daylight>Қытай күндізгі уақыты</daylight>
+					<daylight>Қытай жазғы уақыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="Choibalsan">
@@ -3224,7 +3328,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Куба уақыты</generic>
 					<standard>Куба стандартты уақыты</standard>
-					<daylight>Куба күндізгі уақыты</daylight>
+					<daylight>Куба жазғы уақыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="Davis">
@@ -3234,7 +3338,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="DumontDUrville">
 				<long>
-					<standard>Дюмон д’Юрвиль уақыты</standard>
+					<standard>Дюмон-д’Юрвиль уақыты</standard>
 				</long>
 			</metazone>
 			<metazone type="East_Timor">
@@ -3257,15 +3361,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="Europe_Central">
 				<long>
 					<generic>Орталық Еуропа уақыты</generic>
-					<standard>Орталық Еуропа стандарт уақыты</standard>
-					<daylight>Орталық Еуропа жаздық уақыты</daylight>
+					<standard>Орталық Еуропа стандартты уақыты</standard>
+					<daylight>Орталық Еуропа жазғы уақыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Eastern">
 				<long>
 					<generic>Шығыс Еуропа уақыты</generic>
-					<standard>Шығыс Еуропа стандарт уақыты</standard>
-					<daylight>Шығыс Еуропа жаздық уақыты</daylight>
+					<standard>Шығыс Еуропа стандартты уақыты</standard>
+					<daylight>Шығыс Еуропа жазғы уақыты</daylight>
 				</long>
 				<short>
 					<generic>EET</generic>
@@ -3275,14 +3379,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
 				<long>
-					<standard>Қашық Шығыс Еуропа Уақыты</standard>
+					<standard>Қиыр Шығыс Еуропа уақыты</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
 				<long>
 					<generic>Батыс Еуропа уақыты</generic>
-					<standard>Батыс Еуропа стандарт уақыты</standard>
-					<daylight>Батыс Еуропа жаздық уақыты</daylight>
+					<standard>Батыс Еуропа стандартты уақыты</standard>
+					<daylight>Батыс Еуропа жазғы уақыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="Falkland">
@@ -3352,7 +3456,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Gulf">
 				<long>
-					<standard>Мексика шығанағы уақыты</standard>
+					<standard>Парсы шығанағы уақыты</standard>
 				</long>
 			</metazone>
 			<metazone type="Guyana">
@@ -3383,7 +3487,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="India">
 				<long>
-					<standard>Үндістан уақыты</standard>
+					<standard>Үндістан стандартты уақыты</standard>
 				</long>
 			</metazone>
 			<metazone type="Indian_Ocean">
@@ -3415,7 +3519,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Иран уақыты</generic>
 					<standard>Иран стандартты уақыты</standard>
-					<daylight>Иран күндізгі уақыты</daylight>
+					<daylight>Иран жазғы уақыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="Irkutsk">
@@ -3429,14 +3533,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Израиль уақыты</generic>
 					<standard>Израиль стандартты уақыты</standard>
-					<daylight>Израиль күндізгі уақыты</daylight>
+					<daylight>Израиль жазғы уақыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="Japan">
 				<long>
 					<generic>Жапония уақыты</generic>
 					<standard>Жапония стандартты уақыты</standard>
-					<daylight>Жапония күндізгі уақыты</daylight>
+					<daylight>Жапония жазғы уақыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kazakhstan_Eastern">
@@ -3453,7 +3557,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Корея уақыты</generic>
 					<standard>Корея стандартты уақыты</standard>
-					<daylight>Корея күндізгі уақыты</daylight>
+					<daylight>Корея жазғы уақыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kosrae">
@@ -3531,16 +3635,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Mexico_Northwest">
 				<long>
-					<generic>Солтүстік Мексика Уақыты</generic>
-					<standard>Солтүстік Мексика Стандартты Уақыты</standard>
-					<daylight>Солтүстік Мексика Күндізгі Уақыты</daylight>
+					<generic>Солтүстік Мексика уақыты</generic>
+					<standard>Солтүстік Мексика стандартты уақыты</standard>
+					<daylight>Солтүстік Мексика жазғы уақыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
-					<generic>Мексика Тынық Мұхит Уақыты</generic>
-					<standard>Мексика Тынық Мұхит Стандартты Уақыты</standard>
-					<daylight>Мексика Тынық Мұхит Күндізгі Уақыты</daylight>
+					<generic>Мексика Тынық мұхит уақыты</generic>
+					<standard>Мексика стандартты Тынық мұхит уақыты</standard>
+					<daylight>Мексика жазғы Тынық мұхит уақыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mongolia">
@@ -3583,7 +3687,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Жаңа Зеландия уақыты</generic>
 					<standard>Жаңа Зеландия стандартты уақыты</standard>
-					<daylight>Жаңа Зеландия күндізгі уақыты</daylight>
+					<daylight>Жаңа Зеландия жазғы уақыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="Newfoundland">
@@ -3671,7 +3775,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Сен-Пьер және Микелон уақыты</generic>
 					<standard>Сен-Пьер және Микелон стандартты уақыты</standard>
-					<daylight>Сен-Пьер және Микелон күндізгі уақыты</daylight>
+					<daylight>Сен-Пьер және Микелон жазғы уақыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="Pitcairn">
@@ -3705,7 +3809,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Самоа уақыты</generic>
 					<standard>Самоа стандартты уақыты</standard>
-					<daylight>Самоа күндізгі уақыты</daylight>
+					<daylight>Самоа жазғы уақыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="Seychelles">
@@ -3747,7 +3851,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Тайбэй уақыты</generic>
 					<standard>Тайбэй стандартты уақыты</standard>
-					<daylight>Тайбэй күндізгі уақыты</daylight>
+					<daylight>Тайбэй жазғы уақыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tajikistan">
@@ -3880,14 +3984,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.###</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
+			<decimalFormatLength type="long">
+				<decimalFormat>
+					<pattern type="1000" count="one">0 мың</pattern>
+					<pattern type="1000" count="other">0 мың</pattern>
+					<pattern type="10000" count="one">00 мың</pattern>
+					<pattern type="10000" count="other">00 мың</pattern>
+					<pattern type="100000" count="one">000 мың</pattern>
+					<pattern type="100000" count="other">000 мың</pattern>
+					<pattern type="1000000" count="one">0 миллион</pattern>
+					<pattern type="1000000" count="other">0 миллион</pattern>
+					<pattern type="10000000" count="one">00 миллион</pattern>
+					<pattern type="10000000" count="other">00 миллион</pattern>
+					<pattern type="100000000" count="one">000 миллион</pattern>
+					<pattern type="100000000" count="other">000 миллион</pattern>
+					<pattern type="1000000000" count="one">0 миллиард</pattern>
+					<pattern type="1000000000" count="other">0 миллиард</pattern>
+					<pattern type="10000000000" count="one">00 миллиард</pattern>
+					<pattern type="10000000000" count="other">00 миллиард</pattern>
+					<pattern type="100000000000" count="one">000 миллиард</pattern>
+					<pattern type="100000000000" count="other">000 миллиард</pattern>
+					<pattern type="1000000000000" count="one">0 триллион</pattern>
+					<pattern type="1000000000000" count="other">0 триллион</pattern>
+					<pattern type="10000000000000" count="one">00 триллион</pattern>
+					<pattern type="10000000000000" count="other">00 триллион</pattern>
+					<pattern type="100000000000000" count="one">000 триллион</pattern>
+					<pattern type="100000000000000" count="other">000 триллион</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
 			<decimalFormatLength type="short">
 				<decimalFormat>
 					<pattern type="1000" count="one">0 мың</pattern>
 					<pattern type="1000" count="other">0 мың</pattern>
 					<pattern type="10000" count="one">00 мың</pattern>
 					<pattern type="10000" count="other">00 мың</pattern>
-					<pattern type="100000" count="one">000м</pattern>
-					<pattern type="100000" count="other">000М</pattern>
+					<pattern type="100000" count="one">000 мың</pattern>
+					<pattern type="100000" count="other">000 мың</pattern>
 					<pattern type="1000000" count="one">0 млн</pattern>
 					<pattern type="1000000" count="other">0 млн</pattern>
 					<pattern type="10000000" count="one">00 млн</pattern>
@@ -3898,14 +4030,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern type="1000000000" count="other">0 млрд</pattern>
 					<pattern type="10000000000" count="one">00 млрд</pattern>
 					<pattern type="10000000000" count="other">00 млрд</pattern>
-					<pattern type="100000000000" count="one">000МЛ</pattern>
-					<pattern type="100000000000" count="other">000Б</pattern>
+					<pattern type="100000000000" count="one">000 млрд</pattern>
+					<pattern type="100000000000" count="other">000 млрд</pattern>
 					<pattern type="1000000000000" count="one">0 трлн</pattern>
 					<pattern type="1000000000000" count="other">0 трлн</pattern>
 					<pattern type="10000000000000" count="one">00 трлн</pattern>
 					<pattern type="10000000000000" count="other">00 трлн</pattern>
-					<pattern type="100000000000000" count="one">000T</pattern>
-					<pattern type="100000000000000" count="other">000T</pattern>
+					<pattern type="100000000000000" count="one">000 трлн</pattern>
+					<pattern type="100000000000000" count="other">000 трлн</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
@@ -3932,26 +4064,55 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">0 мың ¤</pattern>
+					<pattern type="1000" count="other">0 мың ¤</pattern>
+					<pattern type="10000" count="one">00 мың ¤</pattern>
+					<pattern type="10000" count="other">00 мың ¤</pattern>
+					<pattern type="100000" count="one">000 мың ¤</pattern>
+					<pattern type="100000" count="other">000 мың ¤</pattern>
+					<pattern type="1000000" count="one">0 млн ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="one">00 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="one">000 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="one">0 млрд ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="one">00 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="one">000 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="one">0 трлн ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="one">00 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="one">000 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
-				<displayName>Дихрам (БАЭ)</displayName>
-				<displayName count="one">Дихрам (БАЭ)</displayName>
-				<displayName count="other">Дихрам (БАЭ)</displayName>
+				<displayName>Біріккен Араб Әмірліктерінің дирхамы</displayName>
+				<displayName count="one">БАӘ дирхамы</displayName>
+				<displayName count="other">БАӘ дирхамы</displayName>
 				<symbol>AED</symbol>
 			</currency>
 			<currency type="AFN">
-				<displayName>Ауғаныстан афганиі</displayName>
-				<displayName count="one">Ауғаныстан афганиі</displayName>
-				<displayName count="other">Ауғаныстан афганиі</displayName>
+				<displayName>Ауғанстан афганиі</displayName>
+				<displayName count="one">Ауғанстан афганиі</displayName>
+				<displayName count="other">Ауғанстан афганиі</displayName>
 				<symbol>AFN</symbol>
 			</currency>
 			<currency type="ALL">
-				<displayName>Албания лекі</displayName>
-				<displayName count="one">Албания лекі</displayName>
-				<displayName count="other">Албания лекі</displayName>
+				<displayName>Албания легі</displayName>
+				<displayName count="one">Албания легі</displayName>
+				<displayName count="other">Албания легі</displayName>
+				<symbol draft="contributed">ALL</symbol>
 			</currency>
 			<currency type="AMD">
 				<displayName>Армения драмы</displayName>
@@ -3970,11 +4131,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Ангола кванзасы</displayName>
 				<displayName count="other">Ангола кванзасы</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="ARS">
 				<displayName>Аргентина песосы</displayName>
 				<displayName count="one">Аргентина песосы</displayName>
 				<displayName count="other">Аргентина песосы</displayName>
+				<symbol draft="contributed">ARS</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="AUD">
 				<displayName>Австралия доллары</displayName>
@@ -3984,9 +4148,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="AWG">
-				<displayName>Арубан флоринсы</displayName>
-				<displayName count="one">Арубан флоринсы</displayName>
-				<displayName count="other">Арубан флоринсы</displayName>
+				<displayName>Аруба флорині</displayName>
+				<displayName count="one">Аруба флорині</displayName>
+				<displayName count="other">Аруба флорині</displayName>
 				<symbol>AWG</symbol>
 			</currency>
 			<currency type="AZM">
@@ -4002,6 +4166,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Босния және Герцеговина айырбасталмалы маркасы</displayName>
 				<displayName count="one">Босния және Герцеговина айырбасталмалы маркасы</displayName>
 				<displayName count="other">Босния және Герцеговина айырбасталмалы маркасы</displayName>
+				<symbol draft="contributed">BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>Барбадос доллары</displayName>
@@ -4018,9 +4184,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">৳</symbol>
 			</currency>
 			<currency type="BGN">
-				<displayName>Болгар леві</displayName>
-				<displayName count="one">Болгар леві</displayName>
-				<displayName count="other">Болгар леві</displayName>
+				<displayName>Болгария леві</displayName>
+				<displayName count="one">Болгария леві</displayName>
+				<displayName count="other">Болгария леві</displayName>
+				<symbol draft="contributed">BGN</symbol>
 			</currency>
 			<currency type="BHD">
 				<displayName>Бахрейн динары</displayName>
@@ -4052,9 +4219,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Боливия боливианосы</displayName>
 				<displayName count="one">Боливия боливианосы</displayName>
 				<displayName count="other">Боливия боливианосы</displayName>
+				<symbol draft="contributed">BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BRL">
 				<displayName>Бразилия реалы</displayName>
+				<displayName count="one">Бразилия реалы</displayName>
+				<displayName count="other">Бразилия реалы</displayName>
+				<symbol draft="contributed">R$</symbol>
+				<symbol alt="narrow" draft="contributed">R$</symbol>
 			</currency>
 			<currency type="BSD">
 				<displayName>Багам доллары</displayName>
@@ -4074,11 +4247,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Ботсвана пуласы</displayName>
 				<displayName count="other">Ботсвана пуласы</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYR">
-				<displayName>Беларус рублі</displayName>
-				<displayName count="one">Беларус рублі</displayName>
-				<displayName count="other">Беларус рублі</displayName>
+				<displayName>Беларусь рублі</displayName>
+				<displayName count="one">Беларусь рублі</displayName>
+				<displayName count="other">Беларусь рублі</displayName>
+				<symbol draft="contributed">BYR</symbol>
+				<symbol alt="narrow" draft="contributed">р.</symbol>
 			</currency>
 			<currency type="BZD">
 				<displayName>Белиз доллары</displayName>
@@ -4104,16 +4280,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Швейцария франкы</displayName>
 				<displayName count="one">Швейцария франкы</displayName>
 				<displayName count="other">Швейцария франкы</displayName>
+				<symbol draft="contributed">CHF</symbol>
 			</currency>
 			<currency type="CLP">
 				<displayName>Чили песосы</displayName>
 				<displayName count="one">Чили песосы</displayName>
 				<displayName count="other">Чили песосы</displayName>
+				<symbol draft="contributed">CLP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CNY">
-				<displayName>Қытай юаны</displayName>
-				<displayName count="one">Қытай юаны</displayName>
-				<displayName count="other">Қытай юаны</displayName>
+				<displayName>Қытай юані</displayName>
+				<displayName count="one">Қытай юані</displayName>
+				<displayName count="other">Қытай юані</displayName>
 				<symbol>CN¥</symbol>
 				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
@@ -4121,11 +4300,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Колумбия песосы</displayName>
 				<displayName count="one">Колумбия песосы</displayName>
 				<displayName count="other">Колумбия песосы</displayName>
+				<symbol draft="contributed">COP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CRC">
-				<displayName>Коста-рика колоны</displayName>
-				<displayName count="one">Коста-рика колоны</displayName>
-				<displayName count="other">Коста-рика колоны</displayName>
+				<displayName>Коста-Рика колоны</displayName>
+				<displayName count="one">Коста-Рика колоны</displayName>
+				<displayName count="other">Коста-Рика колоны</displayName>
 				<symbol>CRC</symbol>
 				<symbol alt="narrow" draft="contributed">₡</symbol>
 			</currency>
@@ -4134,6 +4315,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Куба айырбасталмалы песосы</displayName>
 				<displayName count="other">Куба айырбасталмалы песосы</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>Куба песосы</displayName>
@@ -4149,9 +4331,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>CVE</symbol>
 			</currency>
 			<currency type="CZK">
-				<displayName>Чех кронасы</displayName>
-				<displayName count="one">Чех кронасы</displayName>
-				<displayName count="other">Чех кронасы</displayName>
+				<displayName>Чехия кронасы</displayName>
+				<displayName count="one">Чехия кронасы</displayName>
+				<displayName count="other">Чехия кронасы</displayName>
+				<symbol draft="contributed">CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DJF">
 				<displayName>Джибути франкы</displayName>
@@ -4163,6 +4347,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Дат кроны</displayName>
 				<displayName count="one">Дат кроны</displayName>
 				<displayName count="other">Дат кроны</displayName>
+				<symbol draft="contributed">DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Доминикан песосы</displayName>
@@ -4182,11 +4368,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Мысыр фунты</displayName>
 				<displayName count="other">Мысыр фунты</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
-				<displayName>Эритрей накфасы</displayName>
-				<displayName count="one">Эритрей накфасы</displayName>
-				<displayName count="other">Эритрей накфасы</displayName>
+				<displayName>Эритрея накфасы</displayName>
+				<displayName count="one">Эритрея накфасы</displayName>
+				<displayName count="other">Эритрея накфасы</displayName>
 				<symbol>ERN</symbol>
 			</currency>
 			<currency type="ETB">
@@ -4197,6 +4384,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="EUR">
 				<displayName>Еуро</displayName>
+				<displayName count="one">еуро</displayName>
+				<displayName count="other">еуро</displayName>
+				<symbol draft="contributed">€</symbol>
+				<symbol alt="narrow" draft="contributed">€</symbol>
 			</currency>
 			<currency type="FJD">
 				<displayName>Фиджи доллары</displayName>
@@ -4209,15 +4400,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Фолкленд аралдарының фунты</displayName>
 				<displayName count="one">Фолкленд аралдарының фунты</displayName>
 				<displayName count="other">Фолкленд аралдарының фунты</displayName>
+				<symbol draft="contributed">FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GBP">
 				<displayName>Британия фунты</displayName>
+				<displayName count="one">Британия фунты</displayName>
+				<displayName count="other">Британия фунты</displayName>
+				<symbol draft="contributed">£</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GEL">
 				<displayName>Грузия лариі</displayName>
 				<displayName count="one">Грузия лариі</displayName>
 				<displayName count="other">Грузия лариі</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHS">
 				<displayName>Гана седиі</displayName>
@@ -4229,6 +4427,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Гибралтар фунты</displayName>
 				<displayName count="one">Гибралтар фунты</displayName>
 				<displayName count="other">Гибралтар фунты</displayName>
+				<symbol draft="contributed">GIP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GMD">
 				<displayName>Гамбия даласиі</displayName>
@@ -4237,21 +4437,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>GMD</symbol>
 			</currency>
 			<currency type="GNF">
-				<displayName>Гвиней франкы</displayName>
-				<displayName count="one">Гвиней франкы</displayName>
-				<displayName count="other">Гвиней франкы</displayName>
+				<displayName>Гвинея франкы</displayName>
+				<displayName count="one">Гвинея франкы</displayName>
+				<displayName count="other">Гвинея франкы</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GTQ">
 				<displayName>Гватемала кетсалі</displayName>
 				<displayName count="one">Гватемала кетсалі</displayName>
 				<displayName count="other">Гватемала кетсалі</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GYD">
 				<displayName>Гайана доллары</displayName>
 				<displayName count="one">Гайана доллары</displayName>
 				<displayName count="other">Гайана доллары</displayName>
+				<symbol draft="contributed">GYD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="HKD">
 				<displayName>Гонконг доллары</displayName>
@@ -4265,11 +4469,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Гондурас лемпираcы</displayName>
 				<displayName count="other">Гондурас лемпираcы</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRK">
 				<displayName>Хорватия кунасы</displayName>
 				<displayName count="one">Хорватия кунасы</displayName>
 				<displayName count="other">Хорватия кунасы</displayName>
+				<symbol draft="contributed">HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>Гаити гурды</displayName>
@@ -4278,15 +4485,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>HTG</symbol>
 			</currency>
 			<currency type="HUF">
-				<displayName>Венгер форинты</displayName>
-				<displayName count="one">Венгер форинты</displayName>
-				<displayName count="other">Венгер форинты</displayName>
+				<displayName>Венгрия форинты</displayName>
+				<displayName count="one">Венгрия форинты</displayName>
+				<displayName count="other">Венгрия форинты</displayName>
+				<symbol draft="contributed">HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
-				<displayName>Индонезия рупиі</displayName>
-				<displayName count="one">Индонезия рупиі</displayName>
-				<displayName count="other">Индонезия рупиі</displayName>
+				<displayName>Индонезия рупиясы</displayName>
+				<displayName count="one">Индонезия рупиясы</displayName>
+				<displayName count="other">Индонезия рупиясы</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="ILS">
 				<displayName>Израиль жаңа шекелі</displayName>
@@ -4296,9 +4506,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">₪</symbol>
 			</currency>
 			<currency type="INR">
-				<displayName>Үнді рупиясы</displayName>
-				<displayName count="one">Үнді рупиясы</displayName>
-				<displayName count="other">Үнді рупиясы</displayName>
+				<displayName>Үндістан рупиясы</displayName>
+				<displayName count="one">Үндістан рупиясы</displayName>
+				<displayName count="other">Үндістан рупиясы</displayName>
 				<symbol>₹</symbol>
 				<symbol alt="narrow" draft="contributed">₹</symbol>
 			</currency>
@@ -4318,6 +4528,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Исландия кронасы</displayName>
 				<displayName count="one">Исландия кронасы</displayName>
 				<displayName count="other">Исландия кронасы</displayName>
+				<symbol draft="contributed">ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="JMD">
 				<displayName>Ямайка доллары</displayName>
@@ -4327,15 +4539,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="JOD">
-				<displayName>Йордания динары</displayName>
-				<displayName count="one">Йордания динары</displayName>
-				<displayName count="other">Йордания динары</displayName>
+				<displayName>Иордания динары</displayName>
+				<displayName count="one">Иордания динары</displayName>
+				<displayName count="other">Иордания динары</displayName>
 				<symbol>JOD</symbol>
 			</currency>
 			<currency type="JPY">
-				<displayName>Жапон иені</displayName>
-				<displayName count="one">Жапон иені</displayName>
-				<displayName count="other">Жапон иені</displayName>
+				<displayName>Жапония иенасы</displayName>
+				<displayName count="one">Жапония иенасы</displayName>
+				<displayName count="other">Жапония иенасы</displayName>
 				<symbol>JP¥</symbol>
 				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
@@ -4363,12 +4575,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Комор аралдары франкы</displayName>
 				<displayName count="other">Комор аралдары франкы</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>Солтүстік Корея воны</displayName>
 				<displayName count="one">Солтүстік Корея воны</displayName>
 				<displayName count="other">Солтүстік Корея воны</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>Оңтүстік Корея воны</displayName>
@@ -4409,12 +4623,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Ливан фунты</displayName>
 				<displayName count="other">Ливан фунты</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>Шри-Ланка рупиясы</displayName>
 				<displayName count="one">Шри-Ланка рупиясы</displayName>
 				<displayName count="other">Шри-Ланка рупиясы</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>Либерия доллары</displayName>
@@ -4446,31 +4662,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>MAD</symbol>
 			</currency>
 			<currency type="MDL">
-				<displayName>Молдава лейі</displayName>
-				<displayName count="one">Молдава лейі</displayName>
-				<displayName count="other">Молдава лейі</displayName>
+				<displayName>Молдова лейі</displayName>
+				<displayName count="one">Молдова лейі</displayName>
+				<displayName count="other">Молдова лейі</displayName>
+				<symbol draft="contributed">MDL</symbol>
 			</currency>
 			<currency type="MGA">
 				<displayName>Малагаси ариариы</displayName>
 				<displayName count="one">Малагаси ариариы</displayName>
 				<displayName count="other">Малагаси ариариы</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MKD">
 				<displayName>Македония динары</displayName>
 				<displayName count="one">Македония динары</displayName>
 				<displayName count="other">Македония динары</displayName>
+				<symbol draft="contributed">MKD</symbol>
 			</currency>
 			<currency type="MMK">
 				<displayName>Мьянма кьяты</displayName>
 				<displayName count="one">Мьянма кьяты</displayName>
 				<displayName count="other">Мьянма кьяты</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
-				<displayName>Моңғолия тугрикасы</displayName>
-				<displayName count="one">Моңғолия тугрикасы</displayName>
-				<displayName count="other">Моңғолия тугрикасы</displayName>
+				<displayName>Моңғолия тугригі</displayName>
+				<displayName count="one">Моңғолия тугригі</displayName>
+				<displayName count="other">Моңғолия тугригі</displayName>
 				<symbol>MNT</symbol>
 				<symbol alt="narrow" draft="contributed">₮</symbol>
 			</currency>
@@ -4491,6 +4711,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Маврикий рупиясы</displayName>
 				<displayName count="other">Маврикий рупиясы</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>Мальдив руфиясы</displayName>
@@ -4505,9 +4726,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>MWK</symbol>
 			</currency>
 			<currency type="MXN">
-				<displayName>Мексика пессосы</displayName>
-				<displayName count="one">Мексика пессосы</displayName>
-				<displayName count="other">Мексика пессосы</displayName>
+				<displayName>Мексика песосы</displayName>
+				<displayName count="one">Мексика песосы</displayName>
+				<displayName count="other">Мексика песосы</displayName>
 				<symbol>MX$</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -4516,6 +4737,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Малайзия ринггиті</displayName>
 				<displayName count="other">Малайзия ринггиті</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZN">
 				<displayName>Мозамбик метикалы</displayName>
@@ -4542,17 +4764,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Никарагуа кордобасы</displayName>
 				<displayName count="other">Никарагуа кордобасы</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NOK">
 				<displayName>Норвегия кроны</displayName>
 				<displayName count="one">Норвегия кроны</displayName>
 				<displayName count="other">Норвегия кроны</displayName>
+				<symbol draft="contributed">NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
-				<displayName>Непал рупиі</displayName>
-				<displayName count="one">Непал рупиі</displayName>
-				<displayName count="other">Непал рупиі</displayName>
+				<displayName>Непал рупиясы</displayName>
+				<displayName count="one">Непал рупиясы</displayName>
+				<displayName count="other">Непал рупиясы</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>Жаңа Зеландия доллары</displayName>
@@ -4577,6 +4803,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Перу жаңа солі</displayName>
 				<displayName count="one">Перу жаңа солі</displayName>
 				<displayName count="other">Перу жаңа солі</displayName>
+				<symbol draft="contributed">PEN</symbol>
 			</currency>
 			<currency type="PGK">
 				<displayName>Папуа - Жаңа Гвинея кинасы</displayName>
@@ -4592,20 +4819,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">₱</symbol>
 			</currency>
 			<currency type="PKR">
-				<displayName>Пәкістан рупиі</displayName>
-				<displayName count="one">Пәкістан рупиі</displayName>
-				<displayName count="other">Пәкістан рупиі</displayName>
+				<displayName>Пәкістан рупиясы</displayName>
+				<displayName count="one">Пәкістан рупиясы</displayName>
+				<displayName count="other">Пәкістан рупиясы</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>Польша злотасы</displayName>
 				<displayName count="one">Польша злотасы</displayName>
 				<displayName count="other">Польша злотасы</displayName>
+				<symbol draft="contributed">PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PYG">
 				<displayName>Парагвай гуараниі</displayName>
 				<displayName count="one">Парагвай гуараниі</displayName>
 				<displayName count="other">Парагвай гуараниі</displayName>
+				<symbol draft="contributed">PYG</symbol>
+				<symbol alt="narrow" draft="contributed">₲</symbol>
 			</currency>
 			<currency type="QAR">
 				<displayName>Катар риалы</displayName>
@@ -4617,26 +4849,32 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Румыния лейі</displayName>
 				<displayName count="one">Румыния лейі</displayName>
 				<displayName count="other">Румыния лейі</displayName>
+				<symbol draft="contributed">RON</symbol>
 			</currency>
 			<currency type="RSD">
 				<displayName>Сербия динары</displayName>
 				<displayName count="one">Сербия динары</displayName>
 				<displayName count="other">Сербия динары</displayName>
+				<symbol draft="contributed">RSD</symbol>
 			</currency>
 			<currency type="RUB">
-				<displayName>Ресей рубль</displayName>
-				<symbol>руб.</symbol>
+				<displayName>Ресей рублі</displayName>
+				<displayName count="one">Ресей рублі</displayName>
+				<displayName count="other">Ресей рублі</displayName>
+				<symbol>₽</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RWF">
 				<displayName>Руанда франкы</displayName>
 				<displayName count="one">Руанда франкы</displayName>
 				<displayName count="other">Руанда франкы</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
-				<displayName>Сауд Арабия риалы</displayName>
-				<displayName count="one">Сауд Арабия риалы</displayName>
-				<displayName count="other">Сауд Арабия риалы</displayName>
+				<displayName>Сауд Арабиясының риалы</displayName>
+				<displayName count="one">Сауд Арабиясының риалы</displayName>
+				<displayName count="other">Сауд Арабиясының риалы</displayName>
 				<symbol>SAR</symbol>
 			</currency>
 			<currency type="SBD">
@@ -4659,9 +4897,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>SDG</symbol>
 			</currency>
 			<currency type="SEK">
-				<displayName>Швед кроны</displayName>
-				<displayName count="one">Швед кроны</displayName>
-				<displayName count="other">Швед кроны</displayName>
+				<displayName>Швеция кроны</displayName>
+				<displayName count="one">Швеция кроны</displayName>
+				<displayName count="other">Швеция кроны</displayName>
+				<symbol draft="contributed">SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>Сингапур доллары</displayName>
@@ -4675,6 +4915,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Әулие Елена аралы фунты</displayName>
 				<displayName count="other">Әулие Елена аралы фунты</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SLL">
 				<displayName>Сьерра-Леоне леонесы</displayName>
@@ -4692,6 +4933,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Суринам доллары</displayName>
 				<displayName count="one">Суринам доллары</displayName>
 				<displayName count="other">Суринам доллары</displayName>
+				<symbol draft="contributed">SRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SSP">
 				<displayName>Оңтүстік Судан фунты</displayName>
@@ -4705,12 +4948,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Сант-Томе мен Принсипи добрасы</displayName>
 				<displayName count="other">Сант-Томе мен Принсипи добрасы</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SYP">
 				<displayName>Сирия фунты</displayName>
 				<displayName count="one">Сирия фунты</displayName>
 				<displayName count="other">Сирия фунты</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>Свазиленд лилангениі</displayName>
@@ -4723,6 +4968,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Тай баты</displayName>
 				<displayName count="other">Тай баты</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJS">
 				<displayName>Тәжікстан сомониі</displayName>
@@ -4747,6 +4993,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Тонга паангасы</displayName>
 				<displayName count="other">Тонга паангасы</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TRY">
 				<displayName>Түрік лирасы</displayName>
@@ -4754,6 +5001,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">Түрік лирасы</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Тринидад пен Тобаго доллары</displayName>
@@ -4779,6 +5027,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Украина гривнасы</displayName>
 				<displayName count="one">Украина гривнасы</displayName>
 				<displayName count="other">Украина гривнасы</displayName>
+				<symbol draft="contributed">UAH</symbol>
+				<symbol alt="narrow" draft="contributed">₴</symbol>
 			</currency>
 			<currency type="UGX">
 				<displayName>Уганда шиллингі</displayName>
@@ -4797,6 +5047,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Уругвай песосы</displayName>
 				<displayName count="one">Уругвай песосы</displayName>
 				<displayName count="other">Уругвай песосы</displayName>
+				<symbol draft="contributed">UYU</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="UZS">
 				<displayName>Өзбекстан сомы</displayName>
@@ -4808,6 +5060,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Венесуэла боливары</displayName>
 				<displayName count="one">Венесуэла боливары</displayName>
 				<displayName count="other">Венесуэла боливары</displayName>
+				<symbol draft="contributed">VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>Вьетнам донгы</displayName>
@@ -4839,6 +5093,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Шығыс Кариб доллары</displayName>
 				<displayName count="other">Шығыс Кариб доллары</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XOF">
 				<displayName>КФА ВСЕАО франкы</displayName>
@@ -4854,8 +5109,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="XXX">
 				<displayName>Белгісіз валюта</displayName>
-				<displayName count="one">Белгісіз валюта</displayName>
-				<displayName count="other">Белгісіз валюта</displayName>
+				<displayName count="one">(белгісіз валюта бірлігі)</displayName>
+				<displayName count="other">(белгісіз валюта)</displayName>
 			</currency>
 			<currency type="YER">
 				<displayName>Йемен риалы</displayName>
@@ -4868,12 +5123,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Оңтүстік Африка рэнді</displayName>
 				<displayName count="other">Оңтүстік Африка рэнді</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMW">
 				<displayName>Замбия квачасы</displayName>
 				<displayName count="one">Замбия квачасы</displayName>
 				<displayName count="other">Замбия квачасы</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
@@ -4884,7 +5141,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 	<units>
 		<unitLength type="long">
 			<compoundUnit type="per">
-				<compoundUnitPattern>{0}{1}қатынасы</compoundUnitPattern>
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>гравитациялық күш</displayName>
@@ -4892,13 +5149,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} гравитациялық күш</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
-				<displayName>шаршыланған секундқа шаққан метр</displayName>
-				<unitPattern count="one">{0} метр/шаршыланған секунд</unitPattern>
-				<unitPattern count="other">{0} метр/шаршыланған секунд</unitPattern>
+				<displayName>метр/шаршы секунд</displayName>
+				<unitPattern count="one">{0} метр/шаршы секунд</unitPattern>
+				<unitPattern count="other">{0} метр/шаршы секунд</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>айналым</displayName>
+				<unitPattern count="one">{0} айналым</unitPattern>
+				<unitPattern count="other">{0} айналым</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>радиан</displayName>
+				<unitPattern count="one">{0} радиан</unitPattern>
+				<unitPattern count="other">{0} радиан</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>градус</displayName>
+				<unitPattern count="one">{0} градус</unitPattern>
+				<unitPattern count="other">{0} градус</unitPattern>
 			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>минут</displayName>
-				<unitPattern count="one">минут</unitPattern>
+				<unitPattern count="one">{0} минут</unitPattern>
 				<unitPattern count="other">{0} минут</unitPattern>
 			</unit>
 			<unit type="angle-arc-second">
@@ -4906,30 +5178,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} секунд</unitPattern>
 				<unitPattern count="other">{0} секунд</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>градус</displayName>
-				<unitPattern count="one">{0} градус</unitPattern>
-				<unitPattern count="other">{0} градус</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>радиан</displayName>
-				<unitPattern count="one">{0} радиан</unitPattern>
-				<unitPattern count="other">{0} радиан</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>акр</displayName>
-				<unitPattern count="one">{0} акр</unitPattern>
-				<unitPattern count="other">{0} акр</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>шаршы километр</displayName>
+				<unitPattern count="one">{0} шаршы километр</unitPattern>
+				<unitPattern count="other">{0} шаршы километр</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>гектар</displayName>
 				<unitPattern count="one">{0} гектар</unitPattern>
 				<unitPattern count="other">{0} гектар</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>шаршы метр</displayName>
+				<unitPattern count="one">{0} шаршы метр</unitPattern>
+				<unitPattern count="other">{0} шаршы метр</unitPattern>
+				<perUnitPattern>{0}/метр²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>шаршы сантиметр</displayName>
 				<unitPattern count="one">{0} шаршы сантиметр</unitPattern>
 				<unitPattern count="other">{0} шаршы сантиметр</unitPattern>
+				<perUnitPattern>{0}/см²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>шаршы миля</displayName>
+				<unitPattern count="one">{0} шаршы миля</unitPattern>
+				<unitPattern count="other">{0} шаршы миля</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>акр</displayName>
+				<unitPattern count="one">{0} акр</unitPattern>
+				<unitPattern count="other">{0} акр</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>шаршы ярд</displayName>
+				<unitPattern count="one">{0} шаршы ярд</unitPattern>
+				<unitPattern count="other">{0} шаршы ярд</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>шаршы фут</displayName>
@@ -4940,139 +5224,140 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>шаршы дюйм</displayName>
 				<unitPattern count="one">{0} шаршы дюйм</unitPattern>
 				<unitPattern count="other">{0} шаршы дюйм</unitPattern>
+				<perUnitPattern>{0}/дюйм²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>шаршы километр</displayName>
-				<unitPattern count="one">{0} шаршы километр</unitPattern>
-				<unitPattern count="other">{0} шаршы километр</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>шаршы метр</displayName>
-				<unitPattern count="one">{0} шаршы метр</unitPattern>
-				<unitPattern count="other">{0} шаршы метр</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>шаршы миля</displayName>
-				<unitPattern count="one">{0} шаршы миля</unitPattern>
-				<unitPattern count="other">{0} шаршы миля</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>шаршы ярд</displayName>
-				<unitPattern count="one">{0} шаршы ярд</unitPattern>
-				<unitPattern count="other">{0} шаршы ярд</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>карат</displayName>
+				<unitPattern count="one">{0} карат</unitPattern>
+				<unitPattern count="other">{0} карат</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>литр/километр</displayName>
 				<unitPattern count="one">{0} литр/километр</unitPattern>
 				<unitPattern count="other">{0} литр/километр</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>литр/100 километр</displayName>
+				<unitPattern count="one">{0} литр/100 километр</unitPattern>
+				<unitPattern count="other">{0} литр/100 километр</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>миля/галлон</displayName>
 				<unitPattern count="one">{0} миля/галлон</unitPattern>
 				<unitPattern count="other">{0} миля/галллон</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>бит</displayName>
-				<unitPattern count="one">{0} бит</unitPattern>
-				<unitPattern count="other">{0} бит</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>байт</displayName>
-				<unitPattern count="one">{0} байт</unitPattern>
-				<unitPattern count="other">{0} байт</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>гигабит</displayName>
-				<unitPattern count="one">{0} гигабит</unitPattern>
-				<unitPattern count="other">{0} гигабит</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>гигабайт</displayName>
-				<unitPattern count="one">{0} гигабайт</unitPattern>
-				<unitPattern count="other">{0} гигабайт</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>килобит</displayName>
-				<unitPattern count="one">{0} килобит</unitPattern>
-				<unitPattern count="other">{0} килобит</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>килобайт</displayName>
-				<unitPattern count="one">{0} килобайт</unitPattern>
-				<unitPattern count="other">{0} килобайт</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>мегабит</displayName>
-				<unitPattern count="one">{0} мегабит</unitPattern>
-				<unitPattern count="other">{0} мегабит</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>мегабайт</displayName>
-				<unitPattern count="one">{0} мегабайт</unitPattern>
-				<unitPattern count="other">{0} мегабайт</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>терабит</displayName>
-				<unitPattern count="one">{0} терабит</unitPattern>
-				<unitPattern count="other">{0} терабит</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>терабайт</displayName>
 				<unitPattern count="one">{0} терабайт</unitPattern>
 				<unitPattern count="other">{0} терабайт</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>терабит</displayName>
+				<unitPattern count="one">{0} терабит</unitPattern>
+				<unitPattern count="other">{0} терабит</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>гигабайт</displayName>
+				<unitPattern count="one">{0} гигабайт</unitPattern>
+				<unitPattern count="other">{0} гигабайт</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>гигабит</displayName>
+				<unitPattern count="one">{0} гигабит</unitPattern>
+				<unitPattern count="other">{0} гигабит</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>мегабайт</displayName>
+				<unitPattern count="one">{0} мегабайт</unitPattern>
+				<unitPattern count="other">{0} мегабайт</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>мегабит</displayName>
+				<unitPattern count="one">{0} мегабит</unitPattern>
+				<unitPattern count="other">{0} мегабит</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>килобайт</displayName>
+				<unitPattern count="one">{0} килобайт</unitPattern>
+				<unitPattern count="other">{0} килобайт</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>килобит</displayName>
+				<unitPattern count="one">{0} килобит</unitPattern>
+				<unitPattern count="other">{0} килобит</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>байт</displayName>
+				<unitPattern count="one">{0} байт</unitPattern>
+				<unitPattern count="other">{0} байт</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>бит</displayName>
+				<unitPattern count="one">{0} бит</unitPattern>
+				<unitPattern count="other">{0} бит</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>ғасыр</displayName>
+				<unitPattern count="one">{0} ғасыр</unitPattern>
+				<unitPattern count="other">{0} ғасыр</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>жыл</displayName>
+				<unitPattern count="one">{0} жыл</unitPattern>
+				<unitPattern count="other">{0} жыл</unitPattern>
+				<perUnitPattern>жылына {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ай</displayName>
+				<unitPattern count="one">{0} ай</unitPattern>
+				<unitPattern count="other">{0} ай</unitPattern>
+				<perUnitPattern>айына {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>апта</displayName>
+				<unitPattern count="one">{0} апта</unitPattern>
+				<unitPattern count="other">{0} апта</unitPattern>
+				<perUnitPattern>аптасына {0}</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>тәулік</displayName>
 				<unitPattern count="one">{0} тәулік</unitPattern>
 				<unitPattern count="other">{0} тәулік</unitPattern>
+				<perUnitPattern>тәулігіне {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>сағат</displayName>
 				<unitPattern count="one">{0} сағат</unitPattern>
 				<unitPattern count="other">{0} сағат</unitPattern>
-				<perUnitPattern>{0}/h</perUnitPattern>
+				<perUnitPattern>сағатына {0}</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>микросекунд</displayName>
-				<unitPattern count="one">{0} микросекунд</unitPattern>
-				<unitPattern count="other">{0} микросекунд</unitPattern>
+			<unit type="duration-minute">
+				<displayName>минут</displayName>
+				<unitPattern count="one">{0} минут</unitPattern>
+				<unitPattern count="other">{0} минут</unitPattern>
+				<perUnitPattern>минутына {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>секунд</displayName>
+				<unitPattern count="one">{0} секунд</unitPattern>
+				<unitPattern count="other">{0} секунд</unitPattern>
+				<perUnitPattern>секундына {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>миллисекунд</displayName>
 				<unitPattern count="one">{0} миллисекунд</unitPattern>
 				<unitPattern count="other">{0} миллисекунд</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>минут</displayName>
-				<unitPattern count="one">{0} минут</unitPattern>
-				<unitPattern count="other">{0} минут</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>ай</displayName>
-				<unitPattern count="one">{0} ай</unitPattern>
-				<unitPattern count="other">{0} ай</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>микросекунд</displayName>
+				<unitPattern count="one">{0} микросекунд</unitPattern>
+				<unitPattern count="other">{0} микросекунд</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>наносекунд</displayName>
 				<unitPattern count="one">{0} наносекунд</unitPattern>
 				<unitPattern count="other">{0} наносекунд</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>секунд</displayName>
-				<unitPattern count="one">{0} секунд</unitPattern>
-				<unitPattern count="other">{0} секунд</unitPattern>
-				<perUnitPattern>{0}/s</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>апта</displayName>
-				<unitPattern count="one">{0} апта</unitPattern>
-				<unitPattern count="other">{0} апта</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>жыл</displayName>
-				<unitPattern count="one">{0} жыл</unitPattern>
-				<unitPattern count="other">{0} жыл</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>ампер</displayName>
 				<unitPattern count="one">{0} aмпер</unitPattern>
@@ -5084,15 +5369,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} миллиампер</unitPattern>
 			</unit>
 			<unit type="electric-ohm">
-				<displayName>ом</displayName>
-				<unitPattern count="one">{0} oм</unitPattern>
-				<unitPattern count="other">{0} oм</unitPattern>
+				<displayName>Ом</displayName>
+				<unitPattern count="one">{0} Ом</unitPattern>
+				<unitPattern count="other">{0} Ом</unitPattern>
 			</unit>
 			<unit type="electric-volt">
 				<displayName>вольт</displayName>
 				<unitPattern count="one">{0} вольт</unitPattern>
 				<unitPattern count="other">{0} вольт</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>килокалория</displayName>
+				<unitPattern count="one">{0} килокалория</unitPattern>
+				<unitPattern count="other">{0} килокалория</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>калория</displayName>
 				<unitPattern count="one">{0} калория</unitPattern>
@@ -5103,23 +5393,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Калория</unitPattern>
 				<unitPattern count="other">{0} Калория</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>джоуль</displayName>
-				<unitPattern count="one">{0} джоуль</unitPattern>
-				<unitPattern count="other">{0} джоуль</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>килокалория</displayName>
-				<unitPattern count="one">{0} килокалория</unitPattern>
-				<unitPattern count="other">{0} килокалория</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>килоджоуль</displayName>
 				<unitPattern count="one">{0} килоджуоль</unitPattern>
 				<unitPattern count="other">{0} килоджоуль</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>джоуль</displayName>
+				<unitPattern count="one">{0} джоуль</unitPattern>
+				<unitPattern count="other">{0} джоуль</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
-				<displayName>сағатқа шаққандағы киловатт</displayName>
+				<displayName>киловатт-сағат</displayName>
 				<unitPattern count="one">{0} киловатт-сағат</unitPattern>
 				<unitPattern count="other">{0} киловатт-сағат</unitPattern>
 			</unit>
@@ -5128,216 +5413,225 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} гигагерц</unitPattern>
 				<unitPattern count="other">{0} гигагерц</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>герц</displayName>
-				<unitPattern count="one">{0} герц</unitPattern>
-				<unitPattern count="other">{0} герц</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>мегагерц</displayName>
+				<unitPattern count="one">{0} мегагерц</unitPattern>
+				<unitPattern count="other">{0} мегагерц</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>килогерц</displayName>
 				<unitPattern count="one">{0} килогерц</unitPattern>
 				<unitPattern count="other">{0} килогерц</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>мегагерц</displayName>
-				<unitPattern count="one">{0} мегагерц</unitPattern>
-				<unitPattern count="other">{0} мегагерц</unitPattern>
-			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>астрономиялық бірлік</displayName>
-				<unitPattern count="one">{0} a.б.</unitPattern>
-				<unitPattern count="other">{0} а.б.</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>сантиметр</displayName>
-				<unitPattern count="one">{0} сантиметр</unitPattern>
-				<unitPattern count="other">{0} сантиметр</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<displayName>дециметр</displayName>
-				<unitPattern count="one">{0} дм</unitPattern>
-				<unitPattern count="other">{0} дм</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>фут</displayName>
-				<unitPattern count="one">{0} фут</unitPattern>
-				<unitPattern count="other">{0} фут</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>дюйм</displayName>
-				<unitPattern count="one">{0} дюйм</unitPattern>
-				<unitPattern count="other">{0} дюйм</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>герц</displayName>
+				<unitPattern count="one">{0} герц</unitPattern>
+				<unitPattern count="other">{0} герц</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>километр</displayName>
 				<unitPattern count="one">{0} километр</unitPattern>
 				<unitPattern count="other">{0} километр</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>жарық жылы</displayName>
-				<unitPattern count="one">{0} жарық жылы</unitPattern>
-				<unitPattern count="other">{0} жарық жылы</unitPattern>
+				<perUnitPattern>{0}/километр</perUnitPattern>
 			</unit>
 			<unit type="length-meter">
 				<displayName>метр</displayName>
 				<unitPattern count="one">{0} метр</unitPattern>
 				<unitPattern count="other">{0} метр</unitPattern>
+				<perUnitPattern>{0}/метр</perUnitPattern>
 			</unit>
-			<unit type="length-micrometer">
-				<displayName>микрометр</displayName>
-				<unitPattern count="one">{0} микрометр</unitPattern>
-				<unitPattern count="other">{0} микрометр</unitPattern>
+			<unit type="length-decimeter">
+				<displayName>дециметр</displayName>
+				<unitPattern count="one">{0} дециметр</unitPattern>
+				<unitPattern count="other">{0} дециметр</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName>миля</displayName>
-				<unitPattern count="one">{0} миля</unitPattern>
-				<unitPattern count="other">{0} миля</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>сантиметр</displayName>
+				<unitPattern count="one">{0} сантиметр</unitPattern>
+				<unitPattern count="other">{0} сантиметр</unitPattern>
+				<perUnitPattern>{0}/сантиметр</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>миллиметр</displayName>
 				<unitPattern count="one">{0} миллиметр</unitPattern>
 				<unitPattern count="other">{0} миллиметр</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>микрометр</displayName>
+				<unitPattern count="one">{0} микрометр</unitPattern>
+				<unitPattern count="other">{0} микрометр</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>нанометр</displayName>
 				<unitPattern count="one">{0} нанометр</unitPattern>
 				<unitPattern count="other">{0} нанометр</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>теңіз милясы</displayName>
-				<unitPattern count="one">{0} теңіз милясы</unitPattern>
-				<unitPattern count="other">{0} теңіз милясы</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>парсек</displayName>
-				<unitPattern count="one">{0} парсек</unitPattern>
-				<unitPattern count="other">{0} парсек</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>пикометр</displayName>
 				<unitPattern count="one">{0} пикометр</unitPattern>
 				<unitPattern count="other">{0} пикометр</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>миля</displayName>
+				<unitPattern count="one">{0} миля</unitPattern>
+				<unitPattern count="other">{0} миля</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>ярд</displayName>
 				<unitPattern count="one">{0} ярд</unitPattern>
 				<unitPattern count="other">{0} ярд</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>фут</displayName>
+				<unitPattern count="one">{0} фут</unitPattern>
+				<unitPattern count="other">{0} фут</unitPattern>
+				<perUnitPattern>{0}/фут</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>дюйм</displayName>
+				<unitPattern count="one">{0} дюйм</unitPattern>
+				<unitPattern count="other">{0} дюйм</unitPattern>
+				<perUnitPattern>{0}/дюйм</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>парсек</displayName>
+				<unitPattern count="one">{0} парсек</unitPattern>
+				<unitPattern count="other">{0} парсек</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>жарық жылы</displayName>
+				<unitPattern count="one">{0} жарық жылы</unitPattern>
+				<unitPattern count="other">{0} жарық жылы</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>астрономиялық бірлік</displayName>
+				<unitPattern count="one">{0} астрономиялық бірлік</unitPattern>
+				<unitPattern count="other">{0} астрономиялық бірлік</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>теңіз милясы</displayName>
+				<unitPattern count="one">{0} теңіз милясы</unitPattern>
+				<unitPattern count="other">{0} теңіз милясы</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>скандинавиялық миля</displayName>
+				<unitPattern count="one">{0} скандинавиялық миля</unitPattern>
+				<unitPattern count="other">{0} скандинавиялық миля</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>люкс</displayName>
 				<unitPattern count="one">{0} люкс</unitPattern>
 				<unitPattern count="other">{0} люкс</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>карат</displayName>
-				<unitPattern count="one">{0} карат</unitPattern>
-				<unitPattern count="other">{0} карат</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>грамм</displayName>
-				<unitPattern count="one">{0} грамм</unitPattern>
-				<unitPattern count="other">{0} грамм</unitPattern>
+			<unit type="mass-metric-ton">
+				<displayName>метрлік тонна</displayName>
+				<unitPattern count="one">{0} метрлік тонна</unitPattern>
+				<unitPattern count="other">{0} метрлік тонна</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>килограмм</displayName>
 				<unitPattern count="one">{0} килограмм</unitPattern>
 				<unitPattern count="other">{0} килограмм</unitPattern>
+				<perUnitPattern>{0}/килограмм</perUnitPattern>
 			</unit>
-			<unit type="mass-metric-ton">
-				<displayName>метр тонна</displayName>
-				<unitPattern count="one">{0} метр тонна</unitPattern>
-				<unitPattern count="other">{0} метр тонна</unitPattern>
-			</unit>
-			<unit type="mass-microgram">
-				<displayName>микрограмм</displayName>
-				<unitPattern count="one">{0} микрограмм</unitPattern>
-				<unitPattern count="other">{0} микрограмм</unitPattern>
+			<unit type="mass-gram">
+				<displayName>грамм</displayName>
+				<unitPattern count="one">{0} грамм</unitPattern>
+				<unitPattern count="other">{0} грамм</unitPattern>
+				<perUnitPattern>{0}/грамм</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>миллиграмм</displayName>
 				<unitPattern count="one">{0} миллиграмм</unitPattern>
 				<unitPattern count="other">{0} миллиграмм</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>унция</displayName>
-				<unitPattern count="one">{0} унция</unitPattern>
-				<unitPattern count="other">{0} унция</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>трой унциясы</displayName>
-				<unitPattern count="one">{0} трой унциясы</unitPattern>
-				<unitPattern count="other">{0} трой унциясы</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>фунт</displayName>
-				<unitPattern count="one">{0} фунт</unitPattern>
-				<unitPattern count="other">{0} фунт</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>микрограмм</displayName>
+				<unitPattern count="one">{0} микрограмм</unitPattern>
+				<unitPattern count="other">{0} микрограмм</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>тонна</displayName>
 				<unitPattern count="one">{0} тонна</unitPattern>
 				<unitPattern count="other">{0} тонна</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>фунт</displayName>
+				<unitPattern count="one">{0} фунт</unitPattern>
+				<unitPattern count="other">{0} фунт</unitPattern>
+				<perUnitPattern>{0}/фунт</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>унция</displayName>
+				<unitPattern count="one">{0} унция</unitPattern>
+				<unitPattern count="other">{0} унция</unitPattern>
+				<perUnitPattern>{0}/унция</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>трой унциясы</displayName>
+				<unitPattern count="one">{0} трой унциясы</unitPattern>
+				<unitPattern count="other">{0} трой унциясы</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>карат</displayName>
+				<unitPattern count="one">{0} карат</unitPattern>
+				<unitPattern count="other">{0} карат</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>гигаватт</displayName>
 				<unitPattern count="one">{0} гигаватт</unitPattern>
 				<unitPattern count="other">{0} гигаватт</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>ат күші</displayName>
-				<unitPattern count="one">{0} ат күші</unitPattern>
-				<unitPattern count="other">{0} ат күші</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>киловатт</displayName>
-				<unitPattern count="one">{0} киловатт</unitPattern>
-				<unitPattern count="other">{0} киловатт</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>мегаватт</displayName>
 				<unitPattern count="one">{0} мегаватт</unitPattern>
 				<unitPattern count="other">{0} мегаватт</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>милливатт</displayName>
-				<unitPattern count="one">{0} милливатт</unitPattern>
-				<unitPattern count="other">{0} милливатт</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>киловатт</displayName>
+				<unitPattern count="one">{0} киловатт</unitPattern>
+				<unitPattern count="other">{0} киловатт</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>ватт</displayName>
 				<unitPattern count="one">{0} ватт</unitPattern>
 				<unitPattern count="other">{0} ватт</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>милливатт</displayName>
+				<unitPattern count="one">{0} милливатт</unitPattern>
+				<unitPattern count="other">{0} милливатт</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>ат күші</displayName>
+				<unitPattern count="one">{0} ат күші</unitPattern>
+				<unitPattern count="other">{0} ат күші</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>гектопаскаль</displayName>
 				<unitPattern count="one">{0} гектопаскаль</unitPattern>
 				<unitPattern count="other">{0} гектопаскаль</unitPattern>
 			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>сынап бағанасының миллиметрі</displayName>
+				<unitPattern count="one">сынап бағанасының {0} миллиметрі</unitPattern>
+				<unitPattern count="other">сынап бағанасының {0} миллиметрі</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>фунт/шаршы дюйм</displayName>
+				<unitPattern count="one">{0} фунт/шаршы дюйм</unitPattern>
+				<unitPattern count="other">{0} фунт/шаршы дюйм</unitPattern>
+			</unit>
 			<unit type="pressure-inch-hg">
-				<displayName>сынапты бағана дюймы</displayName>
-				<unitPattern count="one">{0} сынапты бағана дюймы</unitPattern>
-				<unitPattern count="other">{0} сынапты бағана дюймы</unitPattern>
+				<displayName>сынап бағанасының дюймы</displayName>
+				<unitPattern count="one">сынап бағанасының {0} дюймы</unitPattern>
+				<unitPattern count="other">сынап бағанасының {0} дюймы</unitPattern>
 			</unit>
 			<unit type="pressure-millibar">
 				<displayName>миллибар</displayName>
 				<unitPattern count="one">{0} миллибар</unitPattern>
 				<unitPattern count="other">{0} миллибар</unitPattern>
 			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<displayName>сынапты бағана миллиметрі</displayName>
-				<unitPattern count="one">{0} сынапты бағана миллиметрі</unitPattern>
-				<unitPattern count="other">{0} сынапты бағана миллиметрі</unitPattern>
-			</unit>
-			<unit type="pressure-pound-per-square-inch">
-				<displayName>шаршы дюймға шаққандағы фунт</displayName>
-				<unitPattern count="one">{0} фунт/шаршы дюйм</unitPattern>
-				<unitPattern count="other">{0} фунт/шаршы дюйм</unitPattern>
-			</unit>
-			<unit type="proportion-karat">
-				<displayName>карат</displayName>
-				<unitPattern count="one">{0} карат</unitPattern>
-				<unitPattern count="other">{0} карат</unitPattern>
-			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>километр/сағат</displayName>
 				<unitPattern count="one">{0} километр/сағат</unitPattern>
@@ -5353,46 +5647,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} миля/сағат</unitPattern>
 				<unitPattern count="other">{0} миля/сағат</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>түйін</displayName>
+				<unitPattern count="one">{0} түйін</unitPattern>
+				<unitPattern count="other">{0} түйін</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>Цельсий градусы</displayName>
 				<unitPattern count="one">{0} Цельсий градусы</unitPattern>
 				<unitPattern count="other">{0} Цельсий градусы</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
-				<displayName>Фаренгейт бойынша градус</displayName>
-				<unitPattern count="one">{0} Фаренгейт бойынша градус</unitPattern>
-				<unitPattern count="other">{0} Фаренгейт бойынша градус</unitPattern>
+				<displayName>Фаренгейт градусы</displayName>
+				<unitPattern count="one">{0} Фаренгейт градусы</unitPattern>
+				<unitPattern count="other">{0} Фаренгейт градусы</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
 				<displayName>кельвин</displayName>
 				<unitPattern count="one">{0} кельвин</unitPattern>
 				<unitPattern count="other">{0} кельвин</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>акро-фут</displayName>
-				<unitPattern count="one">{0} aкро-фут</unitPattern>
-				<unitPattern count="other">{0} aкро-фут</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>сантилитр</displayName>
-				<unitPattern count="one">{0} cантилитр</unitPattern>
-				<unitPattern count="other">{0} cантилитр</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>текше сантиметр</displayName>
-				<unitPattern count="one">{0} текше сантиметр</unitPattern>
-				<unitPattern count="other">{0} текше сантиметр</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>текше фут</displayName>
-				<unitPattern count="one">{0} текше фут</unitPattern>
-				<unitPattern count="other">{0} текше фут</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>текше дюйм</displayName>
-				<unitPattern count="one">{0} текше дюйм</unitPattern>
-				<unitPattern count="other">{0} текше дюйм</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>текше километр</displayName>
 				<unitPattern count="one">{0} текше километр</unitPattern>
@@ -5402,6 +5681,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>текше метр</displayName>
 				<unitPattern count="one">{0} текше метр</unitPattern>
 				<unitPattern count="other">{0} текше метр</unitPattern>
+				<perUnitPattern>{0}/метр³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>текше сантиметр</displayName>
+				<unitPattern count="one">{0} текше сантиметр</unitPattern>
+				<unitPattern count="other">{0} текше сантиметр</unitPattern>
+				<perUnitPattern>{0}/сантиметр³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>текше миля</displayName>
@@ -5413,25 +5699,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} текше ярд</unitPattern>
 				<unitPattern count="other">{0} текше ярд</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>кесе</displayName>
-				<unitPattern count="one">{0} кесе</unitPattern>
-				<unitPattern count="other">{0} кесе</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>текше фут</displayName>
+				<unitPattern count="one">{0} текше фут</unitPattern>
+				<unitPattern count="other">{0} текше фут</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>децилитр</displayName>
-				<unitPattern count="one">{0} децилитр</unitPattern>
-				<unitPattern count="other">{0} децилитр</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>текше дюйм</displayName>
+				<unitPattern count="one">{0} текше дюйм</unitPattern>
+				<unitPattern count="other">{0} текше дюйм</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>сұйық унция</displayName>
-				<unitPattern count="one">{0} сұйық унция</unitPattern>
-				<unitPattern count="other">{0} сұйық унция</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>галлон</displayName>
-				<unitPattern count="one">{0} галлон</unitPattern>
-				<unitPattern count="other">{0} галлон</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>мегалитр</displayName>
+				<unitPattern count="one">{0} мегалитр</unitPattern>
+				<unitPattern count="other">{0} мегалитр</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>гектолитр</displayName>
@@ -5442,37 +5723,80 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>литр</displayName>
 				<unitPattern count="one">{0} литр</unitPattern>
 				<unitPattern count="other">{0} литр</unitPattern>
+				<perUnitPattern>{0}/литр</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>мегалитр</displayName>
-				<unitPattern count="one">{0} мегалитр</unitPattern>
-				<unitPattern count="other">{0} мегалитр</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>децилитр</displayName>
+				<unitPattern count="one">{0} децилитр</unitPattern>
+				<unitPattern count="other">{0} децилитр</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>сантилитр</displayName>
+				<unitPattern count="one">{0} cантилитр</unitPattern>
+				<unitPattern count="other">{0} cантилитр</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>миллилитр</displayName>
 				<unitPattern count="one">{0} миллилитр</unitPattern>
 				<unitPattern count="other">{0} миллилитр</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>пинта</displayName>
-				<unitPattern count="one">{0} пинта</unitPattern>
-				<unitPattern count="other">{0} пинта</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>метрлік пинта</displayName>
+				<unitPattern count="one">{0} метрлік пинта</unitPattern>
+				<unitPattern count="other">{0} метрлік пинта</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>метрлік кесе</displayName>
+				<unitPattern count="one">{0} метрлік кесе</unitPattern>
+				<unitPattern count="other">{0} метрлік кесе</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>акро-фут</displayName>
+				<unitPattern count="one">{0} aкро-фут</unitPattern>
+				<unitPattern count="other">{0} aкро-фут</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>галлон</displayName>
+				<unitPattern count="one">{0} галлон</unitPattern>
+				<unitPattern count="other">{0} галлон</unitPattern>
+				<perUnitPattern>{0}/галлон</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>кварта</displayName>
 				<unitPattern count="one">{0} кварта</unitPattern>
 				<unitPattern count="other">{0} кварта</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>пинта</displayName>
+				<unitPattern count="one">{0} пинта</unitPattern>
+				<unitPattern count="other">{0} пинта</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>кесе</displayName>
+				<unitPattern count="one">{0} кесе</unitPattern>
+				<unitPattern count="other">{0} кесе</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>сұйық унция</displayName>
+				<unitPattern count="one">{0} сұйық унция</unitPattern>
+				<unitPattern count="other">{0} сұйық унция</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>ас қасық</displayName>
 				<unitPattern count="one">{0} ас қасық</unitPattern>
 				<unitPattern count="other">{0} ас қасық</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
-				<displayName>шәй қасық</displayName>
-				<unitPattern count="one">{0} шәй қасық</unitPattern>
-				<unitPattern count="other">{0} шәй қасық</unitPattern>
+				<displayName>шай қасық</displayName>
+				<unitPattern count="one">{0} шай қасық</unitPattern>
+				<unitPattern count="other">{0} шай қасық</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} Ш</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} С</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} О</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} Б</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -5480,48 +5804,75 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>гравитациялық күш</displayName>
-				<unitPattern count="one">{0} грав. күш</unitPattern>
-				<unitPattern count="other">{0} грав. күш</unitPattern>
+				<unitPattern count="one">{0} G</unitPattern>
+				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
 				<displayName>метр/сек²</displayName>
 				<unitPattern count="one">{0} м/с²</unitPattern>
 				<unitPattern count="other">{0} м/с²</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName>минут</displayName>
-				<unitPattern count="one">{0}мин</unitPattern>
-				<unitPattern count="other">{0}мин</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName>секунд</displayName>
-				<unitPattern count="one">{0}сек</unitPattern>
-				<unitPattern count="other">{0}сек</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName>градус</displayName>
-				<unitPattern count="one">{0}градус</unitPattern>
-				<unitPattern count="other">{0}градус</unitPattern>
+			<unit type="angle-revolution">
+				<displayName>айн.</displayName>
+				<unitPattern count="one">{0} айн.</unitPattern>
+				<unitPattern count="other">{0} айн.</unitPattern>
 			</unit>
 			<unit type="angle-radian">
 				<displayName>радиан</displayName>
 				<unitPattern count="one">{0} рад</unitPattern>
 				<unitPattern count="other">{0} рад</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName>акр</displayName>
-				<unitPattern count="one">{0} акр</unitPattern>
-				<unitPattern count="other">{0} акр</unitPattern>
+			<unit type="angle-degree">
+				<displayName>градус</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>минут</displayName>
+				<unitPattern count="one">{0} мин.</unitPattern>
+				<unitPattern count="other">{0} мин.</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>секунд</displayName>
+				<unitPattern count="one">{0} сек.</unitPattern>
+				<unitPattern count="other">{0} сек.</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>км²</displayName>
+				<unitPattern count="one">{0} км²</unitPattern>
+				<unitPattern count="other">{0} км²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>гектар</displayName>
 				<unitPattern count="one">{0} га</unitPattern>
 				<unitPattern count="other">{0} га</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>метр²</displayName>
+				<unitPattern count="one">{0} м²</unitPattern>
+				<unitPattern count="other">{0} м²</unitPattern>
+				<perUnitPattern>{0}/м²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cм²</displayName>
 				<unitPattern count="one">{0} cм²</unitPattern>
 				<unitPattern count="other">{0} cм²</unitPattern>
+				<perUnitPattern>{0}/см²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>шаршы миля</displayName>
+				<unitPattern count="one">{0} миля²</unitPattern>
+				<unitPattern count="other">{0} миля²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>акр</displayName>
+				<unitPattern count="one">{0} акр</unitPattern>
+				<unitPattern count="other">{0} акр</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>ярд²</displayName>
+				<unitPattern count="one">{0} ярд²</unitPattern>
+				<unitPattern count="other">{0} ярд²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>шаршы фут</displayName>
@@ -5532,139 +5883,140 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>дюйм²</displayName>
 				<unitPattern count="one">{0} дюйм²</unitPattern>
 				<unitPattern count="other">{0} дюйм²</unitPattern>
+				<perUnitPattern>{0}/дюйм²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>шаршы километр</displayName>
-				<unitPattern count="one">{0} км²</unitPattern>
-				<unitPattern count="other">{0} км²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>шаршы метр</displayName>
-				<unitPattern count="one">{0} м²</unitPattern>
-				<unitPattern count="other">{0} м²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>шаршы миля</displayName>
-				<unitPattern count="one">{0} миля²</unitPattern>
-				<unitPattern count="other">{0} миля²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>ярд²</displayName>
-				<unitPattern count="one">{0} ярд²</unitPattern>
-				<unitPattern count="other">{0} ярд²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>карат</displayName>
+				<unitPattern count="one">{0} КТ</unitPattern>
+				<unitPattern count="other">{0} КТ</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>литр/км</displayName>
 				<unitPattern count="one">{0} л/км</unitPattern>
 				<unitPattern count="other">{0} л/км</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>л/100 км</displayName>
+				<unitPattern count="one">{0} л/100 км</unitPattern>
+				<unitPattern count="other">{0} л/100 км</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
-				<displayName>миля/гал</displayName>
-				<unitPattern count="one">{0} м/гал</unitPattern>
-				<unitPattern count="other">{0} м/гал</unitPattern>
+				<displayName>миля/галллон</displayName>
+				<unitPattern count="one">{0} mpg</unitPattern>
+				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>бит</displayName>
-				<unitPattern count="one">{0} бит</unitPattern>
-				<unitPattern count="other">{0} бит</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>байт</displayName>
-				<unitPattern count="one">{0} байт</unitPattern>
-				<unitPattern count="other">{0} байт</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Гб</displayName>
-				<unitPattern count="one">{0} Гб</unitPattern>
-				<unitPattern count="other">{0} Гб</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>ГБ</displayName>
-				<unitPattern count="one">{0} ГБ</unitPattern>
-				<unitPattern count="other">{0} ГБ</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>кбит</displayName>
-				<unitPattern count="one">{0} кб</unitPattern>
-				<unitPattern count="other">{0} кб</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>кБайт</displayName>
-				<unitPattern count="one">{0} кБ</unitPattern>
-				<unitPattern count="other">{0} кБ</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Мбит</displayName>
-				<unitPattern count="one">{0} Mб</unitPattern>
-				<unitPattern count="other">{0} Mб</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>МБайт</displayName>
-				<unitPattern count="one">{0} MБ</unitPattern>
-				<unitPattern count="other">{0} MБ</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>Тбайт</displayName>
+				<unitPattern count="one">{0} TБ</unitPattern>
+				<unitPattern count="other">{0} TБ</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>Тбит</displayName>
 				<unitPattern count="one">{0} Tб</unitPattern>
 				<unitPattern count="other">{0} Tб</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>ТБайт</displayName>
-				<unitPattern count="one">{0} TБ</unitPattern>
-				<unitPattern count="other">{0} TБ</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>Гбайт</displayName>
+				<unitPattern count="one">{0} ГБ</unitPattern>
+				<unitPattern count="other">{0} ГБ</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Гбит</displayName>
+				<unitPattern count="one">{0} Гб</unitPattern>
+				<unitPattern count="other">{0} Гб</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>Мбайт</displayName>
+				<unitPattern count="one">{0} MБ</unitPattern>
+				<unitPattern count="other">{0} MБ</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Мбит</displayName>
+				<unitPattern count="one">{0} Mб</unitPattern>
+				<unitPattern count="other">{0} Mб</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>кбайт</displayName>
+				<unitPattern count="one">{0} кБ</unitPattern>
+				<unitPattern count="other">{0} кБ</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>кбит</displayName>
+				<unitPattern count="one">{0} кб</unitPattern>
+				<unitPattern count="other">{0} кб</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>байт</displayName>
+				<unitPattern count="one">{0} байт</unitPattern>
+				<unitPattern count="other">{0} байт</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>бит</displayName>
+				<unitPattern count="one">{0} бит</unitPattern>
+				<unitPattern count="other">{0} бит</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>ғ.</displayName>
+				<unitPattern count="one">{0} ғ.</unitPattern>
+				<unitPattern count="other">{0} ғ.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>жыл</displayName>
+				<unitPattern count="one">{0} ж.</unitPattern>
+				<unitPattern count="other">{0} ж.</unitPattern>
+				<perUnitPattern>{0}/ж.</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ай</displayName>
+				<unitPattern count="one">{0} ай</unitPattern>
+				<unitPattern count="other">{0} ай</unitPattern>
+				<perUnitPattern>{0}/ай</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>апта</displayName>
+				<unitPattern count="one">{0} ап.</unitPattern>
+				<unitPattern count="other">{0} ап.</unitPattern>
+				<perUnitPattern>{0}/ап.</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
-				<displayName>тәулік</displayName>
-				<unitPattern count="one">{0} тәулік</unitPattern>
-				<unitPattern count="other">{0} тәулік</unitPattern>
+				<displayName>күн</displayName>
+				<unitPattern count="one">{0} күн</unitPattern>
+				<unitPattern count="other">{0} күн</unitPattern>
+				<perUnitPattern>{0}/күн</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>сағат</displayName>
-				<unitPattern count="one">{0} сағат</unitPattern>
-				<unitPattern count="other">{0} сағат</unitPattern>
-				<perUnitPattern>{0}/h</perUnitPattern>
+				<unitPattern count="one">{0} сағ.</unitPattern>
+				<unitPattern count="other">{0} сағ.</unitPattern>
+				<perUnitPattern>{0}/сағ.</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>мин.</displayName>
+				<unitPattern count="one">{0} мин.</unitPattern>
+				<unitPattern count="other">{0} мин.</unitPattern>
+				<perUnitPattern>{0}/мин.</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>сек.</displayName>
+				<unitPattern count="one">{0} сек.</unitPattern>
+				<unitPattern count="other">{0} сек.</unitPattern>
+				<perUnitPattern>{0}/с</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>мсек.</displayName>
+				<unitPattern count="one">{0} мс</unitPattern>
+				<unitPattern count="other">{0} мс</unitPattern>
 			</unit>
 			<unit type="duration-microsecond">
 				<displayName>мкс</displayName>
 				<unitPattern count="one">{0} мкс</unitPattern>
 				<unitPattern count="other">{0} мкс</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>миллисекунд</displayName>
-				<unitPattern count="one">{0} мс</unitPattern>
-				<unitPattern count="other">{0} мс</unitPattern>
-			</unit>
-			<unit type="duration-minute">
-				<displayName>минут</displayName>
-				<unitPattern count="one">{0} мин</unitPattern>
-				<unitPattern count="other">{0} мин</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>ай</displayName>
-				<unitPattern count="one">{0} ай</unitPattern>
-				<unitPattern count="other">{0} ай</unitPattern>
-			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>нс</displayName>
 				<unitPattern count="one">{0} нс</unitPattern>
 				<unitPattern count="other">{0} нс</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>секунд</displayName>
-				<unitPattern count="one">{0} секунд</unitPattern>
-				<unitPattern count="other">{0} секунд</unitPattern>
-				<perUnitPattern>{0}/s</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>апта</displayName>
-				<unitPattern count="one">{0} апта</unitPattern>
-				<unitPattern count="other">{0} апта</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>жыл</displayName>
-				<unitPattern count="one">{0} ж.</unitPattern>
-				<unitPattern count="other">{0} ж.</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>А</displayName>
 				<unitPattern count="one">{0} A</unitPattern>
@@ -5676,15 +6028,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} мA</unitPattern>
 			</unit>
 			<unit type="electric-ohm">
-				<displayName>ом</displayName>
-				<unitPattern count="one">{0} ом</unitPattern>
-				<unitPattern count="other">{0} ом</unitPattern>
+				<displayName>Ом</displayName>
+				<unitPattern count="one">{0} Ом</unitPattern>
+				<unitPattern count="other">{0} Ом</unitPattern>
 			</unit>
 			<unit type="electric-volt">
 				<displayName>вольт</displayName>
 				<unitPattern count="one">{0} В</unitPattern>
 				<unitPattern count="other">{0} В</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>ккал</displayName>
+				<unitPattern count="one">{0} ккал</unitPattern>
+				<unitPattern count="other">{0} ккал</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>кал</displayName>
 				<unitPattern count="one">{0} кал</unitPattern>
@@ -5695,21 +6052,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Кал</unitPattern>
 				<unitPattern count="other">{0} Кал</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>джоуль</displayName>
-				<unitPattern count="one">{0} дж</unitPattern>
-				<unitPattern count="other">{0} дж</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>ккал</displayName>
-				<unitPattern count="one">{0} ккал</unitPattern>
-				<unitPattern count="other">{0} ккал</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>килоджоуль</displayName>
 				<unitPattern count="one">{0} кДж</unitPattern>
 				<unitPattern count="other">{0} кДж</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>джоуль</displayName>
+				<unitPattern count="one">{0} Дж</unitPattern>
+				<unitPattern count="other">{0} Дж</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>кВт-сағ</displayName>
 				<unitPattern count="one">{0} кВт-сағ</unitPattern>
@@ -5720,218 +6072,227 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ГГц</unitPattern>
 				<unitPattern count="other">{0} ГГц</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>герц</displayName>
-				<unitPattern count="one">{0} Гц</unitPattern>
-				<unitPattern count="other">{0} Гц</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>МГц</displayName>
+				<unitPattern count="one">{0} MГц</unitPattern>
+				<unitPattern count="other">{0} MГц</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>кГц</displayName>
 				<unitPattern count="one">{0} кГц</unitPattern>
 				<unitPattern count="other">{0} кГц</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>МГц</displayName>
-				<unitPattern count="one">{0} MГц</unitPattern>
-				<unitPattern count="other">{0} MГц</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Гц</displayName>
+				<unitPattern count="one">{0} Гц</unitPattern>
+				<unitPattern count="other">{0} Гц</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>а.б.</displayName>
-				<unitPattern count="one">{0} а.б.</unitPattern>
-				<unitPattern count="other">{0} а.б.</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>км</displayName>
+				<unitPattern count="one">{0} км</unitPattern>
+				<unitPattern count="other">{0} км</unitPattern>
+				<perUnitPattern>{0}/км</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>сантиметр</displayName>
-				<unitPattern count="one">{0} см</unitPattern>
-				<unitPattern count="other">{0} см</unitPattern>
+			<unit type="length-meter">
+				<displayName>метр</displayName>
+				<unitPattern count="one">{0} м</unitPattern>
+				<unitPattern count="other">{0} м</unitPattern>
+				<perUnitPattern>{0}/м</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>дм</displayName>
 				<unitPattern count="one">{0} дм</unitPattern>
 				<unitPattern count="other">{0} дм</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>фут</displayName>
-				<unitPattern count="one">{0} фут</unitPattern>
-				<unitPattern count="other">{0} фут</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>см</displayName>
+				<unitPattern count="one">{0} см</unitPattern>
+				<unitPattern count="other">{0} см</unitPattern>
+				<perUnitPattern>{0}/см</perUnitPattern>
 			</unit>
-			<unit type="length-inch">
-				<displayName>дюйм</displayName>
-				<unitPattern count="one">{0} дюйм</unitPattern>
-				<unitPattern count="other">{0} дюйм</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>километр</displayName>
-				<unitPattern count="one">{0} км</unitPattern>
-				<unitPattern count="other">{0} км</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>жарық жылы</displayName>
-				<unitPattern count="one">{0} жж</unitPattern>
-				<unitPattern count="other">{0} жж</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>метр</displayName>
-				<unitPattern count="one">{0} м</unitPattern>
-				<unitPattern count="other">{0} м</unitPattern>
+			<unit type="length-millimeter">
+				<displayName>мм</displayName>
+				<unitPattern count="one">{0} мм</unitPattern>
+				<unitPattern count="other">{0} мм</unitPattern>
 			</unit>
 			<unit type="length-micrometer">
 				<displayName>мкм</displayName>
 				<unitPattern count="one">{0} мкм</unitPattern>
 				<unitPattern count="other">{0} мкм</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName>миля</displayName>
-				<unitPattern count="one">{0} миля</unitPattern>
-				<unitPattern count="other">{0} миля</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>миллиметр</displayName>
-				<unitPattern count="one">{0} мм</unitPattern>
-				<unitPattern count="other">{0} мм</unitPattern>
-			</unit>
 			<unit type="length-nanometer">
 				<displayName>нм</displayName>
 				<unitPattern count="one">{0} нм</unitPattern>
 				<unitPattern count="other">{0} нм</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>тмл</displayName>
-				<unitPattern count="one">{0} тмл</unitPattern>
-				<unitPattern count="other">{0} тмл</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>пк</displayName>
-				<unitPattern count="one">{0} пк</unitPattern>
-				<unitPattern count="other">{0} пк</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>пикометр</displayName>
 				<unitPattern count="one">{0} пм</unitPattern>
 				<unitPattern count="other">{0} пм</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>миля</displayName>
+				<unitPattern count="one">{0} миля</unitPattern>
+				<unitPattern count="other">{0} миля</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>ярд</displayName>
 				<unitPattern count="one">{0} ярд</unitPattern>
 				<unitPattern count="other">{0} ярд</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>фут</displayName>
+				<unitPattern count="one">{0} фут</unitPattern>
+				<unitPattern count="other">{0} фут</unitPattern>
+				<perUnitPattern>{0}/фут</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>дюйм</displayName>
+				<unitPattern count="one">{0} дюйм</unitPattern>
+				<unitPattern count="other">{0} дюйм</unitPattern>
+				<perUnitPattern>{0}/дюйм</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>парсек</displayName>
+				<unitPattern count="one">{0} пк</unitPattern>
+				<unitPattern count="other">{0} пк</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>жарық жылы</displayName>
+				<unitPattern count="one">{0} ж. ж.</unitPattern>
+				<unitPattern count="other">{0} ж. ж.</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>а.б.</displayName>
+				<unitPattern count="one">{0} а.б.</unitPattern>
+				<unitPattern count="other">{0} а.б.</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>люкс</displayName>
 				<unitPattern count="one">{0} лк</unitPattern>
 				<unitPattern count="other">{0} лк</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>КТ</displayName>
-				<unitPattern count="one">{0} КТ</unitPattern>
-				<unitPattern count="other">{0} КТ</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>грамм</displayName>
-				<unitPattern count="one">{0} гр</unitPattern>
-				<unitPattern count="other">{0} гр</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>килограмм</displayName>
-				<unitPattern count="one">{0} кг</unitPattern>
-				<unitPattern count="other">{0} кг</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>т</displayName>
 				<unitPattern count="one">{0} т</unitPattern>
 				<unitPattern count="other">{0} т</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>мкг</displayName>
-				<unitPattern count="one">{0} мкг</unitPattern>
-				<unitPattern count="other">{0} мкг</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>кг</displayName>
+				<unitPattern count="one">{0} кг</unitPattern>
+				<unitPattern count="other">{0} кг</unitPattern>
+				<perUnitPattern>{0}/кг</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>грамм</displayName>
+				<unitPattern count="one">{0} г</unitPattern>
+				<unitPattern count="other">{0} г</unitPattern>
+				<perUnitPattern>{0}/г</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>мг</displayName>
 				<unitPattern count="one">{0} мг</unitPattern>
 				<unitPattern count="other">{0} мг</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>унция</displayName>
-				<unitPattern count="one">{0} унция</unitPattern>
-				<unitPattern count="other">{0} унция</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>тр.ун</displayName>
-				<unitPattern count="one">{0} тр.ун</unitPattern>
-				<unitPattern count="other">{0} тр.ун</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>фунт</displayName>
-				<unitPattern count="one">{0} фунт</unitPattern>
-				<unitPattern count="other">{0} фунт</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>мкг</displayName>
+				<unitPattern count="one">{0} мкг</unitPattern>
+				<unitPattern count="other">{0} мкг</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>тонна</displayName>
 				<unitPattern count="one">{0} тн</unitPattern>
 				<unitPattern count="other">{0} тн</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>фунт</displayName>
+				<unitPattern count="one">{0} фунт</unitPattern>
+				<unitPattern count="other">{0} фунт</unitPattern>
+				<perUnitPattern>{0}/фунт</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>унц.</displayName>
+				<unitPattern count="one">{0} унц.</unitPattern>
+				<unitPattern count="other">{0} унц.</unitPattern>
+				<perUnitPattern>{0}/унц.</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>тр. унц.</displayName>
+				<unitPattern count="one">{0} тр. унц.</unitPattern>
+				<unitPattern count="other">{0} тр. унц.</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>карат</displayName>
+				<unitPattern count="one">{0} КТ</unitPattern>
+				<unitPattern count="other">{0} КТ</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>ГВт</displayName>
 				<unitPattern count="one">{0} ГВт</unitPattern>
 				<unitPattern count="other">{0} ГВт</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>ат күші</displayName>
-				<unitPattern count="one">{0} ат күші</unitPattern>
-				<unitPattern count="other">{0} ат күші</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>киловатт</displayName>
-				<unitPattern count="one">{0}кВт</unitPattern>
-				<unitPattern count="other">{0}кВт</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>МВт</displayName>
 				<unitPattern count="one">{0} МВт</unitPattern>
 				<unitPattern count="other">{0} МВт</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>мвт</displayName>
-				<unitPattern count="one">{0} мвт</unitPattern>
-				<unitPattern count="other">{0} мвт</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>киловатт</displayName>
+				<unitPattern count="one">{0} кВт</unitPattern>
+				<unitPattern count="other">{0} кВт</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>ватт</displayName>
 				<unitPattern count="one">{0} Вт</unitPattern>
 				<unitPattern count="other">{0} Вт</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>мВт</displayName>
+				<unitPattern count="one">{0} мВт</unitPattern>
+				<unitPattern count="other">{0} мВт</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>а. к.</displayName>
+				<unitPattern count="one">{0} а. к.</unitPattern>
+				<unitPattern count="other">{0} а. к.</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>гектопаскаль</displayName>
 				<unitPattern count="one">{0} гПа</unitPattern>
 				<unitPattern count="other">{0} гПа</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>сынапты бағана дюймы</displayName>
-				<unitPattern count="one">{0} с.б.д.</unitPattern>
-				<unitPattern count="other">{0} с.б.д.</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>миллибар</displayName>
-				<unitPattern count="one">{0} мб</unitPattern>
-				<unitPattern count="other">{0} мб</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>с.б.мм.</displayName>
 				<unitPattern count="one">{0} с.б.мм.</unitPattern>
 				<unitPattern count="other">{0} с.б.мм.</unitPattern>
 			</unit>
 			<unit type="pressure-pound-per-square-inch">
-				<displayName>фт/шд</displayName>
-				<unitPattern count="one">{0} фт/шд</unitPattern>
-				<unitPattern count="other">{0} фт/шд</unitPattern>
+				<displayName>psi</displayName>
+				<unitPattern count="one">{0} psi</unitPattern>
+				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>карат</displayName>
-				<unitPattern count="one">{0} кт</unitPattern>
-				<unitPattern count="other">{0} кт</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>in Hg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>мбар</displayName>
+				<unitPattern count="one">{0} мб</unitPattern>
+				<unitPattern count="other">{0} мб</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName>километр/сағат</displayName>
+				<displayName>км/сағ</displayName>
 				<unitPattern count="one">{0} км/сағ</unitPattern>
 				<unitPattern count="other">{0} км/сағ</unitPattern>
 			</unit>
@@ -5945,13 +6306,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} миля/сағ</unitPattern>
 				<unitPattern count="other">{0} миля/сағ</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>Цельсий градусы</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
 				<unitPattern count="other">{0}°C</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
-				<displayName>Фаренгейт бойынша градус</displayName>
+				<displayName>Фаренгейт градусы</displayName>
 				<unitPattern count="one">{0}°F</unitPattern>
 				<unitPattern count="other">{0}°F</unitPattern>
 			</unit>
@@ -5960,20 +6331,32 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} К</unitPattern>
 				<unitPattern count="other">{0} К</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>акро фт</displayName>
-				<unitPattern count="one">{0} aк фт</unitPattern>
-				<unitPattern count="other">{0} aк фт</unitPattern>
+			<unit type="volume-cubic-kilometer">
+				<displayName>км³</displayName>
+				<unitPattern count="one">{0} км³</unitPattern>
+				<unitPattern count="other">{0} км³</unitPattern>
 			</unit>
-			<unit type="volume-centiliter">
-				<displayName>сл</displayName>
-				<unitPattern count="one">{0} cл</unitPattern>
-				<unitPattern count="other">{0} cл</unitPattern>
+			<unit type="volume-cubic-meter">
+				<displayName>м³</displayName>
+				<unitPattern count="one">{0} м³</unitPattern>
+				<unitPattern count="other">{0} м³</unitPattern>
+				<perUnitPattern>{0}/м³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-centimeter">
 				<displayName>cм³</displayName>
 				<unitPattern count="one">{0} cм³</unitPattern>
 				<unitPattern count="other">{0} cм³</unitPattern>
+				<perUnitPattern>{0}/см³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>миля³</displayName>
+				<unitPattern count="one">{0} миля³</unitPattern>
+				<unitPattern count="other">{0} миля³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>ярд³</displayName>
+				<unitPattern count="one">{0} ярд³</unitPattern>
+				<unitPattern count="other">{0} ярд³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-foot">
 				<displayName>фут³</displayName>
@@ -5985,45 +6368,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} дюйм³</unitPattern>
 				<unitPattern count="other">{0} дюйм³</unitPattern>
 			</unit>
-			<unit type="volume-cubic-kilometer">
-				<displayName>текше километр</displayName>
-				<unitPattern count="one">{0} км³</unitPattern>
-				<unitPattern count="other">{0} км³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-meter">
-				<displayName>м³</displayName>
-				<unitPattern count="one">{0} м³</unitPattern>
-				<unitPattern count="other">{0} м³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<displayName>текше миля</displayName>
-				<unitPattern count="one">{0} миля³</unitPattern>
-				<unitPattern count="other">{0} миля³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-yard">
-				<displayName>ярд³</displayName>
-				<unitPattern count="one">{0} ярд³</unitPattern>
-				<unitPattern count="other">{0} ярд³</unitPattern>
-			</unit>
-			<unit type="volume-cup">
-				<displayName>кесе</displayName>
-				<unitPattern count="one">{0} к</unitPattern>
-				<unitPattern count="other">{0} к</unitPattern>
-			</unit>
-			<unit type="volume-deciliter">
-				<displayName>дл</displayName>
-				<unitPattern count="one">{0} дц</unitPattern>
-				<unitPattern count="other">{0} дц</unitPattern>
-			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>сқ унц</displayName>
-				<unitPattern count="one">{0} сқ унц</unitPattern>
-				<unitPattern count="other">{0} сқ унц</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>гал</displayName>
-				<unitPattern count="one">{0} гал</unitPattern>
-				<unitPattern count="other">{0} гал</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Мл</displayName>
+				<unitPattern count="one">{0} Мл</unitPattern>
+				<unitPattern count="other">{0} Мл</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>гл</displayName>
@@ -6034,37 +6382,80 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>литр</displayName>
 				<unitPattern count="one">{0} л</unitPattern>
 				<unitPattern count="other">{0} л</unitPattern>
+				<perUnitPattern>{0}/л</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>МЛ</displayName>
-				<unitPattern count="one">{0} МЛ</unitPattern>
-				<unitPattern count="other">{0} МЛ</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>дл</displayName>
+				<unitPattern count="one">{0} дл</unitPattern>
+				<unitPattern count="other">{0} дл</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>сл</displayName>
+				<unitPattern count="one">{0} cл</unitPattern>
+				<unitPattern count="other">{0} cл</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
-				<displayName>мЛ</displayName>
-				<unitPattern count="one">{0} мЛ</unitPattern>
-				<unitPattern count="other">{0} мЛ</unitPattern>
+				<displayName>мл</displayName>
+				<unitPattern count="one">{0} мл</unitPattern>
+				<unitPattern count="other">{0} мл</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>пт</displayName>
-				<unitPattern count="one">{0} пт</unitPattern>
-				<unitPattern count="other">{0} пт</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>м. кесе</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>aкро-фут</displayName>
+				<unitPattern count="one">{0} aкро-фут</unitPattern>
+				<unitPattern count="other">{0} aкро-фут</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
-				<displayName>кв</displayName>
-				<unitPattern count="one">{0} кв</unitPattern>
-				<unitPattern count="other">{0} кв</unitPattern>
+				<displayName>qt</displayName>
+				<unitPattern count="one">{0} qt</unitPattern>
+				<unitPattern count="other">{0} qt</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>пинта</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>кесе</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
-				<displayName>ақ</displayName>
-				<unitPattern count="one">{0} ақ</unitPattern>
-				<unitPattern count="other">{0} ақ</unitPattern>
+				<displayName>ас қ.</displayName>
+				<unitPattern count="one">{0} ас қ.</unitPattern>
+				<unitPattern count="other">{0} ас қ.</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
-				<displayName>шқ</displayName>
-				<unitPattern count="one">{0} шқ</unitPattern>
-				<unitPattern count="other">{0} шқ</unitPattern>
+				<displayName>ш. қ.</displayName>
+				<unitPattern count="one">{0} ш. қ.</unitPattern>
+				<unitPattern count="other">{0} ш. қ.</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} Ш</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} С</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} О</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} Б</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -6074,6 +6465,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} г</unitPattern>
 				<unitPattern count="other">{0} г</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -6082,26 +6477,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} акр</unitPattern>
-				<unitPattern count="other">{0} акр</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} км²</unitPattern>
+				<unitPattern count="other">{0} км²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} га</unitPattern>
 				<unitPattern count="other">{0} га</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} фут²</unitPattern>
-				<unitPattern count="other">{0} фут²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} км²</unitPattern>
-				<unitPattern count="other">{0} км²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} м²</unitPattern>
 				<unitPattern count="other">{0} м²</unitPattern>
@@ -6110,51 +6493,91 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} миля²</unitPattern>
 				<unitPattern count="other">{0} миля²</unitPattern>
 			</unit>
-			<unit type="duration-day">
-				<displayName>тәулік</displayName>
-				<unitPattern count="one">{0} т</unitPattern>
-				<unitPattern count="other">{0}т</unitPattern>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} акр</unitPattern>
+				<unitPattern count="other">{0} акр</unitPattern>
 			</unit>
-			<unit type="duration-hour">
-				<displayName>сағат</displayName>
-				<unitPattern count="one">{0} сағат</unitPattern>
-				<unitPattern count="other">{0} сағат</unitPattern>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} фут²</unitPattern>
+				<unitPattern count="other">{0} фут²</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>миллисекунд</displayName>
-				<unitPattern count="one">{0} мс</unitPattern>
-				<unitPattern count="other">{0} мс</unitPattern>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>л/100 км</displayName>
+				<unitPattern count="one">{0} л/100 км</unitPattern>
+				<unitPattern count="other">{0} л/100 км</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>минут</displayName>
-				<unitPattern count="one">{0} мин</unitPattern>
-				<unitPattern count="other">{0} мин</unitPattern>
+			<unit type="duration-year">
+				<displayName>ж.</displayName>
+				<unitPattern count="one">{0} ж.</unitPattern>
+				<unitPattern count="other">{0} ж.</unitPattern>
 			</unit>
 			<unit type="duration-month">
 				<displayName>ай</displayName>
 				<unitPattern count="one">{0} ай</unitPattern>
 				<unitPattern count="other">{0} ай</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>секунд</displayName>
-				<unitPattern count="one">{0} сек.</unitPattern>
-				<unitPattern count="other">{0} сек.</unitPattern>
-			</unit>
 			<unit type="duration-week">
-				<displayName>апта</displayName>
-				<unitPattern count="one">{0} апта</unitPattern>
-				<unitPattern count="other">{0} апта</unitPattern>
+				<displayName>ап.</displayName>
+				<unitPattern count="one">{0} ап.</unitPattern>
+				<unitPattern count="other">{0} ап.</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>жыл</displayName>
-				<unitPattern count="one">{0} ж.</unitPattern>
-				<unitPattern count="other">{0} ж.</unitPattern>
+			<unit type="duration-day">
+				<displayName>күн</displayName>
+				<unitPattern count="one">{0} к.</unitPattern>
+				<unitPattern count="other">{0} к.</unitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>сағ.</displayName>
+				<unitPattern count="one">{0} сағ.</unitPattern>
+				<unitPattern count="other">{0} сағ.</unitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>мин.</displayName>
+				<unitPattern count="one">{0} мин.</unitPattern>
+				<unitPattern count="other">{0} мин.</unitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>с</displayName>
+				<unitPattern count="one">{0} с</unitPattern>
+				<unitPattern count="other">{0} с</unitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>мс</displayName>
+				<unitPattern count="one">{0} мс</unitPattern>
+				<unitPattern count="other">{0} мс</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>км</displayName>
+				<unitPattern count="one">{0} км</unitPattern>
+				<unitPattern count="other">{0} км</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>метр</displayName>
+				<unitPattern count="one">{0} м</unitPattern>
+				<unitPattern count="other">{0} м</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
-				<displayName>сантиметр</displayName>
+				<displayName>см</displayName>
 				<unitPattern count="one">{0} см</unitPattern>
 				<unitPattern count="other">{0} см</unitPattern>
 			</unit>
+			<unit type="length-millimeter">
+				<displayName>мм</displayName>
+				<unitPattern count="one">{0} мм</unitPattern>
+				<unitPattern count="other">{0} мм</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<unitPattern count="one">{0} пм</unitPattern>
+				<unitPattern count="other">{0} пм</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} миля</unitPattern>
+				<unitPattern count="other">{0} миля</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<unitPattern count="one">{0} ярд</unitPattern>
+				<unitPattern count="other">{0} ярд</unitPattern>
+			</unit>
 			<unit type="length-foot">
 				<unitPattern count="one">{0} фут</unitPattern>
 				<unitPattern count="other">{0} фут</unitPattern>
@@ -6163,58 +6586,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} дюйм</unitPattern>
 				<unitPattern count="other">{0} дюйм</unitPattern>
 			</unit>
-			<unit type="length-kilometer">
-				<displayName>километр</displayName>
-				<unitPattern count="one">{0} км</unitPattern>
-				<unitPattern count="other">{0} км</unitPattern>
-			</unit>
 			<unit type="length-light-year">
 				<unitPattern count="one">{0} ly</unitPattern>
 				<unitPattern count="other">{0} ly</unitPattern>
 			</unit>
-			<unit type="length-meter">
-				<displayName>метр</displayName>
-				<unitPattern count="one">{0} м</unitPattern>
-				<unitPattern count="other">{0} м</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} миля</unitPattern>
-				<unitPattern count="other">{0} миля</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>миллиметр</displayName>
-				<unitPattern count="one">{0} мм</unitPattern>
-				<unitPattern count="other">{0} мм</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<unitPattern count="one">{0} пм</unitPattern>
-				<unitPattern count="other">{0} пм</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<unitPattern count="one">{0} ярд</unitPattern>
-				<unitPattern count="other">{0} ярд</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>грамм</displayName>
-				<unitPattern count="one">{0} гр</unitPattern>
-				<unitPattern count="other">{0} гр</unitPattern>
-			</unit>
 			<unit type="mass-kilogram">
-				<displayName>килограмм</displayName>
+				<displayName>кг</displayName>
 				<unitPattern count="one">{0} кг</unitPattern>
 				<unitPattern count="other">{0} кг</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} унция</unitPattern>
-				<unitPattern count="other">{0} унция</unitPattern>
+			<unit type="mass-gram">
+				<displayName>грамм</displayName>
+				<unitPattern count="one">{0} г</unitPattern>
+				<unitPattern count="other">{0} г</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} фунт</unitPattern>
 				<unitPattern count="other">{0} фунт</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} ат күші</unitPattern>
-				<unitPattern count="other">{0} ат күші</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} унция</unitPattern>
+				<unitPattern count="other">{0} унция</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0}кВт</unitPattern>
@@ -6224,6 +6616,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Вт</unitPattern>
 				<unitPattern count="other">{0} Вт</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} ат күші</unitPattern>
+				<unitPattern count="other">{0} ат күші</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} гПа</unitPattern>
 				<unitPattern count="other">{0} гПа</unitPattern>
@@ -6237,7 +6633,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} мб</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName>километр/сағат</displayName>
+				<displayName>км/сағ</displayName>
 				<unitPattern count="one">{0} км/сағ</unitPattern>
 				<unitPattern count="other">{0} км/сағ</unitPattern>
 			</unit>
@@ -6250,9 +6646,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} миля/сағ</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
-				<displayName>Цельсий градусы</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
+				<displayName>°C</displayName>
+				<unitPattern count="one">{0}°C</unitPattern>
+				<unitPattern count="other">{0}°C</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
 				<unitPattern count="one">{0}°F</unitPattern>
@@ -6271,6 +6667,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} л</unitPattern>
 				<unitPattern count="other">{0} л</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} Ш</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} С</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} О</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} Б</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kk_Cyrl_KZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kk_KZ.xml
similarity index 65%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kk_Cyrl_KZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kk_KZ.xml
index 217ef8f3e0f..a5dd30c50c4 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kk_Cyrl_KZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kk_KZ.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="kk"/>
-		<script type="Cyrl"/>
 		<territory type="KZ"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kkj.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kkj.xml
similarity index 82%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kkj.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kkj.xml
index 5390259c5c2..e585a09a54e 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kkj.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kkj.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="kkj"/>
 	</identity>
 	<localeDisplayNames>
@@ -302,6 +301,36 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<decimal>,</decimal>
 			<group>.</group>
 		</symbols>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤ 0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤ 00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤ 000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤ 0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤ 00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤ 000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤ 0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤ 00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤ 000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤ 0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤ 00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤ 000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencies>
 			<currency type="XAF">
 				<displayName>Franc CFA</displayName>
@@ -317,3 +346,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</listPattern>
 	</listPatterns>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kkj_CM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kkj_CM.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kkj_CM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kkj_CM.xml
index f952e689664..031688f7f13 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kkj_CM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kkj_CM.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="kkj"/>
 		<territory type="CM"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kl.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kl.xml
similarity index 88%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kl.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kl.xml
index bb7ee769847..b88ccb5e316 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kl.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kl.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11928 $"/>
 		<language type="kl"/>
 	</identity>
 	<localeDisplayNames>
@@ -334,11 +333,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="numbers" draft="unconfirmed">normu</key>
 		</keys>
 		<types>
-			<type type="fullwide" key="numbers" draft="unconfirmed">atitooq atugartuut normu</type>
-			<type type="gregorian" key="calendar" draft="unconfirmed">gregorianskit ullorsiutaat</type>
-			<type type="latn" key="numbers" draft="unconfirmed">atugartuut normu</type>
-			<type type="roman" key="numbers" draft="unconfirmed">ruumamiut-kisitsisaat</type>
-			<type type="romanlow" key="numbers" draft="unconfirmed">naqippoq ruumamiut-kisitsisaat</type>
+			<type key="calendar" type="gregorian" draft="unconfirmed">gregorianskit ullorsiutaat</type>
+			<type key="numbers" type="fullwide" draft="unconfirmed">atitooq atugartuut normu</type>
+			<type key="numbers" type="latn" draft="unconfirmed">atugartuut normu</type>
+			<type key="numbers" type="roman" draft="unconfirmed">ruumamiut-kisitsisaat</type>
+			<type key="numbers" type="romanlow" draft="unconfirmed">naqippoq ruumamiut-kisitsisaat</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric" draft="unconfirmed">SI</measurementSystemName>
@@ -1103,7 +1102,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<list draft="unconfirmed">;</list>
 			<percentSign draft="unconfirmed">%</percentSign>
 			<plusSign draft="unconfirmed">+</plusSign>
-			<minusSign draft="unconfirmed">−</minusSign>
+			<minusSign draft="unconfirmed">-</minusSign>
 			<exponential draft="unconfirmed">×10^</exponential>
 			<superscriptingExponent draft="unconfirmed">·</superscriptingExponent>
 			<perMille draft="unconfirmed">‰</perMille>
@@ -1193,6 +1192,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;¤-#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤0 td</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤0 td</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤00 td</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00 td</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤000 td</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000 td</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤0 mn</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0 mn</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤00 mn</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00 mn</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤000 mn</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000 mn</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤0 md</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0 md</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤00 md</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00 md</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤000 md</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000 md</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤0 bn</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0 bn</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤00 bn</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00 bn</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤000 bn</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000 bn</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one" draft="unconfirmed">{0} {1}</unitPattern>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -1230,8 +1257,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName draft="provisional">Jordgravitationer</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} Jordgravitation</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} Jordgravitationer</unitPattern>
+				<unitPattern count="one" draft="unconfirmed">{0} nutsuinera nunarsuaq</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} nutsuinera nunarsuaq</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName draft="provisional">gradi</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} gradi</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} gradi</unitPattern>
 			</unit>
 			<unit type="angle-arc-minute">
 				<displayName draft="provisional">bueminutsi</displayName>
@@ -1243,41 +1275,52 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} buesekundi</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} buesekundi</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName draft="provisional">gradi</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} gradi</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} gradi</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="provisional">amerikanske tønde land</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} amerikanskt tønde land</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} amerikanske tønde land</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName draft="provisional">kvadratkilometeri</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} kvadratkilometeri</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} kvadratkilometeri</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName draft="provisional">hektari</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} hektari</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} hektari</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<displayName draft="provisional">kvadratfod</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} kvadratfod</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} kvadratfod</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="provisional">kvadratkilometeri</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} kvadratkilometeri</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} kvadratkilometeri</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<displayName draft="provisional">kvadratmeteri</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} kvadratmeteri</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} kvadratmeteri</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} per kvadratmeteri</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
 				<displayName draft="provisional">engelske kvadratmil</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} engelsk kvadratmil</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} engelske kvadratmil</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<displayName draft="provisional">amerikanske tønde land</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} amerikanskt tønde land</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} amerikanske tønde land</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName draft="provisional">kvadratfod</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} kvadratfod</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} kvadratfod</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="provisional">ukioq</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} ukioq</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} ukioq</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="provisional">qaammat</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} qaammat</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} qaammat</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="provisional">sapaatip-akunnera</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} sapaatip-akunnera</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} sapaatip-akunnera</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">ulloq unnuarlu</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} ulloq unnuarlu</unitPattern>
@@ -1288,70 +1331,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} nalunaaquttap-akunnera</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} nalunaaquttap-akunnera</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="provisional">millisekundi</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} millisekundi</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} millisekundi</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="provisional">minutsi</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} minutsi</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} minutsi</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">qaammat</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} qaammat</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} qaammat</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="provisional">sekundi</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} sekundi</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} sekundi</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">sapaatip-akunnera</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} sapaatip-akunnera</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} sapaatip-akunnera</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">ukioq</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ukioq</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ukioq</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="provisional">centimeteri</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} centimeteri</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} centimeteri</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="provisional">fod</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} fod</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} fod</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="provisional">tommer</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} tomme</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} tommer</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="provisional">millisekundi</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} millisekundi</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} millisekundi</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="provisional">kilometeri</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} kilometeri</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} kilometeri</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName draft="provisional">lysukioq</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} lysukioq</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} lysukioq</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} per kilometeri</perUnitPattern>
 			</unit>
 			<unit type="length-meter">
 				<displayName draft="provisional">meteri</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} meteri</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} meteri</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} per meteri</perUnitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName draft="provisional">engelske mil</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} engelsk mil</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} engelske mil</unitPattern>
+			<unit type="length-decimeter">
+				<displayName draft="unconfirmed">decimeteri</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} decimeteri</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} decimeteri</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName draft="provisional">centimeteri</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} centimeteri</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} centimeteri</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} per centimeteri</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="provisional">millimeteri</displayName>
@@ -1363,35 +1379,67 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} pikometeri</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} pikometeri</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="provisional">engelske mil</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} engelsk mil</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} engelske mil</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName draft="provisional">engelske yard</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} engelsk yard</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} engelske yard</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="provisional">grammi</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} grammi</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} grammi</unitPattern>
+			<unit type="length-foot">
+				<displayName draft="provisional">fod</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} fod</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} fod</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} per fod</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="provisional">tommer</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} tomme</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} tommer</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} per tomme</perUnitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="provisional">lysukioq</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} lysåri</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} lysåri</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>fur</displayName>
+				<unitPattern count="one">{0} fur</unitPattern>
+				<unitPattern count="other">{0} fur</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>fm</displayName>
+				<unitPattern count="one">{0} fm</unitPattern>
+				<unitPattern count="other">{0} fm</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName draft="unconfirmed">sømili</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} sømili</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} sømili</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="provisional">kilogrammi</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} kilogrammi</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} kilogrammi</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="provisional">unser</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} unse</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} unser</unitPattern>
+			<unit type="mass-gram">
+				<displayName draft="provisional">grammi</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} grammi</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} grammi</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<displayName draft="provisional">skålpund</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} skålpund</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} skålpund</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="provisional">hestekrafter</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} hestekraft</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} hestekrafter</unitPattern>
+			<unit type="mass-ounce">
+				<displayName draft="provisional">unser</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} unse</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} unser</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName draft="provisional">kilowatti</displayName>
@@ -1403,6 +1451,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} watti</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} watti</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<displayName draft="provisional">hestekrafter</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} hestekraft</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} hestekrafter</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="provisional">hektopascali</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} hektopascali</unitPattern>
@@ -1453,11 +1506,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} engelsk kubikmil</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} engelske kubikmil</unitPattern>
 			</unit>
+			<unit type="volume-megaliter">
+				<displayName draft="unconfirmed">megaliteri</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} megaliteri</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} megaliteri</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName draft="unconfirmed">hectoliteri</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} hectoliteri</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} hectoliteri</unitPattern>
+			</unit>
 			<unit type="volume-liter">
 				<displayName draft="provisional">literi</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} literi</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} literi</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} per literi</perUnitPattern>
 			</unit>
+			<unit type="volume-milliliter">
+				<displayName draft="unconfirmed">milliliteri</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} milliliteri</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} milliliteri</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName draft="unconfirmed">alussaatip imai</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} alussaatip imai</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} alussaatip imai</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName draft="unconfirmed">alussaateeqqap imai</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} alussaateeqqap imai</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} alussaateeqqap imai</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="unconfirmed">{0} kangiani</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="unconfirmed">{0} avannaani</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="unconfirmed">{0} kujataani</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="unconfirmed">{0} kitaani</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -1468,6 +1553,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} G</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} G</unitPattern>
 			</unit>
+			<unit type="acceleration-meter-per-second-squared">
+				<displayName draft="unconfirmed">m/s²</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} m/s²</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} m/s²</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName draft="provisional">gradi</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}°</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName draft="provisional">bueminutsi</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}′</unitPattern>
@@ -1478,41 +1573,52 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}″</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName draft="provisional">gradi</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}°</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="provisional">amerikanske tønde land</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName draft="provisional">kvadratkilometeri</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} km²</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName draft="provisional">hektari</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} ha</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<displayName draft="provisional">kvadratfod</displayName>
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="provisional">kvadratkilometeri</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} km²</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<displayName draft="provisional">kvadratmeteri</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} m²</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} m²</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/m²</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
 				<displayName draft="provisional">engelske kvadratmil</displayName>
 				<unitPattern count="one">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<displayName draft="provisional">amerikanske tønde land</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName draft="provisional">kvadratfod</displayName>
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="provisional">ukioq</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} ukioq</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} ukioq</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="provisional">qaammat</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} mån</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} mån</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="provisional">sapaatip-akunnera</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} u</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} u</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">ulloq unnuarlu</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} d</unitPattern>
@@ -1523,110 +1629,120 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} h</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} h</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="provisional">millisekundi</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ms</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="provisional">minutsi</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} min</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} min</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">qaammat</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} mån</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} mån</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="provisional">sekundi</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} s</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">sapaatip-akunnera</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} u</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} u</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">ukioq</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ukioq</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ukioq</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="provisional">centimeteri</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} cm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="provisional">fod</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} fod</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} fod</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="provisional">tommer</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} tomme</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} tommer</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="provisional">millisekundi</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} ms</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="provisional">kilometeri</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} km</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName draft="provisional">lysukioq</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} lysukioq</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} lysukioq</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/km</perUnitPattern>
 			</unit>
 			<unit type="length-meter">
 				<displayName draft="provisional">meteri</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} m</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} m</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/m</perUnitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName draft="provisional">engelske mil</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-decimeter">
+				<displayName draft="unconfirmed">dm</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} dm</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} dm</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName draft="provisional">centimeteri</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} cm</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} cm</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="provisional">millimeteri</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} mm</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-nanometer">
+				<displayName draft="unconfirmed">nm</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} nm</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} nm</unitPattern>
+			</unit>
 			<unit type="length-picometer">
 				<displayName draft="provisional">pikometeri</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} pm</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="provisional">engelske mil</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName draft="provisional">engelske yard</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="provisional">grammi</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} g</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} g</unitPattern>
+			<unit type="length-foot">
+				<displayName draft="provisional">fod</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} fod</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} fod</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/fod</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="provisional">tommer</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} tomme</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} tommer</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/tomme</perUnitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="provisional">lysukioq</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} lysåri</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} lysåri</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>fur</displayName>
+				<unitPattern count="one">{0} fur</unitPattern>
+				<unitPattern count="other">{0} fur</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>fm</displayName>
+				<unitPattern count="one">{0} fm</unitPattern>
+				<unitPattern count="other">{0} fm</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName draft="unconfirmed">sømili</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} sømili</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} sømili</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="provisional">kilogrammi</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} kg</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="provisional">unser</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} unse</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} unser</unitPattern>
+			<unit type="mass-gram">
+				<displayName draft="provisional">grammi</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} g</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<displayName draft="provisional">skålpund</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} skålpund</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} skålpund</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="provisional">hestekrafter</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} hk</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} hk</unitPattern>
+			<unit type="mass-ounce">
+				<displayName draft="provisional">unser</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} unse</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} unser</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName draft="provisional">kilowatti</displayName>
@@ -1638,6 +1754,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} W</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<displayName draft="provisional">hestekrafter</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} hk</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} hk</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="provisional">hektopascali</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} hPa</unitPattern>
@@ -1688,11 +1809,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi³</unitPattern>
 				<unitPattern count="other">{0} mi³</unitPattern>
 			</unit>
+			<unit type="volume-megaliter">
+				<displayName draft="unconfirmed">megaliteri</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} ML</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} ML</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName draft="unconfirmed">hL</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} hL</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} hL</unitPattern>
+			</unit>
 			<unit type="volume-liter">
 				<displayName draft="provisional">literi</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} l</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} l</unitPattern>
+				<unitPattern count="one" draft="unconfirmed">{0} L</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} L</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/L</perUnitPattern>
 			</unit>
+			<unit type="volume-milliliter">
+				<displayName draft="unconfirmed">mL</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} mL</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} mL</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName draft="unconfirmed">ssk</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} ssk</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} ssk</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName draft="unconfirmed">tsk</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} tsk</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} tsk</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="unconfirmed">{0} Ø</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="unconfirmed">{0} N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="unconfirmed">{0} S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="unconfirmed">{0} V</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -1702,6 +1855,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}G</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}G</unitPattern>
 			</unit>
+			<unit type="acceleration-meter-per-second-squared">
+				<displayName draft="unconfirmed">m/s²</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} m/s²</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} m/s²</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one" draft="unconfirmed">{0}°</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one" draft="unconfirmed">{0}′</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}′</unitPattern>
@@ -1710,34 +1872,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}″</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one" draft="unconfirmed">{0}°</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one" draft="unconfirmed">{0}km²</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one" draft="unconfirmed">{0}ha</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one" draft="unconfirmed">{0}km²</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one" draft="unconfirmed">{0}m²</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}m²</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/m²</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
 				<unitPattern count="one">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<unitPattern count="one" draft="unconfirmed">{0}å</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}å</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<unitPattern count="one" draft="unconfirmed">{0}m</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}m</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<unitPattern count="one" draft="unconfirmed">{0}u</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}u</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<unitPattern count="one" draft="unconfirmed">{0}d</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}d</unitPattern>
@@ -1746,89 +1917,101 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}h</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}h</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<unitPattern count="one" draft="unconfirmed">{0}ms</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<unitPattern count="one" draft="unconfirmed">{0}m</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}m</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<unitPattern count="one" draft="unconfirmed">{0}m</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}m</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<unitPattern count="one" draft="unconfirmed">{0}s</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<unitPattern count="one" draft="unconfirmed">{0}u</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}u</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<unitPattern count="one" draft="unconfirmed">{0}å</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}å</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<unitPattern count="one" draft="unconfirmed">{0}cm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one" draft="unconfirmed">{0} fod</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} fod</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one" draft="unconfirmed">{0} tomme</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} tommer</unitPattern>
+			<unit type="duration-millisecond">
+				<unitPattern count="one" draft="unconfirmed">{0}ms</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<unitPattern count="one" draft="unconfirmed">{0}km</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one" draft="unconfirmed">{0} lysukioq</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} lysukioq</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/km</perUnitPattern>
 			</unit>
 			<unit type="length-meter">
 				<unitPattern count="one" draft="unconfirmed">{0}m</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}m</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/m</perUnitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-decimeter">
+				<displayName draft="unconfirmed">dm</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}dm</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}dm</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<unitPattern count="one" draft="unconfirmed">{0}cm</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}cm</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<unitPattern count="one" draft="unconfirmed">{0}mm</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}mm</unitPattern>
 			</unit>
+			<unit type="length-nanometer">
+				<displayName draft="unconfirmed">nm</displayName>
+			</unit>
 			<unit type="length-picometer">
 				<unitPattern count="one" draft="unconfirmed">{0}pm</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<unitPattern count="one" draft="unconfirmed">{0}g</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one" draft="unconfirmed">{0} fod</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} fod</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/fod</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one" draft="unconfirmed">{0} tomme</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} tommer</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/tomme</perUnitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one" draft="unconfirmed">{0} lå</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} lå</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>fur</displayName>
+				<unitPattern count="one">{0} fur</unitPattern>
+				<unitPattern count="other">{0} fur</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>fm</displayName>
+				<unitPattern count="one">{0} fm</unitPattern>
+				<unitPattern count="other">{0} fm</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName draft="unconfirmed">sømili</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} sømili</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} sømili</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<unitPattern count="one" draft="unconfirmed">{0}kg</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one" draft="unconfirmed">{0} unse</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} unser</unitPattern>
+			<unit type="mass-gram">
+				<unitPattern count="one" draft="unconfirmed">{0}g</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one" draft="unconfirmed">{0} skålpund</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} skålpund</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one" draft="unconfirmed">{0}hk</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}hk</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one" draft="unconfirmed">{0} unse</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} unser</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one" draft="unconfirmed">{0}kW</unitPattern>
@@ -1838,6 +2021,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}W</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one" draft="unconfirmed">{0}hk</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}hk</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one" draft="unconfirmed">{0}hPa</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}hPa</unitPattern>
@@ -1878,10 +2065,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi³</unitPattern>
 				<unitPattern count="other">{0} mi³</unitPattern>
 			</unit>
+			<unit type="volume-megaliter">
+				<displayName draft="unconfirmed">megaliteri</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} ML</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} ML</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName draft="unconfirmed">hL</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} hL</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} hL</unitPattern>
+			</unit>
 			<unit type="volume-liter">
 				<unitPattern count="one" draft="unconfirmed">{0}L</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}L</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/L</perUnitPattern>
 			</unit>
+			<unit type="volume-milliliter">
+				<displayName draft="unconfirmed">mL</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} mL</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} mL</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName draft="unconfirmed">ssk</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} ssk</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} ssk</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName draft="unconfirmed">tsk</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} tsk</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} tsk</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="unconfirmed">{0}Ø</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="unconfirmed">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="unconfirmed">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="unconfirmed">{0}V</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
@@ -1926,3 +2145,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kl_GL.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kl_GL.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kl_GL.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kl_GL.xml
index b26e2647268..914c7559ed5 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kl_GL.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kl_GL.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="kl"/>
 		<territory type="GL"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kln.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kln.xml
similarity index 95%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kln.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kln.xml
index 75f5e21f035..2debab258b5 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kln.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kln.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11139 $"/>
-		<generation date="$Date: 2015-01-19 23:55:17 -0600 (Mon, 19 Jan 2015) $"/>
+		<version number="$Revision: 12128 $"/>
 		<language type="kln"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Emetab Anguilla</territory>
 			<territory type="AL">Emetab Albania</territory>
 			<territory type="AM">Emetab Armenia</territory>
-			<territory type="AN">Emetab Antile nebo Holand</territory>
 			<territory type="AO">Emetab Angola</territory>
 			<territory type="AR">Emetab Argentina</territory>
 			<territory type="AS">Emetab American Samoa</territory>
@@ -450,12 +448,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
 							<dayPeriod type="am">krn</dayPeriod>
-							<dayPeriod type="noon">beet</dayPeriod>
 							<dayPeriod type="pm">koosk</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">karoon</dayPeriod>
-							<dayPeriod type="noon">beetkween</dayPeriod>
 							<dayPeriod type="pm">kooskoliny</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
@@ -495,22 +491,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -590,6 +586,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kln_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kln_KE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kln_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kln_KE.xml
index 509d61c90ab..aba62b802dc 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kln_KE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kln_KE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="kln"/>
 		<territory type="KE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/km.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/km.xml
similarity index 83%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/km.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/km.xml
index 34cfb56cb4d..52f1f7206d0 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/km.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/km.xml
@@ -1,80 +1,75 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11351 $"/>
-		<generation date="$Date: 2015-03-06 12:59:09 -0600 (Fri, 06 Mar 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="km"/>
 	</identity>
 	<localeDisplayNames>
 		<localeDisplayPattern>
 			<localePattern>{0} ({1})</localePattern>
 			<localeSeparator>{0}, {1}</localeSeparator>
-			<localeKeyTypePattern>{0}: {1}</localeKeyTypePattern>
+			<localeKeyTypePattern>{0}៖ {1}</localeKeyTypePattern>
 		</localeDisplayPattern>
 		<languages>
 			<language type="aa">ភាសាអាហ្វារ</language>
 			<language type="ab">អាប់ខាហ៊្សាន</language>
 			<language type="ae">ភាសាអាវែស្តង់</language>
-			<language type="af">អាហ្វ្រីកាអាន</language>
-			<language type="agq">Aghem</language>
-			<language type="ak">Akan</language>
+			<language type="af">អាហ្វ្រិកាន</language>
+			<language type="agq">អាហ្គីម</language>
+			<language type="ak">អាកាន</language>
 			<language type="am">អាមហារីច</language>
 			<language type="an">ភាសាអារ៉ាហ្គោន</language>
 			<language type="ar">អារ៉ាប់</language>
-			<language type="ar_001">អារ៉ាប់​ស្តង់ដារ​ទំនើប</language>
-			<language type="arn">Mapuche</language>
+			<language type="ar_001">អារ៉ាប់ផ្លូវការ</language>
+			<language type="arn">ម៉ាពូឈី</language>
 			<language type="as">អាសាមីស</language>
-			<language type="asa">Asu</language>
+			<language type="asa">អាស៊ូ</language>
 			<language type="ay">ភាសាអីម៉ារ៉ា</language>
 			<language type="az">អាហ៊្សែរបែហ្សង់</language>
 			<language type="az" alt="short">អាហ្សេរី</language>
 			<language type="ba">បែស្កឺ</language>
 			<language type="be">បេឡារុស្ស</language>
-			<language type="bem">Bemba</language>
-			<language type="bez">Bena</language>
+			<language type="bem">បេមបា</language>
+			<language type="bez">បេណា</language>
 			<language type="bg">ប៊ុលហ្ការី</language>
+			<language type="bgn">បាឡូជីខាងលិច</language>
 			<language type="bm">បាម្បារា</language>
 			<language type="bn">បង់ក្លាដែស</language>
 			<language type="bo">ទីបេ</language>
 			<language type="br">ប្រីស្តុន</language>
-			<language type="brx">Bodo</language>
+			<language type="brx">បូដូ</language>
 			<language type="bs">បូស្នី</language>
 			<language type="ca">កាតាឡាន</language>
-			<language type="cgg">Chiga</language>
+			<language type="ce">ឈីឆេន</language>
+			<language type="cgg">ឈីហ្គា</language>
 			<language type="chr">ឆេរូគី</language>
-			<language type="ckb">សុរ៉ានី</language>
-			<language type="co">Corsican</language>
+			<language type="ckb">ខឺដកណ្តាល</language>
+			<language type="co">កូស៊ីខាន</language>
 			<language type="cs">ឆេក</language>
+			<language type="cv">ឈូវ៉ាស</language>
 			<language type="cy">វេល</language>
 			<language type="da">ដាណឺម៉ាក</language>
-			<language type="dav">Taita</language>
+			<language type="dav">តៃតា</language>
 			<language type="de">អាល្លឺម៉ង់</language>
-			<language type="de_AT">អាល្លឺម៉ង់ អូទ្រីស</language>
-			<language type="de_CH">អាល្លឺម៉ង់ ស្វីស</language>
-			<language type="dje">Zarma</language>
-			<language type="dsb">Lower Sorbian</language>
-			<language type="dua">Duala</language>
-			<language type="dyo">Jola-Fonyi</language>
-			<language type="dz">ភាសាប៊ូតាន</language>
-			<language type="ebu">Embu</language>
-			<language type="ee">Ewe</language>
+			<language type="dje">ហ្សាម៉ា</language>
+			<language type="dsb">សូប៊ីក្រោម</language>
+			<language type="dua">ឌូអាឡា</language>
+			<language type="dyo">ចូឡាហ៊្វុនយី</language>
+			<language type="dz">ដុងខា</language>
+			<language type="ebu">អេមប៊ូ</language>
+			<language type="ee">អ៊ីវ</language>
 			<language type="el">ក្រិច</language>
 			<language type="en">អង់គ្លេស</language>
-			<language type="en_AU">អង់គ្លេស អូស្ត្រាលី</language>
-			<language type="en_CA">អង់គ្លេស កាណាដា</language>
-			<language type="en_GB">អង់គ្លេស ចក្រភព​អង់គ្លេស</language>
 			<language type="en_GB" alt="short">អង់គ្លេស (ច.អ.)</language>
-			<language type="en_US">អង់គ្លេស អាមេរិក</language>
-			<language type="en_US" alt="short">អង់គ្លេស (ស.រ.អា.)</language>
+			<language type="en_US" alt="short">អង់គ្លេស (ស.រ.អ)</language>
 			<language type="eo">អេស្ពេរ៉ាន់តូ</language>
 			<language type="es">អេស្ប៉ាញ</language>
-			<language type="es_419">អេស្ប៉ាញ អាមេរីកឡាតាំង</language>
-			<language type="es_ES">អេស្ប៉ាញ អឺរ៉ុប</language>
+			<language type="es_ES">អេស្ប៉ាញ (អ៊ឺរ៉ុប)</language>
 			<language type="et">អេស្តូនី</language>
 			<language type="eu">បាស្កេ</language>
 			<language type="fa">ភឺសៀន</language>
@@ -85,144 +80,148 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="fr">បារាំង</language>
 			<language type="fy">ហ្វ្រីស៊ានខាងលិច</language>
 			<language type="ga">អៀរឡង់</language>
-			<language type="gag">Gagauz</language>
+			<language type="gag">កាគូស</language>
 			<language type="gd">ភាសាហ្កែលិគ (gd)</language>
 			<language type="gl">ហ្គាលីស្យាន</language>
 			<language type="gn">ហ្គូរ៉ានី</language>
-			<language type="gsw">អាល្លឺម៉ង ស្វីស</language>
+			<language type="gsw">អាល្លឺម៉ង (ស្វីស)</language>
 			<language type="gu">ហ្កុយ៉ារាទី</language>
-			<language type="guz">Gusii</language>
-			<language type="gv">Manx</language>
+			<language type="guz">ហ្គូស៊ី</language>
+			<language type="gv">មេន</language>
 			<language type="ha">ហូសា</language>
 			<language type="haw">ហាវៃ</language>
 			<language type="he">អ៊ីស្រាអែល</language>
-			<language type="hi">ហិណ្ឌូ</language>
+			<language type="hi">ហិណ្ឌី</language>
 			<language type="hr">ក្រូអាត</language>
-			<language type="hsb">Upper Sorbian</language>
+			<language type="hsb">សូប៊ីលើ</language>
 			<language type="ht">ហៃទី</language>
 			<language type="hu">ហុងគ្រី</language>
 			<language type="hy">អារមេនី</language>
 			<language type="ia" draft="unconfirmed">អីនធើលីង</language>
 			<language type="id">ឥណ្ឌូណេស៊ី</language>
 			<language type="ig">អ៊ីកបូ</language>
-			<language type="ii">Sichuan Yi</language>
+			<language type="ii">ស៊ីឈាន់យី</language>
 			<language type="is">អ៊ីស្លង់</language>
 			<language type="it">អ៊ីតាលី</language>
-			<language type="iu">Inuktitut</language>
+			<language type="iu">អ៊ីនុកទីទុត</language>
 			<language type="ja">ជប៉ុន</language>
-			<language type="jgo">Ngomba</language>
-			<language type="jmc">Machame</language>
+			<language type="jgo">ងុំបា</language>
+			<language type="jmc">ម៉ាឆាំ</language>
 			<language type="jv">ជ្វា</language>
 			<language type="ka">ហ្សក​ហ្ស៊ី</language>
-			<language type="kab">Kabyle</language>
-			<language type="kam">Kamba</language>
-			<language type="kde">Makonde</language>
-			<language type="kea">Kabuverdianu</language>
-			<language type="khq">Koyra Chiini</language>
-			<language type="ki">Kikuyu</language>
+			<language type="kab">កាប៊ីឡេ</language>
+			<language type="kam">កាំបា</language>
+			<language type="kde">ម៉ាកូនដេ</language>
+			<language type="kea">កាប៊ូវឺឌៀនូ</language>
+			<language type="khq">គុយរ៉ាឈីនី</language>
+			<language type="ki">គីគូយូ</language>
 			<language type="kk">កាហ្សាក់ស្តង់់</language>
-			<language type="kl">Kalaallisut</language>
-			<language type="kln">Kalenjin</language>
+			<language type="kl">កាឡាលលីស៊ុត</language>
+			<language type="kln">កាលែនជីន</language>
 			<language type="km">ខ្មែរ</language>
 			<language type="kn">កន្នដ</language>
 			<language type="ko">កូរ៉េ</language>
-			<language type="koi">Komi-Permyak</language>
-			<language type="kok">Konkani</language>
+			<language type="koi">គូមីភឹមយ៉ាគ</language>
+			<language type="kok">គុនកានី</language>
 			<language type="ks">កាស្មៀរ</language>
-			<language type="ksb">Shambala</language>
-			<language type="ksf">Bafia</language>
+			<language type="ksb">សាមបាឡា</language>
+			<language type="ksf">បាហ្វៀ</language>
 			<language type="ku">ឃឺដ</language>
-			<language type="kw">Cornish</language>
+			<language type="kw">កូនីស</language>
 			<language type="ky">គៀរហ្គីស្តង់</language>
 			<language type="la">ឡាតំាង</language>
-			<language type="lag">Langi</language>
+			<language type="lag">ឡានហ្គី</language>
 			<language type="lb">លុចហ្សំបួរ</language>
-			<language type="lg">Ganda</language>
-			<language type="lkt">Lakota</language>
+			<language type="lg">ហ្គាន់ដា</language>
+			<language type="lkt">ឡាកូតា</language>
 			<language type="ln">លីនកាឡា</language>
 			<language type="lo">ឡាវ</language>
+			<language type="lrc">លូរីខាងជើង</language>
 			<language type="lt">លីទុយអានី</language>
-			<language type="lu">Luba-Katanga</language>
-			<language type="luo">Luo</language>
-			<language type="luy">Luyia</language>
-			<language type="lv">ឡាតវីយ៉ា</language>
-			<language type="mas">Masai</language>
-			<language type="mer">Meru</language>
-			<language type="mfe">Morisyen</language>
+			<language type="lu">លូបាកាតានហ្គា</language>
+			<language type="luo">លូអូ</language>
+			<language type="luy">លូយ៉ា</language>
+			<language type="lv">ឡាតវី</language>
+			<language type="mas">ម៉ាសៃ</language>
+			<language type="mer">មេរូ</language>
+			<language type="mfe">ម៉ូរីស៊ីន</language>
 			<language type="mg">ម៉ាឡាហ្គាស៊ី</language>
-			<language type="mgh">Makhuwa-Meetto</language>
-			<language type="mgo">Meta</language>
+			<language type="mgh">ម៉ាកគូវ៉ាមីតូ</language>
+			<language type="mgo">មេតា</language>
 			<language type="mi">ម៉ោរី</language>
 			<language type="mk">ម៉ាសេដូនី</language>
 			<language type="ml">មលយាល័ម</language>
 			<language type="mn">ម៉ុងហ្គោលី</language>
-			<language type="moh">Mohawk</language>
-			<language type="mr">មរាធិ</language>
+			<language type="moh">ម៊ូហាគ</language>
+			<language type="mr">ម៉ារ៉ាធី</language>
 			<language type="ms">ម៉ាឡេស៊ី</language>
 			<language type="mt">ម៉ាល់តា</language>
-			<language type="mua">Mundang</language>
+			<language type="mua">មុនដាង</language>
 			<language type="my">ភូមា</language>
-			<language type="naq">Nama</language>
+			<language type="mzn">ម៉ាហ្សានដឺរេនី</language>
+			<language type="naq">ណាម៉ា</language>
 			<language type="nb">ន័រវែស បុកម៉ាល់</language>
-			<language type="nd">North Ndebele</language>
+			<language type="nd">នេបេលេខាងជើង</language>
+			<language type="nds">អាល្លឺម៉ង់ក្រោម</language>
+			<language type="nds_NL">ហ្សាក់ស្យុងក្រោម</language>
 			<language type="ne">នេប៉ាល់</language>
 			<language type="nl">ហុល្លង់</language>
 			<language type="nl_BE">ផ្លាមីស</language>
-			<language type="nmg">Kwasio</language>
+			<language type="nmg">ក្វាស្យូ</language>
 			<language type="nn">ន័រវែស នីនូស</language>
 			<language type="no">ភាសាន័រវែស</language>
-			<language type="nqo">N’Ko</language>
-			<language type="nus">Nuer</language>
-			<language type="nyn">Nyankole</language>
+			<language type="nqo">នគោ</language>
+			<language type="nus">នូអ័រ</language>
+			<language type="nyn">ណានកូលេ</language>
 			<language type="oc" draft="unconfirmed">អូសីតាន់</language>
-			<language type="om">Oromo</language>
+			<language type="om">អូរ៉ូម៉ូ</language>
 			<language type="or">អូរីយ៉ា</language>
 			<language type="pa">បឹនជាពិ</language>
 			<language type="pl">ប៉ូឡូញ</language>
 			<language type="ps">បាស្តូ</language>
 			<language type="pt">ព័រទុយហ្កាល់</language>
-			<language type="pt_BR">ព័រទុយហ្គាល់ ប្រេស៊ីល</language>
-			<language type="pt_PT">ព័រទុយហ្គាល់ អឺរ៉ុប</language>
+			<language type="pt_PT">ព័រទុយហ្គាល់ (អឺរ៉ុប)</language>
 			<language type="qu">កេទជួអា</language>
-			<language type="quc">Kʼicheʼ</language>
+			<language type="quc">គីចឈី</language>
 			<language type="rm">រ៉ូម៉ង់</language>
 			<language type="rn">រូន្ឌី</language>
 			<language type="ro">រូម៉ានី</language>
-			<language type="ro_MD">ភាសាម៉ុលដាវី</language>
-			<language type="rof">Rombo</language>
+			<language type="ro_MD">ម៉ុលដាវី</language>
+			<language type="rof">រុមបូ</language>
 			<language type="ru">រុស្ស៊ី</language>
-			<language type="rw">Kinyarwanda</language>
-			<language type="rwk">Rwa</language>
+			<language type="rw">គិនយ៉ាវ៉ាន់ដា</language>
+			<language type="rwk">រ៉្វា</language>
 			<language type="sa">សំស្ក្រឹត</language>
-			<language type="saq">Samburu</language>
-			<language type="sbp">Sangu</language>
-			<language type="sd">​​ស៊ីន្តី</language>
-			<language type="se">Sami ភាគ​ខាង​ជើង</language>
-			<language type="seh">Sena</language>
-			<language type="ses">Koyraboro Senni</language>
-			<language type="sg">Sango</language>
+			<language type="saq">សាមបូរូ</language>
+			<language type="sbp">សានហ្គូ</language>
+			<language type="sd">ស៊ីនឌី</language>
+			<language type="sdh">អម្បូរឃឺដខាងត្បូង</language>
+			<language type="se">សាមីខាងជើង</language>
+			<language type="seh">ស៊ីណា</language>
+			<language type="ses">គុយរ៉ាបូរ៉ុស៊ីនី</language>
+			<language type="sg">សានហ្គោ</language>
 			<language type="sh" draft="unconfirmed">សើបូក្រូទៀន</language>
-			<language type="shi">Tachelhit</language>
+			<language type="shi">តាឈីលហ៊ីត</language>
 			<language type="si">ស្រីលង្កា</language>
 			<language type="sk">ស្លូវ៉ាគី</language>
 			<language type="sl">ស្លូវ៉ានី</language>
 			<language type="sm">ភាសាសាមូអា</language>
-			<language type="sma">Sami ភាគ​ខាង​ត្បូង</language>
-			<language type="smj">Lule Sami</language>
-			<language type="smn">Inari Sami</language>
-			<language type="sms">Skolt Sami</language>
-			<language type="sn">Shona</language>
+			<language type="sma">សាមីខាងត្បូង</language>
+			<language type="smj">លូលីសាមី</language>
+			<language type="smn">អ៊ីណារីសាម៉ី</language>
+			<language type="sms">ស្កុលសាមី</language>
+			<language type="sn">សូណា</language>
 			<language type="so">សូម៉ាលី</language>
 			<language type="sq">អាល់បានី</language>
-			<language type="sr">សើប</language>
+			<language type="sr">ស៊ែប</language>
 			<language type="st" draft="unconfirmed">សេសូដូ</language>
 			<language type="su">ស៊ូដង់</language>
 			<language type="sv">ស៊ុយអែដ</language>
 			<language type="sw">ស្វាហ៊ីលី</language>
-			<language type="swc">Congo Swahili</language>
+			<language type="sw_CD">កុងហ្គោស្វាហ៊ីលី</language>
 			<language type="ta">តាមីល</language>
 			<language type="te">តេលុគុ</language>
-			<language type="teo">Teso</language>
+			<language type="teo">តេសូ</language>
 			<language type="tg">តាដហ្សីគីស្តង់</language>
 			<language type="th">ថៃ</language>
 			<language type="ti">ទីរិនយា</language>
@@ -230,21 +229,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="tlh" draft="unconfirmed">ខ្លិងសុន</language>
 			<language type="to">តុងហ្គោ</language>
 			<language type="tr">ទួរគី</language>
-			<language type="tt">តាតារ</language>
+			<language type="tt">តាតា</language>
 			<language type="tw" draft="unconfirmed">ទ្វី</language>
-			<language type="twq">Tasawaq</language>
-			<language type="tzm">Atlas Tamazight កណ្ដាល</language>
+			<language type="twq">តាសាវ៉ាក់</language>
+			<language type="tzm">តាម៉ាសាយអាត្លាសកណ្តាល</language>
 			<language type="ug">អ៊ុយហ្គឺរ</language>
 			<language type="uk">អ៊ុយក្រែន</language>
-			<language type="und">មិន​ស្គាល់​ភាសា</language>
+			<language type="und">ភាសាមិនស្គាល់</language>
 			<language type="ur">អ៊ូរឌូ</language>
 			<language type="uz">អ៊ូហ្សបេគីស្តង់</language>
-			<language type="vai">Vai</language>
+			<language type="vai">វៃ</language>
 			<language type="vi">វៀតណាម</language>
-			<language type="vun">Vunjo</language>
+			<language type="vun">វុនចូ</language>
+			<language type="wbp">វ៉ារីប៉ារី</language>
 			<language type="wo">វូឡុហ្វ</language>
 			<language type="xh">ឃសា</language>
-			<language type="xog">Soga</language>
+			<language type="xog">សូហ្គា</language>
 			<language type="yi">ភាសាយីឌីហ្ស</language>
 			<language type="yo">យរូបា</language>
 			<language type="za">ភាសាចួង</language>
@@ -257,16 +257,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</languages>
 		<scripts>
 			<script type="Arab">អារ៉ាប់</script>
-			<script type="Armn">អារមេនី</script>
+			<script type="Armn">អាម៉ានី</script>
 			<script type="Beng">បង់ក្លាដែស</script>
 			<script type="Bopo">បូផូម៉ូហ្វូ</script>
 			<script type="Brai">អក្សរ​សម្រាប់មនុស្ស​ពិការ​ភ្នែក</script>
-			<script type="Cyrl">ស៊ីរី</script>
+			<script type="Cyrl">ស៊ីរីលីក</script>
 			<script type="Deva">ដាវ៉ាន់ណាការិ</script>
 			<script type="Ethi">អេត្យូពី</script>
 			<script type="Geor">ហ្សកហ្ស៊ី</script>
 			<script type="Grek">ក្រិច</script>
-			<script type="Gujr">កុដ្យារ៉ាទី</script>
+			<script type="Gujr">គូចារ៉ាទី</script>
 			<script type="Guru">កុមុយឃី</script>
 			<script type="Hang">ហាំងកុល</script>
 			<script type="Hani">ហាន</script>
@@ -277,9 +277,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Hebr">អ៊ីស្រាអែល</script>
 			<script type="Hira">ហ៊ីរ៉ាកាណា</script>
 			<script type="Jpan">ជប៉ុន</script>
-			<script type="Kana">កតាកាណា</script>
+			<script type="Kana">កាតាកាណា</script>
 			<script type="Khmr">ខ្មែរ</script>
-			<script type="Knda">កណាដា</script>
+			<script type="Knda">កន្នដ</script>
 			<script type="Kore">កូរ៉េ</script>
 			<script type="Laoo">ឡាវ</script>
 			<script type="Latn">ឡាតាំង</script>
@@ -287,38 +287,38 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Mong">ម៉ុងហ្គោលី</script>
 			<script type="Mymr">ភូមា</script>
 			<script type="Orya">អូរីយ៉ា</script>
-			<script type="Sinh">ស្រីលង្ការ</script>
+			<script type="Sinh">ស៊ីនហាឡា</script>
 			<script type="Taml">តាមីល</script>
 			<script type="Telu">តេលុគុ</script>
 			<script type="Thaa">ថាណា</script>
 			<script type="Thai">ថៃ</script>
-			<script type="Tibt">តៃប៉ិ</script>
+			<script type="Tibt">ទីបេ</script>
 			<script type="Zsym">និមិត្តសញ្ញា</script>
-			<script type="Zxxx">គ្មាន​សរសេរ</script>
-			<script type="Zyyy">ធម្មតា</script>
-			<script type="Zzzz">មិន​ស្គាល់​អក្សរ</script>
+			<script type="Zxxx">គ្មានការសរសេរ</script>
+			<script type="Zyyy">ទូទៅ</script>
+			<script type="Zzzz">អក្សរមិនស្គាល់</script>
 		</scripts>
 		<territories>
 			<territory type="001">ពិភពលោក</territory>
 			<territory type="002">អាហ្វ្រិក</territory>
 			<territory type="003">អាមេរិក​ខាង​ជើង</territory>
 			<territory type="005">អាមេរិក​ខាង​ត្បូង</territory>
-			<territory type="009">មហា​សមុទ្រ</territory>
-			<territory type="011">អាព្រិក​ខាង​លិច</territory>
+			<territory type="009">អូសេអានី</territory>
+			<territory type="011">អាហ្វ្រិក​ខាង​លិច</territory>
 			<territory type="013">អាមេរិក​កណ្ដាល</territory>
-			<territory type="014">អាព្រិក​ខាង​កើត</territory>
-			<territory type="015">អាព្រិក​ខាង​ជើង</territory>
-			<territory type="017">អាព្រិក​កណ្ដាល</territory>
-			<territory type="018">អាព្រិក​ខាង​ត្បូង</territory>
+			<territory type="014">អាហ្វ្រិកខាងកើត</territory>
+			<territory type="015">អាហ្វ្រិក​ខាង​ជើង</territory>
+			<territory type="017">អាហ្វ្រិក​កណ្តាល</territory>
+			<territory type="018">អាហ្វ្រិកភាគខាងត្បូង</territory>
 			<territory type="019">អាមេរិក</territory>
 			<territory type="021">អាមេរិក​ភាគ​ខាង​ជើង</territory>
 			<territory type="029">ការ៉ាប៊ីន</territory>
 			<territory type="030">អាស៊ី​ខាង​កើត</territory>
 			<territory type="034">អាស៊ី​ខាង​ត្បូង</territory>
-			<territory type="035">អាស៊ី អាគ្នេយ៍</territory>
+			<territory type="035">អាស៊ីអាគ្នេយ៍</territory>
 			<territory type="039">អឺរ៉ុប​ខាង​ត្បូង</territory>
 			<territory type="053">អូស្ត្រាឡាស៊ី</territory>
-			<territory type="054">មេឡែណេស៊ី</territory>
+			<territory type="054">មេឡាណេស៊ី</territory>
 			<territory type="057">តំបន់​មីក្រូណេស៊ី</territory>
 			<territory type="061">ប៉ូលីណេស៊ី</territory>
 			<territory type="142">អាស៊ី</territory>
@@ -331,22 +331,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="419">អាមេរិក​ឡាទីន</territory>
 			<territory type="AC">កោះ​អាសេនសិន</territory>
 			<territory type="AD">អង់ដូរ៉ា</territory>
-			<territory type="AE">អេមីរ៉ែទអារ៉ាប់រួម</territory>
+			<territory type="AE">អារ៉ាប់រួម</territory>
 			<territory type="AF">អាហ្វហ្គានីស្ថាន</territory>
 			<territory type="AG">អង់ទីគ័រ និង​បាបុយដា</territory>
 			<territory type="AI">អង់កូឡា</territory>
 			<territory type="AL">អាល់បានី</territory>
 			<territory type="AM">អារមេនី</territory>
 			<territory type="AO">អង់ហ្គោឡា</territory>
-			<territory type="AQ">អង់តាទីកា</territory>
+			<territory type="AQ">អង់តាក់ទិក</territory>
 			<territory type="AR">អាហ្សង់ទីន</territory>
-			<territory type="AS">សៅម៉ៅ អាមេរិក</territory>
+			<territory type="AS">សាម៉ូអាអាមេរិក</territory>
 			<territory type="AT">អូទ្រីស</territory>
 			<territory type="AU">អូស្ត្រាលី</territory>
 			<territory type="AW">អារូបា</territory>
 			<territory type="AX">កោះ​អាឡាំង</territory>
 			<territory type="AZ">អាហ៊្សែរបែហ្សង់</territory>
-			<territory type="BA">បូស្ន៉ី</territory>
+			<territory type="BA">បូស្នី និងហឺហ្សីហ្គូវីណា</territory>
 			<territory type="BB">បារបាដូស</territory>
 			<territory type="BD">បង់ក្លាដេស្ហ</territory>
 			<territory type="BE">បែលហ្ស៉ិក</territory>
@@ -357,7 +357,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BJ">បេណាំង</territory>
 			<territory type="BL">សង់ បាតេឡេម៉ី</territory>
 			<territory type="BM">ប៊ឺមុយដា</territory>
-			<territory type="BN">ព្រុយណេ</territory>
+			<territory type="BN">ប្រ៊ុយណេ</territory>
 			<territory type="BO">បូលីវី</territory>
 			<territory type="BQ">ហុល្លង់ ការ៉ាប៊ីន</territory>
 			<territory type="BR">ប្រេស៊ីល</territory>
@@ -388,11 +388,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CV">កាបវែរ</territory>
 			<territory type="CW">កូរ៉ាកៅ</territory>
 			<territory type="CX">កោះ​គ្រីស្មាស</territory>
-			<territory type="CY">ស៉ីពរ៍</territory>
+			<territory type="CY">ស៊ីពរ៍</territory>
 			<territory type="CZ">សាធារណរដ្ឋឆេក</territory>
 			<territory type="DE">អាល្លឺម៉ង់</territory>
 			<territory type="DG">ឌៀហ្គោហ្គាស៊ី</territory>
-			<territory type="DJ">ហ្ស៉ីបូទី</territory>
+			<territory type="DJ">ហ្ស៊ីបូទី</territory>
 			<territory type="DK">ដាណឺម៉ាក</territory>
 			<territory type="DM">ដូមីនីកា</territory>
 			<territory type="DO">សាធារណរដ្ឋដូមីនីកែន</territory>
@@ -400,7 +400,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="EA">ជឺតា និង​ម៉េលីឡា</territory>
 			<territory type="EC">អេក្វាឌ័រ</territory>
 			<territory type="EE">អេស្តូនី</territory>
-			<territory type="EG">អេហ្ស៉ីប</territory>
+			<territory type="EG">អេហ្ស៊ីប</territory>
 			<territory type="EH">សាហារ៉ាខាងលិច</territory>
 			<territory type="ER">អេរីទ្រា</territory>
 			<territory type="ES">អេស្ប៉ាញ</territory>
@@ -410,15 +410,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="FJ">ហ្វីជី</territory>
 			<territory type="FK">កោះ​ហ្វក់ឡែន</territory>
 			<territory type="FK" alt="variant">កោះ​ហ្វក់ឡែន (Islas Malvinas)</territory>
-			<territory type="FM">មិក្រូនេស៊ី</territory>
+			<territory type="FM">មីក្រូនេស៊ី</territory>
 			<territory type="FO">កោះ​ហ្វារ៉ូ</territory>
 			<territory type="FR">បារាំង</territory>
 			<territory type="GA">ហ្គាបុង</territory>
 			<territory type="GB">ចក្រភព​អង់គ្លេស</territory>
 			<territory type="GB" alt="short">ច.អ.</territory>
-			<territory type="GD">ហ្គ្រើណាដ</territory>
+			<territory type="GD">ហ្គ្រីណាដា</territory>
 			<territory type="GE">ហ្សកហ្ស៉ី</territory>
-			<territory type="GF">ហ្វ្វេន​ហ្គៀណា</territory>
+			<territory type="GF">ហ្គៀណាបារាំង</territory>
 			<territory type="GG">ហ្គេនស៊ី</territory>
 			<territory type="GH">ហ្គាណា</territory>
 			<territory type="GI">ហ្គីប្រាលតា</territory>
@@ -452,7 +452,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="IS">អ៊ីស្លង់</territory>
 			<territory type="IT">អ៊ីតាលី</territory>
 			<territory type="JE">ជឺស៊ី</territory>
-			<territory type="JM">ហ្សាម៉ាអ៉ិគ</territory>
+			<territory type="JM">ចាម៉ៃកា</territory>
 			<territory type="JO">ហ៊្សកដានី</territory>
 			<territory type="JP">ជប៉ុន</territory>
 			<territory type="KE">កេនយ៉ា</territory>
@@ -465,7 +465,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="KR">កូរ៉េ​ខាង​ត្បូង</territory>
 			<territory type="KW">គុយវ៉ែត</territory>
 			<territory type="KY">កោះ​កៃម៉ង់</territory>
-			<territory type="KZ">កាហ្សាក់ស្តាង់់</territory>
+			<territory type="KZ">កាហ្សាក់ស្តង់់</territory>
 			<territory type="LA">ឡាវ</territory>
 			<territory type="LB">លីបង់</territory>
 			<territory type="LC">សង់​លូសៀ</territory>
@@ -484,8 +484,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="MF">សង់​ម៉ាទីន</territory>
 			<territory type="MG">ម៉ាដាហ្កាស្ការ</territory>
 			<territory type="MH">កោះ​ម៉ាស់សល</territory>
-			<territory type="MK">ម៉ាសេដន</territory>
-			<territory type="MK" alt="variant">ម៉ាសេដ្វាន</territory>
+			<territory type="MK">ម៉ាសេដូនា</territory>
+			<territory type="MK" alt="variant">ម៉ាសេដូនា (FYROM)</territory>
 			<territory type="ML">ម៉ាលី</territory>
 			<territory type="MM">មីយ៉ាន់ម៉ា (ភូមា)</territory>
 			<territory type="MN">ម៉ុងហ្គោលី</territory>
@@ -517,11 +517,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="OM">អូម៉ង់</territory>
 			<territory type="PA">ប៉ាណាម៉ា</territory>
 			<territory type="PE">ប៉េរូ</territory>
-			<territory type="PF">ហ្វ្រេន​ប៉ូលី​ណេស៊ី</territory>
-			<territory type="PG">ប៉ាពូអានូវែលហ្គីណេ</territory>
+			<territory type="PF">ប៉ូលី​ណេស៊ី​បារាំង</territory>
+			<territory type="PG">ប៉ាពួញ៉ូហ្គីណេ</territory>
 			<territory type="PH">ហ្វីលីពីន</territory>
 			<territory type="PK">ប៉ាគីស្ថាន</territory>
-			<territory type="PL">ប៉ូលូញ</territory>
+			<territory type="PL">ប៉ូឡូញ</territory>
 			<territory type="PM">សង់ព្យែរ និង​មីគីឡុង</territory>
 			<territory type="PN">កោះ​ភីតខារិន</territory>
 			<territory type="PR">ព័រតូរីកូ</territory>
@@ -530,11 +530,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="PT">ព័រទុយហ្កាល់</territory>
 			<territory type="PW">ផៅឡូ</territory>
 			<territory type="PY">ប៉ារ៉ាហ្គាយ</territory>
-			<territory type="QA">កាតារ</territory>
-			<territory type="QO">អៅលីយីង អុកស៊ីន</territory>
+			<territory type="QA">កាតា</territory>
+			<territory type="QO">តំបន់ជាយអូសេអានី</territory>
 			<territory type="RE">រ៉េអ៊ុយ៉ុង</territory>
 			<territory type="RO">រូម៉ានី</territory>
-			<territory type="RS">សើប</territory>
+			<territory type="RS">ស៊ែប</territory>
 			<territory type="RU">រុស្ស៊ី</territory>
 			<territory type="RW">រវ៉ាន់ដា</territory>
 			<territory type="SA">អារ៉ាប៊ីសាអ៊ូឌីត</territory>
@@ -553,18 +553,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="SO">សូម៉ាលី</territory>
 			<territory type="SR">សូរីណាម</territory>
 			<territory type="SS">ស៊ូដង់​ខាង​ត្បូង</territory>
-			<territory type="ST">សៅ​តុំ និង​ព្រីនស៊ីប៉េ</territory>
+			<territory type="ST">សៅ​តូមេ និង​ព្រីនស៊ីប៉េ</territory>
 			<territory type="SV">អែលសាល់វ៉ាឌ័រ</territory>
 			<territory type="SX">សីង​ម៉ាធីន</territory>
 			<territory type="SY">ស៊ីរី</territory>
-			<territory type="SZ">សូហ្ស៉ីឡង់</territory>
+			<territory type="SZ">ស្វាហ្ស៊ីឡង់</territory>
 			<territory type="TA">ទ្រីស្តង់​ដា​ចូនហា</territory>
 			<territory type="TC">កោះ​កៃកូស និងទូក</territory>
 			<territory type="TD">ឆាដ</territory>
 			<territory type="TF">ដែន​បារាំង​ខាង​ត្បូង</territory>
-			<territory type="TG">តូហ្គូ</territory>
+			<territory type="TG">តូហ្គោ</territory>
 			<territory type="TH">ថៃ</territory>
-			<territory type="TJ">តាដហ្ស៉ីគីស្តង់</territory>
+			<territory type="TJ">តាជីគីស្តង់</territory>
 			<territory type="TK">តូខេឡៅ</territory>
 			<territory type="TL">ទីម័រ</territory>
 			<territory type="TL" alt="variant">ទីម័រ​ខាង​កើត</territory>
@@ -581,7 +581,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="UM">កោះ​អៅឡាយីង​អាមេរិក</territory>
 			<territory type="US">សហរដ្ឋអាមេរិក</territory>
 			<territory type="US" alt="short">ស.រ.អ</territory>
-			<territory type="UY">អ៊ុយរុយហ្គាយ</territory>
+			<territory type="UY">អ៊ុយរ៉ាហ្គាយ</territory>
 			<territory type="UZ">អ៊ូហ្សបេគីស្តង់</territory>
 			<territory type="VA">ទីក្រុងវ៉ាទីកង់</territory>
 			<territory type="VC">សាំង​វីនសេន និង​ឌឹ​ហ្គ្រីណាឌីនីស</territory>
@@ -589,73 +589,86 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="VG">កោះ​វឺជិន​ចក្រភព​អង់គ្លេស</territory>
 			<territory type="VI">កោះ​វឺជីន​អាមេរិក</territory>
 			<territory type="VN">វៀតណាម</territory>
-			<territory type="VU">វ៉ាន់ណៅទូ</territory>
+			<territory type="VU">វ៉ានូអាទូ</territory>
 			<territory type="WF">វ៉ាលីស និង​ហ្វូទូណា</territory>
-			<territory type="WS">សាមូអា</territory>
+			<territory type="WS">សា​ម៉ូអា</territory>
 			<territory type="XK">កូសូវ៉ូ</territory>
 			<territory type="YE">យេមែន</territory>
 			<territory type="YT">ម៉ាយុត</territory>
-			<territory type="ZA">អាព្រិក​ភាគ​ខាង​ត្បូង</territory>
+			<territory type="ZA">អាហ្វ្រិកខាងត្បូង</territory>
 			<territory type="ZM">ហ្សាំប៊ី</territory>
-			<territory type="ZW">ហ្ស៊ីមបាបវ៉េ</territory>
-			<territory type="ZZ">មិន​ស្គាល់​តំបន់</territory>
+			<territory type="ZW">ហ្ស៊ីមបាវ៉េ</territory>
+			<territory type="ZZ">តំបន់មិនស្គាល់</territory>
 		</territories>
 		<keys>
 			<key type="calendar">ប្រតិទិន</key>
 			<key type="collation">លំដាប់​តម្រៀប</key>
 			<key type="currency">រូបិយប័ណ្ណ</key>
+			<key type="hc">វដ្តម៉ោង (12 vs 24)</key>
+			<key type="lb">របៀបចុះបន្ទាត់</key>
+			<key type="ms">ប្រព័ន្ធវាស់វែង</key>
 			<key type="numbers">លេខ</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">លេខ​ឥណ្ឌា-អារ៉ាប់</type>
-			<type type="arabext" key="numbers">លេខ​ឥណ្ឌា-អារ៉ាប់​ពង្រីក</type>
-			<type type="armn" key="numbers">លេខ​អាមេនី</type>
-			<type type="armnlow" key="numbers">លេខ​តូច​អាមេនី</type>
-			<type type="beng" key="numbers">លេខ​បង់ក្លាដែស</type>
-			<type type="buddhist" key="calendar">ប្រតិទិន​ពុទ្ធសាសនិក</type>
-			<type type="chinese" key="calendar">ប្រតិទិន​ចិន</type>
-			<type type="dangi" key="calendar">ប្រតិទិន​ dangi</type>
-			<type type="deva" key="numbers">លេខ​ឌីវ៉ាណាការី</type>
-			<type type="ducet" key="collation">លំដាប់​តម្រៀប​យូនីកូដ​លំនាំដើម</type>
-			<type type="ethi" key="numbers">លេខ​អេត្យូពី</type>
-			<type type="ethiopic" key="calendar">ប្រតិទិន​អេត្យូពី</type>
-			<type type="fullwide" key="numbers">លេខ​ទទឹង​ពេញ</type>
-			<type type="geor" key="numbers">លេខ​ហ្សកហ្សី</type>
-			<type type="gregorian" key="calendar">ប្រតិទិន​ហ្សកហ្ស៊ី</type>
-			<type type="grek" key="numbers">លេខ​ក្រិក</type>
-			<type type="greklow" key="numbers">លេខ​តូច​ក្រិក</type>
-			<type type="gujr" key="numbers">លេខ​ហ្កុយ៉ារាទី</type>
-			<type type="guru" key="numbers">លេខ​កុមុឃី</type>
-			<type type="hanidec" key="numbers">លេខ​ទសភាគ​ចិន</type>
-			<type type="hans" key="numbers">លេខ​ចិន​អក្សរ​កាត់</type>
-			<type type="hansfin" key="numbers">លេខ​ហិរញ្ញវត្ថុ​ចិន​អក្សរ​កាត់</type>
-			<type type="hant" key="numbers">លេខ​ចិន​អក្សរ​ពេញ</type>
-			<type type="hantfin" key="numbers">លេខ​ហិរញ្ញវត្ថុ​ចិន​អក្សរ​ពេញ</type>
-			<type type="hebr" key="numbers">លេខ​អ៊ីស្រាអែល</type>
-			<type type="hebrew" key="calendar">ប្រតិទិន​ហេប្រិ</type>
-			<type type="islamic" key="calendar">ប្រតិទិន​អ៊ិស្លាម</type>
-			<type type="iso8601" key="calendar">ប្រតិទិន ISO-8601</type>
-			<type type="japanese" key="calendar">ប្រតិទិន​ជប៉ុន</type>
-			<type type="jpan" key="numbers">លេខ​ជប៉ុន</type>
-			<type type="jpanfin" key="numbers">លេខ​ហិរញ្ញវត្ថុ​ជប៉ុន</type>
-			<type type="khmr" key="numbers">លេខ​ខ្មែរ</type>
-			<type type="knda" key="numbers">លេខ Kannada</type>
-			<type type="laoo" key="numbers">លេខ​ឡាវ</type>
-			<type type="latn" key="numbers">លេខ​បច្ចឹម​ប្រទេស</type>
-			<type type="mlym" key="numbers">លេខ​មលយាល័ម</type>
-			<type type="mymr" key="numbers">លេខ​ភូមា</type>
-			<type type="orya" key="numbers">លេខ​អូរីយ៉ា</type>
-			<type type="persian" key="calendar">ប្រតិទិន Persian</type>
-			<type type="roc" key="calendar">ប្រតិទិន Minguo</type>
-			<type type="roman" key="numbers">លេខ​រ៉ូមាំង</type>
-			<type type="romanlow" key="numbers">លេខ​តូច​រ៉ូមាំង</type>
-			<type type="search" key="collation">ស្វែងរក​ទូទៅ</type>
-			<type type="standard" key="collation">លំដាប់​តម្រៀប​ស្តង់ដារ</type>
-			<type type="taml" key="numbers">លេខ​តាមីល</type>
-			<type type="tamldec" key="numbers">លេខ​តាមីល</type>
-			<type type="telu" key="numbers">លេខ​តេលុគុ</type>
-			<type type="thai" key="numbers">លេខ​ថៃ</type>
-			<type type="tibt" key="numbers">លេខ​តៃប៉ិ</type>
+			<type key="calendar" type="buddhist">ប្រតិទិកពុទ្ធសាសនា</type>
+			<type key="calendar" type="chinese">ប្រតិទិន​ចិន</type>
+			<type key="calendar" type="dangi">ប្រតិទិនកូរ៉េ</type>
+			<type key="calendar" type="ethiopic">ប្រតិទិន​អេត្យូពី</type>
+			<type key="calendar" type="gregorian">ប្រតិទិន​ហ្សកហ្ស៊ី</type>
+			<type key="calendar" type="hebrew">ប្រតិទិនហេប្រឺ</type>
+			<type key="calendar" type="islamic">ប្រតិទិនអ៊ីស្លាម</type>
+			<type key="calendar" type="iso8601">ប្រតិទិន ISO-8601</type>
+			<type key="calendar" type="japanese">ប្រតិទិន​ជប៉ុន</type>
+			<type key="calendar" type="persian">ប្រតិទិនពែក្ស</type>
+			<type key="calendar" type="roc">ប្រតិទិនមីងគ័រ</type>
+			<type key="collation" type="ducet">លំដាប់​តម្រៀប​យូនីកូដ​លំនាំដើម</type>
+			<type key="collation" type="search">ស្វែងរក​ទូទៅ</type>
+			<type key="collation" type="standard">លំដាប់​តម្រៀប​ស្តង់ដារ</type>
+			<type key="hc" type="h11">ប្រព័ន្ធ 12 ម៉ោង (0–11)</type>
+			<type key="hc" type="h12">ប្រព័ន្ធ 12 ម៉ោង (1–12)</type>
+			<type key="hc" type="h23">ប្រព័ន្ធ 24 ម៉ោង (0–23)</type>
+			<type key="hc" type="h24">ប្រព័ន្ធ 24 ម៉ោង (1–24)</type>
+			<type key="lb" type="loose">របៀបចុះបន្ទាត់ខ្លី</type>
+			<type key="lb" type="normal">របៀបចុះបន្ទាត់ធម្មតា</type>
+			<type key="lb" type="strict">របៀបចុះបន្ទាត់តឹងរឹង</type>
+			<type key="ms" type="metric">ប្រព័ន្ធវាស់វែងម៉ាទ្រិក</type>
+			<type key="ms" type="uksystem">ប្រព័ន្ធវាស់វែងចក្រព័ទ្ធ</type>
+			<type key="ms" type="ussystem">ប្រព័ន្ធវាស់វែងអាមេរិក</type>
+			<type key="numbers" type="arab">លេខ​ឥណ្ឌា-អារ៉ាប់</type>
+			<type key="numbers" type="arabext">លេខ​ឥណ្ឌា-អារ៉ាប់​ពង្រីក</type>
+			<type key="numbers" type="armn">លេខ​អាមេនី</type>
+			<type key="numbers" type="armnlow">លេខ​តូច​អាមេនី</type>
+			<type key="numbers" type="beng">លេខ​បង់ក្លាដែស</type>
+			<type key="numbers" type="deva">លេខ​ឌីវ៉ាណាការី</type>
+			<type key="numbers" type="ethi">លេខ​អេត្យូពី</type>
+			<type key="numbers" type="fullwide">លេខ​ទទឹង​ពេញ</type>
+			<type key="numbers" type="geor">លេខ​ហ្សកហ្សី</type>
+			<type key="numbers" type="grek">លេខ​ក្រិក</type>
+			<type key="numbers" type="greklow">លេខ​តូច​ក្រិក</type>
+			<type key="numbers" type="gujr">លេខ​ហ្កុយ៉ារាទី</type>
+			<type key="numbers" type="guru">លេខ​កុមុឃី</type>
+			<type key="numbers" type="hanidec">លេខ​ទសភាគ​ចិន</type>
+			<type key="numbers" type="hans">លេខ​ចិន​អក្សរ​កាត់</type>
+			<type key="numbers" type="hansfin">លេខ​ហិរញ្ញវត្ថុ​ចិន​អក្សរ​កាត់</type>
+			<type key="numbers" type="hant">លេខ​ចិន​អក្សរ​ពេញ</type>
+			<type key="numbers" type="hantfin">លេខ​ហិរញ្ញវត្ថុ​ចិន​អក្សរ​ពេញ</type>
+			<type key="numbers" type="hebr">លេខហេប្រឺ</type>
+			<type key="numbers" type="jpan">លេខ​ជប៉ុន</type>
+			<type key="numbers" type="jpanfin">លេខ​ហិរញ្ញវត្ថុ​ជប៉ុន</type>
+			<type key="numbers" type="khmr">លេខ​ខ្មែរ</type>
+			<type key="numbers" type="knda">លេខកន្នដ</type>
+			<type key="numbers" type="laoo">លេខ​ឡាវ</type>
+			<type key="numbers" type="latn">លេខ​បច្ចឹម​ប្រទេស</type>
+			<type key="numbers" type="mlym">លេខ​មលយាល័ម</type>
+			<type key="numbers" type="mymr">លេខ​ភូមា</type>
+			<type key="numbers" type="orya">លេខ​អូរីយ៉ា</type>
+			<type key="numbers" type="roman">លេខ​រ៉ូមាំង</type>
+			<type key="numbers" type="romanlow">លេខ​តូច​រ៉ូមាំង</type>
+			<type key="numbers" type="taml">លេខ​តាមីល</type>
+			<type key="numbers" type="tamldec">លេខ​តាមីល</type>
+			<type key="numbers" type="telu">លេខ​តេលុគុ</type>
+			<type key="numbers" type="thai">លេខ​ថៃ</type>
+			<type key="numbers" type="tibt">លេខទីបេ</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">រង្វាស់​ប្រវែង</measurementSystemName>
@@ -670,7 +683,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</localeDisplayNames>
 	<characters>
 		<exemplarCharacters>[\u17D0 ៈ \u17CB \u17C9 \u17CA \u17CD ក ខ គ ឃ ង ច ឆ ជ ឈ ញ ដ ឋ ឌ ឍ ណ ត ថ ទ ធ ន ប ផ ព ភ ម យ រ ឫ ឬ ល ឭ ឮ វ ស ហ ឡ អ {អា} ឥ ឦ ឧ {ឧក} ឩ ឪ ឯ ឰ ឱ ឲ ឳ ា \u17B7 \u17B8 \u17B9 \u17BA \u17BB \u17BC \u17BD ើ ឿ ៀ េ ែ ៃ ោ ៅ \u17C6 ះ \u17D2]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u17CC \u17CE \u17CF \u17D1 \u17B4 \u17B5 \u200B ឝ ឞ]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[\u17B4\u17B5\u200B \u17CC \u17CE \u17CF \u17D1 ឝ ឞ]</exemplarCharacters>
 		<exemplarCharacters type="index" draft="unconfirmed">[ក ខ គ ឃ ង ច ឆ ជ ឈ ញ ដ ឋ ឌ ឍ ណ ត ថ ទ ធ ន ប ផ ព ភ ម យ រ ឫ ឬ ល ឭ ឮ វ ស ហ ឡ អ ឥ ឦ ឧ ឩ ឪ ឯ ឰ ឱ ឳ]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- , ៖ ! ? . ។ ៕ ‘ ’ &quot; “ ” ( ) \[ \] \{ \} ៙ ៚]</exemplarCharacters>
 		<ellipsis type="final">{0}…</ellipsis>
@@ -742,6 +755,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -759,6 +773,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
@@ -768,6 +783,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y MMMM</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
 					</availableFormats>
@@ -963,7 +979,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<dayContext type="format">
 						<dayWidth type="abbreviated">
 							<day type="sun">អាទិត្យ</day>
-							<day type="mon">ចន្ទ</day>
+							<day type="mon">ច័ន្ទ</day>
 							<day type="tue">អង្គារ</day>
 							<day type="wed">ពុធ</day>
 							<day type="thu">ព្រហស្បតិ៍</day>
@@ -971,17 +987,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<day type="sat">សៅរ៍</day>
 						</dayWidth>
 						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
+							<day type="sun">អា</day>
+							<day type="mon">ច</day>
+							<day type="tue">អ</day>
+							<day type="wed">ពុ</day>
+							<day type="thu">ព្រ</day>
+							<day type="fri">សុ</day>
+							<day type="sat">ស</day>
 						</dayWidth>
 						<dayWidth type="short">
 							<day type="sun">អាទិត្យ</day>
-							<day type="mon">ចន្ទ</day>
+							<day type="mon">ច័ន្ទ</day>
 							<day type="tue">អង្គារ</day>
 							<day type="wed">ពុធ</day>
 							<day type="thu">ព្រហស្បតិ៍</day>
@@ -990,7 +1006,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">អាទិត្យ</day>
-							<day type="mon">ចន្ទ</day>
+							<day type="mon">ច័ន្ទ</day>
 							<day type="tue">អង្គារ</day>
 							<day type="wed">ពុធ</day>
 							<day type="thu">ព្រហស្បតិ៍</day>
@@ -1001,7 +1017,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<dayContext type="stand-alone">
 						<dayWidth type="abbreviated">
 							<day type="sun">អាទិត្យ</day>
-							<day type="mon">ចន្ទ</day>
+							<day type="mon">ច័ន្ទ</day>
 							<day type="tue">អង្គារ</day>
 							<day type="wed">ពុធ</day>
 							<day type="thu">ព្រហស្បតិ៍</day>
@@ -1009,17 +1025,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<day type="sat">សៅរ៍</day>
 						</dayWidth>
 						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
+							<day type="sun">អា</day>
+							<day type="mon">ច</day>
+							<day type="tue">អ</day>
+							<day type="wed">ពុ</day>
+							<day type="thu">ព្រ</day>
+							<day type="fri">សុ</day>
+							<day type="sat">ស</day>
 						</dayWidth>
 						<dayWidth type="short">
 							<day type="sun">អាទិត្យ</day>
-							<day type="mon">ចន្ទ</day>
+							<day type="mon">ច័ន្ទ</day>
 							<day type="tue">អង្គារ</day>
 							<day type="wed">ពុធ</day>
 							<day type="thu">ព្រហស្បតិ៍</day>
@@ -1028,7 +1044,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">អាទិត្យ</day>
-							<day type="mon">ចន្ទ</day>
+							<day type="mon">ច័ន្ទ</day>
 							<day type="tue">អង្គារ</day>
 							<day type="wed">ពុធ</day>
 							<day type="thu">ព្រហស្បតិ៍</day>
@@ -1040,56 +1056,108 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<quarters>
 					<quarterContext type="format">
 						<quarterWidth type="abbreviated">
-							<quarter type="1">ត្រីមាសទី ១</quarter>
-							<quarter type="2">ត្រីមាសទី ២</quarter>
-							<quarter type="3">ត្រីមាសទី ៣</quarter>
-							<quarter type="4">ត្រីមាសទី ៤</quarter>
+							<quarter type="1">ត្រីមាសទី 1</quarter>
+							<quarter type="2">ត្រីមាសទី 2</quarter>
+							<quarter type="3">ត្រីមាសទី 3</quarter>
+							<quarter type="4">ត្រីមាសទី 4</quarter>
 						</quarterWidth>
 						<quarterWidth type="narrow">
-							<quarter type="1">១</quarter>
-							<quarter type="2">២</quarter>
-							<quarter type="3">៣</quarter>
-							<quarter type="4">៤</quarter>
+							<quarter type="1">1</quarter>
+							<quarter type="2">2</quarter>
+							<quarter type="3">3</quarter>
+							<quarter type="4">4</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
-							<quarter type="1">ត្រីមាសទី ១</quarter>
-							<quarter type="2">ត្រីមាសទី ២</quarter>
-							<quarter type="3">ត្រីមាសទី ៣</quarter>
-							<quarter type="4">ត្រីមាសទី ៤</quarter>
+							<quarter type="1">ត្រីមាសទី 1</quarter>
+							<quarter type="2">ត្រីមាសទី 2</quarter>
+							<quarter type="3">ត្រីមាសទី 3</quarter>
+							<quarter type="4">ត្រីមាសទី 4</quarter>
 						</quarterWidth>
 					</quarterContext>
 					<quarterContext type="stand-alone">
 						<quarterWidth type="abbreviated">
-							<quarter type="1">ត្រីមាសទី ១</quarter>
-							<quarter type="2">ត្រីមាសទី ២</quarter>
-							<quarter type="3">ត្រីមាសទី ៣</quarter>
-							<quarter type="4">ត្រីមាសទី ៤</quarter>
+							<quarter type="1">ត្រីមាសទី 1</quarter>
+							<quarter type="2">ត្រីមាសទី 2</quarter>
+							<quarter type="3">ត្រីមាសទី 3</quarter>
+							<quarter type="4">ត្រីមាសទី 4</quarter>
 						</quarterWidth>
 						<quarterWidth type="narrow">
-							<quarter type="1">១</quarter>
-							<quarter type="2">២</quarter>
-							<quarter type="3">៣</quarter>
-							<quarter type="4">៤</quarter>
+							<quarter type="1">1</quarter>
+							<quarter type="2">2</quarter>
+							<quarter type="3">3</quarter>
+							<quarter type="4">4</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
-							<quarter type="1">ត្រីមាសទី ១</quarter>
-							<quarter type="2">ត្រីមាសទី ២</quarter>
-							<quarter type="3">ត្រីមាសទី ៣</quarter>
-							<quarter type="4">ត្រីមាសទី ៤</quarter>
+							<quarter type="1">ត្រីមាសទី 1</quarter>
+							<quarter type="2">ត្រីមាសទី 2</quarter>
+							<quarter type="3">ត្រីមាសទី 3</quarter>
+							<quarter type="4">ត្រីមាសទី 4</quarter>
 						</quarterWidth>
 					</quarterContext>
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">អាធ្រាត្រ</dayPeriod>
 							<dayPeriod type="am">ព្រឹក</dayPeriod>
 							<dayPeriod type="noon">ថ្ងៃ</dayPeriod>
 							<dayPeriod type="pm">ល្ងាច</dayPeriod>
+							<dayPeriod type="morning1">ព្រឹក</dayPeriod>
+							<dayPeriod type="afternoon1">រសៀល</dayPeriod>
+							<dayPeriod type="evening1">ល្ងាច</dayPeriod>
+							<dayPeriod type="night1">យប់</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">កណ្តាលអាធ្រាត្រ</dayPeriod>
+							<dayPeriod type="am">ព្រឹក</dayPeriod>
+							<dayPeriod type="noon">ថ្ងៃត្រង់</dayPeriod>
+							<dayPeriod type="pm">ល្ងាច</dayPeriod>
+							<dayPeriod type="morning1">ព្រឹក</dayPeriod>
+							<dayPeriod type="afternoon1">រសៀល</dayPeriod>
+							<dayPeriod type="evening1">ល្ងាច</dayPeriod>
+							<dayPeriod type="night1">យប់</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">អាធ្រាត្រ</dayPeriod>
 							<dayPeriod type="am">ព្រឹក</dayPeriod>
 							<dayPeriod type="noon">ថ្ងៃ</dayPeriod>
 							<dayPeriod type="pm">ល្ងាច</dayPeriod>
+							<dayPeriod type="morning1">ព្រឹក</dayPeriod>
+							<dayPeriod type="afternoon1">រសៀល</dayPeriod>
+							<dayPeriod type="evening1">ល្ងាច</dayPeriod>
+							<dayPeriod type="night1">យប់</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">កណ្តាលអាធ្រាត្រ</dayPeriod>
+							<dayPeriod type="am">ព្រឹក</dayPeriod>
+							<dayPeriod type="noon">ថ្ងៃ​ត្រង់</dayPeriod>
+							<dayPeriod type="pm">ល្ងាច</dayPeriod>
+							<dayPeriod type="morning1">ព្រឹក</dayPeriod>
+							<dayPeriod type="afternoon1">រសៀល</dayPeriod>
+							<dayPeriod type="evening1">ល្ងាច</dayPeriod>
+							<dayPeriod type="night1">យប់</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">កណ្តាលអាធ្រាត្រ</dayPeriod>
+							<dayPeriod type="am">ព្រឹក</dayPeriod>
+							<dayPeriod type="noon">ថ្ងៃ​ត្រង់</dayPeriod>
+							<dayPeriod type="pm">ល្ងាច</dayPeriod>
+							<dayPeriod type="morning1">ព្រឹក</dayPeriod>
+							<dayPeriod type="afternoon1">រសៀល</dayPeriod>
+							<dayPeriod type="evening1">ល្ងាច</dayPeriod>
+							<dayPeriod type="night1">យប់</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">កណ្តាលអាធ្រាត្រ</dayPeriod>
+							<dayPeriod type="am">ព្រឹក</dayPeriod>
+							<dayPeriod type="noon">ថ្ងៃ​ត្រង់</dayPeriod>
+							<dayPeriod type="pm">ល្ងាច</dayPeriod>
+							<dayPeriod type="morning1">ព្រឹក</dayPeriod>
+							<dayPeriod type="afternoon1">រសៀល</dayPeriod>
+							<dayPeriod type="evening1">ល្ងាច</dayPeriod>
+							<dayPeriod type="night1">យប់</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1186,12 +1254,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d-M</dateFormatItem>
 						<dateFormatItem id="MEd">E d MMM</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">M-y</dateFormatItem>
@@ -1200,6 +1273,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMEd">E d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
 						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
 					</availableFormats>
@@ -1322,6 +1396,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>ឆ្នាំ</displayName>
+				<relative type="-1">ឆ្នាំ​មុន</relative>
+				<relative type="0">ឆ្នាំ​នេះ</relative>
+				<relative type="1">ឆ្នាំ​ក្រោយ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ក្នុង​រយៈ​ពេល {0} ឆ្នាំ</relativeTimePattern>
 				</relativeTime>
@@ -1331,6 +1408,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>ឆ្នាំ</displayName>
+				<relative type="-1">ឆ្នាំ​មុន</relative>
+				<relative type="0">ឆ្នាំ​នេះ</relative>
+				<relative type="1">ឆ្នាំ​ក្រោយ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ក្នុង​រយៈ​ពេល {0} ឆ្នាំ</relativeTimePattern>
 				</relativeTime>
@@ -1340,6 +1420,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter">
 				<displayName>ត្រីមាស</displayName>
+				<relative type="-1">ត្រីមាស​មុន</relative>
+				<relative type="0">ត្រីមាស​នេះ</relative>
+				<relative type="1">ត្រីមាស​ក្រោយ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ក្នុង​រយៈ​ពេល {0} ត្រីមាស</relativeTimePattern>
 				</relativeTime>
@@ -1349,6 +1432,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>ត្រីមាស</displayName>
+				<relative type="-1">ត្រីមាស​មុន</relative>
+				<relative type="0">ត្រីមាស​នេះ</relative>
+				<relative type="1">ត្រីមាស​ក្រោយ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ក្នុង​រយៈ​ពេល {0} ត្រីមាស</relativeTimePattern>
 				</relativeTime>
@@ -1358,6 +1444,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>ត្រីមាស</displayName>
+				<relative type="-1">ត្រីមាស​មុន</relative>
+				<relative type="0">ត្រីមាស​នេះ</relative>
+				<relative type="1">ត្រីមាស​ក្រោយ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ក្នុង​រយៈ​ពេល {0} ត្រីមាស</relativeTimePattern>
 				</relativeTime>
@@ -1379,6 +1468,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>ខែ</displayName>
+				<relative type="-1">ខែ​មុន</relative>
+				<relative type="0">ខែ​នេះ</relative>
+				<relative type="1">ខែ​ក្រោយ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ក្នុង​រយៈ​ពេល {0} ខែ</relativeTimePattern>
 				</relativeTime>
@@ -1388,6 +1480,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>ខែ</displayName>
+				<relative type="-1">ខែ​មុន</relative>
+				<relative type="0">ខែ​នេះ</relative>
+				<relative type="1">ខែ​ក្រោយ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ក្នុង​រយៈ​ពេល {0} ខែ</relativeTimePattern>
 				</relativeTime>
@@ -1409,6 +1504,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>សប្ដាហ៍</displayName>
+				<relative type="-1">សប្ដាហ៍​មុន</relative>
+				<relative type="0">សប្ដាហ៍​នេះ</relative>
+				<relative type="1">សប្ដាហ៍​ក្រោយ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ក្នុង​រយៈ​ពេល {0} សប្ដាហ៍</relativeTimePattern>
 				</relativeTime>
@@ -1418,6 +1516,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>សប្ដាហ៍</displayName>
+				<relative type="-1">សប្ដាហ៍​មុន</relative>
+				<relative type="0">សប្ដាហ៍​នេះ</relative>
+				<relative type="1">សប្ដាហ៍​ក្រោយ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ក្នុង​រយៈ​ពេល {0} សប្ដាហ៍</relativeTimePattern>
 				</relativeTime>
@@ -1441,6 +1542,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>ថ្ងៃ</displayName>
+				<relative type="-2">ម្សិល​ម៉្ងៃ</relative>
+				<relative type="-1">ម្សិលមិញ</relative>
+				<relative type="0">ថ្ងៃ​នេះ</relative>
+				<relative type="1">ថ្ងៃស្អែក</relative>
+				<relative type="2">​ខាន​ស្អែក</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ក្នុង​រយៈ​ពេល {0} ថ្ងៃ</relativeTimePattern>
 				</relativeTime>
@@ -1450,6 +1556,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>ថ្ងៃ</displayName>
+				<relative type="-2">ម្សិល​ម៉្ងៃ</relative>
+				<relative type="-1">ម្សិលមិញ</relative>
+				<relative type="0">ថ្ងៃ​នេះ</relative>
+				<relative type="1">ថ្ងៃស្អែក</relative>
+				<relative type="2">​ខាន​ស្អែក</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ក្នុងពេល {0} ថ្ងៃ</relativeTimePattern>
 				</relativeTime>
@@ -1651,16 +1762,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>តំបន់​ពេល​វេលា</displayName>
+				<displayName>ល្វែងម៉ោង</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
 			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>ម៉ោង​សកល{0}</gmtFormat>
+			<gmtFormat>ម៉ោង​សកល {0}</gmtFormat>
 			<gmtZeroFormat>ម៉ោង​សកល</gmtZeroFormat>
 			<regionFormat>ម៉ោង​នៅ​ {0}</regionFormat>
-			<regionFormat type="daylight">ម៉ោង​ពេល​ថ្ងៃ​នៅ​{0}</regionFormat>
-			<regionFormat type="standard">ម៉ោង​ស្តង់ដារ​នៅ​{0}</regionFormat>
+			<regionFormat type="daylight">ម៉ោង​ពេល​ថ្ងៃ​នៅ​ {0}</regionFormat>
+			<regionFormat type="standard">ម៉ោង​ស្តង់ដារ​នៅ ​{0}</regionFormat>
 			<fallbackFormat>{1} ({0})</fallbackFormat>
 			<zone type="Etc/Unknown">
 				<exemplarCity>ទីក្រុង​មិនស្គាល់</exemplarCity>
@@ -1696,7 +1807,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>ផាល់ម័រ</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Troll">
-				<exemplarCity>Troll</exemplarCity>
+				<exemplarCity>ត្រូល</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Syowa">
 				<exemplarCity>ស៊ីយ៉ូវ៉ា</exemplarCity>
@@ -1780,7 +1891,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>ខូរៀ</exemplarCity>
 			</zone>
 			<zone type="Australia/Melbourne">
-				<exemplarCity>ម៉ែលប៊ើន</exemplarCity>
+				<exemplarCity>ម៉េលប៊ន</exemplarCity>
 			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>ហូបាត</exemplarCity>
@@ -1789,10 +1900,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>លីនឌីម៉ែន</exemplarCity>
 			</zone>
 			<zone type="Australia/Sydney">
-				<exemplarCity>ស៊ីតនី</exemplarCity>
+				<exemplarCity>ស៊ីដនី</exemplarCity>
 			</zone>
 			<zone type="Australia/Brisbane">
-				<exemplarCity>ប្រីសបាណេ</exemplarCity>
+				<exemplarCity>ប្រីសប៊ែន</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Macquarie">
 				<exemplarCity>ម៉ាកខ្វារី</exemplarCity>
@@ -2227,7 +2338,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>ម៉ាកាសសារ</exemplarCity>
 			</zone>
 			<zone type="Asia/Jayapura">
-				<exemplarCity>យ៉ាវ៉ាភូរ៉ា</exemplarCity>
+				<exemplarCity>ចាយ៉ាភូរ៉ា</exemplarCity>
 			</zone>
 			<zone type="Europe/Dublin">
 				<long>
@@ -2251,7 +2362,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>បាកដាដ</exemplarCity>
 			</zone>
 			<zone type="Asia/Tehran">
-				<exemplarCity>តេហេរ៉ង់</exemplarCity>
+				<exemplarCity>តេអេរ៉ង់</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Reykjavik">
 				<exemplarCity>រីក្យាវីក</exemplarCity>
@@ -2389,7 +2500,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>រ៉ង់ហ្គូន</exemplarCity>
 			</zone>
 			<zone type="Asia/Hovd">
-				<exemplarCity>ហ</exemplarCity>
+				<exemplarCity>ហូវ</exemplarCity>
 			</zone>
 			<zone type="Asia/Ulaanbaatar">
 				<exemplarCity>អ៊ូឡង់បាទ័រ</exemplarCity>
@@ -2461,7 +2572,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>ខានខុន</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuala_Lumpur">
-				<exemplarCity>គូឡាឡាំពួ</exemplarCity>
+				<exemplarCity>កូឡាឡាំពួរ</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuching">
 				<exemplarCity>ឃឺតចីង</exemplarCity>
@@ -2494,7 +2605,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>អូស្លូ</exemplarCity>
 			</zone>
 			<zone type="Asia/Katmandu">
-				<exemplarCity>កដ្ឋមណ្ឌូ</exemplarCity>
+				<exemplarCity>កាត់ម៉ាន់ឌូ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Nauru">
 				<exemplarCity>ណៅរ៉ូ</exemplarCity>
@@ -2506,7 +2617,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>ចាថាំ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Auckland">
-				<exemplarCity>អាអ៊ុកឡែន</exemplarCity>
+				<exemplarCity>អកលែន</exemplarCity>
 			</zone>
 			<zone type="Asia/Muscat">
 				<exemplarCity>ម៉ាស្កាត</exemplarCity>
@@ -2529,6 +2640,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>ព័រម៉ូរេសប៊ី</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>បូហ្គែនវីល</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>ម៉ានីល</exemplarCity>
 			</zone>
@@ -2613,6 +2727,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>អ៊ីឃឺត</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>ឈីតា</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>យ៉ាកូត</exemplarCity>
 			</zone>
@@ -2631,6 +2748,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>ម៉ាហ្គាដាន</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>ស្រីតនីកូលីម</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>កាំឆាតកា</exemplarCity>
 			</zone>
@@ -3072,7 +3192,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Bhutan">
 				<long>
-					<standard>ម៉ោង​នៅ​ប៊ូតង់</standard>
+					<standard>ម៉ោងនៅប៊ូតាន</standard>
 				</long>
 			</metazone>
 			<metazone type="Bolivia">
@@ -3089,7 +3209,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Brunei">
 				<long>
-					<standard>ម៉ោង​នៅ​ដារូសាឡឹម​ប្រុយណេ</standard>
+					<standard>ម៉ោងនៅប្រ៊ុយណេដារូសាឡឹម</standard>
 				</long>
 			</metazone>
 			<metazone type="Cape_Verde">
@@ -3113,9 +3233,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Chile">
 				<long>
-					<generic>ម៉ោង​នៅ​ស៊ីលី</generic>
-					<standard>ម៉ោង​ស្តង់ដារ​នៅ​ស៊ីលី</standard>
-					<daylight>ម៉ោង​រដូវ​ក្ដៅ​នៅ​ស៊ីលី</daylight>
+					<generic>ម៉ោងនៅឈីលី</generic>
+					<standard>ម៉ោងស្តង់ដារនៅឈីលី</standard>
+					<daylight>ម៉ោងរដូវក្តៅនៅឈីលី</daylight>
 				</long>
 			</metazone>
 			<metazone type="China">
@@ -3206,7 +3326,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
 				<long>
-					<standard>ម៉ោង​នៅ​អឺរ៉ុប​ភាគ​ខាង​កើត​ឆ្ងាយ</standard>
+					<standard>ម៉ោង​នៅ​ចុងភាគ​ខាង​កើត​អឺរ៉ុប​</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
@@ -3269,16 +3389,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Greenland_Eastern">
 				<long>
-					<generic>ម៉ោង​​នៅ​ហ្គ្រោអង់ឡង់​ខាង​កើត</generic>
-					<standard>ម៉ោង​​​ស្តង់ដារ​នៅ​ហ្គ្រោអង់ឡង់​​​ខាង​កើត</standard>
-					<daylight>ម៉ោង​រដូវ​ក្ដៅ​នៅ​ហ្គ្រោអង់ឡង់​​ខាង​កើត</daylight>
+					<generic>ម៉ោង​​នៅ​ហ្គ្រីនលែន​ខាង​កើត</generic>
+					<standard>ម៉ោង​​​ស្តង់ដារ​នៅ​​ហ្គ្រីនលែន​ខាង​កើត</standard>
+					<daylight>ម៉ោង​រដូវ​ក្ដៅ​នៅ​ហ្គ្រីនលែនខាង​កើត</daylight>
 				</long>
 			</metazone>
 			<metazone type="Greenland_Western">
 				<long>
-					<generic>ម៉ោង​​នៅ​ហ្គ្រោអង់ឡង់​​ខាងលិច</generic>
-					<standard>ម៉ោង​​​ស្តង់ដារ​នៅ​ហ្គ្រោអង់ឡង់​​ខាង​លិច</standard>
-					<daylight>ម៉ោង​រដូវ​ក្ដៅ​​នៅ​ហ្គ្រោអង់ឡង់​ខាង​​លិច</daylight>
+					<generic>ម៉ោងនៅហ្គ្រីនលែនខាងលិច</generic>
+					<standard>ម៉ោងស្តង់ដារនៅហ្គ្រីនលែនខាងលិច</standard>
+					<daylight>ម៉ោងរដូវក្តៅនៅហ្គ្រីនលែនខាងលិច</daylight>
 				</long>
 			</metazone>
 			<metazone type="Gulf">
@@ -3401,7 +3521,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Kyrgystan">
 				<long>
-					<standard>ម៉ោង​នៅ​ឃឺកីស្តង់</standard>
+					<standard>ម៉ោងនៅគៀរហ្គីស្តង់</standard>
 				</long>
 			</metazone>
 			<metazone type="Line_Islands">
@@ -3500,7 +3620,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Nepal">
 				<long>
-					<standard>ម៉ោង​នៅ​ណេប៉ាល់</standard>
+					<standard>ម៉ោងនៅនេប៉ាល់</standard>
 				</long>
 			</metazone>
 			<metazone type="New_Caledonia">
@@ -3617,7 +3737,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Reunion">
 				<long>
-					<standard>ម៉ោង​នៅ​អ៊ុយនៀន</standard>
+					<standard>ម៉ោងនៅរេអ៊ុយ៉ុង</standard>
 				</long>
 			</metazone>
 			<metazone type="Rothera">
@@ -3683,7 +3803,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Tajikistan">
 				<long>
-					<standard>ម៉ោង​នៅ​តាស៊ីគីស្តង់</standard>
+					<standard>ម៉ោងនៅតាជីគីស្តង់</standard>
 				</long>
 			</metazone>
 			<metazone type="Tokelau">
@@ -3868,12 +3988,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">¤0ពាន់</pattern>
+					<pattern type="10000" count="other">¤0​មឺុន</pattern>
+					<pattern type="100000" count="other">¤0សែន</pattern>
+					<pattern type="1000000" count="other">¤0លាន</pattern>
+					<pattern type="10000000" count="other">¤0​ដប់​លាន</pattern>
+					<pattern type="100000000" count="other">¤0​រយលាន</pattern>
+					<pattern type="1000000000" count="other">¤0​កោដិ</pattern>
+					<pattern type="10000000000" count="other">¤0​ដប់​កោដិ</pattern>
+					<pattern type="100000000000" count="other">¤0​រយ​កោដិ</pattern>
+					<pattern type="1000000000000" count="other">¤0​ពាន់​កោដិ</pattern>
+					<pattern type="10000000000000" count="other">¤0​មឺុន​កោដិ</pattern>
+					<pattern type="100000000000000" count="other">¤0​សែន​កោដិ</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
-				<displayName>ឌៀរហាំ​អេមីរ៉ាតអារ៉ាប់រួម</displayName>
-				<displayName count="other">ឌៀរហាំ អេមីរ៉ាតអារ៉ាប់រួម</displayName>
+				<displayName>ឌៀរហាំ​អារ៉ាប់រួម</displayName>
+				<displayName count="other">ឌៀរហាំ​អារ៉ាប់រួម</displayName>
 				<symbol>AED</symbol>
 			</currency>
 			<currency type="AFN">
@@ -3900,10 +4036,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ក្វាន់ហ្សា​អង់ហ្គោឡា</displayName>
 				<displayName count="other">ក្វាន់ហ្សា​អង់ហ្គោឡា</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="ARS">
-				<displayName>ប៉ឺហ្សូ​អាហ្សង់ទីន</displayName>
-				<displayName count="other">ប៉ឺហ្សូ​អាហ្សង់ទីន</displayName>
+				<displayName>ប៉េសួអាហ្សង់ទីន</displayName>
+				<displayName count="other">ប៉េសូអាហ្សង់ទីន</displayName>
 				<symbol>ARS</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -3927,6 +4064,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ម៉ាក​អាច​បម្លែង​បាន​បូស្នី</displayName>
 				<displayName count="other">ម៉ាក​អាច​បម្លែង​បាន​បូស្នី</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>ដុល្លារ​បាបាដុស</displayName>
@@ -3971,6 +4109,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>បូលីវីណូ​បូលីវី</displayName>
 				<displayName count="other">បូលីវីណូ​បូលីវី</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BRL">
 				<displayName>រៀល​ប្រេស៊ីល</displayName>
@@ -3985,14 +4124,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BTN">
-				<displayName>ញូលត្រឹម​ប៊ូតង់</displayName>
-				<displayName count="other">ញូលត្រឹម​ប៊ូតង់</displayName>
+				<displayName>ញូលត្រឹម​ប៊ូតាន</displayName>
+				<displayName count="other">ញូលត្រឹម​ប៊ូតាន</displayName>
 				<symbol>BTN</symbol>
 			</currency>
 			<currency type="BWP">
 				<displayName>ពូឡា​បុតស្វាណា</displayName>
 				<displayName count="other">ពូឡា​បុតស្វាណា</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYR">
 				<displayName>រ៉ូបល​បេឡារុស</displayName>
@@ -4018,13 +4158,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>CDF</symbol>
 			</currency>
 			<currency type="CHF">
-				<displayName>ហ្វ្រង់ ស្វីស</displayName>
-				<displayName count="other">ហ្វ្រង់ ស្វីស</displayName>
+				<displayName>ហ្វ្រង់ស្វីស</displayName>
+				<displayName count="other">ហ្វ្រង់ស្វីស</displayName>
 				<symbol>CHF</symbol>
 			</currency>
 			<currency type="CLP">
-				<displayName>ប៉ឺហ្សូ​ស៊ីលី</displayName>
-				<displayName count="other">ប៉ឺហ្សូ​ស៊ីលី</displayName>
+				<displayName>ប៉េសូឈីលី</displayName>
+				<displayName count="other">ប៉េសូឈីលី</displayName>
 				<symbol>CLP</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -4035,8 +4175,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
 			<currency type="COP">
-				<displayName>ប៉ឺហ្សូ​កូឡុំប៊ី</displayName>
-				<displayName count="other">ប៉ឺហ្សូ​កូឡុំប៊ី</displayName>
+				<displayName>ប៉េសូកូឡុំប៊ី</displayName>
+				<displayName count="other">ប៉េសូកូឡុំប៊ី</displayName>
 				<symbol>COP</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -4047,13 +4187,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">₡</symbol>
 			</currency>
 			<currency type="CUC">
-				<displayName>ប៉ឺហ្សូ​អាច​បម្លែង​បាន​គុយបា</displayName>
-				<displayName count="other">ប៉ឺហ្សូ​អាច​បម្លែង​បាន​គុយបា</displayName>
+				<displayName>ប៉េសូ​គុយបាអាច​បម្លែង​បាន</displayName>
+				<displayName count="other">ប៉េសូ​គុយបាអាច​បម្លែង​បាន</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
-				<displayName>ប៉ឺហ្សូ​គុយបា</displayName>
-				<displayName count="other">ប៉ឺហ្សូ​គុយបា</displayName>
+				<displayName>ប៉េសូគុយបា</displayName>
+				<displayName count="other">ប៉េសូគុយបា</displayName>
 				<symbol>CUP</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -4066,6 +4207,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>កូរុណា​សាធារណៈ​ឆេក</displayName>
 				<displayName count="other">កូរុណា​សាធារណៈ​ឆេក</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DJF">
 				<displayName>ហ្វ្រង់​ជីប៊ូទី</displayName>
@@ -4076,10 +4218,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ក្រូណេ​ដាណាម៉ាក់</displayName>
 				<displayName count="other">ក្រូណេ​ដាណាម៉ាក់</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
-				<displayName>ប៉ឺហ្សូ​ដូមីនីក</displayName>
-				<displayName count="other">ប៉ឺហ្សូ​ដូមីនីក</displayName>
+				<displayName>ប៉េសូដូមីនីក</displayName>
+				<displayName count="other">ប៉េសូដូមីនីក</displayName>
 				<symbol>DOP</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -4089,13 +4232,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>DZD</symbol>
 			</currency>
 			<currency type="EGP">
-				<displayName>ផោន​​អេហ្សីប</displayName>
-				<displayName count="other">ផោន​​អេហ្សីប</displayName>
+				<displayName>ផោនអេហ្ស៊ីប</displayName>
+				<displayName count="other">ផោនអេហ្ស៊ីប</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
-				<displayName>ណាក់ហ្វា​អេរីត្រេ</displayName>
-				<displayName count="other">ណាក់ហ្វា​អេរីត្រេ</displayName>
+				<displayName>ណាក់ហ្វាអេរីទ្រា</displayName>
+				<displayName count="other">ណាក់ហ្វាអេរីទ្រា</displayName>
 				<symbol>ERN</symbol>
 			</currency>
 			<currency type="ETB">
@@ -4119,10 +4263,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ផោន​កោះ​ហ្វក់ឡែន</displayName>
 				<displayName count="other">ផោន​កោះ​ហ្វក់ឡែន</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GBP">
-				<displayName>ផោនស្ទែរលិញ​ចក្រភព​អង់គ្លេស</displayName>
-				<displayName count="other">ផោនស្ទែរលិញ​ចក្រភព​អង់គ្លេស</displayName>
+				<displayName>ផោនចក្រភពអង់គ្លេស</displayName>
+				<displayName count="other">ផោនចក្រភពអង់គ្លេស</displayName>
 				<symbol>£</symbol>
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
@@ -4130,6 +4275,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ឡារី​​ហ្សកហ្ស៊ី</displayName>
 				<displayName count="other">ឡារី​​ហ្សកហ្ស៊ី</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHS">
 				<displayName>ស៊ីឌី​ហ្គាណា</displayName>
@@ -4143,19 +4289,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GMD">
-				<displayName>ដាឡាស៊ី​ហ្គំប៊ី</displayName>
-				<displayName count="other">ដាឡាស៊ី​ហ្គំប៊ី</displayName>
+				<displayName>ដាឡាស៊ី​ហ្គាំប៊ី</displayName>
+				<displayName count="other">ដាឡាស៊ី​ហ្គាំប៊ី</displayName>
 				<symbol>GMD</symbol>
 			</currency>
 			<currency type="GNF">
 				<displayName>ហ្វ្រង់​ហ្គីណេ</displayName>
 				<displayName count="other">ហ្វ្រង់ ហ្គីណេ</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GTQ">
 				<displayName>ហ្គីស្សាល​ក្វាតេម៉ាឡា</displayName>
 				<displayName count="other">ហ្គីស្សាល​ក្វាតេម៉ាឡា</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GYD">
 				<displayName>ដុល្លារ​ហ្គីយ៉ាន</displayName>
@@ -4173,11 +4321,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>លិមពីរ៉ា​ហុងឌូរ៉ាស</displayName>
 				<displayName count="other">លិមពីរ៉ា​ហុងឌូរ៉ាស</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRK">
 				<displayName>គូណា​ក្រូអាត</displayName>
 				<displayName count="other">គូណា​ក្រូអាត</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>គោឌី​ហៃទី</displayName>
@@ -4188,11 +4338,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ហ្វូរីន​ហុងគ្រី</displayName>
 				<displayName count="other">ហ្វូរីន​ហុងគ្រី</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
-				<displayName>រ៉ូពីឥណ្ឌូណេស៊ី</displayName>
-				<displayName count="other">រ៉ូពីឥណ្ឌូនេស៊ី</displayName>
+				<displayName>រូពីឥណ្ឌូណេស៊ី</displayName>
+				<displayName count="other">រូពីឥណ្ឌូណេស៊ី</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="ILS">
 				<displayName>ស្ស៊ីហ្គែល​អ៊ីស្រាអែល</displayName>
@@ -4201,8 +4353,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">₪</symbol>
 			</currency>
 			<currency type="INR">
-				<displayName>រ៉ូពី​ឥណ្ឌា</displayName>
-				<displayName count="other">រ៉ូពី​ឥណ្ឌា</displayName>
+				<displayName>រូពីឥណ្ឌា</displayName>
+				<displayName count="other">រូពីឥណ្ឌា</displayName>
 				<symbol>₹</symbol>
 				<symbol alt="narrow" draft="contributed">₹</symbol>
 			</currency>
@@ -4258,15 +4410,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ហ្វ្រង់​កូម័រ</displayName>
 				<displayName count="other">ហ្វ្រង់​កូម័រ</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
-				<displayName>វូន​កូរ៉េ​ខាង​ជើង</displayName>
-				<displayName count="other">វូន​កូរ៉េ​ខាង​ជើង</displayName>
+				<displayName>វ៉ុនកូរ៉េខាងជើង</displayName>
+				<displayName count="other">វ៉ុនកូរ៉េខាងជើង</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
-				<displayName>វូន​កូរ៉េ​ខាង​ត្បូង</displayName>
-				<displayName count="other">វូន​កូរ៉េ​ខាង​ត្បូង</displayName>
+				<displayName>វ៉ុនកូរ៉េខាងត្បូង</displayName>
+				<displayName count="other">វ៉ុនកូរ៉េខាងត្បូង</displayName>
 				<symbol>₩</symbol>
 				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
@@ -4297,11 +4451,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ផោន​លីបង់</displayName>
 				<displayName count="other">ផោន​លីបង់</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
-				<displayName>រ៉ូពី​ស្រីលង្ការ</displayName>
-				<displayName count="other">រ៉ូពី​ស្រីលង្ការ</displayName>
+				<displayName>រូពីស្រីលង្កា</displayName>
+				<displayName count="other">រូពីស្រីលង្កា</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>ដុល្លារ​លីប៊ី</displayName>
@@ -4338,16 +4494,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>អារៀរី​ម៉ាឡាហ្គាស៊ី</displayName>
 				<displayName count="other">អារៀរី​ម៉ាឡាហ្គាស៊ី</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MKD">
-				<displayName>ឌីណា​ម៉ាសេដ្វាន</displayName>
-				<displayName count="other">ឌីណា​ម៉ាសេដ្វាន</displayName>
+				<displayName>ឌីណាម៉ាសេដូនី</displayName>
+				<displayName count="other">ឌីណាម៉ាសេដូនី</displayName>
 				<symbol>MKD</symbol>
 			</currency>
 			<currency type="MMK">
 				<displayName>គីយ៉ាត​ភូមា</displayName>
 				<displayName count="other">គីយ៉ាត​ភូមា</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>ទូរីក​ម៉ុងហ្គោលី</displayName>
@@ -4366,9 +4524,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>MRO</symbol>
 			</currency>
 			<currency type="MUR">
-				<displayName>រ៉ូពី​ម៉ូរីតានី</displayName>
-				<displayName count="other">រ៉ូពី​ម៉ូរីតានី</displayName>
+				<displayName>រូពីម៉ូរីតានី</displayName>
+				<displayName count="other">រូពីម៉ូរីតានី</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>រ៉ូហ្វីយ៉ា​ម៉ាល់ឌីវ</displayName>
@@ -4381,8 +4540,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>MWK</symbol>
 			</currency>
 			<currency type="MXN">
-				<displayName>ប៉ីហ្សូ​ម៉ិកស៉ិក</displayName>
-				<displayName count="other">ប៉ីហ្សូ​ម៉ិកស៉ិក</displayName>
+				<displayName>ប៉េសូម៉ិកសិក</displayName>
+				<displayName count="other">ប៉េសូម៉ិកសិក</displayName>
 				<symbol>MX$</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -4390,6 +4549,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>រីងហ្គីត​ម៉ាឡេស៊ី</displayName>
 				<displayName count="other">រីងហ្គីត​ម៉ាឡេស៊ី</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZN">
 				<displayName>មីទីខល​ម៉ូសំប៊ិក</displayName>
@@ -4412,6 +4572,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ខឌូបា​នីការ៉ាហ្គា</displayName>
 				<displayName count="other">ខឌូបា​នីការ៉ាហ្គា</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NOK">
 				<displayName>ក្រូណេ​ន័រវ៉េ</displayName>
@@ -4419,9 +4580,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>NOK</symbol>
 			</currency>
 			<currency type="NPR">
-				<displayName>រ៉ូពី​នេប៉ាល់</displayName>
-				<displayName count="other">រ៉ូពី​នេប៉ាល់</displayName>
+				<displayName>រូពីនេប៉ាល់</displayName>
+				<displayName count="other">រូពីនេប៉ាល់</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>ដុល្លារ​នូវែលសេឡង់</displayName>
@@ -4445,25 +4607,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>PEN</symbol>
 			</currency>
 			<currency type="PGK">
-				<displayName>គីណា​ប៉ាពូនូហ្គីណេ</displayName>
-				<displayName count="other">គីណា​ប៉ាពូនូហ្គីណេ</displayName>
+				<displayName>គីណាប៉ាពួញូហ្គីណេ</displayName>
+				<displayName count="other">គីណាប៉ាពួញូហ្គីណេ</displayName>
 				<symbol>PGK</symbol>
 			</currency>
 			<currency type="PHP">
-				<displayName>ប៉ឺហ្សូ​ហ្វីលីពីន</displayName>
-				<displayName count="other">ប៉ឺហ្សូ​ហ្វីលីពីន</displayName>
+				<displayName>ប៉េសូហ្វីលីពីន</displayName>
+				<displayName count="other">ប៉េសូហ្វីលីពីន</displayName>
 				<symbol>PHP</symbol>
 				<symbol alt="narrow" draft="contributed">₱</symbol>
 			</currency>
 			<currency type="PKR">
-				<displayName>រ៉ូពី​ប៉ាគីស្ថាន</displayName>
-				<displayName count="other">រ៉ូពី​ប៉ាគីស្ថាន</displayName>
+				<displayName>រូពីប៉ាគីស្ថាន</displayName>
+				<displayName count="other">រូពីប៉ាគីស្ថាន</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>ហ្សូទី​ប៉ូឡូញ</displayName>
 				<displayName count="other">ហ្សូទី​ប៉ូឡូញ</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PYG">
 				<displayName>ហ្គូរីនី​ប៉ារ៉ាហ្គាយ</displayName>
@@ -4482,19 +4646,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>RON</symbol>
 			</currency>
 			<currency type="RSD">
-				<displayName>ឌីណា​សើប</displayName>
-				<displayName count="other">ឌីណា​សើប</displayName>
+				<displayName>ឌីណាស៊ែប</displayName>
+				<displayName count="other">ឌីណាស៊ែប</displayName>
 				<symbol>RSD</symbol>
 			</currency>
 			<currency type="RUB">
 				<displayName>រ៉ូបល​រុស្ស៊ី</displayName>
 				<displayName count="other">រ៉ូបល​រុស្ស៊ី</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RWF">
 				<displayName>ហ្វ្រង់​រវ៉ាន់ដា</displayName>
 				<displayName count="other">ហ្វ្រង់​រវ៉ាន់ដា</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>រីយ៉ាល​អារ៉ាប៊ីសាអូឌីត</displayName>
@@ -4508,8 +4674,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SCR">
-				<displayName>រ៉ូពី​សីស្ហែល</displayName>
-				<displayName count="other">រ៉ូពី​សីស្ហែល</displayName>
+				<displayName>រូពី​សីស្ហែល</displayName>
+				<displayName count="other">រូពី​សីស្ហែល</displayName>
 				<symbol>SCR</symbol>
 			</currency>
 			<currency type="SDG">
@@ -4521,6 +4687,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ក្រូណា​ស៊ុយអែត</displayName>
 				<displayName count="other">ក្រូណា​ស៊ុយអែត</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>ដុល្លារ​​សិង្ហបូរី</displayName>
@@ -4532,6 +4699,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ផោន​សាំងហេឡេណា</displayName>
 				<displayName count="other">ផោន​សាំងហេឡេណា</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SLL">
 				<displayName>លីអ៊ុន​សៀរ៉ាឡេអូន</displayName>
@@ -4559,11 +4727,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ឌូប្រា​សៅតូម៉េ និងប្រាំងស៊ីប</displayName>
 				<displayName count="other">ឌូប្រា​សៅតូម៉េ និងប្រាំងស៊ីប</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SYP">
 				<displayName>ផោន​ស៊ីរី</displayName>
 				<displayName count="other">ផោន​ស៊ីរី</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>លីឡាងហ្គីនី​ស្វាស៊ីឡង់</displayName>
@@ -4574,6 +4744,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>បាត​ថៃ</displayName>
 				<displayName count="other">បាត​ថៃ</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJS">
 				<displayName>សូមុនី​តាហ្ស៊ីគីស្ថាន</displayName>
@@ -4586,20 +4757,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>TMT</symbol>
 			</currency>
 			<currency type="TND">
-				<displayName>ឌីណា​ទុយនីស៊ី</displayName>
-				<displayName count="other">ឌីណា​ទុយនីស៊ី</displayName>
+				<displayName>ឌីណាទុយនេស៊ី</displayName>
+				<displayName count="other">ឌីណាទុយនេស៊ី</displayName>
 				<symbol>TND</symbol>
 			</currency>
 			<currency type="TOP">
 				<displayName>ប៉ាអង់កា​តុងហ្គា</displayName>
 				<displayName count="other">ប៉ាអង់កា​តុងហ្គា</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TRY">
-				<displayName>លីរ៉ា​ទួគី</displayName>
-				<displayName count="other">លីរ៉ា​ទួគី</displayName>
+				<displayName>លីរ៉ាទួរគី</displayName>
+				<displayName count="other">លីរ៉ាទួរគី</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>ដុល្លារ​ទ្រីនីដាដ និងតូបាហ្គោ</displayName>
@@ -4636,8 +4809,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="UYU">
-				<displayName>ប៉ឺហ្សូអ៊ុយរូហ្គាយ</displayName>
-				<displayName count="other">ប៉ឺហ្សូអ៊ុយរូហ្គាយ</displayName>
+				<displayName>ប៉េសូអ៊ុយរូហ្គាយ</displayName>
+				<displayName count="other">ប៉េសូអ៊ុយរូហ្គាយ</displayName>
 				<symbol>UYU</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -4650,6 +4823,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ប៊ូលីវ៉ា​វ៉េណេស៊ុយអេឡា</displayName>
 				<displayName count="other">ប៊ូលីវ៉ា​វ៉េណេស៊ុយអេឡា</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>ដុង​វៀតណាម</displayName>
@@ -4658,8 +4832,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">₫</symbol>
 			</currency>
 			<currency type="VUV">
-				<displayName>វ៉ាទូ​វ៉ានូទូ</displayName>
-				<displayName count="other">វ៉ាទូ​វ៉ានូទូ</displayName>
+				<displayName>វ៉ាទូវ៉ានូអាទូ</displayName>
+				<displayName count="other">វ៉ាទូវ៉ានូអាទូ</displayName>
 				<symbol>VUV</symbol>
 			</currency>
 			<currency type="WST">
@@ -4668,18 +4842,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>WST</symbol>
 			</currency>
 			<currency type="XAF">
-				<displayName>ហ្វ្រង់ BEAC CFA</displayName>
-				<displayName count="other">ហ្វ្រង់ BEAC CFA</displayName>
+				<displayName>ហ្វ្រង់ CFA អាហ្វ្រិកកណ្តាល</displayName>
+				<displayName count="other">ហ្វ្រង់ CFA អាហ្វ្រិកកណ្តាល</displayName>
 				<symbol>FCFA</symbol>
 			</currency>
 			<currency type="XCD">
 				<displayName>ដុល្លារ​ការ៉ាប៊ីន​ខាង​កើត</displayName>
 				<displayName count="other">ដុល្លារ​ការ៉ាប៊ីន​ខាង​កើត</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XOF">
-				<displayName>ហ្វ្រង់ BCEAO CFA</displayName>
-				<displayName count="other">ហ្វ្រង់ BCEAO CFA</displayName>
+				<displayName>ហ្វ្រង់ CFA អាហ្វ្រិកខាងលិច</displayName>
+				<displayName count="other">ហ្វ្រង់ CFA អាហ្វ្រិកខាងលិច</displayName>
 				<symbol>CFA</symbol>
 			</currency>
 			<currency type="XPF">
@@ -4697,17 +4872,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>YER</symbol>
 			</currency>
 			<currency type="ZAR">
-				<displayName>រ៉ង់​អាព្រិក​ខាង​ត្បូង</displayName>
-				<displayName count="other">រ៉ង់​អាព្រិក​ខាង​ត្បូង</displayName>
+				<displayName>រ៉ង់អាហ្វ្រិកខាងត្បូង</displayName>
+				<displayName count="other">រ៉ង់អាហ្វ្រិកខាងត្បូង</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>ក្វាចា សំប៊ី (1968–2012)</displayName>
 			</currency>
 			<currency type="ZMW">
-				<displayName>ក្វាចា​សំប៊ី</displayName>
-				<displayName count="other">ក្វាចា​សំប៊ី</displayName>
+				<displayName>ក្វាចាហ្សំប៊ី</displayName>
+				<displayName count="other">ក្វាចាហ្សំប៊ី</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
@@ -4718,7 +4895,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 	<units>
 		<unitLength type="long">
 			<compoundUnit type="per">
-				<compoundUnitPattern>{0}​ក្នុង​មួយ​{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}​ ក្នុង​មួយ​ {1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>កម្លាំង​ទំនាញ</displayName>
@@ -4728,6 +4905,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ម៉ែត្រ​ក្នុង​មួយ​វិនាទី​ការ៉េ</displayName>
 				<unitPattern count="other">{0} ម៉ែត្រ​ក្នុង​មួយ​វិនាទី​ការ៉េ</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>រង្វិលជុំ</displayName>
+				<unitPattern count="other">{0} រង្វិលជុំ</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>រ៉ាដ្យង់</displayName>
+				<unitPattern count="other">{0} រ៉ាដ្យង់</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>ដឺក្រេ</displayName>
+				<unitPattern count="other">{0} ដឺក្រេ</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>arcminutes</displayName>
 				<unitPattern count="other">{0} arcminutes</unitPattern>
@@ -4736,139 +4925,151 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>arcseconds</displayName>
 				<unitPattern count="other">{0} arcseconds</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>ដឺក្រេ</displayName>
-				<unitPattern count="other">{0} ដឺក្រេ</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>រ៉ាដ្យង់</displayName>
-				<unitPattern count="other">{0} រ៉ាដ្យង់</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>អា</displayName>
-				<unitPattern count="other">{0} អា</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>គីឡូម៉ែត្រ​ការ៉េ</displayName>
+				<unitPattern count="other">{0} គីឡូម៉ែត្រ​ការ៉េ</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ហិកតា</displayName>
 				<unitPattern count="other">{0} ហិកតា</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>ម៉ែត្រ​ការ៉េ</displayName>
+				<unitPattern count="other">{0} ម៉ែត្រ​ការ៉េ</unitPattern>
+				<perUnitPattern>{0} ក្នុងមួយម៉ែត្រការ៉េ</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>សង់ទីម៉ែត្រការ៉េ</displayName>
 				<unitPattern count="other">{0} សង់ទីម៉ែត្រការ៉េ</unitPattern>
+				<perUnitPattern>{0} ក្នុងមួយសង់ទីម៉ែត្រការ៉េ</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>ម៉ាយការ៉េ</displayName>
+				<unitPattern count="other">{0} ម៉ាយការ៉េ</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>អា</displayName>
+				<unitPattern count="other">{0} អា</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>យ៉ាត​ការ៉េ</displayName>
+				<unitPattern count="other">{0} យ៉ាត​ការ៉េ</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ហ្វីត​ការ៉េ</displayName>
 				<unitPattern count="other">{0} ហ្វីត​ការ៉េ</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
-				<displayName>អ៊ិន្ឈ៍ការ៉េ</displayName>
-				<unitPattern count="other">{0} អ៊ិន្ឈ៍ការ៉េ</unitPattern>
+				<displayName>អ៊ីញការ៉េ</displayName>
+				<unitPattern count="other">{0} អ៊ីញការ៉េ</unitPattern>
+				<perUnitPattern>{0} ក្នុងមួយអ៊ីញការ៉េ</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>គីឡូម៉ែត្រ​ការ៉េ</displayName>
-				<unitPattern count="other">{0} គីឡូម៉ែត្រ​ការ៉េ</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>ម៉ែត្រ​ការ៉េ</displayName>
-				<unitPattern count="other">{0} ម៉ែត្រ​ការ៉េ</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>ម៉ាយល៍​ការ៉េ</displayName>
-				<unitPattern count="other">{0} ម៉ាយល៍​ការ៉េ</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>យ៉ាត​ការ៉េ</displayName>
-				<unitPattern count="other">{0} យ៉ាត​ការ៉េ</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>ការ៉ាត់</displayName>
+				<unitPattern count="other">{0} ការ៉ាត់</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>លីត្រ​ក្នុង​មួយ​គីឡូម៉ែត្រ</displayName>
 				<unitPattern count="other">{0} លីត្រ​ក្នុង​មួយ​គីឡូម៉ែត្រ</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>លីត្រក្នុង 100 គីឡូម៉ែត្រ</displayName>
+				<unitPattern count="other">{0} លីត្រក្នុង 100 គីឡូម៉ែត្រ</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
-				<displayName>ម៉ាយល៍​ក្នុង​មួយ​ហ្គាឡុង</displayName>
-				<unitPattern count="other">{0} ម៉ាយល៍​ក្នុង​មួយ​ហ្គាឡុង</unitPattern>
-			</unit>
-			<unit type="digital-bit">
-				<displayName>ប៊ីត</displayName>
-				<unitPattern count="other">{0} ប៊ីត</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>បៃ</displayName>
-				<unitPattern count="other">{0} បៃ</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>ជីកាប៊ីត</displayName>
-				<unitPattern count="other">{0} ជីកាប៊ីត</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>ជីកាបៃ</displayName>
-				<unitPattern count="other">{0} ជីកាបៃ</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>គីឡូប៊ីត</displayName>
-				<unitPattern count="other">{0} គីឡូប៊ីត</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>គីឡូបៃ</displayName>
-				<unitPattern count="other">{0} គីឡូបៃ</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>មេហ្គាប៊ីត</displayName>
-				<unitPattern count="other">{0} មេហ្គាប៊ីត</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>មេហ្គាបៃ</displayName>
-				<unitPattern count="other">{0} មេហ្គាបៃ</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>តេរ៉ាប៊ីត</displayName>
-				<unitPattern count="other">{0} តេរ៉ាប៊ីត</unitPattern>
+				<displayName>ម៉ាយក្នុង​មួយ​ហ្គាឡុង</displayName>
+				<unitPattern count="other">{0} ម៉ាយក្នុង​មួយ​ហ្គាឡុង</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
 				<displayName>តេរ៉ាបៃ</displayName>
 				<unitPattern count="other">{0} តេរ៉ាបៃ</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>តេរ៉ាប៊ីត</displayName>
+				<unitPattern count="other">{0} តេរ៉ាប៊ីត</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>ជីកាបៃ</displayName>
+				<unitPattern count="other">{0} ជីកាបៃ</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>ជីកាប៊ីត</displayName>
+				<unitPattern count="other">{0} ជីកាប៊ីត</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>មេហ្គាបៃ</displayName>
+				<unitPattern count="other">{0} មេហ្គាបៃ</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>មេហ្គាប៊ីត</displayName>
+				<unitPattern count="other">{0} មេហ្គាប៊ីត</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>គីឡូបៃ</displayName>
+				<unitPattern count="other">{0} គីឡូបៃ</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>គីឡូប៊ីត</displayName>
+				<unitPattern count="other">{0} គីឡូប៊ីត</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>បៃ</displayName>
+				<unitPattern count="other">{0} បៃ</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>ប៊ីត</displayName>
+				<unitPattern count="other">{0} ប៊ីត</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>សតវត្ស</displayName>
+				<unitPattern count="other">{0} សតវត្ស</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ឆ្នាំ</displayName>
+				<unitPattern count="other">{0} ឆ្នាំ</unitPattern>
+				<perUnitPattern>{0} ក្នុងមួយឆ្នាំ</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ខែ</displayName>
+				<unitPattern count="other">{0} ខែ</unitPattern>
+				<perUnitPattern>{0} ក្នុងមួយខែ</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>សប្ដាហ៍</displayName>
+				<unitPattern count="other">{0} សប្ដាហ៍</unitPattern>
+				<perUnitPattern>{0} ក្នុងមួយសប្តាហ៍</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ថ្ងៃ</displayName>
 				<unitPattern count="other">{0} ថ្ងៃ</unitPattern>
+				<perUnitPattern>{0} ក្នុងមួយថ្ងៃ</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>ម៉ោង</displayName>
 				<unitPattern count="other">{0} ម៉ោង</unitPattern>
 				<perUnitPattern>{0} ក្នុង​មួយ​ម៉ោង</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>មីក្រូ​វិនាទី</displayName>
-				<unitPattern count="other">{0} មីក្រូ​វិនាទី</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>មិល្លី​វិនាទី</displayName>
-				<unitPattern count="other">{0} មិល្លី​វិនាទី</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>នាទី</displayName>
 				<unitPattern count="other">{0} នាទី</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>ខែ</displayName>
-				<unitPattern count="other">{0} ខែ</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ណាណូវិនាទី</displayName>
-				<unitPattern count="other">{0} ណាណូវិនាទី</unitPattern>
+				<perUnitPattern>{0} ក្នុងមួយនាទី</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>វិនាទី</displayName>
 				<unitPattern count="other">{0} វិនាទី</unitPattern>
 				<perUnitPattern>{0} ក្នុង​មួយ​វិនាទី</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>សប្ដាហ៍</displayName>
-				<unitPattern count="other">{0} សប្ដាហ៍</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>មិល្លី​វិនាទី</displayName>
+				<unitPattern count="other">{0} មិល្លី​វិនាទី</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>ឆ្នាំ</displayName>
-				<unitPattern count="other">{0} ឆ្នាំ</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>មីក្រូ​វិនាទី</displayName>
+				<unitPattern count="other">{0} មីក្រូ​វិនាទី</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ណាណូវិនាទី</displayName>
+				<unitPattern count="other">{0} ណាណូវិនាទី</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>អំពែរ</displayName>
@@ -4886,6 +5087,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>វ៉ុល</displayName>
 				<unitPattern count="other">{0} វ៉ុល</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>គីឡូកាឡូរី</displayName>
+				<unitPattern count="other">{0} គីឡូកាឡូរី</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>កាឡូរី</displayName>
 				<unitPattern count="other">{0} កាឡូរី</unitPattern>
@@ -4894,17 +5099,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>កាឡូរី</displayName>
 				<unitPattern count="other">{0} កាឡូរី</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joules</displayName>
-				<unitPattern count="other">{0} joules</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>គីឡូកាឡូរី</displayName>
-				<unitPattern count="other">{0} គីឡូកាឡូរី</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
-				<displayName>kilojoules</displayName>
-				<unitPattern count="other">{0} kilojoules</unitPattern>
+				<displayName>គីឡូស៊ូល</displayName>
+				<unitPattern count="other">{0} គីឡូស៊ូល</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>ស៊ូល</displayName>
+				<unitPattern count="other">{0} ស៊ូល</unitPattern>
 			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>គីឡូវ៉ាត់​ម៉ោង</displayName>
@@ -4914,173 +5115,182 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ជីកាហឺត</displayName>
 				<unitPattern count="other">{0} ជីកាហឺត</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>ហឺត</displayName>
-				<unitPattern count="other">{0} ហឺត</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>មេហ្គា​ហឺត</displayName>
+				<unitPattern count="other">{0} មេហ្គា​ហឺត</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>គីឡូហឺត</displayName>
 				<unitPattern count="other">{0} គីឡូហឺត</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>មេហ្គា​ហឺត</displayName>
-				<unitPattern count="other">{0} មេហ្គា​ហឺត</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>ហឺត</displayName>
+				<unitPattern count="other">{0} ហឺត</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>ឯកតា astronomical</displayName>
-				<unitPattern count="other">{0} ឯកតា astronomical</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>គីឡូម៉ែត្រ</displayName>
+				<unitPattern count="other">{0} គីឡូម៉ែត្រ</unitPattern>
+				<perUnitPattern>{0} ក្នុងមួយគីឡូម៉ែត្រ</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>សង់ទីម៉ែត្រ</displayName>
-				<unitPattern count="other">{0} សង់ទីម៉ែត្រ</unitPattern>
+			<unit type="length-meter">
+				<displayName>ម៉ែត្រ</displayName>
+				<unitPattern count="other">{0} ម៉ែត្រ</unitPattern>
+				<perUnitPattern>{0} ក្នុងមួយម៉ែត្រ</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>ដេសីុម៉ែត្រ</displayName>
 				<unitPattern count="other">{0} ដេសីុម៉ែត្រ</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ហ្វីត</displayName>
-				<unitPattern count="other">{0} ហ្វីត</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>អ៊ិន្ឈ៍</displayName>
-				<unitPattern count="other">{0} អ៊ិន្ឈ៍</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>គីឡូម៉ែត្រ</displayName>
-				<unitPattern count="other">{0} គីឡូម៉ែត្រ</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ឆ្នាំ​ពន្លឺ</displayName>
-				<unitPattern count="other">{0} ឆ្នាំ​ពន្លឺ</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>ម៉ែត្រ</displayName>
-				<unitPattern count="other">{0} ម៉ែត្រ</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>មីក្រូ​ម៉ែត្រ</displayName>
-				<unitPattern count="other">{0} មីក្រូ​ម៉ែត្រ</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>ម៉ាយល៍</displayName>
-				<unitPattern count="other">{0} ម៉ាយល៍</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>សង់ទីម៉ែត្រ</displayName>
+				<unitPattern count="other">{0} សង់ទីម៉ែត្រ</unitPattern>
+				<perUnitPattern>{0} ក្នុងមួយសង់ទីម៉ែត្រ</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>មិល្លីម៉ែត្រ</displayName>
 				<unitPattern count="other">{0} មិល្លីម៉ែត្រ</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>មីក្រូ​ម៉ែត្រ</displayName>
+				<unitPattern count="other">{0} មីក្រូ​ម៉ែត្រ</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>ណាណូម៉ែត្រ</displayName>
 				<unitPattern count="other">{0} ណាណូម៉ែត្រ</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nautical miles</displayName>
-				<unitPattern count="other">{0} nautical miles</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsecs</displayName>
-				<unitPattern count="other">{0} parsecs</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>ពីកូម៉ែត្រ</displayName>
 				<unitPattern count="other">{0} ពីកូម៉ែត្រ</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>ម៉ាយ</displayName>
+				<unitPattern count="other">{0} ម៉ាយ</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>យ៉ាត</displayName>
 				<unitPattern count="other">{0} យ៉ាត</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ហ្វីត</displayName>
+				<unitPattern count="other">{0} ហ្វីត</unitPattern>
+				<perUnitPattern>{0} ក្នុងមួយហ៊្វូត</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>អ៊ីញ</displayName>
+				<unitPattern count="other">{0} អ៊ីញ</unitPattern>
+				<perUnitPattern>{0} ក្នុងមួយអ៊ីញ</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>ផាសិក</displayName>
+				<unitPattern count="other">{0} ផាសិក</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ឆ្នាំ​ពន្លឺ</displayName>
+				<unitPattern count="other">{0} ឆ្នាំ​ពន្លឺ</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ឯកតាលំហ</displayName>
+				<unitPattern count="other">{0} ឯកតាលំហ</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>ណូទិកម៉ាយ</displayName>
+				<unitPattern count="other">{0} ណូទិកម៉ាយ</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>ម៉ាយស្កង់ឌីណាវ</displayName>
+				<unitPattern count="other">{0} ម៉ាយស្កង់ឌីណាវ</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>ការ៉ាត់</displayName>
-				<unitPattern count="other">{0} ការ៉ាត់</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>ក្រាម</displayName>
-				<unitPattern count="other">{0} ក្រាម</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>គីឡូក្រាម</displayName>
-				<unitPattern count="other">{0} គីឡូក្រាម</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>រង្វាស់​តោន</displayName>
 				<unitPattern count="other">{0} រង្វាស់​តោន</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>មីក្រូក្រាម</displayName>
-				<unitPattern count="other">{0} មីក្រូក្រាម</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>គីឡូក្រាម</displayName>
+				<unitPattern count="other">{0} គីឡូក្រាម</unitPattern>
+				<perUnitPattern>{0} ក្នុងមួយគីឡូក្រាម</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>ក្រាម</displayName>
+				<unitPattern count="other">{0} ក្រាម</unitPattern>
+				<perUnitPattern>{0} ក្នុងមួយក្រាម</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>មិល្លីក្រាម</displayName>
 				<unitPattern count="other">{0} មិល្លីក្រាម</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>អោនស៍</displayName>
-				<unitPattern count="other">{0} អោនស៍</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ត្រយ​អោន</displayName>
-				<unitPattern count="other">{0} ត្រយ​អោន</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>ផោន</displayName>
-				<unitPattern count="other">{0} ផោន</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>មីក្រូក្រាម</displayName>
+				<unitPattern count="other">{0} មីក្រូក្រាម</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>តោន</displayName>
 				<unitPattern count="other">{0} តោន</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>ផោន</displayName>
+				<unitPattern count="other">{0} ផោន</unitPattern>
+				<perUnitPattern>{0} ក្នុងមួយផោន</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>អោន</displayName>
+				<unitPattern count="other">{0} អោន</unitPattern>
+				<perUnitPattern>{0} ក្នុងមួយអោន</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ត្រយ​អោន</displayName>
+				<unitPattern count="other">{0} ត្រយ​អោន</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>ការ៉ាត់</displayName>
+				<unitPattern count="other">{0} ការ៉ាត់</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>ជីកាវ៉ាត់</displayName>
 				<unitPattern count="other">{0} ជីកាវ៉ាត់</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>សេះ</displayName>
-				<unitPattern count="other">{0} សេះ</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>គីឡូវ៉ាត់</displayName>
-				<unitPattern count="other">{0} គីឡូវ៉ាត់</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>មេកាវ៉ាត់</displayName>
 				<unitPattern count="other">{0} មេកាវ៉ាត់</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>មិល្លីវ៉ាត់</displayName>
-				<unitPattern count="other">{0} មិល្លីវ៉ាត់</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>គីឡូវ៉ាត់</displayName>
+				<unitPattern count="other">{0} គីឡូវ៉ាត់</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>វ៉ាត់</displayName>
 				<unitPattern count="other">{0} វ៉ាត់</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>មិល្លីវ៉ាត់</displayName>
+				<unitPattern count="other">{0} មិល្លីវ៉ាត់</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>សេះ</displayName>
+				<unitPattern count="other">{0} សេះ</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>ហិចតូប៉ាស្កាល់</displayName>
 				<unitPattern count="other">{0} ហិចតូប៉ាស្កាល់</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>អ៊ិន្ឈ៍​នៃ​បារត</displayName>
-				<unitPattern count="other">{0} អ៊ិន្ឈ៍​នៃ​បារត</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>មិល្លីបារ</displayName>
-				<unitPattern count="other">{0} មិល្លីបារ</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>មិល្លីម៉ែត្រនៃ​បារត</displayName>
 				<unitPattern count="other">{0} មិល្លីម៉ែត្រនៃ​បារត</unitPattern>
 			</unit>
 			<unit type="pressure-pound-per-square-inch">
-				<displayName>ផោន​ក្នុង​មួយ​អ៊ិន្ឈ៍​ការ៉េ</displayName>
-				<unitPattern count="other">{0} ផោន​ក្នុង​មួយ​អ៊ិន្ឈ៍​ការ៉េ</unitPattern>
+				<displayName>ផោន​ក្នុង​មួយ​អ៊ីញ​ការ៉េ</displayName>
+				<unitPattern count="other">{0} ផោន​ក្នុង​មួយ​អ៊ីញ​ការ៉េ</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>ការ៉ាត់</displayName>
-				<unitPattern count="other">{0} ការ៉ាត់</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>អ៊ីញនៃបារត</displayName>
+				<unitPattern count="other">{0} អ៊ីញនៃបារត</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>មិល្លីបារ</displayName>
+				<unitPattern count="other">{0} មិល្លីបារ</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>គីឡូម៉ែត្រ​ក្នុង​មួយ​ម៉ោង</displayName>
@@ -5091,8 +5301,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ម៉ែត្រ​ក្នុង​មួយ​វិនាទី</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<displayName>ម៉ាយល៍​ក្នុង​មួយ​ម៉ោង</displayName>
-				<unitPattern count="other">{0} ម៉ាយល៍​ក្នុង​មួយ​ម៉ោង</unitPattern>
+				<displayName>ម៉ាយ​ក្នុង​មួយ​ម៉ោង</displayName>
+				<unitPattern count="other">{0} ម៉ាយក្នុងមួយម៉ោង</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>ណត់</displayName>
+				<unitPattern count="other">{0} ណត់</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
 				<displayName>អង្សាសេ</displayName>
@@ -5106,57 +5324,39 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>អង្សា​ខែលវិន</displayName>
 				<unitPattern count="other">{0} អង្សា​ខែលវិន</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>acre-feet</displayName>
-				<unitPattern count="other">{0} acre-feet</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>សង់ទីលីត្រ</displayName>
-				<unitPattern count="other">{0} សង់ទីលីត្រ</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>សង់ទីម៉ែត្រ​គីប</displayName>
-				<unitPattern count="other">{0} សង់ទីម៉ែត្រ​គីប</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ហ្វីត​គីប</displayName>
-				<unitPattern count="other">{0} ហ្វីត​គីប</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>អ៊ិន្ឈ៍​គីប</displayName>
-				<unitPattern count="other">{0} អ៊ិន្ឈ៍​គីប</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
-				<displayName>គីឡូម៉ែត្រ​គីប</displayName>
-				<unitPattern count="other">{0} គីឡូម៉ែត្រ​គីប</unitPattern>
+				<displayName>គីឡូម៉ែត្រ​គូប</displayName>
+				<unitPattern count="other">{0} គីឡូម៉ែត្រ​គូប</unitPattern>
 			</unit>
 			<unit type="volume-cubic-meter">
-				<displayName>ម៉ែត្រ​គីប</displayName>
-				<unitPattern count="other">{0} ម៉ែត្រ​គីប</unitPattern>
+				<displayName>ម៉ែត្រគូប</displayName>
+				<unitPattern count="other">{0} ម៉ែត្រគូប</unitPattern>
+				<perUnitPattern>{0} ក្នុងមួយម៉ែត្រគូប</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>សង់ទីម៉ែត្រគូប</displayName>
+				<unitPattern count="other">{0} សង់ទីម៉ែត្រគូប</unitPattern>
+				<perUnitPattern>{0} ក្នុងមួយសង់ទីម៉ែត្រគូប</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
-				<displayName>ម៉ាយល៍​គីប</displayName>
-				<unitPattern count="other">{0} ម៉ាយល៍​គីប</unitPattern>
+				<displayName>ម៉ាយគូប</displayName>
+				<unitPattern count="other">{0} ម៉ាយគូប</unitPattern>
 			</unit>
 			<unit type="volume-cubic-yard">
-				<displayName>យ៉ាត​គីប</displayName>
-				<unitPattern count="other">{0} យ៉ាត​គីប</unitPattern>
+				<displayName>យ៉ាតគូប</displayName>
+				<unitPattern count="other">{0} យ៉ាតគូប</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>ពែង</displayName>
-				<unitPattern count="other">{0} ពែង</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ហ្វីត​គូប</displayName>
+				<unitPattern count="other">{0} ហ្វីត​គូប</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>ដេសីុលីត្រ</displayName>
-				<unitPattern count="other">{0} ដេសីុលីត្រ</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>អ៊ីញគូប</displayName>
+				<unitPattern count="other">{0} អ៊ីញគូប</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>អោន​វត្ថុ​រាវ</displayName>
-				<unitPattern count="other">{0} អោន​វត្ថុ​រាវ</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>ហ្គាឡុង</displayName>
-				<unitPattern count="other">{0} ហ្គាឡុង</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>មេកាលីត្រ</displayName>
+				<unitPattern count="other">{0} មេកាលីត្រ</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>ហិកតូលីត្រ</displayName>
@@ -5165,23 +5365,53 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-liter">
 				<displayName>លីត្រ</displayName>
 				<unitPattern count="other">{0} លីត្រ</unitPattern>
+				<perUnitPattern>{0} ក្នុងមួយលីត្រ</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>មេកាលីត្រ</displayName>
-				<unitPattern count="other">{0} មេកាលីត្រ</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>ដេសីុលីត្រ</displayName>
+				<unitPattern count="other">{0} ដេសីុលីត្រ</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>សង់ទីលីត្រ</displayName>
+				<unitPattern count="other">{0} សង់ទីលីត្រ</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>មិល្លីលីត្រ</displayName>
 				<unitPattern count="other">{0} មិល្លីលីត្រ</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pints</displayName>
-				<unitPattern count="other">{0} pints</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>រង្វាស់ភីន</displayName>
+				<unitPattern count="other">{0} រង្វាស់ភីន</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>រង្វាស់ពែង</displayName>
+				<unitPattern count="other">{0} រង្វាស់ពែង</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>អាហ្វីត</displayName>
+				<unitPattern count="other">{0} អាហ្វីត</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>ហ្គាឡុង</displayName>
+				<unitPattern count="other">{0} ហ្គាឡុង</unitPattern>
+				<perUnitPattern>{0} ក្នុងមួយហ្គាឡុង</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>ក្វាត</displayName>
 				<unitPattern count="other">{0} ក្វាត</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>ភីន</displayName>
+				<unitPattern count="other">{0} ភីន</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>ពែង</displayName>
+				<unitPattern count="other">{0} ពែង</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>អោន​វត្ថុ​រាវ</displayName>
+				<unitPattern count="other">{0} អោន​វត្ថុ​រាវ</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>ស្លាបព្រា​បាយ</displayName>
 				<unitPattern count="other">{0} ស្លាបព្រា​បាយ</unitPattern>
@@ -5190,6 +5420,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ស្លាបព្រា​កាហ្វេ</displayName>
 				<unitPattern count="other">{0} ស្លាបព្រា​កាហ្វេ</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}កើត</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}ជើង</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}ត្បូង</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}លិច</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -5203,6 +5439,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ម៉ែត្រ​/​វិនាទី​ការ៉េ</displayName>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="other">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>រ៉ាដ្យង់</displayName>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>ដឺក្រេ</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>arcmin</displayName>
 				<unitPattern count="other">{0} arcmins</unitPattern>
@@ -5211,139 +5459,151 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>arcsecs</displayName>
 				<unitPattern count="other">{0} arcsecs</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>ដឺក្រេ</displayName>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>រ៉ាដ្យង់</displayName>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>អា</displayName>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ហិកតា</displayName>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="other">{0} cm²</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<displayName>ហ្វីត​ការ៉េ</displayName>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-inch">
-				<displayName>អ៊ិន្ឈ៍ការ៉េ</displayName>
-				<unitPattern count="other">{0} in²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>ម៉ែត្រ​ការ៉េ</displayName>
-				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
-				<displayName>ម៉ាយល៍​ការ៉េ</displayName>
+				<displayName>mi²</displayName>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<displayName>អា</displayName>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
 			<unit type="area-square-yard">
 				<displayName>yd²</displayName>
 				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
+			<unit type="area-square-foot">
+				<displayName>ft²</displayName>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>អ៊ីញការ៉េ</displayName>
+				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>ការ៉ាត់</displayName>
+				<unitPattern count="other">{0} kt</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
 				<unitPattern count="other">{0} L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
-				<displayName>ម៉ាយល៍​/​ហ្គាឡុង</displayName>
+				<displayName>ម៉ាយ​/​ហ្គាឡុង</displayName>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>ប៊ីត</displayName>
-				<unitPattern count="other">{0} ប៊ីត</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>បៃ</displayName>
-				<unitPattern count="other">{0} បៃ</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>ជីកាប៊ីត</displayName>
-				<unitPattern count="other">{0} ជីកាប៊ីត</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>ជីកាបៃ</displayName>
-				<unitPattern count="other">{0} ជីកាបៃ</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>គីឡូប៊ីត</displayName>
-				<unitPattern count="other">{0} គីឡូប៊ីត</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>គីឡូបៃ</displayName>
-				<unitPattern count="other">{0} គីឡូបៃ</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>មេហ្គាប៊ីត</displayName>
-				<unitPattern count="other">{0} មេហ្គាប៊ីត</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>មេហ្គាបៃ</displayName>
-				<unitPattern count="other">{0} មេហ្គាបៃ</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>TB</displayName>
+				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
-				<displayName>តេរ៉ាប៊ីត</displayName>
-				<unitPattern count="other">{0} តេរ៉ាប៊ីត</unitPattern>
+				<displayName>Tb</displayName>
+				<unitPattern count="other">{0} Tb</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>តេរ៉ាបៃ</displayName>
-				<unitPattern count="other">{0} តេរ៉ាបៃ</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>ស.វ</displayName>
+				<unitPattern count="other">{0} ស.វ</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ឆ្នាំ</displayName>
+				<unitPattern count="other">{0} ឆ្នាំ</unitPattern>
+				<perUnitPattern>{0}/ឆ្នាំ</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ខែ</displayName>
+				<unitPattern count="other">{0} ខែ</unitPattern>
+				<perUnitPattern>{0}/ខែ</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>សប្ដាហ៍</displayName>
+				<unitPattern count="other">{0} សប្ដាហ៍</unitPattern>
+				<perUnitPattern>{0}/សប្តាហ៍</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>ថ្ងៃ</displayName>
 				<unitPattern count="other">{0} ថ្ងៃ</unitPattern>
+				<perUnitPattern>{0}/ថ្ងៃ</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>ម៉ោង</displayName>
 				<unitPattern count="other">{0} ម៉ោង</unitPattern>
 				<perUnitPattern>{0} ក្នុង​មួយ​ម៉ោង</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>មីក្រូ​វិនាទី</displayName>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>មិល្លី​វិនាទី</displayName>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>នាទី</displayName>
 				<unitPattern count="other">{0} នាទី</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>ខែ</displayName>
-				<unitPattern count="other">{0} ខែ</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ណាណូវិនាទី</displayName>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/នាទី</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>វិនាទី</displayName>
 				<unitPattern count="other">{0} វិនាទី</unitPattern>
 				<perUnitPattern>{0} ក្នុង​មួយ​វិនាទី</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>សប្ដាហ៍</displayName>
-				<unitPattern count="other">{0} សប្ដាហ៍</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>មិល្លី​វិនាទី</displayName>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>ឆ្នាំ</displayName>
-				<unitPattern count="other">{0} ឆ្នាំ</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>មីក្រូ​វិនាទី</displayName>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ណាណូវិនាទី</displayName>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>អំពែរ</displayName>
@@ -5361,6 +5621,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>វ៉ុល</displayName>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="other">{0} cal</unitPattern>
@@ -5369,182 +5633,183 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Cal</displayName>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joules</displayName>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
-				<displayName>kilojoule</displayName>
+				<displayName>គីឡូស៊ូល</displayName>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>ស៊ូល</displayName>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
-				<displayName>គីឡូវ៉ាត់​ម៉ោង</displayName>
+				<displayName>kWh</displayName>
 				<unitPattern count="other">{0} kWh</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
 				<displayName>GHz</displayName>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>ឯកតា astronomical</displayName>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>សង់ទីម៉ែត្រ</displayName>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>ម៉ែត្រ</displayName>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ហ្វីត</displayName>
-				<unitPattern count="other">{0} ft</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
-			<unit type="length-inch">
-				<displayName>អ៊ិន្ឈ៍</displayName>
-				<unitPattern count="other">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ឆ្នាំ​ពន្លឺ</displayName>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>ម៉ែត្រ</displayName>
-				<unitPattern count="other">{0} m</unitPattern>
+			<unit type="length-millimeter">
+				<displayName>មិល្លីម៉ែត្រ</displayName>
+				<unitPattern count="other">{0} មិល្លីម៉ែត្រ</unitPattern>
 			</unit>
 			<unit type="length-micrometer">
 				<displayName>មីក្រូ​ម៉ែត្រ</displayName>
 				<unitPattern count="other">{0} µm</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName>ម៉ាយល៍</displayName>
-				<unitPattern count="other">{0} mi</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>mm</displayName>
-				<unitPattern count="other">{0} mm</unitPattern>
-			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsecs</displayName>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>ម៉ាយ</displayName>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>យ៉ាត</displayName>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ហ្វីត</displayName>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>អ៊ីញ</displayName>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>ផាសិក</displayName>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ឆ្នាំ​ពន្លឺ</displayName>
+				<unitPattern count="other">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>ការ៉ាត់</displayName>
-				<unitPattern count="other">{0} ការ៉ាត់</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>ក្រាម</displayName>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>ក្រាម</displayName>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz troy</displayName>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>ផោន</displayName>
-				<unitPattern count="other">{0} lb</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>តោន</displayName>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>ផោន</displayName>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz troy</displayName>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>ការ៉ាត់</displayName>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hp</displayName>
-				<unitPattern count="other">{0} hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>មិល្លីវ៉ាត់</displayName>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>វ៉ាត់</displayName>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
-				<displayName>ហិចតូប៉ាស្កាល់</displayName>
+				<displayName>hPa</displayName>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>មិល្លីបារ</displayName>
-				<unitPattern count="other">{0} មិល្លីបារ</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="other">{0} mm Hg</unitPattern>
@@ -5553,54 +5818,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>psi</displayName>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>ការ៉ាត់</displayName>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName>គីឡូម៉ែត្រ​/​ម៉ោង</displayName>
-				<unitPattern count="other">{0} km/h</unitPattern>
+				<displayName>km/h</displayName>
+				<unitPattern count="other">{0} kph</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
 				<displayName>ម៉ែត្រ​/​វិនាទី</displayName>
-				<unitPattern count="other">{0} ម៉ែត្រ​/​វិនាទី</unitPattern>
+				<unitPattern count="other">{0} m/s</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<displayName>ម៉ាយល៍​/​ម៉ោង</displayName>
-				<unitPattern count="other">{0} ម៉ាយល៍​​ម៉ោង</unitPattern>
+				<displayName>ម៉ាយ​/​ម៉ោង</displayName>
+				<unitPattern count="other">{0} mph</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
 				<displayName>អង្សាសេ</displayName>
 				<unitPattern count="other">{0}°C</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
-				<displayName>អង្សា​ហ្វារិនហៃ</displayName>
+				<displayName>°F</displayName>
 				<unitPattern count="other">{0}°F</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
 				<displayName>K</displayName>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>acre ft</displayName>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>សង់ទីលីត្រ</displayName>
-				<unitPattern count="other">{0} សង់ទីលីត្រ</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>សង់ទីម៉ែត្រ​គីប</displayName>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ហ្វីត​គីប</displayName>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>អ៊ិន្ឈ៍​គីប</displayName>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="other">{0} km³</unitPattern>
@@ -5608,30 +5865,32 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-cubic-meter">
 				<displayName>m³</displayName>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
 				<unitPattern count="other">{0} mi³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-yard">
-				<displayName>យ៉ាត​គីប</displayName>
+				<displayName>យ៉ាតគូប</displayName>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>ពែង</displayName>
-				<unitPattern count="other">{0} ពែង</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ហ្វីត​គូប</displayName>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>អ៊ីញគូប</displayName>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -5639,32 +5898,68 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="volume-liter">
 				<displayName>លីត្រ</displayName>
-				<unitPattern count="other">{0} l</unitPattern>
+				<unitPattern count="other">{0} L</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pints</displayName>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>អាហ្វីត</displayName>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
-				<displayName>qt</displayName>
+				<displayName>qts</displayName>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>ភីន</displayName>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>ពែង</displayName>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
-				<displayName>ស្លាបព្រា​បាយ</displayName>
+				<displayName>tbsp</displayName>
 				<unitPattern count="other">{0} tbsp</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
-				<displayName>ស្លាបព្រា​កាហ្វេ</displayName>
+				<displayName>tsp</displayName>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}កើត</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}ជើង</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}ត្បូង</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}លិច</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -5673,33 +5968,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="acceleration-g-force">
 				<unitPattern count="other">{0} ក.ទ.</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="other">{0}′</unitPattern>
 			</unit>
 			<unit type="angle-arc-second">
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="other">{0} អា</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="other">{0} គ.ម².</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="other">{0} ហ.</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="other">{0} ហ្វ².</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="other">{0} គ.ម².</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="other">{0} ម².</unitPattern>
 			</unit>
 			<unit type="area-square-mile">
 				<unitPattern count="other">{0} ម៉².</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="other">{0} អា</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="other">{0} ហ្វ².</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="other">{0}L/100km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ឆ្នាំ</displayName>
+				<unitPattern count="other">{0} ឆ្នាំ</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ខែ</displayName>
+				<unitPattern count="other">{0} ខែ</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>សប្ដាហ៍</displayName>
+				<unitPattern count="other">{0} សប្ដាហ៍</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ថ្ងៃ</displayName>
 				<unitPattern count="other">{0} ថ្ងៃ</unitPattern>
@@ -5708,53 +6019,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ម៉ោង</displayName>
 				<unitPattern count="other">{0} ម៉ោង</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>មិល្លី​វិនាទី</displayName>
-				<unitPattern count="other">{0}ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>នាទី</displayName>
 				<unitPattern count="other">{0} នាទី</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>ខែ</displayName>
-				<unitPattern count="other">{0} ខែ</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>វិនាទី</displayName>
 				<unitPattern count="other">{0} វិនាទី</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>សប្ដាហ៍</displayName>
-				<unitPattern count="other">{0} សប្ដាហ៍</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>ឆ្នាំ</displayName>
-				<unitPattern count="other">{0} ឆ្នាំ</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="other">{0}′</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="other">{0}″</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>មិល្លី​វិនាទី</displayName>
+				<unitPattern count="other">{0}ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
 				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="other">{0} ឆ្នាំ​ពន្លឺ</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>ម៉ែត្រ</displayName>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="other">{0} ម៉.</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -5763,25 +6050,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="length-picometer">
 				<unitPattern count="other">{0} ព.ម.</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="other">{0} ម៉.</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="other">{0} យ៉.</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>ក្រាម</displayName>
-				<unitPattern count="other">{0}g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="other">{0}′</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="other">{0} ឆ្នាំ​ពន្លឺ</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="other">{0}kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="other">{0} អ.</unitPattern>
+			<unit type="mass-gram">
+				<displayName>ក្រាម</displayName>
+				<unitPattern count="other">{0}g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="other">{0}#</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="other">{0} សេះ</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="other">{0} អ.</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="other">{0} គ.វ.</unitPattern>
@@ -5789,6 +6085,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="power-watt">
 				<unitPattern count="other">{0} វ.</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="other">{0} សេះ</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
@@ -5799,7 +6098,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ម.ប.</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName>គីឡូម៉ែត្រ​/​ម៉ោង</displayName>
+				<displayName>km/h</displayName>
 				<unitPattern count="other">{0} kph</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
@@ -5823,8 +6122,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="volume-liter">
 				<displayName>លីត្រ</displayName>
-				<unitPattern count="other">{0}l</unitPattern>
+				<unitPattern count="other">{0}L</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}កើត</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}ជើង</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}ត្បូង</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}លិច</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
@@ -5840,14 +6145,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<listPattern>
 			<listPatternPart type="start">{0}, {1}</listPatternPart>
 			<listPatternPart type="middle">{0}, {1}</listPatternPart>
-			<listPatternPart type="end">{0} {1}</listPatternPart>
+			<listPatternPart type="end">{0} និង {1}</listPatternPart>
 			<listPatternPart type="2">{0} និង​{1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit">
 			<listPatternPart type="start">{0} {1}</listPatternPart>
 			<listPatternPart type="middle">{0} {1}</listPatternPart>
-			<listPatternPart type="end">{0} និង {1}</listPatternPart>
-			<listPatternPart type="2">{0} និង {1}</listPatternPart>
+			<listPatternPart type="end">{0} {1}</listPatternPart>
+			<listPatternPart type="2">{0} {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-narrow">
 			<listPatternPart type="start">{0} {1}</listPatternPart>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/km_KH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/km_KH.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/km_KH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/km_KH.xml
index 1c63c9d7c20..de1f93c3955 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/km_KH.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/km_KH.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="km"/>
 		<territory type="KH"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kn.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kn.xml
index 4221dec03d1..35ae3147631 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kn.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kn.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11351 $"/>
-		<generation date="$Date: 2015-03-06 12:59:09 -0600 (Fri, 06 Mar 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="kn"/>
 	</identity>
 	<localeDisplayNames>
@@ -59,6 +58,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bem">ಬೆಂಬಾ</language>
 			<language type="bez">ಬೆನ</language>
 			<language type="bg">ಬಲ್ಗೇರಿಯನ್</language>
+			<language type="bgn">ಪಶ್ಚಿಮ ಬಲೊಚಿ</language>
 			<language type="bho">ಭೋಜಪುರಿ</language>
 			<language type="bi">ಬಿಸ್ಲಾಮಾ</language>
 			<language type="bik">ಬಿಕೊಲ್</language>
@@ -276,6 +276,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">ಲಾವೋ</language>
 			<language type="lol">ಮೊಂಗೋ</language>
 			<language type="loz">ಲೋಝಿ</language>
+			<language type="lrc" draft="provisional">lrc</language>
 			<language type="lt">ಲಿಥುವೇನಿಯನ್</language>
 			<language type="lu">ಲೂಬಾ-ಕಟಾಂಗಾ</language>
 			<language type="lua">ಲುಬ-ಲುಲಾ</language>
@@ -321,6 +322,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mwr">ಮಾರ್ವಾಡಿ</language>
 			<language type="my">ಬರ್ಮೀಸ್</language>
 			<language type="myv">ಎರ್‌ಝ್ಯಾ</language>
+			<language type="mzn" draft="provisional">mzn</language>
 			<language type="na">ನೌರು</language>
 			<language type="nap">ನಿಯಾಪೊಲಿಟನ್</language>
 			<language type="naq">ನಮ</language>
@@ -402,6 +404,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">ಸಿಸಿಲಿಯನ್</language>
 			<language type="sco">ಸ್ಕೋಟ್ಸ್</language>
 			<language type="sd">ಸಿಂಧಿ</language>
+			<language type="sdh">ದಕ್ಷಿಣ ಕುರ್ದಿಶ್</language>
 			<language type="se">ಉತ್ತರ ಸಾಮಿ</language>
 			<language type="seh">ಸೆನ</language>
 			<language type="sel">ಸೆಲ್ಕಪ್</language>
@@ -436,8 +439,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">ಸುಮೇರಿಯನ್</language>
 			<language type="sv">ಸ್ವೀಡಿಷ್</language>
 			<language type="sw">ಸ್ವಹಿಲಿ</language>
+			<language type="sw_CD">ಕಾಂಗೊ ಸ್ವಹಿಲಿ</language>
 			<language type="swb" draft="unconfirmed">ಕೊಮೊರಿಯನ್</language>
-			<language type="swc">ಕಾಂಗೊ ಸ್ವಹಿಲಿ</language>
 			<language type="syc">ಶಾಸ್ತ್ರೀಯ ಸಿರಿಯಕ್</language>
 			<language type="syr">ಸಿರಿಯಕ್</language>
 			<language type="ta">ತಮಿಳು</language>
@@ -491,6 +494,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">ವಲಾಮೋ</language>
 			<language type="war">ವರಾಯ್</language>
 			<language type="was">ವಾಷೋ</language>
+			<language type="wbp">ವಾರ್ಲ್‌ಪಿರಿ</language>
 			<language type="wo">ವೋಲೋಫ್</language>
 			<language type="xal">ಕಲ್‌ಮೈಕ್</language>
 			<language type="xh">ಕ್ಸೋಸ</language>
@@ -687,7 +691,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">ಆಂಗುಯಿಲ್ಲಾ</territory>
 			<territory type="AL">ಅಲ್ಬೇನಿಯಾ</territory>
 			<territory type="AM">ಅರ್ಮೇನಿಯಾ</territory>
-			<territory type="AN">ನೆದರ್‌ಲ್ಯಾಂಡ್</territory>
 			<territory type="AO">ಅಂಗೋಲಾ</territory>
 			<territory type="AQ">ಅಂಟಾರ್ಟಿಕಾ</territory>
 			<territory type="AR">ಅರ್ಜೆಂಟಿನಾ</territory>
@@ -784,7 +787,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GU">ಗುಯಾಮ್</territory>
 			<territory type="GW">ಗಿನಿ-ಬಿಸ್ಸಾವ್</territory>
 			<territory type="GY">ಗಯಾನಾ</territory>
-			<territory type="HK">ಹಾಂಕ್‌ ಕಾಂಗ್ SAR ಚೈನಾ</territory>
+			<territory type="HK">ಹಾಂಗ್ ಕಾಂಗ್ SAR ಚೈನಾ</territory>
 			<territory type="HK" alt="short">ಹಾಂಗ್ ಕಾಂಗ್</territory>
 			<territory type="HM">ಹರ್ಡ್ ದ್ವೀಪ ಮತ್ತು ಮ್ಯಾಕ್‍ಡೊನಾಲ್ಡ್ ದ್ವೀಪಗಳು</territory>
 			<territory type="HN">ಹೊಂಡುರಾಸ್</territory>
@@ -967,6 +970,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric">ಸಂಖ್ಯೆ ವಿಂಗಡಣೆ</key>
 			<key type="colStrength">ವಿಂಗಡಣೆ ಸಾಮರ್ಥ್ಯ</key>
 			<key type="currency">ಕರೆನ್ಸಿ</key>
+			<key type="hc">ಗಂಟೆ ಚಕ್ರ (12 ವಿರುದ್ಧ 24)</key>
+			<key type="lb">ಲೈನ್ ಬ್ರೇಕ್ ಶೈಲಿ</key>
+			<key type="ms">ಮಾಪನ ವ್ಯವಸ್ಥೆ</key>
 			<key type="numbers">ಸಂಖ್ಯೆಗಳು</key>
 			<key type="timezone">ಸಮಯ ವಲಯ</key>
 			<key type="va">ಸ್ಥಳೀಯ ಭಿನ್ನತೆ</key>
@@ -974,95 +980,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">ಖಾಸಗಿ ಬಳಕೆ</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">ಅರೇಬಿಕ್-ಇಂಡಿಕ್ ಅಂಕೆಗಳು</type>
-			<type type="arabext" key="numbers">ವಿಸ್ತರಿಸಲಾದ ಅರೇಬಿಕ್-ಇಂಡಿಕ್ ಅಂಕೆಗಳು</type>
-			<type type="armn" key="numbers">ಆರ್ಮೇನಿಯಾದ ಸಂಖ್ಯೆಗಳು</type>
-			<type type="armnlow" key="numbers">ಅರ್ಮೇನಿಯಾದ ಸಣ್ಣಕ್ಷರ ಸಂಖ್ಯೆಗಳು</type>
-			<type type="beng" key="numbers">ಬಂಗಾಳಿ ಅಂಕೆಗಳು</type>
-			<type type="big5han" key="collation">ಸಾಂಪ್ರದಾಯಿಕ ಚೀನಾದ ಅನುಕ್ರಮ ವಿನ್ಯಾಸ - ದೊಡ್ಡ ಐದು</type>
-			<type type="buddhist" key="calendar">ಬೌದ್ಧರ ಕ್ಯಾಲೆಂಡರ್</type>
-			<type type="chinese" key="calendar">ಚೈನೀಸ್ ಕ್ಯಾಲೆಂಡರ್</type>
-			<type type="coptic" key="calendar">ಕೋಪ್ಟಿಕ್ ಕ್ಯಾಲೆಂಡರ್</type>
-			<type type="dangi" key="calendar">ಡಾಂಗಿ ಕ್ಯಾಲೆಂಡರ್</type>
-			<type type="deva" key="numbers">ದೇವನಾಗರಿ ಅಂಕೆಗಳು</type>
-			<type type="dictionary" key="collation">ಡಿಕ್ಷನರಿ ಅನುಕ್ರಮ ವಿನ್ಯಾಸ</type>
-			<type type="ducet" key="collation">ಡೀಫಾಲ್ಟ್ ಯೂನಿಕೋಡ್ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
-			<type type="ethi" key="numbers">ಇಥಿಯೋಪಿಯಾದ ಸಂಖ್ಯೆಗಳು</type>
-			<type type="ethiopic" key="calendar">ಇಥಿಯೋಪಿಕ್ ಕ್ಯಾಲೆಂಡರ್</type>
-			<type type="ethiopic-amete-alem" key="calendar">ಇಥಿಯೋಪಿಕ್ ಅಮೆಟೆ ಅಲೆಮ್ ಕ್ಯಾಲೆಂಡರ್</type>
-			<type type="finance" key="numbers">ಆರ್ಥಿಕ ಸಂಖ್ಯೆಗಳು</type>
-			<type type="fullwide" key="numbers">ಪೂರ್ಣ ಅಗಲವಾದ ಸಂಖ್ಯೆಗಳು</type>
-			<type type="gb2312han" key="collation">ಸರಳೀಕೃತ ಚೈನೀಸ್ ವಿಂಗಡಣೆ ಕ್ರಮ - GB2312</type>
-			<type type="geor" key="numbers">ಜಾರ್ಜಿಯಾದ ಸಂಖ್ಯೆಗಳು</type>
-			<type type="gregorian" key="calendar">ಗ್ರೆಗೋರಿಯನ್ ಕ್ಯಾಲೆಂಡರ್</type>
-			<type type="grek" key="numbers">ಗ್ರೀಕ್ ಸಂಖ್ಯೆಗಳು</type>
-			<type type="greklow" key="numbers">ಗ್ರೀಕ್ ಲೋವರ್‌ಕೇಸ್ ಸಂಖ್ಯೆಗಳು</type>
-			<type type="gujr" key="numbers">ಗುಜರಾತಿ ಅಂಕೆಗಳು</type>
-			<type type="guru" key="numbers">ಗುರ್ಮುಖಿ ಅಂಕೆಗಳು</type>
-			<type type="hanidec" key="numbers">ಚೀನಾದ ದಶಮಾಂಶ ಸಂಖ್ಯೆಗಳು</type>
-			<type type="hans" key="numbers">ಸರಳೀಕೃತ ಚೀನಾದ ಸಂಖ್ಯೆಗಳು</type>
-			<type type="hansfin" key="numbers">ಸರಳೀಕೃತ ಚೀನಾದ ಆರ್ಥಿಕ ಸಂಖ್ಯೆಗಳು</type>
-			<type type="hant" key="numbers">ಸಾಂಪ್ರದಾಯಿಕ ಚೀನಾ ಸಂಖ್ಯೆಗಳು</type>
-			<type type="hantfin" key="numbers">ಸಾಂಪ್ರದಾಯಿಕ ಚೀನಾದ ಆರ್ಥಿಕ ಸಂಖ್ಯೆಗಳು</type>
-			<type type="hebr" key="numbers">ಹೀಬ್ರೂ ಸಂಖ್ಯೆಗಳು</type>
-			<type type="hebrew" key="calendar">ಹೀಬ್ರೂ ಕ್ಯಾಲೆಂಡರ್</type>
-			<type type="identical" key="colStrength">ಎಲ್ಲವನ್ನೂ ವಿಂಗಡಿಸಿ</type>
-			<type type="indian" key="calendar">ಭಾರತೀಯ ರಾಷ್ಟ್ರೀಯ ಕ್ಯಾಲೆಂಡರ್</type>
-			<type type="islamic" key="calendar">ಇಸ್ಲಾಮಿಕ್ ಕ್ಯಾಲೆಂಡರ್</type>
-			<type type="islamic-civil" key="calendar">ಇಸ್ಲಾಮಿಕ್-ಸಿವಿಲ್ ಕ್ಯಾಲೆಂಡರ್</type>
-			<type type="iso8601" key="calendar">ISO-8601 ಕ್ಯಾಲೆಂಡರ್</type>
-			<type type="japanese" key="calendar">ಜಪಾನೀಸ್ ಕ್ಯಾಲೆಂಡರ್</type>
-			<type type="jpan" key="numbers">ಜಪಾನೀ ಸಂಖ್ಯೆಗಳು</type>
-			<type type="jpanfin" key="numbers">ಜಪಾನೀ ಆರ್ಥಿಕ ಸಂಖ್ಯೆಗಳು</type>
-			<type type="khmr" key="numbers">ಖಮೆ ಅಂಕೆಗಳು</type>
-			<type type="knda" key="numbers">ಕನ್ನಡ ಅಂಕೆಗಳು</type>
-			<type type="laoo" key="numbers">ಲಾವೋ ಅಂಕೆಗಳು</type>
-			<type type="latn" key="numbers">ಪಾಶ್ಚಿಮಾತ್ಯ ಅಂಕೆಗಳು</type>
-			<type type="lower" key="colCaseFirst">ಮೊದಲು ಲೋವರ್‌ಕೇಸ್ ಅನ್ನು ವಿಂಗಡಿಸಿ</type>
-			<type type="mlym" key="numbers">ಮಲಯಾಳಂನ ಅಂಕೆಗಳು</type>
-			<type type="mong" key="numbers">ಮಂಗೋಲಿಯಾದ ಅಂಕೆಗಳು</type>
-			<type type="mymr" key="numbers">ಮ್ಯಾನ್ಮಾರ್ ಅಂಕೆಗಳು</type>
-			<type type="native" key="numbers">ಸ್ಥಳೀಯ ಅಂಕೆಗಳು</type>
-			<type type="no" key="colBackwards">ಉಚ್ಛಾರಣೆಯನ್ನು ಸಾಮಾನ್ಯವಾಗಿ ವಿಂಗಡಿಸಿ</type>
-			<type type="no" key="colCaseFirst">ಸಾಮಾನ್ಯ ಕೇಸ್ ಕ್ರಮವನ್ನು ವಿಂಗಡಿಸಿ</type>
-			<type type="no" key="colCaseLevel">ಕೇಸ್ ಇನ್‌ಸೆಂಟೀವ್ ಅನ್ನು ವಿಂಗಡಿಸಿ</type>
-			<type type="no" key="colHiraganaQuaternary">ಕಾನಾ ಅನ್ನು ಬೇರೆಯಾಗಿ ವಿಂಗಡಿಸಿ</type>
-			<type type="no" key="colNormalization">ಸಾಮಾನ್ಯ ಸ್ಥಿತಿಯನ್ನು ಹೊರತುಪಡಿಸಿ ವಿಂಗಡಿಸಿ</type>
-			<type type="no" key="colNumeric">ಅಂಕೆಗಳನ್ನು ಪ್ರತ್ಯೇಕವಾಗಿ ವಿಂಗಡಿಸಿ</type>
-			<type type="non-ignorable" key="colAlternate">ಚಿಹ್ನೆಗಳನ್ನು ವಿಂಗಡಿಸಿ</type>
-			<type type="orya" key="numbers">ಒರಿಯಾ ಅಂಕೆಗಳು</type>
-			<type type="persian" key="calendar">ಪರ್ಷಿಯನ್ ಕ್ಯಾಲೆಂಡರ್</type>
-			<type type="phonebook" key="collation">ಫೋನ್‌ಬುಕ್ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
-			<type type="phonetic" key="collation">ಉಚ್ಛಾರಣಾನುರೂಪವಾಗಿ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
-			<type type="pinyin" key="collation">ಪಿನ್‌ಯಿನ್ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
-			<type type="primary" key="colStrength">ವಿಂಗಡಣೆ ಆಧರಿಸಿದ ಅಕ್ಷರಗಳನ್ನು ಮಾತ್ರ</type>
-			<type type="quaternary" key="colStrength">ಉಚ್ಛಾರಣೆ/ಕೇಸ್/ಅಳತೆ/ಕಾನಾ ವಿಂಗಡಿಸಿ</type>
-			<type type="reformed" key="collation">ಪರಿಷ್ಕೃತ ಅನುಕ್ರಮ ವಿನ್ಯಾಸ</type>
-			<type type="roc" key="calendar">ಮಿಂಗೋ ಕ್ಯಾಲೆಂಡರ್</type>
-			<type type="roman" key="numbers">ರೋಮನ್ ಸಂಖ್ಯೆಗಳು</type>
-			<type type="romanlow" key="numbers">ರೋಮನ್ ಲೋವರ್‌ಕೇಸ್ ಸಂಖ್ಯೆಗಳು</type>
-			<type type="search" key="collation">ಸಾಮಾನ್ಯ- ಉದ್ದೇಶ ಹುಡುಕಾಟ</type>
-			<type type="searchjl" key="collation">ಹಂಗುಲ್ ಆದ್ಯಕ್ಷರ ವ್ಯಂಜನದ ಮೂಲಕ ಹುಡುಕಿ</type>
-			<type type="secondary" key="colStrength">ಉಚ್ಛಾರಣೆಗಳನ್ನು ವಿಂಗಡಿಸಿ</type>
-			<type type="shifted" key="colAlternate">ನಿರ್ಲಕ್ಷಿಸಿದ ಚಿಹ್ನೆಗಳನ್ನು ವಿಂಗಡಿಸಿ</type>
-			<type type="standard" key="collation">ಪ್ರಮಾಣೀಕೃತ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
-			<type type="stroke" key="collation">ಸ್ಟ್ರೋಕ್ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
-			<type type="taml" key="numbers">ಸಾಂಪ್ರದಾಯಿಕ ತಮಿಳು ಸಂಖ್ಯೆಗಳು</type>
-			<type type="tamldec" key="numbers">ತಮಿಳು ಅಂಕೆಗಳು</type>
-			<type type="telu" key="numbers">ತೆಲುಗು ಅಂಕೆಗಳು</type>
-			<type type="tertiary" key="colStrength">ಉಚ್ಛಾರಣೆ/ಕೇಸ್/ಅಳತೆ ವಿಂಗಡಿಸಿ</type>
-			<type type="thai" key="numbers">ಥಾಯ್ ಅಂಕೆಗಳು</type>
-			<type type="tibt" key="numbers">ಟಿಬೇಟಿಯನ್ ಅಂಕೆಗಳು</type>
-			<type type="traditional" key="collation">ಸಾಂಪ್ರದಾಯಿಕ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
-			<type type="traditional" key="numbers">ಸಾಂಪ್ರದಾಯಿಕ ಸಂಖ್ಯೆಗಳು</type>
-			<type type="unihan" key="collation">ರ್ಯಾಡಿಕಲ್-ಸ್ಟ್ರೋಕ್ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
-			<type type="upper" key="colCaseFirst">ಮೊದಲು ಅಪ್ಪರ್‌ಕೇಸ್ ಅನ್ನು ವಿಂಗಡಿಸಿ</type>
-			<type type="vaii" key="numbers">ವಾಯ್ ಅಂಕೆಗಳು</type>
-			<type type="yes" key="colBackwards">ತಿರುಗು ಮುರುಗಾದ ಉಚ್ಛಾರಣೆಗಳನ್ನು ವಿಂಗಡಿಸಿ</type>
-			<type type="yes" key="colCaseLevel">ಕೇಸ್‌ ಸೆನ್ಸಿಟೀವ್‌‌ ವಿಂಗಡಿಸಿ</type>
-			<type type="yes" key="colHiraganaQuaternary">ಕಾನಾ ಅನ್ನು ಬೇರೆಯಾಗಿ ವಿಂಗಡಿಸಿ</type>
-			<type type="yes" key="colNormalization">ಸಾಮಾನ್ಯವಾದ ಯೂನಿಕೋಡ್ ಅನ್ನು ವಿಂಗಡಿಸಿ</type>
-			<type type="yes" key="colNumeric">ಅಂಕೆಗಳನ್ನು ಸಂಖ್ಯಾತ್ಮಕವಾಗಿ ವಿಂಗಡಿಸಿ</type>
+			<type key="calendar" type="buddhist">ಬೌದ್ಧರ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="chinese">ಚೈನೀಸ್ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="coptic">ಕೋಪ್ಟಿಕ್ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="dangi">ಡಾಂಗಿ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="ethiopic">ಇಥಿಯೋಪಿಕ್ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="ethiopic-amete-alem">ಇಥಿಯೋಪಿಕ್ ಅಮೆಟೆ ಅಲೆಮ್ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="gregorian">ಗ್ರೆಗೋರಿಯನ್ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="hebrew">ಹೀಬ್ರೂ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="indian">ಭಾರತೀಯ ರಾಷ್ಟ್ರೀಯ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="islamic">ಇಸ್ಲಾಮಿಕ್ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="islamic-civil">ಇಸ್ಲಾಮಿಕ್-ಸಿವಿಲ್ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="iso8601">ISO-8601 ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="japanese">ಜಪಾನೀಸ್ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="persian">ಪರ್ಷಿಯನ್ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="roc">ಮಿಂಗೋ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="colAlternate" type="non-ignorable">ಚಿಹ್ನೆಗಳನ್ನು ವಿಂಗಡಿಸಿ</type>
+			<type key="colAlternate" type="shifted">ನಿರ್ಲಕ್ಷಿಸಿದ ಚಿಹ್ನೆಗಳನ್ನು ವಿಂಗಡಿಸಿ</type>
+			<type key="colBackwards" type="no">ಉಚ್ಛಾರಣೆಯನ್ನು ಸಾಮಾನ್ಯವಾಗಿ ವಿಂಗಡಿಸಿ</type>
+			<type key="colBackwards" type="yes">ತಿರುಗು ಮುರುಗಾದ ಉಚ್ಛಾರಣೆಗಳನ್ನು ವಿಂಗಡಿಸಿ</type>
+			<type key="colCaseFirst" type="lower">ಮೊದಲು ಲೋವರ್‌ಕೇಸ್ ಅನ್ನು ವಿಂಗಡಿಸಿ</type>
+			<type key="colCaseFirst" type="no">ಸಾಮಾನ್ಯ ಕೇಸ್ ಕ್ರಮವನ್ನು ವಿಂಗಡಿಸಿ</type>
+			<type key="colCaseFirst" type="upper">ಮೊದಲು ಅಪ್ಪರ್‌ಕೇಸ್ ಅನ್ನು ವಿಂಗಡಿಸಿ</type>
+			<type key="colCaseLevel" type="no">ಕೇಸ್ ಇನ್‌ಸೆಂಟೀವ್ ಅನ್ನು ವಿಂಗಡಿಸಿ</type>
+			<type key="colCaseLevel" type="yes">ಕೇಸ್‌ ಸೆನ್ಸಿಟೀವ್‌‌ ವಿಂಗಡಿಸಿ</type>
+			<type key="colHiraganaQuaternary" type="no">ಕಾನಾ ಅನ್ನು ಬೇರೆಯಾಗಿ ವಿಂಗಡಿಸಿ</type>
+			<type key="colHiraganaQuaternary" type="yes">ಕಾನಾ ಅನ್ನು ಬೇರೆಯಾಗಿ ವಿಂಗಡಿಸಿ</type>
+			<type key="collation" type="big5han">ಸಾಂಪ್ರದಾಯಿಕ ಚೀನಾದ ಅನುಕ್ರಮ ವಿನ್ಯಾಸ - ದೊಡ್ಡ ಐದು</type>
+			<type key="collation" type="dictionary">ಡಿಕ್ಷನರಿ ಅನುಕ್ರಮ ವಿನ್ಯಾಸ</type>
+			<type key="collation" type="ducet">ಡೀಫಾಲ್ಟ್ ಯೂನಿಕೋಡ್ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
+			<type key="collation" type="gb2312han">ಸರಳೀಕೃತ ಚೈನೀಸ್ ವಿಂಗಡಣೆ ಕ್ರಮ - GB2312</type>
+			<type key="collation" type="phonebook">ಫೋನ್‌ಬುಕ್ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
+			<type key="collation" type="phonetic">ಉಚ್ಛಾರಣಾನುರೂಪವಾಗಿ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
+			<type key="collation" type="pinyin">ಪಿನ್‌ಯಿನ್ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
+			<type key="collation" type="reformed">ಪರಿಷ್ಕೃತ ಅನುಕ್ರಮ ವಿನ್ಯಾಸ</type>
+			<type key="collation" type="search">ಸಾಮಾನ್ಯ- ಉದ್ದೇಶ ಹುಡುಕಾಟ</type>
+			<type key="collation" type="searchjl">ಹಂಗುಲ್ ಆದ್ಯಕ್ಷರ ವ್ಯಂಜನದ ಮೂಲಕ ಹುಡುಕಿ</type>
+			<type key="collation" type="standard">ಪ್ರಮಾಣೀಕೃತ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
+			<type key="collation" type="stroke">ಸ್ಟ್ರೋಕ್ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
+			<type key="collation" type="traditional">ಸಾಂಪ್ರದಾಯಿಕ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
+			<type key="collation" type="unihan">ರ್ಯಾಡಿಕಲ್-ಸ್ಟ್ರೋಕ್ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
+			<type key="colNormalization" type="no">ಸಾಮಾನ್ಯ ಸ್ಥಿತಿಯನ್ನು ಹೊರತುಪಡಿಸಿ ವಿಂಗಡಿಸಿ</type>
+			<type key="colNormalization" type="yes">ಸಾಮಾನ್ಯವಾದ ಯೂನಿಕೋಡ್ ಅನ್ನು ವಿಂಗಡಿಸಿ</type>
+			<type key="colNumeric" type="no">ಅಂಕೆಗಳನ್ನು ಪ್ರತ್ಯೇಕವಾಗಿ ವಿಂಗಡಿಸಿ</type>
+			<type key="colNumeric" type="yes">ಅಂಕೆಗಳನ್ನು ಸಂಖ್ಯಾತ್ಮಕವಾಗಿ ವಿಂಗಡಿಸಿ</type>
+			<type key="colStrength" type="identical">ಎಲ್ಲವನ್ನೂ ವಿಂಗಡಿಸಿ</type>
+			<type key="colStrength" type="primary">ವಿಂಗಡಣೆ ಆಧರಿಸಿದ ಅಕ್ಷರಗಳನ್ನು ಮಾತ್ರ</type>
+			<type key="colStrength" type="quaternary">ಉಚ್ಛಾರಣೆ/ಕೇಸ್/ಅಳತೆ/ಕಾನಾ ವಿಂಗಡಿಸಿ</type>
+			<type key="colStrength" type="secondary">ಉಚ್ಛಾರಣೆಗಳನ್ನು ವಿಂಗಡಿಸಿ</type>
+			<type key="colStrength" type="tertiary">ಉಚ್ಛಾರಣೆ/ಕೇಸ್/ಅಳತೆ ವಿಂಗಡಿಸಿ</type>
+			<type key="hc" type="h11">12 ಗಂಟೆ ವ್ಯವಸ್ಥೆ (0–11)</type>
+			<type key="hc" type="h12">24 ಗಂಟೆ ವ್ಯವಸ್ಥೆ (0–23)</type>
+			<type key="hc" type="h23">24 ಗಂಟೆ ವ್ಯವಸ್ಥೆ (0–23)</type>
+			<type key="hc" type="h24">24 ಗಂಟೆ ವ್ಯವಸ್ಥೆ (1–24)</type>
+			<type key="lb" type="loose">ಲೂಸ್ ಲೈನ್ ಬ್ರೇಕ್ ಶೈಲಿ</type>
+			<type key="lb" type="normal">ಸಾಮಾನ್ಯ ಲೈನ್ ಬ್ರೇಕ್ ಶೈಲಿ</type>
+			<type key="lb" type="strict">ಕಡ್ಡಾಯ ಲೈನ್ ಬ್ರೇಕ್ ಶೈಲಿ</type>
+			<type key="ms" type="metric">ಮೆಟ್ರಿಕ್ ವ್ಯವಸ್ಥೆ</type>
+			<type key="ms" type="uksystem">ಇಂಪಿರಿಯಲ್ ಮಾಪನ ವ್ಯವಸ್ಥೆ</type>
+			<type key="ms" type="ussystem">ಯುಎಸ್ ಮಾಪನ ವ್ಯವಸ್ಥೆ</type>
+			<type key="numbers" type="arab">ಅರೇಬಿಕ್-ಇಂಡಿಕ್ ಅಂಕೆಗಳು</type>
+			<type key="numbers" type="arabext">ವಿಸ್ತರಿಸಲಾದ ಅರೇಬಿಕ್-ಇಂಡಿಕ್ ಅಂಕೆಗಳು</type>
+			<type key="numbers" type="armn">ಆರ್ಮೇನಿಯಾದ ಸಂಖ್ಯೆಗಳು</type>
+			<type key="numbers" type="armnlow">ಅರ್ಮೇನಿಯಾದ ಸಣ್ಣಕ್ಷರ ಸಂಖ್ಯೆಗಳು</type>
+			<type key="numbers" type="beng">ಬಂಗಾಳಿ ಅಂಕೆಗಳು</type>
+			<type key="numbers" type="deva">ದೇವನಾಗರಿ ಅಂಕೆಗಳು</type>
+			<type key="numbers" type="ethi">ಇಥಿಯೋಪಿಯಾದ ಸಂಖ್ಯೆಗಳು</type>
+			<type key="numbers" type="finance">ಆರ್ಥಿಕ ಸಂಖ್ಯೆಗಳು</type>
+			<type key="numbers" type="fullwide">ಪೂರ್ಣ ಅಗಲವಾದ ಸಂಖ್ಯೆಗಳು</type>
+			<type key="numbers" type="geor">ಜಾರ್ಜಿಯಾದ ಸಂಖ್ಯೆಗಳು</type>
+			<type key="numbers" type="grek">ಗ್ರೀಕ್ ಸಂಖ್ಯೆಗಳು</type>
+			<type key="numbers" type="greklow">ಗ್ರೀಕ್ ಲೋವರ್‌ಕೇಸ್ ಸಂಖ್ಯೆಗಳು</type>
+			<type key="numbers" type="gujr">ಗುಜರಾತಿ ಅಂಕೆಗಳು</type>
+			<type key="numbers" type="guru">ಗುರ್ಮುಖಿ ಅಂಕೆಗಳು</type>
+			<type key="numbers" type="hanidec">ಚೀನಾದ ದಶಮಾಂಶ ಸಂಖ್ಯೆಗಳು</type>
+			<type key="numbers" type="hans">ಸರಳೀಕೃತ ಚೀನಾದ ಸಂಖ್ಯೆಗಳು</type>
+			<type key="numbers" type="hansfin">ಸರಳೀಕೃತ ಚೀನಾದ ಆರ್ಥಿಕ ಸಂಖ್ಯೆಗಳು</type>
+			<type key="numbers" type="hant">ಸಾಂಪ್ರದಾಯಿಕ ಚೀನಾ ಸಂಖ್ಯೆಗಳು</type>
+			<type key="numbers" type="hantfin">ಸಾಂಪ್ರದಾಯಿಕ ಚೀನಾದ ಆರ್ಥಿಕ ಸಂಖ್ಯೆಗಳು</type>
+			<type key="numbers" type="hebr">ಹೀಬ್ರೂ ಸಂಖ್ಯೆಗಳು</type>
+			<type key="numbers" type="jpan">ಜಪಾನೀ ಸಂಖ್ಯೆಗಳು</type>
+			<type key="numbers" type="jpanfin">ಜಪಾನೀ ಆರ್ಥಿಕ ಸಂಖ್ಯೆಗಳು</type>
+			<type key="numbers" type="khmr">ಖಮೆ ಅಂಕೆಗಳು</type>
+			<type key="numbers" type="knda">ಕನ್ನಡ ಅಂಕೆಗಳು</type>
+			<type key="numbers" type="laoo">ಲಾವೋ ಅಂಕೆಗಳು</type>
+			<type key="numbers" type="latn">ಪಾಶ್ಚಿಮಾತ್ಯ ಅಂಕೆಗಳು</type>
+			<type key="numbers" type="mlym">ಮಲಯಾಳಂನ ಅಂಕೆಗಳು</type>
+			<type key="numbers" type="mong">ಮಂಗೋಲಿಯಾದ ಅಂಕೆಗಳು</type>
+			<type key="numbers" type="mymr">ಮ್ಯಾನ್ಮಾರ್ ಅಂಕೆಗಳು</type>
+			<type key="numbers" type="native">ಸ್ಥಳೀಯ ಅಂಕೆಗಳು</type>
+			<type key="numbers" type="orya">ಒರಿಯಾ ಅಂಕೆಗಳು</type>
+			<type key="numbers" type="roman">ರೋಮನ್ ಸಂಖ್ಯೆಗಳು</type>
+			<type key="numbers" type="romanlow">ರೋಮನ್ ಲೋವರ್‌ಕೇಸ್ ಸಂಖ್ಯೆಗಳು</type>
+			<type key="numbers" type="taml">ಸಾಂಪ್ರದಾಯಿಕ ತಮಿಳು ಸಂಖ್ಯೆಗಳು</type>
+			<type key="numbers" type="tamldec">ತಮಿಳು ಅಂಕೆಗಳು</type>
+			<type key="numbers" type="telu">ತೆಲುಗು ಅಂಕೆಗಳು</type>
+			<type key="numbers" type="thai">ಥಾಯ್ ಅಂಕೆಗಳು</type>
+			<type key="numbers" type="tibt">ಟಿಬೇಟಿಯನ್ ಅಂಕೆಗಳು</type>
+			<type key="numbers" type="traditional">ಸಾಂಪ್ರದಾಯಿಕ ಸಂಖ್ಯೆಗಳು</type>
+			<type key="numbers" type="vaii">ವಾಯ್ ಅಂಕೆಗಳು</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN">BGN</transformName>
@@ -1089,7 +1105,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</localeDisplayNames>
 	<characters>
 		<exemplarCharacters>[\u0CBC ೦ ೧ ೨ ೩ ೪ ೫ ೬ ೭ ೮ ೯ ಅ ಆ ಇ ಈ ಉ ಊ ಋ ೠ ಌ ೡ ಎ ಏ ಐ ಒ ಓ ಔ ಂ ಃ ಕ ಖ ಗ ಘ ಙ ಚ ಛ ಜ ಝ ಞ ಟ ಠ ಡ ಢ ಣ ತ ಥ ದ ಧ ನ ಪ ಫ ಬ ಭ ಮ ಯ ರ ಱ ಲ ವ ಶ ಷ ಸ ಹ ಳ ಽ ಾ \u0CBF ೀ ು ೂ ೃ ೄ \u0CC6 ೇ ೈ ೊ ೋ \u0CCC \u0CCD ೕ ೖ]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[ೞ \u200C\u200D]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[\u200C\u200D ೞ]</exemplarCharacters>
 		<exemplarCharacters type="index" draft="contributed">[ಅ ಆ ಇ ಈ ಉ ಊ ಋ ೠ ಌ ೡ ಎ ಏ ಐ ಒ ಓ ಔ ಕ ಖ ಗ ಘ ಙ ಚ ಛ ಜ ಝ ಞ ಟ ಠ ಡ ಢ ಣ ತ ಥ ದ ಧ ನ ಪ ಫ ಬ ಭ ಮ ಯ ರ ಱ ಲ ವ ಶ ಷ ಸ ಹ ಳ ೞ]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‐ – — , ; \: ! ? . … ' ‘ ’ &quot; “ ” ( ) \[ \] @ * / \&amp; # ′ ″]</exemplarCharacters>
 		<ellipsis type="final">{0}…</ellipsis>
@@ -1154,6 +1170,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">G y</dateFormatItem>
 						<dateFormatItem id="GyMMM">G y MMM</dateFormatItem>
@@ -1498,18 +1515,60 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">ಮಧ್ಯ ರಾತ್ರಿ</dayPeriod>
 							<dayPeriod type="am">AM</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">ಬೆಳಗ್ಗೆ</dayPeriod>
+							<dayPeriod type="afternoon1">ಮಧ್ಯಾಹ್ನ</dayPeriod>
+							<dayPeriod type="evening1">ಸಂಜೆ</dayPeriod>
+							<dayPeriod type="night1">ರಾತ್ರಿ</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">ಮಧ್ಯರಾತ್ರಿ</dayPeriod>
 							<dayPeriod type="am">ಪೂ</dayPeriod>
-							<dayPeriod type="noon">ಮ</dayPeriod>
 							<dayPeriod type="pm">ಅ</dayPeriod>
+							<dayPeriod type="morning1">ಬೆಳಗ್ಗೆ</dayPeriod>
+							<dayPeriod type="afternoon1">ಮಧ್ಯಾಹ್ನ</dayPeriod>
+							<dayPeriod type="evening1">ಸಂಜೆ</dayPeriod>
+							<dayPeriod type="night1">ರಾತ್ರಿ</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">ಮಧ್ಯ ರಾತ್ರಿ</dayPeriod>
 							<dayPeriod type="am">ಪೂರ್ವಾಹ್ನ</dayPeriod>
-							<dayPeriod type="noon">ಮಧ್ಯಾಹ್ನ</dayPeriod>
 							<dayPeriod type="pm">ಅಪರಾಹ್ನ</dayPeriod>
+							<dayPeriod type="morning1">ಬೆಳಗ್ಗೆ</dayPeriod>
+							<dayPeriod type="afternoon1">ಮಧ್ಯಾಹ್ನ</dayPeriod>
+							<dayPeriod type="evening1">ಸಂಜೆ</dayPeriod>
+							<dayPeriod type="night1">ರಾತ್ರಿ</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">ಮಧ್ಯರಾತ್ರಿ</dayPeriod>
+							<dayPeriod type="am" draft="provisional">AM</dayPeriod>
+							<dayPeriod type="pm" draft="provisional">PM</dayPeriod>
+							<dayPeriod type="morning1">ಬೆಳಗ್ಗೆ</dayPeriod>
+							<dayPeriod type="afternoon1">ಮಧ್ಯಾಹ್ನ</dayPeriod>
+							<dayPeriod type="evening1">ಸಂಜೆ</dayPeriod>
+							<dayPeriod type="night1">ರಾತ್ರಿ</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">ಮಧ್ಯರಾತ್ರಿ</dayPeriod>
+							<dayPeriod type="am" draft="provisional">AM</dayPeriod>
+							<dayPeriod type="pm" draft="provisional">PM</dayPeriod>
+							<dayPeriod type="morning1">ಬೆಳಗ್ಗೆ</dayPeriod>
+							<dayPeriod type="afternoon1">ಮಧ್ಯಾಹ್ನ</dayPeriod>
+							<dayPeriod type="evening1">ಸಂಜೆ</dayPeriod>
+							<dayPeriod type="night1">ರಾತ್ರಿ</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">ಮಧ್ಯರಾತ್ರಿ</dayPeriod>
+							<dayPeriod type="am">ಪೂರ್ವಾಹ್ನ</dayPeriod>
+							<dayPeriod type="pm">ಅಪರಾಹ್ನ</dayPeriod>
+							<dayPeriod type="morning1">ಬೆಳಗ್ಗೆ</dayPeriod>
+							<dayPeriod type="afternoon1">ಮಧ್ಯಾಹ್ನ</dayPeriod>
+							<dayPeriod type="evening1">ಸಂಜೆ</dayPeriod>
+							<dayPeriod type="night1">ರಾತ್ರಿ</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1545,7 +1604,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>M/d/yy</pattern>
+							<pattern>d/M/yy</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -1610,8 +1669,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">M/d</dateFormatItem>
+						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">d/M, E</dateFormatItem>
 						<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
@@ -1621,7 +1684,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">M/y</dateFormatItem>
-						<dateFormatItem id="yMd">M/d/y</dateFormatItem>
+						<dateFormatItem id="yMd">d/M/y</dateFormatItem>
 						<dateFormatItem id="yMEd">E, M/d/y</dateFormatItem>
 						<dateFormatItem id="yMM">MM-y</dateFormatItem>
 						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
@@ -1690,8 +1753,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, MMM d – E, MMM d</greatestDifference>
-							<greatestDifference id="M">d MMM, E – d MMM, E</greatestDifference>
+							<greatestDifference id="d">MMM d, E – MMM d, E</greatestDifference>
+							<greatestDifference id="M">MMM d, E – MMM d, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
 							<greatestDifference id="y">y–y</greatestDifference>
@@ -1752,6 +1815,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>ವರ್ಷ</displayName>
+				<relative type="-1">ಕಳೆದ ವರ್ಷ</relative>
+				<relative type="0">ಈ ವರ್ಷ</relative>
+				<relative type="1">ಮುಂದಿನ ವರ್ಷ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ವರ್ಷದಲ್ಲಿ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ವರ್ಷಗಳಲ್ಲಿ</relativeTimePattern>
@@ -1763,6 +1829,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>ವರ್ಷ</displayName>
+				<relative type="-1">ಕಳೆದ ವರ್ಷ</relative>
+				<relative type="0">ಈ ವರ್ಷ</relative>
+				<relative type="1">ಮುಂದಿನ ವರ್ಷ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ವರ್ಷದಲ್ಲಿ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ವರ್ಷಗಳಲ್ಲಿ</relativeTimePattern>
@@ -1774,6 +1843,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter">
 				<displayName>ತ್ರೈಮಾಸಿಕ</displayName>
+				<relative type="-1">ಕಳೆದ ತ್ರೈಮಾಸಿಕ</relative>
+				<relative type="0">ಈ ತ್ರೈಮಾಸಿಕ</relative>
+				<relative type="1">ಮುಂದಿನ ತ್ರೈಮಾಸಿಕ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ತ್ರೈಮಾಸಿಕದಲ್ಲಿ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ತ್ರೈಮಾಸಿಕಗಳಲ್ಲಿ</relativeTimePattern>
@@ -1785,6 +1857,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>ತ್ರೈಮಾಸಿಕ</displayName>
+				<relative type="-1">ಕಳೆದ ತ್ರೈಮಾಸಿಕ</relative>
+				<relative type="0">ಈ ತ್ರೈಮಾಸಿಕ</relative>
+				<relative type="1">ಮುಂದಿನ ತ್ರೈಮಾಸಿಕ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ತ್ರೈ.ಮಾ.ದಲ್ಲಿ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ತ್ರೈ.ಮಾ.ಗಳಲ್ಲಿ</relativeTimePattern>
@@ -1796,6 +1871,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>ತ್ರೈಮಾಸಿಕ</displayName>
+				<relative type="-1">ಕಳೆದ ತ್ರೈಮಾಸಿಕ</relative>
+				<relative type="0">ಈ ತ್ರೈಮಾಸಿಕ</relative>
+				<relative type="1">ಮುಂದಿನ ತ್ರೈಮಾಸಿಕ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} ತ್ರೈ</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} ತ್ರೈ</relativeTimePattern>
@@ -1821,6 +1899,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>ತಿಂಗಳು</displayName>
+				<relative type="-1">ಕಳೆದ ತಿಂಗಳು</relative>
+				<relative type="0">ಈ ತಿಂಗಳು</relative>
+				<relative type="1">ಮುಂದಿನ ತಿಂಗಳು</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ತಿಂಗಳಲ್ಲಿ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ತಿಂಗಳುಗಳಲ್ಲಿ</relativeTimePattern>
@@ -1832,6 +1913,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>ತಿಂಗಳು</displayName>
+				<relative type="-1">ಕಳೆದ ತಿಂಗಳು</relative>
+				<relative type="0">ಈ ತಿಂಗಳು</relative>
+				<relative type="1">ಮುಂದಿನ ತಿಂಗಳು</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ತಿಂಗಳಲ್ಲಿ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ತಿಂಗಳುಗಳಲ್ಲಿ</relativeTimePattern>
@@ -1857,6 +1941,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>ವಾರ</displayName>
+				<relative type="-1">ಕಳೆದ ವಾರ</relative>
+				<relative type="0">ಈ ವಾರ</relative>
+				<relative type="1">ಮುಂದಿನ ವಾರ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ವಾರದಲ್ಲಿ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ವಾರಗಳಲ್ಲಿ</relativeTimePattern>
@@ -1868,6 +1955,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>ವಾರ</displayName>
+				<relative type="-1">ಕಳೆದ ವಾರ</relative>
+				<relative type="0">ಈ ವಾರ</relative>
+				<relative type="1">ಮುಂದಿನ ವಾರ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ವಾರದಲ್ಲಿ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ವಾರಗಳಲ್ಲಿ</relativeTimePattern>
@@ -1895,6 +1985,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>ದಿನ</displayName>
+				<relative type="-2">ಮೊನ್ನೆ</relative>
+				<relative type="-1">ನಿನ್ನೆ</relative>
+				<relative type="0">ಇಂದು</relative>
+				<relative type="1">ನಾಳೆ</relative>
+				<relative type="2">ನಾಡಿದ್ದು</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ದಿನದಲ್ಲಿ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ದಿನಗಳಲ್ಲಿ</relativeTimePattern>
@@ -1905,7 +2000,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day-narrow">
-				<displayName>ದಿ</displayName>
+				<displayName>ದಿನ</displayName>
+				<relative type="-2">ಮೊನ್ನೆ</relative>
+				<relative type="-1">ನಿನ್ನೆ</relative>
+				<relative type="0">ಇಂದು</relative>
+				<relative type="1">ನಾಳೆ</relative>
+				<relative type="2">ನಾಡಿದ್ದು</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ದಿನದಲ್ಲಿ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ದಿನಗಳಲ್ಲಿ</relativeTimePattern>
@@ -2196,7 +2296,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>ಮ್ಯಾಕ್‍ಮುರ್ಡೊ</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>ರಿಯೋ ಗಯೇಗೋ</exemplarCity>
+				<exemplarCity>ರಿಯೋ ಗಲ್ಲೆಗೊಸ್</exemplarCity>
 			</zone>
 			<zone type="America/Mendoza">
 				<exemplarCity>ಮೆಂಡೊಜಾ</exemplarCity>
@@ -3005,6 +3105,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>ಪೋರ್ಟ್ ಮೋರಿಸ್‌ಬೈ</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>ಬೌಗೆನ್‍ವಿಲ್ಲೆ</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>ಮನಿಲಾ</exemplarCity>
 			</zone>
@@ -3089,6 +3192,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>ಇರ್‌ಕುಟ್ಸ್</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>ಚಿಟ</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>ಯಕುಟ್ಸ್ಕ್</exemplarCity>
 			</zone>
@@ -3107,6 +3213,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>ಮಗದನ್‌</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>ಸ್ರೇದ್ನೇಕೋಲೀಮಸ್ಕ</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>ಕಮ್ಚತ್ಕ</exemplarCity>
 			</zone>
@@ -3848,12 +3957,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Indonesia_Central">
 				<long>
-					<standard>ಮಧ್ಯ ಇಂಡೋನೇಷಿಯ ಸಮಯ</standard>
+					<standard>ಮಧ್ಯ ಇಂಡೋನೇಷಿಯಾ ಸಮಯ</standard>
 				</long>
 			</metazone>
 			<metazone type="Indonesia_Eastern">
 				<long>
-					<standard>ಪೂರ್ವ ಇಂಡೋನೇಷಿಯ ಸಮಯ</standard>
+					<standard>ಪೂರ್ವ ಇಂಡೋನೇಷಿಯಾ ಸಮಯ</standard>
 				</long>
 			</metazone>
 			<metazone type="Indonesia_Western">
@@ -3920,7 +4029,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Krasnoyarsk">
 				<long>
-					<generic>ಕ್ರಸ್ನಿಯಾರ್ಕ್ಸ್ ಸಮಯ</generic>
+					<generic>ಕ್ರಾಸ್‌ನೊಯಾರ್ಸ್ಕ್ ಸಮಯ</generic>
 					<standard>ಕ್ರಾಸ್‌ನೊಯಾರ್ಸ್ಕ್ ಪ್ರಮಾಣಿತ ಸಮಯ</standard>
 					<daylight>ಕ್ರಾಸ್‌ನೊಯಾರ್ಸ್ಕ್ ಬೇಸಿಗೆ ಸಮಯ</daylight>
 				</long>
@@ -4203,7 +4312,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Singapore">
 				<long>
-					<standard>ಸಿಂಗಪುರ್ ಪ್ರಮಾಣಿತ ಸಮಯ</standard>
+					<standard>ಸಿಂಗಾಪುರ್ ಪ್ರಮಾಣಿತ ಸಮಯ</standard>
 				</long>
 			</metazone>
 			<metazone type="Solomon">
@@ -4449,6 +4558,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">¤0ಸಾ</pattern>
+					<pattern type="1000" count="other">¤0ಸಾ</pattern>
+					<pattern type="10000" count="one">¤00ಸಾ</pattern>
+					<pattern type="10000" count="other">¤00ಸಾ</pattern>
+					<pattern type="100000" count="one">¤000ಸಾ</pattern>
+					<pattern type="100000" count="other">¤000ಸಾ</pattern>
+					<pattern type="1000000" count="one">¤0ಮಿ</pattern>
+					<pattern type="1000000" count="other">¤0ಮಿ</pattern>
+					<pattern type="10000000" count="one">¤00ಮಿ</pattern>
+					<pattern type="10000000" count="other">¤00ಮಿ</pattern>
+					<pattern type="100000000" count="one">¤000ಮಿ</pattern>
+					<pattern type="100000000" count="other">¤000ಮಿ</pattern>
+					<pattern type="1000000000" count="one">¤0ಬಿ</pattern>
+					<pattern type="1000000000" count="other">¤0ಬಿ</pattern>
+					<pattern type="10000000000" count="one">¤00ಬಿ</pattern>
+					<pattern type="10000000000" count="other">¤00ಬಿ</pattern>
+					<pattern type="100000000000" count="one">¤000ಬಿ</pattern>
+					<pattern type="100000000000" count="other">¤000ಬಿ</pattern>
+					<pattern type="1000000000000" count="one">¤0ಟ್ರಿ</pattern>
+					<pattern type="1000000000000" count="other">¤0ಟ್ರಿ</pattern>
+					<pattern type="10000000000000" count="one">¤00ಟ್ರಿ</pattern>
+					<pattern type="10000000000000" count="other">¤00ಟ್ರಿ</pattern>
+					<pattern type="100000000000000" count="one">¤000ಟ್ರಿ</pattern>
+					<pattern type="100000000000000" count="other">¤000ಟ್ರಿ</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4462,7 +4599,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="AFN">
 				<displayName>ಅಫ್‌ಘನ್ ಅಫಗಾನಿ</displayName>
 				<displayName count="one">ಅಫ್‌ಘನ್ ಅಫಗಾನಿ</displayName>
-				<displayName count="other">ಅಫ್‌ಘನ್ ಅಫಗಾನಿ</displayName>
+				<displayName count="other">ಅಫ್‌ಘನ್ ಅಫಗಾನಿಗಳು</displayName>
 				<symbol>AFN</symbol>
 			</currency>
 			<currency type="ALL">
@@ -4474,7 +4611,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="AMD">
 				<displayName>ಅರ್ಮೆನಿಯನ್ ಡ್ರಾಮ್</displayName>
 				<displayName count="one">ಅರ್ಮೆನಿಯನ್ ಡ್ರಾಮ್</displayName>
-				<displayName count="other">ಅರ್‌ಮೇನಿಯನ್ ಡ್ರಾಮ್</displayName>
+				<displayName count="other">ಅರ್‌ಮೇನಿಯನ್ ಡ್ರಾಮ್‌ಗಳು</displayName>
 				<symbol>AMD</symbol>
 			</currency>
 			<currency type="ANG">
@@ -4488,6 +4625,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ಅಂಗೋಲಾದ ಕ್ವಾನ್ಝಾ</displayName>
 				<displayName count="other">ಅಂಗೋಲಾದ ಕ್ವಾನ್ಝಾಗಳು</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="ARS">
 				<displayName>ಅರ್ಜೆಂಟಿನಾ ಪೆಸೊ</displayName>
@@ -4520,6 +4658,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ಬೋಸ್ನಿಯಾ-ಹರ್ಜ್‌ಗೋವಿನ ಪರಿವರ್ತನೀಯ ಗುರುತು</displayName>
 				<displayName count="other">ಬೋಸ್ನಿಯಾ-ಹರ್ಜ್‌ಗೋವಿನ ಪರಿವರ್ತನೀಯ ಗುರುತುಗಳು</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>ಬರ್ಬಾಡಿಯನ್ ಡಾಲರ್</displayName>
@@ -4531,7 +4670,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="BDT">
 				<displayName>ಬಾಂಗ್ಲಾದೇಶದ ಟಾಕಾ</displayName>
 				<displayName count="one">ಬಾಂಗ್ಲಾದೇಶದ ಟಾಕಾ</displayName>
-				<displayName count="other">ಬಾಂಗ್ಲಾದೇಶದ ಟಾಕಾ</displayName>
+				<displayName count="other">ಬಾಂಗ್ಲಾದೇಶದ ಟಾಕಾಗಳು</displayName>
 				<symbol>BDT</symbol>
 				<symbol alt="narrow" draft="contributed">৳</symbol>
 			</currency>
@@ -4563,7 +4702,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="BND">
 				<displayName>ಬ್ರೂನಿ ಡಾಲರ್</displayName>
 				<displayName count="one">ಬ್ರೂನಿ ಡಾಲರ್</displayName>
-				<displayName count="other">ಬ್ರೂನಿ ಡಾಲರ್</displayName>
+				<displayName count="other">ಬ್ರೂನಿ ಡಾಲರ್‌ಗಳು</displayName>
 				<symbol>BND</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -4572,6 +4711,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ಬೊಲಿವಿಯಾದ ಬೊಲಿವಿಯಾನೊ</displayName>
 				<displayName count="other">ಬೊಲಿವಿಯಾದ ಬೊಲಿವಿಯಾನೊಗಳು</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BRL">
 				<displayName>ಬ್ರೆಜಿಲಿಯನ್‌ ರಿಯಲ್</displayName>
@@ -4590,7 +4730,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="BTN">
 				<displayName>ಭೂತಾನೀಸ್ ನುಲ್ತರಮ್</displayName>
 				<displayName count="one">ಭೂತಾನೀಸ್ ನುಲ್ತರಮ್</displayName>
-				<displayName count="other">ಭೂತಾನೀಸ್ ನುಲ್ತರಮ್</displayName>
+				<displayName count="other">ಭೂತಾನೀಸ್ ನುಲ್ತರಮ್‌ಗಳು</displayName>
 				<symbol>BTN</symbol>
 			</currency>
 			<currency type="BWP">
@@ -4598,6 +4738,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ಬೋಟ್ಸ್‌ವಾನನ್ ಪುಲಾ</displayName>
 				<displayName count="other">ಬೋಟ್ಸ್‌ವಾನನ್ ಪುಲಾಗಳು</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYR">
 				<displayName>ಬೆಲಾರುಸಿಯನ್ ರೂಬಲ್</displayName>
@@ -4649,7 +4790,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="COP">
 				<displayName>ಕೊಲೊಂಬಿಯೋದ ಪೆಸೊ</displayName>
 				<displayName count="one">ಕೊಲೊಂಬಿಯೋದ ಪೆಸೊ</displayName>
-				<displayName count="other">ಕೊಲೊಂಬಿಯೋದ ಪೆಸೊ</displayName>
+				<displayName count="other">ಕೊಲೊಂಬಿಯೋದ ಪೆಸೊಗಳು</displayName>
 				<symbol>COP</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -4665,6 +4806,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ಕ್ಯೂಬಾದ ಪರಿವರ್ತನೀಯ ಪೆಸೊ</displayName>
 				<displayName count="other">ಕ್ಯೂಬಾದ ಪರಿವರ್ತನೀಯ ಪೆಸೊಗಳು</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>ಕ್ಯೂಬಾದ ಪೆಸೊ</displayName>
@@ -4684,6 +4826,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ಝೆಕ್ ಗಣರಾಜ್ಯ ಕೊರೂನ</displayName>
 				<displayName count="other">ಝೆಕ್ ಗಣರಾಜ್ಯ ಕೊರೂನಗಳು</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DJF">
 				<displayName>ಜಿಬೊಟಿಯನ್ ಫ್ರಾಂಕ್</displayName>
@@ -4696,6 +4839,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ಡ್ಯಾನಿಶ್ ಕ್ರೋನ್</displayName>
 				<displayName count="other">ಡ್ಯಾನಿಶ್ ಕ್ರೋನ್</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>ಡೊಮಿನಿಕನ್ ಪೆಸೊ</displayName>
@@ -4715,6 +4859,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ಈಜಿಪ್ಷಿಯನ್ ಪೌಂಡ್‍</displayName>
 				<displayName count="other">ಈಜಿಪ್ಷಿಯನ್ ಪೌಂಡ್‍ಗಳು</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>ಎರಿತ್ರಿಯನ್ ನಕ್ಫಾ</displayName>
@@ -4747,11 +4892,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ಫಾಲ್ಕ್‌ಲ್ಯಾಂಡ್ ದ್ವೀಪಗಳ ಪೌಂಡ್</displayName>
 				<displayName count="other">ಫಾಲ್ಕ್‌ಲ್ಯಾಂಡ್ ದ್ವೀಪಗಳ ಪೌಂಡ್‍ಗಳು</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GBP">
-				<displayName>ಬ್ರಿಟೀಷ್ ಪೌಂಡ್ ಸ್ಟೆರ್ಲಿಂಗ್</displayName>
+				<displayName>ಬ್ರಿಟೀಷ್ ಪೌಂಡ್</displayName>
 				<displayName count="one">ಬ್ರಿಟೀಷ್ ಪೌಂಡ್ ಸ್ಟೆರ್ಲಿಂಗ್</displayName>
-				<displayName count="other">ಬ್ರಿಟೀಷ್ ಪೌಂಡ್ ಸ್ಟೆರ್ಲಿಂಗ್</displayName>
+				<displayName count="other">ಬ್ರಿಟೀಷ್ ಪೌಂಡ್‍ಗಳು</displayName>
 				<symbol>£</symbol>
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
@@ -4760,6 +4906,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ಜಾರ್ಜಿಯಾದ ಲಾರಿ</displayName>
 				<displayName count="other">ಜಾರ್ಜಿಯಾದ ಲಾರಿ</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHS">
 				<displayName>ಘಾನಾದ ಸೆದಿ</displayName>
@@ -4785,12 +4932,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ಗಿನಿಯನ್ ಫ್ರಾಂಕ್</displayName>
 				<displayName count="other">ಗಿನಿಯನ್ ಫ್ರಾಂಕ್‌ಗಳು</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GTQ">
 				<displayName>ಗ್ವಾಟೆಮಾಲಾದ ಕುಯಿಟ್ಸಲ್‌‌</displayName>
 				<displayName count="one">ಗ್ವಾಟೆಮಾಲಾದ ಕುಯಿಟ್ಸಲ್‌‌</displayName>
 				<displayName count="other">ಗ್ವಾಟೆಮಾಲಾದ ಕುಯಿಟ್ಸಲ್‌‌‍ಗಳು</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GYD">
 				<displayName>ಗುಯಾನೀಸ್‌ ಡಾಲರ್‌</displayName>
@@ -4802,7 +4951,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="HKD">
 				<displayName>ಹಾಂಗ್ ಕಾಂಗ್ ಡಾಲರ್</displayName>
 				<displayName count="one">ಹಾಂಗ್ ಕಾಂಗ್ ಡಾಲರ್</displayName>
-				<displayName count="other">ಹಾಂಗ್ ಕಾಂಗ್ ಡಾಲರ್</displayName>
+				<displayName count="other">ಹಾಂಗ್ ಕಾಂಗ್ ಡಾಲರ್‌ಗಳು</displayName>
 				<symbol>HK$</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -4811,12 +4960,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ಹೊಂಡುರಾನ್‌ ಲೆಂಪಿರಾ</displayName>
 				<displayName count="other">ಹೊಂಡುರಾನ್‌ ಲೆಂಪಿರಾಗಳು</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRK">
 				<displayName>ಕ್ರೊಯೆಷ್ಯಾದ ಕೂನಾ</displayName>
 				<displayName count="one">ಕ್ರೊಯೆಷ್ಯಾದ ಕೂನಾ</displayName>
 				<displayName count="other">ಕ್ರೊಯೆಷ್ಯಾದ ಕೂನಾಗಳು</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>ಹೈಟಿಯ ಗೋರ್ದೆ</displayName>
@@ -4829,12 +4980,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ಹಂಗೇರಿಯನ್ ಫೋರಿಂಟ್</displayName>
 				<displayName count="other">ಹಂಗೇರಿಯನ್ ಫೋರಿಂಟ್‍ಗಳು</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>ಇಂಡೊನೇಷ್ಯಾ ರುಪೈ</displayName>
 				<displayName count="one">ಇಂಡೊನೇಷ್ಯಾ ರುಪೈ</displayName>
 				<displayName count="other">ಇಂಡೊನೇಷ್ಯಾ ರುಪೈ</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="ILS">
 				<displayName>ಇಸ್ರೇಲಿ ನ್ಯೂ ಶೇಖಲ್</displayName>
@@ -4844,9 +4997,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">₪</symbol>
 			</currency>
 			<currency type="INR">
-				<displayName>ಭಾರತೀಯ ರುಪಾಯಿ</displayName>
-				<displayName count="one">ಭಾರತೀಯ ರುಪಾಯಿ</displayName>
-				<displayName count="other">ಭಾರತೀಯ ರುಪಾಯಿ</displayName>
+				<displayName>ಭಾರತೀಯ ರೂಪಾಯಿ</displayName>
+				<displayName count="one">ಭಾರತೀಯ ರೂಪಾಯಿ</displayName>
+				<displayName count="other">ಭಾರತೀಯ ರೂಪಾಯಿಗಳು</displayName>
 				<symbol>₹</symbol>
 				<symbol alt="narrow" draft="contributed">₹</symbol>
 			</currency>
@@ -4859,7 +5012,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="IRR">
 				<displayName>ಇರಾನಿಯನ್ ರಿಯಲ್</displayName>
 				<displayName count="one">ಇರಾನಿಯನ್ ರಿಯಲ್</displayName>
-				<displayName count="other">ಇರಾನಿಯನ್ ರಿಯಲ್</displayName>
+				<displayName count="other">ಇರಾನಿಯನ್ ರಿಯಲ್‌ಗಳು</displayName>
 				<symbol>IRR</symbol>
 			</currency>
 			<currency type="ISK">
@@ -4867,6 +5020,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ಐಸ್‌ಲ್ಯಾಂಡಿಕ್ ಕ್ರೋನಾ</displayName>
 				<displayName count="other">ಐಸ್‌ಲ್ಯಾಂಡಿಕ್ ಕ್ರೋನಾ</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="JMD">
 				<displayName>ಜಮೈಕನ್ ಡಾಲರ್</displayName>
@@ -4903,7 +5057,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="KHR">
 				<displayName>ಕಾಂಬೋಡಿಯನ್ ರಿಯಲ್</displayName>
 				<displayName count="one">ಕಾಂಬೋಡಿಯನ್ ರಿಯಲ್</displayName>
-				<displayName count="other">ಕಾಂಬೋಡಿಯನ್ ರಿಯಲ್</displayName>
+				<displayName count="other">ಕಾಂಬೋಡಿಯನ್ ರಿಯಲ್‍ಗಳು</displayName>
 				<symbol>KHR</symbol>
 				<symbol alt="narrow" draft="contributed">៛</symbol>
 			</currency>
@@ -4912,12 +5066,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ಕೊಮೊರಿಯನ್ ಫ್ರಾಂಕ್</displayName>
 				<displayName count="other">ಕೊಮೊರಿಯನ್ ಫ್ರಾಂಕ್‍ಗಳು</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>ಉತ್ತರ ಕೊರಿಯನ್ ವೋನ್</displayName>
 				<displayName count="one">ಉತ್ತರ ಕೊರಿಯನ್ ವೋನ್</displayName>
 				<displayName count="other">ಉತ್ತರ ಕೊರಿಯನ್ ವೋನ್</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>ದಕ್ಷಿಣ ಕೊರಿಯನ್ ವೊನ್</displayName>
@@ -4949,7 +5105,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="LAK">
 				<displayName>ಲೋಟಿಯನ್ ಕಿಪ್</displayName>
 				<displayName count="one">ಲೋಟಿಯನ್ ಕಿಪ್</displayName>
-				<displayName count="other">ಲೋಟಿಯನ್ ಕಿಪ್</displayName>
+				<displayName count="other">ಲೋಟಿಯನ್ ಕಿಪ್‍ಗಳು</displayName>
 				<symbol>LAK</symbol>
 				<symbol alt="narrow" draft="contributed">₭</symbol>
 			</currency>
@@ -4958,12 +5114,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ಲೆಬೆನೀಸ್ ಪೌಂಡ್</displayName>
 				<displayName count="other">ಲೆಬೆನೀಸ್ ಪೌಂಡ್‍ಗಳು</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>ಶ್ರೀಲಂಕಾದ ರುಪೀ</displayName>
 				<displayName count="one">ಶ್ರೀಲಂಕಾದ ರುಪೀ</displayName>
-				<displayName count="other">ಶ್ರೀಲಂಕಾದ ರುಪೀ</displayName>
+				<displayName count="other">ಶ್ರೀಲಂಕಾದ ರುಪೀಗಳು</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>ಲಿಬೇರಿಯನ್ ಡಾಲರ್</displayName>
@@ -5010,6 +5168,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ಮಲಗಾಸಿ ಅರಿಯಾರಿ</displayName>
 				<displayName count="other">ಮಲಗಾಸಿ ಅರಿಯಾರಿಗಳು</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MKD">
 				<displayName>ಮೆಸಡೋನಿಯನ್ ದಿನಾರ್</displayName>
@@ -5020,20 +5179,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="MMK">
 				<displayName>ಮ್ಯಾನ್ಮಾರ್ ಕ್ಯಾಟ್</displayName>
 				<displayName count="one">ಮ್ಯಾನ್ಮಾರ್ ಕ್ಯಾಟ್</displayName>
-				<displayName count="other">ಮ್ಯಾನ್ಮಾರ್ ಕ್ಯಾಟ್</displayName>
+				<displayName count="other">ಮ್ಯಾನ್ಮಾರ್ ಕ್ಯಾಟ್‍ಗಳು</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>ಮಂಗೋಲಿಯಾದ ತುಗ್ರಿಕ್‌‌</displayName>
 				<displayName count="one">ಮಂಗೋಲಿಯಾದ ತುಗ್ರಿಕ್‌‌</displayName>
-				<displayName count="other">ಮಂಗೋಲಿಯಾದ ತುಗ್ರಿಕ್‌‌</displayName>
+				<displayName count="other">ಮಂಗೋಲಿಯಾದ ತುಗ್ರಿಕ್‌‌‌ಗಳು</displayName>
 				<symbol>MNT</symbol>
 				<symbol alt="narrow" draft="contributed">₮</symbol>
 			</currency>
 			<currency type="MOP">
 				<displayName>ಮಕ್ಯೂದ ಪಟಕಾ</displayName>
 				<displayName count="one">ಮಕ್ಯೂದ ಪಟಕಾ</displayName>
-				<displayName count="other">ಮಕ್ಯೂದ ಪಟಕಾ</displayName>
+				<displayName count="other">ಮಕ್ಯೂದ ಪಟಕಾಗಳು</displayName>
 				<symbol>MOP</symbol>
 			</currency>
 			<currency type="MRO">
@@ -5047,11 +5207,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ಮಾರಿಷಿಯನ್ ರುಪಿ</displayName>
 				<displayName count="other">ಮಾರಿಷಿಯನ್ ರುಪಿಗಳು</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>ಮಾಲ್ಡೀವಿಯನ್ ರುಫಿಯಾ</displayName>
 				<displayName count="one">ಮಾಲ್ಡೀವಿಯನ್ ರುಫಿಯಾ</displayName>
-				<displayName count="other">ಮಾಲ್ಡೀವಿಯನ್ ರುಫಿಯಾ</displayName>
+				<displayName count="other">ಮಾಲ್ಡೀವಿಯನ್ ರುಫಿಯಾಗಳು</displayName>
 				<symbol>MVR</symbol>
 			</currency>
 			<currency type="MWK">
@@ -5070,8 +5231,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="MYR">
 				<displayName>ಮಲೇಶಿಯನ್ ರಿಂಗಿಟ್ಟ್</displayName>
 				<displayName count="one">ಮಲೇಶಿಯನ್ ರಿಂಗಿಟ್ಟ್</displayName>
-				<displayName count="other">ಮಲೇಶಿಯನ್ ರಿಂಗಿಟ್ಟ್</displayName>
+				<displayName count="other">ಮಲೇಶಿಯನ್ ರಿಂಗಿಟ್ಟ್‌ಗಳು</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZN">
 				<displayName>ಮೊಝಾಂಬಿಕನ್ ಮೆಟಿಕಲ್</displayName>
@@ -5098,18 +5260,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ನಿಕಾರಗ್ವಾದ ಕರ್ದೊಬಾ</displayName>
 				<displayName count="other">ನಿಕಾರಗ್ವಾದ ಕರ್ದೊಬಾಗಳು</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NOK">
 				<displayName>ನಾರ್ವೇಯ ಕ್ರೋನ್</displayName>
 				<displayName count="one">ನಾರ್ವೇಯ ಕ್ರೋನ್</displayName>
 				<displayName count="other">ನಾರ್ವೇಯ ಕ್ರೋನರ್</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>ನೇಪಾಳದ ರುಪೀ</displayName>
 				<displayName count="one">ನೇಪಾಳದ ರುಪೀ</displayName>
-				<displayName count="other">ನೇಪಾಳದ ರುಪೀ</displayName>
+				<displayName count="other">ನೇಪಾಳದ ರುಪೀಗಳು</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>ನ್ಯೂಜಿಲ್ಯಾಂಡ್ ಡಾಲರ್</displayName>
@@ -5145,21 +5310,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="PHP">
 				<displayName>ಫಿಲಿಪ್ಪೈನ್ ಪೆಸೊ</displayName>
 				<displayName count="one">ಫಿಲಿಪ್ಪೈನ್ ಪೆಸೊ</displayName>
-				<displayName count="other">ಫಿಲಿಪ್ಪೈನ್ ಪೆಸೊ</displayName>
+				<displayName count="other">ಫಿಲಿಪ್ಪೈನ್ ಪೆಸೊಗಳು</displayName>
 				<symbol>PHP</symbol>
 				<symbol alt="narrow" draft="contributed">₱</symbol>
 			</currency>
 			<currency type="PKR">
 				<displayName>ಪಾಕಿಸ್ತಾನದ ರುಪೀ</displayName>
 				<displayName count="one">ಪಾಕಿಸ್ತಾನದ ರುಪೀ</displayName>
-				<displayName count="other">ಪಾಕಿಸ್ತಾನದ ರುಪೀ</displayName>
+				<displayName count="other">ಪಾಕಿಸ್ತಾನದ ರುಪೀಗಳು</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>ಪೊಲಿಶ್ ಝ್ಲೋಟಿ</displayName>
 				<displayName count="one">ಪೊಲಿಶ್ ಝ್ಲೋಟಿ</displayName>
 				<displayName count="other">ಪೊಲಿಶ್ ಝ್ಲೋಟಿಗಳು</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PYG">
 				<displayName>ಪೆರುಗ್ವೇಯ ಗ್ವಾರನೀ</displayName>
@@ -5191,12 +5358,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ರಶಿಯನ್ ರೂಬಲ್</displayName>
 				<displayName count="other">ರಶಿಯನ್ ರೂಬಲ್‍ಗಳು</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RWF">
 				<displayName>ರುವಾಂಡನ್ ಫ್ರಾಂಕ್</displayName>
 				<displayName count="one">ರುವಾಂಡನ್ ಫ್ರಾಂಕ್</displayName>
 				<displayName count="other">ರುವಾಂಡನ್ ಫ್ರಾಂಕ್‍ಗಳು</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>ಸೌದಿ ರಿಯಾಲ್</displayName>
@@ -5228,11 +5397,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ಸ್ವೀಡಿಷ್ ಕ್ರೋನಾ</displayName>
 				<displayName count="other">ಸ್ವೀಡಿಶ್ ಕ್ರೋನರ್</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>ಸಿಂಗಾಪುರ್ ಡಾಲರ್‌</displayName>
 				<displayName count="one">ಸಿಂಗಾಪುರ್ ಡಾಲರ್‌</displayName>
-				<displayName count="other">ಸಿಂಗಾಪುರ್ ಡಾಲರ್‌</displayName>
+				<displayName count="other">ಸಿಂಗಾಪುರ್ ಡಾಲರ್‌‌ಗಳು</displayName>
 				<symbol>SGD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -5241,6 +5411,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ಸೇಂಟ್ ಹೆಲೇನಾ ಪೌಂಡ್</displayName>
 				<displayName count="other">ಸೇಂಟ್ ಹೆಲೇನಾ ಪೌಂಡ್</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SLL">
 				<displayName>ಸಿಯೆರಾ ಲಿಯೋನಿಯನ್ ಲಿಯೋನ್</displayName>
@@ -5273,17 +5444,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ಸಾವೊ ಟೋಮ್ ಮತ್ತು ಪ್ರಿನ್ಸಿಪ್ ದೊಬ್ರಾ</displayName>
 				<displayName count="other">ಸಾವೊ ಟೋಮ್ ಮತ್ತು ಪ್ರಿನ್ಸಿಪ್ ದೊಬ್ರಾಗಳು</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SYP">
 				<displayName>ಸಿರಿಯನ್ ಪೌಂಡ್</displayName>
 				<displayName count="one">ಸಿರಿಯನ್ ಪೌಂಡ್</displayName>
 				<displayName count="other">ಸಿರಿಯನ್ ಪೌಂಡ್‌ಗಳು</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>ಸ್ವಾಜಿ ಲಿಲಂಗೆನಿ</displayName>
 				<displayName count="one">ಸ್ವಾಜಿ ಲಿಲಂಗೆನಿ</displayName>
-				<displayName count="other">ಸ್ವಾಜಿ ಲಿಲಂಗೆನಿಗಳು</displayName>
+				<displayName count="other">ಸ್ವಾಜಿ ಎಮಲಂಗೆನಿ</displayName>
 				<symbol>SZL</symbol>
 			</currency>
 			<currency type="THB">
@@ -5291,6 +5464,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ಥಾಯ್ ಬಹ್ತ್</displayName>
 				<displayName count="other">ಥಾಯ್ ಬಹ್ತ್</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJS">
 				<displayName>ತಜಕಿಸ್ತಾನಿ ಸೊಮೋನಿ</displayName>
@@ -5315,6 +5489,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ಟೊಂಗಾ ಪಾಂಗ</displayName>
 				<displayName count="other">ಟೊಂಗಾ ಪಾಂಗ</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TRY">
 				<displayName>ಟರ್ಕಿಶ್ ಲಿರಾ</displayName>
@@ -5322,6 +5497,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">ಟರ್ಕಿಶ್ ಲಿರಾ</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>ಟ್ರಿನಿಡಾಡ್ ಮತ್ತು ಟೊಬಾಗೊ ಡಾಲರ್</displayName>
@@ -5333,7 +5509,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="TWD">
 				<displayName>ನ್ಯೂ ತೈವಾನ್ ಡಾಲರ್</displayName>
 				<displayName count="one">ನ್ಯೂ ತೈವಾನ್ ಡಾಲರ್</displayName>
-				<displayName count="other">ನ್ಯೂ ತೈವಾನ್ ಡಾಲರ್</displayName>
+				<displayName count="other">ನ್ಯೂ ತೈವಾನ್ ಡಾಲರ್‌ಗಳು</displayName>
 				<symbol>NT$</symbol>
 				<symbol alt="narrow" draft="contributed">NT$</symbol>
 			</currency>
@@ -5373,7 +5549,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="UZS">
 				<displayName>ಉಜ್ಬೇಕಿಸ್ತಾನ್ ಸೊಮ್</displayName>
 				<displayName count="one">ಉಜ್ಬೇಕಿಸ್ತಾನ್ ಸೊಮ್</displayName>
-				<displayName count="other">ಉಜ್ಬೇಕಿಸ್ತಾನ್ ಸೊಮ್‍ಗಳು</displayName>
+				<displayName count="other">ಉಜ್ಬೇಕಿಸ್ತಾನ್ ಸೊಮ್</displayName>
 				<symbol>UZS</symbol>
 			</currency>
 			<currency type="VEF">
@@ -5381,6 +5557,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ವೆನಿಜುಲಿಯನ್ ಬೊಲಿವರ್</displayName>
 				<displayName count="other">ವೆನಿಜುಲಿಯನ್ ಬೊಲಿವರ್‌ಗಳು</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>ವಿಯೆಟ್ನಾಮೀಸ್ ಡಾಂಗ್</displayName>
@@ -5412,15 +5589,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ಪೂರ್ವ ಕೆರೀಬಿಯನ್ ಡಾಲರ್</displayName>
 				<displayName count="other">ಪೂರ್ವ ಕೆರೀಬಿಯನ್ ಡಾಲರ್‌ಗಳು</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XOF">
 				<displayName>CFA ಫ್ರಾಂಕ್ BCEAO</displayName>
-				<displayName count="one">CFA ಫ್ರಾಂಕ್ BCEAO</displayName>
+				<displayName count="one">ಪಶ್ಚಿಮ ಆಫ್ರಿಕಾದ [CFA] ಫ್ರಾಂಕ್‌</displayName>
 				<displayName count="other">CFA ಫ್ರಾಂಕ್ BCEAO</displayName>
 				<symbol>CFA</symbol>
 			</currency>
 			<currency type="XPF">
-				<displayName>CFP ಫ್ರಾಂಕ್</displayName>
+				<displayName>[CFP] ಫ್ರಾಂಕ್</displayName>
 				<displayName count="one">CFP ಫ್ರಾಂಕ್</displayName>
 				<displayName count="other">CFP ಫ್ರಾಂಕ್</displayName>
 				<symbol>CFPF</symbol>
@@ -5441,6 +5619,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ದಕ್ಷಿಣ ಆಫ್ರಿಕನ್ ರಾಂಡ್</displayName>
 				<displayName count="other">ದಕ್ಷಿಣ ಆಫ್ರಿಕನ್ ರಾಂಡ್</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>ಜಾಂಬಿಯಾ ಕ್ವಾಚ (1968–2012)</displayName>
@@ -5450,6 +5629,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ಜಾಂಬಿಯಾ ಕ್ವಾಚ</displayName>
 				<displayName count="other">ಜಾಂಬಿಯಾ ಕ್ವಾಚಗಳು</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
@@ -5460,7 +5640,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 	<units>
 		<unitLength type="long">
 			<compoundUnit type="per">
-				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0} ಪ್ರತಿ {1} ಗೆ</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>ಜಿ-ಫೋರ್ಸ್</displayName>
@@ -5468,9 +5648,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ಜಿ-ಫೋರ್ಸ್</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
-				<displayName>ಪ್ರತಿ ಎರಡು ಸೆಕೆಂಡಿಗೆ ಮೀಟರ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಪ್ರತಿ ಎರಡು ಸೆಕೆಂಡಿಗೆ ಮೀಟರ್‌ಗಳು</unitPattern>
-				<unitPattern count="other">{0} ಪ್ರತಿ ಎರಡು ಸೆಕೆಂಡಿಗೆ ಮೀಟರ್‌‌ಗಳು</unitPattern>
+				<displayName>ಮೀಟರ್‌ಗಳು ಪ್ರತಿ ಸೆಕೆಂಡ್‌ ಸ್ಕ್ವೇರ್‌ಗಳಿಗೆ</displayName>
+				<unitPattern count="one">{0} ಮೀಟರ್‌ ಪ್ರತಿ ಸೆಕೆಂಡ್‌ ಸ್ಕ್ವೇರ್‌ಗಳಿಗೆ</unitPattern>
+				<unitPattern count="other">{0} ಮೀಟರ್‌ಗಳು ಪ್ರತಿ ಸೆಕೆಂಡ್‌ ಸ್ಕ್ವೇರ್‌ಗಳಿಗೆ</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>ಕ್ರಾಂತಿ</displayName>
+				<unitPattern count="one">{0} ಕ್ರಾಂತಿ</unitPattern>
+				<unitPattern count="other">{0} ಕ್ರಾಂತಿಗಳು</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>ರೇಡಿಯಾನ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ರೇಡಿಯಾನ್‌</unitPattern>
+				<unitPattern count="other">{0} ರೇಡಿಯಾನ್‌ಗಳು</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>ಡಿಗ್ರಿಗಳು</displayName>
+				<unitPattern count="one">{0}ಡಿಗ್ರಿ</unitPattern>
+				<unitPattern count="other">{0}ಡಿಗ್ರಿಗಳು</unitPattern>
 			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>ನಿಮಿಷಗಳು</displayName>
@@ -5482,30 +5677,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ಸೆಕೆಂಡ್</unitPattern>
 				<unitPattern count="other">{0} ಸೆಕೆಂಡುಗಳು</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>ಡಿಗ್ರಿಗಳು</displayName>
-				<unitPattern count="one">{0}ಡಿಗ್ರಿ</unitPattern>
-				<unitPattern count="other">{0}ಡಿಗ್ರಿಗಳು</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>ರೇಡಿಯಾನ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ರೇಡಿಯಾನ್‌</unitPattern>
-				<unitPattern count="other">{0} ರೇಡಿಯಾನ್‌ಗಳು</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ಎಕರೆಗಳು</displayName>
-				<unitPattern count="one">{0} ಎಕರೆ</unitPattern>
-				<unitPattern count="other">{0} ಎಕರೆಗಳು</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>ಚದರ ಕಿಲೋಮೀಟರ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಚದರ ಕಿಲೋಮೀಟರ್</unitPattern>
+				<unitPattern count="other">{0} ಚದರ ಕಿಲೋಮೀಟರ್‌ಗಳು</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ಹೆಕ್ಟೇರುಗಳು</displayName>
 				<unitPattern count="one">{0} ಹೆಕ್ಟೇರ್</unitPattern>
 				<unitPattern count="other">{0} ಹೆಕ್ಟೇರುಗಳು</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>ಚದರ ಮೀಟರ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಚದರ ಮೀಟರ್</unitPattern>
+				<unitPattern count="other">{0} ಚದರ ಮೀಟರ್‌ಗಳು</unitPattern>
+				<perUnitPattern>{0} ಚದರ ಮೀಟರ್‌ಗೆ</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>ಚದರ ಸೆಂಟಿಮೀಟರ್‌ಗಳು</displayName>
 				<unitPattern count="one">{0} ಚದರ ಸೆಂಟಿಮೀಟರ್</unitPattern>
 				<unitPattern count="other">{0} ಚದರ ಸೆಂಟಿಮೀಟರ್‌ಗಳು</unitPattern>
+				<perUnitPattern>{0} ಪ್ರತಿ ಚದರ ಸೆಂಟಿಮೀಟರ್‌‌ಗೆ</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>ಚದರ ಮೈಲುಗಳು</displayName>
+				<unitPattern count="one">{0} ಚದರ ಮೈಲು</unitPattern>
+				<unitPattern count="other">{0} ಚದರ ಮೈಲುಗಳು</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ಎಕರೆಗಳು</displayName>
+				<unitPattern count="one">{0} ಎಕರೆ</unitPattern>
+				<unitPattern count="other">{0} ಎಕರೆಗಳು</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>ಚದರ ಗಜಗಳು</displayName>
+				<unitPattern count="one">{0} ಚದರ ಗಜ</unitPattern>
+				<unitPattern count="other">{0} ಚದರ ಗಜಗಳು</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ಚದರಡಿ</displayName>
@@ -5516,91 +5723,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ಚದರ ಅಂಗುಲಗಳು</displayName>
 				<unitPattern count="one">{0} ಚದರ ಅಂಗುಲ</unitPattern>
 				<unitPattern count="other">{0} ಚದರ ಅಂಗುಲಗಳು</unitPattern>
+				<perUnitPattern>{0} ಚದರ ಅಂಗುಲಕ್ಕೆ</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>ಚದರ ಕಿಲೋಮೀಟರ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಚದರ ಕಿಲೋಮೀಟರ್</unitPattern>
-				<unitPattern count="other">{0} ಚದರ ಕಿಲೋಮೀಟರ್‌ಗಳು</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>ಚದರ ಮೀಟರ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಚದರ ಮೀಟರ್</unitPattern>
-				<unitPattern count="other">{0} ಚದರ ಮೀಟರ್‌ಗಳು</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>ಚದರ ಮೈಲುಗಳು</displayName>
-				<unitPattern count="one">{0} ಚದರ ಮೈಲು</unitPattern>
-				<unitPattern count="other">{0} ಚದರ ಮೈಲುಗಳು</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>ಚದರ ಗಜಗಳು</displayName>
-				<unitPattern count="one">{0} ಚದರ ಗಜ</unitPattern>
-				<unitPattern count="other">{0} ಚದರ ಗಜಗಳು</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>ಕಾರಟ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಕಾರಟ್‌</unitPattern>
+				<unitPattern count="other">{0} ಕಾರಟ್‌ಗಳು</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName>ಪ್ರತಿ ಕಿಲೋಮೀಟರ್‌ಗೆ ಲೀಟರ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಪ್ರತಿಕಿಲೋಮೀಟರ್‌ಗೆ ಲೀಟರ್‌</unitPattern>
+				<displayName>ಲೀಟರ್ ಪ್ರತಿ ಕಿಲೋಮೀಟರ್‌ಗೆ</displayName>
+				<unitPattern count="one">{0} ಲೀಟರ್ ಪ್ರತಿ ಕಿಲೋಮೀಟರ್‌ಗೆ</unitPattern>
 				<unitPattern count="other">{0} ಪ್ರತಿ ಕಿಲೋಮೀಟರ್‌‌ಗೆ ಲೀಟರ್‌ಗಳು</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} ಲೀಟರ್‌ಗಳು ಪ್ರತಿ 100 ಕಿಲೋಮೀಟರ್‌ಗಳಿಗೆ</unitPattern>
+				<unitPattern count="other">{0} ಲೀಟರ್‌ಗಳು ಪ್ರತಿ 100 ಕಿಲೋಮೀಟರ್‌ಗಳಿಗೆ</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>ಪ್ರತಿ ಗ್ಯಾಲನ್‌‌ಗೆ ಮೈಲಿಗಳು</displayName>
 				<unitPattern count="one">{0} ಪ್ರತಿ ಗ್ಯಾಲನ್‌‌ಗೆ ಮೈಲಿ</unitPattern>
 				<unitPattern count="other">{0} ಪ್ರತಿ ಗ್ಯಾಲನ್‌ಗೆ ಮೈಲಿಗಳು</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>ಬಿಟ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಬಿಟ್‌</unitPattern>
-				<unitPattern count="other">{0} ಬಿಟ್‍ಗಳು</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>ಬೈಟ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಬೈಟ್‌</unitPattern>
-				<unitPattern count="other">{0} ಬೈಟ್‌ಗಳು</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>ಗಿಗಾಬಿಟ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಗಿಗಾಬಿಟ್‌</unitPattern>
-				<unitPattern count="other">{0} ಗಿಗಾಬಿಟ್‌ಗಳು</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>ಗಿಗಾಬೈಟ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಗಿಗಾಬೈಟ್‌</unitPattern>
-				<unitPattern count="other">{0} ಗಿಗಾಬೈಟ್‌ಗಳು</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>ಕಿಲೋಬಿಟ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಕಿಲೋಬಿಟ್‌</unitPattern>
-				<unitPattern count="other">{0} ಕಿಲೋಬಿಟ್‌ಗಳು</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>ಕಿಲೋಬೈಟ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಕಿಲೋಬೈಟ್‌</unitPattern>
-				<unitPattern count="other">{0} ಕಿಲೋಬೈಟ್‌ಗಳು</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>ಮೆಗಾಬಿಟ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಮೆಗಾಬಿಟ್‌</unitPattern>
-				<unitPattern count="other">{0} ಮೆಗಾಬಿಟ್‌ಗಳು</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>ಮೆಗಾಬೈಟ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಮೆಗಾಬೈಟ್‌</unitPattern>
-				<unitPattern count="other">{0} ಮೆಗಾಬೈಟ್‌ಗಳು</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>ಟೆರಾಬೈಟ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಟೆರಾಬೈಟ್‌</unitPattern>
+				<unitPattern count="other">{0} ಟೆರಾಬೈಟ್‌ಗಳು</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>ಟೆರಾಬಿಟ್‌ಗಳು</displayName>
 				<unitPattern count="one">{0} ಟೆರಾಬಿಟ್‌</unitPattern>
 				<unitPattern count="other">{0} ಟೆರಾಬಿಟ್‌ಗಳು</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>ಟೆರಾಬೈಟ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಟೆರಾಬೈಟ್‌</unitPattern>
-				<unitPattern count="other">{0} ಟೆರಾಬೈಟ್‌ಗಳು</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>ಗಿಗಾಬೈಟ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಗಿಗಾಬೈಟ್‌</unitPattern>
+				<unitPattern count="other">{0} ಗಿಗಾಬೈಟ್‌ಗಳು</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>ಗಿಗಾಬಿಟ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಗಿಗಾಬಿಟ್‌</unitPattern>
+				<unitPattern count="other">{0} ಗಿಗಾಬಿಟ್‌ಗಳು</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>ಮೆಗಾಬೈಟ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಮೆಗಾಬೈಟ್‌</unitPattern>
+				<unitPattern count="other">{0} ಮೆಗಾಬೈಟ್‌ಗಳು</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>ಮೆಗಾಬಿಟ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಮೆಗಾಬಿಟ್‌</unitPattern>
+				<unitPattern count="other">{0} ಮೆಗಾಬಿಟ್‌ಗಳು</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>ಕಿಲೋಬೈಟ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಕಿಲೋಬೈಟ್‌</unitPattern>
+				<unitPattern count="other">{0} ಕಿಲೋಬೈಟ್‌ಗಳು</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>ಕಿಲೋಬಿಟ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಕಿಲೋಬಿಟ್‌</unitPattern>
+				<unitPattern count="other">{0} ಕಿಲೋಬಿಟ್‌ಗಳು</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>ಬೈಟ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಬೈಟ್‌</unitPattern>
+				<unitPattern count="other">{0} ಬೈಟ್‌ಗಳು</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>ಬಿಟ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಬಿಟ್‌</unitPattern>
+				<unitPattern count="other">{0} ಬಿಟ್‍ಗಳು</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>ಶತಮಾನಗಳು</displayName>
+				<unitPattern count="one">{0} ಶತಮಾನ</unitPattern>
+				<unitPattern count="other">{0}ಶತಮಾನಗಳು</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ವರ್ಷಗಳು</displayName>
+				<unitPattern count="one">{0} ವರ್ಷ</unitPattern>
+				<unitPattern count="other">{0} ವರ್ಷಗಳು</unitPattern>
+				<perUnitPattern>{0} ಪ್ರತಿ ವರ್ಷಕ್ಕೆ</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ತಿಂಗಳು</displayName>
+				<unitPattern count="one">{0} ತಿಂಗಳು</unitPattern>
+				<unitPattern count="other">{0} ತಿಂಗಳು</unitPattern>
+				<perUnitPattern>{0} ಪ್ರತಿ ತಿಂಗಳಿಗೆ</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ವಾರಗಳು</displayName>
+				<unitPattern count="one">{0} ವಾರಗಳು</unitPattern>
+				<unitPattern count="other">{0} ವಾರಗಳು</unitPattern>
+				<perUnitPattern>{0} ಪ್ರತಿ ವಾರಕ್ಕೆ</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>ದಿನಗಳು</displayName>
 				<unitPattern count="one">{0} ದಿನ</unitPattern>
 				<unitPattern count="other">{0} ದಿನಗಳು</unitPattern>
+				<perUnitPattern>{0} ಪ್ರತಿ ದಿನಕ್ಕೆ</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>ಗಂಟೆಗಳು</displayName>
@@ -5608,30 +5830,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ಗಂಟೆಗಳು</unitPattern>
 				<perUnitPattern>{0} ಪ್ರತಿ ಗಂಟೆ</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>ಮೈಕ್ರೊಸೆಕೆಂಡುಗಳು</displayName>
-				<unitPattern count="one">{0} ಮೈಕ್ರೊಸೆಕೆಂಡ್</unitPattern>
-				<unitPattern count="other">{0} ಮೈಕ್ರೊಸೆಕೆಂಡುಗಳು</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ಮಿಲಿಸೆಕೆಂಡುಗಳು</displayName>
-				<unitPattern count="one">{0} ಮಿಲಿಸೆಕೆಂಡ್</unitPattern>
-				<unitPattern count="other">{0} ಮಿಲಿಸೆಕೆಂಡುಗಳು</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>ನಿಮಿಷಗಳು</displayName>
 				<unitPattern count="one">{0} ನಿಮಿಷ</unitPattern>
 				<unitPattern count="other">{0} ನಿಮಿಷಗಳು</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>ತಿಂಗಳು</displayName>
-				<unitPattern count="one">{0} ತಿಂಗಳು</unitPattern>
-				<unitPattern count="other">{0} ತಿಂಗಳು</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ನ್ಯಾನೊಸೆಕೆಂಡುಗಳು</displayName>
-				<unitPattern count="one">{0} ನ್ಯಾನೊಸೆಕೆಂಡ್</unitPattern>
-				<unitPattern count="other">{0} ನ್ಯಾನೊಸೆಕೆಂಡುಗಳು</unitPattern>
+				<perUnitPattern>{0} ಪ್ರತಿ ನಿಮಿಷಕ್ಕೆ</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>ಸೆಕೆಂಡುಗಳು</displayName>
@@ -5639,15 +5842,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ಸೆಕೆಂಡುಗಳು</unitPattern>
 				<perUnitPattern>{0} ಪ್ರತಿ ಸೆಕೆಂಡ್</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>ವಾರಗಳು</displayName>
-				<unitPattern count="one">{0} ವಾರಗಳು</unitPattern>
-				<unitPattern count="other">{0} ವಾರಗಳು</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ಮಿಲಿಸೆಕೆಂಡುಗಳು</displayName>
+				<unitPattern count="one">{0} ಮಿಲಿಸೆಕೆಂಡ್</unitPattern>
+				<unitPattern count="other">{0} ಮಿಲಿಸೆಕೆಂಡುಗಳು</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>ವರ್ಷಗಳು</displayName>
-				<unitPattern count="one">{0} ವರ್ಷ</unitPattern>
-				<unitPattern count="other">{0} ವರ್ಷಗಳು</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>ಮೈಕ್ರೊಸೆಕೆಂಡುಗಳು</displayName>
+				<unitPattern count="one">{0} ಮೈಕ್ರೊಸೆಕೆಂಡ್</unitPattern>
+				<unitPattern count="other">{0} ಮೈಕ್ರೊಸೆಕೆಂಡುಗಳು</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ನ್ಯಾನೊಸೆಕೆಂಡುಗಳು</displayName>
+				<unitPattern count="one">{0} ನ್ಯಾನೊಸೆಕೆಂಡ್</unitPattern>
+				<unitPattern count="other">{0} ನ್ಯಾನೊಸೆಕೆಂಡುಗಳು</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ಆಂಪೇರ್‌ಗಳು</displayName>
@@ -5669,6 +5877,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ವೋಲ್ಟ್‌</unitPattern>
 				<unitPattern count="other">{0} ವೋಲ್ಟ್‌ಗಳು</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>ಕಿಲೋಕ್ಯಾಲೋರಿಗಳು</displayName>
+				<unitPattern count="one">{0} ಕಿಲೋಕ್ಯಾಲೋರಿ</unitPattern>
+				<unitPattern count="other">{0} ಕಿಲೋಕ್ಯಾಲೋರಿಗಳು</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>ಕ್ಯಾಲೋರಿಗಳು</displayName>
 				<unitPattern count="one">{0} ಕ್ಯಾಲೋರಿ</unitPattern>
@@ -5679,21 +5892,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ಕ್ಯಾಲೋರಿ</unitPattern>
 				<unitPattern count="other">{0} ಕ್ಯಾಲೋರಿಗಳು</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>ಜೌಲ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಜೌಲ್‌</unitPattern>
-				<unitPattern count="other">{0} ಜೌಲ್‌ಗಳು</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>ಕಿಲೋಕ್ಯಾಲೋರಿಗಳು</displayName>
-				<unitPattern count="one">{0} ಕಿಲೋಕ್ಯಾಲೋರಿ</unitPattern>
-				<unitPattern count="other">{0} ಕಿಲೋಕ್ಯಾಲೋರಿಗಳು</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>ಕಿಲೋಜೌಲ್‌‌ಗಳು</displayName>
 				<unitPattern count="one">{0} ಕಿಲೋಜೌಲ್‌</unitPattern>
 				<unitPattern count="other">{0} ಕಿಲೋಜೌಲ್‌ಗಳು</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>ಜೌಲ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಜೌಲ್‌</unitPattern>
+				<unitPattern count="other">{0} ಜೌಲ್‌ಗಳು</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>ಕಿಲೋವ್ಯಾಟ್‌-ಗಂಟೆಗಳು</displayName>
 				<unitPattern count="one">{0} ಕಿಲೋವ್ಯಾಟ್‌-ಗಂಟೆ</unitPattern>
@@ -5704,201 +5912,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ಗಿಗಾಹರ್ಟ್ಸ್‌</unitPattern>
 				<unitPattern count="other">{0} ಗಿಗಾಹರ್ಟ್ಸ್‌</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>ಹರ್ಟ್ಸ್‌</displayName>
-				<unitPattern count="one">{0} ಹರ್ಟ್ಸ್‌</unitPattern>
-				<unitPattern count="other">{0} ಹರ್ಟ್ಸ್‌</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>ಮೆಗಾಹರ್ಟ್ಸ್</displayName>
+				<unitPattern count="one">{0} ಮೆಗಾಹರ್ಟ್ಸ್</unitPattern>
+				<unitPattern count="other">{0} ಮೆಗಾಹರ್ಟ್ಸ್</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>ಕಿಲೋಹರ್ಟ್ಸ್‌</displayName>
 				<unitPattern count="one">{0} ಕಿಲೋಹರ್ಟ್ಸ್‌</unitPattern>
 				<unitPattern count="other">{0} ಕಿಲೋಹರ್ಟ್ಸ್‌</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>ಮೆಗಾಹರ್ಟ್ಸ್</displayName>
-				<unitPattern count="one">{0} ಮೆಗಾಹರ್ಟ್ಸ್</unitPattern>
-				<unitPattern count="other">{0} ಮೆಗಾಹರ್ಟ್ಸ್</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>ಹರ್ಟ್ಸ್‌</displayName>
+				<unitPattern count="one">{0} ಹರ್ಟ್ಸ್‌</unitPattern>
+				<unitPattern count="other">{0} ಹರ್ಟ್ಸ್‌</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>ಅಸ್ಟ್ರಾನಾಮಿಕಲ್ ಯೂನಿಟ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಅಸ್ಟ್ರಾನಾಮಿಕಲ್ ಯೂನಿಟ್</unitPattern>
-				<unitPattern count="other">{0} ಅಸ್ಟ್ರಾನಾಮಿಕಲ್ ಯೂನಿಟ್‌ಗಳು</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>ಕಿಲೋಮೀಟರ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಕಿಲೋಮೀಟರ್</unitPattern>
+				<unitPattern count="other">{0} ಕಿಲೋಮೀಟರ್‌ಗಳು</unitPattern>
+				<perUnitPattern>{0} ಪ್ರತಿ ಕಿಲೋಮೀಟ‍ರ್‌ಗೆ</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>ಸೆಂಟಿಮೀಟರ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಸೆಂಟಿಮೀಟರ್</unitPattern>
-				<unitPattern count="other">{0} ಸೆಂಟಿಮೀಟರ್‌ಗಳು</unitPattern>
+			<unit type="length-meter">
+				<displayName>ಮೀಟರ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಮೀಟರ್</unitPattern>
+				<unitPattern count="other">{0} ಮೀಟರ್‌ಗಳು</unitPattern>
+				<perUnitPattern>{0} ಪ್ರತಿ ಮೀಟರ್‌ಗೆ</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>ಡೆಸಿಮೀಟರ್‌ಗಳು</displayName>
 				<unitPattern count="one">{0} ಡೆಸಿಮೀಟರ್</unitPattern>
 				<unitPattern count="other">{0} ಡೆಸಿಮೀಟರ್‌ಗಳು</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ಅಡಿ</displayName>
-				<unitPattern count="one">{0} ಅಡಿ</unitPattern>
-				<unitPattern count="other">{0} ಅಡಿ</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>ಅಂಗುಲಗಳು</displayName>
-				<unitPattern count="one">{0} ಅಂಗುಲ</unitPattern>
-				<unitPattern count="other">{0} ಅಂಗುಲಗಳು</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>ಕಿಲೋಮೀಟರ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಕಿಲೋಮೀಟರ್</unitPattern>
-				<unitPattern count="other">{0} ಕಿಲೋಮೀಟರ್‌ಗಳು</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ಬೆಳಕಿನ ವರ್ಷಗಳು</displayName>
-				<unitPattern count="one">{0} ಬೆಳಕಿನ ವರ್ಷ</unitPattern>
-				<unitPattern count="other">{0} ಬೆಳಕಿನ ವರ್ಷಗಳು</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>ಮೀಟರ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಮೀಟರ್</unitPattern>
-				<unitPattern count="other">{0} ಮೀಟರ್‌ಗಳು</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>ಮೈಕ್ರೊಮೀಟರ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಮೈಕ್ರೊಮೀಟರ್</unitPattern>
-				<unitPattern count="other">{0} ಮೈಕ್ರೊಮೀಟರ್‌ಗಳು</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>ಮೈಲುಗಳು</displayName>
-				<unitPattern count="one">{0} ಮೈಲು</unitPattern>
-				<unitPattern count="other">{0} ಮೈಲುಗಳು</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>ಸೆಂಟಿಮೀಟರ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಸೆಂಟಿಮೀಟರ್</unitPattern>
+				<unitPattern count="other">{0} ಸೆಂಟಿಮೀಟರ್‌ಗಳು</unitPattern>
+				<perUnitPattern>{0} ಪ್ರತಿ ಸೆಂಟಿಮೀಟರ್‌ಗೆ</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>ಮಿಲಿಮೀಟರ್‌ಗಳು</displayName>
 				<unitPattern count="one">{0} ಮಿಲಿಮೀಟರ್</unitPattern>
 				<unitPattern count="other">{0} ಮಿಲಿಮೀಟರ್‌ಗಳು</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>ಮೈಕ್ರೊಮೀಟರ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಮೈಕ್ರೊಮೀಟರ್</unitPattern>
+				<unitPattern count="other">{0} ಮೈಕ್ರೊಮೀಟರ್‌ಗಳು</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>ನ್ಯಾನೊಮೀಟರ್‌‌ಗಳು</displayName>
 				<unitPattern count="one">{0} ನ್ಯಾನೊಮೀಟರ್‌</unitPattern>
 				<unitPattern count="other">{0} ನ್ಯಾನೊಮೀಟರ್‌‌ಗಳು</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>ನಾಟಿಕಲ್ ಮೈಲುಗಳು</displayName>
-				<unitPattern count="one">{0} ನಾಟಿಕಲ್ ಮೈಲು</unitPattern>
-				<unitPattern count="other">{0} ನಾಟಿಕಲ್ ಮೈಲುಗಳು</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>ಪಾರ್‌‍ಸೆಕೆಂ</displayName>
-				<unitPattern count="one">{0} ಪಾರ್‌ಸೆಕೆಂ</unitPattern>
-				<unitPattern count="other">{0} ಪಾರ್‌ಸೆಕೆಂ</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>ಪಿಕೋಮೀಟರ್‌ಗಳು</displayName>
 				<unitPattern count="one">{0} ಪಿಕೋಮೀಟರ್</unitPattern>
 				<unitPattern count="other">{0} ಪಿಕೋಮೀಟರ್‌ಗಳು</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>ಮೈಲುಗಳು</displayName>
+				<unitPattern count="one">{0} ಮೈಲು</unitPattern>
+				<unitPattern count="other">{0} ಮೈಲುಗಳು</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>ಗಜಗಳು</displayName>
 				<unitPattern count="one">{0} ಗಜ</unitPattern>
 				<unitPattern count="other">{0} ಗಜಗಳು</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ಅಡಿ</displayName>
+				<unitPattern count="one">{0} ಅಡಿ</unitPattern>
+				<unitPattern count="other">{0} ಅಡಿ</unitPattern>
+				<perUnitPattern>{0} ಪ್ರತಿ ಅಡಿಗೆ</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>ಅಂಗುಲಗಳು</displayName>
+				<unitPattern count="one">{0} ಅಂಗುಲ</unitPattern>
+				<unitPattern count="other">{0} ಅಂಗುಲಗಳು</unitPattern>
+				<perUnitPattern>{0} ಪ್ರತಿ ಅಂಗುಲಕ್ಕೆ</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>ಪಾರ್‌‍ಸೆಕೆಂ</displayName>
+				<unitPattern count="one">{0} ಪಾರ್‌ಸೆಕೆಂ</unitPattern>
+				<unitPattern count="other">{0} ಪಾರ್‌ಸೆಕೆಂ</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ಬೆಳಕಿನ ವರ್ಷಗಳು</displayName>
+				<unitPattern count="one">{0} ಬೆಳಕಿನ ವರ್ಷ</unitPattern>
+				<unitPattern count="other">{0} ಬೆಳಕಿನ ವರ್ಷಗಳು</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ಅಸ್ಟ್ರಾನಾಮಿಕಲ್ ಯೂನಿಟ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಅಸ್ಟ್ರಾನಾಮಿಕಲ್ ಯೂನಿಟ್</unitPattern>
+				<unitPattern count="other">{0} ಅಸ್ಟ್ರಾನಾಮಿಕಲ್ ಯೂನಿಟ್‌ಗಳು</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>ನಾಟಿಕಲ್ ಮೈಲುಗಳು</displayName>
+				<unitPattern count="one">{0} ನಾಟಿಕಲ್ ಮೈಲು</unitPattern>
+				<unitPattern count="other">{0} ನಾಟಿಕಲ್ ಮೈಲುಗಳು</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>ಸ್ಕ್ಯಾಂಡಿನೇವಿಯನ್-ಮೈಲು</displayName>
+				<unitPattern count="one">{0} ಸ್ಕ್ಯಾಂಡಿನೇವಿಯನ್-ಮೈಲು</unitPattern>
+				<unitPattern count="other">{0} ಸ್ಕ್ಯಾಂಡಿನೇವಿಯನ್-ಮೈಲುಗಳು</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>ಲಕ್ಸ್‌‌</displayName>
 				<unitPattern count="one">{0} ಲಕ್ಸ್‌‌</unitPattern>
 				<unitPattern count="other">{0} ಲಕ್ಸ್‌‌</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>ಕ್ಯಾರೆಟ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಕ್ಯಾರೆಟ್‌</unitPattern>
-				<unitPattern count="other">{0} ಕ್ಯಾರೆಟ್‌ಗಳು</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>ಗ್ರಾಂಗಳು</displayName>
-				<unitPattern count="one">{0} ಗ್ರಾಂ</unitPattern>
-				<unitPattern count="other">{0} ಗ್ರಾಂಗಳು</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>ಕಿಲೋಗ್ರಾಂಗಳು</displayName>
-				<unitPattern count="one">{0} ಕಿಲೋಗ್ರಾಂ</unitPattern>
-				<unitPattern count="other">{0} ಕಿಲೋಗ್ರಾಂಗಳು</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>ಮೆಟ್ರಿಕ್‌‌ ಟನ್‌ಗಳು</displayName>
 				<unitPattern count="one">{0} ಮೆಟ್ರಿಕ್‌ ಟನ್‌</unitPattern>
 				<unitPattern count="other">{0} ಮೆಟ್ರಿಕ್‌‌ ಟನ್‌‌ಗಳು</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>ಮೈಕ್ರೋ ಗ್ರಾಂಗಳು</displayName>
-				<unitPattern count="one">{0} ಮೈಕ್ರೋ ಗ್ರಾಂ</unitPattern>
-				<unitPattern count="other">{0} ಮೈಕ್ರೋ ಗ್ರಾಂಗಳು</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>ಕಿಲೋಗ್ರಾಂಗಳು</displayName>
+				<unitPattern count="one">{0} ಕಿಲೋಗ್ರಾಂ</unitPattern>
+				<unitPattern count="other">{0} ಕಿಲೋಗ್ರಾಂಗಳು</unitPattern>
+				<perUnitPattern>{0} ಪ್ರತಿ ಕಿಲೋಗ್ರಾಂಗೆ</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>ಗ್ರಾಂಗಳು</displayName>
+				<unitPattern count="one">{0} ಗ್ರಾಂ</unitPattern>
+				<unitPattern count="other">{0} ಗ್ರಾಂಗಳು</unitPattern>
+				<perUnitPattern>{0} ಪ್ರತಿ ಗ್ರಾಂಗೆ</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>ಮಿಲಿ ಗ್ರಾಂಗಳು</displayName>
 				<unitPattern count="one">{0} ಮಿಲಿ ಗ್ರಾಂ</unitPattern>
 				<unitPattern count="other">{0} ಮಿಲಿ ಗ್ರಾಂಗಳು</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ಔನ್ಸ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಔನ್ಸ್</unitPattern>
-				<unitPattern count="other">{0} ಔನ್ಸ್‌ಗಳು</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ಟ್ರಾಯ್ ಔನ್ಸ್</displayName>
-				<unitPattern count="one">{0} ಟ್ರಾಯ್ ಔನ್ಸ್</unitPattern>
-				<unitPattern count="other">{0} ಟ್ರಾಯ್ ಔನ್ಸ್</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>ಪೌಂಡ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಪೌಂಡ್</unitPattern>
-				<unitPattern count="other">{0} ಪೌಂಡ್‌ಗಳು</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>ಮೈಕ್ರೋ ಗ್ರಾಂಗಳು</displayName>
+				<unitPattern count="one">{0} ಮೈಕ್ರೋ ಗ್ರಾಂ</unitPattern>
+				<unitPattern count="other">{0} ಮೈಕ್ರೋ ಗ್ರಾಂಗಳು</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>ಟನ್‌ಗಳು</displayName>
 				<unitPattern count="one">{0} ಟನ್‌</unitPattern>
 				<unitPattern count="other">{0} ಟನ್‌ಗಳು</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>ಪೌಂಡ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಪೌಂಡ್</unitPattern>
+				<unitPattern count="other">{0} ಪೌಂಡ್‌ಗಳು</unitPattern>
+				<perUnitPattern>{0} ಪ್ರತಿ ಪೌಂಡ್‌ಗೆ</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ಔನ್ಸ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಔನ್ಸ್</unitPattern>
+				<unitPattern count="other">{0} ಔನ್ಸ್‌ಗಳು</unitPattern>
+				<perUnitPattern>{0} ಪ್ರತಿ ಔನ್ಸ್‌ಗೆ</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ಟ್ರಾಯ್ ಔನ್ಸ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಟ್ರಾಯ್ ಔನ್ಸ್</unitPattern>
+				<unitPattern count="other">{0} ಟ್ರಾಯ್ ಔನ್ಸ್‌ಗಳು</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>ಕ್ಯಾರೆಟ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಕ್ಯಾರೆಟ್‌</unitPattern>
+				<unitPattern count="other">{0} ಕ್ಯಾರೆಟ್‌ಗಳು</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>ಗಿಗಾವ್ಯಾಟ್‌ಗಳು</displayName>
 				<unitPattern count="one">{0} ಗಿಗಾವ್ಯಾಟ್‌</unitPattern>
 				<unitPattern count="other">{0} ಗಿಗಾವ್ಯಾಟ್‌ಗಳು</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>ಹಾರ್ಸ್‌ಪವರ್</displayName>
-				<unitPattern count="one">{0} ಹಾರ್ಸ್‌ಪವರ್</unitPattern>
-				<unitPattern count="other">{0} ಹಾರ್ಸ್‌ಪವರ್</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>ಕಿಲೋವ್ಯಾಟ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಕಿಲೋವ್ಯಾಟ್</unitPattern>
-				<unitPattern count="other">{0} ಕಿಲೋವ್ಯಾಟ್‌ಗಳು</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>ಮೆಗಾವ್ಯಾಟ್‌ಗಳು</displayName>
 				<unitPattern count="one">{0} ಮೆಗಾವ್ಯಾಟ್‌</unitPattern>
 				<unitPattern count="other">{0} ಮೆಗಾವ್ಯಾಟ್‌ಗಳು</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>ಮಿಲಿವ್ಯಾಟ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಮಿಲಿವ್ಯಾಟ್‌</unitPattern>
-				<unitPattern count="other">{0} ಮಿಲಿವ್ಯಾಟ್‌ಗಳು</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>ಕಿಲೋವ್ಯಾಟ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಕಿಲೋವ್ಯಾಟ್</unitPattern>
+				<unitPattern count="other">{0} ಕಿಲೋವ್ಯಾಟ್‌ಗಳು</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>ವ್ಯಾಟ್‌ಗಳು</displayName>
 				<unitPattern count="one">{0} ವ್ಯಾಟ್</unitPattern>
 				<unitPattern count="other">{0} ವ್ಯಾಟ್‌ಗಳು</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>ಮಿಲಿವ್ಯಾಟ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಮಿಲಿವ್ಯಾಟ್‌</unitPattern>
+				<unitPattern count="other">{0} ಮಿಲಿವ್ಯಾಟ್‌ಗಳು</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>ಹಾರ್ಸ್‌ಪವರ್</displayName>
+				<unitPattern count="one">{0} ಹಾರ್ಸ್‌ಪವರ್</unitPattern>
+				<unitPattern count="other">{0} ಹಾರ್ಸ್‌ಪವರ್</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>ಹೆಕ್ಟೋಪ್ಯಾಸ್ಕಲ್‌ಗಳು</displayName>
 				<unitPattern count="one">{0} ಹೆಕ್ಟೋಪ್ಯಾಸ್ಕಲ್</unitPattern>
 				<unitPattern count="other">{0} ಹೆಕ್ಟೋಪ್ಯಾಸ್ಕಲ್‌ಗಳು</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>ಮರ್ಕ್ಯುರಿ ಅಂಗುಲಗಳು</displayName>
-				<unitPattern count="one">{0} ಮರ್ಕ್ಯುರಿ ಅಂಗುಲ</unitPattern>
-				<unitPattern count="other">{0} ಮರ್ಕ್ಯುರಿ ಅಂಗುಲಗಳು</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>ಮಿಲಿಬಾರ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಮಿಲಿಬಾರ್</unitPattern>
-				<unitPattern count="other">{0} ಮಿಲಿಬಾರ್‌ಗಳು</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್‌ಗಳು</displayName>
 				<unitPattern count="one">{0} ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್‌</unitPattern>
@@ -5909,26 +6121,41 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ಪ್ರತಿ ಚದರ ಇಂಚಿಗೆ ಪೌಂಡ್‌</unitPattern>
 				<unitPattern count="other">{0} ಪ್ರತಿ ಚದರ ಇಂಚಿಗೆ ಪೌಂಡ್‌ಗಳು</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>ಕಾರಟ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಕಾರಟ್‌</unitPattern>
-				<unitPattern count="other">{0} ಕಾರಟ್‌ಗಳು</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>ಮರ್ಕ್ಯುರಿ ಅಂಗುಲಗಳು</displayName>
+				<unitPattern count="one">{0} ಮರ್ಕ್ಯುರಿ ಅಂಗುಲ</unitPattern>
+				<unitPattern count="other">{0} ಮರ್ಕ್ಯುರಿ ಅಂಗುಲಗಳು</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>ಮಿಲಿಬಾರ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಮಿಲಿಬಾರ್</unitPattern>
+				<unitPattern count="other">{0} ಮಿಲಿಬಾರ್‌ಗಳು</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>ಗಂಟೆಗೆ ಕಿಲೋಮೀಟರ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಗಂಟೆಗೆ ಕಿಲೋಮೀಟರ್</unitPattern>
-				<unitPattern count="other">{0} ಗಂಟೆಗೆ ಕಿಲೋಮೀಟರ್‌ಗಳು</unitPattern>
+				<unitPattern count="one">{0} ಕಿಲೋಮಿಟರ್ ಪ್ರತಿ ಗಂಟೆಗೆ</unitPattern>
+				<unitPattern count="other">{0} ಕಿಲೋಮಿಟರ್‌ಗಳು ಪ್ರತಿ ಗಂಟೆಗೆ</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
-				<displayName>ಪ್ರತಿ ಸೆಕೆಂಡಿಗೆ ಮೀಟರ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಪ್ರತಿ ಸೆಕೆಂಡಿಗೆ ಮೀಟರ್</unitPattern>
-				<unitPattern count="other">{0} ಪ್ರತಿ ಸೆಕೆಂಡಿಗೆ ಮೀಟರ್‌ಗಳು</unitPattern>
+				<displayName>ಮೀಟರ್‌ಗಳು ಪ್ರತಿ ಸೆಕೆಂಡ್‌ಗೆ</displayName>
+				<unitPattern count="one">{0} ಮೀಟರ್‌ ಪ್ರತಿ ಸೆಕೆಂಡ್‌ಗೆ</unitPattern>
+				<unitPattern count="other">{0} ಮೀಟರ್‌ಗಳು ಪ್ರತಿ ಸೆಕೆಂಡ್‌ಗೆ</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<displayName>ಗಂಟೆಗೆ ಮೈಲುಗಳು</displayName>
-				<unitPattern count="one">{0} ಗಂಟೆಗೆ ಮೈಲು</unitPattern>
+				<displayName>ಮೈಲುಗಳು ಪ್ರತಿ ಗಂಟೆಗೆ</displayName>
+				<unitPattern count="one">{0} ಮೈಲು ಪ್ರತಿ ಗಂಟೆಗೆ</unitPattern>
 				<unitPattern count="other">{0} ಗಂಟೆಗೆ ಮೈಲುಗಳು</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>ನಾಟ್</displayName>
+				<unitPattern count="one">{0} ನಾಟ್</unitPattern>
+				<unitPattern count="other">{0} ನಾಟ್‌ಗಳು</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>ಡಿಗ್ರಿ ಸೆಲ್ಶಿಯಸ್</displayName>
 				<unitPattern count="one">{0} ಡಿಗ್ರಿ ಸೆಲ್ಶಿಯಸ್</unitPattern>
@@ -5940,34 +6167,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0}ಡಿಗ್ರಿ ಫ್ಯಾರೆನ್‌ಹಿಟ್</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
-				<displayName>ಕೆಲ್ವಿನ್</displayName>
+				<displayName>ಕೆಲ್ವಿನ್‌ಗಳು</displayName>
 				<unitPattern count="one">{0} ಕೆಲ್ವಿನ್</unitPattern>
-				<unitPattern count="other">{0} ಕೆಲ್ವಿನ್</unitPattern>
-			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ಎಕರೆ-ಅಡಿ</displayName>
-				<unitPattern count="one">{0} ಎಕರೆ-ಅಡಿ</unitPattern>
-				<unitPattern count="other">{0} ಎಕರೆ-ಅಡಿ</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>ಸೆಂಟಿಲೀಟರ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಸೆಂಟಿಲೀಟರ್</unitPattern>
-				<unitPattern count="other">{0} ಸೆಂಟಿಲೀಟರ್‌ಗಳು</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>ಕ್ಯೂಬಿಕ್ ಸೆಂಟಿಮೀಟರ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಕ್ಯೂಬಿಕ್ ಸೆಂಟಿಮೀಟರ್</unitPattern>
-				<unitPattern count="other">{0} ಕ್ಯೂಬಿಕ್ ಸೆಂಟಿಮೀಟರ್‌ಗಳು</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ಘನ ಅಡಿ</displayName>
-				<unitPattern count="one">{0} ಘನ ಅಡಿ</unitPattern>
-				<unitPattern count="other">{0} ಘನ ಅಡಿ</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>ಘನ ಅಂಗುಲಗಳು</displayName>
-				<unitPattern count="one">{0} ಘನ ಅಂಗುಲ</unitPattern>
-				<unitPattern count="other">{0} ಘನ ಅಂಗುಲಗಳು</unitPattern>
+				<unitPattern count="other">{0} ಕೆಲ್ವಿನ್‍ಗಳು</unitPattern>
 			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>ಘನ ಕಿಲೋಮೀಟರ್‌ಗಳು</displayName>
@@ -5978,6 +6180,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ಘನ ಮೀಟರುಗಳು</displayName>
 				<unitPattern count="one">{0} ಘನ ಮೀಟರ್</unitPattern>
 				<unitPattern count="other">{0} ಘನ ಮೀಟರುಗಳು</unitPattern>
+				<perUnitPattern>{0} ಪ್ರತಿ ಘನ ಮೀಟರುಗಳಿಗೆ</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>ಕ್ಯೂಬಿಕ್ ಸೆಂಟಿಮೀಟರ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಕ್ಯೂಬಿಕ್ ಸೆಂಟಿಮೀಟರ್</unitPattern>
+				<unitPattern count="other">{0} ಕ್ಯೂಬಿಕ್ ಸೆಂಟಿಮೀಟರ್‌ಗಳು</unitPattern>
+				<perUnitPattern>{0} ಪ್ರತಿ ಕ್ಯೂಬಿಕ್ ಸೆಂಟಿಮೀಟರ್‌ಗಳಿಗೆ</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>ಘನ ಮೈಲುಗಳು</displayName>
@@ -5989,25 +6198,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ಘನ ಗಜ</unitPattern>
 				<unitPattern count="other">{0} ಘನ ಗಜಗಳು</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>ಕಪ್‍ಗಳು</displayName>
-				<unitPattern count="one">{0} ಕಪ್‍</unitPattern>
-				<unitPattern count="other">{0} ಕಪ್‍ಗಳು</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ಘನ ಅಡಿ</displayName>
+				<unitPattern count="one">{0} ಘನ ಅಡಿ</unitPattern>
+				<unitPattern count="other">{0} ಘನ ಅಡಿ</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>ಡೆಸಿಲೀಟರ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಡೆಸಿಲೀಟರ್‌</unitPattern>
-				<unitPattern count="other">{0} ಡೆಸಿಲೀಟರ್‌‌ಗಳು</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>ಘನ ಅಂಗುಲಗಳು</displayName>
+				<unitPattern count="one">{0} ಘನ ಅಂಗುಲ</unitPattern>
+				<unitPattern count="other">{0} ಘನ ಅಂಗುಲಗಳು</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>ಫ್ಲೂಡ್ ಔನ್ಸ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಫ್ಲೂಡ್ ಔನ್ಸ್‌</unitPattern>
-				<unitPattern count="other">{0} ಫ್ಲೂಡ್ ಔನ್ಸ್‌ಗಳು</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>ಗ್ಯಾಲನ್‌‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಗ್ಯಾಲನ್‌</unitPattern>
-				<unitPattern count="other">{0} ಗ್ಯಾಲನ್‌ಗಳು</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ಮೆಗಾ ಲೀಟರ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಮೆಗಾ ಲೀಟರ್‌</unitPattern>
+				<unitPattern count="other">{0} ಮೆಗಾ ಲೀಟರ್‌‌ಗಳು</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>ಹೆಕ್ಟೋಲೀಟರ್‌ಗಳು</displayName>
@@ -6018,27 +6222,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ಲೀಟರ್‌‌ಗಳು</displayName>
 				<unitPattern count="one">{0} ಲೀಟರ್</unitPattern>
 				<unitPattern count="other">{0} ಲೀಟರ್‌ಗಳು</unitPattern>
+				<perUnitPattern>{0} ಪ್ರತಿ ಲೀಟರ್‌ಗೆ</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ಮೆಗಾ ಲೀಟರ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಮೆಗಾ ಲೀಟರ್‌</unitPattern>
-				<unitPattern count="other">{0} ಮೆಗಾ ಲೀಟರ್‌‌ಗಳು</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>ಡೆಸಿಲೀಟರ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಡೆಸಿಲೀಟರ್‌</unitPattern>
+				<unitPattern count="other">{0} ಡೆಸಿಲೀಟರ್‌‌ಗಳು</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>ಸೆಂಟಿಲೀಟರ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಸೆಂಟಿಲೀಟರ್</unitPattern>
+				<unitPattern count="other">{0} ಸೆಂಟಿಲೀಟರ್‌ಗಳು</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ಮಿಲಿಲೀಟರ್‌ಗಳು</displayName>
 				<unitPattern count="one">{0} ಮಿಲಿಲೀಟರ್</unitPattern>
 				<unitPattern count="other">{0} ಮಿಲಿಲೀಟರ್‌ಗಳು</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>ಪಿಂಟ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಪಿಂಟ್‌</unitPattern>
-				<unitPattern count="other">{0} ಪಿಂಟ್‌ಗಳು</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>ಮೆಟ್ರಿಕ್ ಪಿಂಟ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಮೆಟ್ರಿಕ್ ಪಿಂಟ್</unitPattern>
+				<unitPattern count="other">{0} ಮೆಟ್ರಿಕ್ ಪಿಂಟ್‌ಗಳು</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>ಮೆಟ್ರಿಕ್‌ ಕಪ್‌</displayName>
+				<unitPattern count="one">{0} ಮೆಟ್ರಿಕ್‌ ಕಪ್‌</unitPattern>
+				<unitPattern count="other">{0} ಮೆಟ್ರಿಕ್‌ ಕಪ್‌ಗಳು</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ಎಕರೆ-ಅಡಿ</displayName>
+				<unitPattern count="one">{0} ಎಕರೆ-ಅಡಿ</unitPattern>
+				<unitPattern count="other">{0} ಎಕರೆ-ಅಡಿ</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>ಗ್ಯಾಲನ್‌‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಗ್ಯಾಲನ್‌</unitPattern>
+				<unitPattern count="other">{0} ಗ್ಯಾಲನ್‌ಗಳು</unitPattern>
+				<perUnitPattern>{0} ಪ್ರತಿ ಗ್ಯಾಲನ್‍ಗೆ</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>ಕಾಲುಭಾಗಗಳು</displayName>
 				<unitPattern count="one">{0} ಕಾಲುಭಾಗ</unitPattern>
 				<unitPattern count="other">{0} ಕಾಲುಭಾಗಗಳು</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>ಪಿಂಟ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಪಿಂಟ್‌</unitPattern>
+				<unitPattern count="other">{0} ಪಿಂಟ್‌ಗಳು</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>ಕಪ್‍ಗಳು</displayName>
+				<unitPattern count="one">{0} ಕಪ್‍</unitPattern>
+				<unitPattern count="other">{0} ಕಪ್‍ಗಳು</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>ಫ್ಲೂಡ್ ಔನ್ಸ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಫ್ಲೂಡ್ ಔನ್ಸ್‌</unitPattern>
+				<unitPattern count="other">{0} ಫ್ಲೂಡ್ ಔನ್ಸ್‌ಗಳು</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>ಟೇಬಲ್ ಸ್ಪೂನ್‍ಗಳು</displayName>
 				<unitPattern count="one">{0} ಟೇಬಲ್ ಸ್ಪೂನ್‍</unitPattern>
@@ -6049,6 +6290,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ಟೀ ಸ್ಪೂನ್‍</unitPattern>
 				<unitPattern count="other">{0} ಟೀ ಸ್ಪೂನ್‍ಗಳು</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}ಪೂ</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}ಉ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}ದ</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}ಪ</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -6064,6 +6311,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ಮೀ/ಸೆ²</unitPattern>
 				<unitPattern count="other">{0} ಮೀ/ಸೆ²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>ಕ್ರಾಂ</displayName>
+				<unitPattern count="one">{0} ಕ್ರಾಂ</unitPattern>
+				<unitPattern count="other">{0} ಕ್ರಾಂ</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>ರೇಡಿ.</displayName>
+				<unitPattern count="one">{0} ರೇಡಿ.</unitPattern>
+				<unitPattern count="other">{0} ರೇಡಿ</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>ಡಿಗ್ರಿಗಳು</displayName>
+				<unitPattern count="one">{0} ಡಿ.</unitPattern>
+				<unitPattern count="other">{0} ಡಿ.</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>ನಿ.</displayName>
 				<unitPattern count="one">{0} ನಿ.</unitPattern>
@@ -6074,30 +6336,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ಸೆಕೆಂ</unitPattern>
 				<unitPattern count="other">{0} ಸೆಕೆಂ.ಗಳು</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>ಡಿಗ್ರಿಗಳು</displayName>
-				<unitPattern count="one">{0} ಡಿ.</unitPattern>
-				<unitPattern count="other">{0} ಡಿ.</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>ರೇಡಿ.</displayName>
-				<unitPattern count="one">{0} ರೇಡಿ.</unitPattern>
-				<unitPattern count="other">{0} ರೇಡಿ</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ಎಕರೆಗಳು</displayName>
-				<unitPattern count="one">{0} ಎಕ.</unitPattern>
-				<unitPattern count="other">{0} ಎಕ.</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>ಕಿಮೀ²</displayName>
+				<unitPattern count="one">{0} ಕಿಮೀ²</unitPattern>
+				<unitPattern count="other">{0} ಕಿಮೀ²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ಹೆಕ್ಟೇರುಗಳು</displayName>
 				<unitPattern count="one">{0} ಹೆ.</unitPattern>
 				<unitPattern count="other">{0} ಹೆ.</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>ಚದರ ಮೀಟರ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಮೀ²</unitPattern>
+				<unitPattern count="other">{0} ಮೀ²</unitPattern>
+				<perUnitPattern>{0}/ಮೀ²ಗೆ</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>ಸೆಂ.ಮೀ²</displayName>
 				<unitPattern count="one">{0} ಸೆಂ.ಮೀ²</unitPattern>
 				<unitPattern count="other">{0} ಸೆಂ.ಮೀ²</unitPattern>
+				<perUnitPattern>{0}/ಸೆಂ.ಮೀ²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>ಚದರ ಮೈಲುಗಳು</displayName>
+				<unitPattern count="one">{0} ಚ.ಮೀ.</unitPattern>
+				<unitPattern count="other">{0} ಚ.ಮೀ.</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ಎಕರೆಗಳು</displayName>
+				<unitPattern count="one">{0} ಎಕ.</unitPattern>
+				<unitPattern count="other">{0} ಎಕ.</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>ಗಜಗಳು²</displayName>
+				<unitPattern count="one">{0} ಗ²</unitPattern>
+				<unitPattern count="other">{0} ಗ²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ಚದರಡಿ</displayName>
@@ -6108,139 +6382,140 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ಅಂಗುಲಗಳು²</displayName>
 				<unitPattern count="one">{0} ಅಂ²</unitPattern>
 				<unitPattern count="other">{0} ಅಂ²</unitPattern>
+				<perUnitPattern>{0}/ಅಂ²ಕ್ಕೆ</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>ಕಿಮೀ²</displayName>
-				<unitPattern count="one">{0} ಕಿಮೀ²</unitPattern>
-				<unitPattern count="other">{0} ಕಿಮೀ²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>ಚದರ ಮೀಟರ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಮೀ²</unitPattern>
-				<unitPattern count="other">{0} ಮೀ²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>ಚದರ ಮೈಲುಗಳು</displayName>
-				<unitPattern count="one">{0} ಚ.ಮೀ.</unitPattern>
-				<unitPattern count="other">{0} ಚ.ಮೀ.</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>ಗಜಗಳು²</displayName>
-				<unitPattern count="one">{0} ಗ²</unitPattern>
-				<unitPattern count="other">{0} ಗ²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>ಕಾರ.</displayName>
+				<unitPattern count="one">{0} ಕಾರ.</unitPattern>
+				<unitPattern count="other">{0} ಕಾರ.</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ಲೀ/ಕಿ.ಮೀ</displayName>
 				<unitPattern count="one">{0} ಲೀ/ಕಿ.ಮೀ</unitPattern>
 				<unitPattern count="other">{0} ಲೀ/ಕಿ.ಮೀ</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} ಲೀ/100ಕಿ.ಮೀ</unitPattern>
+				<unitPattern count="other">{0} ಲೀ/100ಕಿ.ಮೀ</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>ಮೈ/ಗ್ಯಾ</displayName>
 				<unitPattern count="one">{0} ಪ್ರ.ಗ್ಯಾ.ಮೈ.</unitPattern>
 				<unitPattern count="other">{0} ಪ್ರ.ಗ್ಯಾ.ಮೈ.</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>ಬಿ.</displayName>
-				<unitPattern count="one">{0} ಬಿ.</unitPattern>
-				<unitPattern count="other">{0} ಬಿ.</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>ಬೈ.</displayName>
-				<unitPattern count="one">{0} ಬೈ.</unitPattern>
-				<unitPattern count="other">{0} ಬೈ.</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>ಗಿ.ಬಿ.</displayName>
-				<unitPattern count="one">{0} ಗಿ.ಬಿ.</unitPattern>
-				<unitPattern count="other">{0} ಗಿ.ಬಿ.</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>ಗಿ.ಬೈ.</displayName>
-				<unitPattern count="one">{0} ಗಿ.ಬೈ.</unitPattern>
-				<unitPattern count="other">{0} ಗಿ.ಬೈ.</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>ಕಿ.ಬಿ.</displayName>
-				<unitPattern count="one">{0} ಕಿ.ಬಿ.</unitPattern>
-				<unitPattern count="other">{0} ಕಿ.ಬಿ.</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>ಕಿ.ಬೈ.</displayName>
-				<unitPattern count="one">{0} ಕಿ.ಬೈ.</unitPattern>
-				<unitPattern count="other">{0} ಕಿ.ಬೈ.</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>ಮೆ.ಬಿ.</displayName>
-				<unitPattern count="one">{0} ಮೆ.ಬಿ.</unitPattern>
-				<unitPattern count="other">{0} ಮೆ.ಬಿ.</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>ಮೆ.ಬೈ.</displayName>
-				<unitPattern count="one">{0} ಮೆ.ಬೈ.</unitPattern>
-				<unitPattern count="other">{0} ಮೆ.ಬೈ.</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>ಟೆ.ಬಿ.</displayName>
-				<unitPattern count="one">{0} ಟೆ.ಬಿ.</unitPattern>
-				<unitPattern count="other">{0} ಟೆ.ಬಿ.</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>ಟೆ.ಬೈ.</displayName>
 				<unitPattern count="one">{0} ಟೆ.ಬೈ.</unitPattern>
 				<unitPattern count="other">{0} ಟೆ.ಬೈ.</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>ಟೆ.ಬಿ.</displayName>
+				<unitPattern count="one">{0} ಟೆ.ಬಿ.</unitPattern>
+				<unitPattern count="other">{0} ಟೆ.ಬಿ.</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>ಗಿ.ಬೈ.</displayName>
+				<unitPattern count="one">{0} ಗಿ.ಬೈ.</unitPattern>
+				<unitPattern count="other">{0} ಗಿ.ಬೈ.</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>ಗಿ.ಬಿ.</displayName>
+				<unitPattern count="one">{0} ಗಿ.ಬಿ.</unitPattern>
+				<unitPattern count="other">{0} ಗಿ.ಬಿ.</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>ಮೆ.ಬೈ.</displayName>
+				<unitPattern count="one">{0} ಮೆ.ಬೈ.</unitPattern>
+				<unitPattern count="other">{0} ಮೆ.ಬೈ.</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>ಮೆ.ಬಿ.</displayName>
+				<unitPattern count="one">{0} ಮೆ.ಬಿ.</unitPattern>
+				<unitPattern count="other">{0} ಮೆ.ಬಿ.</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>ಕಿ.ಬೈ.</displayName>
+				<unitPattern count="one">{0} ಕಿ.ಬೈ.</unitPattern>
+				<unitPattern count="other">{0} ಕಿ.ಬೈ.</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>ಕಿ.ಬಿ.</displayName>
+				<unitPattern count="one">{0} ಕಿ.ಬಿ.</unitPattern>
+				<unitPattern count="other">{0} ಕಿ.ಬಿ.</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>ಬೈ.</displayName>
+				<unitPattern count="one">{0} ಬೈ.</unitPattern>
+				<unitPattern count="other">{0} ಬೈ.</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>ಬಿ.</displayName>
+				<unitPattern count="one">{0} ಬಿ.</unitPattern>
+				<unitPattern count="other">{0} ಬಿ.</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>ಶ</displayName>
+				<unitPattern count="one">{0} ಶ</unitPattern>
+				<unitPattern count="other">{0} ಶ</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ವರ್ಷಗಳು</displayName>
+				<unitPattern count="one">{0} ವರ್ಷ</unitPattern>
+				<unitPattern count="other">{0} ವರ್ಷಗಳು</unitPattern>
+				<perUnitPattern>{0}/ವ</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ತಿಂಗಳು</displayName>
+				<unitPattern count="one">{0} ತಿಂ.</unitPattern>
+				<unitPattern count="other">{0} ತಿಂ.</unitPattern>
+				<perUnitPattern>{0}/ತಿ</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ವಾರಗಳು</displayName>
+				<unitPattern count="one">{0} ವಾರ</unitPattern>
+				<unitPattern count="other">{0} ವಾರಗಳು</unitPattern>
+				<perUnitPattern>{0}/ವಾ</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ದಿನಗಳು</displayName>
 				<unitPattern count="one">{0} ದಿನ</unitPattern>
 				<unitPattern count="other">{0} ದಿನಗಳು</unitPattern>
+				<perUnitPattern>{0}/ದಿ</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>ಗಂಟೆಗಳು</displayName>
 				<unitPattern count="one">{0} ಗಂ.</unitPattern>
 				<unitPattern count="other">{0} ಗಂ.</unitPattern>
-				<perUnitPattern>{0}ph</perUnitPattern>
+				<perUnitPattern>{0}/ಗಂ</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μsecs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
+			<unit type="duration-minute">
+				<displayName>ನಿಮಿಷಗಳು</displayName>
+				<unitPattern count="one">{0} ನಿಮಿ</unitPattern>
+				<unitPattern count="other">{0} ನಿಮಿ</unitPattern>
+				<perUnitPattern>{0}/ನಿಮಿ</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>ಸೆಕೆಂಡುಗಳು</displayName>
+				<unitPattern count="one">{0} ಸೆಕೆಂ</unitPattern>
+				<unitPattern count="other">{0} ಸೆಕೆಂ</unitPattern>
+				<perUnitPattern>{0}/ಸೆ</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>ಮಿಲಿಸೆಕೆಂಡುಗಳು</displayName>
 				<unitPattern count="one">{0} ಮಿ.ಸೆ.</unitPattern>
 				<unitPattern count="other">{0} ಮಿ.ಸೆ.</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>ನಿಮಿಷಗಳು</displayName>
-				<unitPattern count="one">{0} ನಿಮಿ</unitPattern>
-				<unitPattern count="other">{0} ನಿಮಿ</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>ತಿಂಗಳು</displayName>
-				<unitPattern count="one">{0} ತಿಂ.</unitPattern>
-				<unitPattern count="other">{0} ತಿಂ.</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μsecs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>ನ್ಯಾ.ಸೆ</displayName>
 				<unitPattern count="one">{0} ನ್ಯಾ.ಸೆ</unitPattern>
 				<unitPattern count="other">{0} ನ್ಯಾ.ಸೆ</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>ಸೆಕೆಂಡುಗಳು</displayName>
-				<unitPattern count="one">{0} ಸೆಕೆಂ</unitPattern>
-				<unitPattern count="other">{0} ಸೆಕೆಂ</unitPattern>
-				<perUnitPattern>{0}ps</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>ವಾರಗಳು</displayName>
-				<unitPattern count="one">{0} ವಾರ</unitPattern>
-				<unitPattern count="other">{0} ವಾರಗಳು</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>ವರ್ಷಗಳು</displayName>
-				<unitPattern count="one">{0} ವರ್ಷ</unitPattern>
-				<unitPattern count="other">{0} ವರ್ಷಗಳು</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>ಆಂ.</displayName>
 				<unitPattern count="one">{0} ಆಂ.</unitPattern>
@@ -6261,6 +6536,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ವೋ</unitPattern>
 				<unitPattern count="other">{0} ವೋ.</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>ಕಿ.ಕ್ಯಾ</displayName>
+				<unitPattern count="one">{0} ಕಿ.ಕ್ಯಾ</unitPattern>
+				<unitPattern count="other">{0} ಕಿ.ಕ್ಯಾ</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>ಕ್ಯಾಲೊ</displayName>
 				<unitPattern count="one">{0} ಕ್ಯಾಲೊ</unitPattern>
@@ -6271,21 +6551,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ಕ್ಯಾ</unitPattern>
 				<unitPattern count="other">{0} ಕ್ಯಾ</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>ಜೌಲ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಜೌ</unitPattern>
-				<unitPattern count="other">{0} ಜೌ</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>ಕಿ.ಕ್ಯಾ</displayName>
-				<unitPattern count="one">{0} ಕಿ.ಕ್ಯಾ</unitPattern>
-				<unitPattern count="other">{0} ಕಿ.ಕ್ಯಾ</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>ಕಿ.ಜೌ</displayName>
 				<unitPattern count="one">{0} ಕಿ.ಜೌ</unitPattern>
 				<unitPattern count="other">{0} ಕಿ.ಜೌ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>ಜೌಲ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಜೌ</unitPattern>
+				<unitPattern count="other">{0} ಜೌ</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>ಕಿ.ವ್ಯಾ-ಗಂ</displayName>
 				<unitPattern count="one">{0} ಕಿ.ವ್ಯಾ.ಗಂ</unitPattern>
@@ -6296,201 +6571,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ಗಿ.ಹ</unitPattern>
 				<unitPattern count="other">{0} ಗಿ.ಹ</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>ಹರ್ಟ್ಸ್‌</displayName>
-				<unitPattern count="one">{0} ಹರ್ಟ್ಸ್‌</unitPattern>
-				<unitPattern count="other">{0} ಹರ್ಟ್ಸ್‌</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>ಮೆ.ಹ</displayName>
+				<unitPattern count="one">{0} ಮೆ.ಹ</unitPattern>
+				<unitPattern count="other">{0} ಮೆ.ಹ</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>ಕಿ.ಹ</displayName>
 				<unitPattern count="one">{0} ಕಿ.ಹ</unitPattern>
 				<unitPattern count="other">{0} ಕಿ.ಹ</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>ಮೆ.ಹ</displayName>
-				<unitPattern count="one">{0} ಮೆ.ಹ</unitPattern>
-				<unitPattern count="other">{0} ಮೆ.ಹ</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>ಹರ್ಟ್ಸ್‌</displayName>
+				<unitPattern count="one">{0} ಹರ್ಟ್ಸ್‌</unitPattern>
+				<unitPattern count="other">{0} ಹರ್ಟ್ಸ್‌</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>ಅ.ಯೂ</displayName>
-				<unitPattern count="one">{0} ಅ.ಯೂ</unitPattern>
-				<unitPattern count="other">{0} ಅ.ಯೂ</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>ಕಿಲೋಮೀಟರ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಕಿಮೀ</unitPattern>
+				<unitPattern count="other">{0} ಕಿಮೀ</unitPattern>
+				<perUnitPattern>{0}/ಕಿ.ಮೀ</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>ಸೆಮೀ</displayName>
-				<unitPattern count="one">{0} ಸೆಮೀ</unitPattern>
-				<unitPattern count="other">{0} ಸೆಮೀ</unitPattern>
+			<unit type="length-meter">
+				<displayName>ಮೀಟರ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಮೀ</unitPattern>
+				<unitPattern count="other">{0} ಮೀ</unitPattern>
+				<perUnitPattern>{0}/ಮೀ</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>ಡೆಮೀ</displayName>
 				<unitPattern count="one">{0} ಡೆಮೀ</unitPattern>
 				<unitPattern count="other">{0} ಡೆಮೀ</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ಅಡಿ</displayName>
-				<unitPattern count="one">{0} ಅ</unitPattern>
-				<unitPattern count="other">{0} ಅ</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>ಅಂಗುಲಗಳು</displayName>
-				<unitPattern count="one">{0} ಅಂ</unitPattern>
-				<unitPattern count="other">{0} ಅಂ</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>ಕಿಲೋಮೀಟರ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಕಿಮೀ</unitPattern>
-				<unitPattern count="other">{0} ಕಿಮೀ</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ಬೆಳಕಿನ ವರ್ಷ</displayName>
-				<unitPattern count="one">{0} ಬೆ.ವರ್ಷ</unitPattern>
-				<unitPattern count="other">{0} ಬೆ.ವರ್ಷ</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>ಮೀಟರ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಮೀ</unitPattern>
-				<unitPattern count="other">{0} ಮೀ</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µmeters</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>ಮೈಲುಗಳು</displayName>
-				<unitPattern count="one">{0} ಮೈ.</unitPattern>
-				<unitPattern count="other">{0} ಮೈ.</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>ಸೆಮೀ</displayName>
+				<unitPattern count="one">{0} ಸೆಮೀ</unitPattern>
+				<unitPattern count="other">{0} ಸೆಮೀ</unitPattern>
+				<perUnitPattern>{0}/ಸೆಂಮೀ</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>ಮಿಮೀ</displayName>
 				<unitPattern count="one">{0} ಮಿಮೀ</unitPattern>
 				<unitPattern count="other">{0} ಮಿಮೀ</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µmeters</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>ನ್ಯಾ.ಮೀ</displayName>
 				<unitPattern count="one">{0} ನ್ಯಾ.ಮೀ</unitPattern>
 				<unitPattern count="other">{0} ನ್ಯಾ.ಮೀ</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>ನಾ.ಮೈ</displayName>
-				<unitPattern count="one">{0} ನಾ.ಮೈ</unitPattern>
-				<unitPattern count="other">{0} ನಾ.ಮೈ</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>ಪಾರ್‌ಸೆಕೆಂ.ಗಳು</displayName>
-				<unitPattern count="one">{0} ಪಾ.ಸೆ</unitPattern>
-				<unitPattern count="other">{0} ಪಾ.ಸೆ</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>ಪಿ.ಮೀ</displayName>
 				<unitPattern count="one">{0} ಪಿ.ಮೀ</unitPattern>
 				<unitPattern count="other">{0} ಪಿ.ಮೀ</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>ಮೈಲುಗಳು</displayName>
+				<unitPattern count="one">{0} ಮೈ.</unitPattern>
+				<unitPattern count="other">{0} ಮೈ.</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>ಗಜಗಳು</displayName>
 				<unitPattern count="one">{0} ಗ</unitPattern>
 				<unitPattern count="other">{0} ಗ</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ಅಡಿ</displayName>
+				<unitPattern count="one">{0} ಅ</unitPattern>
+				<unitPattern count="other">{0} ಅ</unitPattern>
+				<perUnitPattern>{0}/ಅ</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>ಅಂಗುಲಗಳು</displayName>
+				<unitPattern count="one">{0} ಅಂ</unitPattern>
+				<unitPattern count="other">{0} ಅಂ</unitPattern>
+				<perUnitPattern>{0}/ಅಂ</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>ಪಾರ್‌ಸೆಕೆಂ.ಗಳು</displayName>
+				<unitPattern count="one">{0} ಪಾ.ಸೆ</unitPattern>
+				<unitPattern count="other">{0} ಪಾ.ಸೆ</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ಬೆಳಕಿನ ವರ್ಷಗಳು</displayName>
+				<unitPattern count="one">{0} ಬೆ.ವರ್ಷ</unitPattern>
+				<unitPattern count="other">{0} ಬೆ.ವರ್ಷ</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ಅ.ಯೂ</displayName>
+				<unitPattern count="one">{0} ಅ.ಯೂ</unitPattern>
+				<unitPattern count="other">{0} ಅ.ಯೂ</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>ನಾ.ಮೈ</displayName>
+				<unitPattern count="one">{0} ನಾ.ಮೈ</unitPattern>
+				<unitPattern count="other">{0} ನಾ.ಮೈ</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>ಸ್ಕ್ಯಾಂ.ಮೈ</displayName>
+				<unitPattern count="one">{0} ಸ್ಕ್ಯಾಂ.ಮೈ</unitPattern>
+				<unitPattern count="other">{0} ಸ್ಕ್ಯಾಂ.ಮೈ</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>ಲ.</displayName>
 				<unitPattern count="one">{0} ಲ.</unitPattern>
 				<unitPattern count="other">{0} ಲ.</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>ಕ್ಯಾರೆಟ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಕ್ಯಾರೆ</unitPattern>
-				<unitPattern count="other">{0} ಕ್ಯಾರೆ</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>ಗ್ರಾಂಗಳು</displayName>
-				<unitPattern count="one">{0} ಗ್ರಾ</unitPattern>
-				<unitPattern count="other">{0} ಗ್ರಾ</unitPattern>
+			<unit type="mass-metric-ton">
+				<displayName>ಟ</displayName>
+				<unitPattern count="one">{0} ಮೆಟ್ರಿಕ್‌ ಟನ್‌</unitPattern>
+				<unitPattern count="other">{0} ಮೆಟ್ರಿಕ್‌‌ ಟನ್‌‌ಗಳು</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>ಕೆಜಿ</displayName>
 				<unitPattern count="one">{0} ಕೆಜಿ</unitPattern>
 				<unitPattern count="other">{0} ಕೆಜಿ</unitPattern>
+				<perUnitPattern>{0}/ಕೆಜಿ</perUnitPattern>
 			</unit>
-			<unit type="mass-metric-ton">
-				<displayName>ಮೆಟ್ರಿಕ್‌‌ ಟನ್‌ಗಳು</displayName>
-				<unitPattern count="one">{0} ಮೆಟ್ರಿಕ್‌ ಟನ್‌</unitPattern>
-				<unitPattern count="other">{0} ಮೆಟ್ರಿಕ್‌‌ ಟನ್‌‌ಗಳು</unitPattern>
-			</unit>
-			<unit type="mass-microgram">
-				<displayName>ಮೈ.ಗ್ರಾಂ</displayName>
-				<unitPattern count="one">{0} ಮೈ.ಗ್ರಾಂ</unitPattern>
-				<unitPattern count="other">{0} ಮೈ.ಗ್ರಾಂ</unitPattern>
+			<unit type="mass-gram">
+				<displayName>ಗ್ರಾಂಗಳು</displayName>
+				<unitPattern count="one">{0} ಗ್ರಾ</unitPattern>
+				<unitPattern count="other">{0} ಗ್ರಾ</unitPattern>
+				<perUnitPattern>{0}/ಗ್ರಾ</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>ಮಿ.ಗ್ರಾಂ</displayName>
 				<unitPattern count="one">{0} ಮಿ.ಗ್ರಾಂ</unitPattern>
 				<unitPattern count="other">{0} ಮಿ.ಗ್ರಾಂ</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ಔ</displayName>
-				<unitPattern count="one">{0} ಔ</unitPattern>
-				<unitPattern count="other">{0} ಔ</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ಟ್ರಾ.ಔ</displayName>
-				<unitPattern count="one">{0} ಟ್ರಾ.ಔ</unitPattern>
-				<unitPattern count="other">{0} ಟ್ರಾ.ಔ</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>ಪೌಂ</displayName>
-				<unitPattern count="one">{0} ಪೌಂ</unitPattern>
-				<unitPattern count="other">{0} ಪೌಂ</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>ಮೈ.ಗ್ರಾಂ</displayName>
+				<unitPattern count="one">{0} ಮೈ.ಗ್ರಾಂ</unitPattern>
+				<unitPattern count="other">{0} ಮೈ.ಗ್ರಾಂ</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>ಟನ್‍ಗಳು</displayName>
 				<unitPattern count="one">{0} ಟನ್‌</unitPattern>
 				<unitPattern count="other">{0} ಟನ್‌</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>ಪೌಂ</displayName>
+				<unitPattern count="one">{0} ಪೌಂ</unitPattern>
+				<unitPattern count="other">{0} ಪೌಂ</unitPattern>
+				<perUnitPattern>{0}/ಪೌಂ</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ಔ</displayName>
+				<unitPattern count="one">{0} ಔ</unitPattern>
+				<unitPattern count="other">{0} ಔ</unitPattern>
+				<perUnitPattern>{0}/ ಔ</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ಟ್ರಾ.ಔ</displayName>
+				<unitPattern count="one">{0} ಟ್ರಾ.ಔ</unitPattern>
+				<unitPattern count="other">{0} ಟ್ರಾ.ಔ</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>ಕ್ಯಾರೆಟ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಕ್ಯಾರೆ</unitPattern>
+				<unitPattern count="other">{0} ಕ್ಯಾರೆ</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>ಗಿ.ವ್ಯಾ</displayName>
 				<unitPattern count="one">{0} ಗಿ.ವ್ಯಾ</unitPattern>
 				<unitPattern count="other">{0} ಗಿ.ವ್ಯಾ</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>ಹೆಚ್‌ಪಿ</displayName>
-				<unitPattern count="one">{0} ಹೆಚ್‌ಪಿ</unitPattern>
-				<unitPattern count="other">{0} ಹೆಚ್‌ಪಿ</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>ಕಿ.ವ್ಯಾ</displayName>
-				<unitPattern count="one">{0} ಕಿ.ವ್ಯಾ</unitPattern>
-				<unitPattern count="other">{0} ಕಿ.ವ್ಯಾ</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>ಮೆ.ವ್ಯಾ</displayName>
 				<unitPattern count="one">{0} ಮೆ.ವ್ಯಾ</unitPattern>
 				<unitPattern count="other">{0} ಮೆ.ವ್ಯಾ</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>ಮಿ.ವ್ಯಾ</displayName>
-				<unitPattern count="one">{0} ಮಿ.ವ್ಯಾ</unitPattern>
-				<unitPattern count="other">{0} ಮಿ.ವ್ಯಾ</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>ಕಿ.ವ್ಯಾ</displayName>
+				<unitPattern count="one">{0} ಕಿ.ವ್ಯಾ</unitPattern>
+				<unitPattern count="other">{0} ಕಿ.ವ್ಯಾ</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>ವ್ಯಾಟ್‌ಗಳು</displayName>
 				<unitPattern count="one">{0} ವ್ಯಾ.</unitPattern>
 				<unitPattern count="other">{0} ವ್ಯಾ.</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>ಮಿ.ವ್ಯಾ</displayName>
+				<unitPattern count="one">{0} ಮಿ.ವ್ಯಾ</unitPattern>
+				<unitPattern count="other">{0} ಮಿ.ವ್ಯಾ</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>ಹೆಚ್‌ಪಿ</displayName>
+				<unitPattern count="one">{0} ಹೆಚ್‌ಪಿ</unitPattern>
+				<unitPattern count="other">{0} ಹೆಚ್‌ಪಿ</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>ಹೆ.ಪ್ಯಾ.</displayName>
 				<unitPattern count="one">{0} ಹೆ.ಪ್ಯಾ</unitPattern>
 				<unitPattern count="other">{0} ಹೆ.ಪ್ಯಾ</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>ಮರ್ಕ್ಯು.ಅಂ.</displayName>
-				<unitPattern count="one">{0} ಮರ್ಕ್ಯು. ಅಂ.</unitPattern>
-				<unitPattern count="other">{0} ಮರ್ಕ್ಯು. ಅಂ.</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>ಮಿ.ಬಾರ್‌</displayName>
-				<unitPattern count="one">{0} ಮಿ.ಬಾರ್</unitPattern>
-				<unitPattern count="other">{0} ಮಿ.ಬಾರ್</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>ಮರ್ಕ್ಯು.ಮಿ.ಮೀ.</displayName>
 				<unitPattern count="one">{0} ಮರ್ಕ್ಯು.ಮಿ.ಮೀ.</unitPattern>
@@ -6501,10 +6780,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ಪ್ರ.ಚ.ಇಂ.ಪೌಂ.</unitPattern>
 				<unitPattern count="other">{0} ಪ್ರ.ಚ.ಇಂ.ಪೌಂ.</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>ಕಾರ.</displayName>
-				<unitPattern count="one">{0} ಕಾರ.</unitPattern>
-				<unitPattern count="other">{0} ಕಾರ.</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>ಮರ್ಕ್ಯು.ಅಂ.</displayName>
+				<unitPattern count="one">{0} ಮರ್ಕ್ಯು. ಅಂ.</unitPattern>
+				<unitPattern count="other">{0} ಮರ್ಕ್ಯು. ಅಂ.</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>ಮಿ.ಬಾರ್‌</displayName>
+				<unitPattern count="one">{0} ಮಿ.ಬಾರ್</unitPattern>
+				<unitPattern count="other">{0} ಮಿ.ಬಾರ್</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>ಕಿ.ಮೀ/ಗಂ</displayName>
@@ -6521,6 +6805,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ಮೈ/ಗಂ</unitPattern>
 				<unitPattern count="other">{0} ಮೈ/ಗಂ</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>ನಾ</displayName>
+				<unitPattern count="one">{0} ನಾ</unitPattern>
+				<unitPattern count="other">{0} ನಾ</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>ಡಿ.ಸೆ.</displayName>
 				<unitPattern count="one">{0}°ಸೆ</unitPattern>
@@ -6532,34 +6826,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0}°ಫ್ಯಾ</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
-				<displayName>K</displayName>
-				<unitPattern count="one">{0} K</unitPattern>
-				<unitPattern count="other">{0} K</unitPattern>
-			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ಎಕರೆ ಅಡಿ</displayName>
-				<unitPattern count="one">{0} ಎ. ಅ</unitPattern>
-				<unitPattern count="other">{0} ಎ. ಅ</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>ಸೆಂ.ಲೀ</displayName>
-				<unitPattern count="one">{0} ಸೆಂ.ಲೀ</unitPattern>
-				<unitPattern count="other">{0} ಸೆಂ.ಲೀ</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>ಸೆಮೀ³</displayName>
-				<unitPattern count="one">{0} ಸೆಮೀ³</unitPattern>
-				<unitPattern count="other">{0} ಸೆಮೀ³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ಅಡಿ³</displayName>
-				<unitPattern count="one">{0} ಅಡಿ³</unitPattern>
-				<unitPattern count="other">{0} ಅಡಿ³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>ಅಂಗುಲಗಳು³</displayName>
-				<unitPattern count="one">{0} ಅಂ³</unitPattern>
-				<unitPattern count="other">{0} ಅಂ³</unitPattern>
+				<displayName>ಕೆ</displayName>
+				<unitPattern count="one">{0} ಕೆ</unitPattern>
+				<unitPattern count="other">{0} ಕೆ</unitPattern>
 			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>ಕಿಮೀ³</displayName>
@@ -6570,6 +6839,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ಮೀ³</displayName>
 				<unitPattern count="one">{0} ಮೀ³</unitPattern>
 				<unitPattern count="other">{0} ಮೀ³</unitPattern>
+				<perUnitPattern>{0}/ಮೀ³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>ಸೆಮೀ³</displayName>
+				<unitPattern count="one">{0} ಸೆಮೀ³</unitPattern>
+				<unitPattern count="other">{0} ಸೆಮೀ³</unitPattern>
+				<perUnitPattern>{0}/ಸೆಮೀ³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>ಮೈ³</displayName>
@@ -6581,25 +6857,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ಗಜ³</unitPattern>
 				<unitPattern count="other">{0} ಗಜ³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>ಕಪ್‍ಗಳು</displayName>
-				<unitPattern count="one">{0} ಕ</unitPattern>
-				<unitPattern count="other">{0} ಕ</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ಅಡಿ³</displayName>
+				<unitPattern count="one">{0} ಅಡಿ³</unitPattern>
+				<unitPattern count="other">{0} ಅಡಿ³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>ಡೆ.ಲೀ</displayName>
-				<unitPattern count="one">{0} ಡೆ.ಲೀ</unitPattern>
-				<unitPattern count="other">{0} ಡೆ.ಲೀ</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>ಅಂಗುಲಗಳು³</displayName>
+				<unitPattern count="one">{0} ಅಂ³</unitPattern>
+				<unitPattern count="other">{0} ಅಂ³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>ಫ್ಲೂ.ಔ</displayName>
-				<unitPattern count="one">{0} ಫ್ಲೂ.ಔ</unitPattern>
-				<unitPattern count="other">{0} ಫ್ಲೂ.ಔ</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>ಗ್ಯಾ</displayName>
-				<unitPattern count="one">{0} ಗ್ಯಾ</unitPattern>
-				<unitPattern count="other">{0} ಗ್ಯಾ</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ಮೆ.ಲೀ</displayName>
+				<unitPattern count="one">{0} ಮೆ.ಲೀ</unitPattern>
+				<unitPattern count="other">{0} ಮೆ.ಲೀ</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>ಹೆ.ಲೀ</displayName>
@@ -6610,27 +6881,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ಲೀಟರ್‌ಗಳು</displayName>
 				<unitPattern count="one">{0} ಲೀ</unitPattern>
 				<unitPattern count="other">{0} ಲೀ</unitPattern>
+				<perUnitPattern>{0}/ಲೀ</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ಮೆ.ಲೀ</displayName>
-				<unitPattern count="one">{0} ಮೆ.ಲೀ</unitPattern>
-				<unitPattern count="other">{0} ಮೆ.ಲೀ</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>ಡೆ.ಲೀ</displayName>
+				<unitPattern count="one">{0} ಡೆ.ಲೀ</unitPattern>
+				<unitPattern count="other">{0} ಡೆ.ಲೀ</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>ಸೆಂ.ಲೀ</displayName>
+				<unitPattern count="one">{0} ಸೆಂ.ಲೀ</unitPattern>
+				<unitPattern count="other">{0} ಸೆಂ.ಲೀ</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ಮಿ.ಲೀ</displayName>
 				<unitPattern count="one">{0} ಮಿ.ಲೀ</unitPattern>
 				<unitPattern count="other">{0} ಮಿ.ಲೀ</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>ಪಿಂಟ್‍ಗಳು</displayName>
-				<unitPattern count="one">{0} ಪಿಂಟ್‌</unitPattern>
-				<unitPattern count="other">{0} ಪಿಂಟ್‌</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>ಮೆ.ಪಿಂ</displayName>
+				<unitPattern count="one">{0} ಮೆ.ಪಿಂ</unitPattern>
+				<unitPattern count="other">{0} ಮೆ.ಪಿಂ</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>ಮೆ.ಕಪ್‌</displayName>
+				<unitPattern count="one">{0} ಮೆ.ಕಪ್‌</unitPattern>
+				<unitPattern count="other">{0} ಮೆ.ಕ</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ಎಕರೆ ಅಡಿ</displayName>
+				<unitPattern count="one">{0} ಎ. ಅ</unitPattern>
+				<unitPattern count="other">{0} ಎ. ಅ</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>ಗ್ಯಾ</displayName>
+				<unitPattern count="one">{0} ಗ್ಯಾ</unitPattern>
+				<unitPattern count="other">{0} ಗ್ಯಾ</unitPattern>
+				<perUnitPattern>{0}/ಗ್ಯಾ</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>ಕಾ.ಭಾ</displayName>
 				<unitPattern count="one">{0} ಕಾ.ಭಾ</unitPattern>
 				<unitPattern count="other">{0} ಕಾ.ಭಾ</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>ಪಿಂಟ್‍ಗಳು</displayName>
+				<unitPattern count="one">{0} ಪಿಂಟ್‌</unitPattern>
+				<unitPattern count="other">{0} ಪಿಂಟ್‌</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>ಕಪ್‍ಗಳು</displayName>
+				<unitPattern count="one">{0} ಕ</unitPattern>
+				<unitPattern count="other">{0} ಕ</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>ಫ್ಲೂ.ಔ</displayName>
+				<unitPattern count="one">{0} ಫ್ಲೂ.ಔ</unitPattern>
+				<unitPattern count="other">{0} ಫ್ಲೂ.ಔ</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>ಟೇ.ಸ್ಪೂ</displayName>
 				<unitPattern count="one">{0} ಟೇ.ಸ್ಪೂ</unitPattern>
@@ -6641,6 +6949,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ಟೀ ಸ್ಪೂ</unitPattern>
 				<unitPattern count="other">{0} ಟೀ ಸ್ಪೂ</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}ಪೂ</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}ಉ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}ದ</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}ಪ</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -6650,6 +6964,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}ಜಿ-ಫೋ.</unitPattern>
 				<unitPattern count="other">{0}ಜಿ-ಫೋ.</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}ನಿ.</unitPattern>
 				<unitPattern count="other">{0}ನಿ.</unitPattern>
@@ -6658,26 +6976,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}ಸೆಕೆಂ</unitPattern>
 				<unitPattern count="other">{0}ಸೆಕೆಂ</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} ಎಕ.</unitPattern>
-				<unitPattern count="other">{0} ಎಕ.</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} ಚ.ಕಿಮೀ.</unitPattern>
+				<unitPattern count="other">{0} ಚ.ಕಿಮೀ.</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} ಹೆ.</unitPattern>
 				<unitPattern count="other">{0} ಹೆ.</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0}ಚ.ಅ</unitPattern>
-				<unitPattern count="other">{0}ಚ.ಅ</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} ಚ.ಕಿಮೀ.</unitPattern>
-				<unitPattern count="other">{0} ಚ.ಕಿಮೀ.</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} ಮೀ²</unitPattern>
 				<unitPattern count="other">{0} ಮೀ²</unitPattern>
@@ -6686,6 +6992,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}ಚ.ಮೀ.</unitPattern>
 				<unitPattern count="other">{0}ಚ.ಮೀ.</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} ಎಕ.</unitPattern>
+				<unitPattern count="other">{0} ಎಕ.</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0}ಚ.ಅ</unitPattern>
+				<unitPattern count="other">{0}ಚ.ಅ</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ಲೀ/100ಕಿ.ಮೀ</displayName>
+				<unitPattern count="one">{0}L/100km</unitPattern>
+				<unitPattern count="other">{0}L/100km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ವರ್ಷಗಳು</displayName>
+				<unitPattern count="one">{0}ವ</unitPattern>
+				<unitPattern count="other">{0}ವ</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ತಿಂಗಳು</displayName>
+				<unitPattern count="one">{0}ತಿಂ.</unitPattern>
+				<unitPattern count="other">{0}ತಿಂ.</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ವಾರ</displayName>
+				<unitPattern count="one">{0}ವಾರ</unitPattern>
+				<unitPattern count="other">{0}ವಾರ</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ದಿನ</displayName>
 				<unitPattern count="one">{0}ದಿನ</unitPattern>
@@ -6696,66 +7030,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}ಗಂ.</unitPattern>
 				<unitPattern count="other">{0}ಗಂ.</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ಮಿ.ಸೆ.</displayName>
-				<unitPattern count="one">{0}ಮಿ.ಸೆ.</unitPattern>
-				<unitPattern count="other">{0}ಮಿ.ಸೆ.</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>ನಿಮಿಷ</displayName>
 				<unitPattern count="one">{0}ನಿಮಿ</unitPattern>
 				<unitPattern count="other">{0}ನಿಮಿ</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>ತಿಂಗಳು</displayName>
-				<unitPattern count="one">{0}ತಿಂ.</unitPattern>
-				<unitPattern count="other">{0}ತಿಂ.</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>ಸೆಕೆಂ</displayName>
 				<unitPattern count="one">{0}ಸೆಕೆಂ</unitPattern>
 				<unitPattern count="other">{0} ಸೆಕೆಂ</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>ವಾರ</displayName>
-				<unitPattern count="one">{0}ವಾರ</unitPattern>
-				<unitPattern count="other">{0}ವಾರ</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>ವರ್ಷಗಳು</displayName>
-				<unitPattern count="one">{0}ವ</unitPattern>
-				<unitPattern count="other">{0}ವ</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>ಸೆಮೀ</displayName>
-				<unitPattern count="one">{0} ಸೆಮೀ</unitPattern>
-				<unitPattern count="other">{0} ಸೆಮೀ</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0} ′</unitPattern>
-				<unitPattern count="other">{0} ′</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0} ″</unitPattern>
-				<unitPattern count="other">{0} ″</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ಮಿ.ಸೆ.</displayName>
+				<unitPattern count="one">{0}ಮಿ.ಸೆ.</unitPattern>
+				<unitPattern count="other">{0}ಮಿ.ಸೆ.</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>ಕಿಮೀ</displayName>
 				<unitPattern count="one">{0}ಕಿಮೀ</unitPattern>
 				<unitPattern count="other">{0}ಕಿಮೀ</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0}ಹಗು. ವ.</unitPattern>
-				<unitPattern count="other">{0}ಹಗು. ವ.</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>ಮೀಟರ್‌ಗಳು</displayName>
 				<unitPattern count="one">{0}ಮೀ</unitPattern>
 				<unitPattern count="other">{0}ಮೀ</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0}ಮೈ.</unitPattern>
-				<unitPattern count="other">{0}ಮೈ.</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>ಸೆಮೀ</displayName>
+				<unitPattern count="one">{0} ಸೆಮೀ</unitPattern>
+				<unitPattern count="other">{0} ಸೆಮೀ</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>ಮಿಮೀ</displayName>
@@ -6766,31 +7069,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}ಪಿಎಂ</unitPattern>
 				<unitPattern count="other">{0}ಪಿಎಂ</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0}ಮೈ.</unitPattern>
+				<unitPattern count="other">{0}ಮೈ.</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0}ಗ</unitPattern>
 				<unitPattern count="other">{0} ಗ</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>ಗ್ರಾಂಗಳು</displayName>
-				<unitPattern count="one">{0}ಗ್ರಾ</unitPattern>
-				<unitPattern count="other">{0}ಗ್ರಾ</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} ′</unitPattern>
+				<unitPattern count="other">{0} ′</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} ″</unitPattern>
+				<unitPattern count="other">{0} ″</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0}ಹಗು. ವ.</unitPattern>
+				<unitPattern count="other">{0}ಹಗು. ವ.</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>ಕೆಜಿ</displayName>
 				<unitPattern count="one">{0}ಕೆಜಿ</unitPattern>
 				<unitPattern count="other">{0}ಕೆಜಿ</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0}ಔ</unitPattern>
-				<unitPattern count="other">{0}ಔ</unitPattern>
+			<unit type="mass-gram">
+				<displayName>ಗ್ರಾಂ</displayName>
+				<unitPattern count="one">{0}ಗ್ರಾ</unitPattern>
+				<unitPattern count="other">{0}ಗ್ರಾ</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0}#</unitPattern>
 				<unitPattern count="other">{0}#</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0}ಹೆಚ್‌ಪಿ</unitPattern>
-				<unitPattern count="other">{0}ಹೆಚ್‌ಪಿ</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0}ಔ</unitPattern>
+				<unitPattern count="other">{0}ಔ</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0}ಕಿ.ವ್ಯಾ</unitPattern>
@@ -6800,6 +7115,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}ವ್ಯಾ.</unitPattern>
 				<unitPattern count="other">{0}ವ್ಯಾ.</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0}ಹೆಚ್‌ಪಿ</unitPattern>
+				<unitPattern count="other">{0}ಹೆಚ್‌ಪಿ</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0}ಹೆ.ಪ್ಯಾ</unitPattern>
 				<unitPattern count="other">{0}ಹೆ.ಪ್ಯಾ</unitPattern>
@@ -6847,6 +7166,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}ಲೀ</unitPattern>
 				<unitPattern count="other">{0}ಲೀ</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}ಪೂ</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}ಉ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}ದ</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}ಪ</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kn_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kn_IN.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kn_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kn_IN.xml
index 5e9f7945ef1..189fc9e4fd6 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kn_IN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kn_IN.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="kn"/>
 		<territory type="IN"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ko.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ko.xml
similarity index 88%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ko.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ko.xml
index 69a55df41b9..c61a1269218 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ko.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ko.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="ko"/>
 	</identity>
 	<localeDisplayNames>
@@ -46,15 +45,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="arw">아라와크어</language>
 			<language type="ary" draft="contributed">모로코 아랍어</language>
 			<language type="arz" draft="contributed">이집트 아랍어</language>
-			<language type="as">아샘어</language>
-			<language type="asa" draft="contributed">아수어</language>
+			<language type="as">아삼어</language>
+			<language type="asa">아수어</language>
 			<language type="ast">아스투리아어</language>
 			<language type="av">아바릭어</language>
 			<language type="awa">아와히어</language>
 			<language type="ay">아이마라어</language>
 			<language type="az">아제르바이잔어</language>
 			<language type="az" alt="short" draft="contributed">아제리어</language>
-			<language type="azb" draft="contributed">남아제르바이잔어</language>
 			<language type="ba">바슈키르어</language>
 			<language type="bal">발루치어</language>
 			<language type="ban">발리어</language>
@@ -67,6 +65,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bez" draft="contributed">베나어</language>
 			<language type="bfd" draft="contributed">바푸트어</language>
 			<language type="bg">불가리아어</language>
+			<language type="bgn">서부 발로치어</language>
 			<language type="bho">호즈푸리어</language>
 			<language type="bi">비슬라마어</language>
 			<language type="bik">비콜어</language>
@@ -91,7 +90,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="cad">카도어</language>
 			<language type="car">카리브어</language>
 			<language type="cay" draft="contributed">카유가어</language>
-			<language type="cch">아삼어</language>
+			<language type="cch">앗삼어</language>
 			<language type="ce">체첸어</language>
 			<language type="ceb">세부아노어</language>
 			<language type="cgg" draft="contributed">치가어</language>
@@ -118,20 +117,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="da">덴마크어</language>
 			<language type="dak">다코타어</language>
 			<language type="dar">다르그와어</language>
-			<language type="dav" draft="contributed">타이타어</language>
+			<language type="dav">타이타어</language>
 			<language type="de">독일어</language>
-			<language type="de_CH">고지 독일어 (스위스)</language>
+			<language type="de_CH">고지 독일어(스위스)</language>
 			<language type="del">델라웨어어</language>
 			<language type="den">슬라브어</language>
 			<language type="dgr">도그리브어</language>
 			<language type="din">딩카어</language>
-			<language type="dje" draft="contributed">자르마어</language>
+			<language type="dje">자르마어</language>
 			<language type="doi">도그리어</language>
 			<language type="dsb">저지 소르비아어</language>
-			<language type="dua">드와라어</language>
+			<language type="dua">두알라어</language>
 			<language type="dum">중세 네덜란드어</language>
 			<language type="dv">디베히어</language>
-			<language type="dyo" draft="contributed">졸라 포니어</language>
+			<language type="dyo">졸라 포니어</language>
 			<language type="dyu">드율라어</language>
 			<language type="dz">종카어</language>
 			<language type="dzg" draft="contributed">다장가어</language>
@@ -144,13 +143,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="elx">엘람어</language>
 			<language type="en">영어</language>
 			<language type="en_AU">영어(호주)</language>
-			<language type="en_CA">영어 (캐나다)</language>
-			<language type="en_GB">영어 (영국식)</language>
 			<language type="enm">영어, 중세</language>
 			<language type="eo">에스페란토어</language>
 			<language type="es">스페인어</language>
-			<language type="es_419">중남미 스페인어</language>
-			<language type="es_ES">유럽식 스페인어</language>
 			<language type="et">에스토니아어</language>
 			<language type="eu">바스크어</language>
 			<language type="ewo">이원도어</language>
@@ -164,14 +159,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="fo">페로어</language>
 			<language type="fon">폰어</language>
 			<language type="fr">프랑스어</language>
-			<language type="fr_CA">프랑스어 (캐나다)</language>
-			<language type="fr_CH">프랑스어 (스위스)</language>
 			<language type="frm">중세 프랑스어</language>
 			<language type="fro">고대 프랑스어</language>
 			<language type="frr">북부 프리슬란드어</language>
 			<language type="frs">동부 프리슬란드어</language>
 			<language type="fur">프리우리안어</language>
-			<language type="fy">프리지아어</language>
+			<language type="fy">서프리지아어</language>
 			<language type="ga">아일랜드어</language>
 			<language type="gaa">가어</language>
 			<language type="gag">가가우스어</language>
@@ -194,7 +187,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="grc">그리스어, 고대</language>
 			<language type="gsw">독일어(스위스)</language>
 			<language type="gu">구자라트어</language>
-			<language type="guz" draft="contributed">구시어</language>
+			<language type="guz">구시어</language>
 			<language type="gv">맹크스어</language>
 			<language type="gwi">그위친어</language>
 			<language type="ha">하우사어</language>
@@ -245,25 +238,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="kbd">카바르디어</language>
 			<language type="kbl" draft="contributed">카넴부어</language>
 			<language type="kcg" draft="contributed">티얍어</language>
-			<language type="kde" draft="contributed">마콘데어</language>
+			<language type="kde">마콘데어</language>
 			<language type="kea" draft="contributed">크리올어</language>
 			<language type="kfo">코로어</language>
 			<language type="kg">콩고어</language>
 			<language type="kha">카시어</language>
 			<language type="kho">호탄어</language>
-			<language type="khq" draft="contributed">코이라 친니어</language>
+			<language type="khq">코이라 친니어</language>
 			<language type="khw" draft="contributed">코와르어</language>
 			<language type="ki">키쿠유어</language>
 			<language type="kj">쿠안야마어</language>
 			<language type="kk">카자흐어</language>
 			<language type="kkj" draft="contributed">카코어</language>
 			<language type="kl">그린란드어</language>
-			<language type="kln" draft="contributed">칼렌진어</language>
+			<language type="kln">칼렌진어</language>
 			<language type="km">캄보디아어</language>
 			<language type="kmb">킴분두어</language>
 			<language type="kn">칸나다어</language>
 			<language type="ko">한국어</language>
-			<language type="koi" draft="contributed">코미페르먀크어</language>
+			<language type="koi">코미페르먀크어</language>
 			<language type="kok">코카니어</language>
 			<language type="kos">코스라이엔어</language>
 			<language type="kpe">크펠레어</language>
@@ -272,7 +265,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="krl">카렐리야어</language>
 			<language type="kru">쿠르크어</language>
 			<language type="ks">카슈미르어</language>
-			<language type="ksb" draft="contributed">샴발라어</language>
+			<language type="ksb">샴발라어</language>
 			<language type="ksf" draft="contributed">바피아어</language>
 			<language type="ksh" draft="contributed">콜로그니안어</language>
 			<language type="ku">쿠르드어</language>
@@ -283,7 +276,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ky">키르기스어</language>
 			<language type="la">라틴어</language>
 			<language type="lad">라디노어</language>
-			<language type="lag" draft="contributed">랑기어</language>
+			<language type="lag">랑기어</language>
 			<language type="lah">라한다어</language>
 			<language type="lam">람바어</language>
 			<language type="lb">룩셈부르크어</language>
@@ -296,6 +289,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">라오어</language>
 			<language type="lol">몽구어</language>
 			<language type="loz">로지어</language>
+			<language type="lrc">북부 루리어</language>
 			<language type="lt">리투아니아어</language>
 			<language type="lu">루바-카탄가어</language>
 			<language type="lua">루바-룰루아어</language>
@@ -303,7 +297,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lun">룬다어</language>
 			<language type="luo">루오어</language>
 			<language type="lus">루샤이어</language>
-			<language type="luy" draft="contributed">루야어</language>
+			<language type="luy">루야어</language>
 			<language type="lv">라트비아어</language>
 			<language type="mad">마두라어</language>
 			<language type="maf" draft="contributed">마파어</language>
@@ -316,11 +310,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mdf">모크샤어</language>
 			<language type="mdr">만다르어</language>
 			<language type="men">멘데어</language>
-			<language type="mer" draft="contributed">메루어</language>
-			<language type="mfe" draft="contributed">모리스얀어</language>
+			<language type="mer">메루어</language>
+			<language type="mfe">모리스얀어</language>
 			<language type="mg">말라가시어</language>
 			<language type="mga">아일랜드어, 중세</language>
-			<language type="mgh" draft="contributed">마크후와-메토어</language>
+			<language type="mgh">마크후와-메토어</language>
 			<language type="mgo">메타어</language>
 			<language type="mh">마셜제도어</language>
 			<language type="mi">마오리어</language>
@@ -337,7 +331,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mrj" draft="contributed">서부 마리어</language>
 			<language type="ms">말레이어</language>
 			<language type="mt">몰타어</language>
-			<language type="mua" draft="contributed">문당어</language>
+			<language type="mua">문당어</language>
 			<language type="mul">다중 언어</language>
 			<language type="mus">크리크어</language>
 			<language type="mwl">미란데어</language>
@@ -345,10 +339,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="my">버마어</language>
 			<language type="mye" draft="contributed">미예네어</language>
 			<language type="myv">엘즈야어</language>
-			<language type="mzn" draft="contributed">마잔데라니어</language>
+			<language type="mzn">마잔데라니어</language>
 			<language type="na">나우루어</language>
 			<language type="nap">나폴리어</language>
-			<language type="naq" draft="contributed">나마어</language>
+			<language type="naq">나마어</language>
 			<language type="nb">노르웨이어(보크말)</language>
 			<language type="nd">북부 은데벨레어</language>
 			<language type="nds">저지 독일어</language>
@@ -359,7 +353,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="niu">니웨언어</language>
 			<language type="nl">네덜란드어</language>
 			<language type="nl_BE">플라망어</language>
-			<language type="nmg" draft="contributed">크와시오어</language>
+			<language type="nmg">크와시오어</language>
 			<language type="nn">노르웨이어(니노르스크)</language>
 			<language type="nnh" draft="contributed">느기엠본어</language>
 			<language type="no">노르웨이어</language>
@@ -368,7 +362,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nqo">응코어</language>
 			<language type="nr">남부 은데벨레어</language>
 			<language type="nso">소토어 (북부)</language>
-			<language type="nus" draft="contributed">누에르어</language>
+			<language type="nus">누에르어</language>
 			<language type="nv">나바호어</language>
 			<language type="nwc">네와르어 (고전)</language>
 			<language type="ny">니안자어; 치츄어; 츄어</language>
@@ -398,47 +392,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="pro">고대 프로방스어</language>
 			<language type="ps">파슈토어</language>
 			<language type="pt">포르투갈어</language>
-			<language type="pt_BR">포르투갈어 (브라질)</language>
-			<language type="pt_PT">유럽식 포르투갈어</language>
 			<language type="qu">케추아어</language>
 			<language type="quc">키체어</language>
 			<language type="raj">라자스탄어</language>
 			<language type="rap">라파뉴이</language>
 			<language type="rar">라로통가어</language>
-			<language type="rm">레토로만어</language>
+			<language type="rm">로만시어</language>
 			<language type="rn">룬디어</language>
 			<language type="ro">루마니아어</language>
 			<language type="ro_MD">몰도바어</language>
-			<language type="rof" draft="contributed">롬보어</language>
+			<language type="rof">롬보어</language>
 			<language type="rom">집시어</language>
 			<language type="root">어근</language>
 			<language type="ru">러시아어</language>
 			<language type="rue" draft="contributed">루신어</language>
 			<language type="rup">아로마니아어</language>
 			<language type="rw">르완다어</language>
-			<language type="rwk" draft="contributed">르와어</language>
+			<language type="rwk">르와어</language>
 			<language type="sa">산스크리트어</language>
 			<language type="sad">산다웨어</language>
 			<language type="sah">야큐트어</language>
 			<language type="sam">사마리아 아랍어</language>
-			<language type="saq" draft="contributed">삼부루어</language>
+			<language type="saq">삼부루어</language>
 			<language type="sas">사사크어</language>
 			<language type="sat">산탈리어</language>
 			<language type="sba" draft="contributed">느감바이어</language>
-			<language type="sbp" draft="contributed">상구어</language>
+			<language type="sbp">상구어</language>
 			<language type="sc">사르디니아어</language>
 			<language type="scn">시칠리아어</language>
 			<language type="sco">스코틀랜드어</language>
 			<language type="sd">신디어</language>
+			<language type="sdh">남부 쿠르드어</language>
 			<language type="se">북부 사미어</language>
 			<language type="see" draft="contributed">세네카어</language>
-			<language type="seh" draft="contributed">세나어</language>
+			<language type="seh">세나어</language>
 			<language type="sel">셀쿠프어</language>
-			<language type="ses" draft="contributed">코이야보로 세니어</language>
+			<language type="ses">코이야보로 세니어</language>
 			<language type="sg">산고어</language>
 			<language type="sga">아일랜드, 고대</language>
 			<language type="sh">세르비아-크로아티아어</language>
-			<language type="shi" draft="contributed">타셸히트어</language>
+			<language type="shi">타셸히트어</language>
 			<language type="shn">샨어</language>
 			<language type="shu" draft="contributed">차디언 아라비아어</language>
 			<language type="si">스리랑카어</language>
@@ -467,14 +460,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">수메르어</language>
 			<language type="sv">스웨덴어</language>
 			<language type="sw">스와힐리어</language>
+			<language type="sw_CD">콩고 스와힐리어</language>
 			<language type="swb" draft="contributed">코모로어</language>
-			<language type="swc" draft="contributed">콩고 스와힐리어</language>
 			<language type="syc">시리아어 (고전)</language>
 			<language type="syr">시리아어</language>
 			<language type="ta">타밀어</language>
 			<language type="te">텔루구어</language>
 			<language type="tem">팀니어</language>
-			<language type="teo" draft="contributed">테조어</language>
+			<language type="teo">테조어</language>
 			<language type="ter">테레노어</language>
 			<language type="tet">테툼어</language>
 			<language type="tg">타지크어</language>
@@ -502,10 +495,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="tum">툼부카어</language>
 			<language type="tvl">투발루어</language>
 			<language type="tw">트위어</language>
-			<language type="twq" draft="contributed">타사와크어</language>
+			<language type="twq">타사와크어</language>
 			<language type="ty">타히티어</language>
 			<language type="tyv">투비니안어</language>
-			<language type="tzm" draft="contributed">중앙모로코 타마지트어</language>
+			<language type="tzm">중앙 모로코 타마지트어</language>
 			<language type="udm">우드말트어</language>
 			<language type="ug">위구르어</language>
 			<language type="uga">유가리틱어</language>
@@ -519,16 +512,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="vi">베트남어</language>
 			<language type="vo">볼라퓌크어</language>
 			<language type="vot">보틱어</language>
-			<language type="vun" draft="contributed">분조어</language>
+			<language type="vun">분조어</language>
 			<language type="wa">왈론어</language>
 			<language type="wae" draft="contributed">월저어</language>
 			<language type="wal">와라모어</language>
 			<language type="war">와라이어</language>
 			<language type="was">와쇼어</language>
-			<language type="wo">올로프어</language>
+			<language type="wbp">왈피리어</language>
+			<language type="wo">월로프어</language>
 			<language type="xal">칼미크어</language>
 			<language type="xh">코사어</language>
-			<language type="xog" draft="contributed">소가어</language>
+			<language type="xog">소가어</language>
 			<language type="yao">야오족어</language>
 			<language type="yap">얍페세어</language>
 			<language type="yav" draft="contributed">양본어</language>
@@ -540,10 +534,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="zap">사포테크어</language>
 			<language type="zbl">블리스 심볼</language>
 			<language type="zen">제나가어</language>
-			<language type="zgh" draft="contributed">표준 모로코 타마제크어</language>
+			<language type="zgh">표준 모로코 타마지트어</language>
 			<language type="zh">중국어</language>
-			<language type="zh_Hans">중국어(간체)</language>
-			<language type="zh_Hant">중국어(번체)</language>
 			<language type="zu">줄루어</language>
 			<language type="zun">주니어</language>
 			<language type="zxx">언어 관련 내용 없음</language>
@@ -553,7 +545,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Afak" draft="contributed">아파카 문자</script>
 			<script type="Aghb" draft="contributed">코카시안 알바니아 문자</script>
 			<script type="Arab">아랍 문자</script>
-			<script type="Arab" alt="variant" draft="contributed">페르소-아라비아어</script>
+			<script type="Arab" alt="variant">페르소-아라비아어</script>
 			<script type="Armi" draft="contributed">아랍제국 문자</script>
 			<script type="Armn">아르메니아 문자</script>
 			<script type="Avst" draft="contributed">아베스타 문자</script>
@@ -597,9 +589,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Hang">한글</script>
 			<script type="Hani">한자</script>
 			<script type="Hano">하누누 문자</script>
-			<script type="Hans">한자(간체)</script>
+			<script type="Hans">간체</script>
 			<script type="Hans" alt="stand-alone">한자 간체</script>
-			<script type="Hant">한자(번체)</script>
+			<script type="Hant">번체</script>
 			<script type="Hant" alt="stand-alone">한자 번체</script>
 			<script type="Hebr">히브리 문자</script>
 			<script type="Hira">히라가나</script>
@@ -722,7 +714,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="003">북아메리카</territory>
 			<territory type="005">남아메리카(남미)</territory>
 			<territory type="009">오세아니아</territory>
-			<territory type="011">서아프리카</territory>
+			<territory type="011">서부 아프리카</territory>
 			<territory type="013">중앙 아메리카</territory>
 			<territory type="014">동부 아프리카</territory>
 			<territory type="015">북부 아프리카</territory>
@@ -747,15 +739,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="154">북유럽</territory>
 			<territory type="155">서유럽</territory>
 			<territory type="419">라틴 아메리카</territory>
-			<territory type="AC" draft="contributed">어센션 섬</territory>
+			<territory type="AC">어센션 섬</territory>
 			<territory type="AD">안도라</territory>
-			<territory type="AE">아랍에미리트 연합</territory>
+			<territory type="AE">아랍에미리트</territory>
 			<territory type="AF">아프가니스탄</territory>
 			<territory type="AG">앤티가 바부다</territory>
 			<territory type="AI">앵귈라</territory>
 			<territory type="AL">알바니아</territory>
 			<territory type="AM">아르메니아</territory>
-			<territory type="AN">네덜란드령 안틸레스</territory>
 			<territory type="AO">앙골라</territory>
 			<territory type="AQ">남극 대륙</territory>
 			<territory type="AR">아르헨티나</territory>
@@ -787,7 +778,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BY">벨라루스</territory>
 			<territory type="BZ">벨리즈</territory>
 			<territory type="CA">캐나다</territory>
-			<territory type="CC">코코스제도</territory>
+			<territory type="CC">코코스 제도</territory>
 			<territory type="CD">콩고-킨샤사</territory>
 			<territory type="CD" alt="variant">콩고민주공화국</territory>
 			<territory type="CF">중앙 아프리카 공화국</territory>
@@ -795,7 +786,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CG" alt="variant">콩고 공화국</territory>
 			<territory type="CH">스위스</territory>
 			<territory type="CI">코트디부아르</territory>
-			<territory type="CK">쿡제도</territory>
+			<territory type="CI" alt="variant">아이보리 코스트</territory>
+			<territory type="CK">쿡 제도</territory>
 			<territory type="CL">칠레</territory>
 			<territory type="CM">카메룬</territory>
 			<territory type="CN">중국</territory>
@@ -822,7 +814,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="EH">서사하라</territory>
 			<territory type="ER">에리트리아</territory>
 			<territory type="ES">스페인</territory>
-			<territory type="ET">이디오피아</territory>
+			<territory type="ET">에티오피아</territory>
 			<territory type="EU">유럽 연합</territory>
 			<territory type="FI">핀란드</territory>
 			<territory type="FJ">피지</territory>
@@ -851,7 +843,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GU">괌</territory>
 			<territory type="GW">기니비사우</territory>
 			<territory type="GY">가이아나</territory>
-			<territory type="HK">홍콩, 중국 특별행정구</territory>
+			<territory type="HK">홍콩(중국 특별행정구)</territory>
 			<territory type="HK" alt="short">홍콩</territory>
 			<territory type="HM">허드 맥도널드 제도</territory>
 			<territory type="HN">온두라스</territory>
@@ -882,7 +874,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="KP">조선민주주의인민공화국</territory>
 			<territory type="KR">대한민국</territory>
 			<territory type="KW">쿠웨이트</territory>
-			<territory type="KY">케이맨제도</territory>
+			<territory type="KY">케이맨 제도</territory>
 			<territory type="KZ">카자흐스탄</territory>
 			<territory type="LA">라오스</territory>
 			<territory type="LB">레바논</territory>
@@ -899,15 +891,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="MC">모나코</territory>
 			<territory type="MD">몰도바</territory>
 			<territory type="ME">몬테네그로</territory>
-			<territory type="MF">생 마르탱</territory>
+			<territory type="MF">생마르탱</territory>
 			<territory type="MG">마다가스카르</territory>
-			<territory type="MH">마샬 군도</territory>
+			<territory type="MH">마셜 제도</territory>
 			<territory type="MK">마케도니아</territory>
 			<territory type="MK" alt="variant">마케도니아(FYROM)</territory>
 			<territory type="ML">말리</territory>
 			<territory type="MM">미얀마</territory>
 			<territory type="MN">몽골</territory>
-			<territory type="MO">마카오, 중국 특별행정구</territory>
+			<territory type="MO">마카오(중국 특별행정구)</territory>
 			<territory type="MO" alt="short">마카오</territory>
 			<territory type="MP">북마리아나제도</territory>
 			<territory type="MQ">마르티니크</territory>
@@ -1000,7 +992,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="US" alt="short" draft="contributed">미국</territory>
 			<territory type="UY">우루과이</territory>
 			<territory type="UZ">우즈베키스탄</territory>
-			<territory type="VA">바티칸시국</territory>
+			<territory type="VA">바티칸 시국</territory>
 			<territory type="VC">세인트빈센트그레나딘</territory>
 			<territory type="VE">베네수엘라</territory>
 			<territory type="VG">영국령 버진아일랜드</territory>
@@ -1081,6 +1073,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">숫자 정렬</key>
 			<key type="colStrength" draft="contributed">정렬 강도</key>
 			<key type="currency">통화</key>
+			<key type="hc">시간표시법(12시, 24시)</key>
+			<key type="lb">줄바꿈 스타일</key>
+			<key type="ms">계량법</key>
 			<key type="numbers">숫자</key>
 			<key type="timezone" draft="contributed">시간대</key>
 			<key type="va" draft="contributed">방언</key>
@@ -1088,112 +1083,123 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x" draft="contributed">공개 여부</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">아라비아-인도식 숫자</type>
-			<type type="arabext" key="numbers">확장형 아라비아-인도식 숫자</type>
-			<type type="armn" key="numbers">아르메니아 숫자</type>
-			<type type="armnlow" key="numbers">아르메니아 소문자 숫자</type>
-			<type type="bali" key="numbers" draft="contributed">발리 숫자</type>
-			<type type="beng" key="numbers">뱅골 숫자</type>
-			<type type="big5han" key="collation">중국어 번체 정렬 순서 (Big5)</type>
-			<type type="brah" key="numbers" draft="contributed">브라미 숫자</type>
-			<type type="buddhist" key="calendar">불교력</type>
-			<type type="cakm" key="numbers" draft="contributed">챠크마 숫자</type>
-			<type type="cham" key="numbers" draft="contributed">참 숫자</type>
-			<type type="chinese" key="calendar">중국력</type>
-			<type type="coptic" key="calendar">콥트력</type>
-			<type type="dangi" key="calendar">단기력</type>
-			<type type="deva" key="numbers">데바나가리 숫자</type>
-			<type type="dictionary" key="collation">사전 정렬순</type>
-			<type type="ducet" key="collation">기본 유니코드 정렬 순서</type>
-			<type type="ethi" key="numbers">에티오피아 숫자</type>
-			<type type="ethiopic" key="calendar">에티오피아력</type>
-			<type type="ethiopic-amete-alem" key="calendar">에티오피아 아메테 알렘력</type>
-			<type type="finance" key="numbers" draft="contributed">재무 숫자</type>
-			<type type="fullwide" key="numbers">전체 숫자</type>
-			<type type="gb2312han" key="collation">중국어 간체 정렬 순서 (GB2312)</type>
-			<type type="geor" key="numbers">그루지아 숫자</type>
-			<type type="gregorian" key="calendar">태양력</type>
-			<type type="grek" key="numbers">그리스 숫자</type>
-			<type type="greklow" key="numbers">그리스어 소문자 숫자</type>
-			<type type="gujr" key="numbers">구자라트 숫자</type>
-			<type type="guru" key="numbers">굴묵키 숫자</type>
-			<type type="hanidec" key="numbers">중국어 십진 숫자</type>
-			<type type="hans" key="numbers">중국어 간체 숫자</type>
-			<type type="hansfin" key="numbers">중국어 간체 재무 숫자</type>
-			<type type="hant" key="numbers">중국어 번체 숫자</type>
-			<type type="hantfin" key="numbers">중국어 번체 재무 숫자</type>
-			<type type="hebr" key="numbers">히브리 숫자</type>
-			<type type="hebrew" key="calendar">히브리력</type>
-			<type type="identical" key="colStrength" draft="contributed">모두 정렬</type>
-			<type type="indian" key="calendar">인도력</type>
-			<type type="islamic" key="calendar">이슬람력</type>
-			<type type="islamic-civil" key="calendar">이슬람 상용력</type>
-			<type type="iso8601" key="calendar">ISO-8601 달력</type>
-			<type type="japanese" key="calendar">일본력</type>
-			<type type="java" key="numbers" draft="contributed">자바 숫자</type>
-			<type type="jpan" key="numbers">일본 숫자</type>
-			<type type="jpanfin" key="numbers">일본 재무 숫자</type>
-			<type type="kali" key="numbers" draft="contributed">카야 리식 숫자</type>
-			<type type="khmr" key="numbers">크메르 숫자</type>
-			<type type="knda" key="numbers">칸나다 숫자</type>
-			<type type="lana" key="numbers" draft="contributed">타이 탐 호라 숫자</type>
-			<type type="lanatham" key="numbers" draft="contributed">타이 탐탐 숫자</type>
-			<type type="laoo" key="numbers">라오 숫자</type>
-			<type type="latn" key="numbers">서양 숫자</type>
-			<type type="lepc" key="numbers" draft="contributed">렙차 숫자</type>
-			<type type="limb" key="numbers" draft="contributed">림부 숫자</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">첫 소문자 정렬</type>
-			<type type="mlym" key="numbers">말라얄람 숫자</type>
-			<type type="mong" key="numbers">몽골 숫자</type>
-			<type type="mtei" key="numbers" draft="contributed">메이테이 마옉 숫자</type>
-			<type type="mymr" key="numbers">미얀마 숫자</type>
-			<type type="mymrshan" key="numbers" draft="contributed">미얀마 샨 숫자</type>
-			<type type="native" key="numbers" draft="contributed">기본 숫자</type>
-			<type type="no" key="colBackwards" draft="contributed">악센트 일반 정렬</type>
-			<type type="no" key="colCaseFirst" draft="contributed">일반 대/소문자 정렬 순서</type>
-			<type type="no" key="colCaseLevel" draft="contributed">대/소문자 무시 정렬</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">가나 별도 정렬</type>
-			<type type="no" key="colNormalization" draft="contributed">표준화 없이 정렬</type>
-			<type type="no" key="colNumeric" draft="contributed">숫자별 정렬</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">기호 정렬</type>
-			<type type="olck" key="numbers" draft="contributed">올치키 숫자</type>
-			<type type="orya" key="numbers">오리야 숫자</type>
-			<type type="osma" key="numbers" draft="contributed">오스마냐 숫자</type>
-			<type type="persian" key="calendar">페르시안력</type>
-			<type type="phonebook" key="collation">전화번호부순</type>
-			<type type="phonetic" key="collation" draft="contributed">소리나는 대로 정렬 순서</type>
-			<type type="pinyin" key="collation">병음순</type>
-			<type type="primary" key="colStrength" draft="contributed">기본 문자만 정렬</type>
-			<type type="quaternary" key="colStrength" draft="contributed">악센트/대소문자/전반각/가나 정렬</type>
-			<type type="reformed" key="collation">개정 정렬순</type>
-			<type type="roc" key="calendar">대만력</type>
-			<type type="roman" key="numbers">로마 숫자</type>
-			<type type="romanlow" key="numbers">로마 소문자 숫자</type>
-			<type type="saur" key="numbers" draft="contributed">사우라슈트라 숫자</type>
-			<type type="search" key="collation">범용 검색</type>
-			<type type="searchjl" key="collation" draft="contributed">한글 자음으로 검색</type>
-			<type type="secondary" key="colStrength" draft="contributed">악센트 정렬</type>
-			<type type="shifted" key="colAlternate" draft="contributed">기호 무시 정렬</type>
-			<type type="shrd" key="numbers" draft="contributed">샤라다 숫자</type>
-			<type type="standard" key="collation" draft="contributed">표준 정렬 순서</type>
-			<type type="stroke" key="collation">자획순</type>
-			<type type="sund" key="numbers" draft="contributed">순다 숫자</type>
-			<type type="taml" key="numbers">타밀어 숫자</type>
-			<type type="tamldec" key="numbers" draft="contributed">타밀 숫자</type>
-			<type type="telu" key="numbers">텔루구 숫자</type>
-			<type type="tertiary" key="colStrength" draft="contributed">악센트/대소문자/전반각 정렬</type>
-			<type type="thai" key="numbers">태국 숫자</type>
-			<type type="tibt" key="numbers">티벳 숫자</type>
-			<type type="traditional" key="collation">전통 역법</type>
-			<type type="traditional" key="numbers" draft="contributed">전통적인 숫자</type>
-			<type type="unihan" key="collation">부수순</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">대문자 우선 정렬</type>
-			<type type="vaii" key="numbers" draft="contributed">바이 숫자</type>
-			<type type="yes" key="colBackwards" draft="contributed">악센트 역순 정렬</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">대/소문자 구분 정렬</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">가나를 다르게 정렬</type>
-			<type type="yes" key="colNormalization" draft="contributed">유니코드 표준화 정렬</type>
-			<type type="yes" key="colNumeric" draft="contributed">숫자 정렬</type>
+			<type key="calendar" type="buddhist">불교력</type>
+			<type key="calendar" type="chinese">중국력</type>
+			<type key="calendar" type="coptic">콥트력</type>
+			<type key="calendar" type="dangi">단기력</type>
+			<type key="calendar" type="ethiopic">에티오피아력</type>
+			<type key="calendar" type="ethiopic-amete-alem">에티오피아 아메테 알렘력</type>
+			<type key="calendar" type="gregorian">태양력</type>
+			<type key="calendar" type="hebrew">히브리력</type>
+			<type key="calendar" type="indian">인도력</type>
+			<type key="calendar" type="islamic">이슬람력</type>
+			<type key="calendar" type="islamic-civil">이슬람 상용력</type>
+			<type key="calendar" type="iso8601">ISO-8601 달력</type>
+			<type key="calendar" type="japanese">일본력</type>
+			<type key="calendar" type="persian">페르시안력</type>
+			<type key="calendar" type="roc">대만력</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">기호 정렬</type>
+			<type key="colAlternate" type="shifted" draft="contributed">기호 무시 정렬</type>
+			<type key="colBackwards" type="no" draft="contributed">악센트 일반 정렬</type>
+			<type key="colBackwards" type="yes" draft="contributed">악센트 역순 정렬</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">첫 소문자 정렬</type>
+			<type key="colCaseFirst" type="no" draft="contributed">일반 대/소문자 정렬 순서</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">대문자 우선 정렬</type>
+			<type key="colCaseLevel" type="no" draft="contributed">대/소문자 무시 정렬</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">대/소문자 구분 정렬</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">가나 별도 정렬</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">가나를 다르게 정렬</type>
+			<type key="collation" type="big5han">중국어 번체 정렬 순서 (Big5)</type>
+			<type key="collation" type="dictionary">사전 정렬순</type>
+			<type key="collation" type="ducet">기본 유니코드 정렬 순서</type>
+			<type key="collation" type="gb2312han">중국어 간체 정렬 순서 (GB2312)</type>
+			<type key="collation" type="phonebook">전화번호부순</type>
+			<type key="collation" type="phonetic" draft="contributed">소리나는 대로 정렬 순서</type>
+			<type key="collation" type="pinyin">병음순</type>
+			<type key="collation" type="reformed">개정 정렬순</type>
+			<type key="collation" type="search">범용 검색</type>
+			<type key="collation" type="searchjl" draft="contributed">한글 자음으로 검색</type>
+			<type key="collation" type="standard" draft="contributed">표준 정렬 순서</type>
+			<type key="collation" type="stroke">자획순</type>
+			<type key="collation" type="traditional">전통 역법</type>
+			<type key="collation" type="unihan">부수순</type>
+			<type key="collation" type="zhuyin" draft="contributed">주음순</type>
+			<type key="colNormalization" type="no" draft="contributed">표준화 없이 정렬</type>
+			<type key="colNormalization" type="yes" draft="contributed">유니코드 표준화 정렬</type>
+			<type key="colNumeric" type="no" draft="contributed">숫자별 정렬</type>
+			<type key="colNumeric" type="yes" draft="contributed">숫자 정렬</type>
+			<type key="colStrength" type="identical" draft="contributed">모두 정렬</type>
+			<type key="colStrength" type="primary" draft="contributed">기본 문자만 정렬</type>
+			<type key="colStrength" type="quaternary" draft="contributed">악센트/대소문자/전반각/가나 정렬</type>
+			<type key="colStrength" type="secondary" draft="contributed">악센트 정렬</type>
+			<type key="colStrength" type="tertiary" draft="contributed">악센트/대소문자/전반각 정렬</type>
+			<type key="hc" type="h11">12시간제(0–11)</type>
+			<type key="hc" type="h12">12시간제(1–12)</type>
+			<type key="hc" type="h23">24시간제(0–23)</type>
+			<type key="hc" type="h24">24시간제(1–24)</type>
+			<type key="lb" type="loose">줄바꿈 - 넓게</type>
+			<type key="lb" type="normal">줄바꿈 - 보통</type>
+			<type key="lb" type="strict">줄바꿈 - 좁게</type>
+			<type key="ms" type="metric">미터법</type>
+			<type key="ms" type="uksystem">야드파운드법</type>
+			<type key="ms" type="ussystem">미국 계량법</type>
+			<type key="numbers" type="arab">아라비아-인도식 숫자</type>
+			<type key="numbers" type="arabext">확장형 아라비아-인도식 숫자</type>
+			<type key="numbers" type="armn">아르메니아 숫자</type>
+			<type key="numbers" type="armnlow">아르메니아 소문자 숫자</type>
+			<type key="numbers" type="bali" draft="contributed">발리 숫자</type>
+			<type key="numbers" type="beng">뱅골 숫자</type>
+			<type key="numbers" type="brah" draft="contributed">브라미 숫자</type>
+			<type key="numbers" type="cakm" draft="contributed">챠크마 숫자</type>
+			<type key="numbers" type="cham" draft="contributed">참 숫자</type>
+			<type key="numbers" type="deva">데바나가리 숫자</type>
+			<type key="numbers" type="ethi">에티오피아 숫자</type>
+			<type key="numbers" type="finance" draft="contributed">재무 숫자</type>
+			<type key="numbers" type="fullwide">전체 숫자</type>
+			<type key="numbers" type="geor">그루지아 숫자</type>
+			<type key="numbers" type="grek">그리스 숫자</type>
+			<type key="numbers" type="greklow">그리스어 소문자 숫자</type>
+			<type key="numbers" type="gujr">구자라트 숫자</type>
+			<type key="numbers" type="guru">굴묵키 숫자</type>
+			<type key="numbers" type="hanidec">중국어 십진 숫자</type>
+			<type key="numbers" type="hans">중국어 간체 숫자</type>
+			<type key="numbers" type="hansfin">중국어 간체 재무 숫자</type>
+			<type key="numbers" type="hant">중국어 번체 숫자</type>
+			<type key="numbers" type="hantfin">중국어 번체 재무 숫자</type>
+			<type key="numbers" type="hebr">히브리 숫자</type>
+			<type key="numbers" type="java" draft="contributed">자바 숫자</type>
+			<type key="numbers" type="jpan">일본 숫자</type>
+			<type key="numbers" type="jpanfin">일본 재무 숫자</type>
+			<type key="numbers" type="kali" draft="contributed">카야 리식 숫자</type>
+			<type key="numbers" type="khmr">크메르 숫자</type>
+			<type key="numbers" type="knda">칸나다 숫자</type>
+			<type key="numbers" type="lana" draft="contributed">타이 탐 호라 숫자</type>
+			<type key="numbers" type="lanatham" draft="contributed">타이 탐탐 숫자</type>
+			<type key="numbers" type="laoo">라오 숫자</type>
+			<type key="numbers" type="latn">서양 숫자</type>
+			<type key="numbers" type="lepc" draft="contributed">렙차 숫자</type>
+			<type key="numbers" type="limb" draft="contributed">림부 숫자</type>
+			<type key="numbers" type="mlym">말라얄람 숫자</type>
+			<type key="numbers" type="mong">몽골 숫자</type>
+			<type key="numbers" type="mtei" draft="contributed">메이테이 마옉 숫자</type>
+			<type key="numbers" type="mymr">미얀마 숫자</type>
+			<type key="numbers" type="mymrshan" draft="contributed">미얀마 샨 숫자</type>
+			<type key="numbers" type="native" draft="contributed">기본 숫자</type>
+			<type key="numbers" type="olck" draft="contributed">올치키 숫자</type>
+			<type key="numbers" type="orya">오리야 숫자</type>
+			<type key="numbers" type="osma" draft="contributed">오스마냐 숫자</type>
+			<type key="numbers" type="roman">로마 숫자</type>
+			<type key="numbers" type="romanlow">로마 소문자 숫자</type>
+			<type key="numbers" type="saur" draft="contributed">사우라슈트라 숫자</type>
+			<type key="numbers" type="shrd" draft="contributed">샤라다 숫자</type>
+			<type key="numbers" type="sund" draft="contributed">순다 숫자</type>
+			<type key="numbers" type="taml">타밀어 숫자</type>
+			<type key="numbers" type="tamldec" draft="contributed">타밀 숫자</type>
+			<type key="numbers" type="telu">텔루구 숫자</type>
+			<type key="numbers" type="thai">태국 숫자</type>
+			<type key="numbers" type="tibt">티벳 숫자</type>
+			<type key="numbers" type="traditional" draft="contributed">전통적인 숫자</type>
+			<type key="numbers" type="vaii" draft="contributed">바이 숫자</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">미국 지명위원회(BGN)</transformName>
@@ -1455,6 +1461,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMMd">MMM d일</dateFormatItem>
 						<dateFormatItem id="MMMEd">MMM d일 (E)</dateFormatItem>
 						<dateFormatItem id="MMMEEEEd">MMM d일 EEEE</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d일</dateFormatItem>
 						<dateFormatItem id="y">U년</dateFormatItem>
 						<dateFormatItem id="yMd">U. M. d.</dateFormatItem>
 						<dateFormatItem id="yyyy">U년</dateFormatItem>
@@ -1466,6 +1473,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMMd">U년 MMM d일</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">U년 MMM d일 (E)</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEEEEd">U년 MMM d일 EEEE</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">U년 MMMM</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">U년 QQQ</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">U년 QQQQ</dateFormatItem>
 					</availableFormats>
@@ -1489,6 +1497,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="12" draft="contributed">미스라</month>
 							<month type="13" draft="contributed">나시</month>
 						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">투트</month>
+							<month type="2" draft="contributed">바바흐</month>
+							<month type="3" draft="contributed">하투르</month>
+							<month type="4" draft="contributed">키야흐크</month>
+							<month type="5" draft="contributed">투바흐</month>
+							<month type="6" draft="contributed">암쉬르</month>
+							<month type="7" draft="contributed">바라마트</month>
+							<month type="8" draft="contributed">바라문다흐</month>
+							<month type="9" draft="contributed">바샨스</month>
+							<month type="10" draft="contributed">바우나흐</month>
+							<month type="11" draft="contributed">아비브</month>
+							<month type="12" draft="contributed">미스라</month>
+							<month type="13" draft="contributed">나시</month>
+						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
 						<monthWidth type="abbreviated">
@@ -1649,6 +1672,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 								<cyclicName type="11" draft="contributed">술</cyclicName>
 								<cyclicName type="12" draft="contributed">해</cyclicName>
 							</cyclicNameWidth>
+							<cyclicNameWidth type="wide">
+								<cyclicName type="1" draft="contributed">자</cyclicName>
+								<cyclicName type="2" draft="contributed">축</cyclicName>
+								<cyclicName type="3" draft="contributed">인</cyclicName>
+								<cyclicName type="4" draft="contributed">묘</cyclicName>
+								<cyclicName type="5" draft="contributed">진</cyclicName>
+								<cyclicName type="6" draft="contributed">사</cyclicName>
+								<cyclicName type="7" draft="contributed">오</cyclicName>
+								<cyclicName type="8" draft="contributed">미</cyclicName>
+								<cyclicName type="9" draft="contributed">신</cyclicName>
+								<cyclicName type="10" draft="contributed">유</cyclicName>
+								<cyclicName type="11" draft="contributed">술</cyclicName>
+								<cyclicName type="12" draft="contributed">해</cyclicName>
+							</cyclicNameWidth>
 						</cyclicNameContext>
 					</cyclicNameSet>
 					<cyclicNameSet type="solarTerms">
@@ -1763,6 +1800,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 								<cyclicName type="11" draft="contributed">술</cyclicName>
 								<cyclicName type="12" draft="contributed">해</cyclicName>
 							</cyclicNameWidth>
+							<cyclicNameWidth type="wide">
+								<cyclicName type="1" draft="contributed">자</cyclicName>
+								<cyclicName type="2" draft="contributed">축</cyclicName>
+								<cyclicName type="3" draft="contributed">인</cyclicName>
+								<cyclicName type="4" draft="contributed">묘</cyclicName>
+								<cyclicName type="5" draft="contributed">진</cyclicName>
+								<cyclicName type="6" draft="contributed">사</cyclicName>
+								<cyclicName type="7" draft="contributed">오</cyclicName>
+								<cyclicName type="8" draft="contributed">미</cyclicName>
+								<cyclicName type="9" draft="contributed">신</cyclicName>
+								<cyclicName type="10" draft="contributed">유</cyclicName>
+								<cyclicName type="11" draft="contributed">술</cyclicName>
+								<cyclicName type="12" draft="contributed">해</cyclicName>
+							</cyclicNameWidth>
 						</cyclicNameContext>
 					</cyclicNameSet>
 				</cyclicNameSets>
@@ -1807,6 +1858,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="12" draft="contributed">내하세</month>
 							<month type="13" draft="contributed">파구맨</month>
 						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">매스캐램</month>
+							<month type="2" draft="contributed">테켐트</month>
+							<month type="3" draft="contributed">헤다르</month>
+							<month type="4" draft="contributed">타흐사스</month>
+							<month type="5" draft="contributed">테르</month>
+							<month type="6" draft="contributed">얘카티트</month>
+							<month type="7" draft="contributed">매가비트</month>
+							<month type="8" draft="contributed">미야지야</month>
+							<month type="9" draft="contributed">겐보트</month>
+							<month type="10" draft="contributed">새네</month>
+							<month type="11" draft="contributed">함레</month>
+							<month type="12" draft="contributed">내하세</month>
+							<month type="13" draft="contributed">파구맨</month>
+						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
 						<monthWidth type="abbreviated">
@@ -1888,13 +1954,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d일</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d일 (E)</dateFormatItem>
 						<dateFormatItem id="EEEEd">d일 EEEE</dateFormatItem>
 						<dateFormatItem id="Gy">G y년</dateFormatItem>
-						<dateFormatItem id="GyMMM">G y년 MMM</dateFormatItem>
-						<dateFormatItem id="GyMMMd">G y년 MMM d일</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">G y년 MMM d일 (E)</dateFormatItem>
-						<dateFormatItem id="GyMMMEEEEd">G y년 MMM d일 EEEE</dateFormatItem>
+						<dateFormatItem id="GyMMM">G y년 MMM월</dateFormatItem>
+						<dateFormatItem id="GyMMMd">G y년 MMM월 d일</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y년 MMM월 d일 (E)</dateFormatItem>
+						<dateFormatItem id="GyMMMEEEEd">G y년 MMM월 d일 EEEE</dateFormatItem>
 						<dateFormatItem id="h">a h시</dateFormatItem>
 						<dateFormatItem id="H">H시</dateFormatItem>
 						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
@@ -1907,9 +1974,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MEd">M. d. (E)</dateFormatItem>
 						<dateFormatItem id="MEEEEd">M. d. EEEE</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">MMM d일</dateFormatItem>
-						<dateFormatItem id="MMMEd">MMM d일 (E)</dateFormatItem>
-						<dateFormatItem id="MMMEEEEd">MMM d일 EEEE</dateFormatItem>
+						<dateFormatItem id="MMMd">MMM월 d일</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM월 d일 (E)</dateFormatItem>
+						<dateFormatItem id="MMMEEEEd">MMM월 d일 EEEE</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM월 d일</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">G y년</dateFormatItem>
 						<dateFormatItem id="yyyy">G y년</dateFormatItem>
@@ -1917,10 +1985,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMd">G y. M. d.</dateFormatItem>
 						<dateFormatItem id="yyyyMEd">G y. M. d. (E)</dateFormatItem>
 						<dateFormatItem id="yyyyMEEEEd">G y. M. d. EEEE</dateFormatItem>
-						<dateFormatItem id="yyyyMMM">G y년 MMM</dateFormatItem>
-						<dateFormatItem id="yyyyMMMd">G y년 MMM d일</dateFormatItem>
-						<dateFormatItem id="yyyyMMMEd">G y년 MMM d일 (E)</dateFormatItem>
-						<dateFormatItem id="yyyyMMMEEEEd">G y년 MMM d일 EEEE</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">G y년 MMM월</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">G y년 MMM월 d일</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y년 MMM월 d일 (E)</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEEEEd">G y년 MMM월 d일 EEEE</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y년 MMMM월</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">G y년 QQQ</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">G y년 QQQQ</dateFormatItem>
 					</availableFormats>
@@ -1988,7 +2057,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">M월 d일 EEEE ~ M월 d일 EEEE</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL–LLLL</greatestDifference>
+							<greatestDifference id="M">LLLL ~ LLLL</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
 							<greatestDifference id="y">G y년 ~ y년</greatestDifference>
@@ -2246,28 +2315,88 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">오전</dayPeriod>
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">자정</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
 							<dayPeriod type="noon">정오</dayPeriod>
-							<dayPeriod type="pm">오후</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">새벽</dayPeriod>
+							<dayPeriod type="morning2">오전</dayPeriod>
+							<dayPeriod type="afternoon1">오후</dayPeriod>
+							<dayPeriod type="evening1">저녁</dayPeriod>
+							<dayPeriod type="night1">밤</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">자정</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">정오</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">새벽</dayPeriod>
+							<dayPeriod type="morning2">오전</dayPeriod>
+							<dayPeriod type="afternoon1">오후</dayPeriod>
+							<dayPeriod type="evening1">저녁</dayPeriod>
+							<dayPeriod type="night1">밤</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">자정</dayPeriod>
 							<dayPeriod type="am">오전</dayPeriod>
 							<dayPeriod type="noon">정오</dayPeriod>
 							<dayPeriod type="pm">오후</dayPeriod>
+							<dayPeriod type="morning1">새벽</dayPeriod>
+							<dayPeriod type="morning2">오전</dayPeriod>
+							<dayPeriod type="afternoon1">오후</dayPeriod>
+							<dayPeriod type="evening1">저녁</dayPeriod>
+							<dayPeriod type="night1">밤</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">자정</dayPeriod>
+							<dayPeriod type="am">오전</dayPeriod>
+							<dayPeriod type="noon">정오</dayPeriod>
+							<dayPeriod type="pm">오후</dayPeriod>
+							<dayPeriod type="morning1">새벽</dayPeriod>
+							<dayPeriod type="morning2">오전</dayPeriod>
+							<dayPeriod type="afternoon1">오후</dayPeriod>
+							<dayPeriod type="evening1">저녁</dayPeriod>
+							<dayPeriod type="night1">밤</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">자정</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">정오</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">새벽</dayPeriod>
+							<dayPeriod type="morning2">오전</dayPeriod>
+							<dayPeriod type="afternoon1">오후</dayPeriod>
+							<dayPeriod type="evening1">저녁</dayPeriod>
+							<dayPeriod type="night1">밤</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">자정</dayPeriod>
+							<dayPeriod type="am">오전</dayPeriod>
+							<dayPeriod type="noon">정오</dayPeriod>
+							<dayPeriod type="pm">오후</dayPeriod>
+							<dayPeriod type="morning1">새벽</dayPeriod>
+							<dayPeriod type="morning2">오전</dayPeriod>
+							<dayPeriod type="afternoon1">오후</dayPeriod>
+							<dayPeriod type="evening1">저녁</dayPeriod>
+							<dayPeriod type="night1">밤</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
-						<era type="0">기원전</era>
-						<era type="1">서기</era>
-					</eraNames>
-					<eraAbbr>
 						<era type="0">기원전</era>
 						<era type="0" alt="variant">BCE</era>
 						<era type="1">서기</era>
 						<era type="1" alt="variant">CE</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">BC</era>
+						<era type="0" alt="variant">BCE</era>
+						<era type="1">AD</era>
+						<era type="1" alt="variant">CE</era>
 					</eraAbbr>
 				</eras>
 				<dateFormats>
@@ -2368,6 +2497,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMMd">MMM d일</dateFormatItem>
 						<dateFormatItem id="MMMEd">MMM d일 (E)</dateFormatItem>
 						<dateFormatItem id="MMMEEEEd">MMM d일 EEEE</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d일</dateFormatItem>
 						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y년</dateFormatItem>
@@ -2380,11 +2510,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yMMMd">y년 MMM d일</dateFormatItem>
 						<dateFormatItem id="yMMMEd">y년 MMM d일 (E)</dateFormatItem>
 						<dateFormatItem id="yMMMEEEEd">y년 MMM d일 EEEE</dateFormatItem>
+						<dateFormatItem id="yMMMM">y년 MMMM</dateFormatItem>
 						<dateFormatItem id="yQQQ">y년 QQQ</dateFormatItem>
 						<dateFormatItem id="yQQQQ">y년 QQQQ</dateFormatItem>
 					</availableFormats>
 					<appendItems>
-						<appendItem request="Timezone" draft="contributed">{0} {1}</appendItem>
+						<appendItem request="Timezone">{0} {1}</appendItem>
 					</appendItems>
 					<intervalFormats>
 						<intervalFormatFallback>{0} ~ {1}</intervalFormatFallback>
@@ -2510,6 +2641,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="12" draft="contributed">압월</month>
 							<month type="13" draft="contributed">엘룰월</month>
 						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">디스리월</month>
+							<month type="2" draft="contributed">말케스월</month>
+							<month type="3" draft="contributed">기슬르월</month>
+							<month type="4" draft="contributed">데벳월</month>
+							<month type="5" draft="contributed">스밧월</month>
+							<month type="6" draft="contributed">아달월 1</month>
+							<month type="7" draft="contributed">아달월</month>
+							<month type="7" yeartype="leap" draft="contributed">아달월 2</month>
+							<month type="8" draft="contributed">닛산월</month>
+							<month type="9" draft="contributed">이야르월</month>
+							<month type="10" draft="contributed">시완월</month>
+							<month type="11" draft="contributed">담무르월</month>
+							<month type="12" draft="contributed">압월</month>
+							<month type="13" draft="contributed">엘룰월</month>
+						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
 						<monthWidth type="abbreviated">
@@ -2553,6 +2700,40 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</eras>
 			</calendar>
 			<calendar type="islamic">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">무하람</month>
+							<month type="2" draft="contributed">사파르</month>
+							<month type="3" draft="contributed">라비 알 아왈</month>
+							<month type="4" draft="contributed">라비 알 쎄니</month>
+							<month type="5" draft="contributed">주마다 알 아왈</month>
+							<month type="6" draft="contributed">주마다 알 쎄니</month>
+							<month type="7" draft="contributed">라잡</month>
+							<month type="8" draft="contributed">쉐아반</month>
+							<month type="9" draft="contributed">라마단</month>
+							<month type="10" draft="contributed">쉐왈</month>
+							<month type="11" draft="contributed">듀 알 까다</month>
+							<month type="12" draft="contributed">듀 알 히자</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">무하람</month>
+							<month type="2" draft="contributed">사파르</month>
+							<month type="3" draft="contributed">라비 알 아왈</month>
+							<month type="4" draft="contributed">라비 알 쎄니</month>
+							<month type="5" draft="contributed">주마다 알 아왈</month>
+							<month type="6" draft="contributed">주마다 알 쎄니</month>
+							<month type="7" draft="contributed">라잡</month>
+							<month type="8" draft="contributed">쉐아반</month>
+							<month type="9" draft="contributed">라마단</month>
+							<month type="10" draft="contributed">쉐왈</month>
+							<month type="11" draft="contributed">듀 알 까다</month>
+							<month type="12" draft="contributed">듀 알 히자</month>
+						</monthWidth>
+					</monthContext>
+				</months>
 				<eras>
 					<eraAbbr>
 						<era type="0">AH</era>
@@ -2802,6 +2983,70 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</eraAbbr>
 				</eras>
 			</calendar>
+			<calendar type="persian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">화르바딘</month>
+							<month type="2" draft="contributed">오르디베헤쉬트</month>
+							<month type="3" draft="contributed">호르다드</month>
+							<month type="4" draft="contributed">티르</month>
+							<month type="5" draft="contributed">모르다드</month>
+							<month type="6" draft="contributed">샤흐리바르</month>
+							<month type="7" draft="contributed">메흐르</month>
+							<month type="8" draft="contributed">아반</month>
+							<month type="9" draft="contributed">아자르</month>
+							<month type="10" draft="contributed">다이</month>
+							<month type="11" draft="contributed">바흐만</month>
+							<month type="12" draft="contributed">에스판드</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">화르바딘</month>
+							<month type="2" draft="contributed">오르디베헤쉬트</month>
+							<month type="3" draft="contributed">호르다드</month>
+							<month type="4" draft="contributed">티르</month>
+							<month type="5" draft="contributed">모르다드</month>
+							<month type="6" draft="contributed">샤흐리바르</month>
+							<month type="7" draft="contributed">메흐르</month>
+							<month type="8" draft="contributed">아반</month>
+							<month type="9" draft="contributed">아자르</month>
+							<month type="10" draft="contributed">다이</month>
+							<month type="11" draft="contributed">바흐만</month>
+							<month type="12" draft="contributed">에스판드</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">화르바딘</month>
+							<month type="2" draft="contributed">오르디베헤쉬트</month>
+							<month type="3" draft="contributed">호르다드</month>
+							<month type="4" draft="contributed">티르</month>
+							<month type="5" draft="contributed">모르다드</month>
+							<month type="6" draft="contributed">샤흐리바르</month>
+							<month type="7" draft="contributed">메흐르</month>
+							<month type="8" draft="contributed">아반</month>
+							<month type="9" draft="contributed">아자르</month>
+							<month type="10" draft="contributed">다이</month>
+							<month type="11" draft="contributed">바흐만</month>
+							<month type="12" draft="contributed">에스판드</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">화르바딘</month>
+							<month type="2" draft="contributed">오르디베헤쉬트</month>
+							<month type="3" draft="contributed">호르다드</month>
+							<month type="4" draft="contributed">티르</month>
+							<month type="5" draft="contributed">모르다드</month>
+							<month type="6" draft="contributed">샤흐리바르</month>
+							<month type="7" draft="contributed">메흐르</month>
+							<month type="8" draft="contributed">아반</month>
+							<month type="9" draft="contributed">아자르</month>
+							<month type="10" draft="contributed">다이</month>
+							<month type="11" draft="contributed">바흐만</month>
+							<month type="12" draft="contributed">에스판드</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+			</calendar>
 			<calendar type="roc">
 				<eras>
 					<eraAbbr>
@@ -2818,8 +3063,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="year">
 				<displayName>년</displayName>
 				<relative type="-1">작년</relative>
-				<relative type="0" draft="contributed">올해</relative>
-				<relative type="1" draft="contributed">내년</relative>
+				<relative type="0">올해</relative>
+				<relative type="1">내년</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">{0}년 후</relativeTimePattern>
 				</relativeTime>
@@ -3645,7 +3890,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</zone>
 			<zone type="Europe/London">
 				<long>
-					<daylight draft="contributed">영국 일광 절약 시간</daylight>
+					<daylight>영국 하계 표준시</daylight>
 				</long>
 				<exemplarCity>런던</exemplarCity>
 			</zone>
@@ -4036,6 +4281,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>포트모르즈비</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>부갱빌</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>마닐라</exemplarCity>
 			</zone>
@@ -4120,6 +4368,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>이르쿠츠크</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>치타</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>야쿠츠크</exemplarCity>
 			</zone>
@@ -4138,6 +4389,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>마가단</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>스레드네콜림스크</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>캄차카</exemplarCity>
 			</zone>
@@ -4462,7 +4716,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>알마티 표준 시간</generic>
 					<standard>알마티 표준 표준시</standard>
-					<daylight>알마티 서머 타임</daylight>
+					<daylight>알마티 하계 표준시</daylight>
 				</long>
 			</metazone>
 			<metazone type="Amazon">
@@ -4504,7 +4758,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic draft="contributed">아나디리 시간</generic>
 					<standard draft="contributed">아나디리 표준시</standard>
-					<daylight draft="contributed">아나디리 서머 타임</daylight>
+					<daylight draft="contributed">아나디리 하계 표준시</daylight>
 				</long>
 			</metazone>
 			<metazone type="Apia">
@@ -4518,14 +4772,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>악타우 표준 시간</generic>
 					<standard>악타우 표준 표준시</standard>
-					<daylight>악타우 서머 타임</daylight>
+					<daylight>악타우 하계 표준시</daylight>
 				</long>
 			</metazone>
 			<metazone type="Aqtobe">
 				<long>
 					<generic>악퇴베 표준 시간</generic>
 					<standard>악퇴베 표준 표준시</standard>
-					<daylight>악퇴베 서머 타임</daylight>
+					<daylight>악퇴베 하계 표준시</daylight>
 				</long>
 			</metazone>
 			<metazone type="Arabian">
@@ -4565,7 +4819,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
-					<generic>중앙 오스트레일리아 시간</generic>
+					<generic>오스트레일리아 중부 시간</generic>
 					<standard>오스트레일리아 중부 표준시</standard>
 					<daylight>오스트레일리아 중부 하계 표준시</daylight>
 				</long>
@@ -4579,14 +4833,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Australia_Eastern">
 				<long>
-					<generic>동부 오스트레일리아 시간</generic>
+					<generic>오스트레일리아 동부 시간</generic>
 					<standard>오스트레일리아 동부 표준시</standard>
 					<daylight>오스트레일리아 동부 하계 표준시</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Western">
 				<long>
-					<generic>서부 오스트레일리아 시간</generic>
+					<generic>오스트레일리아 서부 시간</generic>
 					<standard>오스트레일리아 서부 표준시</standard>
 					<daylight>오스트레일리아 서부 하계 표준시</daylight>
 				</long>
@@ -4700,7 +4954,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>쿡 제도 시간</generic>
 					<standard>쿡 제도 표준시</standard>
-					<daylight>쿡 제도 절반 서머 타임</daylight>
+					<daylight>쿡 제도 절반 하계 표준시</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cuba">
@@ -4741,14 +4995,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>중부 유럽 시간</generic>
 					<standard>중부 유럽 표준시</standard>
-					<daylight>중부유럽 하계 표준시</daylight>
+					<daylight>중부 유럽 하계 표준시</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Eastern">
 				<long>
-					<generic>동부유럽 시간</generic>
-					<standard>동부유럽 표준시</standard>
-					<daylight>동부유럽 하계 표준시</daylight>
+					<generic>동유럽 시간</generic>
+					<standard>동유럽 표준시</standard>
+					<daylight>동유럽 하계 표준시</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
@@ -4760,21 +5014,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>서유럽 시간</generic>
 					<standard>서유럽 표준시</standard>
-					<daylight>서유럽 서머 타임</daylight>
+					<daylight>서유럽 하계 표준시</daylight>
 				</long>
 			</metazone>
 			<metazone type="Falkland">
 				<long>
-					<generic>포클랜드 시간</generic>
+					<generic>포클랜드 제도 시간</generic>
 					<standard>포클랜드 제도 표준시</standard>
-					<daylight>포클랜드 하계 표준시</daylight>
+					<daylight>포클랜드 제도 하계 표준시</daylight>
 				</long>
 			</metazone>
 			<metazone type="Fiji">
 				<long>
 					<generic>피지 시간</generic>
 					<standard>피지 표준시</standard>
-					<daylight>피지 서머 타임</daylight>
+					<daylight>피지 하계 표준시</daylight>
 				</long>
 			</metazone>
 			<metazone type="French_Guiana">
@@ -4926,7 +5180,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic draft="contributed">페트로파블롭스크-캄차츠키 시간</generic>
 					<standard draft="contributed">페트로파블롭스크-캄차츠키 표준시</standard>
-					<daylight draft="contributed">페트로파블롭스크-캄차츠키 서머 타임</daylight>
+					<daylight draft="contributed">페트로파블롭스크-캄차츠키 하계 표준시</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kazakhstan_Eastern">
@@ -4984,7 +5238,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>마카오 시간</generic>
 					<standard>마카오 표준 시간</standard>
-					<daylight>마카오 서머 타임</daylight>
+					<daylight>마카오 하계 표준시</daylight>
 				</long>
 			</metazone>
 			<metazone type="Macquarie">
@@ -5078,7 +5332,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>뉴칼레도니아 시간</generic>
 					<standard>뉴칼레도니아 표준시</standard>
-					<daylight>뉴 칼레도니아 하계 표준시</daylight>
+					<daylight>뉴칼레도니아 하계 표준시</daylight>
 				</long>
 			</metazone>
 			<metazone type="New_Zealand">
@@ -5135,7 +5389,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>파키스탄 시간</generic>
 					<standard>파키스탄 표준시</standard>
-					<daylight>파키스탄 서머 타임</daylight>
+					<daylight>파키스탄 하계 표준시</daylight>
 				</long>
 			</metazone>
 			<metazone type="Palau">
@@ -5195,7 +5449,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>키질로르다 시간</generic>
 					<standard>키질로르다 표준 시간</standard>
-					<daylight>키질로르다 서머 타임</daylight>
+					<daylight>키질로르다 하계 표준시</daylight>
 				</long>
 			</metazone>
 			<metazone type="Reunion">
@@ -5219,7 +5473,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic draft="contributed">사마라 시간</generic>
 					<standard draft="contributed">사마라 표준시</standard>
-					<daylight draft="contributed">사마라 서머 타임</daylight>
+					<daylight draft="contributed">사마라 하계 표준시</daylight>
 				</long>
 			</metazone>
 			<metazone type="Samoa">
@@ -5285,7 +5539,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>통가 시간</generic>
 					<standard>통가 표준시</standard>
-					<daylight>통가 서머 타임</daylight>
+					<daylight>통가 하계 표준시</daylight>
 				</long>
 			</metazone>
 			<metazone type="Truk">
@@ -5323,7 +5577,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>바누아투 시간</generic>
 					<standard>바누아투 표준시</standard>
-					<daylight>바누아투 서머 타임</daylight>
+					<daylight>바누아투 하계 표준시</daylight>
 				</long>
 			</metazone>
 			<metazone type="Venezuela">
@@ -5404,7 +5658,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</decimalFormatLength>
 			<decimalFormatLength type="long">
 				<decimalFormat>
-					<pattern type="1000" count="other">0000</pattern>
+					<pattern type="1000" count="other">0</pattern>
 					<pattern type="10000" count="other">0만</pattern>
 					<pattern type="100000" count="other">00만</pattern>
 					<pattern type="1000000" count="other">000만</pattern>
@@ -5420,7 +5674,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</decimalFormatLength>
 			<decimalFormatLength type="short">
 				<decimalFormat>
-					<pattern type="1000" count="other">0000</pattern>
+					<pattern type="1000" count="other">0</pattern>
 					<pattern type="10000" count="other">0만</pattern>
 					<pattern type="100000" count="other">00만</pattern>
 					<pattern type="1000000" count="other">000만</pattern>
@@ -5445,7 +5699,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<percentFormats numberSystem="latn">
 			<percentFormatLength>
 				<percentFormat>
-					<pattern draft="contributed">#,##0%</pattern>
+					<pattern>#,##0%</pattern>
 				</percentFormat>
 			</percentFormatLength>
 		</percentFormats>
@@ -5455,10 +5709,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern draft="contributed">¤#,##0.00;(¤#,##0.00)</pattern>
+					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
-			<unitPattern count="other">{0}{1}</unitPattern>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="contributed">0</pattern>
+					<pattern type="10000" count="other" draft="contributed">¤0만</pattern>
+					<pattern type="100000" count="other" draft="contributed">¤00만</pattern>
+					<pattern type="1000000" count="other" draft="contributed">¤000만</pattern>
+					<pattern type="10000000" count="other" draft="contributed">¤0000만</pattern>
+					<pattern type="100000000" count="other" draft="contributed">¤0억</pattern>
+					<pattern type="1000000000" count="other" draft="contributed">¤00억</pattern>
+					<pattern type="10000000000" count="other" draft="contributed">¤000억</pattern>
+					<pattern type="100000000000" count="other" draft="contributed">¤0000억</pattern>
+					<pattern type="1000000000000" count="other" draft="contributed">¤0조</pattern>
+					<pattern type="10000000000000" count="other" draft="contributed">¤00조</pattern>
+					<pattern type="100000000000000" count="other" draft="contributed">¤000조</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencies>
 			<currency type="ADP">
@@ -5496,6 +5766,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>앙골라 콴자</displayName>
 				<displayName count="other">앙골라 콴자</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>앙골라 콴자 (1977–1990)</displayName>
@@ -5553,6 +5824,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>보스니아-헤르체고비나 태환 마르크</displayName>
 				<displayName count="other">보스니아-헤르체고비나 태환 마르크</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BAN">
 				<displayName draft="contributed">보스니아-헤르체고비나 신디나르 (1994–1997)</displayName>
@@ -5618,6 +5890,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>볼리비아노</displayName>
 				<displayName count="other">볼리비아노</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOL">
 				<displayName draft="contributed">볼리비아 볼리비아노 (1863–1963)</displayName>
@@ -5670,6 +5943,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>보츠와나 폴라</displayName>
 				<displayName count="other">보츠와나 폴라</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>벨라루스 신권 루블 (1994–1999)</displayName>
@@ -5751,6 +6025,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>쿠바 태환 페소</displayName>
 				<displayName count="other">쿠바 태환 페소</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>쿠바 페소</displayName>
@@ -5770,6 +6045,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>체코 공화국 코루나</displayName>
 				<displayName count="other">체코 공화국 코루나</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>동독 오스트마르크</displayName>
@@ -5786,6 +6062,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>덴마크 크로네</displayName>
 				<displayName count="other">덴마크 크로네</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>도미니카 페소</displayName>
@@ -5811,6 +6088,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>이집트 파운드</displayName>
 				<displayName count="other">이집트 파운드</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>에리트리아 나크파</displayName>
@@ -5827,8 +6105,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>스페인 페세타</displayName>
 			</currency>
 			<currency type="ETB">
-				<displayName>이디오피아 비르</displayName>
-				<displayName count="other">이디오피아 비르</displayName>
+				<displayName>에티오피아 비르</displayName>
+				<displayName count="other">에티오피아 비르</displayName>
 				<symbol>ETB</symbol>
 			</currency>
 			<currency type="EUR">
@@ -5850,6 +6128,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>포클랜드제도 파운드</displayName>
 				<displayName count="other">포클랜드제도 파운드</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>프랑스 프랑</displayName>
@@ -5867,6 +6146,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>조지아 라리</displayName>
 				<displayName count="other">조지아 라리</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>가나 시디 (1979–2007)</displayName>
@@ -5891,6 +6171,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>기니 프랑</displayName>
 				<displayName count="other">기니 프랑</displayName>
 				<symbol draft="contributed">GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>기니 시리</displayName>
@@ -5905,6 +6186,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>과테말라 케트살</displayName>
 				<displayName count="other">과테말라 케트살</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>포르투갈령 기니 에스쿠도</displayName>
@@ -5928,6 +6210,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>온두라스 렘피라</displayName>
 				<displayName count="other">온두라스 렘피라</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>크로아티아 디나르</displayName>
@@ -5936,6 +6219,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>크로아티아 쿠나</displayName>
 				<displayName count="other">크로아티아 쿠나</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>하이티 구르드</displayName>
@@ -5946,11 +6230,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>헝가리 포린트</displayName>
 				<displayName count="other">헝가리 포린트</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>인도네시아 루피아</displayName>
 				<displayName count="other">인도네시아 루피아</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>아일랜드 파운드</displayName>
@@ -5984,6 +6270,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>아이슬란드 크로나</displayName>
 				<displayName count="other">아이슬란드 크로나</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>이탈리아 리라</displayName>
@@ -6025,11 +6312,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>코모르 프랑</displayName>
 				<displayName count="other">코모르 프랑</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>조선 민주주의 인민 공화국 원</displayName>
 				<displayName count="other">조선 민주주의 인민 공화국 원</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRH">
 				<displayName draft="contributed">대한민국 환 (1953–1962)</displayName>
@@ -6067,11 +6356,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>레바논 파운드</displayName>
 				<displayName count="other">레바논 파운드</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>스리랑카 루피</displayName>
 				<displayName count="other">스리랑카 루피</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>라이베리아 달러</displayName>
@@ -6135,6 +6426,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>마다가스카르 아리아리</displayName>
 				<displayName count="other">마다가스카르 아리아리</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>마다가스카르 프랑</displayName>
@@ -6151,6 +6443,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>미얀마 키얏</displayName>
 				<displayName count="other">미얀마 키얏</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>몽골 투그릭</displayName>
@@ -6178,6 +6471,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>모리셔스 루피</displayName>
 				<displayName count="other">모리셔스 루피</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>몰디브 제도 루피아</displayName>
@@ -6205,6 +6499,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>말레이시아 링깃</displayName>
 				<displayName count="other">말레이시아 링깃</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>모잠비크 에스쿠도</displayName>
@@ -6236,6 +6531,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>니카라과 코르도바 오로</displayName>
 				<displayName count="other">니카라과 코르도바 오로</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>네델란드 길더</displayName>
@@ -6244,11 +6540,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>노르웨이 크로네</displayName>
 				<displayName count="other">노르웨이 크로네</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>네팔 루피</displayName>
 				<displayName count="other">네팔 루피</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>뉴질랜드 달러</displayName>
@@ -6292,11 +6590,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>파키스탄 루피</displayName>
 				<displayName count="other">파키스탄 루피</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>폴란드 즐로티</displayName>
 				<displayName count="other">폴란드 즐로티</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>폴란드 즐로티 (1950–1995)</displayName>
@@ -6335,6 +6635,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>러시아 루블</displayName>
 				<displayName count="other">러시아 루블</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>러시아 루블 (1991–1998)</displayName>
@@ -6343,6 +6644,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>르완다 프랑</displayName>
 				<displayName count="other">르완다 프랑</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>사우디아라비아 리얄</displayName>
@@ -6375,6 +6677,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>스웨덴 크로나</displayName>
 				<displayName count="other">스웨덴 크로나</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>싱가폴 달러</displayName>
@@ -6386,6 +6689,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>세인트헬레나 파운드</displayName>
 				<displayName count="other">세인트헬레나 파운드</displayName>
 				<symbol draft="contributed">SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>슬로베니아 톨라르</displayName>
@@ -6422,6 +6726,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>상투메 프린시페 도브라</displayName>
 				<displayName count="other">상투메 프린시페 도브라</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>소련 루블</displayName>
@@ -6433,6 +6738,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>시리아 파운드</displayName>
 				<displayName count="other">시리아 파운드</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>스와질란드 릴랑게니</displayName>
@@ -6443,6 +6749,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>태국 바트</displayName>
 				<displayName count="other">태국 바트</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>타지키스탄 루블</displayName>
@@ -6469,6 +6776,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>통가 파앙가</displayName>
 				<displayName count="other">통가 파앙가</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>티모르 에스쿠도</displayName>
@@ -6481,6 +6789,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">신 터키 리라</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>트리니다드 토바고 달러</displayName>
@@ -6552,6 +6861,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>베네수엘라 볼리바르</displayName>
 				<displayName count="other">베네수엘라 볼리바르</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>베트남 동</displayName>
@@ -6599,6 +6909,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>동카리브 달러</displayName>
 				<displayName count="other">동카리브 달러</displayName>
 				<symbol draft="contributed">EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>특별인출권</displayName>
@@ -6636,7 +6947,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="XXX">
 				<displayName>알 수 없는 통화단위</displayName>
-				<displayName count="other">알 수 없는 통화단위</displayName>
+				<displayName count="other">(알 수 없는 통화단위)</displayName>
 			</currency>
 			<currency type="YDD">
 				<displayName>예멘 디나르</displayName>
@@ -6662,6 +6973,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>남아프리카 랜드</displayName>
 				<displayName count="other">남아프리카 랜드</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>쟘비아 콰쳐 (1968–2012)</displayName>
@@ -6670,6 +6982,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>잠비아 콰쳐</displayName>
 				<displayName count="other">잠비아 콰쳐</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>자이르 신권 자이르</displayName>
@@ -6688,8 +7001,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
-			<pattern type="atLeast" draft="contributed">{0}+</pattern>
-			<pattern type="range" draft="contributed">{0}-{1}</pattern>
+			<pattern type="atLeast">{0}+</pattern>
+			<pattern type="range">{0}~{1}</pattern>
 		</miscPatterns>
 	</numbers>
 	<units>
@@ -6702,8 +7015,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} 중력가속도</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
-				<displayName>m/s²</displayName>
-				<unitPattern count="other">{0}m/s²</unitPattern>
+				<displayName>제곱 초당 미터</displayName>
+				<unitPattern count="other">{0}제곱 초당 미터</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>회전</displayName>
+				<unitPattern count="other">{0}회전</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>라디안</displayName>
+				<unitPattern count="other">{0}라디안</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>도</displayName>
+				<unitPattern count="other" draft="contributed">{0}도</unitPattern>
 			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>분각</displayName>
@@ -6713,25 +7038,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>각초</displayName>
 				<unitPattern count="other">{0}각초</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>도</displayName>
-				<unitPattern count="other" draft="contributed">{0}도</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>라디안</displayName>
-				<unitPattern count="other">{0}라디안</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>에이커</displayName>
-				<unitPattern count="other">{0}에이커</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>제곱킬로미터</displayName>
+				<unitPattern count="other">{0}제곱킬로미터</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>헥타르</displayName>
 				<unitPattern count="other">{0}헥타르</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>제곱미터</displayName>
+				<unitPattern count="other">{0}제곱미터</unitPattern>
+				<perUnitPattern>제곱미터당 {0}</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>제곱센티미터</displayName>
 				<unitPattern count="other">{0}제곱센티미터</unitPattern>
+				<perUnitPattern>제곱센티미터당 {0}</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>제곱마일</displayName>
+				<unitPattern count="other">{0}제곱마일</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>에이커</displayName>
+				<unitPattern count="other">{0}에이커</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>제곱야드</displayName>
+				<unitPattern count="other">{0}제곱야드</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>제곱피트</displayName>
@@ -6740,113 +7075,115 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="area-square-inch">
 				<displayName>제곱인치</displayName>
 				<unitPattern count="other">{0}제곱인치</unitPattern>
+				<perUnitPattern>제곱인치당 {0}</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>제곱킬로미터</displayName>
-				<unitPattern count="other">{0}제곱킬로미터</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>제곱미터</displayName>
-				<unitPattern count="other">{0}제곱미터</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>제곱마일</displayName>
-				<unitPattern count="other">{0}제곱마일</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>제곱야드</displayName>
-				<unitPattern count="other">{0}제곱야드</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>캐럿</displayName>
+				<unitPattern count="other">{0}캐럿</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>킬로미터당 리터</displayName>
 				<unitPattern count="other">킬로미터당 {0}리터</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>100킬로미터당 리터</displayName>
+				<unitPattern count="other">100킬로미터당 {0}리터</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>갤런당 마일</displayName>
 				<unitPattern count="other">갤런당 {0}마일</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>비트</displayName>
-				<unitPattern count="other">{0}비트</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>바이트</displayName>
-				<unitPattern count="other">{0}바이트</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>기가비트</displayName>
-				<unitPattern count="other">{0}기가비트</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>기가바이트</displayName>
-				<unitPattern count="other" draft="contributed">{0}기가바이트</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>킬로비트</displayName>
-				<unitPattern count="other">{0}킬로비트</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>킬로바이트</displayName>
-				<unitPattern count="other">{0}킬로바이트</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>메가비트</displayName>
-				<unitPattern count="other">{0}메가비트</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>메가바이트</displayName>
-				<unitPattern count="other">{0}메가바이트</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>테라비트</displayName>
-				<unitPattern count="other">{0}테라비트</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>테라바이트</displayName>
 				<unitPattern count="other">{0}테라바이트</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>테라비트</displayName>
+				<unitPattern count="other">{0}테라비트</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>기가바이트</displayName>
+				<unitPattern count="other" draft="contributed">{0}기가바이트</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>기가비트</displayName>
+				<unitPattern count="other">{0}기가비트</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>메가바이트</displayName>
+				<unitPattern count="other">{0}메가바이트</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>메가비트</displayName>
+				<unitPattern count="other">{0}메가비트</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>킬로바이트</displayName>
+				<unitPattern count="other">{0}킬로바이트</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>킬로비트</displayName>
+				<unitPattern count="other">{0}킬로비트</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>바이트</displayName>
+				<unitPattern count="other">{0}바이트</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>비트</displayName>
+				<unitPattern count="other">{0}비트</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>세기</displayName>
+				<unitPattern count="other">{0}세기</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>년</displayName>
+				<unitPattern count="other">{0}년</unitPattern>
+				<perUnitPattern>연당 {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>개월</displayName>
+				<unitPattern count="other">{0}개월</unitPattern>
+				<perUnitPattern>월당 {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>주</displayName>
+				<unitPattern count="other">{0}주</unitPattern>
+				<perUnitPattern>주당 {0}</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>일</displayName>
-				<unitPattern count="other" draft="contributed">{0}일</unitPattern>
+				<unitPattern count="other">{0}일</unitPattern>
+				<perUnitPattern>일당 {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>시간</displayName>
-				<unitPattern count="other" draft="contributed">{0}시간</unitPattern>
-				<perUnitPattern>{0}/h</perUnitPattern>
+				<unitPattern count="other">{0}시간</unitPattern>
+				<perUnitPattern>시간당 {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>분</displayName>
+				<unitPattern count="other">{0}분</unitPattern>
+				<perUnitPattern>분당 {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>초</displayName>
+				<unitPattern count="other">{0}초</unitPattern>
+				<perUnitPattern>초당 {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>밀리초</displayName>
+				<unitPattern count="other">{0}밀리초</unitPattern>
 			</unit>
 			<unit type="duration-microsecond">
 				<displayName>마이크로초</displayName>
 				<unitPattern count="other">{0}마이크로초</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>밀리초</displayName>
-				<unitPattern count="other" draft="contributed">{0}밀리초</unitPattern>
-			</unit>
-			<unit type="duration-minute">
-				<displayName>분</displayName>
-				<unitPattern count="other" draft="contributed">{0}분</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>개월</displayName>
-				<unitPattern count="other" draft="contributed">{0}개월</unitPattern>
-			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>나노초</displayName>
 				<unitPattern count="other">{0}나노초</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>초</displayName>
-				<unitPattern count="other" draft="contributed">{0}초</unitPattern>
-				<perUnitPattern>{0}/s</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>주</displayName>
-				<unitPattern count="other" draft="contributed">{0}주</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>년</displayName>
-				<unitPattern count="other">{0}년</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>암페어</displayName>
 				<unitPattern count="other">{0}암페어</unitPattern>
@@ -6863,6 +7200,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>볼트</displayName>
 				<unitPattern count="other">{0}볼트</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>킬로칼로리</displayName>
+				<unitPattern count="other">{0}킬로칼로리</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>칼로리</displayName>
 				<unitPattern count="other">{0}칼로리</unitPattern>
@@ -6871,18 +7212,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>칼로리</displayName>
 				<unitPattern count="other">{0}칼로리</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>줄</displayName>
-				<unitPattern count="other">{0}줄</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>킬로칼로리</displayName>
-				<unitPattern count="other">{0}킬로칼로리</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>킬로줄</displayName>
 				<unitPattern count="other">{0}킬로줄</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>줄</displayName>
+				<unitPattern count="other">{0}줄</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>킬로와트시</displayName>
 				<unitPattern count="other">{0}킬로와트시</unitPattern>
@@ -6891,162 +7228,167 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>기가헤르츠</displayName>
 				<unitPattern count="other">{0}기가헤르츠</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>헤르츠</displayName>
-				<unitPattern count="other">{0}헤르츠</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>메가헤르츠</displayName>
+				<unitPattern count="other">{0}메가헤르츠</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>킬로헤르츠</displayName>
 				<unitPattern count="other">{0}킬로헤르츠</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>메가헤르츠</displayName>
-				<unitPattern count="other">{0}메가헤르츠</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>헤르츠</displayName>
+				<unitPattern count="other">{0}헤르츠</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>천문 단위</displayName>
-				<unitPattern count="other">{0} 천문 단위</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>킬로미터</displayName>
+				<unitPattern count="other">{0}킬로미터</unitPattern>
+				<perUnitPattern>킬로미터당 {0}</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>센티미터</displayName>
-				<unitPattern count="other">{0}센티미터</unitPattern>
+			<unit type="length-meter">
+				<displayName>미터</displayName>
+				<unitPattern count="other">{0}미터</unitPattern>
+				<perUnitPattern>미터당 {0}</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>데시미터</displayName>
 				<unitPattern count="other">{0}데시미터</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>피트</displayName>
-				<unitPattern count="other" draft="contributed">{0}피트</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>인치</displayName>
-				<unitPattern count="other" draft="contributed">{0}인치</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>킬로미터</displayName>
-				<unitPattern count="other">{0}킬로미터</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>광년</displayName>
-				<unitPattern count="other">{0}광년</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>미터</displayName>
-				<unitPattern count="other">{0}미터</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>마이크로미터</displayName>
-				<unitPattern count="other">{0}마이크로미터</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>마일</displayName>
-				<unitPattern count="other" draft="contributed">{0}마일</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>센티미터</displayName>
+				<unitPattern count="other">{0}센티미터</unitPattern>
+				<perUnitPattern>센티미터당 {0}</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>밀리미터</displayName>
 				<unitPattern count="other">{0}밀리미터</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>마이크로미터</displayName>
+				<unitPattern count="other">{0}마이크로미터</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>나노미터</displayName>
 				<unitPattern count="other">{0}나노미터</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>해리</displayName>
-				<unitPattern count="other">{0}해리</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName draft="contributed">파섹</displayName>
-				<unitPattern count="other">{0}파섹</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>피코미터</displayName>
 				<unitPattern count="other">{0}피코미터</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>마일</displayName>
+				<unitPattern count="other">{0}마일</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>야드</displayName>
 				<unitPattern count="other">{0}야드</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>피트</displayName>
+				<unitPattern count="other">{0}피트</unitPattern>
+				<perUnitPattern>피트당 {0}</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>인치</displayName>
+				<unitPattern count="other">{0}인치</unitPattern>
+				<perUnitPattern>인치당 {0}</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>파섹</displayName>
+				<unitPattern count="other">{0}파섹</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>광년</displayName>
+				<unitPattern count="other">{0}광년</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>천문 단위</displayName>
+				<unitPattern count="other">{0}천문 단위</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>해리</displayName>
+				<unitPattern count="other">{0}해리</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>스칸디나비아 마일</displayName>
+				<unitPattern count="other">{0}스칸디나비아 마일</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>룩스</displayName>
 				<unitPattern count="other">{0}룩스</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>캐럿</displayName>
-				<unitPattern count="other">{0}캐럿</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>그램</displayName>
-				<unitPattern count="other">{0}그램</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>킬로그램</displayName>
-				<unitPattern count="other">{0}킬로그램</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>메트릭 톤</displayName>
 				<unitPattern count="other">{0}메트릭 톤</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>마이크로그램</displayName>
-				<unitPattern count="other">{0}마이크로그램</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>킬로그램</displayName>
+				<unitPattern count="other">{0}킬로그램</unitPattern>
+				<perUnitPattern>킬로그램당 {0}</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>그램</displayName>
+				<unitPattern count="other">{0}그램</unitPattern>
+				<perUnitPattern>그램당 {0}</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>밀리그램</displayName>
 				<unitPattern count="other">{0}밀리그램</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>온스</displayName>
-				<unitPattern count="other" draft="contributed">{0}온스</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>트로이 온스</displayName>
-				<unitPattern count="other">{0}트로이 온스</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>파운드</displayName>
-				<unitPattern count="other">{0}파운드</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>마이크로그램</displayName>
+				<unitPattern count="other">{0}마이크로그램</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>톤</displayName>
 				<unitPattern count="other">{0}톤</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>파운드</displayName>
+				<unitPattern count="other">{0}파운드</unitPattern>
+				<perUnitPattern>파운드당 {0}</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>온스</displayName>
+				<unitPattern count="other">{0}온스</unitPattern>
+				<perUnitPattern>온스당 {0}</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>트로이 온스</displayName>
+				<unitPattern count="other">{0}트로이 온스</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>캐럿</displayName>
+				<unitPattern count="other">{0}캐럿</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>기가와트</displayName>
 				<unitPattern count="other">{0}기가와트</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>마력</displayName>
-				<unitPattern count="other">{0}마력</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>킬로와트</displayName>
-				<unitPattern count="other">{0}킬로와트</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>메가와트</displayName>
 				<unitPattern count="other">{0}메가와트</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>밀리와트</displayName>
-				<unitPattern count="other">{0}밀리와트</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>킬로와트</displayName>
+				<unitPattern count="other">{0}킬로와트</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>와트</displayName>
 				<unitPattern count="other">{0}와트</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>밀리와트</displayName>
+				<unitPattern count="other">{0}밀리와트</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>마력</displayName>
+				<unitPattern count="other">{0}마력</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>헥토파스칼</displayName>
 				<unitPattern count="other">{0}헥토파스칼</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>수은주인치</displayName>
-				<unitPattern count="other">{0}수은주인치</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>밀리바</displayName>
-				<unitPattern count="other">{0}밀리바</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>수은주밀리미터</displayName>
 				<unitPattern count="other">{0}수은주밀리미터</unitPattern>
@@ -7055,54 +7397,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>제곱인치당 파운드</displayName>
 				<unitPattern count="other">{0}제곱인치당 파운드</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>캐럿</displayName>
-				<unitPattern count="other">{0}캐럿</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>수은주인치</displayName>
+				<unitPattern count="other">{0}수은주인치</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>밀리바</displayName>
+				<unitPattern count="other">{0}밀리바</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName>km/h</displayName>
-				<unitPattern count="other" draft="contributed">시속 {0}킬로미터</unitPattern>
+				<displayName>시간당 킬로미터</displayName>
+				<unitPattern count="other">시속 {0}킬로미터</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
 				<displayName>m/s</displayName>
-				<unitPattern count="other" draft="contributed">초속 {0}미터</unitPattern>
+				<unitPattern count="other">초속 {0}미터</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
 				<displayName>mi/h</displayName>
-				<unitPattern count="other" draft="contributed">시속 {0}마일</unitPattern>
+				<unitPattern count="other">시속 {0}마일</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>노트</displayName>
+				<unitPattern count="other">{0}노트</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>도</displayName>
+				<unitPattern count="other">{0}도</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
-				<displayName>°C</displayName>
+				<displayName>섭씨</displayName>
 				<unitPattern count="other">섭씨 {0}도</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
-				<displayName>°F</displayName>
+				<displayName>화씨</displayName>
 				<unitPattern count="other">화씨 {0}도</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
 				<displayName>켈빈</displayName>
 				<unitPattern count="other">{0}켈빈</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>에이커 피트</displayName>
-				<unitPattern count="other">{0}에이커 피트</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>센티리터</displayName>
-				<unitPattern count="other">{0}센티리터</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>세제곱센티미터</displayName>
-				<unitPattern count="other">{0}세제곱센티미터</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>세제곱피트</displayName>
-				<unitPattern count="other">{0}세제곱피트</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>세제곱인치</displayName>
-				<unitPattern count="other">{0}세제곱인치</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>세제곱킬로미터</displayName>
 				<unitPattern count="other">{0}세제곱킬로미터</unitPattern>
@@ -7110,6 +7444,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-cubic-meter">
 				<displayName>세제곱미터</displayName>
 				<unitPattern count="other">{0}세제곱미터</unitPattern>
+				<perUnitPattern>세제곱미터당 {0}</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>세제곱센티미터</displayName>
+				<unitPattern count="other">{0}세제곱센티미터</unitPattern>
+				<perUnitPattern>세제곱센티미터당 {0}</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>세제곱마일</displayName>
@@ -7119,21 +7459,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>세제곱야드</displayName>
 				<unitPattern count="other">{0}세제곱야드</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>컵</displayName>
-				<unitPattern count="other">{0}컵</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>세제곱피트</displayName>
+				<unitPattern count="other">{0}세제곱피트</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>데시리터</displayName>
-				<unitPattern count="other">{0}데시리터</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>세제곱인치</displayName>
+				<unitPattern count="other">{0}세제곱인치</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>액량 온스</displayName>
-				<unitPattern count="other">{0}액량 온스</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>갤런</displayName>
-				<unitPattern count="other">{0}갤런</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>메가리터</displayName>
+				<unitPattern count="other">{0}메가리터</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>헥토리터</displayName>
@@ -7142,23 +7478,53 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-liter">
 				<displayName>리터</displayName>
 				<unitPattern count="other">{0}리터</unitPattern>
+				<perUnitPattern>리터당 {0}</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>메가리터</displayName>
-				<unitPattern count="other">{0}메가리터</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>데시리터</displayName>
+				<unitPattern count="other">{0}데시리터</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>센티리터</displayName>
+				<unitPattern count="other">{0}센티리터</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>밀리리터</displayName>
 				<unitPattern count="other">{0}밀리리터</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>파인트</displayName>
-				<unitPattern count="other">{0}파인트</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>미터식 파인트</displayName>
+				<unitPattern count="other">{0}미터식 파인트</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>미터식 컵</displayName>
+				<unitPattern count="other">{0}미터식 컵</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>에이커 피트</displayName>
+				<unitPattern count="other">{0}에이커 피트</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>갤런</displayName>
+				<unitPattern count="other">{0}갤런</unitPattern>
+				<perUnitPattern>갤런당 {0}</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>쿼트</displayName>
 				<unitPattern count="other">{0}쿼트</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>파인트</displayName>
+				<unitPattern count="other">{0}파인트</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>컵</displayName>
+				<unitPattern count="other">{0}컵</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>액량 온스</displayName>
+				<unitPattern count="other">{0}액량 온스</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>테이블스푼</displayName>
 				<unitPattern count="other">{0}테이블스푼</unitPattern>
@@ -7167,19 +7533,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>티스푼</displayName>
 				<unitPattern count="other">{0}티스푼</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">동경 {0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">북위 {0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">남위 {0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">서경 {0}</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
 				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
-				<displayName>중력가속도</displayName>
+				<displayName>g-force</displayName>
 				<unitPattern count="other">{0}G</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
 				<displayName>m/s²</displayName>
 				<unitPattern count="other">{0}m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="other">{0}rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="other">{0}rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>°</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>′</displayName>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -7188,140 +7572,152 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>″</displayName>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>°</displayName>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="other">{0}rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>에이커</displayName>
-				<unitPattern count="other">{0}에이커</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="other">{0}km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
-				<displayName>헥타르</displayName>
-				<unitPattern count="other" draft="contributed">{0}ha</unitPattern>
+				<displayName>ha</displayName>
+				<unitPattern count="other">{0}ha</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="other">{0}m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
 			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="other">{0}cm²</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<displayName>제곱피트</displayName>
-				<unitPattern count="other">{0}ft²</unitPattern>
-			</unit>
-			<unit type="area-square-inch">
-				<displayName>in²</displayName>
-				<unitPattern count="other">{0}in²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="other" draft="contributed">{0}km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="other" draft="contributed">{0}m²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
 				<displayName>mi²</displayName>
-				<unitPattern count="other" draft="contributed">{0}mi²</unitPattern>
+				<unitPattern count="other">{0}mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ac</displayName>
+				<unitPattern count="other">{0}ac</unitPattern>
 			</unit>
 			<unit type="area-square-yard">
 				<displayName>yd²</displayName>
 				<unitPattern count="other">{0}yd²</unitPattern>
 			</unit>
+			<unit type="area-square-foot">
+				<displayName>ft²</displayName>
+				<unitPattern count="other">{0}ft²</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>in²</displayName>
+				<unitPattern count="other">{0}in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="other">{0}kt</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
 				<unitPattern count="other">{0}L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="other">{0}L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="other">{0}mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="other">{0}bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="other">{0}byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gbit</displayName>
-				<unitPattern count="other">{0}Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GByte</displayName>
-				<unitPattern count="other">{0}GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kbit</displayName>
-				<unitPattern count="other">{0}kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="other">{0}kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mbit</displayName>
-				<unitPattern count="other">{0}Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="other">{0}MB</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>TByte</displayName>
+				<unitPattern count="other">{0}TB</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>Tbit</displayName>
 				<unitPattern count="other">{0}Tb</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>TByte</displayName>
-				<unitPattern count="other">{0}TB</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>GByte</displayName>
+				<unitPattern count="other">{0}GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gbit</displayName>
+				<unitPattern count="other">{0}Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="other">{0}MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mbit</displayName>
+				<unitPattern count="other">{0}Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="other">{0}kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kbit</displayName>
+				<unitPattern count="other">{0}kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="other">{0}byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="other">{0}bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>C</displayName>
+				<unitPattern count="other">{0}C</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>년</displayName>
+				<unitPattern count="other">{0}년</unitPattern>
+				<perUnitPattern>{0}/년</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>개월</displayName>
+				<unitPattern count="other">{0}개월</unitPattern>
+				<perUnitPattern>{0}/월</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>주</displayName>
+				<unitPattern count="other">{0}주</unitPattern>
+				<perUnitPattern>{0}/주</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>일</displayName>
-				<unitPattern count="other" draft="contributed">{0}일</unitPattern>
+				<unitPattern count="other">{0}일</unitPattern>
+				<perUnitPattern>{0}/일</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>시간</displayName>
-				<unitPattern count="other" draft="contributed">{0}시간</unitPattern>
+				<unitPattern count="other">{0}시간</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="other">{0}μs</unitPattern>
+			<unit type="duration-minute">
+				<displayName>분</displayName>
+				<unitPattern count="other">{0}분</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>초</displayName>
+				<unitPattern count="other">{0}초</unitPattern>
+				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>밀리초</displayName>
 				<unitPattern count="other">{0}ms</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>분</displayName>
-				<unitPattern count="other" draft="contributed">{0}분</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>개월</displayName>
-				<unitPattern count="other" draft="contributed">{0}개월</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="other">{0}μs</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>ns</displayName>
 				<unitPattern count="other">{0}ns</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>초</displayName>
-				<unitPattern count="other" draft="contributed">{0}초</unitPattern>
-				<perUnitPattern>{0}/s</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>주</displayName>
-				<unitPattern count="other" draft="contributed">{0}주</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>년</displayName>
-				<unitPattern count="other">{0}년</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>amp</displayName>
 				<unitPattern count="other">{0}A</unitPattern>
@@ -7338,6 +7734,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>volt</displayName>
 				<unitPattern count="other">{0}V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="other">{0}kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="other">{0}cal</unitPattern>
@@ -7346,18 +7746,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Cal</displayName>
 				<unitPattern count="other">{0}Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>줄</displayName>
-				<unitPattern count="other">{0}줄</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="other">{0}kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="other">{0}kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>줄</displayName>
+				<unitPattern count="other">{0}줄</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="other">{0}kWh</unitPattern>
@@ -7366,162 +7762,167 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>GHz</displayName>
 				<unitPattern count="other">{0}GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="other">{0}Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="other">{0}MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="other">{0}kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="other">{0}MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="other">{0}Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="other">{0}au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="other">{0}km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="other" draft="contributed">{0}cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="other">{0}m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="other">{0}dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>피트</displayName>
-				<unitPattern count="other">{0}ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>in</displayName>
-				<unitPattern count="other" draft="contributed">{0}in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="other" draft="contributed">{0}km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ly</displayName>
-				<unitPattern count="other">{0}ly</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>미터</displayName>
-				<unitPattern count="other" draft="contributed">{0}m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="other">{0}µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>마일</displayName>
-				<unitPattern count="other" draft="contributed">{0}mil</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="other">{0}cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="other">{0}mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="other">{0}µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="other">{0}nm</unitPattern>
 			</unit>
+			<unit type="length-picometer">
+				<displayName>pm</displayName>
+				<unitPattern count="other">{0}pm</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="other">{0}mi</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>yd</displayName>
+				<unitPattern count="other">{0}야드</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>ft</displayName>
+				<unitPattern count="other">{0}ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>in</displayName>
+				<unitPattern count="other">{0}in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="other">{0}pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ly</displayName>
+				<unitPattern count="other">{0}ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="other">{0}au</unitPattern>
+			</unit>
 			<unit type="length-nautical-mile">
 				<displayName>nmi</displayName>
 				<unitPattern count="other">{0}nmi</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<displayName>파섹</displayName>
-				<unitPattern count="other">{0}pc</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName>pm</displayName>
-				<unitPattern count="other" draft="contributed">{0}pm</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<displayName>야드</displayName>
-				<unitPattern count="other">{0}야드</unitPattern>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="other">{0}smi</unitPattern>
 			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="other">{0}lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>CD</displayName>
-				<unitPattern count="other">{0}CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>그램</displayName>
-				<unitPattern count="other">{0}g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="other" draft="contributed">{0}kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="other">{0}t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="other">{0}µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="other">{0}kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>그램</displayName>
+				<unitPattern count="other">{0}g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="other">{0}mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="other" draft="contributed">{0}oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="other">{0}oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="other">{0}lb</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="other">{0}µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tn</displayName>
 				<unitPattern count="other">{0}tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="other">{0}lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="other">{0}oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="other">{0}oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>CD</displayName>
+				<unitPattern count="other">{0}CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="other">{0}GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hp</displayName>
-				<unitPattern count="other" draft="contributed">{0}HP</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="other">{0}kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="other">{0}MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="other">{0}mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="other">{0}kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>w</displayName>
 				<unitPattern count="other">{0}W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="other">{0}mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="other">{0}hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="other">{0}hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="other">{0}inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="other" draft="contributed">{0}mb</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="other">{0}mm Hg</unitPattern>
@@ -7530,13 +7931,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>psi</displayName>
 				<unitPattern count="other">{0}psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="other">{0}kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="other">{0}inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="other" draft="contributed">{0}mb</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
-				<unitPattern count="other" draft="contributed">시속 {0}km</unitPattern>
+				<unitPattern count="other">{0}km/h</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
 				<displayName>m/s</displayName>
@@ -7546,6 +7951,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>mi/h</displayName>
 				<unitPattern count="other" draft="contributed">시속 {0}mi</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="other">{0}kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="other">{0}°C</unitPattern>
@@ -7558,26 +7971,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>K</displayName>
 				<unitPattern count="other">{0}K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="other">{0}ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cL</displayName>
-				<unitPattern count="other">{0}cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="other">{0}cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="other">{0}ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="other">{0}in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="other" draft="contributed">{0}km³</unitPattern>
@@ -7585,6 +7978,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-cubic-meter">
 				<displayName>m³</displayName>
 				<unitPattern count="other">{0}m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="other">{0}cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -7594,21 +7993,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>yd³</displayName>
 				<unitPattern count="other">{0}yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>컵</displayName>
-				<unitPattern count="other">{0}컵</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="other">{0}ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="other">{0}dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="other">{0}in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="other">{0}fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="other">{0}gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="other">{0}ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -7617,23 +8012,53 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-liter">
 				<displayName>리터</displayName>
 				<unitPattern count="other">{0}L</unitPattern>
+				<perUnitPattern>{0}/L</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="other">{0}ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="other">{0}dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="other">{0}cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
 				<unitPattern count="other">{0}mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="other">{0}pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="other">{0}mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="other">{0}mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="other">{0}ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="other">{0}gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="other">{0}qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="other">{0}pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>컵</displayName>
+				<unitPattern count="other">{0}컵</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="other">{0}fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>tbsp</displayName>
 				<unitPattern count="other">{0}tbsp</unitPattern>
@@ -7642,6 +8067,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>tsp</displayName>
 				<unitPattern count="other">{0}tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -7650,88 +8081,80 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="acceleration-g-force">
 				<unitPattern count="other" draft="contributed">{0}G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="other" draft="contributed">{0}′</unitPattern>
 			</unit>
 			<unit type="angle-arc-second">
 				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="other" draft="contributed">{0}ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="other" draft="contributed">{0}km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="other" draft="contributed">{0}ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="other" draft="contributed">{0}ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="other" draft="contributed">{0}km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="other" draft="contributed">{0}m²</unitPattern>
 			</unit>
 			<unit type="area-square-mile">
 				<unitPattern count="other" draft="contributed">{0}mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="other" draft="contributed">{0}ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="other" draft="contributed">{0}ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="other">{0}L/100km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>년</displayName>
+				<unitPattern count="other">{0}년</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>개월</displayName>
+				<unitPattern count="other">{0}개월</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>주</displayName>
+				<unitPattern count="other">{0}주</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>일</displayName>
-				<unitPattern count="other" draft="contributed">{0}일</unitPattern>
+				<unitPattern count="other">{0}일</unitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>시간</displayName>
 				<unitPattern count="other">{0}시간</unitPattern>
 			</unit>
+			<unit type="duration-minute">
+				<displayName>분</displayName>
+				<unitPattern count="other">{0}분</unitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>초</displayName>
+				<unitPattern count="other">{0}초</unitPattern>
+			</unit>
 			<unit type="duration-millisecond">
 				<displayName>ms</displayName>
 				<unitPattern count="other">{0}ms</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>분</displayName>
-				<unitPattern count="other" draft="contributed">{0}분</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="other">{0}km</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>개월</displayName>
-				<unitPattern count="other" draft="contributed">{0}개월</unitPattern>
-			</unit>
-			<unit type="duration-second">
-				<displayName>초</displayName>
-				<unitPattern count="other" draft="contributed">{0}초</unitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>주</displayName>
-				<unitPattern count="other" draft="contributed">{0}주</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>년</displayName>
-				<unitPattern count="other" draft="contributed">{0}년</unitPattern>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="other">{0}m</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
 				<displayName>cm</displayName>
-				<unitPattern count="other" draft="contributed">{0}cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="other" draft="contributed">{0}′</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="other" draft="contributed">{0}km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="other" draft="contributed">{0}ly</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>미터</displayName>
-				<unitPattern count="other" draft="contributed">{0}m</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<unitPattern count="other" draft="contributed">{0}mi</unitPattern>
+				<unitPattern count="other">{0}cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -7740,25 +8163,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="length-picometer">
 				<unitPattern count="other" draft="contributed">{0}pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="other" draft="contributed">{0}mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="other" draft="contributed">{0}yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>그램</displayName>
-				<unitPattern count="other" draft="contributed">{0}g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="other" draft="contributed">{0}′</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="other" draft="contributed">{0}ly</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
-				<unitPattern count="other" draft="contributed">{0}kg</unitPattern>
+				<unitPattern count="other">{0}kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="other" draft="contributed">{0}oz</unitPattern>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="other">{0}g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="other" draft="contributed">{0}lb</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="other" draft="contributed">{0}HP</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="other" draft="contributed">{0}oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="other" draft="contributed">{0}kW</unitPattern>
@@ -7766,6 +8198,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="power-watt">
 				<unitPattern count="other" draft="contributed">{0}W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="other" draft="contributed">{0}HP</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="other" draft="contributed">{0}hPa</unitPattern>
 			</unit>
@@ -7799,9 +8234,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other" draft="contributed">{0}mi³</unitPattern>
 			</unit>
 			<unit type="volume-liter">
-				<displayName>리터</displayName>
+				<displayName>ℓ</displayName>
 				<unitPattern count="other" draft="contributed">{0}ℓ</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
@@ -7815,28 +8256,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</units>
 	<listPatterns>
 		<listPattern>
-			<listPatternPart type="start" draft="contributed">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle" draft="contributed">{0}, {1}</listPatternPart>
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
 			<listPatternPart type="end">{0} 및 {1}</listPatternPart>
 			<listPatternPart type="2">{0} 및 {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit">
-			<listPatternPart type="start" draft="contributed">{0} {1}</listPatternPart>
-			<listPatternPart type="middle" draft="contributed">{0} {1}</listPatternPart>
-			<listPatternPart type="end" draft="contributed">{0} {1}</listPatternPart>
-			<listPatternPart type="2" draft="contributed">{0} {1}</listPatternPart>
+			<listPatternPart type="start">{0} {1}</listPatternPart>
+			<listPatternPart type="middle">{0} {1}</listPatternPart>
+			<listPatternPart type="end">{0} {1}</listPatternPart>
+			<listPatternPart type="2">{0} {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-narrow">
-			<listPatternPart type="start" draft="contributed">{0} {1}</listPatternPart>
-			<listPatternPart type="middle" draft="contributed">{0} {1}</listPatternPart>
-			<listPatternPart type="end" draft="contributed">{0} {1}</listPatternPart>
-			<listPatternPart type="2" draft="contributed">{0} {1}</listPatternPart>
+			<listPatternPart type="start">{0} {1}</listPatternPart>
+			<listPatternPart type="middle">{0} {1}</listPatternPart>
+			<listPatternPart type="end">{0} {1}</listPatternPart>
+			<listPatternPart type="2">{0} {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-short">
-			<listPatternPart type="start" draft="contributed">{0} {1}</listPatternPart>
-			<listPatternPart type="middle" draft="contributed">{0} {1}</listPatternPart>
-			<listPatternPart type="end" draft="contributed">{0} {1}</listPatternPart>
-			<listPatternPart type="2" draft="contributed">{0} {1}</listPatternPart>
+			<listPatternPart type="start">{0} {1}</listPatternPart>
+			<listPatternPart type="middle">{0} {1}</listPatternPart>
+			<listPatternPart type="end">{0} {1}</listPatternPart>
+			<listPatternPart type="2">{0} {1}</listPatternPart>
 		</listPattern>
 	</listPatterns>
 	<posix>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ko_KP.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ko_KP.xml
similarity index 78%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ko_KP.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ko_KP.xml
index 9eedbb5fb9e..2f9700e4b1c 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ko_KP.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ko_KP.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ko"/>
 		<territory type="KP"/>
 	</identity>
@@ -23,3 +22,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</timeZoneNames>
 	</dates>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ko_KR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ko_KR.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ko_KR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ko_KR.xml
index 35d3d7f9e7e..18f7abc9690 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ko_KR.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ko_KR.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ko"/>
 		<territory type="KR"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kok.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kok.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kok.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kok.xml
index 1a93212df5f..647aa71a0e5 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kok.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kok.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="kok"/>
 	</identity>
 	<localeDisplayNames>
@@ -230,6 +229,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</days>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">म.पू.</dayPeriod>
+							<dayPeriod type="pm">म.नं.</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">म.पू.</dayPeriod>
 							<dayPeriod type="pm">म.नं.</dayPeriod>
@@ -324,6 +327,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤ #,##,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kok_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kok_IN.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kok_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kok_IN.xml
index 1ef6bb09eda..177ae17d050 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kok_IN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kok_IN.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="kok"/>
 		<territory type="IN"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ks.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ks.xml
similarity index 98%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ks.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ks.xml
index ebe5ce13ee3..1ffa9ed0219 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ks.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ks.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12128 $"/>
 		<language type="ks"/>
 	</identity>
 	<localeDisplayNames>
@@ -613,7 +612,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">انگوئیلا</territory>
 			<territory type="AL">اٮ۪لبانِیا</territory>
 			<territory type="AM">اَرمانِیا</territory>
-			<territory type="AN">نَیدَرلینٛڑٕس اٮ۪نٹَیلٕس</territory>
 			<territory type="AO">انگولا</territory>
 			<territory type="AQ">اینٹارٹِکا</territory>
 			<territory type="AR">أرجَنٹینا</territory>
@@ -883,19 +881,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="currency">ضَرب</key>
 		</keys>
 		<types>
-			<type type="big5han" key="collation">رٮ۪وٲتی چیٖنی تِرتیٖب</type>
-			<type type="buddhist" key="calendar">بُدَن ہُنٛد کیلنڑَر</type>
-			<type type="chinese" key="calendar">چیٖنی کیلَنڑَر</type>
-			<type type="gregorian" key="calendar">گرگوریَن کیلنڑَر</type>
-			<type type="hebrew" key="calendar">ہِبرِو کیلنڑَر</type>
-			<type type="islamic" key="calendar">اِسلٲمی کیلنڑَر</type>
-			<type type="islamic-civil" key="calendar">اِسلٲمی اِجتمٲیی کیلنڑَر</type>
-			<type type="japanese" key="calendar">جاپٲنۍ کیلنڑَر</type>
-			<type type="phonebook" key="collation">فون بُک تَرتیٖب</type>
-			<type type="pinyin" key="collation">آسان بَناونہٕ آمُت چیٖنی پیٖنیَن تَرتیٖب</type>
-			<type type="roc" key="calendar">جموٗریٲتی چیٖنی کیلَنڑَر</type>
-			<type type="stroke" key="collation">رٮ۪وٲتی چیٖنی سٹروک تَرتیٖب</type>
-			<type type="traditional" key="collation">رٮ۪وٲتی تَرتیٖب</type>
+			<type key="calendar" type="buddhist">بُدَن ہُنٛد کیلنڑَر</type>
+			<type key="calendar" type="chinese">چیٖنی کیلَنڑَر</type>
+			<type key="calendar" type="gregorian">گرگوریَن کیلنڑَر</type>
+			<type key="calendar" type="hebrew">ہِبرِو کیلنڑَر</type>
+			<type key="calendar" type="islamic">اِسلٲمی کیلنڑَر</type>
+			<type key="calendar" type="islamic-civil">اِسلٲمی اِجتمٲیی کیلنڑَر</type>
+			<type key="calendar" type="japanese">جاپٲنۍ کیلنڑَر</type>
+			<type key="calendar" type="roc">جموٗریٲتی چیٖنی کیلَنڑَر</type>
+			<type key="collation" type="big5han">رٮ۪وٲتی چیٖنی تِرتیٖب</type>
+			<type key="collation" type="phonebook">فون بُک تَرتیٖب</type>
+			<type key="collation" type="pinyin">آسان بَناونہٕ آمُت چیٖنی پیٖنیَن تَرتیٖب</type>
+			<type key="collation" type="stroke">رٮ۪وٲتی چیٖنی سٹروک تَرتیٖب</type>
+			<type key="collation" type="traditional">رٮ۪وٲتی تَرتیٖب</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">میٖٹرِک</measurementSystemName>
@@ -964,7 +962,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="GGGGyMMMMEEEEdd">EEEE,dd MMMM GGGGy</dateFormatItem>
 						<dateFormatItem id="Gy">Gy</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM Gy</dateFormatItem>
 						<dateFormatItem id="GyMMMd">MMM d, Gy</dateFormatItem>
@@ -1155,7 +1152,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="GGGGyMMMMEEEEdd">EEEE,dd MMMM GGGGy</dateFormatItem>
 						<dateFormatItem id="Gy">Gy</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM Gy</dateFormatItem>
 						<dateFormatItem id="GyMMMd">MMM d, Gy</dateFormatItem>
@@ -3327,6 +3323,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤ #,##,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤ 0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤ 00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤ 000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤ 0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤ 00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤ 000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤ 0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤ 00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤ 000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤ 0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤ 00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤ 000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="ADP">
@@ -4086,6 +4110,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</numbers>
 	<units>
 		<unitLength type="long">
+			<unit type="duration-year">
+				<displayName draft="provisional">ؤری</displayName>
+				<unitPattern count="one">{0} ؤری</unitPattern>
+				<unitPattern count="other">{0} ؤری</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="provisional">ریٚتھ</displayName>
+				<unitPattern count="one">{0} ریٚتھ</unitPattern>
+				<unitPattern count="other">{0} ریٚتھ</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="provisional">ہَفتہٕ</displayName>
+				<unitPattern count="one">{0} ہَفتہٕ</unitPattern>
+				<unitPattern count="other">{0} ہَفتہٕ</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">دۄہ</displayName>
 				<unitPattern count="one">{0} دۄہ</unitPattern>
@@ -4101,28 +4140,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} مِنَٹ</unitPattern>
 				<unitPattern count="other">{0} مِنَٹ</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">ریٚتھ</displayName>
-				<unitPattern count="one">{0} ریٚتھ</unitPattern>
-				<unitPattern count="other">{0} ریٚتھ</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="provisional">سیٚکَنٛڈ</displayName>
 				<unitPattern count="one">{0} سیٚکَنٛڈ</unitPattern>
 				<unitPattern count="other">{0} سیٚکَنٛڈ</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">ہَفتہٕ</displayName>
-				<unitPattern count="one">{0} ہَفتہٕ</unitPattern>
-				<unitPattern count="other">{0} ہَفتہٕ</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">ؤری</displayName>
-				<unitPattern count="one">{0} ؤری</unitPattern>
-				<unitPattern count="other">{0} ؤری</unitPattern>
-			</unit>
 		</unitLength>
 		<unitLength type="short">
+			<unit type="duration-year">
+				<displayName draft="provisional">ؤری</displayName>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="provisional">ریٚتھ</displayName>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="provisional">ہَفتہٕ</displayName>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">دۄہ</displayName>
 			</unit>
@@ -4132,18 +4165,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="duration-minute">
 				<displayName draft="provisional">مِنَٹ</displayName>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">ریٚتھ</displayName>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="provisional">سیٚکَنٛڈ</displayName>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">ہَفتہٕ</displayName>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">ؤری</displayName>
-			</unit>
 		</unitLength>
 	</units>
 	<posix>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ks_Arab_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ks_IN.xml
similarity index 65%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ks_Arab_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ks_IN.xml
index 1894fae26ed..88b1afc0eb4 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ks_Arab_IN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ks_IN.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ks"/>
-		<script type="Arab"/>
 		<territory type="IN"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ksb.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksb.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ksb.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksb.xml
index 8259b211594..9f803291620 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ksb.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksb.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="ksb"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Almenia</territory>
-			<territory type="AN">Antili za Uholanzi</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Ajentina</territory>
 			<territory type="AS">Samoa ya Malekani</territory>
@@ -447,6 +445,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">makeo</dayPeriod>
+							<dayPeriod type="pm">nyiaghuo</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">makeo</dayPeriod>
 							<dayPeriod type="pm">nyiaghuo</dayPeriod>
@@ -488,22 +490,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -580,6 +582,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0K¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0K¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00K¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000K¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0M¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00M¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000M¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0G¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00G¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000G¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0T¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00T¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000T¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ksb_TZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksb_TZ.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ksb_TZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksb_TZ.xml
index b9d532268ac..b4a9977380a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ksb_TZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksb_TZ.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ksb"/>
 		<territory type="TZ"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ksf.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksf.xml
similarity index 95%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ksf.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksf.xml
index 15781feae82..89c2d96a602 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ksf.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksf.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="ksf"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">angiya</territory>
 			<territory type="AL">albaní</territory>
 			<territory type="AM">armɛní</territory>
-			<territory type="AN">antíyǝ nɛlandé</territory>
 			<territory type="AO">angóla</territory>
 			<territory type="AR">arjǝntín</territory>
 			<territory type="AS">samɔa a amɛrika</territory>
@@ -433,6 +431,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">sárúwá</dayPeriod>
+							<dayPeriod type="pm">cɛɛ́nko</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">sárúwá</dayPeriod>
 							<dayPeriod type="pm">cɛɛ́nko</dayPeriod>
@@ -578,6 +580,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">0K ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -754,3 +772,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ksf_CM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksf_CM.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ksf_CM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksf_CM.xml
index 0be6fc074c6..8e5cb7419a1 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ksf_CM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksf_CM.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ksf"/>
 		<territory type="CM"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ksh.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksh.xml
similarity index 95%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ksh.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksh.xml
index 50e6ed149d7..e1680bdf67a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ksh.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksh.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10753 $"/>
-		<generation date="$Date: 2014-08-11 11:10:03 -0500 (Mon, 11 Aug 2014) $"/>
+		<version number="$Revision: 12128 $"/>
 		<language type="ksh"/>
 	</identity>
 	<localeDisplayNames>
@@ -42,7 +41,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="av" draft="contributed">Avahresch</language>
 			<language type="ay" draft="contributed">Aimahresch</language>
 			<language type="az" draft="contributed">Asserbaidschahnesch</language>
-			<language type="azb" draft="contributed">Södasserbaidschahnesch</language>
+			<language type="az_Arab" draft="contributed">Södasserbaidschahnesch</language>
 			<language type="ba" draft="contributed">Baschkihresch</language>
 			<language type="bal" draft="contributed">Beluhtschesch</language>
 			<language type="ban" draft="contributed">Balinehsesch</language>
@@ -324,7 +323,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI" draft="contributed">Anggwilla</territory>
 			<territory type="AL" draft="contributed">Albaanije</territory>
 			<territory type="AM" draft="contributed">Arrmeenije</territory>
-			<territory type="AN" draft="contributed">de Nederlängsche Antille</territory>
 			<territory type="AO" draft="contributed">Angjoola</territory>
 			<territory type="AQ" draft="contributed">der Södpol</territory>
 			<territory type="AR" draft="contributed">Ajjentiinije</territory>
@@ -631,66 +629,66 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="numbers" draft="contributed">de Nummere</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers" draft="contributed">araabesche un indesche Zeffere</type>
-			<type type="arabext" key="numbers" draft="contributed">ußjedehnt araabesche un indesche Zeffere</type>
-			<type type="armn" key="numbers" draft="contributed">armeenesche Zahle</type>
-			<type type="armnlow" key="numbers" draft="contributed">klein jeschrevve armeenesche Zahle</type>
-			<type type="beng" key="numbers" draft="contributed">bängjaalesche Zeffere</type>
-			<type type="big5han" key="collation" draft="contributed">zoteert nohm tradizjonäll schineesesch Big5</type>
-			<type type="buddhist" key="calendar" draft="contributed">buddistesche Kaländer</type>
-			<type type="chinese" key="calendar" draft="contributed">schineesesche Kaländer</type>
-			<type type="coptic" key="calendar" draft="contributed">kopttesche Kaländer</type>
-			<type type="deva" key="numbers" draft="contributed">Devanagari-Zeffere</type>
-			<type type="dictionary" key="collation" draft="contributed">zoteert wi em Wööterbooch</type>
-			<type type="ducet" key="collation" draft="contributed">standattmääßesch zoteert nohm Unicode</type>
-			<type type="ethi" key="numbers" draft="contributed">ätejoopesche Zahle</type>
-			<type type="ethiopic" key="calendar" draft="contributed">ätejoopesche Kaländer</type>
-			<type type="ethiopic-amete-alem" key="calendar" draft="contributed">ätejoopesche Amete Alem Kaländer</type>
-			<type type="fullwide" key="numbers" draft="contributed">janz breede Zeffere</type>
-			<type type="gb2312han" key="collation" draft="contributed">zoteert nohm eijfacher schineesesch GB2312</type>
-			<type type="geor" key="numbers" draft="contributed">jeorjeesche Zahle</type>
-			<type type="gregorian" key="calendar" draft="contributed">jrejorejaanesche Kaländer</type>
-			<type type="grek" key="numbers" draft="contributed">jriischesche Zahle</type>
-			<type type="greklow" key="numbers" draft="contributed">klein jeschrevve jriischesche Zahle</type>
-			<type type="gujr" key="numbers" draft="contributed">Jujarati-Zeffere</type>
-			<type type="guru" key="numbers" draft="contributed">Jurmukhi-Zeffere</type>
-			<type type="hanidec" key="numbers" draft="contributed">schineesesche Zehnerzahle</type>
-			<type type="hans" key="numbers" draft="contributed">eijfache schineesesche Zahle</type>
-			<type type="hansfin" key="numbers" draft="contributed">eijfache schineesesche Finanzzahle</type>
-			<type type="hant" key="numbers" draft="contributed">tradizjonälle schineesesche Zahle</type>
-			<type type="hantfin" key="numbers" draft="contributed">tradizjonälle schineesesche Finanzzahle</type>
-			<type type="hebr" key="numbers" draft="contributed">hebräjesche Zahle</type>
-			<type type="hebrew" key="calendar" draft="contributed">jüdesche Kaländer</type>
-			<type type="indian" key="calendar" draft="contributed">indesche Nazjonahl-Kaländer</type>
-			<type type="islamic" key="calendar" draft="contributed">ißlaamesche Kaländer</type>
-			<type type="islamic-civil" key="calendar" draft="contributed">wältlesche islaamesche Kaländer</type>
-			<type type="japanese" key="calendar" draft="contributed">japaanesche Kaländer</type>
-			<type type="jpan" key="numbers" draft="contributed">japanesche Zahle</type>
-			<type type="jpanfin" key="numbers" draft="contributed">japaanesche Finazzahle</type>
-			<type type="khmr" key="numbers" draft="contributed">Khmer-Zeffere</type>
-			<type type="knda" key="numbers" draft="contributed">Kannada-Zeffere</type>
-			<type type="laoo" key="numbers" draft="contributed">laootesche Zeffere</type>
-			<type type="latn" key="numbers" draft="contributed">wäßlejje Zeffere</type>
-			<type type="mlym" key="numbers" draft="contributed">Malayalam-Zeffere</type>
-			<type type="mong" key="numbers" draft="contributed">mongjoolesche Zeffere</type>
-			<type type="mymr" key="numbers" draft="contributed">Myanmar-Zeffere</type>
-			<type type="orya" key="numbers" draft="contributed">Oriya-Zeffere</type>
-			<type type="persian" key="calendar" draft="contributed">pärsesche Kaländer</type>
-			<type type="phonebook" key="collation" draft="contributed">zoteert wi em Tollefoonbooch</type>
-			<type type="pinyin" key="collation" draft="contributed">zoteert noh de Pinjin Ömschreff vum Schineesesch</type>
-			<type type="roc" key="calendar" draft="contributed">rotschineesesche Kaländer</type>
-			<type type="roman" key="numbers" draft="contributed">römesche Zahle</type>
-			<type type="romanlow" key="numbers" draft="contributed">klein jeschrevve römesche Zahle</type>
-			<type type="search" key="collation" draft="contributed">Söhke</type>
-			<type type="standard" key="collation" draft="contributed">Schtandatt</type>
-			<type type="stroke" key="collation" draft="contributed">zoteert noh de Stresche vum tradizjonäll schineesesch</type>
-			<type type="taml" key="numbers" draft="contributed">tradizjonälle tamilesche Zahle</type>
-			<type type="tamldec" key="numbers" draft="contributed">tamiilesche Zeffere</type>
-			<type type="telu" key="numbers" draft="contributed">Teluju-Zeffere</type>
-			<type type="thai" key="numbers" draft="contributed">thailändesche Zeffere</type>
-			<type type="tibt" key="numbers" draft="contributed">tibetaanesche Zeffere</type>
-			<type type="traditional" key="collation" draft="contributed">tradizjonäll zoteert</type>
-			<type type="unihan" key="collation" draft="contributed">zoteert noh de Radikaale un Stresche vum Schineesesch</type>
+			<type key="calendar" type="buddhist" draft="contributed">buddistesche Kaländer</type>
+			<type key="calendar" type="chinese" draft="contributed">schineesesche Kaländer</type>
+			<type key="calendar" type="coptic" draft="contributed">kopttesche Kaländer</type>
+			<type key="calendar" type="ethiopic" draft="contributed">ätejoopesche Kaländer</type>
+			<type key="calendar" type="ethiopic-amete-alem" draft="contributed">ätejoopesche Amete Alem Kaländer</type>
+			<type key="calendar" type="gregorian" draft="contributed">jrejorejaanesche Kaländer</type>
+			<type key="calendar" type="hebrew" draft="contributed">jüdesche Kaländer</type>
+			<type key="calendar" type="indian" draft="contributed">indesche Nazjonahl-Kaländer</type>
+			<type key="calendar" type="islamic" draft="contributed">ißlaamesche Kaländer</type>
+			<type key="calendar" type="islamic-civil" draft="contributed">wältlesche islaamesche Kaländer</type>
+			<type key="calendar" type="japanese" draft="contributed">japaanesche Kaländer</type>
+			<type key="calendar" type="persian" draft="contributed">pärsesche Kaländer</type>
+			<type key="calendar" type="roc" draft="contributed">rotschineesesche Kaländer</type>
+			<type key="collation" type="big5han" draft="contributed">zoteert nohm tradizjonäll schineesesch Big5</type>
+			<type key="collation" type="dictionary" draft="contributed">zoteert wi em Wööterbooch</type>
+			<type key="collation" type="ducet" draft="contributed">standattmääßesch zoteert nohm Unicode</type>
+			<type key="collation" type="gb2312han" draft="contributed">zoteert nohm eijfacher schineesesch GB2312</type>
+			<type key="collation" type="phonebook" draft="contributed">zoteert wi em Tollefoonbooch</type>
+			<type key="collation" type="pinyin" draft="contributed">zoteert noh de Pinjin Ömschreff vum Schineesesch</type>
+			<type key="collation" type="search" draft="contributed">Söhke</type>
+			<type key="collation" type="standard" draft="contributed">Schtandatt</type>
+			<type key="collation" type="stroke" draft="contributed">zoteert noh de Stresche vum tradizjonäll schineesesch</type>
+			<type key="collation" type="traditional" draft="contributed">tradizjonäll zoteert</type>
+			<type key="collation" type="unihan" draft="contributed">zoteert noh de Radikaale un Stresche vum Schineesesch</type>
+			<type key="numbers" type="arab" draft="contributed">araabesche un indesche Zeffere</type>
+			<type key="numbers" type="arabext" draft="contributed">ußjedehnt araabesche un indesche Zeffere</type>
+			<type key="numbers" type="armn" draft="contributed">armeenesche Zahle</type>
+			<type key="numbers" type="armnlow" draft="contributed">klein jeschrevve armeenesche Zahle</type>
+			<type key="numbers" type="beng" draft="contributed">bängjaalesche Zeffere</type>
+			<type key="numbers" type="deva" draft="contributed">Devanagari-Zeffere</type>
+			<type key="numbers" type="ethi" draft="contributed">ätejoopesche Zahle</type>
+			<type key="numbers" type="fullwide" draft="contributed">janz breede Zeffere</type>
+			<type key="numbers" type="geor" draft="contributed">jeorjeesche Zahle</type>
+			<type key="numbers" type="grek" draft="contributed">jriischesche Zahle</type>
+			<type key="numbers" type="greklow" draft="contributed">klein jeschrevve jriischesche Zahle</type>
+			<type key="numbers" type="gujr" draft="contributed">Jujarati-Zeffere</type>
+			<type key="numbers" type="guru" draft="contributed">Jurmukhi-Zeffere</type>
+			<type key="numbers" type="hanidec" draft="contributed">schineesesche Zehnerzahle</type>
+			<type key="numbers" type="hans" draft="contributed">eijfache schineesesche Zahle</type>
+			<type key="numbers" type="hansfin" draft="contributed">eijfache schineesesche Finanzzahle</type>
+			<type key="numbers" type="hant" draft="contributed">tradizjonälle schineesesche Zahle</type>
+			<type key="numbers" type="hantfin" draft="contributed">tradizjonälle schineesesche Finanzzahle</type>
+			<type key="numbers" type="hebr" draft="contributed">hebräjesche Zahle</type>
+			<type key="numbers" type="jpan" draft="contributed">japanesche Zahle</type>
+			<type key="numbers" type="jpanfin" draft="contributed">japaanesche Finazzahle</type>
+			<type key="numbers" type="khmr" draft="contributed">Khmer-Zeffere</type>
+			<type key="numbers" type="knda" draft="contributed">Kannada-Zeffere</type>
+			<type key="numbers" type="laoo" draft="contributed">laootesche Zeffere</type>
+			<type key="numbers" type="latn" draft="contributed">wäßlejje Zeffere</type>
+			<type key="numbers" type="mlym" draft="contributed">Malayalam-Zeffere</type>
+			<type key="numbers" type="mong" draft="contributed">mongjoolesche Zeffere</type>
+			<type key="numbers" type="mymr" draft="contributed">Myanmar-Zeffere</type>
+			<type key="numbers" type="orya" draft="contributed">Oriya-Zeffere</type>
+			<type key="numbers" type="roman" draft="contributed">römesche Zahle</type>
+			<type key="numbers" type="romanlow" draft="contributed">klein jeschrevve römesche Zahle</type>
+			<type key="numbers" type="taml" draft="contributed">tradizjonälle tamilesche Zahle</type>
+			<type key="numbers" type="tamldec" draft="contributed">tamiilesche Zeffere</type>
+			<type key="numbers" type="telu" draft="contributed">Teluju-Zeffere</type>
+			<type key="numbers" type="thai" draft="contributed">thailändesche Zeffere</type>
+			<type key="numbers" type="tibt" draft="contributed">tibetaanesche Zeffere</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric" draft="contributed">SI</measurementSystemName>
@@ -1690,6 +1688,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern draft="contributed">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="zero" draft="provisional">0 tsd ¤</pattern>
+					<pattern type="1000" count="one" draft="provisional">0 tsd ¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0 tsd ¤</pattern>
+					<pattern type="10000" count="zero" draft="provisional">00 tsd ¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00 tsd ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00 tsd ¤</pattern>
+					<pattern type="100000" count="zero" draft="provisional">000 tsd ¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000 tsd ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000 tsd ¤</pattern>
+					<pattern type="1000000" count="zero" draft="provisional">0 Mio ¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0 Mio ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0 Mio ¤</pattern>
+					<pattern type="10000000" count="zero" draft="provisional">00 Mio ¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00 Mio ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00 Mio ¤</pattern>
+					<pattern type="100000000" count="zero" draft="provisional">000 Mio ¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000 Mio ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000 Mio ¤</pattern>
+					<pattern type="1000000000" count="zero" draft="provisional">0 Mrd ¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0 Mrd ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0 Mrd ¤</pattern>
+					<pattern type="10000000000" count="zero" draft="provisional">00 Mrd ¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00 Mrd ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00 Mrd ¤</pattern>
+					<pattern type="100000000000" count="zero" draft="provisional">000 Mrd ¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000 Mrd ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000 Mrd ¤</pattern>
+					<pattern type="1000000000000" count="zero" draft="provisional">0 Bio ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0 Bio ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0 Bio ¤</pattern>
+					<pattern type="10000000000000" count="zero" draft="provisional">00 Bio ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00 Bio ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00 Bio ¤</pattern>
+					<pattern type="100000000000000" count="zero" draft="provisional">000 Bio ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000 Bio ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000 Bio ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="zero" draft="contributed">{0} {1}</unitPattern>
 			<unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
 			<unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
@@ -2341,6 +2379,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0}-fache Erdbeschleunigung</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}-fache Erdbeschleunigung</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<displayName draft="contributed">Graad</displayName>
+				<unitPattern count="zero" draft="contributed">{0} Graad</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} Graad</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Graad</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName draft="contributed">Winkelmenutte</displayName>
 				<unitPattern count="zero" draft="contributed">{0} Winkelmenutte</unitPattern>
@@ -2353,17 +2397,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} Winkelsekunde</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} Winkelsekunde</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName draft="contributed">Graad</displayName>
-				<unitPattern count="zero" draft="contributed">{0} Graad</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} Graad</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Graad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="contributed">angloamerikanischen Acre</displayName>
-				<unitPattern count="zero" draft="contributed">{0} angloamerikanischen Acre</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} angloamerikanische Acre</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} angloamerikanischen Acre</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName draft="contributed">Quadratkilometer</displayName>
+				<unitPattern count="zero" draft="contributed">{0} Quadratkilometer</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} Quadratkilometer</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Quadratkilometer</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName draft="contributed">hektar</displayName>
@@ -2371,18 +2409,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} hektar</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} hektar</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<displayName draft="contributed">Quadratvoss</displayName>
-				<unitPattern count="zero" draft="contributed">{0} Quadratvoss</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} Quadratvoss</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Quadratvoss</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="contributed">Quadratkilometer</displayName>
-				<unitPattern count="zero" draft="contributed">{0} Quadratkilometer</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} Quadratkilometer</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Quadratkilometer</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<displayName draft="contributed">Quadratmeter</displayName>
 				<unitPattern count="zero" draft="contributed">{0} Quadratmeter</unitPattern>
@@ -2395,6 +2421,36 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} englische Quadratmeile</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} englischen Quadratmeilen</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<displayName draft="contributed">angloamerikanischen Acre</displayName>
+				<unitPattern count="zero" draft="contributed">{0} angloamerikanischen Acre</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} angloamerikanische Acre</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} angloamerikanischen Acre</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName draft="contributed">Quadratvoss</displayName>
+				<unitPattern count="zero" draft="contributed">{0} Quadratvoss</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} Quadratvoss</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Quadratvoss</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="contributed">Johre</displayName>
+				<unitPattern count="zero">{0} Johre</unitPattern>
+				<unitPattern count="one">{0} Johre</unitPattern>
+				<unitPattern count="other">{0} Johre</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">Mohnde</displayName>
+				<unitPattern count="zero">{0} Mohnde</unitPattern>
+				<unitPattern count="one">{0} Mohnde</unitPattern>
+				<unitPattern count="other">{0} Mohnde</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="contributed">Woche</displayName>
+				<unitPattern count="zero">{0} Woche</unitPattern>
+				<unitPattern count="one">{0} Woche</unitPattern>
+				<unitPattern count="other">{0} Woche</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="contributed">Dääsch</displayName>
 				<unitPattern count="zero">{0} Dääsch</unitPattern>
@@ -2407,59 +2463,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Schtunde</unitPattern>
 				<unitPattern count="other">{0} Schtunde</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="contributed">Millisekunde</displayName>
-				<unitPattern count="zero" draft="contributed">{0} Millisekunde</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} Millisekunde</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Millisekunde</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="contributed">Menutte</displayName>
 				<unitPattern count="zero">{0} Menutte</unitPattern>
 				<unitPattern count="one">{0} Menutte</unitPattern>
 				<unitPattern count="other">{0} Menutte</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">Mohnde</displayName>
-				<unitPattern count="zero">{0} Mohnde</unitPattern>
-				<unitPattern count="one">{0} Mohnde</unitPattern>
-				<unitPattern count="other">{0} Mohnde</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="contributed">Sekunde</displayName>
 				<unitPattern count="zero">{0} Sekunde</unitPattern>
 				<unitPattern count="one">{0} Sekunde</unitPattern>
 				<unitPattern count="other">{0} Sekunde</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">Woche</displayName>
-				<unitPattern count="zero">{0} Woche</unitPattern>
-				<unitPattern count="one">{0} Woche</unitPattern>
-				<unitPattern count="other">{0} Woche</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">Johre</displayName>
-				<unitPattern count="zero">{0} Johre</unitPattern>
-				<unitPattern count="one">{0} Johre</unitPattern>
-				<unitPattern count="other">{0} Johre</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">Zentimeter</displayName>
-				<unitPattern count="zero" draft="contributed">{0} Zentimeter</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} Zentimeter</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Zentimeter</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="contributed">Voss</displayName>
-				<unitPattern count="zero" draft="contributed">{0} Voss</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} Voss</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Voss</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="contributed">Dumm</displayName>
-				<unitPattern count="zero" draft="contributed">{0} Dumm</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} Dumm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Dumm</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="contributed">Millisekunde</displayName>
+				<unitPattern count="zero" draft="contributed">{0} Millisekunde</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} Millisekunde</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Millisekunde</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="contributed">Kilometer</displayName>
@@ -2473,11 +2493,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} Meter</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} Meter</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName draft="contributed">englischen Meilen</displayName>
-				<unitPattern count="zero" draft="contributed">{0} englischen Meilen</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} englische Meile</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} englischen Meilen</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="contributed">Zentimeter</displayName>
+				<unitPattern count="zero" draft="contributed">{0} Zentimeter</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} Zentimeter</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Zentimeter</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="contributed">Millimeter</displayName>
@@ -2491,11 +2511,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} Pikometer</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} Pikometer</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="contributed">Gramm</displayName>
-				<unitPattern count="zero" draft="contributed">{0} Gramm</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} Gramm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Gramm</unitPattern>
+			<unit type="length-mile">
+				<displayName draft="contributed">englischen Meilen</displayName>
+				<unitPattern count="zero" draft="contributed">{0} englischen Meilen</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} englische Meile</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} englischen Meilen</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName draft="contributed">Voss</displayName>
+				<unitPattern count="zero" draft="contributed">{0} Voss</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} Voss</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Voss</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="contributed">Dumm</displayName>
+				<unitPattern count="zero" draft="contributed">{0} Dumm</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} Dumm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Dumm</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="contributed">Kilogramm</displayName>
@@ -2503,11 +2535,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} Kilogramm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} Kilogramm</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="contributed">Unzen</displayName>
-				<unitPattern count="zero" draft="contributed">{0} Unzen</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} Unze</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Unzen</unitPattern>
+			<unit type="mass-gram">
+				<displayName draft="contributed">Gramm</displayName>
+				<unitPattern count="zero" draft="contributed">{0} Gramm</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} Gramm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Gramm</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<displayName draft="contributed">Pfund</displayName>
@@ -2515,11 +2547,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} Pfund</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} Pfund</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="contributed">Pferdestärken</displayName>
-				<unitPattern count="zero" draft="contributed">{0} Pferdestärken</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} Pferdestärke</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Pferdestärken</unitPattern>
+			<unit type="mass-ounce">
+				<displayName draft="contributed">Unzen</displayName>
+				<unitPattern count="zero" draft="contributed">{0} Unzen</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} Unze</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Unzen</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName draft="contributed">Kilowatt</displayName>
@@ -2533,6 +2565,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} Watt</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} Watt</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<displayName draft="contributed">Pferdestärken</displayName>
+				<unitPattern count="zero" draft="contributed">{0} Pferdestärken</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} Pferdestärke</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Pferdestärken</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="contributed">Hektopascal</displayName>
 				<unitPattern count="zero" draft="contributed">{0} Hektopascal</unitPattern>
@@ -2610,6 +2648,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} G</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<displayName draft="contributed">Graad</displayName>
+				<unitPattern count="zero" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName draft="contributed">Winkelmenutte</displayName>
 				<unitPattern count="zero" draft="contributed">{0}′</unitPattern>
@@ -2622,17 +2666,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0}″</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName draft="contributed">Graad</displayName>
-				<unitPattern count="zero" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="contributed">angloamerikanischen Acre</displayName>
-				<unitPattern count="zero">{0} ac</unitPattern>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName draft="contributed">Quadratkilometer</displayName>
+				<unitPattern count="zero" draft="contributed">{0} km²</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName draft="contributed">hektar</displayName>
@@ -2640,18 +2678,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} ha</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<displayName draft="contributed">Quadratvoss</displayName>
-				<unitPattern count="zero">{0} ft²</unitPattern>
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="contributed">Quadratkilometer</displayName>
-				<unitPattern count="zero" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<displayName draft="contributed">Quadratmeter</displayName>
 				<unitPattern count="zero" draft="contributed">{0} m²</unitPattern>
@@ -2664,6 +2690,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<displayName draft="contributed">angloamerikanischen Acre</displayName>
+				<unitPattern count="zero">{0} ac</unitPattern>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName draft="contributed">Quadratvoss</displayName>
+				<unitPattern count="zero">{0} ft²</unitPattern>
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="contributed">Johre</displayName>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">Mohnde</displayName>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="contributed">Woche</displayName>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="contributed">Dääsch</displayName>
 				<unitPattern count="zero">{0} d</unitPattern>
@@ -2676,50 +2723,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} h</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} h</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="contributed">Millisekunde</displayName>
-				<unitPattern count="zero" draft="contributed">{0} ms</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} ms</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="contributed">Menutte</displayName>
 				<unitPattern count="zero" draft="contributed">{0} min</unitPattern>
 				<unitPattern count="one" draft="contributed">{0} min</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} min</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">Mohnde</displayName>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="contributed">Sekunde</displayName>
 				<unitPattern count="zero" draft="contributed">{0} s</unitPattern>
 				<unitPattern count="one" draft="contributed">{0} s</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">Woche</displayName>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">Johre</displayName>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">Zentimeter</displayName>
-				<unitPattern count="zero" draft="contributed">{0} cm</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} cm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="contributed">Voss</displayName>
-				<unitPattern count="zero" draft="contributed">{0} Voss</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} Voss</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Voss</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="contributed">Dumm</displayName>
-				<unitPattern count="zero" draft="contributed">{0} Dumm</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} Dumm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Dumm</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="contributed">Millisekunde</displayName>
+				<unitPattern count="zero" draft="contributed">{0} ms</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} ms</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="contributed">Kilometer</displayName>
@@ -2733,11 +2753,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} m</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName draft="contributed">englischen Meilen</displayName>
-				<unitPattern count="zero">{0} mi</unitPattern>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="contributed">Zentimeter</displayName>
+				<unitPattern count="zero" draft="contributed">{0} cm</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} cm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="contributed">Millimeter</displayName>
@@ -2751,11 +2771,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} pm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} pm</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="contributed">Gramm</displayName>
-				<unitPattern count="zero" draft="contributed">{0} g</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} g</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} g</unitPattern>
+			<unit type="length-mile">
+				<displayName draft="contributed">englischen Meilen</displayName>
+				<unitPattern count="zero">{0} mi</unitPattern>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName draft="contributed">Voss</displayName>
+				<unitPattern count="zero" draft="contributed">{0} Voss</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} Voss</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Voss</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="contributed">Dumm</displayName>
+				<unitPattern count="zero" draft="contributed">{0} Dumm</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} Dumm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Dumm</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="contributed">Kilogramm</displayName>
@@ -2763,11 +2795,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} kg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="contributed">Unzen</displayName>
-				<unitPattern count="zero" draft="contributed">{0} Unzen</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} Unze</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Unzen</unitPattern>
+			<unit type="mass-gram">
+				<displayName draft="contributed">Gramm</displayName>
+				<unitPattern count="zero" draft="contributed">{0} g</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} g</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<displayName draft="contributed">Pfund</displayName>
@@ -2775,11 +2807,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} Pfund</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} Pfund</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="contributed">Pferdestärken</displayName>
-				<unitPattern count="zero" draft="contributed">{0} PS</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} PS</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} PS</unitPattern>
+			<unit type="mass-ounce">
+				<displayName draft="contributed">Unzen</displayName>
+				<unitPattern count="zero" draft="contributed">{0} Unzen</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} Unze</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Unzen</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName draft="contributed">Kilowatt</displayName>
@@ -2793,6 +2825,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} W</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<displayName draft="contributed">Pferdestärken</displayName>
+				<unitPattern count="zero" draft="contributed">{0} PS</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} PS</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} PS</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="contributed">Hektopascal</displayName>
 				<unitPattern count="zero" draft="contributed">{0} hPa</unitPattern>
@@ -2869,6 +2907,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0}G</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="zero" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="zero" draft="contributed">{0}′</unitPattern>
 				<unitPattern count="one" draft="contributed">{0}′</unitPattern>
@@ -2879,31 +2922,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0}″</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="zero" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="zero">{0} ac</unitPattern>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="zero" draft="contributed">{0}km²</unitPattern>
+				<unitPattern count="one" draft="contributed">{0}km²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="zero" draft="contributed">{0}ha</unitPattern>
 				<unitPattern count="one" draft="contributed">{0}ha</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="zero">{0} ft²</unitPattern>
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="zero" draft="contributed">{0}km²</unitPattern>
-				<unitPattern count="one" draft="contributed">{0}km²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="zero" draft="contributed">{0}m²</unitPattern>
 				<unitPattern count="one" draft="contributed">{0}m²</unitPattern>
@@ -2914,6 +2942,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="zero">{0} ac</unitPattern>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="zero">{0} ft²</unitPattern>
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<unitPattern count="zero">{0}d</unitPattern>
 				<unitPattern count="one">{0}d</unitPattern>
@@ -2924,11 +2962,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0}h</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}h</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<unitPattern count="zero" draft="contributed">{0}ms</unitPattern>
-				<unitPattern count="one" draft="contributed">{0}ms</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<unitPattern count="zero" draft="contributed">{0}m</unitPattern>
 				<unitPattern count="one" draft="contributed">{0}m</unitPattern>
@@ -2939,20 +2972,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0}s</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}s</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<unitPattern count="zero" draft="contributed">{0}cm</unitPattern>
-				<unitPattern count="one" draft="contributed">{0}cm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="zero" draft="contributed">{0} Voss</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} Voss</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Voss</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="zero" draft="contributed">{0} Dumm</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} Dumm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Dumm</unitPattern>
+			<unit type="duration-millisecond">
+				<unitPattern count="zero" draft="contributed">{0}ms</unitPattern>
+				<unitPattern count="one" draft="contributed">{0}ms</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<unitPattern count="zero" draft="contributed">{0}km</unitPattern>
@@ -2964,10 +2987,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0}m</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="zero">{0} mi</unitPattern>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<unitPattern count="zero" draft="contributed">{0}cm</unitPattern>
+				<unitPattern count="one" draft="contributed">{0}cm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<unitPattern count="zero" draft="contributed">{0}mm</unitPattern>
@@ -2979,30 +3002,40 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0}pm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}pm</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<unitPattern count="zero" draft="contributed">{0}g</unitPattern>
-				<unitPattern count="one" draft="contributed">{0}g</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}g</unitPattern>
+			<unit type="length-mile">
+				<unitPattern count="zero">{0} mi</unitPattern>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<unitPattern count="zero" draft="contributed">{0} Voss</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} Voss</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Voss</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="zero" draft="contributed">{0} Dumm</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} Dumm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Dumm</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<unitPattern count="zero" draft="contributed">{0}kg</unitPattern>
 				<unitPattern count="one" draft="contributed">{0}kg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="zero" draft="contributed">{0} Unzen</unitPattern>
-				<unitPattern count="one" draft="contributed">{0} Unze</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Unzen</unitPattern>
+			<unit type="mass-gram">
+				<unitPattern count="zero" draft="contributed">{0}g</unitPattern>
+				<unitPattern count="one" draft="contributed">{0}g</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="zero" draft="contributed">{0} Pfund</unitPattern>
 				<unitPattern count="one" draft="contributed">{0} Pfund</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} Pfund</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="zero" draft="contributed">{0}PS</unitPattern>
-				<unitPattern count="one" draft="contributed">{0}PS</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}PS</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="zero" draft="contributed">{0} Unzen</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} Unze</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Unzen</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="zero" draft="contributed">{0}kW</unitPattern>
@@ -3014,6 +3047,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0}W</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="zero" draft="contributed">{0}PS</unitPattern>
+				<unitPattern count="one" draft="contributed">{0}PS</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}PS</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="zero" draft="contributed">{0}hPa</unitPattern>
 				<unitPattern count="one" draft="contributed">{0}hPa</unitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ksh_DE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksh_DE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ksh_DE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksh_DE.xml
index fc3a4080d84..292567d4243 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ksh_DE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksh_DE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ksh"/>
 		<territory type="DE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kw.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kw.xml
similarity index 73%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kw.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kw.xml
index d1c68481043..23bd66f2127 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kw.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kw.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11232 $"/>
-		<generation date="$Date: 2015-02-18 13:55:51 -0600 (Wed, 18 Feb 2015) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="kw"/>
 	</identity>
 	<localeDisplayNames>
@@ -52,7 +51,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="calendar" draft="unconfirmed">kalans</key>
 		</keys>
 		<types>
-			<type type="gregorian" key="calendar" draft="unconfirmed">Kalans gregorek</type>
+			<type key="calendar" type="gregorian" draft="unconfirmed">Kalans gregorek</type>
 		</types>
 	</localeDisplayNames>
 	<characters>
@@ -142,6 +141,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</days>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">a.m.</dayPeriod>
+							<dayPeriod type="pm">p.m.</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">a.m.</dayPeriod>
 							<dayPeriod type="pm">p.m.</dayPeriod>
@@ -262,6 +265,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="two" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="two" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="two" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="two" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="two" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="two" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="two" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="two" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="two" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="two" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="two" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="two" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="EUR">
@@ -270,3 +313,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kw_GB.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kw_GB.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kw_GB.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kw_GB.xml
index 4f25e216dc7..4d524ede340 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/kw_GB.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kw_GB.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="kw"/>
 		<territory type="GB"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ky.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ky.xml
similarity index 86%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ky.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ky.xml
index 995ca12eaa0..b0b1e3bf7b3 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ky.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ky.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="ky"/>
 	</identity>
 	<localeDisplayNames>
@@ -28,11 +27,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="as">ассамча</language>
 			<language type="asa">асуча</language>
 			<language type="az">азербайжанча</language>
+			<language type="az" alt="short">азер</language>
 			<language type="ba">башкырча</language>
 			<language type="be">беларусча</language>
 			<language type="bem">бембача</language>
 			<language type="bez">бенача</language>
 			<language type="bg">болгарча</language>
+			<language type="bgn">чыгыш балучиче</language>
 			<language type="bm">бамбарада</language>
 			<language type="bn">бангладешче</language>
 			<language type="bo">тибетче</language>
@@ -40,16 +41,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="brx">бододо</language>
 			<language type="bs">боснийче</language>
 			<language type="ca">каталанча</language>
+			<language type="ce">чеченче</language>
 			<language type="cgg">чигача</language>
 			<language type="chr">черокиче</language>
 			<language type="ckb">сорани курд</language>
 			<language type="co">корсиканча</language>
 			<language type="cs">чехче</language>
+			<language type="cv">чувашча</language>
 			<language type="cy">уелшче</language>
 			<language type="da">датча</language>
 			<language type="dav">таитача</language>
 			<language type="de">немисче</language>
-			<language type="de_CH">жогорку немисче (Швейцария)</language>
 			<language type="dje">замрача</language>
 			<language type="dsb">төмөнкү сорбианча</language>
 			<language type="dua">дуалача</language>
@@ -59,14 +61,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ee">эбече</language>
 			<language type="el">грекче</language>
 			<language type="en">англисче</language>
-			<language type="en_GB" alt="short">англисче (УБ)</language>
 			<language type="en_US" alt="short">англисче (АКШ)</language>
 			<language type="eo">эсперанто</language>
 			<language type="es">испанча</language>
 			<language type="es_ES">испанча (Европа)</language>
 			<language type="et">эстончо</language>
 			<language type="eu">баскча</language>
-			<language type="fa">фарсыча</language>
+			<language type="fa">фарсча</language>
 			<language type="fi">финче</language>
 			<language type="fil">филипино</language>
 			<language type="fj">фижиче</language>
@@ -128,6 +129,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lkt">лакотача</language>
 			<language type="ln">лингалача</language>
 			<language type="lo">лаочо</language>
+			<language type="lrc">түндүк луриче</language>
 			<language type="lt">литовчо</language>
 			<language type="lu">луба-катангача</language>
 			<language type="luo">луочо</language>
@@ -149,9 +151,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mt">малтизче</language>
 			<language type="mua">мундангча</language>
 			<language type="my">бурмача</language>
+			<language type="mzn">мазандераниче</language>
 			<language type="naq">намача</language>
 			<language type="nb">норвежче (Букмал)</language>
 			<language type="nd">түндүк ндыбелче</language>
+			<language type="nds">төмөнкү немисче</language>
+			<language type="nds_NL">төмөнкү саксончо</language>
 			<language type="ne">непалча</language>
 			<language type="nl">голландча</language>
 			<language type="nl_BE">фламандча</language>
@@ -182,6 +187,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="saq">самбуруча</language>
 			<language type="sbp">сангуча</language>
 			<language type="sd">синдхиче</language>
+			<language type="sdh">түштүк курдча</language>
 			<language type="se">түндүк самиче</language>
 			<language type="seh">сенача</language>
 			<language type="ses">койраборо сенниче</language>
@@ -203,7 +209,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="su">сунданча</language>
 			<language type="sv">шведче</language>
 			<language type="sw">суахиличе</language>
-			<language type="swc">конго суахаличе</language>
+			<language type="sw_CD">конго суахаличе</language>
 			<language type="ta">тамилче</language>
 			<language type="te">телугуча</language>
 			<language type="teo">тесочо</language>
@@ -226,6 +232,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="vai">вайиче</language>
 			<language type="vi">вьетнамча</language>
 			<language type="vun">вунжочо</language>
+			<language type="wbp">ворлпириче</language>
 			<language type="wo">уолофчо</language>
 			<language type="xh">косача</language>
 			<language type="xog">согача</language>
@@ -244,7 +251,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Beng">Бенгал</script>
 			<script type="Bopo">Бопомофо</script>
 			<script type="Brai">Брейл</script>
-			<script type="Cyrl">Кирилик</script>
+			<script type="Cyrl">Кирилл</script>
 			<script type="Deva">Деванагари</script>
 			<script type="Ethi">Эфиоп</script>
 			<script type="Geor">Грузин</script>
@@ -252,7 +259,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Gujr">Гужарати</script>
 			<script type="Guru">Гурмухи</script>
 			<script type="Hang">Хангул</script>
-			<script type="Hani">Хани</script>
+			<script type="Hani">Хань</script>
 			<script type="Hans">Жөн. Кытай</script>
 			<script type="Hans" alt="stand-alone">Жөн. Кытай</script>
 			<script type="Hant">Салт. Кытай</script>
@@ -584,61 +591,74 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ZZ">Белгисиз регион</territory>
 		</territories>
 		<keys>
-			<key type="calendar">календарь</key>
-			<key type="collation">иреттөө тартиби</key>
-			<key type="currency">валюта</key>
+			<key type="calendar">Жылнаама</key>
+			<key type="collation">Иргөө тартиби</key>
+			<key type="currency">Валюта</key>
+			<key type="hc">Саат мерчеми (12/24)</key>
+			<key type="lb">Саптарды ажыратуу стили</key>
+			<key type="ms">Өлчөө тутуму</key>
 			<key type="numbers">сандар</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">араб-индус сандары</type>
-			<type type="arabext" key="numbers">кеңейтилген араб-индус сандары</type>
-			<type type="armn" key="numbers">армян сандары</type>
-			<type type="armnlow" key="numbers">армян сандары (саптык жазылыш)</type>
-			<type type="beng" key="numbers">бенгали сандары</type>
-			<type type="buddhist" key="calendar">буддачылык календары</type>
-			<type type="chinese" key="calendar">кытай календары</type>
-			<type type="dangi" key="calendar">данги каленендары</type>
-			<type type="deva" key="numbers">деванагари сандары</type>
-			<type type="ducet" key="collation">баштапкы уникод ирети</type>
-			<type type="ethi" key="numbers">эфиоп сандары</type>
-			<type type="ethiopic" key="calendar">эфиоп календары</type>
-			<type type="fullwide" key="numbers">толук эндүү сандар</type>
-			<type type="geor" key="numbers">грузин сандары</type>
-			<type type="gregorian" key="calendar">григориан календары</type>
-			<type type="grek" key="numbers">грек сандары</type>
-			<type type="greklow" key="numbers">грек сандары (саптык жазылыш)</type>
-			<type type="gujr" key="numbers">гужарати сандары</type>
-			<type type="guru" key="numbers">гурмухи сандары</type>
-			<type type="hanidec" key="numbers">кытай ондук сандары</type>
-			<type type="hans" key="numbers">жөнөкөйлөштүрүлгөн кытай сандары</type>
-			<type type="hansfin" key="numbers">жөнөкөйлөштүрүлгөн кытай финансы сандары</type>
-			<type type="hant" key="numbers">салттуу кытай сандары</type>
-			<type type="hantfin" key="numbers">салттуу кытай финансы сандары</type>
-			<type type="hebr" key="numbers">иврит сандары</type>
-			<type type="hebrew" key="calendar">иврит календары</type>
-			<type type="islamic" key="calendar">ислам календары</type>
-			<type type="iso8601" key="calendar">ИСО-8601 календары</type>
-			<type type="japanese" key="calendar">япон календары</type>
-			<type type="jpan" key="numbers">япон сандары</type>
-			<type type="jpanfin" key="numbers">япон финансы сандары</type>
-			<type type="khmr" key="numbers">кмер сандары</type>
-			<type type="knda" key="numbers">каннада сандары</type>
-			<type type="laoo" key="numbers">лао сандары</type>
-			<type type="latn" key="numbers">батыш сандары</type>
-			<type type="mlym" key="numbers">малайалам сандары</type>
-			<type type="mymr" key="numbers">мйанмар сандары</type>
-			<type type="orya" key="numbers">ория сандары</type>
-			<type type="persian" key="calendar">перс календары</type>
-			<type type="roc" key="calendar">мингуо календары</type>
-			<type type="roman" key="numbers">роман сандары</type>
-			<type type="romanlow" key="numbers">роман сандары (саптык жазылыш)</type>
-			<type type="search" key="collation">жалпы издөө</type>
-			<type type="standard" key="collation">иреттөө стандарты</type>
-			<type type="taml" key="numbers">салттуу тамил сандары</type>
-			<type type="tamldec" key="numbers">тамил сандары</type>
-			<type type="telu" key="numbers">телугу сандары</type>
-			<type type="thai" key="numbers">тай сандары</type>
-			<type type="tibt" key="numbers">тибет сандары</type>
+			<type key="calendar" type="buddhist">Будда жылнаамасы</type>
+			<type key="calendar" type="chinese">Кытай жылнаамасы</type>
+			<type key="calendar" type="dangi">Данги жылнаамасы</type>
+			<type key="calendar" type="ethiopic">Эфиоп жылнаамасы</type>
+			<type key="calendar" type="gregorian">Григориан жылнаамасы</type>
+			<type key="calendar" type="hebrew">Иврит жылнаамасы</type>
+			<type key="calendar" type="islamic">Ислам жылнаамасы</type>
+			<type key="calendar" type="iso8601">ИСО-8601 жылнаамасы</type>
+			<type key="calendar" type="japanese">Жапон жылнаамасы</type>
+			<type key="calendar" type="persian">Перс жылнаамасы</type>
+			<type key="calendar" type="roc">Мингуо жылнаамасы</type>
+			<type key="collation" type="ducet">Демейки Unicode иргөө тартиби</type>
+			<type key="collation" type="search">Жалпы издөө</type>
+			<type key="collation" type="standard">Стандарттуу иргөө тартиби</type>
+			<type key="hc" type="h11">12 сааттык тутум (0–11)</type>
+			<type key="hc" type="h12">12 сааттык тутум (1–12)</type>
+			<type key="hc" type="h23">24 сааттык тутум (0–23)</type>
+			<type key="hc" type="h24">24 сааттык тутум (1–24)</type>
+			<type key="lb" type="loose">Саптардын арасы кенен</type>
+			<type key="lb" type="normal">Саптардын арасы орточо</type>
+			<type key="lb" type="strict">Саптардын арасы тыкыс</type>
+			<type key="ms" type="metric">Метрикалык тутум</type>
+			<type key="ms" type="uksystem">Британ империясынын өлчөө тутуму</type>
+			<type key="ms" type="ussystem">АКШнын өлчөө тутуму</type>
+			<type key="numbers" type="arab">араб-индус сандары</type>
+			<type key="numbers" type="arabext">кеңейтилген араб-индус сандары</type>
+			<type key="numbers" type="armn">армян сандары</type>
+			<type key="numbers" type="armnlow">армян сандары (саптык жазылыш)</type>
+			<type key="numbers" type="beng">бенгали сандары</type>
+			<type key="numbers" type="deva">деванагари сандары</type>
+			<type key="numbers" type="ethi">эфиоп сандары</type>
+			<type key="numbers" type="fullwide">толук эндүү сандар</type>
+			<type key="numbers" type="geor">грузин сандары</type>
+			<type key="numbers" type="grek">грек сандары</type>
+			<type key="numbers" type="greklow">грек сандары (саптык жазылыш)</type>
+			<type key="numbers" type="gujr">гужарати сандары</type>
+			<type key="numbers" type="guru">гурмухи сандары</type>
+			<type key="numbers" type="hanidec">кытай ондук сандары</type>
+			<type key="numbers" type="hans">жөнөкөйлөштүрүлгөн кытай сандары</type>
+			<type key="numbers" type="hansfin">жөнөкөйлөштүрүлгөн кытай финансы сандары</type>
+			<type key="numbers" type="hant">салттуу кытай сандары</type>
+			<type key="numbers" type="hantfin">салттуу кытай финансы сандары</type>
+			<type key="numbers" type="hebr">иврит сандары</type>
+			<type key="numbers" type="jpan">япон сандары</type>
+			<type key="numbers" type="jpanfin">япон финансы сандары</type>
+			<type key="numbers" type="khmr">кмер сандары</type>
+			<type key="numbers" type="knda">каннада сандары</type>
+			<type key="numbers" type="laoo">лао сандары</type>
+			<type key="numbers" type="latn">батыш сандары</type>
+			<type key="numbers" type="mlym">малайалам сандары</type>
+			<type key="numbers" type="mymr">мйанмар сандары</type>
+			<type key="numbers" type="orya">ория сандары</type>
+			<type key="numbers" type="roman">роман сандары</type>
+			<type key="numbers" type="romanlow">роман сандары (саптык жазылыш)</type>
+			<type key="numbers" type="taml">салттуу тамил сандары</type>
+			<type key="numbers" type="tamldec">тамил сандары</type>
+			<type key="numbers" type="telu">телугу сандары</type>
+			<type key="numbers" type="thai">тай сандары</type>
+			<type key="numbers" type="tibt">тибет сандары</type>
 		</types>
 		<transformNames>
 			<transformName type="Numeric" draft="unconfirmed">Сандык</transformName>
@@ -651,7 +671,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<transformName type="x-Publishing" draft="unconfirmed">Басмаканалык</transformName>
 		</transformNames>
 		<measurementSystemNames>
-			<measurementSystemName type="metric">метрикалык</measurementSystemName>
+			<measurementSystemName type="metric">Метрикалык өлчөө тутуму</measurementSystemName>
 			<measurementSystemName type="UK">Британия</measurementSystemName>
 			<measurementSystemName type="US">АКШ</measurementSystemName>
 		</measurementSystemNames>
@@ -728,6 +748,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d, E</dateFormatItem>
 						<dateFormatItem id="Gy">G y</dateFormatItem>
 						<dateFormatItem id="GyMMM">G y MMM</dateFormatItem>
@@ -739,6 +760,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d-MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">d-MMM, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="y">y-G</dateFormatItem>
 						<dateFormatItem id="yyyy">y-G</dateFormatItem>
 						<dateFormatItem id="yyyyM">GGGGG y-MM</dateFormatItem>
@@ -747,6 +769,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">G y-'ж'. MMM</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">G y-'ж'. d-MMM</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">G y-'ж'. d-MMM, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y MMMM</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">G y-'ж'. QQQ</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">G y-'ж'. QQQQ</dateFormatItem>
 					</availableFormats>
@@ -1056,15 +1079,67 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">түн ортосу</dayPeriod>
+							<dayPeriod type="am">тң</dayPeriod>
+							<dayPeriod type="noon">чак түш</dayPeriod>
+							<dayPeriod type="pm">тк</dayPeriod>
+							<dayPeriod type="morning1">эртең менен</dayPeriod>
+							<dayPeriod type="afternoon1">түштөн кийин</dayPeriod>
+							<dayPeriod type="evening1">кечинде</dayPeriod>
+							<dayPeriod type="night1">түн ичинде</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">түн орт</dayPeriod>
 							<dayPeriod type="am">тң</dayPeriod>
 							<dayPeriod type="noon">чт</dayPeriod>
 							<dayPeriod type="pm">тк</dayPeriod>
+							<dayPeriod type="morning1">эртң мн</dayPeriod>
+							<dayPeriod type="afternoon1">түшт кйн</dayPeriod>
+							<dayPeriod type="evening1">кечк</dayPeriod>
+							<dayPeriod type="night1">түн</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">түн ортосу</dayPeriod>
 							<dayPeriod type="am">таңкы</dayPeriod>
 							<dayPeriod type="noon">чак түш</dayPeriod>
-							<dayPeriod type="pm">түштөн кийин</dayPeriod>
+							<dayPeriod type="pm">түштөн кийинки</dayPeriod>
+							<dayPeriod type="morning1">эртең менен</dayPeriod>
+							<dayPeriod type="afternoon1">түштөн кийин</dayPeriod>
+							<dayPeriod type="evening1">кечинде</dayPeriod>
+							<dayPeriod type="night1">түн ичинде</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">түн ортосу</dayPeriod>
+							<dayPeriod type="am">тң</dayPeriod>
+							<dayPeriod type="noon">чак түш</dayPeriod>
+							<dayPeriod type="pm">тк</dayPeriod>
+							<dayPeriod type="morning1">эртең менен</dayPeriod>
+							<dayPeriod type="afternoon1">түштөн кийин</dayPeriod>
+							<dayPeriod type="evening1">кечкурун</dayPeriod>
+							<dayPeriod type="night1">түн</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">түн ортосу</dayPeriod>
+							<dayPeriod type="am">тң</dayPeriod>
+							<dayPeriod type="noon">чак түш</dayPeriod>
+							<dayPeriod type="pm">тк</dayPeriod>
+							<dayPeriod type="morning1">эртең менен</dayPeriod>
+							<dayPeriod type="afternoon1">түштөн кийин</dayPeriod>
+							<dayPeriod type="evening1">кечкурун</dayPeriod>
+							<dayPeriod type="night1">түн</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">түн ортосу</dayPeriod>
+							<dayPeriod type="am">таңкы</dayPeriod>
+							<dayPeriod type="noon">чак түш</dayPeriod>
+							<dayPeriod type="pm">түштөн кийинки</dayPeriod>
+							<dayPeriod type="morning1">эртең менен</dayPeriod>
+							<dayPeriod type="afternoon1">түштөн кийин</dayPeriod>
+							<dayPeriod type="evening1">кечкурун</dayPeriod>
+							<dayPeriod type="night1">түн</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1078,7 +1153,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<era type="1">б.з.</era>
 					</eraAbbr>
 					<eraNarrow>
-						<era type="0" draft="unconfirmed">б.з. ч.</era>
+						<era type="0" draft="unconfirmed">б.з.ч.</era>
 						<era type="1" draft="unconfirmed">б.з.</era>
 					</eraNarrow>
 				</eras>
@@ -1165,12 +1240,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">dd-MM</dateFormatItem>
 						<dateFormatItem id="MEd">dd-MM, E</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d-MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">d-MMM, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">y-MM</dateFormatItem>
@@ -1179,6 +1259,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yMMM">y-'ж'. MMM</dateFormatItem>
 						<dateFormatItem id="yMMMd">y-'ж'. d-MMM</dateFormatItem>
 						<dateFormatItem id="yMMMEd">y-'ж'. d-MMM, E</dateFormatItem>
+						<dateFormatItem id="yMMMM">y MMMM</dateFormatItem>
 						<dateFormatItem id="yQQQ">y-'ж'., QQQ</dateFormatItem>
 						<dateFormatItem id="yQQQQ">y-'ж'., QQQQ</dateFormatItem>
 					</availableFormats>
@@ -1303,6 +1384,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>ж.</displayName>
+				<relative type="-1">былтыр</relative>
+				<relative type="0">быйыл</relative>
+				<relative type="1">эмдиги жылы</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} жыл. кийин</relativeTimePattern>
 					<relativeTimePattern count="other">{0} жыл. кийин</relativeTimePattern>
@@ -1314,6 +1398,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>ж.</displayName>
+				<relative type="-1">былтыр</relative>
+				<relative type="0">быйыл</relative>
+				<relative type="1">эмдиги жылы</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} жыл. кийин</relativeTimePattern>
 					<relativeTimePattern count="other">{0} жыл. кийин</relativeTimePattern>
@@ -1325,6 +1412,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter">
 				<displayName>чейрек</displayName>
+				<relative type="-1">акыркы чейрек</relative>
+				<relative type="0">бул чейрек</relative>
+				<relative type="1">кийинки чейрек</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">кийинки {0} чейректе</relativeTimePattern>
 					<relativeTimePattern count="other">кийинки {0} чейректе</relativeTimePattern>
@@ -1336,6 +1426,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>чейр.</displayName>
+				<relative type="-1">акыркы чейр.</relative>
+				<relative type="0">бул чейр.</relative>
+				<relative type="1">кийинки чейр.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">кийинки {0} чейр.</relativeTimePattern>
 					<relativeTimePattern count="other">кийинки {0} чейр.</relativeTimePattern>
@@ -1347,6 +1440,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>чейр.</displayName>
+				<relative type="-1">акыркы чейр.</relative>
+				<relative type="0">бул чейр.</relative>
+				<relative type="1">кийинки чейр.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} чейр.</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} чейр.</relativeTimePattern>
@@ -1372,6 +1468,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>ай</displayName>
+				<relative type="-1">өткөн айда</relative>
+				<relative type="0">бул айда</relative>
+				<relative type="1">эмдиги айда</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} айдан кийин</relativeTimePattern>
 					<relativeTimePattern count="other">{0} айдан кийин</relativeTimePattern>
@@ -1383,6 +1482,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>ай</displayName>
+				<relative type="-1">өткөн айда</relative>
+				<relative type="0">бул айда</relative>
+				<relative type="1">эмдиги айда</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} ай</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} ай</relativeTimePattern>
@@ -1408,6 +1510,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>апта</displayName>
+				<relative type="-1">өткөн апт.</relative>
+				<relative type="0">ушул апт.</relative>
+				<relative type="1">келерки апт.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} апт. кийин</relativeTimePattern>
 					<relativeTimePattern count="other">{0} апт. кийин</relativeTimePattern>
@@ -1419,6 +1524,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>апта</displayName>
+				<relative type="-1">өткөн апт.</relative>
+				<relative type="0">ушул апт.</relative>
+				<relative type="1">келерки апт.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} апт.</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} апт.</relativeTimePattern>
@@ -1446,6 +1554,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>күн</displayName>
+				<relative type="-2">мурдагы күнү</relative>
+				<relative type="-1">кечээ</relative>
+				<relative type="0">бүгүн</relative>
+				<relative type="1">эртеӊ</relative>
+				<relative type="2">бүрсүгүнү</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} күндөн кийин</relativeTimePattern>
 					<relativeTimePattern count="other">{0} күндөн кийин</relativeTimePattern>
@@ -1457,6 +1570,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>күн</displayName>
+				<relative type="-2">мурдагы күнү</relative>
+				<relative type="-1">кечээ</relative>
+				<relative type="0">бүгүн</relative>
+				<relative type="1">эртеӊ</relative>
+				<relative type="2">бүрсүгүнү</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} күн</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} күн</relativeTimePattern>
@@ -1512,7 +1630,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="tue-narrow">
 				<relative type="-1">өткөн шш.</relative>
 				<relative type="0">ушул шш.</relative>
-				<relative type="1">ушул шш.</relative>
+				<relative type="1">келерки шейш.</relative>
 			</field>
 			<field type="wed">
 				<relative type="-1">өткөн шаршембиде</relative>
@@ -1589,7 +1707,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="hour-short">
-				<displayName>с.</displayName>
+				<displayName>ст</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} саат. кийин</relativeTimePattern>
 					<relativeTimePattern count="other">{0} саат. кийин</relativeTimePattern>
@@ -1600,7 +1718,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="hour-narrow">
-				<displayName>с</displayName>
+				<displayName>ст</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} с.</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} с.</relativeTimePattern>
@@ -1678,7 +1796,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>саат алкагы</displayName>
+				<displayName>убакыт алкагы</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
@@ -2258,7 +2376,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</zone>
 			<zone type="Europe/Dublin">
 				<long>
-					<daylight>Ирландия жайкы убактысы</daylight>
+					<daylight>Ирландия стандарттык убакыты</daylight>
 				</long>
 				<exemplarCity>Дублин</exemplarCity>
 			</zone>
@@ -2446,7 +2564,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Маврикий</exemplarCity>
 			</zone>
 			<zone type="Indian/Maldives">
-				<exemplarCity>Малдивз</exemplarCity>
+				<exemplarCity>Мальдив аралдары</exemplarCity>
 			</zone>
 			<zone type="Africa/Blantyre">
 				<exemplarCity>Блантайр</exemplarCity>
@@ -2556,6 +2674,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Порт Моэрсби</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Бугенвиль</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Манила</exemplarCity>
 			</zone>
@@ -2640,6 +2761,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Иркутск</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Чита</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Якутск</exemplarCity>
 			</zone>
@@ -2658,6 +2782,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Магадан</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Среднеколымск</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Камчатка</exemplarCity>
 			</zone>
@@ -2746,7 +2873,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Бангкок</exemplarCity>
 			</zone>
 			<zone type="Asia/Dushanbe">
-				<exemplarCity>Дүйшөмбү</exemplarCity>
+				<exemplarCity>Душанбе</exemplarCity>
 			</zone>
 			<zone type="Pacific/Fakaofo">
 				<exemplarCity>Факаофо</exemplarCity>
@@ -3052,28 +3179,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Австралия борбордук убактысы</generic>
 					<standard>Австралия борбордук стандарт убактысы</standard>
-					<daylight>Австралия борбордук үнөмдөө убактысы</daylight>
+					<daylight>Австралия борбордук күндүзгү убактысы</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_CentralWestern">
 				<long>
 					<generic>Австралия борбордук батыш убактысы</generic>
 					<standard>Австралия борбордук батыш стандарт убактысы</standard>
-					<daylight>Австралия борбордук батыш үнөмдөө убактысы</daylight>
+					<daylight>Австралия борбордук чыгыш күндүзгү убактысы</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Eastern">
 				<long>
 					<generic>Австралия чыгыш убактысы</generic>
 					<standard>Австралия чыгыш стандарт убактысы</standard>
-					<daylight>Австралия чыгыш үнөмдөө убактысы</daylight>
+					<daylight>Австралия чыгыш күндүзгү убактысы</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Western">
 				<long>
 					<generic>Австралия батыш убактысы</generic>
 					<standard>Австралия батыш стандарт убактысы</standard>
-					<daylight>Австралия батыш үнөмдөө убактысы</daylight>
+					<daylight>Австралия батыш күндүзгү убактысы</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azerbaijan">
@@ -3135,7 +3262,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Чатам убактысы</generic>
 					<standard>Чатам стандарт убактысы</standard>
-					<daylight>Чатам үнөмдөө убактысы</daylight>
+					<daylight>Чатам күндүзгү убактысы</daylight>
 				</long>
 			</metazone>
 			<metazone type="Chile">
@@ -3149,7 +3276,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Кытай убактысы</generic>
 					<standard>Кытай стандарт убактысы</standard>
-					<daylight>Кытай үнөмдөө убактысы</daylight>
+					<daylight>Кытай күндүзгү убактысы</daylight>
 				</long>
 			</metazone>
 			<metazone type="Choibalsan">
@@ -3187,7 +3314,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Куба убактысы</generic>
 					<standard>Куба стандарт убактысы</standard>
-					<daylight>Куба үнөмдөө убактысы</daylight>
+					<daylight>Куба жайкы убактысы</daylight>
 				</long>
 			</metazone>
 			<metazone type="Davis">
@@ -3259,7 +3386,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="French_Guiana">
 				<long>
-					<standard>Френч Гуйана убактысы</standard>
+					<standard>Француз Гвиана убактысы</standard>
 				</long>
 			</metazone>
 			<metazone type="French_Southern">
@@ -3315,7 +3442,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Guyana">
 				<long>
-					<standard>Гуйана убактысы</standard>
+					<standard>Гвиана убактысы</standard>
 				</long>
 			</metazone>
 			<metazone type="Hawaii_Aleutian">
@@ -3327,9 +3454,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>
-					<generic>Гоӊ Коӊ убактысы</generic>
-					<standard>Гоӊ Коӊ стандарт убактысы</standard>
-					<daylight>Гоӊ Коӊ жайкы убактысы</daylight>
+					<generic>Гонконг убактысы</generic>
+					<standard>Гонконг стандарт убактысы</standard>
+					<daylight>Гонконг жайкы убактысы</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hovd">
@@ -3373,7 +3500,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Иран убактысы</generic>
 					<standard>Иран стандарт убактысы</standard>
-					<daylight>Иран үнөмдөө убактысы</daylight>
+					<daylight>Иран күндүзгү убактысы</daylight>
 				</long>
 			</metazone>
 			<metazone type="Irkutsk">
@@ -3387,14 +3514,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Израил убактысы</generic>
 					<standard>Израил стандарт убактысы</standard>
-					<daylight>Израил үнөмдөө убактысы</daylight>
+					<daylight>Израил күндүзгү убакыты</daylight>
 				</long>
 			</metazone>
 			<metazone type="Japan">
 				<long>
 					<generic>Жапан убактысы</generic>
 					<standard>Жапан стандарт убактысы</standard>
-					<daylight>Жапан үнөмдөө убактысы</daylight>
+					<daylight>Жапан күндүзгү убактысы</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kazakhstan_Eastern">
@@ -3411,7 +3538,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Корея убактысы</generic>
 					<standard>Корея стандарт убактысы</standard>
-					<daylight>Корея үнөмдөө убактысы</daylight>
+					<daylight>Корея күндүзгү убактысы</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kosrae">
@@ -3440,7 +3567,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Лорд Хау убактысы</generic>
 					<standard>Лорд Хау стандарт убактысы</standard>
-					<daylight>Лорд Хау үнөмдөө убактысы</daylight>
+					<daylight>Лорд Хау күндүзгү убактысы</daylight>
 				</long>
 			</metazone>
 			<metazone type="Macquarie">
@@ -3462,7 +3589,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Maldives">
 				<long>
-					<standard>Малдив убактысы</standard>
+					<standard>Мальдив убактысы</standard>
 				</long>
 			</metazone>
 			<metazone type="Marquesas">
@@ -3484,7 +3611,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Mawson">
 				<long>
-					<standard>Мосон убактысы</standard>
+					<standard>Моусон убактысы</standard>
 				</long>
 			</metazone>
 			<metazone type="Mexico_Northwest">
@@ -3541,7 +3668,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Жаӊы Зеландия убактысы</generic>
 					<standard>Жаӊы Зеландия стандарт убактысы</standard>
-					<daylight>Жаӊы Зеландия үнөмдөө убактысы</daylight>
+					<daylight>Жаңы Зеландия күндүзгү убактысы</daylight>
 				</long>
 			</metazone>
 			<metazone type="Newfoundland">
@@ -3615,9 +3742,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Philippines">
 				<long>
-					<generic>Филиппинз убактысы</generic>
-					<standard>Филиппинз стандарт убактысы</standard>
-					<daylight>Филиппинз жайкы убактысы</daylight>
+					<generic>Филиппин аралдарынын убактысы</generic>
+					<standard>Филиппин аралдарынын стандарт убактысы</standard>
+					<daylight>Филиппин аралдарынын жайкы убактысы</daylight>
 				</long>
 			</metazone>
 			<metazone type="Phoenix_Islands">
@@ -3705,7 +3832,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Тайпей убактысы</generic>
 					<standard>Тайпей стандарт убактысы</standard>
-					<daylight>Тайпей үнөмдөө убактысы</daylight>
+					<daylight>Тайпей күндүзгү убактысы</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tajikistan">
@@ -3814,6 +3941,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</timeZoneNames>
 	</dates>
 	<numbers>
+		<defaultNumberingSystem draft="contributed">latn</defaultNumberingSystem>
+		<otherNumberingSystems>
+			<native draft="contributed">latn</native>
+		</otherNumberingSystems>
 		<minimumGroupingDigits draft="contributed">1</minimumGroupingDigits>
 		<symbols numberSystem="latn">
 			<decimal>,</decimal>
@@ -3914,6 +4045,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">0 миӊ ¤</pattern>
+					<pattern type="1000" count="other">0 миӊ ¤</pattern>
+					<pattern type="10000" count="one">00 миӊ ¤</pattern>
+					<pattern type="10000" count="other">00 миӊ ¤</pattern>
+					<pattern type="100000" count="one">000 миӊ ¤</pattern>
+					<pattern type="100000" count="other">000 миӊ ¤</pattern>
+					<pattern type="1000000" count="one">0 млн ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="one">00 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="one">000 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="one">0 млд ¤</pattern>
+					<pattern type="1000000000" count="other">0 млд ¤</pattern>
+					<pattern type="10000000000" count="one">00 млд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млд ¤</pattern>
+					<pattern type="100000000000" count="one">000 млд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млд ¤</pattern>
+					<pattern type="1000000000000" count="one">0 трн ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трн ¤</pattern>
+					<pattern type="10000000000000" count="one">00 трн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трн ¤</pattern>
+					<pattern type="100000000000000" count="one">000 трн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -3922,31 +4081,38 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Бириккен Араб Эмираттары дирхамы</displayName>
 				<displayName count="one">БАЭ дирхамы</displayName>
 				<displayName count="other">БАЭ дирхамы</displayName>
+				<symbol draft="contributed">AED</symbol>
 			</currency>
 			<currency type="AFN">
 				<displayName>Афганстан афганиси</displayName>
 				<displayName count="one">Афганстан афганиси</displayName>
 				<displayName count="other">Афганстан афганиси</displayName>
+				<symbol draft="contributed">AFN</symbol>
 			</currency>
 			<currency type="ALL">
 				<displayName>албан леги</displayName>
 				<displayName count="one">албан леги</displayName>
 				<displayName count="other">албан леги</displayName>
+				<symbol draft="contributed">ALL</symbol>
 			</currency>
 			<currency type="AMD">
 				<displayName>Армения драмы</displayName>
 				<displayName count="one">Армения драмы</displayName>
 				<displayName count="other">Армения драмы</displayName>
+				<symbol draft="contributed">AMD</symbol>
 			</currency>
 			<currency type="ANG">
 				<displayName>нидерланд-антил гулдени</displayName>
 				<displayName count="one">нидерланд-антил гулдени</displayName>
 				<displayName count="other">нидерланд-антил гулдени</displayName>
+				<symbol draft="contributed">ANG</symbol>
 			</currency>
 			<currency type="AOA">
 				<displayName>Ангола кванзасы</displayName>
 				<displayName count="one">Ангола кванзасы</displayName>
 				<displayName count="other">Ангола кванзасы</displayName>
+				<symbol draft="contributed">AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="ARS">
 				<displayName>аргентина песосу</displayName>
@@ -3960,33 +4126,40 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Австралия доллары</displayName>
 				<displayName count="other">Австралия доллары</displayName>
 				<symbol>AUD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="AWG">
 				<displayName>аруба флорини</displayName>
 				<displayName count="one">аруба флорини</displayName>
 				<displayName count="other">аруба флорини</displayName>
+				<symbol draft="contributed">AWG</symbol>
 			</currency>
 			<currency type="AZN">
 				<displayName>Азербайжан манаты</displayName>
 				<displayName count="one">Азербайжан манаты</displayName>
 				<displayName count="other">Азербайжан манаты</displayName>
+				<symbol draft="contributed">AZN</symbol>
 			</currency>
 			<currency type="BAM">
 				<displayName>босния-герцоговина жүгүртөлмөлүү маркасы</displayName>
 				<displayName count="one">босния-герцоговина жүгүртөлмөлүү маркасы</displayName>
 				<displayName count="other">босния-герцоговина жүгүртөлмөлүү маркасы</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>барбадос доллары</displayName>
 				<displayName count="one">барбадос доллары</displayName>
 				<displayName count="other">барбадос доллары</displayName>
 				<symbol>BBD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BDT">
 				<displayName>Бангладеш такасы</displayName>
 				<displayName count="one">Бангладеш такасы</displayName>
 				<displayName count="other">Бангладеш такасы</displayName>
+				<symbol draft="contributed">BDT</symbol>
+				<symbol alt="narrow" draft="contributed">৳</symbol>
 			</currency>
 			<currency type="BGN">
 				<displayName>болгар левиси</displayName>
@@ -3998,28 +4171,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Бахрейн динары</displayName>
 				<displayName count="one">Бахрейн динары</displayName>
 				<displayName count="other">Бахрейн динары</displayName>
+				<symbol draft="contributed">BHD</symbol>
 			</currency>
 			<currency type="BIF">
 				<displayName>Бурунди франкы</displayName>
 				<displayName count="one">Бурунди франкы</displayName>
 				<displayName count="other">Бурунди франкы</displayName>
+				<symbol draft="contributed">BIF</symbol>
 			</currency>
 			<currency type="BMD">
 				<displayName>бермуд доллары</displayName>
 				<displayName count="one">бермуд доллары</displayName>
 				<displayName count="other">бермуд доллары</displayName>
 				<symbol>BMD</symbol>
+				<symbol alt="narrow" draft="contributed">BD$</symbol>
 			</currency>
 			<currency type="BND">
 				<displayName>Бруней доллары</displayName>
 				<displayName count="one">Бруней доллары</displayName>
 				<displayName count="other">Бруней доллары</displayName>
+				<symbol draft="contributed">BND</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BOB">
 				<displayName>боливия боливианосу</displayName>
 				<displayName count="one">боливия боливианосу</displayName>
 				<displayName count="other">боливия боливианосу</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BRL">
 				<displayName>бразилия реалы</displayName>
@@ -4032,39 +4211,48 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>багама доллары</displayName>
 				<displayName count="one">багама доллары</displayName>
 				<displayName count="other">багама доллары</displayName>
+				<symbol draft="contributed">BSD</symbol>
+				<symbol alt="narrow" draft="contributed">B$</symbol>
 			</currency>
 			<currency type="BTN">
 				<displayName>Бутан нгултруму</displayName>
 				<displayName count="one">Бутан нгултруму</displayName>
 				<displayName count="other">Бутан нгултруму</displayName>
+				<symbol draft="contributed">BTN</symbol>
 			</currency>
 			<currency type="BWP">
 				<displayName>Ботсвана пуласы</displayName>
 				<displayName count="one">Ботсвана пуласы</displayName>
 				<displayName count="other">Ботсвана пуласы</displayName>
+				<symbol draft="contributed">BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYR">
 				<displayName>беларусь рублу</displayName>
 				<displayName count="one">беларусь рублу</displayName>
 				<displayName count="other">беларусь рублу</displayName>
 				<symbol>BYR</symbol>
+				<symbol alt="narrow" draft="contributed">р.</symbol>
 			</currency>
 			<currency type="BZD">
 				<displayName>белиз доллары</displayName>
 				<displayName count="one">белиз доллары</displayName>
 				<displayName count="other">белиз доллары</displayName>
 				<symbol>BZD</symbol>
+				<symbol alt="narrow" draft="contributed">BZ$</symbol>
 			</currency>
 			<currency type="CAD">
 				<displayName>канада доллары</displayName>
 				<displayName count="one">канада доллары</displayName>
 				<displayName count="other">канада долларлары</displayName>
 				<symbol>CAD</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="CDF">
 				<displayName>Конго франкы</displayName>
 				<displayName count="one">Конго франкы</displayName>
 				<displayName count="other">Конго франкы</displayName>
+				<symbol draft="contributed">CDF</symbol>
 			</currency>
 			<currency type="CHF">
 				<displayName>швейцария франкы</displayName>
@@ -4084,6 +4272,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Кытай юаны</displayName>
 				<displayName count="other">Кытай юаны</displayName>
 				<symbol>CN¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
 			<currency type="COP">
 				<displayName>колумбия песосу</displayName>
@@ -4096,16 +4285,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>коста-рика колону</displayName>
 				<displayName count="one">коста-рика колону</displayName>
 				<displayName count="other">коста-рика колону</displayName>
+				<symbol draft="contributed">CRC</symbol>
+				<symbol alt="narrow" draft="contributed">₡</symbol>
 			</currency>
 			<currency type="CUC">
 				<displayName>куба жүгүртүлмөлүү песосу</displayName>
 				<displayName count="one">куба жүгүртүлмөлүү песосу</displayName>
 				<displayName count="other">куба жүгүртүлмөлүү песосу</displayName>
+				<symbol draft="contributed">CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>куба песосу</displayName>
 				<displayName count="one">куба песосу</displayName>
 				<displayName count="other">куба песосу</displayName>
+				<symbol draft="contributed">CUP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CVE">
 				<displayName>Кабо-Верде эскудосу</displayName>
@@ -4118,42 +4313,52 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">чех кронасы</displayName>
 				<displayName count="other">чех кронасы</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DJF">
 				<displayName>Жибути франкы</displayName>
 				<displayName count="one">Жибути франкы</displayName>
 				<displayName count="other">Жибути франкы</displayName>
+				<symbol draft="contributed">DJF</symbol>
 			</currency>
 			<currency type="DKK">
 				<displayName>дания крону</displayName>
 				<displayName count="one">дания крону</displayName>
 				<displayName count="other">дания крону</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>доминикан песосу</displayName>
 				<displayName count="one">доминикан песосу</displayName>
 				<displayName count="other">доминикан песосу</displayName>
+				<symbol draft="contributed">DOP</symbol>
+				<symbol alt="narrow" draft="contributed">RD$</symbol>
 			</currency>
 			<currency type="DZD">
-				<displayName>Алжир динары</displayName>
-				<displayName count="one">Алжир динары</displayName>
-				<displayName count="other">Алжир динары</displayName>
+				<displayName>алжир динары</displayName>
+				<displayName count="one">алжир динары</displayName>
+				<displayName count="other">алжир динары</displayName>
+				<symbol draft="contributed">DZD</symbol>
 			</currency>
 			<currency type="EGP">
-				<displayName>Мисир фунту</displayName>
-				<displayName count="one">Мисир фунту</displayName>
-				<displayName count="other">Мисир фунту</displayName>
+				<displayName>египет фунту</displayName>
+				<displayName count="one">египет фунту</displayName>
+				<displayName count="other">египет фунту</displayName>
+				<symbol draft="contributed">EGP</symbol>
+				<symbol alt="narrow" draft="contributed">LE</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>Эритреа накфасы</displayName>
 				<displayName count="one">Эритреа накфасы</displayName>
 				<displayName count="other">Эритреа накфасы</displayName>
+				<symbol draft="contributed">ERN</symbol>
 			</currency>
 			<currency type="ETB">
 				<displayName>Эфиопия бирри</displayName>
 				<displayName count="one">Эфиопия бирри</displayName>
 				<displayName count="other">Эфиопия бирри</displayName>
+				<symbol draft="contributed">ETB</symbol>
 			</currency>
 			<currency type="EUR">
 				<displayName>Евро</displayName>
@@ -4166,17 +4371,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Фижи доллары</displayName>
 				<displayName count="one">Фижи доллары</displayName>
 				<displayName count="other">Фижи доллары</displayName>
+				<symbol draft="contributed">FJD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="FKP">
 				<displayName>фолкленд аралдарынын фунту</displayName>
 				<displayName count="one">фолкленд аралдарынын фунту</displayName>
 				<displayName count="other">фолкленд аралдарынын фунту</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GBP">
-				<displayName>британия фунт</displayName>
-				<displayName count="one">британия фунт</displayName>
-				<displayName count="other">британия фунт</displayName>
+				<displayName>британия фунт стерлинги</displayName>
+				<displayName count="one">британия фунт стерлинги</displayName>
+				<displayName count="other">британия фунт стерлинги</displayName>
 				<symbol>GBP</symbol>
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
@@ -4184,6 +4392,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Грузия лариси</displayName>
 				<displayName count="one">Грузия лариси</displayName>
 				<displayName count="other">Грузия лариси</displayName>
+				<symbol draft="contributed">GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHS">
 				<displayName>Гана седиси</displayName>
@@ -4196,6 +4406,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">гибралтар фунту</displayName>
 				<displayName count="other">гибралтар фунту</displayName>
 				<symbol>GIP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GMD">
 				<displayName>Гамбия даласиси</displayName>
@@ -4208,12 +4419,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Гине франкы</displayName>
 				<displayName count="other">Гине франкы</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GTQ">
 				<displayName>гватемала кетсалы</displayName>
 				<displayName count="one">гватемала кетсалы</displayName>
 				<displayName count="other">гватемала кетсалы</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GYD">
 				<displayName>гуйана доллары</displayName>
@@ -4223,87 +4436,104 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="HKD">
-				<displayName>Гоӊ Коӊ доллары</displayName>
-				<displayName count="one">Гоӊ Коӊ доллары</displayName>
-				<displayName count="other">Гоӊ Коӊ доллары</displayName>
+				<displayName>Гонконг доллары</displayName>
+				<displayName count="one">Гонконг доллары</displayName>
+				<displayName count="other">Гонконг доллары</displayName>
 				<symbol>HKD</symbol>
+				<symbol alt="narrow" draft="contributed">HK$</symbol>
 			</currency>
 			<currency type="HNL">
 				<displayName>гондурас лемпирасы</displayName>
 				<displayName count="one">гондурас лемпирасы</displayName>
 				<displayName count="other">гондурас лемпирасы</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRK">
 				<displayName>хорват кунасы</displayName>
 				<displayName count="one">хорват кунасы</displayName>
 				<displayName count="other">хорват кунасы</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">Kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>гаити гурдусу</displayName>
 				<displayName count="one">гаити гурдусу</displayName>
 				<displayName count="other">гаити гурдусу</displayName>
+				<symbol draft="contributed">HTG</symbol>
 			</currency>
 			<currency type="HUF">
 				<displayName>венгр форинти</displayName>
 				<displayName count="one">венгр форинти</displayName>
 				<displayName count="other">венгр форинти</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>Индонезия рупийасы</displayName>
 				<displayName count="one">Индонезия рупийасы</displayName>
 				<displayName count="other">Индонезия рупийасы</displayName>
+				<symbol draft="contributed">IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="ILS">
 				<displayName>Израил жаӊы шегели</displayName>
 				<displayName count="one">Израил жаӊы шегели</displayName>
 				<displayName count="other">Израил жаӊы шегели</displayName>
 				<symbol>ILS</symbol>
+				<symbol alt="narrow" draft="contributed">₪</symbol>
 			</currency>
 			<currency type="INR">
 				<displayName>Индия руписи</displayName>
 				<displayName count="one">Индия руписи</displayName>
 				<displayName count="other">Индия руписи</displayName>
 				<symbol>INR</symbol>
+				<symbol alt="narrow" draft="contributed">₹</symbol>
 			</currency>
 			<currency type="IQD">
 				<displayName>Ирак динары</displayName>
 				<displayName count="one">Ирак динары</displayName>
 				<displayName count="other">Ирак динары</displayName>
+				<symbol draft="contributed">IQD</symbol>
 			</currency>
 			<currency type="IRR">
 				<displayName>Иран риалы</displayName>
 				<displayName count="one">Иран риалы</displayName>
 				<displayName count="other">Иран риалы</displayName>
+				<symbol draft="contributed">IRR</symbol>
 			</currency>
 			<currency type="ISK">
 				<displayName>исландия крону</displayName>
 				<displayName count="one">исландия крону</displayName>
 				<displayName count="other">исландия крону</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="JMD">
 				<displayName>ямайка доллары</displayName>
 				<displayName count="one">ямайка доллары</displayName>
 				<displayName count="other">ямайка доллары</displayName>
+				<symbol draft="contributed">JMD</symbol>
+				<symbol alt="narrow" draft="contributed">J$</symbol>
 			</currency>
 			<currency type="JOD">
 				<displayName>Йордания динары</displayName>
 				<displayName count="one">Йордания динары</displayName>
 				<displayName count="other">Йордания динары</displayName>
+				<symbol draft="contributed">JOD</symbol>
 			</currency>
 			<currency type="JPY">
 				<displayName>Жапан йени</displayName>
 				<displayName count="one">Жапан йени</displayName>
 				<displayName count="other">Жапан йени</displayName>
 				<symbol>JP¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
 			<currency type="KES">
 				<displayName>Кения шиллинги</displayName>
 				<displayName count="one">Кения шиллинги</displayName>
 				<displayName count="other">Кения шиллинги</displayName>
+				<symbol draft="contributed">KES</symbol>
 			</currency>
 			<currency type="KGS">
 				<displayName>Кыргызстан сому</displayName>
@@ -4315,52 +4545,70 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Камбожа риели</displayName>
 				<displayName count="one">Камбожа риели</displayName>
 				<displayName count="other">Камбожа риели</displayName>
+				<symbol draft="contributed">KHR</symbol>
+				<symbol alt="narrow" draft="contributed">៛</symbol>
 			</currency>
 			<currency type="KMF">
 				<displayName>Коморос франкы</displayName>
 				<displayName count="one">Коморос франкы</displayName>
 				<displayName count="other">Коморос франкы</displayName>
+				<symbol draft="contributed">KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>Түндүк Корея уону</displayName>
 				<displayName count="one">Түндүк Корея уону</displayName>
 				<displayName count="other">Түндүк Корея уону</displayName>
+				<symbol draft="contributed">KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>Түштүк Корея уону</displayName>
 				<displayName count="one">Түштүк Корея уону</displayName>
 				<displayName count="other">Түштүк Корея уону</displayName>
 				<symbol>KRW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KWD">
 				<displayName>Кувейт динары</displayName>
 				<displayName count="one">Кувейт динары</displayName>
 				<displayName count="other">Кувейт динары</displayName>
+				<symbol draft="contributed">KWD</symbol>
 			</currency>
 			<currency type="KYD">
 				<displayName>кайман доллары</displayName>
 				<displayName count="one">кайман доллары</displayName>
 				<displayName count="other">кайман доллары</displayName>
+				<symbol draft="contributed">KYD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="KZT">
 				<displayName>Казакстан теӊгеси</displayName>
 				<displayName count="one">Казакстан теӊгеси</displayName>
 				<displayName count="other">Казакстан теӊгеси</displayName>
+				<symbol draft="contributed">KZT</symbol>
+				<symbol alt="narrow" draft="contributed">₸</symbol>
 			</currency>
 			<currency type="LAK">
 				<displayName>Лаос киби</displayName>
 				<displayName count="one">Лаос киби</displayName>
 				<displayName count="other">Лаос киби</displayName>
+				<symbol draft="contributed">LAK</symbol>
+				<symbol alt="narrow" draft="contributed">₭</symbol>
 			</currency>
 			<currency type="LBP">
 				<displayName>Ливан фунту</displayName>
 				<displayName count="one">Ливан фунту</displayName>
 				<displayName count="other">Ливан фунту</displayName>
+				<symbol draft="contributed">LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>Шри Ланка руписи</displayName>
 				<displayName count="one">Шри Ланка руписи</displayName>
 				<displayName count="other">Шри Ланка руписи</displayName>
+				<symbol draft="contributed">LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>Либерия доллары</displayName>
@@ -4382,24 +4630,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>LVL</symbol>
 			</currency>
 			<currency type="LYD">
-				<displayName>Ливия динары</displayName>
-				<displayName count="one">Ливия динары</displayName>
-				<displayName count="other">Ливия динары</displayName>
+				<displayName>ливия динары</displayName>
+				<displayName count="one">ливия динары</displayName>
+				<displayName count="other">ливия динары</displayName>
+				<symbol draft="contributed">LYD</symbol>
 			</currency>
 			<currency type="MAD">
-				<displayName>Марокко дирхамы</displayName>
-				<displayName count="one">Марокко дирхамы</displayName>
-				<displayName count="other">Марокко дирхамы</displayName>
+				<displayName>марокко дирхамы</displayName>
+				<displayName count="one">марокко дирхамы</displayName>
+				<displayName count="other">марокко дирхамы</displayName>
+				<symbol draft="contributed">MAD</symbol>
 			</currency>
 			<currency type="MDL">
 				<displayName>молдован лейи</displayName>
 				<displayName count="one">молдован лейи</displayName>
 				<displayName count="other">молдован лейи</displayName>
+				<symbol draft="contributed">MDL</symbol>
 			</currency>
 			<currency type="MGA">
 				<displayName>Мадагаскар ариариси</displayName>
 				<displayName count="one">Мадагаскар ариариси</displayName>
 				<displayName count="other">Мадагаскар ариариси</displayName>
+				<symbol draft="contributed">MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MKD">
 				<displayName>македон денары</displayName>
@@ -4411,16 +4664,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Мйанмар кйаты</displayName>
 				<displayName count="one">Мйанмар кйаты</displayName>
 				<displayName count="other">Мйанмар кйаты</displayName>
+				<symbol draft="contributed">MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>Монгол тугриги</displayName>
 				<displayName count="one">Монгол тугриги</displayName>
 				<displayName count="other">Монгол тугриги</displayName>
+				<symbol draft="contributed">MNT</symbol>
+				<symbol alt="narrow" draft="contributed">₮</symbol>
 			</currency>
 			<currency type="MOP">
 				<displayName>Макау патакасы</displayName>
 				<displayName count="one">Макау патакасы</displayName>
 				<displayName count="other">Макау патакасы</displayName>
+				<symbol draft="contributed">MOP</symbol>
 			</currency>
 			<currency type="MRO">
 				<displayName>Мавритания угиясы</displayName>
@@ -4432,37 +4690,47 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Мавританий руписи</displayName>
 				<displayName count="one">Мавританий руписи</displayName>
 				<displayName count="other">Мавританий руписи</displayName>
+				<symbol draft="contributed">MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
-				<displayName>Малдив Руфийасы</displayName>
-				<displayName count="one">Малдив Руфийасы</displayName>
-				<displayName count="other">Малдив Руфийасы</displayName>
+				<displayName>Малдив руфийасы</displayName>
+				<displayName count="one">Малдив руфийасы</displayName>
+				<displayName count="other">Малдив руфийасы</displayName>
+				<symbol draft="contributed">MVR</symbol>
 			</currency>
 			<currency type="MWK">
 				<displayName>Малави квачасы</displayName>
 				<displayName count="one">Малави квачасы</displayName>
 				<displayName count="other">Малави квачасы</displayName>
+				<symbol draft="contributed">MWK</symbol>
 			</currency>
 			<currency type="MXN">
 				<displayName>мексика песосу</displayName>
 				<displayName count="one">мексика песосу</displayName>
 				<displayName count="other">мексика песосу</displayName>
 				<symbol>MXN</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="MYR">
 				<displayName>Малайзия ринггити</displayName>
 				<displayName count="one">Малайзия ринггити</displayName>
 				<displayName count="other">Малайзия ринггити</displayName>
+				<symbol draft="contributed">MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZN">
 				<displayName>Мозамбик метикалы</displayName>
 				<displayName count="one">Мозамбик метикалы</displayName>
 				<displayName count="other">Мозамбик метикалы</displayName>
+				<symbol draft="contributed">MZN</symbol>
 			</currency>
 			<currency type="NAD">
 				<displayName>Намибия доллары</displayName>
 				<displayName count="one">Намибия доллары</displayName>
 				<displayName count="other">Намибия доллары</displayName>
+				<symbol draft="contributed">NAD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="NGN">
 				<displayName>Нигерия найрасы</displayName>
@@ -4475,28 +4743,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>никарагуа кордобасы</displayName>
 				<displayName count="one">никарагуа кордобасы</displayName>
 				<displayName count="other">никарагуа кордобасы</displayName>
+				<symbol draft="contributed">NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NOK">
 				<displayName>норвегия крону</displayName>
 				<displayName count="one">норвегия крону</displayName>
 				<displayName count="other">норвегия крону</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>Непал руписи</displayName>
 				<displayName count="one">Непал руписи</displayName>
 				<displayName count="other">Непал руписи</displayName>
+				<symbol draft="contributed">NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>Жаӊы Зеландия доллары</displayName>
 				<displayName count="one">Жаӊы Зеландия доллары</displayName>
 				<displayName count="other">Жаӊы Зеландия доллары</displayName>
 				<symbol>NZD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="OMR">
 				<displayName>Оман риалы</displayName>
 				<displayName count="one">Оман риалы</displayName>
 				<displayName count="other">Оман риалы</displayName>
+				<symbol draft="contributed">OMR</symbol>
 			</currency>
 			<currency type="PAB">
 				<displayName>панама балбоасы</displayName>
@@ -4520,17 +4795,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Филиппин песосу</displayName>
 				<displayName count="one">Филиппин песосу</displayName>
 				<displayName count="other">Филиппин песосу</displayName>
+				<symbol draft="contributed">PHP</symbol>
+				<symbol alt="narrow" draft="contributed">₱</symbol>
 			</currency>
 			<currency type="PKR">
 				<displayName>Пакистан руписи</displayName>
 				<displayName count="one">Пакистан руписи</displayName>
 				<displayName count="other">Пакистан руписи</displayName>
+				<symbol draft="contributed">PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>польша злотыйы</displayName>
 				<displayName count="one">польша злотыйы</displayName>
 				<displayName count="other">польша злотыйы</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PYG">
 				<displayName>парагвай гуараниси</displayName>
@@ -4543,6 +4823,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Катар риалы</displayName>
 				<displayName count="one">Катар риалы</displayName>
 				<displayName count="other">Катар риалы</displayName>
+				<symbol draft="contributed">QAR</symbol>
 			</currency>
 			<currency type="RON">
 				<displayName>румын лейи</displayName>
@@ -4561,16 +4842,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">орус рублу</displayName>
 				<displayName count="other">орус рублу</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RWF">
 				<displayName>Руанда франкы</displayName>
 				<displayName count="one">Руанда франкы</displayName>
 				<displayName count="other">Руанда франкы</displayName>
+				<symbol draft="contributed">RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>Сауд риалы</displayName>
 				<displayName count="one">Сауд риалы</displayName>
 				<displayName count="other">Сауд риалы</displayName>
+				<symbol draft="contributed">SAR</symbol>
 			</currency>
 			<currency type="SBD">
 				<displayName>Соломон доллары</displayName>
@@ -4583,28 +4868,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Сейшел руписи</displayName>
 				<displayName count="one">Сейшел руписи</displayName>
 				<displayName count="other">Сейшел руписи</displayName>
+				<symbol draft="contributed">SCR</symbol>
 			</currency>
 			<currency type="SDG">
-				<displayName>Судан фунту</displayName>
-				<displayName count="one">Судан фунту</displayName>
-				<displayName count="other">Судан фунту</displayName>
+				<displayName>судан фунту</displayName>
+				<displayName count="one">судан фунту</displayName>
+				<displayName count="other">судан фунту</displayName>
+				<symbol draft="contributed">SDG</symbol>
 			</currency>
 			<currency type="SEK">
 				<displayName>швеция крону</displayName>
 				<displayName count="one">швеция крону</displayName>
 				<displayName count="other">швеция крону</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>Сингапур доллары</displayName>
 				<displayName count="one">Сингапур доллары</displayName>
 				<displayName count="other">Сингапур доллары</displayName>
+				<symbol draft="contributed">SGD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SHP">
 				<displayName>Ыйык Елена фунту</displayName>
 				<displayName count="one">Ыйык Елена фунту</displayName>
 				<displayName count="other">Ыйык Елена фунту</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SLL">
 				<displayName>Сиерра-Леоне леонеси</displayName>
@@ -4616,6 +4907,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Сомали шиллинги</displayName>
 				<displayName count="one">Сомали шиллинги</displayName>
 				<displayName count="other">Сомали шиллинги</displayName>
+				<symbol draft="contributed">SOS</symbol>
 			</currency>
 			<currency type="SRD">
 				<displayName>суринам доллары</displayName>
@@ -4628,80 +4920,101 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Түштүк Судан фунту</displayName>
 				<displayName count="one">Түштүк Судан фунту</displayName>
 				<displayName count="other">Түштүк Судан фунту</displayName>
+				<symbol draft="contributed">SSP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="STD">
 				<displayName>Сао Томе жана Принсипе добрасы</displayName>
 				<displayName count="one">Сао Томе жана Принсипе добрасы</displayName>
 				<displayName count="other">Сао Томе жана Принсипе добрасы</displayName>
+				<symbol draft="contributed">STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SYP">
 				<displayName>Сирия фунту</displayName>
 				<displayName count="one">Сирия фунту</displayName>
 				<displayName count="other">Сирия фунту</displayName>
+				<symbol draft="contributed">SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>Свази лилангени</displayName>
 				<displayName count="one">Свази лилангени</displayName>
 				<displayName count="other">Свази эмалангени</displayName>
+				<symbol draft="contributed">SZL</symbol>
 			</currency>
 			<currency type="THB">
 				<displayName>Тай баты</displayName>
 				<displayName count="one">Тай баты</displayName>
 				<displayName count="other">Тай баты</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJS">
 				<displayName>Тажикстан сомониси</displayName>
 				<displayName count="one">Тажикстан сомониси</displayName>
 				<displayName count="other">Тажикстан сомониси</displayName>
+				<symbol draft="contributed">TJS</symbol>
 			</currency>
 			<currency type="TMT">
 				<displayName>Түркмөнстан манаты</displayName>
 				<displayName count="one">Түркмөнстан манаты</displayName>
 				<displayName count="other">Түркмөнстан манаты</displayName>
+				<symbol draft="contributed">TMT</symbol>
 			</currency>
 			<currency type="TND">
-				<displayName>Тунис динары</displayName>
-				<displayName count="one">Тунис динары</displayName>
-				<displayName count="other">Тунис динары</displayName>
+				<displayName>тунис динары</displayName>
+				<displayName count="one">тунис динары</displayName>
+				<displayName count="other">тунис динары</displayName>
+				<symbol draft="contributed">TND</symbol>
 			</currency>
 			<currency type="TOP">
 				<displayName>Тонга паангасы</displayName>
 				<displayName count="one">Тонга паангасы</displayName>
 				<displayName count="other">Тонга паангасы</displayName>
+				<symbol draft="contributed">TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TRY">
 				<displayName>Түркия лирасы</displayName>
 				<displayName count="one">Түркия лирасы</displayName>
 				<displayName count="other">Түркия лирасы</displayName>
+				<symbol draft="contributed">TRY</symbol>
+				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>тринидад жана тобаго доллары</displayName>
 				<displayName count="one">тринидад жана тобаго доллары</displayName>
 				<displayName count="other">тринидад жана тобаго доллары</displayName>
 				<symbol>TTD</symbol>
+				<symbol alt="narrow" draft="contributed">TT$</symbol>
 			</currency>
 			<currency type="TWD">
 				<displayName>Тайвань жаӊы доллары</displayName>
 				<displayName count="one">Тайвань жаӊы доллары</displayName>
 				<displayName count="other">Тайвань жаӊы доллары</displayName>
 				<symbol>TWD</symbol>
+				<symbol alt="narrow" draft="contributed">NT$</symbol>
 			</currency>
 			<currency type="TZS">
 				<displayName>Танзания шиллинги</displayName>
 				<displayName count="one">Танзания шиллинги</displayName>
 				<displayName count="other">Танзания шиллинги</displayName>
+				<symbol draft="contributed">TZS</symbol>
 			</currency>
 			<currency type="UAH">
 				<displayName>украин гривени</displayName>
 				<displayName count="one">украин гривени</displayName>
 				<displayName count="other">украин гривени</displayName>
 				<symbol>UAH</symbol>
+				<symbol alt="narrow" draft="contributed">₴</symbol>
 			</currency>
 			<currency type="UGX">
 				<displayName>Уганда шиллинги</displayName>
 				<displayName count="one">Уганда шиллинги</displayName>
 				<displayName count="other">Уганда шиллинги</displayName>
+				<symbol draft="contributed">UGX</symbol>
 			</currency>
 			<currency type="USD">
 				<displayName>АКШ доллары</displayName>
@@ -4721,28 +5034,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Өзбекстан сому</displayName>
 				<displayName count="one">Өзбекстан сому</displayName>
 				<displayName count="other">Өзбекстан сому</displayName>
+				<symbol draft="contributed">UZS</symbol>
 			</currency>
 			<currency type="VEF">
 				<displayName>венесуэла боливары</displayName>
 				<displayName count="one">венесуэла боливары</displayName>
 				<displayName count="other">венесуэла боливары</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>Вьетнам доӊу</displayName>
 				<displayName count="one">Вьетнам доӊу</displayName>
 				<displayName count="other">Вьетнам доӊу</displayName>
 				<symbol>₫</symbol>
+				<symbol alt="narrow" draft="contributed">₫</symbol>
 			</currency>
 			<currency type="VUV">
 				<displayName>Вануату ватусу</displayName>
 				<displayName count="one">Вануату ватусу</displayName>
 				<displayName count="other">Вануату ватусу</displayName>
+				<symbol draft="contributed">VUV</symbol>
 			</currency>
 			<currency type="WST">
 				<displayName>Самоа таласы</displayName>
 				<displayName count="one">Самоа таласы</displayName>
 				<displayName count="other">Самоа таласы</displayName>
+				<symbol draft="contributed">WST</symbol>
 			</currency>
 			<currency type="XAF">
 				<displayName>КФА ВЕАС франкы</displayName>
@@ -4755,6 +5073,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">чыгыш кариб доллары</displayName>
 				<displayName count="other">чыгыш кариб доллары</displayName>
 				<symbol>XCD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XOF">
 				<displayName>КФА ВСЕАО франкы</displayName>
@@ -4770,23 +5089,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="XXX">
 				<displayName>Белгисиз акча</displayName>
-				<displayName count="one">Белгисиз акча</displayName>
-				<displayName count="other">Белгисиз акча</displayName>
+				<displayName count="one">(белгисиз акча бирдиги)</displayName>
+				<displayName count="other">(белгисиз акча)</displayName>
 			</currency>
 			<currency type="YER">
 				<displayName>Йемен риалы</displayName>
 				<displayName count="one">Йемен риалы</displayName>
 				<displayName count="other">Йемен риалы</displayName>
+				<symbol draft="contributed">YER</symbol>
 			</currency>
 			<currency type="ZAR">
 				<displayName>Түштүк Африка ранды</displayName>
 				<displayName count="one">Түштүк Африка ранды</displayName>
 				<displayName count="other">Түштүк Африка ранды</displayName>
+				<symbol draft="contributed">ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMW">
 				<displayName>Замбия квачасы</displayName>
 				<displayName count="one">Замбия квачасы</displayName>
 				<displayName count="other">Замбия квачасы</displayName>
+				<symbol draft="contributed">ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
@@ -4797,7 +5121,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 	<units>
 		<unitLength type="long">
 			<compoundUnit type="per">
-				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{1}/{0}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>оордук күчүнүн ылдамдануусу</displayName>
@@ -4805,44 +5129,71 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} оордук күчү</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
-				<displayName>метр/квадраттык секунд</displayName>
-				<unitPattern count="one">{0} метр/квадраттык секунд</unitPattern>
-				<unitPattern count="other">{0} метр/квадраттык секунд</unitPattern>
+				<displayName>квадраттык секундасына метр</displayName>
+				<unitPattern count="one">квадраттык секундасына {0} метр</unitPattern>
+				<unitPattern count="other">квадраттык секундасына {0} метр</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName>′</displayName>
-				<unitPattern count="one">{0}′</unitPattern>
-				<unitPattern count="other">{0}′</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName>арксекунд</displayName>
-				<unitPattern count="one">{0}″</unitPattern>
-				<unitPattern count="other">{0}″</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName>градус</displayName>
-				<unitPattern count="one">{0} градус</unitPattern>
-				<unitPattern count="other">{0} градус</unitPattern>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="one">{0} rev</unitPattern>
+				<unitPattern count="other">{0} rev</unitPattern>
 			</unit>
 			<unit type="angle-radian">
 				<displayName>радиан</displayName>
 				<unitPattern count="one">{0} радиан</unitPattern>
 				<unitPattern count="other">{0} радиан</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName>акр</displayName>
-				<unitPattern count="one">{0} акр</unitPattern>
-				<unitPattern count="other">{0} акр</unitPattern>
+			<unit type="angle-degree">
+				<displayName>градус</displayName>
+				<unitPattern count="one">{0} градус</unitPattern>
+				<unitPattern count="other">{0} градус</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>аркмүнөт</displayName>
+				<unitPattern count="one">{0} аркмүнөт</unitPattern>
+				<unitPattern count="other">{0} аркмүнөт</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>арксекунд</displayName>
+				<unitPattern count="one">{0} арксекунд</unitPattern>
+				<unitPattern count="other">{0} арксекунд</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>чарчы километр</displayName>
+				<unitPattern count="one">{0} чарчы километр</unitPattern>
+				<unitPattern count="other">{0} чарчы километр</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>гектар</displayName>
 				<unitPattern count="one">{0} гектар</unitPattern>
 				<unitPattern count="other">{0} гектар</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>чарчы метр</displayName>
+				<unitPattern count="one">{0} чарчы метр</unitPattern>
+				<unitPattern count="other">{0} чарчы метр</unitPattern>
+				<perUnitPattern>чарчы метрине {0}</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>чарчы сантиметр</displayName>
 				<unitPattern count="one">{0} чарчы сантиметр</unitPattern>
 				<unitPattern count="other">{0} чарчы сантиметр</unitPattern>
+				<perUnitPattern>чарчы сантиметрине {0}</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>чарчы мил</displayName>
+				<unitPattern count="one">{0} чарчы мил</unitPattern>
+				<unitPattern count="other">{0} чарчы мил</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>акр</displayName>
+				<unitPattern count="one">{0} акр</unitPattern>
+				<unitPattern count="other">{0} акр</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>чарчы ярд</displayName>
+				<unitPattern count="one">{0} чарчы ярд</unitPattern>
+				<unitPattern count="other">{0} чарчы ярд</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>чарчы фут</displayName>
@@ -4853,139 +5204,140 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>чарчы дюйм</displayName>
 				<unitPattern count="one">{0} чарчы дюйм</unitPattern>
 				<unitPattern count="other">{0} чарчы дюйм</unitPattern>
+				<perUnitPattern>чарчы дюймуна {0}</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>чарчы километр</displayName>
-				<unitPattern count="one">{0} чарчы километр</unitPattern>
-				<unitPattern count="other">{0} чарчы километр</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>чарчы метр</displayName>
-				<unitPattern count="one">{0} чарчы метр</unitPattern>
-				<unitPattern count="other">{0} чарчы метр</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>чарчы мил</displayName>
-				<unitPattern count="one">{0} чарчы мил</unitPattern>
-				<unitPattern count="other">{0} чарчы мил</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>чарчы ярд</displayName>
-				<unitPattern count="one">{0} чарчы ярд</unitPattern>
-				<unitPattern count="other">{0} чарчы ярд</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>карат</displayName>
+				<unitPattern count="one">{0} карат</unitPattern>
+				<unitPattern count="other">{0} карат</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName>л/км</displayName>
-				<unitPattern count="one">{0} л/км</unitPattern>
-				<unitPattern count="other">{0} л/км</unitPattern>
+				<displayName>километрине литр</displayName>
+				<unitPattern count="one">километрине {0} литр</unitPattern>
+				<unitPattern count="other">километрине {0} литр</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>100 километрге литр</displayName>
+				<unitPattern count="one">100 километрге {0} литр</unitPattern>
+				<unitPattern count="other">100 километрге {0} литр</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>милге/галон</displayName>
 				<unitPattern count="one">{0} милге/галон</unitPattern>
 				<unitPattern count="other">{0} милге/галон</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>бит</displayName>
-				<unitPattern count="one">{0} бит</unitPattern>
-				<unitPattern count="other">{0} бит</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>байт</displayName>
-				<unitPattern count="one">{0} байт</unitPattern>
-				<unitPattern count="other">{0} байт</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>гигабит</displayName>
-				<unitPattern count="one">{0} гигабит</unitPattern>
-				<unitPattern count="other">{0} гигабит</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>гигабайт</displayName>
-				<unitPattern count="one">{0} гигабайт</unitPattern>
-				<unitPattern count="other">{0} гигабайт</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>килобит</displayName>
-				<unitPattern count="one">{0} килобит</unitPattern>
-				<unitPattern count="other">{0} килобит</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>килобайт</displayName>
-				<unitPattern count="one">{0} килобайт</unitPattern>
-				<unitPattern count="other">{0} килобайт</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>мегабит</displayName>
-				<unitPattern count="one">{0} мегабит</unitPattern>
-				<unitPattern count="other">{0} мегабит</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>мегабайт</displayName>
-				<unitPattern count="one">{0} мегабайт</unitPattern>
-				<unitPattern count="other">{0} мегабайт</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>терабайт</displayName>
+				<unitPattern count="one">{0} терабайт</unitPattern>
+				<unitPattern count="other">{0} терабайт</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>терабит</displayName>
 				<unitPattern count="one">{0} терабит</unitPattern>
 				<unitPattern count="other">{0} терабит</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>терабайт</displayName>
-				<unitPattern count="one">{0} терабайт</unitPattern>
-				<unitPattern count="other">{0} терабайт</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>гигабайт</displayName>
+				<unitPattern count="one">{0} гигабайт</unitPattern>
+				<unitPattern count="other">{0} гигабайт</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>гигабит</displayName>
+				<unitPattern count="one">{0} гигабит</unitPattern>
+				<unitPattern count="other">{0} гигабит</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>мегабайт</displayName>
+				<unitPattern count="one">{0} мегабайт</unitPattern>
+				<unitPattern count="other">{0} мегабайт</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>мегабит</displayName>
+				<unitPattern count="one">{0} мегабит</unitPattern>
+				<unitPattern count="other">{0} мегабит</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>килобайт</displayName>
+				<unitPattern count="one">{0} килобайт</unitPattern>
+				<unitPattern count="other">{0} килобайт</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>килобит</displayName>
+				<unitPattern count="one">{0} килобит</unitPattern>
+				<unitPattern count="other">{0} килобит</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>байт</displayName>
+				<unitPattern count="one">{0} байт</unitPattern>
+				<unitPattern count="other">{0} байт</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>бит</displayName>
+				<unitPattern count="one">{0} бит</unitPattern>
+				<unitPattern count="other">{0} бит</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>кылым</displayName>
+				<unitPattern count="one">{0} кылым</unitPattern>
+				<unitPattern count="other">{0} кылым</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>жыл</displayName>
+				<unitPattern count="one">{0} жыл</unitPattern>
+				<unitPattern count="other">{0} жыл</unitPattern>
+				<perUnitPattern>жылына {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ай</displayName>
+				<unitPattern count="one">{0} ай</unitPattern>
+				<unitPattern count="other">{0} ай</unitPattern>
+				<perUnitPattern>айына {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>апта</displayName>
+				<unitPattern count="one">{0} апта</unitPattern>
+				<unitPattern count="other">{0} апта</unitPattern>
+				<perUnitPattern>аптасына {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>күн</displayName>
 				<unitPattern count="one">{0} күн</unitPattern>
 				<unitPattern count="other">{0} күн</unitPattern>
+				<perUnitPattern>күнүнө {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>саат</displayName>
 				<unitPattern count="one">{0} саат</unitPattern>
 				<unitPattern count="other">{0} саат</unitPattern>
-				<perUnitPattern>{0} саатына</perUnitPattern>
+				<perUnitPattern>саатына {0}</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>микросекунд</displayName>
-				<unitPattern count="one">{0} микросекунд</unitPattern>
-				<unitPattern count="other">{0} микросекунд</unitPattern>
+			<unit type="duration-minute">
+				<displayName>мүнөт</displayName>
+				<unitPattern count="one">{0} мүнөт</unitPattern>
+				<unitPattern count="other">{0} мүнөт</unitPattern>
+				<perUnitPattern>мүнөтүнө {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>секунд</displayName>
+				<unitPattern count="one">{0} секунд</unitPattern>
+				<unitPattern count="other">{0} секунд</unitPattern>
+				<perUnitPattern>секундуна {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>миллисекунд</displayName>
 				<unitPattern count="one">{0} миллисекунд</unitPattern>
 				<unitPattern count="other">{0} миллисекунд</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>мүнөт</displayName>
-				<unitPattern count="one">{0} мүнөт</unitPattern>
-				<unitPattern count="other">{0} мүнөт</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>ай</displayName>
-				<unitPattern count="one">{0} ай</unitPattern>
-				<unitPattern count="other">{0} ай</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>микросекунд</displayName>
+				<unitPattern count="one">{0} микросекунд</unitPattern>
+				<unitPattern count="other">{0} микросекунд</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>наносекунд</displayName>
 				<unitPattern count="one">{0} наносекунд</unitPattern>
 				<unitPattern count="other">{0} наносекунд</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>секунд</displayName>
-				<unitPattern count="one">{0} секунд</unitPattern>
-				<unitPattern count="other">{0} секунд</unitPattern>
-				<perUnitPattern>{0} секундуна</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>апта</displayName>
-				<unitPattern count="one">{0} апта</unitPattern>
-				<unitPattern count="other">{0} апта</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>жыл</displayName>
-				<unitPattern count="one">{0} жыл</unitPattern>
-				<unitPattern count="other">{0} жыл</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>ампер</displayName>
 				<unitPattern count="one">{0} ампер</unitPattern>
@@ -5006,6 +5358,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} вольт</unitPattern>
 				<unitPattern count="other">{0} вольт</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>килокалория</displayName>
+				<unitPattern count="one">{0} килокалория</unitPattern>
+				<unitPattern count="other">{0} килокалория</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>калория</displayName>
 				<unitPattern count="one">{0} калория</unitPattern>
@@ -5016,21 +5373,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Калория</unitPattern>
 				<unitPattern count="other">{0} Калория</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>жоул</displayName>
-				<unitPattern count="one">{0} жоул</unitPattern>
-				<unitPattern count="other">{0} жоул</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>килокалория</displayName>
-				<unitPattern count="one">{0} килокалория</unitPattern>
-				<unitPattern count="other">{0} килокалория</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>киложоул</displayName>
 				<unitPattern count="one">{0} киложоул</unitPattern>
 				<unitPattern count="other">{0} киложоул</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>жоул</displayName>
+				<unitPattern count="one">{0} жоул</unitPattern>
+				<unitPattern count="other">{0} жоул</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>килловат-саат</displayName>
 				<unitPattern count="one">{0} килловат-саат</unitPattern>
@@ -5041,230 +5393,249 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} гигагерц</unitPattern>
 				<unitPattern count="other">{0} гигагерц</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>герц</displayName>
-				<unitPattern count="one">{0} герц</unitPattern>
-				<unitPattern count="other">{0} герц</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>мегагерц</displayName>
+				<unitPattern count="one">{0} мегагерц</unitPattern>
+				<unitPattern count="other">{0} мегагерц</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>килогерц</displayName>
 				<unitPattern count="one">{0} килогерц</unitPattern>
 				<unitPattern count="other">{0} килогерц</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>мегагерц</displayName>
-				<unitPattern count="one">{0} мегагерц</unitPattern>
-				<unitPattern count="other">{0} мегагерц</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>герц</displayName>
+				<unitPattern count="one">{0} герц</unitPattern>
+				<unitPattern count="other">{0} герц</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>астрономикалык бирдик</displayName>
-				<unitPattern count="one">{0} астрономикалык бирдик</unitPattern>
-				<unitPattern count="other">{0} астрономикалык бирдик</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>километр</displayName>
+				<unitPattern count="one">{0} километр</unitPattern>
+				<unitPattern count="other">{0} километр</unitPattern>
+				<perUnitPattern>километрине {0}</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>сантиметр</displayName>
-				<unitPattern count="one">{0} сантиметр</unitPattern>
-				<unitPattern count="other">{0} сантиметр</unitPattern>
+			<unit type="length-meter">
+				<displayName>метр</displayName>
+				<unitPattern count="one">{0} метр</unitPattern>
+				<unitPattern count="other">{0} метр</unitPattern>
+				<perUnitPattern>метрине {0}</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>дм</displayName>
 				<unitPattern count="one">{0} дм</unitPattern>
 				<unitPattern count="other">{0} дм</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>фут</displayName>
-				<unitPattern count="one">{0} фут</unitPattern>
-				<unitPattern count="other">{0} фут</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>дюйм</displayName>
-				<unitPattern count="one">{0} дюйм</unitPattern>
-				<unitPattern count="other">{0} дюйм</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>километр</displayName>
-				<unitPattern count="one">{0} километр</unitPattern>
-				<unitPattern count="other">{0} километр</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>жарык жыл</displayName>
-				<unitPattern count="one">{0} жарык жыл</unitPattern>
-				<unitPattern count="other">{0} жарык жыл</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>метр</displayName>
-				<unitPattern count="one">{0} метр</unitPattern>
-				<unitPattern count="other">{0} метр</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>микрометр</displayName>
-				<unitPattern count="one">микрометр</unitPattern>
-				<unitPattern count="other">{0} микрометр</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>мил</displayName>
-				<unitPattern count="one">{0} мил</unitPattern>
-				<unitPattern count="other">{0} мил</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>сантиметр</displayName>
+				<unitPattern count="one">{0} сантиметр</unitPattern>
+				<unitPattern count="other">{0} сантиметр</unitPattern>
+				<perUnitPattern>сантиметрине {0}</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>миллиметр</displayName>
 				<unitPattern count="one">{0} миллиметр</unitPattern>
 				<unitPattern count="other">{0} миллиметр</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>микрометр</displayName>
+				<unitPattern count="one">микрометр</unitPattern>
+				<unitPattern count="other">{0} микрометр</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>нанометр</displayName>
 				<unitPattern count="one">{0} нанометр</unitPattern>
 				<unitPattern count="other">{0} нанометр</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>деңиз мили</displayName>
-				<unitPattern count="one">{0} деңиз мили</unitPattern>
-				<unitPattern count="other">{0} деңиз мили</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>парсек</displayName>
-				<unitPattern count="one">{0} парсек</unitPattern>
-				<unitPattern count="other">{0} парсек</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>пикометр</displayName>
 				<unitPattern count="one">{0} пикометр</unitPattern>
 				<unitPattern count="other">{0} пикометр</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>мил</displayName>
+				<unitPattern count="one">{0} мил</unitPattern>
+				<unitPattern count="other">{0} мил</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>ярд</displayName>
 				<unitPattern count="one">{0} ярд</unitPattern>
 				<unitPattern count="other">{0} ярд</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>фут</displayName>
+				<unitPattern count="one">{0} фут</unitPattern>
+				<unitPattern count="other">{0} фут</unitPattern>
+				<perUnitPattern>футуна {0}</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>дюйм</displayName>
+				<unitPattern count="one">{0} дюйм</unitPattern>
+				<unitPattern count="other">{0} дюйм</unitPattern>
+				<perUnitPattern>дюймуна {0}</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>парсек</displayName>
+				<unitPattern count="one">{0} парсек</unitPattern>
+				<unitPattern count="other">{0} парсек</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>жарык жыл</displayName>
+				<unitPattern count="one">{0} жарык жыл</unitPattern>
+				<unitPattern count="other">{0} жарык жыл</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>астрономикалык бирдик</displayName>
+				<unitPattern count="one">{0} астрономикалык бирдик</unitPattern>
+				<unitPattern count="other">{0} астрономикалык бирдик</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>деңиз мили</displayName>
+				<unitPattern count="one">{0} деңиз мили</unitPattern>
+				<unitPattern count="other">{0} деңиз мили</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>люкс</displayName>
 				<unitPattern count="one">{0} люкс</unitPattern>
 				<unitPattern count="other">{0} люкс</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>карат</displayName>
-				<unitPattern count="one">{0} карат</unitPattern>
-				<unitPattern count="other">{0} карат</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>грамм</displayName>
-				<unitPattern count="one">{0} грамм</unitPattern>
-				<unitPattern count="other">{0} грамм</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>килограмм</displayName>
-				<unitPattern count="one">{0} килограмм</unitPattern>
-				<unitPattern count="other">{0} килограмм</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>метр тонна</displayName>
 				<unitPattern count="one">{0} метр тонна</unitPattern>
 				<unitPattern count="other">{0} метр тонна</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>микрограмм</displayName>
-				<unitPattern count="one">{0} микрограмм</unitPattern>
-				<unitPattern count="other">{0} микрограмм</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>килограмм</displayName>
+				<unitPattern count="one">{0} килограмм</unitPattern>
+				<unitPattern count="other">{0} килограмм</unitPattern>
+				<perUnitPattern>килограммына {0}</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>грамм</displayName>
+				<unitPattern count="one">{0} грамм</unitPattern>
+				<unitPattern count="other">{0} грамм</unitPattern>
+				<perUnitPattern>граммына {0}</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>миллиграмм</displayName>
 				<unitPattern count="one">{0} миллиграмм</unitPattern>
 				<unitPattern count="other">{0} миллиграмм</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>унция</displayName>
-				<unitPattern count="one">{0} унция</unitPattern>
-				<unitPattern count="other">{0} унция</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>троя унциясы</displayName>
-				<unitPattern count="one">{0} троя унциясы</unitPattern>
-				<unitPattern count="other">{0} троя унциясы</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>фунт</displayName>
-				<unitPattern count="one">{0} фунт</unitPattern>
-				<unitPattern count="other">{0} фунт</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>микрограмм</displayName>
+				<unitPattern count="one">{0} микрограмм</unitPattern>
+				<unitPattern count="other">{0} микрограмм</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>тонна</displayName>
 				<unitPattern count="one">{0} тонна</unitPattern>
 				<unitPattern count="other">{0} тонна</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>фунт</displayName>
+				<unitPattern count="one">{0} фунт</unitPattern>
+				<unitPattern count="other">{0} фунт</unitPattern>
+				<perUnitPattern>фунтуна {0}</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>унция</displayName>
+				<unitPattern count="one">{0} унция</unitPattern>
+				<unitPattern count="other">{0} унция</unitPattern>
+				<perUnitPattern>унциясына {0}</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>троя унциясы</displayName>
+				<unitPattern count="one">{0} троя унциясы</unitPattern>
+				<unitPattern count="other">{0} троя унциясы</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>карат</displayName>
+				<unitPattern count="one">{0} карат</unitPattern>
+				<unitPattern count="other">{0} карат</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>гигаватт</displayName>
 				<unitPattern count="one">{0} гигаватт</unitPattern>
 				<unitPattern count="other">{0} гигаватт</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>аттын күчү</displayName>
-				<unitPattern count="one">{0} аттын күчү</unitPattern>
-				<unitPattern count="other">{0} аттын күчү</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>киловатт</displayName>
-				<unitPattern count="one">{0} киловатт</unitPattern>
-				<unitPattern count="other">{0} киловатт</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>мегаватт</displayName>
 				<unitPattern count="one">{0} мегаватт</unitPattern>
 				<unitPattern count="other">{0} мегаватт</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>милливатт</displayName>
-				<unitPattern count="one">{0} милливатт</unitPattern>
-				<unitPattern count="other">{0} милливатт</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>киловатт</displayName>
+				<unitPattern count="one">{0} киловатт</unitPattern>
+				<unitPattern count="other">{0} киловатт</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>ватт</displayName>
 				<unitPattern count="one">{0} ватт</unitPattern>
 				<unitPattern count="other">{0} ватт</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>милливатт</displayName>
+				<unitPattern count="one">{0} милливатт</unitPattern>
+				<unitPattern count="other">{0} милливатт</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>аттын күчү</displayName>
+				<unitPattern count="one">{0} аттын күчү</unitPattern>
+				<unitPattern count="other">{0} аттын күчү</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>гектопаскаль</displayName>
 				<unitPattern count="one">{0} гектопаскаль</unitPattern>
 				<unitPattern count="other">{0} гектопаскаль</unitPattern>
 			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>миллиметр сымап мамычасы</displayName>
+				<unitPattern count="one">{0} миллиметр сымап мамычасы</unitPattern>
+				<unitPattern count="other">{0} миллиметр сымап мамычасы</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>чарчы дюймга фунт</displayName>
+				<unitPattern count="one">чарчы дюймга {0} фунт</unitPattern>
+				<unitPattern count="other">чарчы дюймга {0} фунт</unitPattern>
+			</unit>
 			<unit type="pressure-inch-hg">
-				<displayName>дүйм сымап мамычасы</displayName>
-				<unitPattern count="one">{0} дүйм сымап мамычасы</unitPattern>
-				<unitPattern count="other">{0} дүйм сымап мамычасы</unitPattern>
+				<displayName>дюйм сымап мамычасы</displayName>
+				<unitPattern count="one">{0} дюйм сымап мамычасы</unitPattern>
+				<unitPattern count="other">{0} дюйм сымап мамычасы</unitPattern>
 			</unit>
 			<unit type="pressure-millibar">
 				<displayName>миллибар</displayName>
 				<unitPattern count="one">{0} миллибар</unitPattern>
 				<unitPattern count="other">{0} миллибар</unitPattern>
 			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<displayName>сымап мамычасынын миллиметри</displayName>
-				<unitPattern count="one">{0} сымап мамычасынын миллиметри</unitPattern>
-				<unitPattern count="other">{0} сымап мамычасынын миллиметри</unitPattern>
-			</unit>
-			<unit type="pressure-pound-per-square-inch">
-				<displayName>фунт чарчы дюймга</displayName>
-				<unitPattern count="one">{0} фунт чарчы дюймга</unitPattern>
-				<unitPattern count="other">{0} фунт чарчы дюймга</unitPattern>
-			</unit>
-			<unit type="proportion-karat">
-				<displayName>карат</displayName>
-				<unitPattern count="one">{0} карат</unitPattern>
-				<unitPattern count="other">{0} карат</unitPattern>
-			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>саатына километр</displayName>
 				<unitPattern count="one">саатына {0} километр</unitPattern>
 				<unitPattern count="other">саатына {0} километр</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
-				<displayName>метр/секунд</displayName>
-				<unitPattern count="one">{0} метр/секунд</unitPattern>
-				<unitPattern count="other">{0} метр/секунд</unitPattern>
+				<displayName>секундасына метр</displayName>
+				<unitPattern count="one">секундасына {0} метр</unitPattern>
+				<unitPattern count="other">секундасына {0} метр</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<displayName>мил/саат</displayName>
-				<unitPattern count="one">{0} мил/саат</unitPattern>
-				<unitPattern count="other">{0} мил/саат</unitPattern>
+				<displayName>милине саат</displayName>
+				<unitPattern count="one">саатына {0} миль</unitPattern>
+				<unitPattern count="other">саатына {0} миль</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>түйүн</displayName>
+				<unitPattern count="one">{0} түйүн</unitPattern>
+				<unitPattern count="other">{0} түйүн</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
 				<displayName>Цельсий градусу</displayName>
@@ -5281,31 +5652,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Келвин градусу</unitPattern>
 				<unitPattern count="other">{0} Келвин градусу</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>акр-фут</displayName>
-				<unitPattern count="one">{0} акр-фут</unitPattern>
-				<unitPattern count="other">{0} акр-фут</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>сантилитр</displayName>
-				<unitPattern count="one">{0} сантилитр</unitPattern>
-				<unitPattern count="other">{0} сантилитр</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>куб сантиметр</displayName>
-				<unitPattern count="one">{0} куб сантиметр</unitPattern>
-				<unitPattern count="other">{0} куб сантиметр</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>куб фут</displayName>
-				<unitPattern count="one">{0} куб фут</unitPattern>
-				<unitPattern count="other">{0} куб фут</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>куб дюйм</displayName>
-				<unitPattern count="one">{0} куб дюйм</unitPattern>
-				<unitPattern count="other">{0} куб дюйм</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>куб километр</displayName>
 				<unitPattern count="one">{0} куб километр</unitPattern>
@@ -5315,6 +5661,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>куб метр</displayName>
 				<unitPattern count="one">{0} куб метр</unitPattern>
 				<unitPattern count="other">{0} куб метр</unitPattern>
+				<perUnitPattern>куб метрине {0}</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>куб сантиметр</displayName>
+				<unitPattern count="one">{0} куб сантиметр</unitPattern>
+				<unitPattern count="other">{0} куб сантиметр</unitPattern>
+				<perUnitPattern>куб сантиметрине {0}</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>куб мил</displayName>
@@ -5326,25 +5679,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} куб ярд</unitPattern>
 				<unitPattern count="other">{0} куб ярд</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>чөйчөк</displayName>
-				<unitPattern count="one">{0} чөйчөк</unitPattern>
-				<unitPattern count="other">{0} чөйчөк</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>куб фут</displayName>
+				<unitPattern count="one">{0} куб фут</unitPattern>
+				<unitPattern count="other">{0} куб фут</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>декалитр</displayName>
-				<unitPattern count="one">{0} декалитр</unitPattern>
-				<unitPattern count="other">{0} декалитр</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>куб дюйм</displayName>
+				<unitPattern count="one">{0} куб дюйм</unitPattern>
+				<unitPattern count="other">{0} куб дюйм</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>суюк унция</displayName>
-				<unitPattern count="one">{0} суюк унция</unitPattern>
-				<unitPattern count="other">{0} суюк унция</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>галон</displayName>
-				<unitPattern count="one">{0} галон</unitPattern>
-				<unitPattern count="other">{0} гал</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>мегалитр</displayName>
+				<unitPattern count="one">{0} мегалитр</unitPattern>
+				<unitPattern count="other">{0} мегалитр</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>гектолитр</displayName>
@@ -5355,27 +5703,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>литр</displayName>
 				<unitPattern count="one">{0} литр</unitPattern>
 				<unitPattern count="other">{0} литр</unitPattern>
+				<perUnitPattern>литрине {0}</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>мегалитр</displayName>
-				<unitPattern count="one">{0} мегалитр</unitPattern>
-				<unitPattern count="other">{0} мегалитр</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>децилитр</displayName>
+				<unitPattern count="one">{0} децилитр</unitPattern>
+				<unitPattern count="other">{0} децилитр</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>сантилитр</displayName>
+				<unitPattern count="one">{0} сантилитр</unitPattern>
+				<unitPattern count="other">{0} сантилитр</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>миллилитр</displayName>
 				<unitPattern count="one">{0} миллилитр</unitPattern>
 				<unitPattern count="other">{0} миллилитр</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>пинта</displayName>
-				<unitPattern count="one">{0} пинта</unitPattern>
-				<unitPattern count="other">{0} пинта</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>метрикалык пинта</displayName>
+				<unitPattern count="one">{0} метрикалык пинта</unitPattern>
+				<unitPattern count="other">{0} метрикалык пинта</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>акр-фут</displayName>
+				<unitPattern count="one">{0} акр-фут</unitPattern>
+				<unitPattern count="other">{0} акр-фут</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>галон</displayName>
+				<unitPattern count="one">{0} галон</unitPattern>
+				<unitPattern count="other">{0} гал</unitPattern>
+				<perUnitPattern>галонуна {0}</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>кварта</displayName>
 				<unitPattern count="one">{0} кварта</unitPattern>
 				<unitPattern count="other">{0} кварта</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>пинта</displayName>
+				<unitPattern count="one">{0} пинта</unitPattern>
+				<unitPattern count="other">{0} пинта</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>чөйчөк</displayName>
+				<unitPattern count="one">{0} чөйчөк</unitPattern>
+				<unitPattern count="other">{0} чөйчөк</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>суюк унция</displayName>
+				<unitPattern count="one">{0} суюк унция</unitPattern>
+				<unitPattern count="other">{0} суюк унция</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>чоң кашык</displayName>
 				<unitPattern count="one">{0} чоң кашык</unitPattern>
@@ -5386,10 +5771,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} чай кашык</unitPattern>
 				<unitPattern count="other">{0} чай кашык</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}Ч</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}Тн</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}Тш</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}Б</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
-				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{1}/{0}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>оордук күчүнүн ылдамдануусу</displayName>
@@ -5401,40 +5792,67 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} м/сек²</unitPattern>
 				<unitPattern count="other">{0} м/сек²</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName>′</displayName>
-				<unitPattern count="one">{0}′</unitPattern>
-				<unitPattern count="other">{0}′</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName>″</displayName>
-				<unitPattern count="one">{0}″</unitPattern>
-				<unitPattern count="other">{0}″</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName>градус</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="one">{0} rev</unitPattern>
+				<unitPattern count="other">{0} rev</unitPattern>
 			</unit>
 			<unit type="angle-radian">
 				<displayName>рад.</displayName>
 				<unitPattern count="one">{0} рад</unitPattern>
 				<unitPattern count="other">{0} рад.</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName>акр</displayName>
-				<unitPattern count="one">{0} акр</unitPattern>
-				<unitPattern count="other">{0} акр</unitPattern>
+			<unit type="angle-degree">
+				<displayName>градус</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>аркмүн</displayName>
+				<unitPattern count="one">{0} аркмүн</unitPattern>
+				<unitPattern count="other">{0} аркмүн</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>арксек</displayName>
+				<unitPattern count="one">{0} арксек</unitPattern>
+				<unitPattern count="other">{0} арксек</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>км²</displayName>
+				<unitPattern count="one">{0} км²</unitPattern>
+				<unitPattern count="other">{0} км²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>гектар</displayName>
 				<unitPattern count="one">{0} га</unitPattern>
 				<unitPattern count="other">{0} га</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>метр²</displayName>
+				<unitPattern count="one">{0} м²</unitPattern>
+				<unitPattern count="other">{0} м²</unitPattern>
+				<perUnitPattern>м²/{0}</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>см²</displayName>
 				<unitPattern count="one">{0} см²</unitPattern>
 				<unitPattern count="other">{0} см²</unitPattern>
+				<perUnitPattern>см²/{0}</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>чарчы мил</displayName>
+				<unitPattern count="one">{0} мл²</unitPattern>
+				<unitPattern count="other">{0} мл²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>акр</displayName>
+				<unitPattern count="one">{0} акр</unitPattern>
+				<unitPattern count="other">{0} акр</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>ярд²</displayName>
+				<unitPattern count="one">{0} ярд²</unitPattern>
+				<unitPattern count="other">{0} ярд²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>чарчы фут</displayName>
@@ -5445,139 +5863,140 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>дюйм²</displayName>
 				<unitPattern count="one">{0} дюйм²</unitPattern>
 				<unitPattern count="other">{0} дюйм²</unitPattern>
+				<perUnitPattern>дюйм²/{0}</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>км²</displayName>
-				<unitPattern count="one">{0} км²</unitPattern>
-				<unitPattern count="other">{0} км²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>метр²</displayName>
-				<unitPattern count="one">{0} м²</unitPattern>
-				<unitPattern count="other">{0} м²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>чарчы мил</displayName>
-				<unitPattern count="one">{0} мл²</unitPattern>
-				<unitPattern count="other">{0} мл²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>ярд²</displayName>
-				<unitPattern count="one">{0} ярд²</unitPattern>
-				<unitPattern count="other">{0} ярд²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>карат</displayName>
+				<unitPattern count="one">{0} кт</unitPattern>
+				<unitPattern count="other">{0} кт</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName>л/км</displayName>
+				<displayName>км/литр</displayName>
 				<unitPattern count="one">{0} л/км</unitPattern>
 				<unitPattern count="other">{0} л/км</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>100 км/л</displayName>
+				<unitPattern count="one">100 км/{0} л</unitPattern>
+				<unitPattern count="other">100 км/{0} л</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>мил/гал</displayName>
 				<unitPattern count="one">{0} мил/гал</unitPattern>
 				<unitPattern count="other">{0} мил/гал</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>бит</displayName>
-				<unitPattern count="one">{0} бит</unitPattern>
-				<unitPattern count="other">{0} бит</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>байт</displayName>
-				<unitPattern count="one">{0} байт</unitPattern>
-				<unitPattern count="other">{0} байт</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Гбит</displayName>
-				<unitPattern count="one">{0} Гб</unitPattern>
-				<unitPattern count="other">{0} Гб</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>Гбайт</displayName>
-				<unitPattern count="one">{0} ГБ</unitPattern>
-				<unitPattern count="other">{0} ГБ</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>кбит</displayName>
-				<unitPattern count="one">{0} кб</unitPattern>
-				<unitPattern count="other">{0} кб</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>кБайт</displayName>
-				<unitPattern count="one">{0} кБ</unitPattern>
-				<unitPattern count="other">{0} кБ</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Мбит</displayName>
-				<unitPattern count="one">{0} Мб</unitPattern>
-				<unitPattern count="other">{0} Мб</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>МБайт</displayName>
-				<unitPattern count="one">{0} МБ</unitPattern>
-				<unitPattern count="other">{0} МБ</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>ТБайт</displayName>
+				<unitPattern count="one">{0} ТБ</unitPattern>
+				<unitPattern count="other">{0} ТБ</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>Тбит</displayName>
 				<unitPattern count="one">{0} Тб</unitPattern>
 				<unitPattern count="other">{0} Тб</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>ТБайт</displayName>
-				<unitPattern count="one">{0} ТБ</unitPattern>
-				<unitPattern count="other">{0} ТБ</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>Гбайт</displayName>
+				<unitPattern count="one">{0} ГБ</unitPattern>
+				<unitPattern count="other">{0} ГБ</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Гбит</displayName>
+				<unitPattern count="one">{0} Гб</unitPattern>
+				<unitPattern count="other">{0} Гб</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>МБайт</displayName>
+				<unitPattern count="one">{0} МБ</unitPattern>
+				<unitPattern count="other">{0} МБ</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Мбит</displayName>
+				<unitPattern count="one">{0} Мб</unitPattern>
+				<unitPattern count="other">{0} Мб</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>кБайт</displayName>
+				<unitPattern count="one">{0} кБ</unitPattern>
+				<unitPattern count="other">{0} кБ</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>кбит</displayName>
+				<unitPattern count="one">{0} кб</unitPattern>
+				<unitPattern count="other">{0} кб</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>байт</displayName>
+				<unitPattern count="one">{0} байт</unitPattern>
+				<unitPattern count="other">{0} байт</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>бит</displayName>
+				<unitPattern count="one">{0} бит</unitPattern>
+				<unitPattern count="other">{0} бит</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>к.</displayName>
+				<unitPattern count="one">{0} к.</unitPattern>
+				<unitPattern count="other">{0} к.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>жыл</displayName>
+				<unitPattern count="one">{0} ж.</unitPattern>
+				<unitPattern count="other">{0} ж.</unitPattern>
+				<perUnitPattern>ж/{0}</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ай</displayName>
+				<unitPattern count="one">{0} ай</unitPattern>
+				<unitPattern count="other">{0} ай</unitPattern>
+				<perUnitPattern>а/{0}</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>апта</displayName>
+				<unitPattern count="one">{0} апт</unitPattern>
+				<unitPattern count="other">{0} апт</unitPattern>
+				<perUnitPattern>апт/{0}</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>күн</displayName>
 				<unitPattern count="one">{0} күн</unitPattern>
 				<unitPattern count="other">{0} күн</unitPattern>
+				<perUnitPattern>күн/{0}</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>саат</displayName>
-				<unitPattern count="one">{0} с</unitPattern>
-				<unitPattern count="other">{0} с</unitPattern>
-				<perUnitPattern>{0}/с</perUnitPattern>
+				<unitPattern count="one">{0} ст</unitPattern>
+				<unitPattern count="other">{0} ст</unitPattern>
+				<perUnitPattern>ст/{0}</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μсек</displayName>
-				<unitPattern count="one">{0}μс</unitPattern>
-				<unitPattern count="other">{0}μс</unitPattern>
+			<unit type="duration-minute">
+				<displayName>мүнөт</displayName>
+				<unitPattern count="one">{0} мүн</unitPattern>
+				<unitPattern count="other">{0} мүн</unitPattern>
+				<perUnitPattern>мүн/{0}</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>секунд</displayName>
+				<unitPattern count="one">{0} сек</unitPattern>
+				<unitPattern count="other">{0} сек</unitPattern>
+				<perUnitPattern>сек/{0}</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>миллисекунд</displayName>
 				<unitPattern count="one">{0} мс</unitPattern>
 				<unitPattern count="other">{0} мс</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>мүнөт</displayName>
-				<unitPattern count="one">{0} мүн</unitPattern>
-				<unitPattern count="other">{0} мүн</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>ай</displayName>
-				<unitPattern count="one">{0} ай</unitPattern>
-				<unitPattern count="other">{0} ай</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μсек</displayName>
+				<unitPattern count="one">{0}μс</unitPattern>
+				<unitPattern count="other">{0}μс</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>наносек</displayName>
 				<unitPattern count="one">{0} нс</unitPattern>
 				<unitPattern count="other">{0} нс</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>секунд</displayName>
-				<unitPattern count="one">{0} сек</unitPattern>
-				<unitPattern count="other">{0} сек</unitPattern>
-				<perUnitPattern>{0}/сек</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>апта</displayName>
-				<unitPattern count="one">{0} ап</unitPattern>
-				<unitPattern count="other">{0} ап</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>жыл</displayName>
-				<unitPattern count="one">{0} ж.</unitPattern>
-				<unitPattern count="other">{0} ж.</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>амп</displayName>
 				<unitPattern count="one">{0} A</unitPattern>
@@ -5598,6 +6017,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>ккал</displayName>
+				<unitPattern count="one">{0} ккал</unitPattern>
+				<unitPattern count="other">{0} ккал</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>кал</displayName>
 				<unitPattern count="one">{0} кал</unitPattern>
@@ -5608,21 +6032,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Кал</unitPattern>
 				<unitPattern count="other">{0} Кал</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>жоул</displayName>
-				<unitPattern count="one">{0} ж</unitPattern>
-				<unitPattern count="other">{0} ж</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>ккал</displayName>
-				<unitPattern count="one">{0} ккал</unitPattern>
-				<unitPattern count="other">{0} ккал</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>киложоул</displayName>
 				<unitPattern count="one">{0} кж</unitPattern>
 				<unitPattern count="other">{0} кж</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>жоул</displayName>
+				<unitPattern count="one">{0} ж</unitPattern>
+				<unitPattern count="other">{0} ж</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>кВ-саат</displayName>
 				<unitPattern count="one">{0} кВ-саат</unitPattern>
@@ -5633,193 +6052,217 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Ггц</unitPattern>
 				<unitPattern count="other">{0} Ггц</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Гц</displayName>
-				<unitPattern count="one">{0} Гц</unitPattern>
-				<unitPattern count="other">{0} Гц</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>МГЦ</displayName>
+				<unitPattern count="one">{0} МГЦ</unitPattern>
+				<unitPattern count="other">{0} МГЦ</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>кГц</displayName>
 				<unitPattern count="one">{0} кГц</unitPattern>
 				<unitPattern count="other">{0} кГц</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>МГЦ</displayName>
-				<unitPattern count="one">{0} МГЦ</unitPattern>
-				<unitPattern count="other">{0} МГЦ</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Гц</displayName>
+				<unitPattern count="one">{0} Гц</unitPattern>
+				<unitPattern count="other">{0} Гц</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>а. б.</displayName>
-				<unitPattern count="one">{0} а.б.</unitPattern>
-				<unitPattern count="other">{0} а.б.</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>км</displayName>
+				<unitPattern count="one">{0} км</unitPattern>
+				<unitPattern count="other">{0} км</unitPattern>
+				<perUnitPattern>км/{0}</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>см</displayName>
-				<unitPattern count="one">{0} см</unitPattern>
-				<unitPattern count="other">{0} см</unitPattern>
+			<unit type="length-meter">
+				<displayName>метр</displayName>
+				<unitPattern count="one">{0} м</unitPattern>
+				<unitPattern count="other">{0} м</unitPattern>
+				<perUnitPattern>м/{0}</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>дм</displayName>
 				<unitPattern count="one">{0} дм</unitPattern>
 				<unitPattern count="other">{0} дм</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>фут</displayName>
-				<unitPattern count="one">{0} фут</unitPattern>
-				<unitPattern count="other">{0} фут</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>дюйм</displayName>
-				<unitPattern count="one">{0} дюйм</unitPattern>
-				<unitPattern count="other">{0} дюйм</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>км</displayName>
-				<unitPattern count="one">{0} км</unitPattern>
-				<unitPattern count="other">{0} км</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>жарык жыл</displayName>
-				<unitPattern count="one">{0} жар.ж.</unitPattern>
-				<unitPattern count="other">{0} жар.ж.</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>метр</displayName>
-				<unitPattern count="one">{0} м</unitPattern>
-				<unitPattern count="other">{0} м</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µметр</displayName>
-				<unitPattern count="one">{0} µм</unitPattern>
-				<unitPattern count="other">{0} µм</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>мил</displayName>
-				<unitPattern count="one">{0} мил</unitPattern>
-				<unitPattern count="other">{0} мил</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>см</displayName>
+				<unitPattern count="one">{0} см</unitPattern>
+				<unitPattern count="other">{0} см</unitPattern>
+				<perUnitPattern>см/{0}</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>миллиметр</displayName>
 				<unitPattern count="one">{0} мм</unitPattern>
 				<unitPattern count="other">{0} мм</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µметр</displayName>
+				<unitPattern count="one">{0} µм</unitPattern>
+				<unitPattern count="other">{0} µм</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>нм</displayName>
 				<unitPattern count="one">{0} нм</unitPattern>
 				<unitPattern count="other">{0} нм</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>дең. мил.</displayName>
-				<unitPattern count="one">{0} дең. мил.</unitPattern>
-				<unitPattern count="other">{0} дең. мил.</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>парсек</displayName>
-				<unitPattern count="one">{0} пк</unitPattern>
-				<unitPattern count="other">{0} пк</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>пм</displayName>
 				<unitPattern count="one">{0} пм</unitPattern>
 				<unitPattern count="other">{0} пм</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>мил</displayName>
+				<unitPattern count="one">{0} мил</unitPattern>
+				<unitPattern count="other">{0} мил</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>ярд</displayName>
 				<unitPattern count="one">{0} ярд</unitPattern>
 				<unitPattern count="other">{0} ярд</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>фут</displayName>
+				<unitPattern count="one">{0} фут</unitPattern>
+				<unitPattern count="other">{0} фут</unitPattern>
+				<perUnitPattern>ф/{0}</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>дюйм</displayName>
+				<unitPattern count="one">{0} дюйм</unitPattern>
+				<unitPattern count="other">{0} дюйм</unitPattern>
+				<perUnitPattern>д/{0}</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>парсек</displayName>
+				<unitPattern count="one">{0} пк</unitPattern>
+				<unitPattern count="other">{0} пк</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>жарык жыл</displayName>
+				<unitPattern count="one">{0} жар.ж.</unitPattern>
+				<unitPattern count="other">{0} жар.ж.</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>а. б.</displayName>
+				<unitPattern count="one">{0} а.б.</unitPattern>
+				<unitPattern count="other">{0} а.б.</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>дең. мил.</displayName>
+				<unitPattern count="one">{0} дең. мил.</unitPattern>
+				<unitPattern count="other">{0} дең. мил.</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>люкс</displayName>
 				<unitPattern count="one">{0} лк</unitPattern>
 				<unitPattern count="other">{0} лк</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>карат</displayName>
-				<unitPattern count="one">{0} кар.</unitPattern>
-				<unitPattern count="other">{0} кар.</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>грамм</displayName>
-				<unitPattern count="one">{0} г</unitPattern>
-				<unitPattern count="other">{0} г</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>килограмм</displayName>
-				<unitPattern count="one">{0} кг</unitPattern>
-				<unitPattern count="other">{0} кг</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>т</displayName>
 				<unitPattern count="one">{0} т</unitPattern>
 				<unitPattern count="other">{0} т</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>мкг</displayName>
-				<unitPattern count="one">{0} мкг</unitPattern>
-				<unitPattern count="other">{0} мкг</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>килограмм</displayName>
+				<unitPattern count="one">{0} кг</unitPattern>
+				<unitPattern count="other">{0} кг</unitPattern>
+				<perUnitPattern>кг/{0}</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>грамм</displayName>
+				<unitPattern count="one">{0} гр</unitPattern>
+				<unitPattern count="other">{0} гр</unitPattern>
+				<perUnitPattern>гр/{0}</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>мг</displayName>
 				<unitPattern count="one">{0} мг</unitPattern>
 				<unitPattern count="other">{0} мг</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>унц.</displayName>
-				<unitPattern count="one">{0} унц.</unitPattern>
-				<unitPattern count="other">{0} унц.</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>тр. унц.</displayName>
-				<unitPattern count="one">{0} тр. унц.</unitPattern>
-				<unitPattern count="other">{0} тр. унц.</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>фунт</displayName>
-				<unitPattern count="one">{0} фунт</unitPattern>
-				<unitPattern count="other">{0} фунт</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>мкг</displayName>
+				<unitPattern count="one">{0} мкг</unitPattern>
+				<unitPattern count="other">{0} мкг</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>тонна</displayName>
 				<unitPattern count="one">{0} тон.</unitPattern>
 				<unitPattern count="other">{0} тон.</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>фунт</displayName>
+				<unitPattern count="one">{0} фунт</unitPattern>
+				<unitPattern count="other">{0} фунт</unitPattern>
+				<perUnitPattern>фунт/{0}</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>унц.</displayName>
+				<unitPattern count="one">{0} унц.</unitPattern>
+				<unitPattern count="other">{0} унц.</unitPattern>
+				<perUnitPattern>унц/{0}</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>тр. унц.</displayName>
+				<unitPattern count="one">{0} тр. унц.</unitPattern>
+				<unitPattern count="other">{0} тр. унц.</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>карат</displayName>
+				<unitPattern count="one">{0} кар.</unitPattern>
+				<unitPattern count="other">{0} кар.</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>ГВт</displayName>
 				<unitPattern count="one">{0} ГВт</unitPattern>
 				<unitPattern count="other">{0} ГВт</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>а.к.</displayName>
-				<unitPattern count="one">{0} а.к.</unitPattern>
-				<unitPattern count="other">{0} а.к.</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>кВт</displayName>
-				<unitPattern count="one">{0} кВт</unitPattern>
-				<unitPattern count="other">{0} кВт</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>МВт</displayName>
 				<unitPattern count="one">{0} МВт</unitPattern>
 				<unitPattern count="other">{0} МВт</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>мвт</displayName>
-				<unitPattern count="one">{0} мвт</unitPattern>
-				<unitPattern count="other">{0} мвт</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>кВт</displayName>
+				<unitPattern count="one">{0} кВт</unitPattern>
+				<unitPattern count="other">{0} кВт</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>ватт</displayName>
 				<unitPattern count="one">{0} Вт</unitPattern>
 				<unitPattern count="other">{0} Вт</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>мвт</displayName>
+				<unitPattern count="one">{0} мвт</unitPattern>
+				<unitPattern count="other">{0} мвт</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>а.к.</displayName>
+				<unitPattern count="one">{0} а.к.</unitPattern>
+				<unitPattern count="other">{0} а.к.</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} гПа</unitPattern>
 				<unitPattern count="other">{0} гПа</unitPattern>
 			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>мм.с.м.</displayName>
+				<unitPattern count="one">{0} мм.с. м.</unitPattern>
+				<unitPattern count="other">{0} мм.с. м.</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>фчд</displayName>
+				<unitPattern count="one">{0} фчд</unitPattern>
+				<unitPattern count="other">{0} фчд</unitPattern>
+			</unit>
 			<unit type="pressure-inch-hg">
-				<displayName>дүйм сымап мамычасы</displayName>
+				<displayName>дюйм сымап мамычасы</displayName>
 				<unitPattern count="one">{0} inHg</unitPattern>
 				<unitPattern count="other">{0} inHg</unitPattern>
 			</unit>
@@ -5828,21 +6271,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} мбар</unitPattern>
 				<unitPattern count="other">{0} мбар</unitPattern>
 			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<displayName>с. м. мм</displayName>
-				<unitPattern count="one">{0} с. м. мм</unitPattern>
-				<unitPattern count="other">{0} с. м. мм</unitPattern>
-			</unit>
-			<unit type="pressure-pound-per-square-inch">
-				<displayName>фчд</displayName>
-				<unitPattern count="one">{0} фчд</unitPattern>
-				<unitPattern count="other">{0} фчд</unitPattern>
-			</unit>
-			<unit type="proportion-karat">
-				<displayName>карат</displayName>
-				<unitPattern count="one">{0} кт</unitPattern>
-				<unitPattern count="other">{0} кт</unitPattern>
-			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>км/саат</displayName>
 				<unitPattern count="one">{0} км/с</unitPattern>
@@ -5854,10 +6282,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} м/сек.</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<displayName>мил/саат</displayName>
+				<displayName>миль/саат</displayName>
 				<unitPattern count="one">{0} мил/с</unitPattern>
 				<unitPattern count="other">{0} мил/с</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>тн</displayName>
+				<unitPattern count="one">{0} тн</unitPattern>
+				<unitPattern count="other">{0} тн</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>Цельсий град.</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -5873,31 +6311,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>акр-фут</displayName>
-				<unitPattern count="one">{0} ак. фт.</unitPattern>
-				<unitPattern count="other">{0} ак. фт.</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>сЛ</displayName>
-				<unitPattern count="one">{0} сЛ</unitPattern>
-				<unitPattern count="other">{0} сЛ</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>см³</displayName>
-				<unitPattern count="one">{0} см³</unitPattern>
-				<unitPattern count="other">{0} см³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>фут³</displayName>
-				<unitPattern count="one">{0} фут³</unitPattern>
-				<unitPattern count="other">{0} фут³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>дюйм³</displayName>
-				<unitPattern count="one">{0} дюйм³</unitPattern>
-				<unitPattern count="other">{0} дюйм³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>куб километр</displayName>
 				<unitPattern count="one">{0} км³</unitPattern>
@@ -5907,6 +6320,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>м³</displayName>
 				<unitPattern count="one">{0} м³</unitPattern>
 				<unitPattern count="other">{0} м³</unitPattern>
+				<perUnitPattern>м³/{0}</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>см³</displayName>
+				<unitPattern count="one">{0} см³</unitPattern>
+				<unitPattern count="other">{0} см³</unitPattern>
+				<perUnitPattern>см³/{0}</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>мил³</displayName>
@@ -5918,25 +6338,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ярд³</unitPattern>
 				<unitPattern count="other">{0} ярд³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>чөйчөк</displayName>
-				<unitPattern count="one">{0} чөй.</unitPattern>
-				<unitPattern count="other">{0} чөй.</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>фут³</displayName>
+				<unitPattern count="one">{0} фут³</unitPattern>
+				<unitPattern count="other">{0} фут³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>дал</displayName>
-				<unitPattern count="one">{0} дал</unitPattern>
-				<unitPattern count="other">{0} дал</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>дюйм³</displayName>
+				<unitPattern count="one">{0} дюйм³</unitPattern>
+				<unitPattern count="other">{0} дюйм³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>с. унц.</displayName>
-				<unitPattern count="one">{0} с. унц.</unitPattern>
-				<unitPattern count="other">{0} с. унц.</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>гал</displayName>
-				<unitPattern count="one">{0} гал</unitPattern>
-				<unitPattern count="other">{0} гал</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>мгл</displayName>
+				<unitPattern count="one">{0} мгл</unitPattern>
+				<unitPattern count="other">{0} мгл</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>гл</displayName>
@@ -5947,26 +6362,63 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>литр</displayName>
 				<unitPattern count="one">{0} л</unitPattern>
 				<unitPattern count="other">{0} л</unitPattern>
+				<perUnitPattern>л/{0}</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Мл</displayName>
-				<unitPattern count="one">{0} Мл</unitPattern>
-				<unitPattern count="other">{0} Мл</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>дл</displayName>
+				<unitPattern count="one">{0} дл</unitPattern>
+				<unitPattern count="other">{0} дл</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>сЛ</displayName>
+				<unitPattern count="one">{0} сЛ</unitPattern>
+				<unitPattern count="other">{0} сЛ</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
-				<displayName>мЛ</displayName>
-				<unitPattern count="one">{0} мЛ</unitPattern>
-				<unitPattern count="other">{0} мЛ</unitPattern>
+				<displayName>мл</displayName>
+				<unitPattern count="one">{0} мл</unitPattern>
+				<unitPattern count="other">{0} мл</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>мпт</displayName>
+				<unitPattern count="one">{0} мпт</unitPattern>
+				<unitPattern count="other">{0} мпт</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>акр-фут</displayName>
+				<unitPattern count="one">{0} ак. фт.</unitPattern>
+				<unitPattern count="other">{0} ак. фт.</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>гал</displayName>
+				<unitPattern count="one">{0} гал</unitPattern>
+				<unitPattern count="other">{0} гал</unitPattern>
+				<perUnitPattern>гал/{0}</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>квр</displayName>
+				<unitPattern count="one">{0} квр</unitPattern>
+				<unitPattern count="other">{0} квр</unitPattern>
 			</unit>
 			<unit type="volume-pint">
 				<displayName>пт</displayName>
 				<unitPattern count="one">{0} пт</unitPattern>
 				<unitPattern count="other">{0} пт</unitPattern>
 			</unit>
-			<unit type="volume-quart">
-				<displayName>квр</displayName>
-				<unitPattern count="one">{0} квр</unitPattern>
-				<unitPattern count="other">{0} квр</unitPattern>
+			<unit type="volume-cup">
+				<displayName>чөйчөк</displayName>
+				<unitPattern count="one">{0} чөй.</unitPattern>
+				<unitPattern count="other">{0} чөй.</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>с. унц.</displayName>
+				<unitPattern count="one">{0} с. унц.</unitPattern>
+				<unitPattern count="other">{0} с. унц.</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>чоң каш.</displayName>
@@ -5978,15 +6430,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} чай каш.</unitPattern>
 				<unitPattern count="other">{0} чай каш.</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}Ч</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}Тн</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}Тш</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}Б</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
-				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{1}/{0}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<unitPattern count="one">{0} о.к.</unitPattern>
 				<unitPattern count="other">{0} о.к.</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -5995,26 +6457,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} акр</unitPattern>
-				<unitPattern count="other">{0} акр</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} км²</unitPattern>
+				<unitPattern count="other">{0} км²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} га</unitPattern>
 				<unitPattern count="other">{0} га</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} фут²</unitPattern>
-				<unitPattern count="other">{0} фут²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} км²</unitPattern>
-				<unitPattern count="other">{0} км²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} м²</unitPattern>
 				<unitPattern count="other">{0} м²</unitPattern>
@@ -6023,76 +6473,73 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} чак²</unitPattern>
 				<unitPattern count="other">{0} чак²</unitPattern>
 			</unit>
-			<unit type="duration-day">
-				<displayName>күн</displayName>
-				<unitPattern count="one">{0} к</unitPattern>
-				<unitPattern count="other">{0} к</unitPattern>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} акр</unitPattern>
+				<unitPattern count="other">{0} акр</unitPattern>
 			</unit>
-			<unit type="duration-hour">
-				<displayName>саат</displayName>
-				<unitPattern count="one">{0} с</unitPattern>
-				<unitPattern count="other">{0} с</unitPattern>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} фут²</unitPattern>
+				<unitPattern count="other">{0} фут²</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>миллисек</displayName>
-				<unitPattern count="one">{0} мс</unitPattern>
-				<unitPattern count="other">{0} мс</unitPattern>
-			</unit>
-			<unit type="duration-minute">
-				<displayName>мүн</displayName>
-				<unitPattern count="one">{0} мүн</unitPattern>
-				<unitPattern count="other">{0} мүн</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>ай</displayName>
-				<unitPattern count="one">{0} ай</unitPattern>
-				<unitPattern count="other">{0} ай</unitPattern>
-			</unit>
-			<unit type="duration-second">
-				<displayName>сек</displayName>
-				<unitPattern count="one">{0} сек</unitPattern>
-				<unitPattern count="other">{0} сек</unitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>ап</displayName>
-				<unitPattern count="one">{0} ап</unitPattern>
-				<unitPattern count="other">{0} ап</unitPattern>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>100 км/л</displayName>
+				<unitPattern count="one">100 км/{0}л</unitPattern>
+				<unitPattern count="other">100 км/{0}л</unitPattern>
 			</unit>
 			<unit type="duration-year">
 				<displayName>жыл</displayName>
 				<unitPattern count="one">{0} ж.</unitPattern>
 				<unitPattern count="other">{0} ж.</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>см</displayName>
-				<unitPattern count="one">{0} см</unitPattern>
-				<unitPattern count="other">{0} см</unitPattern>
+			<unit type="duration-month">
+				<displayName>ай</displayName>
+				<unitPattern count="one">{0} ай</unitPattern>
+				<unitPattern count="other">{0} ай</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0} фут</unitPattern>
-				<unitPattern count="other">{0} фут</unitPattern>
+			<unit type="duration-week">
+				<displayName>апт</displayName>
+				<unitPattern count="one">{0} ап</unitPattern>
+				<unitPattern count="other">{0} ап</unitPattern>
 			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0} д</unitPattern>
-				<unitPattern count="other">{0} д</unitPattern>
+			<unit type="duration-day">
+				<displayName>күн</displayName>
+				<unitPattern count="one">{0} кн</unitPattern>
+				<unitPattern count="other">{0} кн</unitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>саат</displayName>
+				<unitPattern count="one">{0} ст</unitPattern>
+				<unitPattern count="other">{0} ст</unitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>мүн</displayName>
+				<unitPattern count="one">{0} мүн</unitPattern>
+				<unitPattern count="other">{0} мүн</unitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>сек</displayName>
+				<unitPattern count="one">{0} сек</unitPattern>
+				<unitPattern count="other">{0} сек</unitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>миллисек</displayName>
+				<unitPattern count="one">{0} мс</unitPattern>
+				<unitPattern count="other">{0} мс</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>км</displayName>
 				<unitPattern count="one">{0} км</unitPattern>
 				<unitPattern count="other">{0} км</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} жар.ж.</unitPattern>
-				<unitPattern count="other">{0} жар.ж.</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>метр</displayName>
 				<unitPattern count="one">{0}м</unitPattern>
 				<unitPattern count="other">{0}м</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} чак</unitPattern>
-				<unitPattern count="other">{0} чак</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>см</displayName>
+				<unitPattern count="one">{0} см</unitPattern>
+				<unitPattern count="other">{0} см</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>мм</displayName>
@@ -6103,31 +6550,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} пм</unitPattern>
 				<unitPattern count="other">{0} пм</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} чак</unitPattern>
+				<unitPattern count="other">{0} чак</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} ярд</unitPattern>
 				<unitPattern count="other">{0} ярд</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>грамм</displayName>
-				<unitPattern count="one">{0} г</unitPattern>
-				<unitPattern count="other">{0} г</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} фут</unitPattern>
+				<unitPattern count="other">{0} фут</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} д</unitPattern>
+				<unitPattern count="other">{0} д</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} жар.ж.</unitPattern>
+				<unitPattern count="other">{0} жар.ж.</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>килограмм</displayName>
 				<unitPattern count="one">{0} кг</unitPattern>
 				<unitPattern count="other">{0} кг</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} унция</unitPattern>
-				<unitPattern count="other">{0} унция</unitPattern>
+			<unit type="mass-gram">
+				<displayName>грамм</displayName>
+				<unitPattern count="one">{0} гр</unitPattern>
+				<unitPattern count="other">{0} гр</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} фунт</unitPattern>
 				<unitPattern count="other">{0} фунт</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} ат</unitPattern>
-				<unitPattern count="other">{0} ат</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} унция</unitPattern>
+				<unitPattern count="other">{0} унция</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} кВт</unitPattern>
@@ -6137,6 +6596,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Вт</unitPattern>
 				<unitPattern count="other">{0} Вт</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} ат</unitPattern>
+				<unitPattern count="other">{0} ат</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} гПа</unitPattern>
 				<unitPattern count="other">{0} гПа</unitPattern>
@@ -6184,6 +6647,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} л</unitPattern>
 				<unitPattern count="other">{0} л</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}Ч</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}Тн</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}Тш</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}Б</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
@@ -6208,6 +6677,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<listPatternPart type="end">{0}, {1}</listPatternPart>
 			<listPatternPart type="2">{0}, {1}</listPatternPart>
 		</listPattern>
+		<listPattern type="unit-narrow">
+			<listPatternPart type="start">{0} {1}</listPatternPart>
+			<listPatternPart type="middle">{0} {1}</listPatternPart>
+			<listPatternPart type="end">{0} {1}</listPatternPart>
+			<listPatternPart type="2">{0} {1}</listPatternPart>
+		</listPattern>
 		<listPattern type="unit-short">
 			<listPatternPart type="start">{0}, {1}</listPatternPart>
 			<listPatternPart type="middle">{0}, {1}</listPatternPart>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ky_Cyrl_KG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ky_KG.xml
similarity index 65%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ky_Cyrl_KG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ky_KG.xml
index fb7aa5caf79..37a1dc6a958 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ky_Cyrl_KG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ky_KG.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ky"/>
-		<script type="Cyrl"/>
 		<territory type="KG"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lag.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lag.xml
similarity index 88%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lag.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lag.xml
index 4b3f3ea420b..b06a3a4726a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lag.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lag.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="lag"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguíila</territory>
 			<territory type="AL">Alubánia</territory>
 			<territory type="AM">Ariménia</territory>
-			<territory type="AN">Antili ya Ʉholáanzi</territory>
 			<territory type="AO">Angóola</territory>
 			<territory type="AR">Ajentíina</territory>
 			<territory type="AS">Samóoa ya Amerɨ́ka</territory>
@@ -447,6 +445,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">TOO</dayPeriod>
+							<dayPeriod type="pm">MUU</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">TOO</dayPeriod>
 							<dayPeriod type="pm">MUU</dayPeriod>
@@ -488,22 +490,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -574,6 +576,48 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</fields>
 	</dates>
 	<numbers>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="zero" draft="provisional">¤ 0K</pattern>
+					<pattern type="1000" count="one" draft="provisional">¤ 0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="zero" draft="provisional">¤ 00K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤ 00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="zero" draft="provisional">¤ 000K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤ 000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="zero" draft="provisional">¤ 0M</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤ 0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="zero" draft="provisional">¤ 00M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤ 00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="zero" draft="provisional">¤ 000M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤ 000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="zero" draft="provisional">¤ 0G</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤ 0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="zero" draft="provisional">¤ 00G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤ 00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="zero" draft="provisional">¤ 000G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤ 000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="zero" draft="provisional">¤ 0T</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤ 0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="zero" draft="provisional">¤ 00T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤ 00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="zero" draft="provisional">¤ 000T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤ 000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencies>
 			<currency type="AED">
 				<displayName>Diriháamu ya Ʉtemi wa Kɨaráabu</displayName>
@@ -750,3 +794,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lag_TZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lag_TZ.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lag_TZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lag_TZ.xml
index 8249c5605bc..28c00fce3d1 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lag_TZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lag_TZ.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="lag"/>
 		<territory type="TZ"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lb.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lb.xml
similarity index 97%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lb.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lb.xml
index af35baf8026..a76923b7630 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lb.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lb.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc. CLDR data files are interpreted
+<!-- Copyright © 1991-2015 Unicode, Inc. CLDR data files are interpreted
 according to the LDML specification (http://unicode.org/reports/tr35/) For
 terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="lb"/>
 	</identity>
 	<localeDisplayNames>
@@ -42,7 +41,7 @@ terms of use, see http://www.unicode.org/copyright.html
 			<language type="ar">Arabesch</language>
 			<language type="ar_001">Modernt Héicharabesch</language>
 			<language type="arc">Aramäesch</language>
-			<language type="arn">Araukanesch</language>
+			<language type="arn">Mapudungun</language>
 			<language type="aro">Araona</language>
 			<language type="arp">Arapaho-Sprooch</language>
 			<language type="arq">Algerescht Arabesch</language>
@@ -58,7 +57,6 @@ terms of use, see http://www.unicode.org/copyright.html
 			<language type="awa">Awadhi</language>
 			<language type="ay">Aymara</language>
 			<language type="az">Aserbaidschanesch</language>
-			<language type="azb">Süd-Aserbaidschanesch</language>
 			<language type="ba">Baschkiresch</language>
 			<language type="bal">Belutschesch</language>
 			<language type="ban">Balinesesch</language>
@@ -532,8 +530,8 @@ terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">Sumeresch</language>
 			<language type="sv">Schwedesch</language>
 			<language type="sw">Suaheli</language>
+			<language type="sw_CD">Kongo-Swahili</language>
 			<language type="swb">Komoresch</language>
-			<language type="swc">Kongo-Swahili</language>
 			<language type="syc">Alsyresch</language>
 			<language type="syr">Syresch</language>
 			<language type="szl">Schlesesch</language>
@@ -831,8 +829,8 @@ terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CG">Kongo-Brazzaville</territory>
 			<territory type="CG" alt="variant">Kongo (Republik)</territory>
 			<territory type="CH">Schwäiz</territory>
-			<territory type="CI">Elfebeeküst</territory>
-			<territory type="CI" alt="variant">Côte d’Ivoire</territory>
+			<territory type="CI">Côte d’Ivoire</territory>
+			<territory type="CI" alt="variant">Elfebeeküst</territory>
 			<territory type="CK">Cookinselen</territory>
 			<territory type="CL">Chile</territory>
 			<territory type="CM">Kamerun</territory>
@@ -1113,73 +1111,73 @@ terms of use, see http://www.unicode.org/copyright.html
 			<key type="numbers">Zuelen</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Arabesch-indesch Zifferen</type>
-			<type type="arabext" key="numbers">Erweidert arabesch-indesch Zifferen</type>
-			<type type="armn" key="numbers">Armenesch Zifferen</type>
-			<type type="armnlow" key="numbers">Armenesch Zifferen a Klengschrëft</type>
-			<type type="beng" key="numbers">Bengalesch Zifferen</type>
-			<type type="big5han" key="collation">Traditionellt Chinesesch - Big5</type>
-			<type type="buddhist" key="calendar">Buddhistesche Kalenner</type>
-			<type type="chinese" key="calendar">Chinesesche Kalenner</type>
-			<type type="coptic" key="calendar">Koptesche Kalenner</type>
-			<type type="dangi" key="calendar">Dangi-Kalenner</type>
-			<type type="deva" key="numbers">Devanagari-Zifferen</type>
-			<type type="dictionary" key="collation">Lexikographesch Zortéierreiefolleg</type>
-			<type type="ducet" key="collation">Unicode-Zortéierung</type>
-			<type type="eor" key="collation">Europäesch Zortéierregelen</type>
-			<type type="ethi" key="numbers">Ethiopesch Zifferen</type>
-			<type type="ethiopic" key="calendar">Ethiopesche Kalenner</type>
-			<type type="ethiopic-amete-alem" key="calendar">Ethiopesche Kalenner &quot;Amete Alem&quot;</type>
-			<type type="fullwide" key="numbers">Vollbreet Zifferen</type>
-			<type type="gb2312han" key="collation">Vereinfacht Chinesesch - GB2312</type>
-			<type type="geor" key="numbers">Georgesch Zifferen</type>
-			<type type="gregorian" key="calendar">Gregorianesche Kalenner</type>
-			<type type="grek" key="numbers">Griichesch Zifferen</type>
-			<type type="greklow" key="numbers">Griichesch Zifferen a Klengschrëft</type>
-			<type type="gujr" key="numbers">Gujarati-Zifferen</type>
-			<type type="guru" key="numbers">Gurmukhi-Zifferen</type>
-			<type type="hanidec" key="numbers">Chinesesch Dezimalzuelen</type>
-			<type type="hans" key="numbers">Vereinfacht-Chinesesch Zifferen</type>
-			<type type="hansfin" key="numbers">Vereinfacht-Chinesesch Finanzzifferen</type>
-			<type type="hant" key="numbers">Traditionell-Chinesesch Zifferen</type>
-			<type type="hantfin" key="numbers">Traditionell-Chinesesch Finanzzifferen</type>
-			<type type="hebr" key="numbers">Hebräesch Zifferen</type>
-			<type type="hebrew" key="calendar">Hebräesche Kalenner</type>
-			<type type="indian" key="calendar">Indeschen Nationalkalenner</type>
-			<type type="islamic" key="calendar">Islamesche Kalenner</type>
-			<type type="islamic-civil" key="calendar">Biergerlechen islamesche Kalenner</type>
-			<type type="iso8601" key="calendar">ISO-8601-Kalenner</type>
-			<type type="japanese" key="calendar">Japanesche Kalenner</type>
-			<type type="jpan" key="numbers">Japanesch Zifferen</type>
-			<type type="jpanfin" key="numbers">Japanesch Finanzzifferen</type>
-			<type type="khmr" key="numbers">Khmer-Zifferen</type>
-			<type type="knda" key="numbers">Kannada-Zifferen</type>
-			<type type="laoo" key="numbers">Laotesch Zifferen</type>
-			<type type="latn" key="numbers">Westlech Zifferen</type>
-			<type type="mlym" key="numbers">Malayalam-Zifferen</type>
-			<type type="mong" key="numbers">Mongolesch Zifferen</type>
-			<type type="mymr" key="numbers">Myanmar-Zifferen</type>
-			<type type="orya" key="numbers">Oriya-Zifferen</type>
-			<type type="persian" key="calendar">Persesche Kalenner</type>
-			<type type="phonebook" key="collation">Telefonsbuch-Zortéierung</type>
-			<type type="pinyin" key="collation">Pinyin-Zortéierregelen</type>
-			<type type="reformed" key="collation">Reforméiert Zortéierreiefolleg</type>
-			<type type="roc" key="calendar">Kalenner vun der Republik China</type>
-			<type type="roman" key="numbers">Réimesch Zifferen</type>
-			<type type="romanlow" key="numbers">Réimesch Zifferen a Klengschrëft</type>
-			<type type="search" key="collation">Allgemeng Sich</type>
-			<type type="searchjl" key="collation">Sich no Ufanksbuschtawen aus dem koreaneschen Alphabet</type>
-			<type type="standard" key="collation">Standard Zortéierreiefolleg</type>
-			<type type="stroke" key="collation">Stréchfolleg</type>
-			<type type="taml" key="numbers">Tamilesch Zifferen</type>
-			<type type="tamldec" key="numbers">Tamil-Zifferen</type>
-			<type type="telu" key="numbers">Telugu-Zifferen</type>
-			<type type="thai" key="numbers">Thai-Zifferen</type>
-			<type type="tibt" key="numbers">Tibetesch Zifferen</type>
-			<type type="traditional" key="collation">Traditionell Zortéierregelen</type>
-			<type type="unihan" key="collation">Radikal-Stréch-Zortéierregelen</type>
-			<type type="vaii" key="numbers">Vai-Zifferen</type>
-			<type type="zhuyin" key="collation">Zhuyin-Zortéierregelen</type>
+			<type key="calendar" type="buddhist">Buddhistesche Kalenner</type>
+			<type key="calendar" type="chinese">Chinesesche Kalenner</type>
+			<type key="calendar" type="coptic">Koptesche Kalenner</type>
+			<type key="calendar" type="dangi">Dangi-Kalenner</type>
+			<type key="calendar" type="ethiopic">Ethiopesche Kalenner</type>
+			<type key="calendar" type="ethiopic-amete-alem">Ethiopesche Kalenner &quot;Amete Alem&quot;</type>
+			<type key="calendar" type="gregorian">Gregorianesche Kalenner</type>
+			<type key="calendar" type="hebrew">Hebräesche Kalenner</type>
+			<type key="calendar" type="indian">Indeschen Nationalkalenner</type>
+			<type key="calendar" type="islamic">Islamesche Kalenner</type>
+			<type key="calendar" type="islamic-civil">Biergerlechen islamesche Kalenner</type>
+			<type key="calendar" type="iso8601">ISO-8601-Kalenner</type>
+			<type key="calendar" type="japanese">Japanesche Kalenner</type>
+			<type key="calendar" type="persian">Persesche Kalenner</type>
+			<type key="calendar" type="roc">Kalenner vun der Republik China</type>
+			<type key="collation" type="big5han">Traditionellt Chinesesch - Big5</type>
+			<type key="collation" type="dictionary">Lexikographesch Zortéierreiefolleg</type>
+			<type key="collation" type="ducet">Unicode-Zortéierung</type>
+			<type key="collation" type="eor">Europäesch Zortéierregelen</type>
+			<type key="collation" type="gb2312han">Vereinfacht Chinesesch - GB2312</type>
+			<type key="collation" type="phonebook">Telefonsbuch-Zortéierung</type>
+			<type key="collation" type="pinyin">Pinyin-Zortéierregelen</type>
+			<type key="collation" type="reformed">Reforméiert Zortéierreiefolleg</type>
+			<type key="collation" type="search">Allgemeng Sich</type>
+			<type key="collation" type="searchjl">Sich no Ufanksbuschtawen aus dem koreaneschen Alphabet</type>
+			<type key="collation" type="standard">Standard Zortéierreiefolleg</type>
+			<type key="collation" type="stroke">Stréchfolleg</type>
+			<type key="collation" type="traditional">Traditionell Zortéierregelen</type>
+			<type key="collation" type="unihan">Radikal-Stréch-Zortéierregelen</type>
+			<type key="collation" type="zhuyin">Zhuyin-Zortéierregelen</type>
+			<type key="numbers" type="arab">Arabesch-indesch Zifferen</type>
+			<type key="numbers" type="arabext">Erweidert arabesch-indesch Zifferen</type>
+			<type key="numbers" type="armn">Armenesch Zifferen</type>
+			<type key="numbers" type="armnlow">Armenesch Zifferen a Klengschrëft</type>
+			<type key="numbers" type="beng">Bengalesch Zifferen</type>
+			<type key="numbers" type="deva">Devanagari-Zifferen</type>
+			<type key="numbers" type="ethi">Ethiopesch Zifferen</type>
+			<type key="numbers" type="fullwide">Vollbreet Zifferen</type>
+			<type key="numbers" type="geor">Georgesch Zifferen</type>
+			<type key="numbers" type="grek">Griichesch Zifferen</type>
+			<type key="numbers" type="greklow">Griichesch Zifferen a Klengschrëft</type>
+			<type key="numbers" type="gujr">Gujarati-Zifferen</type>
+			<type key="numbers" type="guru">Gurmukhi-Zifferen</type>
+			<type key="numbers" type="hanidec">Chinesesch Dezimalzuelen</type>
+			<type key="numbers" type="hans">Vereinfacht-Chinesesch Zifferen</type>
+			<type key="numbers" type="hansfin">Vereinfacht-Chinesesch Finanzzifferen</type>
+			<type key="numbers" type="hant">Traditionell-Chinesesch Zifferen</type>
+			<type key="numbers" type="hantfin">Traditionell-Chinesesch Finanzzifferen</type>
+			<type key="numbers" type="hebr">Hebräesch Zifferen</type>
+			<type key="numbers" type="jpan">Japanesch Zifferen</type>
+			<type key="numbers" type="jpanfin">Japanesch Finanzzifferen</type>
+			<type key="numbers" type="khmr">Khmer-Zifferen</type>
+			<type key="numbers" type="knda">Kannada-Zifferen</type>
+			<type key="numbers" type="laoo">Laotesch Zifferen</type>
+			<type key="numbers" type="latn">Westlech Zifferen</type>
+			<type key="numbers" type="mlym">Malayalam-Zifferen</type>
+			<type key="numbers" type="mong">Mongolesch Zifferen</type>
+			<type key="numbers" type="mymr">Myanmar-Zifferen</type>
+			<type key="numbers" type="orya">Oriya-Zifferen</type>
+			<type key="numbers" type="roman">Réimesch Zifferen</type>
+			<type key="numbers" type="romanlow">Réimesch Zifferen a Klengschrëft</type>
+			<type key="numbers" type="taml">Tamilesch Zifferen</type>
+			<type key="numbers" type="tamldec">Tamil-Zifferen</type>
+			<type key="numbers" type="telu">Telugu-Zifferen</type>
+			<type key="numbers" type="thai">Thai-Zifferen</type>
+			<type key="numbers" type="tibt">Tibetesch Zifferen</type>
+			<type key="numbers" type="vaii">Vai-Zifferen</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Metreschen Eenheetesystem</measurementSystemName>
@@ -1638,14 +1636,16 @@ terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">moies</dayPeriod>
+							<dayPeriod type="pm">nomëttes</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am">mo.</dayPeriod>
-							<dayPeriod type="noon">më.</dayPeriod>
 							<dayPeriod type="pm">nomë.</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">moies</dayPeriod>
-							<dayPeriod type="noon">mëttes</dayPeriod>
 							<dayPeriod type="pm">nomëttes</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
@@ -3658,6 +3658,34 @@ terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0 Dsd'.' ¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0 Dsd'.' ¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00 Dsd'.' ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00 Dsd'.' ¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000 Dsd'.' ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000 Dsd'.' ¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0 Mio'.' ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0 Mio'.' ¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00 Mio'.' ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00 Mio'.' ¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000 Mio'.' ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000 Mio'.' ¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0 Mrd'.' ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0 Mrd'.' ¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00 Mrd'.' ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00 Mrd'.' ¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000 Mrd'.' ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000 Mrd'.' ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0 Bio'.' ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0 Bio'.' ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00 Bio'.' ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00 Bio'.' ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000 Bio'.' ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000 Bio'.' ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -5107,6 +5135,16 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Meter pro Quadratsekonn</unitPattern>
 				<unitPattern count="other">{0} Meter pro Quadratsekonn</unitPattern>
 			</unit>
+			<unit type="angle-radian">
+				<displayName>Radianten</displayName>
+				<unitPattern count="one">{0} Radiant</unitPattern>
+				<unitPattern count="other">{0} Radianten</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>Grad</displayName>
+				<unitPattern count="one">{0} Grad</unitPattern>
+				<unitPattern count="other">{0} Grad</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>Wénkelminutten</displayName>
 				<unitPattern count="one">{0} Wénkelminutt</unitPattern>
@@ -5117,31 +5155,41 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Wénkelsekonn</unitPattern>
 				<unitPattern count="other">{0} Wénkelsekonnen</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>Grad</displayName>
-				<unitPattern count="one">{0} Grad</unitPattern>
-				<unitPattern count="other">{0} Grad</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>Radianten</displayName>
-				<unitPattern count="one">{0} Radiant</unitPattern>
-				<unitPattern count="other">{0} Radianten</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>Acres</displayName>
-				<unitPattern count="one">{0} Acre</unitPattern>
-				<unitPattern count="other">{0} Acres</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>Quadratkilometer</displayName>
+				<unitPattern count="one">{0} Quadratkilometer</unitPattern>
+				<unitPattern count="other">{0} Quadratkilometer</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>Hektar</displayName>
 				<unitPattern count="one">{0} Hektar</unitPattern>
 				<unitPattern count="other">{0} Hektar</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>Quadratmeter</displayName>
+				<unitPattern count="one">{0} Quadratmeter</unitPattern>
+				<unitPattern count="other">{0} Quadratmeter</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>Quadratzentimeter</displayName>
 				<unitPattern count="one">{0} Quadratzentimeter</unitPattern>
 				<unitPattern count="other">{0} Quadratzentimeter</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<displayName>Quadratmeilen</displayName>
+				<unitPattern count="one">{0} Quadratmeil</unitPattern>
+				<unitPattern count="other">{0} Quadratmeilen</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>Acres</displayName>
+				<unitPattern count="one">{0} Acre</unitPattern>
+				<unitPattern count="other">{0} Acres</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>Quadratyards</displayName>
+				<unitPattern count="one">{0} Quadratyard</unitPattern>
+				<unitPattern count="other">{0} Quadratyards</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<displayName>Quadratfouss</displayName>
 				<unitPattern count="one">{0} Quadratfouss</unitPattern>
@@ -5152,80 +5200,80 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Quadratzoll</unitPattern>
 				<unitPattern count="other">{0} Quadratzoll</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>Quadratkilometer</displayName>
-				<unitPattern count="one">{0} Quadratkilometer</unitPattern>
-				<unitPattern count="other">{0} Quadratkilometer</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>Quadratmeter</displayName>
-				<unitPattern count="one">{0} Quadratmeter</unitPattern>
-				<unitPattern count="other">{0} Quadratmeter</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>Quadratmeilen</displayName>
-				<unitPattern count="one">{0} Quadratmeil</unitPattern>
-				<unitPattern count="other">{0} Quadratmeilen</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>Quadratyards</displayName>
-				<unitPattern count="one">{0} Quadratyard</unitPattern>
-				<unitPattern count="other">{0} Quadratyards</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>Karat</displayName>
+				<unitPattern count="one">{0} Karat</unitPattern>
+				<unitPattern count="other">{0} Karat</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>Liter pro Kilometer</displayName>
 				<unitPattern count="one">{0} Liter pro Kilometer</unitPattern>
 				<unitPattern count="other">{0} Liter pro Kilometer</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>Bits</displayName>
-				<unitPattern count="one">{0} Bit</unitPattern>
-				<unitPattern count="other">{0} Bits</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>Bytes</displayName>
-				<unitPattern count="one">{0} Byte</unitPattern>
-				<unitPattern count="other">{0} Bytes</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gigabits</displayName>
-				<unitPattern count="one">{0} Gigabit</unitPattern>
-				<unitPattern count="other">{0} Gigabit</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>Gigabytes</displayName>
-				<unitPattern count="one">{0} Gigabyte</unitPattern>
-				<unitPattern count="other">{0} Gigabytes</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>Kilobits</displayName>
-				<unitPattern count="one">{0} Kilobit</unitPattern>
-				<unitPattern count="other">{0} Kilobit</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>Kilobytes</displayName>
-				<unitPattern count="one">{0} Kilobyte</unitPattern>
-				<unitPattern count="other">{0} Kilobytes</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Megabits</displayName>
-				<unitPattern count="one">{0} Megabit</unitPattern>
-				<unitPattern count="other">{0} Megabits</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>Megabytes</displayName>
-				<unitPattern count="one">{0} Megabyte</unitPattern>
-				<unitPattern count="other">{0} Megabytes</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>Terabytes</displayName>
+				<unitPattern count="one">{0} Terabyte</unitPattern>
+				<unitPattern count="other">{0} Terabytes</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>Terabits</displayName>
 				<unitPattern count="one">{0} Terabit</unitPattern>
 				<unitPattern count="other">{0} Terabits</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>Terabytes</displayName>
-				<unitPattern count="one">{0} Terabyte</unitPattern>
-				<unitPattern count="other">{0} Terabytes</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>Gigabytes</displayName>
+				<unitPattern count="one">{0} Gigabyte</unitPattern>
+				<unitPattern count="other">{0} Gigabytes</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gigabits</displayName>
+				<unitPattern count="one">{0} Gigabit</unitPattern>
+				<unitPattern count="other">{0} Gigabit</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>Megabytes</displayName>
+				<unitPattern count="one">{0} Megabyte</unitPattern>
+				<unitPattern count="other">{0} Megabytes</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Megabits</displayName>
+				<unitPattern count="one">{0} Megabit</unitPattern>
+				<unitPattern count="other">{0} Megabits</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>Kilobytes</displayName>
+				<unitPattern count="one">{0} Kilobyte</unitPattern>
+				<unitPattern count="other">{0} Kilobytes</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>Kilobits</displayName>
+				<unitPattern count="one">{0} Kilobit</unitPattern>
+				<unitPattern count="other">{0} Kilobit</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>Bytes</displayName>
+				<unitPattern count="one">{0} Byte</unitPattern>
+				<unitPattern count="other">{0} Bytes</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>Bits</displayName>
+				<unitPattern count="one">{0} Bit</unitPattern>
+				<unitPattern count="other">{0} Bits</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>Joer</displayName>
+				<unitPattern count="one">{0} Joer</unitPattern>
+				<unitPattern count="other">{0} Joer</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>Méint</displayName>
+				<unitPattern count="one">{0} Mount</unitPattern>
+				<unitPattern count="other">{0} Méint</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>Wochen</displayName>
+				<unitPattern count="one">{0} Woch</unitPattern>
+				<unitPattern count="other">{0} Wochen</unitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>Deeg</displayName>
@@ -5238,46 +5286,31 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} Stonnen</unitPattern>
 				<perUnitPattern>{0} pro Stonn</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>Mikrosekonnen</displayName>
-				<unitPattern count="one">{0} Mikrosekonn</unitPattern>
-				<unitPattern count="other">{0} Mikrosekonnen</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>Millisekonnen</displayName>
-				<unitPattern count="one">{0} Millisekonn</unitPattern>
-				<unitPattern count="other">{0} Millisekonnen</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>Minutten</displayName>
 				<unitPattern count="one">{0} Minutt</unitPattern>
 				<unitPattern count="other">{0} Minutten</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>Méint</displayName>
-				<unitPattern count="one">{0} Mount</unitPattern>
-				<unitPattern count="other">{0} Méint</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>Nanosekonnen</displayName>
-				<unitPattern count="one">{0} Nanosekonn</unitPattern>
-				<unitPattern count="other">{0} Nanosekonnen</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>Sekonnen</displayName>
 				<unitPattern count="one">{0} Sekonn</unitPattern>
 				<unitPattern count="other">{0} Sekonnen</unitPattern>
 				<perUnitPattern>{0} pro Sekonn</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>Wochen</displayName>
-				<unitPattern count="one">{0} Woch</unitPattern>
-				<unitPattern count="other">{0} Wochen</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>Millisekonnen</displayName>
+				<unitPattern count="one">{0} Millisekonn</unitPattern>
+				<unitPattern count="other">{0} Millisekonnen</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>Joer</displayName>
-				<unitPattern count="one">{0} Joer</unitPattern>
-				<unitPattern count="other">{0} Joer</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>Mikrosekonnen</displayName>
+				<unitPattern count="one">{0} Mikrosekonn</unitPattern>
+				<unitPattern count="other">{0} Mikrosekonnen</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>Nanosekonnen</displayName>
+				<unitPattern count="one">{0} Nanosekonn</unitPattern>
+				<unitPattern count="other">{0} Nanosekonnen</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>Ampère</displayName>
@@ -5299,6 +5332,11 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Volt</unitPattern>
 				<unitPattern count="other">{0} Volt</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>Kilokalorien</displayName>
+				<unitPattern count="one">{0} Kilokalorie</unitPattern>
+				<unitPattern count="other">{0} Kilokalorien</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>Kalorien</displayName>
 				<unitPattern count="one">{0} Kalorie</unitPattern>
@@ -5309,21 +5347,16 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Liewensmëttelkalorie</unitPattern>
 				<unitPattern count="other">{0} Liewensmëttelkalorien</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>Joule</displayName>
-				<unitPattern count="one">{0} Joule</unitPattern>
-				<unitPattern count="other">{0} Joule</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>Kilokalorien</displayName>
-				<unitPattern count="one">{0} Kilokalorie</unitPattern>
-				<unitPattern count="other">{0} Kilokalorien</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>Kilojoule</displayName>
 				<unitPattern count="one">{0} Kilojoule</unitPattern>
 				<unitPattern count="other">{0} Kilojoule</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>Joule</displayName>
+				<unitPattern count="one">{0} Joule</unitPattern>
+				<unitPattern count="other">{0} Joule</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>Kilowattstonnen</displayName>
 				<unitPattern count="one">{0} Kilowattstonn</unitPattern>
@@ -5334,145 +5367,155 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Gigahertz</unitPattern>
 				<unitPattern count="other">{0} Gigahertz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hertz</displayName>
-				<unitPattern count="one">{0} Hertz</unitPattern>
-				<unitPattern count="other">{0} Hertz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>Megahertz</displayName>
+				<unitPattern count="one">{0} Megahertz</unitPattern>
+				<unitPattern count="other">{0} Megahertz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>Kilohertz</displayName>
 				<unitPattern count="one">{0} Kilohertz</unitPattern>
 				<unitPattern count="other">{0} Kilohertz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>Megahertz</displayName>
-				<unitPattern count="one">{0} Megahertz</unitPattern>
-				<unitPattern count="other">{0} Megahertz</unitPattern>
-			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>Astronomesch Eenheeten</displayName>
-				<unitPattern count="one">{0} Astronomesch Eenheet</unitPattern>
-				<unitPattern count="other">{0} Astronomesch Eenheeten</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>Zentimeter</displayName>
-				<unitPattern count="one">{0} Zentimeter</unitPattern>
-				<unitPattern count="other">{0} Zentimeter</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<displayName>Dezimeter</displayName>
-				<unitPattern count="one">{0} Dezimeter</unitPattern>
-				<unitPattern count="other">{0} Dezimeter</unitPattern>
-			</unit>
-			<unit type="length-fathom">
-				<displayName>Nautesch Fiedem</displayName>
-				<unitPattern count="one">{0} Nautesche Fuedem</unitPattern>
-				<unitPattern count="other">{0} Nautesch Fiedem</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>Fouss</displayName>
-				<unitPattern count="one">{0} Fouss</unitPattern>
-				<unitPattern count="other">{0} Fouss</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>Furlongs</displayName>
-				<unitPattern count="one">{0} Furlong</unitPattern>
-				<unitPattern count="other">{0} Furlongs</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>Zoll</displayName>
-				<unitPattern count="one">{0} Zoll</unitPattern>
-				<unitPattern count="other">{0} Zoll</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hertz</displayName>
+				<unitPattern count="one">{0} Hertz</unitPattern>
+				<unitPattern count="other">{0} Hertz</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>Kilometer</displayName>
 				<unitPattern count="one">{0} Kilometer</unitPattern>
 				<unitPattern count="other">{0} Kilometer</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<displayName>Liichtjoer</displayName>
-				<unitPattern count="one">{0} Liichtjoer</unitPattern>
-				<unitPattern count="other">{0} Liichtjoer</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>Meter</displayName>
 				<unitPattern count="one">{0} Meter</unitPattern>
 				<unitPattern count="other">{0} Meter</unitPattern>
 			</unit>
-			<unit type="length-micrometer">
-				<displayName>Mikrometer</displayName>
-				<unitPattern count="one">{0} Mikrometer</unitPattern>
-				<unitPattern count="other">{0} Mikrometer</unitPattern>
+			<unit type="length-decimeter">
+				<displayName>Dezimeter</displayName>
+				<unitPattern count="one">{0} Dezimeter</unitPattern>
+				<unitPattern count="other">{0} Dezimeter</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName>Meilen</displayName>
-				<unitPattern count="one">{0} Meil</unitPattern>
-				<unitPattern count="other">{0} Meilen</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>Zentimeter</displayName>
+				<unitPattern count="one">{0} Zentimeter</unitPattern>
+				<unitPattern count="other">{0} Zentimeter</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>Millimeter</displayName>
 				<unitPattern count="one">{0} Millimeter</unitPattern>
 				<unitPattern count="other">{0} Millimeter</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>Mikrometer</displayName>
+				<unitPattern count="one">{0} Mikrometer</unitPattern>
+				<unitPattern count="other">{0} Mikrometer</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>Nanometer</displayName>
 				<unitPattern count="one">{0} Nanometer</unitPattern>
 				<unitPattern count="other">{0} Nanometer</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>Nautesch Meilen</displayName>
-				<unitPattern count="one">{0} Nautesch Meil</unitPattern>
-				<unitPattern count="other">{0} Nautesch Meilen</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>Parsecs</displayName>
-				<unitPattern count="one">{0} Parsec</unitPattern>
-				<unitPattern count="other">{0} Parsecs</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>Pikometer</displayName>
 				<unitPattern count="one">{0} Pikometer</unitPattern>
 				<unitPattern count="other">{0} Pikometer</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>Meilen</displayName>
+				<unitPattern count="one">{0} Meil</unitPattern>
+				<unitPattern count="other">{0} Meilen</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>Yard</displayName>
 				<unitPattern count="one">{0} Yard</unitPattern>
 				<unitPattern count="other">{0} Yards</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>Fouss</displayName>
+				<unitPattern count="one">{0} Fouss</unitPattern>
+				<unitPattern count="other">{0} Fouss</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>Zoll</displayName>
+				<unitPattern count="one">{0} Zoll</unitPattern>
+				<unitPattern count="other">{0} Zoll</unitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>Parsecs</displayName>
+				<unitPattern count="one">{0} Parsec</unitPattern>
+				<unitPattern count="other">{0} Parsecs</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>Liichtjoer</displayName>
+				<unitPattern count="one">{0} Liichtjoer</unitPattern>
+				<unitPattern count="other">{0} Liichtjoer</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>Astronomesch Eenheeten</displayName>
+				<unitPattern count="one">{0} Astronomesch Eenheet</unitPattern>
+				<unitPattern count="other">{0} Astronomesch Eenheeten</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>Furlongs</displayName>
+				<unitPattern count="one">{0} Furlong</unitPattern>
+				<unitPattern count="other">{0} Furlongs</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>Nautesch Fiedem</displayName>
+				<unitPattern count="one">{0} Nautesche Fuedem</unitPattern>
+				<unitPattern count="other">{0} Nautesch Fiedem</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>Nautesch Meilen</displayName>
+				<unitPattern count="one">{0} Nautesch Meil</unitPattern>
+				<unitPattern count="other">{0} Nautesch Meilen</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>Lux</displayName>
 				<unitPattern count="one">{0} Lux</unitPattern>
 				<unitPattern count="other">{0} Lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>Carat</displayName>
-				<unitPattern count="one">{0} Carat</unitPattern>
-				<unitPattern count="other">{0} Carat</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>Gramm</displayName>
-				<unitPattern count="one">{0} Gramm</unitPattern>
-				<unitPattern count="other">{0} Gramm</unitPattern>
+			<unit type="mass-metric-ton">
+				<displayName>Tonnen</displayName>
+				<unitPattern count="one">{0} Tonn</unitPattern>
+				<unitPattern count="other">{0} Tonnen</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>Kilogramm</displayName>
 				<unitPattern count="one">{0} Kilogramm</unitPattern>
 				<unitPattern count="other">{0} Kilogramm</unitPattern>
 			</unit>
-			<unit type="mass-metric-ton">
-				<displayName>Tonnen</displayName>
-				<unitPattern count="one">{0} Tonn</unitPattern>
-				<unitPattern count="other">{0} Tonnen</unitPattern>
+			<unit type="mass-gram">
+				<displayName>Gramm</displayName>
+				<unitPattern count="one">{0} Gramm</unitPattern>
+				<unitPattern count="other">{0} Gramm</unitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>Milligramm</displayName>
+				<unitPattern count="one">{0} Milligramm</unitPattern>
+				<unitPattern count="other">{0} Milligramm</unitPattern>
 			</unit>
 			<unit type="mass-microgram">
 				<displayName>Mikrogramm</displayName>
 				<unitPattern count="one">{0} Mikrogramm</unitPattern>
 				<unitPattern count="other">{0} Mikrogramm</unitPattern>
 			</unit>
-			<unit type="mass-milligram">
-				<displayName>Milligramm</displayName>
-				<unitPattern count="one">{0} Milligramm</unitPattern>
-				<unitPattern count="other">{0} Milligramm</unitPattern>
+			<unit type="mass-ton">
+				<displayName>Long tons</displayName>
+				<unitPattern count="one">{0} Long ton</unitPattern>
+				<unitPattern count="other">{0} Long tons</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName>Stones</displayName>
+				<unitPattern count="one">{0} Stone</unitPattern>
+				<unitPattern count="other">{0} Stones</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>Pond</displayName>
+				<unitPattern count="one">{0} Pond</unitPattern>
+				<unitPattern count="other">{0} Pond</unitPattern>
 			</unit>
 			<unit type="mass-ounce">
 				<displayName>Onz</displayName>
@@ -5484,66 +5527,46 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Fäin-Onz</unitPattern>
 				<unitPattern count="other">{0} Fäin-Onzen</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<displayName>Pond</displayName>
-				<unitPattern count="one">{0} Pond</unitPattern>
-				<unitPattern count="other">{0} Pond</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>Stones</displayName>
-				<unitPattern count="one">{0} Stone</unitPattern>
-				<unitPattern count="other">{0} Stones</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<displayName>Long tons</displayName>
-				<unitPattern count="one">{0} Long ton</unitPattern>
-				<unitPattern count="other">{0} Long tons</unitPattern>
+			<unit type="mass-carat">
+				<displayName>Carat</displayName>
+				<unitPattern count="one">{0} Carat</unitPattern>
+				<unitPattern count="other">{0} Carat</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<displayName>Gigawatt</displayName>
 				<unitPattern count="one">{0} Gigawatt</unitPattern>
 				<unitPattern count="other">{0} Gigawatt</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>Päerdsstäerkten</displayName>
-				<unitPattern count="one">{0} Päerdsstäerkt</unitPattern>
-				<unitPattern count="other">{0} Päerdsstäerkten</unitPattern>
+			<unit type="power-megawatt">
+				<displayName>Megawatt</displayName>
+				<unitPattern count="one">{0} Megawatt</unitPattern>
+				<unitPattern count="other">{0} Megawatt</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName>Kilowatt</displayName>
 				<unitPattern count="one">{0} Kilowatt</unitPattern>
 				<unitPattern count="other">{0} Kilowatt</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<displayName>Megawatt</displayName>
-				<unitPattern count="one">{0} Megawatt</unitPattern>
-				<unitPattern count="other">{0} Megawatt</unitPattern>
+			<unit type="power-watt">
+				<displayName>Watt</displayName>
+				<unitPattern count="one">{0} Watt</unitPattern>
+				<unitPattern count="other">{0} Watt</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<displayName>Milliwatt</displayName>
 				<unitPattern count="one">{0} Milliwatt</unitPattern>
 				<unitPattern count="other">{0} Milliwatt</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName>Watt</displayName>
-				<unitPattern count="one">{0} Watt</unitPattern>
-				<unitPattern count="other">{0} Watt</unitPattern>
+			<unit type="power-horsepower">
+				<displayName>Päerdsstäerkten</displayName>
+				<unitPattern count="one">{0} Päerdsstäerkt</unitPattern>
+				<unitPattern count="other">{0} Päerdsstäerkten</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} Hektopascal</unitPattern>
 				<unitPattern count="other">{0} Hektopascal</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} Zoll Quecksëlwersail</unitPattern>
-				<unitPattern count="other">{0} Zoll Quecksëlwersail</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} Millibar</unitPattern>
-				<unitPattern count="other">{0} Millibar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -5554,10 +5577,15 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>Karat</displayName>
-				<unitPattern count="one">{0} Karat</unitPattern>
-				<unitPattern count="other">{0} Karat</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} Zoll Quecksëlwersail</unitPattern>
+				<unitPattern count="other">{0} Zoll Quecksëlwersail</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} Millibar</unitPattern>
+				<unitPattern count="other">{0} Millibar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>Kilometer pro Stonn</displayName>
@@ -5589,36 +5617,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>acre-feet</displayName>
-				<unitPattern count="one">{0} acre-foot</unitPattern>
-				<unitPattern count="other">{0} acre-feet</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>Bushels</displayName>
-				<unitPattern count="one">{0} Bushel</unitPattern>
-				<unitPattern count="other">{0} Bushels</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>Zentiliter</displayName>
-				<unitPattern count="one">{0} Zentiliter</unitPattern>
-				<unitPattern count="other">{0} Zentiliter</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>Kubikzentimeter</displayName>
-				<unitPattern count="one">{0} Kubikzentimeter</unitPattern>
-				<unitPattern count="other">{0} Kubikzentimeter</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>Kubikfouss</displayName>
-				<unitPattern count="one">{0} Kubikfouss</unitPattern>
-				<unitPattern count="other">{0} Kubikfouss</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>Kubikzoll</displayName>
-				<unitPattern count="one">{0} Kubikzoll</unitPattern>
-				<unitPattern count="other">{0} Kubikzoll</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>Kubikkilometer</displayName>
 				<unitPattern count="one">{0} Kubikkilometer</unitPattern>
@@ -5629,6 +5627,11 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Kubikmeter</unitPattern>
 				<unitPattern count="other">{0} Kubikmeter</unitPattern>
 			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>Kubikzentimeter</displayName>
+				<unitPattern count="one">{0} Kubikzentimeter</unitPattern>
+				<unitPattern count="other">{0} Kubikzentimeter</unitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>Kubikmeilen</displayName>
 				<unitPattern count="one">{0} Kubikmeil</unitPattern>
@@ -5639,25 +5642,20 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Kubikyard</unitPattern>
 				<unitPattern count="other">{0} Kubikyard</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>Cup</displayName>
-				<unitPattern count="one">{0} cup</unitPattern>
-				<unitPattern count="other">{0} cup</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>Kubikfouss</displayName>
+				<unitPattern count="one">{0} Kubikfouss</unitPattern>
+				<unitPattern count="other">{0} Kubikfouss</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>Deziliter</displayName>
-				<unitPattern count="one">{0} Deziliter</unitPattern>
-				<unitPattern count="other">{0} Deziliter</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>Kubikzoll</displayName>
+				<unitPattern count="one">{0} Kubikzoll</unitPattern>
+				<unitPattern count="other">{0} Kubikzoll</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>Flësseg-Onzen</displayName>
-				<unitPattern count="one">{0} Flësseg-Onz</unitPattern>
-				<unitPattern count="other">{0} Flësseg-Onzen</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>Gallounen</displayName>
-				<unitPattern count="one">{0} Galloun</unitPattern>
-				<unitPattern count="other">{0} Gallounen</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Megaliter</displayName>
+				<unitPattern count="one">{0} Megaliter</unitPattern>
+				<unitPattern count="other">{0} Megaliter</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>Hektoliter</displayName>
@@ -5669,26 +5667,56 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Liter</unitPattern>
 				<unitPattern count="other">{0} Liter</unitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Megaliter</displayName>
-				<unitPattern count="one">{0} Megaliter</unitPattern>
-				<unitPattern count="other">{0} Megaliter</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>Deziliter</displayName>
+				<unitPattern count="one">{0} Deziliter</unitPattern>
+				<unitPattern count="other">{0} Deziliter</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>Zentiliter</displayName>
+				<unitPattern count="one">{0} Zentiliter</unitPattern>
+				<unitPattern count="other">{0} Zentiliter</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>Milliliter</displayName>
 				<unitPattern count="one">{0} Milliliter</unitPattern>
 				<unitPattern count="other">{0} Milliliter</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>Pinten</displayName>
-				<unitPattern count="one">{0} Pint</unitPattern>
-				<unitPattern count="other">{0} Pinten</unitPattern>
+			<unit type="volume-acre-foot">
+				<displayName>acre-feet</displayName>
+				<unitPattern count="one">{0} acre-foot</unitPattern>
+				<unitPattern count="other">{0} acre-feet</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>Bushels</displayName>
+				<unitPattern count="one">{0} Bushel</unitPattern>
+				<unitPattern count="other">{0} Bushels</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>Gallounen</displayName>
+				<unitPattern count="one">{0} Galloun</unitPattern>
+				<unitPattern count="other">{0} Gallounen</unitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>Quarten</displayName>
 				<unitPattern count="one">{0} Quart</unitPattern>
 				<unitPattern count="other">{0} Quarten</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>Pinten</displayName>
+				<unitPattern count="one">{0} Pint</unitPattern>
+				<unitPattern count="other">{0} Pinten</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>Cup</displayName>
+				<unitPattern count="one">{0} cup</unitPattern>
+				<unitPattern count="other">{0} cup</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>Flësseg-Onzen</displayName>
+				<unitPattern count="one">{0} Flësseg-Onz</unitPattern>
+				<unitPattern count="other">{0} Flësseg-Onzen</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>Zoppeläffelen</displayName>
 				<unitPattern count="one">{0} Zoppeläffel</unitPattern>
@@ -5711,6 +5739,16 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>′</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
@@ -5721,31 +5759,41 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>°</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ac</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ha</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ac</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<displayName>ft²</displayName>
 				<unitPattern count="one">{0} ft²</unitPattern>
@@ -5756,25 +5804,10 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
@@ -5786,55 +5819,70 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>b</displayName>
-				<unitPattern count="one">{0} b</unitPattern>
-				<unitPattern count="other">{0} b</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>B</displayName>
-				<unitPattern count="one">{0} B</unitPattern>
-				<unitPattern count="other">{0} B</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>TB</displayName>
+				<unitPattern count="one">{0} TB</unitPattern>
+				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>Tb</displayName>
 				<unitPattern count="one">{0} Tb</unitPattern>
 				<unitPattern count="other">{0} Tb</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>TB</displayName>
-				<unitPattern count="one">{0} TB</unitPattern>
-				<unitPattern count="other">{0} TB</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>B</displayName>
+				<unitPattern count="one">{0} B</unitPattern>
+				<unitPattern count="other">{0} B</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>b</displayName>
+				<unitPattern count="one">{0} b</unitPattern>
+				<unitPattern count="other">{0} b</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>Mnt</displayName>
+				<unitPattern count="one">{0} Mnt</unitPattern>
+				<unitPattern count="other">{0} Mnt</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>W</displayName>
+				<unitPattern count="one">{0} W</unitPattern>
+				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>D</displayName>
@@ -5847,46 +5895,31 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} St.</unitPattern>
 				<perUnitPattern>{0}/St.</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>Min.</displayName>
 				<unitPattern count="one">{0} Min.</unitPattern>
 				<unitPattern count="other">{0} Min.</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>Mnt</displayName>
-				<unitPattern count="one">{0} Mnt</unitPattern>
-				<unitPattern count="other">{0} Mnt</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>Sek.</displayName>
 				<unitPattern count="one">{0} Sek.</unitPattern>
 				<unitPattern count="other">{0} Sek.</unitPattern>
 				<perUnitPattern>{0}/Sek.</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>W</displayName>
-				<unitPattern count="one">{0} W</unitPattern>
-				<unitPattern count="other">{0} W</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>J</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>A</displayName>
@@ -5908,6 +5941,11 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -5918,21 +5956,16 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Cal</unitPattern>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -5943,145 +5976,155 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
-			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<displayName>dm</displayName>
-				<unitPattern count="one">{0} dm</unitPattern>
-				<unitPattern count="other">{0} dm</unitPattern>
-			</unit>
-			<unit type="length-fathom">
-				<displayName>fm</displayName>
-				<unitPattern count="one">{0} fm</unitPattern>
-				<unitPattern count="other">{0} fm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>ft</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>fur</displayName>
-				<unitPattern count="one">{0} fur</unitPattern>
-				<unitPattern count="other">{0} fur</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>in</displayName>
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
 				<unitPattern count="one">{0} km</unitPattern>
 				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<displayName>ly</displayName>
-				<unitPattern count="one">{0} ly</unitPattern>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>m</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
+			<unit type="length-decimeter">
+				<displayName>dm</displayName>
+				<unitPattern count="one">{0} dm</unitPattern>
+				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName>mi</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="one">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yd</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ft</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>in</displayName>
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ly</displayName>
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>fur</displayName>
+				<unitPattern count="one">{0} fur</unitPattern>
+				<unitPattern count="other">{0} fur</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>fm</displayName>
+				<unitPattern count="one">{0} fm</unitPattern>
+				<unitPattern count="other">{0} fm</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>CD</displayName>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="mass-metric-ton">
+				<displayName>t</displayName>
+				<unitPattern count="one">{0} t</unitPattern>
+				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="one">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-metric-ton">
-				<displayName>t</displayName>
-				<unitPattern count="one">{0} t</unitPattern>
-				<unitPattern count="other">{0} t</unitPattern>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>mg</displayName>
+				<unitPattern count="one">{0} mg</unitPattern>
+				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
 			<unit type="mass-microgram">
 				<displayName>µg</displayName>
 				<unitPattern count="one">{0} µg</unitPattern>
 				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
-			<unit type="mass-milligram">
-				<displayName>mg</displayName>
-				<unitPattern count="one">{0} mg</unitPattern>
-				<unitPattern count="other">{0} mg</unitPattern>
+			<unit type="mass-ton">
+				<displayName>tn</displayName>
+				<unitPattern count="one">{0} tn</unitPattern>
+				<unitPattern count="other">{0} tn</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName>st</displayName>
+				<unitPattern count="one">{0} st</unitPattern>
+				<unitPattern count="other">{0} st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
 			</unit>
 			<unit type="mass-ounce">
 				<displayName>oz</displayName>
@@ -6093,66 +6136,46 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} oz. tr.</unitPattern>
 				<unitPattern count="other">{0} oz. tr.</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>st</displayName>
-				<unitPattern count="one">{0} st</unitPattern>
-				<unitPattern count="other">{0} st</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<displayName>tn</displayName>
-				<unitPattern count="one">{0} tn</unitPattern>
-				<unitPattern count="other">{0} tn</unitPattern>
+			<unit type="mass-carat">
+				<displayName>CD</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>PS</displayName>
-				<unitPattern count="one">{0} PS</unitPattern>
-				<unitPattern count="other">{0} PS</unitPattern>
+			<unit type="power-megawatt">
+				<displayName>MW</displayName>
+				<unitPattern count="one">{0} MW</unitPattern>
+				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName>kW</displayName>
 				<unitPattern count="one">{0} kW</unitPattern>
 				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<displayName>MW</displayName>
-				<unitPattern count="one">{0} MW</unitPattern>
-				<unitPattern count="other">{0} MW</unitPattern>
+			<unit type="power-watt">
+				<displayName>W</displayName>
+				<unitPattern count="one">{0} W</unitPattern>
+				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<displayName>mW</displayName>
 				<unitPattern count="one">{0} mW</unitPattern>
 				<unitPattern count="other">{0} mW</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName>W</displayName>
-				<unitPattern count="one">{0} W</unitPattern>
-				<unitPattern count="other">{0} W</unitPattern>
+			<unit type="power-horsepower">
+				<displayName>PS</displayName>
+				<unitPattern count="one">{0} PS</unitPattern>
+				<unitPattern count="other">{0} PS</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -6163,10 +6186,15 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -6198,36 +6226,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>bu</displayName>
-				<unitPattern count="one">{0} bu</unitPattern>
-				<unitPattern count="other">{0} bu</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cL</displayName>
-				<unitPattern count="one">{0} cL</unitPattern>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -6238,6 +6236,11 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
 			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
 				<unitPattern count="one">{0} mi³</unitPattern>
@@ -6248,25 +6251,20 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>cup</displayName>
-				<unitPattern count="one">{0} cup</unitPattern>
-				<unitPattern count="other">{0} cup</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="one">{0} dL</unitPattern>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -6278,26 +6276,56 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="one">{0} ML</unitPattern>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0} dL</unitPattern>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="one">{0} cL</unitPattern>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
 				<unitPattern count="one">{0} mL</unitPattern>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>bu</displayName>
+				<unitPattern count="one">{0} bu</unitPattern>
+				<unitPattern count="other">{0} bu</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cup</displayName>
+				<unitPattern count="one">{0} cup</unitPattern>
+				<unitPattern count="other">{0} cup</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>ZL</displayName>
 				<unitPattern count="one">{0} ZL</unitPattern>
@@ -6318,6 +6346,10 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -6326,26 +6358,14 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} m²</unitPattern>
 				<unitPattern count="other">{0} m²</unitPattern>
@@ -6354,6 +6374,29 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>M</displayName>
+				<unitPattern count="one">{0} M</unitPattern>
+				<unitPattern count="other">{0} M</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>W</displayName>
+				<unitPattern count="one">{0} W</unitPattern>
+				<unitPattern count="other">{0} W</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>D</displayName>
 				<unitPattern count="one">{0} D</unitPattern>
@@ -6364,147 +6407,141 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} st</unitPattern>
 				<unitPattern count="other">{0} st</unitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>M</displayName>
-				<unitPattern count="one">{0} M</unitPattern>
-				<unitPattern count="other">{0} M</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>s</displayName>
 				<unitPattern count="one">{0} s</unitPattern>
 				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>W</displayName>
-				<unitPattern count="one">{0} W</unitPattern>
-				<unitPattern count="other">{0} W</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>J</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
+			<unit type="duration-microsecond">
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<unitPattern count="one">{0} dm</unitPattern>
-				<unitPattern count="other">{0} dm</unitPattern>
-			</unit>
-			<unit type="length-fathom">
-				<displayName>fm</displayName>
-				<unitPattern count="one">{0} fm</unitPattern>
-				<unitPattern count="other">{0} fm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>fur</displayName>
-				<unitPattern count="one">{0} fur</unitPattern>
-				<unitPattern count="other">{0} fur</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
+			<unit type="duration-nanosecond">
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
 				<unitPattern count="one">{0} km</unitPattern>
 				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} ly</unitPattern>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>m</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-micrometer">
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
+			<unit type="length-decimeter">
+				<unitPattern count="one">{0} dm</unitPattern>
+				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="one">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<unitPattern count="one">{0} Kt</unitPattern>
-				<unitPattern count="other">{0} Kt</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>fur</displayName>
+				<unitPattern count="one">{0} fur</unitPattern>
+				<unitPattern count="other">{0} fur</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>fm</displayName>
+				<unitPattern count="one">{0} fm</unitPattern>
+				<unitPattern count="other">{0} fm</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="mass-metric-ton">
+				<unitPattern count="one">{0} t</unitPattern>
+				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="one">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-metric-ton">
-				<unitPattern count="one">{0} t</unitPattern>
-				<unitPattern count="other">{0} t</unitPattern>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<unitPattern count="one">{0} mg</unitPattern>
+				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
 			<unit type="mass-microgram">
 				<unitPattern count="one">{0} µg</unitPattern>
 				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
-			<unit type="mass-milligram">
-				<unitPattern count="one">{0} mg</unitPattern>
-				<unitPattern count="other">{0} mg</unitPattern>
+			<unit type="mass-ton">
+				<unitPattern count="one">{0} tn</unitPattern>
+				<unitPattern count="other">{0} tn</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName>st</displayName>
+				<unitPattern count="one">{0} st</unitPattern>
+				<unitPattern count="other">{0} st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
 			</unit>
 			<unit type="mass-ounce">
 				<unitPattern count="one">{0} oz</unitPattern>
@@ -6514,22 +6551,9 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} oz. tr.</unitPattern>
 				<unitPattern count="other">{0} oz. tr.</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>st</displayName>
-				<unitPattern count="one">{0} st</unitPattern>
-				<unitPattern count="other">{0} st</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<unitPattern count="one">{0} tn</unitPattern>
-				<unitPattern count="other">{0} tn</unitPattern>
-			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} PS</unitPattern>
-				<unitPattern count="other">{0} PS</unitPattern>
+			<unit type="mass-carat">
+				<unitPattern count="one">{0} Kt</unitPattern>
+				<unitPattern count="other">{0} Kt</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} kW</unitPattern>
@@ -6539,18 +6563,14 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} PS</unitPattern>
+				<unitPattern count="other">{0} PS</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<unitPattern count="one">{0} mm Hg</unitPattern>
 				<unitPattern count="other">{0} mm Hg</unitPattern>
@@ -6559,6 +6579,14 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
+			<unit type="pressure-inch-hg">
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
+			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
 				<unitPattern count="one">{0} km/h</unitPattern>
@@ -6585,31 +6613,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>bu</displayName>
-				<unitPattern count="one">{0} bu</unitPattern>
-				<unitPattern count="other">{0} bu</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<unitPattern count="one">{0} cL</unitPattern>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<unitPattern count="one">{0} km³</unitPattern>
 				<unitPattern count="other">{0} km³</unitPattern>
@@ -6618,6 +6621,10 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
 			</unit>
+			<unit type="volume-cubic-centimeter">
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<unitPattern count="one">{0} mi³</unitPattern>
 				<unitPattern count="other">{0} mi³</unitPattern>
@@ -6626,21 +6633,17 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<unitPattern count="one">{0} cup</unitPattern>
-				<unitPattern count="other">{0} cup</unitPattern>
+			<unit type="volume-cubic-foot">
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<unitPattern count="one">{0} dL</unitPattern>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<unitPattern count="one">{0} hL</unitPattern>
@@ -6651,22 +6654,47 @@ terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<unitPattern count="one">{0} ML</unitPattern>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<unitPattern count="one">{0} dL</unitPattern>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<unitPattern count="one">{0} cL</unitPattern>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<unitPattern count="one">{0} mL</unitPattern>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-acre-foot">
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>bu</displayName>
+				<unitPattern count="one">{0} bu</unitPattern>
+				<unitPattern count="other">{0} bu</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<unitPattern count="one">{0} cup</unitPattern>
+				<unitPattern count="other">{0} cup</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<unitPattern count="one">{0} ZL</unitPattern>
 				<unitPattern count="other">{0} ZL</unitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lb_LU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lb_LU.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lb_LU.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lb_LU.xml
index eb8ad204066..997b854037a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lb_LU.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lb_LU.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10671 $"/>
-		<generation date="$Date: 2014-07-23 17:52:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="lb"/>
 		<territory type="LU"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lg.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lg.xml
similarity index 92%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lg.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lg.xml
index 2493453b372..7597db28818 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lg.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lg.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12128 $"/>
 		<language type="lg"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angwila</territory>
 			<territory type="AL">Alibaniya</territory>
 			<territory type="AM">Arameniya</territory>
-			<territory type="AN">Bizinga bya Antile eby’abaHolandi</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Arigentina</territory>
 			<territory type="AS">Samowa omumerika</territory>
@@ -481,22 +479,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -573,6 +571,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0K¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0K¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00K¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000K¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0M¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00M¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000M¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0G¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00G¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000G¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0T¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00T¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000T¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lg_UG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lg_UG.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lg_UG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lg_UG.xml
index c898ee5eec0..8517c823a5e 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lg_UG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lg_UG.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="lg"/>
 		<territory type="UG"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lkt.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lkt.xml
similarity index 94%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lkt.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lkt.xml
index 614508ea122..00b377cf62d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lkt.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lkt.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="lkt"/>
 	</identity>
 	<localeDisplayNames>
@@ -422,6 +421,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<infinity draft="unconfirmed">∞</infinity>
 			<nan draft="unconfirmed">NaN</nan>
 		</symbols>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencies>
 			<currency type="USD">
 				<symbol>$</symbol>
@@ -430,6 +447,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</numbers>
 	<units>
 		<unitLength type="long">
+			<unit type="duration-year">
+				<displayName draft="provisional">ómakȟa</displayName>
+				<unitPattern count="other">ómakȟa {0}</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="provisional">Wíyawapi</displayName>
+				<unitPattern count="other">Wíyawapi {0}</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="provisional">okó</displayName>
+				<unitPattern count="other">okó {0}</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">-čháŋ</displayName>
 				<unitPattern count="other">{0}-čháŋ</unitPattern>
@@ -438,30 +467,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName draft="provisional">Owápȟe</displayName>
 				<unitPattern count="other">Owápȟe {0}</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">Wíyawapi</displayName>
-				<unitPattern count="other">Wíyawapi {0}</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="provisional">Okpí</displayName>
 				<unitPattern count="other">Okpí {0}</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">okó</displayName>
-				<unitPattern count="other">okó {0}</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">ómakȟa</displayName>
-				<unitPattern count="other">ómakȟa {0}</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="provisional">siíyutȟapi</displayName>
-				<unitPattern count="other">siíyutȟapi {0}</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="provisional">oíyutȟe čísčila</displayName>
-				<unitPattern count="other">oíyutȟe čísčila {0}</unitPattern>
-			</unit>
 			<unit type="length-mile">
 				<displayName draft="provisional">makhíyutȟapi</displayName>
 				<unitPattern count="other">makhíyutȟapi {0}</unitPattern>
@@ -470,12 +479,32 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName draft="provisional">čhaéglepi</displayName>
 				<unitPattern count="other">čhaéglepi {0}</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName draft="provisional">siíyutȟapi</displayName>
+				<unitPattern count="other">siíyutȟapi {0}</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="provisional">oíyutȟe čísčila</displayName>
+				<unitPattern count="other">oíyutȟe čísčila {0}</unitPattern>
+			</unit>
 			<unit type="mass-pound">
 				<displayName draft="provisional">tkeíyutȟapi</displayName>
 				<unitPattern count="other">tkeíyutȟapi {0}</unitPattern>
 			</unit>
 		</unitLength>
 		<unitLength type="short">
+			<unit type="duration-year">
+				<displayName draft="provisional">ómakȟa</displayName>
+				<unitPattern count="other">ómakȟa {0}</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="provisional">Wíyawapi</displayName>
+				<unitPattern count="other">Wíyawapi {0}</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="provisional">okó</displayName>
+				<unitPattern count="other">okó {0}</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">-čháŋ</displayName>
 				<unitPattern count="other">{0}-čháŋ</unitPattern>
@@ -484,30 +513,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName draft="provisional">Owápȟe</displayName>
 				<unitPattern count="other">Owápȟe {0}</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">Wíyawapi</displayName>
-				<unitPattern count="other">Wíyawapi {0}</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="provisional">Okpí</displayName>
 				<unitPattern count="other">Okpí {0}</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">okó</displayName>
-				<unitPattern count="other">okó {0}</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">ómakȟa</displayName>
-				<unitPattern count="other">ómakȟa {0}</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="provisional">siíyutȟapi</displayName>
-				<unitPattern count="other">siíyutȟapi {0}</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="provisional">oíyutȟe čísčila</displayName>
-				<unitPattern count="other">oíyutȟe čísčila {0}</unitPattern>
-			</unit>
 			<unit type="length-mile">
 				<displayName draft="provisional">makhíyutȟapi</displayName>
 				<unitPattern count="other">makhíyutȟapi {0}</unitPattern>
@@ -516,42 +525,50 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName draft="provisional">čhaéglepi</displayName>
 				<unitPattern count="other">čhaéglepi {0}</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName draft="provisional">siíyutȟapi</displayName>
+				<unitPattern count="other">siíyutȟapi {0}</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="provisional">oíyutȟe čísčila</displayName>
+				<unitPattern count="other">oíyutȟe čísčila {0}</unitPattern>
+			</unit>
 			<unit type="mass-pound">
 				<displayName draft="provisional">tkeíyutȟapi</displayName>
 				<unitPattern count="other">tkeíyutȟapi {0}</unitPattern>
 			</unit>
 		</unitLength>
 		<unitLength type="narrow">
+			<unit type="duration-year">
+				<unitPattern count="other">ómakȟa {0}</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<unitPattern count="other">Wí {0}</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<unitPattern count="other">okó {0}</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<unitPattern count="other">{0}-čháŋ</unitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<unitPattern count="other">Owápȟe {0}</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<unitPattern count="other">Wí {0}</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<unitPattern count="other">Okpí {0}</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<unitPattern count="other">okó {0}</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<unitPattern count="other">ómakȟa {0}</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="other">siíyutȟapi {0}</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="other">{0}″</unitPattern>
-			</unit>
 			<unit type="length-mile">
 				<unitPattern count="other">{0} makh</unitPattern>
 			</unit>
 			<unit type="length-yard">
 				<unitPattern count="other">čhaéglepi {0}</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<unitPattern count="other">siíyutȟapi {0}</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="other">{0}#</unitPattern>
 			</unit>
@@ -564,3 +581,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</unitLength>
 	</units>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lkt_US.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lkt_US.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lkt_US.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lkt_US.xml
index ee8c413346b..075d0ed14bb 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lkt_US.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lkt_US.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="lkt"/>
 		<territory type="US"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ln.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln.xml
similarity index 94%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ln.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln.xml
index 030f2abbe3a..eb5c701b9db 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ln.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="ln"/>
 	</identity>
 	<localeDisplayNames>
@@ -109,7 +108,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angiyɛ</territory>
 			<territory type="AL">Alibani</territory>
 			<territory type="AM">Amɛni</territory>
-			<territory type="AN">Antiyɛ ya Olandɛ</territory>
 			<territory type="AO">Angóla</territory>
 			<territory type="AQ">Antarctique</territory>
 			<territory type="AR">Arizantinɛ</territory>
@@ -360,7 +358,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="numbers" draft="unconfirmed">Mamɛlɔ</key>
 		</keys>
 		<types>
-			<type type="gregorian" key="calendar" draft="unconfirmed">Manáka ma Gregɔr</type>
+			<type key="calendar" type="gregorian" draft="unconfirmed">Manáka ma Gregɔr</type>
 		</types>
 		<codePatterns>
 			<codePattern type="language" draft="unconfirmed">lokótá {0}</codePattern>
@@ -531,6 +529,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">ntɔ́ngɔ́</dayPeriod>
+							<dayPeriod type="pm">mpókwa</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">ntɔ́ngɔ́</dayPeriod>
 							<dayPeriod type="pm">mpókwa</dayPeriod>
@@ -710,6 +712,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0K ¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0K ¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00K ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K ¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000K ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K ¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0M ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M ¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00M ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M ¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000M ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M ¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0G ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G ¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00G ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G ¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000G ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0T ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00T ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000T ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ln_AO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_AO.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ln_AO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_AO.xml
index 72f18ecf98a..86ccc1b1102 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ln_AO.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_AO.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ln"/>
 		<territory type="AO"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ln_CD.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_CD.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ln_CD.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_CD.xml
index 9a080682544..743a3551000 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ln_CD.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_CD.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ln"/>
 		<territory type="CD"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ln_CF.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_CF.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ln_CF.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_CF.xml
index 79002f2297f..015965eb853 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ln_CF.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_CF.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ln"/>
 		<territory type="CF"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ln_CG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_CG.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ln_CG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_CG.xml
index addce0c78af..2d236177dc3 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ln_CG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_CG.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ln"/>
 		<territory type="CG"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lo.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lo.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lo.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lo.xml
index 9ba40bb013a..c6d0f9b5542 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lo.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lo.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="lo"/>
 	</identity>
 	<localeDisplayNames>
@@ -62,6 +61,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bez">ບີນາ</language>
 			<language type="bfd">ບາຟັດ</language>
 			<language type="bg">ບັງກາຣຽນ</language>
+			<language type="bgn">ບາໂລຈີ ພາກຕາເວັນຕົກ</language>
 			<language type="bho">ໂບພູຣິ</language>
 			<language type="bi">ບິສລະມາ</language>
 			<language type="bik">ບີຄອນ</language>
@@ -114,7 +114,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="dar">ດາກວາ</language>
 			<language type="dav">ໄຕຕາ</language>
 			<language type="de">ເຢຍລະມັນ</language>
-			<language type="de_AT">ອອສຕຣຽນ ເຈີແມນ</language>
+			<language type="de_AT">ເຢຍລະມັນ (ໂອສຕຣິດ)</language>
 			<language type="de_CH">ສະວິສ ໄຮ ເຈີແມນ</language>
 			<language type="del">ເດລາວາ</language>
 			<language type="den">ຊີເລັບ</language>
@@ -138,17 +138,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="el">ກຣີກ</language>
 			<language type="elx">ອີລາໄມ</language>
 			<language type="en">ອັງກິດ</language>
-			<language type="en_AU">ອັງກິດ (ອອສເຕຣລຽນ)</language>
-			<language type="en_CA">ອັງກິດ (ເຄເນດຽນ)</language>
+			<language type="en_AU">ອັງກິດ (ໂອດສະຕາລີ)</language>
 			<language type="en_GB">ອັງກິດ (ບຣິດທິຊ)</language>
 			<language type="en_GB" alt="short">ອັງກິດ (ສະຫະລາດຊະອານາຈັກ)</language>
 			<language type="en_US">ອັງກິດ (ອາເມລິກັນ)</language>
 			<language type="en_US" alt="short">ອັງກິດ (ສະຫະລັດອາເມລິກາ)</language>
 			<language type="enm">ອັງກິດກາງ</language>
-			<language type="eo">ເອສເປີຣັນໂຕ</language>
+			<language type="eo">ເອສປາຍ</language>
 			<language type="es">ສະແປນນິຊ</language>
 			<language type="es_419">ລາຕິນ ອາເມຣິກັນ ສະແປນນິຊ</language>
-			<language type="es_ES">ຢູໂຣປຽນ ສະແປນນິຊ</language>
+			<language type="es_ES">ສະເປັນ ຢຸໂຣບ</language>
 			<language type="es_MX">ເມັກຊິກັນ ສະແປນນິຊ</language>
 			<language type="et">ເອສໂຕນຽນ</language>
 			<language type="eu">ບັສກີ</language>
@@ -163,14 +162,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="fo">ຟາໂຣສ</language>
 			<language type="fon">ຟອນ</language>
 			<language type="fr">ຝຣັ່ງ</language>
-			<language type="fr_CA">ເຄເນດຽນ ຝຣັ່ງ</language>
-			<language type="fr_CH">ສະວິສ ຝຣັ່ງ</language>
+			<language type="fr_CA">ຟລັງ(ການາດາ)</language>
 			<language type="frm">ຟຮັ່ງເສດກາງ</language>
 			<language type="fro">ຟຮັ່ງເສດໂບຮານ</language>
 			<language type="frr">ຟຣີຊຽນເໜືອ</language>
 			<language type="frs">ຟຣີຊຽນຕາເວັນອອກ</language>
 			<language type="fur">ຟຣີລຽນ</language>
-			<language type="fy">ເວສເທີນ ຟຣິຊຽນ</language>
+			<language type="fy">ຟຣິຊຽນ ຕາເວັນຕົກ</language>
 			<language type="ga">ໄອຣິສ</language>
 			<language type="gaa">ກາ</language>
 			<language type="gag">ກາກາອຸຊ</language>
@@ -203,7 +201,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="hmn">ມອງ</language>
 			<language type="ho">ຮິຣິໂມຕູ</language>
 			<language type="hr">ໂຄຣເອທຽນ</language>
-			<language type="hsb">ຊຸບເປີຊໍບຽນ</language>
+			<language type="hsb">ຊໍບຽນ ທາງຕອນເໜືອ</language>
 			<language type="ht">ໄຮຕຽນ</language>
 			<language type="hu">ຮັງກາຣຽນ</language>
 			<language type="hup">ຮູປາ</language>
@@ -265,7 +263,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="krc">ກາຣາໄຊ-ບານກາ</language>
 			<language type="krl">ກາເຣລຽນ</language>
 			<language type="kru">ກູຣູກ</language>
-			<language type="ks">ຄັດຊະມີຣີ</language>
+			<language type="ks">ຄາສເມຍຣິ</language>
 			<language type="ksb">ຊຳບາລ້າ</language>
 			<language type="ksf">ບາເຟຍ</language>
 			<language type="ksh">ໂຄລອກນຽນ</language>
@@ -289,6 +287,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">ລາວ</language>
 			<language type="lol">ແມັງໂກ້</language>
 			<language type="loz">ໂລຊິ</language>
+			<language type="lrc">ລູຣິ ທາງຕອນເໜືອ</language>
 			<language type="lt">ລິທົວນຽນ</language>
 			<language type="lu">ລູບາ-ຄາຕັງກາ</language>
 			<language type="lua">ລູບາ-ລູລົວ</language>
@@ -337,12 +336,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="my">ມຽນມາ</language>
 			<language type="mye">ມໍຢິນ</language>
 			<language type="myv">ເອີຍາ</language>
+			<language type="mzn">ມາແຊນເດີລັງ</language>
 			<language type="na">ນາຢູລູ</language>
 			<language type="nap">ນາໂປລີ</language>
 			<language type="naq">ນາມາ</language>
 			<language type="nb">ນໍເວຈຽນ ບັອກມອລ</language>
 			<language type="nd">ເອັນເດເບເລເໜືອ</language>
-			<language type="nds">ເຢຍລະມັນຕ່ຳ ແຊກຊອນຕໍ່ຳ</language>
+			<language type="nds">ເຢຍລະມັນ ຕອນໄຕ້</language>
+			<language type="nds_NL">ຊາຊອນ ຕອນໄຕ</language>
 			<language type="ne">ເນປາລີ</language>
 			<language type="new">ນີວາຣິ</language>
 			<language type="ng">ເອັນດອງກາ</language>
@@ -387,22 +388,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="pon">ພອນເພ</language>
 			<language type="pro">ໂປວອງຊານໂບຮານ</language>
 			<language type="ps">ປາສໂຕ</language>
-			<language type="pt">ປໍຕູກີສ</language>
-			<language type="pt_BR">ບຣາຊິລຽນ ປໍຕູກີສ</language>
-			<language type="pt_PT">ຢູໂຣປຽນ ປໍຕູກີສ</language>
+			<language type="pt">ປອກຕຸຍກິສ</language>
+			<language type="pt_BR">ປອກຕຸຍກິສ ບະເລຊີ່ນ</language>
+			<language type="pt_PT">ປອກຕຸຍກິສ ຢຸໂຣບ</language>
 			<language type="qu">ຄີຊົວ</language>
 			<language type="quc">Kʼicheʼ</language>
 			<language type="raj">ຣາຈັສທານິ</language>
 			<language type="rap">ຣາປານຸຍ</language>
 			<language type="rar">ຣາໂຣທອນການ</language>
-			<language type="rm">ໂຣແມນ</language>
+			<language type="rm">ໂຣແມນຊ໌</language>
 			<language type="rn">ຣຸນດິ</language>
 			<language type="ro">ໂຣແມນຽນ</language>
 			<language type="ro_MD">ໂມດາວຽນ</language>
 			<language type="rof">ຣົມໂບ</language>
 			<language type="rom">ໂຣເມນີ</language>
 			<language type="root">ລູດ</language>
-			<language type="ru">ຣັດຊຽນ</language>
+			<language type="ru">ລັດເຊຍ</language>
 			<language type="rup">ອາໂຣມານຽນ</language>
 			<language type="rw">ຄິນຢາວານດາ</language>
 			<language type="rwk">ອາຣວາ</language>
@@ -419,6 +420,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">ຊີຊິລີນ</language>
 			<language type="sco">ສກອດ</language>
 			<language type="sd">ສິນທິ</language>
+			<language type="sdh">ພາກໄຕ້ ຂອງ ກູດິດ</language>
 			<language type="se">ຊາມິເໜືອ</language>
 			<language type="see" draft="provisional">ຊີນີກາ</language>
 			<language type="seh">ຊີນາ</language>
@@ -456,8 +458,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">ຊູເມີເລຍ</language>
 			<language type="sv">ສະວີດິຊ</language>
 			<language type="sw">ຊວາຮີລິ</language>
+			<language type="sw_CD">ຄອງໂກ ຊວາຮີລິ</language>
 			<language type="swb">ໂຄໂນຣຽນ</language>
-			<language type="swc">ຄອງໂກ ຊວາຮີລິ</language>
 			<language type="syc">ຊີເລຍແບບດັ້ງເດີມ</language>
 			<language type="syr">ຊີເລຍ</language>
 			<language type="ta">ທາມິລ</language>
@@ -499,7 +501,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="uk">ຢູເຄຣນຽນ</language>
 			<language type="umb">ອຳບັນດູ</language>
 			<language type="und">ບໍ່ສາມາດລະບຸພາສາ</language>
-			<language type="ur">ອູຣະດູ</language>
+			<language type="ur">ອູຣດູ</language>
 			<language type="uz">ອຸສເບກ</language>
 			<language type="vai">ໄວ</language>
 			<language type="ve">ເວນດາ</language>
@@ -512,6 +514,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">ວາລາໂມ</language>
 			<language type="war">ວາເລ</language>
 			<language type="was">ວາໂຊ</language>
+			<language type="wbp">ວາຣພິຣິ</language>
 			<language type="wo">ວໍລອບ</language>
 			<language type="xal">ການມິກ</language>
 			<language type="xh">ໂຮຊາ</language>
@@ -538,7 +541,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</languages>
 		<scripts>
 			<script type="Afak">ອັບຟາກາ</script>
-			<script type="Arab">ອາຣາບິກ</script>
+			<script type="Arab">ອາລັບ</script>
 			<script type="Armi">ອິມພີຮຽນ ອາເມອິກ</script>
 			<script type="Armn">ອາເມນຽນ</script>
 			<script type="Avst">ອະເວສຕະ</script>
@@ -575,7 +578,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Glag">ກລາໂກລິຕິກ</script>
 			<script type="Goth">ໂກຮິກ</script>
 			<script type="Gran">ເຄນທາ</script>
-			<script type="Grek">ກຣີກ</script>
+			<script type="Grek">ກະເລັກ</script>
 			<script type="Gujr">ຈູຈາຣາທີ</script>
 			<script type="Guru">ກົວມູຄີ</script>
 			<script type="Hang">ຮັນກູນ</script>
@@ -624,8 +627,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Mend">ເມນເດ</script>
 			<script type="Merc">ເຄເລີຊີເມໂຮອິຕິກ</script>
 			<script type="Mero">ເມໂຮຕິກ</script>
-			<script type="Mlym">ມາເລອາລຳ</script>
-			<script type="Mong">ມົງໂກລຽນ</script>
+			<script type="Mlym">ມາລາຍັນ</script>
+			<script type="Mong">ມົງໂກນ</script>
 			<script type="Moon">ມູນ</script>
 			<script type="Mroo">ເມໂຮ</script>
 			<script type="Mtei">ເມເທມາເຍກ</script>
@@ -702,7 +705,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="002">ອາຟຣິກາ</territory>
 			<territory type="003">ອາເມລິກາເໜືອ</territory>
 			<territory type="005">ອາເມລິກາໃຕ້</territory>
-			<territory type="009">ໂອຊີເນຍ</territory>
+			<territory type="009">ໂອຊີອານີ</territory>
 			<territory type="011">ອາຟຣິກາຕາເວັນຕົກ</territory>
 			<territory type="013">ອາເມລິກາກາງ</territory>
 			<territory type="014">ອາຟຣິກາຕາເວັນອອກ</territory>
@@ -710,19 +713,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="017">ອາຟຣິກາກາງ</territory>
 			<territory type="018">ອາຟຣິກາໃຕ້</territory>
 			<territory type="019">ອາເມຣິກາ</territory>
-			<territory type="021">ອາເມລິກາສ່ວນເໜືອ</territory>
+			<territory type="021">ພາກເໜືອອາເມລີກາ</territory>
 			<territory type="029">ຄາຣິບບຽນ</territory>
-			<territory type="030">ເອເຊຍຕາເວັນອອກ</territory>
-			<territory type="034">ເອເຊຍໃຕ້</territory>
-			<territory type="035">ເອເຊຍຕາເວັນອອກສ່ຽງໃຕ້</territory>
+			<territory type="030">ອາຊີຕາເວັນອອກ</territory>
+			<territory type="034">ອາຊີໄຕ້</territory>
+			<territory type="035">ອາຊີຕາເວັນອອກສ່ຽງໄຕ້</territory>
 			<territory type="039">ຢູໂຣບໃຕ້</territory>
-			<territory type="053">ອອສເຕຣເລເຊຍ</territory>
+			<territory type="053">ໂອດສະຕາລີ</territory>
 			<territory type="054">ເມລານີເຊຍ</territory>
 			<territory type="057">ເຂດໄມໂຄຣເນຊຽນ</territory>
 			<territory type="061">ໂພລີນີເຊຍ</territory>
-			<territory type="142">ເອເຊຍ</territory>
-			<territory type="143">ເອເຊຍກາງ</territory>
-			<territory type="145">ເອເຊຍຕາເວັນຕົກ</territory>
+			<territory type="142">ອາຊີ</territory>
+			<territory type="143">ອາຊີກາງ</territory>
+			<territory type="145">ອາຊີຕາເວັນຕົກ</territory>
 			<territory type="150">ຢູໂຣບ</territory>
 			<territory type="151">ຢູໂຣບຕາເວັນອອກ</territory>
 			<territory type="154">ຢູໂຣບເໜືອ</territory>
@@ -736,12 +739,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">ແອນກຸຍລາ</territory>
 			<territory type="AL">ແອວເບເນຍ</territory>
 			<territory type="AM">ອາເມເນຍ</territory>
-			<territory type="AN" draft="unconfirmed">ເນເທີແລນແອນເທິນ</territory>
 			<territory type="AO">ອັນໂກລາ</territory>
 			<territory type="AQ">ແອນຕາດຕິກາ</territory>
 			<territory type="AR">ອາເຈນທິນາ</territory>
 			<territory type="AS">ອາເມຣິກາ ຊາມົວ</territory>
-			<territory type="AT">ອອສເທຣຍ</territory>
+			<territory type="AT">ໂອຕາລິກ</territory>
 			<territory type="AU">ອອສເຕຣເລຍ</territory>
 			<territory type="AW">ອໍຣູບາ</territory>
 			<territory type="AX">ຫມູ່ເກາະໂອລັນ</territory>
@@ -749,9 +751,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BA">ບອດສະເນຍ ແລະ ແຮສໂກວີນາ</territory>
 			<territory type="BB">ບາບາໂດສ</territory>
 			<territory type="BD">ບັງກະລາເທດ</territory>
-			<territory type="BE">ເບວຢຽມ</territory>
+			<territory type="BE">ແບລຊິກ</territory>
 			<territory type="BF">ເບີກິນາ ຟາໂຊ</territory>
-			<territory type="BG">ບັງກາເຣຍ</territory>
+			<territory type="BG">ບູລກາຣິ</territory>
 			<territory type="BH">ບາເຣນ</territory>
 			<territory type="BI">ບູຣຸນດິ</territory>
 			<territory type="BJ">ເບນິນ</territory>
@@ -760,14 +762,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BN">ບຣູໄນ</territory>
 			<territory type="BO">ໂບລິເວຍ</territory>
 			<territory type="BQ">ຄາຣິບບຽນ ເນເທີແລນ</territory>
-			<territory type="BR">ບຣາຊິວ</territory>
+			<territory type="BR">ບະເລຊີນ</territory>
 			<territory type="BS">ບາຮາມາສ</territory>
 			<territory type="BT">ພູຖານ</territory>
 			<territory type="BV">ເກາະບູເວດ</territory>
 			<territory type="BW">ບອດສະວານາ</territory>
 			<territory type="BY">ເບວບາຣຸສ</territory>
 			<territory type="BZ">ເບລີຊ</territory>
-			<territory type="CA">ແຄນາດາ</territory>
+			<territory type="CA">ການາດາ</territory>
 			<territory type="CC">ຫມູ່ເກາະໂກໂກສ</territory>
 			<territory type="CD">ຄອງໂກ - ຄິນຊາຊາ</territory>
 			<territory type="CD" alt="variant">ຄອງໂກ (ສາທາລະນະລັດປະຊາທິປະໄຕ)</territory>
@@ -778,13 +780,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CI">ໂຄຕີ ວົວ</territory>
 			<territory type="CI" alt="variant">ໄອໂວຣີ ໂຄທ</territory>
 			<territory type="CK">ໝູ່ເກາະຄຸກ</territory>
-			<territory type="CL">ຊິລີ</territory>
+			<territory type="CL">ຈີເລ</territory>
 			<territory type="CM">ຄາເມຣູນ</territory>
 			<territory type="CN">ຈີນ</territory>
 			<territory type="CO">ໂຄລົມເບຍ</territory>
 			<territory type="CP">ເກາະຄລິບເປີຕັນ</territory>
 			<territory type="CR">ໂຄສຕາ ຣິກາ</territory>
-			<territory type="CU">ຄິວບາ</territory>
+			<territory type="CU">ກຸຍບາ</territory>
 			<territory type="CV">ເຄບ ເວີດ</territory>
 			<territory type="CW">ຄູຣາຊາວ</territory>
 			<territory type="CX">ເກາະຄຣິສມາດ</territory>
@@ -798,7 +800,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="DO">ສາທາລະນະລັດ ໂດມິນິກັນ</territory>
 			<territory type="DZ">ອັລຈິເຣຍ</territory>
 			<territory type="EA">ເຊວຕາ ແລະເມລິນລາ</territory>
-			<territory type="EC">ເອກກວາດໍ</territory>
+			<territory type="EC">ເອກວາດໍ</territory>
 			<territory type="EE">ເອສໂຕເນຍ</territory>
 			<territory type="EG">ອີຢິບ</territory>
 			<territory type="EH">ຊາຮາຣາຕາເວັນຕົກ</territory>
@@ -806,7 +808,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ES">ສະເປນ</territory>
 			<territory type="ET">ອີທິໂອເປຍ</territory>
 			<territory type="EU">ສະຫະພາບຢູໂຣບ</territory>
-			<territory type="FI">ຟິນແລນ</territory>
+			<territory type="FI">ຝຽກລັງ</territory>
 			<territory type="FJ">ຟິຈິ</territory>
 			<territory type="FK">ຫມູ່ເກາະຟອກແລນ</territory>
 			<territory type="FK" alt="variant">ໝູ່ເກາະຟອກແລນ (ອິສລາສ ມາວິນນາສ)</territory>
@@ -863,7 +865,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="KN">ເຊນ ຄິດ ແລະ ເນວິສ</territory>
 			<territory type="KP">ເກົາຫລີເໜືອ</territory>
 			<territory type="KR">ເກົາຫລີໃຕ້</territory>
-			<territory type="KW">ຄູເວດ</territory>
+			<territory type="KW">ກູເວດ</territory>
 			<territory type="KY">ເຄແມນ ໄອແລນ</territory>
 			<territory type="KZ">ຄາຊັກສະຖານ</territory>
 			<territory type="LA">ລາວ</territory>
@@ -874,7 +876,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="LR">ລິເບີເຣຍ</territory>
 			<territory type="LS">ເລໂຊໂທ</territory>
 			<territory type="LT">ລິທົວເນຍ</territory>
-			<territory type="LU">ລຸກແຊມເບີກ</territory>
+			<territory type="LU">ລຸກຊຳບົວ</territory>
 			<territory type="LV">ລັດເວຍ</territory>
 			<territory type="LY">ລິເບຍ</territory>
 			<territory type="MA">ໂມຣັອກໂຄ</territory>
@@ -888,7 +890,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="MK" alt="variant">ແມຊິໂດເນຍ (FYROM)</territory>
 			<territory type="ML">ມາລິ</territory>
 			<territory type="MM">ມຽນມາ (ເບີມາ)</territory>
-			<territory type="MN">ມອງໂກເລຍ</territory>
+			<territory type="MN">ມົງໂກລີ</territory>
 			<territory type="MO">ມາເກົ້າ ເຂດປົກຄອງພິເສດ ຈີນ</territory>
 			<territory type="MO" alt="short">ມາເກົ້າ</territory>
 			<territory type="MP">ຫມູ່ເກາະມາແຊວຕອນເຫນືອ</territory>
@@ -899,7 +901,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="MU">ມົວຣິຊຽສ</territory>
 			<territory type="MV">ມັນດິຟ</territory>
 			<territory type="MW">ມາລາວີ</territory>
-			<territory type="MX">ເມັກຊິໂກ</territory>
+			<territory type="MX">ແມັກຊີໂກ</territory>
 			<territory type="MY">ມາເລເຊຍ</territory>
 			<territory type="MZ">ໂມແຊມບິກ</territory>
 			<territory type="NA">ນາມີເບຍ</territory>
@@ -909,7 +911,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="NG">ໄນຈີເຣຍ</territory>
 			<territory type="NI">ນິກຄາຣາກົວ</territory>
 			<territory type="NL">ເນເທີແລນ</territory>
-			<territory type="NO">ນໍເວ</territory>
+			<territory type="NO">ນອກແວ໊</territory>
 			<territory type="NP">ເນປານ</territory>
 			<territory type="NR">ນາອູຣູ</territory>
 			<territory type="NU">ນີອູເອ</territory>
@@ -921,7 +923,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="PG">ປາປົວນິວກີນີ</territory>
 			<territory type="PH">ຟິລິບປິນ</territory>
 			<territory type="PK">ປາກິສຖານ</territory>
-			<territory type="PL">ໂປແລນ</territory>
+			<territory type="PL">ໂປໂລຍ</territory>
 			<territory type="PM">ເຊນ ປີແອ ມິເກວລອນ</territory>
 			<territory type="PN">ໝູ່ເກາະພິດແຄນ</territory>
 			<territory type="PR">ເພືອໂຕ ຣິໂກ</territory>
@@ -933,7 +935,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="QA">ກາຕາ</territory>
 			<territory type="QO">ເຂດຫ່າງໄກໂອຊີເນຍ</territory>
 			<territory type="RE">ເຣອູນິຍົງ</territory>
-			<territory type="RO">ໂຣແມເນຍ</territory>
+			<territory type="RO">ໂຣມານີ</territory>
 			<territory type="RS">ເຊີເບຍ</territory>
 			<territory type="RU">ຣັດເຊຍ</territory>
 			<territory type="RW">ຣວັນດາ</territory>
@@ -950,7 +952,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="SL">ເຊຍຣາ ລີໂອນ</territory>
 			<territory type="SM">ແຊນ ມາຣິໂນ</territory>
 			<territory type="SN">ເຊນີໂກລ</territory>
-			<territory type="SO">ໂຊມາເລຍ</territory>
+			<territory type="SO">ໂຊມາລີ</territory>
 			<territory type="SR">ຊູຣິນາມ</territory>
 			<territory type="SS">ຊູດານໃຕ້</territory>
 			<territory type="ST">ເຊົາທູເມ ແລະ ພຣິນຊິບ</territory>
@@ -1061,90 +1063,103 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<keys>
 			<key type="calendar">ປະຕິທິນ</key>
 			<key type="collation">ຮຽງລຳດັບ</key>
-			<key type="currency">ເງິນຕາ</key>
+			<key type="currency">ສະກຸນເງິນ</key>
+			<key type="hc">ຮອບວຽນຊົວໂມງ( 12 ຫຼື 24)</key>
+			<key type="lb">ຮູບແບບການຍຸດຜອນຕາມເສັ້ນຕົງ</key>
+			<key type="ms">ລະບົບການວັດແທກ</key>
 			<key type="numbers">ຕົວເລກ</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">ຕົວເລກອາຣາບິກ-ອິນດິກ</type>
-			<type type="arabext" key="numbers">ຕົວເລກອາຣາບິກ-ອິນດິກຕົວເຕັມ</type>
-			<type type="armn" key="numbers">ຕົວເລກອາເມນຽນ</type>
-			<type type="armnlow" key="numbers">ຕົວເລກອາເມນຽນຕົວພິມນ້ອຍ</type>
-			<type type="bali" key="numbers">ຕົວເລກບາລີ</type>
-			<type type="beng" key="numbers">ຕົວເລກເບັງກາລີ</type>
-			<type type="big5han" key="collation">ລຽງຕາມອັກສອນຈີນດັ້ງເດີມ</type>
-			<type type="buddhist" key="calendar">ປະຕິທິນພຸດ</type>
-			<type type="cham" key="numbers">ຕົວເລກຊຣາມ</type>
-			<type type="chinese" key="calendar">ປະຕິທິນຈີນ</type>
-			<type type="coptic" key="calendar">ປະຕິທິນຄັອບຕິກ</type>
-			<type type="dangi" key="calendar">ປະ​ຕິ​ທິນ​ດັງ​ກີ</type>
-			<type type="deva" key="numbers">ຕົວເລກເນວັນເນກາຣີ</type>
-			<type type="dictionary" key="collation">ລຽງຕາມພົດຈະນານຸກົມ</type>
-			<type type="ducet" key="collation">ຮຽງຕາມລຳດັບຢູນິໂຄດເລີ່ມຕົ້ນ</type>
-			<type type="ethi" key="numbers">ຕົວເລກເອທິໂອປິກ</type>
-			<type type="ethiopic" key="calendar">ປະຕິທິນເອທິໂອເປຍ</type>
-			<type type="ethiopic-amete-alem" key="calendar">ປະຕິທິນປີໂອເອທິໂອເປຍ</type>
-			<type type="fullwide" key="numbers">ຕົວເລກຄວາມກວ້າງເຕັມ</type>
-			<type type="gb2312han" key="collation">ລຽງຕາມອັກສອນຈີນປະຍຸກ</type>
-			<type type="geor" key="numbers">ຕົວເລກຈໍຈຽນ</type>
-			<type type="gregorian" key="calendar">ປະຕິທິນເກຣໂກຣຽນ</type>
-			<type type="grek" key="numbers">ຕົວເລກກຣີກ</type>
-			<type type="greklow" key="numbers">ຕົວເລກກຣີກຕົວພິມນ້ອຍ</type>
-			<type type="gujr" key="numbers">ຕົວເລກກຸຈາລາຕິ</type>
-			<type type="guru" key="numbers">ຕົວເລກກົວມູຄິ</type>
-			<type type="hanidec" key="numbers">ຕົວເລກທົດສະນິນົມຈີນ</type>
-			<type type="hans" key="numbers">ຕົວເລກຈີນແບບຮຽບງ່າຍ</type>
-			<type type="hansfin" key="numbers">ຕົວເລກທາງການເງິນແບບຮຽບງ່າຍຂອງຈີນ</type>
-			<type type="hant" key="numbers">ຕົວເລກຈີນແບບດັ້ງເດີມ</type>
-			<type type="hantfin" key="numbers">ຕົວເລກທາງການເງິນແບບດັ້ງເດີມຂອງຈີນ</type>
-			<type type="hebr" key="numbers">ຕົວເລກຮິບຣິວ</type>
-			<type type="hebrew" key="calendar">ປະ​ຕິ​ທິນ​ຮີບ​ຣິວ</type>
-			<type type="indian" key="calendar">ປະຕິທິນແຫ່ງຊາດອິນເດຍ</type>
-			<type type="islamic" key="calendar">ປະຕິທິນອິສະລາມ</type>
-			<type type="islamic-civil" key="calendar">ປະຕິທິນອິດສະລາມ</type>
-			<type type="iso8601" key="calendar">ປະ​ຕິ​ທິນ ISO-8601</type>
-			<type type="japanese" key="calendar">ປະຕິທິນຍີ່ປຸ່ນ</type>
-			<type type="java" key="numbers">ຕົວເລກຊົວ</type>
-			<type type="jpan" key="numbers">ຕົວເລກຍີ່ປຸ່ນ</type>
-			<type type="jpanfin" key="numbers">ຕົວເລກທາງການເງິນຂອງຍີ່ປຸ່ນ</type>
-			<type type="kali" key="numbers">ຕົວເລກກາຢາ</type>
-			<type type="khmr" key="numbers">ຕົວເລກຂະໝຽນ</type>
-			<type type="knda" key="numbers">ຕົວເລກແຄນນາດາ</type>
-			<type type="lana" key="numbers">ຕົວເລກໄທທຳໂຮລາ</type>
-			<type type="lanatham" key="numbers">ຕົວເລກໄທທຳທຳ</type>
-			<type type="laoo" key="numbers">ຕົວເລກລາວ</type>
-			<type type="latn" key="numbers">ຕົວເລກຕາເວັນຕົກ</type>
-			<type type="lepc" key="numbers">ຕົວເລກເລຊາ</type>
-			<type type="limb" key="numbers">ຕົວເລກລິມບູ</type>
-			<type type="mlym" key="numbers">ຕົວເລກມາເລອາລຳ</type>
-			<type type="mong" key="numbers">ຕົວເລກມ່ອງໂກເລຍ</type>
-			<type type="mtei" key="numbers">ຕົວເລກເມໄຕມາເຢກ</type>
-			<type type="mymr" key="numbers">ຕົວເລກມຽນມາ</type>
-			<type type="mymrshan" key="numbers">ຕົວເລກຊານພະມ້າ</type>
-			<type type="nkoo" key="numbers">ຕົວເລກເອັນໂກ້</type>
-			<type type="olck" key="numbers">ຕົວເລກໂອລຈິກິ</type>
-			<type type="orya" key="numbers">ຕົວເລກໂອຣິຢາ</type>
-			<type type="persian" key="calendar">ປະຕິທິນເປີຊຽນ</type>
-			<type type="phonebook" key="collation">ລຽງຕາມສະໝຸດໂທລະສັບ</type>
-			<type type="pinyin" key="collation">ລຽງຕາມການອອກສຽງພາສາຈີນ</type>
-			<type type="reformed" key="collation">ລຽງຕາມລຳດັບສຸດທ້າຍ</type>
-			<type type="roc" key="calendar">ປະຕິທິນໄຕ້ຫວັນ</type>
-			<type type="roman" key="numbers">ຕົວເລກໂຣມັນ</type>
-			<type type="romanlow" key="numbers">ຕົວເລກໂຣມັນຕົວພິມນ້ອຍ</type>
-			<type type="saur" key="numbers">ຕົວເລກເສົາລັດທາ</type>
-			<type type="search" key="collation">ການຊອກຫາທົ່ວໄປ</type>
-			<type type="searchjl" key="collation">ຄົ້ນຫາຕາມພະຍັນຊະນະຂຶ້ນຕົ້ນທີ່ເປັນຮັງກີຣ</type>
-			<type type="standard" key="collation">ຮຽງຕາມມາດຕະຖານ</type>
-			<type type="stroke" key="collation">ລຽງຕາມການລາກເສັ້ນ</type>
-			<type type="sund" key="numbers">ຕົວເລກຊຸນດາ</type>
-			<type type="talu" key="numbers">ຕົວເລກໄຕລື້ໃໝ່</type>
-			<type type="taml" key="numbers">ຕົວເລກທາມິວແບບດັ້ງເດີມ</type>
-			<type type="tamldec" key="numbers">ຕົວເລກທາມິວ</type>
-			<type type="telu" key="numbers">ຕົວເລກເຕລູກູ</type>
-			<type type="thai" key="numbers">ຕົວເລກໄທ</type>
-			<type type="tibt" key="numbers">ຕົວເລກທິເບດ</type>
-			<type type="traditional" key="collation">ລຽງຕາມແບບດັ້ງເດີມ</type>
-			<type type="unihan" key="collation">ລຽງລຳດັບຕາມຈຳນວນຂີດ</type>
-			<type type="vaii" key="numbers">ຕົວເລກໃນລະບົບໄວ</type>
+			<type key="calendar" type="buddhist">ປະຕິທິນ ພຸດທະສັງກາດ</type>
+			<type key="calendar" type="chinese">ປະຕິທິນຈີນ</type>
+			<type key="calendar" type="coptic">ປະຕິທິນຄັອບຕິກ</type>
+			<type key="calendar" type="dangi">ປະ​ຕິ​ທິນ​ດັງ​ກີ</type>
+			<type key="calendar" type="ethiopic">ປະຕິທິນເອທິໂອເປຍ</type>
+			<type key="calendar" type="ethiopic-amete-alem">ປະຕິທິນປີໂອເອທິໂອເປຍ</type>
+			<type key="calendar" type="gregorian">ປະຕິທິນເກຣໂກຣຽນ</type>
+			<type key="calendar" type="hebrew">ປະ​ຕິ​ທິນ​ຮີບ​ຣິວ</type>
+			<type key="calendar" type="indian">ປະຕິທິນແຫ່ງຊາດອິນເດຍ</type>
+			<type key="calendar" type="islamic">ປະຕິທິນອິສະລາມ</type>
+			<type key="calendar" type="islamic-civil">ປະຕິທິນອິດສະລາມ</type>
+			<type key="calendar" type="iso8601">ປະ​ຕິ​ທິນ ISO-8601</type>
+			<type key="calendar" type="japanese">ປະຕິທິນຍີ່ປຸ່ນ</type>
+			<type key="calendar" type="persian">ປະຕິທິນເປີຊຽນ</type>
+			<type key="calendar" type="roc">ປະຕິທິນໄຕ້ຫວັນ</type>
+			<type key="collation" type="big5han">ລຽງຕາມອັກສອນຈີນດັ້ງເດີມ</type>
+			<type key="collation" type="dictionary">ລຽງຕາມພົດຈະນານຸກົມ</type>
+			<type key="collation" type="ducet">ຮຽງຕາມລຳດັບຢູນິໂຄດເລີ່ມຕົ້ນ</type>
+			<type key="collation" type="gb2312han">ລຽງຕາມອັກສອນຈີນປະຍຸກ</type>
+			<type key="collation" type="phonebook">ລຽງຕາມສະໝຸດໂທລະສັບ</type>
+			<type key="collation" type="pinyin">ລຽງຕາມການອອກສຽງພາສາຈີນ</type>
+			<type key="collation" type="reformed">ລຽງຕາມລຳດັບສຸດທ້າຍ</type>
+			<type key="collation" type="search">ການຊອກຫາທົ່ວໄປ</type>
+			<type key="collation" type="searchjl">ຄົ້ນຫາຕາມພະຍັນຊະນະຂຶ້ນຕົ້ນທີ່ເປັນຮັງກີຣ</type>
+			<type key="collation" type="standard">ຮຽງຕາມມາດຕະຖານ</type>
+			<type key="collation" type="stroke">ລຽງຕາມການລາກເສັ້ນ</type>
+			<type key="collation" type="traditional">ລຽງຕາມແບບດັ້ງເດີມ</type>
+			<type key="collation" type="unihan">ລຽງລຳດັບຕາມຈຳນວນຂີດ</type>
+			<type key="hc" type="h11">ຕາມລະບົບ 12 ຊົວໂມງ (0–11)</type>
+			<type key="hc" type="h12">ຕາມລະບົບ 12 ຊົວໂມງ (1–12)</type>
+			<type key="hc" type="h23">ຕາມລະບົບ 24 ຊົວໂມງ (0–23)</type>
+			<type key="hc" type="h24">ຕາມລະບົບ 24 ຊົວໂມງ (1–24)</type>
+			<type key="lb" type="loose">ຮູບແບບການຍຸດຜອນຕາມເສັ້ນລວມ</type>
+			<type key="lb" type="normal">ຮູບແບບການຍຸດຜອນຕາມປົກກະຕິ</type>
+			<type key="lb" type="strict">ຮູບແບບການຍຸດຜອນແບບເຄັ່ມຫງວດ</type>
+			<type key="ms" type="metric">ລະບົບແມັດຕິດ</type>
+			<type key="ms" type="uksystem">ລະບົບການວັດແທກແບບຕາເວັນຕົກ</type>
+			<type key="ms" type="ussystem">ລະບົບການວັດແທກແບບສະຫະລັດ</type>
+			<type key="numbers" type="arab">ຕົວເລກອາຣາບິກ-ອິນດິກ</type>
+			<type key="numbers" type="arabext">ຕົວເລກອາຣາບິກ-ອິນດິກຕົວເຕັມ</type>
+			<type key="numbers" type="armn">ຕົວເລກອາເມນຽນ</type>
+			<type key="numbers" type="armnlow">ຕົວເລກອາເມນຽນຕົວພິມນ້ອຍ</type>
+			<type key="numbers" type="bali">ຕົວເລກບາລີ</type>
+			<type key="numbers" type="beng">ຕົວເລກເບັງກາລີ</type>
+			<type key="numbers" type="cham">ຕົວເລກຊຣາມ</type>
+			<type key="numbers" type="deva">ຕົວເລກເນວັນເນກາຣີ</type>
+			<type key="numbers" type="ethi">ຕົວເລກເອທິໂອປິກ</type>
+			<type key="numbers" type="fullwide">ຕົວເລກຄວາມກວ້າງເຕັມ</type>
+			<type key="numbers" type="geor">ຕົວເລກຈໍຈຽນ</type>
+			<type key="numbers" type="grek">ຕົວເລກກຣີກ</type>
+			<type key="numbers" type="greklow">ຕົວເລກກຣີກຕົວພິມນ້ອຍ</type>
+			<type key="numbers" type="gujr">ຕົວເລກກຸຈາລາຕິ</type>
+			<type key="numbers" type="guru">ຕົວເລກກົວມູຄິ</type>
+			<type key="numbers" type="hanidec">ຕົວເລກທົດສະນິນົມຈີນ</type>
+			<type key="numbers" type="hans">ຕົວເລກຈີນແບບຮຽບງ່າຍ</type>
+			<type key="numbers" type="hansfin">ຕົວເລກທາງການເງິນແບບຮຽບງ່າຍຂອງຈີນ</type>
+			<type key="numbers" type="hant">ຕົວເລກຈີນແບບດັ້ງເດີມ</type>
+			<type key="numbers" type="hantfin">ຕົວເລກທາງການເງິນແບບດັ້ງເດີມຂອງຈີນ</type>
+			<type key="numbers" type="hebr">ຕົວເລກຮິບຣິວ</type>
+			<type key="numbers" type="java">ຕົວເລກຊົວ</type>
+			<type key="numbers" type="jpan">ຕົວເລກຍີ່ປຸ່ນ</type>
+			<type key="numbers" type="jpanfin">ຕົວເລກທາງການເງິນຂອງຍີ່ປຸ່ນ</type>
+			<type key="numbers" type="kali">ຕົວເລກກາຢາ</type>
+			<type key="numbers" type="khmr">ຕົວເລກຂະໝຽນ</type>
+			<type key="numbers" type="knda">ຕົວເລກແຄນນາດາ</type>
+			<type key="numbers" type="lana">ຕົວເລກໄທທຳໂຮລາ</type>
+			<type key="numbers" type="lanatham">ຕົວເລກໄທທຳທຳ</type>
+			<type key="numbers" type="laoo">ຕົວເລກລາວ</type>
+			<type key="numbers" type="latn">ຕົວເລກຕາເວັນຕົກ</type>
+			<type key="numbers" type="lepc">ຕົວເລກເລຊາ</type>
+			<type key="numbers" type="limb">ຕົວເລກລິມບູ</type>
+			<type key="numbers" type="mlym">ຕົວເລກມາເລອາລຳ</type>
+			<type key="numbers" type="mong">ຕົວເລກມ່ອງໂກເລຍ</type>
+			<type key="numbers" type="mtei">ຕົວເລກເມໄຕມາເຢກ</type>
+			<type key="numbers" type="mymr">ຕົວເລກມຽນມາ</type>
+			<type key="numbers" type="mymrshan">ຕົວເລກຊານພະມ້າ</type>
+			<type key="numbers" type="nkoo">ຕົວເລກເອັນໂກ້</type>
+			<type key="numbers" type="olck">ຕົວເລກໂອລຈິກິ</type>
+			<type key="numbers" type="orya">ຕົວເລກໂອຣິຢາ</type>
+			<type key="numbers" type="roman">ຕົວເລກໂຣມັນ</type>
+			<type key="numbers" type="romanlow">ຕົວເລກໂຣມັນຕົວພິມນ້ອຍ</type>
+			<type key="numbers" type="saur">ຕົວເລກເສົາລັດທາ</type>
+			<type key="numbers" type="sund">ຕົວເລກຊຸນດາ</type>
+			<type key="numbers" type="talu">ຕົວເລກໄຕລື້ໃໝ່</type>
+			<type key="numbers" type="taml">ຕົວເລກທາມິວແບບດັ້ງເດີມ</type>
+			<type key="numbers" type="tamldec">ຕົວເລກທາມິວ</type>
+			<type key="numbers" type="telu">ຕົວເລກເຕລູກູ</type>
+			<type key="numbers" type="thai">ຕົວເລກໄທ</type>
+			<type key="numbers" type="tibt">ຕົວເລກທິເບດ</type>
+			<type key="numbers" type="vaii">ຕົວເລກໃນລະບົບໄວ</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">ເມທຣິກ</measurementSystemName>
@@ -1167,7 +1182,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<ellipsis type="word-final">{0} …</ellipsis>
 		<ellipsis type="word-initial">… {0}</ellipsis>
 		<ellipsis type="word-medial">{0} … {1}</ellipsis>
-		<moreInformation>ຂໍ້ມູນເພີ່ມເຕີມ</moreInformation>
+		<moreInformation>?</moreInformation>
 	</characters>
 	<delimiters>
 		<quotationStart>“</quotationStart>
@@ -1644,11 +1659,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">G y</dateFormatItem>
-						<dateFormatItem id="GyMMM">G MMM y</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G d MMM y</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">G E, d MMM y</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
 						<dateFormatItem id="h">h ໂມງa</dateFormatItem>
 						<dateFormatItem id="H">HH</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
@@ -1661,6 +1677,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">G y</dateFormatItem>
 						<dateFormatItem id="yyyy">G y</dateFormatItem>
@@ -1670,6 +1687,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">G MMM y</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">G d MMM y</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E, G d MMM y</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y MMMM</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">G QQQ y</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">G y QQQQ</dateFormatItem>
 					</availableFormats>
@@ -1983,15 +2001,67 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">ກທ</dayPeriod>
-							<dayPeriod type="noon">ທ</dayPeriod>
-							<dayPeriod type="pm">ຫຼທ</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">ທ່ຽງຄືນ</dayPeriod>
 							<dayPeriod type="am">ກ່ອນທ່ຽງ</dayPeriod>
 							<dayPeriod type="noon">ທ່ຽງ</dayPeriod>
 							<dayPeriod type="pm">ຫຼັງທ່ຽງ</dayPeriod>
+							<dayPeriod type="morning1">ຕອນເຊົ້າ</dayPeriod>
+							<dayPeriod type="afternoon1">ຕອນບ່າຍ</dayPeriod>
+							<dayPeriod type="evening1">ຕອນແລງ</dayPeriod>
+							<dayPeriod type="night1">ກາງຄືນ</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">ທ່ຽງຄືນ</dayPeriod>
+							<dayPeriod type="am">ຕອນເຊົ້າ</dayPeriod>
+							<dayPeriod type="noon">ທ</dayPeriod>
+							<dayPeriod type="pm">ຫຼທ</dayPeriod>
+							<dayPeriod type="morning1">ຕອນເຊົ້າ</dayPeriod>
+							<dayPeriod type="afternoon1">ຕອນທ່ຽງ</dayPeriod>
+							<dayPeriod type="evening1">ຕອນແລງ</dayPeriod>
+							<dayPeriod type="night1">ກາງຄືນ1</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">ທ່ຽງຄືນ</dayPeriod>
+							<dayPeriod type="am">ກ່ອນທ່ຽງ</dayPeriod>
+							<dayPeriod type="noon">ທ່ຽງ</dayPeriod>
+							<dayPeriod type="pm">ຫຼັງທ່ຽງ</dayPeriod>
+							<dayPeriod type="morning1">ຕອນເຊົ້າ</dayPeriod>
+							<dayPeriod type="afternoon1">ຕອນບ່າຍ</dayPeriod>
+							<dayPeriod type="evening1">ຕອນແລງ</dayPeriod>
+							<dayPeriod type="night1">ຕອນກາງຄືນ</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">ທ່ຽງ​ຄືນ</dayPeriod>
+							<dayPeriod type="am">ກ່ອນທ່ຽງ</dayPeriod>
+							<dayPeriod type="noon">ຕອນທ່ຽງ</dayPeriod>
+							<dayPeriod type="pm">ຫຼັງທ່ຽງ</dayPeriod>
+							<dayPeriod type="morning1">​ເຊົ້າ</dayPeriod>
+							<dayPeriod type="afternoon1">ສວຍ</dayPeriod>
+							<dayPeriod type="evening1">ແລງ</dayPeriod>
+							<dayPeriod type="night1">​ກາງ​ຄືນ</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">ທ່ຽງ​ຄືນ</dayPeriod>
+							<dayPeriod type="am">ກທ</dayPeriod>
+							<dayPeriod type="noon">ຕອນທ່ຽງ</dayPeriod>
+							<dayPeriod type="pm">ຫຼທ</dayPeriod>
+							<dayPeriod type="morning1">​ເຊົ້າ</dayPeriod>
+							<dayPeriod type="afternoon1">ສວຍ</dayPeriod>
+							<dayPeriod type="evening1">ແລງ</dayPeriod>
+							<dayPeriod type="night1">​ກາງ​ຄືນ</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">ທ່ຽງ​ຄືນ</dayPeriod>
+							<dayPeriod type="am">ກ່ອນທ່ຽງ</dayPeriod>
+							<dayPeriod type="noon">ຕອນທ່ຽງ</dayPeriod>
+							<dayPeriod type="pm">ຫຼັງທ່ຽງ</dayPeriod>
+							<dayPeriod type="morning1">​ເຊົ້າ</dayPeriod>
+							<dayPeriod type="afternoon1">ສວຍ</dayPeriod>
+							<dayPeriod type="evening1">ແລງ</dayPeriod>
+							<dayPeriod type="night1">​ກາງ​ຄືນ</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -2004,7 +2074,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</eraNames>
 					<eraAbbr>
 						<era type="0">ກ່ອນ ຄ.ສ.</era>
+						<era type="0" alt="variant">ກ່ອນຍຸກ ຄ.ສ</era>
 						<era type="1">ຄ.ສ.</era>
+						<era type="1" alt="variant">ຍຸກ ຄ.ສ</era>
 					</eraAbbr>
 				</eras>
 				<dateFormats>
@@ -2090,12 +2162,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">M/y</dateFormatItem>
@@ -2104,6 +2181,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMEd">E, d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMM">y MMMM</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
 						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
 					</availableFormats>
@@ -2234,9 +2312,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="5">ຊີວັດ</month>
 							<month type="6">ອາດາ I</month>
 							<month type="7">ອາດາ</month>
-							<month type="7" yeartype="leap">ອາດ II</month>
+							<month type="7" yeartype="leap">ອາດາ II</month>
 							<month type="8">ນິດຊານ</month>
-							<month type="9">ອີຍາ</month>
+							<month type="9">ອີຍາຣ</month>
 							<month type="10">ສີວານ</month>
 							<month type="11">ຕາມູ</month>
 							<month type="12">ເອບ</month>
@@ -2270,7 +2348,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="7">ອາດາ</month>
 							<month type="7" yeartype="leap">ອາດາ II</month>
 							<month type="8">ນິດຊານ</month>
-							<month type="9">ອີຍາ</month>
+							<month type="9">ອີຍາຣ</month>
 							<month type="10">ສີວານ</month>
 							<month type="11">ຕາມູ</month>
 							<month type="12">ເອບ</month>
@@ -2415,8 +2493,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<monthWidth type="wide">
 							<month type="1">ມຸຣະຮອມ</month>
 							<month type="2">ຊາຟາຣ</month>
-							<month type="3">ຮາບີ 1</month>
-							<month type="4">ຮາບີ 2</month>
+							<month type="3">ຮອດບີ 1</month>
+							<month type="4">ຮອດບີ 2</month>
 							<month type="5">ຈຸມາດາ 1</month>
 							<month type="6">ຈຸມາດາ 2</month>
 							<month type="7">ຮາຈັບ</month>
@@ -2459,8 +2537,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<monthWidth type="wide">
 							<month type="1">ມຸຣະຮອມ</month>
 							<month type="2">ຊາຟາຣ</month>
-							<month type="3">ຮາບີ 1</month>
-							<month type="4">ຮາບີ 2</month>
+							<month type="3">ຮອດບີ 1</month>
+							<month type="4">ຮອດບີ 2</month>
 							<month type="5">ຈຸມາດາ 1</month>
 							<month type="6">ຈຸມາດາ 2</month>
 							<month type="7">ຮາຈັບ</month>
@@ -2803,7 +2881,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="2">ອໍຣດີບີເຫຣດ</month>
 							<month type="3">ຄໍຣເດດ</month>
 							<month type="4">ແຕຣ</month>
-							<month type="5">ມໍຣດາເ</month>
+							<month type="5">ມໍຣເດດ</month>
 							<month type="6">ຊາຣຫິວາ</month>
 							<month type="7">ເມີ</month>
 							<month type="8">ອາບານ</month>
@@ -2890,9 +2968,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>ປ.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ໃນອີກ {0} ປີ</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ປີກ່ອນ</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-narrow">
+				<displayName>ປ.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ໃນອີກ {0} ປີ</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ປີກ່ອນ</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="quarter">
-				<displayName>ຄວດເຕີ</displayName>
+				<displayName>ໄຕມາດ</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ໃນອີກ {0} ຄວດເຕີ</relativeTimePattern>
 				</relativeTime>
@@ -2901,7 +2994,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="quarter-short">
-				<displayName>ຄຕ.</displayName>
+				<displayName>ຕມ.</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ໃນອີກ {0} ຄຕ.</relativeTimePattern>
 				</relativeTime>
@@ -2910,7 +3003,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="quarter-narrow">
-				<displayName>ຄຕ.</displayName>
+				<displayName>ຕມ.</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">+{0} ຄຕ.</relativeTimePattern>
 				</relativeTime>
@@ -2942,10 +3035,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="month-narrow">
 				<displayName>ດ.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">+{0} ດ.</relativeTimePattern>
+					<relativeTimePattern count="other">ໃນອີກ {0} ດ.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other">-{0} ດ.</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ດ. ກ່ອນ</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week">
@@ -2975,7 +3068,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">+{0} ອທ.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other">-{0} ອທ.</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ອທ. ກ່ອນ</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day">
@@ -2994,6 +3087,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>ມື້</displayName>
+				<relative type="-2">ມື້ກ່ອນ</relative>
+				<relative type="-1">ມື້ວານ</relative>
+				<relative type="0">ມື້ນີ້</relative>
+				<relative type="1">ມື້ອື່ນ</relative>
+				<relative type="2">ມື້ຮື</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ໃນອີກ {0} ມື້</relativeTimePattern>
 				</relativeTime>
@@ -3003,6 +3101,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>ມື້</displayName>
+				<relative type="-2">ມື້ກ່ອນ</relative>
+				<relative type="-1">ມື້ວານ</relative>
+				<relative type="0">ມື້ນີ້</relative>
+				<relative type="1">ມື້ອື່ນ</relative>
+				<relative type="2">ມື້ຮື</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ໃນອີກ {0} ມື້</relativeTimePattern>
 				</relativeTime>
@@ -3019,9 +3122,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">ວັນອາທິດໜ້າ</relative>
 			</field>
 			<field type="sun-short">
-				<relative type="-1">ອາທິດແລ້ວ</relative>
-				<relative type="0">ອາທິດນີ້</relative>
-				<relative type="1">ອາທິດໜ້າ</relative>
+				<relative type="-1">ວັນທິດແລ້ວ</relative>
+				<relative type="0">ວັນອາທິດນີ້</relative>
+				<relative type="1">ວັນອາທິດໜ້າ</relative>
 			</field>
 			<field type="sun-narrow">
 				<relative type="-1">ອາ. ແລ້ວ</relative>
@@ -3216,7 +3319,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<regionFormat type="standard">{0} (+0)</regionFormat>
 			<fallbackFormat>{1} ({0})</fallbackFormat>
 			<zone type="Etc/Unknown">
-				<exemplarCity>ບໍ່ຮູ້ຈັກ</exemplarCity>
+				<exemplarCity>ບໍ່ຮູ້ຊື່ເມືອງ</exemplarCity>
 			</zone>
 			<zone type="Europe/Andorra">
 				<exemplarCity>ອິນດໍຣາ</exemplarCity>
@@ -3368,6 +3471,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="America/Barbados">
 				<exemplarCity>ບາເບດອສ</exemplarCity>
 			</zone>
+			<zone type="Asia/Dhaka">
+				<exemplarCity>ດາຫ໌ກາ</exemplarCity>
+			</zone>
 			<zone type="Europe/Brussels">
 				<exemplarCity>ບຣັສເຊວ</exemplarCity>
 			</zone>
@@ -4079,6 +4185,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>ພອດ ມໍເຣສບີ</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>ເວລາຕາມເຂດບູນກຽນວິວ</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>ມານີລາ</exemplarCity>
 			</zone>
@@ -4163,6 +4272,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>ອີຄຸສຄ໌</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>ຊີຕ່າ</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>ຢາຄຸທຊ໌</exemplarCity>
 			</zone>
@@ -4181,6 +4293,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>ມາກາແດນ</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>ສຣິລເນັກໂກລີດ</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>ຄາມຊາດກາ</exemplarCity>
 			</zone>
@@ -4498,7 +4613,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>ເວລາອະແລສກາ</generic>
 					<standard>ເວລາມາດຕະຖານອະແລສກາ</standard>
-					<daylight>ເວລາຕອນທ່ຽງຂອງອະແລສກາ</daylight>
+					<daylight>ເວລາກາງເວັນອະແລສກາ</daylight>
 				</long>
 			</metazone>
 			<metazone type="Almaty">
@@ -4510,16 +4625,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Amazon">
 				<long>
-					<generic>ເວ​ລາ​ອາ​ເມ​ຊອນ</generic>
+					<generic>ເວລາຕາມເຂດອາເມຊອນ</generic>
 					<standard>ເວ​ລາ​ມາດ​ຕະ​ຖານອາ​ເມ​ຊອນ</standard>
 					<daylight>ເວ​ລາ​ລະ​ດູ​ຮ້ອນອາ​ເມ​ຊອນ</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Central">
 				<long>
-					<generic>ເວລາຕອນທ່ຽງ</generic>
-					<standard>ເວລາມາດຕະຖານ</standard>
-					<daylight>ເວລາຕອນທ່ຽງຂອງອາເມລິກາເໝືອ</daylight>
+					<generic>ເວລາກາງ</generic>
+					<standard>ເວລາມາດຕະຖານກາງ</standard>
+					<daylight>ເວລາກາງເວັນກາງ</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Eastern">
@@ -4533,14 +4648,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>ເວລາແຖບພູເຂົາ</generic>
 					<standard>ເວລາມາດຕະຖານແຖບພູເຂົາ</standard>
-					<daylight>ເວລາຕອນທ່ຽງແຖວພູເຂົາ</daylight>
+					<daylight>ເວລາກາງເວັນແຖວພູເຂົາ</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
 					<generic>ເວລາປາຊີຟິກ</generic>
 					<standard>ເວລາມາດຕະຖານຂອງປາຊີຟິກ</standard>
-					<daylight>ເວລາຕອນທ່ຽງຂອງປາຊີຟິກ</daylight>
+					<daylight>ເວລາກາງເວັນຂອງປາຊີຟິກ</daylight>
 				</long>
 			</metazone>
 			<metazone type="Apia">
@@ -4596,7 +4711,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>ເວລາຂອງອາແລນຕິກ</generic>
 					<standard>ເວລາມາດຕະຖານຂອງອາແລນຕິກ</standard>
-					<daylight>ເວລາຕອນທ່ຽງຂອງອາແລນຕິກ</daylight>
+					<daylight>ເວລາກາງເວັນຂອງອາແລນຕິກ</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Central">
@@ -4660,9 +4775,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Brasilia">
 				<long>
-					<generic>ເວລາເບຣຊີເລຍ</generic>
+					<generic>ເວລາຕາມເຂດບຣາຊິເລຍ</generic>
 					<standard>ເວລາມາດຕາຖານເບຣຊີເລຍ</standard>
-					<daylight>ເວລາລະດູຮ້ອນເບຣຊີເລຍ</daylight>
+					<daylight>ເວລາຕາມເຂດລະດູຮ້ອນຕາມເຂດບຣາຊີເລຍ</daylight>
 				</long>
 			</metazone>
 			<metazone type="Brunei">
@@ -5510,6 +5625,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00;¤-#,##0.00</pattern>
 				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>¤#,##0.00;¤-#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">¤0 ພັນ</pattern>
+					<pattern type="10000" count="other">¤00 ພັນ</pattern>
+					<pattern type="100000" count="other">¤000 ກີບ</pattern>
+					<pattern type="1000000" count="other">¤0 ລ້ານ</pattern>
+					<pattern type="10000000" count="other">¤00 ລ້ານ</pattern>
+					<pattern type="100000000" count="other">¤000 ລ້ານ</pattern>
+					<pattern type="1000000000" count="other">¤0 ຕື້</pattern>
+					<pattern type="10000000000" count="other">¤00 ຕື້</pattern>
+					<pattern type="100000000000" count="other">¤000 ຕື້</pattern>
+					<pattern type="1000000000000" count="other">¤0 ລ້ານລ້ານ</pattern>
+					<pattern type="10000000000000" count="other">¤00 ລ້ານລ້ານ</pattern>
+					<pattern type="100000000000000" count="other">¤000 ລ້ານລ້ານ</pattern>
+				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -5549,6 +5683,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ແອງ​ໂກ​ລັນ ຄວນ​ຊາ</displayName>
 				<displayName count="other">ແອງ​ໂກ​ລັນ ຄວນ​ຊາ</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>ກວານຊາ ແອງໂກລາ (1977–1991)</displayName>
@@ -5606,6 +5741,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ບອ​ສ​ເນຍ-ເຮີ​ເຊ​ໂກວິ​ນາ ຄອນ​ເວີດ​ຕິ​ໂບ ມາກ</displayName>
 				<displayName count="other">ບອ​ສ​ເນຍ-ເຮີ​ເຊ​ໂກວິ​ນາ ຄອນ​ເວີດ​ຕິ​ໂບ ມາກ</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BAN">
 				<displayName>ດີນາໃໝ່ ບອສເນຍ ເຮີເຊໂບວີນາ(1994–1997)</displayName>
@@ -5639,6 +5775,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="BGN">
 				<displayName>ບັງ​ກາ​ຣຽນ ເລບ</displayName>
+				<displayName count="other">ເລບ ບູນກາຣີ</displayName>
 				<symbol>BGN</symbol>
 			</currency>
 			<currency type="BGO">
@@ -5670,6 +5807,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ໂບ​ລິ​ວຽນ ໂບ​ລິ​ເວຍ​ໂນ</displayName>
 				<displayName count="other">ໂບ​ລິ​ວຽນ ໂບ​ລິ​ເວຍ​ໂນ</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOL">
 				<displayName>ໂລລິເວຍໂນ ໂລລິເວຍ (1863–1963)</displayName>
@@ -5722,6 +5860,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ບອດ​ສະ​ວາ​ນານ ພູ​ລາ</displayName>
 				<displayName count="other">ບອດ​ສະ​ວາ​ນານ ພູ​ລາ</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>ຣູໂບ ເບຣາຣຸສ ໃໝ່(1994–1999)</displayName>
@@ -5803,6 +5942,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ຄິວແບນ ຄອນເວີດຕິໂບ ເປໂຊ</displayName>
 				<displayName count="other">ຄິວແບນ ຄອນເວີດຕິໂບ ເປໂຊ</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>ຄິວແບນ ເປໂຊ</displayName>
@@ -5822,6 +5962,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ໂຄ​ຣູ​ນາ ເຊກ</displayName>
 				<displayName count="other">ໂຄ​ຣູ​ນາ ເຊກ</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>ມາກ ເຢຍລະມັນ ຕາເວັນອອກ</displayName>
@@ -5838,6 +5979,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ແດນ​ນິ​ຊ ໂຄຣນ</displayName>
 				<displayName count="other">ແດນ​ນິ​ຊ ໂຄຣນເນີ</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>ໂດ​ມິ​ນິ​ກັນ ເປ​ໂຊ</displayName>
@@ -5863,6 +6005,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ອີ​ຢິບ​ທຽນ ພາວດ໌</displayName>
 				<displayName count="other">ອີ​ຢິບ​ທຽນ ພາວດ໌</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>ອິ​ຣິ​ທຣຽນ ແນກ​ຟ​າ</displayName>
@@ -5895,19 +6038,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="FJD">
 				<displayName>ຟິ​ຈຽນ ໂດ​ລ່າ</displayName>
 				<displayName count="other">ຟິ​ຈຽນ ໂດ​ລ່າ</displayName>
+				<symbol draft="contributed">FJD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="FKP">
 				<displayName>ຟອ​ລ໌ກ​ແລນ ໄອ​ແລນ​ສ໌ ພາວ​ດ໌</displayName>
 				<displayName count="other">ຟອ​ລ໌ກ​ແລນ ໄອ​ແລນ​ສ໌ ພາວ​ດ໌</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>ຟຣັງ ຝຣັ່ງ</displayName>
 			</currency>
 			<currency type="GBP">
-				<displayName>ພາວ​ດ໌ ສະ​ເຕີ​ຣິງ (ອັງ​ກິດ)</displayName>
-				<displayName count="other">ພາວ​ດ໌ ສະ​ເຕີ​ຣິງ (ອັງ​ກິດ)</displayName>
+				<displayName>ປອນ ສະ​ເຕີ​ຣິງ (ອັງ​ກິດ)</displayName>
+				<displayName count="other">ປອນ ສະເຕີຣິງ (ອັງກິດ)</displayName>
 				<symbol>£</symbol>
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
@@ -5918,6 +6063,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ຈໍ​ຈຽນ ລາ​ຣິ</displayName>
 				<displayName count="other">ຈໍ​ຈຽນ ລາ​ຣິ</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">ລາຣີ</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>ເຊດີ ການາ (1979–2007)</displayName>
@@ -5942,6 +6088,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ກິ​ນຽນ ຟຣັງ</displayName>
 				<displayName count="other">ກິ​ນຽນ ຟຣັງ</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>ໄຊລິ ກີນີ</displayName>
@@ -5956,6 +6103,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ກົວເຕມາລານ ເຄັດຊອນ</displayName>
 				<displayName count="other">ເຄັດຊອນ</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>ເອສກູໂດ ກີນີໂປຕູເກດ</displayName>
@@ -5979,6 +6127,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ຮອນດູແຣນ ເລມພິຣາ</displayName>
 				<displayName count="other">ຮອນດູແຣນ ເລມພິຣາ</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>ດີນາ ໂຄຣເອເຊຍ</displayName>
@@ -5987,20 +6136,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ໂຄຣ​ເອ​ທຽນ ຄູ​ນາ</displayName>
 				<displayName count="other">ໂຄຣ​ເອ​ທຽນ ຄູ​ນາ</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>ໄຮ​ຕຽນ ກົວ​ເດ</displayName>
+				<displayName count="other">ໄຮ​ຕຽນ ກົວ​ເດ</displayName>
 				<symbol>HTG</symbol>
 			</currency>
 			<currency type="HUF">
 				<displayName>ຮັງ​ກາ​ຣຽນ ຟໍ​ຣິນ</displayName>
 				<displayName count="other">ຮັງ​ກາ​ຣຽນ ຟໍ​ຣິນ</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>ອິນ​ໂດ​ເນ​ຊຽນ ໂດ​ລ່າ</displayName>
 				<displayName count="other">ອິນ​ໂດ​ເນ​ຊຽນ ໂດ​ລ່າ</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>ປອນ ໄອຣິຊ</displayName>
@@ -6034,6 +6187,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ໄອ​ສ໌​ແລນ​ດິກ ໂຄຣ​ນາ</displayName>
 				<displayName count="other">ໄອ​ສ໌​ແລນ​ດິກ ໂຄຣ​ນາ</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>ລິຣາ ອີຕາລີ</displayName>
@@ -6075,11 +6229,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ໂຄ​ໂມ​ຣຽນ ຟຣັງ</displayName>
 				<displayName count="other">ໂຄ​ໂມ​ຣຽນ ຟຣັງ</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>ເກົາ​ຫລີ​ເໜືອ ວອນ</displayName>
 				<displayName count="other">ເກົາ​ຫລີ​ເໜືອ ວອນ</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRH">
 				<displayName>ຮາວານ ເກົາຫຼີເນື້</displayName>
@@ -6120,11 +6276,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ເລ​ບາ​ນີ​ສ ພາວດ໌</displayName>
 				<displayName count="other">ເລ​ບາ​ນີ​ສ ພາວດ໌</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>ສີ​ລັງ​ກາ ຣູ​ປີ</displayName>
 				<displayName count="other">ສີ​ລັງ​ກາ ຣູ​ປີ</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>ລິ​ເບີ​ຣຽນ ໂດ​ລ່າ</displayName>
@@ -6188,6 +6346,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ມາ​ລາ​ກາ​ຊີ ອາ​ເຣຍ​ຣີ</displayName>
 				<displayName count="other">ມາ​ລາ​ກາ​ຊີ ອາ​ເຣຍ​ຣີ</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>ຟຣັງ ມາດາກັດສະກາ</displayName>
@@ -6207,6 +6366,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ມຽນ​ມາ ຈ໊າດ</displayName>
 				<displayName count="other">ມຽນ​ມາ ຈ໊າດ</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>ມອງ​ໂກ​ລຽນ ຕູກຣິກ</displayName>
@@ -6234,6 +6394,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ເມົາ​ຣິ​ທຽນ ຣູ​ປີ</displayName>
 				<displayName count="other">ເມົາ​ຣິ​ທຽນ ຣູ​ປີ</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>ມັ​ລ​ດິ​ວຽນ ຣູ​ຟິ​ຢາ</displayName>
@@ -6261,6 +6422,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ມາ​ເລ​ເຊຍ ຣິງ​ກິດ</displayName>
 				<displayName count="other">ມາ​ເລ​ເຊຍ ຣິງ​ກິດ</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>ເອສກູໂດ ໂມຊຳບິກ</displayName>
@@ -6292,6 +6454,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ນິກາຣາກວນ ໂຄໂດບາ</displayName>
 				<displayName count="other">ນິກາຣາກວນ ໂຄໂດບາ</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>ກິລເດີ ເນເທີແລນ</displayName>
@@ -6300,11 +6463,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ນໍ​ເວ​ກຽນ ​ໂຄຣນ</displayName>
 				<displayName count="other">ນໍ​ເວ​ກຽນ ​ໂຄຣນ</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>ເນ​ປານ ຣູ​ປີ</displayName>
 				<displayName count="other">ເນ​ປານ ຣູ​ປີ</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>ນິວ​ຊີ​ແລນ ໂດ​ລ່າ</displayName>
@@ -6348,11 +6513,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ປາ​ກິ​ສຖານ ຣູ​ປີ</displayName>
 				<displayName count="other">ປາ​ກິ​ສຖານ ຣູ​ປີ</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>ໂປ​ລິ​ຊ ຊະ​ລໍ​ຕີ</displayName>
 				<displayName count="other">ໂປ​ລິ​ຊ ຊະ​ລໍ​ຕີ</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>ຊະລອສຕີ ໂປແລນ (1950–1995)</displayName>
@@ -6362,6 +6529,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="PYG">
 				<displayName>ກວາຣານີ ປາຣາກວາຍ</displayName>
+				<displayName count="other">ກວາຣານີ ປາຣາກວາຍ</displayName>
 				<symbol>PYG</symbol>
 				<symbol alt="narrow" draft="contributed">₲</symbol>
 			</currency>
@@ -6390,6 +6558,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ຣັສ​ຊຽນ ຣູ​ເບິນ</displayName>
 				<displayName count="other">ຣັສ​ຊຽນ ຣູ​ເບິນ</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>ຣູໂບ ຣັດເຊຍ (1991–1998)</displayName>
@@ -6398,6 +6567,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ຣະ​ວັນ​ດັນ ຟຣັງ</displayName>
 				<displayName count="other">ຣະ​ວັນ​ດັນ ຟຣັງ</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>ຊາ​ອູ​ດິ ຣິ​ຢອນ</displayName>
@@ -6430,6 +6600,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ສະ​ວີ​ດິ​ຊ ໂຄຣ​ນາ</displayName>
 				<displayName count="other">ສະ​ວີ​ດິ​ຊ ໂຄຣ​ນາ</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>ສິງ​ກະ​ໂປ ໂດ​ລ່າ</displayName>
@@ -6441,6 +6612,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ເຊນ ເຮ​ເລ​ນາ ພາວດ໌</displayName>
 				<displayName count="other">ເຊນ ເຮ​ເລ​ນາ ພາວດ໌</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>ໂຕລາ ສະໂລວິເນຍ</displayName>
@@ -6477,6 +6649,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ເຊົາ ໂທ​ເມ ແອນ ພ​ຣິນ​ຊິ​ປີ ໂດບຣາ</displayName>
 				<displayName count="other">ເຊົາ ໂທ​ເມ ແອນ ພ​ຣິນ​ຊິ​ປີ ໂດບຣາ</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>ຣູໂບ ໂຊວຽດ</displayName>
@@ -6488,6 +6661,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ຊີ​ຣຽນ ພາວດ໌</displayName>
 				<displayName count="other">ຊີ​ຣຽນ ພາວດ໌</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>ສະ​ວາ​ຊິ ລິ​ລັນ​ກິ​ນີ</displayName>
@@ -6498,6 +6672,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ໄທ ບາດ</displayName>
 				<displayName count="other">ໄທ ບາດ</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>ຣູໂບ ຕັຈີກິສຖານ</displayName>
@@ -6524,6 +6699,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ຕອງ​ກັນ ປາ​ອັງ​ກາ</displayName>
 				<displayName count="other">ຕອງ​ກັນ ປາ​ອັງ​ກາ</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>ເອສກູໂດ ຕີມໍ</displayName>
@@ -6536,6 +6712,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">ເຕີ​ກິ​ຊ ລິ​ຣາ</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>ທ​ຣິ​ນິ​ແດດ ແອນ ໂທ​ບາ​ໂກ ໂດ​ລ່າ</displayName>
@@ -6545,6 +6722,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="TWD">
 				<displayName>ນິວ ໄຕ້​ຫວັນ ໂດ​ລ່າ</displayName>
+				<displayName count="other">ນິວ ໄຕ້​ຫວັນ ໂດ​ລ່າ</displayName>
 				<symbol>NT$</symbol>
 				<symbol alt="narrow" draft="contributed">NT$</symbol>
 			</currency>
@@ -6606,6 +6784,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ເວ​ເນ​ຊູ​ເອ​ລັນ ໂບ​ລິ​ວາ</displayName>
 				<displayName count="other">ເວ​ເນ​ຊູ​ເອ​ລັນ ໂບ​ລິ​ວາ</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>ຫວຽດ​ນາມ ດົງ</displayName>
@@ -6628,6 +6807,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="XAF">
 				<displayName>ຟຣັງ ເຊຟານ ທະນາຄານລັດອາຟຣິກາກາງ</displayName>
+				<displayName count="other">ຟຣັງ ເຊຟານ ທະນາຄານລັດອາຟຣິກາກາງ</displayName>
 				<symbol>FCFA</symbol>
 			</currency>
 			<currency type="XAG">
@@ -6652,6 +6832,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ອີ​ສ ຄາ​ຣິ​ບຽນ ໂດ​ລ່າ</displayName>
 				<displayName count="other">ອີ​ສ ຄາ​ຣິ​ບຽນ ໂດ​ລ່າ</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>ສິດທິຖອນເງິນພິເສດ</displayName>
@@ -6667,6 +6848,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="XOF">
 				<displayName>ຟັງເຊຟານ ອາຟຣິກາຕາເວັນຕົກ</displayName>
+				<displayName count="other">ຟັງເຊຟານ ອາຟຣິກາຕາເວັນຕົກ</displayName>
 				<symbol>CFA</symbol>
 			</currency>
 			<currency type="XPD">
@@ -6717,6 +6899,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ເຊົາທ໌ ອາ​ຟຣິ​ກັນ ແຣນດ໌</displayName>
 				<displayName count="other">ເຊົາທ໌ ອາ​ຟຣິ​ກັນ ແຣນດ໌</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>ຄວາຊາ ຊັມເບຍ (1968–2012)</displayName>
@@ -6725,6 +6908,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ແຊມ​ບຽນ ຄວາ​ຊາ</displayName>
 				<displayName count="other">ແຊມ​ບຽນ ຄວາ​ຊາ</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>ແຊ ຄອງໂກໃໝ່</displayName>
@@ -6753,13 +6937,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<compoundUnitPattern>{0} ຕໍ່ {1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
-				<displayName>ແຮງຈີ</displayName>
-				<unitPattern count="other">{0} ແຮງຈີ</unitPattern>
+				<displayName>ແຮງຕົກຕາມລຳພັງ</displayName>
+				<unitPattern count="other">{0} ແຮງຕົກຕາມລຳພັງ</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
 				<displayName>m/s²</displayName>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="other">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radians</displayName>
+				<unitPattern count="other">{0} radians</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>ອົງສາ</displayName>
+				<unitPattern count="other">{0} ອົງສາ</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>arcminutes</displayName>
 				<unitPattern count="other">{0} ນາທີ</unitPattern>
@@ -6768,25 +6964,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>arcseconds</displayName>
 				<unitPattern count="other">{0} ວິນາທີ</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>ອົງສາ</displayName>
-				<unitPattern count="other">{0} ອົງສາ</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radians</displayName>
-				<unitPattern count="other">{0} radians</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ເອເຄີ</displayName>
-				<unitPattern count="other">{0} ເອເຄີ</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>ກິໂລຕາແມັດ</displayName>
+				<unitPattern count="other">{0} ກິໂລຕາແມັດ</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ເຮັກຕາ</displayName>
 				<unitPattern count="other">{0} ເຮັກຕາ</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>ຕາແມັດ</displayName>
+				<unitPattern count="other">{0} ຕາແມັດ</unitPattern>
+				<perUnitPattern>{0} ຕໍ່ຕາແມັດ</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
-				<displayName>ຕາຊັງຕີແມັດ</displayName>
-				<unitPattern count="other">{0} ຕາຊັງຕາແມັດ</unitPattern>
+				<displayName>ຊັງຕີຕາແມັດ</displayName>
+				<unitPattern count="other">{0} ຊັງຕີຕາແມັດ</unitPattern>
+				<perUnitPattern>{0} ຕໍ່ຊັງຕີຕາແມັດ</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>ຕາ​ລາງໄມລ໌</displayName>
+				<unitPattern count="other">{0} ຕາ​ລາງໄມລ໌</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ເອເຄີ</displayName>
+				<unitPattern count="other">{0} ເອເຄີ</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>square yards</displayName>
+				<unitPattern count="other">{0} ຕາລາງຢາດ</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ຕາ​ຟຸດ</displayName>
@@ -6795,111 +7001,114 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="area-square-inch">
 				<displayName>ຕານິ້ວ</displayName>
 				<unitPattern count="other">{0} ຕາລາງນິ້ວ</unitPattern>
+				<perUnitPattern>{0} ຕໍ່ຕາລາງນິ້ວ</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>ກິໂລຕາແມັດ</displayName>
-				<unitPattern count="other">{0} ກິໂລຕາແມັດ</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>ຕາແມັດ</displayName>
-				<unitPattern count="other">{0} ຕາແມັດ</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>ຕາ​ໄມລ໌</displayName>
-				<unitPattern count="other">{0} ຕາ​ໄມລ໌</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>square yards</displayName>
-				<unitPattern count="other">{0} ຕາລາງຢາດ</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>ກະຣັດ</displayName>
+				<unitPattern count="other">{0} ກະຣັດ</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
+				<displayName>ລ/ກມ</displayName>
 				<unitPattern count="other">{0} ລິດຕໍ່ກິໂລແມັດ</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ລິດ ຕໍ່ 100 ກິໂລເເມັດ</displayName>
+				<unitPattern count="other">{0} ລິດຕໍ່ 100 ກີໂລແມັດ</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>ໄມລ໌ຕໍ່ແກລອນ</displayName>
 				<unitPattern count="other">{0} ໄມລ໌ຕໍ່ແກລອນ</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="other">{0} MB</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>TB</displayName>
+				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>Tb</displayName>
 				<unitPattern count="other">{0} Tb</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>TB</displayName>
-				<unitPattern count="other">{0} TB</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>ສັດຕະວັດ</displayName>
+				<unitPattern count="other">{0} ສັດຕະວັດ</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ປີ</displayName>
+				<unitPattern count="other">{0} ປີ</unitPattern>
+				<perUnitPattern>{0} /ປີ</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ເດືອນ</displayName>
+				<unitPattern count="other">{0} ເດືອນ</unitPattern>
+				<perUnitPattern>{0}/ເດືອນ</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ອາທິດ</displayName>
+				<unitPattern count="other">{0} ອາທິດ</unitPattern>
+				<perUnitPattern>{0} ຕໍ່ອາທິດ</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>ມື້</displayName>
 				<unitPattern count="other">{0} ມື້</unitPattern>
+				<perUnitPattern>{0} ຕໍ່ມື້</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>ຊົ່ວໂມງ</displayName>
 				<unitPattern count="other">{0} ຊົ່ວໂມງ</unitPattern>
 				<perUnitPattern>{0} ຕໍ່ຊົ່ວໂມງ</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>ໄມ​ໂຄຣ​ວິ​ນາ​ທີ</displayName>
-				<unitPattern count="other">{0} ໄມ​ໂຄຣ​ວິ​ນາ​ທີ</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ມິນລີວິນາທີ</displayName>
-				<unitPattern count="other">{0} ມິນລີວິນາທີ</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>ນາທີ</displayName>
 				<unitPattern count="other">{0} ນາທີ</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>ເດືອນ</displayName>
-				<unitPattern count="other">{0} ເດືອນ</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ນາ​ໂນ​ວິ​ນາ​ທີ</displayName>
-				<unitPattern count="other">{0} ນາ​ໂນ​ວິ​ນາ​ທີ</unitPattern>
+				<perUnitPattern>{0} ຕໍ່ນາທີ</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>ວິນາທີ</displayName>
 				<unitPattern count="other">{0} ວິນາທີ</unitPattern>
 				<perUnitPattern>{0} ຕໍ່ວິນາທີ</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>ອາທິດ</displayName>
-				<unitPattern count="other">{0} ອາທິດ</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ມິນລີວິນາທີ</displayName>
+				<unitPattern count="other">{0} ມິນລີວິນາທີ</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>ປີ</displayName>
-				<unitPattern count="other">{0} ປີ</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>ໄມ​ໂຄຣ​ວິ​ນາ​ທີ</displayName>
+				<unitPattern count="other">{0} ໄມ​ໂຄຣ​ວິ​ນາ​ທີ</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ນາ​ໂນ​ວິ​ນາ​ທີ</displayName>
+				<unitPattern count="other">{0} ນາ​ໂນ​ວິ​ນາ​ທີ</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amp</displayName>
@@ -6917,6 +7126,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>volt</displayName>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="other">{0} cal</unitPattern>
@@ -6925,18 +7138,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Cal</displayName>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="other">{0} kWh</unitPattern>
@@ -6945,160 +7154,167 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>GHz</displayName>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="other">{0} MHz</unitPattern>
-			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>astronomical units</displayName>
-				<unitPattern count="other">{0} astronomical units</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>ຊັງຕີແມັດ</displayName>
-				<unitPattern count="other">{0} ຊັງຕີແມັດ</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<unitPattern count="other">{0} decimeters</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>ຟຸດ</displayName>
-				<unitPattern count="other">{0} ຟຸດ</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>ນິ້ວ</displayName>
-				<unitPattern count="other">{0} ນິ້ວ</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>ກິໂລແມັດ</displayName>
 				<unitPattern count="other">{0} ກິໂລແມັດ</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ປີແສງ</displayName>
-				<unitPattern count="other">{0} ປີແສງ</unitPattern>
+				<perUnitPattern>{0} ຕໍ່ກິໂລແມັດ</perUnitPattern>
 			</unit>
 			<unit type="length-meter">
 				<displayName>ແມັດ</displayName>
 				<unitPattern count="other">{0} ແມັດ</unitPattern>
+				<perUnitPattern>{0} ຕໍ່ແມັດ</perUnitPattern>
 			</unit>
-			<unit type="length-micrometer">
-				<displayName>micrometers</displayName>
-				<unitPattern count="other">{0} micrometers</unitPattern>
+			<unit type="length-decimeter">
+				<displayName>ເດຊີແມັດ</displayName>
+				<unitPattern count="other">{0} ເດຊີແມັດ</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName>ໄມ</displayName>
-				<unitPattern count="other">{0} ໄມ</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>ຊັງຕີແມັດ</displayName>
+				<unitPattern count="other">{0} ຊັງຕີແມັດ</unitPattern>
+				<perUnitPattern>{0} ຕໍ່ຊັງຕີແມັດ</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>ມິນລິແມັດ</displayName>
 				<unitPattern count="other">{0} ມິນລິແມັດ</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>micrometers</displayName>
+				<unitPattern count="other">{0} micrometers</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>ນາໂນແມັດ</displayName>
 				<unitPattern count="other">{0} ນາໂນແມັດ</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<unitPattern count="other">{0} nautical miles</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsecs</displayName>
-				<unitPattern count="other">{0} parsecs</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>ປິໂກແມັດ</displayName>
 				<unitPattern count="other">{0} ປິໂກແມັດ</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>ໄມ</displayName>
+				<unitPattern count="other">{0} ໄມ</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>ຫລາ</displayName>
 				<unitPattern count="other">{0} ຫລາ</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ຟຸດ</displayName>
+				<unitPattern count="other">{0} ຟຸດ</unitPattern>
+				<perUnitPattern>{0} ຕໍ່ຟຸດ</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>ນິ້ວ</displayName>
+				<unitPattern count="other">{0} ນິ້ວ</unitPattern>
+				<perUnitPattern>{0} ຕໍ່ນິ້ວ</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsecs</displayName>
+				<unitPattern count="other">{0} parsecs</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ປີແສງ</displayName>
+				<unitPattern count="other">{0} ປີແສງ</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>astronomical units</displayName>
+				<unitPattern count="other">{0} astronomical units</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>ໄມລ໌ທະເລ</displayName>
+				<unitPattern count="other">{0} ໄມລ໌ທະເລ</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>ໄມລ໌ສະກັງດີນາວຽນ</displayName>
+				<unitPattern count="other">{0} ໄມລ໌ສະກັງດີນາວຽນ</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>CD</displayName>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>ກຣາມ</displayName>
-				<unitPattern count="other">{0} ກຣາມ</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>ກິໂລກຣາມ</displayName>
-				<unitPattern count="other">{0} ກິໂລກຣາມ</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>ກິໂລກຣາມ</displayName>
+				<unitPattern count="other">{0} ກິໂລກຣາມ</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>ກຣາມ</displayName>
+				<unitPattern count="other">{0} ກຣາມ</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ອອນ</displayName>
-				<unitPattern count="other">{0} ອອນ</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>ປອນ</displayName>
-				<unitPattern count="other">{0} ປອນ</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tn</displayName>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>ປອນ</displayName>
+				<unitPattern count="other">{0} ປອນ</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ອອນ</displayName>
+				<unitPattern count="other">{0} ອອນ</unitPattern>
+				<perUnitPattern>{0} ຕໍ່ ອອນ</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>CD</displayName>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>ແຮງມ້າ</displayName>
-				<unitPattern count="other">{0} ແຮງມ້າ</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>ກິໂລວັດ</displayName>
-				<unitPattern count="other">{0} ກິໂລວັດ</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>ກິໂລວັດ</displayName>
+				<unitPattern count="other">{0} ກິໂລວັດ</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>ວັດ</displayName>
 				<unitPattern count="other">{0} ວັດ</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>ແຮງມ້າ</displayName>
+				<unitPattern count="other">{0} ແຮງມ້າ</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hectopascals</displayName>
 				<unitPattern count="other">{0} hectopascals</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inches of mercury</displayName>
-				<unitPattern count="other">{0} inches of mercury</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>ມິນລິບາ</displayName>
-				<unitPattern count="other">{0} ມິນລິບາ</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="other">{0} mm Hg</unitPattern>
@@ -7107,9 +7323,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>pounds per square inch</displayName>
 				<unitPattern count="other">{0} pounds per square inch</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>ກະຣັດ</displayName>
-				<unitPattern count="other">{0} ກະຣັດ</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>in Hg</displayName>
+				<unitPattern count="other">{0} inches of mercury</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>ມິນລິບາ</displayName>
+				<unitPattern count="other">{0} ມິນລິບາ</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>ກິໂລແມັດຕໍ່ຊົ່ວໂມງ</displayName>
@@ -7123,6 +7343,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ໄມລ໌ຕໍ່ຊົ່ວໂມງ</displayName>
 				<unitPattern count="other">{0} ໄມລ໌ຕໍ່ຊົ່ວໂມງ</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>knot</displayName>
+				<unitPattern count="other">{0} knots</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>ອົງສາເຊວຊຽສ</displayName>
 				<unitPattern count="other">{0} ອົງສາເຊວຊຽສ</unitPattern>
@@ -7135,33 +7363,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ອົງສາເຄວິນ</displayName>
 				<unitPattern count="other">{0} ອົງສາເຄວິນ</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cL</displayName>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>ກິໂລແມັດກ້ອນ</displayName>
 				<unitPattern count="other">{0} ກິໂລແມັດກ້ອນ</unitPattern>
 			</unit>
 			<unit type="volume-cubic-meter">
-				<displayName>m³</displayName>
-				<unitPattern count="other">{0} m³</unitPattern>
+				<displayName>ແມັດກ້ອນ</displayName>
+				<unitPattern count="other">{0} ແມັດກ້ອນ</unitPattern>
+				<perUnitPattern>{0} ຕໍ່ມ³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>ໄມລ໌ກ້ອນ</displayName>
@@ -7171,21 +7385,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>yd³</displayName>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>cup</displayName>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -7194,23 +7404,53 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-liter">
 				<displayName>ລິດ</displayName>
 				<unitPattern count="other">{0} ລິດ</unitPattern>
+				<perUnitPattern>{0} ຕໍ່ລິດ</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>metric pints</displayName>
+				<unitPattern count="other">{0} metric pints</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="other">{0} metric cups</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0} per gallon</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cup</displayName>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>tbsp</displayName>
 				<unitPattern count="other">{0} tbsp</unitPattern>
@@ -7219,19 +7459,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>tsp</displayName>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
 				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
-				<displayName>ແຮງຈີ</displayName>
+				<displayName>ແຮງຕົກຕາມລຳພັງ</displayName>
 				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
 				<displayName>m/s²</displayName>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="other">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radians</displayName>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>ອົງສາ</displayName>
+				<unitPattern count="other">{0} ອົງສາ</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>arcmins</displayName>
 				<unitPattern count="other">{0} arcmins</unitPattern>
@@ -7240,25 +7498,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>arcsecs</displayName>
 				<unitPattern count="other">{0} arcsecs</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>ອົງສາ</displayName>
-				<unitPattern count="other">{0} ອົງສາ</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radians</displayName>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ເອເຄີ</displayName>
-				<unitPattern count="other">{0} ເອເຄີ</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>ກມ²</displayName>
+				<unitPattern count="other">{0} ກມ²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ເຮັກຕາ</displayName>
 				<unitPattern count="other">{0} ຮຕ.</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>ແມັດ²</displayName>
+				<unitPattern count="other">{0} ມ²</unitPattern>
+				<perUnitPattern>{0}/ມ²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>ຊມ²</displayName>
 				<unitPattern count="other">{0} ຊມ²</unitPattern>
+				<perUnitPattern>{0}/ຊມ²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>sq miles</displayName>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ເອເຄີ</displayName>
+				<unitPattern count="other">{0} ເອເຄີ</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yards²</displayName>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ຟຸດ²</displayName>
@@ -7267,112 +7535,114 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="area-square-inch">
 				<displayName>ນິ້ວ²</displayName>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>ກມ²</displayName>
-				<unitPattern count="other">{0} ກມ²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>ແມັດ²</displayName>
-				<unitPattern count="other">{0} ແມັດ²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>sq miles</displayName>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yards²</displayName>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>ກະຣັດ</displayName>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ລ/ກມ</displayName>
 				<unitPattern count="other">{0} ລ/ກມ</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ລ/ 100 ກມ</displayName>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>ໄມລ໌/ແກລ</displayName>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>c</displayName>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ປີ</displayName>
+				<unitPattern count="other">{0} ປີ</unitPattern>
+				<perUnitPattern>{0}/y</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ເດືອນ</displayName>
+				<unitPattern count="other">{0} ດ.</unitPattern>
+				<perUnitPattern>{0}/ເດືອນ</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ອາທິດ</displayName>
+				<unitPattern count="other">{0} ອທ.</unitPattern>
+				<perUnitPattern>{0}/ອາທິດ</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ມື້</displayName>
 				<unitPattern count="other">{0} ມື້</unitPattern>
+				<perUnitPattern>{0}/ມື້</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>ຊົ່ວໂມງ</displayName>
 				<unitPattern count="other">{0} ຊມ.</unitPattern>
 				<perUnitPattern>{0}/ຊມ.</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μວິ</displayName>
-				<unitPattern count="other">{0} μວິ</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ມິນລີວິ</displayName>
-				<unitPattern count="other">{0} ມລວ</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>ນທ.</displayName>
 				<unitPattern count="other">{0} ນທ.</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>ເດືອນ</displayName>
-				<unitPattern count="other">{0} ດ.</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ນາ​ໂນ​ວິ​</displayName>
-				<unitPattern count="other">{0} ນນ​ວິ</unitPattern>
+				<perUnitPattern>{0}/ນາທີ</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>ວິ.</displayName>
 				<unitPattern count="other">{0} ວິ.</unitPattern>
 				<perUnitPattern>{0}/ວິ.</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>ອາທິດ</displayName>
-				<unitPattern count="other">{0} ອທ.</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ມິນລີວິ</displayName>
+				<unitPattern count="other">{0} ມລວ</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>ປີ</displayName>
-				<unitPattern count="other">{0} ປີ</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μວິ</displayName>
+				<unitPattern count="other">{0} μວິ</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ນາ​ໂນ​ວິ​</displayName>
+				<unitPattern count="other">{0} ນນ​ວິ</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amp</displayName>
@@ -7390,6 +7660,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>volt</displayName>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="other">{0} cal</unitPattern>
@@ -7398,18 +7672,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Cal</displayName>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="other">{0} kWh</unitPattern>
@@ -7418,162 +7688,167 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>GHz</displayName>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>ກມ</displayName>
+				<unitPattern count="other">{0} ກມ</unitPattern>
+				<perUnitPattern>{0}/ກິໂລແມັດ</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>ຊມ</displayName>
-				<unitPattern count="other">{0} ຊມ</unitPattern>
+			<unit type="length-meter">
+				<displayName>ແມັດ</displayName>
+				<unitPattern count="other">{0} ມ</unitPattern>
+				<perUnitPattern>{0}/ແມັດ</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ຟຸດ</displayName>
-				<unitPattern count="other">{0} ຟ</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>ນິ້ວ</displayName>
-				<unitPattern count="other">{0} ນິ</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>ກມ</displayName>
-				<unitPattern count="other">{0} ກມ</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ປີແສງ</displayName>
-				<unitPattern count="other">{0} ປສ</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>ແມັດ</displayName>
-				<unitPattern count="other">{0} ມ</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>ໄມ</displayName>
-				<unitPattern count="other">{0} ໄມ</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>ຊມ</displayName>
+				<unitPattern count="other">{0} ຊມ</unitPattern>
+				<perUnitPattern>{0}/ຊັງຕີແມັດ</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>ມມ</displayName>
 				<unitPattern count="other">{0} ມມ</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsecs</displayName>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>ໄມ</displayName>
+				<unitPattern count="other">{0} ໄມ</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>ຫລາ</displayName>
 				<unitPattern count="other">{0} ຫລາ</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ຟຸດ</displayName>
+				<unitPattern count="other">{0} ຟ</unitPattern>
+				<perUnitPattern>{0}/ຟຸດ</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>ນິ້ວ</displayName>
+				<unitPattern count="other">{0} ນິ</unitPattern>
+				<perUnitPattern>{0}/ນີວ</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsecs</displayName>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ປີແສງ</displayName>
+				<unitPattern count="other">{0} ປສ</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>CD</displayName>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>ກຣາມ</displayName>
-				<unitPattern count="other">{0} ກຼ</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>ກິໂລກຣາມ</displayName>
-				<unitPattern count="other">{0} ກິໂລ</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>ກິໂລກຣາມ</displayName>
+				<unitPattern count="other">{0} ກິໂລ</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>ກຣາມ</displayName>
+				<unitPattern count="other">{0} ກຼ</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ອອນ</displayName>
-				<unitPattern count="other">{0} ອ</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>ປອນ</displayName>
-				<unitPattern count="other">{0} ປ</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tn</displayName>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>ປອນ</displayName>
+				<unitPattern count="other">{0} ປ</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ອອນ</displayName>
+				<unitPattern count="other">{0} ອ</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>CD</displayName>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>ແຮງມ້າ</displayName>
-				<unitPattern count="other">{0} hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>ກິໂລວັດ</displayName>
-				<unitPattern count="other">{0} ກລ. ວັດ</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>ກິໂລວັດ</displayName>
+				<unitPattern count="other">{0} ກລ. ວັດ</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>ວັດ</displayName>
 				<unitPattern count="other">{0} ວັດ</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>ແຮງມ້າ</displayName>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPA</displayName>
 				<unitPattern count="other">{0} hPA</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>in Hg</displayName>
-				<unitPattern count="other">{0} in Hg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="other">{0} mm Hg</unitPattern>
@@ -7582,9 +7857,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>psi</displayName>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>ກະຣັດ</displayName>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>in Hg</displayName>
+				<unitPattern count="other">{0} in Hg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>ກມ/ຊມ</displayName>
@@ -7598,6 +7877,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ໄມລ໌/ຊົ່ວໂມງ</displayName>
 				<unitPattern count="other">{0} ມ/ຊມ</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>ອົງ​ສາ ຊ.</displayName>
 				<unitPattern count="other">{0} ອົງສາ ຊີ.</unitPattern>
@@ -7610,33 +7897,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ອົງສາ ເຄ.</displayName>
 				<unitPattern count="other">{0}°K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cL</displayName>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="other">{0} km³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-meter">
-				<displayName>m³</displayName>
-				<unitPattern count="other">{0} m³</unitPattern>
+				<displayName>ມ³</displayName>
+				<unitPattern count="other">{0} ມ³</unitPattern>
+				<perUnitPattern>{0}/ມ³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -7646,21 +7919,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>yd³</displayName>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>cup</displayName>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -7669,23 +7938,53 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-liter">
 				<displayName>ລິດ</displayName>
 				<unitPattern count="other">{0} ລິດ</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cup</displayName>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>tbsp</displayName>
 				<unitPattern count="other">{0} tbsp</unitPattern>
@@ -7694,33 +7993,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>tsp</displayName>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
 				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
+			<unit type="angle-degree">
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="other">{0}′</unitPattern>
 			</unit>
 			<unit type="angle-arc-second">
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="other">{0} ac</unitPattern>
-			</unit>
-			<unit type="area-hectare">
-				<unitPattern count="other">{0} ຮຕ</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
 			<unit type="area-square-kilometer">
 				<displayName>ກມ²</displayName>
 				<unitPattern count="other">{0} ກມ²</unitPattern>
 			</unit>
+			<unit type="area-hectare">
+				<unitPattern count="other">{0} ຮຕ</unitPattern>
+			</unit>
 			<unit type="area-square-meter">
 				<displayName>ແມັດ²</displayName>
 				<unitPattern count="other">{0} ແມັດ²</unitPattern>
@@ -7728,6 +8027,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="area-square-mile">
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ລ/ 100 ກມ</displayName>
+				<unitPattern count="other">{0} ລ / 100 ກມ</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ປີ</displayName>
+				<unitPattern count="other">{0} ປ</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ເດືອນ</displayName>
+				<unitPattern count="other">{0} ດ.</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ອທ.</displayName>
+				<unitPattern count="other">{0} ອທ.</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ມື້</displayName>
 				<unitPattern count="other">{0} ມ.</unitPattern>
@@ -7736,57 +8057,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ຊົ່ວໂມງ</displayName>
 				<unitPattern count="other">{0} ຊມ</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ມລວ</displayName>
-				<unitPattern count="other">{0} ມລ. ວິ.</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>ນທ.</displayName>
 				<unitPattern count="other">{0} ນທ</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>ເດືອນ</displayName>
-				<unitPattern count="other">{0} ດ.</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>ວິ.</displayName>
 				<unitPattern count="other">{0} ວິ</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>ອທ.</displayName>
-				<unitPattern count="other">{0} ອທ.</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>ປີ</displayName>
-				<unitPattern count="other">{0} ປ</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>ຊມ</displayName>
-				<unitPattern count="other">{0} ຊມ</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>ຟຸດ</displayName>
-				<unitPattern count="other">{0} ຟ</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>ນິ້ວ</displayName>
-				<unitPattern count="other">{0} ນ</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ມລວ</displayName>
+				<unitPattern count="other">{0} ມລ. ວິ.</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>ກມ</displayName>
 				<unitPattern count="other">{0} ກມ</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<displayName>ປີແສງ</displayName>
-				<unitPattern count="other">{0} ປສ</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>ແມັດ</displayName>
 				<unitPattern count="other">{0} ມ</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName>ໄມ</displayName>
-				<unitPattern count="other">{0} ໄມ</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>ຊມ</displayName>
+				<unitPattern count="other">{0} ຊມ</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>ມມ</displayName>
@@ -7796,26 +8089,39 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>pm</displayName>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>ໄມ</displayName>
+				<unitPattern count="other">{0} ໄມ</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>ຫລາ</displayName>
 				<unitPattern count="other">{0} ຫລາ</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>ກຣາມ</displayName>
-				<unitPattern count="other">{0} ກຼ</unitPattern>
+			<unit type="length-foot">
+				<displayName>ຟຸດ</displayName>
+				<unitPattern count="other">{0} ຟ</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>ນິ້ວ</displayName>
+				<unitPattern count="other">{0} ນ</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ປີແສງ</displayName>
+				<unitPattern count="other">{0} ປສ</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>ກິໂລກຣາມ</displayName>
 				<unitPattern count="other">{0} ກລ</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="other">{0} ອ</unitPattern>
+			<unit type="mass-gram">
+				<displayName>ກຣາມ</displayName>
+				<unitPattern count="other">{0} ກຼ</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="other">{0} ປ</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="other">{0} hp</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="other">{0} ອ</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="other">{0} kW</unitPattern>
@@ -7823,6 +8129,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="power-watt">
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPA</displayName>
 				<unitPattern count="other">{0} hPA</unitPattern>
@@ -7863,6 +8172,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ລິດ</displayName>
 				<unitPattern count="other">{0} ລ</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
@@ -7887,11 +8202,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<listPatternPart type="end">{0}, {1}</listPatternPart>
 			<listPatternPart type="2">{0}, {1}</listPatternPart>
 		</listPattern>
+		<listPattern type="unit-narrow">
+			<listPatternPart type="start">{0} {1}</listPatternPart>
+			<listPatternPart type="middle">{0} {1}</listPatternPart>
+			<listPatternPart type="end">{0} {1}</listPatternPart>
+			<listPatternPart type="2">{0} {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-short">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
+		</listPattern>
 	</listPatterns>
 	<posix>
 		<messages>
-			<yesstr>ແມ່ນ</yesstr>
-			<nostr>ບໍ່ແມ່ນ</nostr>
+			<yesstr>yes:y</yesstr>
+			<nostr>no:n</nostr>
 		</messages>
 	</posix>
 </ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lo_LA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lo_LA.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lo_LA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lo_LA.xml
index aa6cb4819a4..174f5dc3efd 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lo_LA.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lo_LA.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="lo"/>
 		<territory type="LA"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc.xml
new file mode 100644
index 00000000000..8c0ebee7d46
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc.xml
@@ -0,0 +1,855 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12307 $"/>
+		<language type="lrc"/>
+	</identity>
+	<localeDisplayNames>
+		<localeDisplayPattern>
+			<localePattern>{0} ({1})</localePattern>
+			<localeSeparator>{0}, {1}</localeSeparator>
+			<localeKeyTypePattern>{0}: {1}</localeKeyTypePattern>
+		</localeDisplayPattern>
+		<languages>
+			<language type="ab">آذأربایئجانی</language>
+			<language type="af">آفریکانس</language>
+			<language type="agq">آقئم</language>
+			<language type="ak">آکان</language>
+			<language type="am">أمھأری</language>
+			<language type="ar">أرأڤی</language>
+			<language type="ar_001">عروی مدرن</language>
+			<language type="arn">ماپوٙچئ</language>
+			<language type="as">آسامی</language>
+			<language type="asa">آسوٙ</language>
+			<language type="az">آذأربایئجانی ھارگە</language>
+			<language type="az" alt="short">آذأری</language>
+			<language type="az_Arab">آذأری ھارگە</language>
+			<language type="ba">باشکیری</language>
+			<language type="be">بئلاروٙسی</language>
+			<language type="bem">بیما</language>
+			<language type="bez">بئنا</language>
+			<language type="bg">بولغاری</language>
+			<language type="bgn">بألوٙچی أقتوٙنئشین</language>
+			<language type="bm">بامبارا</language>
+			<language type="bn">بأنگالی</language>
+			<language type="bo">تأبأتی</language>
+			<language type="br">بئرئتون</language>
+			<language type="brx">بودو</language>
+			<language type="bs">بوسنیایی</language>
+			<language type="ca">کاتالان</language>
+			<language type="ce">چئچئنی</language>
+			<language type="cgg">چیگا</language>
+			<language type="chr">چوروٙکی</language>
+			<language type="ckb">کوردی سوٙرانی</language>
+			<language type="co">کوریسکان</language>
+			<language type="cv">چواشی</language>
+			<language type="cy">ڤئلزی</language>
+			<language type="da">دانمارکی</language>
+			<language type="dav">تایتا</language>
+			<language type="de">آلمانی</language>
+			<language type="de_AT">آلمانی ئوتریشی</language>
+			<language type="de_CH">آلمانی سوٙییسی</language>
+			<language type="dje">زارما</language>
+			<language type="dsb">سوربی ھاری</language>
+			<language type="dua">دوٙالا</language>
+			<language type="dyo">جولا فوٙنیی</language>
+			<language type="dz">زوٙنگخا</language>
+			<language type="ebu">ئمبو</language>
+			<language type="ee">ئڤئ</language>
+			<language type="el">یوٙنانی</language>
+			<language type="en">ئینگیلیسی</language>
+			<language type="en_AU">ئینگیلیسی ئوستارالیایی</language>
+			<language type="en_CA">ئینگیلیسی کانادایی</language>
+			<language type="en_GB">ئینگیلیسی بئریتانیایی</language>
+			<language type="en_GB" alt="short">ئینگیلیسی بئریتانیا گأپ</language>
+			<language type="en_US">ئینگیلیسی ئمریکایی</language>
+			<language type="en_US" alt="short">ئینگیلیسی ئمریکایی</language>
+			<language type="eo">ئسپئرانتو</language>
+			<language type="es">ئسپانیایی</language>
+			<language type="es_419">ئسپانیایی ئمریکا لاتین</language>
+			<language type="es_ES">ئسپانیایی ئوروٙپا</language>
+			<language type="es_MX">ئسپانیایی مئکزیک</language>
+			<language type="et">ئستونیایی</language>
+			<language type="eu">باسکی</language>
+			<language type="fa">فارسی</language>
+			<language type="fi">فأنلاندی</language>
+			<language type="fil">فیلیپینی</language>
+			<language type="fj">فیجی</language>
+			<language type="fo">فاروٙسی</language>
+			<language type="fr">فآرانسئ ئی</language>
+			<language type="fr_CA">فآرانسئ ئی کانادا</language>
+			<language type="fr_CH">فآرانسئ ئی سوٙییس</language>
+			<language type="fy">فئریسی أفتونئشین</language>
+			<language type="ga">ئیرلأندی</language>
+			<language type="gag">گاگائوز</language>
+			<language type="gl">گالیسی</language>
+			<language type="gn">گوٙآرانی</language>
+			<language type="gsw">آلمانی سوٙئیسی</language>
+			<language type="gu">گوجأراتی</language>
+			<language type="guz">گوٙسی</language>
+			<language type="gv">مانکس</language>
+			<language type="ha">ھائوسا</language>
+			<language type="haw">ھاڤایی</language>
+			<language type="he">عئبری</language>
+			<language type="hi">ھئنی</language>
+			<language type="hr">کوروڤاتی</language>
+			<language type="hsb">سوربی ڤارو</language>
+			<language type="ht">ھاییتی</language>
+			<language type="hu">مأجاری</language>
+			<language type="hy">أرمأنی</language>
+			<language type="id">أندونئزیایی</language>
+			<language type="ig">ئیگبو</language>
+			<language type="ii">سی چوان یی</language>
+			<language type="is">ئیسلأندی</language>
+			<language type="it">ئیتالیایی</language>
+			<language type="iu">ئینوکتیتوٙت</language>
+			<language type="ja">جاپوٙنی</language>
+			<language type="jgo">نئگوٙمبا</language>
+			<language type="jmc">ماچامئ</language>
+			<language type="jv">جاڤئ یی</language>
+			<language type="ka">گورجی</language>
+			<language type="kab">کابیلئ</language>
+			<language type="kam">کامبا</language>
+			<language type="kde">ماکوٙندئ</language>
+			<language type="kea">کاباردینو</language>
+			<language type="khq">کی یورا چینی</language>
+			<language type="ki">کیکیوٙ</language>
+			<language type="kk">قأزاق</language>
+			<language type="kl">کالالیسوٙت</language>
+			<language type="kln">کالئجین</language>
+			<language type="km">خئمئر</language>
+			<language type="kn">کاناد</language>
+			<language type="ko">کورئ یی</language>
+			<language type="koi">کومی پئرمیاک</language>
+			<language type="kok">کوٙنکانی</language>
+			<language type="ks">کأشمیری</language>
+			<language type="ksb">شامبالا</language>
+			<language type="ksf">بافیا</language>
+			<language type="ku">کوردی کورمانجی</language>
+			<language type="kw">کورنیش</language>
+			<language type="ky">قئرقیزی</language>
+			<language type="la">لاتین</language>
+			<language type="lag">لانگی</language>
+			<language type="lb">لوٙکزامبوٙرگی</language>
+			<language type="lg">گاندا</language>
+			<language type="lkt">لاکوٙتا</language>
+			<language type="ln">لینگالا</language>
+			<language type="lo">لاو</language>
+			<language type="lrc">لۊری شومالی</language>
+			<language type="lt">لیتوڤانیایی</language>
+			<language type="lu">لوٙبا کاتانگا</language>
+			<language type="luo">لوٙ</language>
+			<language type="luy">لوٙئیا</language>
+			<language type="lv">لاتوڤیایی</language>
+			<language type="mas">ماسایی</language>
+			<language type="mer">مئرو</language>
+			<language type="mfe">موٙریسی</language>
+			<language type="mg">مالاگاشی</language>
+			<language type="mgh">ماخوڤا میتو</language>
+			<language type="mgo">مئتاٛ</language>
+			<language type="mi">مائوری</language>
+			<language type="mk">مأقدوٙنی</language>
+			<language type="ml">مالایام</language>
+			<language type="mn">موغولی</language>
+			<language type="moh">موٙھاڤک</language>
+			<language type="mr">مأراتی</language>
+			<language type="ms">مالایی</language>
+			<language type="mt">مالتی</language>
+			<language type="mua">موٙندانگ</language>
+			<language type="my">بئرمئ یی</language>
+			<language type="mzn">مازأندأرانی</language>
+			<language type="naq">ناما</language>
+			<language type="nb">نورڤئجی بوٙکمال</language>
+			<language type="nd">نئدئبئلئ شومالی</language>
+			<language type="nds">آلمانی ھاری</language>
+			<language type="nds_NL">آلمانی ھارگە جا</language>
+			<language type="ne">نئپالی</language>
+			<language type="nl">ھولأندی</language>
+			<language type="nl_BE">فئلاماندی</language>
+			<language type="nmg">کئڤاسیوٙ</language>
+			<language type="nn">نورڤئجی نینورسک</language>
+			<language type="nqo">نئکوٙ</language>
+			<language type="nus">نیوٙئر</language>
+			<language type="nyn">نیان کوٙلئ</language>
+			<language type="om">ئوروموٙ</language>
+			<language type="or">ئوریا</language>
+			<language type="pa">پأنجابی</language>
+			<language type="pl">لأھئستانی</language>
+			<language type="ps">پأشتوٙ</language>
+			<language type="pt">پورتئغالی</language>
+			<language type="pt_BR">پورتئغالی بئرئزیل</language>
+			<language type="pt_PT">پورتئغالی ئوروٙپایی</language>
+			<language type="qu">کوچوٙا</language>
+			<language type="quc">کیچی</language>
+			<language type="rm">رومانش</language>
+			<language type="rn">راندی</language>
+			<language type="ro">رومانیایی</language>
+			<language type="ro_MD">رومانیایی مولداڤی</language>
+			<language type="rof">رومبو</language>
+			<language type="ru">روٙسی</language>
+			<language type="rw">کینیاروآندا</language>
+			<language type="rwk">رئڤا</language>
+			<language type="sa">سانسکئریت</language>
+			<language type="saq">سامبوٙروٙ</language>
+			<language type="sbp">سانگوٙ</language>
+			<language type="sd">سئندی</language>
+			<language type="sdh">کوردی ھارگە</language>
+			<language type="se">سامی شومالی</language>
+			<language type="seh">سئنا</language>
+			<language type="ses">کیارابورو سئنی</language>
+			<language type="sg">سانگو</language>
+			<language type="shi">تاچئلھیت</language>
+			<language type="si">سینھالا</language>
+			<language type="sk">ئسلوڤاکی</language>
+			<language type="sl">ئسلوڤئنیایی</language>
+			<language type="sma">سامی ھارگە</language>
+			<language type="smj">لۉلئ سامی</language>
+			<language type="smn">ئیناری سامی</language>
+			<language type="sms">ئسکولت سامی</language>
+			<language type="sn">شونا</language>
+			<language type="so">سوٙمالی</language>
+			<language type="sq">آلبانی</language>
+			<language type="sr">سئربی</language>
+			<language type="su">سوٙدانی</language>
+			<language type="sv">سوٙئدی</language>
+			<language type="sw">سأڤاحیلی</language>
+			<language type="sw_CD">سأڤاحیلی کونگو</language>
+			<language type="ta">تامیل</language>
+			<language type="te">تئلئگو</language>
+			<language type="teo">تئسو</language>
+			<language type="tg">تاجیکی</language>
+			<language type="th">تایلأندی</language>
+			<language type="ti">تیگرینیا</language>
+			<language type="tk">تورکأمأنی</language>
+			<language type="to">توٙنگان</language>
+			<language type="tr">تورکی</language>
+			<language type="tt">تاتار</language>
+			<language type="twq">تاساڤاق</language>
+			<language type="tzm">تامازیغ مینجایی</language>
+			<language type="ug">ئویغوٙر</language>
+			<language type="uk">ئوکراینی</language>
+			<language type="und">زوٙن نادیار</language>
+			<language type="ur">ئوردوٙ</language>
+			<language type="uz">ئوزبأکی</language>
+			<language type="vai">ڤای</language>
+			<language type="vi">ڤییئتنامی</language>
+			<language type="vun">ڤوٙنجوٙ</language>
+			<language type="wbp">ڤارلپیری</language>
+			<language type="wo">ڤولوف</language>
+			<language type="xh">خوٙسا</language>
+			<language type="xog">سوٙگا</language>
+			<language type="yo">یوروبا</language>
+			<language type="zgh">تامازیغ مأراکئشی</language>
+			<language type="zh">چینی</language>
+			<language type="zh_Hans">چینی سادە بیە</language>
+			<language type="zh_Hant">چینی سونأتی</language>
+			<language type="zu">زولو</language>
+			<language type="zxx">بی نئشوٙ</language>
+		</languages>
+		<scripts>
+			<script type="Arab">عأرأڤی</script>
+			<script type="Armn">أرمأنی</script>
+			<script type="Beng">بأنگالی</script>
+			<script type="Bopo">بوٙپوٙ</script>
+			<script type="Brai">بئرئیل</script>
+			<script type="Cyrl">سیریلیک</script>
+			<script type="Deva">دیڤانگأری</script>
+			<script type="Ethi">ئتوٙیوٙپیایی</script>
+			<script type="Geor">گورجی</script>
+			<script type="Grek">یوٙنانی</script>
+			<script type="Gujr">گوجأراتی</script>
+			<script type="Guru">گوٙروٙمخی</script>
+			<script type="Hang">ھانگوٙل</script>
+			<script type="Hani">ھانی</script>
+			<script type="Hans">سادە بیە</script>
+			<script type="Hans" alt="stand-alone">بیتار سادە بیە</script>
+			<script type="Hant">سونأتی</script>
+			<script type="Hant" alt="stand-alone">سونأتی بیتار</script>
+			<script type="Hebr">عئبری</script>
+			<script type="Hira">ھیراگانا</script>
+			<script type="Jpan">جاپوٙنی</script>
+			<script type="Kana">کاتانگا</script>
+			<script type="Khmr">خئمئر</script>
+			<script type="Knda">کانادا</script>
+			<script type="Kore">کورئ یی</script>
+			<script type="Laoo">لائو</script>
+			<script type="Latn">لاتین</script>
+			<script type="Mlym">مالایام</script>
+			<script type="Mong">موغولی</script>
+			<script type="Mymr">میانمار</script>
+			<script type="Orya">ئوریا</script>
+			<script type="Sinh">سیناھالا</script>
+			<script type="Taml">تامیل</script>
+			<script type="Telu">تئلئگو</script>
+			<script type="Thaa">تانا</script>
+			<script type="Thai">تایلأندی</script>
+			<script type="Tibt">تأبأتی</script>
+			<script type="Zsym">نئشوٙنە یا</script>
+			<script type="Zxxx">نیسئسە نأبیە</script>
+			<script type="Zyyy">جائوفتاأ</script>
+			<script type="Zzzz">نیسئسە نادیار</script>
+		</scripts>
+		<territories>
+			<territory type="001">دونیا</territory>
+			<territory type="002">ئفریقا</territory>
+			<territory type="003">ئمریکا شومالی</territory>
+			<territory type="005">ئمریکا ھارگە</territory>
+			<territory type="009">ھوم پئڤأند جأھوٙن آڤ</territory>
+			<territory type="013">مینجا ئمریکا</territory>
+			<territory type="019">ئمریکا</territory>
+			<territory type="021">ئمریکا ڤارو</territory>
+			<territory type="029">کارائیب</territory>
+			<territory type="142">آسیا</territory>
+			<territory type="150">ئوروٙپا</territory>
+			<territory type="419">ئمریکا لاتین</territory>
+			<territory type="BR">بئرئزیل</territory>
+			<territory type="CN">چین</territory>
+			<territory type="DE">آلمان</territory>
+			<territory type="FR">فأرانسە</territory>
+			<territory type="GB">بیریتانیا گأپ</territory>
+			<territory type="IN">ھئن</territory>
+			<territory type="IT">ئیتالیا</territory>
+			<territory type="JP">جاپوٙن</territory>
+			<territory type="RU">روٙسیە</territory>
+			<territory type="US">ڤولاتیا یأکاگئرتە</territory>
+			<territory type="ZZ">راساگە نادیار</territory>
+		</territories>
+		<types>
+			<type key="calendar" type="gregorian">تأقڤیم گأرئگوٙری</type>
+			<type key="collation" type="standard">کوٙلاتی ئستاندارد</type>
+			<type key="numbers" type="arab">أدأدیا عأرأڤی</type>
+			<type key="numbers" type="latn">عأدأدیا لاتین</type>
+		</types>
+		<measurementSystemNames>
+			<measurementSystemName type="metric">مئتری</measurementSystemName>
+			<measurementSystemName type="UK">بئریتانیا گأپ</measurementSystemName>
+			<measurementSystemName type="US">ڤولاتیا یأکاگئرته</measurementSystemName>
+		</measurementSystemNames>
+		<codePatterns>
+			<codePattern type="language">{0}</codePattern>
+			<codePattern type="script">{0}</codePattern>
+			<codePattern type="territory">{0}</codePattern>
+		</codePatterns>
+	</localeDisplayNames>
+	<layout>
+		<orientation>
+			<characterOrder>right-to-left</characterOrder>
+			<lineOrder>top-to-bottom</lineOrder>
+		</orientation>
+	</layout>
+	<characters>
+		<exemplarCharacters>[\u0659 \u065B آ أ ؤ ئ ا ب پ ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ڤ ق ک گ ل م ن ھ ە و ۉ ۊ ی ؽ]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[\u200B\u200C\u200D\u200E\u200F \u064B \u064C \u064D \u064E \u064F \u0650 \u0651 \u0652 \u0654 إ ة ك ه ى ي]</exemplarCharacters>
+		<exemplarCharacters type="index">[آ ا ب پ ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ھ و ی]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐ ، ٫ ٬ ؛ \: ! ؟ . … ‹ › « » ( ) \[ \] * / \\]</exemplarCharacters>
+	</characters>
+	<delimiters>
+		<quotationStart>“</quotationStart>
+		<quotationEnd>”</quotationEnd>
+		<alternateQuotationStart>‘</alternateQuotationStart>
+		<alternateQuotationEnd>’</alternateQuotationEnd>
+	</delimiters>
+	<dates>
+		<calendars>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G y MMMM d, EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G y MMMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G y MMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>GGGGG y-MM-dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<intervalFormats>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">جانڤیە</month>
+							<month type="2">فئڤریە</month>
+							<month type="3">مارس</month>
+							<month type="4">آڤریل</month>
+							<month type="5">مئی</month>
+							<month type="6">جوٙأن</month>
+							<month type="7">جوٙلا</month>
+							<month type="8">آگوست</month>
+							<month type="9">سئپتامر</month>
+							<month type="10">ئوکتوڤر</month>
+							<month type="11">نوڤامر</month>
+							<month type="12">دئسامر</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">1</month>
+							<month type="2">2</month>
+							<month type="3">3</month>
+							<month type="4">4</month>
+							<month type="5">5</month>
+							<month type="6">6</month>
+							<month type="7">7</month>
+							<month type="8">8</month>
+							<month type="9">9</month>
+							<month type="10">10</month>
+							<month type="11">11</month>
+							<month type="12">12</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">جانڤیە</month>
+							<month type="2">فئڤریە</month>
+							<month type="3">مارس</month>
+							<month type="4">آڤریل</month>
+							<month type="5">مئی</month>
+							<month type="6">جوٙأن</month>
+							<month type="7">جوٙلا</month>
+							<month type="8">آگوست</month>
+							<month type="9">سئپتامر</month>
+							<month type="10">ئوکتوڤر</month>
+							<month type="11">نوڤامر</month>
+							<month type="12">دئسامر</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">جانڤیە</month>
+							<month type="2">فئڤریە</month>
+							<month type="3">مارس</month>
+							<month type="4">آڤریل</month>
+							<month type="5">مئی</month>
+							<month type="6">جوٙأن</month>
+							<month type="7">جوٙلا</month>
+							<month type="8">آگوست</month>
+							<month type="9">سئپتامر</month>
+							<month type="10">ئوکتوڤر</month>
+							<month type="11">نوڤامر</month>
+							<month type="12">دئسامر</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">1</month>
+							<month type="2">2</month>
+							<month type="3">3</month>
+							<month type="4">4</month>
+							<month type="5">5</month>
+							<month type="6">6</month>
+							<month type="7">7</month>
+							<month type="8">8</month>
+							<month type="9">9</month>
+							<month type="10">10</month>
+							<month type="11">11</month>
+							<month type="12">12</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">جانڤیە</month>
+							<month type="2">فئڤریە</month>
+							<month type="3">مارس</month>
+							<month type="4">آڤریل</month>
+							<month type="5">مئی</month>
+							<month type="6">جوٙأن</month>
+							<month type="7">جوٙلا</month>
+							<month type="8">آگوست</month>
+							<month type="9">سئپتامر</month>
+							<month type="10">ئوکتوڤر</month>
+							<month type="11">نوڤامر</month>
+							<month type="12">دئسامر</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<quarters>
+					<quarterContext type="format">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">Q1</quarter>
+							<quarter type="2">Q2</quarter>
+							<quarter type="3">Q3</quarter>
+							<quarter type="4">Q4</quarter>
+						</quarterWidth>
+						<quarterWidth type="narrow">
+							<quarter type="1">1</quarter>
+							<quarter type="2">2</quarter>
+							<quarter type="3">3</quarter>
+							<quarter type="4">4</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1">Q1</quarter>
+							<quarter type="2">Q2</quarter>
+							<quarter type="3">Q3</quarter>
+							<quarter type="4">Q4</quarter>
+						</quarterWidth>
+					</quarterContext>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">چارأک أڤأل</quarter>
+							<quarter type="2">Q2</quarter>
+							<quarter type="3">Q3</quarter>
+							<quarter type="4">Q4</quarter>
+						</quarterWidth>
+						<quarterWidth type="narrow">
+							<quarter type="1">1</quarter>
+							<quarter type="2">2</quarter>
+							<quarter type="3">3</quarter>
+							<quarter type="4">4</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1">چارأک أڤأل</quarter>
+							<quarter type="2">چارأک دویوم</quarter>
+							<quarter type="3">چارأک سئیوم</quarter>
+							<quarter type="4">چارأک چاروم</quarter>
+						</quarterWidth>
+					</quarterContext>
+				</quarters>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<eras>
+					<eraAbbr>
+						<era type="0">BCE</era>
+						<era type="1">CE</era>
+					</eraAbbr>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>y MMMM d, EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>y MMMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>y MMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>y-MM-dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<intervalFormats>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="era">
+				<displayName>سأرۉ</displayName>
+			</field>
+			<field type="year">
+				<displayName>سال</displayName>
+			</field>
+			<field type="year-short">
+				<displayName>سال</displayName>
+			</field>
+			<field type="year-narrow">
+				<displayName>سال</displayName>
+			</field>
+			<field type="quarter">
+				<displayName>چارأک</displayName>
+			</field>
+			<field type="quarter-short">
+				<displayName>چارأک</displayName>
+			</field>
+			<field type="quarter-narrow">
+				<displayName>چارأک</displayName>
+			</field>
+			<field type="month">
+				<displayName>ما</displayName>
+			</field>
+			<field type="month-short">
+				<displayName>ما</displayName>
+			</field>
+			<field type="month-narrow">
+				<displayName>ما</displayName>
+			</field>
+			<field type="week">
+				<displayName>ھأفتە</displayName>
+			</field>
+			<field type="week-short">
+				<displayName>ھأفتە</displayName>
+			</field>
+			<field type="week-narrow">
+				<displayName>ھأفتە</displayName>
+			</field>
+			<field type="day">
+				<displayName>روٙز</displayName>
+				<relative type="-1">دیروٙز</relative>
+				<relative type="0">أمروٙ</relative>
+				<relative type="1">شوٙصوٙ</relative>
+			</field>
+			<field type="day-short">
+				<displayName>روٙز</displayName>
+			</field>
+			<field type="day-narrow">
+				<displayName>روٙز</displayName>
+			</field>
+			<field type="weekday">
+				<displayName>روٙز ھأفتە</displayName>
+			</field>
+			<field type="dayperiod">
+				<displayName>گات روٙز</displayName>
+			</field>
+			<field type="hour">
+				<displayName>ساأت</displayName>
+			</field>
+			<field type="hour-short">
+				<displayName>ساأت</displayName>
+			</field>
+			<field type="hour-narrow">
+				<displayName>ساأت</displayName>
+			</field>
+			<field type="minute">
+				<displayName>دئیقە</displayName>
+			</field>
+			<field type="minute-short">
+				<displayName>دئیقە</displayName>
+			</field>
+			<field type="minute-narrow">
+				<displayName>دئیقە</displayName>
+			</field>
+			<field type="second">
+				<displayName>ثانیە</displayName>
+			</field>
+			<field type="second-short">
+				<displayName>ثانیە</displayName>
+			</field>
+			<field type="second-narrow">
+				<displayName>ثانیە</displayName>
+			</field>
+			<field type="zone">
+				<displayName>راساگە</displayName>
+			</field>
+		</fields>
+		<timeZoneNames>
+			<regionFormat>{0}</regionFormat>
+			<zone type="Etc/Unknown">
+				<exemplarCity>نادیار</exemplarCity>
+			</zone>
+			<metazone type="America_Central">
+				<long>
+					<generic>گاٛت مینجاٛیی</generic>
+					<standard>گاٛت مینجاٛیی ئستاٛنداٛرد</standard>
+					<daylight>روٙشنایی نئهادار روٙز</daylight>
+				</long>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<defaultNumberingSystem>arabext</defaultNumberingSystem>
+		<otherNumberingSystems>
+			<native>arabext</native>
+		</otherNumberingSystems>
+		<symbols numberSystem="latn">
+			<decimal>.</decimal>
+			<group>,</group>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+		</symbols>
+		<decimalFormats numberSystem="latn">
+			<decimalFormatLength>
+				<decimalFormat>
+					<pattern>#,##0.###</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+		</decimalFormats>
+		<scientificFormats numberSystem="latn">
+			<scientificFormatLength>
+				<scientificFormat>
+					<pattern>#E0</pattern>
+				</scientificFormat>
+			</scientificFormatLength>
+		</scientificFormats>
+		<percentFormats numberSystem="latn">
+			<percentFormatLength>
+				<percentFormat>
+					<pattern>#,##0%</pattern>
+				</percentFormat>
+			</percentFormatLength>
+		</percentFormats>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>¤ #,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<unitPattern count="other">{0} {1}</unitPattern>
+		</currencyFormats>
+		<currencies>
+			<currency type="BRL">
+				<displayName>رئال بئرئزیل</displayName>
+				<displayName count="other">رئال بئرئزیل</displayName>
+				<symbol draft="contributed">R$</symbol>
+				<symbol alt="narrow" draft="contributed">R$</symbol>
+			</currency>
+			<currency type="CNY">
+				<displayName>یوان چین</displayName>
+				<displayName count="other">یوان چین</displayName>
+				<symbol draft="contributed">CN¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
+			</currency>
+			<currency type="EUR">
+				<displayName>یورو</displayName>
+				<displayName count="other">یورو</displayName>
+				<symbol draft="contributed">€</symbol>
+				<symbol alt="narrow" draft="contributed">€</symbol>
+			</currency>
+			<currency type="GBP">
+				<displayName>پوند بئریتانیا</displayName>
+				<displayName count="other">پوند بئریتانیا</displayName>
+				<symbol draft="contributed">£</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="INR">
+				<displayName>روٙپیه هئن</displayName>
+				<displayName count="other">روٙپیه هئن</displayName>
+				<symbol draft="contributed">₹</symbol>
+				<symbol alt="narrow" draft="contributed">₹</symbol>
+			</currency>
+			<currency type="JPY">
+				<displayName>یئن جاپوٙن</displayName>
+				<displayName count="other">یئن جاپوٙن</displayName>
+				<symbol draft="contributed">JP¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
+			</currency>
+			<currency type="RUB">
+				<displayName>روٙبل روٙسیه</displayName>
+				<displayName count="other">روٙبل روٙسیه</displayName>
+				<symbol draft="contributed">RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
+			</currency>
+			<currency type="USD">
+				<displayName>USD</displayName>
+				<displayName count="other">USD</displayName>
+				<symbol draft="contributed">US$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="XXX">
+				<displayName>پیل نادیار</displayName>
+				<displayName count="other">پیل نادیار</displayName>
+			</currency>
+		</currencies>
+	</numbers>
+	<units>
+		<durationUnit type="hm">
+			<durationUnitPattern>h:mm</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="hms">
+			<durationUnitPattern>h:mm:ss</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="ms">
+			<durationUnitPattern>m:ss</durationUnitPattern>
+		</durationUnit>
+	</units>
+	<listPatterns>
+		<listPattern>
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
+		</listPattern>
+	</listPatterns>
+	<posix>
+		<messages>
+			<yesstr>هأری:ه</yesstr>
+			<nostr>نه:ن</nostr>
+		</messages>
+	</posix>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc_IQ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc_IQ.xml
new file mode 100644
index 00000000000..52e937f752b
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc_IQ.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="lrc"/>
+		<territory type="IQ"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>h:mm:ss a zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>h:mm:ss a z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>h:mm:ss a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>h:mm a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc_IR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc_IR.xml
new file mode 100644
index 00000000000..2e90b81285b
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc_IR.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="lrc"/>
+		<territory type="IR"/>
+	</identity>
+</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lt.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lt.xml
similarity index 93%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lt.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lt.xml
index fb1b4f68cc5..b60b4be7db3 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lt.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lt.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11346 $"/>
-		<generation date="$Date: 2015-03-05 00:47:17 -0600 (Thu, 05 Mar 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="lt"/>
 	</identity>
 	<localeDisplayNames>
@@ -59,7 +58,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ay">aimarų</language>
 			<language type="az">azerbaidžaniečių</language>
 			<language type="az" alt="short">azeri</language>
-			<language type="azb">pietų Azerbaidžano</language>
 			<language type="ba">baškirų</language>
 			<language type="bal">baluči</language>
 			<language type="ban">balinezų</language>
@@ -76,6 +74,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bfd">bafutų</language>
 			<language type="bfq">badaga</language>
 			<language type="bg">bulgarų</language>
+			<language type="bgn">vakarų beludžių</language>
 			<language type="bho">baučpuri</language>
 			<language type="bi">bislama</language>
 			<language type="bik">bikolų</language>
@@ -337,6 +336,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">laosiečių</language>
 			<language type="lol">mongo</language>
 			<language type="loz">lozi</language>
+			<language type="lrc">šiaurės luri</language>
 			<language type="lt">lietuvių</language>
 			<language type="ltg">latgalių</language>
 			<language type="lu">luba katanga</language>
@@ -398,6 +398,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nb">Norvegijos rašytinė – būkmolų</language>
 			<language type="nd">šiaurės ndebelų</language>
 			<language type="nds">Žemutinės Vokietijos</language>
+			<language type="nds_NL">Žemutinės Saksonijos (Nyderlandai)</language>
 			<language type="ne">nepaliečių</language>
 			<language type="new">nevari</language>
 			<language type="ng">ndongų</language>
@@ -491,6 +492,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sco">škotų</language>
 			<language type="sd">sindų</language>
 			<language type="sdc">sasaresų sardinų</language>
+			<language type="sdh">pietų kurdų</language>
 			<language type="se">šiaurės samių</language>
 			<language type="see">senecų</language>
 			<language type="seh">senų</language>
@@ -533,8 +535,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">šumerų</language>
 			<language type="sv">švedų</language>
 			<language type="sw">suahilių</language>
+			<language type="sw_CD">Kongo suahilių</language>
 			<language type="swb">Komorų</language>
-			<language type="swc">Kongo suahilių</language>
 			<language type="syc">klasikinė siriečių</language>
 			<language type="syr">sirų</language>
 			<language type="szl">sileziečių</language>
@@ -601,6 +603,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">valamo</language>
 			<language type="war">varai</language>
 			<language type="was">vašo</language>
+			<language type="wbp">valrpiri</language>
 			<language type="wo">volofų</language>
 			<language type="wuu">kinų kalbos vu tarmė</language>
 			<language type="xal">kalmukų</language>
@@ -837,7 +840,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angilija</territory>
 			<territory type="AL">Albanija</territory>
 			<territory type="AM">Armėnija</territory>
-			<territory type="AN">Olandijos Antilai</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antarktida</territory>
 			<territory type="AR">Argentina</territory>
@@ -877,6 +879,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CG" alt="variant">Kongo Respublika</territory>
 			<territory type="CH">Šveicarija</territory>
 			<territory type="CI">Dramblio Kaulo Krantas</territory>
+			<territory type="CI" alt="variant">Dramblio Kaulo Kranto Respublika</territory>
 			<territory type="CK">Kuko Salos</territory>
 			<territory type="CL">Čilė</territory>
 			<territory type="CM">Kamerūnas</territory>
@@ -1146,6 +1149,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric">Skaitinis rikiavimas</key>
 			<key type="colStrength">Rikiavimo intensyvumas</key>
 			<key type="currency">valiuta</key>
+			<key type="hc">valandų ciklas (12 ir 24)</key>
+			<key type="lb">teksto laužymo stilius</key>
+			<key type="ms">matų sistema</key>
 			<key type="numbers">skaičiai</key>
 			<key type="timezone">Laiko juosta</key>
 			<key type="va">Lokalės variantas</key>
@@ -1153,121 +1159,131 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">Naudoti privačiai</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">arabų-indų skaitmenys</type>
-			<type type="arabext" key="numbers">išplėstiniai arabų-indų skaitmenys</type>
-			<type type="armn" key="numbers">armėnų skaitmenys</type>
-			<type type="armnlow" key="numbers">armėnų skaitmenys mažosiomis raidėmis</type>
-			<type type="bali" key="numbers">bali skaitmenys</type>
-			<type type="beng" key="numbers">bengalų skaitmenys</type>
-			<type type="big5han" key="collation">įprasta kiniška rūšiavimo tvarka - Big5</type>
-			<type type="brah" key="numbers">Brahmi skaitmenys</type>
-			<type type="buddhist" key="calendar">budistų kalendorius</type>
-			<type type="cakm" key="numbers">Čakmų skaitmenys</type>
-			<type type="cham" key="numbers">cham skaitmenys</type>
-			<type type="chinese" key="calendar">kinų kalendorius</type>
-			<type type="coptic" key="calendar">koptų kalendorius</type>
-			<type type="dangi" key="calendar">dangi kalendorius</type>
-			<type type="deva" key="numbers">devanagari skaitmenys</type>
-			<type type="dictionary" key="collation">žodyno rūšiavimo tvarka</type>
-			<type type="ducet" key="collation">numatytasis unikodo rikiavimas</type>
-			<type type="eor" key="collation" draft="unconfirmed">rūšiavimo tvarka daugiakalbės Europos dokumentų</type>
-			<type type="ethi" key="numbers">Etiopijos skaitmenys</type>
-			<type type="ethiopic" key="calendar">Etiopijos kalendorius</type>
-			<type type="ethiopic-amete-alem" key="calendar">Etiopijos „Amete Alem“ kalendorius</type>
-			<type type="finance" key="numbers">Finansiniai skaičiai</type>
-			<type type="fullwide" key="numbers">viso pločio skaitmenys</type>
-			<type type="gb2312han" key="collation">supaprastinta kiniška rūšiavimo tvarka - GB2312</type>
-			<type type="geor" key="numbers">gruzinų skaitmenys</type>
-			<type type="gregorian" key="calendar">Grigaliaus kalendorius</type>
-			<type type="grek" key="numbers">graikų skaitmenys</type>
-			<type type="greklow" key="numbers">graikų skaitmenys mažosiomis raidėmis</type>
-			<type type="gujr" key="numbers">gudžaratų skaitmenys</type>
-			<type type="guru" key="numbers">gurmuki skaitmenys</type>
-			<type type="hanidec" key="numbers">kinų dešimtainiai skaitmenys</type>
-			<type type="hans" key="numbers">supaprastintos kinų k. skaitmenys</type>
-			<type type="hansfin" key="numbers">supaprastintos kinų k. finans. skaitmenys</type>
-			<type type="hant" key="numbers">tradicinės kinų k. skaitmenys</type>
-			<type type="hantfin" key="numbers">tradicinės kinų k. finans. skaitmenys</type>
-			<type type="hebr" key="numbers">hebrajų skaitmenys</type>
-			<type type="hebrew" key="calendar">hebrajų kalendorius</type>
-			<type type="identical" key="colStrength">Rikiuoti viską</type>
-			<type type="indian" key="calendar">nacionalinis indų kalendorius</type>
-			<type type="islamic" key="calendar">islamo kalendorius</type>
-			<type type="islamic-civil" key="calendar">Islamo kalendorius (lentelinis, pilietinė era)</type>
-			<type type="islamic-rgsa" key="calendar">Islamo kalendorius (Saudo Arabija)</type>
-			<type type="islamic-tbla" key="calendar">Islamo kalendorius (lentelinis, astronominė era)</type>
-			<type type="islamic-umalqura" key="calendar">Islamo kalendorius (Umm al-Qura)</type>
-			<type type="iso8601" key="calendar">ISO 8601 kalendorius</type>
-			<type type="japanese" key="calendar">japonų kalendorius</type>
-			<type type="java" key="numbers">javiečių skaitmenys</type>
-			<type type="jpan" key="numbers">japonų skaitmenys</type>
-			<type type="jpanfin" key="numbers">japonų finans. skaitmenys</type>
-			<type type="kali" key="numbers">Kayah Li skaitmenys</type>
-			<type type="khmr" key="numbers">khmerų skaitmenys</type>
-			<type type="knda" key="numbers">kanadų skaitmenys</type>
-			<type type="lana" key="numbers">Tai Tham Hora skaitmenys</type>
-			<type type="lanatham" key="numbers">Tai Tham Tham skaitmenys</type>
-			<type type="laoo" key="numbers">laosiečių skaitmenys</type>
-			<type type="latn" key="numbers">lotyniški skaitmenys</type>
-			<type type="lepc" key="numbers">Lepcha skaitmenys</type>
-			<type type="limb" key="numbers">Limbu skaitmenys</type>
-			<type type="lower" key="colCaseFirst">Rikiuoti suteikiant pirmumą mažosioms raidėms</type>
-			<type type="mlym" key="numbers">malajalių skaitmenys</type>
-			<type type="mong" key="numbers">mongolų skaitmenys</type>
-			<type type="mtei" key="numbers">Meetei Mayek skaitmenys</type>
-			<type type="mymr" key="numbers">mianmariečių skaitmenys</type>
-			<type type="mymrshan" key="numbers">Myanmar Shan skaitmenys</type>
-			<type type="native" key="numbers">Vietiniai skaitmenys</type>
-			<type type="nkoo" key="numbers">N’Ko skaitmenys</type>
-			<type type="no" key="colBackwards">Rikiuoti diakritinius ženklus įprastai</type>
-			<type type="no" key="colCaseFirst">Rikiuoti įprasta didžiųjų ir mažųjų raidžių tvarka</type>
-			<type type="no" key="colCaseLevel">Rikiuoti neskiriant didžiųjų ir mažųjų raidžių</type>
-			<type type="no" key="colHiraganaQuaternary">Rikiuoti kanos ženklus atskirai</type>
-			<type type="no" key="colNormalization">Rikiuoti nenormalizuojant</type>
-			<type type="no" key="colNumeric">Rikiuoti skaitmenis atskirai</type>
-			<type type="non-ignorable" key="colAlternate">Rikiuoti simbolius</type>
-			<type type="olck" key="numbers">Ol Chiki skaitmenys</type>
-			<type type="orya" key="numbers">orijų skaitmenys</type>
-			<type type="osma" key="numbers">Osmanų skaitmenys</type>
-			<type type="persian" key="calendar">persų kalendorius</type>
-			<type type="phonebook" key="collation">telefonų knygos rūšiavimo tvarka</type>
-			<type type="phonetic" key="collation">Fonetinė rikiavimo tvarka</type>
-			<type type="pinyin" key="collation">supaprastinta kiniškų hieroglifų rūšiavimo tvarka</type>
-			<type type="primary" key="colStrength">Rikiuoti tik pagal pamatines raides</type>
-			<type type="quaternary" key="colStrength">Rikiuoti pagal didžiąsias ir mažąsias raides / plotį / diakritinius / kanos ženklus</type>
-			<type type="reformed" key="collation">reformuota rūšiavimo tvarka</type>
-			<type type="roc" key="calendar">Kinijos Respublikos kalendorius</type>
-			<type type="roman" key="numbers">romėniški skaitmenys</type>
-			<type type="romanlow" key="numbers">romėniški skaitmenys mažosiomis raidėmis</type>
-			<type type="saur" key="numbers">Sauraštrų skaitmenys</type>
-			<type type="search" key="collation">bendroji paieška</type>
-			<type type="searchjl" key="collation" draft="provisional">ieškoti pagal hangul pirmines priebalses</type>
-			<type type="secondary" key="colStrength">Rikiuoti diakritinius ženklus</type>
-			<type type="shifted" key="colAlternate">Rikiuoti nepaisant simbolių</type>
-			<type type="shrd" key="numbers">Šaradų skaitmenys</type>
-			<type type="sora" key="numbers">Sora Sompeng skaitmenys</type>
-			<type type="standard" key="collation">standartinis rikiavimas</type>
-			<type type="stroke" key="collation">Įprasta kiniško požymio rūšiavimo tvarka</type>
-			<type type="sund" key="numbers">Sudaniečių skaitmenys</type>
-			<type type="takr" key="numbers">Takri skaitmenys</type>
-			<type type="talu" key="numbers">Naujieji Tai Lue skaitmenys</type>
-			<type type="taml" key="numbers">tradicinės tamilų skaitmenys</type>
-			<type type="tamldec" key="numbers">tamilų skaitmenys</type>
-			<type type="telu" key="numbers">telugų skaitmenys</type>
-			<type type="tertiary" key="colStrength">Rikiuoti pagal diakritinius ženklus / didžiąsias ir mažąsias raides / plotį</type>
-			<type type="thai" key="numbers">tajų skaitmenys</type>
-			<type type="tibt" key="numbers">tibetiečių skaitmenys</type>
-			<type type="traditional" key="collation">įprasta rūšiavimo tvarka</type>
-			<type type="traditional" key="numbers">Tradiciniai skaičiai</type>
-			<type type="unihan" key="collation">Šaknies ženklų ir brūkšnių rūšiavimo tvarka</type>
-			<type type="upper" key="colCaseFirst">Rikiuoti suteikiant pirmumą didžiosioms raidėms</type>
-			<type type="vaii" key="numbers" draft="provisional">vai skaitmenys</type>
-			<type type="yes" key="colBackwards">Rikiuoti diakritinius ženklus atvirkščiai</type>
-			<type type="yes" key="colCaseLevel">Rikiuoti skiriant didžiąsias ir mažąsias raides</type>
-			<type type="yes" key="colHiraganaQuaternary">Rikiuoti kanos ženklus kitaip</type>
-			<type type="yes" key="colNormalization">Rikiuoti normalizuojant unikodą</type>
-			<type type="yes" key="colNumeric">Rikiuoti skaitmenis pagal skaičius</type>
-			<type type="zhuyin" key="collation">Zhuyin rikiavimo tvarka</type>
+			<type key="calendar" type="buddhist">budistų kalendorius</type>
+			<type key="calendar" type="chinese">kinų kalendorius</type>
+			<type key="calendar" type="coptic">koptų kalendorius</type>
+			<type key="calendar" type="dangi">dangi kalendorius</type>
+			<type key="calendar" type="ethiopic">Etiopijos kalendorius</type>
+			<type key="calendar" type="ethiopic-amete-alem">Etiopijos „Amete Alem“ kalendorius</type>
+			<type key="calendar" type="gregorian">Grigaliaus kalendorius</type>
+			<type key="calendar" type="hebrew">hebrajų kalendorius</type>
+			<type key="calendar" type="indian">nacionalinis indų kalendorius</type>
+			<type key="calendar" type="islamic">islamo kalendorius</type>
+			<type key="calendar" type="islamic-civil">Islamo kalendorius (lentelinis, pilietinė era)</type>
+			<type key="calendar" type="islamic-rgsa">Islamo kalendorius (Saudo Arabija)</type>
+			<type key="calendar" type="islamic-tbla">Islamo kalendorius (lentelinis, astronominė era)</type>
+			<type key="calendar" type="islamic-umalqura">Islamo kalendorius (Umm al-Qura)</type>
+			<type key="calendar" type="iso8601">ISO 8601 kalendorius</type>
+			<type key="calendar" type="japanese">japonų kalendorius</type>
+			<type key="calendar" type="persian">persų kalendorius</type>
+			<type key="calendar" type="roc">Kinijos Respublikos kalendorius</type>
+			<type key="colAlternate" type="non-ignorable">Rikiuoti simbolius</type>
+			<type key="colAlternate" type="shifted">Rikiuoti nepaisant simbolių</type>
+			<type key="colBackwards" type="no">Rikiuoti diakritinius ženklus įprastai</type>
+			<type key="colBackwards" type="yes">Rikiuoti diakritinius ženklus atvirkščiai</type>
+			<type key="colCaseFirst" type="lower">Rikiuoti suteikiant pirmumą mažosioms raidėms</type>
+			<type key="colCaseFirst" type="no">Rikiuoti įprasta didžiųjų ir mažųjų raidžių tvarka</type>
+			<type key="colCaseFirst" type="upper">Rikiuoti suteikiant pirmumą didžiosioms raidėms</type>
+			<type key="colCaseLevel" type="no">Rikiuoti neskiriant didžiųjų ir mažųjų raidžių</type>
+			<type key="colCaseLevel" type="yes">Rikiuoti skiriant didžiąsias ir mažąsias raides</type>
+			<type key="colHiraganaQuaternary" type="no">Rikiuoti kanos ženklus atskirai</type>
+			<type key="colHiraganaQuaternary" type="yes">Rikiuoti kanos ženklus kitaip</type>
+			<type key="collation" type="big5han">įprasta kiniška rūšiavimo tvarka - Big5</type>
+			<type key="collation" type="dictionary">žodyno rūšiavimo tvarka</type>
+			<type key="collation" type="ducet">numatytasis unikodo rikiavimas</type>
+			<type key="collation" type="eor" draft="unconfirmed">rūšiavimo tvarka daugiakalbės Europos dokumentų</type>
+			<type key="collation" type="gb2312han">supaprastinta kiniška rūšiavimo tvarka - GB2312</type>
+			<type key="collation" type="phonebook">telefonų knygos rūšiavimo tvarka</type>
+			<type key="collation" type="phonetic">Fonetinė rikiavimo tvarka</type>
+			<type key="collation" type="pinyin">supaprastinta kiniškų hieroglifų rūšiavimo tvarka</type>
+			<type key="collation" type="reformed">reformuota rūšiavimo tvarka</type>
+			<type key="collation" type="search">bendroji paieška</type>
+			<type key="collation" type="searchjl" draft="provisional">ieškoti pagal hangul pirmines priebalses</type>
+			<type key="collation" type="standard">standartinis rikiavimas</type>
+			<type key="collation" type="stroke">Įprasta kiniško požymio rūšiavimo tvarka</type>
+			<type key="collation" type="traditional">įprasta rūšiavimo tvarka</type>
+			<type key="collation" type="unihan">Šaknies ženklų ir brūkšnių rūšiavimo tvarka</type>
+			<type key="collation" type="zhuyin">Zhuyin rikiavimo tvarka</type>
+			<type key="colNormalization" type="no">Rikiuoti nenormalizuojant</type>
+			<type key="colNormalization" type="yes">Rikiuoti normalizuojant unikodą</type>
+			<type key="colNumeric" type="no">Rikiuoti skaitmenis atskirai</type>
+			<type key="colNumeric" type="yes">Rikiuoti skaitmenis pagal skaičius</type>
+			<type key="colStrength" type="identical">Rikiuoti viską</type>
+			<type key="colStrength" type="primary">Rikiuoti tik pagal pamatines raides</type>
+			<type key="colStrength" type="quaternary">Rikiuoti pagal didžiąsias ir mažąsias raides / plotį / diakritinius / kanos ženklus</type>
+			<type key="colStrength" type="secondary">Rikiuoti diakritinius ženklus</type>
+			<type key="colStrength" type="tertiary">Rikiuoti pagal diakritinius ženklus / didžiąsias ir mažąsias raides / plotį</type>
+			<type key="hc" type="h11">12 valandų sistema (0–11)</type>
+			<type key="hc" type="h12">12 valandų sistema (1–12)</type>
+			<type key="hc" type="h23">24 valandų sistema (0–23)</type>
+			<type key="hc" type="h24">24 valandų sistema (1–24)</type>
+			<type key="lb" type="loose">laisvas teksto laužymo stilius</type>
+			<type key="lb" type="normal">įprastas teksto laužymo stilius</type>
+			<type key="lb" type="strict">griežtas teksto laužymo stilius</type>
+			<type key="ms" type="metric">metrinė sistema</type>
+			<type key="ms" type="uksystem">angliška matų sistema</type>
+			<type key="ms" type="ussystem">amerikietiška matų sistema</type>
+			<type key="numbers" type="arab">arabų-indų skaitmenys</type>
+			<type key="numbers" type="arabext">išplėstiniai arabų-indų skaitmenys</type>
+			<type key="numbers" type="armn">armėnų skaitmenys</type>
+			<type key="numbers" type="armnlow">armėnų skaitmenys mažosiomis raidėmis</type>
+			<type key="numbers" type="bali">bali skaitmenys</type>
+			<type key="numbers" type="beng">bengalų skaitmenys</type>
+			<type key="numbers" type="brah">Brahmi skaitmenys</type>
+			<type key="numbers" type="cakm">Čakmų skaitmenys</type>
+			<type key="numbers" type="cham">cham skaitmenys</type>
+			<type key="numbers" type="deva">devanagari skaitmenys</type>
+			<type key="numbers" type="ethi">Etiopijos skaitmenys</type>
+			<type key="numbers" type="finance">Finansiniai skaičiai</type>
+			<type key="numbers" type="fullwide">viso pločio skaitmenys</type>
+			<type key="numbers" type="geor">gruzinų skaitmenys</type>
+			<type key="numbers" type="grek">graikų skaitmenys</type>
+			<type key="numbers" type="greklow">graikų skaitmenys mažosiomis raidėmis</type>
+			<type key="numbers" type="gujr">gudžaratų skaitmenys</type>
+			<type key="numbers" type="guru">gurmuki skaitmenys</type>
+			<type key="numbers" type="hanidec">kinų dešimtainiai skaitmenys</type>
+			<type key="numbers" type="hans">supaprastintos kinų k. skaitmenys</type>
+			<type key="numbers" type="hansfin">supaprastintos kinų k. finans. skaitmenys</type>
+			<type key="numbers" type="hant">tradicinės kinų k. skaitmenys</type>
+			<type key="numbers" type="hantfin">tradicinės kinų k. finans. skaitmenys</type>
+			<type key="numbers" type="hebr">hebrajų skaitmenys</type>
+			<type key="numbers" type="java">javiečių skaitmenys</type>
+			<type key="numbers" type="jpan">japonų skaitmenys</type>
+			<type key="numbers" type="jpanfin">japonų finans. skaitmenys</type>
+			<type key="numbers" type="kali">Kayah Li skaitmenys</type>
+			<type key="numbers" type="khmr">khmerų skaitmenys</type>
+			<type key="numbers" type="knda">kanadų skaitmenys</type>
+			<type key="numbers" type="lana">Tai Tham Hora skaitmenys</type>
+			<type key="numbers" type="lanatham">Tai Tham Tham skaitmenys</type>
+			<type key="numbers" type="laoo">laosiečių skaitmenys</type>
+			<type key="numbers" type="latn">lotyniški skaitmenys</type>
+			<type key="numbers" type="lepc">Lepcha skaitmenys</type>
+			<type key="numbers" type="limb">Limbu skaitmenys</type>
+			<type key="numbers" type="mlym">malajalių skaitmenys</type>
+			<type key="numbers" type="mong">mongolų skaitmenys</type>
+			<type key="numbers" type="mtei">Meetei Mayek skaitmenys</type>
+			<type key="numbers" type="mymr">mianmariečių skaitmenys</type>
+			<type key="numbers" type="mymrshan">Myanmar Shan skaitmenys</type>
+			<type key="numbers" type="native">Vietiniai skaitmenys</type>
+			<type key="numbers" type="nkoo">N’Ko skaitmenys</type>
+			<type key="numbers" type="olck">Ol Chiki skaitmenys</type>
+			<type key="numbers" type="orya">orijų skaitmenys</type>
+			<type key="numbers" type="osma">Osmanų skaitmenys</type>
+			<type key="numbers" type="roman">romėniški skaitmenys</type>
+			<type key="numbers" type="romanlow">romėniški skaitmenys mažosiomis raidėmis</type>
+			<type key="numbers" type="saur">Sauraštrų skaitmenys</type>
+			<type key="numbers" type="shrd">Šaradų skaitmenys</type>
+			<type key="numbers" type="sora">Sora Sompeng skaitmenys</type>
+			<type key="numbers" type="sund">Sudaniečių skaitmenys</type>
+			<type key="numbers" type="takr">Takri skaitmenys</type>
+			<type key="numbers" type="talu">Naujieji Tai Lue skaitmenys</type>
+			<type key="numbers" type="taml">tradicinės tamilų skaitmenys</type>
+			<type key="numbers" type="tamldec">tamilų skaitmenys</type>
+			<type key="numbers" type="telu">telugų skaitmenys</type>
+			<type key="numbers" type="thai">tajų skaitmenys</type>
+			<type key="numbers" type="tibt">tibetiečių skaitmenys</type>
+			<type key="numbers" type="traditional">Tradiciniai skaičiai</type>
+			<type key="numbers" type="vaii" draft="provisional">vai skaitmenys</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN">BGN simboliai</transformName>
@@ -2340,6 +2356,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d, E</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">y MMM G</dateFormatItem>
@@ -2358,6 +2375,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">MMM-d</dateFormatItem>
 						<dateFormatItem id="MMMEd">MMM-d, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
@@ -2367,6 +2385,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">y MMM G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">y MMM d G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">y MMM d G, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y MMMM</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">y G QQQ</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">y G QQQQ</dateFormatItem>
 					</availableFormats>
@@ -2681,18 +2700,66 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am">pr.p.</dayPeriod>
-							<dayPeriod type="pm">pop.</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">pr.p.</dayPeriod>
-							<dayPeriod type="noon">perpiet</dayPeriod>
-							<dayPeriod type="pm">pop.</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">vidurnaktis</dayPeriod>
 							<dayPeriod type="am">priešpiet</dayPeriod>
 							<dayPeriod type="noon">perpiet</dayPeriod>
 							<dayPeriod type="pm">popiet</dayPeriod>
+							<dayPeriod type="morning1">rytas</dayPeriod>
+							<dayPeriod type="afternoon1">popietė</dayPeriod>
+							<dayPeriod type="evening1">vakaras</dayPeriod>
+							<dayPeriod type="night1">naktis</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">vidurnaktis</dayPeriod>
+							<dayPeriod type="am">pr. p.</dayPeriod>
+							<dayPeriod type="noon">perpiet</dayPeriod>
+							<dayPeriod type="pm">pop.</dayPeriod>
+							<dayPeriod type="morning1">rytas</dayPeriod>
+							<dayPeriod type="afternoon1">popietė</dayPeriod>
+							<dayPeriod type="evening1">vakaras</dayPeriod>
+							<dayPeriod type="night1">naktis</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">vidurnaktis</dayPeriod>
+							<dayPeriod type="am">priešpiet</dayPeriod>
+							<dayPeriod type="noon">perpiet</dayPeriod>
+							<dayPeriod type="pm">popiet</dayPeriod>
+							<dayPeriod type="morning1">rytas</dayPeriod>
+							<dayPeriod type="afternoon1">popietė</dayPeriod>
+							<dayPeriod type="evening1">vakaras</dayPeriod>
+							<dayPeriod type="night1">naktis</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">vidurnaktis</dayPeriod>
+							<dayPeriod type="am">priešpiet</dayPeriod>
+							<dayPeriod type="noon">vidurdienis</dayPeriod>
+							<dayPeriod type="pm">popiet</dayPeriod>
+							<dayPeriod type="morning1">rytas</dayPeriod>
+							<dayPeriod type="afternoon1">diena</dayPeriod>
+							<dayPeriod type="evening1">vakaras</dayPeriod>
+							<dayPeriod type="night1">naktis</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">vidurnaktis</dayPeriod>
+							<dayPeriod type="am">pr. p.</dayPeriod>
+							<dayPeriod type="noon">vidurdienis</dayPeriod>
+							<dayPeriod type="pm">pop.</dayPeriod>
+							<dayPeriod type="morning1">rytas</dayPeriod>
+							<dayPeriod type="afternoon1">diena</dayPeriod>
+							<dayPeriod type="evening1">vakaras</dayPeriod>
+							<dayPeriod type="night1">naktis</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">vidurnaktis</dayPeriod>
+							<dayPeriod type="am">priešpiet</dayPeriod>
+							<dayPeriod type="noon">vidurdienis</dayPeriod>
+							<dayPeriod type="pm">popiet</dayPeriod>
+							<dayPeriod type="morning1">rytas</dayPeriod>
+							<dayPeriod type="afternoon1">diena</dayPeriod>
+							<dayPeriod type="evening1">vakaras</dayPeriod>
+							<dayPeriod type="night1">naktis</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -2789,19 +2856,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="EHm">HH:mm, E</dateFormatItem>
 						<dateFormatItem id="Ehms">hh:mm:ss a, E</dateFormatItem>
 						<dateFormatItem id="EHms">HH:mm:ss, E</dateFormatItem>
-						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="Gy">y 'm'. G</dateFormatItem>
 						<dateFormatItem id="GyMMM">y-MM G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">y-MM-dd G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">y-MM-dd G, E</dateFormatItem>
-						<dateFormatItem id="GyMMMM">y G LLLL</dateFormatItem>
-						<dateFormatItem id="GyMMMMd">y G MMMM d</dateFormatItem>
-						<dateFormatItem id="GyMMMMEd">y G MMMM d, E</dateFormatItem>
+						<dateFormatItem id="GyMMMM">y 'm'. G, LLLL</dateFormatItem>
+						<dateFormatItem id="GyMMMMd">y 'm'. G MMMM d 'd'.</dateFormatItem>
+						<dateFormatItem id="GyMMMMEd">y 'm'. G MMMM d 'd'., E</dateFormatItem>
 						<dateFormatItem id="h">hh a</dateFormatItem>
 						<dateFormatItem id="H">HH</dateFormatItem>
 						<dateFormatItem id="hm">hh:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">hh:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">hh:mm:ss a; v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss; v</dateFormatItem>
+						<dateFormatItem id="hmv">hh:mm a; v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm; v</dateFormatItem>
 						<dateFormatItem id="M">MM</dateFormatItem>
 						<dateFormatItem id="Md">MM-d</dateFormatItem>
 						<dateFormatItem id="MEd">MM-dd, E</dateFormatItem>
@@ -2810,8 +2881,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMMd">MM-dd</dateFormatItem>
 						<dateFormatItem id="MMMEd">MM-dd, E</dateFormatItem>
 						<dateFormatItem id="MMMM">LLLL</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
-						<dateFormatItem id="MMMMEd">MMMM d, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d 'd'.</dateFormatItem>
+						<dateFormatItem id="MMMMEd">MMMM d 'd'., E</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">y-MM</dateFormatItem>
@@ -2820,9 +2891,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yMMM">y-MM</dateFormatItem>
 						<dateFormatItem id="yMMMd">y-MM-dd</dateFormatItem>
 						<dateFormatItem id="yMMMEd">y-MM-dd, E</dateFormatItem>
-						<dateFormatItem id="yMMMM">y LLLL</dateFormatItem>
-						<dateFormatItem id="yMMMMd">y MMMM d</dateFormatItem>
-						<dateFormatItem id="yMMMMEd">y MMMM d, E</dateFormatItem>
+						<dateFormatItem id="yMMMM">y 'm'. LLLL</dateFormatItem>
+						<dateFormatItem id="yMMMMd">y 'm'. MMMM d 'd'.</dateFormatItem>
+						<dateFormatItem id="yMMMMEd">y 'm'. MMMM d 'd'., E</dateFormatItem>
 						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
 						<dateFormatItem id="yQQQQ">y QQQQ</dateFormatItem>
 					</availableFormats>
@@ -2878,15 +2949,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">MM-dd, E – MM-dd, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MM–MM</greatestDifference>
+							<greatestDifference id="M">LLL–LLL</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MM-dd – MM-dd</greatestDifference>
-							<greatestDifference id="M">MM-dd – MM-dd</greatestDifference>
+							<greatestDifference id="d">MMM d–d</greatestDifference>
+							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">MM-dd, E – MM-dd, E</greatestDifference>
-							<greatestDifference id="M">MM-dd, E – MM-dd, E</greatestDifference>
+							<greatestDifference id="d">MMM d, E – MMM d, E</greatestDifference>
+							<greatestDifference id="M">MMM d, E – MMM d, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMM">
 							<greatestDifference id="M">LLLL–LLLL</greatestDifference>
@@ -2917,22 +2988,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="y">y-MM-dd, E – y-MM-dd, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">y-MM – y-MM</greatestDifference>
-							<greatestDifference id="y">y-MM – y-MM</greatestDifference>
+							<greatestDifference id="M">y MMM–MMM</greatestDifference>
+							<greatestDifference id="y">y MMM – y MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="M">y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="y">y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="d">y MMM d–d</greatestDifference>
+							<greatestDifference id="M">y MMM d – MMM d</greatestDifference>
+							<greatestDifference id="y">y MMM d – y MMM d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="M">y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="y">y-MM-dd, E – y-MM-dd, E</greatestDifference>
+							<greatestDifference id="d">y MMM d, E – MMM d, E</greatestDifference>
+							<greatestDifference id="M">y MMM d, E – MMM d, E</greatestDifference>
+							<greatestDifference id="y">y MMM d, E – y MMM d, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
 							<greatestDifference id="M">y LLLL–LLLL</greatestDifference>
-							<greatestDifference id="y">y LLLL – LLLL</greatestDifference>
+							<greatestDifference id="y">y LLLL – y LLLL</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMMd">
 							<greatestDifference id="d">y MMMM d–d</greatestDifference>
@@ -3608,10 +3679,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</calendars>
 		<fields>
 			<field type="era">
-				<displayName>Era</displayName>
+				<displayName>era</displayName>
 			</field>
 			<field type="year">
-				<displayName>Metai</displayName>
+				<displayName>metai</displayName>
 				<relative type="-1">praėjusiais metais</relative>
 				<relative type="0">šiais metais</relative>
 				<relative type="1">kitais metais</relative>
@@ -3659,7 +3730,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="quarter">
-				<displayName>Ketvirtis</displayName>
+				<displayName>ketvirtis</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">po {0} ketvirčio</relativeTimePattern>
 					<relativeTimePattern count="few">po {0} ketvirčių</relativeTimePattern>
@@ -3704,7 +3775,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="month">
-				<displayName>Mėnuo</displayName>
+				<displayName>mėnuo</displayName>
 				<relative type="-1">praėjusį mėnesį</relative>
 				<relative type="0">šį mėnesį</relative>
 				<relative type="1">kitą mėnesį</relative>
@@ -3752,7 +3823,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="week">
-				<displayName>Savaitė</displayName>
+				<displayName>savaitė</displayName>
 				<relative type="-1">praėjusią savaitę</relative>
 				<relative type="0">šią savaitę</relative>
 				<relative type="1">kitą savaitę</relative>
@@ -3800,7 +3871,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day">
-				<displayName>Diena</displayName>
+				<displayName>diena</displayName>
 				<relative type="-2">užvakar</relative>
 				<relative type="-1">vakar</relative>
 				<relative type="0">šiandien</relative>
@@ -3850,7 +3921,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="weekday">
-				<displayName>Savaitės diena</displayName>
+				<displayName>savaitės diena</displayName>
 			</field>
 			<field type="sun">
 				<relative type="-1">praėjusį sekmadienį</relative>
@@ -3958,10 +4029,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">kitą šešt.</relative>
 			</field>
 			<field type="dayperiod">
-				<displayName>Iki pietų / po pietų</displayName>
+				<displayName>iki pietų / po pietų</displayName>
 			</field>
 			<field type="hour">
-				<displayName>Valanda</displayName>
+				<displayName>valanda</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">po {0} valandos</relativeTimePattern>
 					<relativeTimePattern count="few">po {0} valandų</relativeTimePattern>
@@ -4006,7 +4077,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="minute">
-				<displayName>Minutė</displayName>
+				<displayName>minutė</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">po {0} minutės</relativeTimePattern>
 					<relativeTimePattern count="few">po {0} minučių</relativeTimePattern>
@@ -4051,7 +4122,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="second">
-				<displayName>Sekundė</displayName>
+				<displayName>sekundė</displayName>
 				<relative type="0">dabar</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">po {0} sekundės</relativeTimePattern>
@@ -4097,7 +4168,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>Laiko juosta</displayName>
+				<displayName>laiko juosta</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
@@ -4975,6 +5046,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Morsbis</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bugenvilis</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
 			</zone>
@@ -5059,6 +5133,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkutskas</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Čita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Jakutskas</exemplarCity>
 			</zone>
@@ -5077,6 +5154,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadanas</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolymskas</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamčiatka</exemplarCity>
 			</zone>
@@ -6469,6 +6549,58 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">0 tūkst'.' ¤</pattern>
+					<pattern type="1000" count="few">0 tūkst'.' ¤</pattern>
+					<pattern type="1000" count="many">0 tūkst'.' ¤</pattern>
+					<pattern type="1000" count="other">0 tūkst'.' ¤</pattern>
+					<pattern type="10000" count="one">00 tūkst'.' ¤</pattern>
+					<pattern type="10000" count="few">00 tūkst'.' ¤</pattern>
+					<pattern type="10000" count="many">00 tūkst'.' ¤</pattern>
+					<pattern type="10000" count="other">00 tūkst'.' ¤</pattern>
+					<pattern type="100000" count="one">000 tūkst'.' ¤</pattern>
+					<pattern type="100000" count="few">000 tūkst'.' ¤</pattern>
+					<pattern type="100000" count="many">000 tūkst'.' ¤</pattern>
+					<pattern type="100000" count="other">000 tūkst'.' ¤</pattern>
+					<pattern type="1000000" count="one">0 mln'.' ¤</pattern>
+					<pattern type="1000000" count="few">0 mln'.' ¤</pattern>
+					<pattern type="1000000" count="many">0 mln'.' ¤</pattern>
+					<pattern type="1000000" count="other">0 mln'.' ¤</pattern>
+					<pattern type="10000000" count="one">00 mln'.' ¤</pattern>
+					<pattern type="10000000" count="few">00 mln'.' ¤</pattern>
+					<pattern type="10000000" count="many">00 mln'.' ¤</pattern>
+					<pattern type="10000000" count="other">00 mln'.' ¤</pattern>
+					<pattern type="100000000" count="one">000 mln'.' ¤</pattern>
+					<pattern type="100000000" count="few">000 mln'.' ¤</pattern>
+					<pattern type="100000000" count="many">000 mln'.' ¤</pattern>
+					<pattern type="100000000" count="other">000 mln'.' ¤</pattern>
+					<pattern type="1000000000" count="one">0 mlrd'.' ¤</pattern>
+					<pattern type="1000000000" count="few">0 mlrd'.' ¤</pattern>
+					<pattern type="1000000000" count="many">0 mlrd'.' ¤</pattern>
+					<pattern type="1000000000" count="other">0 mlrd'.' ¤</pattern>
+					<pattern type="10000000000" count="one">00 mlrd'.' ¤</pattern>
+					<pattern type="10000000000" count="few">00 mlrd'.' ¤</pattern>
+					<pattern type="10000000000" count="many">00 mlrd'.' ¤</pattern>
+					<pattern type="10000000000" count="other">00 mlrd'.' ¤</pattern>
+					<pattern type="100000000000" count="one">000 mlrd'.' ¤</pattern>
+					<pattern type="100000000000" count="few">000 mlrd'.' ¤</pattern>
+					<pattern type="100000000000" count="many">000 mlrd'.' ¤</pattern>
+					<pattern type="100000000000" count="other">000 mlrd'.' ¤</pattern>
+					<pattern type="1000000000000" count="one">0 trln'.' ¤</pattern>
+					<pattern type="1000000000000" count="few">0 trln'.' ¤</pattern>
+					<pattern type="1000000000000" count="many">0 trln'.' ¤</pattern>
+					<pattern type="1000000000000" count="other">0 trln'.' ¤</pattern>
+					<pattern type="10000000000000" count="one">00 trln'.' ¤</pattern>
+					<pattern type="10000000000000" count="few">00 trln'.' ¤</pattern>
+					<pattern type="10000000000000" count="many">00 trln'.' ¤</pattern>
+					<pattern type="10000000000000" count="other">00 trln'.' ¤</pattern>
+					<pattern type="100000000000000" count="one">000 trln'.' ¤</pattern>
+					<pattern type="100000000000000" count="few">000 trln'.' ¤</pattern>
+					<pattern type="100000000000000" count="many">000 trln'.' ¤</pattern>
+					<pattern type="100000000000000" count="other">000 trln'.' ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="few">{0} {1}</unitPattern>
 			<unitPattern count="many">{0} {1}</unitPattern>
@@ -6543,6 +6675,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Angolos kvanzos</displayName>
 				<displayName count="other">Angolos kvanzų</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>Angolos kvanza (1977–1990)</displayName>
@@ -6655,6 +6788,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Bosnijos ir Hercegovinos konvertuojamosios markės</displayName>
 				<displayName count="other">Bosnijos ir Hercegovinos konvertuojamųjų markių</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BAN">
 				<displayName>Bosnijos ir Hercegovinos naujasis dinaras (1994–1997)</displayName>
@@ -6772,6 +6906,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Bolivijos bolivijano</displayName>
 				<displayName count="other">Bolivijos bolivijanų</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOL">
 				<displayName>Bolivijos bolivijanas (1863–1963)</displayName>
@@ -6876,6 +7011,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Botsvanos pulos</displayName>
 				<displayName count="other">Botsvanos pulų</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>Baltarusijos naujasis rublis (1994–1999)</displayName>
@@ -7026,6 +7162,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Kubos konvertuojamojo peso</displayName>
 				<displayName count="other">Kubos konvertuojamųjų pesų</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>Kubos pesas</displayName>
@@ -7058,6 +7195,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Čekijos kronos</displayName>
 				<displayName count="other">Čekijos kronų</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>Rytų Vokietijos markė</displayName>
@@ -7088,6 +7226,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Danijos kronos</displayName>
 				<displayName count="other">Danijos kronų</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Dominikos pesas</displayName>
@@ -7134,6 +7273,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Egipto svaro</displayName>
 				<displayName count="other">Egipto svarų</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>Eritrėjos nakfa</displayName>
@@ -7178,6 +7318,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">eurai</displayName>
 				<displayName count="many">euro</displayName>
 				<displayName count="other">eurų</displayName>
+				<symbol draft="contributed">€</symbol>
+				<symbol alt="narrow" draft="contributed">€</symbol>
 			</currency>
 			<currency type="FIM">
 				<displayName>Suomijos markė</displayName>
@@ -7202,6 +7344,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Falklando salų svaro</displayName>
 				<displayName count="other">Falklando salų svarų</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>Prancūzijos frankas</displayName>
@@ -7233,6 +7376,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Gruzijos lario</displayName>
 				<displayName count="other">Gruzijos larių</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="provisional">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>Ganos sedis (1979–2007)</displayName>
@@ -7273,6 +7417,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Gvinėjos franko</displayName>
 				<displayName count="other">Gvinėjos frankų</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>Guinean sylis</displayName>
@@ -7302,6 +7447,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Gvatemalos ketcalio</displayName>
 				<displayName count="other">Gvatemalos ketcalių</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>Portugalų Gvinėjos eskudas</displayName>
@@ -7342,6 +7488,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Hondūro lempiros</displayName>
 				<displayName count="other">Hondūro lempirų</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>Kroatijos dinaras</displayName>
@@ -7357,6 +7504,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Kroatijos kunos</displayName>
 				<displayName count="other">Kroatijos kunų</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>Haičio gurdas</displayName>
@@ -7373,6 +7521,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Vengrijos forinto</displayName>
 				<displayName count="other">Vengrijos forintų</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>Indonezijos rupija</displayName>
@@ -7381,6 +7530,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Indonezijos rupijos</displayName>
 				<displayName count="other">Indonezijos rupijų</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>Airijos svaras</displayName>
@@ -7451,6 +7601,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Islandijos kronos</displayName>
 				<displayName count="other">Islandijos kronų</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>Italijos lira</displayName>
@@ -7483,7 +7634,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Japonijos jenos</displayName>
 				<displayName count="other">Japonijos jenų</displayName>
 				<symbol>JPY</symbol>
-				<symbol alt="narrow" draft="contributed">JPY</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
 			<currency type="KES">
 				<displayName>Kenijos šilingas</displayName>
@@ -7517,6 +7668,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Komoro franko</displayName>
 				<displayName count="other">Komoro frankų</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>Šiaurės Korėjos vonas</displayName>
@@ -7525,6 +7677,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Šiaurės Korėjos vono</displayName>
 				<displayName count="other">Šiaurės Korėjos vonų</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRH">
 				<displayName>Pietų Korėjos hwanas (1953–1962)</displayName>
@@ -7573,7 +7726,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Kazachstano tengės</displayName>
 				<displayName count="other">Kazachstano tengių</displayName>
 				<symbol>KZT</symbol>
-				<symbol alt="narrow" draft="contributed">KZT</symbol>
+				<symbol alt="narrow" draft="contributed">₸</symbol>
 			</currency>
 			<currency type="LAK">
 				<displayName>Laoso kipas</displayName>
@@ -7591,6 +7744,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Libano svaro</displayName>
 				<displayName count="other">Libano svarų</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>Šri Lankos rupija</displayName>
@@ -7599,6 +7753,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Šri Lankos rupijos</displayName>
 				<displayName count="other">Šri Lankos rupijų</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>Liberijos doleris</displayName>
@@ -7719,6 +7874,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Madagaskaro ariario</displayName>
 				<displayName count="other">Madagaskaro ariarių</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>Madagaskaro frankas</displayName>
@@ -7756,6 +7912,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Mianmaro kijato</displayName>
 				<displayName count="other">Mianmaro kijatų</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>Mongolijos tugrikas</displayName>
@@ -7803,6 +7960,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Mauricijaus rupijos</displayName>
 				<displayName count="other">Mauricijaus rupijų</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVP">
 				<displayName>Maldyvų rupija</displayName>
@@ -7857,6 +8015,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Malaizijos ringito</displayName>
 				<displayName count="other">Malaizijos ringitų</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>Mozambiko eskudas</displayName>
@@ -7912,6 +8071,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Nikaragvos kordobos</displayName>
 				<displayName count="other">Nikaragvos kordobų</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>Nyderlandų guldenas</displayName>
@@ -7927,6 +8087,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Norvegijos kronos</displayName>
 				<displayName count="other">Norvegijos kronų</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>Nepalo rupija</displayName>
@@ -7935,6 +8096,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Nepalo rupijos</displayName>
 				<displayName count="other">Nepalo rupijų</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>Naujosios Zelandijos doleris</displayName>
@@ -8007,6 +8169,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Pakistano rupijos</displayName>
 				<displayName count="other">Pakistano rupijų</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>Lenkijos zlotas</displayName>
@@ -8015,6 +8178,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Lenkijos zloto</displayName>
 				<displayName count="other">Lenkijos zlotų</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zl</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>Lenkijos zlotas (1950–1995)</displayName>
@@ -8084,6 +8248,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Rusijos rublio</displayName>
 				<displayName count="other">Rusijos rublių</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">rb</symbol>
 				<symbol alt="variant">₽</symbol>
 			</currency>
 			<currency type="RUR">
@@ -8100,6 +8265,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Ruandos franko</displayName>
 				<displayName count="other">Ruandos frankų</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>Saudo Arabijos rijalas</displayName>
@@ -8155,6 +8321,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Švedijos kronos</displayName>
 				<displayName count="other">Švedijos kronų</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>Singapūro doleris</displayName>
@@ -8172,6 +8339,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Šv. Elenos salų svaro</displayName>
 				<displayName count="other">Šv. Elenos salų svarų</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>Slovėnijos tolaras</displayName>
@@ -8235,6 +8403,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">San Tomės ir Principės dobros</displayName>
 				<displayName count="other">Sao Tomės ir Principės dobrų</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>Sovietų rublis</displayName>
@@ -8257,6 +8426,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Sirijos svaro</displayName>
 				<displayName count="other">Sirijos svarų</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>Svazilando lilangenis</displayName>
@@ -8273,6 +8443,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Tailando bato</displayName>
 				<displayName count="other">Tailando batų</displayName>
 				<symbol>THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>Tadžikistano rublis</displayName>
@@ -8319,6 +8490,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Tongo paangos</displayName>
 				<displayName count="other">Tongo paangų</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>Timoro eskudas</displayName>
@@ -8407,7 +8579,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">JAV doleriai</displayName>
 				<displayName count="many">JAV dolerio</displayName>
 				<displayName count="other">JAV dolerių</displayName>
-				<symbol>dol.</symbol>
+				<symbol>USD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="USN">
@@ -8469,6 +8641,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Venesuelos bolivaro</displayName>
 				<displayName count="other">Venesuelos bolivarų</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>Vietnamo dongas</displayName>
@@ -8559,6 +8732,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Rytų Karibų dolerio</displayName>
 				<displayName count="other">Rytų Karibų dolerių</displayName>
 				<symbol>XCD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>SDR tarptautinis valiutos fondas</displayName>
@@ -8706,6 +8880,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Pietų Afrikos Respublikos rando</displayName>
 				<displayName count="other">Pietų Afrikos Respublikos randų</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>Zambijos kvača (1968–2012)</displayName>
@@ -8721,6 +8896,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">Zambijos kvačos</displayName>
 				<displayName count="other">Zambijos kvačų</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>Zairo naujasis zairas (1993–1998)</displayName>
@@ -8766,7 +8942,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 	<units>
 		<unitLength type="long">
 			<compoundUnit type="per">
-				<compoundUnitPattern>{0} per {1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>laisvojo kritimo pagreičiai</displayName>
@@ -8782,6 +8958,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} metro per kvadratinę sekundę</unitPattern>
 				<unitPattern count="other">{0} metrų per kvadratinę sekundę</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>pilnas apsisukimas</displayName>
+				<unitPattern count="one">{0} pilnas apsisukimas</unitPattern>
+				<unitPattern count="few">{0} pilni apsisukimai</unitPattern>
+				<unitPattern count="many">{0} pilno apsisukimo</unitPattern>
+				<unitPattern count="other">{0} pilnų apsisukimų</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radianai</displayName>
+				<unitPattern count="one">{0} radianas</unitPattern>
+				<unitPattern count="few">{0} radianai</unitPattern>
+				<unitPattern count="many">{0} radiano</unitPattern>
+				<unitPattern count="other">{0} radianų</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>laipsniai</displayName>
+				<unitPattern count="one">{0} laipsnis</unitPattern>
+				<unitPattern count="few">{0} laipsniai</unitPattern>
+				<unitPattern count="many">{0} laipsnio</unitPattern>
+				<unitPattern count="other">{0} laipsnių</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>kampo minutės</displayName>
 				<unitPattern count="one">{0} kampo minutė</unitPattern>
@@ -8796,26 +8993,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kampo sekundės</unitPattern>
 				<unitPattern count="other">{0} kampo sekundžių</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>laipsniai</displayName>
-				<unitPattern count="one">{0} laipsnis</unitPattern>
-				<unitPattern count="few">{0} laipsniai</unitPattern>
-				<unitPattern count="many">{0} laipsnio</unitPattern>
-				<unitPattern count="other">{0} laipsnių</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radianai</displayName>
-				<unitPattern count="one">{0} radianas</unitPattern>
-				<unitPattern count="few">{0} radianai</unitPattern>
-				<unitPattern count="many">{0} radiano</unitPattern>
-				<unitPattern count="other">{0} radianų</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>akrai</displayName>
-				<unitPattern count="one">{0} akras</unitPattern>
-				<unitPattern count="few">{0} akrai</unitPattern>
-				<unitPattern count="many">{0} akro</unitPattern>
-				<unitPattern count="other">{0} akrų</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>kvadratiniai kilometrai</displayName>
+				<unitPattern count="one">{0} kvadratinis kilometras</unitPattern>
+				<unitPattern count="few">{0} kvadratiniai kilometrai</unitPattern>
+				<unitPattern count="many">{0} kvadratinio kilometro</unitPattern>
+				<unitPattern count="other">{0} kvadratinių kilometrų</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektarai</displayName>
@@ -8824,12 +9007,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} hektaro</unitPattern>
 				<unitPattern count="other">{0} hektarų</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>kvadratiniai metrai</displayName>
+				<unitPattern count="one">{0} kvadratinis metras</unitPattern>
+				<unitPattern count="few">{0} kvadratiniai metrai</unitPattern>
+				<unitPattern count="many">{0} kvadratinio metro</unitPattern>
+				<unitPattern count="other">{0} kvadratinių metrų</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>kvadratiniai centimetrai</displayName>
 				<unitPattern count="one">{0} kvadratinis centimetras</unitPattern>
 				<unitPattern count="few">{0} kvadratiniai centimetrai</unitPattern>
 				<unitPattern count="many">{0} kvadratinio centimetro</unitPattern>
 				<unitPattern count="other">{0} kvadratinių centimetrų</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>kvadratinės mylios</displayName>
+				<unitPattern count="one">{0} kvadratinė mylia</unitPattern>
+				<unitPattern count="few">{0} kvadratinės mylios</unitPattern>
+				<unitPattern count="many">{0} kvadratinės mylios</unitPattern>
+				<unitPattern count="other">{0} kvadratinių mylių</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>akrai</displayName>
+				<unitPattern count="one">{0} akras</unitPattern>
+				<unitPattern count="few">{0} akrai</unitPattern>
+				<unitPattern count="many">{0} akro</unitPattern>
+				<unitPattern count="other">{0} akrų</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>kvadratiniai jardai</displayName>
+				<unitPattern count="one">{0} kvadratinis jardas</unitPattern>
+				<unitPattern count="few">{0} kvadratiniai jardai</unitPattern>
+				<unitPattern count="many">{0} kvadratinio jardo</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>kvadratinės pėdos</displayName>
@@ -8844,34 +9057,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kvadratiniai coliai</unitPattern>
 				<unitPattern count="many">{0} kvadratinio colio</unitPattern>
 				<unitPattern count="other">{0} kvadratinių colių</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kvadratiniai kilometrai</displayName>
-				<unitPattern count="one">{0} kvadratinis kilometras</unitPattern>
-				<unitPattern count="few">{0} kvadratiniai kilometrai</unitPattern>
-				<unitPattern count="many">{0} kvadratinio kilometro</unitPattern>
-				<unitPattern count="other">{0} kvadratinių kilometrų</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>kvadratiniai metrai</displayName>
-				<unitPattern count="one">{0} kvadratinis metras</unitPattern>
-				<unitPattern count="few">{0} kvadratiniai metrai</unitPattern>
-				<unitPattern count="many">{0} kvadratinio metro</unitPattern>
-				<unitPattern count="other">{0} kvadratinių metrų</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>kvadratinės mylios</displayName>
-				<unitPattern count="one">{0} kvadratinė mylia</unitPattern>
-				<unitPattern count="few">{0} kvadratinės mylios</unitPattern>
-				<unitPattern count="many">{0} kvadratinės mylios</unitPattern>
-				<unitPattern count="other">{0} kvadratinių mylių</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>kvadratiniai jardai</displayName>
-				<unitPattern count="one">{0} kvadratinis jardas</unitPattern>
-				<unitPattern count="few">{0} kvadratiniai jardai</unitPattern>
-				<unitPattern count="many">{0} kvadratinio jardo</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karatai</displayName>
+				<unitPattern count="one">{0} karatas</unitPattern>
+				<unitPattern count="few">{0} karatai</unitPattern>
+				<unitPattern count="many">{0} karato</unitPattern>
+				<unitPattern count="other">{0} karatų</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litrai kilometrui</displayName>
@@ -8880,6 +9073,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} litro kilometrui</unitPattern>
 				<unitPattern count="other">{0} litrų kilometrui</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>litrai 100 kilometrų</displayName>
+				<unitPattern count="one">{0} litras 100 kilometrų</unitPattern>
+				<unitPattern count="few">{0} litrai 100 kilometrų</unitPattern>
+				<unitPattern count="many">{0} litro 100 kilometrų</unitPattern>
+				<unitPattern count="other">{0} litrų 100 kilometrų</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mylios už galoną</displayName>
 				<unitPattern count="one">{0} mylia už galoną</unitPattern>
@@ -8887,69 +9087,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mylios už galoną</unitPattern>
 				<unitPattern count="other">{0} mylių už galoną</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bitai</displayName>
-				<unitPattern count="one">{0} bitas</unitPattern>
-				<unitPattern count="few">{0} bitai</unitPattern>
-				<unitPattern count="many">{0} bito</unitPattern>
-				<unitPattern count="other">{0} bitų</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>baitai</displayName>
-				<unitPattern count="one">{0} baitas</unitPattern>
-				<unitPattern count="few">{0} baitai</unitPattern>
-				<unitPattern count="many">{0} baito</unitPattern>
-				<unitPattern count="other">{0} baitų</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabitai</displayName>
-				<unitPattern count="one">{0} gigabitas</unitPattern>
-				<unitPattern count="few">{0} gigabitai</unitPattern>
-				<unitPattern count="many">{0} gigabito</unitPattern>
-				<unitPattern count="other">{0} gigabitų</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabaitai</displayName>
-				<unitPattern count="one">{0} gigabaitas</unitPattern>
-				<unitPattern count="few">{0} gigabaitai</unitPattern>
-				<unitPattern count="many">{0} gigabaito</unitPattern>
-				<unitPattern count="other">{0} gigabaitų</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobitai</displayName>
-				<unitPattern count="one">{0} kilobitas</unitPattern>
-				<unitPattern count="few">{0} kilobitai</unitPattern>
-				<unitPattern count="many">{0} kilobito</unitPattern>
-				<unitPattern count="other">{0} kilobitų</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobaitai</displayName>
-				<unitPattern count="one">{0} kilobaitas</unitPattern>
-				<unitPattern count="few">{0} kilobaitai</unitPattern>
-				<unitPattern count="many">{0} kilobaito</unitPattern>
-				<unitPattern count="other">{0} kilobaitų</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabitai</displayName>
-				<unitPattern count="one">{0} megabitas</unitPattern>
-				<unitPattern count="few">{0} megabitai</unitPattern>
-				<unitPattern count="many">{0} megabito</unitPattern>
-				<unitPattern count="other">{0} megabitų</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabaitai</displayName>
-				<unitPattern count="one">{0} megabaitas</unitPattern>
-				<unitPattern count="few">{0} megabaitai</unitPattern>
-				<unitPattern count="many">{0} megabaito</unitPattern>
-				<unitPattern count="other">{0} megabaitų</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabitai</displayName>
-				<unitPattern count="one">{0} terabitas</unitPattern>
-				<unitPattern count="few">{0} terabitai</unitPattern>
-				<unitPattern count="many">{0} terabito</unitPattern>
-				<unitPattern count="other">{0} terabitų</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabaitai</displayName>
 				<unitPattern count="one">{0} terabaitas</unitPattern>
@@ -8957,12 +9094,107 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} terabaito</unitPattern>
 				<unitPattern count="other">{0} terabaitų</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabitai</displayName>
+				<unitPattern count="one">{0} terabitas</unitPattern>
+				<unitPattern count="few">{0} terabitai</unitPattern>
+				<unitPattern count="many">{0} terabito</unitPattern>
+				<unitPattern count="other">{0} terabitų</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabaitai</displayName>
+				<unitPattern count="one">{0} gigabaitas</unitPattern>
+				<unitPattern count="few">{0} gigabaitai</unitPattern>
+				<unitPattern count="many">{0} gigabaito</unitPattern>
+				<unitPattern count="other">{0} gigabaitų</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabitai</displayName>
+				<unitPattern count="one">{0} gigabitas</unitPattern>
+				<unitPattern count="few">{0} gigabitai</unitPattern>
+				<unitPattern count="many">{0} gigabito</unitPattern>
+				<unitPattern count="other">{0} gigabitų</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabaitai</displayName>
+				<unitPattern count="one">{0} megabaitas</unitPattern>
+				<unitPattern count="few">{0} megabaitai</unitPattern>
+				<unitPattern count="many">{0} megabaito</unitPattern>
+				<unitPattern count="other">{0} megabaitų</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabitai</displayName>
+				<unitPattern count="one">{0} megabitas</unitPattern>
+				<unitPattern count="few">{0} megabitai</unitPattern>
+				<unitPattern count="many">{0} megabito</unitPattern>
+				<unitPattern count="other">{0} megabitų</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobaitai</displayName>
+				<unitPattern count="one">{0} kilobaitas</unitPattern>
+				<unitPattern count="few">{0} kilobaitai</unitPattern>
+				<unitPattern count="many">{0} kilobaito</unitPattern>
+				<unitPattern count="other">{0} kilobaitų</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobitai</displayName>
+				<unitPattern count="one">{0} kilobitas</unitPattern>
+				<unitPattern count="few">{0} kilobitai</unitPattern>
+				<unitPattern count="many">{0} kilobito</unitPattern>
+				<unitPattern count="other">{0} kilobitų</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>baitai</displayName>
+				<unitPattern count="one">{0} baitas</unitPattern>
+				<unitPattern count="few">{0} baitai</unitPattern>
+				<unitPattern count="many">{0} baito</unitPattern>
+				<unitPattern count="other">{0} baitų</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bitai</displayName>
+				<unitPattern count="one">{0} bitas</unitPattern>
+				<unitPattern count="few">{0} bitai</unitPattern>
+				<unitPattern count="many">{0} bito</unitPattern>
+				<unitPattern count="other">{0} bitų</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>amžiai</displayName>
+				<unitPattern count="one">{0} amžius</unitPattern>
+				<unitPattern count="few">{0} amžiai</unitPattern>
+				<unitPattern count="many">{0} amžiaus</unitPattern>
+				<unitPattern count="other">{0} amžių</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>metai</displayName>
+				<unitPattern count="one">{0} metai</unitPattern>
+				<unitPattern count="few">{0} metai</unitPattern>
+				<unitPattern count="many">{0} metų</unitPattern>
+				<unitPattern count="other">{0} metų</unitPattern>
+				<perUnitPattern>{0} per metus</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mėnesiai</displayName>
+				<unitPattern count="one">{0} mėnuo</unitPattern>
+				<unitPattern count="few">{0} mėnesiai</unitPattern>
+				<unitPattern count="many">{0} mėnesio</unitPattern>
+				<unitPattern count="other">{0} mėnesių</unitPattern>
+				<perUnitPattern>{0} per mėnesį</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>savaitės</displayName>
+				<unitPattern count="one">{0} savaitė</unitPattern>
+				<unitPattern count="few">{0} savaitės</unitPattern>
+				<unitPattern count="many">{0} savaitės</unitPattern>
+				<unitPattern count="other">{0} savaičių</unitPattern>
+				<perUnitPattern>{0} per savaitę</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>dienos</displayName>
 				<unitPattern count="one">{0} diena</unitPattern>
 				<unitPattern count="few">{0} dienos</unitPattern>
 				<unitPattern count="many">{0} dienos</unitPattern>
 				<unitPattern count="other">{0} dienų</unitPattern>
+				<perUnitPattern>{0} per dieną</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>valandos</displayName>
@@ -8972,40 +9204,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} valandų</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikrosekundės</displayName>
-				<unitPattern count="one">{0} mikrosekundė</unitPattern>
-				<unitPattern count="few">{0} mikrosekundės</unitPattern>
-				<unitPattern count="many">{0} mikrosekundės</unitPattern>
-				<unitPattern count="other">{0} mikrosekundžių</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milisekundės</displayName>
-				<unitPattern count="one">{0} milisekundė</unitPattern>
-				<unitPattern count="few">{0} milisekundės</unitPattern>
-				<unitPattern count="many">{0} milisekundės</unitPattern>
-				<unitPattern count="other">{0} milisekundžių</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>minutės</displayName>
 				<unitPattern count="one">{0} minutė</unitPattern>
 				<unitPattern count="few">{0} minutės</unitPattern>
 				<unitPattern count="many">{0} minutės</unitPattern>
 				<unitPattern count="other">{0} minučių</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>mėnesiai</displayName>
-				<unitPattern count="one">{0} mėnuo</unitPattern>
-				<unitPattern count="few">{0} mėnesiai</unitPattern>
-				<unitPattern count="many">{0} mėnesio</unitPattern>
-				<unitPattern count="other">{0} mėnesių</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanosekundės</displayName>
-				<unitPattern count="one">{0} nanosekundė</unitPattern>
-				<unitPattern count="few">{0} nanosekundės</unitPattern>
-				<unitPattern count="many">{0} nanosekundės</unitPattern>
-				<unitPattern count="other">{0} nanosekundžių</unitPattern>
+				<perUnitPattern>{0} per minutę</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sekundės</displayName>
@@ -9015,19 +9220,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} sekundžių</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>savaitės</displayName>
-				<unitPattern count="one">{0} savaitė</unitPattern>
-				<unitPattern count="few">{0} savaitės</unitPattern>
-				<unitPattern count="many">{0} savaitės</unitPattern>
-				<unitPattern count="other">{0} savaičių</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milisekundės</displayName>
+				<unitPattern count="one">{0} milisekundė</unitPattern>
+				<unitPattern count="few">{0} milisekundės</unitPattern>
+				<unitPattern count="many">{0} milisekundės</unitPattern>
+				<unitPattern count="other">{0} milisekundžių</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>metai</displayName>
-				<unitPattern count="one">{0} metai</unitPattern>
-				<unitPattern count="few">{0} metai</unitPattern>
-				<unitPattern count="many">{0} metų</unitPattern>
-				<unitPattern count="other">{0} metų</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>mikrosekundės</displayName>
+				<unitPattern count="one">{0} mikrosekundė</unitPattern>
+				<unitPattern count="few">{0} mikrosekundės</unitPattern>
+				<unitPattern count="many">{0} mikrosekundės</unitPattern>
+				<unitPattern count="other">{0} mikrosekundžių</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosekundės</displayName>
+				<unitPattern count="one">{0} nanosekundė</unitPattern>
+				<unitPattern count="few">{0} nanosekundės</unitPattern>
+				<unitPattern count="many">{0} nanosekundės</unitPattern>
+				<unitPattern count="other">{0} nanosekundžių</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amperai</displayName>
@@ -9057,6 +9269,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} volto</unitPattern>
 				<unitPattern count="other">{0} voltų</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokalorijos</displayName>
+				<unitPattern count="one">{0} kilokalorija</unitPattern>
+				<unitPattern count="few">{0} kilokalorijos</unitPattern>
+				<unitPattern count="many">{0} kilokalorijos</unitPattern>
+				<unitPattern count="other">{0} kilokalorijų</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kalorijos</displayName>
 				<unitPattern count="one">{0} kalorija</unitPattern>
@@ -9071,20 +9290,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kalorijos</unitPattern>
 				<unitPattern count="other">{0} kalorijų</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>džauliai</displayName>
-				<unitPattern count="one">{0} džaulis</unitPattern>
-				<unitPattern count="few">{0} džauliai</unitPattern>
-				<unitPattern count="many">{0} džaulio</unitPattern>
-				<unitPattern count="other">{0} džaulių</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokalorijos</displayName>
-				<unitPattern count="one">{0} kilokalorija</unitPattern>
-				<unitPattern count="few">{0} kilokalorijos</unitPattern>
-				<unitPattern count="many">{0} kilokalorijos</unitPattern>
-				<unitPattern count="other">{0} kilokalorijų</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilodžauliai</displayName>
 				<unitPattern count="one">{0} kilodžaulis</unitPattern>
@@ -9092,6 +9297,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kilodžaulio</unitPattern>
 				<unitPattern count="other">{0} kilodžaulių</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>džauliai</displayName>
+				<unitPattern count="one">{0} džaulis</unitPattern>
+				<unitPattern count="few">{0} džauliai</unitPattern>
+				<unitPattern count="many">{0} džaulio</unitPattern>
+				<unitPattern count="other">{0} džaulių</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilovatvalandės</displayName>
 				<unitPattern count="one">{0} kilovatvalandė</unitPattern>
@@ -9106,12 +9318,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} gigaherco</unitPattern>
 				<unitPattern count="other">{0} gigahercų</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hercai</displayName>
-				<unitPattern count="one">{0} hercas</unitPattern>
-				<unitPattern count="few">{0} hercai</unitPattern>
-				<unitPattern count="many">{0} herco</unitPattern>
-				<unitPattern count="other">{0} hercų</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megahercai</displayName>
+				<unitPattern count="one">{0} megahercas</unitPattern>
+				<unitPattern count="few">{0} megahercai</unitPattern>
+				<unitPattern count="many">{0} megaherco</unitPattern>
+				<unitPattern count="other">{0} megahercų</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kilohercai</displayName>
@@ -9120,26 +9332,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kiloherco</unitPattern>
 				<unitPattern count="other">{0} kilohercų</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megahercai</displayName>
-				<unitPattern count="one">{0} megahercas</unitPattern>
-				<unitPattern count="few">{0} megahercai</unitPattern>
-				<unitPattern count="many">{0} megaherco</unitPattern>
-				<unitPattern count="other">{0} megahercų</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hercai</displayName>
+				<unitPattern count="one">{0} hercas</unitPattern>
+				<unitPattern count="few">{0} hercai</unitPattern>
+				<unitPattern count="many">{0} herco</unitPattern>
+				<unitPattern count="other">{0} hercų</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>astronominiai vienetai</displayName>
-				<unitPattern count="one">{0} astronominis vienetas</unitPattern>
-				<unitPattern count="few">{0} astronominiai vienetai</unitPattern>
-				<unitPattern count="many">{0} astronominio vieneto</unitPattern>
-				<unitPattern count="other">{0} astronominių vienetų</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometrai</displayName>
+				<unitPattern count="one">{0} kilometras</unitPattern>
+				<unitPattern count="few">{0} kilometrai</unitPattern>
+				<unitPattern count="many">{0} kilometro</unitPattern>
+				<unitPattern count="other">{0} kilometrų</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>centimetrai</displayName>
-				<unitPattern count="one">{0} centimetras</unitPattern>
-				<unitPattern count="few">{0} centimetrai</unitPattern>
-				<unitPattern count="many">{0} centimetro</unitPattern>
-				<unitPattern count="other">{0} centimetrų</unitPattern>
+			<unit type="length-meter">
+				<displayName>metrai</displayName>
+				<unitPattern count="one">{0} metras</unitPattern>
+				<unitPattern count="few">{0} metrai</unitPattern>
+				<unitPattern count="many">{0} metro</unitPattern>
+				<unitPattern count="other">{0} metrų</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>decimetrai</displayName>
@@ -9148,68 +9362,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} decimetro</unitPattern>
 				<unitPattern count="other">{0} decimetrų</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName>fadomai</displayName>
-				<unitPattern count="one">{0} fadomas</unitPattern>
-				<unitPattern count="few">{0} fadomai</unitPattern>
-				<unitPattern count="many">{0} fadomo</unitPattern>
-				<unitPattern count="other">{0} ftm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>pėdos</displayName>
-				<unitPattern count="one">{0} pėda</unitPattern>
-				<unitPattern count="few">{0} pėdos</unitPattern>
-				<unitPattern count="many">{0} pėdos</unitPattern>
-				<unitPattern count="other">{0} pėdų</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>furlongai</displayName>
-				<unitPattern count="one">{0} furlongas</unitPattern>
-				<unitPattern count="few">{0} furlongai</unitPattern>
-				<unitPattern count="many">{0} furlongo</unitPattern>
-				<unitPattern count="other">{0} furlongų</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>coliai</displayName>
-				<unitPattern count="one">{0} colis</unitPattern>
-				<unitPattern count="few">{0} coliai</unitPattern>
-				<unitPattern count="many">{0} colio</unitPattern>
-				<unitPattern count="other">{0} colių</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometrai</displayName>
-				<unitPattern count="one">{0} kilometras</unitPattern>
-				<unitPattern count="few">{0} kilometrai</unitPattern>
-				<unitPattern count="many">{0} kilometro</unitPattern>
-				<unitPattern count="other">{0} kilometrų</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>šviesmečiai</displayName>
-				<unitPattern count="one">{0} šviesmetis</unitPattern>
-				<unitPattern count="few">{0} šviesmečiai</unitPattern>
-				<unitPattern count="many">{0} šviesmečio</unitPattern>
-				<unitPattern count="other">{0} šviesmečių</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metrai</displayName>
-				<unitPattern count="one">{0} metras</unitPattern>
-				<unitPattern count="few">{0} metrai</unitPattern>
-				<unitPattern count="many">{0} metro</unitPattern>
-				<unitPattern count="other">{0} metrų</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>mikrometrai</displayName>
-				<unitPattern count="one">{0} mikrometras</unitPattern>
-				<unitPattern count="few">{0} mikrometrai</unitPattern>
-				<unitPattern count="many">{0} mikrometro</unitPattern>
-				<unitPattern count="other">{0} mikrometrų</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mylios</displayName>
-				<unitPattern count="one">{0} mylia</unitPattern>
-				<unitPattern count="few">{0} mylios</unitPattern>
-				<unitPattern count="many">{0} mylios</unitPattern>
-				<unitPattern count="other">{0} mylių</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>centimetrai</displayName>
+				<unitPattern count="one">{0} centimetras</unitPattern>
+				<unitPattern count="few">{0} centimetrai</unitPattern>
+				<unitPattern count="many">{0} centimetro</unitPattern>
+				<unitPattern count="other">{0} centimetrų</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>milimetrai</displayName>
@@ -9218,6 +9377,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} milimetro</unitPattern>
 				<unitPattern count="other">{0} milimetrų</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikrometrai</displayName>
+				<unitPattern count="one">{0} mikrometras</unitPattern>
+				<unitPattern count="few">{0} mikrometrai</unitPattern>
+				<unitPattern count="many">{0} mikrometro</unitPattern>
+				<unitPattern count="other">{0} mikrometrų</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanometrai</displayName>
 				<unitPattern count="one">{0} nanometras</unitPattern>
@@ -9225,20 +9391,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} nanometro</unitPattern>
 				<unitPattern count="other">{0} nanometrų</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>jūrmylės</displayName>
-				<unitPattern count="one">{0} jūrmylė</unitPattern>
-				<unitPattern count="few">{0} jūrmylės</unitPattern>
-				<unitPattern count="many">{0} jūrmylės</unitPattern>
-				<unitPattern count="other">{0} jūrmylių</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsekas</displayName>
-				<unitPattern count="one">{0} parsekas</unitPattern>
-				<unitPattern count="few">{0} parsekai</unitPattern>
-				<unitPattern count="many">{0} parseko</unitPattern>
-				<unitPattern count="other">{0} parsekų</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pikometrai</displayName>
 				<unitPattern count="one">{0} pikometras</unitPattern>
@@ -9246,6 +9398,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} pikometro</unitPattern>
 				<unitPattern count="other">{0} pikometrų</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mylios</displayName>
+				<unitPattern count="one">{0} mylia</unitPattern>
+				<unitPattern count="few">{0} mylios</unitPattern>
+				<unitPattern count="many">{0} mylios</unitPattern>
+				<unitPattern count="other">{0} mylių</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>jardai</displayName>
 				<unitPattern count="one">{0} jardas</unitPattern>
@@ -9253,6 +9412,71 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} jardo</unitPattern>
 				<unitPattern count="other">{0} jardų</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>pėdos</displayName>
+				<unitPattern count="one">{0} pėda</unitPattern>
+				<unitPattern count="few">{0} pėdos</unitPattern>
+				<unitPattern count="many">{0} pėdos</unitPattern>
+				<unitPattern count="other">{0} pėdų</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>coliai</displayName>
+				<unitPattern count="one">{0} colis</unitPattern>
+				<unitPattern count="few">{0} coliai</unitPattern>
+				<unitPattern count="many">{0} colio</unitPattern>
+				<unitPattern count="other">{0} colių</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsekas</displayName>
+				<unitPattern count="one">{0} parsekas</unitPattern>
+				<unitPattern count="few">{0} parsekai</unitPattern>
+				<unitPattern count="many">{0} parseko</unitPattern>
+				<unitPattern count="other">{0} parsekų</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>šviesmečiai</displayName>
+				<unitPattern count="one">{0} šviesmetis</unitPattern>
+				<unitPattern count="few">{0} šviesmečiai</unitPattern>
+				<unitPattern count="many">{0} šviesmečio</unitPattern>
+				<unitPattern count="other">{0} šviesmečių</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>astronominiai vienetai</displayName>
+				<unitPattern count="one">{0} astronominis vienetas</unitPattern>
+				<unitPattern count="few">{0} astronominiai vienetai</unitPattern>
+				<unitPattern count="many">{0} astronominio vieneto</unitPattern>
+				<unitPattern count="other">{0} astronominių vienetų</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>furlongai</displayName>
+				<unitPattern count="one">{0} furlongas</unitPattern>
+				<unitPattern count="few">{0} furlongai</unitPattern>
+				<unitPattern count="many">{0} furlongo</unitPattern>
+				<unitPattern count="other">{0} furlongų</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>fadomai</displayName>
+				<unitPattern count="one">{0} fadomas</unitPattern>
+				<unitPattern count="few">{0} fadomai</unitPattern>
+				<unitPattern count="many">{0} fadomo</unitPattern>
+				<unitPattern count="other">{0} ftm</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>jūrmylės</displayName>
+				<unitPattern count="one">{0} jūrmylė</unitPattern>
+				<unitPattern count="few">{0} jūrmylės</unitPattern>
+				<unitPattern count="many">{0} jūrmylės</unitPattern>
+				<unitPattern count="other">{0} jūrmylių</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>ilgoji mylia</displayName>
+				<unitPattern count="one">{0} ilgoji mylia</unitPattern>
+				<unitPattern count="few">{0} ilgosios mylios</unitPattern>
+				<unitPattern count="many">{0} ilgosios mylios</unitPattern>
+				<unitPattern count="other">{0} ilgųjų mylių</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>liuksai</displayName>
 				<unitPattern count="one">{0} liuksas</unitPattern>
@@ -9260,27 +9484,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} liukso</unitPattern>
 				<unitPattern count="other">{0} liuksų</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karatai</displayName>
-				<unitPattern count="one">{0} karatas</unitPattern>
-				<unitPattern count="few">{0} karatai</unitPattern>
-				<unitPattern count="many">{0} karato</unitPattern>
-				<unitPattern count="other">{0} karatų</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gramai</displayName>
-				<unitPattern count="one">{0} gramas</unitPattern>
-				<unitPattern count="few">{0} gramai</unitPattern>
-				<unitPattern count="many">{0} gramo</unitPattern>
-				<unitPattern count="other">{0} gramų</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogramai</displayName>
-				<unitPattern count="one">{0} kilogramas</unitPattern>
-				<unitPattern count="few">{0} kilogramai</unitPattern>
-				<unitPattern count="many">{0} kilogramo</unitPattern>
-				<unitPattern count="other">{0} kilogramų</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>metrinės tonos</displayName>
 				<unitPattern count="one">{0} metrinė tona</unitPattern>
@@ -9288,12 +9491,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} metrinės tonos</unitPattern>
 				<unitPattern count="other">{0} metrinių tonų</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mikrogramai</displayName>
-				<unitPattern count="one">{0} mikrogramas</unitPattern>
-				<unitPattern count="few">{0} mikrogramai</unitPattern>
-				<unitPattern count="many">{0} mikrogramo</unitPattern>
-				<unitPattern count="other">{0} mikrogramų</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogramai</displayName>
+				<unitPattern count="one">{0} kilogramas</unitPattern>
+				<unitPattern count="few">{0} kilogramai</unitPattern>
+				<unitPattern count="many">{0} kilogramo</unitPattern>
+				<unitPattern count="other">{0} kilogramų</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gramai</displayName>
+				<unitPattern count="one">{0} gramas</unitPattern>
+				<unitPattern count="few">{0} gramai</unitPattern>
+				<unitPattern count="many">{0} gramo</unitPattern>
+				<unitPattern count="other">{0} gramų</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>miligramai</displayName>
@@ -9302,33 +9514,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} miligramo</unitPattern>
 				<unitPattern count="other">{0} miligramų</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>uncijos</displayName>
-				<unitPattern count="one">{0} uncija</unitPattern>
-				<unitPattern count="few">{0} uncijos</unitPattern>
-				<unitPattern count="many">{0} uncijos</unitPattern>
-				<unitPattern count="other">{0} uncijų</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>Trojos uncijos</displayName>
-				<unitPattern count="one">{0} Trojos uncija</unitPattern>
-				<unitPattern count="few">{0} Trojos uncijos</unitPattern>
-				<unitPattern count="many">{0} Trojos uncijos</unitPattern>
-				<unitPattern count="other">{0} Trojos uncijų</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>svarai</displayName>
-				<unitPattern count="one">{0} svaras</unitPattern>
-				<unitPattern count="few">{0} svarai</unitPattern>
-				<unitPattern count="many">{0} svaro</unitPattern>
-				<unitPattern count="other">{0} svarų</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>stonai</displayName>
-				<unitPattern count="one">{0} stonas</unitPattern>
-				<unitPattern count="few">{0} stonai</unitPattern>
-				<unitPattern count="many">{0} stono</unitPattern>
-				<unitPattern count="other">{0} stonų</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>mikrogramai</displayName>
+				<unitPattern count="one">{0} mikrogramas</unitPattern>
+				<unitPattern count="few">{0} mikrogramai</unitPattern>
+				<unitPattern count="many">{0} mikrogramo</unitPattern>
+				<unitPattern count="other">{0} mikrogramų</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tonos</displayName>
@@ -9337,6 +9528,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} tonos</unitPattern>
 				<unitPattern count="other">{0} tonų</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName>stonai</displayName>
+				<unitPattern count="one">{0} stonas</unitPattern>
+				<unitPattern count="few">{0} stonai</unitPattern>
+				<unitPattern count="many">{0} stono</unitPattern>
+				<unitPattern count="other">{0} stonų</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>svarai</displayName>
+				<unitPattern count="one">{0} svaras</unitPattern>
+				<unitPattern count="few">{0} svarai</unitPattern>
+				<unitPattern count="many">{0} svaro</unitPattern>
+				<unitPattern count="other">{0} svarų</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>uncijos</displayName>
+				<unitPattern count="one">{0} uncija</unitPattern>
+				<unitPattern count="few">{0} uncijos</unitPattern>
+				<unitPattern count="many">{0} uncijos</unitPattern>
+				<unitPattern count="other">{0} uncijų</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>Trojos uncijos</displayName>
+				<unitPattern count="one">{0} Trojos uncija</unitPattern>
+				<unitPattern count="few">{0} Trojos uncijos</unitPattern>
+				<unitPattern count="many">{0} Trojos uncijos</unitPattern>
+				<unitPattern count="other">{0} Trojos uncijų</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karatai</displayName>
+				<unitPattern count="one">{0} karatas</unitPattern>
+				<unitPattern count="few">{0} karatai</unitPattern>
+				<unitPattern count="many">{0} karato</unitPattern>
+				<unitPattern count="other">{0} karatų</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigavatai</displayName>
 				<unitPattern count="one">{0} gigavatas</unitPattern>
@@ -9344,20 +9572,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} gigavato</unitPattern>
 				<unitPattern count="other">{0} gigavatų</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>arklio galios</displayName>
-				<unitPattern count="one">{0} arklio galia</unitPattern>
-				<unitPattern count="few">{0} arklio galios</unitPattern>
-				<unitPattern count="many">{0} arklio galios</unitPattern>
-				<unitPattern count="other">{0} arklio galių</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilovatai</displayName>
-				<unitPattern count="one">{0} kilovatas</unitPattern>
-				<unitPattern count="few">{0} kilovatai</unitPattern>
-				<unitPattern count="many">{0} kilovato</unitPattern>
-				<unitPattern count="other">{0} kilovatų</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>megavatai</displayName>
 				<unitPattern count="one">{0} megavatas</unitPattern>
@@ -9365,12 +9579,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} megavato</unitPattern>
 				<unitPattern count="other">{0} megavatų</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>milivatai</displayName>
-				<unitPattern count="one">{0} milivatas</unitPattern>
-				<unitPattern count="few">{0} milivatai</unitPattern>
-				<unitPattern count="many">{0} milivato</unitPattern>
-				<unitPattern count="other">{0} milivatų</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilovatai</displayName>
+				<unitPattern count="one">{0} kilovatas</unitPattern>
+				<unitPattern count="few">{0} kilovatai</unitPattern>
+				<unitPattern count="many">{0} kilovato</unitPattern>
+				<unitPattern count="other">{0} kilovatų</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>vatai</displayName>
@@ -9379,6 +9593,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} vato</unitPattern>
 				<unitPattern count="other">{0} vatų</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>milivatai</displayName>
+				<unitPattern count="one">{0} milivatas</unitPattern>
+				<unitPattern count="few">{0} milivatai</unitPattern>
+				<unitPattern count="many">{0} milivato</unitPattern>
+				<unitPattern count="other">{0} milivatų</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>arklio galios</displayName>
+				<unitPattern count="one">{0} arklio galia</unitPattern>
+				<unitPattern count="few">{0} arklio galios</unitPattern>
+				<unitPattern count="many">{0} arklio galios</unitPattern>
+				<unitPattern count="other">{0} arklio galių</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hektopaskaliai</displayName>
 				<unitPattern count="one">{0} hektopaskalis</unitPattern>
@@ -9386,20 +9614,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} hektopaskalio</unitPattern>
 				<unitPattern count="other">{0} hektopaskalių</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>gyvsidabrio stulpelio coliai</displayName>
-				<unitPattern count="one">{0} gyvsidabrio stulpelio colis</unitPattern>
-				<unitPattern count="few">{0} gyvsidabrio stulpelio coliai</unitPattern>
-				<unitPattern count="many">{0} gyvsidabrio stulpelio colio</unitPattern>
-				<unitPattern count="other">{0} gyvsidabrio stulpelio colių</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>milbaras</displayName>
-				<unitPattern count="one">{0} milibaras</unitPattern>
-				<unitPattern count="few">{0} milibarai</unitPattern>
-				<unitPattern count="many">{0} milibaro</unitPattern>
-				<unitPattern count="other">{0} milibarų</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>gysidabrio stulpelio milimetrai</displayName>
 				<unitPattern count="one">{0} gysidabrio stulpelio milimetras</unitPattern>
@@ -9414,12 +9628,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} svaro kv. colyje</unitPattern>
 				<unitPattern count="other">{0} svarų kv. colyje</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karatai</displayName>
-				<unitPattern count="one">{0} karatas</unitPattern>
-				<unitPattern count="few">{0} karatai</unitPattern>
-				<unitPattern count="many">{0} karato</unitPattern>
-				<unitPattern count="other">{0} karatų</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>gyvsidabrio stulpelio coliai</displayName>
+				<unitPattern count="one">{0} gyvsidabrio stulpelio colis</unitPattern>
+				<unitPattern count="few">{0} gyvsidabrio stulpelio coliai</unitPattern>
+				<unitPattern count="many">{0} gyvsidabrio stulpelio colio</unitPattern>
+				<unitPattern count="other">{0} gyvsidabrio stulpelio colių</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>milibarai</displayName>
+				<unitPattern count="one">{0} milibaras</unitPattern>
+				<unitPattern count="few">{0} milibarai</unitPattern>
+				<unitPattern count="many">{0} milibaro</unitPattern>
+				<unitPattern count="other">{0} milibarų</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometrai per valandą</displayName>
@@ -9442,6 +9663,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mylios per valandą</unitPattern>
 				<unitPattern count="other">{0} mylių per valandą</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>mazgas</displayName>
+				<unitPattern count="one">{0} mazgas</unitPattern>
+				<unitPattern count="few">{0} mazgai</unitPattern>
+				<unitPattern count="many">{0} mazgo</unitPattern>
+				<unitPattern count="other">{0} mazgų</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>Celsijaus laipsniai</displayName>
 				<unitPattern count="one">{0} Celsijaus laipsnis</unitPattern>
@@ -9463,48 +9698,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kelvino</unitPattern>
 				<unitPattern count="other">{0} kelvinų</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>pėdos akre</displayName>
-				<unitPattern count="one">{0} pėda akre</unitPattern>
-				<unitPattern count="few">{0} pėdos akre</unitPattern>
-				<unitPattern count="many">{0} pėdos akre</unitPattern>
-				<unitPattern count="other">{0} pėdų akre</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>bušeliai</displayName>
-				<unitPattern count="one">{0} bušelis</unitPattern>
-				<unitPattern count="few">{0} bušeliai</unitPattern>
-				<unitPattern count="many">{0} bušelio</unitPattern>
-				<unitPattern count="other">{0} bušelių</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>centilitrai</displayName>
-				<unitPattern count="one">{0} centilitras</unitPattern>
-				<unitPattern count="few">{0} centilitrai</unitPattern>
-				<unitPattern count="many">{0} centilitro</unitPattern>
-				<unitPattern count="other">{0} centilitrų</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>kubiniai centimetrai</displayName>
-				<unitPattern count="one">{0} kubinis centimetras</unitPattern>
-				<unitPattern count="few">{0} kubiniai centimetrai</unitPattern>
-				<unitPattern count="many">{0} kubinio centimetro</unitPattern>
-				<unitPattern count="other">{0} kubinių centimetrų</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>kubinės pėdos</displayName>
-				<unitPattern count="one">{0} kubinė pėda</unitPattern>
-				<unitPattern count="few">{0} kubinės pėdos</unitPattern>
-				<unitPattern count="many">{0} kubinės pėdos</unitPattern>
-				<unitPattern count="other">{0} kubinių pėdų</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>kubiniai coliai</displayName>
-				<unitPattern count="one">{0} kubinis colis</unitPattern>
-				<unitPattern count="few">{0} kubiniai coliai</unitPattern>
-				<unitPattern count="many">{0} kubinio colio</unitPattern>
-				<unitPattern count="other">{0} kubinių colių</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kubiniai kilometrai</displayName>
 				<unitPattern count="one">{0} kubinis kilometras</unitPattern>
@@ -9518,6 +9711,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kubiniai metrai</unitPattern>
 				<unitPattern count="many">{0} kubinio metro</unitPattern>
 				<unitPattern count="other">{0} kubinių metrų</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>kubiniai centimetrai</displayName>
+				<unitPattern count="one">{0} kubinis centimetras</unitPattern>
+				<unitPattern count="few">{0} kubiniai centimetrai</unitPattern>
+				<unitPattern count="many">{0} kubinio centimetro</unitPattern>
+				<unitPattern count="other">{0} kubinių centimetrų</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>kubinės mylios</displayName>
@@ -9533,33 +9735,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kubinio jardo</unitPattern>
 				<unitPattern count="other">{0} kubinių jardų</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>stiklinės</displayName>
-				<unitPattern count="one">{0} stiklinė</unitPattern>
-				<unitPattern count="few">{0} stiklinės</unitPattern>
-				<unitPattern count="many">{0} stiklinės</unitPattern>
-				<unitPattern count="other">{0} stiklinių</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>kubinės pėdos</displayName>
+				<unitPattern count="one">{0} kubinė pėda</unitPattern>
+				<unitPattern count="few">{0} kubinės pėdos</unitPattern>
+				<unitPattern count="many">{0} kubinės pėdos</unitPattern>
+				<unitPattern count="other">{0} kubinių pėdų</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>decilitrai</displayName>
-				<unitPattern count="one">{0} decilitras</unitPattern>
-				<unitPattern count="few">{0} decilitrai</unitPattern>
-				<unitPattern count="many">{0} decilitro</unitPattern>
-				<unitPattern count="other">{0} decilitrų</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>kubiniai coliai</displayName>
+				<unitPattern count="one">{0} kubinis colis</unitPattern>
+				<unitPattern count="few">{0} kubiniai coliai</unitPattern>
+				<unitPattern count="many">{0} kubinio colio</unitPattern>
+				<unitPattern count="other">{0} kubinių colių</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>skysčio uncijos</displayName>
-				<unitPattern count="one">{0} skysčio uncija</unitPattern>
-				<unitPattern count="few">{0} skysčio uncijos</unitPattern>
-				<unitPattern count="many">{0} skysčio uncijos</unitPattern>
-				<unitPattern count="other">{0} skysčio uncijų</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>galonai</displayName>
-				<unitPattern count="one">{0} galonas</unitPattern>
-				<unitPattern count="few">{0} galonai</unitPattern>
-				<unitPattern count="many">{0} galono</unitPattern>
-				<unitPattern count="other">{0} galonų</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megalitrai</displayName>
+				<unitPattern count="one">{0} megalitras</unitPattern>
+				<unitPattern count="few">{0} megalitrai</unitPattern>
+				<unitPattern count="many">{0} megalitro</unitPattern>
+				<unitPattern count="other">{0} megalitrų</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hektolitrai</displayName>
@@ -9574,13 +9769,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} litrai</unitPattern>
 				<unitPattern count="many">{0} litro</unitPattern>
 				<unitPattern count="other">{0} litrų</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalitrai</displayName>
-				<unitPattern count="one">{0} megalitras</unitPattern>
-				<unitPattern count="few">{0} megalitrai</unitPattern>
-				<unitPattern count="many">{0} megalitro</unitPattern>
-				<unitPattern count="other">{0} megalitrų</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>decilitrai</displayName>
+				<unitPattern count="one">{0} decilitras</unitPattern>
+				<unitPattern count="few">{0} decilitrai</unitPattern>
+				<unitPattern count="many">{0} decilitro</unitPattern>
+				<unitPattern count="other">{0} decilitrų</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centilitrai</displayName>
+				<unitPattern count="one">{0} centilitras</unitPattern>
+				<unitPattern count="few">{0} centilitrai</unitPattern>
+				<unitPattern count="many">{0} centilitro</unitPattern>
+				<unitPattern count="other">{0} centilitrų</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mililitrai</displayName>
@@ -9589,12 +9792,41 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mililitro</unitPattern>
 				<unitPattern count="other">{0} mililitrų</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pintos</displayName>
-				<unitPattern count="one">{0} pinta</unitPattern>
-				<unitPattern count="few">{0} pintos</unitPattern>
-				<unitPattern count="many">{0} pintos</unitPattern>
-				<unitPattern count="other">{0} pintų</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>metrinės pintos</displayName>
+				<unitPattern count="one">{0} metrinė pinta</unitPattern>
+				<unitPattern count="few">{0} metrinės pintos</unitPattern>
+				<unitPattern count="many">{0} metrinės pintos</unitPattern>
+				<unitPattern count="other">{0} metrinių pintų</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>matavimo puodeliai</displayName>
+				<unitPattern count="one">{0} matavimo puodelis</unitPattern>
+				<unitPattern count="few">{0} matavimo puodeliai</unitPattern>
+				<unitPattern count="many">{0} matavimo puodelio</unitPattern>
+				<unitPattern count="other">{0} matavimo puodelių</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>pėdos akre</displayName>
+				<unitPattern count="one">{0} pėda akre</unitPattern>
+				<unitPattern count="few">{0} pėdos akre</unitPattern>
+				<unitPattern count="many">{0} pėdos akre</unitPattern>
+				<unitPattern count="other">{0} pėdų akre</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>bušeliai</displayName>
+				<unitPattern count="one">{0} bušelis</unitPattern>
+				<unitPattern count="few">{0} bušeliai</unitPattern>
+				<unitPattern count="many">{0} bušelio</unitPattern>
+				<unitPattern count="other">{0} bušelių</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galonai</displayName>
+				<unitPattern count="one">{0} galonas</unitPattern>
+				<unitPattern count="few">{0} galonai</unitPattern>
+				<unitPattern count="many">{0} galono</unitPattern>
+				<unitPattern count="other">{0} galonų</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>kvortos</displayName>
@@ -9603,6 +9835,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kvortos</unitPattern>
 				<unitPattern count="other">{0} kvortų</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pintos</displayName>
+				<unitPattern count="one">{0} pinta</unitPattern>
+				<unitPattern count="few">{0} pintos</unitPattern>
+				<unitPattern count="many">{0} pintos</unitPattern>
+				<unitPattern count="other">{0} pintų</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>stiklinės</displayName>
+				<unitPattern count="one">{0} stiklinė</unitPattern>
+				<unitPattern count="few">{0} stiklinės</unitPattern>
+				<unitPattern count="many">{0} stiklinės</unitPattern>
+				<unitPattern count="other">{0} stiklinių</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>skysčio uncijos</displayName>
+				<unitPattern count="one">{0} skysčio uncija</unitPattern>
+				<unitPattern count="few">{0} skysčio uncijos</unitPattern>
+				<unitPattern count="many">{0} skysčio uncijos</unitPattern>
+				<unitPattern count="other">{0} skysčio uncijų</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>valgomieji šaukštai</displayName>
 				<unitPattern count="one">{0} valgomasis šaukštas</unitPattern>
@@ -9617,6 +9870,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} arbatinio šaukštelio</unitPattern>
 				<unitPattern count="other">{0} arbatinių šaukštelių</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -9636,6 +9895,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>apsisuk.</displayName>
+				<unitPattern count="one">{0} apsisuk.</unitPattern>
+				<unitPattern count="few">{0} apsisuk.</unitPattern>
+				<unitPattern count="many">{0} apsisuk.</unitPattern>
+				<unitPattern count="other">{0} apsisuk.</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="few">{0} rad</unitPattern>
+				<unitPattern count="many">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>laipsniai</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>kampo minutės</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
@@ -9650,40 +9930,56 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>laipsniai</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="few">{0}°</unitPattern>
-				<unitPattern count="many">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="few">{0} rad</unitPattern>
-				<unitPattern count="many">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>a.</displayName>
-				<unitPattern count="one">{0} a.</unitPattern>
-				<unitPattern count="few">{0} a.</unitPattern>
-				<unitPattern count="many">{0} a.</unitPattern>
-				<unitPattern count="other">{0} a.</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>kv. km</displayName>
+				<unitPattern count="one">{0} kv. km</unitPattern>
+				<unitPattern count="few">{0} kv. km</unitPattern>
+				<unitPattern count="many">{0} kv. km</unitPattern>
+				<unitPattern count="other">{0} kv. km</unitPattern>
 			</unit>
 			<unit type="area-hectare">
-				<displayName>ha</displayName>
+				<displayName>hektarai</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="few">{0} ha</unitPattern>
 				<unitPattern count="many">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>kv. m</displayName>
+				<unitPattern count="one">{0} kv. m</unitPattern>
+				<unitPattern count="few">{0} kv. m</unitPattern>
+				<unitPattern count="many">{0} kv. m</unitPattern>
+				<unitPattern count="other">{0} kv. m</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="few">{0} cm²</unitPattern>
 				<unitPattern count="many">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>kv. mylios</displayName>
+				<unitPattern count="one">{0} kv. my</unitPattern>
+				<unitPattern count="few">{0} kv. my</unitPattern>
+				<unitPattern count="many">{0} kv. my</unitPattern>
+				<unitPattern count="other">{0} kv. my</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>akrai</displayName>
+				<unitPattern count="one">{0} a.</unitPattern>
+				<unitPattern count="few">{0} a.</unitPattern>
+				<unitPattern count="many">{0} a.</unitPattern>
+				<unitPattern count="other">{0} a.</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="few">{0} yd²</unitPattern>
+				<unitPattern count="many">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>kv. pėda</displayName>
@@ -9698,34 +9994,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} in²</unitPattern>
 				<unitPattern count="many">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kv. km</displayName>
-				<unitPattern count="one">{0} kv. km</unitPattern>
-				<unitPattern count="few">{0} kv. km</unitPattern>
-				<unitPattern count="many">{0} kv. km</unitPattern>
-				<unitPattern count="other">{0} kv. km</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>kv. m</displayName>
-				<unitPattern count="one">{0} kv. m</unitPattern>
-				<unitPattern count="few">{0} kv. m</unitPattern>
-				<unitPattern count="many">{0} kv. m</unitPattern>
-				<unitPattern count="other">{0} kv. m</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>kv. my</displayName>
-				<unitPattern count="one">{0} kv. my</unitPattern>
-				<unitPattern count="few">{0} kv. my</unitPattern>
-				<unitPattern count="many">{0} kv. my</unitPattern>
-				<unitPattern count="other">{0} kv. my</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="few">{0} yd²</unitPattern>
-				<unitPattern count="many">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="few">{0} kt</unitPattern>
+				<unitPattern count="many">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
@@ -9734,6 +10010,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} l/km</unitPattern>
 				<unitPattern count="other">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="few">{0} l/100 km</unitPattern>
+				<unitPattern count="many">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mi/gal</displayName>
 				<unitPattern count="one">{0} mi/gal</unitPattern>
@@ -9741,69 +10024,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mi/gal</unitPattern>
 				<unitPattern count="other">{0} mi/gal</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bitai</displayName>
-				<unitPattern count="one">{0} bitas</unitPattern>
-				<unitPattern count="few">{0} bitai</unitPattern>
-				<unitPattern count="many">{0} bito</unitPattern>
-				<unitPattern count="other">{0} bitų</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>B</displayName>
-				<unitPattern count="one">{0} B</unitPattern>
-				<unitPattern count="few">{0} B</unitPattern>
-				<unitPattern count="many">{0} B</unitPattern>
-				<unitPattern count="other">{0} B</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="few">{0} Gb</unitPattern>
-				<unitPattern count="many">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="few">{0} GB</unitPattern>
-				<unitPattern count="many">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="few">{0} kb</unitPattern>
-				<unitPattern count="many">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="few">{0} kB</unitPattern>
-				<unitPattern count="many">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="few">{0} Mb</unitPattern>
-				<unitPattern count="many">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="few">{0} MB</unitPattern>
-				<unitPattern count="many">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="few">{0} Tb</unitPattern>
-				<unitPattern count="many">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
@@ -9811,12 +10031,107 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="few">{0} Tb</unitPattern>
+				<unitPattern count="many">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="few">{0} GB</unitPattern>
+				<unitPattern count="many">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="few">{0} Gb</unitPattern>
+				<unitPattern count="many">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="few">{0} MB</unitPattern>
+				<unitPattern count="many">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="few">{0} Mb</unitPattern>
+				<unitPattern count="many">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="few">{0} kB</unitPattern>
+				<unitPattern count="many">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="few">{0} kb</unitPattern>
+				<unitPattern count="many">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>B</displayName>
+				<unitPattern count="one">{0} B</unitPattern>
+				<unitPattern count="few">{0} B</unitPattern>
+				<unitPattern count="many">{0} B</unitPattern>
+				<unitPattern count="other">{0} B</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bitai</displayName>
+				<unitPattern count="one">{0} b</unitPattern>
+				<unitPattern count="few">{0} b</unitPattern>
+				<unitPattern count="many">{0} b</unitPattern>
+				<unitPattern count="other">{0} b</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>a.</displayName>
+				<unitPattern count="one">{0} a.</unitPattern>
+				<unitPattern count="few">{0} a.</unitPattern>
+				<unitPattern count="many">{0} a.</unitPattern>
+				<unitPattern count="other">{0} a.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>metai</displayName>
+				<unitPattern count="one">{0} m.</unitPattern>
+				<unitPattern count="few">{0} m.</unitPattern>
+				<unitPattern count="many">{0} m.</unitPattern>
+				<unitPattern count="other">{0} m.</unitPattern>
+				<perUnitPattern>{0}/m.</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mėnesiai</displayName>
+				<unitPattern count="one">{0} mėn.</unitPattern>
+				<unitPattern count="few">{0} mėn.</unitPattern>
+				<unitPattern count="many">{0} mėn.</unitPattern>
+				<unitPattern count="other">{0} mėn.</unitPattern>
+				<perUnitPattern>{0}/mėn.</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>savaitės</displayName>
+				<unitPattern count="one">{0} sav.</unitPattern>
+				<unitPattern count="few">{0} sav.</unitPattern>
+				<unitPattern count="many">{0} sav.</unitPattern>
+				<unitPattern count="other">{0} sav.</unitPattern>
+				<perUnitPattern>{0}/sav.</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>dienos</displayName>
 				<unitPattern count="one">{0} d.</unitPattern>
 				<unitPattern count="few">{0} d.</unitPattern>
 				<unitPattern count="many">{0} d.</unitPattern>
 				<unitPattern count="other">{0} d.</unitPattern>
+				<perUnitPattern>{0}/d.</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>valandos</displayName>
@@ -9826,40 +10141,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} val.</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="few">{0} μs</unitPattern>
-				<unitPattern count="many">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milisek.</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="few">{0} ms</unitPattern>
-				<unitPattern count="many">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min.</displayName>
 				<unitPattern count="one">{0} min.</unitPattern>
 				<unitPattern count="few">{0} min.</unitPattern>
 				<unitPattern count="many">{0} min.</unitPattern>
 				<unitPattern count="other">{0} min.</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>mėnesiai</displayName>
-				<unitPattern count="one">{0} mėn.</unitPattern>
-				<unitPattern count="few">{0} mėn.</unitPattern>
-				<unitPattern count="many">{0} mėn.</unitPattern>
-				<unitPattern count="other">{0} mėn.</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanosek.</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="few">{0} ns</unitPattern>
-				<unitPattern count="many">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/min.</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sek.</displayName>
@@ -9869,19 +10157,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} sek.</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>savaitės</displayName>
-				<unitPattern count="one">{0} sav.</unitPattern>
-				<unitPattern count="few">{0} sav.</unitPattern>
-				<unitPattern count="many">{0} sav.</unitPattern>
-				<unitPattern count="other">{0} sav.</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milisek.</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="few">{0} ms</unitPattern>
+				<unitPattern count="many">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>metai</displayName>
-				<unitPattern count="one">{0} m.</unitPattern>
-				<unitPattern count="few">{0} m.</unitPattern>
-				<unitPattern count="many">{0} m.</unitPattern>
-				<unitPattern count="other">{0} m.</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="few">{0} μs</unitPattern>
+				<unitPattern count="many">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosek.</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="few">{0} ns</unitPattern>
+				<unitPattern count="many">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>A</displayName>
@@ -9911,6 +10206,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="few">{0} kcal</unitPattern>
+				<unitPattern count="many">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -9925,20 +10227,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} cal</unitPattern>
 				<unitPattern count="other">{0} cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>J</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="few">{0} J</unitPattern>
-				<unitPattern count="many">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="few">{0} kcal</unitPattern>
-				<unitPattern count="many">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
@@ -9946,6 +10234,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="few">{0} J</unitPattern>
+				<unitPattern count="many">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -9960,12 +10255,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="few">{0} Hz</unitPattern>
-				<unitPattern count="many">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="few">{0} MHz</unitPattern>
+				<unitPattern count="many">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
@@ -9974,26 +10269,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="few">{0} MHz</unitPattern>
-				<unitPattern count="many">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="few">{0} Hz</unitPattern>
+				<unitPattern count="many">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>AV</displayName>
-				<unitPattern count="one">{0} AV</unitPattern>
-				<unitPattern count="few">{0} AV</unitPattern>
-				<unitPattern count="many">{0} AV</unitPattern>
-				<unitPattern count="other">{0} AV</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="few">{0} km</unitPattern>
+				<unitPattern count="many">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="few">{0} cm</unitPattern>
-				<unitPattern count="many">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="few">{0} m</unitPattern>
+				<unitPattern count="many">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
@@ -10002,68 +10299,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName>ftm</displayName>
-				<unitPattern count="one">{0} ftm</unitPattern>
-				<unitPattern count="few">{0} ftm</unitPattern>
-				<unitPattern count="many">{0} ftm</unitPattern>
-				<unitPattern count="other">{0} ftm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>pėda</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="few">{0} ft</unitPattern>
-				<unitPattern count="many">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>fur</displayName>
-				<unitPattern count="one">{0} fur</unitPattern>
-				<unitPattern count="few">{0} fur</unitPattern>
-				<unitPattern count="many">{0} fur</unitPattern>
-				<unitPattern count="other">{0} fur</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>coliai</displayName>
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="few">{0} in</unitPattern>
-				<unitPattern count="many">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="few">{0} km</unitPattern>
-				<unitPattern count="many">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>šviesmečiai</displayName>
-				<unitPattern count="one">{0} šm.</unitPattern>
-				<unitPattern count="few">{0} šm.</unitPattern>
-				<unitPattern count="many">{0} šm.</unitPattern>
-				<unitPattern count="other">{0} šm.</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="few">{0} m</unitPattern>
-				<unitPattern count="many">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="few">{0} µm</unitPattern>
-				<unitPattern count="many">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mi</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="few">{0} mi</unitPattern>
-				<unitPattern count="many">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="few">{0} cm</unitPattern>
+				<unitPattern count="many">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -10072,6 +10314,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="few">{0} µm</unitPattern>
+				<unitPattern count="many">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
@@ -10079,20 +10328,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>M</displayName>
-				<unitPattern count="one">{0} M</unitPattern>
-				<unitPattern count="few">{0} M</unitPattern>
-				<unitPattern count="many">{0} M</unitPattern>
-				<unitPattern count="other">{0} M</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="few">{0} pc</unitPattern>
-				<unitPattern count="many">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
@@ -10100,6 +10335,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="few">{0} mi</unitPattern>
+				<unitPattern count="many">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yd</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
@@ -10107,6 +10349,71 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>pėda</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="few">{0} ft</unitPattern>
+				<unitPattern count="many">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>coliai</displayName>
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="few">{0} in</unitPattern>
+				<unitPattern count="many">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="few">{0} pc</unitPattern>
+				<unitPattern count="many">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>šviesmečiai</displayName>
+				<unitPattern count="one">{0} šm.</unitPattern>
+				<unitPattern count="few">{0} šm.</unitPattern>
+				<unitPattern count="many">{0} šm.</unitPattern>
+				<unitPattern count="other">{0} šm.</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>AV</displayName>
+				<unitPattern count="one">{0} AV</unitPattern>
+				<unitPattern count="few">{0} AV</unitPattern>
+				<unitPattern count="many">{0} AV</unitPattern>
+				<unitPattern count="other">{0} AV</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>fur</displayName>
+				<unitPattern count="one">{0} fur</unitPattern>
+				<unitPattern count="few">{0} fur</unitPattern>
+				<unitPattern count="many">{0} fur</unitPattern>
+				<unitPattern count="other">{0} fur</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>ftm</displayName>
+				<unitPattern count="one">{0} ftm</unitPattern>
+				<unitPattern count="few">{0} ftm</unitPattern>
+				<unitPattern count="many">{0} ftm</unitPattern>
+				<unitPattern count="other">{0} ftm</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>M</displayName>
+				<unitPattern count="one">{0} M</unitPattern>
+				<unitPattern count="few">{0} M</unitPattern>
+				<unitPattern count="many">{0} M</unitPattern>
+				<unitPattern count="other">{0} M</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>IM</displayName>
+				<unitPattern count="one">{0} IM</unitPattern>
+				<unitPattern count="few">{0} IM</unitPattern>
+				<unitPattern count="many">{0} IM</unitPattern>
+				<unitPattern count="other">{0} IM</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
@@ -10114,27 +10421,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>ct</displayName>
-				<unitPattern count="one">{0} ct</unitPattern>
-				<unitPattern count="few">{0} ct</unitPattern>
-				<unitPattern count="many">{0} ct</unitPattern>
-				<unitPattern count="other">{0} ct</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="few">{0} g</unitPattern>
-				<unitPattern count="many">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="few">{0} kg</unitPattern>
-				<unitPattern count="many">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>mt</displayName>
 				<unitPattern count="one">{0} mt</unitPattern>
@@ -10142,12 +10428,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mt</unitPattern>
 				<unitPattern count="other">{0} mt</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="few">{0} µg</unitPattern>
-				<unitPattern count="many">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="few">{0} kg</unitPattern>
+				<unitPattern count="many">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="many">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
@@ -10156,33 +10451,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="few">{0} oz</unitPattern>
-				<unitPattern count="many">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ozt</displayName>
-				<unitPattern count="one">{0} ozt</unitPattern>
-				<unitPattern count="few">{0} ozt</unitPattern>
-				<unitPattern count="many">{0} ozt</unitPattern>
-				<unitPattern count="other">{0} ozt</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="few">{0} lb</unitPattern>
-				<unitPattern count="many">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>st</displayName>
-				<unitPattern count="one">{0} st</unitPattern>
-				<unitPattern count="few">{0} st</unitPattern>
-				<unitPattern count="many">{0} st</unitPattern>
-				<unitPattern count="other">{0} st</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="few">{0} µg</unitPattern>
+				<unitPattern count="many">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>t</displayName>
@@ -10191,6 +10465,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName>st</displayName>
+				<unitPattern count="one">{0} st</unitPattern>
+				<unitPattern count="few">{0} st</unitPattern>
+				<unitPattern count="many">{0} st</unitPattern>
+				<unitPattern count="other">{0} st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="few">{0} lb</unitPattern>
+				<unitPattern count="many">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="few">{0} oz</unitPattern>
+				<unitPattern count="many">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ozt</displayName>
+				<unitPattern count="one">{0} ozt</unitPattern>
+				<unitPattern count="few">{0} ozt</unitPattern>
+				<unitPattern count="many">{0} ozt</unitPattern>
+				<unitPattern count="other">{0} ozt</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>ct</displayName>
+				<unitPattern count="one">{0} ct</unitPattern>
+				<unitPattern count="few">{0} ct</unitPattern>
+				<unitPattern count="many">{0} ct</unitPattern>
+				<unitPattern count="other">{0} ct</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
@@ -10198,20 +10509,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>AG</displayName>
-				<unitPattern count="one">{0} AG</unitPattern>
-				<unitPattern count="few">{0} AG</unitPattern>
-				<unitPattern count="many">{0} AG</unitPattern>
-				<unitPattern count="other">{0} AG</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="few">{0} kW</unitPattern>
-				<unitPattern count="many">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
@@ -10219,12 +10516,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="few">{0} mW</unitPattern>
-				<unitPattern count="many">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="few">{0} kW</unitPattern>
+				<unitPattern count="many">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>W</displayName>
@@ -10233,6 +10530,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="few">{0} mW</unitPattern>
+				<unitPattern count="many">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>AG</displayName>
+				<unitPattern count="one">{0} AG</unitPattern>
+				<unitPattern count="few">{0} AG</unitPattern>
+				<unitPattern count="many">{0} AG</unitPattern>
+				<unitPattern count="other">{0} AG</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
@@ -10240,20 +10551,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="few">{0} inHg</unitPattern>
-				<unitPattern count="many">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="few">{0} mbar</unitPattern>
-				<unitPattern count="many">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -10268,12 +10565,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} lb in²</unitPattern>
 				<unitPattern count="other">{0} lb in²</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="few">{0} kt</unitPattern>
-				<unitPattern count="many">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="few">{0} inHg</unitPattern>
+				<unitPattern count="many">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="few">{0} mbar</unitPattern>
+				<unitPattern count="many">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/val.</displayName>
@@ -10296,6 +10600,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>mazgas</displayName>
+				<unitPattern count="one">{0} KN</unitPattern>
+				<unitPattern count="few">{0} KN</unitPattern>
+				<unitPattern count="many">{0} KN</unitPattern>
+				<unitPattern count="other">{0} KN</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -10317,48 +10635,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ft akre</displayName>
-				<unitPattern count="one">{0} ft akre</unitPattern>
-				<unitPattern count="few">{0} ft akre</unitPattern>
-				<unitPattern count="many">{0} ft akre</unitPattern>
-				<unitPattern count="other">{0} ft akre</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>bu</displayName>
-				<unitPattern count="one">{0} bu</unitPattern>
-				<unitPattern count="few">{0} bu</unitPattern>
-				<unitPattern count="many">{0} bu</unitPattern>
-				<unitPattern count="other">{0} bu</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="few">{0} cl</unitPattern>
-				<unitPattern count="many">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="few">{0} cm³</unitPattern>
-				<unitPattern count="many">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="few">{0} ft³</unitPattern>
-				<unitPattern count="many">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="few">{0} in³</unitPattern>
-				<unitPattern count="many">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -10372,6 +10648,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} m³</unitPattern>
 				<unitPattern count="many">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="few">{0} cm³</unitPattern>
+				<unitPattern count="many">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -10387,33 +10672,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>stikl.</displayName>
-				<unitPattern count="one">{0} stikl.</unitPattern>
-				<unitPattern count="few">{0} stikl.</unitPattern>
-				<unitPattern count="many">{0} stikl.</unitPattern>
-				<unitPattern count="other">{0} stikl.</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="few">{0} ft³</unitPattern>
+				<unitPattern count="many">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="few">{0} dl</unitPattern>
-				<unitPattern count="many">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="few">{0} in³</unitPattern>
+				<unitPattern count="many">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>skysčio oz</displayName>
-				<unitPattern count="one">{0} skysčio oz</unitPattern>
-				<unitPattern count="few">{0} skysčio oz</unitPattern>
-				<unitPattern count="many">{0} skysčio oz</unitPattern>
-				<unitPattern count="other">{0} skysčio oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="few">{0} gal</unitPattern>
-				<unitPattern count="many">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="few">{0} Ml</unitPattern>
+				<unitPattern count="many">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -10428,13 +10706,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} l</unitPattern>
 				<unitPattern count="many">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="one">{0} Ml</unitPattern>
-				<unitPattern count="few">{0} Ml</unitPattern>
-				<unitPattern count="many">{0} Ml</unitPattern>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="few">{0} dl</unitPattern>
+				<unitPattern count="many">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="few">{0} cl</unitPattern>
+				<unitPattern count="many">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
@@ -10443,12 +10729,41 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="few">{0} pt</unitPattern>
-				<unitPattern count="many">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="few">{0} mpt</unitPattern>
+				<unitPattern count="many">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mat. puodelis</displayName>
+				<unitPattern count="one">{0} mat. puodelis</unitPattern>
+				<unitPattern count="few">{0} mat. puodeliai</unitPattern>
+				<unitPattern count="many">{0} mat. puodelio</unitPattern>
+				<unitPattern count="other">{0} mat. puodelių</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>pėda akre</displayName>
+				<unitPattern count="one">{0} ft akre</unitPattern>
+				<unitPattern count="few">{0} ft akre</unitPattern>
+				<unitPattern count="many">{0} ft akre</unitPattern>
+				<unitPattern count="other">{0} ft akre</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>bu</displayName>
+				<unitPattern count="one">{0} bu</unitPattern>
+				<unitPattern count="few">{0} bu</unitPattern>
+				<unitPattern count="many">{0} bu</unitPattern>
+				<unitPattern count="other">{0} bu</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="few">{0} gal</unitPattern>
+				<unitPattern count="many">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>kvortos</displayName>
@@ -10457,6 +10772,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kvortos</unitPattern>
 				<unitPattern count="other">{0} kvortų</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pintos</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="few">{0} pt</unitPattern>
+				<unitPattern count="many">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>stikl.</displayName>
+				<unitPattern count="one">{0} stikl.</unitPattern>
+				<unitPattern count="few">{0} stikl.</unitPattern>
+				<unitPattern count="many">{0} stikl.</unitPattern>
+				<unitPattern count="other">{0} stikl.</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>skysčio oz</displayName>
+				<unitPattern count="one">{0} skysčio oz</unitPattern>
+				<unitPattern count="few">{0} skysčio oz</unitPattern>
+				<unitPattern count="many">{0} skysčio oz</unitPattern>
+				<unitPattern count="other">{0} skysčio oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>v. š.</displayName>
 				<unitPattern count="one">{0} v. š.</unitPattern>
@@ -10471,6 +10807,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} a. š.</unitPattern>
 				<unitPattern count="other">{0} a. š.</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -10482,6 +10824,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} G</unitPattern>
 				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="few">{0}′</unitPattern>
@@ -10494,17 +10842,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="few">{0}°</unitPattern>
-				<unitPattern count="many">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} akr.</unitPattern>
-				<unitPattern count="few">{0} akr.</unitPattern>
-				<unitPattern count="many">{0} akr.</unitPattern>
-				<unitPattern count="other">{0} akr.</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="few">{0} km²</unitPattern>
+				<unitPattern count="many">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0}ha</unitPattern>
@@ -10512,18 +10854,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}ha</unitPattern>
 				<unitPattern count="other">{0}ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="few">{0} ft²</unitPattern>
-				<unitPattern count="many">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="few">{0} km²</unitPattern>
-				<unitPattern count="many">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} m²</unitPattern>
 				<unitPattern count="few">{0} m²</unitPattern>
@@ -10536,12 +10866,52 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} akr.</unitPattern>
+				<unitPattern count="few">{0} akr.</unitPattern>
+				<unitPattern count="many">{0} akr.</unitPattern>
+				<unitPattern count="other">{0} akr.</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="few">{0} ft²</unitPattern>
+				<unitPattern count="many">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="few">{0} l/100 km</unitPattern>
+				<unitPattern count="many">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<unitPattern count="one">{0} mi/gal</unitPattern>
 				<unitPattern count="few">{0} mi/gal</unitPattern>
 				<unitPattern count="many">{0} mi/gal</unitPattern>
 				<unitPattern count="other">{0} mi/gal</unitPattern>
 			</unit>
+			<unit type="duration-year">
+				<displayName>metai</displayName>
+				<unitPattern count="one">{0} m.</unitPattern>
+				<unitPattern count="few">{0} m.</unitPattern>
+				<unitPattern count="many">{0} m.</unitPattern>
+				<unitPattern count="other">{0} m.</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mėnuo</displayName>
+				<unitPattern count="one">{0} mėn.</unitPattern>
+				<unitPattern count="few">{0} mėn.</unitPattern>
+				<unitPattern count="many">{0} mėn.</unitPattern>
+				<unitPattern count="other">{0} mėn.</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>sav.</displayName>
+				<unitPattern count="one">{0} sav.</unitPattern>
+				<unitPattern count="few">{0} sav.</unitPattern>
+				<unitPattern count="many">{0} sav.</unitPattern>
+				<unitPattern count="other">{0} sav.</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>diena</displayName>
 				<unitPattern count="one">{0} d.</unitPattern>
@@ -10556,13 +10926,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} h</unitPattern>
 				<unitPattern count="other">{0} h</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milisek.</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="few">{0} ms</unitPattern>
-				<unitPattern count="many">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min.</displayName>
 				<unitPattern count="one">{0} min.</unitPattern>
@@ -10570,13 +10933,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} min.</unitPattern>
 				<unitPattern count="other">{0} min.</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>mėnuo</displayName>
-				<unitPattern count="one">{0} mėn.</unitPattern>
-				<unitPattern count="few">{0} mėn.</unitPattern>
-				<unitPattern count="many">{0} mėn.</unitPattern>
-				<unitPattern count="other">{0} mėn.</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>sek.</displayName>
 				<unitPattern count="one">{0} s</unitPattern>
@@ -10584,52 +10940,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} s</unitPattern>
 				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>sav.</displayName>
-				<unitPattern count="one">{0} sav.</unitPattern>
-				<unitPattern count="few">{0} sav.</unitPattern>
-				<unitPattern count="many">{0} sav.</unitPattern>
-				<unitPattern count="other">{0} sav.</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>metai</displayName>
-				<unitPattern count="one">{0} m.</unitPattern>
-				<unitPattern count="few">{0} m.</unitPattern>
-				<unitPattern count="many">{0} m.</unitPattern>
-				<unitPattern count="other">{0} m.</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="few">{0} cm</unitPattern>
-				<unitPattern count="many">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-fathom">
-				<displayName>ftm</displayName>
-				<unitPattern count="one">{0} ftm</unitPattern>
-				<unitPattern count="few">{0} ftm</unitPattern>
-				<unitPattern count="many">{0} ftm</unitPattern>
-				<unitPattern count="other">{0} ftm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="few">{0} ft</unitPattern>
-				<unitPattern count="many">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>fur</displayName>
-				<unitPattern count="one">{0} fur</unitPattern>
-				<unitPattern count="few">{0} fur</unitPattern>
-				<unitPattern count="many">{0} fur</unitPattern>
-				<unitPattern count="other">{0} fur</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="few">{0} in</unitPattern>
-				<unitPattern count="many">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milisek.</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="few">{0} ms</unitPattern>
+				<unitPattern count="many">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
@@ -10638,12 +10954,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} km</unitPattern>
 				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} šm.</unitPattern>
-				<unitPattern count="few">{0} šm.</unitPattern>
-				<unitPattern count="many">{0} šm.</unitPattern>
-				<unitPattern count="other">{0} šm.</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>m</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
@@ -10651,11 +10961,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} my</unitPattern>
-				<unitPattern count="few">{0} my</unitPattern>
-				<unitPattern count="many">{0} my</unitPattern>
-				<unitPattern count="other">{0} my</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="few">{0} cm</unitPattern>
+				<unitPattern count="many">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -10670,18 +10981,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} my</unitPattern>
+				<unitPattern count="few">{0} my</unitPattern>
+				<unitPattern count="many">{0} my</unitPattern>
+				<unitPattern count="other">{0} my</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="few">{0} yd</unitPattern>
 				<unitPattern count="many">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="few">{0} g</unitPattern>
-				<unitPattern count="many">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="few">{0} ft</unitPattern>
+				<unitPattern count="many">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="few">{0} in</unitPattern>
+				<unitPattern count="many">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} šm.</unitPattern>
+				<unitPattern count="few">{0} šm.</unitPattern>
+				<unitPattern count="many">{0} šm.</unitPattern>
+				<unitPattern count="other">{0} šm.</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>fur</displayName>
+				<unitPattern count="one">{0} fur</unitPattern>
+				<unitPattern count="few">{0} fur</unitPattern>
+				<unitPattern count="many">{0} fur</unitPattern>
+				<unitPattern count="other">{0} fur</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>ftm</displayName>
+				<unitPattern count="one">{0} ftm</unitPattern>
+				<unitPattern count="few">{0} ftm</unitPattern>
+				<unitPattern count="many">{0} ftm</unitPattern>
+				<unitPattern count="other">{0} ftm</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
@@ -10690,17 +11032,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="few">{0} oz</unitPattern>
-				<unitPattern count="many">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="few">{0} lb</unitPattern>
-				<unitPattern count="many">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="many">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-stone">
 				<displayName>st</displayName>
@@ -10709,11 +11046,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} st</unitPattern>
 				<unitPattern count="other">{0} st</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} AG</unitPattern>
-				<unitPattern count="few">{0} AG</unitPattern>
-				<unitPattern count="many">{0} AG</unitPattern>
-				<unitPattern count="other">{0} AG</unitPattern>
+			<unit type="mass-pound">
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="few">{0} lb</unitPattern>
+				<unitPattern count="many">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="few">{0} oz</unitPattern>
+				<unitPattern count="many">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} kW</unitPattern>
@@ -10727,12 +11070,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} AG</unitPattern>
+				<unitPattern count="few">{0} AG</unitPattern>
+				<unitPattern count="many">{0} AG</unitPattern>
+				<unitPattern count="other">{0} AG</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="few">{0} hPa</unitPattern>
 				<unitPattern count="many">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<unitPattern count="one">{0} mm Hg</unitPattern>
+				<unitPattern count="few">{0} mm Hg</unitPattern>
+				<unitPattern count="many">{0} mm Hg</unitPattern>
+				<unitPattern count="other">{0} mm Hg</unitPattern>
+			</unit>
 			<unit type="pressure-inch-hg">
 				<unitPattern count="one">{0} inHg</unitPattern>
 				<unitPattern count="few">{0} inHg</unitPattern>
@@ -10745,12 +11100,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mbar</unitPattern>
 				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<unitPattern count="one">{0} mm Hg</unitPattern>
-				<unitPattern count="few">{0} mm Hg</unitPattern>
-				<unitPattern count="many">{0} mm Hg</unitPattern>
-				<unitPattern count="other">{0} mm Hg</unitPattern>
-			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
 				<unitPattern count="one">{0} km/h</unitPattern>
@@ -10790,6 +11139,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
+			<unit type="volume-cubic-kilometer">
+				<unitPattern count="one">{0} km³</unitPattern>
+				<unitPattern count="few">{0} km³</unitPattern>
+				<unitPattern count="many">{0} km³</unitPattern>
+				<unitPattern count="other">{0} km³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<unitPattern count="one">{0} mi³</unitPattern>
+				<unitPattern count="few">{0} mi³</unitPattern>
+				<unitPattern count="many">{0} mi³</unitPattern>
+				<unitPattern count="other">{0} mi³</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>litrai</displayName>
+				<unitPattern count="one">{0} l</unitPattern>
+				<unitPattern count="few">{0} l</unitPattern>
+				<unitPattern count="many">{0} l</unitPattern>
+				<unitPattern count="other">{0} l</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ft akre</displayName>
 				<unitPattern count="one">{0} ft akre</unitPattern>
@@ -10804,17 +11172,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} bu</unitPattern>
 				<unitPattern count="other">{0} bu</unitPattern>
 			</unit>
-			<unit type="volume-cubic-kilometer">
-				<unitPattern count="one">{0} km³</unitPattern>
-				<unitPattern count="few">{0} km³</unitPattern>
-				<unitPattern count="many">{0} km³</unitPattern>
-				<unitPattern count="other">{0} km³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<unitPattern count="one">{0} mi³</unitPattern>
-				<unitPattern count="few">{0} mi³</unitPattern>
-				<unitPattern count="many">{0} mi³</unitPattern>
-				<unitPattern count="other">{0} mi³</unitPattern>
+			<unit type="volume-quart">
+				<unitPattern count="one">{0} kvorta</unitPattern>
+				<unitPattern count="few">{0} kvortos</unitPattern>
+				<unitPattern count="many">{0} kvortos</unitPattern>
+				<unitPattern count="other">{0} kvortų</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce">
 				<unitPattern count="one">{0} fl oz</unitPattern>
@@ -10822,19 +11184,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} fl oz</unitPattern>
 				<unitPattern count="other">{0} fl oz</unitPattern>
 			</unit>
-			<unit type="volume-liter">
-				<displayName>l</displayName>
-				<unitPattern count="one">{0} l</unitPattern>
-				<unitPattern count="few">{0} l</unitPattern>
-				<unitPattern count="many">{0} l</unitPattern>
-				<unitPattern count="other">{0} l</unitPattern>
-			</unit>
-			<unit type="volume-quart">
-				<unitPattern count="one">{0} kvorta</unitPattern>
-				<unitPattern count="few">{0} kvortos</unitPattern>
-				<unitPattern count="many">{0} kvortos</unitPattern>
-				<unitPattern count="other">{0} kvortų</unitPattern>
-			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>hh:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lt_LT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lt_LT.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lt_LT.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lt_LT.xml
index 77d4d4301c9..289213966a9 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lt_LT.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lt_LT.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="lt"/>
 		<territory type="LT"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lu.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lu.xml
similarity index 95%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lu.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lu.xml
index 88ab627d1a9..3a16da80930 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lu.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lu.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="lu"/>
 	</identity>
 	<localeDisplayNames>
@@ -64,7 +63,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angiye</territory>
 			<territory type="AL">Alubani</territory>
 			<territory type="AM">Ameni</territory>
-			<territory type="AN">Antiye wa Olande</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Alijantine</territory>
 			<territory type="AS">Samoa wa Ameriki</territory>
@@ -447,6 +445,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">Dinda</dayPeriod>
+							<dayPeriod type="pm">Dilolo</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">Dinda</dayPeriod>
 							<dayPeriod type="pm">Dilolo</dayPeriod>
@@ -592,6 +594,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">0K¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -772,3 +790,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lu_CD.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lu_CD.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lu_CD.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lu_CD.xml
index ad154a2b3ed..02ac4e70887 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lu_CD.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lu_CD.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="lu"/>
 		<territory type="CD"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/luo.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luo.xml
similarity index 94%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/luo.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luo.xml
index 6bcab345782..07e742c93a8 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/luo.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luo.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="luo"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Netherlands Antilles</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Argentina</territory>
 			<territory type="AS">American Samoa</territory>
@@ -448,6 +446,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">OD</dayPeriod>
+							<dayPeriod type="pm">OT</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">OD</dayPeriod>
 							<dayPeriod type="pm">OT</dayPeriod>
@@ -489,22 +491,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -581,6 +583,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">0K¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/luo_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luo_KE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/luo_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luo_KE.xml
index eb7e4dc89d3..25d15d68749 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/luo_KE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luo_KE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="luo"/>
 		<territory type="KE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/luy.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luy.xml
similarity index 94%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/luy.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luy.xml
index 252229096b5..c755ff3e2e6 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/luy.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luy.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="luy"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antili za Uholanzi</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Ajentina</territory>
 			<territory type="AS">Samoa lya Marekani</territory>
@@ -450,6 +448,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">a.m.</dayPeriod>
+							<dayPeriod type="pm">p.m.</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">a.m.</dayPeriod>
 							<dayPeriod type="pm">p.m.</dayPeriod>
@@ -491,22 +493,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -583,6 +585,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;¤- #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -760,3 +778,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/luy_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luy_KE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/luy_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luy_KE.xml
index 4a10ed860f5..1addecfe1fe 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/luy_KE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luy_KE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="luy"/>
 		<territory type="KE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lv.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lv.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lv.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lv.xml
index a15d86e01c8..c16bc5ba067 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lv.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lv.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="lv"/>
 	</identity>
 	<localeDisplayNames>
@@ -50,6 +49,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ay">aimaru</language>
 			<language type="az">azerbaidžāņu</language>
 			<language type="az" alt="short">azerbaidžāņu</language>
+			<language type="az_Arab" draft="contributed">dienvidazerbaidžāņu</language>
 			<language type="ba">baškīru</language>
 			<language type="bal">beludžu</language>
 			<language type="ban">baliešu</language>
@@ -62,6 +62,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bez">bena</language>
 			<language type="bfd">bafutu</language>
 			<language type="bg">bulgāru</language>
+			<language type="bgn" draft="contributed">rietumbeludžu</language>
 			<language type="bho">bhodžpūru</language>
 			<language type="bi">bišlamā</language>
 			<language type="bik">bikolu</language>
@@ -288,6 +289,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">laosiešu</language>
 			<language type="lol">mongu</language>
 			<language type="loz">lozu</language>
+			<language type="lrc" draft="contributed">ziemeļluru</language>
 			<language type="lt">lietuviešu</language>
 			<language type="lu">lubakatanga</language>
 			<language type="lua">lubalulva</language>
@@ -336,12 +338,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="my">birmiešu</language>
 			<language type="mye">mjenu</language>
 			<language type="myv">erzju</language>
+			<language type="mzn" draft="contributed">mazanderāņu</language>
 			<language type="na">nauruiešu</language>
 			<language type="nap">neapoliešu</language>
 			<language type="naq">nama</language>
 			<language type="nb">norvēģu bukmols</language>
 			<language type="nd">ziemeļndebelu</language>
 			<language type="nds">lejasvācu</language>
+			<language type="nds_NL" draft="contributed">lejassakšu</language>
 			<language type="ne">nepāliešu</language>
 			<language type="new">nevaru</language>
 			<language type="ng">ndongu</language>
@@ -418,6 +422,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">sicīliešu</language>
 			<language type="sco">skotu</language>
 			<language type="sd">sindhu</language>
+			<language type="sdh" draft="contributed">dienvidkurdu</language>
 			<language type="se">ziemeļsāmu</language>
 			<language type="see">seneku</language>
 			<language type="seh">senu</language>
@@ -455,8 +460,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">šumeru</language>
 			<language type="sv">zviedru</language>
 			<language type="sw">svahili</language>
+			<language type="sw_CD">Kongo svahili</language>
 			<language type="swb">komoru</language>
-			<language type="swc">Kongo svahili</language>
 			<language type="syc">klasiskā sīriešu</language>
 			<language type="syr">sīriešu</language>
 			<language type="ta">tamilu</language>
@@ -511,6 +516,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">valamu</language>
 			<language type="war">varaju</language>
 			<language type="was">vašo</language>
+			<language type="wbp" draft="contributed">varlpirī</language>
 			<language type="wo">volofu</language>
 			<language type="xal">kalmiku</language>
 			<language type="xh">khosu</language>
@@ -653,7 +659,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angilja</territory>
 			<territory type="AL">Albānija</territory>
 			<territory type="AM">Armēnija</territory>
-			<territory type="AN">Nīderlandes Antiļas</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antarktika</territory>
 			<territory type="AR">Argentīna</territory>
@@ -949,6 +954,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric">Kārtošana skaitliskā secībā</key>
 			<key type="colStrength">Kārtošanas pakāpe</key>
 			<key type="currency">Valūta</key>
+			<key type="hc" draft="contributed">Stundu formāts (12 vai 24)</key>
+			<key type="lb" draft="contributed">Rindiņas pārtraukuma stils</key>
+			<key type="ms" draft="contributed">mērvienību sistēma</key>
 			<key type="numbers">Cipari</key>
 			<key type="timezone">Laika josla</key>
 			<key type="va">Lokalizācijas variants</key>
@@ -956,96 +964,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">Personīgai lietošanai</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Arābu-indiešu cipari</type>
-			<type type="arabext" key="numbers">Izvērstie arābu-indiešu cipari</type>
-			<type type="armn" key="numbers">Armēņu cipari</type>
-			<type type="armnlow" key="numbers">Mazie armēņu cipari</type>
-			<type type="beng" key="numbers">Bengāļu cipari</type>
-			<type type="big5han" key="collation">tradicionālās ķīniešu valodas kārtošanas secība - Big5</type>
-			<type type="buddhist" key="calendar">budistu kalendārs</type>
-			<type type="chinese" key="calendar">ķīniešu kalendārs</type>
-			<type type="coptic" key="calendar">Koptu kalendārs</type>
-			<type type="dangi" key="calendar">dangi kalendārs</type>
-			<type type="deva" key="numbers">Devanāgarī cipari</type>
-			<type type="dictionary" key="collation">Vārdnīcas kārtošanas secība</type>
-			<type type="ducet" key="collation">Noklusējuma unikoda kārtošanas secība</type>
-			<type type="eor" key="collation" draft="unconfirmed">kārtošanas secība daudzvalodu Eiropas dokumentiem</type>
-			<type type="ethi" key="numbers">Etiopiešu cipari</type>
-			<type type="ethiopic" key="calendar">etiopiešu kalendārs</type>
-			<type type="ethiopic-amete-alem" key="calendar">Etiopiešu kalendārs</type>
-			<type type="finance" key="numbers">Finanšu cipari</type>
-			<type type="fullwide" key="numbers">Pilna platuma cipari</type>
-			<type type="gb2312han" key="collation">vienkāršotās ķīniešu valodas kārtošanas secība - GB2312</type>
-			<type type="geor" key="numbers">Gruzīnu cipari</type>
-			<type type="gregorian" key="calendar">Gregora kalendārs</type>
-			<type type="grek" key="numbers">Grieķu cipari</type>
-			<type type="greklow" key="numbers">Mazie grieķu cipari</type>
-			<type type="gujr" key="numbers">Gudžaratu cipari</type>
-			<type type="guru" key="numbers">Gurmuki cipari</type>
-			<type type="hanidec" key="numbers">Ķīniešu decimāldaļskaitļi</type>
-			<type type="hans" key="numbers">Vienkāršotie ķīniešu cipari</type>
-			<type type="hansfin" key="numbers">Vienkāršotie ķīniešu cipari finanšu dokumentiem</type>
-			<type type="hant" key="numbers">Tradicionālie ķīniešu cipari</type>
-			<type type="hantfin" key="numbers">Tradicionālie ķīniešu cipari finanšu dokumentiem</type>
-			<type type="hebr" key="numbers">Ivrita cipari</type>
-			<type type="hebrew" key="calendar">ebreju kalendārs</type>
-			<type type="identical" key="colStrength">Kārtot visus</type>
-			<type type="indian" key="calendar">Indijas nacionālais kalendārs</type>
-			<type type="islamic" key="calendar">islāma kalendārs</type>
-			<type type="islamic-civil" key="calendar">islāma pilsoņu kalendārs</type>
-			<type type="iso8601" key="calendar">ISO 8601 kalendārs</type>
-			<type type="japanese" key="calendar">japāņu kalendārs</type>
-			<type type="jpan" key="numbers">Japāņu cipari</type>
-			<type type="jpanfin" key="numbers">Japāņu cipari finanšu dokumentiem</type>
-			<type type="khmr" key="numbers">Khmeru cipari</type>
-			<type type="knda" key="numbers">Kannadu cipari</type>
-			<type type="laoo" key="numbers">Laosiešu cipari</type>
-			<type type="latn" key="numbers">Arābu cipari</type>
-			<type type="lower" key="colCaseFirst">Kārtot pēc pirmā mazā burta</type>
-			<type type="mlym" key="numbers">Malajalu cipari</type>
-			<type type="mong" key="numbers">Mongoļu cipari</type>
-			<type type="mymr" key="numbers">Birmiešu cipari</type>
-			<type type="native" key="numbers">Vietējie cipari</type>
-			<type type="no" key="colBackwards">Kārtot diakritiskās zīmes parastā secībā</type>
-			<type type="no" key="colCaseFirst">Kārtot burtu reģistra parastā secībā</type>
-			<type type="no" key="colCaseLevel">Kārtot reģistrnejutīgas rakstzīmes</type>
-			<type type="no" key="colHiraganaQuaternary">Kārtot kana rakstzīmes atsevišķi</type>
-			<type type="no" key="colNormalization">Kārtot bez normalizēšanas</type>
-			<type type="no" key="colNumeric">Kārtot ciparus atsevišķi</type>
-			<type type="non-ignorable" key="colAlternate">Kārtot simbolus</type>
-			<type type="orya" key="numbers">Oriju cipari</type>
-			<type type="persian" key="calendar">persiešu kalendārs</type>
-			<type type="phonebook" key="collation">tālruņu grāmatas kārtošanas secība</type>
-			<type type="phonetic" key="collation">Fonētiskā kārtošanas secība</type>
-			<type type="pinyin" key="collation">piņjiņa kārtošanas secība</type>
-			<type type="primary" key="colStrength">Kārtot tikai pamata burtus</type>
-			<type type="quaternary" key="colStrength">Kārtot diakritiskās zīmes/reģistrjutīgās rakstzīmes/rakstzīmes pēc platuma/Kana rakstzīmes</type>
-			<type type="reformed" key="collation">Reformētā kārtošanas secība</type>
-			<type type="roc" key="calendar">Ķīnas Republikas kalendārs</type>
-			<type type="roman" key="numbers">Romiešu cipari</type>
-			<type type="romanlow" key="numbers">Mazie romiešu cipari</type>
-			<type type="search" key="collation">Vispārīga meklēšana</type>
-			<type type="searchjl" key="collation">Meklēt pēc Hangul sākuma līdzskaņa</type>
-			<type type="secondary" key="colStrength">Kārtot diakritiskās zīmes</type>
-			<type type="shifted" key="colAlternate">Kārtot, ignorējot simbolus</type>
-			<type type="standard" key="collation">Standarta kārtošanas secība</type>
-			<type type="stroke" key="collation">Stroke kārtošanas secība</type>
-			<type type="taml" key="numbers">Tamilu tradicionālie cipari</type>
-			<type type="tamldec" key="numbers">Tamilu cipari</type>
-			<type type="telu" key="numbers">Telugu cipari</type>
-			<type type="tertiary" key="colStrength">Kārtot diakritiskās zīmes/reģistrjutīgās rakstzīmes/rakstzīmes pēc platuma</type>
-			<type type="thai" key="numbers">Tajiešu cipari</type>
-			<type type="tibt" key="numbers">Tibetiešu cipari</type>
-			<type type="traditional" key="collation">tradicionālā kārtošanas secība</type>
-			<type type="traditional" key="numbers">Tradicionālā ciparu sistēma</type>
-			<type type="unihan" key="collation">Radikālā kārtošanas secība pēc vilkumu skaita</type>
-			<type type="upper" key="colCaseFirst">Kārtot pēc pirmā lielā burta</type>
-			<type type="vaii" key="numbers">VAI cipari</type>
-			<type type="yes" key="colBackwards">Kārtot diakritiskās zīmes apgrieztā secībā</type>
-			<type type="yes" key="colCaseLevel">Kārtot reģistrjutīgās rakstzīmes</type>
-			<type type="yes" key="colHiraganaQuaternary">Kārtot kana rakstzīmes, norādot atšķirības</type>
-			<type type="yes" key="colNormalization">Kārtot unikodu normalizējot</type>
-			<type type="yes" key="colNumeric">Kārtot ciparus skaitliskā secībā</type>
+			<type key="calendar" type="buddhist">budistu kalendārs</type>
+			<type key="calendar" type="chinese">ķīniešu kalendārs</type>
+			<type key="calendar" type="coptic">Koptu kalendārs</type>
+			<type key="calendar" type="dangi">dangi kalendārs</type>
+			<type key="calendar" type="ethiopic">etiopiešu kalendārs</type>
+			<type key="calendar" type="ethiopic-amete-alem">Etiopiešu kalendārs</type>
+			<type key="calendar" type="gregorian">Gregora kalendārs</type>
+			<type key="calendar" type="hebrew">ebreju kalendārs</type>
+			<type key="calendar" type="indian">Indijas nacionālais kalendārs</type>
+			<type key="calendar" type="islamic">islāma kalendārs</type>
+			<type key="calendar" type="islamic-civil">islāma pilsoņu kalendārs</type>
+			<type key="calendar" type="iso8601">ISO 8601 kalendārs</type>
+			<type key="calendar" type="japanese">japāņu kalendārs</type>
+			<type key="calendar" type="persian">persiešu kalendārs</type>
+			<type key="calendar" type="roc">Ķīnas Republikas kalendārs</type>
+			<type key="colAlternate" type="non-ignorable">Kārtot simbolus</type>
+			<type key="colAlternate" type="shifted">Kārtot, ignorējot simbolus</type>
+			<type key="colBackwards" type="no">Kārtot diakritiskās zīmes parastā secībā</type>
+			<type key="colBackwards" type="yes">Kārtot diakritiskās zīmes apgrieztā secībā</type>
+			<type key="colCaseFirst" type="lower">Kārtot pēc pirmā mazā burta</type>
+			<type key="colCaseFirst" type="no">Kārtot burtu reģistra parastā secībā</type>
+			<type key="colCaseFirst" type="upper">Kārtot pēc pirmā lielā burta</type>
+			<type key="colCaseLevel" type="no">Kārtot reģistrnejutīgas rakstzīmes</type>
+			<type key="colCaseLevel" type="yes">Kārtot reģistrjutīgās rakstzīmes</type>
+			<type key="colHiraganaQuaternary" type="no">Kārtot kana rakstzīmes atsevišķi</type>
+			<type key="colHiraganaQuaternary" type="yes">Kārtot kana rakstzīmes, norādot atšķirības</type>
+			<type key="collation" type="big5han">tradicionālās ķīniešu valodas kārtošanas secība - Big5</type>
+			<type key="collation" type="dictionary">Vārdnīcas kārtošanas secība</type>
+			<type key="collation" type="ducet">Noklusējuma unikoda kārtošanas secība</type>
+			<type key="collation" type="eor" draft="unconfirmed">kārtošanas secība daudzvalodu Eiropas dokumentiem</type>
+			<type key="collation" type="gb2312han">vienkāršotās ķīniešu valodas kārtošanas secība - GB2312</type>
+			<type key="collation" type="phonebook">tālruņu grāmatas kārtošanas secība</type>
+			<type key="collation" type="phonetic">Fonētiskā kārtošanas secība</type>
+			<type key="collation" type="pinyin">piņjiņa kārtošanas secība</type>
+			<type key="collation" type="reformed">Reformētā kārtošanas secība</type>
+			<type key="collation" type="search">Vispārīga meklēšana</type>
+			<type key="collation" type="searchjl">Meklēt pēc Hangul sākuma līdzskaņa</type>
+			<type key="collation" type="standard">Standarta kārtošanas secība</type>
+			<type key="collation" type="stroke">Stroke kārtošanas secība</type>
+			<type key="collation" type="traditional">tradicionālā kārtošanas secība</type>
+			<type key="collation" type="unihan">Radikālā kārtošanas secība pēc vilkumu skaita</type>
+			<type key="colNormalization" type="no">Kārtot bez normalizēšanas</type>
+			<type key="colNormalization" type="yes">Kārtot unikodu normalizējot</type>
+			<type key="colNumeric" type="no">Kārtot ciparus atsevišķi</type>
+			<type key="colNumeric" type="yes">Kārtot ciparus skaitliskā secībā</type>
+			<type key="colStrength" type="identical">Kārtot visus</type>
+			<type key="colStrength" type="primary">Kārtot tikai pamata burtus</type>
+			<type key="colStrength" type="quaternary">Kārtot diakritiskās zīmes/reģistrjutīgās rakstzīmes/rakstzīmes pēc platuma/Kana rakstzīmes</type>
+			<type key="colStrength" type="secondary">Kārtot diakritiskās zīmes</type>
+			<type key="colStrength" type="tertiary">Kārtot diakritiskās zīmes/reģistrjutīgās rakstzīmes/rakstzīmes pēc platuma</type>
+			<type key="hc" type="h11" draft="contributed">12 stundu sistēma (0–11)</type>
+			<type key="hc" type="h12" draft="contributed">12 stundu sistēma (1–12)</type>
+			<type key="hc" type="h23" draft="contributed">24 stundu sistēma (0–23)</type>
+			<type key="hc" type="h24" draft="contributed">24 stundu sistēma (1–24)</type>
+			<type key="lb" type="loose" draft="contributed">Brīvais rindiņas pārtraukuma stils</type>
+			<type key="lb" type="normal" draft="contributed">Parastais rindiņas pārtraukuma stils</type>
+			<type key="lb" type="strict" draft="contributed">Stingrais rindiņas pārtraukuma stils</type>
+			<type key="ms" type="metric" draft="contributed">metriskā sistēma</type>
+			<type key="ms" type="uksystem" draft="contributed">britu mērvienību sistēma</type>
+			<type key="ms" type="ussystem" draft="contributed">amerikāņu mērvienību sistēma</type>
+			<type key="numbers" type="arab">Arābu-indiešu cipari</type>
+			<type key="numbers" type="arabext">Izvērstie arābu-indiešu cipari</type>
+			<type key="numbers" type="armn">Armēņu cipari</type>
+			<type key="numbers" type="armnlow">Mazie armēņu cipari</type>
+			<type key="numbers" type="beng">Bengāļu cipari</type>
+			<type key="numbers" type="deva">Devanāgarī cipari</type>
+			<type key="numbers" type="ethi">Etiopiešu cipari</type>
+			<type key="numbers" type="finance">Finanšu cipari</type>
+			<type key="numbers" type="fullwide">Pilna platuma cipari</type>
+			<type key="numbers" type="geor">Gruzīnu cipari</type>
+			<type key="numbers" type="grek">Grieķu cipari</type>
+			<type key="numbers" type="greklow">Mazie grieķu cipari</type>
+			<type key="numbers" type="gujr">Gudžaratu cipari</type>
+			<type key="numbers" type="guru">Gurmuki cipari</type>
+			<type key="numbers" type="hanidec">Ķīniešu decimāldaļskaitļi</type>
+			<type key="numbers" type="hans">Vienkāršotie ķīniešu cipari</type>
+			<type key="numbers" type="hansfin">Vienkāršotie ķīniešu cipari finanšu dokumentiem</type>
+			<type key="numbers" type="hant">Tradicionālie ķīniešu cipari</type>
+			<type key="numbers" type="hantfin">Tradicionālie ķīniešu cipari finanšu dokumentiem</type>
+			<type key="numbers" type="hebr">Ivrita cipari</type>
+			<type key="numbers" type="jpan">Japāņu cipari</type>
+			<type key="numbers" type="jpanfin">Japāņu cipari finanšu dokumentiem</type>
+			<type key="numbers" type="khmr">Khmeru cipari</type>
+			<type key="numbers" type="knda">Kannadu cipari</type>
+			<type key="numbers" type="laoo">Laosiešu cipari</type>
+			<type key="numbers" type="latn">Arābu cipari</type>
+			<type key="numbers" type="mlym">Malajalu cipari</type>
+			<type key="numbers" type="mong">Mongoļu cipari</type>
+			<type key="numbers" type="mymr">Birmiešu cipari</type>
+			<type key="numbers" type="native">Vietējie cipari</type>
+			<type key="numbers" type="orya">Oriju cipari</type>
+			<type key="numbers" type="roman">Romiešu cipari</type>
+			<type key="numbers" type="romanlow">Mazie romiešu cipari</type>
+			<type key="numbers" type="taml">Tamilu tradicionālie cipari</type>
+			<type key="numbers" type="tamldec">Tamilu cipari</type>
+			<type key="numbers" type="telu">Telugu cipari</type>
+			<type key="numbers" type="thai">Tajiešu cipari</type>
+			<type key="numbers" type="tibt">Tibetiešu cipari</type>
+			<type key="numbers" type="traditional">Tradicionālā ciparu sistēma</type>
+			<type key="numbers" type="vaii">VAI cipari</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN">BGN</transformName>
@@ -1117,12 +1135,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern>{1} 'plkst.' {0}</pattern>
+							<pattern>{1} 'plkst'. {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern>{1} 'plkst.' {0}</pattern>
+							<pattern>{1} 'plkst'. {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
@@ -1137,6 +1155,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E, d.</dateFormatItem>
 						<dateFormatItem id="Gy">y. 'g'. G</dateFormatItem>
 						<dateFormatItem id="GyMMM">y. 'g'. MMM G</dateFormatItem>
@@ -1479,15 +1498,66 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight" draft="contributed">pusnaktī</dayPeriod>
+							<dayPeriod type="am">priekšp.</dayPeriod>
+							<dayPeriod type="noon" draft="contributed">pusd.</dayPeriod>
+							<dayPeriod type="pm">pēcp.</dayPeriod>
+							<dayPeriod type="morning1" draft="contributed">no rīta</dayPeriod>
+							<dayPeriod type="afternoon1" draft="contributed">pēcpusd.</dayPeriod>
+							<dayPeriod type="evening1" draft="contributed">vakarā</dayPeriod>
+							<dayPeriod type="night1" draft="contributed">naktī</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight" draft="contributed">pusnaktī</dayPeriod>
+							<dayPeriod type="am">priekšp.</dayPeriod>
+							<dayPeriod type="noon" draft="contributed">pusd.</dayPeriod>
+							<dayPeriod type="pm">pēcp.</dayPeriod>
+							<dayPeriod type="morning1" draft="contributed">no rīta</dayPeriod>
+							<dayPeriod type="afternoon1" draft="contributed">pēcpusdienā</dayPeriod>
+							<dayPeriod type="evening1" draft="contributed">vakarā</dayPeriod>
+							<dayPeriod type="night1" draft="contributed">naktī</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight" draft="contributed">pusnaktī</dayPeriod>
+							<dayPeriod type="am">priekšpusdienā</dayPeriod>
+							<dayPeriod type="noon" draft="contributed">pusdienlaikā</dayPeriod>
+							<dayPeriod type="pm">pēcpusdienā</dayPeriod>
+							<dayPeriod type="morning1" draft="contributed">no rīta</dayPeriod>
+							<dayPeriod type="afternoon1" draft="contributed">pēcpusdienā</dayPeriod>
+							<dayPeriod type="evening1" draft="contributed">vakarā</dayPeriod>
+							<dayPeriod type="night1" draft="contributed">naktī</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">pusnakts</dayPeriod>
+							<dayPeriod type="am" draft="contributed">priekšp.</dayPeriod>
+							<dayPeriod type="pm" draft="contributed">pēcpusd.</dayPeriod>
+							<dayPeriod type="morning1">rīts</dayPeriod>
+							<dayPeriod type="afternoon1">pēcpusdiena</dayPeriod>
+							<dayPeriod type="evening1">vakars</dayPeriod>
+							<dayPeriod type="night1">nakts</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">pusnakts</dayPeriod>
 							<dayPeriod type="am">priekšp.</dayPeriod>
 							<dayPeriod type="noon">pusd.</dayPeriod>
 							<dayPeriod type="pm">pēcp.</dayPeriod>
+							<dayPeriod type="morning1">rīts</dayPeriod>
+							<dayPeriod type="afternoon1">pēcpusdiena</dayPeriod>
+							<dayPeriod type="evening1">vakars</dayPeriod>
+							<dayPeriod type="night1">nakts</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">priekšpusdienā</dayPeriod>
-							<dayPeriod type="noon">pusdienlaikā</dayPeriod>
-							<dayPeriod type="pm">pēcpusdienā</dayPeriod>
+							<dayPeriod type="midnight">pusnakts</dayPeriod>
+							<dayPeriod type="am" draft="contributed">priekšpusdienā</dayPeriod>
+							<dayPeriod type="noon">pusdienlaiks</dayPeriod>
+							<dayPeriod type="pm" draft="contributed">pēcpusdiena</dayPeriod>
+							<dayPeriod type="morning1">rīts</dayPeriod>
+							<dayPeriod type="afternoon1">pēcpusdiena</dayPeriod>
+							<dayPeriod type="evening1">vakars</dayPeriod>
+							<dayPeriod type="night1">nakts</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1590,6 +1660,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv" draft="contributed">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv" draft="contributed">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv" draft="contributed">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv" draft="contributed">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">dd.MM.</dateFormatItem>
 						<dateFormatItem id="MEd">E, dd.MM.</dateFormatItem>
@@ -1756,10 +1830,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</calendars>
 		<fields>
 			<field type="era">
-				<displayName>Ēra</displayName>
+				<displayName>ēra</displayName>
 			</field>
 			<field type="year">
-				<displayName>Gads</displayName>
+				<displayName>gads</displayName>
 				<relative type="-1">pagājušajā gadā</relative>
 				<relative type="0">šajā gadā</relative>
 				<relative type="1">nākamajā gadā</relative>
@@ -1840,7 +1914,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="month">
-				<displayName>Mēnesis</displayName>
+				<displayName>mēnesis</displayName>
 				<relative type="-1">pagājušajā mēnesī</relative>
 				<relative type="0">šajā mēnesī</relative>
 				<relative type="1">nākamajā mēnesī</relative>
@@ -2076,10 +2150,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">nāk. sestd.</relative>
 			</field>
 			<field type="dayperiod">
-				<displayName>Priekšpusdienā/pēcpusdienā</displayName>
+				<displayName>priekšpusdienā/pēcpusdienā</displayName>
 			</field>
 			<field type="hour">
-				<displayName>Stundas</displayName>
+				<displayName>stundas</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="zero">pēc {0} stundām</relativeTimePattern>
 					<relativeTimePattern count="one">pēc {0} stundas</relativeTimePattern>
@@ -2118,7 +2192,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="minute">
-				<displayName>Minūtes</displayName>
+				<displayName>minūtes</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="zero">pēc {0} minūtēm</relativeTimePattern>
 					<relativeTimePattern count="one">pēc {0} minūtes</relativeTimePattern>
@@ -2157,7 +2231,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="second">
-				<displayName>Sekundes</displayName>
+				<displayName>sekundes</displayName>
 				<relative type="0">tagad</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="zero">pēc {0} sekundēm</relativeTimePattern>
@@ -2197,7 +2271,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>Laika josla</displayName>
+				<displayName>laika josla</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
@@ -3075,6 +3149,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Portmorsbi</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity draft="contributed">Bugeinvile</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
 			</zone>
@@ -3159,6 +3236,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkutska</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity draft="contributed">Čita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Jakutska</exemplarCity>
 			</zone>
@@ -3177,6 +3257,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadana</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity draft="contributed">Sredņekolimska</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamčatka</exemplarCity>
 			</zone>
@@ -4492,10 +4575,50 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
-					<pattern>¤#0.00</pattern>
+					<pattern>#0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern>¤#0.00</pattern>
+					<pattern>#0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="zero" draft="contributed">¤0 tūkst'.'</pattern>
+					<pattern type="1000" count="one" draft="contributed">¤0 tūkst'.'</pattern>
+					<pattern type="1000" count="other" draft="contributed">¤0 tūkst'.'</pattern>
+					<pattern type="10000" count="zero" draft="contributed">¤00 tūkst'.'</pattern>
+					<pattern type="10000" count="one" draft="contributed">¤00 tūkst'.'</pattern>
+					<pattern type="10000" count="other" draft="contributed">¤00 tūkst'.'</pattern>
+					<pattern type="100000" count="zero" draft="contributed">¤000 tūkst'.'</pattern>
+					<pattern type="100000" count="one" draft="contributed">¤000 tūkst'.'</pattern>
+					<pattern type="100000" count="other" draft="contributed">¤000 tūkst'.'</pattern>
+					<pattern type="1000000" count="zero" draft="contributed">¤0 milj'.'</pattern>
+					<pattern type="1000000" count="one" draft="contributed">¤0 milj'.'</pattern>
+					<pattern type="1000000" count="other" draft="contributed">¤0 milj'.'</pattern>
+					<pattern type="10000000" count="zero" draft="contributed">¤00 milj'.'</pattern>
+					<pattern type="10000000" count="one" draft="contributed">¤00 milj'.'</pattern>
+					<pattern type="10000000" count="other" draft="contributed">¤00 milj'.'</pattern>
+					<pattern type="100000000" count="zero" draft="contributed">¤000 milj'.'</pattern>
+					<pattern type="100000000" count="one" draft="contributed">¤000 milj'.'</pattern>
+					<pattern type="100000000" count="other" draft="contributed">¤000 milj'.'</pattern>
+					<pattern type="1000000000" count="zero" draft="contributed">¤0 mljrd'.'</pattern>
+					<pattern type="1000000000" count="one" draft="contributed">¤0 mljrd'.'</pattern>
+					<pattern type="1000000000" count="other" draft="contributed">¤0 mljrd'.'</pattern>
+					<pattern type="10000000000" count="zero" draft="contributed">¤00 mljrd'.'</pattern>
+					<pattern type="10000000000" count="one" draft="contributed">¤00 mljrd'.'</pattern>
+					<pattern type="10000000000" count="other" draft="contributed">¤00 mljrd'.'</pattern>
+					<pattern type="100000000000" count="zero" draft="contributed">¤000 mljrd'.'</pattern>
+					<pattern type="100000000000" count="one" draft="contributed">¤000 mljrd'.'</pattern>
+					<pattern type="100000000000" count="other" draft="contributed">¤000 mljrd'.'</pattern>
+					<pattern type="1000000000000" count="zero" draft="contributed">¤0 trilj'.'</pattern>
+					<pattern type="1000000000000" count="one" draft="contributed">¤0 trilj'.'</pattern>
+					<pattern type="1000000000000" count="other" draft="contributed">¤0 trilj'.'</pattern>
+					<pattern type="10000000000000" count="zero" draft="contributed">¤00 trilj'.'</pattern>
+					<pattern type="10000000000000" count="one" draft="contributed">¤00 trilj'.'</pattern>
+					<pattern type="10000000000000" count="other" draft="contributed">¤00 trilj'.'</pattern>
+					<pattern type="100000000000000" count="zero" draft="contributed">¤000 trilj'.'</pattern>
+					<pattern type="100000000000000" count="one" draft="contributed">¤000 trilj'.'</pattern>
+					<pattern type="100000000000000" count="other" draft="contributed">¤000 trilj'.'</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="zero">{0} {1}</unitPattern>
@@ -4590,6 +4713,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Bosnijas un Hercogovinas marka</displayName>
 				<displayName count="other">Bosnijas un Hercogovinas markas</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>Barbadosas dolārs</displayName>
@@ -4656,6 +4780,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Bolīvijas boliviano</displayName>
 				<displayName count="other">Bolīvijas boliviano</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BRL">
 				<displayName>Brazīlijas reāls</displayName>
@@ -4766,6 +4891,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Kubas konvertējamais peso</displayName>
 				<displayName count="other">Kubas konvertējamie peso</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>Kubas peso</displayName>
@@ -4791,6 +4917,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Čehijas krona</displayName>
 				<displayName count="other">Čehijas kronas</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DEM">
 				<displayName>Vācijas marka</displayName>
@@ -4808,6 +4935,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Dānijas krona</displayName>
 				<displayName count="other">Dānijas kronas</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Dominikānas peso</displayName>
@@ -4833,6 +4961,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Ēģiptes mārciņa</displayName>
 				<displayName count="other">Ēģiptes mārciņas</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>Eritrejas nakfa</displayName>
@@ -4876,6 +5005,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Folklenda Salu mārciņa</displayName>
 				<displayName count="other">Folklenda Salu mārciņas</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>Francijas franks</displayName>
@@ -4894,6 +5024,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Gruzijas lari</displayName>
 				<displayName count="other">Gruzijas lari</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHS">
 				<displayName>Ganas sedi</displayName>
@@ -4923,6 +5054,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Gvinejas franks</displayName>
 				<displayName count="other">Gvinejas franki</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GRD">
 				<displayName>Grieķijas drahma</displayName>
@@ -4933,6 +5065,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Gvatemalas ketsals</displayName>
 				<displayName count="other">Gvatemalas ketsali</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GYD">
 				<displayName>Gajānas dolārs</displayName>
@@ -4956,6 +5089,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Hondurasas lempīra</displayName>
 				<displayName count="other">Hondurasas lempīras</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRK">
 				<displayName>Horvātijas kuna</displayName>
@@ -4963,6 +5097,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Horvātijas kuna</displayName>
 				<displayName count="other">Horvātijas kunas</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>Haiti gurds</displayName>
@@ -4977,6 +5112,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Ungārijas forints</displayName>
 				<displayName count="other">Ungārijas forinti</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>Indonēzijas rūpija</displayName>
@@ -5024,6 +5160,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Īslandes krona</displayName>
 				<displayName count="other">Īslandes kronas</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>Itālijas lira</displayName>
@@ -5318,6 +5455,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Nikaragvas kordoba</displayName>
 				<displayName count="other">Nikaragvas kordobas</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>Nīderlandes guldenis</displayName>
@@ -5328,6 +5466,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Norvēģijas krona</displayName>
 				<displayName count="other">Norvēģijas kronas</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>Nepālas rūpija</displayName>
@@ -5393,6 +5532,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Polijas zlots</displayName>
 				<displayName count="other">Polijas zloti</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PTE">
 				<displayName>Portugāles eskudo</displayName>
@@ -5438,6 +5578,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Krievijas rublis</displayName>
 				<displayName count="other">Krievijas rubļi</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RWF">
 				<displayName>Ruandas franks</displayName>
@@ -5481,6 +5622,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Zviedrijas krona</displayName>
 				<displayName count="other">Zviedrijas kronas</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>Singapūras dolārs</displayName>
@@ -5496,6 +5638,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Sv.Helēnas salas mārciņa</displayName>
 				<displayName count="other">Sv.Helēnas salas mārciņas</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>Slovēnijas tolars</displayName>
@@ -5688,6 +5831,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Venecuēlas bolivārs</displayName>
 				<displayName count="other">Venecuēlas bolivāri</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>Vjetnamas dongi</displayName>
@@ -5757,6 +5901,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Austrumkarību dolārs</displayName>
 				<displayName count="other">Austrumkarību dolāri</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>Speciālās aizņēmuma tiesības</displayName>
@@ -5868,6 +6013,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} metrs sekundē kvadrātā</unitPattern>
 				<unitPattern count="other">{0} metri sekundē kvadrātā</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName draft="contributed">apgrieziens</displayName>
+				<unitPattern count="zero" draft="contributed">{0} apgriezieni</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} apgrieziens</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} apgriezieni</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radiāni</displayName>
+				<unitPattern count="zero">{0} radiāni</unitPattern>
+				<unitPattern count="one">{0} radiāns</unitPattern>
+				<unitPattern count="other">{0} radiāni</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>grādi</displayName>
+				<unitPattern count="zero">{0} grādi</unitPattern>
+				<unitPattern count="one">{0} grāds</unitPattern>
+				<unitPattern count="other">{0} grādi</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>leņķa minūtes</displayName>
 				<unitPattern count="zero">{0} leņķa minūtes</unitPattern>
@@ -5880,23 +6043,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} leņķa sekunde</unitPattern>
 				<unitPattern count="other">{0} leņķa sekundes</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>grādi</displayName>
-				<unitPattern count="zero">{0} grādi</unitPattern>
-				<unitPattern count="one">{0} grāds</unitPattern>
-				<unitPattern count="other">{0} grādi</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radiāni</displayName>
-				<unitPattern count="zero">{0} radiāni</unitPattern>
-				<unitPattern count="one">{0} radiāns</unitPattern>
-				<unitPattern count="other">{0} radiāni</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>akri</displayName>
-				<unitPattern count="zero">{0} akri</unitPattern>
-				<unitPattern count="one">{0} akrs</unitPattern>
-				<unitPattern count="other">{0} akri</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>kvadrātkilometri</displayName>
+				<unitPattern count="zero">{0} kvadrātkilometri</unitPattern>
+				<unitPattern count="one">{0} kvadrātkilometrs</unitPattern>
+				<unitPattern count="other">{0} kvadrātkilometri</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektāri</displayName>
@@ -5904,11 +6055,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} hektārs</unitPattern>
 				<unitPattern count="other">{0} hektāri</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>kvadrātmetri</displayName>
+				<unitPattern count="zero">{0} kvadrātmetri</unitPattern>
+				<unitPattern count="one">{0} kvadrātmetrs</unitPattern>
+				<unitPattern count="other">{0} kvadrātmetri</unitPattern>
+				<perUnitPattern draft="contributed">{0} uz kvadrātmetru</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>kvadrātcentimetri</displayName>
 				<unitPattern count="zero">{0} kvadrātcentimetri</unitPattern>
 				<unitPattern count="one">{0} kvadrātcentimetrs</unitPattern>
 				<unitPattern count="other">{0} kvadrātcentimetri</unitPattern>
+				<perUnitPattern draft="contributed">{0} uz kvadrātcentimetru</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>kvadrātjūdzes</displayName>
+				<unitPattern count="zero">{0} kvadrātjūdzes</unitPattern>
+				<unitPattern count="one">{0} kvadrātjūdze</unitPattern>
+				<unitPattern count="other">{0} kvadrātjūdzes</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>akri</displayName>
+				<unitPattern count="zero">{0} akri</unitPattern>
+				<unitPattern count="one">{0} akrs</unitPattern>
+				<unitPattern count="other">{0} akri</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>kvadrātjardi</displayName>
+				<unitPattern count="zero">{0} kvadrātjardi</unitPattern>
+				<unitPattern count="one">{0} kvadrātjards</unitPattern>
+				<unitPattern count="other">{0} kvadrātjardi</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>kvadrātpēdas</displayName>
@@ -5921,30 +6098,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="zero">{0} kvadrātcollas</unitPattern>
 				<unitPattern count="one">{0} kvadrātcolla</unitPattern>
 				<unitPattern count="other">{0} kvadrātcollas</unitPattern>
+				<perUnitPattern draft="contributed">{0} uz kvadrātcollu</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kvadrātkilometri</displayName>
-				<unitPattern count="zero">{0} kvadrātkilometri</unitPattern>
-				<unitPattern count="one">{0} kvadrātkilometrs</unitPattern>
-				<unitPattern count="other">{0} kvadrātkilometri</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>kvadrātmetri</displayName>
-				<unitPattern count="zero">{0} kvadrātmetri</unitPattern>
-				<unitPattern count="one">{0} kvadrātmetrs</unitPattern>
-				<unitPattern count="other">{0} kvadrātmetri</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>kvadrātjūdzes</displayName>
-				<unitPattern count="zero">{0} kvadrātjūdzes</unitPattern>
-				<unitPattern count="one">{0} kvadrātjūdze</unitPattern>
-				<unitPattern count="other">{0} kvadrātjūdzes</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>kvadrātjardi</displayName>
-				<unitPattern count="zero">{0} kvadrātjardi</unitPattern>
-				<unitPattern count="one">{0} kvadrātjards</unitPattern>
-				<unitPattern count="other">{0} kvadrātjardi</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karāti</displayName>
+				<unitPattern count="zero">{0} karāti</unitPattern>
+				<unitPattern count="one">{0} karāts</unitPattern>
+				<unitPattern count="other">{0} karāti</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litri uz kilometru</displayName>
@@ -5952,77 +6112,110 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} litrs uz kilometru</unitPattern>
 				<unitPattern count="other">{0} litri uz kilometru</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName draft="contributed">litri uz 100 kilometriem</displayName>
+				<unitPattern count="zero" draft="contributed">{0} litri uz 100 kilometriem</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} litrs uz 100 kilometriem</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} litri uz 100 kilometriem</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>jūdzes ar galonu</displayName>
 				<unitPattern count="zero">{0} jūdzes ar galonu</unitPattern>
 				<unitPattern count="one">{0} jūdze ar galonu</unitPattern>
 				<unitPattern count="other">{0} jūdzes ar galonu</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>biti</displayName>
-				<unitPattern count="zero">{0} biti</unitPattern>
-				<unitPattern count="one">{0} bits</unitPattern>
-				<unitPattern count="other">{0} biti</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>baiti</displayName>
-				<unitPattern count="zero">{0} baiti</unitPattern>
-				<unitPattern count="one">{0} baits</unitPattern>
-				<unitPattern count="other">{0} baiti</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabiti</displayName>
-				<unitPattern count="zero">{0} gigabiti</unitPattern>
-				<unitPattern count="one">{0} gigabits</unitPattern>
-				<unitPattern count="other">{0} gigabiti</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabaiti</displayName>
-				<unitPattern count="zero">{0} gigabaiti</unitPattern>
-				<unitPattern count="one">{0} gigabaits</unitPattern>
-				<unitPattern count="other">{0} gigabaiti</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobiti</displayName>
-				<unitPattern count="zero">{0} kilobiti</unitPattern>
-				<unitPattern count="one">{0} kilobits</unitPattern>
-				<unitPattern count="other">{0} kilobiti</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobaiti</displayName>
-				<unitPattern count="zero">{0} kilobaiti</unitPattern>
-				<unitPattern count="one">{0} kilobaits</unitPattern>
-				<unitPattern count="other">{0} kilobaiti</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabiti</displayName>
-				<unitPattern count="zero">{0} megabiti</unitPattern>
-				<unitPattern count="one">{0} megabits</unitPattern>
-				<unitPattern count="other">{0} megabiti</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabaiti</displayName>
-				<unitPattern count="zero">{0} megabaiti</unitPattern>
-				<unitPattern count="one">{0} megabaits</unitPattern>
-				<unitPattern count="other">{0} megabaits</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabiti</displayName>
-				<unitPattern count="zero">{0} terabiti</unitPattern>
-				<unitPattern count="one">{0} terabits</unitPattern>
-				<unitPattern count="other">{0} terabiti</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabaiti</displayName>
 				<unitPattern count="zero">{0} terabaiti</unitPattern>
 				<unitPattern count="one">{0} terabaits</unitPattern>
 				<unitPattern count="other">{0} terabaiti</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabiti</displayName>
+				<unitPattern count="zero">{0} terabiti</unitPattern>
+				<unitPattern count="one">{0} terabits</unitPattern>
+				<unitPattern count="other">{0} terabiti</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabaiti</displayName>
+				<unitPattern count="zero">{0} gigabaiti</unitPattern>
+				<unitPattern count="one">{0} gigabaits</unitPattern>
+				<unitPattern count="other">{0} gigabaiti</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabiti</displayName>
+				<unitPattern count="zero">{0} gigabiti</unitPattern>
+				<unitPattern count="one">{0} gigabits</unitPattern>
+				<unitPattern count="other">{0} gigabiti</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabaiti</displayName>
+				<unitPattern count="zero">{0} megabaiti</unitPattern>
+				<unitPattern count="one">{0} megabaits</unitPattern>
+				<unitPattern count="other">{0} megabaits</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabiti</displayName>
+				<unitPattern count="zero">{0} megabiti</unitPattern>
+				<unitPattern count="one">{0} megabits</unitPattern>
+				<unitPattern count="other">{0} megabiti</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobaiti</displayName>
+				<unitPattern count="zero">{0} kilobaiti</unitPattern>
+				<unitPattern count="one">{0} kilobaits</unitPattern>
+				<unitPattern count="other">{0} kilobaiti</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobiti</displayName>
+				<unitPattern count="zero">{0} kilobiti</unitPattern>
+				<unitPattern count="one">{0} kilobits</unitPattern>
+				<unitPattern count="other">{0} kilobiti</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>baiti</displayName>
+				<unitPattern count="zero">{0} baiti</unitPattern>
+				<unitPattern count="one">{0} baits</unitPattern>
+				<unitPattern count="other">{0} baiti</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>biti</displayName>
+				<unitPattern count="zero">{0} biti</unitPattern>
+				<unitPattern count="one">{0} bits</unitPattern>
+				<unitPattern count="other">{0} biti</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="contributed">gadsimti</displayName>
+				<unitPattern count="zero" draft="contributed">{0} gadsimti</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} gadsimts</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} gadsimti</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>gadi</displayName>
+				<unitPattern count="zero">{0} gadi</unitPattern>
+				<unitPattern count="one">{0} gads</unitPattern>
+				<unitPattern count="other">{0} gadi</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mēneši</displayName>
+				<unitPattern count="zero">{0} mēneši</unitPattern>
+				<unitPattern count="one">{0} mēnesis</unitPattern>
+				<unitPattern count="other">{0} mēneši</unitPattern>
+				<perUnitPattern draft="contributed">{0} mēnesī</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>nedēļas</displayName>
+				<unitPattern count="zero">{0} nedēļas</unitPattern>
+				<unitPattern count="one">{0} nedēļa</unitPattern>
+				<unitPattern count="other">{0} nedēļas</unitPattern>
+				<perUnitPattern draft="contributed">{0} nedēļā</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>dienas</displayName>
 				<unitPattern count="zero">{0} dienas</unitPattern>
 				<unitPattern count="one">{0} diena</unitPattern>
 				<unitPattern count="other">{0} dienas</unitPattern>
+				<perUnitPattern draft="contributed">{0} dienā</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>stundas</displayName>
@@ -6031,35 +6224,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} stundas</unitPattern>
 				<perUnitPattern>{0} stundā</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikrosekundes</displayName>
-				<unitPattern count="zero">{0} mikrosekundes</unitPattern>
-				<unitPattern count="one">{0} mikrosekunde</unitPattern>
-				<unitPattern count="other">{0} mikrosekundes</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milisekundes</displayName>
-				<unitPattern count="zero">{0} milisekundes</unitPattern>
-				<unitPattern count="one">{0} milisekunde</unitPattern>
-				<unitPattern count="other">{0} milisekundes</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>minūtes</displayName>
 				<unitPattern count="zero">{0} minūtes</unitPattern>
 				<unitPattern count="one">{0} minūte</unitPattern>
 				<unitPattern count="other">{0} minūtes</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>mēneši</displayName>
-				<unitPattern count="zero">{0} mēneši</unitPattern>
-				<unitPattern count="one">{0} mēnesis</unitPattern>
-				<unitPattern count="other">{0} mēneši</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanosekundes</displayName>
-				<unitPattern count="zero">{0} nanosekundes</unitPattern>
-				<unitPattern count="one">{0} nanosekunde</unitPattern>
-				<unitPattern count="other">{0} nanosekundes</unitPattern>
+				<perUnitPattern draft="contributed">{0}/minūtē</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sekundes</displayName>
@@ -6068,17 +6238,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} sekundes</unitPattern>
 				<perUnitPattern>{0} sekundē</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>nedēļas</displayName>
-				<unitPattern count="zero">{0} nedēļas</unitPattern>
-				<unitPattern count="one">{0} nedēļa</unitPattern>
-				<unitPattern count="other">{0} nedēļas</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milisekundes</displayName>
+				<unitPattern count="zero">{0} milisekundes</unitPattern>
+				<unitPattern count="one">{0} milisekunde</unitPattern>
+				<unitPattern count="other">{0} milisekundes</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>gadi</displayName>
-				<unitPattern count="zero">{0} gadi</unitPattern>
-				<unitPattern count="one">{0} gads</unitPattern>
-				<unitPattern count="other">{0} gadi</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>mikrosekundes</displayName>
+				<unitPattern count="zero">{0} mikrosekundes</unitPattern>
+				<unitPattern count="one">{0} mikrosekunde</unitPattern>
+				<unitPattern count="other">{0} mikrosekundes</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosekundes</displayName>
+				<unitPattern count="zero">{0} nanosekundes</unitPattern>
+				<unitPattern count="one">{0} nanosekunde</unitPattern>
+				<unitPattern count="other">{0} nanosekundes</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ampēri</displayName>
@@ -6104,6 +6280,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} volts</unitPattern>
 				<unitPattern count="other">{0} volti</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokalorijas</displayName>
+				<unitPattern count="zero">{0} kilokalorijas</unitPattern>
+				<unitPattern count="one">{0} kilokalorija</unitPattern>
+				<unitPattern count="other">{0} kilokalorijas</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kalorijas</displayName>
 				<unitPattern count="zero">{0} kalorijas</unitPattern>
@@ -6116,24 +6298,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kalorija</unitPattern>
 				<unitPattern count="other">{0} kalorijas</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>džouli</displayName>
-				<unitPattern count="zero">{0} džouli</unitPattern>
-				<unitPattern count="one">{0} džouls</unitPattern>
-				<unitPattern count="other">{0} džouli</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokalorijas</displayName>
-				<unitPattern count="zero">{0} kilokalorijas</unitPattern>
-				<unitPattern count="one">{0} kilokalorija</unitPattern>
-				<unitPattern count="other">{0} kilokalorijas</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilodžouli</displayName>
 				<unitPattern count="zero">{0} kilodžouli</unitPattern>
 				<unitPattern count="one">{0} kilodžouls</unitPattern>
 				<unitPattern count="other">{0} kilodžouli</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>džouli</displayName>
+				<unitPattern count="zero">{0} džouli</unitPattern>
+				<unitPattern count="one">{0} džouls</unitPattern>
+				<unitPattern count="other">{0} džouli</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilovatstundas</displayName>
 				<unitPattern count="zero">{0} kilovatstundas</unitPattern>
@@ -6146,11 +6322,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} gigahercs</unitPattern>
 				<unitPattern count="other">{0} gigaherci</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>herci</displayName>
-				<unitPattern count="zero">{0} herci</unitPattern>
-				<unitPattern count="one">{0} hercs</unitPattern>
-				<unitPattern count="other">{0} herci</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megaherci</displayName>
+				<unitPattern count="zero">{0} megaherci</unitPattern>
+				<unitPattern count="one">{0} megahercs</unitPattern>
+				<unitPattern count="other">{0} megaherci</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kiloherci</displayName>
@@ -6158,23 +6334,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kilohercs</unitPattern>
 				<unitPattern count="other">{0} kiloherci</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megaherci</displayName>
-				<unitPattern count="zero">{0} megaherci</unitPattern>
-				<unitPattern count="one">{0} megahercs</unitPattern>
-				<unitPattern count="other">{0} megaherci</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>herci</displayName>
+				<unitPattern count="zero">{0} herci</unitPattern>
+				<unitPattern count="one">{0} hercs</unitPattern>
+				<unitPattern count="other">{0} herci</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>astronomiskās vienības</displayName>
-				<unitPattern count="zero">{0} astronomiskās vienības</unitPattern>
-				<unitPattern count="one">{0} astronomiskā vienība</unitPattern>
-				<unitPattern count="other">{0} astronomiskās vienības</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometri</displayName>
+				<unitPattern count="zero">{0} kilometri</unitPattern>
+				<unitPattern count="one">{0} kilometrs</unitPattern>
+				<unitPattern count="other">{0} kilometri</unitPattern>
+				<perUnitPattern draft="contributed">{0} kilometrā</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>centimetri</displayName>
-				<unitPattern count="zero">{0} centimetri</unitPattern>
-				<unitPattern count="one">{0} centimetrs</unitPattern>
-				<unitPattern count="other">{0} centimetri</unitPattern>
+			<unit type="length-meter">
+				<displayName>metri</displayName>
+				<unitPattern count="zero">{0} metri</unitPattern>
+				<unitPattern count="one">{0} metrs</unitPattern>
+				<unitPattern count="other">{0} metri</unitPattern>
+				<perUnitPattern draft="contributed">{0} metrā</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>decimetri</displayName>
@@ -6182,47 +6360,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} decimetrs</unitPattern>
 				<unitPattern count="other">{0} decimetri</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>pēdas</displayName>
-				<unitPattern count="zero">{0} pēdas</unitPattern>
-				<unitPattern count="one">{0} pēda</unitPattern>
-				<unitPattern count="other">{0} pēdas</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>collas</displayName>
-				<unitPattern count="zero">{0} collas</unitPattern>
-				<unitPattern count="one">{0} colla</unitPattern>
-				<unitPattern count="other">{0} collas</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometri</displayName>
-				<unitPattern count="zero">{0} kilometri</unitPattern>
-				<unitPattern count="one">{0} kilometrs</unitPattern>
-				<unitPattern count="other">{0} kilometri</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>gaismas gadi</displayName>
-				<unitPattern count="zero">{0} gaismas gadi</unitPattern>
-				<unitPattern count="one">{0} gaismas gads</unitPattern>
-				<unitPattern count="other">{0} gaismas gadi</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metri</displayName>
-				<unitPattern count="zero">{0} metri</unitPattern>
-				<unitPattern count="one">{0} metrs</unitPattern>
-				<unitPattern count="other">{0} metri</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>mikrometri</displayName>
-				<unitPattern count="zero">{0} mikrometri</unitPattern>
-				<unitPattern count="one">{0} mikrometrs</unitPattern>
-				<unitPattern count="other">{0} mikrometri</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>jūdzes</displayName>
-				<unitPattern count="zero">{0} jūdzes</unitPattern>
-				<unitPattern count="one">{0} jūdze</unitPattern>
-				<unitPattern count="other">{0} jūdzes</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>centimetri</displayName>
+				<unitPattern count="zero">{0} centimetri</unitPattern>
+				<unitPattern count="one">{0} centimetrs</unitPattern>
+				<unitPattern count="other">{0} centimetri</unitPattern>
+				<perUnitPattern draft="contributed">{0} centimetrā</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>milimetri</displayName>
@@ -6230,71 +6373,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} milimetrs</unitPattern>
 				<unitPattern count="other">{0} milimetri</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikrometri</displayName>
+				<unitPattern count="zero">{0} mikrometri</unitPattern>
+				<unitPattern count="one">{0} mikrometrs</unitPattern>
+				<unitPattern count="other">{0} mikrometri</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanometri</displayName>
 				<unitPattern count="zero">{0} nanometri</unitPattern>
 				<unitPattern count="one">{0} nanometrs</unitPattern>
 				<unitPattern count="other">{0} nanometri</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>jūras jūdzes</displayName>
-				<unitPattern count="zero">{0} jūras jūdzes</unitPattern>
-				<unitPattern count="one">{0} jūras jūdze</unitPattern>
-				<unitPattern count="other">{0} jūras jūdzes</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parseki</displayName>
-				<unitPattern count="zero">{0} parseki</unitPattern>
-				<unitPattern count="one">{0} parseks</unitPattern>
-				<unitPattern count="other">{0} parseki</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pikometri</displayName>
 				<unitPattern count="zero">{0} pikometri</unitPattern>
 				<unitPattern count="one">{0} pikometrs</unitPattern>
 				<unitPattern count="other">{0} pikometri</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>jūdzes</displayName>
+				<unitPattern count="zero">{0} jūdzes</unitPattern>
+				<unitPattern count="one">{0} jūdze</unitPattern>
+				<unitPattern count="other">{0} jūdzes</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>jardi</displayName>
 				<unitPattern count="zero">{0} jardi</unitPattern>
 				<unitPattern count="one">{0} jards</unitPattern>
 				<unitPattern count="other">{0} jardi</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>pēdas</displayName>
+				<unitPattern count="zero">{0} pēdas</unitPattern>
+				<unitPattern count="one">{0} pēda</unitPattern>
+				<unitPattern count="other">{0} pēdas</unitPattern>
+				<perUnitPattern draft="contributed">{0} pēdā</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>collas</displayName>
+				<unitPattern count="zero">{0} collas</unitPattern>
+				<unitPattern count="one">{0} colla</unitPattern>
+				<unitPattern count="other">{0} collas</unitPattern>
+				<perUnitPattern draft="contributed">{0} collā</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parseki</displayName>
+				<unitPattern count="zero">{0} parseki</unitPattern>
+				<unitPattern count="one">{0} parseks</unitPattern>
+				<unitPattern count="other">{0} parseki</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>gaismas gadi</displayName>
+				<unitPattern count="zero">{0} gaismas gadi</unitPattern>
+				<unitPattern count="one">{0} gaismas gads</unitPattern>
+				<unitPattern count="other">{0} gaismas gadi</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>astronomiskās vienības</displayName>
+				<unitPattern count="zero">{0} astronomiskās vienības</unitPattern>
+				<unitPattern count="one">{0} astronomiskā vienība</unitPattern>
+				<unitPattern count="other">{0} astronomiskās vienības</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>jūras jūdzes</displayName>
+				<unitPattern count="zero">{0} jūras jūdzes</unitPattern>
+				<unitPattern count="one">{0} jūras jūdze</unitPattern>
+				<unitPattern count="other">{0} jūras jūdzes</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="contributed">skandināvu jūdze</displayName>
+				<unitPattern count="zero" draft="contributed">{0} skandināvu jūdzes</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} skandināvu jūdze</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} skandināvu jūdzes</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lukss</displayName>
 				<unitPattern count="zero">{0} luksi</unitPattern>
 				<unitPattern count="one">{0} lukss</unitPattern>
 				<unitPattern count="other">{0} luksi</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karāti</displayName>
-				<unitPattern count="zero">{0} karāti</unitPattern>
-				<unitPattern count="one">{0} karāts</unitPattern>
-				<unitPattern count="other">{0} karāti</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>grami</displayName>
-				<unitPattern count="zero">{0} grami</unitPattern>
-				<unitPattern count="one">{0} grams</unitPattern>
-				<unitPattern count="other">{0} grami</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogrami</displayName>
-				<unitPattern count="zero">{0} kilogrami</unitPattern>
-				<unitPattern count="one">{0} kilograms</unitPattern>
-				<unitPattern count="other">{0} kilogrami</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>metriskās tonnas</displayName>
 				<unitPattern count="zero">{0} metriskās tonnas</unitPattern>
 				<unitPattern count="one">{0} metriskā tonna</unitPattern>
 				<unitPattern count="other">{0} metriskās tonnas</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mikrogrami</displayName>
-				<unitPattern count="zero">{0} mikrogrami</unitPattern>
-				<unitPattern count="one">{0} mikrograms</unitPattern>
-				<unitPattern count="other">{0} mikrogrami</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogrami</displayName>
+				<unitPattern count="zero">{0} kilogrami</unitPattern>
+				<unitPattern count="one">{0} kilograms</unitPattern>
+				<unitPattern count="other">{0} kilogrami</unitPattern>
+				<perUnitPattern draft="contributed">{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>grami</displayName>
+				<unitPattern count="zero">{0} grami</unitPattern>
+				<unitPattern count="one">{0} grams</unitPattern>
+				<unitPattern count="other">{0} grami</unitPattern>
+				<perUnitPattern draft="contributed">{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>miligrami</displayName>
@@ -6302,23 +6479,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} miligrams</unitPattern>
 				<unitPattern count="other">{0} miligrami</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>unces</displayName>
-				<unitPattern count="zero">{0} unces</unitPattern>
-				<unitPattern count="one">{0} unce</unitPattern>
-				<unitPattern count="other">{0} unces</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>Trojas unces</displayName>
-				<unitPattern count="zero">{0} Trojas unces</unitPattern>
-				<unitPattern count="one">{0} Trojas unce</unitPattern>
-				<unitPattern count="other">{0} Trojas unces</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>mārciņas</displayName>
-				<unitPattern count="zero">{0} mārciņas</unitPattern>
-				<unitPattern count="one">{0} mārciņa</unitPattern>
-				<unitPattern count="other">{0} mārciņas</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>mikrogrami</displayName>
+				<unitPattern count="zero">{0} mikrogrami</unitPattern>
+				<unitPattern count="one">{0} mikrograms</unitPattern>
+				<unitPattern count="other">{0} mikrogrami</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tonnas</displayName>
@@ -6326,35 +6491,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} tonna</unitPattern>
 				<unitPattern count="other">{0} tonnas</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>mārciņas</displayName>
+				<unitPattern count="zero">{0} mārciņas</unitPattern>
+				<unitPattern count="one">{0} mārciņa</unitPattern>
+				<unitPattern count="other">{0} mārciņas</unitPattern>
+				<perUnitPattern draft="contributed">{0}/mārc.</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>unces</displayName>
+				<unitPattern count="zero">{0} unces</unitPattern>
+				<unitPattern count="one">{0} unce</unitPattern>
+				<unitPattern count="other">{0} unces</unitPattern>
+				<perUnitPattern draft="contributed">{0}/unce</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>Trojas unces</displayName>
+				<unitPattern count="zero">{0} Trojas unces</unitPattern>
+				<unitPattern count="one">{0} Trojas unce</unitPattern>
+				<unitPattern count="other">{0} Trojas unces</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karāti</displayName>
+				<unitPattern count="zero">{0} karāti</unitPattern>
+				<unitPattern count="one">{0} karāts</unitPattern>
+				<unitPattern count="other">{0} karāti</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigavati</displayName>
 				<unitPattern count="zero">{0} gigavati</unitPattern>
 				<unitPattern count="one">{0} gigavats</unitPattern>
 				<unitPattern count="other">{0} gigavati</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>zirgspēki</displayName>
-				<unitPattern count="zero">{0} zirgspēki</unitPattern>
-				<unitPattern count="one">{0} zirgspēks</unitPattern>
-				<unitPattern count="other">{0} zirgspēki</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilovati</displayName>
-				<unitPattern count="zero">{0} kilovati</unitPattern>
-				<unitPattern count="one">{0} kilovats</unitPattern>
-				<unitPattern count="other">{0} kilovati</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>megavati</displayName>
 				<unitPattern count="zero">{0} megavati</unitPattern>
 				<unitPattern count="one">{0} megavats</unitPattern>
 				<unitPattern count="other">{0} megavati</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>milivati</displayName>
-				<unitPattern count="zero">{0} milivati</unitPattern>
-				<unitPattern count="one">{0} milivats</unitPattern>
-				<unitPattern count="other">{0} milivati</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilovati</displayName>
+				<unitPattern count="zero">{0} kilovati</unitPattern>
+				<unitPattern count="one">{0} kilovats</unitPattern>
+				<unitPattern count="other">{0} kilovati</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>vati</displayName>
@@ -6362,24 +6541,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} vats</unitPattern>
 				<unitPattern count="other">{0} vati</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>milivati</displayName>
+				<unitPattern count="zero">{0} milivati</unitPattern>
+				<unitPattern count="one">{0} milivats</unitPattern>
+				<unitPattern count="other">{0} milivati</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>zirgspēki</displayName>
+				<unitPattern count="zero">{0} zirgspēki</unitPattern>
+				<unitPattern count="one">{0} zirgspēks</unitPattern>
+				<unitPattern count="other">{0} zirgspēki</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hektopaskāli</displayName>
 				<unitPattern count="zero">{0} hektopaskāli</unitPattern>
 				<unitPattern count="one">{0} hektopaskāls</unitPattern>
 				<unitPattern count="other">{0} hektopaskāli</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>dzīvsudraba staba collas</displayName>
-				<unitPattern count="zero">{0} dzīvsudraba staba collas</unitPattern>
-				<unitPattern count="one">{0} dzīvsudraba staba colla</unitPattern>
-				<unitPattern count="other">{0} dzīvsudraba staba collas</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>milibāri</displayName>
-				<unitPattern count="zero">{0} milibāri</unitPattern>
-				<unitPattern count="one">{0} milibārs</unitPattern>
-				<unitPattern count="other">{0} milibāri</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>dzīvsudraba staba milimetri</displayName>
 				<unitPattern count="zero">{0} dzīvsudraba staba milimetri</unitPattern>
@@ -6392,11 +6571,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mārciņa uz kvadrātcollu</unitPattern>
 				<unitPattern count="other">{0} mārciņas uz kvadrātcollu</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karāti</displayName>
-				<unitPattern count="zero">{0} karāti</unitPattern>
-				<unitPattern count="one">{0} karāts</unitPattern>
-				<unitPattern count="other">{0} karāti</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>dzīvsudraba staba collas</displayName>
+				<unitPattern count="zero">{0} dzīvsudraba staba collas</unitPattern>
+				<unitPattern count="one">{0} dzīvsudraba staba colla</unitPattern>
+				<unitPattern count="other">{0} dzīvsudraba staba collas</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>milibāri</displayName>
+				<unitPattern count="zero">{0} milibāri</unitPattern>
+				<unitPattern count="one">{0} milibārs</unitPattern>
+				<unitPattern count="other">{0} milibāri</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometri stundā</displayName>
@@ -6416,6 +6601,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} jūdze stundā</unitPattern>
 				<unitPattern count="other">{0} jūdzes stundā</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName draft="contributed">mezgls</displayName>
+				<unitPattern count="zero" draft="contributed">{0} mezgli</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} mezgls</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mezgli</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName draft="contributed">°</displayName>
+				<unitPattern count="zero" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>Celsija grādi</displayName>
 				<unitPattern count="zero">{0} Celsija grādi</unitPattern>
@@ -6434,36 +6631,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kelvins</unitPattern>
 				<unitPattern count="other">{0} kelvini</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>akrpēdas</displayName>
-				<unitPattern count="zero">{0} akrpēdas</unitPattern>
-				<unitPattern count="one">{0} akrpēda</unitPattern>
-				<unitPattern count="other">{0} akrpēdas</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>centilitri</displayName>
-				<unitPattern count="zero">{0} centilitri</unitPattern>
-				<unitPattern count="one">{0} centilitrs</unitPattern>
-				<unitPattern count="other">{0} centilitri</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>kubikcentimetri</displayName>
-				<unitPattern count="zero">{0} kubikcentimetri</unitPattern>
-				<unitPattern count="one">{0} kubikcentimetrs</unitPattern>
-				<unitPattern count="other">{0} kubikcentimetri</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>kubikpēdas</displayName>
-				<unitPattern count="zero">{0} kubikpēdas</unitPattern>
-				<unitPattern count="one">{0} kubikpēda</unitPattern>
-				<unitPattern count="other">{0} kubikpēdas</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>kubikcollas</displayName>
-				<unitPattern count="zero">{0} kubikcollas</unitPattern>
-				<unitPattern count="one">{0} kubikcolla</unitPattern>
-				<unitPattern count="other">{0} kubikcollas</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kubikkilometri</displayName>
 				<unitPattern count="zero">{0} kubikkilometri</unitPattern>
@@ -6475,6 +6642,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="zero">{0} kubikmetri</unitPattern>
 				<unitPattern count="one">{0} kubikmetrs</unitPattern>
 				<unitPattern count="other">{0} kubikmetri</unitPattern>
+				<perUnitPattern draft="contributed">{0} uz kubikmetru</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>kubikcentimetri</displayName>
+				<unitPattern count="zero">{0} kubikcentimetri</unitPattern>
+				<unitPattern count="one">{0} kubikcentimetrs</unitPattern>
+				<unitPattern count="other">{0} kubikcentimetri</unitPattern>
+				<perUnitPattern draft="contributed">{0} uz kubikcentimetru</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>kubikjūdzes</displayName>
@@ -6488,29 +6663,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kubikjards</unitPattern>
 				<unitPattern count="other">{0} kubikjardi</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>glāzes</displayName>
-				<unitPattern count="zero">{0} glāzes</unitPattern>
-				<unitPattern count="one">{0} glāze</unitPattern>
-				<unitPattern count="other">{0} glāzes</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>kubikpēdas</displayName>
+				<unitPattern count="zero">{0} kubikpēdas</unitPattern>
+				<unitPattern count="one">{0} kubikpēda</unitPattern>
+				<unitPattern count="other">{0} kubikpēdas</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>decilitri</displayName>
-				<unitPattern count="zero">{0} decilitri</unitPattern>
-				<unitPattern count="one">{0} decilitrs</unitPattern>
-				<unitPattern count="other">{0} decilitri</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>kubikcollas</displayName>
+				<unitPattern count="zero">{0} kubikcollas</unitPattern>
+				<unitPattern count="one">{0} kubikcolla</unitPattern>
+				<unitPattern count="other">{0} kubikcollas</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>šķidruma unces</displayName>
-				<unitPattern count="zero">{0} šķidruma unces</unitPattern>
-				<unitPattern count="one">{0} šķidruma unce</unitPattern>
-				<unitPattern count="other">{0} šķidruma unces</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>galoni</displayName>
-				<unitPattern count="zero">{0} galoni</unitPattern>
-				<unitPattern count="one">{0} galons</unitPattern>
-				<unitPattern count="other">{0} galoni</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megalitri</displayName>
+				<unitPattern count="zero">{0} megalitri</unitPattern>
+				<unitPattern count="one">{0} megalitrs</unitPattern>
+				<unitPattern count="other">{0} megalitri</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hektolitri</displayName>
@@ -6523,12 +6692,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="zero">{0} litri</unitPattern>
 				<unitPattern count="one">{0} litrs</unitPattern>
 				<unitPattern count="other">{0} litri</unitPattern>
+				<perUnitPattern draft="contributed">{0} uz litru</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalitri</displayName>
-				<unitPattern count="zero">{0} megalitri</unitPattern>
-				<unitPattern count="one">{0} megalitrs</unitPattern>
-				<unitPattern count="other">{0} megalitri</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>decilitri</displayName>
+				<unitPattern count="zero">{0} decilitri</unitPattern>
+				<unitPattern count="one">{0} decilitrs</unitPattern>
+				<unitPattern count="other">{0} decilitri</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centilitri</displayName>
+				<unitPattern count="zero">{0} centilitri</unitPattern>
+				<unitPattern count="one">{0} centilitrs</unitPattern>
+				<unitPattern count="other">{0} centilitri</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mililitri</displayName>
@@ -6536,11 +6712,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mililitrs</unitPattern>
 				<unitPattern count="other">{0} mililitri</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pintes</displayName>
-				<unitPattern count="zero">{0} pintes</unitPattern>
-				<unitPattern count="one">{0} pinte</unitPattern>
-				<unitPattern count="other">{0} pintes</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName draft="contributed">metriskās pintes</displayName>
+				<unitPattern count="zero" draft="contributed">{0} metriskās pintes</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} metriskā pinte</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} metriskās pintes</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>akrpēdas</displayName>
+				<unitPattern count="zero">{0} akrpēdas</unitPattern>
+				<unitPattern count="one">{0} akrpēda</unitPattern>
+				<unitPattern count="other">{0} akrpēdas</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galoni</displayName>
+				<unitPattern count="zero">{0} galoni</unitPattern>
+				<unitPattern count="one">{0} galons</unitPattern>
+				<unitPattern count="other">{0} galoni</unitPattern>
+				<perUnitPattern draft="contributed">{0}/gal.</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>kvartas</displayName>
@@ -6548,6 +6737,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kvarta</unitPattern>
 				<unitPattern count="other">{0} kvartas</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pintes</displayName>
+				<unitPattern count="zero">{0} pintes</unitPattern>
+				<unitPattern count="one">{0} pinte</unitPattern>
+				<unitPattern count="other">{0} pintes</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>glāzes</displayName>
+				<unitPattern count="zero">{0} glāzes</unitPattern>
+				<unitPattern count="one">{0} glāze</unitPattern>
+				<unitPattern count="other">{0} glāzes</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>šķidruma unces</displayName>
+				<unitPattern count="zero">{0} šķidruma unces</unitPattern>
+				<unitPattern count="one">{0} šķidruma unce</unitPattern>
+				<unitPattern count="other">{0} šķidruma unces</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>ēdamkarotes</displayName>
 				<unitPattern count="zero">{0} ēdamkarotes</unitPattern>
@@ -6560,6 +6767,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} tējkarote</unitPattern>
 				<unitPattern count="other">{0} tējkarotes</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">{0}A</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">{0}Z</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">{0}D</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0}R</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -6577,6 +6790,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName draft="contributed">apgr.</displayName>
+				<unitPattern count="zero" draft="contributed">{0} apgr.</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} apgr.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} apgr.</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="zero">{0} rad</unitPattern>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>°</displayName>
+				<unitPattern count="zero">{0}°</unitPattern>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>′</displayName>
 				<unitPattern count="zero">{0}′</unitPattern>
@@ -6589,23 +6820,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>°</displayName>
-				<unitPattern count="zero">{0}°</unitPattern>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="zero">{0} rad</unitPattern>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ac</displayName>
-				<unitPattern count="zero">{0} ac</unitPattern>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="zero">{0} km²</unitPattern>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ha</displayName>
@@ -6613,11 +6832,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="zero">{0} m²</unitPattern>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern draft="contributed">{0} uz m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="zero">{0} cm²</unitPattern>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern draft="contributed">{0} uz cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="zero">{0} mi²</unitPattern>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ac</displayName>
+				<unitPattern count="zero">{0} ac</unitPattern>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="zero">{0} yd²</unitPattern>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ft²</displayName>
@@ -6630,30 +6875,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="zero">{0} in²</unitPattern>
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern draft="contributed">{0} uz collu²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="zero">{0} km²</unitPattern>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="zero">{0} m²</unitPattern>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="zero">{0} mi²</unitPattern>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="zero">{0} yd²</unitPattern>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="zero">{0} kt</unitPattern>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
@@ -6661,77 +6889,111 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} l/km</unitPattern>
 				<unitPattern count="other">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName draft="contributed">l/100 km</displayName>
+				<unitPattern count="zero" draft="contributed">{0} l/100 km</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} l/100 km</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} l/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="zero">{0} mpg</unitPattern>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>b</displayName>
-				<unitPattern count="zero">{0} b</unitPattern>
-				<unitPattern count="one">{0} b</unitPattern>
-				<unitPattern count="other">{0} b</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>B</displayName>
-				<unitPattern count="zero">{0} B</unitPattern>
-				<unitPattern count="one">{0} B</unitPattern>
-				<unitPattern count="other">{0} B</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="zero">{0} Gb</unitPattern>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="zero">{0} GB</unitPattern>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>Kb</displayName>
-				<unitPattern count="zero">{0} Kb</unitPattern>
-				<unitPattern count="one">{0} Kb</unitPattern>
-				<unitPattern count="other">{0} Kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>KB</displayName>
-				<unitPattern count="zero">{0} KB</unitPattern>
-				<unitPattern count="one">{0} KB</unitPattern>
-				<unitPattern count="other">{0} KB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="zero">{0} Mb</unitPattern>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="zero">{0} MB</unitPattern>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="zero">{0} Tb</unitPattern>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="zero">{0} TB</unitPattern>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="zero">{0} Tb</unitPattern>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="zero">{0} GB</unitPattern>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="zero">{0} Gb</unitPattern>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="zero">{0} MB</unitPattern>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="zero">{0} Mb</unitPattern>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>KB</displayName>
+				<unitPattern count="zero">{0} KB</unitPattern>
+				<unitPattern count="one">{0} KB</unitPattern>
+				<unitPattern count="other">{0} KB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>Kb</displayName>
+				<unitPattern count="zero">{0} Kb</unitPattern>
+				<unitPattern count="one">{0} Kb</unitPattern>
+				<unitPattern count="other">{0} Kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>B</displayName>
+				<unitPattern count="zero">{0} B</unitPattern>
+				<unitPattern count="one">{0} B</unitPattern>
+				<unitPattern count="other">{0} B</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>b</displayName>
+				<unitPattern count="zero">{0} b</unitPattern>
+				<unitPattern count="one">{0} b</unitPattern>
+				<unitPattern count="other">{0} b</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="contributed">gs.</displayName>
+				<unitPattern count="zero" draft="contributed">{0} gs.</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} gs.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} gs.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>g.</displayName>
+				<unitPattern count="zero">{0} g.</unitPattern>
+				<unitPattern count="one">{0} g.</unitPattern>
+				<unitPattern count="other">{0} g.</unitPattern>
+				<perUnitPattern draft="contributed">{0}/g.</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mēneši</displayName>
+				<unitPattern count="zero">{0} mēn.</unitPattern>
+				<unitPattern count="one">{0} mēn.</unitPattern>
+				<unitPattern count="other">{0} mēn.</unitPattern>
+				<perUnitPattern draft="contributed">{0}/mēn.</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ned.</displayName>
+				<unitPattern count="zero">{0} ned.</unitPattern>
+				<unitPattern count="one">{0} ned.</unitPattern>
+				<unitPattern count="other">{0} ned.</unitPattern>
+				<perUnitPattern draft="contributed">{0}/ned.</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>d.</displayName>
 				<unitPattern count="zero">{0} d.</unitPattern>
 				<unitPattern count="one">{0} d.</unitPattern>
 				<unitPattern count="other">{0} d.</unitPattern>
+				<perUnitPattern draft="contributed">{0}/d.</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>st.</displayName>
@@ -6740,35 +7002,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} st.</unitPattern>
 				<perUnitPattern>{0}/st.</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="zero">{0} μs</unitPattern>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="zero">{0} ms</unitPattern>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min.</displayName>
 				<unitPattern count="zero">{0} min.</unitPattern>
 				<unitPattern count="one">{0} min.</unitPattern>
 				<unitPattern count="other">{0} min.</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>mēneši</displayName>
-				<unitPattern count="zero">{0} mēn.</unitPattern>
-				<unitPattern count="one">{0} mēn.</unitPattern>
-				<unitPattern count="other">{0} mēn.</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="zero">{0} ns</unitPattern>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern draft="contributed">{0}/min.</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sek.</displayName>
@@ -6777,17 +7016,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} sek.</unitPattern>
 				<perUnitPattern>{0}/sek.</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>ned.</displayName>
-				<unitPattern count="zero">{0} ned.</unitPattern>
-				<unitPattern count="one">{0} ned.</unitPattern>
-				<unitPattern count="other">{0} ned.</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="zero">{0} ms</unitPattern>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>g.</displayName>
-				<unitPattern count="zero">{0} g.</unitPattern>
-				<unitPattern count="one">{0} g.</unitPattern>
-				<unitPattern count="other">{0} g.</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="zero">{0} μs</unitPattern>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="zero">{0} ns</unitPattern>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>A</displayName>
@@ -6813,6 +7058,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="zero">{0} kcal</unitPattern>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="zero">{0} cal</unitPattern>
@@ -6825,24 +7076,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} cal</unitPattern>
 				<unitPattern count="other">{0} cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>J</displayName>
-				<unitPattern count="zero">{0} J</unitPattern>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="zero">{0} kcal</unitPattern>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="zero">{0} kJ</unitPattern>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="zero">{0} J</unitPattern>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="zero">{0} kWh</unitPattern>
@@ -6855,11 +7100,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="zero">{0} Hz</unitPattern>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="zero">{0} MHz</unitPattern>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
@@ -6867,23 +7112,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="zero">{0} MHz</unitPattern>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="zero">{0} Hz</unitPattern>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>a.v.</displayName>
-				<unitPattern count="zero">{0} a.v.</unitPattern>
-				<unitPattern count="one">{0} a.v.</unitPattern>
-				<unitPattern count="other">{0} a.v.</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometri</displayName>
+				<unitPattern count="zero">{0} km</unitPattern>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern draft="contributed">{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="zero">{0} cm</unitPattern>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="zero">{0} m</unitPattern>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern draft="contributed">{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
@@ -6891,47 +7138,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ft</displayName>
-				<unitPattern count="zero">{0} ft</unitPattern>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>c.</displayName>
-				<unitPattern count="zero">{0} c.</unitPattern>
-				<unitPattern count="one">{0} c.</unitPattern>
-				<unitPattern count="other">{0} c.</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometri</displayName>
-				<unitPattern count="zero">{0} km</unitPattern>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>g.g.</displayName>
-				<unitPattern count="zero">{0} g.g.</unitPattern>
-				<unitPattern count="one">{0} g.g.</unitPattern>
-				<unitPattern count="other">{0} g.g.</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-				<unitPattern count="zero">{0} m</unitPattern>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="zero">{0} µm</unitPattern>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mi</displayName>
-				<unitPattern count="zero">{0} mi</unitPattern>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="zero">{0} cm</unitPattern>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern draft="contributed">{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -6939,71 +7151,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="zero">{0} µm</unitPattern>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="zero">{0} nm</unitPattern>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="zero">{0} nmi</unitPattern>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="zero">{0} pc</unitPattern>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="zero">{0} pm</unitPattern>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="zero">{0} mi</unitPattern>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yd</displayName>
 				<unitPattern count="zero">{0} yd</unitPattern>
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ft</displayName>
+				<unitPattern count="zero">{0} ft</unitPattern>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern draft="contributed">{0}/pēda</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>c.</displayName>
+				<unitPattern count="zero">{0} c.</unitPattern>
+				<unitPattern count="one">{0} c.</unitPattern>
+				<unitPattern count="other">{0} c.</unitPattern>
+				<perUnitPattern draft="contributed">{0}/colla</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="zero">{0} pc</unitPattern>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>g.g.</displayName>
+				<unitPattern count="zero">{0} g.g.</unitPattern>
+				<unitPattern count="one">{0} g.g.</unitPattern>
+				<unitPattern count="other">{0} g.g.</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>a.v.</displayName>
+				<unitPattern count="zero">{0} a.v.</unitPattern>
+				<unitPattern count="one">{0} a.v.</unitPattern>
+				<unitPattern count="other">{0} a.v.</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="zero">{0} nmi</unitPattern>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="contributed">skandināvu jūdze</displayName>
+				<unitPattern count="zero" draft="contributed">{0} skandināvu jūdzes</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} skandināvu jūdze</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} skandināvu jūdzes</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="zero">{0} lx</unitPattern>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>CD</displayName>
-				<unitPattern count="zero">{0} CD</unitPattern>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="zero">{0} g</unitPattern>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="zero">{0} kg</unitPattern>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="zero">{0} t</unitPattern>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="zero">{0} µg</unitPattern>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="zero">{0} kg</unitPattern>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern draft="contributed">{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="zero">{0} g</unitPattern>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern draft="contributed">{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
@@ -7011,23 +7257,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="zero">{0} oz</unitPattern>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="zero">{0} oz t</unitPattern>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="zero">{0} lb</unitPattern>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="zero">{0} µg</unitPattern>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tonnas</displayName>
@@ -7035,35 +7269,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} tonna</unitPattern>
 				<unitPattern count="other">{0} tonnas</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="zero">{0} lb</unitPattern>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern draft="contributed">{0}/mārc.</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="zero">{0} oz</unitPattern>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern draft="contributed">{0}/unce</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="zero">{0} oz t</unitPattern>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>CD</displayName>
+				<unitPattern count="zero">{0} CD</unitPattern>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="zero">{0} GW</unitPattern>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>ZS</displayName>
-				<unitPattern count="zero">{0} ZS</unitPattern>
-				<unitPattern count="one">{0} ZS</unitPattern>
-				<unitPattern count="other">{0} ZS</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="zero">{0} kW</unitPattern>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="zero">{0} MW</unitPattern>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="zero">{0} mW</unitPattern>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="zero">{0} kW</unitPattern>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>W</displayName>
@@ -7071,24 +7319,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="zero">{0} mW</unitPattern>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>ZS</displayName>
+				<unitPattern count="zero">{0} ZS</unitPattern>
+				<unitPattern count="one">{0} ZS</unitPattern>
+				<unitPattern count="other">{0} ZS</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="zero">{0} hPa</unitPattern>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="zero">{0} inHg</unitPattern>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="zero">{0} mbar</unitPattern>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mmHg</displayName>
 				<unitPattern count="zero">{0} mmHg</unitPattern>
@@ -7101,11 +7349,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="zero">{0} kt</unitPattern>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="zero">{0} inHg</unitPattern>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="zero">{0} mbar</unitPattern>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/st.</displayName>
@@ -7125,6 +7379,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName draft="contributed">mezgls</displayName>
+				<unitPattern count="zero" draft="contributed">{0} mezgli</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} mezgls</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mezgli</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName draft="contributed">°</displayName>
+				<unitPattern count="zero" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="zero">{0} °C</unitPattern>
@@ -7143,36 +7409,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="zero">{0} ac ft</unitPattern>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="zero">{0} cl</unitPattern>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="zero">{0} cm³</unitPattern>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="zero">{0} ft³</unitPattern>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="zero">{0} in³</unitPattern>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="zero">{0} km³</unitPattern>
@@ -7184,6 +7420,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="zero">{0} m³</unitPattern>
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern draft="contributed">{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="zero">{0} cm³</unitPattern>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern draft="contributed">{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -7197,29 +7441,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>gl.</displayName>
-				<unitPattern count="zero">{0} gl.</unitPattern>
-				<unitPattern count="one">{0} gl.</unitPattern>
-				<unitPattern count="other">{0} gl.</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="zero">{0} ft³</unitPattern>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="zero">{0} dl</unitPattern>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="zero">{0} in³</unitPattern>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="zero">{0} fl oz</unitPattern>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="zero">{0} gal</unitPattern>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="zero">{0} ML</unitPattern>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -7232,12 +7470,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="zero">{0} l</unitPattern>
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern draft="contributed">{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="zero">{0} ML</unitPattern>
-				<unitPattern count="one">{0} ML</unitPattern>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="zero">{0} dl</unitPattern>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="zero">{0} cl</unitPattern>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
@@ -7245,11 +7490,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="zero">{0} pt</unitPattern>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName draft="contributed">mpt</displayName>
+				<unitPattern count="zero" draft="contributed">{0} mpt</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} mpt</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName draft="contributed">metr.gl.</displayName>
+				<unitPattern count="zero" draft="contributed">{0} metr.gl.</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} metr.gl.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} metr.gl.</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="zero">{0} ac ft</unitPattern>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="zero">{0} gal</unitPattern>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern draft="contributed">{0}/gal.</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
@@ -7257,6 +7521,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="zero">{0} pt</unitPattern>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>gl.</displayName>
+				<unitPattern count="zero">{0} gl.</unitPattern>
+				<unitPattern count="one">{0} gl.</unitPattern>
+				<unitPattern count="other">{0} gl.</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="zero">{0} fl oz</unitPattern>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>ĒK</displayName>
 				<unitPattern count="zero">{0} ĒK</unitPattern>
@@ -7269,6 +7551,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} TK</unitPattern>
 				<unitPattern count="other">{0} TK</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">{0}A</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">{0}Z</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">{0}D</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0}R</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -7279,6 +7567,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}G</unitPattern>
 				<unitPattern count="other">{0}G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="zero">{0}°</unitPattern>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="zero">{0}′</unitPattern>
 				<unitPattern count="one">{0}′</unitPattern>
@@ -7289,31 +7582,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="zero">{0}°</unitPattern>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="zero">{0}ac</unitPattern>
-				<unitPattern count="one">{0}ac</unitPattern>
-				<unitPattern count="other">{0}ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="zero">{0}km²</unitPattern>
+				<unitPattern count="one">{0}km²</unitPattern>
+				<unitPattern count="other">{0}km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="zero">{0}ha</unitPattern>
 				<unitPattern count="one">{0}ha</unitPattern>
 				<unitPattern count="other">{0}ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="zero">{0}ft²</unitPattern>
-				<unitPattern count="one">{0}ft²</unitPattern>
-				<unitPattern count="other">{0}ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="zero">{0}km²</unitPattern>
-				<unitPattern count="one">{0}km²</unitPattern>
-				<unitPattern count="other">{0}km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="zero">{0}m²</unitPattern>
 				<unitPattern count="one">{0}m²</unitPattern>
@@ -7324,6 +7602,40 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}mi²</unitPattern>
 				<unitPattern count="other">{0}mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="zero">{0}ac</unitPattern>
+				<unitPattern count="one">{0}ac</unitPattern>
+				<unitPattern count="other">{0}ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="zero">{0}ft²</unitPattern>
+				<unitPattern count="one">{0}ft²</unitPattern>
+				<unitPattern count="other">{0}ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName draft="contributed">l/100 km</displayName>
+				<unitPattern count="zero" draft="contributed">{0} l/100 km</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} l/100 km</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} l/100 km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>g.</displayName>
+				<unitPattern count="zero">{0}g.</unitPattern>
+				<unitPattern count="one">{0}g.</unitPattern>
+				<unitPattern count="other">{0}g.</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mēn.</displayName>
+				<unitPattern count="zero">{0} mēn.</unitPattern>
+				<unitPattern count="one">{0} mēn.</unitPattern>
+				<unitPattern count="other">{0} mēn.</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ned.</displayName>
+				<unitPattern count="zero">{0} ned.</unitPattern>
+				<unitPattern count="one">{0} ned.</unitPattern>
+				<unitPattern count="other">{0} ned.</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>d.</displayName>
 				<unitPattern count="zero">{0}d</unitPattern>
@@ -7336,57 +7648,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}h</unitPattern>
 				<unitPattern count="other">{0}h</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="zero">{0}ms</unitPattern>
-				<unitPattern count="one">{0}ms</unitPattern>
-				<unitPattern count="other">{0}ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="zero">{0} min</unitPattern>
 				<unitPattern count="one">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>mēn.</displayName>
-				<unitPattern count="zero">{0} mēn.</unitPattern>
-				<unitPattern count="one">{0} mēn.</unitPattern>
-				<unitPattern count="other">{0} mēn.</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>s</displayName>
 				<unitPattern count="zero">{0}s</unitPattern>
 				<unitPattern count="one">{0}s</unitPattern>
 				<unitPattern count="other">{0}s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>ned.</displayName>
-				<unitPattern count="zero">{0} ned.</unitPattern>
-				<unitPattern count="one">{0} ned.</unitPattern>
-				<unitPattern count="other">{0} ned.</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>g.</displayName>
-				<unitPattern count="zero">{0}g.</unitPattern>
-				<unitPattern count="one">{0}g.</unitPattern>
-				<unitPattern count="other">{0}g.</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="zero">{0}cm</unitPattern>
-				<unitPattern count="one">{0}cm</unitPattern>
-				<unitPattern count="other">{0}cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="zero">{0}ft</unitPattern>
-				<unitPattern count="one">{0}ft</unitPattern>
-				<unitPattern count="other">{0}ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="zero">{0}in</unitPattern>
-				<unitPattern count="one">{0}in</unitPattern>
-				<unitPattern count="other">{0}in</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="zero">{0}ms</unitPattern>
+				<unitPattern count="one">{0}ms</unitPattern>
+				<unitPattern count="other">{0}ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
@@ -7394,22 +7672,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}km</unitPattern>
 				<unitPattern count="other">{0}km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<displayName>g.g.</displayName>
-				<unitPattern count="zero">{0}g.g.</unitPattern>
-				<unitPattern count="one">{0}g.g.</unitPattern>
-				<unitPattern count="other">{0}g.g.</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>m</displayName>
 				<unitPattern count="zero">{0}m</unitPattern>
 				<unitPattern count="one">{0}m</unitPattern>
 				<unitPattern count="other">{0}m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="zero">{0}mi</unitPattern>
-				<unitPattern count="one">{0}mi</unitPattern>
-				<unitPattern count="other">{0}mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="zero">{0}cm</unitPattern>
+				<unitPattern count="one">{0}cm</unitPattern>
+				<unitPattern count="other">{0}cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -7422,16 +7695,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}pm</unitPattern>
 				<unitPattern count="other">{0}pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="zero">{0}mi</unitPattern>
+				<unitPattern count="one">{0}mi</unitPattern>
+				<unitPattern count="other">{0}mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="zero">{0}yd</unitPattern>
 				<unitPattern count="one">{0}yd</unitPattern>
 				<unitPattern count="other">{0}yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="zero">{0}g</unitPattern>
-				<unitPattern count="one">{0}g</unitPattern>
-				<unitPattern count="other">{0}g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="zero">{0}ft</unitPattern>
+				<unitPattern count="one">{0}ft</unitPattern>
+				<unitPattern count="other">{0}ft</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="zero">{0}in</unitPattern>
+				<unitPattern count="one">{0}in</unitPattern>
+				<unitPattern count="other">{0}in</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>g.g.</displayName>
+				<unitPattern count="zero">{0}g.g.</unitPattern>
+				<unitPattern count="one">{0}g.g.</unitPattern>
+				<unitPattern count="other">{0}g.g.</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
@@ -7439,20 +7727,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}kg</unitPattern>
 				<unitPattern count="other">{0}kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="zero">{0}oz</unitPattern>
-				<unitPattern count="one">{0}oz</unitPattern>
-				<unitPattern count="other">{0}oz</unitPattern>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="zero">{0}g</unitPattern>
+				<unitPattern count="one">{0}g</unitPattern>
+				<unitPattern count="other">{0}g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="zero">{0}lb</unitPattern>
 				<unitPattern count="one">{0}lb</unitPattern>
 				<unitPattern count="other">{0}lb</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="zero">{0} ZS</unitPattern>
-				<unitPattern count="one">{0} ZS</unitPattern>
-				<unitPattern count="other">{0} ZS</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="zero">{0}oz</unitPattern>
+				<unitPattern count="one">{0}oz</unitPattern>
+				<unitPattern count="other">{0}oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="zero">{0}kW</unitPattern>
@@ -7464,6 +7753,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}W</unitPattern>
 				<unitPattern count="other">{0}W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="zero">{0} ZS</unitPattern>
+				<unitPattern count="one">{0} ZS</unitPattern>
+				<unitPattern count="other">{0} ZS</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="zero">{0}hPa</unitPattern>
 				<unitPattern count="one">{0}hPa</unitPattern>
@@ -7522,6 +7816,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}l</unitPattern>
 				<unitPattern count="other">{0}l</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">{0}A</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">{0}Z</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">{0}D</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0}R</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lv_LV.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lv_LV.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lv_LV.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lv_LV.xml
index ad6761cc5eb..be283190449 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/lv_LV.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lv_LV.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="lv"/>
 		<territory type="LV"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mas.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mas.xml
similarity index 92%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mas.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mas.xml
index 7a5d4b40757..426be014eb7 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mas.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mas.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="mas"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antili za Uholanzi</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Ajentina</territory>
 			<territory type="AS">Samoa ya Marekani</territory>
@@ -435,6 +433,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">Ɛnkakɛnyá</dayPeriod>
+							<dayPeriod type="pm">Ɛndámâ</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">Ɛnkakɛnyá</dayPeriod>
 							<dayPeriod type="pm">Ɛndámâ</dayPeriod>
@@ -476,22 +478,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -571,6 +573,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mas_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mas_KE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mas_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mas_KE.xml
index 71baaee3c45..db770291677 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mas_KE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mas_KE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="mas"/>
 		<territory type="KE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mas_TZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mas_TZ.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mas_TZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mas_TZ.xml
index 096164a82d4..ccffd10f8e8 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mas_TZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mas_TZ.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="mas"/>
 		<territory type="TZ"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mer.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mer.xml
similarity index 94%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mer.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mer.xml
index 2035cc9475e..eda88b2b568 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mer.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mer.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="mer"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Alubania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antili cia Holandi</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Ajentina</territory>
 			<territory type="AS">Samoa ya Amerika</territory>
@@ -441,6 +439,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">RŨ</dayPeriod>
+							<dayPeriod type="pm">ŨG</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">RŨ</dayPeriod>
 							<dayPeriod type="pm">ŨG</dayPeriod>
@@ -482,22 +484,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -577,6 +579,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -754,3 +772,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mer_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mer_KE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mer_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mer_KE.xml
index 1dd136e0ca1..f855872f23a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mer_KE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mer_KE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="mer"/>
 		<territory type="KE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mfe.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mfe.xml
similarity index 95%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mfe.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mfe.xml
index 72a9695dc36..4cc60977e43 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mfe.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mfe.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12128 $"/>
 		<language type="mfe"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albani</territory>
 			<territory type="AM">Armeni</territory>
-			<territory type="AN">Antiy neerlande</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Larzantinn</territory>
 			<territory type="AS">Samoa amerikin</territory>
@@ -567,6 +565,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<symbols numberSystem="latn">
 			<group> </group>
 		</symbols>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencies>
 			<currency type="AED">
 				<displayName>dirham Emira arab ini</displayName>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mfe_MU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mfe_MU.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mfe_MU.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mfe_MU.xml
index 433450b3307..2edfb3460dd 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mfe_MU.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mfe_MU.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="mfe"/>
 		<territory type="MU"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mg.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mg.xml
similarity index 92%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mg.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mg.xml
index f7571b95c14..b1b141a1f9a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mg.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mg.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12128 $"/>
 		<language type="mg"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Vondronosy karaiba holandey</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Arzantina</territory>
 			<territory type="AS">Samoa amerikanina</territory>
@@ -567,6 +565,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mg_MG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mg_MG.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mg_MG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mg_MG.xml
index 5525b88db50..8753c6562a2 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mg_MG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mg_MG.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="mg"/>
 		<territory type="MG"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mgh.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgh.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mgh.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgh.xml
index d79b7844b34..d34e41c4ce6 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mgh.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgh.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="mgh"/>
 	</identity>
 	<localeDisplayNames>
@@ -338,6 +337,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</days>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">wichishu</dayPeriod>
+							<dayPeriod type="pm">mchochil’l</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">wichishu</dayPeriod>
 							<dayPeriod type="pm">mchochil’l</dayPeriod>
@@ -379,22 +382,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -464,6 +467,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<decimal>,</decimal>
 			<group>.</group>
 		</symbols>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencies>
 			<currency type="MZN">
 				<symbol>MTn</symbol>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mgh_MZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgh_MZ.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mgh_MZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgh_MZ.xml
index 91d19ed999f..5132394ec09 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mgh_MZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgh_MZ.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="mgh"/>
 		<territory type="MZ"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mgo.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgo.xml
similarity index 88%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mgo.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgo.xml
index 8fcf2eee863..49cd2f4f9a6 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mgo.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgo.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="mgo"/>
 	</identity>
 	<localeDisplayNames>
@@ -25,8 +24,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ZZ">aba aben tisɔ̀</territory>
 		</territories>
 		<types>
-			<type type="gregorian" key="calendar">ngàb mə̀kala</type>
-			<type type="latn" key="numbers">inu</type>
+			<type key="calendar" type="gregorian">ngàb mə̀kala</type>
+			<type key="numbers" type="latn">inu</type>
 		</types>
 		<codePatterns>
 			<codePattern type="language">{0}</codePattern>
@@ -275,6 +274,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</days>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">AM</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
@@ -492,6 +495,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤ #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤ 0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤ 00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤ 000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤ 0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤ 00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤ 000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤ 0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤ 00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤ 000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤ 0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤ 00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤ 000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -507,6 +538,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</numbers>
 	<units>
 		<unitLength type="long">
+			<unit type="duration-month">
+				<displayName draft="provisional">m</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">d</displayName>
 				<unitPattern count="one">{0} d</unitPattern>
@@ -522,11 +558,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">m</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="provisional">s</displayName>
 				<unitPattern count="one">{0} s</unitPattern>
@@ -534,6 +565,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 		</unitLength>
 		<unitLength type="short">
+			<unit type="duration-month">
+				<displayName draft="provisional">m</displayName>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">d</displayName>
 			</unit>
@@ -543,9 +577,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="duration-minute">
 				<displayName draft="provisional">min</displayName>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">m</displayName>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="provisional">s</displayName>
 			</unit>
@@ -558,3 +589,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mgo_CM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgo_CM.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mgo_CM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgo_CM.xml
index f8c493ffad1..ec52d2d08be 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mgo_CM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgo_CM.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="mgo"/>
 		<territory type="CM"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mk.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mk.xml
similarity index 90%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mk.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mk.xml
index 7d4364f038c..1bdc7d7471b 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mk.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mk.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12411 $"/>
 		<language type="mk"/>
 	</identity>
 	<localeDisplayNames>
@@ -59,7 +58,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ay">ајмарски</language>
 			<language type="az">азербејџански</language>
 			<language type="az" alt="short">азерски</language>
-			<language type="azb">јужноазербејџански</language>
 			<language type="ba">башкирски</language>
 			<language type="bal">белуџиски</language>
 			<language type="ban">балиски</language>
@@ -76,6 +74,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bfd">бафут</language>
 			<language type="bfq">бадага</language>
 			<language type="bg">бугарски</language>
+			<language type="bgn">западен балочи</language>
 			<language type="bho">боџпури</language>
 			<language type="bi">бислама</language>
 			<language type="bik">биколски</language>
@@ -117,7 +116,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="chp">чипевјански</language>
 			<language type="chr">черокиски</language>
 			<language type="chy">чејенски</language>
-			<language type="ckb">сорански курдски</language>
+			<language type="ckb">централен курдски</language>
 			<language type="co">корзикански</language>
 			<language type="cop">коптски</language>
 			<language type="cps">капизнон</language>
@@ -243,7 +242,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="id">индонезиски</language>
 			<language type="ie">окцидентал</language>
 			<language type="ig">игбо</language>
-			<language type="ii">носу</language>
+			<language type="ii">сичуан ји</language>
 			<language type="ik">инупијачки</language>
 			<language type="ilo">илокански</language>
 			<language type="inh">ингушки</language>
@@ -311,7 +310,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="kut">кутенајски</language>
 			<language type="kv">коми</language>
 			<language type="kw">корнски</language>
-			<language type="ky">киргиски</language>
+			<language type="ky">киргистански</language>
 			<language type="la">латински</language>
 			<language type="lad">ладино</language>
 			<language type="lag">ланги</language>
@@ -330,6 +329,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">лаошки</language>
 			<language type="lol">монго</language>
 			<language type="loz">лози</language>
+			<language type="lrc">севернолуриски</language>
 			<language type="lt">литвански</language>
 			<language type="ltg">латгалски</language>
 			<language type="lu">луба-катанга</language>
@@ -397,6 +397,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="niu">ниуејски</language>
 			<language type="njo">ао</language>
 			<language type="nl">холандски</language>
+			<language type="nl_BE" draft="provisional">фламански</language>
 			<language type="nmg">квазио</language>
 			<language type="nn">норвешки нинорск</language>
 			<language type="nnh">нгиембун</language>
@@ -481,6 +482,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sco">шкотски германски</language>
 			<language type="sd">синди</language>
 			<language type="sdc">сасарски сардински</language>
+			<language type="sdh">јужнокурдски</language>
 			<language type="se">севернолапонски</language>
 			<language type="see">сенека</language>
 			<language type="seh">сена</language>
@@ -523,8 +525,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">сумерски</language>
 			<language type="sv">шведски</language>
 			<language type="sw">свахили</language>
+			<language type="sw_CD">конгоански свахили</language>
 			<language type="swb">коморијански</language>
-			<language type="swc">конгоански свахили</language>
 			<language type="syc">класичен сириски</language>
 			<language type="syr">сириски</language>
 			<language type="szl">шлезиски</language>
@@ -591,6 +593,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">воламо</language>
 			<language type="war">варајски</language>
 			<language type="was">вашо</language>
+			<language type="wbp" draft="provisional">варлпири</language>
 			<language type="wo">волофски</language>
 			<language type="wuu">ву</language>
 			<language type="xal">калмички</language>
@@ -826,7 +829,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Ангвила</territory>
 			<territory type="AL">Албанија</territory>
 			<territory type="AM">Ерменија</territory>
-			<territory type="AN">Холандски Антили</territory>
 			<territory type="AO">Ангола</territory>
 			<territory type="AQ">Антарктик</territory>
 			<territory type="AR">Аргентина</territory>
@@ -866,7 +868,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CG" alt="variant">Конго (Република)</territory>
 			<territory type="CH">Швајцарија</territory>
 			<territory type="CI">Брегот на Слоновата Коска</territory>
-			<territory type="CI" alt="variant">Брег на Слоновата Коска</territory>
+			<territory type="CI" alt="variant">Брег на Слонова Коска</territory>
 			<territory type="CK">Кукови Острови</territory>
 			<territory type="CL">Чиле</territory>
 			<territory type="CM">Камерун</territory>
@@ -1080,7 +1082,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="VI">Американски Девствени Острови</territory>
 			<territory type="VN">Виетнам</territory>
 			<territory type="VU">Вануату</territory>
-			<territory type="WF">Волис и Футуна</territory>
+			<territory type="WF">Валис и Футуна</territory>
 			<territory type="WS">Самоа</territory>
 			<territory type="XK">Косово</territory>
 			<territory type="YE">Јемен</territory>
@@ -1098,68 +1100,81 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="calendar">Календар</key>
 			<key type="collation">Подредување</key>
 			<key type="currency">Валута</key>
+			<key type="hc">Часовен циклус (12 или 24)</key>
+			<key type="lb">Стил за разделување редови</key>
+			<key type="ms">Мерен систем</key>
 			<key type="numbers">Броеви</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Арапски-индиски цифри</type>
-			<type type="arabext" key="numbers">Проширени арапско-индиски цифри</type>
-			<type type="armn" key="numbers">Ерменски броеви</type>
-			<type type="armnlow" key="numbers">Ерменски мали броеви</type>
-			<type type="beng" key="numbers">Бенгалски цифри</type>
-			<type type="big5han" key="collation">Традиционално кинеско сортирање</type>
-			<type type="buddhist" key="calendar">Будистички календар</type>
-			<type type="chinese" key="calendar">Кинески календар</type>
-			<type type="coptic" key="calendar">Коптски календар</type>
-			<type type="dangi" key="calendar">Дангиски календар</type>
-			<type type="deva" key="numbers">деванагарски цифри</type>
-			<type type="ducet" key="collation">Стандардно сортирање во уникод</type>
-			<type type="ethi" key="numbers">Етиопски броеви</type>
-			<type type="ethiopic" key="calendar">Етиопски календар</type>
-			<type type="ethiopic-amete-alem" key="calendar">Етиопски Амет Алем календар</type>
-			<type type="fullwide" key="numbers">Цифри со целосна ширина</type>
-			<type type="gb2312han" key="collation">Поедноставено кинеско сортирање</type>
-			<type type="geor" key="numbers">Грузиски броеви</type>
-			<type type="gregorian" key="calendar">Грегоријански календар</type>
-			<type type="grek" key="numbers">Грчки броеви</type>
-			<type type="greklow" key="numbers">Грчки мали броеви</type>
-			<type type="gujr" key="numbers">Гуџарати цифри</type>
-			<type type="guru" key="numbers">Гурмуки цифри</type>
-			<type type="hanidec" key="numbers">Кинески децимални броеви</type>
-			<type type="hans" key="numbers">Поедноставени кинески броеви</type>
-			<type type="hansfin" key="numbers">Поедноставени кинески финансиски броеви</type>
-			<type type="hant" key="numbers">Традиционални кинески броеви</type>
-			<type type="hantfin" key="numbers">Традиционални кинески финансиски броеви</type>
-			<type type="hebr" key="numbers">Хебрејски броеви</type>
-			<type type="hebrew" key="calendar">Еврејски календар</type>
-			<type type="indian" key="calendar">Индиски национален календар</type>
-			<type type="islamic" key="calendar">Исламски календар</type>
-			<type type="islamic-civil" key="calendar">Исламски граѓански календар</type>
-			<type type="iso8601" key="calendar">Календар ISO-8601</type>
-			<type type="japanese" key="calendar">Јапонски календар</type>
-			<type type="jpan" key="numbers">Јапонски броеви</type>
-			<type type="jpanfin" key="numbers">Јапонски финансиски броеви</type>
-			<type type="khmr" key="numbers">Кмерски цифри</type>
-			<type type="knda" key="numbers">Канада цифри</type>
-			<type type="laoo" key="numbers">Лаошки цифри</type>
-			<type type="latn" key="numbers">Арапски броеви</type>
-			<type type="mlym" key="numbers">Малајаламски цифри</type>
-			<type type="mymr" key="numbers">Мјанмарски цифри</type>
-			<type type="orya" key="numbers">Оријски цифри</type>
-			<type type="persian" key="calendar">Персиски календар</type>
-			<type type="phonebook" key="collation">Азбучен редослед</type>
-			<type type="pinyin" key="collation">Сортирање Pinyin</type>
-			<type type="roc" key="calendar">Календар на Република Кина</type>
-			<type type="roman" key="numbers">Римски броеви</type>
-			<type type="romanlow" key="numbers">Римски мали броеви</type>
-			<type type="search" key="collation">Општо пребарување</type>
-			<type type="standard" key="collation">Стандардно сортирање</type>
-			<type type="stroke" key="collation">Ритмички редослед</type>
-			<type type="taml" key="numbers">Традиционални тамилски броеви</type>
-			<type type="tamldec" key="numbers">Тамилски цифри</type>
-			<type type="telu" key="numbers">Телугу цифри</type>
-			<type type="thai" key="numbers">Тајландски цифри</type>
-			<type type="tibt" key="numbers">Тибетски цифри</type>
-			<type type="traditional" key="collation">Традиционално сортирање</type>
+			<type key="calendar" type="buddhist">Будистички календар</type>
+			<type key="calendar" type="chinese">Кинески календар</type>
+			<type key="calendar" type="coptic">Коптски календар</type>
+			<type key="calendar" type="dangi">Дангиски календар</type>
+			<type key="calendar" type="ethiopic">Етиопски календар</type>
+			<type key="calendar" type="ethiopic-amete-alem">Етиопски Амет Алем календар</type>
+			<type key="calendar" type="gregorian">Грегоријански календар</type>
+			<type key="calendar" type="hebrew">Еврејски календар</type>
+			<type key="calendar" type="indian">Индиски национален календар</type>
+			<type key="calendar" type="islamic">Исламски календар</type>
+			<type key="calendar" type="islamic-civil">Исламски граѓански календар</type>
+			<type key="calendar" type="iso8601">Календар ISO-8601</type>
+			<type key="calendar" type="japanese">Јапонски календар</type>
+			<type key="calendar" type="persian">Персиски календар</type>
+			<type key="calendar" type="roc">Мингуо-календар</type>
+			<type key="collation" type="big5han">Традиционално кинеско сортирање</type>
+			<type key="collation" type="ducet">Стандардно сортирање во уникод</type>
+			<type key="collation" type="gb2312han">Поедноставено кинеско сортирање</type>
+			<type key="collation" type="phonebook">Азбучен редослед</type>
+			<type key="collation" type="pinyin">Сортирање Pinyin</type>
+			<type key="collation" type="search">Општо пребарување</type>
+			<type key="collation" type="standard">Стандардно сортирање</type>
+			<type key="collation" type="stroke">Ритмички редослед</type>
+			<type key="collation" type="traditional">Традиционално сортирање</type>
+			<type key="hc" type="h11">12-часовен систем (0-11)</type>
+			<type key="hc" type="h12">12-часовен систем (1-12)</type>
+			<type key="hc" type="h23">24-часовен систем (0-23)</type>
+			<type key="hc" type="h24">24-часовен систем (1-24)</type>
+			<type key="lb" type="loose">Допустлив стил за разделување редови</type>
+			<type key="lb" type="normal">Нормален стил за разделување редови</type>
+			<type key="lb" type="strict">Строг стил за разделување редови</type>
+			<type key="ms" type="metric">Метрички систем</type>
+			<type key="ms" type="uksystem">Империјален мерен систем</type>
+			<type key="ms" type="ussystem">Американски мерен систем</type>
+			<type key="numbers" type="arab">Арапско-индиски цифри</type>
+			<type key="numbers" type="arabext">Проширени арапско-индиски цифри</type>
+			<type key="numbers" type="armn">Ерменски броеви</type>
+			<type key="numbers" type="armnlow">Ерменски мали броеви</type>
+			<type key="numbers" type="beng">Бенгалски цифри</type>
+			<type key="numbers" type="deva">деванагарски цифри</type>
+			<type key="numbers" type="ethi">Етиопски броеви</type>
+			<type key="numbers" type="fullwide">Цифри со целосна ширина</type>
+			<type key="numbers" type="geor">Грузиски броеви</type>
+			<type key="numbers" type="grek">Грчки броеви</type>
+			<type key="numbers" type="greklow">Грчки мали броеви</type>
+			<type key="numbers" type="gujr">Гуџарати цифри</type>
+			<type key="numbers" type="guru">Гурмуки цифри</type>
+			<type key="numbers" type="hanidec">Кинески децимални броеви</type>
+			<type key="numbers" type="hans">Поедноставени кинески броеви</type>
+			<type key="numbers" type="hansfin">Поедноставени кинески финансиски броеви</type>
+			<type key="numbers" type="hant">Традиционални кинески броеви</type>
+			<type key="numbers" type="hantfin">Традиционални кинески финансиски броеви</type>
+			<type key="numbers" type="hebr">Хебрејски броеви</type>
+			<type key="numbers" type="jpan">Јапонски броеви</type>
+			<type key="numbers" type="jpanfin">Јапонски финансиски броеви</type>
+			<type key="numbers" type="khmr">Кмерски цифри</type>
+			<type key="numbers" type="knda">Канада цифри</type>
+			<type key="numbers" type="laoo">Лаошки цифри</type>
+			<type key="numbers" type="latn">Арапски броеви</type>
+			<type key="numbers" type="mlym">Малајаламски цифри</type>
+			<type key="numbers" type="mymr">Мјанмарски цифри</type>
+			<type key="numbers" type="orya">Оријски цифри</type>
+			<type key="numbers" type="roman">Римски броеви</type>
+			<type key="numbers" type="romanlow">Римски мали броеви</type>
+			<type key="numbers" type="taml">Традиционални тамилски броеви</type>
+			<type key="numbers" type="tamldec">Тамилски цифри</type>
+			<type key="numbers" type="telu">Телугу цифри</type>
+			<type key="numbers" type="thai">Тајландски цифри</type>
+			<type key="numbers" type="tibt">Тибетски цифри</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">метрички</measurementSystemName>
@@ -1239,6 +1254,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">E</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">y 'г'. G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y 'г'. G</dateFormatItem>
@@ -1584,15 +1600,73 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">прет.</dayPeriod>
-							<dayPeriod type="noon">напл.</dayPeriod>
-							<dayPeriod type="pm">попл.</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">полноќ</dayPeriod>
 							<dayPeriod type="am">претпладне</dayPeriod>
 							<dayPeriod type="noon">на пладне</dayPeriod>
 							<dayPeriod type="pm">попладне</dayPeriod>
+							<dayPeriod type="morning1">наутро</dayPeriod>
+							<dayPeriod type="morning2">претпладне</dayPeriod>
+							<dayPeriod type="afternoon1">попладне</dayPeriod>
+							<dayPeriod type="evening1">навечер</dayPeriod>
+							<dayPeriod type="night1">ноќе</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">полн.</dayPeriod>
+							<dayPeriod type="am">прет.</dayPeriod>
+							<dayPeriod type="noon">напл.</dayPeriod>
+							<dayPeriod type="pm">попл.</dayPeriod>
+							<dayPeriod type="morning1">утро</dayPeriod>
+							<dayPeriod type="morning2">прет.</dayPeriod>
+							<dayPeriod type="afternoon1">попл.</dayPeriod>
+							<dayPeriod type="evening1">веч.</dayPeriod>
+							<dayPeriod type="night1">полн.</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">полноќ</dayPeriod>
+							<dayPeriod type="am">претпладне</dayPeriod>
+							<dayPeriod type="noon">на пладне</dayPeriod>
+							<dayPeriod type="pm">попладне</dayPeriod>
+							<dayPeriod type="morning1">наутро</dayPeriod>
+							<dayPeriod type="morning2">претпладне</dayPeriod>
+							<dayPeriod type="afternoon1">попладне</dayPeriod>
+							<dayPeriod type="evening1">навечер</dayPeriod>
+							<dayPeriod type="night1">по полноќ</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">полноќ</dayPeriod>
+							<dayPeriod type="am">претпладне</dayPeriod>
+							<dayPeriod type="noon">пладне</dayPeriod>
+							<dayPeriod type="pm">попладне</dayPeriod>
+							<dayPeriod type="morning1">наутро</dayPeriod>
+							<dayPeriod type="morning2">претпладне</dayPeriod>
+							<dayPeriod type="afternoon1">попладне</dayPeriod>
+							<dayPeriod type="evening1">навечер</dayPeriod>
+							<dayPeriod type="night1">по полноќ</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">полноќ</dayPeriod>
+							<dayPeriod type="am">прет.</dayPeriod>
+							<dayPeriod type="noon">пладне</dayPeriod>
+							<dayPeriod type="pm">попл.</dayPeriod>
+							<dayPeriod type="morning1">наутро</dayPeriod>
+							<dayPeriod type="morning2">претпладне</dayPeriod>
+							<dayPeriod type="afternoon1">попладне</dayPeriod>
+							<dayPeriod type="evening1">навечер</dayPeriod>
+							<dayPeriod type="night1">по полноќ</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">на полноќ</dayPeriod>
+							<dayPeriod type="am">претпладне</dayPeriod>
+							<dayPeriod type="noon">напладне</dayPeriod>
+							<dayPeriod type="pm">попладне</dayPeriod>
+							<dayPeriod type="morning1">наутро</dayPeriod>
+							<dayPeriod type="morning2">претпладне</dayPeriod>
+							<dayPeriod type="afternoon1">попладне</dayPeriod>
+							<dayPeriod type="evening1">навечер</dayPeriod>
+							<dayPeriod type="night1">по полноќ</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1607,7 +1681,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<era type="1">н.е.</era>
 					</eraAbbr>
 					<eraNarrow>
-						<era type="0">пр. н.е.</era>
+						<era type="0">пр.н.е.</era>
 						<era type="1">н.е.</era>
 					</eraNarrow>
 				</eras>
@@ -1679,7 +1753,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
 						<dateFormatItem id="E">ccc</dateFormatItem>
-						<dateFormatItem id="Ed">E, d</dateFormatItem>
+						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
@@ -1694,6 +1768,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d.M</dateFormatItem>
 						<dateFormatItem id="Mdd">dd.M</dateFormatItem>
@@ -1821,7 +1899,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</calendars>
 		<fields>
 			<field type="era">
-				<displayName>Ера</displayName>
+				<displayName>ера</displayName>
 			</field>
 			<field type="year">
 				<displayName>година</displayName>
@@ -1839,6 +1917,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>год.</displayName>
+				<relative type="-1">минатата година</relative>
+				<relative type="0">оваа година</relative>
+				<relative type="1">следната година</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">за {0} година</relativeTimePattern>
 					<relativeTimePattern count="other">за {0} години</relativeTimePattern>
@@ -1850,13 +1931,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>год.</displayName>
+				<relative type="-1">минатата година</relative>
+				<relative type="0">оваа година</relative>
+				<relative type="1">следната година</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">За {0} години</relativeTimePattern>
-					<relativeTimePattern count="other">За {0} години</relativeTimePattern>
+					<relativeTimePattern count="one">за {0} години</relativeTimePattern>
+					<relativeTimePattern count="other">за {0} години</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">Пред {0} години</relativeTimePattern>
-					<relativeTimePattern count="other">Пред {0} години</relativeTimePattern>
+					<relativeTimePattern count="one">пред {0} години</relativeTimePattern>
+					<relativeTimePattern count="other">пред {0} години</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter">
@@ -1873,11 +1957,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="quarter-short">
 				<displayName>тромес.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">за {0} тромесечје</relativeTimePattern>
+					<relativeTimePattern count="one">за {0} тромес.</relativeTimePattern>
 					<relativeTimePattern count="other">за {0} тромесечја</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">пред {0} тромесечје</relativeTimePattern>
+					<relativeTimePattern count="one">пред {0} тромес.</relativeTimePattern>
 					<relativeTimePattern count="other">пред {0} тромесечја</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -1893,7 +1977,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="month">
-				<displayName>Месец</displayName>
+				<displayName>месец</displayName>
 				<relative type="-1">минатиот месец</relative>
 				<relative type="0">овој месец</relative>
 				<relative type="1">следниот месец</relative>
@@ -1908,6 +1992,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>мес.</displayName>
+				<relative type="-1">минатиот месец</relative>
+				<relative type="0">овој месец</relative>
+				<relative type="1">следниот месец</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">за {0} месец</relativeTimePattern>
 					<relativeTimePattern count="other">за {0} месеци</relativeTimePattern>
@@ -1919,6 +2006,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>мес.</displayName>
+				<relative type="-1">минатиот месец</relative>
+				<relative type="0">овој месец</relative>
+				<relative type="1">следниот месец</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">за {0} месец</relativeTimePattern>
 					<relativeTimePattern count="other">за {0} месеци</relativeTimePattern>
@@ -1929,7 +2019,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="week">
-				<displayName>Недела</displayName>
+				<displayName>недела</displayName>
 				<relative type="-1">минатата седмица</relative>
 				<relative type="0">оваа седмица</relative>
 				<relative type="1">следната седмица</relative>
@@ -1944,6 +2034,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>сед.</displayName>
+				<relative type="-1">минатата седмица</relative>
+				<relative type="0">оваа седмица</relative>
+				<relative type="1">следната седмица</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">за {0} седмица</relativeTimePattern>
 					<relativeTimePattern count="other">за {0} седмици</relativeTimePattern>
@@ -1955,6 +2048,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>сед.</displayName>
+				<relative type="-1">минатата седмица</relative>
+				<relative type="0">оваа седмица</relative>
+				<relative type="1">следната седмица</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">за {0} седмица</relativeTimePattern>
 					<relativeTimePattern count="other">за {0} седмици</relativeTimePattern>
@@ -1982,6 +2078,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>ден</displayName>
+				<relative type="-2">завчера</relative>
+				<relative type="-1">вчера</relative>
+				<relative type="0">денес</relative>
+				<relative type="1">утре</relative>
+				<relative type="2">задутре</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">за {0} ден</relativeTimePattern>
 					<relativeTimePattern count="other">за {0} дена</relativeTimePattern>
@@ -1993,6 +2094,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>ден</displayName>
+				<relative type="-2">завчера</relative>
+				<relative type="-1">вчера</relative>
+				<relative type="0">денес</relative>
+				<relative type="1">утре</relative>
+				<relative type="2">задутре</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">за {0} ден</relativeTimePattern>
 					<relativeTimePattern count="other">за {0} дена</relativeTimePattern>
@@ -2003,7 +2109,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="weekday">
-				<displayName>Ден во неделата</displayName>
+				<displayName>ден во неделата</displayName>
 			</field>
 			<field type="sun">
 				<relative type="-1">минатата недела</relative>
@@ -2041,7 +2147,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">следниот вторник</relative>
 			</field>
 			<field type="tue-short">
-				<relative type="-1">минатиот вторник</relative>
+				<relative type="-1">мин. вт.</relative>
 				<relative type="0">овој вторник</relative>
 				<relative type="1">следниот вторник</relative>
 			</field>
@@ -2114,7 +2220,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>претпладне/попладне</displayName>
 			</field>
 			<field type="hour">
-				<displayName>Час</displayName>
+				<displayName>час</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">за {0} час</relativeTimePattern>
 					<relativeTimePattern count="other">за {0} часа</relativeTimePattern>
@@ -2147,7 +2253,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="minute">
-				<displayName>Минута</displayName>
+				<displayName>минута</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">за {0} минута</relativeTimePattern>
 					<relativeTimePattern count="other">за {0} минути</relativeTimePattern>
@@ -2180,7 +2286,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="second">
-				<displayName>Секунда</displayName>
+				<displayName>секунда</displayName>
 				<relative type="0">сега</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">за {0} секунда</relativeTimePattern>
@@ -2214,7 +2320,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>зона</displayName>
+				<displayName>временска зона</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
@@ -2226,7 +2332,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<regionFormat type="standard">{0} (+0)</regionFormat>
 			<fallbackFormat>{1} ({0})</fallbackFormat>
 			<zone type="Etc/Unknown">
-				<exemplarCity>Непознато</exemplarCity>
+				<exemplarCity>Непознат град</exemplarCity>
 			</zone>
 			<zone type="Europe/Andorra">
 				<exemplarCity>Андора</exemplarCity>
@@ -2794,7 +2900,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</zone>
 			<zone type="Europe/Dublin">
 				<long>
-					<daylight>Ирско летно време</daylight>
+					<daylight>Ирско стандардно време</daylight>
 				</long>
 				<exemplarCity>Даблин</exemplarCity>
 			</zone>
@@ -3092,6 +3198,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Порт Морсби</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Буганвил</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Манила</exemplarCity>
 			</zone>
@@ -3176,6 +3285,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Иркутск</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Чита</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Јакутск</exemplarCity>
 			</zone>
@@ -3194,6 +3306,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Магадан</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Среднеколимск</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Камчатка</exemplarCity>
 			</zone>
@@ -3315,7 +3430,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Дар ес Салам</exemplarCity>
 			</zone>
 			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ужгород</exemplarCity>
+				<exemplarCity>Ужхород</exemplarCity>
 			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Киев</exemplarCity>
@@ -4491,6 +4606,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤ #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤ 0 илј'.'</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤ 0 илј'.'</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤ 00 илј'.'</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00 илј'.'</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤ 000 илј'.'</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000 илј'.'</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤ 0 мил'.'</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0 мил'.'</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤ 00 мил'.'</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00 мил'.'</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤ 000 М</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000 М</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤ 0 милј'.'</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0 милј'.'</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤ 00 милј'.'</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00 милј'.'</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤ 000 мј'.'</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000 милј'.'</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤ 0 трил'.'</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0 трил'.'</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤ 00 трил'.'</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00 трил'.'</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤ 000 трил'.'</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000 трил'.'</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4514,9 +4657,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>AFN</symbol>
 			</currency>
 			<currency type="ALL">
-				<displayName>Албански Лек</displayName>
-				<displayName count="one">Албански Лек</displayName>
-				<displayName count="other">Албански Лек</displayName>
+				<displayName>Албански лек</displayName>
+				<displayName count="one">Албански лек</displayName>
+				<displayName count="other">Албански леки</displayName>
 				<symbol>ALL</symbol>
 			</currency>
 			<currency type="AMD">
@@ -4534,8 +4677,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="AOA">
 				<displayName>Анголска Кванза</displayName>
 				<displayName count="one">Анголска Кванза</displayName>
-				<displayName count="other">Анголска Кванза</displayName>
+				<displayName count="other">Анголски кванзи</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>Анголска Кванза (1977–1990)</displayName>
@@ -4581,12 +4725,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="BAM">
 				<displayName>Босанско-Херцеговска конвертибилна марка</displayName>
 				<displayName count="one">Босанско-Херцеговска конвертибилна марка</displayName>
-				<displayName count="other">Босанско-Херцеговска конвертибилна марка</displayName>
+				<displayName count="other">Босанско-Херцеговски конвертибилни марки</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>Барбадоски долар</displayName>
-				<displayName count="one">Барбадоски Долар</displayName>
+				<displayName count="one">Барбадоски долар</displayName>
 				<displayName count="other">Барбадоски долари</displayName>
 				<symbol>BBD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
@@ -4623,9 +4768,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>BHD</symbol>
 			</currency>
 			<currency type="BIF">
-				<displayName>Бурундиски Франк</displayName>
-				<displayName count="one">Бурундиски Франк</displayName>
-				<displayName count="other">Бурундиски Франк</displayName>
+				<displayName>Бурундиски франк</displayName>
+				<displayName count="one">Бурундиски франк</displayName>
+				<displayName count="other">Бурундиски франци</displayName>
 				<symbol>BIF</symbol>
 			</currency>
 			<currency type="BMD">
@@ -4647,6 +4792,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Боливиски боливиани</displayName>
 				<displayName count="other">Боливиски боливиани</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BRL">
 				<displayName>Бразилски реал</displayName>
@@ -4673,14 +4819,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Боцванска Пула</displayName>
 				<displayName count="other">Боцванска Пула</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>Белоруска нова рубља (1994–1999)</displayName>
 			</currency>
 			<currency type="BYR">
 				<displayName>Белоруска рубља</displayName>
-				<displayName count="one">Белоруска Рубља</displayName>
-				<displayName count="other">Белоруска Рубља</displayName>
+				<displayName count="one">Белоруска рубља</displayName>
+				<displayName count="other">Белоруски рубљи</displayName>
 				<symbol>BYR</symbol>
 				<symbol alt="narrow" draft="contributed">р.</symbol>
 			</currency>
@@ -4707,7 +4854,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="CHF">
 				<displayName>Швајцарски Франк</displayName>
 				<displayName count="one">Швајцарски Франк</displayName>
-				<displayName count="other">Швајцарски Франк</displayName>
+				<displayName count="other">Швајцарски франци</displayName>
 				<symbol>CHF</symbol>
 			</currency>
 			<currency type="CLP">
@@ -4746,6 +4893,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Кубански пезос (конвертибилен)</displayName>
 				<displayName count="other">Кубански пезоси (конвертибилни)</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>Кубански пезос</displayName>
@@ -4768,6 +4916,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Чешка корона</displayName>
 				<displayName count="other">Чешка корона</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DEM">
 				<displayName>Германска Марка</displayName>
@@ -4783,6 +4932,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Данска круна</displayName>
 				<displayName count="other">Данска круна</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Доминикански Пезос</displayName>
@@ -4792,20 +4942,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="DZD">
-				<displayName>Алжирски Динар</displayName>
-				<displayName count="one">Алжирски Динар</displayName>
-				<displayName count="other">Алжирски Динар</displayName>
+				<displayName>Алжирски динар</displayName>
+				<displayName count="one">Алжирски динар</displayName>
+				<displayName count="other">Алжирски динари</displayName>
 				<symbol>DZD</symbol>
 			</currency>
 			<currency type="EGP">
-				<displayName>Египетска Фунта</displayName>
-				<displayName count="one">Египетска Фунта</displayName>
-				<displayName count="other">Египетска Фунта</displayName>
+				<displayName>Египетска фунта</displayName>
+				<displayName count="one">Египетска фунта</displayName>
+				<displayName count="other">Египетски фунти</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
-				<displayName>Еритрејска Накфа</displayName>
-				<displayName count="one">Еритрејска Накфа</displayName>
+				<displayName>Еритрејска накфа</displayName>
+				<displayName count="one">Еритрејска накфа</displayName>
 				<displayName count="other">Еритрејски Накфи</displayName>
 				<symbol>ERN</symbol>
 			</currency>
@@ -4813,9 +4964,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Шпанска Пезета</displayName>
 			</currency>
 			<currency type="ETB">
-				<displayName>Етиописки Бир</displayName>
-				<displayName count="one">Етиописки Бир</displayName>
-				<displayName count="other">Етиописки Бир</displayName>
+				<displayName>Етиописки бир</displayName>
+				<displayName count="one">Етиописки бир</displayName>
+				<displayName count="other">Етиописки бири</displayName>
 				<symbol>ETB</symbol>
 			</currency>
 			<currency type="EUR">
@@ -4840,6 +4991,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Фолкландски фунти</displayName>
 				<displayName count="other">Фолкландски фунти</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>Француски франк</displayName>
@@ -4847,7 +4999,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="GBP">
 				<displayName>Британска Фунта</displayName>
 				<displayName count="one">Британска Фунта</displayName>
-				<displayName count="other">Британска Фунта</displayName>
+				<displayName count="other">Британски фунти</displayName>
 				<symbol>GBP</symbol>
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
@@ -4856,6 +5008,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Грузиски лари</displayName>
 				<displayName count="other">Грузиски лари</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>Ганајски Седи</displayName>
@@ -4869,7 +5022,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="GIP">
 				<displayName>Гибралтарска фунта</displayName>
 				<displayName count="one">Гибралтарска фунта</displayName>
-				<displayName count="other">Гибралтарска фунта</displayName>
+				<displayName count="other">Гибралтарски фунти</displayName>
 				<symbol>GIP</symbol>
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
@@ -4882,8 +5035,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="GNF">
 				<displayName>Гвинејски франк</displayName>
 				<displayName count="one">Гвинејски франк</displayName>
-				<displayName count="other">Гвинејски франк</displayName>
+				<displayName count="other">Гвинејски франци</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GRD">
 				<displayName>Грчка драхма</displayName>
@@ -4893,6 +5047,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Гватемалски кветцал</displayName>
 				<displayName count="other">Гватемалски кветцал</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWP">
 				<displayName>Гвинејски Бисау пезос</displayName>
@@ -4916,15 +5071,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Хондурски лемпири</displayName>
 				<displayName count="other">Хондурски лемпири</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>Хрватски динар</displayName>
 			</currency>
 			<currency type="HRK">
-				<displayName>Хрватска Куна</displayName>
-				<displayName count="one">Хрватска Куна</displayName>
-				<displayName count="other">Хрватска Куна</displayName>
+				<displayName>Хрватска куна</displayName>
+				<displayName count="one">Хрватска куна</displayName>
+				<displayName count="other">Хрватски куни</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>Хаитски гурд</displayName>
@@ -4937,12 +5094,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Унгарска форинта</displayName>
 				<displayName count="other">Унгарска форинта</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>Индонезиска рупија</displayName>
 				<displayName count="one">Индонезиска рупија</displayName>
 				<displayName count="other">Индонезиска рупија</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>Ирска фунта</displayName>
@@ -4979,8 +5138,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="ISK">
 				<displayName>Исландска крона</displayName>
 				<displayName count="one">Исландска крона</displayName>
-				<displayName count="other">Исландска крона</displayName>
+				<displayName count="other">Исландски крони</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>Италијанска лира</displayName>
@@ -5008,7 +5168,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="KES">
 				<displayName>Кениски шилинг</displayName>
 				<displayName count="one">Кениски шилинг</displayName>
-				<displayName count="other">Кениски шилинг</displayName>
+				<displayName count="other">Кениски шилинзи</displayName>
 				<symbol>KES</symbol>
 			</currency>
 			<currency type="KGS">
@@ -5025,16 +5185,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">៛</symbol>
 			</currency>
 			<currency type="KMF">
-				<displayName>Коморски долар</displayName>
-				<displayName count="one">Коморски долар</displayName>
-				<displayName count="other">Коморски долар</displayName>
+				<displayName>Коморски франк</displayName>
+				<displayName count="one">Коморски франк</displayName>
+				<displayName count="other">Коморски франци</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>Северно корејски вон</displayName>
 				<displayName count="one">Северно корејски вон</displayName>
 				<displayName count="other">Северно корејски вон</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>Јужно корејски вон</displayName>
@@ -5075,12 +5237,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Либанска фунта</displayName>
 				<displayName count="other">Либанска фунта</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>Шриланканска рупија</displayName>
 				<displayName count="one">Шриланканска рупија</displayName>
 				<displayName count="other">Шриланканска рупија</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>Либериски долар</displayName>
@@ -5116,13 +5280,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="LYD">
 				<displayName>Либијски динар</displayName>
 				<displayName count="one">Либијски динар</displayName>
-				<displayName count="other">Либијски динар</displayName>
+				<displayName count="other">Либијски динари</displayName>
 				<symbol>LYD</symbol>
 			</currency>
 			<currency type="MAD">
 				<displayName>Марокански Дирхам</displayName>
 				<displayName count="one">Марокански Дирхам</displayName>
-				<displayName count="other">Марокански Дирхам</displayName>
+				<displayName count="other">Марокански дирхами</displayName>
 				<symbol>MAD</symbol>
 			</currency>
 			<currency type="MAF">
@@ -5139,11 +5303,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Малагасиски ариари</displayName>
 				<displayName count="other">Малагасиски ариари</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MKD">
 				<displayName>Македонски денар</displayName>
 				<displayName count="one">Македонски денар</displayName>
-				<displayName count="other">Македонски денар</displayName>
+				<displayName count="other">Македонски денари</displayName>
 				<symbol>ден</symbol>
 			</currency>
 			<currency type="MLF">
@@ -5154,6 +5319,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Мјанмарски киат</displayName>
 				<displayName count="other">Мјанмарски киати</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>Монголиски тугрик</displayName>
@@ -5185,6 +5351,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Мавританска рупија</displayName>
 				<displayName count="other">Мавритански рупии</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>Малдивиска руфија</displayName>
@@ -5213,6 +5380,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Малазиски рингит</displayName>
 				<displayName count="other">Малазиски рингит</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>Мозамбиско ескудо</displayName>
@@ -5222,8 +5390,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="MZN">
 				<displayName>Мозамбиски метикал</displayName>
-				<displayName count="one">Мозамбиски метикали</displayName>
-				<displayName count="other">Мозамбиски метикал</displayName>
+				<displayName count="one">Мозамбиски метикал</displayName>
+				<displayName count="other">Мозамбиски метикали</displayName>
 				<symbol>MZN</symbol>
 			</currency>
 			<currency type="NAD">
@@ -5236,7 +5404,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="NGN">
 				<displayName>Нигериска наира</displayName>
 				<displayName count="one">Нигериска наира</displayName>
-				<displayName count="other">Нигериска наира</displayName>
+				<displayName count="other">Нигериски наири</displayName>
 				<symbol>NGN</symbol>
 				<symbol alt="narrow" draft="contributed">₦</symbol>
 			</currency>
@@ -5250,6 +5418,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Никарагванска кордоба</displayName>
 				<displayName count="other">Никарагвански кордоби</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>Холандски гилдер</displayName>
@@ -5257,14 +5426,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="NOK">
 				<displayName>Норвешка круна</displayName>
 				<displayName count="one">Норвешка круна</displayName>
-				<displayName count="other">Норвешка круна</displayName>
+				<displayName count="other">Норвешки круни</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>Непалска рупија</displayName>
 				<displayName count="one">Непалска рупија</displayName>
 				<displayName count="other">Непалска рупија</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>Новозеландски долар</displayName>
@@ -5312,12 +5483,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Пакистанска рупија</displayName>
 				<displayName count="other">Пакистанска рупија</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>Полска злота</displayName>
 				<displayName count="one">Полска злота</displayName>
-				<displayName count="other">Полска злота</displayName>
+				<displayName count="other">Полски злоти</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>Полска злота (1950–1995)</displayName>
@@ -5352,14 +5525,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="RSD">
 				<displayName>Српски динар</displayName>
 				<displayName count="one">Српски динар</displayName>
-				<displayName count="other">Српски динар</displayName>
+				<displayName count="other">Српски динари</displayName>
 				<symbol>RSD</symbol>
 			</currency>
 			<currency type="RUB">
 				<displayName>Руска рубља</displayName>
 				<displayName count="one">Руска рубља</displayName>
-				<displayName count="other">Руска рубља</displayName>
+				<displayName count="other">Руски рубљи</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>Руска рубља (1991–1998)</displayName>
@@ -5367,8 +5541,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="RWF">
 				<displayName>Руандски франк</displayName>
 				<displayName count="one">Руандски франк</displayName>
-				<displayName count="other">Руандски франк</displayName>
+				<displayName count="other">Руандски франци</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>Саудиски ријал</displayName>
@@ -5404,8 +5579,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="SEK">
 				<displayName>Шведска круна</displayName>
 				<displayName count="one">Шведска круна</displayName>
-				<displayName count="other">Шведска круна</displayName>
+				<displayName count="other">Шведски круни</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>Сингапурски долар</displayName>
@@ -5419,6 +5595,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Фунта на Света Елена</displayName>
 				<displayName count="other">Фунти на Света Елена</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>Словенечки толар</displayName>
@@ -5429,12 +5606,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="SLL">
 				<displayName>Сиералеонско леоне</displayName>
 				<displayName count="one">Сиералеонско леоне</displayName>
-				<displayName count="other">Сиералеонско леоне</displayName>
+				<displayName count="other">Сиералеонски леони</displayName>
 				<symbol>SLL</symbol>
 			</currency>
 			<currency type="SOS">
 				<displayName>Сомалијски шилинг</displayName>
-				<displayName count="one">Сомалијски шилинзи</displayName>
+				<displayName count="one">Сомалијски шилинг</displayName>
 				<displayName count="other">Сомалијски шилинзи</displayName>
 				<symbol>SOS</symbol>
 			</currency>
@@ -5460,6 +5637,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Добра на Сао Томе и Принсипе</displayName>
 				<displayName count="other">Добри на Сао Томе и Принсипе</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>Советска рубља</displayName>
@@ -5472,6 +5650,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Сиријска фунта</displayName>
 				<displayName count="other">Сиријска фунта</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>Свазилендски лиланген</displayName>
@@ -5484,6 +5663,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Таи бат</displayName>
 				<displayName count="other">Таи бат</displayName>
 				<symbol>THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>Таџикистанска рубља</displayName>
@@ -5514,6 +5694,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Тонганска панга</displayName>
 				<displayName count="other">Тонганска панга</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>Тиморски ескудо</displayName>
@@ -5529,6 +5710,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">Турски лири</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Долар на Тринидад и Тобаго</displayName>
@@ -5547,13 +5729,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="TZS">
 				<displayName>Танзаниски шилинг</displayName>
 				<displayName count="one">Танзаниски шилинг</displayName>
-				<displayName count="other">Танзаниски шилинг</displayName>
+				<displayName count="other">Танзаниски шилинзи</displayName>
 				<symbol>TZS</symbol>
 			</currency>
 			<currency type="UAH">
 				<displayName>Украинска хривнија</displayName>
 				<displayName count="one">Украинска хривнија</displayName>
-				<displayName count="other">Украинска хривнија</displayName>
+				<displayName count="other">Украински хривнии</displayName>
 				<symbol>UAH</symbol>
 				<symbol alt="narrow" draft="contributed">₴</symbol>
 			</currency>
@@ -5563,7 +5745,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="UGX">
 				<displayName>Угандиски шилинг</displayName>
 				<displayName count="one">Угандиски шилинг</displayName>
-				<displayName count="other">Угандиски шилинг</displayName>
+				<displayName count="other">Угандиски шилинзи</displayName>
 				<symbol>UGX</symbol>
 			</currency>
 			<currency type="USD">
@@ -5605,6 +5787,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Венецуелски боливар</displayName>
 				<displayName count="other">Венецуелски боливари</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>Виетнамски донг</displayName>
@@ -5626,9 +5809,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>WST</symbol>
 			</currency>
 			<currency type="XAF">
-				<displayName>XAF</displayName>
-				<displayName count="one">XAF</displayName>
-				<displayName count="other">XAF</displayName>
+				<displayName>Централноафрикански франк</displayName>
+				<displayName count="one">Централноафрикански франк</displayName>
+				<displayName count="other">Централноафрикански франци</displayName>
 				<symbol>FCFA</symbol>
 			</currency>
 			<currency type="XCD">
@@ -5636,11 +5819,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Источно карибиски долар</displayName>
 				<displayName count="other">Источно карибиски долар</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XOF">
-				<displayName>XOF</displayName>
-				<displayName count="one">XOF</displayName>
-				<displayName count="other">XOF</displayName>
+				<displayName>Западноафрикански франк</displayName>
+				<displayName count="one">Западноафрикански франк</displayName>
+				<displayName count="other">Западноафрикански франци</displayName>
 				<symbol>CFA</symbol>
 			</currency>
 			<currency type="XPF">
@@ -5677,6 +5861,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Јужно афрички ранд</displayName>
 				<displayName count="other">Јужно афрички ранд</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>Замбијска квача (1968–2012)</displayName>
@@ -5684,8 +5869,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="ZMW">
 				<displayName>Замбијска квача</displayName>
 				<displayName count="one">Замбијска квача</displayName>
-				<displayName count="other">Замбијска квача</displayName>
+				<displayName count="other">Замбијски квачи</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>Заирско новозаире</displayName>
@@ -5717,6 +5903,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} метар во секунда на квадрат</unitPattern>
 				<unitPattern count="other">{0} метри во секунда на квадрат</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>револуција</displayName>
+				<unitPattern count="one">{0} револуција</unitPattern>
+				<unitPattern count="other">{0} револуции</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>радијани</displayName>
+				<unitPattern count="one">{0} радијан</unitPattern>
+				<unitPattern count="other">{0} радијани</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>степени</displayName>
+				<unitPattern count="one">{0} степен</unitPattern>
+				<unitPattern count="other">{0} степени</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>минути</displayName>
 				<unitPattern count="one">{0} минута</unitPattern>
@@ -5727,30 +5928,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} секунда</unitPattern>
 				<unitPattern count="other">{0} секунди</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>степени</displayName>
-				<unitPattern count="one">{0} степен</unitPattern>
-				<unitPattern count="other">{0} степени</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>радијани</displayName>
-				<unitPattern count="one">{0} радијан</unitPattern>
-				<unitPattern count="other">{0} радијани</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>акри</displayName>
-				<unitPattern count="one">{0} акр</unitPattern>
-				<unitPattern count="other">{0} акри</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>квадратни километри</displayName>
+				<unitPattern count="one">{0} квадратен километар</unitPattern>
+				<unitPattern count="other">{0} квадратни километри</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>хектари</displayName>
 				<unitPattern count="one">{0} хектар</unitPattern>
 				<unitPattern count="other">{0} хектари</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>квадратни метри</displayName>
+				<unitPattern count="one">{0} квадратен метар</unitPattern>
+				<unitPattern count="other">{0} квадратни метри</unitPattern>
+				<perUnitPattern>{0} по метар квадратен</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>квадратни сантиметри</displayName>
 				<unitPattern count="one">{0} квадратен сантиметар</unitPattern>
 				<unitPattern count="other">{0} квадратни сантиметри</unitPattern>
+				<perUnitPattern>{0} по квадратен сантиметар</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>квадратни милји</displayName>
+				<unitPattern count="one">{0} квадратна милја</unitPattern>
+				<unitPattern count="other">{0} квадратни милји</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>акри</displayName>
+				<unitPattern count="one">{0} акр</unitPattern>
+				<unitPattern count="other">{0} акри</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>квадратни јарди</displayName>
+				<unitPattern count="one">{0} квадратен јард</unitPattern>
+				<unitPattern count="other">{0} квадратни јарди</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>квадратни стапки</displayName>
@@ -5761,91 +5974,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>квадратни инчи</displayName>
 				<unitPattern count="one">{0} квадратен инч</unitPattern>
 				<unitPattern count="other">{0} квадратни инчи</unitPattern>
+				<perUnitPattern>{0} по квадратен инч</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>квадратни километри</displayName>
-				<unitPattern count="one">{0} квадратен километар</unitPattern>
-				<unitPattern count="other">{0} квадратни километри</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>квадратни метри</displayName>
-				<unitPattern count="one">{0} квадратен метар</unitPattern>
-				<unitPattern count="other">{0} квадратни метри</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>квадратни милји</displayName>
-				<unitPattern count="one">{0} квадратна милја</unitPattern>
-				<unitPattern count="other">{0} квадратни милји</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>квадратни јарди</displayName>
-				<unitPattern count="one">{0} квадратен јард</unitPattern>
-				<unitPattern count="other">{0} квадратни јарди</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>карат</displayName>
+				<unitPattern count="one">{0} карат</unitPattern>
+				<unitPattern count="other">{0} карати</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>литри на километар</displayName>
 				<unitPattern count="one">{0} литар на километар</unitPattern>
 				<unitPattern count="other">{0} литри на километар</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>литри на 100 километри</displayName>
+				<unitPattern count="one">{0} литар на 100 километри</unitPattern>
+				<unitPattern count="other">{0} литри на 100 километри</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>милји на галон</displayName>
 				<unitPattern count="one">{0} милја на галон</unitPattern>
 				<unitPattern count="other">{0} милји на галон</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>битови</displayName>
-				<unitPattern count="one">{0} бит</unitPattern>
-				<unitPattern count="other">{0} битови</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>бајти</displayName>
-				<unitPattern count="one">{0} бајт</unitPattern>
-				<unitPattern count="other">{0} бајти</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>гигабитови</displayName>
-				<unitPattern count="one">{0} гигабит</unitPattern>
-				<unitPattern count="other">{0} гигабитови</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>гигабајти</displayName>
-				<unitPattern count="one">{0} гигабајт</unitPattern>
-				<unitPattern count="other">{0} гигабајти</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>килобитови</displayName>
-				<unitPattern count="one">{0} килобит</unitPattern>
-				<unitPattern count="other">{0} килобитови</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>килобајти</displayName>
-				<unitPattern count="one">{0} килобајт</unitPattern>
-				<unitPattern count="other">{0} килобајти</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>мегабитови</displayName>
-				<unitPattern count="one">{0} мегабит</unitPattern>
-				<unitPattern count="other">{0} мегабитови</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>мегабајти</displayName>
-				<unitPattern count="one">{0} мегабајт</unitPattern>
-				<unitPattern count="other">{0} мегабајти</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>терабитови</displayName>
-				<unitPattern count="one">{0} терабит</unitPattern>
-				<unitPattern count="other">{0} терабитови</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>терабајти</displayName>
 				<unitPattern count="one">{0} терабајт</unitPattern>
 				<unitPattern count="other">{0} терабајти</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>терабитови</displayName>
+				<unitPattern count="one">{0} терабит</unitPattern>
+				<unitPattern count="other">{0} терабитови</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>гигабајти</displayName>
+				<unitPattern count="one">{0} гигабајт</unitPattern>
+				<unitPattern count="other">{0} гигабајти</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>гигабитови</displayName>
+				<unitPattern count="one">{0} гигабит</unitPattern>
+				<unitPattern count="other">{0} гигабитови</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>мегабајти</displayName>
+				<unitPattern count="one">{0} мегабајт</unitPattern>
+				<unitPattern count="other">{0} мегабајти</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>мегабитови</displayName>
+				<unitPattern count="one">{0} мегабит</unitPattern>
+				<unitPattern count="other">{0} мегабитови</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>килобајти</displayName>
+				<unitPattern count="one">{0} килобајт</unitPattern>
+				<unitPattern count="other">{0} килобајти</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>килобитови</displayName>
+				<unitPattern count="one">{0} килобит</unitPattern>
+				<unitPattern count="other">{0} килобитови</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>бајти</displayName>
+				<unitPattern count="one">{0} бајт</unitPattern>
+				<unitPattern count="other">{0} бајти</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>битови</displayName>
+				<unitPattern count="one">{0} бит</unitPattern>
+				<unitPattern count="other">{0} битови</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>векови</displayName>
+				<unitPattern count="one">{0} век</unitPattern>
+				<unitPattern count="other">{0} векови</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>години</displayName>
+				<unitPattern count="one">{0} година</unitPattern>
+				<unitPattern count="other">{0} години</unitPattern>
+				<perUnitPattern>{0} годишно</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>месеци</displayName>
+				<unitPattern count="one">{0} месец</unitPattern>
+				<unitPattern count="other">{0} месеци</unitPattern>
+				<perUnitPattern>{0} месечно</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>седмици</displayName>
+				<unitPattern count="one">{0} седмица</unitPattern>
+				<unitPattern count="other">{0} седмици</unitPattern>
+				<perUnitPattern>{0} неделно</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>дена</displayName>
 				<unitPattern count="one">{0} ден</unitPattern>
 				<unitPattern count="other">{0} дена</unitPattern>
+				<perUnitPattern>{0} дневно</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>часа</displayName>
@@ -5853,30 +6081,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} часа</unitPattern>
 				<perUnitPattern>{0} на час</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>микросекунди</displayName>
-				<unitPattern count="one">{0} микросекунда</unitPattern>
-				<unitPattern count="other">{0} микросекунди</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>милисекунди</displayName>
-				<unitPattern count="one">{0} милисекунда</unitPattern>
-				<unitPattern count="other">{0} милисекунди</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>минути</displayName>
 				<unitPattern count="one">{0} минута</unitPattern>
 				<unitPattern count="other">{0} минути</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>месеци</displayName>
-				<unitPattern count="one">{0} месец</unitPattern>
-				<unitPattern count="other">{0} месеци</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>наносекунди</displayName>
-				<unitPattern count="one">{0} наносекунда</unitPattern>
-				<unitPattern count="other">{0} наносекунди</unitPattern>
+				<perUnitPattern>{0} на минута</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>секунди</displayName>
@@ -5884,15 +6093,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} секунди</unitPattern>
 				<perUnitPattern>{0} во секунда</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>седмици</displayName>
-				<unitPattern count="one">{0} седмица</unitPattern>
-				<unitPattern count="other">{0} седмици</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>милисекунди</displayName>
+				<unitPattern count="one">{0} милисекунда</unitPattern>
+				<unitPattern count="other">{0} милисекунди</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>години</displayName>
-				<unitPattern count="one">{0} година</unitPattern>
-				<unitPattern count="other">{0} години</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>микросекунди</displayName>
+				<unitPattern count="one">{0} микросекунда</unitPattern>
+				<unitPattern count="other">{0} микросекунди</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>наносекунди</displayName>
+				<unitPattern count="one">{0} наносекунда</unitPattern>
+				<unitPattern count="other">{0} наносекунди</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ампери</displayName>
@@ -5914,6 +6128,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} волт</unitPattern>
 				<unitPattern count="other">{0} волти</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>килокалории</displayName>
+				<unitPattern count="one">{0} килокалорија</unitPattern>
+				<unitPattern count="other">{0} килокалории</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>калории</displayName>
 				<unitPattern count="one">{0} калорија</unitPattern>
@@ -5924,21 +6143,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} калорија</unitPattern>
 				<unitPattern count="other">{0} калории</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>џули</displayName>
-				<unitPattern count="one">{0} џул</unitPattern>
-				<unitPattern count="other">{0} џули</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>килокалории</displayName>
-				<unitPattern count="one">{0} килокалорија</unitPattern>
-				<unitPattern count="other">{0} килокалории</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>килоџули</displayName>
 				<unitPattern count="one">{0} килоџул</unitPattern>
 				<unitPattern count="other">{0} килоџули</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>џули</displayName>
+				<unitPattern count="one">{0} џул</unitPattern>
+				<unitPattern count="other">{0} џули</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>киловат-часови</displayName>
 				<unitPattern count="one">{0} киловат-час</unitPattern>
@@ -5949,216 +6163,220 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} гигахерц</unitPattern>
 				<unitPattern count="other">{0} гигахерци</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>херц</displayName>
-				<unitPattern count="one">{0} херц</unitPattern>
-				<unitPattern count="other">{0} херци</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>мегахерц</displayName>
+				<unitPattern count="one">{0} мегахерц</unitPattern>
+				<unitPattern count="other">{0} мегахерци</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>килохерц</displayName>
 				<unitPattern count="one">{0} килохерц</unitPattern>
 				<unitPattern count="other">{0} килохерци</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>мегахерц</displayName>
-				<unitPattern count="one">{0} мегахерц</unitPattern>
-				<unitPattern count="other">{0} мегахерци</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>херц</displayName>
+				<unitPattern count="one">{0} херц</unitPattern>
+				<unitPattern count="other">{0} херци</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>астрономски единици</displayName>
-				<unitPattern count="one">{0} астрономска единица</unitPattern>
-				<unitPattern count="other">{0} астрономски единици</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>километри</displayName>
+				<unitPattern count="one">{0} километар</unitPattern>
+				<unitPattern count="other">{0} километри</unitPattern>
+				<perUnitPattern>{0} на километар</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>сантиметри</displayName>
-				<unitPattern count="one">{0} сантиметар</unitPattern>
-				<unitPattern count="other">{0} сантиметри</unitPattern>
+			<unit type="length-meter">
+				<displayName>метри</displayName>
+				<unitPattern count="one">{0} метар</unitPattern>
+				<unitPattern count="other">{0} метри</unitPattern>
+				<perUnitPattern>{0} на метар</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>дециметри</displayName>
 				<unitPattern count="one">{0} дециметар</unitPattern>
 				<unitPattern count="other">{0} дециметри</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName>фатоми</displayName>
-				<unitPattern count="one">{0} фатом</unitPattern>
-				<unitPattern count="other">{0} фатоми</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>стапки</displayName>
-				<unitPattern count="one">{0} стапка</unitPattern>
-				<unitPattern count="other">{0} стапки</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>фурлонзи</displayName>
-				<unitPattern count="one">{0} фурлонг</unitPattern>
-				<unitPattern count="other">{0} фурлонзи</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>инчи</displayName>
-				<unitPattern count="one">{0} инч</unitPattern>
-				<unitPattern count="other">{0} инчи</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>километри</displayName>
-				<unitPattern count="one">{0} километар</unitPattern>
-				<unitPattern count="other">{0} километри</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>светлосни години</displayName>
-				<unitPattern count="one">{0} светлосна година</unitPattern>
-				<unitPattern count="other">{0} светлосни години</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>метри</displayName>
-				<unitPattern count="one">{0} метар</unitPattern>
-				<unitPattern count="other">{0} метри</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>микрометри</displayName>
-				<unitPattern count="one">{0} микрометар</unitPattern>
-				<unitPattern count="other">{0} микрометри</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>милји</displayName>
-				<unitPattern count="one">{0} милја</unitPattern>
-				<unitPattern count="other">{0} милји</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>сантиметри</displayName>
+				<unitPattern count="one">{0} сантиметар</unitPattern>
+				<unitPattern count="other">{0} сантиметри</unitPattern>
+				<perUnitPattern>{0} на сантиметар</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>милиметри</displayName>
 				<unitPattern count="one">{0} милиметар</unitPattern>
 				<unitPattern count="other">{0} милиметри</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>микрометри</displayName>
+				<unitPattern count="one">{0} микрометар</unitPattern>
+				<unitPattern count="other">{0} микрометри</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>нанометри</displayName>
 				<unitPattern count="one">{0} нанометар</unitPattern>
 				<unitPattern count="other">{0} нанометри</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>наутички милји</displayName>
-				<unitPattern count="one">{0} наутичка милја</unitPattern>
-				<unitPattern count="other">{0} наутички милји</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>парсеци</displayName>
-				<unitPattern count="one">{0} парсек</unitPattern>
-				<unitPattern count="other">{0} парсеци</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>пикометри</displayName>
 				<unitPattern count="one">{0} пикометар</unitPattern>
 				<unitPattern count="other">{0} пикометри</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>милји</displayName>
+				<unitPattern count="one">{0} милја</unitPattern>
+				<unitPattern count="other">{0} милји</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>јарди</displayName>
 				<unitPattern count="one">{0} јард</unitPattern>
 				<unitPattern count="other">{0} јарди</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>стапки</displayName>
+				<unitPattern count="one">{0} стапка</unitPattern>
+				<unitPattern count="other">{0} стапки</unitPattern>
+				<perUnitPattern>{0} на стапка</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>инчи</displayName>
+				<unitPattern count="one">{0} инч</unitPattern>
+				<unitPattern count="other">{0} инчи</unitPattern>
+				<perUnitPattern>{0} на инч</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>парсеци</displayName>
+				<unitPattern count="one">{0} парсек</unitPattern>
+				<unitPattern count="other">{0} парсеци</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>светлосни години</displayName>
+				<unitPattern count="one">{0} светлосна година</unitPattern>
+				<unitPattern count="other">{0} светлосни години</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>астрономски единици</displayName>
+				<unitPattern count="one">{0} астрономска единица</unitPattern>
+				<unitPattern count="other">{0} астрономски единици</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>фурлонзи</displayName>
+				<unitPattern count="one">{0} фурлонг</unitPattern>
+				<unitPattern count="other">{0} фурлонзи</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>фатоми</displayName>
+				<unitPattern count="one">{0} фатом</unitPattern>
+				<unitPattern count="other">{0} фатоми</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>наутички милји</displayName>
+				<unitPattern count="one">{0} наутичка милја</unitPattern>
+				<unitPattern count="other">{0} наутички милји</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>скандинавска милја</displayName>
+				<unitPattern count="one">{0} скандинавска милја</unitPattern>
+				<unitPattern count="other">{0} скандинавски милји</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>лукс</displayName>
 				<unitPattern count="one">{0} лукс</unitPattern>
 				<unitPattern count="other">{0} лукса</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>карати</displayName>
-				<unitPattern count="one">{0} карат</unitPattern>
-				<unitPattern count="other">{0} карати</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>грама</displayName>
-				<unitPattern count="one">{0} грам</unitPattern>
-				<unitPattern count="other">{0} грама</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>килограми</displayName>
-				<unitPattern count="one">{0} килограм</unitPattern>
-				<unitPattern count="other">{0} килограми</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>метрички тони</displayName>
 				<unitPattern count="one">{0} метрички тон</unitPattern>
 				<unitPattern count="other">{0} метрички тони</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>микрограми</displayName>
-				<unitPattern count="one">{0} микрограм</unitPattern>
-				<unitPattern count="other">{0} микрограми</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>килограми</displayName>
+				<unitPattern count="one">{0} килограм</unitPattern>
+				<unitPattern count="other">{0} килограми</unitPattern>
+				<perUnitPattern>{0} од килограм</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>грама</displayName>
+				<unitPattern count="one">{0} грам</unitPattern>
+				<unitPattern count="other">{0} грама</unitPattern>
+				<perUnitPattern>{0} од грам</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>милиграми</displayName>
 				<unitPattern count="one">{0} милиграм</unitPattern>
 				<unitPattern count="other">{0} милиграми</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>унци</displayName>
-				<unitPattern count="one">{0} унца</unitPattern>
-				<unitPattern count="other">{0} унци</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>тројски унци</displayName>
-				<unitPattern count="one">{0} тројска унца</unitPattern>
-				<unitPattern count="other">{0} тројски унци</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>фунти</displayName>
-				<unitPattern count="one">{0} фунта</unitPattern>
-				<unitPattern count="other">{0} фунти</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>стоуни</displayName>
-				<unitPattern count="one">{0} стоун</unitPattern>
-				<unitPattern count="other">{0} стоуни</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>микрограми</displayName>
+				<unitPattern count="one">{0} микрограм</unitPattern>
+				<unitPattern count="other">{0} микрограми</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>тони</displayName>
 				<unitPattern count="one">{0} тон</unitPattern>
 				<unitPattern count="other">{0} тони</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName>стоуни</displayName>
+				<unitPattern count="one">{0} стоун</unitPattern>
+				<unitPattern count="other">{0} стоуни</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>фунти</displayName>
+				<unitPattern count="one">{0} фунта</unitPattern>
+				<unitPattern count="other">{0} фунти</unitPattern>
+				<perUnitPattern>{0} од фунта</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>унци</displayName>
+				<unitPattern count="one">{0} унца</unitPattern>
+				<unitPattern count="other">{0} унци</unitPattern>
+				<perUnitPattern>{0} од унца</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>тројски унци</displayName>
+				<unitPattern count="one">{0} тројска унца</unitPattern>
+				<unitPattern count="other">{0} тројски унци</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>карати</displayName>
+				<unitPattern count="one">{0} карат</unitPattern>
+				<unitPattern count="other">{0} карати</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>гигавати</displayName>
 				<unitPattern count="one">{0} гигават</unitPattern>
 				<unitPattern count="other">{0} гигавати</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>коњски сили</displayName>
-				<unitPattern count="one">{0} коњска сила</unitPattern>
-				<unitPattern count="other">{0} коњски сили</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>киловати</displayName>
-				<unitPattern count="one">{0} киловат</unitPattern>
-				<unitPattern count="other">{0} киловати</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>мегавати</displayName>
 				<unitPattern count="one">{0} мегават</unitPattern>
 				<unitPattern count="other">{0} мегавати</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>миливати</displayName>
-				<unitPattern count="one">{0} миливат</unitPattern>
-				<unitPattern count="other">{0} миливати</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>киловати</displayName>
+				<unitPattern count="one">{0} киловат</unitPattern>
+				<unitPattern count="other">{0} киловати</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>вати</displayName>
 				<unitPattern count="one">{0} ват</unitPattern>
 				<unitPattern count="other">{0} вати</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>миливати</displayName>
+				<unitPattern count="one">{0} миливат</unitPattern>
+				<unitPattern count="other">{0} миливати</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>коњски сили</displayName>
+				<unitPattern count="one">{0} коњска сила</unitPattern>
+				<unitPattern count="other">{0} коњски сили</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>хектопаскали</displayName>
 				<unitPattern count="one">{0} хектопаскал</unitPattern>
 				<unitPattern count="other">{0} хектопаскали</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>инчи жива</displayName>
-				<unitPattern count="one">{0} инч жива</unitPattern>
-				<unitPattern count="other">{0} инчи жива</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>милибари</displayName>
-				<unitPattern count="one">{0} милибар</unitPattern>
-				<unitPattern count="other">{0} милибари</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>милиметри жива</displayName>
 				<unitPattern count="one">{0} милиметар жива</unitPattern>
@@ -6169,10 +6387,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} фунта на квадратен инч</unitPattern>
 				<unitPattern count="other">{0} фунти на квадратен инч</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>карат</displayName>
-				<unitPattern count="one">{0} карат</unitPattern>
-				<unitPattern count="other">{0} карати</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>инчи жива</displayName>
+				<unitPattern count="one">{0} инч жива</unitPattern>
+				<unitPattern count="other">{0} инчи жива</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>милибари</displayName>
+				<unitPattern count="one">{0} милибар</unitPattern>
+				<unitPattern count="other">{0} милибари</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>километри на час</displayName>
@@ -6189,6 +6412,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} милја на час</unitPattern>
 				<unitPattern count="other">{0} милји на час</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>јазол</displayName>
+				<unitPattern count="one">{0} јазол</unitPattern>
+				<unitPattern count="other">{0} јазли</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>целзиусови степени</displayName>
 				<unitPattern count="one">{0} целзиусов степен</unitPattern>
@@ -6204,36 +6437,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} келвин</unitPattern>
 				<unitPattern count="other">{0} келвини</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>акр-стапки</displayName>
-				<unitPattern count="one">{0} акр-стапка</unitPattern>
-				<unitPattern count="other">{0} акр-стапки</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>бушели</displayName>
-				<unitPattern count="one">{0} бушел</unitPattern>
-				<unitPattern count="other">{0} бушели</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>сантилитри</displayName>
-				<unitPattern count="one">{0} сантилитар</unitPattern>
-				<unitPattern count="other">{0} сантилитри</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>кубни сантиметри</displayName>
-				<unitPattern count="one">{0} кубен сантиметар</unitPattern>
-				<unitPattern count="other">{0} кубни сантиметри</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>кубни стапки</displayName>
-				<unitPattern count="one">{0} кубна стапка</unitPattern>
-				<unitPattern count="other">{0} кубни стапки</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>кубни инчи</displayName>
-				<unitPattern count="one">{0} кубен инч</unitPattern>
-				<unitPattern count="other">{0} кубни инчи</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>кубни километри</displayName>
 				<unitPattern count="one">{0} кубен километар</unitPattern>
@@ -6243,6 +6446,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>кубни метри</displayName>
 				<unitPattern count="one">{0} кубен метар</unitPattern>
 				<unitPattern count="other">{0} кубни метри</unitPattern>
+				<perUnitPattern>{0} на кубен метар</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>кубни сантиметри</displayName>
+				<unitPattern count="one">{0} кубен сантиметар</unitPattern>
+				<unitPattern count="other">{0} кубни сантиметри</unitPattern>
+				<perUnitPattern>{0} на кубен сантиметар</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>кубни милји</displayName>
@@ -6254,25 +6464,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} кубен јард</unitPattern>
 				<unitPattern count="other">{0} кубни јарди</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>шолји</displayName>
-				<unitPattern count="one">{0} шолја</unitPattern>
-				<unitPattern count="other">{0} шолји</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>кубни стапки</displayName>
+				<unitPattern count="one">{0} кубна стапка</unitPattern>
+				<unitPattern count="other">{0} кубни стапки</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>децилитри</displayName>
-				<unitPattern count="one">{0} децилитар</unitPattern>
-				<unitPattern count="other">{0} децилитри</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>кубни инчи</displayName>
+				<unitPattern count="one">{0} кубен инч</unitPattern>
+				<unitPattern count="other">{0} кубни инчи</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>унци течност</displayName>
-				<unitPattern count="one">{0} унца течност</unitPattern>
-				<unitPattern count="other">{0} унци течност</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>галони</displayName>
-				<unitPattern count="one">{0} галон</unitPattern>
-				<unitPattern count="other">{0} галони</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>мегалитри</displayName>
+				<unitPattern count="one">{0} мегалитар</unitPattern>
+				<unitPattern count="other">{0} мегалитри</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>хектолитри</displayName>
@@ -6283,27 +6488,69 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>литри</displayName>
 				<unitPattern count="one">{0} литар</unitPattern>
 				<unitPattern count="other">{0} литри</unitPattern>
+				<perUnitPattern>{0} по литар</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>мегалитри</displayName>
-				<unitPattern count="one">{0} мегалитар</unitPattern>
-				<unitPattern count="other">{0} мегалитри</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>децилитри</displayName>
+				<unitPattern count="one">{0} децилитар</unitPattern>
+				<unitPattern count="other">{0} децилитри</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>центилитри</displayName>
+				<unitPattern count="one">{0} центилитар</unitPattern>
+				<unitPattern count="other">{0} центилитри</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>милилитри</displayName>
 				<unitPattern count="one">{0} милилитар</unitPattern>
 				<unitPattern count="other">{0} милилитри</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>пинти</displayName>
-				<unitPattern count="one">{0} пинта</unitPattern>
-				<unitPattern count="other">{0} пинти</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>метрички пинти</displayName>
+				<unitPattern count="one">{0} метричка пинта</unitPattern>
+				<unitPattern count="other">{0} метрички пинти</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>метрички шолји</displayName>
+				<unitPattern count="one">{0} метричка шолја</unitPattern>
+				<unitPattern count="other">{0} метрички шолји</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ар-стапка</displayName>
+				<unitPattern count="one">{0} ар-стапка</unitPattern>
+				<unitPattern count="other">{0} ар-стапки</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>бушели</displayName>
+				<unitPattern count="one">{0} бушел</unitPattern>
+				<unitPattern count="other">{0} бушели</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>галони</displayName>
+				<unitPattern count="one">{0} галон</unitPattern>
+				<unitPattern count="other">{0} галони</unitPattern>
+				<perUnitPattern>{0} по галон</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>кварти</displayName>
 				<unitPattern count="one">{0} кварт</unitPattern>
 				<unitPattern count="other">{0} кварти</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>пинти</displayName>
+				<unitPattern count="one">{0} пинта</unitPattern>
+				<unitPattern count="other">{0} пинти</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>шолји</displayName>
+				<unitPattern count="one">{0} шолја</unitPattern>
+				<unitPattern count="other">{0} шолји</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>унци течност</displayName>
+				<unitPattern count="one">{0} унца течност</unitPattern>
+				<unitPattern count="other">{0} унци течност</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>супени лажици</displayName>
 				<unitPattern count="one">{0} супена лажица</unitPattern>
@@ -6314,6 +6561,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} кафена лажица</unitPattern>
 				<unitPattern count="other">{0} кафени лажици</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}И</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}С</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}Ј</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}З</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -6329,6 +6582,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} м/с²</unitPattern>
 				<unitPattern count="other">{0} м/с²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="one">{0} rev</unitPattern>
+				<unitPattern count="other">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>радијани</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>степени</displayName>
+				<unitPattern count="one">{0} степ.</unitPattern>
+				<unitPattern count="other">{0} степ.</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>минути</displayName>
 				<unitPattern count="one">{0} мин.</unitPattern>
@@ -6339,30 +6607,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} сек</unitPattern>
 				<unitPattern count="other">{0} сек</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>степени</displayName>
-				<unitPattern count="one">{0} степ.</unitPattern>
-				<unitPattern count="other">{0} степ.</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>радијани</displayName>
-				<unitPattern count="one">{0} рад</unitPattern>
-				<unitPattern count="other">{0} рад</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>акри</displayName>
-				<unitPattern count="one">{0} акр</unitPattern>
-				<unitPattern count="other">{0} акри</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>км²</displayName>
+				<unitPattern count="one">{0} км²</unitPattern>
+				<unitPattern count="other">{0} км²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>хектари</displayName>
 				<unitPattern count="one">{0} хектар</unitPattern>
 				<unitPattern count="other">{0} хектари</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>метри²</displayName>
+				<unitPattern count="one">{0} м²</unitPattern>
+				<unitPattern count="other">{0} м²</unitPattern>
+				<perUnitPattern>{0}/м²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>см²</displayName>
 				<unitPattern count="one">{0} см²</unitPattern>
 				<unitPattern count="other">{0} см²</unitPattern>
+				<perUnitPattern>{0}/см²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>кв. милји</displayName>
+				<unitPattern count="one">{0} кв. милја</unitPattern>
+				<unitPattern count="other">{0} кв. милји</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>акри</displayName>
+				<unitPattern count="one">{0} акр</unitPattern>
+				<unitPattern count="other">{0} акри</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>јарди²</displayName>
+				<unitPattern count="one">{0} јд²</unitPattern>
+				<unitPattern count="other">{0} јд²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>квадратни стапки</displayName>
@@ -6373,91 +6653,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>in²</displayName>
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>км²</displayName>
-				<unitPattern count="one">{0} км²</unitPattern>
-				<unitPattern count="other">{0} км²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>м²</displayName>
-				<unitPattern count="one">{0} м²</unitPattern>
-				<unitPattern count="other">{0} м²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>кв. милји</displayName>
-				<unitPattern count="one">{0} кв. милја</unitPattern>
-				<unitPattern count="other">{0} кв. милји</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>јарди²</displayName>
-				<unitPattern count="one">{0} јд²</unitPattern>
-				<unitPattern count="other">{0} јд²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>карати</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>литри/км</displayName>
-				<unitPattern count="one">{0} л/км</unitPattern>
-				<unitPattern count="other">{0} л/км</unitPattern>
+				<unitPattern count="one">{0} L/km</unitPattern>
+				<unitPattern count="other">{0} L/km</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} L/100km</unitPattern>
+				<unitPattern count="other">{0} L/100km</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>милји/гал</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>бит</displayName>
-				<unitPattern count="one">{0} бит</unitPattern>
-				<unitPattern count="other">{0} битови</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>TByte</displayName>
+				<unitPattern count="one">{0} TB</unitPattern>
+				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
-			<unit type="digital-byte">
-				<displayName>бајт</displayName>
-				<unitPattern count="one">{0} бајт</unitPattern>
-				<unitPattern count="other">{0} бајти</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
+			<unit type="digital-terabit">
+				<displayName>Tbit</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
 			</unit>
 			<unit type="digital-gigabyte">
 				<displayName>GB</displayName>
 				<unitPattern count="one">{0} GB</unitPattern>
 				<unitPattern count="other">{0} GB</unitPattern>
 			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MByte</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mbit</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
 			</unit>
 			<unit type="digital-kilobyte">
 				<displayName>kB</displayName>
 				<unitPattern count="one">{0} kB</unitPattern>
 				<unitPattern count="other">{0} kB</unitPattern>
 			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
+			<unit type="digital-kilobit">
+				<displayName>kbit</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
 			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
+			<unit type="digital-byte">
+				<displayName>бајт</displayName>
+				<unitPattern count="one">{0} бајт</unitPattern>
+				<unitPattern count="other">{0} бајти</unitPattern>
 			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
+			<unit type="digital-bit">
+				<displayName>бит</displayName>
+				<unitPattern count="one">{0} бит</unitPattern>
+				<unitPattern count="other">{0} битови</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>TB</displayName>
-				<unitPattern count="one">{0} TB</unitPattern>
-				<unitPattern count="other">{0} TB</unitPattern>
+			<unit type="duration-century">
+				<displayName>в.</displayName>
+				<unitPattern count="one">{0} в.</unitPattern>
+				<unitPattern count="other">{0} в.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>години</displayName>
+				<unitPattern count="one">{0} год.</unitPattern>
+				<unitPattern count="other">{0} год.</unitPattern>
+				<perUnitPattern>{0}/год.</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>месеци</displayName>
+				<unitPattern count="one">{0} мес.</unitPattern>
+				<unitPattern count="other">{0} мес.</unitPattern>
+				<perUnitPattern>{0}/мес.</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>седмици</displayName>
+				<unitPattern count="one">{0} сед.</unitPattern>
+				<unitPattern count="other">{0} сед.</unitPattern>
+				<perUnitPattern>{0}/сед.</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>дена</displayName>
 				<unitPattern count="one">{0} ден</unitPattern>
 				<unitPattern count="other">{0} дена</unitPattern>
+				<perUnitPattern>{0}/ден</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>часа</displayName>
@@ -6465,30 +6760,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} часа</unitPattern>
 				<perUnitPattern>{0}/ч</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} мс</unitPattern>
-				<unitPattern count="other">{0} мс</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>минути</displayName>
 				<unitPattern count="one">{0} мин.</unitPattern>
 				<unitPattern count="other">{0} мин.</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>месеци</displayName>
-				<unitPattern count="one">{0} мес.</unitPattern>
-				<unitPattern count="other">{0} мес.</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>наносек</displayName>
-				<unitPattern count="one">{0} нс</unitPattern>
-				<unitPattern count="other">{0} нс</unitPattern>
+				<perUnitPattern>{0}/мин.</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>секунди</displayName>
@@ -6496,15 +6772,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} сек.</unitPattern>
 				<perUnitPattern>{0}/с</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>седмици</displayName>
-				<unitPattern count="one">{0} сед.</unitPattern>
-				<unitPattern count="other">{0} сед.</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} мс</unitPattern>
+				<unitPattern count="other">{0} мс</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>години</displayName>
-				<unitPattern count="one">{0} год.</unitPattern>
-				<unitPattern count="other">{0} год.</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>наносек</displayName>
+				<unitPattern count="one">{0} нс</unitPattern>
+				<unitPattern count="other">{0} нс</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>амп.</displayName>
@@ -6512,7 +6793,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} A</unitPattern>
 			</unit>
 			<unit type="electric-milliampere">
-				<displayName>mA</displayName>
+				<displayName>милиамп.</displayName>
 				<unitPattern count="one">{0} mA</unitPattern>
 				<unitPattern count="other">{0} mA</unitPattern>
 			</unit>
@@ -6526,6 +6807,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>кал.</displayName>
 				<unitPattern count="one">{0} кал.</unitPattern>
@@ -6536,21 +6822,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} кал.</unitPattern>
 				<unitPattern count="other">{0} кал.</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>џули</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>килоџул</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>џули</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -6561,216 +6842,220 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>ае</displayName>
-				<unitPattern count="one">{0} ае</unitPattern>
-				<unitPattern count="other">{0} ае</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>км</displayName>
+				<unitPattern count="one">{0} км</unitPattern>
+				<unitPattern count="other">{0} км</unitPattern>
+				<perUnitPattern>{0}/км</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>см</displayName>
-				<unitPattern count="one">{0} см</unitPattern>
-				<unitPattern count="other">{0} см</unitPattern>
+			<unit type="length-meter">
+				<displayName>метри</displayName>
+				<unitPattern count="one">{0} м</unitPattern>
+				<unitPattern count="other">{0} м</unitPattern>
+				<perUnitPattern>{0}/м</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>дм</displayName>
 				<unitPattern count="one">{0} дм</unitPattern>
 				<unitPattern count="other">{0} дм</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName>фатоми</displayName>
-				<unitPattern count="one">{0} фм</unitPattern>
-				<unitPattern count="other">{0} фм</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>стапки</displayName>
-				<unitPattern count="one">{0} ст</unitPattern>
-				<unitPattern count="other">{0} ст</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>фурлонзи</displayName>
-				<unitPattern count="one">{0} фур</unitPattern>
-				<unitPattern count="other">{0} фур</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>инчи</displayName>
-				<unitPattern count="one">{0} инч</unitPattern>
-				<unitPattern count="other">{0} инчи</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>км</displayName>
-				<unitPattern count="one">{0} км</unitPattern>
-				<unitPattern count="other">{0} км</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>свет. год.</displayName>
-				<unitPattern count="one">{0} сг</unitPattern>
-				<unitPattern count="other">{0} сг</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>метри</displayName>
-				<unitPattern count="one">{0} м</unitPattern>
-				<unitPattern count="other">{0} м</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>милји</displayName>
-				<unitPattern count="one">{0} ми</unitPattern>
-				<unitPattern count="other">{0} ми</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>см</displayName>
+				<unitPattern count="one">{0} см</unitPattern>
+				<unitPattern count="other">{0} см</unitPattern>
+				<perUnitPattern>{0}/см</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>мм</displayName>
 				<unitPattern count="one">{0} мм</unitPattern>
 				<unitPattern count="other">{0} мм</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>нм</displayName>
 				<unitPattern count="one">{0} нм</unitPattern>
 				<unitPattern count="other">{0} нм</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>нми</displayName>
-				<unitPattern count="one">{0} нми</unitPattern>
-				<unitPattern count="other">{0} нми</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>парсеци</displayName>
-				<unitPattern count="one">{0} пс</unitPattern>
-				<unitPattern count="other">{0} пс</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>пм</displayName>
 				<unitPattern count="one">{0} пм</unitPattern>
 				<unitPattern count="other">{0} пм</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>милји</displayName>
+				<unitPattern count="one">{0} ми</unitPattern>
+				<unitPattern count="other">{0} ми</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>јарди</displayName>
 				<unitPattern count="one">{0} јард</unitPattern>
 				<unitPattern count="other">{0} јарди</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>стапки</displayName>
+				<unitPattern count="one">{0} ст</unitPattern>
+				<unitPattern count="other">{0} ст</unitPattern>
+				<perUnitPattern>{0}/ст</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>инчи</displayName>
+				<unitPattern count="one">{0} инч</unitPattern>
+				<unitPattern count="other">{0} инчи</unitPattern>
+				<perUnitPattern>{0}/ин</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>парсеци</displayName>
+				<unitPattern count="one">{0} пс</unitPattern>
+				<unitPattern count="other">{0} пс</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>свет. год.</displayName>
+				<unitPattern count="one">{0} сг</unitPattern>
+				<unitPattern count="other">{0} сг</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ае</displayName>
+				<unitPattern count="one">{0} ае</unitPattern>
+				<unitPattern count="other">{0} ае</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>фурлонзи</displayName>
+				<unitPattern count="one">{0} фур</unitPattern>
+				<unitPattern count="other">{0} фур</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>фатоми</displayName>
+				<unitPattern count="one">{0} фм</unitPattern>
+				<unitPattern count="other">{0} фм</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>нми</displayName>
+				<unitPattern count="one">{0} нми</unitPattern>
+				<unitPattern count="other">{0} нми</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>лукс</displayName>
-				<unitPattern count="one">{0} лк</unitPattern>
-				<unitPattern count="other">{0} лк</unitPattern>
-			</unit>
-			<unit type="mass-carat">
-				<displayName>карати</displayName>
-				<unitPattern count="one">{0} кар.</unitPattern>
-				<unitPattern count="other">{0} кар.</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>грама</displayName>
-				<unitPattern count="one">{0} г</unitPattern>
-				<unitPattern count="other">{0} г</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>кг</displayName>
-				<unitPattern count="one">{0} кг</unitPattern>
-				<unitPattern count="other">{0} кг</unitPattern>
+				<unitPattern count="one">{0} lx</unitPattern>
+				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>т</displayName>
 				<unitPattern count="one">{0} т</unitPattern>
 				<unitPattern count="other">{0} т</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>кг</displayName>
+				<unitPattern count="one">{0} кг</unitPattern>
+				<unitPattern count="other">{0} кг</unitPattern>
+				<perUnitPattern>{0}/кг</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>грама</displayName>
+				<unitPattern count="one">{0} г</unitPattern>
+				<unitPattern count="other">{0} г</unitPattern>
+				<perUnitPattern>{0}/г</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>мг</displayName>
 				<unitPattern count="one">{0} мг</unitPattern>
 				<unitPattern count="other">{0} мг</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>унци</displayName>
-				<unitPattern count="one">{0} унца</unitPattern>
-				<unitPattern count="other">{0} унци</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>тројска унца</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>фунти</displayName>
-				<unitPattern count="one">{0} фунта</unitPattern>
-				<unitPattern count="other">{0} фунти</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>стоуни</displayName>
-				<unitPattern count="one">{0} стоун</unitPattern>
-				<unitPattern count="other">{0} стоуни</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>тони</displayName>
 				<unitPattern count="one">{0} тн</unitPattern>
 				<unitPattern count="other">{0} тн</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName>стоуни</displayName>
+				<unitPattern count="one">{0} стоун</unitPattern>
+				<unitPattern count="other">{0} стоуни</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>фунти</displayName>
+				<unitPattern count="one">{0} фунта</unitPattern>
+				<unitPattern count="other">{0} фунти</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>унци</displayName>
+				<unitPattern count="one">{0} унца</unitPattern>
+				<unitPattern count="other">{0} унци</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>тројска унца</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>карати</displayName>
+				<unitPattern count="one">{0} кар.</unitPattern>
+				<unitPattern count="other">{0} кар.</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>коњски сили</displayName>
-				<unitPattern count="one">{0} кс</unitPattern>
-				<unitPattern count="other">{0} кс</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>вати</displayName>
 				<unitPattern count="one">{0} ват</unitPattern>
 				<unitPattern count="other">{0} вати</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>коњски сили</displayName>
+				<unitPattern count="one">{0} кс</unitPattern>
+				<unitPattern count="other">{0} кс</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>мбар</displayName>
-				<unitPattern count="one">{0} мбар</unitPattern>
-				<unitPattern count="other">{0} мбар</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>мм жива</displayName>
 				<unitPattern count="one">{0} мм жива</unitPattern>
@@ -6781,10 +7066,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>карати</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>мбар</displayName>
+				<unitPattern count="one">{0} мбар</unitPattern>
+				<unitPattern count="other">{0} мб.</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>км/час</displayName>
@@ -6801,6 +7091,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ми/ч</unitPattern>
 				<unitPattern count="other">{0} ми/ч</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>целзиусови степени</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -6816,36 +7116,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>акр ст</displayName>
-				<unitPattern count="one">{0} ак ст</unitPattern>
-				<unitPattern count="other">{0} ак ст</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>бушели</displayName>
-				<unitPattern count="one">{0} бу</unitPattern>
-				<unitPattern count="other">{0} бу</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>сл</displayName>
-				<unitPattern count="one">{0} сл</unitPattern>
-				<unitPattern count="other">{0} сл</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>см³</displayName>
-				<unitPattern count="one">{0} см³</unitPattern>
-				<unitPattern count="other">{0} см³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>стапки³</displayName>
-				<unitPattern count="one">{0} ст³</unitPattern>
-				<unitPattern count="other">{0} ст³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>инчи³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>км³</displayName>
 				<unitPattern count="one">{0} км³</unitPattern>
@@ -6855,6 +7125,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>м³</displayName>
 				<unitPattern count="one">{0} м³</unitPattern>
 				<unitPattern count="other">{0} м³</unitPattern>
+				<perUnitPattern>{0}/м³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>см³</displayName>
+				<unitPattern count="one">{0} см³</unitPattern>
+				<unitPattern count="other">{0} см³</unitPattern>
+				<perUnitPattern>{0}/см³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>ми³</displayName>
@@ -6866,66 +7143,109 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} јд³</unitPattern>
 				<unitPattern count="other">{0} јд³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>шолји</displayName>
-				<unitPattern count="one">{0} ш.</unitPattern>
-				<unitPattern count="other">{0} ш.</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>стапки³</displayName>
+				<unitPattern count="one">{0} ст³</unitPattern>
+				<unitPattern count="other">{0} ст³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>дл</displayName>
-				<unitPattern count="one">{0} дл</unitPattern>
-				<unitPattern count="other">{0} дл</unitPattern>
-			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>гал</displayName>
-				<unitPattern count="one">{0} гал</unitPattern>
-				<unitPattern count="other">{0} гал</unitPattern>
-			</unit>
-			<unit type="volume-hectoliter">
-				<displayName>хл</displayName>
-				<unitPattern count="one">{0} хл</unitPattern>
-				<unitPattern count="other">{0} хл</unitPattern>
-			</unit>
-			<unit type="volume-liter">
-				<displayName>литри</displayName>
-				<unitPattern count="one">{0} л</unitPattern>
-				<unitPattern count="other">{0} л</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>инчи³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
 			<unit type="volume-megaliter">
 				<displayName>ML</displayName>
 				<unitPattern count="one">{0} ML</unitPattern>
 				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
-			<unit type="volume-milliliter">
-				<displayName>мл</displayName>
-				<unitPattern count="one">{0} мл</unitPattern>
-				<unitPattern count="other">{0} мл</unitPattern>
+			<unit type="volume-hectoliter">
+				<displayName>hL</displayName>
+				<unitPattern count="one">{0} hL</unitPattern>
+				<unitPattern count="other">{0} hL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>пинти</displayName>
-				<unitPattern count="one">{0} пт</unitPattern>
-				<unitPattern count="other">{0} пт</unitPattern>
+			<unit type="volume-liter">
+				<displayName>литри</displayName>
+				<unitPattern count="one">{0} л</unitPattern>
+				<unitPattern count="other">{0} л</unitPattern>
+				<perUnitPattern>{0}/л</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0} dL</unitPattern>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="one">{0} cL</unitPattern>
+				<unitPattern count="other">{0} cL</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>mL</displayName>
+				<unitPattern count="one">{0} mL</unitPattern>
+				<unitPattern count="other">{0} mL</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ар-ст.</displayName>
+				<unitPattern count="one">{0} ар-ст.</unitPattern>
+				<unitPattern count="other">{0} ар-ст.</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>бушели</displayName>
+				<unitPattern count="one">{0} бу</unitPattern>
+				<unitPattern count="other">{0} бу</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>гал</displayName>
+				<unitPattern count="one">{0} гал</unitPattern>
+				<unitPattern count="other">{0} гал</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>пинти</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>шолји</displayName>
+				<unitPattern count="one">{0} ш.</unitPattern>
+				<unitPattern count="other">{0} ш.</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
-				<displayName>суп. лаж.</displayName>
-				<unitPattern count="one">{0} суп. лаж.</unitPattern>
-				<unitPattern count="other">{0} суп. лаж.</unitPattern>
+				<displayName>tbsp</displayName>
+				<unitPattern count="one">{0} tbsp</unitPattern>
+				<unitPattern count="other">{0} tbsp</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
-				<displayName>каф. лаж.</displayName>
-				<unitPattern count="one">{0} каф. лаж.</unitPattern>
-				<unitPattern count="other">{0} каф. лаж.</unitPattern>
+				<displayName>tsp</displayName>
+				<unitPattern count="one">{0} tsp</unitPattern>
+				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}И</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}С</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}Ј</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}З</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -6939,6 +7259,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} м/с²</unitPattern>
 				<unitPattern count="other">{0} м/с²</unitPattern>
 			</unit>
+			<unit type="angle-radian">
+				<unitPattern count="one">{0} рад</unitPattern>
+				<unitPattern count="other">{0} рад</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>степени</displayName>
+				<unitPattern count="one">{0} степ.</unitPattern>
+				<unitPattern count="other">{0} степ.</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -6947,34 +7276,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0} степ.</unitPattern>
-				<unitPattern count="other">{0} степ.</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<unitPattern count="one">{0} рад</unitPattern>
-				<unitPattern count="other">{0} рад</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} акр</unitPattern>
-				<unitPattern count="other">{0} акри</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} км²</unitPattern>
+				<unitPattern count="other">{0} км²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} ха</unitPattern>
 				<unitPattern count="other">{0} ха</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} стапка²</unitPattern>
-				<unitPattern count="other">{0} стапки²</unitPattern>
-			</unit>
-			<unit type="area-square-inch">
-				<unitPattern count="one">{0} ин²</unitPattern>
-				<unitPattern count="other">{0} ин²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} км²</unitPattern>
-				<unitPattern count="other">{0} км²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<displayName>м²</displayName>
 				<unitPattern count="one">{0} м²</unitPattern>
@@ -6984,61 +7293,97 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ми²</unitPattern>
 				<unitPattern count="other">{0} ми²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} акр</unitPattern>
+				<unitPattern count="other">{0} акри</unitPattern>
+			</unit>
 			<unit type="area-square-yard">
 				<unitPattern count="one">{0} јд²</unitPattern>
 				<unitPattern count="other">{0} јд²</unitPattern>
 			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} стапка²</unitPattern>
+				<unitPattern count="other">{0} стапки²</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<unitPattern count="one">{0} ин²</unitPattern>
+				<unitPattern count="other">{0} ин²</unitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<unitPattern count="one">{0} кт</unitPattern>
+				<unitPattern count="other">{0} кт</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="one">{0} л/км</unitPattern>
 				<unitPattern count="other">{0} л/км</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} L/100km</unitPattern>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<unitPattern count="one">{0} ми/гал</unitPattern>
 				<unitPattern count="other">{0} ми/гал</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>бит</displayName>
-				<unitPattern count="one">{0} бит</unitPattern>
-				<unitPattern count="other">{0} битови</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>TB</displayName>
+				<unitPattern count="one">{0} TB</unitPattern>
+				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
+			<unit type="digital-terabit">
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
 			</unit>
 			<unit type="digital-gigabyte">
 				<displayName>GB</displayName>
 				<unitPattern count="one">{0} GB</unitPattern>
 				<unitPattern count="other">{0} GB</unitPattern>
 			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
 			</unit>
 			<unit type="digital-megabyte">
 				<displayName>MB</displayName>
 				<unitPattern count="one">{0} MB</unitPattern>
 				<unitPattern count="other">{0} MB</unitPattern>
 			</unit>
-			<unit type="digital-terabit">
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>TB</displayName>
-				<unitPattern count="one">{0} TB</unitPattern>
-				<unitPattern count="other">{0} TB</unitPattern>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>бит</displayName>
+				<unitPattern count="one">{0} бит</unitPattern>
+				<unitPattern count="other">{0} битови</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>год.</displayName>
+				<unitPattern count="one">{0} год.</unitPattern>
+				<unitPattern count="other">{0} год.</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>месец</displayName>
+				<unitPattern count="one">{0} мес.</unitPattern>
+				<unitPattern count="other">{0} мес.</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>сед.</displayName>
+				<unitPattern count="one">{0} сед.</unitPattern>
+				<unitPattern count="other">{0} сед.</unitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>ден</displayName>
@@ -7050,151 +7395,146 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} час</unitPattern>
 				<unitPattern count="other">{0} часа</unitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<unitPattern count="one">{0}μс</unitPattern>
-				<unitPattern count="other">{0}μс</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>мсек</displayName>
-				<unitPattern count="one">{0} мс</unitPattern>
-				<unitPattern count="other">{0} мс</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>мин</displayName>
 				<unitPattern count="one">{0} мин.</unitPattern>
 				<unitPattern count="other">{0} мин.</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>месец</displayName>
-				<unitPattern count="one">{0} мес.</unitPattern>
-				<unitPattern count="other">{0} мес.</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<unitPattern count="one">{0} нс</unitPattern>
-				<unitPattern count="other">{0} нс</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>сек.</displayName>
 				<unitPattern count="one">{0} сек.</unitPattern>
 				<unitPattern count="other">{0} сек.</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>сед.</displayName>
-				<unitPattern count="one">{0} сед.</unitPattern>
-				<unitPattern count="other">{0} сед.</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>мсек</displayName>
+				<unitPattern count="one">{0} мс</unitPattern>
+				<unitPattern count="other">{0} мс</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>год.</displayName>
-				<unitPattern count="one">{0} год.</unitPattern>
-				<unitPattern count="other">{0} год.</unitPattern>
+			<unit type="duration-microsecond">
+				<unitPattern count="one">{0}μс</unitPattern>
+				<unitPattern count="other">{0}μс</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<unitPattern count="one">{0} ае</unitPattern>
-				<unitPattern count="other">{0} ае</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>см</displayName>
-				<unitPattern count="one">{0} см</unitPattern>
-				<unitPattern count="other">{0} см</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<unitPattern count="one">{0} дм</unitPattern>
-				<unitPattern count="other">{0} дм</unitPattern>
-			</unit>
-			<unit type="length-fathom">
-				<displayName>фатоми</displayName>
-				<unitPattern count="one">{0} фм</unitPattern>
-				<unitPattern count="other">{0} фм</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0}′</unitPattern>
-				<unitPattern count="other">{0}′</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>фурлонг</displayName>
-				<unitPattern count="one">{0} фур</unitPattern>
-				<unitPattern count="other">{0} фур</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0}″</unitPattern>
-				<unitPattern count="other">{0}″</unitPattern>
+			<unit type="duration-nanosecond">
+				<unitPattern count="one">{0} нс</unitPattern>
+				<unitPattern count="other">{0} нс</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>км</displayName>
 				<unitPattern count="one">{0} км</unitPattern>
 				<unitPattern count="other">{0} км</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} сг</unitPattern>
-				<unitPattern count="other">{0} сг</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>метар</displayName>
 				<unitPattern count="one">{0} м</unitPattern>
 				<unitPattern count="other">{0} м</unitPattern>
 			</unit>
-			<unit type="length-micrometer">
-				<unitPattern count="one">{0} µм</unitPattern>
-				<unitPattern count="other">{0} µм</unitPattern>
+			<unit type="length-decimeter">
+				<unitPattern count="one">{0} дм</unitPattern>
+				<unitPattern count="other">{0} дм</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} ми</unitPattern>
-				<unitPattern count="other">{0} ми</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>см</displayName>
+				<unitPattern count="one">{0} см</unitPattern>
+				<unitPattern count="other">{0} см</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>мм</displayName>
 				<unitPattern count="one">{0} мм</unitPattern>
 				<unitPattern count="other">{0} мм</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<unitPattern count="one">{0} µм</unitPattern>
+				<unitPattern count="other">{0} µм</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<unitPattern count="one">{0} нм</unitPattern>
 				<unitPattern count="other">{0} нм</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<unitPattern count="one">{0} нми</unitPattern>
-				<unitPattern count="other">{0} нми</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<unitPattern count="one">{0} пс</unitPattern>
-				<unitPattern count="other">{0} пс</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<unitPattern count="one">{0} пм</unitPattern>
 				<unitPattern count="other">{0} пм</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} ми</unitPattern>
+				<unitPattern count="other">{0} ми</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} јд</unitPattern>
 				<unitPattern count="other">{0} јд</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="other">{0}′</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<unitPattern count="one">{0} пс</unitPattern>
+				<unitPattern count="other">{0} пс</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} сг</unitPattern>
+				<unitPattern count="other">{0} сг</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<unitPattern count="one">{0} ае</unitPattern>
+				<unitPattern count="other">{0} ае</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>фурлонг</displayName>
+				<unitPattern count="one">{0} фур</unitPattern>
+				<unitPattern count="other">{0} фур</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>фатоми</displayName>
+				<unitPattern count="one">{0} фм</unitPattern>
+				<unitPattern count="other">{0} фм</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<unitPattern count="one">{0} нми</unitPattern>
+				<unitPattern count="other">{0} нми</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<unitPattern count="one">{0} лк</unitPattern>
 				<unitPattern count="other">{0} лк</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<unitPattern count="one">{0} кар.</unitPattern>
-				<unitPattern count="other">{0} кар.</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>грам</displayName>
-				<unitPattern count="one" draft="contributed">{0} г</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} г</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>кг</displayName>
-				<unitPattern count="one" draft="contributed">{0} кг</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} кг</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<unitPattern count="one">{0} т</unitPattern>
 				<unitPattern count="other">{0} т</unitPattern>
 			</unit>
+			<unit type="mass-kilogram">
+				<displayName>кг</displayName>
+				<unitPattern count="one">{0} кг</unitPattern>
+				<unitPattern count="other">{0} кг</unitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>грам</displayName>
+				<unitPattern count="one">{0}г</unitPattern>
+				<unitPattern count="other">{0}г</unitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<unitPattern count="one">{0} мг</unitPattern>
+				<unitPattern count="other">{0} мг</unitPattern>
+			</unit>
 			<unit type="mass-microgram">
 				<unitPattern count="one">{0} µг</unitPattern>
 				<unitPattern count="other">{0} µг</unitPattern>
 			</unit>
-			<unit type="mass-milligram">
-				<unitPattern count="one">{0} мг</unitPattern>
-				<unitPattern count="other">{0} мг</unitPattern>
+			<unit type="mass-ton">
+				<displayName>тони</displayName>
+				<unitPattern count="one">{0} тн</unitPattern>
+				<unitPattern count="other">{0} тн</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName>стоун</displayName>
+				<unitPattern count="one">{0} стоун</unitPattern>
+				<unitPattern count="other">{0} стоуни</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<unitPattern count="one">{0} фунта</unitPattern>
+				<unitPattern count="other">{0} фунти</unitPattern>
 			</unit>
 			<unit type="mass-ounce">
 				<unitPattern count="one">{0} унца</unitPattern>
@@ -7204,25 +7544,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} oz t</unitPattern>
 				<unitPattern count="other">{0} oz t</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<unitPattern count="one">{0} фунта</unitPattern>
-				<unitPattern count="other">{0} фунти</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>стоун</displayName>
-				<unitPattern count="one">{0} стоун</unitPattern>
-				<unitPattern count="other">{0} стоуни</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<displayName>тони</displayName>
-				<unitPattern count="one">{0} тн</unitPattern>
-				<unitPattern count="other">{0} тн</unitPattern>
-			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} кс</unitPattern>
-				<unitPattern count="other">{0} кс</unitPattern>
+			<unit type="mass-carat">
+				<unitPattern count="one">{0} кар.</unitPattern>
+				<unitPattern count="other">{0} кар.</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
 				<unitPattern count="one">{0} kW</unitPattern>
 				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
@@ -7230,10 +7557,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ват</unitPattern>
 				<unitPattern count="other">{0} вати</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} кс</unitPattern>
+				<unitPattern count="other">{0} кс</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} хПа</unitPattern>
 				<unitPattern count="other">{0} хПа</unitPattern>
 			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<unitPattern count="one">{0}mm Hg</unitPattern>
+				<unitPattern count="other">{0}mm Hg</unitPattern>
+			</unit>
 			<unit type="pressure-inch-hg">
 				<displayName>inHg</displayName>
 				<unitPattern count="one">{0} inHg</unitPattern>
@@ -7244,14 +7579,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} мб</unitPattern>
 				<unitPattern count="other">{0} мб</unitPattern>
 			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<unitPattern count="one">{0}mm Hg</unitPattern>
-				<unitPattern count="other">{0}mm Hg</unitPattern>
-			</unit>
-			<unit type="proportion-karat">
-				<unitPattern count="one">{0} кт</unitPattern>
-				<unitPattern count="other">{0} кт</unitPattern>
-			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>км/ч</displayName>
 				<unitPattern count="one">{0} к/ч</unitPattern>
@@ -7271,38 +7598,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0}°C</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
-				<unitPattern count="one" draft="contributed">{0}°F</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°F</unitPattern>
+				<displayName>°F</displayName>
+				<unitPattern count="one">{0}°F</unitPattern>
+				<unitPattern count="other">{0}°F</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
 				<unitPattern count="one">{0}°K</unitPattern>
 				<unitPattern count="other">{0}°K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<unitPattern count="one">{0} ак ст</unitPattern>
-				<unitPattern count="other">{0} ак ст</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>бу</displayName>
-				<unitPattern count="one">{0} бу</unitPattern>
-				<unitPattern count="other">{0} бу</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<unitPattern count="one">{0} сл</unitPattern>
-				<unitPattern count="other">{0} сл</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<unitPattern count="one">{0} см³</unitPattern>
-				<unitPattern count="other">{0} см³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<unitPattern count="one">{0} ст³</unitPattern>
-				<unitPattern count="other">{0} ст³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<unitPattern count="one">{0} ин³</unitPattern>
-				<unitPattern count="other">{0} ин³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<unitPattern count="one">{0} км³</unitPattern>
 				<unitPattern count="other">{0} км³</unitPattern>
@@ -7311,6 +7614,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} м³</unitPattern>
 				<unitPattern count="other">{0} м³</unitPattern>
 			</unit>
+			<unit type="volume-cubic-centimeter">
+				<unitPattern count="one">{0} см³</unitPattern>
+				<unitPattern count="other">{0} см³</unitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<unitPattern count="one">{0} ми³</unitPattern>
 				<unitPattern count="other">{0} ми³</unitPattern>
@@ -7319,17 +7626,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} јд³</unitPattern>
 				<unitPattern count="other">{0} јд³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<unitPattern count="one">{0} дл</unitPattern>
-				<unitPattern count="other">{0} дл</unitPattern>
+			<unit type="volume-cubic-foot">
+				<unitPattern count="one">{0} ст³</unitPattern>
+				<unitPattern count="other">{0} ст³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
+			<unit type="volume-cubic-inch">
+				<unitPattern count="one">{0} ин³</unitPattern>
+				<unitPattern count="other">{0} ин³</unitPattern>
 			</unit>
-			<unit type="volume-gallon">
-				<unitPattern count="one">{0} гал</unitPattern>
-				<unitPattern count="other">{0} гал</unitPattern>
+			<unit type="volume-megaliter">
+				<unitPattern count="one">{0} Мл</unitPattern>
+				<unitPattern count="other">{0} Мл</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<unitPattern count="one">{0} хл</unitPattern>
@@ -7340,22 +7647,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} л</unitPattern>
 				<unitPattern count="other">{0} л</unitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<unitPattern count="one">{0} Мл</unitPattern>
-				<unitPattern count="other">{0} Мл</unitPattern>
+			<unit type="volume-deciliter">
+				<unitPattern count="one">{0} дл</unitPattern>
+				<unitPattern count="other">{0} дл</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<unitPattern count="one">{0} сл</unitPattern>
+				<unitPattern count="other">{0} сл</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<unitPattern count="one">{0} мл</unitPattern>
 				<unitPattern count="other">{0} мл</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<unitPattern count="one">{0} пт</unitPattern>
-				<unitPattern count="other">{0} пт</unitPattern>
+			<unit type="volume-acre-foot">
+				<unitPattern count="one">{0} ак ст</unitPattern>
+				<unitPattern count="other">{0} ак ст</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>бу</displayName>
+				<unitPattern count="one">{0} бу</unitPattern>
+				<unitPattern count="other">{0} бу</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<unitPattern count="one">{0} гал</unitPattern>
+				<unitPattern count="other">{0} гал</unitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<unitPattern count="one">{0} пт</unitPattern>
+				<unitPattern count="other">{0} пт</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<unitPattern count="one">{0}tbsp</unitPattern>
 				<unitPattern count="other">{0}tbsp</unitPattern>
@@ -7364,6 +7692,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}tsp</unitPattern>
 				<unitPattern count="other">{0}tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}И</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}С</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}Ј</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}З</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mk_MK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mk_MK.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mk_MK.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mk_MK.xml
index 50789f1d8ee..76e8cae3f2c 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mk_MK.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mk_MK.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="mk"/>
 		<territory type="MK"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ml.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ml.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ml.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ml.xml
index 2c898cf2155..8f82dd986f2 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ml.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ml.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="ml"/>
 	</identity>
 	<localeDisplayNames>
@@ -62,6 +61,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bez">ബെനാ</language>
 			<language type="bfd">ബാഫട്ട്</language>
 			<language type="bg">ബൾഗേറിയൻ</language>
+			<language type="bgn">പശ്ചിമ ബലൂചി</language>
 			<language type="bho">ഭോജ്‌പൂരി</language>
 			<language type="bi">ബിസ്‌ലാമ</language>
 			<language type="bik">ബികോൽ</language>
@@ -223,7 +223,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="is">ഐസ്‌ലാൻഡിക്</language>
 			<language type="it">ഇറ്റാലിയൻ</language>
 			<language type="iu">ഇനുക്റ്റിറ്റട്ട്</language>
-			<language type="ja">ജപ്പാനീസ്</language>
+			<language type="ja">ജാപ്പനീസ്</language>
 			<language type="jbo">ലോജ്ബാൻ</language>
 			<language type="jgo">ഗോമ്പ</language>
 			<language type="jmc">മചേം</language>
@@ -289,6 +289,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">ലാവോ</language>
 			<language type="lol">മോങ്കോ</language>
 			<language type="loz">ലൊസി</language>
+			<language type="lrc">വടക്കൻ ലൂറി</language>
 			<language type="lt">ലിത്വാനിയൻ</language>
 			<language type="lu">ലുബ-കറ്റംഗ</language>
 			<language type="lua">ലൂബ-ലുലുവ</language>
@@ -337,12 +338,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="my">ബർമീസ്</language>
 			<language type="mye">മയീൻ</language>
 			<language type="myv">ഏഴ്സ്യ</language>
+			<language type="mzn">മസന്ററാനി</language>
 			<language type="na">നൗറു</language>
 			<language type="nap">നെപ്പോളിറ്റാൻ</language>
 			<language type="naq">നാമ</language>
 			<language type="nb">നോർവീജിയൻ ബുക്‌മൽ</language>
 			<language type="nd">നോർത്ത് ഡെബിൾ</language>
 			<language type="nds">ലോ ജർമൻ</language>
+			<language type="nds_NL">ലോ സാക്സൺ</language>
 			<language type="ne">നേപ്പാളി</language>
 			<language type="new">നേവാരി</language>
 			<language type="ng">ഡോങ്ക</language>
@@ -387,7 +390,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="pon">പൊൻപിയൻ</language>
 			<language type="pro">പ്രൊവൻഷ്ൽ</language>
 			<language type="ps">പഷ്തു</language>
-			<language type="ps" alt="variant" draft="contributed">പുഷ്തോ</language>
+			<language type="ps" alt="variant">പുഷ്തോ</language>
 			<language type="pt">പോർച്ചുഗീസ്</language>
 			<language type="pt_BR">ബ്രസീലിയൻ പോർച്ചുഗീസ്</language>
 			<language type="pt_PT">യൂറോപ്യൻ പോർച്ചുഗീസ്</language>
@@ -420,6 +423,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">സിസിലിയൻ</language>
 			<language type="sco">സ്കോട്സ്</language>
 			<language type="sd">സിന്ധി</language>
+			<language type="sdh">തെക്കൻ കുർദ്ദിഷ്</language>
 			<language type="se">വടക്കൻ സമി</language>
 			<language type="see">സെനേക</language>
 			<language type="seh">സേന</language>
@@ -451,14 +455,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ss">സ്വാറ്റി</language>
 			<language type="ssy">സാഹോ</language>
 			<language type="st">തെക്കൻ സോതോ</language>
-			<language type="su">സുഡാനീസ്</language>
+			<language type="su">സുണ്ടാനീസ്</language>
 			<language type="suk">സുകുമ</language>
 			<language type="sus">സുസു</language>
 			<language type="sux">സുമേരിയൻ</language>
 			<language type="sv">സ്വീഡിഷ്</language>
 			<language type="sw">സ്വാഹിലി</language>
+			<language type="sw_CD">കോംഗോ സ്വാഹിലി</language>
 			<language type="swb">കൊമോറിയൻ</language>
-			<language type="swc">കോംഗോ സ്വാഹിലി</language>
 			<language type="syc">പുരാതന സുറിയാനിഭാഷ</language>
 			<language type="syr">സുറിയാനി</language>
 			<language type="ta">തമിഴ്</language>
@@ -514,6 +518,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">വലമൊ</language>
 			<language type="war">വാരേയ്</language>
 			<language type="was">വാഷൊ</language>
+			<language type="wbp">വാൾപ്പിരി</language>
 			<language type="wo">വൊളോഫ്</language>
 			<language type="xal">കൽമൈക്</language>
 			<language type="xh">ഖോസ</language>
@@ -531,8 +536,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="zen">സെനഗ</language>
 			<language type="zgh">മൊറോക്കൻ സാധാരണ താമസൈറ്റ്</language>
 			<language type="zh">ചൈനീസ്</language>
-			<language type="zh_Hans">ചീനഭാഷ-ലളിതലിപി</language>
-			<language type="zh_Hant">ചീനഭാഷ-പരമ്പരാഗതലിപി</language>
 			<language type="zu">സുലു</language>
 			<language type="zun">സുനി</language>
 			<language type="zxx">ഭാഷാപരമായ ഉള്ളടക്കമൊന്നുമില്ല</language>
@@ -712,7 +715,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">ആൻഗ്വില്ല</territory>
 			<territory type="AL">അൽബേനിയ</territory>
 			<territory type="AM">അർമേനിയ</territory>
-			<territory type="AN">നെതർലൻഡ്സ് ആൻറിലിസ്</territory>
 			<territory type="AO">അംഗോള</territory>
 			<territory type="AQ">അൻറാർട്ടിക്ക</territory>
 			<territory type="AR">അർജൻറീന</territory>
@@ -744,7 +746,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BY">ബെലറൂസ്</territory>
 			<territory type="BZ">ബെലീസ്</territory>
 			<territory type="CA">കാനഡ</territory>
-			<territory type="CC">കോക്കസ് ദ്വീപുകൾ</territory>
+			<territory type="CC">കോക്കസ് (കീലിംഗ്) ദ്വീപുകൾ</territory>
 			<territory type="CD">കോംഗോ - കിൻഷാസ</territory>
 			<territory type="CD" alt="variant">കോംഗോ (DRC)</territory>
 			<territory type="CF">സെൻട്രൽ ആഫ്രിക്കൻ റിപ്പബ്ലിക്</territory>
@@ -785,12 +787,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="FI">ഫിൻലാൻഡ്</territory>
 			<territory type="FJ">ഫിജി</territory>
 			<territory type="FK">ഫാക്ക്‌ലാന്റ് ദ്വീപുകൾ</territory>
-			<territory type="FK" alt="variant">ഫാക്ക്‌ലാൻഡ് ദ്വീപുകൾ (മൽവിനാസ്)</territory>
+			<territory type="FK" alt="variant">ഫോക്ക്‌ലാൻഡ് ദ്വീപുകൾ (ഐലാസ് മാൽവിനാസ്)</territory>
 			<territory type="FM">മൈക്രോനേഷ്യ</territory>
 			<territory type="FO">ഫറോ ദ്വീപുകൾ</territory>
 			<territory type="FR">ഫ്രാൻസ്</territory>
 			<territory type="GA">ഗാബൺ</territory>
-			<territory type="GB">ബ്രിട്ടൻ</territory>
+			<territory type="GB">യുണൈറ്റഡ് കിംഗ്ഡം</territory>
 			<territory type="GB" alt="short">യു.കെ.</territory>
 			<territory type="GD">ഗ്രനേഡ</territory>
 			<territory type="GE">ജോർജ്ജിയ</territory>
@@ -809,7 +811,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GU">ഗ്വാം</territory>
 			<territory type="GW">ഗിനിയ-ബിസൗ</territory>
 			<territory type="GY">ഗയാന</territory>
-			<territory type="HK">ഹോങ് കോങ് എസ്.ഏ.ആർ. ചൈന</territory>
+			<territory type="HK">ഹോങ്കോങ്ങ് (SAR) ചൈന</territory>
 			<territory type="HK" alt="short">ഹോങ്കോങ്ങ്</territory>
 			<territory type="HM">ഹിയേർഡും മക്‌ഡൊണാൾഡ് ദ്വീപുകളും</territory>
 			<territory type="HN">ഹോണ്ടുറാസ്</territory>
@@ -865,7 +867,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ML">മാലി</territory>
 			<territory type="MM">മ്യാൻമാർ (ബർമ്മ)</territory>
 			<territory type="MN">മംഗോളിയ</territory>
-			<territory type="MO">മക്കാവോ SAR ചൈന</territory>
+			<territory type="MO">മക്കാവു (SAR) ചൈന</territory>
 			<territory type="MO" alt="short">മക്കാവു</territory>
 			<territory type="MP">ഉത്തര മറിയാനാ ദ്വീപുകൾ</territory>
 			<territory type="MQ">മാർട്ടിനിക്ക്</territory>
@@ -1002,6 +1004,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric">അക്കങ്ങൾ പ്രകാരമുള്ള അടുക്കൽ</key>
 			<key type="colStrength">അടുക്കൽ ദൃഢത</key>
 			<key type="currency">നാണയം</key>
+			<key type="hc">സമയ ഘടന (12 / 24)</key>
+			<key type="lb">രേഖാ വിഭാജി ശൈലി</key>
+			<key type="ms">അളക്കൽ സംവിധാനം</key>
 			<key type="numbers">അക്കങ്ങൾ‌</key>
 			<key type="timezone">സമയ മേഖല</key>
 			<key type="va">ഭാഷാ ഭേദം</key>
@@ -1009,95 +1014,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">സ്വകാര്യ ഉപയോഗം</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">അറബിക്-ഇന്ത്യ അക്കങ്ങൾ</type>
-			<type type="arabext" key="numbers">വിപുലീകൃത അറബി-ഭാരതീയ അക്കങ്ങൾ</type>
-			<type type="armn" key="numbers">അർമേനിയൻ സംഖ്യകൾ</type>
-			<type type="armnlow" key="numbers">അർമേനിയൻ ചെറിയ സംഖ്യകൾ</type>
-			<type type="beng" key="numbers">ബംഗാളി അക്കങ്ങൾ</type>
-			<type type="big5han" key="collation">പരമ്പരാഗത ചൈനീസ് ക്രമീകരണം - ബിഗ്5</type>
-			<type type="buddhist" key="calendar">ബുദ്ധമതകലണ്ടർ</type>
-			<type type="chinese" key="calendar">ചൈനീസ് കലണ്ടർ</type>
-			<type type="coptic" key="calendar" draft="contributed">കോപ്റ്റിക് കലണ്ടർ</type>
-			<type type="dangi" key="calendar">ഡാംഗി കലണ്ടർ</type>
-			<type type="deva" key="numbers">ദേവനാഗരി അക്കങ്ങൾ</type>
-			<type type="dictionary" key="collation" draft="contributed">നിഘണ്ടു അടുക്കൽ ക്രമം</type>
-			<type type="ducet" key="collation">സ്ഥിര യൂണികോഡ് അടുക്കൽ ക്രമം</type>
-			<type type="ethi" key="numbers">എത്യോപിക് സംഖ്യകൾ</type>
-			<type type="ethiopic" key="calendar">എത്യോപിക് കലണ്ടർ</type>
-			<type type="ethiopic-amete-alem" key="calendar" draft="contributed">എത്യോപിക് അമെതെ അലെം കലണ്ടർ</type>
-			<type type="finance" key="numbers">സാമ്പത്തിക സംഖ്യകൾ</type>
-			<type type="fullwide" key="numbers">പൂർണ വലുപ്പമുള്ള സംഖ്യകൾ</type>
-			<type type="gb2312han" key="collation">ലളിതമായ ചൈനീസ് ക്രമീകരണം - ജീബി2312</type>
-			<type type="geor" key="numbers">ജോർജിയൻ സംഖ്യകൾ</type>
-			<type type="gregorian" key="calendar">ഇംഗ്ലീഷ് കലണ്ടർ</type>
-			<type type="grek" key="numbers">ഗ്രീക്ക് സംഖ്യകൾ</type>
-			<type type="greklow" key="numbers">ഗ്രീക്ക് ചെറിയക്ഷര സംഖ്യകൾ</type>
-			<type type="gujr" key="numbers">ഗുജറാത്തി അക്കങ്ങൾ</type>
-			<type type="guru" key="numbers">ഗുരുമുഖി അക്കങ്ങൾ</type>
-			<type type="hanidec" key="numbers">ചൈനീസ് ദശാംശ സംഖ്യകൾ</type>
-			<type type="hans" key="numbers">ലളിതവൽക്കരിച്ച ചൈനീസ് സംഖ്യകൾ</type>
-			<type type="hansfin" key="numbers">ലളിതവൽക്കരിച്ച ചൈനീസ് ധനകാര്യ സംഖ്യകൾ</type>
-			<type type="hant" key="numbers">പരമ്പരാഗത ചൈനീസ് സംഖ്യകൾ</type>
-			<type type="hantfin" key="numbers">പരമ്പരാഗത ചൈനീസ് ധനകാര്യ സംഖ്യകൾ</type>
-			<type type="hebr" key="numbers">ഹീബ്രു സംഖ്യകൾ</type>
-			<type type="hebrew" key="calendar">ഹീബ്രൂ കലണ്ടർ</type>
-			<type type="identical" key="colStrength">എല്ലാം അടുക്കുക</type>
-			<type type="indian" key="calendar">ശകവർഷ കലണ്ടർ</type>
-			<type type="islamic" key="calendar">ഇസ്‌ലാമിക് കലണ്ടർ</type>
-			<type type="islamic-civil" key="calendar">ഇസ്ലാം-സിവിൽ കലണ്ടർ</type>
-			<type type="iso8601" key="calendar">ഐഎസ്ഓ 8601 കലണ്ടർ</type>
-			<type type="japanese" key="calendar">ജാപ്പനീസ് കലണ്ടർ</type>
-			<type type="jpan" key="numbers">ജപ്പാനീസ് സംഖ്യകൾ</type>
-			<type type="jpanfin" key="numbers">ജപ്പാനീസ് ധനകാര്യ സംഖ്യകൾ</type>
-			<type type="khmr" key="numbers">ഖമേർ അക്കങ്ങൾ</type>
-			<type type="knda" key="numbers">കന്നഡ സംഖ്യകൾ</type>
-			<type type="laoo" key="numbers">ലാവോ അക്കങ്ങൾ</type>
-			<type type="latn" key="numbers">പടിഞ്ഞാറൻ അക്കങ്ങൾ</type>
-			<type type="lower" key="colCaseFirst">ആദ്യം ചെറിയക്ഷര പ്രകാരം അടുക്കുക</type>
-			<type type="mlym" key="numbers">മലയാളം അക്കങ്ങൾ</type>
-			<type type="mong" key="numbers" draft="contributed">മംഗോളിയൻ സംഖ്യകൾ</type>
-			<type type="mymr" key="numbers">മ്യാൻമാർ അക്കങ്ങൾ</type>
-			<type type="native" key="numbers">സ്വാഭാവിക ഡിജിറ്റുകൾ</type>
-			<type type="no" key="colBackwards">സാധാരണ ആക്‌സന്റുകൾ പ്രകാരം അടുക്കുക</type>
-			<type type="no" key="colCaseFirst">സാധാരണ കേസ് ക്രമത്തിൽ അടുക്കുക</type>
-			<type type="no" key="colCaseLevel">കേസ് സെൻസിറ്റീവ് പ്രകാരം അടുക്കുക</type>
-			<type type="no" key="colHiraganaQuaternary">Kana പ്രത്യേകം അടുക്കുക</type>
-			<type type="no" key="colNormalization">സാധാരണരീതി ഇല്ലാതെ അടുക്കുക</type>
-			<type type="no" key="colNumeric">ഓരോ ഡിജിറ്റുകൾ പ്രകാരം അടുക്കുക</type>
-			<type type="non-ignorable" key="colAlternate">ചിഹ്നങ്ങൾ അടുക്കുക</type>
-			<type type="orya" key="numbers">ഒഡിയ അക്കങ്ങൾ</type>
-			<type type="persian" key="calendar">പേർഷ്യൻ കലണ്ടർ</type>
-			<type type="phonebook" key="collation">ഫോൺബുക്കിലെ ക്രമീകരണം</type>
-			<type type="phonetic" key="collation">സ്വരസൂചക അടുക്കൽ ക്രമം</type>
-			<type type="pinyin" key="collation">പിൻ‌യിൻ ക്രമീകരണം</type>
-			<type type="primary" key="colStrength">അടിസ്ഥാന അക്ഷരങ്ങൾ മാത്രം അടുക്കുക</type>
-			<type type="quaternary" key="colStrength">ആക്‌സന്റുകൾ/കേസ്/വീതി/Kana അടുക്കുക</type>
-			<type type="reformed" key="collation" draft="contributed">നവീകരിച്ച അടുക്കൽ ക്രമം</type>
-			<type type="roc" key="calendar">ചൈനീസ് കലണ്ടർ</type>
-			<type type="roman" key="numbers">റോമൻ സംഖ്യകൾ</type>
-			<type type="romanlow" key="numbers">റോമൻ ചെറിയ സംഖ്യകൾ</type>
-			<type type="search" key="collation">പൊതുവായ ആവശ്യത്തിനുള്ള തിരയൽ</type>
-			<type type="searchjl" key="collation">ഹാംഗൽ പ്രാരംഭ വ്യഞ്ജനാക്ഷരം പ്രകാരം തിരയുക</type>
-			<type type="secondary" key="colStrength">ആക്‌സന്റുകൾ അടുക്കുക</type>
-			<type type="shifted" key="colAlternate">അവഗണിക്കൽ ചിഹ്നങ്ങൾ അടുക്കുക</type>
-			<type type="standard" key="collation">സാധാരണ അടുക്കൽ ക്രമം</type>
-			<type type="stroke" key="collation">സ്റ്റ്രോക്ക് ക്രമീകരണം</type>
-			<type type="taml" key="numbers">പഴയ തമിഴ് സംഖ്യകൾ</type>
-			<type type="tamldec" key="numbers">തമിഴ് അക്കങ്ങൾ</type>
-			<type type="telu" key="numbers">തെലുങ്ക് സംഖ്യകൾ</type>
-			<type type="tertiary" key="colStrength">ആക്‌സന്റുകൾ/കേസ്/വീതി അടുക്കുക</type>
-			<type type="thai" key="numbers">തായി അക്കങ്ങൾ</type>
-			<type type="tibt" key="numbers">ടിബറ്റൻ അക്കങ്ങൾ</type>
-			<type type="traditional" key="collation">പരമ്പരാഗത ക്രമീകരണം</type>
-			<type type="traditional" key="numbers">സാധാരണയായി ഉപയോഗിച്ചുവരുന്ന സംഖ്യകൾ</type>
-			<type type="unihan" key="collation" draft="contributed">റാഡിക്കൽ-സ്ട്രോക്ക് അടുക്കൽ ക്രമം</type>
-			<type type="upper" key="colCaseFirst">ആദ്യം വലിയക്ഷരപ്രകാരം അടുക്കുക</type>
-			<type type="vaii" key="numbers">വായ് സംഖ്യകൾ</type>
-			<type type="yes" key="colBackwards">ആക്‌സന്റുകളെ വിപരീതക്രമത്തിൽ അടുക്കുക</type>
-			<type type="yes" key="colCaseLevel">കേസ് സെൻസിറ്റീവ് അടുക്കുക</type>
-			<type type="yes" key="colHiraganaQuaternary">Kana വ്യത്യസ്‌തമായി അടുക്കുക</type>
-			<type type="yes" key="colNormalization">സാധാരണ യൂണിക്കോഡ് അടുക്കുക</type>
-			<type type="yes" key="colNumeric">ഡിജിറ്റുകളെ സംഖ്യാപരമായി അടുക്കുക</type>
+			<type key="calendar" type="buddhist">ബുദ്ധമതകലണ്ടർ</type>
+			<type key="calendar" type="chinese">ചൈനീസ് കലണ്ടർ</type>
+			<type key="calendar" type="coptic" draft="contributed">കോപ്റ്റിക് കലണ്ടർ</type>
+			<type key="calendar" type="dangi">ഡാംഗി കലണ്ടർ</type>
+			<type key="calendar" type="ethiopic">എത്യോപിക് കലണ്ടർ</type>
+			<type key="calendar" type="ethiopic-amete-alem" draft="contributed">എത്യോപിക് അമെതെ അലെം കലണ്ടർ</type>
+			<type key="calendar" type="gregorian">ഇംഗ്ലീഷ് കലണ്ടർ</type>
+			<type key="calendar" type="hebrew">ഹീബ്രൂ കലണ്ടർ</type>
+			<type key="calendar" type="indian">ശകവർഷ കലണ്ടർ</type>
+			<type key="calendar" type="islamic">ഇസ്‌ലാമിക് കലണ്ടർ</type>
+			<type key="calendar" type="islamic-civil">ഇസ്ലാം-സിവിൽ കലണ്ടർ</type>
+			<type key="calendar" type="iso8601">ഐഎസ്ഓ 8601 കലണ്ടർ</type>
+			<type key="calendar" type="japanese">ജാപ്പനീസ് കലണ്ടർ</type>
+			<type key="calendar" type="persian">പേർഷ്യൻ കലണ്ടർ</type>
+			<type key="calendar" type="roc">മിംഗ്വോ കലണ്ടർ</type>
+			<type key="colAlternate" type="non-ignorable">ചിഹ്നങ്ങൾ അടുക്കുക</type>
+			<type key="colAlternate" type="shifted">അവഗണിക്കൽ ചിഹ്നങ്ങൾ അടുക്കുക</type>
+			<type key="colBackwards" type="no">സാധാരണ ആക്‌സന്റുകൾ പ്രകാരം അടുക്കുക</type>
+			<type key="colBackwards" type="yes">ആക്‌സന്റുകളെ വിപരീതക്രമത്തിൽ അടുക്കുക</type>
+			<type key="colCaseFirst" type="lower">ആദ്യം ചെറിയക്ഷര പ്രകാരം അടുക്കുക</type>
+			<type key="colCaseFirst" type="no">സാധാരണ കേസ് ക്രമത്തിൽ അടുക്കുക</type>
+			<type key="colCaseFirst" type="upper">ആദ്യം വലിയക്ഷരപ്രകാരം അടുക്കുക</type>
+			<type key="colCaseLevel" type="no">കേസ് സെൻസിറ്റീവ് പ്രകാരം അടുക്കുക</type>
+			<type key="colCaseLevel" type="yes">കേസ് സെൻസിറ്റീവ് അടുക്കുക</type>
+			<type key="colHiraganaQuaternary" type="no">Kana പ്രത്യേകം അടുക്കുക</type>
+			<type key="colHiraganaQuaternary" type="yes">Kana വ്യത്യസ്‌തമായി അടുക്കുക</type>
+			<type key="collation" type="big5han">പരമ്പരാഗത ചൈനീസ് ക്രമീകരണം - ബിഗ്5</type>
+			<type key="collation" type="dictionary" draft="contributed">നിഘണ്ടു അടുക്കൽ ക്രമം</type>
+			<type key="collation" type="ducet">സ്ഥിര യൂണികോഡ് അടുക്കൽ ക്രമം</type>
+			<type key="collation" type="gb2312han">ലളിതമായ ചൈനീസ് ക്രമീകരണം - ജീബി2312</type>
+			<type key="collation" type="phonebook">ഫോൺബുക്കിലെ ക്രമീകരണം</type>
+			<type key="collation" type="phonetic">സ്വരസൂചക അടുക്കൽ ക്രമം</type>
+			<type key="collation" type="pinyin">പിൻ‌യിൻ ക്രമീകരണം</type>
+			<type key="collation" type="reformed" draft="contributed">നവീകരിച്ച അടുക്കൽ ക്രമം</type>
+			<type key="collation" type="search">പൊതുവായ ആവശ്യത്തിനുള്ള തിരയൽ</type>
+			<type key="collation" type="searchjl">ഹാംഗൽ പ്രാരംഭ വ്യഞ്ജനാക്ഷരം പ്രകാരം തിരയുക</type>
+			<type key="collation" type="standard">സാധാരണ അടുക്കൽ ക്രമം</type>
+			<type key="collation" type="stroke">സ്റ്റ്രോക്ക് ക്രമീകരണം</type>
+			<type key="collation" type="traditional">പരമ്പരാഗത ക്രമീകരണം</type>
+			<type key="collation" type="unihan" draft="contributed">റാഡിക്കൽ-സ്ട്രോക്ക് അടുക്കൽ ക്രമം</type>
+			<type key="colNormalization" type="no">സാധാരണരീതി ഇല്ലാതെ അടുക്കുക</type>
+			<type key="colNormalization" type="yes">സാധാരണ യൂണിക്കോഡ് അടുക്കുക</type>
+			<type key="colNumeric" type="no">ഓരോ ഡിജിറ്റുകൾ പ്രകാരം അടുക്കുക</type>
+			<type key="colNumeric" type="yes">ഡിജിറ്റുകളെ സംഖ്യാപരമായി അടുക്കുക</type>
+			<type key="colStrength" type="identical">എല്ലാം അടുക്കുക</type>
+			<type key="colStrength" type="primary">അടിസ്ഥാന അക്ഷരങ്ങൾ മാത്രം അടുക്കുക</type>
+			<type key="colStrength" type="quaternary">ആക്‌സന്റുകൾ/കേസ്/വീതി/Kana അടുക്കുക</type>
+			<type key="colStrength" type="secondary">ആക്‌സന്റുകൾ അടുക്കുക</type>
+			<type key="colStrength" type="tertiary">ആക്‌സന്റുകൾ/കേസ്/വീതി അടുക്കുക</type>
+			<type key="hc" type="h11">12 മണിക്കൂർ സംവിധാനം (0–11)</type>
+			<type key="hc" type="h12">12 മണിക്കൂർ സംവിധാനം (1–12)</type>
+			<type key="hc" type="h23">24 മണിക്കൂർ സംവിധാനം (0–23)</type>
+			<type key="hc" type="h24">24 മണിക്കൂർ സംവിധാനം (1–24)</type>
+			<type key="lb" type="loose">അനിയന്ത്രിത രേഖാ വിഭാജി ശൈലി</type>
+			<type key="lb" type="normal">സാധാരണ രേഖാ വിഭാജി ശൈലി</type>
+			<type key="lb" type="strict">നിയന്ത്രിത രേഖാ വിഭാജി ശൈലി</type>
+			<type key="ms" type="metric">മെട്രിക്ക് സംവിധാനം</type>
+			<type key="ms" type="uksystem">ബ്രിട്ടീഷ് അളക്കൽ സംവിധാനം</type>
+			<type key="ms" type="ussystem">യുഎസ് അളക്കൽ സംവിധാനം</type>
+			<type key="numbers" type="arab">അറബിക്-ഇന്ത്യ അക്കങ്ങൾ</type>
+			<type key="numbers" type="arabext">വിപുലീകൃത അറബി-ഭാരതീയ അക്കങ്ങൾ</type>
+			<type key="numbers" type="armn">അർമേനിയൻ സംഖ്യകൾ</type>
+			<type key="numbers" type="armnlow">അർമേനിയൻ ചെറിയ സംഖ്യകൾ</type>
+			<type key="numbers" type="beng">ബംഗാളി അക്കങ്ങൾ</type>
+			<type key="numbers" type="deva">ദേവനാഗരി അക്കങ്ങൾ</type>
+			<type key="numbers" type="ethi">എത്യോപിക് സംഖ്യകൾ</type>
+			<type key="numbers" type="finance">സാമ്പത്തിക സംഖ്യകൾ</type>
+			<type key="numbers" type="fullwide">പൂർണ വലുപ്പമുള്ള സംഖ്യകൾ</type>
+			<type key="numbers" type="geor">ജോർജിയൻ സംഖ്യകൾ</type>
+			<type key="numbers" type="grek">ഗ്രീക്ക് സംഖ്യകൾ</type>
+			<type key="numbers" type="greklow">ഗ്രീക്ക് ചെറിയക്ഷര സംഖ്യകൾ</type>
+			<type key="numbers" type="gujr">ഗുജറാത്തി അക്കങ്ങൾ</type>
+			<type key="numbers" type="guru">ഗുരുമുഖി അക്കങ്ങൾ</type>
+			<type key="numbers" type="hanidec">ചൈനീസ് ദശാംശ സംഖ്യകൾ</type>
+			<type key="numbers" type="hans">ലളിതവൽക്കരിച്ച ചൈനീസ് സംഖ്യകൾ</type>
+			<type key="numbers" type="hansfin">ലളിതവൽക്കരിച്ച ചൈനീസ് ധനകാര്യ സംഖ്യകൾ</type>
+			<type key="numbers" type="hant">പരമ്പരാഗത ചൈനീസ് സംഖ്യകൾ</type>
+			<type key="numbers" type="hantfin">പരമ്പരാഗത ചൈനീസ് ധനകാര്യ സംഖ്യകൾ</type>
+			<type key="numbers" type="hebr">ഹീബ്രു സംഖ്യകൾ</type>
+			<type key="numbers" type="jpan">ജാപ്പനീസ് സംഖ്യകൾ</type>
+			<type key="numbers" type="jpanfin">ജാപ്പനീസ് ധനകാര്യ സംഖ്യകൾ</type>
+			<type key="numbers" type="khmr">ഖമേർ അക്കങ്ങൾ</type>
+			<type key="numbers" type="knda">കന്നഡ സംഖ്യകൾ</type>
+			<type key="numbers" type="laoo">ലാവോ അക്കങ്ങൾ</type>
+			<type key="numbers" type="latn">പടിഞ്ഞാറൻ അക്കങ്ങൾ</type>
+			<type key="numbers" type="mlym">മലയാളം അക്കങ്ങൾ</type>
+			<type key="numbers" type="mong" draft="contributed">മംഗോളിയൻ സംഖ്യകൾ</type>
+			<type key="numbers" type="mymr">മ്യാൻമാർ അക്കങ്ങൾ</type>
+			<type key="numbers" type="native">സ്വാഭാവിക ഡിജിറ്റുകൾ</type>
+			<type key="numbers" type="orya">ഒഡിയ അക്കങ്ങൾ</type>
+			<type key="numbers" type="roman">റോമൻ സംഖ്യകൾ</type>
+			<type key="numbers" type="romanlow">റോമൻ ചെറിയ സംഖ്യകൾ</type>
+			<type key="numbers" type="taml">പരമ്പരാഗത തമിഴ് സംഖ്യകൾ</type>
+			<type key="numbers" type="tamldec">തമിഴ് അക്കങ്ങൾ</type>
+			<type key="numbers" type="telu">തെലുങ്ക് സംഖ്യകൾ</type>
+			<type key="numbers" type="thai">തായി അക്കങ്ങൾ</type>
+			<type key="numbers" type="tibt">ടിബറ്റൻ അക്കങ്ങൾ</type>
+			<type key="numbers" type="traditional">സാധാരണയായി ഉപയോഗിച്ചുവരുന്ന സംഖ്യകൾ</type>
+			<type key="numbers" type="vaii">വായ് സംഖ്യകൾ</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN">BGN</transformName>
@@ -1114,7 +1129,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<measurementSystemNames>
 			<measurementSystemName type="metric">മെട്രിക്ക്</measurementSystemName>
 			<measurementSystemName type="UK">യുകെ</measurementSystemName>
-			<measurementSystemName type="US">യുഎസ്സ്</measurementSystemName>
+			<measurementSystemName type="US">യുഎസ്</measurementSystemName>
 		</measurementSystemNames>
 		<codePatterns>
 			<codePattern type="language">ഭാഷ: {0}</codePattern>
@@ -1123,7 +1138,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</codePatterns>
 	</localeDisplayNames>
 	<characters>
-		<exemplarCharacters>[\u200C\u200D ഃ അ ആ ഇ ഈ ഉ ഊ ഋ ൠ ഌ ൡ എ ഏ ഐ ഒ ഓ ഔ ക ൿ ഖ ഗ ഘ ങ ച ഛ ജ ഝ ഞ ട ഠ ഡ ഢ ണ ൺ ത ഥ ദ ധ ന ൻ പ ഫ ബ ഭ മ ം യ ര ർ ല ൽ വ ശ ഷ സ ഹ ള ൾ ഴ റ ാ ി ീ \u0D41 \u0D42 \u0D43 െ േ ൈ ൊ ോ ൗ ൌ \u0D4D]</exemplarCharacters>
+		<exemplarCharacters>[\u200C\u200D ഃ അ ആ ഇ ഈ ഉ ഊ ഋ ൠ ഌ ൡ എ ഏ ഐ ഒ ഓ ഔ ക ൿ ഖ ഗ ഘ ങ ച ഛ ജ ഝ ഞ ട ഠ ഡ ഢ ണ ൺ ത ഥ ദ ധ ന ൻ പ ഫ ബ ഭ മ ം യ ര ർ ല ൽ വ ശ ഷ സ ഹ ള ൾ ഴ റ ാ ി ീ \u0D41 \u0D42 \u0D43 െ േ ൈ ൊ ോ ൌ ൗ \u0D4D]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[]</exemplarCharacters>
 		<exemplarCharacters type="index" draft="contributed">[അ ആ ഇ ഈ ഉ ഊ ഋ എ ഏ ഐ ഒ ഓ ഔ ക ഖ ഗ ഘ ങ ച ഛ ജ ഝ ഞ ട ഠ ഡ ഢ ണ ത ഥ ദ ധ ന പ ഫ ബ ഭ മ യ ര ല വ ശ ഷ സ ഹ ള ഴ റ]</exemplarCharacters>
 		<exemplarCharacters type="punctuation" draft="contributed">[\- , ; \: ! ? . ' ‘ ’ &quot; “ ” ( ) \[ \] \{ \}]</exemplarCharacters>
@@ -1189,6 +1204,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">G y</dateFormatItem>
 						<dateFormatItem id="GyMMM">G y MMM</dateFormatItem>
@@ -1214,7 +1230,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyy">G y</dateFormatItem>
 						<dateFormatItem id="yyyyM">GGGGG y-MM</dateFormatItem>
 						<dateFormatItem id="yyyyMd">G d/M/y</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">G d-M-y, E</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">G d/M/y, E</dateFormatItem>
 						<dateFormatItem id="yyyyMM">MM-y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMM">G y MMM</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">G y MMM d</dateFormatItem>
@@ -1283,7 +1299,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">MMM d, E – MMM d, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL–LLLL</greatestDifference>
+							<greatestDifference id="M">MMMM – MMMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
 							<greatestDifference id="y">G y–y</greatestDifference>
@@ -1362,7 +1378,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="5">മേയ്</month>
 							<month type="6">ജൂൺ</month>
 							<month type="7">ജൂലൈ</month>
-							<month type="8">ആഗസ്റ്റ്</month>
+							<month type="8">ഓഗസ്റ്റ്</month>
 							<month type="9">സെപ്റ്റംബർ</month>
 							<month type="10">ഒക്‌ടോബർ</month>
 							<month type="11">നവംബർ</month>
@@ -1386,14 +1402,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">ജ</month>
-							<month type="2">ഫ</month>
+							<month type="2">ഫെ</month>
 							<month type="3">മാ</month>
 							<month type="4">ഏ</month>
-							<month type="5">മേ</month>
+							<month type="5">മെ</month>
 							<month type="6">ജൂ</month>
 							<month type="7">ജൂ</month>
 							<month type="8">ഓ</month>
-							<month type="9">സ</month>
+							<month type="9">സെ</month>
 							<month type="10">ഒ</month>
 							<month type="11">ന</month>
 							<month type="12">ഡി</month>
@@ -1406,7 +1422,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="5">മേയ്</month>
 							<month type="6">ജൂൺ</month>
 							<month type="7">ജൂലൈ</month>
-							<month type="8">ആഗസ്റ്റ്</month>
+							<month type="8">ഓഗസ്റ്റ്</month>
 							<month type="9">സെപ്റ്റംബർ</month>
 							<month type="10">ഒക്‌ടോബർ</month>
 							<month type="11">നവംബർ</month>
@@ -1428,9 +1444,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dayWidth type="narrow">
 							<day type="sun">ഞ</day>
 							<day type="mon">തി</day>
-							<day type="tue">ച</day>
+							<day type="tue">ചൊ</day>
 							<day type="wed">ബു</day>
-							<day type="thu">വ</day>
+							<day type="thu">വ്യാ</day>
 							<day type="fri">വെ</day>
 							<day type="sat">ശ</day>
 						</dayWidth>
@@ -1464,11 +1480,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<day type="sat">ശനി</day>
 						</dayWidth>
 						<dayWidth type="narrow">
-							<day type="sun">ഞ</day>
+							<day type="sun">ഞാ</day>
 							<day type="mon">തി</day>
-							<day type="tue">ച</day>
+							<day type="tue">ചൊ</day>
 							<day type="wed">ബു</day>
-							<day type="thu">വ</day>
+							<day type="thu">വ്യാ</day>
 							<day type="fri">വെ</day>
 							<day type="sat">ശ</day>
 						</dayWidth>
@@ -1536,15 +1552,85 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">അർദ്ധരാത്രി</dayPeriod>
 							<dayPeriod type="am">AM</dayPeriod>
 							<dayPeriod type="noon">ഉച്ച</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">പുലർച്ചെ</dayPeriod>
+							<dayPeriod type="morning2">രാവിലെ</dayPeriod>
+							<dayPeriod type="afternoon1">ഉച്ചയ്ക്ക്</dayPeriod>
+							<dayPeriod type="afternoon2">ഉച്ചതിരിഞ്ഞ്</dayPeriod>
+							<dayPeriod type="evening1">വൈകുന്നേരം</dayPeriod>
+							<dayPeriod type="evening2">സന്ധ്യ</dayPeriod>
+							<dayPeriod type="night1">രാത്രി</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">അ</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">ഉച്ച</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">പു</dayPeriod>
+							<dayPeriod type="morning2">രാ</dayPeriod>
+							<dayPeriod type="afternoon1">ഉച്ചയ്</dayPeriod>
+							<dayPeriod type="afternoon2">ഉച്ചതി</dayPeriod>
+							<dayPeriod type="evening1">വൈ</dayPeriod>
+							<dayPeriod type="evening2">സ</dayPeriod>
+							<dayPeriod type="night1">രാ</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">അർദ്ധരാത്രി</dayPeriod>
 							<dayPeriod type="am">AM</dayPeriod>
 							<dayPeriod type="noon">ഉച്ച</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">പുലർച്ചെ</dayPeriod>
+							<dayPeriod type="morning2">രാവിലെ</dayPeriod>
+							<dayPeriod type="afternoon1">ഉച്ചയ്ക്ക്</dayPeriod>
+							<dayPeriod type="afternoon2">ഉച്ചതിരിഞ്ഞ്</dayPeriod>
+							<dayPeriod type="evening1">വൈകുന്നേരം</dayPeriod>
+							<dayPeriod type="evening2">സന്ധ്യ</dayPeriod>
+							<dayPeriod type="night1">രാത്രി</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">അർദ്ധരാത്രി</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">ഉച്ച</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">പുലർച്ചെ</dayPeriod>
+							<dayPeriod type="morning2">രാവിലെ</dayPeriod>
+							<dayPeriod type="afternoon1">ഉച്ചയ്ക്ക്</dayPeriod>
+							<dayPeriod type="afternoon2">ഉച്ചതിരിഞ്ഞ്</dayPeriod>
+							<dayPeriod type="evening1">വൈകുന്നേരം</dayPeriod>
+							<dayPeriod type="evening2">സന്ധ്യ</dayPeriod>
+							<dayPeriod type="night1">രാത്രി</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">അർദ്ധരാത്രി</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">ഉച്ച</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">പുലർച്ചെ</dayPeriod>
+							<dayPeriod type="morning2">രാവിലെ</dayPeriod>
+							<dayPeriod type="afternoon1">ഉച്ചയ്ക്ക്</dayPeriod>
+							<dayPeriod type="afternoon2">ഉച്ചതിരിഞ്ഞ്</dayPeriod>
+							<dayPeriod type="evening1">വൈകുന്നേരം</dayPeriod>
+							<dayPeriod type="evening2">സന്ധ്യ</dayPeriod>
+							<dayPeriod type="night1">രാത്രി</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">അർദ്ധരാത്രി</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">ഉച്ച</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">പുലർച്ചെ</dayPeriod>
+							<dayPeriod type="morning2">രാവിലെ</dayPeriod>
+							<dayPeriod type="afternoon1">ഉച്ചയ്ക്ക്</dayPeriod>
+							<dayPeriod type="afternoon2">ഉച്ചതിരിഞ്ഞ്</dayPeriod>
+							<dayPeriod type="evening1">വൈകുന്നേരം</dayPeriod>
+							<dayPeriod type="evening2">സന്ധ്യ</dayPeriod>
+							<dayPeriod type="night1">രാത്രി</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1580,7 +1666,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
+							<pattern>d/M/yy</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -1645,10 +1731,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">MM-dd</dateFormatItem>
-						<dateFormatItem id="MEd">M/d, E</dateFormatItem>
-						<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
+						<dateFormatItem id="Md">d/M</dateFormatItem>
+						<dateFormatItem id="MEd">d/M, E</dateFormatItem>
+						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
 						<dateFormatItem id="MMMEd">MMM d, E</dateFormatItem>
@@ -1719,10 +1809,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">d/M, E – d/M, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM–MMM</greatestDifference>
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MMM d–d</greatestDifference>
+							<greatestDifference id="d">MMM d – d</greatestDifference>
 							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
@@ -1730,7 +1820,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">MMM d, E – MMM d, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL–LLLL</greatestDifference>
+							<greatestDifference id="M">MMMM – MMMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
 							<greatestDifference id="y">y – y</greatestDifference>
@@ -1873,6 +1963,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>വർഷം</displayName>
+				<relative type="-1">കഴിഞ്ഞ വർഷം</relative>
+				<relative type="0">ഈ വർ‌ഷം</relative>
+				<relative type="1">അടുത്തവർഷം</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} വർഷത്തിൽ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} വർഷത്തിൽ</relativeTimePattern>
@@ -1884,6 +1977,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>വർഷം</displayName>
+				<relative type="-1">കഴിഞ്ഞ വർഷം</relative>
+				<relative type="0">ഈ വർ‌ഷം</relative>
+				<relative type="1">അടുത്തവർഷം</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} വർഷത്തിൽ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} വർഷത്തിൽ</relativeTimePattern>
@@ -1942,6 +2038,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>മാസം</displayName>
+				<relative type="-1">കഴിഞ്ഞ മാസം</relative>
+				<relative type="0">ഈ മാസം</relative>
+				<relative type="1">അടുത്ത മാസം</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} മാസത്തിൽ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} മാസത്തിൽ</relativeTimePattern>
@@ -1953,6 +2052,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>മാസം</displayName>
+				<relative type="-1">കഴിഞ്ഞ മാസം</relative>
+				<relative type="0">ഈ മാസം</relative>
+				<relative type="1">അടുത്ത മാസം</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} മാസത്തിൽ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} മാസത്തിൽ</relativeTimePattern>
@@ -1978,6 +2080,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>ആഴ്ച</displayName>
+				<relative type="-1">കഴിഞ്ഞ ആഴ്‌ച</relative>
+				<relative type="0">ഈ ആഴ്ച</relative>
+				<relative type="1">അടുത്ത ആഴ്ച</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ആഴ്ചയിൽ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ആഴ്ചയിൽ</relativeTimePattern>
@@ -1989,6 +2094,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>ആഴ്ച</displayName>
+				<relative type="-1">കഴിഞ്ഞ ആഴ്‌ച</relative>
+				<relative type="0">ഈ ആഴ്ച</relative>
+				<relative type="1">അടുത്ത ആഴ്ച</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ആഴ്ചയിൽ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ആഴ്ചയിൽ</relativeTimePattern>
@@ -2016,6 +2124,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>ദിവസം</displayName>
+				<relative type="-2">മിനിഞ്ഞാന്ന്</relative>
+				<relative type="-1">ഇന്നലെ</relative>
+				<relative type="0">ഇന്ന്</relative>
+				<relative type="1">നാളെ</relative>
+				<relative type="2">മറ്റന്നാൾ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ദിവസത്തിൽ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ദിവസത്തിൽ</relativeTimePattern>
@@ -2027,6 +2140,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>ദിവസം</displayName>
+				<relative type="-2">മിനിഞ്ഞാന്ന്</relative>
+				<relative type="-1">ഇന്നലെ</relative>
+				<relative type="0">ഇന്ന്</relative>
+				<relative type="1">നാളെ</relative>
+				<relative type="2">മറ്റന്നാൾ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ദിവസത്തിൽ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ദിവസത്തിൽ</relativeTimePattern>
@@ -2045,14 +2163,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">അടുത്ത ഞായറാഴ്ച</relative>
 			</field>
 			<field type="sun-short">
-				<relative type="-1">കഴിഞ്ഞ ഞായറാഴ്ച</relative>
-				<relative type="0">ഈ ഞായറാഴ്ച</relative>
-				<relative type="1">അടുത്ത ഞായറാഴ്ച</relative>
+				<relative type="-1">കഴിഞ്ഞ ഞായർ</relative>
+				<relative type="0">ഈ ഞായർ</relative>
+				<relative type="1">അടുത്ത ഞായർ</relative>
 			</field>
 			<field type="sun-narrow">
-				<relative type="-1">കഴിഞ്ഞ ഞായറാഴ്ച</relative>
-				<relative type="0">ഈ ഞായറാഴ്ച</relative>
-				<relative type="1">അടുത്ത ഞായറാഴ്ച</relative>
+				<relative type="-1">കഴിഞ്ഞ ഞായർ</relative>
+				<relative type="0">ഈ ഞായർ</relative>
+				<relative type="1">അടുത്ത ഞായർ</relative>
 			</field>
 			<field type="mon">
 				<relative type="-1">കഴിഞ്ഞ തിങ്കളാഴ്ച</relative>
@@ -2060,14 +2178,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">അടുത്ത തിങ്കളാഴ്ച</relative>
 			</field>
 			<field type="mon-short">
-				<relative type="-1">കഴിഞ്ഞ തിങ്കളാഴ്ച</relative>
-				<relative type="0">ഈ തിങ്കളാഴ്ച</relative>
-				<relative type="1">അടുത്ത തിങ്കളാഴ്ച</relative>
+				<relative type="-1">കഴിഞ്ഞ തിങ്കൾ</relative>
+				<relative type="0">ഈ തിങ്കൾ</relative>
+				<relative type="1">അടുത്ത തിങ്കൾ</relative>
 			</field>
 			<field type="mon-narrow">
-				<relative type="-1">കഴിഞ്ഞ തിങ്കളാഴ്ച</relative>
-				<relative type="0">ഈ തിങ്കളാഴ്ച</relative>
-				<relative type="1">അടുത്ത തിങ്കളാഴ്ച</relative>
+				<relative type="-1">കഴിഞ്ഞ തിങ്കൾ</relative>
+				<relative type="0">ഈ തിങ്കൾ</relative>
+				<relative type="1">അടുത്ത തിങ്കൾ</relative>
 			</field>
 			<field type="tue">
 				<relative type="-1">കഴിഞ്ഞ ചൊവാഴ്ച</relative>
@@ -2075,14 +2193,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">അടുത്ത ചൊവാഴ്ച</relative>
 			</field>
 			<field type="tue-short">
-				<relative type="-1">കഴിഞ്ഞ ചൊവാഴ്ച</relative>
-				<relative type="0">ഈ ചൊവാഴ്ച</relative>
-				<relative type="1">അടുത്ത ചൊവാഴ്ച</relative>
+				<relative type="-1">കഴിഞ്ഞ ചൊവ്വ</relative>
+				<relative type="0">ഈ ചൊവ്വ</relative>
+				<relative type="1">അടുത്ത ചൊവ്വ</relative>
 			</field>
 			<field type="tue-narrow">
-				<relative type="-1">കഴിഞ്ഞ ചൊവാഴ്ച</relative>
-				<relative type="0">ഈ ചൊവാഴ്ച</relative>
-				<relative type="1">അടുത്ത ചൊവാഴ്ച</relative>
+				<relative type="-1">കഴിഞ്ഞ ചൊവ്വ</relative>
+				<relative type="0">ഈ ചൊവ്വ</relative>
+				<relative type="1">അടുത്ത ചൊവ്വ</relative>
 			</field>
 			<field type="wed">
 				<relative type="-1">കഴിഞ്ഞ ബുധനാഴ്ച</relative>
@@ -2090,14 +2208,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">അടുത്ത ബുധനാഴ്ച</relative>
 			</field>
 			<field type="wed-short">
-				<relative type="-1">കഴിഞ്ഞ ബുധനാഴ്ച</relative>
-				<relative type="0">ഈ ബുധനാഴ്ച</relative>
-				<relative type="1">അടുത്ത ബുധനാഴ്ച</relative>
+				<relative type="-1">കഴിഞ്ഞ ബുധൻ</relative>
+				<relative type="0">ഈ ബുധൻ</relative>
+				<relative type="1">അടുത്ത ബുധൻ</relative>
 			</field>
 			<field type="wed-narrow">
-				<relative type="-1">കഴിഞ്ഞ ബുധനാഴ്ച</relative>
-				<relative type="0">ഈ ബുധനാഴ്ച</relative>
-				<relative type="1">അടുത്ത ബുധനാഴ്ച</relative>
+				<relative type="-1">കഴിഞ്ഞ ബുധൻ</relative>
+				<relative type="0">ഈ ബുധൻ</relative>
+				<relative type="1">അടുത്ത ബുധൻ</relative>
 			</field>
 			<field type="thu">
 				<relative type="-1">കഴിഞ്ഞ വ്യാഴാഴ്ച</relative>
@@ -2105,14 +2223,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">അടുത്ത വ്യാഴാഴ്ച</relative>
 			</field>
 			<field type="thu-short">
-				<relative type="-1">കഴിഞ്ഞ വ്യാഴാഴ്ച</relative>
-				<relative type="0">ഈ വ്യാഴാഴ്ച</relative>
-				<relative type="1">അടുത്ത വ്യാഴാഴ്ച</relative>
+				<relative type="-1">കഴിഞ്ഞ വ്യാഴം</relative>
+				<relative type="0">ഈ വ്യാഴം</relative>
+				<relative type="1">അടുത്ത വ്യാഴം</relative>
 			</field>
 			<field type="thu-narrow">
-				<relative type="-1">കഴിഞ്ഞ വ്യാഴാഴ്ച</relative>
-				<relative type="0">ഈ വ്യാഴാഴ്ച</relative>
-				<relative type="1">അടുത്ത വ്യാഴാഴ്ച</relative>
+				<relative type="-1">കഴിഞ്ഞ വ്യാഴം</relative>
+				<relative type="0">ഈ വ്യാഴം</relative>
+				<relative type="1">അടുത്ത വ്യാഴം</relative>
 			</field>
 			<field type="fri">
 				<relative type="-1">കഴിഞ്ഞ വെള്ളിയാഴ്ച</relative>
@@ -2120,14 +2238,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">അടുത്ത വെള്ളിയാഴ്ച</relative>
 			</field>
 			<field type="fri-short">
-				<relative type="-1">കഴിഞ്ഞ വെള്ളിയാഴ്ച</relative>
-				<relative type="0">ഈ വെള്ളിയാഴ്ച</relative>
-				<relative type="1">അടുത്ത വെള്ളിയാഴ്ച</relative>
+				<relative type="-1">കഴിഞ്ഞ വെള്ളി</relative>
+				<relative type="0">ഈ വെള്ളി</relative>
+				<relative type="1">അടുത്ത വെള്ളി</relative>
 			</field>
 			<field type="fri-narrow">
-				<relative type="-1">കഴിഞ്ഞ വെള്ളിയാഴ്ച</relative>
-				<relative type="0">ഈ വെള്ളിയാഴ്ച</relative>
-				<relative type="1">അടുത്ത വെള്ളിയാഴ്ച</relative>
+				<relative type="-1">കഴിഞ്ഞ വെള്ളി</relative>
+				<relative type="0">ഈ വെള്ളി</relative>
+				<relative type="1">അടുത്ത വെള്ളി</relative>
 			</field>
 			<field type="sat">
 				<relative type="-1">കഴിഞ്ഞ ശനിയാഴ്ച</relative>
@@ -2135,17 +2253,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">അടുത്ത ശനിയാഴ്ച</relative>
 			</field>
 			<field type="sat-short">
-				<relative type="-1">കഴിഞ്ഞ ശനിയാഴ്ച</relative>
-				<relative type="0">ഈ ശനിയാഴ്ച</relative>
-				<relative type="1">അടുത്ത ശനിയാഴ്ച</relative>
+				<relative type="-1">കഴിഞ്ഞ ശനി</relative>
+				<relative type="0">ഈ ശനി</relative>
+				<relative type="1">അടുത്ത ശനി</relative>
 			</field>
 			<field type="sat-narrow">
-				<relative type="-1">കഴിഞ്ഞ ശനിയാഴ്ച</relative>
-				<relative type="0">ഈ ശനിയാഴ്ച</relative>
-				<relative type="1">അടുത്ത ശനിയാഴ്ച</relative>
+				<relative type="-1">കഴിഞ്ഞ ശനി</relative>
+				<relative type="0">ഈ ശനി</relative>
+				<relative type="1">അടുത്ത ശനി</relative>
 			</field>
 			<field type="dayperiod">
-				<displayName>am/pm</displayName>
+				<displayName>AM/PM</displayName>
 			</field>
 			<field type="hour">
 				<displayName>മണിക്കൂർ</displayName>
@@ -2181,7 +2299,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="minute">
-				<displayName>മിനിട്ട്</displayName>
+				<displayName>മിനിറ്റ്</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} മിനിറ്റിൽ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} മിനിറ്റിൽ</relativeTimePattern>
@@ -2192,7 +2310,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="minute-short">
-				<displayName>മിനിറ്റ്</displayName>
+				<displayName>മി.</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} മിനിറ്റിൽ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} മിനിറ്റിൽ</relativeTimePattern>
@@ -2203,7 +2321,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="minute-narrow">
-				<displayName>മിനിറ്റ്</displayName>
+				<displayName>മി.</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} മിനിറ്റിൽ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} മിനിറ്റിൽ</relativeTimePattern>
@@ -2214,7 +2332,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="second">
-				<displayName>സെക്കൻറ്</displayName>
+				<displayName>സെക്കൻഡ്</displayName>
 				<relative type="0">ഇപ്പോൾ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} സെക്കൻഡിൽ</relativeTimePattern>
@@ -2226,7 +2344,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="second-short">
-				<displayName>സെക്കൻഡ്</displayName>
+				<displayName>സെ.</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} സെക്കൻഡിൽ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} സെക്കൻഡിൽ</relativeTimePattern>
@@ -2237,7 +2355,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="second-narrow">
-				<displayName>സെക്കൻഡ്</displayName>
+				<displayName>സെ.</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} സെക്കൻഡിൽ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} സെക്കൻഡിൽ</relativeTimePattern>
@@ -2248,7 +2366,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>മേഖല</displayName>
+				<displayName>സമയ മേഖല</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
@@ -2257,7 +2375,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<gmtZeroFormat>ജിഎംടി</gmtZeroFormat>
 			<regionFormat>{0} സമയം</regionFormat>
 			<regionFormat type="daylight">{0} ഡേലൈറ്റ് സമയം</regionFormat>
-			<regionFormat type="standard">{0} സ്റ്റാന്റേഡ് സമയം</regionFormat>
+			<regionFormat type="standard">{0} സ്റ്റാൻഡേർഡ് സമയം</regionFormat>
 			<fallbackFormat>{1} ({0})</fallbackFormat>
 			<zone type="Etc/Unknown">
 				<exemplarCity>അജ്ഞാത നഗരം</exemplarCity>
@@ -2353,7 +2471,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>ബ്യൂണസ് ഐറിസ്</exemplarCity>
 			</zone>
 			<zone type="Pacific/Pago_Pago">
-				<exemplarCity>പാഗോ പോഗോ</exemplarCity>
+				<exemplarCity>പാഗോ പാഗോ</exemplarCity>
 			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>വിയന്ന</exemplarCity>
@@ -2605,7 +2723,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>ബംഗുയി</exemplarCity>
 			</zone>
 			<zone type="Africa/Brazzaville">
-				<exemplarCity>ബ്രാസവിൽ</exemplarCity>
+				<exemplarCity>ബ്രാസവില്ലി</exemplarCity>
 			</zone>
 			<zone type="Europe/Zurich">
 				<exemplarCity>സൂറിച്ച്</exemplarCity>
@@ -3004,7 +3122,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>മാർട്ടിനിക്</exemplarCity>
 			</zone>
 			<zone type="Africa/Nouakchott">
-				<exemplarCity>നൌവാൿഷോട്ട്</exemplarCity>
+				<exemplarCity>നൗവാക്‌ഷോട്ട്</exemplarCity>
 			</zone>
 			<zone type="America/Montserrat">
 				<exemplarCity>മൊണ്ടെസരത്ത്</exemplarCity>
@@ -3121,11 +3239,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>മാർക്യുസാസ്</exemplarCity>
 			</zone>
 			<zone type="Pacific/Gambier">
-				<exemplarCity>ഗാന്പിയർ</exemplarCity>
+				<exemplarCity>ഗാമ്പിയർ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>പോർട്ട് മോഴ്‌സ്ബൈ</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>ബോഗൺവില്ലെ</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>മനില</exemplarCity>
 			</zone>
@@ -3136,7 +3257,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>വാർസോ</exemplarCity>
 			</zone>
 			<zone type="America/Miquelon">
-				<exemplarCity>മൈക്വെലൻ‌</exemplarCity>
+				<exemplarCity>മിക്വലൻ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Pitcairn">
 				<exemplarCity>പിറ്റ്കയിൻ‌</exemplarCity>
@@ -3210,6 +3331,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>ഇർകസ്ക്</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>ചീറ്റ</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>യാക്കറ്റ്സ്‌ക്</exemplarCity>
 			</zone>
@@ -3228,6 +3352,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>മഗഡാൻ</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>സ്രിഡ്‌നികോളിംസ്ക്</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>കാംചട്ക</exemplarCity>
 			</zone>
@@ -3241,7 +3368,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>റിയാദ്</exemplarCity>
 			</zone>
 			<zone type="Pacific/Guadalcanal">
-				<exemplarCity>ഗ്വാഡോ കനാൽ</exemplarCity>
+				<exemplarCity>ഗ്വാഡൽകനാൽ</exemplarCity>
 			</zone>
 			<zone type="Indian/Mahe">
 				<exemplarCity>മാഹി</exemplarCity>
@@ -3268,7 +3395,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>ബ്രാട്ടിസ്‍ലാവ</exemplarCity>
 			</zone>
 			<zone type="Africa/Freetown">
-				<exemplarCity>ഫ്രീടൌൺ‌</exemplarCity>
+				<exemplarCity>ഫ്രീടൗൺ</exemplarCity>
 			</zone>
 			<zone type="Europe/San_Marino">
 				<exemplarCity>സാൻ മാരിനോ</exemplarCity>
@@ -3566,7 +3693,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>വടക്കെ അമേരിക്കൻ സെൻട്രൽ സമയം</generic>
 					<standard>വടക്കെ അമേരിക്കൻ സെൻട്രൽ സ്റ്റാൻഡേർഡ് സമയം</standard>
-					<daylight>വടക്കെ അമേരിക്കൻ സെൻട്രൽ പകൽ സമയം</daylight>
+					<daylight>വടക്കെ അമേരിക്കൻ സെൻട്രൽ ഡേലൈറ്റ് സമയം</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Eastern">
@@ -3580,14 +3707,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>വടക്കെ അമേരിക്കൻ മൌണ്ടൻ സമയം</generic>
 					<standard>വടക്കെ അമേരിക്കൻ മൗണ്ടൻ സ്റ്റാൻഡേർഡ് സമയം</standard>
-					<daylight>വടക്കെ അമേരിക്കൻ മൌണ്ടൻ പകൽ സമയം</daylight>
+					<daylight>വടക്കെ അമേരിക്കൻ മൗണ്ടൻ ഡേലൈറ്റ് സമയം</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
 					<generic>വടക്കെ അമേരിക്കൻ പസഫിക് സമയം</generic>
 					<standard>വടക്കെ അമേരിക്കൻ പസഫിക് സ്റ്റാൻഡേർഡ് സമയം</standard>
-					<daylight>വടക്കെ അമേരിക്കൻ പസഫിക് പകൽ സമയം</daylight>
+					<daylight>വടക്കെ അമേരിക്കൻ പസഫിക് ഡേലൈറ്റ് സമയം</daylight>
 				</long>
 			</metazone>
 			<metazone type="Anadyr">
@@ -3622,7 +3749,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>അറേബ്യൻ സമയം</generic>
 					<standard>അറേബ്യൻ സ്റ്റാൻഡേർഡ് സമയം</standard>
-					<daylight>അറേബ്യൻ പകൽ സമയം</daylight>
+					<daylight>അറേബ്യൻ ഡേലൈറ്റ് സമയം</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina">
@@ -3648,16 +3775,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Atlantic">
 				<long>
-					<generic>അറ്റ്ലാൻറിക് സമയം</generic>
-					<standard>അറ്റ്ലാൻറിക് സ്റ്റാൻഡേർഡ് സമയം</standard>
-					<daylight>അറ്റ്ലാൻറിക് പകൽ സമയം</daylight>
+					<generic>അറ്റ്‌ലാന്റിക് സമയം</generic>
+					<standard>അറ്റ്‌ലാന്റിക് സ്റ്റാൻഡേർഡ് സമയം</standard>
+					<daylight>അറ്റ്‌ലാന്റിക് ഡേലൈറ്റ് സമയം</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
 					<generic>സെൻട്രൽ ഓസ്ട്രേലിയ സമയം</generic>
 					<standard>ഓസ്ട്രേലിയൻ സെൻട്രൽ സ്റ്റാൻഡേർഡ് സമയം</standard>
-					<daylight>ഓസ്ട്രേലിയൻ സെൻട്രൽ പകൽ സമയം</daylight>
+					<daylight>ഓസ്ട്രേലിയൻ സെൻട്രൽ ഡേലൈറ്റ് സമയം</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_CentralWestern">
@@ -3754,7 +3881,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>ചൈന സമയം</generic>
 					<standard>ചൈന സ്റ്റാൻഡേർഡ് സമയം</standard>
-					<daylight>ചൈന പകൽ സമയം</daylight>
+					<daylight>ചൈന ഡേലൈറ്റ് സമയം</daylight>
 				</long>
 			</metazone>
 			<metazone type="Choibalsan">
@@ -3826,19 +3953,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>സെൻട്രൽ യൂറോപ്യൻ സമയം</generic>
 					<standard>സെൻട്രൽ യൂറോപ്യൻ സ്റ്റാൻഡേർഡ് സമയം</standard>
-					<daylight>സെൻട്രൽ യൂറോപ്യൻ വേനൽക്കാല സമയം</daylight>
+					<daylight>സെൻട്രൽ യൂറോപ്യൻ ഗ്രീഷ്മകാല സമയം</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Eastern">
 				<long>
 					<generic>കിഴക്കൻ യൂറോപ്യൻ സമയം</generic>
 					<standard>കിഴക്കൻ യൂറോപ്യൻ സ്റ്റാൻഡേർഡ് സമയം</standard>
-					<daylight>കിഴക്കൻ യൂറോപ്യൻ വേനൽക്കാല സമയം</daylight>
+					<daylight>കിഴക്കൻ യൂറോപ്യൻ ഗ്രീഷ്മകാല സമയം</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
 				<long>
-					<standard>ഇനിയും-കിഴക്കൻ യൂറോപ്യൻ സമയം</standard>
+					<standard>കിഴക്കേയറ്റത്തെ യൂറോപ്യൻ സമയം</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
@@ -3986,7 +4113,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>ഇറാൻ സമയം</generic>
 					<standard>ഇറാൻ സ്റ്റാൻഡേർഡ് സമയം</standard>
-					<daylight>ഇറാൻ പകൽ സമയം</daylight>
+					<daylight>ഇറാൻ ഡേലൈറ്റ് സമയം</daylight>
 				</long>
 			</metazone>
 			<metazone type="Irkutsk">
@@ -4007,7 +4134,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>ജപ്പാൻ സമയം</generic>
 					<standard>ജപ്പാൻ സ്റ്റാൻഡേർഡ് സമയം</standard>
-					<daylight>ജപ്പാൻ പകൽ സമയം</daylight>
+					<daylight>ജപ്പാൻ ഡേലൈറ്റ് സമയം</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kamchatka">
@@ -4031,7 +4158,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>കൊറിയൻ സമയം</generic>
 					<standard>കൊറിയൻ സ്റ്റാൻഡേർഡ് സമയം</standard>
-					<daylight>കൊറിയൻ പകൽ സമയം</daylight>
+					<daylight>കൊറിയൻ ഡേലൈറ്റ് സമയം</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kosrae">
@@ -4065,7 +4192,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>ലോർഡ് ഹോവ് സമയം</generic>
 					<standard>ലോർഡ് ഹോവ് സ്റ്റാൻഡേർഡ് സമയം</standard>
-					<daylight>ലോർഡ് ഹോവ് പകൽ സമയം</daylight>
+					<daylight>ലോർഡ് ഹോവ് ഡേലൈറ്റ് സമയം</daylight>
 				</long>
 			</metazone>
 			<metazone type="Macau">
@@ -4129,7 +4256,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>മെക്സിക്കൻ പസഫിക് സമയം</generic>
-					<standard>മെക്സിക്കൻ പസഫിക് സാധാരണ സമയം</standard>
+					<standard>മെക്‌സിക്കൻ പസഫിക് സ്റ്റാൻഡേർഡ് സമയം</standard>
 					<daylight>മെക്സിക്കൻ പസഫിക് ഡേലൈറ്റ് സമയം</daylight>
 				</long>
 			</metazone>
@@ -4178,9 +4305,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Newfoundland">
 				<long>
-					<generic>ന്യൂഫൗണ്ട്ലാൻഡ് സമയം</generic>
-					<standard>ന്യൂഫൗണ്ട്ലാൻഡ് സ്റ്റാൻഡേർഡ് സമയം</standard>
-					<daylight>ന്യൂഫൗണ്ട്ലാൻഡ് ഡേലൈറ്റ് സമയം</daylight>
+					<generic>ന്യൂഫൗണ്ട്‌ലാന്റ് സമയം</generic>
+					<standard>ന്യൂഫൗണ്ട്‌ലാന്റ് സ്റ്റാൻഡേർഡ് സമയം</standard>
+					<daylight>ന്യൂഫൗണ്ട്‌ലാന്റ് ഡേലൈറ്റ് സമയം</daylight>
 				</long>
 			</metazone>
 			<metazone type="Niue">
@@ -4356,7 +4483,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>തായ്‌പെയ് സമയം</generic>
 					<standard>തായ്‌പെയ് സ്റ്റാൻഡേർഡ് സമയം</standard>
-					<daylight>തായ്‌പെയ് പകൽ സമയം</daylight>
+					<daylight>തായ്‌പെയ് ഡേലൈറ്റ് സമയം</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tajikistan">
@@ -4582,6 +4709,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">¤0K</pattern>
+					<pattern type="1000" count="other">¤0K</pattern>
+					<pattern type="10000" count="one">¤00K</pattern>
+					<pattern type="10000" count="other">¤00K</pattern>
+					<pattern type="100000" count="one">¤000K</pattern>
+					<pattern type="100000" count="other">¤000K</pattern>
+					<pattern type="1000000" count="one">¤0M</pattern>
+					<pattern type="1000000" count="other">¤0M</pattern>
+					<pattern type="10000000" count="one">¤00M</pattern>
+					<pattern type="10000000" count="other">¤00M</pattern>
+					<pattern type="100000000" count="one">¤000M</pattern>
+					<pattern type="100000000" count="other">¤000M</pattern>
+					<pattern type="1000000000" count="one">¤0B</pattern>
+					<pattern type="1000000000" count="other">¤0B</pattern>
+					<pattern type="10000000000" count="one">¤00B</pattern>
+					<pattern type="10000000000" count="other">¤00B</pattern>
+					<pattern type="100000000000" count="one">¤000B</pattern>
+					<pattern type="100000000000" count="other">¤000B</pattern>
+					<pattern type="1000000000000" count="one">¤0T</pattern>
+					<pattern type="1000000000000" count="other">¤0T</pattern>
+					<pattern type="10000000000000" count="one">¤00T</pattern>
+					<pattern type="10000000000000" count="other">¤00T</pattern>
+					<pattern type="100000000000000" count="one">¤000T</pattern>
+					<pattern type="100000000000000" count="other">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4631,6 +4786,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">അംഗോളൻ ക്വാൻസ</displayName>
 				<displayName count="other">അംഗോളൻ ക്വാൻസ</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>അംഗോളൻ ‍ക്വാൻസ (1977–1990)</displayName>
@@ -4703,6 +4859,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ബോസ്‌നിയ-ഹെർസഗോവിന കൺവേർട്ടബിൾ മാർക്ക്</displayName>
 				<displayName count="other">ബോസ്‌നിയ-ഹെർസഗോവിന കൺവേർട്ടബിൾ മാർക്ക്</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>ബാർബഡോസ് ഡോളർ</displayName>
@@ -4775,6 +4932,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ബൊളീവിയൻ ബൊളിവിയാനോ</displayName>
 				<displayName count="other">ബൊളീവിയൻ ബൊളിവിയാനോ</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOP">
 				<displayName>ബൊളീവിയൻ പെയ്സോ</displayName>
@@ -4841,6 +4999,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ബോട്‌സ്വാനൻ പ്യുല</displayName>
 				<displayName count="other">ബോട്‌സ്വാനൻ പ്യുല</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>ബെലാറഷ്യൻ ന്യൂ റൂബിൾ (1994–1999)</displayName>
@@ -4882,7 +5041,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="CHF">
 				<displayName>സ്വിസ് ഫ്രാങ്ക്</displayName>
 				<displayName count="one">സ്വിസ് ഫ്രാങ്ക്</displayName>
-				<displayName count="other">സ്വിസ് ഫ്രാങ്ക്സ്</displayName>
+				<displayName count="other">സ്വിസ് ഫ്രാങ്ക്</displayName>
 				<symbol>CHF</symbol>
 			</currency>
 			<currency type="CHW">
@@ -4943,6 +5102,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ക്യൂബൻ കൺവേർട്ടബിൾ പെസോ</displayName>
 				<displayName count="other">ക്യൂബൻ കൺവേർട്ടബിൾ പെസോ</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>ക്യൂബൻ പെസോ</displayName>
@@ -4967,6 +5127,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ചെക്ക് റിപ്പബ്ലിക് കൊരുണ</displayName>
 				<displayName count="other">ചെക്ക് റിപ്പബ്ലിക് കൊരുണ</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>കിഴക്കൻ ജർമൻ ഓസ്റ്റ്മാർക്ക്</displayName>
@@ -4989,6 +5150,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ഡാനിഷ് ക്രോണെ</displayName>
 				<displayName count="other">ഡാനിഷ് ക്രോണെ</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>ഡൊമിനിക്കൻ പെസോ</displayName>
@@ -5023,6 +5185,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ഈജിപ്‌ഷ്യൻ പൗണ്ട്</displayName>
 				<displayName count="other">ഈജിപ്‌ഷ്യൻ പൗണ്ട്</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>എറിത്രിയൻ നക്ഫ</displayName>
@@ -5075,6 +5238,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ഫാക്ക്‌ലാന്റ് ദ്വീപുകളുടെ പൗണ്ട്</displayName>
 				<displayName count="other">ഫാക്ക്‌ലാന്റ് ദ്വീപുകളുടെ പൗണ്ട്</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>ഫ്രാങ്ക്</displayName>
@@ -5082,9 +5246,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">ഫ്രെഞ്ച് ഫ്രാങ്ക്സ്</displayName>
 			</currency>
 			<currency type="GBP">
-				<displayName>ബ്രിട്ടീഷ് പൗണ്ട് സ്‌റ്റെർലിംഗ്</displayName>
-				<displayName count="one">ബ്രിട്ടീഷ് പൗണ്ട് സ്‌റ്റെർലിംഗ്</displayName>
-				<displayName count="other">ബ്രിട്ടീഷ് പൗണ്ട് സ്‌റ്റെർലിംഗ്</displayName>
+				<displayName>ബ്രിട്ടീഷ് പൗണ്ട്</displayName>
+				<displayName count="one">ബ്രിട്ടീഷ് പൗണ്ട്</displayName>
+				<displayName count="other">ബ്രിട്ടീഷ് പൗണ്ട്</displayName>
 				<symbol>£</symbol>
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
@@ -5098,6 +5262,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ജോർജ്ജിയൻ ലാറി</displayName>
 				<displayName count="other">ജോർജ്ജിയൻ ലാറി</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>ഘാന കെഡി (1979–2007)</displayName>
@@ -5128,6 +5293,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ഗിനിയൻ ഫ്രാങ്ക്</displayName>
 				<displayName count="other">ഗിനിയൻ ഫ്രാങ്ക്</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>ഗിനിയ സൈലി</displayName>
@@ -5149,6 +5315,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ഗ്വാട്ടിമാലൻ ക്വെറ്റ്‌സൽ</displayName>
 				<displayName count="other">ഗ്വാട്ടിമാലൻ ക്വെറ്റ്‌സൽ</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>പോർച്ചുഗീസ് ഗിനി എസ്ക്യൂഡോ</displayName>
@@ -5179,6 +5346,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ഹോണ്ടുറൻ ലെംപിറ</displayName>
 				<displayName count="other">ഹോണ്ടുറൻ ലെംപിറ</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>ക്രൊയേഷ്യൻ ദിനാർ</displayName>
@@ -5190,6 +5358,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ക്രൊയേഷൻ ക്യുന</displayName>
 				<displayName count="other">ക്രൊയേഷൻ ക്യുന</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>ഹെയ്‌തിയൻ ഗൂർഡ്</displayName>
@@ -5202,12 +5371,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ഹംഗേറിയൻ ഫോറിന്റ്</displayName>
 				<displayName count="other">ഹംഗേറിയൻ ഫോറിന്റ്</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>ഇന്തോനേഷ്യൻ റുപിയ</displayName>
 				<displayName count="one">ഇന്തോനേഷ്യൻ റുപിയ</displayName>
 				<displayName count="other">ഇന്തോനേഷ്യൻ റുപിയ</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>ഐറിഷ് പൌണ്ട്</displayName>
@@ -5250,6 +5421,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ഐസ്‌ലാൻഡിക് ക്രോണ</displayName>
 				<displayName count="other">ഐസ്‌ലാൻഡിക് ക്രോണ</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>ഇറ്റാലിയൻ ലിറ</displayName>
@@ -5270,7 +5442,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>JOD</symbol>
 			</currency>
 			<currency type="JPY">
-				<displayName>ജപ്പാനീസ് യെൻ</displayName>
+				<displayName>ജാപ്പനീസ് യെൻ</displayName>
 				<displayName count="one">ജാപ്പനീസ് യെൻ</displayName>
 				<displayName count="other">ജാപ്പനീസ് യെൻ</displayName>
 				<symbol>¥</symbol>
@@ -5300,12 +5472,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">കൊമോറിയൻ ഫ്രാങ്ക്</displayName>
 				<displayName count="other">കൊമോറിയൻ ഫ്രാങ്ക്</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>ഉത്തര കൊറിയൻ വോൺ</displayName>
 				<displayName count="one">ഉത്തര കൊറിയൻ വോൺ</displayName>
 				<displayName count="other">ഉത്തര കൊറിയൻ വോൺ</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>ദക്ഷിണ കൊറിയൻ വോൺ</displayName>
@@ -5346,12 +5520,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ലെബനീസ് പൗണ്ട്</displayName>
 				<displayName count="other">ലെബനീസ് പൗണ്ട്</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>ശ്രീലങ്കൻ റുപ്പീ</displayName>
 				<displayName count="one">ശ്രീലങ്കൻ റുപ്പീ</displayName>
 				<displayName count="other">ശ്രീലങ്കൻ റുപ്പീ</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>ലൈബീരിയൻ ഡോളർ</displayName>
@@ -5428,6 +5604,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">മഡഗാസി ഏരിയറി</displayName>
 				<displayName count="other">മഡഗാസി ഏരിയറി</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>മഡഗാസ്കർ ഫ്രാങ്ക്</displayName>
@@ -5446,6 +5623,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">മ്യാൻമാർ ക്യാട്</displayName>
 				<displayName count="other">മ്യാൻമാർ ക്യാട്</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>മംഗോളിയൻ തുഗ്രിക്</displayName>
@@ -5477,6 +5655,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">മൗറീഷ്യൻ റുപ്പീ</displayName>
 				<displayName count="other">മൗറീഷ്യൻ റുപ്പീ</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>മാൽദീവിയൻ റുഫിയ</displayName>
@@ -5512,6 +5691,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">മലേഷ്യൻ റിംഗിറ്റ്</displayName>
 				<displayName count="other">മലേഷ്യൻ റിംഗിറ്റ്</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>മൊസാന്പിക്ക് എസ്ക്യുഡോ</displayName>
@@ -5547,6 +5727,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">നിക്കരാഗ്വൻ കോർഡോബ</displayName>
 				<displayName count="other">നിക്കരാഗ്വൻ കോർഡോബ</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>നെതർലൻഡ്സ് ഗിൽഡർ</displayName>
@@ -5558,12 +5739,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">നോർവീജിയൻ ക്രോണെ</displayName>
 				<displayName count="other">നോർവീജിയൻ ക്രോണെ</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>നേപ്പാളീസ് റുപ്പീ</displayName>
 				<displayName count="one">നേപ്പാളീസ് റുപ്പീ</displayName>
 				<displayName count="other">നേപ്പാളീസ് റുപ്പീ</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>ന്യൂസിലാന്റ് ഡോളർ</displayName>
@@ -5618,12 +5801,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">പാക്കിസ്ഥാനി റുപ്പീ</displayName>
 				<displayName count="other">പാക്കിസ്ഥാനി റുപ്പീ</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>പോളിഷ് സ്ലോട്ടി</displayName>
 				<displayName count="one">പോളിഷ് സ്ലോട്ടി</displayName>
 				<displayName count="other">പോളിഷ് സ്ലോട്ടി</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>പോളിഷ് സ്ലോട്ടി (1950–1995)</displayName>
@@ -5667,6 +5852,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">റഷ്യൻ റൂബിൾ</displayName>
 				<displayName count="other">റഷ്യൻ റൂബിൾ</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>റഷ്യൻ റൂബിൾ (1991–1998)</displayName>
@@ -5676,6 +5862,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">റുവാണ്ടൻ ഫ്രാങ്ക്</displayName>
 				<displayName count="other">റുവാണ്ടൻ ഫ്രാങ്ക്</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>സൗദി റിയാൽ</displayName>
@@ -5713,6 +5900,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">സ്വീഡിഷ് ക്രോണ</displayName>
 				<displayName count="other">സ്വീഡിഷ് ക്രോണ</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>സിംഗപ്പൂർ ഡോളർ</displayName>
@@ -5726,6 +5914,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">സെന്റ് ഹെലീന പൗണ്ട്</displayName>
 				<displayName count="other">സെന്റ് ഹെലീന പൗണ്ട്</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>സ്ലൊവേനിയ റ്റോളർ</displayName>
@@ -5767,6 +5956,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">സാവോ ടോമി ആൻഡ് പ്രിൻസിപെ ഡോബ്ര</displayName>
 				<displayName count="other">സാവോ ടോമി ആൻഡ് പ്രിൻസിപെ ഡോബ്ര</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>സോവിയറ്റ് റൂബിൾ</displayName>
@@ -5779,6 +5969,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">സിറിയൻ പൗണ്ട്</displayName>
 				<displayName count="other">സിറിയൻ പൗണ്ട്</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>സ്വാസി ലിലാംഗനി</displayName>
@@ -5791,6 +5982,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">തായ് ബട്ട്</displayName>
 				<displayName count="other">തായ് ബട്ട്</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>താജിക്കിസ്ഥാൻ റൂബിൾ</displayName>
@@ -5825,6 +6017,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ടോംഗൻ പാംഗ</displayName>
 				<displayName count="other">ടോംഗൻ പാംഗ</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>തിമോർ എസ്ക്യൂഡോ</displayName>
@@ -5842,6 +6035,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">ടർക്കിഷ് ലിറ</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>ട്രിനിഡാഡ് അന്റ് ടുബാഗോ ഡോളർ</displayName>
@@ -5886,8 +6080,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="USD">
 				<displayName>യു.എസ്. ഡോളർ</displayName>
-				<displayName count="one">യു.എസ് ഡോളർ</displayName>
-				<displayName count="other">യു.എസ് ഡോളർ</displayName>
+				<displayName count="one">യു.എസ്. ഡോളർ</displayName>
+				<displayName count="other">യു.എസ്. ഡോളർ</displayName>
 				<symbol>$</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -5932,6 +6126,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">വെനിസ്വേലൻ ബൊളീവർ</displayName>
 				<displayName count="other">വെനിസ്വേലൻ ബൊളീവർ</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>വിയറ്റ്നാമീസ് ഡോങ്</displayName>
@@ -5953,9 +6148,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>WST</symbol>
 			</currency>
 			<currency type="XAF">
-				<displayName>CFA ഫ്രാങ്ക് BEAC</displayName>
-				<displayName count="one">CFA ഫ്രാങ്ക് BEAC</displayName>
-				<displayName count="other">CFA ഫ്രാങ്ക് BEAC</displayName>
+				<displayName>മദ്ധ്യ ആഫ്രിക്കൻ [CFA] ഫ്രാങ്ക്</displayName>
+				<displayName count="one">മദ്ധ്യ ആഫ്രിക്കൻ [CFA] ഫ്രാങ്ക്</displayName>
+				<displayName count="other">മദ്ധ്യ ആഫ്രിക്കൻ [CFA] ഫ്രാങ്ക്</displayName>
 				<symbol>FCFA</symbol>
 			</currency>
 			<currency type="XAG">
@@ -5993,6 +6188,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">കിഴക്കൻ കരീബിയൻ ഡോളർ</displayName>
 				<displayName count="other">കിഴക്കൻ കരീബിയൻ ഡോളർ</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>സ്പെഷ്യൽ ഡ്രോയിംഗ് റൈറ്റ്സ്</displayName>
@@ -6015,9 +6211,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">ഫ്രെഞ്ച് UIC-ഫ്രാങ്ക്സ്</displayName>
 			</currency>
 			<currency type="XOF">
-				<displayName>CFA ഫ്രാങ്ക് BCEAO</displayName>
-				<displayName count="one">CFA ഫ്രാങ്ക് BCEAO</displayName>
-				<displayName count="other">CFA ഫ്രാങ്ക് BCEAO</displayName>
+				<displayName>പശ്ചിമ ആഫ്രിക്കൻ [CFA] ഫ്രാങ്ക്</displayName>
+				<displayName count="one">പശ്ചിമ ആഫ്രിക്കൻ [CFA] ഫ്രാങ്ക്</displayName>
+				<displayName count="other">പശ്ചിമ ആഫ്രിക്കൻ [CFA] ഫ്രാങ്ക്</displayName>
 				<symbol>CFA</symbol>
 			</currency>
 			<currency type="XPD">
@@ -6087,6 +6283,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ദക്ഷിണാഫ്രിക്കൻ റാൻഡ്</displayName>
 				<displayName count="other">ദക്ഷിണാഫ്രിക്കൻ റാൻഡ്</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>സാംബിയൻ ക്വാച (1968–2012)</displayName>
@@ -6098,6 +6295,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">സാംബിയൻ ക്വാച്ച</displayName>
 				<displayName count="other">സാംബിയൻ ക്വാച്ച</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>സൈറിയൻ ന്യൂ സൈർ</displayName>
@@ -6135,6 +6333,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} മീറ്റർ/സെക്കൻഡ്²</unitPattern>
 				<unitPattern count="other">{0} മീറ്റർ/സെക്കൻഡ്²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>റെവല്യൂഷൻ</displayName>
+				<unitPattern count="one">{0} റെവല്യൂഷൻ</unitPattern>
+				<unitPattern count="other">{0} റെവല്യൂഷൻ</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>റേഡിയൻ</displayName>
+				<unitPattern count="one">{0} റേഡിയൻ</unitPattern>
+				<unitPattern count="other">{0} റേഡിയൻ</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>ഡിഗ്രി</displayName>
+				<unitPattern count="one">{0} ഡിഗ്രി</unitPattern>
+				<unitPattern count="other">{0} ഡിഗ്രി</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>ആർക്ക്മിനിറ്റ്</displayName>
 				<unitPattern count="one">{0} ആർക്ക്മിനിറ്റ്</unitPattern>
@@ -6145,30 +6358,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ആർക്ക്സെക്കൻഡ്</unitPattern>
 				<unitPattern count="other">{0} ആർക്ക്സെക്കൻഡ്</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>ഡിഗ്രി</displayName>
-				<unitPattern count="one">{0} ഡിഗ്രി</unitPattern>
-				<unitPattern count="other">{0} ഡിഗ്രി</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>റേഡിയൻ</displayName>
-				<unitPattern count="one">{0} റേഡിയൻ</unitPattern>
-				<unitPattern count="other">{0} റേഡിയൻ</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ഏക്കർ</displayName>
-				<unitPattern count="one">{0} ഏക്കർ</unitPattern>
-				<unitPattern count="other">{0} ഏക്കർ</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>ചതുരശ്ര കിലോമീറ്റർ</displayName>
+				<unitPattern count="one">{0} ചതുരശ്ര കിലോമീറ്റർ</unitPattern>
+				<unitPattern count="other">{0} ചതുരശ്ര കിലോമീറ്റർ</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ഹെക്‌ടർ</displayName>
 				<unitPattern count="one">{0} ഹെക്‌ടർ</unitPattern>
 				<unitPattern count="other">{0} ഹെക്‌ടർ</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>ചതുരശ്ര മീറ്റർ</displayName>
+				<unitPattern count="one">{0} ചതുരശ്ര മീറ്റർ</unitPattern>
+				<unitPattern count="other">{0} ചതുരശ്ര മീറ്റർ</unitPattern>
+				<perUnitPattern>{0} / ചതുരശ്ര മീറ്റർ</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>ചതുരശ്ര സെന്റിമീറ്റർ</displayName>
 				<unitPattern count="one">{0} ചതുരശ്ര സെന്റിമീറ്റർ</unitPattern>
 				<unitPattern count="other">{0} ചതുരശ്ര സെന്റിമീറ്റർ</unitPattern>
+				<perUnitPattern>{0} / ചതുരശ്ര സെന്റിമീറ്റർ</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>ചതുരശ്ര മൈൽ</displayName>
+				<unitPattern count="one">{0} ചതുരശ്ര മൈൽ</unitPattern>
+				<unitPattern count="other">{0} ചതുരശ്ര മൈൽ</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ഏക്കർ</displayName>
+				<unitPattern count="one">{0} ഏക്കർ</unitPattern>
+				<unitPattern count="other">{0} ഏക്കർ</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>ചതുരശ്ര വാര</displayName>
+				<unitPattern count="one">{0} ചതുരശ്ര വാര</unitPattern>
+				<unitPattern count="other">{0} ചതുരശ്ര വാര</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ചതുരശ്ര അടി</displayName>
@@ -6179,91 +6404,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ചതുരശ്ര ഇഞ്ച്</displayName>
 				<unitPattern count="one">{0} ചതുരശ്ര ഇഞ്ച്</unitPattern>
 				<unitPattern count="other">{0} ചതുരശ്ര ഇഞ്ച്</unitPattern>
+				<perUnitPattern>{0} / ചതുരശ്ര ഇഞ്ച്</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>ചതുരശ്ര കിലോമീറ്റർ</displayName>
-				<unitPattern count="one">{0} ചതുരശ്ര കിലോമീറ്റർ</unitPattern>
-				<unitPattern count="other">{0} ചതുരശ്ര കിലോമീറ്റർ</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>ചതുരശ്ര മീറ്റർ</displayName>
-				<unitPattern count="one">{0} ചതുരശ്ര മീറ്റർ</unitPattern>
-				<unitPattern count="other">{0} ചതുരശ്ര മീറ്റർ</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>ചതുരശ്ര മൈൽ</displayName>
-				<unitPattern count="one">{0} ചതുരശ്ര മൈൽ</unitPattern>
-				<unitPattern count="other">{0} ചതുരശ്ര മൈൽ</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>ചതുരശ്ര വാര</displayName>
-				<unitPattern count="one">{0} ചതുരശ്ര വാര</unitPattern>
-				<unitPattern count="other">{0} ചതുരശ്ര വാര</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>ക്യാരറ്റ്</displayName>
+				<unitPattern count="one">{0} ക്യാരറ്റ്</unitPattern>
+				<unitPattern count="other">{0} ക്യാരറ്റ്</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ലിറ്റർ/കിലോമീറ്റർ</displayName>
 				<unitPattern count="one">{0} ലിറ്റർ/കിലോമീറ്റർ</unitPattern>
 				<unitPattern count="other">{0} ലിറ്റർ/കിലോമീറ്റർ</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ലിറ്റർ/100 കിലോമീറ്റർ</displayName>
+				<unitPattern count="one">{0} ലിറ്റർ/100 കിലോമീറ്റർ</unitPattern>
+				<unitPattern count="other">{0} ലിറ്റർ/100 കിലോമീറ്റർ</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>മൈൽ/ഗാലൻ</displayName>
 				<unitPattern count="one">{0} മൈൽ/ഗാലൻ</unitPattern>
 				<unitPattern count="other">{0} മൈൽ/ഗാലൻ</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>ബിറ്റ്</displayName>
-				<unitPattern count="one">{0} ബിറ്റ്</unitPattern>
-				<unitPattern count="other">{0} ബിറ്റ്</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>ബൈറ്റ്</displayName>
-				<unitPattern count="one">{0} ബൈറ്റ്</unitPattern>
-				<unitPattern count="other">{0} ബൈറ്റ്</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>ജിഗാബിറ്റ്</displayName>
-				<unitPattern count="one">{0} ജിഗാബിറ്റ്</unitPattern>
-				<unitPattern count="other">{0} ജിഗാബിറ്റ്</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>ജിഗാബൈറ്റ്</displayName>
-				<unitPattern count="one">{0} ജിഗാബൈറ്റ്</unitPattern>
-				<unitPattern count="other">{0} ജിഗാബൈറ്റ്</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>കിലോബിറ്റ്</displayName>
-				<unitPattern count="one">{0} കിലോബിറ്റ്</unitPattern>
-				<unitPattern count="other">{0} കിലോബിറ്റ്</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>കിലോബൈറ്റ്</displayName>
-				<unitPattern count="one">{0} കിലോബൈറ്റ്</unitPattern>
-				<unitPattern count="other">{0} കിലോബൈറ്റ്</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>മെഗാബിറ്റ്</displayName>
-				<unitPattern count="one">{0} മെഗാബിറ്റ്</unitPattern>
-				<unitPattern count="other">{0} മെഗാബിറ്റ്</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>മെഗാബൈറ്റ്</displayName>
-				<unitPattern count="one">{0} മെഗാബൈറ്റ്</unitPattern>
-				<unitPattern count="other">{0} മെഗാബൈറ്റ്</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>ടെറാബിറ്റ്</displayName>
-				<unitPattern count="one">{0} ടെറാബിറ്റ്</unitPattern>
-				<unitPattern count="other">{0} ടെറാബിറ്റ്</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>ടെറാബൈറ്റ്</displayName>
 				<unitPattern count="one">{0} ടെറാബൈറ്റ്</unitPattern>
 				<unitPattern count="other">{0} ടെറാബൈറ്റ്</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>ടെറാബിറ്റ്</displayName>
+				<unitPattern count="one">{0} ടെറാബിറ്റ്</unitPattern>
+				<unitPattern count="other">{0} ടെറാബിറ്റ്</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>ജിഗാബൈറ്റ്</displayName>
+				<unitPattern count="one">{0} ജിഗാബൈറ്റ്</unitPattern>
+				<unitPattern count="other">{0} ജിഗാബൈറ്റ്</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>ജിഗാബിറ്റ്</displayName>
+				<unitPattern count="one">{0} ജിഗാബിറ്റ്</unitPattern>
+				<unitPattern count="other">{0} ജിഗാബിറ്റ്</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>മെഗാബൈറ്റ്</displayName>
+				<unitPattern count="one">{0} മെഗാബൈറ്റ്</unitPattern>
+				<unitPattern count="other">{0} മെഗാബൈറ്റ്</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>മെഗാബിറ്റ്</displayName>
+				<unitPattern count="one">{0} മെഗാബിറ്റ്</unitPattern>
+				<unitPattern count="other">{0} മെഗാബിറ്റ്</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>കിലോബൈറ്റ്</displayName>
+				<unitPattern count="one">{0} കിലോബൈറ്റ്</unitPattern>
+				<unitPattern count="other">{0} കിലോബൈറ്റ്</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>കിലോബിറ്റ്</displayName>
+				<unitPattern count="one">{0} കിലോബിറ്റ്</unitPattern>
+				<unitPattern count="other">{0} കിലോബിറ്റ്</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>ബൈറ്റ്</displayName>
+				<unitPattern count="one">{0} ബൈറ്റ്</unitPattern>
+				<unitPattern count="other">{0} ബൈറ്റ്</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>ബിറ്റ്</displayName>
+				<unitPattern count="one">{0} ബിറ്റ്</unitPattern>
+				<unitPattern count="other">{0} ബിറ്റ്</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>നൂറ്റാണ്ടുകൾ</displayName>
+				<unitPattern count="one">{0} നൂറ്റാണ്ട്</unitPattern>
+				<unitPattern count="other">{0} നൂറ്റാണ്ടുകൾ</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>വർഷം</displayName>
+				<unitPattern count="one">{0} വർഷം</unitPattern>
+				<unitPattern count="other">{0} വർഷം</unitPattern>
+				<perUnitPattern>{0} / വർഷം</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>മാസം</displayName>
+				<unitPattern count="one">{0} മാസം</unitPattern>
+				<unitPattern count="other">{0} മാസം</unitPattern>
+				<perUnitPattern>{0} / മാസം</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ആഴ്ച</displayName>
+				<unitPattern count="one">{0} ആഴ്ച</unitPattern>
+				<unitPattern count="other">{0} ആഴ്ച</unitPattern>
+				<perUnitPattern>{0} / ആഴ്ച</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ദിവസം</displayName>
 				<unitPattern count="one">{0} ദിവസം</unitPattern>
 				<unitPattern count="other">{0} ദിവസം</unitPattern>
+				<perUnitPattern>{0} / ദിവസം</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>മണിക്കൂർ</displayName>
@@ -6271,30 +6511,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} മണിക്കൂർ</unitPattern>
 				<perUnitPattern>{0} / മണിക്കൂർ</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>മൈക്രോസെക്കൻഡ്</displayName>
-				<unitPattern count="one">{0} മൈക്രോസെക്കൻഡ്</unitPattern>
-				<unitPattern count="other">{0} മൈക്രോസെക്കൻഡ്</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>മില്ലിസെക്കൻഡ്</displayName>
-				<unitPattern count="one">{0} മില്ലിസെക്കൻഡ്</unitPattern>
-				<unitPattern count="other">{0} മില്ലിസെക്കൻഡ്</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>മിനിറ്റ്</displayName>
 				<unitPattern count="one">{0} മിനിറ്റ്</unitPattern>
 				<unitPattern count="other">{0} മിനിറ്റ്</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>മാസം</displayName>
-				<unitPattern count="one">{0} മാസം</unitPattern>
-				<unitPattern count="other">{0} മാസം</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>നാനോസെക്കൻഡ്</displayName>
-				<unitPattern count="one">{0} നാനോസെക്കൻഡ്</unitPattern>
-				<unitPattern count="other">{0} നാനോസെക്കൻഡ്</unitPattern>
+				<perUnitPattern>{0} / മിനിറ്റ്</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>സെക്കൻഡ്</displayName>
@@ -6302,15 +6523,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} സെക്കൻഡ്</unitPattern>
 				<perUnitPattern>{0} / സെക്കൻഡ്</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>ആഴ്ച</displayName>
-				<unitPattern count="one">{0} ആഴ്ച</unitPattern>
-				<unitPattern count="other">{0} ആഴ്ച</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>മില്ലിസെക്കൻഡ്</displayName>
+				<unitPattern count="one">{0} മില്ലിസെക്കൻഡ്</unitPattern>
+				<unitPattern count="other">{0} മില്ലിസെക്കൻഡ്</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>വർഷം</displayName>
-				<unitPattern count="one">{0} വർഷം</unitPattern>
-				<unitPattern count="other">{0} വർഷം</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>മൈക്രോസെക്കൻഡ്</displayName>
+				<unitPattern count="one">{0} മൈക്രോസെക്കൻഡ്</unitPattern>
+				<unitPattern count="other">{0} മൈക്രോസെക്കൻഡ്</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>നാനോസെക്കൻഡ്</displayName>
+				<unitPattern count="one">{0} നാനോസെക്കൻഡ്</unitPattern>
+				<unitPattern count="other">{0} നാനോസെക്കൻഡ്</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ആമ്പിയർ</displayName>
@@ -6332,6 +6558,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} വോൾട്ട്</unitPattern>
 				<unitPattern count="other">{0} വോൾട്ട്</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>കിലോകലോറി</displayName>
+				<unitPattern count="one">{0} കിലോകലോറി</unitPattern>
+				<unitPattern count="other">{0} കിലോകലോറി</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>കലോറി</displayName>
 				<unitPattern count="one">{0} കലോറി</unitPattern>
@@ -6342,21 +6573,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} കലോറി</unitPattern>
 				<unitPattern count="other">{0} കലോറി</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>ജൂൾ</displayName>
-				<unitPattern count="one">{0} ജൂൾ</unitPattern>
-				<unitPattern count="other">{0} ജൂൾ</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>കിലോകലോറി</displayName>
-				<unitPattern count="one">{0} കിലോകലോറി</unitPattern>
-				<unitPattern count="other">{0} കിലോകലോറി</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>കിലോജൂൾ</displayName>
 				<unitPattern count="one">{0} കിലോജൂൾ</unitPattern>
 				<unitPattern count="other">{0} കിലോജൂൾ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>ജൂൾ</displayName>
+				<unitPattern count="one">{0} ജൂൾ</unitPattern>
+				<unitPattern count="other">{0} ജൂൾ</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>കിലോവാട്ട്/മണിക്കൂർ</displayName>
 				<unitPattern count="one">{0} കിലോവാട്ട്/മണിക്കൂർ</unitPattern>
@@ -6367,201 +6593,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ജിഗാഹെർട്സ്</unitPattern>
 				<unitPattern count="other">{0} ജിഗാഹെർട്സ്</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>ഹെർട്സ്</displayName>
-				<unitPattern count="one">{0} ഹെർട്സ്</unitPattern>
-				<unitPattern count="other">{0} ഹെർട്സ്</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>മെഗാഹെർട്സ്</displayName>
+				<unitPattern count="one">{0} മെഗാഹെർട്സ്</unitPattern>
+				<unitPattern count="other">{0} മെഗാഹെർട്സ്</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>കിലോഹെർട്സ്</displayName>
 				<unitPattern count="one">{0} കിലോഹെർട്സ്</unitPattern>
 				<unitPattern count="other">{0} കിലോഹെർട്സ്</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>മെഗാഹെർട്സ്</displayName>
-				<unitPattern count="one">{0} മെഗാഹെർട്സ്</unitPattern>
-				<unitPattern count="other">{0} മെഗാഹെർട്സ്</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>ഹെർട്സ്</displayName>
+				<unitPattern count="one">{0} ഹെർട്സ്</unitPattern>
+				<unitPattern count="other">{0} ഹെർട്സ്</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>ജ്യോതിശാസ്‌ത്ര യൂണിറ്റ്</displayName>
-				<unitPattern count="one">{0} ജ്യോതിശാസ്‌ത്ര യൂണിറ്റ്</unitPattern>
-				<unitPattern count="other">{0} ജ്യോതിശാസ്‌ത്ര യൂണിറ്റ്</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>കിലോമീറ്റർ</displayName>
+				<unitPattern count="one">{0} കിലോമീറ്റർ</unitPattern>
+				<unitPattern count="other">{0} കിലോമീറ്റർ</unitPattern>
+				<perUnitPattern>{0} / കിലോമീറ്റർ</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>സെന്റീമീറ്റർ</displayName>
-				<unitPattern count="one">{0} സെന്റീമീറ്റർ</unitPattern>
-				<unitPattern count="other">{0} സെന്റീമീറ്റർ</unitPattern>
+			<unit type="length-meter">
+				<displayName>മീറ്റർ</displayName>
+				<unitPattern count="one">{0} മീറ്റർ</unitPattern>
+				<unitPattern count="other">{0} മീറ്റർ</unitPattern>
+				<perUnitPattern>{0} / മീറ്റർ</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>ഡെസീമീറ്റർ</displayName>
 				<unitPattern count="one">{0} ഡെസീമീറ്റർ</unitPattern>
 				<unitPattern count="other">{0} ഡെസീമീറ്റർ</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>അടി</displayName>
-				<unitPattern count="one">{0} അടി</unitPattern>
-				<unitPattern count="other">{0} അടി</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>ഇഞ്ച്</displayName>
-				<unitPattern count="one">{0} ഇഞ്ച്</unitPattern>
-				<unitPattern count="other">{0} ഇഞ്ച്</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>കിലോമീറ്റർ</displayName>
-				<unitPattern count="one">{0} കിലോമീറ്റർ</unitPattern>
-				<unitPattern count="other">{0} കിലോമീറ്റർ</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>പ്രകാശവർഷം</displayName>
-				<unitPattern count="one">{0} പ്രകാശവർഷം</unitPattern>
-				<unitPattern count="other">{0} പ്രകാശവർഷം</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>മീറ്റർ</displayName>
-				<unitPattern count="one">{0} മീറ്റർ</unitPattern>
-				<unitPattern count="other">{0} മീറ്റർ</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>മൈക്രോമീറ്റർ</displayName>
-				<unitPattern count="one">{0} മൈക്രോമീറ്റർ</unitPattern>
-				<unitPattern count="other">{0} മൈക്രോമീറ്റർ</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>മൈൽ</displayName>
-				<unitPattern count="one">{0} മൈൽ</unitPattern>
-				<unitPattern count="other">{0} മൈൽ</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>സെന്റീമീറ്റർ</displayName>
+				<unitPattern count="one">{0} സെന്റീമീറ്റർ</unitPattern>
+				<unitPattern count="other">{0} സെന്റീമീറ്റർ</unitPattern>
+				<perUnitPattern>{0} / സെന്റിമീറ്റർ</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>മില്ലീമീറ്റർ</displayName>
 				<unitPattern count="one">{0} മില്ലീമീറ്റർ</unitPattern>
 				<unitPattern count="other">{0} മില്ലീമീറ്റർ</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>മൈക്രോമീറ്റർ</displayName>
+				<unitPattern count="one">{0} മൈക്രോമീറ്റർ</unitPattern>
+				<unitPattern count="other">{0} മൈക്രോമീറ്റർ</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>നാനോമീറ്റർ</displayName>
 				<unitPattern count="one">{0} നാനോമീറ്റർ</unitPattern>
 				<unitPattern count="other">{0} നാനോമീറ്റർ</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>നോട്ടിക്കൽ മൈൽ</displayName>
-				<unitPattern count="one">{0} നോട്ടിക്കൽ മൈൽ</unitPattern>
-				<unitPattern count="other">{0} നോട്ടിക്കൽ മൈൽ</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>പാർസെക്</displayName>
-				<unitPattern count="one">{0} പാർസെക്</unitPattern>
-				<unitPattern count="other">{0} പാർസെക്</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>പൈക്കോമീറ്റർ</displayName>
 				<unitPattern count="one">{0} പൈക്കോമീറ്റർ</unitPattern>
 				<unitPattern count="other">{0} പൈക്കോമീറ്റർ</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>മൈൽ</displayName>
+				<unitPattern count="one">{0} മൈൽ</unitPattern>
+				<unitPattern count="other">{0} മൈൽ</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>വാര</displayName>
 				<unitPattern count="one">{0} വാര</unitPattern>
 				<unitPattern count="other">{0} വാര</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>അടി</displayName>
+				<unitPattern count="one">{0} അടി</unitPattern>
+				<unitPattern count="other">{0} അടി</unitPattern>
+				<perUnitPattern>{0} / അടി</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>ഇഞ്ച്</displayName>
+				<unitPattern count="one">{0} ഇഞ്ച്</unitPattern>
+				<unitPattern count="other">{0} ഇഞ്ച്</unitPattern>
+				<perUnitPattern>{0} / ഇഞ്ച്</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>പാർസെക്</displayName>
+				<unitPattern count="one">{0} പാർസെക്</unitPattern>
+				<unitPattern count="other">{0} പാർസെക്</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>പ്രകാശവർഷം</displayName>
+				<unitPattern count="one">{0} പ്രകാശവർഷം</unitPattern>
+				<unitPattern count="other">{0} പ്രകാശവർഷം</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ജ്യോതിശാസ്‌ത്ര യൂണിറ്റ്</displayName>
+				<unitPattern count="one">{0} ജ്യോതിശാസ്‌ത്ര യൂണിറ്റ്</unitPattern>
+				<unitPattern count="other">{0} ജ്യോതിശാസ്‌ത്ര യൂണിറ്റ്</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>നോട്ടിക്കൽ മൈൽ</displayName>
+				<unitPattern count="one">{0} നോട്ടിക്കൽ മൈൽ</unitPattern>
+				<unitPattern count="other">{0} നോട്ടിക്കൽ മൈൽ</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>സ്കാൻഡിനേവിയൻ മൈൽ</displayName>
+				<unitPattern count="one">{0} സ്കാൻഡിനേവിയൻ മൈൽ</unitPattern>
+				<unitPattern count="other">{0} സ്കാൻഡിനേവിയൻ മൈൽ</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>ലക്സ്</displayName>
 				<unitPattern count="one">{0} ലക്സ്</unitPattern>
 				<unitPattern count="other">{0} ലക്സ്</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>ക്യാരറ്റ്</displayName>
-				<unitPattern count="one">{0} ക്യാരറ്റ്</unitPattern>
-				<unitPattern count="other">{0} ക്യാരറ്റ്</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>ഗ്രാം</displayName>
-				<unitPattern count="one">{0} ഗ്രാം</unitPattern>
-				<unitPattern count="other">{0} ഗ്രാം</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>കിലോഗ്രാം</displayName>
-				<unitPattern count="one">{0} കിലോഗ്രാം</unitPattern>
-				<unitPattern count="other">{0} കിലോഗ്രാം</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>മെട്രിക് ടൺ</displayName>
 				<unitPattern count="one">{0} മെട്രിക് ടൺ</unitPattern>
 				<unitPattern count="other">{0} മെട്രിക് ടൺ</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>മൈക്രോഗ്രാം</displayName>
-				<unitPattern count="one">{0} മൈക്രോഗ്രാം</unitPattern>
-				<unitPattern count="other">{0} മൈക്രോഗ്രാം</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>കിലോഗ്രാം</displayName>
+				<unitPattern count="one">{0} കിലോഗ്രാം</unitPattern>
+				<unitPattern count="other">{0} കിലോഗ്രാം</unitPattern>
+				<perUnitPattern>{0}/കിലോഗ്രാം</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>ഗ്രാം</displayName>
+				<unitPattern count="one">{0} ഗ്രാം</unitPattern>
+				<unitPattern count="other">{0} ഗ്രാം</unitPattern>
+				<perUnitPattern>{0}/ഗ്രാം</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>മില്ലിഗ്രാം</displayName>
 				<unitPattern count="one">{0} മില്ലിഗ്രാം</unitPattern>
 				<unitPattern count="other">{0} മില്ലിഗ്രാം</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ഔൺസ്</displayName>
-				<unitPattern count="one">{0} ഔൺസ്</unitPattern>
-				<unitPattern count="other">{0} ഔൺസ്</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ട്രോയ് ഔൺസ്</displayName>
-				<unitPattern count="one">{0} ട്രോയ് ഔൺസ്</unitPattern>
-				<unitPattern count="other">{0} ട്രോയ് ഔൺസ്</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>പൗണ്ട്</displayName>
-				<unitPattern count="one">{0} പൗണ്ട്</unitPattern>
-				<unitPattern count="other">{0} പൗണ്ട്</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>മൈക്രോഗ്രാം</displayName>
+				<unitPattern count="one">{0} മൈക്രോഗ്രാം</unitPattern>
+				<unitPattern count="other">{0} മൈക്രോഗ്രാം</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>ടൺ</displayName>
 				<unitPattern count="one">{0} ടൺ</unitPattern>
 				<unitPattern count="other">{0} ടൺ</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>പൗണ്ട്</displayName>
+				<unitPattern count="one">{0} പൗണ്ട്</unitPattern>
+				<unitPattern count="other">{0} പൗണ്ട്</unitPattern>
+				<perUnitPattern>{0}/പൗണ്ട്</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ഔൺസ്</displayName>
+				<unitPattern count="one">{0} ഔൺസ്</unitPattern>
+				<unitPattern count="other">{0} ഔൺസ്</unitPattern>
+				<perUnitPattern>{0}/ഔൺസ്</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ട്രോയ് ഔൺസ്</displayName>
+				<unitPattern count="one">{0} ട്രോയ് ഔൺസ്</unitPattern>
+				<unitPattern count="other">{0} ട്രോയ് ഔൺസ്</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>ക്യാരറ്റ്</displayName>
+				<unitPattern count="one">{0} ക്യാരറ്റ്</unitPattern>
+				<unitPattern count="other">{0} ക്യാരറ്റ്</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>ജിഗാവാട്ട്</displayName>
 				<unitPattern count="one">{0} ജിഗാവാട്ട്</unitPattern>
 				<unitPattern count="other">{0} ജിഗാവാട്ട്</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>കുതിരശക്തി</displayName>
-				<unitPattern count="one">{0} കുതിരശക്തി</unitPattern>
-				<unitPattern count="other">{0} കുതിരശക്തി</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>കിലോവാട്ട്</displayName>
-				<unitPattern count="one">{0} കിലോവാട്ട്</unitPattern>
-				<unitPattern count="other">{0} കിലോവാട്ട്</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>മെഗാവാട്ട്</displayName>
 				<unitPattern count="one">{0} മെഗാവാട്ട്</unitPattern>
 				<unitPattern count="other">{0} മെഗാവാട്ട്</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>മില്ലിവാട്ട്</displayName>
-				<unitPattern count="one">{0} മില്ലിവാട്ട്</unitPattern>
-				<unitPattern count="other">{0} മില്ലിവാട്ട്</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>കിലോവാട്ട്</displayName>
+				<unitPattern count="one">{0} കിലോവാട്ട്</unitPattern>
+				<unitPattern count="other">{0} കിലോവാട്ട്</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>വാട്ട്</displayName>
 				<unitPattern count="one">{0} വാട്ട്</unitPattern>
 				<unitPattern count="other">{0} വാട്ട്</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>മില്ലിവാട്ട്</displayName>
+				<unitPattern count="one">{0} മില്ലിവാട്ട്</unitPattern>
+				<unitPattern count="other">{0} മില്ലിവാട്ട്</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>കുതിരശക്തി</displayName>
+				<unitPattern count="one">{0} കുതിരശക്തി</unitPattern>
+				<unitPattern count="other">{0} കുതിരശക്തി</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>ഹെക്‌ടോപാസ്‌ക്കൽ</displayName>
 				<unitPattern count="one">{0} ഹെക്‌ടോപാസ്‌ക്കൽ</unitPattern>
 				<unitPattern count="other">{0} ഹെക്‌ടോപാസ്‌ക്കൽ</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>ഇഞ്ച് ഓഫ് മെർക്കുറി</displayName>
-				<unitPattern count="one">{0} ഇഞ്ച് ഓഫ് മെർക്കുറി</unitPattern>
-				<unitPattern count="other">{0} ഇഞ്ച് ഓഫ് മെർക്കുറി</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>മില്ലിബാർ</displayName>
-				<unitPattern count="one">{0} മില്ലിബാർ</unitPattern>
-				<unitPattern count="other">{0} മില്ലിബാർ</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>മില്ലീമീറ്റർ മെർക്കുറി</displayName>
 				<unitPattern count="one">{0} മില്ലീമീറ്റർ മെർക്കുറി</unitPattern>
@@ -6572,10 +6802,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ചതുരശ്ര ഇഞ്ചിലുള്ള റാത്തൽ</unitPattern>
 				<unitPattern count="other">{0} ചതുരശ്ര ഇഞ്ചിലുള്ള റാത്തൽ</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>ക്യാരറ്റ്</displayName>
-				<unitPattern count="one">{0} ക്യാരറ്റ്</unitPattern>
-				<unitPattern count="other">{0} ക്യാരറ്റ്</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>ഇഞ്ച് ഓഫ് മെർക്കുറി</displayName>
+				<unitPattern count="one">{0} ഇഞ്ച് ഓഫ് മെർക്കുറി</unitPattern>
+				<unitPattern count="other">{0} ഇഞ്ച് ഓഫ് മെർക്കുറി</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>മില്ലിബാർ</displayName>
+				<unitPattern count="one">{0} മില്ലിബാർ</unitPattern>
+				<unitPattern count="other">{0} മില്ലിബാർ</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>കിലോമീറ്റർ/മണിക്കൂർ</displayName>
@@ -6592,6 +6827,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} മൈൽ/മണിക്കൂർ</unitPattern>
 				<unitPattern count="other">{0} മൈൽ/മണിക്കൂർ</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>നോട്ട്</displayName>
+				<unitPattern count="one">{0} നോട്ട്</unitPattern>
+				<unitPattern count="other">{0} നോട്ട്</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>ഡിഗ്രി സെൽഷ്യസ്</displayName>
 				<unitPattern count="one">{0} ഡിഗ്രി സെൽഷ്യസ്</unitPattern>
@@ -6607,31 +6852,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} കെൽവിൻ</unitPattern>
 				<unitPattern count="other">{0} കെൽവിൻ</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ഏക്കർ അടി</displayName>
-				<unitPattern count="one">{0} ഏക്കർ അടി</unitPattern>
-				<unitPattern count="other">{0} ഏക്കർ അടി</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>സെന്റീലിറ്റർ</displayName>
-				<unitPattern count="one">{0} സെന്റീലിറ്റർ</unitPattern>
-				<unitPattern count="other">{0} സെന്റീലിറ്റർ</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>ക്യൂബിക് സെന്റീമീറ്റർ</displayName>
-				<unitPattern count="one">{0} ക്യൂബിക് സെന്റീമീറ്റർ</unitPattern>
-				<unitPattern count="other">{0} ക്യൂബിക് സെന്റീമീറ്റർ</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ക്യൂബിക് അടി</displayName>
-				<unitPattern count="one">{0} ക്യൂബിക് അടി</unitPattern>
-				<unitPattern count="other">{0} ക്യൂബിക് അടി</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>ക്യൂബിക് ഇഞ്ച്</displayName>
-				<unitPattern count="one">{0} ക്യൂബിക് ഇഞ്ച്</unitPattern>
-				<unitPattern count="other">{0} ക്യൂബിക് ഇഞ്ച്</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>ക്യൂബിക് കിലോമീറ്റർ</displayName>
 				<unitPattern count="one">{0} ക്യൂബിക് കിലോമീറ്റർ</unitPattern>
@@ -6641,6 +6861,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ക്യൂബിക് മീറ്റർ</displayName>
 				<unitPattern count="one">{0} ക്യൂബിക് മീറ്റർ</unitPattern>
 				<unitPattern count="other">{0} ക്യൂബിക് മീറ്റർ</unitPattern>
+				<perUnitPattern>{0} / ക്യൂബിക് മീറ്റർ</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>ക്യൂബിക് സെന്റീമീറ്റർ</displayName>
+				<unitPattern count="one">{0} ക്യൂബിക് സെന്റീമീറ്റർ</unitPattern>
+				<unitPattern count="other">{0} ക്യൂബിക് സെന്റീമീറ്റർ</unitPattern>
+				<perUnitPattern>{0} / ക്യൂബിക് സെന്റീമീറ്റർ</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>ക്യൂബിക്ക് മൈൽ</displayName>
@@ -6652,25 +6879,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ക്യൂബിക് യാർഡ്</unitPattern>
 				<unitPattern count="other">{0} ക്യൂബിക് യാർഡ്</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>കപ്പ്</displayName>
-				<unitPattern count="one">{0} കപ്പ്</unitPattern>
-				<unitPattern count="other">{0} കപ്പ്</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ക്യൂബിക് അടി</displayName>
+				<unitPattern count="one">{0} ക്യൂബിക് അടി</unitPattern>
+				<unitPattern count="other">{0} ക്യൂബിക് അടി</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>ഡെസിലിറ്റർ</displayName>
-				<unitPattern count="one">{0} ഡെസിലിറ്റർ</unitPattern>
-				<unitPattern count="other">{0} ഡെസിലിറ്റർ</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>ക്യൂബിക് ഇഞ്ച്</displayName>
+				<unitPattern count="one">{0} ക്യൂബിക് ഇഞ്ച്</unitPattern>
+				<unitPattern count="other">{0} ക്യൂബിക് ഇഞ്ച്</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>ഫ്ലൂയിഡ് ഔൺസ്</displayName>
-				<unitPattern count="one">{0} ഫ്ലൂയിഡ് ഔൺസ്</unitPattern>
-				<unitPattern count="other">{0} ഫ്ലൂയിഡ് ഔൺസ്</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>ഗാലൻ</displayName>
-				<unitPattern count="one">{0} ഗാലൻ</unitPattern>
-				<unitPattern count="other">{0} ഗാലൻ</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>മെഗാലിറ്റർ</displayName>
+				<unitPattern count="one">{0} മെഗാലിറ്റർ</unitPattern>
+				<unitPattern count="other">{0} മെഗാലിറ്റർ</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>ഹെക്ടോലിറ്റർ</displayName>
@@ -6681,27 +6903,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ലിറ്റർ</displayName>
 				<unitPattern count="one">{0} ലിറ്റർ</unitPattern>
 				<unitPattern count="other">{0} ലിറ്റർ</unitPattern>
+				<perUnitPattern>{0} / ലിറ്റർ</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>മെഗാലിറ്റർ</displayName>
-				<unitPattern count="one">{0} മെഗാലിറ്റർ</unitPattern>
-				<unitPattern count="other">{0} മെഗാലിറ്റർ</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>ഡെസിലിറ്റർ</displayName>
+				<unitPattern count="one">{0} ഡെസിലിറ്റർ</unitPattern>
+				<unitPattern count="other">{0} ഡെസിലിറ്റർ</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>സെന്റീലിറ്റർ</displayName>
+				<unitPattern count="one">{0} സെന്റീലിറ്റർ</unitPattern>
+				<unitPattern count="other">{0} സെന്റീലിറ്റർ</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>മില്ലിലിറ്റർ</displayName>
 				<unitPattern count="one">{0} മില്ലിലിറ്റർ</unitPattern>
 				<unitPattern count="other">{0} മില്ലിലിറ്റർ</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>പൈന്റ്</displayName>
-				<unitPattern count="one">{0} പൈന്റ്</unitPattern>
-				<unitPattern count="other">{0} പൈന്റ്</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>മെട്രിക് പൈന്റ്</displayName>
+				<unitPattern count="one">{0} മെട്രിക് പൈന്റ്</unitPattern>
+				<unitPattern count="other">{0} മെട്രിക് പൈന്റ്</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>മെട്രിക് കപ്പ്</displayName>
+				<unitPattern count="one">{0} മെട്രിക് കപ്പ്</unitPattern>
+				<unitPattern count="other">{0} മെട്രിക് കപ്പ്</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ഏക്കർ അടി</displayName>
+				<unitPattern count="one">{0} ഏക്കർ അടി</unitPattern>
+				<unitPattern count="other">{0} ഏക്കർ അടി</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>ഗാലൻ</displayName>
+				<unitPattern count="one">{0} ഗാലൻ</unitPattern>
+				<unitPattern count="other">{0} ഗാലൻ</unitPattern>
+				<perUnitPattern>{0} / ഗാലൻ</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>ക്വാർട്ട്</displayName>
 				<unitPattern count="one">{0} ക്വാർട്ട്</unitPattern>
 				<unitPattern count="other">{0} ക്വാർട്ട്</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>പൈന്റ്</displayName>
+				<unitPattern count="one">{0} പൈന്റ്</unitPattern>
+				<unitPattern count="other">{0} പൈന്റ്</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>കപ്പ്</displayName>
+				<unitPattern count="one">{0} കപ്പ്</unitPattern>
+				<unitPattern count="other">{0} കപ്പ്</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>ഫ്ലൂയിഡ് ഔൺസ്</displayName>
+				<unitPattern count="one">{0} ഫ്ലൂയിഡ് ഔൺസ്</unitPattern>
+				<unitPattern count="other">{0} ഫ്ലൂയിഡ് ഔൺസ്</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>ടേബിൾസ്‌പൂൺ</displayName>
 				<unitPattern count="one">{0} ടേബിൾസ്‌പൂൺ</unitPattern>
@@ -6712,6 +6971,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ടീസ്‌പൂൺ</unitPattern>
 				<unitPattern count="other">{0} ടീസ്‌പൂൺ</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}കി.</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}വ.</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}തെ.</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}പ.</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -6727,6 +6992,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} മീ/സെ²</unitPattern>
 				<unitPattern count="other">{0} മീ/സെ²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>റെവ.</displayName>
+				<unitPattern count="one">{0} റെവ.</unitPattern>
+				<unitPattern count="other">{0} റെവ.</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>റേഡിയൻ</displayName>
+				<unitPattern count="one">{0} റേഡി.</unitPattern>
+				<unitPattern count="other">{0} റേഡി.</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>ഡിഗ്രി</displayName>
+				<unitPattern count="one">{0} ഡിഗ്രി</unitPattern>
+				<unitPattern count="other">{0} ഡിഗ്രി</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>ആർക്ക്.മി.</displayName>
 				<unitPattern count="one">{0} ആർക്ക്.മി.</unitPattern>
@@ -6737,30 +7017,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ആർക്ക്.സെ.</unitPattern>
 				<unitPattern count="other">{0} ആർക്ക്.സെ.</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>ഡിഗ്രി</displayName>
-				<unitPattern count="one">{0} ഡിഗ്രി</unitPattern>
-				<unitPattern count="other">{0} ഡിഗ്രി</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>റേഡിയൻ</displayName>
-				<unitPattern count="one">{0} റേഡി.</unitPattern>
-				<unitPattern count="other">{0} റേഡി.</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ഏക്കർ</displayName>
-				<unitPattern count="one">{0} ഏക്ക.</unitPattern>
-				<unitPattern count="other">{0} ഏക്ക.</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>കി.മീ²</displayName>
+				<unitPattern count="one">{0} കി.മീ²</unitPattern>
+				<unitPattern count="other">{0} കി.മീ²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ഹെക്‌ടർ</displayName>
 				<unitPattern count="one">{0} ഹെക്.</unitPattern>
 				<unitPattern count="other">{0} ഹെക്.</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>മീറ്റർ²</displayName>
+				<unitPattern count="one">{0} മീ²</unitPattern>
+				<unitPattern count="other">{0} മീ²</unitPattern>
+				<perUnitPattern>{0}/മീ²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>സെ.മീ²</displayName>
 				<unitPattern count="one">{0} സെ.മീ²</unitPattern>
 				<unitPattern count="other">{0} സെ.മീ²</unitPattern>
+				<perUnitPattern>{0}/സെ.മീ²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>ചതു.മൈൽ</displayName>
+				<unitPattern count="one">{0} ചതു.മൈ</unitPattern>
+				<unitPattern count="other">{0} ചതു.മൈ</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ഏക്കർ</displayName>
+				<unitPattern count="one">{0} ഏക്ക.</unitPattern>
+				<unitPattern count="other">{0} ഏക്ക.</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>വാര²</displayName>
+				<unitPattern count="one">{0} വാ²</unitPattern>
+				<unitPattern count="other">{0} വാ²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ചതു.അടി</displayName>
@@ -6771,91 +7063,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ഇഞ്ച്²</displayName>
 				<unitPattern count="one">{0} ഇഞ്ച്²</unitPattern>
 				<unitPattern count="other">{0} ഇഞ്ച്²</unitPattern>
+				<perUnitPattern>{0}/ഇഞ്ച്²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>കി.മീ²</displayName>
-				<unitPattern count="one">{0} കി.മീ²</unitPattern>
-				<unitPattern count="other">{0} കി.മീ²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>മീറ്റർ²</displayName>
-				<unitPattern count="one">{0} മീ²</unitPattern>
-				<unitPattern count="other">{0} മീ²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>ചതു.മൈൽ</displayName>
-				<unitPattern count="one">{0} ചതു.മൈ</unitPattern>
-				<unitPattern count="other">{0} ചതു.മൈ</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>വാര²</displayName>
-				<unitPattern count="one">{0} വാ²</unitPattern>
-				<unitPattern count="other">{0} വാ²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>ക്യാരറ്റ്</displayName>
+				<unitPattern count="one">{0} ക്യാ.</unitPattern>
+				<unitPattern count="other">{0} ക്യാ.</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ലിറ്റർ/കി.മീ.</displayName>
 				<unitPattern count="one">{0} ലി/കി.മീ.</unitPattern>
 				<unitPattern count="other">{0} ലി/കി.മീ.</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ലി./100 കി.മീ.</displayName>
+				<unitPattern count="one">{0} ലി./100 കി.മീ.</unitPattern>
+				<unitPattern count="other">{0} ലി./100 കി.മീ.</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>മൈൽ/ഗാ.</displayName>
 				<unitPattern count="one">{0} മൈ/ഗാ.</unitPattern>
 				<unitPattern count="other">{0} മൈ/ഗാ.</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>ബിറ്റ്</displayName>
-				<unitPattern count="one">{0} ബിറ്റ്</unitPattern>
-				<unitPattern count="other">{0} ബിറ്റ്</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>ബൈറ്റ്</displayName>
-				<unitPattern count="one">{0} ബൈറ്റ്</unitPattern>
-				<unitPattern count="other">{0} ബൈറ്റ്</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>ജി.ബിറ്റ്</displayName>
-				<unitPattern count="one">{0} ജിബി</unitPattern>
-				<unitPattern count="other">{0} ജിബി</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>ജി.ബൈറ്റ്</displayName>
-				<unitPattern count="one">{0} ജി.ബൈ.</unitPattern>
-				<unitPattern count="other">{0} ജി.ബൈ.</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>കി.ബിറ്റ്</displayName>
-				<unitPattern count="one">{0} കി.ബിറ്റ്</unitPattern>
-				<unitPattern count="other">{0} കി.ബിറ്റ്</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>കി.ബൈറ്റ്</displayName>
-				<unitPattern count="one">{0} കി.ബി.</unitPattern>
-				<unitPattern count="other">{0} കി.ബി.</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>മെ.ബിറ്റ്</displayName>
-				<unitPattern count="one">{0} മെ.ബി.</unitPattern>
-				<unitPattern count="other">{0} മെ.ബി.</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>മെ.ബൈറ്റ്</displayName>
-				<unitPattern count="one">{0} മെ.ബൈ.</unitPattern>
-				<unitPattern count="other">{0} മെ.ബൈ.</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>ടെ.ബിറ്റ്</displayName>
-				<unitPattern count="one">{0} ടെ.ബി.</unitPattern>
-				<unitPattern count="other">{0} ടെ.ബി.</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>ടെ.ബൈറ്റ്</displayName>
 				<unitPattern count="one">{0} ടെ.ബൈ.</unitPattern>
 				<unitPattern count="other">{0} ടെ.ബൈ.</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>ടെ.ബിറ്റ്</displayName>
+				<unitPattern count="one">{0} ടെ.ബി.</unitPattern>
+				<unitPattern count="other">{0} ടെ.ബി.</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>ജി.ബൈറ്റ്</displayName>
+				<unitPattern count="one">{0} ജി.ബൈ.</unitPattern>
+				<unitPattern count="other">{0} ജി.ബൈ.</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>ജി.ബിറ്റ്</displayName>
+				<unitPattern count="one">{0} ജിബി</unitPattern>
+				<unitPattern count="other">{0} ജിബി</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>മെ.ബൈറ്റ്</displayName>
+				<unitPattern count="one">{0} മെ.ബൈ.</unitPattern>
+				<unitPattern count="other">{0} മെ.ബൈ.</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>മെ.ബിറ്റ്</displayName>
+				<unitPattern count="one">{0} മെ.ബി.</unitPattern>
+				<unitPattern count="other">{0} മെ.ബി.</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>കി.ബൈറ്റ്</displayName>
+				<unitPattern count="one">{0} കി.ബി.</unitPattern>
+				<unitPattern count="other">{0} കി.ബി.</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>കി.ബിറ്റ്</displayName>
+				<unitPattern count="one">{0} കി.ബിറ്റ്</unitPattern>
+				<unitPattern count="other">{0} കി.ബിറ്റ്</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>ബൈറ്റ്</displayName>
+				<unitPattern count="one">{0} ബൈറ്റ്</unitPattern>
+				<unitPattern count="other">{0} ബൈറ്റ്</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>ബിറ്റ്</displayName>
+				<unitPattern count="one">{0} ബിറ്റ്</unitPattern>
+				<unitPattern count="other">{0} ബിറ്റ്</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>നൂ.</displayName>
+				<unitPattern count="one">{0} നൂ.</unitPattern>
+				<unitPattern count="other">{0} നൂ.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>വർഷം</displayName>
+				<unitPattern count="one">{0} വ</unitPattern>
+				<unitPattern count="other">{0} വ</unitPattern>
+				<perUnitPattern>{0}/വ.</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>മാസം</displayName>
+				<unitPattern count="one">{0} മാസം</unitPattern>
+				<unitPattern count="other">{0} മാസം</unitPattern>
+				<perUnitPattern>{0}/മാ.</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ആഴ്ച</displayName>
+				<unitPattern count="one">{0} ആ</unitPattern>
+				<unitPattern count="other">{0} ആ</unitPattern>
+				<perUnitPattern>{0}/ആ.</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ദിവസം</displayName>
 				<unitPattern count="one">{0} ദിവസം‌</unitPattern>
 				<unitPattern count="other">{0} ദിവസം‌</unitPattern>
+				<perUnitPattern>{0}/ദി.</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>മണിക്കൂർ</displayName>
@@ -6863,30 +7170,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} മ</unitPattern>
 				<perUnitPattern>{0}/മ.</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μ.സെ.</displayName>
-				<unitPattern count="one">{0} μ.സെ.</unitPattern>
-				<unitPattern count="other">{0} μ.സെ.</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>മില്ലിസെക്കൻഡ്</displayName>
-				<unitPattern count="one">{0} മി.സെ.</unitPattern>
-				<unitPattern count="other">{0} മി.സെ.</unitPattern>
-			</unit>
 			<unit type="duration-minute">
-				<displayName>മിനിറ്റ്</displayName>
-				<unitPattern count="one">{0} മിനിറ്റ്</unitPattern>
-				<unitPattern count="other">{0} മിനിറ്റ്</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>മാസം</displayName>
-				<unitPattern count="one">{0} മാസം</unitPattern>
-				<unitPattern count="other">{0} മാസം</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>നാനോസെക്കൻഡ്</displayName>
-				<unitPattern count="one">{0} നാ.സെ.</unitPattern>
-				<unitPattern count="other">{0} നാ.സെ.</unitPattern>
+				<displayName>മി.</displayName>
+				<unitPattern count="one">{0} മി.</unitPattern>
+				<unitPattern count="other">{0} മി.</unitPattern>
+				<perUnitPattern>{0}/മി.</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>സെക്കൻഡ്</displayName>
@@ -6894,15 +7182,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} സെ.</unitPattern>
 				<perUnitPattern>{0}/സെ.</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>ആഴ്ച</displayName>
-				<unitPattern count="one">{0} ആ</unitPattern>
-				<unitPattern count="other">{0} ആ</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>മില്ലിസെക്കൻഡ്</displayName>
+				<unitPattern count="one">{0} മി.സെ.</unitPattern>
+				<unitPattern count="other">{0} മി.സെ.</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>വർഷം</displayName>
-				<unitPattern count="one">{0} വ</unitPattern>
-				<unitPattern count="other">{0} വ</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μ.സെ.</displayName>
+				<unitPattern count="one">{0} μ.സെ.</unitPattern>
+				<unitPattern count="other">{0} μ.സെ.</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>നാനോസെക്കൻഡ്</displayName>
+				<unitPattern count="one">{0} നാ.സെ.</unitPattern>
+				<unitPattern count="other">{0} നാ.സെ.</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ആമ്പിയർ</displayName>
@@ -6924,6 +7217,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>കി.കലോ.</displayName>
+				<unitPattern count="one">{0} കി.കലോ.</unitPattern>
+				<unitPattern count="other">{0} കി.കലോ.</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>കലോ.</displayName>
 				<unitPattern count="one">{0} കലോ.</unitPattern>
@@ -6934,21 +7232,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} കലോ.</unitPattern>
 				<unitPattern count="other">{0} കലോ.</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>ജൂൾ</displayName>
-				<unitPattern count="one">{0} ജൂ.</unitPattern>
-				<unitPattern count="other">{0} ജൂ.</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>കി.കലോ.</displayName>
-				<unitPattern count="one">{0} കി.കലോ.</unitPattern>
-				<unitPattern count="other">{0} കി.കലോ.</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>കി.ജൂ.</displayName>
 				<unitPattern count="one">{0} കി.ജൂ.</unitPattern>
 				<unitPattern count="other">{0} കി.ജൂ.</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>ജൂൾ</displayName>
+				<unitPattern count="one">{0} ജൂ.</unitPattern>
+				<unitPattern count="other">{0} ജൂ.</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>കി.വാ/മ.</displayName>
 				<unitPattern count="one">{0} കി.വാ/മ.</unitPattern>
@@ -6959,201 +7252,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ജി.ഹെ.</unitPattern>
 				<unitPattern count="other">{0} ജി.ഹെ.</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>ഹെ.</displayName>
-				<unitPattern count="one">{0} ഹെ.</unitPattern>
-				<unitPattern count="other">{0} ഹെ.</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>മെ.ഹെ.</displayName>
+				<unitPattern count="one">{0} മെ.ഹെ.</unitPattern>
+				<unitPattern count="other">{0} മെ.ഹെ.</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>കി.ഹെ.</displayName>
 				<unitPattern count="one">{0} കി.ഹെ.</unitPattern>
 				<unitPattern count="other">{0} കി.ഹെ.</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>മെ.ഹെ.</displayName>
-				<unitPattern count="one">{0} മെ.ഹെ.</unitPattern>
-				<unitPattern count="other">{0} മെ.ഹെ.</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>ഹെ.</displayName>
+				<unitPattern count="one">{0} ഹെ.</unitPattern>
+				<unitPattern count="other">{0} ഹെ.</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>ജ്യോ.യൂ.</displayName>
-				<unitPattern count="one">{0} ജ്യോ.യൂ.</unitPattern>
-				<unitPattern count="other">{0} ജ്യോ.യൂ.</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>കി.മീ.</displayName>
+				<unitPattern count="one">{0} കി.മീ.</unitPattern>
+				<unitPattern count="other">{0} കി.മീ.</unitPattern>
+				<perUnitPattern>{0}/കി.മീ.</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>സെ.മീ.</displayName>
-				<unitPattern count="one">{0} സെ.മീ.</unitPattern>
-				<unitPattern count="other">{0} സെ.മീ.</unitPattern>
+			<unit type="length-meter">
+				<displayName>മീറ്റർ</displayName>
+				<unitPattern count="one">{0} മീ.</unitPattern>
+				<unitPattern count="other">{0} മീ.</unitPattern>
+				<perUnitPattern>{0}/മീ.</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>ഡെ.മീ.</displayName>
 				<unitPattern count="one">{0} ഡെ.മീ.</unitPattern>
 				<unitPattern count="other">{0} ഡെ.മീ</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>അടി</displayName>
-				<unitPattern count="one">{0} അടി</unitPattern>
-				<unitPattern count="other">{0} അടി</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>ഇഞ്ച്</displayName>
-				<unitPattern count="one">{0} ഇഞ്ച്</unitPattern>
-				<unitPattern count="other">{0} ഇഞ്ച്</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>കിലോമീറ്റർ</displayName>
-				<unitPattern count="one">{0} കി.മീ.</unitPattern>
-				<unitPattern count="other">{0} കി.മീ.</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>പ്രകാശവർഷം</displayName>
-				<unitPattern count="one">{0} പ.വ.</unitPattern>
-				<unitPattern count="other">{0} പ്രക.വർ</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>മീറ്റർ</displayName>
-				<unitPattern count="one">{0} മീ.</unitPattern>
-				<unitPattern count="other">{0} മീ.</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µമീറ്റർ</displayName>
-				<unitPattern count="one">µമീ.</unitPattern>
-				<unitPattern count="other">{0} µമീ.</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>മൈൽ</displayName>
-				<unitPattern count="one">{0} മൈൽ</unitPattern>
-				<unitPattern count="other">{0} മൈ</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>സെ.മീ.</displayName>
+				<unitPattern count="one">{0} സെ.മീ.</unitPattern>
+				<unitPattern count="other">{0} സെ.മീ.</unitPattern>
+				<perUnitPattern>{0}/സെ.മീ.</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>മില്ലീമീറ്റർ</displayName>
 				<unitPattern count="one">{0} മി.മീ.</unitPattern>
 				<unitPattern count="other">{0} മി.മീ.</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µമീറ്റർ</displayName>
+				<unitPattern count="one">µമീ.</unitPattern>
+				<unitPattern count="other">{0} µമീ.</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>നാ.മീ.</displayName>
 				<unitPattern count="one">{0} നാ.മീ.</unitPattern>
 				<unitPattern count="other">{0} നാ.മീ.</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>നോ.മൈ.</displayName>
-				<unitPattern count="one">{0} നോ.മൈ.</unitPattern>
-				<unitPattern count="other">{0} നോ.മൈ.</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>പാർസെക്</displayName>
-				<unitPattern count="one">{0} പാ.സെ.</unitPattern>
-				<unitPattern count="other">{0} പാ.സെ.</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>പൈ.മീ.</displayName>
 				<unitPattern count="one">{0} പൈ.മീ.</unitPattern>
 				<unitPattern count="other">{0} പൈ.മീ.</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>മൈൽ</displayName>
+				<unitPattern count="one">{0} മൈൽ</unitPattern>
+				<unitPattern count="other">{0} മൈൽ</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>വാര</displayName>
-				<unitPattern count="one">{0} യാ</unitPattern>
-				<unitPattern count="other">{0} യാ</unitPattern>
+				<unitPattern count="one">{0} വാര</unitPattern>
+				<unitPattern count="other">{0} വാര</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>അടി</displayName>
+				<unitPattern count="one">{0} അടി</unitPattern>
+				<unitPattern count="other">{0} അടി</unitPattern>
+				<perUnitPattern>{0}/അടി</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>ഇഞ്ച്</displayName>
+				<unitPattern count="one">{0} ഇഞ്ച്</unitPattern>
+				<unitPattern count="other">{0} ഇഞ്ച്</unitPattern>
+				<perUnitPattern>{0}/ഇഞ്ച്</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>പാർസെക്</displayName>
+				<unitPattern count="one">{0} പാ.സെ.</unitPattern>
+				<unitPattern count="other">{0} പാ.സെ.</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>പ്രകാശവർഷം</displayName>
+				<unitPattern count="one">{0} പ്ര.വ.</unitPattern>
+				<unitPattern count="other">{0} പ്ര.വ.</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ജ്യോ.യൂ.</displayName>
+				<unitPattern count="one">{0} ജ്യോ.യൂ.</unitPattern>
+				<unitPattern count="other">{0} ജ്യോ.യൂ.</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>നോ.മൈ.</displayName>
+				<unitPattern count="one">{0} നോ.മൈ.</unitPattern>
+				<unitPattern count="other">{0} നോ.മൈ.</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>സ്.മൈ.</displayName>
+				<unitPattern count="one">{0} സ്.മൈ.</unitPattern>
+				<unitPattern count="other">{0} സ്.മൈ.</unitPattern>
 			</unit>
 			<unit type="light-lux">
 				<displayName>ലക്സ്</displayName>
 				<unitPattern count="one">{0} ലക്സ്</unitPattern>
 				<unitPattern count="other">{0} ലക്സ്</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>ക്യാരറ്റ്</displayName>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>ഗ്രാം</displayName>
-				<unitPattern count="one">{0} ഗ്രാം</unitPattern>
-				<unitPattern count="other">{0} ഗ്രാം</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>കി.ഗ്രാം</displayName>
-				<unitPattern count="one">{0} കി.ഗ്രാം</unitPattern>
-				<unitPattern count="other">{0} കി.ഗ്രാം</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>ട.</displayName>
 				<unitPattern count="one">{0} ട.</unitPattern>
 				<unitPattern count="other">{0} ട.</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µ.ഗ്രാം.</displayName>
-				<unitPattern count="one">{0} µ.ഗ്രാം.</unitPattern>
-				<unitPattern count="other">{0} µ.ഗ്രാം.</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>കി.ഗ്രാം</displayName>
+				<unitPattern count="one">{0} കി.ഗ്രാം</unitPattern>
+				<unitPattern count="other">{0} കി.ഗ്രാം</unitPattern>
+				<perUnitPattern>{0}/കി.ഗ്രാം</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>ഗ്രാം</displayName>
+				<unitPattern count="one">{0} ഗ്രാം</unitPattern>
+				<unitPattern count="other">{0} ഗ്രാം</unitPattern>
+				<perUnitPattern>{0}/ഗ്രാം</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>മി.ഗ്രാം.</displayName>
 				<unitPattern count="one">{0} മി.ഗ്രാം.</unitPattern>
 				<unitPattern count="other">{0} മി.ഗ്രാം.</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ഔ.</displayName>
-				<unitPattern count="one">{0} ഔ.</unitPattern>
-				<unitPattern count="other">{0} ഔ.</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ട്രോ.ഔ.</displayName>
-				<unitPattern count="one">{0} ട്രോ.ഔ.</unitPattern>
-				<unitPattern count="other">{0} ട്രോ.ഔ.</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>പൗണ്ട്</displayName>
-				<unitPattern count="one">{0} പൗ</unitPattern>
-				<unitPattern count="other">{0} പൗ</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µ.ഗ്രാം.</displayName>
+				<unitPattern count="one">{0} µ.ഗ്രാം.</unitPattern>
+				<unitPattern count="other">{0} µ.ഗ്രാം.</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>ടൺ</displayName>
 				<unitPattern count="one">{0} ടൺ</unitPattern>
 				<unitPattern count="other">{0} ടൺ</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>പൗണ്ട്</displayName>
+				<unitPattern count="one">{0} പൗ</unitPattern>
+				<unitPattern count="other">{0} പൗ</unitPattern>
+				<perUnitPattern>{0}/പൗ.</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ഔ.</displayName>
+				<unitPattern count="one">{0} ഔ.</unitPattern>
+				<unitPattern count="other">{0} ഔ.</unitPattern>
+				<perUnitPattern>{0}/ഔ.</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ട്രോ.ഔ.</displayName>
+				<unitPattern count="one">{0} ട്രോ.ഔ.</unitPattern>
+				<unitPattern count="other">{0} ട്രോ.ഔ.</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>ക്യാരറ്റ്</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>ജി.വാ.</displayName>
 				<unitPattern count="one">{0} ജി.വാ.</unitPattern>
 				<unitPattern count="other">{0} ജി.വാട്ട്</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>എച്ച്.പി.</displayName>
-				<unitPattern count="one">{0} എച്ച്.പി.</unitPattern>
-				<unitPattern count="other">{0} എച്ച്.പി.</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>കി.വാട്ട്</displayName>
-				<unitPattern count="one">{0} കി.വാ.</unitPattern>
-				<unitPattern count="other">{0} കി.വാ.</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>മെ.വാ.</displayName>
 				<unitPattern count="one">{0} മെ.വാ.</unitPattern>
 				<unitPattern count="other">{0} മെ.വാ.</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>മി.വാ.</displayName>
-				<unitPattern count="one">{0} മി.വാ.</unitPattern>
-				<unitPattern count="other">{0} മി.വാ.</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>കി.വാട്ട്</displayName>
+				<unitPattern count="one">{0} കി.വാ.</unitPattern>
+				<unitPattern count="other">{0} കി.വാ.</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>വാട്ട്</displayName>
 				<unitPattern count="one">{0} വാ.</unitPattern>
 				<unitPattern count="other">{0} വാ.</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>മി.വാ.</displayName>
+				<unitPattern count="one">{0} മി.വാ.</unitPattern>
+				<unitPattern count="other">{0} മി.വാ.</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>എച്ച്.പി.</displayName>
+				<unitPattern count="one">{0} എച്ച്.പി.</unitPattern>
+				<unitPattern count="other">{0} എച്ച്.പി.</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>ഹെ.പാ.</displayName>
 				<unitPattern count="one">{0} ഹെ.പാ.</unitPattern>
 				<unitPattern count="other">{0} ഹെ.പാ.</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>ഇഞ്ച് മെ.</displayName>
-				<unitPattern count="one">Hg ൽ {0}</unitPattern>
-				<unitPattern count="other">Hg ൽ {0}</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>മി.ബാർ</displayName>
-				<unitPattern count="one">{0} മി.ബാ</unitPattern>
-				<unitPattern count="other">{0} മി.ബാ</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>മിമീ.മെ.</displayName>
 				<unitPattern count="one">{0} മിമീ.മെ.</unitPattern>
@@ -7164,10 +7461,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} പിഎസ്ഐ</unitPattern>
 				<unitPattern count="other">{0} പിഎസ്ഐ</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>ക്യാരറ്റ്</displayName>
-				<unitPattern count="one">{0} ക്യാ.</unitPattern>
-				<unitPattern count="other">{0} ക്യാ.</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>ഇഞ്ച് മെ.</displayName>
+				<unitPattern count="one">{0} ഇഞ്ച് മെ.</unitPattern>
+				<unitPattern count="other">{0} ഇഞ്ച് മെ.</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>മി.ബാ</displayName>
+				<unitPattern count="one">{0} മി.ബാ</unitPattern>
+				<unitPattern count="other">{0} മി.ബാ</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>കി.മീ/മ.</displayName>
@@ -7184,6 +7486,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} മൈ/മ.</unitPattern>
 				<unitPattern count="other">{0} മൈ/മ.</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>നോട്ട്</displayName>
+				<unitPattern count="one">{0} നോട്ട്</unitPattern>
+				<unitPattern count="other">{0} നോട്ട്</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>ഡിഗ്രി.സെ.</displayName>
 				<unitPattern count="one">{0}°സെ</unitPattern>
@@ -7199,31 +7511,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K​</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ഏ. അടി</displayName>
-				<unitPattern count="one">{0} ഏ. അടി</unitPattern>
-				<unitPattern count="other">{0} ഏ. അടി</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>സെ.ലി.</displayName>
-				<unitPattern count="one">{0} സെ.ലി.</unitPattern>
-				<unitPattern count="other">{0} സെ.ലി.</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>സെ.മീ³</displayName>
-				<unitPattern count="one">{0} സെ.മീ³</unitPattern>
-				<unitPattern count="other">{0} സെ.മീ³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>അടി³</displayName>
-				<unitPattern count="one">{0} അടി³</unitPattern>
-				<unitPattern count="other">{0} അടി³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>ഇഞ്ച്³</displayName>
-				<unitPattern count="one">{0} ഇഞ്ച്³</unitPattern>
-				<unitPattern count="other">{0} ഇഞ്ച്³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>കി.മീ³</displayName>
 				<unitPattern count="one">{0} കി.മീ³</unitPattern>
@@ -7233,6 +7520,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>മീ³</displayName>
 				<unitPattern count="one">{0} മീ³</unitPattern>
 				<unitPattern count="other">{0} മീ³</unitPattern>
+				<perUnitPattern>{0}/മീ³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>സെ.മീ³</displayName>
+				<unitPattern count="one">{0} സെ.മീ³</unitPattern>
+				<unitPattern count="other">{0} സെ.മീ³</unitPattern>
+				<perUnitPattern>{0}/സെ.മീ³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>മൈ³</displayName>
@@ -7244,25 +7538,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} വാ³</unitPattern>
 				<unitPattern count="other">{0} വാ³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>കപ്പ്</displayName>
-				<unitPattern count="one">{0} കപ്പ്</unitPattern>
-				<unitPattern count="other">{0} കപ്പ്</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>അടി³</displayName>
+				<unitPattern count="one">{0} അടി³</unitPattern>
+				<unitPattern count="other">{0} അടി³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>ഡെ.ലി.</displayName>
-				<unitPattern count="one">{0} ഡെ.ലി.</unitPattern>
-				<unitPattern count="other">{0} ഡെ.ലി.</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>ഇഞ്ച്³</displayName>
+				<unitPattern count="one">{0} ഇഞ്ച്³</unitPattern>
+				<unitPattern count="other">{0} ഇഞ്ച്³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>ഫ്ലൂ. ഔ.</displayName>
-				<unitPattern count="one">{0} ഫ്ലൂ. ഔ.</unitPattern>
-				<unitPattern count="other">{0} ഫ്ലൂ. ഔ.</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>ഗാ.</displayName>
-				<unitPattern count="one">{0} ഗാ.</unitPattern>
-				<unitPattern count="other">{0} ഗാ.</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>മെ.ലി.</displayName>
+				<unitPattern count="one">{0} മെ.ലി.</unitPattern>
+				<unitPattern count="other">{0} മെ.ലി.</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>ഹെ.ലി.</displayName>
@@ -7273,27 +7562,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ലിറ്റർ</displayName>
 				<unitPattern count="one">{0} ലി.</unitPattern>
 				<unitPattern count="other">{0} ലി.</unitPattern>
+				<perUnitPattern>{0}/ലി.</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>മെ.ലി.</displayName>
-				<unitPattern count="one">{0} മെ.ലി.</unitPattern>
-				<unitPattern count="other">{0} മെ.ലി.</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>ഡെ.ലി.</displayName>
+				<unitPattern count="one">{0} ഡെ.ലി.</unitPattern>
+				<unitPattern count="other">{0} ഡെ.ലി.</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>സെ.ലി.</displayName>
+				<unitPattern count="one">{0} സെ.ലി.</unitPattern>
+				<unitPattern count="other">{0} സെ.ലി.</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>മി.ലി.</displayName>
 				<unitPattern count="one">{0} മി.ലി.</unitPattern>
 				<unitPattern count="other">{0} മി.ലി.</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>പൈ.</displayName>
-				<unitPattern count="one">{0} പൈ.</unitPattern>
-				<unitPattern count="other">{0} പൈ.</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>മെ. പൈ.</displayName>
+				<unitPattern count="one">{0} മെ. പൈ.</unitPattern>
+				<unitPattern count="other">{0} മെ. പൈ.</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>മെ. ക.</displayName>
+				<unitPattern count="one">{0} മെ. ക.</unitPattern>
+				<unitPattern count="other">{0} മെ. ക.</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ഏ. അടി</displayName>
+				<unitPattern count="one">{0} ഏ. അടി</unitPattern>
+				<unitPattern count="other">{0} ഏ. അടി</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>ഗാ.</displayName>
+				<unitPattern count="one">{0} ഗാ.</unitPattern>
+				<unitPattern count="other">{0} ഗാ.</unitPattern>
+				<perUnitPattern>{0}/ഗാ.</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>ക്വാ.</displayName>
 				<unitPattern count="one">{0} ക്വാ.</unitPattern>
 				<unitPattern count="other">{0} ക്വാ.</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>പൈ.</displayName>
+				<unitPattern count="one">{0} പൈ.</unitPattern>
+				<unitPattern count="other">{0} പൈ.</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>കപ്പ്</displayName>
+				<unitPattern count="one">{0} കപ്പ്</unitPattern>
+				<unitPattern count="other">{0} കപ്പ്</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>ഫ്ലൂ. ഔ.</displayName>
+				<unitPattern count="one">{0} ഫ്ലൂ. ഔ.</unitPattern>
+				<unitPattern count="other">{0} ഫ്ലൂ. ഔ.</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>ടേ.സ്‌പൂ.</displayName>
 				<unitPattern count="one">{0} ടേ.സ്‌പൂ.</unitPattern>
@@ -7304,6 +7630,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ടീ.സ്‌പൂ.</unitPattern>
 				<unitPattern count="other">{0} ടീ.സ്‌പൂ.</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}കി.</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}വ.</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}തെ.</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}പ.</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -7313,6 +7645,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ജി</unitPattern>
 				<unitPattern count="other">{0} ജി</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -7321,26 +7657,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} ഏ</unitPattern>
-				<unitPattern count="other">{0} ഏക്ക</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} ച.കിമീ</unitPattern>
+				<unitPattern count="other">{0} ച.കിമീ</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} ഹെ</unitPattern>
 				<unitPattern count="other">{0} ഹെ</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} ച. അടി</unitPattern>
-				<unitPattern count="other">{0} ച.അടി</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} ച.കിമീ</unitPattern>
-				<unitPattern count="other">{0} ച.കിമീ</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} ച.മീ</unitPattern>
 				<unitPattern count="other">{0} ച.മീ</unitPattern>
@@ -7349,6 +7673,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ച.മൈ</unitPattern>
 				<unitPattern count="other">{0} ച.മൈ</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} ഏ</unitPattern>
+				<unitPattern count="other">{0} ഏക്ക</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ച. അടി</unitPattern>
+				<unitPattern count="other">{0} ച.അടി</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ലി./100 കി.മീ.</displayName>
+				<unitPattern count="one">{0}ലി/100കിമി</unitPattern>
+				<unitPattern count="other">{0}ലി/100കിമി</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>വ</displayName>
+				<unitPattern count="one">{0} വ</unitPattern>
+				<unitPattern count="other">{0} വ</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>മാസം</displayName>
+				<unitPattern count="one">{0} മാ</unitPattern>
+				<unitPattern count="other">{0} മാ</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ആ</displayName>
+				<unitPattern count="one">{0} ആ</unitPattern>
+				<unitPattern count="other">{0} ആ</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ദിവസം</displayName>
 				<unitPattern count="one">{0} ദി</unitPattern>
@@ -7359,66 +7711,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} മ</unitPattern>
 				<unitPattern count="other">{0} മ</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>മി.സെ.</displayName>
-				<unitPattern count="one">{0} മി.സെ.</unitPattern>
-				<unitPattern count="other">{0} മി.സെ.</unitPattern>
-			</unit>
 			<unit type="duration-minute">
-				<displayName>മിനിറ്റ്</displayName>
+				<displayName>മി.</displayName>
 				<unitPattern count="one">{0} മി.</unitPattern>
 				<unitPattern count="other">{0} മി.</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>മാസം</displayName>
-				<unitPattern count="one">{0} മാ</unitPattern>
-				<unitPattern count="other">{0} മാ</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>സെ.</displayName>
 				<unitPattern count="one">{0} സെ.</unitPattern>
 				<unitPattern count="other">{0} സെ.</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>ആ</displayName>
-				<unitPattern count="one">{0} ആ</unitPattern>
-				<unitPattern count="other">{0} ആ</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>വർഷം</displayName>
-				<unitPattern count="one">{0} വ</unitPattern>
-				<unitPattern count="other">{0} വ</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>സെ.മീ.</displayName>
-				<unitPattern count="one">{0} സെ.മീ.</unitPattern>
-				<unitPattern count="other">{0} സെ.മീ.</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0}′</unitPattern>
-				<unitPattern count="other">{0}′</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0}″</unitPattern>
-				<unitPattern count="other">{0}″</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>മി.സെ.</displayName>
+				<unitPattern count="one">{0} മി.സെ.</unitPattern>
+				<unitPattern count="other">{0} മി.സെ.</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>കി.മീ.</displayName>
 				<unitPattern count="one">{0} കി.മീ.</unitPattern>
 				<unitPattern count="other">{0} കി.മീ.</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} പ്ര.വ</unitPattern>
-				<unitPattern count="other">{0} പ്ര.വ</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>മീറ്റർ</displayName>
 				<unitPattern count="one">{0} മീ.</unitPattern>
 				<unitPattern count="other">{0} മീ.</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} മൈ</unitPattern>
-				<unitPattern count="other">{0} മൈ</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>സെ.മീ.</displayName>
+				<unitPattern count="one">{0} സെ.മീ.</unitPattern>
+				<unitPattern count="other">{0} സെ.മീ.</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>മി.മീ.</displayName>
@@ -7429,31 +7750,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} പൈ.മീ</unitPattern>
 				<unitPattern count="other">{0} പൈ.മീ</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} മൈ</unitPattern>
+				<unitPattern count="other">{0} മൈ</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} യാ</unitPattern>
 				<unitPattern count="other">{0} യാ</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="other">{0}′</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} പ്ര.വ</unitPattern>
+				<unitPattern count="other">{0} പ്ര.വ</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>കി.ഗ്രാം</displayName>
+				<unitPattern count="one">{0}കി.ഗ്രാം</unitPattern>
+				<unitPattern count="other">{0}കി.ഗ്രാം</unitPattern>
+			</unit>
 			<unit type="mass-gram">
 				<displayName>ഗ്രാം</displayName>
 				<unitPattern count="one">{0} ഗ്രാം</unitPattern>
 				<unitPattern count="other">{0} ഗ്രാം</unitPattern>
 			</unit>
-			<unit type="mass-kilogram">
-				<displayName>കി.ഗ്രാം</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} ഔ</unitPattern>
-				<unitPattern count="other">{0} ഔ</unitPattern>
-			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} പൗ</unitPattern>
 				<unitPattern count="other">{0} പൗ</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} ഔ</unitPattern>
+				<unitPattern count="other">{0} ഔ</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one" draft="contributed">{0}kW</unitPattern>
@@ -7463,6 +7796,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} വാ</unitPattern>
 				<unitPattern count="other">{0} വാ</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
@@ -7510,6 +7847,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ലി.</unitPattern>
 				<unitPattern count="other">{0} ലി.</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}കി.</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}വ.</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}തെ.</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}പ.</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ml_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ml_IN.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ml_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ml_IN.xml
index f41981a1b81..689794dc35e 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ml_IN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ml_IN.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ml"/>
 		<territory type="IN"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mn.xml
similarity index 97%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mn.xml
index bd9ce1b703a..1da1718020f 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mn.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mn.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="mn"/>
 	</identity>
 	<localeDisplayNames>
@@ -218,7 +217,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="su">сундан</language>
 			<language type="sv">швед</language>
 			<language type="sw">свахили</language>
-			<language type="swc">конго свахили</language>
+			<language type="sw_CD">конго свахили</language>
 			<language type="ta">тамил</language>
 			<language type="te">тэлүгү</language>
 			<language type="teo">тэсо</language>
@@ -506,7 +505,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="NF">Норфолк Арлууд</territory>
 			<territory type="NG">Нигери</territory>
 			<territory type="NI">Никарагуа</territory>
-			<territory type="NL">Голланд</territory>
+			<territory type="NL">Нидерланд</territory>
 			<territory type="NO">Норвеги</territory>
 			<territory type="NP">Балба</territory>
 			<territory type="NR">Науру</territory>
@@ -605,56 +604,56 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="numbers">Тоо</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">араб-энэтхэг тоо</type>
-			<type type="arabext" key="numbers">өргөтгөсөн араб-энэтхэг тоо</type>
-			<type type="armn" key="numbers">армен тоо</type>
-			<type type="armnlow" key="numbers">жижиг армен тоо</type>
-			<type type="beng" key="numbers">бенгал тоо</type>
-			<type type="buddhist" key="calendar">буддын хуанли</type>
-			<type type="chinese" key="calendar">хятад хуанли</type>
-			<type type="dangi" key="calendar">данги хуанли</type>
-			<type type="deva" key="numbers">деванагари тоо</type>
-			<type type="ducet" key="collation">юникодын үндсэн эрэмбэлэх дараалал</type>
-			<type type="ethi" key="numbers">этиоп тоо</type>
-			<type type="ethiopic" key="calendar">этиоп хуанли</type>
-			<type type="fullwide" key="numbers">бүрэн хэмжээтэй тоо</type>
-			<type type="geor" key="numbers">гүрж тоо</type>
-			<type type="gregorian" key="calendar">грегорийн хуанли</type>
-			<type type="grek" key="numbers">грек тоо</type>
-			<type type="greklow" key="numbers">жижиг грек тоо</type>
-			<type type="gujr" key="numbers">гүжарати тоо</type>
-			<type type="guru" key="numbers">гүрмүкхи тоо</type>
-			<type type="hanidec" key="numbers">хятад аравтын тоо</type>
-			<type type="hans" key="numbers">хялбаршуулсан хятад тоо</type>
-			<type type="hansfin" key="numbers">хялбаршуулсан хятад санхүүгийн тоо</type>
-			<type type="hant" key="numbers">уламжлалт хятад тоо</type>
-			<type type="hantfin" key="numbers">уламжлалт хятад санхүүгийн тоо</type>
-			<type type="hebr" key="numbers">еврей тоо</type>
-			<type type="hebrew" key="calendar">еврей хуанли</type>
-			<type type="islamic" key="calendar">исламын хуанли</type>
-			<type type="iso8601" key="calendar">ISO-8601 хуанли</type>
-			<type type="japanese" key="calendar">япон хуанли</type>
-			<type type="jpan" key="numbers">япон тоо</type>
-			<type type="jpanfin" key="numbers">япон санхүүгийн тоо</type>
-			<type type="khmr" key="numbers">кхмер тоо</type>
-			<type type="knda" key="numbers">каннада тоо</type>
-			<type type="laoo" key="numbers">лаос тоо</type>
-			<type type="latn" key="numbers">араб тоо</type>
-			<type type="mlym" key="numbers">малаялам тоо</type>
-			<type type="mong" key="numbers">монгол тоо</type>
-			<type type="mymr" key="numbers">мьянмар тоо</type>
-			<type type="orya" key="numbers">ория тоо</type>
-			<type type="persian" key="calendar">перс хуанли</type>
-			<type type="roc" key="calendar">минго хуанли</type>
-			<type type="roman" key="numbers">ром тоо</type>
-			<type type="romanlow" key="numbers">жижиг ром тоо</type>
-			<type type="search" key="collation">ерөнхий зорилготой хайлт</type>
-			<type type="standard" key="collation">стандарт эрэмбэлэх дараалал</type>
-			<type type="taml" key="numbers">уламжлалт тамил тоо</type>
-			<type type="tamldec" key="numbers">тамил тоо</type>
-			<type type="telu" key="numbers">телүгү тоо</type>
-			<type type="thai" key="numbers">тай тоо</type>
-			<type type="tibt" key="numbers">тибет тоо</type>
+			<type key="calendar" type="buddhist">буддын хуанли</type>
+			<type key="calendar" type="chinese">хятад хуанли</type>
+			<type key="calendar" type="dangi">данги хуанли</type>
+			<type key="calendar" type="ethiopic">этиоп хуанли</type>
+			<type key="calendar" type="gregorian">грегорийн хуанли</type>
+			<type key="calendar" type="hebrew">еврей хуанли</type>
+			<type key="calendar" type="islamic">исламын хуанли</type>
+			<type key="calendar" type="iso8601">ISO-8601 хуанли</type>
+			<type key="calendar" type="japanese">япон хуанли</type>
+			<type key="calendar" type="persian">перс хуанли</type>
+			<type key="calendar" type="roc">минго хуанли</type>
+			<type key="collation" type="ducet">юникодын үндсэн эрэмбэлэх дараалал</type>
+			<type key="collation" type="search">ерөнхий зорилготой хайлт</type>
+			<type key="collation" type="standard">стандарт эрэмбэлэх дараалал</type>
+			<type key="numbers" type="arab">араб-энэтхэг тоо</type>
+			<type key="numbers" type="arabext">өргөтгөсөн араб-энэтхэг тоо</type>
+			<type key="numbers" type="armn">армен тоо</type>
+			<type key="numbers" type="armnlow">жижиг армен тоо</type>
+			<type key="numbers" type="beng">бенгал тоо</type>
+			<type key="numbers" type="deva">деванагари тоо</type>
+			<type key="numbers" type="ethi">этиоп тоо</type>
+			<type key="numbers" type="fullwide">бүрэн хэмжээтэй тоо</type>
+			<type key="numbers" type="geor">гүрж тоо</type>
+			<type key="numbers" type="grek">грек тоо</type>
+			<type key="numbers" type="greklow">жижиг грек тоо</type>
+			<type key="numbers" type="gujr">гүжарати тоо</type>
+			<type key="numbers" type="guru">гүрмүкхи тоо</type>
+			<type key="numbers" type="hanidec">хятад аравтын тоо</type>
+			<type key="numbers" type="hans">хялбаршуулсан хятад тоо</type>
+			<type key="numbers" type="hansfin">хялбаршуулсан хятад санхүүгийн тоо</type>
+			<type key="numbers" type="hant">уламжлалт хятад тоо</type>
+			<type key="numbers" type="hantfin">уламжлалт хятад санхүүгийн тоо</type>
+			<type key="numbers" type="hebr">еврей тоо</type>
+			<type key="numbers" type="jpan">япон тоо</type>
+			<type key="numbers" type="jpanfin">япон санхүүгийн тоо</type>
+			<type key="numbers" type="khmr">кхмер тоо</type>
+			<type key="numbers" type="knda">каннада тоо</type>
+			<type key="numbers" type="laoo">лаос тоо</type>
+			<type key="numbers" type="latn">араб тоо</type>
+			<type key="numbers" type="mlym">малаялам тоо</type>
+			<type key="numbers" type="mong">монгол тоо</type>
+			<type key="numbers" type="mymr">мьянмар тоо</type>
+			<type key="numbers" type="orya">ория тоо</type>
+			<type key="numbers" type="roman">ром тоо</type>
+			<type key="numbers" type="romanlow">жижиг ром тоо</type>
+			<type key="numbers" type="taml">уламжлалт тамил тоо</type>
+			<type key="numbers" type="tamldec">тамил тоо</type>
+			<type key="numbers" type="telu">телүгү тоо</type>
+			<type key="numbers" type="thai">тай тоо</type>
+			<type key="numbers" type="tibt">тибет тоо</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">метрийн</measurementSystemName>
@@ -1073,15 +1072,47 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">үө</dayPeriod>
-							<dayPeriod type="noon">үд</dayPeriod>
-							<dayPeriod type="pm">үх</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">шөнө дунд</dayPeriod>
 							<dayPeriod type="am">ҮӨ</dayPeriod>
 							<dayPeriod type="noon">үд дунд</dayPeriod>
 							<dayPeriod type="pm">ҮХ</dayPeriod>
+							<dayPeriod type="morning1">өглөө</dayPeriod>
+							<dayPeriod type="afternoon1">өдөр</dayPeriod>
+							<dayPeriod type="evening1">орой</dayPeriod>
+							<dayPeriod type="night1">шөнө</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">шөнө дунд</dayPeriod>
+							<dayPeriod type="am">үө</dayPeriod>
+							<dayPeriod type="noon">үд</dayPeriod>
+							<dayPeriod type="pm">үх</dayPeriod>
+							<dayPeriod type="morning1">өглөө</dayPeriod>
+							<dayPeriod type="afternoon1">өдөр</dayPeriod>
+							<dayPeriod type="evening1">орой</dayPeriod>
+							<dayPeriod type="night1">шөнө</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">шөнө дунд</dayPeriod>
+							<dayPeriod type="am">ҮӨ</dayPeriod>
+							<dayPeriod type="noon">үд дунд</dayPeriod>
+							<dayPeriod type="pm">ҮХ</dayPeriod>
+							<dayPeriod type="morning1">өглөө</dayPeriod>
+							<dayPeriod type="afternoon1">өдөр</dayPeriod>
+							<dayPeriod type="evening1">орой</dayPeriod>
+							<dayPeriod type="night1">шөнө</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">шөнө дунд</dayPeriod>
+							<dayPeriod type="am" draft="provisional">ҮӨ</dayPeriod>
+							<dayPeriod type="noon">үд дунд</dayPeriod>
+							<dayPeriod type="pm" draft="provisional">ҮХ</dayPeriod>
+							<dayPeriod type="morning1">өглөө</dayPeriod>
+							<dayPeriod type="afternoon1">өдөр</dayPeriod>
+							<dayPeriod type="evening1">орой</dayPeriod>
+							<dayPeriod type="night1">шөнө</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1093,14 +1124,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<era type="1" alt="variant">НТ</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0">МЭӨ</era>
+						<era type="0">м.э.ө</era>
 						<era type="0" alt="variant">НТӨ</era>
-						<era type="1">МЭ</era>
+						<era type="1">м.э.</era>
 						<era type="1" alt="variant">НТ</era>
 					</eraAbbr>
 					<eraNarrow>
-						<era type="0">м.э.ө</era>
-						<era type="1">м.э.</era>
+						<era type="0">МЭӨ</era>
+						<era type="1">МЭ</era>
 					</eraNarrow>
 				</eras>
 				<dateFormats>
@@ -3940,6 +3971,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤ #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤ 0М</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤ 0М</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤ 00М</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00М</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤ 000М</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000М</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤ 0С</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0С</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤ 00С</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00С</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤ 000С</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000С</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤ 0Т</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0Т</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤ 00Т</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00Т</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤ 000Т</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000Т</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤ 0ИН</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0ИН</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤ 00ИН</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00ИН</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤ 000ИН</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000ИН</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4963,6 +5022,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} метр сек кв</unitPattern>
 				<unitPattern count="other">{0} метр сек кв</unitPattern>
 			</unit>
+			<unit type="angle-radian">
+				<displayName>радиан</displayName>
+				<unitPattern count="one">{0} радиан</unitPattern>
+				<unitPattern count="other">{0} радиан</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>хэм</displayName>
+				<unitPattern count="one">{0} хэм</unitPattern>
+				<unitPattern count="other">{0} хэм</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>аркминут</displayName>
 				<unitPattern count="one">{0} аркминут</unitPattern>
@@ -4973,31 +5042,41 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} арксекунд</unitPattern>
 				<unitPattern count="other">{0} арксекунд</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>хэм</displayName>
-				<unitPattern count="one">{0} хэм</unitPattern>
-				<unitPattern count="other">{0} хэм</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>радиан</displayName>
-				<unitPattern count="one">{0} радиан</unitPattern>
-				<unitPattern count="other">{0} радиан</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>акр</displayName>
-				<unitPattern count="one">{0} акр</unitPattern>
-				<unitPattern count="other">{0} акр</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>километр квадрат</displayName>
+				<unitPattern count="one">{0} километр квадрат</unitPattern>
+				<unitPattern count="other">{0} километр квадрат</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>гектар</displayName>
 				<unitPattern count="one">{0} гектар</unitPattern>
 				<unitPattern count="other">{0} гектар</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>метр квадрат</displayName>
+				<unitPattern count="one">{0} метр квадрат</unitPattern>
+				<unitPattern count="other">{0} метр квадрат</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>сантиметр квадрат</displayName>
 				<unitPattern count="one">{0} сантиметр квадрат</unitPattern>
 				<unitPattern count="other">{0} сантиметр квадрат</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<displayName>миль квадрат</displayName>
+				<unitPattern count="one">{0} миль квадрат</unitPattern>
+				<unitPattern count="other">{0} миль квадрат</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>акр</displayName>
+				<unitPattern count="one">{0} акр</unitPattern>
+				<unitPattern count="other">{0} акр</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>ярд квадрат</displayName>
+				<unitPattern count="one">{0} ярд квадрат</unitPattern>
+				<unitPattern count="other">{0} ярд квадрат</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<displayName>фүүт квадрат</displayName>
 				<unitPattern count="one">{0} фүүт квадрат</unitPattern>
@@ -5008,25 +5087,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} инч квадрат</unitPattern>
 				<unitPattern count="other">{0} инч квадрат</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>километр квадрат</displayName>
-				<unitPattern count="one">{0} километр квадрат</unitPattern>
-				<unitPattern count="other">{0} километр квадрат</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>метр квадрат</displayName>
-				<unitPattern count="one">{0} метр квадрат</unitPattern>
-				<unitPattern count="other">{0} метр квадрат</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>миль квадрат</displayName>
-				<unitPattern count="one">{0} миль квадрат</unitPattern>
-				<unitPattern count="other">{0} миль квадрат</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>ярд квадрат</displayName>
-				<unitPattern count="one">{0} ярд квадрат</unitPattern>
-				<unitPattern count="other">{0} ярд квадрат</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>карат</displayName>
+				<unitPattern count="one">{0} карат</unitPattern>
+				<unitPattern count="other">{0} карат</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>литр/километр</displayName>
@@ -5038,55 +5102,70 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} миль/галлон</unitPattern>
 				<unitPattern count="other">{0} миль/галлон</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>бит</displayName>
-				<unitPattern count="one">{0} бит</unitPattern>
-				<unitPattern count="other">{0} бит</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>байт</displayName>
-				<unitPattern count="one">{0} байт</unitPattern>
-				<unitPattern count="other">{0} байт</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>гигабит</displayName>
-				<unitPattern count="one">{0} гигабит</unitPattern>
-				<unitPattern count="other">{0} гигабит</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>гигабайт</displayName>
-				<unitPattern count="one">{0} гигабайт</unitPattern>
-				<unitPattern count="other">{0} гигабайт</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>килобит</displayName>
-				<unitPattern count="one">{0} килобит</unitPattern>
-				<unitPattern count="other">{0} килобит</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>килобайт</displayName>
-				<unitPattern count="one">{0} килобайт</unitPattern>
-				<unitPattern count="other">{0} килобайт</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>мегабит</displayName>
-				<unitPattern count="one">{0} мегабит</unitPattern>
-				<unitPattern count="other">{0} мегабит</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>мегабайт</displayName>
-				<unitPattern count="one">{0} мегабайт</unitPattern>
-				<unitPattern count="other">{0} мегабайт</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>терабайт</displayName>
+				<unitPattern count="one">{0} терабайт</unitPattern>
+				<unitPattern count="other">{0} терабайт</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>терабит</displayName>
 				<unitPattern count="one">{0} терабит</unitPattern>
 				<unitPattern count="other">{0} терабит</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>терабайт</displayName>
-				<unitPattern count="one">{0} терабайт</unitPattern>
-				<unitPattern count="other">{0} терабайт</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>гигабайт</displayName>
+				<unitPattern count="one">{0} гигабайт</unitPattern>
+				<unitPattern count="other">{0} гигабайт</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>гигабит</displayName>
+				<unitPattern count="one">{0} гигабит</unitPattern>
+				<unitPattern count="other">{0} гигабит</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>мегабайт</displayName>
+				<unitPattern count="one">{0} мегабайт</unitPattern>
+				<unitPattern count="other">{0} мегабайт</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>мегабит</displayName>
+				<unitPattern count="one">{0} мегабит</unitPattern>
+				<unitPattern count="other">{0} мегабит</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>килобайт</displayName>
+				<unitPattern count="one">{0} килобайт</unitPattern>
+				<unitPattern count="other">{0} килобайт</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>килобит</displayName>
+				<unitPattern count="one">{0} килобит</unitPattern>
+				<unitPattern count="other">{0} килобит</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>байт</displayName>
+				<unitPattern count="one">{0} байт</unitPattern>
+				<unitPattern count="other">{0} байт</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>бит</displayName>
+				<unitPattern count="one">{0} бит</unitPattern>
+				<unitPattern count="other">{0} бит</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>жил</displayName>
+				<unitPattern count="one">{0} жил</unitPattern>
+				<unitPattern count="other">{0} жил</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>сар</displayName>
+				<unitPattern count="one">{0} сар</unitPattern>
+				<unitPattern count="other">{0} сар</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>долоо хоног</displayName>
+				<unitPattern count="one">{0} долоо хоног</unitPattern>
+				<unitPattern count="other">{0} долоо хоног</unitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>өдөр</displayName>
@@ -5099,46 +5178,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} цаг</unitPattern>
 				<perUnitPattern>{0} цагт</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>микросекунд</displayName>
-				<unitPattern count="one">{0} микросекунд</unitPattern>
-				<unitPattern count="other">{0} микросекунд</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>милисекунд</displayName>
-				<unitPattern count="one">{0} милисекунд</unitPattern>
-				<unitPattern count="other">{0} милисекунд</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>минут</displayName>
 				<unitPattern count="one">{0} минут</unitPattern>
 				<unitPattern count="other">{0} минут</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>сар</displayName>
-				<unitPattern count="one">{0} сар</unitPattern>
-				<unitPattern count="other">{0} сар</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>наносекунд</displayName>
-				<unitPattern count="one">{0} наносекунд</unitPattern>
-				<unitPattern count="other">{0} наносекунд</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>секунд</displayName>
 				<unitPattern count="one">{0} секунд</unitPattern>
 				<unitPattern count="other">{0} секунд</unitPattern>
 				<perUnitPattern>{0} секундэд</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>долоо хоног</displayName>
-				<unitPattern count="one">{0} долоо хоног</unitPattern>
-				<unitPattern count="other">{0} долоо хоног</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>милисекунд</displayName>
+				<unitPattern count="one">{0} милисекунд</unitPattern>
+				<unitPattern count="other">{0} милисекунд</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>жил</displayName>
-				<unitPattern count="one">{0} жил</unitPattern>
-				<unitPattern count="other">{0} жил</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>микросекунд</displayName>
+				<unitPattern count="one">{0} микросекунд</unitPattern>
+				<unitPattern count="other">{0} микросекунд</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>наносекунд</displayName>
+				<unitPattern count="one">{0} наносекунд</unitPattern>
+				<unitPattern count="other">{0} наносекунд</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ампер</displayName>
@@ -5160,6 +5224,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} вольт</unitPattern>
 				<unitPattern count="other">{0} вольт</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>килокалори</displayName>
+				<unitPattern count="one">{0} килокалори</unitPattern>
+				<unitPattern count="other">{0} килокалори</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>калори</displayName>
 				<unitPattern count="one">{0} калори</unitPattern>
@@ -5170,21 +5239,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Калори</unitPattern>
 				<unitPattern count="other">{0} Калори</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>жоуль</displayName>
-				<unitPattern count="one">{0} жоуль</unitPattern>
-				<unitPattern count="other">{0} жоуль</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>килокалори</displayName>
-				<unitPattern count="one">{0} килокалори</unitPattern>
-				<unitPattern count="other">{0} килокалори</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>киложоуль</displayName>
 				<unitPattern count="one">{0} киложоуль</unitPattern>
 				<unitPattern count="other">{0} киложоуль</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>жоуль</displayName>
+				<unitPattern count="one">{0} жоуль</unitPattern>
+				<unitPattern count="other">{0} жоуль</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>киловатт цаг</displayName>
 				<unitPattern count="one">{0} киловатт цаг</unitPattern>
@@ -5195,35 +5259,70 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} гигагерц</unitPattern>
 				<unitPattern count="other">{0} гигагерц</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>герц</displayName>
-				<unitPattern count="one">{0} герц</unitPattern>
-				<unitPattern count="other">{0} герц</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>мегагерц</displayName>
+				<unitPattern count="one">{0} мегагерц</unitPattern>
+				<unitPattern count="other">{0} мегагерц</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>килогерц</displayName>
 				<unitPattern count="one">{0} килогерц</unitPattern>
 				<unitPattern count="other">{0} килогерц</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>мегагерц</displayName>
-				<unitPattern count="one">{0} мегагерц</unitPattern>
-				<unitPattern count="other">{0} мегагерц</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>герц</displayName>
+				<unitPattern count="one">{0} герц</unitPattern>
+				<unitPattern count="other">{0} герц</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>сансрын нэгж</displayName>
-				<unitPattern count="one">{0} сансрын нэгж</unitPattern>
-				<unitPattern count="other">{0} сансрын нэгж</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>километр</displayName>
+				<unitPattern count="one">{0} километр</unitPattern>
+				<unitPattern count="other">{0} километр</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>метр</displayName>
+				<unitPattern count="one">{0} метр</unitPattern>
+				<unitPattern count="other">{0} метр</unitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>дециметр</displayName>
+				<unitPattern count="one">{0} дециметр</unitPattern>
+				<unitPattern count="other">{0} дециметр</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
 				<displayName>сантиметр</displayName>
 				<unitPattern count="one">{0} сантиметр</unitPattern>
 				<unitPattern count="other">{0} сантиметр</unitPattern>
 			</unit>
-			<unit type="length-decimeter">
-				<displayName>дециметр</displayName>
-				<unitPattern count="one">{0} дециметр</unitPattern>
-				<unitPattern count="other">{0} дециметр</unitPattern>
+			<unit type="length-millimeter">
+				<displayName>милиметр</displayName>
+				<unitPattern count="one">{0} милиметр</unitPattern>
+				<unitPattern count="other">{0} милиметр</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>микрометр</displayName>
+				<unitPattern count="one">{0} микрометр</unitPattern>
+				<unitPattern count="other">{0} микрометр</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>нанометр</displayName>
+				<unitPattern count="one">{0} нанометр</unitPattern>
+				<unitPattern count="other">{0} нанометр</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>пикометр</displayName>
+				<unitPattern count="one">{0} пикометр</unitPattern>
+				<unitPattern count="other">{0} пикометр</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>миль</displayName>
+				<unitPattern count="one">{0} миль</unitPattern>
+				<unitPattern count="other">{0} миль</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>ярд</displayName>
+				<unitPattern count="one">{0} ярд</unitPattern>
+				<unitPattern count="other">{0} ярд</unitPattern>
 			</unit>
 			<unit type="length-foot">
 				<displayName>фүүт</displayName>
@@ -5235,96 +5334,66 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} инч</unitPattern>
 				<unitPattern count="other">{0} инч</unitPattern>
 			</unit>
-			<unit type="length-kilometer">
-				<displayName>километр</displayName>
-				<unitPattern count="one">{0} километр</unitPattern>
-				<unitPattern count="other">{0} километр</unitPattern>
+			<unit type="length-parsec">
+				<displayName>парсек</displayName>
+				<unitPattern count="one">{0} парсек</unitPattern>
+				<unitPattern count="other">{0} парсек</unitPattern>
 			</unit>
 			<unit type="length-light-year">
 				<displayName>гэрлийн жил</displayName>
 				<unitPattern count="one">{0} гэрлийн жил</unitPattern>
 				<unitPattern count="other">{0} гэрлийн жил</unitPattern>
 			</unit>
-			<unit type="length-meter">
-				<displayName>метр</displayName>
-				<unitPattern count="one">{0} метр</unitPattern>
-				<unitPattern count="other">{0} метр</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>микрометр</displayName>
-				<unitPattern count="one">{0} микрометр</unitPattern>
-				<unitPattern count="other">{0} микрометр</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>миль</displayName>
-				<unitPattern count="one">{0} миль</unitPattern>
-				<unitPattern count="other">{0} миль</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>милиметр</displayName>
-				<unitPattern count="one">{0} милиметр</unitPattern>
-				<unitPattern count="other">{0} милиметр</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<displayName>нанометр</displayName>
-				<unitPattern count="one">{0} нанометр</unitPattern>
-				<unitPattern count="other">{0} нанометр</unitPattern>
+			<unit type="length-astronomical-unit">
+				<displayName>сансрын нэгж</displayName>
+				<unitPattern count="one">{0} сансрын нэгж</unitPattern>
+				<unitPattern count="other">{0} сансрын нэгж</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
 				<displayName>далайн миль</displayName>
 				<unitPattern count="one">{0} далайн миль</unitPattern>
 				<unitPattern count="other">{0} далайн миль</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<displayName>парсек</displayName>
-				<unitPattern count="one">{0} парсек</unitPattern>
-				<unitPattern count="other">{0} парсек</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName>пикометр</displayName>
-				<unitPattern count="one">{0} пикометр</unitPattern>
-				<unitPattern count="other">{0} пикометр</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<displayName>ярд</displayName>
-				<unitPattern count="one">{0} ярд</unitPattern>
-				<unitPattern count="other">{0} ярд</unitPattern>
-			</unit>
 			<unit type="light-lux">
 				<displayName>люкс</displayName>
 				<unitPattern count="one">{0} люкс</unitPattern>
 				<unitPattern count="other">{0} люкс</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>карат</displayName>
-				<unitPattern count="one">{0} карат</unitPattern>
-				<unitPattern count="other">{0} карат</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>грам</displayName>
-				<unitPattern count="one">{0} грам</unitPattern>
-				<unitPattern count="other">{0} грам</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>килограм</displayName>
-				<unitPattern count="one">{0} килограм</unitPattern>
-				<unitPattern count="other">{0} килограм</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>метрийн тонн</displayName>
 				<unitPattern count="one">{0} метрийн тонн</unitPattern>
 				<unitPattern count="other">{0} метрийн тонн</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>микрограм</displayName>
-				<unitPattern count="one">{0} микрограм</unitPattern>
-				<unitPattern count="other">{0} микрограм</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>килограм</displayName>
+				<unitPattern count="one">{0} килограм</unitPattern>
+				<unitPattern count="other">{0} килограм</unitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>грам</displayName>
+				<unitPattern count="one">{0} грам</unitPattern>
+				<unitPattern count="other">{0} грам</unitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>милиграм</displayName>
 				<unitPattern count="one">{0} милиграм</unitPattern>
 				<unitPattern count="other">{0} милиграм</unitPattern>
 			</unit>
+			<unit type="mass-microgram">
+				<displayName>микрограм</displayName>
+				<unitPattern count="one">{0} микрограм</unitPattern>
+				<unitPattern count="other">{0} микрограм</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>тонн</displayName>
+				<unitPattern count="one">{0} тонн</unitPattern>
+				<unitPattern count="other">{0} тонн</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>фунт</displayName>
+				<unitPattern count="one">{0} фунт</unitPattern>
+				<unitPattern count="other">{0} фунт</unitPattern>
+			</unit>
 			<unit type="mass-ounce">
 				<displayName>унц</displayName>
 				<unitPattern count="one">{0} унц</unitPattern>
@@ -5335,61 +5404,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} трой унц</unitPattern>
 				<unitPattern count="other">{0} трой унц</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<displayName>фунт</displayName>
-				<unitPattern count="one">{0} фунт</unitPattern>
-				<unitPattern count="other">{0} фунт</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<displayName>тонн</displayName>
-				<unitPattern count="one">{0} тонн</unitPattern>
-				<unitPattern count="other">{0} тонн</unitPattern>
+			<unit type="mass-carat">
+				<displayName>карат</displayName>
+				<unitPattern count="one">{0} карат</unitPattern>
+				<unitPattern count="other">{0} карат</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<displayName>гигаватт</displayName>
 				<unitPattern count="one">{0} гигаватт</unitPattern>
 				<unitPattern count="other">{0} гигаватт</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>морины хүч</displayName>
-				<unitPattern count="one">{0} морины хүч</unitPattern>
-				<unitPattern count="other">{0} морины хүч</unitPattern>
+			<unit type="power-megawatt">
+				<displayName>мегаватт</displayName>
+				<unitPattern count="one">{0} мегаватт</unitPattern>
+				<unitPattern count="other">{0} мегаватт</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName>киловатт</displayName>
 				<unitPattern count="one">{0} киловатт</unitPattern>
 				<unitPattern count="other">{0} киловатт</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<displayName>мегаватт</displayName>
-				<unitPattern count="one">{0} мегаватт</unitPattern>
-				<unitPattern count="other">{0} мегаватт</unitPattern>
+			<unit type="power-watt">
+				<displayName>ватт</displayName>
+				<unitPattern count="one">{0} ватт</unitPattern>
+				<unitPattern count="other">{0} ватт</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<displayName>миливатт</displayName>
 				<unitPattern count="one">{0} миливатт</unitPattern>
 				<unitPattern count="other">{0} миливатт</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName>ватт</displayName>
-				<unitPattern count="one">{0} ватт</unitPattern>
-				<unitPattern count="other">{0} ватт</unitPattern>
+			<unit type="power-horsepower">
+				<displayName>морины хүч</displayName>
+				<unitPattern count="one">{0} морины хүч</unitPattern>
+				<unitPattern count="other">{0} морины хүч</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>гектопаскал</displayName>
 				<unitPattern count="one">{0} гектопаскал</unitPattern>
 				<unitPattern count="other">{0} гектопаскал</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>мөнгөн усны инч</displayName>
-				<unitPattern count="one">{0} мөнгөн усны инч</unitPattern>
-				<unitPattern count="other">{0} мөнгөн усны инч</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>милибар</displayName>
-				<unitPattern count="one">{0} милибар</unitPattern>
-				<unitPattern count="other">{0} милибар</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>мөнгөн усны милиметр</displayName>
 				<unitPattern count="one">{0} мөнгөн усны милиметр</unitPattern>
@@ -5400,10 +5454,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} фунт инч квадрат</unitPattern>
 				<unitPattern count="other">{0} фунт инч квадрат</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>карат</displayName>
-				<unitPattern count="one">{0} карат</unitPattern>
-				<unitPattern count="other">{0} карат</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>мөнгөн усны инч</displayName>
+				<unitPattern count="one">{0} мөнгөн усны инч</unitPattern>
+				<unitPattern count="other">{0} мөнгөн усны инч</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>милибар</displayName>
+				<unitPattern count="one">{0} милибар</unitPattern>
+				<unitPattern count="other">{0} милибар</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>километр/цаг</displayName>
@@ -5435,31 +5494,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} келвиний хэм</unitPattern>
 				<unitPattern count="other">{0} келвиний хэм</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>акр-фүүт</displayName>
-				<unitPattern count="one">{0} акр-фүүт</unitPattern>
-				<unitPattern count="other">{0} акр-фүүт</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>центилитр</displayName>
-				<unitPattern count="one">{0} центилитр</unitPattern>
-				<unitPattern count="other">{0} центилитр</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>сантиметр куб</displayName>
-				<unitPattern count="one">{0} сантиметр куб</unitPattern>
-				<unitPattern count="other">{0} сантиметр куб</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>фүүт куб</displayName>
-				<unitPattern count="one">{0} фүүт куб</unitPattern>
-				<unitPattern count="other">{0} фүүт куб</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>инч куб</displayName>
-				<unitPattern count="one">{0} инч куб</unitPattern>
-				<unitPattern count="other">{0} инч куб</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>километр куб</displayName>
 				<unitPattern count="one">{0} километр куб</unitPattern>
@@ -5470,6 +5504,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} метр куб</unitPattern>
 				<unitPattern count="other">{0} метр куб</unitPattern>
 			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>сантиметр куб</displayName>
+				<unitPattern count="one">{0} сантиметр куб</unitPattern>
+				<unitPattern count="other">{0} сантиметр куб</unitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>миль куб</displayName>
 				<unitPattern count="one">{0} миль куб</unitPattern>
@@ -5480,25 +5519,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ярд куб</unitPattern>
 				<unitPattern count="other">{0} ярд куб</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>аяга</displayName>
-				<unitPattern count="one">{0} аяга</unitPattern>
-				<unitPattern count="other">{0} аяга</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>фүүт куб</displayName>
+				<unitPattern count="one">{0} фүүт куб</unitPattern>
+				<unitPattern count="other">{0} фүүт куб</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>децилитр</displayName>
-				<unitPattern count="one">{0} децилитр</unitPattern>
-				<unitPattern count="other">{0} децилитр</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>инч куб</displayName>
+				<unitPattern count="one">{0} инч куб</unitPattern>
+				<unitPattern count="other">{0} инч куб</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>шингэн унц</displayName>
-				<unitPattern count="one">{0} ш унц</unitPattern>
-				<unitPattern count="other">{0} ш унц</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>галлон</displayName>
-				<unitPattern count="one">{0} галлон</unitPattern>
-				<unitPattern count="other">{0} галлон</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>мегалитр</displayName>
+				<unitPattern count="one">{0} мегалитр</unitPattern>
+				<unitPattern count="other">{0} мегалитр</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>хектолитр</displayName>
@@ -5510,26 +5544,51 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} литр</unitPattern>
 				<unitPattern count="other">{0} литр</unitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>мегалитр</displayName>
-				<unitPattern count="one">{0} мегалитр</unitPattern>
-				<unitPattern count="other">{0} мегалитр</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>децилитр</displayName>
+				<unitPattern count="one">{0} децилитр</unitPattern>
+				<unitPattern count="other">{0} децилитр</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>центилитр</displayName>
+				<unitPattern count="one">{0} центилитр</unitPattern>
+				<unitPattern count="other">{0} центилитр</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>милилитр</displayName>
 				<unitPattern count="one">{0} милилитр</unitPattern>
 				<unitPattern count="other">{0} милилитр</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>пайнт</displayName>
-				<unitPattern count="one">{0} пайнт</unitPattern>
-				<unitPattern count="other">{0} пайнт</unitPattern>
+			<unit type="volume-acre-foot">
+				<displayName>акр-фүүт</displayName>
+				<unitPattern count="one">{0} акр-фүүт</unitPattern>
+				<unitPattern count="other">{0} акр-фүүт</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>галлон</displayName>
+				<unitPattern count="one">{0} галлон</unitPattern>
+				<unitPattern count="other">{0} галлон</unitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>кварц</displayName>
 				<unitPattern count="one">{0} кварц</unitPattern>
 				<unitPattern count="other">{0} кварц</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>пайнт</displayName>
+				<unitPattern count="one">{0} пайнт</unitPattern>
+				<unitPattern count="other">{0} пайнт</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>аяга</displayName>
+				<unitPattern count="one">{0} аяга</unitPattern>
+				<unitPattern count="other">{0} аяга</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>шингэн унц</displayName>
+				<unitPattern count="one">{0} ш унц</unitPattern>
+				<unitPattern count="other">{0} ш унц</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>хоолны халбага</displayName>
 				<unitPattern count="one">{0} хоолны халбага</unitPattern>
@@ -5555,6 +5614,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} м/с²</unitPattern>
 				<unitPattern count="other">{0} м/с²</unitPattern>
 			</unit>
+			<unit type="angle-radian">
+				<displayName>радиан</displayName>
+				<unitPattern count="one">{0} рад</unitPattern>
+				<unitPattern count="other">{0} рад</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>хэм</displayName>
+				<unitPattern count="one">{0} хэм</unitPattern>
+				<unitPattern count="other">{0} хэм</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>аркмин</displayName>
 				<unitPattern count="one">{0} аркмин</unitPattern>
@@ -5565,31 +5634,41 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} арксек</unitPattern>
 				<unitPattern count="other">{0} арксек</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>хэм</displayName>
-				<unitPattern count="one">{0} хэм</unitPattern>
-				<unitPattern count="other">{0} хэм</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>радиан</displayName>
-				<unitPattern count="one">{0} рад</unitPattern>
-				<unitPattern count="other">{0} рад</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>акр</displayName>
-				<unitPattern count="one">{0} акр</unitPattern>
-				<unitPattern count="other">{0} акр</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>км²</displayName>
+				<unitPattern count="one">{0} км²</unitPattern>
+				<unitPattern count="other">{0} км²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>гектар</displayName>
 				<unitPattern count="one">{0} га</unitPattern>
 				<unitPattern count="other">{0} га</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>метр²</displayName>
+				<unitPattern count="one">{0} м²</unitPattern>
+				<unitPattern count="other">{0} м²</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>см²</displayName>
 				<unitPattern count="one">{0} см²</unitPattern>
 				<unitPattern count="other">{0} см²</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<displayName>миль кв</displayName>
+				<unitPattern count="one">{0} миль кв</unitPattern>
+				<unitPattern count="other">{0} миль кв</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>акр</displayName>
+				<unitPattern count="one">{0} акр</unitPattern>
+				<unitPattern count="other">{0} акр</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>ярд²</displayName>
+				<unitPattern count="one">{0} ярд²</unitPattern>
+				<unitPattern count="other">{0} ярд²</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<displayName>фүүт кв</displayName>
 				<unitPattern count="one">{0} фт кв</unitPattern>
@@ -5600,25 +5679,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ин²</unitPattern>
 				<unitPattern count="other">{0} ин²</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>км²</displayName>
-				<unitPattern count="one">{0} км²</unitPattern>
-				<unitPattern count="other">{0} км²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>метр²</displayName>
-				<unitPattern count="one">{0} м²</unitPattern>
-				<unitPattern count="other">{0} м²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>миль кв</displayName>
-				<unitPattern count="one">{0} миль кв</unitPattern>
-				<unitPattern count="other">{0} миль кв</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>ярд²</displayName>
-				<unitPattern count="one">{0} ярд²</unitPattern>
-				<unitPattern count="other">{0} ярд²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>карат</displayName>
+				<unitPattern count="one">{0} кт</unitPattern>
+				<unitPattern count="other">{0} кт</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>литр/км</displayName>
@@ -5630,55 +5694,70 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">ми/гал</unitPattern>
 				<unitPattern count="other">{0} ми/гал</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>бит</displayName>
-				<unitPattern count="one">{0} бит</unitPattern>
-				<unitPattern count="other">{0} бит</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>байт</displayName>
-				<unitPattern count="one">{0} байт</unitPattern>
-				<unitPattern count="other">{0} байт</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Гбит</displayName>
-				<unitPattern count="one">{0} Гб</unitPattern>
-				<unitPattern count="other">{0} Гб</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>Гбайт</displayName>
-				<unitPattern count="one">{0} ГБ</unitPattern>
-				<unitPattern count="other">{0} ГБ</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>кбит</displayName>
-				<unitPattern count="one">{0} кб</unitPattern>
-				<unitPattern count="other">{0} кб</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>кбайт</displayName>
-				<unitPattern count="one">{0} кБ</unitPattern>
-				<unitPattern count="other">{0} кБ</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Мбит</displayName>
-				<unitPattern count="one">{0} Мб</unitPattern>
-				<unitPattern count="other">{0} Мб</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>Мбайт</displayName>
-				<unitPattern count="one">{0} МБ</unitPattern>
-				<unitPattern count="other">{0} МБ</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>Тбайт</displayName>
+				<unitPattern count="one">{0} ТБ</unitPattern>
+				<unitPattern count="other">{0} ТБ</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>Тбит</displayName>
 				<unitPattern count="one">{0} Тб</unitPattern>
 				<unitPattern count="other">{0} Тб</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>Тбайт</displayName>
-				<unitPattern count="one">{0} ТБ</unitPattern>
-				<unitPattern count="other">{0} ТБ</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>Гбайт</displayName>
+				<unitPattern count="one">{0} ГБ</unitPattern>
+				<unitPattern count="other">{0} ГБ</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Гбит</displayName>
+				<unitPattern count="one">{0} Гб</unitPattern>
+				<unitPattern count="other">{0} Гб</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>Мбайт</displayName>
+				<unitPattern count="one">{0} МБ</unitPattern>
+				<unitPattern count="other">{0} МБ</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Мбит</displayName>
+				<unitPattern count="one">{0} Мб</unitPattern>
+				<unitPattern count="other">{0} Мб</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>кбайт</displayName>
+				<unitPattern count="one">{0} кБ</unitPattern>
+				<unitPattern count="other">{0} кБ</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>кбит</displayName>
+				<unitPattern count="one">{0} кб</unitPattern>
+				<unitPattern count="other">{0} кб</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>байт</displayName>
+				<unitPattern count="one">{0} байт</unitPattern>
+				<unitPattern count="other">{0} байт</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>бит</displayName>
+				<unitPattern count="one">{0} бит</unitPattern>
+				<unitPattern count="other">{0} бит</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>жил</displayName>
+				<unitPattern count="one">{0} жил</unitPattern>
+				<unitPattern count="other">{0} жил</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>сар</displayName>
+				<unitPattern count="one">{0} сар</unitPattern>
+				<unitPattern count="other">{0} сар</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>дол/хон</displayName>
+				<unitPattern count="one">{0} дол/хон</unitPattern>
+				<unitPattern count="other">{0} дол/хон</unitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>өдөр</displayName>
@@ -5691,46 +5770,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} цаг</unitPattern>
 				<perUnitPattern>{0} цгт</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>милисек</displayName>
-				<unitPattern count="one">{0} мс</unitPattern>
-				<unitPattern count="other">{0} мс</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>мин</displayName>
 				<unitPattern count="one">{0} мин</unitPattern>
 				<unitPattern count="other">{0} мин</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>сар</displayName>
-				<unitPattern count="one">{0} сар</unitPattern>
-				<unitPattern count="other">{0} сар</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>наносек</displayName>
-				<unitPattern count="one">{0} нс</unitPattern>
-				<unitPattern count="other">{0} нс</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>сек</displayName>
 				<unitPattern count="one">{0} сек</unitPattern>
 				<unitPattern count="other">{0} сек</unitPattern>
 				<perUnitPattern>{0} секд</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>дол/хон</displayName>
-				<unitPattern count="one">{0} дол/хон</unitPattern>
-				<unitPattern count="other">{0} дол/хон</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>милисек</displayName>
+				<unitPattern count="one">{0} мс</unitPattern>
+				<unitPattern count="other">{0} мс</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>жил</displayName>
-				<unitPattern count="one">{0} жил</unitPattern>
-				<unitPattern count="other">{0} жил</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>наносек</displayName>
+				<unitPattern count="one">{0} нс</unitPattern>
+				<unitPattern count="other">{0} нс</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>амп</displayName>
@@ -5752,6 +5816,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} В</unitPattern>
 				<unitPattern count="other">{0} В</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>ккал</displayName>
+				<unitPattern count="one">{0} ккал</unitPattern>
+				<unitPattern count="other">{0} ккал</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>кал</displayName>
 				<unitPattern count="one">{0} кал</unitPattern>
@@ -5762,21 +5831,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Кал</unitPattern>
 				<unitPattern count="other">{0} Кал</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>жоуль</displayName>
-				<unitPattern count="one">{0} жо</unitPattern>
-				<unitPattern count="other">{0} жо</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>ккал</displayName>
-				<unitPattern count="one">{0} ккал</unitPattern>
-				<unitPattern count="other">{0} ккал</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>киложоуль</displayName>
 				<unitPattern count="one">{0} кж</unitPattern>
 				<unitPattern count="other">{0} кж</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>жоуль</displayName>
+				<unitPattern count="one">{0} жо</unitPattern>
+				<unitPattern count="other">{0} жо</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>кВ-цаг</displayName>
 				<unitPattern count="one">{0} кВц</unitPattern>
@@ -5787,35 +5851,70 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ГГц</unitPattern>
 				<unitPattern count="other">{0} ГГц</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Гц</displayName>
-				<unitPattern count="one">{0} Гц</unitPattern>
-				<unitPattern count="other">{0} Гц</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>МГц</displayName>
+				<unitPattern count="one">{0} МГц</unitPattern>
+				<unitPattern count="other">{0} МГц</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>кГц</displayName>
 				<unitPattern count="one">{0} кГц</unitPattern>
 				<unitPattern count="other">{0} кГц</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>МГц</displayName>
-				<unitPattern count="one">{0} МГц</unitPattern>
-				<unitPattern count="other">{0} МГц</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Гц</displayName>
+				<unitPattern count="one">{0} Гц</unitPattern>
+				<unitPattern count="other">{0} Гц</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>сн</displayName>
-				<unitPattern count="one">{0} сн</unitPattern>
-				<unitPattern count="other">{0} сн</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>км</displayName>
+				<unitPattern count="one">{0} км</unitPattern>
+				<unitPattern count="other">{0} км</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>метр</displayName>
+				<unitPattern count="one">{0} м</unitPattern>
+				<unitPattern count="other">{0} м</unitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>дм</displayName>
+				<unitPattern count="one">{0} дм</unitPattern>
+				<unitPattern count="other">{0} дм</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
 				<displayName>см</displayName>
 				<unitPattern count="one">{0} см</unitPattern>
 				<unitPattern count="other">{0} см</unitPattern>
 			</unit>
-			<unit type="length-decimeter">
-				<displayName>дм</displayName>
-				<unitPattern count="one">{0} дм</unitPattern>
-				<unitPattern count="other">{0} дм</unitPattern>
+			<unit type="length-millimeter">
+				<displayName>мм</displayName>
+				<unitPattern count="one">{0} мм</unitPattern>
+				<unitPattern count="other">{0} мм</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>µметр</displayName>
+				<unitPattern count="one">{0} µм</unitPattern>
+				<unitPattern count="other">{0} µм</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>нм</displayName>
+				<unitPattern count="one">{0} нм</unitPattern>
+				<unitPattern count="other">{0} нм</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>пм</displayName>
+				<unitPattern count="one">{0} пм</unitPattern>
+				<unitPattern count="other">{0} пм</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>миль</displayName>
+				<unitPattern count="one">{0} ми</unitPattern>
+				<unitPattern count="other">{0} ми</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>ярд</displayName>
+				<unitPattern count="one">{0} ярд</unitPattern>
+				<unitPattern count="other">{0} ярд</unitPattern>
 			</unit>
 			<unit type="length-foot">
 				<displayName>фүүт</displayName>
@@ -5827,96 +5926,66 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ин</unitPattern>
 				<unitPattern count="other">{0} ин</unitPattern>
 			</unit>
-			<unit type="length-kilometer">
-				<displayName>км</displayName>
-				<unitPattern count="one">{0} км</unitPattern>
-				<unitPattern count="other">{0} км</unitPattern>
+			<unit type="length-parsec">
+				<displayName>парсек</displayName>
+				<unitPattern count="one">{0} пк</unitPattern>
+				<unitPattern count="other">{0} пк</unitPattern>
 			</unit>
 			<unit type="length-light-year">
 				<displayName>гэр жил</displayName>
 				<unitPattern count="one">{0} гж</unitPattern>
 				<unitPattern count="other">{0} гж</unitPattern>
 			</unit>
-			<unit type="length-meter">
-				<displayName>метр</displayName>
-				<unitPattern count="one">{0} м</unitPattern>
-				<unitPattern count="other">{0} м</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µметр</displayName>
-				<unitPattern count="one">{0} µм</unitPattern>
-				<unitPattern count="other">{0} µм</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>миль</displayName>
-				<unitPattern count="one">{0} ми</unitPattern>
-				<unitPattern count="other">{0} ми</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>мм</displayName>
-				<unitPattern count="one">{0} мм</unitPattern>
-				<unitPattern count="other">{0} мм</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<displayName>нм</displayName>
-				<unitPattern count="one">{0} нм</unitPattern>
-				<unitPattern count="other">{0} нм</unitPattern>
+			<unit type="length-astronomical-unit">
+				<displayName>сн</displayName>
+				<unitPattern count="one">{0} сн</unitPattern>
+				<unitPattern count="other">{0} сн</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
 				<displayName>дмиль</displayName>
 				<unitPattern count="one">{0} дмиль</unitPattern>
 				<unitPattern count="other">{0} дмиль</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<displayName>парсек</displayName>
-				<unitPattern count="one">{0} пк</unitPattern>
-				<unitPattern count="other">{0} пк</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName>пм</displayName>
-				<unitPattern count="one">{0} пм</unitPattern>
-				<unitPattern count="other">{0} пм</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<displayName>ярд</displayName>
-				<unitPattern count="one">{0} ярд</unitPattern>
-				<unitPattern count="other">{0} ярд</unitPattern>
-			</unit>
 			<unit type="light-lux">
 				<displayName>люкс</displayName>
 				<unitPattern count="one">{0} люкс</unitPattern>
 				<unitPattern count="other">{0} люкс</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>карат</displayName>
-				<unitPattern count="one">{0} крт</unitPattern>
-				<unitPattern count="other">{0} крт</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>грам</displayName>
-				<unitPattern count="one">{0} г</unitPattern>
-				<unitPattern count="other">{0} г</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>кг</displayName>
-				<unitPattern count="one">{0} кг</unitPattern>
-				<unitPattern count="other">{0} кг</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>т</displayName>
 				<unitPattern count="one">{0} т</unitPattern>
 				<unitPattern count="other">{0} т</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µг</displayName>
-				<unitPattern count="one">{0} µг</unitPattern>
-				<unitPattern count="other">{0} µг</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>кг</displayName>
+				<unitPattern count="one">{0} кг</unitPattern>
+				<unitPattern count="other">{0} кг</unitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>грам</displayName>
+				<unitPattern count="one">{0} г</unitPattern>
+				<unitPattern count="other">{0} г</unitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>мг</displayName>
 				<unitPattern count="one">{0} мг</unitPattern>
 				<unitPattern count="other">{0} мг</unitPattern>
 			</unit>
+			<unit type="mass-microgram">
+				<displayName>µг</displayName>
+				<unitPattern count="one">{0} µг</unitPattern>
+				<unitPattern count="other">{0} µг</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>тонн</displayName>
+				<unitPattern count="one">{0} тн</unitPattern>
+				<unitPattern count="other">{0} тн</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>фунт</displayName>
+				<unitPattern count="one">{0} фнт</unitPattern>
+				<unitPattern count="other">{0} фнт</unitPattern>
+			</unit>
 			<unit type="mass-ounce">
 				<displayName>унц</displayName>
 				<unitPattern count="one">{0} унц</unitPattern>
@@ -5927,61 +5996,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} т унц</unitPattern>
 				<unitPattern count="other">{0} т унц</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<displayName>фунт</displayName>
-				<unitPattern count="one">{0} фнт</unitPattern>
-				<unitPattern count="other">{0} фнт</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<displayName>тонн</displayName>
-				<unitPattern count="one">{0} тн</unitPattern>
-				<unitPattern count="other">{0} тн</unitPattern>
+			<unit type="mass-carat">
+				<displayName>карат</displayName>
+				<unitPattern count="one">{0} крт</unitPattern>
+				<unitPattern count="other">{0} крт</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<displayName>ГВ</displayName>
 				<unitPattern count="one">{0} ГВ</unitPattern>
 				<unitPattern count="other">{0} ГВ</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>мх</displayName>
-				<unitPattern count="one">{0} мх</unitPattern>
-				<unitPattern count="other">{0} мх</unitPattern>
+			<unit type="power-megawatt">
+				<displayName>МВт</displayName>
+				<unitPattern count="one">{0} МВт</unitPattern>
+				<unitPattern count="other">{0} МВт</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName>кВт</displayName>
 				<unitPattern count="one">{0} кВт</unitPattern>
 				<unitPattern count="other">{0} кВт</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<displayName>МВт</displayName>
-				<unitPattern count="one">{0} МВт</unitPattern>
-				<unitPattern count="other">{0} МВт</unitPattern>
+			<unit type="power-watt">
+				<displayName>ватт</displayName>
+				<unitPattern count="one">{0} Вт</unitPattern>
+				<unitPattern count="other">{0} Вт</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<displayName>мВт</displayName>
 				<unitPattern count="one">{0} мВт</unitPattern>
 				<unitPattern count="other">{0} мВт</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName>ватт</displayName>
-				<unitPattern count="one">{0} Вт</unitPattern>
-				<unitPattern count="other">{0} Вт</unitPattern>
+			<unit type="power-horsepower">
+				<displayName>мх</displayName>
+				<unitPattern count="one">{0} мх</unitPattern>
+				<unitPattern count="other">{0} мх</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>гПа</displayName>
 				<unitPattern count="one">{0} гПа</unitPattern>
 				<unitPattern count="other">{0} гПа</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>МөУсИн</displayName>
-				<unitPattern count="one">{0} МөУсИн</unitPattern>
-				<unitPattern count="other">{0} МөУсИн</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>мбар</displayName>
-				<unitPattern count="one">{0} мбар</unitPattern>
-				<unitPattern count="other">{0} мбар</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>МөУс мм</displayName>
 				<unitPattern count="one">{0} МөУс мм</unitPattern>
@@ -5992,10 +6046,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ф ин кв</unitPattern>
 				<unitPattern count="other">{0} ф ин кв</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>карат</displayName>
-				<unitPattern count="one">{0} кт</unitPattern>
-				<unitPattern count="other">{0} кт</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>МөУсИн</displayName>
+				<unitPattern count="one">{0} МөУсИн</unitPattern>
+				<unitPattern count="other">{0} МөУсИн</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>мбар</displayName>
+				<unitPattern count="one">{0} мбар</unitPattern>
+				<unitPattern count="other">{0} мбар</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>км/цаг</displayName>
@@ -6027,31 +6086,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}°К</unitPattern>
 				<unitPattern count="other">{0}°К</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>акр фүүт</displayName>
-				<unitPattern count="one">{0} ак фт</unitPattern>
-				<unitPattern count="other">{0} ак фт</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>цЛ</displayName>
-				<unitPattern count="one">{0} цЛ</unitPattern>
-				<unitPattern count="other">{0} цЛ</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>см³</displayName>
-				<unitPattern count="one">{0} cм³</unitPattern>
-				<unitPattern count="other">{0} cм³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>фүүт³</displayName>
-				<unitPattern count="one">{0} фт³</unitPattern>
-				<unitPattern count="other">{0} фт³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>инч³</displayName>
-				<unitPattern count="one">{0} ин³</unitPattern>
-				<unitPattern count="other">{0} ин³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>км³</displayName>
 				<unitPattern count="one">{0} км³</unitPattern>
@@ -6062,6 +6096,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} м³</unitPattern>
 				<unitPattern count="other">{0} м³</unitPattern>
 			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>см³</displayName>
+				<unitPattern count="one">{0} cм³</unitPattern>
+				<unitPattern count="other">{0} cм³</unitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>ми³</displayName>
 				<unitPattern count="one">{0} ми³</unitPattern>
@@ -6072,25 +6111,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ярд³</unitPattern>
 				<unitPattern count="other">{0} ярд³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>аяга</displayName>
-				<unitPattern count="one">{0} а</unitPattern>
-				<unitPattern count="other">{0} а</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>фүүт³</displayName>
+				<unitPattern count="one">{0} фт³</unitPattern>
+				<unitPattern count="other">{0} фт³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>дЛ</displayName>
-				<unitPattern count="one">{0} дЛ</unitPattern>
-				<unitPattern count="other">{0} дЛ</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>инч³</displayName>
+				<unitPattern count="one">{0} ин³</unitPattern>
+				<unitPattern count="other">{0} ин³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>ш унц</displayName>
-				<unitPattern count="one">{0} ш унц</unitPattern>
-				<unitPattern count="other">{0} ш унц</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>гал</displayName>
-				<unitPattern count="one">{0} гал</unitPattern>
-				<unitPattern count="other">{0} гал</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>МЛ</displayName>
+				<unitPattern count="one">{0} МЛ</unitPattern>
+				<unitPattern count="other">{0} МЛ</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>хЛ</displayName>
@@ -6102,26 +6136,51 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} л</unitPattern>
 				<unitPattern count="other">{0} л</unitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>МЛ</displayName>
-				<unitPattern count="one">{0} МЛ</unitPattern>
-				<unitPattern count="other">{0} МЛ</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>дЛ</displayName>
+				<unitPattern count="one">{0} дЛ</unitPattern>
+				<unitPattern count="other">{0} дЛ</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>цЛ</displayName>
+				<unitPattern count="one">{0} цЛ</unitPattern>
+				<unitPattern count="other">{0} цЛ</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>мЛ</displayName>
 				<unitPattern count="one">{0} мЛ</unitPattern>
 				<unitPattern count="other">{0} мЛ</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>пайнт</displayName>
-				<unitPattern count="one">{0} пнт</unitPattern>
-				<unitPattern count="other">{0} пнт</unitPattern>
+			<unit type="volume-acre-foot">
+				<displayName>акр фүүт</displayName>
+				<unitPattern count="one">{0} ак фт</unitPattern>
+				<unitPattern count="other">{0} ак фт</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>гал</displayName>
+				<unitPattern count="one">{0} гал</unitPattern>
+				<unitPattern count="other">{0} гал</unitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>крц</displayName>
 				<unitPattern count="one">{0} крц</unitPattern>
 				<unitPattern count="other">{0} крц</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>пайнт</displayName>
+				<unitPattern count="one">{0} пнт</unitPattern>
+				<unitPattern count="other">{0} пнт</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>аяга</displayName>
+				<unitPattern count="one">{0} а</unitPattern>
+				<unitPattern count="other">{0} а</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>ш унц</displayName>
+				<unitPattern count="one">{0} ш унц</unitPattern>
+				<unitPattern count="other">{0} ш унц</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>ххалбага</displayName>
 				<unitPattern count="one">{0} ххалбага</unitPattern>
@@ -6141,6 +6200,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} G</unitPattern>
 				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -6149,26 +6212,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} акр</unitPattern>
-				<unitPattern count="other">{0} акр</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} км²</unitPattern>
+				<unitPattern count="other">{0} км²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} га</unitPattern>
 				<unitPattern count="other">{0} га</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} фт²</unitPattern>
-				<unitPattern count="other">{0} фт²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} км²</unitPattern>
-				<unitPattern count="other">{0} км²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} м²</unitPattern>
 				<unitPattern count="other">{0} м²</unitPattern>
@@ -6177,6 +6228,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} миль²</unitPattern>
 				<unitPattern count="other">{0} миль²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} акр</unitPattern>
+				<unitPattern count="other">{0} акр</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} фт²</unitPattern>
+				<unitPattern count="other">{0} фт²</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ж</displayName>
+				<unitPattern count="one">{0} ж</unitPattern>
+				<unitPattern count="other">{0} ж</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>сар</displayName>
+				<unitPattern count="one">{0} ср</unitPattern>
+				<unitPattern count="other">{0} ср</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>д/х</displayName>
+				<unitPattern count="one">{0} д/х</unitPattern>
+				<unitPattern count="other">{0} д/х</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>өдөр</displayName>
 				<unitPattern count="one">{0} ө</unitPattern>
@@ -6187,66 +6261,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ц</unitPattern>
 				<unitPattern count="other">{0} ц</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>мсек</displayName>
-				<unitPattern count="one">{0} мс</unitPattern>
-				<unitPattern count="other">{0} мс</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>мин</displayName>
 				<unitPattern count="one">{0} м</unitPattern>
 				<unitPattern count="other">{0} м</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>сар</displayName>
-				<unitPattern count="one">{0} ср</unitPattern>
-				<unitPattern count="other">{0} ср</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>сек</displayName>
 				<unitPattern count="one">{0} с</unitPattern>
 				<unitPattern count="other">{0} с</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>д/х</displayName>
-				<unitPattern count="one">{0} д/х</unitPattern>
-				<unitPattern count="other">{0} д/х</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>ж</displayName>
-				<unitPattern count="one">{0} ж</unitPattern>
-				<unitPattern count="other">{0} ж</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>см</displayName>
-				<unitPattern count="one">{0} см</unitPattern>
-				<unitPattern count="other">{0} см</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0} фт</unitPattern>
-				<unitPattern count="other">{0} фт</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0} инч</unitPattern>
-				<unitPattern count="other">{0} инч</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>мсек</displayName>
+				<unitPattern count="one">{0} мс</unitPattern>
+				<unitPattern count="other">{0} мс</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>км</displayName>
 				<unitPattern count="one">{0} км</unitPattern>
 				<unitPattern count="other">{0} км</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} гэр/жил</unitPattern>
-				<unitPattern count="other">{0} гэр/жил</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>метр</displayName>
 				<unitPattern count="one">{0} м</unitPattern>
 				<unitPattern count="other">{0} м</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} миль</unitPattern>
-				<unitPattern count="other">{0} миль</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>см</displayName>
+				<unitPattern count="one">{0} см</unitPattern>
+				<unitPattern count="other">{0} см</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>мм</displayName>
@@ -6257,31 +6300,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} пм</unitPattern>
 				<unitPattern count="other">{0} пм</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} миль</unitPattern>
+				<unitPattern count="other">{0} миль</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} ярд</unitPattern>
 				<unitPattern count="other">{0} ярд</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>грам</displayName>
-				<unitPattern count="one">{0} г</unitPattern>
-				<unitPattern count="other">{0} г</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} фт</unitPattern>
+				<unitPattern count="other">{0} фт</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} инч</unitPattern>
+				<unitPattern count="other">{0} инч</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} гэр/жил</unitPattern>
+				<unitPattern count="other">{0} гэр/жил</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>кг</displayName>
 				<unitPattern count="one">{0} кг</unitPattern>
 				<unitPattern count="other">{0} кг</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} унц</unitPattern>
-				<unitPattern count="other">{0} унц</unitPattern>
+			<unit type="mass-gram">
+				<displayName>грам</displayName>
+				<unitPattern count="one">{0} г</unitPattern>
+				<unitPattern count="other">{0} г</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} фунт</unitPattern>
 				<unitPattern count="other">{0} фунт</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} м.х.</unitPattern>
-				<unitPattern count="other">{0} м.х.</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} унц</unitPattern>
+				<unitPattern count="other">{0} унц</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} кватт</unitPattern>
@@ -6291,6 +6346,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ватт</unitPattern>
 				<unitPattern count="other">{0} ватт</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} м.х.</unitPattern>
+				<unitPattern count="other">{0} м.х.</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} гПа</unitPattern>
 				<unitPattern count="other">{0} гПа</unitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mn_Cyrl_MN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mn_MN.xml
similarity index 65%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mn_Cyrl_MN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mn_MN.xml
index 132bee4e6d3..afc809a1baa 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mn_Cyrl_MN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mn_MN.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="mn"/>
-		<script type="Cyrl"/>
 		<territory type="MN"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mr.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mr.xml
similarity index 89%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mr.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mr.xml
index 39a69f6ed81..7a317da447b 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mr.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mr.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="mr"/>
 	</identity>
 	<localeDisplayNames>
@@ -59,6 +58,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bem">बेम्बा</language>
 			<language type="bez">बेना</language>
 			<language type="bg">बल्गेरियन</language>
+			<language type="bgn">पश्चिमी बालोची</language>
 			<language type="bho">भोजपुरी</language>
 			<language type="bi">बिस्लामा</language>
 			<language type="bik">बिकोल</language>
@@ -78,7 +78,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="cad">कॅड्डो</language>
 			<language type="car">कॅरिब</language>
 			<language type="cch">अत्सम</language>
-			<language type="ce">चेचन</language>
+			<language type="ce">चेचेन</language>
 			<language type="ceb">सिबुआनो</language>
 			<language type="cgg">किगा</language>
 			<language type="ch">कॅमोरो</language>
@@ -91,7 +91,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="chp">शिपेव्यान</language>
 			<language type="chr">चेरोकी</language>
 			<language type="chy">शेयेन्न</language>
-			<language type="ckb">सोरानी कुर्दिश</language>
+			<language type="ckb">मध्य कुर्दिश</language>
 			<language type="co">कॉर्सिकन</language>
 			<language type="cop">कॉप्टिक</language>
 			<language type="cr">क्री</language>
@@ -276,6 +276,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">लाओ</language>
 			<language type="lol">मोंगो</language>
 			<language type="loz">लोझि</language>
+			<language type="lrc">उत्तरी ल्युरी</language>
 			<language type="lt">लिथुआनियन</language>
 			<language type="lu">ल्यूबा-कटांगा</language>
 			<language type="lua">लुबा-लुलुआ</language>
@@ -321,12 +322,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mwr">मारवाडी</language>
 			<language type="my">बर्मी</language>
 			<language type="myv">एर्झ्या</language>
+			<language type="mzn">माझानदेरानी</language>
 			<language type="na">नउरू</language>
 			<language type="nap">नेपोलिटान</language>
 			<language type="naq">नामा</language>
 			<language type="nb">नॉर्वेजियन बोकमाल</language>
 			<language type="nd">उत्तर देबेली</language>
 			<language type="nds">लो जर्मन</language>
+			<language type="nds_NL">लो सॅक्सन</language>
 			<language type="ne">नेपाळी</language>
 			<language type="new">नेवारी</language>
 			<language type="ng">डोंगा</language>
@@ -402,6 +405,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">सिसिलियन</language>
 			<language type="sco">स्कॉट्स</language>
 			<language type="sd">सिंधी</language>
+			<language type="sdh">दक्षिणी कुर्दिश</language>
 			<language type="se">उत्तरी सामी</language>
 			<language type="seh">सेना</language>
 			<language type="sel">सेल्कप</language>
@@ -436,8 +440,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">सुमेरियन</language>
 			<language type="sv">स्वीडिश</language>
 			<language type="sw">स्वाहिली</language>
+			<language type="sw_CD">काँगो स्वाहिली</language>
 			<language type="swb">कोमोरियन</language>
-			<language type="swc">काँगो स्वाहिली</language>
 			<language type="syc">अभिजात सिरियाक</language>
 			<language type="syr">सिरियाक</language>
 			<language type="ta">तामिळ</language>
@@ -490,6 +494,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">वलामो</language>
 			<language type="war">वारे</language>
 			<language type="was">वाशो</language>
+			<language type="wbp">वार्लपिरी</language>
 			<language type="wo">वोलोफ</language>
 			<language type="xal">काल्मिक</language>
 			<language type="xh">खोसा</language>
@@ -686,7 +691,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">अँग्विला</territory>
 			<territory type="AL">अल्बानिया</territory>
 			<territory type="AM">अर्मेनिया</territory>
-			<territory type="AN">नेदरलँड्‍स अँ‍टिल्स</territory>
 			<territory type="AO">अंगोला</territory>
 			<territory type="AQ">अंटार्क्टिका</territory>
 			<territory type="AR">अर्जेंटिना</territory>
@@ -735,7 +739,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CR">कोस्टा रिका</territory>
 			<territory type="CU">क्यूबा</territory>
 			<territory type="CV">केप व्हर्डे</territory>
-			<territory type="CW">कुरॅको</territory>
+			<territory type="CW">क्युरासाओ</territory>
 			<territory type="CX">ख्रिसमस बेट</territory>
 			<territory type="CY">सायप्रस</territory>
 			<territory type="CZ">झेक प्रजासत्ताक</territory>
@@ -797,7 +801,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="IN">भारत</territory>
 			<territory type="IO">ब्रिटिश हिंदी महासागर क्षेत्र</territory>
 			<territory type="IQ">इराक</territory>
-			<territory type="IR">ईराण</territory>
+			<territory type="IR">इराण</territory>
 			<territory type="IS">आइसलँड</territory>
 			<territory type="IT">इटली</territory>
 			<territory type="JE">जर्सी</territory>
@@ -860,7 +864,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="NL">नेदरलँड</territory>
 			<territory type="NO">नॉर्वे</territory>
 			<territory type="NP">नेपाळ</territory>
-			<territory type="NR">नऊरु</territory>
+			<territory type="NR">नाउरू</territory>
 			<territory type="NU">नीयू</territory>
 			<territory type="NZ">न्यूझीलंड</territory>
 			<territory type="OM">ओमान</territory>
@@ -937,7 +941,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="VG">ब्रिटिश व्हर्जिन बेटे</territory>
 			<territory type="VI">यू.एस. व्हर्जिन बेटे</territory>
 			<territory type="VN">व्हिएतनाम</territory>
-			<territory type="VU">वानौटु</territory>
+			<territory type="VU">वानुआतु</territory>
 			<territory type="WF">वालिस आणि फ्यूचूना</territory>
 			<territory type="WS">सामोआ</territory>
 			<territory type="XK">कोसोव्हो</territory>
@@ -964,6 +968,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric">अंकीय क्रमवारी</key>
 			<key type="colStrength">क्रमवारी सामर्थ्य</key>
 			<key type="currency">चलन</key>
+			<key type="hc">तास चक्र (12 वि 24)</key>
+			<key type="lb">लाइन ब्रेक शैली</key>
+			<key type="ms">मापन पद्धती</key>
 			<key type="numbers">संख्या</key>
 			<key type="timezone">टाइम झोन</key>
 			<key type="va">लोकेल व्हेरियंट</key>
@@ -971,95 +978,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">खासगी-वापर</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">अरबी-भारतीय अंक</type>
-			<type type="arabext" key="numbers">विस्तारित अरबी-भारतीय अंक</type>
-			<type type="armn" key="numbers">अमेरिकन अंक</type>
-			<type type="armnlow" key="numbers">अर्मेनियन छोटी लिपी अंक</type>
-			<type type="beng" key="numbers">बंगाली अंक</type>
-			<type type="big5han" key="collation">पारंपारिक चिनी क्रमवारी क्रम - Big5</type>
-			<type type="buddhist" key="calendar">बौद्ध दिनदर्शिका</type>
-			<type type="chinese" key="calendar">चीनी दिनदर्शिका</type>
-			<type type="coptic" key="calendar">कॉप्टिक दिनदर्शिका</type>
-			<type type="dangi" key="calendar">डांगी दिनदर्शिका</type>
-			<type type="deva" key="numbers">देवनागरी अंक</type>
-			<type type="dictionary" key="collation">शब्दकोश अनुक्रम</type>
-			<type type="ducet" key="collation">डीफॉल्ट युनिकोड क्रमवारी क्रम</type>
-			<type type="ethi" key="numbers">इथिओपिक अंक</type>
-			<type type="ethiopic" key="calendar">इथिओपिक दिनदर्शिका</type>
-			<type type="ethiopic-amete-alem" key="calendar">इतिओपिक अमेटे अलेम दिनदर्शिका</type>
-			<type type="finance" key="numbers">वित्तीय संख्‍या</type>
-			<type type="fullwide" key="numbers">पूर्ण रुंदीचे अंक</type>
-			<type type="gb2312han" key="collation">सरलीकृत चिनी क्रमवारी क्रम - GB2312</type>
-			<type type="geor" key="numbers">जॉर्जियन अंक</type>
-			<type type="gregorian" key="calendar">ग्रेगोरियन दिनदर्शिका</type>
-			<type type="grek" key="numbers">ग्रीक अंक</type>
-			<type type="greklow" key="numbers">ग्रीक लहान लिपीचे अंक</type>
-			<type type="gujr" key="numbers">गुजराती अंक</type>
-			<type type="guru" key="numbers">गुरमुखी अंक</type>
-			<type type="hanidec" key="numbers">चीनी दशांश अंक</type>
-			<type type="hans" key="numbers">सरलीकृत चीनी अंक</type>
-			<type type="hansfin" key="numbers">सरलीकृत चीनी वित्तीय अंक</type>
-			<type type="hant" key="numbers">पारंपारिक चीनी अंक</type>
-			<type type="hantfin" key="numbers">पारंपारिक चीनी वित्तीय अंक</type>
-			<type type="hebr" key="numbers">हिब्रू अंक</type>
-			<type type="hebrew" key="calendar">यहूदी दिनदर्शिका</type>
-			<type type="identical" key="colStrength">सर्व क्रमवारी लावा</type>
-			<type type="indian" key="calendar">भारतीय राष्ट्रीय दिनदर्शिका</type>
-			<type type="islamic" key="calendar">मुस्लिम दिनदर्शिका</type>
-			<type type="islamic-civil" key="calendar">मुस्लिम- नागरी दिनदर्शिका</type>
-			<type type="iso8601" key="calendar">(ISO-8601) दिनदर्शिका</type>
-			<type type="japanese" key="calendar">जपानी दिनदर्शिका</type>
-			<type type="jpan" key="numbers">जपानी अंक</type>
-			<type type="jpanfin" key="numbers">जपानी वित्तीय अंक</type>
-			<type type="khmr" key="numbers">ख्मेर अंक</type>
-			<type type="knda" key="numbers">कन्नड अंक</type>
-			<type type="laoo" key="numbers">लाओ अंक</type>
-			<type type="latn" key="numbers">पश्चिमी अंक</type>
-			<type type="lower" key="colCaseFirst">प्रथम लोअरकेस क्रमवारी लावा</type>
-			<type type="mlym" key="numbers">मल्याळम अंक</type>
-			<type type="mong" key="numbers">मंगोलियन अंक</type>
-			<type type="mymr" key="numbers">म्यानमार अंक</type>
-			<type type="native" key="numbers">मूळ अंक</type>
-			<type type="no" key="colBackwards">सामान्यपणे उच्चार क्रमवारी करा</type>
-			<type type="no" key="colCaseFirst">सामान्य केस क्रमाची क्रमवारी लावा</type>
-			<type type="no" key="colCaseLevel">केस संवेदी क्रमवारी लावा</type>
-			<type type="no" key="colHiraganaQuaternary">काना विभक्तपणे क्रमवारी लावा</type>
-			<type type="no" key="colNormalization">नेहमीसारखे न करता क्रमवारी लावा</type>
-			<type type="no" key="colNumeric">अंकांची वैयक्तिकरित्या क्रमवारी लावा</type>
-			<type type="non-ignorable" key="colAlternate">प्रतीकांची क्रमवारी लावा</type>
-			<type type="orya" key="numbers">उडिया अंक</type>
-			<type type="persian" key="calendar">फारसी दिनदर्शिका</type>
-			<type type="phonebook" key="collation">फोनबुक अनुक्रम</type>
-			<type type="phonetic" key="collation">ध्वनीविचार क्रमवारी क्रम</type>
-			<type type="pinyin" key="collation">पिनयिन अनुक्रम</type>
-			<type type="primary" key="colStrength">केवळ मूळ अक्षरांची क्रमवारी लावा</type>
-			<type type="quaternary" key="colStrength">उच्चार/केस/रुंदी/काना क्रमवारी लावा</type>
-			<type type="reformed" key="collation">पुनर्स्वरूपित अनुक्रम</type>
-			<type type="roc" key="calendar">मिनगुओ दिनदर्शिका</type>
-			<type type="roman" key="numbers">रोमन अंक</type>
-			<type type="romanlow" key="numbers">रोमन लहान लिपीचे अंक</type>
-			<type type="search" key="collation">सामान्य हेतु शोध</type>
-			<type type="searchjl" key="collation">हँगुल प्रारंभिक व्यंजनानुसार शोधा</type>
-			<type type="secondary" key="colStrength">उच्चार क्रमवारी लावा</type>
-			<type type="shifted" key="colAlternate">दुर्लक्षित प्रतीकांची क्रमवारी लावा</type>
-			<type type="standard" key="collation">प्रमाणित क्रमवारी क्रम</type>
-			<type type="stroke" key="collation">स्ट्रोक अनुक्रम</type>
-			<type type="taml" key="numbers">पारंपारिक तामिळ अंक</type>
-			<type type="tamldec" key="numbers">तामिळ अंक</type>
-			<type type="telu" key="numbers">तेलगु अंक</type>
-			<type type="tertiary" key="colStrength">उच्चार/केस/रुंदीची क्रमवारी लावा</type>
-			<type type="thai" key="numbers">थाई अंक</type>
-			<type type="tibt" key="numbers">तिबेटी अंक</type>
-			<type type="traditional" key="collation">पारंपारिक अनुक्रम</type>
-			<type type="traditional" key="numbers">पारंपारिक संख्‍या</type>
-			<type type="unihan" key="collation">रॅडिकल-स्ट्रोक अनुक्रम</type>
-			<type type="upper" key="colCaseFirst">प्रथम अपरकेस क्रमवारी लावा</type>
-			<type type="vaii" key="numbers">व्हाई अंक</type>
-			<type type="yes" key="colBackwards">उलट उच्चार क्रमवारी लावा</type>
-			<type type="yes" key="colCaseLevel">केस संवेदी क्रमवारी लावा</type>
-			<type type="yes" key="colHiraganaQuaternary">काना भिन्नपणे क्रमवारी लावा</type>
-			<type type="yes" key="colNormalization">युनिकोड सामान्यीकृत क्रमवारी लावा</type>
-			<type type="yes" key="colNumeric">अंकांची संख्‍याक्रमानुसार क्रमवारी लावा</type>
+			<type key="calendar" type="buddhist">बौद्ध दिनदर्शिका</type>
+			<type key="calendar" type="chinese">चीनी दिनदर्शिका</type>
+			<type key="calendar" type="coptic">कॉप्टिक दिनदर्शिका</type>
+			<type key="calendar" type="dangi">डांगी दिनदर्शिका</type>
+			<type key="calendar" type="ethiopic">इथिओपिक दिनदर्शिका</type>
+			<type key="calendar" type="ethiopic-amete-alem">इतिओपिक अमेटे अलेम दिनदर्शिका</type>
+			<type key="calendar" type="gregorian">ग्रेगोरियन दिनदर्शिका</type>
+			<type key="calendar" type="hebrew">यहूदी दिनदर्शिका</type>
+			<type key="calendar" type="indian">भारतीय राष्ट्रीय दिनदर्शिका</type>
+			<type key="calendar" type="islamic">मुस्लिम दिनदर्शिका</type>
+			<type key="calendar" type="islamic-civil">मुस्लिम- नागरी दिनदर्शिका</type>
+			<type key="calendar" type="iso8601">(ISO-8601) दिनदर्शिका</type>
+			<type key="calendar" type="japanese">जपानी दिनदर्शिका</type>
+			<type key="calendar" type="persian">फारसी दिनदर्शिका</type>
+			<type key="calendar" type="roc">मिनगुओ दिनदर्शिका</type>
+			<type key="colAlternate" type="non-ignorable">प्रतीकांची क्रमवारी लावा</type>
+			<type key="colAlternate" type="shifted">दुर्लक्षित प्रतीकांची क्रमवारी लावा</type>
+			<type key="colBackwards" type="no">सामान्यपणे उच्चार क्रमवारी करा</type>
+			<type key="colBackwards" type="yes">उलट उच्चार क्रमवारी लावा</type>
+			<type key="colCaseFirst" type="lower">प्रथम लोअरकेस क्रमवारी लावा</type>
+			<type key="colCaseFirst" type="no">सामान्य केस क्रमाची क्रमवारी लावा</type>
+			<type key="colCaseFirst" type="upper">प्रथम अपरकेस क्रमवारी लावा</type>
+			<type key="colCaseLevel" type="no">केस संवेदी क्रमवारी लावा</type>
+			<type key="colCaseLevel" type="yes">केस संवेदी क्रमवारी लावा</type>
+			<type key="colHiraganaQuaternary" type="no">काना विभक्तपणे क्रमवारी लावा</type>
+			<type key="colHiraganaQuaternary" type="yes">काना भिन्नपणे क्रमवारी लावा</type>
+			<type key="collation" type="big5han">पारंपारिक चिनी क्रमवारी क्रम - Big5</type>
+			<type key="collation" type="dictionary">शब्दकोश अनुक्रम</type>
+			<type key="collation" type="ducet">डीफॉल्ट युनिकोड क्रमवारी क्रम</type>
+			<type key="collation" type="gb2312han">सरलीकृत चिनी क्रमवारी क्रम - GB2312</type>
+			<type key="collation" type="phonebook">फोनबुक अनुक्रम</type>
+			<type key="collation" type="phonetic">ध्वनीविचार क्रमवारी क्रम</type>
+			<type key="collation" type="pinyin">पिनयिन अनुक्रम</type>
+			<type key="collation" type="reformed">पुनर्स्वरूपित अनुक्रम</type>
+			<type key="collation" type="search">सामान्य हेतु शोध</type>
+			<type key="collation" type="searchjl">हँगुल प्रारंभिक व्यंजनानुसार शोधा</type>
+			<type key="collation" type="standard">प्रमाणित क्रमवारी क्रम</type>
+			<type key="collation" type="stroke">स्ट्रोक अनुक्रम</type>
+			<type key="collation" type="traditional">पारंपारिक अनुक्रम</type>
+			<type key="collation" type="unihan">रॅडिकल-स्ट्रोक अनुक्रम</type>
+			<type key="colNormalization" type="no">नेहमीसारखे न करता क्रमवारी लावा</type>
+			<type key="colNormalization" type="yes">युनिकोड सामान्यीकृत क्रमवारी लावा</type>
+			<type key="colNumeric" type="no">अंकांची वैयक्तिकरित्या क्रमवारी लावा</type>
+			<type key="colNumeric" type="yes">अंकांची संख्‍याक्रमानुसार क्रमवारी लावा</type>
+			<type key="colStrength" type="identical">सर्व क्रमवारी लावा</type>
+			<type key="colStrength" type="primary">केवळ मूळ अक्षरांची क्रमवारी लावा</type>
+			<type key="colStrength" type="quaternary">उच्चार/केस/रुंदी/काना क्रमवारी लावा</type>
+			<type key="colStrength" type="secondary">उच्चार क्रमवारी लावा</type>
+			<type key="colStrength" type="tertiary">उच्चार/केस/रुंदीची क्रमवारी लावा</type>
+			<type key="hc" type="h11">12 तास पद्धती (0–11)</type>
+			<type key="hc" type="h12">12 तास पद्धती (1–12)</type>
+			<type key="hc" type="h23">24 तास पद्धती (0–23)</type>
+			<type key="hc" type="h24">24 तास पद्धती (1–24)</type>
+			<type key="lb" type="loose">ढिली लाइन ब्रेक शैली</type>
+			<type key="lb" type="normal">सामान्य लाइन ब्रेक शैली</type>
+			<type key="lb" type="strict">काटेकोर लाइन ब्रेक</type>
+			<type key="ms" type="metric">दशमान पद्धती</type>
+			<type key="ms" type="uksystem">ब्रिटिश मापन पद्धती</type>
+			<type key="ms" type="ussystem">अमेरीकन मापन पद्धती</type>
+			<type key="numbers" type="arab">अरबी-भारतीय अंक</type>
+			<type key="numbers" type="arabext">विस्तारित अरबी-भारतीय अंक</type>
+			<type key="numbers" type="armn">अर्मेनियन अंक</type>
+			<type key="numbers" type="armnlow">अर्मेनियन छोटी लिपी अंक</type>
+			<type key="numbers" type="beng">बंगाली अंक</type>
+			<type key="numbers" type="deva">देवनागरी अंक</type>
+			<type key="numbers" type="ethi">इथिओपिक अंक</type>
+			<type key="numbers" type="finance">वित्तीय संख्‍या</type>
+			<type key="numbers" type="fullwide">पूर्ण रुंदीचे अंक</type>
+			<type key="numbers" type="geor">जॉर्जियन अंक</type>
+			<type key="numbers" type="grek">ग्रीक अंक</type>
+			<type key="numbers" type="greklow">ग्रीक लहान लिपीचे अंक</type>
+			<type key="numbers" type="gujr">गुजराती अंक</type>
+			<type key="numbers" type="guru">गुरमुखी अंक</type>
+			<type key="numbers" type="hanidec">चीनी दशांश अंक</type>
+			<type key="numbers" type="hans">सरलीकृत चीनी अंक</type>
+			<type key="numbers" type="hansfin">सरलीकृत चीनी वित्तीय अंक</type>
+			<type key="numbers" type="hant">पारंपारिक चीनी अंक</type>
+			<type key="numbers" type="hantfin">पारंपारिक चीनी वित्तीय अंक</type>
+			<type key="numbers" type="hebr">हिब्रू अंक</type>
+			<type key="numbers" type="jpan">जपानी अंक</type>
+			<type key="numbers" type="jpanfin">जपानी वित्तीय अंक</type>
+			<type key="numbers" type="khmr">ख्मेर अंक</type>
+			<type key="numbers" type="knda">कन्नड अंक</type>
+			<type key="numbers" type="laoo">लाओ अंक</type>
+			<type key="numbers" type="latn">पश्चिमी अंक</type>
+			<type key="numbers" type="mlym">मल्याळम अंक</type>
+			<type key="numbers" type="mong">मंगोलियन अंक</type>
+			<type key="numbers" type="mymr">म्यानमार अंक</type>
+			<type key="numbers" type="native">मूळ अंक</type>
+			<type key="numbers" type="orya">उडिया अंक</type>
+			<type key="numbers" type="roman">रोमन अंक</type>
+			<type key="numbers" type="romanlow">रोमन लहान लिपीचे अंक</type>
+			<type key="numbers" type="taml">पारंपारिक तामिळ अंक</type>
+			<type key="numbers" type="tamldec">तामिळ अंक</type>
+			<type key="numbers" type="telu">तेलगु अंक</type>
+			<type key="numbers" type="thai">थाई अंक</type>
+			<type key="numbers" type="tibt">तिबेटी अंक</type>
+			<type key="numbers" type="traditional">पारंपारिक संख्‍या</type>
+			<type key="numbers" type="vaii">व्हाई अंक</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN">BGN</transformName>
@@ -1131,12 +1148,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern>{1} 'वाजता' {0}</pattern>
+							<pattern>{1} वाजता {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern>{1} 'वाजता' {0}</pattern>
+							<pattern>{1} वाजता {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
@@ -1151,6 +1168,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -1495,18 +1513,78 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="pm">PM</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">स</dayPeriod>
-							<dayPeriod type="noon">दु</dayPeriod>
-							<dayPeriod type="pm">सं</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">मध्यरात्र</dayPeriod>
 							<dayPeriod type="am">म.पू.</dayPeriod>
 							<dayPeriod type="noon">मध्यान्ह</dayPeriod>
 							<dayPeriod type="pm">म.उ.</dayPeriod>
+							<dayPeriod type="morning1">पहाट</dayPeriod>
+							<dayPeriod type="morning2">सकाळ</dayPeriod>
+							<dayPeriod type="afternoon1">दुपार</dayPeriod>
+							<dayPeriod type="evening1">संध्याकाळ</dayPeriod>
+							<dayPeriod type="evening2">सायंकाळ</dayPeriod>
+							<dayPeriod type="night1">रात्र</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">म.रा.</dayPeriod>
+							<dayPeriod type="am">स</dayPeriod>
+							<dayPeriod type="noon">म</dayPeriod>
+							<dayPeriod type="pm">सं</dayPeriod>
+							<dayPeriod type="morning1">प</dayPeriod>
+							<dayPeriod type="morning2">स</dayPeriod>
+							<dayPeriod type="afternoon1">दु</dayPeriod>
+							<dayPeriod type="evening1">सं</dayPeriod>
+							<dayPeriod type="evening2">सा</dayPeriod>
+							<dayPeriod type="night1">रा</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">मध्यरात्र</dayPeriod>
+							<dayPeriod type="am">म.पू.</dayPeriod>
+							<dayPeriod type="noon">मध्यान्ह</dayPeriod>
+							<dayPeriod type="pm">म.उ.</dayPeriod>
+							<dayPeriod type="morning1">पहाट</dayPeriod>
+							<dayPeriod type="morning2">सकाळ</dayPeriod>
+							<dayPeriod type="afternoon1">दुपार</dayPeriod>
+							<dayPeriod type="evening1">संध्याकाळ</dayPeriod>
+							<dayPeriod type="evening2">सायंकाळ</dayPeriod>
+							<dayPeriod type="night1">रात्र</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">मध्यरात्र</dayPeriod>
+							<dayPeriod type="am">म.पू.</dayPeriod>
+							<dayPeriod type="noon">मध्यान्ह</dayPeriod>
+							<dayPeriod type="pm">म.उ.</dayPeriod>
+							<dayPeriod type="morning1">पहाट</dayPeriod>
+							<dayPeriod type="morning2">सकाळ</dayPeriod>
+							<dayPeriod type="afternoon1">दुपार</dayPeriod>
+							<dayPeriod type="evening1">संध्याकाळ</dayPeriod>
+							<dayPeriod type="evening2">सायंकाळ</dayPeriod>
+							<dayPeriod type="night1">रात्र</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">म.रा.</dayPeriod>
+							<dayPeriod type="am">म.पू.</dayPeriod>
+							<dayPeriod type="noon">म</dayPeriod>
+							<dayPeriod type="pm">म.उ.</dayPeriod>
+							<dayPeriod type="morning1">प</dayPeriod>
+							<dayPeriod type="morning2">स</dayPeriod>
+							<dayPeriod type="afternoon1">दु</dayPeriod>
+							<dayPeriod type="evening1">सं</dayPeriod>
+							<dayPeriod type="evening2">सा</dayPeriod>
+							<dayPeriod type="night1">रा</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">मध्यरात्र</dayPeriod>
+							<dayPeriod type="am">म.पू.</dayPeriod>
+							<dayPeriod type="noon">मध्यान्ह</dayPeriod>
+							<dayPeriod type="pm">म.उ.</dayPeriod>
+							<dayPeriod type="morning1">पहाट</dayPeriod>
+							<dayPeriod type="morning2">सकाळ</dayPeriod>
+							<dayPeriod type="afternoon1">दुपार</dayPeriod>
+							<dayPeriod type="evening1">संध्याकाळ</dayPeriod>
+							<dayPeriod type="evening2">सायंकाळ</dayPeriod>
+							<dayPeriod type="night1">रात्र</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1515,11 +1593,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<era type="0">ईसवीसनपूर्व</era>
 						<era type="0" alt="variant">ईसापूर्व युग</era>
 						<era type="1">ईसवीसन</era>
-						<era type="1" alt="variant">ईसायुग</era>
+						<era type="1" alt="variant">ख्रिस्तयुग</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">इ. स. पू.</era>
-						<era type="0" alt="variant">इ. स. पू. युग</era>
+						<era type="0" alt="variant">ईसापूर्व युग</era>
 						<era type="1">इ. स.</era>
 						<era type="1" alt="variant">ख्रि. यु.</era>
 					</eraAbbr>
@@ -1571,12 +1649,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern>{1} 'रोजी' {0}</pattern>
+							<pattern>{1} रोजी {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern>{1} 'रोजी' {0}</pattern>
+							<pattern>{1} रोजी {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
@@ -1607,6 +1685,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">H:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
@@ -1749,17 +1831,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>वर्ष</displayName>
+				<relative type="-1">मागील वर्ष</relative>
+				<relative type="0">हे वर्ष</relative>
+				<relative type="1">पुढील वर्ष</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} वर्षांमध्ये</relativeTimePattern>
+					<relativeTimePattern count="one">{0} वर्षामध्ये</relativeTimePattern>
 					<relativeTimePattern count="other">{0} वर्षांमध्ये</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} वर्षांपूर्वी</relativeTimePattern>
+					<relativeTimePattern count="one">{0} वर्षापूर्वी</relativeTimePattern>
 					<relativeTimePattern count="other">{0} वर्षांपूर्वी</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="year-narrow">
 				<displayName>वर्ष</displayName>
+				<relative type="-1">मागील वर्ष</relative>
+				<relative type="0">हे वर्ष</relative>
+				<relative type="1">पुढील वर्ष</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} वर्ष</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} वर्ष</relativeTimePattern>
@@ -1771,6 +1859,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter">
 				<displayName>तिमाही</displayName>
+				<relative type="-1">मागील तिमाही</relative>
+				<relative type="0">ही तिमाही</relative>
+				<relative type="1">पुढील तिमाही</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} तिमाहीमध्ये</relativeTimePattern>
 					<relativeTimePattern count="other">{0} तिमाहींमध्ये</relativeTimePattern>
@@ -1782,6 +1873,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>तिमाही</displayName>
+				<relative type="-1">मागील तिमाही</relative>
+				<relative type="0">ही तिमाही</relative>
+				<relative type="1">पुढील तिमाही</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} तिमाहीमध्ये</relativeTimePattern>
 					<relativeTimePattern count="other">{0} तिमाहींमध्ये</relativeTimePattern>
@@ -1793,13 +1887,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>तिमाही</displayName>
+				<relative type="-1">मागील तिमाही</relative>
+				<relative type="0">ही तिमाही</relative>
+				<relative type="1">पुढील तिमाही</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">+{0} तिमाही</relativeTimePattern>
-					<relativeTimePattern count="other">+{0} तिमाही</relativeTimePattern>
+					<relativeTimePattern count="one">{0} तिमाहीमध्ये</relativeTimePattern>
+					<relativeTimePattern count="other">{0} तिमाहींमध्ये</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} तिमाही</relativeTimePattern>
-					<relativeTimePattern count="other">-{0} तिमाही</relativeTimePattern>
+					<relativeTimePattern count="one">{0} तिमाहीपूर्वी</relativeTimePattern>
+					<relativeTimePattern count="other">{0} तिमाहींपूर्वी</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month">
@@ -1818,6 +1915,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>महिना</displayName>
+				<relative type="-1">मागील महिना</relative>
+				<relative type="0">हा महिना</relative>
+				<relative type="1">पुढील महिना</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} महिन्यामध्ये</relativeTimePattern>
 					<relativeTimePattern count="other">{0} महिन्यामध्ये</relativeTimePattern>
@@ -1829,13 +1929,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>महिना</displayName>
+				<relative type="-1">मागील महिना</relative>
+				<relative type="0">हा महिना</relative>
+				<relative type="1">पुढील महिना</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">+{0} महिना</relativeTimePattern>
-					<relativeTimePattern count="other">+{0} महिना</relativeTimePattern>
+					<relativeTimePattern count="one">{0} महिन्यामध्ये</relativeTimePattern>
+					<relativeTimePattern count="other">{0} महिन्यांमध्ये</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} महिना</relativeTimePattern>
-					<relativeTimePattern count="other">-{0} महिना</relativeTimePattern>
+					<relativeTimePattern count="one">{0} महिन्यापूर्वी</relativeTimePattern>
+					<relativeTimePattern count="other">{0} महिन्यांपूर्वी</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week">
@@ -1854,24 +1957,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>आठवडा</displayName>
+				<relative type="-1">मागील आठवडा</relative>
+				<relative type="0">हा आठवडा</relative>
+				<relative type="1">पुढील आठवडा</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} आठवड्यामध्ये</relativeTimePattern>
-					<relativeTimePattern count="other">{0} आठवड्यामध्ये</relativeTimePattern>
+					<relativeTimePattern count="other">{0} आठवड्यांमध्ये</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} आठवड्यापूर्वी</relativeTimePattern>
-					<relativeTimePattern count="other">{0} आठवड्यापूर्वी</relativeTimePattern>
+					<relativeTimePattern count="other">{0} आठवड्यांपूर्वी</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week-narrow">
 				<displayName>आठवडा</displayName>
+				<relative type="-1">मागील आठवडा</relative>
+				<relative type="0">हा आठवडा</relative>
+				<relative type="1">पुढील आठवडा</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">+{0} आठवडा</relativeTimePattern>
-					<relativeTimePattern count="other">+{0} आठवडा</relativeTimePattern>
+					<relativeTimePattern count="one">{0} आठवड्यामध्ये</relativeTimePattern>
+					<relativeTimePattern count="other">{0} आठवड्यांमध्ये</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} आठवडा</relativeTimePattern>
-					<relativeTimePattern count="other">-{0} आठवडा</relativeTimePattern>
+					<relativeTimePattern count="one">{0} आठवड्यापूर्वी</relativeTimePattern>
+					<relativeTimePattern count="other">{0} आठवड्यांपूर्वी</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day">
@@ -1902,12 +2011,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="day-narrow">
 				<displayName>दिवस</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">+{0} दिवस</relativeTimePattern>
-					<relativeTimePattern count="other">+{0} दिवस</relativeTimePattern>
+					<relativeTimePattern count="one">{0} दिवसामध्ये</relativeTimePattern>
+					<relativeTimePattern count="other">{0} दिवसांमध्ये</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} दिवस</relativeTimePattern>
-					<relativeTimePattern count="other">-{0} दिवस</relativeTimePattern>
+					<relativeTimePattern count="one">{0} दिवसापूर्वी</relativeTimePattern>
+					<relativeTimePattern count="other">{0} दिवसांपूर्वी</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="weekday">
@@ -1924,9 +2033,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">पुढील रवि.</relative>
 			</field>
 			<field type="sun-narrow">
-				<relative type="-1">मागील रवि</relative>
-				<relative type="0">हा रवि</relative>
-				<relative type="1">पुढील रवि</relative>
+				<relative type="-1">मागील र</relative>
+				<relative type="0">हा र</relative>
+				<relative type="1">पुढील र</relative>
 			</field>
 			<field type="mon">
 				<relative type="-1">मागील सोमवार</relative>
@@ -1939,8 +2048,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">पुढील सोम.</relative>
 			</field>
 			<field type="mon-narrow">
-				<relative type="-1">मागील सोम</relative>
-				<relative type="0">हा सोम</relative>
+				<relative type="-1">मागील सो</relative>
+				<relative type="0">हा सो</relative>
 				<relative type="1">पुढील सो</relative>
 			</field>
 			<field type="tue">
@@ -1954,9 +2063,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">पुढील मंगळ.</relative>
 			</field>
 			<field type="tue-narrow">
-				<relative type="-1">मागील मंगळ</relative>
-				<relative type="0">हा मंगळ</relative>
-				<relative type="1">पुढील मंगळ</relative>
+				<relative type="-1">मागील मं</relative>
+				<relative type="0">हा मं</relative>
+				<relative type="1">पुढील मं</relative>
 			</field>
 			<field type="wed">
 				<relative type="-1">मागील बुधवार</relative>
@@ -1969,9 +2078,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">पुढील बुध.</relative>
 			</field>
 			<field type="wed-narrow">
-				<relative type="-1">मागील बुध</relative>
-				<relative type="0">हा बुध</relative>
-				<relative type="1">पुढील बुध</relative>
+				<relative type="-1">मागील बु</relative>
+				<relative type="0">हा बु</relative>
+				<relative type="1">पुढील बु</relative>
 			</field>
 			<field type="thu">
 				<relative type="-1">मागील गुरुवार</relative>
@@ -1984,9 +2093,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">पुढील गुरू.</relative>
 			</field>
 			<field type="thu-narrow">
-				<relative type="-1">मागील गुरू</relative>
-				<relative type="0">हा गुरू</relative>
-				<relative type="1">पुढील गुरू</relative>
+				<relative type="-1">मागील गु</relative>
+				<relative type="0">हा गु</relative>
+				<relative type="1">पुढील गु</relative>
 			</field>
 			<field type="fri">
 				<relative type="-1">मागील शुक्रवार</relative>
@@ -1999,9 +2108,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">पुढील शुक्र.</relative>
 			</field>
 			<field type="fri-narrow">
-				<relative type="-1">मागील शुक्र</relative>
-				<relative type="0">हा शुक्र</relative>
-				<relative type="1">पुढील शुक्र</relative>
+				<relative type="-1">मागील शु</relative>
+				<relative type="0">हा शु</relative>
+				<relative type="1">पुढील शु</relative>
 			</field>
 			<field type="sat">
 				<relative type="-1">मागील शनिवार</relative>
@@ -2014,12 +2123,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">पुढील शनि.</relative>
 			</field>
 			<field type="sat-narrow">
-				<relative type="-1">मागील शनि</relative>
-				<relative type="0">हा शनि</relative>
-				<relative type="1">पुढील शनि</relative>
+				<relative type="-1">मागील श</relative>
+				<relative type="0">हा श</relative>
+				<relative type="1">पुढील श</relative>
 			</field>
 			<field type="dayperiod">
-				<displayName>[AM/PM]</displayName>
+				<displayName>[म.पू./म.उ.]</displayName>
 			</field>
 			<field type="hour">
 				<displayName>तास</displayName>
@@ -2036,22 +2145,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>तास</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} तासामध्ये</relativeTimePattern>
-					<relativeTimePattern count="other">{0} तासामध्ये</relativeTimePattern>
+					<relativeTimePattern count="other">{0} तासांमध्ये</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} तासापूर्वी</relativeTimePattern>
-					<relativeTimePattern count="other">{0} तासापूर्वी</relativeTimePattern>
+					<relativeTimePattern count="other">{0} तासांपूर्वी</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-narrow">
 				<displayName>तास</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">+{0} ता</relativeTimePattern>
-					<relativeTimePattern count="other">+{0} ता</relativeTimePattern>
+					<relativeTimePattern count="one">{0} तासामध्ये</relativeTimePattern>
+					<relativeTimePattern count="other">{0} तासांमध्ये</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} ता</relativeTimePattern>
-					<relativeTimePattern count="other">-{0} ता</relativeTimePattern>
+					<relativeTimePattern count="one">{0} तासापूर्वी</relativeTimePattern>
+					<relativeTimePattern count="other">{0} तासांपूर्वी</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute">
@@ -2077,14 +2186,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="minute-narrow">
-				<displayName>मि</displayName>
+				<displayName>मि.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">+{0} मि</relativeTimePattern>
-					<relativeTimePattern count="other">+{0} मि</relativeTimePattern>
+					<relativeTimePattern count="one">{0} मिनि. मध्ये</relativeTimePattern>
+					<relativeTimePattern count="other">{0} मिनि. मध्ये</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} मि</relativeTimePattern>
-					<relativeTimePattern count="other">-{0} मि</relativeTimePattern>
+					<relativeTimePattern count="one">{0} मिनि. पूर्वी</relativeTimePattern>
+					<relativeTimePattern count="other">{0} मिनि. पूर्वी</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second">
@@ -2102,23 +2211,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="second-short">
 				<displayName>से.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} सेकंदामध्ये</relativeTimePattern>
-					<relativeTimePattern count="other">{0} सेकंदामध्ये</relativeTimePattern>
+					<relativeTimePattern count="one">{0} से. मध्ये</relativeTimePattern>
+					<relativeTimePattern count="other">{0} से. मध्ये</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} सेकंदापूर्वी</relativeTimePattern>
-					<relativeTimePattern count="other">{0} सेकंदापूर्वी</relativeTimePattern>
+					<relativeTimePattern count="one">{0} से. पूर्वी</relativeTimePattern>
+					<relativeTimePattern count="other">{0} से. पूर्वी</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second-narrow">
-				<displayName>से</displayName>
+				<displayName>से.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">+{0} से</relativeTimePattern>
-					<relativeTimePattern count="other">+{0} से</relativeTimePattern>
+					<relativeTimePattern count="one">{0} से. मध्ये</relativeTimePattern>
+					<relativeTimePattern count="other">{0} से. मध्ये</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} से पूर्वी</relativeTimePattern>
-					<relativeTimePattern count="other">-{0} से पूर्वी</relativeTimePattern>
+					<relativeTimePattern count="one">{0} से. पूर्वी</relativeTimePattern>
+					<relativeTimePattern count="other">{0} से. पूर्वी</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="zone">
@@ -2185,7 +2294,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>कॅसे</exemplarCity>
 			</zone>
 			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>डुमोंट डी‘उर्व्हिल</exemplarCity>
+				<exemplarCity>ड्युमॉन्ट ड्युर्विल</exemplarCity>
 			</zone>
 			<zone type="Antarctica/McMurdo">
 				<exemplarCity>मॅक्मुरडो</exemplarCity>
@@ -2299,7 +2408,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>सोफिया</exemplarCity>
 			</zone>
 			<zone type="Asia/Bahrain">
-				<exemplarCity>बहारीन</exemplarCity>
+				<exemplarCity>बेहरीन</exemplarCity>
 			</zone>
 			<zone type="Africa/Bujumbura">
 				<exemplarCity>बुजुंबुरा</exemplarCity>
@@ -2350,7 +2459,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>बेलेम</exemplarCity>
 			</zone>
 			<zone type="America/Araguaina">
-				<exemplarCity>अरागुआइना</exemplarCity>
+				<exemplarCity>अरागायना</exemplarCity>
 			</zone>
 			<zone type="America/Sao_Paulo">
 				<exemplarCity>साओ पावलो</exemplarCity>
@@ -2395,7 +2504,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>इनुविक</exemplarCity>
 			</zone>
 			<zone type="America/Vancouver">
-				<exemplarCity>व्हँकुव्हर</exemplarCity>
+				<exemplarCity>व्हॅनकुव्हर</exemplarCity>
 			</zone>
 			<zone type="America/Dawson_Creek">
 				<exemplarCity>डॉसन क्रीक</exemplarCity>
@@ -2557,7 +2666,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>गुआयाक्विल</exemplarCity>
 			</zone>
 			<zone type="Europe/Tallinn">
-				<exemplarCity>तल्लिन्न</exemplarCity>
+				<exemplarCity>तालिन</exemplarCity>
 			</zone>
 			<zone type="Africa/Cairo">
 				<exemplarCity>कैरो</exemplarCity>
@@ -2596,7 +2705,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>पोनपेई</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kosrae">
-				<exemplarCity>कोसराए</exemplarCity>
+				<exemplarCity>कोशाय</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Faeroe">
 				<exemplarCity>फॅरो</exemplarCity>
@@ -2638,7 +2747,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>नूक</exemplarCity>
 			</zone>
 			<zone type="America/Scoresbysund">
-				<exemplarCity>इट्टोकोर्टूरमिट</exemplarCity>
+				<exemplarCity>इटोकॉरटॉर्मीट</exemplarCity>
 			</zone>
 			<zone type="America/Danmarkshavn">
 				<exemplarCity>डेन्मार्कशॉन</exemplarCity>
@@ -2899,7 +3008,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>तिजुआना</exemplarCity>
 			</zone>
 			<zone type="America/Santa_Isabel">
-				<exemplarCity>सँटा इसाबेल</exemplarCity>
+				<exemplarCity>सांता इसाबेल</exemplarCity>
 			</zone>
 			<zone type="America/Hermosillo">
 				<exemplarCity>हर्मोसिलो</exemplarCity>
@@ -3000,6 +3109,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>पोर्ट मोरेस्बे</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>बॉगॅनव्हिल</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>मनिला</exemplarCity>
 			</zone>
@@ -3013,7 +3125,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>मिक्वेलोन</exemplarCity>
 			</zone>
 			<zone type="Pacific/Pitcairn">
-				<exemplarCity>पिट्कैर्न</exemplarCity>
+				<exemplarCity>पिटकेर्न</exemplarCity>
 			</zone>
 			<zone type="America/Puerto_Rico">
 				<exemplarCity>प्युएर्तो रिको</exemplarCity>
@@ -3084,6 +3196,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>ईर्कुत्स्क</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>चिता</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>यकुत्स्क</exemplarCity>
 			</zone>
@@ -3102,6 +3217,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>मेगाडन</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>स्रेदनेकोलीम्स्क</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>कॅमचाटका</exemplarCity>
 			</zone>
@@ -3166,13 +3284,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>एल साल्वाडोर</exemplarCity>
 			</zone>
 			<zone type="America/Lower_Princes">
-				<exemplarCity>लोअर प्रिन्स क्वार्टर</exemplarCity>
+				<exemplarCity>लोअर प्रिन्सस क्वार्टर</exemplarCity>
 			</zone>
 			<zone type="Asia/Damascus">
 				<exemplarCity>दमास्कस</exemplarCity>
 			</zone>
 			<zone type="Africa/Mbabane">
-				<exemplarCity>मबाबाने</exemplarCity>
+				<exemplarCity>अंबाबाने</exemplarCity>
 			</zone>
 			<zone type="America/Grand_Turk">
 				<exemplarCity>ग्रँड टर्क</exemplarCity>
@@ -3223,7 +3341,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>दार ए सलाम</exemplarCity>
 			</zone>
 			<zone type="Europe/Uzhgorod">
-				<exemplarCity>उझगोरोड</exemplarCity>
+				<exemplarCity>उझहोरोड</exemplarCity>
 			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>कीव</exemplarCity>
@@ -3259,7 +3377,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>यकुतात</exemplarCity>
 			</zone>
 			<zone type="America/Sitka">
-				<exemplarCity>सितका</exemplarCity>
+				<exemplarCity>सिटका</exemplarCity>
 			</zone>
 			<zone type="America/Juneau">
 				<exemplarCity>ज्यूनौ</exemplarCity>
@@ -3316,7 +3434,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>इंडियानापोलिस</exemplarCity>
 			</zone>
 			<zone type="America/Louisville">
-				<exemplarCity>लुईव्हिल</exemplarCity>
+				<exemplarCity>ल्युइसव्हिल</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Vevay">
 				<exemplarCity>वेवाय-इंडियाना</exemplarCity>
@@ -3473,9 +3591,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic>आपिया वेळ</generic>
-					<standard>आपिया प्रमाण वेळ</standard>
-					<daylight>आपिया सूर्यप्रकाश वेळ</daylight>
+					<generic>एपिया वेळ</generic>
+					<standard>एपिया प्रमाण वेळ</standard>
+					<daylight>एपिया सूर्यप्रकाश वेळ</daylight>
 				</long>
 			</metazone>
 			<metazone type="Aqtau">
@@ -3508,9 +3626,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Argentina_Western">
 				<long>
-					<generic>पश्चिम अर्जेंटिना वेळ</generic>
-					<standard>पश्चिम अर्जेंटिना प्रमाण वेळ</standard>
-					<daylight>पश्चिम अर्जेंटिना उन्हाळी वेळ</daylight>
+					<generic>पश्चिमी अर्जेंटिना वेळ</generic>
+					<standard>पश्चिमी अर्जेंटिना प्रमाण वेळ</standard>
+					<daylight>पश्चिमी अर्जेंटिना उन्हाळी वेळ</daylight>
 				</long>
 			</metazone>
 			<metazone type="Armenia">
@@ -3676,7 +3794,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="DumontDUrville">
 				<long>
-					<standard>डरमाँट-डी‘उर्व्हिले वेळ</standard>
+					<standard>ड्युमॉन्ट-ड्युर्विल वेळ</standard>
 				</long>
 			</metazone>
 			<metazone type="East_Timor">
@@ -3848,12 +3966,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Indonesia_Eastern">
 				<long>
-					<standard>पूर्व इंडोनेशिया वेळ</standard>
+					<standard>पौर्वात्य इंडोनेशिया वेळ</standard>
 				</long>
 			</metazone>
 			<metazone type="Indonesia_Western">
 				<long>
-					<standard>पश्चिम इंडोनेशिया वेळ</standard>
+					<standard>पश्चिमी इंडोनेशिया वेळ</standard>
 				</long>
 			</metazone>
 			<metazone type="Iran">
@@ -3872,9 +3990,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Israel">
 				<long>
-					<generic>इस्राएल वेळ</generic>
-					<standard>इस्राएल प्रमाण वेळ</standard>
-					<daylight>इस्राएल सूर्यप्रकाश वेळ</daylight>
+					<generic>इस्रायल</generic>
+					<standard>इस्रायल प्रमाण वेळ</standard>
+					<daylight>इस्रायल सूर्यप्रकाश वेळ</daylight>
 				</long>
 			</metazone>
 			<metazone type="Japan">
@@ -4283,9 +4401,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Vanuatu">
 				<long>
-					<generic>वनातू वेळ</generic>
-					<standard>वनातू प्रमाण वेळ</standard>
-					<daylight>वनातू उन्हाळी वेळ</daylight>
+					<generic>वानुआतु वेळ</generic>
+					<standard>वानुआतु प्रमाण वेळ</standard>
+					<daylight>वानुआतु उन्हाळी वेळ</daylight>
 				</long>
 			</metazone>
 			<metazone type="Venezuela">
@@ -4485,6 +4603,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">¤0 ह</pattern>
+					<pattern type="1000" count="other">¤0 ह</pattern>
+					<pattern type="10000" count="one">¤00 ह</pattern>
+					<pattern type="10000" count="other">¤00 ह</pattern>
+					<pattern type="100000" count="one">¤0 लाख</pattern>
+					<pattern type="100000" count="other">¤0 लाख</pattern>
+					<pattern type="1000000" count="one">¤00 लाख</pattern>
+					<pattern type="1000000" count="other">¤00 लाख</pattern>
+					<pattern type="10000000" count="one">¤0 कोटी</pattern>
+					<pattern type="10000000" count="other">¤0 कोटी</pattern>
+					<pattern type="100000000" count="one">¤00 कोटी</pattern>
+					<pattern type="100000000" count="other">¤00 कोटी</pattern>
+					<pattern type="1000000000" count="one">¤0 अब्ज</pattern>
+					<pattern type="1000000000" count="other">¤0 अब्ज</pattern>
+					<pattern type="10000000000" count="one">¤00 अब्ज</pattern>
+					<pattern type="10000000000" count="other">¤00 अब्ज</pattern>
+					<pattern type="100000000000" count="one">¤0 खर्व</pattern>
+					<pattern type="100000000000" count="other">¤0 खर्व</pattern>
+					<pattern type="1000000000000" count="one">¤00 खर्व</pattern>
+					<pattern type="1000000000000" count="other">¤00 खर्व</pattern>
+					<pattern type="10000000000000" count="one">¤0 पद्म</pattern>
+					<pattern type="10000000000000" count="other">¤0 पद्म</pattern>
+					<pattern type="100000000000000" count="one">¤00 पद्म</pattern>
+					<pattern type="100000000000000" count="other">¤00 पद्म</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4524,6 +4670,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">अँगोलन क्वॅन्झा</displayName>
 				<displayName count="other">अँगोलन क्वॅन्झास</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="ARS">
 				<displayName>अर्जेंटाइन पेसो</displayName>
@@ -4556,6 +4703,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">बोस्निया-हर्जेगोविना विनिमय मार्क</displayName>
 				<displayName count="other">बोस्निया-हर्जेगोविना विनिमय मार्क्स</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>बार्बाडियन डॉलर</displayName>
@@ -4584,9 +4732,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>BHD</symbol>
 			</currency>
 			<currency type="BIF">
-				<displayName>बुरुडियन फ्रँक</displayName>
-				<displayName count="one">बुरुडियन फ्रँक</displayName>
-				<displayName count="other">बुरुडियन फ्रँक्स</displayName>
+				<displayName>बुरुंडियन फ्रँक</displayName>
+				<displayName count="one">बुरुंडियन फ्रँक</displayName>
+				<displayName count="other">बुरुंडियन फ्रँक्स</displayName>
 				<symbol>BIF</symbol>
 			</currency>
 			<currency type="BMD">
@@ -4608,6 +4756,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">बोलिव्हियन बोलिव्हियानो</displayName>
 				<displayName count="other">बोलिव्हियन बोलिव्हियानोज</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BRL">
 				<displayName>ब्राझिलियन रियाल</displayName>
@@ -4630,10 +4779,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>BTN</symbol>
 			</currency>
 			<currency type="BWP">
-				<displayName>बोट्सवाना पुला</displayName>
-				<displayName count="one">बोट्सवाना पुला</displayName>
+				<displayName>बोट्सवानन पुला</displayName>
+				<displayName count="one">बोट्सवानन पुला</displayName>
 				<displayName count="other">बोट्सवाना पुलाज</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYR">
 				<displayName>बेलारुशियन रुबल</displayName>
@@ -4701,6 +4851,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">क्यूबन विनिमय पेसो</displayName>
 				<displayName count="other">क्यूबन विनिमय पेसोज</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>क्यूबन पेसो</displayName>
@@ -4720,6 +4871,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">झेक प्रजासत्ताक कोरुना</displayName>
 				<displayName count="other">झेक प्रजासत्ताक कोरुनाज</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DJF">
 				<displayName>जिबौटियन फ्रँक</displayName>
@@ -4732,6 +4884,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">डॅनिश क्रोन</displayName>
 				<displayName count="other">डॅनिश क्रोनर</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>डोमिनिकन पेसो</displayName>
@@ -4751,11 +4904,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">इजिप्शियन पाउंड</displayName>
 				<displayName count="other">इजिप्शियन पाउंड्स</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
-				<displayName>इरिट्रियन नाफ्का</displayName>
-				<displayName count="one">इरिट्रिया नाफ्का</displayName>
-				<displayName count="other">इरिट्रिया नाफ्काज</displayName>
+				<displayName>इरिट्रियन नाक्फा</displayName>
+				<displayName count="one">इरिट्रियन नाक्फा</displayName>
+				<displayName count="other">इरिट्रियन नाक्फाज</displayName>
 				<symbol>ERN</symbol>
 			</currency>
 			<currency type="ETB">
@@ -4783,11 +4937,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">फॉकलंड आयलंड पाउंड</displayName>
 				<displayName count="other">फॉकलंड आयलंड पाउंड्स</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GBP">
-				<displayName>ब्रिटिश पाऊंड स्टर्लिंग</displayName>
-				<displayName count="one">ब्रिटिश पाऊंड स्टर्लिंग</displayName>
-				<displayName count="other">ब्रिटिश पाऊंड्स स्टर्लिंग</displayName>
+				<displayName>ब्रिटिश पाऊंड</displayName>
+				<displayName count="one">ब्रिटिश पाऊंड</displayName>
+				<displayName count="other">ब्रिटिश पाऊंड्स</displayName>
 				<symbol>£</symbol>
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
@@ -4796,6 +4951,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">जॉर्जियन लारी</displayName>
 				<displayName count="other">जॉर्जियन लारी</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">[₾]</symbol>
 			</currency>
 			<currency type="GHS">
 				<displayName>घानीयन सेडी</displayName>
@@ -4821,12 +4977,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">गिनी फ्रँक</displayName>
 				<displayName count="other">गिनी फ्रँक्स</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GTQ">
 				<displayName>ग्वाटेमालाचे क्वेत्झाल</displayName>
 				<displayName count="one">ग्वाटेमालाचे क्वेत्झाल</displayName>
 				<displayName count="other">ग्वाटेमालाचे क्वेत्झाल्स</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GYD">
 				<displayName>गयाना डॉलर</displayName>
@@ -4843,16 +5001,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="HNL">
-				<displayName>होंडुरा लेम्पियरा</displayName>
-				<displayName count="one">होंडुरा लेम्पियरा</displayName>
-				<displayName count="other">होंडुरा लेम्पियराज</displayName>
+				<displayName>होन्डुरन लेंपिरा</displayName>
+				<displayName count="one">होन्डुरन लेंपिरा</displayName>
+				<displayName count="other">होन्डुरन लेंपिराज</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRK">
 				<displayName>क्रोएशियन कूना</displayName>
 				<displayName count="one">क्रोएशियन कूना</displayName>
 				<displayName count="other">क्रोएशियन कूनाज</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>हैती गोअर्ड</displayName>
@@ -4865,12 +5025,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">हंगेरियन फॉरिन्ट</displayName>
 				<displayName count="other">हंगेरियन फॉरिन्ट्स</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
-				<displayName>इंडोनेशियन रुपैयाह</displayName>
-				<displayName count="one">इंडोनेशियन रुपैयाह</displayName>
-				<displayName count="other">इंडोनेशियन रुपैयाह</displayName>
+				<displayName>इंडोनेशियन रुपिया</displayName>
+				<displayName count="one">इंडोनेशियन रुपिया</displayName>
+				<displayName count="other">इंडोनेशियन रुपिया</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="ILS">
 				<displayName>ईस्त्रायली न्यू शेकेल</displayName>
@@ -4903,6 +5065,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">आइसलँडिक क्रोना</displayName>
 				<displayName count="other">आइसलँडिक क्रोन्युर</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="JMD">
 				<displayName>जमैकन डॉलर</displayName>
@@ -4944,16 +5107,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">៛</symbol>
 			</currency>
 			<currency type="KMF">
-				<displayName>कोलोरियन फ्रँक</displayName>
-				<displayName count="one">कोलोरियन फ्रँक</displayName>
-				<displayName count="other">कोलोरियन फ्रँक्स</displayName>
+				<displayName>कोमोरियन फ्रँक</displayName>
+				<displayName count="one">कोमोरियन फ्रँक</displayName>
+				<displayName count="other">कोमोरियन फ्रँक्स</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>उत्तर कोरियन वॉन</displayName>
 				<displayName count="one">उत्तर कोरियन वॉन</displayName>
 				<displayName count="other">उत्तर कोरियन वॉन</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>दक्षिण कोरियन वॉन</displayName>
@@ -4983,9 +5148,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">₸</symbol>
 			</currency>
 			<currency type="LAK">
-				<displayName>लेओशियन किप</displayName>
-				<displayName count="one">लेओशियन किप</displayName>
-				<displayName count="other">लेओशियन किप</displayName>
+				<displayName>लाओशियन किप</displayName>
+				<displayName count="one">लाओशियन किप</displayName>
+				<displayName count="other">लाओशियन किप</displayName>
 				<symbol>LAK</symbol>
 				<symbol alt="narrow" draft="contributed">₭</symbol>
 			</currency>
@@ -4994,12 +5159,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">लेबनीज पाउंड</displayName>
 				<displayName count="other">लेबनीज पाउंड्स</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
-				<displayName>श्रीलंकन रुपी</displayName>
-				<displayName count="one">श्रीलंकन रुपी</displayName>
+				<displayName>श्रीलंकन रुपया</displayName>
+				<displayName count="one">श्रीलंकन रुपया</displayName>
 				<displayName count="other">श्रीलंकन रुपये</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>लाइबेरियन डॉलर</displayName>
@@ -5026,13 +5193,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="LYD">
 				<displayName>लिबियाचा दिनार</displayName>
 				<displayName count="one">लिबियाचा दिनार</displayName>
-				<displayName count="other">लिबियाचा दिनार</displayName>
+				<displayName count="other">लिबियन दिनार</displayName>
 				<symbol>LYD</symbol>
 			</currency>
 			<currency type="MAD">
 				<displayName>मोरोक्को दिरहॅम</displayName>
 				<displayName count="one">मोरोक्को दिरहॅम</displayName>
-				<displayName count="other">मोरोक्को दिरहॅम</displayName>
+				<displayName count="other">मोरोक्कन दिरहाम</displayName>
 				<symbol>MAD</symbol>
 			</currency>
 			<currency type="MDL">
@@ -5046,6 +5213,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">मालागासी एरियारी</displayName>
 				<displayName count="other">मालागासी एरियारीज</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MKD">
 				<displayName>मॅसेडोनियन देनार</displayName>
@@ -5058,6 +5226,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">म्यानमार क्याट</displayName>
 				<displayName count="other">म्यानमार क्याट</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>मंगोलियन टुग्रिक</displayName>
@@ -5083,6 +5252,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">मॉरिशियन रुपी</displayName>
 				<displayName count="other">मॉरिशियन रुपीज</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>मालदीवियन रुफिया</displayName>
@@ -5108,6 +5278,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">मलेशियन रिंगिट</displayName>
 				<displayName count="other">मलेशियन रिंगिट</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZN">
 				<displayName>मोझांबिकन मेटिकल</displayName>
@@ -5132,20 +5303,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="NIO">
 				<displayName>निकाराग्वेचा कोर्डोबा</displayName>
 				<displayName count="one">निकाराग्वेचा कोर्डोबा</displayName>
-				<displayName count="other">निकाराग्वेचा कोर्डोबाज</displayName>
+				<displayName count="other">निकाराग्वन कोर्डोबाज</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NOK">
 				<displayName>नॉर्वेजियन क्रोन</displayName>
 				<displayName count="one">नॉर्वेजियन क्रोन</displayName>
 				<displayName count="other">नॉर्वेजियन क्रोनर</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>नेपाळी रुपया</displayName>
 				<displayName count="one">नेपाळी रुपया</displayName>
 				<displayName count="other">नेपाळी रुपये</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>न्यूझीलँड डॉलर</displayName>
@@ -5190,12 +5364,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">पाकिस्तानी रुपया</displayName>
 				<displayName count="other">पाकिस्तानी रुपये</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>पोलिश झ्लॉटी</displayName>
 				<displayName count="one">पोलिश झ्लॉटी</displayName>
 				<displayName count="other">पोलिश झ्लॉटीज</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PYG">
 				<displayName>पराग्वे ग्वारानी</displayName>
@@ -5227,12 +5403,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">रशियन रुबल</displayName>
 				<displayName count="other">रशियन रुबल्स</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RWF">
 				<displayName>रवांडा फ्रँक</displayName>
 				<displayName count="one">रवांडा फ्रँक</displayName>
 				<displayName count="other">रवांडा फ्रँक्स</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>सौदी रियाल</displayName>
@@ -5264,6 +5442,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">स्वीडिश क्रोना</displayName>
 				<displayName count="other">स्वीडिश क्रोनोर</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>सिंगापूर डॉलर</displayName>
@@ -5277,6 +5456,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">सेंट हेलेना पाउंड</displayName>
 				<displayName count="other">सेंट हेलेना पाउंड्स</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SLL">
 				<displayName>सिएरा लिऑनचा लिऑन</displayName>
@@ -5309,12 +5489,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">साओ टोम आणि प्रिन्सिपे डोबरा</displayName>
 				<displayName count="other">साओ टोम आणि प्रिन्सिपे डोबराज</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SYP">
 				<displayName>सीरियन पाउंड</displayName>
 				<displayName count="one">सीरियन पाउंड</displayName>
 				<displayName count="other">सीरियन पाउंड्स</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>स्वाझी लीलांगेनी</displayName>
@@ -5327,11 +5509,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">थाई बाहत</displayName>
 				<displayName count="other">थाई बाहत</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJS">
 				<displayName>ताजकीस्तानी सोमोनी</displayName>
 				<displayName count="one">ताजकीस्तानी सोमोनी</displayName>
-				<displayName count="other">ताजकीस्तानचा सोमोनी</displayName>
+				<displayName count="other">ताजकीस्तानी सोमोनीज</displayName>
 				<symbol>TJS</symbol>
 			</currency>
 			<currency type="TMT">
@@ -5347,10 +5530,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>TND</symbol>
 			</currency>
 			<currency type="TOP">
-				<displayName>टोंगा पाआंगा</displayName>
-				<displayName count="one">टोंगा पाआंगा</displayName>
-				<displayName count="other">टोंगा पाआंगा</displayName>
+				<displayName>टोंगन पाआंगा</displayName>
+				<displayName count="one">टोंगन पाआंगा</displayName>
+				<displayName count="other">टोंगन पाआंगा</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TRY">
 				<displayName>तुर्की लिरा</displayName>
@@ -5358,6 +5542,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">तुर्की लिरा</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>त्रिनिदाद आणि टोबॅगो डॉलर</displayName>
@@ -5407,9 +5592,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="UZS">
-				<displayName>उझबेकिस्तान सॉम</displayName>
-				<displayName count="one">उझबेकिस्तान सॉम</displayName>
-				<displayName count="other">उझबेकिस्तान सॉम</displayName>
+				<displayName>उझबेकिस्तानी सोम</displayName>
+				<displayName count="one">उझबेकिस्तानी सोम</displayName>
+				<displayName count="other">उझबेकिस्तानी सोम</displayName>
 				<symbol>UZS</symbol>
 			</currency>
 			<currency type="VEF">
@@ -5417,6 +5602,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">व्हेनेझुएला बोलिव्हार</displayName>
 				<displayName count="other">व्हेनेझुएला बोलिव्हार्स</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>व्हिएतनामी डोंग</displayName>
@@ -5426,9 +5612,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">₫</symbol>
 			</currency>
 			<currency type="VUV">
-				<displayName>वानाटु वाटु</displayName>
-				<displayName count="one">वानाटु वाटु</displayName>
-				<displayName count="other">वानाटु वाटुज</displayName>
+				<displayName>वानुआतु वाटु</displayName>
+				<displayName count="one">वानुआतु वाटु</displayName>
+				<displayName count="other">वानुआतु वाटु</displayName>
 				<symbol>VUV</symbol>
 			</currency>
 			<currency type="WST">
@@ -5438,9 +5624,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>WST</symbol>
 			</currency>
 			<currency type="XAF">
-				<displayName>[CFA] फ्रँक [BEAC]</displayName>
-				<displayName count="one">[CFA] फ्रँक [BEAC]</displayName>
-				<displayName count="other">[CFA] फ्रँक्स [BEAC]</displayName>
+				<displayName>मध्य आफ्रिकन [CFA] फ्रँक</displayName>
+				<displayName count="one">मध्य आफ्रिकन [CFA] फ्रँक</displayName>
+				<displayName count="other">मध्य आफ्रिकन [CFA] फ्रँक</displayName>
 				<symbol>FCFA</symbol>
 			</currency>
 			<currency type="XCD">
@@ -5448,11 +5634,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">पूर्व कॅरीबियन डॉलर</displayName>
 				<displayName count="other">पूर्व कॅरीबियन डॉलर्स</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XOF">
-				<displayName>[CFA] फ्रँक [BCEAO]</displayName>
-				<displayName count="one">[CFA] फ्रँक [BCEAO]</displayName>
-				<displayName count="other">[CFA] फ्रँक्स [BCEAO]</displayName>
+				<displayName>पश्चिम आफ्रिकन [CFA] फ्रँक</displayName>
+				<displayName count="one">पश्चिम आफ्रिकन [CFA] फ्रँक</displayName>
+				<displayName count="other">पश्चिम आफ्रिकन [CFA] फ्रँक्स</displayName>
 				<symbol>CFA</symbol>
 			</currency>
 			<currency type="XPF">
@@ -5463,7 +5650,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="XXX">
 				<displayName>अज्ञात चलन</displayName>
-				<displayName count="one">अज्ञात चलन</displayName>
+				<displayName count="one">(चलनाचे अज्ञात एकक)</displayName>
 				<displayName count="other">(अज्ञात चलन)</displayName>
 			</currency>
 			<currency type="YER">
@@ -5477,6 +5664,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">दक्षिण आफ्रिकी रँड</displayName>
 				<displayName count="other">दक्षिण आफ्रिकी रँड</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>झांबियन क्वाचा (1968–2012)</displayName>
@@ -5486,6 +5674,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">झांबियन क्वाचा</displayName>
 				<displayName count="other">झांबियन क्वाचास</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
@@ -5508,6 +5697,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} मीटर प्रति सेकंद चौरस</unitPattern>
 				<unitPattern count="other">{0} मीटर प्रति सेकंद चौरस</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>परिभ्रमण</displayName>
+				<unitPattern count="one">{0} परिभ्रमण</unitPattern>
+				<unitPattern count="other">{0} परिभ्रमणे</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>रेडियन</displayName>
+				<unitPattern count="one">{0} रेडियन</unitPattern>
+				<unitPattern count="other">{0} रेडियन</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>अंश</displayName>
+				<unitPattern count="one">{0} अंश</unitPattern>
+				<unitPattern count="other">{0} अंश</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>आर्कमिनिटे</displayName>
 				<unitPattern count="one">{0} आर्कमिनिट</unitPattern>
@@ -5518,30 +5722,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} आर्कसेकंद</unitPattern>
 				<unitPattern count="other">{0} आर्कसेकंद</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>अंश</displayName>
-				<unitPattern count="one">{0} अंश</unitPattern>
-				<unitPattern count="other">{0} अंश</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>रेडियन</displayName>
-				<unitPattern count="one">{0} रेडियन</unitPattern>
-				<unitPattern count="other">{0} रेडियन</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>एकर</displayName>
-				<unitPattern count="one">{0} एकर</unitPattern>
-				<unitPattern count="other">{0} एकर</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>चौरस किलोमीटर</displayName>
+				<unitPattern count="one">{0} चौरस किलोमीटर</unitPattern>
+				<unitPattern count="other">{0} चौरस किलोमीटर</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>हेक्टर</displayName>
 				<unitPattern count="one">{0} हेक्टर</unitPattern>
 				<unitPattern count="other">{0} हेक्टर</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>चौरस मीटर</displayName>
+				<unitPattern count="one">{0} चौरस मीटर</unitPattern>
+				<unitPattern count="other">{0} चौरस मीटर</unitPattern>
+				<perUnitPattern>{0} दर चौरस मीटर</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>चौरस सेंटीमीटर</displayName>
 				<unitPattern count="one">{0} चौरस सेंटीमीटर</unitPattern>
 				<unitPattern count="other">{0} चौरस सेंटीमीटर</unitPattern>
+				<perUnitPattern>{0} दर चौरस सेंटीमीटर</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>चौरस मैल</displayName>
+				<unitPattern count="one">{0} चौरस मैल</unitPattern>
+				<unitPattern count="other">{0} चौरस मैल</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>एकर</displayName>
+				<unitPattern count="one">{0} एकर</unitPattern>
+				<unitPattern count="other">{0} एकर</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>वर्ग यार्ड</displayName>
+				<unitPattern count="one">{0} वर्ग यार्ड</unitPattern>
+				<unitPattern count="other">{0} वर्ग यार्ड</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>चौरस फूट</displayName>
@@ -5552,91 +5768,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>चौरस इंच</displayName>
 				<unitPattern count="one">{0} चौरस इंच</unitPattern>
 				<unitPattern count="other">{0} चौरस इंच</unitPattern>
+				<perUnitPattern>{0} दर चौरस इंच</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>चौरस किलोमीटर</displayName>
-				<unitPattern count="one">{0} चौरस किलोमीटर</unitPattern>
-				<unitPattern count="other">{0} चौरस किलोमीटर</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>चौरस मीटर</displayName>
-				<unitPattern count="one">{0} चौरस मीटर</unitPattern>
-				<unitPattern count="other">{0} चौरस मीटर</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>चौरस मैल</displayName>
-				<unitPattern count="one">{0} चौरस मैल</unitPattern>
-				<unitPattern count="other">{0} चौरस मैल</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>वर्ग यार्ड</displayName>
-				<unitPattern count="one">{0} वर्ग यार्ड</unitPattern>
-				<unitPattern count="other">{0} वर्ग यार्ड</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>कॅरेट्स</displayName>
+				<unitPattern count="one">{0} कॅरेट</unitPattern>
+				<unitPattern count="other">{0} कॅरेट्स</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>लीटर प्रति किलोमीटर</displayName>
 				<unitPattern count="one">{0} लीटर प्रति किलोमीटर</unitPattern>
 				<unitPattern count="other">{0} लीटर प्रति किलोमीटर</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>लीटर प्रति 100 किलोमीटर</displayName>
+				<unitPattern count="one">{0} लीटर प्रति 100 किलोमीटर</unitPattern>
+				<unitPattern count="other">{0} लीटर प्रति 100 किलोमीटर</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>मैल प्रति गॅलन</displayName>
 				<unitPattern count="one">{0} मैल प्रति गॅलन</unitPattern>
 				<unitPattern count="other">{0} मैल प्रति गॅलन</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>बिट</displayName>
-				<unitPattern count="one">{0} बिट</unitPattern>
-				<unitPattern count="other">{0} बिट</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>बाइट</displayName>
-				<unitPattern count="one">{0} बाइट</unitPattern>
-				<unitPattern count="other">{0} बाइट</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>गिगाबिट</displayName>
-				<unitPattern count="one">{0} गिगाबिट</unitPattern>
-				<unitPattern count="other">{0} गिगाबिट</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>गिगाबाइट</displayName>
-				<unitPattern count="one">{0} गिगाबाइट</unitPattern>
-				<unitPattern count="other">{0} गिगाबाइट</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>किलोबिट</displayName>
-				<unitPattern count="one">{0} किलोबिट</unitPattern>
-				<unitPattern count="other">{0} किलोबिट</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>किलोबाइट</displayName>
-				<unitPattern count="one">{0} किलोबाइट</unitPattern>
-				<unitPattern count="other">{0} किलोबाइट</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>मेगाबिट</displayName>
-				<unitPattern count="one">{0} मेगाबिट</unitPattern>
-				<unitPattern count="other">{0} मेगाबिट</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>मेगाबाइट</displayName>
-				<unitPattern count="one">{0} मेगाबाइट</unitPattern>
-				<unitPattern count="other">{0} मेगाबाइट</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>टेराबिट</displayName>
-				<unitPattern count="one">{0} टेराबिट</unitPattern>
-				<unitPattern count="other">{0} टेराबिट</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>टेराबाइट</displayName>
 				<unitPattern count="one">{0} टेराबाइट</unitPattern>
 				<unitPattern count="other">{0} टेराबाइट</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>टेराबिट</displayName>
+				<unitPattern count="one">{0} टेराबिट</unitPattern>
+				<unitPattern count="other">{0} टेराबिट</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>गिगाबाइट</displayName>
+				<unitPattern count="one">{0} गिगाबाइट</unitPattern>
+				<unitPattern count="other">{0} गिगाबाइट</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>गिगाबिट</displayName>
+				<unitPattern count="one">{0} गिगाबिट</unitPattern>
+				<unitPattern count="other">{0} गिगाबिट</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>मेगाबाइट</displayName>
+				<unitPattern count="one">{0} मेगाबाइट</unitPattern>
+				<unitPattern count="other">{0} मेगाबाइट</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>मेगाबिट</displayName>
+				<unitPattern count="one">{0} मेगाबिट</unitPattern>
+				<unitPattern count="other">{0} मेगाबिट</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>किलोबाइट</displayName>
+				<unitPattern count="one">{0} किलोबाइट</unitPattern>
+				<unitPattern count="other">{0} किलोबाइट</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>किलोबिट</displayName>
+				<unitPattern count="one">{0} किलोबिट</unitPattern>
+				<unitPattern count="other">{0} किलोबिट</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>बाइट</displayName>
+				<unitPattern count="one">{0} बाइट</unitPattern>
+				<unitPattern count="other">{0} बाइट</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>बिट</displayName>
+				<unitPattern count="one">{0} बिट</unitPattern>
+				<unitPattern count="other">{0} बिट</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>शतके</displayName>
+				<unitPattern count="one">{0} शतक</unitPattern>
+				<unitPattern count="other">{0} शतके</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>वर्षे</displayName>
+				<unitPattern count="one">{0} वर्ष</unitPattern>
+				<unitPattern count="other">{0} वर्षे</unitPattern>
+				<perUnitPattern>{0} दर वर्षी</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>महिने</displayName>
+				<unitPattern count="one">{0} महिना</unitPattern>
+				<unitPattern count="other">{0} महिने</unitPattern>
+				<perUnitPattern>{0} दर महिना</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>आठवडे</displayName>
+				<unitPattern count="one">{0} आठवडा</unitPattern>
+				<unitPattern count="other">{0} आठवडे</unitPattern>
+				<perUnitPattern>{0} दर आठवडा</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>दिवस</displayName>
 				<unitPattern count="one">{0} दिवस</unitPattern>
 				<unitPattern count="other">{0} दिवस</unitPattern>
+				<perUnitPattern>{0} दर दिवशी</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>तास</displayName>
@@ -5644,30 +5875,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} तास</unitPattern>
 				<perUnitPattern>{0} प्रति तास</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>मायक्रोसेकंद</displayName>
-				<unitPattern count="one">{0} मायक्रोसेकंद</unitPattern>
-				<unitPattern count="other">{0} मायक्रोसेकंद</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>मिलिसेकंद</displayName>
-				<unitPattern count="one">{0} मिलिसेकंद</unitPattern>
-				<unitPattern count="other">{0} मिलिसेकंद</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>मिनिटे</displayName>
 				<unitPattern count="one">{0} मिनिट</unitPattern>
 				<unitPattern count="other">{0} मिनिटे</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>महिने</displayName>
-				<unitPattern count="one">{0} महिना</unitPattern>
-				<unitPattern count="other">{0} महिने</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>नॅनोसेकंद</displayName>
-				<unitPattern count="one">{0} नॅनोसेकंद</unitPattern>
-				<unitPattern count="other">{0} नॅनोसेकंद</unitPattern>
+				<perUnitPattern>{0} दर मिनिट</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>सेकंद</displayName>
@@ -5675,15 +5887,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} सेकंद</unitPattern>
 				<perUnitPattern>{0} प्रति सेकंद</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>आठवडे</displayName>
-				<unitPattern count="one">{0} आठवडा</unitPattern>
-				<unitPattern count="other">{0} आठवडे</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>मिलिसेकंद</displayName>
+				<unitPattern count="one">{0} मिलिसेकंद</unitPattern>
+				<unitPattern count="other">{0} मिलिसेकंद</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>वर्षे</displayName>
-				<unitPattern count="one">{0} वर्ष</unitPattern>
-				<unitPattern count="other">{0} वर्षे</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>मायक्रोसेकंद</displayName>
+				<unitPattern count="one">{0} मायक्रोसेकंद</unitPattern>
+				<unitPattern count="other">{0} मायक्रोसेकंद</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>नॅनोसेकंद</displayName>
+				<unitPattern count="one">{0} नॅनोसेकंद</unitPattern>
+				<unitPattern count="other">{0} नॅनोसेकंद</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>अँपियर</displayName>
@@ -5705,6 +5922,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} व्होल्ट</unitPattern>
 				<unitPattern count="other">{0} व्होल्ट</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>किलोकॅलोरी</displayName>
+				<unitPattern count="one">{0} किलोकॅलोरी</unitPattern>
+				<unitPattern count="other">{0} किलोकॅलोरी</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>कॅलरीज</displayName>
 				<unitPattern count="one">{0} कॅलरी</unitPattern>
@@ -5715,21 +5937,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} कॅलरी</unitPattern>
 				<unitPattern count="other">{0} कॅलरीज</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>ज्यूल</displayName>
-				<unitPattern count="one">{0} ज्यूल</unitPattern>
-				<unitPattern count="other">{0} ज्यूल</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>किलोकॅलोरी</displayName>
-				<unitPattern count="one">{0} किलोकॅलोरी</unitPattern>
-				<unitPattern count="other">{0} किलोकॅलोरी</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>किलोज्यूल</displayName>
 				<unitPattern count="one">{0} किलोज्यूल</unitPattern>
 				<unitPattern count="other">{0} किलोज्यूल</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>ज्यूल</displayName>
+				<unitPattern count="one">{0} ज्यूल</unitPattern>
+				<unitPattern count="other">{0} ज्यूल</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>किलोवॉट-तास</displayName>
 				<unitPattern count="one">{0} किलोवॉट तास</unitPattern>
@@ -5740,201 +5957,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} गिगाहर्ट्झ</unitPattern>
 				<unitPattern count="other">{0} गिगाहर्ट्झ</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>हर्ट्झ</displayName>
-				<unitPattern count="one">{0} हर्ट्झ</unitPattern>
-				<unitPattern count="other">{0} हर्ट्झ</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>मेगाहर्ट्झ</displayName>
+				<unitPattern count="one">{0} मेगाहर्ट्झ</unitPattern>
+				<unitPattern count="other">{0} मेगाहर्ट्झ</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>किलोहर्ट्झ</displayName>
 				<unitPattern count="one">{0} किलोहर्ट्झ</unitPattern>
 				<unitPattern count="other">{0} किलोहर्ट्झ</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>मेगाहर्ट्झ</displayName>
-				<unitPattern count="one">{0} मेगाहर्ट्झ</unitPattern>
-				<unitPattern count="other">{0} मेगाहर्ट्झ</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>हर्ट्झ</displayName>
+				<unitPattern count="one">{0} हर्ट्झ</unitPattern>
+				<unitPattern count="other">{0} हर्ट्झ</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>खगोलीय एकके</displayName>
-				<unitPattern count="one">{0} खगोलीय एकक</unitPattern>
-				<unitPattern count="other">{0} खगोलीय एकके</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>किलोमीटर</displayName>
+				<unitPattern count="one">{0} किलोमीटर</unitPattern>
+				<unitPattern count="other">{0} किलोमीटर</unitPattern>
+				<perUnitPattern>{0} दर किलोमीटर</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>सेंटीमीटर</displayName>
-				<unitPattern count="one">{0} सेंटीमीटर</unitPattern>
-				<unitPattern count="other">{0} सेंटीमीटर</unitPattern>
+			<unit type="length-meter">
+				<displayName>मीटर</displayName>
+				<unitPattern count="one">{0} मीटर</unitPattern>
+				<unitPattern count="other">{0} मीटर</unitPattern>
+				<perUnitPattern>{0} दर मीटर</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>डेसीमीटर</displayName>
 				<unitPattern count="one">{0} डेसीमीटर</unitPattern>
 				<unitPattern count="other">{0} डेसीमीटर</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>फूट</displayName>
-				<unitPattern count="one">{0} फूट</unitPattern>
-				<unitPattern count="other">{0} फूट</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>इंच</displayName>
-				<unitPattern count="one">{0} इंच</unitPattern>
-				<unitPattern count="other">{0} इंच</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>किलोमीटर</displayName>
-				<unitPattern count="one">{0} किलोमीटर</unitPattern>
-				<unitPattern count="other">{0} किलोमीटर</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>प्रकाश वर्षे</displayName>
-				<unitPattern count="one">{0} प्रकाश वर्ष</unitPattern>
-				<unitPattern count="other">{0} प्रकाश वर्षे</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>मीटर</displayName>
-				<unitPattern count="one">{0} मीटर</unitPattern>
-				<unitPattern count="other">{0} मीटर</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>मायक्रोमीटर</displayName>
-				<unitPattern count="one">{0} मायक्रोमीटर</unitPattern>
-				<unitPattern count="other">{0} मायक्रोमीटर</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>मैल</displayName>
-				<unitPattern count="one">{0} मैल</unitPattern>
-				<unitPattern count="other">{0} मैल</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>सेंटीमीटर</displayName>
+				<unitPattern count="one">{0} सेंटीमीटर</unitPattern>
+				<unitPattern count="other">{0} सेंटीमीटर</unitPattern>
+				<perUnitPattern>{0} दर सेंटीमीटर</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>मिलिमीटर</displayName>
 				<unitPattern count="one">{0} मिलिमीटर</unitPattern>
 				<unitPattern count="other">{0} मिलिमीटर</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>मायक्रोमीटर</displayName>
+				<unitPattern count="one">{0} मायक्रोमीटर</unitPattern>
+				<unitPattern count="other">{0} मायक्रोमीटर</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>नॅनोमीटर</displayName>
 				<unitPattern count="one">{0} नॅनोमीटर</unitPattern>
 				<unitPattern count="other">{0} नॅनोमीटर</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>नॉटिकल मैल</displayName>
-				<unitPattern count="one">{0} नॉटिकल मैल</unitPattern>
-				<unitPattern count="other">{0} नॉटिकल मैल</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>पार्सेक</displayName>
-				<unitPattern count="one">{0} पार्सेक</unitPattern>
-				<unitPattern count="other">{0} पार्सेक</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>पिकोमीटर</displayName>
 				<unitPattern count="one">{0} पिकोमीटर</unitPattern>
 				<unitPattern count="other">{0} पिकोमीटर</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>मैल</displayName>
+				<unitPattern count="one">{0} मैल</unitPattern>
+				<unitPattern count="other">{0} मैल</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>यार्ड</displayName>
 				<unitPattern count="one">{0} यार्ड</unitPattern>
 				<unitPattern count="other">{0} यार्ड</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>फूट</displayName>
+				<unitPattern count="one">{0} फूट</unitPattern>
+				<unitPattern count="other">{0} फूट</unitPattern>
+				<perUnitPattern>{0} दर फूट</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>इंच</displayName>
+				<unitPattern count="one">{0} इंच</unitPattern>
+				<unitPattern count="other">{0} इंच</unitPattern>
+				<perUnitPattern>{0} दर इंच</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>पार्सेक</displayName>
+				<unitPattern count="one">{0} पार्सेक</unitPattern>
+				<unitPattern count="other">{0} पार्सेक</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>प्रकाश वर्षे</displayName>
+				<unitPattern count="one">{0} प्रकाश वर्ष</unitPattern>
+				<unitPattern count="other">{0} प्रकाश वर्षे</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>खगोलीय एकके</displayName>
+				<unitPattern count="one">{0} खगोलीय एकक</unitPattern>
+				<unitPattern count="other">{0} खगोलीय एकके</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>नॉटिकल मैल</displayName>
+				<unitPattern count="one">{0} नॉटिकल मैल</unitPattern>
+				<unitPattern count="other">{0} नॉटिकल मैल</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>मैल-स्कॅन्डीनेव्हियन</displayName>
+				<unitPattern count="one">{0} मैल-स्कॅन्डीनेव्हियन</unitPattern>
+				<unitPattern count="other">{0} मैल-स्कॅन्डीनेव्हियन</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>लक्स</displayName>
 				<unitPattern count="one">{0} लक्स</unitPattern>
 				<unitPattern count="other">{0} लक्स</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>कॅरेट्स</displayName>
-				<unitPattern count="one">{0} कॅरेट</unitPattern>
-				<unitPattern count="other">{0} कॅरेट्स</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>ग्रॅम</displayName>
-				<unitPattern count="one">{0} ग्रॅम</unitPattern>
-				<unitPattern count="other">{0} ग्रॅम</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>किलोग्रॅम</displayName>
-				<unitPattern count="one">{0} किलोग्रॅम</unitPattern>
-				<unitPattern count="other">{0} किलोग्रॅम</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>मेट्रिक टन</displayName>
 				<unitPattern count="one">{0} मेट्रिक टन</unitPattern>
 				<unitPattern count="other">{0} मेट्रिक टन</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>मायक्रोग्रॅम</displayName>
-				<unitPattern count="one">{0} मायक्रोग्रॅम</unitPattern>
-				<unitPattern count="other">{0} मायक्रोग्रॅम</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>किलोग्रॅम</displayName>
+				<unitPattern count="one">{0} किलोग्रॅम</unitPattern>
+				<unitPattern count="other">{0} किलोग्रॅम</unitPattern>
+				<perUnitPattern>{0} दर किलोग्रॅम</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>ग्रॅम</displayName>
+				<unitPattern count="one">{0} ग्रॅम</unitPattern>
+				<unitPattern count="other">{0} ग्रॅम</unitPattern>
+				<perUnitPattern>{0} दर ग्रॅम</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>मिलिग्रॅम</displayName>
 				<unitPattern count="one">{0} मिलिग्रॅम</unitPattern>
 				<unitPattern count="other">{0} मिलिग्रॅम</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>औंस</displayName>
-				<unitPattern count="one">{0} औंस</unitPattern>
-				<unitPattern count="other">{0} औंस</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ट्रॉय औंस</displayName>
-				<unitPattern count="one">{0} ट्रॉय औंस</unitPattern>
-				<unitPattern count="other">{0} ट्रॉय औंस</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>पाउंड</displayName>
-				<unitPattern count="one">{0} पाउंड</unitPattern>
-				<unitPattern count="other">{0} पाउंड</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>मायक्रोग्रॅम</displayName>
+				<unitPattern count="one">{0} मायक्रोग्रॅम</unitPattern>
+				<unitPattern count="other">{0} मायक्रोग्रॅम</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>टन</displayName>
 				<unitPattern count="one">{0} टन</unitPattern>
 				<unitPattern count="other">{0} टन</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>पाउंड</displayName>
+				<unitPattern count="one">{0} पाउंड</unitPattern>
+				<unitPattern count="other">{0} पाउंड</unitPattern>
+				<perUnitPattern>{0} दर पाउंड</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>औंस</displayName>
+				<unitPattern count="one">{0} औंस</unitPattern>
+				<unitPattern count="other">{0} औंस</unitPattern>
+				<perUnitPattern>{0} दर औंस</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ट्रॉय औंस</displayName>
+				<unitPattern count="one">{0} ट्रॉय औंस</unitPattern>
+				<unitPattern count="other">{0} ट्रॉय औंस</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>कॅरेट्स</displayName>
+				<unitPattern count="one">{0} कॅरेट</unitPattern>
+				<unitPattern count="other">{0} कॅरेट्स</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>गिगावॉट</displayName>
 				<unitPattern count="one">{0} गिगावॉट</unitPattern>
 				<unitPattern count="other">{0} गिगावॉट</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>हॉर्सपॉवर</displayName>
-				<unitPattern count="one">{0} हॉर्सपॉवर</unitPattern>
-				<unitPattern count="other">{0} हॉर्सपॉवर</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>किलोवॉट</displayName>
-				<unitPattern count="one">{0} किलोवॉट</unitPattern>
-				<unitPattern count="other">{0} किलोवॉट</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>मेगावॉट</displayName>
 				<unitPattern count="one">{0} मेगावॉट</unitPattern>
 				<unitPattern count="other">{0} मेगावॉट</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>मिलिवॉट</displayName>
-				<unitPattern count="one">{0} मिलिवॉट</unitPattern>
-				<unitPattern count="other">{0} मिलिवॉट</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>किलोवॉट</displayName>
+				<unitPattern count="one">{0} किलोवॉट</unitPattern>
+				<unitPattern count="other">{0} किलोवॉट</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>वॉट</displayName>
 				<unitPattern count="one">{0} वॉट</unitPattern>
 				<unitPattern count="other">{0} वॉट</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>मिलिवॉट</displayName>
+				<unitPattern count="one">{0} मिलिवॉट</unitPattern>
+				<unitPattern count="other">{0} मिलिवॉट</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>हॉर्सपॉवर</displayName>
+				<unitPattern count="one">{0} हॉर्सपॉवर</unitPattern>
+				<unitPattern count="other">{0} हॉर्सपॉवर</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>हेक्टोपास्कल</displayName>
 				<unitPattern count="one">{0} हेक्टोपास्कल</unitPattern>
 				<unitPattern count="other">{0} हेक्टोपास्कल</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>मर्क्यूरी इंच</displayName>
-				<unitPattern count="one">{0} मर्क्यूरी इंच</unitPattern>
-				<unitPattern count="other">{0} मर्क्यूरी इंच</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>मिलिबार</displayName>
-				<unitPattern count="one">{0} मिलिबार</unitPattern>
-				<unitPattern count="other">{0} मिलिबार</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>मर्क्यूरी मिलिमीटर</displayName>
 				<unitPattern count="one">{0} मर्क्यूरी मिलिमीटर</unitPattern>
@@ -5945,10 +6166,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} प्रति चौरस इंच पाउंड</unitPattern>
 				<unitPattern count="other">{0} प्रति चौरस इंच पाउंड</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>कॅरेट्स</displayName>
-				<unitPattern count="one">{0} कॅरेट</unitPattern>
-				<unitPattern count="other">{0} कॅरेट्स</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>मर्क्यूरी इंच</displayName>
+				<unitPattern count="one">{0} मर्क्यूरी इंच</unitPattern>
+				<unitPattern count="other">{0} मर्क्यूरी इंच</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>मिलिबार</displayName>
+				<unitPattern count="one">{0} मिलिबार</unitPattern>
+				<unitPattern count="other">{0} मिलिबार</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>किलोमीटर प्रति तास</displayName>
@@ -5965,6 +6191,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} मैल प्रति तास</unitPattern>
 				<unitPattern count="other">{0} मैल प्रति तास</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>नॉट</displayName>
+				<unitPattern count="one">{0} नॉट</unitPattern>
+				<unitPattern count="other">{0} नॉट</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>अंश सेल्सिअस</displayName>
 				<unitPattern count="one">{0} अंश सेल्सिअस</unitPattern>
@@ -5980,31 +6216,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} केल्व्हिन</unitPattern>
 				<unitPattern count="other">{0} केल्व्हिन</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>एकर-फूट</displayName>
-				<unitPattern count="one">{0} एकर-फूट</unitPattern>
-				<unitPattern count="other">{0} एकर-फूट</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>सेंटीलीटर</displayName>
-				<unitPattern count="one">{0} सेंटीलीटर</unitPattern>
-				<unitPattern count="other">{0} सेंटीलीटर</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>घन सेंटीमीटर</displayName>
-				<unitPattern count="one">{0} घन सेंटीमीटर</unitPattern>
-				<unitPattern count="other">{0} घन सेंटीमीटर</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>घन फूट</displayName>
-				<unitPattern count="one">{0} घन फूट</unitPattern>
-				<unitPattern count="other">{0} घन फूट</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>घन इंच</displayName>
-				<unitPattern count="one">{0} घन इंच</unitPattern>
-				<unitPattern count="other">{0} घन इंच</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>घन किलोमीटर</displayName>
 				<unitPattern count="one">{0} घन किलोमीटर</unitPattern>
@@ -6014,6 +6225,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>घन मीटर</displayName>
 				<unitPattern count="one">{0} घन मीटर</unitPattern>
 				<unitPattern count="other">{0} घन मीटर</unitPattern>
+				<perUnitPattern>{0} दर घन मीटर</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>घन सेंटीमीटर</displayName>
+				<unitPattern count="one">{0} घन सेंटीमीटर</unitPattern>
+				<unitPattern count="other">{0} घन सेंटीमीटर</unitPattern>
+				<perUnitPattern>{0} प्रति घन सेंटिमीटर</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>घन मैल</displayName>
@@ -6025,25 +6243,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} घन यार्ड</unitPattern>
 				<unitPattern count="other">{0} घन यार्ड</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>कप</displayName>
-				<unitPattern count="one">{0} कप</unitPattern>
-				<unitPattern count="other">{0} कप</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>घन फूट</displayName>
+				<unitPattern count="one">{0} घन फूट</unitPattern>
+				<unitPattern count="other">{0} घन फूट</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>डेसीलीटर</displayName>
-				<unitPattern count="one">{0} डेसीलीटर</unitPattern>
-				<unitPattern count="other">{0} डेसीलीटर</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>घन इंच</displayName>
+				<unitPattern count="one">{0} घन इंच</unitPattern>
+				<unitPattern count="other">{0} घन इंच</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>फ्लूइड औंस</displayName>
-				<unitPattern count="one">{0} फ्लूइड औंस</unitPattern>
-				<unitPattern count="other">{0} फ्लूइड औंस</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>गॅलन</displayName>
-				<unitPattern count="one">{0} गॅलन</unitPattern>
-				<unitPattern count="other">{0} गॅलन</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>मेगालीटर</displayName>
+				<unitPattern count="one">{0} मेगालीटर</unitPattern>
+				<unitPattern count="other">{0} मेगालीटर</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>हेक्टोलीटर</displayName>
@@ -6054,27 +6267,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>लीटर</displayName>
 				<unitPattern count="one">{0} लीटर</unitPattern>
 				<unitPattern count="other">{0} लीटर</unitPattern>
+				<perUnitPattern>{0} दर लीटर</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>मेगालीटर</displayName>
-				<unitPattern count="one">{0} मेगालीटर</unitPattern>
-				<unitPattern count="other">{0} मेगालीटर</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>डेसीलीटर</displayName>
+				<unitPattern count="one">{0} डेसीलीटर</unitPattern>
+				<unitPattern count="other">{0} डेसीलीटर</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>सेंटीलीटर</displayName>
+				<unitPattern count="one">{0} सेंटीलीटर</unitPattern>
+				<unitPattern count="other">{0} सेंटीलीटर</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>मिलीलीटर</displayName>
 				<unitPattern count="one">{0} मिलीलीटर</unitPattern>
 				<unitPattern count="other">{0} मिलीलीटर</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>पिंट</displayName>
-				<unitPattern count="one">{0} पिंट</unitPattern>
-				<unitPattern count="other">{0} पिंट</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>मेट्रिक पिंट</displayName>
+				<unitPattern count="one">{0} मेट्रिक पिंट</unitPattern>
+				<unitPattern count="other">{0} मेट्रिक पिंट</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>मेट्रिक कप</displayName>
+				<unitPattern count="one">{0} मेट्रिक कप</unitPattern>
+				<unitPattern count="other">{0} मेट्रिक कप</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>एकर-फूट</displayName>
+				<unitPattern count="one">{0} एकर-फूट</unitPattern>
+				<unitPattern count="other">{0} एकर-फूट</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>गॅलन</displayName>
+				<unitPattern count="one">{0} गॅलन</unitPattern>
+				<unitPattern count="other">{0} गॅलन</unitPattern>
+				<perUnitPattern>{0} दर गॅलन</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>क्वार्ट</displayName>
 				<unitPattern count="one">{0} क्वार्ट</unitPattern>
 				<unitPattern count="other">{0} क्वार्ट</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>पिंट</displayName>
+				<unitPattern count="one">{0} पिंट</unitPattern>
+				<unitPattern count="other">{0} पिंट</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>कप</displayName>
+				<unitPattern count="one">{0} कप</unitPattern>
+				<unitPattern count="other">{0} कप</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>फ्लूइड औंस</displayName>
+				<unitPattern count="one">{0} फ्लूइड औंस</unitPattern>
+				<unitPattern count="other">{0} फ्लूइड औंस</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>टेबलस्पून</displayName>
 				<unitPattern count="one">{0} टेबलस्पून</unitPattern>
@@ -6085,6 +6335,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} टीस्पून</unitPattern>
 				<unitPattern count="other">{0} टीस्पून</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}पू</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}उ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}द</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}प</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -6100,6 +6356,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} मी/से²</unitPattern>
 				<unitPattern count="other">{0} मी/से²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>परिभ्र.</displayName>
+				<unitPattern count="one">{0} परिभ्र.</unitPattern>
+				<unitPattern count="other">{0} परिभ्र.</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>रेडियन</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>अंश</displayName>
+				<unitPattern count="one">{0} अंश</unitPattern>
+				<unitPattern count="other">{0} अंश</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>आर्कमिनि</displayName>
 				<unitPattern count="one">{0} आर्कमिनि</unitPattern>
@@ -6110,30 +6381,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} आर्कसेक</unitPattern>
 				<unitPattern count="other">{0} आर्कसेक</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>अंश</displayName>
-				<unitPattern count="one">{0} अंश</unitPattern>
-				<unitPattern count="other">{0} अंश</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>रेडियन</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>एकर</displayName>
-				<unitPattern count="one">{0} एकर</unitPattern>
-				<unitPattern count="other">{0} एकर</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>किमी²</displayName>
+				<unitPattern count="one">{0} किमी²</unitPattern>
+				<unitPattern count="other">{0} किमी²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>हेक्टर</displayName>
 				<unitPattern count="one">{0} हेक्टर</unitPattern>
 				<unitPattern count="other">{0} हेक्टर</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>मीटर²</displayName>
+				<unitPattern count="one">{0} मी²</unitPattern>
+				<unitPattern count="other">{0} मी²</unitPattern>
+				<perUnitPattern>{0}/मी²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>सेंमी²</displayName>
 				<unitPattern count="one">{0} सेंमी²</unitPattern>
 				<unitPattern count="other">{0} सेंमी²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>चौरस मैल</displayName>
+				<unitPattern count="one">{0} चौ मै</unitPattern>
+				<unitPattern count="other">{0} चौ मै</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>एकर</displayName>
+				<unitPattern count="one">{0} एकर</unitPattern>
+				<unitPattern count="other">{0} एकर</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>यार्ड²</displayName>
+				<unitPattern count="one">{0} यार्ड²</unitPattern>
+				<unitPattern count="other">{0} यार्ड²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>चौरस फूट</displayName>
@@ -6144,91 +6427,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>इंच²</displayName>
 				<unitPattern count="one">{0} इंच²</unitPattern>
 				<unitPattern count="other">{0} इंच²</unitPattern>
+				<perUnitPattern>{0}/इंच²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>किमी²</displayName>
-				<unitPattern count="one">{0} किमी²</unitPattern>
-				<unitPattern count="other">{0} किमी²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>मीटर²</displayName>
-				<unitPattern count="one">{0} मी²</unitPattern>
-				<unitPattern count="other">{0} मी²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>चौरस मैल</displayName>
-				<unitPattern count="one">{0} चौ मै</unitPattern>
-				<unitPattern count="other">{0} चौ मै</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>यार्ड²</displayName>
-				<unitPattern count="one">{0} यार्ड²</unitPattern>
-				<unitPattern count="other">{0} यार्ड²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>कॅरेट्स</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>लीटर/किमी</displayName>
 				<unitPattern count="one">{0} ली/किमी</unitPattern>
 				<unitPattern count="other">{0} ली/किमी</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ली/100किमी</displayName>
+				<unitPattern count="one">{0} ली/100किमी</unitPattern>
+				<unitPattern count="other">{0} ली/100किमी</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>मैल/गॅलन</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>बिट</displayName>
-				<unitPattern count="one">{0} बिट</unitPattern>
-				<unitPattern count="other">{0} बिट</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>बाइट</displayName>
-				<unitPattern count="one">{0} बाइट</unitPattern>
-				<unitPattern count="other">{0} बाइट</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gbit</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GByte</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kbit</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kByte</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mbit</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MByte</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tbit</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TByte</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tbit</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GByte</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gbit</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MByte</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mbit</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kByte</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kbit</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>बाइट</displayName>
+				<unitPattern count="one">{0} बाइट</unitPattern>
+				<unitPattern count="other">{0} बाइट</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>बिट</displayName>
+				<unitPattern count="one">{0} बिट</unitPattern>
+				<unitPattern count="other">{0} बिट</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>श</displayName>
+				<unitPattern count="one">{0} श</unitPattern>
+				<unitPattern count="other">{0} श</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>वर्षे</displayName>
+				<unitPattern count="one">{0} वर्ष</unitPattern>
+				<unitPattern count="other">{0} वर्षे</unitPattern>
+				<perUnitPattern>{0}/वर्षी</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>महिने</displayName>
+				<unitPattern count="one">{0} महिना</unitPattern>
+				<unitPattern count="other">{0} महिने</unitPattern>
+				<perUnitPattern>{0}/म</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>आठवडे</displayName>
+				<unitPattern count="one">{0} आ</unitPattern>
+				<unitPattern count="other">{0} आ</unitPattern>
+				<perUnitPattern>{0}/आ</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>दिवस</displayName>
 				<unitPattern count="one">{0} दिवस</unitPattern>
 				<unitPattern count="other">{0} दिवस</unitPattern>
+				<perUnitPattern>{0}/दि</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>तास</displayName>
@@ -6236,30 +6534,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ता</unitPattern>
 				<perUnitPattern>{0}प्रता</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>मिलिसेकंद</displayName>
-				<unitPattern count="one">{0} मिलिसे</unitPattern>
-				<unitPattern count="other">{0} मिलिसे</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>मिनिटे</displayName>
 				<unitPattern count="one">{0} मिनि</unitPattern>
 				<unitPattern count="other">{0} मिनि</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>महिने</displayName>
-				<unitPattern count="one">{0} महिना</unitPattern>
-				<unitPattern count="other">{0} महिने</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>नॅनोसेक</displayName>
-				<unitPattern count="one">{0} नॅसे</unitPattern>
-				<unitPattern count="other">{0} नॅसे</unitPattern>
+				<perUnitPattern>{0}/मिनि</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>सेकंद</displayName>
@@ -6267,15 +6546,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} से</unitPattern>
 				<perUnitPattern>{0}प्रसे</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>आठवडे</displayName>
-				<unitPattern count="one">{0} आ</unitPattern>
-				<unitPattern count="other">{0} आ</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>मिलिसेकंद</displayName>
+				<unitPattern count="one">{0} मिलिसे</unitPattern>
+				<unitPattern count="other">{0} मिलिसे</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>वर्षे</displayName>
-				<unitPattern count="one">{0} वर्ष</unitPattern>
-				<unitPattern count="other">{0} वर्षे</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>नॅनोसेक</displayName>
+				<unitPattern count="one">{0} नॅसे</unitPattern>
+				<unitPattern count="other">{0} नॅसे</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>अँप्स</displayName>
@@ -6297,6 +6581,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -6307,21 +6596,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Cal</unitPattern>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>ज्यूल</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>किलोज्यूल</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>ज्यूल</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kW-तास</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -6332,201 +6616,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
-			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>सेंमी</displayName>
-				<unitPattern count="one">{0} सेंमी</unitPattern>
-				<unitPattern count="other">{0} सेंमी</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<displayName>dm</displayName>
-				<unitPattern count="one">{0} dm</unitPattern>
-				<unitPattern count="other">{0} dm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>फूट</displayName>
-				<unitPattern count="one">{0} फूट</unitPattern>
-				<unitPattern count="other">{0} फूट</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>इंच</displayName>
-				<unitPattern count="one">{0} इंच</unitPattern>
-				<unitPattern count="other">{0} इंच</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>किमी</displayName>
 				<unitPattern count="one">{0} किमी</unitPattern>
 				<unitPattern count="other">{0} किमी</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>प्रकाश वर्षे</displayName>
-				<unitPattern count="one">{0} प्रव</unitPattern>
-				<unitPattern count="other">{0} प्रव</unitPattern>
+				<perUnitPattern>{0}/किमी</perUnitPattern>
 			</unit>
 			<unit type="length-meter">
 				<displayName>मीटर</displayName>
 				<unitPattern count="one">{0} मी</unitPattern>
 				<unitPattern count="other">{0} मी</unitPattern>
+				<perUnitPattern>{0}/मी</perUnitPattern>
 			</unit>
-			<unit type="length-micrometer">
-				<displayName>µmeters</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
+			<unit type="length-decimeter">
+				<displayName>डेमी</displayName>
+				<unitPattern count="one">{0} dm</unitPattern>
+				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName>मैल</displayName>
-				<unitPattern count="one">{0} मैल</unitPattern>
-				<unitPattern count="other">{0} मैल</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>सेंमी</displayName>
+				<unitPattern count="one">{0} सेंमी</unitPattern>
+				<unitPattern count="other">{0} सेंमी</unitPattern>
+				<perUnitPattern>{0}/सेंमी</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>मिमी</displayName>
 				<unitPattern count="one">{0} मिमी</unitPattern>
 				<unitPattern count="other">{0} मिमी</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µmeters</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>पार्सेक</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>पिमी</displayName>
 				<unitPattern count="one">{0} पिमी</unitPattern>
 				<unitPattern count="other">{0} पिमी</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>मैल</displayName>
+				<unitPattern count="one">{0} मैल</unitPattern>
+				<unitPattern count="other">{0} मैल</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>यार्ड</displayName>
 				<unitPattern count="one">{0} यार्ड</unitPattern>
 				<unitPattern count="other">{0} यार्ड</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>फूट</displayName>
+				<unitPattern count="one">{0} फूट</unitPattern>
+				<unitPattern count="other">{0} फूट</unitPattern>
+				<perUnitPattern>{0}/फूट</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>इंच</displayName>
+				<unitPattern count="one">{0} इंच</unitPattern>
+				<unitPattern count="other">{0} इंच</unitPattern>
+				<perUnitPattern>{0}/इंच</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>पार्सेक</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>प्रकाश वर्षे</displayName>
+				<unitPattern count="one">{0} प्रव</unitPattern>
+				<unitPattern count="other">{0} प्रव</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>लक्स</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>कॅरेट्स</displayName>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>ग्रॅम</displayName>
-				<unitPattern count="one">{0} ग्रॅ</unitPattern>
-				<unitPattern count="other">{0} ग्रॅ</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>किग्रॅ</displayName>
-				<unitPattern count="one">{0} किग्रॅ</unitPattern>
-				<unitPattern count="other">{0} किग्रॅ</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>किग्रॅ</displayName>
+				<unitPattern count="one">{0} किग्रॅ</unitPattern>
+				<unitPattern count="other">{0} किग्रॅ</unitPattern>
+				<perUnitPattern>{0}/किग्रॅ</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>ग्रॅम</displayName>
+				<unitPattern count="one">{0} ग्रॅ</unitPattern>
+				<unitPattern count="other">{0} ग्रॅ</unitPattern>
+				<perUnitPattern>{0}/ग्रॅ</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>मिग्रॅ</displayName>
 				<unitPattern count="one">{0} मिग्रॅ</unitPattern>
 				<unitPattern count="other">{0} मिग्रॅ</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>औंस</displayName>
-				<unitPattern count="one">{0} औंस</unitPattern>
-				<unitPattern count="other">{0} औंस</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz ट्रॉय</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>पाउंड</displayName>
-				<unitPattern count="one">{0} पाउंड</unitPattern>
-				<unitPattern count="other">{0} पाउंड</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>टन</displayName>
 				<unitPattern count="one">{0} टन</unitPattern>
 				<unitPattern count="other">{0} टन</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>पाउंड</displayName>
+				<unitPattern count="one">{0} पाउंड</unitPattern>
+				<unitPattern count="other">{0} पाउंड</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>औंस</displayName>
+				<unitPattern count="one">{0} औंस</unitPattern>
+				<unitPattern count="other">{0} औंस</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz ट्रॉय</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>कॅरेट्स</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hp</displayName>
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} किवॉ</unitPattern>
-				<unitPattern count="other">{0} किवॉ</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>किवॉ</displayName>
+				<unitPattern count="one">{0} किवॉ</unitPattern>
+				<unitPattern count="other">{0} किवॉ</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>वॉट</displayName>
 				<unitPattern count="one">{0} वॉ</unitPattern>
 				<unitPattern count="other">{0} वॉ</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>in Hg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>मिलिबार</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -6537,10 +6825,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>कॅरेट्स</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>in Hg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>मिलिबार</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>किमी/तास</displayName>
@@ -6557,6 +6850,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} मैप्रता</unitPattern>
 				<unitPattern count="other">{0} मैप्रता</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>अंश सेल्सिअस</displayName>
 				<unitPattern count="one">{0}°से</unitPattern>
@@ -6572,31 +6875,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cL</displayName>
-				<unitPattern count="one">{0} cL</unitPattern>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>सेंमी³</displayName>
-				<unitPattern count="one">{0} सेंमी³</unitPattern>
-				<unitPattern count="other">{0} सेंमी³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>फूट³</displayName>
-				<unitPattern count="one">{0} फूट³</unitPattern>
-				<unitPattern count="other">{0} फूट³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>इंच³</displayName>
-				<unitPattern count="one">{0} इंच³</unitPattern>
-				<unitPattern count="other">{0} इंच³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>किमी³</displayName>
 				<unitPattern count="one">{0} किमी³</unitPattern>
@@ -6606,6 +6884,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>मी³</displayName>
 				<unitPattern count="one">{0} मी³</unitPattern>
 				<unitPattern count="other">{0} मी³</unitPattern>
+				<perUnitPattern>{0}/मी³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>सेंमी³</displayName>
+				<unitPattern count="one">{0} सेंमी³</unitPattern>
+				<unitPattern count="other">{0} सेंमी³</unitPattern>
+				<perUnitPattern>{0}/सेंमी³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>मै³</displayName>
@@ -6617,25 +6902,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} यार्ड³</unitPattern>
 				<unitPattern count="other">{0} यार्ड³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>कप</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>फूट³</displayName>
+				<unitPattern count="one">{0} फूट³</unitPattern>
+				<unitPattern count="other">{0} फूट³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="one">{0} dL</unitPattern>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>इंच³</displayName>
+				<unitPattern count="one">{0} इंच³</unitPattern>
+				<unitPattern count="other">{0} इंच³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -6646,27 +6926,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>लीटर</displayName>
 				<unitPattern count="one">{0} ली</unitPattern>
 				<unitPattern count="other">{0} ली</unitPattern>
+				<perUnitPattern>{0}/ली</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="one">{0} ML</unitPattern>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0} dL</unitPattern>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="one">{0} cL</unitPattern>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>मिली</displayName>
 				<unitPattern count="one">{0} मिली</unitPattern>
 				<unitPattern count="other">{0} मिली</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>पिंट</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/गॅ</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>पिंट</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>कप</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>tbsp</displayName>
 				<unitPattern count="one">{0} tbsp</unitPattern>
@@ -6677,6 +6994,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} tsp</unitPattern>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}पू</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}उ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}द</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}प</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -6686,6 +7009,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}जी</unitPattern>
 				<unitPattern count="other">{0}जी</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}'</unitPattern>
@@ -6694,26 +7021,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}&quot;</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0}एकर</unitPattern>
-				<unitPattern count="other">{0}एकर</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} किमी²</unitPattern>
+				<unitPattern count="other">{0} किमी²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0}हेक्टर</unitPattern>
 				<unitPattern count="other">{0}हेक्टर</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} फूट²</unitPattern>
-				<unitPattern count="other">{0}फूट²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} किमी²</unitPattern>
-				<unitPattern count="other">{0} किमी²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} मी²</unitPattern>
 				<unitPattern count="other">{0} मी²</unitPattern>
@@ -6722,6 +7037,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}मै²</unitPattern>
 				<unitPattern count="other">{0}मै²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0}एकर</unitPattern>
+				<unitPattern count="other">{0}एकर</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} फूट²</unitPattern>
+				<unitPattern count="other">{0}फूट²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ली/100किमी</displayName>
+				<unitPattern count="one">{0} ली/100किमी</unitPattern>
+				<unitPattern count="other">{0} ली/100किमी</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>वर्ष</displayName>
+				<unitPattern count="one">{0}व</unitPattern>
+				<unitPattern count="other">{0}व</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>महिना</displayName>
+				<unitPattern count="one">{0}म</unitPattern>
+				<unitPattern count="other">{0}म</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>आ</displayName>
+				<unitPattern count="one">{0}आ</unitPattern>
+				<unitPattern count="other">{0}आ</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>दिवस</displayName>
 				<unitPattern count="one">{0}दि</unitPattern>
@@ -6732,66 +7075,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}ता</unitPattern>
 				<unitPattern count="other">{0}ता</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>मिलिसेकंद</displayName>
-				<unitPattern count="one">{0} मिलिसे</unitPattern>
-				<unitPattern count="other">{0} मिलिसे</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>मिनिटे</displayName>
 				<unitPattern count="one">{0}मि</unitPattern>
 				<unitPattern count="other">{0}मि</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>महिना</displayName>
-				<unitPattern count="one">{0}म</unitPattern>
-				<unitPattern count="other">{0}म</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>सेकंद</displayName>
 				<unitPattern count="one">{0}से</unitPattern>
 				<unitPattern count="other">{0}से</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>आ</displayName>
-				<unitPattern count="one">{0}आ</unitPattern>
-				<unitPattern count="other">{0}आ</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>वर्ष</displayName>
-				<unitPattern count="one">{0}व</unitPattern>
-				<unitPattern count="other">{0}व</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>सेंमी</displayName>
-				<unitPattern count="one">{0}सेंमी</unitPattern>
-				<unitPattern count="other">{0}सेंमी</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0}'</unitPattern>
-				<unitPattern count="other">{0}'</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0}″</unitPattern>
-				<unitPattern count="other">{0}″</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>मिलिसेकंद</displayName>
+				<unitPattern count="one">{0} मिलिसे</unitPattern>
+				<unitPattern count="other">{0} मिलिसे</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>किमी</displayName>
 				<unitPattern count="one">{0}किमी</unitPattern>
 				<unitPattern count="other">{0}किमी</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0}प्रव</unitPattern>
-				<unitPattern count="other">{0}प्रव</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>मीटर</displayName>
 				<unitPattern count="one">{0}मी</unitPattern>
 				<unitPattern count="other">{0}मी</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0}मैल</unitPattern>
-				<unitPattern count="other">{0}मैल</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>सेंमी</displayName>
+				<unitPattern count="one">{0}सेंमी</unitPattern>
+				<unitPattern count="other">{0}सेंमी</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>मिमी</displayName>
@@ -6802,31 +7114,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}पिमी</unitPattern>
 				<unitPattern count="other">{0}पिमी</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0}मैल</unitPattern>
+				<unitPattern count="other">{0}मैल</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0}यार्ड</unitPattern>
 				<unitPattern count="other">{0}यार्ड</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>ग्रॅम</displayName>
-				<unitPattern count="one">{0}ग्रॅ</unitPattern>
-				<unitPattern count="other">{0}ग्रॅ</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0}'</unitPattern>
+				<unitPattern count="other">{0}'</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0}प्रव</unitPattern>
+				<unitPattern count="other">{0}प्रव</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>किग्रॅ</displayName>
 				<unitPattern count="one">{0}किग्रॅ</unitPattern>
 				<unitPattern count="other">{0}किग्रॅ</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0}औंस</unitPattern>
-				<unitPattern count="other">{0}औंस</unitPattern>
+			<unit type="mass-gram">
+				<displayName>ग्रॅम</displayName>
+				<unitPattern count="one">{0}ग्रॅ</unitPattern>
+				<unitPattern count="other">{0}ग्रॅ</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0}#</unitPattern>
 				<unitPattern count="other">{0}#</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} हॉपॉ</unitPattern>
-				<unitPattern count="other">{0}हॉपॉ</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0}औंस</unitPattern>
+				<unitPattern count="other">{0}औंस</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0}किवॉ</unitPattern>
@@ -6836,6 +7160,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}वॉ</unitPattern>
 				<unitPattern count="other">{0}वॉ</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} हॉपॉ</unitPattern>
+				<unitPattern count="other">{0}हॉपॉ</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0}हेक्टोपा</unitPattern>
 				<unitPattern count="other">{0}हेक्टोपा</unitPattern>
@@ -6883,6 +7211,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}ली</unitPattern>
 				<unitPattern count="other">{0}ली</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}पू</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}उ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}द</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}प</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mr_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mr_IN.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mr_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mr_IN.xml
index 4de5447dfe7..a572dd9c281 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mr_IN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mr_IN.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="mr"/>
 		<territory type="IN"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ms.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ms.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms.xml
index ec4c03f29c0..10c16998595 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ms.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12416 $"/>
 		<language type="ms"/>
 	</identity>
 	<localeDisplayNames>
@@ -39,9 +38,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ay">Aymara</language>
 			<language type="az">Azerbaijan</language>
 			<language type="az" alt="short">Azeri</language>
-			<language type="azb">Azerbaijan Selatan</language>
 			<language type="ba">Bashkir</language>
 			<language type="bal">Baluchi</language>
+			<language type="bas">Basaa</language>
 			<language type="bax">Bamun</language>
 			<language type="bbj" draft="contributed">Ghomala</language>
 			<language type="be">Belarus</language>
@@ -50,6 +49,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bez">Bena</language>
 			<language type="bfd" draft="contributed">Bafut</language>
 			<language type="bg">Bulgaria</language>
+			<language type="bgn">Balochi Barat</language>
 			<language type="bkm" draft="contributed">Kom</language>
 			<language type="bm">Bambara</language>
 			<language type="bn">Benggala</language>
@@ -108,6 +108,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="es_MX">Sepanyol Mexico</language>
 			<language type="et">Estonia</language>
 			<language type="eu">Basque</language>
+			<language type="ewo">Ewondo</language>
 			<language type="fa">Parsi</language>
 			<language type="fi">Finland</language>
 			<language type="fil">Filipina</language>
@@ -116,7 +117,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="fr">Perancis</language>
 			<language type="fr_CA">Perancis Kanada</language>
 			<language type="fr_CH">Perancis Switzerland</language>
-			<language type="fy">Frisian</language>
+			<language type="fy">Frisian Barat</language>
 			<language type="ga">Ireland</language>
 			<language type="gaa">Ga</language>
 			<language type="gag">Gagauz</language>
@@ -135,7 +136,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="haw">Hawaii</language>
 			<language type="he">Ibrani</language>
 			<language type="hi">Hindi</language>
-			<language type="hr">Croat</language>
+			<language type="hr">Croatia</language>
 			<language type="hsb">Upper Sorbian</language>
 			<language type="ht">Haiti</language>
 			<language type="hu">Hungary</language>
@@ -188,6 +189,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ln">Lingala</language>
 			<language type="lo">Laos</language>
 			<language type="loz">Lozi</language>
+			<language type="lrc">Luri Utara</language>
 			<language type="lt">Lithuania</language>
 			<language type="lu">Luba-Katanga</language>
 			<language type="lua">Luba-Lulua</language>
@@ -219,11 +221,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="naq">Nama</language>
 			<language type="nb">Bokmål Norway</language>
 			<language type="nd">Ndebele Utara</language>
+			<language type="nds">Jerman Rendah</language>
+			<language type="nds_NL">Saxon Rendah</language>
 			<language type="ne">Nepal</language>
 			<language type="nl">Belanda</language>
 			<language type="nl_BE">Flemish</language>
 			<language type="nmg">Kwasio</language>
 			<language type="nn">Nynorsk Norway</language>
+			<language type="nnh">Ngiemboon</language>
 			<language type="no">Norway</language>
 			<language type="nqo">N’ko</language>
 			<language type="nso">Sotho Utara</language>
@@ -256,6 +261,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sba" draft="contributed">Ngambay</language>
 			<language type="sbp">Sangu</language>
 			<language type="sd">Sindhi</language>
+			<language type="sdh">Kurdish Selatan</language>
 			<language type="se">Sami Utara</language>
 			<language type="see" draft="contributed">Seneca</language>
 			<language type="seh">Sena</language>
@@ -282,8 +288,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="su">Sunda</language>
 			<language type="sv">Sweden</language>
 			<language type="sw">Swahili</language>
+			<language type="sw_CD">Congo Swahili</language>
 			<language type="swb">Comoria</language>
-			<language type="swc">Congo Swahili</language>
 			<language type="ta">Tamil</language>
 			<language type="te">Telugu</language>
 			<language type="teo">Teso</language>
@@ -317,6 +323,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="vi">Vietnam</language>
 			<language type="vun">Vunjo</language>
 			<language type="wae" draft="contributed">Walser</language>
+			<language type="wbp">Warlpiri</language>
 			<language type="wo">Wolof</language>
 			<language type="xh">Xhosa</language>
 			<language type="xog">Soga</language>
@@ -418,7 +425,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Netherlands Antilles</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antartika</territory>
 			<territory type="AR">Argentina</territory>
@@ -497,7 +503,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="FR">Perancis</territory>
 			<territory type="GA">Gabon</territory>
 			<territory type="GB">United Kingdom</territory>
-			<territory type="GB" alt="short">GB</territory>
+			<territory type="GB" alt="short">UK</territory>
 			<territory type="GD">Grenada</territory>
 			<territory type="GE">Georgia</territory>
 			<territory type="GF">Guiana Perancis</territory>
@@ -509,7 +515,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GN">Guinea</territory>
 			<territory type="GP">Guadeloupe</territory>
 			<territory type="GQ">Guinea Khatulistiwa</territory>
-			<territory type="GR">Yunani</territory>
+			<territory type="GR">Greece</territory>
 			<territory type="GS">Kepulauan Georgia Selatan &amp; Sandwich Selatan</territory>
 			<territory type="GT">Guatemala</territory>
 			<territory type="GU">Guam</territory>
@@ -694,6 +700,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric">Pengisihan Berangka</key>
 			<key type="colStrength">Kekuatan Pengisihan</key>
 			<key type="currency">Mata wang</key>
+			<key type="hc">Kitaran Jam (12 berbanding 24)</key>
+			<key type="lb">Gaya Pemisah Baris</key>
+			<key type="ms">Sistem Ukuran</key>
 			<key type="numbers">Nombor</key>
 			<key type="timezone">Zon Waktu</key>
 			<key type="va">Varian Tempat</key>
@@ -701,95 +710,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">Penggunaan Peribadi</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Digit Indi-Arab</type>
-			<type type="arabext" key="numbers">Digit Indi Arab Lanjutan</type>
-			<type type="armn" key="numbers">Angka Armenia</type>
-			<type type="armnlow" key="numbers">Angka Kecil Armenia</type>
-			<type type="beng" key="numbers">Digit Bengali</type>
-			<type type="big5han" key="collation">Aturan Isih Cina Tradisional - Big5</type>
-			<type type="buddhist" key="calendar">Kalendar Buddha</type>
-			<type type="chinese" key="calendar">Kalendar Cina</type>
-			<type type="coptic" key="calendar">Kalendar Qibti</type>
-			<type type="dangi" key="calendar">Kalendar Dangi</type>
-			<type type="deva" key="numbers">Digit Devanagari</type>
-			<type type="dictionary" key="collation">Aturan Isih Kamus</type>
-			<type type="ducet" key="collation">Aturan Isih Unikod Lalai</type>
-			<type type="ethi" key="numbers">Angka Ethiopia</type>
-			<type type="ethiopic" key="calendar">Kalendar Ethiopia</type>
-			<type type="ethiopic-amete-alem" key="calendar">Kalendar Amete Alem Ethiopia</type>
-			<type type="finance" key="numbers">Angka Kewangan</type>
-			<type type="fullwide" key="numbers">Digit Lebar Penuh</type>
-			<type type="gb2312han" key="collation">Aturan Isih Bahasa Cina Ringkas - GB2312</type>
-			<type type="geor" key="numbers">Angka Georgia</type>
-			<type type="gregorian" key="calendar">Kalendar Gregory</type>
-			<type type="grek" key="numbers">Angka Greek</type>
-			<type type="greklow" key="numbers">Angka Huruf Kecil Greek</type>
-			<type type="gujr" key="numbers">Digit Gujarat</type>
-			<type type="guru" key="numbers">Digit Gurmukhi</type>
-			<type type="hanidec" key="numbers">Angka Perpuluhan Cina</type>
-			<type type="hans" key="numbers">Angka Cina Ringkas</type>
-			<type type="hansfin" key="numbers">Angka Kewangan Cina Ringkas</type>
-			<type type="hant" key="numbers">Angka Cina Tradisional</type>
-			<type type="hantfin" key="numbers">Angka Kewangan Cina Tradisional</type>
-			<type type="hebr" key="numbers">Angka Ibrani</type>
-			<type type="hebrew" key="calendar">Kalendar Ibrani</type>
-			<type type="identical" key="colStrength">Isih Semua</type>
-			<type type="indian" key="calendar">Kalendar Kebangsaan India</type>
-			<type type="islamic" key="calendar">Kalendar Islam</type>
-			<type type="islamic-civil" key="calendar">Kalendar Sivil Islam</type>
-			<type type="iso8601" key="calendar">Kalendar ISO-8601</type>
-			<type type="japanese" key="calendar">Kalendar Jepun</type>
-			<type type="jpan" key="numbers">Angka Jepun</type>
-			<type type="jpanfin" key="numbers">Angka Kewangan Jepun</type>
-			<type type="khmr" key="numbers">Digit Khmer</type>
-			<type type="knda" key="numbers">Digit Kannada</type>
-			<type type="laoo" key="numbers">Digit Lao</type>
-			<type type="latn" key="numbers">Digit Barat</type>
-			<type type="lower" key="colCaseFirst">Isih Huruf Kecil Dahulu</type>
-			<type type="mlym" key="numbers">Digit Malayalam</type>
-			<type type="mong" key="numbers">Digit Mongolia</type>
-			<type type="mymr" key="numbers">Digit Myammar</type>
-			<type type="native" key="numbers">Digit Asal</type>
-			<type type="no" key="colBackwards">Isih Aksen Secara Biasa</type>
-			<type type="no" key="colCaseFirst">Isih Urutan Atur Biasa</type>
-			<type type="no" key="colCaseLevel">Isih Tidak Sensitif Atur</type>
-			<type type="no" key="colHiraganaQuaternary">Isih Kana Berasingan</type>
-			<type type="no" key="colNormalization">Isih Tanpa Penormalan</type>
-			<type type="no" key="colNumeric">Isih Digit Secara Berasingan</type>
-			<type type="non-ignorable" key="colAlternate">Isih Simbol</type>
-			<type type="orya" key="numbers">Digit Oriya</type>
-			<type type="persian" key="calendar">Kalendar Parsi</type>
-			<type type="phonebook" key="collation">Aturan Isih Buku Telefon</type>
-			<type type="phonetic" key="collation">Urutan Isih Fonetik</type>
-			<type type="pinyin" key="collation">Aturan Isih Pinyin</type>
-			<type type="primary" key="colStrength">Isih Huruf Asas Sahaja</type>
-			<type type="quaternary" key="colStrength">Isih Aksen/Atur/Lebar/Kana</type>
-			<type type="reformed" key="collation">Aturan Isih Pembaharuan</type>
-			<type type="roc" key="calendar">Kalendar Minguo</type>
-			<type type="roman" key="numbers">Angka Roman</type>
-			<type type="romanlow" key="numbers">Angka Huruf Kecil Roman</type>
-			<type type="search" key="collation">Carian Tujuan Umum</type>
-			<type type="searchjl" key="collation">Cari Mengikut Konsonan Awal Hangul</type>
-			<type type="secondary" key="colStrength">Isih Aksen</type>
-			<type type="shifted" key="colAlternate">Isih Mengabaikan Simbol</type>
-			<type type="standard" key="collation">Urutan Isihan Standard</type>
-			<type type="stroke" key="collation">Aturan Isih Coretan</type>
-			<type type="taml" key="numbers">Angka Tamil</type>
-			<type type="tamldec" key="numbers">Digit Tamil</type>
-			<type type="telu" key="numbers">Digit Telugu</type>
-			<type type="tertiary" key="colStrength">Isih Aksen/Atur/Lebar</type>
-			<type type="thai" key="numbers">Digit Thai</type>
-			<type type="tibt" key="numbers">Digit Tibet</type>
-			<type type="traditional" key="collation">Aturan Isih Tradisional</type>
-			<type type="traditional" key="numbers">Angka Tradisional</type>
-			<type type="unihan" key="collation">Aturan Isih Coretan Radikal</type>
-			<type type="upper" key="colCaseFirst">Isih Huruf Besar Dahulu</type>
-			<type type="vaii" key="numbers">Digit Vai</type>
-			<type type="yes" key="colBackwards">Isih Aksen Terbalik</type>
-			<type type="yes" key="colCaseLevel">Isih Sensitif Atur</type>
-			<type type="yes" key="colHiraganaQuaternary">Isih Kana Secara Berbeza</type>
-			<type type="yes" key="colNormalization">Isih Unikod Ternormal</type>
-			<type type="yes" key="colNumeric">Isih Digit Mengikut Nombor</type>
+			<type key="calendar" type="buddhist">Kalendar Buddha</type>
+			<type key="calendar" type="chinese">Kalendar Cina</type>
+			<type key="calendar" type="coptic">Kalendar Qibti</type>
+			<type key="calendar" type="dangi">Kalendar Dangi</type>
+			<type key="calendar" type="ethiopic">Kalendar Ethiopia</type>
+			<type key="calendar" type="ethiopic-amete-alem">Kalendar Amete Alem Ethiopia</type>
+			<type key="calendar" type="gregorian">Kalendar Gregory</type>
+			<type key="calendar" type="hebrew">Kalendar Ibrani</type>
+			<type key="calendar" type="indian">Kalendar Kebangsaan India</type>
+			<type key="calendar" type="islamic">Kalendar Islam</type>
+			<type key="calendar" type="islamic-civil">Kalendar Sivil Islam</type>
+			<type key="calendar" type="iso8601">Kalendar ISO-8601</type>
+			<type key="calendar" type="japanese">Kalendar Jepun</type>
+			<type key="calendar" type="persian">Kalendar Parsi</type>
+			<type key="calendar" type="roc">Kalendar Minguo</type>
+			<type key="colAlternate" type="non-ignorable">Isih Simbol</type>
+			<type key="colAlternate" type="shifted">Isih Mengabaikan Simbol</type>
+			<type key="colBackwards" type="no">Isih Aksen Secara Biasa</type>
+			<type key="colBackwards" type="yes">Isih Aksen Terbalik</type>
+			<type key="colCaseFirst" type="lower">Isih Huruf Kecil Dahulu</type>
+			<type key="colCaseFirst" type="no">Isih Urutan Atur Biasa</type>
+			<type key="colCaseFirst" type="upper">Isih Huruf Besar Dahulu</type>
+			<type key="colCaseLevel" type="no">Isih Tidak Sensitif Atur</type>
+			<type key="colCaseLevel" type="yes">Isih Sensitif Atur</type>
+			<type key="colHiraganaQuaternary" type="no">Isih Kana Berasingan</type>
+			<type key="colHiraganaQuaternary" type="yes">Isih Kana Secara Berbeza</type>
+			<type key="collation" type="big5han">Aturan Isih Cina Tradisional - Big5</type>
+			<type key="collation" type="dictionary">Aturan Isih Kamus</type>
+			<type key="collation" type="ducet">Aturan Isih Unikod Lalai</type>
+			<type key="collation" type="gb2312han">Aturan Isih Bahasa Cina Ringkas - GB2312</type>
+			<type key="collation" type="phonebook">Aturan Isih Buku Telefon</type>
+			<type key="collation" type="phonetic">Urutan Isih Fonetik</type>
+			<type key="collation" type="pinyin">Aturan Isih Pinyin</type>
+			<type key="collation" type="reformed">Aturan Isih Pembaharuan</type>
+			<type key="collation" type="search">Carian Tujuan Umum</type>
+			<type key="collation" type="searchjl">Cari Mengikut Konsonan Awal Hangul</type>
+			<type key="collation" type="standard">Urutan Isihan Standard</type>
+			<type key="collation" type="stroke">Aturan Isih Coretan</type>
+			<type key="collation" type="traditional">Aturan Isih Tradisional</type>
+			<type key="collation" type="unihan">Aturan Isih Coretan Radikal</type>
+			<type key="colNormalization" type="no">Isih Tanpa Penormalan</type>
+			<type key="colNormalization" type="yes">Isih Unikod Ternormal</type>
+			<type key="colNumeric" type="no">Isih Digit Secara Berasingan</type>
+			<type key="colNumeric" type="yes">Isih Digit Mengikut Nombor</type>
+			<type key="colStrength" type="identical">Isih Semua</type>
+			<type key="colStrength" type="primary">Isih Huruf Asas Sahaja</type>
+			<type key="colStrength" type="quaternary">Isih Aksen/Atur/Lebar/Kana</type>
+			<type key="colStrength" type="secondary">Isih Aksen</type>
+			<type key="colStrength" type="tertiary">Isih Aksen/Atur/Lebar</type>
+			<type key="hc" type="h11">Sistem 12 Jam (0–11)</type>
+			<type key="hc" type="h12">Sistem 12 Jam (1–12)</type>
+			<type key="hc" type="h23">Sistem 24 Jam (0–23)</type>
+			<type key="hc" type="h24">Sistem 24 Jam (1–24)</type>
+			<type key="lb" type="loose">Gaya Pemisah Baris Bebas</type>
+			<type key="lb" type="normal">Gaya Pemisah Baris Biasa</type>
+			<type key="lb" type="strict">Gaya Pemisah Baris Ketat</type>
+			<type key="ms" type="metric">Sistem Metrik</type>
+			<type key="ms" type="uksystem">Sistem Ukuran Imperial</type>
+			<type key="ms" type="ussystem">Sistem Ukuran AS</type>
+			<type key="numbers" type="arab">Digit Indi-Arab</type>
+			<type key="numbers" type="arabext">Digit Indi Arab Lanjutan</type>
+			<type key="numbers" type="armn">Angka Armenia</type>
+			<type key="numbers" type="armnlow">Angka Kecil Armenia</type>
+			<type key="numbers" type="beng">Digit Bengali</type>
+			<type key="numbers" type="deva">Digit Devanagari</type>
+			<type key="numbers" type="ethi">Angka Ethiopia</type>
+			<type key="numbers" type="finance">Angka Kewangan</type>
+			<type key="numbers" type="fullwide">Digit Lebar Penuh</type>
+			<type key="numbers" type="geor">Angka Georgia</type>
+			<type key="numbers" type="grek">Angka Greek</type>
+			<type key="numbers" type="greklow">Angka Huruf Kecil Greek</type>
+			<type key="numbers" type="gujr">Digit Gujarat</type>
+			<type key="numbers" type="guru">Digit Gurmukhi</type>
+			<type key="numbers" type="hanidec">Angka Perpuluhan Cina</type>
+			<type key="numbers" type="hans">Angka Cina Ringkas</type>
+			<type key="numbers" type="hansfin">Angka Kewangan Cina Ringkas</type>
+			<type key="numbers" type="hant">Angka Cina Tradisional</type>
+			<type key="numbers" type="hantfin">Angka Kewangan Cina Tradisional</type>
+			<type key="numbers" type="hebr">Angka Ibrani</type>
+			<type key="numbers" type="jpan">Angka Jepun</type>
+			<type key="numbers" type="jpanfin">Angka Kewangan Jepun</type>
+			<type key="numbers" type="khmr">Digit Khmer</type>
+			<type key="numbers" type="knda">Digit Kannada</type>
+			<type key="numbers" type="laoo">Digit Lao</type>
+			<type key="numbers" type="latn">Digit Barat</type>
+			<type key="numbers" type="mlym">Digit Malayalam</type>
+			<type key="numbers" type="mong">Digit Mongolia</type>
+			<type key="numbers" type="mymr">Digit Myammar</type>
+			<type key="numbers" type="native">Digit Asal</type>
+			<type key="numbers" type="orya">Digit Oriya</type>
+			<type key="numbers" type="roman">Angka Roman</type>
+			<type key="numbers" type="romanlow">Angka Huruf Kecil Roman</type>
+			<type key="numbers" type="taml">Angka Tamil</type>
+			<type key="numbers" type="tamldec">Digit Tamil</type>
+			<type key="numbers" type="telu">Digit Telugu</type>
+			<type key="numbers" type="thai">Digit Thai</type>
+			<type key="numbers" type="tibt">Digit Tibet</type>
+			<type key="numbers" type="traditional">Angka Tradisional</type>
+			<type key="numbers" type="vaii">Digit Vai</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN">BGN</transformName>
@@ -1001,6 +1020,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -1010,7 +1030,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="H">HH</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
-						<dateFormatItem id="Hmm">H:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
@@ -1029,6 +1048,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">MMMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
 					</availableFormats>
@@ -1343,18 +1363,60 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am">pg</dayPeriod>
-							<dayPeriod type="pm">ptg</dayPeriod>
+							<dayPeriod type="am">PG</dayPeriod>
+							<dayPeriod type="pm">PTG</dayPeriod>
+							<dayPeriod type="morning1">tengah malam</dayPeriod>
+							<dayPeriod type="morning2">pagi</dayPeriod>
+							<dayPeriod type="afternoon1">tengah hari</dayPeriod>
+							<dayPeriod type="evening1">petang</dayPeriod>
+							<dayPeriod type="night1">malam</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am">a</dayPeriod>
-							<dayPeriod type="noon">t</dayPeriod>
 							<dayPeriod type="pm">p</dayPeriod>
+							<dayPeriod type="morning1">tengah malam</dayPeriod>
+							<dayPeriod type="morning2">pagi</dayPeriod>
+							<dayPeriod type="afternoon1">tengah hari</dayPeriod>
+							<dayPeriod type="evening1">petang</dayPeriod>
+							<dayPeriod type="night1">malam</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">PG</dayPeriod>
-							<dayPeriod type="noon">t/hari</dayPeriod>
 							<dayPeriod type="pm">PTG</dayPeriod>
+							<dayPeriod type="morning1">tengah malam</dayPeriod>
+							<dayPeriod type="morning2">pagi</dayPeriod>
+							<dayPeriod type="afternoon1">tengah hari</dayPeriod>
+							<dayPeriod type="evening1">petang</dayPeriod>
+							<dayPeriod type="night1">malam</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">PG</dayPeriod>
+							<dayPeriod type="pm">PTG</dayPeriod>
+							<dayPeriod type="morning1">tengah malam</dayPeriod>
+							<dayPeriod type="morning2">pagi</dayPeriod>
+							<dayPeriod type="afternoon1">tengah hari</dayPeriod>
+							<dayPeriod type="evening1">petang</dayPeriod>
+							<dayPeriod type="night1">malam</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">a</dayPeriod>
+							<dayPeriod type="pm">p</dayPeriod>
+							<dayPeriod type="morning1">tengah malam</dayPeriod>
+							<dayPeriod type="morning2">pagi</dayPeriod>
+							<dayPeriod type="afternoon1">tengah hari</dayPeriod>
+							<dayPeriod type="evening1">petang</dayPeriod>
+							<dayPeriod type="night1">malam</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">PG</dayPeriod>
+							<dayPeriod type="pm">PTG</dayPeriod>
+							<dayPeriod type="morning1">tengah malam</dayPeriod>
+							<dayPeriod type="morning2">pagi</dayPeriod>
+							<dayPeriod type="afternoon1">tengah hari</dayPeriod>
+							<dayPeriod type="evening1">petang</dayPeriod>
+							<dayPeriod type="night1">malam</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1449,9 +1511,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="H">HH</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
-						<dateFormatItem id="Hmm">H:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d-M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d-M</dateFormatItem>
@@ -1468,6 +1533,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMEd">E, d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
 						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
 					</availableFormats>
@@ -1629,6 +1695,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>thn</displayName>
+				<relative type="-1">thn lepas</relative>
+				<relative type="0">thn ini</relative>
+				<relative type="1">thn depan</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">dalam {0} thn</relativeTimePattern>
 				</relativeTime>
@@ -1638,6 +1707,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>thn</displayName>
+				<relative type="-1">thn lepas</relative>
+				<relative type="0">thn ini</relative>
+				<relative type="1">thn depan</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">dalam {0} thn</relativeTimePattern>
 				</relativeTime>
@@ -1647,6 +1719,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter">
 				<displayName>Suku Tahun</displayName>
+				<relative type="-1">suku lepas</relative>
+				<relative type="0">suku ini</relative>
+				<relative type="1">suku seterusnya</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">dalam {0} suku</relativeTimePattern>
 				</relativeTime>
@@ -1656,6 +1731,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>suku</displayName>
+				<relative type="-1">suku lepas</relative>
+				<relative type="0">suku ini</relative>
+				<relative type="1">suku seterusnya</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">dlm {0} suku</relativeTimePattern>
 				</relativeTime>
@@ -1665,6 +1743,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>suku</displayName>
+				<relative type="-1">suku lepas</relative>
+				<relative type="0">suku ini</relative>
+				<relative type="1">suku seterusnya</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">dlm {0} suku</relativeTimePattern>
 				</relativeTime>
@@ -1686,6 +1767,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>bln</displayName>
+				<relative type="-1">bln lalu</relative>
+				<relative type="0">bln ini</relative>
+				<relative type="1">bln depan</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">dlm {0} bln</relativeTimePattern>
 				</relativeTime>
@@ -1695,6 +1779,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>bln</displayName>
+				<relative type="-1">bln lalu</relative>
+				<relative type="0">bln ini</relative>
+				<relative type="1">bln depan</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">dalam {0} bln lalu</relativeTimePattern>
 				</relativeTime>
@@ -1716,6 +1803,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>mgu</displayName>
+				<relative type="-1">mng lepas</relative>
+				<relative type="0">mng ini</relative>
+				<relative type="1">mng depan</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">dlm {0} mgu</relativeTimePattern>
 				</relativeTime>
@@ -1725,6 +1815,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>mgu</displayName>
+				<relative type="-1">mng lepas</relative>
+				<relative type="0">mng ini</relative>
+				<relative type="1">mng depan</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">dlm {0} mgu</relativeTimePattern>
 				</relativeTime>
@@ -1748,6 +1841,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>hari</displayName>
+				<relative type="-2">kelmarin</relative>
+				<relative type="-1">semlm</relative>
+				<relative type="0">hari ini</relative>
+				<relative type="1">esok</relative>
+				<relative type="2">lusa</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">dlm {0} hari</relativeTimePattern>
 				</relativeTime>
@@ -1757,6 +1855,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>hari</displayName>
+				<relative type="-2">kelmarin</relative>
+				<relative type="-1">semlm</relative>
+				<relative type="0">hari ini</relative>
+				<relative type="1">esok</relative>
+				<relative type="2">lusa</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">dlm {0} hari</relativeTimePattern>
 				</relativeTime>
@@ -2836,6 +2939,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
 			</zone>
@@ -2920,6 +3026,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Chita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Yakutsk</exemplarCity>
 			</zone>
@@ -2938,6 +3047,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolymsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamchatka</exemplarCity>
 			</zone>
@@ -4202,6 +4314,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">¤0K</pattern>
+					<pattern type="10000" count="other">¤00K</pattern>
+					<pattern type="100000" count="other">¤000K</pattern>
+					<pattern type="1000000" count="other">¤0J</pattern>
+					<pattern type="10000000" count="other">¤00J</pattern>
+					<pattern type="100000000" count="other">¤000J</pattern>
+					<pattern type="1000000000" count="other">¤0B</pattern>
+					<pattern type="10000000000" count="other">¤00B</pattern>
+					<pattern type="100000000000" count="other">¤000B</pattern>
+					<pattern type="1000000000000" count="other">¤0T</pattern>
+					<pattern type="10000000000000" count="other">¤00T</pattern>
+					<pattern type="100000000000000" count="other">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencies>
@@ -4234,6 +4362,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Kwanza Angola</displayName>
 				<displayName count="other">Kwanza Angola</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="ARS">
 				<displayName>Peso Argentina</displayName>
@@ -4261,6 +4390,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Mark Boleh Tukar Bosnia-Herzegovina</displayName>
 				<displayName count="other">Mark Boleh Tukar Bosnia-Herzegovina</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>Dolar Barbados</displayName>
@@ -4305,6 +4435,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Boliviano Bolivia</displayName>
 				<displayName count="other">Boliviano Bolivia</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BRL">
 				<displayName>Real Brazil</displayName>
@@ -4327,6 +4458,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Pula Botswana</displayName>
 				<displayName count="other">Pula Botswana</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYR">
 				<displayName>Ruble Belarus</displayName>
@@ -4384,6 +4516,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Peso Boleh Tukar Cuba</displayName>
 				<displayName count="other">Peso Boleh Tukar Cuba</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>Peso Cuba</displayName>
@@ -4400,6 +4533,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Koruna Republik Czech</displayName>
 				<displayName count="other">Koruna Republik Czech</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DJF">
 				<displayName>Franc Djibouti</displayName>
@@ -4410,6 +4544,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Krone Denmark</displayName>
 				<displayName count="other">Krone Denmark</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Peso Dominican</displayName>
@@ -4426,6 +4561,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Paun Mesir</displayName>
 				<displayName count="other">Paun Mesir</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>ERN</displayName>
@@ -4453,6 +4589,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Paun Kepulauan Falkland</displayName>
 				<displayName count="other">Paun Kepulauan Falkland</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GBP">
 				<displayName>Paun British</displayName>
@@ -4485,11 +4622,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Franc Guinea</displayName>
 				<displayName count="other">Franc Guinea</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GTQ">
 				<displayName>Quetzal Guatemala</displayName>
 				<displayName count="other">Quetzal Guatemala</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GYD">
 				<displayName>Dolar Guyana</displayName>
@@ -4507,11 +4646,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Lempira Honduras</displayName>
 				<displayName count="other">Lempira Honduras</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRK">
 				<displayName>Kuna Croatia</displayName>
 				<displayName count="other">Kuna Croatia</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>Gourde Haiti</displayName>
@@ -4522,11 +4663,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Forint Hungary</displayName>
 				<displayName count="other">Forint Hungary</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>Rupiah Indonesia</displayName>
 				<displayName count="other">Rupiah Indonesia</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="ILS">
 				<displayName>Sheqel Baru Israel</displayName>
@@ -4554,6 +4697,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Krona Iceland</displayName>
 				<displayName count="other">Krona Iceland</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="JMD">
 				<displayName>Dolar Jamaica</displayName>
@@ -4592,11 +4736,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Franc Comoria</displayName>
 				<displayName count="other">Franc Comoria</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>Won Korea Utara</displayName>
 				<displayName count="other">Won Korea Utara</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>Won Korea Selatan</displayName>
@@ -4631,11 +4777,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Paun Lubnan</displayName>
 				<displayName count="other">Paun Lubnan</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>Rupee Sri Lanka</displayName>
 				<displayName count="other">Rupee Sri Lanka</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>Dolar Liberia</displayName>
@@ -4675,6 +4823,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Ariary Malagasy</displayName>
 				<displayName count="other">Ariary Malagasy</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MKD">
 				<displayName>Denar Macedonia</displayName>
@@ -4685,6 +4834,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Kyat Myanma</displayName>
 				<displayName count="other">Kyat Myanma</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>Tugrik Mongolia</displayName>
@@ -4706,6 +4856,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Rupee Mauritia</displayName>
 				<displayName count="other">Rupee Mauritia</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>Rufiyaa Maldives</displayName>
@@ -4727,6 +4878,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Ringgit Malaysia</displayName>
 				<displayName count="other">Ringgit Malaysia</displayName>
 				<symbol>RM</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZN">
 				<displayName>Metikal Mozambique</displayName>
@@ -4749,16 +4901,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Cordoba Nicaragua</displayName>
 				<displayName count="other">Cordoba Nicaragua</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NOK">
 				<displayName>Krone Norway</displayName>
 				<displayName count="other">Krone Norway</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>Rupee Nepal</displayName>
 				<displayName count="other">Rupee Nepal</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>Dolar New Zealand</displayName>
@@ -4796,11 +4951,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Rupee Pakistan</displayName>
 				<displayName count="other">Rupee Pakistan</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>Zloty Poland</displayName>
 				<displayName count="other">Zloty Poland</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PYG">
 				<displayName>Guarani Paraguay</displayName>
@@ -4827,11 +4984,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Ruble Rusia</displayName>
 				<displayName count="other">Ruble Rusia</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RWF">
 				<displayName>Franc Rwanda</displayName>
 				<displayName count="other">Franc Rwanda</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>Riyal Saudi</displayName>
@@ -4858,6 +5017,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Krona Sweden</displayName>
 				<displayName count="other">Krona Sweden</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>Dolar Singapura</displayName>
@@ -4869,6 +5029,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Paun Saint Helena</displayName>
 				<displayName count="other">Paun Saint Helena</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SLL">
 				<displayName>Leone Sierra Leone</displayName>
@@ -4896,11 +5057,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Dobra Sao Tome dan Principe</displayName>
 				<displayName count="other">Dobra Sao Tome dan Principe</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SYP">
 				<displayName>Paun Syria</displayName>
 				<displayName count="other">Paun Syria</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>Lilangeni Swazi</displayName>
@@ -4910,7 +5073,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="THB">
 				<displayName>Baht Thai</displayName>
 				<displayName count="other">Baht Thai</displayName>
-				<symbol>฿</symbol>
+				<symbol>THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJS">
 				<displayName>Somoni Tajikistan</displayName>
@@ -4931,12 +5095,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Tongan Paʻanga</displayName>
 				<displayName count="other">Tongan Paʻanga</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TRY">
 				<displayName>Lira Turki</displayName>
 				<displayName count="other">Lira Turki</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Dolar Trinidad dan Tobago</displayName>
@@ -4987,6 +5153,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Bolivar Venezuela</displayName>
 				<displayName count="other">Bolivar Venezuela</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>Dong Vietnam</displayName>
@@ -5013,6 +5180,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Dolar Caribbean Timur</displayName>
 				<displayName count="other">Dolar Caribbean Timur</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XOF">
 				<displayName>Franc CFA BCEAO</displayName>
@@ -5037,6 +5205,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Rand Afrika Selatan</displayName>
 				<displayName count="other">Rand Afrika Selatan</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>Kwacha Zambia (1968–2012)</displayName>
@@ -5046,6 +5215,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Kwacha Zambia</displayName>
 				<displayName count="other">Kwacha Zambia</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
@@ -5066,6 +5236,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>meter sesaat ganda dua</displayName>
 				<unitPattern count="other">{0} meter sesaat ganda dua</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>revolusi</displayName>
+				<unitPattern count="other">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radian</displayName>
+				<unitPattern count="other">{0} radian</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>darjah</displayName>
+				<unitPattern count="other">{0} darjah</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>minit arka</displayName>
 				<unitPattern count="other">{0} minit arka</unitPattern>
@@ -5074,25 +5256,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>saat arka</displayName>
 				<unitPattern count="other">{0} saat arka</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>darjah</displayName>
-				<unitPattern count="other">{0} darjah</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radian</displayName>
-				<unitPattern count="other">{0} radian</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ekar</displayName>
-				<unitPattern count="other">{0} ekar</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>kilometer persegi</displayName>
+				<unitPattern count="other">{0} kilometer persegi</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektar</displayName>
 				<unitPattern count="other">{0} hektar</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>meter persegi</displayName>
+				<unitPattern count="other">{0} meter persegi</unitPattern>
+				<perUnitPattern>{0} setiap meter persegi</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>sentimeter persegi</displayName>
 				<unitPattern count="other">{0} sentimeter persegi</unitPattern>
+				<perUnitPattern>{0} setiap sentimeter persegi</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>batu persegi</displayName>
+				<unitPattern count="other">{0} batu persegi</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ekar</displayName>
+				<unitPattern count="other">{0} ekar</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>ela persegi</displayName>
+				<unitPattern count="other">{0} ela persegi</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>kaki persegi</displayName>
@@ -5101,112 +5293,114 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="area-square-inch">
 				<displayName>inci persegi</displayName>
 				<unitPattern count="other">{0} inci persegi</unitPattern>
+				<perUnitPattern>{0} setiap inci persegi</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kilometer persegi</displayName>
-				<unitPattern count="other">{0} kilometer persegi</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>meter persegi</displayName>
-				<unitPattern count="other">{0} meter persegi</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>batu persegi</displayName>
-				<unitPattern count="other">{0} batu persegi</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>ela persegi</displayName>
-				<unitPattern count="other">{0} ela persegi</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karat</displayName>
+				<unitPattern count="other">{0} karat</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liter sekilometer</displayName>
 				<unitPattern count="other">{0} liter sekilometer</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>liter setiap 100 kilometer</displayName>
+				<unitPattern count="other">{0} liter setiap 100 kilometer</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>batu segelen</displayName>
 				<unitPattern count="other">{0} batu segelen</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bait</displayName>
-				<unitPattern count="other">{0} bait</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabit</displayName>
-				<unitPattern count="other">{0} gigabit</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabait</displayName>
-				<unitPattern count="other">{0} gigabait</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobit</displayName>
-				<unitPattern count="other">{0} kilobit</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobait</displayName>
-				<unitPattern count="other">{0} kilobait</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabit</displayName>
-				<unitPattern count="other">{0} megabit</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabait</displayName>
-				<unitPattern count="other">{0} megabait</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabit</displayName>
-				<unitPattern count="other">{0} terabit</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabait</displayName>
 				<unitPattern count="other">{0} terabait</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabit</displayName>
+				<unitPattern count="other">{0} terabit</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabait</displayName>
+				<unitPattern count="other">{0} gigabait</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabit</displayName>
+				<unitPattern count="other">{0} gigabit</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabait</displayName>
+				<unitPattern count="other">{0} megabait</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabit</displayName>
+				<unitPattern count="other">{0} megabit</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobait</displayName>
+				<unitPattern count="other">{0} kilobait</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobit</displayName>
+				<unitPattern count="other">{0} kilobit</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bait</displayName>
+				<unitPattern count="other">{0} bait</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>abad</displayName>
+				<unitPattern count="other">{0} abad</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>tahun</displayName>
+				<unitPattern count="other">{0} tahun</unitPattern>
+				<perUnitPattern>{0} setiap tahun</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>bulan</displayName>
+				<unitPattern count="other">{0} bulan</unitPattern>
+				<perUnitPattern>{0}/bln</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>minggu</displayName>
+				<unitPattern count="other">{0} minggu</unitPattern>
+				<perUnitPattern>{0} setiap minggu</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>hari</displayName>
 				<unitPattern count="other">{0} hari</unitPattern>
+				<perUnitPattern>{0} setiap hari</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>jam</displayName>
 				<unitPattern count="other">{0} jam</unitPattern>
 				<perUnitPattern>{0} sejam</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikrosaat</displayName>
-				<unitPattern count="other">{0} mikrosaat</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milisaat</displayName>
-				<unitPattern count="other">{0} milisaat</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>minit</displayName>
 				<unitPattern count="other">{0} minit</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>bulan</displayName>
-				<unitPattern count="other">{0} bulan</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanosaat</displayName>
-				<unitPattern count="other">{0} nanosaat</unitPattern>
+				<perUnitPattern>{0} setiap minit</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>saat</displayName>
 				<unitPattern count="other">{0} saat</unitPattern>
 				<perUnitPattern>{0} sesaat</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>minggu</displayName>
-				<unitPattern count="other">{0} minggu</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milisaat</displayName>
+				<unitPattern count="other">{0} milisaat</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>tahun</displayName>
-				<unitPattern count="other">{0} tahun</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>mikrosaat</displayName>
+				<unitPattern count="other">{0} mikrosaat</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosaat</displayName>
+				<unitPattern count="other">{0} nanosaat</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ampere</displayName>
@@ -5224,6 +5418,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>volt</displayName>
 				<unitPattern count="other">{0} volt</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokalori</displayName>
+				<unitPattern count="other">{0} kilokalori</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kalori</displayName>
 				<unitPattern count="other">{0} kalori</unitPattern>
@@ -5232,18 +5430,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Kalori</displayName>
 				<unitPattern count="other">{0} Kalori</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="other">{0} joule</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokalori</displayName>
-				<unitPattern count="other">{0} kilokalori</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojoule</displayName>
 				<unitPattern count="other">{0} kilojoule</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="other">{0} joule</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilowatt jam</displayName>
 				<unitPattern count="other">{0} kilowatt jam</unitPattern>
@@ -5252,162 +5446,167 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>gigahertz</displayName>
 				<unitPattern count="other">{0} gigahertz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hertz</displayName>
-				<unitPattern count="other">{0} hertz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megahertz</displayName>
+				<unitPattern count="other">{0} megahertz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kilohertz</displayName>
 				<unitPattern count="other">{0} kilohertz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megahertz</displayName>
-				<unitPattern count="other">{0} megahertz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hertz</displayName>
+				<unitPattern count="other">{0} hertz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>unit astronomi</displayName>
-				<unitPattern count="other">{0} unit astronomi</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometer</displayName>
+				<unitPattern count="other">{0} kilometer</unitPattern>
+				<perUnitPattern>{0} setiap kilometer</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>sentimeter</displayName>
-				<unitPattern count="other">{0} sentimeter</unitPattern>
+			<unit type="length-meter">
+				<displayName>meter</displayName>
+				<unitPattern count="other">{0} meter</unitPattern>
+				<perUnitPattern>{0} setiap meter</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>desimeter</displayName>
 				<unitPattern count="other">{0} desimeter</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>kaki</displayName>
-				<unitPattern count="other">{0} kaki</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>inci</displayName>
-				<unitPattern count="other">{0} inci</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometer</displayName>
-				<unitPattern count="other">{0} kilometer</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>tahun cahaya</displayName>
-				<unitPattern count="other">{0} tahun cahaya</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>meter</displayName>
-				<unitPattern count="other">{0} meter</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>mikrometer</displayName>
-				<unitPattern count="other">{0} mikrometer</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>batu</displayName>
-				<unitPattern count="other">{0} batu</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>sentimeter</displayName>
+				<unitPattern count="other">{0} sentimeter</unitPattern>
+				<perUnitPattern>{0} setiap sentimeter</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>milimeter</displayName>
 				<unitPattern count="other">{0} milimeter</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikrometer</displayName>
+				<unitPattern count="other">{0} mikrometer</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="other">{0} nanometer</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>batu nautika</displayName>
-				<unitPattern count="other">{0} batu nautika</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsek</displayName>
-				<unitPattern count="other">{0} parsek</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pikometer</displayName>
 				<unitPattern count="other">{0} pikometer</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>batu</displayName>
+				<unitPattern count="other">{0} batu</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>ela</displayName>
 				<unitPattern count="other">{0} ela</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>kaki</displayName>
+				<unitPattern count="other">{0} kaki</unitPattern>
+				<perUnitPattern>{0} sekaki</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>inci</displayName>
+				<unitPattern count="other">{0} inci</unitPattern>
+				<perUnitPattern>{0} seinci</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsek</displayName>
+				<unitPattern count="other">{0} parsek</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>tahun cahaya</displayName>
+				<unitPattern count="other">{0} tahun cahaya</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>unit astronomi</displayName>
+				<unitPattern count="other">{0} unit astronomi</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>batu nautika</displayName>
+				<unitPattern count="other">{0} batu nautika</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>batu-skandinavia</displayName>
+				<unitPattern count="other">{0} batu-skandinavia</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karat</displayName>
-				<unitPattern count="other">{0} karat</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gram</displayName>
-				<unitPattern count="other">{0} gram</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogram</displayName>
-				<unitPattern count="other">{0} kilogram</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>metrik tan</displayName>
 				<unitPattern count="other">{0} metrik tan</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mikrogram</displayName>
-				<unitPattern count="other">{0} mikrogram</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogram</displayName>
+				<unitPattern count="other">{0} kilogram</unitPattern>
+				<perUnitPattern>{0} setiap kilogram</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="other">{0} gram</unitPattern>
+				<perUnitPattern>{0} setiap gram</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>miligram</displayName>
 				<unitPattern count="other">{0} miligram</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>auns</displayName>
-				<unitPattern count="other">{0} auns</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>auns troy</displayName>
-				<unitPattern count="other">{0} auns troy</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>paun</displayName>
-				<unitPattern count="other">{0} paun</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>mikrogram</displayName>
+				<unitPattern count="other">{0} mikrogram</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tan</displayName>
 				<unitPattern count="other">{0} tan</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>paun</displayName>
+				<unitPattern count="other">{0} paun</unitPattern>
+				<perUnitPattern>{0} setiap paun</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>auns</displayName>
+				<unitPattern count="other">{0} auns</unitPattern>
+				<perUnitPattern>{0} setiap auns</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>auns troy</displayName>
+				<unitPattern count="other">{0} auns troy</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karat</displayName>
+				<unitPattern count="other">{0} karat</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigawatt</displayName>
 				<unitPattern count="other">{0} gigawatt</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>kuasa kuda</displayName>
-				<unitPattern count="other">{0} kuasa kuda</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilowatt</displayName>
-				<unitPattern count="other">{0} kilowatt</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>megawatt</displayName>
 				<unitPattern count="other">{0} megawatt</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>miliwatt</displayName>
-				<unitPattern count="other">{0} miliwatt</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilowatt</displayName>
+				<unitPattern count="other">{0} kilowatt</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watt</displayName>
 				<unitPattern count="other">{0} watt</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>miliwatt</displayName>
+				<unitPattern count="other">{0} miliwatt</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>kuasa kuda</displayName>
+				<unitPattern count="other">{0} kuasa kuda</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hektopascal</displayName>
 				<unitPattern count="other">{0} hektopascal</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inci raksa</displayName>
-				<unitPattern count="other">{0} inci raksa</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>milibar</displayName>
-				<unitPattern count="other">{0} milibar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>milimeter raksa</displayName>
 				<unitPattern count="other">{0} milimeter raksa</unitPattern>
@@ -5416,9 +5615,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>paun seinci persegi</displayName>
 				<unitPattern count="other">{0} paun seinci persegi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karat</displayName>
-				<unitPattern count="other">{0} karat</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inci raksa</displayName>
+				<unitPattern count="other">{0} inci raksa</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>milibar</displayName>
+				<unitPattern count="other">{0} milibar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometer sejam</displayName>
@@ -5432,9 +5635,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>batu sejam</displayName>
 				<unitPattern count="other">{0} batu sejam</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>knot</displayName>
+				<unitPattern count="other">{0} knot</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>darjah Celsius</displayName>
-				<unitPattern count="other">{0}darjah Celsius</unitPattern>
+				<unitPattern count="other">{0} darjah Celsius</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
 				<displayName>darjah Fahrenheit</displayName>
@@ -5444,26 +5655,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>kelvin</displayName>
 				<unitPattern count="other">{0} kelvin</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ekar-kaki</displayName>
-				<unitPattern count="other">{0} ekar-kaki</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>sentiliter</displayName>
-				<unitPattern count="other">{0} sentiliter</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>sentimeter padu</displayName>
-				<unitPattern count="other">{0} sentimeter padu</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>kaki padu</displayName>
-				<unitPattern count="other">{0} kaki padu</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>inci padu</displayName>
-				<unitPattern count="other">{0} inci padu</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kilometer padu</displayName>
 				<unitPattern count="other">{0} kilometer padu</unitPattern>
@@ -5471,6 +5662,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-cubic-meter">
 				<displayName>meter padu</displayName>
 				<unitPattern count="other">{0} meter padu</unitPattern>
+				<perUnitPattern>{0} setiap meter padu</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>sentimeter padu</displayName>
+				<unitPattern count="other">{0} sentimeter padu</unitPattern>
+				<perUnitPattern>{0} setiap sentimeter padu</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>batu padu</displayName>
@@ -5480,21 +5677,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ela padu</displayName>
 				<unitPattern count="other">{0} ela padu</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>cawan</displayName>
-				<unitPattern count="other">{0} cawan</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>kaki padu</displayName>
+				<unitPattern count="other">{0} kaki padu</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>desiliter</displayName>
-				<unitPattern count="other">{0} desiliter</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>inci padu</displayName>
+				<unitPattern count="other">{0} inci padu</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>auns cecair</displayName>
-				<unitPattern count="other">{0} auns cecair</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gelen</displayName>
-				<unitPattern count="other">{0} gelen</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megaliter</displayName>
+				<unitPattern count="other">{0} megaliter</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hektoliter</displayName>
@@ -5503,23 +5696,53 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-liter">
 				<displayName>liter</displayName>
 				<unitPattern count="other">{0} liter</unitPattern>
+				<perUnitPattern>{0} setiap liter</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megaliter</displayName>
-				<unitPattern count="other">{0} megaliter</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>desiliter</displayName>
+				<unitPattern count="other">{0} desiliter</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>sentiliter</displayName>
+				<unitPattern count="other">{0} sentiliter</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mililiter</displayName>
 				<unitPattern count="other">{0} mililiter</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pain</displayName>
-				<unitPattern count="other">{0} pain</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>pain metrik</displayName>
+				<unitPattern count="other">{0} pain metrik</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>cawan metrik</displayName>
+				<unitPattern count="other">{0} cawan metrik</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ekar-kaki</displayName>
+				<unitPattern count="other">{0} ekar-kaki</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gelen</displayName>
+				<unitPattern count="other">{0} gelen</unitPattern>
+				<perUnitPattern>{0} segelen</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>kuart</displayName>
 				<unitPattern count="other">{0} kuart</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pain</displayName>
+				<unitPattern count="other">{0} pain</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cawan</displayName>
+				<unitPattern count="other">{0} cawan</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>auns cecair</displayName>
+				<unitPattern count="other">{0} auns cecair</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>sudu besar</displayName>
 				<unitPattern count="other">{0} sudu besar</unitPattern>
@@ -5528,6 +5751,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>sudu teh</displayName>
 				<unitPattern count="other">{0} sudu teh</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -5541,6 +5770,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>meter/s²</displayName>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="other">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radian</displayName>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>darjah</displayName>
+				<unitPattern count="other">{0} darjah</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>arcmin</displayName>
 				<unitPattern count="other">{0} arcmin</unitPattern>
@@ -5549,25 +5790,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>saat arka</displayName>
 				<unitPattern count="other">{0} saat arka</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>darjah</displayName>
-				<unitPattern count="other">{0} darjah</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radian</displayName>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ekar</displayName>
-				<unitPattern count="other">{0} ekar</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektar</displayName>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0} setiap m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0} setiap cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>batu persegi</displayName>
+				<unitPattern count="other">{0} bt²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ekar</displayName>
+				<unitPattern count="other">{0} ekar</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>ela²</displayName>
+				<unitPattern count="other">{0} ela²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ka persegi</displayName>
@@ -5576,112 +5827,114 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="area-square-inch">
 				<displayName>inci²</displayName>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0} setiap in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>batu persegi</displayName>
-				<unitPattern count="other">{0} bt²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>ela²</displayName>
-				<unitPattern count="other">{0} ela²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karat</displayName>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liter/km</displayName>
 				<unitPattern count="other">{0} L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>batu/gal</displayName>
 				<unitPattern count="other">{0} bpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bait</displayName>
-				<unitPattern count="other">{0} bait</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gbit</displayName>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GBait</displayName>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kbit</displayName>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kBait</displayName>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mbit</displayName>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MBait</displayName>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tbit</displayName>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TBait</displayName>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tbit</displayName>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GBait</displayName>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gbit</displayName>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MBait</displayName>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mbit</displayName>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kBait</displayName>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kbit</displayName>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bait</displayName>
+				<unitPattern count="other">{0} bait</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>abad</displayName>
+				<unitPattern count="other">{0} abad</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>tahun</displayName>
+				<unitPattern count="other">{0} thn</unitPattern>
+				<perUnitPattern>{0}/thn</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>bulan</displayName>
+				<unitPattern count="other">{0} bln</unitPattern>
+				<perUnitPattern>{0}/bln</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>minggu</displayName>
+				<unitPattern count="other">{0} mgu</unitPattern>
+				<perUnitPattern>{0}/mgu</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>hari</displayName>
 				<unitPattern count="other">{0} hari</unitPattern>
+				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>jam</displayName>
 				<unitPattern count="other">{0} j</unitPattern>
 				<perUnitPattern>{0}/j</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μsaat</displayName>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milisaat</displayName>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>minit</displayName>
 				<unitPattern count="other">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>bulan</displayName>
-				<unitPattern count="other">{0} bln</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanosaat</displayName>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>saat</displayName>
 				<unitPattern count="other">{0} saat</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>minggu</displayName>
-				<unitPattern count="other">{0} mgu</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milisaat</displayName>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>tahun</displayName>
-				<unitPattern count="other">{0} thn</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μsaat</displayName>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosaat</displayName>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amp</displayName>
@@ -5699,6 +5952,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>volt</displayName>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kkal</displayName>
+				<unitPattern count="other">{0} kkal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kal</displayName>
 				<unitPattern count="other">{0} kal</unitPattern>
@@ -5707,18 +5964,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Kal</displayName>
 				<unitPattern count="other">{0} Kal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kkal</displayName>
-				<unitPattern count="other">{0} kkal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojoule</displayName>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="other">{0} kWh</unitPattern>
@@ -5727,162 +5980,167 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>GHz</displayName>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometer</displayName>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>sentimeter</displayName>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>meter</displayName>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>kaki</displayName>
-				<unitPattern count="other">{0} ka</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>inci</displayName>
-				<unitPattern count="other">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometer</displayName>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>thn cahaya</displayName>
-				<unitPattern count="other">{0} thn cahaya</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>meter</displayName>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µmeter</displayName>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>batu</displayName>
-				<unitPattern count="other">{0} bt</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>sentimeter</displayName>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µmeter</displayName>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>btn</displayName>
-				<unitPattern count="other">{0} btn</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>batu</displayName>
+				<unitPattern count="other">{0} bt</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>ela</displayName>
 				<unitPattern count="other">{0} ela</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>kaki</displayName>
+				<unitPattern count="other">{0} ka</unitPattern>
+				<perUnitPattern>{0}/ka</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>inci</displayName>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>thn cahaya</displayName>
+				<unitPattern count="other">{0} thn cahaya</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>btn</displayName>
+				<unitPattern count="other">{0} btn</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karat</displayName>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gram</displayName>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogram</displayName>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogram</displayName>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>auns</displayName>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz troy</displayName>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>paun</displayName>
-				<unitPattern count="other">{0} lb</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tan</displayName>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>paun</displayName>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>auns</displayName>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz troy</displayName>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karat</displayName>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hp</displayName>
-				<unitPattern count="other">{0} hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watt</displayName>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="other">{0} mm Hg</unitPattern>
@@ -5891,9 +6149,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>psi</displayName>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karat</displayName>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/jam</displayName>
@@ -5907,6 +6169,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>batu/jam</displayName>
 				<unitPattern count="other">{0} bsj</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>darjah C</displayName>
 				<unitPattern count="other">{0}°C</unitPattern>
@@ -5917,27 +6187,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="temperature-kelvin">
 				<displayName>K</displayName>
-				<unitPattern count="other">{0}°K</unitPattern>
-			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ekar ka</displayName>
-				<unitPattern count="other">{0} ekar ka</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cL</displayName>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ka³</displayName>
-				<unitPattern count="other">{0} ka³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="other">{0} in³</unitPattern>
+				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
@@ -5946,6 +6196,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-cubic-meter">
 				<displayName>m³</displayName>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>bt³</displayName>
@@ -5955,21 +6211,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>yd³</displayName>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>cawan</displayName>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ka³</displayName>
+				<unitPattern count="other">{0} ka³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -5978,23 +6230,53 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-liter">
 				<displayName>liter</displayName>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pain</displayName>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>cawan metrik</displayName>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ekar ka</displayName>
+				<unitPattern count="other">{0} ekar ka</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pain</displayName>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cawan</displayName>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>sudu besar</displayName>
 				<unitPattern count="other">{0} sudu besar</unitPattern>
@@ -6003,6 +6285,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>sudu teh</displayName>
 				<unitPattern count="other">{0} sudu teh</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -6011,33 +6299,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="acceleration-g-force">
 				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="other">{0}′</unitPattern>
 			</unit>
 			<unit type="angle-arc-second">
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="other">{0} ekar</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="other">{0} ka²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="other">{0} m²</unitPattern>
 			</unit>
 			<unit type="area-square-mile">
 				<unitPattern count="other">{0} bt²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="other">{0} ekar</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="other">{0} ka²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>thn</displayName>
+				<unitPattern count="other">{0} thn</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>bulan</displayName>
+				<unitPattern count="other">{0} bln</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>minggu</displayName>
+				<unitPattern count="other">{0} mgu</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>hari</displayName>
 				<unitPattern count="other">{0} h</unitPattern>
@@ -6046,53 +6350,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>jam</displayName>
 				<unitPattern count="other">{0} j</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milisaat</displayName>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>minit</displayName>
 				<unitPattern count="other">{0} min</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>bulan</displayName>
-				<unitPattern count="other">{0} bln</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>saat</displayName>
 				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>minggu</displayName>
-				<unitPattern count="other">{0} mgu</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>thn</displayName>
-				<unitPattern count="other">{0} thn</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>sentimeter</displayName>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="other">{0}'</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="other">{0}&quot;</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milisaat</displayName>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>kilometer</displayName>
 				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="other">{0} t. chya</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>meter</displayName>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="other">{0} bt</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>sentimeter</displayName>
+				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -6101,25 +6381,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="length-picometer">
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="other">{0} bt</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="other">{0} ela</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>gram</displayName>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="other">{0}'</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="other">{0}&quot;</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="other">{0} t. chya</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="other">{0} auns</unitPattern>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="other">{0} paun</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="other">{0} hp</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="other">{0} auns</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="other">{0} kW</unitPattern>
@@ -6127,6 +6416,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="power-watt">
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
@@ -6163,6 +6455,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>liter</displayName>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ms_Latn_BN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms_BN.xml
similarity index 87%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ms_Latn_BN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms_BN.xml
index b19321d7939..6341ec0c22f 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ms_Latn_BN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms_BN.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ms"/>
-		<script type="Latn"/>
 		<territory type="BN"/>
 	</identity>
 	<dates>
@@ -53,3 +51,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ms_Latn_MY.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms_MY.xml
similarity index 65%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ms_Latn_MY.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms_MY.xml
index b521357cae9..4e51e377911 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ms_Latn_MY.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms_MY.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ms"/>
-		<script type="Latn"/>
 		<territory type="MY"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ms_Latn_SG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms_SG.xml
similarity index 71%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ms_Latn_SG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms_SG.xml
index 06ab71c970d..3bc57895281 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ms_Latn_SG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms_SG.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ms"/>
-		<script type="Latn"/>
 		<territory type="SG"/>
 	</identity>
 	<numbers>
@@ -20,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mt.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mt.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mt.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mt.xml
index 0969628f5b8..fb067b70602 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mt.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mt.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11093 $"/>
-		<generation date="$Date: 2015-01-02 21:36:02 -0600 (Fri, 02 Jan 2015) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="mt"/>
 	</identity>
 	<localeDisplayNames>
@@ -488,7 +487,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angwilla</territory>
 			<territory type="AL">Albanija</territory>
 			<territory type="AM">Armenja</territory>
-			<territory type="AN">Antilles Olandiżi</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antartika</territory>
 			<territory type="AR">Arġentina</territory>
@@ -528,7 +526,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CL">Ċili</territory>
 			<territory type="CM">Kamerun</territory>
 			<territory type="CN">Iċ-Ċina</territory>
-			<territory type="CO">Kolumbja</territory>
+			<territory type="CO">Kolombja</territory>
 			<territory type="CR">Kosta Rika</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Kape Verde</territory>
@@ -545,7 +543,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="EE">Estonja</territory>
 			<territory type="EG">Eġittu</territory>
 			<territory type="EH">Sahara tal-Punent</territory>
-			<territory type="ER">Eritreja</territory>
+			<territory type="ER">Eritrea</territory>
 			<territory type="ES">Spanja</territory>
 			<territory type="ET">Etijopja</territory>
 			<territory type="EU">Unjoni Ewropea</territory>
@@ -558,13 +556,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GA">Gabon</territory>
 			<territory type="GB">L-Ingilterra</territory>
 			<territory type="GD">Grenada</territory>
-			<territory type="GE">Ġorġja</territory>
+			<territory type="GE">Ġeorġja</territory>
 			<territory type="GF">Gujana Franċiża</territory>
 			<territory type="GH">Gana</territory>
 			<territory type="GI">Gibraltar</territory>
 			<territory type="GL">Grinlandja</territory>
 			<territory type="GM">Gambja</territory>
-			<territory type="GN">Gineja</territory>
+			<territory type="GN">Ginea</territory>
 			<territory type="GP">Gwadelupe</territory>
 			<territory type="GQ">Ginea Ekwatorjali</territory>
 			<territory type="GR">Greċja</territory>
@@ -617,7 +615,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="LY">Libja</territory>
 			<territory type="MA">Marokk</territory>
 			<territory type="MC">Monako</territory>
-			<territory type="MD">Maldova</territory>
+			<territory type="MD">Moldova</territory>
 			<territory type="MG">Madagaskar</territory>
 			<territory type="MH">Gżejjer ta’ Marshall</territory>
 			<territory type="MK">Maċedonja</territory>
@@ -737,25 +735,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="numbers" draft="unconfirmed">Numri</key>
 		</keys>
 		<types>
-			<type type="big5han" key="collation">Ordni Ċiniż Tradizzjonali (Big5)</type>
-			<type type="buddhist" key="calendar">Kalendarju Buddist</type>
-			<type type="chinese" key="calendar">Kalendarju Ċiniż</type>
-			<type type="dangi" key="calendar">Kalendarju Dangi</type>
-			<type type="dictionary" key="collation" draft="unconfirmed">Ordni tad-Dizzjunarju</type>
-			<type type="ethiopic" key="calendar">Kalendarju Etjopiku</type>
-			<type type="gb2312han" key="collation">Ordni Ċiniż Sempliċi (GB2312)</type>
-			<type type="gregorian" key="calendar">Kalendarju Gregorjan</type>
-			<type type="hebrew" key="calendar">Kalendarju Ebrajk</type>
-			<type type="islamic" key="calendar">Kalendarju Iżlamiku</type>
-			<type type="islamic-civil" key="calendar">Kalendarju Islamiku-Ċivili</type>
-			<type type="iso8601" key="calendar">Kalendarju ISO-8601</type>
-			<type type="japanese" key="calendar">Kalendarju Ġappuniż</type>
-			<type type="latn" key="numbers">Numri tal-Punent</type>
-			<type type="phonebook" key="collation">Ordni Telefonika</type>
-			<type type="pinyin" key="collation">Ordni tal-Pinjin</type>
-			<type type="standard" key="collation">Ordni Standard</type>
-			<type type="stroke" key="collation">Ordni Maħżuża</type>
-			<type type="traditional" key="collation">Tradizzjonali</type>
+			<type key="calendar" type="buddhist">Kalendarju Buddist</type>
+			<type key="calendar" type="chinese">Kalendarju Ċiniż</type>
+			<type key="calendar" type="dangi">Kalendarju Dangi</type>
+			<type key="calendar" type="ethiopic">Kalendarju Etjopiku</type>
+			<type key="calendar" type="gregorian">Kalendarju Gregorjan</type>
+			<type key="calendar" type="hebrew">Kalendarju Ebrajk</type>
+			<type key="calendar" type="islamic">Kalendarju Iżlamiku</type>
+			<type key="calendar" type="islamic-civil">Kalendarju Islamiku-Ċivili</type>
+			<type key="calendar" type="iso8601">Kalendarju ISO-8601</type>
+			<type key="calendar" type="japanese">Kalendarju Ġappuniż</type>
+			<type key="collation" type="big5han">Ordni Ċiniż Tradizzjonali (Big5)</type>
+			<type key="collation" type="dictionary" draft="unconfirmed">Ordni tad-Dizzjunarju</type>
+			<type key="collation" type="gb2312han">Ordni Ċiniż Sempliċi (GB2312)</type>
+			<type key="collation" type="phonebook">Ordni Telefonika</type>
+			<type key="collation" type="pinyin">Ordni tal-Pinjin</type>
+			<type key="collation" type="standard">Ordni Standard</type>
+			<type key="collation" type="stroke">Ordni Maħżuża</type>
+			<type key="collation" type="traditional">Tradizzjonali</type>
+			<type key="numbers" type="latn">Numri tal-Punent</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Metriku</measurementSystemName>
@@ -1104,6 +1102,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">AM</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
@@ -1268,7 +1270,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="year">
 				<displayName>Sena</displayName>
 				<relative type="-1">Is-sena li għaddiet</relative>
-				<relative type="0" draft="unconfirmed">Din is-sena</relative>
+				<relative type="0">din is-sena</relative>
 				<relative type="1">Is-sena d-dieħla</relative>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} sena ilu</relativeTimePattern>
@@ -1305,7 +1307,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="mon">
 				<relative type="-1">It-Tnejn li għadda</relative>
-				<relative type="0" draft="unconfirmed">Dan It-Tnejn</relative>
+				<relative type="0">Dan It-Tnejn</relative>
 				<relative type="1">It-Tnejn li ġej</relative>
 			</field>
 			<field type="dayperiod">
@@ -1404,12 +1406,85 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<nan>NaN</nan>
 			<timeSeparator draft="contributed">:</timeSeparator>
 		</symbols>
+		<decimalFormats numberSystem="latn">
+			<decimalFormatLength>
+				<decimalFormat>
+					<pattern draft="unconfirmed">#,##0.###</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+		</decimalFormats>
+		<scientificFormats numberSystem="latn">
+			<scientificFormatLength>
+				<scientificFormat>
+					<pattern draft="unconfirmed">#E0</pattern>
+				</scientificFormat>
+			</scientificFormatLength>
+		</scientificFormats>
+		<percentFormats numberSystem="latn">
+			<percentFormatLength>
+				<percentFormat>
+					<pattern draft="unconfirmed">#,##0%</pattern>
+				</percentFormat>
+			</percentFormatLength>
+		</percentFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="few" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="many" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="few" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="many" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="few" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="many" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="few" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="many" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="few" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="many" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="few" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="many" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="few" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="many" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="few" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="many" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="few" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="many" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="few" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="many" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="few" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="many" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="few" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="many" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="EUR">
@@ -1441,6 +1516,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
 			</unit>
+			<unit type="concentr-karat">
+				<displayName>karati</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="few">{0} kt</unitPattern>
+				<unitPattern count="many">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
 				<unitPattern count="one">{0} litru kull kilometru</unitPattern>
@@ -1448,12 +1530,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} litri kull kilometru</unitPattern>
 				<unitPattern count="other">{0} litri kull kilometru</unitPattern>
 			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabytes</displayName>
-				<unitPattern count="one">{0} megabyte</unitPattern>
-				<unitPattern count="few">{0} megabytes</unitPattern>
-				<unitPattern count="many">{0} megabytes</unitPattern>
-				<unitPattern count="other">{0} megabytes</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>terabytes</displayName>
+				<unitPattern count="one">{0} terabyte</unitPattern>
+				<unitPattern count="few">{0} terabytes</unitPattern>
+				<unitPattern count="many">{0} terabytes</unitPattern>
+				<unitPattern count="other">{0} terabytes</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>terabits</displayName>
@@ -1462,12 +1544,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} terabits</unitPattern>
 				<unitPattern count="other">{0} terabits</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>terabytes</displayName>
-				<unitPattern count="one">{0} terabyte</unitPattern>
-				<unitPattern count="few">{0} terabytes</unitPattern>
-				<unitPattern count="many">{0} terabytes</unitPattern>
-				<unitPattern count="other">{0} terabytes</unitPattern>
+			<unit type="digital-megabyte">
+				<displayName>megabytes</displayName>
+				<unitPattern count="one">{0} megabyte</unitPattern>
+				<unitPattern count="few">{0} megabytes</unitPattern>
+				<unitPattern count="many">{0} megabytes</unitPattern>
+				<unitPattern count="other">{0} megabytes</unitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>millisekondi</displayName>
@@ -1483,15 +1565,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karati</displayName>
+		</unitLength>
+		<unitLength type="short">
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
 				<unitPattern count="one">{0} kt</unitPattern>
 				<unitPattern count="few">{0} kt</unitPattern>
 				<unitPattern count="many">{0} kt</unitPattern>
 				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
-		</unitLength>
-		<unitLength type="short">
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
 				<unitPattern count="one">{0} L/km</unitPattern>
@@ -1499,18 +1581,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} L/km</unitPattern>
 				<unitPattern count="other">{0} L/km</unitPattern>
 			</unit>
-			<unit type="digital-megabit">
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="few">{0} Mb</unitPattern>
-				<unitPattern count="many">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="few">{0} MB</unitPattern>
-				<unitPattern count="many">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>TB</displayName>
+				<unitPattern count="one">{0} TB</unitPattern>
+				<unitPattern count="few">{0} TB</unitPattern>
+				<unitPattern count="many">{0} TB</unitPattern>
+				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>Tb</displayName>
@@ -1519,12 +1595,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} Tb</unitPattern>
 				<unitPattern count="other">{0} Tb</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>TB</displayName>
-				<unitPattern count="one">{0} TB</unitPattern>
-				<unitPattern count="few">{0} TB</unitPattern>
-				<unitPattern count="many">{0} TB</unitPattern>
-				<unitPattern count="other">{0} TB</unitPattern>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="few">{0} MB</unitPattern>
+				<unitPattern count="many">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="few">{0} Mb</unitPattern>
+				<unitPattern count="many">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>millisek</displayName>
@@ -1540,13 +1622,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="few">{0} kt</unitPattern>
-				<unitPattern count="many">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
-			</unit>
 		</unitLength>
 		<unitLength type="narrow">
 			<unit type="duration-millisecond">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mt_MT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mt_MT.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mt_MT.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mt_MT.xml
index 0d1b91cc43e..f5d3eb1bb67 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mt_MT.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mt_MT.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="mt"/>
 		<territory type="MT"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mua.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mua.xml
similarity index 95%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mua.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mua.xml
index 5b4d6632ca7..64e9fda0452 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mua.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mua.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="mua"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">anguiya</territory>
 			<territory type="AL">albaniya</territory>
 			<territory type="AM">armeniya</territory>
-			<territory type="AN">Sǝr ma kasǝŋ ma laŋne</territory>
 			<territory type="AO">angola</territory>
 			<territory type="AR">argentiniya</territory>
 			<territory type="AS">samoa Amerika</territory>
@@ -449,6 +447,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">comme</dayPeriod>
+							<dayPeriod type="pm">lilli</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">comme</dayPeriod>
 							<dayPeriod type="pm">lilli</dayPeriod>
@@ -601,6 +603,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mua_CM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mua_CM.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mua_CM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mua_CM.xml
index b46a19d97d5..10e738d9391 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/mua_CM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mua_CM.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="mua"/>
 		<territory type="CM"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/my.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/my.xml
similarity index 89%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/my.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/my.xml
index c8778d0e09b..64dc010d247 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/my.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/my.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11321 $"/>
-		<generation date="$Date: 2015-02-26 14:20:05 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 12384 $"/>
 		<language type="my"/>
 	</identity>
 	<localeDisplayNames>
@@ -17,7 +16,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<localeKeyTypePattern>{0} ၊ {1}</localeKeyTypePattern>
 		</localeDisplayPattern>
 		<languages>
-			<language type="ab">အက်ခါဇူအနျ</language>
+			<language type="ab">အဘ်ခါဇီရန်</language>
 			<language type="af">အာဖရိကန်းစ်</language>
 			<language type="agq">အာဂ်ဟိန်း</language>
 			<language type="ak">အာကိန်</language>
@@ -37,6 +36,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bem">ဘိန်ဘာ</language>
 			<language type="bez">ဘီနာ</language>
 			<language type="bg">ဘူဂေးရီးယား</language>
+			<language type="bgn">အနောက်ပိုင်းဘဲလိုချီ</language>
 			<language type="bm">ဘန်ဘာရာ</language>
 			<language type="bn">ဘင်္ဂါလီ</language>
 			<language type="bo">တိဘက်</language>
@@ -51,6 +51,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="co">ခိုစီကန်</language>
 			<language type="cr">ခရီး</language>
 			<language type="cs">ချက်</language>
+			<language type="cv">ချူဗက်ရှ်</language>
 			<language type="cy">ဝေလ</language>
 			<language type="da">ဒိန်းမတ်</language>
 			<language type="dak">ဒါကိုတာ</language>
@@ -158,6 +159,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lkt">လာကိုတာ</language>
 			<language type="ln">လင်ဂါလာ</language>
 			<language type="lo">လာအို</language>
+			<language type="lrc">မြောက်လူရီ</language>
 			<language type="lt">လစ္သူအာနီယံ</language>
 			<language type="lu">လူဘာ-ခါတန်ဂါ</language>
 			<language type="luo">လူအို</language>
@@ -170,7 +172,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mga">အလယ်ပိုင်း အိုင်းရစ်</language>
 			<language type="mgh">မာခူဝါ-မီအီတို</language>
 			<language type="mgo">မီတာ</language>
-			<language type="mi" draft="contributed">မောင်းရီ (နယူးဇီလန်ကျွန်းရှိ ပင်ရင်းတိုင်းရင်းသားလူမျိုး)</language>
+			<language type="mi">မောင်းရီ (နယူးဇီလန်ကျွန်းရှိ ပင်ရင်းတိုင်းရင်းသားလူမျိုး)</language>
 			<language type="mk">မာစီဒိုနီယံ</language>
 			<language type="ml">မလေးရာလမ်</language>
 			<language type="mn">မွန်ဂိုလီးယန်း</language>
@@ -183,6 +185,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mua">မန်ဒန်း</language>
 			<language type="mul">အကြိမ်များစွာ ဘာသာစကားများ</language>
 			<language type="my">ဗမာ</language>
+			<language type="mzn">မာဇန်ဒါရန်နီ</language>
 			<language type="naq">နာမာ</language>
 			<language type="nb">ဘွတ်မော်လ်</language>
 			<language type="nd">တောင်ဒီဘီလီ</language>
@@ -239,14 +242,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="so">ဆိုမာလီ</language>
 			<language type="sq">အယ်လ်ဘေးနီးယန်း</language>
 			<language type="sr">ဆားဗီးယန်း</language>
-			<language type="su">ဆူဒန်</language>
 			<language type="sv">ဆွီဒင်</language>
 			<language type="sw">ဆြာဟီလီ</language>
-			<language type="swc">ခွန်ဂို စွာဟီလီ</language>
+			<language type="sw_CD">ခွန်ဂို စွာဟီလီ</language>
 			<language type="ta">တမီးလ်</language>
 			<language type="te">တီလီဂု</language>
 			<language type="teo">တီဆို</language>
-			<language type="tg">တာဂွီခ်</language>
+			<language type="tg">တာဂျစ်</language>
 			<language type="th">ထိုင်း</language>
 			<language type="ti">တီဂ်ရင်ရာ</language>
 			<language type="tk">တခ္မင်</language>
@@ -263,6 +265,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="vai">ဗိုင်</language>
 			<language type="vi">ဗီယက်နမ်</language>
 			<language type="vun">ဗန်ဂျို</language>
+			<language type="wbp">ဝေါလ်ပါရီ</language>
 			<language type="wo">ဝူလိုဖ်</language>
 			<language type="xh">ဇိုစာ</language>
 			<language type="xog">ဆိုဂါ</language>
@@ -311,7 +314,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Mymr">မြန်မာ</script>
 			<script type="Orya">အိုရာ</script>
 			<script type="Sinh">ဆင်ဟာလ</script>
-			<script type="Sund">ဆူဒန်</script>
 			<script type="Tale">တိုင်လီ</script>
 			<script type="Taml">တမီးလ်</script>
 			<script type="Telu">တီလု</script>
@@ -405,6 +407,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CG" alt="variant">ကွန်ဂို (Republic)</territory>
 			<territory type="CH">ဆွစ်ဇလန်</territory>
 			<territory type="CI">အိုင်ဗရီကိုစ့်</territory>
+			<territory type="CI" alt="variant">အိုက်ဗရီကို့စ်</territory>
 			<territory type="CK">ကွတ် ကျွန်းစု</territory>
 			<territory type="CL">ချီလီ</territory>
 			<territory type="CM">ကင်မရွန်း</territory>
@@ -644,61 +647,74 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="calendar">ပြက္ခဒိန်</key>
 			<key type="collation">စနစ်တကျစီသော</key>
 			<key type="currency">ငွေကြေး</key>
+			<key type="hc">နာရီစက်ဝန်း(၁၂ အပြိုင် ၂၄)</key>
+			<key type="lb">လိုင်းဖြတ်တောက်မှုပုံစံ</key>
+			<key type="ms">တိုင်းတာရေးစနစ်</key>
 			<key type="numbers">ဂဏန်းနံပါတ်</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">အာရပ်ဂဏန်းခြေ</type>
-			<type type="arabext" key="numbers">တိုးချဲ့အာရပ်ဂဏန်းခြေ</type>
-			<type type="armn" key="numbers">အာမေနီယန်ဂဏန်းခြေ</type>
-			<type type="armnlow" key="numbers">အာမေနီယန်ဂဏန်းခြေအသေး</type>
-			<type type="beng" key="numbers">ဘန်ဂါလီဂဏန်းခြေ</type>
-			<type type="buddhist" key="calendar">ဗုဒ္ဓ ပြက္ခဒိန်</type>
-			<type type="chinese" key="calendar">တရုတ် ပြက္ခဒိန်</type>
-			<type type="dangi" key="calendar">ဒန်းဂိ ပြက္ခဒိန်</type>
-			<type type="deva" key="numbers">ဒီပါနာဂါရီဂဏန်းခြေ</type>
-			<type type="ducet" key="collation">ယူနီကုတ်အစဉ်လိုက်စီထားသော</type>
-			<type type="ethi" key="numbers">အီသီအိုပီးယားဂဏန်းခြေ</type>
-			<type type="ethiopic" key="calendar">အီသီယိုးပီးယား ပြက္ခဒိန်</type>
-			<type type="fullwide" key="numbers">အနံအပြည့်နှင့်ဂဏန်းခြေ</type>
-			<type type="geor" key="numbers">နိုင်ငံတကာသုံးဂဏန်းခြေ</type>
-			<type type="gregorian" key="calendar">နိုင်ငံတကာသုံး ပြက္ခဒိန်</type>
-			<type type="grek" key="numbers">ဂရိဂဏန်းခြေ</type>
-			<type type="greklow" key="numbers">ဂရိဂဏန်းခြေအသေး</type>
-			<type type="gujr" key="numbers">ဂုဂျာရာတီဂဏန်းခြေ</type>
-			<type type="guru" key="numbers">ဂူမူခီဂဏန်းခြေ</type>
-			<type type="hanidec" key="numbers">တရုတ်ဆယ်လီစနစ်ဂဏန်းခြေ</type>
-			<type type="hans" key="numbers">ရိုးရှင်းသောတရုတ်ဂဏန်းခြေ</type>
-			<type type="hansfin" key="numbers">ရိုးရှင်းသောတရုတ်ဘဏ္ဏာရေးသုံးဂဏန်းခြေ</type>
-			<type type="hant" key="numbers">ရိုးရာတရုတ်ဂဏန်းခြေ</type>
-			<type type="hantfin" key="numbers">ရိုးရာတရုတ်ဘဏ္ဏာရေးသုံးဂဏန်းခြေ</type>
-			<type type="hebr" key="numbers">ဟေဗြဲဂဏန်းခြေ</type>
-			<type type="hebrew" key="calendar">ဟီဗရူး ပြက္ခဒိန်</type>
-			<type type="indian" key="calendar">အိန္ဒြိယ အမျိုးသား ပြက္ခဒိန်</type>
-			<type type="islamic" key="calendar">အစ္စလာမ် ပြက္ခဒိန်</type>
-			<type type="iso8601" key="calendar">iso8601</type>
-			<type type="japanese" key="calendar">ဂျပန် ပြက္ခဒိန်</type>
-			<type type="jpan" key="numbers">ဂျပန်ဂဏန်းခြေ</type>
-			<type type="jpanfin" key="numbers">ဂျပန်ဘဏ္ဏာရေးသုံးဂဏန်းခြေ</type>
-			<type type="khmr" key="numbers">ခမာဂဏန်းခြေ</type>
-			<type type="knda" key="numbers">ခန္နဒါဂဏန်းခြေ</type>
-			<type type="laoo" key="numbers">လာအိုဂဏန်းခြေ</type>
-			<type type="latn" key="numbers">အနောက်တိုင်းဂဏန်းခြေ</type>
-			<type type="mlym" key="numbers">မလာရာလမ်ဂဏန်းခြေ</type>
-			<type type="mymr" key="numbers">မြန်မာဂဏန်းခြေ</type>
-			<type type="mymrshan" key="numbers">ရှမ်းဂဏန်းခြေ</type>
-			<type type="orya" key="numbers">ဩရီရာဂဏန်းခြေ</type>
-			<type type="persian" key="calendar">ပါရှား ပြက္ခဒိန်</type>
-			<type type="phonebook" key="collation">ဖုန်းစာအုပ် အစီအစဉ်</type>
-			<type type="roc" key="calendar">မင်ဂုအို ပြက္ခဒိန်</type>
-			<type type="roman" key="numbers">ရောမဂဏန်းခြေ</type>
-			<type type="romanlow" key="numbers">ရောမဂဏန်းခြေအသေး</type>
-			<type type="search" key="collation">ယေဘုယျရှာခြင်း</type>
-			<type type="standard" key="collation">ပုံမှန်စီသော</type>
-			<type type="taml" key="numbers">ရိုးရာတမီးလ်ဂဏန်းခြေ</type>
-			<type type="tamldec" key="numbers">တမီးလ်ဂဏန်းခြေ</type>
-			<type type="telu" key="numbers">တီရီဂုဂဏန်းခြေ</type>
-			<type type="thai" key="numbers">ထိုင်းဂဏန်းခြေ</type>
-			<type type="tibt" key="numbers">တိဘက်ဂဏန်းခြေ</type>
+			<type key="calendar" type="buddhist">ဗုဒ္ဓ ပြက္ခဒိန်</type>
+			<type key="calendar" type="chinese">တရုတ် ပြက္ခဒိန်</type>
+			<type key="calendar" type="dangi">ဒန်းဂိ ပြက္ခဒိန်</type>
+			<type key="calendar" type="ethiopic">အီသီယိုးပီးယား ပြက္ခဒိန်</type>
+			<type key="calendar" type="gregorian">နိုင်ငံတကာသုံး ပြက္ခဒိန်</type>
+			<type key="calendar" type="hebrew">ဟီဗရူး ပြက္ခဒိန်</type>
+			<type key="calendar" type="indian">အိန္ဒြိယ အမျိုးသား ပြက္ခဒိန်</type>
+			<type key="calendar" type="islamic">အစ္စလာမ် ပြက္ခဒိန်</type>
+			<type key="calendar" type="iso8601">ISO-8601 ပြက္ခဒိန်</type>
+			<type key="calendar" type="japanese">ဂျပန် ပြက္ခဒိန်</type>
+			<type key="calendar" type="persian">ပါရှား ပြက္ခဒိန်</type>
+			<type key="calendar" type="roc">မင်ဂုအို ပြက္ခဒိန်</type>
+			<type key="collation" type="ducet">ယူနီကုတ်အစဉ်လိုက်စီထားသော</type>
+			<type key="collation" type="phonebook">ဖုန်းစာအုပ် အစီအစဉ်</type>
+			<type key="collation" type="search">ယေဘုယျရှာခြင်း</type>
+			<type key="collation" type="standard">ပုံမှန်စီသော</type>
+			<type key="hc" type="h11">၁၂ နာရီ စနစ် (၀–၁၁)</type>
+			<type key="hc" type="h12">၁၂ နာရီစနစ် (၁–၁၂)</type>
+			<type key="hc" type="h23">၂၄ နာရီ စနစ် (၀–၂၃)</type>
+			<type key="hc" type="h24">၂၄ နာရီ စနစ်(၁–၂၄)</type>
+			<type key="lb" type="loose">လျော့ရဲသော လိုင်းဖြတ်တောင်မှုပုံစံ</type>
+			<type key="lb" type="normal">ပုံမှန်လိုင်းဖြတ်တောက်မှုပုံစံ</type>
+			<type key="lb" type="strict">တင်းကြပ်သောလိုင်းဖြတ်တောက်မှုပုံစံ</type>
+			<type key="ms" type="metric">မက်ထရစ်စနစ်</type>
+			<type key="ms" type="uksystem">ဗြိတိသျှတိုင်းတာစနစ်</type>
+			<type key="ms" type="ussystem">အမေရိကန်တိုင်းတာစနစ်</type>
+			<type key="numbers" type="arab">အာရပ်ဂဏန်းခြေ</type>
+			<type key="numbers" type="arabext">တိုးချဲ့အာရပ်ဂဏန်းခြေ</type>
+			<type key="numbers" type="armn">အာမေနီယန်ဂဏန်းခြေ</type>
+			<type key="numbers" type="armnlow">အာမေနီယန်ဂဏန်းခြေအသေး</type>
+			<type key="numbers" type="beng">ဘန်ဂါလီဂဏန်းခြေ</type>
+			<type key="numbers" type="deva">ဒီပါနာဂါရီဂဏန်းခြေ</type>
+			<type key="numbers" type="ethi">အီသီအိုပီးယားဂဏန်းခြေ</type>
+			<type key="numbers" type="fullwide">အနံအပြည့်နှင့်ဂဏန်းခြေ</type>
+			<type key="numbers" type="geor">နိုင်ငံတကာသုံးဂဏန်းခြေ</type>
+			<type key="numbers" type="grek">ဂရိဂဏန်းခြေ</type>
+			<type key="numbers" type="greklow">ဂရိဂဏန်းခြေအသေး</type>
+			<type key="numbers" type="gujr">ဂုဂျာရာတီဂဏန်းခြေ</type>
+			<type key="numbers" type="guru">ဂူမူခီဂဏန်းခြေ</type>
+			<type key="numbers" type="hanidec">တရုတ်ဆယ်လီစနစ်ဂဏန်းခြေ</type>
+			<type key="numbers" type="hans">ရိုးရှင်းသောတရုတ်ဂဏန်းခြေ</type>
+			<type key="numbers" type="hansfin">ရိုးရှင်းသောတရုတ်ဘဏ္ဏာရေးသုံးဂဏန်းခြေ</type>
+			<type key="numbers" type="hant">ရိုးရာတရုတ်ဂဏန်းခြေ</type>
+			<type key="numbers" type="hantfin">ရိုးရာတရုတ်ဘဏ္ဏာရေးသုံးဂဏန်းခြေ</type>
+			<type key="numbers" type="hebr">ဟေဗြဲဂဏန်းခြေ</type>
+			<type key="numbers" type="jpan">ဂျပန်ဂဏန်းခြေ</type>
+			<type key="numbers" type="jpanfin">ဂျပန်ဘဏ္ဏာရေးသုံးဂဏန်းခြေ</type>
+			<type key="numbers" type="khmr">ခမာဂဏန်းခြေ</type>
+			<type key="numbers" type="knda">ခန္နဒါဂဏန်းခြေ</type>
+			<type key="numbers" type="laoo">လာအိုဂဏန်းခြေ</type>
+			<type key="numbers" type="latn">အနောက်တိုင်းဂဏန်းခြေ</type>
+			<type key="numbers" type="mlym">မလာရာလမ်ဂဏန်းခြေ</type>
+			<type key="numbers" type="mymr">မြန်မာဂဏန်းခြေ</type>
+			<type key="numbers" type="mymrshan">ရှမ်းဂဏန်းခြေ</type>
+			<type key="numbers" type="orya">ဩရီရာဂဏန်းခြေ</type>
+			<type key="numbers" type="roman">ရောမဂဏန်းခြေ</type>
+			<type key="numbers" type="romanlow">ရောမဂဏန်းခြေအသေး</type>
+			<type key="numbers" type="taml">ရိုးရာတမီးလ်ဂဏန်းခြေ</type>
+			<type key="numbers" type="tamldec">တမီးလ်ဂဏန်းခြေ</type>
+			<type key="numbers" type="telu">တီရီဂုဂဏန်းခြေ</type>
+			<type key="numbers" type="thai">ထိုင်းဂဏန်းခြေ</type>
+			<type key="numbers" type="tibt">တိဘက်ဂဏန်းခြေ</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">မက်ထရစ်စနစ်</measurementSystemName>
@@ -716,6 +732,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<exemplarCharacters type="auxiliary">[ၐ ၑ ဨ ဢ ၒ ၓ ၔ ၕ ၖ ၗ \u1058 \u1059]</exemplarCharacters>
 		<exemplarCharacters type="index" draft="contributed">[က ခ ဂ ဃ င စ ဆ ဇ ဈ ဉ ည ဋ ဌ ဍ ဎ ဏ တ ထ ဒ ဓ န ပ ဖ ဗ ဘ မ ယ ရ လ ဝ သ ဟ ဠ အ]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[၊ ။ ‘ ’ “ ”]</exemplarCharacters>
+		<ellipsis type="final">{0}…</ellipsis>
+		<ellipsis type="initial">…{0}</ellipsis>
+		<ellipsis type="medial">{0}…{1}</ellipsis>
+		<ellipsis type="word-final">{0} …</ellipsis>
+		<ellipsis type="word-initial">… {0}</ellipsis>
+		<ellipsis type="word-medial">{0} … {1}</ellipsis>
+		<moreInformation>?</moreInformation>
 	</characters>
 	<delimiters>
 		<quotationStart>“</quotationStart>
@@ -771,6 +794,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E၊ d</dateFormatItem>
 						<dateFormatItem id="Gy">G y</dateFormatItem>
 						<dateFormatItem id="GyMMM">G MMM y</dateFormatItem>
@@ -914,6 +938,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="11">နို</month>
 							<month type="12">ဒီ</month>
 						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">ဇ</month>
+							<month type="2">ဖ</month>
+							<month type="3">မ</month>
+							<month type="4">ဧ</month>
+							<month type="5">မ</month>
+							<month type="6">ဇ</month>
+							<month type="7">ဇ</month>
+							<month type="8">ဩ</month>
+							<month type="9">စ</month>
+							<month type="10">အ</month>
+							<month type="11">န</month>
+							<month type="12">ဒ</month>
+						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">ဇန်နဝါရီ</month>
 							<month type="2">ဖေဖော်ဝါရီ</month>
@@ -985,6 +1023,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<day type="fri">သောကြာ</day>
 							<day type="sat">စနေ</day>
 						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun">တ</day>
+							<day type="mon">တ</day>
+							<day type="tue">အ</day>
+							<day type="wed">ဗ</day>
+							<day type="thu">က</day>
+							<day type="fri">သ</day>
+							<day type="sat">စ</day>
+						</dayWidth>
 						<dayWidth type="short">
 							<day type="sun">တနင်္ဂနွေ</day>
 							<day type="mon">တနင်္လာ</day>
@@ -1023,6 +1070,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<day type="fri">သ</day>
 							<day type="sat">စ</day>
 						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">တနင်္ဂနွေ</day>
+							<day type="mon">တနင်္လာ</day>
+							<day type="tue">အင်္ဂါ</day>
+							<day type="wed">ဗုဒ္ဓဟူး</day>
+							<day type="thu">ကြာသပတေး</day>
+							<day type="fri">သောကြာ</day>
+							<day type="sat">စနေ</day>
+						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">တနင်္ဂနွေ</day>
 							<day type="mon">တနင်္လာ</day>
@@ -1078,22 +1134,76 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">ညသန်းခေါင်ယံ</dayPeriod>
 							<dayPeriod type="am">နံနက်</dayPeriod>
 							<dayPeriod type="noon">မွန်းတည့်</dayPeriod>
 							<dayPeriod type="pm">ညနေ</dayPeriod>
+							<dayPeriod type="morning1">မနက်တွင်</dayPeriod>
+							<dayPeriod type="afternoon1">နေ့လည်ခင်းတွင်</dayPeriod>
+							<dayPeriod type="evening1">ညနေခင်းတွင်</dayPeriod>
+							<dayPeriod type="night1">ညတွင်</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">ညသန်းခေါင်ယံ</dayPeriod>
+							<dayPeriod type="am">နံနက်</dayPeriod>
+							<dayPeriod type="noon">မွန်းတည့်</dayPeriod>
+							<dayPeriod type="pm">ညနေ</dayPeriod>
+							<dayPeriod type="morning1">မနက်၁</dayPeriod>
+							<dayPeriod type="afternoon1">နေ့လည်ခင်း၁</dayPeriod>
+							<dayPeriod type="evening1">ညနေခင်း၁</dayPeriod>
+							<dayPeriod type="night1">ည၁</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">ညသန်းခေါင်ယံ</dayPeriod>
 							<dayPeriod type="am">နံနက်</dayPeriod>
 							<dayPeriod type="noon">မွန်းတည့်</dayPeriod>
 							<dayPeriod type="pm">ညနေ</dayPeriod>
+							<dayPeriod type="morning1">မနက်တွင်</dayPeriod>
+							<dayPeriod type="afternoon1">နေ့လည်ခင်းတွင်</dayPeriod>
+							<dayPeriod type="evening1">ညနေခင်းတွင်</dayPeriod>
+							<dayPeriod type="night1">ညတွင်</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">သန်းခေါင်ယံ</dayPeriod>
+							<dayPeriod type="am">နံနက်</dayPeriod>
+							<dayPeriod type="noon">မွန်းတည့်</dayPeriod>
+							<dayPeriod type="pm">ညနေ</dayPeriod>
+							<dayPeriod type="morning1">နံနက်</dayPeriod>
+							<dayPeriod type="afternoon1">နေ့လည်</dayPeriod>
+							<dayPeriod type="evening1">ညနေ</dayPeriod>
+							<dayPeriod type="night1">ည</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">သန်းခေါင်ယံ</dayPeriod>
+							<dayPeriod type="am">နံနက်</dayPeriod>
+							<dayPeriod type="noon">မွန်းတည့်</dayPeriod>
+							<dayPeriod type="pm">ညနေ</dayPeriod>
+							<dayPeriod type="morning1">နံနက်</dayPeriod>
+							<dayPeriod type="afternoon1">နေ့လည်</dayPeriod>
+							<dayPeriod type="evening1">ညနေ</dayPeriod>
+							<dayPeriod type="night1">ည</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">သန်းခေါင်ယံ</dayPeriod>
+							<dayPeriod type="am">နံနက်</dayPeriod>
+							<dayPeriod type="noon">မွန်းတည့်</dayPeriod>
+							<dayPeriod type="pm">ညနေ</dayPeriod>
+							<dayPeriod type="morning1">နံနက်</dayPeriod>
+							<dayPeriod type="afternoon1">နေ့လည်</dayPeriod>
+							<dayPeriod type="evening1">ညနေ</dayPeriod>
+							<dayPeriod type="night1">ည</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
 						<era type="0">ခရစ်တော် မပေါ်မီကာလ</era>
+						<era type="0" alt="variant">ဘီစီအီး</era>
 						<era type="1">ခရစ်တော် ပေါ်ထွန်းပြီးကာလ</era>
+						<era type="1" alt="variant">စီအီး</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">ဘီစီ</era>
@@ -1326,8 +1436,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">လွန်ခဲ့သော{0}နှစ်</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="year-short">
+				<displayName>နှစ်</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0}နှစ်အတွင်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">လွန်ခဲ့သော{0}နှစ်</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-narrow">
+				<displayName>နှစ်</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0}နှစ်အတွင်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">လွန်ခဲ့သော{0}နှစ်</relativeTimePattern>
+				</relativeTime>
+			</field>
 			<field type="quarter">
 				<displayName>သုံးလပတ်</displayName>
+				<relative type="-1">ပြီးခဲ့သောသုံးလပတ်</relative>
+				<relative type="0">ယခုသုံးလပတ်</relative>
+				<relative type="1">နောက်လာမည့်သုံးလပတ်</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">သုံးလပတ်{0}ခု အတွင်း</relativeTimePattern>
 				</relativeTime>
@@ -1337,6 +1468,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>သုံးလပတ်</displayName>
+				<relative type="-1">ပြီးခဲ့သောသုံးလပတ်</relative>
+				<relative type="0">ယခုသုံးလပတ်</relative>
+				<relative type="1">နောက်လာမည့်သုံးလပတ်</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">သုံးလပတ်{0}ခု အတွင်း</relativeTimePattern>
 				</relativeTime>
@@ -1346,6 +1480,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>သုံးလပတ်</displayName>
+				<relative type="-1">ပြီးခဲ့သောသုံးလပတ်</relative>
+				<relative type="0">ယခုသုံးလပတ်</relative>
+				<relative type="1">နောက်လာမည့်သုံးလပတ်</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">သုံးလပတ်{0}ခု အတွင်း</relativeTimePattern>
 				</relativeTime>
@@ -1365,6 +1502,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">လွန်ခဲ့သော{0}လ</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="month-short">
+				<displayName>လ</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0}လအတွင်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">လွန်ခဲ့သော{0}လ</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-narrow">
+				<displayName>လ</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0}လအတွင်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">လွန်ခဲ့သော{0}လ</relativeTimePattern>
+				</relativeTime>
+			</field>
 			<field type="week">
 				<displayName>ပတ်</displayName>
 				<relative type="-1">ပြီးခဲ့သောအပတ်</relative>
@@ -1377,6 +1532,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">လွန်ခဲ့သော{0}ပတ်</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="week-short">
+				<displayName>ပတ်</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0}ပတ်အတွင်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">လွန်ခဲ့သော{0}ပတ်</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-narrow">
+				<displayName>ပတ်</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0}ပတ်အတွင်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">လွန်ခဲ့သော{0}ပတ်</relativeTimePattern>
+				</relativeTime>
+			</field>
 			<field type="day">
 				<displayName>ရက်</displayName>
 				<relative type="-2">တနေ့က</relative>
@@ -1391,6 +1564,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">လွန်ခဲ့သော{0}ရက်</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="day-short">
+				<displayName>ရက်</displayName>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">လွန်ခဲ့သော{0}ရက်</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-narrow">
+				<displayName>ရက်</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0}ရက်အတွင်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">လွန်ခဲ့သော{0}ရက်</relativeTimePattern>
+				</relativeTime>
+			</field>
 			<field type="weekday">
 				<displayName>နေ့</displayName>
 			</field>
@@ -1399,36 +1587,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="0">ဒီတနင်္ဂနွေ</relative>
 				<relative type="1">နောက်တနင်္ဂနွေ</relative>
 			</field>
+			<field type="sun-short">
+				<relative type="-1">ပြီးခဲ့သောတနင်္ဂနွေ</relative>
+				<relative type="0">ဒီတနင်္ဂနွေ</relative>
+				<relative type="1">နောက်တနင်္ဂနွေ</relative>
+			</field>
+			<field type="sun-narrow">
+				<relative type="-1">ပြီးခဲ့သောတနင်္ဂနွေ</relative>
+				<relative type="0">ဒီတနင်္ဂနွေ</relative>
+				<relative type="1">နောက်တနင်္ဂနွေ</relative>
+			</field>
 			<field type="mon">
 				<relative type="-1">ပြီးခဲ့သောတနင်္လာ</relative>
 				<relative type="0">ဒီတနင်္လာ</relative>
 				<relative type="1">နောက်တနင်္လာ</relative>
 			</field>
+			<field type="mon-short">
+				<relative type="-1">ပြီးခဲ့သောတနင်္လာ</relative>
+				<relative type="0">ဒီတနင်္လာ</relative>
+				<relative type="1">နောက်တနင်္လာ</relative>
+			</field>
+			<field type="mon-narrow">
+				<relative type="-1">ပြီးခဲ့သောတနင်္လာ</relative>
+				<relative type="0">ဒီတနင်္လာ</relative>
+				<relative type="1">နောက်တနင်္လာ</relative>
+			</field>
 			<field type="tue">
 				<relative type="-1">ပြီးခဲ့သောအင်္ဂါ</relative>
 				<relative type="0">ဒီအင်္ဂါ</relative>
 				<relative type="1">နောက်အင်္ဂါ</relative>
 			</field>
+			<field type="tue-short">
+				<relative type="-1">ပြီးခဲ့သောအင်္ဂါ</relative>
+				<relative type="0">ဒီအင်္ဂါ</relative>
+				<relative type="1">နောက်အင်္ဂါ</relative>
+			</field>
+			<field type="tue-narrow">
+				<relative type="-1">ပြီးခဲ့သောအင်္ဂါ</relative>
+				<relative type="0">ဒီအင်္ဂါ</relative>
+				<relative type="1">နောက်အင်္ဂါ</relative>
+			</field>
 			<field type="wed">
 				<relative type="-1">ပြီးခဲ့သော ဗုဒ္ဓဟူး</relative>
 				<relative type="0">ဒီဗုဒ္ဓဟူး</relative>
 				<relative type="1">နောက်ဗုဒ္ဓဟူး</relative>
 			</field>
+			<field type="wed-short">
+				<relative type="-1">ပြီးခဲ့သော ဗုဒ္ဓဟူး</relative>
+				<relative type="0">ဒီဗုဒ္ဓဟူး</relative>
+				<relative type="1">နောက်ဗုဒ္ဓဟူး</relative>
+			</field>
+			<field type="wed-narrow">
+				<relative type="-1">ပြီးခဲ့သော ဗုဒ္ဓဟူး</relative>
+				<relative type="0">ဒီဗုဒ္ဓဟူး</relative>
+				<relative type="1">နောက်ဗုဒ္ဓဟူး</relative>
+			</field>
 			<field type="thu">
 				<relative type="-1">ပြီးခဲ့သောကြာသပတေး</relative>
 				<relative type="0">ဒီကြာသပတေး</relative>
 				<relative type="1">နောက်ကြာသပတေး</relative>
 			</field>
+			<field type="thu-short">
+				<relative type="-1">ပြီးခဲ့သောကြာသပတေး</relative>
+				<relative type="0">ဒီကြာသပတေး</relative>
+				<relative type="1">နောက်ကြာသပတေး</relative>
+			</field>
+			<field type="thu-narrow">
+				<relative type="-1">ပြီးခဲ့သောကြာသပတေး</relative>
+				<relative type="0">ဒီကြာသပတေး</relative>
+				<relative type="1">နောက်ကြာသပတေး</relative>
+			</field>
 			<field type="fri">
 				<relative type="-1">ပြီးခဲ့သောသောကြာ</relative>
 				<relative type="0">ဒီသောကြာ</relative>
 				<relative type="1">နောက်သောကြာ</relative>
 			</field>
+			<field type="fri-short">
+				<relative type="-1">ပြီးခဲ့သောသောကြာ</relative>
+				<relative type="0">ဒီသောကြာ</relative>
+				<relative type="1">နောက်သောကြာ</relative>
+			</field>
+			<field type="fri-narrow">
+				<relative type="-1">ပြီးခဲ့သောသောကြာ</relative>
+				<relative type="0">ဒီသောကြာ</relative>
+				<relative type="1">နောက်သောကြာ</relative>
+			</field>
 			<field type="sat">
 				<relative type="-1">ပြီးခဲ့သောစနေ</relative>
 				<relative type="0">ဒီစနေ</relative>
 				<relative type="1">နောက်စနေ</relative>
 			</field>
+			<field type="sat-short">
+				<relative type="-1">ပြီးခဲ့သောစနေ</relative>
+				<relative type="0">ဒီစနေ</relative>
+				<relative type="1">နောက်စနေ</relative>
+			</field>
+			<field type="sat-narrow">
+				<relative type="-1">ပြီးခဲ့သောစနေ</relative>
+				<relative type="0">ဒီစနေ</relative>
+				<relative type="1">နောက်စနေ</relative>
+			</field>
 			<field type="dayperiod">
 				<displayName>နံနက်/ညနေ</displayName>
 			</field>
@@ -1441,6 +1699,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">လွန်ခဲ့သော{0}နာရီ</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="hour-short">
+				<displayName>နာရီ</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0}နာရီအတွင်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">လွန်ခဲ့သော{0}နာရီ</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-narrow">
+				<displayName>နာရီ</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0}နာရီအတွင်း</relativeTimePattern>
+				</relativeTime>
+			</field>
 			<field type="minute">
 				<displayName>မိနစ်</displayName>
 				<relativeTime type="future">
@@ -1450,6 +1723,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">လွန်ခဲ့သော{0}မိနစ်</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="minute-short">
+				<displayName>မိနစ်</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0}မိနစ်အတွင်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">လွန်ခဲ့သော{0}မိနစ်</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-narrow">
+				<displayName>မိနစ်</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0}မိနစ်အတွင်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">လွန်ခဲ့သော{0}မိနစ်</relativeTimePattern>
+				</relativeTime>
+			</field>
 			<field type="second">
 				<displayName>စက္ကန့်</displayName>
 				<relative type="0">ယခု</relative>
@@ -1460,6 +1751,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">လွန်ခဲ့သော{0}စက္ကန့်</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="second-short">
+				<displayName>စက္ကန့်</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0}စက္ကန့်အတွင်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">လွန်ခဲ့သော{0}စက္ကန့်</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-narrow">
+				<displayName>စက္ကန့်</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0}စက္ကန့်အတွင်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">လွန်ခဲ့သော{0}စက္ကန့်</relativeTimePattern>
+				</relativeTime>
+			</field>
 			<field type="zone">
 				<displayName>ဇုန်</displayName>
 			</field>
@@ -1472,15 +1781,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<regionFormat type="daylight">{0} (+1)</regionFormat>
 			<regionFormat type="standard">{0} (စံတော်ချိန်)</regionFormat>
 			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>ချောင်ချင်း</exemplarCity>
-			</zone>
-			<zone type="Asia/Harbin">
-				<exemplarCity>ဟာဘင်</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>ခါရှီးဂ်</exemplarCity>
-			</zone>
+			<!-- <zone type="Asia/Chongqing">
+				 <exemplarCity>ချောင်ချင်း</exemplarCity>
+				 </zone>
+				 <zone type="Asia/Harbin">
+				 <exemplarCity>ဟာဘင်</exemplarCity>
+				 </zone>
+				 <zone type="Asia/Kashgar">
+				 <exemplarCity>ခါရှီးဂ်</exemplarCity>
+				 </zone>
+			-->
 			<zone type="Etc/Unknown">
 				<exemplarCity>အမည်မသိသောမြို့</exemplarCity>
 			</zone>
@@ -2348,6 +2658,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>ဖို့တ် မိုရက်စ်ဘီ</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>ဘူဂန်ဗီးလီးယား</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>မနီလာ</exemplarCity>
 			</zone>
@@ -2432,6 +2745,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>အီရူခူတ်</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>ချီတာ</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>ယူခူးတ်စ်</exemplarCity>
 			</zone>
@@ -2450,6 +2766,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>မာဂါဒန်း</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>ဆရီနီကိုလူ့ဇ်</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>ခမ်ချာ့ခါ</exemplarCity>
 			</zone>
@@ -3702,6 +4021,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤ #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">¤ 0ထောင်</pattern>
+					<pattern type="10000" count="other">¤ 0သောင်း</pattern>
+					<pattern type="100000" count="other">¤ 0သိန်း</pattern>
+					<pattern type="1000000" count="other">¤ 0သန်း</pattern>
+					<pattern type="10000000" count="other">¤ 0ကုဋေ</pattern>
+					<pattern type="100000000" count="other">¤ 00ကုဋေ</pattern>
+					<pattern type="1000000000" count="other">¤ ကုဋေ000</pattern>
+					<pattern type="10000000000" count="other">¤ ကုဋေ0000</pattern>
+					<pattern type="100000000000" count="other">¤ 0000ကုဋေ</pattern>
+					<pattern type="1000000000000" count="other">¤ ကုဋေ0သိန်း</pattern>
+					<pattern type="10000000000000" count="other">¤ ကုဋေ0သန်း</pattern>
+					<pattern type="100000000000000" count="other">¤ 0ကောဋိ</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencies>
@@ -3743,6 +4078,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="AWG">
 				<displayName>အရူဘန် ဂင်းဒါး</displayName>
+				<displayName count="other">အရူဘန် ဂင်းဒါး</displayName>
 			</currency>
 			<currency type="AZN">
 				<displayName>အဇာဘိုင်ဂျန်မာနတ်</displayName>
@@ -3778,10 +4114,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="BMD">
 				<displayName>ဘာမူဒါ ဒေါ်လာ</displayName>
 				<displayName count="other">ဘာမူဒါ ဒေါ်လာ</displayName>
+				<symbol draft="contributed">BMD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BND">
 				<displayName>ဘရူနိုင်း ဒေါ်လာ</displayName>
 				<displayName count="other">ဘရူနိုင်း ဒေါ်လာ</displayName>
+				<symbol draft="contributed">BND</symbol>
 			</currency>
 			<currency type="BOB">
 				<displayName>ဘိုလီဘီယံ ဘိုလီဘီအားနို</displayName>
@@ -3808,6 +4147,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="BWP">
 				<displayName>ဘော့စ်ဝါနာ ပုလ</displayName>
+				<displayName count="other">ဘော့စ်ဝါနာ ပုလ</displayName>
 			</currency>
 			<currency type="BYB">
 				<displayName>ဘီလာရုစ် ရူဘယ်အသစ် (၁၉၉၄–၁၉၉၉)</displayName>
@@ -3819,11 +4159,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="BZD">
 				<displayName>ဘေလီဇ် ဒေါ်လာ</displayName>
 				<displayName count="other">ဘေလီဇ် ဒေါ်လာ</displayName>
+				<symbol alt="narrow" draft="contributed">ဒေါ်လာ</symbol>
 			</currency>
 			<currency type="CAD">
 				<displayName>ကနေဒါ ဒေါ်လာ</displayName>
 				<displayName count="other">ကနေဒါ ဒေါ်လာ</displayName>
 				<symbol>CA$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CDF">
 				<displayName>ကွန်ဂို ဖရန့်</displayName>
@@ -3849,6 +4191,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="CRC">
 				<displayName>ကော့စ်တာရီကာ ခိုလုံး</displayName>
 				<displayName count="other">ကော့စ်တာရီကာ ခိုလုံး</displayName>
+				<symbol draft="contributed">စီအာစီ</symbol>
 			</currency>
 			<currency type="CUC">
 				<displayName>နိုင်ငံခြားငွေလဲလှယ်နိုင်သော ကျူးဘားပီဆိုငွေ</displayName>
@@ -3856,10 +4199,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="CUP">
 				<displayName>ကျူးဘား ပီဆို</displayName>
+				<displayName count="other">ကျူးဘား ပီဆို</displayName>
 			</currency>
 			<currency type="CVE">
 				<displayName>ခေ့ပ်ဗာဒူ အက်စ်ခူဒို</displayName>
 				<displayName count="other">ခေ့ပ်ဗာဒူ အက်စ်ခူဒို</displayName>
+				<symbol draft="contributed">CVE</symbol>
 			</currency>
 			<currency type="CYP">
 				<displayName>ဆိုက်ပရက်စ် ပေါင်</displayName>
@@ -3881,6 +4226,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="DOP">
 				<displayName>ဒိုမီနီကန် ပီဆို</displayName>
+				<displayName count="other">ဒိုမီနီကန် ပီဆို</displayName>
 			</currency>
 			<currency type="DZD">
 				<displayName>အဲလ်ဂျီရီယန် ဒီနာ</displayName>
@@ -3929,21 +4275,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="GHS">
 				<displayName>ဂါနာ ဆဲဒီ</displayName>
 				<displayName count="other">ဂါနာ ဆဲဒီ</displayName>
+				<symbol draft="contributed">GHS</symbol>
 			</currency>
 			<currency type="GIP">
 				<displayName>ဂျီဘရော်လ်တာ ပေါင်</displayName>
+				<displayName count="other">ဂျီဘရော်လ်တာ ပေါင်</displayName>
 			</currency>
 			<currency type="GMD">
 				<displayName>ဂန်ဘီယာ ဒါလာစီ</displayName>
 				<displayName count="other">ဂန်ဘီယာ ဒါလာစီ</displayName>
+				<symbol draft="contributed">GMD</symbol>
 			</currency>
 			<currency type="GNF">
 				<displayName>ဂီးနီ ဖရန့်</displayName>
 				<displayName count="other">ဂီရာနာ ဖရန့်</displayName>
+				<symbol draft="contributed">GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GTQ">
 				<displayName>ဂွာတီမာလာ ခက်ဇော်လ်</displayName>
 				<displayName count="other">ဂွာတီမာလာ ခက်ဇော်လ်</displayName>
+				<symbol draft="contributed">GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GYD">
 				<displayName>ဂူရာနာ ဒေါ်လာ</displayName>
@@ -3951,6 +4304,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="HKD">
 				<displayName>ဟောင်ကောင် ဒေါ်လာ</displayName>
+				<displayName count="other">ဟောင်ကောင် ဒေါ်လာ</displayName>
 				<symbol>HK$</symbol>
 			</currency>
 			<currency type="HNL">
@@ -4000,6 +4354,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="JMD">
 				<displayName>ဂျမေကာ ဒေါ်လာ</displayName>
+				<displayName count="other">ဂျမေကာ ဒေါ်လာ</displayName>
 			</currency>
 			<currency type="JOD">
 				<displayName>ဂျော်ဒန်ဒီနား</displayName>
@@ -4062,6 +4417,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="LRD">
 				<displayName>လိုင်ဘေးရီးယား ဒေါ်လာ</displayName>
 				<displayName count="other">လိုင်ဘေးရီးယား ဒေါ်လာ</displayName>
+				<symbol draft="contributed">LRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="LTL">
 				<displayName>လစ်သူယေးနီးယားလီတားစ်</displayName>
@@ -4107,6 +4464,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="MRO">
 				<displayName>မောရီတာနီအာအူဂီးယာ</displayName>
 				<displayName count="other">မောရီတာနီအာအူဂီးယာ</displayName>
+				<symbol draft="contributed">MRO</symbol>
 			</currency>
 			<currency type="MUR">
 				<displayName>မော်ရေရှားစ် ရူပီ</displayName>
@@ -4140,6 +4498,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="NGN">
 				<displayName>နိုင်ဂျီးရီးယားနိုင်းရာ</displayName>
 				<displayName count="other">နိုင်ဂျီးရီးယားနိုင်းရာ</displayName>
+				<symbol draft="contributed">NGN</symbol>
+				<symbol alt="narrow" draft="contributed">₦</symbol>
 			</currency>
 			<currency type="NIO">
 				<displayName>နီကာရာဂွာ ခိုးဒိုဘာ</displayName>
@@ -4180,6 +4540,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="PKR">
 				<displayName>ပါကစ္စတန် ရူပီး</displayName>
+				<displayName count="other">ပါကစ္စတန် ရူပီး</displayName>
 			</currency>
 			<currency type="PLN">
 				<displayName>ပိုလန် ဇ‌လော့တီ</displayName>
@@ -4203,6 +4564,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="RUB">
 				<displayName>ရုရှ ရူဘယ်</displayName>
+				<displayName count="other">ရုရှ ရူဘယ်</displayName>
 			</currency>
 			<currency type="RUR">
 				<displayName>ရုရှ ရူဘယ် (၁၉၉၁–၁၉၉၈)</displayName>
@@ -4241,10 +4603,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="SHP">
 				<displayName>စိန့်ဟဲလီနာ ပေါင်</displayName>
 				<displayName count="other">စိန့်ဟဲလီနာ ပေါင်</displayName>
+				<symbol draft="contributed">SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SLL">
 				<displayName>ဆီအဲရာ လီအိုနီယန် လီအိုနီ</displayName>
 				<displayName count="other">ဆီအဲရာ လီအိုနီယန် လီအိုနီ</displayName>
+				<symbol draft="contributed">SLL</symbol>
 			</currency>
 			<currency type="SOS">
 				<displayName>ဆိုမာလီသျှီလင်</displayName>
@@ -4326,6 +4691,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>အမေရိကန် ဒေါ်လာ</displayName>
 				<displayName count="other">အမေရိကန် ဒေါ်လာ</displayName>
 				<symbol>US$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="USN">
 				<displayName>အမေရိကန် ဒေါ်လာ (နောက်နေ့)</displayName>
@@ -4386,8 +4752,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>CFA</symbol>
 			</currency>
 			<currency type="XPF">
-				<displayName>XPFဖရန့်</displayName>
-				<displayName count="other">XPFဖရန့်</displayName>
+				<displayName>CFP ဖရန့်</displayName>
+				<displayName count="other">CFP ဖရန့်</displayName>
 				<symbol>CFPF</symbol>
 			</currency>
 			<currency type="XPT">
@@ -4434,6 +4800,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>မီတာ/စက္ကန့်နှစ်ထပ်ကိန်း</displayName>
 				<unitPattern count="other">{0} မီတာ/စက္ကန့်နှစ်ထပ်ကိန်း</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="other">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>ရေဒီအန်းစ်</displayName>
+				<unitPattern count="other">{0}ရေဒီအန်းစ်</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>ဒီဂရီ</displayName>
+				<unitPattern count="other">{0}ဒီဂရီ</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>မိနစ်</displayName>
 				<unitPattern count="other">{0}မိနစ်</unitPattern>
@@ -4442,25 +4820,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>စက္ကန့်</displayName>
 				<unitPattern count="other">{0}စက္ကန့်</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>ဒီဂရီ</displayName>
-				<unitPattern count="other">{0}ဒီဂရီ</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>ရေဒီအန်းစ်</displayName>
-				<unitPattern count="other">{0}ရေဒီအန်းစ်</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ဧက</displayName>
-				<unitPattern count="other">{0}ဧက</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>စတုရန်းကီလိုမီတာ</displayName>
+				<unitPattern count="other">{0}စတုရန်းကီလိုမီတာ</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ဟက်တာ</displayName>
 				<unitPattern count="other">{0} ဟက်တာ</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>စတုရန်းမီတာ</displayName>
+				<unitPattern count="other">{0}စတုရန်းမီတာ</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>စတုရန်းစင်တီမီတာ</displayName>
 				<unitPattern count="other">{0}စတုရန်းစင်တီမီတာ</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>စတုရန်းမိုင်</displayName>
+				<unitPattern count="other">{0}စတုရန်းမိုင်</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ဧက</displayName>
+				<unitPattern count="other">{0}ဧက</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>စတုရန်းကိုက်</displayName>
+				<unitPattern count="other">{0}စတုရန်းကိုက်</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>စတုရန်းပေ</displayName>
@@ -4469,112 +4856,114 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="area-square-inch">
 				<displayName>စတုရန်းလက်မ</displayName>
 				<unitPattern count="other">{0}စတုရန်းလက်မ</unitPattern>
+				<perUnitPattern>{0}တစ်စတုရန်းလက်မလျှင်</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>စတုရန်းကီလိုမီတာ</displayName>
-				<unitPattern count="other">{0}စတုရန်းကီလိုမီတာ</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>စတုရန်းမီတာ</displayName>
-				<unitPattern count="other">{0}စတုရန်းမီတာ</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>စတုရန်းမိုင်</displayName>
-				<unitPattern count="other">{0}စတုရန်းမိုင်</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>စတုရန်းကိုက်</displayName>
-				<unitPattern count="other">{0}စတုရန်းကိုက်</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>ကရက်</displayName>
+				<unitPattern count="other">{0} ကရက်</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>လီတာ/ကီလိုမီတာ</displayName>
 				<unitPattern count="other">၁ကီလိုမီတာ {0}လီတာနှုန်း</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>မိုင်/ဂါလန်</displayName>
 				<unitPattern count="other">၁ ဂါလန် {0} မိုင်နှုန်း</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>ဘစ်</displayName>
-				<unitPattern count="other">{0}ဘစ်</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>ဘိုက်</displayName>
-				<unitPattern count="other">{0}ဘိုက်</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>ဂီဂါဘစ်</displayName>
-				<unitPattern count="other">{0}ဂီဂါဘစ်</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>ဂီဂါဘိုက်</displayName>
-				<unitPattern count="other">{0}ဂီဂါဘိုက်</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>ကီလိုဘစ်</displayName>
-				<unitPattern count="other">{0}ကီလိုဘစ်</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>ကီလိုဘိုက်</displayName>
-				<unitPattern count="other">{0}ကီလိုဘိုက်</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>မီဂါဘစ်</displayName>
-				<unitPattern count="other">{0}မီဂါဘစ်</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>မီဂါဘိုက်</displayName>
-				<unitPattern count="other">{0}မီဂါဘိုက်</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>တီရာဘစ်</displayName>
-				<unitPattern count="other">{0}တီရာဘစ်</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>တီရာဘိုက်</displayName>
 				<unitPattern count="other">{0}တီရာဘိုက်</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>တီရာဘစ်</displayName>
+				<unitPattern count="other">{0}တီရာဘစ်</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>ဂီဂါဘိုက်</displayName>
+				<unitPattern count="other">{0}ဂီဂါဘိုက်</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>ဂီဂါဘစ်</displayName>
+				<unitPattern count="other">{0}ဂီဂါဘစ်</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>မီဂါဘိုက်</displayName>
+				<unitPattern count="other">{0}မီဂါဘိုက်</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>မီဂါဘစ်</displayName>
+				<unitPattern count="other">{0}မီဂါဘစ်</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>ကီလိုဘိုက်</displayName>
+				<unitPattern count="other">{0}ကီလိုဘိုက်</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>ကီလိုဘစ်</displayName>
+				<unitPattern count="other">{0}ကီလိုဘစ်</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>ဘိုက်</displayName>
+				<unitPattern count="other">{0}ဘိုက်</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>ဘစ်</displayName>
+				<unitPattern count="other">{0}ဘစ်</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>c</displayName>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>နှစ်</displayName>
+				<unitPattern count="other">{0}နှစ်</unitPattern>
+				<perUnitPattern>{0}နှစ်လျှင်</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>လ</displayName>
+				<unitPattern count="other">{0}လ</unitPattern>
+				<perUnitPattern>{0}တစ်လလျှင်</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ပတ်</displayName>
+				<unitPattern count="other">{0}ပတ်</unitPattern>
+				<perUnitPattern>{0}တစ်ပတ်လျှင်</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ရက်</displayName>
 				<unitPattern count="other">{0}ရက်</unitPattern>
+				<perUnitPattern>{0}တစ်နေ့လျှင်</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>နာရီ</displayName>
 				<unitPattern count="other">{0}နာရီ</unitPattern>
 				<perUnitPattern>တစ်နာရီ {0}နှုန်း</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>မိုက်ခရိုစက္ကန့်</displayName>
-				<unitPattern count="other">{0}မိုက်ခရိုစက္ကန့်</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>မီလီစက္ကန့်</displayName>
-				<unitPattern count="other">{0}မီလီစက္ကန့်</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>မိနစ်</displayName>
 				<unitPattern count="other">{0} မိနစ်</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>လ</displayName>
-				<unitPattern count="other">{0}လ</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>နာနိုစက္ကန့်</displayName>
-				<unitPattern count="other">{0} နာနိုစက္ကန့်</unitPattern>
+				<perUnitPattern>{0}မိနစ်လျှင်</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>စက္ကန့်</displayName>
 				<unitPattern count="other">{0} စက္ကန့်</unitPattern>
 				<perUnitPattern>တစ်စက္ကန့် {0}နှုန်း</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>ပတ်</displayName>
-				<unitPattern count="other">{0}ပတ်</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>မီလီစက္ကန့်</displayName>
+				<unitPattern count="other">{0}မီလီစက္ကန့်</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>နှစ်</displayName>
-				<unitPattern count="other">{0}နှစ်</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>မိုက်ခရိုစက္ကန့်</displayName>
+				<unitPattern count="other">{0}မိုက်ခရိုစက္ကန့်</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>နာနိုစက္ကန့်</displayName>
+				<unitPattern count="other">{0} နာနိုစက္ကန့်</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>အမ်ပီယာ</displayName>
@@ -4592,6 +4981,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ဗို့</displayName>
 				<unitPattern count="other">{0}ဗို့</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>ကီလိုကယ်လိုရီ</displayName>
+				<unitPattern count="other">{0} ကီလိုကယ်လိုရီ</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>ကယ်လိုရီ</displayName>
 				<unitPattern count="other">{0} ကယ်လိုရီ</unitPattern>
@@ -4600,18 +4993,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ကယ်လိုရီ</displayName>
 				<unitPattern count="other">{0} ကယ်လိုရီ</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>ဂျူးလ်</displayName>
-				<unitPattern count="other">{0} ဂျူးလ်</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>ကီလိုကယ်လိုရီ</displayName>
-				<unitPattern count="other">{0} ကီလိုကယ်လိုရီ</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>ကီလိုဂျူးလ်</displayName>
 				<unitPattern count="other">{0} ကီလိုဂျူးလ်</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>ဂျူးလ်</displayName>
+				<unitPattern count="other">{0} ဂျူးလ်</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>ကီလိုဝပ်-နာရီ</displayName>
 				<unitPattern count="other">{0}ကီလိုဝပ်-နာရီ</unitPattern>
@@ -4620,162 +5009,167 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ဂီဂါဟတ်ဇ်</displayName>
 				<unitPattern count="other">{0}ဂီဂါဟတ်ဇ်</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>ဟတ်ဇ်</displayName>
-				<unitPattern count="other">{0}ဟတ်ဇ်</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>မက်ဂါဟတ်ဇ်</displayName>
+				<unitPattern count="other">{0}မက်ဂါဟတ်ဇ်</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>ကီလိုဟတ်ဇ်</displayName>
 				<unitPattern count="other">{0}ကီလိုဟတ်ဇ်</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>မက်ဂါဟတ်ဇ်</displayName>
-				<unitPattern count="other">{0}မက်ဂါဟတ်ဇ်</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>ဟတ်ဇ်</displayName>
+				<unitPattern count="other">{0}ဟတ်ဇ်</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>နက္ခတ္တဗေဒယူနစ်</displayName>
-				<unitPattern count="other">{0} နက္ခတ္တဗေဒယူနစ်</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>ကီလိုမီတာ</displayName>
+				<unitPattern count="other">{0} ကီလိုမီတာ</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>စင်တီမီတာ</displayName>
-				<unitPattern count="other">{0} စင်တီမီတာ</unitPattern>
+			<unit type="length-meter">
+				<displayName>မီတာ</displayName>
+				<unitPattern count="other">{0}မီတာ</unitPattern>
+				<perUnitPattern>{0}တစ်မီတာလျှင်</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>ဒါစီမီတာ</displayName>
 				<unitPattern count="other">{0} ဒါစီမီတာ</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ပေ</displayName>
-				<unitPattern count="other">{0} ပေ</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>လက်မ</displayName>
-				<unitPattern count="other">{0} လက်မ</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>ကီလိုမီတာ</displayName>
-				<unitPattern count="other">{0} ကီလိုမီတာ</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>အလင်းနှစ်</displayName>
-				<unitPattern count="other">{0} အလင်းနှစ်</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>မီတာ</displayName>
-				<unitPattern count="other">{0}မီတာ</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>မိုက်ခရိုမီတာ</displayName>
-				<unitPattern count="other">{0} မိုက်ခရိုမီတာ</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>မိုင်</displayName>
-				<unitPattern count="other">{0} မိုင်</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>စင်တီမီတာ</displayName>
+				<unitPattern count="other">{0} စင်တီမီတာ</unitPattern>
+				<perUnitPattern>{0} တစ်စင်တီမီတာလျှင်</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>မီလီမီတာ</displayName>
 				<unitPattern count="other">{0} မီလီမီတာ</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>မိုက်ခရိုမီတာ</displayName>
+				<unitPattern count="other">{0} မိုက်ခရိုမီတာ</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>နာနိုမီတာ</displayName>
 				<unitPattern count="other">{0} နာနိုမီတာ</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>ရေမိုင်</displayName>
-				<unitPattern count="other">{0} ရေမိုင်</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>ပါစက်ခ်</displayName>
-				<unitPattern count="other">{0} ပါစက်ခ်</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>ပီကိုမီတာ</displayName>
 				<unitPattern count="other">{0} ပီကိုမီတာ</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>မိုင်</displayName>
+				<unitPattern count="other">{0} မိုင်</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>ကိုက်</displayName>
 				<unitPattern count="other">{0} ကိုက်</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ပေ</displayName>
+				<unitPattern count="other">{0} ပေ</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>လက်မ</displayName>
+				<unitPattern count="other">{0} လက်မ</unitPattern>
+				<perUnitPattern>{0}တစ်လက်မလျှင်</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>ပါစက်ခ်</displayName>
+				<unitPattern count="other">{0} ပါစက်ခ်</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>အလင်းနှစ်</displayName>
+				<unitPattern count="other">{0} အလင်းနှစ်</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>နက္ခတ္တဗေဒယူနစ်</displayName>
+				<unitPattern count="other">{0} နက္ခတ္တဗေဒယူနစ်</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>ရေမိုင်</displayName>
+				<unitPattern count="other">{0} ရေမိုင်</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>စကန်ဒီနေးဗီးရန်း မိုင်</displayName>
+				<unitPattern count="other">{0}စကန်ဒီနေးဗီးရန်း မိုင်များ</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>လတ်ခ်</displayName>
 				<unitPattern count="other">{0} လတ်ခ်</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>ကရက်</displayName>
-				<unitPattern count="other">{0} ကရက်</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>ဂရမ်</displayName>
-				<unitPattern count="other">{0} ဂရမ်</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>ကီလိုဂရမ်</displayName>
-				<unitPattern count="other">{0}ကီလိုဂရမ်</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>မက်ထရစ်တန်</displayName>
 				<unitPattern count="other">{0} မက်ထရစ်တန်</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>မိုက်ကရိုဂရမ်</displayName>
-				<unitPattern count="other">{0}မိုက်ကရိုဂရမ်</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>ကီလိုဂရမ်</displayName>
+				<unitPattern count="other">{0}ကီလိုဂရမ်</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>ဂရမ်</displayName>
+				<unitPattern count="other">{0} ဂရမ်</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>မီလီဂရမ်</displayName>
 				<unitPattern count="other">{0} မီလီဂရမ်</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>အောင်စ</displayName>
-				<unitPattern count="other">{0}အောင်စ</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ထရိုအောင်စ</displayName>
-				<unitPattern count="other">{0} ထရိုအောင်စ</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>ပေါင်</displayName>
-				<unitPattern count="other">{0}ပေါင်</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>မိုက်ကရိုဂရမ်</displayName>
+				<unitPattern count="other">{0}မိုက်ကရိုဂရမ်</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>တန်</displayName>
 				<unitPattern count="other">{0}တန်</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>ပေါင်</displayName>
+				<unitPattern count="other">{0}ပေါင်</unitPattern>
+				<perUnitPattern>{0}တစ်ပေါင်လျှင်</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>အောင်စ</displayName>
+				<unitPattern count="other">{0}အောင်စ</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ထရိုအောင်စ</displayName>
+				<unitPattern count="other">{0} ထရိုအောင်စ</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>ကရက်</displayName>
+				<unitPattern count="other">{0} ကရက်</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>ဂီဂါဝပ်</displayName>
 				<unitPattern count="other">{0} ဂီဂါဝပ်</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>မြင်းကောင်ရေအား</displayName>
-				<unitPattern count="other">{0} မြင်းကောင်ရေအား</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>ကီလိုဝပ်</displayName>
-				<unitPattern count="other">{0}ကီလိုဝပ်</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>မီဂါဝပ်</displayName>
 				<unitPattern count="other">{0} မီဂါဝပ်</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>မီလီဝပ်</displayName>
-				<unitPattern count="other">{0} မီလီဝပ်</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>ကီလိုဝပ်</displayName>
+				<unitPattern count="other">{0}ကီလိုဝပ်</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>ဝပ်</displayName>
 				<unitPattern count="other">{0}ဝပ်</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>မီလီဝပ်</displayName>
+				<unitPattern count="other">{0} မီလီဝပ်</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>မြင်းကောင်ရေအား</displayName>
+				<unitPattern count="other">{0} မြင်းကောင်ရေအား</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>ဟက်တိုပါစကယ်</displayName>
 				<unitPattern count="other">{0}ဟက်တိုပါစကယ်</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>ပြဒါးလက်မ</displayName>
-				<unitPattern count="other">ပြဒါး{0}လက်မ</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>မီလီဘား</displayName>
-				<unitPattern count="other">{0}မီလီဘား</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>ပြဒါးမီလီမီတာ</displayName>
 				<unitPattern count="other">ပြဒါး{0}မီလီမီတာ</unitPattern>
@@ -4784,9 +5178,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ပေါင်/စတုရန်းလက်မ</displayName>
 				<unitPattern count="other">၁စတုရန်းလက်မ {0}ပေါင်နှုန်း</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>ကရက်</displayName>
-				<unitPattern count="other">{0} ကရက်</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>ပြဒါးလက်မ</displayName>
+				<unitPattern count="other">ပြဒါး{0}လက်မ</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>မီလီဘား</displayName>
+				<unitPattern count="other">{0}မီလီဘား</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>ကီလိုမီတာ/နာရီ</displayName>
@@ -4800,6 +5198,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>မိုင်/နာရီ</displayName>
 				<unitPattern count="other">တစ်နာရီလျှင်{0}မိုင်နှုန်း</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>ရေမိုင်နော့</displayName>
+				<unitPattern count="other">{0}ရေမိုင်နော့များ</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>စင်တီဂရိတ်</displayName>
 				<unitPattern count="other">{0}စင်တီဂရိတ်</unitPattern>
@@ -4812,26 +5218,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ကယ်လ်ဗင်</displayName>
 				<unitPattern count="other">{0}ကယ်လ်ဗင်</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ဧက-ပေ</displayName>
-				<unitPattern count="other">{0} ဧက-ပေ</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>စင်တီလီတာ</displayName>
-				<unitPattern count="other">{0}စင်တီလီတာ</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>ကုဗစင်တီမီတာ</displayName>
-				<unitPattern count="other">{0}ကုဗစင်တီမီတာ</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ကုဗပေ</displayName>
-				<unitPattern count="other">{0} ကုဗပေ</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>ကုဗလက်မ</displayName>
-				<unitPattern count="other">{0}ကုဗလက်မ</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>ကုဗကီလိုမီတာ</displayName>
 				<unitPattern count="other">{0} ကုဗကီလိုမီတာ</unitPattern>
@@ -4839,6 +5225,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-cubic-meter">
 				<displayName>ကုဗမီတာ</displayName>
 				<unitPattern count="other">{0}ကုဗမီတာ</unitPattern>
+				<perUnitPattern>{0}တစ်ကုဗမီတာလျှင်</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>ကုဗစင်တီမီတာ</displayName>
+				<unitPattern count="other">{0}ကုဗစင်တီမီတာ</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>ကုဗမိုင်</displayName>
@@ -4848,21 +5240,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ကုဗကိုက်</displayName>
 				<unitPattern count="other">{0}ကုဗကိုက်</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>ခွက်</displayName>
-				<unitPattern count="other">{0} ခွက်</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ကုဗပေ</displayName>
+				<unitPattern count="other">{0} ကုဗပေ</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>ဒါစီလီတာ</displayName>
-				<unitPattern count="other">{0} ဒါစီလီတာ</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>ကုဗလက်မ</displayName>
+				<unitPattern count="other">{0}ကုဗလက်မ</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>အရည်အောင်စ</displayName>
-				<unitPattern count="other">{0}အရည်အောင်စ</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>ဂါလန်</displayName>
-				<unitPattern count="other">{0}ဂါလန်</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>မက်ဂါလီတာ</displayName>
+				<unitPattern count="other">{0}မက်ဂါလီတာ</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>ဟက်တိုလီတာ</displayName>
@@ -4871,23 +5259,53 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-liter">
 				<displayName>လီတာ</displayName>
 				<unitPattern count="other">{0}လီတာ</unitPattern>
+				<perUnitPattern>{0} တစ်လီတာလျှင်</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>မက်ဂါလီတာ</displayName>
-				<unitPattern count="other">{0}မက်ဂါလီတာ</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>ဒါစီလီတာ</displayName>
+				<unitPattern count="other">{0} ဒါစီလီတာ</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>စင်တီလီတာ</displayName>
+				<unitPattern count="other">{0}စင်တီလီတာ</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>မီလီလီတာ</displayName>
 				<unitPattern count="other">{0}မီလီလီတာ</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>ပိုင့်</displayName>
-				<unitPattern count="other">{0}ပိုင့်</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>မထ္ထရစ်ပို့င်</displayName>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>မထ္ထရစ်ကပ်</displayName>
+				<unitPattern count="other">{0}မထ္ထရစ်ကပ်စ်</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ဧက-ပေ</displayName>
+				<unitPattern count="other">{0} ဧက-ပေ</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>ဂါလန်</displayName>
+				<unitPattern count="other">{0}ဂါလန်</unitPattern>
+				<perUnitPattern>{0}တစ်ဂါလံလျှင်</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>ကွတ်</displayName>
 				<unitPattern count="other">{0}ကွတ်</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>ပိုင့်</displayName>
+				<unitPattern count="other">{0}ပိုင့်</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>ခွက်</displayName>
+				<unitPattern count="other">{0} ခွက်</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>အရည်အောင်စ</displayName>
+				<unitPattern count="other">{0}အရည်အောင်စ</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>စားပွဲဇွန်း</displayName>
 				<unitPattern count="other">စားပွဲဇွန်း{0}ဇွန်း</unitPattern>
@@ -4896,6 +5314,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>လက်ဖက်ရည်ဇွန်း</displayName>
 				<unitPattern count="other">လက်ဖက်ရည်ဇွန်း{0}ဇွန်း</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -4909,6 +5333,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>မီတာ/စက္ကန့်နှစ်ထပ်ကိန်း</displayName>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="other">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>ရေဒီအန်းစ်</displayName>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>ဒီဂရီ</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>မိနစ်</displayName>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -4917,25 +5353,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>စက္ကန့်</displayName>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>ဒီဂရီ</displayName>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>ရေဒီအန်းစ်</displayName>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ဧက</displayName>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>စတုရန်းကီလိုမီတာ</displayName>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ဟက်တာ</displayName>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>စတုရန်းမီတာ</displayName>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>စတုရန်းစင်တီမီတာ</displayName>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>စတုရန်းမိုင်</displayName>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ဧက</displayName>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>စတုရန်းကိုက်</displayName>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>စတုရန်းပေ</displayName>
@@ -4944,112 +5390,114 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="area-square-inch">
 				<displayName>စတုရန်းလက်မ</displayName>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>စတုရန်းကီလိုမီတာ</displayName>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>စတုရန်းမီတာ</displayName>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>စတုရန်းမိုင်</displayName>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>စတုရန်းကိုက်</displayName>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>ကရက်</displayName>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>လီတာ/ကီလိုမီတာ</displayName>
 				<unitPattern count="other">{0} L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>မိုင်/ဂါလန်</displayName>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>ဘစ်</displayName>
-				<unitPattern count="other">{0}ဘစ်</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>ဘိုက်</displayName>
-				<unitPattern count="other">{0}ဘိုက်</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>ဂီဂါဘစ်</displayName>
-				<unitPattern count="other">{0}ဂီဂါဘစ်</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>ဂီဂါဘိုက်</displayName>
-				<unitPattern count="other">{0}ဂီဂါဘိုက်</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>ကီလိုဘစ်</displayName>
-				<unitPattern count="other">{0}ကီလိုဘစ်</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>ကီလိုဘိုက်</displayName>
-				<unitPattern count="other">{0}ကီလိုဘိုက်</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>မီဂါဘစ်</displayName>
-				<unitPattern count="other">{0}မီဂါဘစ်</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>မီဂါဘိုက်</displayName>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>တီရာဘစ်</displayName>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>တီရာဘိုက်</displayName>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>တီရာဘစ်</displayName>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>ဂီဂါဘိုက်</displayName>
+				<unitPattern count="other">{0}ဂီဂါဘိုက်</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>ဂီဂါဘစ်</displayName>
+				<unitPattern count="other">{0}ဂီဂါဘစ်</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>မီဂါဘိုက်</displayName>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>မီဂါဘစ်</displayName>
+				<unitPattern count="other">{0}မီဂါဘစ်</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>ကီလိုဘိုက်</displayName>
+				<unitPattern count="other">{0}ကီလိုဘိုက်</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>ကီလိုဘစ်</displayName>
+				<unitPattern count="other">{0}ကီလိုဘစ်</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>ဘိုက်</displayName>
+				<unitPattern count="other">{0}ဘိုက်</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>ဘစ်</displayName>
+				<unitPattern count="other">{0}ဘစ်</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>c</displayName>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>နှစ်</displayName>
+				<unitPattern count="other">{0} y</unitPattern>
+				<perUnitPattern>{0}/y</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>လ</displayName>
+				<unitPattern count="other">{0}လ</unitPattern>
+				<perUnitPattern>{0}/လ</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ပတ်</displayName>
+				<unitPattern count="other">{0}ပတ်</unitPattern>
+				<perUnitPattern>{0}/w</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ရက်</displayName>
 				<unitPattern count="other">{0}ရက်</unitPattern>
+				<perUnitPattern>{0}/d</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>နာရီ</displayName>
 				<unitPattern count="other">{0}နာရီ</unitPattern>
 				<perUnitPattern>{0}/နာရီ</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>မိုက်ခရိုစက္ကန့်</displayName>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>မီလီစက္ကန့်</displayName>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>မိနစ်</displayName>
 				<unitPattern count="other">{0}မိနစ်</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>လ</displayName>
-				<unitPattern count="other">{0}လ</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>နာနိုစက္ကန့်</displayName>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}မိနစ်လျှင်</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>စက္ကန့်</displayName>
 				<unitPattern count="other">{0} s</unitPattern>
 				<perUnitPattern>{0}/စက္ကန့်</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>ပတ်</displayName>
-				<unitPattern count="other">{0}ပတ်</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>မီလီစက္ကန့်</displayName>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>နှစ်</displayName>
-				<unitPattern count="other">{0} y</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>မိုက်ခရိုစက္ကန့်</displayName>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>နာနိုစက္ကန့်</displayName>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>အမ်ပီယာ</displayName>
@@ -5067,6 +5515,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ဗို့</displayName>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>ကီလိုကယ်လိုရီ</displayName>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>ကယ်လိုရီ</displayName>
 				<unitPattern count="other">{0} cal</unitPattern>
@@ -5075,18 +5527,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ကယ်လိုရီ</displayName>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>ဂျူးလ်</displayName>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>ကီလိုကယ်လိုရီ</displayName>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>ကီလိုဂျူးလ်</displayName>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>ဂျူးလ်</displayName>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>ကီလိုဝပ်-နာရီ</displayName>
 				<unitPattern count="other">{0} kWh</unitPattern>
@@ -5095,162 +5543,167 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>GHz</displayName>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>နက္ခတ္တဗေဒယူနစ်</displayName>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>ကီလိုမီတာ</displayName>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>စင်တီမီတာ</displayName>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>မီတာ</displayName>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>ဒါစီမီတာ</displayName>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ပေ</displayName>
-				<unitPattern count="other">{0} ပေ</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>လက်မ</displayName>
-				<unitPattern count="other">{0} လက်မ</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>ကီလိုမီတာ</displayName>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>အလင်းနှစ်</displayName>
-				<unitPattern count="other">{0} အလင်းနှစ်</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>မီတာ</displayName>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>မိုက်ခရိုမီတာ</displayName>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>မိုင်</displayName>
-				<unitPattern count="other">{0}မိုင်</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>စင်တီမီတာ</displayName>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>မီလီမီတာ</displayName>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>မိုက်ခရိုမီတာ</displayName>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>နာနိုမီတာ</displayName>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>ရေမိုင်</displayName>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>ပါစက်ခ်</displayName>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>ပီကိုမီတာ</displayName>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>မိုင်</displayName>
+				<unitPattern count="other">{0}မိုင်</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>ကိုက်</displayName>
 				<unitPattern count="other">{0} ကိုက်</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ပေ</displayName>
+				<unitPattern count="other">{0} ပေ</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>လက်မ</displayName>
+				<unitPattern count="other">{0} လက်မ</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>ပါစက်ခ်</displayName>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>အလင်းနှစ်</displayName>
+				<unitPattern count="other">{0} အလင်းနှစ်</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>နက္ခတ္တဗေဒယူနစ်</displayName>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>ရေမိုင်</displayName>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>လတ်ခ်</displayName>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>ကရက်</displayName>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>ဂရမ်</displayName>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>ကီလိုဂရမ်</displayName>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>ကီလိုဂရမ်</displayName>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>ဂရမ်</displayName>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>မီလီဂရမ်</displayName>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>အောင်စ</displayName>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ထရိုအောင်စ</displayName>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>ပေါင်</displayName>
-				<unitPattern count="other">{0} lb</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>တန်</displayName>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>ပေါင်</displayName>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>အောင်စ</displayName>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ထရိုအောင်စ</displayName>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>ကရက်</displayName>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>ဂီဂါဝပ်</displayName>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hp</displayName>
-				<unitPattern count="other">{0} hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>ကီလိုဝပ်</displayName>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>မီဂါဝပ်</displayName>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>မီလီဝပ်</displayName>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>ကီလိုဝပ်</displayName>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>ဝပ်</displayName>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>မီလီဝပ်</displayName>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>မီလီဘား</displayName>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="other">{0} mm Hg</unitPattern>
@@ -5259,9 +5712,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ပေါင်/စတုရန်းလက်မ</displayName>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>ကရက်</displayName>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>မီလီဘား</displayName>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>ကီလိုမီတာ/နာရီ</displayName>
@@ -5275,6 +5732,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>မိုင်/နာရီ</displayName>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="other">{0}°C</unitPattern>
@@ -5287,26 +5752,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>K</displayName>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ဧက-ပေ</displayName>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>စင်တီလီတာ</displayName>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>ကုဗစင်တီမီတာ</displayName>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ကုဗပေ</displayName>
-				<unitPattern count="other">{0} ကုဗပေ</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>ကုဗလက်မ</displayName>
-				<unitPattern count="other">{0}ကုဗလက်မ</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>ကုဗကီလိုမီတာ</displayName>
 				<unitPattern count="other">{0} km³</unitPattern>
@@ -5314,6 +5759,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-cubic-meter">
 				<displayName>ကုဗမီတာ</displayName>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>ကုဗစင်တီမီတာ</displayName>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>ကုဗမိုင်</displayName>
@@ -5323,21 +5774,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ကုဗကိုက်</displayName>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>ခွက်</displayName>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ကုဗပေ</displayName>
+				<unitPattern count="other">{0} ကုဗပေ</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>ဒါစီလီတာ</displayName>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>ကုဗလက်မ</displayName>
+				<unitPattern count="other">{0}ကုဗလက်မ</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>အရည်အောင်စ</displayName>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>ဂါလန်</displayName>
-				<unitPattern count="other">{0}ဂါလန်</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>မက်ဂါလီတာ</displayName>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>ဟက်တိုလီတာ</displayName>
@@ -5346,23 +5793,53 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-liter">
 				<displayName>လီတာ</displayName>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>မက်ဂါလီတာ</displayName>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>ဒါစီလီတာ</displayName>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>စင်တီလီတာ</displayName>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>မီလီလီတာ</displayName>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>ပိုင့်</displayName>
-				<unitPattern count="other">{0}ပိုင့်</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ဧက-ပေ</displayName>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>ဂါလန်</displayName>
+				<unitPattern count="other">{0}ဂါလန်</unitPattern>
+				<perUnitPattern>{0}/ဂါလံ</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>ကွတ်</displayName>
 				<unitPattern count="other">{0}ကွတ်</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>ပိုင့်</displayName>
+				<unitPattern count="other">{0}ပိုင့်</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>ခွက်</displayName>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>အရည်အောင်စ</displayName>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>စားပွဲဇွန်း</displayName>
 				<unitPattern count="other">စားပွဲဇွန်း{0}ဇွန်း</unitPattern>
@@ -5371,6 +5848,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>လက်ဖက်ရည်ဇွန်း</displayName>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -5379,33 +5862,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="acceleration-g-force">
 				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="other">{0}′</unitPattern>
 			</unit>
 			<unit type="angle-arc-second">
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="other">{0} m²</unitPattern>
 			</unit>
 			<unit type="area-square-mile">
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>နှစ်</displayName>
+				<unitPattern count="other">{0} y</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>လ</displayName>
+				<unitPattern count="other">{0}လ</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ပတ်</displayName>
+				<unitPattern count="other">{0}ပတ်</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ရက်</displayName>
 				<unitPattern count="other">{0}ရက်</unitPattern>
@@ -5414,53 +5913,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>နာရီ</displayName>
 				<unitPattern count="other">{0}နာရီ</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>မီလီစက္ကန့်</displayName>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>မိနစ်</displayName>
 				<unitPattern count="other">{0}မိနစ်</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>လ</displayName>
-				<unitPattern count="other">{0}လ</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>စက္ကန့်</displayName>
 				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>ပတ်</displayName>
-				<unitPattern count="other">{0}ပတ်</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>နှစ်</displayName>
-				<unitPattern count="other">{0} y</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>စင်တီမီတာ</displayName>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="other">{0} '</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="other">{0} ″</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>မီလီစက္ကန့်</displayName>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>ကီလိုမီတာ</displayName>
 				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="other">{0} အလင်းနှစ်</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>မီတာ</displayName>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="other">{0}မိုင်</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>စင်တီမီတာ</displayName>
+				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>မီလီမီတာ</displayName>
@@ -5469,25 +5944,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="length-picometer">
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="other">{0}မိုင်</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="other">{0} ကိုက်</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>ဂရမ်</displayName>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="other">{0} '</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="other">{0} ″</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="other">{0} အလင်းနှစ်</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>ကီလိုဂရမ်</displayName>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="other">{0} oz</unitPattern>
+			<unit type="mass-gram">
+				<displayName>ဂရမ်</displayName>
+				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="other">{0} lb</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="other">{0} hp</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="other">{0} oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="other">{0} kW</unitPattern>
@@ -5495,6 +5979,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="power-watt">
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
@@ -5531,6 +6018,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>လီတာ</displayName>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/my_MM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/my_MM.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/my_MM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/my_MM.xml
index 8479232d593..b703edfb071 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/my_MM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/my_MM.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="my"/>
 		<territory type="MM"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mzn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mzn.xml
new file mode 100644
index 00000000000..8dc6af6e7db
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mzn.xml
@@ -0,0 +1,2789 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12293 $"/>
+		<language type="mzn"/>
+	</identity>
+	<localeDisplayNames>
+		<localeDisplayPattern>
+			<localePattern>{0} ({1})</localePattern>
+			<localeSeparator>{0}, {1}</localeSeparator>
+			<localeKeyTypePattern>{0}: {1}</localeKeyTypePattern>
+		</localeDisplayPattern>
+		<languages>
+			<language type="ab">آبخازی</language>
+			<language type="af">آفریکانس</language>
+			<language type="agq">آقم</language>
+			<language type="ak">آکان</language>
+			<language type="am">امهری</language>
+			<language type="ar">عربی</language>
+			<language type="ar_001">مدرن استاندارد عربی</language>
+			<language type="arn">ماپوچه</language>
+			<language type="as">آسامی</language>
+			<language type="asa">آسو</language>
+			<language type="az">آذری ِترکی</language>
+			<language type="az" alt="short">آذری</language>
+			<language type="az_Arab">جنوبی آذری ترکی</language>
+			<language type="ba">باشقیری</language>
+			<language type="be">بلاروسی</language>
+			<language type="bem">بمبایی</language>
+			<language type="bez">بنایی</language>
+			<language type="bg">بلغاری</language>
+			<language type="bgn">غربی بلوچی</language>
+			<language type="bm">بامبارایی</language>
+			<language type="bn">بنگالی</language>
+			<language type="bo">تبتی</language>
+			<language type="br">برِتونی</language>
+			<language type="brx">بدویی</language>
+			<language type="bs">بوسنیایی</language>
+			<language type="ca">کاتالونی</language>
+			<language type="ce">چچنی</language>
+			<language type="cgg">چیگا</language>
+			<language type="chr">چروکیایی</language>
+			<language type="ckb">میونی کوردی</language>
+			<language type="co">کورسیکان</language>
+			<language type="cs">چکی</language>
+			<language type="cv">چوواشی</language>
+			<language type="cy">ولزی</language>
+			<language type="da">دانمارکی</language>
+			<language type="dav">تایتا</language>
+			<language type="de">آلمانی</language>
+			<language type="de_AT">اتریش ِآلمانی</language>
+			<language type="de_CH">سوییس ِآلمانی</language>
+			<language type="dje">زارمایی</language>
+			<language type="dsb">پایین صربی</language>
+			<language type="dua">دوئالایی</language>
+			<language type="dyo">جولا-فونی</language>
+			<language type="dz">دزونگخا</language>
+			<language type="ebu">امبو</language>
+			<language type="ee">اوه‌یی</language>
+			<language type="el">یونانی</language>
+			<language type="en">انگلیسی</language>
+			<language type="en_AU">استرالیای ِانگلیسی</language>
+			<language type="en_CA">کانادای ِانگلیسی</language>
+			<language type="en_GB">بریتیش انگلیسی</language>
+			<language type="en_GB" alt="short">بریتانیای ِانگلیسی</language>
+			<language type="en_US">امریکن انگلیسی</language>
+			<language type="en_US" alt="short">آمریکای ِانگلیسی</language>
+			<language type="eo">اسپرانتو</language>
+			<language type="es">ایسپانیولی</language>
+			<language type="es_419">جنوبی آمریکای ِایسپانیولی</language>
+			<language type="es_ES">اروپای ِایسپانیولی</language>
+			<language type="es_MX">مکزیک ِایسپانیولی</language>
+			<language type="et">استونیایی</language>
+			<language type="eu">باسکی</language>
+			<language type="fa">فارسی</language>
+			<language type="fi">فینیش</language>
+			<language type="fil">فیلیپینو</language>
+			<language type="fj">فیجیایی</language>
+			<language type="fo">فارویی</language>
+			<language type="fr">فرانسوی</language>
+			<language type="fr_CA">کانادای ِفرانسوی</language>
+			<language type="fr_CH">سوییس ِفرانسوی</language>
+			<language type="fy">غربی فیریزی</language>
+			<language type="ga">ایریش</language>
+			<language type="gag">گاگائوزی</language>
+			<language type="gl">گالیک</language>
+			<language type="gn">گورانی</language>
+			<language type="gsw">سوییس آلمانی</language>
+			<language type="gu">گجراتی</language>
+			<language type="guz">گوسی</language>
+			<language type="gv">مانکس</language>
+			<language type="ha">هوسا</language>
+			<language type="haw">هاواییایی</language>
+			<language type="he">عبری</language>
+			<language type="hi">هندی</language>
+			<language type="hr">کرواتی</language>
+			<language type="hsb">بالایی صربی</language>
+			<language type="ht">هائتیایی</language>
+			<language type="hu">مجاری</language>
+			<language type="hy">ارمنی</language>
+			<language type="id">اندونزیایی</language>
+			<language type="ig">ایگبو</language>
+			<language type="ii">سیچوئان یی</language>
+			<language type="is">ایسلندی</language>
+			<language type="it">ایتالیایی</language>
+			<language type="iu">انوکتیتوت</language>
+			<language type="ja">جاپونی</language>
+			<language type="jgo">نگومبا</language>
+			<language type="jmc">ماچامه</language>
+			<language type="jv">جاوایی</language>
+			<language type="ka">گرجی</language>
+			<language type="kab">قبایلی</language>
+			<language type="kam">کامبایی</language>
+			<language type="kde">ماکونده</language>
+			<language type="kea">کیپ وُردی</language>
+			<language type="khq">کویرا چیینی</language>
+			<language type="ki">کیکویو</language>
+			<language type="kk">قزاقی</language>
+			<language type="kl">کالائلیسوت</language>
+			<language type="kln">کالنجین</language>
+			<language type="km">خمری</language>
+			<language type="kn">کانّادا</language>
+			<language type="ko">کُره‌یی</language>
+			<language type="koi">کومی-پرمیاک</language>
+			<language type="kok">کونکانی</language>
+			<language type="ks">کشمیری</language>
+			<language type="ksb">شامبالا</language>
+			<language type="ksf">بافیایی</language>
+			<language type="ku">کوردی</language>
+			<language type="kw">کورنیش</language>
+			<language type="ky">قرقیزی</language>
+			<language type="la">لاتین</language>
+			<language type="lag">لانگی</language>
+			<language type="lb">لوکزامبورگی</language>
+			<language type="lg">گاندا</language>
+			<language type="lkt">لاکوتا</language>
+			<language type="ln">لینگالا</language>
+			<language type="lo">لائویی</language>
+			<language type="lrc">شمالی لُری</language>
+			<language type="lt">لتونیایی</language>
+			<language type="lu">لوبا-کاتانگا</language>
+			<language type="luo">لوئو</language>
+			<language type="luy">لوییا</language>
+			<language type="lv">لاتویایی</language>
+			<language type="mas">ماسایی</language>
+			<language type="mer">مِرویی</language>
+			<language type="mfe">موریسین</language>
+			<language type="mg">مالاگاسی</language>
+			<language type="mgh">ماخوئا-میتو</language>
+			<language type="mgo">مِتاء</language>
+			<language type="mi">مائوری</language>
+			<language type="mk">مقدونی</language>
+			<language type="ml">مالایالام</language>
+			<language type="mn">مغولی</language>
+			<language type="moh">موهاک</language>
+			<language type="mr">ماراتی</language>
+			<language type="ms">مالایی</language>
+			<language type="mt">مالتی</language>
+			<language type="mua">موندانگ</language>
+			<language type="my">برمه‌یی</language>
+			<language type="mzn">مازرونی</language>
+			<language type="naq">ناما</language>
+			<language type="nb">نروژی بوکمال</language>
+			<language type="nd">شمالی ندبله</language>
+			<language type="nds">پایین آلمانی</language>
+			<language type="nds_NL">پایین ساکسونی</language>
+			<language type="ne">نپالی</language>
+			<language type="nl">هلندی</language>
+			<language type="nl_BE">فلمیش</language>
+			<language type="nmg">کوئاسیو</language>
+			<language type="nn">نروژی نینورسک</language>
+			<language type="nqo">نئکو</language>
+			<language type="nus">نوئر</language>
+			<language type="nyn">نیانکوله</language>
+			<language type="om">اورومو</language>
+			<language type="or">اوریا</language>
+			<language type="pa">پنجابی</language>
+			<language type="pl">لهستونی</language>
+			<language type="ps">پشتو</language>
+			<language type="pt">پرتغالی</language>
+			<language type="pt_BR">برزیل ِپرتغالی</language>
+			<language type="pt_PT">اروپای ِپرتغالی</language>
+			<language type="qu">قوئچوئا</language>
+			<language type="quc">کئیچه‌ئی</language>
+			<language type="rm">رومانش</language>
+			<language type="rn">روندی</language>
+			<language type="ro">رومانیایی</language>
+			<language type="ro_MD">مولداوی</language>
+			<language type="rof">رومبو</language>
+			<language type="ru">روسی</language>
+			<language type="rw">کنیاروآندایی</language>
+			<language type="rwk">روآیی</language>
+			<language type="sa">سانسکریت</language>
+			<language type="saq">سامبورو</language>
+			<language type="sbp">سانگوو</language>
+			<language type="sd">سندی</language>
+			<language type="sdh">جنوبی کردی</language>
+			<language type="se">شمالی سامی</language>
+			<language type="seh">سِنایی</language>
+			<language type="ses">کویرابورا سنی</language>
+			<language type="sg">سانگو</language>
+			<language type="shi">تاچلهیت</language>
+			<language type="si">سینهالا</language>
+			<language type="sk">اسلواکی</language>
+			<language type="sl">اسلوونیایی</language>
+			<language type="sma">جنوبی سامی</language>
+			<language type="smj">لوله سامی</language>
+			<language type="smn">ایناری سامی</language>
+			<language type="sms">سکولت سامی</language>
+			<language type="sn">شونا</language>
+			<language type="so">سومالیایی</language>
+			<language type="sq">آلبانیایی</language>
+			<language type="sr">صربی</language>
+			<language type="su">سوندانسی</language>
+			<language type="sv">سوئدی</language>
+			<language type="sw">سواحیلی</language>
+			<language type="sw_CD">کنگو سواحیلی</language>
+			<language type="ta">تامیلی</language>
+			<language type="te">تلوگویی</language>
+			<language type="teo">تسویی</language>
+			<language type="tg">تاجیکی</language>
+			<language type="th">تایی</language>
+			<language type="ti">تیگرینیایی</language>
+			<language type="tk">ترکمونی</language>
+			<language type="to">تونگانی</language>
+			<language type="tr">ترکی</language>
+			<language type="tt">تاتاری</language>
+			<language type="twq">تاساواقی</language>
+			<language type="tzm">میونی اطلس تامزیقی</language>
+			<language type="ug">ئوغوری</language>
+			<language type="uk">اوکراینی</language>
+			<language type="und">نشناسی‌یه زوون</language>
+			<language type="ur">اردو</language>
+			<language type="uz">ازبکی</language>
+			<language type="vai">وایی</language>
+			<language type="vi">ویتنامی</language>
+			<language type="vun">وونجویی</language>
+			<language type="wbp">والرپیری</language>
+			<language type="wo">وولفی</language>
+			<language type="xh">خوسا</language>
+			<language type="xog">سوگا</language>
+			<language type="yo">یوروبا</language>
+			<language type="zgh">مراکش ِاستاندارد ِتامازیقتی</language>
+			<language type="zh">چینی</language>
+			<language type="zh_Hans">ساده چینی</language>
+			<language type="zh_Hant">سنتی چینی</language>
+			<language type="zu">زولو</language>
+			<language type="zxx">این زوون بشناسی‌یه نیّه</language>
+		</languages>
+		<scripts>
+			<script type="Arab">عربی</script>
+			<script type="Armn">ارمنی</script>
+			<script type="Beng">بنگالی</script>
+			<script type="Bopo">بوپوموفو</script>
+			<script type="Cyrl">سیریلیک</script>
+			<script type="Deva">دیوانانگری</script>
+			<script type="Ethi">اتیوپیایی</script>
+			<script type="Geor">گرجی</script>
+			<script type="Grek">یونانی</script>
+			<script type="Gujr">گجراتی</script>
+			<script type="Guru">گورموخی</script>
+			<script type="Hang">هانگول</script>
+			<script type="Hani">هان</script>
+			<script type="Hans">ساده‌بَیی هان</script>
+			<script type="Hans" alt="stand-alone">ساده‌بَیی هان</script>
+			<script type="Hant">سنتی هانت</script>
+			<script type="Hant" alt="stand-alone">استاندارد ِسنتی هانت</script>
+			<script type="Hebr">عبری</script>
+			<script type="Hira">هیراگانا</script>
+			<script type="Jpan">جاپونی</script>
+			<script type="Kana">کاتاکانا</script>
+		</scripts>
+		<territories>
+			<territory type="001">جهون</territory>
+			<territory type="002">آفریقا</territory>
+			<territory type="003">شمالی آمریکا</territory>
+			<territory type="005">جنوبی آمریکا</territory>
+			<territory type="009">اوقیانوسیه</territory>
+			<territory type="011">غربی آفریقا</territory>
+			<territory type="013">میونی آمریکا</territory>
+			<territory type="014">شرقی آفریقا</territory>
+			<territory type="015">شمالی ۀفریقا</territory>
+			<territory type="017">میونی آفریقا</territory>
+			<territory type="018">جنوبی آفریقا</territory>
+			<territory type="019">آمریکا</territory>
+			<territory type="021">شمالی امریکا</territory>
+			<territory type="029">کاراییب</territory>
+			<territory type="030">شرقی آسیا</territory>
+			<territory type="034">جنوبی آسیا</territory>
+			<territory type="035">آسیای ِجنوب‌شرقی‌وَر</territory>
+			<territory type="039">جنوبی اروپا</territory>
+			<territory type="053">اوسترالزی</territory>
+			<territory type="054">ملانزی</territory>
+			<territory type="057">میکرونزی منقطه</territory>
+			<territory type="061">پولی‌نزی</territory>
+			<territory type="142">آسیا</territory>
+			<territory type="143">میونی آسیا</territory>
+			<territory type="145">غربی آسیا</territory>
+			<territory type="150">اروپا</territory>
+			<territory type="151">شرقی اروپا</territory>
+			<territory type="154">شمالی اروپا</territory>
+			<territory type="155">غربی اروپا</territory>
+			<territory type="419">لاتین آمریکا</territory>
+			<territory type="AC">آسنسیون جزیره</territory>
+			<territory type="AD">آندورا</territory>
+			<territory type="AE">متحده عربی امارات</territory>
+			<territory type="AF">افغانستون</territory>
+			<territory type="AG">آنتیگوا و باربودا</territory>
+			<territory type="AI">آنگویلا</territory>
+			<territory type="AL">آلبانی</territory>
+			<territory type="AM">ارمنستون</territory>
+			<territory type="AO">آنگولا</territory>
+			<territory type="AQ">جنوبی یخ‌بزه قطب</territory>
+			<territory type="AR">آرژانتین</territory>
+			<territory type="AS">آمریکای ِساموآ</territory>
+			<territory type="AT">اتریش</territory>
+			<territory type="AU">استرالیا</territory>
+			<territory type="AW">آروبا</territory>
+			<territory type="AX">آلند جزیره</territory>
+			<territory type="AZ">آذربایجون</territory>
+			<territory type="BA">بوسنی و هرزگوین</territory>
+			<territory type="BB">باربادوس</territory>
+			<territory type="BD">بنگلادش</territory>
+			<territory type="BE">بلژیک</territory>
+			<territory type="BF">بورکینا فاسو</territory>
+			<territory type="BG">بلغارستون</territory>
+			<territory type="BH">بحرین</territory>
+			<territory type="BI">بوروندی</territory>
+			<territory type="BJ">بنین</territory>
+			<territory type="BL">سنت بارتلمی</territory>
+			<territory type="BM">برمودا</territory>
+			<territory type="BN">برونئی</territory>
+			<territory type="BO">بولیوی</territory>
+			<territory type="BQ">هلند ِکاراییبی جزایر</territory>
+			<territory type="BR">برزیل</territory>
+			<territory type="BS">باهاما</territory>
+			<territory type="BT">بوتان</territory>
+			<territory type="BV">بووت جزیره</territory>
+			<territory type="BW">بوتساوانا</territory>
+			<territory type="BY">بلاروس</territory>
+			<territory type="BZ">بلیز</territory>
+			<territory type="CA">کانادا</territory>
+			<territory type="CC">کوک (کیلینگ) جزایر</territory>
+			<territory type="CD">کنگو کینشاسا</territory>
+			<territory type="CD" alt="variant">کنگو (دموکراتیک جمهوری)</territory>
+			<territory type="CF">مرکزی آفریقای جمهوری</territory>
+			<territory type="CG">کنگو برازاویل</territory>
+			<territory type="CG" alt="variant">کنگو (جمهوری)</territory>
+			<territory type="CH">سوییس</territory>
+			<territory type="CI">عاج ِساحل</territory>
+			<territory type="CI" alt="variant">عاج ساحل</territory>
+			<territory type="CK">کوک جزایر</territory>
+			<territory type="CL">شیلی</territory>
+			<territory type="CM">کامرون</territory>
+			<territory type="CN">چین</territory>
+			<territory type="CO">کلمبیا</territory>
+			<territory type="CP">کلیپرتون جزیره</territory>
+			<territory type="CR">کاستاریکا</territory>
+			<territory type="CU">کوبا</territory>
+			<territory type="CV">کیپ ورد</territory>
+			<territory type="CW">کوراسائو</territory>
+			<territory type="CX">کریسمس جزیره</territory>
+			<territory type="CY">قبرس</territory>
+			<territory type="CZ">چک جمهوری</territory>
+			<territory type="DE">آلمان</territory>
+			<territory type="DG">دیگو گارسیا</territory>
+			<territory type="DJ">جیبوتی</territory>
+			<territory type="DK">دانمارک</territory>
+			<territory type="DM">دومنیکا</territory>
+			<territory type="DO">دومنیکن جمهوری</territory>
+			<territory type="DZ">الجزیره</territory>
+			<territory type="EA">سوتا و ملیله</territory>
+			<territory type="EC">اکوادر</territory>
+			<territory type="EE">استونی</territory>
+			<territory type="EG">مصر</territory>
+			<territory type="EH">غربی صحرا</territory>
+			<territory type="ER">اریتره</territory>
+			<territory type="ES">ایسپانیا</territory>
+			<territory type="ET">اتیوپی</territory>
+			<territory type="EU">اروپا اتحادیه</territory>
+			<territory type="FI">فنلاند</territory>
+			<territory type="FJ">فیجی</territory>
+			<territory type="FK">فالکلند جزیره‌ئون</territory>
+			<territory type="FK" alt="variant">فالکلند (مالویناس)</territory>
+			<territory type="FM">میکرونزی</territory>
+			<territory type="FO">فارو جزایر</territory>
+			<territory type="FR">فرانسه</territory>
+			<territory type="GA">گابون</territory>
+			<territory type="GB">بریتانیا</territory>
+			<territory type="GB" alt="short">بریتانیا</territory>
+			<territory type="GD">گرانادا</territory>
+			<territory type="GE">گرجستون</territory>
+			<territory type="GF">فرانسه‌ی ِگویان</territory>
+			<territory type="GG">گرنزی</territory>
+			<territory type="GH">غنا</territory>
+			<territory type="GI">جبل طارق</territory>
+			<territory type="GL">گرینلند</territory>
+			<territory type="GM">گامبیا</territory>
+			<territory type="GN">گینه</territory>
+			<territory type="GP">گوادلوپ</territory>
+			<territory type="GQ">استوایی گینه</territory>
+			<territory type="GR">یونان</territory>
+			<territory type="GS">جنوبی جورجیا و جنوبی ساندویچ جزایر</territory>
+			<territory type="GT">گواتمالا</territory>
+			<territory type="GU">گوئام</territory>
+			<territory type="GW">گینه بیسائو</territory>
+			<territory type="GY">گویان</territory>
+			<territory type="HK">هنگ کنگ</territory>
+			<territory type="HK" alt="short">هونگ کونگ</territory>
+			<territory type="HM">هارد و مک‌دونالد جزایر</territory>
+			<territory type="HN">هندوراس</territory>
+			<territory type="HR">کرواسی</territory>
+			<territory type="HT">هاییتی</territory>
+			<territory type="HU">مجارستون</territory>
+			<territory type="IC">قناری جزایر</territory>
+			<territory type="ID">اندونزی</territory>
+			<territory type="IE">ایرلند</territory>
+			<territory type="IL">ایسراییل</territory>
+			<territory type="IM">من ِجزیره</territory>
+			<territory type="IN">هند</territory>
+			<territory type="IO">بریتانیای هند ِاوقیانوس ِمناطق</territory>
+			<territory type="IQ">عراق</territory>
+			<territory type="IR">ایران</territory>
+			<territory type="IS">ایسلند</territory>
+			<territory type="IT">ایتالیا</territory>
+			<territory type="JE">جرسی</territory>
+			<territory type="JM">جاماییکا</territory>
+			<territory type="JO">اردن</territory>
+			<territory type="JP">جاپون</territory>
+			<territory type="KE">کنیا</territory>
+			<territory type="KG">قرقیزستون</territory>
+			<territory type="KH">کامبوج</territory>
+			<territory type="KI">کیریباتی</territory>
+			<territory type="KM">کومور</territory>
+			<territory type="KN">سنت کیتس و نویس</territory>
+			<territory type="KP">شمالی کُره</territory>
+			<territory type="KR">جنوبی کُره</territory>
+			<territory type="KW">کویت</territory>
+			<territory type="KY">کیمن جزیره‌ئون</territory>
+			<territory type="KZ">قزاقستون</territory>
+			<territory type="LA">لائوس</territory>
+			<territory type="LB">لبنان</territory>
+			<territory type="LC">سنت لوسیا</territory>
+			<territory type="LI">لیختن اشتاین</territory>
+			<territory type="LK">سریلانکا</territory>
+			<territory type="LR">لیبریا</territory>
+			<territory type="LS">لسوتو</territory>
+			<territory type="LT">لتونی</territory>
+			<territory type="LU">لوکزامبورگ</territory>
+			<territory type="LV">لاتویا</territory>
+			<territory type="LY">لیبی</territory>
+			<territory type="MA">مراکش</territory>
+			<territory type="MC">موناکو</territory>
+			<territory type="MD">مولداوی</territory>
+			<territory type="ME">مونته‌نگرو</territory>
+			<territory type="MF">سنت مارتین</territory>
+			<territory type="MG">ماداگاسکار</territory>
+			<territory type="MH">مارشال جزایر</territory>
+			<territory type="MK">مقدونیه</territory>
+			<territory type="MK" alt="variant">مقدونیه جمهوری</territory>
+			<territory type="ML">مالی</territory>
+			<territory type="MM">میانمار</territory>
+			<territory type="MN">مغولستون</territory>
+			<territory type="MO">ماکائو (چین دله)</territory>
+			<territory type="MO" alt="short">ماکائو</territory>
+			<territory type="MP">شمالی ماریانا جزایر</territory>
+			<territory type="MQ">مارتینیک جزیره‌ئون</territory>
+			<territory type="MR">موریتانی</territory>
+			<territory type="MS">مونتسرات</territory>
+			<territory type="MT">مالت</territory>
+			<territory type="MU">مورى تيوس</territory>
+			<territory type="MV">مالدیو</territory>
+			<territory type="MW">مالاوی</territory>
+			<territory type="MX">مکزیک</territory>
+			<territory type="MY">مالزی</territory>
+			<territory type="MZ">موزامبیک</territory>
+			<territory type="NA">نامبیا</territory>
+			<territory type="NC">نیو کالیدونیا</territory>
+			<territory type="NE">نیجر</territory>
+			<territory type="NF">نورفولک جزیره</territory>
+			<territory type="NG">نیجریه</territory>
+			<territory type="NI">نیکاراگوئه</territory>
+			<territory type="NL">هلند</territory>
+			<territory type="NO">نروژ</territory>
+			<territory type="NP">نپال</territory>
+			<territory type="NR">نائورو</territory>
+			<territory type="NU">نیئو</territory>
+			<territory type="NZ">نیوزلند</territory>
+			<territory type="OM">عمان</territory>
+			<territory type="PA">پاناما</territory>
+			<territory type="PE">پرو</territory>
+			<territory type="PF">فرانسه‌ی پولی‌نزی</territory>
+			<territory type="PG">پاپوا نو گینه</territory>
+			<territory type="PH">فیلیپین</territory>
+			<territory type="PK">پاکستون</territory>
+			<territory type="PL">لهستون</territory>
+			<territory type="PM">سن پییر و میکلن</territory>
+			<territory type="PN">پیتکارین جزایر</territory>
+			<territory type="PR">پورتوریکو</territory>
+			<territory type="PS">فلسطین ِسرزمین</territory>
+			<territory type="PS" alt="short">فلسطین</territory>
+			<territory type="PT">پرتغال</territory>
+			<territory type="PW">پالائو</territory>
+			<territory type="PY">پاراگوئه</territory>
+			<territory type="QA">قطر</territory>
+			<territory type="QO">اوقیانوسیه‌ی ِپرت ِجائون</territory>
+			<territory type="RE">رئونیون</territory>
+			<territory type="RO">رومانی</territory>
+			<territory type="RS">صربستون</territory>
+			<territory type="RU">روسیه</territory>
+			<territory type="RW">روآندا</territory>
+			<territory type="SA">عربستون</territory>
+			<territory type="SB">سلیمون جزیره</territory>
+			<territory type="SC">سیشل</territory>
+			<territory type="SD">سودان</territory>
+			<territory type="SE">سوئد</territory>
+			<territory type="SG">سنگاپور</territory>
+			<territory type="SH">سنت هلنا</territory>
+			<territory type="SI">اسلوونی</territory>
+			<territory type="SJ">سوالبارد و يان ماين</territory>
+			<territory type="SK">اسلواکی</territory>
+			<territory type="SL">سیرالئون</territory>
+			<territory type="SM">سن مارینو</territory>
+			<territory type="SN">سنگال</territory>
+			<territory type="SO">سومالی</territory>
+			<territory type="SR">سورینام</territory>
+			<territory type="SS">جنوبی سودان</territory>
+			<territory type="ST">سائوتومه و پرینسیپ</territory>
+			<territory type="SV">السالوادور</territory>
+			<territory type="SX">سنت مارتن</territory>
+			<territory type="SY">سوریه</territory>
+			<territory type="SZ">سوازیلند</territory>
+			<territory type="TA">تریستان دا جونها</territory>
+			<territory type="TC">تورکس و کایکوس جزایر</territory>
+			<territory type="TD">چاد</territory>
+			<territory type="TF">فرانسه‌ی جنوبی مناطق</territory>
+			<territory type="TG">توگو</territory>
+			<territory type="TH">تایلند</territory>
+			<territory type="TJ">تاجیکستون</territory>
+			<territory type="TK">توکلائو</territory>
+			<territory type="TL">تیمور شرقی</territory>
+			<territory type="TL" alt="variant">شرقی تیمور</territory>
+			<territory type="TM">ترکمونستون</territory>
+			<territory type="TN">تونس</territory>
+			<territory type="TO">تونگا</territory>
+			<territory type="TR">ترکیه</territory>
+			<territory type="TT">ترینیداد و توباگو</territory>
+			<territory type="TV">تووالو</territory>
+			<territory type="TW">تایوان</territory>
+			<territory type="TZ">تانزانیا</territory>
+			<territory type="UA">اوکراین</territory>
+			<territory type="UG">اوگاندا</territory>
+			<territory type="UM">آمریکای پَرتِ‌پِلا جزیره‌ئون</territory>
+			<territory type="US">متحده ایالات</territory>
+			<territory type="US" alt="short">آمریکا متحده ایالات</territory>
+			<territory type="UY">اروگوئه</territory>
+			<territory type="UZ">ازبکستون</territory>
+			<territory type="VA">واتیکان</territory>
+			<territory type="VC">سنت وینسنت و گرنادین</territory>
+			<territory type="VE">ونزوئلا</territory>
+			<territory type="VG">بریتانیای ویرجین</territory>
+			<territory type="VI">آمریکای ویرجین</territory>
+			<territory type="VN">ویتنام</territory>
+			<territory type="VU">وانواتو</territory>
+			<territory type="WF">والیس و فوتونا</territory>
+			<territory type="WS">ساموآ</territory>
+			<territory type="XK">کوزوو</territory>
+			<territory type="YE">یمن</territory>
+			<territory type="YT">مایوت</territory>
+			<territory type="ZA">جنوبی افریقا</territory>
+			<territory type="ZM">زامبیا</territory>
+			<territory type="ZW">زیمبابوه</territory>
+			<territory type="ZZ">نامَیِّن منطقه</territory>
+		</territories>
+		<measurementSystemNames>
+			<measurementSystemName type="metric">متریک</measurementSystemName>
+			<measurementSystemName type="UK">بریتانیایی</measurementSystemName>
+			<measurementSystemName type="US">آمریکایی</measurementSystemName>
+		</measurementSystemNames>
+		<codePatterns>
+			<codePattern type="language">زوون: {0}</codePattern>
+			<codePattern type="script">اسکریپت: {0}</codePattern>
+			<codePattern type="territory">منطقه: {0}</codePattern>
+		</codePatterns>
+	</localeDisplayNames>
+	<layout>
+		<orientation>
+			<characterOrder>right-to-left</characterOrder>
+			<lineOrder>top-to-bottom</lineOrder>
+		</orientation>
+	</layout>
+	<characters>
+		<exemplarCharacters>[\u064B \u064C \u064D \u0651 \u0654 ء آ أ ؤ ئ ا ب پ ة ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ه و ی]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[\u200C\u200D\u200E\u200F \u064E \u064F \u0650 \u0652 \u0656 \u0670 إ ك ى ي]</exemplarCharacters>
+		<exemplarCharacters type="index">[آ ا ب پ ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ه و ی]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐ ، ٫ ٬ ؛ \: ! ؟ . … ‹ › « » ( ) \[ \] * / \\]</exemplarCharacters>
+		<ellipsis type="final">{0}…</ellipsis>
+		<ellipsis type="initial">…{0}</ellipsis>
+		<ellipsis type="medial">{0}…{1}</ellipsis>
+		<ellipsis type="word-final">{0} …</ellipsis>
+		<ellipsis type="word-initial">… {0}</ellipsis>
+		<ellipsis type="word-medial">{0} … {1}</ellipsis>
+		<moreInformation>؟</moreInformation>
+	</characters>
+	<delimiters>
+		<quotationStart>«</quotationStart>
+		<quotationEnd>»</quotationEnd>
+		<alternateQuotationStart>‹</alternateQuotationStart>
+		<alternateQuotationEnd>›</alternateQuotationEnd>
+	</delimiters>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">ژانویه</month>
+							<month type="2">فوریه</month>
+							<month type="3">مارس</month>
+							<month type="4">آوریل</month>
+							<month type="5">مه</month>
+							<month type="6">ژوئن</month>
+							<month type="7">ژوئیه</month>
+							<month type="8">اوت</month>
+							<month type="9">سپتامبر</month>
+							<month type="10">اکتبر</month>
+							<month type="11">نوامبر</month>
+							<month type="12">دسامبر</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">ژانویه</month>
+							<month type="2">فوریه</month>
+							<month type="3">مارس</month>
+							<month type="4">آوریل</month>
+							<month type="5">مه</month>
+							<month type="6">ژوئن</month>
+							<month type="7">ژوئیه</month>
+							<month type="8">اوت</month>
+							<month type="9">سپتامبر</month>
+							<month type="10">اکتبر</month>
+							<month type="11">نوامبر</month>
+							<month type="12">دسامبر</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">ژانویه</month>
+							<month type="2">فوریه</month>
+							<month type="3">مارس</month>
+							<month type="4">آوریل</month>
+							<month type="5">مه</month>
+							<month type="6">ژوئن</month>
+							<month type="7">ژوئیه</month>
+							<month type="8">اوت</month>
+							<month type="9">سپتامبر</month>
+							<month type="10">اکتبر</month>
+							<month type="11">نوامبر</month>
+							<month type="12">دسامبر</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">ژانویه</month>
+							<month type="2">فوریه</month>
+							<month type="3">مارس</month>
+							<month type="4">آوریل</month>
+							<month type="5">مه</month>
+							<month type="6">ژوئن</month>
+							<month type="7">ژوئیه</month>
+							<month type="8">اوت</month>
+							<month type="9">سپتامبر</month>
+							<month type="10">اکتبر</month>
+							<month type="11">نوامبر</month>
+							<month type="12">دسامبر</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<eras>
+					<eraNames>
+						<era type="0">قبل میلاد</era>
+						<era type="0" alt="variant">قبل میلادی تقویم</era>
+						<era type="1">بعد میلاد</era>
+						<era type="1" alt="variant">میلادی</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">پ.م</era>
+						<era type="0" alt="variant">پ.م.</era>
+						<era type="1">م.</era>
+						<era type="1" alt="variant">م</era>
+					</eraAbbr>
+				</eras>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="era">
+				<displayName>تقویم</displayName>
+			</field>
+			<field type="year">
+				<displayName>سال</displayName>
+				<relative type="-1">پارسال</relative>
+				<relative type="0">امسال</relative>
+				<relative type="1">سال دیگه</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} سال دله</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} سال پیش</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-short">
+				<displayName>سال</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} سال دله</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} سال پیش</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-narrow">
+				<displayName>سال</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} سال دله</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} سال پیش</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter">
+				<displayName>ربع</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} ربع دله</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ربع پیش</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-short">
+				<displayName>ربع</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} ربع دله</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ربع پیش</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-narrow">
+				<displayName>ربع</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} ربع دله</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ربع پیش</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month">
+				<displayName>ماه</displayName>
+				<relative type="-1">ماه قبل</relative>
+				<relative type="0">این ماه</relative>
+				<relative type="1">ماه ِبعد</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} ماه دله</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ماه پیش</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-short">
+				<displayName>ماه</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} ماه دله</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ماه پیش</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-narrow">
+				<displayName>ماه</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} ماه دله</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ماه پیش</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week">
+				<displayName>هفته</displayName>
+				<relative type="-1">قبلی هفته</relative>
+				<relative type="0">این هفته</relative>
+				<relative type="1">بعدی هفته</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} هفته دله</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} هفته پیش</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-short">
+				<displayName>هفته</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} هفته دله</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} هفته پیش</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-narrow">
+				<displayName>هفته</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} هفته دله</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} هفته پیش</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day">
+				<displayName>روز</displayName>
+				<relative type="-1">دیروز</relative>
+				<relative type="0">اَمروز</relative>
+				<relative type="1">فِردا</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} روز دله</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} روز پیش</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-short">
+				<displayName>روز</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} روز دله</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} روز پیش</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-narrow">
+				<displayName>روز</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} روز دله</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} روز پیش</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="weekday">
+				<displayName>هفته‌ی ِروز</displayName>
+			</field>
+			<field type="sun">
+				<relative type="-1">قبلی یکشنبه</relative>
+				<relative type="0">این یکشنبه</relative>
+				<relative type="1">بعدی یکشنبه</relative>
+			</field>
+			<field type="sun-short">
+				<relative type="-1">یکشنبه قبل</relative>
+				<relative type="0">این یکشنبه</relative>
+				<relative type="1">یکشنبه بعد</relative>
+			</field>
+			<field type="sun-narrow">
+				<relative type="-1">قبلی یکشنبه</relative>
+				<relative type="0">این یکشنبه</relative>
+				<relative type="1">بعدی یکشنبه</relative>
+			</field>
+			<field type="mon">
+				<relative type="-1">قبلی دِشنبه</relative>
+				<relative type="0">این دِشنبه</relative>
+				<relative type="1">بعدی دِشنبه</relative>
+			</field>
+			<field type="mon-short">
+				<relative type="-1">قبلی دِشنبه</relative>
+				<relative type="0">این دِشنبه</relative>
+				<relative type="1">بعدی دِشنبه</relative>
+			</field>
+			<field type="mon-narrow">
+				<relative type="-1">قبلی دِشنبه</relative>
+				<relative type="0">این دِشنبه</relative>
+				<relative type="1">بعدی دِشنبه</relative>
+			</field>
+			<field type="tue">
+				<relative type="-1">قبلی سه‌شنبه</relative>
+				<relative type="0">این سه‌شنبه</relative>
+				<relative type="1">بعدی سه‌شنبه</relative>
+			</field>
+			<field type="tue-short">
+				<relative type="-1">قبلی سه‌شنبه</relative>
+				<relative type="0">این سه‌شنبه</relative>
+				<relative type="1">بعدی سه‌شنبه</relative>
+			</field>
+			<field type="tue-narrow">
+				<relative type="-1">قبلی سه‌شنبه</relative>
+				<relative type="0">این سه‌شنبه</relative>
+				<relative type="1">بعدی سه‌شنبه</relative>
+			</field>
+			<field type="wed">
+				<relative type="-1">قبلی چارشنبه</relative>
+				<relative type="0">این چارشنبه</relative>
+				<relative type="1">بعدی چارشنبه</relative>
+			</field>
+			<field type="wed-short">
+				<relative type="-1">قبلی چارشنبه</relative>
+				<relative type="0">این چارشنبه</relative>
+				<relative type="1">بعدی چارشنبه</relative>
+			</field>
+			<field type="wed-narrow">
+				<relative type="-1">قبلی چارشنبه</relative>
+				<relative type="0">این چارشنبه</relative>
+				<relative type="1">بعدی چارشنبه</relative>
+			</field>
+			<field type="thu">
+				<relative type="-1">قبلی پنجشنبه</relative>
+				<relative type="0">این پنجشنبه</relative>
+				<relative type="1">بعدی پنجشنبه</relative>
+			</field>
+			<field type="thu-short">
+				<relative type="-1">قبلی پنجشنبه</relative>
+				<relative type="0">این پنجشنبه</relative>
+				<relative type="1">بعدی پنجشنبه</relative>
+			</field>
+			<field type="thu-narrow">
+				<relative type="-1">قبلی پنجشنبه</relative>
+				<relative type="0">این پنجشنبه</relative>
+				<relative type="1">بعدی پنجشنبه</relative>
+			</field>
+			<field type="fri">
+				<relative type="-1">قبلی جومه</relative>
+				<relative type="0">این جومه</relative>
+				<relative type="1">بعدی جومه</relative>
+			</field>
+			<field type="fri-short">
+				<relative type="-1">قبلی جومه</relative>
+				<relative type="0">این جومه</relative>
+				<relative type="1">بعدی جومه</relative>
+			</field>
+			<field type="fri-narrow">
+				<relative type="-1">قبلی جومه</relative>
+				<relative type="0">این جومه</relative>
+				<relative type="1">بعدی جومه</relative>
+			</field>
+			<field type="sat">
+				<relative type="-1">قبلی شنبه</relative>
+				<relative type="0">این شنبه</relative>
+				<relative type="1">بعدی شنبه</relative>
+			</field>
+			<field type="sat-short">
+				<relative type="-1">قبلی شنبه</relative>
+				<relative type="0">این شنبه</relative>
+				<relative type="1">بعدی شنبه</relative>
+			</field>
+			<field type="sat-narrow">
+				<relative type="-1">قبلی شنبه</relative>
+				<relative type="0">این شنبه</relative>
+				<relative type="1">بعدی شنبه</relative>
+			</field>
+			<field type="dayperiod">
+				<displayName>صواحی/ظُر</displayName>
+			</field>
+			<field type="hour">
+				<displayName>ساعِت</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} ساعِت دله</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ساعِت پیش</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-short">
+				<displayName>ساعت</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} ساعت دله</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ساعت پیش</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-narrow">
+				<displayName>ساعت</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} ساعت دله</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ساعت پیش</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute">
+				<displayName>دقیقه</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} دقیقه دله</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} دَقه پیش</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-short">
+				<displayName>دَقه</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} دَقه دله</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} دَقه پیش</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-narrow">
+				<displayName>دَقه</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} دَقه دله</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} دَقه پیش</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second">
+				<displayName>ثانیه</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} ثانیه دله</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ثانیه پیش</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-short">
+				<displayName>ثانیه</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} ثانیه دله</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ثانیه پیش</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-narrow">
+				<displayName>ثانیه</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} ثانیه دله</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ثانیه پیش</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="zone">
+				<displayName>زمونی منقطه</displayName>
+			</field>
+		</fields>
+		<timeZoneNames>
+			<hourFormat>+HH:mm;-HH:mm</hourFormat>
+			<gmtFormat>GMT{0}</gmtFormat>
+			<gmtZeroFormat>GMT</gmtZeroFormat>
+			<regionFormat>{0}</regionFormat>
+			<regionFormat type="daylight">{0} (+1)</regionFormat>
+			<regionFormat type="standard">{0} (+0)</regionFormat>
+			<fallbackFormat>{1} ({0})</fallbackFormat>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<defaultNumberingSystem draft="contributed">arabext</defaultNumberingSystem>
+		<otherNumberingSystems>
+			<native draft="contributed">arabext</native>
+		</otherNumberingSystems>
+		<currencies>
+			<currency type="AED">
+				<displayName>متحده عربی امارات ِدرهم</displayName>
+				<displayName count="other">امارات ِدرهم</displayName>
+				<symbol draft="contributed">AED</symbol>
+			</currency>
+			<currency type="AFN">
+				<displayName>افغانستون ِافغانی</displayName>
+				<displayName count="other">افغانستون ِافغانی</displayName>
+				<symbol draft="contributed">AFN</symbol>
+			</currency>
+			<currency type="ALL">
+				<displayName>آلبانی ِلک</displayName>
+				<displayName count="other">آلبانی ِلک</displayName>
+				<symbol draft="contributed">ALL</symbol>
+			</currency>
+			<currency type="AMD">
+				<displayName>ارمنستون درهم</displayName>
+				<displayName count="other">ارمنستون درهم</displayName>
+				<symbol draft="contributed">AMD</symbol>
+			</currency>
+			<currency type="ANG">
+				<displayName>هلند ِآنتیل ِجزایر ِگویلدر</displayName>
+				<displayName count="other">هلند ِآنتیل ِجزایر ِگویلدر</displayName>
+				<symbol draft="contributed">ANG</symbol>
+			</currency>
+			<currency type="AOA">
+				<displayName>آنگولای ِکوانزا</displayName>
+				<displayName count="other">آنگولای ِکوانزا</displayName>
+				<symbol draft="contributed">AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
+			</currency>
+			<currency type="ARS">
+				<displayName>آرژانتین ِپزو</displayName>
+				<displayName count="other">آرژانتین ِپزو</displayName>
+				<symbol draft="contributed">ARS</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="AWG">
+				<displayName>آروبای ِفلورن</displayName>
+				<displayName count="other">آروبای فلورن</displayName>
+				<symbol draft="contributed">AWG</symbol>
+			</currency>
+			<currency type="AZN">
+				<displayName>آذربایجون ِمنات</displayName>
+				<displayName count="other">آذربایجون ِمنات</displayName>
+				<symbol draft="contributed">AZN</symbol>
+			</currency>
+			<currency type="BAM">
+				<displayName>بوسنی و هرزگوین ِتبدیل‌بَیی مارک</displayName>
+				<displayName count="other">بوسنی و هرزگوین ِتبدیل‌بَیی مارک</displayName>
+				<symbol draft="contributed">BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
+			</currency>
+			<currency type="BBD">
+				<displayName>باربادوس ِدولار</displayName>
+				<displayName count="other">باربادوس دلار</displayName>
+				<symbol draft="contributed">BBD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BDT">
+				<displayName>بنگلادش ِتاکا</displayName>
+				<displayName count="other">بنگلادش ِتاکا</displayName>
+				<symbol draft="contributed">BDT</symbol>
+				<symbol alt="narrow" draft="contributed">৳</symbol>
+			</currency>
+			<currency type="BGN">
+				<displayName>بلغارستون ِلیوا</displayName>
+				<displayName count="other">بلغارستون ِلیوا</displayName>
+				<symbol draft="contributed">BGN</symbol>
+			</currency>
+			<currency type="BHD">
+				<displayName>بحرین ِدینار</displayName>
+				<displayName count="other">بحرین ِدینار</displayName>
+				<symbol draft="contributed">BHD</symbol>
+			</currency>
+			<currency type="BIF">
+				<displayName>بوروندی ِفرانک</displayName>
+				<displayName count="other">بوروندی ِفرانک</displayName>
+				<symbol draft="contributed">BIF</symbol>
+			</currency>
+			<currency type="BMD">
+				<displayName>برمودای ِدولار</displayName>
+				<displayName count="other">برمودای ِدلار</displayName>
+				<symbol draft="contributed">BMD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BND">
+				<displayName>برونئی ِدولار</displayName>
+				<displayName count="other">برونئی دلار</displayName>
+				<symbol draft="contributed">BND</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BOB">
+				<displayName>بولیوی ِبولیویانو</displayName>
+				<displayName count="other">بولیوی ِبولیویانو</displayName>
+				<symbol draft="contributed">BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
+			</currency>
+			<currency type="BRL">
+				<displayName>برزیل ِرئال</displayName>
+				<displayName count="other">برزیل ِرئال</displayName>
+				<symbol draft="contributed">R$</symbol>
+				<symbol alt="narrow" draft="contributed">R$</symbol>
+			</currency>
+			<currency type="BSD">
+				<displayName>باهامای ِدولار</displayName>
+				<displayName count="other">باهامای ِدولار</displayName>
+				<symbol draft="contributed">BSD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BTN">
+				<displayName>بوتان ِنگولتروم</displayName>
+				<displayName count="other">بوتان ِنگولتروم</displayName>
+				<symbol draft="contributed">BTN</symbol>
+			</currency>
+			<currency type="BWP">
+				<displayName>بوتساوانای ِپولا</displayName>
+				<displayName count="other">بوتساوانای ِپولا</displayName>
+				<symbol draft="contributed">BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
+			</currency>
+			<currency type="BYR">
+				<displayName>بلاروس ِروبل</displayName>
+				<displayName count="other">بلاروس ِروبل</displayName>
+				<symbol draft="contributed">BYR</symbol>
+				<symbol alt="narrow" draft="contributed">р.</symbol>
+			</currency>
+			<currency type="BZD">
+				<displayName>بلیز ِدولار</displayName>
+				<displayName count="other">بلیز دلار</displayName>
+				<symbol draft="contributed">BZD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CAD">
+				<displayName>کانادای ِدولار</displayName>
+				<displayName count="other">کانادای ِدلار</displayName>
+				<symbol draft="contributed">CA$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CDF">
+				<displayName>کنگوی ِفرانک</displayName>
+				<displayName count="other">کنگوی ِفرانک</displayName>
+				<symbol draft="contributed">CDF</symbol>
+			</currency>
+			<currency type="CHF">
+				<displayName>سوییس ِفرانک</displayName>
+				<displayName count="other">سوییس ِفرانک</displayName>
+				<symbol draft="contributed">CHF</symbol>
+			</currency>
+			<currency type="CLP">
+				<displayName>شیلی ِپزو</displayName>
+				<displayName count="other">شیلی ِپزو</displayName>
+				<symbol draft="contributed">CLP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CNY">
+				<displayName>چین ِیوآن</displayName>
+				<displayName count="other">چین ِیوآن</displayName>
+				<symbol draft="contributed">CN¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
+			</currency>
+			<currency type="COP">
+				<displayName>کلمبیای ِپزو</displayName>
+				<displayName count="other">کلمبیای ِپزو</displayName>
+				<symbol draft="contributed">COP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CRC">
+				<displayName>کاستاریکای ِکولون</displayName>
+				<displayName count="other">کاستاریکا کولون</displayName>
+				<symbol draft="contributed">CRC</symbol>
+				<symbol alt="narrow" draft="contributed">₡</symbol>
+			</currency>
+			<currency type="CUC">
+				<displayName>کوبای ِتبدیل‌بَیی پزو</displayName>
+				<displayName count="other">کوبای تبدیل‌بَیی پزو</displayName>
+				<symbol draft="contributed">CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CUP">
+				<displayName>کوبای ِپزو</displayName>
+				<displayName count="other">کوبای پزو</displayName>
+				<symbol draft="contributed">CUP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CVE">
+				<displayName>عاج ِساحل ِایسکودو</displayName>
+				<displayName count="other">عاج ِساحل ِایسکودو</displayName>
+				<symbol draft="contributed">CVE</symbol>
+			</currency>
+			<currency type="CZK">
+				<displayName>چک ِکرون</displayName>
+				<displayName count="other">چک ِکرون</displayName>
+				<symbol draft="contributed">CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
+			</currency>
+			<currency type="DJF">
+				<displayName>جیبوتی ِفرانک</displayName>
+				<displayName count="other">جیبوتی ِفرانک</displayName>
+				<symbol draft="contributed">DJF</symbol>
+			</currency>
+			<currency type="DKK">
+				<displayName>دانمارک ِکورن</displayName>
+				<displayName count="other">دانمارک ِکورن</displayName>
+				<symbol draft="contributed">DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="DOP">
+				<displayName>دومینیکن ِپزو</displayName>
+				<displayName count="other">دومینیکن پزو</displayName>
+				<symbol draft="contributed">DOP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="DZD">
+				<displayName>الجزیره‌ی ِدینار</displayName>
+				<displayName count="other">الجزیره‌ی ِدینار</displayName>
+				<symbol draft="contributed">DZD</symbol>
+			</currency>
+			<currency type="EGP">
+				<displayName>مصر ِپوند</displayName>
+				<displayName count="other">مصر ِپوند</displayName>
+				<symbol draft="contributed">EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
+			</currency>
+			<currency type="ERN">
+				<displayName>اریتره‌ی ِناکفا</displayName>
+				<displayName count="other">اریتره‌ی ِناکفا</displayName>
+				<symbol draft="contributed">ERN</symbol>
+			</currency>
+			<currency type="ETB">
+				<displayName>اتیوپی ِبیر</displayName>
+				<displayName count="other">اتیوپی ِبیر</displayName>
+				<symbol draft="contributed">ETB</symbol>
+			</currency>
+			<currency type="EUR">
+				<displayName>یورو</displayName>
+				<displayName count="other">یورو</displayName>
+				<symbol draft="contributed">€</symbol>
+				<symbol alt="narrow" draft="contributed">€</symbol>
+			</currency>
+			<currency type="FKP">
+				<displayName>فالکلند ِجزایر ِپوند</displayName>
+				<displayName count="other">فالکلند ِجزایر ِپوند</displayName>
+				<symbol draft="contributed">FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="GBP">
+				<displayName>بریتانیای ِپوند</displayName>
+				<displayName count="other">بریتانیای ِپوند</displayName>
+				<symbol draft="contributed">£</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="GEL">
+				<displayName>گرجستون ِلاری</displayName>
+				<displayName count="other">گرجستون ِلاری</displayName>
+				<symbol draft="contributed">GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
+			</currency>
+			<currency type="GHS">
+				<displayName>غنای ِسدی</displayName>
+				<displayName count="other">غنای ِسدی</displayName>
+				<symbol draft="contributed">GHS</symbol>
+			</currency>
+			<currency type="GIP">
+				<displayName>جبل‌طارق ِپوند</displayName>
+				<displayName count="other">جبل‌طارق ِپوند</displayName>
+				<symbol draft="contributed">GIP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="GMD">
+				<displayName>گامبیای ِدالاسی</displayName>
+				<displayName count="other">گامبیای ِدالاسی</displayName>
+				<symbol draft="contributed">GMD</symbol>
+			</currency>
+			<currency type="GNF">
+				<displayName>گینه‌ی ِفرانک</displayName>
+				<displayName count="other">گینه‌ی ِفرانک</displayName>
+				<symbol draft="contributed">GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
+			</currency>
+			<currency type="GTQ">
+				<displayName>گواتمالا کتزال</displayName>
+				<displayName count="other">گواتمالای ِکتزال</displayName>
+				<symbol draft="contributed">GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
+			</currency>
+			<currency type="GYD">
+				<displayName>گویان ِدولار</displayName>
+				<displayName count="other">گویان دلار</displayName>
+				<symbol draft="contributed">GYD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="HKD">
+				<displayName>هونگ کونگ ِدولار</displayName>
+				<displayName count="other">هنگ کنگ ِدلار</displayName>
+				<symbol draft="contributed">HK$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="HNL">
+				<displayName>هندوراس ِلمپیرا</displayName>
+				<displayName count="other">هندوراس لمپیرا</displayName>
+				<symbol draft="contributed">HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
+			</currency>
+			<currency type="HRK">
+				<displayName>کرواسی ِکونا</displayName>
+				<displayName count="other">کرواسی ِکونا</displayName>
+				<symbol draft="contributed">HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
+			</currency>
+			<currency type="HTG">
+				<displayName>هائیتی ِگورد</displayName>
+				<displayName count="other">هاییتی گورد</displayName>
+				<symbol draft="contributed">HTG</symbol>
+			</currency>
+			<currency type="HUF">
+				<displayName>مجارستون ِفروینت</displayName>
+				<displayName count="other">مجارستون ِفروینت</displayName>
+				<symbol draft="contributed">HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
+			</currency>
+			<currency type="IDR">
+				<displayName>اندونزی ِروپیه</displayName>
+				<displayName count="other">اندونزی ِروپیه</displayName>
+				<symbol draft="contributed">IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
+			</currency>
+			<currency type="ILS">
+				<displayName>اسراییل ِنو شِکِل</displayName>
+				<displayName count="other">اسراییل ِنو شِکِل</displayName>
+				<symbol draft="contributed">₪</symbol>
+				<symbol alt="narrow" draft="contributed">₪</symbol>
+			</currency>
+			<currency type="INR">
+				<displayName>هند ِروپیه</displayName>
+				<displayName count="other">هند ِروپیه</displayName>
+				<symbol draft="contributed">₹</symbol>
+				<symbol alt="narrow" draft="contributed">₹</symbol>
+			</currency>
+			<currency type="IQD">
+				<displayName>عراق ِدینار</displayName>
+				<displayName count="other">عراق ِدینار</displayName>
+				<symbol draft="contributed">IQD</symbol>
+			</currency>
+			<currency type="IRR">
+				<displayName>ایران ریال</displayName>
+				<displayName count="other">ایران ریال</displayName>
+				<symbol draft="contributed">IRR</symbol>
+			</currency>
+			<currency type="ISK">
+				<displayName>ایسلند کرونا</displayName>
+				<displayName count="other">ایسلند کرونا</displayName>
+				<symbol draft="contributed">ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="JMD">
+				<displayName>جاماییکای ِدولار</displayName>
+				<displayName count="other">جاماییکا دلار</displayName>
+				<symbol draft="contributed">JMD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="JOD">
+				<displayName>اردن ِدینار</displayName>
+				<displayName count="other">اردن ِدینار</displayName>
+				<symbol draft="contributed">JOD</symbol>
+			</currency>
+			<currency type="JPY">
+				<displayName>جاپون ِین</displayName>
+				<displayName count="other">جاپون ِین</displayName>
+				<symbol draft="contributed">JP¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
+			</currency>
+			<currency type="KES">
+				<displayName>کنیای ِشیلینگ</displayName>
+				<displayName count="other">کنیای ِشیلینگ</displayName>
+				<symbol draft="contributed">KES</symbol>
+			</currency>
+			<currency type="KGS">
+				<displayName>قرقیزستون ِسام</displayName>
+				<displayName count="other">قرقیزستون ِسام</displayName>
+				<symbol draft="contributed">KGS</symbol>
+			</currency>
+			<currency type="KHR">
+				<displayName>کامبوج ِریل</displayName>
+				<displayName count="other">کامبوج ِریل</displayName>
+				<symbol draft="contributed">KHR</symbol>
+				<symbol alt="narrow" draft="contributed">៛</symbol>
+			</currency>
+			<currency type="KMF">
+				<displayName>کامرون ِفرانک</displayName>
+				<displayName count="other">کامرون ِفرانک</displayName>
+				<symbol draft="contributed">KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
+			</currency>
+			<currency type="KPW">
+				<displayName>شمالی کره‌ی ِوون</displayName>
+				<displayName count="other">شمالی کره وون</displayName>
+				<symbol draft="contributed">KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
+			</currency>
+			<currency type="KRW">
+				<displayName>جنوبی کُره‌ی ِوون</displayName>
+				<displayName count="other">جنوبی کره وون</displayName>
+				<symbol draft="contributed">₩</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
+			</currency>
+			<currency type="KWD">
+				<displayName>کویت ِدینار</displayName>
+				<displayName count="other">کویت ِدینار</displayName>
+				<symbol draft="contributed">KWD</symbol>
+			</currency>
+			<currency type="KYD">
+				<displayName>کایمن جزیره‌ی ِدولار</displayName>
+				<displayName count="other">کایمن جزیره‌ی دلار</displayName>
+				<symbol draft="contributed">KYD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="KZT">
+				<displayName>قراقستون ِتنگ</displayName>
+				<displayName count="other">قراقستون ِتنگ</displayName>
+				<symbol draft="contributed">KZT</symbol>
+				<symbol alt="narrow" draft="contributed">₸</symbol>
+			</currency>
+			<currency type="LAK">
+				<displayName>لائوس ِکیپ</displayName>
+				<displayName count="other">لائوس ِکیپ</displayName>
+				<symbol draft="contributed">LAK</symbol>
+				<symbol alt="narrow" draft="contributed">₭</symbol>
+			</currency>
+			<currency type="LBP">
+				<displayName>لبنان ِپوند</displayName>
+				<displayName count="other">لبنان ِپوند</displayName>
+				<symbol draft="contributed">LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
+			</currency>
+			<currency type="LKR">
+				<displayName>سریلانکا روپیه</displayName>
+				<displayName count="other">سریلانکا روپیه</displayName>
+				<symbol draft="contributed">LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="LRD">
+				<displayName>لیبریای ِدولار</displayName>
+				<displayName count="other">لیبریا دلار</displayName>
+				<symbol draft="contributed">LRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="LYD">
+				<displayName>لیبی ِدینار</displayName>
+				<displayName count="other">لیبی ِدینار</displayName>
+				<symbol draft="contributed">LYD</symbol>
+			</currency>
+			<currency type="MAD">
+				<displayName>مراکش ِدرهم</displayName>
+				<displayName count="other">مراکش ِدرهم</displayName>
+				<symbol draft="contributed">MAD</symbol>
+			</currency>
+			<currency type="MDL">
+				<displayName>مولداوی ِلئو</displayName>
+				<displayName count="other">مولداوی ِلئو</displayName>
+				<symbol draft="contributed">MDL</symbol>
+			</currency>
+			<currency type="MGA">
+				<displayName>ماداگاسکار ِآریاری</displayName>
+				<displayName count="other">ماداگاسکار ِآریاری</displayName>
+				<symbol draft="contributed">MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
+			</currency>
+			<currency type="MKD">
+				<displayName>مقدونیه‌ی ِدینار</displayName>
+				<displayName count="other">مقدونیه‌ی ِدینار</displayName>
+				<symbol draft="contributed">MKD</symbol>
+			</currency>
+			<currency type="MMK">
+				<displayName>میانمار ِکیات</displayName>
+				<displayName count="other">میانمار ِکیات</displayName>
+				<symbol draft="contributed">MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
+			</currency>
+			<currency type="MNT">
+				<displayName>مغلستون ِتوگریک</displayName>
+				<displayName count="other">مغلستون ِتوگریک</displayName>
+				<symbol draft="contributed">MNT</symbol>
+				<symbol alt="narrow" draft="contributed">₮</symbol>
+			</currency>
+			<currency type="MOP">
+				<displayName>ماکائو ِپاتاجا</displayName>
+				<displayName count="other">ماکائو ِپاتاجا</displayName>
+				<symbol draft="contributed">MOP</symbol>
+			</currency>
+			<currency type="MRO">
+				<displayName>موریتانی ِاوگوئیا</displayName>
+				<displayName count="other">موریتانی ِاوگوئیا</displayName>
+				<symbol draft="contributed">MRO</symbol>
+			</currency>
+			<currency type="MUR">
+				<displayName>موریتیان ِروپیه</displayName>
+				<displayName count="other">موریتیان ِروپیه</displayName>
+				<symbol draft="contributed">MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="MVR">
+				<displayName>مالدیو ِروفیا</displayName>
+				<displayName count="other">مالدیو ِروفیا</displayName>
+				<symbol draft="contributed">MVR</symbol>
+			</currency>
+			<currency type="MWK">
+				<displayName>مالاوی ِکواچا</displayName>
+				<displayName count="other">مالاوی ِکواچا</displayName>
+				<symbol draft="contributed">MWK</symbol>
+			</currency>
+			<currency type="MXN">
+				<displayName>مکزیک ِپزو</displayName>
+				<displayName count="other">مکزیک پزو</displayName>
+				<symbol draft="contributed">MX$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="MYR">
+				<displayName>مالزی ِرینگیت</displayName>
+				<displayName count="other">مالزی ِرینگیت</displayName>
+				<symbol draft="contributed">MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
+			</currency>
+			<currency type="MZN">
+				<displayName>موزامبیک متیکال</displayName>
+				<displayName count="other">موزامبیک متیکال</displayName>
+				<symbol draft="contributed">MZN</symbol>
+			</currency>
+			<currency type="NAD">
+				<displayName>نامبیای ِدولار</displayName>
+				<displayName count="other">نامبیای ِدلار</displayName>
+				<symbol draft="contributed">NAD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="NGN">
+				<displayName>نیجریه‌ی ِنیارا</displayName>
+				<displayName count="other">نیجریه‌ی ِنیارا</displayName>
+				<symbol draft="contributed">NGN</symbol>
+				<symbol alt="narrow" draft="contributed">₦</symbol>
+			</currency>
+			<currency type="NIO">
+				<displayName>نیکاراگوئه‌ی ِکوردوبا</displayName>
+				<displayName count="other">نیکاراگوئه کوردوبا</displayName>
+				<symbol draft="contributed">NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
+			</currency>
+			<currency type="NOK">
+				<displayName>نروژ ِکرون</displayName>
+				<displayName count="other">نروژ ِکرون</displayName>
+				<symbol draft="contributed">NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="NPR">
+				<displayName>نپال ِروپیه</displayName>
+				<displayName count="other">نپال ِروپیه</displayName>
+				<symbol draft="contributed">NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="OMR">
+				<displayName>عمان ِریال</displayName>
+				<displayName count="other">عمان ِریال</displayName>
+				<symbol draft="contributed">OMR</symbol>
+			</currency>
+			<currency type="PAB">
+				<displayName>پانامای ِبالبوا</displayName>
+				<displayName count="other">پانامای بالبوا</displayName>
+				<symbol draft="contributed">PAB</symbol>
+			</currency>
+			<currency type="PEN">
+				<displayName>پروی ِنوئوو سول</displayName>
+				<displayName count="other">پروی ِنوئوو سول</displayName>
+				<symbol draft="contributed">PEN</symbol>
+			</currency>
+			<currency type="PHP">
+				<displayName>فیلیپین ِپزو</displayName>
+				<displayName count="other">فیلیپین ِپزو</displayName>
+				<symbol draft="contributed">PHP</symbol>
+				<symbol alt="narrow" draft="contributed">₱</symbol>
+			</currency>
+			<currency type="PKR">
+				<displayName>پاکستون روپیه</displayName>
+				<displayName count="other">پاکستون روپیه</displayName>
+				<symbol draft="contributed">PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="PLN">
+				<displayName>لهستون ِزلوتی</displayName>
+				<displayName count="other">لهستون ِزلوتی</displayName>
+				<symbol draft="contributed">PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
+			</currency>
+			<currency type="PYG">
+				<displayName>پاراگوئه‌ی ِگوارانی</displayName>
+				<displayName count="other">پاراگوئه‌ی ِگوارانی</displayName>
+				<symbol draft="contributed">PYG</symbol>
+				<symbol alt="narrow" draft="contributed">₲</symbol>
+			</currency>
+			<currency type="QAR">
+				<displayName>قطر ِریال</displayName>
+				<displayName count="other">قطر ِریال</displayName>
+				<symbol draft="contributed">QAR</symbol>
+			</currency>
+			<currency type="RON">
+				<displayName>رومانی ِلئو</displayName>
+				<displayName count="other">رومانی ِلئو</displayName>
+				<symbol draft="contributed">RON</symbol>
+			</currency>
+			<currency type="RSD">
+				<displayName>صربستون ِدینار</displayName>
+				<displayName count="other">صربستون ِدینار</displayName>
+				<symbol draft="contributed">RSD</symbol>
+			</currency>
+			<currency type="RUB">
+				<displayName>روسیه‌ی ِروبل</displayName>
+				<displayName count="other">روسیه‌ی ِروبل</displayName>
+				<symbol draft="contributed">RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
+			</currency>
+			<currency type="RWF">
+				<displayName>روآندای ِفرانک</displayName>
+				<displayName count="other">روآندای ِفرانک</displayName>
+				<symbol draft="contributed">RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
+			</currency>
+			<currency type="SAR">
+				<displayName>عربستون ِریال</displayName>
+				<displayName count="other">عربستون ِریال</displayName>
+				<symbol draft="contributed">SAR</symbol>
+			</currency>
+			<currency type="SCR">
+				<displayName>سیشل ِروپیه</displayName>
+				<displayName count="other">سیشل ِروپیه</displayName>
+				<symbol draft="contributed">SCR</symbol>
+			</currency>
+			<currency type="SDG">
+				<displayName>سودان ِپوند</displayName>
+				<displayName count="other">سودان ِپوند</displayName>
+				<symbol draft="contributed">SDG</symbol>
+			</currency>
+			<currency type="SEK">
+				<displayName>سوئد ِکرون</displayName>
+				<displayName count="other">سوئد ِکرون</displayName>
+				<symbol draft="contributed">SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="SGD">
+				<displayName>سنگاپور ِدلار</displayName>
+				<displayName count="other">سنگاپور ِدلار</displayName>
+				<symbol draft="contributed">SGD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="SHP">
+				<displayName>سنت هلنای ِپوند</displayName>
+				<displayName count="other">سنت هلنای ِپوند</displayName>
+				<symbol draft="contributed">SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="SLL">
+				<displayName>سیرالئون ِلئون</displayName>
+				<displayName count="other">سیرالئون ِلئون</displayName>
+				<symbol draft="contributed">SLL</symbol>
+			</currency>
+			<currency type="SOS">
+				<displayName>سومالی ِشیلینگ</displayName>
+				<displayName count="other">سومالی ِشیلینگ</displayName>
+				<symbol draft="contributed">SOS</symbol>
+			</currency>
+			<currency type="SRD">
+				<displayName>سورینام ِدولار</displayName>
+				<displayName count="other">سورینام ِدولار</displayName>
+				<symbol draft="contributed">SRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="SSP">
+				<displayName>جنوبی سودان ِپوند</displayName>
+				<displayName count="other">جنوبی سودان ِپوند</displayName>
+				<symbol draft="contributed">SSP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="STD">
+				<displayName>سائوتومه و پرینسیپ ِدوبرا</displayName>
+				<displayName count="other">سائوتومه و پرینسیپ ِدوبرا</displayName>
+				<symbol draft="contributed">STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
+			</currency>
+			<currency type="SYP">
+				<displayName>سوریه‌ی ِپوند</displayName>
+				<displayName count="other">سوریه‌ی ِپوند</displayName>
+				<symbol draft="contributed">SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="SZL">
+				<displayName>سوازیلند ِلیلانجنی</displayName>
+				<displayName count="other">سوازیلند ِلیلانجنی</displayName>
+				<symbol draft="contributed">SZL</symbol>
+			</currency>
+			<currency type="THB">
+				<displayName>تایلند ِبات</displayName>
+				<displayName count="other">تایلند ِبات</displayName>
+				<symbol draft="contributed">THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
+			</currency>
+			<currency type="TJS">
+				<displayName>تاجیکستون ِسامانی</displayName>
+				<displayName count="other">تاجیکستون ِسامانی</displayName>
+				<symbol draft="contributed">TJS</symbol>
+			</currency>
+			<currency type="TMT">
+				<displayName>ترکمنستون ِمنات</displayName>
+				<displayName count="other">ترکمنستون ِمنات</displayName>
+				<symbol draft="contributed">TMT</symbol>
+			</currency>
+			<currency type="TND">
+				<displayName>تونس ِدینار</displayName>
+				<displayName count="other">تونس ِدینار</displayName>
+				<symbol draft="contributed">TND</symbol>
+			</currency>
+			<currency type="TRY">
+				<displayName>ترکیه‌ی ِلیره</displayName>
+				<displayName count="other">ترکیه‌ی ِلیره</displayName>
+				<symbol draft="contributed">TRY</symbol>
+				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
+			</currency>
+			<currency type="TTD">
+				<displayName>ترینیداد و توباگوی ِدولار</displayName>
+				<displayName count="other">ترینیداد و توباگوی ِدلار</displayName>
+				<symbol draft="contributed">TTD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="TWD">
+				<displayName>جدید ِتایوان ِدولار</displayName>
+				<displayName count="other">تایوان دلار</displayName>
+				<symbol draft="contributed">NT$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="TZS">
+				<displayName>تانزانیای ِشیلینگ</displayName>
+				<displayName count="other">تانزانیای ِشیلینگ</displayName>
+				<symbol draft="contributed">TZS</symbol>
+			</currency>
+			<currency type="UAH">
+				<displayName>اکراین ِگریونا</displayName>
+				<displayName count="other">اکراین ِگریونا</displayName>
+				<symbol draft="contributed">UAH</symbol>
+				<symbol alt="narrow" draft="contributed">₴</symbol>
+			</currency>
+			<currency type="UGX">
+				<displayName>اوگاندای ِشیلینگ</displayName>
+				<displayName count="other">اوگاندای ِشیلینگ</displayName>
+				<symbol draft="contributed">UGX</symbol>
+			</currency>
+			<currency type="USD">
+				<displayName>آمریکای ِدولار</displayName>
+				<displayName count="other">آمریکای ِدلار</displayName>
+				<symbol draft="contributed">$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="UYU">
+				<displayName>اروگوئه‌ی ِپزو</displayName>
+				<displayName count="other">اروگوئه‌ی ِپزو</displayName>
+				<symbol draft="contributed">UYU</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="UZS">
+				<displayName>ازبکستون ِسام</displayName>
+				<displayName count="other">ازبکستون ِسام</displayName>
+				<symbol draft="contributed">UZS</symbol>
+			</currency>
+			<currency type="VEF">
+				<displayName>ونزوئلایِ بولیوار</displayName>
+				<displayName count="other">ونزوئلایِ بولیوار</displayName>
+				<symbol draft="contributed">VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
+			</currency>
+			<currency type="VND">
+				<displayName>ویتنام ِدنگ</displayName>
+				<displayName count="other">ویتنام ِدنگ</displayName>
+				<symbol draft="contributed">₫</symbol>
+				<symbol alt="narrow" draft="contributed">₫</symbol>
+			</currency>
+			<currency type="XAF">
+				<displayName>میونی آفریقای ِسی‌اف‌ای فرانک</displayName>
+				<displayName count="other">میونی آفریقای ِسی‌اف‌ای فرانک</displayName>
+				<symbol draft="contributed">FCFA</symbol>
+			</currency>
+			<currency type="XCD">
+				<displayName>شرقی کاراییب ِدولار</displayName>
+				<displayName count="other">شرقی کارائیب دلار</displayName>
+				<symbol draft="contributed">EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="XOF">
+				<displayName>غربی آفریقای ِسی‌اف‌ای فرانک</displayName>
+				<displayName count="other">غربی آفریقای ِسی‌اف‌ای فرانک</displayName>
+				<symbol draft="contributed">CFA</symbol>
+			</currency>
+			<currency type="YER">
+				<displayName>یمن ِریال</displayName>
+				<displayName count="other">یمن ِریال</displayName>
+				<symbol draft="contributed">YER</symbol>
+			</currency>
+			<currency type="ZAR">
+				<displayName>جنوبی آفریقای ِراند</displayName>
+				<displayName count="other">جنوبی آفریقای ِراند</displayName>
+				<symbol draft="contributed">ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
+			</currency>
+			<currency type="ZMW">
+				<displayName>زامبیای ِکواچا</displayName>
+				<displayName count="other">زامبیای ِکواچا</displayName>
+				<symbol draft="contributed">ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+	<units>
+		<unitLength type="long">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<displayName>g-force</displayName>
+				<unitPattern count="other">{0} G</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-second-squared">
+				<displayName>m/s²</displayName>
+				<unitPattern count="other">{0} m/s²</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="other">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>deg</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>arcmin</displayName>
+				<unitPattern count="other">{0}′</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>arcsec</displayName>
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="other">{0} kt</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>L/km</displayName>
+				<unitPattern count="other">{0} L/km</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>mpg</displayName>
+				<unitPattern count="other">{0} mpg</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<displayName>ترابایت</displayName>
+				<unitPattern count="other">{0} ترابایت</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>ترابیت</displayName>
+				<unitPattern count="other">{0} ترابیت</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>گیگابایت</displayName>
+				<unitPattern count="other">{0} گیگابایت</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>گیگابیت</displayName>
+				<unitPattern count="other">{0} گیگابیت</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>مگابایت</displayName>
+				<unitPattern count="other">{0} مگابایت</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>مگابیت</displayName>
+				<unitPattern count="other">{0} مگابیت</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>کیلوبایت</displayName>
+				<unitPattern count="other">{0} کیلوبایت</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>کیلوبیت</displayName>
+				<unitPattern count="other">{0} کیلوبیت</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>بایت</displayName>
+				<unitPattern count="other">{0} بایت</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>بیت</displayName>
+				<unitPattern count="other">{0} بیت</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>قرن</displayName>
+				<unitPattern count="other">{0} قرن</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>سال</displayName>
+				<unitPattern count="other">{0} سال</unitPattern>
+				<perUnitPattern>{0} سال پیش</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ماه</displayName>
+				<unitPattern count="other">{0} ماه</unitPattern>
+				<perUnitPattern>{0} ماه پیش</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>هفته</displayName>
+				<unitPattern count="other">{0} هفته</unitPattern>
+				<perUnitPattern>{0} هفته پیش</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>روز</displayName>
+				<unitPattern count="other">{0} روز</unitPattern>
+				<perUnitPattern>{0} روز</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>ساعت</displayName>
+				<unitPattern count="other">{0} ساعِت</unitPattern>
+				<perUnitPattern>{0} ساعِت</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>دقیقه</displayName>
+				<unitPattern count="other">{0} دقیقه</unitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>ثانیه</displayName>
+				<unitPattern count="other">{0} ثانیه</unitPattern>
+				<perUnitPattern>{0} ثانیه</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>میلی‌ثانیه</displayName>
+				<unitPattern count="other">{0} میلی‌ثانیه</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>میکروثانیه</displayName>
+				<unitPattern count="other">{0} میکروثانیه</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>نانوثانیه</displayName>
+				<unitPattern count="other">{0} نانوثانیه</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName>آمپر</displayName>
+				<unitPattern count="other">{0} آمپر</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>میلی‌آمپر</displayName>
+				<unitPattern count="other">{0} میلی‌آمپر</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<displayName>اُهم</displayName>
+				<unitPattern count="other">{0} Ω</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>وُلت</displayName>
+				<unitPattern count="other">{0} ولت</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>کیلوکالری</displayName>
+				<unitPattern count="other">{0} کیلوکالری</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>کالری</displayName>
+				<unitPattern count="other">{0} کالری</unitPattern>
+			</unit>
+			<unit type="energy-foodcalorie">
+				<displayName>کالری</displayName>
+				<unitPattern count="other">{0} کالری</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>کیلوژول</displayName>
+				<unitPattern count="other">{0} کیلوژول</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>ژول</displayName>
+				<unitPattern count="other">{0} ژول</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>کیلووات بر ساعت</displayName>
+				<unitPattern count="other">{0} کیلووات-ساعت</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<displayName>گیگاهرتز</displayName>
+				<unitPattern count="other">{0} گیگاهرتز</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<displayName>مگاهرتز</displayName>
+				<unitPattern count="other">{0} مگاهرتز</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>کیلوهرتز</displayName>
+				<unitPattern count="other">{0} کیلوهرتز</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<displayName>هرتز</displayName>
+				<unitPattern count="other">{0} هرتز</unitPattern>
+			</unit>
+			<unit type="light-lux">
+				<displayName>lx</displayName>
+				<unitPattern count="other">{0} lx</unitPattern>
+			</unit>
+			<unit type="mass-metric-ton">
+				<displayName>متریک تُن</displayName>
+				<unitPattern count="other">{0} متریک تُن</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>کیلوگرم</displayName>
+				<unitPattern count="other">{0} کیلوگرم</unitPattern>
+				<perUnitPattern>{0} هر کیلوگرم دله</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>گرم</displayName>
+				<unitPattern count="other">{0} گرم</unitPattern>
+				<perUnitPattern>{0} هر گرم دله</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>میلی‌گرم</displayName>
+				<unitPattern count="other">{0} میلی‌گرم</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>میکروگرم</displayName>
+				<unitPattern count="other">{0} میکروگرم</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>تُن</displayName>
+				<unitPattern count="other">{0} تُن</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>پوند</displayName>
+				<unitPattern count="other">{0} پوند</unitPattern>
+				<perUnitPattern>{0} هر پوند دله</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>اونس</displayName>
+				<unitPattern count="other">{0} اونس</unitPattern>
+				<perUnitPattern>{0} هر اونس دله</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>تروی اونس</displayName>
+				<unitPattern count="other">{0} تروی اونس</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>قیراط</displayName>
+				<unitPattern count="other">{0} قیراط</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<displayName>گیگاوات</displayName>
+				<unitPattern count="other">{0} گیگاوات</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>مگاوات</displayName>
+				<unitPattern count="other">{0} مگاوات</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>کیلووات</displayName>
+				<unitPattern count="other">{0} کیلووات</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>وات</displayName>
+				<unitPattern count="other">{0} وات</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>میلی‌وات</displayName>
+				<unitPattern count="other">{0} میلی‌وات</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>اسب‌بخار</displayName>
+				<unitPattern count="other">{0} اسب بخار</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>کیلومتر بر ساعت</displayName>
+				<unitPattern count="other">{0} کیلومتر بر ساعت</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>متر بر ثانیه</displayName>
+				<unitPattern count="other">{0} متر بر ثانیه</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>مایل بر ساعت</displayName>
+				<unitPattern count="other">{0} مایل بر ساعت</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>گره</displayName>
+				<unitPattern count="other">{0} گره</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>درجه سلسیوس</displayName>
+				<unitPattern count="other">{0} درجه سلسیوس</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName>فارنهایت</displayName>
+				<unitPattern count="other">{0} فارنهایت</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>کلوین</displayName>
+				<unitPattern count="other">{0} کلوین</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>کیلومتر مکعب</displayName>
+				<unitPattern count="other">{0} کیلومتر مکعب</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>متر مکعب</displayName>
+				<unitPattern count="other">{0} متر مکعب</unitPattern>
+				<perUnitPattern>{0} هر متر مکعب دله</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>سانتی‌متر مکعب</displayName>
+				<unitPattern count="other">{0} سانتی‌متر مکعب</unitPattern>
+				<perUnitPattern>{0} هر سانتی‌متر مکعب دله</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>مایل مکعب</displayName>
+				<unitPattern count="other">{0} مایل مکعب</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>یارد مکعب</displayName>
+				<unitPattern count="other">{0} یارد مکعب</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>فوت مکعب</displayName>
+				<unitPattern count="other">{0} فوت مکعب</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>اینچ مکعب</displayName>
+				<unitPattern count="other">{0} اینچ مکعب</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>مگالیتر</displayName>
+				<unitPattern count="other">{0} مگالیتر</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>هکتولیتر</displayName>
+				<unitPattern count="other">{0} هکتولیتر</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>لیتر</displayName>
+				<unitPattern count="other">{0} لیتر</unitPattern>
+				<perUnitPattern>{0} هر لیتر دله</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>دسی‌لیتر</displayName>
+				<unitPattern count="other">{0} دسی‌لیتر</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>سانتی‌لیتر</displayName>
+				<unitPattern count="other">{0} سانتی‌لیتر</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>میلی‌لیتر</displayName>
+				<unitPattern count="other">{0} میلی‌لیتر</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>متریک پاینت</displayName>
+				<unitPattern count="other">{0} متریک پاینت</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>متریک دَییل</displayName>
+				<unitPattern count="other">{0} متریک دَییل</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>آکر-فوت</displayName>
+				<unitPattern count="other">{0} آکر-فوت</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>گالون</displayName>
+				<unitPattern count="other">{0} گالون</unitPattern>
+				<perUnitPattern>{0} هر گالون دله</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>ربع</displayName>
+				<unitPattern count="other">{0} ربع</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>پاینت</displayName>
+				<unitPattern count="other">{0} پاینت</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>دَییل</displayName>
+				<unitPattern count="other">{0} دَییل</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>فلوید اونس</displayName>
+				<unitPattern count="other">{0} فلوید اونس</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>کال</displayName>
+				<unitPattern count="other">{0}تا کال</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>چایی‌خاری کچه</displayName>
+				<unitPattern count="other">{0} چایی‌خاری کچه</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<unitLength type="short">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<displayName>g-force</displayName>
+				<unitPattern count="other">{0} G</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-second-squared">
+				<displayName>m/s²</displayName>
+				<unitPattern count="other">{0} m/s²</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="other">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>deg</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>arcmin</displayName>
+				<unitPattern count="other">{0}′</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>arcsec</displayName>
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="other">{0} kt</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>L/km</displayName>
+				<unitPattern count="other">{0} L/km</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>mpg</displayName>
+				<unitPattern count="other">{0} mpg</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<displayName>ترابایت</displayName>
+				<unitPattern count="other">{0} ترابایت</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>ترابیت</displayName>
+				<unitPattern count="other">{0} ترابیت</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>گیگابایت</displayName>
+				<unitPattern count="other">{0} گیگابایت</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>گیگابیت</displayName>
+				<unitPattern count="other">{0} گیگابیت</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>مگابایت</displayName>
+				<unitPattern count="other">{0} مگابایت</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>مگابیت</displayName>
+				<unitPattern count="other">{0} مگابیت</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>کیلوبایت</displayName>
+				<unitPattern count="other">{0} کیلوبایت</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>کیلوبیت</displayName>
+				<unitPattern count="other">{0} کیلوبیت</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>بایت</displayName>
+				<unitPattern count="other">{0} بایت</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>بیت</displayName>
+				<unitPattern count="other">{0} بیت</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>قرن</displayName>
+				<unitPattern count="other">{0} قرن</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>سال</displayName>
+				<unitPattern count="other">{0} سال</unitPattern>
+				<perUnitPattern>{0} سال</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ماه</displayName>
+				<unitPattern count="other">{0} ماه</unitPattern>
+				<perUnitPattern>{0} ماه</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>هفته</displayName>
+				<unitPattern count="other">{0} هفته</unitPattern>
+				<perUnitPattern>{0} هفته</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>روز</displayName>
+				<unitPattern count="other">{0} روز</unitPattern>
+				<perUnitPattern>{0} روز</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>ساعت</displayName>
+				<perUnitPattern>{0} ساعِت</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>دَقه</displayName>
+				<unitPattern count="other">{0} دَقه</unitPattern>
+				<perUnitPattern>{0} دَقه</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>ثانیه</displayName>
+				<unitPattern count="other">{0} ثانیه</unitPattern>
+				<perUnitPattern>{0} ثانیه</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>میلی‌ثانیه</displayName>
+				<unitPattern count="other">{0} میلی‌ثانیه</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>میکروثانیه</displayName>
+				<unitPattern count="other">{0} میکروثانیه</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>نانوثانیه</displayName>
+				<unitPattern count="other">{0} نانوثانیه</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName>آمپر</displayName>
+				<unitPattern count="other">{0} A</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>میلی‌آمپر</displayName>
+				<unitPattern count="other">{0} mA</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<displayName>اهم</displayName>
+				<unitPattern count="other">{0} Ω</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>ولت</displayName>
+				<unitPattern count="other">{0} V</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>کیلوکالری</displayName>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>کالری</displayName>
+				<unitPattern count="other">{0} cal</unitPattern>
+			</unit>
+			<unit type="energy-foodcalorie">
+				<displayName>کالری</displayName>
+				<unitPattern count="other">{0} Cal</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>کیلوژول</displayName>
+				<unitPattern count="other">{0} kJ</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>ژول</displayName>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>کیلووات-ساعت</displayName>
+				<unitPattern count="other">{0} kWh</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<displayName>گیگاهرتز</displayName>
+				<unitPattern count="other">{0} GHz</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<displayName>مگاهرتز</displayName>
+				<unitPattern count="other">{0} MHz</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>کیلوهرتز</displayName>
+				<unitPattern count="other">{0} kHz</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<displayName>هرتز</displayName>
+				<unitPattern count="other">{0} Hz</unitPattern>
+			</unit>
+			<unit type="light-lux">
+				<displayName>lx</displayName>
+				<unitPattern count="other">{0} lx</unitPattern>
+			</unit>
+			<unit type="mass-metric-ton">
+				<displayName>t</displayName>
+				<unitPattern count="other">{0} t</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>کیلوگرم</displayName>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>گرم</displayName>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>میلی‌گرم</displayName>
+				<unitPattern count="other">{0} mg</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>میکروگرم</displayName>
+				<unitPattern count="other">{0} µg</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>تُن</displayName>
+				<unitPattern count="other">{0} tn</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>پوند</displayName>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>اونس</displayName>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>تروی اونس</displayName>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>قیراط</displayName>
+				<unitPattern count="other">{0} قیراط</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<displayName>گیگاوات</displayName>
+				<unitPattern count="other">{0} GW</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>مگاوات</displayName>
+				<unitPattern count="other">{0} MW</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>کیلووات</displayName>
+				<unitPattern count="other">{0} kW</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>وات</displayName>
+				<unitPattern count="other">{0} W</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>میلی‌وات</displayName>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>اسب‌بخار</displayName>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>کیلومتر بر ساعت</displayName>
+				<unitPattern count="other">{0} km/h</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>متر بر ثانیه</displayName>
+				<unitPattern count="other">{0} m/s</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>مایل بر ساعت</displayName>
+				<unitPattern count="other">{0} mi/h</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>گره</displayName>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>°C</displayName>
+				<unitPattern count="other">{0}°C</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName>°F</displayName>
+				<unitPattern count="other">{0}°F</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>K</displayName>
+				<unitPattern count="other">{0} K</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>km³</displayName>
+				<unitPattern count="other">{0} km³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>m³</displayName>
+				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>mi³</displayName>
+				<unitPattern count="other">{0} mi³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>yd³</displayName>
+				<unitPattern count="other">{0} yd³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="other">{0} ft³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="other">{0} in³</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>مگالیتر</displayName>
+				<unitPattern count="other">{0} ML</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>هکتولیتر</displayName>
+				<unitPattern count="other">{0} hL</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>لیتر</displayName>
+				<unitPattern count="other">{0} لیتر</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>دسی‌لیتر</displayName>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>سانتی‌لیتر</displayName>
+				<unitPattern count="other">{0} cL</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>میلی‌لیتر</displayName>
+				<unitPattern count="other">{0} mL</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>متریک پاینت</displayName>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>آکرفوت</displayName>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>گالون</displayName>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>ربع</displayName>
+				<unitPattern count="other">{0} qt</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>پاینت</displayName>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>دَییل</displayName>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>فلوید اونس</displayName>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>کال</displayName>
+				<unitPattern count="other">{0} tbsp</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>چایی‌خاری کچه</displayName>
+				<unitPattern count="other">{0} tsp</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<unitLength type="narrow">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>سال</displayName>
+				<unitPattern count="other">{0} سال</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ماه</displayName>
+				<unitPattern count="other">{0} ماه</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>هفته</displayName>
+				<unitPattern count="other">{0} هفته</unitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>روز</displayName>
+				<unitPattern count="other">{0} روز</unitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>ساعت</displayName>
+				<unitPattern count="other">{0} ساعِت</unitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>دَقه</displayName>
+				<unitPattern count="other">{0} دَقه</unitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>ثانیه</displayName>
+				<unitPattern count="other">{0} ثانیه</unitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>میلی‌ثانیه</displayName>
+				<unitPattern count="other">{0} میلی‌ثانیه</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>کیلوگرم</displayName>
+				<unitPattern count="other">{0} kg</unitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>گرم</displayName>
+				<unitPattern count="other">{0} g</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>کیلومتر بر ساعت</displayName>
+				<unitPattern count="other">{0} km/h</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>°C</displayName>
+				<unitPattern count="other">{0}°C</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>لیتر</displayName>
+				<unitPattern count="other">{0} l</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<durationUnit type="hm">
+			<durationUnitPattern>h:mm</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="hms">
+			<durationUnitPattern>h:mm:ss</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="ms">
+			<durationUnitPattern>m:ss</durationUnitPattern>
+		</durationUnit>
+	</units>
+	<listPatterns>
+		<listPattern>
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-narrow">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-short">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
+		</listPattern>
+	</listPatterns>
+	<posix>
+		<messages>
+			<yesstr>yes:y</yesstr>
+			<nostr>no:n</nostr>
+		</messages>
+	</posix>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mzn_IR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mzn_IR.xml
new file mode 100644
index 00000000000..36d4d31f880
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mzn_IR.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="mzn"/>
+		<territory type="IR"/>
+	</identity>
+</ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/naq.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/naq.xml
similarity index 89%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/naq.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/naq.xml
index 072c3f64d85..d14a169eadb 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/naq.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/naq.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="naq"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguillab</territory>
 			<territory type="AL">Albaniab</territory>
 			<territory type="AM">Armeniab</territory>
-			<territory type="AN">Netherlands Antilles</territory>
 			<territory type="AO">Angolab</territory>
 			<territory type="AR">Argentinab</territory>
 			<territory type="AS">Americab Samoab</territory>
@@ -448,6 +446,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">ǁgoagas</dayPeriod>
+							<dayPeriod type="pm">ǃuias</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">ǁgoagas</dayPeriod>
 							<dayPeriod type="pm">ǃuias</dayPeriod>
@@ -550,7 +552,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day">
 				<displayName>Tsees</displayName>
+				<relative type="-1">yesterday</relative>
 				<relative type="0">Neetsee</relative>
+				<relative type="1">tomorrow</relative>
 			</field>
 			<field type="weekday">
 				<displayName>Wekheb tsees</displayName>
@@ -579,6 +583,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="two" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="two" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="two" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="two" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="two" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="two" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="two" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="two" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="two" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="two" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="two" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="two" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -759,3 +803,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/naq_NA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/naq_NA.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/naq_NA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/naq_NA.xml
index 6528b2bcf18..6c546da8036 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/naq_NA.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/naq_NA.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="naq"/>
 		<territory type="NA"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nb.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nb.xml
similarity index 72%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nb.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nb.xml
index 632caf658b0..c06e3298673 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nb.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nb.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12379 $"/>
 		<language type="nb"/>
 	</identity>
 	<localeDisplayNames>
@@ -24,13 +23,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ada">adangme</language>
 			<language type="ady">adyghe</language>
 			<language type="ae">avestisk</language>
+			<language type="aeb" draft="contributed">tunisisk-arabisk</language>
 			<language type="af">afrikaans</language>
 			<language type="afh">afrihili</language>
 			<language type="agq">aghem</language>
 			<language type="ain">ainu</language>
 			<language type="ak">akan</language>
 			<language type="akk">akkadisk</language>
+			<language type="akz" draft="contributed">alabama</language>
 			<language type="ale">aleutisk</language>
+			<language type="aln" draft="contributed">gegisk-albansk</language>
 			<language type="alt">søraltaisk</language>
 			<language type="am">amharisk</language>
 			<language type="an">aragonsk</language>
@@ -40,12 +42,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ar_001">moderne standard arabisk</language>
 			<language type="arc">arameisk</language>
 			<language type="arn">araukansk</language>
+			<language type="aro" draft="contributed">araona</language>
 			<language type="arp">arapaho</language>
+			<language type="arq" draft="contributed">algerisk arabisk</language>
 			<language type="arw">arawak</language>
+			<language type="ary" draft="contributed">marokkansk-arabisk</language>
+			<language type="arz" draft="contributed">egyptisk arabisk</language>
 			<language type="as">assamisk</language>
 			<language type="asa">asu</language>
+			<language type="ase" draft="contributed">amerikansk tegnspråk</language>
 			<language type="ast">asturisk</language>
 			<language type="av">avarisk</language>
+			<language type="avk" draft="contributed">kotava</language>
 			<language type="awa">awadhi</language>
 			<language type="ay">aymara</language>
 			<language type="az">aserbajdsjansk</language>
@@ -53,26 +61,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ba">basjkirsk</language>
 			<language type="bal">baluchi</language>
 			<language type="ban">balinesisk</language>
+			<language type="bar" draft="contributed">bairisk</language>
 			<language type="bas">basa</language>
 			<language type="bax">bamun</language>
+			<language type="bbc" draft="contributed">batak toba</language>
 			<language type="bbj">ghomala</language>
 			<language type="be">hviterussisk</language>
 			<language type="bej">beja</language>
 			<language type="bem">bemba</language>
+			<language type="bew" draft="contributed">betawi</language>
 			<language type="bez">bena</language>
 			<language type="bfd">bafut</language>
+			<language type="bfq" draft="contributed">badaga</language>
 			<language type="bg">bulgarsk</language>
+			<language type="bgn">vestbalutsji</language>
 			<language type="bho">bhojpuri</language>
 			<language type="bi">bislama</language>
 			<language type="bik">bikol</language>
 			<language type="bin">bini</language>
+			<language type="bjn" draft="contributed">banjar</language>
 			<language type="bkm">kom</language>
 			<language type="bla">siksika</language>
 			<language type="bm">bambara</language>
 			<language type="bn">bengali</language>
 			<language type="bo">tibetansk</language>
+			<language type="bpy" draft="contributed">bishnupriya</language>
+			<language type="bqi" draft="contributed">bakhtiari</language>
 			<language type="br">bretonsk</language>
 			<language type="bra">braj</language>
+			<language type="brh" draft="contributed">brahui</language>
 			<language type="brx">bodo</language>
 			<language type="bs">bosnisk</language>
 			<language type="bss" draft="contributed">akose</language>
@@ -102,12 +119,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ckb">kurdisk (sorani)</language>
 			<language type="co">korsikansk</language>
 			<language type="cop">koptisk</language>
+			<language type="cps" draft="contributed">kapiz</language>
 			<language type="cr">cree</language>
 			<language type="crh">krimtatarisk</language>
 			<language type="cs">tsjekkisk</language>
 			<language type="csb">kasjubisk</language>
 			<language type="cu">kirkeslavisk</language>
-			<language type="cv">tsjuvansk</language>
+			<language type="cv">tsjuvasjisk</language>
 			<language type="cy">walisisk</language>
 			<language type="da">dansk</language>
 			<language type="dak">dakota</language>
@@ -123,6 +141,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="dje">zarma</language>
 			<language type="doi">dogri</language>
 			<language type="dsb">lavsorbisk</language>
+			<language type="dtp" draft="contributed">sentraldusun</language>
 			<language type="dua">duala</language>
 			<language type="dum">mellomnederlandsk</language>
 			<language type="dv">divehi</language>
@@ -133,6 +152,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ebu">kiembu</language>
 			<language type="ee">ewe</language>
 			<language type="efi">efik</language>
+			<language type="egl" draft="contributed">emiliansk</language>
 			<language type="egy">gammelegyptisk</language>
 			<language type="eka">ekajuk</language>
 			<language type="el">gresk</language>
@@ -141,7 +161,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="en_AU">australsk engelsk</language>
 			<language type="en_CA">canadisk engelsk</language>
 			<language type="en_GB">britisk engelsk</language>
-			<language type="en_GB" alt="short">engelsk – britisk</language>
+			<language type="en_GB" alt="short">engelsk – Storbritannia</language>
 			<language type="en_US">amerikansk engelsk</language>
 			<language type="en_US" alt="short">engelsk – USA</language>
 			<language type="enm">mellomengelsk</language>
@@ -150,23 +170,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="es_419">latinamerikansk spansk</language>
 			<language type="es_ES">europeisk spansk</language>
 			<language type="es_MX">meksikansk spansk</language>
+			<language type="esu" draft="contributed">sentralyupik</language>
 			<language type="et">estisk</language>
 			<language type="eu">baskisk</language>
 			<language type="ewo">ewondo</language>
+			<language type="ext" draft="contributed">ekstremaduransk</language>
 			<language type="fa">persisk</language>
 			<language type="fan">fang</language>
 			<language type="fat">fanti</language>
 			<language type="ff">fulani</language>
 			<language type="fi">finsk</language>
 			<language type="fil">filippinsk</language>
+			<language type="fit" draft="contributed">tornedalsfinsk</language>
 			<language type="fj">fijiansk</language>
 			<language type="fo">færøysk</language>
 			<language type="fon">fon</language>
 			<language type="fr">fransk</language>
 			<language type="fr_CA">canadisk fransk</language>
 			<language type="fr_CH">sveitsisk fransk</language>
+			<language type="frc" draft="contributed">kajunfransk</language>
 			<language type="frm">mellomfransk</language>
 			<language type="fro">gammelfransk</language>
+			<language type="frp" draft="contributed">arpitansk</language>
 			<language type="frr">nordfrisisk</language>
 			<language type="frs">østfrisisk</language>
 			<language type="fur">friuliansk</language>
@@ -174,15 +199,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ga">irsk</language>
 			<language type="gaa">ga</language>
 			<language type="gag">gagausisk</language>
+			<language type="gan" draft="contributed">gan</language>
 			<language type="gay">gayo</language>
 			<language type="gba">gbaya</language>
+			<language type="gbz" draft="contributed">zoroastrisk dari</language>
 			<language type="gd">skotsk gælisk</language>
 			<language type="gez">ges</language>
 			<language type="gil">kiribatisk</language>
 			<language type="gl">galisisk</language>
+			<language type="glk" draft="contributed">gileki</language>
 			<language type="gmh">mellomhøytysk</language>
 			<language type="gn">guarani</language>
 			<language type="goh">gammelhøytysk</language>
+			<language type="gom" draft="contributed">goansk konkani</language>
 			<language type="gon">gondi</language>
 			<language type="gor">gorontalo</language>
 			<language type="got">gotisk</language>
@@ -190,20 +219,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="grc">gammelgresk</language>
 			<language type="gsw">sveitsertysk</language>
 			<language type="gu">gujarati</language>
+			<language type="guc" draft="contributed">wayuu</language>
+			<language type="gur" draft="contributed">frafra</language>
 			<language type="guz">gusii</language>
 			<language type="gv">mansk</language>
 			<language type="gwi">gwichin</language>
 			<language type="ha">hausa</language>
 			<language type="hai">haida</language>
+			<language type="hak" draft="contributed">hakka</language>
 			<language type="haw">hawaiisk</language>
 			<language type="he">hebraisk</language>
 			<language type="hi">hindi</language>
+			<language type="hif" draft="contributed">fijiansk hindi</language>
 			<language type="hil">hiligaynon</language>
 			<language type="hit">hettittisk</language>
 			<language type="hmn">hmong</language>
 			<language type="ho">hiri motu</language>
 			<language type="hr">kroatisk</language>
 			<language type="hsb">høysorbisk</language>
+			<language type="hsn" draft="contributed">xiang</language>
 			<language type="ht">haitisk</language>
 			<language type="hu">ungarsk</language>
 			<language type="hup">hupa</language>
@@ -223,12 +257,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="is">islandsk</language>
 			<language type="it">italiensk</language>
 			<language type="iu">inuktitut</language>
+			<language type="izh" draft="contributed">ingrisk</language>
 			<language type="ja">japansk</language>
+			<language type="jam" draft="contributed">jamaicansk kreolengelsk</language>
 			<language type="jbo">lojban</language>
 			<language type="jgo">ngomba</language>
 			<language type="jmc">machame</language>
 			<language type="jpr">jødepersisk</language>
 			<language type="jrb">jødearabisk</language>
+			<language type="jut" draft="contributed">jysk</language>
 			<language type="jv">javanesisk</language>
 			<language type="ka">georgisk</language>
 			<language type="kaa">karakalpakisk</language>
@@ -242,12 +279,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="kcg">tyap</language>
 			<language type="kde">makonde</language>
 			<language type="kea">kappverdisk</language>
+			<language type="ken" draft="contributed">kenyang</language>
 			<language type="kfo">koro</language>
 			<language type="kg">kikongo</language>
+			<language type="kgp" draft="contributed">kaingang</language>
 			<language type="kha">khasi</language>
 			<language type="kho">khotanesisk</language>
 			<language type="khq">koyra chiini</language>
+			<language type="khw" draft="contributed">khowar</language>
 			<language type="ki">kikuyu</language>
+			<language type="kiu" draft="contributed">kirmancki</language>
 			<language type="kj">kuanyama</language>
 			<language type="kk">kasakhisk</language>
 			<language type="kkj" draft="contributed">kako</language>
@@ -263,6 +304,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="kpe">kpelle</language>
 			<language type="kr">kanuri</language>
 			<language type="krc">karachay-balkar</language>
+			<language type="kri" draft="contributed">krio</language>
+			<language type="krj" draft="contributed">kinaray-a</language>
 			<language type="krl">karelsk</language>
 			<language type="kru">kurukh</language>
 			<language type="ks">kasjmiri</language>
@@ -282,22 +325,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lam">lamba</language>
 			<language type="lb">luxemburgsk</language>
 			<language type="lez">lezghian</language>
+			<language type="lfn" draft="contributed">lingua franca nova</language>
 			<language type="lg">ganda</language>
 			<language type="li">limburgisk</language>
+			<language type="lij" draft="contributed">ligurisk</language>
+			<language type="liv" draft="contributed">livisk</language>
 			<language type="lkt">lakota</language>
+			<language type="lmo" draft="contributed">lombardisk</language>
 			<language type="ln">lingala</language>
 			<language type="lo">laotisk</language>
 			<language type="lol">mongo</language>
 			<language type="loz">lozi</language>
+			<language type="lrc">nord-luri</language>
 			<language type="lt">litauisk</language>
+			<language type="ltg" draft="contributed">latgallisk</language>
 			<language type="lu">luba-katanga</language>
 			<language type="lua">luba-lulua</language>
 			<language type="lui">luiseno</language>
 			<language type="lun">lunda</language>
 			<language type="luo">luo</language>
-			<language type="lus">lushai</language>
+			<language type="lus">mizo</language>
 			<language type="luy">luhya</language>
 			<language type="lv">latvisk</language>
+			<language type="lzh" draft="contributed">klassisk kinesisk</language>
+			<language type="lzz" draft="contributed">lazisk</language>
 			<language type="mad">maduresisk</language>
 			<language type="maf">mafa</language>
 			<language type="mag">magahi</language>
@@ -311,7 +362,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="men">mende</language>
 			<language type="mer">meru</language>
 			<language type="mfe">mauritisk-kreolsk</language>
-			<language type="mg">madagassisk</language>
+			<language type="mg">gassisk</language>
 			<language type="mga">mellomirsk</language>
 			<language type="mgh">makhuwa-meetto</language>
 			<language type="mgo">meta’</language>
@@ -327,6 +378,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="moh">mohawk</language>
 			<language type="mos">mossi</language>
 			<language type="mr">marathi</language>
+			<language type="mrj" draft="contributed">vestmarisk</language>
 			<language type="ms">malayisk</language>
 			<language type="mt">maltesisk</language>
 			<language type="mua">mundang</language>
@@ -334,20 +386,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mus">creek</language>
 			<language type="mwl">mirandesisk</language>
 			<language type="mwr">marwari</language>
+			<language type="mwv" draft="contributed">mentawai</language>
 			<language type="my">burmesisk</language>
 			<language type="mye">myene</language>
 			<language type="myv">erzya</language>
+			<language type="mzn">mazandarani</language>
 			<language type="na">nauru</language>
+			<language type="nan" draft="contributed">minnan</language>
 			<language type="nap">napolitansk</language>
 			<language type="naq">nama</language>
 			<language type="nb">norsk bokmål</language>
 			<language type="nd">nord-ndebele</language>
-			<language type="nds">lavtysk</language>
+			<language type="nds">nedertysk</language>
+			<language type="nds_NL">nedersaksisk</language>
 			<language type="ne">nepali</language>
 			<language type="new">newari</language>
 			<language type="ng">ndonga</language>
 			<language type="nia">nias</language>
 			<language type="niu">niueansk</language>
+			<language type="njo" draft="contributed">ao naga</language>
 			<language type="nl">nederlandsk</language>
 			<language type="nl_BE">flamsk</language>
 			<language type="nmg">kwasio</language>
@@ -356,7 +413,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="no">norsk</language>
 			<language type="nog">nogai</language>
 			<language type="non">gammelnorsk</language>
-			<language type="nqo">nkå</language>
+			<language type="nov" draft="contributed">novial</language>
+			<language type="nqo">nʼko</language>
 			<language type="nr">sør-ndebele</language>
 			<language type="nso">nord-sotho</language>
 			<language type="nus">nuer</language>
@@ -380,11 +438,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="pam">pampanga</language>
 			<language type="pap">papiamento</language>
 			<language type="pau">palauisk</language>
+			<language type="pcd" draft="contributed">pikardisk</language>
+			<language type="pdc" draft="contributed">pennsylvaniatysk</language>
+			<language type="pdt" draft="contributed">plautdietsch</language>
 			<language type="peo">gammelpersisk</language>
+			<language type="pfl" draft="contributed">palatintysk</language>
 			<language type="phn">fønikisk</language>
 			<language type="pi">pali</language>
 			<language type="pl">polsk</language>
+			<language type="pms" draft="contributed">piemontesisk</language>
+			<language type="pnt" draft="contributed">pontisk</language>
 			<language type="pon">ponapisk</language>
+			<language type="prg" draft="contributed">prøyssisk</language>
 			<language type="pro">gammelprovençalsk</language>
 			<language type="ps">pashto</language>
 			<language type="ps" alt="variant">pushto</language>
@@ -393,9 +458,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="pt_PT">europeisk portugisisk</language>
 			<language type="qu">quechua</language>
 			<language type="quc">quiché</language>
+			<language type="qug" draft="contributed">kichwa (Chimborazo-høylandet)</language>
 			<language type="raj">rajasthani</language>
 			<language type="rap">rapanui</language>
 			<language type="rar">rarotongansk</language>
+			<language type="rgn" draft="contributed">romagnolsk</language>
+			<language type="rif" draft="contributed">riff</language>
 			<language type="rm">retoromansk</language>
 			<language type="rn">rundi</language>
 			<language type="ro">rumensk</language>
@@ -403,7 +471,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="rof">rombo</language>
 			<language type="rom">romani</language>
 			<language type="root">rot</language>
+			<language type="rtm" draft="contributed">rotumansk</language>
 			<language type="ru">russisk</language>
+			<language type="rue" draft="contributed">rusinsk</language>
+			<language type="rug" draft="contributed">roviana</language>
 			<language type="rup">aromansk</language>
 			<language type="rw">kinyarwanda</language>
 			<language type="rwk">rwa</language>
@@ -414,19 +485,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="saq">samburu</language>
 			<language type="sas">sasak</language>
 			<language type="sat">santali</language>
+			<language type="saz" draft="contributed">saurashtra</language>
 			<language type="sba">ngambay</language>
 			<language type="sbp">sangu</language>
 			<language type="sc">sardinsk</language>
 			<language type="scn">siciliansk</language>
 			<language type="sco">skotsk</language>
 			<language type="sd">sindhi</language>
+			<language type="sdc" draft="contributed">sassarisk sardinsk</language>
+			<language type="sdh">sørkurdisk</language>
 			<language type="se">nordsamisk</language>
 			<language type="see">seneca</language>
 			<language type="seh">sena</language>
+			<language type="sei" draft="contributed">seri</language>
 			<language type="sel">selkupisk</language>
 			<language type="ses">koyraboro senni</language>
 			<language type="sg">sango</language>
 			<language type="sga">gammelirsk</language>
+			<language type="sgs" draft="contributed">samogitisk</language>
 			<language type="sh">serbokroatisk</language>
 			<language type="shi">tachelhit</language>
 			<language type="shn">shan</language>
@@ -435,6 +511,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sid">sidamo</language>
 			<language type="sk">slovakisk</language>
 			<language type="sl">slovensk</language>
+			<language type="sli" draft="contributed">lavschlesisk</language>
+			<language type="sly" draft="contributed">selayar</language>
 			<language type="sm">samoansk</language>
 			<language type="sma">sørsamisk</language>
 			<language type="smj">lulesamisk</language>
@@ -451,17 +529,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ss">swati</language>
 			<language type="ssy">saho</language>
 			<language type="st">sør-sotho</language>
+			<language type="stq" draft="contributed">saterfrisisk</language>
 			<language type="su">sundanesisk</language>
 			<language type="suk">sukuma</language>
 			<language type="sus">susu</language>
 			<language type="sux">sumerisk</language>
 			<language type="sv">svensk</language>
 			<language type="sw">swahili</language>
+			<language type="sw_CD">kongolesisk swahili</language>
 			<language type="swb">komorisk</language>
-			<language type="swc">kongolesisk swahili</language>
 			<language type="syc">klassisk syrisk</language>
 			<language type="syr">syrisk</language>
-			<language type="ta">tamilsk</language>
+			<language type="szl" draft="contributed">schlesisk</language>
+			<language type="ta">tamil</language>
+			<language type="tcy" draft="contributed">tulu</language>
 			<language type="te">telugu</language>
 			<language type="tem">temne</language>
 			<language type="teo">teso</language>
@@ -474,19 +555,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="tiv">tiv</language>
 			<language type="tk">turkmensk</language>
 			<language type="tkl">tokelau</language>
+			<language type="tkr" draft="contributed">tsakhursk</language>
 			<language type="tl">tagalog</language>
 			<language type="tlh">klingon</language>
 			<language type="tli">tlingit</language>
+			<language type="tly" draft="contributed">talysh</language>
 			<language type="tmh">tamasjek</language>
 			<language type="tn">setswana</language>
 			<language type="to">tongansk</language>
 			<language type="tog">nyasa-tongansk</language>
 			<language type="tpi">tok pisin</language>
 			<language type="tr">tyrkisk</language>
+			<language type="tru" draft="contributed">turoyo</language>
 			<language type="trv">taroko</language>
 			<language type="ts">tsonga</language>
+			<language type="tsd" draft="contributed">tsakonisk</language>
 			<language type="tsi">tsimshian</language>
 			<language type="tt">tatarisk</language>
+			<language type="ttt" draft="contributed">muslimsk tat</language>
 			<language type="tum">tumbuka</language>
 			<language type="tvl">tuvalu</language>
 			<language type="tw">twi</language>
@@ -504,18 +590,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="uz">usbekisk</language>
 			<language type="vai">vai</language>
 			<language type="ve">venda</language>
+			<language type="vec" draft="contributed">venetiansk</language>
+			<language type="vep" draft="contributed">vepsisk</language>
 			<language type="vi">vietnamesisk</language>
+			<language type="vls" draft="contributed">vestflamsk</language>
+			<language type="vmf" draft="contributed">Main-frankisk</language>
 			<language type="vo">volapyk</language>
 			<language type="vot">votisk</language>
+			<language type="vro" draft="contributed">sørestisk</language>
 			<language type="vun">vunjo</language>
 			<language type="wa">vallonsk</language>
 			<language type="wae" draft="contributed">walser</language>
 			<language type="wal">walamo</language>
 			<language type="war">waray</language>
 			<language type="was">washo</language>
+			<language type="wbp">warlpiri</language>
 			<language type="wo">wolof</language>
+			<language type="wuu" draft="contributed">wu</language>
 			<language type="xal">kalmyk</language>
 			<language type="xh">xhosa</language>
+			<language type="xmf" draft="contributed">mingrelsk</language>
 			<language type="xog">soga</language>
 			<language type="yao">yao</language>
 			<language type="yap">yapesisk</language>
@@ -523,10 +617,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ybb">yemba</language>
 			<language type="yi">jiddisk</language>
 			<language type="yo">joruba</language>
+			<language type="yrl" draft="contributed">nheengatu</language>
 			<language type="yue">kantonesisk</language>
 			<language type="za">zhuang</language>
 			<language type="zap">zapotec</language>
 			<language type="zbl">blissymboler</language>
+			<language type="zea" draft="contributed">zeeuws</language>
 			<language type="zen">zenaga</language>
 			<language type="zgh">standard marrokansk tamazight</language>
 			<language type="zh">kinesisk</language>
@@ -539,6 +635,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</languages>
 		<scripts>
 			<script type="Afak" draft="contributed">afaka</script>
+			<script type="Aghb" draft="contributed">kaukasus-albansk</script>
+			<script type="Ahom" draft="contributed">ahom</script>
 			<script type="Arab">arabisk</script>
 			<script type="Arab" alt="variant">persisk-arabisk</script>
 			<script type="Armi">arameisk</script>
@@ -571,6 +669,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Egyd">egyptisk demotisk</script>
 			<script type="Egyh">egyptisk hieratisk</script>
 			<script type="Egyp">egyptiske hieroglyfer</script>
+			<script type="Elba" draft="contributed">elbasisk</script>
 			<script type="Ethi">etiopisk</script>
 			<script type="Geok">georgisk khutsuri</script>
 			<script type="Geor">georgisk</script>
@@ -587,6 +686,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Hans" alt="stand-alone">forenklet han</script>
 			<script type="Hant">tradisjonell</script>
 			<script type="Hant" alt="stand-alone">tradisjonell han</script>
+			<script type="Hatr" draft="contributed">hatransk armensk</script>
 			<script type="Hebr">hebraisk</script>
 			<script type="Hira">hiragana</script>
 			<script type="Hluw" draft="contributed">anatoliske hieroglyfer</script>
@@ -620,6 +720,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Loma" draft="contributed">loma</script>
 			<script type="Lyci">lykisk</script>
 			<script type="Lydi">lydisk</script>
+			<script type="Mahj" draft="contributed">mahajani</script>
 			<script type="Mand">mandaisk</script>
 			<script type="Mani">manikeisk</script>
 			<script type="Maya">maya-hieroglyfer</script>
@@ -627,10 +728,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Merc" draft="contributed">meroitisk kursiv</script>
 			<script type="Mero">meroitisk</script>
 			<script type="Mlym">malayalam</script>
+			<script type="Modi" draft="contributed">modi</script>
 			<script type="Mong">mongolsk</script>
 			<script type="Moon">moon</script>
 			<script type="Mroo" draft="contributed">mro</script>
 			<script type="Mtei">meitei-mayek</script>
+			<script type="Mult" draft="contributed">multani</script>
 			<script type="Mymr">myanmar</script>
 			<script type="Narb" draft="contributed">gammelnordarabisk</script>
 			<script type="Nbat" draft="contributed">nabataeansk</script>
@@ -643,6 +746,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Orya">oriya</script>
 			<script type="Osma">osmanya</script>
 			<script type="Palm" draft="contributed">palmyrensk</script>
+			<script type="Pauc" draft="contributed">pau cin hau</script>
 			<script type="Perm">gammelpermisk</script>
 			<script type="Phag">phags-pa</script>
 			<script type="Phli">inskripsjonspahlavi</script>
@@ -651,6 +755,54 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Phnx">fønikisk</script>
 			<script type="Plrd">pollard-fonetisk</script>
 			<script type="Prti">inskripsjonsparthisk</script>
+			<script type="Qaaa" draft="contributed">qaaa</script>
+			<script type="Qaab" draft="contributed">qaab</script>
+			<script type="Qaac" draft="contributed">qaac</script>
+			<script type="Qaad" draft="contributed">qaad</script>
+			<script type="Qaae" draft="contributed">qaae</script>
+			<script type="Qaaf" draft="contributed">qaaf</script>
+			<script type="Qaag" draft="contributed">qaag</script>
+			<script type="Qaah" draft="contributed">qaah</script>
+			<script type="Qaak" draft="contributed">qaak</script>
+			<script type="Qaal" draft="contributed">qaal</script>
+			<script type="Qaam" draft="contributed">qaam</script>
+			<script type="Qaan" draft="contributed">qaan</script>
+			<script type="Qaao" draft="contributed">qaao</script>
+			<script type="Qaap" draft="contributed">qaap</script>
+			<script type="Qaaq" draft="contributed">qaaq</script>
+			<script type="Qaar" draft="contributed">qaar</script>
+			<script type="Qaas" draft="contributed">qaas</script>
+			<script type="Qaat" draft="contributed">qaat</script>
+			<script type="Qaau" draft="contributed">qaau</script>
+			<script type="Qaav" draft="contributed">qaav</script>
+			<script type="Qaaw" draft="contributed">qaaw</script>
+			<script type="Qaax" draft="contributed">qaax</script>
+			<script type="Qaay" draft="contributed">qaay</script>
+			<script type="Qaaz" draft="contributed">qaaz</script>
+			<script type="Qaba" draft="contributed">qaba</script>
+			<script type="Qabb" draft="contributed">qabb</script>
+			<script type="Qabc" draft="contributed">qabc</script>
+			<script type="Qabd" draft="contributed">qabd</script>
+			<script type="Qabe" draft="contributed">qabe</script>
+			<script type="Qabf" draft="contributed">qafb</script>
+			<script type="Qabg" draft="contributed">qabg</script>
+			<script type="Qabh" draft="contributed">qabh</script>
+			<script type="Qabi" draft="contributed">qabi</script>
+			<script type="Qabj" draft="contributed">qabj</script>
+			<script type="Qabk" draft="contributed">qabk</script>
+			<script type="Qabl" draft="contributed">qabl</script>
+			<script type="Qabm" draft="contributed">qabm</script>
+			<script type="Qabn" draft="contributed">qabn</script>
+			<script type="Qabo" draft="contributed">qabo</script>
+			<script type="Qabp" draft="contributed">qabp</script>
+			<script type="Qabq" draft="contributed">qabq</script>
+			<script type="Qabr" draft="contributed">qabr</script>
+			<script type="Qabs" draft="contributed">qabs</script>
+			<script type="Qabt" draft="contributed">qabt</script>
+			<script type="Qabu" draft="contributed">qabu</script>
+			<script type="Qabv" draft="contributed">qabv</script>
+			<script type="Qabw" draft="contributed">qabw</script>
+			<script type="Qabx" draft="contributed">qabx</script>
 			<script type="Rjng">rejang</script>
 			<script type="Roro">rongorongo</script>
 			<script type="Runr">runer</script>
@@ -661,6 +813,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Sgnw">tegnskrift</script>
 			<script type="Shaw">shavisk</script>
 			<script type="Shrd" draft="contributed">sharada</script>
+			<script type="Sidd" draft="contributed">siddham</script>
 			<script type="Sind" draft="contributed">khudawadi</script>
 			<script type="Sinh">sinhala</script>
 			<script type="Sora" draft="contributed">sora sompeng</script>
@@ -739,7 +892,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">De nederlandske antiller</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antarktis</territory>
 			<territory type="AR">Argentina</territory>
@@ -1013,29 +1165,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<variant type="AREVELA">øst-armensk</variant>
 			<variant type="AREVMDA">vest-armensk</variant>
 			<variant type="BAKU1926" draft="contributed">samlet tyrkisk-latinsk alfabet</variant>
+			<variant type="BALANKA" draft="contributed">balankadialekten av anii</variant>
+			<variant type="BARLA" draft="contributed">barlaventa-dialektgruppen av kappverdiansk</variant>
 			<variant type="BAUDDHA" draft="contributed">bauddha</variant>
 			<variant type="BISCAYAN" draft="contributed">biscayan</variant>
 			<variant type="BISKE">san giorgio- og biladialekt</variant>
 			<variant type="BOHORIC" draft="contributed">bohorisk alfabet</variant>
 			<variant type="BOONT">boontling</variant>
 			<variant type="DAJNKO" draft="contributed">dajnkoalfabet</variant>
+			<variant type="EKAVSK" draft="contributed">serbisk med ekavisk uttale</variant>
 			<variant type="EMODENG" draft="contributed">tidlig moderne engelsk</variant>
 			<variant type="FONIPA">det internasjonale fonetiske alfabet (IPA)</variant>
 			<variant type="FONUPA">det uraliske fonetiske alfabet (UPA)</variant>
 			<variant type="FONXSAMP" draft="contributed">fonxsamp</variant>
 			<variant type="HEPBURN" draft="contributed">Hepburn-romanisering</variant>
 			<variant type="HOGNORSK" draft="contributed">høgnorsk</variant>
+			<variant type="IJEKAVSK" draft="contributed">serbisk med ijekavisk uttale</variant>
 			<variant type="ITIHASA" draft="contributed">itihasa</variant>
 			<variant type="JAUER" draft="contributed">jauer</variant>
 			<variant type="JYUTPING" draft="contributed">jyutping</variant>
 			<variant type="KKCOR">felles ortografi</variant>
+			<variant type="KOCIEWIE" draft="contributed">kociewie</variant>
 			<variant type="KSCOR" draft="contributed">standard ortografi</variant>
 			<variant type="LAUKIKA" draft="contributed">laukika</variant>
 			<variant type="LIPAW" draft="contributed">resia med Lipovaz-dialekt</variant>
 			<variant type="LUNA1918" draft="contributed">LUNA1918</variant>
 			<variant type="METELKO" draft="contributed">Metelko-alfabet</variant>
 			<variant type="MONOTON">monotonisk rettskriving</variant>
-			<variant type="NDYUKA">Ndyuka-dialekt</variant>
+			<variant type="NDYUKA">ndyuka-dialekt</variant>
 			<variant type="NEDIS">natisonedialekt</variant>
 			<variant type="NJIVA">gniva- og njivadialekt</variant>
 			<variant type="NULIK" draft="contributed">moderne volapük</variant>
@@ -1046,29 +1203,32 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<variant type="POLYTON">polytonisk rettskriving</variant>
 			<variant type="POSIX">dataspråk</variant>
 			<variant type="PUTER" draft="contributed">PUTER</variant>
-			<variant type="REVISED">revidert rettskriving</variant>
+			<variant type="REVISED">revidert ortografi</variant>
 			<variant type="RIGIK" draft="contributed">klassisk volapük</variant>
 			<variant type="ROZAJ">resisk dialekt</variant>
 			<variant type="RUMGR" draft="contributed">RUMGR</variant>
-			<variant type="SAAHO">saaho dialekt</variant>
+			<variant type="SAAHO">saho</variant>
 			<variant type="SCOTLAND">skotsk standard engelsk</variant>
 			<variant type="SCOUSE">scouse dialekt</variant>
 			<variant type="SOLBA">stolvizza- og solbicadialekt</variant>
+			<variant type="SOTAV" draft="contributed">sotavento-dialektgruppen av kappverdiansk</variant>
 			<variant type="SURMIRAN" draft="contributed">surmiransk</variant>
 			<variant type="SURSILV" draft="contributed">sursilvan</variant>
 			<variant type="SUTSILV" draft="contributed">sutsilvan</variant>
 			<variant type="TARASK" draft="contributed">taraskievica-ortografi</variant>
-			<variant type="UCRCOR" draft="contributed">felles revidert ortografi</variant>
+			<variant type="UCCOR" draft="contributed">harmonisert ortografi</variant>
+			<variant type="UCRCOR">harmonisert revidert ortografi</variant>
 			<variant type="ULSTER" draft="contributed">ulster</variant>
+			<variant type="UNIFON" draft="contributed">Unifon fonetisk alfabet</variant>
 			<variant type="VAIDIKA" draft="contributed">vaidika</variant>
-			<variant type="VALENCIA">valensisk dialekt</variant>
+			<variant type="VALENCIA">valensiansk</variant>
 			<variant type="VALLADER" draft="contributed">vallader</variant>
-			<variant type="WADEGILE" draft="contributed">Wade-Giles</variant>
+			<variant type="WADEGILE">Wade-Giles-romanisering</variant>
 		</variants>
 		<keys>
 			<key type="calendar">kalender</key>
 			<key type="colAlternate" draft="contributed">Ignorer sortering etter symboler</key>
-			<key type="colBackwards" draft="contributed">Omvendt sortering etter aksent</key>
+			<key type="colBackwards" draft="contributed">omvendt sortering etter aksent</key>
 			<key type="colCaseFirst" draft="contributed">Organisering av store og små bokstaver</key>
 			<key type="colCaseLevel" draft="contributed">Sortering av store og små bokstaver</key>
 			<key type="colHiraganaQuaternary" draft="contributed">Sortering av kana</key>
@@ -1077,6 +1237,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">Numerisk sortering</key>
 			<key type="colStrength" draft="contributed">Sorteringsstyrke</key>
 			<key type="currency">valuta</key>
+			<key type="hc">timesyklus (12 eller 24)</key>
+			<key type="lb">linjeskiftstil</key>
+			<key type="ms">målesystem</key>
 			<key type="numbers">tall</key>
 			<key type="timezone" draft="contributed">tidssone</key>
 			<key type="va" draft="contributed">Språkvariant</key>
@@ -1084,121 +1247,133 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">privat bruk</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">arabisk-indiske tall</type>
-			<type type="arabext" key="numbers">utvidede arabisk-indiske tall</type>
-			<type type="armn" key="numbers">armenske tallsymboler</type>
-			<type type="armnlow" key="numbers">små armenske tallsymboler</type>
-			<type type="bali" key="numbers" draft="contributed">baliske tall</type>
-			<type type="beng" key="numbers">bengalske tall</type>
-			<type type="big5han" key="collation">tradisjonell kinesisk sortering - Big 5</type>
-			<type type="brah" key="numbers" draft="contributed">brahmiske tall</type>
-			<type type="buddhist" key="calendar">buddhistisk kalender</type>
-			<type type="cakm" key="numbers" draft="contributed">chakma-tall</type>
-			<type type="cham" key="numbers" draft="contributed">cham-tall</type>
-			<type type="chinese" key="calendar">kinesisk kalender</type>
-			<type type="coptic" key="calendar">koptisk kalender</type>
-			<type type="dangi" key="calendar">dangisk kalender</type>
-			<type type="deva" key="numbers">devanagari-tall</type>
-			<type type="dictionary" key="collation">ordlistesortering</type>
-			<type type="ducet" key="collation">standard Unicode-sorteringsrekkefølge</type>
-			<type type="eor" key="collation" draft="unconfirmed">sorteringsrekkefølge for flerspråklige europeiske dokumenter</type>
-			<type type="ethi" key="numbers">etiopiske tallsymboler</type>
-			<type type="ethiopic" key="calendar">etiopisk kalender</type>
-			<type type="ethiopic-amete-alem" key="calendar">etiopisk amete-alem-kalender</type>
-			<type type="finance" key="numbers" draft="contributed">Finansielle tall</type>
-			<type type="fullwide" key="numbers">tall med full bredde</type>
-			<type type="gb2312han" key="collation">forenklet kinesisk sortering - GB2312</type>
-			<type type="geor" key="numbers">georgiske tall</type>
-			<type type="gregorian" key="calendar">gregoriansk kalender</type>
-			<type type="grek" key="numbers">greske tallsymboler</type>
-			<type type="greklow" key="numbers">små greske tallsymboler</type>
-			<type type="gujr" key="numbers">gujarati-tall</type>
-			<type type="guru" key="numbers">gurmukhi-tall</type>
-			<type type="hanidec" key="numbers">kinesiske desimaltallsymboler</type>
-			<type type="hans" key="numbers">forenklede kinesiske tallsymboler</type>
-			<type type="hansfin" key="numbers">forenklede kinesiske finanstallsymboler</type>
-			<type type="hant" key="numbers">tradisjonelle kinesiske tallsymboler</type>
-			<type type="hantfin" key="numbers">tradisjonelle kinesiske finanstallsymboler</type>
-			<type type="hebr" key="numbers">hebraiske tallsymboler</type>
-			<type type="hebrew" key="calendar">hebraisk kalender</type>
-			<type type="identical" key="colStrength" draft="contributed">Sortér alle</type>
-			<type type="indian" key="calendar">indisk nasjonalkalender</type>
-			<type type="islamic" key="calendar">islamsk kalender</type>
-			<type type="islamic-civil" key="calendar">islamsk sivil kalender</type>
-			<type type="islamic-rgsa" key="calendar" draft="contributed">islamsk kalender (Saudi-Arabia. synlighet)</type>
-			<type type="islamic-tbla" key="calendar" draft="contributed">islamsk kalender (tabellarisk, astronomisk epoke)</type>
-			<type type="islamic-umalqura" key="calendar" draft="contributed">islamsk kalender (Umm al-Qura)</type>
-			<type type="iso8601" key="calendar">ISO 8601-kalender</type>
-			<type type="japanese" key="calendar">japansk kalender</type>
-			<type type="java" key="numbers" draft="contributed">java-tall</type>
-			<type type="jpan" key="numbers">japanske tallsymboler</type>
-			<type type="jpanfin" key="numbers">japanske finanstallsymboler</type>
-			<type type="kali" key="numbers" draft="contributed">kayah li-tall</type>
-			<type type="khmr" key="numbers">khmer-tall</type>
-			<type type="knda" key="numbers">kannada-tall</type>
-			<type type="lana" key="numbers" draft="contributed">thai tham hora-tall</type>
-			<type type="lanatham" key="numbers" draft="contributed">tai tham tham-tall</type>
-			<type type="laoo" key="numbers">lao-tall</type>
-			<type type="latn" key="numbers">vestlige tall</type>
-			<type type="lepc" key="numbers" draft="contributed">lepecha-tall</type>
-			<type type="limb" key="numbers" draft="contributed">limbu-tall</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">Sortér små bokstaver først</type>
-			<type type="mlym" key="numbers">malayalam-tall</type>
-			<type type="mong" key="numbers">mongolske tall</type>
-			<type type="mtei" key="numbers" draft="contributed">meetei mayek-tall</type>
-			<type type="mymr" key="numbers">myanmar-tall</type>
-			<type type="mymrshan" key="numbers" draft="contributed">myanmar shan-tall</type>
-			<type type="native" key="numbers" draft="contributed">Språkspesifikke sifre</type>
-			<type type="nkoo" key="numbers" draft="contributed">n’ko-tall</type>
-			<type type="no" key="colBackwards" draft="contributed">Sortér aksenttegn normalt</type>
-			<type type="no" key="colCaseFirst" draft="contributed">Sortér store og små bokstaver i vanlig rekkefølge</type>
-			<type type="no" key="colCaseLevel" draft="contributed">Sortér uavhengig av store og små bokstaver.</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">Sortér kana separat</type>
-			<type type="no" key="colNormalization" draft="contributed">Sortér uten normalisering</type>
-			<type type="no" key="colNumeric" draft="contributed">Sortér sifre individuelt</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">Sortér symboler</type>
-			<type type="olck" key="numbers" draft="contributed">ol chiki-tall</type>
-			<type type="orya" key="numbers">oriya-tall</type>
-			<type type="osma" key="numbers" draft="contributed">osmanya-tall</type>
-			<type type="persian" key="calendar">persisk kalender</type>
-			<type type="phonebook" key="collation">telefonkatalogsortering</type>
-			<type type="phonetic" key="collation" draft="contributed">Fonetisk sorteringsrekkefølge</type>
-			<type type="pinyin" key="collation">pinyinsortering</type>
-			<type type="primary" key="colStrength" draft="contributed">Sortér bare basisbokstaver</type>
-			<type type="quaternary" key="colStrength" draft="contributed">Sortér aksenttegn / små og store bokstaver / bredde / kana</type>
-			<type type="reformed" key="collation">reformert sortering</type>
-			<type type="roc" key="calendar">kalender for Republikken Kina</type>
-			<type type="roman" key="numbers">romertall</type>
-			<type type="romanlow" key="numbers">små romertall</type>
-			<type type="saur" key="numbers" draft="contributed">sarushatra-tall</type>
-			<type type="search" key="collation">søk av normaltype</type>
-			<type type="searchjl" key="collation" draft="contributed">Søk etter første konsonant i hangul</type>
-			<type type="secondary" key="colStrength" draft="contributed">Sortér aksenttegn</type>
-			<type type="shifted" key="colAlternate" draft="contributed">Ignorer symboler under sortering</type>
-			<type type="shrd" key="numbers" draft="contributed">sharada-tall</type>
-			<type type="sora" key="numbers" draft="contributed">sora sompeng-tall</type>
-			<type type="standard" key="collation">standard sorteringsrekkefølge</type>
-			<type type="stroke" key="collation">streksortering</type>
-			<type type="sund" key="numbers" draft="contributed">sundanese-tall</type>
-			<type type="takr" key="numbers" draft="contributed">takri-tall</type>
-			<type type="talu" key="numbers" draft="contributed">ny tai lue-tall</type>
-			<type type="taml" key="numbers">tamilske tallsymboler</type>
-			<type type="tamldec" key="numbers">tamilske tall</type>
-			<type type="telu" key="numbers">telugu-tall</type>
-			<type type="tertiary" key="colStrength" draft="contributed">Sortér aksenttegn / små og store bokstaver / bredde</type>
-			<type type="thai" key="numbers">thailandske tall</type>
-			<type type="tibt" key="numbers">tibetanske tall</type>
-			<type type="traditional" key="collation">tradisjonell sortering</type>
-			<type type="traditional" key="numbers" draft="contributed">Tradisjonelle tall</type>
-			<type type="unihan" key="collation">radikal-strek-sortering</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">Sortér store bokstaver først</type>
-			<type type="vaii" key="numbers" draft="contributed">vai-sifre</type>
-			<type type="yes" key="colBackwards" draft="contributed">Sortér aksenttegn i motsatt rekkefølge</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">Sortér med skille mellom små og store bokstaver</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">Sortér med skille mellom forskjellige varianter av kana</type>
-			<type type="yes" key="colNormalization" draft="contributed">Sortér Unicode normalisert</type>
-			<type type="yes" key="colNumeric" draft="contributed">Sortér sifre numerisk</type>
-			<type type="zhuyin" key="collation" draft="contributed">zhuyin-sortering</type>
+			<type key="calendar" type="buddhist">buddhistisk kalender</type>
+			<type key="calendar" type="chinese">kinesisk kalender</type>
+			<type key="calendar" type="coptic">koptisk kalender</type>
+			<type key="calendar" type="dangi">dangisk kalender</type>
+			<type key="calendar" type="ethiopic">etiopisk kalender</type>
+			<type key="calendar" type="ethiopic-amete-alem">etiopisk amete-alem-kalender</type>
+			<type key="calendar" type="gregorian">gregoriansk kalender</type>
+			<type key="calendar" type="hebrew">hebraisk kalender</type>
+			<type key="calendar" type="indian">indisk nasjonalkalender</type>
+			<type key="calendar" type="islamic">islamsk kalender</type>
+			<type key="calendar" type="islamic-civil">islamsk kalender (tabell, sivil)</type>
+			<type key="calendar" type="islamic-rgsa">islamsk kalender (Saudi-Arabia, observasjon)</type>
+			<type key="calendar" type="islamic-tbla">islamsk kalender (tabell, astronomisk)</type>
+			<type key="calendar" type="islamic-umalqura" draft="contributed">islamsk kalender (Umm al-Qura)</type>
+			<type key="calendar" type="iso8601">ISO 8601-kalender</type>
+			<type key="calendar" type="japanese">japansk kalender</type>
+			<type key="calendar" type="persian">persisk kalender</type>
+			<type key="calendar" type="roc">kalender for Republikken Kina</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">sortér symboler</type>
+			<type key="colAlternate" type="shifted" draft="contributed">Ignorer symboler under sortering</type>
+			<type key="colBackwards" type="no" draft="contributed">sortér aksenttegn normalt</type>
+			<type key="colBackwards" type="yes" draft="contributed">sortér aksenttegn i motsatt rekkefølge</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">Sortér små bokstaver først</type>
+			<type key="colCaseFirst" type="no" draft="contributed">Sortér store og små bokstaver i vanlig rekkefølge</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">Sortér store bokstaver først</type>
+			<type key="colCaseLevel" type="no" draft="contributed">Sortér uavhengig av store og små bokstaver.</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">Sortér med skille mellom små og store bokstaver</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">Sortér kana separat</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">Sortér med skille mellom forskjellige varianter av kana</type>
+			<type key="collation" type="big5han">tradisjonell kinesisk sortering - Big 5</type>
+			<type key="collation" type="compat" draft="contributed">forrige sorteringsrekkefølge (for kompatibilitet)</type>
+			<type key="collation" type="dictionary">ordlistesortering</type>
+			<type key="collation" type="ducet">standard Unicode-sorteringsrekkefølge</type>
+			<type key="collation" type="emoji" draft="contributed">emoji-sorteringsrekkefølge</type>
+			<type key="collation" type="eor" draft="contributed">sorteringsrekkefølge for flerspråklige europeiske dokumenter</type>
+			<type key="collation" type="gb2312han">forenklet kinesisk sortering - GB2312</type>
+			<type key="collation" type="phonebook">telefonkatalogsortering</type>
+			<type key="collation" type="phonetic" draft="contributed">Fonetisk sorteringsrekkefølge</type>
+			<type key="collation" type="pinyin">pinyinsortering</type>
+			<type key="collation" type="reformed">reformert sortering</type>
+			<type key="collation" type="search">generelt søk</type>
+			<type key="collation" type="searchjl" draft="contributed">Søk etter første konsonant i hangul</type>
+			<type key="collation" type="standard">standard sorteringsrekkefølge</type>
+			<type key="collation" type="stroke">streksortering</type>
+			<type key="collation" type="traditional">tradisjonell sortering</type>
+			<type key="collation" type="unihan">radikal-strek-sortering</type>
+			<type key="collation" type="zhuyin" draft="contributed">zhuyin-sortering</type>
+			<type key="colNormalization" type="no" draft="contributed">Sortér uten normalisering</type>
+			<type key="colNormalization" type="yes" draft="contributed">Sortér Unicode normalisert</type>
+			<type key="colNumeric" type="no" draft="contributed">Sortér sifre individuelt</type>
+			<type key="colNumeric" type="yes" draft="contributed">Sortér sifre numerisk</type>
+			<type key="colStrength" type="identical" draft="contributed">Sortér alle</type>
+			<type key="colStrength" type="primary" draft="contributed">Sortér bare basisbokstaver</type>
+			<type key="colStrength" type="quaternary" draft="contributed">Sortér aksenttegn / små og store bokstaver / bredde / kana</type>
+			<type key="colStrength" type="secondary" draft="contributed">Sortér aksenttegn</type>
+			<type key="colStrength" type="tertiary" draft="contributed">Sortér aksenttegn / små og store bokstaver / bredde</type>
+			<type key="hc" type="h11">12-timers system (0–11)</type>
+			<type key="hc" type="h12">12-timers system (1–12)</type>
+			<type key="hc" type="h23">24-timers system (0–23)</type>
+			<type key="hc" type="h24">24-timers system (1–24)</type>
+			<type key="lb" type="loose">løs linjeskiftstil</type>
+			<type key="lb" type="normal">normal linjeskiftstil</type>
+			<type key="lb" type="strict">streng linjeskiftstil</type>
+			<type key="ms" type="metric">metrisk system</type>
+			<type key="ms" type="uksystem">britisk målesystem</type>
+			<type key="ms" type="ussystem">amerikansk målesystem</type>
+			<type key="numbers" type="arab">arabisk-indiske sifre</type>
+			<type key="numbers" type="arabext">utvidede arabisk-indiske sifre</type>
+			<type key="numbers" type="armn">armenske tallsymboler</type>
+			<type key="numbers" type="armnlow">små armenske tallsymboler</type>
+			<type key="numbers" type="bali" draft="contributed">baliske tall</type>
+			<type key="numbers" type="beng">bengalske sifre</type>
+			<type key="numbers" type="brah" draft="contributed">brahmiske tall</type>
+			<type key="numbers" type="cakm" draft="contributed">chakma-tall</type>
+			<type key="numbers" type="cham" draft="contributed">cham-tall</type>
+			<type key="numbers" type="deva">devanagari-sifre</type>
+			<type key="numbers" type="ethi">etiopiske tallsymboler</type>
+			<type key="numbers" type="finance" draft="contributed">Finansielle tall</type>
+			<type key="numbers" type="fullwide">sifre med full bredde</type>
+			<type key="numbers" type="geor">georgiske tallsymboler</type>
+			<type key="numbers" type="grek">greske tallsymboler</type>
+			<type key="numbers" type="greklow">små greske tallsymboler</type>
+			<type key="numbers" type="gujr">gujarati-sifre</type>
+			<type key="numbers" type="guru">gurmukhi-sifre</type>
+			<type key="numbers" type="hanidec">kinesiske desimaltallsymboler</type>
+			<type key="numbers" type="hans">forenklede kinesiske tallsymboler</type>
+			<type key="numbers" type="hansfin">forenklede kinesiske finanstallsymboler</type>
+			<type key="numbers" type="hant">tradisjonelle kinesiske tallsymboler</type>
+			<type key="numbers" type="hantfin">tradisjonelle kinesiske finanstallsymboler</type>
+			<type key="numbers" type="hebr">hebraiske tallsymboler</type>
+			<type key="numbers" type="java" draft="contributed">java-tall</type>
+			<type key="numbers" type="jpan">japanske tallsymboler</type>
+			<type key="numbers" type="jpanfin">japanske finanstallsymboler</type>
+			<type key="numbers" type="kali" draft="contributed">kayah li-tall</type>
+			<type key="numbers" type="khmr">khmer-sifre</type>
+			<type key="numbers" type="knda">kannada-sifre</type>
+			<type key="numbers" type="lana" draft="contributed">thai tham hora-tall</type>
+			<type key="numbers" type="lanatham" draft="contributed">tai tham tham-tall</type>
+			<type key="numbers" type="laoo">laotiske sifre</type>
+			<type key="numbers" type="latn">vestlige sifre</type>
+			<type key="numbers" type="lepc" draft="contributed">lepecha-tall</type>
+			<type key="numbers" type="limb" draft="contributed">limbu-tall</type>
+			<type key="numbers" type="mlym">malayalam-sifre</type>
+			<type key="numbers" type="mong">mongolske tall</type>
+			<type key="numbers" type="mtei" draft="contributed">meetei mayek-tall</type>
+			<type key="numbers" type="mymr">myanmar-sifre</type>
+			<type key="numbers" type="mymrshan" draft="contributed">myanmar shan-tall</type>
+			<type key="numbers" type="native" draft="contributed">Språkspesifikke sifre</type>
+			<type key="numbers" type="nkoo" draft="contributed">n’ko-tall</type>
+			<type key="numbers" type="olck" draft="contributed">ol chiki-tall</type>
+			<type key="numbers" type="orya">oriya-sifre</type>
+			<type key="numbers" type="osma" draft="contributed">osmanya-tall</type>
+			<type key="numbers" type="roman">romertall</type>
+			<type key="numbers" type="romanlow">små romertall</type>
+			<type key="numbers" type="saur" draft="contributed">sarushatra-tall</type>
+			<type key="numbers" type="shrd" draft="contributed">sharada-tall</type>
+			<type key="numbers" type="sora" draft="contributed">sora sompeng-tall</type>
+			<type key="numbers" type="sund" draft="contributed">sundanese-tall</type>
+			<type key="numbers" type="takr" draft="contributed">takri-tall</type>
+			<type key="numbers" type="talu" draft="contributed">ny tai lue-tall</type>
+			<type key="numbers" type="taml">tamilske tallsymboler</type>
+			<type key="numbers" type="tamldec">tamilske sifre</type>
+			<type key="numbers" type="telu">telugu-sifre</type>
+			<type key="numbers" type="thai">thailandske sifre</type>
+			<type key="numbers" type="tibt">tibetanske sifre</type>
+			<type key="numbers" type="traditional" draft="contributed">Tradisjonelle tall</type>
+			<type key="numbers" type="vaii" draft="contributed">vai-sifre</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">BGN</transformName>
@@ -1230,7 +1405,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</contextTransforms>
 	<characters>
 		<exemplarCharacters>[a à b c d e é f g h i j k l m n o ó ò ô p q r s t u v w x y z æ ø å]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[á ǎ ã č ç đ è ê í ń ñ ŋ š ŧ ü ž ä ö]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[á ǎ ã č ç đ è ê í ń ñ ŋ š ŧ ú ü ž ä ö]</exemplarCharacters>
 		<exemplarCharacters type="index">[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 Æ Ø Å]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- – , ; \: ! ? . ' &quot; « » ( ) \[ \] \{ \} § @ * / \\]</exemplarCharacters>
 		<ellipsis type="final">{0}…</ellipsis>
@@ -1255,6 +1430,600 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<era type="0">BE</era>
 					</eraAbbr>
 				</eras>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
+						<dateFormatItem id="MMMMd" draft="contributed">d. MMMM</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="chinese">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">M01</month>
+							<month type="2" draft="contributed">M02</month>
+							<month type="3" draft="contributed">M03</month>
+							<month type="4" draft="contributed">M04</month>
+							<month type="5" draft="contributed">M05</month>
+							<month type="6" draft="contributed">M06</month>
+							<month type="7" draft="contributed">M07</month>
+							<month type="8" draft="contributed">M08</month>
+							<month type="9" draft="contributed">M09</month>
+							<month type="10" draft="contributed">M10</month>
+							<month type="11" draft="contributed">M11</month>
+							<month type="12" draft="contributed">M12</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">1</month>
+							<month type="2" draft="contributed">2</month>
+							<month type="3" draft="contributed">3</month>
+							<month type="4" draft="contributed">4</month>
+							<month type="5" draft="contributed">5</month>
+							<month type="6" draft="contributed">6</month>
+							<month type="7" draft="contributed">7</month>
+							<month type="8" draft="contributed">8</month>
+							<month type="9" draft="contributed">9</month>
+							<month type="10" draft="contributed">10</month>
+							<month type="11" draft="contributed">11</month>
+							<month type="12" draft="contributed">12</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<monthPatterns>
+					<monthPatternContext type="format">
+						<monthPatternWidth type="abbreviated">
+							<monthPattern type="leap" draft="contributed">{0}bis</monthPattern>
+						</monthPatternWidth>
+						<monthPatternWidth type="narrow">
+							<monthPattern type="leap" draft="contributed">{0}b</monthPattern>
+						</monthPatternWidth>
+						<monthPatternWidth type="wide">
+							<monthPattern type="leap" draft="contributed">{0}bis</monthPattern>
+						</monthPatternWidth>
+					</monthPatternContext>
+					<monthPatternContext type="numeric">
+						<monthPatternWidth type="all">
+							<monthPattern type="leap" draft="contributed">{0}bis</monthPattern>
+						</monthPatternWidth>
+					</monthPatternContext>
+					<monthPatternContext type="stand-alone">
+						<monthPatternWidth type="abbreviated">
+							<monthPattern type="leap" draft="contributed">{0}bis</monthPattern>
+						</monthPatternWidth>
+						<monthPatternWidth type="narrow">
+							<monthPattern type="leap" draft="contributed">{0}b</monthPattern>
+						</monthPatternWidth>
+						<monthPatternWidth type="wide">
+							<monthPattern type="leap" draft="contributed">{0}bis</monthPattern>
+						</monthPatternWidth>
+					</monthPatternContext>
+				</monthPatterns>
+				<cyclicNameSets>
+					<cyclicNameSet type="dayParts">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1" draft="contributed">zi</cyclicName>
+								<cyclicName type="2" draft="contributed">chou</cyclicName>
+								<cyclicName type="3" draft="contributed">yin</cyclicName>
+								<cyclicName type="4" draft="contributed">mao</cyclicName>
+								<cyclicName type="5" draft="contributed">chen</cyclicName>
+								<cyclicName type="6" draft="contributed">si</cyclicName>
+								<cyclicName type="7" draft="contributed">wu</cyclicName>
+								<cyclicName type="8" draft="contributed">wei</cyclicName>
+								<cyclicName type="9" draft="contributed">shen</cyclicName>
+								<cyclicName type="10" draft="contributed">you</cyclicName>
+								<cyclicName type="11" draft="contributed">xu</cyclicName>
+								<cyclicName type="12" draft="contributed">hai</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+					<cyclicNameSet type="solarTerms">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1" draft="contributed">vårstart</cyclicName>
+								<cyclicName type="2" draft="contributed">regnvann</cyclicName>
+								<cyclicName type="3" draft="contributed">insekter våkner</cyclicName>
+								<cyclicName type="4" draft="contributed">vårjevndøgn</cyclicName>
+								<cyclicName type="5" draft="contributed">lyst og klart</cyclicName>
+								<cyclicName type="6" draft="contributed">kornregn</cyclicName>
+								<cyclicName type="7" draft="contributed">sommerstart</cyclicName>
+								<cyclicName type="8" draft="contributed">tidl. korn</cyclicName>
+								<cyclicName type="9" draft="contributed">korn i aks</cyclicName>
+								<cyclicName type="10" draft="contributed">sommersolverv</cyclicName>
+								<cyclicName type="11" draft="contributed">liten varme</cyclicName>
+								<cyclicName type="12" draft="contributed">stor varme</cyclicName>
+								<cyclicName type="13" draft="contributed">høststart</cyclicName>
+								<cyclicName type="14" draft="contributed">varmeslutt</cyclicName>
+								<cyclicName type="15" draft="contributed">hvit dugg</cyclicName>
+								<cyclicName type="16" draft="contributed">høstjevndøgn</cyclicName>
+								<cyclicName type="17" draft="contributed">kalddugg</cyclicName>
+								<cyclicName type="18" draft="contributed">første frost</cyclicName>
+								<cyclicName type="19" draft="contributed">vinterstart</cyclicName>
+								<cyclicName type="20" draft="contributed">litt snø</cyclicName>
+								<cyclicName type="21" draft="contributed">mye snø</cyclicName>
+								<cyclicName type="22" draft="contributed">vintersolverv</cyclicName>
+								<cyclicName type="23" draft="contributed">liten kulde</cyclicName>
+								<cyclicName type="24" draft="contributed">stor kulde</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+					<cyclicNameSet type="years">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1" draft="contributed">jia-zi</cyclicName>
+								<cyclicName type="2" draft="contributed">yi-chou</cyclicName>
+								<cyclicName type="3" draft="contributed">bing-yin</cyclicName>
+								<cyclicName type="4" draft="contributed">ding-mao</cyclicName>
+								<cyclicName type="5" draft="contributed">wu-chen</cyclicName>
+								<cyclicName type="6" draft="contributed">ji-si</cyclicName>
+								<cyclicName type="7" draft="contributed">geng-wu</cyclicName>
+								<cyclicName type="8" draft="contributed">xin-wei</cyclicName>
+								<cyclicName type="9" draft="contributed">ren-shen</cyclicName>
+								<cyclicName type="10" draft="contributed">gui-you</cyclicName>
+								<cyclicName type="11" draft="contributed">jia-xu</cyclicName>
+								<cyclicName type="12" draft="contributed">yi-hai</cyclicName>
+								<cyclicName type="13" draft="contributed">bing-zi</cyclicName>
+								<cyclicName type="14" draft="contributed">ding-chou</cyclicName>
+								<cyclicName type="15" draft="contributed">wu-yin</cyclicName>
+								<cyclicName type="16" draft="contributed">ji-mao</cyclicName>
+								<cyclicName type="17" draft="contributed">geng-chen</cyclicName>
+								<cyclicName type="18" draft="contributed">xin-si</cyclicName>
+								<cyclicName type="19" draft="contributed">ren-wu</cyclicName>
+								<cyclicName type="20" draft="contributed">gui-wei</cyclicName>
+								<cyclicName type="21" draft="contributed">jia-shen</cyclicName>
+								<cyclicName type="22" draft="contributed">yi-you</cyclicName>
+								<cyclicName type="23" draft="contributed">bing-xu</cyclicName>
+								<cyclicName type="24" draft="contributed">ding-hai</cyclicName>
+								<cyclicName type="25" draft="contributed">wu-zi</cyclicName>
+								<cyclicName type="26" draft="contributed">ji-chou</cyclicName>
+								<cyclicName type="27" draft="contributed">geng-yin</cyclicName>
+								<cyclicName type="28" draft="contributed">xin-mao</cyclicName>
+								<cyclicName type="29" draft="contributed">ren-chen</cyclicName>
+								<cyclicName type="30" draft="contributed">gui-si</cyclicName>
+								<cyclicName type="31" draft="contributed">jia-wu</cyclicName>
+								<cyclicName type="32" draft="contributed">yi-wei</cyclicName>
+								<cyclicName type="33" draft="contributed">bing-shen</cyclicName>
+								<cyclicName type="34" draft="contributed">ding-you</cyclicName>
+								<cyclicName type="35" draft="contributed">wu-xu</cyclicName>
+								<cyclicName type="36" draft="contributed">ji-hai</cyclicName>
+								<cyclicName type="37" draft="contributed">geng-zi</cyclicName>
+								<cyclicName type="38" draft="contributed">xin-chou</cyclicName>
+								<cyclicName type="39" draft="contributed">ren-yin</cyclicName>
+								<cyclicName type="40" draft="contributed">gui-mao</cyclicName>
+								<cyclicName type="41" draft="contributed">jia-chen</cyclicName>
+								<cyclicName type="42" draft="contributed">yi-si</cyclicName>
+								<cyclicName type="43" draft="contributed">bing-wu</cyclicName>
+								<cyclicName type="44" draft="contributed">ding-wei</cyclicName>
+								<cyclicName type="45" draft="contributed">wu-shen</cyclicName>
+								<cyclicName type="46" draft="contributed">ji-you</cyclicName>
+								<cyclicName type="47" draft="contributed">geng-xu</cyclicName>
+								<cyclicName type="48" draft="contributed">xin-hai</cyclicName>
+								<cyclicName type="49" draft="contributed">ren-zi</cyclicName>
+								<cyclicName type="50" draft="contributed">gui-chou</cyclicName>
+								<cyclicName type="51" draft="contributed">jia-yin</cyclicName>
+								<cyclicName type="52" draft="contributed">yi-mao</cyclicName>
+								<cyclicName type="53" draft="contributed">bing-chen</cyclicName>
+								<cyclicName type="54" draft="contributed">ding-si</cyclicName>
+								<cyclicName type="55" draft="contributed">wu-wu</cyclicName>
+								<cyclicName type="56" draft="contributed">ji-wei</cyclicName>
+								<cyclicName type="57" draft="contributed">geng-shen</cyclicName>
+								<cyclicName type="58" draft="contributed">xin-you</cyclicName>
+								<cyclicName type="59" draft="contributed">ren-xu</cyclicName>
+								<cyclicName type="60" draft="contributed">gui-hai</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+				</cyclicNameSets>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern draft="contributed">EEEE d. MMMM r(U)</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern draft="contributed">d. MMMM r(U)</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern draft="contributed">d. MMM r</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern draft="contributed">d.M.r</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern draft="contributed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern draft="contributed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern draft="contributed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern draft="contributed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="d" draft="contributed">d.</dateFormatItem>
+						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
+						<dateFormatItem id="Ed" draft="contributed">E d.</dateFormatItem>
+						<dateFormatItem id="Gy" draft="contributed">r(U)</dateFormatItem>
+						<dateFormatItem id="GyMMM" draft="contributed">MMM r(U)</dateFormatItem>
+						<dateFormatItem id="GyMMMd" draft="contributed">d. MMM r</dateFormatItem>
+						<dateFormatItem id="GyMMMEd" draft="contributed">E d. MMM r(U)</dateFormatItem>
+						<dateFormatItem id="M" draft="contributed">L.</dateFormatItem>
+						<dateFormatItem id="Md" draft="contributed">dd.MM</dateFormatItem>
+						<dateFormatItem id="MEd" draft="contributed">E dd.MM.</dateFormatItem>
+						<dateFormatItem id="MMM" draft="contributed">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd" draft="contributed">d. MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd" draft="contributed">E d. MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd" draft="contributed">d. MMMM</dateFormatItem>
+						<dateFormatItem id="UM" draft="contributed">MM. U</dateFormatItem>
+						<dateFormatItem id="UMd" draft="contributed">d.MM. U</dateFormatItem>
+						<dateFormatItem id="UMMM" draft="contributed">MMM U</dateFormatItem>
+						<dateFormatItem id="UMMMd" draft="contributed">d. MMM U</dateFormatItem>
+						<dateFormatItem id="y" draft="contributed">r(U)</dateFormatItem>
+						<dateFormatItem id="yMd" draft="contributed">dd.MM.r</dateFormatItem>
+						<dateFormatItem id="yyyy" draft="contributed">r(U)</dateFormatItem>
+						<dateFormatItem id="yyyyM" draft="contributed">MM.r</dateFormatItem>
+						<dateFormatItem id="yyyyMd" draft="contributed">dd.MM.r</dateFormatItem>
+						<dateFormatItem id="yyyyMEd" draft="contributed">E dd.MM.r</dateFormatItem>
+						<dateFormatItem id="yyyyMMM" draft="contributed">MMM r(U)</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd" draft="contributed">d. MMM r</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd" draft="contributed">E d. MMM r(U)</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM" draft="contributed">MMMM r(U)</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ" draft="contributed">QQQ r(U)</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ" draft="contributed">QQQQ r(U)</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback draft="contributed">{0}–{1}</intervalFormatFallback>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d" draft="contributed">d.–d.</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a" draft="contributed">h a–h a</greatestDifference>
+							<greatestDifference id="h" draft="contributed">h–h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H" draft="contributed">HH–HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a" draft="contributed">h.mm a–h.mm a</greatestDifference>
+							<greatestDifference id="h" draft="contributed">h.mm–h.mm a</greatestDifference>
+							<greatestDifference id="m" draft="contributed">h.mm–h.mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H" draft="contributed">HH.mm–HH.mm</greatestDifference>
+							<greatestDifference id="m" draft="contributed">HH.mm–HH.mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a" draft="contributed">h.mm a–h.mm a v</greatestDifference>
+							<greatestDifference id="h" draft="contributed">h.mm–h.mm a v</greatestDifference>
+							<greatestDifference id="m" draft="contributed">h.mm–h.mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H" draft="contributed">HH.mm–HH.mm v</greatestDifference>
+							<greatestDifference id="m" draft="contributed">HH.mm–HH.mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a" draft="contributed">h a–h a v</greatestDifference>
+							<greatestDifference id="h" draft="contributed">h–h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H" draft="contributed">HH–HH v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M" draft="contributed">MM.–MM.</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d" draft="contributed">dd.MM.–dd.MM.</greatestDifference>
+							<greatestDifference id="M" draft="contributed">dd.MM.–dd.MM.</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d" draft="contributed">dd.MM.E–dd.MM.E</greatestDifference>
+							<greatestDifference id="M" draft="contributed">dd.MM.E–dd.MM.E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M" draft="contributed">LLL–LLL</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d" draft="contributed">d.–d. MMM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d. MMM–d. MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d" draft="contributed">E d. MMM–E d. MMM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E d. MMM–E d. MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y" draft="contributed">U–U</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M" draft="contributed">MM.y–MM.y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">MM.y–MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d" draft="contributed">dd.MM.y–dd.MM.y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">dd.MM.y–dd.MM.y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">dd.MM.y–dd.MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d" draft="contributed">E dd.MM.y–E dd.MM.y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E dd.MM.y–E dd.MM.y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">E dd.MM.y–E dd.MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M" draft="contributed">MMM–MMM U</greatestDifference>
+							<greatestDifference id="y" draft="contributed">MMM U–MMM U</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d" draft="contributed">d.–d. U MMM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d. MMM–d. MMM U</greatestDifference>
+							<greatestDifference id="y" draft="contributed">d. MMM U–d. MMM U</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d" draft="contributed">E d. MMM–E d. MMM U</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E d. MMM–E d. MMM U</greatestDifference>
+							<greatestDifference id="y" draft="contributed">E d. MMM U–E d. MMM U</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M" draft="contributed">MMMM–MMMM U</greatestDifference>
+							<greatestDifference id="y" draft="contributed">MMMM U–MMMM U</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="coptic">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">tout</month>
+							<month type="2" draft="contributed">baba</month>
+							<month type="3" draft="contributed">hator</month>
+							<month type="4" draft="contributed">kiahk</month>
+							<month type="5" draft="contributed">toba</month>
+							<month type="6" draft="contributed">amshir</month>
+							<month type="7" draft="contributed">baramhat</month>
+							<month type="8" draft="contributed">baramouda</month>
+							<month type="9" draft="contributed">bashans</month>
+							<month type="10" draft="contributed">paona</month>
+							<month type="11" draft="contributed">epep</month>
+							<month type="12" draft="contributed">mesra</month>
+							<month type="13" draft="contributed">nasie</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">1</month>
+							<month type="2" draft="contributed">2</month>
+							<month type="3" draft="contributed">3</month>
+							<month type="4" draft="contributed">4</month>
+							<month type="5" draft="contributed">5</month>
+							<month type="6" draft="contributed">6</month>
+							<month type="7" draft="contributed">7</month>
+							<month type="8" draft="contributed">8</month>
+							<month type="9" draft="contributed">9</month>
+							<month type="10" draft="contributed">10</month>
+							<month type="11" draft="contributed">11</month>
+							<month type="12" draft="contributed">12</month>
+							<month type="13" draft="contributed">13</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">tout</month>
+							<month type="2" draft="contributed">baba</month>
+							<month type="3" draft="contributed">hator</month>
+							<month type="4" draft="contributed">kiahk</month>
+							<month type="5" draft="contributed">toba</month>
+							<month type="6" draft="contributed">amshir</month>
+							<month type="7" draft="contributed">baramhat</month>
+							<month type="8" draft="contributed">baramouda</month>
+							<month type="9" draft="contributed">bashans</month>
+							<month type="10" draft="contributed">paona</month>
+							<month type="11" draft="contributed">epep</month>
+							<month type="12" draft="contributed">mesra</month>
+							<month type="13" draft="contributed">nasie</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">tout</month>
+							<month type="2" draft="contributed">baba</month>
+							<month type="3" draft="contributed">hator</month>
+							<month type="4" draft="contributed">kiahk</month>
+							<month type="5" draft="contributed">toba</month>
+							<month type="6" draft="contributed">amshir</month>
+							<month type="7" draft="contributed">baramhat</month>
+							<month type="8" draft="contributed">baramouda</month>
+							<month type="9" draft="contributed">bashans</month>
+							<month type="10" draft="contributed">paona</month>
+							<month type="11" draft="contributed">epep</month>
+							<month type="12" draft="contributed">mesra</month>
+							<month type="13" draft="contributed">nasie</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">1</month>
+							<month type="2" draft="contributed">2</month>
+							<month type="3" draft="contributed">3</month>
+							<month type="4" draft="contributed">4</month>
+							<month type="5" draft="contributed">5</month>
+							<month type="6" draft="contributed">6</month>
+							<month type="7" draft="contributed">7</month>
+							<month type="8" draft="contributed">8</month>
+							<month type="9" draft="contributed">9</month>
+							<month type="10" draft="contributed">10</month>
+							<month type="11" draft="contributed">11</month>
+							<month type="12" draft="contributed">12</month>
+							<month type="13" draft="contributed">13</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">tout</month>
+							<month type="2" draft="contributed">baba</month>
+							<month type="3" draft="contributed">hator</month>
+							<month type="4" draft="contributed">kiahk</month>
+							<month type="5" draft="contributed">toba</month>
+							<month type="6" draft="contributed">amshir</month>
+							<month type="7" draft="contributed">baramhat</month>
+							<month type="8" draft="contributed">baramouda</month>
+							<month type="9" draft="contributed">bashans</month>
+							<month type="10" draft="contributed">paona</month>
+							<month type="11" draft="contributed">epep</month>
+							<month type="12" draft="contributed">mesra</month>
+							<month type="13" draft="contributed">nasie</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<eras>
+					<eraNames>
+						<era type="0" draft="contributed">0. tidsalder</era>
+						<era type="1" draft="contributed">1. tidsalder</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0" draft="contributed">0. t.a.</era>
+						<era type="1" draft="contributed">1. t.a.</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0" draft="contributed">TA0</era>
+						<era type="1" draft="contributed">TA1</era>
+					</eraNarrow>
+				</eras>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
+						<dateFormatItem id="MMMMd" draft="contributed">d. MMMM</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="ethiopic">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">meskerem</month>
+							<month type="2" draft="contributed">tekemt</month>
+							<month type="3" draft="contributed">hedar</month>
+							<month type="4" draft="contributed">tahsas</month>
+							<month type="5" draft="contributed">ter</month>
+							<month type="6" draft="contributed">yekatit</month>
+							<month type="7" draft="contributed">megabit</month>
+							<month type="8" draft="contributed">miazia</month>
+							<month type="9" draft="contributed">genbot</month>
+							<month type="10" draft="contributed">sene</month>
+							<month type="11" draft="contributed">hamle</month>
+							<month type="12" draft="contributed">nehasse</month>
+							<month type="13" draft="contributed">pagumen</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">1</month>
+							<month type="2" draft="contributed">2</month>
+							<month type="3" draft="contributed">3</month>
+							<month type="4" draft="contributed">4</month>
+							<month type="5" draft="contributed">5</month>
+							<month type="6" draft="contributed">6</month>
+							<month type="7" draft="contributed">7</month>
+							<month type="8" draft="contributed">8</month>
+							<month type="9" draft="contributed">9</month>
+							<month type="10" draft="contributed">10</month>
+							<month type="11" draft="contributed">11</month>
+							<month type="12" draft="contributed">12</month>
+							<month type="13" draft="contributed">13</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">meskerem</month>
+							<month type="2" draft="contributed">tekemt</month>
+							<month type="3" draft="contributed">hedar</month>
+							<month type="4" draft="contributed">tahsas</month>
+							<month type="5" draft="contributed">ter</month>
+							<month type="6" draft="contributed">yekatit</month>
+							<month type="7" draft="contributed">megabit</month>
+							<month type="8" draft="contributed">miazia</month>
+							<month type="9" draft="contributed">genbot</month>
+							<month type="10" draft="contributed">sene</month>
+							<month type="11" draft="contributed">hamle</month>
+							<month type="12" draft="contributed">nehasse</month>
+							<month type="13" draft="contributed">pagumen</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">meskerem</month>
+							<month type="2" draft="contributed">tekemt</month>
+							<month type="3" draft="contributed">hedar</month>
+							<month type="4" draft="contributed">tahsas</month>
+							<month type="5" draft="contributed">ter</month>
+							<month type="6" draft="contributed">yekatit</month>
+							<month type="7" draft="contributed">megabit</month>
+							<month type="8" draft="contributed">miazia</month>
+							<month type="9" draft="contributed">genbot</month>
+							<month type="10" draft="contributed">sene</month>
+							<month type="11" draft="contributed">hamle</month>
+							<month type="12" draft="contributed">nehasse</month>
+							<month type="13" draft="contributed">pagumen</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">1</month>
+							<month type="2" draft="contributed">2</month>
+							<month type="3" draft="contributed">3</month>
+							<month type="4" draft="contributed">4</month>
+							<month type="5" draft="contributed">5</month>
+							<month type="6" draft="contributed">6</month>
+							<month type="7" draft="contributed">7</month>
+							<month type="8" draft="contributed">8</month>
+							<month type="9" draft="contributed">9</month>
+							<month type="10" draft="contributed">10</month>
+							<month type="11" draft="contributed">11</month>
+							<month type="12" draft="contributed">12</month>
+							<month type="13" draft="contributed">13</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">meskerem</month>
+							<month type="2" draft="contributed">tekemt</month>
+							<month type="3" draft="contributed">hedar</month>
+							<month type="4" draft="contributed">tahsas</month>
+							<month type="5" draft="contributed">ter</month>
+							<month type="6" draft="contributed">yekatit</month>
+							<month type="7" draft="contributed">megabit</month>
+							<month type="8" draft="contributed">miazia</month>
+							<month type="9" draft="contributed">genbot</month>
+							<month type="10" draft="contributed">sene</month>
+							<month type="11" draft="contributed">hamle</month>
+							<month type="12" draft="contributed">nehasse</month>
+							<month type="13" draft="contributed">pagumen</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<eras>
+					<eraNames>
+						<era type="0" draft="contributed">0. tidsalder</era>
+						<era type="1" draft="contributed">1. tidsalder</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0" draft="contributed">0. t.a.</era>
+						<era type="1" draft="contributed">1. t.a.</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0" draft="contributed">TA0</era>
+						<era type="1" draft="contributed">TA1</era>
+					</eraNarrow>
+				</eras>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
+						<dateFormatItem id="MMMMd" draft="contributed">d. MMMM</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
 			</calendar>
 			<calendar type="generic">
 				<dateFormats>
@@ -1302,6 +2071,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d.</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d.</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -1320,6 +2090,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d. MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm.ss</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
@@ -1563,13 +2334,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dayContext>
 					<dayContext type="stand-alone">
 						<dayWidth type="abbreviated">
-							<day type="sun">sø.</day>
-							<day type="mon">ma.</day>
-							<day type="tue">ti.</day>
-							<day type="wed">on.</day>
-							<day type="thu">to.</day>
-							<day type="fri">fr.</day>
-							<day type="sat">lø.</day>
+							<day type="sun">søn.</day>
+							<day type="mon">man.</day>
+							<day type="tue">tir.</day>
+							<day type="wed">ons.</day>
+							<day type="thu">tor.</day>
+							<day type="fri">fre.</day>
+							<day type="sat">lør.</day>
 						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun">S</day>
@@ -1609,10 +2380,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<quarter type="4">K4</quarter>
 						</quarterWidth>
 						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
+							<quarter type="1">1.</quarter>
+							<quarter type="2">2.</quarter>
+							<quarter type="3">3.</quarter>
+							<quarter type="4">4.</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
 							<quarter type="1">1. kvartal</quarter>
@@ -1629,10 +2400,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<quarter type="4">K4</quarter>
 						</quarterWidth>
 						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
+							<quarter type="1">1.</quarter>
+							<quarter type="2">2.</quarter>
+							<quarter type="3">3.</quarter>
+							<quarter type="4">4.</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
 							<quarter type="1">1. kvartal</quarter>
@@ -1645,45 +2416,87 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am" draft="contributed">a.m.</dayPeriod>
-							<dayPeriod type="pm" draft="contributed">p.m.</dayPeriod>
+							<dayPeriod type="midnight">midn.</dayPeriod>
+							<dayPeriod type="am">a.m.</dayPeriod>
+							<dayPeriod type="pm">p.m.</dayPeriod>
+							<dayPeriod type="morning1">morg.</dayPeriod>
+							<dayPeriod type="morning2">form.</dayPeriod>
+							<dayPeriod type="afternoon1">etterm.</dayPeriod>
+							<dayPeriod type="evening1">kveld</dayPeriod>
+							<dayPeriod type="night1">natt</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">mn.</dayPeriod>
 							<dayPeriod type="am">a</dayPeriod>
-							<dayPeriod type="noon">12</dayPeriod>
 							<dayPeriod type="pm">p</dayPeriod>
+							<dayPeriod type="morning1">mg.</dayPeriod>
+							<dayPeriod type="morning2">fm.</dayPeriod>
+							<dayPeriod type="afternoon1">em.</dayPeriod>
+							<dayPeriod type="evening1">kv.</dayPeriod>
+							<dayPeriod type="night1">nt.</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">midnatt</dayPeriod>
 							<dayPeriod type="am">a.m.</dayPeriod>
-							<dayPeriod type="noon">kl. 12</dayPeriod>
 							<dayPeriod type="pm">p.m.</dayPeriod>
+							<dayPeriod type="morning1">morgenen</dayPeriod>
+							<dayPeriod type="morning2">formiddagen</dayPeriod>
+							<dayPeriod type="afternoon1">ettermiddagen</dayPeriod>
+							<dayPeriod type="evening1">kvelden</dayPeriod>
+							<dayPeriod type="night1">natten</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">midn.</dayPeriod>
+							<dayPeriod type="am">a.m.</dayPeriod>
+							<dayPeriod type="pm">p.m.</dayPeriod>
+							<dayPeriod type="morning1">morg.</dayPeriod>
+							<dayPeriod type="morning2">form.</dayPeriod>
+							<dayPeriod type="afternoon1">etterm.</dayPeriod>
+							<dayPeriod type="evening1">kveld</dayPeriod>
+							<dayPeriod type="night1">natt</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">mn.</dayPeriod>
+							<dayPeriod type="am">a.m.</dayPeriod>
+							<dayPeriod type="pm">p.m.</dayPeriod>
+							<dayPeriod type="morning1">mg.</dayPeriod>
+							<dayPeriod type="morning2">fm.</dayPeriod>
+							<dayPeriod type="afternoon1">em.</dayPeriod>
+							<dayPeriod type="evening1">kv.</dayPeriod>
+							<dayPeriod type="night1">nt.</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="am" draft="provisional">AM</dayPeriod>
-							<dayPeriod type="pm" draft="provisional">PM</dayPeriod>
+							<dayPeriod type="midnight">midnatt</dayPeriod>
+							<dayPeriod type="am">a.m.</dayPeriod>
+							<dayPeriod type="pm">p.m.</dayPeriod>
+							<dayPeriod type="morning1">morgen</dayPeriod>
+							<dayPeriod type="morning2">formiddag</dayPeriod>
+							<dayPeriod type="afternoon1">ettermiddag</dayPeriod>
+							<dayPeriod type="evening1">kveld</dayPeriod>
+							<dayPeriod type="night1">natt</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
-						<era type="0">f.Kr.</era>
+						<era type="0">før Kristus</era>
 						<era type="0" alt="variant">før vår tidsregning</era>
-						<era type="1">e.Kr.</era>
-						<era type="1" alt="variant">vår tidsregning</era>
+						<era type="1">etter Kristus</era>
+						<era type="1" alt="variant">etter vår tidsregning</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">f.Kr.</era>
 						<era type="0" alt="variant">fvt.</era>
 						<era type="1">e.Kr.</era>
-						<era type="1" alt="variant">vt.</era>
+						<era type="1" alt="variant">evt.</era>
 					</eraAbbr>
 					<eraNarrow>
 						<era type="0">f.Kr.</era>
-						<era type="0" alt="variant" draft="contributed">fvt.</era>
+						<era type="0" alt="variant">fvt.</era>
 						<era type="1">e.Kr.</era>
-						<era type="1" alt="variant" draft="contributed">vt</era>
+						<era type="1" alt="variant" draft="contributed">vt.</era>
 					</eraNarrow>
 				</eras>
 				<dateFormats>
@@ -1712,21 +2525,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<timeFormatLength type="full">
 						<timeFormat>
 							<pattern>HH.mm.ss zzzz</pattern>
+							<pattern alt="variant">HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
 							<pattern>HH.mm.ss z</pattern>
+							<pattern alt="variant">HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
 							<pattern>HH.mm.ss</pattern>
+							<pattern alt="variant">HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
 							<pattern>HH.mm</pattern>
+							<pattern alt="variant">HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -1738,7 +2555,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern>{1} 'kl.' {0}</pattern>
+							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
@@ -1780,6 +2597,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d. MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm.ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">M.y</dateFormatItem>
@@ -1802,14 +2620,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="d">d.–d.</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
+							<greatestDifference id="a">h a–h a</greatestDifference>
 							<greatestDifference id="h">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
 							<greatestDifference id="H">HH–HH</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h.mm a – h.mm a</greatestDifference>
+							<greatestDifference id="a">h.mm a–h.mm a</greatestDifference>
 							<greatestDifference id="h">h.mm–h.mm a</greatestDifference>
 							<greatestDifference id="m">h.mm–h.mm a</greatestDifference>
 						</intervalFormatItem>
@@ -1818,7 +2636,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="m">HH.mm–HH.mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h.mm a – h.mm a v</greatestDifference>
+							<greatestDifference id="a">h.mm a–h.mm a v</greatestDifference>
 							<greatestDifference id="h">h.mm–h.mm a v</greatestDifference>
 							<greatestDifference id="m">h.mm–h.mm a v</greatestDifference>
 						</intervalFormatItem>
@@ -1827,7 +2645,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="m">HH.mm–HH.mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
+							<greatestDifference id="a">h a–h a v</greatestDifference>
 							<greatestDifference id="h">h–h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
@@ -1894,20 +2712,579 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="hebrew">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">tishri</month>
+							<month type="2">heshvan</month>
+							<month type="3">kislev</month>
+							<month type="4">tevet</month>
+							<month type="5">shevat</month>
+							<month type="6">adar I</month>
+							<month type="7">adar</month>
+							<month type="7" yeartype="leap">adar II</month>
+							<month type="8">nisan</month>
+							<month type="9">iyar</month>
+							<month type="10">sivan</month>
+							<month type="11">tamuz</month>
+							<month type="12">av</month>
+							<month type="13">elul</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">1</month>
+							<month type="2" draft="contributed">2</month>
+							<month type="3" draft="contributed">3</month>
+							<month type="4" draft="contributed">4</month>
+							<month type="5" draft="contributed">5</month>
+							<month type="6" draft="contributed">6</month>
+							<month type="7" draft="contributed">7</month>
+							<month type="7" yeartype="leap" draft="contributed">7</month>
+							<month type="8" draft="contributed">8</month>
+							<month type="9" draft="contributed">9</month>
+							<month type="10" draft="contributed">10</month>
+							<month type="11" draft="contributed">11</month>
+							<month type="12" draft="contributed">12</month>
+							<month type="13" draft="contributed">13</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">tishri</month>
+							<month type="2">heshvan</month>
+							<month type="3">kislev</month>
+							<month type="4">tevet</month>
+							<month type="5">shevat</month>
+							<month type="6">adar I</month>
+							<month type="7">adar</month>
+							<month type="7" yeartype="leap">adar II</month>
+							<month type="8">nisan</month>
+							<month type="9">iyar</month>
+							<month type="10">sivan</month>
+							<month type="11">tamuz</month>
+							<month type="12">av</month>
+							<month type="13">elul</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">tishri</month>
+							<month type="2">heshvan</month>
+							<month type="3">kislev</month>
+							<month type="4">tevet</month>
+							<month type="5">shevat</month>
+							<month type="6">adar I</month>
+							<month type="7">adar</month>
+							<month type="7" yeartype="leap">adar II</month>
+							<month type="8">nisan</month>
+							<month type="9">iyar</month>
+							<month type="10">sivan</month>
+							<month type="11">tamuz</month>
+							<month type="12">av</month>
+							<month type="13">elul</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">1</month>
+							<month type="2" draft="contributed">2</month>
+							<month type="3" draft="contributed">3</month>
+							<month type="4" draft="contributed">4</month>
+							<month type="5" draft="contributed">5</month>
+							<month type="6" draft="contributed">6</month>
+							<month type="7" draft="contributed">7</month>
+							<month type="7" yeartype="leap" draft="contributed">7</month>
+							<month type="8" draft="contributed">8</month>
+							<month type="9" draft="contributed">9</month>
+							<month type="10" draft="contributed">10</month>
+							<month type="11" draft="contributed">11</month>
+							<month type="12" draft="contributed">12</month>
+							<month type="13" draft="contributed">13</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">tishri</month>
+							<month type="2">heshvan</month>
+							<month type="3">kislev</month>
+							<month type="4">tevet</month>
+							<month type="5">shevat</month>
+							<month type="6">adar I</month>
+							<month type="7">adar</month>
+							<month type="7" yeartype="leap">adar II</month>
+							<month type="8">nisan</month>
+							<month type="9">iyar</month>
+							<month type="10">sivan</month>
+							<month type="11">tamuz</month>
+							<month type="12">av</month>
+							<month type="13">elul</month>
+						</monthWidth>
+					</monthContext>
+				</months>
 				<eras>
 					<eraAbbr>
 						<era type="0">AM</era>
 					</eraAbbr>
 				</eras>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
+						<dateFormatItem id="MMMMd" draft="contributed">d. MMMM</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="indian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">chaitra</month>
+							<month type="2" draft="contributed">vaisakha</month>
+							<month type="3" draft="contributed">jyaistha</month>
+							<month type="4" draft="contributed">asadha</month>
+							<month type="5" draft="contributed">sravana</month>
+							<month type="6" draft="contributed">bhadra</month>
+							<month type="7" draft="contributed">asvina</month>
+							<month type="8" draft="contributed">kartika</month>
+							<month type="9" draft="contributed">agrahayana</month>
+							<month type="10" draft="contributed">pausa</month>
+							<month type="11" draft="contributed">magha</month>
+							<month type="12" draft="contributed">phalguna</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">1</month>
+							<month type="2" draft="contributed">2</month>
+							<month type="3" draft="contributed">3</month>
+							<month type="4" draft="contributed">4</month>
+							<month type="5" draft="contributed">5</month>
+							<month type="6" draft="contributed">6</month>
+							<month type="7" draft="contributed">7</month>
+							<month type="8" draft="contributed">8</month>
+							<month type="9" draft="contributed">9</month>
+							<month type="10" draft="contributed">10</month>
+							<month type="11" draft="contributed">11</month>
+							<month type="12" draft="contributed">12</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">chaitra</month>
+							<month type="2" draft="contributed">vaisakha</month>
+							<month type="3" draft="contributed">jyaistha</month>
+							<month type="4" draft="contributed">asadha</month>
+							<month type="5" draft="contributed">sravana</month>
+							<month type="6" draft="contributed">bhadra</month>
+							<month type="7" draft="contributed">asvina</month>
+							<month type="8" draft="contributed">kartika</month>
+							<month type="9" draft="contributed">agrahayana</month>
+							<month type="10" draft="contributed">pausa</month>
+							<month type="11" draft="contributed">magha</month>
+							<month type="12" draft="contributed">phalguna</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">chaitra</month>
+							<month type="2" draft="contributed">vaisakha</month>
+							<month type="3" draft="contributed">jyaistha</month>
+							<month type="4" draft="contributed">asadha</month>
+							<month type="5" draft="contributed">sravana</month>
+							<month type="6" draft="contributed">bhadra</month>
+							<month type="7" draft="contributed">asvina</month>
+							<month type="8" draft="contributed">kartika</month>
+							<month type="9" draft="contributed">agrahayana</month>
+							<month type="10" draft="contributed">pausa</month>
+							<month type="11" draft="contributed">magha</month>
+							<month type="12" draft="contributed">phalguna</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">1</month>
+							<month type="2" draft="contributed">2</month>
+							<month type="3" draft="contributed">3</month>
+							<month type="4" draft="contributed">4</month>
+							<month type="5" draft="contributed">5</month>
+							<month type="6" draft="contributed">6</month>
+							<month type="7" draft="contributed">7</month>
+							<month type="8" draft="contributed">8</month>
+							<month type="9" draft="contributed">9</month>
+							<month type="10" draft="contributed">10</month>
+							<month type="11" draft="contributed">11</month>
+							<month type="12" draft="contributed">12</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">chaitra</month>
+							<month type="2" draft="contributed">vaisakha</month>
+							<month type="3" draft="contributed">jyaistha</month>
+							<month type="4" draft="contributed">asadha</month>
+							<month type="5" draft="contributed">sravana</month>
+							<month type="6" draft="contributed">bhadra</month>
+							<month type="7" draft="contributed">asvina</month>
+							<month type="8" draft="contributed">kartika</month>
+							<month type="9" draft="contributed">agrahayana</month>
+							<month type="10" draft="contributed">pausa</month>
+							<month type="11" draft="contributed">magha</month>
+							<month type="12" draft="contributed">phalguna</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<eras>
+					<eraNames>
+						<era type="0" draft="contributed">saka</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0" draft="contributed">saka</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0" draft="contributed">saka</era>
+					</eraNarrow>
+				</eras>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
+						<dateFormatItem id="MMMMd" draft="contributed">d. MMMM</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
 			</calendar>
 			<calendar type="islamic">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">muh.</month>
+							<month type="2" draft="contributed">saf.</month>
+							<month type="3" draft="contributed">rab. I</month>
+							<month type="4" draft="contributed">rab. II</month>
+							<month type="5" draft="contributed">jum. I</month>
+							<month type="6" draft="contributed">jum. II</month>
+							<month type="7" draft="contributed">raj.</month>
+							<month type="8" draft="contributed">sha.</month>
+							<month type="9" draft="contributed">ram.</month>
+							<month type="10" draft="contributed">shaw.</month>
+							<month type="11" draft="contributed">dhuʻl-q.</month>
+							<month type="12" draft="contributed">dhuʻl-h.</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">1</month>
+							<month type="2" draft="contributed">2</month>
+							<month type="3" draft="contributed">3</month>
+							<month type="4" draft="contributed">4</month>
+							<month type="5" draft="contributed">5</month>
+							<month type="6" draft="contributed">6</month>
+							<month type="7" draft="contributed">7</month>
+							<month type="8" draft="contributed">8</month>
+							<month type="9" draft="contributed">9</month>
+							<month type="10" draft="contributed">10</month>
+							<month type="11" draft="contributed">11</month>
+							<month type="12" draft="contributed">12</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">muharram</month>
+							<month type="2" draft="contributed">safar</month>
+							<month type="3" draft="contributed">rabiʻ I</month>
+							<month type="4" draft="contributed">rabiʻ II</month>
+							<month type="5" draft="contributed">jumada I</month>
+							<month type="6" draft="contributed">jumada II</month>
+							<month type="7" draft="contributed">rajab</month>
+							<month type="8" draft="contributed">shaʻban</month>
+							<month type="9" draft="contributed">ramadan</month>
+							<month type="10" draft="contributed">shawwal</month>
+							<month type="11" draft="contributed">dhuʻl-qiʻdah</month>
+							<month type="12" draft="contributed">dhuʻl-hijjah</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">muh.</month>
+							<month type="2" draft="contributed">saf.</month>
+							<month type="3" draft="contributed">rab. I</month>
+							<month type="4" draft="contributed">rab. II</month>
+							<month type="5" draft="contributed">jum. I</month>
+							<month type="6" draft="contributed">jum. II</month>
+							<month type="7" draft="contributed">raj.</month>
+							<month type="8" draft="contributed">sha.</month>
+							<month type="9" draft="contributed">ram.</month>
+							<month type="10" draft="contributed">shaw.</month>
+							<month type="11" draft="contributed">dhuʻl-q.</month>
+							<month type="12" draft="contributed">Dhuʻl-H.</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">1</month>
+							<month type="2" draft="contributed">2</month>
+							<month type="3" draft="contributed">3</month>
+							<month type="4" draft="contributed">4</month>
+							<month type="5" draft="contributed">5</month>
+							<month type="6" draft="contributed">6</month>
+							<month type="7" draft="contributed">7</month>
+							<month type="8" draft="contributed">8</month>
+							<month type="9" draft="contributed">9</month>
+							<month type="10" draft="contributed">10</month>
+							<month type="11" draft="contributed">11</month>
+							<month type="12" draft="contributed">12</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">muharram</month>
+							<month type="2" draft="contributed">safar</month>
+							<month type="3" draft="contributed">rabiʻ I</month>
+							<month type="4" draft="contributed">rabiʻ II</month>
+							<month type="5" draft="contributed">jumada I</month>
+							<month type="6" draft="contributed">jumada II</month>
+							<month type="7" draft="contributed">rajab</month>
+							<month type="8" draft="contributed">shaʻban</month>
+							<month type="9" draft="contributed">ramadan</month>
+							<month type="10" draft="contributed">shawwal</month>
+							<month type="11" draft="contributed">dhuʻl-qiʻdah</month>
+							<month type="12" draft="contributed">dhuʻl-hijjah</month>
+						</monthWidth>
+					</monthContext>
+				</months>
 				<eras>
 					<eraAbbr>
 						<era type="0">AH</era>
 					</eraAbbr>
 				</eras>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
+						<dateFormatItem id="MMMMd" draft="contributed">d. MMMM</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
 			</calendar>
 			<calendar type="japanese">
+				<eras>
+					<eraNames>
+						<era type="0" draft="contributed">Taika (645–650)</era>
+						<era type="1" draft="contributed">Hakuchi (650–671)</era>
+						<era type="2" draft="contributed">Hakuhō (672–686)</era>
+						<era type="3" draft="contributed">Shuchō (686–701)</era>
+						<era type="4" draft="contributed">Taihō (701–704)</era>
+						<era type="5" draft="contributed">Keiun (704–708)</era>
+						<era type="6" draft="contributed">Wadō (708–715)</era>
+						<era type="7" draft="contributed">Reiki (715–717)</era>
+						<era type="8" draft="contributed">Yōrō (717–724)</era>
+						<era type="9" draft="contributed">Jinki (724–729)</era>
+						<era type="10" draft="contributed">Tenpyō (729–749)</era>
+						<era type="11" draft="contributed">Tenpyō-kampō (749-749)</era>
+						<era type="12" draft="contributed">Tenpyō-shōhō (749-757)</era>
+						<era type="13" draft="contributed">Tenpyō-hōji (757-765)</era>
+						<era type="14" draft="contributed">Tenpyō-jingo (765-767)</era>
+						<era type="15" draft="contributed">Jingo-keiun (767-770)</era>
+						<era type="16" draft="contributed">Hōki (770–780)</era>
+						<era type="17" draft="contributed">Ten-ō (781-782)</era>
+						<era type="18" draft="contributed">Enryaku (782–806)</era>
+						<era type="19" draft="contributed">Daidō (806–810)</era>
+						<era type="20" draft="contributed">Kōnin (810–824)</era>
+						<era type="21" draft="contributed">Tenchō (824–834)</era>
+						<era type="22" draft="contributed">Jōwa (834–848)</era>
+						<era type="23" draft="contributed">Kajō (848–851)</era>
+						<era type="24" draft="contributed">Ninju (851–854)</era>
+						<era type="25" draft="contributed">Saikō (854–857)</era>
+						<era type="26" draft="contributed">Ten-an (857-859)</era>
+						<era type="27" draft="contributed">Jōgan (859–877)</era>
+						<era type="28" draft="contributed">Gangyō (877–885)</era>
+						<era type="29" draft="contributed">Ninna (885–889)</era>
+						<era type="30" draft="contributed">Kanpyō (889–898)</era>
+						<era type="31" draft="contributed">Shōtai (898–901)</era>
+						<era type="32" draft="contributed">Engi (901–923)</era>
+						<era type="33" draft="contributed">Enchō (923–931)</era>
+						<era type="34" draft="contributed">Jōhei (931–938)</era>
+						<era type="35" draft="contributed">Tengyō (938–947)</era>
+						<era type="36" draft="contributed">Tenryaku (947–957)</era>
+						<era type="37" draft="contributed">Tentoku (957–961)</era>
+						<era type="38" draft="contributed">Ōwa (961–964)</era>
+						<era type="39" draft="contributed">Kōhō (964–968)</era>
+						<era type="40" draft="contributed">Anna (968–970)</era>
+						<era type="41" draft="contributed">Tenroku (970–973)</era>
+						<era type="42" draft="contributed">Ten’en (973–976)</era>
+						<era type="43" draft="contributed">Jōgen (976–978)</era>
+						<era type="44" draft="contributed">Tengen (978–983)</era>
+						<era type="45" draft="contributed">Eikan (983–985)</era>
+						<era type="46" draft="contributed">Kanna (985–987)</era>
+						<era type="47" draft="contributed">Eien (987–989)</era>
+						<era type="48" draft="contributed">Eiso (989–990)</era>
+						<era type="49" draft="contributed">Shōryaku (990–995)</era>
+						<era type="50" draft="contributed">Chōtoku (995–999)</era>
+						<era type="51" draft="contributed">Chōhō (999–1004)</era>
+						<era type="52" draft="contributed">Kankō (1004–1012)</era>
+						<era type="53" draft="contributed">Chōwa (1012–1017)</era>
+						<era type="54" draft="contributed">Kannin (1017–1021)</era>
+						<era type="55" draft="contributed">Jian (1021–1024)</era>
+						<era type="56" draft="contributed">Manju (1024–1028)</era>
+						<era type="57" draft="contributed">Chōgen (1028–1037)</era>
+						<era type="58" draft="contributed">Chōryaku (1037–1040)</era>
+						<era type="59" draft="contributed">Chōkyū (1040–1044)</era>
+						<era type="60" draft="contributed">Kantoku (1044–1046)</era>
+						<era type="61" draft="contributed">Eishō (1046–1053)</era>
+						<era type="62" draft="contributed">Tengi (1053–1058)</era>
+						<era type="63" draft="contributed">Kōhei (1058–1065)</era>
+						<era type="64" draft="contributed">Jiryaku (1065–1069)</era>
+						<era type="65" draft="contributed">Enkyū (1069–1074)</era>
+						<era type="66" draft="contributed">Shōho (1074–1077)</era>
+						<era type="67" draft="contributed">Shōryaku (1077–1081)</era>
+						<era type="68" draft="contributed">Eihō (1081–1084)</era>
+						<era type="69" draft="contributed">Ōtoku (1084–1087)</era>
+						<era type="70" draft="contributed">Kanji (1087–1094)</era>
+						<era type="71" draft="contributed">Kahō (1094–1096)</era>
+						<era type="72" draft="contributed">Eichō (1096–1097)</era>
+						<era type="73" draft="contributed">Jōtoku (1097–1099)</era>
+						<era type="74" draft="contributed">Kōwa (1099–1104)</era>
+						<era type="75" draft="contributed">Chōji (1104–1106)</era>
+						<era type="76" draft="contributed">Kashō (1106–1108)</era>
+						<era type="77" draft="contributed">Tennin (1108–1110)</era>
+						<era type="78" draft="contributed">Ten-ei (1110-1113)</era>
+						<era type="79" draft="contributed">Eikyū (1113–1118)</era>
+						<era type="80" draft="contributed">Gen’ei (1118–1120)</era>
+						<era type="81" draft="contributed">Hōan (1120–1124)</era>
+						<era type="82" draft="contributed">Tenji (1124–1126)</era>
+						<era type="83" draft="contributed">Daiji (1126–1131)</era>
+						<era type="84" draft="contributed">Tenshō (1131–1132)</era>
+						<era type="85" draft="contributed">Chōshō (1132–1135)</era>
+						<era type="86" draft="contributed">Hōen (1135–1141)</era>
+						<era type="87" draft="contributed">Eiji (1141–1142)</era>
+						<era type="88" draft="contributed">Kōji (1142–1144)</era>
+						<era type="89" draft="contributed">Ten’yō (1144–1145)</era>
+						<era type="90" draft="contributed">Kyūan (1145–1151)</era>
+						<era type="91" draft="contributed">Ninpei (1151–1154)</era>
+						<era type="92" draft="contributed">Kyūju (1154–1156)</era>
+						<era type="93" draft="contributed">Hōgen (1156–1159)</era>
+						<era type="94" draft="contributed">Heiji (1159–1160)</era>
+						<era type="95" draft="contributed">Eiryaku (1160–1161)</era>
+						<era type="96" draft="contributed">Ōho (1161–1163)</era>
+						<era type="97" draft="contributed">Chōkan (1163–1165)</era>
+						<era type="98" draft="contributed">Eiman (1165–1166)</era>
+						<era type="99" draft="contributed">Nin’an (1166–1169)</era>
+						<era type="100" draft="contributed">Kaō (1169–1171)</era>
+						<era type="101" draft="contributed">Shōan (1171–1175)</era>
+						<era type="102" draft="contributed">Angen (1175–1177)</era>
+						<era type="103" draft="contributed">Jishō (1177–1181)</era>
+						<era type="104" draft="contributed">Yōwa (1181–1182)</era>
+						<era type="105" draft="contributed">Juei (1182–1184)</era>
+						<era type="106" draft="contributed">Genryaku (1184–1185)</era>
+						<era type="107" draft="contributed">Bunji (1185–1190)</era>
+						<era type="108" draft="contributed">Kenkyū (1190–1199)</era>
+						<era type="109" draft="contributed">Shōji (1199–1201)</era>
+						<era type="110" draft="contributed">Kennin (1201–1204)</era>
+						<era type="111" draft="contributed">Genkyū (1204–1206)</era>
+						<era type="112" draft="contributed">Ken’ei (1206–1207)</era>
+						<era type="113" draft="contributed">Jōgen (1207–1211)</era>
+						<era type="114" draft="contributed">Kenryaku (1211–1213)</era>
+						<era type="115" draft="contributed">Kenpō (1213–1219)</era>
+						<era type="116" draft="contributed">Jōkyū (1219–1222)</era>
+						<era type="117" draft="contributed">Jōō (1222–1224)</era>
+						<era type="118" draft="contributed">Gennin (1224–1225)</era>
+						<era type="119" draft="contributed">Karoku (1225–1227)</era>
+						<era type="120" draft="contributed">Antei (1227–1229)</era>
+						<era type="121" draft="contributed">Kanki (1229–1232)</era>
+						<era type="122" draft="contributed">Jōei (1232–1233)</era>
+						<era type="123" draft="contributed">Tenpuku (1233–1234)</era>
+						<era type="124" draft="contributed">Bunryaku (1234–1235)</era>
+						<era type="125" draft="contributed">Katei (1235–1238)</era>
+						<era type="126" draft="contributed">Ryakunin (1238–1239)</era>
+						<era type="127" draft="contributed">En’ō (1239–1240)</era>
+						<era type="128" draft="contributed">Ninji (1240–1243)</era>
+						<era type="129" draft="contributed">Kangen (1243–1247)</era>
+						<era type="130" draft="contributed">Hōji (1247–1249)</era>
+						<era type="131" draft="contributed">Kenchō (1249–1256)</era>
+						<era type="132" draft="contributed">Kōgen (1256–1257)</era>
+						<era type="133" draft="contributed">Shōka (1257–1259)</era>
+						<era type="134" draft="contributed">Shōgen (1259–1260)</era>
+						<era type="135" draft="contributed">Bun’ō (1260–1261)</era>
+						<era type="136" draft="contributed">Kōchō (1261–1264)</era>
+						<era type="137" draft="contributed">Bun’ei (1264–1275)</era>
+						<era type="138" draft="contributed">Kenji (1275–1278)</era>
+						<era type="139" draft="contributed">Kōan (1278–1288)</era>
+						<era type="140" draft="contributed">Shōō (1288–1293)</era>
+						<era type="141" draft="contributed">Einin (1293–1299)</era>
+						<era type="142" draft="contributed">Shōan (1299–1302)</era>
+						<era type="143" draft="contributed">Kengen (1302–1303)</era>
+						<era type="144" draft="contributed">Kagen (1303–1306)</era>
+						<era type="145" draft="contributed">Tokuji (1306–1308)</era>
+						<era type="146" draft="contributed">Enkyō (1308–1311)</era>
+						<era type="147" draft="contributed">Ōchō (1311–1312)</era>
+						<era type="148" draft="contributed">Shōwa (1312–1317)</era>
+						<era type="149" draft="contributed">Bunpō (1317–1319)</era>
+						<era type="150" draft="contributed">Genō (1319–1321)</era>
+						<era type="151" draft="contributed">Genkō (1321–1324)</era>
+						<era type="152" draft="contributed">Shōchū (1324–1326)</era>
+						<era type="153" draft="contributed">Karyaku (1326–1329)</era>
+						<era type="154" draft="contributed">Gentoku (1329–1331)</era>
+						<era type="155" draft="contributed">Genkō (1331–1334)</era>
+						<era type="156" draft="contributed">Kenmu (1334–1336)</era>
+						<era type="157" draft="contributed">Engen (1336–1340)</era>
+						<era type="158" draft="contributed">Kōkoku (1340–1346)</era>
+						<era type="159" draft="contributed">Shōhei (1346–1370)</era>
+						<era type="160" draft="contributed">Kentoku (1370–1372)</era>
+						<era type="161" draft="contributed">Bunchū (1372–1375)</era>
+						<era type="162" draft="contributed">Tenju (1375–1379)</era>
+						<era type="163" draft="contributed">Kōryaku (1379–1381)</era>
+						<era type="164" draft="contributed">Kōwa (1381–1384)</era>
+						<era type="165" draft="contributed">Genchū (1384–1392)</era>
+						<era type="166" draft="contributed">Meitoku (1384–1387)</era>
+						<era type="167" draft="contributed">Kakei (1387–1389)</era>
+						<era type="168" draft="contributed">Kōō (1389–1390)</era>
+						<era type="169" draft="contributed">Meitoku (1390–1394)</era>
+						<era type="170" draft="contributed">Ōei (1394–1428)</era>
+						<era type="171" draft="contributed">Shōchō (1428–1429)</era>
+						<era type="172" draft="contributed">Eikyō (1429–1441)</era>
+						<era type="173" draft="contributed">Kakitsu (1441–1444)</era>
+						<era type="174" draft="contributed">Bun’an (1444–1449)</era>
+						<era type="175" draft="contributed">Hōtoku (1449–1452)</era>
+						<era type="176" draft="contributed">Kyōtoku (1452–1455)</era>
+						<era type="177" draft="contributed">Kōshō (1455–1457)</era>
+						<era type="178" draft="contributed">Chōroku (1457–1460)</era>
+						<era type="179" draft="contributed">Kanshō (1460–1466)</era>
+						<era type="180" draft="contributed">Bunshō (1466–1467)</era>
+						<era type="181" draft="contributed">Ōnin (1467–1469)</era>
+						<era type="182" draft="contributed">Bunmei (1469–1487)</era>
+						<era type="183" draft="contributed">Chōkyō (1487–1489)</era>
+						<era type="184" draft="contributed">Entoku (1489–1492)</era>
+						<era type="185" draft="contributed">Meiō (1492–1501)</era>
+						<era type="186" draft="contributed">Bunki (1501–1504)</era>
+						<era type="187" draft="contributed">Eishō (1504–1521)</era>
+						<era type="188" draft="contributed">Taiei (1521–1528)</era>
+						<era type="189" draft="contributed">Kyōroku (1528–1532)</era>
+						<era type="190" draft="contributed">Tenbun (1532–1555)</era>
+						<era type="191" draft="contributed">Kōji (1555–1558)</era>
+						<era type="192" draft="contributed">Eiroku (1558–1570)</era>
+						<era type="193" draft="contributed">Genki (1570–1573)</era>
+						<era type="194" draft="contributed">Tenshō (1573–1592)</era>
+						<era type="195" draft="contributed">Bunroku (1592–1596)</era>
+						<era type="196" draft="contributed">Keichō (1596–1615)</era>
+						<era type="197" draft="contributed">Genna (1615–1624)</era>
+						<era type="198" draft="contributed">Kan’ei (1624–1644)</era>
+						<era type="199" draft="contributed">Shōho (1644–1648)</era>
+						<era type="200" draft="contributed">Keian (1648–1652)</era>
+						<era type="201" draft="contributed">Jōō (1652–1655)</era>
+						<era type="202" draft="contributed">Meireki (1655–1658)</era>
+						<era type="203" draft="contributed">Manji (1658–1661)</era>
+						<era type="204" draft="contributed">Kanbun (1661–1673)</era>
+						<era type="205" draft="contributed">Enpō (1673–1681)</era>
+						<era type="206" draft="contributed">Tenna (1681–1684)</era>
+						<era type="207" draft="contributed">Jōkyō (1684–1688)</era>
+						<era type="208" draft="contributed">Genroku (1688–1704)</era>
+						<era type="209" draft="contributed">Hōei (1704–1711)</era>
+						<era type="210" draft="contributed">Shōtoku (1711–1716)</era>
+						<era type="211" draft="contributed">Kyōhō (1716–1736)</era>
+						<era type="212" draft="contributed">Genbun (1736–1741)</era>
+						<era type="213" draft="contributed">Kanpō (1741–1744)</era>
+						<era type="214" draft="contributed">Enkyō (1744–1748)</era>
+						<era type="215" draft="contributed">Kan’en (1748–1751)</era>
+						<era type="216" draft="contributed">Hōreki (1751–1764)</era>
+						<era type="217" draft="contributed">Meiwa (1764–1772)</era>
+						<era type="218" draft="contributed">An’ei (1772–1781)</era>
+						<era type="219" draft="contributed">Tenmei (1781–1789)</era>
+						<era type="220" draft="contributed">Kansei (1789–1801)</era>
+						<era type="221" draft="contributed">Kyōwa (1801–1804)</era>
+						<era type="222" draft="contributed">Bunka (1804–1818)</era>
+						<era type="223" draft="contributed">Bunsei (1818–1830)</era>
+						<era type="224" draft="contributed">Tenpō (1830–1844)</era>
+						<era type="225" draft="contributed">Kōka (1844–1848)</era>
+						<era type="226" draft="contributed">Kaei (1848–1854)</era>
+						<era type="227" draft="contributed">Ansei (1854–1860)</era>
+						<era type="228" draft="contributed">Man’en (1860–1861)</era>
+						<era type="229" draft="contributed">Bunkyū (1861–1864)</era>
+						<era type="230" draft="contributed">Genji (1864–1865)</era>
+						<era type="231" draft="contributed">Keiō (1865–1868)</era>
+						<era type="232" draft="contributed">Meiji</era>
+						<era type="233" draft="contributed">Taishō</era>
+						<era type="234" draft="contributed">Shōwa</era>
+						<era type="235" draft="contributed">Heisei</era>
+					</eraNames>
+					<eraNarrow>
+						<era type="232" draft="contributed">M</era>
+						<era type="233" draft="contributed">T</era>
+						<era type="234" draft="contributed">S</era>
+						<era type="235" draft="contributed">H</era>
+					</eraNarrow>
+				</eras>
 				<!-- need some non-empty element here to make inheritance work,
 					 this copy of generic dateFormats above is smaller than root japanese eras
 				-->
@@ -1933,6 +3310,121 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
+						<dateFormatItem id="MMMMd" draft="contributed">d. MMMM</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="persian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">farvardin</month>
+							<month type="2" draft="contributed">ordibehesht</month>
+							<month type="3" draft="contributed">khordad</month>
+							<month type="4" draft="contributed">tir</month>
+							<month type="5" draft="contributed">mordad</month>
+							<month type="6" draft="contributed">shahrivar</month>
+							<month type="7" draft="contributed">mehr</month>
+							<month type="8" draft="contributed">aban</month>
+							<month type="9" draft="contributed">azar</month>
+							<month type="10" draft="contributed">dey</month>
+							<month type="11" draft="contributed">bahman</month>
+							<month type="12" draft="contributed">esfand</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">1</month>
+							<month type="2" draft="contributed">2</month>
+							<month type="3" draft="contributed">3</month>
+							<month type="4" draft="contributed">4</month>
+							<month type="5" draft="contributed">5</month>
+							<month type="6" draft="contributed">6</month>
+							<month type="7" draft="contributed">7</month>
+							<month type="8" draft="contributed">8</month>
+							<month type="9" draft="contributed">9</month>
+							<month type="10" draft="contributed">10</month>
+							<month type="11" draft="contributed">11</month>
+							<month type="12" draft="contributed">12</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">farvardin</month>
+							<month type="2" draft="contributed">ordibehesht</month>
+							<month type="3" draft="contributed">khordad</month>
+							<month type="4" draft="contributed">tir</month>
+							<month type="5" draft="contributed">mordad</month>
+							<month type="6" draft="contributed">shahrivar</month>
+							<month type="7" draft="contributed">mehr</month>
+							<month type="8" draft="contributed">aban</month>
+							<month type="9" draft="contributed">azar</month>
+							<month type="10" draft="contributed">dey</month>
+							<month type="11" draft="contributed">bahman</month>
+							<month type="12" draft="contributed">esfand</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">farvardin</month>
+							<month type="2" draft="contributed">ordibehesht</month>
+							<month type="3" draft="contributed">khordad</month>
+							<month type="4" draft="contributed">tir</month>
+							<month type="5" draft="contributed">mordad</month>
+							<month type="6" draft="contributed">shahrivar</month>
+							<month type="7" draft="contributed">mehr</month>
+							<month type="8" draft="contributed">aban</month>
+							<month type="9" draft="contributed">azar</month>
+							<month type="10" draft="contributed">dey</month>
+							<month type="11" draft="contributed">bahman</month>
+							<month type="12" draft="contributed">esfand</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">1</month>
+							<month type="2" draft="contributed">2</month>
+							<month type="3" draft="contributed">3</month>
+							<month type="4" draft="contributed">4</month>
+							<month type="5" draft="contributed">5</month>
+							<month type="6" draft="contributed">6</month>
+							<month type="7" draft="contributed">7</month>
+							<month type="8" draft="contributed">8</month>
+							<month type="9" draft="contributed">9</month>
+							<month type="10" draft="contributed">10</month>
+							<month type="11" draft="contributed">11</month>
+							<month type="12" draft="contributed">12</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">farvardin</month>
+							<month type="2" draft="contributed">ordibehesht</month>
+							<month type="3" draft="contributed">khordad</month>
+							<month type="4" draft="contributed">tir</month>
+							<month type="5" draft="contributed">mordad</month>
+							<month type="6" draft="contributed">shahrivar</month>
+							<month type="7" draft="contributed">mehr</month>
+							<month type="8" draft="contributed">aban</month>
+							<month type="9" draft="contributed">azar</month>
+							<month type="10" draft="contributed">dey</month>
+							<month type="11" draft="contributed">bahman</month>
+							<month type="12" draft="contributed">esfand</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<eras>
+					<eraNames>
+						<era type="0" draft="contributed">AP</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0" draft="contributed">AP</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0" draft="contributed">AP</era>
+					</eraNarrow>
+				</eras>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
+						<dateFormatItem id="MMMMd" draft="contributed">d. MMMM</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
 			</calendar>
 			<calendar type="roc">
 				<eras>
@@ -1941,14 +3433,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<era type="1">Minguo</era>
 					</eraAbbr>
 				</eras>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
+						<dateFormatItem id="MMMMd" draft="contributed">d. MMMM</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
 			</calendar>
 		</calendars>
 		<fields>
 			<field type="era">
-				<displayName>Tidsalder</displayName>
+				<displayName>tidsalder</displayName>
 			</field>
 			<field type="year">
-				<displayName>År</displayName>
+				<displayName>år</displayName>
 				<relative type="-1">i fjor</relative>
 				<relative type="0">i år</relative>
 				<relative type="1">neste år</relative>
@@ -1964,12 +3462,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="year-short">
 				<displayName>år</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">om {0} år</relativeTimePattern>
-					<relativeTimePattern count="other">om {0} år</relativeTimePattern>
+					<relativeTimePattern count="one">+{0} år</relativeTimePattern>
+					<relativeTimePattern count="other">+{0} år</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">for {0} år siden</relativeTimePattern>
-					<relativeTimePattern count="other">for {0} år siden</relativeTimePattern>
+					<relativeTimePattern count="one">–{0} år</relativeTimePattern>
+					<relativeTimePattern count="other">–{0} år</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="year-narrow">
@@ -1984,7 +3482,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="quarter">
-				<displayName>Kvartal</displayName>
+				<displayName>kvartal</displayName>
+				<relative type="-1">forrige kvartal</relative>
+				<relative type="0">dette kvartal</relative>
+				<relative type="1">neste kvartal</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} kvartal</relativeTimePattern>
 					<relativeTimePattern count="other">om {0} kvartaler</relativeTimePattern>
@@ -1996,6 +3497,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>kv.</displayName>
+				<relative type="-1">forrige kv.</relative>
+				<relative type="0">dette kv.</relative>
+				<relative type="1">neste kv.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} kv.</relativeTimePattern>
 					<relativeTimePattern count="other">om {0} kv.</relativeTimePattern>
@@ -2007,6 +3511,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>kv.</displayName>
+				<relative type="-1">forrige kv.</relative>
+				<relative type="0">dette kv.</relative>
+				<relative type="1">neste kv.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} kv.</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} kv.</relativeTimePattern>
@@ -2017,7 +3524,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="month">
-				<displayName>Måned</displayName>
+				<displayName>måned</displayName>
 				<relative type="-1">forrige måned</relative>
 				<relative type="0">denne måneden</relative>
 				<relative type="1">neste måned</relative>
@@ -2032,17 +3539,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>mnd.</displayName>
+				<relative type="-1">forrige md.</relative>
+				<relative type="0">denne md.</relative>
+				<relative type="1">neste md.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">om {0} måneder</relativeTimePattern>
-					<relativeTimePattern count="other">om {0} måneder</relativeTimePattern>
+					<relativeTimePattern count="one">om {0} md.</relativeTimePattern>
+					<relativeTimePattern count="other">om {0} md.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">for {0} måneder siden</relativeTimePattern>
-					<relativeTimePattern count="other">for {0} måneder siden</relativeTimePattern>
+					<relativeTimePattern count="one">for {0} md. siden</relativeTimePattern>
+					<relativeTimePattern count="other">for {0} md. siden</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month-narrow">
 				<displayName>md.</displayName>
+				<relative type="-1">forrige md.</relative>
+				<relative type="0">denne md.</relative>
+				<relative type="1">neste md.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} md.</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} md.</relativeTimePattern>
@@ -2053,7 +3566,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="week">
-				<displayName>Uke</displayName>
+				<displayName>uke</displayName>
 				<relative type="-1">forrige uke</relative>
 				<relative type="0">denne uken</relative>
 				<relative type="1">neste uke</relative>
@@ -2068,17 +3581,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>uke</displayName>
+				<relative type="-1">forrige uke</relative>
+				<relative type="0">denne uken</relative>
+				<relative type="1">neste uke</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">om {0} uke</relativeTimePattern>
-					<relativeTimePattern count="other">om {0} uker</relativeTimePattern>
+					<relativeTimePattern count="one">om {0} u.</relativeTimePattern>
+					<relativeTimePattern count="other">om {0} u.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">for {0} uke siden</relativeTimePattern>
-					<relativeTimePattern count="other">for {0} uker siden</relativeTimePattern>
+					<relativeTimePattern count="one">for {0} u. siden</relativeTimePattern>
+					<relativeTimePattern count="other">for {0} u. siden</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week-narrow">
 				<displayName>uke</displayName>
+				<relative type="-1">forrige uke</relative>
+				<relative type="0">denne uken</relative>
+				<relative type="1">neste uke</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} u.</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} u.</relativeTimePattern>
@@ -2089,7 +3608,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day">
-				<displayName>Dag</displayName>
+				<displayName>dag</displayName>
 				<relative type="-2">i forgårs</relative>
 				<relative type="-1">i går</relative>
 				<relative type="0">i dag</relative>
@@ -2106,13 +3625,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>dag</displayName>
+				<relative type="-2">i forgårs</relative>
+				<relative type="-1">i går</relative>
+				<relative type="0">i dag</relative>
+				<relative type="1">i morgen</relative>
+				<relative type="2">i overmorgen</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">om {0} døgn</relativeTimePattern>
-					<relativeTimePattern count="other">om {0} døgn</relativeTimePattern>
+					<relativeTimePattern count="one">om {0} d.</relativeTimePattern>
+					<relativeTimePattern count="other">om {0} d.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">for {0} døgn siden</relativeTimePattern>
-					<relativeTimePattern count="other">for {0} døgn siden</relativeTimePattern>
+					<relativeTimePattern count="one">for {0} d. siden</relativeTimePattern>
+					<relativeTimePattern count="other">for {0} d. siden</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day-narrow">
@@ -2127,7 +3651,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="weekday">
-				<displayName>Ukedag</displayName>
+				<displayName>ukedag</displayName>
 			</field>
 			<field type="sun">
 				<relative type="-1">søndag sist uke</relative>
@@ -2135,14 +3659,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">søndag neste uke</relative>
 			</field>
 			<field type="sun-short">
-				<relative type="-1">forrige søn.</relative>
+				<relative type="-1">sist søn.</relative>
 				<relative type="0">denne søn.</relative>
-				<relative type="1">kommende søn.</relative>
+				<relative type="1">neste søn.</relative>
 			</field>
 			<field type="sun-narrow">
-				<relative type="-1">forrige sø.</relative>
+				<relative type="-1">sist sø.</relative>
 				<relative type="0">denne sø.</relative>
-				<relative type="1">kommende sø.</relative>
+				<relative type="1">neste sø.</relative>
 			</field>
 			<field type="mon">
 				<relative type="-1">mandag sist uke</relative>
@@ -2150,14 +3674,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">mandag neste uke</relative>
 			</field>
 			<field type="mon-short">
-				<relative type="-1">forrige man.</relative>
+				<relative type="-1">sist man.</relative>
 				<relative type="0">denne man.</relative>
-				<relative type="1">kommende man.</relative>
+				<relative type="1">neste man.</relative>
 			</field>
 			<field type="mon-narrow">
-				<relative type="-1">forrige ma.</relative>
+				<relative type="-1">sist ma.</relative>
 				<relative type="0">denne ma.</relative>
-				<relative type="1">kommende ma.</relative>
+				<relative type="1">neste ma.</relative>
 			</field>
 			<field type="tue">
 				<relative type="-1">tirsdag sist uke</relative>
@@ -2165,14 +3689,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">tirsdag neste uke</relative>
 			</field>
 			<field type="tue-short">
-				<relative type="-1">forrige tir.</relative>
+				<relative type="-1">sist tir.</relative>
 				<relative type="0">denne tir.</relative>
-				<relative type="1">kommende tir.</relative>
+				<relative type="1">neste tir.</relative>
 			</field>
 			<field type="tue-narrow">
-				<relative type="-1">forrige ti.</relative>
+				<relative type="-1">sist ti.</relative>
 				<relative type="0">denne ti.</relative>
-				<relative type="1">kommende ti.</relative>
+				<relative type="1">neste ti.</relative>
 			</field>
 			<field type="wed">
 				<relative type="-1">onsdag sist uke</relative>
@@ -2180,14 +3704,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">onsdag neste uke</relative>
 			</field>
 			<field type="wed-short">
-				<relative type="-1">forrige ons.</relative>
+				<relative type="-1">sist ons.</relative>
 				<relative type="0">denne ons.</relative>
-				<relative type="1">kommende ons.</relative>
+				<relative type="1">neste ons.</relative>
 			</field>
 			<field type="wed-narrow">
-				<relative type="-1">forrige on.</relative>
+				<relative type="-1">sist on.</relative>
 				<relative type="0">denne on.</relative>
-				<relative type="1">kommende on.</relative>
+				<relative type="1">neste on.</relative>
 			</field>
 			<field type="thu">
 				<relative type="-1">torsdag sist uke</relative>
@@ -2195,14 +3719,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">torsdag neste uke</relative>
 			</field>
 			<field type="thu-short">
-				<relative type="-1">forrige tor.</relative>
+				<relative type="-1">sist tor.</relative>
 				<relative type="0">denne tor.</relative>
-				<relative type="1">kommende tor.</relative>
+				<relative type="1">neste tor.</relative>
 			</field>
 			<field type="thu-narrow">
-				<relative type="-1">forrige to.</relative>
+				<relative type="-1">sist to.</relative>
 				<relative type="0">denne to.</relative>
-				<relative type="1">kommende to.</relative>
+				<relative type="1">neste to.</relative>
 			</field>
 			<field type="fri">
 				<relative type="-1">fredag sist uke</relative>
@@ -2210,14 +3734,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">fredag neste uke</relative>
 			</field>
 			<field type="fri-short">
-				<relative type="-1">forrige fre.</relative>
+				<relative type="-1">sist fre.</relative>
 				<relative type="0">denne fre.</relative>
-				<relative type="1">kommende fre.</relative>
+				<relative type="1">neste fre.</relative>
 			</field>
 			<field type="fri-narrow">
-				<relative type="-1">forrige fr.</relative>
+				<relative type="-1">sist fr.</relative>
 				<relative type="0">denne fr.</relative>
-				<relative type="1">kommende fr.</relative>
+				<relative type="1">neste fr.</relative>
 			</field>
 			<field type="sat">
 				<relative type="-1">lørdag sist uke</relative>
@@ -2225,20 +3749,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">lørdag neste uke</relative>
 			</field>
 			<field type="sat-short">
-				<relative type="-1">forrige lør.</relative>
+				<relative type="-1">sist lør.</relative>
 				<relative type="0">denne lør.</relative>
-				<relative type="1">kommende lør.</relative>
+				<relative type="1">neste lør.</relative>
 			</field>
 			<field type="sat-narrow">
-				<relative type="-1">forrige lø.</relative>
+				<relative type="-1">sist lø.</relative>
 				<relative type="0">denne lø.</relative>
-				<relative type="1">kommende lø.</relative>
+				<relative type="1">neste lø.</relative>
 			</field>
 			<field type="dayperiod">
 				<displayName>AM/PM</displayName>
 			</field>
 			<field type="hour">
-				<displayName>Time</displayName>
+				<displayName>time</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} time</relativeTimePattern>
 					<relativeTimePattern count="other">om {0} timer</relativeTimePattern>
@@ -2271,7 +3795,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="minute">
-				<displayName>Minutt</displayName>
+				<displayName>minutt</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} minutt</relativeTimePattern>
 					<relativeTimePattern count="other">om {0} minutter</relativeTimePattern>
@@ -2304,7 +3828,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="second">
-				<displayName>Sekund</displayName>
+				<displayName>sekund</displayName>
 				<relative type="0">nå</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} sekund</relativeTimePattern>
@@ -2338,7 +3862,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>Tidssone</displayName>
+				<displayName>tidssone</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
@@ -3216,6 +4740,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
 			</zone>
@@ -3301,6 +4828,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Chita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Jakutsk</exemplarCity>
 			</zone>
@@ -3319,6 +4849,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolymsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamtsjatka</exemplarCity>
 			</zone>
@@ -3607,7 +5140,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Afghanistan">
 				<long>
-					<standard draft="contributed">afghansk tid</standard>
+					<standard>afghansk tid</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Central">
@@ -3634,10 +5167,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Alaska">
 				<long>
-					<generic draft="contributed">alaskisk tid</generic>
-					<standard draft="contributed">alaskisk normaltid</standard>
-					<daylight draft="contributed">alaskisk sommertid</daylight>
+					<generic>alaskisk tid</generic>
+					<standard>alaskisk normaltid</standard>
+					<daylight>alaskisk sommertid</daylight>
 				</long>
+				<short>
+					<generic draft="contributed">AKT</generic>
+					<standard draft="contributed">AKST</standard>
+					<daylight draft="contributed">AKDT</daylight>
+				</short>
 			</metazone>
 			<metazone type="Almaty">
 				<long>
@@ -3659,6 +5197,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<standard>normaltid for det sentrale Nord-Amerika</standard>
 					<daylight>sommertid for det sentrale Nord-Amerika</daylight>
 				</long>
+				<short>
+					<generic draft="contributed">CT</generic>
+					<standard draft="contributed">CST</standard>
+					<daylight draft="contributed">CDT</daylight>
+				</short>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
@@ -3666,6 +5209,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<standard>normaltid for den nordamerikanske østkysten</standard>
 					<daylight>sommertid for den nordamerikanske østkysten</daylight>
 				</long>
+				<short>
+					<generic draft="contributed">ET</generic>
+					<standard draft="contributed">EST</standard>
+					<daylight draft="contributed">EDT</daylight>
+				</short>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
@@ -3673,6 +5221,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<standard>normaltid for Rocky Mountains (USA)</standard>
 					<daylight>sommertid for Rocky Mountains (USA)</daylight>
 				</long>
+				<short>
+					<generic draft="contributed">MT</generic>
+					<standard draft="contributed">MST</standard>
+					<daylight draft="contributed">MDT</daylight>
+				</short>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
@@ -3680,6 +5233,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<standard>normaltid for den nordamerikanske Stillehavskysten</standard>
 					<daylight>sommertid for den nordamerikanske Stillehavskysten</daylight>
 				</long>
+				<short>
+					<generic draft="contributed">PT</generic>
+					<standard draft="contributed">PST</standard>
+					<daylight draft="contributed">PDT</daylight>
+				</short>
 			</metazone>
 			<metazone type="Anadyr">
 				<long>
@@ -3690,9 +5248,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic draft="contributed">tidssone for Apia</generic>
-					<standard draft="contributed">normaltid for Apia</standard>
-					<daylight draft="contributed">sommetid for Apia</daylight>
+					<generic>tidssone for Apia</generic>
+					<standard>normaltid for Apia</standard>
+					<daylight>sommertid for Apia</daylight>
 				</long>
 			</metazone>
 			<metazone type="Aqtau">
@@ -3718,16 +5276,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Argentina">
 				<long>
-					<generic draft="contributed">argentinsk tid</generic>
-					<standard draft="contributed">argentinsk normaltid</standard>
-					<daylight draft="contributed">argentinsk sommertid</daylight>
+					<generic>argentinsk tid</generic>
+					<standard>argentinsk normaltid</standard>
+					<daylight>argentinsk sommertid</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina_Western">
 				<long>
-					<generic draft="contributed">vestargentinsk tid</generic>
-					<standard draft="contributed">vestargentinsk normaltid</standard>
-					<daylight draft="contributed">vestargentinsk sommertid</daylight>
+					<generic>vestargentinsk tid</generic>
+					<standard>vestargentinsk normaltid</standard>
+					<daylight>vestargentinsk sommertid</daylight>
 				</long>
 			</metazone>
 			<metazone type="Armenia">
@@ -3743,6 +5301,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<standard>atlanterhavskystlig standardtid</standard>
 					<daylight>atlanterhavskystlig sommertid</daylight>
 				</long>
+				<short>
+					<generic draft="contributed">AT</generic>
+					<standard draft="contributed">AST</standard>
+					<daylight draft="contributed">ADT</daylight>
+				</short>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
@@ -3795,12 +5358,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Bhutan">
 				<long>
-					<standard draft="contributed">bhutansk tid</standard>
+					<standard>bhutansk tid</standard>
 				</long>
 			</metazone>
 			<metazone type="Bolivia">
 				<long>
-					<standard draft="contributed">boliviansk tid</standard>
+					<standard>boliviansk tid</standard>
 				</long>
 			</metazone>
 			<metazone type="Brasilia">
@@ -3841,15 +5404,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Chile">
 				<long>
-					<generic draft="contributed">chilensk tid</generic>
-					<standard draft="contributed">chilensk normaltid</standard>
-					<daylight draft="contributed">chilensk sommertid</daylight>
+					<generic>chilensk tid</generic>
+					<standard>chilensk normaltid</standard>
+					<daylight>chilensk sommertid</daylight>
 				</long>
 			</metazone>
 			<metazone type="China">
 				<long>
 					<generic>kinesisk tid</generic>
-					<standard>kinesisk standardtid</standard>
+					<standard>kinesisk normaltid</standard>
 					<daylight>kinesisk sommertid</daylight>
 				</long>
 			</metazone>
@@ -3872,9 +5435,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Colombia">
 				<long>
-					<generic draft="contributed">colombiansk tid</generic>
-					<standard draft="contributed">colombiansk normaltid</standard>
-					<daylight draft="contributed">colombiansk sommertid</daylight>
+					<generic>colombiansk tid</generic>
+					<standard>colombiansk normaltid</standard>
+					<daylight>colombiansk sommertid</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cook">
@@ -3886,9 +5449,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Cuba">
 				<long>
-					<generic draft="contributed">cubansk tid</generic>
-					<standard draft="contributed">cubansk normaltid</standard>
-					<daylight draft="contributed">cubansk sommertid</daylight>
+					<generic>cubansk tid</generic>
+					<standard>cubansk normaltid</standard>
+					<daylight>cubansk sommertid</daylight>
 				</long>
 			</metazone>
 			<metazone type="Davis">
@@ -3915,7 +5478,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Ecuador">
 				<long>
-					<standard draft="contributed">ecuadoriansk tid</standard>
+					<standard>ecuadoriansk tid</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Central">
@@ -3968,9 +5531,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Fiji">
 				<long>
-					<generic draft="contributed">fijiansk tid</generic>
-					<standard draft="contributed">fijiansk normaltid</standard>
-					<daylight draft="contributed">fijiansk sommertid</daylight>
+					<generic>fijiansk tid</generic>
+					<standard>fijiansk normaltid</standard>
+					<daylight>fijiansk sommertid</daylight>
 				</long>
 			</metazone>
 			<metazone type="French_Guiana">
@@ -4015,16 +5578,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Greenland_Eastern">
 				<long>
-					<generic draft="contributed">østgrønlandsk tid</generic>
-					<standard draft="contributed">østgrønlandsk normaltid</standard>
-					<daylight draft="contributed">østgrønlandsk sommertid</daylight>
+					<generic>østgrønlandsk tid</generic>
+					<standard>østgrønlandsk normaltid</standard>
+					<daylight>østgrønlandsk sommertid</daylight>
 				</long>
 			</metazone>
 			<metazone type="Greenland_Western">
 				<long>
-					<generic draft="contributed">vestgrønlandsk tid</generic>
-					<standard draft="contributed">vestgrønlandsk normaltid</standard>
-					<daylight draft="contributed">vestgrønlandsk sommertid</daylight>
+					<generic>vestgrønlandsk tid</generic>
+					<standard>vestgrønlandsk normaltid</standard>
+					<daylight>vestgrønlandsk sommertid</daylight>
 				</long>
 			</metazone>
 			<metazone type="Guam">
@@ -4048,6 +5611,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<standard>normaltid for Hawaii og Aleutene</standard>
 					<daylight>sommertid for Hawaii og Aleutene</daylight>
 				</long>
+				<short>
+					<generic draft="contributed">HAT</generic>
+					<standard draft="contributed">HAST</standard>
+					<daylight draft="contributed">HADT</daylight>
+				</short>
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>
@@ -4095,9 +5663,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Iran">
 				<long>
-					<generic draft="contributed">iransk tid</generic>
-					<standard draft="contributed">iransk normaltid</standard>
-					<daylight draft="contributed">iransk sommertid</daylight>
+					<generic>iransk tid</generic>
+					<standard>iransk normaltid</standard>
+					<daylight>iransk sommertid</daylight>
 				</long>
 			</metazone>
 			<metazone type="Irkutsk">
@@ -4200,12 +5768,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Malaysia">
 				<long>
-					<standard draft="contributed">malaysisk tid</standard>
+					<standard>malaysisk tid</standard>
 				</long>
 			</metazone>
 			<metazone type="Maldives">
 				<long>
-					<standard draft="contributed">maldivisk tid</standard>
+					<standard>maldivisk tid</standard>
 				</long>
 			</metazone>
 			<metazone type="Marquesas">
@@ -4270,14 +5838,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Nepal">
 				<long>
-					<standard draft="contributed">nepalsk tid</standard>
+					<standard>nepalsk tid</standard>
 				</long>
 			</metazone>
 			<metazone type="New_Caledonia">
 				<long>
-					<generic draft="contributed">kaledonsk tid</generic>
-					<standard draft="contributed">kaledonsk normaltid</standard>
-					<daylight draft="contributed">kaledonsk sommertid</daylight>
+					<generic>kaledonsk tid</generic>
+					<standard>kaledonsk normaltid</standard>
+					<daylight>kaledonsk sommertid</daylight>
 				</long>
 			</metazone>
 			<metazone type="New_Zealand">
@@ -4332,9 +5900,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Pakistan">
 				<long>
-					<generic draft="contributed">pakistansk tid</generic>
-					<standard draft="contributed">pakistansk normaltid</standard>
-					<daylight draft="contributed">pakistansk sommertid</daylight>
+					<generic>pakistansk tid</generic>
+					<standard>pakistansk normaltid</standard>
+					<daylight>pakistansk sommertid</daylight>
 				</long>
 			</metazone>
 			<metazone type="Palau">
@@ -4349,16 +5917,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Paraguay">
 				<long>
-					<generic draft="contributed">paraguayansk tid</generic>
-					<standard draft="contributed">paraguayansk normaltid</standard>
-					<daylight draft="contributed">paraguayansk sommertid</daylight>
+					<generic>paraguayansk tid</generic>
+					<standard>paraguayansk normaltid</standard>
+					<daylight>paraguayansk sommertid</daylight>
 				</long>
 			</metazone>
 			<metazone type="Peru">
 				<long>
-					<generic draft="contributed">peruansk tid</generic>
-					<standard draft="contributed">peruansk normaltid</standard>
-					<daylight draft="contributed">peruansk sommertid</daylight>
+					<generic>peruansk tid</generic>
+					<standard>peruansk normaltid</standard>
+					<daylight>peruansk sommertid</daylight>
 				</long>
 			</metazone>
 			<metazone type="Philippines">
@@ -4387,7 +5955,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Ponape">
 				<long>
-					<standard draft="contributed">tidssone for Pohnpei</standard>
+					<standard>tidssone for Pohnpei</standard>
 				</long>
 			</metazone>
 			<metazone type="Qyzylorda">
@@ -4423,9 +5991,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Samoa">
 				<long>
-					<generic draft="contributed">samoansk tid</generic>
-					<standard draft="contributed">samoansk normaltid</standard>
-					<daylight draft="contributed">samoansk sommertid</daylight>
+					<generic>samoansk tid</generic>
+					<standard>samoansk normaltid</standard>
+					<daylight>samoansk sommertid</daylight>
 				</long>
 			</metazone>
 			<metazone type="Seychelles">
@@ -4482,9 +6050,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Tonga">
 				<long>
-					<generic draft="contributed">tongansk tid</generic>
-					<standard draft="contributed">tongansk normaltid</standard>
-					<daylight draft="contributed">tongansk sommertid</daylight>
+					<generic>tongansk tid</generic>
+					<standard>tongansk normaltid</standard>
+					<daylight>tongansk sommertid</daylight>
 				</long>
 			</metazone>
 			<metazone type="Truk">
@@ -4506,9 +6074,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Uruguay">
 				<long>
-					<generic draft="contributed">uruguayansk tid</generic>
-					<standard draft="contributed">uruguayansk normaltid</standard>
-					<daylight draft="contributed">uruguayansk sommertid</daylight>
+					<generic>uruguayansk tid</generic>
+					<standard>uruguayansk normaltid</standard>
+					<daylight>uruguayansk sommertid</daylight>
 				</long>
 			</metazone>
 			<metazone type="Uzbekistan">
@@ -4520,14 +6088,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Vanuatu">
 				<long>
-					<generic draft="contributed">vanuatisk tid</generic>
-					<standard draft="contributed">vanuatisk normaltid</standard>
-					<daylight draft="contributed">vanuatisk sommertid</daylight>
+					<generic>vanuatisk tid</generic>
+					<standard>vanuatisk normaltid</standard>
+					<daylight>vanuatisk sommertid</daylight>
 				</long>
 			</metazone>
 			<metazone type="Venezuela">
 				<long>
-					<standard draft="contributed">venezuelansk tid</standard>
+					<standard>venezuelansk tid</standard>
 				</long>
 			</metazone>
 			<metazone type="Vladivostok">
@@ -4581,6 +6149,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<native draft="contributed">latn</native>
 		</otherNumberingSystems>
 		<minimumGroupingDigits draft="contributed">1</minimumGroupingDigits>
+		<symbols numberSystem="arab">
+			<decimal draft="contributed">٫</decimal>
+			<group draft="contributed"> </group>
+			<list draft="contributed">؛</list>
+			<percentSign draft="contributed">٪</percentSign>
+			<plusSign draft="contributed">+</plusSign>
+			<minusSign draft="contributed">−</minusSign>
+			<exponential draft="contributed">اس</exponential>
+			<superscriptingExponent draft="contributed">×</superscriptingExponent>
+			<perMille draft="contributed">؉</perMille>
+			<infinity draft="contributed">∞</infinity>
+			<nan draft="contributed">NaN</nan>
+			<timeSeparator draft="contributed">.</timeSeparator>
+		</symbols>
+		<symbols numberSystem="arabext">
+			<decimal draft="contributed">,</decimal>
+			<group draft="contributed"> </group>
+			<list draft="contributed">؛</list>
+			<percentSign draft="contributed">٪</percentSign>
+			<plusSign draft="contributed">+</plusSign>
+			<minusSign draft="contributed">−</minusSign>
+			<exponential draft="contributed">×۱۰^</exponential>
+			<superscriptingExponent draft="contributed">×</superscriptingExponent>
+			<perMille draft="contributed">؉</perMille>
+			<infinity draft="contributed">∞</infinity>
+			<nan draft="contributed">NaN</nan>
+			<timeSeparator draft="contributed">.</timeSeparator>
+		</symbols>
 		<symbols numberSystem="latn">
 			<decimal>,</decimal>
 			<group> </group>
@@ -4593,7 +6189,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<perMille>‰</perMille>
 			<infinity>∞</infinity>
 			<nan>NaN</nan>
-			<timeSeparator draft="contributed">.</timeSeparator>
+			<timeSeparator>.</timeSeparator>
+			<timeSeparator alt="variant">:</timeSeparator>
 		</symbols>
 		<decimalFormats numberSystem="latn">
 			<decimalFormatLength>
@@ -4681,6 +6278,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤ #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">¤ 0k</pattern>
+					<pattern type="1000" count="other">¤ 0k</pattern>
+					<pattern type="10000" count="one">¤ 00k</pattern>
+					<pattern type="10000" count="other">¤ 00k</pattern>
+					<pattern type="100000" count="one">¤ 000k</pattern>
+					<pattern type="100000" count="other">¤ 000k</pattern>
+					<pattern type="1000000" count="one">¤ 0 mill</pattern>
+					<pattern type="1000000" count="other">¤ 0 mill</pattern>
+					<pattern type="10000000" count="one">¤ 00 mill</pattern>
+					<pattern type="10000000" count="other">¤ 00 mill</pattern>
+					<pattern type="100000000" count="one">¤ 000 mill</pattern>
+					<pattern type="100000000" count="other">¤ 000 mill</pattern>
+					<pattern type="1000000000" count="one">¤ 0 mrd</pattern>
+					<pattern type="1000000000" count="other">¤ 0 mrd</pattern>
+					<pattern type="10000000000" count="one">¤ 00 mrd</pattern>
+					<pattern type="10000000000" count="other">¤ 00 mrd</pattern>
+					<pattern type="100000000000" count="one">¤ 000 mrd</pattern>
+					<pattern type="100000000000" count="other">¤ 000 mrd</pattern>
+					<pattern type="1000000000000" count="one">¤ 0 bill</pattern>
+					<pattern type="1000000000000" count="other">¤ 0 bill</pattern>
+					<pattern type="10000000000000" count="one">¤ 00 bill</pattern>
+					<pattern type="10000000000000" count="other">¤ 00 bill</pattern>
+					<pattern type="100000000000000" count="one">¤ 000 bill</pattern>
+					<pattern type="100000000000000" count="other">¤ 000 bill</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4738,6 +6363,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">angolansk kwanza</displayName>
 				<displayName count="other">angolanske kwanza</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>angolanske kwanza (1977–1990)</displayName>
@@ -4830,6 +6456,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">bosnisk-hercegovinsk konvertibel mark</displayName>
 				<displayName count="other">bosnisk-hercegovinske konvertible mark</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BAN">
 				<displayName draft="contributed">nye bosnisk-hercegovinske dinarer (1994–1997)</displayName>
@@ -4924,6 +6551,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">boliviansk boliviano</displayName>
 				<displayName count="other">bolivianske boliviano</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOL">
 				<displayName draft="contributed">bolivianske boliviano (1863–1963)</displayName>
@@ -4950,7 +6578,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol draft="contributed">BRB</symbol>
 			</currency>
 			<currency type="BRC">
-				<displayName>brasilianske cruzado</displayName>
+				<displayName>brasilianske cruzados (1986–1989)</displayName>
 				<displayName count="one">brasiliansk cruzado (1986–1989)</displayName>
 				<displayName count="other">brasilianske cruzado (1986–1989)</displayName>
 				<symbol>BRC</symbol>
@@ -4971,13 +6599,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="BRN">
 				<displayName>brasilianske cruzado novo (1989–1990)</displayName>
 				<displayName count="one">brasiliansk cruzado novo (1989–1990)</displayName>
-				<displayName count="other">brasilianske cruzado novo</displayName>
+				<displayName count="other">brasilianske cruzado novo (1989–1990)</displayName>
 				<symbol draft="contributed">BRN</symbol>
 			</currency>
 			<currency type="BRR">
-				<displayName>brasilianske cruzeiro</displayName>
-				<displayName count="one">brasiliansk cruzeiro</displayName>
-				<displayName count="other">brasilianske cruzeiro</displayName>
+				<displayName>brasilianske cruzeiro (1993–1994)</displayName>
+				<displayName count="one">brasiliansk cruzeiro (1993–1994)</displayName>
+				<displayName count="other">brasilianske cruzeiro (1993–1994)</displayName>
 				<symbol draft="contributed">BRR</symbol>
 			</currency>
 			<currency type="BRZ">
@@ -5010,6 +6638,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">botswansk pula</displayName>
 				<displayName count="other">botswanske pula</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>hviterussiske nye rubler (1994–1999)</displayName>
@@ -5098,9 +6727,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="COU">
-				<displayName>unidad de valor real</displayName>
-				<displayName count="one">unidad de valor real</displayName>
-				<displayName count="other">unidad de valor real</displayName>
+				<displayName>colombianske unidad de valor real</displayName>
+				<displayName count="one">colombiansk unidad de valor real</displayName>
+				<displayName count="other">colombianske unidad de valor real</displayName>
 				<symbol draft="contributed">COU</symbol>
 			</currency>
 			<currency type="CRC">
@@ -5127,6 +6756,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">kubansk konvertibel peso</displayName>
 				<displayName count="other">kubanske konvertible pesos</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>kubanske pesos</displayName>
@@ -5152,11 +6782,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">tsjekkisk koruna</displayName>
 				<displayName count="other">tsjekkiske koruna</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
-				<displayName>østtyske ostmark</displayName>
-				<displayName count="one">østtysk ostmark</displayName>
-				<displayName count="other">østtyske ostmark</displayName>
+				<displayName>østtyske mark</displayName>
+				<displayName count="one">østtysk mark</displayName>
+				<displayName count="other">østtyske mark</displayName>
 				<symbol draft="contributed">DDM</symbol>
 			</currency>
 			<currency type="DEM">
@@ -5176,6 +6807,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dansk krone</displayName>
 				<displayName count="other">danske kroner</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>dominikanske pesos</displayName>
@@ -5213,6 +6845,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">egyptisk pund</displayName>
 				<displayName count="other">egyptiske pund</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>eritreiske nakfa</displayName>
@@ -5269,6 +6902,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">falklandspund</displayName>
 				<displayName count="other">falklandspund</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>franske franc</displayName>
@@ -5294,6 +6928,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">georgisk lari</displayName>
 				<displayName count="other">georgiske lari</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>ghanesisk cedi (1979–2007)</displayName>
@@ -5325,6 +6960,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">guineansk franc</displayName>
 				<displayName count="other">guineanske franc</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>guineanske syli</displayName>
@@ -5349,6 +6985,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">guatemalansk quetzal</displayName>
 				<displayName count="other">guatemalanske quetzal</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>portugisiske guinea escudo</displayName>
@@ -5381,6 +7018,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">honduransk lempira</displayName>
 				<displayName count="other">honduranske lempira</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>kroatiske dinarer</displayName>
@@ -5393,6 +7031,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">kroatisk kuna</displayName>
 				<displayName count="other">kroatiske kuna</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>haitiske gourde</displayName>
@@ -5405,12 +7044,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ungarsk forint</displayName>
 				<displayName count="other">ungarske forinter</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>indonesiske rupier</displayName>
 				<displayName count="one">indonesisk rupi</displayName>
 				<displayName count="other">indonesiske rupier</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>irske pund</displayName>
@@ -5457,15 +7098,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>IRR</symbol>
 			</currency>
 			<currency type="ISJ">
-				<displayName>gammel islandsk krone</displayName>
-				<displayName count="one">gammel islandsk krone</displayName>
-				<displayName count="other">gamle islandske kroner</displayName>
+				<displayName>islandske kroner (1918–1981)</displayName>
+				<displayName count="one">islandsk krone (1918–1981)</displayName>
+				<displayName count="other">islandske kroner (1918–1981)</displayName>
 			</currency>
 			<currency type="ISK">
 				<displayName>islandske kroner</displayName>
 				<displayName count="one">islandsk krone</displayName>
 				<displayName count="other">islandske kroner</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>italienske lire</displayName>
@@ -5517,12 +7159,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">komorisk franc</displayName>
 				<displayName count="other">komoriske franc</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>nordkoreanske won</displayName>
 				<displayName count="one">nordkoreansk won</displayName>
 				<displayName count="other">nordkoreanske won</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRH">
 				<displayName draft="contributed">sørkoreanske hwan (1953–1962)</displayName>
@@ -5575,12 +7219,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">libanesisk pund</displayName>
 				<displayName count="other">libanesiske pund</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>srilankiske rupier</displayName>
 				<displayName count="one">srilankisk rupi</displayName>
 				<displayName count="other">srilankiske rupier</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>liberiske dollar</displayName>
@@ -5596,10 +7242,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol draft="contributed">LSL</symbol>
 			</currency>
 			<currency type="LTL">
-				<displayName>litauiske lita</displayName>
+				<displayName>litauiske litas</displayName>
 				<displayName count="one">litauisk lita</displayName>
 				<displayName count="other">litauiske lita</displayName>
 				<symbol>LTL</symbol>
+				<symbol alt="narrow" draft="contributed">Lt</symbol>
 			</currency>
 			<currency type="LTT">
 				<displayName>litauiske talonas</displayName>
@@ -5630,6 +7277,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">latvisk lats</displayName>
 				<displayName count="other">latviske lats</displayName>
 				<symbol>LVL</symbol>
+				<symbol alt="narrow" draft="contributed">Ls</symbol>
 			</currency>
 			<currency type="LVR">
 				<displayName>latviske rubler</displayName>
@@ -5678,6 +7326,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">madagassisk ariary</displayName>
 				<displayName count="other">madagassiske ariary</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>madagassiske franc</displayName>
@@ -5707,6 +7356,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">myanmarsk kyat</displayName>
 				<displayName count="other">myanmarske kyat</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>mongolske tugrik</displayName>
@@ -5744,6 +7394,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">mauritisk rupi</displayName>
 				<displayName count="other">mauritiske rupier</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVP">
 				<displayName draft="contributed">maldiviske rupier</displayName>
@@ -5787,6 +7438,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">malaysisk ringgit</displayName>
 				<displayName count="other">malaysiske ringgit</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>mosambikiske escudo</displayName>
@@ -5831,6 +7483,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">nicaraguansk córdoba</displayName>
 				<displayName count="other">nicaraguanske córdoba</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>nederlandske gylden</displayName>
@@ -5843,12 +7496,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">norsk krone</displayName>
 				<displayName count="other">norske kroner</displayName>
 				<symbol>kr</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>nepalske rupier</displayName>
 				<displayName count="one">nepalsk rupi</displayName>
 				<displayName count="other">nepalske rupier</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>newzealandske dollar</displayName>
@@ -5905,12 +7560,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">pakistansk rupi</displayName>
 				<displayName count="other">pakistanske rupier</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>polske zloty</displayName>
 				<displayName count="one">polsk zloty</displayName>
 				<displayName count="other">polske zloty</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>polske zloty (1950–1995)</displayName>
@@ -5966,6 +7623,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">russisk rubel</displayName>
 				<displayName count="other">russiske rubler</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>russiske rubler (1991–1998)</displayName>
@@ -5978,6 +7636,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">rwandisk franc</displayName>
 				<displayName count="other">rwandiske franc</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>saudiarabiske riyaler</displayName>
@@ -6021,6 +7680,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">svensk krone</displayName>
 				<displayName count="other">svenske kroner</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>singaporske dollar</displayName>
@@ -6034,6 +7694,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">sankthelensk pund</displayName>
 				<displayName count="other">sankthelenske pund</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>slovenske tolar</displayName>
@@ -6084,6 +7745,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">São Tomé og Príncipe-dobra</displayName>
 				<displayName count="other">São Tomé og Príncipe-dobra</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>sovjetiske rubler</displayName>
@@ -6102,6 +7764,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">syrisk pund</displayName>
 				<displayName count="other">syriske pund</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>swazilandske lilangeni</displayName>
@@ -6114,6 +7777,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">thailandsk baht</displayName>
 				<displayName count="other">thailandske baht</displayName>
 				<symbol>THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>tadsjikiske rubler</displayName>
@@ -6150,6 +7814,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">tongansk paʻanga</displayName>
 				<displayName count="other">tonganske paʻanga</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>timoresiske escudo</displayName>
@@ -6169,6 +7834,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">tyrkiske lire</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>trinidadiske dollar</displayName>
@@ -6242,7 +7908,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="UYP">
 				<displayName>uruguayanske pesos (1975–1993)</displayName>
-				<displayName count="one">uruguayansk pesos (1975–1993)</displayName>
+				<displayName count="one">uruguayansk peso (1975–1993)</displayName>
 				<displayName count="other">uruguayanske pesos (1975–1993)</displayName>
 				<symbol draft="contributed">UYP</symbol>
 			</currency>
@@ -6268,8 +7934,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="VEF">
 				<displayName>venezuelanske bolivar</displayName>
 				<displayName count="one">venezuelansk bolivar</displayName>
-				<displayName count="other">venezuelanske bolivarer</displayName>
+				<displayName count="other">venezuelanske bolivar</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>vietnamesiske dong</displayName>
@@ -6343,6 +8010,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">østkaribisk dollar</displayName>
 				<displayName count="other">østkaribiske dollar</displayName>
 				<symbol>XCD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>spesielle trekkrettigheter</displayName>
@@ -6467,6 +8135,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">sørafrikansk rand</displayName>
 				<displayName count="other">sørafrikanske rand</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>zambiske kwacha (1968–2012)</displayName>
@@ -6479,6 +8148,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">zambisk kwacha</displayName>
 				<displayName count="other">zambiske kwacha</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>zairiske nye zaire</displayName>
@@ -6512,7 +8182,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">⩾{0}</pattern>
-			<pattern type="range" draft="contributed">{0}‒{1}</pattern>
+			<pattern type="range">{0}–{1}</pattern>
 		</miscPatterns>
 	</numbers>
 	<units>
@@ -6530,6 +8200,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} meter per sekund²</unitPattern>
 				<unitPattern count="other">{0} meter per sekund²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>omdreininger</displayName>
+				<unitPattern count="one">{0} omdreining</unitPattern>
+				<unitPattern count="other">{0} omdreininger</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radianer</displayName>
+				<unitPattern count="one">{0} radian</unitPattern>
+				<unitPattern count="other">{0} radianer</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>grader</displayName>
+				<unitPattern count="one">{0} grad</unitPattern>
+				<unitPattern count="other">{0} grader</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>bueminutter</displayName>
 				<unitPattern count="one">{0} bueminutt</unitPattern>
@@ -6540,30 +8225,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} buesekund</unitPattern>
 				<unitPattern count="other">{0} buesekunder</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>grader</displayName>
-				<unitPattern count="one">{0} grad</unitPattern>
-				<unitPattern count="other">{0} grader</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radianer</displayName>
-				<unitPattern count="one">{0} radian</unitPattern>
-				<unitPattern count="other">{0} radianer</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>acres</displayName>
-				<unitPattern count="one">{0} acre</unitPattern>
-				<unitPattern count="other">{0} acres</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>kvadratkilometer</displayName>
+				<unitPattern count="one">{0} kvadratkilometer</unitPattern>
+				<unitPattern count="other">{0} kvadratkilometer</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektar</displayName>
 				<unitPattern count="one">{0} hektar</unitPattern>
 				<unitPattern count="other">{0} hektar</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>kvadratmeter</displayName>
+				<unitPattern count="one">{0} kvadratmeter</unitPattern>
+				<unitPattern count="other">{0} kvadratmeter</unitPattern>
+				<perUnitPattern>{0} per kvadratmeter</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>kvadratcentimeter</displayName>
 				<unitPattern count="one">{0} kvadratcentimeter</unitPattern>
 				<unitPattern count="other">{0} kvadratcentimeter</unitPattern>
+				<perUnitPattern>{0} per kvadratcentimeter</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>engelske kvadratmil</displayName>
+				<unitPattern count="one">{0} engelsk kvadratmil</unitPattern>
+				<unitPattern count="other">{0} engelske kvadratmil</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acre</displayName>
+				<unitPattern count="one">{0} acre</unitPattern>
+				<unitPattern count="other">{0} acre</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>kvadratyard</displayName>
+				<unitPattern count="one">{0} kvadratyard</unitPattern>
+				<unitPattern count="other">{0} kvadratyard</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>kvadratfot</displayName>
@@ -6574,91 +8271,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>kvadrattommer</displayName>
 				<unitPattern count="one">{0} kvadrattomme</unitPattern>
 				<unitPattern count="other">{0} kvadrattommer</unitPattern>
+				<perUnitPattern>{0} per kvadrattomme</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kvadratkilometer</displayName>
-				<unitPattern count="one">{0} kvadratkilometer</unitPattern>
-				<unitPattern count="other">{0} kvadratkilometer</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>kvadratmeter</displayName>
-				<unitPattern count="one">{0} kvadratmeter</unitPattern>
-				<unitPattern count="other">{0} kvadratmeter</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>engelske kvadratmil</displayName>
-				<unitPattern count="one">{0} engelsk kvadratmil</unitPattern>
-				<unitPattern count="other">{0} engelske kvadratmil</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>kvadratyard</displayName>
-				<unitPattern count="one">{0} kvadratyard</unitPattern>
-				<unitPattern count="other">{0} kvadratyard</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="other">{0} karat</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liter per kilometer</displayName>
 				<unitPattern count="one">{0} liter per kilometer</unitPattern>
 				<unitPattern count="other">{0} liter per kilometer</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>liter per 100 kilometer</displayName>
+				<unitPattern count="one">{0} liter per 100 kilometer</unitPattern>
+				<unitPattern count="other">{0} liter per 100 kilometer</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>engelske mil per gallon</displayName>
 				<unitPattern count="one">{0} engelsk mil per gallon</unitPattern>
 				<unitPattern count="other">{0} engelske mil per gallon</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabit</displayName>
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="other">{0} gigabit</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabyte</displayName>
-				<unitPattern count="one">{0} gigabyte</unitPattern>
-				<unitPattern count="other">{0} gigabyte</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobit</displayName>
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="other">{0} kilobit</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobyte</displayName>
-				<unitPattern count="one">{0} kilobyte</unitPattern>
-				<unitPattern count="other">{0} kilobyte</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabit</displayName>
-				<unitPattern count="one">{0} megabit</unitPattern>
-				<unitPattern count="other">{0} megabit</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabyte</displayName>
-				<unitPattern count="one">{0} megabyte</unitPattern>
-				<unitPattern count="other">{0} megabyte</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabit</displayName>
-				<unitPattern count="one">{0} terabit</unitPattern>
-				<unitPattern count="other">{0} terabit</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabyte</displayName>
 				<unitPattern count="one">{0} terabyte</unitPattern>
 				<unitPattern count="other">{0} terabyte</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabit</displayName>
+				<unitPattern count="one">{0} terabit</unitPattern>
+				<unitPattern count="other">{0} terabit</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabyte</displayName>
+				<unitPattern count="one">{0} gigabyte</unitPattern>
+				<unitPattern count="other">{0} gigabyte</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabit</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="other">{0} gigabit</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabyte</displayName>
+				<unitPattern count="one">{0} megabyte</unitPattern>
+				<unitPattern count="other">{0} megabyte</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabit</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="other">{0} megabit</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobyte</displayName>
+				<unitPattern count="one">{0} kilobyte</unitPattern>
+				<unitPattern count="other">{0} kilobyte</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobit</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="other">{0} kilobit</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>århundrer</displayName>
+				<unitPattern count="one">{0} århundre</unitPattern>
+				<unitPattern count="other">{0} århundrer</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>år</displayName>
+				<unitPattern count="one">{0} år</unitPattern>
+				<unitPattern count="other">{0} år</unitPattern>
+				<perUnitPattern>{0} per år</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>måneder</displayName>
+				<unitPattern count="one">{0} måned</unitPattern>
+				<unitPattern count="other">{0} måneder</unitPattern>
+				<perUnitPattern>{0}/måned</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>uker</displayName>
+				<unitPattern count="one">{0} uke</unitPattern>
+				<unitPattern count="other">{0} uker</unitPattern>
+				<perUnitPattern>{0} per uke</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>døgn</displayName>
 				<unitPattern count="one">{0} døgn</unitPattern>
 				<unitPattern count="other">{0} døgn</unitPattern>
+				<perUnitPattern>{0} per døgn</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>timer</displayName>
@@ -6666,30 +8378,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} timer</unitPattern>
 				<perUnitPattern>{0} per time</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikrosekunder</displayName>
-				<unitPattern count="one">{0} mikrosekund</unitPattern>
-				<unitPattern count="other">{0} mikrosekunder</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>millisekunder</displayName>
-				<unitPattern count="one">{0} millisekund</unitPattern>
-				<unitPattern count="other">{0} millisekunder</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>minutter</displayName>
 				<unitPattern count="one">{0} minutt</unitPattern>
 				<unitPattern count="other">{0} minutter</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>måneder</displayName>
-				<unitPattern count="one">{0} måned</unitPattern>
-				<unitPattern count="other">{0} måneder</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanosekunder</displayName>
-				<unitPattern count="one">{0} nanosekund</unitPattern>
-				<unitPattern count="other">{0} nanosekunder</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sekunder</displayName>
@@ -6697,15 +8390,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} sekunder</unitPattern>
 				<perUnitPattern>{0} per sekund</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>uker</displayName>
-				<unitPattern count="one">{0} uke</unitPattern>
-				<unitPattern count="other">{0} uker</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>millisekunder</displayName>
+				<unitPattern count="one">{0} millisekund</unitPattern>
+				<unitPattern count="other">{0} millisekunder</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>år</displayName>
-				<unitPattern count="one">{0} år</unitPattern>
-				<unitPattern count="other">{0} år</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>mikrosekunder</displayName>
+				<unitPattern count="one">{0} mikrosekund</unitPattern>
+				<unitPattern count="other">{0} mikrosekunder</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosekunder</displayName>
+				<unitPattern count="one">{0} nanosekund</unitPattern>
+				<unitPattern count="other">{0} nanosekunder</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ampere</displayName>
@@ -6727,6 +8425,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} volt</unitPattern>
 				<unitPattern count="other">{0} volt</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokalorier</displayName>
+				<unitPattern count="one">{0} kilokalori</unitPattern>
+				<unitPattern count="other">{0} kilokalorier</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kalorier</displayName>
 				<unitPattern count="one">{0} kalori</unitPattern>
@@ -6737,21 +8440,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kalori</unitPattern>
 				<unitPattern count="other">{0} kalorier</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="one">{0} joule</unitPattern>
-				<unitPattern count="other">{0} joule</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokalorier</displayName>
-				<unitPattern count="one">{0} kilokalori</unitPattern>
-				<unitPattern count="other">{0} kilokalorier</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojoule</displayName>
 				<unitPattern count="one">{0} kilojoule</unitPattern>
 				<unitPattern count="other">{0} kilojoule</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="one">{0} joule</unitPattern>
+				<unitPattern count="other">{0} joule</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilowattimer</displayName>
 				<unitPattern count="one">{0} kilowattime</unitPattern>
@@ -6762,206 +8460,210 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} gigahertz</unitPattern>
 				<unitPattern count="other">{0} gigahertz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hertz</displayName>
-				<unitPattern count="one">{0} hertz</unitPattern>
-				<unitPattern count="other">{0} hertz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megahertz</displayName>
+				<unitPattern count="one">{0} megahertz</unitPattern>
+				<unitPattern count="other">{0} megahertz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kilohertz</displayName>
 				<unitPattern count="one">{0} kilohertz</unitPattern>
 				<unitPattern count="other">{0} kilohertz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megahertz</displayName>
-				<unitPattern count="one">{0} megahertz</unitPattern>
-				<unitPattern count="other">{0} megahertz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hertz</displayName>
+				<unitPattern count="one">{0} hertz</unitPattern>
+				<unitPattern count="other">{0} hertz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>astronomiske enheter</displayName>
-				<unitPattern count="one">{0} astronomisk enhet</unitPattern>
-				<unitPattern count="other">{0} astronomiske enheter</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometer</displayName>
+				<unitPattern count="one">{0} kilometer</unitPattern>
+				<unitPattern count="other">{0} kilometer</unitPattern>
+				<perUnitPattern>{0} per kilometer</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>centimeter</displayName>
-				<unitPattern count="one">{0} centimeter</unitPattern>
-				<unitPattern count="other">{0} centimeter</unitPattern>
+			<unit type="length-meter">
+				<displayName>meter</displayName>
+				<unitPattern count="one">{0} meter</unitPattern>
+				<unitPattern count="other">{0} meter</unitPattern>
+				<perUnitPattern>{0} per meter</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>desimeter</displayName>
 				<unitPattern count="one">{0} desimeter</unitPattern>
 				<unitPattern count="other">{0} desimeter</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>fot</displayName>
-				<unitPattern count="one">{0} fot</unitPattern>
-				<unitPattern count="other">{0} fot</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>tommer</displayName>
-				<unitPattern count="one">{0} tomme</unitPattern>
-				<unitPattern count="other">{0} tommer</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometer</displayName>
-				<unitPattern count="one">{0} kilometer</unitPattern>
-				<unitPattern count="other">{0} kilometer</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>lysår</displayName>
-				<unitPattern count="one">{0} lysår</unitPattern>
-				<unitPattern count="other">{0} lysår</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>meter</displayName>
-				<unitPattern count="one">{0} meter</unitPattern>
-				<unitPattern count="other">{0} meter</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>mikrometer</displayName>
-				<unitPattern count="one">{0} mikrometer</unitPattern>
-				<unitPattern count="other">{0} mikrometer</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>engelske mil</displayName>
-				<unitPattern count="one">{0} engelsk mil</unitPattern>
-				<unitPattern count="other">{0} engelske mil</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>centimeter</displayName>
+				<unitPattern count="one">{0} centimeter</unitPattern>
+				<unitPattern count="other">{0} centimeter</unitPattern>
+				<perUnitPattern>{0} per centimeter</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>millimeter</displayName>
 				<unitPattern count="one">{0} millimeter</unitPattern>
 				<unitPattern count="other">{0} millimeter</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikrometer</displayName>
+				<unitPattern count="one">{0} mikrometer</unitPattern>
+				<unitPattern count="other">{0} mikrometer</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanometer</displayName>
 				<unitPattern count="one">{0} nanometer</unitPattern>
 				<unitPattern count="other">{0} nanometer</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nautiske mil</displayName>
-				<unitPattern count="one">{0} nautisk mil</unitPattern>
-				<unitPattern count="other">{0} nautiske mil</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsec</displayName>
-				<unitPattern count="one">{0} parsec</unitPattern>
-				<unitPattern count="other">{0} parsec</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pikometer</displayName>
 				<unitPattern count="one">{0} pikometer</unitPattern>
 				<unitPattern count="other">{0} pikometer</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>engelske mil</displayName>
+				<unitPattern count="one">{0} engelsk mil</unitPattern>
+				<unitPattern count="other">{0} engelske mil</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yard</displayName>
 				<unitPattern count="one">{0} yard</unitPattern>
 				<unitPattern count="other">{0} yard</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>fot</displayName>
+				<unitPattern count="one">{0} fot</unitPattern>
+				<unitPattern count="other">{0} fot</unitPattern>
+				<perUnitPattern>{0} per fot</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>tommer</displayName>
+				<unitPattern count="one">{0} tomme</unitPattern>
+				<unitPattern count="other">{0} tommer</unitPattern>
+				<perUnitPattern>{0} per tomme</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsec</displayName>
+				<unitPattern count="one">{0} parsec</unitPattern>
+				<unitPattern count="other">{0} parsec</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>lysår</displayName>
+				<unitPattern count="one">{0} lysår</unitPattern>
+				<unitPattern count="other">{0} lysår</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>astronomiske enheter</displayName>
+				<unitPattern count="one">{0} astronomisk enhet</unitPattern>
+				<unitPattern count="other">{0} astronomiske enheter</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nautiske mil</displayName>
+				<unitPattern count="one">{0} nautisk mil</unitPattern>
+				<unitPattern count="other">{0} nautiske mil</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>mil</displayName>
+				<unitPattern count="one">{0} mil</unitPattern>
+				<unitPattern count="other">{0} mil</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="other">{0} karat</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gram</displayName>
-				<unitPattern count="one">{0} gram</unitPattern>
-				<unitPattern count="other">{0} gram</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogram</displayName>
-				<unitPattern count="one">{0} kilogram</unitPattern>
-				<unitPattern count="other">{0} kilogram</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>tonn</displayName>
 				<unitPattern count="one">{0} tonn</unitPattern>
 				<unitPattern count="other">{0} tonn</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mikrogram</displayName>
-				<unitPattern count="one">{0} mikrogram</unitPattern>
-				<unitPattern count="other">{0} mikrogram</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogram</displayName>
+				<unitPattern count="one">{0} kilogram</unitPattern>
+				<unitPattern count="other">{0} kilogram</unitPattern>
+				<perUnitPattern>{0} per kilogram</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="one">{0} gram</unitPattern>
+				<unitPattern count="other">{0} gram</unitPattern>
+				<perUnitPattern>{0} per gram</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>milligram</displayName>
 				<unitPattern count="one">{0} milligram</unitPattern>
 				<unitPattern count="other">{0} milligram</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>unser</displayName>
-				<unitPattern count="one">{0} unse</unitPattern>
-				<unitPattern count="other">{0} unser</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>troy ounce</displayName>
-				<unitPattern count="one">{0} troy ounce</unitPattern>
-				<unitPattern count="other">{0} troy ounce</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>pund</displayName>
-				<unitPattern count="one">{0} pund</unitPattern>
-				<unitPattern count="other">{0} pund</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="unconfirmed">engelske steiner</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} engelsk stein</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} engelske steiner</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>mikrogram</displayName>
+				<unitPattern count="one">{0} mikrogram</unitPattern>
+				<unitPattern count="other">{0} mikrogram</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>amerikanske tonn</displayName>
 				<unitPattern count="one">{0} amerikansk tonn</unitPattern>
 				<unitPattern count="other">{0} amerikanske tonn</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName draft="unconfirmed">engelske steiner</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} engelsk stein</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} engelske steiner</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>pund</displayName>
+				<unitPattern count="one">{0} pund</unitPattern>
+				<unitPattern count="other">{0} pund</unitPattern>
+				<perUnitPattern draft="contributed">{0} per pund</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>unser</displayName>
+				<unitPattern count="one">{0} unse</unitPattern>
+				<unitPattern count="other">{0} unser</unitPattern>
+				<perUnitPattern>{0} per unse</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>troy ounce</displayName>
+				<unitPattern count="one">{0} troy ounce</unitPattern>
+				<unitPattern count="other">{0} troy ounce</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="other">{0} karat</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigawatt</displayName>
 				<unitPattern count="one">{0} gigawatt</unitPattern>
 				<unitPattern count="other">{0} gigawatt</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hestekrefter</displayName>
-				<unitPattern count="one">{0} hestekraft</unitPattern>
-				<unitPattern count="other">{0} hestekrefter</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilowatt</displayName>
-				<unitPattern count="one">{0} kilowatt</unitPattern>
-				<unitPattern count="other">{0} kilowatt</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>megawatt</displayName>
 				<unitPattern count="one">{0} megawatt</unitPattern>
 				<unitPattern count="other">{0} megawatt</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>milliwatt</displayName>
-				<unitPattern count="one">{0} milliwatt</unitPattern>
-				<unitPattern count="other">{0} milliwatt</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilowatt</displayName>
+				<unitPattern count="one">{0} kilowatt</unitPattern>
+				<unitPattern count="other">{0} kilowatt</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watt</displayName>
 				<unitPattern count="one">{0} watt</unitPattern>
 				<unitPattern count="other">{0} watt</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>milliwatt</displayName>
+				<unitPattern count="one">{0} milliwatt</unitPattern>
+				<unitPattern count="other">{0} milliwatt</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hestekrefter</displayName>
+				<unitPattern count="one">{0} hestekraft</unitPattern>
+				<unitPattern count="other">{0} hestekrefter</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hektopascal</displayName>
 				<unitPattern count="one">{0} hektopascal</unitPattern>
 				<unitPattern count="other">{0} hektopascal</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>tommer kvikksølv</displayName>
-				<unitPattern count="one">{0} tomme kvikksølv</unitPattern>
-				<unitPattern count="other">{0} tommer kvikksølv</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>millibar</displayName>
-				<unitPattern count="one">{0} millibar</unitPattern>
-				<unitPattern count="other">{0} millibar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>millimeter kvikksølv</displayName>
 				<unitPattern count="one">{0} millimeter kvikksølv</unitPattern>
@@ -6972,10 +8674,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} pund per kvadrattomme</unitPattern>
 				<unitPattern count="other">{0} pund per kvadrattomme</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="other">{0} karat</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>tommer kvikksølv</displayName>
+				<unitPattern count="one">{0} tomme kvikksølv</unitPattern>
+				<unitPattern count="other">{0} tommer kvikksølv</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>millibar</displayName>
+				<unitPattern count="one">{0} millibar</unitPattern>
+				<unitPattern count="other">{0} millibar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometer per time</displayName>
@@ -6992,6 +8699,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} engelsk mil per time</unitPattern>
 				<unitPattern count="other">{0} engelske mil per time</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>knop</displayName>
+				<unitPattern count="one">{0} knop</unitPattern>
+				<unitPattern count="other">{0} knop</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>grader celsius</displayName>
 				<unitPattern count="one">{0} grad celsius</unitPattern>
@@ -7007,31 +8724,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kelvin</unitPattern>
 				<unitPattern count="other">{0} kelvin</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>acre-fot</displayName>
-				<unitPattern count="one">{0} acre-fot</unitPattern>
-				<unitPattern count="other">{0} acre-fot</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>centiliter</displayName>
-				<unitPattern count="one">{0} centiliter</unitPattern>
-				<unitPattern count="other">{0} centiliter</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>kubikkcentimeter</displayName>
-				<unitPattern count="one">{0} kubikkcentimeter</unitPattern>
-				<unitPattern count="other">{0} kubikkcentimeter</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>kubikkfot</displayName>
-				<unitPattern count="one">{0} kubikkfot</unitPattern>
-				<unitPattern count="other">{0} kubikkfot</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>kubikktommer</displayName>
-				<unitPattern count="one">{0} kubikktomme</unitPattern>
-				<unitPattern count="other">{0} kubikktommer</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kubikkilometer</displayName>
 				<unitPattern count="one">{0} kubikkilometer</unitPattern>
@@ -7041,6 +8733,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>kubikkmeter</displayName>
 				<unitPattern count="one">{0} kubikkmeter</unitPattern>
 				<unitPattern count="other">{0} kubikkmeter</unitPattern>
+				<perUnitPattern>{0} per kubikkmeter</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>kubikkcentimeter</displayName>
+				<unitPattern count="one">{0} kubikkcentimeter</unitPattern>
+				<unitPattern count="other">{0} kubikkcentimeter</unitPattern>
+				<perUnitPattern>{0} per kubikkcentimeter</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>engelske kubikkmil</displayName>
@@ -7052,25 +8751,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kubikkyard</unitPattern>
 				<unitPattern count="other">{0} kubikkyard</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>kopper</displayName>
-				<unitPattern count="one">{0} kopp</unitPattern>
-				<unitPattern count="other">{0} kopper</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>kubikkfot</displayName>
+				<unitPattern count="one">{0} kubikkfot</unitPattern>
+				<unitPattern count="other">{0} kubikkfot</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>desiliter</displayName>
-				<unitPattern count="one">{0} desiliter</unitPattern>
-				<unitPattern count="other">{0} desiliter</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>kubikktommer</displayName>
+				<unitPattern count="one">{0} kubikktomme</unitPattern>
+				<unitPattern count="other">{0} kubikktommer</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>væskeunser</displayName>
-				<unitPattern count="one">{0} væskeunse</unitPattern>
-				<unitPattern count="other">{0} væskeunser</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gallon</displayName>
-				<unitPattern count="one">{0} gallon</unitPattern>
-				<unitPattern count="other">{0} gallon</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megaliter</displayName>
+				<unitPattern count="one">{0} megaliter</unitPattern>
+				<unitPattern count="other">{0} megaliter</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hektoliter</displayName>
@@ -7081,27 +8775,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>liter</displayName>
 				<unitPattern count="one">{0} liter</unitPattern>
 				<unitPattern count="other">{0} liter</unitPattern>
+				<perUnitPattern>{0} per liter</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megaliter</displayName>
-				<unitPattern count="one">{0} megaliter</unitPattern>
-				<unitPattern count="other">{0} megaliter</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>desiliter</displayName>
+				<unitPattern count="one">{0} desiliter</unitPattern>
+				<unitPattern count="other">{0} desiliter</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centiliter</displayName>
+				<unitPattern count="one">{0} centiliter</unitPattern>
+				<unitPattern count="other">{0} centiliter</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>milliliter</displayName>
 				<unitPattern count="one">{0} milliliter</unitPattern>
 				<unitPattern count="other">{0} milliliter</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pint</displayName>
-				<unitPattern count="one">{0} pint</unitPattern>
-				<unitPattern count="other">{0} pint</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>metriske pint</displayName>
+				<unitPattern count="one">{0} metrisk pint</unitPattern>
+				<unitPattern count="other">{0} metriske pint</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>metriske kopper</displayName>
+				<unitPattern count="one">{0} metrisk kopp</unitPattern>
+				<unitPattern count="other">{0} metriske kopper</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acre-fot</displayName>
+				<unitPattern count="one">{0} acre-fot</unitPattern>
+				<unitPattern count="other">{0} acre-fot</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gallon</displayName>
+				<unitPattern count="one">{0} gallon</unitPattern>
+				<unitPattern count="other">{0} gallon</unitPattern>
+				<perUnitPattern>{0} per gallon</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>quart</displayName>
 				<unitPattern count="one">{0} quart</unitPattern>
 				<unitPattern count="other">{0} quart</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pint</displayName>
+				<unitPattern count="one">{0} pint</unitPattern>
+				<unitPattern count="other">{0} pint</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>kopper</displayName>
+				<unitPattern count="one">{0} kopp</unitPattern>
+				<unitPattern count="other">{0} kopper</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>væskeunser</displayName>
+				<unitPattern count="one">{0} væskeunse</unitPattern>
+				<unitPattern count="other">{0} væskeunser</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>spiseskjeer</displayName>
 				<unitPattern count="one">{0} spiseskje</unitPattern>
@@ -7112,6 +8843,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} teskje</unitPattern>
 				<unitPattern count="other">{0} teskjeer</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} øst</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} nord</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} sør</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} vest</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -7127,6 +8864,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>omdr.</displayName>
+				<unitPattern count="one">{0} omdr.</unitPattern>
+				<unitPattern count="other">{0} omdr.</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radianer</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>grader</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>bueminutter</displayName>
 				<unitPattern count="one">{0} bmin</unitPattern>
@@ -7137,30 +8889,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} bsek</unitPattern>
 				<unitPattern count="other">{0} bsek</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>grader</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radianer</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>acres</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektar</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>engelske mil²</displayName>
+				<unitPattern count="one">{0} mile²</unitPattern>
+				<unitPattern count="other">{0} mile²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acre</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>kvadratfot</displayName>
@@ -7168,94 +8932,109 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} fot²</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
-				<displayName>in²</displayName>
-				<unitPattern count="one">{0} in²</unitPattern>
-				<unitPattern count="other">{0} in²</unitPattern>
+				<displayName>tommer²</displayName>
+				<unitPattern count="one">{0} tommer²</unitPattern>
+				<unitPattern count="other">{0} tommer²</unitPattern>
+				<perUnitPattern>{0}/tommer²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>engelske kvadratmil</displayName>
-				<unitPattern count="one">{0} mile²</unitPattern>
-				<unitPattern count="other">{0} mile²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liter/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
 				<unitPattern count="other">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>eng. mil/gal</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gbit</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kbit</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mbit</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gbit</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mbit</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kbit</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0} B</unitPattern>
+				<unitPattern count="other">{0} B</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>årh.</displayName>
+				<unitPattern count="one">{0} årh.</unitPattern>
+				<unitPattern count="other">{0} årh.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>år</displayName>
+				<unitPattern count="one">{0} år</unitPattern>
+				<unitPattern count="other">{0} år</unitPattern>
+				<perUnitPattern>{0}/år</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>måneder</displayName>
+				<unitPattern count="one">{0} md.</unitPattern>
+				<unitPattern count="other">{0} md.</unitPattern>
+				<perUnitPattern>{0}/md.</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>uker</displayName>
+				<unitPattern count="one">{0} u</unitPattern>
+				<unitPattern count="other">{0} u</unitPattern>
+				<perUnitPattern>{0}/u</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>døgn</displayName>
 				<unitPattern count="one">{0} d</unitPattern>
 				<unitPattern count="other">{0} d</unitPattern>
+				<perUnitPattern>{0}/d</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>timer</displayName>
@@ -7263,30 +9042,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} t</unitPattern>
 				<perUnitPattern>{0}/t</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>måneder</displayName>
-				<unitPattern count="one">{0} mnd</unitPattern>
-				<unitPattern count="other">{0} mnd</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sek</displayName>
@@ -7294,15 +9054,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} sek</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>uker</displayName>
-				<unitPattern count="one">{0} u</unitPattern>
-				<unitPattern count="other">{0} u</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>år</displayName>
-				<unitPattern count="one">{0} år</unitPattern>
-				<unitPattern count="other">{0} år</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ampere</displayName>
@@ -7324,31 +9089,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
 				<unitPattern count="other">{0} cal</unitPattern>
 			</unit>
 			<unit type="energy-foodcalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
+				<displayName>cal</displayName>
+				<unitPattern count="one">{0} cal</unitPattern>
+				<unitPattern count="other">{0} cal</unitPattern>
 			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojoule</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -7359,206 +9124,210 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>meter</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>fot</displayName>
-				<unitPattern count="one">{0} fot</unitPattern>
-				<unitPattern count="other">{0} fot</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>tommer</displayName>
-				<unitPattern count="one">{0} tomme</unitPattern>
-				<unitPattern count="other">{0} tommer</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>lysår</displayName>
-				<unitPattern count="one">{0} lysår</unitPattern>
-				<unitPattern count="other">{0} lysår</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>meter</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>engelske mil</displayName>
-				<unitPattern count="one">{0} mile</unitPattern>
-				<unitPattern count="other">{0} mile</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="one">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsec</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>engelske mil</displayName>
+				<unitPattern count="one">{0} mile</unitPattern>
+				<unitPattern count="other">{0} mile</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yard</displayName>
 				<unitPattern count="one">{0} yard</unitPattern>
 				<unitPattern count="other">{0} yard</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>fot</displayName>
+				<unitPattern count="one">{0} fot</unitPattern>
+				<unitPattern count="other">{0} fot</unitPattern>
+				<perUnitPattern>{0}/fot</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>tommer</displayName>
+				<unitPattern count="one">{0} tomme</unitPattern>
+				<unitPattern count="other">{0} tommer</unitPattern>
+				<perUnitPattern>{0}/tomme</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsec</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>lysår</displayName>
+				<unitPattern count="one">{0} lysår</unitPattern>
+				<unitPattern count="other">{0} lysår</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>mil</displayName>
+				<unitPattern count="one">{0} mil</unitPattern>
+				<unitPattern count="other">{0} mil</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gram</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>tonn</displayName>
 				<unitPattern count="one">{0} tonn</unitPattern>
 				<unitPattern count="other">{0} tonn</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>unser</displayName>
-				<unitPattern count="one">{0} unse</unitPattern>
-				<unitPattern count="other">{0} unser</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz tr</displayName>
-				<unitPattern count="one">{0} oz tr</unitPattern>
-				<unitPattern count="other">{0} oz tr</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>pund</displayName>
-				<unitPattern count="one">{0} pund</unitPattern>
-				<unitPattern count="other">{0} pund</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="unconfirmed">eng. steiner</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} eng. stein</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} eng. stein</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>amerikanske tonn</displayName>
 				<unitPattern count="one">{0} am. tonn</unitPattern>
 				<unitPattern count="other">{0} am. tonn</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName draft="unconfirmed">eng. steiner</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} eng. stein</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} eng. stein</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>pund</displayName>
+				<unitPattern count="one">{0} pund</unitPattern>
+				<unitPattern count="other">{0} pund</unitPattern>
+				<perUnitPattern draft="contributed">{0}/pund</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>unser</displayName>
+				<unitPattern count="one">{0} unse</unitPattern>
+				<unitPattern count="other">{0} unser</unitPattern>
+				<perUnitPattern>{0}/unse</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz tr</displayName>
+				<unitPattern count="one">{0} oz tr</unitPattern>
+				<unitPattern count="other">{0} oz tr</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hk</displayName>
-				<unitPattern count="one">{0} hk</unitPattern>
-				<unitPattern count="other">{0} hk</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watt</displayName>
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hk</displayName>
+				<unitPattern count="one">{0} hk</unitPattern>
+				<unitPattern count="other">{0} hk</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mmHg</displayName>
 				<unitPattern count="one">{0} mmHg</unitPattern>
@@ -7569,10 +9338,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/time</displayName>
@@ -7589,6 +9363,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mile/t</unitPattern>
 				<unitPattern count="other">{0} mile/t</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0} °C</unitPattern>
@@ -7604,20 +9388,32 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>acre-fot</displayName>
-				<unitPattern count="one">{0} ac-fot</unitPattern>
-				<unitPattern count="other">{0} ac-fot</unitPattern>
+			<unit type="volume-cubic-kilometer">
+				<displayName>km³</displayName>
+				<unitPattern count="one">{0} km³</unitPattern>
+				<unitPattern count="other">{0} km³</unitPattern>
 			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
+			<unit type="volume-cubic-meter">
+				<displayName>m³</displayName>
+				<unitPattern count="one">{0} m³</unitPattern>
+				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-centimeter">
 				<displayName>cm³</displayName>
 				<unitPattern count="one">{0} cm³</unitPattern>
 				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>engelske mil³</displayName>
+				<unitPattern count="one">{0} mile³</unitPattern>
+				<unitPattern count="other">{0} mile³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>yard³</displayName>
+				<unitPattern count="one">{0} yard³</unitPattern>
+				<unitPattern count="other">{0} yard³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-foot">
 				<displayName>fot³</displayName>
@@ -7629,45 +9425,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} tommer³</unitPattern>
 				<unitPattern count="other">{0} tommer³</unitPattern>
 			</unit>
-			<unit type="volume-cubic-kilometer">
-				<displayName>km³</displayName>
-				<unitPattern count="one">{0} km³</unitPattern>
-				<unitPattern count="other">{0} km³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-meter">
-				<displayName>m³</displayName>
-				<unitPattern count="one">{0} m³</unitPattern>
-				<unitPattern count="other">{0} m³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<displayName>engelske kubikkmil</displayName>
-				<unitPattern count="one">{0} mile³</unitPattern>
-				<unitPattern count="other">{0} mile³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-yard">
-				<displayName>yard³</displayName>
-				<unitPattern count="one">{0} yard³</unitPattern>
-				<unitPattern count="other">{0} yard³</unitPattern>
-			</unit>
-			<unit type="volume-cup">
-				<displayName>kopper</displayName>
-				<unitPattern count="one">{0} kopp</unitPattern>
-				<unitPattern count="other">{0} kopper</unitPattern>
-			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
-			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>væskeunse</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -7678,27 +9439,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>liter</displayName>
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="one">{0} Ml</unitPattern>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
 				<unitPattern count="one">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pint</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>m. kopper</displayName>
+				<unitPattern count="one">{0} m. kopp</unitPattern>
+				<unitPattern count="other">{0} m. kopper</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acre-fot</displayName>
+				<unitPattern count="one">{0} ac-fot</unitPattern>
+				<unitPattern count="other">{0} ac-fot</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pint</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>kopper</displayName>
+				<unitPattern count="one">{0} k</unitPattern>
+				<unitPattern count="other">{0} k</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>væskeunse</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>ss</displayName>
 				<unitPattern count="one">{0} ss</unitPattern>
@@ -7709,6 +9507,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ts</unitPattern>
 				<unitPattern count="other">{0} ts</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} Ø</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} V</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -7724,6 +9528,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}m/s²</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}m/s²</unitPattern>
 			</unit>
+			<unit type="angle-radian">
+				<displayName draft="unconfirmed">rad</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}rad</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName draft="unconfirmed">grader</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName draft="unconfirmed">buemin</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
@@ -7734,159 +9548,144 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName draft="unconfirmed">grader</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName draft="unconfirmed">rad</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}rad</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
-			</unit>
-			<unit type="area-hectare">
-				<unitPattern count="one">{0}ha</unitPattern>
-				<unitPattern count="other">{0}ha</unitPattern>
-			</unit>
-			<unit type="area-square-centimeter">
-				<displayName draft="unconfirmed">cm²</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}cm²</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}cm²</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0}fot²</unitPattern>
-				<unitPattern count="other">{0}fot²</unitPattern>
-			</unit>
 			<unit type="area-square-kilometer">
 				<displayName draft="unconfirmed">km²</displayName>
 				<unitPattern count="one">{0}km²</unitPattern>
 				<unitPattern count="other">{0}km²</unitPattern>
 			</unit>
+			<unit type="area-hectare">
+				<unitPattern count="one">{0}ha</unitPattern>
+				<unitPattern count="other">{0}ha</unitPattern>
+			</unit>
 			<unit type="area-square-meter">
 				<displayName draft="unconfirmed">m²</displayName>
 				<unitPattern count="one">{0}m²</unitPattern>
 				<unitPattern count="other">{0}m²</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/m²</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName draft="unconfirmed">cm²</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}cm²</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}cm²</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/cm²</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
 				<unitPattern count="one">{0} eng mil²</unitPattern>
 				<unitPattern count="other">{0} eng mil²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0}fot²</unitPattern>
+				<unitPattern count="other">{0}fot²</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName draft="unconfirmed">L/km</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}L/km</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100km</displayName>
+				<unitPattern count="one">{0} l/100km</unitPattern>
+				<unitPattern count="other">{0} l/100km</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="contributed">årh.</displayName>
+				<unitPattern count="one" draft="contributed">{0} årh.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} årh.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>år</displayName>
+				<unitPattern count="one">{0}å</unitPattern>
+				<unitPattern count="other">{0}å</unitPattern>
+				<perUnitPattern draft="contributed">{0}/år</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>måned</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern draft="contributed">{0}/m</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>uke</displayName>
+				<unitPattern count="one">{0}u</unitPattern>
+				<unitPattern count="other">{0}u</unitPattern>
+				<perUnitPattern draft="contributed">{0}/u</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>døgn</displayName>
 				<unitPattern count="one">{0}d</unitPattern>
 				<unitPattern count="other">{0}d</unitPattern>
+				<perUnitPattern draft="contributed">{0}/d</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>time</displayName>
 				<unitPattern count="one">{0}t</unitPattern>
 				<unitPattern count="other">{0}t</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/h</perUnitPattern>
+				<perUnitPattern draft="contributed">{0}/t</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName draft="unconfirmed">μs</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}μs</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}μs</unitPattern>
+			<unit type="duration-minute">
+				<displayName>min</displayName>
+				<unitPattern count="one">{0}m</unitPattern>
+				<unitPattern count="other">{0}m</unitPattern>
+				<perUnitPattern draft="contributed">{0}/m</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>sek</displayName>
+				<unitPattern count="one">{0}s</unitPattern>
+				<unitPattern count="other">{0}s</unitPattern>
+				<perUnitPattern draft="contributed">{0}/s</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>ms</displayName>
 				<unitPattern count="one">{0}ms</unitPattern>
 				<unitPattern count="other">{0}ms</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>min</displayName>
-				<unitPattern count="one">{0}m</unitPattern>
-				<unitPattern count="other">{0}m</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>måned</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName draft="contributed">μs</displayName>
+				<unitPattern count="one" draft="contributed">{0}μs</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}μs</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
-				<displayName draft="unconfirmed">ns</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}ns</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}ns</unitPattern>
+				<displayName draft="contributed">ns</displayName>
+				<unitPattern count="one" draft="contributed">{0}ns</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}ns</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>sek</displayName>
-				<unitPattern count="one">{0}s</unitPattern>
-				<unitPattern count="other">{0}s</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/s</perUnitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0}km</unitPattern>
+				<unitPattern count="other">{0}km</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/km</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>uke</displayName>
-				<unitPattern count="one">{0}u</unitPattern>
-				<unitPattern count="other">{0}u</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>år</displayName>
-				<unitPattern count="one">{0}å</unitPattern>
-				<unitPattern count="other">{0}å</unitPattern>
-			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName draft="unconfirmed">ae</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}ae</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}ae</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0}cm</unitPattern>
-				<unitPattern count="other">{0}cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>meter</displayName>
+				<unitPattern count="one">{0}m</unitPattern>
+				<unitPattern count="other">{0}m</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName draft="unconfirmed">dm</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}dm</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName draft="unconfirmed">fot</displayName>
-				<unitPattern count="one" draft="contributed">{0} fot</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fot</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="unconfirmed">tom</displayName>
-				<unitPattern count="one" draft="contributed">{0} tomme</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} tommer</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0}km</unitPattern>
-				<unitPattern count="other">{0}km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName draft="unconfirmed">lysår</displayName>
-				<unitPattern count="one" draft="contributed">{0} lysår</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} lysår</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>meter</displayName>
-				<unitPattern count="one">{0}m</unitPattern>
-				<unitPattern count="other">{0}m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName draft="unconfirmed">µm</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}µm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName draft="unconfirmed">eng.mil</displayName>
-				<unitPattern count="one">{0} eng mil</unitPattern>
-				<unitPattern count="other">{0} eng mil</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0}cm</unitPattern>
+				<unitPattern count="other">{0}cm</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="one">{0}mm</unitPattern>
 				<unitPattern count="other">{0}mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName draft="unconfirmed">µm</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}µm</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName draft="unconfirmed">nm</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}nm</unitPattern>
@@ -7897,73 +9696,103 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}pm</unitPattern>
 				<unitPattern count="other">{0}pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="unconfirmed">eng.mil</displayName>
+				<unitPattern count="one">{0} eng mil</unitPattern>
+				<unitPattern count="other">{0} eng mil</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} yard</unitPattern>
 				<unitPattern count="other">{0} yard</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName draft="unconfirmed">fot</displayName>
+				<unitPattern count="one" draft="contributed">{0} fot</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fot</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="unconfirmed">tom</displayName>
+				<unitPattern count="one" draft="contributed">{0} tomme</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} tommer</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/tom</perUnitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="unconfirmed">lysår</displayName>
+				<unitPattern count="one" draft="contributed">{0} lysår</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} lysår</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName draft="unconfirmed">ae</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}ae</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}ae</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="unconfirmed">mil</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}mil</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}mil</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName draft="unconfirmed">lux</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}lx</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName draft="unconfirmed">karat</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} karat</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} karat</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gram</displayName>
-				<unitPattern count="one">{0}g</unitPattern>
-				<unitPattern count="other">{0}g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0}kg</unitPattern>
-				<unitPattern count="other">{0}kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName draft="unconfirmed">tonn</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}t</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName draft="unconfirmed">µg</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}µg</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0}kg</unitPattern>
+				<unitPattern count="other">{0}kg</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="one">{0}g</unitPattern>
+				<unitPattern count="other">{0}g</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName draft="unconfirmed">mg</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}mg</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="unconfirmed">unser</displayName>
-				<unitPattern count="one">{0} unse</unitPattern>
-				<unitPattern count="other">{0} unser</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName draft="unconfirmed">troyunser</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} tr.uns</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} tr.uns</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName draft="unconfirmed">skålpund</displayName>
-				<unitPattern count="one">{0} pund</unitPattern>
-				<unitPattern count="other">{0} pund</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="unconfirmed">eng. steiner</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}en.stein</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}en.stein</unitPattern>
+			<unit type="mass-microgram">
+				<displayName draft="unconfirmed">µg</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}µg</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName draft="unconfirmed">eng. k. tonn</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}en.k.ton</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}en.k.ton</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0}hk</unitPattern>
-				<unitPattern count="other">{0}hk</unitPattern>
+			<unit type="mass-stone">
+				<displayName draft="unconfirmed">eng. steiner</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}en.stein</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}en.stein</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName draft="unconfirmed">skålpund</displayName>
+				<unitPattern count="one">{0} pund</unitPattern>
+				<unitPattern count="other">{0} pund</unitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName draft="unconfirmed">unser</displayName>
+				<unitPattern count="one">{0} unse</unitPattern>
+				<unitPattern count="other">{0} unser</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/unse</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName draft="unconfirmed">troyunser</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} tr.uns</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} tr.uns</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName draft="unconfirmed">karat</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} karat</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} karat</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0}kW</unitPattern>
@@ -7973,6 +9802,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}W</unitPattern>
 				<unitPattern count="other">{0}W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0}hk</unitPattern>
+				<unitPattern count="other">{0}hk</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="unconfirmed">hPa</displayName>
 				<unitPattern count="one">{0}hPa</unitPattern>
@@ -8018,13 +9851,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}K</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}K</unitPattern>
 			</unit>
-			<unit type="volume-centiliter">
-				<unitPattern count="one" draft="unconfirmed">{0}cL</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}cL</unitPattern>
+			<unit type="volume-cubic-kilometer">
+				<unitPattern count="one">{0}km³</unitPattern>
+				<unitPattern count="other">{0}km³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<unitPattern count="one" draft="unconfirmed">{0}m³</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}m³</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/m³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-centimeter">
 				<unitPattern count="one" draft="unconfirmed">{0}cm³</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}cm³</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/cm³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<unitPattern count="one">{0} eng mil³</unitPattern>
+				<unitPattern count="other">{0} eng mil³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-foot">
 				<unitPattern count="one" draft="unconfirmed">{0} fot³</unitPattern>
@@ -8034,21 +9877,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} tom³</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} tom³</unitPattern>
 			</unit>
-			<unit type="volume-cubic-kilometer">
-				<unitPattern count="one">{0}km³</unitPattern>
-				<unitPattern count="other">{0}km³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-meter">
-				<unitPattern count="one" draft="unconfirmed">{0}m³</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}m³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<unitPattern count="one">{0} eng mil³</unitPattern>
-				<unitPattern count="other">{0} eng mil³</unitPattern>
-			</unit>
-			<unit type="volume-deciliter">
-				<unitPattern count="one" draft="unconfirmed">{0}dL</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}dL</unitPattern>
+			<unit type="volume-megaliter">
+				<unitPattern count="one" draft="unconfirmed">{0}ML</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<unitPattern count="one" draft="unconfirmed">{0}hL</unitPattern>
@@ -8058,10 +9889,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>liter</displayName>
 				<unitPattern count="one">{0}l</unitPattern>
 				<unitPattern count="other">{0}l</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<unitPattern count="one" draft="unconfirmed">{0}ML</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}ML</unitPattern>
+			<unit type="volume-deciliter">
+				<unitPattern count="one" draft="unconfirmed">{0}dL</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<unitPattern count="one" draft="unconfirmed">{0}cL</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<unitPattern count="one" draft="unconfirmed">{0}mL</unitPattern>
@@ -8075,15 +9911,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} ts</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} ts</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}Ø</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}V</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h.mm</durationUnitPattern>
+			<durationUnitPattern alt="variant">h:mm</durationUnitPattern>
 		</durationUnit>
 		<durationUnit type="hms">
 			<durationUnitPattern>h.mm.ss</durationUnitPattern>
+			<durationUnitPattern alt="variant">h:mm:ss</durationUnitPattern>
 		</durationUnit>
 		<durationUnit type="ms">
 			<durationUnitPattern>m.ss</durationUnitPattern>
+			<durationUnitPattern alt="variant">m:ss</durationUnitPattern>
 		</durationUnit>
 	</units>
 	<listPatterns>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nb_NO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nb_NO.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nb_NO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nb_NO.xml
index f57daa2c5bd..e112495fb87 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nb_NO.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nb_NO.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="nb"/>
 		<territory type="NO"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nb_SJ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nb_SJ.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nb_SJ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nb_SJ.xml
index aee5f74494e..d6771b47a6d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nb_SJ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nb_SJ.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="nb"/>
 		<territory type="SJ"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nd.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nd.xml
similarity index 92%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nd.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nd.xml
index 1459006cbbc..4e21f242f51 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nd.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nd.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12128 $"/>
 		<language type="nd"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Netherlands Antilles</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Ajentina</territory>
 			<territory type="AS">Samoa ye Amelika</territory>
@@ -570,6 +568,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -749,3 +775,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nd_ZW.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nd_ZW.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nd_ZW.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nd_ZW.xml
index 6e0f9b1ee24..e32f7b438c2 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nd_ZW.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nd_ZW.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="nd"/>
 		<territory type="ZW"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ne.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ne.xml
similarity index 84%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ne.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ne.xml
index 8c931e07ffc..85ce7127763 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ne.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ne.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="ne"/>
 	</identity>
 	<localeDisplayNames>
@@ -17,196 +16,480 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<localeKeyTypePattern>{0}: {1}</localeKeyTypePattern>
 		</localeDisplayPattern>
 		<languages>
+			<language type="aa">अफार</language>
 			<language type="ab">अब्खाजियाली</language>
+			<language type="ace">अचाइनिज</language>
+			<language type="ach">अकोली</language>
+			<language type="ada">अदाङमे</language>
+			<language type="ady">अदिघे</language>
+			<language type="ae">अवेस्तान</language>
 			<language type="af">अफ्रिकान्स</language>
+			<language type="afh">अफ्रिहिली</language>
 			<language type="agq">आघेम</language>
+			<language type="ain">अइनु</language>
 			<language type="ak">आकान</language>
+			<language type="akk">अक्कादियाली</language>
+			<language type="akz">अलाबामा</language>
+			<language type="ale">अलेउट</language>
+			<language type="aln">घेग अल्बानियाली</language>
 			<language type="am">अम्हारिक</language>
+			<language type="an">अरागोनी</language>
+			<language type="ang">पुरातन अङ्ग्रेजी</language>
+			<language type="anp">अङ्गिका</language>
 			<language type="ar">अरबी</language>
 			<language type="ar_001">आधुनिक मानक अरबी</language>
+			<language type="arc">अरामाइक</language>
 			<language type="arn">मापुचे</language>
+			<language type="aro">अराओना</language>
+			<language type="arp">अरापाहो</language>
+			<language type="arq">अल्जेरियाली अरबी</language>
+			<language type="arw">अरावाक</language>
+			<language type="ary">मोरोक्कोली अरबी</language>
+			<language type="arz">इजिप्ट अरबी</language>
 			<language type="as">आसामी</language>
 			<language type="asa">आसु</language>
+			<language type="ase">अमेरिकी साङ्केतिक भाषा</language>
+			<language type="ast">अस्टुरियाली</language>
+			<language type="av">अवारिक</language>
+			<language type="avk">कोटावा</language>
+			<language type="awa">अवधी</language>
+			<language type="ay">ऐमारा</language>
 			<language type="az">अजरबैजानी</language>
 			<language type="az" alt="short">अजेरी</language>
-			<language type="ba">बाश्किर</language>
-			<language type="be">वेलारूसी</language>
+			<language type="ba">बास्किर</language>
+			<language type="bal">बालुची</language>
+			<language type="ban">बाली</language>
+			<language type="bar">बाभारियाली</language>
+			<language type="bas">बासा</language>
+			<language type="bax">बामुन</language>
+			<language type="bbc">बाताक तोबा</language>
+			<language type="bbj">घोमाला</language>
+			<language type="be">बेलारुसी</language>
+			<language type="bej">बेजा</language>
 			<language type="bem">बेम्बा</language>
+			<language type="bew">बेटावी</language>
 			<language type="bez">बेना</language>
+			<language type="bfd">बाफुट</language>
+			<language type="bfq">बडागा</language>
 			<language type="bg">बुल्गेरियाली</language>
+			<language type="bgn">पश्चिम बालोची</language>
+			<language type="bho">भोजपुरी</language>
+			<language type="bi">बिस्लाम</language>
+			<language type="bik">बिकोल</language>
+			<language type="bin">बिनी</language>
+			<language type="bjn">बन्जार</language>
+			<language type="bkm">कोम</language>
 			<language type="bm">बाम्बारा</language>
 			<language type="bn">बंगाली</language>
 			<language type="bo">तिब्बती</language>
+			<language type="bpy">विष्णुप्रिया</language>
+			<language type="bqi">बाख्तिआरी</language>
 			<language type="br">ब्रेटन</language>
+			<language type="bra">ब्रज</language>
+			<language type="brh">ब्राहुइ</language>
 			<language type="brx">बोडो</language>
 			<language type="bs">बोस्नियाली</language>
+			<language type="bss">अकुज</language>
+			<language type="bua">बुरिआत</language>
+			<language type="bug">बुगिनियाली</language>
+			<language type="bum">बुलु</language>
+			<language type="byn">ब्लिन</language>
+			<language type="byv">मेडुम्बा</language>
 			<language type="ca">क्याटालन</language>
+			<language type="cad">काड्डो</language>
+			<language type="car">क्यारिब</language>
+			<language type="cay">कायुगा</language>
+			<language type="cch">अट्साम</language>
+			<language type="ce">चेचेन</language>
+			<language type="ceb">सेबुआनो</language>
 			<language type="cgg">चिगा</language>
+			<language type="ch">चामोर्रो</language>
+			<language type="chb">चिब्चा</language>
+			<language type="chg">चागाटाई</language>
+			<language type="chk">चुकेसे</language>
+			<language type="chm">मारी</language>
+			<language type="chn">चिनुक जार्गन</language>
+			<language type="cho">चोक्टाव</language>
+			<language type="chp">चिपेव्यान</language>
 			<language type="chr">चेरोकी</language>
-			<language type="ckb">सोरानी कुर्दिश</language>
+			<language type="chy">चेयेन्ने</language>
+			<language type="ckb">केन्द्रीय कुर्दी</language>
 			<language type="co">कोर्सिकन</language>
+			<language type="cop">कोप्टिक</language>
+			<language type="cps">कापिज्नोन</language>
+			<language type="cr">क्री</language>
+			<language type="crh">क्रिमियाली तुर्क</language>
 			<language type="cs">चेक</language>
+			<language type="csb">कासुवियन</language>
+			<language type="cu">चर्च स्लाभिक</language>
+			<language type="cv">चुभास</language>
 			<language type="cy">वेल्श</language>
-			<language type="da">डेनिश</language>
+			<language type="da">डेनिस</language>
+			<language type="dak">डाकोटा</language>
+			<language type="dar">दार्ग्वा</language>
 			<language type="dav">ताइता</language>
 			<language type="de">जर्मन</language>
-			<language type="de_AT">अष्ट्रियन जर्मन</language>
+			<language type="de_AT">अस्ट्रियाली जर्मन</language>
 			<language type="de_CH">स्वीस हाई जर्मन</language>
+			<language type="del">देलावर</language>
+			<language type="dgr">दोग्रिब</language>
+			<language type="din">दिन्का</language>
 			<language type="dje">जर्मा</language>
+			<language type="doi">डोगरी</language>
 			<language type="dsb">तल्लो सोर्बियन</language>
+			<language type="dtp">केन्द्रीय दुसुन</language>
 			<language type="dua">दुवाला</language>
+			<language type="dum">मध्य डच</language>
+			<language type="dv">दिबेही</language>
 			<language type="dyo">जोला-फोनिल</language>
+			<language type="dyu">द्युला</language>
 			<language type="dz">जोङ्खा</language>
+			<language type="dzg">दाजागा</language>
 			<language type="ebu">एम्बु</language>
-			<language type="ee">इवि</language>
+			<language type="ee">इवी</language>
+			<language type="efi">एफिक</language>
+			<language type="egl">एमिलियाली</language>
+			<language type="egy">पुरातन इजिप्टी</language>
+			<language type="eka">एकाजुक</language>
 			<language type="el">ग्रीक</language>
-			<language type="en">अंग्रेजी</language>
-			<language type="en_US" alt="short">अंग्रेजी (अमेरिका)</language>
+			<language type="elx">एलामाइट</language>
+			<language type="en">अङ्ग्रेजी</language>
+			<language type="en_AU">अस्ट्रेलियाली अङ्ग्रेजी</language>
+			<language type="en_CA">क्यानाडेली अङ्ग्रेजी</language>
+			<language type="en_GB">बेलायती अङ्ग्रेजी</language>
+			<language type="en_GB" alt="short">संयुक्त अधिराज्य अङ्ग्रेजी</language>
+			<language type="en_US">अमेरिकी अङ्ग्रेजी</language>
+			<language type="en_US" alt="short">युएस अङ्ग्रेजी</language>
+			<language type="enm">मध्य अङ्ग्रेजी</language>
 			<language type="eo">एस्पेरान्तो</language>
-			<language type="es">स्पेनिस</language>
-			<language type="es_ES">युरोपेली स्पेनिस</language>
+			<language type="es">स्पेनी</language>
+			<language type="es_419">ल्याटिन अमेरिकी स्पेनी</language>
+			<language type="es_ES">युरोपेली स्पेनी</language>
+			<language type="es_MX">मेक्सिकन स्पेनी</language>
+			<language type="esu">केन्द्रीय युपिक</language>
 			<language type="et">इस्टोनियाली</language>
 			<language type="eu">बास्क</language>
+			<language type="ewo">इवोन्डो</language>
+			<language type="ext">एक्सट्रेमादुराली</language>
 			<language type="fa">फारसी</language>
-			<language type="fi">फिनिश</language>
+			<language type="fan">फाङ</language>
+			<language type="fat">फान्टी</language>
+			<language type="ff">फुलाह</language>
+			<language type="fi">फिनिस</language>
 			<language type="fil">फिलिपिनी</language>
 			<language type="fj">फिजियाली</language>
 			<language type="fo">फारोज</language>
+			<language type="fon">फोन</language>
 			<language type="fr">फ्रान्सेली</language>
+			<language type="fr_CA">क्यानेडाली फ्रान्सेली</language>
+			<language type="frc">काहुन फ्रान्सेली</language>
+			<language type="frm">मध्य फ्रान्सेली</language>
+			<language type="fro">पुरातन फ्रान्सेली</language>
+			<language type="frp">अर्पितान</language>
+			<language type="frr">उत्तरी फ्रिजी</language>
+			<language type="frs">पूर्वी फ्रिसियाली</language>
+			<language type="fur">फ्रिउलियाली</language>
 			<language type="fy">फ्रिजीयन</language>
-			<language type="ga">आइरिश</language>
+			<language type="ga">आयरिस</language>
+			<language type="gaa">गा</language>
 			<language type="gag">गगाउज</language>
-			<language type="gd" draft="unconfirmed">स्कट्स गाएलिक</language>
+			<language type="gan">गान चिनियाँ</language>
+			<language type="gay">गायो</language>
+			<language type="gba">ग्बाया</language>
+			<language type="gd">स्कटिस गाएलिक</language>
+			<language type="gez">गिज</language>
+			<language type="gil">गिल्बर्टी</language>
 			<language type="gl">गलिसियाली</language>
-			<language type="gn">गुजरानी</language>
+			<language type="glk">गिलाकी</language>
+			<language type="gmh">मध्य उच्च जर्मन</language>
+			<language type="gn">गुवारानी</language>
+			<language type="goh">पुरातन उच्च जर्मन</language>
+			<language type="gom">गोवा कोन्कानी</language>
+			<language type="gon">गोन्डी</language>
+			<language type="gor">गोरोन्टालो</language>
+			<language type="got">गोथिक</language>
+			<language type="grb">ग्रेबो</language>
+			<language type="grc">पुरातन ग्रिक</language>
 			<language type="gsw">स्वीस जर्मन</language>
 			<language type="gu">गुजराती</language>
+			<language type="gur">फ्राफ्रा</language>
 			<language type="guz">गुसी</language>
 			<language type="gv">मान्क्स</language>
+			<language type="gwi">गुइचिन</language>
 			<language type="ha">हाउसा</language>
+			<language type="hai">हाइदा</language>
+			<language type="hak">हक्का चिनियाँ</language>
 			<language type="haw">हवाइयन</language>
 			<language type="he">हिब्रु</language>
 			<language type="hi">हिन्दी</language>
-			<language type="hr">क्रोएशियाली</language>
+			<language type="hif">फिजी हिन्दी</language>
+			<language type="hil">हिलिगायनोन</language>
+			<language type="hit">हिट्टिटे</language>
+			<language type="hmn">हमोङ</language>
+			<language type="ho">हिरी मोटु</language>
+			<language type="hr">क्रोयसियाली</language>
 			<language type="hsb">माथिल्लो सोर्बियन</language>
 			<language type="ht">हैटियाली</language>
-			<language type="hu">हंग्रीयाली</language>
+			<language type="hu">हङ्गेरियाली</language>
+			<language type="hup">हुपा</language>
 			<language type="hy">आर्मेनियाली</language>
-			<language type="ia" draft="unconfirmed">इन्टर्लिङ्गुआ</language>
+			<language type="hz">हेरेरो</language>
+			<language type="ia">इन्टर्लिङ्गुआ</language>
+			<language type="iba">इबान</language>
+			<language type="ibb">इबिबियो</language>
 			<language type="id">इन्डोनेसियाली</language>
-			<language type="ie" draft="unconfirmed">अन्तरभाषी</language>
+			<language type="ie">इन्टरलिङ्ग्वे</language>
 			<language type="ig">इग्बो</language>
 			<language type="ii">सिचुआन यि</language>
-			<language type="is">आइसल्यान्डिक</language>
-			<language type="it">इटालियन</language>
-			<language type="iu">लनुक्टिटुट</language>
+			<language type="ik">इनुपिआक्</language>
+			<language type="ilo">इयोको</language>
+			<language type="inh">इन्गस</language>
+			<language type="io">इडो</language>
+			<language type="is">आइसल्यान्डियाली</language>
+			<language type="it">इटालेली</language>
+			<language type="iu">इनुक्टिटुट</language>
+			<language type="izh">इन्ग्रियाली</language>
 			<language type="ja">जापानी</language>
-			<language type="jgo">गोम्बा</language>
+			<language type="jam">जमैकाली क्रेओले अङ्ग्रेजी</language>
+			<language type="jbo">लोज्बान</language>
+			<language type="jgo">न्गोम्बा</language>
 			<language type="jmc">माचामे</language>
-			<language type="jv">जाभानिज</language>
+			<language type="jpr">जुडियो-फारसी</language>
+			<language type="jrb">जुडियो-अरबी</language>
+			<language type="jut">जुटिस</language>
+			<language type="jv">जाभानी</language>
 			<language type="ka">जर्जियाली</language>
+			<language type="kaa">कारा-काल्पाक</language>
 			<language type="kab">काबिल</language>
+			<language type="kac">काचिन</language>
+			<language type="kaj">ज्जु</language>
 			<language type="kam">काम्बा</language>
+			<language type="kaw">कावी</language>
+			<language type="kbd">काबार्दियाली</language>
+			<language type="kbl">कानेम्बु</language>
 			<language type="kde">माकोन्डे</language>
 			<language type="kea">काबुभेर्डियानु</language>
+			<language type="ken">केनयाङ</language>
+			<language type="kfo">कोरो</language>
+			<language type="kg">कोङ्गो</language>
+			<language type="kgp">काइनगाङ</language>
+			<language type="kha">खासी</language>
+			<language type="kho">खोटानी</language>
 			<language type="khq">कोयरा चिनी</language>
+			<language type="khw">खोवार</language>
 			<language type="ki">किकुयु</language>
+			<language type="kiu">किर्मान्जकी</language>
+			<language type="kj">कुआन्यामा</language>
 			<language type="kk">काजाख</language>
+			<language type="kkj">काको</language>
 			<language type="kl">कालालिसुट</language>
 			<language type="kln">कालेन्जिन</language>
 			<language type="km">खमेर</language>
+			<language type="kmb">किम्बुन्डु</language>
 			<language type="kn">कन्नाडा</language>
 			<language type="ko">कोरियाली</language>
 			<language type="koi">कोमी-पर्म्याक</language>
 			<language type="kok">कोन्कानी</language>
-			<language type="ks">काश्मीरी</language>
+			<language type="kos">कोस्राली</language>
+			<language type="kpe">क्पेल्ले</language>
+			<language type="kr">कानुरी</language>
+			<language type="krc">काराचाय-बाल्कर</language>
+			<language type="kri">क्रिओ</language>
+			<language type="krj">किनाराय-ए</language>
+			<language type="krl">कारेलियाली</language>
+			<language type="kru">कुरुख</language>
+			<language type="ks">कास्मिरी</language>
 			<language type="ksb">शाम्बाला</language>
 			<language type="ksf">बाफिया</language>
-			<language type="ku">कुर्दिश</language>
-			<language type="kw">कोर्निश</language>
+			<language type="ksh">कोलोग्नियाली</language>
+			<language type="ku">कुर्दी</language>
+			<language type="kum">कुमिक</language>
+			<language type="kut">कुतेनाइ</language>
+			<language type="kv">कोमी</language>
+			<language type="kw">कोर्निस</language>
 			<language type="ky">किर्गिज</language>
 			<language type="la">ल्याटिन</language>
+			<language type="lad">लाडिनो</language>
 			<language type="lag">लाङ्गी</language>
-			<language type="lb">लक्जेम्बर्गिस</language>
+			<language type="lah">लाहन्डा</language>
+			<language type="lam">लाम्बा</language>
+			<language type="lb">लक्जेम्बर्गी</language>
+			<language type="lez">लाज्घियाली</language>
+			<language type="lfn">लिङ्गुवा फ्राङ्का नोभा</language>
 			<language type="lg">गान्डा</language>
-			<language type="lkt">लोकोता</language>
-			<language type="ln">लिंगाला</language>
+			<language type="li">लिम्बुर्गी</language>
+			<language type="lij">लिगुरियाली</language>
+			<language type="liv">लिभोनियाली</language>
+			<language type="lkt">लाकोता</language>
+			<language type="lmo">लोम्बार्ड</language>
+			<language type="ln">लिङ्गाला</language>
 			<language type="lo">लाओ</language>
+			<language type="lol">मोङ्गो</language>
+			<language type="loz">लोजी</language>
+			<language type="lrc">उत्तरी लुरी</language>
 			<language type="lt">लिथुआनियाली</language>
+			<language type="ltg">लाट्गाली</language>
 			<language type="lu">लुबा-काताङ्गा</language>
+			<language type="lua">लुबा-लुलुआ</language>
+			<language type="lui">लुइसेनो</language>
+			<language type="lun">लुन्डा</language>
 			<language type="luo">लुओ</language>
+			<language type="lus">मिजो</language>
 			<language type="luy">लुइया</language>
 			<language type="lv">लात्भियाली</language>
-			<language type="mas">मासाल</language>
+			<language type="lzh">साहित्यिक चिनियाँ</language>
+			<language type="lzz">लाज</language>
+			<language type="mad">मादुरेसे</language>
+			<language type="maf">माफा</language>
+			<language type="mag">मगधी</language>
+			<language type="mai">मैथिली</language>
+			<language type="mak">माकासार</language>
+			<language type="man">मान्दिङो</language>
+			<language type="mas">मसाई</language>
+			<language type="mde">माबा</language>
+			<language type="mdf">मोक्ष</language>
+			<language type="mdr">मन्दर</language>
+			<language type="men">मेन्डे</language>
 			<language type="mer">मेरू</language>
 			<language type="mfe">मोरिसेन</language>
 			<language type="mg">मलागासी</language>
+			<language type="mga">मध्य आयरिस</language>
 			<language type="mgh">माखुवा-मिट्टो</language>
 			<language type="mgo">मेटा</language>
+			<language type="mh">मार्साली</language>
 			<language type="mi">माओरी</language>
-			<language type="mk">म्याकेडोनियन</language>
+			<language type="mic">मिकमाक</language>
+			<language type="min">मिनाङकाबाउ</language>
+			<language type="mk">म्यासेडोनियाली</language>
 			<language type="ml">मलयालम</language>
-			<language type="mn">मंगोल</language>
+			<language type="mn">मङ्गोलियाली</language>
+			<language type="mnc">मान्चु</language>
+			<language type="mni">मनिपुरी</language>
 			<language type="moh">मोहक</language>
+			<language type="mos">मोस्सी</language>
 			<language type="mr">मराठी</language>
-			<language type="ms">मलाया</language>
+			<language type="ms">मलाय</language>
 			<language type="mt">माल्टिज</language>
 			<language type="mua">मुन्डाङ</language>
-			<language type="my">वर्मेली</language>
+			<language type="mul">बहुभाषा</language>
+			<language type="mus">क्रिक</language>
+			<language type="mwl">मिरान्डी</language>
+			<language type="mwr">माडवारी</language>
+			<language type="mwv">मेन्टावाई</language>
+			<language type="my">बर्मेली</language>
+			<language type="mye">म्येने</language>
+			<language type="myv">इर्ज्या</language>
+			<language type="mzn">मजानडेरानी</language>
+			<language type="na">नाउरू</language>
+			<language type="nan">मिन नान चिनियाँ</language>
+			<language type="nap">नेपोलिटान</language>
 			<language type="naq">नामा</language>
 			<language type="nb">नर्वेली बोकमाल</language>
-			<language type="nd">उत्तर नेडेबेले</language>
+			<language type="nd">उत्तरी न्डेबेले</language>
+			<language type="nds">तल्लो जर्मन</language>
+			<language type="nds_NL">तल्लो साक्सन</language>
 			<language type="ne">नेपाली</language>
+			<language type="new">नेवारी</language>
+			<language type="ng">न्दोन्गा</language>
+			<language type="nia">नियास</language>
+			<language type="niu">निउएन</language>
+			<language type="njo">अओ नागा</language>
 			<language type="nl">डच</language>
-			<language type="nl_BE">फ्लेमिश</language>
+			<language type="nl_BE">फ्लेमिस</language>
 			<language type="nmg">क्वासियो</language>
 			<language type="nn">नर्वेली नाइनोर्स्क</language>
-			<language type="no" draft="unconfirmed">नर्वेजियाली</language>
+			<language type="nnh">न्गिएम्बुन</language>
+			<language type="no">नर्वेली</language>
+			<language type="nog">नोगाइ</language>
+			<language type="non">पुरानो नोर्से</language>
+			<language type="nov">नोभियल</language>
 			<language type="nqo">नको</language>
+			<language type="nso">उत्तरी सोथो</language>
 			<language type="nus">नुएर</language>
+			<language type="nv">नाभाजो</language>
+			<language type="nwc">परम्परागत नेवारी</language>
+			<language type="ny">न्यान्जा</language>
+			<language type="nym">न्यामवेजी</language>
 			<language type="nyn">न्यान्कोल</language>
-			<language type="oc" draft="unconfirmed">अक्सिटन</language>
+			<language type="nyo">न्योरो</language>
+			<language type="nzi">नजिमा</language>
+			<language type="oc">अक्सिटन</language>
+			<language type="oj">ओजिब्वा</language>
 			<language type="om">ओरोमो</language>
-			<language type="or">ओरिया</language>
+			<language type="or">उडिया</language>
+			<language type="os">अोस्सेटिक</language>
+			<language type="osa">ओसागे</language>
+			<language type="ota">अटोमन तुर्की</language>
 			<language type="pa">पंजाबी</language>
-			<language type="pl">पोलिश</language>
-			<language type="ps">पाश्तो</language>
+			<language type="pag">पाङ्गासिनान</language>
+			<language type="pal">पाहलावी</language>
+			<language type="pam">पामपाङ्गा</language>
+			<language type="pap">पापियामेन्तो</language>
+			<language type="pau">पालाउवाली</language>
+			<language type="pcd">पिकार्ड</language>
+			<language type="pdc">पेन्सिलभानियाली जर्मन</language>
+			<language type="peo">पुरातन फारसी</language>
+			<language type="pfl">पालाटिन जर्मन</language>
+			<language type="phn">फोनिसियाली</language>
+			<language type="pi">पाली</language>
+			<language type="pl">पोलिस</language>
+			<language type="pms">पिएडमोन्तेसे</language>
+			<language type="pnt">पोन्टिक</language>
+			<language type="pro">पुरातन प्रोभेन्काल</language>
+			<language type="ps">पास्तो</language>
 			<language type="pt">पोर्तुगी</language>
-			<language type="pt_PT">पोर्तुगी (युरोप)</language>
+			<language type="pt_BR">ब्राजिली पोर्तुगी</language>
+			<language type="pt_PT">युरोपेली पोर्तुगी</language>
 			<language type="qu">क्वेचुवा</language>
 			<language type="quc">किचे</language>
-			<language type="rm">रोमानिश</language>
-			<language type="rn">रूण्डी</language>
+			<language type="qug">चिम्बोराजो उच्चस्थान किचुआ</language>
+			<language type="raj">राजस्थानी</language>
+			<language type="rm">रोमानिस</language>
+			<language type="rn">रुन्डी</language>
 			<language type="ro">रोमानियाली</language>
 			<language type="ro_MD">माल्डाभियन</language>
 			<language type="rof">रोम्बो</language>
 			<language type="ru">रूसी</language>
+			<language type="rup">अरोमानीयाली</language>
 			<language type="rw">किन्यारवान्डा</language>
 			<language type="rwk">र्‌वा</language>
 			<language type="sa">संस्कृत</language>
 			<language type="saq">साम्बुरू</language>
+			<language type="sat">सान्ताली</language>
+			<language type="sba">न्गामबाय</language>
 			<language type="sbp">साङ्गु</language>
 			<language type="sd">सिन्धी</language>
+			<language type="sdh">दक्षिणी कुर्दिश</language>
 			<language type="se">उत्तरी सामी</language>
 			<language type="seh">सेना</language>
 			<language type="ses">कोयराबोरो सेन्नी</language>
 			<language type="sg">साङ्गो</language>
+			<language type="sga">पुरातन आयरीस</language>
 			<language type="shi">टाचेल्हिट</language>
-			<language type="si">सिन्हाला</language>
+			<language type="shu">चाड अरबी</language>
+			<language type="si">सिन्हाली</language>
 			<language type="sk">स्लोभाकियाली</language>
 			<language type="sl">स्लोभेनियाली</language>
+			<language type="sli">तल्लो सिलेसियाली</language>
 			<language type="sma">दक्षिणी सामी</language>
 			<language type="smj">लुले सामी</language>
 			<language type="smn">इनारी सामी</language>
 			<language type="sms">स्कोइट सामी</language>
 			<language type="sn">शोना</language>
 			<language type="so">सोमाली</language>
-			<language type="sq">अल्बेनियन</language>
+			<language type="sq">अल्बानियाली</language>
 			<language type="sr">सर्बियाली</language>
-			<language type="su">सुडानी</language>
-			<language type="sv">स्विडिश</language>
+			<language type="srn">स्रानान टोङ्गो</language>
+			<language type="ss">स्वाती</language>
+			<language type="suk">सुकुमा</language>
+			<language type="sus">सुसू</language>
+			<language type="sux">सुमेरियाली</language>
+			<language type="sv">स्विडिस</language>
 			<language type="sw">स्वाहिली</language>
-			<language type="swc">कोङ्गो स्वाहिली</language>
+			<language type="sw_CD">कङ्गो स्वाहिली</language>
+			<language type="swb">कोमोरी</language>
+			<language type="syc">परम्परागत सिरियाक</language>
+			<language type="syr">सिरियाक</language>
 			<language type="ta">तामिल</language>
 			<language type="te">तेलुगु</language>
 			<language type="teo">टेसो</language>
@@ -214,10 +497,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="th">थाई</language>
 			<language type="ti">तिग्रीन्या</language>
 			<language type="tk">टर्कमेन</language>
-			<language type="tlh" draft="unconfirmed">क्लिङ्गन</language>
+			<language type="tlh">क्लिङ्गन</language>
 			<language type="to">टोङ्गन</language>
+			<language type="tog">न्यास टोङ्गा</language>
 			<language type="tr">टर्किश</language>
 			<language type="tt">तातार</language>
+			<language type="ttt">मुस्लिम टाट</language>
 			<language type="twq">तासावाक</language>
 			<language type="tzm">केन्द्रीय एट्लास टामाजिघट</language>
 			<language type="ug">उइघुर</language>
@@ -227,12 +512,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="uz">उज्बेकी</language>
 			<language type="vai">भाइ</language>
 			<language type="vi">भियतनामी</language>
+			<language type="vmf">मुख्य-फ्राङ्कोनियाली</language>
 			<language type="vun">भुन्जो</language>
+			<language type="wbp">वार्ल्पिरी</language>
 			<language type="wo">वुलुफ</language>
+			<language type="xal">काल्मिक</language>
 			<language type="xh">खोसा</language>
+			<language type="xmf">मिनग्रेलियाली</language>
 			<language type="xog">सोगा</language>
-			<language type="yi" draft="unconfirmed">यिद्दिस</language>
+			<language type="yi">यिद्दिस</language>
 			<language type="yo">योरूवा</language>
+			<language type="yrl">न्हिनगातु</language>
+			<language type="yue">कान्टोनियाली</language>
+			<language type="zbl">ब्लिससिम्बोल्स</language>
 			<language type="zgh">मानक मोरोक्कोन तामाजिघट</language>
 			<language type="zh">चिनियाँ</language>
 			<language type="zh_Hans">सरलिकृत चिनियाँ</language>
@@ -242,128 +534,127 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</languages>
 		<scripts>
 			<script type="Arab">अरबी</script>
-			<script type="Armi" draft="contributed">आर्मी</script>
+			<script type="Armi">आर्मी</script>
 			<script type="Armn">आर्मेनियाली</script>
-			<script type="Avst" draft="contributed">आभेस्टान</script>
-			<script type="Bali" draft="contributed">बाली</script>
-			<script type="Batk" draft="contributed">बाटक</script>
+			<script type="Avst">आभेस्टान</script>
+			<script type="Bali">बाली</script>
+			<script type="Batk">बाटक</script>
 			<script type="Beng">बङ्गाली</script>
-			<script type="Blis" draft="contributed">ब्लिजसिम्बोल्स</script>
+			<script type="Blis">ब्लिजसिम्बोल्स</script>
 			<script type="Bopo">बोपोमोफो</script>
-			<script type="Brah" draft="contributed">ब्राह्मी</script>
+			<script type="Brah">ब्राह्मी</script>
 			<script type="Brai">ब्रेल</script>
-			<script type="Bugi" draft="contributed">बुगिनिज</script>
-			<script type="Buhd" draft="contributed">बुहिद</script>
-			<script type="Cakm" draft="contributed">काक्म्</script>
-			<script type="Cari" draft="contributed">कारियन</script>
-			<script type="Cham" draft="contributed">चाम</script>
-			<script type="Cher" draft="contributed">चेरोकी</script>
-			<script type="Cirt" draft="contributed">किर्थ</script>
-			<script type="Copt" draft="contributed">कप्टिक</script>
-			<script type="Cprt" draft="contributed">कप्रियट</script>
+			<script type="Bugi">बुगिनिज</script>
+			<script type="Buhd">बुहिद</script>
+			<script type="Cakm">काक्म्</script>
+			<script type="Cari">कारियन</script>
+			<script type="Cham">चाम</script>
+			<script type="Cher">चेरोकी</script>
+			<script type="Cirt">किर्थ</script>
+			<script type="Copt">कप्टिक</script>
+			<script type="Cprt">कप्रियट</script>
 			<script type="Cyrl">सिरिलिक</script>
 			<script type="Deva">देवानागरी</script>
-			<script type="Dsrt" draft="contributed">डेसेरेट</script>
-			<script type="Egyd" draft="contributed">इजिप्टियन डेमोटिक</script>
-			<script type="Egyh" draft="contributed">इजिप्टियन हाइरटिक</script>
-			<script type="Egyp" draft="contributed">इजिप्टियन हाइरोग्लिफ्स</script>
+			<script type="Dsrt">डेसेरेट</script>
+			<script type="Egyd">इजिप्टियन डेमोटिक</script>
+			<script type="Egyh">इजिप्टियन हाइरटिक</script>
+			<script type="Egyp">इजिप्टियन हाइरोग्लिफ्स</script>
 			<script type="Ethi">इथियोपिक</script>
-			<script type="Geok" draft="contributed">ग्रुजियाली खुट्सुरी</script>
+			<script type="Geok">ग्रुजियाली खुट्सुरी</script>
 			<script type="Geor">जोर्जियन</script>
-			<script type="Glag" draft="contributed">ग्लागोलिटिक</script>
-			<script type="Goth" draft="contributed">गोथिक</script>
+			<script type="Glag">ग्लागोलिटिक</script>
+			<script type="Goth">गोथिक</script>
 			<script type="Grek">ग्रीक</script>
 			<script type="Gujr">गुजराती</script>
 			<script type="Guru">गुरूमुखी</script>
 			<script type="Hang">हान्गुल</script>
 			<script type="Hani">हान</script>
-			<script type="Hano" draft="contributed">हानुनु</script>
+			<script type="Hano">हानुनु</script>
 			<script type="Hans">सरलिकृत चिनी</script>
 			<script type="Hans" alt="stand-alone">सरलिकृत चिनी</script>
 			<script type="Hant">परम्परागत चिनी</script>
 			<script type="Hant" alt="stand-alone">परम्परागत चिनी</script>
 			<script type="Hebr">हिब्रु</script>
 			<script type="Hira">हिरागना</script>
-			<script type="Hmng" draft="contributed">पहावह हमोङ्ग</script>
-			<script type="Hrkt" draft="contributed">काताकाना वा हिरागाना</script>
-			<script type="Hung" draft="contributed">पुरानो हङ्गेरियाली</script>
+			<script type="Hmng">पहावह हमोङ्ग</script>
+			<script type="Hrkt">काताकाना वा हिरागाना</script>
+			<script type="Hung">पुरानो हङ्गेरियाली</script>
 			<script type="Inds" draft="contributed">इन्दुस</script>
-			<script type="Ital" draft="contributed">पुरानो इटालिक</script>
-			<script type="Java" draft="contributed">जाभानी</script>
+			<script type="Ital">पुरानो इटालिक</script>
+			<script type="Java">जाभानी</script>
 			<script type="Jpan">जापानी</script>
-			<script type="Kali" draft="contributed">कायाहली</script>
+			<script type="Kali">कायाहली</script>
 			<script type="Kana">काताकाना</script>
-			<script type="Khar" draft="contributed">खारोस्थिति</script>
+			<script type="Khar">खारोस्थिति</script>
 			<script type="Khmr">खमेर</script>
 			<script type="Knda">कान्नाडा</script>
 			<script type="Kore">कोरियन</script>
-			<script type="Kthi" draft="contributed">क्थी</script>
-			<script type="Lana" draft="contributed">लान्ना</script>
+			<script type="Kthi">क्थी</script>
+			<script type="Lana">लान्ना</script>
 			<script type="Laoo">लाओ</script>
-			<script type="Latf" draft="contributed">फ्राक्टुर ल्याटिन</script>
-			<script type="Latg" draft="contributed">ग्यालिक ल्याटिन</script>
+			<script type="Latf">फ्राक्टुर ल्याटिन</script>
+			<script type="Latg">ग्यालिक ल्याटिन</script>
 			<script type="Latn">ल्याटिन</script>
-			<script type="Lepc" draft="contributed">लेप्चा</script>
-			<script type="Limb" draft="contributed">लिम्बु</script>
-			<script type="Lyci" draft="contributed">लाइसियन</script>
-			<script type="Lydi" draft="contributed">लाइडियन</script>
-			<script type="Mand" draft="contributed">मान्डाएन</script>
-			<script type="Mani" draft="contributed">मानिकाएन</script>
-			<script type="Maya" draft="contributed">माया हाइरोग्लिफ्स</script>
-			<script type="Mero" draft="contributed">मेरियोटिक</script>
+			<script type="Lepc">लेप्चा</script>
+			<script type="Limb">लिम्बु</script>
+			<script type="Lyci">लाइसियन</script>
+			<script type="Lydi">लाइडियन</script>
+			<script type="Mand">मान्डाएन</script>
+			<script type="Mani">मानिकाएन</script>
+			<script type="Maya">माया हाइरोग्लिफ्स</script>
+			<script type="Mero">मेरियोटिक</script>
 			<script type="Mlym">मलायालम</script>
 			<script type="Mong">मङ्गोल</script>
-			<script type="Moon" draft="contributed">जून</script>
-			<script type="Mtei" draft="contributed">माइटेइ मायेक</script>
+			<script type="Moon">जून</script>
+			<script type="Mtei">माइटेइ मायेक</script>
 			<script type="Mymr">म्यान्मार</script>
-			<script type="Nkoo" draft="contributed">एन्को</script>
-			<script type="Ogam" draft="contributed">ओघाम</script>
-			<script type="Olck" draft="contributed">ओलचिकी</script>
-			<script type="Orkh" draft="contributed">ओर्खोन</script>
+			<script type="Nkoo">एन्को</script>
+			<script type="Ogam">ओघाम</script>
+			<script type="Olck">ओलचिकी</script>
+			<script type="Orkh">ओर्खोन</script>
 			<script type="Orya">ओडिया</script>
-			<script type="Osma" draft="contributed">ओस्मान्या</script>
-			<script type="Perm" draft="contributed">पुरानो पर्मिक</script>
-			<script type="Phag" draft="contributed">फाग्स-पा</script>
-			<script type="Phli" draft="contributed">फ्लि</script>
-			<script type="Phlp" draft="contributed">फ्ल्प</script>
-			<script type="Phlv" draft="contributed">बुक पहल्भी</script>
-			<script type="Phnx" draft="contributed">फोनिसियन</script>
-			<script type="Plrd" draft="contributed">पोल्लार्ड फोनेटिक</script>
-			<script type="Prti" draft="contributed">पिआरटी</script>
-			<script type="Rjng" draft="contributed">रेजाङ</script>
-			<script type="Roro" draft="contributed">रोङ्गोरोङ्गो</script>
-			<script type="Runr" draft="contributed">रूनिक</script>
-			<script type="Samr" draft="contributed">समारिटन</script>
-			<script type="Sara" draft="contributed">सारती</script>
-			<script type="Saur" draft="contributed">सौराष्ट्र</script>
-			<script type="Sgnw" draft="contributed">साइनराइटिङ</script>
-			<script type="Shaw" draft="contributed">शाभियन</script>
+			<script type="Osma">ओस्मान्या</script>
+			<script type="Perm">पुरानो पर्मिक</script>
+			<script type="Phag">फाग्स-पा</script>
+			<script type="Phli">फ्लि</script>
+			<script type="Phlp">फ्ल्प</script>
+			<script type="Phlv">बुक पहल्भी</script>
+			<script type="Phnx">फोनिसियन</script>
+			<script type="Plrd">पोल्लार्ड फोनेटिक</script>
+			<script type="Prti">पिआरटी</script>
+			<script type="Rjng">रेजाङ</script>
+			<script type="Roro">रोङ्गोरोङ्गो</script>
+			<script type="Runr">रूनिक</script>
+			<script type="Samr">समारिटन</script>
+			<script type="Sara">सारती</script>
+			<script type="Saur">सौराष्ट्र</script>
+			<script type="Sgnw">साइनराइटिङ</script>
+			<script type="Shaw">शाभियन</script>
 			<script type="Sinh">सिन्हाला</script>
-			<script type="Sund" draft="contributed">सुडानी</script>
-			<script type="Sylo" draft="contributed">स्ल्योटी नाग्री</script>
-			<script type="Syrc" draft="contributed">सिरियाक</script>
-			<script type="Syre" draft="contributed">इस्ट्रेनजेलो सिरियाक</script>
-			<script type="Syrj" draft="contributed">पश्चिमी सिरियाक</script>
-			<script type="Syrn" draft="contributed">पूर्वी सिरियाक</script>
-			<script type="Tagb" draft="contributed">टाग्वान्वा</script>
-			<script type="Tale" draft="contributed">टाइले</script>
-			<script type="Talu" draft="contributed">न्यू टाइ लुइ</script>
+			<script type="Sylo">स्ल्योटी नाग्री</script>
+			<script type="Syrc">सिरियाक</script>
+			<script type="Syre">इस्ट्रेनजेलो सिरियाक</script>
+			<script type="Syrj">पश्चिमी सिरियाक</script>
+			<script type="Syrn">पूर्वी सिरियाक</script>
+			<script type="Tagb">टाग्वान्वा</script>
+			<script type="Tale">टाइले</script>
+			<script type="Talu">न्यू टाइ लुइ</script>
 			<script type="Taml">तामिल</script>
-			<script type="Tavt" draft="contributed">टाभ्ट</script>
-			<script type="Telu">तेलेगु</script>
-			<script type="Teng" draft="contributed">टेङ्वार</script>
-			<script type="Tfng" draft="contributed">टिफिनाघ</script>
-			<script type="Tglg" draft="contributed">टागालोग</script>
+			<script type="Tavt">टाभ्ट</script>
+			<script type="Telu">तेलुगु</script>
+			<script type="Teng">टेङ्वार</script>
+			<script type="Tfng">टिफिनाघ</script>
+			<script type="Tglg">टागालोग</script>
 			<script type="Thaa">थाना</script>
 			<script type="Thai">थाई</script>
 			<script type="Tibt">तिब्बती</script>
-			<script type="Ugar" draft="contributed">युगारिटिक</script>
-			<script type="Vaii" draft="contributed">भाइ</script>
-			<script type="Visp" draft="contributed">दृश्यमय वाणी</script>
-			<script type="Xpeo" draft="contributed">पुरानो पर्सियन</script>
-			<script type="Yiii" draft="contributed">यी</script>
-			<script type="Zinh" draft="contributed">इन्हेरिटेड</script>
-			<script type="Zmth" draft="contributed">जमथ</script>
+			<script type="Ugar">युगारिटिक</script>
+			<script type="Vaii">भाइ</script>
+			<script type="Visp">दृश्यमय वाणी</script>
+			<script type="Xpeo">पुरानो पर्सियन</script>
+			<script type="Yiii">यी</script>
+			<script type="Zinh">इन्हेरिटेड</script>
+			<script type="Zmth">जमथ</script>
 			<script type="Zsym">प्रतीकहरू</script>
 			<script type="Zxxx">नलेखिएको</script>
 			<script type="Zyyy">साझा</script>
@@ -408,7 +699,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">आङ्गुइला</territory>
 			<territory type="AL">अल्बानिया</territory>
 			<territory type="AM">आर्मेनिया</territory>
-			<territory type="AN" draft="contributed">नेदरल्याण्ड्स एण्टिलिस</territory>
 			<territory type="AO">अङ्गोला</territory>
 			<territory type="AQ">अन्टारतिका</territory>
 			<territory type="AR">अर्जेन्टिना</territory>
@@ -679,66 +969,79 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="calendar">पात्रो</key>
 			<key type="collation">क्रमबद्ध सुची</key>
 			<key type="currency">मुद्रा</key>
+			<key type="hc">hc</key>
+			<key type="lb">lb</key>
+			<key type="ms">मापन प्रणाली</key>
 			<key type="numbers">अङ्कहरू</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">अरबी भारतीय अङ्कहरू</type>
-			<type type="arabext" key="numbers">विस्तृत अरबी भारतीय अङ्कहरू</type>
-			<type type="armn" key="numbers">आर्मेनियाली अङ्कहरू</type>
-			<type type="armnlow" key="numbers">आर्मनियाली साना अङ्कहरू</type>
-			<type type="beng" key="numbers">बङ्गाली अङ्कहरू</type>
-			<type type="big5han" key="collation" draft="contributed">परम्परागत चिनिँया क्रमबद्धता पद्दति - बिग फाइभ</type>
-			<type type="buddhist" key="calendar">बुद्धिष्ट पात्रो</type>
-			<type type="chinese" key="calendar">चिनिँया पात्रो</type>
-			<type type="dangi" key="calendar">डाङ्गी पात्रो</type>
-			<type type="deva" key="numbers">देवनागरी अङ्कहरू</type>
-			<type type="ducet" key="collation">पूर्वनिर्धारित युनिकोड क्रमबद्ध सूची</type>
-			<type type="ethi" key="numbers">इथियोपाली अङ्कहरू</type>
-			<type type="ethiopic" key="calendar">इथिओपिक पात्रो</type>
-			<type type="fullwide" key="numbers">पुरा चौडाईका अङ्कहरू</type>
-			<type type="gb2312han" key="collation" draft="contributed">सरलिकृत चिनियाँ क्रमबद्धता पद्दति-गीबीटुथ्रीवानटु</type>
-			<type type="geor" key="numbers">जर्जियाली अङ्कहरू</type>
-			<type type="gregorian" key="calendar">ग्रेगोरियन पात्रो</type>
-			<type type="grek" key="numbers">ग्रीक अङ्कहरू</type>
-			<type type="greklow" key="numbers">ग्रीक साना अङ्कहरू</type>
-			<type type="gujr" key="numbers">गुजराती अङ्कहरू</type>
-			<type type="guru" key="numbers">गुरूमुखी अङ्कहरू</type>
-			<type type="hanidec" key="numbers">चिनियाँ दशमलव अङ्कहरू</type>
-			<type type="hans" key="numbers">सरलिकृत चिनियाँ अङ्कहरू</type>
-			<type type="hansfin" key="numbers">सरलिकृत चिनियाँ वित्तीय अङ्कहरू</type>
-			<type type="hant" key="numbers">परम्परागत चिनियाँ अङ्कहरू</type>
-			<type type="hantfin" key="numbers">परम्परागत चिनियाँ वित्तीय अङ्कहरू</type>
-			<type type="hebr" key="numbers">हिब्रु अङ्कहरू</type>
-			<type type="hebrew" key="calendar">हिब्रु पात्रो</type>
-			<type type="indian" key="calendar" draft="contributed">भारतीय राष्ट्रिय पात्रो</type>
-			<type type="islamic" key="calendar">इस्लामी पात्रो</type>
-			<type type="islamic-civil" key="calendar" draft="contributed">इस्लामी नागरिक पात्रो</type>
-			<type type="iso8601" key="calendar">iso8601</type>
-			<type type="japanese" key="calendar">जापानी पात्रो</type>
-			<type type="jpan" key="numbers">जापानी अङ्कहरू</type>
-			<type type="jpanfin" key="numbers">जापानी वित्तीय अङ्कहरू</type>
-			<type type="khmr" key="numbers">खमेर अङ्कहरू</type>
-			<type type="knda" key="numbers">कन्नाडा अङ्कहरू</type>
-			<type type="laoo" key="numbers">लाओ अङ्कहरू</type>
-			<type type="latn" key="numbers">पश्चिमी अङ्कहरू</type>
-			<type type="mlym" key="numbers">मलायलम अङ्कहरू</type>
-			<type type="mymr" key="numbers">म्यान्मारका अङ्कहरू</type>
-			<type type="orya" key="numbers">ओरिया अङ्कहरू</type>
-			<type type="persian" key="calendar">फारसी पात्रो</type>
-			<type type="phonebook" key="collation" draft="contributed">टेलिफोन पुस्तिका क्रमबद्धतापद्दति</type>
-			<type type="pinyin" key="collation" draft="contributed">पिनयिन क्रमबद्धता पद्दति</type>
-			<type type="roc" key="calendar">चिनिँया गणतन्त्र पात्रो</type>
-			<type type="roman" key="numbers">रोमन अङ्कहरू</type>
-			<type type="romanlow" key="numbers">रोमन साना केसका अङ्कहरू</type>
-			<type type="search" key="collation">सामान्य खोजी</type>
-			<type type="standard" key="collation">स्तर</type>
-			<type type="stroke" key="collation" draft="contributed">स्ट्रोक क्रमबद्धता पद्दति</type>
-			<type type="taml" key="numbers">परम्परागत तामिल अङ्कहरू</type>
-			<type type="tamldec" key="numbers">तामिल अङ्कहरू</type>
-			<type type="telu" key="numbers">तेलेगु अङ्कहरू</type>
-			<type type="thai" key="numbers">थाई अङ्कहरू</type>
-			<type type="tibt" key="numbers">तिब्बती अङ्कहरू</type>
-			<type type="traditional" key="collation" draft="contributed">परम्परागत क्रमबद्धता पद्दति</type>
+			<type key="calendar" type="buddhist">बुद्धिष्ट पात्रो</type>
+			<type key="calendar" type="chinese">चिनिँया पात्रो</type>
+			<type key="calendar" type="dangi">डाङ्गी पात्रो</type>
+			<type key="calendar" type="ethiopic">इथिओपिक पात्रो</type>
+			<type key="calendar" type="gregorian">ग्रेगोरियन पात्रो</type>
+			<type key="calendar" type="hebrew">हिब्रु पात्रो</type>
+			<type key="calendar" type="indian" draft="contributed">भारतीय राष्ट्रिय पात्रो</type>
+			<type key="calendar" type="islamic">इस्लामी पात्रो</type>
+			<type key="calendar" type="islamic-civil" draft="contributed">इस्लामी नागरिक पात्रो</type>
+			<type key="calendar" type="iso8601">iso8601</type>
+			<type key="calendar" type="japanese">जापानी पात्रो</type>
+			<type key="calendar" type="persian">फारसी पात्रो</type>
+			<type key="calendar" type="roc">चिनिँया गणतन्त्र पात्रो</type>
+			<type key="collation" type="big5han" draft="contributed">परम्परागत चिनिँया क्रमबद्धता पद्दति - बिग फाइभ</type>
+			<type key="collation" type="ducet">पूर्वनिर्धारित युनिकोड क्रमबद्ध सूची</type>
+			<type key="collation" type="gb2312han" draft="contributed">सरलिकृत चिनियाँ क्रमबद्धता पद्दति-गीबीटुथ्रीवानटु</type>
+			<type key="collation" type="phonebook" draft="contributed">टेलिफोन पुस्तिका क्रमबद्धतापद्दति</type>
+			<type key="collation" type="pinyin" draft="contributed">पिनयिन क्रमबद्धता पद्दति</type>
+			<type key="collation" type="search">सामान्य खोजी</type>
+			<type key="collation" type="standard">स्तर</type>
+			<type key="collation" type="stroke" draft="contributed">स्ट्रोक क्रमबद्धता पद्दति</type>
+			<type key="collation" type="traditional" draft="contributed">परम्परागत क्रमबद्धता पद्दति</type>
+			<type key="hc" type="h11">h11</type>
+			<type key="hc" type="h12">h12</type>
+			<type key="hc" type="h23">h23</type>
+			<type key="hc" type="h24">h24</type>
+			<type key="lb" type="loose">loose</type>
+			<type key="lb" type="normal">normal</type>
+			<type key="lb" type="strict">strict</type>
+			<type key="ms" type="metric">मेट्रिक प्रणाली</type>
+			<type key="ms" type="uksystem">इम्पेरियल मापन प्रणाली</type>
+			<type key="ms" type="ussystem">संयुक्त राज्य मापन प्रणाली</type>
+			<type key="numbers" type="arab">अरबी भारतीय अङ्कहरू</type>
+			<type key="numbers" type="arabext">विस्तृत अरबी भारतीय अङ्कहरू</type>
+			<type key="numbers" type="armn">आर्मेनियाली अङ्कहरू</type>
+			<type key="numbers" type="armnlow">आर्मनियाली साना अङ्कहरू</type>
+			<type key="numbers" type="beng">बङ्गाली अङ्कहरू</type>
+			<type key="numbers" type="deva">देवनागरी अङ्कहरू</type>
+			<type key="numbers" type="ethi">इथियोपाली अङ्कहरू</type>
+			<type key="numbers" type="fullwide">पुरा चौडाईका अङ्कहरू</type>
+			<type key="numbers" type="geor">जर्जियाली अङ्कहरू</type>
+			<type key="numbers" type="grek">ग्रीक अङ्कहरू</type>
+			<type key="numbers" type="greklow">ग्रीक साना अङ्कहरू</type>
+			<type key="numbers" type="gujr">गुजराती अङ्कहरू</type>
+			<type key="numbers" type="guru">गुरूमुखी अङ्कहरू</type>
+			<type key="numbers" type="hanidec">चिनियाँ दशमलव अङ्कहरू</type>
+			<type key="numbers" type="hans">सरलिकृत चिनियाँ अङ्कहरू</type>
+			<type key="numbers" type="hansfin">सरलिकृत चिनियाँ वित्तीय अङ्कहरू</type>
+			<type key="numbers" type="hant">परम्परागत चिनियाँ अङ्कहरू</type>
+			<type key="numbers" type="hantfin">परम्परागत चिनियाँ वित्तीय अङ्कहरू</type>
+			<type key="numbers" type="hebr">हिब्रु अङ्कहरू</type>
+			<type key="numbers" type="jpan">जापानी अङ्कहरू</type>
+			<type key="numbers" type="jpanfin">जापानी वित्तीय अङ्कहरू</type>
+			<type key="numbers" type="khmr">खमेर अङ्कहरू</type>
+			<type key="numbers" type="knda">कन्नाडा अङ्कहरू</type>
+			<type key="numbers" type="laoo">लाओ अङ्कहरू</type>
+			<type key="numbers" type="latn">पश्चिमी अङ्कहरू</type>
+			<type key="numbers" type="mlym">मलायलम अङ्कहरू</type>
+			<type key="numbers" type="mymr">म्यान्मारका अङ्कहरू</type>
+			<type key="numbers" type="orya">ओरिया अङ्कहरू</type>
+			<type key="numbers" type="roman">रोमन अङ्कहरू</type>
+			<type key="numbers" type="romanlow">रोमन साना केसका अङ्कहरू</type>
+			<type key="numbers" type="taml">परम्परागत तामिल अङ्कहरू</type>
+			<type key="numbers" type="tamldec">तामिल अङ्कहरू</type>
+			<type key="numbers" type="telu">तेलेगु अङ्कहरू</type>
+			<type key="numbers" type="thai">थाई अङ्कहरू</type>
+			<type key="numbers" type="tibt">तिब्बती अङ्कहरू</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">मेट्रिक</measurementSystemName>
@@ -746,9 +1049,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<measurementSystemName type="US">संयु्क्त राज्य</measurementSystemName>
 		</measurementSystemNames>
 		<codePatterns>
-			<codePattern type="language">{0}</codePattern>
-			<codePattern type="script">{0}</codePattern>
-			<codePattern type="territory">{0}</codePattern>
+			<codePattern type="language">भाषा: {0}</codePattern>
+			<codePattern type="script">लिपि: {0}</codePattern>
+			<codePattern type="territory">क्षेत्र: {0}</codePattern>
 		</codePatterns>
 	</localeDisplayNames>
 	<characters>
@@ -757,6 +1060,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<exemplarCharacters type="index" draft="unconfirmed">[अ आ इ ई उ ऊ ऋ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल व श ष स ह]</exemplarCharacters>
 		<ellipsis type="final">{0}…</ellipsis>
 		<ellipsis type="initial">…{0}</ellipsis>
+		<ellipsis type="medial">{0}…{1}</ellipsis>
 		<ellipsis type="word-final">{0} …</ellipsis>
 		<ellipsis type="word-initial">… {0}</ellipsis>
 		<ellipsis type="word-medial">{0} … {1}</ellipsis>
@@ -816,6 +1120,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d, E</dateFormatItem>
 						<dateFormatItem id="Gy">G y</dateFormatItem>
 						<dateFormatItem id="GyMMM">G y MMM</dateFormatItem>
@@ -827,6 +1132,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
 						<dateFormatItem id="MMMEd">MMM d, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="y">G y</dateFormatItem>
 						<dateFormatItem id="yyyy">G y</dateFormatItem>
 						<dateFormatItem id="yyyyM">GGGGG y-MM</dateFormatItem>
@@ -835,6 +1141,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">G y MMM</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">G y MMM d</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">G y MMM d, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y MMMM</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">G y QQQ</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">G y QQQQ</dateFormatItem>
 					</availableFormats>
@@ -1116,26 +1423,72 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">a</dayPeriod>
-							<dayPeriod type="noon">n</dayPeriod>
-							<dayPeriod type="pm">p</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">मध्यरात</dayPeriod>
 							<dayPeriod type="am">पूर्वाह्न</dayPeriod>
 							<dayPeriod type="noon">मध्यान्ह</dayPeriod>
 							<dayPeriod type="pm">अपराह्न</dayPeriod>
+							<dayPeriod type="morning1">बिहान</dayPeriod>
+							<dayPeriod type="afternoon1">अपरान्ह</dayPeriod>
+							<dayPeriod type="afternoon2">बेलुका</dayPeriod>
+							<dayPeriod type="evening1">साँझ</dayPeriod>
+							<dayPeriod type="night1">रात</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">मध्यरात</dayPeriod>
+							<dayPeriod type="am">a</dayPeriod>
+							<dayPeriod type="noon">n</dayPeriod>
+							<dayPeriod type="pm">p</dayPeriod>
+							<dayPeriod type="morning1">बिहान</dayPeriod>
+							<dayPeriod type="afternoon1">अपरान्ह</dayPeriod>
+							<dayPeriod type="afternoon2">बेलुका</dayPeriod>
+							<dayPeriod type="evening1">साँझ</dayPeriod>
+							<dayPeriod type="night1">रात</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">मध्यरात</dayPeriod>
+							<dayPeriod type="am">पूर्वाह्न</dayPeriod>
+							<dayPeriod type="noon">मध्यान्ह</dayPeriod>
+							<dayPeriod type="pm">अपराह्न</dayPeriod>
+							<dayPeriod type="morning1">बिहान</dayPeriod>
+							<dayPeriod type="afternoon1">अपरान्ह</dayPeriod>
+							<dayPeriod type="afternoon2">बेलुका</dayPeriod>
+							<dayPeriod type="evening1">साँझ</dayPeriod>
+							<dayPeriod type="night1">रात</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">मध्यरात</dayPeriod>
+							<dayPeriod type="am">पूर्वाह्न</dayPeriod>
+							<dayPeriod type="noon">मध्यान्ह</dayPeriod>
+							<dayPeriod type="pm">अपराह्न</dayPeriod>
+							<dayPeriod type="morning1">बिहान</dayPeriod>
+							<dayPeriod type="afternoon1">अपरान्ह</dayPeriod>
+							<dayPeriod type="afternoon2">साँझ</dayPeriod>
+							<dayPeriod type="evening1">बेलुका</dayPeriod>
+							<dayPeriod type="night1">रात</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">मध्यरात</dayPeriod>
+							<dayPeriod type="am" draft="provisional">पूर्वाह्न</dayPeriod>
+							<dayPeriod type="noon">मध्यान्ह</dayPeriod>
+							<dayPeriod type="pm" draft="provisional">अपराह्न</dayPeriod>
+							<dayPeriod type="morning1">विहान</dayPeriod>
+							<dayPeriod type="afternoon1">अपरान्ह</dayPeriod>
+							<dayPeriod type="afternoon2">साँझ</dayPeriod>
+							<dayPeriod type="evening1">बेलुका</dayPeriod>
+							<dayPeriod type="night1">रात</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
-						<era type="0" alt="variant">इशा पूर्व</era>
 						<era type="1" alt="variant">सिइ</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">ईसा पूर्व</era>
-						<era type="0" alt="variant">इशा पूर्व</era>
+						<era type="0" alt="variant">इस्वीपूर्व</era>
 						<era type="1">सन्</era>
 						<era type="1" alt="variant">सिइ</era>
 					</eraAbbr>
@@ -1223,12 +1576,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">MM-dd</dateFormatItem>
 						<dateFormatItem id="MEd">MM-dd, E</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
 						<dateFormatItem id="MMMEd">MMM d, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">y-MM</dateFormatItem>
@@ -1237,6 +1595,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yMMM">y MMM</dateFormatItem>
 						<dateFormatItem id="yMMMd">y MMM d</dateFormatItem>
 						<dateFormatItem id="yMMMEd">y MMM d, E</dateFormatItem>
+						<dateFormatItem id="yMMMM">y MMMM</dateFormatItem>
 						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
 						<dateFormatItem id="yQQQQ">y QQQQ</dateFormatItem>
 					</availableFormats>
@@ -1507,7 +1866,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="-2">अस्ति</relative>
 				<relative type="-1">हिजो</relative>
 				<relative type="0">आज</relative>
-				<relative type="1">भोली</relative>
+				<relative type="1">भोलि</relative>
 				<relative type="2">पर्सि</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} दिनमा</relativeTimePattern>
@@ -1544,9 +1903,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>हप्ताको बार</displayName>
 			</field>
 			<field type="sun">
-				<relative type="-1">गत आईतबार</relative>
-				<relative type="0">यो आईतबार</relative>
-				<relative type="1">अर्को आईतबार</relative>
+				<relative type="-1">गत आइतबार</relative>
+				<relative type="0">यो आइतबार</relative>
+				<relative type="1">अर्को आइतबार</relative>
+			</field>
+			<field type="sun-short">
+				<relative type="-1">गत आइतबार</relative>
+				<relative type="0">यो आइतबार</relative>
+				<relative type="1">अर्को आइतबार</relative>
+			</field>
+			<field type="sun-narrow">
+				<relative type="-1">गत आइतबार</relative>
+				<relative type="0">यो आइतबार</relative>
+				<relative type="1">अर्को आइतबार</relative>
 			</field>
 			<field type="mon">
 				<relative type="-1">गत सोमबार</relative>
@@ -1698,6 +2067,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="minute-narrow">
 				<displayName>मिनेट</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} मिनेटमा</relativeTimePattern>
+					<relativeTimePattern count="other">{0} मिनेटमा</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} मिनेट पहिले</relativeTimePattern>
+					<relativeTimePattern count="other">{0} मिनेट पहिले</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="second">
 				<displayName>सेकेन्ड</displayName>
@@ -2610,6 +2987,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>पोर्ट मोरेस्बी</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>बुगेनभिल्ले</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>मनिला</exemplarCity>
 			</zone>
@@ -2694,6 +3074,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>इर्कुत्स्क</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>चिता</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>याकुत्स्क</exemplarCity>
 			</zone>
@@ -2712,6 +3095,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>मागाडान</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>स्रेद्निकोलिम्स्क</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>कामचट्का</exemplarCity>
 			</zone>
@@ -3872,7 +4258,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<otherNumberingSystems>
 			<native>deva</native>
 		</otherNumberingSystems>
-		<minimumGroupingDigits draft="contributed">1</minimumGroupingDigits>
+		<minimumGroupingDigits>1</minimumGroupingDigits>
 		<symbols numberSystem="deva">
 			<decimal>.</decimal>
 			<group>,</group>
@@ -4014,6 +4400,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤ #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">¤ 0 हजार</pattern>
+					<pattern type="1000" count="other">¤ 0 हजार</pattern>
+					<pattern type="10000" count="one">¤ 00 हजार</pattern>
+					<pattern type="10000" count="other">¤ 00 हजार</pattern>
+					<pattern type="100000" count="one">¤ 0 लाख</pattern>
+					<pattern type="100000" count="other">¤ 0 लाख</pattern>
+					<pattern type="1000000" count="one">¤ 00 लाख</pattern>
+					<pattern type="1000000" count="other">¤ 00 लाख</pattern>
+					<pattern type="10000000" count="one">¤ 0 करोड</pattern>
+					<pattern type="10000000" count="other">¤ 0 करोड</pattern>
+					<pattern type="100000000" count="one">¤ 00 करोड</pattern>
+					<pattern type="100000000" count="other">¤ 00 करोड</pattern>
+					<pattern type="1000000000" count="one">¤ 0 अरब</pattern>
+					<pattern type="1000000000" count="other">¤ 0 अरब</pattern>
+					<pattern type="10000000000" count="one">¤ 00 अरब</pattern>
+					<pattern type="10000000000" count="other">¤ 00 अरब</pattern>
+					<pattern type="100000000000" count="one">¤ 0 खरब</pattern>
+					<pattern type="100000000000" count="other">¤ 0 खरब</pattern>
+					<pattern type="1000000000000" count="one">¤ 00 खरब</pattern>
+					<pattern type="1000000000000" count="other">¤ 00 खरब</pattern>
+					<pattern type="10000000000000" count="one">¤ 0 शंख</pattern>
+					<pattern type="10000000000000" count="other">¤ 0 शंख</pattern>
+					<pattern type="100000000000000" count="one">¤ 00 शंख</pattern>
+					<pattern type="100000000000000" count="other">¤ 00 शंख</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4056,16 +4470,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">एङ्गोलान क्वान्जा</displayName>
 				<displayName count="other">एङ्गोलान क्वान्जा</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="ARS">
 				<displayName>अर्जेन्टिनी पेसो</displayName>
 				<displayName count="one">अर्जेन्टिनी पेसो</displayName>
 				<displayName count="other">अर्जेन्टिनी पेसो</displayName>
 				<symbol>ARS</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="AUD">
 				<displayName>अष्ट्रेलियन डलर</displayName>
+				<displayName count="one">अष्ट्रेलियन डलर</displayName>
+				<displayName count="other">अष्ट्रेलियन डलर</displayName>
 				<symbol>A$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="AWG">
 				<displayName>आरूबन फ्लोरिन</displayName>
@@ -4084,18 +4503,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">बोस्निया-हर्जगोभिनिया रूपान्तरयोग्य मार्क</displayName>
 				<displayName count="other">बोस्निया-हर्जगोभिनिया रूपान्तरयोग्य मार्क</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>बर्बाडियन डलर</displayName>
 				<displayName count="one">बार्बाडियन डलर</displayName>
 				<displayName count="other">बर्बाडियन डलर</displayName>
 				<symbol>BBD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BDT">
 				<displayName>बङ्गलादेशी टाका</displayName>
 				<displayName count="one">बङ्गलादेशी टाका</displayName>
 				<displayName count="other">बङ्गलादेशी टाका</displayName>
 				<symbol>BDT</symbol>
+				<symbol alt="narrow" draft="contributed">৳</symbol>
 			</currency>
 			<currency type="BGN">
 				<displayName>बुल्गारियाली लेभ</displayName>
@@ -4120,6 +4542,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">बर्मुडन डलर</displayName>
 				<displayName count="other">बर्मुडन डलर</displayName>
 				<symbol>BMD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BND">
 				<displayName>ब्रुनाई डलर</displayName>
@@ -4132,18 +4555,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">बोलिभियन बोलिभियानो</displayName>
 				<displayName count="other">बोलिभियन बोलिभियानो</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BRL">
 				<displayName>ब्राजिलियन रियल</displayName>
 				<displayName count="one">ब्राजिलियन रियल</displayName>
 				<displayName count="other">ब्राजिलियन रियल</displayName>
 				<symbol>R$</symbol>
+				<symbol alt="narrow" draft="contributed">R$</symbol>
 			</currency>
 			<currency type="BSD">
 				<displayName>बहामियाली डलर</displayName>
 				<displayName count="one">बहामियाली डलर</displayName>
 				<displayName count="other">बहामियाली डलर</displayName>
 				<symbol>BSD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BTN">
 				<displayName>भुटानी एन्‌गुल्ट्रुम</displayName>
@@ -4156,24 +4582,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">बोट्सवानान पुला</displayName>
 				<displayName count="other">बोट्सवानान पुला</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYR">
 				<displayName>बेलारूसी रूबल</displayName>
 				<displayName count="one">बेलारूसी रूबल</displayName>
 				<displayName count="other">बेलारूसी रूबल</displayName>
 				<symbol>BYR</symbol>
+				<symbol alt="narrow" draft="contributed">р.</symbol>
 			</currency>
 			<currency type="BZD">
 				<displayName>वेलिज डलर</displayName>
 				<displayName count="one">वेलिज डलर</displayName>
 				<displayName count="other">वेलिज डलर</displayName>
 				<symbol>BZD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CAD">
 				<displayName>क्यानाडियाली डलर</displayName>
 				<displayName count="one">क्यानाडियाली डलर</displayName>
 				<displayName count="other">क्यानाडियाली डलर</displayName>
 				<symbol>CA$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CDF">
 				<displayName>कङ्गोली फ्रान्क</displayName>
@@ -4192,36 +4622,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">चिलियन पेसो</displayName>
 				<displayName count="other">चिलियन पेसो</displayName>
 				<symbol>CLP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CNY">
 				<displayName>चिनिँया युआन</displayName>
 				<displayName count="one">चिनिँया युआन</displayName>
 				<displayName count="other">चिनिँया युआन</displayName>
 				<symbol>CN¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
 			<currency type="COP">
 				<displayName>कोलम्वियन पेसो</displayName>
 				<displayName count="one">कोलम्वियन पेसो</displayName>
 				<displayName count="other">कोलम्वियन पेसो</displayName>
 				<symbol>COP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CRC">
 				<displayName>कोष्टारिकन कोलोन</displayName>
 				<displayName count="one">कोष्टारिकन कोलोन</displayName>
 				<displayName count="other">कोष्टारिकन कोलोनहरू</displayName>
 				<symbol>CRC</symbol>
+				<symbol alt="narrow" draft="contributed">₡</symbol>
 			</currency>
 			<currency type="CUC">
 				<displayName>क्यूवाली रूपान्तरणयोग्य पेसो</displayName>
 				<displayName count="one">क्यूवाली रूपान्तरणयोग्य पेसो</displayName>
 				<displayName count="other">क्यूवाली रूपान्तरणयोग्य पेसो</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>क्यूवाली पेसो</displayName>
 				<displayName count="one">क्यूवाली पेसो</displayName>
 				<displayName count="other">क्यूवाली पेसो</displayName>
 				<symbol>CUP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CVE">
 				<displayName>केप भर्डियन एस्कुडो</displayName>
@@ -4234,6 +4670,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">चेख गणतञ्त्र कोरूना</displayName>
 				<displayName count="other">चेख गणतञ्त्र कोरूना</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DJF">
 				<displayName>जिबौंटियाली फ्रान्क</displayName>
@@ -4246,12 +4683,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ड्यानिश क्रोन</displayName>
 				<displayName count="other">ड्यानिश क्रोनर</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>डोमिनिकन पेसो</displayName>
 				<displayName count="one">डोमिनिकन पेसो</displayName>
 				<displayName count="other">डोमिनिकन पेसो</displayName>
 				<symbol>DOP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="DZD">
 				<displayName>अल्जेरियाली डिनार</displayName>
@@ -4264,6 +4703,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">इजिप्सियन पाउन्ड</displayName>
 				<displayName count="other">इजिप्सियन पाउन्ड</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>एरिट्रियन नाक्फा</displayName>
@@ -4282,30 +4722,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">युरो</displayName>
 				<displayName count="other">युरो</displayName>
 				<symbol>€</symbol>
+				<symbol alt="narrow" draft="contributed">€</symbol>
 			</currency>
 			<currency type="FJD">
 				<displayName>फिजीयाली डलर</displayName>
 				<displayName count="one">फिजीयाली डलर</displayName>
 				<displayName count="other">फिजीयाली डलरहरू</displayName>
 				<symbol>FJD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="FKP">
 				<displayName>फक्‌ल्याण्ड टापुहरूका पाउन्ड</displayName>
 				<displayName count="one">फक्‌ल्याण्ड टापुहरूका पाउन्ड</displayName>
 				<displayName count="other">फक्‌ल्याण्ड टापुहरूका पाउन्ड</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GBP">
 				<displayName>बेलायती पाउण्ड स्टर्लिङ</displayName>
 				<displayName count="one">बेलायती पाउण्ड स्टर्लिङ</displayName>
 				<displayName count="other">बेलायती पाउण्ड स्टर्लिङ</displayName>
 				<symbol>£</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GEL">
 				<displayName>जर्जियाली लारी</displayName>
 				<displayName count="one">जर्जियाली लारी</displayName>
 				<displayName count="other">जर्जियन लारी</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHS">
 				<displayName>घानाली सेडी</displayName>
@@ -4318,6 +4763,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">जिब्राल्टर पाउण्ड</displayName>
 				<displayName count="other">जिब्राल्टर पाउण्ड</displayName>
 				<symbol>GIP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GMD">
 				<displayName>गाम्वियाली डालासी</displayName>
@@ -4330,36 +4776,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">गिनियाली फ्रान्क</displayName>
 				<displayName count="other">गिनियाली फ्रान्क</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GTQ">
 				<displayName>ग्वाटेमाला क्वेट्जाल</displayName>
 				<displayName count="one">ग्वाटेमाला क्वेट्जाल</displayName>
 				<displayName count="other">ग्वाटेमाला क्वेट्जाल</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GYD">
 				<displayName>गाइनिज डलर</displayName>
 				<displayName count="one">गाइनिज डलर</displayName>
 				<displayName count="other">गाइनिज डलर</displayName>
 				<symbol>GYD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="HKD">
 				<displayName>हङकङ डलर</displayName>
 				<displayName count="one">हङकङ डलर</displayName>
 				<displayName count="other">हङकङ डलर</displayName>
 				<symbol>HK$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="HNL">
 				<displayName>होन्डुरान लेम्पिरा</displayName>
 				<displayName count="one">होन्डुरान लेम्पिरा</displayName>
 				<displayName count="other">होन्डुरान लेम्पिरा</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRK">
 				<displayName>क्रोएशियाली कुना</displayName>
 				<displayName count="one">क्रोएशियाली कुना</displayName>
 				<displayName count="other">क्रोएशियाली कुना</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>हैटियाली गुर्ड</displayName>
@@ -4372,6 +4824,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">हङ्गेरियन फोरिन्ट</displayName>
 				<displayName count="other">हङ्गेरियन फोरिन्ट</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>इण्डोनेशियाली रूपियाँ</displayName>
@@ -4384,12 +4837,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">इजरायली नयाँ शेकेल</displayName>
 				<displayName count="other">इजरायली नयाँ शेकेल</displayName>
 				<symbol>₪</symbol>
+				<symbol alt="narrow" draft="contributed">₪</symbol>
 			</currency>
 			<currency type="INR">
 				<displayName>भारतीय रूपिँया</displayName>
 				<displayName count="one">भारतीय रूपिँया</displayName>
 				<displayName count="other">भारतीय रूपिँया</displayName>
 				<symbol>₹</symbol>
+				<symbol alt="narrow" draft="contributed">₹</symbol>
 			</currency>
 			<currency type="IQD">
 				<displayName>इराकी डिनार</displayName>
@@ -4408,12 +4863,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">आइसल्याण्डिक क्रोना</displayName>
 				<displayName count="other">आइसल्याण्डिक क्रोनर</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="JMD">
 				<displayName>जमाइकाली डलर</displayName>
 				<displayName count="one">जमाइकाली डलर</displayName>
 				<displayName count="other">जमाइकाली डलर</displayName>
 				<symbol>JMD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="JOD">
 				<displayName>जोर्डानियाली डलर</displayName>
@@ -4426,6 +4883,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">जापानी येन</displayName>
 				<displayName count="other">जापानी येन</displayName>
 				<symbol>JP¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
 			<currency type="KES">
 				<displayName>केन्याली शिलिङ</displayName>
@@ -4450,18 +4908,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">कोमोरियन फ्रान्क</displayName>
 				<displayName count="other">कोमोरियन फ्रान्क</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>उत्तर कोरियाली वन</displayName>
 				<displayName count="one">उत्तर कोरियाली वन</displayName>
 				<displayName count="other">उत्तर कोरियाली वन</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>दक्षिण कोरियाली वन</displayName>
 				<displayName count="one">दक्षिण कोरियाली वन</displayName>
 				<displayName count="other">दक्षिण कोरियाली वन</displayName>
 				<symbol>₩</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KWD">
 				<displayName>कुवेती डिनार</displayName>
@@ -4474,12 +4935,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">केम्यान टापुहरूका डलर</displayName>
 				<displayName count="other">केम्यान टापुहरूका डलर</displayName>
 				<symbol>KYD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="KZT">
 				<displayName>काजाखस्तानी टेन्ज</displayName>
 				<displayName count="one">काजाखस्तानी टेन्ज</displayName>
 				<displayName count="other">काजाखस्तानी टेन्ज</displayName>
 				<symbol>KZT</symbol>
+				<symbol alt="narrow" draft="contributed">₸</symbol>
 			</currency>
 			<currency type="LAK">
 				<displayName>लाओशियन किप</displayName>
@@ -4492,18 +4955,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">लेबनाली पाउन्ड</displayName>
 				<displayName count="other">लेबनाली पाउन्ड</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>श्रीलङ्काली रूपिया</displayName>
 				<displayName count="one">श्रीलङ्काली रूपिया</displayName>
 				<displayName count="other">श्रीलङ्काली रूपिया</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>लिबेरियाली डलर</displayName>
 				<displayName count="one">लिबेरियाली डलर</displayName>
 				<displayName count="other">लिबेरियाली डलर</displayName>
 				<symbol>LRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="LTL">
 				<displayName>लिथुनियाली लिटास</displayName>
@@ -4540,6 +5006,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">मालागासी एरिआरी</displayName>
 				<displayName count="other">मालागासी एरिआरी</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MKD">
 				<displayName>म्यासेडोनियाली डेनार</displayName>
@@ -4558,6 +5025,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">मङ्गोलियाली टुग्रिक</displayName>
 				<displayName count="other">मङ्गोलियाली टुग्रिक</displayName>
 				<symbol>MNT</symbol>
+				<symbol alt="narrow" draft="contributed">₮</symbol>
 			</currency>
 			<currency type="MOP">
 				<displayName>माकानिज पटाका</displayName>
@@ -4576,6 +5044,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">माउरिटियन रूपी</displayName>
 				<displayName count="other">माउरिटियन रूपी</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>मालडिभियाली रूफियाँ</displayName>
@@ -4594,6 +5063,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">मेक्सिकन पेसो</displayName>
 				<displayName count="other">मेक्सिकन पेसो</displayName>
 				<symbol>MX$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="MYR">
 				<displayName>मलेशियाली रिङ्गेट</displayName>
@@ -4612,36 +5082,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">नामिबियन डलर</displayName>
 				<displayName count="other">नामिबियन डलर</displayName>
 				<symbol>NAD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="NGN">
 				<displayName>नाइजेरियन नाइरा</displayName>
 				<displayName count="one">नाइजेरियन नाइरा</displayName>
 				<displayName count="other">नाइजेरियन नाइरा</displayName>
 				<symbol>NGN</symbol>
+				<symbol alt="narrow" draft="contributed">₦</symbol>
 			</currency>
 			<currency type="NIO">
 				<displayName>निकारागुवान कोर्डोवा</displayName>
 				<displayName count="one">निकारागुवान कोर्डोवा</displayName>
 				<displayName count="other">निकारागुवान कोर्डोवा</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NOK">
 				<displayName>नर्वेजियाली क्रोन</displayName>
 				<displayName count="one">नर्वेजियाली क्रोन</displayName>
 				<displayName count="other">नर्वेजियाली क्रोनर</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>नेपाली रूपैयाँ</displayName>
 				<displayName count="one">नेपाली रूपैयाँ</displayName>
 				<displayName count="other">नेपाली रूपैयाँ</displayName>
 				<symbol>नेरू</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>न्यूजिल्याण्ड डलर</displayName>
 				<displayName count="one">न्यूजिल्याण्ड डलर</displayName>
 				<displayName count="other">न्यूजिल्याण्ड डलरहरू</displayName>
 				<symbol>NZ$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="OMR">
 				<displayName>ओमनी रियल</displayName>
@@ -4678,18 +5154,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">पाकिस्तानी रूपियाँ</displayName>
 				<displayName count="other">पाकिस्तानी रूपियाँ</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>पोलिश ज्लोटाई</displayName>
 				<displayName count="one">पोलिश ज्लोटाई</displayName>
 				<displayName count="other">पोलिश ज्लोटाई</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PYG">
 				<displayName>पारागुयाली गुरानी</displayName>
 				<displayName count="one">पारागुयाली गुरानी</displayName>
 				<displayName count="other">पारागुयाली गुरानी</displayName>
 				<symbol>PYG</symbol>
+				<symbol alt="narrow" draft="contributed">₲</symbol>
 			</currency>
 			<currency type="QAR">
 				<displayName>कतारी रियल</displayName>
@@ -4714,12 +5193,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">रूसी रूबल</displayName>
 				<displayName count="other">रूसी रूबल</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RWF">
 				<displayName>र्‌वाण्डाली फ्रान्क</displayName>
 				<displayName count="one">र्‌वाण्डाली फ्रान्क</displayName>
 				<displayName count="other">र्‌वाण्डाली फ्रान्क</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>साउदी रियालहरू</displayName>
@@ -4732,6 +5213,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">सोलोमन टापुहरूका डलर</displayName>
 				<displayName count="other">सोलोमन टापुहरूका डलर</displayName>
 				<symbol>SBD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SCR">
 				<displayName>सेचेलोइस रूपी</displayName>
@@ -4750,18 +5232,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">स्विडिश क्रोना</displayName>
 				<displayName count="other">स्विडिश क्रोनर</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>सिङ्गापुर डलर</displayName>
 				<displayName count="one">सिङ्गापुर डलर</displayName>
 				<displayName count="other">सिङ्गापुर डलर</displayName>
 				<symbol>SGD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SHP">
 				<displayName>सेन्ट हेलेना पाउन्ड</displayName>
 				<displayName count="one">सेन्ट हेलेना पाउन्ड</displayName>
 				<displayName count="other">सेन्ट हेलेना पाउन्ड</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SLL">
 				<displayName>सियरा लियोनेन लियोन</displayName>
@@ -4780,24 +5265,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">सुरिनामिज डलर</displayName>
 				<displayName count="other">सुरिनामिज डलर</displayName>
 				<symbol>SRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SSP">
 				<displayName>दक्षिण सुडानी पाउन्ड</displayName>
 				<displayName count="one">दक्षिण सुडानी पाउन्ड</displayName>
 				<displayName count="other">दक्षिण सुडानी पाउन्ड</displayName>
 				<symbol>SSP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="STD">
 				<displayName>साओ टोम र प्रिन्सिप डोब्रा</displayName>
 				<displayName count="one">साओ टोम र प्रिन्सिप डोब्रा</displayName>
 				<displayName count="other">साओ टोम र प्रिन्सिप डोब्रा</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SYP">
 				<displayName>सिरियाली पाउन्ड</displayName>
 				<displayName count="one">सिरियाली पाउन्ड</displayName>
 				<displayName count="other">सिरियाली पाउन्ड</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>स्वाजी लिलान्गेनी</displayName>
@@ -4810,6 +5299,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">थाई भाट</displayName>
 				<displayName count="other">थाई भाट</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJS">
 				<displayName>ताजिक्स्तानी सोमोनी</displayName>
@@ -4834,24 +5324,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">टङ्गन पाङ्गा</displayName>
 				<displayName count="other">टङ्गन पाङ्गा</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TRY">
 				<displayName>टर्किश लिरा</displayName>
 				<displayName count="one">टर्किश लिरा</displayName>
 				<displayName count="other">टर्किश लिरा</displayName>
 				<symbol>TRY</symbol>
+				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>त्रिनिडाड र टोबागो डलर</displayName>
 				<displayName count="one">त्रिनिडाड र टोबागो डलर</displayName>
 				<displayName count="other">त्रिनिडाड र टोबागो डलर</displayName>
 				<symbol>TTD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="TWD">
 				<displayName>नयाँ ताइवान डलर</displayName>
 				<displayName count="one">नयाँ ताइवान डलर</displayName>
 				<displayName count="other">नयाँ ताइवान डलर</displayName>
 				<symbol>NT$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="TZS">
 				<displayName>ताञ्जानियाली शिलिङ</displayName>
@@ -4864,6 +5359,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">युक्रेनी हिर्भिनिया</displayName>
 				<displayName count="other">युक्रेनी हिर्भिनिया</displayName>
 				<symbol>UAH</symbol>
+				<symbol alt="narrow" draft="contributed">₴</symbol>
 			</currency>
 			<currency type="UGX">
 				<displayName>युगाण्डाली शिलिङ</displayName>
@@ -4876,12 +5372,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">अमेरिकी डलर</displayName>
 				<displayName count="other">संयुक्त राज्य डलर</displayName>
 				<symbol>US$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="UYU">
 				<displayName>उरूगुवायाली पेसो</displayName>
 				<displayName count="one">उरूगुवायाली पेसो</displayName>
 				<displayName count="other">उरूगुवायाली पेसो</displayName>
 				<symbol>UYU</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="UZS">
 				<displayName>उज्बेकिस्तान सोम</displayName>
@@ -4894,12 +5392,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">भेनेजुएलन बोलिभर</displayName>
 				<displayName count="other">भेनेजुएलन बोलिभर</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>भियतनामी डङ्</displayName>
 				<displayName count="one">भियतनामी डङ्</displayName>
 				<displayName count="other">भियतनामी डङ्</displayName>
 				<symbol>₫</symbol>
+				<symbol alt="narrow" draft="contributed">₫</symbol>
 			</currency>
 			<currency type="VUV">
 				<displayName>भानुआतू भातु</displayName>
@@ -4924,6 +5424,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">पूर्वी क्यारिबियन डलर</displayName>
 				<displayName count="other">पूर्वी क्यारिबियन डलर</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XOF">
 				<displayName>सीएफ्‌ए फ्रान्क बीसीइएओ</displayName>
@@ -4953,6 +5454,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">दक्षिण अफ्रिकी र्‍यान्ड</displayName>
 				<displayName count="other">दक्षिण अफ्रिकी र्‍यान्ड</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>जाम्बियाली क्वाचा (१९६८–२०१२)</displayName>
@@ -4964,6 +5466,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">जाम्बियाली क्वाचा</displayName>
 				<displayName count="other">जाम्बियाली क्वाचा</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
@@ -4974,7 +5477,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 	<units>
 		<unitLength type="long">
 			<compoundUnit type="per">
-				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}प्रति{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>गुरूत्वाकर्षण शक्ति</displayName>
@@ -4982,9 +5485,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} गुरूत्वाकर्षण शक्ति</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
+				<displayName>मिटर प्रति वर्ग सेकेन्ड</displayName>
 				<unitPattern count="one">{0}मिटर प्रति सेकेण्ड वर्ग</unitPattern>
 				<unitPattern count="other">{0}मिटर प्रति सेकेण्ड वर्ग</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>परिक्रमा</displayName>
+				<unitPattern count="one">{0}परिक्रमा</unitPattern>
+				<unitPattern count="other">{0}परिक्रमा</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>रेडियन</displayName>
+				<unitPattern count="one">{0}रेडियन</unitPattern>
+				<unitPattern count="other">{0}रेडियन</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>डिग्री</displayName>
+				<unitPattern count="one">{0} डिग्री</unitPattern>
+				<unitPattern count="other">{0} डिग्री</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>आर्क मिनेट</displayName>
 				<unitPattern count="one">{0}आर्क मिनेट</unitPattern>
@@ -4995,30 +5514,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}आर्क सेकेण्ड</unitPattern>
 				<unitPattern count="other">{0}आर्क सेकेण्ड</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>डिग्री</displayName>
-				<unitPattern count="one">{0} डिग्री</unitPattern>
-				<unitPattern count="other">{0} डिग्री</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>रेडियन</displayName>
-				<unitPattern count="one">{0}रेडियन</unitPattern>
-				<unitPattern count="other">{0}रेडियन</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>बर्ग गज</displayName>
-				<unitPattern count="one">{0} बर्ग गज</unitPattern>
-				<unitPattern count="other">{0} बर्ग गज</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>बर्ग किलोमिटर</displayName>
+				<unitPattern count="one">{0} बर्ग किलोमिटर</unitPattern>
+				<unitPattern count="other">{0} बर्ग किलोमिटर</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>हेक्टर</displayName>
 				<unitPattern count="one">{0} हेक्टर</unitPattern>
 				<unitPattern count="other">{0} हेक्टर</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>बर्ग मिटर</displayName>
+				<unitPattern count="one">{0} बर्ग मिटर</unitPattern>
+				<unitPattern count="other">{0} बर्ग मिटर</unitPattern>
+				<perUnitPattern>{0}प्रति वर्ग मिटर</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>वर्ग सेन्टिमिटर</displayName>
 				<unitPattern count="one">{0}वर्ग सेन्टिमिटर</unitPattern>
 				<unitPattern count="other">{0}वर्ग सेन्टिमिटर</unitPattern>
+				<perUnitPattern>{0}प्रति वर्ग सेन्टिमिटर</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>बर्ग माईल</displayName>
+				<unitPattern count="one">{0} बर्ग माईल</unitPattern>
+				<unitPattern count="other">{0} बर्ग माईल</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>बर्ग गज</displayName>
+				<unitPattern count="one">{0} बर्ग गज</unitPattern>
+				<unitPattern count="other">{0} बर्ग गज</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>वर्ग यार्ड</displayName>
+				<unitPattern count="one">{0}वर्ग यार्ड</unitPattern>
+				<unitPattern count="other">{0}वर्ग यार्ड</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>बर्ग फुट</displayName>
@@ -5029,91 +5560,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>वर्ग इन्च</displayName>
 				<unitPattern count="one">{0}वर्ग इन्च</unitPattern>
 				<unitPattern count="other">{0}वर्ग इन्च</unitPattern>
+				<perUnitPattern>{0}प्रति वर्ग इन्च</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>बर्ग किलोमिटर</displayName>
-				<unitPattern count="one">{0} बर्ग किलोमिटर</unitPattern>
-				<unitPattern count="other">{0} बर्ग किलोमिटर</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>बर्ग मिटर</displayName>
-				<unitPattern count="one">{0} बर्ग मिटर</unitPattern>
-				<unitPattern count="other">{0} बर्ग मिटर</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>बर्ग माईल</displayName>
-				<unitPattern count="one">{0} बर्ग माईल</unitPattern>
-				<unitPattern count="other">{0} बर्ग माईल</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>वर्ग यार्ड</displayName>
-				<unitPattern count="one">{0}वर्ग यार्ड</unitPattern>
-				<unitPattern count="other">{0}वर्ग यार्ड</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>कराट</displayName>
+				<unitPattern count="one">{0}कराट</unitPattern>
+				<unitPattern count="other">{0}कराट</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>लिटर प्रति किलोमिटर</displayName>
 				<unitPattern count="one">{0}लिटर प्रति किलोमिटर</unitPattern>
 				<unitPattern count="other">{0}लिटर प्रति किलोमिटर</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>लिटर प्रति १०० किलोमिटर</displayName>
+				<unitPattern count="one">{0}लिटर प्रति १०० किलोमिटर</unitPattern>
+				<unitPattern count="other">{0}लिटर प्रति १०० किलोमिटर</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>माइल प्रति गालोन</displayName>
 				<unitPattern count="one">{0}माइल प्रति गालोन</unitPattern>
 				<unitPattern count="other">{0}माइल प्रति गालोन</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>बिट</displayName>
-				<unitPattern count="one">{0}बिट</unitPattern>
-				<unitPattern count="other">{0}बिट</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>बाइट</displayName>
-				<unitPattern count="one">{0}बाइट</unitPattern>
-				<unitPattern count="other">{0}बाइट</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>गिगाबिट</displayName>
-				<unitPattern count="one">{0}गिगाबिट</unitPattern>
-				<unitPattern count="other">{0}गिगाबिट</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>गिगाबाइट</displayName>
-				<unitPattern count="one">{0}गिगाबाइट</unitPattern>
-				<unitPattern count="other">{0}गिगाबाइट</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>किलोबिट</displayName>
-				<unitPattern count="one">{0}किलोबिट</unitPattern>
-				<unitPattern count="other">{0}किलोबिट</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>किलोबाइट</displayName>
-				<unitPattern count="one">{0}किलोबाइट</unitPattern>
-				<unitPattern count="other">{0}किलोबाइट</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>मेगाबिट</displayName>
-				<unitPattern count="one">{0}मेगाबिट</unitPattern>
-				<unitPattern count="other">{0}मेगाबिट</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>मेगाबाइट</displayName>
-				<unitPattern count="one">{0}मेगाबाइट</unitPattern>
-				<unitPattern count="other">{0}मेगाबाइट</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>टेराबिट</displayName>
-				<unitPattern count="one">{0}टेराबिट</unitPattern>
-				<unitPattern count="other">{0}टेराबिट</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>टेराबाइट</displayName>
 				<unitPattern count="one">{0}टेराबाइट</unitPattern>
 				<unitPattern count="other">{0}टेराबाइट</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>टेराबिट</displayName>
+				<unitPattern count="one">{0}टेराबिट</unitPattern>
+				<unitPattern count="other">{0}टेराबिट</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>गिगाबाइट</displayName>
+				<unitPattern count="one">{0}गिगाबाइट</unitPattern>
+				<unitPattern count="other">{0}गिगाबाइट</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>गिगाबिट</displayName>
+				<unitPattern count="one">{0}गिगाबिट</unitPattern>
+				<unitPattern count="other">{0}गिगाबिट</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>मेगाबाइट</displayName>
+				<unitPattern count="one">{0}मेगाबाइट</unitPattern>
+				<unitPattern count="other">{0}मेगाबाइट</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>मेगाबिट</displayName>
+				<unitPattern count="one">{0}मेगाबिट</unitPattern>
+				<unitPattern count="other">{0}मेगाबिट</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>किलोबाइट</displayName>
+				<unitPattern count="one">{0}किलोबाइट</unitPattern>
+				<unitPattern count="other">{0}किलोबाइट</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>किलोबिट</displayName>
+				<unitPattern count="one">{0}किलोबिट</unitPattern>
+				<unitPattern count="other">{0}किलोबिट</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>बाइट</displayName>
+				<unitPattern count="one">{0}बाइट</unitPattern>
+				<unitPattern count="other">{0}बाइट</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>बिट</displayName>
+				<unitPattern count="one">{0}बिट</unitPattern>
+				<unitPattern count="other">{0}बिट</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>शताब्दी</displayName>
+				<unitPattern count="one">{0}शताब्दी</unitPattern>
+				<unitPattern count="other">{0}शताब्दी</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>वर्ष</displayName>
+				<unitPattern count="one">{0} वर्ष</unitPattern>
+				<unitPattern count="other">{0} वर्ष</unitPattern>
+				<perUnitPattern>{0}प्रति वर्ष</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>महिना</displayName>
+				<unitPattern count="one">{0} महिना</unitPattern>
+				<unitPattern count="other">{0} महिना</unitPattern>
+				<perUnitPattern>{0}/महिना</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>हप्ता</displayName>
+				<unitPattern count="one">{0} हप्ता</unitPattern>
+				<unitPattern count="other">{0} हप्ता</unitPattern>
+				<perUnitPattern>{0}प्रति हप्ता</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>दिन</displayName>
 				<unitPattern count="one">{0} दिन</unitPattern>
 				<unitPattern count="other">{0} दिन</unitPattern>
+				<perUnitPattern>{0}/दिन</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>घन्टा</displayName>
@@ -5121,30 +5667,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} घण्टा</unitPattern>
 				<perUnitPattern>{0}प्रति घण्टा</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>माइक्रोसेकेण्ड</displayName>
-				<unitPattern count="one">{0}माइक्रोसेकेण्ड</unitPattern>
-				<unitPattern count="other">{0}माइक्रोसेकेण्ड</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>मिली सेकेण्ड</displayName>
-				<unitPattern count="one">{0} मिली सेकेण्ड</unitPattern>
-				<unitPattern count="other">{0} मिली सेकेण्ड</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>मिनेट</displayName>
 				<unitPattern count="one">{0} मिनेट</unitPattern>
 				<unitPattern count="other">{0} मिनेट</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>महिना</displayName>
-				<unitPattern count="one">{0} महिना</unitPattern>
-				<unitPattern count="other">{0} महिना</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>न्यानोसेकेण्ड</displayName>
-				<unitPattern count="one">{0}न्यानोसेकेण्ड</unitPattern>
-				<unitPattern count="other">{0}न्यानोसेकेण्ड</unitPattern>
+				<perUnitPattern>{0}प्रति मिनेट</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>सेकेण्ड</displayName>
@@ -5152,15 +5679,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} सेकेण्ड</unitPattern>
 				<perUnitPattern>{0}प्रति सेकेण्ड</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>हप्ता</displayName>
-				<unitPattern count="one">{0} हप्ता</unitPattern>
-				<unitPattern count="other">{0} हप्ता</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>मिली सेकेण्ड</displayName>
+				<unitPattern count="one">{0} मिली सेकेण्ड</unitPattern>
+				<unitPattern count="other">{0} मिली सेकेण्ड</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>वर्ष</displayName>
-				<unitPattern count="one">{0} वर्ष</unitPattern>
-				<unitPattern count="other">{0} वर्ष</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>माइक्रोसेकेण्ड</displayName>
+				<unitPattern count="one">{0}माइक्रोसेकेण्ड</unitPattern>
+				<unitPattern count="other">{0}माइक्रोसेकेण्ड</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>न्यानोसेकेण्ड</displayName>
+				<unitPattern count="one">{0}न्यानोसेकेण्ड</unitPattern>
+				<unitPattern count="other">{0}न्यानोसेकेण्ड</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>एम्पियर</displayName>
@@ -5182,6 +5714,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}भोल्ट</unitPattern>
 				<unitPattern count="other">{0}भोल्ट</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>किलोक्यालोरी</displayName>
+				<unitPattern count="one">{0}किलोक्यालोरी</unitPattern>
+				<unitPattern count="other">{0}किलोक्यालोरी</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>क्यालोरी</displayName>
 				<unitPattern count="one">{0}क्यालोरी</unitPattern>
@@ -5192,21 +5729,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}क्यालोरी</unitPattern>
 				<unitPattern count="other">{0}क्यालोरी</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>जुल</displayName>
-				<unitPattern count="one">{0} जुल</unitPattern>
-				<unitPattern count="other">{0}जुल</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>किलोक्यालोरी</displayName>
-				<unitPattern count="one">{0}किलोक्यालोरी</unitPattern>
-				<unitPattern count="other">{0}किलोक्यालोरी</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>किलोजुल</displayName>
 				<unitPattern count="one">{0}किलोजुल</unitPattern>
 				<unitPattern count="other">{0}किलोजुल</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>जुल</displayName>
+				<unitPattern count="one">{0} जुल</unitPattern>
+				<unitPattern count="other">{0}जुल</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>किलोवाट-घण्टा</displayName>
 				<unitPattern count="one">{0}किलोवाट-घण्टा</unitPattern>
@@ -5217,201 +5749,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}गिगाहर्ज</unitPattern>
 				<unitPattern count="other">{0}गिगाहर्ज</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>हर्ज</displayName>
-				<unitPattern count="one">{0} हर्ज</unitPattern>
-				<unitPattern count="other">{0} हर्ज</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>मेगाहर्ज</displayName>
+				<unitPattern count="one">{0} मेगाहर्ज</unitPattern>
+				<unitPattern count="other">{0} मेगाहर्ज</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>किलोहर्ज</displayName>
 				<unitPattern count="one">{0}किलोहर्ज</unitPattern>
 				<unitPattern count="other">{0}किलोहर्ज</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>मेगाहर्ज</displayName>
-				<unitPattern count="one">{0} मेगाहर्ज</unitPattern>
-				<unitPattern count="other">{0} मेगाहर्ज</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>हर्ज</displayName>
+				<unitPattern count="one">{0} हर्ज</unitPattern>
+				<unitPattern count="other">{0} हर्ज</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>खगोल एकाइ</displayName>
-				<unitPattern count="one">{0}खगोल एकाइ</unitPattern>
-				<unitPattern count="other">{0}खगोल एकाइ</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>किलोमिटर</displayName>
+				<unitPattern count="one">{0} किलोमिटर</unitPattern>
+				<unitPattern count="other">{0}किलोमिटर</unitPattern>
+				<perUnitPattern>{0}प्रति किलोमिटर</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>सेन्टिमिटर</displayName>
-				<unitPattern count="one">{0} सेन्टिमिटर</unitPattern>
-				<unitPattern count="other">{0} सेन्टिमिटर</unitPattern>
+			<unit type="length-meter">
+				<displayName>मिटर</displayName>
+				<unitPattern count="one">{0} मिटर</unitPattern>
+				<unitPattern count="other">{0} मिटर</unitPattern>
+				<perUnitPattern>{0}प्रति मिटर</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>डेसिमिटर</displayName>
 				<unitPattern count="one">{0}डेसिमिटर</unitPattern>
 				<unitPattern count="other">{0}डेसिमिटर</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>फुट</displayName>
-				<unitPattern count="one">{0} फुट</unitPattern>
-				<unitPattern count="other">{0} फुट</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>इन्च</displayName>
-				<unitPattern count="one">{0} ईञ्‍च</unitPattern>
-				<unitPattern count="other">{0} ईञ्‍च</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>किलोमिटर</displayName>
-				<unitPattern count="one">{0} किलोमिटर</unitPattern>
-				<unitPattern count="other">{0} किलो मिटर</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>प्रकाश वर्ष</displayName>
-				<unitPattern count="one">{0} प्रकाश वर्ष</unitPattern>
-				<unitPattern count="other">{0} प्रकाश वर्ष</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>मिटर</displayName>
-				<unitPattern count="one">{0} मिटर</unitPattern>
-				<unitPattern count="other">{0} मिटर</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>माइक्रोमिटर</displayName>
-				<unitPattern count="one">{0}माइक्रोमिटर</unitPattern>
-				<unitPattern count="other">{0}माइक्रोमिटर</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>माइल</displayName>
-				<unitPattern count="one">माइल</unitPattern>
-				<unitPattern count="other">{0} माईल</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>सेन्टिमिटर</displayName>
+				<unitPattern count="one">{0} सेन्टिमिटर</unitPattern>
+				<unitPattern count="other">{0} सेन्टिमिटर</unitPattern>
+				<perUnitPattern>{0}प्रति सेन्टिमिटर</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>मिलिमिटर</displayName>
 				<unitPattern count="one">{0} मिलिमिटर</unitPattern>
 				<unitPattern count="other">{0} मिलिमिटर</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>माइक्रोमिटर</displayName>
+				<unitPattern count="one">{0}माइक्रोमिटर</unitPattern>
+				<unitPattern count="other">{0}माइक्रोमिटर</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>न्यानोमिटर</displayName>
 				<unitPattern count="one">{0}न्यानोमिटर</unitPattern>
 				<unitPattern count="other">{0}न्यानोमिटर</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>नउटिकल माइल</displayName>
-				<unitPattern count="one">{0}नउटिकल माइल</unitPattern>
-				<unitPattern count="other">{0}नउटिकल माइल</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>पारसेकेण्ड</displayName>
-				<unitPattern count="one">{0}पारसेकेण्ड</unitPattern>
-				<unitPattern count="other">{0}पारसेकेण्ड</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>पिकोमिटर</displayName>
 				<unitPattern count="one">{0} पिकोमिटर</unitPattern>
 				<unitPattern count="other">{0} पिकोमिटर</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>माइल</displayName>
+				<unitPattern count="one">माइल</unitPattern>
+				<unitPattern count="other">{0} माइल</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>गज</displayName>
 				<unitPattern count="one">{0} गज</unitPattern>
 				<unitPattern count="other">{0} गज</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>फुट</displayName>
+				<unitPattern count="one">{0} फुट</unitPattern>
+				<unitPattern count="other">{0} फुट</unitPattern>
+				<perUnitPattern>{0} प्रति फुट</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>इन्च</displayName>
+				<unitPattern count="one">{0}इन्च</unitPattern>
+				<unitPattern count="other">{0}इन्च</unitPattern>
+				<perUnitPattern>{0} प्रति इन्च</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>पारसेकेण्ड</displayName>
+				<unitPattern count="one">{0}पारसेकेण्ड</unitPattern>
+				<unitPattern count="other">{0}पारसेकेण्ड</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>प्रकाश वर्ष</displayName>
+				<unitPattern count="one">{0} प्रकाश वर्ष</unitPattern>
+				<unitPattern count="other">{0} प्रकाश वर्ष</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>खगोल एकाइ</displayName>
+				<unitPattern count="one">{0}खगोल एकाइ</unitPattern>
+				<unitPattern count="other">{0}खगोल एकाइ</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>नउटिकल माइल</displayName>
+				<unitPattern count="one">{0}नउटिकल माइल</unitPattern>
+				<unitPattern count="other">{0}नउटिकल माइल</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} miles-scandinavian</unitPattern>
+				<unitPattern count="other">{0} miles-scandinavian</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>लक्स</displayName>
 				<unitPattern count="one">{0}लक्स</unitPattern>
 				<unitPattern count="other">{0}लक्स</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>कराट</displayName>
-				<unitPattern count="one">{0}कराट</unitPattern>
-				<unitPattern count="other">{0}कराट</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>ग्राम</displayName>
-				<unitPattern count="one">{0} ग्राम</unitPattern>
-				<unitPattern count="other">{0} ग्राम</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>किलोग्राम</displayName>
-				<unitPattern count="one">{0} किलोग्राम</unitPattern>
-				<unitPattern count="other">{0} किलोग्राम</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>मेट्रिक टन</displayName>
 				<unitPattern count="one">{0}मेट्रिक टन</unitPattern>
 				<unitPattern count="other">{0}मेट्रिक टन</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>माइक्रोग्राम</displayName>
-				<unitPattern count="one">{0}माइक्रोग्राम</unitPattern>
-				<unitPattern count="other">{0}माइक्रोग्राम</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>किलोग्राम</displayName>
+				<unitPattern count="one">{0} किलोग्राम</unitPattern>
+				<unitPattern count="other">{0} किलोग्राम</unitPattern>
+				<perUnitPattern>{0} प्रति किलोग्राम</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>ग्राम</displayName>
+				<unitPattern count="one">{0} ग्राम</unitPattern>
+				<unitPattern count="other">{0} ग्राम</unitPattern>
+				<perUnitPattern>{0}प्रति ग्राम</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>मिलिग्राम</displayName>
 				<unitPattern count="one">{0}मिलिग्राम</unitPattern>
 				<unitPattern count="other">{0}मिलिग्राम</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>आउन्स</displayName>
-				<unitPattern count="one">{0} आउन्स</unitPattern>
-				<unitPattern count="other">{0} आउन्स</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ट्रोय आउन्स</displayName>
-				<unitPattern count="one">{0} ट्रोय आउन्स</unitPattern>
-				<unitPattern count="other">{0}ट्रोय आउन्स</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>पाउण्ड</displayName>
-				<unitPattern count="one">{0} पाउण्ड</unitPattern>
-				<unitPattern count="other">{0} पाउण्ड</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>माइक्रोग्राम</displayName>
+				<unitPattern count="one">{0}माइक्रोग्राम</unitPattern>
+				<unitPattern count="other">{0}माइक्रोग्राम</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>टन</displayName>
 				<unitPattern count="one">{0}टन</unitPattern>
 				<unitPattern count="other">{0} टन</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>पाउण्ड</displayName>
+				<unitPattern count="one">{0} पाउण्ड</unitPattern>
+				<unitPattern count="other">{0} पाउण्ड</unitPattern>
+				<perUnitPattern>{0}प्रति पाउन्ड</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>आउन्स</displayName>
+				<unitPattern count="one">{0} आउन्स</unitPattern>
+				<unitPattern count="other">{0} आउन्स</unitPattern>
+				<perUnitPattern>{0}प्रति आउन्स</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ट्रोय आउन्स</displayName>
+				<unitPattern count="one">{0} ट्रोय आउन्स</unitPattern>
+				<unitPattern count="other">{0}ट्रोय आउन्स</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>कराट</displayName>
+				<unitPattern count="one">{0}कराट</unitPattern>
+				<unitPattern count="other">{0}कराट</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>गिगावाट</displayName>
 				<unitPattern count="one">{0}गिगावाट</unitPattern>
 				<unitPattern count="other">{0}गिगावाट</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>हर्सपावर</displayName>
-				<unitPattern count="one">{0} हर्सपावर</unitPattern>
-				<unitPattern count="other">{0} हर्सपावर</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>किलोवाट</displayName>
-				<unitPattern count="one">{0} किलोवाट</unitPattern>
-				<unitPattern count="other">{0} किलोवाट</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>मेगावाट</displayName>
 				<unitPattern count="one">{0}मेगावाट</unitPattern>
 				<unitPattern count="other">{0}मेगावाट</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>मिलिवाट</displayName>
-				<unitPattern count="one">{0}मिलिवाट</unitPattern>
-				<unitPattern count="other">{0}मिलिवाट</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>किलोवाट</displayName>
+				<unitPattern count="one">{0} किलोवाट</unitPattern>
+				<unitPattern count="other">{0} किलोवाट</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>वाट</displayName>
 				<unitPattern count="one">{0} वाट</unitPattern>
 				<unitPattern count="other">{0} वाट</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>मिलिवाट</displayName>
+				<unitPattern count="one">{0}मिलिवाट</unitPattern>
+				<unitPattern count="other">{0}मिलिवाट</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>हर्सपावर</displayName>
+				<unitPattern count="one">{0} हर्सपावर</unitPattern>
+				<unitPattern count="other">{0} हर्सपावर</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>हेक्टो पास्कल</displayName>
 				<unitPattern count="one">{0} हेक्टो पास्कल</unitPattern>
 				<unitPattern count="other">{0} हेक्टो पास्कल</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>इन्च पारो</displayName>
-				<unitPattern count="one">{0} इन्च पारो</unitPattern>
-				<unitPattern count="other">{0} इन्च पारो</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>मिलिबार</displayName>
-				<unitPattern count="one">{0} मिलिबार</unitPattern>
-				<unitPattern count="other">{0} मिलिबार</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>मिलिमिटर पारो</displayName>
 				<unitPattern count="one">{0} मिलिमिटर पारो</unitPattern>
@@ -5422,10 +5958,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} पाउन्ड प्रति वर्ग इन्च</unitPattern>
 				<unitPattern count="other">{0}पाउन्ड प्रति वर्ग इन्च</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>कराट</displayName>
-				<unitPattern count="one">{0}कराट</unitPattern>
-				<unitPattern count="other">{0}कराट</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>इन्च पारो</displayName>
+				<unitPattern count="one">{0} इन्च पारो</unitPattern>
+				<unitPattern count="other">{0} इन्च पारो</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>मिलिबार</displayName>
+				<unitPattern count="one">{0} मिलिबार</unitPattern>
+				<unitPattern count="other">{0} मिलिबार</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>किलोमिटर प्रति घण्टा</displayName>
@@ -5442,6 +5983,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">माइल प्रति घण्टा</unitPattern>
 				<unitPattern count="other">{0} माइल प्रति घण्टा</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>नट</displayName>
+				<unitPattern count="one">{0}नट</unitPattern>
+				<unitPattern count="other">{0}नट्स</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>डिग्री सेल्सियस्</displayName>
 				<unitPattern count="one">{0} डिग्री सेल्सियस्</unitPattern>
@@ -5457,31 +6008,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>एकर-फिट</displayName>
-				<unitPattern count="one">{0}एकर-फिट</unitPattern>
-				<unitPattern count="other">{0}एकर-फिट</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>सेन्टिलिटर</displayName>
-				<unitPattern count="one">{0}सेन्टिलिटर</unitPattern>
-				<unitPattern count="other">{0}सेन्टिलिटर</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>घन सेन्टिमिटर</displayName>
-				<unitPattern count="one">{0}घन सेन्टिमिटर</unitPattern>
-				<unitPattern count="other">{0}घन सेन्टिमिटर</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>घन फिट</displayName>
-				<unitPattern count="one">{0}घन फिट</unitPattern>
-				<unitPattern count="other">{0}घन फिट</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>घन इन्च</displayName>
-				<unitPattern count="one">{0}घन इन्च</unitPattern>
-				<unitPattern count="other">{0}घन इन्च</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>घन किलोमिटर</displayName>
 				<unitPattern count="one">{0} घन किलोमिटर</unitPattern>
@@ -5491,6 +6017,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>घन मिटर</displayName>
 				<unitPattern count="one">{0}घन मिटर</unitPattern>
 				<unitPattern count="other">{0}घन मिटर</unitPattern>
+				<perUnitPattern>{0}प्रति घन मिटर</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>घन सेन्टिमिटर</displayName>
+				<unitPattern count="one">{0}घन सेन्टिमिटर</unitPattern>
+				<unitPattern count="other">{0}घन सेन्टिमिटर</unitPattern>
+				<perUnitPattern>{0}प्रति घन सेन्टिमिटर</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>घन माइल</displayName>
@@ -5502,25 +6035,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}घन यार्ड</unitPattern>
 				<unitPattern count="other">{0}घन यार्ड</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>कप्स</displayName>
-				<unitPattern count="one">{0}कप</unitPattern>
-				<unitPattern count="other">{0}कप्स</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>घन फिट</displayName>
+				<unitPattern count="one">{0}घन फिट</unitPattern>
+				<unitPattern count="other">{0}घन फिट</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>डेसिलिटर</displayName>
-				<unitPattern count="one">{0}डेसिलिटर</unitPattern>
-				<unitPattern count="other">{0}डेसिलिटर</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>घन इन्च</displayName>
+				<unitPattern count="one">{0}घन इन्च</unitPattern>
+				<unitPattern count="other">{0}घन इन्च</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>तरल आउन्स</displayName>
-				<unitPattern count="one">{0} तरल आउन्स</unitPattern>
-				<unitPattern count="other">{0}तरल आउन्स</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>गालोन</displayName>
-				<unitPattern count="one">{0}गालोन</unitPattern>
-				<unitPattern count="other">{0} गालोन</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>मेगालिटर</displayName>
+				<unitPattern count="one">{0}मेघालिटर</unitPattern>
+				<unitPattern count="other">{0}मेघालिटर</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>हेक्टोलिटर</displayName>
@@ -5531,27 +6059,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>लिटर</displayName>
 				<unitPattern count="one">{0} लिटर</unitPattern>
 				<unitPattern count="other">{0} लिटर</unitPattern>
+				<perUnitPattern>{0}प्रति लिटर</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>मेगालिटर</displayName>
-				<unitPattern count="one">{0}मेघालिटर</unitPattern>
-				<unitPattern count="other">{0}मेघालिटर</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>डेसिलिटर</displayName>
+				<unitPattern count="one">{0}डेसिलिटर</unitPattern>
+				<unitPattern count="other">{0}डेसिलिटर</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>सेन्टिलिटर</displayName>
+				<unitPattern count="one">{0}सेन्टिलिटर</unitPattern>
+				<unitPattern count="other">{0}सेन्टिलिटर</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>मिलिलिटर</displayName>
 				<unitPattern count="one">{0}मिलिलिटर</unitPattern>
 				<unitPattern count="other">{0}मिलिलिटर</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>पिन्ट</displayName>
-				<unitPattern count="one">{0}पिन्ट</unitPattern>
-				<unitPattern count="other">{0}पिन्ट</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>मेट्रिक पिन्ट्स</displayName>
+				<unitPattern count="one">{0}मेट्रिक पिन्ट</unitPattern>
+				<unitPattern count="other">{0}मेट्रिक पिन्ट्स</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>मेट्रिक कप्स</displayName>
+				<unitPattern count="one">{0}मेट्रिक कप</unitPattern>
+				<unitPattern count="other">{0}मेट्रिक कप्स</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>एकर-फिट</displayName>
+				<unitPattern count="one">{0}एकर-फिट</unitPattern>
+				<unitPattern count="other">{0}एकर-फिट</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>गालोन</displayName>
+				<unitPattern count="one">{0}गालोन</unitPattern>
+				<unitPattern count="other">{0} गालोन</unitPattern>
+				<perUnitPattern>{0}/गालोन</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>क्वार्ट्स</displayName>
 				<unitPattern count="one">{0}क्वार्ट</unitPattern>
 				<unitPattern count="other">{0}क्वार्ट्स</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>पिन्ट</displayName>
+				<unitPattern count="one">{0}पिन्ट</unitPattern>
+				<unitPattern count="other">{0}पिन्ट</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>कप्स</displayName>
+				<unitPattern count="one">{0}कप</unitPattern>
+				<unitPattern count="other">{0}कप्स</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>तरल आउन्स</displayName>
+				<unitPattern count="one">{0} तरल आउन्स</unitPattern>
+				<unitPattern count="other">{0}तरल आउन्स</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>टेबल चम्चा</displayName>
 				<unitPattern count="one">{0} टेबल चम्चा</unitPattern>
@@ -5562,6 +6127,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}चिया चम्चा</unitPattern>
 				<unitPattern count="other">{0}चिया चम्चा</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}पूर्व</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}उत्तर</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}दक्षिण</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}पश्चिम</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -5577,6 +6148,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>परिक्रमा</displayName>
+				<unitPattern count="one">{0}परिक्रमा</unitPattern>
+				<unitPattern count="other">{0}परिक्रमा</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>रेडियन</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>डिग्री</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>आर्क मिनेट</displayName>
 				<unitPattern count="one">{0}आर्क मिनेट</unitPattern>
@@ -5587,30 +6173,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}आर्क सेकेण्ड</unitPattern>
 				<unitPattern count="other">{0}आर्क सेकेण्ड</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>डिग्री</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>रेडियन</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>बर्ग गज</displayName>
-				<unitPattern count="one">{0} बर्ग गज</unitPattern>
-				<unitPattern count="other">{0} बर्ग गज</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>बर्ग किलोमिटर</displayName>
+				<unitPattern count="one">{0} ब.कि.मि.</unitPattern>
+				<unitPattern count="other">{0} ब.कि.मि.</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>हेक्टर</displayName>
 				<unitPattern count="one">{0} हे.</unitPattern>
 				<unitPattern count="other">{0} हे.</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>बर्ग मिटर</displayName>
+				<unitPattern count="one">{0} ब.मि.</unitPattern>
+				<unitPattern count="other">{0} ब.मि.</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>वर्ग सेन्टिमिटर</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>बर्ग माईल</displayName>
+				<unitPattern count="one">{0} बर्ग माईल</unitPattern>
+				<unitPattern count="other">{0} बर्ग माईल</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>बर्ग गज</displayName>
+				<unitPattern count="one">{0} बर्ग गज</unitPattern>
+				<unitPattern count="other">{0} बर्ग गज</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>वर्ग यार्ड</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>बर्ग फुट</displayName>
@@ -5621,91 +6219,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>वर्ग इन्च</displayName>
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>बर्ग किलोमिटर</displayName>
-				<unitPattern count="one">{0} ब.कि.मि.</unitPattern>
-				<unitPattern count="other">{0} ब.कि.मि.</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>बर्ग मिटर</displayName>
-				<unitPattern count="one">{0} ब.मि.</unitPattern>
-				<unitPattern count="other">{0} ब.मि.</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>बर्ग माईल</displayName>
-				<unitPattern count="one">{0} बर्ग माईल</unitPattern>
-				<unitPattern count="other">{0} बर्ग माईल</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>वर्ग यार्ड</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>कराट</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>लिटर/किलोमिटर</displayName>
 				<unitPattern count="one">{0} L/km</unitPattern>
 				<unitPattern count="other">{0} L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>लि./१००कि.मि.</displayName>
+				<unitPattern count="one">{0}लि./१००कि.मि.</unitPattern>
+				<unitPattern count="other">{0}लि./१००कि.मि.</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>माइल/गाल</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>बाइट</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>बाइट</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>शताब्दी</displayName>
+				<unitPattern count="one">{0}शताब्दी</unitPattern>
+				<unitPattern count="other">{0}शताब्दी</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>वर्ष</displayName>
+				<unitPattern count="one">{0} वर्ष</unitPattern>
+				<unitPattern count="other">{0} वर्ष</unitPattern>
+				<perUnitPattern>{0}/वर्ष</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>महिना</displayName>
+				<unitPattern count="one">{0} महिना</unitPattern>
+				<unitPattern count="other">{0} महिना</unitPattern>
+				<perUnitPattern>{0}/महिना</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>हप्ता</displayName>
+				<unitPattern count="one">{0} हप्ता</unitPattern>
+				<unitPattern count="other">{0} हप्ता</unitPattern>
+				<perUnitPattern>{0}/हप्ता</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>दिन</displayName>
 				<unitPattern count="one">{0} दिन</unitPattern>
 				<unitPattern count="other">{0} दिन</unitPattern>
+				<perUnitPattern>{0}/दिन</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>घन्टा</displayName>
@@ -5713,30 +6326,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} घण्टा</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>मिली सेकेण्ड</displayName>
-				<unitPattern count="one">{0} मिली से.</unitPattern>
-				<unitPattern count="other">{0} मिली से.</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>मिनेट</displayName>
 				<unitPattern count="one">{0} मिनेट</unitPattern>
 				<unitPattern count="other">{0} मिनेट</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>महिना</displayName>
-				<unitPattern count="one">{0} महिना</unitPattern>
-				<unitPattern count="other">{0} महिना</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/मिनेट</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>सेकेण्ड</displayName>
@@ -5744,15 +6338,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} सेकेण्ड</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>हप्ता</displayName>
-				<unitPattern count="one">{0} हप्ता</unitPattern>
-				<unitPattern count="other">{0} हप्ता</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>मिली सेकेण्ड</displayName>
+				<unitPattern count="one">{0} मिली से.</unitPattern>
+				<unitPattern count="other">{0} मिली से.</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>वर्ष</displayName>
-				<unitPattern count="one">{0} वर्ष</unitPattern>
-				<unitPattern count="other">{0} वर्ष</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amp</displayName>
@@ -5774,6 +6373,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -5784,21 +6388,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}क्याल</unitPattern>
 				<unitPattern count="other">{0} क्याल</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>जुल</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>किलोजुल</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>जुल</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>किलोवाट-घण्टा</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -5809,201 +6408,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>कि.मि.</displayName>
+				<unitPattern count="one">{0}कि.मि.</unitPattern>
+				<unitPattern count="other">{0}कि.मि.</unitPattern>
+				<perUnitPattern>{0}/कि.मि.</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>से.मी.</displayName>
-				<unitPattern count="one">{0} से.मी.</unitPattern>
-				<unitPattern count="other">{0} से.मी.</unitPattern>
+			<unit type="length-meter">
+				<displayName>मिटर</displayName>
+				<unitPattern count="one">{0} मि.</unitPattern>
+				<unitPattern count="other">{0} मि.</unitPattern>
+				<perUnitPattern>{0}/मिटर</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>फुट</displayName>
-				<unitPattern count="one">{0} फुट</unitPattern>
-				<unitPattern count="other">{0} फुट</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>से.मि.</displayName>
+				<unitPattern count="one">{0}से.मि.</unitPattern>
+				<unitPattern count="other">{0}से.मि.</unitPattern>
+				<perUnitPattern>{0}/से.मि.</perUnitPattern>
 			</unit>
-			<unit type="length-inch">
-				<displayName>इन्च</displayName>
-				<unitPattern count="one">इन्च</unitPattern>
-				<unitPattern count="other">{0} ईञ्‍च</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>कि.मि.</displayName>
-				<unitPattern count="one">{0} कि.मी.</unitPattern>
-				<unitPattern count="other">{0} कि.मी.</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>प्रकाश वर्ष</displayName>
-				<unitPattern count="one">{0} ly</unitPattern>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>मिटर</displayName>
-				<unitPattern count="one">{0} मि.</unitPattern>
-				<unitPattern count="other">{0} मि.</unitPattern>
+			<unit type="length-millimeter">
+				<displayName>मि.मि.</displayName>
+				<unitPattern count="one">मि.मि.</unitPattern>
+				<unitPattern count="other">{0}मि.मि.</unitPattern>
 			</unit>
 			<unit type="length-micrometer">
 				<displayName>µm</displayName>
 				<unitPattern count="one">{0} µm</unitPattern>
 				<unitPattern count="other">{0} µm</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName>माइल</displayName>
-				<unitPattern count="one">{0} माइल</unitPattern>
-				<unitPattern count="other">{0} माइल</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>मि.मी.</displayName>
-				<unitPattern count="one">मि.मी.</unitPattern>
-				<unitPattern count="other">{0} मि.मी.</unitPattern>
-			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>पारसेकेण्ड</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>पिकोमिटर</displayName>
 				<unitPattern count="one">{0}पिकोमिटर</unitPattern>
 				<unitPattern count="other">{0}पिकोमिटर</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>माइल</displayName>
+				<unitPattern count="one">{0} माइल</unitPattern>
+				<unitPattern count="other">{0} माइल</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>गज</displayName>
 				<unitPattern count="one">{0} गज</unitPattern>
 				<unitPattern count="other">{0} गज</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>फिट</displayName>
+				<unitPattern count="one">{0}फिट</unitPattern>
+				<unitPattern count="other">{0}फिट</unitPattern>
+				<perUnitPattern>{0}/फिट</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>इन्च</displayName>
+				<unitPattern count="one">इन्च</unitPattern>
+				<unitPattern count="other">{0}इन्च</unitPattern>
+				<perUnitPattern>{0}/इन्च</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>पारसेकेण्ड</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>प्रकाश वर्ष</displayName>
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>लक्स</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>कराट</displayName>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>ग्राम</displayName>
-				<unitPattern count="one">{0} ग्राम</unitPattern>
-				<unitPattern count="other">{0} ग्राम</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>किलोग्राम</displayName>
-				<unitPattern count="one">{0} किलो</unitPattern>
-				<unitPattern count="other">{0} किलो</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>किलोग्राम</displayName>
+				<unitPattern count="one">{0} किलो</unitPattern>
+				<unitPattern count="other">{0} किलो</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>ग्राम</displayName>
+				<unitPattern count="one">{0} ग्राम</unitPattern>
+				<unitPattern count="other">{0} ग्राम</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>मिलिग्राम</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>आउन्स</displayName>
-				<unitPattern count="one">{0} आउन्स</unitPattern>
-				<unitPattern count="other">{0} आउन्स</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ओज ट्रोय</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>पाउण्ड</displayName>
-				<unitPattern count="one">{0} पाउण्ड</unitPattern>
-				<unitPattern count="other">{0} पाउण्ड</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>टन</displayName>
 				<unitPattern count="one">{0} tn</unitPattern>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>पाउन्ड</displayName>
+				<unitPattern count="one">{0}lb</unitPattern>
+				<unitPattern count="other">{0}lbs</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>आउन्स</displayName>
+				<unitPattern count="one">{0} आउन्स</unitPattern>
+				<unitPattern count="other">{0} आउन्स</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ओज ट्रोय</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>कराट</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>हर्सपावर</displayName>
-				<unitPattern count="one">{0} हर्सपावर</unitPattern>
-				<unitPattern count="other">{0} हर्सपावर</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>किलोवाट</displayName>
-				<unitPattern count="one">{0} किलोवाट</unitPattern>
-				<unitPattern count="other">{0} किलोवाट</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>मेगावाट</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>मिलिवाट</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>किलोवाट</displayName>
+				<unitPattern count="one">{0} किलोवाट</unitPattern>
+				<unitPattern count="other">{0} किलोवाट</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>वाट</displayName>
 				<unitPattern count="one">{0} वाट</unitPattern>
 				<unitPattern count="other">{0} वाट</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>मिलिवाट</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>हर्सपावर</displayName>
+				<unitPattern count="one">{0} हर्सपावर</unitPattern>
+				<unitPattern count="other">{0} हर्सपावर</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>हेक्टो पास्कल</displayName>
 				<unitPattern count="one">{0}hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>इन्च पारो</displayName>
-				<unitPattern count="one">{0} इन्च पारो</unitPattern>
-				<unitPattern count="other">{0} इन्च पारो</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>मिलिबार</displayName>
-				<unitPattern count="one">{0} मिलिबार</unitPattern>
-				<unitPattern count="other">{0} मिलिबार</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -6014,10 +6617,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>कराट</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>इन्च पारो</displayName>
+				<unitPattern count="one">{0} इन्च पारो</unitPattern>
+				<unitPattern count="other">{0} इन्च पारो</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>मिलिबार</displayName>
+				<unitPattern count="one">{0} मिलिबार</unitPattern>
+				<unitPattern count="other">{0} मिलिबार</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>किलोमिटर प्रति घण्टा</displayName>
@@ -6034,6 +6642,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mph</unitPattern>
 				<unitPattern count="other">{0} mph</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>डिग्री सेल्सियस्</displayName>
 				<unitPattern count="one">{0}°से</unitPattern>
@@ -6049,31 +6667,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>एकर फिट</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cL</displayName>
-				<unitPattern count="one">{0} cL</unitPattern>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>घन फिट</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>घन इन्च</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>घन किलोमिटर</displayName>
 				<unitPattern count="one">{0}km³</unitPattern>
@@ -6083,6 +6676,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>घन मिटर</displayName>
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>घन माइल</displayName>
@@ -6094,25 +6694,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>कप्स</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>घन फिट</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="one">{0} dL</unitPattern>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>घन इन्च</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>गाल</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -6123,27 +6718,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>लिटर</displayName>
 				<unitPattern count="one">{0} लि.</unitPattern>
 				<unitPattern count="other">{0} लि.</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="one">{0} ML</unitPattern>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0} dL</unitPattern>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="one">{0} cL</unitPattern>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
 				<unitPattern count="one">{0} mL</unitPattern>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>पिन्ट</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0}mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>एकर फिट</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>गाल</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>क्वार्ट्स</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>पिन्ट</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>कप्स</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>tbsp</displayName>
 				<unitPattern count="one">{0} tbsp</unitPattern>
@@ -6154,6 +6786,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} tsp</unitPattern>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}पूर्व</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}उत्तर</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}दक्षिण</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}पश्चिम</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -6163,6 +6801,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} g</unitPattern>
 				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -6171,26 +6813,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} एकर</unitPattern>
-				<unitPattern count="other">{0} एकर</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} ब.कि.मि.</unitPattern>
+				<unitPattern count="other">{0} ब.कि.मि.</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} हे.</unitPattern>
 				<unitPattern count="other">{0} हे.</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} ब.फु.</unitPattern>
-				<unitPattern count="other">{0} ब.फु.</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} ब.कि.मि.</unitPattern>
-				<unitPattern count="other">{0} ब.कि.मि.</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} ब.मि.</unitPattern>
 				<unitPattern count="other">{0} ब.मि.</unitPattern>
@@ -6199,6 +6829,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} बर्ग माईल</unitPattern>
 				<unitPattern count="other">{0} बर्ग माईल</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} एकर</unitPattern>
+				<unitPattern count="other">{0} एकर</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ब.फु.</unitPattern>
+				<unitPattern count="other">{0} ब.फु.</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>लि./१००कि.मि.</displayName>
+				<unitPattern count="one">{0}L/100km</unitPattern>
+				<unitPattern count="other">{0}L/100km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>वर्ष</displayName>
+				<unitPattern count="one">{0} वर्ष</unitPattern>
+				<unitPattern count="other">{0} वर्ष</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>महिना</displayName>
+				<unitPattern count="one">{0} महिना</unitPattern>
+				<unitPattern count="other">{0} महिना</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>हप्ता</displayName>
+				<unitPattern count="one">{0} हप्ता</unitPattern>
+				<unitPattern count="other">{0} हप्ता</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>दिन</displayName>
 				<unitPattern count="one">{0} दिन</unitPattern>
@@ -6209,38 +6867,52 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} घण्टा</unitPattern>
 				<unitPattern count="other">{0} घण्टा</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>मिली सेकेण्ड</displayName>
-				<unitPattern count="one">{0}मि.से.</unitPattern>
-				<unitPattern count="other">{0}मि.से.</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>मिनेट</displayName>
 				<unitPattern count="one">{0} मिनेट</unitPattern>
 				<unitPattern count="other">{0} मिनेट</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>महिना</displayName>
-				<unitPattern count="one">{0} महिना</unitPattern>
-				<unitPattern count="other">{0} महिना</unitPattern>
-			</unit>
 			<unit type="duration-second">
+				<displayName>सेकेण्ड</displayName>
 				<unitPattern count="one">{0} सेकेण्ड</unitPattern>
 				<unitPattern count="other">{0} सेकेण्ड</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>हप्ता</displayName>
-				<unitPattern count="one">{0} हप्ता</unitPattern>
-				<unitPattern count="other">{0} हप्ता</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>मिली सेकेण्ड</displayName>
+				<unitPattern count="one">{0}मि.से.</unitPattern>
+				<unitPattern count="other">{0}मि.से.</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>वर्ष</displayName>
-				<unitPattern count="one">{0} वर्ष</unitPattern>
-				<unitPattern count="other">{0} वर्ष</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>कि.मि.</displayName>
+				<unitPattern count="one">{0}कि.मि.</unitPattern>
+				<unitPattern count="other">{0}कि.मि.</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>मिटर</displayName>
+				<unitPattern count="one">{0} मि.</unitPattern>
+				<unitPattern count="other">{0} मि.</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
-				<unitPattern count="one">{0} से.मी.</unitPattern>
-				<unitPattern count="other">{0} से.मी.</unitPattern>
+				<displayName>से.मि.</displayName>
+				<unitPattern count="one">{0}से.मि.</unitPattern>
+				<unitPattern count="other">{0}से.मि.</unitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>मि.मि.</displayName>
+				<unitPattern count="one">{0}मि.मि.</unitPattern>
+				<unitPattern count="other">{0}मि.मि.</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<unitPattern count="one">{0} pm</unitPattern>
+				<unitPattern count="other">{0} pm</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} माईल</unitPattern>
+				<unitPattern count="other">{0} माईल</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<unitPattern count="one">{0} गज</unitPattern>
+				<unitPattern count="other">{0} गज</unitPattern>
 			</unit>
 			<unit type="length-foot">
 				<unitPattern count="one">{0}′</unitPattern>
@@ -6250,59 +6922,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="length-kilometer">
-				<displayName>कि.मी.</displayName>
-				<unitPattern count="one">{0} कि.मी.</unitPattern>
-				<unitPattern count="other">{0} कि.मी.</unitPattern>
-			</unit>
 			<unit type="length-light-year">
 				<unitPattern count="one">{0} ly</unitPattern>
 				<unitPattern count="other">{0} ly</unitPattern>
 			</unit>
-			<unit type="length-meter">
-				<displayName>मिटर</displayName>
-				<unitPattern count="one">{0} मि.</unitPattern>
-				<unitPattern count="other">{0} मि.</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} माईल</unitPattern>
-				<unitPattern count="other">{0} माईल</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>मि.मी.</displayName>
-				<unitPattern count="one">{0} मि.मी.</unitPattern>
-				<unitPattern count="other">{0}मि.मी.</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<unitPattern count="one">{0} pm</unitPattern>
-				<unitPattern count="other">{0} pm</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<unitPattern count="one">{0} गज</unitPattern>
-				<unitPattern count="other">{0} गज</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>ग्राम</displayName>
-				<unitPattern count="one">{0} ग्राम</unitPattern>
-				<unitPattern count="other">{0} ग्राम</unitPattern>
-			</unit>
 			<unit type="mass-kilogram">
 				<displayName>किलो</displayName>
 				<unitPattern count="one">{0} किलो</unitPattern>
 				<unitPattern count="other">{0} किलो</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} आऊन्स</unitPattern>
-				<unitPattern count="other">{0} आऊन्स</unitPattern>
+			<unit type="mass-gram">
+				<displayName>ग्राम</displayName>
+				<unitPattern count="one">{0} ग्राम</unitPattern>
+				<unitPattern count="other">{0} ग्राम</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} पाउण्ड</unitPattern>
 				<unitPattern count="other">{0} पाउण्ड</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>हर्सपावर</displayName>
-				<unitPattern count="one">{0} हर्सपावर</unitPattern>
-				<unitPattern count="other">{0} हर्सपावर</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} आऊन्स</unitPattern>
+				<unitPattern count="other">{0} आऊन्स</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName>किलोवाट</displayName>
@@ -6313,6 +6953,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} वाट</unitPattern>
 				<unitPattern count="other">{0} वाट</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<displayName>हर्सपावर</displayName>
+				<unitPattern count="one">{0} हर्सपावर</unitPattern>
+				<unitPattern count="other">{0} हर्सपावर</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
@@ -6360,6 +7005,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} लि.</unitPattern>
 				<unitPattern count="other">{0} लि.</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}पूर्व</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}उत्तर</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}दक्षिण</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}पश्चिम</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ne_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ne_IN.xml
new file mode 100644
index 00000000000..2c598b296ca
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ne_IN.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="ne"/>
+		<territory type="IN"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>h:mm:ss a zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>h:mm:ss a z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>h:mm:ss a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>h:mm a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+		<timeZoneNames>
+			<metazone type="India">
+				<short>
+					<standard>IST</standard>
+				</short>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ne_NP.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ne_NP.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ne_NP.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ne_NP.xml
index 58bed0cbaf4..91ab4d811d3 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ne_NP.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ne_NP.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ne"/>
 		<territory type="NP"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nl.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl.xml
similarity index 76%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nl.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl.xml
index bd2213c6704..32ce02ce0f0 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nl.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12381 $"/>
 		<language type="nl"/>
 	</identity>
 	<localeDisplayNames>
@@ -59,7 +58,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ay">Aymara</language>
 			<language type="az">Azerbeidzjaans</language>
 			<language type="az" alt="short">Azeri</language>
-			<language type="azb">Zuid-Azerbeidzjaans Arabisch</language>
 			<language type="ba">Basjkiers</language>
 			<language type="bal">Beloetsji</language>
 			<language type="ban">Balinees</language>
@@ -76,6 +74,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bfd">Bafut</language>
 			<language type="bfq">Badaga</language>
 			<language type="bg">Bulgaars</language>
+			<language type="bgn">Westers Beloetsji</language>
 			<language type="bho">Bhojpuri</language>
 			<language type="bi">Bislama</language>
 			<language type="bik">Bikol</language>
@@ -162,7 +161,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="en_AU">Australisch Engels</language>
 			<language type="en_CA">Canadees Engels</language>
 			<language type="en_GB">Brits Engels</language>
+			<language type="en_GB" alt="short">Engels (VK)</language>
 			<language type="en_US">Amerikaans Engels</language>
+			<language type="en_US" alt="short">Engels (VS)</language>
 			<language type="enm">Middelengels</language>
 			<language type="eo">Esperanto</language>
 			<language type="es">Spaans</language>
@@ -198,7 +199,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ga">Iers</language>
 			<language type="gaa">Ga</language>
 			<language type="gag">Gagaoezisch</language>
-			<language type="gan" draft="provisional">Gan</language>
+			<language type="gan" draft="contributed">Ganyu</language>
 			<language type="gay">Gayo</language>
 			<language type="gba">Gbaya</language>
 			<language type="gbz">Zoroastrisch Dari</language>
@@ -335,6 +336,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">Laotiaans</language>
 			<language type="lol">Mongo</language>
 			<language type="loz">Lozi</language>
+			<language type="lrc">Noordelijk Luri</language>
 			<language type="lt">Litouws</language>
 			<language type="ltg">Letgaals</language>
 			<language type="lu">Luba-Katanga</language>
@@ -489,6 +491,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sco">Schots</language>
 			<language type="sd">Sindhi</language>
 			<language type="sdc">Sassarees</language>
+			<language type="sdh">Pahlavani</language>
 			<language type="se">Noord-Samisch</language>
 			<language type="see">Seneca</language>
 			<language type="seh">Sena</language>
@@ -531,8 +534,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">Soemerisch</language>
 			<language type="sv">Zweeds</language>
 			<language type="sw">Swahili</language>
+			<language type="sw_CD">Congo Swahili</language>
 			<language type="swb">Shimaore</language>
-			<language type="swc">Congo Swahili</language>
 			<language type="syc">Klassiek Syrisch</language>
 			<language type="syr">Syrisch</language>
 			<language type="szl">Silezisch</language>
@@ -544,7 +547,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ter">Tereno</language>
 			<language type="tet">Tetun</language>
 			<language type="tg">Tadzjieks</language>
-			<language type="th">Thais</language>
+			<language type="th">Thai</language>
 			<language type="ti">Tigrinya</language>
 			<language type="tig">Tigre</language>
 			<language type="tiv">Tiv</language>
@@ -554,7 +557,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="tl">Tagalog</language>
 			<language type="tlh">Klingon</language>
 			<language type="tli">Tlingit</language>
-			<language type="tly" draft="provisional">Talisch</language>
+			<language type="tly">Talysh</language>
 			<language type="tmh">Tamashek</language>
 			<language type="tn">Tswana</language>
 			<language type="to">Tongaans</language>
@@ -574,7 +577,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="twq">Tasawaq</language>
 			<language type="ty">Tahitiaans</language>
 			<language type="tyv">Toevaans</language>
-			<language type="tzm" draft="contributed">Tamazight (Centraal-Marokko)</language>
+			<language type="tzm">Tamazight (Centraal-Marokko)</language>
 			<language type="udm">Oedmoerts</language>
 			<language type="ug">Oeigoers</language>
 			<language type="uga">Oegaritisch</language>
@@ -589,7 +592,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="vep">Wepsisch</language>
 			<language type="vi">Vietnamees</language>
 			<language type="vls">West-Vlaams</language>
-			<language type="vmf" draft="provisional">Mainfränkisch</language>
+			<language type="vmf" draft="contributed">Opperfrankisch</language>
 			<language type="vo">Volapük</language>
 			<language type="vot">Votisch</language>
 			<language type="vro">Võro</language>
@@ -599,6 +602,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">Wolaytta</language>
 			<language type="war">Waray</language>
 			<language type="was">Washo</language>
+			<language type="wbp">Warlpiri</language>
 			<language type="wo">Wolof</language>
 			<language type="wuu">Wuyu</language>
 			<language type="xal">Kalmuks</language>
@@ -630,6 +634,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<scripts>
 			<script type="Afak" draft="contributed">Defaka</script>
 			<script type="Aghb" draft="contributed">Kaukasisch Albanees</script>
+			<script type="Ahom" draft="contributed">Ahom</script>
 			<script type="Arab">Arabisch</script>
 			<script type="Arab" alt="variant">Perso-Arabisch</script>
 			<script type="Armi">Keizerlijk Aramees</script>
@@ -679,6 +684,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Hans" alt="stand-alone">vereenvoudigd Chinees</script>
 			<script type="Hant">traditioneel</script>
 			<script type="Hant" alt="stand-alone">traditioneel Chinees</script>
+			<script type="Hatr" draft="contributed">Hatran</script>
 			<script type="Hebr">Hebreeuws</script>
 			<script type="Hira">Hiragana</script>
 			<script type="Hluw" draft="contributed">Anatolische hiërogliefen</script>
@@ -725,6 +731,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Moon">Moon</script>
 			<script type="Mroo" draft="contributed">Mro</script>
 			<script type="Mtei">Meitei</script>
+			<script type="Mult" draft="contributed">Multani</script>
 			<script type="Mymr">Birmaans</script>
 			<script type="Narb" draft="contributed">Oud Noord-Arabisch</script>
 			<script type="Nbat" draft="contributed">Nabateaans</script>
@@ -746,6 +753,54 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Phnx">Foenicisch</script>
 			<script type="Plrd">Pollard-fonetisch</script>
 			<script type="Prti">Inscriptioneel Parthisch</script>
+			<script type="Qaaa" draft="contributed">Qaaa</script>
+			<script type="Qaab" draft="contributed">Qaab</script>
+			<script type="Qaac" draft="contributed">Qaac</script>
+			<script type="Qaad" draft="contributed">Qaad</script>
+			<script type="Qaae" draft="contributed">Qaae</script>
+			<script type="Qaaf" draft="contributed">Qaaf</script>
+			<script type="Qaag" draft="contributed">Qaag</script>
+			<script type="Qaah" draft="contributed">Qaah</script>
+			<script type="Qaak" draft="contributed">Qaak</script>
+			<script type="Qaal" draft="contributed">Qaal</script>
+			<script type="Qaam" draft="contributed">Qaam</script>
+			<script type="Qaan" draft="contributed">Qaan</script>
+			<script type="Qaao" draft="contributed">Qaao</script>
+			<script type="Qaap" draft="contributed">Qaap</script>
+			<script type="Qaaq" draft="contributed">Qaaq</script>
+			<script type="Qaar" draft="contributed">Qaar</script>
+			<script type="Qaas" draft="contributed">Qaas</script>
+			<script type="Qaat" draft="contributed">Qaat</script>
+			<script type="Qaau" draft="contributed">Qaau</script>
+			<script type="Qaav" draft="contributed">Qaav</script>
+			<script type="Qaaw" draft="contributed">Qaaw</script>
+			<script type="Qaax" draft="contributed">Qaax</script>
+			<script type="Qaay" draft="contributed">Qaay</script>
+			<script type="Qaaz" draft="contributed">Qaaz</script>
+			<script type="Qaba" draft="contributed">Qaba</script>
+			<script type="Qabb" draft="contributed">Qabb</script>
+			<script type="Qabc" draft="contributed">Qabc</script>
+			<script type="Qabd" draft="contributed">Qabd</script>
+			<script type="Qabe" draft="contributed">Qabe</script>
+			<script type="Qabf" draft="contributed">Qabf</script>
+			<script type="Qabg" draft="contributed">Qabg</script>
+			<script type="Qabh" draft="contributed">Qabh</script>
+			<script type="Qabi" draft="contributed">Qabi</script>
+			<script type="Qabj" draft="contributed">Qabj</script>
+			<script type="Qabk" draft="contributed">Qabk</script>
+			<script type="Qabl" draft="contributed">Qabl</script>
+			<script type="Qabm" draft="contributed">Qabm</script>
+			<script type="Qabn" draft="contributed">Qabn</script>
+			<script type="Qabo" draft="contributed">Qabo</script>
+			<script type="Qabp" draft="contributed">Qabp</script>
+			<script type="Qabq" draft="contributed">Qabq</script>
+			<script type="Qabr" draft="contributed">Qabr</script>
+			<script type="Qabs" draft="contributed">Qabs</script>
+			<script type="Qabt" draft="contributed">Qabt</script>
+			<script type="Qabu" draft="contributed">Qabu</script>
+			<script type="Qabv" draft="contributed">Qabv</script>
+			<script type="Qabw" draft="contributed">Qabw</script>
+			<script type="Qabx" draft="contributed">Qabx</script>
 			<script type="Rjng">Rejang</script>
 			<script type="Roro">Rongorongo</script>
 			<script type="Runr">Runic</script>
@@ -835,7 +890,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albanië</territory>
 			<territory type="AM">Armenië</territory>
-			<territory type="AN">Nederlandse Antillen</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antarctica</territory>
 			<territory type="AR">Argentinië</territory>
@@ -864,7 +918,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BT">Bhutan</territory>
 			<territory type="BV">Bouveteiland</territory>
 			<territory type="BW">Botswana</territory>
-			<territory type="BY">Wit-Rusland</territory>
+			<territory type="BY">Belarus</territory>
 			<territory type="BZ">Belize</territory>
 			<territory type="CA">Canada</territory>
 			<territory type="CC">Cocoseilanden</territory>
@@ -962,7 +1016,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="KP">Noord-Korea</territory>
 			<territory type="KR">Zuid-Korea</territory>
 			<territory type="KW">Koeweit</territory>
-			<territory type="KY">Caymaneilanden</territory>
+			<territory type="KY">Kaaimaneilanden</territory>
 			<territory type="KZ">Kazachstan</territory>
 			<territory type="LA">Laos</territory>
 			<territory type="LB">Libanon</territory>
@@ -1059,7 +1113,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="TA">Tristan da Cunha</territory>
 			<territory type="TC">Turks- en Caicoseilanden</territory>
 			<territory type="TD">Tsjaad</territory>
-			<territory type="TF">Franse Zuidelijke Gebieden</territory>
+			<territory type="TF">Franse Gebieden in de zuidelijke Indische Oceaan</territory>
 			<territory type="TG">Togo</territory>
 			<territory type="TH">Thailand</territory>
 			<territory type="TJ">Tadzjikistan</territory>
@@ -1105,7 +1159,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<variant type="1694ACAD">Vroeg modern Frans</variant>
 			<variant type="1959ACAD" draft="contributed">Academisch</variant>
 			<variant type="ALALC97" draft="contributed">Romanisering ALA-LC, editie 1997</variant>
-			<variant type="ALUKU" draft="contributed">Aloekoe dialect</variant>
+			<variant type="ALUKU" draft="contributed">Aloekoe-dialect</variant>
 			<variant type="AREVELA">Oost-Armeens</variant>
 			<variant type="AREVMDA">West-Armeens</variant>
 			<variant type="BAKU1926">Eenvormig Turkse Latijnse alfabet</variant>
@@ -1121,21 +1175,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<variant type="EMODENG" draft="contributed">Vroegmodern Engels</variant>
 			<variant type="FONIPA">Internationaal Fonetisch Alfabet</variant>
 			<variant type="FONUPA">Oeralisch Fonetisch Alfabet</variant>
-			<variant type="FONXSAMP" draft="contributed">Fonxsamp</variant>
+			<variant type="FONXSAMP" draft="contributed">Transcriptie volgens X-SAMPA</variant>
 			<variant type="HEPBURN" draft="contributed">Hepburn-romanisering</variant>
 			<variant type="HOGNORSK" draft="contributed">Hoognoors</variant>
 			<variant type="IJEKAVSK" draft="contributed">Servisch met Ijekaviaanse uitspraak</variant>
-			<variant type="ITIHASA" draft="contributed">Itihasa</variant>
+			<variant type="ITIHASA" draft="contributed">Episch Sanskriet</variant>
 			<variant type="JAUER" draft="contributed">Jauer</variant>
 			<variant type="JYUTPING" draft="contributed">Jyutping</variant>
 			<variant type="KKCOR" draft="contributed">Algemene spelling</variant>
+			<variant type="KOCIEWIE" draft="contributed">Kociewie</variant>
 			<variant type="KSCOR" draft="contributed">Standaardspelling</variant>
 			<variant type="LAUKIKA" draft="contributed">Laukika</variant>
 			<variant type="LIPAW">Het Lipovaz-dialect van het Resiaans</variant>
-			<variant type="LUNA1918" draft="contributed">Luna1918</variant>
+			<variant type="LUNA1918" draft="contributed">Russische spelling van 1917</variant>
 			<variant type="METELKO" draft="contributed">Metelko-alfabet</variant>
 			<variant type="MONOTON">Monotonaal</variant>
-			<variant type="NDYUKA" draft="contributed">Ndyuka</variant>
+			<variant type="NDYUKA" draft="contributed">Ndyuka-dialect</variant>
 			<variant type="NEDIS">Natisone-dialect</variant>
 			<variant type="NJIVA">Gniva/Njiva-dialect</variant>
 			<variant type="NULIK" draft="contributed">Modern Volapük</variant>
@@ -1180,6 +1235,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">Numeriek sorteren</key>
 			<key type="colStrength" draft="contributed">Sorteervoorrang</key>
 			<key type="currency">valuta</key>
+			<key type="hc">uursysteem (12 of 24)</key>
+			<key type="lb">stijl regelafbreking</key>
+			<key type="ms">maatsysteem</key>
 			<key type="numbers">cijfers</key>
 			<key type="timezone" draft="contributed">Tijdzone</key>
 			<key type="va" draft="contributed">Landvariant</key>
@@ -1187,121 +1245,133 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x" draft="contributed">Privégebruik</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Arabisch-Indische cijfers</type>
-			<type type="arabext" key="numbers">uitgebreide Arabisch-Indische cijfers</type>
-			<type type="armn" key="numbers">Armeense cijfers</type>
-			<type type="armnlow" key="numbers">kleine Armeense cijfers</type>
-			<type type="bali" key="numbers" draft="contributed">Balinese cijfers</type>
-			<type type="beng" key="numbers">Bengaalse cijfers</type>
-			<type type="big5han" key="collation">Traditioneel-Chinese sorteervolgorde - Big5</type>
-			<type type="brah" key="numbers" draft="contributed">Brahmi cijfers</type>
-			<type type="buddhist" key="calendar">Boeddhistische kalender</type>
-			<type type="cakm" key="numbers" draft="contributed">Chakma cijfers</type>
-			<type type="cham" key="numbers" draft="contributed">Cham cijfers</type>
-			<type type="chinese" key="calendar">Chinese kalender</type>
-			<type type="coptic" key="calendar">Koptische kalender</type>
-			<type type="dangi" key="calendar">Dangi-kalender</type>
-			<type type="deva" key="numbers">Devanagari cijfers</type>
-			<type type="dictionary" key="collation">Woordenboeksorteervolgorde</type>
-			<type type="ducet" key="collation">standaard Unicode-sorteervolgorde</type>
-			<type type="eor" key="collation" draft="contributed">Europese sorteerregels</type>
-			<type type="ethi" key="numbers">Ethiopische cijfers</type>
-			<type type="ethiopic" key="calendar">Ethiopische kalender</type>
-			<type type="ethiopic-amete-alem" key="calendar">Ethiopische Amete Alem-kalender</type>
-			<type type="finance" key="numbers" draft="contributed">Financiële cijfers</type>
-			<type type="fullwide" key="numbers">cijfers met volledige breedte</type>
-			<type type="gb2312han" key="collation">Vereenvoudigd-Chinese sorteervolgorde - GB2312</type>
-			<type type="geor" key="numbers">Georgische cijfers</type>
-			<type type="gregorian" key="calendar">Gregoriaanse kalender</type>
-			<type type="grek" key="numbers">Griekse cijfers</type>
-			<type type="greklow" key="numbers">kleine Griekse cijfers</type>
-			<type type="gujr" key="numbers">Gujarati cijfers</type>
-			<type type="guru" key="numbers">Gurmukhi cijfers</type>
-			<type type="hanidec" key="numbers">Chinese decimale getallen</type>
-			<type type="hans" key="numbers">vereenvoudigd Chinese cijfers</type>
-			<type type="hansfin" key="numbers">vereenvoudigd Chinese financiële cijfers</type>
-			<type type="hant" key="numbers">traditioneel Chinese cijfers</type>
-			<type type="hantfin" key="numbers">traditioneel Chinese financiële cijfers</type>
-			<type type="hebr" key="numbers">Hebreeuwse cijfers</type>
-			<type type="hebrew" key="calendar">Hebreeuwse kalender</type>
-			<type type="identical" key="colStrength" draft="contributed">Alles sorteren</type>
-			<type type="indian" key="calendar">Indiase nationale kalender</type>
-			<type type="islamic" key="calendar">Islamitische kalender</type>
-			<type type="islamic-civil" key="calendar">Islamitische kalender (cyclisch)</type>
-			<type type="islamic-rgsa" key="calendar" draft="contributed">Islamitische kalender (Saudi–Arabië)</type>
-			<type type="islamic-tbla" key="calendar" draft="contributed">Islamitische kalender (epoche)</type>
-			<type type="islamic-umalqura" key="calendar" draft="contributed">Islamitische kalender (Umm al-Qura)</type>
-			<type type="iso8601" key="calendar">ISO-8601-kalender</type>
-			<type type="japanese" key="calendar">Japanse kalender</type>
-			<type type="java" key="numbers" draft="contributed">Javaanse cijfers</type>
-			<type type="jpan" key="numbers">Japanse cijfers</type>
-			<type type="jpanfin" key="numbers">Japanse financiële cijfers</type>
-			<type type="kali" key="numbers" draft="contributed">Kayah Li cijfers</type>
-			<type type="khmr" key="numbers">Khmer cijfers</type>
-			<type type="knda" key="numbers">Kannada cijfers</type>
-			<type type="lana" key="numbers" draft="contributed">Tai Tham Hora cijfers</type>
-			<type type="lanatham" key="numbers" draft="contributed">Tai Tham Tham cijfers</type>
-			<type type="laoo" key="numbers">Laotiaanse cijfers</type>
-			<type type="latn" key="numbers">Westerse cijfers</type>
-			<type type="lepc" key="numbers" draft="contributed">Lepcha cijfers</type>
-			<type type="limb" key="numbers" draft="contributed">Limbu cijfers</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">Eerst sorteren op kleine letters</type>
-			<type type="mlym" key="numbers">Malayalam cijfers</type>
-			<type type="mong" key="numbers">Mongoolse cijfers</type>
-			<type type="mtei" key="numbers" draft="contributed">Meetei Mayek cijfers</type>
-			<type type="mymr" key="numbers">Myanmarese cijfers</type>
-			<type type="mymrshan" key="numbers" draft="contributed">Myanmarese Shan cijfers</type>
-			<type type="native" key="numbers" draft="contributed">Binnenlandse cijfers</type>
-			<type type="nkoo" key="numbers" draft="contributed">N’Ko cijfers</type>
-			<type type="no" key="colBackwards" draft="contributed">Normaal sorteren op accenten</type>
-			<type type="no" key="colCaseFirst" draft="contributed">Sorteervolgorde algemeen hoofdlettergebruik</type>
-			<type type="no" key="colCaseLevel" draft="contributed">Niet hoofdlettergevoelig sorteren</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">Kana afzonderlijk sorteren</type>
-			<type type="no" key="colNormalization" draft="contributed">Zonder normalisatie sorteren</type>
-			<type type="no" key="colNumeric" draft="contributed">Cijfers afzonderlijk sorteren</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">Symbolen sorteren</type>
-			<type type="olck" key="numbers" draft="contributed">Ol Chiki cijfers</type>
-			<type type="orya" key="numbers">Odia cijfers</type>
-			<type type="osma" key="numbers" draft="contributed">Osmanya cijfers</type>
-			<type type="persian" key="calendar">Perzische kalender</type>
-			<type type="phonebook" key="collation">Telefoonboeksorteervolgorde</type>
-			<type type="phonetic" key="collation" draft="contributed">Fonetische sorteervolgorde</type>
-			<type type="pinyin" key="collation">Pinyinvolgorde</type>
-			<type type="primary" key="colStrength" draft="contributed">Alleen sorteren op letters</type>
-			<type type="quaternary" key="colStrength" draft="contributed">Sorteren op accenten/hoofdlettergebruik/breedte/Kana</type>
-			<type type="reformed" key="collation">Herziene sorteervolgorde</type>
-			<type type="roc" key="calendar">Kalender van de Chinese Republiek</type>
-			<type type="roman" key="numbers">Romeinse cijfers</type>
-			<type type="romanlow" key="numbers">kleine Romeinse cijfers</type>
-			<type type="saur" key="numbers" draft="contributed">Saurashtra cijfers</type>
-			<type type="search" key="collation">algemeen zoeken</type>
-			<type type="searchjl" key="collation" draft="contributed">Zoeken op eerste Hangul-medeklinker</type>
-			<type type="secondary" key="colStrength" draft="contributed">Sorteren op accenten</type>
-			<type type="shifted" key="colAlternate" draft="contributed">Sorteren zonder symbolen</type>
-			<type type="shrd" key="numbers" draft="contributed">Sharada cijfers</type>
-			<type type="sora" key="numbers" draft="contributed">Sora Sompeng cijfers</type>
-			<type type="standard" key="collation" draft="contributed">standaard sorteervolgorde</type>
-			<type type="stroke" key="collation">Streeksorteervolgorde</type>
-			<type type="sund" key="numbers" draft="contributed">Sundanese cijfers</type>
-			<type type="takr" key="numbers" draft="contributed">Takri cijfers</type>
-			<type type="talu" key="numbers" draft="contributed">nieuwe Tai Lue cijfers</type>
-			<type type="taml" key="numbers">traditionele Tamil cijfers</type>
-			<type type="tamldec" key="numbers">Tamil cijfers</type>
-			<type type="telu" key="numbers">Telugu cijfers</type>
-			<type type="tertiary" key="colStrength" draft="contributed">Sorteren op accenten/hoofdlettergebruik/breedte</type>
-			<type type="thai" key="numbers">Thaise cijfers</type>
-			<type type="tibt" key="numbers">Tibetaanse cijfers</type>
-			<type type="traditional" key="collation">Traditionele sorteervolgorde</type>
-			<type type="traditional" key="numbers" draft="contributed">Traditionele cijfers</type>
-			<type type="unihan" key="collation">Sorteervolgorde radicalen/strepen</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">Eerst sorteren op hoofdletters</type>
-			<type type="vaii" key="numbers" draft="contributed">Vai-cijfers</type>
-			<type type="yes" key="colBackwards" draft="contributed">Omgekeerd sorteren op accenten</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">Hoofdlettergevoelig sorteren</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">Kana anders sorteren</type>
-			<type type="yes" key="colNormalization" draft="contributed">Unicode genormaliseerd sorteren</type>
-			<type type="yes" key="colNumeric" draft="contributed">Cijfers numeriek sorteren</type>
-			<type type="zhuyin" key="collation" draft="contributed">Zhuyinvolgorde</type>
+			<type key="calendar" type="buddhist">Boeddhistische kalender</type>
+			<type key="calendar" type="chinese">Chinese kalender</type>
+			<type key="calendar" type="coptic">Koptische kalender</type>
+			<type key="calendar" type="dangi">Dangi-kalender</type>
+			<type key="calendar" type="ethiopic">Ethiopische kalender</type>
+			<type key="calendar" type="ethiopic-amete-alem">Ethiopische Amete Alem-kalender</type>
+			<type key="calendar" type="gregorian">Gregoriaanse kalender</type>
+			<type key="calendar" type="hebrew">Hebreeuwse kalender</type>
+			<type key="calendar" type="indian">Indiase nationale kalender</type>
+			<type key="calendar" type="islamic">Islamitische kalender</type>
+			<type key="calendar" type="islamic-civil">Islamitische kalender (cyclisch)</type>
+			<type key="calendar" type="islamic-rgsa" draft="contributed">Islamitische kalender (Saudi–Arabië)</type>
+			<type key="calendar" type="islamic-tbla" draft="contributed">Islamitische kalender (epoche)</type>
+			<type key="calendar" type="islamic-umalqura" draft="contributed">Islamitische kalender (Umm al-Qura)</type>
+			<type key="calendar" type="iso8601">ISO-8601-kalender</type>
+			<type key="calendar" type="japanese">Japanse kalender</type>
+			<type key="calendar" type="persian">Perzische kalender</type>
+			<type key="calendar" type="roc">Kalender van de Chinese Republiek</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">Symbolen sorteren</type>
+			<type key="colAlternate" type="shifted" draft="contributed">Sorteren zonder symbolen</type>
+			<type key="colBackwards" type="no" draft="contributed">Normaal sorteren op accenten</type>
+			<type key="colBackwards" type="yes" draft="contributed">Omgekeerd sorteren op accenten</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">Eerst sorteren op kleine letters</type>
+			<type key="colCaseFirst" type="no" draft="contributed">Sorteervolgorde algemeen hoofdlettergebruik</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">Eerst sorteren op hoofdletters</type>
+			<type key="colCaseLevel" type="no" draft="contributed">Niet hoofdlettergevoelig sorteren</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">Hoofdlettergevoelig sorteren</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">Kana afzonderlijk sorteren</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">Kana anders sorteren</type>
+			<type key="collation" type="big5han">Traditioneel-Chinese sorteervolgorde - Big5</type>
+			<type key="collation" type="compat" draft="contributed">vorige sorteervolgorde, voor compatibiliteit</type>
+			<type key="collation" type="dictionary">Woordenboeksorteervolgorde</type>
+			<type key="collation" type="ducet">standaard Unicode-sorteervolgorde</type>
+			<type key="collation" type="emoji" draft="contributed">emojisorteervolgorde</type>
+			<type key="collation" type="eor" draft="contributed">Europese sorteerregels</type>
+			<type key="collation" type="gb2312han">Vereenvoudigd-Chinese sorteervolgorde - GB2312</type>
+			<type key="collation" type="phonebook">Telefoonboeksorteervolgorde</type>
+			<type key="collation" type="phonetic" draft="contributed">Fonetische sorteervolgorde</type>
+			<type key="collation" type="pinyin">Pinyinvolgorde</type>
+			<type key="collation" type="reformed">Herziene sorteervolgorde</type>
+			<type key="collation" type="search">algemeen zoeken</type>
+			<type key="collation" type="searchjl" draft="contributed">Zoeken op eerste Hangul-medeklinker</type>
+			<type key="collation" type="standard">standaard sorteervolgorde</type>
+			<type key="collation" type="stroke">Streeksorteervolgorde</type>
+			<type key="collation" type="traditional">Traditionele sorteervolgorde</type>
+			<type key="collation" type="unihan">Sorteervolgorde radicalen/strepen</type>
+			<type key="collation" type="zhuyin" draft="contributed">Zhuyinvolgorde</type>
+			<type key="colNormalization" type="no" draft="contributed">Zonder normalisatie sorteren</type>
+			<type key="colNormalization" type="yes" draft="contributed">Unicode genormaliseerd sorteren</type>
+			<type key="colNumeric" type="no" draft="contributed">Cijfers afzonderlijk sorteren</type>
+			<type key="colNumeric" type="yes" draft="contributed">Cijfers numeriek sorteren</type>
+			<type key="colStrength" type="identical" draft="contributed">Alles sorteren</type>
+			<type key="colStrength" type="primary" draft="contributed">Alleen sorteren op letters</type>
+			<type key="colStrength" type="quaternary" draft="contributed">Sorteren op accenten/hoofdlettergebruik/breedte/Kana</type>
+			<type key="colStrength" type="secondary" draft="contributed">Sorteren op accenten</type>
+			<type key="colStrength" type="tertiary" draft="contributed">Sorteren op accenten/hoofdlettergebruik/breedte</type>
+			<type key="hc" type="h11">12-uursysteem (0-11)</type>
+			<type key="hc" type="h12">12-uursysteem (1-12)</type>
+			<type key="hc" type="h23">24-uursysteem (0-23)</type>
+			<type key="hc" type="h24">24-uursysteem (1-24)</type>
+			<type key="lb" type="loose">losse stijl regelafbreking</type>
+			<type key="lb" type="normal">normale stijl regelafbreking</type>
+			<type key="lb" type="strict">strikte stijl regelafbreking</type>
+			<type key="ms" type="metric">metriek stelsel</type>
+			<type key="ms" type="uksystem">Brits imperiaal stelsel</type>
+			<type key="ms" type="ussystem">Amerikaans imperiaal stelsel</type>
+			<type key="numbers" type="arab">Arabisch-Indische cijfers</type>
+			<type key="numbers" type="arabext">uitgebreide Arabisch-Indische cijfers</type>
+			<type key="numbers" type="armn">Armeense cijfers</type>
+			<type key="numbers" type="armnlow">kleine Armeense cijfers</type>
+			<type key="numbers" type="bali" draft="contributed">Balinese cijfers</type>
+			<type key="numbers" type="beng">Bengaalse cijfers</type>
+			<type key="numbers" type="brah" draft="contributed">Brahmi cijfers</type>
+			<type key="numbers" type="cakm" draft="contributed">Chakma cijfers</type>
+			<type key="numbers" type="cham" draft="contributed">Cham cijfers</type>
+			<type key="numbers" type="deva">Devanagari cijfers</type>
+			<type key="numbers" type="ethi">Ethiopische cijfers</type>
+			<type key="numbers" type="finance" draft="contributed">Financiële cijfers</type>
+			<type key="numbers" type="fullwide">cijfers met volledige breedte</type>
+			<type key="numbers" type="geor">Georgische cijfers</type>
+			<type key="numbers" type="grek">Griekse cijfers</type>
+			<type key="numbers" type="greklow">kleine Griekse cijfers</type>
+			<type key="numbers" type="gujr">Gujarati cijfers</type>
+			<type key="numbers" type="guru">Gurmukhi cijfers</type>
+			<type key="numbers" type="hanidec">Chinese decimale getallen</type>
+			<type key="numbers" type="hans">vereenvoudigd Chinese cijfers</type>
+			<type key="numbers" type="hansfin">vereenvoudigd Chinese financiële cijfers</type>
+			<type key="numbers" type="hant">traditioneel Chinese cijfers</type>
+			<type key="numbers" type="hantfin">traditioneel Chinese financiële cijfers</type>
+			<type key="numbers" type="hebr">Hebreeuwse cijfers</type>
+			<type key="numbers" type="java" draft="contributed">Javaanse cijfers</type>
+			<type key="numbers" type="jpan">Japanse cijfers</type>
+			<type key="numbers" type="jpanfin">Japanse financiële cijfers</type>
+			<type key="numbers" type="kali" draft="contributed">Kayah Li cijfers</type>
+			<type key="numbers" type="khmr">Khmer cijfers</type>
+			<type key="numbers" type="knda">Kannada cijfers</type>
+			<type key="numbers" type="lana" draft="contributed">Tai Tham Hora cijfers</type>
+			<type key="numbers" type="lanatham" draft="contributed">Tai Tham Tham cijfers</type>
+			<type key="numbers" type="laoo">Laotiaanse cijfers</type>
+			<type key="numbers" type="latn">Westerse cijfers</type>
+			<type key="numbers" type="lepc" draft="contributed">Lepcha cijfers</type>
+			<type key="numbers" type="limb" draft="contributed">Limbu cijfers</type>
+			<type key="numbers" type="mlym">Malayalam cijfers</type>
+			<type key="numbers" type="mong">Mongoolse cijfers</type>
+			<type key="numbers" type="mtei" draft="contributed">Meetei Mayek cijfers</type>
+			<type key="numbers" type="mymr">Myanmarese cijfers</type>
+			<type key="numbers" type="mymrshan" draft="contributed">Myanmarese Shan cijfers</type>
+			<type key="numbers" type="native" draft="contributed">Binnenlandse cijfers</type>
+			<type key="numbers" type="nkoo" draft="contributed">N’Ko cijfers</type>
+			<type key="numbers" type="olck" draft="contributed">Ol Chiki cijfers</type>
+			<type key="numbers" type="orya">Odia cijfers</type>
+			<type key="numbers" type="osma" draft="contributed">Osmanya cijfers</type>
+			<type key="numbers" type="roman">Romeinse cijfers</type>
+			<type key="numbers" type="romanlow">kleine Romeinse cijfers</type>
+			<type key="numbers" type="saur" draft="contributed">Saurashtra cijfers</type>
+			<type key="numbers" type="shrd" draft="contributed">Sharada cijfers</type>
+			<type key="numbers" type="sora" draft="contributed">Sora Sompeng cijfers</type>
+			<type key="numbers" type="sund" draft="contributed">Sundanese cijfers</type>
+			<type key="numbers" type="takr" draft="contributed">Takri cijfers</type>
+			<type key="numbers" type="talu" draft="contributed">nieuwe Tai Lue cijfers</type>
+			<type key="numbers" type="taml">traditionele Tamil cijfers</type>
+			<type key="numbers" type="tamldec">Tamil cijfers</type>
+			<type key="numbers" type="telu">Telugu cijfers</type>
+			<type key="numbers" type="thai">Thaise cijfers</type>
+			<type key="numbers" type="tibt">Tibetaanse cijfers</type>
+			<type key="numbers" type="traditional" draft="contributed">Traditionele cijfers</type>
+			<type key="numbers" type="vaii" draft="contributed">Vai-cijfers</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">BGN</transformName>
@@ -1353,13 +1423,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<exemplarCharacters type="auxiliary">[à â å ã æ ç è ê î ñ ô ø œ ù û ÿ]</exemplarCharacters>
 		<exemplarCharacters type="index" draft="contributed">[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]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‐ – — , ; \: ! ? . … ' ‘ ’ &quot; “ ” ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
-		<ellipsis type="final" draft="contributed">{0}…</ellipsis>
-		<ellipsis type="initial" draft="contributed">…{0}</ellipsis>
-		<ellipsis type="medial" draft="contributed">{0}…{1}</ellipsis>
-		<ellipsis type="word-final" draft="contributed">{0} …</ellipsis>
-		<ellipsis type="word-initial" draft="contributed">… {0}</ellipsis>
-		<ellipsis type="word-medial" draft="contributed">{0} … {1}</ellipsis>
-		<moreInformation draft="contributed">?</moreInformation>
+		<ellipsis type="final">{0}…</ellipsis>
+		<ellipsis type="initial">…{0}</ellipsis>
+		<ellipsis type="medial">{0}…{1}</ellipsis>
+		<ellipsis type="word-final">{0} …</ellipsis>
+		<ellipsis type="word-initial">… {0}</ellipsis>
+		<ellipsis type="word-medial">{0} … {1}</ellipsis>
+		<moreInformation>?</moreInformation>
 	</characters>
 	<delimiters>
 		<quotationStart>‘</quotationStart>
@@ -1400,6 +1470,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<availableFormats>
 						<dateFormatItem id="d" draft="contributed">d</dateFormatItem>
+						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -1443,20 +1514,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="11" draft="contributed">mnd 11</month>
 							<month type="12" draft="contributed">mnd 12</month>
 						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1" draft="contributed">1</month>
-							<month type="2" draft="contributed">2</month>
-							<month type="3" draft="contributed">3</month>
-							<month type="4" draft="contributed">4</month>
-							<month type="5" draft="contributed">5</month>
-							<month type="6" draft="contributed">6</month>
-							<month type="7" draft="contributed">7</month>
-							<month type="8" draft="contributed">8</month>
-							<month type="9" draft="contributed">9</month>
-							<month type="10" draft="contributed">10</month>
-							<month type="11" draft="contributed">11</month>
-							<month type="12" draft="contributed">12</month>
-						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1" draft="contributed">maand 1</month>
 							<month type="2" draft="contributed">maand 2</month>
@@ -1473,20 +1530,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1" draft="contributed">Mnd 1</month>
-							<month type="2" draft="contributed">Mnd 2</month>
-							<month type="3" draft="contributed">Mnd 3</month>
-							<month type="4" draft="contributed">Mnd 4</month>
-							<month type="5" draft="contributed">Mnd 5</month>
-							<month type="6" draft="contributed">Mnd 6</month>
-							<month type="7" draft="contributed">Mnd 7</month>
-							<month type="8" draft="contributed">Mnd 8</month>
-							<month type="9" draft="contributed">Mnd 9</month>
-							<month type="10" draft="contributed">Mnd 10</month>
-							<month type="11" draft="contributed">Mnd 11</month>
-							<month type="12" draft="contributed">Mnd 12</month>
-						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1" draft="contributed">1</month>
 							<month type="2" draft="contributed">2</month>
@@ -1501,20 +1544,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="11" draft="contributed">11</month>
 							<month type="12" draft="contributed">12</month>
 						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1" draft="contributed">Maand 1</month>
-							<month type="2" draft="contributed">Maand 2</month>
-							<month type="3" draft="contributed">Maand 3</month>
-							<month type="4" draft="contributed">Maand 4</month>
-							<month type="5" draft="contributed">Maand 5</month>
-							<month type="6" draft="contributed">Maand 6</month>
-							<month type="7" draft="contributed">Maand 7</month>
-							<month type="8" draft="contributed">Maand 8</month>
-							<month type="9" draft="contributed">Maand 9</month>
-							<month type="10" draft="contributed">Maand 10</month>
-							<month type="11" draft="contributed">Maand 11</month>
-							<month type="12" draft="contributed">Maand 12</month>
-						</monthWidth>
 					</monthContext>
 				</months>
 				<monthPatterns>
@@ -1561,7 +1590,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 								<cyclicName type="3" draft="contributed">insecten ontwaken</cyclicName>
 								<cyclicName type="4" draft="contributed">lentepunt</cyclicName>
 								<cyclicName type="5" draft="contributed">licht en helder</cyclicName>
+								<cyclicName type="6" draft="contributed">nat graan</cyclicName>
 								<cyclicName type="7" draft="contributed">begin van de zomer</cyclicName>
+								<cyclicName type="8" draft="contributed">vol graan</cyclicName>
+								<cyclicName type="9" draft="contributed">oogst graan</cyclicName>
 								<cyclicName type="10" draft="contributed">zomerpunt</cyclicName>
 								<cyclicName type="11" draft="contributed">warm</cyclicName>
 								<cyclicName type="12" draft="contributed">heet</cyclicName>
@@ -1575,6 +1607,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 								<cyclicName type="20" draft="contributed">lichte sneeuw</cyclicName>
 								<cyclicName type="21" draft="contributed">zware sneeuw</cyclicName>
 								<cyclicName type="22" draft="contributed">winterpunt</cyclicName>
+								<cyclicName type="23" draft="contributed">koel</cyclicName>
+								<cyclicName type="24" draft="contributed">koud</cyclicName>
 							</cyclicNameWidth>
 						</cyclicNameContext>
 					</cyclicNameSet>
@@ -1708,6 +1742,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d" draft="contributed">d</dateFormatItem>
+						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">U</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM U</dateFormatItem>
@@ -1727,6 +1762,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMMEd" draft="contributed">E d MMM</dateFormatItem>
 						<dateFormatItem id="MMMMd" draft="contributed">d MMMM</dateFormatItem>
 						<dateFormatItem id="ms" draft="contributed">mm:ss</dateFormatItem>
+						<dateFormatItem id="UM" draft="contributed">U MM</dateFormatItem>
+						<dateFormatItem id="UMd" draft="contributed">U MM-d</dateFormatItem>
+						<dateFormatItem id="UMMM" draft="contributed">U MMM</dateFormatItem>
+						<dateFormatItem id="UMMMd" draft="contributed">U MMM d</dateFormatItem>
 						<dateFormatItem id="y" draft="contributed">U</dateFormatItem>
 						<dateFormatItem id="yMd" draft="contributed">y-MM-dd</dateFormatItem>
 						<dateFormatItem id="yyyy" draft="contributed">U</dateFormatItem>
@@ -1741,9 +1780,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyQQQQ" draft="contributed">QQQQ U</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
+						<intervalFormatFallback draft="contributed">{0} – {1}</intervalFormatFallback>
 						<intervalFormatItem id="d">
 							<greatestDifference id="d" draft="contributed">d–d</greatestDifference>
 						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a" draft="contributed">h a – h a</greatestDifference>
+							<greatestDifference id="h" draft="contributed">h–h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H" draft="contributed">HH–HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a" draft="contributed">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h" draft="contributed">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="m" draft="contributed">h:mm–h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H" draft="contributed">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="m" draft="contributed">HH:mm–HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a" draft="contributed">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h" draft="contributed">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="m" draft="contributed">h:mm–h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H" draft="contributed">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="m" draft="contributed">HH:mm–HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a" draft="contributed">h a – h a v</greatestDifference>
+							<greatestDifference id="h" draft="contributed">h–h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H" draft="contributed">HH–HH v</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M" draft="contributed">MM–MM</greatestDifference>
 						</intervalFormatItem>
@@ -1901,266 +1973,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</monthWidth>
 					</monthContext>
 				</months>
-			</calendar>
-			<calendar type="dangi">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1" draft="contributed">mnd 1</month>
-							<month type="2" draft="contributed">mnd 2</month>
-							<month type="3" draft="contributed">mnd 3</month>
-							<month type="4" draft="contributed">mnd 4</month>
-							<month type="5" draft="contributed">mnd 5</month>
-							<month type="6" draft="contributed">mnd 6</month>
-							<month type="7" draft="contributed">mnd 7</month>
-							<month type="8" draft="contributed">mnd 8</month>
-							<month type="9" draft="contributed">mnd 9</month>
-							<month type="10" draft="contributed">mnd 10</month>
-							<month type="11" draft="contributed">mnd 11</month>
-							<month type="12" draft="contributed">mnd 12</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1" draft="contributed">1</month>
-							<month type="2" draft="contributed">2</month>
-							<month type="3" draft="contributed">3</month>
-							<month type="4" draft="contributed">4</month>
-							<month type="5" draft="contributed">5</month>
-							<month type="6" draft="contributed">6</month>
-							<month type="7" draft="contributed">7</month>
-							<month type="8" draft="contributed">8</month>
-							<month type="9" draft="contributed">9</month>
-							<month type="10" draft="contributed">10</month>
-							<month type="11" draft="contributed">11</month>
-							<month type="12" draft="contributed">12</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1" draft="contributed">maand 1</month>
-							<month type="2" draft="contributed">maand 2</month>
-							<month type="3" draft="contributed">maand 3</month>
-							<month type="4" draft="contributed">maand 4</month>
-							<month type="5" draft="contributed">maand 5</month>
-							<month type="6" draft="contributed">maand 6</month>
-							<month type="7" draft="contributed">maand 7</month>
-							<month type="8" draft="contributed">maand 8</month>
-							<month type="9" draft="contributed">maand 9</month>
-							<month type="10" draft="contributed">maand 10</month>
-							<month type="11" draft="contributed">maand 11</month>
-							<month type="12" draft="contributed">maand 12</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1" draft="contributed">Mnd 1</month>
-							<month type="2" draft="contributed">Mnd 2</month>
-							<month type="3" draft="contributed">Mnd 3</month>
-							<month type="4" draft="contributed">Mnd 4</month>
-							<month type="5" draft="contributed">Mnd 5</month>
-							<month type="6" draft="contributed">Mnd 6</month>
-							<month type="7" draft="contributed">Mnd 7</month>
-							<month type="8" draft="contributed">Mnd 8</month>
-							<month type="9" draft="contributed">Mnd 9</month>
-							<month type="10" draft="contributed">Mnd 10</month>
-							<month type="11" draft="contributed">Mnd 11</month>
-							<month type="12" draft="contributed">Mnd 12</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1" draft="contributed">1</month>
-							<month type="2" draft="contributed">2</month>
-							<month type="3" draft="contributed">3</month>
-							<month type="4" draft="contributed">4</month>
-							<month type="5" draft="contributed">5</month>
-							<month type="6" draft="contributed">6</month>
-							<month type="7" draft="contributed">7</month>
-							<month type="8" draft="contributed">8</month>
-							<month type="9" draft="contributed">9</month>
-							<month type="10" draft="contributed">10</month>
-							<month type="11" draft="contributed">11</month>
-							<month type="12" draft="contributed">12</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1" draft="contributed">Maand 1</month>
-							<month type="2" draft="contributed">Maand 2</month>
-							<month type="3" draft="contributed">Maand 3</month>
-							<month type="4" draft="contributed">Maand 4</month>
-							<month type="5" draft="contributed">Maand 5</month>
-							<month type="6" draft="contributed">Maand 6</month>
-							<month type="7" draft="contributed">Maand 7</month>
-							<month type="8" draft="contributed">Maand 8</month>
-							<month type="9" draft="contributed">Maand 9</month>
-							<month type="10" draft="contributed">Maand 10</month>
-							<month type="11" draft="contributed">Maand 11</month>
-							<month type="12" draft="contributed">Maand 12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<monthPatterns>
-					<monthPatternContext type="format">
-						<monthPatternWidth type="wide">
-							<monthPattern type="leap" draft="contributed">{0}bis</monthPattern>
-						</monthPatternWidth>
-					</monthPatternContext>
-					<monthPatternContext type="numeric">
-						<monthPatternWidth type="all">
-							<monthPattern type="leap" draft="contributed">{0}bis</monthPattern>
-						</monthPatternWidth>
-					</monthPatternContext>
-					<monthPatternContext type="stand-alone">
-						<monthPatternWidth type="narrow">
-							<monthPattern type="leap" draft="contributed">{0}b</monthPattern>
-						</monthPatternWidth>
-					</monthPatternContext>
-				</monthPatterns>
-				<cyclicNameSets>
-					<cyclicNameSet type="dayParts">
-						<cyclicNameContext type="format">
-							<cyclicNameWidth type="abbreviated">
-								<cyclicName type="1" draft="contributed">zi</cyclicName>
-								<cyclicName type="2" draft="contributed">chou</cyclicName>
-								<cyclicName type="3" draft="contributed">yin</cyclicName>
-								<cyclicName type="4" draft="contributed">mao</cyclicName>
-								<cyclicName type="5" draft="contributed">chen</cyclicName>
-								<cyclicName type="6" draft="contributed">si</cyclicName>
-								<cyclicName type="7" draft="contributed">wu</cyclicName>
-								<cyclicName type="8" draft="contributed">wei</cyclicName>
-								<cyclicName type="9" draft="contributed">shen</cyclicName>
-								<cyclicName type="10" draft="contributed">you</cyclicName>
-								<cyclicName type="11" draft="contributed">xu</cyclicName>
-								<cyclicName type="12" draft="contributed">hai</cyclicName>
-							</cyclicNameWidth>
-						</cyclicNameContext>
-					</cyclicNameSet>
-					<cyclicNameSet type="solarTerms">
-						<cyclicNameContext type="format">
-							<cyclicNameWidth type="abbreviated">
-								<cyclicName type="1" draft="contributed">begin van de lente</cyclicName>
-								<cyclicName type="2" draft="contributed">regenwater</cyclicName>
-								<cyclicName type="3" draft="contributed">insecten ontwaken</cyclicName>
-								<cyclicName type="4" draft="contributed">lentepunt</cyclicName>
-								<cyclicName type="5" draft="contributed">licht en helder</cyclicName>
-								<cyclicName type="7" draft="contributed">begin van de zomer</cyclicName>
-								<cyclicName type="10" draft="contributed">zomerpunt</cyclicName>
-								<cyclicName type="11" draft="contributed">warm</cyclicName>
-								<cyclicName type="12" draft="contributed">heet</cyclicName>
-								<cyclicName type="13" draft="contributed">begin van de herfst</cyclicName>
-								<cyclicName type="14" draft="contributed">einde van de hitte</cyclicName>
-								<cyclicName type="15" draft="contributed">witte dauw</cyclicName>
-								<cyclicName type="16" draft="contributed">herfstpunt</cyclicName>
-								<cyclicName type="17" draft="contributed">koude dauw</cyclicName>
-								<cyclicName type="18" draft="contributed">eerste vorst</cyclicName>
-								<cyclicName type="19" draft="contributed">begin van de winter</cyclicName>
-								<cyclicName type="20" draft="contributed">lichte sneeuw</cyclicName>
-								<cyclicName type="21" draft="contributed">zware sneeuw</cyclicName>
-								<cyclicName type="22" draft="contributed">winterpunt</cyclicName>
-							</cyclicNameWidth>
-						</cyclicNameContext>
-					</cyclicNameSet>
-					<cyclicNameSet type="years">
-						<cyclicNameContext type="format">
-							<cyclicNameWidth type="abbreviated">
-								<cyclicName type="1" draft="contributed">jia-zi</cyclicName>
-								<cyclicName type="2" draft="contributed">yi-chou</cyclicName>
-								<cyclicName type="3" draft="contributed">bing-yin</cyclicName>
-								<cyclicName type="4" draft="contributed">ding-mao</cyclicName>
-								<cyclicName type="5" draft="contributed">wu-chen</cyclicName>
-								<cyclicName type="6" draft="contributed">ji-si</cyclicName>
-								<cyclicName type="7" draft="contributed">geng-wu</cyclicName>
-								<cyclicName type="8" draft="contributed">xin-wei</cyclicName>
-								<cyclicName type="9" draft="contributed">ren-shen</cyclicName>
-								<cyclicName type="10" draft="contributed">gui-you</cyclicName>
-								<cyclicName type="11" draft="contributed">jia-xu</cyclicName>
-								<cyclicName type="12" draft="contributed">yi-hai</cyclicName>
-								<cyclicName type="13" draft="contributed">bing-zi</cyclicName>
-								<cyclicName type="14" draft="contributed">ding-chou</cyclicName>
-								<cyclicName type="15" draft="contributed">wu-yin</cyclicName>
-								<cyclicName type="16" draft="contributed">ji-mao</cyclicName>
-								<cyclicName type="17" draft="contributed">geng-chen</cyclicName>
-								<cyclicName type="18" draft="contributed">xin-si</cyclicName>
-								<cyclicName type="19" draft="contributed">ren-wu</cyclicName>
-								<cyclicName type="20" draft="contributed">gui-wei</cyclicName>
-								<cyclicName type="21" draft="contributed">jia-shen</cyclicName>
-								<cyclicName type="22" draft="contributed">yi-you</cyclicName>
-								<cyclicName type="23" draft="contributed">bing-xu</cyclicName>
-								<cyclicName type="24" draft="contributed">ding-hai</cyclicName>
-								<cyclicName type="25" draft="contributed">wu-zi</cyclicName>
-								<cyclicName type="26" draft="contributed">ji-chou</cyclicName>
-								<cyclicName type="27" draft="contributed">geng-yin</cyclicName>
-								<cyclicName type="28" draft="contributed">xin-mao</cyclicName>
-								<cyclicName type="29" draft="contributed">ren-chen</cyclicName>
-								<cyclicName type="30" draft="contributed">gui-si</cyclicName>
-								<cyclicName type="31" draft="contributed">jia-wu</cyclicName>
-								<cyclicName type="32" draft="contributed">yi-wei</cyclicName>
-								<cyclicName type="33" draft="contributed">bing-shen</cyclicName>
-								<cyclicName type="34" draft="contributed">ding-you</cyclicName>
-								<cyclicName type="35" draft="contributed">wu-xu</cyclicName>
-								<cyclicName type="36" draft="contributed">ji-hai</cyclicName>
-								<cyclicName type="37" draft="contributed">geng-zi</cyclicName>
-								<cyclicName type="38" draft="contributed">xin-chou</cyclicName>
-								<cyclicName type="39" draft="contributed">ren-yin</cyclicName>
-								<cyclicName type="40" draft="contributed">gui-mao</cyclicName>
-								<cyclicName type="41" draft="contributed">jia-chen</cyclicName>
-								<cyclicName type="42" draft="contributed">yi-si</cyclicName>
-								<cyclicName type="43" draft="contributed">bing-wu</cyclicName>
-								<cyclicName type="44" draft="contributed">ding-wei</cyclicName>
-								<cyclicName type="45" draft="contributed">wu-shen</cyclicName>
-								<cyclicName type="46" draft="contributed">ji-you</cyclicName>
-								<cyclicName type="47" draft="contributed">geng-xu</cyclicName>
-								<cyclicName type="48" draft="contributed">xin-hai</cyclicName>
-								<cyclicName type="49" draft="contributed">ren-zi</cyclicName>
-								<cyclicName type="50" draft="contributed">gui-chou</cyclicName>
-								<cyclicName type="51" draft="contributed">jia-yin</cyclicName>
-								<cyclicName type="52" draft="contributed">yi-mao</cyclicName>
-								<cyclicName type="53" draft="contributed">bing-chen</cyclicName>
-								<cyclicName type="54" draft="contributed">ding-si</cyclicName>
-								<cyclicName type="55" draft="contributed">wu-wu</cyclicName>
-								<cyclicName type="56" draft="contributed">ji-wei</cyclicName>
-								<cyclicName type="57" draft="contributed">geng-shen</cyclicName>
-								<cyclicName type="58" draft="contributed">xin-you</cyclicName>
-								<cyclicName type="59" draft="contributed">ren-xu</cyclicName>
-								<cyclicName type="60" draft="contributed">gui-hai</cyclicName>
-							</cyclicNameWidth>
-						</cyclicNameContext>
-					</cyclicNameSet>
-					<cyclicNameSet type="zodiacs">
-						<cyclicNameContext type="format">
-							<cyclicNameWidth type="abbreviated">
-								<cyclicName type="1" draft="contributed">Rat</cyclicName>
-								<cyclicName type="2" draft="contributed">Os</cyclicName>
-								<cyclicName type="3" draft="contributed">Tijger</cyclicName>
-								<cyclicName type="4" draft="contributed">Konijn</cyclicName>
-								<cyclicName type="5" draft="contributed">Draak</cyclicName>
-								<cyclicName type="6" draft="contributed">Slang</cyclicName>
-								<cyclicName type="7" draft="contributed">Paard</cyclicName>
-								<cyclicName type="8" draft="contributed">Geit</cyclicName>
-								<cyclicName type="9" draft="contributed">Aap</cyclicName>
-								<cyclicName type="10" draft="contributed">Haan</cyclicName>
-								<cyclicName type="11" draft="contributed">Hond</cyclicName>
-								<cyclicName type="12" draft="contributed">Varken</cyclicName>
-							</cyclicNameWidth>
-						</cyclicNameContext>
-					</cyclicNameSet>
-				</cyclicNameSets>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMM U</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM U</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM U</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd-MM-yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
+				<eras>
+					<eraNames>
+						<era type="0" draft="contributed">ERA0</era>
+						<era type="1" draft="contributed">ERA1</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0" draft="contributed">ERA0</era>
+						<era type="1" draft="contributed">ERA1</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0" draft="contributed">ERA0</era>
+						<era type="1" draft="contributed">ERA1</era>
+					</eraNarrow>
+				</eras>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
 			</calendar>
 			<calendar type="ethiopic">
 				<months>
@@ -2421,26 +2252,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="d" draft="contributed">d</dateFormatItem>
+						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -2452,30 +2284,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm" draft="contributed">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms" draft="contributed">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="M" draft="contributed">L</dateFormatItem>
-						<dateFormatItem id="Md" draft="contributed">d-M</dateFormatItem>
+						<dateFormatItem id="M">L</dateFormatItem>
+						<dateFormatItem id="Md">d-M</dateFormatItem>
 						<dateFormatItem id="MEd">E d-M</dateFormatItem>
-						<dateFormatItem id="MMM" draft="contributed">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd" draft="contributed">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd" draft="contributed">E d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd" draft="contributed">d MMMM</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="ms" draft="contributed">mm:ss</dateFormatItem>
-						<dateFormatItem id="y" draft="contributed">y G</dateFormatItem>
-						<dateFormatItem id="yyyy" draft="contributed">y G</dateFormatItem>
-						<dateFormatItem id="yyyyM" draft="contributed">M-y GGGGG</dateFormatItem>
+						<dateFormatItem id="y">y G</dateFormatItem>
+						<dateFormatItem id="yyyy">y G</dateFormatItem>
+						<dateFormatItem id="yyyyM">M-y GGGGG</dateFormatItem>
 						<dateFormatItem id="yyyyMd">d-M-y GGGGG</dateFormatItem>
 						<dateFormatItem id="yyyyMEd">E d-M-y GGGGG</dateFormatItem>
-						<dateFormatItem id="yyyyMMM" draft="contributed">MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E d MMM y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM" draft="contributed">MMMM y G</dateFormatItem>
-						<dateFormatItem id="yyyyQQQ" draft="contributed">QQQ y G</dateFormatItem>
-						<dateFormatItem id="yyyyQQQQ" draft="contributed">QQQQ y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">MMMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatFallback draft="contributed">{0} - {1}</intervalFormatFallback>
+						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
 						<intervalFormatItem id="d">
-							<greatestDifference id="d" draft="contributed">d–d</greatestDifference>
+							<greatestDifference id="d">d–d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a" draft="contributed">h a – h a</greatestDifference>
@@ -2510,64 +2342,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="H" draft="contributed">HH–HH v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
-							<greatestDifference id="M" draft="contributed">M–M</greatestDifference>
+							<greatestDifference id="M">M–M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="contributed">dd-MM – dd-MM</greatestDifference>
-							<greatestDifference id="M" draft="contributed">dd-MM – dd-MM</greatestDifference>
+							<greatestDifference id="d">dd-MM – dd-MM</greatestDifference>
+							<greatestDifference id="M">dd-MM – dd-MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="contributed">E dd-MM – E dd-MM</greatestDifference>
-							<greatestDifference id="M" draft="contributed">E dd-MM – E dd-MM</greatestDifference>
+							<greatestDifference id="d">E dd-MM – E dd-MM</greatestDifference>
+							<greatestDifference id="M">E dd-MM – E dd-MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M" draft="contributed">MMM–MMM</greatestDifference>
+							<greatestDifference id="M">MMM–MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d" draft="contributed">d–d MMM</greatestDifference>
-							<greatestDifference id="M" draft="contributed">d MMM – d MMM</greatestDifference>
+							<greatestDifference id="d">d–d MMM</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d" draft="contributed">E d – E d MMM</greatestDifference>
-							<greatestDifference id="M" draft="contributed">E d MMM – E d MMM</greatestDifference>
+							<greatestDifference id="d">E d – E d MMM</greatestDifference>
+							<greatestDifference id="M">E d MMM – E d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M" draft="contributed">MMMM–MMMM</greatestDifference>
+							<greatestDifference id="M">MMMM–MMMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
-							<greatestDifference id="y" draft="contributed">y–y G</greatestDifference>
+							<greatestDifference id="y">y–y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="contributed">MM-y – MM-y G</greatestDifference>
-							<greatestDifference id="y" draft="contributed">MM-y – MM-y G</greatestDifference>
+							<greatestDifference id="M">MM-y – MM-y G</greatestDifference>
+							<greatestDifference id="y">MM-y – MM-y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
-							<greatestDifference id="M" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
-							<greatestDifference id="y" draft="contributed">dd-MM-y – dd-MM-y G</greatestDifference>
+							<greatestDifference id="d">dd-MM-y – dd-MM-y G</greatestDifference>
+							<greatestDifference id="M">dd-MM-y – dd-MM-y G</greatestDifference>
+							<greatestDifference id="y">dd-MM-y – dd-MM-y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-							<greatestDifference id="M" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
-							<greatestDifference id="y" draft="contributed">E dd-MM-y – E dd-MM-y G</greatestDifference>
+							<greatestDifference id="d">E dd-MM-y – E dd-MM-y G</greatestDifference>
+							<greatestDifference id="M">E dd-MM-y – E dd-MM-y G</greatestDifference>
+							<greatestDifference id="y">E dd-MM-y – E dd-MM-y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M" draft="contributed">MMM–MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="contributed">MMM y – MMM y G</greatestDifference>
+							<greatestDifference id="M">MMM–MMM y G</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d" draft="contributed">d–d MMM y G</greatestDifference>
-							<greatestDifference id="M" draft="contributed">d MMM – d MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="contributed">d MMM y – d MMM y G</greatestDifference>
+							<greatestDifference id="d">d–d MMM y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d" draft="contributed">E d – E d MMM y G</greatestDifference>
-							<greatestDifference id="M" draft="contributed">E d MMM – E d MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="contributed">E d MMM y – E d MMM y G</greatestDifference>
+							<greatestDifference id="d">E d – E d MMM y G</greatestDifference>
+							<greatestDifference id="M">E d MMM – E d MMM y G</greatestDifference>
+							<greatestDifference id="y">E d MMM y – E d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M" draft="contributed">MMMM–MMMM y G</greatestDifference>
-							<greatestDifference id="y" draft="contributed">MMMM y – MMMM y G</greatestDifference>
+							<greatestDifference id="M">MMMM–MMMM y G</greatestDifference>
+							<greatestDifference id="y">MMMM y – MMMM y G</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -2620,18 +2452,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</monthContext>
 					<monthContext type="stand-alone">
 						<monthWidth type="abbreviated">
-							<month type="1">Jan.</month>
-							<month type="2">Feb.</month>
-							<month type="3">Mrt.</month>
-							<month type="4">Apr.</month>
-							<month type="5">Mei</month>
-							<month type="6">Jun.</month>
-							<month type="7">Jul.</month>
-							<month type="8">Aug.</month>
-							<month type="9">Sep.</month>
-							<month type="10">Okt.</month>
-							<month type="11">Nov.</month>
-							<month type="12">Dec.</month>
+							<month type="1">jan.</month>
+							<month type="2">feb.</month>
+							<month type="3">mrt.</month>
+							<month type="4">apr.</month>
+							<month type="5">mei</month>
+							<month type="6">jun.</month>
+							<month type="7">jul.</month>
+							<month type="8">aug.</month>
+							<month type="9">sep.</month>
+							<month type="10">okt.</month>
+							<month type="11">nov.</month>
+							<month type="12">dec.</month>
 						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">J</month>
@@ -2648,18 +2480,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="12">D</month>
 						</monthWidth>
 						<monthWidth type="wide">
-							<month type="1">Januari</month>
-							<month type="2">Februari</month>
-							<month type="3">Maart</month>
-							<month type="4">April</month>
-							<month type="5">Mei</month>
-							<month type="6">Juni</month>
-							<month type="7">Juli</month>
-							<month type="8">Augustus</month>
-							<month type="9">September</month>
-							<month type="10">Oktober</month>
-							<month type="11">November</month>
-							<month type="12">December</month>
+							<month type="1">januari</month>
+							<month type="2">februari</month>
+							<month type="3">maart</month>
+							<month type="4">april</month>
+							<month type="5">mei</month>
+							<month type="6">juni</month>
+							<month type="7">juli</month>
+							<month type="8">augustus</month>
+							<month type="9">september</month>
+							<month type="10">oktober</month>
+							<month type="11">november</month>
+							<month type="12">december</month>
 						</monthWidth>
 					</monthContext>
 				</months>
@@ -2704,13 +2536,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dayContext>
 					<dayContext type="stand-alone">
 						<dayWidth type="abbreviated">
-							<day type="sun">Zo</day>
-							<day type="mon">Ma</day>
-							<day type="tue">Di</day>
-							<day type="wed">Wo</day>
-							<day type="thu">Do</day>
-							<day type="fri">Vr</day>
-							<day type="sat">Za</day>
+							<day type="sun">zo</day>
+							<day type="mon">ma</day>
+							<day type="tue">di</day>
+							<day type="wed">wo</day>
+							<day type="thu">do</day>
+							<day type="fri">vr</day>
+							<day type="sat">za</day>
 						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun">Z</day>
@@ -2722,22 +2554,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<day type="sat">Z</day>
 						</dayWidth>
 						<dayWidth type="short">
-							<day type="sun">Zo</day>
-							<day type="mon">Ma</day>
-							<day type="tue">Di</day>
-							<day type="wed">Wo</day>
-							<day type="thu">Do</day>
-							<day type="fri">Vr</day>
-							<day type="sat">Za</day>
+							<day type="sun">zo</day>
+							<day type="mon">ma</day>
+							<day type="tue">di</day>
+							<day type="wed">wo</day>
+							<day type="thu">do</day>
+							<day type="fri">vr</day>
+							<day type="sat">za</day>
 						</dayWidth>
 						<dayWidth type="wide">
-							<day type="sun">Zondag</day>
-							<day type="mon">Maandag</day>
-							<day type="tue">Dinsdag</day>
-							<day type="wed">Woensdag</day>
-							<day type="thu">Donderdag</day>
-							<day type="fri">Vrijdag</day>
-							<day type="sat">Zaterdag</day>
+							<day type="sun">zondag</day>
+							<day type="mon">maandag</day>
+							<day type="tue">dinsdag</day>
+							<day type="wed">woensdag</day>
+							<day type="thu">donderdag</day>
+							<day type="fri">vrijdag</day>
+							<day type="sat">zaterdag</day>
 						</dayWidth>
 					</dayContext>
 				</days>
@@ -2786,36 +2618,69 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="noon" draft="contributed">12 uur ‘s middags</dayPeriod>
+							<dayPeriod type="midnight">middernacht</dayPeriod>
+							<dayPeriod type="am">a.m.</dayPeriod>
+							<dayPeriod type="pm">p.m.</dayPeriod>
+							<dayPeriod type="morning1">ochtend</dayPeriod>
+							<dayPeriod type="afternoon1">middag</dayPeriod>
+							<dayPeriod type="evening1">avond</dayPeriod>
+							<dayPeriod type="night1">nacht</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">middernacht</dayPeriod>
 							<dayPeriod type="am">a.m.</dayPeriod>
-							<dayPeriod type="noon" draft="contributed">n</dayPeriod>
 							<dayPeriod type="pm">p.m.</dayPeriod>
+							<dayPeriod type="morning1">ochtend</dayPeriod>
+							<dayPeriod type="afternoon1">middag</dayPeriod>
+							<dayPeriod type="evening1">avond</dayPeriod>
+							<dayPeriod type="night1">nacht</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">middernacht</dayPeriod>
 							<dayPeriod type="am">a.m.</dayPeriod>
-							<dayPeriod type="noon" draft="contributed">12 uur ‘s middags</dayPeriod>
 							<dayPeriod type="pm">p.m.</dayPeriod>
+							<dayPeriod type="morning1">ochtend</dayPeriod>
+							<dayPeriod type="afternoon1">middag</dayPeriod>
+							<dayPeriod type="evening1">avond</dayPeriod>
+							<dayPeriod type="night1">nacht</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am" draft="provisional">a.m.</dayPeriod>
-							<dayPeriod type="pm" draft="provisional">p.m.</dayPeriod>
+							<dayPeriod type="midnight">middernacht</dayPeriod>
+							<dayPeriod type="am">a.m.</dayPeriod>
+							<dayPeriod type="pm">p.m.</dayPeriod>
+							<dayPeriod type="morning1">ochtend</dayPeriod>
+							<dayPeriod type="afternoon1">middag</dayPeriod>
+							<dayPeriod type="evening1">avond</dayPeriod>
+							<dayPeriod type="night1">nacht</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">middernacht</dayPeriod>
+							<dayPeriod type="am">a.m.</dayPeriod>
+							<dayPeriod type="pm">p.m.</dayPeriod>
+							<dayPeriod type="morning1">ochtend</dayPeriod>
+							<dayPeriod type="afternoon1">middag</dayPeriod>
+							<dayPeriod type="evening1">avond</dayPeriod>
+							<dayPeriod type="night1">nacht</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="am" draft="unconfirmed">voormiddag</dayPeriod>
-							<dayPeriod type="pm" draft="provisional">p.m.</dayPeriod>
+							<dayPeriod type="midnight">middernacht</dayPeriod>
+							<dayPeriod type="am">a.m.</dayPeriod>
+							<dayPeriod type="pm">p.m.</dayPeriod>
+							<dayPeriod type="morning1">ochtend</dayPeriod>
+							<dayPeriod type="afternoon1">middag</dayPeriod>
+							<dayPeriod type="evening1">avond</dayPeriod>
+							<dayPeriod type="night1">nacht</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
 						<era type="0">voor Christus</era>
-						<era type="0" alt="variant" draft="contributed">vóór gewone jaartelling</era>
-						<era type="1" draft="contributed">na Christus</era>
-						<era type="1" alt="variant" draft="contributed">gewone jaartelling</era>
+						<era type="0" alt="variant">vóór gewone jaartelling</era>
+						<era type="1">na Christus</era>
+						<era type="1" alt="variant">gewone jaartelling</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">v.Chr.</era>
@@ -2897,7 +2762,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
@@ -3415,6 +3280,246 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="japanese">
+				<eras>
+					<eraAbbr>
+						<era type="0" draft="contributed">Taika (645–650)</era>
+						<era type="1" draft="contributed">Hakuchi (650–671)</era>
+						<era type="2" draft="contributed">Hakuhō (672–686)</era>
+						<era type="3" draft="contributed">Shuchō (686–701)</era>
+						<era type="4" draft="contributed">Taihō (701–704)</era>
+						<era type="5" draft="contributed">Keiun (704–708)</era>
+						<era type="6" draft="contributed">Wadō (708–715)</era>
+						<era type="7" draft="contributed">Reiki (715–717)</era>
+						<era type="8" draft="contributed">Yōrō (717–724)</era>
+						<era type="9" draft="contributed">Jinki (724–729)</era>
+						<era type="10" draft="contributed">Tenpyō (729–749)</era>
+						<era type="11" draft="contributed">Tenpyō-kampō (749-749)</era>
+						<era type="12" draft="contributed">Tenpyō-shōhō (749-757)</era>
+						<era type="13" draft="contributed">Tenpyō-hōji (757-765)</era>
+						<era type="14" draft="contributed">Tenpyō-jingo (765-767)</era>
+						<era type="15" draft="contributed">Jingo-keiun (767-770)</era>
+						<era type="16" draft="contributed">Hōki (770–780)</era>
+						<era type="17" draft="contributed">Ten-ō (781-782)</era>
+						<era type="18" draft="contributed">Enryaku (782–806)</era>
+						<era type="19" draft="contributed">Daidō (806–810)</era>
+						<era type="20" draft="contributed">Kōnin (810–824)</era>
+						<era type="21" draft="contributed">Tenchō (824–834)</era>
+						<era type="22" draft="contributed">Jōwa (834–848)</era>
+						<era type="23" draft="contributed">Kajō (848–851)</era>
+						<era type="24" draft="contributed">Ninju (851–854)</era>
+						<era type="25" draft="contributed">Saikō (854–857)</era>
+						<era type="26" draft="contributed">Ten-an (857-859)</era>
+						<era type="27" draft="contributed">Jōgan (859–877)</era>
+						<era type="28" draft="contributed">Gangyō (877–885)</era>
+						<era type="29" draft="contributed">Ninna (885–889)</era>
+						<era type="30" draft="contributed">Kanpyō (889–898)</era>
+						<era type="31" draft="contributed">Shōtai (898–901)</era>
+						<era type="32" draft="contributed">Engi (901–923)</era>
+						<era type="33" draft="contributed">Enchō (923–931)</era>
+						<era type="34" draft="contributed">Jōhei (931–938)</era>
+						<era type="35" draft="contributed">Tengyō (938–947)</era>
+						<era type="36" draft="contributed">Tenryaku (947–957)</era>
+						<era type="37" draft="contributed">Tentoku (957–961)</era>
+						<era type="38" draft="contributed">Ōwa (961–964)</era>
+						<era type="39" draft="contributed">Kōhō (964–968)</era>
+						<era type="40" draft="contributed">Anna (968–970)</era>
+						<era type="41" draft="contributed">Tenroku (970–973)</era>
+						<era type="42" draft="contributed">Ten’en (973–976)</era>
+						<era type="43" draft="contributed">Jōgen (976–978)</era>
+						<era type="44" draft="contributed">Tengen (978–983)</era>
+						<era type="45" draft="contributed">Eikan (983–985)</era>
+						<era type="46" draft="contributed">Kanna (985–987)</era>
+						<era type="47" draft="contributed">Eien (987–989)</era>
+						<era type="48" draft="contributed">Eiso (989–990)</era>
+						<era type="49" draft="contributed">Shōryaku (990–995)</era>
+						<era type="50" draft="contributed">Chōtoku (995–999)</era>
+						<era type="51" draft="contributed">Chōhō (999–1004)</era>
+						<era type="52" draft="contributed">Kankō (1004–1012)</era>
+						<era type="53" draft="contributed">Chōwa (1012–1017)</era>
+						<era type="54" draft="contributed">Kannin (1017–1021)</era>
+						<era type="55" draft="contributed">Jian (1021–1024)</era>
+						<era type="56" draft="contributed">Manju (1024–1028)</era>
+						<era type="57" draft="contributed">Chōgen (1028–1037)</era>
+						<era type="58" draft="contributed">Chōryaku (1037–1040)</era>
+						<era type="59" draft="contributed">Chōkyū (1040–1044)</era>
+						<era type="60" draft="contributed">Kantoku (1044–1046)</era>
+						<era type="61" draft="contributed">Eishō (1046–1053)</era>
+						<era type="62" draft="contributed">Tengi (1053–1058)</era>
+						<era type="63" draft="contributed">Kōhei (1058–1065)</era>
+						<era type="64" draft="contributed">Jiryaku (1065–1069)</era>
+						<era type="65" draft="contributed">Enkyū (1069–1074)</era>
+						<era type="66" draft="contributed">Shōho (1074–1077)</era>
+						<era type="67" draft="contributed">Shōryaku (1077–1081)</era>
+						<era type="68" draft="contributed">Eihō (1081–1084)</era>
+						<era type="69" draft="contributed">Ōtoku (1084–1087)</era>
+						<era type="70" draft="contributed">Kanji (1087–1094)</era>
+						<era type="71" draft="contributed">Kaho (1094–1096)</era>
+						<era type="72" draft="contributed">Eichō (1096–1097)</era>
+						<era type="73" draft="contributed">Shōtoku (1097–1099)</era>
+						<era type="74" draft="contributed">Kōwa (1099–1104)</era>
+						<era type="75" draft="contributed">Chōji (1104–1106)</era>
+						<era type="76" draft="contributed">Kashō (1106–1108)</era>
+						<era type="77" draft="contributed">Tennin (1108–1110)</era>
+						<era type="78" draft="contributed">Ten-ei (1110-1113)</era>
+						<era type="79" draft="contributed">Eikyū (1113–1118)</era>
+						<era type="80" draft="contributed">Gen-ei (1118-1120)</era>
+						<era type="81" draft="contributed">Hoan (1120–1124)</era>
+						<era type="82" draft="contributed">Tenji (1124–1126)</era>
+						<era type="83" draft="contributed">Daiji (1126–1131)</era>
+						<era type="84" draft="contributed">Tenshō (1131–1132)</era>
+						<era type="85" draft="contributed">Chōshō (1132–1135)</era>
+						<era type="86" draft="contributed">Hoen (1135–1141)</era>
+						<era type="87" draft="contributed">Eiji (1141–1142)</era>
+						<era type="88" draft="contributed">Kōji (1142–1144)</era>
+						<era type="89" draft="contributed">Ten’yō (1144–1145)</era>
+						<era type="90" draft="contributed">Kyūan (1145–1151)</era>
+						<era type="91" draft="contributed">Ninpei (1151–1154)</era>
+						<era type="92" draft="contributed">Kyūju (1154–1156)</era>
+						<era type="93" draft="contributed">Hogen (1156–1159)</era>
+						<era type="94" draft="contributed">Heiji (1159–1160)</era>
+						<era type="95" draft="contributed">Eiryaku (1160–1161)</era>
+						<era type="96" draft="contributed">Ōho (1161–1163)</era>
+						<era type="97" draft="contributed">Chōkan (1163–1165)</era>
+						<era type="98" draft="contributed">Eiman (1165–1166)</era>
+						<era type="99" draft="contributed">Nin’an (1166–1169)</era>
+						<era type="100" draft="contributed">Kaō (1169–1171)</era>
+						<era type="101" draft="contributed">Shōan (1171–1175)</era>
+						<era type="102" draft="contributed">Angen (1175–1177)</era>
+						<era type="103" draft="contributed">Jishō (1177–1181)</era>
+						<era type="104" draft="contributed">Yōwa (1181–1182)</era>
+						<era type="105" draft="contributed">Juei (1182–1184)</era>
+						<era type="106" draft="contributed">Genryaku (1184–1185)</era>
+						<era type="107" draft="contributed">Bunji (1185–1190)</era>
+						<era type="108" draft="contributed">Kenkyū (1190–1199)</era>
+						<era type="109" draft="contributed">Shōji (1199–1201)</era>
+						<era type="110" draft="contributed">Kennin (1201–1204)</era>
+						<era type="111" draft="contributed">Genkyū (1204–1206)</era>
+						<era type="112" draft="contributed">Ken-ei (1206-1207)</era>
+						<era type="113" draft="contributed">Shōgen (1207–1211)</era>
+						<era type="114" draft="contributed">Kenryaku (1211–1213)</era>
+						<era type="115" draft="contributed">Kenpō (1213–1219)</era>
+						<era type="116" draft="contributed">Shōkyū (1219–1222)</era>
+						<era type="117" draft="contributed">Jōō (1222–1224)</era>
+						<era type="118" draft="contributed">Gennin (1224–1225)</era>
+						<era type="119" draft="contributed">Karoku (1225–1227)</era>
+						<era type="120" draft="contributed">Antei (1227–1229)</era>
+						<era type="121" draft="contributed">Kanki (1229–1232)</era>
+						<era type="122" draft="contributed">Jōei (1232–1233)</era>
+						<era type="123" draft="contributed">Tempuku (1233–1234)</era>
+						<era type="124" draft="contributed">Bunryaku (1234–1235)</era>
+						<era type="125" draft="contributed">Katei (1235–1238)</era>
+						<era type="126" draft="contributed">Ryakunin (1238–1239)</era>
+						<era type="127" draft="contributed">En-ō (1239-1240)</era>
+						<era type="128" draft="contributed">Ninji (1240–1243)</era>
+						<era type="129" draft="contributed">Kangen (1243–1247)</era>
+						<era type="130" draft="contributed">Hōji (1247–1249)</era>
+						<era type="131" draft="contributed">Kenchō (1249–1256)</era>
+						<era type="132" draft="contributed">Kōgen (1256–1257)</era>
+						<era type="133" draft="contributed">Shōka (1257–1259)</era>
+						<era type="134" draft="contributed">Shōgen (1259–1260)</era>
+						<era type="135" draft="contributed">Bun-ō (1260-1261)</era>
+						<era type="136" draft="contributed">Kōchō (1261–1264)</era>
+						<era type="137" draft="contributed">Bun-ei (1264-1275)</era>
+						<era type="138" draft="contributed">Kenji (1275–1278)</era>
+						<era type="139" draft="contributed">Kōan (1278–1288)</era>
+						<era type="140" draft="contributed">Shōō (1288–1293)</era>
+						<era type="141" draft="contributed">Einin (1293–1299)</era>
+						<era type="142" draft="contributed">Shōan (1299–1302)</era>
+						<era type="143" draft="contributed">Kengen (1302–1303)</era>
+						<era type="144" draft="contributed">Kagen (1303–1306)</era>
+						<era type="145" draft="contributed">Tokuji (1306–1308)</era>
+						<era type="146" draft="contributed">Enkei (1308–1311)</era>
+						<era type="147" draft="contributed">Ōchō (1311–1312)</era>
+						<era type="148" draft="contributed">Shōwa (1312–1317)</era>
+						<era type="149" draft="contributed">Bunpō (1317–1319)</era>
+						<era type="150" draft="contributed">Genō (1319–1321)</era>
+						<era type="151" draft="contributed">Genkyō (1321–1324)</era>
+						<era type="152" draft="contributed">Shōchū (1324–1326)</era>
+						<era type="153" draft="contributed">Kareki (1326–1329)</era>
+						<era type="154" draft="contributed">Gentoku (1329–1331)</era>
+						<era type="155" draft="contributed">Genkō (1331–1334)</era>
+						<era type="156" draft="contributed">Kemmu (1334–1336)</era>
+						<era type="157" draft="contributed">Engen (1336–1340)</era>
+						<era type="158" draft="contributed">Kōkoku (1340–1346)</era>
+						<era type="159" draft="contributed">Shōhei (1346–1370)</era>
+						<era type="160" draft="contributed">Kentoku (1370–1372)</era>
+						<era type="161" draft="contributed">Bunchū (1372–1375)</era>
+						<era type="162" draft="contributed">Tenju (1375–1379)</era>
+						<era type="163" draft="contributed">Kōryaku (1379–1381)</era>
+						<era type="164" draft="contributed">Kōwa (1381–1384)</era>
+						<era type="165" draft="contributed">Genchū (1384–1392)</era>
+						<era type="166" draft="contributed">Meitoku (1384–1387)</era>
+						<era type="167" draft="contributed">Kakei (1387–1389)</era>
+						<era type="168" draft="contributed">Kōō (1389–1390)</era>
+						<era type="169" draft="contributed">Meitoku (1390–1394)</era>
+						<era type="170" draft="contributed">Ōei (1394–1428)</era>
+						<era type="171" draft="contributed">Shōchō (1428–1429)</era>
+						<era type="172" draft="contributed">Eikyō (1429–1441)</era>
+						<era type="173" draft="contributed">Kakitsu (1441–1444)</era>
+						<era type="174" draft="contributed">Bun-an (1444-1449)</era>
+						<era type="175" draft="contributed">Hōtoku (1449–1452)</era>
+						<era type="176" draft="contributed">Kyōtoku (1452–1455)</era>
+						<era type="177" draft="contributed">Kōshō (1455–1457)</era>
+						<era type="178" draft="contributed">Chōroku (1457–1460)</era>
+						<era type="179" draft="contributed">Kanshō (1460–1466)</era>
+						<era type="180" draft="contributed">Bunshō (1466–1467)</era>
+						<era type="181" draft="contributed">Ōnin (1467–1469)</era>
+						<era type="182" draft="contributed">Bunmei (1469–1487)</era>
+						<era type="183" draft="contributed">Chōkyō (1487–1489)</era>
+						<era type="184" draft="contributed">Entoku (1489–1492)</era>
+						<era type="185" draft="contributed">Meiō (1492–1501)</era>
+						<era type="186" draft="contributed">Bunki (1501–1504)</era>
+						<era type="187" draft="contributed">Eishō (1504–1521)</era>
+						<era type="188" draft="contributed">Taiei (1521–1528)</era>
+						<era type="189" draft="contributed">Kyōroku (1528–1532)</era>
+						<era type="190" draft="contributed">Tenmon (1532–1555)</era>
+						<era type="191" draft="contributed">Kōji (1555–1558)</era>
+						<era type="192" draft="contributed">Eiroku (1558–1570)</era>
+						<era type="193" draft="contributed">Genki (1570–1573)</era>
+						<era type="194" draft="contributed">Tenshō (1573–1592)</era>
+						<era type="195" draft="contributed">Bunroku (1592–1596)</era>
+						<era type="196" draft="contributed">Keichō (1596–1615)</era>
+						<era type="197" draft="contributed">Genwa (1615–1624)</era>
+						<era type="198" draft="contributed">Kan-ei (1624-1644)</era>
+						<era type="199" draft="contributed">Shōho (1644–1648)</era>
+						<era type="200" draft="contributed">Keian (1648–1652)</era>
+						<era type="201" draft="contributed">Shōō (1652–1655)</era>
+						<era type="202" draft="contributed">Meiryaku (1655–1658)</era>
+						<era type="203" draft="contributed">Manji (1658–1661)</era>
+						<era type="204" draft="contributed">Kanbun (1661–1673)</era>
+						<era type="205" draft="contributed">Enpō (1673–1681)</era>
+						<era type="206" draft="contributed">Tenwa (1681–1684)</era>
+						<era type="207" draft="contributed">Jōkyō (1684–1688)</era>
+						<era type="208" draft="contributed">Genroku (1688–1704)</era>
+						<era type="209" draft="contributed">Hōei (1704–1711)</era>
+						<era type="210" draft="contributed">Shōtoku (1711–1716)</era>
+						<era type="211" draft="contributed">Kyōhō (1716–1736)</era>
+						<era type="212" draft="contributed">Genbun (1736–1741)</era>
+						<era type="213" draft="contributed">Kanpō (1741–1744)</era>
+						<era type="214" draft="contributed">Enkyō (1744–1748)</era>
+						<era type="215" draft="contributed">Kan-en (1748-1751)</era>
+						<era type="216" draft="contributed">Hōryaku (1751–1764)</era>
+						<era type="217" draft="contributed">Meiwa (1764–1772)</era>
+						<era type="218" draft="contributed">An-ei (1772-1781)</era>
+						<era type="219" draft="contributed">Tenmei (1781–1789)</era>
+						<era type="220" draft="contributed">Kansei (1789–1801)</era>
+						<era type="221" draft="contributed">Kyōwa (1801–1804)</era>
+						<era type="222" draft="contributed">Bunka (1804–1818)</era>
+						<era type="223" draft="contributed">Bunsei (1818–1830)</era>
+						<era type="224" draft="contributed">Tenpō (1830–1844)</era>
+						<era type="225" draft="contributed">Kōka (1844–1848)</era>
+						<era type="226" draft="contributed">Kaei (1848–1854)</era>
+						<era type="227" draft="contributed">Ansei (1854–1860)</era>
+						<era type="228" draft="contributed">Man-en (1860-1861)</era>
+						<era type="229" draft="contributed">Bunkyū (1861–1864)</era>
+						<era type="230" draft="contributed">Genji (1864–1865)</era>
+						<era type="231" draft="contributed">Keiō (1865–1868)</era>
+						<era type="232" draft="contributed">Meiji</era>
+						<era type="233" draft="contributed">Taishō</era>
+						<era type="234" draft="contributed">Shōwa</era>
+						<era type="235" draft="contributed">Heisei</era>
+					</eraAbbr>
+				</eras>
 				<!-- need some non-empty element here to make inheritance work,
 					 this copy of generic dateFormats above is smaller than root japanese eras
 				-->
@@ -3589,7 +3694,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<calendar type="roc">
 				<eras>
 					<eraAbbr>
-						<era type="0">Before R.O.C.</era>
+						<era type="0">voor R.O.C.</era>
 						<era type="1">Minguo</era>
 					</eraAbbr>
 				</eras>
@@ -3647,10 +3752,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</calendars>
 		<fields>
 			<field type="era">
-				<displayName>Tijdperk</displayName>
+				<displayName>tijdperk</displayName>
 			</field>
 			<field type="year">
-				<displayName>Jaar</displayName>
+				<displayName>jaar</displayName>
 				<relative type="-1">vorig jaar</relative>
 				<relative type="0">dit jaar</relative>
 				<relative type="1">volgend jaar</relative>
@@ -3664,62 +3769,77 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="year-short">
-				<displayName draft="contributed">jr.</displayName>
+				<displayName>jr.</displayName>
+				<relative type="-1">vorig jaar</relative>
+				<relative type="0">dit jaar</relative>
+				<relative type="1">volgend jaar</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="contributed">over {0} jaar</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">over {0} jaar</relativeTimePattern>
+					<relativeTimePattern count="one">over {0} jaar</relativeTimePattern>
+					<relativeTimePattern count="other">over {0} jaar</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="contributed">{0} jaar geleden</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">{0} jaar geleden</relativeTimePattern>
+					<relativeTimePattern count="one">{0} jaar geleden</relativeTimePattern>
+					<relativeTimePattern count="other">{0} jaar geleden</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="year-narrow">
-				<displayName draft="contributed">jr.</displayName>
+				<displayName>jr.</displayName>
+				<relative type="-1">vorig jaar</relative>
+				<relative type="0">dit jaar</relative>
+				<relative type="1">volgend jaar</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="contributed">over {0} jaar</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">over {0} jaar</relativeTimePattern>
+					<relativeTimePattern count="one">over {0} jaar</relativeTimePattern>
+					<relativeTimePattern count="other">over {0} jaar</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="contributed">{0} jaar geleden</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">{0} jaar geleden</relativeTimePattern>
+					<relativeTimePattern count="one">{0} jaar geleden</relativeTimePattern>
+					<relativeTimePattern count="other">{0} jaar geleden</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter">
-				<displayName draft="contributed">Kwartaal</displayName>
+				<displayName>kwartaal</displayName>
+				<relative type="-1">vorig kwartaal</relative>
+				<relative type="0">dit kwartaal</relative>
+				<relative type="1">volgend kwartaal</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="contributed">over {0} kwartaal</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">over {0} kwartalen</relativeTimePattern>
+					<relativeTimePattern count="one">over {0} kwartaal</relativeTimePattern>
+					<relativeTimePattern count="other">over {0} kwartalen</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="contributed">{0} kwartaal geleden</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">{0} kwartalen geleden</relativeTimePattern>
+					<relativeTimePattern count="one">{0} kwartaal geleden</relativeTimePattern>
+					<relativeTimePattern count="other">{0} kwartalen geleden</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-short">
-				<displayName draft="contributed">kwartaal</displayName>
+				<displayName>kwartaal</displayName>
+				<relative type="-1">vorig kwartaal</relative>
+				<relative type="0">dit kwartaal</relative>
+				<relative type="1">volgend kwartaal</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="contributed">over {0} kwartaal</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">over {0} kwartalen</relativeTimePattern>
+					<relativeTimePattern count="one">over {0} kwartaal</relativeTimePattern>
+					<relativeTimePattern count="other">over {0} kwartalen</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="contributed">{0} kwartaal geleden</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">{0} kwartalen geleden</relativeTimePattern>
+					<relativeTimePattern count="one">{0} kwartaal geleden</relativeTimePattern>
+					<relativeTimePattern count="other">{0} kwartalen geleden</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-narrow">
-				<displayName draft="contributed">kwartaal</displayName>
+				<displayName>kwartaal</displayName>
+				<relative type="-1">vorig kwartaal</relative>
+				<relative type="0">dit kwartaal</relative>
+				<relative type="1">volgend kwartaal</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="contributed">over {0} kwartaal</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">over {0} kwartalen</relativeTimePattern>
+					<relativeTimePattern count="one">over {0} kwartaal</relativeTimePattern>
+					<relativeTimePattern count="other">over {0} kwartalen</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="contributed">{0} kwartaal geleden</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">{0} kwartalen geleden</relativeTimePattern>
+					<relativeTimePattern count="one">{0} kwartaal geleden</relativeTimePattern>
+					<relativeTimePattern count="other">{0} kwartalen geleden</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month">
-				<displayName>Maand</displayName>
+				<displayName>maand</displayName>
 				<relative type="-1">vorige maand</relative>
 				<relative type="0">deze maand</relative>
 				<relative type="1">volgende maand</relative>
@@ -3733,29 +3853,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="month-short">
-				<displayName draft="contributed">mnd</displayName>
+				<displayName>mnd</displayName>
+				<relative type="-1">vorige maand</relative>
+				<relative type="0">deze maand</relative>
+				<relative type="1">volgende maand</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="contributed">over {0} maand</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">over {0} maanden</relativeTimePattern>
+					<relativeTimePattern count="one">over {0} maand</relativeTimePattern>
+					<relativeTimePattern count="other">over {0} maanden</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="contributed">{0} maand geleden</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">{0} maanden geleden</relativeTimePattern>
+					<relativeTimePattern count="one">{0} maand geleden</relativeTimePattern>
+					<relativeTimePattern count="other">{0} maanden geleden</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month-narrow">
-				<displayName draft="contributed">mnd</displayName>
+				<displayName>mnd</displayName>
+				<relative type="-1">vorige maand</relative>
+				<relative type="0">deze maand</relative>
+				<relative type="1">volgende maand</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="contributed">over {0} maand</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">over {0} maanden</relativeTimePattern>
+					<relativeTimePattern count="one">over {0} maand</relativeTimePattern>
+					<relativeTimePattern count="other">over {0} maanden</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="contributed">{0} maand geleden</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">{0} maanden geleden</relativeTimePattern>
+					<relativeTimePattern count="one">{0} maand geleden</relativeTimePattern>
+					<relativeTimePattern count="other">{0} maanden geleden</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week">
-				<displayName>Week</displayName>
+				<displayName>week</displayName>
 				<relative type="-1">vorige week</relative>
 				<relative type="0">deze week</relative>
 				<relative type="1">volgende week</relative>
@@ -3769,29 +3895,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="week-short">
-				<displayName draft="contributed">wk</displayName>
+				<displayName>wk</displayName>
+				<relative type="-1">vorige week</relative>
+				<relative type="0">deze week</relative>
+				<relative type="1">volgende week</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="contributed">over {0} week</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">over {0} weken</relativeTimePattern>
+					<relativeTimePattern count="one">over {0} week</relativeTimePattern>
+					<relativeTimePattern count="other">over {0} weken</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="contributed">{0} week geleden</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">{0} weken geleden</relativeTimePattern>
+					<relativeTimePattern count="one">{0} week geleden</relativeTimePattern>
+					<relativeTimePattern count="other">{0} weken geleden</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week-narrow">
-				<displayName draft="contributed">wk</displayName>
+				<displayName>wk</displayName>
+				<relative type="-1">vorige week</relative>
+				<relative type="0">deze week</relative>
+				<relative type="1">volgende week</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="contributed">over {0} week</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">over {0} weken</relativeTimePattern>
+					<relativeTimePattern count="one">over {0} week</relativeTimePattern>
+					<relativeTimePattern count="other">over {0} weken</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="contributed">{0} week geleden</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">{0} weken geleden</relativeTimePattern>
+					<relativeTimePattern count="one">{0} week geleden</relativeTimePattern>
+					<relativeTimePattern count="other">{0} weken geleden</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day">
-				<displayName>Dag</displayName>
+				<displayName>dag</displayName>
 				<relative type="-2">eergisteren</relative>
 				<relative type="-1">gisteren</relative>
 				<relative type="0">vandaag</relative>
@@ -3807,7 +3939,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day-short">
-				<displayName draft="contributed">dag</displayName>
+				<displayName>dag</displayName>
+				<relative type="-2">eergisteren</relative>
+				<relative type="-1">gisteren</relative>
+				<relative type="0">vandaag</relative>
+				<relative type="1">morgen</relative>
+				<relative type="2">overmorgen</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">over {0} dag</relativeTimePattern>
 					<relativeTimePattern count="other">over {0} dgn</relativeTimePattern>
@@ -3818,7 +3955,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day-narrow">
-				<displayName draft="contributed">dag</displayName>
+				<displayName>dag</displayName>
+				<relative type="-2">eergisteren</relative>
+				<relative type="-1">gisteren</relative>
+				<relative type="0">vandaag</relative>
+				<relative type="1">morgen</relative>
+				<relative type="2">overmorgen</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">over {0} dag</relativeTimePattern>
 					<relativeTimePattern count="other">over {0} dgn</relativeTimePattern>
@@ -3829,7 +3971,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="weekday">
-				<displayName>Dag van de week</displayName>
+				<displayName>dag van de week</displayName>
 			</field>
 			<field type="sun">
 				<relative type="-1">afgelopen zondag</relative>
@@ -3837,14 +3979,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">volgende week zondag</relative>
 			</field>
 			<field type="sun-short">
-				<relative type="-1" draft="contributed">afgelopen zon.</relative>
-				<relative type="0" draft="contributed">deze zon.</relative>
-				<relative type="1" draft="contributed">volgende week zon.</relative>
+				<relative type="-1">afgelopen zon.</relative>
+				<relative type="0">deze zon.</relative>
+				<relative type="1">volgende week zon.</relative>
 			</field>
 			<field type="sun-narrow">
-				<relative type="-1" draft="contributed">afgelopen zo</relative>
-				<relative type="0" draft="contributed">deze zo</relative>
-				<relative type="1" draft="contributed">volgende week zo</relative>
+				<relative type="-1">afgelopen zo</relative>
+				<relative type="0">deze zo</relative>
+				<relative type="1">volgende week zo</relative>
 			</field>
 			<field type="mon">
 				<relative type="-1">afgelopen maandag</relative>
@@ -3852,14 +3994,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">volgende week maandag</relative>
 			</field>
 			<field type="mon-short">
-				<relative type="-1" draft="contributed">afgelopen maan.</relative>
-				<relative type="0" draft="contributed">deze maan.</relative>
-				<relative type="1" draft="contributed">volgende week maan.</relative>
+				<relative type="-1">afgelopen maan.</relative>
+				<relative type="0">deze maan.</relative>
+				<relative type="1">volgende week maan.</relative>
 			</field>
 			<field type="mon-narrow">
-				<relative type="-1" draft="contributed">afgelopen ma</relative>
-				<relative type="0" draft="contributed">deze ma</relative>
-				<relative type="1" draft="contributed">volgende week ma</relative>
+				<relative type="-1">afgelopen ma</relative>
+				<relative type="0">deze ma</relative>
+				<relative type="1">volgende week ma</relative>
 			</field>
 			<field type="tue">
 				<relative type="-1">afgelopen dinsdag</relative>
@@ -3867,14 +4009,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">volgende week dinsdag</relative>
 			</field>
 			<field type="tue-short">
-				<relative type="-1" draft="contributed">afgelopen dins.</relative>
-				<relative type="0" draft="contributed">deze dins.</relative>
-				<relative type="1" draft="contributed">volgende week dins.</relative>
+				<relative type="-1">afgelopen dins.</relative>
+				<relative type="0">deze dins.</relative>
+				<relative type="1">volgende week dins.</relative>
 			</field>
 			<field type="tue-narrow">
-				<relative type="-1" draft="contributed">afgelopen di</relative>
-				<relative type="0" draft="contributed">deze di</relative>
-				<relative type="1" draft="contributed">volgende week di</relative>
+				<relative type="-1">afgelopen di</relative>
+				<relative type="0">deze di</relative>
+				<relative type="1">volgende week di</relative>
 			</field>
 			<field type="wed">
 				<relative type="-1">afgelopen woensdag</relative>
@@ -3882,14 +4024,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">volgende week woensdag</relative>
 			</field>
 			<field type="wed-short">
-				<relative type="-1" draft="contributed">afgelopen woens.</relative>
-				<relative type="0" draft="contributed">deze woens.</relative>
-				<relative type="1" draft="contributed">volgende week woens.</relative>
+				<relative type="-1">afgelopen woens.</relative>
+				<relative type="0">deze woens.</relative>
+				<relative type="1">volgende week woens.</relative>
 			</field>
 			<field type="wed-narrow">
-				<relative type="-1" draft="contributed">afgelopen wo</relative>
-				<relative type="0" draft="contributed">deze wo</relative>
-				<relative type="1" draft="contributed">volgende week wo</relative>
+				<relative type="-1">afgelopen wo</relative>
+				<relative type="0">deze wo</relative>
+				<relative type="1">volgende week wo</relative>
 			</field>
 			<field type="thu">
 				<relative type="-1">afgelopen donderdag</relative>
@@ -3897,14 +4039,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">volgende week donderdag</relative>
 			</field>
 			<field type="thu-short">
-				<relative type="-1" draft="contributed">afgelopen donder.</relative>
-				<relative type="0" draft="contributed">deze donder.</relative>
-				<relative type="1" draft="contributed">volgende week donder.</relative>
+				<relative type="-1">afgelopen donder.</relative>
+				<relative type="0">deze donder.</relative>
+				<relative type="1">volgende week donder.</relative>
 			</field>
 			<field type="thu-narrow">
-				<relative type="-1" draft="contributed">afgelopen do</relative>
-				<relative type="0" draft="contributed">deze do</relative>
-				<relative type="1" draft="contributed">volgende week do</relative>
+				<relative type="-1">afgelopen do</relative>
+				<relative type="0">deze do</relative>
+				<relative type="1">volgende week do</relative>
 			</field>
 			<field type="fri">
 				<relative type="-1">afgelopen vrijdag</relative>
@@ -3912,14 +4054,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">volgende week vrijdag</relative>
 			</field>
 			<field type="fri-short">
-				<relative type="-1" draft="contributed">afgelopen vrij.</relative>
-				<relative type="0" draft="contributed">deze vrij.</relative>
-				<relative type="1" draft="contributed">volgende week vrij.</relative>
+				<relative type="-1">afgelopen vrij.</relative>
+				<relative type="0">deze vrij.</relative>
+				<relative type="1">volgende week vrij.</relative>
 			</field>
 			<field type="fri-narrow">
-				<relative type="-1" draft="contributed">afgelopen vr</relative>
-				<relative type="0" draft="contributed">deze vr</relative>
-				<relative type="1" draft="contributed">volgende week vr</relative>
+				<relative type="-1">afgelopen vr</relative>
+				<relative type="0">deze vr</relative>
+				<relative type="1">volgende week vr</relative>
 			</field>
 			<field type="sat">
 				<relative type="-1">afgelopen zaterdag</relative>
@@ -3927,14 +4069,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">volgende week zaterdag</relative>
 			</field>
 			<field type="sat-short">
-				<relative type="-1" draft="contributed">afgelopen zater.</relative>
-				<relative type="0" draft="contributed">deze zater.</relative>
-				<relative type="1" draft="contributed">volgende week zater.</relative>
+				<relative type="-1">afgelopen zater.</relative>
+				<relative type="0">deze zater.</relative>
+				<relative type="1">volgende week zater.</relative>
 			</field>
 			<field type="sat-narrow">
-				<relative type="-1" draft="contributed">afgelopen za</relative>
-				<relative type="0" draft="contributed">deze za</relative>
-				<relative type="1" draft="contributed">volgende week za</relative>
+				<relative type="-1">afgelopen za</relative>
+				<relative type="0">deze za</relative>
+				<relative type="1">volgende week za</relative>
 			</field>
 			<field type="dayperiod">
 				<displayName>a.m./p.m.</displayName>
@@ -3951,7 +4093,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="hour-short">
-				<displayName draft="contributed">uur</displayName>
+				<displayName>uur</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">over {0} uur</relativeTimePattern>
 					<relativeTimePattern count="other">over {0} uur</relativeTimePattern>
@@ -3962,7 +4104,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="hour-narrow">
-				<displayName draft="contributed">u</displayName>
+				<displayName>u</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">over {0} uur</relativeTimePattern>
 					<relativeTimePattern count="other">over {0} uur</relativeTimePattern>
@@ -3973,7 +4115,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="minute">
-				<displayName>Minuut</displayName>
+				<displayName>minuut</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">over {0} minuut</relativeTimePattern>
 					<relativeTimePattern count="other">over {0} minuten</relativeTimePattern>
@@ -3984,7 +4126,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="minute-short">
-				<displayName draft="contributed">min.</displayName>
+				<displayName>min.</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">over {0} min.</relativeTimePattern>
 					<relativeTimePattern count="other">over {0} min.</relativeTimePattern>
@@ -3995,7 +4137,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="minute-narrow">
-				<displayName draft="contributed">m</displayName>
+				<displayName>m</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">over {0} min.</relativeTimePattern>
 					<relativeTimePattern count="other">over {0} min.</relativeTimePattern>
@@ -4006,7 +4148,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="second">
-				<displayName>Seconde</displayName>
+				<displayName>seconde</displayName>
 				<relative type="0">nu</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">over {0} seconde</relativeTimePattern>
@@ -4018,7 +4160,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="second-short">
-				<displayName draft="contributed">sec.</displayName>
+				<displayName>sec.</displayName>
+				<relative type="0">nu</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">over {0} sec.</relativeTimePattern>
 					<relativeTimePattern count="other">over {0} sec.</relativeTimePattern>
@@ -4029,7 +4172,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="second-narrow">
-				<displayName draft="contributed">s</displayName>
+				<displayName>s</displayName>
+				<relative type="0">nu</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">over {0} sec.</relativeTimePattern>
 					<relativeTimePattern count="other">over {0} sec.</relativeTimePattern>
@@ -4040,34 +4184,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>Zone</displayName>
+				<displayName>tijdzone</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
-			<hourFormat draft="contributed">+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat draft="contributed">GMT{0}</gmtFormat>
-			<gmtZeroFormat draft="contributed">GMT</gmtZeroFormat>
-			<regionFormat draft="contributed">{0}-tijd</regionFormat>
+			<hourFormat>+HH:mm;-HH:mm</hourFormat>
+			<gmtFormat>GMT{0}</gmtFormat>
+			<gmtZeroFormat>GMT</gmtZeroFormat>
+			<regionFormat>{0}-tijd</regionFormat>
 			<regionFormat type="daylight">zomertijd {0}</regionFormat>
 			<regionFormat type="standard">standaardtijd {0}</regionFormat>
-			<fallbackFormat draft="contributed">{1} ({0})</fallbackFormat>
+			<fallbackFormat>{1} ({0})</fallbackFormat>
 			<zone type="Etc/Unknown">
 				<exemplarCity>onbekende stad</exemplarCity>
 			</zone>
 			<zone type="Europe/Andorra">
-				<exemplarCity draft="contributed">Andorra</exemplarCity>
+				<exemplarCity>Andorra</exemplarCity>
 			</zone>
 			<zone type="Asia/Dubai">
-				<exemplarCity draft="contributed">Dubai</exemplarCity>
+				<exemplarCity>Dubai</exemplarCity>
 			</zone>
 			<zone type="Asia/Kabul">
-				<exemplarCity draft="contributed">Kabul</exemplarCity>
+				<exemplarCity>Kabul</exemplarCity>
 			</zone>
 			<zone type="America/Antigua">
-				<exemplarCity draft="contributed">Antigua</exemplarCity>
+				<exemplarCity>Antigua</exemplarCity>
 			</zone>
 			<zone type="America/Anguilla">
-				<exemplarCity draft="contributed">Anguilla</exemplarCity>
+				<exemplarCity>Anguilla</exemplarCity>
 			</zone>
 			<zone type="Europe/Tirane">
 				<exemplarCity>Tirana</exemplarCity>
@@ -4076,64 +4220,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Jerevan</exemplarCity>
 			</zone>
 			<zone type="Africa/Luanda">
-				<exemplarCity draft="contributed">Luanda</exemplarCity>
+				<exemplarCity>Luanda</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Rothera">
-				<exemplarCity draft="contributed">Rothera</exemplarCity>
+				<exemplarCity>Rothera</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Palmer">
-				<exemplarCity draft="contributed">Palmer</exemplarCity>
+				<exemplarCity>Palmer</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Troll">
-				<exemplarCity draft="contributed">Troll</exemplarCity>
+				<exemplarCity>Troll</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Syowa">
-				<exemplarCity draft="contributed">Syowa</exemplarCity>
+				<exemplarCity>Syowa</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Mawson">
-				<exemplarCity draft="contributed">Mawson</exemplarCity>
+				<exemplarCity>Mawson</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Davis">
-				<exemplarCity draft="contributed">Davis</exemplarCity>
+				<exemplarCity>Davis</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Vostok">
-				<exemplarCity draft="contributed">Vostok</exemplarCity>
+				<exemplarCity>Vostok</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Casey">
-				<exemplarCity draft="contributed">Casey</exemplarCity>
+				<exemplarCity>Casey</exemplarCity>
 			</zone>
 			<zone type="Antarctica/DumontDUrville">
 				<exemplarCity>Dumont d’Urville</exemplarCity>
 			</zone>
 			<zone type="Antarctica/McMurdo">
-				<exemplarCity draft="contributed">McMurdo</exemplarCity>
+				<exemplarCity>McMurdo</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Rio_Gallegos">
 				<exemplarCity>Río Gallegos</exemplarCity>
 			</zone>
 			<zone type="America/Mendoza">
-				<exemplarCity draft="contributed">Mendoza</exemplarCity>
+				<exemplarCity>Mendoza</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/San_Juan">
-				<exemplarCity draft="contributed">San Juan</exemplarCity>
+				<exemplarCity>San Juan</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity draft="contributed">Ushuaia</exemplarCity>
+				<exemplarCity>Ushuaia</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity draft="contributed">La Rioja</exemplarCity>
+				<exemplarCity>La Rioja</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/San_Luis">
-				<exemplarCity draft="contributed">San Luis</exemplarCity>
+				<exemplarCity>San Luis</exemplarCity>
 			</zone>
 			<zone type="America/Catamarca">
-				<exemplarCity draft="contributed">Catamarca</exemplarCity>
+				<exemplarCity>Catamarca</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Salta">
-				<exemplarCity draft="contributed">Salta</exemplarCity>
+				<exemplarCity>Salta</exemplarCity>
 			</zone>
 			<zone type="America/Jujuy">
-				<exemplarCity draft="contributed">Jujuy</exemplarCity>
+				<exemplarCity>Jujuy</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Tucuman">
 				<exemplarCity>Tucumán</exemplarCity>
@@ -4142,244 +4286,244 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Córdoba</exemplarCity>
 			</zone>
 			<zone type="America/Buenos_Aires">
-				<exemplarCity draft="contributed">Buenos Aires</exemplarCity>
+				<exemplarCity>Buenos Aires</exemplarCity>
 			</zone>
 			<zone type="Pacific/Pago_Pago">
-				<exemplarCity draft="contributed">Pago Pago</exemplarCity>
+				<exemplarCity>Pago Pago</exemplarCity>
 			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Wenen</exemplarCity>
 			</zone>
 			<zone type="Australia/Perth">
-				<exemplarCity draft="contributed">Perth</exemplarCity>
+				<exemplarCity>Perth</exemplarCity>
 			</zone>
 			<zone type="Australia/Eucla">
-				<exemplarCity draft="contributed">Eucla</exemplarCity>
+				<exemplarCity>Eucla</exemplarCity>
 			</zone>
 			<zone type="Australia/Darwin">
-				<exemplarCity draft="contributed">Darwin</exemplarCity>
+				<exemplarCity>Darwin</exemplarCity>
 			</zone>
 			<zone type="Australia/Adelaide">
-				<exemplarCity draft="contributed">Adelaide</exemplarCity>
+				<exemplarCity>Adelaide</exemplarCity>
 			</zone>
 			<zone type="Australia/Broken_Hill">
-				<exemplarCity draft="contributed">Broken Hill</exemplarCity>
+				<exemplarCity>Broken Hill</exemplarCity>
 			</zone>
 			<zone type="Australia/Currie">
-				<exemplarCity draft="contributed">Currie</exemplarCity>
+				<exemplarCity>Currie</exemplarCity>
 			</zone>
 			<zone type="Australia/Melbourne">
-				<exemplarCity draft="contributed">Melbourne</exemplarCity>
+				<exemplarCity>Melbourne</exemplarCity>
 			</zone>
 			<zone type="Australia/Hobart">
-				<exemplarCity draft="contributed">Hobart</exemplarCity>
+				<exemplarCity>Hobart</exemplarCity>
 			</zone>
 			<zone type="Australia/Lindeman">
-				<exemplarCity draft="contributed">Lindeman</exemplarCity>
+				<exemplarCity>Lindeman</exemplarCity>
 			</zone>
 			<zone type="Australia/Sydney">
-				<exemplarCity draft="contributed">Sydney</exemplarCity>
+				<exemplarCity>Sydney</exemplarCity>
 			</zone>
 			<zone type="Australia/Brisbane">
-				<exemplarCity draft="contributed">Brisbane</exemplarCity>
+				<exemplarCity>Brisbane</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Macquarie">
-				<exemplarCity draft="contributed">Macquarie</exemplarCity>
+				<exemplarCity>Macquarie</exemplarCity>
 			</zone>
 			<zone type="Australia/Lord_Howe">
-				<exemplarCity draft="contributed">Lord Howe</exemplarCity>
+				<exemplarCity>Lord Howe</exemplarCity>
 			</zone>
 			<zone type="America/Aruba">
-				<exemplarCity draft="contributed">Aruba</exemplarCity>
+				<exemplarCity>Aruba</exemplarCity>
 			</zone>
 			<zone type="Europe/Mariehamn">
-				<exemplarCity draft="contributed">Mariehamn</exemplarCity>
+				<exemplarCity>Mariehamn</exemplarCity>
 			</zone>
 			<zone type="Asia/Baku">
 				<exemplarCity>Bakoe</exemplarCity>
 			</zone>
 			<zone type="Europe/Sarajevo">
-				<exemplarCity draft="contributed">Sarajevo</exemplarCity>
+				<exemplarCity>Sarajevo</exemplarCity>
 			</zone>
 			<zone type="America/Barbados">
-				<exemplarCity draft="contributed">Barbados</exemplarCity>
+				<exemplarCity>Barbados</exemplarCity>
 			</zone>
 			<zone type="Asia/Dhaka">
-				<exemplarCity draft="contributed">Dhaka</exemplarCity>
+				<exemplarCity>Dhaka</exemplarCity>
 			</zone>
 			<zone type="Europe/Brussels">
 				<exemplarCity>Brussel</exemplarCity>
 			</zone>
 			<zone type="Africa/Ouagadougou">
-				<exemplarCity draft="contributed">Ouagadougou</exemplarCity>
+				<exemplarCity>Ouagadougou</exemplarCity>
 			</zone>
 			<zone type="Europe/Sofia">
-				<exemplarCity draft="contributed">Sofia</exemplarCity>
+				<exemplarCity>Sofia</exemplarCity>
 			</zone>
 			<zone type="Asia/Bahrain">
 				<exemplarCity>Bahrein</exemplarCity>
 			</zone>
 			<zone type="Africa/Bujumbura">
-				<exemplarCity draft="contributed">Bujumbura</exemplarCity>
+				<exemplarCity>Bujumbura</exemplarCity>
 			</zone>
 			<zone type="Africa/Porto-Novo">
-				<exemplarCity draft="contributed">Porto-Novo</exemplarCity>
+				<exemplarCity>Porto-Novo</exemplarCity>
 			</zone>
 			<zone type="America/St_Barthelemy">
 				<exemplarCity>Saint-Barthélemy</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Bermuda">
-				<exemplarCity draft="contributed">Bermuda</exemplarCity>
+				<exemplarCity>Bermuda</exemplarCity>
 			</zone>
 			<zone type="Asia/Brunei">
-				<exemplarCity draft="contributed">Brunei</exemplarCity>
+				<exemplarCity>Brunei</exemplarCity>
 			</zone>
 			<zone type="America/La_Paz">
-				<exemplarCity draft="contributed">La Paz</exemplarCity>
+				<exemplarCity>La Paz</exemplarCity>
 			</zone>
 			<zone type="America/Kralendijk">
-				<exemplarCity draft="contributed">Kralendijk</exemplarCity>
+				<exemplarCity>Kralendijk</exemplarCity>
 			</zone>
 			<zone type="America/Eirunepe">
-				<exemplarCity draft="contributed">Eirunepe</exemplarCity>
+				<exemplarCity>Eirunepe</exemplarCity>
 			</zone>
 			<zone type="America/Rio_Branco">
-				<exemplarCity draft="contributed">Rio Branco</exemplarCity>
+				<exemplarCity>Rio Branco</exemplarCity>
 			</zone>
 			<zone type="America/Porto_Velho">
 				<exemplarCity>Porto Velho</exemplarCity>
 			</zone>
 			<zone type="America/Boa_Vista">
-				<exemplarCity draft="contributed">Boa Vista</exemplarCity>
+				<exemplarCity>Boa Vista</exemplarCity>
 			</zone>
 			<zone type="America/Manaus">
-				<exemplarCity draft="contributed">Manaus</exemplarCity>
+				<exemplarCity>Manaus</exemplarCity>
 			</zone>
 			<zone type="America/Cuiaba">
 				<exemplarCity>Cuiabá</exemplarCity>
 			</zone>
 			<zone type="America/Santarem">
-				<exemplarCity draft="contributed">Santarem</exemplarCity>
+				<exemplarCity>Santarem</exemplarCity>
 			</zone>
 			<zone type="America/Campo_Grande">
-				<exemplarCity draft="contributed">Campo Grande</exemplarCity>
+				<exemplarCity>Campo Grande</exemplarCity>
 			</zone>
 			<zone type="America/Belem">
 				<exemplarCity>Belém</exemplarCity>
 			</zone>
 			<zone type="America/Araguaina">
-				<exemplarCity draft="contributed">Araguaina</exemplarCity>
+				<exemplarCity>Araguaina</exemplarCity>
 			</zone>
 			<zone type="America/Sao_Paulo">
 				<exemplarCity>São Paulo</exemplarCity>
 			</zone>
 			<zone type="America/Bahia">
-				<exemplarCity draft="contributed">Bahia</exemplarCity>
+				<exemplarCity>Bahia</exemplarCity>
 			</zone>
 			<zone type="America/Fortaleza">
-				<exemplarCity draft="contributed">Fortaleza</exemplarCity>
+				<exemplarCity>Fortaleza</exemplarCity>
 			</zone>
 			<zone type="America/Maceio">
 				<exemplarCity>Maceió</exemplarCity>
 			</zone>
 			<zone type="America/Recife">
-				<exemplarCity draft="contributed">Recife</exemplarCity>
+				<exemplarCity>Recife</exemplarCity>
 			</zone>
 			<zone type="America/Noronha">
-				<exemplarCity draft="contributed">Noronha</exemplarCity>
+				<exemplarCity>Noronha</exemplarCity>
 			</zone>
 			<zone type="America/Nassau">
-				<exemplarCity draft="contributed">Nassau</exemplarCity>
+				<exemplarCity>Nassau</exemplarCity>
 			</zone>
 			<zone type="Asia/Thimphu">
-				<exemplarCity draft="contributed">Thimphu</exemplarCity>
+				<exemplarCity>Thimphu</exemplarCity>
 			</zone>
 			<zone type="Africa/Gaborone">
-				<exemplarCity draft="contributed">Gaborone</exemplarCity>
+				<exemplarCity>Gaborone</exemplarCity>
 			</zone>
 			<zone type="Europe/Minsk">
-				<exemplarCity draft="contributed">Minsk</exemplarCity>
+				<exemplarCity>Minsk</exemplarCity>
 			</zone>
 			<zone type="America/Belize">
-				<exemplarCity draft="contributed">Belize</exemplarCity>
+				<exemplarCity>Belize</exemplarCity>
 			</zone>
 			<zone type="America/Dawson">
-				<exemplarCity draft="contributed">Dawson</exemplarCity>
+				<exemplarCity>Dawson</exemplarCity>
 			</zone>
 			<zone type="America/Whitehorse">
-				<exemplarCity draft="contributed">Whitehorse</exemplarCity>
+				<exemplarCity>Whitehorse</exemplarCity>
 			</zone>
 			<zone type="America/Inuvik">
-				<exemplarCity draft="contributed">Inuvik</exemplarCity>
+				<exemplarCity>Inuvik</exemplarCity>
 			</zone>
 			<zone type="America/Vancouver">
-				<exemplarCity draft="contributed">Vancouver</exemplarCity>
+				<exemplarCity>Vancouver</exemplarCity>
 			</zone>
 			<zone type="America/Dawson_Creek">
-				<exemplarCity draft="contributed">Dawson Creek</exemplarCity>
+				<exemplarCity>Dawson Creek</exemplarCity>
 			</zone>
 			<zone type="America/Creston">
-				<exemplarCity draft="contributed">Creston</exemplarCity>
+				<exemplarCity>Creston</exemplarCity>
 			</zone>
 			<zone type="America/Yellowknife">
-				<exemplarCity draft="contributed">Yellowknife</exemplarCity>
+				<exemplarCity>Yellowknife</exemplarCity>
 			</zone>
 			<zone type="America/Edmonton">
-				<exemplarCity draft="contributed">Edmonton</exemplarCity>
+				<exemplarCity>Edmonton</exemplarCity>
 			</zone>
 			<zone type="America/Swift_Current">
-				<exemplarCity draft="contributed">Swift Current</exemplarCity>
+				<exemplarCity>Swift Current</exemplarCity>
 			</zone>
 			<zone type="America/Cambridge_Bay">
-				<exemplarCity draft="contributed">Cambridge Bay</exemplarCity>
+				<exemplarCity>Cambridge Bay</exemplarCity>
 			</zone>
 			<zone type="America/Regina">
-				<exemplarCity draft="contributed">Regina</exemplarCity>
+				<exemplarCity>Regina</exemplarCity>
 			</zone>
 			<zone type="America/Winnipeg">
-				<exemplarCity draft="contributed">Winnipeg</exemplarCity>
+				<exemplarCity>Winnipeg</exemplarCity>
 			</zone>
 			<zone type="America/Resolute">
-				<exemplarCity draft="contributed">Resolute</exemplarCity>
+				<exemplarCity>Resolute</exemplarCity>
 			</zone>
 			<zone type="America/Rainy_River">
-				<exemplarCity draft="contributed">Rainy River</exemplarCity>
+				<exemplarCity>Rainy River</exemplarCity>
 			</zone>
 			<zone type="America/Rankin_Inlet">
-				<exemplarCity draft="contributed">Rankin Inlet</exemplarCity>
+				<exemplarCity>Rankin Inlet</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>Atikokan</exemplarCity>
 			</zone>
 			<zone type="America/Thunder_Bay">
-				<exemplarCity draft="contributed">Thunder Bay</exemplarCity>
+				<exemplarCity>Thunder Bay</exemplarCity>
 			</zone>
 			<zone type="America/Nipigon">
-				<exemplarCity draft="contributed">Nipigon</exemplarCity>
+				<exemplarCity>Nipigon</exemplarCity>
 			</zone>
 			<zone type="America/Toronto">
-				<exemplarCity draft="contributed">Toronto</exemplarCity>
+				<exemplarCity>Toronto</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
-				<exemplarCity draft="contributed">Iqaluit</exemplarCity>
+				<exemplarCity>Iqaluit</exemplarCity>
 			</zone>
 			<zone type="America/Pangnirtung">
-				<exemplarCity draft="contributed">Pangnirtung</exemplarCity>
+				<exemplarCity>Pangnirtung</exemplarCity>
 			</zone>
 			<zone type="America/Moncton">
-				<exemplarCity draft="contributed">Moncton</exemplarCity>
+				<exemplarCity>Moncton</exemplarCity>
 			</zone>
 			<zone type="America/Halifax">
-				<exemplarCity draft="contributed">Halifax</exemplarCity>
+				<exemplarCity>Halifax</exemplarCity>
 			</zone>
 			<zone type="America/Goose_Bay">
-				<exemplarCity draft="contributed">Goose Bay</exemplarCity>
+				<exemplarCity>Goose Bay</exemplarCity>
 			</zone>
 			<zone type="America/Glace_Bay">
-				<exemplarCity draft="contributed">Glace Bay</exemplarCity>
+				<exemplarCity>Glace Bay</exemplarCity>
 			</zone>
 			<zone type="America/Blanc-Sablon">
-				<exemplarCity draft="contributed">Blanc-Sablon</exemplarCity>
+				<exemplarCity>Blanc-Sablon</exemplarCity>
 			</zone>
 			<zone type="America/St_Johns">
 				<exemplarCity>St. John’s</exemplarCity>
@@ -4388,37 +4532,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Cocoseilanden</exemplarCity>
 			</zone>
 			<zone type="Africa/Kinshasa">
-				<exemplarCity draft="contributed">Kinshasa</exemplarCity>
+				<exemplarCity>Kinshasa</exemplarCity>
 			</zone>
 			<zone type="Africa/Lubumbashi">
-				<exemplarCity draft="contributed">Lubumbashi</exemplarCity>
+				<exemplarCity>Lubumbashi</exemplarCity>
 			</zone>
 			<zone type="Africa/Bangui">
-				<exemplarCity draft="contributed">Bangui</exemplarCity>
+				<exemplarCity>Bangui</exemplarCity>
 			</zone>
 			<zone type="Africa/Brazzaville">
-				<exemplarCity draft="contributed">Brazzaville</exemplarCity>
+				<exemplarCity>Brazzaville</exemplarCity>
 			</zone>
 			<zone type="Europe/Zurich">
 				<exemplarCity>Zürich</exemplarCity>
 			</zone>
 			<zone type="Africa/Abidjan">
-				<exemplarCity draft="contributed">Abidjan</exemplarCity>
+				<exemplarCity>Abidjan</exemplarCity>
 			</zone>
 			<zone type="Pacific/Rarotonga">
-				<exemplarCity draft="contributed">Rarotonga</exemplarCity>
+				<exemplarCity>Rarotonga</exemplarCity>
 			</zone>
 			<zone type="Pacific/Easter">
 				<exemplarCity>Paaseiland</exemplarCity>
 			</zone>
 			<zone type="America/Santiago">
-				<exemplarCity draft="contributed">Santiago</exemplarCity>
+				<exemplarCity>Santiago</exemplarCity>
 			</zone>
 			<zone type="Africa/Douala">
-				<exemplarCity draft="contributed">Douala</exemplarCity>
+				<exemplarCity>Douala</exemplarCity>
 			</zone>
 			<zone type="Asia/Urumqi">
-				<exemplarCity draft="contributed">Urumqi</exemplarCity>
+				<exemplarCity>Urumqi</exemplarCity>
 			</zone>
 			<zone type="Asia/Shanghai">
 				<exemplarCity>Sjanghai</exemplarCity>
@@ -4427,10 +4571,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Bogota</exemplarCity>
 			</zone>
 			<zone type="America/Costa_Rica">
-				<exemplarCity draft="contributed">Costa Rica</exemplarCity>
+				<exemplarCity>Costa Rica</exemplarCity>
 			</zone>
 			<zone type="America/Havana">
-				<exemplarCity draft="contributed">Havana</exemplarCity>
+				<exemplarCity>Havana</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Cape_Verde">
 				<exemplarCity>Kaapverdië</exemplarCity>
@@ -4442,46 +4586,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Christmaseiland</exemplarCity>
 			</zone>
 			<zone type="Asia/Nicosia">
-				<exemplarCity draft="contributed">Nicosia</exemplarCity>
+				<exemplarCity>Nicosia</exemplarCity>
 			</zone>
 			<zone type="Europe/Prague">
 				<exemplarCity>Praag</exemplarCity>
 			</zone>
 			<zone type="Europe/Busingen">
-				<exemplarCity draft="contributed">Busingen</exemplarCity>
+				<exemplarCity>Busingen</exemplarCity>
 			</zone>
 			<zone type="Europe/Berlin">
 				<exemplarCity>Berlijn</exemplarCity>
 			</zone>
 			<zone type="Africa/Djibouti">
-				<exemplarCity draft="contributed">Djibouti</exemplarCity>
+				<exemplarCity>Djibouti</exemplarCity>
 			</zone>
 			<zone type="Europe/Copenhagen">
 				<exemplarCity>Kopenhagen</exemplarCity>
 			</zone>
 			<zone type="America/Dominica">
-				<exemplarCity draft="contributed">Dominica</exemplarCity>
+				<exemplarCity>Dominica</exemplarCity>
 			</zone>
 			<zone type="America/Santo_Domingo">
-				<exemplarCity draft="contributed">Santo Domingo</exemplarCity>
+				<exemplarCity>Santo Domingo</exemplarCity>
 			</zone>
 			<zone type="Africa/Algiers">
-				<exemplarCity draft="contributed">Algiers</exemplarCity>
+				<exemplarCity>Algiers</exemplarCity>
 			</zone>
 			<zone type="Pacific/Galapagos">
 				<exemplarCity>Galapagos</exemplarCity>
 			</zone>
 			<zone type="America/Guayaquil">
-				<exemplarCity draft="contributed">Guayaquil</exemplarCity>
+				<exemplarCity>Guayaquil</exemplarCity>
 			</zone>
 			<zone type="Europe/Tallinn">
-				<exemplarCity draft="contributed">Tallinn</exemplarCity>
+				<exemplarCity>Tallinn</exemplarCity>
 			</zone>
 			<zone type="Africa/Cairo">
 				<exemplarCity>Caïro</exemplarCity>
 			</zone>
 			<zone type="Africa/El_Aaiun">
-				<exemplarCity draft="contributed">El Aaiun</exemplarCity>
+				<exemplarCity>El Aaiun</exemplarCity>
 			</zone>
 			<zone type="Africa/Asmera">
 				<exemplarCity>Asmara</exemplarCity>
@@ -4490,22 +4634,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Canarische Eilanden</exemplarCity>
 			</zone>
 			<zone type="Africa/Ceuta">
-				<exemplarCity draft="contributed">Ceuta</exemplarCity>
+				<exemplarCity>Ceuta</exemplarCity>
 			</zone>
 			<zone type="Europe/Madrid">
-				<exemplarCity draft="contributed">Madrid</exemplarCity>
+				<exemplarCity>Madrid</exemplarCity>
 			</zone>
 			<zone type="Africa/Addis_Ababa">
 				<exemplarCity>Addis Abeba</exemplarCity>
 			</zone>
 			<zone type="Europe/Helsinki">
-				<exemplarCity draft="contributed">Helsinki</exemplarCity>
+				<exemplarCity>Helsinki</exemplarCity>
 			</zone>
 			<zone type="Pacific/Fiji">
-				<exemplarCity draft="contributed">Fiji</exemplarCity>
+				<exemplarCity>Fiji</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Stanley">
-				<exemplarCity draft="contributed">Stanley</exemplarCity>
+				<exemplarCity>Stanley</exemplarCity>
 			</zone>
 			<zone type="Pacific/Truk">
 				<exemplarCity>Chuuk</exemplarCity>
@@ -4514,7 +4658,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Pohnpei</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kosrae">
-				<exemplarCity draft="contributed">Kosrae</exemplarCity>
+				<exemplarCity>Kosrae</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Faeroe">
 				<exemplarCity>Faeröer</exemplarCity>
@@ -4523,34 +4667,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Parijs</exemplarCity>
 			</zone>
 			<zone type="Africa/Libreville">
-				<exemplarCity draft="contributed">Libreville</exemplarCity>
+				<exemplarCity>Libreville</exemplarCity>
 			</zone>
 			<zone type="Europe/London">
 				<long>
-					<daylight draft="contributed">Britse zomertijd</daylight>
+					<daylight>Britse zomertijd</daylight>
 				</long>
 				<exemplarCity>Londen</exemplarCity>
 			</zone>
 			<zone type="America/Grenada">
-				<exemplarCity draft="contributed">Grenada</exemplarCity>
+				<exemplarCity>Grenada</exemplarCity>
 			</zone>
 			<zone type="Asia/Tbilisi">
-				<exemplarCity draft="contributed">Tbilisi</exemplarCity>
+				<exemplarCity>Tbilisi</exemplarCity>
 			</zone>
 			<zone type="America/Cayenne">
-				<exemplarCity draft="contributed">Cayenne</exemplarCity>
+				<exemplarCity>Cayenne</exemplarCity>
 			</zone>
 			<zone type="Europe/Guernsey">
-				<exemplarCity draft="contributed">Guernsey</exemplarCity>
+				<exemplarCity>Guernsey</exemplarCity>
 			</zone>
 			<zone type="Africa/Accra">
-				<exemplarCity draft="contributed">Accra</exemplarCity>
+				<exemplarCity>Accra</exemplarCity>
 			</zone>
 			<zone type="Europe/Gibraltar">
-				<exemplarCity draft="contributed">Gibraltar</exemplarCity>
+				<exemplarCity>Gibraltar</exemplarCity>
 			</zone>
 			<zone type="America/Thule">
-				<exemplarCity draft="contributed">Thule</exemplarCity>
+				<exemplarCity>Thule</exemplarCity>
 			</zone>
 			<zone type="America/Godthab">
 				<exemplarCity>Nuuk</exemplarCity>
@@ -4559,19 +4703,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Ittoqqortoormiit</exemplarCity>
 			</zone>
 			<zone type="America/Danmarkshavn">
-				<exemplarCity draft="contributed">Danmarkshavn</exemplarCity>
+				<exemplarCity>Danmarkshavn</exemplarCity>
 			</zone>
 			<zone type="Africa/Banjul">
-				<exemplarCity draft="contributed">Banjul</exemplarCity>
+				<exemplarCity>Banjul</exemplarCity>
 			</zone>
 			<zone type="Africa/Conakry">
-				<exemplarCity draft="contributed">Conakry</exemplarCity>
+				<exemplarCity>Conakry</exemplarCity>
 			</zone>
 			<zone type="America/Guadeloupe">
-				<exemplarCity draft="contributed">Guadeloupe</exemplarCity>
+				<exemplarCity>Guadeloupe</exemplarCity>
 			</zone>
 			<zone type="Africa/Malabo">
-				<exemplarCity draft="contributed">Malabo</exemplarCity>
+				<exemplarCity>Malabo</exemplarCity>
 			</zone>
 			<zone type="Europe/Athens">
 				<exemplarCity>Athene</exemplarCity>
@@ -4580,55 +4724,55 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Zuid-Georgia</exemplarCity>
 			</zone>
 			<zone type="America/Guatemala">
-				<exemplarCity draft="contributed">Guatemala</exemplarCity>
+				<exemplarCity>Guatemala</exemplarCity>
 			</zone>
 			<zone type="Pacific/Guam">
-				<exemplarCity draft="contributed">Guam</exemplarCity>
+				<exemplarCity>Guam</exemplarCity>
 			</zone>
 			<zone type="Africa/Bissau">
-				<exemplarCity draft="contributed">Bissau</exemplarCity>
+				<exemplarCity>Bissau</exemplarCity>
 			</zone>
 			<zone type="America/Guyana">
-				<exemplarCity draft="contributed">Guyana</exemplarCity>
+				<exemplarCity>Guyana</exemplarCity>
 			</zone>
 			<zone type="Asia/Hong_Kong">
 				<exemplarCity>Hongkong</exemplarCity>
 			</zone>
 			<zone type="America/Tegucigalpa">
-				<exemplarCity draft="contributed">Tegucigalpa</exemplarCity>
+				<exemplarCity>Tegucigalpa</exemplarCity>
 			</zone>
 			<zone type="Europe/Zagreb">
-				<exemplarCity draft="contributed">Zagreb</exemplarCity>
+				<exemplarCity>Zagreb</exemplarCity>
 			</zone>
 			<zone type="America/Port-au-Prince">
-				<exemplarCity draft="contributed">Port-au-Prince</exemplarCity>
+				<exemplarCity>Port-au-Prince</exemplarCity>
 			</zone>
 			<zone type="Europe/Budapest">
 				<exemplarCity>Boedapest</exemplarCity>
 			</zone>
 			<zone type="Asia/Jakarta">
-				<exemplarCity draft="contributed">Jakarta</exemplarCity>
+				<exemplarCity>Jakarta</exemplarCity>
 			</zone>
 			<zone type="Asia/Pontianak">
-				<exemplarCity draft="contributed">Pontianak</exemplarCity>
+				<exemplarCity>Pontianak</exemplarCity>
 			</zone>
 			<zone type="Asia/Makassar">
-				<exemplarCity draft="contributed">Makassar</exemplarCity>
+				<exemplarCity>Makassar</exemplarCity>
 			</zone>
 			<zone type="Asia/Jayapura">
-				<exemplarCity draft="contributed">Jayapura</exemplarCity>
+				<exemplarCity>Jayapura</exemplarCity>
 			</zone>
 			<zone type="Europe/Dublin">
 				<long>
-					<daylight draft="contributed">Ierse zomertijd</daylight>
+					<daylight>Ierse zomertijd</daylight>
 				</long>
-				<exemplarCity draft="contributed">Dublin</exemplarCity>
+				<exemplarCity>Dublin</exemplarCity>
 			</zone>
 			<zone type="Asia/Jerusalem">
 				<exemplarCity>Jeruzalem</exemplarCity>
 			</zone>
 			<zone type="Europe/Isle_of_Man">
-				<exemplarCity draft="contributed">Isle of Man</exemplarCity>
+				<exemplarCity>Isle of Man</exemplarCity>
 			</zone>
 			<zone type="Asia/Calcutta">
 				<exemplarCity>Calcutta</exemplarCity>
@@ -4643,25 +4787,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Teheran</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Reykjavik">
-				<exemplarCity draft="contributed">Reykjavik</exemplarCity>
+				<exemplarCity>Reykjavik</exemplarCity>
 			</zone>
 			<zone type="Europe/Rome">
-				<exemplarCity draft="contributed">Rome</exemplarCity>
+				<exemplarCity>Rome</exemplarCity>
 			</zone>
 			<zone type="Europe/Jersey">
-				<exemplarCity draft="contributed">Jersey</exemplarCity>
+				<exemplarCity>Jersey</exemplarCity>
 			</zone>
 			<zone type="America/Jamaica">
-				<exemplarCity draft="contributed">Jamaica</exemplarCity>
+				<exemplarCity>Jamaica</exemplarCity>
 			</zone>
 			<zone type="Asia/Amman">
-				<exemplarCity draft="contributed">Amman</exemplarCity>
+				<exemplarCity>Amman</exemplarCity>
 			</zone>
 			<zone type="Asia/Tokyo">
 				<exemplarCity>Tokio</exemplarCity>
 			</zone>
 			<zone type="Africa/Nairobi">
-				<exemplarCity draft="contributed">Nairobi</exemplarCity>
+				<exemplarCity>Nairobi</exemplarCity>
 			</zone>
 			<zone type="Asia/Bishkek">
 				<exemplarCity>Bisjkek</exemplarCity>
@@ -4673,46 +4817,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Enderbury</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
-				<exemplarCity draft="contributed">Kiritimati</exemplarCity>
+				<exemplarCity>Kiritimati</exemplarCity>
 			</zone>
 			<zone type="Pacific/Tarawa">
-				<exemplarCity draft="contributed">Tarawa</exemplarCity>
+				<exemplarCity>Tarawa</exemplarCity>
 			</zone>
 			<zone type="Indian/Comoro">
-				<exemplarCity draft="contributed">Comoro</exemplarCity>
+				<exemplarCity>Comoro</exemplarCity>
 			</zone>
 			<zone type="America/St_Kitts">
 				<exemplarCity>St. Kitts</exemplarCity>
 			</zone>
 			<zone type="Asia/Pyongyang">
-				<exemplarCity draft="contributed">Pyongyang</exemplarCity>
+				<exemplarCity>Pyongyang</exemplarCity>
 			</zone>
 			<zone type="Asia/Seoul">
-				<exemplarCity draft="contributed">Seoul</exemplarCity>
+				<exemplarCity>Seoul</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuwait">
 				<exemplarCity>Koeweit</exemplarCity>
 			</zone>
 			<zone type="America/Cayman">
-				<exemplarCity draft="contributed">Cayman</exemplarCity>
+				<exemplarCity>Cayman</exemplarCity>
 			</zone>
 			<zone type="Asia/Aqtau">
-				<exemplarCity draft="contributed">Aqtau</exemplarCity>
+				<exemplarCity>Aqtau</exemplarCity>
 			</zone>
 			<zone type="Asia/Oral">
-				<exemplarCity draft="contributed">Oral</exemplarCity>
+				<exemplarCity>Oral</exemplarCity>
 			</zone>
 			<zone type="Asia/Aqtobe">
 				<exemplarCity>Aqtöbe</exemplarCity>
 			</zone>
 			<zone type="Asia/Qyzylorda">
-				<exemplarCity draft="contributed">Qyzylorda</exemplarCity>
+				<exemplarCity>Qyzylorda</exemplarCity>
 			</zone>
 			<zone type="Asia/Almaty">
 				<exemplarCity>Alma-Ata</exemplarCity>
 			</zone>
 			<zone type="Asia/Vientiane">
-				<exemplarCity draft="contributed">Vientiane</exemplarCity>
+				<exemplarCity>Vientiane</exemplarCity>
 			</zone>
 			<zone type="Asia/Beirut">
 				<exemplarCity>Beiroet</exemplarCity>
@@ -4721,193 +4865,193 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>St. Lucia</exemplarCity>
 			</zone>
 			<zone type="Europe/Vaduz">
-				<exemplarCity draft="contributed">Vaduz</exemplarCity>
+				<exemplarCity>Vaduz</exemplarCity>
 			</zone>
 			<zone type="Asia/Colombo">
-				<exemplarCity draft="contributed">Colombo</exemplarCity>
+				<exemplarCity>Colombo</exemplarCity>
 			</zone>
 			<zone type="Africa/Monrovia">
-				<exemplarCity draft="contributed">Monrovia</exemplarCity>
+				<exemplarCity>Monrovia</exemplarCity>
 			</zone>
 			<zone type="Africa/Maseru">
-				<exemplarCity draft="contributed">Maseru</exemplarCity>
+				<exemplarCity>Maseru</exemplarCity>
 			</zone>
 			<zone type="Europe/Vilnius">
-				<exemplarCity draft="contributed">Vilnius</exemplarCity>
+				<exemplarCity>Vilnius</exemplarCity>
 			</zone>
 			<zone type="Europe/Luxembourg">
 				<exemplarCity>Luxemburg</exemplarCity>
 			</zone>
 			<zone type="Europe/Riga">
-				<exemplarCity draft="contributed">Riga</exemplarCity>
+				<exemplarCity>Riga</exemplarCity>
 			</zone>
 			<zone type="Africa/Tripoli">
-				<exemplarCity draft="contributed">Tripoli</exemplarCity>
+				<exemplarCity>Tripoli</exemplarCity>
 			</zone>
 			<zone type="Africa/Casablanca">
-				<exemplarCity draft="contributed">Casablanca</exemplarCity>
+				<exemplarCity>Casablanca</exemplarCity>
 			</zone>
 			<zone type="Europe/Monaco">
-				<exemplarCity draft="contributed">Monaco</exemplarCity>
+				<exemplarCity>Monaco</exemplarCity>
 			</zone>
 			<zone type="Europe/Chisinau">
-				<exemplarCity draft="contributed">Chisinau</exemplarCity>
+				<exemplarCity>Chisinau</exemplarCity>
 			</zone>
 			<zone type="Europe/Podgorica">
-				<exemplarCity draft="contributed">Podgorica</exemplarCity>
+				<exemplarCity>Podgorica</exemplarCity>
 			</zone>
 			<zone type="America/Marigot">
-				<exemplarCity draft="contributed">Marigot</exemplarCity>
+				<exemplarCity>Marigot</exemplarCity>
 			</zone>
 			<zone type="Indian/Antananarivo">
-				<exemplarCity draft="contributed">Antananarivo</exemplarCity>
+				<exemplarCity>Antananarivo</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kwajalein">
-				<exemplarCity draft="contributed">Kwajalein</exemplarCity>
+				<exemplarCity>Kwajalein</exemplarCity>
 			</zone>
 			<zone type="Pacific/Majuro">
-				<exemplarCity draft="contributed">Majuro</exemplarCity>
+				<exemplarCity>Majuro</exemplarCity>
 			</zone>
 			<zone type="Europe/Skopje">
-				<exemplarCity draft="contributed">Skopje</exemplarCity>
+				<exemplarCity>Skopje</exemplarCity>
 			</zone>
 			<zone type="Africa/Bamako">
-				<exemplarCity draft="contributed">Bamako</exemplarCity>
+				<exemplarCity>Bamako</exemplarCity>
 			</zone>
 			<zone type="Asia/Rangoon">
-				<exemplarCity draft="contributed">Rangoon</exemplarCity>
+				<exemplarCity>Rangoon</exemplarCity>
 			</zone>
 			<zone type="Asia/Hovd">
-				<exemplarCity draft="contributed">Hovd</exemplarCity>
+				<exemplarCity>Hovd</exemplarCity>
 			</zone>
 			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity draft="contributed">Ulaanbaatar</exemplarCity>
+				<exemplarCity>Ulaanbaatar</exemplarCity>
 			</zone>
 			<zone type="Asia/Choibalsan">
-				<exemplarCity draft="contributed">Choibalsan</exemplarCity>
+				<exemplarCity>Choibalsan</exemplarCity>
 			</zone>
 			<zone type="Asia/Macau">
-				<exemplarCity draft="contributed">Macau</exemplarCity>
+				<exemplarCity>Macau</exemplarCity>
 			</zone>
 			<zone type="Pacific/Saipan">
-				<exemplarCity draft="contributed">Saipan</exemplarCity>
+				<exemplarCity>Saipan</exemplarCity>
 			</zone>
 			<zone type="America/Martinique">
-				<exemplarCity draft="contributed">Martinique</exemplarCity>
+				<exemplarCity>Martinique</exemplarCity>
 			</zone>
 			<zone type="Africa/Nouakchott">
-				<exemplarCity draft="contributed">Nouakchott</exemplarCity>
+				<exemplarCity>Nouakchott</exemplarCity>
 			</zone>
 			<zone type="America/Montserrat">
-				<exemplarCity draft="contributed">Montserrat</exemplarCity>
+				<exemplarCity>Montserrat</exemplarCity>
 			</zone>
 			<zone type="Europe/Malta">
-				<exemplarCity draft="contributed">Malta</exemplarCity>
+				<exemplarCity>Malta</exemplarCity>
 			</zone>
 			<zone type="Indian/Mauritius">
-				<exemplarCity draft="contributed">Mauritius</exemplarCity>
+				<exemplarCity>Mauritius</exemplarCity>
 			</zone>
 			<zone type="Indian/Maldives">
 				<exemplarCity>Maldiven</exemplarCity>
 			</zone>
 			<zone type="Africa/Blantyre">
-				<exemplarCity draft="contributed">Blantyre</exemplarCity>
+				<exemplarCity>Blantyre</exemplarCity>
 			</zone>
 			<zone type="America/Tijuana">
-				<exemplarCity draft="contributed">Tijuana</exemplarCity>
+				<exemplarCity>Tijuana</exemplarCity>
 			</zone>
 			<zone type="America/Santa_Isabel">
-				<exemplarCity draft="contributed">Santa Isabel</exemplarCity>
+				<exemplarCity>Santa Isabel</exemplarCity>
 			</zone>
 			<zone type="America/Hermosillo">
-				<exemplarCity draft="contributed">Hermosillo</exemplarCity>
+				<exemplarCity>Hermosillo</exemplarCity>
 			</zone>
 			<zone type="America/Mazatlan">
 				<exemplarCity>Mazatlán</exemplarCity>
 			</zone>
 			<zone type="America/Chihuahua">
-				<exemplarCity draft="contributed">Chihuahua</exemplarCity>
+				<exemplarCity>Chihuahua</exemplarCity>
 			</zone>
 			<zone type="America/Bahia_Banderas">
 				<exemplarCity>Bahía de Banderas</exemplarCity>
 			</zone>
 			<zone type="America/Ojinaga">
-				<exemplarCity draft="contributed">Ojinaga</exemplarCity>
+				<exemplarCity>Ojinaga</exemplarCity>
 			</zone>
 			<zone type="America/Monterrey">
-				<exemplarCity draft="contributed">Monterrey</exemplarCity>
+				<exemplarCity>Monterrey</exemplarCity>
 			</zone>
 			<zone type="America/Mexico_City">
 				<exemplarCity>Mexico-Stad</exemplarCity>
 			</zone>
 			<zone type="America/Matamoros">
-				<exemplarCity draft="contributed">Matamoros</exemplarCity>
+				<exemplarCity>Matamoros</exemplarCity>
 			</zone>
 			<zone type="America/Merida">
 				<exemplarCity>Mérida</exemplarCity>
 			</zone>
 			<zone type="America/Cancun">
-				<exemplarCity draft="contributed">Cancun</exemplarCity>
+				<exemplarCity>Cancun</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuala_Lumpur">
-				<exemplarCity draft="contributed">Kuala Lumpur</exemplarCity>
+				<exemplarCity>Kuala Lumpur</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuching">
-				<exemplarCity draft="contributed">Kuching</exemplarCity>
+				<exemplarCity>Kuching</exemplarCity>
 			</zone>
 			<zone type="Africa/Maputo">
-				<exemplarCity draft="contributed">Maputo</exemplarCity>
+				<exemplarCity>Maputo</exemplarCity>
 			</zone>
 			<zone type="Africa/Windhoek">
-				<exemplarCity draft="contributed">Windhoek</exemplarCity>
+				<exemplarCity>Windhoek</exemplarCity>
 			</zone>
 			<zone type="Pacific/Noumea">
 				<exemplarCity>Nouméa</exemplarCity>
 			</zone>
 			<zone type="Africa/Niamey">
-				<exemplarCity draft="contributed">Niamey</exemplarCity>
+				<exemplarCity>Niamey</exemplarCity>
 			</zone>
 			<zone type="Pacific/Norfolk">
-				<exemplarCity draft="contributed">Norfolk</exemplarCity>
+				<exemplarCity>Norfolk</exemplarCity>
 			</zone>
 			<zone type="Africa/Lagos">
-				<exemplarCity draft="contributed">Lagos</exemplarCity>
+				<exemplarCity>Lagos</exemplarCity>
 			</zone>
 			<zone type="America/Managua">
-				<exemplarCity draft="contributed">Managua</exemplarCity>
+				<exemplarCity>Managua</exemplarCity>
 			</zone>
 			<zone type="Europe/Amsterdam">
-				<exemplarCity draft="contributed">Amsterdam</exemplarCity>
+				<exemplarCity>Amsterdam</exemplarCity>
 			</zone>
 			<zone type="Europe/Oslo">
-				<exemplarCity draft="contributed">Oslo</exemplarCity>
+				<exemplarCity>Oslo</exemplarCity>
 			</zone>
 			<zone type="Asia/Katmandu">
 				<exemplarCity>Kathmandu</exemplarCity>
 			</zone>
 			<zone type="Pacific/Nauru">
-				<exemplarCity draft="contributed">Nauru</exemplarCity>
+				<exemplarCity>Nauru</exemplarCity>
 			</zone>
 			<zone type="Pacific/Niue">
-				<exemplarCity draft="contributed">Niue</exemplarCity>
+				<exemplarCity>Niue</exemplarCity>
 			</zone>
 			<zone type="Pacific/Chatham">
-				<exemplarCity draft="contributed">Chatham</exemplarCity>
+				<exemplarCity>Chatham</exemplarCity>
 			</zone>
 			<zone type="Pacific/Auckland">
-				<exemplarCity draft="contributed">Auckland</exemplarCity>
+				<exemplarCity>Auckland</exemplarCity>
 			</zone>
 			<zone type="Asia/Muscat">
-				<exemplarCity draft="contributed">Muscat</exemplarCity>
+				<exemplarCity>Muscat</exemplarCity>
 			</zone>
 			<zone type="America/Panama">
-				<exemplarCity draft="contributed">Panama</exemplarCity>
+				<exemplarCity>Panama</exemplarCity>
 			</zone>
 			<zone type="America/Lima">
-				<exemplarCity draft="contributed">Lima</exemplarCity>
+				<exemplarCity>Lima</exemplarCity>
 			</zone>
 			<zone type="Pacific/Tahiti">
-				<exemplarCity draft="contributed">Tahiti</exemplarCity>
+				<exemplarCity>Tahiti</exemplarCity>
 			</zone>
 			<zone type="Pacific/Marquesas">
 				<exemplarCity>Marquesaseilanden</exemplarCity>
@@ -4916,49 +5060,52 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Îles Gambier</exemplarCity>
 			</zone>
 			<zone type="Pacific/Port_Moresby">
-				<exemplarCity draft="contributed">Port Moresby</exemplarCity>
+				<exemplarCity>Port Moresby</exemplarCity>
+			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bougainville</exemplarCity>
 			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manilla</exemplarCity>
 			</zone>
 			<zone type="Asia/Karachi">
-				<exemplarCity draft="contributed">Karachi</exemplarCity>
+				<exemplarCity>Karachi</exemplarCity>
 			</zone>
 			<zone type="Europe/Warsaw">
 				<exemplarCity>Warschau</exemplarCity>
 			</zone>
 			<zone type="America/Miquelon">
-				<exemplarCity draft="contributed">Miquelon</exemplarCity>
+				<exemplarCity>Miquelon</exemplarCity>
 			</zone>
 			<zone type="Pacific/Pitcairn">
-				<exemplarCity draft="contributed">Pitcairn</exemplarCity>
+				<exemplarCity>Pitcairn</exemplarCity>
 			</zone>
 			<zone type="America/Puerto_Rico">
-				<exemplarCity draft="contributed">Puerto Rico</exemplarCity>
+				<exemplarCity>Puerto Rico</exemplarCity>
 			</zone>
 			<zone type="Asia/Gaza">
-				<exemplarCity draft="contributed">Gaza</exemplarCity>
+				<exemplarCity>Gaza</exemplarCity>
 			</zone>
 			<zone type="Asia/Hebron">
-				<exemplarCity draft="contributed">Hebron</exemplarCity>
+				<exemplarCity>Hebron</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Azores">
 				<exemplarCity>Azoren</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Madeira">
-				<exemplarCity draft="contributed">Madeira</exemplarCity>
+				<exemplarCity>Madeira</exemplarCity>
 			</zone>
 			<zone type="Europe/Lisbon">
 				<exemplarCity>Lissabon</exemplarCity>
 			</zone>
 			<zone type="Pacific/Palau">
-				<exemplarCity draft="contributed">Palau</exemplarCity>
+				<exemplarCity>Palau</exemplarCity>
 			</zone>
 			<zone type="America/Asuncion">
 				<exemplarCity>Asunción</exemplarCity>
 			</zone>
 			<zone type="Asia/Qatar">
-				<exemplarCity draft="contributed">Qatar</exemplarCity>
+				<exemplarCity>Qatar</exemplarCity>
 			</zone>
 			<zone type="Indian/Reunion">
 				<exemplarCity>Réunion</exemplarCity>
@@ -4970,10 +5117,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Belgrado</exemplarCity>
 			</zone>
 			<zone type="Europe/Kaliningrad">
-				<exemplarCity draft="contributed">Kaliningrad</exemplarCity>
+				<exemplarCity>Kaliningrad</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
-				<exemplarCity draft="contributed">Simferopol</exemplarCity>
+				<exemplarCity>Simferopol</exemplarCity>
 			</zone>
 			<zone type="Europe/Moscow">
 				<exemplarCity>Moskou</exemplarCity>
@@ -4982,19 +5129,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Wolgograd</exemplarCity>
 			</zone>
 			<zone type="Europe/Samara">
-				<exemplarCity draft="contributed">Samara</exemplarCity>
+				<exemplarCity>Samara</exemplarCity>
 			</zone>
 			<zone type="Asia/Yekaterinburg">
 				<exemplarCity>Jekaterinenburg</exemplarCity>
 			</zone>
 			<zone type="Asia/Omsk">
-				<exemplarCity draft="contributed">Omsk</exemplarCity>
+				<exemplarCity>Omsk</exemplarCity>
 			</zone>
 			<zone type="Asia/Novosibirsk">
-				<exemplarCity draft="contributed">Novosibirsk</exemplarCity>
+				<exemplarCity>Novosibirsk</exemplarCity>
 			</zone>
 			<zone type="Asia/Novokuznetsk">
-				<exemplarCity draft="contributed">Novokuznetsk</exemplarCity>
+				<exemplarCity>Novokuznetsk</exemplarCity>
 			</zone>
 			<zone type="Asia/Krasnoyarsk">
 				<exemplarCity>Krasnojarsk</exemplarCity>
@@ -5002,38 +5149,44 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkoetsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Chita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Jakoetsk</exemplarCity>
 			</zone>
 			<zone type="Asia/Vladivostok">
-				<exemplarCity draft="contributed">Vladivostok</exemplarCity>
+				<exemplarCity>Vladivostok</exemplarCity>
 			</zone>
 			<zone type="Asia/Khandyga">
-				<exemplarCity draft="contributed">Khandyga</exemplarCity>
+				<exemplarCity>Khandyga</exemplarCity>
 			</zone>
 			<zone type="Asia/Sakhalin">
 				<exemplarCity>Sachalin</exemplarCity>
 			</zone>
 			<zone type="Asia/Ust-Nera">
-				<exemplarCity draft="contributed">Ust-Nera</exemplarCity>
+				<exemplarCity>Ust-Nera</exemplarCity>
 			</zone>
 			<zone type="Asia/Magadan">
-				<exemplarCity draft="contributed">Magadan</exemplarCity>
+				<exemplarCity>Magadan</exemplarCity>
+			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolymsk</exemplarCity>
 			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamtsjatka</exemplarCity>
 			</zone>
 			<zone type="Asia/Anadyr">
-				<exemplarCity draft="contributed">Anadyr</exemplarCity>
+				<exemplarCity>Anadyr</exemplarCity>
 			</zone>
 			<zone type="Africa/Kigali">
-				<exemplarCity draft="contributed">Kigali</exemplarCity>
+				<exemplarCity>Kigali</exemplarCity>
 			</zone>
 			<zone type="Asia/Riyadh">
 				<exemplarCity>Riyad</exemplarCity>
 			</zone>
 			<zone type="Pacific/Guadalcanal">
-				<exemplarCity draft="contributed">Guadalcanal</exemplarCity>
+				<exemplarCity>Guadalcanal</exemplarCity>
 			</zone>
 			<zone type="Indian/Mahe">
 				<exemplarCity>Mahé</exemplarCity>
@@ -5042,40 +5195,40 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Khartoem</exemplarCity>
 			</zone>
 			<zone type="Europe/Stockholm">
-				<exemplarCity draft="contributed">Stockholm</exemplarCity>
+				<exemplarCity>Stockholm</exemplarCity>
 			</zone>
 			<zone type="Asia/Singapore">
-				<exemplarCity draft="contributed">Singapore</exemplarCity>
+				<exemplarCity>Singapore</exemplarCity>
 			</zone>
 			<zone type="Atlantic/St_Helena">
 				<exemplarCity>Sint-Helena</exemplarCity>
 			</zone>
 			<zone type="Europe/Ljubljana">
-				<exemplarCity draft="contributed">Ljubljana</exemplarCity>
+				<exemplarCity>Ljubljana</exemplarCity>
 			</zone>
 			<zone type="Arctic/Longyearbyen">
-				<exemplarCity draft="contributed">Longyearbyen</exemplarCity>
+				<exemplarCity>Longyearbyen</exemplarCity>
 			</zone>
 			<zone type="Europe/Bratislava">
-				<exemplarCity draft="contributed">Bratislava</exemplarCity>
+				<exemplarCity>Bratislava</exemplarCity>
 			</zone>
 			<zone type="Africa/Freetown">
-				<exemplarCity draft="contributed">Freetown</exemplarCity>
+				<exemplarCity>Freetown</exemplarCity>
 			</zone>
 			<zone type="Europe/San_Marino">
-				<exemplarCity draft="contributed">San Marino</exemplarCity>
+				<exemplarCity>San Marino</exemplarCity>
 			</zone>
 			<zone type="Africa/Dakar">
-				<exemplarCity draft="contributed">Dakar</exemplarCity>
+				<exemplarCity>Dakar</exemplarCity>
 			</zone>
 			<zone type="Africa/Mogadishu">
-				<exemplarCity draft="contributed">Mogadishu</exemplarCity>
+				<exemplarCity>Mogadishu</exemplarCity>
 			</zone>
 			<zone type="America/Paramaribo">
-				<exemplarCity draft="contributed">Paramaribo</exemplarCity>
+				<exemplarCity>Paramaribo</exemplarCity>
 			</zone>
 			<zone type="Africa/Juba">
-				<exemplarCity draft="contributed">Juba</exemplarCity>
+				<exemplarCity>Juba</exemplarCity>
 			</zone>
 			<zone type="Africa/Sao_Tome">
 				<exemplarCity>Sao Tomé</exemplarCity>
@@ -5087,115 +5240,115 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Beneden Prinsen Kwartier</exemplarCity>
 			</zone>
 			<zone type="Asia/Damascus">
-				<exemplarCity draft="contributed">Damascus</exemplarCity>
+				<exemplarCity>Damascus</exemplarCity>
 			</zone>
 			<zone type="Africa/Mbabane">
-				<exemplarCity draft="contributed">Mbabane</exemplarCity>
+				<exemplarCity>Mbabane</exemplarCity>
 			</zone>
 			<zone type="America/Grand_Turk">
-				<exemplarCity draft="contributed">Grand Turk</exemplarCity>
+				<exemplarCity>Grand Turk</exemplarCity>
 			</zone>
 			<zone type="Africa/Ndjamena">
-				<exemplarCity draft="contributed">Ndjamena</exemplarCity>
+				<exemplarCity>Ndjamena</exemplarCity>
 			</zone>
 			<zone type="Indian/Kerguelen">
-				<exemplarCity draft="contributed">Kerguelen</exemplarCity>
+				<exemplarCity>Kerguelen</exemplarCity>
 			</zone>
 			<zone type="Africa/Lome">
 				<exemplarCity>Lomé</exemplarCity>
 			</zone>
 			<zone type="Asia/Bangkok">
-				<exemplarCity draft="contributed">Bangkok</exemplarCity>
+				<exemplarCity>Bangkok</exemplarCity>
 			</zone>
 			<zone type="Asia/Dushanbe">
 				<exemplarCity>Doesjanbe</exemplarCity>
 			</zone>
 			<zone type="Pacific/Fakaofo">
-				<exemplarCity draft="contributed">Fakaofo</exemplarCity>
+				<exemplarCity>Fakaofo</exemplarCity>
 			</zone>
 			<zone type="Asia/Dili">
-				<exemplarCity draft="contributed">Dili</exemplarCity>
+				<exemplarCity>Dili</exemplarCity>
 			</zone>
 			<zone type="Asia/Ashgabat">
 				<exemplarCity>Asjchabad</exemplarCity>
 			</zone>
 			<zone type="Africa/Tunis">
-				<exemplarCity draft="contributed">Tunis</exemplarCity>
+				<exemplarCity>Tunis</exemplarCity>
 			</zone>
 			<zone type="Pacific/Tongatapu">
-				<exemplarCity draft="contributed">Tongatapu</exemplarCity>
+				<exemplarCity>Tongatapu</exemplarCity>
 			</zone>
 			<zone type="Europe/Istanbul">
 				<exemplarCity>Istanboel</exemplarCity>
 			</zone>
 			<zone type="America/Port_of_Spain">
-				<exemplarCity draft="contributed">Port of Spain</exemplarCity>
+				<exemplarCity>Port of Spain</exemplarCity>
 			</zone>
 			<zone type="Pacific/Funafuti">
-				<exemplarCity draft="contributed">Funafuti</exemplarCity>
+				<exemplarCity>Funafuti</exemplarCity>
 			</zone>
 			<zone type="Asia/Taipei">
-				<exemplarCity draft="contributed">Taipei</exemplarCity>
+				<exemplarCity>Taipei</exemplarCity>
 			</zone>
 			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity draft="contributed">Dar es Salaam</exemplarCity>
+				<exemplarCity>Dar es Salaam</exemplarCity>
 			</zone>
 			<zone type="Europe/Uzhgorod">
 				<exemplarCity>Oezjhorod</exemplarCity>
 			</zone>
 			<zone type="Europe/Kiev">
-				<exemplarCity draft="contributed">Kiev</exemplarCity>
+				<exemplarCity>Kiev</exemplarCity>
 			</zone>
 			<zone type="Europe/Zaporozhye">
 				<exemplarCity>Zaporizja</exemplarCity>
 			</zone>
 			<zone type="Africa/Kampala">
-				<exemplarCity draft="contributed">Kampala</exemplarCity>
+				<exemplarCity>Kampala</exemplarCity>
 			</zone>
 			<zone type="Pacific/Midway">
-				<exemplarCity draft="contributed">Midway</exemplarCity>
+				<exemplarCity>Midway</exemplarCity>
 			</zone>
 			<zone type="Pacific/Johnston">
-				<exemplarCity draft="contributed">Johnston</exemplarCity>
+				<exemplarCity>Johnston</exemplarCity>
 			</zone>
 			<zone type="Pacific/Wake">
-				<exemplarCity draft="contributed">Wake</exemplarCity>
+				<exemplarCity>Wake</exemplarCity>
 			</zone>
 			<zone type="America/Adak">
-				<exemplarCity draft="contributed">Adak</exemplarCity>
+				<exemplarCity>Adak</exemplarCity>
 			</zone>
 			<zone type="America/Nome">
-				<exemplarCity draft="contributed">Nome</exemplarCity>
+				<exemplarCity>Nome</exemplarCity>
 			</zone>
 			<zone type="Pacific/Honolulu">
-				<exemplarCity draft="contributed">Honolulu</exemplarCity>
+				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
 			<zone type="America/Anchorage">
-				<exemplarCity draft="contributed">Anchorage</exemplarCity>
+				<exemplarCity>Anchorage</exemplarCity>
 			</zone>
 			<zone type="America/Yakutat">
-				<exemplarCity draft="contributed">Yakutat</exemplarCity>
+				<exemplarCity>Yakutat</exemplarCity>
 			</zone>
 			<zone type="America/Sitka">
-				<exemplarCity draft="contributed">Sitka</exemplarCity>
+				<exemplarCity>Sitka</exemplarCity>
 			</zone>
 			<zone type="America/Juneau">
-				<exemplarCity draft="contributed">Juneau</exemplarCity>
+				<exemplarCity>Juneau</exemplarCity>
 			</zone>
 			<zone type="America/Metlakatla">
-				<exemplarCity draft="contributed">Metlakatla</exemplarCity>
+				<exemplarCity>Metlakatla</exemplarCity>
 			</zone>
 			<zone type="America/Los_Angeles">
-				<exemplarCity draft="contributed">Los Angeles</exemplarCity>
+				<exemplarCity>Los Angeles</exemplarCity>
 			</zone>
 			<zone type="America/Boise">
-				<exemplarCity draft="contributed">Boise</exemplarCity>
+				<exemplarCity>Boise</exemplarCity>
 			</zone>
 			<zone type="America/Phoenix">
-				<exemplarCity draft="contributed">Phoenix</exemplarCity>
+				<exemplarCity>Phoenix</exemplarCity>
 			</zone>
 			<zone type="America/Denver">
-				<exemplarCity draft="contributed">Denver</exemplarCity>
+				<exemplarCity>Denver</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/Beulah">
 				<exemplarCity>Beulah, Noord-Dakota</exemplarCity>
@@ -5207,10 +5360,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Center, Noord-Dakota</exemplarCity>
 			</zone>
 			<zone type="America/Chicago">
-				<exemplarCity draft="contributed">Chicago</exemplarCity>
+				<exemplarCity>Chicago</exemplarCity>
 			</zone>
 			<zone type="America/Menominee">
-				<exemplarCity draft="contributed">Menominee</exemplarCity>
+				<exemplarCity>Menominee</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Vincennes">
 				<exemplarCity>Vincennes, Indiana</exemplarCity>
@@ -5231,10 +5384,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Marengo, Indiana</exemplarCity>
 			</zone>
 			<zone type="America/Indianapolis">
-				<exemplarCity draft="contributed">Indianapolis</exemplarCity>
+				<exemplarCity>Indianapolis</exemplarCity>
 			</zone>
 			<zone type="America/Louisville">
-				<exemplarCity draft="contributed">Louisville</exemplarCity>
+				<exemplarCity>Louisville</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Vevay">
 				<exemplarCity>Vevay, Indiana</exemplarCity>
@@ -5243,16 +5396,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Monticello, Kentucky</exemplarCity>
 			</zone>
 			<zone type="America/Detroit">
-				<exemplarCity draft="contributed">Detroit</exemplarCity>
+				<exemplarCity>Detroit</exemplarCity>
 			</zone>
 			<zone type="America/New_York">
-				<exemplarCity draft="contributed">New York</exemplarCity>
+				<exemplarCity>New York</exemplarCity>
 			</zone>
 			<zone type="America/Montevideo">
-				<exemplarCity draft="contributed">Montevideo</exemplarCity>
+				<exemplarCity>Montevideo</exemplarCity>
 			</zone>
 			<zone type="Asia/Samarkand">
-				<exemplarCity draft="contributed">Samarkand</exemplarCity>
+				<exemplarCity>Samarkand</exemplarCity>
 			</zone>
 			<zone type="Asia/Tashkent">
 				<exemplarCity>Tasjkent</exemplarCity>
@@ -5264,10 +5417,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>St. Vincent</exemplarCity>
 			</zone>
 			<zone type="America/Caracas">
-				<exemplarCity draft="contributed">Caracas</exemplarCity>
+				<exemplarCity>Caracas</exemplarCity>
 			</zone>
 			<zone type="America/Tortola">
-				<exemplarCity draft="contributed">Tortola</exemplarCity>
+				<exemplarCity>Tortola</exemplarCity>
 			</zone>
 			<zone type="America/St_Thomas">
 				<exemplarCity>St. Thomas</exemplarCity>
@@ -5276,28 +5429,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Ho Chi Minhstad</exemplarCity>
 			</zone>
 			<zone type="Pacific/Efate">
-				<exemplarCity draft="contributed">Efate</exemplarCity>
+				<exemplarCity>Efate</exemplarCity>
 			</zone>
 			<zone type="Pacific/Wallis">
-				<exemplarCity draft="contributed">Wallis</exemplarCity>
+				<exemplarCity>Wallis</exemplarCity>
 			</zone>
 			<zone type="Pacific/Apia">
-				<exemplarCity draft="contributed">Apia</exemplarCity>
+				<exemplarCity>Apia</exemplarCity>
 			</zone>
 			<zone type="Asia/Aden">
-				<exemplarCity draft="contributed">Aden</exemplarCity>
+				<exemplarCity>Aden</exemplarCity>
 			</zone>
 			<zone type="Indian/Mayotte">
-				<exemplarCity draft="contributed">Mayotte</exemplarCity>
+				<exemplarCity>Mayotte</exemplarCity>
 			</zone>
 			<zone type="Africa/Johannesburg">
-				<exemplarCity draft="contributed">Johannesburg</exemplarCity>
+				<exemplarCity>Johannesburg</exemplarCity>
 			</zone>
 			<zone type="Africa/Lusaka">
-				<exemplarCity draft="contributed">Lusaka</exemplarCity>
+				<exemplarCity>Lusaka</exemplarCity>
 			</zone>
 			<zone type="Africa/Harare">
-				<exemplarCity draft="contributed">Harare</exemplarCity>
+				<exemplarCity>Harare</exemplarCity>
 			</zone>
 			<metazone type="Acre">
 				<long>
@@ -5313,24 +5466,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Africa_Central">
 				<long>
-					<standard draft="contributed">Centraal-Afrikaanse tijd</standard>
+					<standard>Centraal-Afrikaanse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Eastern">
 				<long>
-					<standard draft="contributed">Oost-Afrikaanse tijd</standard>
+					<standard>Oost-Afrikaanse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Southern">
 				<long>
-					<standard draft="contributed">Zuid-Afrikaanse tijd</standard>
+					<standard>Zuid-Afrikaanse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic draft="contributed">West-Afrikaanse tijd</generic>
-					<standard draft="contributed">West-Afrikaanse standaardtijd</standard>
-					<daylight draft="contributed">West-Afrikaanse zomertijd</daylight>
+					<generic>West-Afrikaanse tijd</generic>
+					<standard>West-Afrikaanse standaardtijd</standard>
+					<daylight>West-Afrikaanse zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -5391,9 +5544,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic draft="contributed">Apia-tijd</generic>
-					<standard draft="contributed">Apia-standaardtijd</standard>
-					<daylight draft="contributed">Apia-zomertijd</daylight>
+					<generic>Apia-tijd</generic>
+					<standard>Apia-standaardtijd</standard>
+					<daylight>Apia-zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Aqtau">
@@ -5412,9 +5565,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Arabian">
 				<long>
-					<generic draft="contributed">Arabische tijd</generic>
-					<standard draft="contributed">Arabische standaardtijd</standard>
-					<daylight draft="contributed">Arabische zomertijd</daylight>
+					<generic>Arabische tijd</generic>
+					<standard>Arabische standaardtijd</standard>
+					<daylight>Arabische zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina">
@@ -5433,9 +5586,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Armenia">
 				<long>
-					<generic draft="contributed">Armeense tijd</generic>
-					<standard draft="contributed">Armeense standaardtijd</standard>
-					<daylight draft="contributed">Armeense zomertijd</daylight>
+					<generic>Armeense tijd</generic>
+					<standard>Armeense standaardtijd</standard>
+					<daylight>Armeense zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Atlantic">
@@ -5475,16 +5628,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Azerbaijan">
 				<long>
-					<generic draft="contributed">Azerbeidzjaanse tijd</generic>
-					<standard draft="contributed">Azerbeidzjaanse standaardtijd</standard>
-					<daylight draft="contributed">Azerbeidzjaanse zomertijd</daylight>
+					<generic>Azerbeidzjaanse tijd</generic>
+					<standard>Azerbeidzjaanse standaardtijd</standard>
+					<daylight>Azerbeidzjaanse zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azores">
 				<long>
-					<generic draft="contributed">Azoren-tijd</generic>
-					<standard draft="contributed">Azoren-standaardtijd</standard>
-					<daylight draft="contributed">Azoren-zomertijd</daylight>
+					<generic>Azoren-tijd</generic>
+					<standard>Azoren-standaardtijd</standard>
+					<daylight>Azoren-zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Bangladesh">
@@ -5513,14 +5666,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Brunei">
 				<long>
-					<standard draft="contributed">Bruneise tijd</standard>
+					<standard>Bruneise tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Cape_Verde">
 				<long>
-					<generic draft="contributed">Kaapverdische tijd</generic>
-					<standard draft="contributed">Kaapverdische standaardtijd</standard>
-					<daylight draft="contributed">Kaapverdische zomertijd</daylight>
+					<generic>Kaapverdische tijd</generic>
+					<standard>Kaapverdische standaardtijd</standard>
+					<daylight>Kaapverdische zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Casey">
@@ -5530,14 +5683,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Chamorro">
 				<long>
-					<standard draft="contributed">Chamorro-tijd</standard>
+					<standard>Chamorro-tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Chatham">
 				<long>
-					<generic>Chatham tijd</generic>
-					<standard>Chatham standaardtijd</standard>
-					<daylight>Chatham zomertijd</daylight>
+					<generic>Chatham-tijd</generic>
+					<standard>Chatham-standaardtijd</standard>
+					<daylight>Chatham-zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Chile">
@@ -5556,19 +5709,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Choibalsan">
 				<long>
-					<generic>Tsjojbalsan tijd</generic>
-					<standard>Tsjojbalsan standaardtijd</standard>
-					<daylight>Tsjojbalsan zomertijd</daylight>
+					<generic>Tsjojbalsan-tijd</generic>
+					<standard>Tsjojbalsan-standaardtijd</standard>
+					<daylight>Tsjojbalsan-zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Christmas">
 				<long>
-					<standard draft="contributed">Christmaseilandse tijd</standard>
+					<standard>Christmaseilandse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Cocos">
 				<long>
-					<standard draft="contributed">Cocoseilandse tijd</standard>
+					<standard>Cocoseilandse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Colombia">
@@ -5580,31 +5733,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Cook">
 				<long>
-					<generic draft="contributed">Cookeilandse tijd</generic>
-					<standard draft="contributed">Cookeilandse standaardtijd</standard>
-					<daylight draft="contributed">Cookeilandse halve zomertijd</daylight>
+					<generic>Cookeilandse tijd</generic>
+					<standard>Cookeilandse standaardtijd</standard>
+					<daylight>Cookeilandse halve zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cuba">
 				<long>
-					<generic draft="contributed">Cubaanse tijd</generic>
-					<standard draft="contributed">Cubaanse standaardtijd</standard>
-					<daylight draft="contributed">Cubaanse zomertijd</daylight>
+					<generic>Cubaanse tijd</generic>
+					<standard>Cubaanse standaardtijd</standard>
+					<daylight>Cubaanse zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Davis">
 				<long>
-					<standard draft="contributed">Davis tijd</standard>
+					<standard>Davis-tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="DumontDUrville">
 				<long>
-					<standard draft="contributed">Dumont-d’Urville tijd</standard>
+					<standard>Dumont-d’Urville-tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="East_Timor">
 				<long>
-					<standard draft="contributed">Oost-Timorese tijd</standard>
+					<standard>Oost-Timorese tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Easter">
@@ -5645,14 +5798,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
 				<long>
-					<standard draft="contributed">Verder-oostelijk-Europese tijd</standard>
+					<standard>Verder-oostelijk-Europese tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
 				<long>
-					<generic draft="contributed">West-Europese tijd</generic>
-					<standard draft="contributed">West-Europese standaardtijd</standard>
-					<daylight draft="contributed">West-Europese zomertijd</daylight>
+					<generic>West-Europese tijd</generic>
+					<standard>West-Europese standaardtijd</standard>
+					<daylight>West-Europese zomertijd</daylight>
 				</long>
 				<short>
 					<generic>WET</generic>
@@ -5669,9 +5822,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Fiji">
 				<long>
-					<generic draft="contributed">Fijische tijd</generic>
-					<standard draft="contributed">Fijische standaardtijd</standard>
-					<daylight draft="contributed">Fijische zomertijd</daylight>
+					<generic>Fijische tijd</generic>
+					<standard>Fijische standaardtijd</standard>
+					<daylight>Fijische zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="French_Guiana">
@@ -5681,7 +5834,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="French_Southern">
 				<long>
-					<standard draft="contributed">Franse zuidelijke en Antarctische tijd</standard>
+					<standard>Franse zuidelijke en Antarctische tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Galapagos">
@@ -5691,19 +5844,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Gambier">
 				<long>
-					<standard draft="contributed">Gambiereilandse tijd</standard>
+					<standard>Gambiereilandse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Georgia">
 				<long>
-					<generic draft="contributed">Georgische tijd</generic>
-					<standard draft="contributed">Georgische standaardtijd</standard>
-					<daylight draft="contributed">Georgische zomertijd</daylight>
+					<generic>Georgische tijd</generic>
+					<standard>Georgische standaardtijd</standard>
+					<daylight>Georgische zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Gilbert_Islands">
 				<long>
-					<standard draft="contributed">Gilberteilandse tijd</standard>
+					<standard>Gilberteilandse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="GMT">
@@ -5713,16 +5866,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Greenland_Eastern">
 				<long>
-					<generic draft="contributed">Oost-Groenlandse tijd</generic>
-					<standard draft="contributed">Oost-Groenlandse standaardtijd</standard>
-					<daylight draft="contributed">Oost-Groenlandse zomertijd</daylight>
+					<generic>Oost-Groenlandse tijd</generic>
+					<standard>Oost-Groenlandse standaardtijd</standard>
+					<daylight>Oost-Groenlandse zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Greenland_Western">
 				<long>
-					<generic draft="contributed">West-Groenlandse tijd</generic>
-					<standard draft="contributed">West-Groenlandse standaardtijd</standard>
-					<daylight draft="contributed">West-Groenlandse zomertijd</daylight>
+					<generic>West-Groenlandse tijd</generic>
+					<standard>West-Groenlandse standaardtijd</standard>
+					<daylight>West-Groenlandse zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Guam">
@@ -5732,7 +5885,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Gulf">
 				<long>
-					<standard draft="contributed">Golf standaardtijd</standard>
+					<standard>Golf-standaardtijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Guyana">
@@ -5742,9 +5895,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
-					<generic draft="contributed">Hawaii-Aleoetische tijd</generic>
-					<standard draft="contributed">Hawaii-Aleoetische standaardtijd</standard>
-					<daylight draft="contributed">Hawaii-Aleoetische zomertijd</daylight>
+					<generic>Hawaii-Aleoetische tijd</generic>
+					<standard>Hawaii-Aleoetische standaardtijd</standard>
+					<daylight>Hawaii-Aleoetische zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hong_Kong">
@@ -5756,9 +5909,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Hovd">
 				<long>
-					<generic>Hovd tijd</generic>
-					<standard>Hovd standaardtijd</standard>
-					<daylight>Hovd zomertijd</daylight>
+					<generic>Hovd-tijd</generic>
+					<standard>Hovd-standaardtijd</standard>
+					<daylight>Hovd-zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="India">
@@ -5768,27 +5921,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Indian_Ocean">
 				<long>
-					<standard draft="contributed">Indische Oceaan-tijd</standard>
+					<standard>Indische Oceaan-tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Indochina">
 				<long>
-					<standard draft="contributed">Indochinese tijd</standard>
+					<standard>Indochinese tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Indonesia_Central">
 				<long>
-					<standard draft="contributed">Centraal-Indonesische tijd</standard>
+					<standard>Centraal-Indonesische tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Indonesia_Eastern">
 				<long>
-					<standard draft="contributed">Oost-Indonesische tijd</standard>
+					<standard>Oost-Indonesische tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Indonesia_Western">
 				<long>
-					<standard draft="contributed">West-Indonesische tijd</standard>
+					<standard>West-Indonesische tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Iran">
@@ -5828,12 +5981,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Kazakhstan_Eastern">
 				<long>
-					<standard draft="contributed">Oost-Kazachse tijd</standard>
+					<standard>Oost-Kazachse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Kazakhstan_Western">
 				<long>
-					<standard draft="contributed">West-Kazachse tijd</standard>
+					<standard>West-Kazachse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Korea">
@@ -5845,7 +5998,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Kosrae">
 				<long>
-					<standard draft="contributed">Kosraese tijd</standard>
+					<standard>Kosraese tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Krasnoyarsk">
@@ -5857,7 +6010,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Kyrgystan">
 				<long>
-					<standard draft="contributed">Kirgizische tijd</standard>
+					<standard>Kirgizische tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Lanka">
@@ -5867,7 +6020,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Line_Islands">
 				<long>
-					<standard draft="contributed">Line-eilandse tijd</standard>
+					<standard>Line-eilandse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Lord_Howe">
@@ -5898,7 +6051,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Malaysia">
 				<long>
-					<standard draft="contributed">Maleisische tijd</standard>
+					<standard>Maleisische tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Maldives">
@@ -5908,45 +6061,45 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Marquesas">
 				<long>
-					<standard draft="contributed">Marquesaseilandse tijd</standard>
+					<standard>Marquesaseilandse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Marshall_Islands">
 				<long>
-					<standard draft="contributed">Marshalleilandse tijd</standard>
+					<standard>Marshalleilandse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Mauritius">
 				<long>
-					<generic draft="contributed">Mauritiaanse tijd</generic>
-					<standard draft="contributed">Mauritiaanse standaardtijd</standard>
-					<daylight draft="contributed">Mauritiaanse zomertijd</daylight>
+					<generic>Mauritiaanse tijd</generic>
+					<standard>Mauritiaanse standaardtijd</standard>
+					<daylight>Mauritiaanse zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mawson">
 				<long>
-					<standard draft="contributed">Mawson tijd</standard>
+					<standard>Mawson-tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Mexico_Northwest">
 				<long>
-					<generic draft="contributed">Noordwest-Mexicaanse tijd</generic>
-					<standard draft="contributed">Noordwest-Mexicaanse standaardtijd</standard>
-					<daylight draft="contributed">Noordwest-Mexicaanse zomertijd</daylight>
+					<generic>Noordwest-Mexicaanse tijd</generic>
+					<standard>Noordwest-Mexicaanse standaardtijd</standard>
+					<daylight>Noordwest-Mexicaanse zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
-					<generic draft="contributed">Mexicaanse Pacific-tijd</generic>
-					<standard draft="contributed">Mexicaanse Pacific-standaardtijd</standard>
-					<daylight draft="contributed">Mexicaanse Pacific-zomertijd</daylight>
+					<generic>Mexicaanse Pacific-tijd</generic>
+					<standard>Mexicaanse Pacific-standaardtijd</standard>
+					<daylight>Mexicaanse Pacific-zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mongolia">
 				<long>
-					<generic>Ulaanbaatar tijd</generic>
-					<standard>Ulaanbaatar standaardtijd</standard>
-					<daylight>Ulaanbaatar zomertijd</daylight>
+					<generic>Ulaanbaatar-tijd</generic>
+					<standard>Ulaanbaatar-standaardtijd</standard>
+					<daylight>Ulaanbaatar-zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Moscow">
@@ -5958,12 +6111,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Myanmar">
 				<long>
-					<standard draft="contributed">Myanmarese tijd</standard>
+					<standard>Myanmarese tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Nauru">
 				<long>
-					<standard draft="contributed">Nauruaanse tijd</standard>
+					<standard>Nauruaanse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Nepal">
@@ -5973,9 +6126,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="New_Caledonia">
 				<long>
-					<generic draft="contributed">Nieuw-Caledonische tijd</generic>
-					<standard draft="contributed">Nieuw-Caledonische standaardtijd</standard>
-					<daylight draft="contributed">Nieuw-Caledonische zomertijd</daylight>
+					<generic>Nieuw-Caledonische tijd</generic>
+					<standard>Nieuw-Caledonische standaardtijd</standard>
+					<daylight>Nieuw-Caledonische zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="New_Zealand">
@@ -5994,7 +6147,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Niue">
 				<long>
-					<standard draft="contributed">Niuese tijd</standard>
+					<standard>Niuese tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Norfolk">
@@ -6037,12 +6190,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Palau">
 				<long>
-					<standard draft="contributed">Belause tijd</standard>
+					<standard>Belause tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Papua_New_Guinea">
 				<long>
-					<standard draft="contributed">Papoea-Nieuw-Guineese tijd</standard>
+					<standard>Papoea-Nieuw-Guineese tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Paraguay">
@@ -6061,31 +6214,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Philippines">
 				<long>
-					<generic draft="contributed">Filipijnse tijd</generic>
-					<standard draft="contributed">Filipijnse standaardtijd</standard>
-					<daylight draft="contributed">Filipijnse zomertijd</daylight>
+					<generic>Filipijnse tijd</generic>
+					<standard>Filipijnse standaardtijd</standard>
+					<daylight>Filipijnse zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Phoenix_Islands">
 				<long>
-					<standard draft="contributed">Phoenixeilandse tijd</standard>
+					<standard>Phoenixeilandse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Pierre_Miquelon">
 				<long>
-					<generic draft="contributed">Saint Pierre en Miquelon-tijd</generic>
-					<standard draft="contributed">Saint Pierre en Miquelon-standaardtijd</standard>
-					<daylight draft="contributed">Saint Pierre en Miquelon-zomertijd</daylight>
+					<generic>Saint Pierre en Miquelon-tijd</generic>
+					<standard>Saint Pierre en Miquelon-standaardtijd</standard>
+					<daylight>Saint Pierre en Miquelon-zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Pitcairn">
 				<long>
-					<standard draft="contributed">Pitcairneilandse tijd</standard>
+					<standard>Pitcairneilandse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Ponape">
 				<long>
-					<standard draft="contributed">Pohnpei tijd</standard>
+					<standard>Pohnpei-tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Qyzylorda">
@@ -6097,12 +6250,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Reunion">
 				<long>
-					<standard draft="contributed">Réunionse tijd</standard>
+					<standard>Réunionse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Rothera">
 				<long>
-					<standard draft="contributed">Rothera tijd</standard>
+					<standard>Rothera-tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Sakhalin">
@@ -6121,29 +6274,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Samoa">
 				<long>
-					<generic draft="contributed">Samoaanse tijd</generic>
-					<standard draft="contributed">Samoaanse standaardtijd</standard>
-					<daylight draft="contributed">Samoaanse zomertijd</daylight>
+					<generic>Samoaanse tijd</generic>
+					<standard>Samoaanse standaardtijd</standard>
+					<daylight>Samoaanse zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Seychelles">
 				<long>
-					<standard draft="contributed">Seychelse tijd</standard>
+					<standard>Seychelse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Singapore">
 				<long>
-					<standard draft="contributed">Singaporese standaardtijd</standard>
+					<standard>Singaporese standaardtijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Solomon">
 				<long>
-					<standard draft="contributed">Salomonseilandse tijd</standard>
+					<standard>Salomonseilandse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="South_Georgia">
 				<long>
-					<standard draft="contributed">Zuid-Georgische tijd</standard>
+					<standard>Zuid-Georgische tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Suriname">
@@ -6153,53 +6306,53 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Syowa">
 				<long>
-					<standard draft="contributed">Syowa tijd</standard>
+					<standard>Syowa-tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Tahiti">
 				<long>
-					<standard draft="contributed">Tahitiaanse tijd</standard>
+					<standard>Tahitiaanse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Taipei">
 				<long>
-					<generic>Taipei tijd</generic>
-					<standard>Taipei standaardtijd</standard>
-					<daylight>Taipei zomertijd</daylight>
+					<generic>Taipei-tijd</generic>
+					<standard>Taipei-standaardtijd</standard>
+					<daylight>Taipei-zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tajikistan">
 				<long>
-					<standard draft="contributed">Tadzjiekse tijd</standard>
+					<standard>Tadzjiekse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Tokelau">
 				<long>
-					<standard draft="contributed">Tokelau-eilandse tijd</standard>
+					<standard>Tokelau-eilandse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Tonga">
 				<long>
-					<generic draft="contributed">Tongaanse tijd</generic>
-					<standard draft="contributed">Tongaanse standaardtijd</standard>
-					<daylight draft="contributed">Tongaanse zomertijd</daylight>
+					<generic>Tongaanse tijd</generic>
+					<standard>Tongaanse standaardtijd</standard>
+					<daylight>Tongaanse zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Truk">
 				<long>
-					<standard draft="contributed">Chuukse tijd</standard>
+					<standard>Chuukse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
-					<generic draft="contributed">Turkmeense tijd</generic>
-					<standard draft="contributed">Turkmeense standaardtijd</standard>
-					<daylight draft="contributed">Turkmeense zomertijd</daylight>
+					<generic>Turkmeense tijd</generic>
+					<standard>Turkmeense standaardtijd</standard>
+					<daylight>Turkmeense zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tuvalu">
 				<long>
-					<standard draft="contributed">Tuvaluaanse tijd</standard>
+					<standard>Tuvaluaanse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Uruguay">
@@ -6211,16 +6364,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Uzbekistan">
 				<long>
-					<generic draft="contributed">Oezbeekse tijd</generic>
-					<standard draft="contributed">Oezbeekse standaardtijd</standard>
-					<daylight draft="contributed">Oezbeekse zomertijd</daylight>
+					<generic>Oezbeekse tijd</generic>
+					<standard>Oezbeekse standaardtijd</standard>
+					<daylight>Oezbeekse zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Vanuatu">
 				<long>
-					<generic draft="contributed">Vanuatuaanse tijd</generic>
-					<standard draft="contributed">Vanuatuaanse standaardtijd</standard>
-					<daylight draft="contributed">Vanuatuaanse zomertijd</daylight>
+					<generic>Vanuatuaanse tijd</generic>
+					<standard>Vanuatuaanse standaardtijd</standard>
+					<daylight>Vanuatuaanse zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Venezuela">
@@ -6244,17 +6397,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Vostok">
 				<long>
-					<standard draft="contributed">Vostok tijd</standard>
+					<standard>Vostok-tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Wake">
 				<long>
-					<standard draft="contributed">Wake-eilandse tijd</standard>
+					<standard>Wake-eilandse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Wallis">
 				<long>
-					<standard draft="contributed">Wallis en Futunase tijd</standard>
+					<standard>Wallis en Futunase tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Yakutsk">
@@ -6279,6 +6432,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<native draft="contributed">latn</native>
 		</otherNumberingSystems>
 		<minimumGroupingDigits draft="contributed">1</minimumGroupingDigits>
+		<symbols numberSystem="arab">
+			<timeSeparator draft="unconfirmed">:</timeSeparator>
+		</symbols>
 		<symbols numberSystem="latn">
 			<decimal>,</decimal>
 			<group>.</group>
@@ -6379,6 +6535,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤ #,##0.00;(¤ #,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">¤ 0K</pattern>
+					<pattern type="1000" count="other">¤ 0K</pattern>
+					<pattern type="10000" count="one">¤ 00K</pattern>
+					<pattern type="10000" count="other">¤ 00K</pattern>
+					<pattern type="100000" count="one">¤ 000K</pattern>
+					<pattern type="100000" count="other">¤ 000K</pattern>
+					<pattern type="1000000" count="one">¤ 0 mln'.'</pattern>
+					<pattern type="1000000" count="other">¤ 0 mln'.'</pattern>
+					<pattern type="10000000" count="one">¤ 00 mln'.'</pattern>
+					<pattern type="10000000" count="other">¤ 00 mln'.'</pattern>
+					<pattern type="100000000" count="one">¤ 000 mln'.'</pattern>
+					<pattern type="100000000" count="other">¤ 000 mln'.'</pattern>
+					<pattern type="1000000000" count="one">¤ 0 mld'.'</pattern>
+					<pattern type="1000000000" count="other">¤ 0 mld'.'</pattern>
+					<pattern type="10000000000" count="one">¤ 00 mld'.'</pattern>
+					<pattern type="10000000000" count="other">¤ 00 mld'.'</pattern>
+					<pattern type="100000000000" count="one">¤ 000 mld'.'</pattern>
+					<pattern type="100000000000" count="other">¤ 000 mld'.'</pattern>
+					<pattern type="1000000000000" count="one">¤ 0 bln'.'</pattern>
+					<pattern type="1000000000000" count="other">¤ 0 bln'.'</pattern>
+					<pattern type="10000000000000" count="one">¤ 00 bln'.'</pattern>
+					<pattern type="10000000000000" count="other">¤ 00 bln'.'</pattern>
+					<pattern type="100000000000000" count="one">¤ 000 bln'.'</pattern>
+					<pattern type="100000000000000" count="other">¤ 000 bln'.'</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -6436,6 +6620,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Angolese kwanza</displayName>
 				<displayName count="other">Angolese kwanza</displayName>
 				<symbol draft="contributed">AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>Angolese kwanza (1977–1990)</displayName>
@@ -6528,6 +6713,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Bosnische convertibele mark</displayName>
 				<displayName count="other">Bosnische convertibele mark</displayName>
 				<symbol draft="contributed">BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BAN">
 				<displayName draft="contributed">Nieuwe Bosnische dinar (1994–1997)</displayName>
@@ -6622,6 +6808,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Boliviaanse boliviano</displayName>
 				<displayName count="other">Boliviaanse boliviano</displayName>
 				<symbol draft="contributed">BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOL">
 				<displayName draft="contributed">Boliviaanse boliviano (1863–1963)</displayName>
@@ -6708,6 +6895,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Botswaanse pula</displayName>
 				<displayName count="other">Botswaanse pula</displayName>
 				<symbol draft="contributed">BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>Wit-Russische nieuwe roebel (1994–1999)</displayName>
@@ -6786,9 +6974,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol draft="contributed">CNX</symbol>
 			</currency>
 			<currency type="CNY">
-				<displayName>Chinese yuan renminbi</displayName>
-				<displayName count="one">Chinese renminbi</displayName>
-				<displayName count="other">Chinese renminbi</displayName>
+				<displayName>Chinese renminbi</displayName>
+				<displayName count="one">Chinese yuan</displayName>
+				<displayName count="other">Chinese yuan</displayName>
 				<symbol>CN¥</symbol>
 				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
@@ -6829,6 +7017,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Cubaanse convertibele peso</displayName>
 				<displayName count="other">Cubaanse convertibele peso</displayName>
 				<symbol draft="contributed">CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>Cubaanse peso</displayName>
@@ -6854,6 +7043,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Tsjechische kroon</displayName>
 				<displayName count="other">Tsjechische kronen</displayName>
 				<symbol draft="contributed">CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>Oost-Duitse ostmark</displayName>
@@ -6878,6 +7068,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Deense kroon</displayName>
 				<displayName count="other">Deense kronen</displayName>
 				<symbol draft="contributed">DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Dominicaanse peso</displayName>
@@ -6915,6 +7106,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Egyptisch pond</displayName>
 				<displayName count="other">Egyptisch pond</displayName>
 				<symbol draft="contributed">EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>Eritrese nakfa</displayName>
@@ -6972,6 +7164,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Falklandeilands pond</displayName>
 				<displayName count="other">Falklandeilands pond</displayName>
 				<symbol draft="contributed">FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>Franse franc</displayName>
@@ -6997,6 +7190,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Georgische lari</displayName>
 				<displayName count="other">Georgische lari</displayName>
 				<symbol draft="contributed">GEL</symbol>
+				<symbol alt="variant" draft="contributed">ლ</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>Ghanese cedi (1979–2007)</displayName>
@@ -7024,10 +7218,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol draft="contributed">GMD</symbol>
 			</currency>
 			<currency type="GNF">
-				<displayName>Guinese franc</displayName>
-				<displayName count="one">Guinese franc</displayName>
-				<displayName count="other">Guinese franc</displayName>
+				<displayName>Guinese frank</displayName>
+				<displayName count="one">Guinese frank</displayName>
+				<displayName count="other">Guinese frank</displayName>
 				<symbol draft="contributed">GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>Guinese syli</displayName>
@@ -7052,6 +7247,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Guatemalteekse quetzal</displayName>
 				<displayName count="other">Guatemalteekse quetzal</displayName>
 				<symbol draft="contributed">GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>Portugees-Guinese escudo</displayName>
@@ -7084,6 +7280,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Hondurese lempira</displayName>
 				<displayName count="other">Hondurese lempira</displayName>
 				<symbol draft="contributed">HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>Kroatische dinar</displayName>
@@ -7096,6 +7293,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Kroatische kuna</displayName>
 				<displayName count="other">Kroatische kuna</displayName>
 				<symbol draft="contributed">HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>Haïtiaanse gourde</displayName>
@@ -7108,12 +7306,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Hongaarse forint</displayName>
 				<displayName count="other">Hongaarse forint</displayName>
 				<symbol draft="contributed">HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>Indonesische roepia</displayName>
 				<displayName count="one">Indonesische roepia</displayName>
 				<displayName count="other">Indonesische roepia</displayName>
 				<symbol draft="contributed">IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>Iers pond</displayName>
@@ -7170,6 +7370,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">IJslandse kroon</displayName>
 				<displayName count="other">IJslandse kronen</displayName>
 				<symbol draft="contributed">ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>Italiaanse lire</displayName>
@@ -7221,12 +7422,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Comorese frank</displayName>
 				<displayName count="other">Comorese frank</displayName>
 				<symbol draft="contributed">KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>Noord-Koreaanse won</displayName>
 				<displayName count="one">Noord-Koreaanse won</displayName>
 				<displayName count="other">Noord-Koreaanse won</displayName>
 				<symbol draft="contributed">KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRH">
 				<displayName draft="contributed">Zuid-Koreaanse hwan (1953–1962)</displayName>
@@ -7254,9 +7457,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol draft="contributed">KWD</symbol>
 			</currency>
 			<currency type="KYD">
-				<displayName>Caymaneilandse dollar</displayName>
-				<displayName count="one">Caymaneilandse dollar</displayName>
-				<displayName count="other">Caymaneilandse dollar</displayName>
+				<displayName>Kaaimaneilandse dollar</displayName>
+				<displayName count="one">Kaaimaneilandse dollar</displayName>
+				<displayName count="other">Kaaimaneilandse dollar</displayName>
 				<symbol draft="contributed">KYD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -7279,12 +7482,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Libanees pond</displayName>
 				<displayName count="other">Libanees pond</displayName>
 				<symbol draft="contributed">LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>Sri Lankaanse roepie</displayName>
 				<displayName count="one">Sri Lankaanse roepie</displayName>
 				<displayName count="other">Sri Lankaanse roepie</displayName>
 				<symbol draft="contributed">LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>Liberiaanse dollar</displayName>
@@ -7382,6 +7587,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Malagassische ariary</displayName>
 				<displayName count="other">Malagassische ariary</displayName>
 				<symbol draft="contributed">MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>Malagassische franc</displayName>
@@ -7412,6 +7618,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Myanmarese kyat</displayName>
 				<displayName count="other">Myanmarese kyat</displayName>
 				<symbol draft="contributed">MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>Mongoolse tugrik</displayName>
@@ -7449,6 +7656,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Mauritiaanse roepie</displayName>
 				<displayName count="other">Mauritiaanse roepie</displayName>
 				<symbol draft="contributed">MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVP">
 				<displayName draft="contributed">Maldivische roepie</displayName>
@@ -7492,6 +7700,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Maleisische ringgit</displayName>
 				<displayName count="other">Maleisische ringgit</displayName>
 				<symbol draft="contributed">MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>Mozambikaanse escudo</displayName>
@@ -7536,6 +7745,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Nicaraguaanse córdoba</displayName>
 				<displayName count="other">Nicaraguaanse córdoba</displayName>
 				<symbol draft="contributed">NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>Nederlandse gulden</displayName>
@@ -7548,12 +7758,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Noorse kroon</displayName>
 				<displayName count="other">Noorse kronen</displayName>
 				<symbol draft="contributed">NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>Nepalese roepie</displayName>
 				<displayName count="one">Nepalese roepie</displayName>
 				<displayName count="other">Nepalese roepie</displayName>
 				<symbol draft="contributed">NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>Nieuw-Zeelandse dollar</displayName>
@@ -7610,12 +7822,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Pakistaanse roepie</displayName>
 				<displayName count="other">Pakistaanse roepie</displayName>
 				<symbol draft="contributed">PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>Poolse zloty</displayName>
 				<displayName count="one">Poolse zloty</displayName>
 				<displayName count="other">Poolse zloty</displayName>
 				<symbol draft="contributed">PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>Poolse zloty (1950–1995)</displayName>
@@ -7671,6 +7885,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Russische roebel</displayName>
 				<displayName count="other">Russische roebel</displayName>
 				<symbol draft="contributed">RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>Russische roebel (1991–1998)</displayName>
@@ -7684,6 +7899,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Rwandese frank</displayName>
 				<displayName count="other">Rwandese frank</displayName>
 				<symbol draft="contributed">RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>Saoedi-Arabische riyal</displayName>
@@ -7727,6 +7943,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Zweedse kroon</displayName>
 				<displayName count="other">Zweedse kronen</displayName>
 				<symbol draft="contributed">SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>Singaporese dollar</displayName>
@@ -7740,6 +7957,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Sint-Heleens pond</displayName>
 				<displayName count="other">Sint-Heleens pond</displayName>
 				<symbol draft="contributed">SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>Sloveense tolar</displayName>
@@ -7790,6 +8008,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Santomese dobra</displayName>
 				<displayName count="other">Santomese dobra</displayName>
 				<symbol draft="contributed">STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>Sovjet-roebel</displayName>
@@ -7808,6 +8027,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Syrisch pond</displayName>
 				<displayName count="other">Syrisch pond</displayName>
 				<symbol draft="contributed">SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>Swazische lilangeni</displayName>
@@ -7820,6 +8040,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Thaise baht</displayName>
 				<displayName count="other">Thaise baht</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>Tadzjikistaanse roebel</displayName>
@@ -7856,6 +8077,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Tongaanse paʻanga</displayName>
 				<displayName count="other">Tongaanse paʻanga</displayName>
 				<symbol draft="contributed">TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>Timorese escudo</displayName>
@@ -7875,6 +8097,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">Turkse lira</displayName>
 				<symbol draft="contributed">TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Trinidad en Tobago-dollar</displayName>
@@ -7976,6 +8199,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Venezolaanse bolivar</displayName>
 				<displayName count="other">Venezolaanse bolivar</displayName>
 				<symbol draft="contributed">VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>Vietnamese dong</displayName>
@@ -7985,9 +8209,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">₫</symbol>
 			</currency>
 			<currency type="VNN">
-				<displayName draft="contributed">Oude Vietnamese dong (1978–1985)</displayName>
-				<displayName count="one" draft="contributed">oude Vietnamese dong (1978–1985)</displayName>
-				<displayName count="other" draft="contributed">oude Vietnamese dong (1978–1985)</displayName>
+				<displayName draft="contributed">Vietnamese dong (1978–1985)</displayName>
+				<displayName count="one" draft="contributed">Vietnamese dong (1978–1985)</displayName>
+				<displayName count="other" draft="contributed">Vietnamese dong (1978–1985)</displayName>
 				<symbol draft="contributed">VNN</symbol>
 			</currency>
 			<currency type="VUV">
@@ -8049,6 +8273,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Oost-Caribische dollar</displayName>
 				<displayName count="other">Oost-Caribische dollar</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>Special Drawing Rights</displayName>
@@ -8087,8 +8312,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol draft="contributed">XPD</symbol>
 			</currency>
 			<currency type="XPF">
-				<displayName>CFP-franc</displayName>
-				<displayName count="one">CFP-franc</displayName>
+				<displayName>CFP-frank</displayName>
+				<displayName count="one">CFP-frank</displayName>
 				<displayName count="other">CFP-frank</displayName>
 				<symbol>XPF</symbol>
 			</currency>
@@ -8175,6 +8400,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Zuid-Afrikaanse rand</displayName>
 				<displayName count="other">Zuid-Afrikaanse rand</displayName>
 				<symbol draft="contributed">ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>Zambiaanse kwacha (1968–2012)</displayName>
@@ -8187,6 +8413,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Zambiaanse kwacha</displayName>
 				<displayName count="other">Zambiaanse kwacha</displayName>
 				<symbol draft="contributed">ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>Zaïrese nieuwe zaïre</displayName>
@@ -8227,1231 +8454,1365 @@ For terms of use, see http://www.unicode.org/copyright.html
 	<units>
 		<unitLength type="long">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0} per {1}</compoundUnitPattern>
+				<compoundUnitPattern>{0} per {1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
-				<displayName draft="contributed">G-krachten</displayName>
+				<displayName>G-krachten</displayName>
 				<unitPattern count="one">{0} G-kracht</unitPattern>
 				<unitPattern count="other">{0} G-krachten</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
-				<displayName draft="contributed">m/s²</displayName>
-				<unitPattern count="one" draft="contributed">{0} m/s²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} m/s²</unitPattern>
+				<displayName>meter per seconde kwadraat</displayName>
+				<unitPattern count="one">{0} meter per seconde kwadraat</unitPattern>
+				<unitPattern count="other">{0} meter per seconde kwadraat</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>toeren</displayName>
+				<unitPattern count="one">{0} toer</unitPattern>
+				<unitPattern count="other">{0} toeren</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radiaal</displayName>
+				<unitPattern count="one">{0} radiaal</unitPattern>
+				<unitPattern count="other">{0} radialen</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>booggraden</displayName>
+				<unitPattern count="one">{0} booggraad</unitPattern>
+				<unitPattern count="other">{0} booggraden</unitPattern>
 			</unit>
 			<unit type="angle-arc-minute">
-				<displayName draft="contributed">boogminuten</displayName>
+				<displayName>boogminuten</displayName>
 				<unitPattern count="one">{0} boogminuut</unitPattern>
 				<unitPattern count="other">{0} boogminuten</unitPattern>
 			</unit>
 			<unit type="angle-arc-second">
-				<displayName draft="contributed">boogseconden</displayName>
+				<displayName>boogseconden</displayName>
 				<unitPattern count="one">{0} boogseconde</unitPattern>
 				<unitPattern count="other">{0} boogseconden</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName draft="contributed">booggraden</displayName>
-				<unitPattern count="one">{0} booggraad</unitPattern>
-				<unitPattern count="other">{0} booggraden</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName draft="contributed">radiaal</displayName>
-				<unitPattern count="one" draft="contributed">{0} radiaal</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} radialen</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="contributed">acre</displayName>
-				<unitPattern count="one">{0} acre</unitPattern>
-				<unitPattern count="other">{0} acres</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>vierkante kilometer</displayName>
+				<unitPattern count="one">{0} vierkante kilometer</unitPattern>
+				<unitPattern count="other">{0} vierkante kilometer</unitPattern>
 			</unit>
 			<unit type="area-hectare">
-				<displayName draft="contributed">hectare</displayName>
+				<displayName>hectare</displayName>
 				<unitPattern count="one">{0} hectare</unitPattern>
 				<unitPattern count="other">{0} hectare</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>vierkante meter</displayName>
+				<unitPattern count="one">{0} vierkante meter</unitPattern>
+				<unitPattern count="other">{0} vierkante meter</unitPattern>
+				<perUnitPattern>{0} per vierkante meter</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
-				<displayName draft="contributed">vierkante centimeter</displayName>
-				<unitPattern count="one" draft="contributed">{0} vierkante centimeter</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} vierkante centimeter</unitPattern>
+				<displayName>vierkante centimeter</displayName>
+				<unitPattern count="one">{0} vierkante centimeter</unitPattern>
+				<unitPattern count="other">{0} vierkante centimeter</unitPattern>
+				<perUnitPattern>{0} per vierkante centimeter</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>vierkante mijl</displayName>
+				<unitPattern count="one">{0} vierkante mijl</unitPattern>
+				<unitPattern count="other">{0} vierkante mijl</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acre</displayName>
+				<unitPattern count="one">{0} acre</unitPattern>
+				<unitPattern count="other">{0} acres</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>vierkante yard</displayName>
+				<unitPattern count="one">{0} vierkante yard</unitPattern>
+				<unitPattern count="other">{0} vierkante yard</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
-				<displayName draft="contributed">vierkante voet</displayName>
+				<displayName>vierkante voet</displayName>
 				<unitPattern count="one">{0} vierkante voet</unitPattern>
 				<unitPattern count="other">{0} vierkante voet</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
-				<displayName draft="contributed">vierkante inch</displayName>
-				<unitPattern count="one" draft="contributed">{0} vierkante inch</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} vierkante inch</unitPattern>
+				<displayName>vierkante inch</displayName>
+				<unitPattern count="one">{0} vierkante inch</unitPattern>
+				<unitPattern count="other">{0} vierkante inch</unitPattern>
+				<perUnitPattern>{0} per vierkante inch</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="contributed">vierkante kilometer</displayName>
-				<unitPattern count="one">{0} vierkante kilometer</unitPattern>
-				<unitPattern count="other">{0} vierkante kilometer</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName draft="contributed">vierkante meter</displayName>
-				<unitPattern count="one">{0} vierkante meter</unitPattern>
-				<unitPattern count="other">{0} vierkante meter</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName draft="contributed">vierkante mijl</displayName>
-				<unitPattern count="one">{0} vierkante mijl</unitPattern>
-				<unitPattern count="other">{0} vierkante mijl</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName draft="contributed">vierkante yard</displayName>
-				<unitPattern count="one" draft="contributed">{0} vierkante yard</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} vierkante yard</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karaat</displayName>
+				<unitPattern count="one">{0} karaat</unitPattern>
+				<unitPattern count="other">{0} karaat</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName draft="contributed">liter per kilometer</displayName>
-				<unitPattern count="one" draft="contributed">{0} liter per kilometer</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} liter per kilometer</unitPattern>
+				<displayName>liter per kilometer</displayName>
+				<unitPattern count="one">{0} liter per kilometer</unitPattern>
+				<unitPattern count="other">{0} liter per kilometer</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>liter per 100 kilometer</displayName>
+				<unitPattern count="one">{0} liter per 100 kilometer</unitPattern>
+				<unitPattern count="other">{0} liter per 100 kilometer</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
-				<displayName draft="contributed">mijl per gallon</displayName>
-				<unitPattern count="one" draft="contributed">{0} mijl per gallon</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mijl per gallon</unitPattern>
-			</unit>
-			<unit type="digital-bit">
-				<displayName draft="contributed">bit</displayName>
-				<unitPattern count="one" draft="contributed">{0} bit</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} bits</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName draft="contributed">byte</displayName>
-				<unitPattern count="one" draft="contributed">{0} byte</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName draft="contributed">gigabit</displayName>
-				<unitPattern count="one" draft="contributed">{0} gigabit</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} gigabits</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName draft="contributed">gigabyte</displayName>
-				<unitPattern count="one" draft="contributed">{0} gigabyte</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} gigabyte</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName draft="contributed">kilobit</displayName>
-				<unitPattern count="one" draft="contributed">{0} kilobit</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kilobits</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName draft="contributed">kilobyte</displayName>
-				<unitPattern count="one" draft="contributed">{0} kilobyte</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kilobyte</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName draft="contributed">megabit</displayName>
-				<unitPattern count="one" draft="contributed">{0} megabit</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} megabits</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName draft="contributed">megabyte</displayName>
-				<unitPattern count="one" draft="contributed">{0} megabyte</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} megabyte</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName draft="contributed">terabit</displayName>
-				<unitPattern count="one" draft="contributed">{0} terabit</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} terabits</unitPattern>
+				<displayName>mijl per gallon</displayName>
+				<unitPattern count="one">{0} mijl per gallon</unitPattern>
+				<unitPattern count="other">{0} mijl per gallon</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
-				<displayName draft="contributed">terabyte</displayName>
-				<unitPattern count="one" draft="contributed">{0} terabyte</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} terabyte</unitPattern>
+				<displayName>terabyte</displayName>
+				<unitPattern count="one">{0} terabyte</unitPattern>
+				<unitPattern count="other">{0} terabyte</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabit</displayName>
+				<unitPattern count="one">{0} terabit</unitPattern>
+				<unitPattern count="other">{0} terabits</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabyte</displayName>
+				<unitPattern count="one">{0} gigabyte</unitPattern>
+				<unitPattern count="other">{0} gigabyte</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabit</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="other">{0} gigabits</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabyte</displayName>
+				<unitPattern count="one">{0} megabyte</unitPattern>
+				<unitPattern count="other">{0} megabyte</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabit</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="other">{0} megabits</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobyte</displayName>
+				<unitPattern count="one">{0} kilobyte</unitPattern>
+				<unitPattern count="other">{0} kilobyte</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobit</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="other">{0} kilobits</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bits</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>eeuwen</displayName>
+				<unitPattern count="one">{0} eeuw</unitPattern>
+				<unitPattern count="other">{0} eeuwen</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>jaar</displayName>
+				<unitPattern count="one">{0} jaar</unitPattern>
+				<unitPattern count="other">{0} jaar</unitPattern>
+				<perUnitPattern>{0} per jaar</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>maanden</displayName>
+				<unitPattern count="one">{0} maand</unitPattern>
+				<unitPattern count="other">{0} maanden</unitPattern>
+				<perUnitPattern>{0} per maand</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>weken</displayName>
+				<unitPattern count="one">{0} week</unitPattern>
+				<unitPattern count="other">{0} weken</unitPattern>
+				<perUnitPattern>{0} per week</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
-				<displayName draft="contributed">dagen</displayName>
+				<displayName>dagen</displayName>
 				<unitPattern count="one">{0} dag</unitPattern>
 				<unitPattern count="other">{0} dagen</unitPattern>
+				<perUnitPattern>{0} per dag</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName draft="contributed">uur</displayName>
+				<displayName>uur</displayName>
 				<unitPattern count="one">{0} uur</unitPattern>
 				<unitPattern count="other">{0} uur</unitPattern>
-				<perUnitPattern draft="contributed">{0} per uur</perUnitPattern>
+				<perUnitPattern>{0} per uur</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName draft="contributed">microseconde</displayName>
-				<unitPattern count="one" draft="contributed">{0} microseconde</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} microseconden</unitPattern>
+			<unit type="duration-minute">
+				<displayName>minuten</displayName>
+				<unitPattern count="one">{0} minuut</unitPattern>
+				<unitPattern count="other">{0} minuten</unitPattern>
+				<perUnitPattern>{0} per minuut</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>seconden</displayName>
+				<unitPattern count="one">{0} seconde</unitPattern>
+				<unitPattern count="other">{0} seconden</unitPattern>
+				<perUnitPattern>{0} per seconde</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
-				<displayName draft="contributed">milliseconde</displayName>
+				<displayName>milliseconden</displayName>
 				<unitPattern count="one">{0} milliseconde</unitPattern>
 				<unitPattern count="other">{0} milliseconden</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName draft="contributed">minuten</displayName>
-				<unitPattern count="one">{0} minuut</unitPattern>
-				<unitPattern count="other">{0} minuten</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">maanden</displayName>
-				<unitPattern count="one">{0} maand</unitPattern>
-				<unitPattern count="other">{0} maanden</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>microseconden</displayName>
+				<unitPattern count="one">{0} microseconde</unitPattern>
+				<unitPattern count="other">{0} microseconden</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
-				<displayName draft="contributed">nanoseconde</displayName>
-				<unitPattern count="one" draft="contributed">{0} nanoseconde</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} nanoseconden</unitPattern>
-			</unit>
-			<unit type="duration-second">
-				<displayName draft="contributed">seconden</displayName>
-				<unitPattern count="one">{0} seconde</unitPattern>
-				<unitPattern count="other">{0} seconden</unitPattern>
-				<perUnitPattern draft="contributed">{0} per seconde</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">weken</displayName>
-				<unitPattern count="one">{0} week</unitPattern>
-				<unitPattern count="other">{0} weken</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">jaar</displayName>
-				<unitPattern count="one">{0} jaar</unitPattern>
-				<unitPattern count="other">{0} jaar</unitPattern>
+				<displayName>nanoseconden</displayName>
+				<unitPattern count="one">{0} nanoseconde</unitPattern>
+				<unitPattern count="other">{0} nanoseconden</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
-				<displayName draft="contributed">ampère</displayName>
-				<unitPattern count="one" draft="contributed">{0} ampère</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ampère</unitPattern>
+				<displayName>ampère</displayName>
+				<unitPattern count="one">{0} ampère</unitPattern>
+				<unitPattern count="other">{0} ampère</unitPattern>
 			</unit>
 			<unit type="electric-milliampere">
-				<displayName draft="contributed">milliampère</displayName>
-				<unitPattern count="one" draft="contributed">{0} milliampère</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} milliampère</unitPattern>
+				<displayName>milliampère</displayName>
+				<unitPattern count="one">{0} milliampère</unitPattern>
+				<unitPattern count="other">{0} milliampère</unitPattern>
 			</unit>
 			<unit type="electric-ohm">
-				<displayName draft="contributed">ohm</displayName>
-				<unitPattern count="one" draft="contributed">{0} ohm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ohm</unitPattern>
+				<displayName>ohm</displayName>
+				<unitPattern count="one">{0} ohm</unitPattern>
+				<unitPattern count="other">{0} ohm</unitPattern>
 			</unit>
 			<unit type="electric-volt">
-				<displayName draft="contributed">volt</displayName>
-				<unitPattern count="one" draft="contributed">{0} volt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} volt</unitPattern>
-			</unit>
-			<unit type="energy-calorie">
-				<displayName draft="contributed">calorie</displayName>
-				<unitPattern count="one" draft="contributed">{0} calorie</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} calorieën</unitPattern>
-			</unit>
-			<unit type="energy-foodcalorie">
-				<displayName draft="contributed">kilocalorie</displayName>
-				<unitPattern count="one" draft="contributed">{0} kilocalorie</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kilocalorieën</unitPattern>
-			</unit>
-			<unit type="energy-joule">
-				<displayName draft="contributed">joule</displayName>
-				<unitPattern count="one" draft="contributed">{0} joule</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} joules</unitPattern>
+				<displayName>volt</displayName>
+				<unitPattern count="one">{0} volt</unitPattern>
+				<unitPattern count="other">{0} volt</unitPattern>
 			</unit>
 			<unit type="energy-kilocalorie">
-				<displayName draft="contributed">kilocalorie</displayName>
-				<unitPattern count="one" draft="contributed">{0} kilocalorie</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kilocalorieën</unitPattern>
+				<displayName>kilocalorie</displayName>
+				<unitPattern count="one">{0} kilocalorie</unitPattern>
+				<unitPattern count="other">{0} kilocalorieën</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>calorie</displayName>
+				<unitPattern count="one">{0} calorie</unitPattern>
+				<unitPattern count="other">{0} calorieën</unitPattern>
+			</unit>
+			<unit type="energy-foodcalorie">
+				<displayName>kilocalorie</displayName>
+				<unitPattern count="one">{0} kilocalorie</unitPattern>
+				<unitPattern count="other">{0} kilocalorieën</unitPattern>
 			</unit>
 			<unit type="energy-kilojoule">
-				<displayName draft="contributed">kilojoule</displayName>
-				<unitPattern count="one" draft="contributed">{0} kilojoule</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kilojoules</unitPattern>
+				<displayName>kilojoule</displayName>
+				<unitPattern count="one">{0} kilojoule</unitPattern>
+				<unitPattern count="other">{0} kilojoules</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="one">{0} joule</unitPattern>
+				<unitPattern count="other">{0} joules</unitPattern>
 			</unit>
 			<unit type="energy-kilowatt-hour">
-				<displayName draft="contributed">kilowattuur</displayName>
-				<unitPattern count="one" draft="contributed">{0} kilowattuur</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kilowattuur</unitPattern>
+				<displayName>kilowattuur</displayName>
+				<unitPattern count="one">{0} kilowattuur</unitPattern>
+				<unitPattern count="other">{0} kilowattuur</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
-				<displayName draft="contributed">gigahertz</displayName>
-				<unitPattern count="one" draft="contributed">{0} gigahertz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} gigahertz</unitPattern>
-			</unit>
-			<unit type="frequency-hertz">
-				<displayName draft="contributed">hertz</displayName>
-				<unitPattern count="one" draft="contributed">{0} hertz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} hertz</unitPattern>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<displayName draft="contributed">kilohertz</displayName>
-				<unitPattern count="one" draft="contributed">{0} kilohertz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kilohertz</unitPattern>
+				<displayName>gigahertz</displayName>
+				<unitPattern count="one">{0} gigahertz</unitPattern>
+				<unitPattern count="other">{0} gigahertz</unitPattern>
 			</unit>
 			<unit type="frequency-megahertz">
-				<displayName draft="contributed">megahertz</displayName>
-				<unitPattern count="one" draft="contributed">{0} megahertz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} megahertz</unitPattern>
+				<displayName>megahertz</displayName>
+				<unitPattern count="one">{0} megahertz</unitPattern>
+				<unitPattern count="other">{0} megahertz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName draft="contributed">astronomische eenheid</displayName>
-				<unitPattern count="one" draft="contributed">{0} astronomische eenheid</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} astronomische eenheden</unitPattern>
+			<unit type="frequency-kilohertz">
+				<displayName>kilohertz</displayName>
+				<unitPattern count="one">{0} kilohertz</unitPattern>
+				<unitPattern count="other">{0} kilohertz</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">centimeter</displayName>
-				<unitPattern count="one">{0} centimeter</unitPattern>
-				<unitPattern count="other">{0} centimeter</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hertz</displayName>
+				<unitPattern count="one">{0} hertz</unitPattern>
+				<unitPattern count="other">{0} hertz</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>kilometer</displayName>
+				<unitPattern count="one">{0} kilometer</unitPattern>
+				<unitPattern count="other">{0} kilometer</unitPattern>
+				<perUnitPattern>{0} per kilometer</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>meter</displayName>
+				<unitPattern count="one">{0} meter</unitPattern>
+				<unitPattern count="other">{0} meter</unitPattern>
+				<perUnitPattern>{0} per meter</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
-				<displayName draft="contributed">decimeter</displayName>
-				<unitPattern count="one" draft="contributed">{0} decimeter</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} decimeter</unitPattern>
+				<displayName>decimeter</displayName>
+				<unitPattern count="one">{0} decimeter</unitPattern>
+				<unitPattern count="other">{0} decimeter</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName draft="contributed">vadem</displayName>
-				<unitPattern count="one" draft="contributed">{0} vadem</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} vadems</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>centimeter</displayName>
+				<unitPattern count="one">{0} centimeter</unitPattern>
+				<unitPattern count="other">{0} centimeter</unitPattern>
+				<perUnitPattern>{0} per centimeter</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>millimeter</displayName>
+				<unitPattern count="one">{0} millimeter</unitPattern>
+				<unitPattern count="other">{0} millimeter</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>micrometer</displayName>
+				<unitPattern count="one">{0} micrometer</unitPattern>
+				<unitPattern count="other">{0} micrometer</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nanometer</displayName>
+				<unitPattern count="one">{0} nanometer</unitPattern>
+				<unitPattern count="other">{0} nanometer</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>picometer</displayName>
+				<unitPattern count="one">{0} picometer</unitPattern>
+				<unitPattern count="other">{0} picometer</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>mijl</displayName>
+				<unitPattern count="one">{0} mijl</unitPattern>
+				<unitPattern count="other">{0} mijl</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>yards</displayName>
+				<unitPattern count="one">{0} yard</unitPattern>
+				<unitPattern count="other">{0} yards</unitPattern>
 			</unit>
 			<unit type="length-foot">
-				<displayName draft="contributed">voet</displayName>
+				<displayName>voet</displayName>
 				<unitPattern count="one">{0} voet</unitPattern>
 				<unitPattern count="other">{0} voet</unitPattern>
+				<perUnitPattern>{0} per voet</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>inches</displayName>
+				<unitPattern count="one">{0} inch</unitPattern>
+				<unitPattern count="other">{0} inches</unitPattern>
+				<perUnitPattern>{0} per inch</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsec</displayName>
+				<unitPattern count="one">{0} parsec</unitPattern>
+				<unitPattern count="other">{0} parsecs</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>lichtjaar</displayName>
+				<unitPattern count="one">{0} lichtjaar</unitPattern>
+				<unitPattern count="other">{0} lichtjaar</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>astronomische eenheid</displayName>
+				<unitPattern count="one">{0} astronomische eenheid</unitPattern>
+				<unitPattern count="other">{0} astronomische eenheden</unitPattern>
 			</unit>
 			<unit type="length-furlong">
 				<displayName draft="contributed">furlong</displayName>
 				<unitPattern count="one" draft="contributed">{0} furlong</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} furlong</unitPattern>
 			</unit>
-			<unit type="length-inch">
-				<displayName draft="contributed">inches</displayName>
-				<unitPattern count="one">{0} inch</unitPattern>
-				<unitPattern count="other">{0} inches</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName draft="contributed">kilometer</displayName>
-				<unitPattern count="one">{0} kilometer</unitPattern>
-				<unitPattern count="other">{0} kilometer</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName draft="contributed">lichtjaar</displayName>
-				<unitPattern count="one">{0} lichtjaar</unitPattern>
-				<unitPattern count="other">{0} lichtjaar</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName draft="contributed">meter</displayName>
-				<unitPattern count="one">{0} meter</unitPattern>
-				<unitPattern count="other">{0} meter</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName draft="contributed">micrometer</displayName>
-				<unitPattern count="one" draft="contributed">{0} micrometer</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} micrometer</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName draft="contributed">mijl</displayName>
-				<unitPattern count="one">{0} mijl</unitPattern>
-				<unitPattern count="other">{0} mijl</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName draft="contributed">millimeter</displayName>
-				<unitPattern count="one">{0} millimeter</unitPattern>
-				<unitPattern count="other">{0} millimeter</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<displayName draft="contributed">nanometer</displayName>
-				<unitPattern count="one" draft="contributed">{0} nanometer</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} nanometer</unitPattern>
+			<unit type="length-fathom">
+				<displayName draft="contributed">vadem</displayName>
+				<unitPattern count="one" draft="contributed">{0} vadem</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} vadems</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
-				<displayName draft="contributed">zeemijl</displayName>
-				<unitPattern count="one" draft="contributed">{0} zeemijl</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} zeemijl</unitPattern>
+				<displayName>zeemijl</displayName>
+				<unitPattern count="one">{0} zeemijl</unitPattern>
+				<unitPattern count="other">{0} zeemijlen</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<displayName draft="contributed">parsec</displayName>
-				<unitPattern count="one" draft="contributed">{0} parsec</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} parsecs</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName draft="contributed">picometer</displayName>
-				<unitPattern count="one">{0} picometer</unitPattern>
-				<unitPattern count="other">{0} picometer</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<displayName draft="contributed">yards</displayName>
-				<unitPattern count="one">{0} yard</unitPattern>
-				<unitPattern count="other">{0} yards</unitPattern>
+			<unit type="length-mile-scandinavian">
+				<displayName>Scandinavische mijl</displayName>
+				<unitPattern count="one">{0} Scandinavische mijl</unitPattern>
+				<unitPattern count="other">{0} Scandinavische mijl</unitPattern>
 			</unit>
 			<unit type="light-lux">
-				<displayName draft="contributed">lux</displayName>
-				<unitPattern count="one" draft="contributed">{0} lux</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} lux</unitPattern>
-			</unit>
-			<unit type="mass-carat">
-				<displayName draft="contributed">karaat</displayName>
-				<unitPattern count="one" draft="contributed">{0} karaat</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} karaat</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName draft="contributed">gram</displayName>
-				<unitPattern count="one">{0} gram</unitPattern>
-				<unitPattern count="other">{0} gram</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName draft="contributed">kilogram</displayName>
-				<unitPattern count="one">{0} kilogram</unitPattern>
-				<unitPattern count="other">{0} kilogram</unitPattern>
+				<displayName>lux</displayName>
+				<unitPattern count="one">{0} lux</unitPattern>
+				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
 			<unit type="mass-metric-ton">
-				<displayName draft="contributed">tonne</displayName>
-				<unitPattern count="one" draft="contributed">{0} tonne</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} tonnes</unitPattern>
+				<displayName>tonne</displayName>
+				<unitPattern count="one">{0} tonne</unitPattern>
+				<unitPattern count="other">{0} tonnes</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName draft="contributed">microgram</displayName>
-				<unitPattern count="one" draft="contributed">{0} microgram</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} microgram</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogram</displayName>
+				<unitPattern count="one">{0} kilogram</unitPattern>
+				<unitPattern count="other">{0} kilogram</unitPattern>
+				<perUnitPattern>{0} per kilogram</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="one">{0} gram</unitPattern>
+				<unitPattern count="other">{0} gram</unitPattern>
+				<perUnitPattern>{0} per gram</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
-				<displayName draft="contributed">milligram</displayName>
-				<unitPattern count="one" draft="contributed">{0} milligram</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} milligram</unitPattern>
+				<displayName>milligram</displayName>
+				<unitPattern count="one">{0} milligram</unitPattern>
+				<unitPattern count="other">{0} milligram</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="contributed">ons</displayName>
-				<unitPattern count="one">{0} ons</unitPattern>
-				<unitPattern count="other">{0} ons</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>microgram</displayName>
+				<unitPattern count="one">{0} microgram</unitPattern>
+				<unitPattern count="other">{0} microgram</unitPattern>
 			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName draft="contributed">troy ounce</displayName>
-				<unitPattern count="one" draft="contributed">{0} troy ounce</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} troy ounce</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName draft="contributed">pond</displayName>
-				<unitPattern count="one">{0} pond</unitPattern>
-				<unitPattern count="other">{0} pond</unitPattern>
+			<unit type="mass-ton">
+				<displayName>ton</displayName>
+				<unitPattern count="one">{0} ton</unitPattern>
+				<unitPattern count="other">{0} ton</unitPattern>
 			</unit>
 			<unit type="mass-stone">
 				<displayName draft="contributed">stone</displayName>
 				<unitPattern count="one" draft="contributed">{0} stone</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} stone</unitPattern>
 			</unit>
-			<unit type="mass-ton">
-				<displayName draft="contributed">ton</displayName>
-				<unitPattern count="one" draft="contributed">{0} ton</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ton</unitPattern>
+			<unit type="mass-pound">
+				<displayName>pound</displayName>
+				<unitPattern count="one">{0} pound</unitPattern>
+				<unitPattern count="other">{0} pound</unitPattern>
+				<perUnitPattern>{0} per pound</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ounce</displayName>
+				<unitPattern count="one">{0} ounce</unitPattern>
+				<unitPattern count="other">{0} ounce</unitPattern>
+				<perUnitPattern>{0} per ounce</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>troy ounce</displayName>
+				<unitPattern count="one">{0} troy ounce</unitPattern>
+				<unitPattern count="other">{0} troy ounce</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karaat</displayName>
+				<unitPattern count="one">{0} karaat</unitPattern>
+				<unitPattern count="other">{0} karaat</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
-				<displayName draft="contributed">gigawatt</displayName>
-				<unitPattern count="one" draft="contributed">{0} gigawatt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} gigawatt</unitPattern>
+				<displayName>gigawatt</displayName>
+				<unitPattern count="one">{0} gigawatt</unitPattern>
+				<unitPattern count="other">{0} gigawatt</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="contributed">paardenkrachten</displayName>
-				<unitPattern count="one">{0} paardenkracht</unitPattern>
-				<unitPattern count="other">{0} paardenkrachten</unitPattern>
+			<unit type="power-megawatt">
+				<displayName>megawatt</displayName>
+				<unitPattern count="one">{0} megawatt</unitPattern>
+				<unitPattern count="other">{0} megawatt</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
-				<displayName draft="contributed">kilowatt</displayName>
+				<displayName>kilowatt</displayName>
 				<unitPattern count="one">{0} kilowatt</unitPattern>
 				<unitPattern count="other">{0} kilowatt</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<displayName draft="contributed">megawatt</displayName>
-				<unitPattern count="one" draft="contributed">{0} megawatt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} megawatt</unitPattern>
-			</unit>
-			<unit type="power-milliwatt">
-				<displayName draft="contributed">milliwatt</displayName>
-				<unitPattern count="one" draft="contributed">{0} milliwatt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} milliwatt</unitPattern>
-			</unit>
 			<unit type="power-watt">
-				<displayName draft="contributed">watt</displayName>
+				<displayName>watt</displayName>
 				<unitPattern count="one">{0} watt</unitPattern>
 				<unitPattern count="other">{0} watt</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>milliwatt</displayName>
+				<unitPattern count="one">{0} milliwatt</unitPattern>
+				<unitPattern count="other">{0} milliwatt</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>paardenkrachten</displayName>
+				<unitPattern count="one">{0} paardenkracht</unitPattern>
+				<unitPattern count="other">{0} paardenkrachten</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
-				<displayName draft="contributed">hectopascal</displayName>
+				<displayName>hectopascal</displayName>
 				<unitPattern count="one">{0} hectopascal</unitPattern>
 				<unitPattern count="other">{0} hectopascal</unitPattern>
 			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>millimeter-kwikdruk</displayName>
+				<unitPattern count="one">{0} millimeter-kwikdruk</unitPattern>
+				<unitPattern count="other">{0} millimeter-kwikdruk</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>psi</displayName>
+				<unitPattern count="one">{0} psi</unitPattern>
+				<unitPattern count="other">{0} psi</unitPattern>
+			</unit>
 			<unit type="pressure-inch-hg">
-				<displayName draft="contributed">inch-kwikdruk</displayName>
+				<displayName>inch-kwikdruk</displayName>
 				<unitPattern count="one">{0} inch-kwikdruk</unitPattern>
 				<unitPattern count="other">{0} inch-kwikdruk</unitPattern>
 			</unit>
 			<unit type="pressure-millibar">
-				<displayName draft="contributed">millibar</displayName>
+				<displayName>millibar</displayName>
 				<unitPattern count="one">{0} millibar</unitPattern>
 				<unitPattern count="other">{0} millibar</unitPattern>
 			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<displayName draft="contributed">millimeter-kwikdruk</displayName>
-				<unitPattern count="one" draft="contributed">{0} millimeter-kwikdruk</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} millimeter-kwikdruk</unitPattern>
-			</unit>
-			<unit type="pressure-pound-per-square-inch">
-				<displayName draft="contributed">psi</displayName>
-				<unitPattern count="one" draft="contributed">{0} psi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} psi</unitPattern>
-			</unit>
-			<unit type="proportion-karat">
-				<displayName draft="contributed">karaat</displayName>
-				<unitPattern count="one" draft="contributed">{0} karaat</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} karaat</unitPattern>
-			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName draft="contributed">kilometer per uur</displayName>
+				<displayName>kilometer per uur</displayName>
 				<unitPattern count="one">{0} kilometer per uur</unitPattern>
 				<unitPattern count="other">{0} kilometer per uur</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
-				<displayName draft="contributed">meter per seconde</displayName>
+				<displayName>meter per seconde</displayName>
 				<unitPattern count="one">{0} meter per seconde</unitPattern>
 				<unitPattern count="other">{0} meter per seconde</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<displayName draft="contributed">mijl per uur</displayName>
+				<displayName>mijl per uur</displayName>
 				<unitPattern count="one">{0} mijl per uur</unitPattern>
 				<unitPattern count="other">{0} mijl per uur</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>knoop</displayName>
+				<unitPattern count="one">{0} knoop</unitPattern>
+				<unitPattern count="other">{0} knopen</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
-				<displayName draft="contributed">graden Celsius</displayName>
+				<displayName>graden Celsius</displayName>
 				<unitPattern count="one">{0} graad Celsius</unitPattern>
 				<unitPattern count="other">{0} graden Celsius</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
-				<displayName draft="contributed">graden Fahrenheit</displayName>
+				<displayName>graden Fahrenheit</displayName>
 				<unitPattern count="one">{0} graad Fahrenheit</unitPattern>
 				<unitPattern count="other">{0} graden Fahrenheit</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
-				<displayName draft="contributed">kelvin</displayName>
-				<unitPattern count="one" draft="contributed">{0} kelvin</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kelvin</unitPattern>
+				<displayName>kelvin</displayName>
+				<unitPattern count="one">{0} kelvin</unitPattern>
+				<unitPattern count="other">{0} kelvin</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>kubieke kilometer</displayName>
+				<unitPattern count="one">{0} kubieke kilometer</unitPattern>
+				<unitPattern count="other">{0} kubieke kilometer</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>kubieke meter</displayName>
+				<unitPattern count="one">{0} kubieke meter</unitPattern>
+				<unitPattern count="other">{0} kubieke meter</unitPattern>
+				<perUnitPattern>{0} per kubieke meter</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>kubieke centimeter</displayName>
+				<unitPattern count="one">{0} kubieke centimeter</unitPattern>
+				<unitPattern count="other">{0} kubieke centimeter</unitPattern>
+				<perUnitPattern>{0} per kubieke centimeter</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>kubieke mijl</displayName>
+				<unitPattern count="one">{0} kubieke mijl</unitPattern>
+				<unitPattern count="other">{0} kubieke mijl</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>kubieke yard</displayName>
+				<unitPattern count="one">{0} kubieke yard</unitPattern>
+				<unitPattern count="other">{0} kubieke yard</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>kubieke voet</displayName>
+				<unitPattern count="one">{0} kubieke voet</unitPattern>
+				<unitPattern count="other">{0} kubieke voet</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>kubieke inch</displayName>
+				<unitPattern count="one">{0} kubieke inch</unitPattern>
+				<unitPattern count="other">{0} kubieke inch</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>megaliter</displayName>
+				<unitPattern count="one">{0} megaliter</unitPattern>
+				<unitPattern count="other">{0} megaliter</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hectoliter</displayName>
+				<unitPattern count="one">{0} hectoliter</unitPattern>
+				<unitPattern count="other">{0} hectoliter</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>liter</displayName>
+				<unitPattern count="one">{0} liter</unitPattern>
+				<unitPattern count="other">{0} liter</unitPattern>
+				<perUnitPattern>{0} per liter</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>deciliter</displayName>
+				<unitPattern count="one">{0} deciliter</unitPattern>
+				<unitPattern count="other">{0} deciliter</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centiliter</displayName>
+				<unitPattern count="one">{0} centiliter</unitPattern>
+				<unitPattern count="other">{0} centiliter</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>milliliter</displayName>
+				<unitPattern count="one">{0} milliliter</unitPattern>
+				<unitPattern count="other">{0} milliliter</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>metrische pint</displayName>
+				<unitPattern count="one">{0} metrische pint</unitPattern>
+				<unitPattern count="other">{0} metrische pint</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>metrische cup</displayName>
+				<unitPattern count="one">{0} metrische cup</unitPattern>
+				<unitPattern count="other">{0} metrische cup</unitPattern>
 			</unit>
 			<unit type="volume-acre-foot">
-				<displayName draft="contributed">liter per vierkante meter</displayName>
-				<unitPattern count="one" draft="contributed">{0} liter per vierkante meter</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} liter per vierkante meter</unitPattern>
+				<displayName>acre-feet</displayName>
+				<unitPattern count="one">{0} acre-foot</unitPattern>
+				<unitPattern count="other">{0} acre-feet</unitPattern>
 			</unit>
 			<unit type="volume-bushel">
 				<displayName draft="contributed">bushel</displayName>
 				<unitPattern count="one" draft="contributed">{0} bushel</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} bushels</unitPattern>
 			</unit>
-			<unit type="volume-centiliter">
-				<displayName draft="contributed">centiliter</displayName>
-				<unitPattern count="one" draft="contributed">{0} centiliter</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} centiliter</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName draft="contributed">kubieke centimeter</displayName>
-				<unitPattern count="one" draft="contributed">{0} kubieke centimeter</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kubieke centimeter</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName draft="contributed">kubieke voet</displayName>
-				<unitPattern count="one" draft="contributed">{0} kubieke voet</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kubieke voet</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName draft="contributed">kubieke inch</displayName>
-				<unitPattern count="one" draft="contributed">{0} kubieke inch</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kubieke inch</unitPattern>
-			</unit>
-			<unit type="volume-cubic-kilometer">
-				<displayName draft="contributed">kubieke kilometer</displayName>
-				<unitPattern count="one">{0} kubieke kilometer</unitPattern>
-				<unitPattern count="other">{0} kubieke kilometer</unitPattern>
-			</unit>
-			<unit type="volume-cubic-meter">
-				<displayName draft="contributed">kubieke meter</displayName>
-				<unitPattern count="one" draft="contributed">{0} kubieke meter</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kubieke meter</unitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<displayName draft="contributed">kubieke mijl</displayName>
-				<unitPattern count="one">{0} kubieke mijl</unitPattern>
-				<unitPattern count="other">{0} kubieke mijl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-yard">
-				<displayName draft="contributed">kubieke yard</displayName>
-				<unitPattern count="one" draft="contributed">{0} kubieke yard</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kubieke yard</unitPattern>
-			</unit>
-			<unit type="volume-cup">
-				<displayName draft="contributed">kopje</displayName>
-				<unitPattern count="one" draft="contributed">{0} kopje</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kopjes</unitPattern>
-			</unit>
-			<unit type="volume-deciliter">
-				<displayName draft="contributed">deciliter</displayName>
-				<unitPattern count="one" draft="contributed">{0} deciliter</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} deciliter</unitPattern>
-			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName draft="contributed">fluid ounce</displayName>
-				<unitPattern count="one" draft="contributed">{0} fluid ounce</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fluid ounce</unitPattern>
-			</unit>
 			<unit type="volume-gallon">
-				<displayName draft="contributed">gallon</displayName>
-				<unitPattern count="one" draft="contributed">{0} gallon</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} gallon</unitPattern>
-			</unit>
-			<unit type="volume-hectoliter">
-				<displayName draft="contributed">hectoliter</displayName>
-				<unitPattern count="one" draft="contributed">{0} hectoliter</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} hectoliter</unitPattern>
-			</unit>
-			<unit type="volume-liter">
-				<displayName draft="contributed">liter</displayName>
-				<unitPattern count="one">{0} liter</unitPattern>
-				<unitPattern count="other">{0} liter</unitPattern>
-			</unit>
-			<unit type="volume-megaliter">
-				<displayName draft="contributed">megaliter</displayName>
-				<unitPattern count="one" draft="contributed">{0} megaliter</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} megaliter</unitPattern>
-			</unit>
-			<unit type="volume-milliliter">
-				<displayName draft="contributed">milliliter</displayName>
-				<unitPattern count="one" draft="contributed">{0} milliliter</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} milliliter</unitPattern>
-			</unit>
-			<unit type="volume-pint">
-				<displayName draft="contributed">pint</displayName>
-				<unitPattern count="one" draft="contributed">{0} pint</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pints</unitPattern>
+				<displayName>gallon</displayName>
+				<unitPattern count="one">{0} gallon</unitPattern>
+				<unitPattern count="other">{0} gallon</unitPattern>
+				<perUnitPattern>{0} per gallon</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
-				<displayName draft="contributed">quart</displayName>
-				<unitPattern count="one" draft="contributed">{0} quart</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} quarts</unitPattern>
+				<displayName>quart</displayName>
+				<unitPattern count="one">{0} quart</unitPattern>
+				<unitPattern count="other">{0} quart</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>pint</displayName>
+				<unitPattern count="one">{0} pint</unitPattern>
+				<unitPattern count="other">{0} pint</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cup</displayName>
+				<unitPattern count="one">{0} cup</unitPattern>
+				<unitPattern count="other">{0} cup</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fluid ounce</displayName>
+				<unitPattern count="one">{0} fluid ounce</unitPattern>
+				<unitPattern count="other">{0} fluid ounce</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
-				<displayName draft="contributed">eetlepel</displayName>
-				<unitPattern count="one" draft="contributed">{0} eetlepel</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} eetlepels</unitPattern>
+				<displayName>eetlepel</displayName>
+				<unitPattern count="one">{0} eetlepel</unitPattern>
+				<unitPattern count="other">{0} eetlepels</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
-				<displayName draft="contributed">theelepel</displayName>
-				<unitPattern count="one" draft="contributed">{0} theelepel</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} theelepels</unitPattern>
+				<displayName>theelepel</displayName>
+				<unitPattern count="one">{0} theelepel</unitPattern>
+				<unitPattern count="other">{0} theelepels</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} OL</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} NB</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} ZB</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} WL</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
-				<displayName draft="contributed">G</displayName>
+				<displayName>G</displayName>
 				<unitPattern count="one">{0} G</unitPattern>
 				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
-				<displayName draft="contributed">m/s²</displayName>
-				<unitPattern count="one" draft="contributed">{0} m/s²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} m/s²</unitPattern>
+				<displayName>m/s²</displayName>
+				<unitPattern count="one">{0} m/s²</unitPattern>
+				<unitPattern count="other">{0} m/s²</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>tr</displayName>
+				<unitPattern count="one">{0} tr</unitPattern>
+				<unitPattern count="other">{0} tr</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="angle-arc-minute">
-				<displayName draft="contributed">′</displayName>
+				<displayName>′</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
 			</unit>
 			<unit type="angle-arc-second">
-				<displayName draft="contributed">″</displayName>
+				<displayName>″</displayName>
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName draft="contributed">°</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName draft="contributed">rad</displayName>
-				<unitPattern count="one" draft="contributed">{0} rad</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="contributed">acre</displayName>
-				<unitPattern count="one">{0} acre</unitPattern>
-				<unitPattern count="other">{0} acres</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
-				<displayName draft="contributed">ha</displayName>
+				<displayName>ha</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0} per m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
-				<displayName draft="contributed">cm²</displayName>
-				<unitPattern count="one" draft="contributed">{0} cm²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cm²</unitPattern>
+				<displayName>cm²</displayName>
+				<unitPattern count="one">{0} cm²</unitPattern>
+				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0} per cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acre</displayName>
+				<unitPattern count="one">{0} acre</unitPattern>
+				<unitPattern count="other">{0} acres</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
-				<displayName draft="contributed">ft²</displayName>
+				<displayName>ft²</displayName>
 				<unitPattern count="one">{0} ft²</unitPattern>
 				<unitPattern count="other">{0} ft²</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
-				<displayName draft="contributed">in²</displayName>
-				<unitPattern count="one" draft="contributed">{0} in²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} in²</unitPattern>
+				<displayName>in²</displayName>
+				<unitPattern count="one">{0} in²</unitPattern>
+				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0} per in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="contributed">km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName draft="contributed">m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName draft="contributed">mi²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName draft="contributed">yd²</displayName>
-				<unitPattern count="one" draft="contributed">{0} yd²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>K</displayName>
+				<unitPattern count="one">{0} K</unitPattern>
+				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName draft="contributed">l/km</displayName>
-				<unitPattern count="one" draft="contributed">{0} l/km</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} l/km</unitPattern>
+				<displayName>l/km</displayName>
+				<unitPattern count="one">{0} l/km</unitPattern>
+				<unitPattern count="other">{0} l/km</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100km</displayName>
+				<unitPattern count="one">{0} l/100km</unitPattern>
+				<unitPattern count="other">{0} l/100km</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
-				<displayName draft="contributed">mpg</displayName>
-				<unitPattern count="one" draft="contributed">{0} mpg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mpg</unitPattern>
-			</unit>
-			<unit type="digital-bit">
-				<displayName draft="contributed">bit</displayName>
-				<unitPattern count="one" draft="contributed">{0} bit</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} bits</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName draft="contributed">byte</displayName>
-				<unitPattern count="one" draft="contributed">{0} byte</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName draft="contributed">Gb</displayName>
-				<unitPattern count="one" draft="contributed">{0} Gb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName draft="contributed">GB</displayName>
-				<unitPattern count="one" draft="contributed">{0} GB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName draft="contributed">kb</displayName>
-				<unitPattern count="one" draft="contributed">{0} kb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName draft="contributed">kB</displayName>
-				<unitPattern count="one" draft="contributed">{0} kB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName draft="contributed">Mb</displayName>
-				<unitPattern count="one" draft="contributed">{0} Mb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName draft="contributed">MB</displayName>
-				<unitPattern count="one" draft="contributed">{0} MB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName draft="contributed">Tb</displayName>
-				<unitPattern count="one" draft="contributed">{0} Tb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Tb</unitPattern>
+				<displayName>mpg</displayName>
+				<unitPattern count="one">{0} mpg</unitPattern>
+				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
-				<displayName draft="contributed">TB</displayName>
-				<unitPattern count="one" draft="contributed">{0} TB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} TB</unitPattern>
+				<displayName>TB</displayName>
+				<unitPattern count="one">{0} TB</unitPattern>
+				<unitPattern count="other">{0} TB</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bits</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>eeuwen</displayName>
+				<unitPattern count="one">{0} eeuw</unitPattern>
+				<unitPattern count="other">{0} eeuwen</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>jr</displayName>
+				<unitPattern count="one">{0} jr</unitPattern>
+				<unitPattern count="other">{0} jr</unitPattern>
+				<perUnitPattern>{0}/jr</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mnd</displayName>
+				<unitPattern count="one">{0} mnd</unitPattern>
+				<unitPattern count="other">{0} mnd</unitPattern>
+				<perUnitPattern>{0}/mnd</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>wk</displayName>
+				<unitPattern count="one">{0} wk</unitPattern>
+				<unitPattern count="other">{0} wkn</unitPattern>
+				<perUnitPattern>{0}/wk</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
-				<displayName draft="contributed">dagen</displayName>
+				<displayName>dagen</displayName>
 				<unitPattern count="one">{0} dag</unitPattern>
 				<unitPattern count="other">{0} dagen</unitPattern>
+				<perUnitPattern>{0}/dag</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName draft="contributed">uur</displayName>
+				<displayName>uur</displayName>
 				<unitPattern count="one">{0} uur</unitPattern>
 				<unitPattern count="other">{0} uur</unitPattern>
-				<perUnitPattern draft="contributed">{0}/uur</perUnitPattern>
+				<perUnitPattern>{0}/uur</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName draft="contributed">μs</displayName>
-				<unitPattern count="one" draft="contributed">{0} μs</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} μs</unitPattern>
+			<unit type="duration-minute">
+				<displayName>min</displayName>
+				<unitPattern count="one">{0} min</unitPattern>
+				<unitPattern count="other">{0} min</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>sec</displayName>
+				<unitPattern count="one">{0} sec</unitPattern>
+				<unitPattern count="other">{0} sec</unitPattern>
+				<perUnitPattern>{0} sec</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
-				<displayName draft="contributed">ms</displayName>
+				<displayName>ms</displayName>
 				<unitPattern count="one">{0} ms</unitPattern>
 				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName draft="contributed">min</displayName>
-				<unitPattern count="one">{0} min</unitPattern>
-				<unitPattern count="other">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">mnd</displayName>
-				<unitPattern count="one">{0} mnd</unitPattern>
-				<unitPattern count="other">{0} mnd</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
-				<displayName draft="contributed">ns</displayName>
-				<unitPattern count="one" draft="contributed">{0} ns</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ns</unitPattern>
-			</unit>
-			<unit type="duration-second">
-				<displayName draft="contributed">sec</displayName>
-				<unitPattern count="one">{0} sec</unitPattern>
-				<unitPattern count="other">{0} sec</unitPattern>
-				<perUnitPattern draft="contributed">{0} sec</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">wk</displayName>
-				<unitPattern count="one">{0} wk</unitPattern>
-				<unitPattern count="other">{0} wkn</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">jr</displayName>
-				<unitPattern count="one">{0} jr</unitPattern>
-				<unitPattern count="other">{0} jr</unitPattern>
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
-				<displayName draft="contributed">A</displayName>
-				<unitPattern count="one" draft="contributed">{0} A</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} A</unitPattern>
+				<displayName>A</displayName>
+				<unitPattern count="one">{0} A</unitPattern>
+				<unitPattern count="other">{0} A</unitPattern>
 			</unit>
 			<unit type="electric-milliampere">
-				<displayName draft="contributed">mA</displayName>
-				<unitPattern count="one" draft="contributed">{0} mA</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mA</unitPattern>
+				<displayName>mA</displayName>
+				<unitPattern count="one">{0} mA</unitPattern>
+				<unitPattern count="other">{0} mA</unitPattern>
 			</unit>
 			<unit type="electric-ohm">
-				<displayName draft="contributed">Ω</displayName>
-				<unitPattern count="one" draft="contributed">{0} Ω</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Ω</unitPattern>
+				<displayName>Ω</displayName>
+				<unitPattern count="one">{0} Ω</unitPattern>
+				<unitPattern count="other">{0} Ω</unitPattern>
 			</unit>
 			<unit type="electric-volt">
-				<displayName draft="contributed">V</displayName>
-				<unitPattern count="one" draft="contributed">{0} V</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} V</unitPattern>
-			</unit>
-			<unit type="energy-calorie">
-				<displayName draft="contributed">cal</displayName>
-				<unitPattern count="one" draft="contributed">{0} cal</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cal</unitPattern>
-			</unit>
-			<unit type="energy-foodcalorie">
-				<displayName draft="contributed">kcal</displayName>
-				<unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
-			</unit>
-			<unit type="energy-joule">
-				<displayName draft="contributed">J</displayName>
-				<unitPattern count="one" draft="contributed">{0} J</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} J</unitPattern>
+				<displayName>V</displayName>
+				<unitPattern count="one">{0} V</unitPattern>
+				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
 			<unit type="energy-kilocalorie">
-				<displayName draft="contributed">kcal</displayName>
-				<unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>cal</displayName>
+				<unitPattern count="one">{0} cal</unitPattern>
+				<unitPattern count="other">{0} cal</unitPattern>
+			</unit>
+			<unit type="energy-foodcalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
 			</unit>
 			<unit type="energy-kilojoule">
-				<displayName draft="contributed">kJ</displayName>
-				<unitPattern count="one" draft="contributed">{0} kJ</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kJ</unitPattern>
+				<displayName>kJ</displayName>
+				<unitPattern count="one">{0} kJ</unitPattern>
+				<unitPattern count="other">{0} kJ</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
 			</unit>
 			<unit type="energy-kilowatt-hour">
-				<displayName draft="contributed">kWh</displayName>
-				<unitPattern count="one" draft="contributed">{0} kWh</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kWh</unitPattern>
+				<displayName>kWh</displayName>
+				<unitPattern count="one">{0} kWh</unitPattern>
+				<unitPattern count="other">{0} kWh</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
-				<displayName draft="contributed">GHz</displayName>
-				<unitPattern count="one" draft="contributed">{0} GHz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} GHz</unitPattern>
-			</unit>
-			<unit type="frequency-hertz">
-				<displayName draft="contributed">Hz</displayName>
-				<unitPattern count="one" draft="contributed">{0} Hz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Hz</unitPattern>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<displayName draft="contributed">kHz</displayName>
-				<unitPattern count="one" draft="contributed">{0} kHz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kHz</unitPattern>
+				<displayName>GHz</displayName>
+				<unitPattern count="one">{0} GHz</unitPattern>
+				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
 			<unit type="frequency-megahertz">
-				<displayName draft="contributed">MHz</displayName>
-				<unitPattern count="one" draft="contributed">{0} MHz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MHz</unitPattern>
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName draft="contributed">AE</displayName>
-				<unitPattern count="one" draft="contributed">{0} AE</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} AE</unitPattern>
+			<unit type="frequency-kilohertz">
+				<displayName>kHz</displayName>
+				<unitPattern count="one">{0} kHz</unitPattern>
+				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
-				<displayName draft="contributed">dm</displayName>
-				<unitPattern count="one" draft="contributed">{0} dm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} dm</unitPattern>
+				<displayName>dm</displayName>
+				<unitPattern count="one">{0} dm</unitPattern>
+				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName draft="contributed">fm</displayName>
-				<unitPattern count="one" draft="contributed">{0} fm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fm</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>mm</displayName>
+				<unitPattern count="one">{0} mm</unitPattern>
+				<unitPattern count="other">{0} mm</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nm</displayName>
+				<unitPattern count="one">{0} nm</unitPattern>
+				<unitPattern count="other">{0} nm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>pm</displayName>
+				<unitPattern count="one">{0} pm</unitPattern>
+				<unitPattern count="other">{0} pm</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>yards</displayName>
+				<unitPattern count="one">{0} yd</unitPattern>
+				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
 			<unit type="length-foot">
-				<displayName draft="contributed">ft</displayName>
+				<displayName>ft</displayName>
 				<unitPattern count="one">{0} ft</unitPattern>
 				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>inches</displayName>
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>lj</displayName>
+				<unitPattern count="one">{0} lj</unitPattern>
+				<unitPattern count="other">{0} lj</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>AE</displayName>
+				<unitPattern count="one">{0} AE</unitPattern>
+				<unitPattern count="other">{0} AE</unitPattern>
 			</unit>
 			<unit type="length-furlong">
 				<displayName draft="contributed">fur</displayName>
 				<unitPattern count="one" draft="contributed">{0} fur</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} fur</unitPattern>
 			</unit>
-			<unit type="length-inch">
-				<displayName draft="contributed">inches</displayName>
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName draft="contributed">km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName draft="contributed">lj</displayName>
-				<unitPattern count="one">{0} lj</unitPattern>
-				<unitPattern count="other">{0} lj</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName draft="contributed">m</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName draft="contributed">µm</displayName>
-				<unitPattern count="one" draft="contributed">{0} µm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName draft="contributed">mi</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName draft="contributed">mm</displayName>
-				<unitPattern count="one">{0} mm</unitPattern>
-				<unitPattern count="other">{0} mm</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<displayName draft="contributed">nm</displayName>
-				<unitPattern count="one" draft="contributed">{0} nm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} nm</unitPattern>
+			<unit type="length-fathom">
+				<displayName draft="contributed">fm</displayName>
+				<unitPattern count="one" draft="contributed">{0} fm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fm</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
-				<displayName draft="contributed">nmi</displayName>
-				<unitPattern count="one" draft="contributed">{0} nmi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} nmi</unitPattern>
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<displayName draft="contributed">pc</displayName>
-				<unitPattern count="one" draft="contributed">{0} pc</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pc</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName draft="contributed">pm</displayName>
-				<unitPattern count="one">{0} pm</unitPattern>
-				<unitPattern count="other">{0} pm</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<displayName draft="contributed">yards</displayName>
-				<unitPattern count="one">{0} yd</unitPattern>
-				<unitPattern count="other">{0} yd</unitPattern>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
 			</unit>
 			<unit type="light-lux">
-				<displayName draft="contributed">lx</displayName>
-				<unitPattern count="one" draft="contributed">{0} lx</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} lx</unitPattern>
-			</unit>
-			<unit type="mass-carat">
-				<displayName draft="contributed">CD</displayName>
-				<unitPattern count="one" draft="contributed">{0} CD</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName draft="contributed">g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName draft="contributed">kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
+				<displayName>lx</displayName>
+				<unitPattern count="one">{0} lx</unitPattern>
+				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
 			<unit type="mass-metric-ton">
-				<displayName draft="contributed">t</displayName>
-				<unitPattern count="one" draft="contributed">{0} t</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} t</unitPattern>
+				<displayName>t</displayName>
+				<unitPattern count="one">{0} t</unitPattern>
+				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName draft="contributed">µg</displayName>
-				<unitPattern count="one" draft="contributed">{0} µg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
-				<displayName draft="contributed">mg</displayName>
-				<unitPattern count="one" draft="contributed">{0} mg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mg</unitPattern>
+				<displayName>mg</displayName>
+				<unitPattern count="one">{0} mg</unitPattern>
+				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="contributed">oz</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName draft="contributed">oz t</displayName>
-				<unitPattern count="one" draft="contributed">{0} oz t</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName draft="contributed">lb</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
+			<unit type="mass-ton">
+				<displayName>ton</displayName>
+				<unitPattern count="one">{0} ton</unitPattern>
+				<unitPattern count="other">{0} ton</unitPattern>
 			</unit>
 			<unit type="mass-stone">
 				<displayName draft="contributed">st</displayName>
 				<unitPattern count="one" draft="contributed">{0} st</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} st</unitPattern>
 			</unit>
-			<unit type="mass-ton">
-				<displayName draft="contributed">ton</displayName>
-				<unitPattern count="one" draft="contributed">{0} ton</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ton</unitPattern>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
 			</unit>
-			<unit type="power-gigawatt">
-				<displayName draft="contributed">GW</displayName>
-				<unitPattern count="one" draft="contributed">{0} GW</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} GW</unitPattern>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="contributed">pk</displayName>
-				<unitPattern count="one">{0} pk</unitPattern>
-				<unitPattern count="other">{0} pk</unitPattern>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
 			</unit>
-			<unit type="power-kilowatt">
-				<displayName draft="contributed">kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
-			<unit type="power-megawatt">
-				<displayName draft="contributed">MW</displayName>
-				<unitPattern count="one" draft="contributed">{0} MW</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MW</unitPattern>
-			</unit>
-			<unit type="power-milliwatt">
-				<displayName draft="contributed">mW</displayName>
-				<unitPattern count="one" draft="contributed">{0} mW</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mW</unitPattern>
-			</unit>
-			<unit type="power-watt">
-				<displayName draft="contributed">W</displayName>
-				<unitPattern count="one">{0} W</unitPattern>
-				<unitPattern count="other">{0} W</unitPattern>
-			</unit>
-			<unit type="pressure-hectopascal">
-				<displayName draft="contributed">hPa</displayName>
-				<unitPattern count="one">{0} hPa</unitPattern>
-				<unitPattern count="other">{0} hPa</unitPattern>
-			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName draft="contributed">inHg</displayName>
-				<unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName draft="contributed">mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<displayName draft="contributed">mmHg</displayName>
-				<unitPattern count="one" draft="contributed">{0} mmHg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mmHg</unitPattern>
-			</unit>
-			<unit type="pressure-pound-per-square-inch">
-				<displayName draft="contributed">psi</displayName>
-				<unitPattern count="one" draft="contributed">{0} psi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} psi</unitPattern>
-			</unit>
-			<unit type="proportion-karat">
+			<unit type="mass-carat">
 				<displayName>CD</displayName>
 				<unitPattern count="one">{0} CD</unitPattern>
 				<unitPattern count="other">{0} CD</unitPattern>
 			</unit>
+			<unit type="power-gigawatt">
+				<displayName>GW</displayName>
+				<unitPattern count="one">{0} GW</unitPattern>
+				<unitPattern count="other">{0} GW</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>MW</displayName>
+				<unitPattern count="one">{0} MW</unitPattern>
+				<unitPattern count="other">{0} MW</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>W</displayName>
+				<unitPattern count="one">{0} W</unitPattern>
+				<unitPattern count="other">{0} W</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>pk</displayName>
+				<unitPattern count="one">{0} pk</unitPattern>
+				<unitPattern count="other">{0} pk</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<displayName>hPa</displayName>
+				<unitPattern count="one">{0} hPa</unitPattern>
+				<unitPattern count="other">{0} hPa</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>mmHg</displayName>
+				<unitPattern count="one">{0} mmHg</unitPattern>
+				<unitPattern count="other">{0} mmHg</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>psi</displayName>
+				<unitPattern count="one">{0} psi</unitPattern>
+				<unitPattern count="other">{0} psi</unitPattern>
+			</unit>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
+			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName draft="contributed">km/h</displayName>
+				<displayName>km/h</displayName>
 				<unitPattern count="one">{0} km/h</unitPattern>
 				<unitPattern count="other">{0} km/h</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
-				<displayName draft="contributed">m/s</displayName>
+				<displayName>m/s</displayName>
 				<unitPattern count="one">{0} m/s</unitPattern>
 				<unitPattern count="other">{0} m/s</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<displayName draft="contributed">mi/h</displayName>
+				<displayName>mi/h</displayName>
 				<unitPattern count="one">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kt</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
-				<displayName draft="contributed">°C</displayName>
+				<displayName>°C</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
 				<unitPattern count="other">{0}°C</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
-				<displayName draft="contributed">°F</displayName>
+				<displayName>°F</displayName>
 				<unitPattern count="one">{0}°F</unitPattern>
 				<unitPattern count="other">{0}°F</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
 				<displayName>K</displayName>
-				<unitPattern count="one" draft="contributed">{0} K</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} K</unitPattern>
+				<unitPattern count="one">{0} K</unitPattern>
+				<unitPattern count="other">{0} K</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>km³</displayName>
+				<unitPattern count="one">{0} km³</unitPattern>
+				<unitPattern count="other">{0} km³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>m³</displayName>
+				<unitPattern count="one">{0} m³</unitPattern>
+				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>mi³</displayName>
+				<unitPattern count="one">{0} mi³</unitPattern>
+				<unitPattern count="other">{0} mi³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>yd³</displayName>
+				<unitPattern count="one">{0} yd³</unitPattern>
+				<unitPattern count="other">{0} yd³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hl</displayName>
+				<unitPattern count="one">{0} hl</unitPattern>
+				<unitPattern count="other">{0} hl</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>l</displayName>
+				<unitPattern count="one">{0} l</unitPattern>
+				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>ml</displayName>
+				<unitPattern count="one">{0} ml</unitPattern>
+				<unitPattern count="other">{0} ml</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>metrische cup</displayName>
+				<unitPattern count="one">{0} metrische cup</unitPattern>
+				<unitPattern count="other">{0} metrische cup</unitPattern>
 			</unit>
 			<unit type="volume-acre-foot">
-				<displayName draft="contributed">l/m²</displayName>
-				<unitPattern count="one" draft="contributed">{0} l/m²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} l/m²</unitPattern>
+				<displayName>acre ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
 			</unit>
 			<unit type="volume-bushel">
 				<displayName draft="contributed">bu</displayName>
 				<unitPattern count="one" draft="contributed">{0} bu</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} bu</unitPattern>
 			</unit>
-			<unit type="volume-centiliter">
-				<displayName draft="contributed">cl</displayName>
-				<unitPattern count="one" draft="contributed">{0} cl</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName draft="contributed">cm³</displayName>
-				<unitPattern count="one" draft="contributed">{0} cm³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName draft="contributed">ft³</displayName>
-				<unitPattern count="one" draft="contributed">{0} ft³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName draft="contributed">in³</displayName>
-				<unitPattern count="one" draft="contributed">{0} in³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} in³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-kilometer">
-				<displayName draft="contributed">km³</displayName>
-				<unitPattern count="one">{0} km³</unitPattern>
-				<unitPattern count="other">{0} km³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-meter">
-				<displayName draft="contributed">m³</displayName>
-				<unitPattern count="one" draft="contributed">{0} m³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} m³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<displayName draft="contributed">mi³</displayName>
-				<unitPattern count="one">{0} mi³</unitPattern>
-				<unitPattern count="other">{0} mi³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-yard">
-				<displayName draft="contributed">yd³</displayName>
-				<unitPattern count="one" draft="contributed">{0} yd³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} yd³</unitPattern>
-			</unit>
-			<unit type="volume-cup">
-				<displayName draft="contributed">c</displayName>
-				<unitPattern count="one" draft="contributed">{0} c</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} c</unitPattern>
-			</unit>
-			<unit type="volume-deciliter">
-				<displayName draft="contributed">dl</displayName>
-				<unitPattern count="one" draft="contributed">{0} dl</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} dl</unitPattern>
-			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName draft="contributed">fl oz</displayName>
-				<unitPattern count="one" draft="contributed">{0} fl oz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fl oz</unitPattern>
-			</unit>
 			<unit type="volume-gallon">
-				<displayName draft="contributed">gal</displayName>
-				<unitPattern count="one" draft="contributed">{0} gal</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} gal</unitPattern>
-			</unit>
-			<unit type="volume-hectoliter">
-				<displayName draft="contributed">hl</displayName>
-				<unitPattern count="one" draft="contributed">{0} hl</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} hl</unitPattern>
-			</unit>
-			<unit type="volume-liter">
-				<displayName draft="contributed">l</displayName>
-				<unitPattern count="one">{0} l</unitPattern>
-				<unitPattern count="other">{0} l</unitPattern>
-			</unit>
-			<unit type="volume-megaliter">
-				<displayName draft="contributed">ML</displayName>
-				<unitPattern count="one" draft="contributed">{0} ML</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ML</unitPattern>
-			</unit>
-			<unit type="volume-milliliter">
-				<displayName draft="contributed">ml</displayName>
-				<unitPattern count="one" draft="contributed">{0} ml</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ml</unitPattern>
-			</unit>
-			<unit type="volume-pint">
-				<displayName draft="contributed">pt</displayName>
-				<unitPattern count="one" draft="contributed">{0} pt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pt</unitPattern>
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
-				<displayName draft="contributed">qt</displayName>
-				<unitPattern count="one" draft="contributed">{0} qt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} qt</unitPattern>
+				<displayName>qt</displayName>
+				<unitPattern count="one">{0} qt</unitPattern>
+				<unitPattern count="other">{0} qt</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cup</displayName>
+				<unitPattern count="one">{0} cup</unitPattern>
+				<unitPattern count="other">{0} cup</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
-				<displayName draft="contributed">tbsp</displayName>
-				<unitPattern count="one" draft="contributed">{0} tbsp</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} tbsp</unitPattern>
+				<displayName>el</displayName>
+				<unitPattern count="one">{0} el</unitPattern>
+				<unitPattern count="other">{0} el</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
-				<displayName draft="contributed">tsp</displayName>
-				<unitPattern count="one" draft="contributed">{0} tsp</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} tsp</unitPattern>
+				<displayName>tl</displayName>
+				<unitPattern count="one">{0} tl</unitPattern>
+				<unitPattern count="other">{0} tl</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} OL</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} NB</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} ZB</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} WL</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<unitPattern count="one">{0} G</unitPattern>
@@ -9461,6 +9822,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} m/s²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName draft="contributed">tr</displayName>
+				<unitPattern count="one" draft="contributed">{0} t</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} t</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<unitPattern count="one" draft="contributed">{0} rad</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -9469,26 +9843,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<unitPattern count="one" draft="contributed">{0} rad</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} acre</unitPattern>
-				<unitPattern count="other">{0} acres</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<unitPattern count="one" draft="contributed">{0} cm²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} cm²</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} acre</unitPattern>
+				<unitPattern count="other">{0} acres</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<unitPattern count="one" draft="contributed">{0} yd²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} yd²</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<unitPattern count="one">{0} ft²</unitPattern>
 				<unitPattern count="other">{0} ft²</unitPattern>
@@ -9497,118 +9879,111 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} in²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} in²</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<unitPattern count="one" draft="contributed">{0} yd²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<unitPattern count="one" draft="contributed">{0} K</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} K</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="one" draft="contributed">{0} l/km</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100km</displayName>
+				<unitPattern count="one">{0} l/100km</unitPattern>
+				<unitPattern count="other">{0} l/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<unitPattern count="one" draft="contributed">{0} mpg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<unitPattern count="one" draft="contributed">{0} bit</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} bits</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<unitPattern count="one" draft="contributed">{0} byte</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<unitPattern count="one" draft="contributed">{0} Gb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<unitPattern count="one" draft="contributed">{0} GB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<unitPattern count="one" draft="contributed">{0} kb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<unitPattern count="one" draft="contributed">{0} kB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<unitPattern count="one" draft="contributed">{0} Mb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<unitPattern count="one" draft="contributed">{0} MB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<unitPattern count="one" draft="contributed">{0} Tb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<unitPattern count="one" draft="contributed">{0} TB</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<unitPattern count="one" draft="contributed">{0} Tb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<unitPattern count="one" draft="contributed">{0} GB</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<unitPattern count="one" draft="contributed">{0} Gb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<unitPattern count="one" draft="contributed">{0} MB</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<unitPattern count="one" draft="contributed">{0} Mb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<unitPattern count="one" draft="contributed">{0} kB</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<unitPattern count="one" draft="contributed">{0} kb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<unitPattern count="one" draft="contributed">{0} byte</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<unitPattern count="one" draft="contributed">{0} bit</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} bits</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>jr</displayName>
+				<unitPattern count="one">{0} jr</unitPattern>
+				<unitPattern count="other">{0} jr</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>w</displayName>
+				<unitPattern count="one">{0} w</unitPattern>
+				<unitPattern count="other">{0} w</unitPattern>
+			</unit>
 			<unit type="duration-day">
-				<displayName draft="contributed">d</displayName>
+				<displayName>d</displayName>
 				<unitPattern count="one">{0} d</unitPattern>
 				<unitPattern count="other">{0} d</unitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName draft="contributed">u</displayName>
+				<displayName>u</displayName>
 				<unitPattern count="one">{0} u</unitPattern>
 				<unitPattern count="other">{0} u</unitPattern>
 			</unit>
+			<unit type="duration-minute">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>s</displayName>
+				<unitPattern count="one">{0} s</unitPattern>
+				<unitPattern count="other">{0} s</unitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
+			</unit>
 			<unit type="duration-microsecond">
 				<unitPattern count="one" draft="contributed">{0} μs</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} μs</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="contributed">ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
-			<unit type="duration-minute">
-				<displayName draft="contributed">m</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">m</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
 			<unit type="duration-nanosecond">
 				<unitPattern count="one" draft="contributed">{0} ns</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ns</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName draft="contributed">s</displayName>
-				<unitPattern count="one">{0} s</unitPattern>
-				<unitPattern count="other">{0} s</unitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">w</displayName>
-				<unitPattern count="one">{0} w</unitPattern>
-				<unitPattern count="other">{0} w</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">jr</displayName>
-				<unitPattern count="one">{0} jr</unitPattern>
-				<unitPattern count="other">{0} jr</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<unitPattern count="one" draft="contributed">{0} A</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} A</unitPattern>
@@ -9625,6 +10000,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} V</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<unitPattern count="one" draft="contributed">{0} cal</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} cal</unitPattern>
@@ -9633,18 +10012,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<unitPattern count="one" draft="contributed">{0} J</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<unitPattern count="one" draft="contributed">{0} kJ</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<unitPattern count="one" draft="contributed">{0} J</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<unitPattern count="one" draft="contributed">{0} kWh</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kWh</unitPattern>
@@ -9653,126 +10028,135 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} GHz</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<unitPattern count="one" draft="contributed">{0} Hz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<unitPattern count="one" draft="contributed">{0} MHz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<unitPattern count="one" draft="contributed">{0} kHz</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<unitPattern count="one" draft="contributed">{0} MHz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<unitPattern count="one" draft="contributed">{0} Hz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<unitPattern count="one" draft="contributed">{0} AE</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} AE</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<unitPattern count="one" draft="contributed">{0} dm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName draft="contributed">fm</displayName>
-				<unitPattern count="one" draft="contributed">{0} fm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fm</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>mm</displayName>
+				<unitPattern count="one">{0} mm</unitPattern>
+				<unitPattern count="other">{0} mm</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<unitPattern count="one" draft="contributed">{0} µm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} µm</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<unitPattern count="one" draft="contributed">{0} nm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} nm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<unitPattern count="one">{0} pm</unitPattern>
+				<unitPattern count="other">{0} pm</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<unitPattern count="one">{0} yd</unitPattern>
+				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
 			<unit type="length-foot">
 				<unitPattern count="one">{0} ft</unitPattern>
 				<unitPattern count="other">{0} ft</unitPattern>
 			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0}&quot;</unitPattern>
+				<unitPattern count="other">{0}&quot;</unitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<unitPattern count="one" draft="contributed">{0} pc</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} lj</unitPattern>
+				<unitPattern count="other">{0} lj</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<unitPattern count="one" draft="contributed">{0} AE</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} AE</unitPattern>
+			</unit>
 			<unit type="length-furlong">
 				<displayName draft="contributed">fur</displayName>
 				<unitPattern count="one" draft="contributed">{0} fur</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} fur</unitPattern>
 			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0}&quot;</unitPattern>
-				<unitPattern count="other">{0}&quot;</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName draft="contributed">km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} lj</unitPattern>
-				<unitPattern count="other">{0} lj</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName draft="contributed">m</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<unitPattern count="one" draft="contributed">{0} µm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName draft="contributed">mm</displayName>
-				<unitPattern count="one">{0} mm</unitPattern>
-				<unitPattern count="other">{0} mm</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<unitPattern count="one" draft="contributed">{0} nm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} nm</unitPattern>
+			<unit type="length-fathom">
+				<displayName draft="contributed">fm</displayName>
+				<unitPattern count="one" draft="contributed">{0} fm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fm</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
 				<unitPattern count="one" draft="contributed">{0} nmi</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} nmi</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<unitPattern count="one" draft="contributed">{0} pc</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pc</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<unitPattern count="one">{0} pm</unitPattern>
-				<unitPattern count="other">{0} pm</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<unitPattern count="one">{0} yd</unitPattern>
-				<unitPattern count="other">{0} yd</unitPattern>
-			</unit>
 			<unit type="light-lux">
 				<unitPattern count="one" draft="contributed">{0} lx</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<unitPattern count="one" draft="contributed">{0} CD</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName draft="contributed">g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName draft="contributed">kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<unitPattern count="one" draft="contributed">{0} t</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<unitPattern count="one" draft="contributed">{0} µg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<unitPattern count="one" draft="contributed">{0} mg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mg</unitPattern>
 			</unit>
+			<unit type="mass-microgram">
+				<unitPattern count="one" draft="contributed">{0} µg</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} µg</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<unitPattern count="one" draft="contributed">{0} ton</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ton</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName draft="contributed">st</displayName>
+				<unitPattern count="one" draft="contributed">{0} st</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+			</unit>
 			<unit type="mass-ounce">
 				<unitPattern count="one">{0} oz</unitPattern>
 				<unitPattern count="other">{0} oz</unitPattern>
@@ -9781,55 +10165,38 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} oz t</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} oz t</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="contributed">st</displayName>
-				<unitPattern count="one" draft="contributed">{0} st</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} st</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<unitPattern count="one" draft="contributed">{0} ton</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ton</unitPattern>
+			<unit type="mass-carat">
+				<unitPattern count="one" draft="contributed">{0} CD</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} CD</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<unitPattern count="one" draft="contributed">{0} GW</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} pk</unitPattern>
-				<unitPattern count="other">{0} pk</unitPattern>
+			<unit type="power-megawatt">
+				<unitPattern count="one" draft="contributed">{0} MW</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} MW</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} kW</unitPattern>
 				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<unitPattern count="one" draft="contributed">{0} MW</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MW</unitPattern>
+			<unit type="power-watt">
+				<unitPattern count="one">{0} W</unitPattern>
+				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<unitPattern count="one" draft="contributed">{0} mW</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mW</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<unitPattern count="one">{0} W</unitPattern>
-				<unitPattern count="other">{0} W</unitPattern>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} pk</unitPattern>
+				<unitPattern count="other">{0} pk</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<unitPattern count="one" draft="contributed">{0} mmHg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mmHg</unitPattern>
@@ -9838,12 +10205,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} psi</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<unitPattern count="one" draft="contributed">{0} K</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} K</unitPattern>
+			<unit type="pressure-inch-hg">
+				<unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName draft="contributed">km/h</displayName>
+				<displayName>km/h</displayName>
 				<unitPattern count="one">{0} km/h</unitPattern>
 				<unitPattern count="other">{0} km/h</unitPattern>
 			</unit>
@@ -9855,8 +10226,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
-			<unit type="temperature-celsius">
+			<unit type="temperature-generic">
 				<displayName draft="contributed">°</displayName>
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>°</displayName>
 				<unitPattern count="one">{0}°</unitPattern>
 				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
@@ -9868,31 +10244,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} K</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<unitPattern count="one" draft="contributed">{0} l/m²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} l/m²</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName draft="contributed">bu</displayName>
-				<unitPattern count="one" draft="contributed">{0} bu</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} bu</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<unitPattern count="one" draft="contributed">{0} cl</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<unitPattern count="one" draft="contributed">{0} cm³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<unitPattern count="one" draft="contributed">{0} ft³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<unitPattern count="one" draft="contributed">{0} in³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<unitPattern count="one">{0} km³</unitPattern>
 				<unitPattern count="other">{0} km³</unitPattern>
@@ -9901,6 +10252,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} m³</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} m³</unitPattern>
 			</unit>
+			<unit type="volume-cubic-centimeter">
+				<unitPattern count="one" draft="contributed">{0} cm³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cm³</unitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<unitPattern count="one">{0} mi³</unitPattern>
 				<unitPattern count="other">{0} mi³</unitPattern>
@@ -9909,47 +10264,68 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} yd³</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<unitPattern count="one" draft="contributed">{0} c</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<unitPattern count="one" draft="contributed">{0} ft³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<unitPattern count="one" draft="contributed">{0} dl</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<unitPattern count="one" draft="contributed">{0} in³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<unitPattern count="one" draft="contributed">{0} fl oz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<unitPattern count="one" draft="contributed">{0} gal</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<unitPattern count="one" draft="contributed">{0} ML</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<unitPattern count="one" draft="contributed">{0} hl</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} hl</unitPattern>
 			</unit>
 			<unit type="volume-liter">
-				<displayName draft="contributed">l</displayName>
+				<displayName>l</displayName>
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<unitPattern count="one" draft="contributed">{0} ML</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<unitPattern count="one" draft="contributed">{0} dl</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<unitPattern count="one" draft="contributed">{0} cl</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<unitPattern count="one" draft="contributed">{0} ml</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<unitPattern count="one" draft="contributed">{0} pt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pt</unitPattern>
+			<unit type="volume-acre-foot">
+				<unitPattern count="one" draft="contributed">{0} l/m²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} l/m²</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName draft="contributed">bu</displayName>
+				<unitPattern count="one" draft="contributed">{0} bu</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} bu</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<unitPattern count="one" draft="contributed">{0} gal</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} gal</unitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<unitPattern count="one" draft="contributed">{0} qt</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<unitPattern count="one" draft="contributed">{0} pt</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<unitPattern count="one" draft="contributed">{0} c</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<unitPattern count="one" draft="contributed">{0} fl oz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<unitPattern count="one" draft="contributed">{0} tbsp</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} tbsp</unitPattern>
@@ -9958,6 +10334,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} tsp</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} OL</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} NB</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} ZB</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} WL</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
@@ -9971,28 +10353,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</units>
 	<listPatterns>
 		<listPattern>
-			<listPatternPart type="start" draft="contributed">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle" draft="contributed">{0}, {1}</listPatternPart>
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
 			<listPatternPart type="end">{0} en {1}</listPatternPart>
 			<listPatternPart type="2">{0} en {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit">
-			<listPatternPart type="start" draft="contributed">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle" draft="contributed">{0}, {1}</listPatternPart>
-			<listPatternPart type="end" draft="contributed">{0}, {1}</listPatternPart>
-			<listPatternPart type="2" draft="contributed">{0} en {1}</listPatternPart>
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0} en {1}</listPatternPart>
+			<listPatternPart type="2">{0} en {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-narrow">
-			<listPatternPart type="start" draft="contributed">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle" draft="contributed">{0}, {1}</listPatternPart>
-			<listPatternPart type="end" draft="contributed">{0}, {1}</listPatternPart>
-			<listPatternPart type="2" draft="contributed">{0}, {1}</listPatternPart>
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-short">
-			<listPatternPart type="start" draft="contributed">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle" draft="contributed">{0}, {1}</listPatternPart>
-			<listPatternPart type="end" draft="contributed">{0}, {1}</listPatternPart>
-			<listPatternPart type="2" draft="contributed">{0}, {1}</listPatternPart>
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
 		</listPattern>
 	</listPatterns>
 	<posix>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nl_AW.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_AW.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nl_AW.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_AW.xml
index 1253edbb88c..15d6e8ef77d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nl_AW.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_AW.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="nl"/>
 		<territory type="AW"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nl_BE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_BE.xml
similarity index 96%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nl_BE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_BE.xml
index d030fc37e9c..e907ab48bf9 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nl_BE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_BE.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11173 $"/>
-		<generation date="$Date: 2015-02-10 17:51:18 -0600 (Tue, 10 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="nl"/>
 		<territory type="BE"/>
 	</identity>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nl_BQ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_BQ.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nl_BQ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_BQ.xml
index 42abd0256b2..f241d0ea893 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nl_BQ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_BQ.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="nl"/>
 		<territory type="BQ"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nl_CW.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_CW.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nl_CW.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_CW.xml
index 50e0d1cb8ec..ba2e04f79da 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nl_CW.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_CW.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="nl"/>
 		<territory type="CW"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nl_NL.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_NL.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nl_NL.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_NL.xml
index 58a5c6e6203..b44dbc72b43 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nl_NL.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_NL.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="nl"/>
 		<territory type="NL"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nl_SR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_SR.xml
similarity index 65%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nl_SR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_SR.xml
index 71aec6628fc..2321a6709f5 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nl_SR.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_SR.xml
@@ -1,16 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="nl"/>
 		<territory type="SR"/>
 	</identity>
+	<dates>
+		<timeZoneNames>
+			<metazone type="Suriname">
+				<short>
+					<standard>SRT</standard>
+				</short>
+			</metazone>
+		</timeZoneNames>
+	</dates>
 	<numbers>
 		<currencies>
 			<currency type="SRD">
@@ -19,3 +27,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nl_SX.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_SX.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nl_SX.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_SX.xml
index 2c38bd696cf..a1a9ccac199 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nl_SX.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_SX.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="nl"/>
 		<territory type="SX"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nmg.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nmg.xml
similarity index 95%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nmg.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nmg.xml
index 61140dd7905..eccb2286932 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nmg.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nmg.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="nmg"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguílla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Arménia</territory>
-			<territory type="AN">B’Antilles bó Nedɛrland</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Argentína</territory>
 			<territory type="AS">Samoa m ́Amɛ́rka</territory>
@@ -433,6 +431,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">maná</dayPeriod>
+							<dayPeriod type="pm">kugú</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">maná</dayPeriod>
 							<dayPeriod type="pm">kugú</dayPeriod>
@@ -582,6 +584,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">0K ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nmg_CM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nmg_CM.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nmg_CM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nmg_CM.xml
index 873539d891e..24ab9493afb 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nmg_CM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nmg_CM.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="nmg"/>
 		<territory type="CM"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nn.xml
similarity index 94%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nn.xml
index d179f25a84f..dbf05159467 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nn.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nn.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11042 $"/>
-		<generation date="$Date: 2014-10-31 12:11:19 -0500 (Fri, 31 Oct 2014) $"/>
+		<version number="$Revision: 12366 $"/>
 		<language type="nn"/>
 	</identity>
 	<localeDisplayNames>
@@ -657,7 +656,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Dei nederlandske Antillane</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antarktis</territory>
 			<territory type="AR">Argentina</territory>
@@ -953,63 +951,63 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="numbers">tal</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers" draft="unconfirmed">hindu-arabiske siffer (vestlige)</type>
-			<type type="arabext" key="numbers" draft="unconfirmed">hindu-arabiske siffer (østlige)</type>
-			<type type="armn" key="numbers" draft="unconfirmed">armenske numeraler</type>
-			<type type="armnlow" key="numbers" draft="unconfirmed">armenske numeraler i små bogstaver</type>
-			<type type="beng" key="numbers" draft="unconfirmed">bengalske siffer</type>
-			<type type="big5han" key="collation">tradisjonell kinesisk sortering</type>
-			<type type="buddhist" key="calendar">buddhistisk kalender</type>
-			<type type="chinese" key="calendar">kinesisk kalender</type>
-			<type type="deva" key="numbers" draft="unconfirmed">devanagariske siffer</type>
-			<type type="ducet" key="collation">grunnleggjande Unicode-sorteringsrekkjefølgje</type>
-			<type type="eor" key="collation" draft="unconfirmed">sorteringsrekkefølge for flerspråklige europeiske dokumenter</type>
-			<type type="ethi" key="numbers" draft="unconfirmed">etiopiske numeraler</type>
-			<type type="ethiopic" key="calendar">etiopisk kalender</type>
-			<type type="ethiopic-amete-alem" key="calendar">etiopisk amete-alem-kalender</type>
-			<type type="fullwide" key="numbers" draft="unconfirmed">vesterlandske siffer i fuld bredde</type>
-			<type type="gb2312han" key="collation">forenkla kinesisk sortering</type>
-			<type type="geor" key="numbers" draft="unconfirmed">georgiske numeraler</type>
-			<type type="gregorian" key="calendar">gregoriansk kalender</type>
-			<type type="grek" key="numbers" draft="unconfirmed">græske numeraler</type>
-			<type type="greklow" key="numbers" draft="unconfirmed">græske numeraler i små bogstaver</type>
-			<type type="gujr" key="numbers" draft="unconfirmed">gujaratiske siffer</type>
-			<type type="guru" key="numbers" draft="unconfirmed">gurmukhiske siffer</type>
-			<type type="hanidec" key="numbers" draft="unconfirmed">kinesiskt stavede siffer</type>
-			<type type="hans" key="numbers" draft="unconfirmed">forenklet stavede kinesiske numeraler</type>
-			<type type="hansfin" key="numbers" draft="unconfirmed">forenklet stavede kinesiske financielle numeraler</type>
-			<type type="hant" key="numbers" draft="unconfirmed">traditionelt stavede kinesiske numeraler</type>
-			<type type="hantfin" key="numbers" draft="unconfirmed">traditionelt stavede kinesiske financielle numeraler</type>
-			<type type="hebr" key="numbers" draft="unconfirmed">hebæiske numeraler</type>
-			<type type="hebrew" key="calendar">hebraisk kalender</type>
-			<type type="indian" key="calendar">indisk nasjonalkalender</type>
-			<type type="islamic" key="calendar">islamsk kalender</type>
-			<type type="islamic-civil" key="calendar">islamsk sivil kalender</type>
-			<type type="japanese" key="calendar">japansk kalender</type>
-			<type type="java" key="numbers" draft="unconfirmed">javanesiske siffer</type>
-			<type type="jpan" key="numbers" draft="unconfirmed">japanskt stavede numeraler</type>
-			<type type="jpanfin" key="numbers" draft="unconfirmed">japanskt stavede financielle numeraler</type>
-			<type type="khmr" key="numbers" draft="unconfirmed">kambodiske siffer</type>
-			<type type="knda" key="numbers" draft="unconfirmed">kannadiske siffer</type>
-			<type type="laoo" key="numbers" draft="unconfirmed">laotiske siffer</type>
-			<type type="latn" key="numbers" draft="unconfirmed">vesterlandske siffer</type>
-			<type type="mlym" key="numbers" draft="unconfirmed">malayalamiske siffer</type>
-			<type type="mymr" key="numbers" draft="unconfirmed">burmeske siffer</type>
-			<type type="orya" key="numbers" draft="unconfirmed">oryiske siffer</type>
-			<type type="persian" key="calendar">persisk kalender</type>
-			<type type="phonebook" key="collation">telefonkatalogsortering</type>
-			<type type="pinyin" key="collation">pinyin-sortering</type>
-			<type type="roc" key="calendar">kalender for Republikken Kina</type>
-			<type type="roman" key="numbers" draft="unconfirmed">romernumeraler</type>
-			<type type="romanlow" key="numbers" draft="unconfirmed">romernumeraler i små bogstaver</type>
-			<type type="search" key="collation">søksorteringsrekkjefølgje etter CLDR</type>
-			<type type="stroke" key="collation">streksortering</type>
-			<type type="taml" key="numbers" draft="unconfirmed">traditionelle tamilske numeraler</type>
-			<type type="tamldec" key="numbers" draft="unconfirmed">tamilske siffer</type>
-			<type type="telu" key="numbers" draft="unconfirmed">telugiske siffer</type>
-			<type type="thai" key="numbers" draft="unconfirmed">thailandske siffer</type>
-			<type type="tibt" key="numbers" draft="unconfirmed">tibetanske siffer</type>
-			<type type="traditional" key="collation">tradisjonell sortering</type>
+			<type key="calendar" type="buddhist">buddhistisk kalender</type>
+			<type key="calendar" type="chinese">kinesisk kalender</type>
+			<type key="calendar" type="ethiopic">etiopisk kalender</type>
+			<type key="calendar" type="ethiopic-amete-alem">etiopisk amete-alem-kalender</type>
+			<type key="calendar" type="gregorian">gregoriansk kalender</type>
+			<type key="calendar" type="hebrew">hebraisk kalender</type>
+			<type key="calendar" type="indian">indisk nasjonalkalender</type>
+			<type key="calendar" type="islamic">islamsk kalender</type>
+			<type key="calendar" type="islamic-civil">islamsk sivil kalender</type>
+			<type key="calendar" type="japanese">japansk kalender</type>
+			<type key="calendar" type="persian">persisk kalender</type>
+			<type key="calendar" type="roc">kalender for Republikken Kina</type>
+			<type key="collation" type="big5han">tradisjonell kinesisk sortering</type>
+			<type key="collation" type="ducet">grunnleggjande Unicode-sorteringsrekkjefølgje</type>
+			<type key="collation" type="eor" draft="unconfirmed">sorteringsrekkefølge for flerspråklige europeiske dokumenter</type>
+			<type key="collation" type="gb2312han">forenkla kinesisk sortering</type>
+			<type key="collation" type="phonebook">telefonkatalogsortering</type>
+			<type key="collation" type="pinyin">pinyin-sortering</type>
+			<type key="collation" type="search">søksorteringsrekkjefølgje etter CLDR</type>
+			<type key="collation" type="stroke">streksortering</type>
+			<type key="collation" type="traditional">tradisjonell sortering</type>
+			<type key="numbers" type="arab" draft="unconfirmed">hindu-arabiske siffer (vestlige)</type>
+			<type key="numbers" type="arabext" draft="unconfirmed">hindu-arabiske siffer (østlige)</type>
+			<type key="numbers" type="armn" draft="unconfirmed">armenske numeraler</type>
+			<type key="numbers" type="armnlow" draft="unconfirmed">armenske numeraler i små bogstaver</type>
+			<type key="numbers" type="beng" draft="unconfirmed">bengalske siffer</type>
+			<type key="numbers" type="deva" draft="unconfirmed">devanagariske siffer</type>
+			<type key="numbers" type="ethi" draft="unconfirmed">etiopiske numeraler</type>
+			<type key="numbers" type="fullwide" draft="unconfirmed">vesterlandske siffer i fuld bredde</type>
+			<type key="numbers" type="geor" draft="unconfirmed">georgiske numeraler</type>
+			<type key="numbers" type="grek" draft="unconfirmed">græske numeraler</type>
+			<type key="numbers" type="greklow" draft="unconfirmed">græske numeraler i små bogstaver</type>
+			<type key="numbers" type="gujr" draft="unconfirmed">gujaratiske siffer</type>
+			<type key="numbers" type="guru" draft="unconfirmed">gurmukhiske siffer</type>
+			<type key="numbers" type="hanidec" draft="unconfirmed">kinesiskt stavede siffer</type>
+			<type key="numbers" type="hans" draft="unconfirmed">forenklet stavede kinesiske numeraler</type>
+			<type key="numbers" type="hansfin" draft="unconfirmed">forenklet stavede kinesiske financielle numeraler</type>
+			<type key="numbers" type="hant" draft="unconfirmed">traditionelt stavede kinesiske numeraler</type>
+			<type key="numbers" type="hantfin" draft="unconfirmed">traditionelt stavede kinesiske financielle numeraler</type>
+			<type key="numbers" type="hebr" draft="unconfirmed">hebæiske numeraler</type>
+			<type key="numbers" type="java" draft="unconfirmed">javanesiske siffer</type>
+			<type key="numbers" type="jpan" draft="unconfirmed">japanskt stavede numeraler</type>
+			<type key="numbers" type="jpanfin" draft="unconfirmed">japanskt stavede financielle numeraler</type>
+			<type key="numbers" type="khmr" draft="unconfirmed">kambodiske siffer</type>
+			<type key="numbers" type="knda" draft="unconfirmed">kannadiske siffer</type>
+			<type key="numbers" type="laoo" draft="unconfirmed">laotiske siffer</type>
+			<type key="numbers" type="latn" draft="unconfirmed">vesterlandske siffer</type>
+			<type key="numbers" type="mlym" draft="unconfirmed">malayalamiske siffer</type>
+			<type key="numbers" type="mymr" draft="unconfirmed">burmeske siffer</type>
+			<type key="numbers" type="orya" draft="unconfirmed">oryiske siffer</type>
+			<type key="numbers" type="roman" draft="unconfirmed">romernumeraler</type>
+			<type key="numbers" type="romanlow" draft="unconfirmed">romernumeraler i små bogstaver</type>
+			<type key="numbers" type="taml" draft="unconfirmed">traditionelle tamilske numeraler</type>
+			<type key="numbers" type="tamldec" draft="unconfirmed">tamilske siffer</type>
+			<type key="numbers" type="telu" draft="unconfirmed">telugiske siffer</type>
+			<type key="numbers" type="thai" draft="unconfirmed">thailandske siffer</type>
+			<type key="numbers" type="tibt" draft="unconfirmed">tibetanske siffer</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metrisk</measurementSystemName>
@@ -1074,10 +1072,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="GyMMMEd">E d. MMM y G</dateFormatItem>
 						<dateFormatItem id="h" draft="contributed">h a</dateFormatItem>
 						<dateFormatItem id="H" draft="contributed">HH</dateFormatItem>
-						<dateFormatItem id="hm">h:mm a</dateFormatItem>
-						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
-						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hm">h.mm a</dateFormatItem>
+						<dateFormatItem id="Hm">HH.mm</dateFormatItem>
+						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
+						<dateFormatItem id="Hms">HH.mm.ss</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d.M.</dateFormatItem>
 						<dateFormatItem id="MEd">E d.M</dateFormatItem>
@@ -1085,7 +1083,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d. MMM</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
+						<dateFormatItem id="ms">mm.ss</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
 						<dateFormatItem id="yyyyM">M y G</dateFormatItem>
@@ -1112,22 +1110,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="H" draft="contributed">HH–HH</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="a">h.mm a – h.mm a</greatestDifference>
+							<greatestDifference id="h">h.mm–h.mm a</greatestDifference>
+							<greatestDifference id="m">h.mm–h.mm a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hm">
-							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="H">HH.mm–HH.mm</greatestDifference>
+							<greatestDifference id="m">HH.mm–HH.mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="a">h.mm a – h.mm a v</greatestDifference>
+							<greatestDifference id="h">h.mm–h.mm a v</greatestDifference>
+							<greatestDifference id="m">h.mm–h.mm a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H">HH:mm–HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="H">HH.mm–HH.mm v</greatestDifference>
+							<greatestDifference id="m">HH.mm–HH.mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a">h a – h a v</greatestDifference>
@@ -1320,8 +1318,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am" draft="unconfirmed">f.m.</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">e.m.</dayPeriod>
+							<dayPeriod type="am" draft="contributed">f.m.</dayPeriod>
+							<dayPeriod type="pm" draft="contributed">e.m.</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am" draft="unconfirmed">f.m.</dayPeriod>
@@ -1378,22 +1376,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>'kl'. HH:mm:ss zzzz</pattern>
+							<pattern>'kl'. HH.mm.ss zzzz</pattern>
+							<pattern alt="variant">'kl'. HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
+							<pattern>HH.mm.ss z</pattern>
+							<pattern alt="variant">HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
+							<pattern>HH.mm.ss</pattern>
+							<pattern alt="variant">HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>HH:mm</pattern>
+							<pattern>HH.mm</pattern>
+							<pattern alt="variant">HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -1405,7 +1407,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern>{1} 'kl.' {0}</pattern>
+							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
@@ -1425,17 +1427,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d. MMM y G</dateFormatItem>
-						<dateFormatItem id="hm">h:mm a</dateFormatItem>
-						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
-						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hm">h.mm a</dateFormatItem>
+						<dateFormatItem id="Hm">HH.mm</dateFormatItem>
+						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
+						<dateFormatItem id="Hms">HH.mm.ss</dateFormatItem>
 						<dateFormatItem id="Md">d.M.</dateFormatItem>
 						<dateFormatItem id="MEd">E d.M</dateFormatItem>
 						<dateFormatItem id="MMdd">d.M.</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d. MMM</dateFormatItem>
 						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
+						<dateFormatItem id="ms">mm.ss</dateFormatItem>
 						<dateFormatItem id="yM">M y</dateFormatItem>
 						<dateFormatItem id="yMd">d.M.y</dateFormatItem>
 						<dateFormatItem id="yMEd">E d.M.y</dateFormatItem>
@@ -1456,20 +1458,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="h">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="h">h.mm–h.mm a</greatestDifference>
+							<greatestDifference id="m">h.mm–h.mm a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hm">
-							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="H">HH.mm–HH.mm</greatestDifference>
+							<greatestDifference id="m">HH.mm–HH.mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="h">h.mm–h.mm a v</greatestDifference>
+							<greatestDifference id="m">h.mm–h.mm a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H">HH:mm–HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="H">HH.mm–HH.mm v</greatestDifference>
+							<greatestDifference id="m">HH.mm–HH.mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="h">h–h a v</greatestDifference>
@@ -1525,7 +1527,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<intervalFormatItem id="yMMMEd">
 							<greatestDifference id="d">E d.–E d. MMM y</greatestDifference>
 							<greatestDifference id="M">E d. MMM–E d. MMM y</greatestDifference>
-							<greatestDifference id="y">E d. MMM y–E d. MMM</greatestDifference>
+							<greatestDifference id="y">E d. MMM y–E d. MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
 							<greatestDifference id="M">MMMM–MMMM y</greatestDifference>
@@ -1676,7 +1678,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 		</fields>
 		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
+			<hourFormat>+HH.mm;-HH.mm</hourFormat>
 			<gmtFormat>GMT{0}</gmtFormat>
 			<fallbackFormat>{1} ({0})</fallbackFormat>
 			<zone type="Etc/Unknown">
@@ -1861,6 +1863,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<perMille>‰</perMille>
 			<infinity>∞</infinity>
 			<nan>NaN</nan>
+			<timeSeparator>.</timeSeparator>
+			<timeSeparator alt="variant">:</timeSeparator>
 		</symbols>
 		<decimalFormats numberSystem="latn">
 			<decimalFormatLength>
@@ -1945,6 +1949,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0 tn ¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0 tn ¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00 tn ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00 tn ¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000 tn ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000 tn ¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0 mn ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0 mn ¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00 mn ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00 mn ¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000 mn ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000 mn ¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0 md ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0 md ¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00 md ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00 md ¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000 md ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000 md ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0 bn ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0 bn ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00 bn ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00 bn ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000 bn ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000 bn ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -3213,6 +3245,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} Jordgravitasjon</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} Jordgravitasjoner</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<displayName draft="provisional">grader</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} grad</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} grader</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName draft="provisional">bueminutter</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} bueminutt</unitPattern>
@@ -3223,31 +3260,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} buesekund</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} buesekunder</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName draft="provisional">grader</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} grad</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} grader</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="provisional">amerikanske tønneland</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} amerikanskt tønneland</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} amerikanske tønneland</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName draft="provisional">kvadratkilometer</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} kvadratkilometer</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} kvadratkilometer</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName draft="provisional">hektar</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} hektar</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} hektar</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<displayName draft="provisional">kvadratfot</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} kvadratfot</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} kvadratfot</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="provisional">kvadratkilometer</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} kvadratkilometer</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} kvadratkilometer</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<displayName draft="provisional">kvadratmeter</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} kvadratmeter</unitPattern>
@@ -3258,6 +3280,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} kvadrat-engelsk mil</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} kvadrat-engelske mil</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<displayName draft="provisional">amerikanske tønneland</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} amerikanskt tønneland</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} amerikanske tønneland</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName draft="provisional">kvadratfot</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} kvadratfot</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} kvadratfot</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="provisional">år</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} år</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} år</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="provisional">måneder</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} måned</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} måneder</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="provisional">uker</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} uke</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} uker</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">døgn</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} døgn</unitPattern>
@@ -3268,70 +3315,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} time</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} timer</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="provisional">millisekunder</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} millisekund</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} millisekunder</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="provisional">minutter</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} minutt</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} minutter</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">måneder</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} måned</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} måneder</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="provisional">sekunder</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} sekund</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} sekunder</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">uker</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} uke</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} uker</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">år</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} år</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} år</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="provisional">centimeter</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} centimeter</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} centimeter</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="provisional">fot</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} fot</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} fot</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="provisional">tommer</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} tomme</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} tommer</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="provisional">millisekunder</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} millisekund</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} millisekunder</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="provisional">kilometer</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} kilometer</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} kilometer</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<displayName draft="provisional">lysår</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} lysår</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} lysår</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName draft="provisional">meter</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} meter</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} meter</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName draft="provisional">engelske mil</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} engelsk mil</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} engelske mil</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="provisional">centimeter</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} centimeter</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} centimeter</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="provisional">millimeter</displayName>
@@ -3343,35 +3355,55 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} pikometer</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} pikometer</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="provisional">engelske mil</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} engelsk mil</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} engelske mil</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName draft="provisional">engelske yard</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} engelsk yard</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} engelske yard</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="provisional">gram</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} gram</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} gram</unitPattern>
+			<unit type="length-foot">
+				<displayName draft="provisional">fot</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} fot</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} fot</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="provisional">tommer</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} tomme</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} tommer</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="provisional">lysår</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} lysår</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} lysår</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="unconfirmed">mil</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} mil</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} mil</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="provisional">kilogram</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} kilogram</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} kilogram</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="provisional">unser</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} unse</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} unser</unitPattern>
+			<unit type="mass-gram">
+				<displayName draft="provisional">gram</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} gram</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} gram</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<displayName draft="provisional">skålpund</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} skålpund</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} skålpund</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="provisional">hestekrafter</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} hestekraft</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} hestekrafter</unitPattern>
+			<unit type="mass-ounce">
+				<displayName draft="provisional">unser</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} unse</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} unser</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName draft="provisional">kilowatt</displayName>
@@ -3383,6 +3415,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} watt</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} watt</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<displayName draft="provisional">hestekrafter</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} hestekraft</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} hestekrafter</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="provisional">hektopascal</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} hektopascal</unitPattern>
@@ -3448,6 +3485,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} G</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<displayName draft="provisional">grader</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}°</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName draft="provisional">bueminutter</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}′</unitPattern>
@@ -3458,31 +3500,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}″</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName draft="provisional">grader</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}°</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="provisional">amerikanske tønneland</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName draft="provisional">kvadratkilometer</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} km²</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName draft="provisional">hektar</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} ha</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<displayName draft="provisional">kvadratfot</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} kvadratfot</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} kvadratfot</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="provisional">kvadratkilometer</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} km²</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<displayName draft="provisional">kvadratmeter</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} m²</unitPattern>
@@ -3493,6 +3520,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<displayName draft="provisional">amerikanske tønneland</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName draft="provisional">kvadratfot</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} kvadratfot</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} kvadratfot</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="provisional">år</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} år</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} år</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="provisional">måneder</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} mån</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} mån</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="provisional">uker</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} u</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} u</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">døgn</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} d</unitPattern>
@@ -3503,70 +3555,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} h</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} h</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="provisional">millisekunder</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ms</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="provisional">minutter</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} min</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} min</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">måneder</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} mån</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} mån</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="provisional">sekunder</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} s</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">uker</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} u</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} u</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">år</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} år</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} år</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="provisional">centimeter</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} cm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="provisional">fot</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} fot</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} fot</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="provisional">tommer</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} tomme</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} tommer</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="provisional">millisekunder</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} ms</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="provisional">kilometer</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} km</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<displayName draft="provisional">lysår</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} lysår</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} lysår</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName draft="provisional">meter</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} m</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName draft="provisional">engelske mil</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="provisional">centimeter</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} cm</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="provisional">millimeter</displayName>
@@ -3578,35 +3595,55 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} pm</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="provisional">engelske mil</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName draft="provisional">engelske yard</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="provisional">gram</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} g</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} g</unitPattern>
+			<unit type="length-foot">
+				<displayName draft="provisional">fot</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} fot</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} fot</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="provisional">tommer</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} tomme</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} tommer</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="provisional">lysår</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} lysår</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} lysår</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="unconfirmed">mil</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} mil</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} mil</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="provisional">kilogram</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} kg</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="provisional">unser</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} unse</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} unser</unitPattern>
+			<unit type="mass-gram">
+				<displayName draft="provisional">gram</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} g</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<displayName draft="provisional">skålpund</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} skålpund</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} skålpund</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="provisional">hestekrafter</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} hk</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} hk</unitPattern>
+			<unit type="mass-ounce">
+				<displayName draft="provisional">unser</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} unse</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} unser</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName draft="provisional">kilowatt</displayName>
@@ -3618,6 +3655,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} W</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<displayName draft="provisional">hestekrafter</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} hk</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} hk</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="provisional">hektopascal</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} hPa</unitPattern>
@@ -3682,6 +3724,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}G</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one" draft="unconfirmed">{0}°</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one" draft="unconfirmed">{0}′</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}′</unitPattern>
@@ -3690,26 +3736,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}″</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one" draft="unconfirmed">{0}°</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one" draft="unconfirmed">{0}km²</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one" draft="unconfirmed">{0}ha</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one" draft="unconfirmed">{0}km²</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one" draft="unconfirmed">{0}m²</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}m²</unitPattern>
@@ -3718,6 +3752,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<unitPattern count="one" draft="unconfirmed">{0}å</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}å</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<unitPattern count="one" draft="unconfirmed">{0}m</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}m</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<unitPattern count="one" draft="unconfirmed">{0}u</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}u</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<unitPattern count="one" draft="unconfirmed">{0}d</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}d</unitPattern>
@@ -3726,57 +3780,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}h</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}h</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<unitPattern count="one" draft="unconfirmed">{0}ms</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<unitPattern count="one" draft="unconfirmed">{0}m</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}m</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<unitPattern count="one" draft="unconfirmed">{0}m</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}m</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<unitPattern count="one" draft="unconfirmed">{0}s</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<unitPattern count="one" draft="unconfirmed">{0}u</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}u</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<unitPattern count="one" draft="unconfirmed">{0}å</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}å</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<unitPattern count="one" draft="unconfirmed">{0}cm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one" draft="unconfirmed">{0} fot</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} fot</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one" draft="unconfirmed">{0} tomme</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} tommer</unitPattern>
+			<unit type="duration-millisecond">
+				<unitPattern count="one" draft="unconfirmed">{0}ms</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<unitPattern count="one" draft="unconfirmed">{0}km</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one" draft="unconfirmed">{0} lysår</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} lysår</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<unitPattern count="one" draft="unconfirmed">{0}m</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<unitPattern count="one" draft="unconfirmed">{0}cm</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<unitPattern count="one" draft="unconfirmed">{0}mm</unitPattern>
@@ -3786,29 +3812,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}pm</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<unitPattern count="one" draft="unconfirmed">{0}g</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one" draft="unconfirmed">{0} fot</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} fot</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one" draft="unconfirmed">{0} tomme</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} tommer</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one" draft="unconfirmed">{0} lysår</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} lysår</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="unconfirmed">mil</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}mil</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}mil</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<unitPattern count="one" draft="unconfirmed">{0}kg</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one" draft="unconfirmed">{0} unse</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} unser</unitPattern>
+			<unit type="mass-gram">
+				<unitPattern count="one" draft="unconfirmed">{0}g</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one" draft="unconfirmed">{0} skålpund</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} skålpund</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one" draft="unconfirmed">{0}hk</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}hk</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one" draft="unconfirmed">{0} unse</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} unser</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one" draft="unconfirmed">{0}kW</unitPattern>
@@ -3818,6 +3861,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}W</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one" draft="unconfirmed">{0}hk</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}hk</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one" draft="unconfirmed">{0}hPa</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}hPa</unitPattern>
@@ -3864,13 +3911,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 		</unitLength>
 		<durationUnit type="hm">
-			<durationUnitPattern>h:mm</durationUnitPattern>
+			<durationUnitPattern>h.mm</durationUnitPattern>
+			<durationUnitPattern alt="variant">h:mm</durationUnitPattern>
 		</durationUnit>
 		<durationUnit type="hms">
-			<durationUnitPattern>h:mm:ss</durationUnitPattern>
+			<durationUnitPattern>h.mm.ss</durationUnitPattern>
+			<durationUnitPattern alt="variant">h:mm:ss</durationUnitPattern>
 		</durationUnit>
 		<durationUnit type="ms">
-			<durationUnitPattern>m:ss</durationUnitPattern>
+			<durationUnitPattern>m.ss</durationUnitPattern>
+			<durationUnitPattern alt="variant">m:ss</durationUnitPattern>
 		</durationUnit>
 	</units>
 	<listPatterns>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nn_NO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nn_NO.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nn_NO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nn_NO.xml
index a058c0b04d8..b5528a68db4 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nn_NO.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nn_NO.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="nn"/>
 		<territory type="NO"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nnh.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nnh.xml
similarity index 81%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nnh.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nnh.xml
index 5d773f19b19..e5793f86721 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nnh.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nnh.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="nnh"/>
 	</identity>
 	<localeDisplayNames>
@@ -15,11 +14,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bas">Shwóŋò pʉa mbasǎ</language>
 			<language type="bax">Shwóŋò pamom</language>
 			<language type="bbj">Shwóŋò pʉa nzsekàʼa</language>
-			<language type="bfd">Shwóŋò pafut</language>
+			<language type="bfd">Shwóŋò pafud</language>
 			<language type="bkm">Shwóŋò pʉ̀a njinikom</language>
 			<language type="bss">Shwóŋò pakɔsi</language>
 			<language type="bum">Shwóŋò mbulu</language>
-			<language type="byv">Shwóŋò ngáŋtʉɔʼ</language>
+			<language type="byv">Shwóŋò ngáŋtÿɔʼ</language>
 			<language type="de">nzǎmɔ̂ɔn</language>
 			<language type="en">ngilísè</language>
 			<language type="ewo">Shwóŋò pʉa Yɔɔnmendi</language>
@@ -108,7 +107,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="4">saŋ cÿó</month>
 							<month type="5">saŋ tsɛ̀ɛ cÿó</month>
 							<month type="6">saŋ njÿoláʼ</month>
-							<month type="7">saŋ tyɛ̀b tyɛ̀b mbʉ̀</month>
+							<month type="7">saŋ tyɛ̀b tyɛ̀b mbʉ̀ŋ</month>
 							<month type="8">saŋ mbʉ̀ŋ</month>
 							<month type="9">saŋ ngwɔ̀ʼ mbÿɛ</month>
 							<month type="10">saŋ tàŋa tsetsáʼ</month>
@@ -122,7 +121,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="4">saŋ cÿó</month>
 							<month type="5">saŋ tsɛ̀ɛ cÿó</month>
 							<month type="6">saŋ njÿoláʼ</month>
-							<month type="7">saŋ tyɛ̀b tyɛ̀b mbʉ̀</month>
+							<month type="7">saŋ tyɛ̀b tyɛ̀b mbʉ̀ŋ</month>
 							<month type="8">saŋ mbʉ̀ŋ</month>
 							<month type="9">saŋ ngwɔ̀ʼ mbÿɛ</month>
 							<month type="10">saŋ tàŋa tsetsáʼ</month>
@@ -138,7 +137,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="4">saŋ cÿó</month>
 							<month type="5">saŋ tsɛ̀ɛ cÿó</month>
 							<month type="6">saŋ njÿoláʼ</month>
-							<month type="7">saŋ tyɛ̀b tyɛ̀b mbʉ̀</month>
+							<month type="7">saŋ tyɛ̀b tyɛ̀b mbʉ̀ŋ</month>
 							<month type="8">saŋ mbʉ̀ŋ</month>
 							<month type="9">saŋ ngwɔ̀ʼ mbÿɛ</month>
 							<month type="10">saŋ tàŋa tsetsáʼ</month>
@@ -152,7 +151,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="4">saŋ cÿó</month>
 							<month type="5">saŋ tsɛ̀ɛ cÿó</month>
 							<month type="6">saŋ njÿoláʼ</month>
-							<month type="7">saŋ tyɛ̀b tyɛ̀b mbʉ̀</month>
+							<month type="7">saŋ tyɛ̀b tyɛ̀b mbʉ̀ŋ</month>
 							<month type="8">saŋ mbʉ̀ŋ</month>
 							<month type="9">saŋ ngwɔ̀ʼ mbÿɛ</month>
 							<month type="10">saŋ tàŋa tsetsáʼ</month>
@@ -223,6 +222,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</days>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">mbaʼámbaʼ</dayPeriod>
+							<dayPeriod type="pm">ncwònzém</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">mbaʼámbaʼ</dayPeriod>
 							<dayPeriod type="pm">ncwònzém</dayPeriod>
@@ -323,6 +326,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤ #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤ 0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤ 00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤ 000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤ 0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤ 00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤ 000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤ 0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤ 00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤ 000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤ 0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤ 00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤ 000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="XAF">
@@ -332,3 +363,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nnh_CM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nnh_CM.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nnh_CM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nnh_CM.xml
index ab01b478f77..3c7c7c9de76 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nnh_CM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nnh_CM.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="nnh"/>
 		<territory type="CM"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nus.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nus.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nus.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nus.xml
index 8cefd14125f..6921b0f6713 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nus.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nus.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="nus"/>
 	</identity>
 	<localeDisplayNames>
@@ -274,6 +273,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">RW</dayPeriod>
+							<dayPeriod type="pm">TŊ</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">RW</dayPeriod>
 							<dayPeriod type="pm">TŊ</dayPeriod>
@@ -423,7 +426,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
+		<currencies>
+			<currency type="GBP">
+				<symbol>GB£</symbol>
+			</currency>
+			<currency type="SSP">
+				<symbol>£</symbol>
+			</currency>
+		</currencies>
 	</numbers>
 	<posix>
 		<messages>
@@ -432,3 +459,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nus_SD.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nus_SS.xml
similarity index 63%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nus_SD.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nus_SS.xml
index 91f6ebff22f..eee75e526d2 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nus_SD.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nus_SS.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11938 $"/>
 		<language type="nus"/>
-		<territory type="SD"/>
+		<territory type="SS"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nyn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nyn.xml
similarity index 92%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nyn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nyn.xml
index e605acfd2a1..ddc7df7a9fd 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nyn.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nyn.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12128 $"/>
 		<language type="nyn"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angwira</territory>
 			<territory type="AL">Arubania</territory>
 			<territory type="AM">Arimeniya</territory>
-			<territory type="AN">Antiri za Hoorandi</territory>
 			<territory type="AO">Angora</territory>
 			<territory type="AR">Arigentina</territory>
 			<territory type="AS">Samowa ya Ameerika</territory>
@@ -480,22 +478,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -572,6 +570,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nyn_UG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nyn_UG.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nyn_UG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nyn_UG.xml
index 8724814d7a6..04f2b42f647 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/nyn_UG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nyn_UG.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="nyn"/>
 		<territory type="UG"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/om.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/om.xml
similarity index 84%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/om.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/om.xml
index 100fa8375dc..dc6ff80b939 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/om.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/om.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11042 $"/>
-		<generation date="$Date: 2014-10-31 12:11:19 -0500 (Fri, 31 Oct 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="om"/>
 	</identity>
 	<localeDisplayNames>
@@ -240,6 +239,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</days>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">WD</dayPeriod>
+							<dayPeriod type="pm">WB</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">WD</dayPeriod>
 							<dayPeriod type="pm">WB</dayPeriod>
@@ -324,6 +327,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="BRL">
@@ -357,3 +388,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/om_ET.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/om_ET.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/om_ET.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/om_ET.xml
index ecee48dc763..ca203fa4ad3 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/om_ET.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/om_ET.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="om"/>
 		<territory type="ET"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/om_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/om_KE.xml
new file mode 100644
index 00000000000..1acca693e53
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/om_KE.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="om"/>
+		<territory type="KE"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="KES">
+				<symbol>Ksh</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/or.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/or.xml
similarity index 96%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/or.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/or.xml
index 0489568136f..158eb194a55 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/or.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/or.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="or"/>
 	</identity>
 	<localeDisplayNames>
@@ -628,7 +627,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">ଆଙ୍ଗୁଇଲ୍ଲା</territory>
 			<territory type="AL">ଆଲବାନିଆ</territory>
 			<territory type="AM">ଆର୍ମେନିଆ</territory>
-			<territory type="AN">ନେଦରଲ୍ୟାଣ୍ଡସ୍ ଆଣ୍ଟିଲିଜ୍</territory>
 			<territory type="AO">ଆଙ୍ଗୋଲା</territory>
 			<territory type="AQ">ଆର୍ଣ୍ଟକଟିକା</territory>
 			<territory type="AR">ଆର୍ଜେଣ୍ଟିନା</territory>
@@ -1036,6 +1034,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</days>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">am</dayPeriod>
+							<dayPeriod type="pm">pm</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am">am</dayPeriod>
 							<dayPeriod type="pm">pm</dayPeriod>
@@ -1143,6 +1145,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤ #,##,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤ 0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤ 00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤ 000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤ 0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤ 00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤ 000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤ 0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤ 00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤ 000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤ 0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤ 00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤ 000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="INR">
@@ -1157,3 +1187,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/or_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/or_IN.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/or_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/or_IN.xml
index 3822810012f..c9edbb8ab00 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/or_IN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/or_IN.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="or"/>
 		<territory type="IN"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/os.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/os.xml
similarity index 94%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/os.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/os.xml
index ac11e877cf2..2d3208ccc09 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/os.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/os.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11093 $"/>
-		<generation date="$Date: 2015-01-02 21:36:02 -0600 (Fri, 02 Jan 2015) $"/>
+		<version number="$Revision: 12313 $"/>
 		<language type="os"/>
 	</identity>
 	<localeDisplayNames>
@@ -122,10 +121,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="numbers" draft="contributed">Нымӕцтӕ</key>
 		</keys>
 		<types>
-			<type type="gregorian" key="calendar" draft="contributed">Грегориан къӕлиндар</type>
-			<type type="hebrew" key="calendar" draft="contributed">Уирӕгты къӕлиндар</type>
-			<type type="latn" key="numbers" draft="contributed">Нырыккон цифрӕтӕ</type>
-			<type type="persian" key="calendar" draft="contributed">Персайнаг къӕлиндар</type>
+			<type key="calendar" type="gregorian" draft="contributed">Грегориан къӕлиндар</type>
+			<type key="calendar" type="hebrew" draft="contributed">Уирӕгты къӕлиндар</type>
+			<type key="calendar" type="persian" draft="contributed">Персайнаг къӕлиндар</type>
+			<type key="numbers" type="latn" draft="contributed">Нырыккон цифрӕтӕ</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric" draft="contributed">Метрикон</measurementSystemName>
@@ -278,7 +277,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="2" draft="contributed">фев.</month>
 							<month type="3" draft="contributed">мар.</month>
 							<month type="4" draft="contributed">апр.</month>
-							<month type="5" draft="contributed">мая</month>
+							<month type="5" draft="contributed">майы</month>
 							<month type="6" draft="contributed">июны</month>
 							<month type="7" draft="contributed">июлы</month>
 							<month type="8" draft="contributed">авг.</month>
@@ -320,7 +319,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<monthWidth type="abbreviated">
 							<month type="1" draft="contributed">Янв.</month>
 							<month type="2" draft="contributed">Февр.</month>
-							<month type="3" draft="contributed">Март</month>
+							<month type="3" draft="contributed">Март.</month>
 							<month type="4" draft="contributed">Апр.</month>
 							<month type="5" draft="contributed">Май</month>
 							<month type="6" draft="contributed">Июнь</month>
@@ -465,6 +464,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am" draft="contributed">AM</dayPeriod>
+							<dayPeriod type="pm" draft="contributed">PM</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am" draft="contributed">ӕмбисбоны размӕ</dayPeriod>
 							<dayPeriod type="pm" draft="contributed">ӕмбисбоны фӕстӕ</dayPeriod>
@@ -770,6 +773,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern draft="contributed">¤ #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤ 0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤ 00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤ 000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤ 0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤ 00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤ 000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤ 0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤ 00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤ 000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤ 0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤ 00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤ 000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
 			<unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -796,6 +827,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName draft="contributed">Лар</displayName>
 				<displayName count="one" draft="contributed">лар</displayName>
 				<displayName count="other" draft="contributed">лары</displayName>
+				<symbol>₾</symbol>
 			</currency>
 			<currency type="RUB">
 				<displayName draft="contributed">Сом</displayName>
@@ -817,6 +849,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</numbers>
 	<units>
 		<unitLength type="long">
+			<unit type="duration-year">
+				<displayName draft="contributed">азы</displayName>
+				<unitPattern count="one">{0} аз</unitPattern>
+				<unitPattern count="other">{0} азы</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">мӕйы</displayName>
+				<unitPattern count="one">{0} мӕй</unitPattern>
+				<unitPattern count="other">{0} мӕйы</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="contributed">къуырийы</displayName>
+				<unitPattern count="one">{0} къуыри</unitPattern>
+				<unitPattern count="other">{0} къуырийы</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="contributed">боны</displayName>
 				<unitPattern count="one">{0} бон</unitPattern>
@@ -832,28 +879,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} минут</unitPattern>
 				<unitPattern count="other">{0} минуты</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">мӕйы</displayName>
-				<unitPattern count="one">{0} мӕй</unitPattern>
-				<unitPattern count="other">{0} мӕйы</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="contributed">секунды</displayName>
 				<unitPattern count="one">{0} секунд</unitPattern>
 				<unitPattern count="other">{0} секунды</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">къуырийы</displayName>
-				<unitPattern count="one">{0} къуыри</unitPattern>
-				<unitPattern count="other">{0} къуырийы</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">азы</displayName>
-				<unitPattern count="one">{0} аз</unitPattern>
-				<unitPattern count="other">{0} азы</unitPattern>
-			</unit>
 		</unitLength>
 		<unitLength type="short">
+			<unit type="duration-year">
+				<displayName draft="contributed">азы</displayName>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">мӕйы</displayName>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="contributed">къуырийы</displayName>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="contributed">боны</displayName>
 				<unitPattern count="one">{0} бон</unitPattern>
@@ -869,18 +910,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} мин.</unitPattern>
 				<unitPattern count="other">{0} мин.</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">мӕйы</displayName>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="contributed">секунды</displayName>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">къуырийы</displayName>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">азы</displayName>
-			</unit>
 		</unitLength>
 	</units>
 	<listPatterns>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/os_GE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/os_GE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/os_GE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/os_GE.xml
index b4ffb6483d3..68fbcec7fd1 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/os_GE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/os_GE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="os"/>
 		<territory type="GE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/os_RU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/os_RU.xml
similarity index 70%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/os_RU.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/os_RU.xml
index b695781f00e..225c3a67838 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/os_RU.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/os_RU.xml
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12147 $"/>
 		<language type="os"/>
 		<territory type="RU"/>
 	</identity>
 	<numbers>
 		<currencies>
+			<currency type="GEL">
+				<symbol>GEL</symbol>
+			</currency>
 			<currency type="RUB">
-				<symbol>руб.</symbol>
+				<symbol>₽</symbol>
 			</currency>
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pa.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa.xml
similarity index 92%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pa.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa.xml
index 465d52e913a..29115d115a9 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pa.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="pa"/>
 	</identity>
 	<localeDisplayNames>
@@ -37,6 +36,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bem">ਬੇਮਬਾ</language>
 			<language type="bez">ਬੇਨਾ</language>
 			<language type="bg">ਬੁਲਗਾਰੀਆਈ</language>
+			<language type="bgn">ਪੱਛਮੀ ਬਲੂਚੀ</language>
 			<language type="bho">ਭੋਜਪੁਰੀ</language>
 			<language type="bm">ਬੰਬਾਰਾ</language>
 			<language type="bn">ਬੰਗਾਲੀ</language>
@@ -49,9 +49,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="cgg">ਚੀਗਾ</language>
 			<language type="chm">ਮਾਰੀ</language>
 			<language type="chr">ਚੇਰੋਕੀ</language>
-			<language type="ckb">ਸੋਰਾਨੀ ਕੁਰਦਿਸ਼</language>
+			<language type="ckb">ਕੇਂਦਰੀ ਕੁਰਦਿਸ਼</language>
 			<language type="co">ਕੋਰਸੀਕਨ</language>
 			<language type="cs">ਚੈਕ</language>
+			<language type="cv">ਚੁਵਾਸ਼</language>
 			<language type="cy">ਵੈਲਜ਼</language>
 			<language type="da">ਡੈਨਿਸ਼</language>
 			<language type="dav">ਟੇਟਾ</language>
@@ -147,6 +148,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lkt">ਲਕੋਟਾ</language>
 			<language type="ln">ਲਿੰਗਾਲਾ</language>
 			<language type="lo">ਲਾਓ</language>
+			<language type="lrc">ਉੱਤਰੀ ਲੁਰੀ</language>
 			<language type="lt">ਲਿਥੁਆਨੀਅਨ</language>
 			<language type="lu">ਲੂਬਾ-ਕਾਟਾਂਗਾ</language>
 			<language type="luo">ਲੂਓ</language>
@@ -171,9 +173,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mua">ਮੁੰਡੇਂਗ</language>
 			<language type="mul">ਕਈ ਭਾਸ਼ਾਵਾਂ</language>
 			<language type="my">ਬਰਮੀ</language>
+			<language type="mzn">ਮੇਜ਼ੈਂਡਰਾਨੀ</language>
 			<language type="naq">ਨਾਮਾ</language>
 			<language type="nb">ਨਾਰਵੇਜਿਆਈ ਬੋਕਮਲ</language>
 			<language type="nd">ਉੱਤਰੀ ਨਡੇਬੇਲੇ</language>
+			<language type="nds">ਲੋ ਜਰਮਨ</language>
+			<language type="nds_NL">ਲੋ ਸੈਕਸਨ</language>
 			<language type="ne">ਨੇਪਾਲੀ</language>
 			<language type="nl">ਡੱਚ</language>
 			<language type="nl_BE">ਫਲੈਮਿਸ਼</language>
@@ -208,6 +213,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sat">ਸੰਥਾਲੀ</language>
 			<language type="sbp">ਸੇਂਗੋ</language>
 			<language type="sd">ਸਿੰਧੀ</language>
+			<language type="sdh">ਦੱਖਣੀ ਕੁਰਦਿਸ਼</language>
 			<language type="se">ਉੱਤਰੀ ਸਾਮੀ</language>
 			<language type="seh">ਸੇਨਾ</language>
 			<language type="ses">ਕੋਇਰਾਬੋਰੋ ਸੇਂਨੀ</language>
@@ -225,10 +231,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="so">ਸੋਮਾਲੀ</language>
 			<language type="sq">ਅਲਬਾਨੀਆਈ</language>
 			<language type="sr">ਸਰਬੀਆਈ</language>
-			<language type="su">ਸੂਡਾਨੀ</language>
+			<language type="su">ਸੂੰਡਾਨੀ</language>
 			<language type="sv">ਸਵੀਡਿਸ਼</language>
 			<language type="sw">ਸਵਾਹਿਲੀ</language>
-			<language type="swc">ਕਾਂਗੋ ਸਵਾਹਿਲੀ</language>
+			<language type="sw_CD">ਕਾਂਗੋ ਸਵਾਹਿਲੀ</language>
 			<language type="ta">ਤਮਿਲ</language>
 			<language type="te">ਤੇਲਗੂ</language>
 			<language type="teo">ਟੇਸੋ</language>
@@ -244,12 +250,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="tzm">ਮੱਧ ਐਟਲਸ ਤਮਾਜ਼ਿਤ</language>
 			<language type="ug">ਉਇਗੁਰ</language>
 			<language type="uk">ਯੂਕਰੇਨੀਆਈ</language>
-			<language type="und">ਅਣਪਛਾਤੀ ਭਾਸ਼ਾ</language>
+			<language type="und">ਅਗਿਆਤ ਭਾਸ਼ਾ</language>
 			<language type="ur">ਉਰਦੂ</language>
 			<language type="uz">ਉਜ਼ਬੇਕ</language>
 			<language type="vai">ਵਾਈ</language>
 			<language type="vi">ਵੀਅਤਨਾਮੀ</language>
 			<language type="vun">ਵੂੰਜੋ</language>
+			<language type="wbp">ਵਾਲਪੁਰੀ</language>
 			<language type="wo">ਵੋਲੋਫ</language>
 			<language type="xh">ਖੋਸਾ</language>
 			<language type="xog">ਸੋਗਾ</language>
@@ -611,63 +618,76 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="calendar">ਕੈਲੰਡਰ</key>
 			<key type="collation">ਲੜੀਬੱਧ ਕ੍ਰਮ</key>
 			<key type="currency">ਮੁਦਰਾ</key>
-			<key type="numbers">ਸੰਖਿਆ</key>
+			<key type="hc">ਘੰਟੇ ਦਾ ਚੱਕਰ (12 ਬਨਾਮ 24)</key>
+			<key type="lb">ਰੇਖਾ ਵਿੱਥ ਸ਼ੈਲੀ</key>
+			<key type="ms">ਮਾਪ ਪ੍ਰਣਾਲੀ</key>
+			<key type="numbers">ਸੰਖਿਆਵਾਂ</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">ਅਰਬੀ-ਭਾਰਤੀ ਅੰਕ</type>
-			<type type="arabext" key="numbers">ਵਿਸਤਾਰਿਤ ਅਰਬੀ-ਭਾਰਤੀ ਅੰਕ</type>
-			<type type="armn" key="numbers">ਆਰਮੀਨੀਅਨ ਸੰਖਿਆਵਾਂ</type>
-			<type type="armnlow" key="numbers">ਆਰਮੀਨੀਅਨ ਲੋਅਰਕੇਸ ਸੰਖਿਆਵਾਂ</type>
-			<type type="beng" key="numbers">ਬੰਗਾਲੀ ਅੰਕ</type>
-			<type type="brah" key="numbers">ਬਰਾਹਮੀ ਅੰਕ</type>
-			<type type="buddhist" key="calendar">ਬੋਧੀ ਕੈਲੰਡਰ</type>
-			<type type="chinese" key="calendar">ਚੀਨੀ ਕੈਲੰਡਰ</type>
-			<type type="dangi" key="calendar">ਡਾਂਗੀ ਕੈਲੰਡਰ</type>
-			<type type="deva" key="numbers">ਦੇਵਨਾਗਰੀ ਅੰਕ</type>
-			<type type="dictionary" key="collation">ਸ਼ਬਦ-ਕੋਸ਼ ਲੜੀਬੱਧ ਕ੍ਰਮ</type>
-			<type type="ducet" key="collation">ਮੂਲ ਯੂਨੀਕੋਡ ਲੜੀਬੱਧ ਕ੍ਰਮ</type>
-			<type type="ethi" key="numbers">ਐਥਿਓਪਿਕ ਸੰਖਿਆਵਾਂ</type>
-			<type type="ethiopic" key="calendar">ਇਥੀਓਪਿਕ ਕੈਲੰਡਰ</type>
-			<type type="fullwide" key="numbers">ਪੂਰਨ ਵਿਸਤਾਰ ਅੰਕ</type>
-			<type type="geor" key="numbers">ਜਾਰਜੀਅਨ ਸੰਖਿਆਵਾਂ</type>
-			<type type="gregorian" key="calendar">ਗਰੇਗੋਰੀਅਨ ਕੈਲੰਡਰ</type>
-			<type type="grek" key="numbers">ਗ੍ਰੀਕ ਸੰਖਿਆਵਾਂ</type>
-			<type type="greklow" key="numbers">ਗ੍ਰੀਕ ਲੋਅਰਕੇਸ ਸੰਖਿਆਵਾਂ</type>
-			<type type="gujr" key="numbers">ਗੁਜਰਾਤੀ ਅੰਕ</type>
-			<type type="guru" key="numbers">ਗੁਰਮੁਖੀ ਅੰਕ</type>
-			<type type="hanidec" key="numbers">ਚੀਨੀ ਦਸ਼ਮਲਵ ਸੰਖਿਆਵਾਂ</type>
-			<type type="hans" key="numbers">ਸਰਲ ਚੀਨੀ ਸੰਖਿਆਵਾਂ</type>
-			<type type="hansfin" key="numbers">ਸਰਲ ਚੀਨੀ ਵਿੱਤੀ ਸੰਖਿਆਵਾਂ</type>
-			<type type="hant" key="numbers">ਰਵਾਇਤੀ ਚੀਨੀ ਸੰਖਿਆਵਾਂ</type>
-			<type type="hantfin" key="numbers">ਰਵਾਇਤੀ ਚੀਨੀ ਵਿੱਤੀ ਸੰਖਿਆਵਾਂ</type>
-			<type type="hebr" key="numbers">ਹਿਬਰੂ ਸੰਖਿਆਵਾਂ</type>
-			<type type="hebrew" key="calendar">ਹਿਬਰੂ ਕੈਲੰਡਰ</type>
-			<type type="indian" key="calendar">ਭਾਰਤੀ ਕੌਮੀ ਕੈਲੰਡਰ</type>
-			<type type="islamic" key="calendar">ਇਸਲਾਮੀ ਕੈਲੰਡਰ</type>
-			<type type="iso8601" key="calendar">(ISO-8601) ਕੈਲੰਡਰ</type>
-			<type type="japanese" key="calendar">ਜਪਾਨੀ ਕੈਲੰਡਰ</type>
-			<type type="jpan" key="numbers">ਜਾਪਾਨੀ ਸੰਖਿਆਵਾਂ</type>
-			<type type="jpanfin" key="numbers">ਜਾਪਾਨੀ ਵਿੱਤੀ ਸੰਖਿਆਵਾਂ</type>
-			<type type="khmr" key="numbers">ਖਮੇਰ ਅੰਕ</type>
-			<type type="knda" key="numbers">ਕੰਨੜ ਅੰਕ</type>
-			<type type="laoo" key="numbers">ਲਾਓ ਅੰਕ</type>
-			<type type="latn" key="numbers">ਪੱਛਮੀ ਅੰਕ</type>
-			<type type="mlym" key="numbers">ਮਲਿਆਲਮ ਅੰਕ</type>
-			<type type="mong" key="numbers">ਮੰਗੋਲ ਅੰਕ</type>
-			<type type="mymr" key="numbers">ਮਿਆਂਮਾਰ ਅੰਕ</type>
-			<type type="orya" key="numbers">ਉੜੀਆ ਅੰਕ</type>
-			<type type="persian" key="calendar">ਫ਼ਾਰਸੀ ਕੈਲੰਡਰ</type>
-			<type type="roc" key="calendar">ਮਿੰਗੂਓ ਕੈਲੰਡਰ</type>
-			<type type="roman" key="numbers">ਰੋਮਨ ਸੰਖਿਆਵਾਂ</type>
-			<type type="romanlow" key="numbers">ਰੋਮਨ ਲੋਅਰਕੇਸ ਸੰਖਿਆਵਾਂ</type>
-			<type type="search" key="collation">ਆਮ-ਮੰਤਵ ਖੋਜ</type>
-			<type type="standard" key="collation">ਸਧਾਰਨ ਲੜੀਬੱਧ ਕ੍ਰਮ</type>
-			<type type="taml" key="numbers">ਰਵਾਇਤੀ ਤਮਿਲ ਸੰਖਿਆਵਾਂ</type>
-			<type type="tamldec" key="numbers">ਤਮਿਲ ਅੰਕ</type>
-			<type type="telu" key="numbers">ਤੇਲਗੂ ਅੰਕ</type>
-			<type type="thai" key="numbers">ਥਾਈ ਅੰਕ</type>
-			<type type="tibt" key="numbers">ਤਿੱਬਤੀ ਅੰਕ</type>
-			<type type="traditional" key="collation">ਰਵਾਇਤੀ ਲੜੀਬੱਧ ਕ੍ਰਮ</type>
+			<type key="calendar" type="buddhist">ਬੋਧੀ ਕੈਲੰਡਰ</type>
+			<type key="calendar" type="chinese">ਚੀਨੀ ਕੈਲੰਡਰ</type>
+			<type key="calendar" type="dangi">ਡਾਂਗੀ ਕੈਲੰਡਰ</type>
+			<type key="calendar" type="ethiopic">ਇਥੀਓਪਿਕ ਕੈਲੰਡਰ</type>
+			<type key="calendar" type="gregorian">ਗਰੇਗੋਰੀਅਨ ਕੈਲੰਡਰ</type>
+			<type key="calendar" type="hebrew">ਹਿਬਰੂ ਕੈਲੰਡਰ</type>
+			<type key="calendar" type="indian">ਭਾਰਤੀ ਕੌਮੀ ਕੈਲੰਡਰ</type>
+			<type key="calendar" type="islamic">ਇਸਲਾਮੀ ਕੈਲੰਡਰ</type>
+			<type key="calendar" type="iso8601">(ISO-8601) ਕੈਲੰਡਰ</type>
+			<type key="calendar" type="japanese">ਜਪਾਨੀ ਕੈਲੰਡਰ</type>
+			<type key="calendar" type="persian">ਫ਼ਾਰਸੀ ਕੈਲੰਡਰ</type>
+			<type key="calendar" type="roc">ਮਿੰਗੂਓ ਕੈਲੰਡਰ</type>
+			<type key="collation" type="dictionary">ਸ਼ਬਦ-ਕੋਸ਼ ਲੜੀਬੱਧ ਕ੍ਰਮ</type>
+			<type key="collation" type="ducet">ਮੂਲ ਯੂਨੀਕੋਡ ਲੜੀਬੱਧ ਕ੍ਰਮ</type>
+			<type key="collation" type="search">ਆਮ-ਮੰਤਵ ਖੋਜ</type>
+			<type key="collation" type="standard">ਸਧਾਰਨ ਲੜੀਬੱਧ ਕ੍ਰਮ</type>
+			<type key="collation" type="traditional">ਰਵਾਇਤੀ ਲੜੀਬੱਧ ਕ੍ਰਮ</type>
+			<type key="hc" type="h11">12 ਘੰਟੇ ਦੀ ਪੱਧਤੀ (0–11)</type>
+			<type key="hc" type="h12">12 ਘੰਟੇ ਦੀ ਪੱਧਤੀ (1–12)</type>
+			<type key="hc" type="h23">24 ਘੰਟੇ ਦੀ ਪੱਧਤੀ (0–23)</type>
+			<type key="hc" type="h24">24 ਘੰਟੇ ਦੀ ਪੱਧਤੀ (1–24)</type>
+			<type key="lb" type="loose">ਖੁੱਲ੍ਹੀ ਰੇਖਾ ਵਿੱਥ ਸ਼ੈਲੀ</type>
+			<type key="lb" type="normal">ਸਧਾਰਨ ਰੇਖਾ ਵਿੱਥ ਸ਼ੈਲੀ</type>
+			<type key="lb" type="strict">ਪੱਕੀ ਰੇਖਾ ਵਿੱਥ ਸ਼ੈਲੀ</type>
+			<type key="ms" type="metric">ਮੀਟਰਿਕ ਪ੍ਰਣਾਲੀ</type>
+			<type key="ms" type="uksystem">ਇੰਪੀਰੀਅਲ ਮਾਪ ਪ੍ਰਣਾਲੀ</type>
+			<type key="ms" type="ussystem">ਅਮਰੀਕੀ ਮਾਪ ਪ੍ਰਣਾਲੀ</type>
+			<type key="numbers" type="arab">ਅਰਬੀ-ਭਾਰਤੀ ਅੰਕ</type>
+			<type key="numbers" type="arabext">ਵਿਸਤਾਰਿਤ ਅਰਬੀ-ਭਾਰਤੀ ਅੰਕ</type>
+			<type key="numbers" type="armn">ਆਰਮੀਨੀਅਨ ਸੰਖਿਆਵਾਂ</type>
+			<type key="numbers" type="armnlow">ਆਰਮੀਨੀਅਨ ਲੋਅਰਕੇਸ ਸੰਖਿਆਵਾਂ</type>
+			<type key="numbers" type="beng">ਬੰਗਾਲੀ ਅੰਕ</type>
+			<type key="numbers" type="brah">ਬਰਾਹਮੀ ਅੰਕ</type>
+			<type key="numbers" type="deva">ਦੇਵਨਾਗਰੀ ਅੰਕ</type>
+			<type key="numbers" type="ethi">ਐਥਿਓਪਿਕ ਸੰਖਿਆਵਾਂ</type>
+			<type key="numbers" type="fullwide">ਪੂਰਨ ਵਿਸਤਾਰ ਅੰਕ</type>
+			<type key="numbers" type="geor">ਜਾਰਜੀਅਨ ਸੰਖਿਆਵਾਂ</type>
+			<type key="numbers" type="grek">ਗ੍ਰੀਕ ਸੰਖਿਆਵਾਂ</type>
+			<type key="numbers" type="greklow">ਗ੍ਰੀਕ ਲੋਅਰਕੇਸ ਸੰਖਿਆਵਾਂ</type>
+			<type key="numbers" type="gujr">ਗੁਜਰਾਤੀ ਅੰਕ</type>
+			<type key="numbers" type="guru">ਗੁਰਮੁਖੀ ਅੰਕ</type>
+			<type key="numbers" type="hanidec">ਚੀਨੀ ਦਸ਼ਮਲਵ ਸੰਖਿਆਵਾਂ</type>
+			<type key="numbers" type="hans">ਸਰਲ ਚੀਨੀ ਸੰਖਿਆਵਾਂ</type>
+			<type key="numbers" type="hansfin">ਸਰਲ ਚੀਨੀ ਵਿੱਤੀ ਸੰਖਿਆਵਾਂ</type>
+			<type key="numbers" type="hant">ਰਵਾਇਤੀ ਚੀਨੀ ਸੰਖਿਆਵਾਂ</type>
+			<type key="numbers" type="hantfin">ਰਵਾਇਤੀ ਚੀਨੀ ਵਿੱਤੀ ਸੰਖਿਆਵਾਂ</type>
+			<type key="numbers" type="hebr">ਹਿਬਰੂ ਸੰਖਿਆਵਾਂ</type>
+			<type key="numbers" type="jpan">ਜਾਪਾਨੀ ਸੰਖਿਆਵਾਂ</type>
+			<type key="numbers" type="jpanfin">ਜਾਪਾਨੀ ਵਿੱਤੀ ਸੰਖਿਆਵਾਂ</type>
+			<type key="numbers" type="khmr">ਖਮੇਰ ਅੰਕ</type>
+			<type key="numbers" type="knda">ਕੰਨੜ ਅੰਕ</type>
+			<type key="numbers" type="laoo">ਲਾਓ ਅੰਕ</type>
+			<type key="numbers" type="latn">ਪੱਛਮੀ ਅੰਕ</type>
+			<type key="numbers" type="mlym">ਮਲਿਆਲਮ ਅੰਕ</type>
+			<type key="numbers" type="mong">ਮੰਗੋਲ ਅੰਕ</type>
+			<type key="numbers" type="mymr">ਮਿਆਂਮਾਰ ਅੰਕ</type>
+			<type key="numbers" type="orya">ਉੜੀਆ ਅੰਕ</type>
+			<type key="numbers" type="roman">ਰੋਮਨ ਸੰਖਿਆਵਾਂ</type>
+			<type key="numbers" type="romanlow">ਰੋਮਨ ਲੋਅਰਕੇਸ ਸੰਖਿਆਵਾਂ</type>
+			<type key="numbers" type="taml">ਰਵਾਇਤੀ ਤਮਿਲ ਸੰਖਿਆਵਾਂ</type>
+			<type key="numbers" type="tamldec">ਤਮਿਲ ਅੰਕ</type>
+			<type key="numbers" type="telu">ਤੇਲਗੂ ਅੰਕ</type>
+			<type key="numbers" type="thai">ਥਾਈ ਅੰਕ</type>
+			<type key="numbers" type="tibt">ਤਿੱਬਤੀ ਅੰਕ</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">ਮੀਟਰਿਕ</measurementSystemName>
@@ -747,19 +767,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
 						<dateFormatItem id="Gy">G y</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM,y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
+						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ y G</dateFormatItem>
@@ -770,6 +792,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y MMMM</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
 					</availableFormats>
@@ -824,12 +847,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<intervalFormatItem id="yMMMd">
 							<greatestDifference id="d">d – d, MMM y G</greatestDifference>
 							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
-							<greatestDifference id="y">d, MMM – d, MMM y G</greatestDifference>
+							<greatestDifference id="y">d, MMM y – d, MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
 							<greatestDifference id="d">E, d MMM – E, d MMM y G</greatestDifference>
 							<greatestDifference id="M">E, d MMM – E, d MMM y G</greatestDifference>
-							<greatestDifference id="y">E, d MMM – E, d MMM y G</greatestDifference>
+							<greatestDifference id="y">E, d MMM y – E, d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
 							<greatestDifference id="M">MMMM – MMMM y G</greatestDifference>
@@ -1051,15 +1074,61 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">ਅੱਧੀ ਰਾਤ</dayPeriod>
+							<dayPeriod type="am">ਪੂ.ਦੁ.</dayPeriod>
+							<dayPeriod type="pm">ਬਾ.ਦੁ.</dayPeriod>
+							<dayPeriod type="morning1">ਸਵੇਰੇ</dayPeriod>
+							<dayPeriod type="afternoon1">ਦੁਪਹਿਰੇ</dayPeriod>
+							<dayPeriod type="evening1">ਸ਼ਾਮੀਂ</dayPeriod>
+							<dayPeriod type="night1">ਰਾਤੀਂ</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">ਅੱਧੀ ਰਾਤ</dayPeriod>
 							<dayPeriod type="am">ਸ.</dayPeriod>
-							<dayPeriod type="noon">ਦੁ.</dayPeriod>
 							<dayPeriod type="pm">ਸ਼.</dayPeriod>
+							<dayPeriod type="morning1">ਸਵੇਰ</dayPeriod>
+							<dayPeriod type="afternoon1">ਦੁਪ.</dayPeriod>
+							<dayPeriod type="evening1">ਸ਼ਾਮ</dayPeriod>
+							<dayPeriod type="night1">ਰਾਤ</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">ਅੱਧੀ ਰਾਤ</dayPeriod>
 							<dayPeriod type="am">ਪੂ.ਦੁ.</dayPeriod>
-							<dayPeriod type="noon">ਦੁਪਹਿਰ</dayPeriod>
 							<dayPeriod type="pm">ਬਾ.ਦੁ.</dayPeriod>
+							<dayPeriod type="morning1">ਸਵੇਰ</dayPeriod>
+							<dayPeriod type="afternoon1">ਦੁਪਹਿਰ</dayPeriod>
+							<dayPeriod type="evening1">ਸ਼ਾਮ</dayPeriod>
+							<dayPeriod type="night1">ਰਾਤ</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">ਅੱਧੀ ਰਾਤ</dayPeriod>
+							<dayPeriod type="am">ਪੂ.ਦੁ.</dayPeriod>
+							<dayPeriod type="pm">ਬਾ.ਦੁ.</dayPeriod>
+							<dayPeriod type="morning1">ਸਵੇਰ</dayPeriod>
+							<dayPeriod type="afternoon1">ਦੁਪਹਿਰ</dayPeriod>
+							<dayPeriod type="evening1">ਸ਼ਾਮ</dayPeriod>
+							<dayPeriod type="night1">ਰਾਤ</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">ਅੱਧੀ ਰਾਤ</dayPeriod>
+							<dayPeriod type="am">ਪੂ.ਦੁ.</dayPeriod>
+							<dayPeriod type="pm">ਬਾ.ਦੁ.</dayPeriod>
+							<dayPeriod type="morning1">ਸਵੇਰ</dayPeriod>
+							<dayPeriod type="afternoon1">ਦੁਪਹਿਰ</dayPeriod>
+							<dayPeriod type="evening1">ਸ਼ਾਮ</dayPeriod>
+							<dayPeriod type="night1">ਰਾਤ</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">ਅੱਧੀ ਰਾਤ</dayPeriod>
+							<dayPeriod type="am">ਪੂ.ਦੁ.</dayPeriod>
+							<dayPeriod type="pm">ਬਾ.ਦੁ.</dayPeriod>
+							<dayPeriod type="morning1">ਸਵੇਰ</dayPeriod>
+							<dayPeriod type="afternoon1">ਦੁਪਹਿਰ</dayPeriod>
+							<dayPeriod type="evening1">ਸ਼ਾਮ</dayPeriod>
+							<dayPeriod type="night1">ਰਾਤ</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1162,17 +1231,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="GyMMMEd">E d MMM, G y</dateFormatItem>
 						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">HH</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, dd-MM.</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
@@ -1182,6 +1255,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMEd">E, d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMM">y MMMM</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
 						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
 					</availableFormats>
@@ -1403,6 +1477,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>ਸਾਲ</displayName>
+				<relative type="-1">ਪਿਛਲਾ ਸਾਲ</relative>
+				<relative type="0">ਇਹ ਸਾਲ</relative>
+				<relative type="1">ਅਗਲਾ ਸਾਲ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ਸਾਲ ਵਿੱਚ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ਸਾਲਾਂ ਵਿੱਚ</relativeTimePattern>
@@ -1414,6 +1491,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>ਸਾਲ</displayName>
+				<relative type="-1">ਪਿਛਲਾ ਸਾਲ</relative>
+				<relative type="0">ਇਹ ਸਾਲ</relative>
+				<relative type="1">ਅਗਲਾ ਸਾਲ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ਸਾਲ ਵਿੱਚ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ਸਾਲਾਂ ਵਿੱਚ</relativeTimePattern>
@@ -1425,6 +1505,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter">
 				<displayName>ਤਿਮਾਹੀ</displayName>
+				<relative type="-1">ਪਿਛਲੀ ਤਿਮਾਹੀ</relative>
+				<relative type="0">ਇਹ ਤਿਮਾਹੀ</relative>
+				<relative type="1">ਅਗਲੀ ਤਿਮਾਹੀ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ਤਿਮਾਹੀ ਵਿੱਚ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ਤਿਮਾਹੀਆਂ ਵਿੱਚ</relativeTimePattern>
@@ -1436,6 +1519,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>ਤਿਮਾਹੀ</displayName>
+				<relative type="-1">ਪਿਛਲੀ ਤਿਮਾਹੀ</relative>
+				<relative type="0">ਇਹ ਤਿਮਾਹੀ</relative>
+				<relative type="1">ਅਗਲੀ ਤਿਮਾਹੀ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ਤਿਮਾਹੀ ਵਿੱਚ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ਤਿਮਾਹੀਆਂ ਵਿੱਚ</relativeTimePattern>
@@ -1447,13 +1533,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>ਤਿਮਾਹੀ</displayName>
+				<relative type="-1">ਪਿਛਲੀ ਤਿਮਾਹੀ</relative>
+				<relative type="0">ਇਹ ਤਿਮਾਹੀ</relative>
+				<relative type="1">ਅਗਲੀ ਤਿਮਾਹੀ</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">+{0} ਤਿਮਾਹੀ</relativeTimePattern>
-					<relativeTimePattern count="other">+{0} ਤਿਮਾਹੀਆਂ</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ਤਿਮਾਹੀਆਂ ਵਿੱਚ</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ਤਿਮਾਹੀਆਂ ਵਿੱਚ</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} ਤਿਮਾਹੀ</relativeTimePattern>
-					<relativeTimePattern count="other">-{0} ਤਿਮਾਹੀਆਂ</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ਤਿਮਾਹੀਆਂ ਪਹਿਲਾਂ</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ਤਿਮਾਹੀਆਂ ਪਹਿਲਾਂ</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month">
@@ -1472,6 +1561,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>ਮਹੀਨਾ</displayName>
+				<relative type="-1">ਪਿਛਲਾ ਮਹੀਨਾ</relative>
+				<relative type="0">ਇਹ ਮਹੀਨਾ</relative>
+				<relative type="1">ਅਗਲਾ ਮਹੀਨਾ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ਮਹੀਨੇ ਵਿੱਚ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ਮਹੀਨਿਆਂ ਵਿੱਚ</relativeTimePattern>
@@ -1483,6 +1575,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>ਮਹੀਨਾ</displayName>
+				<relative type="-1">ਪਿਛਲਾ ਮਹੀਨਾ</relative>
+				<relative type="0">ਇਹ ਮਹੀਨਾ</relative>
+				<relative type="1">ਅਗਲਾ ਮਹੀਨਾ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ਮਹੀਨੇ ਵਿੱਚ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ਮਹੀਨਿਆਂ ਵਿੱਚ</relativeTimePattern>
@@ -1508,6 +1603,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>ਹਫ਼ਤਾ</displayName>
+				<relative type="-1">ਪਿਛਲਾ ਹਫ਼ਤਾ</relative>
+				<relative type="0">ਇਹ ਹਫ਼ਤਾ</relative>
+				<relative type="1">ਅਗਲਾ ਹਫ਼ਤਾ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ਹਫ਼ਤੇ ਵਿੱਚ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ਹਫ਼ਤਿਆਂ ਵਿੱਚ</relativeTimePattern>
@@ -1519,6 +1617,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>ਹਫ਼ਤਾ</displayName>
+				<relative type="-1">ਪਿਛਲਾ ਹਫ਼ਤਾ</relative>
+				<relative type="0">ਇਹ ਹਫ਼ਤਾ</relative>
+				<relative type="1">ਅਗਲਾ ਹਫ਼ਤਾ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ਹਫ਼ਤੇ ਵਿੱਚ</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ਹਫ਼ਤਿਆਂ ਵਿੱਚ</relativeTimePattern>
@@ -1788,7 +1889,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<regionFormat type="standard">{0} ਮਿਆਰੀ ਸਮਾਂ</regionFormat>
 			<fallbackFormat>{1} ({0})</fallbackFormat>
 			<zone type="Etc/Unknown">
-				<exemplarCity>ਅਣਪਛਾਤਾ ਸ਼ਹਿਰ</exemplarCity>
+				<exemplarCity>ਅਗਿਆਤ ਸ਼ਹਿਰ</exemplarCity>
 			</zone>
 			<zone type="Europe/Andorra">
 				<exemplarCity>ਅੰਡੋਰਾ</exemplarCity>
@@ -2654,6 +2755,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>ਪੋਰਟ ਮੋਰੇਸਬੀ</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>ਬੋਗਨਵਿਲੇ</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>ਮਨੀਲਾ</exemplarCity>
 			</zone>
@@ -2738,6 +2842,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>ਇਰਕੁਤਸਕ</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>ਚਿਤਾ</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>ਯਕੁਤਸਕ</exemplarCity>
 			</zone>
@@ -2756,6 +2863,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>ਮੈਗੇਡਨ</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>ਸਰਿਡਨੀਕੋਲਿਸਕ</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>ਕਮਚਟਕਾ</exemplarCity>
 			</zone>
@@ -3009,7 +3119,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>ਸੇਂਟ ਥੋਮਸ</exemplarCity>
 			</zone>
 			<zone type="Asia/Saigon">
-				<exemplarCity>ਹੋ ਚਾਈ ਮਿਨ੍ਹ ਸਿਟੀ</exemplarCity>
+				<exemplarCity>ਹੋ ਚੀ ਮਿਨ੍ਹ ਸਿਟੀ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Efate">
 				<exemplarCity>ਇਫੇਟ</exemplarCity>
@@ -3986,7 +4096,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<perMille>؉</perMille>
 			<infinity>∞</infinity>
 			<nan>NaN</nan>
-			<timeSeparator draft="contributed">٫</timeSeparator>
 		</symbols>
 		<symbols numberSystem="latn">
 			<decimal>.</decimal>
@@ -4115,6 +4224,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤ #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">¤ 0 ਹਜ਼ਾਰ</pattern>
+					<pattern type="1000" count="other">¤ 0 ਹਜ਼ਾਰ</pattern>
+					<pattern type="10000" count="one">¤ 00 ਹਜ਼ਾਰ</pattern>
+					<pattern type="10000" count="other">¤ 00 ਹਜ਼ਾਰ</pattern>
+					<pattern type="100000" count="one">¤ 0 ਲੱਖ</pattern>
+					<pattern type="100000" count="other">¤ 0 ਲੱਖ</pattern>
+					<pattern type="1000000" count="one">¤ 00 ਲੱਖ</pattern>
+					<pattern type="1000000" count="other">¤ 00 ਲੱਖ</pattern>
+					<pattern type="10000000" count="one">¤ 0 ਕਰੋੜ</pattern>
+					<pattern type="10000000" count="other">¤ 0 ਕਰੋੜ</pattern>
+					<pattern type="100000000" count="one">¤ 00 ਕਰੋੜ</pattern>
+					<pattern type="100000000" count="other">¤ 00 ਕਰੋੜ</pattern>
+					<pattern type="1000000000" count="one">¤ 0 ਅਰਬ</pattern>
+					<pattern type="1000000000" count="other">¤ 0 ਅਰਬ</pattern>
+					<pattern type="10000000000" count="one">¤ 00 ਅਰਬ</pattern>
+					<pattern type="10000000000" count="other">¤ 00 ਅਰਬ</pattern>
+					<pattern type="100000000000" count="one">¤ 0 ਖਰਬ</pattern>
+					<pattern type="100000000000" count="other">¤ 0 ਖਰਬ</pattern>
+					<pattern type="1000000000000" count="one">¤ 00 ਖਰਬ</pattern>
+					<pattern type="1000000000000" count="other">¤ 00 ਖਰਬ</pattern>
+					<pattern type="10000000000000" count="one">¤ 0 ਨੀਲ</pattern>
+					<pattern type="10000000000000" count="other">¤ 0 ਨੀਲ</pattern>
+					<pattern type="100000000000000" count="one">¤ 00 ਨੀਲ</pattern>
+					<pattern type="100000000000000" count="other">¤ 00 ਨੀਲ</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4154,6 +4291,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਅੰਗੋਲਾ ਕਵਾਂਜਾ</displayName>
 				<displayName count="other">ਅੰਗੋਲਾ ਕਵਾਂਜਾ</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="ARA">
 				<displayName>ਅਰਜਨਟੀਨੀ ਅਸਟਰਾਲ</displayName>
@@ -4210,6 +4348,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਬੋਸਨੀਆ-ਹਰਜ਼ੇਗੋਵੀਨਾ ਬਦਲਣਯੋਗ ਮਾਰਕ</displayName>
 				<displayName count="other">ਬੋਸਨੀਆ-ਹਰਜ਼ੇਗੋਵੀਨਾ ਬਦਲਣਯੋਗ ਮਾਰਕ</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>ਬਾਰਬਾਡੀਅਨ ਡਾਲਰ</displayName>
@@ -4262,6 +4401,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਬੋਲੀਵੀਅਨ ਬੋਲੀਵੀਅਨੋ</displayName>
 				<displayName count="other">ਬੋਲੀਵੀਅਨ ਬੋਲੀਵੀਅਨੋ</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOL">
 				<displayName>ਬੋਲੀਵੀਆਈ ਬੋਲੀਵੀਅਨੋ (1863–1963)</displayName>
@@ -4342,6 +4482,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਬੋਟਸਵਾਨਾ ਪੁਲਾ</displayName>
 				<displayName count="other">ਬੋਟਸਵਾਨਾ ਪੁਲਾ</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYR">
 				<displayName>ਬੇਲਾਰੂਸੀ ਰੂਬਲ</displayName>
@@ -4409,6 +4550,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਕਿਊਬਨ ਬਦਲਣਯੋਗ ਪੇਸੋ</displayName>
 				<displayName count="other">ਕਿਊਬਨ ਬਦਲਣਯੋਗ ਪੇਸੋ</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>ਕਿਊਬਨ ਪੇਸੋ</displayName>
@@ -4428,6 +4570,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਚੈਕ ਗਣਰਾਜ ਕੋਰੁਨਾ</displayName>
 				<displayName count="other">ਚੈਕ ਗਣਰਾਜ ਕੋਰੁਨਾ</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DEM">
 				<displayName>ਜਰਮਨ ਮਾਰਕ</displayName>
@@ -4446,6 +4589,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਡੈਨਿਸ਼ ਕਰੌਨ</displayName>
 				<displayName count="other">ਡੈਨਿਸ਼ ਕਰੌਨ</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>ਡੌਮਿਨਿਕਨ ਪੇਸੋ</displayName>
@@ -4465,6 +4609,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਮਿਸਰੀ ਪੌਂਡ</displayName>
 				<displayName count="other">ਮਿਸਰੀ ਪੌਂਡ</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>ਇਰੀਟ੍ਰਿਆਈ ਨਾਫ਼ਾ</displayName>
@@ -4497,11 +4642,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਫ਼ਾਕਲੈਂਡ ਆਈਲੈਂਡਸ ਪੌਂਡ</displayName>
 				<displayName count="other">ਫ਼ਾਕਲੈਂਡ ਆਈਲੈਂਡਸ ਪੌਂਡ</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GBP">
-				<displayName>ਬ੍ਰਿਟਿਸ਼ ਪੌਂਡ ਸਟਰਲਿੰਗ</displayName>
-				<displayName count="one">ਬ੍ਰਿਟਿਸ਼ ਪੌਂਡ ਸਟਰਲਿੰਗ</displayName>
-				<displayName count="other">ਬ੍ਰਿਟਿਸ਼ ਪੌਂਡ ਸਟਰਲਿੰਗ</displayName>
+				<displayName>ਬ੍ਰਿਟਿਸ਼ ਪੌਂਡ</displayName>
+				<displayName count="one">ਬ੍ਰਿਟਿਸ਼ ਪੌਂਡ</displayName>
+				<displayName count="other">ਬ੍ਰਿਟਿਸ਼ ਪੌਂਡ</displayName>
 				<symbol>£</symbol>
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
@@ -4510,6 +4656,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਜਾਰਜੀਆਈ ਲਾਰੀ</displayName>
 				<displayName count="other">ਜਾਰਜੀਆਈ ਲਾਰੀ</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHS">
 				<displayName>ਘਾਨਾਈ ਸੇਡੀ</displayName>
@@ -4535,12 +4682,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਗਿਨੀ ਫ੍ਰੈਂਕ</displayName>
 				<displayName count="other">ਗਿਨੀ ਫ੍ਰੈਂਕ</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GTQ">
 				<displayName>ਗੁਆਟੇਮਾਲਾ ਕੁਏਟਜ਼ਲ</displayName>
 				<displayName count="one">ਗੁਆਟੇਮਾਲਾ ਕੁਏਟਜ਼ਲ</displayName>
 				<displayName count="other">ਗੁਆਟੇਮਾਲਾ ਕੁਏਟਜ਼ਲ</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GYD">
 				<displayName>ਗੁਆਨਾਆਈ ਡਾਲਰ</displayName>
@@ -4561,12 +4710,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਹਾਨਡੂਰਨ ਲੇਮਪਿਰਾ</displayName>
 				<displayName count="other">ਹਾਨਡੂਰਨ ਲੇਮਪਿਰਾ</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRK">
 				<displayName>ਕਰੋਏਸ਼ੀਆਈ ਕੁਨਾ</displayName>
 				<displayName count="one">ਕਰੋਏਸ਼ੀਆਈ ਕੁਨਾ</displayName>
 				<displayName count="other">ਕਰੋਏਸ਼ੀਆਈ ਕੁਨਾ</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>ਹੈਤੀ ਗੌਰਡੇ</displayName>
@@ -4579,12 +4730,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਹੰਗਰੀ ਫੋਰਿੰਟ</displayName>
 				<displayName count="other">ਹੰਗਰੀ ਫੋਰਿੰਟ</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>ਇੰਡੋਨੇਸ਼ੀਆਈ ਰੁਪਿਆਹ</displayName>
 				<displayName count="one">ਇੰਡੋਨੇਸ਼ੀਆਈ ਰੁਪਿਆਹ</displayName>
 				<displayName count="other">ਇੰਡੋਨੇਸ਼ੀਆਈ ਰੁਪਿਆਹ</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>ਆਇਰਿਸ਼ ਪੌਂਡ</displayName>
@@ -4628,6 +4781,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਆਈਸਲੈਂਡਿਕ ਕਰੌਨ</displayName>
 				<displayName count="other">ਆਈਸਲੈਂਡਿਕ ਕਰੌਨ</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="JMD">
 				<displayName>ਜਮਾਇਕਨ ਡਾਲਰ</displayName>
@@ -4673,12 +4827,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਕੋਮੋਰੀਅਨ ਫ੍ਰੈਂਕ</displayName>
 				<displayName count="other">ਕੋਮੋਰੀਅਨ ਫ੍ਰੈਂਕ</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>ਉੱਤਰੀ ਕੋਰੀਆਈ ਵੋਨ</displayName>
 				<displayName count="one">ਉੱਤਰੀ ਕੋਰੀਆਈ ਵੋਨ</displayName>
 				<displayName count="other">ਉੱਤਰੀ ਕੋਰੀਆਈ ਵੋਨ</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>ਦੱਖਣੀ ਕੋਰੀਆਈ ਵੋਨ</displayName>
@@ -4719,12 +4875,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਲੈਬਨਾਨੀ ਪੌਂਡ</displayName>
 				<displayName count="other">ਲੈਬਨਾਨੀ ਪੌਂਡ</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>ਸ੍ਰੀਲੰਕਾਈ ਰੁਪਇਆ</displayName>
 				<displayName count="one">ਸ੍ਰੀਲੰਕਾਈ ਰੁਪਇਆ</displayName>
 				<displayName count="other">ਸ੍ਰੀਲੰਕਾਈ ਰੁਪਏ</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>ਲਾਈਬੀਰੀਆਈ ਡਾਲਰ</displayName>
@@ -4768,6 +4926,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਮਾਲਾਗਾਸੀ ਅਰਾਇਰੀ</displayName>
 				<displayName count="other">ਮਾਲਾਗਾਸੀ ਅਰਾਇਰੀ</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MKD">
 				<displayName>ਮੈਕਡੋਨੀਆਈ ਡੇਨਾਰ</displayName>
@@ -4780,6 +4939,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਮਿਆਂਮਾਰ ਕਿਆਤ</displayName>
 				<displayName count="other">ਮਿਆਂਮਾਰ ਕਿਆਤ</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>ਮੰਗੋਲੀਆਈ ਤੁਗਰਿਕ</displayName>
@@ -4805,6 +4965,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਮੌਰਿਸ਼ੀਆਈ ਰੁਪਇਆ</displayName>
 				<displayName count="other">ਮੌਰਿਸ਼ੀਆਈ ਰੁਪਏ</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>ਮਾਲਦੀਵੀ ਰੁਫੀਆ</displayName>
@@ -4830,6 +4991,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਮਲੇਸ਼ੀਆਈ ਰਿੰਗਿਟ</displayName>
 				<displayName count="other">ਮਲੇਸ਼ੀਆਈ ਰਿੰਗਿਟ</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZN">
 				<displayName>ਮੋਜ਼ਾਮਬੀਕਨ ਮੈਟੀਕਲ</displayName>
@@ -4856,18 +5018,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਨਿਕਾਰਾਗੁਆਈ ਕੋਰਡੋਬਾ</displayName>
 				<displayName count="other">ਨਿਕਾਰਾਗੁਆਈ ਕੋਰਡੋਬਾ</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NOK">
 				<displayName>ਨਾਰਵੇਜੀਆਈ ਕਰੌਨ</displayName>
 				<displayName count="one">ਨਾਰਵੇਜੀਆਈ ਕਰੌਨ</displayName>
 				<displayName count="other">ਨਾਰਵੇਜੀਆਈ ਕਰੌਨ</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>ਨੇਪਾਲੀ ਰੁਪਇਆ</displayName>
 				<displayName count="one">ਨੇਪਾਲੀ ਰੁਪਇਆ</displayName>
 				<displayName count="other">ਨੇਪਾਲੀ ਰੁਪਏ</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>ਨਿਊਜ਼ੀਲੈਂਡ ਡਾਲਰ</displayName>
@@ -4912,12 +5077,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਪਾਕਿਸਤਾਨੀ ਰੁਪਇਆ</displayName>
 				<displayName count="other">ਪਾਕਿਸਤਾਨੀ ਰੁਪਏ</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>ਪੋਲੈਂਡੀ ਜ਼ਲੌਟੀ</displayName>
 				<displayName count="one">ਪੋਲੈਂਡੀ ਜ਼ਲੌਟੀ</displayName>
 				<displayName count="other">ਪੋਲੈਂਡੀ ਜ਼ਲੌਟੀ</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PYG">
 				<displayName>ਪੈਰਾਗੁਵਾਇਨ ਗੁਆਰਾਨੀ</displayName>
@@ -4949,6 +5116,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਰੂਸੀ ਰੂਬਲ</displayName>
 				<displayName count="other">ਰੂਸੀ ਰੂਬਲ</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<symbol alt="narrow" draft="contributed">р.</symbol>
@@ -4958,6 +5126,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਰਵਾਂਡਨ ਫ੍ਰੈਂਕ</displayName>
 				<displayName count="other">ਰਵਾਂਡਨ ਫ੍ਰੈਂਕ</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>ਸਾਊਦੀ ਰਿਆਲ</displayName>
@@ -4989,6 +5158,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਸਵੀਡਿਸ਼ ਕਰੋਨਾ</displayName>
 				<displayName count="other">ਸਵੀਡਿਸ਼ ਕਰੋਨਾ</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>ਸਿੰਗਾਪੁਰ ਡਾਲਰ</displayName>
@@ -5002,6 +5172,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਸੇਂਟ ਹੇਲੇਨਾ ਪੌਂਡ</displayName>
 				<displayName count="other">ਸੇਂਟ ਹੇਲੇਨਾ ਪੌਂਡ</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SLL">
 				<displayName>ਸਿਏਰਾ ਲਿਓਨੀਅਨ ਲਿਓਨ</displayName>
@@ -5034,6 +5205,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਸਾਉ ਟੋਮੀ ਐਂਡ ਪ੍ਰਿੰਸਪੀ ਡੋਬਰਾ</displayName>
 				<displayName count="other">ਸਾਉ ਟੋਮੀ ਐਂਡ ਪ੍ਰਿੰਸਪੀ ਡੋਬਰਾ</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>ਸੋਵੀਅਤ ਰੂਬਲ</displayName>
@@ -5046,6 +5218,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਸੀਰੀਆਈ ਪੌਂਡ</displayName>
 				<displayName count="other">ਸੀਰੀਆਈ ਪੌਂਡ</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>ਸਵਾਜ਼ੀ ਲਾਇਲੈਂਗਨੀ</displayName>
@@ -5058,6 +5231,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਥਾਈ ਬਾਹਤ</displayName>
 				<displayName count="other">ਥਾਈ ਬਾਹਤ</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJS">
 				<displayName>ਤਾਜਿਕਿਸਤਾਨੀ ਸੋਮੋਨੀ</displayName>
@@ -5082,6 +5256,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਟੌਂਗਨ ਪੈਂਗਾ</displayName>
 				<displayName count="other">ਟੌਂਗਨ ਪੈਂਗਾ</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TRY">
 				<displayName>ਤੁਰਕੀ ਲੀਰਾ</displayName>
@@ -5089,6 +5264,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">ਤੁਰਕੀ ਲੀਰਾ</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>ਟ੍ਰਿਨੀਡਾਡ ਅਤੇ ਟੋਬਾਗੋ ਡਾਲਰ</displayName>
@@ -5163,6 +5339,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਵੇਨੇਜ਼ੂਏਲਨ ਬੋਲੀਵਰ</displayName>
 				<displayName count="other">ਵੇਨੇਜ਼ੂਏਲਨ ਬੋਲੀਵਰ</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>ਵੀਅਤਨਾਮੀ ਡੋਂਗ</displayName>
@@ -5227,6 +5404,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਪੂਰਬੀ ਕੈਰੇਬੀਅਨ ਡਾਲਰ</displayName>
 				<displayName count="other">ਪੂਰਬੀ ਕੈਰੇਬੀਅਨ ਡਾਲਰ</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XEU">
 				<displayName>ਯੂਰਪੀ ਮੁਦਰਾ ਇਕਾਈ</displayName>
@@ -5235,7 +5413,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>XEU</symbol>
 			</currency>
 			<currency type="XOF">
-				<displayName>ਫ੍ਰੈਂਕ (CFA BCEAO)</displayName>
+				<displayName>ਪੱਛਮੀ ਅਫ਼ਰੀਕੀ (CFA) ਫ੍ਰੈਂਕ</displayName>
 				<displayName count="one">ਫ੍ਰੈਂਕ (CFA BCEAO)</displayName>
 				<displayName count="other">ਫ੍ਰੈਂਕ (CFA BCEAO)</displayName>
 				<symbol>CFA</symbol>
@@ -5263,12 +5441,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ਦੱਖਣੀ ਅਫਰੀਕੀ ਰੈਂਡ</displayName>
 				<displayName count="other">ਦੱਖਣੀ ਅਫਰੀਕੀ ਰੈਂਡ</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMW">
 				<displayName>ਜ਼ਾਮਬੀਆਈ ਕਵਾਚਾ</displayName>
 				<displayName count="one">ਜ਼ਾਮਬੀਆਈ ਕਵਾਚਾ</displayName>
 				<displayName count="other">ਜ਼ਾਮਬੀਆਈ ਕਵਾਚਾ</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
@@ -5291,6 +5471,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ਮੀਟਰ ਪ੍ਰਤੀ ਵਰਗ ਸਕਿੰਟ</unitPattern>
 				<unitPattern count="other">{0} ਮੀਟਰ ਪ੍ਰਤੀ ਵਰਗ ਸਕਿੰਟ</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>ਪਰਿਕਰਮਾ</displayName>
+				<unitPattern count="one">{0} ਪਰਿਕਰਮਾ</unitPattern>
+				<unitPattern count="other">{0} ਪਰਿਕਰਮਾ</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>ਰੇਡੀਅਨ</displayName>
+				<unitPattern count="one">{0} ਰੇਡੀਅਨ</unitPattern>
+				<unitPattern count="other">{0} ਰੇਡੀਅਨ</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>ਡਿਗਰੀ</displayName>
+				<unitPattern count="one">{0} ਡਿਗਰੀ</unitPattern>
+				<unitPattern count="other">{0} ਡਿਗਰੀ</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>ਚਾਪ-ਮਿੰਟ</displayName>
 				<unitPattern count="one">{0} ਚਾਪ-ਮਿੰਟ</unitPattern>
@@ -5301,30 +5496,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ਚਾਪ-ਸਕਿੰਟ</unitPattern>
 				<unitPattern count="other">{0} ਚਾਪ-ਸਕਿੰਟ</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>ਡਿਗਰੀ</displayName>
-				<unitPattern count="one">{0} ਡਿਗਰੀ</unitPattern>
-				<unitPattern count="other">{0} ਡਿਗਰੀ</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>ਰੇਡੀਅਨ</displayName>
-				<unitPattern count="one">{0} ਰੇਡੀਅਨ</unitPattern>
-				<unitPattern count="other">{0} ਰੇਡੀਅਨ</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ਏਕੜ</displayName>
-				<unitPattern count="one">{0} ਏਕੜ</unitPattern>
-				<unitPattern count="other">{0} ਏਕੜ</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>ਵਰਗ ਕਿਲੋਮੀਟਰ</displayName>
+				<unitPattern count="one">{0} ਵਰਗ ਕਿਲੋਮੀਟਰ</unitPattern>
+				<unitPattern count="other">{0} ਵਰਗ ਕਿਲੋਮੀਟਰ</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ਹੈਕਟੇਅਰ</displayName>
 				<unitPattern count="one">{0} ਹੈਕਟੇਅਰ</unitPattern>
 				<unitPattern count="other">{0} ਹੈਕਟੇਅਰ</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>ਵਰਗ ਮੀਟਰ</displayName>
+				<unitPattern count="one">{0} ਵਰਗ ਮੀਟਰ</unitPattern>
+				<unitPattern count="other">{0} ਵਰਗ ਮੀਟਰ</unitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤੀ ਵਰਗ ਮੀਟਰ</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>ਵਰਗ ਸੈਂਟੀਮੀਟਰ</displayName>
 				<unitPattern count="one">{0} ਵਰਗ ਸੈਂਟੀਮੀਟਰ</unitPattern>
 				<unitPattern count="other">{0} ਵਰਗ ਸੈਂਟੀਮੀਟਰ</unitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤੀ ਵਰਗ ਸੈਂਟੀਮੀਟਰ</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>ਵਰਗ ਮੀਲ</displayName>
+				<unitPattern count="one">{0} ਵਰਗ ਮੀਲ</unitPattern>
+				<unitPattern count="other">{0} ਵਰਗ ਮੀਲ</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ਏਕੜ</displayName>
+				<unitPattern count="one">{0} ਏਕੜ</unitPattern>
+				<unitPattern count="other">{0} ਏਕੜ</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>ਵਰਗ ਗਜ਼</displayName>
+				<unitPattern count="one">{0} ਵਰਗ ਗਜ਼</unitPattern>
+				<unitPattern count="other">{0} ਵਰਗ ਗਜ਼</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ਵਰਗ ਫੁੱਟ</displayName>
@@ -5335,91 +5542,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ਵਰਗ ਇੰਚ</displayName>
 				<unitPattern count="one">{0} ਵਰਗ ਇੰਚ</unitPattern>
 				<unitPattern count="other">{0} ਵਰਗ ਇੰਚ</unitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤੀ ਵਰਗ ਇੰਚ</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>ਵਰਗ ਕਿਲੋਮੀਟਰ</displayName>
-				<unitPattern count="one">{0} ਵਰਗ ਕਿਲੋਮੀਟਰ</unitPattern>
-				<unitPattern count="other">{0} ਵਰਗ ਕਿਲੋਮੀਟਰ</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>ਵਰਗ ਮੀਟਰ</displayName>
-				<unitPattern count="one">{0} ਵਰਗ ਮੀਟਰ</unitPattern>
-				<unitPattern count="other">{0} ਵਰਗ ਮੀਟਰ</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>ਵਰਗ ਮੀਲ</displayName>
-				<unitPattern count="one">{0} ਵਰਗ ਮੀਲ</unitPattern>
-				<unitPattern count="other">{0} ਵਰਗ ਮੀਲ</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>ਵਰਗ ਗਜ਼</displayName>
-				<unitPattern count="one">{0} ਵਰਗ ਗਜ਼</unitPattern>
-				<unitPattern count="other">{0} ਵਰਗ ਗਜ਼</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>ਕੇਰਟ</displayName>
+				<unitPattern count="one">{0} ਕੇਰਟ</unitPattern>
+				<unitPattern count="other">{0} ਕੇਰਟ</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ਲਿਟਰ ਪ੍ਰਤੀ ਕਿਲੋਮੀਟਰ</displayName>
 				<unitPattern count="one">{0} ਲਿਟਰ ਪ੍ਰਤੀ ਕਿਲੋਮੀਟਰ</unitPattern>
 				<unitPattern count="other">{0} ਲਿਟਰ ਪ੍ਰਤੀ ਕਿਲੋਮੀਟਰ</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ਲਿਟਰ ਪ੍ਰਤੀ 100 ਕਿਲੋਮੀਟਰ</displayName>
+				<unitPattern count="one">{0} ਲਿਟਰ ਪ੍ਰਤੀ 100 ਕਿਲੋਮੀਟਰ</unitPattern>
+				<unitPattern count="other">{0} ਲਿਟਰ ਪ੍ਰਤੀ 100 ਕਿਲੋਮੀਟਰ</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>ਮੀਲ ਪ੍ਰਤੀ ਗੈਲਨ</displayName>
 				<unitPattern count="one">{0} ਮੀਲ ਪ੍ਰਤੀ ਗੈਲਨ</unitPattern>
 				<unitPattern count="other">{0} ਮੀਲ ਪ੍ਰਤੀ ਗੈਲਨ</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>ਬਿਟ</displayName>
-				<unitPattern count="one">{0} ਬਿਟ</unitPattern>
-				<unitPattern count="other">{0} ਬਿਟ</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>ਬਾਇਟ</displayName>
-				<unitPattern count="one">{0} ਬਾਇਟ</unitPattern>
-				<unitPattern count="other">{0} ਬਾਇਟ</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>ਗੀਗਾਬਿਟ</displayName>
-				<unitPattern count="one">{0} ਗੀਗਾਬਿਟ</unitPattern>
-				<unitPattern count="other">{0} ਗੀਗਾਬਿਟ</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>ਗੀਗਾਬਾਇਟ</displayName>
-				<unitPattern count="one">{0} ਗੀਗਾਬਾਇਟ</unitPattern>
-				<unitPattern count="other">{0} ਗੀਗਾਬਾਇਟ</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>ਕਿਲੋਬਿਟ</displayName>
-				<unitPattern count="one">{0} ਕਿਲੋਬਿਟ</unitPattern>
-				<unitPattern count="other">{0} ਕਿਲੋਬਿਟ</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>ਕਿਲੋਬਾਇਟ</displayName>
-				<unitPattern count="one">{0} ਕਿਲੋਬਾਇਟ</unitPattern>
-				<unitPattern count="other">{0} ਕਿਲੋਬਾਇਟ</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>ਮੈਗਾਬਿਟ</displayName>
-				<unitPattern count="one">{0} ਮੈਗਾਬਿਟ</unitPattern>
-				<unitPattern count="other">{0} ਮੈਗਾਬਿਟ</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>ਮੈਗਾਬਾਇਟ</displayName>
-				<unitPattern count="one">{0} ਮੈਗਾਬਾਇਟ</unitPattern>
-				<unitPattern count="other">{0} ਮੈਗਾਬਾਇਟ</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>ਟੇਰਾਬਿਟ</displayName>
-				<unitPattern count="one">{0} ਟੇਰਾਬਿਟ</unitPattern>
-				<unitPattern count="other">{0} ਟੇਰਾਬਿਟ</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>ਟੇਰਾਬਾਇਟ</displayName>
 				<unitPattern count="one">{0} ਟੇਰਾਬਾਇਟ</unitPattern>
 				<unitPattern count="other">{0} ਟੇਰਾਬਾਇਟ</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>ਟੇਰਾਬਿਟ</displayName>
+				<unitPattern count="one">{0} ਟੇਰਾਬਿਟ</unitPattern>
+				<unitPattern count="other">{0} ਟੇਰਾਬਿਟ</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>ਗੀਗਾਬਾਇਟ</displayName>
+				<unitPattern count="one">{0} ਗੀਗਾਬਾਇਟ</unitPattern>
+				<unitPattern count="other">{0} ਗੀਗਾਬਾਇਟ</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>ਗੀਗਾਬਿਟ</displayName>
+				<unitPattern count="one">{0} ਗੀਗਾਬਿਟ</unitPattern>
+				<unitPattern count="other">{0} ਗੀਗਾਬਿਟ</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>ਮੈਗਾਬਾਇਟ</displayName>
+				<unitPattern count="one">{0} ਮੈਗਾਬਾਇਟ</unitPattern>
+				<unitPattern count="other">{0} ਮੈਗਾਬਾਇਟ</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>ਮੈਗਾਬਿਟ</displayName>
+				<unitPattern count="one">{0} ਮੈਗਾਬਿਟ</unitPattern>
+				<unitPattern count="other">{0} ਮੈਗਾਬਿਟ</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>ਕਿਲੋਬਾਇਟ</displayName>
+				<unitPattern count="one">{0} ਕਿਲੋਬਾਇਟ</unitPattern>
+				<unitPattern count="other">{0} ਕਿਲੋਬਾਇਟ</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>ਕਿਲੋਬਿਟ</displayName>
+				<unitPattern count="one">{0} ਕਿਲੋਬਿਟ</unitPattern>
+				<unitPattern count="other">{0} ਕਿਲੋਬਿਟ</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>ਬਾਇਟ</displayName>
+				<unitPattern count="one">{0} ਬਾਇਟ</unitPattern>
+				<unitPattern count="other">{0} ਬਾਇਟ</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>ਬਿਟ</displayName>
+				<unitPattern count="one">{0} ਬਿਟ</unitPattern>
+				<unitPattern count="other">{0} ਬਿਟ</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>ਸਦੀਆਂ</displayName>
+				<unitPattern count="one">{0} ਸਦੀ</unitPattern>
+				<unitPattern count="other">{0} ਸਦੀਆਂ</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ਸਾਲ</displayName>
+				<unitPattern count="one">{0} ਸਾਲ</unitPattern>
+				<unitPattern count="other">{0} ਸਾਲ</unitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤੀ ਸਾਲ</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ਮਹੀਨੇ</displayName>
+				<unitPattern count="one">{0} ਮਹੀਨਾ</unitPattern>
+				<unitPattern count="other">{0} ਮਹੀਨੇ</unitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤੀ ਮਹੀਨਾ</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ਹਫ਼ਤੇ</displayName>
+				<unitPattern count="one">{0} ਹਫ਼ਤਾ</unitPattern>
+				<unitPattern count="other">{0} ਹਫ਼ਤੇ</unitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤੀ ਹਫ਼ਤਾ</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ਦਿਨ</displayName>
 				<unitPattern count="one">{0} ਦਿਨ</unitPattern>
 				<unitPattern count="other">{0} ਦਿਨ</unitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤੀ ਦਿਨ</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>ਘੰਟੇ</displayName>
@@ -5427,30 +5649,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ਘੰਟੇ</unitPattern>
 				<perUnitPattern>{0} ਪ੍ਰਤੀ ਘੰਟਾ</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>ਮਾਈਕਰੋਸਕਿੰਟ</displayName>
-				<unitPattern count="one">{0} ਮਾਈਕਰੋਸਕਿੰਟ</unitPattern>
-				<unitPattern count="other">{0} ਮਾਈਕਰੋਸਕਿੰਟ</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ਮਿਲੀਸਕਿੰਟ</displayName>
-				<unitPattern count="one">{0} ਮਿਲੀਸਕਿੰਟ</unitPattern>
-				<unitPattern count="other">{0} ਮਿਲੀਸਕਿੰਟ</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>ਮਿੰਟ</displayName>
 				<unitPattern count="one">{0} ਮਿੰਟ</unitPattern>
 				<unitPattern count="other">{0} ਮਿੰਟ</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>ਮਹੀਨੇ</displayName>
-				<unitPattern count="one">{0} ਮਹੀਨਾ</unitPattern>
-				<unitPattern count="other">{0} ਮਹੀਨੇ</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ਨੈਨੋਸਕਿੰਟ</displayName>
-				<unitPattern count="one">{0} ਨੈਨੋਸਕਿੰਟ</unitPattern>
-				<unitPattern count="other">{0} ਨੈਨੋਸਕਿੰਟ</unitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤੀ ਮਿੰਟ</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>ਸਕਿੰਟ</displayName>
@@ -5458,15 +5661,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ਸਕਿੰਟ</unitPattern>
 				<perUnitPattern>{0} ਪ੍ਰਤੀ ਸਕਿੰਟ</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>ਹਫ਼ਤੇ</displayName>
-				<unitPattern count="one">{0} ਹਫ਼ਤਾ</unitPattern>
-				<unitPattern count="other">{0} ਹਫ਼ਤੇ</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ਮਿਲੀਸਕਿੰਟ</displayName>
+				<unitPattern count="one">{0} ਮਿਲੀਸਕਿੰਟ</unitPattern>
+				<unitPattern count="other">{0} ਮਿਲੀਸਕਿੰਟ</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>ਸਾਲ</displayName>
-				<unitPattern count="one">{0} ਸਾਲ</unitPattern>
-				<unitPattern count="other">{0} ਸਾਲ</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>ਮਾਈਕਰੋਸਕਿੰਟ</displayName>
+				<unitPattern count="one">{0} ਮਾਈਕਰੋਸਕਿੰਟ</unitPattern>
+				<unitPattern count="other">{0} ਮਾਈਕਰੋਸਕਿੰਟ</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ਨੈਨੋਸਕਿੰਟ</displayName>
+				<unitPattern count="one">{0} ਨੈਨੋਸਕਿੰਟ</unitPattern>
+				<unitPattern count="other">{0} ਨੈਨੋਸਕਿੰਟ</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ਐਮਪੀਅਰ</displayName>
@@ -5488,6 +5696,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ਵੋਲਟ</unitPattern>
 				<unitPattern count="other">{0} ਵੋਲਟ</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>ਕਿਲੋਕੈਲੋਰੀਆਂ</displayName>
+				<unitPattern count="one">{0} ਕਿਲੋਕੈਲੋਰੀ</unitPattern>
+				<unitPattern count="other">{0} ਕਿਲੋਕੈਲੋਰੀਆਂ</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>ਕੈਲੋਰੀਆਂ</displayName>
 				<unitPattern count="one">{0} ਕੈਲੋਰੀ</unitPattern>
@@ -5498,21 +5711,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ਕੈਲੋਰੀ</unitPattern>
 				<unitPattern count="other">{0} ਕੈਲੋਰੀਆਂ</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>ਜੂਲ</displayName>
-				<unitPattern count="one">{0} ਜੂਲ</unitPattern>
-				<unitPattern count="other">{0} ਜੂਲ</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>ਕਿਲੋਕੈਲੋਰੀਆਂ</displayName>
-				<unitPattern count="one">{0} ਕਿਲੋਕੈਲੋਰੀ</unitPattern>
-				<unitPattern count="other">{0} ਕਿਲੋਕੈਲੋਰੀਆਂ</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>ਕਿਲੋਜੂਲ</displayName>
 				<unitPattern count="one">{0} ਕਿਲੋਜੂਲ</unitPattern>
 				<unitPattern count="other">{0} ਕਿਲੋਜੂਲ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>ਜੂਲ</displayName>
+				<unitPattern count="one">{0} ਜੂਲ</unitPattern>
+				<unitPattern count="other">{0} ਜੂਲ</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>ਕਿਲੋਵਾਟ-ਘੰਟੇ</displayName>
 				<unitPattern count="one">{0} ਕਿਲੋਵਾਟ ਘੰਟਾ</unitPattern>
@@ -5523,216 +5731,220 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ਗੀਗਾਹਰਟਜ਼</unitPattern>
 				<unitPattern count="other">{0} ਗੀਗਾਹਰਟਜ਼</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>ਹਰਟਜ਼</displayName>
-				<unitPattern count="one">{0} ਹਰਟਜ਼</unitPattern>
-				<unitPattern count="other">{0} ਹਰਟਜ਼</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>ਮੈਗਾਹਰਟਜ਼</displayName>
+				<unitPattern count="one">{0} ਮੈਗਾਹਰਟਜ਼</unitPattern>
+				<unitPattern count="other">{0} ਮੈਗਾਹਰਟਜ਼</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>ਕਿਲੋਹਰਟਜ਼</displayName>
 				<unitPattern count="one">{0} ਕਿਲੋਹਰਟਜ਼</unitPattern>
 				<unitPattern count="other">{0} ਕਿਲੋਹਰਟਜ਼</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>ਮੈਗਾਹਰਟਜ਼</displayName>
-				<unitPattern count="one">{0} ਮੈਗਾਹਰਟਜ਼</unitPattern>
-				<unitPattern count="other">{0} ਮੈਗਾਹਰਟਜ਼</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>ਹਰਟਜ਼</displayName>
+				<unitPattern count="one">{0} ਹਰਟਜ਼</unitPattern>
+				<unitPattern count="other">{0} ਹਰਟਜ਼</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>ਖਗੋਲੀ ਇਕਾਈਆਂ</displayName>
-				<unitPattern count="one">{0} ਖਗੋਲੀ ਇਕਾਈ</unitPattern>
-				<unitPattern count="other">{0} ਖਗੋਲੀ ਇਕਾਈਆਂ</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>ਕਿਲੋਮੀਟਰ</displayName>
+				<unitPattern count="one">{0} ਕਿਲੋਮੀਟਰ</unitPattern>
+				<unitPattern count="other">{0} ਕਿਲੋਮੀਟਰ</unitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤੀ ਕਿਲੋਮੀਟਰ</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>ਸੈਂਟੀਮੀਟਰ</displayName>
-				<unitPattern count="one">{0} ਸੈਂਟੀਮੀਟਰ</unitPattern>
-				<unitPattern count="other">{0} ਸੈਂਟੀਮੀਟਰ</unitPattern>
+			<unit type="length-meter">
+				<displayName>ਮੀਟਰ</displayName>
+				<unitPattern count="one">{0} ਮੀਟਰ</unitPattern>
+				<unitPattern count="other">{0} ਮੀਟਰ</unitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤੀ ਮੀਟਰ</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>ਡੈਸੀਮੀਟਰ</displayName>
 				<unitPattern count="one">{0} ਡੈਸੀਮੀਟਰ</unitPattern>
 				<unitPattern count="other">{0} ਡੈਸੀਮੀਟਰ</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName>ਫ਼ੈਦਮ</displayName>
-				<unitPattern count="one">{0} ਫ਼ੈਦਮ</unitPattern>
-				<unitPattern count="other">{0} ਫ਼ੈਦਮ</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>ਫੁੱਟ</displayName>
-				<unitPattern count="one">{0} ਫੁੱਟ</unitPattern>
-				<unitPattern count="other">{0} ਫੁੱਟ</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>ਫਰਲਾਂਗ</displayName>
-				<unitPattern count="one">{0} ਫਰਲਾਂਗ</unitPattern>
-				<unitPattern count="other">{0} ਫਰਲਾਂਗ</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>ਇੰਚ</displayName>
-				<unitPattern count="one">{0} ਇੰਚ</unitPattern>
-				<unitPattern count="other">{0} ਇੰਚ</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>ਕਿਲੋਮੀਟਰ</displayName>
-				<unitPattern count="one">{0} ਕਿਲੋਮੀਟਰ</unitPattern>
-				<unitPattern count="other">{0} ਕਿਲੋਮੀਟਰ</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ਪ੍ਰਕਾਸ਼ ਸਾਲ</displayName>
-				<unitPattern count="one">{0} ਪ੍ਰਕਾਸ਼ ਸਾਲ</unitPattern>
-				<unitPattern count="other">{0} ਪ੍ਰਕਾਸ਼ ਸਾਲ</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>ਮੀਟਰ</displayName>
-				<unitPattern count="one">{0} ਮੀਟਰ</unitPattern>
-				<unitPattern count="other">{0} ਮੀਟਰ</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>ਮਾਈਕਰੋਮੀਟਰ</displayName>
-				<unitPattern count="one">{0} ਮਾਈਕਰੋਮੀਟਰ</unitPattern>
-				<unitPattern count="other">{0} ਮਾਈਕਰੋਮੀਟਰ</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>ਮੀਲ</displayName>
-				<unitPattern count="one">{0} ਮੀਲ</unitPattern>
-				<unitPattern count="other">{0} ਮੀਲ</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>ਸੈਂਟੀਮੀਟਰ</displayName>
+				<unitPattern count="one">{0} ਸੈਂਟੀਮੀਟਰ</unitPattern>
+				<unitPattern count="other">{0} ਸੈਂਟੀਮੀਟਰ</unitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤੀ ਸੈਂਟੀਮੀਟਰ</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>ਮਿਲੀਮੀਟਰ</displayName>
 				<unitPattern count="one">{0} ਮਿਲੀਮੀਟਰ</unitPattern>
 				<unitPattern count="other">{0} ਮਿਲੀਮੀਟਰ</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>ਮਾਈਕਰੋਮੀਟਰ</displayName>
+				<unitPattern count="one">{0} ਮਾਈਕਰੋਮੀਟਰ</unitPattern>
+				<unitPattern count="other">{0} ਮਾਈਕਰੋਮੀਟਰ</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>ਨੈਨੋਮੀਟਰ</displayName>
 				<unitPattern count="one">{0} ਨੈਨੋਮੀਟਰ</unitPattern>
 				<unitPattern count="other">{0} ਨੈਨੋਮੀਟਰ</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>ਨੋਟੀਕਲ ਮੀਲ</displayName>
-				<unitPattern count="one">{0} ਨੋਟੀਕਲ ਮੀਲ</unitPattern>
-				<unitPattern count="other">{0} ਨੋਟੀਕਲ ਮੀਲ</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>ਪਾਸੈੱਕ</displayName>
-				<unitPattern count="one">{0} ਪਾਸੈੱਕ</unitPattern>
-				<unitPattern count="other">{0} ਪਾਸੈੱਕ</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>ਪਿਕੋਮੀਟਰ</displayName>
 				<unitPattern count="one">{0} ਪਿਕੋਮੀਟਰ</unitPattern>
 				<unitPattern count="other">{0} ਪਿਕੋਮੀਟਰ</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>ਮੀਲ</displayName>
+				<unitPattern count="one">{0} ਮੀਲ</unitPattern>
+				<unitPattern count="other">{0} ਮੀਲ</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>ਗਜ਼</displayName>
 				<unitPattern count="one">{0} ਗਜ਼</unitPattern>
 				<unitPattern count="other">{0} ਗਜ਼</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ਫੁੱਟ</displayName>
+				<unitPattern count="one">{0} ਫੁੱਟ</unitPattern>
+				<unitPattern count="other">{0} ਫੁੱਟ</unitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤੀ ਫੁੱਟ</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>ਇੰਚ</displayName>
+				<unitPattern count="one">{0} ਇੰਚ</unitPattern>
+				<unitPattern count="other">{0} ਇੰਚ</unitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤੀ ਇੰਚ</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>ਪਾਸੈੱਕ</displayName>
+				<unitPattern count="one">{0} ਪਾਸੈੱਕ</unitPattern>
+				<unitPattern count="other">{0} ਪਾਸੈੱਕ</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ਪ੍ਰਕਾਸ਼ ਸਾਲ</displayName>
+				<unitPattern count="one">{0} ਪ੍ਰਕਾਸ਼ ਸਾਲ</unitPattern>
+				<unitPattern count="other">{0} ਪ੍ਰਕਾਸ਼ ਸਾਲ</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ਖਗੋਲੀ ਇਕਾਈਆਂ</displayName>
+				<unitPattern count="one">{0} ਖਗੋਲੀ ਇਕਾਈ</unitPattern>
+				<unitPattern count="other">{0} ਖਗੋਲੀ ਇਕਾਈਆਂ</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>ਫਰਲਾਂਗ</displayName>
+				<unitPattern count="one">{0} ਫਰਲਾਂਗ</unitPattern>
+				<unitPattern count="other">{0} ਫਰਲਾਂਗ</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>ਫ਼ੈਦਮ</displayName>
+				<unitPattern count="one">{0} ਫ਼ੈਦਮ</unitPattern>
+				<unitPattern count="other">{0} ਫ਼ੈਦਮ</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>ਨੋਟੀਕਲ ਮੀਲ</displayName>
+				<unitPattern count="one">{0} ਨੋਟੀਕਲ ਮੀਲ</unitPattern>
+				<unitPattern count="other">{0} ਨੋਟੀਕਲ ਮੀਲ</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>ਮੀਲ-ਸਕੈਂਡਿਨੇਵਿਆਈ</displayName>
+				<unitPattern count="one">{0} ਮੀਲ-ਸਕੈਂਡਿਨੇਵਿਆਈ</unitPattern>
+				<unitPattern count="other">{0} ਮੀਲ-ਸਕੈਂਡਿਨੇਵਿਆਈ</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>ਲਕਸ</displayName>
 				<unitPattern count="one">{0} ਲਕਸ</unitPattern>
 				<unitPattern count="other">{0} ਲਕਸ</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>ਕੈਰਟ</displayName>
-				<unitPattern count="one">{0} ਕੈਰਟ</unitPattern>
-				<unitPattern count="other">{0} ਕੈਰਟ</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>ਗ੍ਰਾਮ</displayName>
-				<unitPattern count="one">{0} ਗ੍ਰਾਮ</unitPattern>
-				<unitPattern count="other">{0} ਗ੍ਰਾਮ</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>ਕਿਲੋਗ੍ਰਾਮ</displayName>
-				<unitPattern count="one">{0} ਕਿਲੋਗ੍ਰਾਮ</unitPattern>
-				<unitPattern count="other">{0} ਕਿਲੋਗ੍ਰਾਮ</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>ਮੀਟਰਿਕ ਟਨ</displayName>
 				<unitPattern count="one">{0} ਮੀਟਰਿਕ ਟਨ</unitPattern>
 				<unitPattern count="other">{0} ਮੀਟਰਿਕ ਟਨ</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>ਮਾਈਕਰੋਗ੍ਰਾਮ</displayName>
-				<unitPattern count="one">{0} ਮਾਈਕਰੋਗ੍ਰਾਮ</unitPattern>
-				<unitPattern count="other">{0} ਮਾਈਕਰੋਗ੍ਰਾਮ</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>ਕਿਲੋਗ੍ਰਾਮ</displayName>
+				<unitPattern count="one">{0} ਕਿਲੋਗ੍ਰਾਮ</unitPattern>
+				<unitPattern count="other">{0} ਕਿਲੋਗ੍ਰਾਮ</unitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤੀ ਕਿਲੋਗ੍ਰਾਮ</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>ਗ੍ਰਾਮ</displayName>
+				<unitPattern count="one">{0} ਗ੍ਰਾਮ</unitPattern>
+				<unitPattern count="other">{0} ਗ੍ਰਾਮ</unitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤੀ ਗ੍ਰਾਮ</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>ਮਿਲੀਗ੍ਰਾਮ</displayName>
 				<unitPattern count="one">{0} ਮਿਲੀਗ੍ਰਾਮ</unitPattern>
 				<unitPattern count="other">{0} ਮਿਲੀਗ੍ਰਾਮ</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ਔਂਸ</displayName>
-				<unitPattern count="one">{0} ਔਂਸ</unitPattern>
-				<unitPattern count="other">{0} ਔਂਸ</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ਟਰੌਏ ਔਂਸ</displayName>
-				<unitPattern count="one">{0} ਟਰੌਏ ਔਂਸ</unitPattern>
-				<unitPattern count="other">{0} ਟਰੌਏ ਔਂਸ</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>ਪੌਂਡ</displayName>
-				<unitPattern count="one">{0} ਪੌਂਡ</unitPattern>
-				<unitPattern count="other">{0} ਪੌਂਡ</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>ਸਟੋਨ</displayName>
-				<unitPattern count="one">{0} ਸਟੋਨ</unitPattern>
-				<unitPattern count="other">{0} ਸਟੋਨ</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>ਮਾਈਕਰੋਗ੍ਰਾਮ</displayName>
+				<unitPattern count="one">{0} ਮਾਈਕਰੋਗ੍ਰਾਮ</unitPattern>
+				<unitPattern count="other">{0} ਮਾਈਕਰੋਗ੍ਰਾਮ</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>ਟਨ</displayName>
 				<unitPattern count="one">{0} ਟਨ</unitPattern>
 				<unitPattern count="other">{0} ਟਨ</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName>ਸਟੋਨ</displayName>
+				<unitPattern count="one">{0} ਸਟੋਨ</unitPattern>
+				<unitPattern count="other">{0} ਸਟੋਨ</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>ਪੌਂਡ</displayName>
+				<unitPattern count="one">{0} ਪੌਂਡ</unitPattern>
+				<unitPattern count="other">{0} ਪੌਂਡ</unitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤੀ ਪੌਂਡ</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ਔਂਸ</displayName>
+				<unitPattern count="one">{0} ਔਂਸ</unitPattern>
+				<unitPattern count="other">{0} ਔਂਸ</unitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤੀ ਔਂਸ</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ਟਰੌਏ ਔਂਸ</displayName>
+				<unitPattern count="one">{0} ਟਰੌਏ ਔਂਸ</unitPattern>
+				<unitPattern count="other">{0} ਟਰੌਏ ਔਂਸ</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>ਕੈਰਟ</displayName>
+				<unitPattern count="one">{0} ਕੈਰਟ</unitPattern>
+				<unitPattern count="other">{0} ਕੈਰਟ</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>ਗੀਗਾਵਾਟ</displayName>
 				<unitPattern count="one">{0} ਗੀਗਾਵਾਟ</unitPattern>
 				<unitPattern count="other">{0} ਗੀਗਾਵਾਟ</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>ਹੌਰਸਪਾਵਰ</displayName>
-				<unitPattern count="one">{0} ਹੌਰਸਪਾਵਰ</unitPattern>
-				<unitPattern count="other">{0} ਹੌਰਸਪਾਵਰ</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>ਕਿਲੋਵਾਟ</displayName>
-				<unitPattern count="one">{0} ਕਿਲੋਵਾਟ</unitPattern>
-				<unitPattern count="other">{0} ਕਿਲੋਵਾਟ</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>ਮੈਗਾਵਾਟ</displayName>
 				<unitPattern count="one">{0} ਮੈਗਾਵਾਟ</unitPattern>
 				<unitPattern count="other">{0} ਮੈਗਾਵਾਟ</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>ਮਿਲੀਵਾਟ</displayName>
-				<unitPattern count="one">{0} ਮਿਲੀਵਾਟ</unitPattern>
-				<unitPattern count="other">{0} ਮਿਲੀਵਾਟ</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>ਕਿਲੋਵਾਟ</displayName>
+				<unitPattern count="one">{0} ਕਿਲੋਵਾਟ</unitPattern>
+				<unitPattern count="other">{0} ਕਿਲੋਵਾਟ</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>ਵਾਟ</displayName>
 				<unitPattern count="one">{0} ਵਾਟ</unitPattern>
 				<unitPattern count="other">{0} ਵਾਟ</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>ਮਿਲੀਵਾਟ</displayName>
+				<unitPattern count="one">{0} ਮਿਲੀਵਾਟ</unitPattern>
+				<unitPattern count="other">{0} ਮਿਲੀਵਾਟ</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>ਹੌਰਸਪਾਵਰ</displayName>
+				<unitPattern count="one">{0} ਹੌਰਸਪਾਵਰ</unitPattern>
+				<unitPattern count="other">{0} ਹੌਰਸਪਾਵਰ</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>ਹੈਕਟੋਪਾਸਕਲ</displayName>
 				<unitPattern count="one">{0} ਹੈਕਟੋਪਾਸਕਲ</unitPattern>
 				<unitPattern count="other">{0} ਹੈਕਟੋਪਾਸਕਲ</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>ਇੰਚ ਪਾਰਾ</displayName>
-				<unitPattern count="one">{0} ਇੰਚ ਪਾਰਾ</unitPattern>
-				<unitPattern count="other">{0} ਇੰਚ ਪਾਰਾ</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>ਮਿਲੀਬਾਰ</displayName>
-				<unitPattern count="one">{0} ਮਿਲੀਬਾਰ</unitPattern>
-				<unitPattern count="other">{0} ਮਿਲੀਬਾਰ</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>ਮਿਲੀਮੀਟਰ ਪਾਰਾ</displayName>
 				<unitPattern count="one">{0} ਮਿਲੀਮੀਟਰ ਪਾਰਾ</unitPattern>
@@ -5743,10 +5955,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ਪੌਂਡ ਪ੍ਰਤੀ ਵਰਗ ਇੰਚ</unitPattern>
 				<unitPattern count="other">{0} ਪੌਂਡ ਪ੍ਰਤੀ ਵਰਗ ਇੰਚ</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>ਕੇਰਟ</displayName>
-				<unitPattern count="one">{0} ਕੇਰਟ</unitPattern>
-				<unitPattern count="other">{0} ਕੇਰਟ</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>ਇੰਚ ਪਾਰਾ</displayName>
+				<unitPattern count="one">{0} ਇੰਚ ਪਾਰਾ</unitPattern>
+				<unitPattern count="other">{0} ਇੰਚ ਪਾਰਾ</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>ਮਿਲੀਬਾਰ</displayName>
+				<unitPattern count="one">{0} ਮਿਲੀਬਾਰ</unitPattern>
+				<unitPattern count="other">{0} ਮਿਲੀਬਾਰ</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>ਕਿਲੋਮੀਟਰ ਪ੍ਰਤੀ ਘੰਟਾ</displayName>
@@ -5763,6 +5980,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ਮੀਲ ਪ੍ਰਤੀ ਘੰਟਾ</unitPattern>
 				<unitPattern count="other">{0} ਮੀਲ ਪ੍ਰਤੀ ਘੰਟਾ</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>ਨੌਟ</displayName>
+				<unitPattern count="one">{0} ਨੌਟ</unitPattern>
+				<unitPattern count="other">{0} ਨੌਟ</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>ਦਰਜੇ ਸੈਲਸੀਅਸ</displayName>
 				<unitPattern count="one">{0} ਦਰਜਾ ਸੈਲਸੀਅਸ</unitPattern>
@@ -5778,36 +6005,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ਕੈਲਵਿਨ</unitPattern>
 				<unitPattern count="other">{0} ਕੈਲਵਿਨ</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ਏਕੜ ਫੁੱਟ</displayName>
-				<unitPattern count="one">{0} ਏਕੜ ਫੁੱਟ</unitPattern>
-				<unitPattern count="other">{0} ਏਕੜ ਫੁੱਟ</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>ਬੁਸ਼ਲ</displayName>
-				<unitPattern count="one">{0} ਬੁਸ਼ਲ</unitPattern>
-				<unitPattern count="other">{0} ਬੁਸ਼ਲ</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>ਸੈਂਟੀਲਿਟਰ</displayName>
-				<unitPattern count="one">{0} ਸੈਂਟੀਲਿਟਰ</unitPattern>
-				<unitPattern count="other">{0} ਸੈਂਟੀਲਿਟਰ</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>ਘਣ ਸੈਂਟੀਮੀਟਰ</displayName>
-				<unitPattern count="one">{0} ਘਣ ਸੈਂਟੀਮੀਟਰ</unitPattern>
-				<unitPattern count="other">{0} ਘਣ ਸੈਂਟੀਮੀਟਰ</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ਘਣ ਫੁੱਟ</displayName>
-				<unitPattern count="one">{0} ਘਣ ਫੁੱਟ</unitPattern>
-				<unitPattern count="other">{0} ਘਣ ਫੁੱਟ</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>ਘਣ ਇੰਚ</displayName>
-				<unitPattern count="one">{0} ਘਣ ਇੰਚ</unitPattern>
-				<unitPattern count="other">{0} ਘਣ ਇੰਚ</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>ਘਣ ਕਿਲੋਮੀਟਰ</displayName>
 				<unitPattern count="one">{0} ਘਣ ਕਿਲੋਮੀਟਰ</unitPattern>
@@ -5817,6 +6014,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ਘਣ ਮੀਟਰ</displayName>
 				<unitPattern count="one">{0} ਘਣ ਮੀਟਰ</unitPattern>
 				<unitPattern count="other">{0} ਘਣ ਮੀਟਰ</unitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤੀ ਘਣ ਮੀਟਰ</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>ਘਣ ਸੈਂਟੀਮੀਟਰ</displayName>
+				<unitPattern count="one">{0} ਘਣ ਸੈਂਟੀਮੀਟਰ</unitPattern>
+				<unitPattern count="other">{0} ਘਣ ਸੈਂਟੀਮੀਟਰ</unitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤੀ ਘਣ ਸੈਂਟੀਮੀਟਰ</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>ਘਣ ਮੀਲ</displayName>
@@ -5828,25 +6032,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ਘਣ ਗਜ਼</unitPattern>
 				<unitPattern count="other">{0} ਘਣ ਗਜ਼</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>ਕੱਪ</displayName>
-				<unitPattern count="one">{0} ਕੱਪ</unitPattern>
-				<unitPattern count="other">{0} ਕੱਪ</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ਘਣ ਫੁੱਟ</displayName>
+				<unitPattern count="one">{0} ਘਣ ਫੁੱਟ</unitPattern>
+				<unitPattern count="other">{0} ਘਣ ਫੁੱਟ</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>ਡੈਸੀਲਿਟਰ</displayName>
-				<unitPattern count="one">{0} ਡੈਸੀਲਿਟਰ</unitPattern>
-				<unitPattern count="other">{0} ਡੈਸੀਲਿਟਰ</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>ਘਣ ਇੰਚ</displayName>
+				<unitPattern count="one">{0} ਘਣ ਇੰਚ</unitPattern>
+				<unitPattern count="other">{0} ਘਣ ਇੰਚ</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>ਤਰਲ ਔਂਸ</displayName>
-				<unitPattern count="one">{0} ਤਰਲ ਔਂਸ</unitPattern>
-				<unitPattern count="other">{0} ਤਰਲ ਔਂਸ</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>ਗੈਲਨ</displayName>
-				<unitPattern count="one">{0} ਗੈਲਨ</unitPattern>
-				<unitPattern count="other">{0} ਗੈਲਨ</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ਮੈਗਾਲਿਟਰ</displayName>
+				<unitPattern count="one">{0} ਮੈਗਾਲਿਟਰ</unitPattern>
+				<unitPattern count="other">{0} ਮੈਗਾਲਿਟਰ</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>ਹੈਕਟੋਲਿਟਰ</displayName>
@@ -5857,27 +6056,69 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ਲਿਟਰ</displayName>
 				<unitPattern count="one">{0} ਲਿਟਰ</unitPattern>
 				<unitPattern count="other">{0} ਲਿਟਰ</unitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤੀ ਲਿਟਰ</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ਮੈਗਾਲਿਟਰ</displayName>
-				<unitPattern count="one">{0} ਮੈਗਾਲਿਟਰ</unitPattern>
-				<unitPattern count="other">{0} ਮੈਗਾਲਿਟਰ</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>ਡੈਸੀਲਿਟਰ</displayName>
+				<unitPattern count="one">{0} ਡੈਸੀਲਿਟਰ</unitPattern>
+				<unitPattern count="other">{0} ਡੈਸੀਲਿਟਰ</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>ਸੈਂਟੀਲਿਟਰ</displayName>
+				<unitPattern count="one">{0} ਸੈਂਟੀਲਿਟਰ</unitPattern>
+				<unitPattern count="other">{0} ਸੈਂਟੀਲਿਟਰ</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ਮਿਲੀਲਿਟਰ</displayName>
 				<unitPattern count="one">{0} ਮਿਲੀਲਿਟਰ</unitPattern>
 				<unitPattern count="other">{0} ਮਿਲੀਲਿਟਰ</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>ਪਿੰਟ</displayName>
-				<unitPattern count="one">{0} ਪਿੰਟ</unitPattern>
-				<unitPattern count="other">{0} ਪਿੰਟ</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>ਮੀਟਰਿਕ ਪਿੰਟ</displayName>
+				<unitPattern count="one">{0} ਮੀਟਰਿਕ ਪਿੰਟ</unitPattern>
+				<unitPattern count="other">{0} ਮੀਟਰਿਕ ਪਿੰਟ</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>ਮੀਟਰਿਕ ਕੱਪ</displayName>
+				<unitPattern count="one">{0} ਮੀਟਰਿਕ ਕੱਪ</unitPattern>
+				<unitPattern count="other">{0} ਮੀਟਰਿਕ ਕੱਪ</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ਏਕੜ ਫੁੱਟ</displayName>
+				<unitPattern count="one">{0} ਏਕੜ ਫੁੱਟ</unitPattern>
+				<unitPattern count="other">{0} ਏਕੜ ਫੁੱਟ</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>ਬੁਸ਼ਲ</displayName>
+				<unitPattern count="one">{0} ਬੁਸ਼ਲ</unitPattern>
+				<unitPattern count="other">{0} ਬੁਸ਼ਲ</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>ਗੈਲਨ</displayName>
+				<unitPattern count="one">{0} ਗੈਲਨ</unitPattern>
+				<unitPattern count="other">{0} ਗੈਲਨ</unitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤੀ ਗੈਲਨ</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>ਕੁਆਟ</displayName>
 				<unitPattern count="one">{0} ਕੁਆਟ</unitPattern>
 				<unitPattern count="other">{0} ਕੁਆਟ</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>ਪਿੰਟ</displayName>
+				<unitPattern count="one">{0} ਪਿੰਟ</unitPattern>
+				<unitPattern count="other">{0} ਪਿੰਟ</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>ਕੱਪ</displayName>
+				<unitPattern count="one">{0} ਕੱਪ</unitPattern>
+				<unitPattern count="other">{0} ਕੱਪ</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>ਤਰਲ ਔਂਸ</displayName>
+				<unitPattern count="one">{0} ਤਰਲ ਔਂਸ</unitPattern>
+				<unitPattern count="other">{0} ਤਰਲ ਔਂਸ</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>ਟੇਬਲ ਸਪੂਨ</displayName>
 				<unitPattern count="one">{0} ਟੇਬਲ ਸਪੂਨ</unitPattern>
@@ -5888,6 +6129,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ਟੀ ਸਪੂਨ</unitPattern>
 				<unitPattern count="other">{0} ਟੀ ਸਪੂਨ</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}ਪੂ</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}ਉ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}ਦੱ</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}ਪੱ</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -5903,6 +6150,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ਮੀ/ਸ²</unitPattern>
 				<unitPattern count="other">{0} ਮੀ/ਸ²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>ਪਰਿਕਰਮਾ</displayName>
+				<unitPattern count="one">{0} ਪਰਿਕਰਮਾ</unitPattern>
+				<unitPattern count="other">{0} ਪਰਿਕਰਮਾ</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>ਰੇਡੀਅਨ</displayName>
+				<unitPattern count="one">{0} ਰੇਡੀ.</unitPattern>
+				<unitPattern count="other">{0} ਰੇਡੀ.</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>ਡਿਗਰੀ</displayName>
+				<unitPattern count="one">{0} ਡਿ.</unitPattern>
+				<unitPattern count="other">{0} ਡਿ.</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>ਚਾਪ-ਮਿੰਟ</displayName>
 				<unitPattern count="one">{0} ਚਾਪਮਿੰਟ</unitPattern>
@@ -5913,30 +6175,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ਚਾਪ-ਸਕਿੰਟ</unitPattern>
 				<unitPattern count="other">{0} ਚਾਪ-ਸਕਿੰਟ</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>ਡਿਗਰੀ</displayName>
-				<unitPattern count="one">{0} ਡਿ.</unitPattern>
-				<unitPattern count="other">{0} ਡਿ.</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>ਰੇਡੀਅਨ</displayName>
-				<unitPattern count="one">{0} ਰੇਡੀ.</unitPattern>
-				<unitPattern count="other">{0} ਰੇਡੀ.</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ਏਕੜ</displayName>
-				<unitPattern count="one">{0} ਏਕੜ</unitPattern>
-				<unitPattern count="other">{0} ਏਕੜ</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>ਕਿਮੀ²</displayName>
+				<unitPattern count="one">{0} ਕਿਮੀ²</unitPattern>
+				<unitPattern count="other">{0} ਕਿਮੀ²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ਹੈਕਟੇਅਰ</displayName>
 				<unitPattern count="one">{0} ਹੈਕਟੇਅਰ</unitPattern>
 				<unitPattern count="other">{0} ਹੈਕਟੇਅਰ</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>ਮੀਟਰ²</displayName>
+				<unitPattern count="one">{0} ਮੀ²</unitPattern>
+				<unitPattern count="other">{0} ਮੀ²</unitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤੀ ਮੀ²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>ਸੈਮੀ²</displayName>
 				<unitPattern count="one">{0} ਸੈਮੀ²</unitPattern>
 				<unitPattern count="other">{0} ਸੈਮੀ²</unitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤੀ ਸੈਮੀ²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>ਵਰਗ ਮੀਲ</displayName>
+				<unitPattern count="one">{0} ਵ. ਮੀਲ</unitPattern>
+				<unitPattern count="other">{0} ਵ. ਮੀਲ</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ਏਕੜ</displayName>
+				<unitPattern count="one">{0} ਏਕੜ</unitPattern>
+				<unitPattern count="other">{0} ਏਕੜ</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>ਗਜ਼²</displayName>
+				<unitPattern count="one">{0} ਗਜ਼²</unitPattern>
+				<unitPattern count="other">{0} ਗਜ਼²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ਵ. ਫੁੱਟ</displayName>
@@ -5947,91 +6221,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ਇੰਚ²</displayName>
 				<unitPattern count="one">{0} ਇੰਚ²</unitPattern>
 				<unitPattern count="other">{0} ਇੰਚ²</unitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤੀ ਇੰਚ²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>ਕਿਮੀ²</displayName>
-				<unitPattern count="one">{0} ਕਿਮੀ²</unitPattern>
-				<unitPattern count="other">{0} ਕਿਮੀ²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>ਮੀਟਰ²</displayName>
-				<unitPattern count="one">{0} ਮੀ²</unitPattern>
-				<unitPattern count="other">{0} ਮੀ²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>ਵਰਗ ਮੀਲ</displayName>
-				<unitPattern count="one">{0} ਵ. ਮੀਲ</unitPattern>
-				<unitPattern count="other">{0} ਵ. ਮੀਲ</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>ਗਜ਼²</displayName>
-				<unitPattern count="one">{0} ਗਜ਼²</unitPattern>
-				<unitPattern count="other">{0} ਗਜ਼²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>ਕੇਰਟ</displayName>
+				<unitPattern count="one">{0} ਕੇਰਟ</unitPattern>
+				<unitPattern count="other">{0} ਕੇਰਟ</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ਲਿਟਰ/ਕਿ.ਮੀ.</displayName>
 				<unitPattern count="one">{0} ਲਿ./ਕਿ.ਮੀ.</unitPattern>
 				<unitPattern count="other">{0} ਲਿ./ਕਿ.ਮੀ.</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ਲਿ./100ਕਿ.ਮੀ.</displayName>
+				<unitPattern count="one">{0} ਲਿ./100 ਕਿ.ਮੀ.</unitPattern>
+				<unitPattern count="other">{0} ਲਿ./100 ਕਿ.ਮੀ.</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>ਮੀਲ/ਗੈਲਨ</displayName>
 				<unitPattern count="one">{0} ਮੀ.ਪ੍ਰ.ਗੈ.</unitPattern>
 				<unitPattern count="other">{0} ਮੀ.ਪ੍ਰ.ਗੈ.</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>ਬਿਟ</displayName>
-				<unitPattern count="one">{0} ਬਿਟ</unitPattern>
-				<unitPattern count="other">{0} ਬਿਟ</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>ਬਾਇਟ</displayName>
-				<unitPattern count="one">{0} ਬਾਇਟ</unitPattern>
-				<unitPattern count="other">{0} ਬਾਇਟ</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>ਗੀਗਾਬਾਇਟ</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>ਕਿਲੋਬਿਟ</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>ਕਿਲੋਬਾਇਟ</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>ਮੈਗਾਬਿਟ</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>ਮੈਗਾਬਾਇਟ</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>ਟੇਰਾਬਿਟ</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>ਟੇਰਾਬਾਇਟ</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>ਟੇਰਾਬਿਟ</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>ਗੀਗਾਬਾਇਟ</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gbit</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>ਮੈਗਾਬਾਇਟ</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>ਮੈਗਾਬਿਟ</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>ਕਿਲੋਬਾਇਟ</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>ਕਿਲੋਬਿਟ</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>ਬਾਇਟ</displayName>
+				<unitPattern count="one">{0} ਬਾਇਟ</unitPattern>
+				<unitPattern count="other">{0} ਬਾਇਟ</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>ਬਿਟ</displayName>
+				<unitPattern count="one">{0} ਬਿਟ</unitPattern>
+				<unitPattern count="other">{0} ਬਿਟ</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>ਸਦੀ</displayName>
+				<unitPattern count="one">{0} ਸਦੀ</unitPattern>
+				<unitPattern count="other">{0} ਸਦੀ</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ਸਾਲ</displayName>
+				<unitPattern count="one">{0} ਸਾਲ</unitPattern>
+				<unitPattern count="other">{0} ਸਾਲ</unitPattern>
+				<perUnitPattern>{0}/ਸਾਲ</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ਮਹੀਨੇ</displayName>
+				<unitPattern count="one">{0} ਮਹੀਨਾ</unitPattern>
+				<unitPattern count="other">{0} ਮਹੀਨੇ</unitPattern>
+				<perUnitPattern>{0}/ਮਹੀਨਾ</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ਹਫ਼ਤੇ</displayName>
+				<unitPattern count="one">{0} ਹਫ਼ਤਾ</unitPattern>
+				<unitPattern count="other">{0} ਹਫ਼ਤੇ</unitPattern>
+				<perUnitPattern>{0}/ਹਫ਼ਤਾ</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ਦਿਨ</displayName>
 				<unitPattern count="one">{0} ਦਿਨ</unitPattern>
 				<unitPattern count="other">{0} ਦਿਨ</unitPattern>
+				<perUnitPattern>{0}/ਦਿਨ</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>ਘੰਟੇ</displayName>
@@ -6039,30 +6328,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ਘੰਟੇ</unitPattern>
 				<perUnitPattern>{0} ਪ੍ਰ.ਘੰ.</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>ਮਾਈਕਰੋਸਕਿੰਟ</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ਮਿਲੀਸਕਿੰਟ</displayName>
-				<unitPattern count="one">{0} ਮਿਲੀਸਕਿੰਟ</unitPattern>
-				<unitPattern count="other">{0} ਮਿਲੀਸਕਿੰਟ</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>ਮਿੰਟ</displayName>
 				<unitPattern count="one">{0} ਮਿੰਟ</unitPattern>
 				<unitPattern count="other">{0} ਮਿੰਟ</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>ਮਹੀਨੇ</displayName>
-				<unitPattern count="one">{0} ਮਹੀਨਾ</unitPattern>
-				<unitPattern count="other">{0} ਮਹੀਨੇ</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ਨੈਨੋਸਕਿੰਟ</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/ਮਿੰਟ</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>ਸਕਿੰਟ</displayName>
@@ -6070,15 +6340,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ਸਕਿੰਟ</unitPattern>
 				<perUnitPattern>{0} ਪ੍ਰ.ਸ.</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>ਹਫ਼ਤੇ</displayName>
-				<unitPattern count="one">{0} ਹਫ਼ਤਾ</unitPattern>
-				<unitPattern count="other">{0} ਹਫ਼ਤੇ</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ਮਿਲੀਸਕਿੰਟ</displayName>
+				<unitPattern count="one">{0} ਮਿਲੀਸਕਿੰਟ</unitPattern>
+				<unitPattern count="other">{0} ਮਿਲੀਸਕਿੰਟ</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>ਸਾਲ</displayName>
-				<unitPattern count="one">{0} ਸਾਲ</unitPattern>
-				<unitPattern count="other">{0} ਸਾਲ</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>ਮਾਈਕਰੋਸਕਿੰਟ</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ਨੈਨੋਸਕਿੰਟ</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ਐਮਪੀਅਰ</displayName>
@@ -6100,6 +6375,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>ਕਿ.ਕੈਲੋਰੀ</displayName>
+				<unitPattern count="one">{0} ਕਿ.ਕੈਲੋਰੀ</unitPattern>
+				<unitPattern count="other">{0} ਕਿ.ਕੈਲੋਰੀਆਂ</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>ਕੈਲੋਰੀ</displayName>
 				<unitPattern count="one">{0} ਕੈਲੋਰੀ</unitPattern>
@@ -6110,21 +6390,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ਕੈਲੋਰੀ</unitPattern>
 				<unitPattern count="other">{0} ਕੈਲੋਰੀਆਂ</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>ਜੂਲ</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>ਕਿ.ਕੈਲੋਰੀ</displayName>
-				<unitPattern count="one">{0} ਕਿ.ਕੈਲੋਰੀ</unitPattern>
-				<unitPattern count="other">{0} ਕਿ.ਕੈਲੋਰੀਆਂ</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>ਕਿਲੋਜੂਲ</displayName>
 				<unitPattern count="one">{0} ਕਿ.ਜੂਲ</unitPattern>
 				<unitPattern count="other">{0} ਕਿ.ਜੂਲ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>ਜੂਲ</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>ਕਿ.ਵਾ.ਘੰ.</displayName>
 				<unitPattern count="one">{0} ਕਿ.ਵਾ.ਘੰ.</unitPattern>
@@ -6135,216 +6410,220 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>ਕਿ.ਮੀ.</displayName>
+				<unitPattern count="one">{0} ਕਿ.ਮੀ.</unitPattern>
+				<unitPattern count="other">{0} ਕਿ.ਮੀ.</unitPattern>
+				<perUnitPattern>{0}/ਕਿ.ਮੀ.</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>ਸੈਂ.ਮੀ.</displayName>
-				<unitPattern count="one">{0} ਸੈਂ.ਮੀ.</unitPattern>
-				<unitPattern count="other">{0} ਸੈਂ.ਮੀ.</unitPattern>
+			<unit type="length-meter">
+				<displayName>ਮੀਟਰ</displayName>
+				<unitPattern count="one">{0} ਮੀ.</unitPattern>
+				<unitPattern count="other">{0} ਮੀ.</unitPattern>
+				<perUnitPattern>{0}/ਮੀ.</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>ਡੈ.ਮੀ.</displayName>
 				<unitPattern count="one">{0} ਡੈ.ਮੀ.</unitPattern>
 				<unitPattern count="other">{0} ਡੈ.ਮੀ.</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName>ਫ਼ੈਦਮ</displayName>
-				<unitPattern count="one">{0} ਫ਼ੈਦਮ</unitPattern>
-				<unitPattern count="other">{0} ਫ਼ੈਦਮ</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>ਫੁੱਟ</displayName>
-				<unitPattern count="one">{0} ਫੁੱਟ</unitPattern>
-				<unitPattern count="other">{0} ਫੁੱਟ</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>ਫਰਲਾਂਗ</displayName>
-				<unitPattern count="one">{0} ਫਰਲਾਂਗ</unitPattern>
-				<unitPattern count="other">{0} ਫਰਲਾਂਗ</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>ਇੰਚ</displayName>
-				<unitPattern count="one">{0} ਇੰਚ</unitPattern>
-				<unitPattern count="other">{0} ਇੰਚ</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>ਕਿ.ਮੀ.</displayName>
-				<unitPattern count="one">{0} ਕਿ.ਮੀ.</unitPattern>
-				<unitPattern count="other">{0} ਕਿ.ਮੀ.</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ਪ੍ਰਕਾਸ਼ ਸਾਲ</displayName>
-				<unitPattern count="one">{0} ਪ੍ਰ.ਸ.</unitPattern>
-				<unitPattern count="other">{0} ਪ੍ਰ.ਸ.</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>ਮੀਟਰ</displayName>
-				<unitPattern count="one">{0} ਮੀ.</unitPattern>
-				<unitPattern count="other">{0} ਮੀ.</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>ਮਾਈਕਰੋਮੀਟਰ</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>ਮੀਲ</displayName>
-				<unitPattern count="one">{0} ਮੀਲ</unitPattern>
-				<unitPattern count="other">{0} ਮੀਲ</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>ਸੈਂ.ਮੀ.</displayName>
+				<unitPattern count="one">{0} ਸੈਂ.ਮੀ.</unitPattern>
+				<unitPattern count="other">{0} ਸੈਂ.ਮੀ.</unitPattern>
+				<perUnitPattern>{0}/ਸੈਂ.ਮੀ.</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>ਮਿ.ਮੀ.</displayName>
 				<unitPattern count="one">{0} ਮਿ.ਮੀ.</unitPattern>
 				<unitPattern count="other">{0} ਮਿ.ਮੀ.</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>ਮਾਈਕਰੋਮੀਟਰ</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>ਨੈ.ਮੀ.</displayName>
 				<unitPattern count="one">{0} ਨੈ.ਮੀ.</unitPattern>
 				<unitPattern count="other">{0} ਨੈ.ਮੀ.</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>ਨੋ.ਮੀਲ</displayName>
-				<unitPattern count="one">{0} ਨੋ.ਮੀਲ</unitPattern>
-				<unitPattern count="other">{0} ਨੋ.ਮੀਲ</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>ਪਾਸੈੱਕ</displayName>
-				<unitPattern count="one">{0} ਪਾਸੈੱਕ</unitPattern>
-				<unitPattern count="other">{0} ਪਾਸੈੱਕ</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>ਪਿ.ਮੀ.</displayName>
 				<unitPattern count="one">{0} ਪਿਕੋਮੀਟਰ</unitPattern>
 				<unitPattern count="other">{0} ਪਿਕੋਮੀਟਰ</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>ਮੀਲ</displayName>
+				<unitPattern count="one">{0} ਮੀਲ</unitPattern>
+				<unitPattern count="other">{0} ਮੀਲ</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>ਗਜ਼</displayName>
 				<unitPattern count="one">{0} ਗਜ਼</unitPattern>
 				<unitPattern count="other">{0} ਗਜ਼</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ਫੁੱਟ</displayName>
+				<unitPattern count="one">{0} ਫੁੱਟ</unitPattern>
+				<unitPattern count="other">{0} ਫੁੱਟ</unitPattern>
+				<perUnitPattern>{0}/ਫੁੱਟ</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>ਇੰਚ</displayName>
+				<unitPattern count="one">{0} ਇੰਚ</unitPattern>
+				<unitPattern count="other">{0} ਇੰਚ</unitPattern>
+				<perUnitPattern>{0}/ਇੰਚ</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>ਪਾਸੈੱਕ</displayName>
+				<unitPattern count="one">{0} ਪਾਸੈੱਕ</unitPattern>
+				<unitPattern count="other">{0} ਪਾਸੈੱਕ</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ਪ੍ਰਕਾਸ਼ ਸਾਲ</displayName>
+				<unitPattern count="one">{0} ਪ੍ਰ.ਸ.</unitPattern>
+				<unitPattern count="other">{0} ਪ੍ਰ.ਸ.</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>ਫਰਲਾਂਗ</displayName>
+				<unitPattern count="one">{0} ਫਰਲਾਂਗ</unitPattern>
+				<unitPattern count="other">{0} ਫਰਲਾਂਗ</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>ਫ਼ੈਦਮ</displayName>
+				<unitPattern count="one">{0} ਫ਼ੈਦਮ</unitPattern>
+				<unitPattern count="other">{0} ਫ਼ੈਦਮ</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>ਨੋ.ਮੀਲ</displayName>
+				<unitPattern count="one">{0} ਨੋ.ਮੀਲ</unitPattern>
+				<unitPattern count="other">{0} ਨੋ.ਮੀਲ</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>ਸਕੈਂਡ. ਮੀਲ</displayName>
+				<unitPattern count="one">{0} ਸਕੈਂਡ. ਮੀਲ</unitPattern>
+				<unitPattern count="other">{0} ਸਕੈਂਡ. ਮੀਲ</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>ਲਕਸ</displayName>
 				<unitPattern count="one">{0} ਲਕਸ</unitPattern>
 				<unitPattern count="other">{0} ਲਕਸ</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>ਕੈਰਟ</displayName>
-				<unitPattern count="one">{0} ਕੈਰਟ</unitPattern>
-				<unitPattern count="other">{0} ਕੈਰਟ</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>ਗ੍ਰਾਮ</displayName>
-				<unitPattern count="one">{0} ਗ੍ਰਾ.</unitPattern>
-				<unitPattern count="other">{0} ਗ੍ਰਾ.</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>ਕਿ.ਗ੍ਰਾ.</displayName>
-				<unitPattern count="one">{0} ਕਿ.ਗ੍ਰਾ.</unitPattern>
-				<unitPattern count="other">{0} ਕਿ.ਗ੍ਰਾ.</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>ਕਿ.ਗ੍ਰਾ.</displayName>
+				<unitPattern count="one">{0} ਕਿ.ਗ੍ਰਾ.</unitPattern>
+				<unitPattern count="other">{0} ਕਿ.ਗ੍ਰਾ.</unitPattern>
+				<perUnitPattern>{0}/ਕਿ.ਗ੍ਰਾ.</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>ਗ੍ਰਾਮ</displayName>
+				<unitPattern count="one">{0} ਗ੍ਰਾ.</unitPattern>
+				<unitPattern count="other">{0} ਗ੍ਰਾ.</unitPattern>
+				<perUnitPattern>{0}/ਗ੍ਰਾ.</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>ਮਿ.ਗ੍ਰਾ.</displayName>
 				<unitPattern count="one">{0} ਮਿ.ਗ੍ਰਾ.</unitPattern>
 				<unitPattern count="other">{0} ਮਿ.ਗ੍ਰਾ.</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ਔਂਸ</displayName>
-				<unitPattern count="one">{0} ਔਂਸ</unitPattern>
-				<unitPattern count="other">{0} ਔਂਸ</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ਔਂਸ ਟਰੌਏ</displayName>
-				<unitPattern count="one">{0} ਔਂਸ ਟ.</unitPattern>
-				<unitPattern count="other">{0} ਔਂਸ ਟ.</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>ਪੌਂਡ</displayName>
-				<unitPattern count="one">{0} ਪੌਂਡ</unitPattern>
-				<unitPattern count="other">{0} ਪੌਂਡ</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>ਸਟੋਨ</displayName>
-				<unitPattern count="one">{0} ਸਟੋਨ</unitPattern>
-				<unitPattern count="other">{0} ਸਟੋਨ</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>ਟਨ</displayName>
 				<unitPattern count="one">{0} ਟਨ</unitPattern>
 				<unitPattern count="other">{0} ਟਨ</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName>ਸਟੋਨ</displayName>
+				<unitPattern count="one">{0} ਸਟੋਨ</unitPattern>
+				<unitPattern count="other">{0} ਸਟੋਨ</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>ਪੌਂਡ</displayName>
+				<unitPattern count="one">{0} ਪੌਂਡ</unitPattern>
+				<unitPattern count="other">{0} ਪੌਂਡ</unitPattern>
+				<perUnitPattern>{0}/ਪੌਂਡ</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ਔਂਸ</displayName>
+				<unitPattern count="one">{0} ਔਂਸ</unitPattern>
+				<unitPattern count="other">{0} ਔਂਸ</unitPattern>
+				<perUnitPattern>{0}/ਔਂਸ</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ਔਂਸ ਟਰੌਏ</displayName>
+				<unitPattern count="one">{0} ਔਂਸ ਟ.</unitPattern>
+				<unitPattern count="other">{0} ਔਂਸ ਟ.</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>ਕੈਰਟ</displayName>
+				<unitPattern count="one">{0} ਕੈਰਟ</unitPattern>
+				<unitPattern count="other">{0} ਕੈਰਟ</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>ਗੀ.ਵਾਟ</displayName>
 				<unitPattern count="one">{0} ਗੀ.ਵਾਟ</unitPattern>
 				<unitPattern count="other">{0} ਗੀ.ਵਾਟ</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hp</displayName>
-				<unitPattern count="one">{0} ਹੌਰਸਪਾਵਰ</unitPattern>
-				<unitPattern count="other">{0} ਹੌਰਸਪਾਵਰ</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>ਕਿ.ਵਾਟ</displayName>
-				<unitPattern count="one">{0} ਕਿ. ਵਾਟ</unitPattern>
-				<unitPattern count="other">{0} ਕਿ. ਵਾਟ</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>ਮੈ.ਵਾਟ</displayName>
 				<unitPattern count="one">{0} ਮੈ.ਵਾਟ</unitPattern>
 				<unitPattern count="other">{0} ਮੈ.ਵਾਟ</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>ਮਿ.ਵਾਟ</displayName>
-				<unitPattern count="one">{0} ਮਿ.ਵਾਟ</unitPattern>
-				<unitPattern count="other">{0} ਮਿ.ਵਾਟ</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>ਕਿ.ਵਾਟ</displayName>
+				<unitPattern count="one">{0} ਕਿ. ਵਾਟ</unitPattern>
+				<unitPattern count="other">{0} ਕਿ. ਵਾਟ</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>ਵਾਟ</displayName>
 				<unitPattern count="one">{0} ਵਾਟ</unitPattern>
 				<unitPattern count="other">{0} ਵਾਟ</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>ਮਿ.ਵਾਟ</displayName>
+				<unitPattern count="one">{0} ਮਿ.ਵਾਟ</unitPattern>
+				<unitPattern count="other">{0} ਮਿ.ਵਾਟ</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="one">{0} ਹੌਰਸਪਾਵਰ</unitPattern>
+				<unitPattern count="other">{0} ਹੌਰਸਪਾਵਰ</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>ਹੈ.ਪਾ.</displayName>
 				<unitPattern count="one">{0} ਹੈ.ਪਾ.</unitPattern>
 				<unitPattern count="other">{0} ਹੈ.ਪਾ.</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>ਇੰਚ ਪਾਰਾ</displayName>
-				<unitPattern count="one">{0} ਇੰਚ ਪਾਰਾ</unitPattern>
-				<unitPattern count="other">{0} ਇੰਚ ਪਾਰਾ</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>ਮਿਲੀਬਾਰ</displayName>
-				<unitPattern count="one">{0} ਮਿਲੀਬਾਰ</unitPattern>
-				<unitPattern count="other">{0} ਮਿਲੀਬਾਰ</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>ਮਿ.ਮੀ. ਪਾਰਾ</displayName>
 				<unitPattern count="one">{0} ਮਿ.ਮੀ. ਪਾਰਾ</unitPattern>
@@ -6355,10 +6634,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ਪੌਂ.ਵ.ਇੰਚ</unitPattern>
 				<unitPattern count="other">{0} ਪੌਂ.ਵ.ਇੰਚ</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>ਕੇਰਟ</displayName>
-				<unitPattern count="one">{0} ਕੇਰਟ</unitPattern>
-				<unitPattern count="other">{0} ਕੇਰਟ</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>ਇੰਚ ਪਾਰਾ</displayName>
+				<unitPattern count="one">{0} ਇੰਚ ਪਾਰਾ</unitPattern>
+				<unitPattern count="other">{0} ਇੰਚ ਪਾਰਾ</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>ਮਿਲੀਬਾਰ</displayName>
+				<unitPattern count="one">{0} ਮਿਲੀਬਾਰ</unitPattern>
+				<unitPattern count="other">{0} ਮਿਲੀਬਾਰ</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>ਕਿ.ਮੀ./ਘੰਟਾ</displayName>
@@ -6375,6 +6659,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ਮੀ.ਪ੍ਰ.ਘੰ.</unitPattern>
 				<unitPattern count="other">{0} ਮੀ.ਪ੍ਰ.ਘੰ.</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>ਦਰਜਾ ਸੈਲਸੀਅਸ</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -6390,36 +6684,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ਏਕੜ ਫੁੱਟ</displayName>
-				<unitPattern count="one">{0} ਏਕੜ ਫੁੱਟ</unitPattern>
-				<unitPattern count="other">{0} ਏਕੜ ਫੁੱਟ</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>ਬੁਸ਼ਲ</displayName>
-				<unitPattern count="one">{0} ਬੁਸ਼ਲ</unitPattern>
-				<unitPattern count="other">{0} ਬੁਸ਼ਲ</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>ਸੈਂ.ਲਿ.</displayName>
-				<unitPattern count="one">{0} ਸੈਂ.ਲਿ.</unitPattern>
-				<unitPattern count="other">{0} ਸੈਂ.ਲਿ.</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>ਸੈਮੀ³</displayName>
-				<unitPattern count="one">{0} ਸੈਮੀ³</unitPattern>
-				<unitPattern count="other">{0} ਸੈਮੀ³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ਫੁੱਟ³</displayName>
-				<unitPattern count="one">{0} ਫੁੱਟ³</unitPattern>
-				<unitPattern count="other">{0} ਫੁੱਟ³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>ਇੰਚ³</displayName>
-				<unitPattern count="one">{0} ਇੰਚ³</unitPattern>
-				<unitPattern count="other">{0} ਇੰਚ³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>ਕਿਮੀ³</displayName>
 				<unitPattern count="one">{0} ਕਿਮੀ³</unitPattern>
@@ -6429,6 +6693,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ਮੀ³</displayName>
 				<unitPattern count="one">{0} ਮੀ³</unitPattern>
 				<unitPattern count="other">{0} ਮੀ³</unitPattern>
+				<perUnitPattern>{0}/ਮੀ³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>ਸੈਮੀ³</displayName>
+				<unitPattern count="one">{0} ਸੈਮੀ³</unitPattern>
+				<unitPattern count="other">{0} ਸੈਮੀ³</unitPattern>
+				<perUnitPattern>{0}/ਸੈਮੀ³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>ਮੀਲ³</displayName>
@@ -6440,25 +6711,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ਗਜ਼³</unitPattern>
 				<unitPattern count="other">{0} ਗਜ਼³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>ਕੱਪ</displayName>
-				<unitPattern count="one">{0} ਕੱਪ</unitPattern>
-				<unitPattern count="other">{0} ਕੱਪ</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ਫੁੱਟ³</displayName>
+				<unitPattern count="one">{0} ਫੁੱਟ³</unitPattern>
+				<unitPattern count="other">{0} ਫੁੱਟ³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>ਡੈ.ਲਿ.</displayName>
-				<unitPattern count="one">{0} ਡੈ.ਲਿ.</unitPattern>
-				<unitPattern count="other">{0} ਡੈ.ਲਿ.</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>ਇੰਚ³</displayName>
+				<unitPattern count="one">{0} ਇੰਚ³</unitPattern>
+				<unitPattern count="other">{0} ਇੰਚ³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>ਤ. ਔਂਸ</displayName>
-				<unitPattern count="one">{0} ਤ. ਔਂਸ</unitPattern>
-				<unitPattern count="other">{0} ਤ. ਔਂਸ</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>ਗੈਲਨ</displayName>
-				<unitPattern count="one">{0} ਗੈਲਨ</unitPattern>
-				<unitPattern count="other">{0} ਗੈਲਨ</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ਮੈ.ਲਿ.</displayName>
+				<unitPattern count="one">{0} ਮੈ.ਲਿ.</unitPattern>
+				<unitPattern count="other">{0} ਮੈ.ਲਿ.</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>ਹੈ.ਲਿ.</displayName>
@@ -6469,27 +6735,69 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ਲਿਟਰ</displayName>
 				<unitPattern count="one">{0} ਲਿ.</unitPattern>
 				<unitPattern count="other">{0} ਲਿ.</unitPattern>
+				<perUnitPattern>{0}/ਲਿ.</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ਮੈ.ਲਿ.</displayName>
-				<unitPattern count="one">{0} ਮੈ.ਲਿ.</unitPattern>
-				<unitPattern count="other">{0} ਮੈ.ਲਿ.</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>ਡੈ.ਲਿ.</displayName>
+				<unitPattern count="one">{0} ਡੈ.ਲਿ.</unitPattern>
+				<unitPattern count="other">{0} ਡੈ.ਲਿ.</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>ਸੈਂ.ਲਿ.</displayName>
+				<unitPattern count="one">{0} ਸੈਂ.ਲਿ.</unitPattern>
+				<unitPattern count="other">{0} ਸੈਂ.ਲਿ.</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ਮਿ.ਲਿ.</displayName>
 				<unitPattern count="one">{0} ਮਿ.ਲਿ.</unitPattern>
 				<unitPattern count="other">{0} ਮਿ.ਲਿ.</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>ਪਿੰਟ</displayName>
-				<unitPattern count="one">{0} ਪਿੰਟ</unitPattern>
-				<unitPattern count="other">{0} ਪਿੰਟ</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>ਮੀ ਪਿੰਟ</displayName>
+				<unitPattern count="one">{0} ਮੀ ਪਿੰਟ</unitPattern>
+				<unitPattern count="other">{0} ਮੀ ਪਿੰਟ</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>ਮੀ ਕੱਪ</displayName>
+				<unitPattern count="one">{0} ਮੀ ਕੱਪ</unitPattern>
+				<unitPattern count="other">{0} ਮੀ ਕੱਪ</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ਏਕੜ ਫੁੱਟ</displayName>
+				<unitPattern count="one">{0} ਏਕੜ ਫੁੱਟ</unitPattern>
+				<unitPattern count="other">{0} ਏਕੜ ਫੁੱਟ</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>ਬੁਸ਼ਲ</displayName>
+				<unitPattern count="one">{0} ਬੁਸ਼ਲ</unitPattern>
+				<unitPattern count="other">{0} ਬੁਸ਼ਲ</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>ਗੈਲਨ</displayName>
+				<unitPattern count="one">{0} ਗੈਲਨ</unitPattern>
+				<unitPattern count="other">{0} ਗੈਲਨ</unitPattern>
+				<perUnitPattern>{0}/ਗੈਲਨ</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>ਕੁਆਟ</displayName>
 				<unitPattern count="one">{0} ਕੁਆਟ</unitPattern>
 				<unitPattern count="other">{0} ਕੁਆਟ</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>ਪਿੰਟ</displayName>
+				<unitPattern count="one">{0} ਪਿੰਟ</unitPattern>
+				<unitPattern count="other">{0} ਪਿੰਟ</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>ਕੱਪ</displayName>
+				<unitPattern count="one">{0} ਕੱਪ</unitPattern>
+				<unitPattern count="other">{0} ਕੱਪ</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>ਤ. ਔਂਸ</displayName>
+				<unitPattern count="one">{0} ਤ. ਔਂਸ</unitPattern>
+				<unitPattern count="other">{0} ਤ. ਔਂਸ</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>ਟੇਬਲ ਸਪੂਨ</displayName>
 				<unitPattern count="one">{0} ਟੇਬਲ ਸਪੂਨ</unitPattern>
@@ -6500,10 +6808,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ਟੀ ਸਪੂਨ</unitPattern>
 				<unitPattern count="other">{0} ਟੀ ਸਪੂਨ</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}ਪੂ</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}ਉ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}ਦੱ</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}ਪੱ</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
-				<compoundUnitPattern>{0} ਪ੍ਰਤੀ {1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<unitPattern count="one">{0}G</unitPattern>
@@ -6513,6 +6827,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}ਮੀ/ਸ²</unitPattern>
 				<unitPattern count="other">{0}ਮੀ/ਸ²</unitPattern>
 			</unit>
+			<unit type="angle-radian">
+				<unitPattern count="one">{0} ਰੇਡੀ.</unitPattern>
+				<unitPattern count="other">{0} ਰੇਡੀ.</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -6521,26 +6843,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<unitPattern count="one">{0} ਰੇਡੀ.</unitPattern>
-				<unitPattern count="other">{0} ਰੇਡੀ.</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0}ਏਕੜ</unitPattern>
-				<unitPattern count="other">{0}ਏਕੜ</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} ਕਿਮੀ²</unitPattern>
+				<unitPattern count="other">{0} ਕਿਮੀ²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0}ਹੈਕ</unitPattern>
 				<unitPattern count="other">{0}ਹੈਕ</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<unitPattern count="one">{0} ਮੀ²</unitPattern>
+				<unitPattern count="other">{0} ਮੀ²</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<unitPattern count="one">{0}ਸੈਮੀ²</unitPattern>
 				<unitPattern count="other">{0}ਸੈਮੀ²</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<unitPattern count="one">{0}ਮੀਲ²</unitPattern>
+				<unitPattern count="other">{0}ਮੀਲ²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0}ਏਕੜ</unitPattern>
+				<unitPattern count="other">{0}ਏਕੜ</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<unitPattern count="one">{0} ਗਜ਼²</unitPattern>
+				<unitPattern count="other">{0} ਗਜ਼²</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<unitPattern count="one">{0}ਫੁੱਟ²</unitPattern>
 				<unitPattern count="other">{0}ਫੁੱਟ²</unitPattern>
@@ -6549,69 +6879,77 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}ਇੰਚ²</unitPattern>
 				<unitPattern count="other">{0}ਇੰਚ²</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} ਕਿਮੀ²</unitPattern>
-				<unitPattern count="other">{0} ਕਿਮੀ²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<unitPattern count="one">{0} ਮੀ²</unitPattern>
-				<unitPattern count="other">{0} ਮੀ²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<unitPattern count="one">{0}ਮੀਲ²</unitPattern>
-				<unitPattern count="other">{0}ਮੀਲ²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<unitPattern count="one">{0} ਗਜ਼²</unitPattern>
-				<unitPattern count="other">{0} ਗਜ਼²</unitPattern>
+			<unit type="concentr-karat">
+				<unitPattern count="one">{0} ਕੇਰਟ</unitPattern>
+				<unitPattern count="other">{0} ਕੇਰਟ</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="one">{0}ਲਿ./ਕਿ.ਮੀ.</unitPattern>
 				<unitPattern count="other">{0}ਲਿ./ਕਿ.ਮੀ.</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ਲਿ./100ਕਿ.ਮੀ.</displayName>
+				<unitPattern count="one">{0} L/100km</unitPattern>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<unitPattern count="one">{0} ਮੀ.ਪ੍ਰ.ਗੈ.</unitPattern>
 				<unitPattern count="other">{0} ਮੀ.ਪ੍ਰ.ਗੈ.</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<unitPattern count="one">{0}ਬਿਟ</unitPattern>
-				<unitPattern count="other">{0}ਬਿਟ</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<unitPattern count="one">{0}ਬਾਇਟ</unitPattern>
-				<unitPattern count="other">{0}ਬਾਇਟ</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
+			<unit type="digital-terabyte">
+				<unitPattern count="one">{0} TB</unitPattern>
+				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<unitPattern count="one">{0} Tb</unitPattern>
 				<unitPattern count="other">{0} Tb</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<unitPattern count="one">{0} TB</unitPattern>
-				<unitPattern count="other">{0} TB</unitPattern>
+			<unit type="digital-gigabyte">
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<unitPattern count="one">{0}ਬਾਇਟ</unitPattern>
+				<unitPattern count="other">{0}ਬਾਇਟ</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<unitPattern count="one">{0}ਬਿਟ</unitPattern>
+				<unitPattern count="other">{0}ਬਿਟ</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ਸਾਲ</displayName>
+				<unitPattern count="one">{0} ਸਾਲ</unitPattern>
+				<unitPattern count="other">{0} ਸਾਲ</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ਮਹੀਨਾ</displayName>
+				<unitPattern count="one">{0} ਮਹੀਨਾ</unitPattern>
+				<unitPattern count="other">{0} ਮਹੀਨੇ</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ਹਫ਼ਤਾ</displayName>
+				<unitPattern count="one">{0} ਹਫ਼ਤਾ</unitPattern>
+				<unitPattern count="other">{0} ਹਫ਼ਤੇ</unitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>ਦਿਨ</displayName>
@@ -6623,43 +6961,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ਘੰਟਾ</unitPattern>
 				<unitPattern count="other">{0} ਘੰਟੇ</unitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ਮਿਲੀਸਕਿੰਟ</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>ਮਿੰਟ</displayName>
 				<unitPattern count="one">{0} ਮਿੰਟ</unitPattern>
 				<unitPattern count="other">{0} ਮਿੰਟ</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>ਮਹੀਨਾ</displayName>
-				<unitPattern count="one">{0} ਮਹੀਨਾ</unitPattern>
-				<unitPattern count="other">{0} ਮਹੀਨੇ</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>ਸਕਿੰਟ</displayName>
 				<unitPattern count="one">{0} ਸਕਿੰਟ</unitPattern>
 				<unitPattern count="other">{0} ਸਕਿੰਟ</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>ਹਫ਼ਤਾ</displayName>
-				<unitPattern count="one">{0} ਹਫ਼ਤਾ</unitPattern>
-				<unitPattern count="other">{0} ਹਫ਼ਤੇ</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ਮਿਲੀਸਕਿੰਟ</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>ਸਾਲ</displayName>
-				<unitPattern count="one">{0} ਸਾਲ</unitPattern>
-				<unitPattern count="other">{0} ਸਾਲ</unitPattern>
+			<unit type="duration-microsecond">
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<unitPattern count="one">{0}A</unitPattern>
@@ -6677,6 +7000,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}V</unitPattern>
 				<unitPattern count="other">{0}V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<unitPattern count="one">{0}ਕਿ.ਕੈਲੋਰੀਆਂ</unitPattern>
+				<unitPattern count="other">{0}ਕਿ.ਕੈਲੋਰੀਆਂ</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<unitPattern count="one">{0} ਕੈਲੋਰੀਆਂ</unitPattern>
 				<unitPattern count="other">{0} ਕੈਲੋਰੀਆਂ</unitPattern>
@@ -6685,18 +7012,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ਕੈਲੋਰੀਆਂ</unitPattern>
 				<unitPattern count="other">{0} ਕੈਲੋਰੀਆਂ</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<unitPattern count="one">{0}ਕਿ.ਕੈਲੋਰੀ</unitPattern>
-				<unitPattern count="other">{0}ਕਿ.ਕੈਲੋਰੀਆਂ</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<unitPattern count="one">{0} ਕਿ.ਜੂਲ</unitPattern>
 				<unitPattern count="other">{0} ਕਿ.ਜੂਲ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<unitPattern count="one">{0} ਕਿ.ਵਾ.ਘੰ.</unitPattern>
 				<unitPattern count="other">{0} ਕਿ.ਵਾ.ਘੰ.</unitPattern>
@@ -6705,109 +7028,122 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}GHz</unitPattern>
 				<unitPattern count="other">{0}GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<unitPattern count="one">{0}Hz</unitPattern>
-				<unitPattern count="other">{0}Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<unitPattern count="one">{0}MHz</unitPattern>
+				<unitPattern count="other">{0}MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<unitPattern count="one">{0}kHz</unitPattern>
 				<unitPattern count="other">{0}kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<unitPattern count="one">{0}MHz</unitPattern>
-				<unitPattern count="other">{0}MHz</unitPattern>
-			</unit>
-			<unit type="length-astronomical-unit">
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>ਸੈਂ.ਮੀ.</displayName>
-				<unitPattern count="one">{0}ਸੈਂ.ਮੀ.</unitPattern>
-				<unitPattern count="other">{0}ਸੈਂ.ਮੀ.</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<unitPattern count="one">{0} ਡੈ.ਮੀ.</unitPattern>
-				<unitPattern count="other">{0} ਡੈ.ਮੀ.</unitPattern>
-			</unit>
-			<unit type="length-fathom">
-				<displayName>ਫ਼ੈਦਮ</displayName>
-				<unitPattern count="one">{0} ਫ਼ੈਦਮ</unitPattern>
-				<unitPattern count="other">{0} ਫ਼ੈਦਮ</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0}'</unitPattern>
-				<unitPattern count="other">{0}'</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>ਫਰਲਾਂਗ</displayName>
-				<unitPattern count="one">{0} ਫਰਲਾਂਗ</unitPattern>
-				<unitPattern count="other">{0} ਫਰਲਾਂਗ</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0}&quot;</unitPattern>
-				<unitPattern count="other">{0}&quot;</unitPattern>
+			<unit type="frequency-hertz">
+				<unitPattern count="one">{0}Hz</unitPattern>
+				<unitPattern count="other">{0}Hz</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>ਕਿ.ਮੀ.</displayName>
 				<unitPattern count="one">{0} ਕਿ.ਮੀ.</unitPattern>
 				<unitPattern count="other">{0} ਕਿ.ਮੀ.</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} ਪ੍ਰ.ਸ.</unitPattern>
-				<unitPattern count="other">{0} ਪ੍ਰ.ਸ.</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>ਮੀਟਰ</displayName>
 				<unitPattern count="one">{0} ਮੀ.</unitPattern>
 				<unitPattern count="other">{0} ਮੀ.</unitPattern>
 			</unit>
-			<unit type="length-micrometer">
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
+			<unit type="length-decimeter">
+				<unitPattern count="one">{0} ਡੈ.ਮੀ.</unitPattern>
+				<unitPattern count="other">{0} ਡੈ.ਮੀ.</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} ਮੀਲ</unitPattern>
-				<unitPattern count="other">{0} ਮੀਲ</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>ਸੈਂ.ਮੀ.</displayName>
+				<unitPattern count="one">{0}ਸੈਂ.ਮੀ.</unitPattern>
+				<unitPattern count="other">{0}ਸੈਂ.ਮੀ.</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>ਮਿ.ਮੀ.</displayName>
 				<unitPattern count="one">{0} ਮਿ.ਮੀ.</unitPattern>
 				<unitPattern count="other">{0} ਮਿ.ਮੀ.</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<unitPattern count="one">{0} ਨੈ.ਮੀ.</unitPattern>
 				<unitPattern count="other">{0} ਨੈ.ਮੀ.</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<unitPattern count="one">{0} ਨੋ.ਮੀਲ</unitPattern>
-				<unitPattern count="other">{0} ਨੋ.ਮੀਲ</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<unitPattern count="one">{0} ਪਾਸੈੱਕ</unitPattern>
-				<unitPattern count="other">{0} ਪਾਸੈੱਕ</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<unitPattern count="one">{0} ਪਿ.ਮੀ.</unitPattern>
 				<unitPattern count="other">{0} ਪਿ.ਮੀ.</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} ਮੀਲ</unitPattern>
+				<unitPattern count="other">{0} ਮੀਲ</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} ਗਜ਼</unitPattern>
 				<unitPattern count="other">{0} ਗਜ਼</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<unitPattern count="one">{0}'</unitPattern>
+				<unitPattern count="other">{0}'</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0}&quot;</unitPattern>
+				<unitPattern count="other">{0}&quot;</unitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<unitPattern count="one">{0} ਪਾਸੈੱਕ</unitPattern>
+				<unitPattern count="other">{0} ਪਾਸੈੱਕ</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} ਪ੍ਰ.ਸ.</unitPattern>
+				<unitPattern count="other">{0} ਪ੍ਰ.ਸ.</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>ਫਰਲਾਂਗ</displayName>
+				<unitPattern count="one">{0} ਫਰਲਾਂਗ</unitPattern>
+				<unitPattern count="other">{0} ਫਰਲਾਂਗ</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>ਫ਼ੈਦਮ</displayName>
+				<unitPattern count="one">{0} ਫ਼ੈਦਮ</unitPattern>
+				<unitPattern count="other">{0} ਫ਼ੈਦਮ</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<unitPattern count="one">{0} ਨੋ.ਮੀਲ</unitPattern>
+				<unitPattern count="other">{0} ਨੋ.ਮੀਲ</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<unitPattern count="one">{0} ਲਕਸ</unitPattern>
 				<unitPattern count="other">{0} ਲਕਸ</unitPattern>
 			</unit>
+			<unit type="mass-kilogram">
+				<displayName>ਕਿ ਗ੍ਰਾ</displayName>
+				<unitPattern count="one">{0} ਕਿ.ਗ੍ਰਾ.</unitPattern>
+				<unitPattern count="other">{0} ਕਿ.ਗ੍ਰਾ.</unitPattern>
+			</unit>
 			<unit type="mass-gram">
 				<displayName>ਗ੍ਰਾਮ</displayName>
 				<unitPattern count="one">{0} ਗ੍ਰਾ.</unitPattern>
 				<unitPattern count="other">{0} ਗ੍ਰਾ.</unitPattern>
 			</unit>
-			<unit type="mass-kilogram">
-				<displayName>ਕਿ ਗ੍ਰਾ</displayName>
-				<unitPattern count="one">{0} ਕਿ.ਗ੍ਰਾ.</unitPattern>
-				<unitPattern count="other">{0} ਕਿ.ਗ੍ਰਾ.</unitPattern>
+			<unit type="mass-ton">
+				<unitPattern count="one">{0}ਟਨ</unitPattern>
+				<unitPattern count="other">{0}ਟਨ</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName>ਸਟੋਨ</displayName>
+				<unitPattern count="one">{0}ਸਟੋਨ</unitPattern>
+				<unitPattern count="other">{0}ਸਟੋਨ</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<unitPattern count="one">{0}#</unitPattern>
+				<unitPattern count="other">{0}#</unitPattern>
 			</unit>
 			<unit type="mass-ounce">
 				<unitPattern count="one">{0} ਔਂਸ</unitPattern>
@@ -6817,47 +7153,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ਔਂਸ ਟ.</unitPattern>
 				<unitPattern count="other">{0} ਔਂਸ ਟ.</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<unitPattern count="one">{0}#</unitPattern>
-				<unitPattern count="other">{0}#</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>ਸਟੋਨ</displayName>
-				<unitPattern count="one">{0}ਸਟੋਨ</unitPattern>
-				<unitPattern count="other">{0}ਸਟੋਨ</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<unitPattern count="one">{0}ਟਨ</unitPattern>
-				<unitPattern count="other">{0}ਟਨ</unitPattern>
-			</unit>
 			<unit type="power-gigawatt">
 				<unitPattern count="one">{0} ਗੀ.ਵਾਟ</unitPattern>
 				<unitPattern count="other">{0} ਗੀ.ਵਾਟ</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0}hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<unitPattern count="one">{0} ਕਿ. ਵਾਟ</unitPattern>
-				<unitPattern count="other">{0} ਕਿ. ਵਾਟ</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<unitPattern count="one">{0} ਮੈ.ਵਾਟ</unitPattern>
 				<unitPattern count="other">{0} ਮੈ.ਵਾਟ</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<unitPattern count="one">{0} ਮਿ.ਵਾਟ</unitPattern>
-				<unitPattern count="other">{0} ਮਿ.ਵਾਟ</unitPattern>
+			<unit type="power-kilowatt">
+				<unitPattern count="one">{0} ਕਿ. ਵਾਟ</unitPattern>
+				<unitPattern count="other">{0} ਕਿ. ਵਾਟ</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<unitPattern count="one">{0} ਵਾਟ</unitPattern>
 				<unitPattern count="other">{0} ਵਾਟ</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<unitPattern count="one">{0} ਮਿ.ਵਾਟ</unitPattern>
+				<unitPattern count="other">{0} ਮਿ.ਵਾਟ</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0}hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} ਹੈ.ਪਾ.</unitPattern>
 				<unitPattern count="other">{0} ਹੈ.ਪਾ.</unitPattern>
 			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<unitPattern count="one">{0} ਮਿ.ਮੀ. ਪਾਰਾ</unitPattern>
+				<unitPattern count="other">{0} ਮਿ.ਮੀ. ਪਾਰਾ</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<unitPattern count="one">{0} ਪੌਂ.ਵ.ਇੰਚ</unitPattern>
+				<unitPattern count="other">{0} ਪੌਂ.ਵ.ਇੰਚ</unitPattern>
+			</unit>
 			<unit type="pressure-inch-hg">
 				<unitPattern count="one">{0}&quot; ਪਾਰਾ</unitPattern>
 				<unitPattern count="other">{0}&quot; ਪਾਰਾ</unitPattern>
@@ -6866,18 +7197,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ਮਿ.ਬਾ.</unitPattern>
 				<unitPattern count="other">{0} ਮਿ.ਬਾ.</unitPattern>
 			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<unitPattern count="one">{0} ਮਿਮੀ ਪਾਰਾ</unitPattern>
-				<unitPattern count="other">{0} ਮਿਮੀ ਪਾਰਾ</unitPattern>
-			</unit>
-			<unit type="pressure-pound-per-square-inch">
-				<unitPattern count="one">{0} ਪੌਂ.ਵ.ਇੰਚ</unitPattern>
-				<unitPattern count="other">{0} ਪੌਂ.ਵ.ਇੰਚ</unitPattern>
-			</unit>
-			<unit type="proportion-karat">
-				<unitPattern count="one">{0} ਕੇਰਟ</unitPattern>
-				<unitPattern count="other">{0} ਕੇਰਟ</unitPattern>
-			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>ਕਿ.ਮੀ./ਘੰਟਾ</displayName>
 				<unitPattern count="one">{0} ਕਿ.ਪ੍ਰ.ਘੰ.</unitPattern>
@@ -6904,31 +7223,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}°K</unitPattern>
 				<unitPattern count="other">{0}°K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<unitPattern count="one">{0}ਏਕੜ ਫੁੱਟ</unitPattern>
-				<unitPattern count="other">{0}ਏਕੜ ਫੁੱਟ</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>ਬੁਸ਼ਲ</displayName>
-				<unitPattern count="one">{0}ਬੁਸ਼ਲ</unitPattern>
-				<unitPattern count="other">{0}ਬੁਸ਼ਲ</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<unitPattern count="one">{0} ਸੈਂ.ਲਿ.</unitPattern>
-				<unitPattern count="other">{0} ਸੈਂ.ਲਿ.</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<unitPattern count="one">{0}ਸੈਮੀ³</unitPattern>
-				<unitPattern count="other">{0}ਸੈਮੀ³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<unitPattern count="one">{0}ਫੁੱਟ³</unitPattern>
-				<unitPattern count="other">{0}ਫੁੱਟ³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<unitPattern count="one">{0}ਇੰਚ³</unitPattern>
-				<unitPattern count="other">{0}ਇੰਚ³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<unitPattern count="one">{0}ਕਿਮੀ³</unitPattern>
 				<unitPattern count="other">{0}ਕਿਮੀ³</unitPattern>
@@ -6937,6 +7231,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}ਮੀ³</unitPattern>
 				<unitPattern count="other">{0}ਮੀ³</unitPattern>
 			</unit>
+			<unit type="volume-cubic-centimeter">
+				<unitPattern count="one">{0}ਸੈਮੀ³</unitPattern>
+				<unitPattern count="other">{0}ਸੈਮੀ³</unitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<unitPattern count="one">{0}ਮੀਲ³</unitPattern>
 				<unitPattern count="other">{0}ਮੀਲ³</unitPattern>
@@ -6945,21 +7243,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}ਗਜ਼³</unitPattern>
 				<unitPattern count="other">{0}ਗਜ਼³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<unitPattern count="one">{0}ਕੱਪ</unitPattern>
-				<unitPattern count="other">{0}ਕੱਪ</unitPattern>
+			<unit type="volume-cubic-foot">
+				<unitPattern count="one">{0}ਫੁੱਟ³</unitPattern>
+				<unitPattern count="other">{0}ਫੁੱਟ³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<unitPattern count="one">{0} ਡੈ.ਲਿ.</unitPattern>
-				<unitPattern count="other">{0} ਡੈ.ਲਿ.</unitPattern>
+			<unit type="volume-cubic-inch">
+				<unitPattern count="one">{0}ਇੰਚ³</unitPattern>
+				<unitPattern count="other">{0}ਇੰਚ³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<unitPattern count="one">{0} ਤ. ਔਂਸ</unitPattern>
-				<unitPattern count="other">{0} ਤ. ਔਂਸ</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<unitPattern count="one">{0}ਗੈਲਨ</unitPattern>
-				<unitPattern count="other">{0}ਗੈਲਨ</unitPattern>
+			<unit type="volume-megaliter">
+				<unitPattern count="one">{0} ਮੈ.ਲਿ.</unitPattern>
+				<unitPattern count="other">{0} ਮੈ.ਲਿ.</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<unitPattern count="one">{0} ਹੈ.ਲਿ.</unitPattern>
@@ -6970,22 +7264,53 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ਲਿ.</unitPattern>
 				<unitPattern count="other">{0} ਲਿ.</unitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<unitPattern count="one">{0} ਮੈ.ਲਿ.</unitPattern>
-				<unitPattern count="other">{0} ਮੈ.ਲਿ.</unitPattern>
+			<unit type="volume-deciliter">
+				<unitPattern count="one">{0} ਡੈ.ਲਿ.</unitPattern>
+				<unitPattern count="other">{0} ਡੈ.ਲਿ.</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<unitPattern count="one">{0} ਸੈਂ.ਲਿ.</unitPattern>
+				<unitPattern count="other">{0} ਸੈਂ.ਲਿ.</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<unitPattern count="one">{0} ਮਿ.ਲਿ.</unitPattern>
 				<unitPattern count="other">{0} ਮਿ.ਲਿ.</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<unitPattern count="one">{0}ਪਿੰਟ</unitPattern>
-				<unitPattern count="other">{0}ਪਿੰਟ</unitPattern>
+			<unit type="volume-acre-foot">
+				<unitPattern count="one">{0}ਏਕੜ ਫੁੱਟ</unitPattern>
+				<unitPattern count="other">{0}ਏਕੜ ਫੁੱਟ</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>ਬੁਸ਼ਲ</displayName>
+				<unitPattern count="one">{0}ਬੁਸ਼ਲ</unitPattern>
+				<unitPattern count="other">{0}ਬੁਸ਼ਲ</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<unitPattern count="one">{0}ਗੈਲਨ</unitPattern>
+				<unitPattern count="other">{0}ਗੈਲਨ</unitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<unitPattern count="one">{0}ਕੁਆਟ</unitPattern>
 				<unitPattern count="other">{0}ਕੁਆਟ</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<unitPattern count="one">{0}ਪਿੰਟ</unitPattern>
+				<unitPattern count="other">{0}ਪਿੰਟ</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<unitPattern count="one">{0}ਕੱਪ</unitPattern>
+				<unitPattern count="other">{0}ਕੱਪ</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<unitPattern count="one">{0} ਤ. ਔਂਸ</unitPattern>
+				<unitPattern count="other">{0} ਤ. ਔਂਸ</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}ਪੂ</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}ਉ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}ਦੱ</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}ਪੱ</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pa_Arab.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Arab.xml
similarity index 73%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pa_Arab.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Arab.xml
index bbb7a43c609..7c8f6c22679 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pa_Arab.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Arab.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11974 $"/>
 		<language type="pa"/>
 		<script type="Arab"/>
 	</identity>
@@ -62,7 +61,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<availableFormats>
 						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
+						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
 					</availableFormats>
@@ -115,6 +114,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<era type="0">ايساپورو</era>
 						<era type="1">سں</era>
 					</eraNames>
+					<eraAbbr>
+						<era type="0">ايساپورو</era>
+						<era type="1">سں</era>
+					</eraAbbr>
 				</eras>
 				<dateFormats>
 					<dateFormatLength type="full">
@@ -207,6 +210,36 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<plusSign>‎+</plusSign> <!-- includes LRM before sign -->
 			<minusSign>‎-</minusSign> <!-- includes LRM before sign (002D) -->
 		</symbols>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤ 0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤ 00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤ 000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤ 0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤ 00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤ 000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤ 0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤ 00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤ 000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤ 0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤ 00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤ 000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencies>
 			<currency type="EUR">
 				<displayName>يورو</displayName>
@@ -227,3 +260,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pa_Arab_PK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Arab_PK.xml
similarity index 69%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pa_Arab_PK.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Arab_PK.xml
index c9f2212342d..5a811df9a65 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pa_Arab_PK.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Arab_PK.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="pa"/>
 		<script type="Arab"/>
 		<territory type="PK"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pa_Guru.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Guru.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pa_Guru.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Guru.xml
index 5323c023d14..261222d0da4 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pa_Guru.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Guru.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="pa"/>
 		<script type="Guru"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pa_Guru_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Guru_IN.xml
similarity index 69%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pa_Guru_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Guru_IN.xml
index 49fc0266578..d576b901074 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pa_Guru_IN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Guru_IN.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="pa"/>
 		<script type="Guru"/>
 		<territory type="IN"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pl.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pl.xml
similarity index 92%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pl.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pl.xml
index 48901837f00..90a08707530 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pl.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pl.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="pl"/>
 	</identity>
 	<localeDisplayNames>
@@ -59,7 +58,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ay">ajmara</language>
 			<language type="az">azerski</language>
 			<language type="az" alt="short">azerski</language>
-			<language type="azb" draft="contributed">południowoazerski</language>
 			<language type="ba">baszkirski</language>
 			<language type="bal">beludżi</language>
 			<language type="ban">balijski</language>
@@ -76,6 +74,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bfd" draft="contributed">bafut</language>
 			<language type="bfq" draft="contributed">badaga</language>
 			<language type="bg">bułgarski</language>
+			<language type="bgn" draft="contributed">beludżi północny</language>
 			<language type="bho">bhodźpuri</language>
 			<language type="bi">bislama</language>
 			<language type="bik">bikol</language>
@@ -222,7 +221,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="gu">gudźaracki</language>
 			<language type="guc" draft="contributed">wayúu</language>
 			<language type="gur" draft="contributed">frafra</language>
-			<language type="guz" draft="contributed">gusii</language>
+			<language type="guz">gusii</language>
 			<language type="gv">manx</language>
 			<language type="gwi">gwichʼin</language>
 			<language type="ha">hausa</language>
@@ -337,6 +336,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">laotański</language>
 			<language type="lol">mongo</language>
 			<language type="loz">lozi</language>
+			<language type="lrc" draft="contributed">luryjski północny</language>
 			<language type="lt">litewski</language>
 			<language type="ltg" draft="contributed">łatgalski</language>
 			<language type="lu">luba-katanga</language>
@@ -390,14 +390,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="my">birmański</language>
 			<language type="mye" draft="contributed">myene</language>
 			<language type="myv">erzya</language>
-			<language type="mzn" draft="contributed">mazanderański</language>
+			<language type="mzn">mazanderański</language>
 			<language type="na">nauru</language>
 			<language type="nan" draft="contributed">minnański</language>
 			<language type="nap">neapolitański</language>
 			<language type="naq" draft="contributed">nama</language>
 			<language type="nb">norweski (bokmål)</language>
 			<language type="nd">ndebele północny</language>
-			<language type="nds">dolnosaksoński</language>
+			<language type="nds">dolnoniemiecki</language>
 			<language type="ne">nepalski</language>
 			<language type="new">newarski</language>
 			<language type="ng">ndonga</language>
@@ -405,7 +405,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="niu">niue</language>
 			<language type="njo" draft="contributed">ao</language>
 			<language type="nl">niderlandzki</language>
-			<language type="nl_BE">flamandzki (Belgia)</language>
+			<language type="nl_BE">flamandzki</language>
 			<language type="nmg" draft="contributed">ngumba</language>
 			<language type="nn">norweski (nynorsk)</language>
 			<language type="nnh" draft="contributed">ngiemboon</language>
@@ -492,6 +492,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sco">szkocki</language>
 			<language type="sd">sindhi</language>
 			<language type="sdc" draft="contributed">sassarski</language>
+			<language type="sdh" draft="contributed">południowokurdyjski</language>
 			<language type="se">lapoński północny</language>
 			<language type="see" draft="contributed">seneka</language>
 			<language type="seh" draft="contributed">sena</language>
@@ -534,8 +535,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">sumeryjski</language>
 			<language type="sv">szwedzki</language>
 			<language type="sw">suahili</language>
+			<language type="sw_CD">kongijski suahili</language>
 			<language type="swb">komoryjski</language>
-			<language type="swc" draft="contributed">kongijski suahili</language>
 			<language type="syc">syriacki</language>
 			<language type="syr">syryjski</language>
 			<language type="szl" draft="contributed">śląski</language>
@@ -602,6 +603,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">walamo</language>
 			<language type="war">waraj</language>
 			<language type="was" draft="contributed">washo</language>
+			<language type="wbp" draft="contributed">Warlpiri</language>
 			<language type="wo">wolof</language>
 			<language type="wuu" draft="contributed">wu</language>
 			<language type="xal">kałmucki</language>
@@ -621,7 +623,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="zbl">bliss</language>
 			<language type="zea" draft="contributed">zelandzki</language>
 			<language type="zen">zenaga</language>
-			<language type="zgh" draft="contributed">zgh</language>
+			<language type="zgh">standardowy marokański tamazight</language>
 			<language type="zh">chiński</language>
 			<language type="zh_Hans">chiński (uproszczony)</language>
 			<language type="zh_Hant">chiński (tradycyjny)</language>
@@ -832,7 +834,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antyle Holenderskie</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antarktyka</territory>
 			<territory type="AR">Argentyna</territory>
@@ -1141,6 +1142,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">Sortowanie numeryczne</key>
 			<key type="colStrength" draft="contributed">Siła sortowania</key>
 			<key type="currency">waluta</key>
+			<key type="hc" draft="contributed">cykl (12- lub 24-godzinny)</key>
+			<key type="lb" draft="contributed">styl podziału wiersza</key>
+			<key type="ms" draft="contributed">układ miar</key>
 			<key type="numbers">cyfry</key>
 			<key type="timezone" draft="contributed">Strefa czasowa</key>
 			<key type="va" draft="contributed">Wariant regionalny</key>
@@ -1148,99 +1152,109 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">Do prywatnego użytku</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">cyfry arabsko-indyjskie</type>
-			<type type="arabext" key="numbers">rozszerzone cyfry arabsko-indyjskie</type>
-			<type type="armn" key="numbers">cyfry ormiańskie</type>
-			<type type="armnlow" key="numbers">cyfry ormiańskie (małe litery)</type>
-			<type type="beng" key="numbers">cyfry bengalskie</type>
-			<type type="big5han" key="collation">chiński tradycyjny porządek sortowania - Big5</type>
-			<type type="buddhist" key="calendar">kalendarz buddyjski</type>
-			<type type="chinese" key="calendar">kalendarz chiński</type>
-			<type type="coptic" key="calendar">Kalendarz koptyjski</type>
-			<type type="dangi" key="calendar" draft="contributed">kalendarz dangi</type>
-			<type type="deva" key="numbers">cyfry dewanagari</type>
-			<type type="dictionary" key="collation">sortowanie słownikowe</type>
-			<type type="ducet" key="collation">Domyślna kolejność sortowania Unicode</type>
-			<type type="eor" key="collation" draft="contributed">europejskie reguły określania kolejności</type>
-			<type type="ethi" key="numbers">cyfry etiopskie</type>
-			<type type="ethiopic" key="calendar">Kalendarz etiopski</type>
-			<type type="ethiopic-amete-alem" key="calendar">Kalendarz etiopski Amete Alem</type>
-			<type type="finance" key="numbers" draft="contributed">Liczebniki księgowe</type>
-			<type type="fullwide" key="numbers">cyfry o pełnej szerokości</type>
-			<type type="gb2312han" key="collation">chiński uproszczony porządek sortowania - GB2312</type>
-			<type type="geor" key="numbers">cyfry gruzińskie</type>
-			<type type="gregorian" key="calendar">kalendarz gregoriański</type>
-			<type type="grek" key="numbers">cyfry greckie</type>
-			<type type="greklow" key="numbers">cyfry greckie (małe litery)</type>
-			<type type="gujr" key="numbers">cyfry gudżarati</type>
-			<type type="guru" key="numbers">cyfry gurmukhi</type>
-			<type type="hanidec" key="numbers">chińskie cyfry dziesiętne</type>
-			<type type="hans" key="numbers">uproszczone cyfry chińskie</type>
-			<type type="hansfin" key="numbers">uproszczone chińskie cyfry księgowe</type>
-			<type type="hant" key="numbers">tradycyjne cyfry chińskie</type>
-			<type type="hantfin" key="numbers">tradycyjne chińskie cyfry księgowe</type>
-			<type type="hebr" key="numbers">cyfry hebrajskie</type>
-			<type type="hebrew" key="calendar">kalendarz hebrajski</type>
-			<type type="identical" key="colStrength" draft="contributed">Sortuj wszystko</type>
-			<type type="indian" key="calendar">narodowy kalendarz hinduski</type>
-			<type type="islamic" key="calendar">kalendarz islamski (metoda wzrokowa)</type>
-			<type type="islamic-civil" key="calendar">kalendarz islamski (metoda obliczeniowa)</type>
-			<type type="islamic-rgsa" key="calendar" draft="contributed">kalendarz islamski (Arabia Saudyjska, metoda wzrokowa)</type>
-			<type type="islamic-tbla" key="calendar" draft="contributed">kalendarz islamski (metoda obliczeniowa, epoka astronomiczna)</type>
-			<type type="islamic-umalqura" key="calendar" draft="contributed">kalendarz islamski (Umm al-Kura)</type>
-			<type type="iso8601" key="calendar" draft="contributed">kalendarz ISO-8601</type>
-			<type type="japanese" key="calendar">kalendarz japoński</type>
-			<type type="jpan" key="numbers">cyfry japońskie</type>
-			<type type="jpanfin" key="numbers">japońskie cyfry księgowe</type>
-			<type type="khmr" key="numbers">cyfry khmerskie</type>
-			<type type="knda" key="numbers">cyfry kannada</type>
-			<type type="laoo" key="numbers">cyfry laotańskie</type>
-			<type type="latn" key="numbers">cyfry arabskie</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">Sortowanie od małych liter</type>
-			<type type="mlym" key="numbers">cyfry malajalam</type>
-			<type type="mong" key="numbers">Cyfry mongolskie</type>
-			<type type="mymr" key="numbers">cyfry birmańskie</type>
-			<type type="native" key="numbers" draft="contributed">Cyfry macierzyste</type>
-			<type type="no" key="colBackwards" draft="contributed">Zwykłe sortowanie znaków akcentowanych</type>
-			<type type="no" key="colCaseFirst" draft="contributed">Sortowanie z zachowaniem zwykłej kolejności wielkości liter</type>
-			<type type="no" key="colCaseLevel" draft="contributed">Sortowanie bez rozróżniania wielkości liter</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">Osobne sortowanie kana</type>
-			<type type="no" key="colNormalization" draft="contributed">Sortowanie bez normalizacji</type>
-			<type type="no" key="colNumeric" draft="contributed">Oddzielne sortowanie cyfr</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">Sortowanie symboli</type>
-			<type type="orya" key="numbers">cyfry orija</type>
-			<type type="persian" key="calendar">Kalendarz perski</type>
-			<type type="phonebook" key="collation">porządek sortowania książki telefonicznej</type>
-			<type type="phonetic" key="collation">sortowanie fonetyczne</type>
-			<type type="pinyin" key="collation">porządek sortowania pinyin</type>
-			<type type="primary" key="colStrength" draft="contributed">Sortowanie tylko liter podstawowych</type>
-			<type type="quaternary" key="colStrength" draft="contributed">Sortowanie znaków akcentowanych/wielkości liter/szerokości/kana</type>
-			<type type="reformed" key="collation">sortowanie zreformowane</type>
-			<type type="roc" key="calendar">kalendarz Republiki Chińskiej</type>
-			<type type="roman" key="numbers">cyfry rzymskie</type>
-			<type type="romanlow" key="numbers">cyfry rzymskie (małe litery)</type>
-			<type type="search" key="collation">uniwersalny porządek sortowania</type>
-			<type type="searchjl" key="collation" draft="contributed">Wyszukiwanie według początkowej spółgłoski hangul</type>
-			<type type="secondary" key="colStrength" draft="contributed">Sortowanie znaków akcentowanych</type>
-			<type type="shifted" key="colAlternate" draft="contributed">Sortowanie ignorujące symbole</type>
-			<type type="standard" key="collation">sortowanie standardowe</type>
-			<type type="stroke" key="collation">porządek akcentów</type>
-			<type type="taml" key="numbers">cyfry tamilskie</type>
-			<type type="tamldec" key="numbers">cyfry tamilskie</type>
-			<type type="telu" key="numbers">cyfry telugu</type>
-			<type type="tertiary" key="colStrength" draft="contributed">Sortowanie znaków akcentowanych/wielkości liter/szerokości</type>
-			<type type="thai" key="numbers">cyfry tajskie</type>
-			<type type="tibt" key="numbers">cyfry tybetańskie</type>
-			<type type="traditional" key="collation">tradycyjny porządek sortowania</type>
-			<type type="traditional" key="numbers" draft="contributed">Liczebniki tradycyjne</type>
-			<type type="unihan" key="collation">sortowanie wg kluczy i ich liczby kresek</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">Sortowanie od wielkich liter</type>
-			<type type="vaii" key="numbers" draft="contributed">Cyfry vai</type>
-			<type type="yes" key="colBackwards" draft="contributed">Sortowanie znaków akcentowanych w odwróconej kolejności</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">Sortowanie z rozróżnianiem wielkości liter</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">Inne sortowanie kana</type>
-			<type type="yes" key="colNormalization" draft="contributed">Sortowanie z normalizacją unicode</type>
-			<type type="yes" key="colNumeric" draft="contributed">Numeryczne sortowanie cyfr</type>
+			<type key="calendar" type="buddhist">kalendarz buddyjski</type>
+			<type key="calendar" type="chinese">kalendarz chiński</type>
+			<type key="calendar" type="coptic">Kalendarz koptyjski</type>
+			<type key="calendar" type="dangi" draft="contributed">kalendarz dangi</type>
+			<type key="calendar" type="ethiopic">Kalendarz etiopski</type>
+			<type key="calendar" type="ethiopic-amete-alem">Kalendarz etiopski Amete Alem</type>
+			<type key="calendar" type="gregorian">kalendarz gregoriański</type>
+			<type key="calendar" type="hebrew">kalendarz hebrajski</type>
+			<type key="calendar" type="indian">narodowy kalendarz hinduski</type>
+			<type key="calendar" type="islamic">kalendarz islamski (metoda wzrokowa)</type>
+			<type key="calendar" type="islamic-civil">kalendarz islamski (metoda obliczeniowa)</type>
+			<type key="calendar" type="islamic-rgsa" draft="contributed">kalendarz islamski (Arabia Saudyjska, metoda wzrokowa)</type>
+			<type key="calendar" type="islamic-tbla" draft="contributed">kalendarz islamski (metoda obliczeniowa, epoka astronomiczna)</type>
+			<type key="calendar" type="islamic-umalqura" draft="contributed">kalendarz islamski (Umm al-Kura)</type>
+			<type key="calendar" type="iso8601" draft="contributed">kalendarz ISO-8601</type>
+			<type key="calendar" type="japanese">kalendarz japoński</type>
+			<type key="calendar" type="persian">Kalendarz perski</type>
+			<type key="calendar" type="roc">kalendarz Republiki Chińskiej</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">Sortowanie symboli</type>
+			<type key="colAlternate" type="shifted" draft="contributed">Sortowanie ignorujące symbole</type>
+			<type key="colBackwards" type="no" draft="contributed">Zwykłe sortowanie znaków akcentowanych</type>
+			<type key="colBackwards" type="yes" draft="contributed">Sortowanie znaków akcentowanych w odwróconej kolejności</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">Sortowanie od małych liter</type>
+			<type key="colCaseFirst" type="no" draft="contributed">Sortowanie z zachowaniem zwykłej kolejności wielkości liter</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">Sortowanie od wielkich liter</type>
+			<type key="colCaseLevel" type="no" draft="contributed">Sortowanie bez rozróżniania wielkości liter</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">Sortowanie z rozróżnianiem wielkości liter</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">Osobne sortowanie kana</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">Inne sortowanie kana</type>
+			<type key="collation" type="big5han">chiński tradycyjny porządek sortowania - Big5</type>
+			<type key="collation" type="dictionary">sortowanie słownikowe</type>
+			<type key="collation" type="ducet">Domyślna kolejność sortowania Unicode</type>
+			<type key="collation" type="eor" draft="contributed">europejskie reguły określania kolejności</type>
+			<type key="collation" type="gb2312han">chiński uproszczony porządek sortowania - GB2312</type>
+			<type key="collation" type="phonebook">porządek sortowania książki telefonicznej</type>
+			<type key="collation" type="phonetic">sortowanie fonetyczne</type>
+			<type key="collation" type="pinyin">porządek sortowania pinyin</type>
+			<type key="collation" type="reformed">sortowanie zreformowane</type>
+			<type key="collation" type="search">uniwersalny porządek sortowania</type>
+			<type key="collation" type="searchjl" draft="contributed">Wyszukiwanie według początkowej spółgłoski hangul</type>
+			<type key="collation" type="standard">sortowanie standardowe</type>
+			<type key="collation" type="stroke">porządek akcentów</type>
+			<type key="collation" type="traditional">tradycyjny porządek sortowania</type>
+			<type key="collation" type="unihan">sortowanie wg kluczy i ich liczby kresek</type>
+			<type key="colNormalization" type="no" draft="contributed">Sortowanie bez normalizacji</type>
+			<type key="colNormalization" type="yes" draft="contributed">Sortowanie z normalizacją unicode</type>
+			<type key="colNumeric" type="no" draft="contributed">Oddzielne sortowanie cyfr</type>
+			<type key="colNumeric" type="yes" draft="contributed">Numeryczne sortowanie cyfr</type>
+			<type key="colStrength" type="identical" draft="contributed">Sortuj wszystko</type>
+			<type key="colStrength" type="primary" draft="contributed">Sortowanie tylko liter podstawowych</type>
+			<type key="colStrength" type="quaternary" draft="contributed">Sortowanie znaków akcentowanych/wielkości liter/szerokości/kana</type>
+			<type key="colStrength" type="secondary" draft="contributed">Sortowanie znaków akcentowanych</type>
+			<type key="colStrength" type="tertiary" draft="contributed">Sortowanie znaków akcentowanych/wielkości liter/szerokości</type>
+			<type key="hc" type="h11" draft="contributed">system 12-godzinny (0-11)</type>
+			<type key="hc" type="h12" draft="contributed">system 12-godzinny (1-12)</type>
+			<type key="hc" type="h23" draft="contributed">system 24-godzinny (0-23)</type>
+			<type key="hc" type="h24" draft="contributed">system 24-godzinny (1-24)</type>
+			<type key="lb" type="loose" draft="contributed">luźny styl podziału wiersza</type>
+			<type key="lb" type="normal" draft="contributed">normalny styl podziału wiersza</type>
+			<type key="lb" type="strict" draft="contributed">ścisły styl podziału wiersza</type>
+			<type key="ms" type="metric" draft="contributed">system metryczny</type>
+			<type key="ms" type="uksystem" draft="contributed">imperialny system miar</type>
+			<type key="ms" type="ussystem" draft="contributed">amerykański system miar</type>
+			<type key="numbers" type="arab">cyfry arabsko-indyjskie</type>
+			<type key="numbers" type="arabext">rozszerzone cyfry arabsko-indyjskie</type>
+			<type key="numbers" type="armn">cyfry ormiańskie</type>
+			<type key="numbers" type="armnlow">cyfry ormiańskie (małe litery)</type>
+			<type key="numbers" type="beng">cyfry bengalskie</type>
+			<type key="numbers" type="deva">cyfry dewanagari</type>
+			<type key="numbers" type="ethi">cyfry etiopskie</type>
+			<type key="numbers" type="finance" draft="contributed">Liczebniki księgowe</type>
+			<type key="numbers" type="fullwide">cyfry o pełnej szerokości</type>
+			<type key="numbers" type="geor">cyfry gruzińskie</type>
+			<type key="numbers" type="grek">cyfry greckie</type>
+			<type key="numbers" type="greklow">cyfry greckie (małe litery)</type>
+			<type key="numbers" type="gujr">cyfry gudżarati</type>
+			<type key="numbers" type="guru">cyfry gurmukhi</type>
+			<type key="numbers" type="hanidec">chińskie cyfry dziesiętne</type>
+			<type key="numbers" type="hans">uproszczone cyfry chińskie</type>
+			<type key="numbers" type="hansfin">uproszczone chińskie cyfry księgowe</type>
+			<type key="numbers" type="hant">tradycyjne cyfry chińskie</type>
+			<type key="numbers" type="hantfin">tradycyjne chińskie cyfry księgowe</type>
+			<type key="numbers" type="hebr">cyfry hebrajskie</type>
+			<type key="numbers" type="jpan">cyfry japońskie</type>
+			<type key="numbers" type="jpanfin">japońskie cyfry księgowe</type>
+			<type key="numbers" type="khmr">cyfry khmerskie</type>
+			<type key="numbers" type="knda">cyfry kannada</type>
+			<type key="numbers" type="laoo">cyfry laotańskie</type>
+			<type key="numbers" type="latn">cyfry arabskie</type>
+			<type key="numbers" type="mlym">cyfry malajalam</type>
+			<type key="numbers" type="mong">Cyfry mongolskie</type>
+			<type key="numbers" type="mymr">cyfry birmańskie</type>
+			<type key="numbers" type="native" draft="contributed">Cyfry macierzyste</type>
+			<type key="numbers" type="orya">cyfry orija</type>
+			<type key="numbers" type="roman">cyfry rzymskie</type>
+			<type key="numbers" type="romanlow">cyfry rzymskie (małe litery)</type>
+			<type key="numbers" type="taml">cyfry tamilskie</type>
+			<type key="numbers" type="tamldec">cyfry tamilskie</type>
+			<type key="numbers" type="telu">cyfry telugu</type>
+			<type key="numbers" type="thai">cyfry tajskie</type>
+			<type key="numbers" type="tibt">cyfry tybetańskie</type>
+			<type key="numbers" type="traditional" draft="contributed">Liczebniki tradycyjne</type>
+			<type key="numbers" type="vaii" draft="contributed">Cyfry vai</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">BGN</transformName>
@@ -1579,6 +1593,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
@@ -1821,13 +1836,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<day type="sat">S</day>
 						</dayWidth>
 						<dayWidth type="short">
-							<day type="sun">niedz.</day>
-							<day type="mon">pon.</day>
-							<day type="tue">wt.</day>
-							<day type="wed">śr.</day>
-							<day type="thu">czw.</day>
-							<day type="fri">pt.</day>
-							<day type="sat">sob.</day>
+							<day type="sun">nie</day>
+							<day type="mon">pon</day>
+							<day type="tue">wto</day>
+							<day type="wed">śro</day>
+							<day type="thu">czw</day>
+							<day type="fri">pią</day>
+							<day type="sat">sob</day>
 						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">niedziela</day>
@@ -1859,13 +1874,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<day type="sat">S</day>
 						</dayWidth>
 						<dayWidth type="short">
-							<day type="sun">niedz.</day>
-							<day type="mon">pon.</day>
-							<day type="tue">wt.</day>
-							<day type="wed">śr.</day>
-							<day type="thu">czw.</day>
-							<day type="fri">pt.</day>
-							<day type="sat">sob.</day>
+							<day type="sun">nie</day>
+							<day type="mon">pon</day>
+							<day type="tue">wto</day>
+							<day type="wed">śro</day>
+							<day type="thu">czw</day>
+							<day type="fri">pią</day>
+							<day type="sat">sob</day>
 						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">niedziela</day>
@@ -1922,30 +1937,68 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">o północy</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">w południe</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">rano</dayPeriod>
+							<dayPeriod type="morning2">przed południem</dayPeriod>
+							<dayPeriod type="afternoon1">po południu</dayPeriod>
+							<dayPeriod type="evening1">wieczorem</dayPeriod>
+							<dayPeriod type="night1">w nocy</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">o półn.</dayPeriod>
+							<dayPeriod type="am">a</dayPeriod>
+							<dayPeriod type="noon">n</dayPeriod>
+							<dayPeriod type="pm">p</dayPeriod>
+							<dayPeriod type="morning1">rano</dayPeriod>
+							<dayPeriod type="morning2">przed południem</dayPeriod>
+							<dayPeriod type="afternoon1">po południu</dayPeriod>
+							<dayPeriod type="evening1">wieczorem</dayPeriod>
+							<dayPeriod type="night1">w nocy</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">o północy</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">w południe</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">rano</dayPeriod>
+							<dayPeriod type="morning2">przed południem</dayPeriod>
+							<dayPeriod type="afternoon1">po południu</dayPeriod>
+							<dayPeriod type="evening1">wieczorem</dayPeriod>
+							<dayPeriod type="night1">w nocy</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am" draft="contributed">AM</dayPeriod>
+							<dayPeriod type="pm" draft="contributed">PM</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am" draft="contributed">a</dayPeriod>
-							<dayPeriod type="noon" draft="contributed">n</dayPeriod>
 							<dayPeriod type="pm" draft="contributed">p</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="afternoon">po południu</dayPeriod>
+							<dayPeriod type="midnight">północ</dayPeriod>
 							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="earlyMorning">nad ranem</dayPeriod>
-							<dayPeriod type="evening">wieczorem</dayPeriod>
-							<dayPeriod type="lateMorning">przed południem</dayPeriod>
-							<dayPeriod type="morning">rano</dayPeriod>
-							<dayPeriod type="night">w nocy</dayPeriod>
-							<dayPeriod type="noon">w południe</dayPeriod>
+							<dayPeriod type="noon">południe</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">rano</dayPeriod>
+							<dayPeriod type="morning2">przedpołudnie</dayPeriod>
+							<dayPeriod type="afternoon1">popołudnie</dayPeriod>
+							<dayPeriod type="evening1">wieczór</dayPeriod>
+							<dayPeriod type="night1">noc</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
-						<era type="0" draft="contributed">p.n.e.</era>
-						<era type="0" alt="variant" draft="contributed">BCE</era>
-						<era type="1" draft="contributed">n.e.</era>
-						<era type="1" alt="variant" draft="contributed">CE</era>
+						<era type="0">p.n.e.</era>
+						<era type="0" alt="variant">BCE</era>
+						<era type="1">n.e.</era>
+						<era type="1" alt="variant">CE</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">p.n.e.</era>
@@ -2028,9 +2081,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
-						<dateFormatItem id="GyMMM">MM.y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d.MM.y G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">E, d.MM.y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMM">LLLL y G</dateFormatItem>
 						<dateFormatItem id="GyMMMMd">d MMMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMMEd">E, d MMMM y G</dateFormatItem>
@@ -2222,19 +2275,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</monthContext>
 					<monthContext type="stand-alone">
 						<monthWidth type="abbreviated">
-							<month type="1" draft="contributed">Tiszri</month>
-							<month type="2" draft="contributed">Cheszwan</month>
-							<month type="3" draft="contributed">Kislew</month>
-							<month type="4" draft="contributed">Tewet</month>
-							<month type="5" draft="contributed">Szwat</month>
-							<month type="6" draft="contributed">Adar I</month>
-							<month type="7" draft="contributed">Adar</month>
-							<month type="8" draft="contributed">Nisan</month>
-							<month type="9" draft="contributed">Ijar</month>
-							<month type="10" draft="contributed">Siwan</month>
-							<month type="11" draft="contributed">Tamuz</month>
-							<month type="12" draft="contributed">Aw</month>
-							<month type="13" draft="contributed">Elul</month>
+							<month type="1">Tiszri</month>
+							<month type="2">Cheszwan</month>
+							<month type="3">Kislew</month>
+							<month type="4">Tewet</month>
+							<month type="5">Szwat</month>
+							<month type="6">Adar I</month>
+							<month type="7">Adar</month>
+							<month type="7" yeartype="leap">Adar II</month>
+							<month type="8">Nisan</month>
+							<month type="9">Ijar</month>
+							<month type="10">Siwan</month>
+							<month type="11">Tamuz</month>
+							<month type="12">Aw</month>
+							<month type="13">Elul</month>
 						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1" draft="contributed">Tiszri</month>
@@ -2565,6 +2619,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter">
 				<displayName draft="contributed">kwartał</displayName>
+				<relative type="-1" draft="contributed">w zeszłym kwartale</relative>
+				<relative type="0" draft="contributed">w tym kwartale</relative>
+				<relative type="1" draft="contributed">w przyszłym kwartale</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one" draft="contributed">za {0} kwartał</relativeTimePattern>
 					<relativeTimePattern count="few" draft="contributed">za {0} kwartały</relativeTimePattern>
@@ -2580,6 +2637,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName draft="contributed">kw.</displayName>
+				<relative type="-1" draft="contributed">w zeszłym kwartale</relative>
+				<relative type="0" draft="contributed">w tym kwartale</relative>
+				<relative type="1" draft="contributed">w przyszłym kwartale</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one" draft="contributed">za {0} kw.</relativeTimePattern>
 					<relativeTimePattern count="few" draft="contributed">za {0} kw.</relativeTimePattern>
@@ -2595,6 +2655,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName draft="contributed">kw.</displayName>
+				<relative type="-1" draft="contributed">w zeszłym kwartale</relative>
+				<relative type="0" draft="contributed">w tym kwartale</relative>
+				<relative type="1" draft="contributed">w przyszłym kwartale</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one" draft="contributed">+{0} kw.</relativeTimePattern>
 					<relativeTimePattern count="few" draft="contributed">+{0} kw.</relativeTimePattern>
@@ -3880,6 +3943,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity draft="contributed">Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity draft="contributed">Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity draft="contributed">Manila</exemplarCity>
 			</zone>
@@ -3964,6 +4030,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkuck</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity draft="contributed">Chita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Jakuck</exemplarCity>
 			</zone>
@@ -3982,6 +4051,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity draft="contributed">Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity draft="contributed">Sriedniekołymsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamczatka</exemplarCity>
 			</zone>
@@ -5327,6 +5399,58 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="contributed">0 tys'.' ¤</pattern>
+					<pattern type="1000" count="few" draft="contributed">0 tys'.' ¤</pattern>
+					<pattern type="1000" count="many" draft="contributed">0 tys'.' ¤</pattern>
+					<pattern type="1000" count="other" draft="contributed">0 tys'.' ¤</pattern>
+					<pattern type="10000" count="one" draft="contributed">00 tys'.' ¤</pattern>
+					<pattern type="10000" count="few" draft="contributed">00 tys'.' ¤</pattern>
+					<pattern type="10000" count="many" draft="contributed">00 tys'.' ¤</pattern>
+					<pattern type="10000" count="other" draft="contributed">00 tys'.' ¤</pattern>
+					<pattern type="100000" count="one" draft="contributed">000 tys'.' ¤</pattern>
+					<pattern type="100000" count="few" draft="contributed">000 tys'.' ¤</pattern>
+					<pattern type="100000" count="many" draft="contributed">000 tys'.' ¤</pattern>
+					<pattern type="100000" count="other" draft="contributed">000 tys'.' ¤</pattern>
+					<pattern type="1000000" count="one" draft="contributed">0 mln ¤</pattern>
+					<pattern type="1000000" count="few" draft="contributed">0 mln ¤</pattern>
+					<pattern type="1000000" count="many" draft="contributed">0 mln ¤</pattern>
+					<pattern type="1000000" count="other" draft="contributed">0 mln ¤</pattern>
+					<pattern type="10000000" count="one" draft="contributed">00 mln ¤</pattern>
+					<pattern type="10000000" count="few" draft="contributed">00 mln ¤</pattern>
+					<pattern type="10000000" count="many" draft="contributed">00 mln ¤</pattern>
+					<pattern type="10000000" count="other" draft="contributed">00 mln ¤</pattern>
+					<pattern type="100000000" count="one" draft="contributed">000 mln ¤</pattern>
+					<pattern type="100000000" count="few" draft="contributed">000 mln ¤</pattern>
+					<pattern type="100000000" count="many" draft="contributed">000 mln ¤</pattern>
+					<pattern type="100000000" count="other" draft="contributed">000 mln ¤</pattern>
+					<pattern type="1000000000" count="one" draft="contributed">0 mld ¤</pattern>
+					<pattern type="1000000000" count="few" draft="contributed">0 mld ¤</pattern>
+					<pattern type="1000000000" count="many" draft="contributed">0 mld ¤</pattern>
+					<pattern type="1000000000" count="other" draft="contributed">0 mld ¤</pattern>
+					<pattern type="10000000000" count="one" draft="contributed">00 mld ¤</pattern>
+					<pattern type="10000000000" count="few" draft="contributed">00 mld ¤</pattern>
+					<pattern type="10000000000" count="many" draft="contributed">00 mld ¤</pattern>
+					<pattern type="10000000000" count="other" draft="contributed">00 mld ¤</pattern>
+					<pattern type="100000000000" count="one" draft="contributed">000 mld ¤</pattern>
+					<pattern type="100000000000" count="few" draft="contributed">000 mld ¤</pattern>
+					<pattern type="100000000000" count="many" draft="contributed">000 mld ¤</pattern>
+					<pattern type="100000000000" count="other" draft="contributed">000 mld ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="contributed">0 bln ¤</pattern>
+					<pattern type="1000000000000" count="few" draft="contributed">0 bln ¤</pattern>
+					<pattern type="1000000000000" count="many" draft="contributed">0 bln ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="contributed">0 bln ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="contributed">00 bln ¤</pattern>
+					<pattern type="10000000000000" count="few" draft="contributed">00 bln ¤</pattern>
+					<pattern type="10000000000000" count="many" draft="contributed">00 bln ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="contributed">00 bln ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="contributed">000 bln ¤</pattern>
+					<pattern type="100000000000000" count="few" draft="contributed">000 bln ¤</pattern>
+					<pattern type="100000000000000" count="many" draft="contributed">000 bln ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="contributed">000 bln ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="few">{0} {1}</unitPattern>
 			<unitPattern count="many">{0} {1}</unitPattern>
@@ -5394,6 +5518,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">kwanz angolańskich</displayName>
 				<displayName count="other">kwanzy angolańskiej</displayName>
 				<symbol draft="contributed">AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>kwanza angolańska (1977–1990)</displayName>
@@ -5476,6 +5601,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">marek zamiennych Bośni i Hercegowiny</displayName>
 				<displayName count="other">marki zamiennej Bośni i Hercegowiny</displayName>
 				<symbol draft="contributed">BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>dolar Barbadosu</displayName>
@@ -5514,6 +5640,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lewy bułgarskie wymienne</displayName>
 				<displayName count="many">lewów bułgarskich wymiennych</displayName>
 				<displayName count="other">lewa bułgarskiego wymiennego</displayName>
+				<symbol draft="contributed">BGL</symbol>
 			</currency>
 			<currency type="BGM">
 				<displayName>lew bułgarski socjalistyczny</displayName>
@@ -5521,6 +5648,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lewy bułgarskie socjalistyczne</displayName>
 				<displayName count="many">lewów bułgarskich socjalistycznych</displayName>
 				<displayName count="other">lewa bułgarskiego socjalistycznego</displayName>
+				<symbol draft="contributed">BGM</symbol>
 			</currency>
 			<currency type="BGN">
 				<displayName>lew bułgarski</displayName>
@@ -5542,7 +5670,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dinar bahrański</displayName>
 				<displayName count="few">dinary bahrańskie</displayName>
 				<displayName count="many">dinarów bahrańskich</displayName>
-				<displayName count="other">dinara barhańskiego</displayName>
+				<displayName count="other">dinara bahrańskiego</displayName>
 				<symbol draft="contributed">BHD</symbol>
 			</currency>
 			<currency type="BIF">
@@ -5578,6 +5706,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many" draft="contributed">boliviano</displayName>
 				<displayName count="other" draft="contributed">boliviano</displayName>
 				<symbol draft="contributed">BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOP">
 				<displayName>peso boliwijskie</displayName>
@@ -5636,6 +5765,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">pul botswańskich</displayName>
 				<displayName count="other">puli botswańskiej</displayName>
 				<symbol draft="contributed">BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>rubel białoruski (1994–1999)</displayName>
@@ -5736,6 +5866,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">pesos kubańskich wymienialnych</displayName>
 				<displayName count="other">peso kubańskiego wymienialnego</displayName>
 				<symbol draft="contributed">CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>peso kubańskie</displayName>
@@ -5764,6 +5895,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">koron czeskich</displayName>
 				<displayName count="other">korony czeskiej</displayName>
 				<symbol draft="contributed">CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>wschodnia marka wschodnioniemiecka</displayName>
@@ -5790,6 +5922,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">koron duńskich</displayName>
 				<displayName count="other">korony duńskiej</displayName>
 				<symbol draft="contributed">DKK</symbol>
+				<symbol alt="narrow" draft="provisional">ISK</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>peso dominikańskie</displayName>
@@ -5825,6 +5958,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">funtów egipskich</displayName>
 				<displayName count="other">funta egipskiego</displayName>
 				<symbol draft="contributed">EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>nakfa erytrejska</displayName>
@@ -5883,6 +6017,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">funtów falklandzkich</displayName>
 				<displayName count="other">funta falklandzkiego</displayName>
 				<symbol draft="contributed">FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>frank francuski</displayName>
@@ -5910,6 +6045,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">lari gruzińskich</displayName>
 				<displayName count="other">lari gruzińskiego</displayName>
 				<symbol draft="contributed">GEL</symbol>
+				<symbol alt="variant" draft="provisional">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>cedi ghańskie (1979–2007)</displayName>
@@ -5946,6 +6082,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">franków gwinejskich</displayName>
 				<displayName count="other">franka gwinejskiego</displayName>
 				<symbol draft="contributed">GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>syli gwinejskie</displayName>
@@ -5963,6 +6100,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">quetzali gwatemalskich</displayName>
 				<displayName count="other">quetzala gwatemalskiego</displayName>
 				<symbol draft="contributed">GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>escudo Gwinea Portugalska</displayName>
@@ -5995,6 +6133,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">lempir honduraskich</displayName>
 				<displayName count="other">lempiry honduraskiej</displayName>
 				<symbol draft="contributed">HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>dinar chorwacki</displayName>
@@ -6006,6 +6145,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">kun chorwackich</displayName>
 				<displayName count="other">kuny chorwackiej</displayName>
 				<symbol draft="contributed">HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>gourde haitańskie</displayName>
@@ -6022,6 +6162,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">forintów węgierskich</displayName>
 				<displayName count="other">forinta węgierskiego</displayName>
 				<symbol draft="contributed">HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>rupia indonezyjska</displayName>
@@ -6030,6 +6171,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">rupii indonezyjskich</displayName>
 				<displayName count="other">rupii indonezyjskiej</displayName>
 				<symbol draft="contributed">IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>funt irlandzki</displayName>
@@ -6078,6 +6220,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">koron islandzkich</displayName>
 				<displayName count="other">korony islandzkiej</displayName>
 				<symbol draft="contributed">ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>lir włoski</displayName>
@@ -6140,6 +6283,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">franków komoryjskich</displayName>
 				<displayName count="other">franka komoryjskiego</displayName>
 				<symbol draft="contributed">KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>won północnokoreański</displayName>
@@ -6148,6 +6292,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">wonów północnokoreańskich</displayName>
 				<displayName count="other">wona północnokoreańskiego</displayName>
 				<symbol draft="contributed">KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>won południowokoreański</displayName>
@@ -6200,6 +6345,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">funtów libańskich</displayName>
 				<displayName count="other">funta libańskiego</displayName>
 				<symbol draft="contributed">LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>rupia lankijska</displayName>
@@ -6208,6 +6354,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">rupii lankijskich</displayName>
 				<displayName count="other">rupii lankijskiej</displayName>
 				<symbol draft="contributed">LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>dolar liberyjski</displayName>
@@ -6284,6 +6431,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">ariary malgaskich</displayName>
 				<displayName count="other">ariary malgaskiego</displayName>
 				<symbol draft="contributed">MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>frank malgaski</displayName>
@@ -6306,6 +6454,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">kiatów birmańskich</displayName>
 				<displayName count="other">kiata birmańskiego</displayName>
 				<symbol draft="contributed">MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>tugrik mongolski</displayName>
@@ -6345,6 +6494,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">rupii maurytyjskich</displayName>
 				<displayName count="other">rupii maurytyjskiej</displayName>
 				<symbol draft="contributed">MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>rupia malediwska</displayName>
@@ -6381,6 +6531,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">ringgitów malezyjskich</displayName>
 				<displayName count="other">ringgita malezyjskiego</displayName>
 				<symbol draft="contributed">MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>escudo mozambickie</displayName>
@@ -6428,6 +6579,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">cordob nikaraguańskich</displayName>
 				<displayName count="other">cordoby nikaraguańskiej</displayName>
 				<symbol draft="contributed">NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>gulden holenderski</displayName>
@@ -6439,6 +6591,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">koron norweskich</displayName>
 				<displayName count="other">korony norweskiej</displayName>
 				<symbol draft="contributed">NOK</symbol>
+				<symbol alt="narrow" draft="provisional">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>rupia nepalska</displayName>
@@ -6447,6 +6600,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">rupii nepalskich</displayName>
 				<displayName count="other">rupii nepalskiej</displayName>
 				<symbol draft="contributed">NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>dolar nowozelandzki</displayName>
@@ -6511,6 +6665,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">rupii pakistańskich</displayName>
 				<displayName count="other">rupii pakistańskiej</displayName>
 				<symbol draft="contributed">PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>złoty polski</displayName>
@@ -6519,6 +6674,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">złotych polskich</displayName>
 				<displayName count="other">złotego polskiego</displayName>
 				<symbol>zł</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>złoty polski (1950–1995)</displayName>
@@ -6580,6 +6736,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">rubli rosyjskich</displayName>
 				<displayName count="other">rubla rosyjskiego</displayName>
 				<symbol draft="contributed">RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>rubel rosyjski (1991–1998)</displayName>
@@ -6595,6 +6752,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">franków ruandyjskich</displayName>
 				<displayName count="other">franka ruandyjskiego</displayName>
 				<symbol draft="contributed">RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>rial saudyjski</displayName>
@@ -6646,6 +6804,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">koron szwedzkich</displayName>
 				<displayName count="other">korony szwedzkiej</displayName>
 				<symbol draft="contributed">SEK</symbol>
+				<symbol alt="narrow" draft="provisional">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>dolar singapurski</displayName>
@@ -6663,6 +6822,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">funtów Wyspy Świętej Heleny</displayName>
 				<displayName count="other">funta Wyspy Świętej Heleny</displayName>
 				<symbol draft="contributed">SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>tolar słoweński</displayName>
@@ -6722,6 +6882,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">dobr Wysp Świętego Tomasza i Książęcej</displayName>
 				<displayName count="other">dobry Wysp Świętego Tomasza i Książęcej</displayName>
 				<symbol draft="contributed">STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>rubel radziecki</displayName>
@@ -6740,6 +6901,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">funtów syryjskich</displayName>
 				<displayName count="other">funta syryjskiego</displayName>
 				<symbol draft="contributed">SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>lilangeni Suazi</displayName>
@@ -6756,6 +6918,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">bahtów tajskich</displayName>
 				<displayName count="other">bahta tajskiego</displayName>
 				<symbol>THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>rubel tadżycki</displayName>
@@ -6798,6 +6961,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">pa’anga tongijskich</displayName>
 				<displayName count="other">pa’anga tongijskiej</displayName>
 				<symbol draft="contributed">TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>escudo timorskie</displayName>
@@ -6817,6 +6981,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">liry tureckiej</displayName>
 				<symbol draft="contributed">TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>dolar Trynidadu i Tobago</displayName>
@@ -6914,6 +7079,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">boliwarów wenezuelskich</displayName>
 				<displayName count="other">boliwara wenezuelskiego</displayName>
 				<symbol draft="contributed">VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>dong wietnamski</displayName>
@@ -6973,6 +7139,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">dolarów wschodniokaraibskich</displayName>
 				<displayName count="other">dolara wschodniokaraibskiego</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>specjalne prawa ciągnienia</displayName>
@@ -7045,6 +7212,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">randów południowoafrykańskich</displayName>
 				<displayName count="other">randa południowoafrykańskiego</displayName>
 				<symbol draft="contributed">ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>kwacha zambijska (1968–2012)</displayName>
@@ -7060,6 +7228,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">kwacha zambijskich</displayName>
 				<displayName count="other">kwacha zambijskiej</displayName>
 				<symbol draft="contributed">ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>nowy zair zairski</displayName>
@@ -7101,6 +7270,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} metrów na sekundę do kwadratu</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} metra na sekundę do kwadratu</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName draft="contributed">obrót</displayName>
+				<unitPattern count="one" draft="contributed">{0} obrót</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} obroty</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} obrotów</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} obrotu</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName draft="contributed">radiany</displayName>
+				<unitPattern count="one" draft="contributed">{0} radian</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} radiany</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} radianów</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} radiana</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName draft="contributed">stopnie</displayName>
+				<unitPattern count="one">{0} stopień</unitPattern>
+				<unitPattern count="few">{0} stopnie</unitPattern>
+				<unitPattern count="many">{0} stopni</unitPattern>
+				<unitPattern count="other">{0} stopnia</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName draft="contributed">minuty kątowe</displayName>
 				<unitPattern count="one">{0} minuta</unitPattern>
@@ -7115,26 +7305,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} sekund</unitPattern>
 				<unitPattern count="other">{0} sekundy</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName draft="contributed">stopnie</displayName>
-				<unitPattern count="one">{0} stopień</unitPattern>
-				<unitPattern count="few">{0} stopnie</unitPattern>
-				<unitPattern count="many">{0} stopni</unitPattern>
-				<unitPattern count="other">{0} stopnia</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName draft="contributed">radiany</displayName>
-				<unitPattern count="one" draft="contributed">{0} radian</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} radiany</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} radianów</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} radiana</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="contributed">akry</displayName>
-				<unitPattern count="one">{0} akr</unitPattern>
-				<unitPattern count="few">{0} akry</unitPattern>
-				<unitPattern count="many">{0} akrów</unitPattern>
-				<unitPattern count="other">{0} akra</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName draft="contributed">kilometry kwadratowe</displayName>
+				<unitPattern count="one">{0} kilometr kwadratowy</unitPattern>
+				<unitPattern count="few">{0} kilometry kwadratowe</unitPattern>
+				<unitPattern count="many">{0} kilometrów kwadratowych</unitPattern>
+				<unitPattern count="other">{0} kilometra kwadratowego</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName draft="contributed">hektary</displayName>
@@ -7143,12 +7319,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} hektarów</unitPattern>
 				<unitPattern count="other">{0} hektara</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName draft="contributed">metry kwadratowe</displayName>
+				<unitPattern count="one">{0} metr kwadratowy</unitPattern>
+				<unitPattern count="few">{0} metry kwadratowe</unitPattern>
+				<unitPattern count="many">{0} metrów kwadratowych</unitPattern>
+				<unitPattern count="other">{0} metra kwadratowego</unitPattern>
+				<perUnitPattern draft="contributed">{0} na metr kwadratowy</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName draft="contributed">centymetry kwadratowe</displayName>
 				<unitPattern count="one" draft="contributed">{0} centymetr kwadratowy</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} centymetry kwadratowe</unitPattern>
 				<unitPattern count="many" draft="contributed">{0} centymetrów kwadratowych</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} centymetra kwadratowego</unitPattern>
+				<perUnitPattern draft="contributed">{0} na centymetr kwadratowy</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName draft="contributed">mile kwadratowe</displayName>
+				<unitPattern count="one">{0} mila kwadratowa</unitPattern>
+				<unitPattern count="few">{0} mile kwadratowe</unitPattern>
+				<unitPattern count="many">{0} mil kwadratowych</unitPattern>
+				<unitPattern count="other">{0} mili kwadratowej</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName draft="contributed">akry</displayName>
+				<unitPattern count="one">{0} akr</unitPattern>
+				<unitPattern count="few">{0} akry</unitPattern>
+				<unitPattern count="many">{0} akrów</unitPattern>
+				<unitPattern count="other">{0} akra</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName draft="contributed">jardy kwadratowe</displayName>
+				<unitPattern count="one" draft="contributed">{0} jard kwadratowy</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} jardy kwadratowe</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} jardów kwadratowych</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} jarda kwadratowego</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName draft="contributed">stopy kwadratowe</displayName>
@@ -7163,34 +7369,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} cale kwadratowe</unitPattern>
 				<unitPattern count="many" draft="contributed">{0} cali kwadratowych</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} cala kwadratowego</unitPattern>
+				<perUnitPattern draft="contributed">{0} na cal kwadratowy</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="contributed">kilometry kwadratowe</displayName>
-				<unitPattern count="one">{0} kilometr kwadratowy</unitPattern>
-				<unitPattern count="few">{0} kilometry kwadratowe</unitPattern>
-				<unitPattern count="many">{0} kilometrów kwadratowych</unitPattern>
-				<unitPattern count="other">{0} kilometra kwadratowego</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName draft="contributed">metry kwadratowe</displayName>
-				<unitPattern count="one">{0} metr kwadratowy</unitPattern>
-				<unitPattern count="few">{0} metry kwadratowe</unitPattern>
-				<unitPattern count="many">{0} metrów kwadratowych</unitPattern>
-				<unitPattern count="other">{0} metra kwadratowego</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName draft="contributed">mile kwadratowe</displayName>
-				<unitPattern count="one">{0} mila kwadratowa</unitPattern>
-				<unitPattern count="few">{0} mile kwadratowe</unitPattern>
-				<unitPattern count="many">{0} mil kwadratowych</unitPattern>
-				<unitPattern count="other">{0} mili kwadratowej</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName draft="contributed">jardy kwadratowe</displayName>
-				<unitPattern count="one" draft="contributed">{0} jard kwadratowy</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} jardy kwadratowe</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} jardów kwadratowych</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} jarda kwadratowego</unitPattern>
+			<unit type="concentr-karat">
+				<displayName draft="contributed">karaty</displayName>
+				<unitPattern count="one" draft="contributed">{0} karat</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} karaty</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} karatów</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} karata</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName draft="contributed">litry na kilometr</displayName>
@@ -7199,6 +7385,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} litrów na kilometr</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} litra na kilometr</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>litrów na 100 kilometrów</displayName>
+				<unitPattern count="one">{0} litr na 100 kilometrów</unitPattern>
+				<unitPattern count="few">{0} litry na 100 kilometrów</unitPattern>
+				<unitPattern count="many">{0} litrów na 100 kilometrów</unitPattern>
+				<unitPattern count="other">{0} litra na 100 kilometrów</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName draft="contributed">mile na galon</displayName>
 				<unitPattern count="one" draft="contributed">{0} mila na galon</unitPattern>
@@ -7206,69 +7399,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} mili na galon</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mili na galon</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName draft="contributed">bity</displayName>
-				<unitPattern count="one" draft="contributed">{0} bit</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} bity</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} bitów</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} bitu</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName draft="contributed">bajty</displayName>
-				<unitPattern count="one" draft="contributed">{0} bajt</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} bajty</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} bajtów</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} bajta</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName draft="contributed">gigabity</displayName>
-				<unitPattern count="one" draft="contributed">{0} gigabit</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} gigabity</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} gigabitów</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} gigabitu</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName draft="contributed">gigabajty</displayName>
-				<unitPattern count="one" draft="contributed">{0} gigabajt</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} gigabajty</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} gigabajtów</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} gigabajta</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName draft="contributed">kilobity</displayName>
-				<unitPattern count="one" draft="contributed">{0} kilobit</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kilobity</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} kilobitów</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kilobitu</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName draft="contributed">kilobajty</displayName>
-				<unitPattern count="one" draft="contributed">{0} kilobajt</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kilobajty</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} kilobajtów</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kilobajta</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName draft="contributed">megabity</displayName>
-				<unitPattern count="one" draft="contributed">{0} megabit</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} megabity</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} megabitów</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} megabitu</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName draft="contributed">megabajty</displayName>
-				<unitPattern count="one" draft="contributed">{0} megabajt</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} megabajty</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} megabajtów</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} megabajta</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName draft="contributed">terabity</displayName>
-				<unitPattern count="one" draft="contributed">{0} terabit</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} terabity</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} terabitów</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} terabitu</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName draft="contributed">terabajty</displayName>
 				<unitPattern count="one" draft="contributed">{0} terabajt</unitPattern>
@@ -7276,12 +7406,107 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} terabajtów</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} terabajta</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName draft="contributed">terabity</displayName>
+				<unitPattern count="one" draft="contributed">{0} terabit</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} terabity</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} terabitów</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} terabitu</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName draft="contributed">gigabajty</displayName>
+				<unitPattern count="one" draft="contributed">{0} gigabajt</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} gigabajty</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} gigabajtów</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} gigabajta</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName draft="contributed">gigabity</displayName>
+				<unitPattern count="one" draft="contributed">{0} gigabit</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} gigabity</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} gigabitów</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} gigabitu</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName draft="contributed">megabajty</displayName>
+				<unitPattern count="one" draft="contributed">{0} megabajt</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} megabajty</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} megabajtów</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} megabajta</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName draft="contributed">megabity</displayName>
+				<unitPattern count="one" draft="contributed">{0} megabit</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} megabity</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} megabitów</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} megabitu</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName draft="contributed">kilobajty</displayName>
+				<unitPattern count="one" draft="contributed">{0} kilobajt</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kilobajty</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} kilobajtów</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kilobajta</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName draft="contributed">kilobity</displayName>
+				<unitPattern count="one" draft="contributed">{0} kilobit</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kilobity</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} kilobitów</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kilobitu</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName draft="contributed">bajty</displayName>
+				<unitPattern count="one" draft="contributed">{0} bajt</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} bajty</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} bajtów</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} bajta</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName draft="contributed">bity</displayName>
+				<unitPattern count="one" draft="contributed">{0} bit</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} bity</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} bitów</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} bitu</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="contributed">wieki</displayName>
+				<unitPattern count="one" draft="contributed">{0} wiek</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} wieki</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} wieków</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} wieku</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="contributed">lata</displayName>
+				<unitPattern count="one">{0} rok</unitPattern>
+				<unitPattern count="few">{0} lata</unitPattern>
+				<unitPattern count="many">{0} lat</unitPattern>
+				<unitPattern count="other">{0} roku</unitPattern>
+				<perUnitPattern draft="contributed">{0} na rok</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">miesiące</displayName>
+				<unitPattern count="one">{0} miesiąc</unitPattern>
+				<unitPattern count="few">{0} miesiące</unitPattern>
+				<unitPattern count="many">{0} miesięcy</unitPattern>
+				<unitPattern count="other">{0} miesiąca</unitPattern>
+				<perUnitPattern draft="contributed">{0} na miesiąc</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="contributed">tygodnie</displayName>
+				<unitPattern count="one">{0} tydzień</unitPattern>
+				<unitPattern count="few">{0} tygodnie</unitPattern>
+				<unitPattern count="many">{0} tygodni</unitPattern>
+				<unitPattern count="other">{0} tygodnia</unitPattern>
+				<perUnitPattern draft="contributed">{0} na tydzień</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="contributed">dni</displayName>
 				<unitPattern count="one">{0} dzień</unitPattern>
 				<unitPattern count="few">{0} dni</unitPattern>
 				<unitPattern count="many">{0} dni</unitPattern>
 				<unitPattern count="other">{0} dnia</unitPattern>
+				<perUnitPattern draft="contributed">{0} na dzień</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName draft="contributed">godziny</displayName>
@@ -7291,40 +7516,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} godzin</unitPattern>
 				<perUnitPattern draft="contributed">{0} na godzinę</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName draft="contributed">mikrosekundy</displayName>
-				<unitPattern count="one" draft="contributed">{0} mikrosekunda</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mikrosekundy</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} mikrosekund</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mikrosekundy</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="contributed">milisekundy</displayName>
-				<unitPattern count="one">{0} milisekunda</unitPattern>
-				<unitPattern count="few">{0} milisekundy</unitPattern>
-				<unitPattern count="many">{0} milisekund</unitPattern>
-				<unitPattern count="other">{0} milisekundy</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="contributed">minuty</displayName>
 				<unitPattern count="one">{0} minuta</unitPattern>
 				<unitPattern count="few">{0} minuty</unitPattern>
 				<unitPattern count="many">{0} minut</unitPattern>
 				<unitPattern count="other">{0} minuty</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">miesiące</displayName>
-				<unitPattern count="one">{0} miesiąc</unitPattern>
-				<unitPattern count="few">{0} miesiące</unitPattern>
-				<unitPattern count="many">{0} miesięcy</unitPattern>
-				<unitPattern count="other">{0} miesiąca</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName draft="contributed">nanosekundy</displayName>
-				<unitPattern count="one" draft="contributed">{0} nanosekunda</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} nanosekundy</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} nanosekund</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} nanosekundy</unitPattern>
+				<perUnitPattern draft="contributed">{0} na minutę</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName draft="contributed">sekundy</displayName>
@@ -7334,19 +7532,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} sekundy</unitPattern>
 				<perUnitPattern draft="contributed">{0} na sekundę</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">tygodnie</displayName>
-				<unitPattern count="one">{0} tydzień</unitPattern>
-				<unitPattern count="few">{0} tygodnie</unitPattern>
-				<unitPattern count="many">{0} tygodni</unitPattern>
-				<unitPattern count="other">{0} tygodnia</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="contributed">milisekundy</displayName>
+				<unitPattern count="one">{0} milisekunda</unitPattern>
+				<unitPattern count="few">{0} milisekundy</unitPattern>
+				<unitPattern count="many">{0} milisekund</unitPattern>
+				<unitPattern count="other">{0} milisekundy</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">lata</displayName>
-				<unitPattern count="one">{0} rok</unitPattern>
-				<unitPattern count="few">{0} lata</unitPattern>
-				<unitPattern count="many">{0} lat</unitPattern>
-				<unitPattern count="other">{0} roku</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName draft="contributed">mikrosekundy</displayName>
+				<unitPattern count="one" draft="contributed">{0} mikrosekunda</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mikrosekundy</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} mikrosekund</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mikrosekundy</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName draft="contributed">nanosekundy</displayName>
+				<unitPattern count="one" draft="contributed">{0} nanosekunda</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} nanosekundy</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} nanosekund</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} nanosekundy</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName draft="contributed">ampery</displayName>
@@ -7376,6 +7581,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} woltów</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} wolta</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName draft="contributed">kilokalorie</displayName>
+				<unitPattern count="one" draft="contributed">{0} kilokaloria</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kilokalorie</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} kilokalorii</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kilokalorii</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName draft="contributed">kalorie</displayName>
 				<unitPattern count="one" draft="contributed">{0} kaloria</unitPattern>
@@ -7390,20 +7602,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} kalorii</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kalorii</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName draft="contributed">dżule</displayName>
-				<unitPattern count="one" draft="contributed">{0} dżul</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} dżule</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} dżuli</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} dżula</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName draft="contributed">kilokalorie</displayName>
-				<unitPattern count="one" draft="contributed">{0} kilokaloria</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kilokalorie</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} kilokalorii</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kilokalorii</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName draft="contributed">kilodżule</displayName>
 				<unitPattern count="one" draft="contributed">{0} kilodżul</unitPattern>
@@ -7411,6 +7609,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} kilodżuli</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kilodżula</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName draft="contributed">dżule</displayName>
+				<unitPattern count="one" draft="contributed">{0} dżul</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} dżule</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} dżuli</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} dżula</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName draft="contributed">kilowatogodziny</displayName>
 				<unitPattern count="one" draft="contributed">{0} kilowatogodzina</unitPattern>
@@ -7425,12 +7630,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} gigaherców</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} gigaherca</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName draft="contributed">herce</displayName>
-				<unitPattern count="one" draft="contributed">{0} herc</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} herce</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} herców</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} herca</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName draft="contributed">megaherce</displayName>
+				<unitPattern count="one" draft="contributed">{0} megaherc</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} megaherce</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} megaherców</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} megaherca</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName draft="contributed">kiloherce</displayName>
@@ -7439,26 +7644,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} kiloherców</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kiloherca</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName draft="contributed">megaherce</displayName>
-				<unitPattern count="one" draft="contributed">{0} megaherc</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} megaherce</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} megaherców</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} megaherca</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName draft="contributed">herce</displayName>
+				<unitPattern count="one" draft="contributed">{0} herc</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} herce</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} herców</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} herca</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName draft="contributed">jednostki astronomiczne</displayName>
-				<unitPattern count="one" draft="contributed">{0} jednostka astronomiczna</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} jednostki astronomiczne</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} jednostek astronomicznych</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} jednostki astronomicznej</unitPattern>
+			<unit type="length-kilometer">
+				<displayName draft="contributed">kilometry</displayName>
+				<unitPattern count="one">{0} kilometr</unitPattern>
+				<unitPattern count="few">{0} kilometry</unitPattern>
+				<unitPattern count="many">{0} kilometrów</unitPattern>
+				<unitPattern count="other">{0} kilometra</unitPattern>
+				<perUnitPattern draft="contributed">{0} na kilometr</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">centymetry</displayName>
-				<unitPattern count="one">{0} centymetr</unitPattern>
-				<unitPattern count="few">{0} centymetry</unitPattern>
-				<unitPattern count="many">{0} centymetrów</unitPattern>
-				<unitPattern count="other">{0} centymetra</unitPattern>
+			<unit type="length-meter">
+				<displayName draft="contributed">metry</displayName>
+				<unitPattern count="one">{0} metr</unitPattern>
+				<unitPattern count="few">{0} metry</unitPattern>
+				<unitPattern count="many">{0} metrów</unitPattern>
+				<unitPattern count="other">{0} metra</unitPattern>
+				<perUnitPattern draft="contributed">{0} na metr</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName draft="contributed">decymetry</displayName>
@@ -7467,54 +7674,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} decymetrów</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} decymetra</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName draft="contributed">stopy</displayName>
-				<unitPattern count="one">{0} stopa</unitPattern>
-				<unitPattern count="few">{0} stopy</unitPattern>
-				<unitPattern count="many">{0} stóp</unitPattern>
-				<unitPattern count="other">{0} stopy</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>cale</displayName>
-				<unitPattern count="one">{0} cal</unitPattern>
-				<unitPattern count="few">{0} cale</unitPattern>
-				<unitPattern count="many">{0} cali</unitPattern>
-				<unitPattern count="other">{0} cala</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName draft="contributed">kilometry</displayName>
-				<unitPattern count="one">{0} kilometr</unitPattern>
-				<unitPattern count="few">{0} kilometry</unitPattern>
-				<unitPattern count="many">{0} kilometrów</unitPattern>
-				<unitPattern count="other">{0} kilometra</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName draft="contributed">lata świetlne</displayName>
-				<unitPattern count="one">{0} rok świetlny</unitPattern>
-				<unitPattern count="few">{0} lata świetlne</unitPattern>
-				<unitPattern count="many">{0} lat świetlnych</unitPattern>
-				<unitPattern count="other">{0} roku świetlnego</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName draft="contributed">metry</displayName>
-				<unitPattern count="one">{0} metr</unitPattern>
-				<unitPattern count="few">{0} metry</unitPattern>
-				<unitPattern count="many">{0} metrów</unitPattern>
-				<unitPattern count="other">{0} metra</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName draft="contributed">mikrometry</displayName>
-				<unitPattern count="one" draft="contributed">{0} mikrometr</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mikrometry</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} mikrometrów</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mikrometra</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName draft="contributed">mile</displayName>
-				<unitPattern count="one">{0} mila</unitPattern>
-				<unitPattern count="few">{0} mile</unitPattern>
-				<unitPattern count="many">{0} mil</unitPattern>
-				<unitPattern count="other">{0} mili</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="contributed">centymetry</displayName>
+				<unitPattern count="one">{0} centymetr</unitPattern>
+				<unitPattern count="few">{0} centymetry</unitPattern>
+				<unitPattern count="many">{0} centymetrów</unitPattern>
+				<unitPattern count="other">{0} centymetra</unitPattern>
+				<perUnitPattern draft="contributed">{0} na centymetr</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="contributed">milimetry</displayName>
@@ -7523,6 +7689,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} milimetrów</unitPattern>
 				<unitPattern count="other">{0} milimetra</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName draft="contributed">mikrometry</displayName>
+				<unitPattern count="one" draft="contributed">{0} mikrometr</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mikrometry</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} mikrometrów</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mikrometra</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName draft="contributed">nanometry</displayName>
 				<unitPattern count="one" draft="contributed">{0} nanometr</unitPattern>
@@ -7530,20 +7703,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} nanometrów</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} nanometra</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName draft="contributed">mile morskie</displayName>
-				<unitPattern count="one" draft="contributed">{0} mila morska</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mile morskie</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} mil morskich</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mili morskiej</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName draft="contributed">parseki</displayName>
-				<unitPattern count="one" draft="contributed">{0} parsek</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} parseki</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} parseków</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} parseka</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName draft="contributed">pikometry</displayName>
 				<unitPattern count="one">{0} pikometr</unitPattern>
@@ -7551,6 +7710,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} pikometrów</unitPattern>
 				<unitPattern count="other">{0} pikometra</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="contributed">mile</displayName>
+				<unitPattern count="one">{0} mila</unitPattern>
+				<unitPattern count="few">{0} mile</unitPattern>
+				<unitPattern count="many">{0} mil</unitPattern>
+				<unitPattern count="other">{0} mili</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName draft="contributed">jardy</displayName>
 				<unitPattern count="one">{0} jard</unitPattern>
@@ -7558,6 +7724,57 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} jardów</unitPattern>
 				<unitPattern count="other">{0} jarda</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName draft="contributed">stopy</displayName>
+				<unitPattern count="one">{0} stopa</unitPattern>
+				<unitPattern count="few">{0} stopy</unitPattern>
+				<unitPattern count="many">{0} stóp</unitPattern>
+				<unitPattern count="other">{0} stopy</unitPattern>
+				<perUnitPattern draft="contributed">{0} na stopę</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>cale</displayName>
+				<unitPattern count="one">{0} cal</unitPattern>
+				<unitPattern count="few">{0} cale</unitPattern>
+				<unitPattern count="many">{0} cali</unitPattern>
+				<unitPattern count="other">{0} cala</unitPattern>
+				<perUnitPattern draft="contributed">{0} na cal</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName draft="contributed">parseki</displayName>
+				<unitPattern count="one" draft="contributed">{0} parsek</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} parseki</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} parseków</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} parseka</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="contributed">lata świetlne</displayName>
+				<unitPattern count="one">{0} rok świetlny</unitPattern>
+				<unitPattern count="few">{0} lata świetlne</unitPattern>
+				<unitPattern count="many">{0} lat świetlnych</unitPattern>
+				<unitPattern count="other">{0} roku świetlnego</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName draft="contributed">jednostki astronomiczne</displayName>
+				<unitPattern count="one" draft="contributed">{0} jednostka astronomiczna</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} jednostki astronomiczne</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} jednostek astronomicznych</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} jednostki astronomicznej</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName draft="contributed">mile morskie</displayName>
+				<unitPattern count="one" draft="contributed">{0} mila morska</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mile morskie</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} mil morskich</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mili morskiej</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="contributed">mila skandynawska</displayName>
+				<unitPattern count="one" draft="contributed">{0} mila skandynawska</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mile skandynawskie</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} mil skandynawskich</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mili skandynawskiej</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName draft="contributed">luksy</displayName>
 				<unitPattern count="one" draft="contributed">{0} luks</unitPattern>
@@ -7565,27 +7782,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} luksów</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} luksu</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName draft="contributed">karaty</displayName>
-				<unitPattern count="one" draft="contributed">{0} karat</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} karaty</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} karatów</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} karata</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName draft="contributed">gramy</displayName>
-				<unitPattern count="one">{0} gram</unitPattern>
-				<unitPattern count="few">{0} gramy</unitPattern>
-				<unitPattern count="many">{0} gramów</unitPattern>
-				<unitPattern count="other">{0} grama</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName draft="contributed">kilogramy</displayName>
-				<unitPattern count="one">{0} kilogram</unitPattern>
-				<unitPattern count="few">{0} kilogramy</unitPattern>
-				<unitPattern count="many">{0} kilogramów</unitPattern>
-				<unitPattern count="other">{0} kilograma</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName draft="contributed">tony</displayName>
 				<unitPattern count="one" draft="contributed">{0} tona</unitPattern>
@@ -7593,12 +7789,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} ton</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} tony</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName draft="contributed">mikrogramy</displayName>
-				<unitPattern count="one" draft="contributed">{0} mikrogram</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mikrogramy</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} mikrogramów</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mikrograma</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName draft="contributed">kilogramy</displayName>
+				<unitPattern count="one">{0} kilogram</unitPattern>
+				<unitPattern count="few">{0} kilogramy</unitPattern>
+				<unitPattern count="many">{0} kilogramów</unitPattern>
+				<unitPattern count="other">{0} kilograma</unitPattern>
+				<perUnitPattern>{0} na kilogram</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName draft="contributed">gramy</displayName>
+				<unitPattern count="one">{0} gram</unitPattern>
+				<unitPattern count="few">{0} gramy</unitPattern>
+				<unitPattern count="many">{0} gramów</unitPattern>
+				<unitPattern count="other">{0} grama</unitPattern>
+				<perUnitPattern>{0} na gram</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName draft="contributed">miligramy</displayName>
@@ -7607,26 +7812,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} miligramów</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} miligrama</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="contributed">uncje</displayName>
-				<unitPattern count="one">{0} uncja</unitPattern>
-				<unitPattern count="few">{0} uncje</unitPattern>
-				<unitPattern count="many">{0} uncji</unitPattern>
-				<unitPattern count="other">{0} uncji</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName draft="contributed">uncja trojańska</displayName>
-				<unitPattern count="one" draft="contributed">{0} uncja trojańska</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} uncje trojańskie</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} uncji trojańskich</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} uncji trojańskiej</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName draft="contributed">funty</displayName>
-				<unitPattern count="one">{0} funt</unitPattern>
-				<unitPattern count="few">{0} funty</unitPattern>
-				<unitPattern count="many">{0} funtów</unitPattern>
-				<unitPattern count="other">{0} funta</unitPattern>
+			<unit type="mass-microgram">
+				<displayName draft="contributed">mikrogramy</displayName>
+				<unitPattern count="one" draft="contributed">{0} mikrogram</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mikrogramy</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} mikrogramów</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mikrograma</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName draft="contributed">krótkie tony</displayName>
@@ -7635,6 +7826,36 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} krótkich ton</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} krótkiej tony</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName draft="contributed">funty</displayName>
+				<unitPattern count="one">{0} funt</unitPattern>
+				<unitPattern count="few">{0} funty</unitPattern>
+				<unitPattern count="many">{0} funtów</unitPattern>
+				<unitPattern count="other">{0} funta</unitPattern>
+				<perUnitPattern>{0} na funt</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName draft="contributed">uncje</displayName>
+				<unitPattern count="one">{0} uncja</unitPattern>
+				<unitPattern count="few">{0} uncje</unitPattern>
+				<unitPattern count="many">{0} uncji</unitPattern>
+				<unitPattern count="other">{0} uncji</unitPattern>
+				<perUnitPattern>{0} na uncję</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName draft="contributed">uncja trojańska</displayName>
+				<unitPattern count="one" draft="contributed">{0} uncja trojańska</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} uncje trojańskie</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} uncji trojańskich</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} uncji trojańskiej</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName draft="contributed">karaty</displayName>
+				<unitPattern count="one" draft="contributed">{0} karat</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} karaty</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} karatów</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} karata</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName draft="contributed">gigawaty</displayName>
 				<unitPattern count="one" draft="contributed">{0} gigawat</unitPattern>
@@ -7642,20 +7863,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} gigawatów</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} gigawata</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="contributed">konie mechaniczne</displayName>
-				<unitPattern count="one">{0} koń mechaniczny</unitPattern>
-				<unitPattern count="few">{0} konie mechaniczne</unitPattern>
-				<unitPattern count="many">{0} koni mechanicznych</unitPattern>
-				<unitPattern count="other">{0} konia mechanicznego</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName draft="contributed">kilowaty</displayName>
-				<unitPattern count="one">{0} kilowat</unitPattern>
-				<unitPattern count="few">{0} kilowaty</unitPattern>
-				<unitPattern count="many">{0} kilowatów</unitPattern>
-				<unitPattern count="other">{0} kilowata</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName draft="contributed">megawaty</displayName>
 				<unitPattern count="one" draft="contributed">{0} megawat</unitPattern>
@@ -7663,12 +7870,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} megawatów</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} megawata</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName draft="contributed">miliwaty</displayName>
-				<unitPattern count="one" draft="contributed">{0} miliwat</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} miliwaty</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} miliwatów</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} miliwata</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName draft="contributed">kilowaty</displayName>
+				<unitPattern count="one">{0} kilowat</unitPattern>
+				<unitPattern count="few">{0} kilowaty</unitPattern>
+				<unitPattern count="many">{0} kilowatów</unitPattern>
+				<unitPattern count="other">{0} kilowata</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName draft="contributed">waty</displayName>
@@ -7677,6 +7884,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} watów</unitPattern>
 				<unitPattern count="other">{0} wata</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName draft="contributed">miliwaty</displayName>
+				<unitPattern count="one" draft="contributed">{0} miliwat</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} miliwaty</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} miliwatów</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} miliwata</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName draft="contributed">konie mechaniczne</displayName>
+				<unitPattern count="one">{0} koń mechaniczny</unitPattern>
+				<unitPattern count="few">{0} konie mechaniczne</unitPattern>
+				<unitPattern count="many">{0} koni mechanicznych</unitPattern>
+				<unitPattern count="other">{0} konia mechanicznego</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="contributed">hektopaskale</displayName>
 				<unitPattern count="one">{0} hektopaskal</unitPattern>
@@ -7684,20 +7905,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} hektopaskali</unitPattern>
 				<unitPattern count="other">{0} hektopaskala</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName draft="contributed">cale słupa rtęci</displayName>
-				<unitPattern count="one">{0} cal słupa rtęci</unitPattern>
-				<unitPattern count="few">{0} cale słupa rtęci</unitPattern>
-				<unitPattern count="many">{0} cali słupa rtęci</unitPattern>
-				<unitPattern count="other">{0} cala słupa rtęci</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName draft="contributed">milibary</displayName>
-				<unitPattern count="one">{0} millibar</unitPattern>
-				<unitPattern count="few">{0} millibary</unitPattern>
-				<unitPattern count="many">{0} millibarów</unitPattern>
-				<unitPattern count="other">{0} millibara</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName draft="contributed">milimetry słupa rtęci</displayName>
 				<unitPattern count="one" draft="contributed">{0} milimetr słupa rtęci</unitPattern>
@@ -7712,12 +7919,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} funtów na cal kwadratowy</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} funta na cal kwadratowy</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName draft="contributed">karaty</displayName>
-				<unitPattern count="one" draft="contributed">{0} karat</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} karaty</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} karatów</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} karata</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName draft="contributed">cale słupa rtęci</displayName>
+				<unitPattern count="one">{0} cal słupa rtęci</unitPattern>
+				<unitPattern count="few">{0} cale słupa rtęci</unitPattern>
+				<unitPattern count="many">{0} cali słupa rtęci</unitPattern>
+				<unitPattern count="other">{0} cala słupa rtęci</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName draft="contributed">milibary</displayName>
+				<unitPattern count="one">{0} millibar</unitPattern>
+				<unitPattern count="few">{0} millibary</unitPattern>
+				<unitPattern count="many">{0} millibarów</unitPattern>
+				<unitPattern count="other">{0} millibara</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName draft="contributed">kilometry na godzinę</displayName>
@@ -7740,6 +7954,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mil na godzinę</unitPattern>
 				<unitPattern count="other">{0} mili na godzinę</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName draft="contributed">węzeł</displayName>
+				<unitPattern count="one" draft="contributed">{0} węzeł</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} węzły</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} węzłów</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} węzła</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName draft="contributed">stopnie</displayName>
+				<unitPattern count="one" draft="contributed">{0} stopień</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} stopnie</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} stopni</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} stopnia</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName draft="contributed">stopnie Celsjusza</displayName>
 				<unitPattern count="one">{0} stopień Celsjusza</unitPattern>
@@ -7761,41 +7989,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} kelwinów</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kelwina</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName draft="contributed">akro-stopy</displayName>
-				<unitPattern count="one" draft="contributed">{0} akro-stopa</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} akro-stopy</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} akro-stóp</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} akro-stopy</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName draft="contributed">centylitry</displayName>
-				<unitPattern count="one" draft="contributed">{0} centylitr</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} centylitry</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} centylitrów</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} centylitra</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName draft="contributed">centymetry sześcienne</displayName>
-				<unitPattern count="one" draft="contributed">{0} centymetr sześcienny</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} centymetry sześcienne</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} centymetrów sześciennych</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} centymetra sześciennego</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName draft="contributed">stopy sześcienne</displayName>
-				<unitPattern count="one" draft="contributed">{0} stopa sześcienna</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} stopy sześcienne</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} stóp sześciennych</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} stopy sześciennej</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName draft="contributed">cale sześcienne</displayName>
-				<unitPattern count="one" draft="contributed">{0} cal sześcienny</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} cale sześcienne</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} cali sześciennych</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cala sześciennego</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName draft="contributed">kilometry sześcienne</displayName>
 				<unitPattern count="one">{0} kilometr sześcienny</unitPattern>
@@ -7809,6 +8002,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} metry sześcienne</unitPattern>
 				<unitPattern count="many" draft="contributed">{0} metrów sześciennych</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} metra sześciennego</unitPattern>
+				<perUnitPattern draft="contributed">{0} na metr sześcienny</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName draft="contributed">centymetry sześcienne</displayName>
+				<unitPattern count="one" draft="contributed">{0} centymetr sześcienny</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} centymetry sześcienne</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} centymetrów sześciennych</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} centymetra sześciennego</unitPattern>
+				<perUnitPattern draft="contributed">{0} na centymetr sześcienny</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName draft="contributed">mile sześcienne</displayName>
@@ -7824,33 +8026,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} jardów sześciennych</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} jarda sześciennego</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName draft="contributed">ćwierćkwarty</displayName>
-				<unitPattern count="one" draft="contributed">{0} ćwierćkwarta</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ćwierćkwarty</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ćwierćkwart</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ćwierćkwarty</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName draft="contributed">stopy sześcienne</displayName>
+				<unitPattern count="one" draft="contributed">{0} stopa sześcienna</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} stopy sześcienne</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} stóp sześciennych</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} stopy sześciennej</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName draft="contributed">decylitry</displayName>
-				<unitPattern count="one" draft="contributed">{0} decylitr</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} decylitry</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} decylitrów</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} decylitra</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName draft="contributed">cale sześcienne</displayName>
+				<unitPattern count="one" draft="contributed">{0} cal sześcienny</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} cale sześcienne</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} cali sześciennych</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cala sześciennego</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName draft="contributed">uncje płynu</displayName>
-				<unitPattern count="one" draft="contributed">{0} uncja płynu</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} uncje płynu</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} uncji płynu</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} uncji płynu</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName draft="contributed">galony</displayName>
-				<unitPattern count="one" draft="contributed">{0} galon</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} galony</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} galonów</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} galona</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName draft="contributed">megalitry</displayName>
+				<unitPattern count="one" draft="contributed">{0} megalitr</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} megalitry</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} megalitrów</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} megalitra</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName draft="contributed">hektolitry</displayName>
@@ -7865,13 +8060,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} litry</unitPattern>
 				<unitPattern count="many">{0} litrów</unitPattern>
 				<unitPattern count="other">{0} litra</unitPattern>
+				<perUnitPattern draft="contributed">{0} na litr</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName draft="contributed">megalitry</displayName>
-				<unitPattern count="one" draft="contributed">{0} megalitr</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} megalitry</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} megalitrów</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} megalitra</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName draft="contributed">decylitry</displayName>
+				<unitPattern count="one" draft="contributed">{0} decylitr</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} decylitry</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} decylitrów</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} decylitra</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName draft="contributed">centylitry</displayName>
+				<unitPattern count="one" draft="contributed">{0} centylitr</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} centylitry</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} centylitrów</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} centylitra</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName draft="contributed">mililitry</displayName>
@@ -7880,12 +8083,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} mililitrów</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mililitra</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName draft="contributed">półkwarty</displayName>
-				<unitPattern count="one" draft="contributed">{0} półkwarta</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} półkwarty</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} półkwart</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} półkwarty</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName draft="contributed">półkwarty metryczne</displayName>
+				<unitPattern count="one" draft="contributed">{0} półkwarta metryczna</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} półkwarty metryczne</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} półkwart metrycznych</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} półkwarty metrycznej</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName draft="contributed">ćwierćkwarty metryczne</displayName>
+				<unitPattern count="one" draft="contributed">{0} ćwierćkwarta metryczna</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ćwierćkwarty metryczne</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ćwierćkwart metrycznych</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ćwierćkwarty metrycznej</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName draft="contributed">akro-stopy</displayName>
+				<unitPattern count="one" draft="contributed">{0} akro-stopa</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} akro-stopy</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} akro-stóp</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} akro-stopy</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName draft="contributed">galony</displayName>
+				<unitPattern count="one" draft="contributed">{0} galon</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} galony</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} galonów</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} galona</unitPattern>
+				<perUnitPattern draft="contributed">{0} na galon</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName draft="contributed">kwarty</displayName>
@@ -7894,6 +8119,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} kwart</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kwarty</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName draft="contributed">półkwarty</displayName>
+				<unitPattern count="one" draft="contributed">{0} półkwarta</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} półkwarty</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} półkwart</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} półkwarty</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName draft="contributed">ćwierćkwarty</displayName>
+				<unitPattern count="one" draft="contributed">{0} ćwierćkwarta</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ćwierćkwarty</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ćwierćkwart</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ćwierćkwarty</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName draft="contributed">uncje płynu</displayName>
+				<unitPattern count="one" draft="contributed">{0} uncja płynu</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} uncje płynu</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} uncji płynu</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} uncji płynu</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName draft="contributed">łyżki stołowe</displayName>
 				<unitPattern count="one" draft="contributed">{0} łyżka stołowa</unitPattern>
@@ -7908,6 +8154,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} łyżeczek</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} łyżeczki</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -7927,6 +8179,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} m/s²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName draft="contributed">obr.</displayName>
+				<unitPattern count="one" draft="contributed">{0} obr.</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} obr.</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} obr.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} obr.</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName draft="contributed">rad</displayName>
+				<unitPattern count="one" draft="contributed">{0} rad</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} rad</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} rad</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName draft="contributed">stopnie</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName draft="contributed">minuty</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
@@ -7941,26 +8214,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} s</unitPattern>
 				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName draft="contributed">stopnie</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="few">{0}°</unitPattern>
-				<unitPattern count="many">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName draft="contributed">rad</displayName>
-				<unitPattern count="one" draft="contributed">{0} rad</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} rad</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} rad</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="contributed">akry</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="few">{0} ac</unitPattern>
-				<unitPattern count="many">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName draft="contributed">km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="few">{0} km²</unitPattern>
+				<unitPattern count="many">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName draft="contributed">ha</displayName>
@@ -7969,12 +8228,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName draft="contributed">m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="few">{0} m²</unitPattern>
+				<unitPattern count="many">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern draft="contributed">{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName draft="contributed">cm²</displayName>
 				<unitPattern count="one" draft="contributed">{0} cm²</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} cm²</unitPattern>
 				<unitPattern count="many" draft="contributed">{0} cm²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} cm²</unitPattern>
+				<perUnitPattern draft="contributed">{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName draft="contributed">mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="few">{0} mi²</unitPattern>
+				<unitPattern count="many">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName draft="contributed">akry</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="few">{0} ac</unitPattern>
+				<unitPattern count="many">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName draft="contributed">yd²</displayName>
+				<unitPattern count="one" draft="contributed">{0} yd²</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} yd²</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} yd²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName draft="contributed">ft²</displayName>
@@ -7989,34 +8278,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} in²</unitPattern>
 				<unitPattern count="many" draft="contributed">{0} in²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} in²</unitPattern>
+				<perUnitPattern draft="contributed">{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="contributed">km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="few">{0} km²</unitPattern>
-				<unitPattern count="many">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName draft="contributed">m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="few">{0} m²</unitPattern>
-				<unitPattern count="many">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName draft="contributed">mi²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="few">{0} mi²</unitPattern>
-				<unitPattern count="many">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName draft="contributed">yd²</displayName>
-				<unitPattern count="one" draft="contributed">{0} yd²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} yd²</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} yd²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName draft="contributed">kt</displayName>
+				<unitPattern count="one" draft="contributed">{0} kt</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kt</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} kt</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName draft="contributed">l/km</displayName>
@@ -8025,6 +8294,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} l/km</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName draft="contributed">l/100 km</displayName>
+				<unitPattern count="one" draft="contributed">l/100 km</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} l/100 km</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} l/100 km</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} l/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName draft="contributed">mpg</displayName>
 				<unitPattern count="one" draft="contributed">{0} mpg</unitPattern>
@@ -8032,69 +8308,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} mpg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName draft="contributed">bity</displayName>
-				<unitPattern count="one" draft="contributed">{0} b</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} b</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} b</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} b</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName draft="contributed">bajty</displayName>
-				<unitPattern count="one" draft="contributed">{0} B</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} B</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} B</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} B</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName draft="contributed">Gb</displayName>
-				<unitPattern count="one" draft="contributed">{0} Gb</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} Gb</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} Gb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName draft="contributed">GB</displayName>
-				<unitPattern count="one" draft="contributed">{0} GB</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} GB</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} GB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName draft="contributed">kb</displayName>
-				<unitPattern count="one" draft="contributed">{0} kb</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kb</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} kb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName draft="contributed">kB</displayName>
-				<unitPattern count="one" draft="contributed">{0} kB</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kB</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} kB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName draft="contributed">Mb</displayName>
-				<unitPattern count="one" draft="contributed">{0} Mb</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} Mb</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} Mb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName draft="contributed">MB</displayName>
-				<unitPattern count="one" draft="contributed">{0} MB</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} MB</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} MB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName draft="contributed">Tb</displayName>
-				<unitPattern count="one" draft="contributed">{0} Tb</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} Tb</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} Tb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName draft="contributed">TB</displayName>
 				<unitPattern count="one" draft="contributed">{0} TB</unitPattern>
@@ -8102,12 +8315,107 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} TB</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName draft="contributed">Tb</displayName>
+				<unitPattern count="one" draft="contributed">{0} Tb</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Tb</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} Tb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName draft="contributed">GB</displayName>
+				<unitPattern count="one" draft="contributed">{0} GB</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} GB</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} GB</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName draft="contributed">Gb</displayName>
+				<unitPattern count="one" draft="contributed">{0} Gb</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Gb</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} Gb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName draft="contributed">MB</displayName>
+				<unitPattern count="one" draft="contributed">{0} MB</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} MB</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} MB</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName draft="contributed">Mb</displayName>
+				<unitPattern count="one" draft="contributed">{0} Mb</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Mb</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} Mb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName draft="contributed">kB</displayName>
+				<unitPattern count="one" draft="contributed">{0} kB</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kB</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} kB</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName draft="contributed">kb</displayName>
+				<unitPattern count="one" draft="contributed">{0} kb</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kb</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} kb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName draft="contributed">bajty</displayName>
+				<unitPattern count="one" draft="contributed">{0} B</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} B</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} B</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} B</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName draft="contributed">bity</displayName>
+				<unitPattern count="one" draft="contributed">{0} b</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} b</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} b</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} b</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="contributed">w.</displayName>
+				<unitPattern count="one" draft="contributed">{0} w.</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} w.</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} w.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} w.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="contributed">lata</displayName>
+				<unitPattern count="one">{0} rok</unitPattern>
+				<unitPattern count="few">{0} lata</unitPattern>
+				<unitPattern count="many">{0} lat</unitPattern>
+				<unitPattern count="other">{0} roku</unitPattern>
+				<perUnitPattern draft="contributed">{0}/rok</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">miesiące</displayName>
+				<unitPattern count="one">{0} mies.</unitPattern>
+				<unitPattern count="few">{0} mies.</unitPattern>
+				<unitPattern count="many">{0} mies.</unitPattern>
+				<unitPattern count="other">{0} mies.</unitPattern>
+				<perUnitPattern draft="contributed">{0}/mies.</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="contributed">tygodnie</displayName>
+				<unitPattern count="one">{0} tydz.</unitPattern>
+				<unitPattern count="few">{0} tyg.</unitPattern>
+				<unitPattern count="many">{0} tyg.</unitPattern>
+				<unitPattern count="other">{0} tyg.</unitPattern>
+				<perUnitPattern draft="contributed">{0}/tydz.</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="contributed">dni</displayName>
 				<unitPattern count="one">{0} dzień</unitPattern>
 				<unitPattern count="few">{0} dni</unitPattern>
 				<unitPattern count="many">{0} dni</unitPattern>
 				<unitPattern count="other">{0} dnia</unitPattern>
+				<perUnitPattern draft="contributed">{0}/dzień</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName draft="contributed">godziny</displayName>
@@ -8117,40 +8425,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} godz.</unitPattern>
 				<perUnitPattern draft="contributed">{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName draft="contributed">μs</displayName>
-				<unitPattern count="one" draft="contributed">{0} μs</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} μs</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} μs</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="contributed">milisekundy</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="few">{0} ms</unitPattern>
-				<unitPattern count="many">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="contributed">minuty</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
 				<unitPattern count="few">{0} min</unitPattern>
 				<unitPattern count="many">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">miesiące</displayName>
-				<unitPattern count="one">{0} mies.</unitPattern>
-				<unitPattern count="few">{0} mies.</unitPattern>
-				<unitPattern count="many">{0} mies.</unitPattern>
-				<unitPattern count="other">{0} mies.</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName draft="contributed">ns</displayName>
-				<unitPattern count="one" draft="contributed">{0} ns</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ns</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ns</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ns</unitPattern>
+				<perUnitPattern draft="contributed">{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName draft="contributed">sekundy</displayName>
@@ -8160,19 +8441,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} sek.</unitPattern>
 				<perUnitPattern draft="contributed">{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">tygodnie</displayName>
-				<unitPattern count="one">{0} tydz.</unitPattern>
-				<unitPattern count="few">{0} tyg.</unitPattern>
-				<unitPattern count="many">{0} tyg.</unitPattern>
-				<unitPattern count="other">{0} tyg.</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="contributed">milisekundy</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="few">{0} ms</unitPattern>
+				<unitPattern count="many">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">lata</displayName>
-				<unitPattern count="one">{0} rok</unitPattern>
-				<unitPattern count="few">{0} lata</unitPattern>
-				<unitPattern count="many">{0} lat</unitPattern>
-				<unitPattern count="other">{0} roku</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName draft="contributed">μs</displayName>
+				<unitPattern count="one" draft="contributed">{0} μs</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} μs</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} μs</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName draft="contributed">ns</displayName>
+				<unitPattern count="one" draft="contributed">{0} ns</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ns</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ns</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName draft="contributed">ampery</displayName>
@@ -8202,6 +8490,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} V</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName draft="contributed">kcal</displayName>
+				<unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kcal</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} kcal</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kal</displayName>
 				<unitPattern count="one">{0} kal</unitPattern>
@@ -8216,20 +8511,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kal</unitPattern>
 				<unitPattern count="other">{0} kal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName draft="contributed">J</displayName>
-				<unitPattern count="one" draft="contributed">{0} J</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} J</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} J</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName draft="contributed">kcal</displayName>
-				<unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kcal</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} kcal</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName draft="contributed">kJ</displayName>
 				<unitPattern count="one" draft="contributed">{0} kJ</unitPattern>
@@ -8237,6 +8518,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} kJ</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName draft="contributed">J</displayName>
+				<unitPattern count="one" draft="contributed">{0} J</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} J</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} J</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName draft="contributed">kWh</displayName>
 				<unitPattern count="one" draft="contributed">{0} kWh</unitPattern>
@@ -8251,12 +8539,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} GHz</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName draft="contributed">Hz</displayName>
-				<unitPattern count="one" draft="contributed">{0} Hz</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} Hz</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} Hz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName draft="contributed">MHz</displayName>
+				<unitPattern count="one" draft="contributed">{0} MHz</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} MHz</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} MHz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName draft="contributed">kHz</displayName>
@@ -8265,26 +8553,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} kHz</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName draft="contributed">MHz</displayName>
-				<unitPattern count="one" draft="contributed">{0} MHz</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} MHz</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} MHz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName draft="contributed">Hz</displayName>
+				<unitPattern count="one" draft="contributed">{0} Hz</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Hz</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} Hz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName draft="contributed">j.a.</displayName>
-				<unitPattern count="one" draft="contributed">{0} j.a.</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} j.a.</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} j.a.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} j.a.</unitPattern>
+			<unit type="length-kilometer">
+				<displayName draft="contributed">km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="few">{0} km</unitPattern>
+				<unitPattern count="many">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern draft="contributed">{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">centymetry</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="few">{0} cm</unitPattern>
-				<unitPattern count="many">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName draft="contributed">metry</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="few">{0} m</unitPattern>
+				<unitPattern count="many">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern draft="contributed">{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName draft="contributed">dm</displayName>
@@ -8293,54 +8583,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} dm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName draft="contributed">stopy</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="few">{0} ft</unitPattern>
-				<unitPattern count="many">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>cale</displayName>
-				<unitPattern count="one">{0}″</unitPattern>
-				<unitPattern count="few">{0}″</unitPattern>
-				<unitPattern count="many">{0}″</unitPattern>
-				<unitPattern count="other">{0}″</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName draft="contributed">km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="few">{0} km</unitPattern>
-				<unitPattern count="many">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName draft="contributed">lata świetlne</displayName>
-				<unitPattern count="one">{0} ly</unitPattern>
-				<unitPattern count="few">{0} ly</unitPattern>
-				<unitPattern count="many">{0} ly</unitPattern>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName draft="contributed">metry</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="few">{0} m</unitPattern>
-				<unitPattern count="many">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName draft="contributed">µm</displayName>
-				<unitPattern count="one" draft="contributed">{0} µm</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} µm</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} µm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName draft="contributed">mile</displayName>
-				<unitPattern count="one">{0} mila</unitPattern>
-				<unitPattern count="few">{0} mile</unitPattern>
-				<unitPattern count="many">{0} mil</unitPattern>
-				<unitPattern count="other">{0} mili</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="contributed">centymetry</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="few">{0} cm</unitPattern>
+				<unitPattern count="many">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern draft="contributed">{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="contributed">mm</displayName>
@@ -8349,6 +8598,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName draft="contributed">µm</displayName>
+				<unitPattern count="one" draft="contributed">{0} µm</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} µm</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} µm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName draft="contributed">nm</displayName>
 				<unitPattern count="one" draft="contributed">{0} nm</unitPattern>
@@ -8356,20 +8612,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} nm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName draft="contributed">Mm</displayName>
-				<unitPattern count="one" draft="contributed">{0} Mm</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} Mm</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} Mm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Mm</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName draft="contributed">pc</displayName>
-				<unitPattern count="one" draft="contributed">{0} pc</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} pc</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} pc</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName draft="contributed">pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
@@ -8377,6 +8619,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="contributed">mile</displayName>
+				<unitPattern count="one">{0} mila</unitPattern>
+				<unitPattern count="few">{0} mile</unitPattern>
+				<unitPattern count="many">{0} mil</unitPattern>
+				<unitPattern count="other">{0} mili</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName draft="contributed">yd</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
@@ -8384,6 +8633,57 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName draft="contributed">stopy</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="few">{0} ft</unitPattern>
+				<unitPattern count="many">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern draft="contributed">{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>cale</displayName>
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="few">{0}″</unitPattern>
+				<unitPattern count="many">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+				<perUnitPattern draft="contributed">{0}/cal</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName draft="contributed">pc</displayName>
+				<unitPattern count="one" draft="contributed">{0} pc</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} pc</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} pc</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="contributed">lata świetlne</displayName>
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="few">{0} ly</unitPattern>
+				<unitPattern count="many">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName draft="contributed">j.a.</displayName>
+				<unitPattern count="one" draft="contributed">{0} j.a.</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} j.a.</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} j.a.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} j.a.</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName draft="contributed">Mm</displayName>
+				<unitPattern count="one" draft="contributed">{0} Mm</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Mm</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} Mm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Mm</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="contributed">smi</displayName>
+				<unitPattern count="one" draft="contributed">{0} smi</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} smi</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} smi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName draft="contributed">lx</displayName>
 				<unitPattern count="one" draft="contributed">{0} lx</unitPattern>
@@ -8391,27 +8691,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} lx</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName draft="contributed">karaty</displayName>
-				<unitPattern count="one" draft="contributed">{0} kt</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kt</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} kt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kt</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName draft="contributed">g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="few">{0} g</unitPattern>
-				<unitPattern count="many">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName draft="contributed">kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="few">{0} kg</unitPattern>
-				<unitPattern count="many">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName draft="contributed">t</displayName>
 				<unitPattern count="one" draft="contributed">{0} t</unitPattern>
@@ -8419,12 +8698,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} t</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName draft="contributed">µg</displayName>
-				<unitPattern count="one" draft="contributed">{0} µg</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} µg</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} µg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName draft="contributed">kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="few">{0} kg</unitPattern>
+				<unitPattern count="many">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName draft="contributed">g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="many">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName draft="contributed">mg</displayName>
@@ -8433,26 +8721,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} mg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="contributed">oz</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="few">{0} oz</unitPattern>
-				<unitPattern count="many">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName draft="contributed">oz t</displayName>
-				<unitPattern count="one" draft="contributed">{0} oz t</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} oz t</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} oz t</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName draft="contributed">funty</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="few">{0} lb</unitPattern>
-				<unitPattern count="many">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
+			<unit type="mass-microgram">
+				<displayName draft="contributed">µg</displayName>
+				<unitPattern count="one" draft="contributed">{0} µg</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} µg</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} µg</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName draft="contributed">tn</displayName>
@@ -8461,6 +8735,36 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} tn</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName draft="contributed">funty</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="few">{0} lb</unitPattern>
+				<unitPattern count="many">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName draft="contributed">oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="few">{0} oz</unitPattern>
+				<unitPattern count="many">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName draft="contributed">oz t</displayName>
+				<unitPattern count="one" draft="contributed">{0} oz t</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} oz t</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} oz t</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName draft="contributed">karaty</displayName>
+				<unitPattern count="one" draft="contributed">{0} kt</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kt</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} kt</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kt</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName draft="contributed">GW</displayName>
 				<unitPattern count="one" draft="contributed">{0} GW</unitPattern>
@@ -8468,20 +8772,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} GW</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="contributed">KM</displayName>
-				<unitPattern count="one">{0} KM</unitPattern>
-				<unitPattern count="few">{0} KM</unitPattern>
-				<unitPattern count="many">{0} KM</unitPattern>
-				<unitPattern count="other">{0} KM</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName draft="contributed">kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="few">{0} kW</unitPattern>
-				<unitPattern count="many">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName draft="contributed">MW</displayName>
 				<unitPattern count="one" draft="contributed">{0} MW</unitPattern>
@@ -8489,12 +8779,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} MW</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName draft="contributed">mW</displayName>
-				<unitPattern count="one" draft="contributed">{0} mW</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mW</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} mW</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName draft="contributed">kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="few">{0} kW</unitPattern>
+				<unitPattern count="many">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName draft="contributed">waty</displayName>
@@ -8503,6 +8793,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName draft="contributed">mW</displayName>
+				<unitPattern count="one" draft="contributed">{0} mW</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mW</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} mW</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName draft="contributed">KM</displayName>
+				<unitPattern count="one">{0} KM</unitPattern>
+				<unitPattern count="few">{0} KM</unitPattern>
+				<unitPattern count="many">{0} KM</unitPattern>
+				<unitPattern count="other">{0} KM</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="contributed">hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
@@ -8510,20 +8814,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName draft="contributed">inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="few">{0} inHg</unitPattern>
-				<unitPattern count="many">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName draft="contributed">mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="few">{0} mbar</unitPattern>
-				<unitPattern count="many">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName draft="contributed">mm Hg</displayName>
 				<unitPattern count="one" draft="contributed">{0} mm Hg</unitPattern>
@@ -8538,12 +8828,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} psi</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName draft="contributed">kt</displayName>
-				<unitPattern count="one" draft="contributed">{0} kt</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kt</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} kt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName draft="contributed">inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="few">{0} inHg</unitPattern>
+				<unitPattern count="many">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName draft="contributed">mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="few">{0} mbar</unitPattern>
+				<unitPattern count="many">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName draft="contributed">km/h</displayName>
@@ -8566,6 +8863,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName draft="contributed">w.</displayName>
+				<unitPattern count="one" draft="contributed">{0} w.</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} w.</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} w.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} w.</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName draft="contributed">°</displayName>
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="few" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="many" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName draft="contributed">°C</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -8587,41 +8898,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} K</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName draft="contributed">ac ft</displayName>
-				<unitPattern count="one" draft="contributed">{0} ac ft</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ac ft</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ac ft</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName draft="contributed">cl</displayName>
-				<unitPattern count="one" draft="contributed">{0} cl</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} cl</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} cl</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName draft="contributed">cm³</displayName>
-				<unitPattern count="one" draft="contributed">{0} cm³</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} cm³</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} cm³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName draft="contributed">ft³</displayName>
-				<unitPattern count="one" draft="contributed">{0} ft³</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ft³</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ft³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName draft="contributed">in³</displayName>
-				<unitPattern count="one" draft="contributed">{0} in³</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} in³</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} in³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName draft="contributed">km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -8635,6 +8911,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} m³</unitPattern>
 				<unitPattern count="many" draft="contributed">{0} m³</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} m³</unitPattern>
+				<perUnitPattern draft="contributed">{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName draft="contributed">cm³</displayName>
+				<unitPattern count="one" draft="contributed">{0} cm³</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} cm³</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} cm³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cm³</unitPattern>
+				<perUnitPattern draft="contributed">{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName draft="contributed">mi³</displayName>
@@ -8650,33 +8935,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} yd³</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName draft="contributed">ćwierćkwarty</displayName>
-				<unitPattern count="one" draft="contributed">{0} c</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} c</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} c</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName draft="contributed">ft³</displayName>
+				<unitPattern count="one" draft="contributed">{0} ft³</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ft³</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ft³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName draft="contributed">dl</displayName>
-				<unitPattern count="one" draft="contributed">{0} dl</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} dl</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} dl</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName draft="contributed">in³</displayName>
+				<unitPattern count="one" draft="contributed">{0} in³</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} in³</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} in³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName draft="contributed">fl oz</displayName>
-				<unitPattern count="one" draft="contributed">{0} fl oz</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} fl oz</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} fl oz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName draft="contributed">gal</displayName>
-				<unitPattern count="one" draft="contributed">{0} gal</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} gal</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} gal</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName draft="contributed">Ml</displayName>
+				<unitPattern count="one" draft="contributed">{0} Ml</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Ml</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} Ml</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName draft="contributed">hl</displayName>
@@ -8691,13 +8969,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} l</unitPattern>
 				<unitPattern count="many">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern draft="contributed">{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName draft="contributed">Ml</displayName>
-				<unitPattern count="one" draft="contributed">{0} Ml</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} Ml</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} Ml</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName draft="contributed">dl</displayName>
+				<unitPattern count="one" draft="contributed">{0} dl</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} dl</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} dl</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName draft="contributed">cl</displayName>
+				<unitPattern count="one" draft="contributed">{0} cl</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} cl</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} cl</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName draft="contributed">ml</displayName>
@@ -8706,12 +8992,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} ml</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName draft="contributed">półkwarty</displayName>
-				<unitPattern count="one" draft="contributed">{0} pt</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} pt</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} pt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName draft="contributed">mpt</displayName>
+				<unitPattern count="one" draft="contributed">{0} mpt</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mpt</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} mpt</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName draft="contributed">mcup</displayName>
+				<unitPattern count="one" draft="contributed">{0} mc</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mc</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} mc</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName draft="contributed">ac ft</displayName>
+				<unitPattern count="one" draft="contributed">{0} ac ft</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ac ft</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ac ft</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName draft="contributed">gal</displayName>
+				<unitPattern count="one" draft="contributed">{0} gal</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} gal</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} gal</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} gal</unitPattern>
+				<perUnitPattern draft="contributed">{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName draft="contributed">qt</displayName>
@@ -8720,6 +9028,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} qt</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName draft="contributed">półkwarty</displayName>
+				<unitPattern count="one" draft="contributed">{0} pt</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} pt</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} pt</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName draft="contributed">ćwierćkwarty</displayName>
+				<unitPattern count="one" draft="contributed">{0} c</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} c</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} c</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName draft="contributed">fl oz</displayName>
+				<unitPattern count="one" draft="contributed">{0} fl oz</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} fl oz</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} fl oz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName draft="contributed">ł. stoł.</displayName>
 				<unitPattern count="one" draft="contributed">{0} ł. stoł.</unitPattern>
@@ -8734,6 +9063,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} łyżeczek</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} łyżeczki</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -8745,6 +9080,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} G</unitPattern>
 				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="few">{0}′</unitPattern>
@@ -8757,17 +9098,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="few">{0}°</unitPattern>
-				<unitPattern count="many">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="few">{0} ac</unitPattern>
-				<unitPattern count="many">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="few">{0} km²</unitPattern>
+				<unitPattern count="many">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} ha</unitPattern>
@@ -8775,18 +9110,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="few">{0} ft²</unitPattern>
-				<unitPattern count="many">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="few">{0} km²</unitPattern>
-				<unitPattern count="many">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} m²</unitPattern>
 				<unitPattern count="few">{0} m²</unitPattern>
@@ -8799,6 +9122,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="few">{0} ac</unitPattern>
+				<unitPattern count="many">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="few">{0} ft²</unitPattern>
+				<unitPattern count="many">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName draft="contributed">l/100 km</displayName>
+				<unitPattern count="one" draft="contributed">{0} l/100 km</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} l/100 km</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} l/100 km</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} l/100 km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="contributed">rok</displayName>
+				<unitPattern count="one">{0} r.</unitPattern>
+				<unitPattern count="few">{0} l.</unitPattern>
+				<unitPattern count="many">{0} l.</unitPattern>
+				<unitPattern count="other">{0} r.</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">miesiąc</displayName>
+				<unitPattern count="one">{0} m-c</unitPattern>
+				<unitPattern count="few">{0} m-ce</unitPattern>
+				<unitPattern count="many">{0} m-cy</unitPattern>
+				<unitPattern count="other">{0} m-ca</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="contributed">tydzień</displayName>
+				<unitPattern count="one">{0} tydz.</unitPattern>
+				<unitPattern count="few">{0} tyg.</unitPattern>
+				<unitPattern count="many">{0} tyg.</unitPattern>
+				<unitPattern count="other">{0} tyg.</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="contributed">dzień</displayName>
 				<unitPattern count="one">{0} d.</unitPattern>
@@ -8813,13 +9176,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} godz.</unitPattern>
 				<unitPattern count="other">{0} godz.</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="contributed">ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="few">{0} ms</unitPattern>
-				<unitPattern count="many">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="contributed">minuty</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
@@ -8827,13 +9183,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">miesiąc</displayName>
-				<unitPattern count="one">{0} m-c</unitPattern>
-				<unitPattern count="few">{0} m-ce</unitPattern>
-				<unitPattern count="many">{0} m-cy</unitPattern>
-				<unitPattern count="other">{0} m-ca</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="contributed">sekundy</displayName>
 				<unitPattern count="one">{0} s</unitPattern>
@@ -8841,38 +9190,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} s</unitPattern>
 				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">tydzień</displayName>
-				<unitPattern count="one">{0} tydz.</unitPattern>
-				<unitPattern count="few">{0} tyg.</unitPattern>
-				<unitPattern count="many">{0} tyg.</unitPattern>
-				<unitPattern count="other">{0} tyg.</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">rok</displayName>
-				<unitPattern count="one">{0} r.</unitPattern>
-				<unitPattern count="few">{0} l.</unitPattern>
-				<unitPattern count="many">{0} l.</unitPattern>
-				<unitPattern count="other">{0} r.</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="few">{0} cm</unitPattern>
-				<unitPattern count="many">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="few">{0} ft</unitPattern>
-				<unitPattern count="many">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0}″</unitPattern>
-				<unitPattern count="few">{0}″</unitPattern>
-				<unitPattern count="many">{0}″</unitPattern>
-				<unitPattern count="other">{0}″</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="contributed">ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="few">{0} ms</unitPattern>
+				<unitPattern count="many">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="contributed">km</displayName>
@@ -8881,12 +9204,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} km</unitPattern>
 				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} ly</unitPattern>
-				<unitPattern count="few">{0} ly</unitPattern>
-				<unitPattern count="many">{0} ly</unitPattern>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName draft="contributed">metr</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
@@ -8894,11 +9211,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="few">{0} mi</unitPattern>
-				<unitPattern count="many">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="contributed">cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="few">{0} cm</unitPattern>
+				<unitPattern count="many">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="contributed">mm</displayName>
@@ -8913,18 +9231,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="few">{0} mi</unitPattern>
+				<unitPattern count="many">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="few">{0} yd</unitPattern>
 				<unitPattern count="many">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="contributed">gram</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="few">{0} g</unitPattern>
-				<unitPattern count="many">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="few">{0} ft</unitPattern>
+				<unitPattern count="many">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="few">{0}″</unitPattern>
+				<unitPattern count="many">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="few">{0} ly</unitPattern>
+				<unitPattern count="many">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="contributed">kg</displayName>
@@ -8933,11 +9268,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="few">{0} oz</unitPattern>
-				<unitPattern count="many">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
+			<unit type="mass-gram">
+				<displayName draft="contributed">gram</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="many">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} lb</unitPattern>
@@ -8945,11 +9281,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} lb</unitPattern>
 				<unitPattern count="other">{0} lb</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} KM</unitPattern>
-				<unitPattern count="few">{0} KM</unitPattern>
-				<unitPattern count="many">{0} KM</unitPattern>
-				<unitPattern count="other">{0} KM</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="few">{0} oz</unitPattern>
+				<unitPattern count="many">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} kW</unitPattern>
@@ -8963,6 +9299,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} KM</unitPattern>
+				<unitPattern count="few">{0} KM</unitPattern>
+				<unitPattern count="many">{0} KM</unitPattern>
+				<unitPattern count="other">{0} KM</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="few">{0} hPa</unitPattern>
@@ -9032,6 +9374,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
@@ -9057,8 +9405,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<listPatternPart type="2">{0} i {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-narrow">
-			<listPatternPart type="start" draft="contributed">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle" draft="contributed">{0}, {1}</listPatternPart>
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
 			<listPatternPart type="end" draft="contributed">{0} i {1}</listPatternPart>
 			<listPatternPart type="2" draft="contributed">{0} i {1}</listPatternPart>
 		</listPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pl_PL.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pl_PL.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pl_PL.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pl_PL.xml
index 3e869e90644..fcb4154128d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pl_PL.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pl_PL.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="pl"/>
 		<territory type="PL"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/prg.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/prg.xml
new file mode 100644
index 00000000000..aed383f8cdc
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/prg.xml
@@ -0,0 +1,958 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2014 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12313 $"/>
+		<language type="prg"/>
+	</identity>
+	<localeDisplayNames>
+		<localeDisplayPattern>
+			<localePattern draft="unconfirmed">{0} ({1})</localePattern>
+			<localeSeparator draft="unconfirmed">{0}, {1}</localeSeparator>
+			<localeKeyTypePattern draft="unconfirmed">{0}: {1}</localeKeyTypePattern>
+		</localeDisplayPattern>
+		<languages>
+			<language type="ar" draft="unconfirmed">arābiskan</language>
+			<language type="da" draft="unconfirmed">dāniskan</language>
+			<language type="de" draft="unconfirmed">miksiskan</language>
+			<language type="de_AT" draft="unconfirmed">Āustrarīkis miksiskan</language>
+			<language type="de_CH" draft="unconfirmed">Šwēicis aūktamiksiskan</language>
+			<language type="el" draft="unconfirmed">grēkiskan</language>
+			<language type="en" draft="unconfirmed">ēngliskan</language>
+			<language type="en_AU" draft="unconfirmed">Austrālijas ēngliskan</language>
+			<language type="en_CA" draft="unconfirmed">Kanādas ēngliskan</language>
+			<language type="en_GB" draft="unconfirmed">brītiskan ēngliskan</language>
+			<language type="en_GB" alt="short" draft="unconfirmed">brītiskan ēngliskan</language>
+			<language type="en_US" draft="unconfirmed">amērikaniskan ēngliskan</language>
+			<language type="en_US" alt="short" draft="unconfirmed">APW ēngliskan</language>
+			<language type="es" draft="unconfirmed">špāniskan</language>
+			<language type="es_419" draft="unconfirmed">Lātiniskas Amērikas špāniskan</language>
+			<language type="es_ES" draft="unconfirmed">eurōpiskan špāniskan</language>
+			<language type="es_MX" draft="unconfirmed">Meksikus špāniskan</language>
+			<language type="et" draft="unconfirmed">èstiskan</language>
+			<language type="fi" draft="unconfirmed">sōmiskan</language>
+			<language type="fr" draft="unconfirmed">prancōziskan</language>
+			<language type="fr_CA" draft="unconfirmed">Kanādas prancōziskan</language>
+			<language type="fr_CH" draft="unconfirmed">Šwēicis prancōziskan</language>
+			<language type="it" draft="unconfirmed">wālkiskan</language>
+			<language type="ja" draft="unconfirmed">japāniskan</language>
+			<language type="lt" draft="unconfirmed">laītawiskan</language>
+			<language type="lv" draft="unconfirmed">lattawiskan</language>
+			<language type="nl" draft="unconfirmed">ullandiskan</language>
+			<language type="pl" draft="unconfirmed">pōliskan</language>
+			<language type="prg">prūsiskan</language>
+			<language type="pt" draft="unconfirmed">pōrtugaliskan</language>
+			<language type="pt_BR" draft="unconfirmed">Brazīlijas pōrtugaliskan</language>
+			<language type="pt_PT" draft="unconfirmed">eurōpiskan pōrtugaliskan</language>
+			<language type="ru" draft="unconfirmed">maskōwitiskan</language>
+			<language type="sv" draft="unconfirmed">šwēdiskan</language>
+			<language type="tr" draft="unconfirmed">turkiskan</language>
+			<language type="und" draft="unconfirmed">niwaistā bilā</language>
+			<language type="zh" draft="unconfirmed">kīniskan</language>
+			<language type="zh_Hans" draft="unconfirmed">prastintan kīniskan</language>
+			<language type="zh_Hant" draft="unconfirmed">tradiciōnalin kīniskan</language>
+		</languages>
+		<scripts>
+			<script type="Arab" draft="unconfirmed">arābiskan</script>
+			<script type="Cyrl" draft="unconfirmed">cīriliskan</script>
+			<script type="Hans" draft="unconfirmed">prastintan</script>
+			<script type="Hans" alt="stand-alone" draft="unconfirmed">prastintan han</script>
+			<script type="Hant" draft="unconfirmed">tradiciōnalin</script>
+			<script type="Hant" alt="stand-alone" draft="unconfirmed">tradiciōnalin han</script>
+			<script type="Jpan" draft="unconfirmed">japāniskas</script>
+			<script type="Latn" draft="unconfirmed">lātiniskan</script>
+			<script type="Zxxx" draft="unconfirmed">nienpeisātan</script>
+			<script type="Zzzz" draft="unconfirmed">niwaīstan skriptan</script>
+		</scripts>
+		<territories>
+			<territory type="001" draft="unconfirmed">swītai</territory>
+			<territory type="002" draft="unconfirmed">Afrika</territory>
+			<territory type="003" draft="unconfirmed">Zēimanamērika</territory>
+			<territory type="005" draft="unconfirmed">Pussideinanamērika</territory>
+			<territory type="019" draft="unconfirmed">Amērika</territory>
+			<territory type="142" draft="unconfirmed">Āzija</territory>
+			<territory type="150" draft="unconfirmed">Eurōpa</territory>
+			<territory type="AD" draft="unconfirmed">Andōra</territory>
+			<territory type="AG" draft="unconfirmed">Antīgwa be Barbūda</territory>
+			<territory type="AL" draft="unconfirmed">Albānija</territory>
+			<territory type="AR" draft="unconfirmed">Argentīnija</territory>
+			<territory type="AT" draft="unconfirmed">Āustrarīki</territory>
+			<territory type="AU" draft="unconfirmed">Austrālija</territory>
+			<territory type="BA" draft="unconfirmed">Bōsnija be Ercegōwina</territory>
+			<territory type="BB" draft="unconfirmed">Barbādas</territory>
+			<territory type="BE" draft="unconfirmed">Belgija</territory>
+			<territory type="BG" draft="unconfirmed">Bulgārija</territory>
+			<territory type="BO" draft="unconfirmed">Bōliwija</territory>
+			<territory type="BR" draft="unconfirmed">Brazīlija</territory>
+			<territory type="BS" draft="unconfirmed">Bahāmai</territory>
+			<territory type="BY" draft="unconfirmed">Krēiwa</territory>
+			<territory type="BZ" draft="unconfirmed">Belīzi</territory>
+			<territory type="CA" draft="unconfirmed">Kānada</territory>
+			<territory type="CH" draft="unconfirmed">Šwēici</territory>
+			<territory type="CL" draft="unconfirmed">Čīli</territory>
+			<territory type="CN" draft="unconfirmed">Kīna</territory>
+			<territory type="CO" draft="unconfirmed">Kōlumbija</territory>
+			<territory type="CR" draft="unconfirmed">Costa Rica</territory>
+			<territory type="CU" draft="unconfirmed">Kūba</territory>
+			<territory type="CZ" draft="unconfirmed">Čekkija</territory>
+			<territory type="DE" draft="unconfirmed">Mikskātauta</territory>
+			<territory type="DK" draft="unconfirmed">Dānanmarki</territory>
+			<territory type="DM" draft="unconfirmed">Dōminika</territory>
+			<territory type="DO" draft="unconfirmed">Dōminikas Republīki</territory>
+			<territory type="EC" draft="unconfirmed">Ekwadōrs</territory>
+			<territory type="EE" draft="unconfirmed">Estantauta</territory>
+			<territory type="ES" draft="unconfirmed">Špānija</territory>
+			<territory type="FI" draft="unconfirmed">Sōmija</territory>
+			<territory type="FO" draft="unconfirmed">Farēirai</territory>
+			<territory type="FR" draft="unconfirmed">Prankrīki</territory>
+			<territory type="GB" draft="unconfirmed">Debabritānija</territory>
+			<territory type="GB" alt="short" draft="unconfirmed">DB</territory>
+			<territory type="GD" draft="unconfirmed">Grenāda</territory>
+			<territory type="GF" draft="unconfirmed">Prancōziska Gujāna</territory>
+			<territory type="GI" draft="unconfirmed">Gibrāltars</territory>
+			<territory type="GL" draft="unconfirmed">Grēnlandan</territory>
+			<territory type="GR" draft="unconfirmed">Grēkantauta</territory>
+			<territory type="GT" draft="unconfirmed">Gwatemāla</territory>
+			<territory type="GY" draft="unconfirmed">Gujāna</territory>
+			<territory type="HN" draft="unconfirmed">Hōnduras</territory>
+			<territory type="HR" draft="unconfirmed">Kruātija</territory>
+			<territory type="HT" draft="unconfirmed">Haīti</territory>
+			<territory type="HU" draft="unconfirmed">Ungrai</territory>
+			<territory type="ID" draft="unconfirmed">Indōnezija</territory>
+			<territory type="IN" draft="unconfirmed">Īndija</territory>
+			<territory type="IS" draft="unconfirmed">Īslandan</territory>
+			<territory type="IT" draft="unconfirmed">Wālkija</territory>
+			<territory type="JM" draft="unconfirmed">Jamāika</territory>
+			<territory type="JP" draft="unconfirmed">Japānija</territory>
+			<territory type="KR" draft="unconfirmed">Pussideinankōreja</territory>
+			<territory type="LI" draft="unconfirmed">Līchtenšteinan</territory>
+			<territory type="LT" draft="unconfirmed">Laītawa</territory>
+			<territory type="LU" draft="unconfirmed">Luksemburgan</territory>
+			<territory type="LV" draft="unconfirmed">Lattawa</territory>
+			<territory type="MC" draft="unconfirmed">Mōnakō</territory>
+			<territory type="MD" draft="unconfirmed">Mōldawija</territory>
+			<territory type="ME" draft="unconfirmed">Mōntenegran</territory>
+			<territory type="MK" draft="unconfirmed">Macedōnija</territory>
+			<territory type="MT" draft="unconfirmed">Mālta</territory>
+			<territory type="MX" draft="unconfirmed">Meksiku</territory>
+			<territory type="NI" draft="unconfirmed">Nikarāgwa</territory>
+			<territory type="NO" draft="unconfirmed">Nōrwigai</territory>
+			<territory type="NZ" draft="unconfirmed">Nawazēlandan</territory>
+			<territory type="PA" draft="unconfirmed">Panāma</territory>
+			<territory type="PE" draft="unconfirmed">Perū</territory>
+			<territory type="PL" draft="unconfirmed">Pōli</territory>
+			<territory type="PT" draft="unconfirmed">Pōrtugalin</territory>
+			<territory type="PW" draft="unconfirmed">Palau</territory>
+			<territory type="PY" draft="unconfirmed">Paragwājs</territory>
+			<territory type="RO" draft="unconfirmed">Rumānija</territory>
+			<territory type="RS" draft="unconfirmed">Serbija</territory>
+			<territory type="RU" draft="unconfirmed">Russi</territory>
+			<territory type="SA" draft="unconfirmed">Saūdi Arābija</territory>
+			<territory type="SE" draft="unconfirmed">Šwēdija</territory>
+			<territory type="SI" draft="unconfirmed">Slōwenija</territory>
+			<territory type="SK" draft="unconfirmed">Slōwakei</territory>
+			<territory type="SM" draft="unconfirmed">San Marinō</territory>
+			<territory type="SR" draft="unconfirmed">Surināms</territory>
+			<territory type="SV" draft="unconfirmed">El Salvadōrs</territory>
+			<territory type="TH" draft="unconfirmed">Tāilandan</territory>
+			<territory type="TR" draft="unconfirmed">Turkāja</territory>
+			<territory type="TT" draft="unconfirmed">Trinidāds be Tobagō</territory>
+			<territory type="TW" draft="unconfirmed">Taiwāns</territory>
+			<territory type="UA" draft="unconfirmed">Ukrāini</territory>
+			<territory type="US" draft="unconfirmed">Peraīnintas Wālstis</territory>
+			<territory type="US" alt="short" draft="unconfirmed">PW</territory>
+			<territory type="UY" draft="unconfirmed">Urugwājs</territory>
+			<territory type="VE" draft="unconfirmed">Venezuēla</territory>
+			<territory type="XK" draft="unconfirmed">Kōsawa</territory>
+			<territory type="ZA" draft="unconfirmed">Pussideinanafrika</territory>
+			<territory type="ZZ" draft="unconfirmed">niwaistā regiōni</territory>
+		</territories>
+		<types>
+			<type key="calendar" type="gregorian" draft="unconfirmed">Gregōriskas kalāndars</type>
+			<type key="collation" type="standard" draft="unconfirmed">sēisnas rikā</type>
+			<type key="numbers" type="latn" draft="unconfirmed">lātiniskas cipperis</type>
+		</types>
+		<measurementSystemNames>
+			<measurementSystemName type="metric" draft="unconfirmed">mētriskan</measurementSystemName>
+			<measurementSystemName type="UK" draft="unconfirmed">brītiskan</measurementSystemName>
+			<measurementSystemName type="US" draft="unconfirmed">amērikaniskan</measurementSystemName>
+		</measurementSystemNames>
+		<codePatterns>
+			<codePattern type="language" draft="unconfirmed">Bilā: {0}</codePattern>
+			<codePattern type="script" draft="unconfirmed">Skriptan: {0}</codePattern>
+			<codePattern type="territory" draft="unconfirmed">Regiōni: {0}</codePattern>
+		</codePatterns>
+	</localeDisplayNames>
+	<characters>
+		<exemplarCharacters>[a ā b c d ḑ e ē f g ģ h i ī j k ķ l m n ņ o ō p q r ŗ s š t ț u ū v w x y z ž]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[]</exemplarCharacters>
+		<exemplarCharacters type="index">[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 Ž]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐ – — , ; \: ! ? . … “ „ ( ) \[ \] \{ \}]</exemplarCharacters>
+	</characters>
+	<delimiters>
+		<quotationStart draft="unconfirmed">„</quotationStart>
+		<quotationEnd draft="unconfirmed">“</quotationEnd>
+		<alternateQuotationStart draft="unconfirmed">„</alternateQuotationStart>
+		<alternateQuotationEnd draft="unconfirmed">“</alternateQuotationEnd>
+	</delimiters>
+	<dates>
+		<calendars>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern draft="unconfirmed">EEEE, y 'mettas' d. MMMM G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern draft="unconfirmed">y 'mettas' d. MMMM G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern draft="unconfirmed">dd.MM 'st'. y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern draft="unconfirmed">dd.MM.y GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<intervalFormats>
+						<intervalFormatFallback draft="unconfirmed">{0} – {1}</intervalFormatFallback>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="unconfirmed">rag</month>
+							<month type="2" draft="unconfirmed">was</month>
+							<month type="3" draft="unconfirmed">pūl</month>
+							<month type="4" draft="unconfirmed">sak</month>
+							<month type="5" draft="unconfirmed">zal</month>
+							<month type="6" draft="unconfirmed">sīm</month>
+							<month type="7" draft="unconfirmed">līp</month>
+							<month type="8" draft="unconfirmed">dag</month>
+							<month type="9" draft="unconfirmed">sil</month>
+							<month type="10" draft="unconfirmed">spa</month>
+							<month type="11" draft="unconfirmed">lap</month>
+							<month type="12" draft="unconfirmed">sal</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="unconfirmed">R</month>
+							<month type="2" draft="unconfirmed">W</month>
+							<month type="3" draft="unconfirmed">P</month>
+							<month type="4" draft="unconfirmed">S</month>
+							<month type="5" draft="unconfirmed">Z</month>
+							<month type="6" draft="unconfirmed">S</month>
+							<month type="7" draft="unconfirmed">L</month>
+							<month type="8" draft="unconfirmed">D</month>
+							<month type="9" draft="unconfirmed">S</month>
+							<month type="10" draft="unconfirmed">S</month>
+							<month type="11" draft="unconfirmed">L</month>
+							<month type="12" draft="unconfirmed">S</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">rags</month>
+							<month type="2" draft="unconfirmed">wassarins</month>
+							<month type="3" draft="unconfirmed">pūlis</month>
+							<month type="4" draft="unconfirmed">sakkis</month>
+							<month type="5" draft="unconfirmed">zallaws</month>
+							<month type="6" draft="unconfirmed">sīmenis</month>
+							<month type="7" draft="unconfirmed">līpa</month>
+							<month type="8" draft="unconfirmed">daggis</month>
+							<month type="9" draft="unconfirmed">sillins</month>
+							<month type="10" draft="unconfirmed">spallins</month>
+							<month type="11" draft="unconfirmed">lapkrūtis</month>
+							<month type="12" draft="unconfirmed">sallaws</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="unconfirmed">rag</month>
+							<month type="2" draft="unconfirmed">was</month>
+							<month type="3" draft="unconfirmed">pūl</month>
+							<month type="4" draft="unconfirmed">sak</month>
+							<month type="5" draft="unconfirmed">zal</month>
+							<month type="6" draft="unconfirmed">sīm</month>
+							<month type="7" draft="unconfirmed">līp</month>
+							<month type="8" draft="unconfirmed">dag</month>
+							<month type="9" draft="unconfirmed">sil</month>
+							<month type="10" draft="unconfirmed">spa</month>
+							<month type="11" draft="unconfirmed">lap</month>
+							<month type="12" draft="unconfirmed">sal</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="unconfirmed">R</month>
+							<month type="2" draft="unconfirmed">W</month>
+							<month type="3" draft="unconfirmed">P</month>
+							<month type="4" draft="unconfirmed">S</month>
+							<month type="5" draft="unconfirmed">Z</month>
+							<month type="6" draft="unconfirmed">S</month>
+							<month type="7" draft="unconfirmed">L</month>
+							<month type="8" draft="unconfirmed">D</month>
+							<month type="9" draft="unconfirmed">S</month>
+							<month type="10" draft="unconfirmed">S</month>
+							<month type="11" draft="unconfirmed">L</month>
+							<month type="12" draft="unconfirmed">S</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">rags</month>
+							<month type="2" draft="unconfirmed">wassarins</month>
+							<month type="3" draft="unconfirmed">pūlis</month>
+							<month type="4" draft="unconfirmed">sakkis</month>
+							<month type="5" draft="unconfirmed">zallaws</month>
+							<month type="6" draft="unconfirmed">sīmenis</month>
+							<month type="7" draft="unconfirmed">līpa</month>
+							<month type="8" draft="unconfirmed">daggis</month>
+							<month type="9" draft="unconfirmed">sillins</month>
+							<month type="10" draft="unconfirmed">spallins</month>
+							<month type="11" draft="unconfirmed">lapkrūtis</month>
+							<month type="12" draft="unconfirmed">sallaws</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="abbreviated">
+							<day type="sun" draft="unconfirmed">nad</day>
+							<day type="mon" draft="unconfirmed">pan</day>
+							<day type="tue" draft="unconfirmed">wis</day>
+							<day type="wed" draft="unconfirmed">pus</day>
+							<day type="thu" draft="unconfirmed">ket</day>
+							<day type="fri" draft="unconfirmed">pēn</day>
+							<day type="sat" draft="unconfirmed">sab</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun" draft="unconfirmed">N</day>
+							<day type="mon" draft="unconfirmed">P</day>
+							<day type="tue" draft="unconfirmed">W</day>
+							<day type="wed" draft="unconfirmed">P</day>
+							<day type="thu" draft="unconfirmed">K</day>
+							<day type="fri" draft="unconfirmed">P</day>
+							<day type="sat" draft="unconfirmed">S</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun" draft="unconfirmed">nadīli</day>
+							<day type="mon" draft="unconfirmed">panadīli</day>
+							<day type="tue" draft="unconfirmed">wisasīdis</day>
+							<day type="wed" draft="unconfirmed">pussisawaiti</day>
+							<day type="thu" draft="unconfirmed">ketwirtiks</day>
+							<day type="fri" draft="unconfirmed">pēntniks</day>
+							<day type="sat" draft="unconfirmed">sabattika</day>
+						</dayWidth>
+					</dayContext>
+					<dayContext type="stand-alone">
+						<dayWidth type="abbreviated">
+							<day type="sun" draft="unconfirmed">nad</day>
+							<day type="mon" draft="unconfirmed">pan</day>
+							<day type="tue" draft="unconfirmed">wis</day>
+							<day type="wed" draft="unconfirmed">pus</day>
+							<day type="thu" draft="unconfirmed">ket</day>
+							<day type="fri" draft="unconfirmed">pēn</day>
+							<day type="sat" draft="unconfirmed">sab</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun" draft="unconfirmed">N</day>
+							<day type="mon" draft="unconfirmed">P</day>
+							<day type="tue" draft="unconfirmed">W</day>
+							<day type="wed" draft="unconfirmed">P</day>
+							<day type="thu" draft="unconfirmed">K</day>
+							<day type="fri" draft="unconfirmed">P</day>
+							<day type="sat" draft="unconfirmed">S</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun" draft="unconfirmed">nadīli</day>
+							<day type="mon" draft="unconfirmed">panadīli</day>
+							<day type="tue" draft="unconfirmed">wisasīdis</day>
+							<day type="wed" draft="unconfirmed">pussisawaiti</day>
+							<day type="thu" draft="unconfirmed">ketwirtiks</day>
+							<day type="fri" draft="unconfirmed">pēntniks</day>
+							<day type="sat" draft="unconfirmed">sabattika</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<quarters>
+					<quarterContext type="format">
+						<quarterWidth type="abbreviated">
+							<quarter type="1" draft="unconfirmed">1. k.</quarter>
+							<quarter type="2" draft="unconfirmed">2. k.</quarter>
+							<quarter type="3" draft="unconfirmed">3. k.</quarter>
+							<quarter type="4" draft="unconfirmed">4. k.</quarter>
+						</quarterWidth>
+						<quarterWidth type="narrow">
+							<quarter type="1" draft="unconfirmed">1</quarter>
+							<quarter type="2" draft="unconfirmed">2</quarter>
+							<quarter type="3" draft="unconfirmed">3</quarter>
+							<quarter type="4" draft="unconfirmed">4</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1" draft="unconfirmed">1. ketwirts</quarter>
+							<quarter type="2" draft="unconfirmed">2. ketwirts</quarter>
+							<quarter type="3" draft="unconfirmed">3. ketwirts</quarter>
+							<quarter type="4" draft="unconfirmed">4. ketwirts</quarter>
+						</quarterWidth>
+					</quarterContext>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="abbreviated">
+							<quarter type="1" draft="unconfirmed">1. ketw.</quarter>
+							<quarter type="2" draft="unconfirmed">2. ketw.</quarter>
+							<quarter type="3" draft="unconfirmed">3. ketw.</quarter>
+							<quarter type="4" draft="unconfirmed">4. ketw.</quarter>
+						</quarterWidth>
+						<quarterWidth type="narrow">
+							<quarter type="1" draft="unconfirmed">1</quarter>
+							<quarter type="2" draft="unconfirmed">2</quarter>
+							<quarter type="3" draft="unconfirmed">3</quarter>
+							<quarter type="4" draft="unconfirmed">4</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1" draft="unconfirmed">1. ketwirts</quarter>
+							<quarter type="2" draft="unconfirmed">2. ketwirts</quarter>
+							<quarter type="3" draft="unconfirmed">3. ketwirts</quarter>
+							<quarter type="4" draft="unconfirmed">4. ketwirts</quarter>
+						</quarterWidth>
+					</quarterContext>
+				</quarters>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am" draft="unconfirmed">AM</dayPeriod>
+							<dayPeriod type="pm" draft="unconfirmed">PM</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am" draft="unconfirmed">ankstāinan</dayPeriod>
+							<dayPeriod type="pm" draft="unconfirmed">pa pussideinan</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<eras>
+					<eraAbbr>
+						<era type="0" draft="unconfirmed">BC</era>
+						<era type="1" draft="unconfirmed">AD</era>
+					</eraAbbr>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern draft="unconfirmed">EEEE, y 'mettas' d. MMMM</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern draft="unconfirmed">y 'mettas' d. MMMM</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern draft="unconfirmed">dd.MM 'st'. y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern draft="unconfirmed">dd.MM.yy</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern draft="unconfirmed">HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern draft="unconfirmed">HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern draft="unconfirmed">HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern draft="unconfirmed">HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="d" draft="unconfirmed">d.</dateFormatItem>
+						<dateFormatItem id="E" draft="unconfirmed">ccc</dateFormatItem>
+						<dateFormatItem id="Ed" draft="unconfirmed">E, d.</dateFormatItem>
+						<dateFormatItem id="Ehm" draft="unconfirmed">E, h:mm a</dateFormatItem>
+						<dateFormatItem id="EHm" draft="unconfirmed">E, HH:mm</dateFormatItem>
+						<dateFormatItem id="Ehms" draft="unconfirmed">E, h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="EHms" draft="unconfirmed">E, HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="Gy" draft="unconfirmed">y 'm'. G</dateFormatItem>
+						<dateFormatItem id="GyMMM" draft="unconfirmed">y 'm'. MMM G</dateFormatItem>
+						<dateFormatItem id="GyMMMd" draft="unconfirmed">dd.MM 'st'. y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd" draft="unconfirmed">E, dd.MM 'st'. y G</dateFormatItem>
+						<dateFormatItem id="h" draft="unconfirmed">h a</dateFormatItem>
+						<dateFormatItem id="H" draft="unconfirmed">HH</dateFormatItem>
+						<dateFormatItem id="hm" draft="unconfirmed">h:mm a</dateFormatItem>
+						<dateFormatItem id="Hm" draft="unconfirmed">HH:mm</dateFormatItem>
+						<dateFormatItem id="hms" draft="unconfirmed">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hms" draft="unconfirmed">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv" draft="unconfirmed">h:mm:ss a; v</dateFormatItem>
+						<dateFormatItem id="Hmsv" draft="unconfirmed">HH:mm:ss; v</dateFormatItem>
+						<dateFormatItem id="hmv" draft="unconfirmed">h:mm a; v</dateFormatItem>
+						<dateFormatItem id="Hmv" draft="unconfirmed">HH:mm; v</dateFormatItem>
+						<dateFormatItem id="M" draft="unconfirmed">L.</dateFormatItem>
+						<dateFormatItem id="Md" draft="unconfirmed">d.M</dateFormatItem>
+						<dateFormatItem id="MEd" draft="unconfirmed">E, d.M</dateFormatItem>
+						<dateFormatItem id="MMM" draft="unconfirmed">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd" draft="unconfirmed">d. MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd" draft="unconfirmed">E, d. MMM</dateFormatItem>
+						<dateFormatItem id="ms" draft="unconfirmed">mm:ss</dateFormatItem>
+						<dateFormatItem id="y" draft="unconfirmed">y 'm'.</dateFormatItem>
+						<dateFormatItem id="yM" draft="unconfirmed">M.y</dateFormatItem>
+						<dateFormatItem id="yMd" draft="unconfirmed">d.M.y</dateFormatItem>
+						<dateFormatItem id="yMEd" draft="unconfirmed">E, d.M.y</dateFormatItem>
+						<dateFormatItem id="yMMM" draft="unconfirmed">y 'm'. MMM</dateFormatItem>
+						<dateFormatItem id="yMMMd" draft="unconfirmed">dd.MM 'st'. y</dateFormatItem>
+						<dateFormatItem id="yMMMEd" draft="unconfirmed">E, dd.MM 'st'. y</dateFormatItem>
+						<dateFormatItem id="yQQQ" draft="unconfirmed">y 'm'. QQQ</dateFormatItem>
+						<dateFormatItem id="yQQQQ" draft="unconfirmed">y 'm'. QQQQ</dateFormatItem>
+					</availableFormats>
+					<appendItems>
+						<appendItem request="Timezone" draft="unconfirmed">{0} {1}</appendItem>
+					</appendItems>
+					<intervalFormats>
+						<intervalFormatFallback draft="unconfirmed">{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d" draft="unconfirmed">d.–d.</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a" draft="unconfirmed">h a – h a</greatestDifference>
+							<greatestDifference id="h" draft="unconfirmed">h–h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H" draft="unconfirmed">HH–HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a" draft="unconfirmed">h a – h a v</greatestDifference>
+							<greatestDifference id="h" draft="unconfirmed">h–h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H" draft="unconfirmed">HH–HH v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M" draft="unconfirmed">M.–M.</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d" draft="unconfirmed">dd.MM–dd.MM</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">dd.MM–dd.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d" draft="unconfirmed">E, dd.MM – E, dd.MM</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E, dd.MM – E, dd.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M" draft="unconfirmed">MMM–MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d" draft="unconfirmed">d.–d. MMM</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">d. MMM – d. MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d" draft="unconfirmed">E, d. – E, d. MMM</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E, d. MMM – E, d. MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y" draft="unconfirmed">y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M" draft="unconfirmed">MM.y–MM.y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">MM.y–MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d" draft="unconfirmed">dd.MM.y–dd.MM.y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">dd.MM.y–dd.MM.y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">dd.MM.y–dd.MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d" draft="unconfirmed">E, dd.MM.y – E, dd.MM.y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E, dd.MM.y – E, dd.MM.y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">E, dd.MM.y – E, dd.MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M" draft="unconfirmed">y 'm'. MMM–MMM</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">y 'm'. MMM – y 'm'. MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d" draft="unconfirmed">dd.–dd.MM 'st'. y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">dd.MM–dd.MM 'st'. y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">dd.MM 'st'. y – dd.MM 'st'. y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d" draft="unconfirmed">E, dd. – E, dd.MM 'st'. y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E, dd.MM – E, dd.MM 'st'. y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">E, dd.MM 'st'. y – E, dd.MM 'st'. y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M" draft="unconfirmed">y 'mettas' MMMM–MMMM</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">y 'mettas' MMMM – y 'mettas' MMMM</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="era">
+				<displayName draft="unconfirmed">ēra</displayName>
+			</field>
+			<field type="year">
+				<displayName draft="unconfirmed">mettan</displayName>
+				<relative type="-1" draft="unconfirmed">panzdauman mettan</relative>
+				<relative type="0" draft="unconfirmed">this year</relative>
+				<relative type="1" draft="unconfirmed">next year</relative>
+			</field>
+			<field type="year-short">
+				<displayName draft="unconfirmed">m.</displayName>
+			</field>
+			<field type="year-narrow">
+				<displayName draft="unconfirmed">m.</displayName>
+			</field>
+			<field type="quarter">
+				<displayName draft="unconfirmed">ketwirts</displayName>
+			</field>
+			<field type="quarter-short">
+				<displayName draft="unconfirmed">ketw.</displayName>
+			</field>
+			<field type="quarter-narrow">
+				<displayName draft="unconfirmed">ketw.</displayName>
+			</field>
+			<field type="month">
+				<displayName draft="unconfirmed">mīnss</displayName>
+			</field>
+			<field type="month-short">
+				<displayName draft="unconfirmed">mī.</displayName>
+			</field>
+			<field type="month-narrow">
+				<displayName draft="unconfirmed">mī.</displayName>
+			</field>
+			<field type="week">
+				<displayName draft="unconfirmed">sawaīti</displayName>
+			</field>
+			<field type="week-short">
+				<displayName draft="unconfirmed">saw.</displayName>
+			</field>
+			<field type="week-narrow">
+				<displayName draft="unconfirmed">saw.</displayName>
+			</field>
+			<field type="day">
+				<displayName draft="unconfirmed">deinā</displayName>
+				<relative type="-1" draft="unconfirmed">bītan</relative>
+				<relative type="0" draft="unconfirmed">šandēinan</relative>
+				<relative type="1" draft="unconfirmed">ankstāinan</relative>
+			</field>
+			<field type="day-short">
+				<displayName draft="unconfirmed">d.</displayName>
+			</field>
+			<field type="day-narrow">
+				<displayName draft="unconfirmed">d.</displayName>
+			</field>
+			<field type="weekday">
+				<displayName draft="unconfirmed">sawaītis deinā</displayName>
+			</field>
+			<field type="dayperiod">
+				<displayName draft="unconfirmed">ankstāinan / pa pussideinan</displayName>
+			</field>
+			<field type="hour">
+				<displayName draft="unconfirmed">stūndi</displayName>
+			</field>
+			<field type="hour-short">
+				<displayName draft="unconfirmed">st.</displayName>
+			</field>
+			<field type="hour-narrow">
+				<displayName draft="unconfirmed">st.</displayName>
+			</field>
+			<field type="minute">
+				<displayName draft="unconfirmed">minūti</displayName>
+			</field>
+			<field type="minute-short">
+				<displayName draft="unconfirmed">min.</displayName>
+			</field>
+			<field type="minute-narrow">
+				<displayName draft="unconfirmed">min.</displayName>
+			</field>
+			<field type="second">
+				<displayName draft="unconfirmed">sekūndi</displayName>
+			</field>
+			<field type="second-short">
+				<displayName draft="unconfirmed">sek.</displayName>
+			</field>
+			<field type="second-narrow">
+				<displayName draft="unconfirmed">sek.</displayName>
+			</field>
+			<field type="zone">
+				<displayName draft="unconfirmed">kerdaszōni</displayName>
+			</field>
+		</fields>
+		<timeZoneNames>
+			<hourFormat draft="unconfirmed">+HH:mm;-HH:mm</hourFormat>
+			<gmtFormat draft="unconfirmed">GMT{0}</gmtFormat>
+			<gmtZeroFormat draft="unconfirmed">GMT</gmtZeroFormat>
+			<regionFormat draft="unconfirmed">Kerdā: {0}</regionFormat>
+			<regionFormat type="daylight" draft="unconfirmed">Daggas kerdā: {0}</regionFormat>
+			<regionFormat type="standard" draft="unconfirmed">Zēimas kerdā: {0}</regionFormat>
+			<fallbackFormat draft="unconfirmed">{1} ({0})</fallbackFormat>
+			<metazone type="America_Central">
+				<long>
+					<generic draft="unconfirmed">Centrālas Amērikas kerdā</generic>
+					<standard draft="unconfirmed">Centrālas Amērikas zēimas kerdā</standard>
+					<daylight draft="unconfirmed">Centrālas Amērikas daggas kerdā</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Eastern">
+				<long>
+					<generic draft="unconfirmed">Dēiniskas Amērikas kerdā</generic>
+					<standard draft="unconfirmed">Dēiniskas Amērikas zēimas kerdā</standard>
+					<daylight draft="unconfirmed">Dēiniskas Amērikas daggas kerdā</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Mountain">
+				<long>
+					<generic draft="unconfirmed">Amērikas gārban kerdā</generic>
+					<standard draft="unconfirmed">Amērikas gārban zēimas kerdā</standard>
+					<daylight draft="unconfirmed">Amērikas gārban daggas kerdā</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Pacific">
+				<long>
+					<generic draft="unconfirmed">Pacīfiskas Amērikas kerdā</generic>
+					<standard draft="unconfirmed">Pacīfiskas Amērikas zēimas kerdā</standard>
+					<daylight draft="unconfirmed">Pacīfiskas Amērikas daggas kerdā</daylight>
+				</long>
+			</metazone>
+			<metazone type="Atlantic">
+				<long>
+					<generic draft="unconfirmed">Atlāntiska kerdā</generic>
+					<standard draft="unconfirmed">Atlāntiska zēimas kerdā</standard>
+					<daylight draft="unconfirmed">Atlāntiska daggas kerdā</daylight>
+				</long>
+			</metazone>
+			<metazone type="Europe_Central">
+				<long>
+					<generic draft="unconfirmed">Centrālas Eurōpas kerdā</generic>
+					<standard draft="unconfirmed">Centrālas Eurōpas zēimas kerdā</standard>
+					<daylight draft="unconfirmed">Centrālas Eurōpas daggas kerdā</daylight>
+				</long>
+			</metazone>
+			<metazone type="Europe_Eastern">
+				<long>
+					<generic draft="unconfirmed">Dēiniskas Eurōpas kerdā</generic>
+					<standard draft="unconfirmed">Dēiniskas Eurōpas zēimas kerdā</standard>
+					<daylight draft="unconfirmed">Dēiniskas Eurōpas daggas kerdā</daylight>
+				</long>
+			</metazone>
+			<metazone type="Europe_Western">
+				<long>
+					<generic draft="unconfirmed">Wakkariskas Eurōpas kerdā</generic>
+					<standard draft="unconfirmed">Wakkariskas Eurōpas zēimas kerdā</standard>
+					<daylight draft="unconfirmed">Wakkariskas Eurōpas daggas kerdā</daylight>
+				</long>
+			</metazone>
+			<metazone type="GMT">
+				<long>
+					<standard draft="unconfirmed">Greenwich kerdā</standard>
+				</long>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<defaultNumberingSystem draft="unconfirmed">latn</defaultNumberingSystem>
+		<otherNumberingSystems>
+			<native draft="unconfirmed">latn</native>
+		</otherNumberingSystems>
+		<symbols numberSystem="latn">
+			<decimal draft="unconfirmed">,</decimal>
+			<group draft="unconfirmed"> </group>
+			<percentSign draft="unconfirmed">%</percentSign>
+			<plusSign draft="unconfirmed">+</plusSign>
+			<minusSign draft="unconfirmed">-</minusSign>
+		</symbols>
+		<decimalFormats numberSystem="latn">
+			<decimalFormatLength>
+				<decimalFormat>
+					<pattern draft="unconfirmed">#,##0.###</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+		</decimalFormats>
+		<scientificFormats numberSystem="latn">
+			<scientificFormatLength>
+				<scientificFormat>
+					<pattern draft="unconfirmed">#E0</pattern>
+				</scientificFormat>
+			</scientificFormatLength>
+		</scientificFormats>
+		<percentFormats numberSystem="latn">
+			<percentFormatLength>
+				<percentFormat>
+					<pattern draft="unconfirmed">#,##0%</pattern>
+				</percentFormat>
+			</percentFormatLength>
+		</percentFormats>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern draft="unconfirmed">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<unitPattern count="zero" draft="unconfirmed">{0} {1}</unitPattern>
+			<unitPattern count="one" draft="unconfirmed">{0} {1}</unitPattern>
+			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
+		</currencyFormats>
+		<currencies>
+			<currency type="BRL">
+				<displayName draft="unconfirmed">Brazīlijas reals</displayName>
+				<displayName count="zero" draft="unconfirmed">Brazīlijas realin</displayName>
+				<displayName count="one" draft="unconfirmed">Brazīlijas reals</displayName>
+				<displayName count="other" draft="unconfirmed">Brazīlijas realai</displayName>
+			</currency>
+			<currency type="CNY">
+				<displayName draft="unconfirmed">Kīnas juāns</displayName>
+				<displayName count="zero" draft="unconfirmed">Kīnas juānan</displayName>
+				<displayName count="one" draft="unconfirmed">Kīnas juāns</displayName>
+				<displayName count="other" draft="unconfirmed">Kīnas juānai</displayName>
+			</currency>
+			<currency type="EUR">
+				<displayName draft="unconfirmed">eurō</displayName>
+				<displayName count="zero" draft="unconfirmed">eurō</displayName>
+				<displayName count="one" draft="unconfirmed">eurō</displayName>
+				<displayName count="other" draft="unconfirmed">eurō</displayName>
+			</currency>
+			<currency type="GBP">
+				<displayName draft="unconfirmed">punds sterlings</displayName>
+				<displayName count="zero" draft="unconfirmed">pundan sterlingan</displayName>
+				<displayName count="one" draft="unconfirmed">punds sterlings</displayName>
+				<displayName count="other" draft="unconfirmed">pundai sterlingai</displayName>
+			</currency>
+			<currency type="INR">
+				<displayName draft="unconfirmed">Īndijas rūpija</displayName>
+				<displayName count="zero" draft="unconfirmed">Īndijas rūpijan</displayName>
+				<displayName count="one" draft="unconfirmed">Īndijas rūpija</displayName>
+				<displayName count="other" draft="unconfirmed">Īndijas rūpijas</displayName>
+			</currency>
+			<currency type="JPY">
+				<displayName draft="unconfirmed">Japānijas jāns</displayName>
+				<displayName count="zero" draft="unconfirmed">Japānijas jānan</displayName>
+				<displayName count="one" draft="unconfirmed">Japānijas jāns</displayName>
+				<displayName count="other" draft="unconfirmed">Japānijas jānai</displayName>
+			</currency>
+			<currency type="RUB">
+				<displayName draft="unconfirmed">Russis rūbels</displayName>
+				<displayName count="zero" draft="unconfirmed">Russis rūblin</displayName>
+				<displayName count="one" draft="unconfirmed">Russis rūbels</displayName>
+				<displayName count="other" draft="unconfirmed">Russis rūblai</displayName>
+			</currency>
+			<currency type="USD">
+				<displayName draft="unconfirmed">APW dālars</displayName>
+				<displayName count="zero" draft="unconfirmed">APW dālaran</displayName>
+				<displayName count="one" draft="unconfirmed">APW dālars</displayName>
+				<displayName count="other" draft="unconfirmed">APW dālarai</displayName>
+			</currency>
+			<currency type="XXX">
+				<displayName draft="unconfirmed">niwaistā walūta</displayName>
+				<displayName count="zero" draft="unconfirmed">(niwaistā walūta)</displayName>
+				<displayName count="one" draft="unconfirmed">(niwaistā walūtas aīnibi)</displayName>
+				<displayName count="other" draft="unconfirmed">(niwaistā walūta)</displayName>
+			</currency>
+		</currencies>
+	</numbers>
+	<units>
+		<durationUnit type="hm">
+			<durationUnitPattern draft="unconfirmed">h:mm</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="hms">
+			<durationUnitPattern draft="unconfirmed">h:mm:ss</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="ms">
+			<durationUnitPattern draft="unconfirmed">m:ss</durationUnitPattern>
+		</durationUnit>
+	</units>
+	<listPatterns>
+		<listPattern>
+			<listPatternPart type="start" draft="unconfirmed">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle" draft="unconfirmed">{0}, {1}</listPatternPart>
+			<listPatternPart type="end" draft="unconfirmed">{0} be {1}</listPatternPart>
+			<listPatternPart type="2" draft="unconfirmed">{0} be {1}</listPatternPart>
+		</listPattern>
+	</listPatterns>
+	<posix>
+		<messages>
+			<yesstr draft="unconfirmed">jā:j</yesstr>
+			<nostr draft="unconfirmed">ni:n</nostr>
+		</messages>
+	</posix>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/eo_001.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/prg_001.xml
similarity index 72%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/eo_001.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/prg_001.xml
index 4b4f55ce95c..5fa9e4d8828 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/eo_001.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/prg_001.xml
@@ -6,9 +6,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="eo"/>
+		<version number="$Revision: 11914 $"/>
+		<language type="prg"/>
 		<territory type="001"/>
 	</identity>
 </ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ps.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ps.xml
similarity index 85%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ps.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ps.xml
index db31ef79cf2..22f5c8e8172 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ps.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ps.xml
@@ -1,28 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="ps"/>
 	</identity>
 	<localeDisplayNames>
 		<languages>
 			<language type="af" draft="unconfirmed">افريکاني</language>
-			<language type="am" draft="unconfirmed">امهاري</language>
+			<language type="am">امهاري</language>
 			<language type="ar">عربي</language>
-			<language type="as" draft="unconfirmed">اسمائى ژبه</language>
+			<language type="as">آسامي</language>
 			<language type="az" draft="unconfirmed">أذربائجاني</language>
 			<language type="bal">بلوڅي</language>
-			<language type="be" draft="unconfirmed">بېلاروسي</language>
-			<language type="bg" draft="unconfirmed">بلغاري</language>
+			<language type="be">بېلاروسي</language>
+			<language type="bg">بلغاري</language>
 			<language type="bn" draft="unconfirmed">بنګالي</language>
 			<language type="br" draft="unconfirmed">برېتون</language>
-			<language type="bs" draft="unconfirmed">بوسني</language>
+			<language type="bs">بوسني</language>
 			<language type="ca" draft="unconfirmed">کټلاني</language>
 			<language type="cs" draft="unconfirmed">چېک</language>
 			<language type="cy" draft="unconfirmed">ويلشي</language>
@@ -33,7 +32,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="eo" draft="unconfirmed">اسپرانتو</language>
 			<language type="es" draft="unconfirmed">هسپانوي</language>
 			<language type="et">حبشي</language>
-			<language type="eu" draft="unconfirmed">باسکي</language>
+			<language type="eu">باسکي</language>
 			<language type="fa">فارسي</language>
 			<language type="fi">فینلنډي</language>
 			<language type="fil" draft="unconfirmed">تګالوګ</language>
@@ -75,7 +74,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ms">ملایا</language>
 			<language type="mt" draft="unconfirmed">مالټايي</language>
 			<language type="ne" draft="unconfirmed">نېپالي</language>
-			<language type="nl" draft="unconfirmed">هالېنډي</language>
+			<language type="nl">هالېنډي</language>
 			<language type="nn" draft="unconfirmed">ناروېئي (نائنورسک)</language>
 			<language type="no" draft="unconfirmed">ناروېئې</language>
 			<language type="oc" draft="unconfirmed">اوکسيټاني</language>
@@ -95,7 +94,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sk" draft="unconfirmed">سلوواکي</language>
 			<language type="sl" draft="unconfirmed">سلوواني</language>
 			<language type="so" draft="unconfirmed">سومالي</language>
-			<language type="sq" draft="unconfirmed">الباني</language>
+			<language type="sq">الباني</language>
 			<language type="sr" draft="unconfirmed">سربيائي</language>
 			<language type="st" draft="unconfirmed">سيسوتو</language>
 			<language type="su" draft="unconfirmed">سوډاني</language>
@@ -196,7 +195,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</orientation>
 	</layout>
 	<characters>
-		<exemplarCharacters>[\u064E \u0650 \u064F \u064B \u064D \u064C \u0651 \u0652 \u0654 \u0670 آ ا أ ء ب پ ت ټ ث ج ځ چ څ ح خ د ډ ذ ر ړ ز ژ ږ س ش ښ ص ض ط ظ ع غ ف ق ک ګ ل م ن ڼ ه ة و ؤ ی ي ې ۍ ئ]</exemplarCharacters>
+		<exemplarCharacters>[\u064E \u0650 \u064F \u064B \u064D \u064C \u0651 \u0652 \u0654 \u0670 آ ا أ ء ب پ ت ټ ث ج ځ چ څ ح خ د ډ ذ ر ړ ز ژ ږ س ش ښ ص ض ط ظ ع غ ف ق ک ګ گ ل م ن ڼ ه ة و ؤ ی ي ې ۍ ئ]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[\u200C \u200D \u200E\u200F]</exemplarCharacters>
 		<exemplarCharacters type="index" draft="unconfirmed">[آ ا ء ب پ ت ټ ث ج ځ چ څ ح خ د ډ ذ ر ړ ز ژ ږ س ش ښ ص ض ط ظ ع غ ف ق ک ګ ل م ن ڼ ه و ی]</exemplarCharacters>
 	</characters>
@@ -271,6 +270,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</days>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">غ.م.</dayPeriod>
+							<dayPeriod type="pm">غ.و.</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">غ.م.</dayPeriod>
 							<dayPeriod type="pm">غ.و.</dayPeriod>
@@ -404,8 +407,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<decimal>,</decimal>
 			<group>.</group>
 			<percentSign>%</percentSign>
-			<plusSign>‎+</plusSign> <!-- includes LRM before sign -->
-			<minusSign>‎−</minusSign> <!-- includes LRM before sign (2212) -->
+			<plusSign>‎+</plusSign>
+			<minusSign>‎−</minusSign>
 			<exponential>E</exponential>
 		</symbols>
 		<currencyFormats numberSystem="latn">
@@ -414,6 +417,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0K ¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0K ¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00K ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K ¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000K ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K ¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0M ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M ¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00M ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M ¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000M ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M ¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0G ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G ¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00G ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G ¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000G ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0T ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00T ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000T ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AFN">
@@ -424,12 +455,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</numbers>
 	<units>
 		<unitLength type="long">
-			<unit type="duration-day">
-				<displayName>ورځ</displayName>
-			</unit>
 			<unit type="duration-year">
 				<displayName>کالونه</displayName>
 			</unit>
+			<unit type="duration-day">
+				<displayName>ورځ</displayName>
+			</unit>
 		</unitLength>
 	</units>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ps_AF.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ps_AF.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ps_AF.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ps_AF.xml
index 7e99522f51a..c3724f73567 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ps_AF.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ps_AF.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ps"/>
 		<territory type="AF"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt.xml
index 4fc8253f961..f279d0c2c73 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt.xml
@@ -6,8 +6,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="pt"/>
 	</identity>
 	<localeDisplayNames>
@@ -39,7 +38,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ar">árabe</language>
 			<language type="ar_001">árabe moderno</language>
 			<language type="arc">aramaico</language>
-			<language type="arn">araucano</language>
+			<language type="arn">mapudungun</language>
 			<language type="arp">arapaho</language>
 			<language type="arw">arauaqui</language>
 			<language type="as">assamês</language>
@@ -50,6 +49,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ay">aimara</language>
 			<language type="az">azerbaijano</language>
 			<language type="az" alt="short">azeri</language>
+			<language type="az_Arab" draft="contributed">azeri sul</language>
 			<language type="ba">bashkir</language>
 			<language type="bal">balúchi</language>
 			<language type="ban">balinês</language>
@@ -62,6 +62,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bez">bena</language>
 			<language type="bfd" draft="contributed">bafut</language>
 			<language type="bg">búlgaro</language>
+			<language type="bgn" draft="contributed">balúchi ocidental</language>
 			<language type="bho">bhojpuri</language>
 			<language type="bi">bislamá</language>
 			<language type="bik">bikol</language>
@@ -107,7 +108,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="cs">tcheco</language>
 			<language type="csb">kashubian</language>
 			<language type="cu">eslavo eclesiástico</language>
-			<language type="cv">chuvash</language>
+			<language type="cv">tchuvache</language>
 			<language type="cy">galês</language>
 			<language type="da">dinamarquês</language>
 			<language type="dak">dacota</language>
@@ -289,6 +290,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">laosiano</language>
 			<language type="lol">mongo</language>
 			<language type="loz">lozi</language>
+			<language type="lrc" draft="contributed">luri setentrional</language>
 			<language type="lt">lituano</language>
 			<language type="lu">luba-catanga</language>
 			<language type="lua">luba-lulua</language>
@@ -337,12 +339,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="my">birmanês</language>
 			<language type="mye" draft="contributed">myene</language>
 			<language type="myv">erzya</language>
+			<language type="mzn" draft="contributed">mazandarani</language>
 			<language type="na">nauruano</language>
 			<language type="nap">napolitano</language>
 			<language type="naq">nama</language>
 			<language type="nb">bokmål norueguês</language>
 			<language type="nd">ndebele do norte</language>
 			<language type="nds">baixo alemão</language>
+			<language type="nds_NL" draft="contributed">baixo-saxão</language>
 			<language type="ne">nepali</language>
 			<language type="new">newari</language>
 			<language type="ng">dongo</language>
@@ -404,7 +408,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="rom">romani</language>
 			<language type="ru">russo</language>
 			<language type="rup">aromeno</language>
-			<language type="rw">kinyarwanda</language>
+			<language type="rw">quiniaruanda</language>
 			<language type="rwk">rwa</language>
 			<language type="sa">sânscrito</language>
 			<language type="sad">sandawe</language>
@@ -419,6 +423,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">siciliano</language>
 			<language type="sco">escocês</language>
 			<language type="sd">sindi</language>
+			<language type="sdh" draft="contributed">curdo meridional</language>
 			<language type="se">sami do norte</language>
 			<language type="see" draft="contributed">seneca</language>
 			<language type="seh">sena</language>
@@ -436,9 +441,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sl">esloveno</language>
 			<language type="sm">samoano</language>
 			<language type="sma">sami do sul</language>
-			<language type="smj">lule sami</language>
-			<language type="smn">inari sami</language>
-			<language type="sms">skolt sami</language>
+			<language type="smj">sami de Lule</language>
+			<language type="smn">sami de Inari</language>
+			<language type="sms">sami de Skolt</language>
 			<language type="sn">shona</language>
 			<language type="snk">soninquê</language>
 			<language type="so">somali</language>
@@ -456,8 +461,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">sumério</language>
 			<language type="sv">sueco</language>
 			<language type="sw">suaíli</language>
+			<language type="sw_CD">suaíli do Congo</language>
 			<language type="swb">comoriano</language>
-			<language type="swc">suaíli do Congo</language>
 			<language type="syc">siríaco clássico</language>
 			<language type="syr">siríaco</language>
 			<language type="ta">tâmil</language>
@@ -512,6 +517,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">walamo</language>
 			<language type="war">waray</language>
 			<language type="was">washo</language>
+			<language type="wbp" draft="contributed">warlpiri</language>
 			<language type="wo">uólofe</language>
 			<language type="xal">kalmyk</language>
 			<language type="xh">xosa</language>
@@ -713,7 +719,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albânia</territory>
 			<territory type="AM">Armênia</territory>
-			<territory type="AN">Antilhas Holandesas</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antártida</territory>
 			<territory type="AR">Argentina</territory>
@@ -1028,6 +1033,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">Classificação numérica</key>
 			<key type="colStrength" draft="contributed">Intensidade da classificação</key>
 			<key type="currency">Moeda</key>
+			<key type="hc" draft="contributed">Ciclo de horário (12 vs. 24)</key>
+			<key type="lb" draft="contributed">Estilo de quebra de linha</key>
+			<key type="ms" draft="contributed">Sistema de medição</key>
 			<key type="numbers">Números</key>
 			<key type="timezone" draft="contributed">Fuso horário</key>
 			<key type="va" draft="contributed">Variante de localidade</key>
@@ -1035,95 +1043,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x" draft="contributed">Uso privado</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Algarismos indo-arábicos</type>
-			<type type="arabext" key="numbers">Algarismos indo-arábicos por extenso</type>
-			<type type="armn" key="numbers">Algarismos armênios</type>
-			<type type="armnlow" key="numbers">Algarismos armênios minúsculos</type>
-			<type type="beng" key="numbers">Algarismos Bengali</type>
-			<type type="big5han" key="collation">Ordem do Chinês Tradicional - Big5</type>
-			<type type="buddhist" key="calendar">Calendário Budista</type>
-			<type type="chinese" key="calendar">Calendário Chinês</type>
-			<type type="coptic" key="calendar">Calendário Coptic</type>
-			<type type="dangi" key="calendar">Calendário Dangi</type>
-			<type type="deva" key="numbers">Algarismos Devanagari</type>
-			<type type="dictionary" key="collation">Ordem do dicionário</type>
-			<type type="ducet" key="collation">Ordem padrão do Unicode</type>
-			<type type="ethi" key="numbers">Algarismos etiopianos</type>
-			<type type="ethiopic" key="calendar">Calendário etiópico</type>
-			<type type="ethiopic-amete-alem" key="calendar">Calendário Amete Alem da Etiópia</type>
-			<type type="finance" key="numbers" draft="contributed">Numerais financeiros</type>
-			<type type="fullwide" key="numbers">Algarismos em extensão total</type>
-			<type type="gb2312han" key="collation">Ordem do Chinês Simplificado - GB2312</type>
-			<type type="geor" key="numbers">Algarismos georgianos</type>
-			<type type="gregorian" key="calendar">Calendário Gregoriano</type>
-			<type type="grek" key="numbers">Algarismos gregos</type>
-			<type type="greklow" key="numbers">Algarismos gregos minúsculos</type>
-			<type type="gujr" key="numbers">Algarismos Gujarati</type>
-			<type type="guru" key="numbers">Algarismos Gurmukhi</type>
-			<type type="hanidec" key="numbers">Algarismos decimais chineses</type>
-			<type type="hans" key="numbers">Algarismos chineses simplificados</type>
-			<type type="hansfin" key="numbers">Algarismos financeiros chineses simplificados</type>
-			<type type="hant" key="numbers">Algarismos chineses tradicionais</type>
-			<type type="hantfin" key="numbers">Algarismos financeiros chineses tradicionais</type>
-			<type type="hebr" key="numbers">Algarismos hebraicos</type>
-			<type type="hebrew" key="calendar">Calendário Hebraico</type>
-			<type type="identical" key="colStrength" draft="contributed">Classificar tudo</type>
-			<type type="indian" key="calendar">Calendário Nacional Indiano</type>
-			<type type="islamic" key="calendar">Calendário Islâmico</type>
-			<type type="islamic-civil" key="calendar">Calendário Civil Islâmico</type>
-			<type type="iso8601" key="calendar">Calendário ISO-8601</type>
-			<type type="japanese" key="calendar">Calendário Japonês</type>
-			<type type="jpan" key="numbers">Algarismos japoneses</type>
-			<type type="jpanfin" key="numbers">Algarismos financeiros japoneses</type>
-			<type type="khmr" key="numbers">Algarismos Khmer</type>
-			<type type="knda" key="numbers">Algarismos Kannada</type>
-			<type type="laoo" key="numbers">Algarismos laosianos</type>
-			<type type="latn" key="numbers">Algarismos ocidentais</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">Classificar por minúsculas</type>
-			<type type="mlym" key="numbers">Algarismos Malayalam</type>
-			<type type="mong" key="numbers">Algarismos mongóis</type>
-			<type type="mymr" key="numbers">Algarismos Myanmar</type>
-			<type type="native" key="numbers" draft="contributed">Dígitos nativos</type>
-			<type type="no" key="colBackwards" draft="contributed">Classificar acentos normalmente</type>
-			<type type="no" key="colCaseFirst" draft="contributed">Classificação normal de maiúsculas e minúsculas</type>
-			<type type="no" key="colCaseLevel" draft="contributed">Classificação sem diferenciação de maiúsculas e minúsculas</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">Classificar kana separadamente</type>
-			<type type="no" key="colNormalization" draft="contributed">Classificar sem normalização</type>
-			<type type="no" key="colNumeric" draft="contributed">Classificar dígitos individualmente</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">Classificar símbolos</type>
-			<type type="orya" key="numbers">Algarismos Oriya</type>
-			<type type="persian" key="calendar">Calendário Persa</type>
-			<type type="phonebook" key="collation">Ordem de Lista Telefônica</type>
-			<type type="phonetic" key="collation" draft="contributed">Ordem de classificação fonética</type>
-			<type type="pinyin" key="collation">Ordem Pin-yin</type>
-			<type type="primary" key="colStrength" draft="contributed">Classificar somente letras básicas</type>
-			<type type="quaternary" key="colStrength" draft="contributed">Classificar acentos/maiúsculas e minúsculas/largura/kana</type>
-			<type type="reformed" key="collation">Ordem reformulada</type>
-			<type type="roc" key="calendar">Calendário da República da China</type>
-			<type type="roman" key="numbers">Algarismos romanos</type>
-			<type type="romanlow" key="numbers">Algarismos romanos minúsculos</type>
-			<type type="search" key="collation">Pesquisa de uso geral</type>
-			<type type="searchjl" key="collation" draft="contributed">Pesquisar por consonante inicial hangul</type>
-			<type type="secondary" key="colStrength" draft="contributed">Classificar acentos</type>
-			<type type="shifted" key="colAlternate" draft="contributed">Classificar ignorando símbolos</type>
-			<type type="standard" key="collation">padrão</type>
-			<type type="stroke" key="collation">Ordem dos Traços</type>
-			<type type="taml" key="numbers">Algarismos Tâmil</type>
-			<type type="tamldec" key="numbers">Algarismos Tâmil</type>
-			<type type="telu" key="numbers">Algarismos Telugu</type>
-			<type type="tertiary" key="colStrength" draft="contributed">Classificar acentos/maiúsculas e minúsculas/largura</type>
-			<type type="thai" key="numbers">Algarismos tailandeses</type>
-			<type type="tibt" key="numbers">Algarismos tibetanos</type>
-			<type type="traditional" key="collation">Ordem Tradicional</type>
-			<type type="traditional" key="numbers" draft="contributed">Numerais tradicionais</type>
-			<type type="unihan" key="collation">Ordem por Radical-Traços</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">Classificar por maiúsculas</type>
-			<type type="vaii" key="numbers" draft="contributed">Dígitos vai</type>
-			<type type="yes" key="colBackwards" draft="contributed">Classificação reversa de acentos</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">Classificação com diferenciação de maiúsculas e minúsculas</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">Classificar kana diferentemente</type>
-			<type type="yes" key="colNormalization" draft="contributed">Classificar Unicode normalizado</type>
-			<type type="yes" key="colNumeric" draft="contributed">Classificar dígitos numericamente</type>
+			<type key="calendar" type="buddhist">Calendário Budista</type>
+			<type key="calendar" type="chinese">Calendário Chinês</type>
+			<type key="calendar" type="coptic">Calendário Coptic</type>
+			<type key="calendar" type="dangi">Calendário Dangi</type>
+			<type key="calendar" type="ethiopic">Calendário etíope</type>
+			<type key="calendar" type="ethiopic-amete-alem">Calendário Amete Alem da Etiópia</type>
+			<type key="calendar" type="gregorian">Calendário Gregoriano</type>
+			<type key="calendar" type="hebrew">Calendário Hebraico</type>
+			<type key="calendar" type="indian">Calendário Nacional Indiano</type>
+			<type key="calendar" type="islamic">Calendário Islâmico</type>
+			<type key="calendar" type="islamic-civil">Calendário Civil Islâmico</type>
+			<type key="calendar" type="iso8601">Calendário ISO-8601</type>
+			<type key="calendar" type="japanese">Calendário Japonês</type>
+			<type key="calendar" type="persian">Calendário Persa</type>
+			<type key="calendar" type="roc">Calendário da República da China</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">Classificar símbolos</type>
+			<type key="colAlternate" type="shifted" draft="contributed">Classificar ignorando símbolos</type>
+			<type key="colBackwards" type="no" draft="contributed">Classificar acentos normalmente</type>
+			<type key="colBackwards" type="yes" draft="contributed">Classificação reversa de acentos</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">Classificar por minúsculas</type>
+			<type key="colCaseFirst" type="no" draft="contributed">Classificação normal de maiúsculas e minúsculas</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">Classificar por maiúsculas</type>
+			<type key="colCaseLevel" type="no" draft="contributed">Classificação sem diferenciação de maiúsculas e minúsculas</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">Classificação com diferenciação de maiúsculas e minúsculas</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">Classificar kana separadamente</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">Classificar kana diferentemente</type>
+			<type key="collation" type="big5han">Ordem do Chinês Tradicional - Big5</type>
+			<type key="collation" type="dictionary">Ordem do dicionário</type>
+			<type key="collation" type="ducet">Ordem padrão do Unicode</type>
+			<type key="collation" type="gb2312han">Ordem do Chinês Simplificado - GB2312</type>
+			<type key="collation" type="phonebook">Ordem de Lista Telefônica</type>
+			<type key="collation" type="phonetic" draft="contributed">Ordem de classificação fonética</type>
+			<type key="collation" type="pinyin">Ordem Pin-yin</type>
+			<type key="collation" type="reformed">Ordem reformulada</type>
+			<type key="collation" type="search">Pesquisa de uso geral</type>
+			<type key="collation" type="searchjl" draft="contributed">Pesquisar por consonante inicial hangul</type>
+			<type key="collation" type="standard">padrão</type>
+			<type key="collation" type="stroke">Ordem dos Traços</type>
+			<type key="collation" type="traditional">Ordem Tradicional</type>
+			<type key="collation" type="unihan">Ordem por Radical-Traços</type>
+			<type key="colNormalization" type="no" draft="contributed">Classificar sem normalização</type>
+			<type key="colNormalization" type="yes" draft="contributed">Classificar Unicode normalizado</type>
+			<type key="colNumeric" type="no" draft="contributed">Classificar dígitos individualmente</type>
+			<type key="colNumeric" type="yes" draft="contributed">Classificar dígitos numericamente</type>
+			<type key="colStrength" type="identical" draft="contributed">Classificar tudo</type>
+			<type key="colStrength" type="primary" draft="contributed">Classificar somente letras básicas</type>
+			<type key="colStrength" type="quaternary" draft="contributed">Classificar acentos/maiúsculas e minúsculas/largura/kana</type>
+			<type key="colStrength" type="secondary" draft="contributed">Classificar acentos</type>
+			<type key="colStrength" type="tertiary" draft="contributed">Classificar acentos/maiúsculas e minúsculas/largura</type>
+			<type key="hc" type="h11" draft="contributed">Sistema de 12 horas (0–11)</type>
+			<type key="hc" type="h12" draft="contributed">Sistema de 12 horas (1–12)</type>
+			<type key="hc" type="h23" draft="contributed">Sistema de 24 horas (0–23)</type>
+			<type key="hc" type="h24" draft="contributed">Sistema de 24 horas (1–24)</type>
+			<type key="lb" type="loose" draft="contributed">Quebra de linha com estilo solto</type>
+			<type key="lb" type="normal" draft="contributed">Quebra de linha com estilo normal</type>
+			<type key="lb" type="strict" draft="contributed">Quebra de linha com estilo estrito</type>
+			<type key="ms" type="metric" draft="contributed">Sistema métrico</type>
+			<type key="ms" type="uksystem" draft="contributed">Sistema de medição imperial</type>
+			<type key="ms" type="ussystem" draft="contributed">Sistema de medição americano</type>
+			<type key="numbers" type="arab">Algarismos indo-arábicos</type>
+			<type key="numbers" type="arabext">Algarismos indo-arábicos por extenso</type>
+			<type key="numbers" type="armn">Algarismos armênios</type>
+			<type key="numbers" type="armnlow">Algarismos armênios minúsculos</type>
+			<type key="numbers" type="beng">Algarismos Bengali</type>
+			<type key="numbers" type="deva">Algarismos Devanagari</type>
+			<type key="numbers" type="ethi">Algarismos etiopianos</type>
+			<type key="numbers" type="finance" draft="contributed">Numerais financeiros</type>
+			<type key="numbers" type="fullwide">Algarismos em extensão total</type>
+			<type key="numbers" type="geor">Algarismos georgianos</type>
+			<type key="numbers" type="grek">Algarismos gregos</type>
+			<type key="numbers" type="greklow">Algarismos gregos minúsculos</type>
+			<type key="numbers" type="gujr">Algarismos Gujarati</type>
+			<type key="numbers" type="guru">Algarismos Gurmukhi</type>
+			<type key="numbers" type="hanidec">Algarismos decimais chineses</type>
+			<type key="numbers" type="hans">Algarismos chineses simplificados</type>
+			<type key="numbers" type="hansfin">Algarismos financeiros chineses simplificados</type>
+			<type key="numbers" type="hant">Algarismos chineses tradicionais</type>
+			<type key="numbers" type="hantfin">Algarismos financeiros chineses tradicionais</type>
+			<type key="numbers" type="hebr">Algarismos hebraicos</type>
+			<type key="numbers" type="jpan">Algarismos japoneses</type>
+			<type key="numbers" type="jpanfin">Algarismos financeiros japoneses</type>
+			<type key="numbers" type="khmr">Algarismos Khmer</type>
+			<type key="numbers" type="knda">Algarismos Kannada</type>
+			<type key="numbers" type="laoo">Algarismos laosianos</type>
+			<type key="numbers" type="latn">Algarismos ocidentais</type>
+			<type key="numbers" type="mlym">Algarismos Malayalam</type>
+			<type key="numbers" type="mong">Algarismos mongóis</type>
+			<type key="numbers" type="mymr">Algarismos Myanmar</type>
+			<type key="numbers" type="native" draft="contributed">Dígitos nativos</type>
+			<type key="numbers" type="orya">Algarismos Oriya</type>
+			<type key="numbers" type="roman">Algarismos romanos</type>
+			<type key="numbers" type="romanlow">Algarismos romanos minúsculos</type>
+			<type key="numbers" type="taml">Algarismos Tâmil</type>
+			<type key="numbers" type="tamldec">Algarismos Tâmil</type>
+			<type key="numbers" type="telu">Algarismos Telugu</type>
+			<type key="numbers" type="thai">Algarismos tailandeses</type>
+			<type key="numbers" type="tibt">Algarismos tibetanos</type>
+			<type key="numbers" type="traditional" draft="contributed">Numerais tradicionais</type>
+			<type key="numbers" type="vaii" draft="contributed">Dígitos vai</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">BGN</transformName>
@@ -1242,18 +1260,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</monthContext>
 					<monthContext type="stand-alone">
 						<monthWidth type="abbreviated">
-							<month type="1" draft="contributed">1</month>
-							<month type="2" draft="contributed">2</month>
-							<month type="3" draft="contributed">3</month>
-							<month type="4" draft="contributed">4</month>
-							<month type="5" draft="contributed">5</month>
-							<month type="6" draft="contributed">6</month>
-							<month type="7" draft="contributed">7</month>
-							<month type="8" draft="contributed">8</month>
-							<month type="9" draft="contributed">9</month>
-							<month type="10" draft="contributed">10</month>
-							<month type="11" draft="contributed">11</month>
-							<month type="12" draft="contributed">12</month>
+							<month type="1">Mês 1</month>
+							<month type="2">Mês 2</month>
+							<month type="3">Mês 3</month>
+							<month type="4">Mês 4</month>
+							<month type="5">Mês 5</month>
+							<month type="6">Mês 6</month>
+							<month type="7">Mês 7</month>
+							<month type="8">Mês 8</month>
+							<month type="9">Mês 9</month>
+							<month type="10">Mês 10</month>
+							<month type="11">Mês 11</month>
+							<month type="12">Mês 12</month>
 						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">1</month>
@@ -1490,6 +1508,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM 'de' y G</dateFormatItem>
@@ -1507,6 +1526,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d 'de' MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, d 'de' MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d 'de' MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMEd">E, d 'de' MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
@@ -1516,6 +1537,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">MMM 'de' y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">d 'de' MMM 'de' y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E, d 'de' MMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">MMMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMMd">d 'de' MMMM 'de' y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMMEd">E, d 'de' MMMM 'de' y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">G y QQQ</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">G y QQQQ</dateFormatItem>
 					</availableFormats>
@@ -1830,37 +1854,74 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am" draft="contributed">AM</dayPeriod>
-							<dayPeriod type="pm" draft="contributed">PM</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">a</dayPeriod>
-							<dayPeriod type="noon">n</dayPeriod>
-							<dayPeriod type="pm">p</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="afternoon">tarde</dayPeriod>
+							<dayPeriod type="midnight">meia-noite</dayPeriod>
 							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="morning">manhã</dayPeriod>
-							<dayPeriod type="night">noite</dayPeriod>
 							<dayPeriod type="noon">meio-dia</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">da manhã</dayPeriod>
+							<dayPeriod type="afternoon1">da tarde</dayPeriod>
+							<dayPeriod type="evening1">da noite</dayPeriod>
+							<dayPeriod type="night1">da madrugada</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">m</dayPeriod>
+							<dayPeriod type="am">a</dayPeriod>
+							<dayPeriod type="noon">m</dayPeriod>
+							<dayPeriod type="pm">p</dayPeriod>
+							<dayPeriod type="morning1">da manhã</dayPeriod>
+							<dayPeriod type="afternoon1">da tarde</dayPeriod>
+							<dayPeriod type="evening1">da noite</dayPeriod>
+							<dayPeriod type="night1">da madrugada</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">meia-noite</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">meio-dia</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">da manhã</dayPeriod>
+							<dayPeriod type="afternoon1">da tarde</dayPeriod>
+							<dayPeriod type="evening1">da noite</dayPeriod>
+							<dayPeriod type="night1">da madrugada</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="afternoon" draft="provisional">tarde</dayPeriod>
-							<dayPeriod type="morning" draft="provisional">manhã</dayPeriod>
-							<dayPeriod type="night" draft="provisional">noite</dayPeriod>
-							<dayPeriod type="noon" draft="provisional">meia-noite</dayPeriod>
+							<dayPeriod type="midnight">meia-noite</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">meio-dia</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">manhã</dayPeriod>
+							<dayPeriod type="afternoon1">tarde</dayPeriod>
+							<dayPeriod type="evening1">noite</dayPeriod>
+							<dayPeriod type="night1">madrugada</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">meia-noite</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">meio-dia</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">manhã</dayPeriod>
+							<dayPeriod type="afternoon1">tarde</dayPeriod>
+							<dayPeriod type="evening1">noite</dayPeriod>
+							<dayPeriod type="night1">madrugada</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">meia-noite</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">meio-dia</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">manhã</dayPeriod>
+							<dayPeriod type="afternoon1">tarde</dayPeriod>
+							<dayPeriod type="evening1">noite</dayPeriod>
+							<dayPeriod type="night1">madrugada</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
-						<era type="0">Antes de Cristo</era>
-						<era type="0" alt="variant">Antes da Era Comum</era>
-						<era type="1">Ano do Senhor</era>
+						<era type="0">antes de Cristo</era>
+						<era type="0" alt="variant">antes da Era Comum</era>
+						<era type="1">depois de Cristo</era>
 						<era type="1" alt="variant">Era Comum</era>
 					</eraNames>
 					<eraAbbr>
@@ -1964,6 +2025,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d 'de' MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, d 'de' MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d 'de' MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMEd">E, d 'de' MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">MM/y</dateFormatItem>
@@ -1973,6 +2036,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yMMM">MMM 'de' y</dateFormatItem>
 						<dateFormatItem id="yMMMd">d 'de' MMM 'de' y</dateFormatItem>
 						<dateFormatItem id="yMMMEd">E, d 'de' MMM 'de' y</dateFormatItem>
+						<dateFormatItem id="yMMMM">MMMM 'de' y</dateFormatItem>
+						<dateFormatItem id="yMMMMd">d 'de' MMMM 'de' y</dateFormatItem>
+						<dateFormatItem id="yMMMMEd">E, d 'de' MMMM 'de' y</dateFormatItem>
 						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
 						<dateFormatItem id="yQQQQ">y QQQQ</dateFormatItem>
 					</availableFormats>
@@ -2321,31 +2387,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</calendars>
 		<fields>
 			<field type="era">
-				<displayName>Era</displayName>
+				<displayName>era</displayName>
 			</field>
 			<field type="year">
-				<displayName>Ano</displayName>
+				<displayName>ano</displayName>
 				<relative type="-1">ano passado</relative>
 				<relative type="0">este ano</relative>
 				<relative type="1">próximo ano</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Dentro de {0} ano</relativeTimePattern>
-					<relativeTimePattern count="other">Dentro de {0} anos</relativeTimePattern>
+					<relativeTimePattern count="one">em {0} ano</relativeTimePattern>
+					<relativeTimePattern count="other">em {0} anos</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">Há {0} ano</relativeTimePattern>
-					<relativeTimePattern count="other">Há {0} anos</relativeTimePattern>
+					<relativeTimePattern count="one">há {0} ano</relativeTimePattern>
+					<relativeTimePattern count="other">há {0} anos</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="year-short">
 				<displayName>ano</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Dentro de {0} ano</relativeTimePattern>
-					<relativeTimePattern count="other">Dentro de {0} anos</relativeTimePattern>
+					<relativeTimePattern count="one">em {0} ano</relativeTimePattern>
+					<relativeTimePattern count="other">em {0} anos</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">Há {0} ano</relativeTimePattern>
-					<relativeTimePattern count="other">Há {0} anos</relativeTimePattern>
+					<relativeTimePattern count="one">há {0} ano</relativeTimePattern>
+					<relativeTimePattern count="other">há {0} anos</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="year-narrow">
@@ -2360,25 +2426,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="quarter">
-				<displayName>Trimestre</displayName>
+				<displayName>trimestre</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Dentro de {0} trimestre</relativeTimePattern>
-					<relativeTimePattern count="other">Dentro de {0} trimestres</relativeTimePattern>
+					<relativeTimePattern count="one">em {0} trimestre</relativeTimePattern>
+					<relativeTimePattern count="other">em {0} trimestres</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">Há {0} trimestre</relativeTimePattern>
-					<relativeTimePattern count="other">Há {0} trimestres</relativeTimePattern>
+					<relativeTimePattern count="one">há {0} trimestre</relativeTimePattern>
+					<relativeTimePattern count="other">há {0} trimestres</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-short">
 				<displayName>trim.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Dentro de {0} trim.</relativeTimePattern>
-					<relativeTimePattern count="other">Dentro de {0} trims.</relativeTimePattern>
+					<relativeTimePattern count="one">em {0} trim.</relativeTimePattern>
+					<relativeTimePattern count="other">em {0} trims.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">Há {0} trim.</relativeTimePattern>
-					<relativeTimePattern count="other">Há {0} trims.</relativeTimePattern>
+					<relativeTimePattern count="one">há {0} trim.</relativeTimePattern>
+					<relativeTimePattern count="other">há {0} trims.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-narrow">
@@ -2393,28 +2459,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="month">
-				<displayName>Mês</displayName>
+				<displayName>mês</displayName>
 				<relative type="-1">mês passado</relative>
 				<relative type="0">este mês</relative>
 				<relative type="1">próximo mês</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Dentro de {0} mês</relativeTimePattern>
-					<relativeTimePattern count="other">Dentro de {0} meses</relativeTimePattern>
+					<relativeTimePattern count="one">em {0} mês</relativeTimePattern>
+					<relativeTimePattern count="other">em {0} meses</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">Há {0} mês</relativeTimePattern>
-					<relativeTimePattern count="other">Há {0} meses</relativeTimePattern>
+					<relativeTimePattern count="one">há {0} mês</relativeTimePattern>
+					<relativeTimePattern count="other">há {0} meses</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month-short">
 				<displayName>mês</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Dentro de {0} mês</relativeTimePattern>
-					<relativeTimePattern count="other">Dentro de {0} meses</relativeTimePattern>
+					<relativeTimePattern count="one">em {0} mês</relativeTimePattern>
+					<relativeTimePattern count="other">em {0} meses</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">Há {0} mês</relativeTimePattern>
-					<relativeTimePattern count="other">Há {0} meses</relativeTimePattern>
+					<relativeTimePattern count="one">há {0} mês</relativeTimePattern>
+					<relativeTimePattern count="other">há {0} meses</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month-narrow">
@@ -2429,28 +2495,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="week">
-				<displayName>Semana</displayName>
+				<displayName>semana</displayName>
 				<relative type="-1">semana passada</relative>
 				<relative type="0">esta semana</relative>
 				<relative type="1">próxima semana</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Dentro de {0} semana</relativeTimePattern>
-					<relativeTimePattern count="other">Dentro de {0} semanas</relativeTimePattern>
+					<relativeTimePattern count="one">em {0} semana</relativeTimePattern>
+					<relativeTimePattern count="other">em {0} semanas</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">Há {0} semana</relativeTimePattern>
-					<relativeTimePattern count="other">Há {0} semanas</relativeTimePattern>
+					<relativeTimePattern count="one">há {0} semana</relativeTimePattern>
+					<relativeTimePattern count="other">há {0} semanas</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week-short">
 				<displayName>sem.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Dentro de {0} sem.</relativeTimePattern>
-					<relativeTimePattern count="other">Dentro de {0} sem.</relativeTimePattern>
+					<relativeTimePattern count="one">em {0} sem.</relativeTimePattern>
+					<relativeTimePattern count="other">em {0} sem.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">Há {0} sem.</relativeTimePattern>
-					<relativeTimePattern count="other">Há {0} sem.</relativeTimePattern>
+					<relativeTimePattern count="one">há {0} sem.</relativeTimePattern>
+					<relativeTimePattern count="other">há {0} sem.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week-narrow">
@@ -2465,30 +2531,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day">
-				<displayName>Dia</displayName>
+				<displayName>dia</displayName>
 				<relative type="-2">anteontem</relative>
 				<relative type="-1">ontem</relative>
 				<relative type="0">hoje</relative>
 				<relative type="1">amanhã</relative>
 				<relative type="2">depois de amanhã</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Dentro de {0} dia</relativeTimePattern>
-					<relativeTimePattern count="other">Dentro de {0} dias</relativeTimePattern>
+					<relativeTimePattern count="one">em {0} dia</relativeTimePattern>
+					<relativeTimePattern count="other">em {0} dias</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">Há {0} dia</relativeTimePattern>
-					<relativeTimePattern count="other">Há {0} dias</relativeTimePattern>
+					<relativeTimePattern count="one">há {0} dia</relativeTimePattern>
+					<relativeTimePattern count="other">há {0} dias</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day-short">
 				<displayName>dia</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Dentro de {0} dia</relativeTimePattern>
-					<relativeTimePattern count="other">Dentro de {0} dias</relativeTimePattern>
+					<relativeTimePattern count="one">em {0} dia</relativeTimePattern>
+					<relativeTimePattern count="other">em {0} dias</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">Há {0} dia</relativeTimePattern>
-					<relativeTimePattern count="other">Há {0} dias</relativeTimePattern>
+					<relativeTimePattern count="one">há {0} dia</relativeTimePattern>
+					<relativeTimePattern count="other">há {0} dias</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day-narrow">
@@ -2503,7 +2569,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="weekday">
-				<displayName>Dia da semana</displayName>
+				<displayName>dia da semana</displayName>
 			</field>
 			<field type="sun">
 				<relative type="-1">domingo passado</relative>
@@ -2614,25 +2680,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>AM/PM</displayName>
 			</field>
 			<field type="hour">
-				<displayName>Hora</displayName>
+				<displayName>hora</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Dentro de {0} hora</relativeTimePattern>
-					<relativeTimePattern count="other">Dentro de {0} horas</relativeTimePattern>
+					<relativeTimePattern count="one">em {0} hora</relativeTimePattern>
+					<relativeTimePattern count="other">em {0} horas</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">Há {0} hora</relativeTimePattern>
-					<relativeTimePattern count="other">Há {0} horas</relativeTimePattern>
+					<relativeTimePattern count="one">há {0} hora</relativeTimePattern>
+					<relativeTimePattern count="other">há {0} horas</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-short">
-				<displayName>hr.</displayName>
+				<displayName>h</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Dentro de {0} h</relativeTimePattern>
-					<relativeTimePattern count="other">Dentro de {0} h</relativeTimePattern>
+					<relativeTimePattern count="one">em {0} h</relativeTimePattern>
+					<relativeTimePattern count="other">em {0} h</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">Há {0} h</relativeTimePattern>
-					<relativeTimePattern count="other">Há {0} h</relativeTimePattern>
+					<relativeTimePattern count="one">há {0} h</relativeTimePattern>
+					<relativeTimePattern count="other">há {0} h</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-narrow">
@@ -2647,25 +2713,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="minute">
-				<displayName>Minuto</displayName>
+				<displayName>minuto</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Dentro de {0} minuto</relativeTimePattern>
-					<relativeTimePattern count="other">Dentro de {0} minutos</relativeTimePattern>
+					<relativeTimePattern count="one">em {0} minuto</relativeTimePattern>
+					<relativeTimePattern count="other">em {0} minutos</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">Há {0} minuto</relativeTimePattern>
-					<relativeTimePattern count="other">Há {0} minutos</relativeTimePattern>
+					<relativeTimePattern count="one">há {0} minuto</relativeTimePattern>
+					<relativeTimePattern count="other">há {0} minutos</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute-short">
 				<displayName>min.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Dentro de {0} min.</relativeTimePattern>
-					<relativeTimePattern count="other">Dentro de {0} min</relativeTimePattern>
+					<relativeTimePattern count="one">em {0} min.</relativeTimePattern>
+					<relativeTimePattern count="other">em {0} mins.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">Há {0} min.</relativeTimePattern>
-					<relativeTimePattern count="other">Há {0} min</relativeTimePattern>
+					<relativeTimePattern count="one">há {0} min.</relativeTimePattern>
+					<relativeTimePattern count="other">há {0} mins.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute-narrow">
@@ -2680,26 +2746,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="second">
-				<displayName>Segundo</displayName>
+				<displayName>segundo</displayName>
 				<relative type="0">agora</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Dentro de {0} segundo</relativeTimePattern>
-					<relativeTimePattern count="other">Dentro de {0} segundos</relativeTimePattern>
+					<relativeTimePattern count="one">em {0} segundo</relativeTimePattern>
+					<relativeTimePattern count="other">em {0} segundos</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">Há {0} segundo</relativeTimePattern>
-					<relativeTimePattern count="other">Há {0} segundos</relativeTimePattern>
+					<relativeTimePattern count="one">há {0} segundo</relativeTimePattern>
+					<relativeTimePattern count="other">há {0} segundos</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second-short">
 				<displayName>seg.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Dentro de {0} seg.</relativeTimePattern>
-					<relativeTimePattern count="other">Dentro de {0} seg.</relativeTimePattern>
+					<relativeTimePattern count="one">em {0} seg.</relativeTimePattern>
+					<relativeTimePattern count="other">em {0} segs.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">Há {0} seg.</relativeTimePattern>
-					<relativeTimePattern count="other">Há {0} seg.</relativeTimePattern>
+					<relativeTimePattern count="one">há {0} seg.</relativeTimePattern>
+					<relativeTimePattern count="other">há {0} seg.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second-narrow">
@@ -2714,7 +2780,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>Fuso horário</displayName>
+				<displayName>fuso horário</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
@@ -3592,6 +3658,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity draft="contributed">Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
 			</zone>
@@ -3676,6 +3745,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity draft="contributed">Chita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Yakutsk</exemplarCity>
 			</zone>
@@ -3694,6 +3766,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity draft="contributed">Srednekolymsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamchatka</exemplarCity>
 			</zone>
@@ -5048,6 +5123,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="contributed">¤0 mil</pattern>
+					<pattern type="1000" count="other" draft="contributed">¤0 mil</pattern>
+					<pattern type="10000" count="one" draft="contributed">¤00 mil</pattern>
+					<pattern type="10000" count="other" draft="contributed">¤00 mil</pattern>
+					<pattern type="100000" count="one" draft="contributed">¤000 mil</pattern>
+					<pattern type="100000" count="other" draft="contributed">¤000 mil</pattern>
+					<pattern type="1000000" count="one" draft="contributed">¤0 mi</pattern>
+					<pattern type="1000000" count="other" draft="contributed">¤0 mi</pattern>
+					<pattern type="10000000" count="one" draft="contributed">¤00 mi</pattern>
+					<pattern type="10000000" count="other" draft="contributed">¤00 mi</pattern>
+					<pattern type="100000000" count="one" draft="contributed">¤000 mi</pattern>
+					<pattern type="100000000" count="other" draft="contributed">¤000 mi</pattern>
+					<pattern type="1000000000" count="one" draft="contributed">¤0 bi</pattern>
+					<pattern type="1000000000" count="other" draft="contributed">¤0 bi</pattern>
+					<pattern type="10000000000" count="one" draft="contributed">¤00 bi</pattern>
+					<pattern type="10000000000" count="other" draft="contributed">¤00 bi</pattern>
+					<pattern type="100000000000" count="one" draft="contributed">¤000 bi</pattern>
+					<pattern type="100000000000" count="other" draft="contributed">¤000 bi</pattern>
+					<pattern type="1000000000000" count="one" draft="contributed">¤0 tri</pattern>
+					<pattern type="1000000000000" count="other" draft="contributed">¤0 tri</pattern>
+					<pattern type="10000000000000" count="one" draft="contributed">¤00 tri</pattern>
+					<pattern type="10000000000000" count="other" draft="contributed">¤00 tri</pattern>
+					<pattern type="100000000000000" count="one" draft="contributed">¤000 tri</pattern>
+					<pattern type="100000000000000" count="other" draft="contributed">¤000 tri</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -5102,6 +5205,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Kwanza angolano</displayName>
 				<displayName count="other">Kwanzas angolanos</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>Cuanza angolano (1977–1990)</displayName>
@@ -5184,6 +5288,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Marco bósnio-herzegovino conversível</displayName>
 				<displayName count="other">Marco bósnio-herzegovino conversível</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BAN">
 				<displayName>Novo dinar da Bósnia-Herzegovina (1994–1997)</displayName>
@@ -5271,6 +5376,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Boliviano</displayName>
 				<displayName count="other">Bolivianos</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOL">
 				<displayName>Boliviano (1863–1963)</displayName>
@@ -5347,6 +5453,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Pula botsuanesa</displayName>
 				<displayName count="other">Pulas botsuanesas</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>Rublo novo bielo-russo (1994–1999)</displayName>
@@ -5459,6 +5566,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Peso cubano conversível</displayName>
 				<displayName count="other">Pesos cubanos conversíveis</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>Peso cubano</displayName>
@@ -5483,6 +5591,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Coroa tcheca</displayName>
 				<displayName count="other">Coroas tchecas</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>Ostmark da Alemanha Oriental</displayName>
@@ -5505,6 +5614,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Coroa dinamarquesa</displayName>
 				<displayName count="other">Coroas dinamarquesas</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Peso dominicano</displayName>
@@ -5539,6 +5649,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Libra egípcia</displayName>
 				<displayName count="other">Libras egípcias</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>Nakfa da Eritreia</displayName>
@@ -5591,6 +5702,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Libra malvinense</displayName>
 				<displayName count="other">Libras malvinenses</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>Franco francês</displayName>
@@ -5614,6 +5726,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Lari georgiano</displayName>
 				<displayName count="other">Laris georgianos</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>Cedi de Gana (1979–2007)</displayName>
@@ -5644,6 +5757,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Franco guineano</displayName>
 				<displayName count="other">Francos guineanos</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>Syli da Guiné</displayName>
@@ -5665,6 +5779,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Quetzal guatemalense</displayName>
 				<displayName count="other">Quetzais guatemalenses</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>Escudo da Guiné Portuguesa</displayName>
@@ -5695,6 +5810,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Lempira hondurenha</displayName>
 				<displayName count="other">Lempiras hondurenhas</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>Dinar croata</displayName>
@@ -5706,6 +5822,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Kuna croata</displayName>
 				<displayName count="other">Kunas croatas</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>Gourde haitiano</displayName>
@@ -5718,12 +5835,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Forint húngaro</displayName>
 				<displayName count="other">Forints húngaros</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>Rupia indonésia</displayName>
 				<displayName count="one">Rupia indonésia</displayName>
 				<displayName count="other">Rupias indonésias</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>Libra irlandesa</displayName>
@@ -5776,6 +5895,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Coroa islandesa</displayName>
 				<displayName count="other">Coroas islandesas</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>Lira italiana</displayName>
@@ -5826,12 +5946,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Franco comorense</displayName>
 				<displayName count="other">Francos comorenses</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>Won norte-coreano</displayName>
 				<displayName count="one">Won norte-coreano</displayName>
 				<displayName count="other">Wons norte-coreanos</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRH">
 				<displayName>Hwan da Coreia do Sul (1953–1962)</displayName>
@@ -5882,12 +6004,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Libra libanesa</displayName>
 				<displayName count="other">Libras libanesas</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>Rupia ceilandesa</displayName>
 				<displayName count="one">Rupia ceilandesa</displayName>
 				<displayName count="other">Rupias ceilandesas</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>Dólar liberiano</displayName>
@@ -5976,6 +6100,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Ariary malgaxe</displayName>
 				<displayName count="other">Ariarys malgaxes</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>Franco de Madagascar</displayName>
@@ -6003,6 +6128,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Kyat mianmarense</displayName>
 				<displayName count="other">Kyats mianmarenses</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>Tugrik mongol</displayName>
@@ -6038,6 +6164,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Rupia mauriciana</displayName>
 				<displayName count="other">Rupias mauricianas</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>Rupia maldiva</displayName>
@@ -6073,6 +6200,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Ringgit malaio</displayName>
 				<displayName count="other">Ringgits malaios</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>Escudo de Moçambique</displayName>
@@ -6114,6 +6242,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Córdoba nicaraguense</displayName>
 				<displayName count="other">Córdobas nicaraguenses</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>Florim holandês</displayName>
@@ -6125,12 +6254,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Coroa norueguesa</displayName>
 				<displayName count="other">Coroas norueguesas</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>Rupia nepalesa</displayName>
 				<displayName count="one">Rupia nepalesa</displayName>
 				<displayName count="other">Rupias nepalesas</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>Dólar neozelandês</displayName>
@@ -6185,12 +6316,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Rupia paquistanesa</displayName>
 				<displayName count="other">Rupias paquistanesas</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>Zloti polonês</displayName>
 				<displayName count="one">Zloti polonês</displayName>
 				<displayName count="other">Zlotis poloneses</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>Zloti polonês (1950–1995)</displayName>
@@ -6229,7 +6362,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="RON">
 				<displayName>Leu romeno</displayName>
 				<displayName count="one">Leu romeno</displayName>
-				<displayName count="other">Leus da Romênia</displayName>
+				<displayName count="other">Leus romenos</displayName>
 				<symbol>RON</symbol>
 			</currency>
 			<currency type="RSD">
@@ -6243,6 +6376,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Rublo russo</displayName>
 				<displayName count="other">Rublos russos</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>Rublo russo (1991–1998)</displayName>
@@ -6254,6 +6388,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Franco ruandês</displayName>
 				<displayName count="other">Francos ruandeses</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>Riyal saudita</displayName>
@@ -6295,6 +6430,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Coroa sueca</displayName>
 				<displayName count="other">Coroas suecas</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>Dólar singapuriano</displayName>
@@ -6308,6 +6444,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Libra de Santa Helena</displayName>
 				<displayName count="other">Libras de Santa Helena</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>Tolar Bons esloveno</displayName>
@@ -6355,6 +6492,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Dobra de São Tomé e Príncipe</displayName>
 				<displayName count="other">Dobras de São Tomé e Príncipe</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>Rublo soviético</displayName>
@@ -6371,6 +6509,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Libra síria</displayName>
 				<displayName count="other">Libras sírias</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>Lilangeni suazi</displayName>
@@ -6383,6 +6522,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Baht tailandês</displayName>
 				<displayName count="other">Bahts tailandeses</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>Rublo do Tadjiquistão</displayName>
@@ -6417,6 +6557,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Paʻanga tonganesa</displayName>
 				<displayName count="other">Paʻangas tonganesas</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>Escudo timorense</displayName>
@@ -6434,6 +6575,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">Liras turcas</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Dólar de Trinidad e Tobago</displayName>
@@ -6528,6 +6670,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Bolívar venezuelano</displayName>
 				<displayName count="other">Bolívares venezuelanos</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>Dong vietnamita</displayName>
@@ -6594,6 +6737,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Dólar do Caribe Oriental</displayName>
 				<displayName count="other">Dólares do Caribe Oriental</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>Direitos Especiais de Giro</displayName>
@@ -6693,6 +6837,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Rand sul-africano</displayName>
 				<displayName count="other">Rands sul-africanos</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>Cuacha zambiano (1968–2012)</displayName>
@@ -6705,6 +6850,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Kwacha zambiano</displayName>
 				<displayName count="other">Kwachas zambianos</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>Zaire Novo zairense (1993–1998)</displayName>
@@ -6752,6 +6898,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} metro por segundo ao quadrado</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} metros por segundo ao quadrado</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName draft="contributed">revolução</displayName>
+				<unitPattern count="one" draft="contributed">{0} revolução</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} revoluções</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName draft="contributed">radianos</displayName>
+				<unitPattern count="one" draft="contributed">{0} radiano</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} radianos</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName draft="contributed">graus</displayName>
+				<unitPattern count="one">{0} grau</unitPattern>
+				<unitPattern count="other">{0} graus</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName draft="contributed">minutos de arco</displayName>
 				<unitPattern count="one">{0} minuto de arco</unitPattern>
@@ -6762,30 +6923,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} segundo de arco</unitPattern>
 				<unitPattern count="other">{0} segundos de arco</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName draft="contributed">graus</displayName>
-				<unitPattern count="one">{0} grau</unitPattern>
-				<unitPattern count="other">{0} graus</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName draft="contributed">radianos</displayName>
-				<unitPattern count="one" draft="contributed">{0} radiano</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} radianos</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="contributed">acres</displayName>
-				<unitPattern count="one">{0} acre</unitPattern>
-				<unitPattern count="other">{0} acres</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName draft="contributed">quilômetros quadrados</displayName>
+				<unitPattern count="one">{0} quilômetro quadrado</unitPattern>
+				<unitPattern count="other">{0} quilômetros quadrados</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName draft="contributed">hectares</displayName>
 				<unitPattern count="one">{0} hectare</unitPattern>
 				<unitPattern count="other">{0} hectares</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName draft="contributed">metros quadrados</displayName>
+				<unitPattern count="one">{0} metro quadrado</unitPattern>
+				<unitPattern count="other">{0} metros quadrados</unitPattern>
+				<perUnitPattern draft="contributed">{0} por metro quadrado</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName draft="contributed">centímetros quadrados</displayName>
 				<unitPattern count="one" draft="contributed">{0} centímetro quadrado</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} centímetros quadrados</unitPattern>
+				<perUnitPattern draft="contributed">{0} por centímetro quadrado</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName draft="contributed">milhas quadradas</displayName>
+				<unitPattern count="one">{0} milha quadrada</unitPattern>
+				<unitPattern count="other">{0} milhas quadradas</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName draft="contributed">acres</displayName>
+				<unitPattern count="one">{0} acre</unitPattern>
+				<unitPattern count="other">{0} acres</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName draft="contributed">jardas quadradas</displayName>
+				<unitPattern count="one" draft="contributed">{0} jarda quadrada</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} jardas quadradas</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName draft="contributed">pés quadrados</displayName>
@@ -6796,91 +6969,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName draft="contributed">polegadas quadradas</displayName>
 				<unitPattern count="one" draft="contributed">{0} polegada quadrada</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} polegadas quadradas</unitPattern>
+				<perUnitPattern draft="contributed">{0} por polegada quadrada</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="contributed">quilômetros quadrados</displayName>
-				<unitPattern count="one">{0} quilômetro quadrado</unitPattern>
-				<unitPattern count="other">{0} quilômetros quadrados</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName draft="contributed">metros quadrados</displayName>
-				<unitPattern count="one">{0} metro quadrado</unitPattern>
-				<unitPattern count="other">{0} metros quadrados</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName draft="contributed">milhas quadradas</displayName>
-				<unitPattern count="one">{0} milha quadrada</unitPattern>
-				<unitPattern count="other">{0} milhas quadradas</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName draft="contributed">jardas quadradas</displayName>
-				<unitPattern count="one" draft="contributed">{0} jarda quadrada</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} jardas quadradas</unitPattern>
+			<unit type="concentr-karat">
+				<displayName draft="contributed">kilates</displayName>
+				<unitPattern count="one" draft="contributed">{0} kilate</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kilates</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName draft="contributed">litros por quilômetro</displayName>
 				<unitPattern count="one" draft="contributed">{0} litro por quilômetro</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} litros por quilômetro</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName draft="contributed">litros por 100 quilômetros</displayName>
+				<unitPattern count="one" draft="contributed">{0} litro por 100 quilômetros</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} litros por 100 quilômetros</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName draft="contributed">milhas por galão</displayName>
 				<unitPattern count="one" draft="contributed">{0} milha por galão</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} milhas por galão</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName draft="contributed">bits</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bits</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName draft="contributed">bytes</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} bytes</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName draft="contributed">gigabits</displayName>
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="other">{0} gigabits</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName draft="contributed">gigabytes</displayName>
-				<unitPattern count="one">{0} gigabyte</unitPattern>
-				<unitPattern count="other">{0} gigabytes</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName draft="contributed">kilobits</displayName>
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="other">{0} kilobits</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName draft="contributed">kilobytes</displayName>
-				<unitPattern count="one">{0} kilobyte</unitPattern>
-				<unitPattern count="other">{0} kilobytes</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName draft="contributed">megabits</displayName>
-				<unitPattern count="one">{0} megabit</unitPattern>
-				<unitPattern count="other">{0} megabits</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName draft="contributed">megabytes</displayName>
-				<unitPattern count="one">{0} megabyte</unitPattern>
-				<unitPattern count="other">{0} megabytes</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName draft="contributed">terabits</displayName>
-				<unitPattern count="one">{0} terabit</unitPattern>
-				<unitPattern count="other">{0} terabits</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName draft="contributed">terabytes</displayName>
 				<unitPattern count="one">{0} terabyte</unitPattern>
 				<unitPattern count="other">{0} terabytes</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName draft="contributed">terabits</displayName>
+				<unitPattern count="one">{0} terabit</unitPattern>
+				<unitPattern count="other">{0} terabits</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName draft="contributed">gigabytes</displayName>
+				<unitPattern count="one">{0} gigabyte</unitPattern>
+				<unitPattern count="other">{0} gigabytes</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName draft="contributed">gigabits</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="other">{0} gigabits</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName draft="contributed">megabytes</displayName>
+				<unitPattern count="one">{0} megabyte</unitPattern>
+				<unitPattern count="other">{0} megabytes</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName draft="contributed">megabits</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="other">{0} megabits</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName draft="contributed">kilobytes</displayName>
+				<unitPattern count="one">{0} kilobyte</unitPattern>
+				<unitPattern count="other">{0} kilobytes</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName draft="contributed">kilobits</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="other">{0} kilobits</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName draft="contributed">bytes</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} bytes</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName draft="contributed">bits</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bits</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="contributed">séculos</displayName>
+				<unitPattern count="one" draft="contributed">{0} século</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} sécs.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="contributed">anos</displayName>
+				<unitPattern count="one" draft="contributed">{0} ano</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} anos</unitPattern>
+				<perUnitPattern draft="contributed">{0} por ano</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">meses</displayName>
+				<unitPattern count="one" draft="contributed">{0} mês</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} meses</unitPattern>
+				<perUnitPattern draft="contributed">{0} por mês</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="contributed">semanas</displayName>
+				<unitPattern count="one" draft="contributed">{0} semana</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} semanas</unitPattern>
+				<perUnitPattern draft="contributed">{0} por semana</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="contributed">dias</displayName>
 				<unitPattern count="one" draft="contributed">{0} dia</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} dias</unitPattern>
+				<perUnitPattern draft="contributed">{0} por dia</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName draft="contributed">horas</displayName>
@@ -6888,30 +7076,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other" draft="contributed">{0} horas</unitPattern>
 				<perUnitPattern draft="contributed">{0} por hora</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName draft="contributed">microssegundos</displayName>
-				<unitPattern count="one" draft="contributed">{0} microssegundo</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} microssegundos</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="contributed">milissegundos</displayName>
-				<unitPattern count="one">{0} milissegundo</unitPattern>
-				<unitPattern count="other">{0} milissegundos</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="contributed">minutos</displayName>
 				<unitPattern count="one" draft="contributed">{0} minuto</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} minutos</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">meses</displayName>
-				<unitPattern count="one" draft="contributed">{0} mês</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} meses</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName draft="contributed">nanossegundos</displayName>
-				<unitPattern count="one" draft="contributed">{0} nanossegundo</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} nanossegundos</unitPattern>
+				<perUnitPattern draft="contributed">{0} por minuto</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName draft="contributed">segundos</displayName>
@@ -6919,15 +7088,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other" draft="contributed">{0} segundos</unitPattern>
 				<perUnitPattern draft="contributed">{0} por segundo</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">semanas</displayName>
-				<unitPattern count="one" draft="contributed">{0} semana</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} semanas</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="contributed">milissegundos</displayName>
+				<unitPattern count="one">{0} milissegundo</unitPattern>
+				<unitPattern count="other">{0} milissegundos</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">anos</displayName>
-				<unitPattern count="one" draft="contributed">{0} ano</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} anos</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName draft="contributed">microssegundos</displayName>
+				<unitPattern count="one" draft="contributed">{0} microssegundo</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} microssegundos</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName draft="contributed">nanossegundos</displayName>
+				<unitPattern count="one" draft="contributed">{0} nanossegundo</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} nanossegundos</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName draft="contributed">amperes</displayName>
@@ -6949,6 +7123,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} volt</unitPattern>
 				<unitPattern count="other">{0} volts</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName draft="contributed">quilocalorias</displayName>
+				<unitPattern count="one" draft="contributed">{0} quilocaloria</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} quilocalorias</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName draft="contributed">calorias</displayName>
 				<unitPattern count="one" draft="contributed">{0} caloria</unitPattern>
@@ -6959,21 +7138,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} Caloria</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} Calorias</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName draft="contributed">joules</displayName>
-				<unitPattern count="one">{0} joule</unitPattern>
-				<unitPattern count="other">{0} joules</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName draft="contributed">quilocalorias</displayName>
-				<unitPattern count="one" draft="contributed">{0} quilocaloria</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} quilocalorias</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName draft="contributed">quilojoules</displayName>
 				<unitPattern count="one" draft="contributed">{0} quilojoule</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} quilojoules</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joules</displayName>
+				<unitPattern count="one">{0} joule</unitPattern>
+				<unitPattern count="other">{0} joules</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName draft="contributed">quilowatts-hora</displayName>
 				<unitPattern count="one" draft="contributed">{0} quilowatt-hora</unitPattern>
@@ -6984,201 +7158,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} gigahertz</unitPattern>
 				<unitPattern count="other">{0} gigahertz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName draft="contributed">hertz</displayName>
-				<unitPattern count="one">{0} hertz</unitPattern>
-				<unitPattern count="other">{0} hertz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName draft="contributed">megahertz</displayName>
+				<unitPattern count="one">{0} megahertz</unitPattern>
+				<unitPattern count="other">{0} megahertz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName draft="contributed">kilohertz</displayName>
 				<unitPattern count="one">{0} kilohertz</unitPattern>
 				<unitPattern count="other">{0} kilohertz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName draft="contributed">megahertz</displayName>
-				<unitPattern count="one">{0} megahertz</unitPattern>
-				<unitPattern count="other">{0} megahertz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName draft="contributed">hertz</displayName>
+				<unitPattern count="one">{0} hertz</unitPattern>
+				<unitPattern count="other">{0} hertz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName draft="contributed">unidades astronômicas</displayName>
-				<unitPattern count="one" draft="contributed">{0} unidade astronômica</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} unidades astronômicas</unitPattern>
+			<unit type="length-kilometer">
+				<displayName draft="contributed">quilômetros</displayName>
+				<unitPattern count="one">{0} quilômetro</unitPattern>
+				<unitPattern count="other">{0} quilômetros</unitPattern>
+				<perUnitPattern draft="contributed">{0} por quilômetro</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">centímetros</displayName>
-				<unitPattern count="one">{0} centímetro</unitPattern>
-				<unitPattern count="other">{0} centímetros</unitPattern>
+			<unit type="length-meter">
+				<displayName draft="contributed">metros</displayName>
+				<unitPattern count="one">{0} metro</unitPattern>
+				<unitPattern count="other">{0} metros</unitPattern>
+				<perUnitPattern draft="contributed">{0} por metro</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName draft="contributed">decímetros</displayName>
 				<unitPattern count="one" draft="contributed">{0} decímetro</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} decímetros</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName draft="contributed">pés</displayName>
-				<unitPattern count="one">{0} pé</unitPattern>
-				<unitPattern count="other">{0} pés</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="contributed">polegadas</displayName>
-				<unitPattern count="one">{0} polegada</unitPattern>
-				<unitPattern count="other">{0} polegadas</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName draft="contributed">quilômetros</displayName>
-				<unitPattern count="one">{0} quilômetro</unitPattern>
-				<unitPattern count="other">{0} quilômetros</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName draft="contributed">anos-luz</displayName>
-				<unitPattern count="one">{0} ano-luz</unitPattern>
-				<unitPattern count="other">{0} anos-luz</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName draft="contributed">metros</displayName>
-				<unitPattern count="one">{0} metro</unitPattern>
-				<unitPattern count="other">{0} metros</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName draft="contributed">micrômetros</displayName>
-				<unitPattern count="one" draft="contributed">{0} micrômetro</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} micrômetros</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName draft="contributed">milhas</displayName>
-				<unitPattern count="one">{0} milha</unitPattern>
-				<unitPattern count="other">{0} milhas</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="contributed">centímetros</displayName>
+				<unitPattern count="one">{0} centímetro</unitPattern>
+				<unitPattern count="other">{0} centímetros</unitPattern>
+				<perUnitPattern draft="contributed">{0} por centímetro</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="contributed">milímetros</displayName>
 				<unitPattern count="one">{0} milímetro</unitPattern>
 				<unitPattern count="other">{0} milímetros</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName draft="contributed">micrômetros</displayName>
+				<unitPattern count="one" draft="contributed">{0} micrômetro</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} micrômetros</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName draft="contributed">nanômetros</displayName>
 				<unitPattern count="one" draft="contributed">{0} nanômetro</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} nanômetros</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName draft="contributed">milhas náuticas</displayName>
-				<unitPattern count="one" draft="contributed">{0} milha náutica</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} milhas náuticas</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName draft="contributed">parsecs</displayName>
-				<unitPattern count="one">{0} parsec</unitPattern>
-				<unitPattern count="other">{0} parsecs</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName draft="contributed">picômetros</displayName>
 				<unitPattern count="one">{0} picômetro</unitPattern>
 				<unitPattern count="other">{0} picômetros</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="contributed">milhas</displayName>
+				<unitPattern count="one">{0} milha</unitPattern>
+				<unitPattern count="other">{0} milhas</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName draft="contributed">jardas</displayName>
 				<unitPattern count="one">{0} jarda</unitPattern>
 				<unitPattern count="other">{0} jardas</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName draft="contributed">pés</displayName>
+				<unitPattern count="one">{0} pé</unitPattern>
+				<unitPattern count="other">{0} pés</unitPattern>
+				<perUnitPattern draft="contributed">{0} por pé</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="contributed">polegadas</displayName>
+				<unitPattern count="one">{0} polegada</unitPattern>
+				<unitPattern count="other">{0} polegadas</unitPattern>
+				<perUnitPattern draft="contributed">{0} por polegada</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName draft="contributed">parsecs</displayName>
+				<unitPattern count="one">{0} parsec</unitPattern>
+				<unitPattern count="other">{0} parsecs</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="contributed">anos-luz</displayName>
+				<unitPattern count="one">{0} ano-luz</unitPattern>
+				<unitPattern count="other">{0} anos-luz</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName draft="contributed">unidades astronômicas</displayName>
+				<unitPattern count="one" draft="contributed">{0} unidade astronômica</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} unidades astronômicas</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName draft="contributed">milhas náuticas</displayName>
+				<unitPattern count="one" draft="contributed">{0} milha náutica</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} milhas náuticas</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="contributed">milhas escandinavas</displayName>
+				<unitPattern count="one" draft="contributed">{0} milha escandinava</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} milhas escandinavas</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName draft="contributed">lux</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName draft="contributed">quilates</displayName>
-				<unitPattern count="one" draft="contributed">{0} quilate</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} quilates</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName draft="contributed">gramas</displayName>
-				<unitPattern count="one">{0} grama</unitPattern>
-				<unitPattern count="other">{0} gramas</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName draft="contributed">quilogramas</displayName>
-				<unitPattern count="one">{0} quilograma</unitPattern>
-				<unitPattern count="other">{0} quilogramas</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName draft="contributed">toneladas métricas</displayName>
 				<unitPattern count="one" draft="contributed">{0} tonelada métrica</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} toneladas métricas</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName draft="contributed">microgramas</displayName>
-				<unitPattern count="one" draft="contributed">{0} micrograma</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} microgramas</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName draft="contributed">quilogramas</displayName>
+				<unitPattern count="one">{0} quilograma</unitPattern>
+				<unitPattern count="other">{0} quilogramas</unitPattern>
+				<perUnitPattern draft="contributed">{0} por quilograma</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName draft="contributed">gramas</displayName>
+				<unitPattern count="one">{0} grama</unitPattern>
+				<unitPattern count="other">{0} gramas</unitPattern>
+				<perUnitPattern draft="contributed">{0} por grama</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName draft="contributed">miligramas</displayName>
 				<unitPattern count="one" draft="contributed">{0} miligrama</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} miligramas</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="contributed">onças</displayName>
-				<unitPattern count="one">{0} onça</unitPattern>
-				<unitPattern count="other">{0} onças</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName draft="contributed">onças troy</displayName>
-				<unitPattern count="one" draft="contributed">{0} onça troy</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} onças troy</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName draft="contributed">libras</displayName>
-				<unitPattern count="one">{0} libra</unitPattern>
-				<unitPattern count="other">{0} libras</unitPattern>
+			<unit type="mass-microgram">
+				<displayName draft="contributed">microgramas</displayName>
+				<unitPattern count="one" draft="contributed">{0} micrograma</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} microgramas</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName draft="contributed">toneladas</displayName>
 				<unitPattern count="one" draft="contributed">{0} tonelada</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} toneladas</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName draft="contributed">libras</displayName>
+				<unitPattern count="one">{0} libra</unitPattern>
+				<unitPattern count="other">{0} libras</unitPattern>
+				<perUnitPattern draft="contributed">{0} por libra</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName draft="contributed">onças</displayName>
+				<unitPattern count="one">{0} onça</unitPattern>
+				<unitPattern count="other">{0} onças</unitPattern>
+				<perUnitPattern draft="contributed">{0} por onça</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName draft="contributed">onças troy</displayName>
+				<unitPattern count="one" draft="contributed">{0} onça troy</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} onças troy</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName draft="contributed">quilates</displayName>
+				<unitPattern count="one" draft="contributed">{0} quilate</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} quilates</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName draft="contributed">gigawatts</displayName>
 				<unitPattern count="one">{0} gigawatt</unitPattern>
 				<unitPattern count="other">{0} gigawatts</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="contributed">cavalos-vapor</displayName>
-				<unitPattern count="one">{0} cavalo-vapor</unitPattern>
-				<unitPattern count="other">{0} cavalos-vapor</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName draft="contributed">quilowatts</displayName>
-				<unitPattern count="one">{0} quilowatt</unitPattern>
-				<unitPattern count="other">{0} quilowatts</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName draft="contributed">megawatts</displayName>
 				<unitPattern count="one">{0} megawatt</unitPattern>
 				<unitPattern count="other">{0} megawatts</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName draft="contributed">miliwatts</displayName>
-				<unitPattern count="one" draft="contributed">{0} miliwatt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} miliwatts</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName draft="contributed">quilowatts</displayName>
+				<unitPattern count="one">{0} quilowatt</unitPattern>
+				<unitPattern count="other">{0} quilowatts</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName draft="contributed">watts</displayName>
 				<unitPattern count="one">{0} watt</unitPattern>
 				<unitPattern count="other">{0} watts</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName draft="contributed">miliwatts</displayName>
+				<unitPattern count="one">{0} miliwatt</unitPattern>
+				<unitPattern count="other">{0} miliwatts</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName draft="contributed">cavalos-vapor</displayName>
+				<unitPattern count="one">{0} cavalo-vapor</unitPattern>
+				<unitPattern count="other">{0} cavalos-vapor</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="contributed">hectopascais</displayName>
 				<unitPattern count="one">{0} hectopascal</unitPattern>
 				<unitPattern count="other">{0} hectopascais</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName draft="contributed">polegadas de mercúrio</displayName>
-				<unitPattern count="one">{0} polegada de mercúrio</unitPattern>
-				<unitPattern count="other">{0} polegadas de mercúrio</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName draft="contributed">milibares</displayName>
-				<unitPattern count="one">{0} milibar</unitPattern>
-				<unitPattern count="other">{0} milibares</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName draft="contributed">milímetros de mercúrio</displayName>
 				<unitPattern count="one" draft="contributed">{0} milímetro de mercúrio</unitPattern>
@@ -7189,10 +7367,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} psi</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName draft="contributed">kilates</displayName>
-				<unitPattern count="one" draft="contributed">{0} kilate</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kilates</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName draft="contributed">polegadas de mercúrio</displayName>
+				<unitPattern count="one">{0} polegada de mercúrio</unitPattern>
+				<unitPattern count="other">{0} polegadas de mercúrio</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName draft="contributed">milibares</displayName>
+				<unitPattern count="one">{0} milibar</unitPattern>
+				<unitPattern count="other">{0} milibares</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName draft="contributed">quilômetros por hora</displayName>
@@ -7209,13 +7392,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} milha por hora</unitPattern>
 				<unitPattern count="other">{0} milhas por hora</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName draft="contributed">nó</displayName>
+				<unitPattern count="one" draft="contributed">{0} nó</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} nós</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
-				<displayName draft="contributed">graus Celsius</displayName>
+				<displayName>graus Celsius</displayName>
 				<unitPattern count="one">{0} grau Celsius</unitPattern>
 				<unitPattern count="other">{0} graus Celsius</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
-				<displayName draft="contributed">graus Fahrenheit</displayName>
+				<displayName>graus Fahrenheit</displayName>
 				<unitPattern count="one">{0} grau Fahrenheit</unitPattern>
 				<unitPattern count="other">{0} graus Fahrenheit</unitPattern>
 			</unit>
@@ -7224,31 +7417,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kelvin</unitPattern>
 				<unitPattern count="other">{0} kelvins</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName draft="contributed">acre-pés</displayName>
-				<unitPattern count="one" draft="contributed">{0} acre-pé</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} acre-pés</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName draft="contributed">centilitros</displayName>
-				<unitPattern count="one" draft="contributed">{0} centilitro</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} centilitros</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName draft="contributed">centímetros cúbicos</displayName>
-				<unitPattern count="one" draft="contributed">{0} centímetro cúbico</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} centímetros cúbicos</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName draft="contributed">pés cúbicos</displayName>
-				<unitPattern count="one" draft="contributed">{0} pé cúbico</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pés cúbicos</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName draft="contributed">polegadas cúbicas</displayName>
-				<unitPattern count="one" draft="contributed">{0} polegada cúbica</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} polegadas cúbicas</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName draft="contributed">quilômetros cúbicos</displayName>
 				<unitPattern count="one">{0} quilômetro cúbico</unitPattern>
@@ -7258,6 +7426,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName draft="contributed">metros cúbicos</displayName>
 				<unitPattern count="one" draft="contributed">{0} metro cúbico</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} metros cúbicos</unitPattern>
+				<perUnitPattern draft="contributed">{0} por metro cúbico</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName draft="contributed">centímetros cúbicos</displayName>
+				<unitPattern count="one" draft="contributed">{0} centímetro cúbico</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} centímetros cúbicos</unitPattern>
+				<perUnitPattern draft="contributed">{0} por centímetro cúbico</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName draft="contributed">milhas cúbicas</displayName>
@@ -7269,25 +7444,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} jarda cúbica</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} jardas cúbicas</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName draft="contributed">xícaras</displayName>
-				<unitPattern count="one" draft="contributed">{0} xícara</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} xícaras</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName draft="contributed">pés cúbicos</displayName>
+				<unitPattern count="one" draft="contributed">{0} pé cúbico</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} pés cúbicos</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName draft="contributed">decilitros</displayName>
-				<unitPattern count="one" draft="contributed">{0} decilitro</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} decilitros</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName draft="contributed">polegadas cúbicas</displayName>
+				<unitPattern count="one" draft="contributed">{0} polegada cúbica</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} polegadas cúbicas</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName draft="contributed">onças fluidas</displayName>
-				<unitPattern count="one" draft="contributed">{0} onça fluida</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} onças fluidas</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName draft="contributed">galões</displayName>
-				<unitPattern count="one" draft="contributed">{0} galão</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} galões</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName draft="contributed">megalitros</displayName>
+				<unitPattern count="one" draft="contributed">{0} megalitro</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} megalitros</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName draft="contributed">hectolitros</displayName>
@@ -7298,27 +7468,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName draft="contributed">litros</displayName>
 				<unitPattern count="one">{0} litro</unitPattern>
 				<unitPattern count="other">{0} litros</unitPattern>
+				<perUnitPattern draft="contributed">{0} por litro</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName draft="contributed">megalitros</displayName>
-				<unitPattern count="one" draft="contributed">{0} megalitro</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} megalitros</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName draft="contributed">decilitros</displayName>
+				<unitPattern count="one" draft="contributed">{0} decilitro</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} decilitros</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName draft="contributed">centilitros</displayName>
+				<unitPattern count="one" draft="contributed">{0} centilitro</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} centilitros</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName draft="contributed">mililitros</displayName>
 				<unitPattern count="one" draft="contributed">{0} mililitro</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mililitros</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName draft="contributed">pints</displayName>
-				<unitPattern count="one">{0} pint</unitPattern>
-				<unitPattern count="other">{0} pints</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName draft="contributed">pints métricos</displayName>
+				<unitPattern count="one" draft="contributed">{0} pint métrico</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} pints métricos</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName draft="contributed">xícaras métricas</displayName>
+				<unitPattern count="one" draft="contributed">{0} xícara métrica</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} xícaras métricas</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName draft="contributed">acre-pés</displayName>
+				<unitPattern count="one" draft="contributed">{0} acre-pé</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} acre-pés</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName draft="contributed">galões</displayName>
+				<unitPattern count="one" draft="contributed">{0} galão</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} galões</unitPattern>
+				<perUnitPattern draft="contributed">{0} por galão</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName draft="contributed">quartos</displayName>
 				<unitPattern count="one" draft="contributed">{0} quarto</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} quartos</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName draft="contributed">pints</displayName>
+				<unitPattern count="one">{0} pint</unitPattern>
+				<unitPattern count="other">{0} pints</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName draft="contributed">xícaras</displayName>
+				<unitPattern count="one" draft="contributed">{0} xícara</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} xícaras</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName draft="contributed">onças fluidas</displayName>
+				<unitPattern count="one" draft="contributed">{0} onça fluida</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} onças fluidas</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName draft="contributed">colheres de sopa</displayName>
 				<unitPattern count="one" draft="contributed">{0} colher de sopa</unitPattern>
@@ -7329,6 +7536,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} colher de chá</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} colheres de chá</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0}O</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -7344,6 +7557,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} m/s²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName draft="contributed">rev</displayName>
+				<unitPattern count="one" draft="contributed">{0} rev</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName draft="contributed">radianos</displayName>
+				<unitPattern count="one" draft="contributed">{0} rad</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName draft="contributed">graus</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName draft="contributed">arcmins</displayName>
 				<unitPattern count="one">{0} arcmin</unitPattern>
@@ -7354,30 +7582,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} arcseg</unitPattern>
 				<unitPattern count="other">{0} arcsegs</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName draft="contributed">graus</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName draft="contributed">radianos</displayName>
-				<unitPattern count="one" draft="contributed">{0} rad</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="contributed">acres</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName draft="contributed">km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName draft="contributed">hectares</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName draft="contributed">metros²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern draft="contributed">{0} por m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName draft="contributed">cm²</displayName>
 				<unitPattern count="one" draft="contributed">{0} cm²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} cm²</unitPattern>
+				<perUnitPattern draft="contributed">{0} por cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName draft="contributed">milhas²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName draft="contributed">acres</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName draft="contributed">jardas²</displayName>
+				<unitPattern count="one" draft="contributed">{0} yd²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName draft="contributed">pés²</displayName>
@@ -7388,91 +7628,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName draft="contributed">polegadas²</displayName>
 				<unitPattern count="one" draft="contributed">{0} pol²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} pol²</unitPattern>
+				<perUnitPattern draft="contributed">{0} por pol²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="contributed">km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName draft="contributed">metros²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName draft="contributed">milhas²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName draft="contributed">jardas²</displayName>
-				<unitPattern count="one" draft="contributed">{0} yd²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName draft="contributed">kilates</displayName>
+				<unitPattern count="one" draft="contributed">{0} k</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} k</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName draft="contributed">litros/km</displayName>
 				<unitPattern count="one" draft="contributed">{0} l/km</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName draft="contributed">l/100 km</displayName>
+				<unitPattern count="one" draft="contributed">{0} l/100 km</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} l/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName draft="contributed">milhas/gal</displayName>
 				<unitPattern count="one" draft="contributed">{0} mpg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName draft="contributed">bit</displayName>
-				<unitPattern count="one" draft="contributed">{0} bit</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName draft="contributed">byte</displayName>
-				<unitPattern count="one" draft="contributed">{0} byte</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName draft="contributed">Gbit</displayName>
-				<unitPattern count="one" draft="contributed">{0} Gb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName draft="contributed">GByte</displayName>
-				<unitPattern count="one" draft="contributed">{0} GB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName draft="contributed">kbit</displayName>
-				<unitPattern count="one" draft="contributed">{0} kb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName draft="contributed">kByte</displayName>
-				<unitPattern count="one" draft="contributed">{0} kB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName draft="contributed">Mbit</displayName>
-				<unitPattern count="one" draft="contributed">{0} Mb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName draft="contributed">MByte</displayName>
-				<unitPattern count="one" draft="contributed">{0} MB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName draft="contributed">Tbit</displayName>
-				<unitPattern count="one" draft="contributed">{0} Tb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName draft="contributed">TByte</displayName>
 				<unitPattern count="one" draft="contributed">{0} TB</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName draft="contributed">Tbit</displayName>
+				<unitPattern count="one" draft="contributed">{0} Tb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName draft="contributed">GByte</displayName>
+				<unitPattern count="one" draft="contributed">{0} GB</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName draft="contributed">Gbit</displayName>
+				<unitPattern count="one" draft="contributed">{0} Gb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName draft="contributed">MByte</displayName>
+				<unitPattern count="one" draft="contributed">{0} MB</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName draft="contributed">Mbit</displayName>
+				<unitPattern count="one" draft="contributed">{0} Mb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName draft="contributed">kByte</displayName>
+				<unitPattern count="one" draft="contributed">{0} kB</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName draft="contributed">kbit</displayName>
+				<unitPattern count="one" draft="contributed">{0} kb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName draft="contributed">byte</displayName>
+				<unitPattern count="one" draft="contributed">{0} byte</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName draft="contributed">bit</displayName>
+				<unitPattern count="one" draft="contributed">{0} bit</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="contributed">séc.</displayName>
+				<unitPattern count="one" draft="contributed">{0} séc.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} sécs.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="contributed">anos</displayName>
+				<unitPattern count="one" draft="contributed">{0} ano</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} anos</unitPattern>
+				<perUnitPattern draft="contributed">{0}/ano</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">meses</displayName>
+				<unitPattern count="one" draft="contributed">{0} mês</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} meses</unitPattern>
+				<perUnitPattern draft="contributed">{0}/mês</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="contributed">semanas</displayName>
+				<unitPattern count="one" draft="contributed">{0} sem.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} sem.</unitPattern>
+				<perUnitPattern draft="contributed">{0}/sem.</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="contributed">dias</displayName>
 				<unitPattern count="one" draft="contributed">{0} dia</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} dias</unitPattern>
+				<perUnitPattern draft="contributed">{0}/dia</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName draft="contributed">horas</displayName>
@@ -7480,30 +7735,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other" draft="contributed">{0} h</unitPattern>
 				<perUnitPattern draft="contributed">{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName draft="contributed">μs</displayName>
-				<unitPattern count="one" draft="contributed">{0} μs</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="contributed">milissegundos</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="contributed">mins</displayName>
 				<unitPattern count="one" draft="contributed">{0} min</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">meses</displayName>
-				<unitPattern count="one" draft="contributed">{0} mês</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} meses</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName draft="contributed">ns</displayName>
-				<unitPattern count="one" draft="contributed">{0} ns</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ns</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName draft="contributed">segs</displayName>
@@ -7511,18 +7747,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other" draft="contributed">{0} seg</unitPattern>
 				<perUnitPattern draft="contributed">{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">semanas</displayName>
-				<unitPattern count="one" draft="contributed">{0} sem.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} sem.</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="contributed">milissegundos</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">anos</displayName>
-				<unitPattern count="one" draft="contributed">{0} ano</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} anos</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName draft="contributed">μs</displayName>
+				<unitPattern count="one" draft="contributed">{0} μs</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName draft="contributed">ns</displayName>
+				<unitPattern count="one" draft="contributed">{0} ns</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
-				<displayName draft="contributed">amps</displayName>
+				<displayName>amps</displayName>
 				<unitPattern count="one" draft="contributed">{0} A</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} A</unitPattern>
 			</unit>
@@ -7541,6 +7782,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} V</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName draft="contributed">kcal</displayName>
+				<unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName draft="contributed">cal</displayName>
 				<unitPattern count="one" draft="contributed">{0} cal</unitPattern>
@@ -7551,21 +7797,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} Cal</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName draft="contributed">joules</displayName>
-				<unitPattern count="one" draft="contributed">{0} J</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName draft="contributed">kcal</displayName>
-				<unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName draft="contributed">quilojoule</displayName>
 				<unitPattern count="one" draft="contributed">{0} kJ</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName draft="contributed">joules</displayName>
+				<unitPattern count="one" draft="contributed">{0} J</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName draft="contributed">kW-hora</displayName>
 				<unitPattern count="one" draft="contributed">{0} kWh</unitPattern>
@@ -7576,201 +7817,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} GHz</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName draft="contributed">Hz</displayName>
-				<unitPattern count="one" draft="contributed">{0} Hz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName draft="contributed">MHz</displayName>
+				<unitPattern count="one" draft="contributed">{0} MHz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName draft="contributed">kHz</displayName>
 				<unitPattern count="one" draft="contributed">{0} kHz</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName draft="contributed">MHz</displayName>
-				<unitPattern count="one" draft="contributed">{0} MHz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName draft="contributed">Hz</displayName>
+				<unitPattern count="one" draft="contributed">{0} Hz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName draft="contributed">ua</displayName>
-				<unitPattern count="one" draft="contributed">{0} ua</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ua</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName draft="contributed">metros</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName draft="contributed">dm</displayName>
 				<unitPattern count="one" draft="contributed">{0} dm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName draft="contributed">pés</displayName>
-				<unitPattern count="one">{0} pé</unitPattern>
-				<unitPattern count="other">{0} pés</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="contributed">pol.</displayName>
-				<unitPattern count="one">{0} pol.</unitPattern>
-				<unitPattern count="other">{0} pol.</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName draft="contributed">km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName draft="contributed">anos-luz</displayName>
-				<unitPattern count="one">{0} ano-luz</unitPattern>
-				<unitPattern count="other">{0} anos-luz</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName draft="contributed">metros</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName draft="contributed">µm</displayName>
-				<unitPattern count="one" draft="contributed">{0} µm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName draft="contributed">milhas</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="contributed">cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="contributed">mm</displayName>
 				<unitPattern count="one">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName draft="contributed">µm</displayName>
+				<unitPattern count="one" draft="contributed">{0} µm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName draft="contributed">nm</displayName>
 				<unitPattern count="one" draft="contributed">{0} nm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName draft="contributed">mn</displayName>
-				<unitPattern count="one" draft="contributed">{0} mn</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mn</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName draft="contributed">parsecs</displayName>
-				<unitPattern count="one" draft="contributed">{0} pc</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName draft="contributed">pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="contributed">milhas</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName draft="contributed">jardas</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName draft="contributed">pés</displayName>
+				<unitPattern count="one">{0} pé</unitPattern>
+				<unitPattern count="other">{0} pés</unitPattern>
+				<perUnitPattern draft="contributed">{0}/pé</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="contributed">pol.</displayName>
+				<unitPattern count="one">{0} pol.</unitPattern>
+				<unitPattern count="other">{0} pol.</unitPattern>
+				<perUnitPattern draft="contributed">{0}/pol.</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName draft="contributed">parsecs</displayName>
+				<unitPattern count="one" draft="contributed">{0} pc</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="contributed">anos-luz</displayName>
+				<unitPattern count="one">{0} ano-luz</unitPattern>
+				<unitPattern count="other">{0} anos-luz</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName draft="contributed">ua</displayName>
+				<unitPattern count="one" draft="contributed">{0} ua</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ua</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName draft="contributed">mn</displayName>
+				<unitPattern count="one" draft="contributed">{0} mn</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mn</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="contributed">smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName draft="contributed">lux</displayName>
 				<unitPattern count="one" draft="contributed">{0} lx</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName draft="contributed">quilates</displayName>
-				<unitPattern count="one" draft="contributed">{0} ql</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ql</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName draft="contributed">gramas</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName draft="contributed">kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName draft="contributed">t</displayName>
 				<unitPattern count="one" draft="contributed">{0} t</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName draft="contributed">µg</displayName>
-				<unitPattern count="one" draft="contributed">{0} µg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName draft="contributed">gramas</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName draft="contributed">mg</displayName>
 				<unitPattern count="one" draft="contributed">{0} mg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="contributed">oz</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName draft="contributed">oz troy</displayName>
-				<unitPattern count="one" draft="contributed">{0} oz t</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName draft="contributed">libras</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
+			<unit type="mass-microgram">
+				<displayName draft="contributed">µg</displayName>
+				<unitPattern count="one" draft="contributed">{0} µg</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName draft="contributed">toneladas</displayName>
 				<unitPattern count="one" draft="contributed">{0} tn</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName draft="contributed">libras</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName draft="contributed">oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName draft="contributed">oz troy</displayName>
+				<unitPattern count="one" draft="contributed">{0} oz t</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName draft="contributed">quilates</displayName>
+				<unitPattern count="one" draft="contributed">{0} ql</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ql</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName draft="contributed">GW</displayName>
 				<unitPattern count="one" draft="contributed">{0} GW</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="contributed">cv</displayName>
-				<unitPattern count="one">{0} cv</unitPattern>
-				<unitPattern count="other">{0} cv</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName draft="contributed">kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName draft="contributed">MW</displayName>
 				<unitPattern count="one" draft="contributed">{0} MW</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName draft="contributed">mW</displayName>
-				<unitPattern count="one" draft="contributed">{0} mW</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName draft="contributed">kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName draft="contributed">watts</displayName>
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName draft="contributed">mW</displayName>
+				<unitPattern count="one" draft="contributed">{0} mW</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName draft="contributed">cv</displayName>
+				<unitPattern count="one">{0} cv</unitPattern>
+				<unitPattern count="other">{0} cv</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="contributed">hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName draft="contributed">pol Hg</displayName>
-				<unitPattern count="one">{0} pol Hg</unitPattern>
-				<unitPattern count="other">{0} pol Hg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName draft="contributed">mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName draft="contributed">mm Hg</displayName>
 				<unitPattern count="one" draft="contributed">{0} mm Hg</unitPattern>
@@ -7781,10 +8026,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} psi</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName draft="contributed">kilates</displayName>
-				<unitPattern count="one" draft="contributed">{0} k</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} k</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName draft="contributed">pol Hg</displayName>
+				<unitPattern count="one">{0} pol Hg</unitPattern>
+				<unitPattern count="other">{0} pol Hg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName draft="contributed">mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName draft="contributed">km/h</displayName>
@@ -7801,13 +8051,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mph</unitPattern>
 				<unitPattern count="other">{0} mph</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName draft="contributed">nó</displayName>
+				<unitPattern count="one" draft="contributed">{0} nó</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} nós</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
-				<displayName draft="contributed">graus C</displayName>
+				<displayName>graus C</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
 				<unitPattern count="other">{0}°C</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
-				<displayName draft="contributed">graus F</displayName>
+				<displayName>graus F</displayName>
 				<unitPattern count="one">{0} °F</unitPattern>
 				<unitPattern count="other">{0} °F</unitPattern>
 			</unit>
@@ -7816,31 +8076,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName draft="contributed">acre-pés</displayName>
-				<unitPattern count="one" draft="contributed">{0} acre-pé</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} acre-pés</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName draft="contributed">cl</displayName>
-				<unitPattern count="one" draft="contributed">{0} cl</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName draft="contributed">cm³</displayName>
-				<unitPattern count="one" draft="contributed">{0} cm³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName draft="contributed">pés³</displayName>
-				<unitPattern count="one" draft="contributed">{0} ft³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName draft="contributed">polegadas³</displayName>
-				<unitPattern count="one" draft="contributed">{0} pol³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pol³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName draft="contributed">km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -7850,6 +8085,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName draft="contributed">m³</displayName>
 				<unitPattern count="one" draft="contributed">{0} m³</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName draft="contributed">cm³</displayName>
+				<unitPattern count="one" draft="contributed">{0} cm³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName draft="contributed">mi³</displayName>
@@ -7861,25 +8103,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} yd³</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName draft="contributed">xícaras</displayName>
-				<unitPattern count="one" draft="contributed">{0} xíc.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} xíc.</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName draft="contributed">pés³</displayName>
+				<unitPattern count="one" draft="contributed">{0} ft³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName draft="contributed">dl</displayName>
-				<unitPattern count="one" draft="contributed">{0} dl</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName draft="contributed">polegadas³</displayName>
+				<unitPattern count="one" draft="contributed">{0} pol³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} pol³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName draft="contributed">fl oz</displayName>
-				<unitPattern count="one" draft="contributed">{0} fl oz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName draft="contributed">gal</displayName>
-				<unitPattern count="one" draft="contributed">{0} gal</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName draft="contributed">ML</displayName>
+				<unitPattern count="one" draft="contributed">{0} ML</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName draft="contributed">hl</displayName>
@@ -7890,27 +8127,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName draft="contributed">litros</displayName>
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName draft="contributed">ML</displayName>
-				<unitPattern count="one" draft="contributed">{0} ML</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName draft="contributed">dl</displayName>
+				<unitPattern count="one" draft="contributed">{0} dl</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName draft="contributed">cl</displayName>
+				<unitPattern count="one" draft="contributed">{0} cl</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName draft="contributed">ml</displayName>
 				<unitPattern count="one" draft="contributed">{0} ml</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName draft="contributed">pints</displayName>
-				<unitPattern count="one" draft="contributed">{0} pt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName draft="contributed">ptm</displayName>
+				<unitPattern count="one" draft="contributed">{0} ptm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ptm</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName draft="contributed">xícm</displayName>
+				<unitPattern count="one" draft="contributed">{0} xícm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} xícm</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName draft="contributed">acre-pés</displayName>
+				<unitPattern count="one" draft="contributed">{0} acre-pé</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} acre-pés</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName draft="contributed">gal</displayName>
+				<unitPattern count="one" draft="contributed">{0} gal</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName draft="contributed">qts</displayName>
 				<unitPattern count="one" draft="contributed">{0} qt</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName draft="contributed">pints</displayName>
+				<unitPattern count="one" draft="contributed">{0} pt</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName draft="contributed">xícaras</displayName>
+				<unitPattern count="one" draft="contributed">{0} xíc.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} xíc.</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName draft="contributed">fl oz</displayName>
+				<unitPattern count="one" draft="contributed">{0} fl oz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName draft="contributed">CS</displayName>
 				<unitPattern count="one" draft="contributed">{0} CS</unitPattern>
@@ -7921,6 +8195,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} cc</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} cc</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0}O</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -7930,6 +8210,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} G</unitPattern>
 				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}'</unitPattern>
 				<unitPattern count="other">{0}'</unitPattern>
@@ -7938,26 +8222,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}&quot;</unitPattern>
 				<unitPattern count="other">{0}&quot;</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} acre</unitPattern>
-				<unitPattern count="other">{0} acres</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} m²</unitPattern>
 				<unitPattern count="other">{0} m²</unitPattern>
@@ -7966,6 +8238,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} acre</unitPattern>
+				<unitPattern count="other">{0} acres</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName draft="contributed">l/100 km</displayName>
+				<unitPattern count="one" draft="contributed">{0} l/100 km</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} l/100 km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="contributed">ano</displayName>
+				<unitPattern count="one">{0} ano</unitPattern>
+				<unitPattern count="other">{0} anos</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">mês</displayName>
+				<unitPattern count="one">{0} mês</unitPattern>
+				<unitPattern count="other">{0} meses</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="contributed">sem.</displayName>
+				<unitPattern count="one">{0} sem.</unitPattern>
+				<unitPattern count="other">{0} sem.</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="contributed">dia</displayName>
 				<unitPattern count="one">{0} dia</unitPattern>
@@ -7976,66 +8276,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} h</unitPattern>
 				<unitPattern count="other">{0} h</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="contributed">ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="contributed">min</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">mês</displayName>
-				<unitPattern count="one">{0} mês</unitPattern>
-				<unitPattern count="other">{0} meses</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="contributed">seg</displayName>
 				<unitPattern count="one">{0} s</unitPattern>
 				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">sem.</displayName>
-				<unitPattern count="one">{0} sem.</unitPattern>
-				<unitPattern count="other">{0} sem.</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">ano</displayName>
-				<unitPattern count="one">{0} ano</unitPattern>
-				<unitPattern count="other">{0} anos</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0} pé</unitPattern>
-				<unitPattern count="other">{0} pés</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0}″</unitPattern>
-				<unitPattern count="other">{0}″</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="contributed">ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="contributed">km</displayName>
 				<unitPattern count="one">{0} km</unitPattern>
 				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} ano-luz</unitPattern>
-				<unitPattern count="other">{0} anos-luz</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName draft="contributed">metro</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} milha</unitPattern>
-				<unitPattern count="other">{0} milhas</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="contributed">cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="contributed">mm</displayName>
@@ -8046,31 +8315,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} milha</unitPattern>
+				<unitPattern count="other">{0} milhas</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="contributed">grama</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} pé</unitPattern>
+				<unitPattern count="other">{0} pés</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} ano-luz</unitPattern>
+				<unitPattern count="other">{0} anos-luz</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="contributed">kg</displayName>
 				<unitPattern count="one">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
+			<unit type="mass-gram">
+				<displayName draft="contributed">grama</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} lb</unitPattern>
 				<unitPattern count="other">{0} lb</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} cv</unitPattern>
-				<unitPattern count="other">{0} cv</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} kW</unitPattern>
@@ -8080,6 +8361,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} cv</unitPattern>
+				<unitPattern count="other">{0} cv</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
@@ -8106,11 +8391,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
-				<displayName draft="contributed">°C</displayName>
+				<displayName>°C</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
 				<unitPattern count="other">{0}°C</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
+				<displayName>°F</displayName>
 				<unitPattern count="one">{0}°F</unitPattern>
 				<unitPattern count="other">{0}°F</unitPattern>
 			</unit>
@@ -8127,6 +8413,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0}O</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_AO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_AO.xml
similarity index 88%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_AO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_AO.xml
index de4a634d7ea..3f72317679c 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_AO.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_AO.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="pt"/>
 		<territory type="AO"/>
 	</identity>
@@ -51,3 +50,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_BR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_BR.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_BR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_BR.xml
index 40ddf183fd6..07e2a10e50c 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_BR.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_BR.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="pt"/>
 		<territory type="BR"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_CH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_CH.xml
new file mode 100644
index 00000000000..029c170c60d
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_CH.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12400 $"/>
+		<language type="pt"/>
+		<territory type="CH"/>
+	</identity>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_CV.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_CV.xml
similarity index 89%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_CV.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_CV.xml
index cd50de6ca46..69244a3721b 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_CV.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_CV.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10708 $"/>
-		<generation date="$Date: 2014-07-31 16:08:50 -0500 (Thu, 31 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="pt"/>
 		<territory type="CV"/>
 	</identity>
@@ -58,3 +57,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_GQ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_GQ.xml
new file mode 100644
index 00000000000..c1d7dc8b085
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_GQ.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12400 $"/>
+		<language type="pt"/>
+		<territory type="GQ"/>
+	</identity>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_GW.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_GW.xml
similarity index 87%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_GW.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_GW.xml
index 6c47069ca5c..386dabb4855 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_GW.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_GW.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="pt"/>
 		<territory type="GW"/>
 	</identity>
@@ -44,3 +43,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</timeZoneNames>
 	</dates>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_LU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_LU.xml
new file mode 100644
index 00000000000..4dd9506258e
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_LU.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12400 $"/>
+		<language type="pt"/>
+		<territory type="LU"/>
+	</identity>
+	<numbers>
+		<currencies>
+			<currency type="LUF">
+				<symbol>F</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_MO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_MO.xml
similarity index 62%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_MO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_MO.xml
index f6332ac2e6d..983eda752d4 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_MO.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_MO.xml
@@ -1,17 +1,42 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="pt"/>
 		<territory type="MO"/>
 	</identity>
 	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>h:mm:ss a zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>h:mm:ss a z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>h:mm:ss a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>h:mm a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
 		<timeZoneNames>
 			<metazone type="Azores">
 				<short>
@@ -51,3 +76,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_MZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_MZ.xml
similarity index 88%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_MZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_MZ.xml
index 10ed51331c4..7f6246ba940 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_MZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_MZ.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="pt"/>
 		<territory type="MZ"/>
 	</identity>
@@ -51,3 +50,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_PT.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_PT.xml
similarity index 83%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_PT.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_PT.xml
index 91d69f38873..23d9b2f5914 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_PT.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_PT.xml
@@ -6,20 +6,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 12413 $"/>
 		<language type="pt"/>
 		<territory type="PT"/>
 	</identity>
 	<localeDisplayNames>
 		<languages>
 			<language type="af">africânder</language>
+			<language type="ar_001" draft="contributed">árabe moderno padrão</language>
 			<language type="arn">mapuche</language>
+			<language type="az_Arab" draft="contributed">azeri meridional</language>
 			<language type="bax" draft="contributed">bamun</language>
 			<language type="bbj" draft="contributed">ghomala</language>
 			<language type="chn" draft="contributed">jargão chinook</language>
 			<language type="ckb">sorani curdo</language>
 			<language type="cs">checo</language>
+			<language type="cv" draft="contributed">chuvash</language>
 			<language type="dsb">baixo sórabio</language>
 			<language type="ee">ewe</language>
 			<language type="egy">egípcio clássico</language>
@@ -44,18 +46,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="kn">canarim</language>
 			<language type="lez" draft="contributed">lezghiano</language>
 			<language type="lg">ganda</language>
+			<language type="lrc" draft="contributed">luri do norte</language>
 			<language type="luo">luo</language>
 			<language type="mga">irlandês, medieval</language>
 			<language type="mk">macedónio</language>
+			<language type="moh">mohawk</language>
 			<language type="nb">norueguês bokmål</language>
+			<language type="nds" draft="contributed">baixo-alemão</language>
 			<language type="nn">norueguês nynorsk</language>
 			<language type="oc" draft="contributed">provençal</language>
 			<language type="os" draft="contributed">ossético</language>
 			<language type="pl">polaco</language>
 			<language type="ps">pastó</language>
 			<language type="rom" draft="contributed">romanês</language>
+			<language type="root" draft="contributed">root</language>
+			<language type="rw">kinyarwanda</language>
 			<language type="sah" draft="contributed">sakha</language>
 			<language type="shu" draft="contributed">árabe do Chade</language>
+			<language type="smj">lule sami</language>
+			<language type="smn">inari sami</language>
+			<language type="sms">skolt sami</language>
 			<language type="tk">turcomano</language>
 			<language type="tl" draft="provisional">tagalogue</language>
 			<language type="to">tonga</language>
@@ -88,44 +98,60 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="154">Europa do Norte</territory>
 			<territory type="AI">Anguila</territory>
 			<territory type="AM">Arménia</territory>
+			<territory type="AX">Alanda</territory>
+			<territory type="BD">Bangladeche</territory>
 			<territory type="BH">Barém</territory>
 			<territory type="BJ">Benim</territory>
+			<territory type="BS">Baamas</territory>
+			<territory type="CC">Ilhas dos Cocos (Keeling)</territory>
 			<territory type="CD">Congo-Kinshasa</territory>
 			<territory type="CG">Congo-Brazzaville</territory>
 			<territory type="CG" alt="variant">República do Congo</territory>
 			<territory type="CM">Camarões</territory>
 			<territory type="CW">Curaçau</territory>
+			<territory type="CX">Ilha do Natal</territory>
 			<territory type="CZ">República Checa</territory>
+			<territory type="DJ">Jibuti</territory>
 			<territory type="DM">Domínica</territory>
 			<territory type="EE">Estónia</territory>
 			<territory type="FK">Ilhas Falkland</territory>
 			<territory type="FK" alt="variant">Ilhas Malvinas</territory>
 			<territory type="FO">Ilhas Faroé</territory>
+			<territory type="GB" alt="short">GB</territory>
 			<territory type="GL">Gronelândia</territory>
 			<territory type="GU">Guame</territory>
 			<territory type="IR">Irão</territory>
 			<territory type="KE">Quénia</territory>
+			<territory type="KN">São Cristóvão e Neves</territory>
 			<territory type="KY">Ilhas Caimão</territory>
+			<territory type="LI">Listenstaine</territory>
+			<territory type="LK">Sri Lanca</territory>
 			<territory type="LV">Letónia</territory>
 			<territory type="MC">Mónaco</territory>
 			<territory type="MG">Madagáscar</territory>
 			<territory type="MK">Macedónia</territory>
-			<territory type="MK" alt="variant">Antiga República Jugoslava da Macedónia</territory>
+			<territory type="MK" alt="variant">Macedónia (ARJM)</territory>
 			<territory type="MS">Monserrate</territory>
 			<territory type="MU">Maurícia</territory>
+			<territory type="MW">Maláui</territory>
 			<territory type="NC">Nova Caledónia</territory>
+			<territory type="NL">Países Baixos</territory>
 			<territory type="PL">Polónia</territory>
-			<territory type="PN">Pitcairn</territory>
+			<territory type="PM">São Pedro e Miquelão</territory>
 			<territory type="PS">Territórios palestinianos</territory>
 			<territory type="QO">Oceânia Insular</territory>
 			<territory type="RO">Roménia</territory>
 			<territory type="SC">Seicheles</territory>
 			<territory type="SG">Singapura</territory>
 			<territory type="SI">Eslovénia</territory>
-			<territory type="SM">São Marino</territory>
+			<territory type="SM">São Marinho</territory>
+			<territory type="SV">Salvador</territory>
+			<territory type="TC">Ilhas Turcas e Caicos</territory>
 			<territory type="TK">Toquelau</territory>
 			<territory type="TM">Turquemenistão</territory>
 			<territory type="TT">Trindade e Tobago</territory>
+			<territory type="UM">Ilhas Menores Afastadas dos EUA</territory>
+			<territory type="UZ">Usbequistão</territory>
 			<territory type="VN">Vietname</territory>
 			<territory type="YE">Iémen</territory>
 			<territory type="YT">Maiote</territory>
@@ -147,81 +173,87 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNormalization" draft="contributed">Ordenação normalizada</key>
 			<key type="colNumeric" draft="contributed">Ordenação numérica</key>
 			<key type="colStrength" draft="contributed">Força da ordenação</key>
+			<key type="hc" draft="contributed">Ciclo horário (12 vs. 24)</key>
+			<key type="ms" draft="contributed">Sistema de medida</key>
 			<key type="variableTop" draft="contributed">Ordenar como símbolos</key>
 			<key type="x" draft="contributed">Utilização privada</key>
 		</keys>
 		<types>
-			<type type="armn" key="numbers">Numeração arménia</type>
-			<type type="armnlow" key="numbers">Numeração arménia minúscula</type>
-			<type type="beng" key="numbers">Algarismos bengalis</type>
-			<type type="buddhist" key="calendar">Calendário budista</type>
-			<type type="chinese" key="calendar">Calendário chinês</type>
-			<type type="coptic" key="calendar" draft="contributed">Calendário copta</type>
-			<type type="dangi" key="calendar">Calendário dangi</type>
-			<type type="deva" key="numbers">Algarismos devanágaris</type>
-			<type type="dictionary" key="collation" draft="contributed">Ordenação do dicionário</type>
-			<type type="ducet" key="collation">Ordenação unicode predefinida</type>
-			<type type="ethi" key="numbers">Numeração etíope</type>
-			<type type="ethiopic" key="calendar">Calendário etíope</type>
-			<type type="ethiopic-amete-alem" key="calendar" draft="contributed">Calendário Etíope Amete Alem</type>
-			<type type="finance" key="numbers" draft="contributed">Algarismos financeiros</type>
-			<type type="fullwide" key="numbers">Algarismos de largura completa</type>
-			<type type="geor" key="numbers">Numeração georgiana</type>
-			<type type="gregorian" key="calendar">Calendário gregoriano</type>
-			<type type="grek" key="numbers">Numeração grega</type>
-			<type type="greklow" key="numbers">Numeração grega minúscula</type>
-			<type type="gujr" key="numbers">Algarismos de guzerate</type>
-			<type type="guru" key="numbers">Algarismos de gurmukhi</type>
-			<type type="hanidec" key="numbers">Numeração decimal chinesa</type>
-			<type type="hans" key="numbers">Numeração em chinês simplificado</type>
-			<type type="hansfin" key="numbers">Numeração financeira em chinês simplificado</type>
-			<type type="hant" key="numbers">Numeração em chinês tradicional</type>
-			<type type="hantfin" key="numbers">Numeração financeira em chinês tradicional</type>
-			<type type="hebr" key="numbers">Numeração hebraica</type>
-			<type type="hebrew" key="calendar">Calendário hebraico</type>
-			<type type="identical" key="colStrength" draft="contributed">Ordenar tudo</type>
-			<type type="islamic" key="calendar">Calendário islâmico</type>
-			<type type="japanese" key="calendar">Calendário japonês</type>
-			<type type="jpan" key="numbers">Numeração japonesa</type>
-			<type type="jpanfin" key="numbers">Numeração financeira japonesa</type>
-			<type type="khmr" key="numbers">Algarismos de cmer</type>
-			<type type="knda" key="numbers">Algarismos de canarim</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">Ordenar por minúsculas</type>
-			<type type="mlym" key="numbers">Algarismos de malaiala</type>
-			<type type="mymr" key="numbers">Algarismos birmaneses</type>
-			<type type="no" key="colBackwards" draft="contributed">Ordenar acentos normalmente</type>
-			<type type="no" key="colCaseFirst" draft="contributed">Ordenar disposição de tipo de letra normal</type>
-			<type type="no" key="colCaseLevel" draft="contributed">Ordenar insensível a maiúsculas/minúsculas</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">Ordenar kana separadamente</type>
-			<type type="no" key="colNormalization" draft="contributed">Ordenar sem normalização</type>
-			<type type="no" key="colNumeric" draft="contributed">Ordenar dígitos individualmente</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">Ordenar símbolos</type>
-			<type type="orya" key="numbers">Algarismos de oriya</type>
-			<type type="persian" key="calendar">Calendário persa</type>
-			<type type="phonebook" key="collation">Ordem da lista telefónica</type>
-			<type type="phonetic" key="collation" draft="contributed">Sequência de ordenação fonética</type>
-			<type type="primary" key="colStrength" draft="contributed">Ordenar apenas letras básicas</type>
-			<type type="quaternary" key="colStrength" draft="contributed">Ordenar acentos/tipo de letra/largura/kana</type>
-			<type type="reformed" key="collation" draft="contributed">Reforma da ordenação</type>
-			<type type="roman" key="numbers">Numeração romana</type>
-			<type type="romanlow" key="numbers">Numeração romana minúscula</type>
-			<type type="secondary" key="colStrength" draft="contributed">Ordenar acentos</type>
-			<type type="shifted" key="colAlternate" draft="contributed">Ordenar símbolos ignorados</type>
-			<type type="standard" key="collation">Ordenação padrão</type>
-			<type type="stroke" key="collation">Ordem por traços</type>
-			<type type="taml" key="numbers">Numeração tâmil</type>
-			<type type="tamldec" key="numbers">Algarismos de tâmil</type>
-			<type type="telu" key="numbers">Algarismos de telugu</type>
-			<type type="tertiary" key="colStrength" draft="contributed">Ordenar acentos/tipo de letra/largura</type>
-			<type type="traditional" key="collation" draft="contributed">Ordem tradicional</type>
-			<type type="traditional" key="numbers" draft="contributed">Algarismos tradicionais</type>
-			<type type="unihan" key="collation">Ordem por radical e traços</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">Ordenar por maiúsculas</type>
-			<type type="yes" key="colBackwards" draft="contributed">Ordenar acentos inversamente</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">Ordenar sensível a maiúsculas/minúsculas</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">Ordenar kana diferentemente</type>
-			<type type="yes" key="colNormalization" draft="contributed">Ordenar Unicode normalizado</type>
-			<type type="yes" key="colNumeric" draft="contributed">Ordenar dígitos numericamente</type>
+			<type key="calendar" type="buddhist">Calendário budista</type>
+			<type key="calendar" type="chinese">Calendário chinês</type>
+			<type key="calendar" type="coptic" draft="contributed">Calendário copta</type>
+			<type key="calendar" type="dangi">Calendário dangi</type>
+			<type key="calendar" type="ethiopic-amete-alem" draft="contributed">Calendário Etíope Amete Alem</type>
+			<type key="calendar" type="gregorian">Calendário gregoriano</type>
+			<type key="calendar" type="hebrew">Calendário hebraico</type>
+			<type key="calendar" type="islamic">Calendário islâmico</type>
+			<type key="calendar" type="japanese">Calendário japonês</type>
+			<type key="calendar" type="persian">Calendário persa</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">Ordenar símbolos</type>
+			<type key="colAlternate" type="shifted" draft="contributed">Ordenar símbolos ignorados</type>
+			<type key="colBackwards" type="no" draft="contributed">Ordenar acentos normalmente</type>
+			<type key="colBackwards" type="yes" draft="contributed">Ordenar acentos inversamente</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">Ordenar por minúsculas</type>
+			<type key="colCaseFirst" type="no" draft="contributed">Ordenar disposição de tipo de letra normal</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">Ordenar por maiúsculas</type>
+			<type key="colCaseLevel" type="no" draft="contributed">Ordenar insensível a maiúsculas/minúsculas</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">Ordenar sensível a maiúsculas/minúsculas</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">Ordenar kana separadamente</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">Ordenar kana diferentemente</type>
+			<type key="collation" type="dictionary" draft="contributed">Ordenação do dicionário</type>
+			<type key="collation" type="ducet">Ordenação unicode predefinida</type>
+			<type key="collation" type="phonebook">Ordem da lista telefónica</type>
+			<type key="collation" type="phonetic" draft="contributed">Sequência de ordenação fonética</type>
+			<type key="collation" type="reformed" draft="contributed">Reforma da ordenação</type>
+			<type key="collation" type="standard">Ordenação padrão</type>
+			<type key="collation" type="stroke">Ordem por traços</type>
+			<type key="collation" type="traditional" draft="contributed">Ordem tradicional</type>
+			<type key="collation" type="unihan">Ordem por radical e traços</type>
+			<type key="colNormalization" type="no" draft="contributed">Ordenar sem normalização</type>
+			<type key="colNormalization" type="yes" draft="contributed">Ordenar Unicode normalizado</type>
+			<type key="colNumeric" type="no" draft="contributed">Ordenar dígitos individualmente</type>
+			<type key="colNumeric" type="yes" draft="contributed">Ordenar dígitos numericamente</type>
+			<type key="colStrength" type="identical" draft="contributed">Ordenar tudo</type>
+			<type key="colStrength" type="primary" draft="contributed">Ordenar apenas letras básicas</type>
+			<type key="colStrength" type="quaternary" draft="contributed">Ordenar acentos/tipo de letra/largura/kana</type>
+			<type key="colStrength" type="secondary" draft="contributed">Ordenar acentos</type>
+			<type key="colStrength" type="tertiary" draft="contributed">Ordenar acentos/tipo de letra/largura</type>
+			<type key="lb" type="loose" draft="contributed">Estilo solto de quebra de linha</type>
+			<type key="lb" type="normal" draft="contributed">Estilo padrão de quebra de linha</type>
+			<type key="lb" type="strict" draft="contributed">Estilo estrito de quebra de linha</type>
+			<type key="ms" type="uksystem" draft="contributed">Sistema de medida imperial</type>
+			<type key="ms" type="ussystem" draft="contributed">Sistema de medida americano</type>
+			<type key="numbers" type="armn">Numeração arménia</type>
+			<type key="numbers" type="armnlow">Numeração arménia minúscula</type>
+			<type key="numbers" type="beng">Algarismos bengalis</type>
+			<type key="numbers" type="deva">Algarismos devanágaris</type>
+			<type key="numbers" type="ethi">Numeração etíope</type>
+			<type key="numbers" type="finance" draft="contributed">Algarismos financeiros</type>
+			<type key="numbers" type="fullwide">Algarismos de largura completa</type>
+			<type key="numbers" type="geor">Numeração georgiana</type>
+			<type key="numbers" type="grek">Numeração grega</type>
+			<type key="numbers" type="greklow">Numeração grega minúscula</type>
+			<type key="numbers" type="gujr">Algarismos de guzerate</type>
+			<type key="numbers" type="guru">Algarismos de gurmukhi</type>
+			<type key="numbers" type="hanidec">Numeração decimal chinesa</type>
+			<type key="numbers" type="hans">Numeração em chinês simplificado</type>
+			<type key="numbers" type="hansfin">Numeração financeira em chinês simplificado</type>
+			<type key="numbers" type="hant">Numeração em chinês tradicional</type>
+			<type key="numbers" type="hantfin">Numeração financeira em chinês tradicional</type>
+			<type key="numbers" type="hebr">Numeração hebraica</type>
+			<type key="numbers" type="jpan">Numeração japonesa</type>
+			<type key="numbers" type="jpanfin">Numeração financeira japonesa</type>
+			<type key="numbers" type="khmr">Algarismos de cmer</type>
+			<type key="numbers" type="knda">Algarismos de canarim</type>
+			<type key="numbers" type="mlym">Algarismos de malaiala</type>
+			<type key="numbers" type="mymr">Algarismos birmaneses</type>
+			<type key="numbers" type="orya">Algarismos de oriya</type>
+			<type key="numbers" type="roman">Numeração romana</type>
+			<type key="numbers" type="romanlow">Numeração romana minúscula</type>
+			<type key="numbers" type="taml">Numeração tâmil</type>
+			<type key="numbers" type="tamldec">Algarismos de tâmil</type>
+			<type key="numbers" type="telu">Algarismos de telugu</type>
+			<type key="numbers" type="traditional" draft="contributed">Algarismos tradicionais</type>
 		</types>
 		<transformNames>
 			<transformName type="x-Accents" draft="contributed">Acentos</transformName>
@@ -303,11 +335,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</calendar>
 			<calendar type="generic">
 				<dateFormats>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d 'de' MMM, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
 							<pattern>d/M/y G</pattern>
@@ -336,15 +363,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="MMMMd">d 'de' MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E, d 'de' MMMM</dateFormatItem>
 						<dateFormatItem id="yyyyMMM">MM/y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">d/MM/y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E, d/MM/y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEEEEd">EEEE, d/MM/y</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM 'de' y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMMd">d 'de' MMMM 'de' y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMMEd">E, d 'de' MMMM 'de' y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">QQQQ 'de' y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">QQQQ 'de' y G</dateFormatItem>
 					</availableFormats>
@@ -356,25 +378,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<intervalFormatItem id="hm">
 							<greatestDifference id="h">h:mm – h:mm a</greatestDifference>
 						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M" draft="contributed">MM–MM</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
 							<greatestDifference id="M">MMM–MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d 'de' MMM – E, d 'de' MMM</greatestDifference>
+							<greatestDifference id="d">ccc, dd/MM – ccc, dd/MM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">ccc, dd/MM – ccc, dd/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMMEd">
+							<greatestDifference id="d">ccc, d 'de' MMMM – ccc, d 'de' MMMM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">ccc, d 'de' MMMM – ccc, d 'de' MMMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
 							<greatestDifference id="y">y–y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d 'de' MMM – E, d 'de' MMM 'de' y G</greatestDifference>
+							<greatestDifference id="d">E, dd/MM – E, dd/MM/y G</greatestDifference>
+							<greatestDifference id="M">E, dd/MM – E, dd/MM/y G</greatestDifference>
+							<greatestDifference id="y">E, dd/MM/y – E, dd/MM/y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
 							<greatestDifference id="M">MMMM – MMMM 'de' y G</greatestDifference>
 						</intervalFormatItem>
+						<intervalFormatItem id="yMMMMEd">
+							<greatestDifference id="d">E, d 'de' MMMM – E, d 'de' MMMM 'de' y G</greatestDifference>
+							<greatestDifference id="M" draft="contributed">E, d 'de' MMMM – E, d 'de' MMMM 'de' y G</greatestDifference>
+							<greatestDifference id="y" draft="contributed">E, d 'de' MMMM 'de' y – E, d 'de' MMMM 'de' y G</greatestDifference>
+						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="gregorian">
+				<days>
+					<dayContext type="format">
+						<dayWidth type="abbreviated">
+							<day type="sun" draft="contributed">domingo</day>
+							<day type="mon" draft="contributed">segunda</day>
+							<day type="tue" draft="contributed">terça</day>
+							<day type="wed" draft="contributed">quarta</day>
+							<day type="thu" draft="contributed">quinta</day>
+							<day type="fri" draft="contributed">sexta</day>
+							<day type="sat" draft="contributed">sábado</day>
+						</dayWidth>
+					</dayContext>
+					<dayContext type="stand-alone">
+						<dayWidth type="abbreviated">
+							<day type="sun" draft="contributed">domingo</day>
+							<day type="mon" draft="contributed">segunda</day>
+							<day type="tue" draft="contributed">terça</day>
+							<day type="wed" draft="contributed">quarta</day>
+							<day type="thu" draft="contributed">quinta</day>
+							<day type="fri" draft="contributed">sexta</day>
+							<day type="sat" draft="contributed">sábado</day>
+						</dayWidth>
+					</dayContext>
+				</days>
 				<quarters>
 					<quarterContext type="format">
 						<quarterWidth type="wide">
@@ -400,9 +461,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<dayPeriod type="pm" draft="contributed">p.m.</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">meia-noite</dayPeriod>
 							<dayPeriod type="am">a.m.</dayPeriod>
-							<dayPeriod type="noon">m.d.</dayPeriod>
+							<dayPeriod type="noon">meio-dia</dayPeriod>
 							<dayPeriod type="pm">p.m.</dayPeriod>
+							<dayPeriod type="morning1">manhã</dayPeriod>
+							<dayPeriod type="afternoon1">tarde</dayPeriod>
+							<dayPeriod type="evening1">noite</dayPeriod>
+							<dayPeriod type="night1">madrugada</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">da manhã</dayPeriod>
@@ -414,18 +480,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<dayPeriod type="am">a.m.</dayPeriod>
 							<dayPeriod type="pm">p.m.</dayPeriod>
 						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">a.m.</dayPeriod>
+							<dayPeriod type="pm">p.m.</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="am" draft="contributed">a.m.</dayPeriod>
-							<dayPeriod type="pm" draft="contributed">p.m.</dayPeriod>
+							<dayPeriod type="am">manhã</dayPeriod>
+							<dayPeriod type="pm">tarde</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
-					<eraNames>
-						<era type="0">antes de Cristo</era>
-						<era type="0" alt="variant">antes da Era Comum</era>
-						<era type="1">depois de Cristo</era>
-					</eraNames>
 					<eraAbbr>
 						<era type="0" alt="variant">a.E.C.</era>
 						<era type="1" alt="variant">E.C.</era>
@@ -460,17 +525,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="Md">dd/MM</dateFormatItem>
 						<dateFormatItem id="MMMd">d/MM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, d/MM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d 'de' MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E, d 'de' MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMEd">ccc, d 'de' MMMM</dateFormatItem>
 						<dateFormatItem id="yMMM">MM/y</dateFormatItem>
 						<dateFormatItem id="yMMMd">d/MM/y</dateFormatItem>
 						<dateFormatItem id="yMMMEd">E, d/MM/y</dateFormatItem>
 						<dateFormatItem id="yMMMEEEEd">EEEE, d/MM/y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM 'de' y</dateFormatItem>
-						<dateFormatItem id="yMMMMd">d 'de' MMMM 'de' y</dateFormatItem>
-						<dateFormatItem id="yMMMMEd">E, d 'de' MMMM 'de' y</dateFormatItem>
+						<dateFormatItem id="yMMMMEd">ccc, d 'de' MMMM 'de' y</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQQ 'de' y</dateFormatItem>
 						<dateFormatItem id="yQQQQ">QQQQ 'de' y</dateFormatItem>
 					</availableFormats>
@@ -485,9 +548,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<intervalFormatItem id="H">
 							<greatestDifference id="H">HH–HH</greatestDifference>
 						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="h" draft="contributed">h–h a v</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
 						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d" draft="contributed">ccc, dd/MM – ccc, dd/MM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">ccc, dd/MM – ccc, dd/MM</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
 							<greatestDifference id="M">MMM–MMM</greatestDifference>
 						</intervalFormatItem>
@@ -495,11 +565,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="d">d–d 'de' MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d 'de' MMM – E, d 'de' MMM</greatestDifference>
+							<greatestDifference id="d">ccc, dd/MM – ccc, dd/MM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">ccc, dd/MM – ccc, dd/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMMEd">
+							<greatestDifference id="d">ccc, d 'de' MMMM – ccc, d 'de' MMMM</greatestDifference>
+							<greatestDifference id="M" draft="contributed">ccc, d 'de' MMMM – ccc, d 'de' MMMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
 							<greatestDifference id="y">y–y</greatestDifference>
 						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d" draft="contributed">ccc, dd/MM/y – ccc, dd/MM/y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">ccc, dd/MM/y – ccc, dd/MM/y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">ccc, dd/MM/y – ccc, dd/MM/y</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
 							<greatestDifference id="M">MMM–MMM 'de' y</greatestDifference>
 						</intervalFormatItem>
@@ -507,7 +587,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="d">d–d 'de' MMM 'de' y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d 'de' MMM – E, d 'de' MMM 'de' y</greatestDifference>
+							<greatestDifference id="d">E, dd/MM – E, dd/MM/y</greatestDifference>
+							<greatestDifference id="M">E, dd/MM – E, dd/MM/y</greatestDifference>
+							<greatestDifference id="y">E, dd/MM/y – E, dd/MM/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMMEd">
+							<greatestDifference id="d">E, d 'de' MMMM – E, d 'de' MMMM 'de' y</greatestDifference>
+							<greatestDifference id="M">E, d 'de' MMMM – E, d 'de' MMMM 'de' y</greatestDifference>
+							<greatestDifference id="y">E, d 'de' MMMM 'de' y – E, d 'de' MMMM 'de' y</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -555,32 +642,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="one">dentro de {0} ano</relativeTimePattern>
 					<relativeTimePattern count="other">dentro de {0} anos</relativeTimePattern>
 				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">há {0} ano</relativeTimePattern>
-					<relativeTimePattern count="other">há {0} anos</relativeTimePattern>
-				</relativeTime>
 			</field>
 			<field type="year-short">
 				<relativeTime type="future">
 					<relativeTimePattern count="one">dentro de {0} ano</relativeTimePattern>
 					<relativeTimePattern count="other">dentro de {0} anos</relativeTimePattern>
 				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">há {0} ano</relativeTimePattern>
-					<relativeTimePattern count="other">há {0} anos</relativeTimePattern>
-				</relativeTime>
 			</field>
 			<field type="quarter">
+				<relative type="-1" draft="contributed">trimestre passado</relative>
+				<relative type="0" draft="contributed">este trimestre</relative>
+				<relative type="1" draft="contributed">próximo trimestre</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">dentro de {0} trimestre</relativeTimePattern>
 					<relativeTimePattern count="other">dentro de {0} trimestres</relativeTimePattern>
 				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">há {0} trimestre</relativeTimePattern>
-					<relativeTimePattern count="other">há {0} trimestres</relativeTimePattern>
-				</relativeTime>
 			</field>
 			<field type="quarter-short">
+				<relative type="-1" draft="contributed">trim. passado</relative>
+				<relative type="0" draft="contributed">este trim.</relative>
+				<relative type="1" draft="contributed">próximo trim.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">dentro de {0} trim.</relativeTimePattern>
 					<relativeTimePattern count="other">dentro de {0} trim.</relativeTimePattern>
@@ -591,6 +672,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="quarter-narrow">
+				<relative type="-1" draft="contributed">trim. passado</relative>
+				<relative type="0" draft="contributed">este trim.</relative>
+				<relative type="1" draft="contributed">próximo trim.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} trim.</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} trim.</relativeTimePattern>
@@ -605,97 +689,84 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="one">dentro de {0} mês</relativeTimePattern>
 					<relativeTimePattern count="other">dentro de {0} meses</relativeTimePattern>
 				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">há {0} mês</relativeTimePattern>
-					<relativeTimePattern count="other">há {0} meses</relativeTimePattern>
-				</relativeTime>
 			</field>
 			<field type="month-short">
 				<relativeTime type="future">
 					<relativeTimePattern count="one">dentro de {0} mês</relativeTimePattern>
 					<relativeTimePattern count="other">dentro de {0} meses</relativeTimePattern>
 				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">há {0} mês</relativeTimePattern>
-					<relativeTimePattern count="other">há {0} meses</relativeTimePattern>
-				</relativeTime>
 			</field>
 			<field type="week">
 				<relativeTime type="future">
 					<relativeTimePattern count="one">dentro de {0} semana</relativeTimePattern>
 					<relativeTimePattern count="other">dentro de {0} semanas</relativeTimePattern>
 				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">há {0} semana</relativeTimePattern>
-					<relativeTimePattern count="other">há {0} semanas</relativeTimePattern>
-				</relativeTime>
 			</field>
 			<field type="week-short">
 				<relativeTime type="future">
 					<relativeTimePattern count="one">dentro de {0} sem.</relativeTimePattern>
 					<relativeTimePattern count="other">dentro de {0} sem.</relativeTimePattern>
 				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">há {0} sem.</relativeTimePattern>
-					<relativeTimePattern count="other">há {0} sem.</relativeTimePattern>
-				</relativeTime>
 			</field>
 			<field type="day">
 				<relativeTime type="future">
 					<relativeTimePattern count="one">dentro de {0} dia</relativeTimePattern>
 					<relativeTimePattern count="other">dentro de {0} dias</relativeTimePattern>
 				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">há {0} dia</relativeTimePattern>
-					<relativeTimePattern count="other">há {0} dias</relativeTimePattern>
-				</relativeTime>
 			</field>
 			<field type="day-short">
 				<relativeTime type="future">
 					<relativeTimePattern count="one">dentro de {0} dia</relativeTimePattern>
 					<relativeTimePattern count="other">dentro de {0} dias</relativeTimePattern>
 				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">há {0} dia</relativeTimePattern>
-					<relativeTimePattern count="other">há {0} dias</relativeTimePattern>
-				</relativeTime>
+			</field>
+			<field type="mon-short">
+				<relative type="-1">segunda passada</relative>
+				<relative type="0">esta segunda</relative>
+				<relative type="1">próxima segunda</relative>
+			</field>
+			<field type="tue-short">
+				<relative type="-1">terça passada</relative>
+				<relative type="0">esta terça</relative>
+				<relative type="1">próxima terça</relative>
+			</field>
+			<field type="wed-short">
+				<relative type="-1">quarta passada</relative>
+				<relative type="0">esta quarta</relative>
+				<relative type="1">próxima quarta</relative>
 			</field>
 			<field type="thu-short">
-				<relative type="1">próxima qui.</relative>
+				<relative type="-1">quinta passada</relative>
+				<relative type="0">esta quinta</relative>
+				<relative type="1">próxima quinta</relative>
 			</field>
 			<field type="thu-narrow">
+				<relative type="-1">qui. passada</relative>
+				<relative type="0">esta qui.</relative>
 				<relative type="1">próxima qui.</relative>
 			</field>
+			<field type="fri-short">
+				<relative type="-1">sexta passada</relative>
+				<relative type="0">esta sexta</relative>
+				<relative type="1">próxima sexta</relative>
+			</field>
 			<field type="hour">
 				<relativeTime type="future">
 					<relativeTimePattern count="one">dentro de {0} hora</relativeTimePattern>
 					<relativeTimePattern count="other">dentro de {0} horas</relativeTimePattern>
 				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">há {0} hora</relativeTimePattern>
-					<relativeTimePattern count="other">há {0} horas</relativeTimePattern>
-				</relativeTime>
 			</field>
 			<field type="hour-short">
-				<displayName>h</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">dentro de {0} h</relativeTimePattern>
 					<relativeTimePattern count="other">dentro de {0} h</relativeTimePattern>
 				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">há {0} h</relativeTimePattern>
-					<relativeTimePattern count="other">há {0} h</relativeTimePattern>
-				</relativeTime>
 			</field>
 			<field type="minute">
 				<relativeTime type="future">
 					<relativeTimePattern count="one">dentro de {0} minuto</relativeTimePattern>
 					<relativeTimePattern count="other">dentro de {0} minutos</relativeTimePattern>
 				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">há {0} minuto</relativeTimePattern>
-					<relativeTimePattern count="other">há {0} minutos</relativeTimePattern>
-				</relativeTime>
 			</field>
 			<field type="minute-short">
 				<displayName>min</displayName>
@@ -724,10 +795,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="one">dentro de {0} segundo</relativeTimePattern>
 					<relativeTimePattern count="other">dentro de {0} segundos</relativeTimePattern>
 				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">há {0} segundo</relativeTimePattern>
-					<relativeTimePattern count="other">há {0} segundos</relativeTimePattern>
-				</relativeTime>
 			</field>
 			<field type="second-short">
 				<displayName>s</displayName>
@@ -891,7 +958,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Singapura</exemplarCity>
 			</zone>
 			<zone type="Europe/San_Marino">
-				<exemplarCity>São Marino</exemplarCity>
+				<exemplarCity>São Marinho</exemplarCity>
 			</zone>
 			<zone type="Asia/Bangkok">
 				<exemplarCity>Banguecoque</exemplarCity>
@@ -1004,7 +1071,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
-					<generic>Hora da Montanha</generic>
+					<generic>Hora de Montanha</generic>
 					<standard>Hora padrão da Montanha</standard>
 					<daylight>Hora de verão da Montanha</daylight>
 				</long>
@@ -1023,6 +1090,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<daylight>Hora de verão de Anadyr</daylight>
 				</long>
 			</metazone>
+			<metazone type="Apia">
+				<long>
+					<generic draft="contributed">Hora de Apia</generic>
+					<standard draft="contributed">Hora padrão de Apia</standard>
+					<daylight draft="contributed">Hora de verão de Apia</daylight>
+				</long>
+			</metazone>
 			<metazone type="Aqtau">
 				<long>
 					<generic>Hora de Aqtau</generic>
@@ -1906,6 +1980,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</timeZoneNames>
 	</dates>
 	<numbers>
+		<minimumGroupingDigits>2</minimumGroupingDigits>
 		<symbols numberSystem="latn">
 			<group> </group>
 		</symbols>
@@ -1940,12 +2015,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern type="10000000" count="other">00 M</pattern>
 					<pattern type="100000000" count="one">000 M</pattern>
 					<pattern type="100000000" count="other">000 M</pattern>
-					<pattern type="1000000000" count="one">0 MM</pattern>
-					<pattern type="1000000000" count="other">0 MM</pattern>
-					<pattern type="10000000000" count="one">00 MM</pattern>
-					<pattern type="10000000000" count="other">00 MM</pattern>
-					<pattern type="100000000000" count="one">000 MM</pattern>
-					<pattern type="100000000000" count="other">000 MM</pattern>
+					<pattern type="1000000000" count="one">0 mM</pattern>
+					<pattern type="1000000000" count="other">0 mM</pattern>
+					<pattern type="10000000000" count="one">00 mM</pattern>
+					<pattern type="10000000000" count="other">00 mM</pattern>
+					<pattern type="100000000000" count="one">000 mM</pattern>
+					<pattern type="100000000000" count="other">000 mM</pattern>
 					<pattern type="1000000000000" count="one">0 Bi</pattern>
 					<pattern type="1000000000000" count="other">0 Bi</pattern>
 					<pattern type="10000000000000" count="one">00 Bi</pattern>
@@ -1964,6 +2039,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000000" count="one" draft="contributed">¤0 M</pattern>
+					<pattern type="1000000" count="other" draft="contributed">¤0 M</pattern>
+					<pattern type="10000000" count="one" draft="contributed">¤00 M</pattern>
+					<pattern type="10000000" count="other" draft="contributed">¤00 M</pattern>
+					<pattern type="100000000" count="one" draft="contributed">¤000 M</pattern>
+					<pattern type="100000000" count="other" draft="contributed">¤000 M</pattern>
+					<pattern type="1000000000" count="one" draft="contributed">¤0 mM</pattern>
+					<pattern type="1000000000" count="other" draft="contributed">¤0 mM</pattern>
+					<pattern type="10000000000" count="one" draft="contributed">¤00 mM</pattern>
+					<pattern type="10000000000" count="other" draft="contributed">¤00 mM</pattern>
+					<pattern type="100000000000" count="one" draft="contributed">¤000 mM</pattern>
+					<pattern type="100000000000" count="other" draft="contributed">¤000 mM</pattern>
+					<pattern type="1000000000000" count="one" draft="contributed">¤0 B</pattern>
+					<pattern type="1000000000000" count="other" draft="contributed">¤0 B</pattern>
+					<pattern type="10000000000000" count="one" draft="contributed">¤00 B</pattern>
+					<pattern type="10000000000000" count="other" draft="contributed">¤00 B</pattern>
+					<pattern type="100000000000000" count="one" draft="contributed">¤000 B</pattern>
+					<pattern type="100000000000000" count="other" draft="contributed">¤000 B</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -2079,6 +2176,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Libra das Ilhas Falkland</displayName>
 				<displayName count="other">Libras das Ilhas Falkland</displayName>
 			</currency>
+			<currency type="GBP">
+				<displayName>Libra esterlina britânica</displayName>
+				<displayName count="one">Libra esterlina britânica</displayName>
+				<displayName count="other">Libras esterlinas britânicas</displayName>
+			</currency>
 			<currency type="GHC">
 				<displayName draft="unconfirmed">Cedi do Gana</displayName>
 			</currency>
@@ -2420,11 +2522,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} quilómetro quadrado</unitPattern>
 				<unitPattern count="other">{0} quilómetros quadrados</unitPattern>
 			</unit>
+			<unit type="concentr-karat">
+				<displayName>quilates</displayName>
+				<unitPattern count="one">{0} quilate</unitPattern>
+				<unitPattern count="other">{0} quilates</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litros por quilómetro</displayName>
 				<unitPattern count="one">{0} litro por quilómetro</unitPattern>
 				<unitPattern count="other">{0} litros por quilómetro</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName draft="contributed">litros por 100 quilómetros</displayName>
+				<unitPattern count="one" draft="contributed">{0} litro por 100 quilómetros</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} litros por 100 quilómetros</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<unitPattern count="one">{0} século</unitPattern>
+				<unitPattern count="other">{0} séculos</unitPattern>
+			</unit>
 			<unit type="duration-hour">
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
@@ -2436,15 +2552,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} quilocaloria</unitPattern>
 				<unitPattern count="other">{0} quilocalorias</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>unidades astronómicas</displayName>
-				<unitPattern count="one">{0} unidade astronómica</unitPattern>
-				<unitPattern count="other">{0} unidades astronómicas</unitPattern>
-			</unit>
 			<unit type="length-kilometer">
 				<displayName>quilómetros</displayName>
 				<unitPattern count="one">{0} quilómetro</unitPattern>
 				<unitPattern count="other">{0} quilómetros</unitPattern>
+				<perUnitPattern draft="contributed">{0} por quilómetro</perUnitPattern>
 			</unit>
 			<unit type="length-micrometer">
 				<displayName>micrómetros</displayName>
@@ -2461,10 +2573,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} picómetro</unitPattern>
 				<unitPattern count="other">{0} picómetros</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>quilates</displayName>
-				<unitPattern count="one">{0} quilate</unitPattern>
-				<unitPattern count="other">{0} quilates</unitPattern>
+			<unit type="length-astronomical-unit">
+				<displayName>unidades astronómicas</displayName>
+				<unitPattern count="one">{0} unidade astronómica</unitPattern>
+				<unitPattern count="other">{0} unidades astronómicas</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="contributed">milha escandinava</displayName>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>quilómetros por hora</displayName>
@@ -2476,6 +2591,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} quilómetro cúbico</unitPattern>
 				<unitPattern count="other">{0} quilómetros cúbicos</unitPattern>
 			</unit>
+			<unit type="volume-cup">
+				<displayName>chávenas</displayName>
+				<unitPattern count="one">{0} chávena</unitPattern>
+				<unitPattern count="other">{0} chávenas</unitPattern>
+			</unit>
 		</unitLength>
 		<unitLength type="short">
 			<unit type="acceleration-g-force">
@@ -2490,10 +2610,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="angle-arc-second">
 				<displayName>segundos de arco</displayName>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<perUnitPattern draft="contributed">{0}/m²</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<perUnitPattern draft="contributed">{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+			</unit>
 			<unit type="area-acre">
 				<unitPattern count="one">{0} acre</unitPattern>
 				<unitPattern count="other">{0} acres</unitPattern>
 			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+			</unit>
 			<unit type="area-square-foot">
 				<displayName>pés quadrados</displayName>
 			</unit>
@@ -2501,15 +2634,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>in²</displayName>
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern draft="contributed">{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
+			<unit type="concentr-karat">
+				<displayName>quilates</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName draft="contributed">l/100km</displayName>
+				<unitPattern count="one" draft="contributed">{0} l/100km</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} l/100km</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>milhas/galão</displayName>
@@ -2518,6 +2653,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>minutos</displayName>
 			</unit>
 			<unit type="duration-second">
+				<displayName draft="contributed">s</displayName>
 				<unitPattern count="one">{0} s</unitPattern>
 				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
@@ -2526,29 +2662,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kcal</unitPattern>
 				<unitPattern count="other">{0} kcal</unitPattern>
 			</unit>
-			<unit type="length-inch">
-				<displayName>polegadas</displayName>
-			</unit>
 			<unit type="length-mile">
 				<unitPattern count="one">{0} milha</unitPattern>
 				<unitPattern count="other">{0} milhas</unitPattern>
 			</unit>
+			<unit type="length-inch">
+				<displayName>polegadas</displayName>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+			</unit>
 			<unit type="length-nautical-mile">
 				<displayName>nmi</displayName>
 				<unitPattern count="one">{0} nmi</unitPattern>
 				<unitPattern count="other">{0} nmi</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
+			<unit type="mass-ton">
+				<unitPattern count="one">{0} ton</unitPattern>
+				<unitPattern count="other">{0} ton</unitPattern>
 			</unit>
 			<unit type="mass-carat">
 				<unitPattern count="one">{0} ct</unitPattern>
 				<unitPattern count="other">{0} ct</unitPattern>
 			</unit>
-			<unit type="mass-ton">
-				<unitPattern count="one">{0} ton</unitPattern>
-				<unitPattern count="other">{0} ton</unitPattern>
-			</unit>
 			<unit type="pressure-inch-hg">
 				<displayName>in Hg</displayName>
 				<unitPattern count="one">{0} inHg</unitPattern>
@@ -2558,11 +2694,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mb</unitPattern>
 				<unitPattern count="other">{0} mb</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>quilates</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
-			</unit>
 			<unit type="speed-meter-per-second">
 				<displayName>m/s</displayName>
 			</unit>
@@ -2579,15 +2710,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="temperature-fahrenheit">
 				<displayName>graus Fahrenheit</displayName>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cL</displayName>
-				<unitPattern count="one">{0} cL</unitPattern>
-				<unitPattern count="other">{0} cL</unitPattern>
+			<unit type="volume-cubic-yard">
+				<displayName>yd³</displayName>
 			</unit>
 			<unit type="volume-cubic-foot">
 				<displayName>ft³</displayName>
@@ -2597,8 +2721,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} in³</unitPattern>
 				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-cubic-yard">
-				<displayName>yd³</displayName>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>chávenas</displayName>
+				<unitPattern count="one">{0} cháv.</unitPattern>
+				<unitPattern count="other">{0} cháv.</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>cs</displayName>
@@ -2607,6 +2738,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 		</unitLength>
 		<unitLength type="narrow">
+			<unit type="consumption-liter-per-100kilometers">
+				<unitPattern count="one" draft="contributed">{0}l/100km</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}l/100km</unitPattern>
+			</unit>
 			<unit type="duration-second">
 				<displayName>s</displayName>
 			</unit>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_ST.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_ST.xml
similarity index 88%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_ST.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_ST.xml
index 3d64240d809..1d73e5c7f13 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_ST.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_ST.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="pt"/>
 		<territory type="ST"/>
 	</identity>
@@ -51,3 +50,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_TL.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_TL.xml
similarity index 87%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_TL.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_TL.xml
index 851e8aa43fa..07ddd4b67ae 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/pt_TL.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_TL.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="pt"/>
 		<territory type="TL"/>
 	</identity>
@@ -44,3 +43,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</timeZoneNames>
 	</dates>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/qu.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu.xml
similarity index 89%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/qu.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu.xml
index b29a9844705..1c151e37e60 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/qu.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10671 $"/>
-		<generation date="$Date: 2014-07-23 17:52:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="qu"/>
 	</identity>
 	<localeDisplayNames>
@@ -155,7 +154,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BD">Bangladesh</territory>
 			<territory type="BE">Bélgica</territory>
 			<territory type="BG">Bulgaria</territory>
-			<territory type="BH">Bahréin</territory>
+			<territory type="BH">Baréin</territory>
 			<territory type="BI">Burundi</territory>
 			<territory type="BJ">Benín</territory>
 			<territory type="BN">Brunéi</territory>
@@ -170,7 +169,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CD">Congo (RDC)</territory>
 			<territory type="CG">Congo</territory>
 			<territory type="CH">Suiza</territory>
-			<territory type="CI">Côte dʼIvoire</territory>
+			<territory type="CI">Côte d’Ivoire</territory>
 			<territory type="CL">Chile</territory>
 			<territory type="CM">Camerún</territory>
 			<territory type="CN">China</territory>
@@ -197,7 +196,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="FR">Francia</territory>
 			<territory type="GA">Gabón</territory>
 			<territory type="GB">Reino Unido</territory>
-			<territory type="GG">Guernsey</territory>
+			<territory type="GG">Guernesey</territory>
 			<territory type="GH">Ghana</territory>
 			<territory type="GM">Gambia</territory>
 			<territory type="GN">Guinea</territory>
@@ -205,7 +204,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GR">Grecia</territory>
 			<territory type="GT">Guatemala</territory>
 			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinea-Bissau</territory>
+			<territory type="GW">Guinea-Bisáu</territory>
 			<territory type="GY">Guyana</territory>
 			<territory type="HK">Hong Kong (RAE)</territory>
 			<territory type="HM">Islas Heard y McDonald</territory>
@@ -215,7 +214,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ID">Indonesia</territory>
 			<territory type="IL">Israel</territory>
 			<territory type="IN">India</territory>
-			<territory type="IQ">Iraq</territory>
+			<territory type="IQ">Irak</territory>
 			<territory type="IR">Irán</territory>
 			<territory type="IS">Islandia</territory>
 			<territory type="IT">Italia</territory>
@@ -230,7 +229,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="KP">Corea del Norte</territory>
 			<territory type="KR">Corea del Sur</territory>
 			<territory type="KW">Kuwait</territory>
-			<territory type="KZ">Kazajistan</territory>
+			<territory type="KZ">Kazajistán</territory>
 			<territory type="LA">Laos</territory>
 			<territory type="LB">Líbano</territory>
 			<territory type="LI">Liechtenstein</territory>
@@ -306,7 +305,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="SY">Siria</territory>
 			<territory type="SZ">Suazilandia</territory>
 			<territory type="TD">Chad</territory>
-			<territory type="TF">Tierras Australes y Antárticas Francesas</territory>
+			<territory type="TF">Territorios Australes Franceses</territory>
 			<territory type="TG">Togo</territory>
 			<territory type="TH">Tailandia</territory>
 			<territory type="TJ">Tayikistán</territory>
@@ -326,7 +325,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="VI">EE.UU. Islas Vírgenes</territory>
 			<territory type="VN">Vietnam</territory>
 			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis, Futuna</territory>
+			<territory type="WF">Wallis y Futuna</territory>
 			<territory type="WS">Samoa</territory>
 			<territory type="YE">Yemen</territory>
 			<territory type="ZA">Sudáfrica</territory>
@@ -418,6 +417,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</days>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">a.m.</dayPeriod>
+							<dayPeriod type="pm">p.m.</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">a.m.</dayPeriod>
 							<dayPeriod type="pm">p.m.</dayPeriod>
@@ -445,14 +448,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateFormatLength>
 				</dateFormats>
 				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>hh:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>hh:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -464,6 +477,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</dateTimeFormats>
 			</calendar>
 		</calendars>
+		<timeZoneNames>
+			<metazone type="Peru">
+				<short>
+					<generic>PET</generic>
+					<standard>PET</standard>
+					<daylight>PEST</daylight>
+				</short>
+			</metazone>
+		</timeZoneNames>
 	</dates>
 	<numbers>
 		<symbols numberSystem="latn">
@@ -505,6 +527,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤ #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="PEN">
@@ -513,3 +551,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/qu_BO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu_BO.xml
similarity index 60%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/qu_BO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu_BO.xml
index 8224b361801..92860482e6d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/qu_BO.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu_BO.xml
@@ -1,16 +1,31 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10671 $"/>
-		<generation date="$Date: 2014-07-23 17:52:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="qu"/>
 		<territory type="BO"/>
 	</identity>
+	<dates>
+		<timeZoneNames>
+			<metazone type="Bolivia">
+				<short>
+					<standard>BOT</standard>
+				</short>
+			</metazone>
+			<metazone type="Peru">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+		</timeZoneNames>
+	</dates>
 	<numbers>
 		<symbols numberSystem="latn">
 			<decimal>,</decimal>
@@ -26,3 +41,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/qu_EC.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu_EC.xml
similarity index 56%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/qu_EC.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu_EC.xml
index 1047a9f0597..802094795cd 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/qu_EC.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu_EC.xml
@@ -1,16 +1,31 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10671 $"/>
-		<generation date="$Date: 2014-07-23 17:52:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="qu"/>
 		<territory type="EC"/>
 	</identity>
+	<dates>
+		<timeZoneNames>
+			<metazone type="Ecuador">
+				<short>
+					<standard>ECT</standard>
+				</short>
+			</metazone>
+			<metazone type="Peru">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+		</timeZoneNames>
+	</dates>
 	<numbers>
 		<currencies>
 			<currency type="PEN">
@@ -22,3 +37,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/qu_PE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu_PE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/qu_PE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu_PE.xml
index e7b6797e53a..f0c8bef809e 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/qu_PE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu_PE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10671 $"/>
-		<generation date="$Date: 2014-07-23 17:52:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="qu"/>
 		<territory type="PE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rm.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rm.xml
similarity index 97%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rm.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rm.xml
index fc40a5d51fd..bdd0a3f8746 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rm.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rm.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="rm"/>
 	</identity>
 	<localeDisplayNames>
@@ -626,7 +625,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI" draft="contributed">Anguilla</territory>
 			<territory type="AL" draft="contributed">Albania</territory>
 			<territory type="AM" draft="contributed">Armenia</territory>
-			<territory type="AN" draft="contributed">Antillas Ollandaisas</territory>
 			<territory type="AO" draft="contributed">Angola</territory>
 			<territory type="AQ" draft="contributed">Antarctica</territory>
 			<territory type="AR" draft="contributed">Argentinia</territory>
@@ -906,32 +904,32 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="numbers" draft="unconfirmed">dumbers</key>
 		</keys>
 		<types>
-			<type type="armn" key="numbers" draft="unconfirmed">dumbers armens</type>
-			<type type="beng" key="numbers" draft="unconfirmed">cifras bengalas</type>
-			<type type="big5han" key="collation" draft="contributed">chinaisa tradiziunala - Big5</type>
-			<type type="buddhist" key="calendar" draft="contributed">chalender budistic</type>
-			<type type="chinese" key="calendar" draft="contributed">chalender chinais</type>
-			<type type="coptic" key="calendar" draft="unconfirmed">chalender coptic</type>
-			<type type="ethiopic" key="calendar" draft="unconfirmed">chalender etiopic</type>
-			<type type="gb2312han" key="collation" draft="contributed">chinaisa simplifitgada - GB2312</type>
-			<type type="geor" key="numbers" draft="unconfirmed">dumbers georgians</type>
-			<type type="gregorian" key="calendar" draft="contributed">chalender gregorian</type>
-			<type type="hebrew" key="calendar" draft="contributed">chalender ebraic</type>
-			<type type="indian" key="calendar" draft="contributed">chalender naziunal indic</type>
-			<type type="islamic" key="calendar" draft="contributed">chalender islamic</type>
-			<type type="islamic-civil" key="calendar" draft="contributed">chalender islamic civil</type>
-			<type type="islamic-rgsa" key="calendar" draft="unconfirmed">chalender islamic (Arabia Saudita)</type>
-			<type type="islamic-umalqura" key="calendar" draft="unconfirmed">chalender islamic (Umm al-Qura)</type>
-			<type type="iso8601" key="calendar" draft="unconfirmed">chalender tenor ISO 8601</type>
-			<type type="japanese" key="calendar" draft="contributed">chalender giapunais</type>
-			<type type="latn" key="numbers" draft="unconfirmed">cifras europeicas</type>
-			<type type="persian" key="calendar" draft="unconfirmed">chalender persian</type>
-			<type type="phonebook" key="collation" draft="contributed">cudesch da telefon</type>
-			<type type="pinyin" key="collation" draft="contributed">Pinyin</type>
-			<type type="roc" key="calendar" draft="contributed">chalendar da la republica chinaisa</type>
-			<type type="standard" key="collation" draft="unconfirmed">zavrada da standard</type>
-			<type type="stroke" key="collation" draft="contributed">urden dals stritgs</type>
-			<type type="traditional" key="collation" draft="contributed">reglas tradiziunalas</type>
+			<type key="calendar" type="buddhist" draft="contributed">chalender budistic</type>
+			<type key="calendar" type="chinese" draft="contributed">chalender chinais</type>
+			<type key="calendar" type="coptic" draft="unconfirmed">chalender coptic</type>
+			<type key="calendar" type="ethiopic" draft="unconfirmed">chalender etiopic</type>
+			<type key="calendar" type="gregorian" draft="contributed">chalender gregorian</type>
+			<type key="calendar" type="hebrew" draft="contributed">chalender ebraic</type>
+			<type key="calendar" type="indian" draft="contributed">chalender naziunal indic</type>
+			<type key="calendar" type="islamic" draft="contributed">chalender islamic</type>
+			<type key="calendar" type="islamic-civil" draft="contributed">chalender islamic civil</type>
+			<type key="calendar" type="islamic-rgsa" draft="unconfirmed">chalender islamic (Arabia Saudita)</type>
+			<type key="calendar" type="islamic-umalqura" draft="unconfirmed">chalender islamic (Umm al-Qura)</type>
+			<type key="calendar" type="iso8601" draft="unconfirmed">chalender tenor ISO 8601</type>
+			<type key="calendar" type="japanese" draft="contributed">chalender giapunais</type>
+			<type key="calendar" type="persian" draft="unconfirmed">chalender persian</type>
+			<type key="calendar" type="roc" draft="contributed">chalendar da la republica chinaisa</type>
+			<type key="collation" type="big5han" draft="contributed">chinaisa tradiziunala - Big5</type>
+			<type key="collation" type="gb2312han" draft="contributed">chinaisa simplifitgada - GB2312</type>
+			<type key="collation" type="phonebook" draft="contributed">cudesch da telefon</type>
+			<type key="collation" type="pinyin" draft="contributed">Pinyin</type>
+			<type key="collation" type="standard" draft="unconfirmed">zavrada da standard</type>
+			<type key="collation" type="stroke" draft="contributed">urden dals stritgs</type>
+			<type key="collation" type="traditional" draft="contributed">reglas tradiziunalas</type>
+			<type key="numbers" type="armn" draft="unconfirmed">dumbers armens</type>
+			<type key="numbers" type="beng" draft="unconfirmed">cifras bengalas</type>
+			<type key="numbers" type="geor" draft="unconfirmed">dumbers georgians</type>
+			<type key="numbers" type="latn" draft="unconfirmed">cifras europeicas</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metric</measurementSystemName>
@@ -1188,6 +1186,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">am</dayPeriod>
+							<dayPeriod type="pm">sm</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">am</dayPeriod>
 							<dayPeriod type="pm">sm</dayPeriod>
@@ -1870,6 +1872,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern draft="contributed">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0K ¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0K ¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00K ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K ¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000K ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K ¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0M ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M ¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00M ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M ¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000M ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M ¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0G ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G ¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00G ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G ¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000G ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0T ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00T ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000T ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
 			<unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -2832,6 +2862,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</numbers>
 	<units>
 		<unitLength type="long">
+			<unit type="duration-year">
+				<displayName draft="unconfirmed">onns</displayName>
+				<unitPattern count="one">{0} onn</unitPattern>
+				<unitPattern count="other">{0} onns</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="unconfirmed">mais</displayName>
+				<unitPattern count="one">{0} mais</unitPattern>
+				<unitPattern count="other">{0} mais</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="unconfirmed">emnas</displayName>
+				<unitPattern count="one">{0} emna</unitPattern>
+				<unitPattern count="other">{0} emnas</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="unconfirmed">dis</displayName>
 				<unitPattern count="one">{0} di</unitPattern>
@@ -2842,40 +2887,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ura</unitPattern>
 				<unitPattern count="other">{0} uras</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="unconfirmed">millisecundas</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} millisecunda</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} millisecundas</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="unconfirmed">minutas</displayName>
 				<unitPattern count="one">{0} minuta</unitPattern>
 				<unitPattern count="other">{0} minutas</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="unconfirmed">mais</displayName>
-				<unitPattern count="one">{0} mais</unitPattern>
-				<unitPattern count="other">{0} mais</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="unconfirmed">secundas</displayName>
 				<unitPattern count="one">{0} secunda</unitPattern>
 				<unitPattern count="other">{0} secundas</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="unconfirmed">emnas</displayName>
-				<unitPattern count="one">{0} emna</unitPattern>
-				<unitPattern count="other">{0} emnas</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="unconfirmed">onns</displayName>
-				<unitPattern count="one">{0} onn</unitPattern>
-				<unitPattern count="other">{0} onns</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="unconfirmed">centimeters</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} centimeter</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} centimeters</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="unconfirmed">millisecundas</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} millisecunda</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} millisecundas</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="unconfirmed">kilometers</displayName>
@@ -2887,21 +2912,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} meter</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} meters</unitPattern>
 			</unit>
+			<unit type="length-centimeter">
+				<displayName draft="unconfirmed">centimeters</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} centimeter</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} centimeters</unitPattern>
+			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="unconfirmed">millimeters</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} millimeter</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} millimeters</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="unconfirmed">grams</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} gram</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} grams</unitPattern>
-			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="unconfirmed">kilograms</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} kilogram</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} kilograms</unitPattern>
 			</unit>
+			<unit type="mass-gram">
+				<displayName draft="unconfirmed">grams</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} gram</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} grams</unitPattern>
+			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName draft="unconfirmed">kilometers per ura</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} kilometer per ura</unitPattern>
@@ -2919,6 +2949,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 		</unitLength>
 		<unitLength type="short">
+			<unit type="duration-year">
+				<displayName draft="unconfirmed">onns</displayName>
+				<unitPattern count="one">{0} onn</unitPattern>
+				<unitPattern count="other">{0} onns</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="unconfirmed">mais</displayName>
+				<unitPattern count="one">{0} mais</unitPattern>
+				<unitPattern count="other">{0} mais</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="unconfirmed">emnas</displayName>
+				<unitPattern count="one">{0} emna</unitPattern>
+				<unitPattern count="other">{0} emnas</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="unconfirmed">dis</displayName>
 				<unitPattern count="one">{0} di</unitPattern>
@@ -2929,40 +2974,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ura</unitPattern>
 				<unitPattern count="other">{0} uras</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="unconfirmed">ms</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ms</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="unconfirmed">minutas</displayName>
 				<unitPattern count="one">{0} min.</unitPattern>
 				<unitPattern count="other">{0} mins.</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="unconfirmed">mais</displayName>
-				<unitPattern count="one">{0} mais</unitPattern>
-				<unitPattern count="other">{0} mais</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="unconfirmed">secundas</displayName>
 				<unitPattern count="one">{0} sec.</unitPattern>
 				<unitPattern count="other">{0} secs.</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="unconfirmed">emnas</displayName>
-				<unitPattern count="one">{0} emna</unitPattern>
-				<unitPattern count="other">{0} emnas</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="unconfirmed">onns</displayName>
-				<unitPattern count="one">{0} onn</unitPattern>
-				<unitPattern count="other">{0} onns</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="unconfirmed">cm</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} cm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} cm</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="unconfirmed">ms</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} ms</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="unconfirmed">km</displayName>
@@ -2974,21 +2999,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0} m</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} m</unitPattern>
 			</unit>
+			<unit type="length-centimeter">
+				<displayName draft="unconfirmed">cm</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} cm</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} cm</unitPattern>
+			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="unconfirmed">mm</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} mm</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} mm</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="unconfirmed">grams</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} g</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} g</unitPattern>
-			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="unconfirmed">kg</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} kg</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} kg</unitPattern>
 			</unit>
+			<unit type="mass-gram">
+				<displayName draft="unconfirmed">grams</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} g</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} g</unitPattern>
+			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName draft="unconfirmed">km/h</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} km/h</unitPattern>
@@ -3006,6 +3036,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 		</unitLength>
 		<unitLength type="narrow">
+			<unit type="duration-year">
+				<displayName draft="unconfirmed">onn</displayName>
+				<unitPattern count="one">{0} onns</unitPattern>
+				<unitPattern count="other">{0} onns</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="unconfirmed">mais</displayName>
+				<unitPattern count="one">{0} mais</unitPattern>
+				<unitPattern count="other">{0} mais</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="unconfirmed">emna</displayName>
+				<unitPattern count="one">{0} emnas</unitPattern>
+				<unitPattern count="other">{0} emnas</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="unconfirmed">di</displayName>
 				<unitPattern count="one">{0} dis</unitPattern>
@@ -3016,40 +3061,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} uras</unitPattern>
 				<unitPattern count="other">{0} uras</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="unconfirmed">ms</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}ms</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="unconfirmed">min</displayName>
 				<unitPattern count="one">{0} mins.</unitPattern>
 				<unitPattern count="other">{0} mins.</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="unconfirmed">mais</displayName>
-				<unitPattern count="one">{0} mais</unitPattern>
-				<unitPattern count="other">{0} mais</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="unconfirmed">sec</displayName>
 				<unitPattern count="one">{0} secs.</unitPattern>
 				<unitPattern count="other">{0} secs.</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="unconfirmed">emna</displayName>
-				<unitPattern count="one">{0} emnas</unitPattern>
-				<unitPattern count="other">{0} emnas</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="unconfirmed">onn</displayName>
-				<unitPattern count="one">{0} onns</unitPattern>
-				<unitPattern count="other">{0} onns</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="unconfirmed">cm</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}cm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}cm</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="unconfirmed">ms</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}ms</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="unconfirmed">km</displayName>
@@ -3061,21 +3086,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="unconfirmed">{0}m</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}m</unitPattern>
 			</unit>
+			<unit type="length-centimeter">
+				<displayName draft="unconfirmed">cm</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}cm</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}cm</unitPattern>
+			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="unconfirmed">mm</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0}mm</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}mm</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="unconfirmed">gram</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} g</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} g</unitPattern>
-			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="unconfirmed">kg</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} kg</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} kg</unitPattern>
 			</unit>
+			<unit type="mass-gram">
+				<displayName draft="unconfirmed">gram</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} g</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} g</unitPattern>
+			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName draft="unconfirmed">km/h</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} km/h</unitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rm_CH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rm_CH.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rm_CH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rm_CH.xml
index a4404f28f76..b2b898dafd2 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rm_CH.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rm_CH.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="rm"/>
 		<territory type="CH"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rn.xml
similarity index 95%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rn.xml
index c88a4c6d5b7..23718fa8684 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rn.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rn.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="rn"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angwila</territory>
 			<territory type="AL">Alubaniya</territory>
 			<territory type="AM">Arumeniya</territory>
-			<territory type="AN">Antiye y’Abaholandi</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Arijantine</territory>
 			<territory type="AS">Samowa nyamerika</territory>
@@ -421,6 +419,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">Z.MU.</dayPeriod>
+							<dayPeriod type="pm">Z.MW.</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">Z.MU.</dayPeriod>
 							<dayPeriod type="pm">Z.MW.</dayPeriod>
@@ -573,6 +575,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">0K¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rn_BI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rn_BI.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rn_BI.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rn_BI.xml
index 910b08c86ad..cbc5a190645 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rn_BI.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rn_BI.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="rn"/>
 		<territory type="BI"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ro.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ro.xml
similarity index 92%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ro.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ro.xml
index 42b1351f669..b07e107b7f3 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ro.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ro.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="ro"/>
 	</identity>
 	<localeDisplayNames>
@@ -20,7 +19,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="aa" draft="contributed">afar</language>
 			<language type="ab">abhază</language>
 			<language type="ace" draft="contributed">aceh</language>
-			<language type="ach" draft="contributed">acoli</language>
+			<language type="ach">acoli</language>
 			<language type="ada" draft="contributed">adangme</language>
 			<language type="ady" draft="contributed">adyghe</language>
 			<language type="ae" draft="contributed">avestană</language>
@@ -39,7 +38,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ar">arabă</language>
 			<language type="ar_001">arabă standard modernă</language>
 			<language type="arc">aramaică</language>
-			<language type="arn" draft="contributed">araucaniană</language>
+			<language type="arn">mapuche</language>
 			<language type="arp" draft="contributed">arapaho</language>
 			<language type="arw" draft="contributed">arawak</language>
 			<language type="as">asameză</language>
@@ -62,6 +61,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bez">bena</language>
 			<language type="bfd" draft="contributed">bafut</language>
 			<language type="bg">bulgară</language>
+			<language type="bgn">baluchi occidentală</language>
 			<language type="bho" draft="contributed">bhojpuri</language>
 			<language type="bi" draft="contributed">bislama</language>
 			<language type="bik" draft="contributed">bikol</language>
@@ -172,7 +172,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="fur" draft="contributed">friulană</language>
 			<language type="fy">frizonă occidentală</language>
 			<language type="ga">irlandeză</language>
-			<language type="gaa" draft="contributed">ga</language>
+			<language type="gaa">ga</language>
 			<language type="gag">găgăuză</language>
 			<language type="gay" draft="contributed">gayo</language>
 			<language type="gba" draft="contributed">gbaya</language>
@@ -289,6 +289,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">laoțiană</language>
 			<language type="lol" draft="contributed">mongo</language>
 			<language type="loz" draft="contributed">lozi</language>
+			<language type="lrc">luri de nord</language>
 			<language type="lt">lituaniană</language>
 			<language type="lu">luba-katanga</language>
 			<language type="lua" draft="contributed">luba-lulua</language>
@@ -337,18 +338,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="my">birmaneză</language>
 			<language type="mye" draft="contributed">myene</language>
 			<language type="myv" draft="contributed">erzya</language>
+			<language type="mzn">mazanderani</language>
 			<language type="na" draft="contributed">nauru</language>
 			<language type="nap">napolitană</language>
 			<language type="naq">nama</language>
 			<language type="nb">norvegiană bokmål</language>
 			<language type="nd">ndebele de nord</language>
-			<language type="nds" draft="contributed">germana de jos</language>
+			<language type="nds">germana de jos</language>
+			<language type="nds_NL">saxona de jos</language>
 			<language type="ne">nepaleză</language>
 			<language type="new" draft="contributed">newari</language>
 			<language type="ng" draft="contributed">ndonga</language>
 			<language type="nia" draft="contributed">nias</language>
 			<language type="niu" draft="contributed">niueană</language>
-			<language type="nl">olandeză</language>
+			<language type="nl">neerlandeză</language>
 			<language type="nl_BE">flamandă</language>
 			<language type="nmg">kwasio</language>
 			<language type="nn">norvegiană nynorsk</language>
@@ -392,7 +395,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="pt_BR">portugheză braziliană</language>
 			<language type="pt_PT">portugheză europeană</language>
 			<language type="qu">quechua</language>
-			<language type="quc" draft="contributed">kʼicheʼ</language>
+			<language type="quc">quiché</language>
 			<language type="raj" draft="contributed">rajasthani</language>
 			<language type="rap" draft="contributed">rapanui</language>
 			<language type="rar" draft="contributed">rarotongan</language>
@@ -420,6 +423,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">siciliană</language>
 			<language type="sco">scots</language>
 			<language type="sd">sindhi</language>
+			<language type="sdh">kurdă de sud</language>
 			<language type="se">sami de nord</language>
 			<language type="see" draft="contributed">seneca</language>
 			<language type="seh">sena</language>
@@ -457,8 +461,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">sumeriană</language>
 			<language type="sv">suedeză</language>
 			<language type="sw">swahili</language>
+			<language type="sw_CD">swahili Congo</language>
 			<language type="swb">comoreză</language>
-			<language type="swc">swahili Congo</language>
 			<language type="syc" draft="contributed">siriacă clasică</language>
 			<language type="syr">siriacă</language>
 			<language type="ta">tamilă</language>
@@ -513,6 +517,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal" draft="contributed">walamo</language>
 			<language type="war" draft="contributed">waray</language>
 			<language type="was" draft="contributed">washo</language>
+			<language type="wbp">warlpiri</language>
 			<language type="wo">wolof</language>
 			<language type="xal">calmucă</language>
 			<language type="xh">xhosa</language>
@@ -652,7 +657,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antilele Olandeze</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antarctica</territory>
 			<territory type="AR">Argentina</territory>
@@ -816,12 +820,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="MV">Maldive</territory>
 			<territory type="MW">Malawi</territory>
 			<territory type="MX">Mexic</territory>
-			<territory type="MY">Malaezia</territory>
+			<territory type="MY">Malaysia</territory>
 			<territory type="MZ">Mozambic</territory>
 			<territory type="NA">Namibia</territory>
 			<territory type="NC">Noua Caledonie</territory>
 			<territory type="NE">Niger</territory>
-			<territory type="NF">Insulele Norfolk</territory>
+			<territory type="NF">Insula Norfolk</territory>
 			<territory type="NG">Nigeria</territory>
 			<territory type="NI">Nicaragua</territory>
 			<territory type="NL">Țările de Jos</territory>
@@ -867,7 +871,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="SM">San Marino</territory>
 			<territory type="SN">Senegal</territory>
 			<territory type="SO">Somalia</territory>
-			<territory type="SR">Surinam</territory>
+			<territory type="SR">Suriname</territory>
 			<territory type="SS">Sudanul de Sud</territory>
 			<territory type="ST">Sao Tome și Principe</territory>
 			<territory type="SV">El Salvador</territory>
@@ -899,7 +903,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="UY">Uruguay</territory>
 			<territory type="UZ">Uzbekistan</territory>
 			<territory type="VA">Statul Cetății Vaticanului</territory>
-			<territory type="VC">Saint Vincent și Grenadine</territory>
+			<territory type="VC">Saint Vincent și Grenadinele</territory>
 			<territory type="VE">Venezuela</territory>
 			<territory type="VG">Insulele Virgine Britanice</territory>
 			<territory type="VI">Insulele Virgine S.U.A.</territory>
@@ -962,6 +966,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">Ordonare numerică</key>
 			<key type="colStrength" draft="contributed">Puterea ordonării</key>
 			<key type="currency">monedă</key>
+			<key type="hc">ciclu orar (12 sau 24)</key>
+			<key type="lb">stil de întrerupere a liniei</key>
+			<key type="ms">sistem de unități de măsură</key>
 			<key type="numbers">numere</key>
 			<key type="timezone" draft="contributed">Fusul orar</key>
 			<key type="va" draft="contributed">Varianta locală</key>
@@ -969,96 +976,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">Utilizare privată</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">cifre indo-arabe</type>
-			<type type="arabext" key="numbers">cifre indo-arabe extinse</type>
-			<type type="armn" key="numbers">numerale armenești</type>
-			<type type="armnlow" key="numbers">numerale armenești cu minuscule</type>
-			<type type="beng" key="numbers">cifre bengaleze</type>
-			<type type="big5han" key="collation">sortare pentru chineza tradițională - Big5</type>
-			<type type="buddhist" key="calendar">calendar budist</type>
-			<type type="chinese" key="calendar">calendar chinezesc</type>
-			<type type="coptic" key="calendar">calendar copt</type>
-			<type type="dangi" key="calendar">calendar dangi</type>
-			<type type="deva" key="numbers">cifre devanagari</type>
-			<type type="dictionary" key="collation">Ordine de sortare a dicționarului</type>
-			<type type="ducet" key="collation">ordine de sortare Unicode implicită</type>
-			<type type="eor" key="collation" draft="contributed">regulile europene de sortare</type>
-			<type type="ethi" key="numbers">numerale etiopiene</type>
-			<type type="ethiopic" key="calendar">calendar etiopian</type>
-			<type type="ethiopic-amete-alem" key="calendar">Calendarul etiopian amete alem</type>
-			<type type="finance" key="numbers" draft="contributed">Sistemul numeric financiar</type>
-			<type type="fullwide" key="numbers">cifre cu lățimea întreagă</type>
-			<type type="gb2312han" key="collation">sortare pentru chineza simplificată - GB2312</type>
-			<type type="geor" key="numbers">numerale georgiene</type>
-			<type type="gregorian" key="calendar">calendar gregorian</type>
-			<type type="grek" key="numbers">numerale grecești</type>
-			<type type="greklow" key="numbers">numerale grecești cu minuscule</type>
-			<type type="gujr" key="numbers">cifre gujarati</type>
-			<type type="guru" key="numbers">cifre gurmukhi</type>
-			<type type="hanidec" key="numbers">numerale zecimale chinezești</type>
-			<type type="hans" key="numbers">numerale chinezești simplificate</type>
-			<type type="hansfin" key="numbers">numerale financiare chinezești simplificate</type>
-			<type type="hant" key="numbers">numerale chinezești tradiționale</type>
-			<type type="hantfin" key="numbers">numerale financiare chinezești tradiționale</type>
-			<type type="hebr" key="numbers">numerale ebraice</type>
-			<type type="hebrew" key="calendar">calendar ebraic</type>
-			<type type="identical" key="colStrength" draft="contributed">Ordonați-le pe toate</type>
-			<type type="indian" key="calendar">calendar național indian</type>
-			<type type="islamic" key="calendar">calendar islamic</type>
-			<type type="islamic-civil" key="calendar">calendar islamic civil</type>
-			<type type="iso8601" key="calendar">calendar ISO-8601</type>
-			<type type="japanese" key="calendar">calendar japonez</type>
-			<type type="jpan" key="numbers">numerale japoneze</type>
-			<type type="jpanfin" key="numbers">numerale financiare japoneze</type>
-			<type type="khmr" key="numbers">cifre khmere</type>
-			<type type="knda" key="numbers">cifre kannada</type>
-			<type type="laoo" key="numbers">cifre laoțiene</type>
-			<type type="latn" key="numbers">cifre occidentale</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">Ordonați întâi minusculele</type>
-			<type type="mlym" key="numbers">cifre malayalam</type>
-			<type type="mong" key="numbers">Cifre mongole</type>
-			<type type="mymr" key="numbers">cifre birmaneze</type>
-			<type type="native" key="numbers" draft="contributed">Cifre native</type>
-			<type type="no" key="colBackwards" draft="contributed">Ordonați accentele în mod normal</type>
-			<type type="no" key="colCaseFirst" draft="contributed">Ordonați după dimensiunea normală a literei</type>
-			<type type="no" key="colCaseLevel" draft="contributed">Ordonați neținând seama de diferența dintre majuscule/minuscule</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">Ordonați caracterele kana separat</type>
-			<type type="no" key="colNormalization" draft="contributed">Ordonați fără normalizare</type>
-			<type type="no" key="colNumeric" draft="contributed">Ordonați cifrele individual</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">Ordonați simbolurile</type>
-			<type type="orya" key="numbers">cifre oriya</type>
-			<type type="persian" key="calendar">calendar persan</type>
-			<type type="phonebook" key="collation">sortare după cartea de telefon</type>
-			<type type="phonetic" key="collation" draft="contributed">Tip de ordonare fonetică</type>
-			<type type="pinyin" key="collation">sortare pinyin</type>
-			<type type="primary" key="colStrength" draft="contributed">Ordonați numai literele de bază</type>
-			<type type="quaternary" key="colStrength" draft="contributed">Ordonați după accente/dimensiunea literei/lățime/kana</type>
-			<type type="reformed" key="collation">Ordine de sortare reformată</type>
-			<type type="roc" key="calendar">calendarul Republicii Chineze</type>
-			<type type="roman" key="numbers">numerale romane</type>
-			<type type="romanlow" key="numbers">numerale romane cu minuscule</type>
-			<type type="search" key="collation">căutare cu scop general</type>
-			<type type="searchjl" key="collation" draft="contributed">Căutați în funcție de consoana inițială hangul</type>
-			<type type="secondary" key="colStrength" draft="contributed">Ordonați după accent</type>
-			<type type="shifted" key="colAlternate" draft="contributed">Ordonați ignorând simbolurile</type>
-			<type type="standard" key="collation">ordine de sortare standard</type>
-			<type type="stroke" key="collation">ordine de sortare după trasare</type>
-			<type type="taml" key="numbers">numerale tradiționale tamilă</type>
-			<type type="tamldec" key="numbers">cifre tamile</type>
-			<type type="telu" key="numbers">cifre telugu</type>
-			<type type="tertiary" key="colStrength" draft="contributed">Ordonați după accente/dimensiunea literei/lățime</type>
-			<type type="thai" key="numbers">cifre thailandeze</type>
-			<type type="tibt" key="numbers">cifre tibetane</type>
-			<type type="traditional" key="collation">sortare tradițională</type>
-			<type type="traditional" key="numbers" draft="contributed">Numere tradiționale</type>
-			<type type="unihan" key="collation">Ordine de sortare a liniilor ideogramelor</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">Ordonați mai întâi majusculele</type>
-			<type type="vaii" key="numbers" draft="contributed">Cifre Vai</type>
-			<type type="yes" key="colBackwards" draft="contributed">Ordonați după accente în ordine inversă</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">Ordonați ținând seama de diferența dintre majuscule/minuscule</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">Ordonați kana diferențiat</type>
-			<type type="yes" key="colNormalization" draft="contributed">Ordonați caracterele unicode normalizat</type>
-			<type type="yes" key="colNumeric" draft="contributed">Ordonați cifrele în ordine numerică</type>
+			<type key="calendar" type="buddhist">calendar budist</type>
+			<type key="calendar" type="chinese">calendar chinezesc</type>
+			<type key="calendar" type="coptic">calendar copt</type>
+			<type key="calendar" type="dangi">calendar dangi</type>
+			<type key="calendar" type="ethiopic">calendar etiopian</type>
+			<type key="calendar" type="ethiopic-amete-alem">Calendarul etiopian amete alem</type>
+			<type key="calendar" type="gregorian">calendar gregorian</type>
+			<type key="calendar" type="hebrew">calendar ebraic</type>
+			<type key="calendar" type="indian">calendar național indian</type>
+			<type key="calendar" type="islamic">calendar islamic</type>
+			<type key="calendar" type="islamic-civil">calendar islamic civil</type>
+			<type key="calendar" type="iso8601">calendar ISO-8601</type>
+			<type key="calendar" type="japanese">calendar japonez</type>
+			<type key="calendar" type="persian">calendar persan</type>
+			<type key="calendar" type="roc">calendarul Republicii Chineze</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">Ordonați simbolurile</type>
+			<type key="colAlternate" type="shifted" draft="contributed">Ordonați ignorând simbolurile</type>
+			<type key="colBackwards" type="no" draft="contributed">Ordonați accentele în mod normal</type>
+			<type key="colBackwards" type="yes" draft="contributed">Ordonați după accente în ordine inversă</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">Ordonați întâi minusculele</type>
+			<type key="colCaseFirst" type="no" draft="contributed">Ordonați după dimensiunea normală a literei</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">Ordonați mai întâi majusculele</type>
+			<type key="colCaseLevel" type="no" draft="contributed">Ordonați neținând seama de diferența dintre majuscule/minuscule</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">Ordonați ținând seama de diferența dintre majuscule/minuscule</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">Ordonați caracterele kana separat</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">Ordonați kana diferențiat</type>
+			<type key="collation" type="big5han">sortare pentru chineza tradițională - Big5</type>
+			<type key="collation" type="dictionary">Ordine de sortare a dicționarului</type>
+			<type key="collation" type="ducet">ordine de sortare Unicode implicită</type>
+			<type key="collation" type="eor" draft="contributed">regulile europene de sortare</type>
+			<type key="collation" type="gb2312han">sortare pentru chineza simplificată - GB2312</type>
+			<type key="collation" type="phonebook">sortare după cartea de telefon</type>
+			<type key="collation" type="phonetic" draft="contributed">Tip de ordonare fonetică</type>
+			<type key="collation" type="pinyin">sortare pinyin</type>
+			<type key="collation" type="reformed">Ordine de sortare reformată</type>
+			<type key="collation" type="search">căutare cu scop general</type>
+			<type key="collation" type="searchjl" draft="contributed">Căutați în funcție de consoana inițială hangul</type>
+			<type key="collation" type="standard">ordine de sortare standard</type>
+			<type key="collation" type="stroke">ordine de sortare după trasare</type>
+			<type key="collation" type="traditional">sortare tradițională</type>
+			<type key="collation" type="unihan">Ordine de sortare a liniilor ideogramelor</type>
+			<type key="colNormalization" type="no" draft="contributed">Ordonați fără normalizare</type>
+			<type key="colNormalization" type="yes" draft="contributed">Ordonați caracterele unicode normalizat</type>
+			<type key="colNumeric" type="no" draft="contributed">Ordonați cifrele individual</type>
+			<type key="colNumeric" type="yes" draft="contributed">Ordonați cifrele în ordine numerică</type>
+			<type key="colStrength" type="identical" draft="contributed">Ordonați-le pe toate</type>
+			<type key="colStrength" type="primary" draft="contributed">Ordonați numai literele de bază</type>
+			<type key="colStrength" type="quaternary" draft="contributed">Ordonați după accente/dimensiunea literei/lățime/kana</type>
+			<type key="colStrength" type="secondary" draft="contributed">Ordonați după accent</type>
+			<type key="colStrength" type="tertiary" draft="contributed">Ordonați după accente/dimensiunea literei/lățime</type>
+			<type key="hc" type="h11">sistem cu 12 ore (0–11)</type>
+			<type key="hc" type="h12">sistem cu 12 ore (0–12)</type>
+			<type key="hc" type="h23">sistem cu 24 de ore (0–23)</type>
+			<type key="hc" type="h24">sistem cu 24 de ore (1–24)</type>
+			<type key="lb" type="loose">stil liber de întrerupere a liniei</type>
+			<type key="lb" type="normal">stil normal de întrerupere a liniei</type>
+			<type key="lb" type="strict">stil strict de întrerupere a liniei</type>
+			<type key="ms" type="metric">sistemul metric</type>
+			<type key="ms" type="uksystem">sistemul imperial de unități de măsură</type>
+			<type key="ms" type="ussystem">sistemul american de unități de măsură</type>
+			<type key="numbers" type="arab">cifre indo-arabe</type>
+			<type key="numbers" type="arabext">cifre indo-arabe extinse</type>
+			<type key="numbers" type="armn">numerale armenești</type>
+			<type key="numbers" type="armnlow">numerale armenești cu minuscule</type>
+			<type key="numbers" type="beng">cifre bengaleze</type>
+			<type key="numbers" type="deva">cifre devanagari</type>
+			<type key="numbers" type="ethi">numerale etiopiene</type>
+			<type key="numbers" type="finance" draft="contributed">Sistemul numeric financiar</type>
+			<type key="numbers" type="fullwide">cifre cu lățimea întreagă</type>
+			<type key="numbers" type="geor">numerale georgiene</type>
+			<type key="numbers" type="grek">numerale grecești</type>
+			<type key="numbers" type="greklow">numerale grecești cu minuscule</type>
+			<type key="numbers" type="gujr">cifre gujarati</type>
+			<type key="numbers" type="guru">cifre gurmukhi</type>
+			<type key="numbers" type="hanidec">numerale zecimale chinezești</type>
+			<type key="numbers" type="hans">numerale chinezești simplificate</type>
+			<type key="numbers" type="hansfin">numerale financiare chinezești simplificate</type>
+			<type key="numbers" type="hant">numerale chinezești tradiționale</type>
+			<type key="numbers" type="hantfin">numerale financiare chinezești tradiționale</type>
+			<type key="numbers" type="hebr">numerale ebraice</type>
+			<type key="numbers" type="jpan">numerale japoneze</type>
+			<type key="numbers" type="jpanfin">numerale financiare japoneze</type>
+			<type key="numbers" type="khmr">cifre khmere</type>
+			<type key="numbers" type="knda">cifre kannada</type>
+			<type key="numbers" type="laoo">cifre laoțiene</type>
+			<type key="numbers" type="latn">cifre occidentale</type>
+			<type key="numbers" type="mlym">cifre malayalam</type>
+			<type key="numbers" type="mong">Cifre mongole</type>
+			<type key="numbers" type="mymr">cifre birmaneze</type>
+			<type key="numbers" type="native" draft="contributed">Cifre native</type>
+			<type key="numbers" type="orya">cifre oriya</type>
+			<type key="numbers" type="roman">numerale romane</type>
+			<type key="numbers" type="romanlow">numerale romane cu minuscule</type>
+			<type key="numbers" type="taml">numerale tradiționale tamilă</type>
+			<type key="numbers" type="tamldec">cifre tamile</type>
+			<type key="numbers" type="telu">cifre telugu</type>
+			<type key="numbers" type="thai">cifre thailandeze</type>
+			<type key="numbers" type="tibt">cifre tibetane</type>
+			<type key="numbers" type="traditional" draft="contributed">Numere tradiționale</type>
+			<type key="numbers" type="vaii" draft="contributed">Cifre Vai</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">BGN</transformName>
@@ -1097,7 +1114,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<moreInformation>...</moreInformation>
 	</characters>
 	<delimiters>
-		<quotationStart>“</quotationStart>
+		<quotationStart>„</quotationStart>
 		<quotationEnd>”</quotationEnd>
 		<alternateQuotationStart>«</alternateQuotationStart>
 		<alternateQuotationEnd>»</alternateQuotationEnd>
@@ -1266,6 +1283,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -1299,7 +1317,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
 						<intervalFormatItem id="d">
 							<greatestDifference id="d">d–d</greatestDifference>
 						</intervalFormatItem>
@@ -1471,31 +1489,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="12">D</month>
 						</monthWidth>
 						<monthWidth type="wide">
-							<month type="1">Ianuarie</month>
-							<month type="2">Februarie</month>
-							<month type="3">Martie</month>
-							<month type="4">Aprilie</month>
-							<month type="5">Mai</month>
-							<month type="6">Iunie</month>
-							<month type="7">Iulie</month>
-							<month type="8">August</month>
-							<month type="9">Septembrie</month>
-							<month type="10">Octombrie</month>
-							<month type="11">Noiembrie</month>
-							<month type="12">Decembrie</month>
+							<month type="1">ianuarie</month>
+							<month type="2">februarie</month>
+							<month type="3">martie</month>
+							<month type="4">aprilie</month>
+							<month type="5">mai</month>
+							<month type="6">iunie</month>
+							<month type="7">iulie</month>
+							<month type="8">august</month>
+							<month type="9">septembrie</month>
+							<month type="10">octombrie</month>
+							<month type="11">noiembrie</month>
+							<month type="12">decembrie</month>
 						</monthWidth>
 					</monthContext>
 				</months>
 				<days>
 					<dayContext type="format">
 						<dayWidth type="abbreviated">
-							<day type="sun">Dum</day>
-							<day type="mon">Lun</day>
-							<day type="tue">Mar</day>
-							<day type="wed">Mie</day>
-							<day type="thu">Joi</day>
-							<day type="fri">Vin</day>
-							<day type="sat">Sâm</day>
+							<day type="sun">dum.</day>
+							<day type="mon">lun.</day>
+							<day type="tue">mar.</day>
+							<day type="wed">mie.</day>
+							<day type="thu">joi</day>
+							<day type="fri">vin.</day>
+							<day type="sat">sâm.</day>
 						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun">D</day>
@@ -1507,13 +1525,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<day type="sat">S</day>
 						</dayWidth>
 						<dayWidth type="short">
-							<day type="sun">Du</day>
-							<day type="mon">Lu</day>
-							<day type="tue">Ma</day>
-							<day type="wed">Mi</day>
-							<day type="thu">Jo</day>
-							<day type="fri">Vi</day>
-							<day type="sat">Sâ</day>
+							<day type="sun">du.</day>
+							<day type="mon">lu.</day>
+							<day type="tue">ma.</day>
+							<day type="wed">mi.</day>
+							<day type="thu">jo.</day>
+							<day type="fri">vi.</day>
+							<day type="sat">sâ.</day>
 						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">duminică</day>
@@ -1527,13 +1545,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dayContext>
 					<dayContext type="stand-alone">
 						<dayWidth type="abbreviated">
-							<day type="sun">Dum</day>
-							<day type="mon">Lun</day>
-							<day type="tue">Mar</day>
-							<day type="wed">Mie</day>
-							<day type="thu">Joi</day>
-							<day type="fri">Vin</day>
-							<day type="sat">Sâm</day>
+							<day type="sun">dum.</day>
+							<day type="mon">lun.</day>
+							<day type="tue">mar.</day>
+							<day type="wed">mie.</day>
+							<day type="thu">joi</day>
+							<day type="fri">vin.</day>
+							<day type="sat">sâm.</day>
 						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun">D</day>
@@ -1545,22 +1563,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<day type="sat">S</day>
 						</dayWidth>
 						<dayWidth type="short">
-							<day type="sun">Du</day>
-							<day type="mon">Lu</day>
-							<day type="tue">Ma</day>
-							<day type="wed">Mi</day>
-							<day type="thu">Jo</day>
-							<day type="fri">Vi</day>
-							<day type="sat">Sâ</day>
+							<day type="sun">du</day>
+							<day type="mon">lu</day>
+							<day type="tue">ma</day>
+							<day type="wed">mi</day>
+							<day type="thu">jo</day>
+							<day type="fri">vi</day>
+							<day type="sat">sâ</day>
 						</dayWidth>
 						<dayWidth type="wide">
-							<day type="sun">Duminică</day>
-							<day type="mon">Luni</day>
-							<day type="tue">Marți</day>
-							<day type="wed">Miercuri</day>
-							<day type="thu">Joi</day>
-							<day type="fri">Vineri</day>
-							<day type="sat">Sâmbătă</day>
+							<day type="sun">duminică</day>
+							<day type="mon">luni</day>
+							<day type="tue">marți</day>
+							<day type="wed">miercuri</day>
+							<day type="thu">joi</day>
+							<day type="fri">vineri</day>
+							<day type="sat">sâmbătă</day>
 						</dayWidth>
 					</dayContext>
 				</days>
@@ -1608,15 +1626,58 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">miezul nopții</dayPeriod>
+							<dayPeriod type="am">a.m.</dayPeriod>
+							<dayPeriod type="noon">amiază</dayPeriod>
+							<dayPeriod type="pm">p.m.</dayPeriod>
+							<dayPeriod type="morning1">dimineața</dayPeriod>
+							<dayPeriod type="afternoon1">după-amiaza</dayPeriod>
+							<dayPeriod type="evening1">seara</dayPeriod>
+							<dayPeriod type="night1">noaptea</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">miezul nopții</dayPeriod>
 							<dayPeriod type="am">a.m.</dayPeriod>
 							<dayPeriod type="noon">prânz</dayPeriod>
 							<dayPeriod type="pm">p.m.</dayPeriod>
+							<dayPeriod type="morning1">dimineață</dayPeriod>
+							<dayPeriod type="afternoon1">după-amiază</dayPeriod>
+							<dayPeriod type="evening1">seară</dayPeriod>
+							<dayPeriod type="night1">noapte</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">la miezul nopții</dayPeriod>
 							<dayPeriod type="am">a.m.</dayPeriod>
-							<dayPeriod type="noon">la prânz</dayPeriod>
+							<dayPeriod type="noon">la amiază</dayPeriod>
 							<dayPeriod type="pm">p.m.</dayPeriod>
+							<dayPeriod type="morning1">dimineața</dayPeriod>
+							<dayPeriod type="afternoon1">după-amiaza</dayPeriod>
+							<dayPeriod type="evening1">seara</dayPeriod>
+							<dayPeriod type="night1">noaptea</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">miezul nopții</dayPeriod>
+							<dayPeriod type="am">a.m.</dayPeriod>
+							<dayPeriod type="noon">amiază</dayPeriod>
+							<dayPeriod type="pm">p.m.</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">miezul nopții</dayPeriod>
+							<dayPeriod type="am">a.m.</dayPeriod>
+							<dayPeriod type="pm">p.m.</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">la miezul nopții</dayPeriod>
+							<dayPeriod type="am">a.m.</dayPeriod>
+							<dayPeriod type="noon">la amiază</dayPeriod>
+							<dayPeriod type="pm">p.m.</dayPeriod>
+							<dayPeriod type="morning1">dimineață</dayPeriod>
+							<dayPeriod type="afternoon1">după-amiază</dayPeriod>
+							<dayPeriod type="evening1">seară</dayPeriod>
+							<dayPeriod type="night1">noapte</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1717,6 +1778,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">dd.MM</dateFormatItem>
 						<dateFormatItem id="MEd">E, dd.MM</dateFormatItem>
@@ -1743,7 +1808,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<appendItem request="Timezone">{0} {1}</appendItem>
 					</appendItems>
 					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
 						<intervalFormatItem id="d">
 							<greatestDifference id="d">d–d</greatestDifference>
 						</intervalFormatItem>
@@ -1967,6 +2032,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter">
 				<displayName>Trimestru</displayName>
+				<relative type="-1" draft="contributed">trimestrul trecut</relative>
+				<relative type="0" draft="contributed">trimestrul acesta</relative>
+				<relative type="1" draft="contributed">trimestrul viitor</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">peste {0} trimestru</relativeTimePattern>
 					<relativeTimePattern count="few">peste {0} trimestre</relativeTimePattern>
@@ -1980,6 +2048,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>trim.</displayName>
+				<relative type="-1" draft="contributed">trim. trecut</relative>
+				<relative type="0" draft="contributed">trim. acesta</relative>
+				<relative type="1" draft="contributed">trim. viitor</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">peste {0} trim.</relativeTimePattern>
 					<relativeTimePattern count="few">peste {0} trim.</relativeTimePattern>
@@ -1993,15 +2064,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>trim.</displayName>
+				<relative type="-1" draft="contributed">trim. trecut</relative>
+				<relative type="0" draft="contributed">trim. acesta</relative>
+				<relative type="1" draft="contributed">trim. viitor</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} trim.</relativeTimePattern>
 					<relativeTimePattern count="few">+{0} trim.</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} trim.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">+{0} trim.</relativeTimePattern>
-					<relativeTimePattern count="few">+{0} trim.</relativeTimePattern>
-					<relativeTimePattern count="other">+{0} trim.</relativeTimePattern>
+					<relativeTimePattern count="one">-{0} trim.</relativeTimePattern>
+					<relativeTimePattern count="few">-{0} trim.</relativeTimePattern>
+					<relativeTimePattern count="other">-{0} trim.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month">
@@ -3240,6 +3314,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
 			</zone>
@@ -3324,6 +3401,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkuțk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Cita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Yakuțk</exemplarCity>
 			</zone>
@@ -3342,6 +3422,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolimsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamciatka</exemplarCity>
 			</zone>
@@ -3713,9 +3796,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic draft="contributed">Ora din Apia</generic>
-					<standard draft="contributed">Ora standard din Apia</standard>
-					<daylight draft="contributed">Ora de vară din Apia</daylight>
+					<generic>Ora din Apia</generic>
+					<standard>Ora standard din Apia</standard>
+					<daylight>Ora de vară din Apia</daylight>
 				</long>
 			</metazone>
 			<metazone type="Aqtau">
@@ -4694,9 +4777,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">0 mie ¤</pattern>
+					<pattern type="1000" count="few">0 mii ¤</pattern>
+					<pattern type="1000" count="other">0 mii ¤</pattern>
+					<pattern type="10000" count="one">00 mii ¤</pattern>
+					<pattern type="10000" count="few">00 mii ¤</pattern>
+					<pattern type="10000" count="other">00 mii ¤</pattern>
+					<pattern type="100000" count="one">000 mii ¤</pattern>
+					<pattern type="100000" count="few">000 mii ¤</pattern>
+					<pattern type="100000" count="other">000 mii ¤</pattern>
+					<pattern type="1000000" count="one">0 mil'.' ¤</pattern>
+					<pattern type="1000000" count="few">0 mil'.' ¤</pattern>
+					<pattern type="1000000" count="other">0 mil'.' ¤</pattern>
+					<pattern type="10000000" count="one">00 mil'.' ¤</pattern>
+					<pattern type="10000000" count="few">00 mil'.' ¤</pattern>
+					<pattern type="10000000" count="other">00 mil'.' ¤</pattern>
+					<pattern type="100000000" count="one">000 mil'.' ¤</pattern>
+					<pattern type="100000000" count="few">000 mil'.' ¤</pattern>
+					<pattern type="100000000" count="other">000 mil'.' ¤</pattern>
+					<pattern type="1000000000" count="one">0 mld'.' ¤</pattern>
+					<pattern type="1000000000" count="few">0 mld'.' ¤</pattern>
+					<pattern type="1000000000" count="other">0 mld'.' ¤</pattern>
+					<pattern type="10000000000" count="one">00 mld'.' ¤</pattern>
+					<pattern type="10000000000" count="few">00 mld'.' ¤</pattern>
+					<pattern type="10000000000" count="other">00 mld'.' ¤</pattern>
+					<pattern type="100000000000" count="one">000 mld'.' ¤</pattern>
+					<pattern type="100000000000" count="few">000 mld'.' ¤</pattern>
+					<pattern type="100000000000" count="other">000 mld'.' ¤</pattern>
+					<pattern type="1000000000000" count="one">0 tril'.' ¤</pattern>
+					<pattern type="1000000000000" count="few">0 tril'.' ¤</pattern>
+					<pattern type="1000000000000" count="other">0 tril'.' ¤</pattern>
+					<pattern type="10000000000000" count="one">00 tril'.' ¤</pattern>
+					<pattern type="10000000000000" count="few">00 tril'.' ¤</pattern>
+					<pattern type="10000000000000" count="other">00 tril'.' ¤</pattern>
+					<pattern type="100000000000000" count="one">000 tril'.' ¤</pattern>
+					<pattern type="100000000000000" count="few">000 tril'.' ¤</pattern>
+					<pattern type="100000000000000" count="other">000 tril'.' ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="few">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
+			<unitPattern count="other">{0} de {1}</unitPattern>
 		</currencyFormats>
 		<currencies>
 			<currency type="ADP">
@@ -4746,6 +4869,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">kwanze angoleze</displayName>
 				<displayName count="other">kwanze angoleze</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="ARP">
 				<displayName>peso argentinian (1983–1985)</displayName>
@@ -4804,6 +4928,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">mărci convertibile din Bosnia și Herțegovina</displayName>
 				<displayName count="other">mărci convertibile din Bosnia și Herțegovina</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>dolar Barbados</displayName>
@@ -4882,6 +5007,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">boliviano bolivieni</displayName>
 				<displayName count="other">boliviano bolivieni</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOP">
 				<displayName>peso bolivian</displayName>
@@ -4930,6 +5056,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few" draft="contributed">pule Botswana</displayName>
 				<displayName count="other" draft="contributed">pule Botswana</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYR">
 				<displayName>rublă belarusă</displayName>
@@ -5013,6 +5140,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">pesos cubanezi convertibili</displayName>
 				<displayName count="other">pesos cubanezi convertibili</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>peso cubanez</displayName>
@@ -5041,6 +5169,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">coroane cehe</displayName>
 				<displayName count="other">coroane cehe</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>marcă est-germană</displayName>
@@ -5067,6 +5196,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">coroane daneze</displayName>
 				<displayName count="other">coroane daneze</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>peso dominican</displayName>
@@ -5098,6 +5228,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lire egiptene</displayName>
 				<displayName count="other">lire egiptene</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>nakfa eritreeană</displayName>
@@ -5153,6 +5284,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lire din Insulele Falkland</displayName>
 				<displayName count="other">lire din Insulele Falkland</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>franc francez</displayName>
@@ -5174,6 +5306,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lari georgieni</displayName>
 				<displayName count="other">lari georgieni</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>cedi Ghana (1979–2007)</displayName>
@@ -5206,6 +5339,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">franci guineeni</displayName>
 				<displayName count="other">franci guineeni</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GRD">
 				<displayName>drahmă grecească</displayName>
@@ -5219,6 +5353,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">quetzali guatemalezi</displayName>
 				<displayName count="other">quetzali guatemalezi</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWP">
 				<displayName>peso Guineea-Bissau</displayName>
@@ -5248,6 +5383,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lempire honduriene</displayName>
 				<displayName count="other">lempire honduriene</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>dinar croat</displayName>
@@ -5261,6 +5397,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">kune croate</displayName>
 				<displayName count="other">kune croate</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>gourde din Haiti</displayName>
@@ -5275,6 +5412,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">forinți maghiari</displayName>
 				<displayName count="other">forinți maghiari</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>rupie indoneziană</displayName>
@@ -5282,6 +5420,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">rupii indoneziene</displayName>
 				<displayName count="other">rupii indoneziene</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>liră irlandeză</displayName>
@@ -5331,6 +5470,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">coroane islandeze</displayName>
 				<displayName count="other">coroane islandeze</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>liră italiană</displayName>
@@ -5389,6 +5529,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">franci comorieni</displayName>
 				<displayName count="other">franci comorieni</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>won nord-coreean</displayName>
@@ -5396,6 +5537,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">woni nord-coreeni</displayName>
 				<displayName count="other">woni nord-coreeni</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>won sud-coreean</displayName>
@@ -5442,6 +5584,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lire libaneze</displayName>
 				<displayName count="other">lire libaneze</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>rupie din Sri Lanka</displayName>
@@ -5449,6 +5592,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">rupii din Sri Lanka</displayName>
 				<displayName count="other">rupii Sri Lanka</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>dolar liberian</displayName>
@@ -5532,6 +5676,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">ariary malgași</displayName>
 				<displayName count="other">ariary malgași</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>franc Madagascar</displayName>
@@ -5558,6 +5703,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">kyați din Myanmar</displayName>
 				<displayName count="other">kyați din Myanmar</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>tugrik mongol</displayName>
@@ -5593,6 +5739,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">rupii mauritiene</displayName>
 				<displayName count="other">rupii mauritiene</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>rufiyaa maldiviană</displayName>
@@ -5628,6 +5775,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">ringgit malaiezieni</displayName>
 				<displayName count="other">ringgit malaiezieni</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>escudo Mozambic</displayName>
@@ -5667,6 +5815,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">cordobe nicaraguane</displayName>
 				<displayName count="other">cordobe nicaraguane</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>gulden olandez</displayName>
@@ -5680,6 +5829,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">coroane norvegiene</displayName>
 				<displayName count="other">coroane norvegiene</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>rupie nepaleză</displayName>
@@ -5687,6 +5837,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">rupii nepaleze</displayName>
 				<displayName count="other">rupii nepaleze</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>dolar neozeelandez</displayName>
@@ -5747,6 +5898,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">rupii pakistaneze</displayName>
 				<displayName count="other">rupii pakistaneze</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>zlot polonez</displayName>
@@ -5754,6 +5906,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">zloți polonezi</displayName>
 				<displayName count="other">zloți polonezi</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>zlot polonez (1950–1995)</displayName>
@@ -5808,6 +5961,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">ruble rusești</displayName>
 				<displayName count="other">ruble rusești</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RWF">
 				<displayName>franc rwandez</displayName>
@@ -5815,6 +5969,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">franci rwandezi</displayName>
 				<displayName count="other">franci rwandezi</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>rial saudit</displayName>
@@ -5863,6 +6018,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">coroane suedeze</displayName>
 				<displayName count="other">coroane suedeze</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>dolar Singapore</displayName>
@@ -5878,6 +6034,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lire Insula Sf. Elena</displayName>
 				<displayName count="other">lire Insula Sf. Elena</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>tolar sloven</displayName>
@@ -5933,6 +6090,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few" draft="contributed">dobre Sao Tome și Principe</displayName>
 				<displayName count="other" draft="contributed">dobre Sao Tome și Principe</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>rublă sovietică</displayName>
@@ -5952,6 +6110,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">lire siriene</displayName>
 				<displayName count="other">lire siriene</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>lilangeni din Swaziland</displayName>
@@ -5966,6 +6125,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">bahți thailandezi</displayName>
 				<displayName count="other">bahți thailandezi</displayName>
 				<symbol>THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>rublă Tadjikistan</displayName>
@@ -6006,6 +6166,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">pa’anga tongane</displayName>
 				<displayName count="other">pa’anga tongane</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TRL">
 				<displayName>liră turcească (1922–2005)</displayName>
@@ -6020,6 +6181,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">lire turcești</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>dolar din Trinidad-Tobago</displayName>
@@ -6124,6 +6286,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">bolivari venezueleni</displayName>
 				<displayName count="other">bolivari venezueleni</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>dong vietnamez</displayName>
@@ -6178,6 +6341,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">dolari din Caraibele de Est</displayName>
 				<displayName count="other">dolari din Caraibele de Est</displayName>
 				<symbol>XCD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>drepturi speciale de tragere</displayName>
@@ -6263,6 +6427,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">ranzi sud-africani</displayName>
 				<displayName count="other">ranzi sud-africani</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>kwacha zambian (1968–2012)</displayName>
@@ -6276,6 +6441,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">kwache zambiene</displayName>
 				<displayName count="other">kwache zambiene</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>zair nou</displayName>
@@ -6304,7 +6470,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 	<units>
 		<unitLength type="long">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0} pe {1}</compoundUnitPattern>
+				<compoundUnitPattern>{0} pe {1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>forță g</displayName>
@@ -6318,23 +6484,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} metri pe secundă la pătrat</unitPattern>
 				<unitPattern count="other">{0} de metri pe secundă la pătrat</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName>minute de arc</displayName>
-				<unitPattern count="one" draft="contributed">{0} minut</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} minute</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} de minute</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName>secunde de arc</displayName>
-				<unitPattern count="one" draft="contributed">{0} secundă</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} secunde</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} de secunde</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName>grade</displayName>
-				<unitPattern count="one">{0} grad</unitPattern>
-				<unitPattern count="few">{0} grade</unitPattern>
-				<unitPattern count="other">{0} de grade</unitPattern>
+			<unit type="angle-revolution">
+				<displayName>revoluție</displayName>
+				<unitPattern count="one">{0} revoluție</unitPattern>
+				<unitPattern count="few">{0} revoluții</unitPattern>
+				<unitPattern count="other">{0} de revoluții</unitPattern>
 			</unit>
 			<unit type="angle-radian">
 				<displayName>radiani</displayName>
@@ -6342,35 +6496,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} radiani</unitPattern>
 				<unitPattern count="other">{0} de radiani</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName>acri</displayName>
-				<unitPattern count="one">{0} acru</unitPattern>
-				<unitPattern count="few">{0} acri</unitPattern>
-				<unitPattern count="other">{0} de acri</unitPattern>
+			<unit type="angle-degree">
+				<displayName>grade</displayName>
+				<unitPattern count="one">{0} grad</unitPattern>
+				<unitPattern count="few">{0} grade</unitPattern>
+				<unitPattern count="other">{0} de grade</unitPattern>
 			</unit>
-			<unit type="area-hectare">
-				<displayName>hectare</displayName>
-				<unitPattern count="one">{0} hectar</unitPattern>
-				<unitPattern count="few">{0} hectare</unitPattern>
-				<unitPattern count="other">{0} de hectare</unitPattern>
+			<unit type="angle-arc-minute">
+				<displayName>minute de arc</displayName>
+				<unitPattern count="one">{0} minut de arc</unitPattern>
+				<unitPattern count="few">{0} minute de arc</unitPattern>
+				<unitPattern count="other">{0} de minute de arc</unitPattern>
 			</unit>
-			<unit type="area-square-centimeter">
-				<displayName>centimetri pătrați</displayName>
-				<unitPattern count="one">{0} centimetru pătrat</unitPattern>
-				<unitPattern count="few">{0} centimetri pătrați</unitPattern>
-				<unitPattern count="other">{0} de centimetri pătrați</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<displayName>picioare pătrate</displayName>
-				<unitPattern count="one">{0} picior pătrat</unitPattern>
-				<unitPattern count="few">{0} picioare pătrate</unitPattern>
-				<unitPattern count="other">{0} picioare pătrate</unitPattern>
-			</unit>
-			<unit type="area-square-inch">
-				<displayName>inchi pătrați</displayName>
-				<unitPattern count="one">{0} inch pătrat</unitPattern>
-				<unitPattern count="few">{0} inchi pătrați</unitPattern>
-				<unitPattern count="other">{0} de inchi pătrați</unitPattern>
+			<unit type="angle-arc-second">
+				<displayName>secunde de arc</displayName>
+				<unitPattern count="one">{0} secundă de arc</unitPattern>
+				<unitPattern count="few">{0} secunde de arc</unitPattern>
+				<unitPattern count="other">{0} de secunde de arc</unitPattern>
 			</unit>
 			<unit type="area-square-kilometer">
 				<displayName>kilometri pătrați</displayName>
@@ -6378,11 +6520,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kilometri pătrați</unitPattern>
 				<unitPattern count="other">{0} de kilometri pătrați</unitPattern>
 			</unit>
+			<unit type="area-hectare">
+				<displayName>hectare</displayName>
+				<unitPattern count="one">{0} hectar</unitPattern>
+				<unitPattern count="few">{0} hectare</unitPattern>
+				<unitPattern count="other">{0} de hectare</unitPattern>
+			</unit>
 			<unit type="area-square-meter">
 				<displayName>metri pătrați</displayName>
 				<unitPattern count="one">{0} metru pătrat</unitPattern>
 				<unitPattern count="few">{0} metri pătrați</unitPattern>
 				<unitPattern count="other">{0} de metri pătrați</unitPattern>
+				<perUnitPattern>{0} pe metru pătrat</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>centimetri pătrați</displayName>
+				<unitPattern count="one">{0} centimetru pătrat</unitPattern>
+				<unitPattern count="few">{0} centimetri pătrați</unitPattern>
+				<unitPattern count="other">{0} de centimetri pătrați</unitPattern>
+				<perUnitPattern>{0} pe centimetru pătrat</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
 				<displayName>mile pătrate</displayName>
@@ -6390,89 +6546,148 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mile pătrate</unitPattern>
 				<unitPattern count="other">{0} de mile pătrate</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<displayName>acri</displayName>
+				<unitPattern count="one">{0} acru</unitPattern>
+				<unitPattern count="few">{0} acri</unitPattern>
+				<unitPattern count="other">{0} de acri</unitPattern>
+			</unit>
 			<unit type="area-square-yard">
 				<displayName>iarzi pătrați</displayName>
 				<unitPattern count="one">{0} iard pătrat</unitPattern>
 				<unitPattern count="few">{0} iarzi pătrați</unitPattern>
 				<unitPattern count="other">{0} de iarzi pătrați</unitPattern>
 			</unit>
+			<unit type="area-square-foot">
+				<displayName>picioare pătrate</displayName>
+				<unitPattern count="one">{0} picior pătrat</unitPattern>
+				<unitPattern count="few">{0} picioare pătrate</unitPattern>
+				<unitPattern count="other">{0} de picioare pătrate</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>inchi pătrați</displayName>
+				<unitPattern count="one">{0} inch pătrat</unitPattern>
+				<unitPattern count="few">{0} inchi pătrați</unitPattern>
+				<unitPattern count="other">{0} de inchi pătrați</unitPattern>
+				<perUnitPattern>{0} pe inchi pătrat</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>karate</displayName>
+				<unitPattern count="one">{0} karată</unitPattern>
+				<unitPattern count="few">{0} karate</unitPattern>
+				<unitPattern count="other">{0} de karate</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litri pe kilometru</displayName>
 				<unitPattern count="one">{0} litru pe kilometru</unitPattern>
 				<unitPattern count="few">{0} litri pe kilometru</unitPattern>
 				<unitPattern count="other">{0} de litri pe kilometru</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>litri la suta de kilometri</displayName>
+				<unitPattern count="one">{0} litru la suta de kilometri</unitPattern>
+				<unitPattern count="few">{0} litri la suta de kilometri</unitPattern>
+				<unitPattern count="other">{0} de litri la suta de kilometri</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mile pe galon</displayName>
 				<unitPattern count="one">{0} milă pe galon</unitPattern>
 				<unitPattern count="few">{0} mile pe galon</unitPattern>
 				<unitPattern count="other">{0} de mile pe galon</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>biți</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="few">{0} biți</unitPattern>
-				<unitPattern count="other">{0} de biți</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byți</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="few">{0} byți</unitPattern>
-				<unitPattern count="other">{0} de byți</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabiți</displayName>
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="few">{0} gigabiți</unitPattern>
-				<unitPattern count="other">{0} de gigabiți</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabyți</displayName>
-				<unitPattern count="one">{0} gigabyte</unitPattern>
-				<unitPattern count="few">{0} gigabyți</unitPattern>
-				<unitPattern count="other">{0} de gigabyți</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobiți</displayName>
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="few">{0} kilobiți</unitPattern>
-				<unitPattern count="other">{0} de kilobiți</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobyți</displayName>
-				<unitPattern count="one">{0} kilobyte</unitPattern>
-				<unitPattern count="few">{0} kilobyți</unitPattern>
-				<unitPattern count="other">{0} de kilobyți</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabiți</displayName>
-				<unitPattern count="one">{0} megabit</unitPattern>
-				<unitPattern count="few">{0} megabiți</unitPattern>
-				<unitPattern count="other">{0} de megabiți</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabyți</displayName>
-				<unitPattern count="one">{0} megabyte</unitPattern>
-				<unitPattern count="few">{0} megabyți</unitPattern>
-				<unitPattern count="other">{0} de megabyți</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabiți</displayName>
-				<unitPattern count="one">{0} terabit</unitPattern>
-				<unitPattern count="few">{0} terabiți</unitPattern>
-				<unitPattern count="other">{0} de terabiți</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabyți</displayName>
 				<unitPattern count="one">{0} terabyte</unitPattern>
 				<unitPattern count="few">{0} terabyți</unitPattern>
 				<unitPattern count="other">{0} de terabyți</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabiți</displayName>
+				<unitPattern count="one">{0} terabit</unitPattern>
+				<unitPattern count="few">{0} terabiți</unitPattern>
+				<unitPattern count="other">{0} de terabiți</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabyți</displayName>
+				<unitPattern count="one">{0} gigabyte</unitPattern>
+				<unitPattern count="few">{0} gigabyți</unitPattern>
+				<unitPattern count="other">{0} de gigabyți</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabiți</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="few">{0} gigabiți</unitPattern>
+				<unitPattern count="other">{0} de gigabiți</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabyți</displayName>
+				<unitPattern count="one">{0} megabyte</unitPattern>
+				<unitPattern count="few">{0} megabyți</unitPattern>
+				<unitPattern count="other">{0} de megabyți</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabiți</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="few">{0} megabiți</unitPattern>
+				<unitPattern count="other">{0} de megabiți</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobyți</displayName>
+				<unitPattern count="one">{0} kilobyte</unitPattern>
+				<unitPattern count="few">{0} kilobyți</unitPattern>
+				<unitPattern count="other">{0} de kilobyți</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobiți</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="few">{0} kilobiți</unitPattern>
+				<unitPattern count="other">{0} de kilobiți</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byți</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="few">{0} byți</unitPattern>
+				<unitPattern count="other">{0} de byți</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>biți</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="few">{0} biți</unitPattern>
+				<unitPattern count="other">{0} de biți</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>secole</displayName>
+				<unitPattern count="one">{0} secol</unitPattern>
+				<unitPattern count="few">{0} secole</unitPattern>
+				<unitPattern count="other">{0} de secole</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ani</displayName>
+				<unitPattern count="one">{0} an</unitPattern>
+				<unitPattern count="few">{0} ani</unitPattern>
+				<unitPattern count="other">{0} de ani</unitPattern>
+				<perUnitPattern>{0} pe an</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>luni</displayName>
+				<unitPattern count="one">{0} lună</unitPattern>
+				<unitPattern count="few">{0} luni</unitPattern>
+				<unitPattern count="other">{0} de luni</unitPattern>
+				<perUnitPattern>{0} pe lună</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>săptămâni</displayName>
+				<unitPattern count="one">{0} săptămână</unitPattern>
+				<unitPattern count="few">{0} săptămâni</unitPattern>
+				<unitPattern count="other">{0} de săptămâni</unitPattern>
+				<perUnitPattern>{0} pe săptămână</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>zile</displayName>
 				<unitPattern count="one">{0} zi</unitPattern>
 				<unitPattern count="few">{0} zile</unitPattern>
 				<unitPattern count="other">{0} de zile</unitPattern>
+				<perUnitPattern>{0} pe zi</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>ore</displayName>
@@ -6481,35 +6696,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} de ore</unitPattern>
 				<perUnitPattern>{0} pe oră</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>microsecunde</displayName>
-				<unitPattern count="one">{0} microsecundă</unitPattern>
-				<unitPattern count="few">{0} microsecunde</unitPattern>
-				<unitPattern count="other">{0} de microsecunde</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milisecunde</displayName>
-				<unitPattern count="one">{0} milisecundă</unitPattern>
-				<unitPattern count="few">{0} milisecunde</unitPattern>
-				<unitPattern count="other">{0} de milisecunde</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>minute</displayName>
 				<unitPattern count="one">{0} minut</unitPattern>
 				<unitPattern count="few">{0} minute</unitPattern>
 				<unitPattern count="other">{0} de minute</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>luni</displayName>
-				<unitPattern count="one">{0} lună</unitPattern>
-				<unitPattern count="few">{0} luni</unitPattern>
-				<unitPattern count="other">{0} de luni</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanosecunde</displayName>
-				<unitPattern count="one">{0} nanosecundă</unitPattern>
-				<unitPattern count="few">{0} nanosecunde</unitPattern>
-				<unitPattern count="other">{0} de nanosecunde</unitPattern>
+				<perUnitPattern>{0} pe minut</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>secunde</displayName>
@@ -6518,17 +6710,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} de secunde</unitPattern>
 				<perUnitPattern>{0} pe secundă</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>săptămâni</displayName>
-				<unitPattern count="one">{0} săptămână</unitPattern>
-				<unitPattern count="few">{0} săptămâni</unitPattern>
-				<unitPattern count="other">{0} de săptămâni</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milisecunde</displayName>
+				<unitPattern count="one">{0} milisecundă</unitPattern>
+				<unitPattern count="few">{0} milisecunde</unitPattern>
+				<unitPattern count="other">{0} de milisecunde</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>ani</displayName>
-				<unitPattern count="one">{0} an</unitPattern>
-				<unitPattern count="few">{0} ani</unitPattern>
-				<unitPattern count="other">{0} de ani</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>microsecunde</displayName>
+				<unitPattern count="one">{0} microsecundă</unitPattern>
+				<unitPattern count="few">{0} microsecunde</unitPattern>
+				<unitPattern count="other">{0} de microsecunde</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosecunde</displayName>
+				<unitPattern count="one">{0} nanosecundă</unitPattern>
+				<unitPattern count="few">{0} nanosecunde</unitPattern>
+				<unitPattern count="other">{0} de nanosecunde</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amperi</displayName>
@@ -6554,6 +6752,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} volți</unitPattern>
 				<unitPattern count="other">{0} de volți</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilocalorii</displayName>
+				<unitPattern count="one">{0} kilocalorie</unitPattern>
+				<unitPattern count="few">{0} kilocalorii</unitPattern>
+				<unitPattern count="other">{0} de kilocalorii</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>calorii</displayName>
 				<unitPattern count="one">{0} calorie</unitPattern>
@@ -6566,24 +6770,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kilocalorii</unitPattern>
 				<unitPattern count="other">{0} de kilocalorii</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>jouli</displayName>
-				<unitPattern count="one">{0} joule</unitPattern>
-				<unitPattern count="few">{0} jouli</unitPattern>
-				<unitPattern count="other">{0} de jouli</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilocalorii</displayName>
-				<unitPattern count="one">{0} kilocalorie</unitPattern>
-				<unitPattern count="few">{0} kilocalorii</unitPattern>
-				<unitPattern count="other">{0} de kilocalorii</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojouli</displayName>
 				<unitPattern count="one">{0} kilojoule</unitPattern>
 				<unitPattern count="few">{0} kilojouli</unitPattern>
 				<unitPattern count="other">{0} de kilojouli</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>jouli</displayName>
+				<unitPattern count="one">{0} joule</unitPattern>
+				<unitPattern count="few">{0} jouli</unitPattern>
+				<unitPattern count="other">{0} de jouli</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilowați-oră</displayName>
 				<unitPattern count="one">kilowatt-oră</unitPattern>
@@ -6596,11 +6794,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} gigahertzi</unitPattern>
 				<unitPattern count="other">{0} de gigahertzi</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hertz</displayName>
-				<unitPattern count="one">{0} hertz</unitPattern>
-				<unitPattern count="few">{0} hertzi</unitPattern>
-				<unitPattern count="other">{0} de hertzi</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megahertz</displayName>
+				<unitPattern count="one">{0} megahertz</unitPattern>
+				<unitPattern count="few">{0} megahertzi</unitPattern>
+				<unitPattern count="other">{0} de megahertzi</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kilohertz</displayName>
@@ -6608,23 +6806,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kilohertzi</unitPattern>
 				<unitPattern count="other">{0} de kilohertzi</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megahertz</displayName>
-				<unitPattern count="one">{0} megahertz</unitPattern>
-				<unitPattern count="few">{0} megahertzi</unitPattern>
-				<unitPattern count="other">{0} de megahertzi</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hertz</displayName>
+				<unitPattern count="one">{0} hertz</unitPattern>
+				<unitPattern count="few">{0} hertzi</unitPattern>
+				<unitPattern count="other">{0} de hertzi</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>unități astronomice</displayName>
-				<unitPattern count="one">{0} unitate astronomică</unitPattern>
-				<unitPattern count="few">{0} unități astronomice</unitPattern>
-				<unitPattern count="other">{0} de unități astronomice</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometri</displayName>
+				<unitPattern count="one">{0} kilometru</unitPattern>
+				<unitPattern count="few">{0} kilometri</unitPattern>
+				<unitPattern count="other">{0} de kilometri</unitPattern>
+				<perUnitPattern>{0} pe kilometru</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>centimetri</displayName>
-				<unitPattern count="one">{0} centimetru</unitPattern>
-				<unitPattern count="few">{0} centimetri</unitPattern>
-				<unitPattern count="other">{0} de centimetri</unitPattern>
+			<unit type="length-meter">
+				<displayName>metri</displayName>
+				<unitPattern count="one">{0} metru</unitPattern>
+				<unitPattern count="few">{0} metri</unitPattern>
+				<unitPattern count="other">{0} de metri</unitPattern>
+				<perUnitPattern>{0} pe metru</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>decimetri</displayName>
@@ -6632,47 +6832,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} decimetri</unitPattern>
 				<unitPattern count="other">{0} de decimetri</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>picioare</displayName>
-				<unitPattern count="one">{0} picior</unitPattern>
-				<unitPattern count="few">{0} picioare</unitPattern>
-				<unitPattern count="other">{0} de picioare</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>inchi</displayName>
-				<unitPattern count="one">{0} inch</unitPattern>
-				<unitPattern count="few">{0} inchi</unitPattern>
-				<unitPattern count="other">{0} de inchi</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometri</displayName>
-				<unitPattern count="one">{0} kilometru</unitPattern>
-				<unitPattern count="few">{0} kilometri</unitPattern>
-				<unitPattern count="other">{0} de kilometri</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ani lumină</displayName>
-				<unitPattern count="one">{0} an lumină</unitPattern>
-				<unitPattern count="few">{0} ani lumină</unitPattern>
-				<unitPattern count="other">{0} de ani lumină</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metri</displayName>
-				<unitPattern count="one">{0} metru</unitPattern>
-				<unitPattern count="few">{0} metri</unitPattern>
-				<unitPattern count="other">{0} de metri</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>micrometri</displayName>
-				<unitPattern count="one">{0} micrometru</unitPattern>
-				<unitPattern count="few">{0} micrometri</unitPattern>
-				<unitPattern count="other">{0} de micrometri</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mile</displayName>
-				<unitPattern count="one">{0} milă</unitPattern>
-				<unitPattern count="few">{0} mile</unitPattern>
-				<unitPattern count="other">{0} de mile</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>centimetri</displayName>
+				<unitPattern count="one">{0} centimetru</unitPattern>
+				<unitPattern count="few">{0} centimetri</unitPattern>
+				<unitPattern count="other">{0} de centimetri</unitPattern>
+				<perUnitPattern>{0} pe centimetru</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>milimetri</displayName>
@@ -6680,71 +6845,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} milimetri</unitPattern>
 				<unitPattern count="other">{0} de milimetri</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>micrometri</displayName>
+				<unitPattern count="one">{0} micrometru</unitPattern>
+				<unitPattern count="few">{0} micrometri</unitPattern>
+				<unitPattern count="other">{0} de micrometri</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanometri</displayName>
 				<unitPattern count="one">{0} nanometru</unitPattern>
 				<unitPattern count="few">{0} nanometri</unitPattern>
 				<unitPattern count="other">{0} de nanometri</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>mile nautice</displayName>
-				<unitPattern count="one">{0} milă nautică</unitPattern>
-				<unitPattern count="few">{0} mile nautice</unitPattern>
-				<unitPattern count="other">{0} de mile nautice</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parseci</displayName>
-				<unitPattern count="one">{0} parsec</unitPattern>
-				<unitPattern count="few">{0} parseci</unitPattern>
-				<unitPattern count="other">{0} de parseci</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>picometri</displayName>
 				<unitPattern count="one">{0} picometru</unitPattern>
 				<unitPattern count="few">{0} picometri</unitPattern>
 				<unitPattern count="other">{0} de picometri</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mile</displayName>
+				<unitPattern count="one">{0} milă</unitPattern>
+				<unitPattern count="few">{0} mile</unitPattern>
+				<unitPattern count="other">{0} de mile</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>iarzi</displayName>
 				<unitPattern count="one">{0} iard</unitPattern>
 				<unitPattern count="few">{0} iarzi</unitPattern>
 				<unitPattern count="other">{0} de iarzi</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>picioare</displayName>
+				<unitPattern count="one">{0} picior</unitPattern>
+				<unitPattern count="few">{0} picioare</unitPattern>
+				<unitPattern count="other">{0} de picioare</unitPattern>
+				<perUnitPattern>{0} pe picior</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>inchi</displayName>
+				<unitPattern count="one">{0} inch</unitPattern>
+				<unitPattern count="few">{0} inchi</unitPattern>
+				<unitPattern count="other">{0} de inchi</unitPattern>
+				<perUnitPattern>{0} pe inch</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parseci</displayName>
+				<unitPattern count="one">{0} parsec</unitPattern>
+				<unitPattern count="few">{0} parseci</unitPattern>
+				<unitPattern count="other">{0} de parseci</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ani lumină</displayName>
+				<unitPattern count="one">{0} an lumină</unitPattern>
+				<unitPattern count="few">{0} ani lumină</unitPattern>
+				<unitPattern count="other">{0} de ani lumină</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>unități astronomice</displayName>
+				<unitPattern count="one">{0} unitate astronomică</unitPattern>
+				<unitPattern count="few">{0} unități astronomice</unitPattern>
+				<unitPattern count="other">{0} de unități astronomice</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>mile nautice</displayName>
+				<unitPattern count="one">{0} milă nautică</unitPattern>
+				<unitPattern count="few">{0} mile nautice</unitPattern>
+				<unitPattern count="other">{0} de mile nautice</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>milă scandinavă</displayName>
+				<unitPattern count="one">{0} milă scandinavă</unitPattern>
+				<unitPattern count="few">{0} mile scandinave</unitPattern>
+				<unitPattern count="other">{0} de mile scandinave</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lucși</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
 				<unitPattern count="few">{0} lucși</unitPattern>
 				<unitPattern count="other">{0} de lucși</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>carate</displayName>
-				<unitPattern count="one">{0} carat</unitPattern>
-				<unitPattern count="few">{0} carate</unitPattern>
-				<unitPattern count="other">{0} de carate</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>grame</displayName>
-				<unitPattern count="one">{0} gram</unitPattern>
-				<unitPattern count="few">{0} grame</unitPattern>
-				<unitPattern count="other">{0} de grame</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilograme</displayName>
-				<unitPattern count="one">{0} kilogram</unitPattern>
-				<unitPattern count="few">{0} kilograme</unitPattern>
-				<unitPattern count="other">{0} de kilograme</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>tone</displayName>
 				<unitPattern count="one">{0} tonă</unitPattern>
 				<unitPattern count="few">{0} tone</unitPattern>
 				<unitPattern count="other">{0} de tone</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>micrograme</displayName>
-				<unitPattern count="one">{0} microgram</unitPattern>
-				<unitPattern count="few">{0} micrograme</unitPattern>
-				<unitPattern count="other">{0} de micrograme</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilograme</displayName>
+				<unitPattern count="one">{0} kilogram</unitPattern>
+				<unitPattern count="few">{0} kilograme</unitPattern>
+				<unitPattern count="other">{0} de kilograme</unitPattern>
+				<perUnitPattern>{0} per kilogram</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>grame</displayName>
+				<unitPattern count="one">{0} gram</unitPattern>
+				<unitPattern count="few">{0} grame</unitPattern>
+				<unitPattern count="other">{0} de grame</unitPattern>
+				<perUnitPattern>{0} per gram</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>miligrame</displayName>
@@ -6752,23 +6951,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} miligrame</unitPattern>
 				<unitPattern count="other">{0} de miligrame</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>uncii</displayName>
-				<unitPattern count="one">{0} uncie</unitPattern>
-				<unitPattern count="few">{0} uncii</unitPattern>
-				<unitPattern count="other">{0} de uncii</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>uncii monetare</displayName>
-				<unitPattern count="one">{0} uncie monetară</unitPattern>
-				<unitPattern count="few">{0} uncii monetare</unitPattern>
-				<unitPattern count="other">{0} de uncii monetare</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>livre</displayName>
-				<unitPattern count="one">{0} livră</unitPattern>
-				<unitPattern count="few">{0} livre</unitPattern>
-				<unitPattern count="other">{0} de livre</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>micrograme</displayName>
+				<unitPattern count="one">{0} microgram</unitPattern>
+				<unitPattern count="few">{0} micrograme</unitPattern>
+				<unitPattern count="other">{0} de micrograme</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tone scurte</displayName>
@@ -6776,35 +6963,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} tone scurte</unitPattern>
 				<unitPattern count="other">{0} de tone scurte</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>livre</displayName>
+				<unitPattern count="one">{0} livră</unitPattern>
+				<unitPattern count="few">{0} livre</unitPattern>
+				<unitPattern count="other">{0} de livre</unitPattern>
+				<perUnitPattern>{0} per livră</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>uncii</displayName>
+				<unitPattern count="one">{0} uncie</unitPattern>
+				<unitPattern count="few">{0} uncii</unitPattern>
+				<unitPattern count="other">{0} de uncii</unitPattern>
+				<perUnitPattern>{0} per uncie</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>uncii monetare</displayName>
+				<unitPattern count="one">{0} uncie monetară</unitPattern>
+				<unitPattern count="few">{0} uncii monetare</unitPattern>
+				<unitPattern count="other">{0} de uncii monetare</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>carate</displayName>
+				<unitPattern count="one">{0} carat</unitPattern>
+				<unitPattern count="few">{0} carate</unitPattern>
+				<unitPattern count="other">{0} de carate</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigawați</displayName>
 				<unitPattern count="one">{0} gigawatt</unitPattern>
 				<unitPattern count="few">{0} gigawați</unitPattern>
 				<unitPattern count="other">{0} de gigawați</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>cai putere</displayName>
-				<unitPattern count="one">{0} cal putere</unitPattern>
-				<unitPattern count="few">{0} cai putere</unitPattern>
-				<unitPattern count="other">{0} de cai putere</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilowați</displayName>
-				<unitPattern count="one">{0} kilowatt</unitPattern>
-				<unitPattern count="few">{0} kilowați</unitPattern>
-				<unitPattern count="other">{0} de kilowați</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>megawați</displayName>
 				<unitPattern count="one">{0} megawatt</unitPattern>
 				<unitPattern count="few">{0} megawați</unitPattern>
 				<unitPattern count="other">{0} de megawați</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>miliwați</displayName>
-				<unitPattern count="one">{0} miliwatt</unitPattern>
-				<unitPattern count="few">{0} miliwați</unitPattern>
-				<unitPattern count="other">{0} de miliwați</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilowați</displayName>
+				<unitPattern count="one">{0} kilowatt</unitPattern>
+				<unitPattern count="few">{0} kilowați</unitPattern>
+				<unitPattern count="other">{0} de kilowați</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>wați</displayName>
@@ -6812,24 +7013,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} wați</unitPattern>
 				<unitPattern count="other">{0} de wați</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>miliwați</displayName>
+				<unitPattern count="one">{0} miliwatt</unitPattern>
+				<unitPattern count="few">{0} miliwați</unitPattern>
+				<unitPattern count="other">{0} de miliwați</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>cai putere</displayName>
+				<unitPattern count="one">{0} cal putere</unitPattern>
+				<unitPattern count="few">{0} cai putere</unitPattern>
+				<unitPattern count="other">{0} de cai putere</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hectopascali</displayName>
 				<unitPattern count="one">{0} hectopascal</unitPattern>
 				<unitPattern count="few">{0} hectopascali</unitPattern>
 				<unitPattern count="other">{0} de hectopascali</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inchi coloană de mercur</displayName>
-				<unitPattern count="one">{0} inch coloană de mercur</unitPattern>
-				<unitPattern count="few">{0} inchi coloană de mercur</unitPattern>
-				<unitPattern count="other">{0} de inchi coloană de mercur</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>milibari</displayName>
-				<unitPattern count="one">{0} milibar</unitPattern>
-				<unitPattern count="few">{0} milibari</unitPattern>
-				<unitPattern count="other">{0} de milibari</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>milimetri coloană de mercur</displayName>
 				<unitPattern count="one">{0} milimetru coloană de mercur</unitPattern>
@@ -6842,11 +7043,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} livre pe inch pătrat</unitPattern>
 				<unitPattern count="other">{0} de livre pe inch pătrat</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karate</displayName>
-				<unitPattern count="one">{0} karată</unitPattern>
-				<unitPattern count="few">{0} karate</unitPattern>
-				<unitPattern count="other">{0} de karate</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inchi coloană de mercur</displayName>
+				<unitPattern count="one">{0} inch coloană de mercur</unitPattern>
+				<unitPattern count="few">{0} inchi coloană de mercur</unitPattern>
+				<unitPattern count="other">{0} de inchi coloană de mercur</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>milibari</displayName>
+				<unitPattern count="one">{0} milibar</unitPattern>
+				<unitPattern count="few">{0} milibari</unitPattern>
+				<unitPattern count="other">{0} de milibari</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometri pe oră</displayName>
@@ -6866,6 +7073,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mile pe oră</unitPattern>
 				<unitPattern count="other">{0} de mile pe oră</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>nod</displayName>
+				<unitPattern count="one">{0} nod</unitPattern>
+				<unitPattern count="few">{0} noduri</unitPattern>
+				<unitPattern count="other">{0} de noduri</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>grade Celsius</displayName>
 				<unitPattern count="one">{0} grad Celsius</unitPattern>
@@ -6884,36 +7103,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kelvini</unitPattern>
 				<unitPattern count="other">{0} de kelvini</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>acru-picioare</displayName>
-				<unitPattern count="one">{0} acru-picior</unitPattern>
-				<unitPattern count="few">{0} acru-picioare</unitPattern>
-				<unitPattern count="other">{0} de acru-picioare</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>centilitri</displayName>
-				<unitPattern count="one">{0} centilitru</unitPattern>
-				<unitPattern count="few">{0} centilitri</unitPattern>
-				<unitPattern count="other">{0} de centilitri</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>centimetri cubi</displayName>
-				<unitPattern count="one">{0} centimetru cub</unitPattern>
-				<unitPattern count="few">{0} centimetri cubi</unitPattern>
-				<unitPattern count="other">{0} de centimetri cubi</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>picioare cubice</displayName>
-				<unitPattern count="one">{0} picior cubic</unitPattern>
-				<unitPattern count="few">{0} picioare cubice</unitPattern>
-				<unitPattern count="other">{0} de picioare cubice</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>inchi cubici</displayName>
-				<unitPattern count="one">{0} inch cubic</unitPattern>
-				<unitPattern count="few">{0} inchi cubici</unitPattern>
-				<unitPattern count="other">{0} de inchi cubici</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kilometri cubi</displayName>
 				<unitPattern count="one">{0} kilometru cub</unitPattern>
@@ -6925,6 +7114,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} metru cub</unitPattern>
 				<unitPattern count="few">{0} metri cubi</unitPattern>
 				<unitPattern count="other">{0} de metri cubi</unitPattern>
+				<perUnitPattern>{0} pe metru cub</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>centimetri cubi</displayName>
+				<unitPattern count="one">{0} centimetru cub</unitPattern>
+				<unitPattern count="few">{0} centimetri cubi</unitPattern>
+				<unitPattern count="other">{0} de centimetri cubi</unitPattern>
+				<perUnitPattern>{0} pe centimetru cub</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mile cubice</displayName>
@@ -6938,29 +7135,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} iarzi cubici</unitPattern>
 				<unitPattern count="other">{0} de iarzi cubici</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>căni</displayName>
-				<unitPattern count="one">{0} cană</unitPattern>
-				<unitPattern count="few">{0} căni</unitPattern>
-				<unitPattern count="other">{0} de căni</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>picioare cubice</displayName>
+				<unitPattern count="one">{0} picior cubic</unitPattern>
+				<unitPattern count="few">{0} picioare cubice</unitPattern>
+				<unitPattern count="other">{0} de picioare cubice</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>decilitri</displayName>
-				<unitPattern count="one">{0} decilitru</unitPattern>
-				<unitPattern count="few">{0} decilitri</unitPattern>
-				<unitPattern count="other">{0} de decilitri</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>inchi cubici</displayName>
+				<unitPattern count="one">{0} inch cubic</unitPattern>
+				<unitPattern count="few">{0} inchi cubici</unitPattern>
+				<unitPattern count="other">{0} de inchi cubici</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>uncii lichide</displayName>
-				<unitPattern count="one">{0} uncie lichidă</unitPattern>
-				<unitPattern count="few">{0} uncii lichide</unitPattern>
-				<unitPattern count="other">{0} de uncii lichide</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>galoane</displayName>
-				<unitPattern count="one">{0} galon</unitPattern>
-				<unitPattern count="few">{0} galoane</unitPattern>
-				<unitPattern count="other">{0} de galoane</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megalitri</displayName>
+				<unitPattern count="one">{0} megalitru</unitPattern>
+				<unitPattern count="few">{0} megalitri</unitPattern>
+				<unitPattern count="other">{0} megalitri</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hectolitri</displayName>
@@ -6973,12 +7164,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} litru</unitPattern>
 				<unitPattern count="few">{0} litri</unitPattern>
 				<unitPattern count="other">{0} de litri</unitPattern>
+				<perUnitPattern>{0} pe litru</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalitri</displayName>
-				<unitPattern count="one">{0} megalitru</unitPattern>
-				<unitPattern count="few">{0} megalitri</unitPattern>
-				<unitPattern count="other">{0} megalitri</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>decilitri</displayName>
+				<unitPattern count="one">{0} decilitru</unitPattern>
+				<unitPattern count="few">{0} decilitri</unitPattern>
+				<unitPattern count="other">{0} de decilitri</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centilitri</displayName>
+				<unitPattern count="one">{0} centilitru</unitPattern>
+				<unitPattern count="few">{0} centilitri</unitPattern>
+				<unitPattern count="other">{0} de centilitri</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mililitri</displayName>
@@ -6986,11 +7184,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mililitri</unitPattern>
 				<unitPattern count="other">{0} de mililitri</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pinte</displayName>
-				<unitPattern count="one">{0} pintă</unitPattern>
-				<unitPattern count="few">{0} pinte</unitPattern>
-				<unitPattern count="other">{0} de pinte</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>pinte metrice</displayName>
+				<unitPattern count="one">{0} pintă metrică</unitPattern>
+				<unitPattern count="few">{0} pinte metrice</unitPattern>
+				<unitPattern count="other">{0} de pinte metrice</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>căni metrice</displayName>
+				<unitPattern count="one">{0} cană metrică</unitPattern>
+				<unitPattern count="few">{0} căni metrice</unitPattern>
+				<unitPattern count="other">{0} de căni metrice</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acru-picioare</displayName>
+				<unitPattern count="one">{0} acru-picior</unitPattern>
+				<unitPattern count="few">{0} acru-picioare</unitPattern>
+				<unitPattern count="other">{0} de acru-picioare</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galoane</displayName>
+				<unitPattern count="one">{0} galon</unitPattern>
+				<unitPattern count="few">{0} galoane</unitPattern>
+				<unitPattern count="other">{0} de galoane</unitPattern>
+				<perUnitPattern>{0} per galon</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>quarte</displayName>
@@ -6998,6 +7215,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} quarte</unitPattern>
 				<unitPattern count="other">{0} de quarte</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pinte</displayName>
+				<unitPattern count="one">{0} pintă</unitPattern>
+				<unitPattern count="few">{0} pinte</unitPattern>
+				<unitPattern count="other">{0} de pinte</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>căni</displayName>
+				<unitPattern count="one">{0} cană</unitPattern>
+				<unitPattern count="few">{0} căni</unitPattern>
+				<unitPattern count="other">{0} de căni</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>uncii lichide</displayName>
+				<unitPattern count="one">{0} uncie lichidă</unitPattern>
+				<unitPattern count="few">{0} uncii lichide</unitPattern>
+				<unitPattern count="other">{0} de uncii lichide</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>linguri</displayName>
 				<unitPattern count="one">{0} lingură</unitPattern>
@@ -7010,10 +7245,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} lingurițe</unitPattern>
 				<unitPattern count="other">{0} de lingurițe</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} V</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>forță g</displayName>
@@ -7027,6 +7268,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev.</displayName>
+				<unitPattern count="one">{0} rev.</unitPattern>
+				<unitPattern count="few">{0} rev.</unitPattern>
+				<unitPattern count="other">{0} rev.</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="few">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>grade</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>arcmin</displayName>
 				<unitPattern count="one">{0} arcmin</unitPattern>
@@ -7039,23 +7298,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} sec.</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} sec.</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>grade</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="few">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="few">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>acri</displayName>
-				<unitPattern count="one">{0} ac.</unitPattern>
-				<unitPattern count="few">{0} ac.</unitPattern>
-				<unitPattern count="other">{0} ac.</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="few">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ha</displayName>
@@ -7063,11 +7310,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="few">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0} pe m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="few">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0} pe cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="few">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acri</displayName>
+				<unitPattern count="one">{0} ac.</unitPattern>
+				<unitPattern count="few">{0} ac.</unitPattern>
+				<unitPattern count="other">{0} ac.</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="few">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ft²</displayName>
@@ -7080,30 +7353,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="few">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="few">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="few">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="few">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="few">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="few">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
@@ -7111,90 +7367,132 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} l/km</unitPattern>
 				<unitPattern count="other">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">l/100 km</unitPattern>
+				<unitPattern count="few">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mile/gal.</displayName>
 				<unitPattern count="one">{0} milă/gal.</unitPattern>
 				<unitPattern count="few">{0} mile/gal.</unitPattern>
 				<unitPattern count="other">{0} mile/gal.</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>b</displayName>
-				<unitPattern count="one">{0} b</unitPattern>
-				<unitPattern count="few">{0} b</unitPattern>
-				<unitPattern count="other">{0} b</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>B</displayName>
-				<unitPattern count="one">{0} B</unitPattern>
-				<unitPattern count="few">{0} B</unitPattern>
-				<unitPattern count="other">{0} B</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="few">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="few">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="few">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="few">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="few">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="few">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="few">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="few">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="few">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="few">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="few">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="few">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="few">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="few">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="few">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>B</displayName>
+				<unitPattern count="one">{0} B</unitPattern>
+				<unitPattern count="few">{0} B</unitPattern>
+				<unitPattern count="other">{0} B</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>b</displayName>
+				<unitPattern count="one">{0} b</unitPattern>
+				<unitPattern count="few">{0} b</unitPattern>
+				<unitPattern count="other">{0} b</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>sec.</displayName>
+				<unitPattern count="one">{0} sec.</unitPattern>
+				<unitPattern count="few">{0} sec.</unitPattern>
+				<unitPattern count="other">{0} sec.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ani</displayName>
+				<unitPattern count="one">{0} an</unitPattern>
+				<unitPattern count="few">{0} ani</unitPattern>
+				<unitPattern count="other">{0} ani</unitPattern>
+				<perUnitPattern>{0}/an</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>luni</displayName>
+				<unitPattern count="one">{0} lună</unitPattern>
+				<unitPattern count="few">{0} luni</unitPattern>
+				<unitPattern count="other">{0} luni</unitPattern>
+				<perUnitPattern>{0}/lună</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>săptămâni</displayName>
+				<unitPattern count="one">{0} săpt.</unitPattern>
+				<unitPattern count="few">{0} săpt.</unitPattern>
+				<unitPattern count="other">{0} săpt.</unitPattern>
+				<perUnitPattern>{0}/săpt.</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>zile</displayName>
 				<unitPattern count="one">{0} zi</unitPattern>
 				<unitPattern count="few">{0} zile</unitPattern>
 				<unitPattern count="other">{0} zile</unitPattern>
+				<perUnitPattern>{0}/zi</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>ore</displayName>
-				<unitPattern count="one" draft="contributed">{0} oră</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ore</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ore</unitPattern>
+				<unitPattern count="one">{0} oră</unitPattern>
+				<unitPattern count="few">{0} ore</unitPattern>
+				<unitPattern count="other">{0} ore</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="few">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
+			<unit type="duration-minute">
+				<displayName>min.</displayName>
+				<unitPattern count="one">{0} min.</unitPattern>
+				<unitPattern count="few">{0} min.</unitPattern>
+				<unitPattern count="other">{0} min.</unitPattern>
+				<perUnitPattern>{0}/min.</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>s</displayName>
+				<unitPattern count="one">{0} s</unitPattern>
+				<unitPattern count="few">{0} s</unitPattern>
+				<unitPattern count="other">{0} s</unitPattern>
+				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>ms</displayName>
@@ -7202,17 +7500,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ms</unitPattern>
 				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>min.</displayName>
-				<unitPattern count="one">{0} min.</unitPattern>
-				<unitPattern count="few">{0} min.</unitPattern>
-				<unitPattern count="other">{0} min.</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>luni</displayName>
-				<unitPattern count="one">{0} lună</unitPattern>
-				<unitPattern count="few">{0} luni</unitPattern>
-				<unitPattern count="other">{0} luni</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="few">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>ns</displayName>
@@ -7220,25 +7512,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ns</unitPattern>
 				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>sec.</displayName>
-				<unitPattern count="one">{0} sec.</unitPattern>
-				<unitPattern count="few">{0} sec.</unitPattern>
-				<unitPattern count="other">{0} sec.</unitPattern>
-				<perUnitPattern>{0}/s</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>săptămâni</displayName>
-				<unitPattern count="one">{0} săpt.</unitPattern>
-				<unitPattern count="few">{0} săpt.</unitPattern>
-				<unitPattern count="other">{0} săpt.</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>ani</displayName>
-				<unitPattern count="one">{0} an</unitPattern>
-				<unitPattern count="few">{0} ani</unitPattern>
-				<unitPattern count="other">{0} ani</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>A</displayName>
 				<unitPattern count="one">{0} A</unitPattern>
@@ -7263,6 +7536,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="few">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -7275,24 +7554,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kcal</unitPattern>
 				<unitPattern count="other">{0} kcal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>J</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="few">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="few">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="few">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="few">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -7305,11 +7578,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="few">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="few">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
@@ -7317,23 +7590,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="few">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="few">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>ua</displayName>
-				<unitPattern count="one">{0} ua</unitPattern>
-				<unitPattern count="few">{0} ua</unitPattern>
-				<unitPattern count="other">{0} ua</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="few">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="few">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>metri</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="few">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
@@ -7341,47 +7616,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ft</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="few">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>in</displayName>
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="few">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="few">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>a.l.</displayName>
-				<unitPattern count="one">{0} a.l.</unitPattern>
-				<unitPattern count="few">{0} a.l.</unitPattern>
-				<unitPattern count="other">{0} a.l.</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metri</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="few">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="few">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mi</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="few">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="few">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -7389,71 +7629,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="few">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="few">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>mn</displayName>
-				<unitPattern count="one">{0} mn</unitPattern>
-				<unitPattern count="few">{0} mn</unitPattern>
-				<unitPattern count="other">{0} mn</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="few">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="few">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="few">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yd</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="few">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ft</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="few">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>in</displayName>
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="few">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="few">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>a.l.</displayName>
+				<unitPattern count="one">{0} a.l.</unitPattern>
+				<unitPattern count="few">{0} a.l.</unitPattern>
+				<unitPattern count="other">{0} a.l.</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ua</displayName>
+				<unitPattern count="one">{0} ua</unitPattern>
+				<unitPattern count="few">{0} ua</unitPattern>
+				<unitPattern count="other">{0} ua</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>mn</displayName>
+				<unitPattern count="one">{0} mn</unitPattern>
+				<unitPattern count="few">{0} mn</unitPattern>
+				<unitPattern count="other">{0} mn</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="few">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="few">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>carate</displayName>
-				<unitPattern count="one">{0} ct</unitPattern>
-				<unitPattern count="few">{0} ct</unitPattern>
-				<unitPattern count="other">{0} ct</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>grame</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="few">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="few">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="few">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="few">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="few">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>grame</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
@@ -7461,23 +7735,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="few">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="few">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="few">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="few">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>t.s.</displayName>
@@ -7485,35 +7747,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} t.s.</unitPattern>
 				<unitPattern count="other">{0} t.s.</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="few">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="few">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="few">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>carate</displayName>
+				<unitPattern count="one">{0} ct</unitPattern>
+				<unitPattern count="few">{0} ct</unitPattern>
+				<unitPattern count="other">{0} ct</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="few">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>CP</displayName>
-				<unitPattern count="one">{0} CP</unitPattern>
-				<unitPattern count="few">{0} CP</unitPattern>
-				<unitPattern count="other">{0} CP</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="few">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="few">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="few">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="few">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>W</displayName>
@@ -7521,24 +7797,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="few">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>CP</displayName>
+				<unitPattern count="one">{0} CP</unitPattern>
+				<unitPattern count="few">{0} CP</unitPattern>
+				<unitPattern count="other">{0} CP</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="few">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>in Hg</displayName>
-				<unitPattern count="one">{0} in Hg</unitPattern>
-				<unitPattern count="few">{0} in Hg</unitPattern>
-				<unitPattern count="other">{0} in Hg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="few">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -7551,11 +7827,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="few">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>in Hg</displayName>
+				<unitPattern count="one">{0} in Hg</unitPattern>
+				<unitPattern count="few">{0} in Hg</unitPattern>
+				<unitPattern count="other">{0} in Hg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="few">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -7575,6 +7857,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="few">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0} °C</unitPattern>
@@ -7593,36 +7887,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="few">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="few">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="few">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="few">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="few">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -7634,6 +7898,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="few">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="few">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -7647,29 +7919,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>căni</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="few">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="few">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="few">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="few">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="few">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="few">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="few">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -7682,12 +7948,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="few">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="one">{0} Ml</unitPattern>
-				<unitPattern count="few">{0} Ml</unitPattern>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="few">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="few">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
@@ -7695,11 +7968,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pinte</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="few">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="few">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="few">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="few">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="few">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
@@ -7707,6 +7999,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pinte</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="few">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>căni</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="few">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="few">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>tbsp</displayName>
 				<unitPattern count="one">{0} tbsp</unitPattern>
@@ -7719,16 +8029,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} tsp</unitPattern>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}V</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<unitPattern count="one" draft="contributed">{0} G</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} G</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="few" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one" draft="contributed">{0}′</unitPattern>
 				<unitPattern count="few" draft="contributed">{0}′</unitPattern>
@@ -7739,31 +8060,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0}″</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="few" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one" draft="contributed">{0} ac.</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ac.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ac.</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} km²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one" draft="contributed">{0} ha</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} ha</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one" draft="contributed">{0} ft²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ft²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one" draft="contributed">{0} m²</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} m²</unitPattern>
@@ -7774,6 +8080,40 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} mi²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one" draft="contributed">{0} ac.</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ac.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ac.</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one" draft="contributed">{0} ft²</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ft²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="few">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>a</displayName>
+				<unitPattern count="one">{0} a</unitPattern>
+				<unitPattern count="few">{0} a</unitPattern>
+				<unitPattern count="other">{0} a</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>l</displayName>
+				<unitPattern count="one">{0} l</unitPattern>
+				<unitPattern count="few">{0} l</unitPattern>
+				<unitPattern count="other">{0} l</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>săpt.</displayName>
+				<unitPattern count="one">{0} săpt.</unitPattern>
+				<unitPattern count="few">{0} săpt.</unitPattern>
+				<unitPattern count="other">{0} săpt.</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>zi</displayName>
 				<unitPattern count="one">{0} z</unitPattern>
@@ -7786,57 +8126,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} h</unitPattern>
 				<unitPattern count="other">{0} h</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="few">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>m</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
 				<unitPattern count="few">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>l</displayName>
-				<unitPattern count="one">{0} l</unitPattern>
-				<unitPattern count="few">{0} l</unitPattern>
-				<unitPattern count="other">{0} l</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>s</displayName>
 				<unitPattern count="one">{0} s</unitPattern>
 				<unitPattern count="few">{0} s</unitPattern>
 				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>săpt.</displayName>
-				<unitPattern count="one">{0} săpt.</unitPattern>
-				<unitPattern count="few">{0} săpt.</unitPattern>
-				<unitPattern count="other">{0} săpt.</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>a</displayName>
-				<unitPattern count="one">{0} a</unitPattern>
-				<unitPattern count="few">{0} a</unitPattern>
-				<unitPattern count="other">{0} a</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="few">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one" draft="contributed">{0} ft</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ft</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one" draft="contributed">{0} in</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} in</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} in</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="few">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
@@ -7844,21 +8150,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} km</unitPattern>
 				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one" draft="contributed">{0} a.l.</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} a.l.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} a.l.</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>m</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
 				<unitPattern count="few">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one" draft="contributed">{0} mi</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="few">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -7871,16 +8173,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} pm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one" draft="contributed">{0} mi</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one" draft="contributed">{0} yd</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} yd</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="few">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one" draft="contributed">{0} ft</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ft</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ft</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one" draft="contributed">{0} in</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} in</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} in</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one" draft="contributed">{0} a.l.</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} a.l.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} a.l.</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
@@ -7888,20 +8204,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one" draft="contributed">{0} oz</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} oz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} oz</unitPattern>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one" draft="contributed">{0} lb</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} lb</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} lb</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one" draft="contributed">{0} CP</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} CP</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} CP</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one" draft="contributed">{0} oz</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} oz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one" draft="contributed">{0} kW</unitPattern>
@@ -7913,6 +8230,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} W</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one" draft="contributed">{0} CP</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} CP</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} CP</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one" draft="contributed">{0} hPa</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} hPa</unitPattern>
@@ -7971,6 +8293,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}V</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ro_MD.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ro_MD.xml
new file mode 100644
index 00000000000..6fc6b8952f7
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ro_MD.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="ro"/>
+		<territory type="MD"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<days>
+					<dayContext type="format">
+						<dayWidth type="abbreviated">
+							<day type="sun" draft="contributed">Dum</day>
+							<day type="mon" draft="contributed">Lun</day>
+							<day type="tue" draft="contributed">Mar</day>
+							<day type="wed" draft="contributed">Mie</day>
+							<day type="thu" draft="contributed">Joi</day>
+							<day type="fri" draft="contributed">Vin</day>
+							<day type="sat" draft="contributed">Sâm</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun" draft="contributed">D</day>
+							<day type="mon" draft="contributed">L</day>
+							<day type="tue" draft="contributed">Ma</day>
+							<day type="wed" draft="contributed">Mi</day>
+							<day type="thu" draft="contributed">J</day>
+							<day type="fri" draft="contributed">V</day>
+							<day type="sat" draft="contributed">S</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun" draft="contributed">Du</day>
+							<day type="mon" draft="contributed">Lu</day>
+							<day type="tue" draft="contributed">Ma</day>
+							<day type="wed" draft="contributed">Mi</day>
+							<day type="thu" draft="contributed">Jo</day>
+							<day type="fri" draft="contributed">Vi</day>
+							<day type="sat" draft="contributed">Sâ</day>
+						</dayWidth>
+					</dayContext>
+					<dayContext type="stand-alone">
+						<dayWidth type="abbreviated">
+							<day type="sun" draft="contributed">Dum</day>
+							<day type="mon" draft="contributed">Lun</day>
+							<day type="tue" draft="contributed">Mar</day>
+							<day type="wed" draft="contributed">Mie</day>
+							<day type="thu" draft="contributed">Joi</day>
+							<day type="fri" draft="contributed">Vin</day>
+							<day type="sat" draft="contributed">Sâm</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun" draft="contributed">D</day>
+							<day type="mon" draft="contributed">L</day>
+							<day type="tue" draft="contributed">Ma</day>
+							<day type="wed" draft="contributed">Mi</day>
+							<day type="thu" draft="contributed">J</day>
+							<day type="fri" draft="contributed">V</day>
+							<day type="sat" draft="contributed">S</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun" draft="contributed">Du</day>
+							<day type="mon" draft="contributed">Lu</day>
+							<day type="tue" draft="contributed">Ma</day>
+							<day type="wed" draft="contributed">Mi</day>
+							<day type="thu" draft="contributed">Jo</day>
+							<day type="fri" draft="contributed">Vi</day>
+							<day type="sat" draft="contributed">Sâ</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<quarters>
+					<quarterContext type="format">
+						<quarterWidth type="abbreviated">
+							<quarter type="1" draft="contributed">trim. 1</quarter>
+							<quarter type="2" draft="contributed">trim. 2</quarter>
+							<quarter type="3" draft="contributed">trim. 3</quarter>
+							<quarter type="4" draft="contributed">trim. 4</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1" draft="contributed">trimestrul 1</quarter>
+							<quarter type="2" draft="contributed">trimestrul 2</quarter>
+							<quarter type="3" draft="contributed">trimestrul 3</quarter>
+							<quarter type="4" draft="contributed">trimestrul 4</quarter>
+						</quarterWidth>
+					</quarterContext>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="abbreviated">
+							<quarter type="1" draft="contributed">Trim. 1</quarter>
+							<quarter type="2" draft="contributed">Trim. 2</quarter>
+							<quarter type="3" draft="contributed">Trim. 3</quarter>
+							<quarter type="4" draft="contributed">Trim. 4</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1" draft="contributed">Trimestrul 1</quarter>
+							<quarter type="2" draft="contributed">Trimestrul 2</quarter>
+							<quarter type="3" draft="contributed">Trimestrul 3</quarter>
+							<quarter type="4" draft="contributed">Trimestrul 4</quarter>
+						</quarterWidth>
+					</quarterContext>
+				</quarters>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight" draft="contributed">miezul nopții</dayPeriod>
+							<dayPeriod type="noon" draft="contributed">amiază</dayPeriod>
+							<dayPeriod type="morning1" draft="contributed">dimineață</dayPeriod>
+							<dayPeriod type="afternoon1" draft="contributed">după-amiază</dayPeriod>
+							<dayPeriod type="evening1" draft="contributed">seară</dayPeriod>
+							<dayPeriod type="night1" draft="contributed">noapte</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight" draft="contributed">miezul nopții</dayPeriod>
+							<dayPeriod type="noon" draft="contributed">amiază</dayPeriod>
+							<dayPeriod type="morning1" draft="contributed">dimineața</dayPeriod>
+							<dayPeriod type="afternoon1" draft="contributed">după-amiaza</dayPeriod>
+							<dayPeriod type="evening1" draft="contributed">seara</dayPeriod>
+							<dayPeriod type="night1" draft="contributed">noaptea</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<eras>
+					<eraAbbr>
+						<era type="0" alt="variant" draft="contributed">î.e.n.</era>
+					</eraAbbr>
+				</eras>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="MDL">
+				<symbol>L</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+	<units>
+		<unitLength type="short">
+			<unit type="duration-millisecond">
+				<displayName draft="contributed">milisec.</displayName>
+			</unit>
+		</unitLength>
+		<unitLength type="narrow">
+			<unit type="duration-year">
+				<unitPattern count="one" draft="contributed">{0}an</unitPattern>
+				<unitPattern count="few" draft="contributed">{0}ani</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}ani</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">lună</displayName>
+				<unitPattern count="one" draft="contributed">{0}lună</unitPattern>
+				<unitPattern count="few" draft="contributed">{0}luni</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}luni</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<unitPattern count="one" draft="contributed">{0}săpt.</unitPattern>
+				<unitPattern count="few" draft="contributed">{0}săpt.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}săpt.</unitPattern>
+			</unit>
+			<unit type="duration-day">
+				<unitPattern count="one" draft="contributed">{0}zi</unitPattern>
+				<unitPattern count="few" draft="contributed">{0}zile</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}zile</unitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName draft="contributed">min</displayName>
+				<unitPattern count="one" draft="contributed">{0}min.</unitPattern>
+				<unitPattern count="few" draft="contributed">{0}min.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}min.</unitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName draft="contributed">msec</displayName>
+				<unitPattern count="one" draft="contributed">{0}ms</unitPattern>
+				<unitPattern count="few" draft="contributed">{0}ms</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}ms</unitPattern>
+			</unit>
+		</unitLength>
+	</units>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ro_RO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ro_RO.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ro_RO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ro_RO.xml
index 45c3f93eb71..ea5c2a9fa7a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ro_RO.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ro_RO.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ro"/>
 		<territory type="RO"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rof.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rof.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rof.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rof.xml
index 35bbc4a1c40..82f55902ff9 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rof.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rof.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="rof"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguila</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Amenia</territory>
-			<territory type="AN">Antili za Uholanzi</territory>
 			<territory type="AO">Angolo</territory>
 			<territory type="AR">Ajentina</territory>
 			<territory type="AS">Samoa ya Marekani</territory>
@@ -448,6 +446,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">kang’ama</dayPeriod>
+							<dayPeriod type="pm">kingoto</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">kang’ama</dayPeriod>
 							<dayPeriod type="pm">kingoto</dayPeriod>
@@ -489,22 +491,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -581,6 +583,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rof_TZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rof_TZ.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rof_TZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rof_TZ.xml
index a240615090a..7b178165ec2 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rof_TZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rof_TZ.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="rof"/>
 		<territory type="TZ"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/root.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/root.xml
similarity index 83%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/root.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/root.xml
index 73c644cccc2..945f848ab2f 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/root.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/root.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
+<!-- Copyright © 1991-2015 Unicode, Inc. CLDR data files are interpreted according to the LDML specification
+(http://unicode.org/reports/tr35/) For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11290 $"/>
-		<generation date="$Date: 2015-02-22 04:15:45 -0600 (Sun, 22 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="root"/>
 	</identity>
 	<localeDisplayNames>
@@ -394,6 +392,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
 						<dateFormatItem id="MMMEd">MMM d, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="UM">U MM</dateFormatItem>
 						<dateFormatItem id="UMd">U MM-d</dateFormatItem>
@@ -408,6 +407,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">r(U) MMM</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">r MMM d</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">r(U) MMM d, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">r(U) MMMM</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">r(U) QQQ</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">r(U) QQQQ</dateFormatItem>
 					</availableFormats>
@@ -882,6 +882,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
 						<dateFormatItem id="MMMEd">MMM d, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">G y</dateFormatItem>
 						<dateFormatItem id="yyyy">G y</dateFormatItem>
@@ -891,6 +892,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">G y MMM</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">G y MMM d</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">G y MMM d, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y MMMM</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">G y QQQ</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">G y QQQQ</dateFormatItem>
 					</availableFormats>
@@ -1126,21 +1128,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
-							<alias source="locale" path="../dayPeriodWidth[@type='wide']"/>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">a</dayPeriod>
-							<dayPeriod type="noon">n</dayPeriod>
-							<dayPeriod type="pm">p</dayPeriod>
+							<alias source="locale" path="../dayPeriodWidth[@type='abbreviated']"/>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="noon">noon</dayPeriod>
-							<dayPeriod type="pm">PM</dayPeriod>
+							<alias source="locale" path="../dayPeriodWidth[@type='abbreviated']"/>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
-						<alias source="locale" path="../dayPeriodContext[@type='format']"/>
+						<dayPeriodWidth type="abbreviated">
+							<alias source="locale" path="../../dayPeriodContext[@type='format']/dayPeriodWidth[@type='abbreviated']"/>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<alias source="locale" path="../dayPeriodWidth[@type='abbreviated']"/>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<alias source="locale" path="../dayPeriodWidth[@type='abbreviated']"/>
+						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
@@ -1248,6 +1255,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
 						<dateFormatItem id="MMMEd">MMM d, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">y-MM</dateFormatItem>
@@ -1256,6 +1264,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yMMM">y MMM</dateFormatItem>
 						<dateFormatItem id="yMMMd">y MMM d</dateFormatItem>
 						<dateFormatItem id="yMMMEd">y MMM d, E</dateFormatItem>
+						<dateFormatItem id="yMMMM">y MMMM</dateFormatItem>
 						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
 						<dateFormatItem id="yQQQQ">y QQQQ</dateFormatItem>
 					</availableFormats>
@@ -1435,9 +1444,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</eraNames>
 					<eraAbbr>
 						<era type="0">AM</era>
-						<!-- HY = Anno Mundi
-							 = -180799862400000 milliseconds since 1/1/1970 AD
-						-->
+						<!-- HY = Anno Mundi = -180799862400000 milliseconds since 1/1/1970 AD -->
 					</eraAbbr>
 					<eraNarrow>
 						<alias source="locale" path="../eraAbbr"/>
@@ -1603,9 +1610,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</eraNames>
 					<eraAbbr>
 						<era type="0">AH</era>
-						<!-- Anno Hijri, = 7/16/622 AD
-							 = -42521587200000.0 millis since 1/1/1970
-						-->
+						<!-- Anno Hijri, = 7/16/622 AD = -42521587200000.0 millis since 1/1/1970 -->
 					</eraAbbr>
 					<eraNarrow>
 						<alias source="locale" path="../eraAbbr"/>
@@ -1743,480 +1748,479 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<alias source="locale" path="../eraAbbr"/>
 					</eraNames>
 					<eraAbbr>
-						<!-- These eras are numbered according to the data used
-							 by the ICU Japanese Calendar.
-							 search for 'ERAS ='
+						<!-- These eras are numbered according to the data used by the ICU Japanese Calendar. search for
+							 'ERAS ='
 						-->
-						<era type="0">Taika (645-650)</era>
-						<era type="1">Hakuchi (650-671)</era>
-						<era type="2">Hakuhō (672-686)</era>
-						<era type="3">Shuchō (686-701)</era>
-						<era type="4">Taihō (701-704)</era>
-						<era type="5">Keiun (704-708)</era>
-						<era type="6">Wadō (708-715)</era>
-						<era type="7">Reiki (715-717)</era>
-						<era type="8">Yōrō (717-724)</era>
-						<era type="9">Jinki (724-729)</era>
-						<era type="10">Tempyō (729-749)</era>
-						<era type="11">Tempyō-kampō (749-749)</era>
-						<era type="12">Tempyō-shōhō (749-757)</era>
-						<era type="13">Tempyō-hōji (757-765)</era>
-						<era type="14">Temphō-jingo (765-767)</era>
+						<era type="0">Taika (645–650)</era>
+						<era type="1">Hakuchi (650–671)</era>
+						<era type="2">Hakuhō (672–686)</era>
+						<era type="3">Shuchō (686–701)</era>
+						<era type="4">Taihō (701–704)</era>
+						<era type="5">Keiun (704–708)</era>
+						<era type="6">Wadō (708–715)</era>
+						<era type="7">Reiki (715–717)</era>
+						<era type="8">Yōrō (717–724)</era>
+						<era type="9">Jinki (724–729)</era>
+						<era type="10">Tenpyō (729–749)</era>
+						<era type="11">Tenpyō-kampō (749-749)</era>
+						<era type="12">Tenpyō-shōhō (749-757)</era>
+						<era type="13">Tenpyō-hōji (757-765)</era>
+						<era type="14">Tenpyō-jingo (765-767)</era>
 						<era type="15">Jingo-keiun (767-770)</era>
-						<era type="16">Hōki (770-780)</era>
+						<era type="16">Hōki (770–780)</era>
 						<era type="17">Ten-ō (781-782)</era>
-						<era type="18">Enryaku (782-806)</era>
-						<era type="19">Daidō (806-810)</era>
-						<era type="20">Kōnin (810-824)</era>
-						<era type="21">Tenchō (824-834)</era>
-						<era type="22">Jōwa (834-848)</era>
-						<era type="23">Kajō (848-851)</era>
-						<era type="24">Ninju (851-854)</era>
-						<era type="25">Saiko (854-857)</era>
-						<era type="26">Tennan (857-859)</era>
-						<era type="27">Jōgan (859-877)</era>
-						<era type="28">Genkei (877-885)</era>
-						<era type="29">Ninna (885-889)</era>
-						<era type="30">Kampyō (889-898)</era>
-						<era type="31">Shōtai (898-901)</era>
-						<era type="32">Engi (901-923)</era>
-						<era type="33">Enchō (923-931)</era>
-						<era type="34">Shōhei (931-938)</era>
-						<era type="35">Tengyō (938-947)</era>
-						<era type="36">Tenryaku (947-957)</era>
-						<era type="37">Tentoku (957-961)</era>
-						<era type="38">Ōwa (961-964)</era>
-						<era type="39">Kōhō (964-968)</era>
-						<era type="40">Anna (968-970)</era>
-						<era type="41">Tenroku (970-973)</era>
-						<era type="42">Ten-en (973-976)</era>
-						<era type="43">Jōgen (976-978)</era>
-						<era type="44">Tengen (978-983)</era>
-						<era type="45">Eikan (983-985)</era>
-						<era type="46">Kanna (985-987)</era>
-						<era type="47">Ei-en (987-989)</era>
-						<era type="48">Eiso (989-990)</era>
-						<era type="49">Shōryaku (990-995)</era>
-						<era type="50">Chōtoku (995-999)</era>
-						<era type="51">Chōhō (999-1004)</era>
-						<era type="52">Kankō (1004-1012)</era>
-						<era type="53">Chōwa (1012-1017)</era>
-						<era type="54">Kannin (1017-1021)</era>
-						<era type="55">Jian (1021-1024)</era>
-						<era type="56">Manju (1024-1028)</era>
-						<era type="57">Chōgen (1028-1037)</era>
-						<era type="58">Chōryaku (1037-1040)</era>
-						<era type="59">Chōkyū (1040-1044)</era>
-						<era type="60">Kantoku (1044-1046)</era>
-						<era type="61">Eishō (1046-1053)</era>
-						<era type="62">Tengi (1053-1058)</era>
-						<era type="63">Kōhei (1058-1065)</era>
-						<era type="64">Jiryaku (1065-1069)</era>
-						<era type="65">Enkyū (1069-1074)</era>
-						<era type="66">Shōho (1074-1077)</era>
-						<era type="67">Shōryaku (1077-1081)</era>
-						<era type="68">Eiho (1081-1084)</era>
-						<era type="69">Ōtoku (1084-1087)</era>
-						<era type="70">Kanji (1087-1094)</era>
-						<era type="71">Kaho (1094-1096)</era>
-						<era type="72">Eichō (1096-1097)</era>
-						<era type="73">Shōtoku (1097-1099)</era>
-						<era type="74">Kōwa (1099-1104)</era>
-						<era type="75">Chōji (1104-1106)</era>
-						<era type="76">Kashō (1106-1108)</era>
-						<era type="77">Tennin (1108-1110)</era>
+						<era type="18">Enryaku (782–806)</era>
+						<era type="19">Daidō (806–810)</era>
+						<era type="20">Kōnin (810–824)</era>
+						<era type="21">Tenchō (824–834)</era>
+						<era type="22">Jōwa (834–848)</era>
+						<era type="23">Kajō (848–851)</era>
+						<era type="24">Ninju (851–854)</era>
+						<era type="25">Saikō (854–857)</era>
+						<era type="26">Ten-an (857-859)</era>
+						<era type="27">Jōgan (859–877)</era>
+						<era type="28">Gangyō (877–885)</era>
+						<era type="29">Ninna (885–889)</era>
+						<era type="30">Kanpyō (889–898)</era>
+						<era type="31">Shōtai (898–901)</era>
+						<era type="32">Engi (901–923)</era>
+						<era type="33">Enchō (923–931)</era>
+						<era type="34">Jōhei (931–938)</era>
+						<era type="35">Tengyō (938–947)</era>
+						<era type="36">Tenryaku (947–957)</era>
+						<era type="37">Tentoku (957–961)</era>
+						<era type="38">Ōwa (961–964)</era>
+						<era type="39">Kōhō (964–968)</era>
+						<era type="40">Anna (968–970)</era>
+						<era type="41">Tenroku (970–973)</era>
+						<era type="42">Ten’en (973–976)</era>
+						<era type="43">Jōgen (976–978)</era>
+						<era type="44">Tengen (978–983)</era>
+						<era type="45">Eikan (983–985)</era>
+						<era type="46">Kanna (985–987)</era>
+						<era type="47">Eien (987–989)</era>
+						<era type="48">Eiso (989–990)</era>
+						<era type="49">Shōryaku (990–995)</era>
+						<era type="50">Chōtoku (995–999)</era>
+						<era type="51">Chōhō (999–1004)</era>
+						<era type="52">Kankō (1004–1012)</era>
+						<era type="53">Chōwa (1012–1017)</era>
+						<era type="54">Kannin (1017–1021)</era>
+						<era type="55">Jian (1021–1024)</era>
+						<era type="56">Manju (1024–1028)</era>
+						<era type="57">Chōgen (1028–1037)</era>
+						<era type="58">Chōryaku (1037–1040)</era>
+						<era type="59">Chōkyū (1040–1044)</era>
+						<era type="60">Kantoku (1044–1046)</era>
+						<era type="61">Eishō (1046–1053)</era>
+						<era type="62">Tengi (1053–1058)</era>
+						<era type="63">Kōhei (1058–1065)</era>
+						<era type="64">Jiryaku (1065–1069)</era>
+						<era type="65">Enkyū (1069–1074)</era>
+						<era type="66">Shōho (1074–1077)</era>
+						<era type="67">Shōryaku (1077–1081)</era>
+						<era type="68">Eihō (1081–1084)</era>
+						<era type="69">Ōtoku (1084–1087)</era>
+						<era type="70">Kanji (1087–1094)</era>
+						<era type="71">Kahō (1094–1096)</era>
+						<era type="72">Eichō (1096–1097)</era>
+						<era type="73">Jōtoku (1097–1099)</era>
+						<era type="74">Kōwa (1099–1104)</era>
+						<era type="75">Chōji (1104–1106)</era>
+						<era type="76">Kashō (1106–1108)</era>
+						<era type="77">Tennin (1108–1110)</era>
 						<era type="78">Ten-ei (1110-1113)</era>
-						<era type="79">Eikyū (1113-1118)</era>
-						<era type="80">Gen-ei (1118-1120)</era>
-						<era type="81">Hoan (1120-1124)</era>
-						<era type="82">Tenji (1124-1126)</era>
-						<era type="83">Daiji (1126-1131)</era>
-						<era type="84">Tenshō (1131-1132)</era>
-						<era type="85">Chōshō (1132-1135)</era>
-						<era type="86">Hoen (1135-1141)</era>
-						<era type="87">Eiji (1141-1142)</era>
-						<era type="88">Kōji (1142-1144)</era>
-						<era type="89">Tenyō (1144-1145)</era>
-						<era type="90">Kyūan (1145-1151)</era>
-						<era type="91">Ninpei (1151-1154)</era>
-						<era type="92">Kyūju (1154-1156)</era>
-						<era type="93">Hogen (1156-1159)</era>
-						<era type="94">Heiji (1159-1160)</era>
-						<era type="95">Eiryaku (1160-1161)</era>
-						<era type="96">Ōho (1161-1163)</era>
-						<era type="97">Chōkan (1163-1165)</era>
-						<era type="98">Eiman (1165-1166)</era>
-						<era type="99">Nin-an (1166-1169)</era>
-						<era type="100">Kaō (1169-1171)</era>
-						<era type="101">Shōan (1171-1175)</era>
-						<era type="102">Angen (1175-1177)</era>
-						<era type="103">Jishō (1177-1181)</era>
-						<era type="104">Yōwa (1181-1182)</era>
-						<era type="105">Juei (1182-1184)</era>
-						<era type="106">Genryuku (1184-1185)</era>
-						<era type="107">Bunji (1185-1190)</era>
-						<era type="108">Kenkyū (1190-1199)</era>
-						<era type="109">Shōji (1199-1201)</era>
-						<era type="110">Kennin (1201-1204)</era>
-						<era type="111">Genkyū (1204-1206)</era>
-						<era type="112">Ken-ei (1206-1207)</era>
-						<era type="113">Shōgen (1207-1211)</era>
-						<era type="114">Kenryaku (1211-1213)</era>
-						<era type="115">Kenpō (1213-1219)</era>
-						<era type="116">Shōkyū (1219-1222)</era>
-						<era type="117">Jōō (1222-1224)</era>
-						<era type="118">Gennin (1224-1225)</era>
-						<era type="119">Karoku (1225-1227)</era>
-						<era type="120">Antei (1227-1229)</era>
-						<era type="121">Kanki (1229-1232)</era>
-						<era type="122">Jōei (1232-1233)</era>
-						<era type="123">Tempuku (1233-1234)</era>
-						<era type="124">Bunryaku (1234-1235)</era>
-						<era type="125">Katei (1235-1238)</era>
-						<era type="126">Ryakunin (1238-1239)</era>
-						<era type="127">En-ō (1239-1240)</era>
-						<era type="128">Ninji (1240-1243)</era>
-						<era type="129">Kangen (1243-1247)</era>
-						<era type="130">Hōji (1247-1249)</era>
-						<era type="131">Kenchō (1249-1256)</era>
-						<era type="132">Kōgen (1256-1257)</era>
-						<era type="133">Shōka (1257-1259)</era>
-						<era type="134">Shōgen (1259-1260)</era>
-						<era type="135">Bun-ō (1260-1261)</era>
-						<era type="136">Kōchō (1261-1264)</era>
-						<era type="137">Bun-ei (1264-1275)</era>
-						<era type="138">Kenji (1275-1278)</era>
-						<era type="139">Kōan (1278-1288)</era>
-						<era type="140">Shōō (1288-1293)</era>
-						<era type="141">Einin (1293-1299)</era>
-						<era type="142">Shōan (1299-1302)</era>
-						<era type="143">Kengen (1302-1303)</era>
-						<era type="144">Kagen (1303-1306)</era>
-						<era type="145">Tokuji (1306-1308)</era>
-						<era type="146">Enkei (1308-1311)</era>
-						<era type="147">Ōchō (1311-1312)</era>
-						<era type="148">Shōwa (1312-1317)</era>
-						<era type="149">Bunpō (1317-1319)</era>
-						<era type="150">Genō (1319-1321)</era>
-						<era type="151">Genkyō (1321-1324)</era>
-						<era type="152">Shōchū (1324-1326)</era>
-						<era type="153">Kareki (1326-1329)</era>
-						<era type="154">Gentoku (1329-1331)</era>
-						<era type="155">Genkō (1331-1334)</era>
-						<era type="156">Kemmu (1334-1336)</era>
-						<era type="157">Engen (1336-1340)</era>
-						<era type="158">Kōkoku (1340-1346)</era>
-						<era type="159">Shōhei (1346-1370)</era>
-						<era type="160">Kentoku (1370-1372)</era>
-						<era type="161">Bunchū (1372-1375)</era>
-						<era type="162">Tenju (1375-1379)</era>
-						<era type="163">Kōryaku (1379-1381)</era>
-						<era type="164">Kōwa (1381-1384)</era>
-						<era type="165">Genchū (1384-1392)</era>
-						<era type="166">Meitoku (1384-1387)</era>
-						<era type="167">Kakei (1387-1389)</era>
-						<era type="168">Kōō (1389-1390)</era>
-						<era type="169">Meitoku (1390-1394)</era>
-						<era type="170">Ōei (1394-1428)</era>
-						<era type="171">Shōchō (1428-1429)</era>
-						<era type="172">Eikyō (1429-1441)</era>
-						<era type="173">Kakitsu (1441-1444)</era>
-						<era type="174">Bun-an (1444-1449)</era>
-						<era type="175">Hōtoku (1449-1452)</era>
-						<era type="176">Kyōtoku (1452-1455)</era>
-						<era type="177">Kōshō (1455-1457)</era>
-						<era type="178">Chōroku (1457-1460)</era>
-						<era type="179">Kanshō (1460-1466)</era>
-						<era type="180">Bunshō (1466-1467)</era>
-						<era type="181">Ōnin (1467-1469)</era>
-						<era type="182">Bunmei (1469-1487)</era>
-						<era type="183">Chōkyō (1487-1489)</era>
-						<era type="184">Entoku (1489-1492)</era>
-						<era type="185">Meiō (1492-1501)</era>
-						<era type="186">Bunki (1501-1504)</era>
-						<era type="187">Eishō (1504-1521)</era>
-						<era type="188">Taiei (1521-1528)</era>
-						<era type="189">Kyōroku (1528-1532)</era>
-						<era type="190">Tenmon (1532-1555)</era>
-						<era type="191">Kōji (1555-1558)</era>
-						<era type="192">Eiroku (1558-1570)</era>
-						<era type="193">Genki (1570-1573)</era>
-						<era type="194">Tenshō (1573-1592)</era>
-						<era type="195">Bunroku (1592-1596)</era>
-						<era type="196">Keichō (1596-1615)</era>
-						<era type="197">Genwa (1615-1624)</era>
-						<era type="198">Kan-ei (1624-1644)</era>
-						<era type="199">Shōho (1644-1648)</era>
-						<era type="200">Keian (1648-1652)</era>
-						<era type="201">Shōō (1652-1655)</era>
-						<era type="202">Meiryaku (1655-1658)</era>
-						<era type="203">Manji (1658-1661)</era>
-						<era type="204">Kanbun (1661-1673)</era>
-						<era type="205">Enpō (1673-1681)</era>
-						<era type="206">Tenwa (1681-1684)</era>
-						<era type="207">Jōkyō (1684-1688)</era>
-						<era type="208">Genroku (1688-1704)</era>
-						<era type="209">Hōei (1704-1711)</era>
-						<era type="210">Shōtoku (1711-1716)</era>
-						<era type="211">Kyōhō (1716-1736)</era>
-						<era type="212">Genbun (1736-1741)</era>
-						<era type="213">Kanpō (1741-1744)</era>
-						<era type="214">Enkyō (1744-1748)</era>
-						<era type="215">Kan-en (1748-1751)</era>
-						<era type="216">Hōryaku (1751-1764)</era>
-						<era type="217">Meiwa (1764-1772)</era>
-						<era type="218">An-ei (1772-1781)</era>
-						<era type="219">Tenmei (1781-1789)</era>
-						<era type="220">Kansei (1789-1801)</era>
-						<era type="221">Kyōwa (1801-1804)</era>
-						<era type="222">Bunka (1804-1818)</era>
-						<era type="223">Bunsei (1818-1830)</era>
-						<era type="224">Tenpō (1830-1844)</era>
-						<era type="225">Kōka (1844-1848)</era>
-						<era type="226">Kaei (1848-1854)</era>
-						<era type="227">Ansei (1854-1860)</era>
-						<era type="228">Man-en (1860-1861)</era>
-						<era type="229">Bunkyū (1861-1864)</era>
-						<era type="230">Genji (1864-1865)</era>
-						<era type="231">Keiō (1865-1868)</era>
+						<era type="79">Eikyū (1113–1118)</era>
+						<era type="80">Gen’ei (1118–1120)</era>
+						<era type="81">Hōan (1120–1124)</era>
+						<era type="82">Tenji (1124–1126)</era>
+						<era type="83">Daiji (1126–1131)</era>
+						<era type="84">Tenshō (1131–1132)</era>
+						<era type="85">Chōshō (1132–1135)</era>
+						<era type="86">Hōen (1135–1141)</era>
+						<era type="87">Eiji (1141–1142)</era>
+						<era type="88">Kōji (1142–1144)</era>
+						<era type="89">Ten’yō (1144–1145)</era>
+						<era type="90">Kyūan (1145–1151)</era>
+						<era type="91">Ninpei (1151–1154)</era>
+						<era type="92">Kyūju (1154–1156)</era>
+						<era type="93">Hōgen (1156–1159)</era>
+						<era type="94">Heiji (1159–1160)</era>
+						<era type="95">Eiryaku (1160–1161)</era>
+						<era type="96">Ōho (1161–1163)</era>
+						<era type="97">Chōkan (1163–1165)</era>
+						<era type="98">Eiman (1165–1166)</era>
+						<era type="99">Nin’an (1166–1169)</era>
+						<era type="100">Kaō (1169–1171)</era>
+						<era type="101">Shōan (1171–1175)</era>
+						<era type="102">Angen (1175–1177)</era>
+						<era type="103">Jishō (1177–1181)</era>
+						<era type="104">Yōwa (1181–1182)</era>
+						<era type="105">Juei (1182–1184)</era>
+						<era type="106">Genryaku (1184–1185)</era>
+						<era type="107">Bunji (1185–1190)</era>
+						<era type="108">Kenkyū (1190–1199)</era>
+						<era type="109">Shōji (1199–1201)</era>
+						<era type="110">Kennin (1201–1204)</era>
+						<era type="111">Genkyū (1204–1206)</era>
+						<era type="112">Ken’ei (1206–1207)</era>
+						<era type="113">Jōgen (1207–1211)</era>
+						<era type="114">Kenryaku (1211–1213)</era>
+						<era type="115">Kenpō (1213–1219)</era>
+						<era type="116">Jōkyū (1219–1222)</era>
+						<era type="117">Jōō (1222–1224)</era>
+						<era type="118">Gennin (1224–1225)</era>
+						<era type="119">Karoku (1225–1227)</era>
+						<era type="120">Antei (1227–1229)</era>
+						<era type="121">Kanki (1229–1232)</era>
+						<era type="122">Jōei (1232–1233)</era>
+						<era type="123">Tenpuku (1233–1234)</era>
+						<era type="124">Bunryaku (1234–1235)</era>
+						<era type="125">Katei (1235–1238)</era>
+						<era type="126">Ryakunin (1238–1239)</era>
+						<era type="127">En’ō (1239–1240)</era>
+						<era type="128">Ninji (1240–1243)</era>
+						<era type="129">Kangen (1243–1247)</era>
+						<era type="130">Hōji (1247–1249)</era>
+						<era type="131">Kenchō (1249–1256)</era>
+						<era type="132">Kōgen (1256–1257)</era>
+						<era type="133">Shōka (1257–1259)</era>
+						<era type="134">Shōgen (1259–1260)</era>
+						<era type="135">Bun’ō (1260–1261)</era>
+						<era type="136">Kōchō (1261–1264)</era>
+						<era type="137">Bun’ei (1264–1275)</era>
+						<era type="138">Kenji (1275–1278)</era>
+						<era type="139">Kōan (1278–1288)</era>
+						<era type="140">Shōō (1288–1293)</era>
+						<era type="141">Einin (1293–1299)</era>
+						<era type="142">Shōan (1299–1302)</era>
+						<era type="143">Kengen (1302–1303)</era>
+						<era type="144">Kagen (1303–1306)</era>
+						<era type="145">Tokuji (1306–1308)</era>
+						<era type="146">Enkyō (1308–1311)</era>
+						<era type="147">Ōchō (1311–1312)</era>
+						<era type="148">Shōwa (1312–1317)</era>
+						<era type="149">Bunpō (1317–1319)</era>
+						<era type="150">Genō (1319–1321)</era>
+						<era type="151">Genkō (1321–1324)</era>
+						<era type="152">Shōchū (1324–1326)</era>
+						<era type="153">Karyaku (1326–1329)</era>
+						<era type="154">Gentoku (1329–1331)</era>
+						<era type="155">Genkō (1331–1334)</era>
+						<era type="156">Kenmu (1334–1336)</era>
+						<era type="157">Engen (1336–1340)</era>
+						<era type="158">Kōkoku (1340–1346)</era>
+						<era type="159">Shōhei (1346–1370)</era>
+						<era type="160">Kentoku (1370–1372)</era>
+						<era type="161">Bunchū (1372–1375)</era>
+						<era type="162">Tenju (1375–1379)</era>
+						<era type="163">Kōryaku (1379–1381)</era>
+						<era type="164">Kōwa (1381–1384)</era>
+						<era type="165">Genchū (1384–1392)</era>
+						<era type="166">Meitoku (1384–1387)</era>
+						<era type="167">Kakei (1387–1389)</era>
+						<era type="168">Kōō (1389–1390)</era>
+						<era type="169">Meitoku (1390–1394)</era>
+						<era type="170">Ōei (1394–1428)</era>
+						<era type="171">Shōchō (1428–1429)</era>
+						<era type="172">Eikyō (1429–1441)</era>
+						<era type="173">Kakitsu (1441–1444)</era>
+						<era type="174">Bun’an (1444–1449)</era>
+						<era type="175">Hōtoku (1449–1452)</era>
+						<era type="176">Kyōtoku (1452–1455)</era>
+						<era type="177">Kōshō (1455–1457)</era>
+						<era type="178">Chōroku (1457–1460)</era>
+						<era type="179">Kanshō (1460–1466)</era>
+						<era type="180">Bunshō (1466–1467)</era>
+						<era type="181">Ōnin (1467–1469)</era>
+						<era type="182">Bunmei (1469–1487)</era>
+						<era type="183">Chōkyō (1487–1489)</era>
+						<era type="184">Entoku (1489–1492)</era>
+						<era type="185">Meiō (1492–1501)</era>
+						<era type="186">Bunki (1501–1504)</era>
+						<era type="187">Eishō (1504–1521)</era>
+						<era type="188">Taiei (1521–1528)</era>
+						<era type="189">Kyōroku (1528–1532)</era>
+						<era type="190">Tenbun (1532–1555)</era>
+						<era type="191">Kōji (1555–1558)</era>
+						<era type="192">Eiroku (1558–1570)</era>
+						<era type="193">Genki (1570–1573)</era>
+						<era type="194">Tenshō (1573–1592)</era>
+						<era type="195">Bunroku (1592–1596)</era>
+						<era type="196">Keichō (1596–1615)</era>
+						<era type="197">Genna (1615–1624)</era>
+						<era type="198">Kan’ei (1624–1644)</era>
+						<era type="199">Shōho (1644–1648)</era>
+						<era type="200">Keian (1648–1652)</era>
+						<era type="201">Jōō (1652–1655)</era>
+						<era type="202">Meireki (1655–1658)</era>
+						<era type="203">Manji (1658–1661)</era>
+						<era type="204">Kanbun (1661–1673)</era>
+						<era type="205">Enpō (1673–1681)</era>
+						<era type="206">Tenna (1681–1684)</era>
+						<era type="207">Jōkyō (1684–1688)</era>
+						<era type="208">Genroku (1688–1704)</era>
+						<era type="209">Hōei (1704–1711)</era>
+						<era type="210">Shōtoku (1711–1716)</era>
+						<era type="211">Kyōhō (1716–1736)</era>
+						<era type="212">Genbun (1736–1741)</era>
+						<era type="213">Kanpō (1741–1744)</era>
+						<era type="214">Enkyō (1744–1748)</era>
+						<era type="215">Kan’en (1748–1751)</era>
+						<era type="216">Hōreki (1751–1764)</era>
+						<era type="217">Meiwa (1764–1772)</era>
+						<era type="218">An’ei (1772–1781)</era>
+						<era type="219">Tenmei (1781–1789)</era>
+						<era type="220">Kansei (1789–1801)</era>
+						<era type="221">Kyōwa (1801–1804)</era>
+						<era type="222">Bunka (1804–1818)</era>
+						<era type="223">Bunsei (1818–1830)</era>
+						<era type="224">Tenpō (1830–1844)</era>
+						<era type="225">Kōka (1844–1848)</era>
+						<era type="226">Kaei (1848–1854)</era>
+						<era type="227">Ansei (1854–1860)</era>
+						<era type="228">Man’en (1860–1861)</era>
+						<era type="229">Bunkyū (1861–1864)</era>
+						<era type="230">Genji (1864–1865)</era>
+						<era type="231">Keiō (1865–1868)</era>
 						<era type="232">Meiji</era>
 						<era type="233">Taishō</era>
 						<era type="234">Shōwa</era>
 						<era type="235">Heisei</era>
 					</eraAbbr>
 					<eraNarrow>
-						<era type="0">Taika (645-650)</era>
-						<era type="1">Hakuchi (650-671)</era>
-						<era type="2">Hakuhō (672-686)</era>
-						<era type="3">Shuchō (686-701)</era>
-						<era type="4">Taihō (701-704)</era>
-						<era type="5">Keiun (704-708)</era>
-						<era type="6">Wadō (708-715)</era>
-						<era type="7">Reiki (715-717)</era>
-						<era type="8">Yōrō (717-724)</era>
-						<era type="9">Jinki (724-729)</era>
-						<era type="10">Tempyō (729-749)</era>
-						<era type="11">Tempyō-kampō (749-749)</era>
-						<era type="12">Tempyō-shōhō (749-757)</era>
-						<era type="13">Tempyō-hōji (757-765)</era>
-						<era type="14">Temphō-jingo (765-767)</era>
+						<era type="0">Taika (645–650)</era>
+						<era type="1">Hakuchi (650–671)</era>
+						<era type="2">Hakuhō (672–686)</era>
+						<era type="3">Shuchō (686–701)</era>
+						<era type="4">Taihō (701–704)</era>
+						<era type="5">Keiun (704–708)</era>
+						<era type="6">Wadō (708–715)</era>
+						<era type="7">Reiki (715–717)</era>
+						<era type="8">Yōrō (717–724)</era>
+						<era type="9">Jinki (724–729)</era>
+						<era type="10">Tenpyō (729–749)</era>
+						<era type="11">Tenpyō-kampō (749-749)</era>
+						<era type="12">Tenpyō-shōhō (749-757)</era>
+						<era type="13">Tenpyō-hōji (757-765)</era>
+						<era type="14">Tenpyō-jingo (765-767)</era>
 						<era type="15">Jingo-keiun (767-770)</era>
-						<era type="16">Hōki (770-780)</era>
+						<era type="16">Hōki (770–780)</era>
 						<era type="17">Ten-ō (781-782)</era>
-						<era type="18">Enryaku (782-806)</era>
-						<era type="19">Daidō (806-810)</era>
-						<era type="20">Kōnin (810-824)</era>
-						<era type="21">Tenchō (824-834)</era>
-						<era type="22">Jōwa (834-848)</era>
-						<era type="23">Kajō (848-851)</era>
-						<era type="24">Ninju (851-854)</era>
-						<era type="25">Saiko (854-857)</era>
-						<era type="26">Tennan (857-859)</era>
-						<era type="27">Jōgan (859-877)</era>
-						<era type="28">Genkei (877-885)</era>
-						<era type="29">Ninna (885-889)</era>
-						<era type="30">Kampyō (889-898)</era>
-						<era type="31">Shōtai (898-901)</era>
-						<era type="32">Engi (901-923)</era>
-						<era type="33">Enchō (923-931)</era>
-						<era type="34">Shōhei (931-938)</era>
-						<era type="35">Tengyō (938-947)</era>
-						<era type="36">Tenryaku (947-957)</era>
-						<era type="37">Tentoku (957-961)</era>
-						<era type="38">Ōwa (961-964)</era>
-						<era type="39">Kōhō (964-968)</era>
-						<era type="40">Anna (968-970)</era>
-						<era type="41">Tenroku (970-973)</era>
-						<era type="42">Ten-en (973-976)</era>
-						<era type="43">Jōgen (976-978)</era>
-						<era type="44">Tengen (978-983)</era>
-						<era type="45">Eikan (983-985)</era>
-						<era type="46">Kanna (985-987)</era>
-						<era type="47">Ei-en (987-989)</era>
-						<era type="48">Eiso (989-990)</era>
-						<era type="49">Shōryaku (990-995)</era>
-						<era type="50">Chōtoku (995-999)</era>
-						<era type="51">Chōhō (999-1004)</era>
-						<era type="52">Kankō (1004-1012)</era>
-						<era type="53">Chōwa (1012-1017)</era>
-						<era type="54">Kannin (1017-1021)</era>
-						<era type="55">Jian (1021-1024)</era>
-						<era type="56">Manju (1024-1028)</era>
-						<era type="57">Chōgen (1028-1037)</era>
-						<era type="58">Chōryaku (1037-1040)</era>
-						<era type="59">Chōkyū (1040-1044)</era>
-						<era type="60">Kantoku (1044-1046)</era>
-						<era type="61">Eishō (1046-1053)</era>
-						<era type="62">Tengi (1053-1058)</era>
-						<era type="63">Kōhei (1058-1065)</era>
-						<era type="64">Jiryaku (1065-1069)</era>
-						<era type="65">Enkyū (1069-1074)</era>
-						<era type="66">Shōho (1074-1077)</era>
-						<era type="67">Shōryaku (1077-1081)</era>
-						<era type="68">Eiho (1081-1084)</era>
-						<era type="69">Ōtoku (1084-1087)</era>
-						<era type="70">Kanji (1087-1094)</era>
-						<era type="71">Kaho (1094-1096)</era>
-						<era type="72">Eichō (1096-1097)</era>
-						<era type="73">Shōtoku (1097-1099)</era>
-						<era type="74">Kōwa (1099-1104)</era>
-						<era type="75">Chōji (1104-1106)</era>
-						<era type="76">Kashō (1106-1108)</era>
-						<era type="77">Tennin (1108-1110)</era>
+						<era type="18">Enryaku (782–806)</era>
+						<era type="19">Daidō (806–810)</era>
+						<era type="20">Kōnin (810–824)</era>
+						<era type="21">Tenchō (824–834)</era>
+						<era type="22">Jōwa (834–848)</era>
+						<era type="23">Kajō (848–851)</era>
+						<era type="24">Ninju (851–854)</era>
+						<era type="25">Saikō (854–857)</era>
+						<era type="26">Ten-an (857-859)</era>
+						<era type="27">Jōgan (859–877)</era>
+						<era type="28">Gangyō (877–885)</era>
+						<era type="29">Ninna (885–889)</era>
+						<era type="30">Kanpyō (889–898)</era>
+						<era type="31">Shōtai (898–901)</era>
+						<era type="32">Engi (901–923)</era>
+						<era type="33">Enchō (923–931)</era>
+						<era type="34">Jōhei (931–938)</era>
+						<era type="35">Tengyō (938–947)</era>
+						<era type="36">Tenryaku (947–957)</era>
+						<era type="37">Tentoku (957–961)</era>
+						<era type="38">Ōwa (961–964)</era>
+						<era type="39">Kōhō (964–968)</era>
+						<era type="40">Anna (968–970)</era>
+						<era type="41">Tenroku (970–973)</era>
+						<era type="42">Ten’en (973–976)</era>
+						<era type="43">Jōgen (976–978)</era>
+						<era type="44">Tengen (978–983)</era>
+						<era type="45">Eikan (983–985)</era>
+						<era type="46">Kanna (985–987)</era>
+						<era type="47">Eien (987–989)</era>
+						<era type="48">Eiso (989–990)</era>
+						<era type="49">Shōryaku (990–995)</era>
+						<era type="50">Chōtoku (995–999)</era>
+						<era type="51">Chōhō (999–1004)</era>
+						<era type="52">Kankō (1004–1012)</era>
+						<era type="53">Chōwa (1012–1017)</era>
+						<era type="54">Kannin (1017–1021)</era>
+						<era type="55">Jian (1021–1024)</era>
+						<era type="56">Manju (1024–1028)</era>
+						<era type="57">Chōgen (1028–1037)</era>
+						<era type="58">Chōryaku (1037–1040)</era>
+						<era type="59">Chōkyū (1040–1044)</era>
+						<era type="60">Kantoku (1044–1046)</era>
+						<era type="61">Eishō (1046–1053)</era>
+						<era type="62">Tengi (1053–1058)</era>
+						<era type="63">Kōhei (1058–1065)</era>
+						<era type="64">Jiryaku (1065–1069)</era>
+						<era type="65">Enkyū (1069–1074)</era>
+						<era type="66">Shōho (1074–1077)</era>
+						<era type="67">Shōryaku (1077–1081)</era>
+						<era type="68">Eihō (1081–1084)</era>
+						<era type="69">Ōtoku (1084–1087)</era>
+						<era type="70">Kanji (1087–1094)</era>
+						<era type="71">Kahō (1094–1096)</era>
+						<era type="72">Eichō (1096–1097)</era>
+						<era type="73">Jōtoku (1097–1099)</era>
+						<era type="74">Kōwa (1099–1104)</era>
+						<era type="75">Chōji (1104–1106)</era>
+						<era type="76">Kashō (1106–1108)</era>
+						<era type="77">Tennin (1108–1110)</era>
 						<era type="78">Ten-ei (1110-1113)</era>
-						<era type="79">Eikyū (1113-1118)</era>
-						<era type="80">Gen-ei (1118-1120)</era>
-						<era type="81">Hoan (1120-1124)</era>
-						<era type="82">Tenji (1124-1126)</era>
-						<era type="83">Daiji (1126-1131)</era>
-						<era type="84">Tenshō (1131-1132)</era>
-						<era type="85">Chōshō (1132-1135)</era>
-						<era type="86">Hoen (1135-1141)</era>
-						<era type="87">Eiji (1141-1142)</era>
-						<era type="88">Kōji (1142-1144)</era>
-						<era type="89">Tenyō (1144-1145)</era>
-						<era type="90">Kyūan (1145-1151)</era>
-						<era type="91">Ninpei (1151-1154)</era>
-						<era type="92">Kyūju (1154-1156)</era>
-						<era type="93">Hogen (1156-1159)</era>
-						<era type="94">Heiji (1159-1160)</era>
-						<era type="95">Eiryaku (1160-1161)</era>
-						<era type="96">Ōho (1161-1163)</era>
-						<era type="97">Chōkan (1163-1165)</era>
-						<era type="98">Eiman (1165-1166)</era>
-						<era type="99">Nin-an (1166-1169)</era>
-						<era type="100">Kaō (1169-1171)</era>
-						<era type="101">Shōan (1171-1175)</era>
-						<era type="102">Angen (1175-1177)</era>
-						<era type="103">Jishō (1177-1181)</era>
-						<era type="104">Yōwa (1181-1182)</era>
-						<era type="105">Juei (1182-1184)</era>
-						<era type="106">Genryuku (1184-1185)</era>
-						<era type="107">Bunji (1185-1190)</era>
-						<era type="108">Kenkyū (1190-1199)</era>
-						<era type="109">Shōji (1199-1201)</era>
-						<era type="110">Kennin (1201-1204)</era>
-						<era type="111">Genkyū (1204-1206)</era>
-						<era type="112">Ken-ei (1206-1207)</era>
-						<era type="113">Shōgen (1207-1211)</era>
-						<era type="114">Kenryaku (1211-1213)</era>
-						<era type="115">Kenpō (1213-1219)</era>
-						<era type="116">Shōkyū (1219-1222)</era>
-						<era type="117">Jōō (1222-1224)</era>
-						<era type="118">Gennin (1224-1225)</era>
-						<era type="119">Karoku (1225-1227)</era>
-						<era type="120">Antei (1227-1229)</era>
-						<era type="121">Kanki (1229-1232)</era>
-						<era type="122">Jōei (1232-1233)</era>
-						<era type="123">Tempuku (1233-1234)</era>
-						<era type="124">Bunryaku (1234-1235)</era>
-						<era type="125">Katei (1235-1238)</era>
-						<era type="126">Ryakunin (1238-1239)</era>
-						<era type="127">En-ō (1239-1240)</era>
-						<era type="128">Ninji (1240-1243)</era>
-						<era type="129">Kangen (1243-1247)</era>
-						<era type="130">Hōji (1247-1249)</era>
-						<era type="131">Kenchō (1249-1256)</era>
-						<era type="132">Kōgen (1256-1257)</era>
-						<era type="133">Shōka (1257-1259)</era>
-						<era type="134">Shōgen (1259-1260)</era>
-						<era type="135">Bun-ō (1260-1261)</era>
-						<era type="136">Kōchō (1261-1264)</era>
-						<era type="137">Bun-ei (1264-1275)</era>
-						<era type="138">Kenji (1275-1278)</era>
-						<era type="139">Kōan (1278-1288)</era>
-						<era type="140">Shōō (1288-1293)</era>
-						<era type="141">Einin (1293-1299)</era>
-						<era type="142">Shōan (1299-1302)</era>
-						<era type="143">Kengen (1302-1303)</era>
-						<era type="144">Kagen (1303-1306)</era>
-						<era type="145">Tokuji (1306-1308)</era>
-						<era type="146">Enkei (1308-1311)</era>
-						<era type="147">Ōchō (1311-1312)</era>
-						<era type="148">Shōwa (1312-1317)</era>
-						<era type="149">Bunpō (1317-1319)</era>
-						<era type="150">Genō (1319-1321)</era>
-						<era type="151">Genkyō (1321-1324)</era>
-						<era type="152">Shōchū (1324-1326)</era>
-						<era type="153">Kareki (1326-1329)</era>
-						<era type="154">Gentoku (1329-1331)</era>
-						<era type="155">Genkō (1331-1334)</era>
-						<era type="156">Kemmu (1334-1336)</era>
-						<era type="157">Engen (1336-1340)</era>
-						<era type="158">Kōkoku (1340-1346)</era>
-						<era type="159">Shōhei (1346-1370)</era>
-						<era type="160">Kentoku (1370-1372)</era>
-						<era type="161">Bunchũ (1372-1375)</era>
-						<era type="162">Tenju (1375-1379)</era>
-						<era type="163">Kōryaku (1379-1381)</era>
-						<era type="164">Kōwa (1381-1384)</era>
-						<era type="165">Genchũ (1384-1392)</era>
-						<era type="166">Meitoku (1384-1387)</era>
-						<era type="167">Kakei (1387-1389)</era>
-						<era type="168">Kōō (1389-1390)</era>
-						<era type="169">Meitoku (1390-1394)</era>
-						<era type="170">Ōei (1394-1428)</era>
-						<era type="171">Shōchō (1428-1429)</era>
-						<era type="172">Eikyō (1429-1441)</era>
-						<era type="173">Kakitsu (1441-1444)</era>
-						<era type="174">Bun-an (1444-1449)</era>
-						<era type="175">Hōtoku (1449-1452)</era>
-						<era type="176">Kyōtoku (1452-1455)</era>
-						<era type="177">Kōshō (1455-1457)</era>
-						<era type="178">Chōroku (1457-1460)</era>
-						<era type="179">Kanshō (1460-1466)</era>
-						<era type="180">Bunshō (1466-1467)</era>
-						<era type="181">Ōnin (1467-1469)</era>
-						<era type="182">Bunmei (1469-1487)</era>
-						<era type="183">Chōkyō (1487-1489)</era>
-						<era type="184">Entoku (1489-1492)</era>
-						<era type="185">Meiō (1492-1501)</era>
-						<era type="186">Bunki (1501-1504)</era>
-						<era type="187">Eishō (1504-1521)</era>
-						<era type="188">Taiei (1521-1528)</era>
-						<era type="189">Kyōroku (1528-1532)</era>
-						<era type="190">Tenmon (1532-1555)</era>
-						<era type="191">Kōji (1555-1558)</era>
-						<era type="192">Eiroku (1558-1570)</era>
-						<era type="193">Genki (1570-1573)</era>
-						<era type="194">Tenshō (1573-1592)</era>
-						<era type="195">Bunroku (1592-1596)</era>
-						<era type="196">Keichō (1596-1615)</era>
-						<era type="197">Genwa (1615-1624)</era>
-						<era type="198">Kan-ei (1624-1644)</era>
-						<era type="199">Shōho (1644-1648)</era>
-						<era type="200">Keian (1648-1652)</era>
-						<era type="201">Shōō (1652-1655)</era>
-						<era type="202">Meiryaku (1655-1658)</era>
-						<era type="203">Manji (1658-1661)</era>
-						<era type="204">Kanbun (1661-1673)</era>
-						<era type="205">Enpō (1673-1681)</era>
-						<era type="206">Tenwa (1681-1684)</era>
-						<era type="207">Jōkyō (1684-1688)</era>
-						<era type="208">Genroku (1688-1704)</era>
-						<era type="209">Hōei (1704-1711)</era>
-						<era type="210">Shōtoku (1711-1716)</era>
-						<era type="211">Kyōhō (1716-1736)</era>
-						<era type="212">Genbun (1736-1741)</era>
-						<era type="213">Kanpō (1741-1744)</era>
-						<era type="214">Enkyō (1744-1748)</era>
-						<era type="215">Kan-en (1748-1751)</era>
-						<era type="216">Hōryaku (1751-1764)</era>
-						<era type="217">Meiwa (1764-1772)</era>
-						<era type="218">An-ei (1772-1781)</era>
-						<era type="219">Tenmei (1781-1789)</era>
-						<era type="220">Kansei (1789-1801)</era>
-						<era type="221">Kyōwa (1801-1804)</era>
-						<era type="222">Bunka (1804-1818)</era>
-						<era type="223">Bunsei (1818-1830)</era>
-						<era type="224">Tenpō (1830-1844)</era>
-						<era type="225">Kōka (1844-1848)</era>
-						<era type="226">Kaei (1848-1854)</era>
-						<era type="227">Ansei (1854-1860)</era>
-						<era type="228">Man-en (1860-1861)</era>
-						<era type="229">Bunkyū (1861-1864)</era>
-						<era type="230">Genji (1864-1865)</era>
-						<era type="231">Keiō (1865-1868)</era>
+						<era type="79">Eikyū (1113–1118)</era>
+						<era type="80">Gen’ei (1118–1120)</era>
+						<era type="81">Hōan (1120–1124)</era>
+						<era type="82">Tenji (1124–1126)</era>
+						<era type="83">Daiji (1126–1131)</era>
+						<era type="84">Tenshō (1131–1132)</era>
+						<era type="85">Chōshō (1132–1135)</era>
+						<era type="86">Hōen (1135–1141)</era>
+						<era type="87">Eiji (1141–1142)</era>
+						<era type="88">Kōji (1142–1144)</era>
+						<era type="89">Ten’yō (1144–1145)</era>
+						<era type="90">Kyūan (1145–1151)</era>
+						<era type="91">Ninpei (1151–1154)</era>
+						<era type="92">Kyūju (1154–1156)</era>
+						<era type="93">Hōgen (1156–1159)</era>
+						<era type="94">Heiji (1159–1160)</era>
+						<era type="95">Eiryaku (1160–1161)</era>
+						<era type="96">Ōho (1161–1163)</era>
+						<era type="97">Chōkan (1163–1165)</era>
+						<era type="98">Eiman (1165–1166)</era>
+						<era type="99">Nin’an (1166–1169)</era>
+						<era type="100">Kaō (1169–1171)</era>
+						<era type="101">Shōan (1171–1175)</era>
+						<era type="102">Angen (1175–1177)</era>
+						<era type="103">Jishō (1177–1181)</era>
+						<era type="104">Yōwa (1181–1182)</era>
+						<era type="105">Juei (1182–1184)</era>
+						<era type="106">Genryaku (1184–1185)</era>
+						<era type="107">Bunji (1185–1190)</era>
+						<era type="108">Kenkyū (1190–1199)</era>
+						<era type="109">Shōji (1199–1201)</era>
+						<era type="110">Kennin (1201–1204)</era>
+						<era type="111">Genkyū (1204–1206)</era>
+						<era type="112">Ken’ei (1206–1207)</era>
+						<era type="113">Jōgen (1207–1211)</era>
+						<era type="114">Kenryaku (1211–1213)</era>
+						<era type="115">Kenpō (1213–1219)</era>
+						<era type="116">Jōkyū (1219–1222)</era>
+						<era type="117">Jōō (1222–1224)</era>
+						<era type="118">Gennin (1224–1225)</era>
+						<era type="119">Karoku (1225–1227)</era>
+						<era type="120">Antei (1227–1229)</era>
+						<era type="121">Kanki (1229–1232)</era>
+						<era type="122">Jōei (1232–1233)</era>
+						<era type="123">Tenpuku (1233–1234)</era>
+						<era type="124">Bunryaku (1234–1235)</era>
+						<era type="125">Katei (1235–1238)</era>
+						<era type="126">Ryakunin (1238–1239)</era>
+						<era type="127">En’ō (1239–1240)</era>
+						<era type="128">Ninji (1240–1243)</era>
+						<era type="129">Kangen (1243–1247)</era>
+						<era type="130">Hōji (1247–1249)</era>
+						<era type="131">Kenchō (1249–1256)</era>
+						<era type="132">Kōgen (1256–1257)</era>
+						<era type="133">Shōka (1257–1259)</era>
+						<era type="134">Shōgen (1259–1260)</era>
+						<era type="135">Bun’ō (1260–1261)</era>
+						<era type="136">Kōchō (1261–1264)</era>
+						<era type="137">Bun’ei (1264–1275)</era>
+						<era type="138">Kenji (1275–1278)</era>
+						<era type="139">Kōan (1278–1288)</era>
+						<era type="140">Shōō (1288–1293)</era>
+						<era type="141">Einin (1293–1299)</era>
+						<era type="142">Shōan (1299–1302)</era>
+						<era type="143">Kengen (1302–1303)</era>
+						<era type="144">Kagen (1303–1306)</era>
+						<era type="145">Tokuji (1306–1308)</era>
+						<era type="146">Enkyō (1308–1311)</era>
+						<era type="147">Ōchō (1311–1312)</era>
+						<era type="148">Shōwa (1312–1317)</era>
+						<era type="149">Bunpō (1317–1319)</era>
+						<era type="150">Genō (1319–1321)</era>
+						<era type="151">Genkō (1321–1324)</era>
+						<era type="152">Shōchū (1324–1326)</era>
+						<era type="153">Karyaku (1326–1329)</era>
+						<era type="154">Gentoku (1329–1331)</era>
+						<era type="155">Genkō (1331–1334)</era>
+						<era type="156">Kenmu (1334–1336)</era>
+						<era type="157">Engen (1336–1340)</era>
+						<era type="158">Kōkoku (1340–1346)</era>
+						<era type="159">Shōhei (1346–1370)</era>
+						<era type="160">Kentoku (1370–1372)</era>
+						<era type="161">Bunchū (1372–1375)</era>
+						<era type="162">Tenju (1375–1379)</era>
+						<era type="163">Kōryaku (1379–1381)</era>
+						<era type="164">Kōwa (1381–1384)</era>
+						<era type="165">Genchū (1384–1392)</era>
+						<era type="166">Meitoku (1384–1387)</era>
+						<era type="167">Kakei (1387–1389)</era>
+						<era type="168">Kōō (1389–1390)</era>
+						<era type="169">Meitoku (1390–1394)</era>
+						<era type="170">Ōei (1394–1428)</era>
+						<era type="171">Shōchō (1428–1429)</era>
+						<era type="172">Eikyō (1429–1441)</era>
+						<era type="173">Kakitsu (1441–1444)</era>
+						<era type="174">Bun’an (1444–1449)</era>
+						<era type="175">Hōtoku (1449–1452)</era>
+						<era type="176">Kyōtoku (1452–1455)</era>
+						<era type="177">Kōshō (1455–1457)</era>
+						<era type="178">Chōroku (1457–1460)</era>
+						<era type="179">Kanshō (1460–1466)</era>
+						<era type="180">Bunshō (1466–1467)</era>
+						<era type="181">Ōnin (1467–1469)</era>
+						<era type="182">Bunmei (1469–1487)</era>
+						<era type="183">Chōkyō (1487–1489)</era>
+						<era type="184">Entoku (1489–1492)</era>
+						<era type="185">Meiō (1492–1501)</era>
+						<era type="186">Bunki (1501–1504)</era>
+						<era type="187">Eishō (1504–1521)</era>
+						<era type="188">Taiei (1521–1528)</era>
+						<era type="189">Kyōroku (1528–1532)</era>
+						<era type="190">Tenbun (1532–1555)</era>
+						<era type="191">Kōji (1555–1558)</era>
+						<era type="192">Eiroku (1558–1570)</era>
+						<era type="193">Genki (1570–1573)</era>
+						<era type="194">Tenshō (1573–1592)</era>
+						<era type="195">Bunroku (1592–1596)</era>
+						<era type="196">Keichō (1596–1615)</era>
+						<era type="197">Genna (1615–1624)</era>
+						<era type="198">Kan’ei (1624–1644)</era>
+						<era type="199">Shōho (1644–1648)</era>
+						<era type="200">Keian (1648–1652)</era>
+						<era type="201">Jōō (1652–1655)</era>
+						<era type="202">Meireki (1655–1658)</era>
+						<era type="203">Manji (1658–1661)</era>
+						<era type="204">Kanbun (1661–1673)</era>
+						<era type="205">Enpō (1673–1681)</era>
+						<era type="206">Tenna (1681–1684)</era>
+						<era type="207">Jōkyō (1684–1688)</era>
+						<era type="208">Genroku (1688–1704)</era>
+						<era type="209">Hōei (1704–1711)</era>
+						<era type="210">Shōtoku (1711–1716)</era>
+						<era type="211">Kyōhō (1716–1736)</era>
+						<era type="212">Genbun (1736–1741)</era>
+						<era type="213">Kanpō (1741–1744)</era>
+						<era type="214">Enkyō (1744–1748)</era>
+						<era type="215">Kan’en (1748–1751)</era>
+						<era type="216">Hōreki (1751–1764)</era>
+						<era type="217">Meiwa (1764–1772)</era>
+						<era type="218">An’ei (1772–1781)</era>
+						<era type="219">Tenmei (1781–1789)</era>
+						<era type="220">Kansei (1789–1801)</era>
+						<era type="221">Kyōwa (1801–1804)</era>
+						<era type="222">Bunka (1804–1818)</era>
+						<era type="223">Bunsei (1818–1830)</era>
+						<era type="224">Tenpō (1830–1844)</era>
+						<era type="225">Kōka (1844–1848)</era>
+						<era type="226">Kaei (1848–1854)</era>
+						<era type="227">Ansei (1854–1860)</era>
+						<era type="228">Man’en (1860–1861)</era>
+						<era type="229">Bunkyū (1861–1864)</era>
+						<era type="230">Genji (1864–1865)</era>
+						<era type="231">Keiō (1865–1868)</era>
 						<era type="232">M</era>
 						<era type="233">T</era>
 						<era type="234">S</era>
@@ -2698,7 +2702,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<perMille>؉</perMille>
 			<infinity>∞</infinity>
 			<nan>NaN</nan>
-			<timeSeparator>٫</timeSeparator>
+			<timeSeparator>:</timeSeparator>
 		</symbols>
 		<symbols numberSystem="arabext">
 			<decimal>٫</decimal>
@@ -3344,6 +3348,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<alias source="locale" path="../currencyFormat[@type='standard']"/>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">¤ 0K</pattern>
+					<pattern type="10000" count="other">¤ 00K</pattern>
+					<pattern type="100000" count="other">¤ 000K</pattern>
+					<pattern type="1000000" count="other">¤ 0M</pattern>
+					<pattern type="10000000" count="other">¤ 00M</pattern>
+					<pattern type="100000000" count="other">¤ 000M</pattern>
+					<pattern type="1000000000" count="other">¤ 0G</pattern>
+					<pattern type="10000000000" count="other">¤ 00G</pattern>
+					<pattern type="100000000000" count="other">¤ 000G</pattern>
+					<pattern type="1000000000000" count="other">¤ 0T</pattern>
+					<pattern type="10000000000000" count="other">¤ 00T</pattern>
+					<pattern type="100000000000000" count="other">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="lepc">
@@ -3509,6 +3529,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>£</symbol>
 				<symbol alt="narrow">£</symbol>
 			</currency>
+			<currency type="GEL">
+				<symbol alt="narrow">₾</symbol>
+			</currency>
 			<currency type="GIP">
 				<symbol alt="narrow">£</symbol>
 			</currency>
@@ -3643,7 +3666,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow">₲</symbol>
 			</currency>
 			<currency type="RUB">
-				<symbol alt="variant">₽</symbol>
+				<symbol alt="narrow">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<symbol alt="narrow">р.</symbol>
@@ -3690,7 +3713,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="TWD">
 				<symbol>NT$</symbol>
-				<symbol alt="narrow">NT$</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="UAH">
 				<symbol alt="narrow">₴</symbol>
@@ -3873,6 +3896,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m/s²</displayName>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="other">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>deg</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>arcmin</displayName>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -3881,25 +3916,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>arcsec</displayName>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>deg</displayName>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>acre</displayName>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hectare</displayName>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acre</displayName>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ft²</displayName>
@@ -3908,112 +3953,142 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="area-square-inch">
 				<displayName>in²</displayName>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="other">{0} km²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="other">{0} m²</unitPattern>
+			<unit type="concentr-milligram-per-deciliter">
+				<displayName>mg/dL</displayName>
+				<unitPattern count="other">{0} mg/dL</unitPattern>
 			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="other">{0} mi²</unitPattern>
+			<unit type="concentr-millimole-per-liter">
+				<displayName>mmol/L</displayName>
+				<unitPattern count="other">{0} mmol/L</unitPattern>
 			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-part-per-million">
+				<displayName>ppm</displayName>
+				<unitPattern count="other">{0} ppm</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
 				<unitPattern count="other">{0} L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
-				<displayName>mpg</displayName>
-				<unitPattern count="other">{0} mpg</unitPattern>
+				<displayName>mpg US</displayName>
+				<unitPattern count="other">{0} mpg US</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="other">{0} Tb</unitPattern>
+			<unit type="consumption-mile-per-gallon-imperial">
+				<displayName>mpg Imp.</displayName>
+				<unitPattern count="other">{0} mpg Imp.</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>c</displayName>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>yr</displayName>
+				<unitPattern count="other">{0} y</unitPattern>
+				<perUnitPattern>{0}/y</perUnitPattern>
+			</unit>
+			<unit type="duration-year-person">
+				<alias source="locale" path="../unit[@type='duration-year']"/>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mon</displayName>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
+			</unit>
+			<unit type="duration-month-person">
+				<alias source="locale" path="../unit[@type='duration-month']"/>
+			</unit>
+			<unit type="duration-week">
+				<displayName>wk</displayName>
+				<unitPattern count="other">{0} w</unitPattern>
+				<perUnitPattern>{0}/w</perUnitPattern>
+			</unit>
+			<unit type="duration-week-person">
+				<alias source="locale" path="../unit[@type='duration-week']"/>
+			</unit>
 			<unit type="duration-day">
 				<displayName>day</displayName>
 				<unitPattern count="other">{0} d</unitPattern>
+				<perUnitPattern>{0}/d</perUnitPattern>
+			</unit>
+			<unit type="duration-day-person">
+				<alias source="locale" path="../unit[@type='duration-day']"/>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>hr</displayName>
 				<unitPattern count="other">{0} h</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="other">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>mon</displayName>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sec</displayName>
 				<unitPattern count="other">{0} s</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>wk</displayName>
-				<unitPattern count="other">{0} w</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>yr</displayName>
-				<unitPattern count="other">{0} y</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amp</displayName>
@@ -4031,6 +4106,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>volt</displayName>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="other">{0} cal</unitPattern>
@@ -4039,18 +4118,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Cal</displayName>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="other">{0} kWh</unitPattern>
@@ -4059,174 +4134,179 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>GHz</displayName>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>meter</displayName>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName>fm</displayName>
-				<unitPattern count="other">{0} fm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>ft</displayName>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>fur</displayName>
-				<unitPattern count="other">{0} fur</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>in</displayName>
-				<unitPattern count="other">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ly</displayName>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>meter</displayName>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mi</displayName>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yd</displayName>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ft</displayName>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>in</displayName>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ly</displayName>
+				<unitPattern count="other">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>fur</displayName>
+				<unitPattern count="other">{0} fur</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>fm</displayName>
+				<unitPattern count="other">{0} fm</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>CD</displayName>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gram</displayName>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="other">{0} lb</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>st</displayName>
-				<unitPattern count="other">{0} st</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tn</displayName>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName>st</displayName>
+				<unitPattern count="other">{0} st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>CD</displayName>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hp</displayName>
-				<unitPattern count="other">{0} hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watt</displayName>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="other">{0} mm Hg</unitPattern>
@@ -4235,9 +4315,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>psi</displayName>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -4251,6 +4335,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>mi/h</displayName>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="other">{0}°C</unitPattern>
@@ -4259,38 +4351,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>°F</displayName>
 				<unitPattern count="other">{0}°F</unitPattern>
 			</unit>
-			<unit type="temperature-generic">
-				<displayName>°</displayName>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
 			<unit type="temperature-kelvin">
 				<displayName>K</displayName>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>bu</displayName>
-				<unitPattern count="other">{0} bu</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cL</displayName>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="other">{0} km³</unitPattern>
@@ -4298,6 +4362,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-cubic-meter">
 				<displayName>m³</displayName>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -4307,21 +4377,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>yd³</displayName>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>cup</displayName>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -4330,23 +4396,62 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-liter">
 				<displayName>liter</displayName>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>bu</displayName>
+				<unitPattern count="other">{0} bu</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>US gal</displayName>
+				<unitPattern count="other">{0} gal US</unitPattern>
+				<perUnitPattern>{0}/gal US</perUnitPattern>
+			</unit>
+			<unit type="volume-gallon-imperial">
+				<displayName>Imp. gal</displayName>
+				<unitPattern count="other">{0} gal Imp.</unitPattern>
+				<perUnitPattern>{0}/gal Imp.</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cup</displayName>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>tbsp</displayName>
 				<unitPattern count="other">{0} tbsp</unitPattern>
@@ -4355,6 +4460,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>tsp</displayName>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<alias source="locale" path="../unitLength[@type='short']"/>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ru.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ru.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru.xml
index 18e8fa0bd47..d484508b445 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ru.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11353 $"/>
-		<generation date="$Date: 2015-03-06 15:54:42 -0600 (Fri, 06 Mar 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="ru"/>
 	</identity>
 	<localeDisplayNames>
@@ -43,7 +42,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="arp">арапахо</language>
 			<language type="arw">аравакский</language>
 			<language type="as">ассамский</language>
-			<language type="asa">аса</language>
+			<language type="asa">асу</language>
 			<language type="ast">астурийский</language>
 			<language type="av">аварский</language>
 			<language type="awa">авадхи</language>
@@ -62,6 +61,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bez">бена</language>
 			<language type="bfd" draft="contributed">бафут</language>
 			<language type="bg">болгарский</language>
+			<language type="bgn">западно-белуджский</language>
 			<language type="bho">бходжпури</language>
 			<language type="bi">бислама</language>
 			<language type="bik">бикольский</language>
@@ -75,7 +75,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bra">брауи</language>
 			<language type="brx">бодо</language>
 			<language type="bs">боснийский</language>
-			<language type="bss" draft="contributed">акоосе</language>
+			<language type="bss">акоосе</language>
 			<language type="bua">бурятский</language>
 			<language type="bug">бугийский</language>
 			<language type="bum" draft="contributed">булу</language>
@@ -148,6 +148,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="es">испанский</language>
 			<language type="es_419">латиноамериканский испанский</language>
 			<language type="es_ES">европейский испанский</language>
+			<language type="es_MX">мексиканский испанский</language>
 			<language type="et">эстонский</language>
 			<language type="eu">баскский</language>
 			<language type="ewo">эвондо</language>
@@ -287,6 +288,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">лаосский</language>
 			<language type="lol">монго</language>
 			<language type="loz">лози</language>
+			<language type="lrc">северно-лурийский</language>
 			<language type="lt">литовский</language>
 			<language type="lu">луба-катанга</language>
 			<language type="lua">луба-лулуа</language>
@@ -335,18 +337,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="my">бирманский</language>
 			<language type="mye" draft="contributed">миене</language>
 			<language type="myv">эрзя</language>
+			<language type="mzn">мазендеранский</language>
 			<language type="na">науру</language>
 			<language type="nap">неаполитанский</language>
 			<language type="naq">нама</language>
 			<language type="nb">норвежский букмол</language>
 			<language type="nd">северный ндебели</language>
 			<language type="nds">нижнегерманский</language>
+			<language type="nds_NL">нижнесаксонский</language>
 			<language type="ne">непальский</language>
 			<language type="new">неварский</language>
 			<language type="ng">ндонга</language>
 			<language type="nia">ниас</language>
 			<language type="niu">ниуэ</language>
-			<language type="nl">голландский</language>
+			<language type="nl">нидерландский</language>
 			<language type="nl_BE">фламандский</language>
 			<language type="nmg">квасио</language>
 			<language type="nn">норвежский нюнорск</language>
@@ -417,6 +421,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">сицилийский</language>
 			<language type="sco">шотландский</language>
 			<language type="sd">синдхи</language>
+			<language type="sdh">южнокурдский</language>
 			<language type="se">северносаамский</language>
 			<language type="see" draft="contributed">сенека</language>
 			<language type="seh">сена</language>
@@ -425,7 +430,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sg">санго</language>
 			<language type="sga">староирландский</language>
 			<language type="sh">сербскохорватский</language>
-			<language type="shi" draft="contributed">тахелхит</language>
+			<language type="shi">ташельхит</language>
 			<language type="shn">шанский</language>
 			<language type="shu" draft="contributed">чадский арабс</language>
 			<language type="si">сингальский</language>
@@ -433,10 +438,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sk">словацкий</language>
 			<language type="sl">словенский</language>
 			<language type="sm">самоанский</language>
-			<language type="sma">саамский (южный)</language>
+			<language type="sma">южно-саамский</language>
 			<language type="smj">луле-саамский</language>
 			<language type="smn">инари-саамский</language>
-			<language type="sms" draft="contributed">скольт-саамский</language>
+			<language type="sms">скольт-саамский</language>
 			<language type="sn">шона</language>
 			<language type="snk">сонинке</language>
 			<language type="so">сомали</language>
@@ -454,8 +459,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">шумерский</language>
 			<language type="sv">шведский</language>
 			<language type="sw">суахили</language>
+			<language type="sw_CD">конголезский суахили</language>
 			<language type="swb">коморский</language>
-			<language type="swc">конголезский суахили</language>
 			<language type="syc">классический сирийский</language>
 			<language type="syr">сирийский</language>
 			<language type="ta">тамильский</language>
@@ -491,7 +496,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="twq">тасавак</language>
 			<language type="ty">таитянский</language>
 			<language type="tyv">тувинский</language>
-			<language type="tzm" draft="contributed">среднеатласский тамазигхтский</language>
+			<language type="tzm">среднеатласский тамазигхтский</language>
 			<language type="udm">удмуртский</language>
 			<language type="ug">уйгурский</language>
 			<language type="uga">угаритский</language>
@@ -511,6 +516,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">воламо</language>
 			<language type="war">варай</language>
 			<language type="was">вашо</language>
+			<language type="wbp">вальбири</language>
 			<language type="wo">волоф</language>
 			<language type="xal">калмыцкий</language>
 			<language type="xh">коса</language>
@@ -550,7 +556,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Blis">блиссимволика</script>
 			<script type="Bopo">бопомофо</script>
 			<script type="Brah">брахми</script>
-			<script type="Brai">брайля</script>
+			<script type="Brai">Брайля</script>
 			<script type="Bugi">бугинизийская</script>
 			<script type="Buhd">бухид</script>
 			<script type="Cakm">чакмийская</script>
@@ -737,7 +743,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Ангилья</territory>
 			<territory type="AL">Албания</territory>
 			<territory type="AM">Армения</territory>
-			<territory type="AN">Нидерландские Антильские о-ва</territory>
 			<territory type="AO">Ангола</territory>
 			<territory type="AQ">Антарктида</territory>
 			<territory type="AR">Аргентина</territory>
@@ -834,7 +839,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GU">Гуам</territory>
 			<territory type="GW">Гвинея-Бисау</territory>
 			<territory type="GY">Гайана</territory>
-			<territory type="HK">Гонконг (особый район)</territory>
+			<territory type="HK">Гонконг (специальный административный район)</territory>
 			<territory type="HK" alt="short">Гонконг</territory>
 			<territory type="HM">о-ва Херд и Макдональд</territory>
 			<territory type="HN">Гондурас</territory>
@@ -845,7 +850,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ID">Индонезия</territory>
 			<territory type="IE">Ирландия</territory>
 			<territory type="IL">Израиль</territory>
-			<territory type="IM">О-в Мэн</territory>
+			<territory type="IM">о-в Мэн</territory>
 			<territory type="IN">Индия</territory>
 			<territory type="IO">Британская территория в Индийском океане</territory>
 			<territory type="IQ">Ирак</territory>
@@ -890,7 +895,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ML">Мали</territory>
 			<territory type="MM">Мьянма (Бирма)</territory>
 			<territory type="MN">Монголия</territory>
-			<territory type="MO">Макао (особый район)</territory>
+			<territory type="MO">Макао (специальный административный район)</territory>
 			<territory type="MO" alt="short">Макао</territory>
 			<territory type="MP">Северные Марианские о-ва</territory>
 			<territory type="MQ">Мартиника</territory>
@@ -924,7 +929,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="PK">Пакистан</territory>
 			<territory type="PL">Польша</territory>
 			<territory type="PM">Сен-Пьер и Микелон</territory>
-			<territory type="PN">Питкерн</territory>
+			<territory type="PN">острова Питкэрн</territory>
 			<territory type="PR">Пуэрто-Рико</territory>
 			<territory type="PS">Палестинские территории</territory>
 			<territory type="PS" alt="short">Палестина</territory>
@@ -944,7 +949,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="SD">Судан</territory>
 			<territory type="SE">Швеция</territory>
 			<territory type="SG">Сингапур</territory>
-			<territory type="SH">О-в Св. Елены</territory>
+			<territory type="SH">о-в Св. Елены</territory>
 			<territory type="SI">Словения</territory>
 			<territory type="SJ">Шпицберген и Ян-Майен</territory>
 			<territory type="SK">Словакия</territory>
@@ -960,7 +965,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="SY">Сирия</territory>
 			<territory type="SZ">Свазиленд</territory>
 			<territory type="TA">Тристан-да-Кунья</territory>
-			<territory type="TC">О-ва Тёркс и Кайкос</territory>
+			<territory type="TC">о-ва Тёркс и Кайкос</territory>
 			<territory type="TD">Чад</territory>
 			<territory type="TF">Французские Южные Территории</territory>
 			<territory type="TG">Того</territory>
@@ -968,6 +973,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="TJ">Таджикистан</territory>
 			<territory type="TK">Токелау</territory>
 			<territory type="TL">Восточный Тимор</territory>
+			<territory type="TL" alt="variant">Тимор-Лесте</territory>
 			<territory type="TM">Туркменистан</territory>
 			<territory type="TN">Тунис</territory>
 			<territory type="TO">Тонга</territory>
@@ -1047,6 +1053,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">Сортировка чисел</key>
 			<key type="colStrength" draft="contributed">Эффективность сортировки</key>
 			<key type="currency">валюта</key>
+			<key type="hc">Система времени (12 или 24)</key>
+			<key type="lb">стиль перевода строки</key>
+			<key type="ms">система мер</key>
 			<key type="numbers">цифры</key>
 			<key type="timezone" draft="contributed">Часовой пояс</key>
 			<key type="va" draft="contributed">Вариант региональных настроек</key>
@@ -1054,121 +1063,131 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x" draft="contributed">Частное</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">арабско-индийские цифры</type>
-			<type type="arabext" key="numbers">расширенная система арабско-индийских цифр</type>
-			<type type="armn" key="numbers">армянские цифры</type>
-			<type type="armnlow" key="numbers">армянские цифры в нижнем регистре</type>
-			<type type="bali" key="numbers" draft="contributed">балийские цифры</type>
-			<type type="beng" key="numbers">бенгальские цифры</type>
-			<type type="big5han" key="collation">Сортировка традиционного китайского языка – Big5</type>
-			<type type="brah" key="numbers" draft="contributed">цифры брахми</type>
-			<type type="buddhist" key="calendar">буддийский календарь</type>
-			<type type="cakm" key="numbers" draft="contributed">цифры чакма</type>
-			<type type="cham" key="numbers" draft="contributed">чамские цифры</type>
-			<type type="chinese" key="calendar">китайский календарь</type>
-			<type type="coptic" key="calendar">Коптский календарь</type>
-			<type type="dangi" key="calendar" draft="contributed">календарь данги</type>
-			<type type="deva" key="numbers">цифры деванагари</type>
-			<type type="dictionary" key="collation">словарный порядок сортировки</type>
-			<type type="ducet" key="collation">cтандартная сортировка Unicode</type>
-			<type type="eor" key="collation" draft="contributed">европейские правила сортировки</type>
-			<type type="ethi" key="numbers">эфиопские цифры</type>
-			<type type="ethiopic" key="calendar">эфиопский календарь</type>
-			<type type="ethiopic-amete-alem" key="calendar">Эфиопский календарь &quot;Амете Алем&quot;</type>
-			<type type="finance" key="numbers" draft="contributed">Символы обозначения финансовых показателей</type>
-			<type type="fullwide" key="numbers">полноширинные цифры</type>
-			<type type="gb2312han" key="collation">упрощенный китайский - GB2312</type>
-			<type type="geor" key="numbers">грузинские цифры</type>
-			<type type="gregorian" key="calendar">григорианский календарь</type>
-			<type type="grek" key="numbers">греческие цифры</type>
-			<type type="greklow" key="numbers">греческие цифры в нижнем регистре</type>
-			<type type="gujr" key="numbers">цифры гуджарати</type>
-			<type type="guru" key="numbers">цифры гурмукхи</type>
-			<type type="hanidec" key="numbers">китайские десятичные цифры</type>
-			<type type="hans" key="numbers">китайские упрощенные цифры</type>
-			<type type="hansfin" key="numbers">китайские упрощенные цифры (финансы)</type>
-			<type type="hant" key="numbers">китайские традиционные цифры</type>
-			<type type="hantfin" key="numbers">китайские традиционные цифры (финансы)</type>
-			<type type="hebr" key="numbers">цифры на иврите</type>
-			<type type="hebrew" key="calendar">еврейский календарь</type>
-			<type type="identical" key="colStrength" draft="contributed">Полная сортировка</type>
-			<type type="indian" key="calendar">Национальный календарь Индии</type>
-			<type type="islamic" key="calendar">исламский календарь</type>
-			<type type="islamic-civil" key="calendar">Исламский гражданский календарь</type>
-			<type type="islamic-rgsa" key="calendar" draft="contributed">исламский календарь (Саудовская Аравия)</type>
-			<type type="islamic-tbla" key="calendar" draft="contributed">исламский календарь (табличный, астрономическая эпоха)</type>
-			<type type="islamic-umalqura" key="calendar" draft="contributed">исламский календарь (Умм аль-Кура)</type>
-			<type type="iso8601" key="calendar" draft="contributed">календарь ISO-8601</type>
-			<type type="japanese" key="calendar">японский календарь</type>
-			<type type="java" key="numbers" draft="contributed">яванские цифры</type>
-			<type type="jpan" key="numbers">японские цифры</type>
-			<type type="jpanfin" key="numbers">японские цифры (финансы)</type>
-			<type type="kali" key="numbers" draft="contributed">цифры кайя ли</type>
-			<type type="khmr" key="numbers">кхмерские цифры</type>
-			<type type="knda" key="numbers">цифры каннада</type>
-			<type type="lana" key="numbers" draft="contributed">цифры тай там хора</type>
-			<type type="lanatham" key="numbers" draft="contributed">цифры тай там там</type>
-			<type type="laoo" key="numbers">лаосские цифры</type>
-			<type type="latn" key="numbers">современные арабские цифры</type>
-			<type type="lepc" key="numbers" draft="contributed">цифры лепча</type>
-			<type type="limb" key="numbers" draft="contributed">цифры лимбу</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">Приоритетная сортировка слов в нижнем регистре</type>
-			<type type="mlym" key="numbers">цифры малаялам</type>
-			<type type="mong" key="numbers">Монгольские цифры</type>
-			<type type="mtei" key="numbers" draft="contributed">цифры манипури</type>
-			<type type="mymr" key="numbers">бирманские цифры</type>
-			<type type="mymrshan" key="numbers" draft="contributed">бирманские шанские цифры</type>
-			<type type="native" key="numbers" draft="contributed">Обозначения цифр коренного населения</type>
-			<type type="nkoo" key="numbers" draft="contributed">цифры нко</type>
-			<type type="no" key="colBackwards" draft="contributed">Сортировка по акцентам в обычном порядке</type>
-			<type type="no" key="colCaseFirst" draft="contributed">Сортировка по стандартным правилам</type>
-			<type type="no" key="colCaseLevel" draft="contributed">Сортировка вне зависимости от регистра</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">Отдельная сортировка каны</type>
-			<type type="no" key="colNormalization" draft="contributed">Сортировка без нормализации</type>
-			<type type="no" key="colNumeric" draft="contributed">Отдельная сортировка числовых значений</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">Сортировка символов</type>
-			<type type="olck" key="numbers" draft="contributed">цифры ол-чики</type>
-			<type type="orya" key="numbers">цифры ория</type>
-			<type type="osma" key="numbers" draft="contributed">цифры османья</type>
-			<type type="persian" key="calendar">персидский календарь</type>
-			<type type="phonebook" key="collation">порядок телефонной книги</type>
-			<type type="phonetic" key="collation" draft="contributed">Фонетический порядок сортировки</type>
-			<type type="pinyin" key="collation">пиньинь</type>
-			<type type="primary" key="colStrength" draft="contributed">Сортировка только по символам, обозначающим разрядность</type>
-			<type type="quaternary" key="colStrength" draft="contributed">Сортировка по акцентам/регистрам/длине строки/кане</type>
-			<type type="reformed" key="collation">реформированный порядок сортировки</type>
-			<type type="roc" key="calendar">китайский календарь</type>
-			<type type="roman" key="numbers">римские цифры</type>
-			<type type="romanlow" key="numbers">римские цифры в нижнем регистре</type>
-			<type type="saur" key="numbers" draft="contributed">цифры саураштра</type>
-			<type type="search" key="collation">поиск</type>
-			<type type="searchjl" key="collation" draft="contributed">Поиск по первой согласной хангыль</type>
-			<type type="secondary" key="colStrength" draft="contributed">Сортировка по акцентам</type>
-			<type type="shifted" key="colAlternate" draft="contributed">Сортировка без учета символов</type>
-			<type type="shrd" key="numbers" draft="contributed">цифры шарада</type>
-			<type type="sora" key="numbers" draft="contributed">цифры сора-сомпенг</type>
-			<type type="standard" key="collation">стандартная сортировка</type>
-			<type type="stroke" key="collation" draft="contributed">по чертам</type>
-			<type type="sund" key="numbers" draft="contributed">суданские цифры</type>
-			<type type="takr" key="numbers" draft="contributed">цифры такри</type>
-			<type type="talu" key="numbers" draft="contributed">цифры новой тай-лю</type>
-			<type type="taml" key="numbers">тамильские традиционные цифры</type>
-			<type type="tamldec" key="numbers">тамильские цифры</type>
-			<type type="telu" key="numbers">цифры телугу</type>
-			<type type="tertiary" key="colStrength" draft="contributed">Сортировка по акцентам/регистру/длине строки</type>
-			<type type="thai" key="numbers">тайские цифры</type>
-			<type type="tibt" key="numbers">тибетские цифры</type>
-			<type type="traditional" key="collation">традиционный порядок</type>
-			<type type="traditional" key="numbers" draft="contributed">Традиционная система нумерации</type>
-			<type type="unihan" key="collation">сортировка по ключам, затем по чертам</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">Приоритетная сортировка слов в верхнем регистре</type>
-			<type type="vaii" key="numbers" draft="contributed">Цифры языка вай</type>
-			<type type="yes" key="colBackwards" draft="contributed">Сортировка по акцентам в обратном порядке</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">Сортировка с учетом регистра</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">Сортировка каны другим способом</type>
-			<type type="yes" key="colNormalization" draft="contributed">Сортировка нормализованных символов Unicode</type>
-			<type type="yes" key="colNumeric" draft="contributed">Сортировка численных значений</type>
-			<type type="zhuyin" key="collation" draft="contributed">чжуинь</type>
+			<type key="calendar" type="buddhist">буддийский календарь</type>
+			<type key="calendar" type="chinese">китайский календарь</type>
+			<type key="calendar" type="coptic">Коптский календарь</type>
+			<type key="calendar" type="dangi">календарь данги</type>
+			<type key="calendar" type="ethiopic">эфиопский календарь</type>
+			<type key="calendar" type="ethiopic-amete-alem">Эфиопский календарь &quot;Амете Алем&quot;</type>
+			<type key="calendar" type="gregorian">григорианский календарь</type>
+			<type key="calendar" type="hebrew">еврейский календарь</type>
+			<type key="calendar" type="indian">Национальный календарь Индии</type>
+			<type key="calendar" type="islamic">исламский календарь</type>
+			<type key="calendar" type="islamic-civil">Исламский гражданский календарь</type>
+			<type key="calendar" type="islamic-rgsa" draft="contributed">исламский календарь (Саудовская Аравия)</type>
+			<type key="calendar" type="islamic-tbla" draft="contributed">исламский календарь (табличный, астрономическая эпоха)</type>
+			<type key="calendar" type="islamic-umalqura" draft="contributed">исламский календарь (Умм аль-Кура)</type>
+			<type key="calendar" type="iso8601">календарь ISO-8601</type>
+			<type key="calendar" type="japanese">японский календарь</type>
+			<type key="calendar" type="persian">персидский календарь</type>
+			<type key="calendar" type="roc">китайский календарь</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">Сортировка символов</type>
+			<type key="colAlternate" type="shifted" draft="contributed">Сортировка без учета символов</type>
+			<type key="colBackwards" type="no" draft="contributed">Сортировка по акцентам в обычном порядке</type>
+			<type key="colBackwards" type="yes" draft="contributed">Сортировка по акцентам в обратном порядке</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">Приоритетная сортировка слов в нижнем регистре</type>
+			<type key="colCaseFirst" type="no" draft="contributed">Сортировка по стандартным правилам</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">Приоритетная сортировка слов в верхнем регистре</type>
+			<type key="colCaseLevel" type="no" draft="contributed">Сортировка вне зависимости от регистра</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">Сортировка с учетом регистра</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">Отдельная сортировка каны</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">Сортировка каны другим способом</type>
+			<type key="collation" type="big5han">Сортировка традиционного китайского языка – Big5</type>
+			<type key="collation" type="dictionary">словарный порядок сортировки</type>
+			<type key="collation" type="ducet">cтандартная сортировка Unicode</type>
+			<type key="collation" type="eor" draft="contributed">европейские правила сортировки</type>
+			<type key="collation" type="gb2312han">упрощенный китайский - GB2312</type>
+			<type key="collation" type="phonebook">порядок телефонной книги</type>
+			<type key="collation" type="phonetic" draft="contributed">Фонетический порядок сортировки</type>
+			<type key="collation" type="pinyin">пиньинь</type>
+			<type key="collation" type="reformed">реформированный порядок сортировки</type>
+			<type key="collation" type="search">поиск</type>
+			<type key="collation" type="searchjl" draft="contributed">Поиск по первой согласной хангыль</type>
+			<type key="collation" type="standard">стандартная сортировка</type>
+			<type key="collation" type="stroke" draft="contributed">по чертам</type>
+			<type key="collation" type="traditional">традиционный порядок</type>
+			<type key="collation" type="unihan">сортировка по ключам, затем по чертам</type>
+			<type key="collation" type="zhuyin" draft="contributed">чжуинь</type>
+			<type key="colNormalization" type="no" draft="contributed">Сортировка без нормализации</type>
+			<type key="colNormalization" type="yes" draft="contributed">Сортировка нормализованных символов Unicode</type>
+			<type key="colNumeric" type="no" draft="contributed">Отдельная сортировка числовых значений</type>
+			<type key="colNumeric" type="yes" draft="contributed">Сортировка численных значений</type>
+			<type key="colStrength" type="identical" draft="contributed">Полная сортировка</type>
+			<type key="colStrength" type="primary" draft="contributed">Сортировка только по символам, обозначающим разрядность</type>
+			<type key="colStrength" type="quaternary" draft="contributed">Сортировка по акцентам/регистрам/длине строки/кане</type>
+			<type key="colStrength" type="secondary" draft="contributed">Сортировка по акцентам</type>
+			<type key="colStrength" type="tertiary" draft="contributed">Сортировка по акцентам/регистру/длине строки</type>
+			<type key="hc" type="h11">12-часовая система (0-11)</type>
+			<type key="hc" type="h12">12-часовая система (1-12)</type>
+			<type key="hc" type="h23">24-часовая система (0-23)</type>
+			<type key="hc" type="h24">24-часовая система (1-24)</type>
+			<type key="lb" type="loose">мягкий перевод строки</type>
+			<type key="lb" type="normal">обычный перевод строки</type>
+			<type key="lb" type="strict">жесткий перевод строки</type>
+			<type key="ms" type="metric">метрическая система</type>
+			<type key="ms" type="uksystem">британская система мер</type>
+			<type key="ms" type="ussystem">американская система мер</type>
+			<type key="numbers" type="arab">арабско-индийские цифры</type>
+			<type key="numbers" type="arabext">расширенная система арабско-индийских цифр</type>
+			<type key="numbers" type="armn">армянские цифры</type>
+			<type key="numbers" type="armnlow">армянские цифры в нижнем регистре</type>
+			<type key="numbers" type="bali" draft="contributed">балийские цифры</type>
+			<type key="numbers" type="beng">бенгальские цифры</type>
+			<type key="numbers" type="brah" draft="contributed">цифры брахми</type>
+			<type key="numbers" type="cakm" draft="contributed">цифры чакма</type>
+			<type key="numbers" type="cham" draft="contributed">чамские цифры</type>
+			<type key="numbers" type="deva">цифры деванагари</type>
+			<type key="numbers" type="ethi">эфиопские цифры</type>
+			<type key="numbers" type="finance" draft="contributed">Символы обозначения финансовых показателей</type>
+			<type key="numbers" type="fullwide">полноширинные цифры</type>
+			<type key="numbers" type="geor">грузинские цифры</type>
+			<type key="numbers" type="grek">греческие цифры</type>
+			<type key="numbers" type="greklow">греческие цифры в нижнем регистре</type>
+			<type key="numbers" type="gujr">цифры гуджарати</type>
+			<type key="numbers" type="guru">цифры гурмукхи</type>
+			<type key="numbers" type="hanidec">китайские десятичные цифры</type>
+			<type key="numbers" type="hans">китайские упрощенные цифры</type>
+			<type key="numbers" type="hansfin">китайские упрощенные цифры (финансы)</type>
+			<type key="numbers" type="hant">китайские традиционные цифры</type>
+			<type key="numbers" type="hantfin">китайские традиционные цифры (финансы)</type>
+			<type key="numbers" type="hebr">цифры на иврите</type>
+			<type key="numbers" type="java" draft="contributed">яванские цифры</type>
+			<type key="numbers" type="jpan">японские цифры</type>
+			<type key="numbers" type="jpanfin">японские цифры (финансы)</type>
+			<type key="numbers" type="kali" draft="contributed">цифры кайя ли</type>
+			<type key="numbers" type="khmr">кхмерские цифры</type>
+			<type key="numbers" type="knda">цифры каннада</type>
+			<type key="numbers" type="lana" draft="contributed">цифры тай там хора</type>
+			<type key="numbers" type="lanatham" draft="contributed">цифры тай там там</type>
+			<type key="numbers" type="laoo">лаосские цифры</type>
+			<type key="numbers" type="latn">современные арабские цифры</type>
+			<type key="numbers" type="lepc" draft="contributed">цифры лепча</type>
+			<type key="numbers" type="limb" draft="contributed">цифры лимбу</type>
+			<type key="numbers" type="mlym">цифры малаялам</type>
+			<type key="numbers" type="mong">Монгольские цифры</type>
+			<type key="numbers" type="mtei" draft="contributed">цифры манипури</type>
+			<type key="numbers" type="mymr">бирманские цифры</type>
+			<type key="numbers" type="mymrshan" draft="contributed">бирманские шанские цифры</type>
+			<type key="numbers" type="native" draft="contributed">Обозначения цифр коренного населения</type>
+			<type key="numbers" type="nkoo" draft="contributed">цифры нко</type>
+			<type key="numbers" type="olck" draft="contributed">цифры ол-чики</type>
+			<type key="numbers" type="orya">цифры ория</type>
+			<type key="numbers" type="osma" draft="contributed">цифры османья</type>
+			<type key="numbers" type="roman">римские цифры</type>
+			<type key="numbers" type="romanlow">римские цифры в нижнем регистре</type>
+			<type key="numbers" type="saur" draft="contributed">цифры саураштра</type>
+			<type key="numbers" type="shrd" draft="contributed">цифры шарада</type>
+			<type key="numbers" type="sora" draft="contributed">цифры сора-сомпенг</type>
+			<type key="numbers" type="sund" draft="contributed">суданские цифры</type>
+			<type key="numbers" type="takr" draft="contributed">цифры такри</type>
+			<type key="numbers" type="talu" draft="contributed">цифры новой тай-лю</type>
+			<type key="numbers" type="taml">тамильские традиционные цифры</type>
+			<type key="numbers" type="tamldec">тамильские цифры</type>
+			<type key="numbers" type="telu">цифры телугу</type>
+			<type key="numbers" type="thai">тайские цифры</type>
+			<type key="numbers" type="tibt">тибетские цифры</type>
+			<type key="numbers" type="traditional" draft="contributed">Традиционная система нумерации</type>
+			<type key="numbers" type="vaii" draft="contributed">Цифры языка вай</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">Палата географических названий США</transformName>
@@ -1604,8 +1623,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
-						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d MMM y 'г'. G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d MMM y 'г'. G</dateFormatItem>
 						<dateFormatItem id="h" draft="contributed">h a</dateFormatItem>
 						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm" draft="contributed">h:mm a</dateFormatItem>
@@ -1618,6 +1637,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">ccc, d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
@@ -1625,8 +1645,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMd">dd.MM.y G</dateFormatItem>
 						<dateFormatItem id="yyyyMEd">E, dd.MM.y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMM">LLL y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMd">d MMM y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMEd">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">d MMM y 'г'. G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">E, d MMM y 'г'. G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMM">LLLL y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">QQQQ y 'г'. G</dateFormatItem>
@@ -1680,7 +1700,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">E, dd.MM – E, dd.MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL-LLL</greatestDifference>
+							<greatestDifference id="M">LLL–LLL</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">d–d MMM</greatestDifference>
@@ -1737,11 +1757,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<monthWidth type="abbreviated">
 							<month type="1">янв.</month>
 							<month type="2">февр.</month>
-							<month type="3">марта</month>
+							<month type="3">мар.</month>
 							<month type="4">апр.</month>
 							<month type="5">мая</month>
-							<month type="6">июня</month>
-							<month type="7">июля</month>
+							<month type="6">июн.</month>
+							<month type="7">июл.</month>
 							<month type="8">авг.</month>
 							<month type="9">сент.</month>
 							<month type="10">окт.</month>
@@ -1863,13 +1883,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dayContext>
 					<dayContext type="stand-alone">
 						<dayWidth type="abbreviated">
-							<day type="sun">Вс</day>
-							<day type="mon">Пн</day>
-							<day type="tue">Вт</day>
-							<day type="wed">Ср</day>
-							<day type="thu">Чт</day>
-							<day type="fri">Пт</day>
-							<day type="sat">Сб</day>
+							<day type="sun">вс</day>
+							<day type="mon">пн</day>
+							<day type="tue">вт</day>
+							<day type="wed">ср</day>
+							<day type="thu">чт</day>
+							<day type="fri">пт</day>
+							<day type="sat">сб</day>
 						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun">В</day>
@@ -1890,13 +1910,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<day type="sat" draft="contributed">сб</day>
 						</dayWidth>
 						<dayWidth type="wide">
-							<day type="sun">Воскресенье</day>
-							<day type="mon">Понедельник</day>
-							<day type="tue">Вторник</day>
-							<day type="wed">Среда</day>
-							<day type="thu">Четверг</day>
-							<day type="fri">Пятница</day>
-							<day type="sat">Суббота</day>
+							<day type="sun">воскресенье</day>
+							<day type="mon">понедельник</day>
+							<day type="tue">вторник</day>
+							<day type="wed">среда</day>
+							<day type="thu">четверг</day>
+							<day type="fri">пятница</day>
+							<day type="sat">суббота</day>
 						</dayWidth>
 					</dayContext>
 				</days>
@@ -1945,25 +1965,75 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am" draft="contributed">AM</dayPeriod>
-							<dayPeriod type="pm" draft="contributed">PM</dayPeriod>
+							<dayPeriod type="midnight">полночь</dayPeriod>
+							<dayPeriod type="am">ДП</dayPeriod>
+							<dayPeriod type="noon">полдень</dayPeriod>
+							<dayPeriod type="pm">ПП</dayPeriod>
+							<dayPeriod type="morning1">утра</dayPeriod>
+							<dayPeriod type="afternoon1">дня</dayPeriod>
+							<dayPeriod type="evening1">вечера</dayPeriod>
+							<dayPeriod type="night1">ночи</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am" draft="contributed">AM</dayPeriod>
+							<dayPeriod type="midnight">полночь</dayPeriod>
+							<dayPeriod type="am">ДП</dayPeriod>
 							<dayPeriod type="noon">полдень</dayPeriod>
-							<dayPeriod type="pm" draft="contributed">PM</dayPeriod>
+							<dayPeriod type="pm">ПП</dayPeriod>
+							<dayPeriod type="morning1">утра</dayPeriod>
+							<dayPeriod type="afternoon1">дня</dayPeriod>
+							<dayPeriod type="evening1">вечера</dayPeriod>
+							<dayPeriod type="night1">ночи</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="midnight">полночь</dayPeriod>
+							<dayPeriod type="am">ДП</dayPeriod>
 							<dayPeriod type="noon">полдень</dayPeriod>
-							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="pm">ПП</dayPeriod>
+							<dayPeriod type="morning1">утра</dayPeriod>
+							<dayPeriod type="afternoon1">дня</dayPeriod>
+							<dayPeriod type="evening1">вечера</dayPeriod>
+							<dayPeriod type="night1">ночи</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">полн.</dayPeriod>
+							<dayPeriod type="am">ДП</dayPeriod>
+							<dayPeriod type="noon">полд.</dayPeriod>
+							<dayPeriod type="pm">ПП</dayPeriod>
+							<dayPeriod type="morning1">утро</dayPeriod>
+							<dayPeriod type="afternoon1">день</dayPeriod>
+							<dayPeriod type="evening1">веч.</dayPeriod>
+							<dayPeriod type="night1">ночь</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">полн.</dayPeriod>
+							<dayPeriod type="am">ДП</dayPeriod>
+							<dayPeriod type="noon">полд.</dayPeriod>
+							<dayPeriod type="pm">ПП</dayPeriod>
+							<dayPeriod type="morning1">утро</dayPeriod>
+							<dayPeriod type="afternoon1">день</dayPeriod>
+							<dayPeriod type="evening1">веч.</dayPeriod>
+							<dayPeriod type="night1">ночь</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">полночь</dayPeriod>
+							<dayPeriod type="am">ДП</dayPeriod>
+							<dayPeriod type="noon">полдень</dayPeriod>
+							<dayPeriod type="pm">ПП</dayPeriod>
+							<dayPeriod type="morning1">утро</dayPeriod>
+							<dayPeriod type="afternoon1">день</dayPeriod>
+							<dayPeriod type="evening1">вечер</dayPeriod>
+							<dayPeriod type="night1">ночь</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
-						<era type="0">до н. э.</era>
-						<era type="1">н. э.</era>
+						<era type="0">до Рождества Христова</era>
+						<era type="0" alt="variant">до нашей эры</era>
+						<era type="1">от Рождества Христова</era>
+						<era type="1" alt="variant">нашей эры</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">до н. э.</era>
@@ -2047,7 +2117,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="Gy">y 'г'. G</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y 'г'. G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y 'г'. G</dateFormatItem>
@@ -2068,17 +2138,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">ccc, d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yLLLL">LLLL y</dateFormatItem>
 						<dateFormatItem id="yM">MM.y</dateFormatItem>
 						<dateFormatItem id="yMd">dd.MM.y</dateFormatItem>
 						<dateFormatItem id="yMEd">ccc, d.MM.y 'г'.</dateFormatItem>
 						<dateFormatItem id="yMM">MM.y</dateFormatItem>
-						<dateFormatItem id="yMMM">LLL y</dateFormatItem>
+						<dateFormatItem id="yMMM">LLL y 'г'.</dateFormatItem>
 						<dateFormatItem id="yMMMd">d MMM y 'г'.</dateFormatItem>
 						<dateFormatItem id="yMMMEd">E, d MMM y 'г'.</dateFormatItem>
-						<dateFormatItem id="yMMMM">LLLL y</dateFormatItem>
+						<dateFormatItem id="yMMMM">LLLL y 'г'.</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ y 'г'.</dateFormatItem>
 						<dateFormatItem id="yQQQQ">QQQQ y 'г'.</dateFormatItem>
 					</availableFormats>
@@ -2134,18 +2204,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">E, dd.MM – E, dd.MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL-LLL</greatestDifference>
+							<greatestDifference id="M">LLL – LLL</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">d–d MMM</greatestDifference>
 							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">ccc, d - E, d MMM</greatestDifference>
-							<greatestDifference id="M">ccc, d MMM – ccc, d MMM</greatestDifference>
+							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL–LLLL</greatestDifference>
+							<greatestDifference id="M">LLLL – LLLL</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
 							<greatestDifference id="y">y–y</greatestDifference>
@@ -2417,238 +2487,238 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<eras>
 					<!-- per cldrbug 2835, accept provisional -->
 					<eraAbbr>
-						<era type="0">Эпоха Тайка (645-650)</era>
-						<era type="1">Эпоха Хакути (650-671)</era>
-						<era type="2">Эпоха Хакухо (672-686)</era>
-						<era type="3">Эпоха Сючё (686-701)</era>
-						<era type="4">Эпоха Тайхо (701-704)</era>
-						<era type="5">Эпоха Кёюн (704-708)</era>
-						<era type="6">Эпоха Вадо (708-715)</era>
-						<era type="7">Эпоха Рэйки (715-717)</era>
-						<era type="8">Эпоха Ёро (717-724)</era>
-						<era type="9">Эпоха Дзинки (724-729)</era>
-						<era type="10">Эпоха Темпьё (729-749)</era>
-						<era type="11">Эпоха Темпьё (749-749)</era>
+						<era type="0">Эпоха Тайка (645–650)</era>
+						<era type="1">Эпоха Хакути (650–671)</era>
+						<era type="2">Эпоха Хакухо (672–686)</era>
+						<era type="3">Эпоха Сючё (686–701)</era>
+						<era type="4">Эпоха Тайхо (701–704)</era>
+						<era type="5">Эпоха Кёюн (704–708)</era>
+						<era type="6">Эпоха Вадо (708–715)</era>
+						<era type="7">Эпоха Рэйки (715–717)</era>
+						<era type="8">Эпоха Ёро (717–724)</era>
+						<era type="9">Эпоха Дзинки (724–729)</era>
+						<era type="10">Эпоха Темпьё (729–749)</era>
+						<era type="11">Эпоха Темпьё (749–749)</era>
 						<era type="12">Эпоха Темпьё-Сьохо (749-757)</era>
 						<era type="13">Эпоха Темпьё-Ходзи (757-765)</era>
 						<era type="14">Эпоха Темпьё-Ходзи (765-767)</era>
 						<era type="15">Эпоха Джинго-Кёюн (767-770)</era>
-						<era type="16">Эпоха Хоки (770-780)</era>
-						<era type="17">Эпоха Теньё (781-782)</era>
-						<era type="18">Эпоха Енряку (782-806)</era>
-						<era type="19">Эпоха Дайдо (806-810)</era>
-						<era type="20">Эпоха Конин (810-824)</era>
-						<era type="21">Эпоха Тентьо (824-834)</era>
-						<era type="22">Эпоха Шова (834-848)</era>
-						<era type="23">Эпоха Кайо (848-851)</era>
-						<era type="24">Эпоха Ниндзю (851-854)</era>
-						<era type="25">Эпоха Сайко (854-857)</era>
-						<era type="26">Эпоха Теннан (857-859)</era>
-						<era type="27">Эпоха Йоган (859-877)</era>
-						<era type="28">Эпоха Генкей (877-885)</era>
-						<era type="29">Эпоха Нинна (885-889)</era>
-						<era type="30">Эпоха Кампьё (889-898)</era>
-						<era type="31">Эпоха Сьотай (898-901)</era>
-						<era type="32">Эпоха Энги (901-923)</era>
-						<era type="33">Эпоха Ентьо (923-931)</era>
-						<era type="34">Эпоха Сьёхэй (931-938)</era>
-						<era type="35">Эпоха Тенгьо (938-947)</era>
-						<era type="36">Эпоха Тенрияку (947-957)</era>
-						<era type="37">Эпоха Тентоку (957-961)</era>
-						<era type="38">Эпоха Ова (961-964)</era>
-						<era type="39">Эпоха Кохо (964-968)</era>
-						<era type="40">Эпоха Анна (968-970)</era>
-						<era type="41">Эпоха Тенроку (970-973)</era>
-						<era type="42">Эпоха Теньен (973-976)</era>
-						<era type="43">Эпоха Дзьоген (976-978)</era>
-						<era type="44">Эпоха Тенген (978-983)</era>
-						<era type="45">Эпоха Ейкан (983-985)</era>
-						<era type="46">Эпоха Канна (985-987)</era>
-						<era type="47">Эпоха Ейен (987-989)</era>
-						<era type="48">Эпоха Ейсо (989-990)</era>
-						<era type="49" draft="contributed">Эпоха Сёряку (990-995)</era>
-						<era type="50" draft="contributed">Эпоха Тётоку (995-999)</era>
-						<era type="51" draft="contributed">Эпоха Тёхо (999-1004)</era>
-						<era type="52" draft="contributed">Эпоха Канко (1004-1012)</era>
-						<era type="53" draft="contributed">Эпоха Тёва (1012-1017)</era>
-						<era type="54" draft="contributed">Эпоха Каннин (1017-1021)</era>
-						<era type="55" draft="contributed">Эпоха Дзиан (1021-1024)</era>
-						<era type="56" draft="contributed">Эпоха Мандзю (1024-1028)</era>
-						<era type="57" draft="contributed">Эпоха Тёгэн (1028-1037)</era>
-						<era type="58" draft="contributed">Эпоха Тёряку (1037-1040)</era>
-						<era type="59" draft="contributed">Эпоха Тёкю (1040-1044)</era>
-						<era type="60" draft="contributed">Эпоха Катоку (1044-1046)</era>
-						<era type="61" draft="contributed">Эпоха Эйсо (1046-1053)</era>
-						<era type="62" draft="contributed">Эпоха Тэнги (1053-1058)</era>
-						<era type="63" draft="contributed">Эпоха Кохэй (1058-1065)</era>
-						<era type="64" draft="contributed">Эпоха Дзиряку (1065-1069)</era>
-						<era type="65" draft="contributed">Эпоха Энкю (1069-1074)</era>
-						<era type="66" draft="contributed">Эпоха Сёхо (1074-1077)</era>
-						<era type="67" draft="contributed">Эпоха Сёряку (1077-1081)</era>
-						<era type="68" draft="contributed">Эпоха Эйхо (1081-1084)</era>
-						<era type="69" draft="contributed">Эпоха Отоку (1084-1087)</era>
-						<era type="70" draft="contributed">Эпоха Кандзи (1087-1094)</era>
-						<era type="71" draft="contributed">Эпоха Кахо (1094-1096)</era>
-						<era type="72" draft="contributed">Эпоха Эйтё (1096-1097)</era>
-						<era type="73" draft="contributed">Эпоха Сётоку (1097-1099)</era>
-						<era type="74" draft="contributed">Эпоха Кова (1099-1104)</era>
-						<era type="75" draft="contributed">Эпоха Тёдзи (1104-1106)</era>
-						<era type="76" draft="contributed">Эпоха Касё (1106-1108)</era>
-						<era type="77" draft="contributed">Эпоха Тэннин (1108-1110)</era>
-						<era type="78" draft="contributed">Эпоха Тэнъэй (1110-1113)</era>
-						<era type="79" draft="contributed">Эпоха Эйкю (1113-1118)</era>
-						<era type="80" draft="contributed">Эпоха Гэнъэй (1118-1120)</era>
-						<era type="81" draft="contributed">Эпоха Хоан (1120-1124)</era>
-						<era type="82" draft="contributed">Эпоха Тэндзи (1124-1126)</era>
-						<era type="83" draft="contributed">Эпоха Дайдзи (1126-1131)</era>
-						<era type="84" draft="contributed">Эпоха Тэнсё (1131-1132)</era>
-						<era type="85" draft="contributed">Эпоха Тёсё (1132-1135)</era>
-						<era type="86" draft="contributed">Эпоха Хоэн (1135-1141)</era>
-						<era type="87" draft="contributed">Эпоха Эйдзи (1141-1142)</era>
-						<era type="88" draft="contributed">Эпоха Кодзи (1142-1144)</era>
-						<era type="89" draft="contributed">Эпоха Тэнё (1144-1145)</era>
-						<era type="90" draft="contributed">Эпоха Кюан (1145-1151)</era>
-						<era type="91" draft="contributed">Эпоха Нимпэй (1151-1154)</era>
-						<era type="92" draft="contributed">Эпоха Кюдзю (1154-1156)</era>
-						<era type="93" draft="contributed">Эпоха Хогэн (1156-1159)</era>
-						<era type="94" draft="contributed">Эпоха Хэйдзи (1159-1160)</era>
-						<era type="95" draft="contributed">Эпоха Эйряку (1160-1161)</era>
-						<era type="96" draft="contributed">Эпоха Охо (1161-1163)</era>
-						<era type="97" draft="contributed">Эпоха Тёкан (1163-1165)</era>
-						<era type="98" draft="contributed">Эпоха Эйман (1165-1166)</era>
-						<era type="99" draft="contributed">Эпоха Нинъан (1166-1169)</era>
-						<era type="100" draft="contributed">Эпоха Као (1169-1171)</era>
-						<era type="101" draft="contributed">Эпоха Сёан (1171-1175)</era>
-						<era type="102" draft="contributed">Эпоха Ангэн (1175-1177)</era>
-						<era type="103" draft="contributed">Эпоха Дзисё (1177-1181)</era>
-						<era type="104" draft="contributed">Эпоха Ёва (1181-1182)</era>
-						<era type="105" draft="contributed">Эпоха Дзюэй (1182-1184)</era>
-						<era type="106" draft="contributed">Эпоха Гэнрюку (1184-1185)</era>
-						<era type="107" draft="contributed">Эпоха Бундзи (1185-1190)</era>
-						<era type="108" draft="contributed">Эпоха Кэнкю (1190-1199)</era>
-						<era type="109" draft="contributed">Эпоха Сёдзи (1199-1201)</era>
-						<era type="110" draft="contributed">Эпоха Кэннин (1201-1204)</era>
-						<era type="111" draft="contributed">Эпоха Гэнкю (1204-1206)</era>
-						<era type="112" draft="contributed">Эпоха Кэнъэй (1206-1207)</era>
-						<era type="113" draft="contributed">Эпоха Сёгэн (1207-1211)</era>
-						<era type="114" draft="contributed">Эпоха Кэнряку (1211-1213)</era>
-						<era type="115" draft="contributed">Эпоха Кэмпо (1213-1219)</era>
-						<era type="116" draft="contributed">Эпоха Сёкю (1219-1222)</era>
-						<era type="117" draft="contributed">Эпоха Дзёо (1222-1224)</era>
-						<era type="118" draft="contributed">Эпоха Гэннин (1224-1225)</era>
-						<era type="119" draft="contributed">Эпоха Кароку (1225-1227)</era>
-						<era type="120" draft="contributed">Эпоха Антэй (1227-1229)</era>
-						<era type="121" draft="contributed">Эпоха Канки (1229-1232)</era>
-						<era type="122" draft="contributed">Эпоха Дзёэй (1232-1233)</era>
-						<era type="123" draft="contributed">Эпоха Тэмпуку (1233-1234)</era>
-						<era type="124" draft="contributed">Эпоха Бунряку (1234-1235)</era>
-						<era type="125" draft="contributed">Эпоха Катэй (1235-1238)</era>
-						<era type="126" draft="contributed">Эпоха Рякунин (1238-1239)</era>
-						<era type="127" draft="contributed">Эпоха Энъо (1239-1240)</era>
-						<era type="128" draft="contributed">Эпоха Ниндзи (1240-1243)</era>
-						<era type="129" draft="contributed">Эпоха Кангэн (1243-1247)</era>
-						<era type="130" draft="contributed">Эпоха Ходзи (1247-1249)</era>
-						<era type="131" draft="contributed">Эпоха Кэнтё (1249-1256)</era>
-						<era type="132" draft="contributed">Эпоха Когэн (1256-1257)</era>
-						<era type="133" draft="contributed">Эпоха Сёка (1257-1259)</era>
-						<era type="134" draft="contributed">Эпоха Сёгэн (1259-1260)</era>
-						<era type="135" draft="contributed">Эпоха Бунъо (1260-1261)</era>
-						<era type="136" draft="contributed">Эпоха Котё (1261-1264)</era>
-						<era type="137" draft="contributed">Эпоха Бунъэй (1264-1275)</era>
-						<era type="138" draft="contributed">Эпоха Кэндзи (1275-1278)</era>
-						<era type="139" draft="contributed">Эпоха Коан (1278-1288)</era>
-						<era type="140" draft="contributed">Эпоха Сёо (1288-1293)</era>
-						<era type="141" draft="contributed">Эпоха Эйнин (1293-1299)</era>
-						<era type="142" draft="contributed">Эпоха Сёан (1299-1302)</era>
-						<era type="143" draft="contributed">Эпоха Кэнгэн (1302-1303)</era>
-						<era type="144" draft="contributed">Эпоха Кагэн (1303-1306)</era>
-						<era type="145" draft="contributed">Эпоха Токудзи (1306-1308)</era>
-						<era type="146" draft="contributed">Эпоха Энкэй (1308-1311)</era>
-						<era type="147" draft="contributed">Эпоха Отё (1311-1312)</era>
-						<era type="148" draft="contributed">Эпоха Сёва (1312-1317)</era>
-						<era type="149" draft="contributed">Эпоха Бумпо (1317-1319)</era>
-						<era type="150" draft="contributed">Эпоха Гэно (1319-1321)</era>
-						<era type="151" draft="contributed">Эпоха Гэнкё (1321-1324)</era>
-						<era type="152" draft="contributed">Эпоха Сётю (1324-1326)</era>
-						<era type="153" draft="contributed">Эпоха Карэки (1326-1329)</era>
-						<era type="154" draft="contributed">Эпоха Гэнтоку (1329-1331)</era>
-						<era type="155" draft="contributed">Эпоха Гэнко (1331-1334)</era>
-						<era type="156" draft="contributed">Эпоха Кэмму (1334-1336)</era>
-						<era type="157" draft="contributed">Эпоха Энгэн (1336-1340)</era>
-						<era type="158" draft="contributed">Эпоха Кококу (1340-1346)</era>
-						<era type="159" draft="contributed">Эпоха Сёхэй (1346-1370)</era>
-						<era type="160" draft="contributed">Эпоха Кэнтоку (1370-1372)</era>
-						<era type="161" draft="contributed">Эпоха Бунтю (1372-1375)</era>
-						<era type="162" draft="contributed">Эпоха Иэндзю (1375-1379)</era>
-						<era type="163" draft="contributed">Эпоха Коряку (1379-1381)</era>
-						<era type="164" draft="contributed">Эпоха Кова (1381-1384)</era>
-						<era type="165" draft="contributed">Эпоха Гэнтю (1384-1392)</era>
-						<era type="166" draft="contributed">Эпоха Мэйтоку (1384-1387)</era>
-						<era type="167" draft="contributed">Эпоха Какэй (1387-1389)</era>
-						<era type="168" draft="contributed">Эпоха Коо (1389-1390)</era>
-						<era type="169" draft="contributed">Эпоха Мэйтоку (1390-1394)</era>
-						<era type="170" draft="contributed">Эпоха Оэй (1394-1428)</era>
-						<era type="171" draft="contributed">Эпоха Сётё (1428-1429)</era>
-						<era type="172" draft="contributed">Эпоха Эйкё (1429-1441)</era>
-						<era type="173" draft="contributed">Эпоха Какицу (1441-1444)</era>
-						<era type="174" draft="contributed">Эпоха Банъан (1444-1449)</era>
-						<era type="175" draft="contributed">Эпоха Хотоку (1449-1452)</era>
-						<era type="176" draft="contributed">Эпоха Кётоку (1452-1455)</era>
-						<era type="177" draft="contributed">Эпоха Косё (1455-1457)</era>
-						<era type="178" draft="contributed">Эпоха Тёроку (1457-1460)</era>
-						<era type="179" draft="contributed">Эпоха Кансё (1460-1466)</era>
-						<era type="180" draft="contributed">Эпоха Бунсё (1466-1467)</era>
-						<era type="181" draft="contributed">Эпоха Онин (1467-1469)</era>
-						<era type="182" draft="contributed">Эпоха Буммэй (1469-1487)</era>
-						<era type="183" draft="contributed">Эпоха Тёкё (1487-1489)</era>
-						<era type="184" draft="contributed">Эпоха Энтоку (1489-1492)</era>
-						<era type="185" draft="contributed">Эпоха Мэйо (1492-1501)</era>
-						<era type="186" draft="contributed">Эпоха Бунки (1501-1504)</era>
-						<era type="187" draft="contributed">Эпоха Эйсё (1504-1521)</era>
-						<era type="188" draft="contributed">Эпоха Тайэй (1521-1528)</era>
-						<era type="189" draft="contributed">Эпоха Кёроку (1528-1532)</era>
-						<era type="190" draft="contributed">Эпоха Тэммон (1532-1555)</era>
-						<era type="191" draft="contributed">Эпоха Кодзи (1555-1558)</era>
-						<era type="192" draft="contributed">Эпоха Эйроку (1558-1570)</era>
-						<era type="193" draft="contributed">Эпоха Гэнки (1570-1573)</era>
-						<era type="194" draft="contributed">Эпоха Тэнсё (1573-1592)</era>
-						<era type="195" draft="contributed">Эпоха Бунроку (1592-1596)</era>
-						<era type="196" draft="contributed">Эпоха Кэйтё (1596-1615)</era>
-						<era type="197" draft="contributed">Эпоха Гэнва (1615-1624)</era>
-						<era type="198" draft="contributed">Эпоха Канъэй (1624-1644)</era>
-						<era type="199" draft="contributed">Эпоха Сёхо (1644-1648)</era>
-						<era type="200" draft="contributed">Эпоха Кэйан (1648-1652)</era>
-						<era type="201" draft="contributed">Эпоха Сё (1652-1655)</era>
-						<era type="202" draft="contributed">Эпоха Мэйряку (1655-1658)</era>
-						<era type="203" draft="contributed">Эпоха Мандзи (1658-1661)</era>
-						<era type="204" draft="contributed">Эпоха Камбун (1661-1673)</era>
-						<era type="205" draft="contributed">Эпоха Эмпо (1673-1681)</era>
-						<era type="206" draft="contributed">Эпоха Тэнва (1681-1684)</era>
-						<era type="207" draft="contributed">Эпоха Дзёкё (1684-1688)</era>
-						<era type="208" draft="contributed">Эпоха Гэнроку (1688-1704)</era>
-						<era type="209" draft="contributed">Эпоха Хоэй (1704-1711)</era>
-						<era type="210" draft="contributed">Эпоха Сётоку (1711-1716)</era>
-						<era type="211" draft="contributed">Эпоха Кёхо (1716-1736)</era>
-						<era type="212" draft="contributed">Эпоха Гэмбун (1736-1741)</era>
-						<era type="213" draft="contributed">Эпоха Кампо (1741-1744)</era>
-						<era type="214" draft="contributed">Эпоха Энкё (1744-1748)</era>
-						<era type="215" draft="contributed">Эпоха Канъэн (1748-1751)</era>
-						<era type="216" draft="contributed">Эпоха Хоряку (1751-1764)</era>
-						<era type="217" draft="contributed">Эпоха Мэйва (1764-1772)</era>
-						<era type="218" draft="contributed">Эпоха Анъэй (1772-1781)</era>
-						<era type="219" draft="contributed">Эпоха Тэммэй (1781-1789)</era>
-						<era type="220" draft="contributed">Эпоха Кансэй (1789-1801)</era>
-						<era type="221" draft="contributed">Эпоха Кёва (1801-1804)</era>
-						<era type="222" draft="contributed">Эпоха Бунка (1804-1818)</era>
-						<era type="223" draft="contributed">Эпоха Бунсэй (1818-1830)</era>
-						<era type="224" draft="contributed">Эпоха Тэмпо (1830-1844)</era>
-						<era type="225" draft="contributed">Эпоха Кока (1844-1848)</era>
-						<era type="226" draft="contributed">Эпоха Каэй (1848-1854)</era>
-						<era type="227" draft="contributed">Эпоха Ансэй (1854-1860)</era>
-						<era type="228" draft="contributed">Эпоха Манъэн (1860-1861)</era>
-						<era type="229" draft="contributed">Эпоха Бункю (1861-1864)</era>
-						<era type="230">Эпоха Гендзи (1864-1865)</era>
-						<era type="231">Эпоха Кейо (1865-1868)</era>
+						<era type="16">Эпоха Хоки (770–780)</era>
+						<era type="17">Эпоха Теньё (781–782)</era>
+						<era type="18">Эпоха Енряку (782–806)</era>
+						<era type="19">Эпоха Дайдо (806–810)</era>
+						<era type="20">Эпоха Конин (810–824)</era>
+						<era type="21">Эпоха Тентьо (824–834)</era>
+						<era type="22">Эпоха Шова (834–848)</era>
+						<era type="23">Эпоха Кайо (848–851)</era>
+						<era type="24">Эпоха Ниндзю (851–854)</era>
+						<era type="25">Эпоха Сайко (854–857)</era>
+						<era type="26">Эпоха Теннан (857–859)</era>
+						<era type="27">Эпоха Йоган (859–877)</era>
+						<era type="28">Эпоха Генкей (877–885)</era>
+						<era type="29">Эпоха Нинна (885–889)</era>
+						<era type="30">Эпоха Кампьё (889–898)</era>
+						<era type="31">Эпоха Сьотай (898–901)</era>
+						<era type="32">Эпоха Энги (901–923)</era>
+						<era type="33">Эпоха Ентьо (923–931)</era>
+						<era type="34">Эпоха Сьёхэй (931–938)</era>
+						<era type="35">Эпоха Тенгьо (938–947)</era>
+						<era type="36">Эпоха Тенрияку (947–957)</era>
+						<era type="37">Эпоха Тентоку (957–961)</era>
+						<era type="38">Эпоха Ова (961–964)</era>
+						<era type="39">Эпоха Кохо (964–968)</era>
+						<era type="40">Эпоха Анна (968–970)</era>
+						<era type="41">Эпоха Тенроку (970–973)</era>
+						<era type="42">Эпоха Теньен (973–976)</era>
+						<era type="43">Эпоха Дзьоген (976–978)</era>
+						<era type="44">Эпоха Тенген (978–983)</era>
+						<era type="45">Эпоха Ейкан (983–985)</era>
+						<era type="46">Эпоха Канна (985–987)</era>
+						<era type="47">Эпоха Ейен (987–989)</era>
+						<era type="48">Эпоха Ейсо (989–990)</era>
+						<era type="49" draft="contributed">Эпоха Сёряку (990–995)</era>
+						<era type="50" draft="contributed">Эпоха Тётоку (995–999)</era>
+						<era type="51" draft="contributed">Эпоха Тёхо (999–1004)</era>
+						<era type="52" draft="contributed">Эпоха Канко (1004–1012)</era>
+						<era type="53" draft="contributed">Эпоха Тёва (1012–1017)</era>
+						<era type="54" draft="contributed">Эпоха Каннин (1017–1021)</era>
+						<era type="55" draft="contributed">Эпоха Дзиан (1021–1024)</era>
+						<era type="56" draft="contributed">Эпоха Мандзю (1024–1028)</era>
+						<era type="57" draft="contributed">Эпоха Тёгэн (1028–1037)</era>
+						<era type="58" draft="contributed">Эпоха Тёряку (1037–1040)</era>
+						<era type="59" draft="contributed">Эпоха Тёкю (1040–1044)</era>
+						<era type="60" draft="contributed">Эпоха Катоку (1044–1046)</era>
+						<era type="61" draft="contributed">Эпоха Эйсо (1046–1053)</era>
+						<era type="62" draft="contributed">Эпоха Тэнги (1053–1058)</era>
+						<era type="63" draft="contributed">Эпоха Кохэй (1058–1065)</era>
+						<era type="64" draft="contributed">Эпоха Дзиряку (1065–1069)</era>
+						<era type="65" draft="contributed">Эпоха Энкю (1069–1074)</era>
+						<era type="66" draft="contributed">Эпоха Сёхо (1074–1077)</era>
+						<era type="67" draft="contributed">Эпоха Сёряку (1077–1081)</era>
+						<era type="68" draft="contributed">Эпоха Эйхо (1081–1084)</era>
+						<era type="69" draft="contributed">Эпоха Отоку (1084–1087)</era>
+						<era type="70" draft="contributed">Эпоха Кандзи (1087–1094)</era>
+						<era type="71" draft="contributed">Эпоха Кахо (1094–1096)</era>
+						<era type="72" draft="contributed">Эпоха Эйтё (1096–1097)</era>
+						<era type="73" draft="contributed">Эпоха Сётоку (1097–1099)</era>
+						<era type="74" draft="contributed">Эпоха Кова (1099–1104)</era>
+						<era type="75" draft="contributed">Эпоха Тёдзи (1104–1106)</era>
+						<era type="76" draft="contributed">Эпоха Касё (1106–1108)</era>
+						<era type="77" draft="contributed">Эпоха Тэннин (1108–1110)</era>
+						<era type="78" draft="contributed">Эпоха Тэнъэй (1110–1113)</era>
+						<era type="79" draft="contributed">Эпоха Эйкю (1113–1118)</era>
+						<era type="80" draft="contributed">Эпоха Гэнъэй (1118–1120)</era>
+						<era type="81" draft="contributed">Эпоха Хоан (1120–1124)</era>
+						<era type="82" draft="contributed">Эпоха Тэндзи (1124–1126)</era>
+						<era type="83" draft="contributed">Эпоха Дайдзи (1126–1131)</era>
+						<era type="84" draft="contributed">Эпоха Тэнсё (1131–1132)</era>
+						<era type="85" draft="contributed">Эпоха Тёсё (1132–1135)</era>
+						<era type="86" draft="contributed">Эпоха Хоэн (1135–1141)</era>
+						<era type="87" draft="contributed">Эпоха Эйдзи (1141–1142)</era>
+						<era type="88" draft="contributed">Эпоха Кодзи (1142–1144)</era>
+						<era type="89" draft="contributed">Эпоха Тэнё (1144–1145)</era>
+						<era type="90" draft="contributed">Эпоха Кюан (1145–1151)</era>
+						<era type="91" draft="contributed">Эпоха Нимпэй (1151–1154)</era>
+						<era type="92" draft="contributed">Эпоха Кюдзю (1154–1156)</era>
+						<era type="93" draft="contributed">Эпоха Хогэн (1156–1159)</era>
+						<era type="94" draft="contributed">Эпоха Хэйдзи (1159–1160)</era>
+						<era type="95" draft="contributed">Эпоха Эйряку (1160–1161)</era>
+						<era type="96" draft="contributed">Эпоха Охо (1161–1163)</era>
+						<era type="97" draft="contributed">Эпоха Тёкан (1163–1165)</era>
+						<era type="98" draft="contributed">Эпоха Эйман (1165–1166)</era>
+						<era type="99" draft="contributed">Эпоха Нинъан (1166–1169)</era>
+						<era type="100" draft="contributed">Эпоха Као (1169–1171)</era>
+						<era type="101" draft="contributed">Эпоха Сёан (1171–1175)</era>
+						<era type="102" draft="contributed">Эпоха Ангэн (1175–1177)</era>
+						<era type="103" draft="contributed">Эпоха Дзисё (1177–1181)</era>
+						<era type="104" draft="contributed">Эпоха Ёва (1181–1182)</era>
+						<era type="105" draft="contributed">Эпоха Дзюэй (1182–1184)</era>
+						<era type="106" draft="contributed">Эпоха Гэнрюку (1184–1185)</era>
+						<era type="107" draft="contributed">Эпоха Бундзи (1185–1190)</era>
+						<era type="108" draft="contributed">Эпоха Кэнкю (1190–1199)</era>
+						<era type="109" draft="contributed">Эпоха Сёдзи (1199–1201)</era>
+						<era type="110" draft="contributed">Эпоха Кэннин (1201–1204)</era>
+						<era type="111" draft="contributed">Эпоха Гэнкю (1204–1206)</era>
+						<era type="112" draft="contributed">Эпоха Кэнъэй (1206–1207)</era>
+						<era type="113" draft="contributed">Эпоха Сёгэн (1207–1211)</era>
+						<era type="114" draft="contributed">Эпоха Кэнряку (1211–1213)</era>
+						<era type="115" draft="contributed">Эпоха Кэмпо (1213–1219)</era>
+						<era type="116" draft="contributed">Эпоха Сёкю (1219–1222)</era>
+						<era type="117" draft="contributed">Эпоха Дзёо (1222–1224)</era>
+						<era type="118" draft="contributed">Эпоха Гэннин (1224–1225)</era>
+						<era type="119" draft="contributed">Эпоха Кароку (1225–1227)</era>
+						<era type="120" draft="contributed">Эпоха Антэй (1227–1229)</era>
+						<era type="121" draft="contributed">Эпоха Канки (1229–1232)</era>
+						<era type="122" draft="contributed">Эпоха Дзёэй (1232–1233)</era>
+						<era type="123" draft="contributed">Эпоха Тэмпуку (1233–1234)</era>
+						<era type="124" draft="contributed">Эпоха Бунряку (1234–1235)</era>
+						<era type="125" draft="contributed">Эпоха Катэй (1235–1238)</era>
+						<era type="126" draft="contributed">Эпоха Рякунин (1238–1239)</era>
+						<era type="127" draft="contributed">Эпоха Энъо (1239–1240)</era>
+						<era type="128" draft="contributed">Эпоха Ниндзи (1240–1243)</era>
+						<era type="129" draft="contributed">Эпоха Кангэн (1243–1247)</era>
+						<era type="130" draft="contributed">Эпоха Ходзи (1247–1249)</era>
+						<era type="131" draft="contributed">Эпоха Кэнтё (1249–1256)</era>
+						<era type="132" draft="contributed">Эпоха Когэн (1256–1257)</era>
+						<era type="133" draft="contributed">Эпоха Сёка (1257–1259)</era>
+						<era type="134" draft="contributed">Эпоха Сёгэн (1259–1260)</era>
+						<era type="135" draft="contributed">Эпоха Бунъо (1260–1261)</era>
+						<era type="136" draft="contributed">Эпоха Котё (1261–1264)</era>
+						<era type="137" draft="contributed">Эпоха Бунъэй (1264–1275)</era>
+						<era type="138" draft="contributed">Эпоха Кэндзи (1275–1278)</era>
+						<era type="139" draft="contributed">Эпоха Коан (1278–1288)</era>
+						<era type="140" draft="contributed">Эпоха Сёо (1288–1293)</era>
+						<era type="141" draft="contributed">Эпоха Эйнин (1293–1299)</era>
+						<era type="142" draft="contributed">Эпоха Сёан (1299–1302)</era>
+						<era type="143" draft="contributed">Эпоха Кэнгэн (1302–1303)</era>
+						<era type="144" draft="contributed">Эпоха Кагэн (1303–1306)</era>
+						<era type="145" draft="contributed">Эпоха Токудзи (1306–1308)</era>
+						<era type="146" draft="contributed">Эпоха Энкэй (1308–1311)</era>
+						<era type="147" draft="contributed">Эпоха Отё (1311–1312)</era>
+						<era type="148" draft="contributed">Эпоха Сёва (1312–1317)</era>
+						<era type="149" draft="contributed">Эпоха Бумпо (1317–1319)</era>
+						<era type="150" draft="contributed">Эпоха Гэно (1319–1321)</era>
+						<era type="151" draft="contributed">Эпоха Гэнкё (1321–1324)</era>
+						<era type="152" draft="contributed">Эпоха Сётю (1324–1326)</era>
+						<era type="153" draft="contributed">Эпоха Карэки (1326–1329)</era>
+						<era type="154" draft="contributed">Эпоха Гэнтоку (1329–1331)</era>
+						<era type="155" draft="contributed">Эпоха Гэнко (1331–1334)</era>
+						<era type="156" draft="contributed">Эпоха Кэмму (1334–1336)</era>
+						<era type="157" draft="contributed">Эпоха Энгэн (1336–1340)</era>
+						<era type="158" draft="contributed">Эпоха Кококу (1340–1346)</era>
+						<era type="159" draft="contributed">Эпоха Сёхэй (1346–1370)</era>
+						<era type="160" draft="contributed">Эпоха Кэнтоку (1370–1372)</era>
+						<era type="161" draft="contributed">Эпоха Бунтю (1372–1375)</era>
+						<era type="162" draft="contributed">Эпоха Иэндзю (1375–1379)</era>
+						<era type="163" draft="contributed">Эпоха Коряку (1379–1381)</era>
+						<era type="164" draft="contributed">Эпоха Кова (1381–1384)</era>
+						<era type="165" draft="contributed">Эпоха Гэнтю (1384–1392)</era>
+						<era type="166" draft="contributed">Эпоха Мэйтоку (1384–1387)</era>
+						<era type="167" draft="contributed">Эпоха Какэй (1387–1389)</era>
+						<era type="168" draft="contributed">Эпоха Коо (1389–1390)</era>
+						<era type="169" draft="contributed">Эпоха Мэйтоку (1390–1394)</era>
+						<era type="170" draft="contributed">Эпоха Оэй (1394–1428)</era>
+						<era type="171" draft="contributed">Эпоха Сётё (1428–1429)</era>
+						<era type="172" draft="contributed">Эпоха Эйкё (1429–1441)</era>
+						<era type="173" draft="contributed">Эпоха Какицу (1441–1444)</era>
+						<era type="174" draft="contributed">Эпоха Банъан (1444–1449)</era>
+						<era type="175" draft="contributed">Эпоха Хотоку (1449–1452)</era>
+						<era type="176" draft="contributed">Эпоха Кётоку (1452–1455)</era>
+						<era type="177" draft="contributed">Эпоха Косё (1455–1457)</era>
+						<era type="178" draft="contributed">Эпоха Тёроку (1457–1460)</era>
+						<era type="179" draft="contributed">Эпоха Кансё (1460–1466)</era>
+						<era type="180" draft="contributed">Эпоха Бунсё (1466–1467)</era>
+						<era type="181" draft="contributed">Эпоха Онин (1467–1469)</era>
+						<era type="182" draft="contributed">Эпоха Буммэй (1469–1487)</era>
+						<era type="183" draft="contributed">Эпоха Тёкё (1487–1489)</era>
+						<era type="184" draft="contributed">Эпоха Энтоку (1489–1492)</era>
+						<era type="185" draft="contributed">Эпоха Мэйо (1492–1501)</era>
+						<era type="186" draft="contributed">Эпоха Бунки (1501–1504)</era>
+						<era type="187" draft="contributed">Эпоха Эйсё (1504–1521)</era>
+						<era type="188" draft="contributed">Эпоха Тайэй (1521–1528)</era>
+						<era type="189" draft="contributed">Эпоха Кёроку (1528–1532)</era>
+						<era type="190" draft="contributed">Эпоха Тэммон (1532–1555)</era>
+						<era type="191" draft="contributed">Эпоха Кодзи (1555–1558)</era>
+						<era type="192" draft="contributed">Эпоха Эйроку (1558–1570)</era>
+						<era type="193" draft="contributed">Эпоха Гэнки (1570–1573)</era>
+						<era type="194" draft="contributed">Эпоха Тэнсё (1573–1592)</era>
+						<era type="195" draft="contributed">Эпоха Бунроку (1592–1596)</era>
+						<era type="196" draft="contributed">Эпоха Кэйтё (1596–1615)</era>
+						<era type="197" draft="contributed">Эпоха Гэнва (1615–1624)</era>
+						<era type="198" draft="contributed">Эпоха Канъэй (1624–1644)</era>
+						<era type="199" draft="contributed">Эпоха Сёхо (1644–1648)</era>
+						<era type="200" draft="contributed">Эпоха Кэйан (1648–1652)</era>
+						<era type="201" draft="contributed">Эпоха Сё (1652–1655)</era>
+						<era type="202" draft="contributed">Эпоха Мэйряку (1655–1658)</era>
+						<era type="203" draft="contributed">Эпоха Мандзи (1658–1661)</era>
+						<era type="204" draft="contributed">Эпоха Камбун (1661–1673)</era>
+						<era type="205" draft="contributed">Эпоха Эмпо (1673–1681)</era>
+						<era type="206" draft="contributed">Эпоха Тэнва (1681–1684)</era>
+						<era type="207" draft="contributed">Эпоха Дзёкё (1684–1688)</era>
+						<era type="208" draft="contributed">Эпоха Гэнроку (1688–1704)</era>
+						<era type="209" draft="contributed">Эпоха Хоэй (1704–1711)</era>
+						<era type="210" draft="contributed">Эпоха Сётоку (1711–1716)</era>
+						<era type="211" draft="contributed">Эпоха Кёхо (1716–1736)</era>
+						<era type="212" draft="contributed">Эпоха Гэмбун (1736–1741)</era>
+						<era type="213" draft="contributed">Эпоха Кампо (1741–1744)</era>
+						<era type="214" draft="contributed">Эпоха Энкё (1744–1748)</era>
+						<era type="215" draft="contributed">Эпоха Канъэн (1748–1751)</era>
+						<era type="216" draft="contributed">Эпоха Хоряку (1751–1764)</era>
+						<era type="217" draft="contributed">Эпоха Мэйва (1764–1772)</era>
+						<era type="218" draft="contributed">Эпоха Анъэй (1772–1781)</era>
+						<era type="219" draft="contributed">Эпоха Тэммэй (1781–1789)</era>
+						<era type="220" draft="contributed">Эпоха Кансэй (1789–1801)</era>
+						<era type="221" draft="contributed">Эпоха Кёва (1801–1804)</era>
+						<era type="222" draft="contributed">Эпоха Бунка (1804–1818)</era>
+						<era type="223" draft="contributed">Эпоха Бунсэй (1818–1830)</era>
+						<era type="224" draft="contributed">Эпоха Тэмпо (1830–1844)</era>
+						<era type="225" draft="contributed">Эпоха Кока (1844–1848)</era>
+						<era type="226" draft="contributed">Эпоха Каэй (1848–1854)</era>
+						<era type="227" draft="contributed">Эпоха Ансэй (1854–1860)</era>
+						<era type="228" draft="contributed">Эпоха Манъэн (1860–1861)</era>
+						<era type="229" draft="contributed">Эпоха Бункю (1861–1864)</era>
+						<era type="230">Эпоха Гендзи (1864–1865)</era>
+						<era type="231">Эпоха Кейо (1865–1868)</era>
 						<era type="232">Эпоха Мэйдзи</era>
 						<era type="233">Эпоха Тайсьо</era>
 						<era type="234">Сьова</era>
@@ -2745,12 +2815,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</calendars>
 		<fields>
 			<field type="era">
-				<displayName>Эра</displayName>
+				<displayName>эра</displayName>
 			</field>
 			<field type="year">
-				<displayName>Год</displayName>
+				<displayName>год</displayName>
 				<relative type="-1">в прошлом году</relative>
-				<relative type="0">в этому году</relative>
+				<relative type="0">в этом году</relative>
 				<relative type="1">в следующем году</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">через {0} год</relativeTimePattern>
@@ -2796,7 +2866,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="quarter">
-				<displayName>Квартал</displayName>
+				<displayName>квартал</displayName>
+				<relative type="-1" draft="contributed">последний квартал</relative>
+				<relative type="0" draft="contributed">текущий квартал</relative>
+				<relative type="1" draft="contributed">следующий квартал</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">через {0} квартал</relativeTimePattern>
 					<relativeTimePattern count="few">через {0} квартала</relativeTimePattern>
@@ -2812,6 +2885,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>кв.</displayName>
+				<relative type="-1" draft="contributed">последний кв.</relative>
+				<relative type="0" draft="contributed">текущий кв.</relative>
+				<relative type="1" draft="contributed">следующий кв.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">через {0} кв.</relativeTimePattern>
 					<relativeTimePattern count="few">через {0} кв.</relativeTimePattern>
@@ -2827,6 +2903,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>кв.</displayName>
+				<relative type="-1" draft="contributed">посл. кв.</relative>
+				<relative type="0" draft="contributed">тек. кв.</relative>
+				<relative type="1" draft="contributed">след. кв.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} кв.</relativeTimePattern>
 					<relativeTimePattern count="few">+{0} кв.</relativeTimePattern>
@@ -2841,7 +2920,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="month">
-				<displayName>Месяц</displayName>
+				<displayName>месяц</displayName>
 				<relative type="-1">в прошлом месяце</relative>
 				<relative type="0">в этом месяце</relative>
 				<relative type="1">в следующем месяце</relative>
@@ -2889,7 +2968,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="week">
-				<displayName>Неделя</displayName>
+				<displayName>неделя</displayName>
 				<relative type="-1">на прошлой неделе</relative>
 				<relative type="0">на этой неделе</relative>
 				<relative type="1">на следующей неделе</relative>
@@ -2937,7 +3016,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day">
-				<displayName>День</displayName>
+				<displayName>день</displayName>
 				<relative type="-2">позавчера</relative>
 				<relative type="-1">вчера</relative>
 				<relative type="0">сегодня</relative>
@@ -2987,7 +3066,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="weekday">
-				<displayName>День недели</displayName>
+				<displayName>день недели</displayName>
 			</field>
 			<field type="sun">
 				<relative type="-1">в прошлое воскресенье</relative>
@@ -3098,7 +3177,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ДП/ПП</displayName>
 			</field>
 			<field type="hour">
-				<displayName>Час</displayName>
+				<displayName>час</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">через {0} час</relativeTimePattern>
 					<relativeTimePattern count="few">через {0} часа</relativeTimePattern>
@@ -3143,7 +3222,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="minute">
-				<displayName>Минута</displayName>
+				<displayName>минута</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">через {0} минуту</relativeTimePattern>
 					<relativeTimePattern count="few">через {0} минуты</relativeTimePattern>
@@ -3188,7 +3267,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="second">
-				<displayName>Секунда</displayName>
+				<displayName>секунда</displayName>
 				<relative type="0">сейчас</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">через {0} секунду</relativeTimePattern>
@@ -3234,7 +3313,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>Часовой пояс</displayName>
+				<displayName>часовой пояс</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
@@ -4112,6 +4191,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Порт-Морсби</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Бугенвиль</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Манила</exemplarCity>
 			</zone>
@@ -4196,6 +4278,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Иркутск</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Чита</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Якутск</exemplarCity>
 			</zone>
@@ -4214,6 +4299,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Магадан</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Среднеколымск</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Петропавловск-Камчатский</exemplarCity>
 			</zone>
@@ -4585,15 +4673,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic draft="contributed">время Апиа, Самоа</generic>
-					<standard draft="contributed">Стандартное время Апиа, Самоа</standard>
-					<daylight draft="contributed">летнее время Апиа, Самоа</daylight>
+					<generic>Апиа</generic>
+					<standard>Апиа, стандартное время</standard>
+					<daylight>Апиа, летнее время</daylight>
 				</long>
 			</metazone>
 			<metazone type="Aqtau">
 				<long>
 					<generic>Актау время</generic>
-					<standard>Актау стандартное время</standard>
+					<standard>Актау, стандартное время</standard>
 					<daylight>Актау летнее время</daylight>
 				</long>
 			</metazone>
@@ -4829,7 +4917,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
 				<long>
-					<standard draft="contributed">время в Калининграде и Минске</standard>
+					<standard>Минское время</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
@@ -5606,6 +5694,58 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">0 тыс'.' ¤</pattern>
+					<pattern type="1000" count="few">0 тыс'.' ¤</pattern>
+					<pattern type="1000" count="many">0 тыс'.' ¤</pattern>
+					<pattern type="1000" count="other">0 тыс'.' ¤</pattern>
+					<pattern type="10000" count="one">00 тыс'.' ¤</pattern>
+					<pattern type="10000" count="few">00 тыс'.' ¤</pattern>
+					<pattern type="10000" count="many">00 тыс'.' ¤</pattern>
+					<pattern type="10000" count="other">00 тыс'.' ¤</pattern>
+					<pattern type="100000" count="one">000 тыс'.' ¤</pattern>
+					<pattern type="100000" count="few">000 тыс'.' ¤</pattern>
+					<pattern type="100000" count="many">000 тыс'.' ¤</pattern>
+					<pattern type="100000" count="other">000 тыс'.' ¤</pattern>
+					<pattern type="1000000" count="one">0 млн ¤</pattern>
+					<pattern type="1000000" count="few">0 млн ¤</pattern>
+					<pattern type="1000000" count="many">0 млн ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="one">00 млн ¤</pattern>
+					<pattern type="10000000" count="few">00 млн ¤</pattern>
+					<pattern type="10000000" count="many">00 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="one">000 млн ¤</pattern>
+					<pattern type="100000000" count="few">000 млн ¤</pattern>
+					<pattern type="100000000" count="many">000 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="one">0 млрд ¤</pattern>
+					<pattern type="1000000000" count="few">0 млрд ¤</pattern>
+					<pattern type="1000000000" count="many">0 млрд ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="one">00 млрд ¤</pattern>
+					<pattern type="10000000000" count="few">00 млрд ¤</pattern>
+					<pattern type="10000000000" count="many">00 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="one">000 млрд ¤</pattern>
+					<pattern type="100000000000" count="few">000 млрд ¤</pattern>
+					<pattern type="100000000000" count="many">000 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="one">0 трлн ¤</pattern>
+					<pattern type="1000000000000" count="few">0 трлн ¤</pattern>
+					<pattern type="1000000000000" count="many">0 трлн ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="one">00 трлн ¤</pattern>
+					<pattern type="10000000000000" count="few">00 трлн ¤</pattern>
+					<pattern type="10000000000000" count="many">00 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="one">000 трлн ¤</pattern>
+					<pattern type="100000000000000" count="few">000 трлн ¤</pattern>
+					<pattern type="100000000000000" count="many">000 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="few">{0} {1}</unitPattern>
 			<unitPattern count="many">{0} {1}</unitPattern>
@@ -5669,6 +5809,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">ангольских кванз</displayName>
 				<displayName count="other">ангольской кванзы</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>Ангольская кванза (1977–1990)</displayName>
@@ -5743,6 +5884,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">конвертируемых марок Боснии и Герцеговины</displayName>
 				<displayName count="other">конвертируемой марки Боснии и Герцеговины</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>Барбадосский доллар</displayName>
@@ -5823,6 +5965,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">боливийских боливиано</displayName>
 				<displayName count="other">боливийского боливиано</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOP">
 				<displayName>Боливийское песо</displayName>
@@ -5881,6 +6024,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">ботсванских пул</displayName>
 				<displayName count="other">ботсванской пулы</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>Белорусский рубль (1994–1999)</displayName>
@@ -5989,6 +6133,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">кубинских конвертируемых песо</displayName>
 				<displayName count="other">кубинского конвертируемого песо</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>Кубинское песо</displayName>
@@ -6017,6 +6162,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">чешских крон</displayName>
 				<displayName count="other">чешской кроны</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>Восточногерманская марка</displayName>
@@ -6039,6 +6185,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">датских крон</displayName>
 				<displayName count="other">датской кроны</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Доминиканское песо</displayName>
@@ -6073,6 +6220,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">египетских фунтов</displayName>
 				<displayName count="other">египетского фунта</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>Накфа</displayName>
@@ -6127,16 +6275,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">фунтов Фолклендских островов</displayName>
 				<displayName count="other">фунта Фолклендских островов</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>Французский франк</displayName>
 			</currency>
 			<currency type="GBP">
-				<displayName>Английский фунт</displayName>
-				<displayName count="one">английский фунт</displayName>
-				<displayName count="few">английских фунта</displayName>
-				<displayName count="many">английских фунтов</displayName>
-				<displayName count="other">английского фунта</displayName>
+				<displayName>Английский фунт стерлингов</displayName>
+				<displayName count="one">английский фунт стерлингов</displayName>
+				<displayName count="few">английских фунта стерлингов</displayName>
+				<displayName count="many">английских фунтов стерлингов</displayName>
+				<displayName count="other">английского фунта стерлингов</displayName>
 				<symbol>£</symbol>
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
@@ -6150,6 +6299,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">грузинских лари</displayName>
 				<displayName count="other">грузинского лари</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>Ганский седи (1979–2007)</displayName>
@@ -6186,6 +6336,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">гвинейских франков</displayName>
 				<displayName count="other">гвинейского франка</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>Гвинейская сили</displayName>
@@ -6203,6 +6354,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">гватемальских кетсалей</displayName>
 				<displayName count="other">гватемальского кетсаля</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>Эскудо Португальской Гвинеи</displayName>
@@ -6235,6 +6387,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">гондурасских лемпир</displayName>
 				<displayName count="other">гондурасской лемпиры</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>Хорватский динар</displayName>
@@ -6246,6 +6399,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">хорватских кун</displayName>
 				<displayName count="other">хорватской куны</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>Гаитянский гурд</displayName>
@@ -6262,6 +6416,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">венгерских форинтов</displayName>
 				<displayName count="other">венгерского форинта</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>Индонезийская рупия</displayName>
@@ -6270,6 +6425,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">индонезийских рупий</displayName>
 				<displayName count="other">индонезийской рупии</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>Ирландский фунт</displayName>
@@ -6318,6 +6474,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">исландских крон</displayName>
 				<displayName count="other">исландской кроны</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>Итальянская лира</displayName>
@@ -6380,6 +6537,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">франков Коморских островов</displayName>
 				<displayName count="other">франка Коморских островов</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>Северокорейская вона</displayName>
@@ -6388,6 +6546,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">северокорейских вон</displayName>
 				<displayName count="other">северокорейской воны</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>Южнокорейская вона</displayName>
@@ -6440,6 +6599,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">ливанских фунтов</displayName>
 				<displayName count="other">ливанского фунта</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>Шри-Ланкийская рупия</displayName>
@@ -6448,6 +6608,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">шри-ланкийских рупий</displayName>
 				<displayName count="other">шри-ланкийской рупии</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>Либерийский доллар</displayName>
@@ -6526,6 +6687,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">малагасийских ариари</displayName>
 				<displayName count="other">малагасийского ариари</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>Малагасийский франк</displayName>
@@ -6548,6 +6710,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">мьянманских кьятов</displayName>
 				<displayName count="other">мьянманского кьята</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>Монгольский тугрик</displayName>
@@ -6587,6 +6750,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">маврикийских рупий</displayName>
 				<displayName count="other">маврикийской рупии</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>Мальдивская руфия</displayName>
@@ -6626,6 +6790,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">малайзийских ринггитов</displayName>
 				<displayName count="other">малайзийского ринггита</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>Мозамбикское эскудо</displayName>
@@ -6669,6 +6834,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">никарагуанских кордоб</displayName>
 				<displayName count="other">никарагуанской кордобы</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>Нидерландский гульден</displayName>
@@ -6680,6 +6846,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">норвежских крон</displayName>
 				<displayName count="other">норвежской кроны</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>Непальская рупия</displayName>
@@ -6688,6 +6855,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">непальских рупий</displayName>
 				<displayName count="other">непальской рупии</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>Новозеландский доллар</displayName>
@@ -6752,6 +6920,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">пакистанских рупий</displayName>
 				<displayName count="other">пакистанской рупии</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>Польский злотый</displayName>
@@ -6760,6 +6929,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">польских злотых</displayName>
 				<displayName count="other">польского злотого</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>Злотый</displayName>
@@ -6812,7 +6982,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">российских рубля</displayName>
 				<displayName count="many">российских рублей</displayName>
 				<displayName count="other">российского рубля</displayName>
-				<symbol>руб.</symbol>
+				<symbol>₽</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>Российский рубль (1991–1998)</displayName>
@@ -6825,6 +6996,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">франков Руанды</displayName>
 				<displayName count="other">франка Руанды</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>Саудовский риал</displayName>
@@ -6872,6 +7044,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">шведских крон</displayName>
 				<displayName count="other">шведской кроны</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>Сингапурский доллар</displayName>
@@ -6889,6 +7062,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">фунтов острова Святой Елены</displayName>
 				<displayName count="other">фунта острова Святой Елены</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>Словенский толар</displayName>
@@ -6940,6 +7114,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">добр Сан-Томе и Принсипи</displayName>
 				<displayName count="other">добры Сан-Томе и Принсипи</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>Рубль СССР</displayName>
@@ -6954,6 +7129,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">сирийских фунтов</displayName>
 				<displayName count="other">сирийского фунта</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>Свазилендский лилангени</displayName>
@@ -6970,6 +7146,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">таиландских батов</displayName>
 				<displayName count="other">таиландского бата</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>Таджикский рубль</displayName>
@@ -7008,6 +7185,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">тонганских паанг</displayName>
 				<displayName count="other">тонганской паанги</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>Тиморское эскудо</displayName>
@@ -7021,12 +7199,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="TRY">
 				<displayName>Турецкая лира</displayName>
-				<displayName count="one">новая турецкая лира</displayName>
+				<displayName count="one">турецкая лира</displayName>
 				<displayName count="few">турецкие лиры</displayName>
 				<displayName count="many">турецких лир</displayName>
 				<displayName count="other">турецкой лиры</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Доллар Тринидада и Тобаго</displayName>
@@ -7062,6 +7241,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">украинской гривны</displayName>
 				<symbol>₴</symbol>
 				<symbol alt="narrow" draft="contributed">₴</symbol>
+				<symbol alt="variant">грн.</symbol>
 			</currency>
 			<currency type="UAK">
 				<displayName>Карбованец (украинский)</displayName>
@@ -7125,6 +7305,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">венесуэльских боливара</displayName>
 				<displayName count="other">венесуэльского боливара</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>Вьетнамский донг</displayName>
@@ -7184,6 +7365,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">восточно-карибских доллара</displayName>
 				<displayName count="other">восточно-карибского доллара</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>СДР (специальные права заимствования)</displayName>
@@ -7263,6 +7445,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">южноафриканских рэндов</displayName>
 				<displayName count="other">южноафриканского рэнда</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>Квача (замбийская) (1968–2012)</displayName>
@@ -7278,6 +7461,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">замбийских квач</displayName>
 				<displayName count="other">замбийской квачи</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>Новый заир</displayName>
@@ -7300,7 +7484,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 	<units>
 		<unitLength type="long">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0} на {1}</compoundUnitPattern>
+				<compoundUnitPattern>{0} на {1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>ускорение свободного падения</displayName>
@@ -7316,6 +7500,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} метров в секунду в квадрате</unitPattern>
 				<unitPattern count="other">{0} метра в секунду в квадрате</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>оборот</displayName>
+				<unitPattern count="one">{0} оборот</unitPattern>
+				<unitPattern count="few">{0} оборота</unitPattern>
+				<unitPattern count="many">{0} оборотов</unitPattern>
+				<unitPattern count="other">{0} оборота</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>радианы</displayName>
+				<unitPattern count="one">{0} радиан</unitPattern>
+				<unitPattern count="few">{0} радиана</unitPattern>
+				<unitPattern count="many">{0} радиан</unitPattern>
+				<unitPattern count="other">{0} радиана</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>градусы</displayName>
+				<unitPattern count="one">{0}градус</unitPattern>
+				<unitPattern count="few">{0} градуса</unitPattern>
+				<unitPattern count="many">{0} градусов</unitPattern>
+				<unitPattern count="other">{0} градуса</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>минуты</displayName>
 				<unitPattern count="one">{0} минута</unitPattern>
@@ -7330,26 +7535,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} секунд</unitPattern>
 				<unitPattern count="other">{0} секунды</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>градусы</displayName>
-				<unitPattern count="one">{0}градус</unitPattern>
-				<unitPattern count="few">{0} градуса</unitPattern>
-				<unitPattern count="many">{0} градусов</unitPattern>
-				<unitPattern count="other">{0} градуса</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>радианы</displayName>
-				<unitPattern count="one">{0} радиан</unitPattern>
-				<unitPattern count="few">{0} радиана</unitPattern>
-				<unitPattern count="many">{0} радиан</unitPattern>
-				<unitPattern count="other">{0} радиана</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>акры</displayName>
-				<unitPattern count="one">{0} акр</unitPattern>
-				<unitPattern count="few">{0} акра</unitPattern>
-				<unitPattern count="many">{0} акров</unitPattern>
-				<unitPattern count="other">{0} акра</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>квадратные километры</displayName>
+				<unitPattern count="one">{0} квадратный километр</unitPattern>
+				<unitPattern count="few">{0} квадратных километра</unitPattern>
+				<unitPattern count="many">{0} квадратных километров</unitPattern>
+				<unitPattern count="other">{0} квадратного километра</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>гектары</displayName>
@@ -7358,12 +7549,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} гектар</unitPattern>
 				<unitPattern count="other">{0} гектара</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>квадратные метры</displayName>
+				<unitPattern count="one">{0} квадратный метр</unitPattern>
+				<unitPattern count="few">{0} квадратных метра</unitPattern>
+				<unitPattern count="many">{0} квадратных метров</unitPattern>
+				<unitPattern count="other">{0} квадратного метра</unitPattern>
+				<perUnitPattern>{0} на квадратный метр</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>квадратные сантиметры</displayName>
 				<unitPattern count="one">{0} квадратный сантиметр</unitPattern>
 				<unitPattern count="few">{0} квадратных сантиметра</unitPattern>
 				<unitPattern count="many">{0} квадратных сантиметров</unitPattern>
 				<unitPattern count="other">{0} квадратного сантиметра</unitPattern>
+				<perUnitPattern>{0} на квадратный сантиметр</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>квадратные мили</displayName>
+				<unitPattern count="one">{0} квадратная миля</unitPattern>
+				<unitPattern count="few">{0} квадратных мили</unitPattern>
+				<unitPattern count="many">{0} квадратных миль</unitPattern>
+				<unitPattern count="other">{0} квадратной мили</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>акры</displayName>
+				<unitPattern count="one">{0} акр</unitPattern>
+				<unitPattern count="few">{0} акра</unitPattern>
+				<unitPattern count="many">{0} акров</unitPattern>
+				<unitPattern count="other">{0} акра</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>квадратные ярды</displayName>
+				<unitPattern count="one">{0} квадратный ярд</unitPattern>
+				<unitPattern count="few">{0} квадратных ярда</unitPattern>
+				<unitPattern count="many">{0} квадратных ярдов</unitPattern>
+				<unitPattern count="other">{0} квадратного ярда</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>квадратные футы</displayName>
@@ -7378,34 +7599,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} квадратных дюйма</unitPattern>
 				<unitPattern count="many">{0} квадратных дюймов</unitPattern>
 				<unitPattern count="other">{0} квадратного дюйма</unitPattern>
+				<perUnitPattern>{0} на квадратный дюйм</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>квадратные километры</displayName>
-				<unitPattern count="one">{0} квадратный километр</unitPattern>
-				<unitPattern count="few">{0} квадратных километра</unitPattern>
-				<unitPattern count="many">{0} квадратных километров</unitPattern>
-				<unitPattern count="other">{0} квадратного километра</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>квадратные метры</displayName>
-				<unitPattern count="one">{0} квадратный метр</unitPattern>
-				<unitPattern count="few">{0} квадратных метра</unitPattern>
-				<unitPattern count="many">{0} квадратных метров</unitPattern>
-				<unitPattern count="other">{0} квадратного метра</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>квадратные мили</displayName>
-				<unitPattern count="one">{0} квадратная миля</unitPattern>
-				<unitPattern count="few">{0} квадратных мили</unitPattern>
-				<unitPattern count="many">{0} квадратных миль</unitPattern>
-				<unitPattern count="other">{0} квадратной мили</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>квадратные ярды</displayName>
-				<unitPattern count="one">{0} квадратный ярд</unitPattern>
-				<unitPattern count="few">{0} квадратных ярда</unitPattern>
-				<unitPattern count="many">{0} квадратных ярдов</unitPattern>
-				<unitPattern count="other">{0} квадратного ярда</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>караты</displayName>
+				<unitPattern count="one">{0} карат</unitPattern>
+				<unitPattern count="few">{0} карата</unitPattern>
+				<unitPattern count="many">{0} карат</unitPattern>
+				<unitPattern count="other">{0} карата</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>литры на километр</displayName>
@@ -7414,6 +7615,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} литров на километр</unitPattern>
 				<unitPattern count="other">{0} литра на километр</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>литров на 100 километров</displayName>
+				<unitPattern count="one">{0} литр на 100 километров</unitPattern>
+				<unitPattern count="few">{0} литра на 100 километров</unitPattern>
+				<unitPattern count="many">{0} литров на 100 километров</unitPattern>
+				<unitPattern count="other">{0} литра на 100 километров</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>мили на галлон</displayName>
 				<unitPattern count="one">{0} миля на галлон</unitPattern>
@@ -7421,69 +7629,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} миль на галлон</unitPattern>
 				<unitPattern count="other">{0} мили на галлон</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>биты</displayName>
-				<unitPattern count="one">{0} бит</unitPattern>
-				<unitPattern count="few">{0} бита</unitPattern>
-				<unitPattern count="many">{0} бит</unitPattern>
-				<unitPattern count="other">{0} бита</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>байты</displayName>
-				<unitPattern count="one">{0} байт</unitPattern>
-				<unitPattern count="few">{0} байта</unitPattern>
-				<unitPattern count="many">{0} байт</unitPattern>
-				<unitPattern count="other">{0} байта</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>гигабиты</displayName>
-				<unitPattern count="one">{0} гигабит</unitPattern>
-				<unitPattern count="few">{0} гигабита</unitPattern>
-				<unitPattern count="many">{0} гигабит</unitPattern>
-				<unitPattern count="other">{0} гигабита</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>гигабайты</displayName>
-				<unitPattern count="one">{0} гигабайт</unitPattern>
-				<unitPattern count="few">{0} гигабайта</unitPattern>
-				<unitPattern count="many">{0} гигабайт</unitPattern>
-				<unitPattern count="other">{0} гигабайта</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>килобиты</displayName>
-				<unitPattern count="one">{0} килобит</unitPattern>
-				<unitPattern count="few">{0} килобита</unitPattern>
-				<unitPattern count="many">{0} килобит</unitPattern>
-				<unitPattern count="other">{0} килобита</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>килобайты</displayName>
-				<unitPattern count="one">{0} килобайт</unitPattern>
-				<unitPattern count="few">{0} килобайта</unitPattern>
-				<unitPattern count="many">{0} килобайт</unitPattern>
-				<unitPattern count="other">{0} килобайта</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>мегабиты</displayName>
-				<unitPattern count="one">{0} мегабит</unitPattern>
-				<unitPattern count="few">{0} мегабита</unitPattern>
-				<unitPattern count="many">{0} мегабит</unitPattern>
-				<unitPattern count="other">{0} мегабита</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>мегабайты</displayName>
-				<unitPattern count="one">{0} мегабайт</unitPattern>
-				<unitPattern count="few">{0} мегабайта</unitPattern>
-				<unitPattern count="many">{0} мегабайт</unitPattern>
-				<unitPattern count="other">{0} мегабайта</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>терабиты</displayName>
-				<unitPattern count="one">{0} терабит</unitPattern>
-				<unitPattern count="few">{0} терабита</unitPattern>
-				<unitPattern count="many">{0} терабит</unitPattern>
-				<unitPattern count="other">{0} терабита</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>терабайты</displayName>
 				<unitPattern count="one">{0} терабайт</unitPattern>
@@ -7491,12 +7636,107 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} терабайт</unitPattern>
 				<unitPattern count="other">{0} терабайта</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>терабиты</displayName>
+				<unitPattern count="one">{0} терабит</unitPattern>
+				<unitPattern count="few">{0} терабита</unitPattern>
+				<unitPattern count="many">{0} терабит</unitPattern>
+				<unitPattern count="other">{0} терабита</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>гигабайты</displayName>
+				<unitPattern count="one">{0} гигабайт</unitPattern>
+				<unitPattern count="few">{0} гигабайта</unitPattern>
+				<unitPattern count="many">{0} гигабайт</unitPattern>
+				<unitPattern count="other">{0} гигабайта</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>гигабиты</displayName>
+				<unitPattern count="one">{0} гигабит</unitPattern>
+				<unitPattern count="few">{0} гигабита</unitPattern>
+				<unitPattern count="many">{0} гигабит</unitPattern>
+				<unitPattern count="other">{0} гигабита</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>мегабайты</displayName>
+				<unitPattern count="one">{0} мегабайт</unitPattern>
+				<unitPattern count="few">{0} мегабайта</unitPattern>
+				<unitPattern count="many">{0} мегабайт</unitPattern>
+				<unitPattern count="other">{0} мегабайта</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>мегабиты</displayName>
+				<unitPattern count="one">{0} мегабит</unitPattern>
+				<unitPattern count="few">{0} мегабита</unitPattern>
+				<unitPattern count="many">{0} мегабит</unitPattern>
+				<unitPattern count="other">{0} мегабита</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>килобайты</displayName>
+				<unitPattern count="one">{0} килобайт</unitPattern>
+				<unitPattern count="few">{0} килобайта</unitPattern>
+				<unitPattern count="many">{0} килобайт</unitPattern>
+				<unitPattern count="other">{0} килобайта</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>килобиты</displayName>
+				<unitPattern count="one">{0} килобит</unitPattern>
+				<unitPattern count="few">{0} килобита</unitPattern>
+				<unitPattern count="many">{0} килобит</unitPattern>
+				<unitPattern count="other">{0} килобита</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>байты</displayName>
+				<unitPattern count="one">{0} байт</unitPattern>
+				<unitPattern count="few">{0} байта</unitPattern>
+				<unitPattern count="many">{0} байт</unitPattern>
+				<unitPattern count="other">{0} байта</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>биты</displayName>
+				<unitPattern count="one">{0} бит</unitPattern>
+				<unitPattern count="few">{0} бита</unitPattern>
+				<unitPattern count="many">{0} бит</unitPattern>
+				<unitPattern count="other">{0} бита</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>века</displayName>
+				<unitPattern count="one">{0} век</unitPattern>
+				<unitPattern count="few">{0} века</unitPattern>
+				<unitPattern count="many">{0} веков</unitPattern>
+				<unitPattern count="other">{0} века</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>годы</displayName>
+				<unitPattern count="one">{0} год</unitPattern>
+				<unitPattern count="few">{0} года</unitPattern>
+				<unitPattern count="many">{0} лет</unitPattern>
+				<unitPattern count="other">{0} года</unitPattern>
+				<perUnitPattern>{0} в год</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>месяцы</displayName>
+				<unitPattern count="one">{0} месяц</unitPattern>
+				<unitPattern count="few">{0} месяца</unitPattern>
+				<unitPattern count="many">{0} месяцев</unitPattern>
+				<unitPattern count="other">{0} месяца</unitPattern>
+				<perUnitPattern>{0} в месяц</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>недели</displayName>
+				<unitPattern count="one">{0} неделя</unitPattern>
+				<unitPattern count="few">{0} недели</unitPattern>
+				<unitPattern count="many">{0} недель</unitPattern>
+				<unitPattern count="other">{0} недели</unitPattern>
+				<perUnitPattern>{0} в неделю</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>дни</displayName>
 				<unitPattern count="one">{0} день</unitPattern>
 				<unitPattern count="few">{0} дня</unitPattern>
 				<unitPattern count="many">{0} дней</unitPattern>
 				<unitPattern count="other">{0} дня</unitPattern>
+				<perUnitPattern>{0} в день</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>часы</displayName>
@@ -7506,40 +7746,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} часа</unitPattern>
 				<perUnitPattern>{0} в час</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>микросекунды</displayName>
-				<unitPattern count="one">{0} микросекунда</unitPattern>
-				<unitPattern count="few">{0} микросекунды</unitPattern>
-				<unitPattern count="many">{0} микросекунд</unitPattern>
-				<unitPattern count="other">{0} микросекунды</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>миллисекунды</displayName>
-				<unitPattern count="one">{0} миллисекунда</unitPattern>
-				<unitPattern count="few">{0} миллисекунды</unitPattern>
-				<unitPattern count="many">{0} миллисекунд</unitPattern>
-				<unitPattern count="other">{0} миллисекунды</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>минуты</displayName>
 				<unitPattern count="one">{0} минута</unitPattern>
 				<unitPattern count="few">{0} минуты</unitPattern>
 				<unitPattern count="many">{0} минут</unitPattern>
 				<unitPattern count="other">{0} минуты</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>месяцы</displayName>
-				<unitPattern count="one">{0} месяц</unitPattern>
-				<unitPattern count="few">{0} месяца</unitPattern>
-				<unitPattern count="many">{0} месяцев</unitPattern>
-				<unitPattern count="other">{0} месяца</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>наносекунды</displayName>
-				<unitPattern count="one">{0} наносекунда</unitPattern>
-				<unitPattern count="few">{0} наносекунды</unitPattern>
-				<unitPattern count="many">{0} наносекунд</unitPattern>
-				<unitPattern count="other">{0} наносекунды</unitPattern>
+				<perUnitPattern>{0} в минуту</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>секунды</displayName>
@@ -7549,19 +7762,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} секунды</unitPattern>
 				<perUnitPattern>{0} в секунду</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>недели</displayName>
-				<unitPattern count="one">{0} неделя</unitPattern>
-				<unitPattern count="few">{0} недели</unitPattern>
-				<unitPattern count="many">{0} недель</unitPattern>
-				<unitPattern count="other">{0} недели</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>миллисекунды</displayName>
+				<unitPattern count="one">{0} миллисекунда</unitPattern>
+				<unitPattern count="few">{0} миллисекунды</unitPattern>
+				<unitPattern count="many">{0} миллисекунд</unitPattern>
+				<unitPattern count="other">{0} миллисекунды</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>годы</displayName>
-				<unitPattern count="one" draft="contributed">{0} год</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} года</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} лет</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} года</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>микросекунды</displayName>
+				<unitPattern count="one">{0} микросекунда</unitPattern>
+				<unitPattern count="few">{0} микросекунды</unitPattern>
+				<unitPattern count="many">{0} микросекунд</unitPattern>
+				<unitPattern count="other">{0} микросекунды</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>наносекунды</displayName>
+				<unitPattern count="one">{0} наносекунда</unitPattern>
+				<unitPattern count="few">{0} наносекунды</unitPattern>
+				<unitPattern count="many">{0} наносекунд</unitPattern>
+				<unitPattern count="other">{0} наносекунды</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>амперы</displayName>
@@ -7591,6 +7811,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} вольт</unitPattern>
 				<unitPattern count="other">{0} вольта</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>килокалории</displayName>
+				<unitPattern count="one">{0} килокалория</unitPattern>
+				<unitPattern count="few">{0} килокалории</unitPattern>
+				<unitPattern count="many">{0} килокалорий</unitPattern>
+				<unitPattern count="other">{0} килокалории</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>калории</displayName>
 				<unitPattern count="one">{0} калория</unitPattern>
@@ -7605,20 +7832,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} калорий</unitPattern>
 				<unitPattern count="other">{0} калории</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>джоули</displayName>
-				<unitPattern count="one">{0} джоуль</unitPattern>
-				<unitPattern count="few">{0} джоуля</unitPattern>
-				<unitPattern count="many">{0} джоулей</unitPattern>
-				<unitPattern count="other">{0} джоуля</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>килокалории</displayName>
-				<unitPattern count="one">{0} килокалория</unitPattern>
-				<unitPattern count="few">{0} килокалории</unitPattern>
-				<unitPattern count="many">{0} килокалорий</unitPattern>
-				<unitPattern count="other">{0} килокалории</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>килоджоули</displayName>
 				<unitPattern count="one">{0} килоджоуль</unitPattern>
@@ -7626,6 +7839,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} килоджоулей</unitPattern>
 				<unitPattern count="other">{0} килоджоуля</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>джоули</displayName>
+				<unitPattern count="one">{0} джоуль</unitPattern>
+				<unitPattern count="few">{0} джоуля</unitPattern>
+				<unitPattern count="many">{0} джоулей</unitPattern>
+				<unitPattern count="other">{0} джоуля</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>киловатт-часы</displayName>
 				<unitPattern count="one">{0} киловатт-час</unitPattern>
@@ -7640,12 +7860,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} гигагерц</unitPattern>
 				<unitPattern count="other">{0} гигагерца</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>герцы</displayName>
-				<unitPattern count="one">{0} герц</unitPattern>
-				<unitPattern count="few">{0} герца</unitPattern>
-				<unitPattern count="many">{0} герц</unitPattern>
-				<unitPattern count="other">{0} герца</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>мегагерцы</displayName>
+				<unitPattern count="one">{0} мегагерц</unitPattern>
+				<unitPattern count="few">{0} мегагерца</unitPattern>
+				<unitPattern count="many">{0} мегагерц</unitPattern>
+				<unitPattern count="other">{0} мегагерца</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>килогерцы</displayName>
@@ -7654,26 +7874,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} килогерц</unitPattern>
 				<unitPattern count="other">{0} килогерца</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>мегагерцы</displayName>
-				<unitPattern count="one">{0} мегагерц</unitPattern>
-				<unitPattern count="few">{0} мегагерца</unitPattern>
-				<unitPattern count="many">{0} мегагерц</unitPattern>
-				<unitPattern count="other">{0} мегагерца</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>герцы</displayName>
+				<unitPattern count="one">{0} герц</unitPattern>
+				<unitPattern count="few">{0} герца</unitPattern>
+				<unitPattern count="many">{0} герц</unitPattern>
+				<unitPattern count="other">{0} герца</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>астрономические единицы</displayName>
-				<unitPattern count="one">{0} астрономическая единица</unitPattern>
-				<unitPattern count="few">{0} астрономические единицы</unitPattern>
-				<unitPattern count="many">{0} астрономических единиц</unitPattern>
-				<unitPattern count="other">{0} астрономической единицы</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>километры</displayName>
+				<unitPattern count="one">{0} километр</unitPattern>
+				<unitPattern count="few">{0} километра</unitPattern>
+				<unitPattern count="many">{0} километров</unitPattern>
+				<unitPattern count="other">{0} километра</unitPattern>
+				<perUnitPattern>{0} на километр</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>сантиметры</displayName>
-				<unitPattern count="one">{0} сантиметр</unitPattern>
-				<unitPattern count="few">{0} сантиметра</unitPattern>
-				<unitPattern count="many">{0} сантиметров</unitPattern>
-				<unitPattern count="other">{0} сантиметра</unitPattern>
+			<unit type="length-meter">
+				<displayName>метры</displayName>
+				<unitPattern count="one">{0} метр</unitPattern>
+				<unitPattern count="few">{0} метра</unitPattern>
+				<unitPattern count="many">{0} метров</unitPattern>
+				<unitPattern count="other">{0} метра</unitPattern>
+				<perUnitPattern>{0}/м</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>дециметры</displayName>
@@ -7682,54 +7904,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} дециметров</unitPattern>
 				<unitPattern count="other">{0} дециметра</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>футы</displayName>
-				<unitPattern count="one">{0} фут</unitPattern>
-				<unitPattern count="few">{0} фута</unitPattern>
-				<unitPattern count="many">{0} футов</unitPattern>
-				<unitPattern count="other">{0} фута</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>дюймы</displayName>
-				<unitPattern count="one">{0} дюйм</unitPattern>
-				<unitPattern count="few">{0} дюйма</unitPattern>
-				<unitPattern count="many">{0} дюймов</unitPattern>
-				<unitPattern count="other">{0} дюйма</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>километры</displayName>
-				<unitPattern count="one">{0} километр</unitPattern>
-				<unitPattern count="few">{0} километра</unitPattern>
-				<unitPattern count="many">{0} километров</unitPattern>
-				<unitPattern count="other">{0} километра</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>световые годы</displayName>
-				<unitPattern count="one">{0} световой год</unitPattern>
-				<unitPattern count="few">{0} световых года</unitPattern>
-				<unitPattern count="many">{0} световых лет</unitPattern>
-				<unitPattern count="other">{0} световых года</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>метры</displayName>
-				<unitPattern count="one">{0} метр</unitPattern>
-				<unitPattern count="few">{0} метра</unitPattern>
-				<unitPattern count="many">{0} метров</unitPattern>
-				<unitPattern count="other">{0} метра</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>микрометры</displayName>
-				<unitPattern count="one">{0} микрометр</unitPattern>
-				<unitPattern count="few">{0} микрометра</unitPattern>
-				<unitPattern count="many">{0} микрометров</unitPattern>
-				<unitPattern count="other">{0} микрометра</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>мили</displayName>
-				<unitPattern count="one">{0} миля</unitPattern>
-				<unitPattern count="few">{0} мили</unitPattern>
-				<unitPattern count="many">{0} миль</unitPattern>
-				<unitPattern count="other">{0} мили</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>сантиметры</displayName>
+				<unitPattern count="one">{0} сантиметр</unitPattern>
+				<unitPattern count="few">{0} сантиметра</unitPattern>
+				<unitPattern count="many">{0} сантиметров</unitPattern>
+				<unitPattern count="other">{0} сантиметра</unitPattern>
+				<perUnitPattern>{0} на сантиметр</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>миллиметры</displayName>
@@ -7738,6 +7919,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} миллиметров</unitPattern>
 				<unitPattern count="other">{0} миллиметра</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>микрометры</displayName>
+				<unitPattern count="one">{0} микрометр</unitPattern>
+				<unitPattern count="few">{0} микрометра</unitPattern>
+				<unitPattern count="many">{0} микрометров</unitPattern>
+				<unitPattern count="other">{0} микрометра</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>нанометры</displayName>
 				<unitPattern count="one">{0} нанометр</unitPattern>
@@ -7745,20 +7933,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} нанометров</unitPattern>
 				<unitPattern count="other">{0} нанометра</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>морские мили</displayName>
-				<unitPattern count="one">{0} морская миля</unitPattern>
-				<unitPattern count="few">{0} морские мили</unitPattern>
-				<unitPattern count="many">{0} морских миль</unitPattern>
-				<unitPattern count="other">{0} морской мили</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>парсеки</displayName>
-				<unitPattern count="one">{0} парсек</unitPattern>
-				<unitPattern count="few">{0} парсека</unitPattern>
-				<unitPattern count="many">{0} парсеков</unitPattern>
-				<unitPattern count="other">{0} парсека</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>пикометры</displayName>
 				<unitPattern count="one">{0} пикометр</unitPattern>
@@ -7766,6 +7940,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} пикометров</unitPattern>
 				<unitPattern count="other">{0} пикометра</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>мили</displayName>
+				<unitPattern count="one">{0} миля</unitPattern>
+				<unitPattern count="few">{0} мили</unitPattern>
+				<unitPattern count="many">{0} миль</unitPattern>
+				<unitPattern count="other">{0} мили</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>ярды</displayName>
 				<unitPattern count="one">{0} ярд</unitPattern>
@@ -7773,6 +7954,57 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ярдов</unitPattern>
 				<unitPattern count="other">{0} ярда</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>футы</displayName>
+				<unitPattern count="one">{0} фут</unitPattern>
+				<unitPattern count="few">{0} фута</unitPattern>
+				<unitPattern count="many">{0} футов</unitPattern>
+				<unitPattern count="other">{0} фута</unitPattern>
+				<perUnitPattern>{0} на фут</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>дюймы</displayName>
+				<unitPattern count="one">{0} дюйм</unitPattern>
+				<unitPattern count="few">{0} дюйма</unitPattern>
+				<unitPattern count="many">{0} дюймов</unitPattern>
+				<unitPattern count="other">{0} дюйма</unitPattern>
+				<perUnitPattern>{0} на дюйм</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>парсеки</displayName>
+				<unitPattern count="one">{0} парсек</unitPattern>
+				<unitPattern count="few">{0} парсека</unitPattern>
+				<unitPattern count="many">{0} парсеков</unitPattern>
+				<unitPattern count="other">{0} парсека</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>световые годы</displayName>
+				<unitPattern count="one">{0} световой год</unitPattern>
+				<unitPattern count="few">{0} световых года</unitPattern>
+				<unitPattern count="many">{0} световых лет</unitPattern>
+				<unitPattern count="other">{0} световых года</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>астрономические единицы</displayName>
+				<unitPattern count="one">{0} астрономическая единица</unitPattern>
+				<unitPattern count="few">{0} астрономические единицы</unitPattern>
+				<unitPattern count="many">{0} астрономических единиц</unitPattern>
+				<unitPattern count="other">{0} астрономической единицы</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>морские мили</displayName>
+				<unitPattern count="one">{0} морская миля</unitPattern>
+				<unitPattern count="few">{0} морские мили</unitPattern>
+				<unitPattern count="many">{0} морских миль</unitPattern>
+				<unitPattern count="other">{0} морской мили</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>скандинавская миля</displayName>
+				<unitPattern count="one">{0} скандинавская миля</unitPattern>
+				<unitPattern count="few">{0} скандинавских мили</unitPattern>
+				<unitPattern count="many">{0} скандинавских миль</unitPattern>
+				<unitPattern count="other">{0} скандинавской мили</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>люксы</displayName>
 				<unitPattern count="one">{0} люкс</unitPattern>
@@ -7780,27 +8012,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} люкс</unitPattern>
 				<unitPattern count="other">{0} люкса</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>караты</displayName>
-				<unitPattern count="one">{0} карат</unitPattern>
-				<unitPattern count="few">{0} карата</unitPattern>
-				<unitPattern count="many">{0} карат</unitPattern>
-				<unitPattern count="other">{0} карата</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>граммы</displayName>
-				<unitPattern count="one">{0} грамм</unitPattern>
-				<unitPattern count="few">{0} грамма</unitPattern>
-				<unitPattern count="many">{0} грамм</unitPattern>
-				<unitPattern count="other">{0} грамма</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>килограммы</displayName>
-				<unitPattern count="one">{0} килограмм</unitPattern>
-				<unitPattern count="few">{0} килограмма</unitPattern>
-				<unitPattern count="many">{0} килограмм</unitPattern>
-				<unitPattern count="other">{0} килограмма</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>тонны</displayName>
 				<unitPattern count="one">{0} тонна</unitPattern>
@@ -7808,12 +8019,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} тонн</unitPattern>
 				<unitPattern count="other">{0} тонны</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>микрограммы</displayName>
-				<unitPattern count="one">{0} микрограмм</unitPattern>
-				<unitPattern count="few">{0} микрограмма</unitPattern>
-				<unitPattern count="many">{0} микрограммов</unitPattern>
-				<unitPattern count="other">{0} микрограмма</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>килограммы</displayName>
+				<unitPattern count="one">{0} килограмм</unitPattern>
+				<unitPattern count="few">{0} килограмма</unitPattern>
+				<unitPattern count="many">{0} килограмм</unitPattern>
+				<unitPattern count="other">{0} килограмма</unitPattern>
+				<perUnitPattern>{0} на килограмм</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>граммы</displayName>
+				<unitPattern count="one">{0} грамм</unitPattern>
+				<unitPattern count="few">{0} грамма</unitPattern>
+				<unitPattern count="many">{0} грамм</unitPattern>
+				<unitPattern count="other">{0} грамма</unitPattern>
+				<perUnitPattern>{0} на грамм</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>миллиграммы</displayName>
@@ -7822,26 +8042,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} миллиграммов</unitPattern>
 				<unitPattern count="other">{0} миллиграмма</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>унции</displayName>
-				<unitPattern count="one">{0} унция</unitPattern>
-				<unitPattern count="few">{0} унции</unitPattern>
-				<unitPattern count="many">{0} унций</unitPattern>
-				<unitPattern count="other">{0} унции</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>тройские унции</displayName>
-				<unitPattern count="one">{0} тройская унция</unitPattern>
-				<unitPattern count="few">{0} тройские унции</unitPattern>
-				<unitPattern count="many">{0} тройских унций</unitPattern>
-				<unitPattern count="other">{0} тройской унции</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>фунты</displayName>
-				<unitPattern count="one">{0} фунт</unitPattern>
-				<unitPattern count="few">{0} фунта</unitPattern>
-				<unitPattern count="many">{0} фунтов</unitPattern>
-				<unitPattern count="other">{0} фунта</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>микрограммы</displayName>
+				<unitPattern count="one">{0} микрограмм</unitPattern>
+				<unitPattern count="few">{0} микрограмма</unitPattern>
+				<unitPattern count="many">{0} микрограммов</unitPattern>
+				<unitPattern count="other">{0} микрограмма</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>американские тонны</displayName>
@@ -7850,6 +8056,36 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} американских тонн</unitPattern>
 				<unitPattern count="other">{0} американской тонны</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>фунты</displayName>
+				<unitPattern count="one">{0} фунт</unitPattern>
+				<unitPattern count="few">{0} фунта</unitPattern>
+				<unitPattern count="many">{0} фунтов</unitPattern>
+				<unitPattern count="other">{0} фунта</unitPattern>
+				<perUnitPattern>{0} на фунт</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>унции</displayName>
+				<unitPattern count="one">{0} унция</unitPattern>
+				<unitPattern count="few">{0} унции</unitPattern>
+				<unitPattern count="many">{0} унций</unitPattern>
+				<unitPattern count="other">{0} унции</unitPattern>
+				<perUnitPattern>{0} на унцию</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>тройские унции</displayName>
+				<unitPattern count="one">{0} тройская унция</unitPattern>
+				<unitPattern count="few">{0} тройские унции</unitPattern>
+				<unitPattern count="many">{0} тройских унций</unitPattern>
+				<unitPattern count="other">{0} тройской унции</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>караты</displayName>
+				<unitPattern count="one">{0} карат</unitPattern>
+				<unitPattern count="few">{0} карата</unitPattern>
+				<unitPattern count="many">{0} карат</unitPattern>
+				<unitPattern count="other">{0} карата</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>гигаватты</displayName>
 				<unitPattern count="one">{0} гигаватт</unitPattern>
@@ -7857,20 +8093,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} гигаватт</unitPattern>
 				<unitPattern count="other">{0} гигаватта</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>лошадиные силы</displayName>
-				<unitPattern count="one">{0} лошадиная сила</unitPattern>
-				<unitPattern count="few">{0} лошадиных силы</unitPattern>
-				<unitPattern count="many">{0} лошадиных сил</unitPattern>
-				<unitPattern count="other">{0} лошадиной силы</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>киловатты</displayName>
-				<unitPattern count="one">{0} киловатт</unitPattern>
-				<unitPattern count="few">{0} киловатта</unitPattern>
-				<unitPattern count="many">{0} киловатт</unitPattern>
-				<unitPattern count="other">{0} киловатта</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>мегаватты</displayName>
 				<unitPattern count="one">{0} мегаватт</unitPattern>
@@ -7878,12 +8100,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} мегаватт</unitPattern>
 				<unitPattern count="other">{0} мегаватта</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>милливатты</displayName>
-				<unitPattern count="one">{0} милливатт</unitPattern>
-				<unitPattern count="few">{0} милливатта</unitPattern>
-				<unitPattern count="many">{0} милливатт</unitPattern>
-				<unitPattern count="other">{0} милливатта</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>киловатты</displayName>
+				<unitPattern count="one">{0} киловатт</unitPattern>
+				<unitPattern count="few">{0} киловатта</unitPattern>
+				<unitPattern count="many">{0} киловатт</unitPattern>
+				<unitPattern count="other">{0} киловатта</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>ватты</displayName>
@@ -7892,6 +8114,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ватт</unitPattern>
 				<unitPattern count="other">{0} ватта</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>милливатты</displayName>
+				<unitPattern count="one">{0} милливатт</unitPattern>
+				<unitPattern count="few">{0} милливатта</unitPattern>
+				<unitPattern count="many">{0} милливатт</unitPattern>
+				<unitPattern count="other">{0} милливатта</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>лошадиные силы</displayName>
+				<unitPattern count="one">{0} лошадиная сила</unitPattern>
+				<unitPattern count="few">{0} лошадиных силы</unitPattern>
+				<unitPattern count="many">{0} лошадиных сил</unitPattern>
+				<unitPattern count="other">{0} лошадиной силы</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>гектопаскали</displayName>
 				<unitPattern count="one">{0} гектопаскаль</unitPattern>
@@ -7899,20 +8135,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} гектопаскалей</unitPattern>
 				<unitPattern count="other">{0} гектопаскаля</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>дюймы ртутного столба</displayName>
-				<unitPattern count="one">{0} дюйм ртутного столба</unitPattern>
-				<unitPattern count="few">{0} дюйма ртутного столба</unitPattern>
-				<unitPattern count="many">{0} дюймов ртутного столба</unitPattern>
-				<unitPattern count="other">{0}дюйма ртутного столба</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>миллибары</displayName>
-				<unitPattern count="one">{0} миллибар</unitPattern>
-				<unitPattern count="few">{0} миллибара</unitPattern>
-				<unitPattern count="many">{0} миллибар</unitPattern>
-				<unitPattern count="other">{0} миллибара</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>миллиметры ртутного столба</displayName>
 				<unitPattern count="one">{0} миллиметр ртутного столба</unitPattern>
@@ -7927,12 +8149,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} фунтов на квадратный дюйм</unitPattern>
 				<unitPattern count="other">{0} фунта на квадратный дюйм</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>караты</displayName>
-				<unitPattern count="one">{0} карат</unitPattern>
-				<unitPattern count="few">{0} карата</unitPattern>
-				<unitPattern count="many">{0} карат</unitPattern>
-				<unitPattern count="other">{0} карата</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>дюймы ртутного столба</displayName>
+				<unitPattern count="one">{0} дюйм ртутного столба</unitPattern>
+				<unitPattern count="few">{0} дюйма ртутного столба</unitPattern>
+				<unitPattern count="many">{0} дюймов ртутного столба</unitPattern>
+				<unitPattern count="other">{0} дюйма ртутного столба</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>миллибары</displayName>
+				<unitPattern count="one">{0} миллибар</unitPattern>
+				<unitPattern count="few">{0} миллибара</unitPattern>
+				<unitPattern count="many">{0} миллибар</unitPattern>
+				<unitPattern count="other">{0} миллибара</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>километры в час</displayName>
@@ -7955,6 +8184,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} миль в час</unitPattern>
 				<unitPattern count="other">{0} мили в час</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>узел</displayName>
+				<unitPattern count="one">{0} узел</unitPattern>
+				<unitPattern count="few">{0} узла</unitPattern>
+				<unitPattern count="many">{0} узлов</unitPattern>
+				<unitPattern count="other">{0} узла</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>градусы Цельсия</displayName>
 				<unitPattern count="one">{0}градус Цельсия</unitPattern>
@@ -7976,41 +8219,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} градусов по Кельвину</unitPattern>
 				<unitPattern count="other">{0} градуса по Кельвину</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>акрофуты</displayName>
-				<unitPattern count="one">{0} акрофут</unitPattern>
-				<unitPattern count="few">{0} акрофута</unitPattern>
-				<unitPattern count="many">{0} акрофутов</unitPattern>
-				<unitPattern count="other">{0} акрофута</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>сантилитры</displayName>
-				<unitPattern count="one">{0} сантилитр</unitPattern>
-				<unitPattern count="few">{0} сантилитра</unitPattern>
-				<unitPattern count="many">{0} сантилитров</unitPattern>
-				<unitPattern count="other">{0} сантилитра</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>кубические сантиметры</displayName>
-				<unitPattern count="one">{0} кубический сантиметр</unitPattern>
-				<unitPattern count="few">{0} кубических сантиметра</unitPattern>
-				<unitPattern count="many">{0} кубических сантиметров</unitPattern>
-				<unitPattern count="other">{0} кубического сантиметра</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>кубические футы</displayName>
-				<unitPattern count="one">{0} кубический фут</unitPattern>
-				<unitPattern count="few">{0} кубических фута</unitPattern>
-				<unitPattern count="many">{0} кубических футов</unitPattern>
-				<unitPattern count="other">{0} кубического фута</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>кубические дюймы</displayName>
-				<unitPattern count="one">{0} кубический дюйм</unitPattern>
-				<unitPattern count="few">{0} кубических дюйма</unitPattern>
-				<unitPattern count="many">{0} кубических дюймов</unitPattern>
-				<unitPattern count="other">{0} кубического дюйма</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>кубические километры</displayName>
 				<unitPattern count="one">{0} кубический километр</unitPattern>
@@ -8024,6 +8232,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} кубических метра</unitPattern>
 				<unitPattern count="many">{0} кубических метров</unitPattern>
 				<unitPattern count="other">{0} кубического метра</unitPattern>
+				<perUnitPattern>{0} на кубический метр</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>кубические сантиметры</displayName>
+				<unitPattern count="one">{0} кубический сантиметр</unitPattern>
+				<unitPattern count="few">{0} кубических сантиметра</unitPattern>
+				<unitPattern count="many">{0} кубических сантиметров</unitPattern>
+				<unitPattern count="other">{0} кубического сантиметра</unitPattern>
+				<perUnitPattern>{0} на кубический сантиметр</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>кубические мили</displayName>
@@ -8039,33 +8256,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} кубических ярдов</unitPattern>
 				<unitPattern count="other">{0} кубического ярда</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>чашки</displayName>
-				<unitPattern count="one">{0} чашка</unitPattern>
-				<unitPattern count="few">{0} чашки</unitPattern>
-				<unitPattern count="many">{0} чашек</unitPattern>
-				<unitPattern count="other">{0} чашки</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>кубические футы</displayName>
+				<unitPattern count="one">{0} кубический фут</unitPattern>
+				<unitPattern count="few">{0} кубических фута</unitPattern>
+				<unitPattern count="many">{0} кубических футов</unitPattern>
+				<unitPattern count="other">{0} кубического фута</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>децилитры</displayName>
-				<unitPattern count="one">{0} децилитр</unitPattern>
-				<unitPattern count="few">{0} децилитра</unitPattern>
-				<unitPattern count="many">{0} децилитров</unitPattern>
-				<unitPattern count="other">{0} децилитра</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>кубические дюймы</displayName>
+				<unitPattern count="one">{0} кубический дюйм</unitPattern>
+				<unitPattern count="few">{0} кубических дюйма</unitPattern>
+				<unitPattern count="many">{0} кубических дюймов</unitPattern>
+				<unitPattern count="other">{0} кубического дюйма</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>жидкие унции</displayName>
-				<unitPattern count="one">{0} жидкая унция</unitPattern>
-				<unitPattern count="few">{0} жидкие унции</unitPattern>
-				<unitPattern count="many">{0} жидких унций</unitPattern>
-				<unitPattern count="other">{0} жидкой унции</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>галлоны</displayName>
-				<unitPattern count="one">{0} галлон</unitPattern>
-				<unitPattern count="few">{0} галлона</unitPattern>
-				<unitPattern count="many">{0} галлонов</unitPattern>
-				<unitPattern count="other">{0} галлона</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>мегалитры</displayName>
+				<unitPattern count="one">{0} мегалитр</unitPattern>
+				<unitPattern count="few">{0} мегалитра</unitPattern>
+				<unitPattern count="many">{0} мегалитров</unitPattern>
+				<unitPattern count="other">{0} мегалитра</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>гектолитры</displayName>
@@ -8080,13 +8290,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} литра</unitPattern>
 				<unitPattern count="many">{0} литра</unitPattern>
 				<unitPattern count="other">{0} литра</unitPattern>
+				<perUnitPattern>{0} на литр</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>мегалитры</displayName>
-				<unitPattern count="one">{0} мегалитр</unitPattern>
-				<unitPattern count="few">{0} мегалитра</unitPattern>
-				<unitPattern count="many">{0} мегалитров</unitPattern>
-				<unitPattern count="other">{0} мегалитра</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>децилитры</displayName>
+				<unitPattern count="one">{0} децилитр</unitPattern>
+				<unitPattern count="few">{0} децилитра</unitPattern>
+				<unitPattern count="many">{0} децилитров</unitPattern>
+				<unitPattern count="other">{0} децилитра</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>сантилитры</displayName>
+				<unitPattern count="one">{0} сантилитр</unitPattern>
+				<unitPattern count="few">{0} сантилитра</unitPattern>
+				<unitPattern count="many">{0} сантилитров</unitPattern>
+				<unitPattern count="other">{0} сантилитра</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>миллилитры</displayName>
@@ -8095,12 +8313,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} миллилитров</unitPattern>
 				<unitPattern count="other">{0} миллилитра</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>пинты</displayName>
-				<unitPattern count="one">{0} пинта</unitPattern>
-				<unitPattern count="few">{0} пинты</unitPattern>
-				<unitPattern count="many">{0} пинт</unitPattern>
-				<unitPattern count="other">{0} пинты</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>метрические пинты</displayName>
+				<unitPattern count="one">{0} метрическая пинта</unitPattern>
+				<unitPattern count="few">{0} метрические пинты</unitPattern>
+				<unitPattern count="many">{0} метрическая пинта</unitPattern>
+				<unitPattern count="other">{0} метрической пинты</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>метрические чашки</displayName>
+				<unitPattern count="one">{0} метрическая чашка</unitPattern>
+				<unitPattern count="few">{0} метрических чашки</unitPattern>
+				<unitPattern count="many">{0} метрических чашек</unitPattern>
+				<unitPattern count="other">{0} метрической чашки</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>акрофуты</displayName>
+				<unitPattern count="one">{0} акрофут</unitPattern>
+				<unitPattern count="few">{0} акрофута</unitPattern>
+				<unitPattern count="many">{0} акрофутов</unitPattern>
+				<unitPattern count="other">{0} акрофута</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>галлоны</displayName>
+				<unitPattern count="one">{0} галлон</unitPattern>
+				<unitPattern count="few">{0} галлона</unitPattern>
+				<unitPattern count="many">{0} галлонов</unitPattern>
+				<unitPattern count="other">{0} галлона</unitPattern>
+				<perUnitPattern>{0} на галлон</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>кварты</displayName>
@@ -8109,6 +8349,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} кварт</unitPattern>
 				<unitPattern count="other">{0} кварты</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>пинты</displayName>
+				<unitPattern count="one">{0} пинта</unitPattern>
+				<unitPattern count="few">{0} пинты</unitPattern>
+				<unitPattern count="many">{0} пинт</unitPattern>
+				<unitPattern count="other">{0} пинты</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>чашки</displayName>
+				<unitPattern count="one">{0} чашка</unitPattern>
+				<unitPattern count="few">{0} чашки</unitPattern>
+				<unitPattern count="many">{0} чашек</unitPattern>
+				<unitPattern count="other">{0} чашки</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>жидкие унции</displayName>
+				<unitPattern count="one">{0} жидкая унция</unitPattern>
+				<unitPattern count="few">{0} жидкие унции</unitPattern>
+				<unitPattern count="many">{0} жидких унций</unitPattern>
+				<unitPattern count="other">{0} жидкой унции</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>столовые ложки</displayName>
 				<unitPattern count="one">{0} столовая ложка</unitPattern>
@@ -8123,10 +8384,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} чайных ложек</unitPattern>
 				<unitPattern count="other">{0} чайной ложки</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} восточной долготы</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} северной широты</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} южной широты</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} западной долготы</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>g</displayName>
@@ -8142,6 +8409,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} м/с²</unitPattern>
 				<unitPattern count="other">{0} м/с²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>об.</displayName>
+				<unitPattern count="one">{0} об.</unitPattern>
+				<unitPattern count="few">{0} об.</unitPattern>
+				<unitPattern count="many">{0} об.</unitPattern>
+				<unitPattern count="other">{0} об.</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>рад</displayName>
+				<unitPattern count="one">{0} рад</unitPattern>
+				<unitPattern count="few">{0} рад</unitPattern>
+				<unitPattern count="many">{0} рад</unitPattern>
+				<unitPattern count="other">{0} рад</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>градусы</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>минуты</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
@@ -8151,31 +8439,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="angle-arc-second">
 				<displayName>секунды</displayName>
-				<unitPattern count="one" draft="contributed">{0}″</unitPattern>
-				<unitPattern count="few" draft="contributed">{0}″</unitPattern>
-				<unitPattern count="many" draft="contributed">{0}″</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="few">{0}″</unitPattern>
+				<unitPattern count="many">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>градусы</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="few">{0}°</unitPattern>
-				<unitPattern count="many">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>рад</displayName>
-				<unitPattern count="one">{0} рад</unitPattern>
-				<unitPattern count="few">{0} рад</unitPattern>
-				<unitPattern count="many">{0} рад</unitPattern>
-				<unitPattern count="other">{0} рад</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>акры</displayName>
-				<unitPattern count="one">{0} акр</unitPattern>
-				<unitPattern count="few">{0} акра</unitPattern>
-				<unitPattern count="many">{0} акров</unitPattern>
-				<unitPattern count="other">{0} акра</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>квадратные километры</displayName>
+				<unitPattern count="one">{0} км²</unitPattern>
+				<unitPattern count="few">{0} км²</unitPattern>
+				<unitPattern count="many">{0} км²</unitPattern>
+				<unitPattern count="other">{0} км²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>гектары</displayName>
@@ -8184,12 +8458,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} га</unitPattern>
 				<unitPattern count="other">{0} га</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>квадратные метры</displayName>
+				<unitPattern count="one">{0} м²</unitPattern>
+				<unitPattern count="few">{0} м²</unitPattern>
+				<unitPattern count="many">{0} м²</unitPattern>
+				<unitPattern count="other">{0} м²</unitPattern>
+				<perUnitPattern>{0}/м²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>квадратные сантиметры</displayName>
 				<unitPattern count="one">{0} см²</unitPattern>
 				<unitPattern count="few">{0} см²</unitPattern>
 				<unitPattern count="many">{0} см²</unitPattern>
 				<unitPattern count="other">{0} см²</unitPattern>
+				<perUnitPattern>{0}/см²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>квадратные мили</displayName>
+				<unitPattern count="one">{0} кв. миля</unitPattern>
+				<unitPattern count="few">{0} кв. мили</unitPattern>
+				<unitPattern count="many">{0} кв. миль</unitPattern>
+				<unitPattern count="other">{0} кв. мили</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>акры</displayName>
+				<unitPattern count="one">{0} акр</unitPattern>
+				<unitPattern count="few">{0} акра</unitPattern>
+				<unitPattern count="many">{0} акров</unitPattern>
+				<unitPattern count="other">{0} акра</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>квадратные ярды</displayName>
+				<unitPattern count="one">{0} кв. ярд</unitPattern>
+				<unitPattern count="few">{0} кв. ярда</unitPattern>
+				<unitPattern count="many">{0} кв. ярдов</unitPattern>
+				<unitPattern count="other">{0} кв. ярда</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>квадратные футы</displayName>
@@ -8204,34 +8508,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} кв. дюйм.</unitPattern>
 				<unitPattern count="many">{0} кв. дюйм.</unitPattern>
 				<unitPattern count="other">{0} кв. дюйм.</unitPattern>
+				<perUnitPattern>{0}/дюйм²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>квадратные километры</displayName>
-				<unitPattern count="one">{0} км²</unitPattern>
-				<unitPattern count="few">{0} км²</unitPattern>
-				<unitPattern count="many">{0} км²</unitPattern>
-				<unitPattern count="other">{0} км²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>квадратные метры</displayName>
-				<unitPattern count="one">{0} м²</unitPattern>
-				<unitPattern count="few">{0} м²</unitPattern>
-				<unitPattern count="many">{0} м²</unitPattern>
-				<unitPattern count="other">{0} м²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>квадратные мили</displayName>
-				<unitPattern count="one">{0} кв. миля</unitPattern>
-				<unitPattern count="few">{0} кв. мили</unitPattern>
-				<unitPattern count="many">{0} кв. миль</unitPattern>
-				<unitPattern count="other">{0} кв. мили</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>квадратные ярды</displayName>
-				<unitPattern count="one">{0} кв. ярд</unitPattern>
-				<unitPattern count="few">{0} кв. ярда</unitPattern>
-				<unitPattern count="many">{0} кв. ярдов</unitPattern>
-				<unitPattern count="other">{0} кв. ярда</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>кар</displayName>
+				<unitPattern count="one">{0} кар</unitPattern>
+				<unitPattern count="few">{0} кар</unitPattern>
+				<unitPattern count="many">{0} кар</unitPattern>
+				<unitPattern count="other">{0} кар</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>л/км</displayName>
@@ -8240,6 +8524,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} л/км</unitPattern>
 				<unitPattern count="other">{0} л/км</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>л/100 км</displayName>
+				<unitPattern count="one">{0} л/100 км</unitPattern>
+				<unitPattern count="few">{0} л/100 км</unitPattern>
+				<unitPattern count="many">{0} л/100 км</unitPattern>
+				<unitPattern count="other">{0} л/100 км</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>миль/галл.</displayName>
 				<unitPattern count="one">{0} миля/галл.</unitPattern>
@@ -8247,69 +8538,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} миль/галл.</unitPattern>
 				<unitPattern count="other">{0} мили/галл.</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>бит</displayName>
-				<unitPattern count="one">{0} бит</unitPattern>
-				<unitPattern count="few">{0} бита</unitPattern>
-				<unitPattern count="many">{0} бит</unitPattern>
-				<unitPattern count="other">{0} бита</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>Б</displayName>
-				<unitPattern count="one">{0} Б</unitPattern>
-				<unitPattern count="few">{0} Б</unitPattern>
-				<unitPattern count="many">{0} Б</unitPattern>
-				<unitPattern count="other">{0} Б</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Гбит</displayName>
-				<unitPattern count="one">{0} Гбит</unitPattern>
-				<unitPattern count="few">{0} Гбит</unitPattern>
-				<unitPattern count="many">{0} Гбит</unitPattern>
-				<unitPattern count="other">{0} Гбит</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>ГБ</displayName>
-				<unitPattern count="one">{0} ГБ</unitPattern>
-				<unitPattern count="few">{0} ГБ</unitPattern>
-				<unitPattern count="many">{0} ГБ</unitPattern>
-				<unitPattern count="other">{0} ГБ</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>кбит</displayName>
-				<unitPattern count="one">{0} кбит</unitPattern>
-				<unitPattern count="few">{0} кбит</unitPattern>
-				<unitPattern count="many">{0} кбит</unitPattern>
-				<unitPattern count="other">{0} кбит</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>кБ</displayName>
-				<unitPattern count="one">{0} кБ</unitPattern>
-				<unitPattern count="few">{0} кБ</unitPattern>
-				<unitPattern count="many">{0} кБ</unitPattern>
-				<unitPattern count="other">{0} кБ</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Мбит</displayName>
-				<unitPattern count="one">{0} Мбит</unitPattern>
-				<unitPattern count="few">{0} Мбит</unitPattern>
-				<unitPattern count="many">{0} Мбит</unitPattern>
-				<unitPattern count="other">{0} Мбит</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>МБ</displayName>
-				<unitPattern count="one">{0} МБ</unitPattern>
-				<unitPattern count="few">{0} МБ</unitPattern>
-				<unitPattern count="many">{0} МБ</unitPattern>
-				<unitPattern count="other">{0} МБ</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Тбит</displayName>
-				<unitPattern count="one">{0} Тбит</unitPattern>
-				<unitPattern count="few">{0} Тбит</unitPattern>
-				<unitPattern count="many">{0} Тбит</unitPattern>
-				<unitPattern count="other">{0} Тбит</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>ТБ</displayName>
 				<unitPattern count="one">{0} ТБ</unitPattern>
@@ -8317,12 +8545,107 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ТБ</unitPattern>
 				<unitPattern count="other">{0} ТБ</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Тбит</displayName>
+				<unitPattern count="one">{0} Тбит</unitPattern>
+				<unitPattern count="few">{0} Тбит</unitPattern>
+				<unitPattern count="many">{0} Тбит</unitPattern>
+				<unitPattern count="other">{0} Тбит</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>ГБ</displayName>
+				<unitPattern count="one">{0} ГБ</unitPattern>
+				<unitPattern count="few">{0} ГБ</unitPattern>
+				<unitPattern count="many">{0} ГБ</unitPattern>
+				<unitPattern count="other">{0} ГБ</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Гбит</displayName>
+				<unitPattern count="one">{0} Гбит</unitPattern>
+				<unitPattern count="few">{0} Гбит</unitPattern>
+				<unitPattern count="many">{0} Гбит</unitPattern>
+				<unitPattern count="other">{0} Гбит</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>МБ</displayName>
+				<unitPattern count="one">{0} МБ</unitPattern>
+				<unitPattern count="few">{0} МБ</unitPattern>
+				<unitPattern count="many">{0} МБ</unitPattern>
+				<unitPattern count="other">{0} МБ</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Мбит</displayName>
+				<unitPattern count="one">{0} Мбит</unitPattern>
+				<unitPattern count="few">{0} Мбит</unitPattern>
+				<unitPattern count="many">{0} Мбит</unitPattern>
+				<unitPattern count="other">{0} Мбит</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>кБ</displayName>
+				<unitPattern count="one">{0} кБ</unitPattern>
+				<unitPattern count="few">{0} кБ</unitPattern>
+				<unitPattern count="many">{0} кБ</unitPattern>
+				<unitPattern count="other">{0} кБ</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>кбит</displayName>
+				<unitPattern count="one">{0} кбит</unitPattern>
+				<unitPattern count="few">{0} кбит</unitPattern>
+				<unitPattern count="many">{0} кбит</unitPattern>
+				<unitPattern count="other">{0} кбит</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>Б</displayName>
+				<unitPattern count="one">{0} Б</unitPattern>
+				<unitPattern count="few">{0} Б</unitPattern>
+				<unitPattern count="many">{0} Б</unitPattern>
+				<unitPattern count="other">{0} Б</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>бит</displayName>
+				<unitPattern count="one">{0} бит</unitPattern>
+				<unitPattern count="few">{0} бита</unitPattern>
+				<unitPattern count="many">{0} бит</unitPattern>
+				<unitPattern count="other">{0} бита</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>в.</displayName>
+				<unitPattern count="one">{0} в.</unitPattern>
+				<unitPattern count="few">{0} в.</unitPattern>
+				<unitPattern count="many">{0} в.</unitPattern>
+				<unitPattern count="other">{0} в.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>г.</displayName>
+				<unitPattern count="one">{0} г.</unitPattern>
+				<unitPattern count="few">{0} г.</unitPattern>
+				<unitPattern count="many">{0} л.</unitPattern>
+				<unitPattern count="other">{0} г.</unitPattern>
+				<perUnitPattern>{0}/г</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>мес.</displayName>
+				<unitPattern count="one">{0} мес.</unitPattern>
+				<unitPattern count="few">{0} мес.</unitPattern>
+				<unitPattern count="many">{0} мес.</unitPattern>
+				<unitPattern count="other">{0} мес.</unitPattern>
+				<perUnitPattern>{0}/мес</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>нед.</displayName>
+				<unitPattern count="one">{0} нед.</unitPattern>
+				<unitPattern count="few">{0} нед.</unitPattern>
+				<unitPattern count="many">{0} нед.</unitPattern>
+				<unitPattern count="other">{0} нед.</unitPattern>
+				<perUnitPattern>{0}/нед</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
-				<displayName>дн</displayName>
-				<unitPattern count="one">{0} дн</unitPattern>
-				<unitPattern count="few">{0} дн</unitPattern>
-				<unitPattern count="many">{0} дн</unitPattern>
-				<unitPattern count="other">{0} дн</unitPattern>
+				<displayName>дн.</displayName>
+				<unitPattern count="one">{0} дн.</unitPattern>
+				<unitPattern count="few">{0} дн.</unitPattern>
+				<unitPattern count="many">{0} дн.</unitPattern>
+				<unitPattern count="other">{0} дн.</unitPattern>
+				<perUnitPattern>{0}/д</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>ч</displayName>
@@ -8332,40 +8655,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ч</unitPattern>
 				<perUnitPattern>{0}/ч</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>мкс</displayName>
-				<unitPattern count="one">{0} мкс</unitPattern>
-				<unitPattern count="few">{0} мкс</unitPattern>
-				<unitPattern count="many">{0} мкс</unitPattern>
-				<unitPattern count="other">{0} мкс</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>мс</displayName>
-				<unitPattern count="one">{0} мс</unitPattern>
-				<unitPattern count="few">{0} мс</unitPattern>
-				<unitPattern count="many">{0} мс</unitPattern>
-				<unitPattern count="other">{0} мс</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>мин</displayName>
 				<unitPattern count="one">{0} мин</unitPattern>
 				<unitPattern count="few">{0} мин</unitPattern>
 				<unitPattern count="many">{0} мин</unitPattern>
 				<unitPattern count="other">{0} мин</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>мес</displayName>
-				<unitPattern count="one">{0} мес</unitPattern>
-				<unitPattern count="few">{0} мес</unitPattern>
-				<unitPattern count="many">{0} мес</unitPattern>
-				<unitPattern count="other">{0} мес</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>нс</displayName>
-				<unitPattern count="one">{0} нс</unitPattern>
-				<unitPattern count="few">{0} нс</unitPattern>
-				<unitPattern count="many">{0} нс</unitPattern>
-				<unitPattern count="other">{0} нс</unitPattern>
+				<perUnitPattern>{0}/мин</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>сек</displayName>
@@ -8375,19 +8671,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} сек</unitPattern>
 				<perUnitPattern>{0}/c</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>нед</displayName>
-				<unitPattern count="one">{0} нед</unitPattern>
-				<unitPattern count="few">{0} нед</unitPattern>
-				<unitPattern count="many">{0} нед</unitPattern>
-				<unitPattern count="other">{0} нед</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>мс</displayName>
+				<unitPattern count="one">{0} мс</unitPattern>
+				<unitPattern count="few">{0} мс</unitPattern>
+				<unitPattern count="many">{0} мс</unitPattern>
+				<unitPattern count="other">{0} мс</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>г.</displayName>
-				<unitPattern count="one">{0} г.</unitPattern>
-				<unitPattern count="few">{0} г.</unitPattern>
-				<unitPattern count="many">{0} л.</unitPattern>
-				<unitPattern count="other">{0} г.</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>мкс</displayName>
+				<unitPattern count="one">{0} мкс</unitPattern>
+				<unitPattern count="few">{0} мкс</unitPattern>
+				<unitPattern count="many">{0} мкс</unitPattern>
+				<unitPattern count="other">{0} мкс</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>нс</displayName>
+				<unitPattern count="one">{0} нс</unitPattern>
+				<unitPattern count="few">{0} нс</unitPattern>
+				<unitPattern count="many">{0} нс</unitPattern>
+				<unitPattern count="other">{0} нс</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>А</displayName>
@@ -8417,6 +8720,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} В</unitPattern>
 				<unitPattern count="other">{0} В</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>ккал</displayName>
+				<unitPattern count="one">{0} ккал</unitPattern>
+				<unitPattern count="few">{0} ккал</unitPattern>
+				<unitPattern count="many">{0} ккал</unitPattern>
+				<unitPattern count="other">{0} ккал</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>кал</displayName>
 				<unitPattern count="one">{0} кал</unitPattern>
@@ -8431,20 +8741,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} кал</unitPattern>
 				<unitPattern count="other">{0} кал</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>Дж</displayName>
-				<unitPattern count="one">{0} Дж</unitPattern>
-				<unitPattern count="few">{0} Дж</unitPattern>
-				<unitPattern count="many">{0} Дж</unitPattern>
-				<unitPattern count="other">{0} Дж</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>ккал</displayName>
-				<unitPattern count="one">{0} ккал</unitPattern>
-				<unitPattern count="few">{0} ккал</unitPattern>
-				<unitPattern count="many">{0} ккал</unitPattern>
-				<unitPattern count="other">{0} ккал</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>кДж</displayName>
 				<unitPattern count="one">{0} кДж</unitPattern>
@@ -8452,6 +8748,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} кДж</unitPattern>
 				<unitPattern count="other">{0} кДж</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>Дж</displayName>
+				<unitPattern count="one">{0} Дж</unitPattern>
+				<unitPattern count="few">{0} Дж</unitPattern>
+				<unitPattern count="many">{0} Дж</unitPattern>
+				<unitPattern count="other">{0} Дж</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>кВт⋅ч</displayName>
 				<unitPattern count="one">{0} кВт⋅ч</unitPattern>
@@ -8466,12 +8769,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ГГц</unitPattern>
 				<unitPattern count="other">{0} ГГц</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Гц</displayName>
-				<unitPattern count="one">{0} Гц</unitPattern>
-				<unitPattern count="few">{0} Гц</unitPattern>
-				<unitPattern count="many">{0} Гц</unitPattern>
-				<unitPattern count="other">{0} Гц</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>МГц</displayName>
+				<unitPattern count="one">{0} МГц</unitPattern>
+				<unitPattern count="few">{0} МГц</unitPattern>
+				<unitPattern count="many">{0} МГц</unitPattern>
+				<unitPattern count="other">{0} МГц</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>кГц</displayName>
@@ -8480,26 +8783,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} кГц</unitPattern>
 				<unitPattern count="other">{0} кГц</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>МГц</displayName>
-				<unitPattern count="one">{0} МГц</unitPattern>
-				<unitPattern count="few">{0} МГц</unitPattern>
-				<unitPattern count="many">{0} МГц</unitPattern>
-				<unitPattern count="other">{0} МГц</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Гц</displayName>
+				<unitPattern count="one">{0} Гц</unitPattern>
+				<unitPattern count="few">{0} Гц</unitPattern>
+				<unitPattern count="many">{0} Гц</unitPattern>
+				<unitPattern count="other">{0} Гц</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>а. е.</displayName>
-				<unitPattern count="one">{0} а. е.</unitPattern>
-				<unitPattern count="few">{0} а. е.</unitPattern>
-				<unitPattern count="many">{0} а. е.</unitPattern>
-				<unitPattern count="other">{0} а. е.</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>км</displayName>
+				<unitPattern count="one">{0} км</unitPattern>
+				<unitPattern count="few">{0} км</unitPattern>
+				<unitPattern count="many">{0} км</unitPattern>
+				<unitPattern count="other">{0} км</unitPattern>
+				<perUnitPattern>{0}/км</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>см</displayName>
-				<unitPattern count="one">{0} см</unitPattern>
-				<unitPattern count="few">{0} см</unitPattern>
-				<unitPattern count="many">{0} см</unitPattern>
-				<unitPattern count="other">{0} см</unitPattern>
+			<unit type="length-meter">
+				<displayName>метры</displayName>
+				<unitPattern count="one">{0} м</unitPattern>
+				<unitPattern count="few">{0} м</unitPattern>
+				<unitPattern count="many">{0} м</unitPattern>
+				<unitPattern count="other">{0} м</unitPattern>
+				<perUnitPattern>{0}/м</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>дм</displayName>
@@ -8508,54 +8813,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} дм</unitPattern>
 				<unitPattern count="other">{0} дм</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>футы</displayName>
-				<unitPattern count="one">{0} фут</unitPattern>
-				<unitPattern count="few">{0} фута</unitPattern>
-				<unitPattern count="many">{0} футов</unitPattern>
-				<unitPattern count="other">{0} фута</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>дюйм.</displayName>
-				<unitPattern count="one">{0} дюйм</unitPattern>
-				<unitPattern count="few">{0} дюйм.</unitPattern>
-				<unitPattern count="many">{0} дюйм.</unitPattern>
-				<unitPattern count="other">{0} дюйм.</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>км</displayName>
-				<unitPattern count="one">{0} км</unitPattern>
-				<unitPattern count="few">{0} км</unitPattern>
-				<unitPattern count="many">{0} км</unitPattern>
-				<unitPattern count="other">{0} км</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>св. годы</displayName>
-				<unitPattern count="one">{0} св. г.</unitPattern>
-				<unitPattern count="few">{0} св. г.</unitPattern>
-				<unitPattern count="many">{0} св. л.</unitPattern>
-				<unitPattern count="other">{0} св. г.</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>метры</displayName>
-				<unitPattern count="one">{0} м</unitPattern>
-				<unitPattern count="few">{0} м</unitPattern>
-				<unitPattern count="many">{0} м</unitPattern>
-				<unitPattern count="other">{0} м</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>мкм</displayName>
-				<unitPattern count="one">{0} мкм</unitPattern>
-				<unitPattern count="few">{0} мкм</unitPattern>
-				<unitPattern count="many">{0} мкм</unitPattern>
-				<unitPattern count="other">{0} мкм</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>мили</displayName>
-				<unitPattern count="one">{0} миля</unitPattern>
-				<unitPattern count="few">{0} мили</unitPattern>
-				<unitPattern count="many">{0} миль</unitPattern>
-				<unitPattern count="other">{0} мили</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>см</displayName>
+				<unitPattern count="one">{0} см</unitPattern>
+				<unitPattern count="few">{0} см</unitPattern>
+				<unitPattern count="many">{0} см</unitPattern>
+				<unitPattern count="other">{0} см</unitPattern>
+				<perUnitPattern>{0}/см</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>мм</displayName>
@@ -8564,6 +8828,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} мм</unitPattern>
 				<unitPattern count="other">{0} мм</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>мкм</displayName>
+				<unitPattern count="one">{0} мкм</unitPattern>
+				<unitPattern count="few">{0} мкм</unitPattern>
+				<unitPattern count="many">{0} мкм</unitPattern>
+				<unitPattern count="other">{0} мкм</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>нанометр</displayName>
 				<unitPattern count="one">{0} нм</unitPattern>
@@ -8571,20 +8842,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} нм</unitPattern>
 				<unitPattern count="other">{0} нм</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>мор. мили</displayName>
-				<unitPattern count="one">{0} мор. миля</unitPattern>
-				<unitPattern count="few">{0} мор. мили</unitPattern>
-				<unitPattern count="many">{0} мор. миль</unitPattern>
-				<unitPattern count="other">{0} мор. мили</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>парсеки</displayName>
-				<unitPattern count="one">{0} пк</unitPattern>
-				<unitPattern count="few">{0} пк</unitPattern>
-				<unitPattern count="many">{0} пк</unitPattern>
-				<unitPattern count="other">{0} пк</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>пм</displayName>
 				<unitPattern count="one">{0} пм</unitPattern>
@@ -8592,13 +8849,71 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} пм</unitPattern>
 				<unitPattern count="other">{0} пм</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>мили</displayName>
+				<unitPattern count="one">{0} миля</unitPattern>
+				<unitPattern count="few">{0} мили</unitPattern>
+				<unitPattern count="many">{0} миль</unitPattern>
+				<unitPattern count="other">{0} мили</unitPattern>
+			</unit>
 			<unit type="length-yard">
-				<displayName>ярда</displayName>
+				<displayName>ярды</displayName>
 				<unitPattern count="one">{0} ярд</unitPattern>
 				<unitPattern count="few">{0} ярда</unitPattern>
 				<unitPattern count="many">{0} ярдов</unitPattern>
 				<unitPattern count="other">{0} ярда</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>футы</displayName>
+				<unitPattern count="one">{0} фут</unitPattern>
+				<unitPattern count="few">{0} фута</unitPattern>
+				<unitPattern count="many">{0} футов</unitPattern>
+				<unitPattern count="other">{0} фута</unitPattern>
+				<perUnitPattern>{0}/фут</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>дюйм.</displayName>
+				<unitPattern count="one">{0} дюйм</unitPattern>
+				<unitPattern count="few">{0} дюйм.</unitPattern>
+				<unitPattern count="many">{0} дюйм.</unitPattern>
+				<unitPattern count="other">{0} дюйм.</unitPattern>
+				<perUnitPattern>{0}/дюйм</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>парсеки</displayName>
+				<unitPattern count="one">{0} пк</unitPattern>
+				<unitPattern count="few">{0} пк</unitPattern>
+				<unitPattern count="many">{0} пк</unitPattern>
+				<unitPattern count="other">{0} пк</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>св. годы</displayName>
+				<unitPattern count="one">{0} св. г.</unitPattern>
+				<unitPattern count="few">{0} св. г.</unitPattern>
+				<unitPattern count="many">{0} св. л.</unitPattern>
+				<unitPattern count="other">{0} св. г.</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>а. е.</displayName>
+				<unitPattern count="one">{0} а. е.</unitPattern>
+				<unitPattern count="few">{0} а. е.</unitPattern>
+				<unitPattern count="many">{0} а. е.</unitPattern>
+				<unitPattern count="other">{0} а. е.</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>мор. мили</displayName>
+				<unitPattern count="one">{0} мор. миля</unitPattern>
+				<unitPattern count="few">{0} мор. мили</unitPattern>
+				<unitPattern count="many">{0} мор. миль</unitPattern>
+				<unitPattern count="other">{0} мор. мили</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>ск. мил.</displayName>
+				<unitPattern count="one">{0} ск. мил.</unitPattern>
+				<unitPattern count="few">{0} ск. мил.</unitPattern>
+				<unitPattern count="many">{0} ск. мил.</unitPattern>
+				<unitPattern count="other">{0} ск. мил.</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>лк</displayName>
 				<unitPattern count="one">{0} лк</unitPattern>
@@ -8606,27 +8921,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} лк</unitPattern>
 				<unitPattern count="other">{0} лк</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>кар</displayName>
-				<unitPattern count="one">{0} кар</unitPattern>
-				<unitPattern count="few">{0} кар</unitPattern>
-				<unitPattern count="many">{0} кар</unitPattern>
-				<unitPattern count="other">{0} кар</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName draft="contributed">граммы</displayName>
-				<unitPattern count="one">{0} г</unitPattern>
-				<unitPattern count="few">{0} г</unitPattern>
-				<unitPattern count="many">{0} г</unitPattern>
-				<unitPattern count="other">{0} г</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>кг</displayName>
-				<unitPattern count="one">{0} кг</unitPattern>
-				<unitPattern count="few">{0} кг</unitPattern>
-				<unitPattern count="many">{0} кг</unitPattern>
-				<unitPattern count="other">{0} кг</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>т</displayName>
 				<unitPattern count="one">{0} т</unitPattern>
@@ -8634,12 +8928,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} т</unitPattern>
 				<unitPattern count="other">{0} т</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>мкг</displayName>
-				<unitPattern count="one">{0} мкг</unitPattern>
-				<unitPattern count="few">{0} мкг</unitPattern>
-				<unitPattern count="many">{0} мкг</unitPattern>
-				<unitPattern count="other">{0} мкг</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>кг</displayName>
+				<unitPattern count="one">{0} кг</unitPattern>
+				<unitPattern count="few">{0} кг</unitPattern>
+				<unitPattern count="many">{0} кг</unitPattern>
+				<unitPattern count="other">{0} кг</unitPattern>
+				<perUnitPattern>{0}/кг</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>граммы</displayName>
+				<unitPattern count="one">{0} г</unitPattern>
+				<unitPattern count="few">{0} г</unitPattern>
+				<unitPattern count="many">{0} г</unitPattern>
+				<unitPattern count="other">{0} г</unitPattern>
+				<perUnitPattern>{0}/г</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>мг</displayName>
@@ -8648,26 +8951,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} мг</unitPattern>
 				<unitPattern count="other">{0} мг</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>унц.</displayName>
-				<unitPattern count="one">{0} унц.</unitPattern>
-				<unitPattern count="few">{0} унц.</unitPattern>
-				<unitPattern count="many">{0} унц.</unitPattern>
-				<unitPattern count="other">{0} унц.</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>тр. унц.</displayName>
-				<unitPattern count="one">{0} тр. унц.</unitPattern>
-				<unitPattern count="few">{0} тр. унц.</unitPattern>
-				<unitPattern count="many">{0} тр. унц.</unitPattern>
-				<unitPattern count="other">{0} тр. унц.</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>фунт.</displayName>
-				<unitPattern count="one">{0} фунт.</unitPattern>
-				<unitPattern count="few">{0} фунт.</unitPattern>
-				<unitPattern count="many">{0} фунт.</unitPattern>
-				<unitPattern count="other">{0} фунт.</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>мкг</displayName>
+				<unitPattern count="one">{0} мкг</unitPattern>
+				<unitPattern count="few">{0} мкг</unitPattern>
+				<unitPattern count="many">{0} мкг</unitPattern>
+				<unitPattern count="other">{0} мкг</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>амер. т</displayName>
@@ -8676,6 +8965,36 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} амер. т</unitPattern>
 				<unitPattern count="other">{0} амер. т</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>фунт.</displayName>
+				<unitPattern count="one">{0} фунт.</unitPattern>
+				<unitPattern count="few">{0} фунт.</unitPattern>
+				<unitPattern count="many">{0} фунт.</unitPattern>
+				<unitPattern count="other">{0} фунт.</unitPattern>
+				<perUnitPattern>{0}/фунт</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>унц.</displayName>
+				<unitPattern count="one">{0} унц.</unitPattern>
+				<unitPattern count="few">{0} унц.</unitPattern>
+				<unitPattern count="many">{0} унц.</unitPattern>
+				<unitPattern count="other">{0} унц.</unitPattern>
+				<perUnitPattern>{0}/унция</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>тр. унц.</displayName>
+				<unitPattern count="one">{0} тр. унц.</unitPattern>
+				<unitPattern count="few">{0} тр. унц.</unitPattern>
+				<unitPattern count="many">{0} тр. унц.</unitPattern>
+				<unitPattern count="other">{0} тр. унц.</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>кар</displayName>
+				<unitPattern count="one">{0} кар</unitPattern>
+				<unitPattern count="few">{0} кар</unitPattern>
+				<unitPattern count="many">{0} кар</unitPattern>
+				<unitPattern count="other">{0} кар</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>ГВт</displayName>
 				<unitPattern count="one">{0} ГВт</unitPattern>
@@ -8683,20 +9002,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ГВт</unitPattern>
 				<unitPattern count="other">{0} ГВт</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>л.с.</displayName>
-				<unitPattern count="one">{0} л.с.</unitPattern>
-				<unitPattern count="few">{0} л.с.</unitPattern>
-				<unitPattern count="many">{0} л.с.</unitPattern>
-				<unitPattern count="other">{0} л.с.</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>кВт</displayName>
-				<unitPattern count="one">{0} кВт</unitPattern>
-				<unitPattern count="few">{0} кВт</unitPattern>
-				<unitPattern count="many">{0} кВт</unitPattern>
-				<unitPattern count="other">{0} кВт</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>МВт</displayName>
 				<unitPattern count="one">{0} МВт</unitPattern>
@@ -8704,12 +9009,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} МВт</unitPattern>
 				<unitPattern count="other">{0} МВт</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>мВт</displayName>
-				<unitPattern count="one">{0} мВт</unitPattern>
-				<unitPattern count="few">{0} мВт</unitPattern>
-				<unitPattern count="many">{0} мВт</unitPattern>
-				<unitPattern count="other">{0} мВт</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>кВт</displayName>
+				<unitPattern count="one">{0} кВт</unitPattern>
+				<unitPattern count="few">{0} кВт</unitPattern>
+				<unitPattern count="many">{0} кВт</unitPattern>
+				<unitPattern count="other">{0} кВт</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>Вт</displayName>
@@ -8718,6 +9023,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} Вт</unitPattern>
 				<unitPattern count="other">{0} Вт</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>мВт</displayName>
+				<unitPattern count="one">{0} мВт</unitPattern>
+				<unitPattern count="few">{0} мВт</unitPattern>
+				<unitPattern count="many">{0} мВт</unitPattern>
+				<unitPattern count="other">{0} мВт</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>л.с.</displayName>
+				<unitPattern count="one">{0} л.с.</unitPattern>
+				<unitPattern count="few">{0} л.с.</unitPattern>
+				<unitPattern count="many">{0} л.с.</unitPattern>
+				<unitPattern count="other">{0} л.с.</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>гПа</displayName>
 				<unitPattern count="one">{0} гПа</unitPattern>
@@ -8725,20 +9044,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} гПа</unitPattern>
 				<unitPattern count="other">{0} гПа</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>дюймы рт. ст</displayName>
-				<unitPattern count="one">{0} д. рт. ст.</unitPattern>
-				<unitPattern count="few">{0} д. рт. ст.</unitPattern>
-				<unitPattern count="many">{0} д. рт. ст.</unitPattern>
-				<unitPattern count="other">{0} д. рт. ст.</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>мбар</displayName>
-				<unitPattern count="one">{0} мбар</unitPattern>
-				<unitPattern count="few">{0} мбар</unitPattern>
-				<unitPattern count="many">{0} мбар</unitPattern>
-				<unitPattern count="other">{0} мбар</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>мм рт. ст.</displayName>
 				<unitPattern count="one">{0} мм рт. ст.</unitPattern>
@@ -8753,12 +9058,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ф./кв. д.</unitPattern>
 				<unitPattern count="other">{0} ф./кв. д.</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>кар</displayName>
-				<unitPattern count="one">{0} кар</unitPattern>
-				<unitPattern count="few">{0} кар</unitPattern>
-				<unitPattern count="many">{0} кар</unitPattern>
-				<unitPattern count="other">{0} кар</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>дюймы рт. ст</displayName>
+				<unitPattern count="one">{0} д. рт. ст.</unitPattern>
+				<unitPattern count="few">{0} д. рт. ст.</unitPattern>
+				<unitPattern count="many">{0} д. рт. ст.</unitPattern>
+				<unitPattern count="other">{0} д. рт. ст.</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>мбар</displayName>
+				<unitPattern count="one">{0} мбар</unitPattern>
+				<unitPattern count="few">{0} мбар</unitPattern>
+				<unitPattern count="many">{0} мбар</unitPattern>
+				<unitPattern count="other">{0} мбар</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>км/ч</displayName>
@@ -8781,6 +9093,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} миль/час</unitPattern>
 				<unitPattern count="other">{0} мили/час</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>уз.</displayName>
+				<unitPattern count="one">{0} уз.</unitPattern>
+				<unitPattern count="few">{0} уз.</unitPattern>
+				<unitPattern count="many">{0} уз.</unitPattern>
+				<unitPattern count="other">{0} уз.</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0} °C</unitPattern>
@@ -8802,41 +9128,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>акрофуты</displayName>
-				<unitPattern count="one">{0} акрофут</unitPattern>
-				<unitPattern count="few">{0} акрофута</unitPattern>
-				<unitPattern count="many">{0} акрофутов</unitPattern>
-				<unitPattern count="other">{0} акрофута</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>сл</displayName>
-				<unitPattern count="one">{0} сл</unitPattern>
-				<unitPattern count="few">{0} сл</unitPattern>
-				<unitPattern count="many">{0} сл</unitPattern>
-				<unitPattern count="other">{0} сл</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>см³</displayName>
-				<unitPattern count="one">{0} см³</unitPattern>
-				<unitPattern count="few">{0} см³</unitPattern>
-				<unitPattern count="many">{0} см³</unitPattern>
-				<unitPattern count="other">{0} см³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>куб. футы</displayName>
-				<unitPattern count="one">{0} куб. фут</unitPattern>
-				<unitPattern count="few">{0} куб. фута</unitPattern>
-				<unitPattern count="many">{0} куб. футов</unitPattern>
-				<unitPattern count="other">{0} куб. фута</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>куб. дюймы</displayName>
-				<unitPattern count="one">{0} куб. дюйм</unitPattern>
-				<unitPattern count="few">{0} куб. дюйма</unitPattern>
-				<unitPattern count="many">{0} куб. дюймов</unitPattern>
-				<unitPattern count="other">{0} куб. дюйма</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>км³</displayName>
 				<unitPattern count="one">{0} км³</unitPattern>
@@ -8850,6 +9141,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} м³</unitPattern>
 				<unitPattern count="many">{0} м³</unitPattern>
 				<unitPattern count="other">{0} м³</unitPattern>
+				<perUnitPattern>{0}/м³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>см³</displayName>
+				<unitPattern count="one">{0} см³</unitPattern>
+				<unitPattern count="few">{0} см³</unitPattern>
+				<unitPattern count="many">{0} см³</unitPattern>
+				<unitPattern count="other">{0} см³</unitPattern>
+				<perUnitPattern>{0}/см³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>куб. мили</displayName>
@@ -8865,33 +9165,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} куб. ярдов</unitPattern>
 				<unitPattern count="other">{0} куб. ярда</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>чаш.</displayName>
-				<unitPattern count="one">{0} чаш.</unitPattern>
-				<unitPattern count="few">{0} чаш.</unitPattern>
-				<unitPattern count="many">{0} чаш.</unitPattern>
-				<unitPattern count="other">{0} чаш.</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>куб. футы</displayName>
+				<unitPattern count="one">{0} куб. фут</unitPattern>
+				<unitPattern count="few">{0} куб. фута</unitPattern>
+				<unitPattern count="many">{0} куб. футов</unitPattern>
+				<unitPattern count="other">{0} куб. фута</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>дл</displayName>
-				<unitPattern count="one">{0} дл</unitPattern>
-				<unitPattern count="few">{0} дл</unitPattern>
-				<unitPattern count="many">{0} дл</unitPattern>
-				<unitPattern count="other">{0} дл</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>куб. дюймы</displayName>
+				<unitPattern count="one">{0} куб. дюйм</unitPattern>
+				<unitPattern count="few">{0} куб. дюйма</unitPattern>
+				<unitPattern count="many">{0} куб. дюймов</unitPattern>
+				<unitPattern count="other">{0} куб. дюйма</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>жидк. унц.</displayName>
-				<unitPattern count="one">{0} жидк. унц.</unitPattern>
-				<unitPattern count="few">{0} жидк. унц.</unitPattern>
-				<unitPattern count="many">{0} жидк. унц.</unitPattern>
-				<unitPattern count="other">{0} жидк. унц.</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>гал.</displayName>
-				<unitPattern count="one">{0} гал.</unitPattern>
-				<unitPattern count="few">{0} гал.</unitPattern>
-				<unitPattern count="many">{0} гал.</unitPattern>
-				<unitPattern count="other">{0} гал.</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Мл</displayName>
+				<unitPattern count="one">{0} Мл</unitPattern>
+				<unitPattern count="few">{0} Мл</unitPattern>
+				<unitPattern count="many">{0} Мл</unitPattern>
+				<unitPattern count="other">{0} Мл</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>гл</displayName>
@@ -8906,13 +9199,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} л</unitPattern>
 				<unitPattern count="many">{0} л</unitPattern>
 				<unitPattern count="other">{0} л</unitPattern>
+				<perUnitPattern>{0}/л</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Мл</displayName>
-				<unitPattern count="one">{0} Мл</unitPattern>
-				<unitPattern count="few">{0} Мл</unitPattern>
-				<unitPattern count="many">{0} Мл</unitPattern>
-				<unitPattern count="other">{0} Мл</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>дл</displayName>
+				<unitPattern count="one">{0} дл</unitPattern>
+				<unitPattern count="few">{0} дл</unitPattern>
+				<unitPattern count="many">{0} дл</unitPattern>
+				<unitPattern count="other">{0} дл</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>сл</displayName>
+				<unitPattern count="one">{0} сл</unitPattern>
+				<unitPattern count="few">{0} сл</unitPattern>
+				<unitPattern count="many">{0} сл</unitPattern>
+				<unitPattern count="other">{0} сл</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>мл</displayName>
@@ -8921,12 +9222,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} мл</unitPattern>
 				<unitPattern count="other">{0} мл</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>пинт.</displayName>
-				<unitPattern count="one">{0} пинт.</unitPattern>
-				<unitPattern count="few">{0} пинт.</unitPattern>
-				<unitPattern count="many">{0} пинт.</unitPattern>
-				<unitPattern count="other">{0} пинт.</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>мпт</displayName>
+				<unitPattern count="one">{0} мпт</unitPattern>
+				<unitPattern count="few">{0} мпт</unitPattern>
+				<unitPattern count="many">{0} мпт</unitPattern>
+				<unitPattern count="other">{0} мпт</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>м. чаш.</displayName>
+				<unitPattern count="one">{0} м. чаш.</unitPattern>
+				<unitPattern count="few">{0} м. чаш.</unitPattern>
+				<unitPattern count="many">{0} м. чаш.</unitPattern>
+				<unitPattern count="other">{0} м. чаш.</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>акрофуты</displayName>
+				<unitPattern count="one">{0} акрофут</unitPattern>
+				<unitPattern count="few">{0} акрофута</unitPattern>
+				<unitPattern count="many">{0} акрофутов</unitPattern>
+				<unitPattern count="other">{0} акрофута</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>гал.</displayName>
+				<unitPattern count="one">{0} гал.</unitPattern>
+				<unitPattern count="few">{0} гал.</unitPattern>
+				<unitPattern count="many">{0} гал.</unitPattern>
+				<unitPattern count="other">{0} гал.</unitPattern>
+				<perUnitPattern>{0}/галл</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>кварт.</displayName>
@@ -8935,6 +9258,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} кварт.</unitPattern>
 				<unitPattern count="other">{0} кварт.</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>пинт.</displayName>
+				<unitPattern count="one">{0} пинт.</unitPattern>
+				<unitPattern count="few">{0} пинт.</unitPattern>
+				<unitPattern count="many">{0} пинт.</unitPattern>
+				<unitPattern count="other">{0} пинт.</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>чаш.</displayName>
+				<unitPattern count="one">{0} чаш.</unitPattern>
+				<unitPattern count="few">{0} чаш.</unitPattern>
+				<unitPattern count="many">{0} чаш.</unitPattern>
+				<unitPattern count="other">{0} чаш.</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>жидк. унц.</displayName>
+				<unitPattern count="one">{0} жидк. унц.</unitPattern>
+				<unitPattern count="few">{0} жидк. унц.</unitPattern>
+				<unitPattern count="many">{0} жидк. унц.</unitPattern>
+				<unitPattern count="other">{0} жидк. унц.</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>ст. л.</displayName>
 				<unitPattern count="one">{0} ст. л.</unitPattern>
@@ -8943,16 +9287,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ст. л.</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
-				<displayName>ч.л.</displayName>
-				<unitPattern count="one">{0} ч.л.</unitPattern>
-				<unitPattern count="few">{0} ч.л.</unitPattern>
-				<unitPattern count="many">{0} ч.л.</unitPattern>
-				<unitPattern count="other">{0} ч.л.</unitPattern>
+				<displayName>ч. л.</displayName>
+				<unitPattern count="one">{0} ч. л.</unitPattern>
+				<unitPattern count="few">{0} ч. л.</unitPattern>
+				<unitPattern count="many">{0} ч. л.</unitPattern>
+				<unitPattern count="other">{0} ч. л.</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} в. д.</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} с. ш.</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} ю. ш.</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} з. д.</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<unitPattern count="one" draft="contributed">{0} G</unitPattern>
@@ -8960,6 +9310,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} G</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="few" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="many" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one" draft="contributed">{0}′</unitPattern>
 				<unitPattern count="few" draft="contributed">{0}′</unitPattern>
@@ -8972,17 +9328,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0}″</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="few" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="many" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one" draft="contributed">{0} акр</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} акра</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} акров</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} акра</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one" draft="contributed">{0} км²</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} км²</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} км²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} км²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one" draft="contributed">{0} га</unitPattern>
@@ -8990,18 +9340,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} га</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} га</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one" draft="contributed">{0} кв. фут</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} кв. фута</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} кв. футов</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} кв. фута</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one" draft="contributed">{0} км²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} км²</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} км²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} км²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one" draft="contributed">{0} м²</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} м²</unitPattern>
@@ -9014,6 +9352,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} кв. миль</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} кв. мили</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one" draft="contributed">{0} акр</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} акра</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} акров</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} акра</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one" draft="contributed">{0} кв. фут</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} кв. фута</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} кв. футов</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} кв. фута</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>л/100 км</displayName>
+				<unitPattern count="one">{0} л/100 км</unitPattern>
+				<unitPattern count="few">{0} л/100 км</unitPattern>
+				<unitPattern count="many">{0} л/100 км</unitPattern>
+				<unitPattern count="other">{0} л/100 км</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>г.</displayName>
+				<unitPattern count="one">{0} г.</unitPattern>
+				<unitPattern count="few">{0} г.</unitPattern>
+				<unitPattern count="many">{0} л.</unitPattern>
+				<unitPattern count="other">{0} г.</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>м.</displayName>
+				<unitPattern count="one">{0} м.</unitPattern>
+				<unitPattern count="few">{0} м.</unitPattern>
+				<unitPattern count="many">{0} м.</unitPattern>
+				<unitPattern count="other">{0} м.</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>н.</displayName>
+				<unitPattern count="one">{0} н.</unitPattern>
+				<unitPattern count="few">{0} н.</unitPattern>
+				<unitPattern count="many">{0} н.</unitPattern>
+				<unitPattern count="other">{0} н.</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>д.</displayName>
 				<unitPattern count="one">{0} д.</unitPattern>
@@ -9028,27 +9406,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ч</unitPattern>
 				<unitPattern count="other">{0} ч</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>мс</displayName>
-				<unitPattern count="one">{0} мс</unitPattern>
-				<unitPattern count="few">{0} мс</unitPattern>
-				<unitPattern count="many">{0} мс</unitPattern>
-				<unitPattern count="other">{0} мс</unitPattern>
-			</unit>
 			<unit type="duration-minute">
-				<displayName>мин.</displayName>
+				<displayName>мин</displayName>
 				<unitPattern count="one">{0} мин</unitPattern>
 				<unitPattern count="few">{0} мин</unitPattern>
 				<unitPattern count="many">{0} мин</unitPattern>
 				<unitPattern count="other">{0} мин</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>мес</displayName>
-				<unitPattern count="one">{0} м.</unitPattern>
-				<unitPattern count="few">{0} м.</unitPattern>
-				<unitPattern count="many">{0} м.</unitPattern>
-				<unitPattern count="other">{0} м.</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>c</displayName>
 				<unitPattern count="one">{0} с</unitPattern>
@@ -9056,38 +9420,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} с</unitPattern>
 				<unitPattern count="other">{0} с</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>нед</displayName>
-				<unitPattern count="one">{0} н.</unitPattern>
-				<unitPattern count="few">{0} н.</unitPattern>
-				<unitPattern count="many">{0} н.</unitPattern>
-				<unitPattern count="other">{0} н.</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>г.</displayName>
-				<unitPattern count="one">{0} г.</unitPattern>
-				<unitPattern count="few">{0} л.</unitPattern>
-				<unitPattern count="many">{0} л.</unitPattern>
-				<unitPattern count="other">{0} г.</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>см</displayName>
-				<unitPattern count="one">{0} см</unitPattern>
-				<unitPattern count="few">{0} см</unitPattern>
-				<unitPattern count="many">{0} см</unitPattern>
-				<unitPattern count="other">{0} см</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one" draft="contributed">{0} фут</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} фута</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} футов</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} фута</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one" draft="contributed">{0} дюйм</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} дюйма</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} дюймов</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} дюйма</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>мс</displayName>
+				<unitPattern count="one">{0} мс</unitPattern>
+				<unitPattern count="few">{0} мс</unitPattern>
+				<unitPattern count="many">{0} мс</unitPattern>
+				<unitPattern count="other">{0} мс</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>км</displayName>
@@ -9096,13 +9434,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} км</unitPattern>
 				<unitPattern count="other">{0} км</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<displayName>св. годы</displayName>
-				<unitPattern count="one">{0} св. г.</unitPattern>
-				<unitPattern count="few">{0} св. г.</unitPattern>
-				<unitPattern count="many">{0} св. л.</unitPattern>
-				<unitPattern count="other">{0} св. г.</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>метр</displayName>
 				<unitPattern count="one">{0} м</unitPattern>
@@ -9110,11 +9441,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} м</unitPattern>
 				<unitPattern count="other">{0} м</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one" draft="contributed">{0} миля</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} миль</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} миль</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} мили</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>см</displayName>
+				<unitPattern count="one">{0} см</unitPattern>
+				<unitPattern count="few">{0} см</unitPattern>
+				<unitPattern count="many">{0} см</unitPattern>
+				<unitPattern count="other">{0} см</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>мм</displayName>
@@ -9129,18 +9461,36 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} pm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one" draft="contributed">{0} миля</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} миль</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} миль</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} мили</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one" draft="contributed">{0} ярд</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} ярда</unitPattern>
 				<unitPattern count="many" draft="contributed">{0} ярдов</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ярда</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>г</displayName>
-				<unitPattern count="one">{0} г</unitPattern>
-				<unitPattern count="few">{0} г</unitPattern>
-				<unitPattern count="many">{0} г</unitPattern>
-				<unitPattern count="other">{0} г</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one" draft="contributed">{0} фут</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} фута</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} футов</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} фута</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one" draft="contributed">{0} дюйм</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} дюйма</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} дюймов</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} дюйма</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>св. годы</displayName>
+				<unitPattern count="one">{0} св. г.</unitPattern>
+				<unitPattern count="few">{0} св. г.</unitPattern>
+				<unitPattern count="many">{0} св. л.</unitPattern>
+				<unitPattern count="other">{0} св. г.</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>кг</displayName>
@@ -9149,11 +9499,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} кг</unitPattern>
 				<unitPattern count="other">{0} кг</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one" draft="contributed">{0} oz</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} oz</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} oz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} oz</unitPattern>
+			<unit type="mass-gram">
+				<displayName>г</displayName>
+				<unitPattern count="one">{0} г</unitPattern>
+				<unitPattern count="few">{0} г</unitPattern>
+				<unitPattern count="many">{0} г</unitPattern>
+				<unitPattern count="other">{0} г</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one" draft="contributed">{0} lb</unitPattern>
@@ -9161,11 +9512,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} lb</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} lb</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one" draft="contributed">{0} л.с.</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} л.с.</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} л.с.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} л.с.</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one" draft="contributed">{0} oz</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} oz</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} oz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one" draft="contributed">{0} кВт</unitPattern>
@@ -9179,6 +9530,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} Вт</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} Вт</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one" draft="contributed">{0} л.с.</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} л.с.</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} л.с.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} л.с.</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one" draft="contributed">{0} гПа</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} гПа</unitPattern>
@@ -9248,6 +9605,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} л</unitPattern>
 				<unitPattern count="other">{0} л</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} в. д.</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} с. ш.</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} ю. ш.</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} з. д.</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
@@ -9267,10 +9630,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<listPatternPart type="2">{0} и {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit">
-			<listPatternPart type="start">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="start">{0} {1}</listPatternPart>
+			<listPatternPart type="middle">{0} {1}</listPatternPart>
 			<listPatternPart type="end">{0} и {1}</listPatternPart>
-			<listPatternPart type="2">{0} {1}</listPatternPart>
+			<listPatternPart type="2">{0} и {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-narrow">
 			<listPatternPart type="start">{0} {1}</listPatternPart>
@@ -9279,10 +9642,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<listPatternPart type="2">{0} {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-short">
-			<listPatternPart type="start">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle">{0}, {1}</listPatternPart>
-			<listPatternPart type="end">{0}, {1}</listPatternPart>
-			<listPatternPart type="2">{0}, {1}</listPatternPart>
+			<listPatternPart type="start">{0} {1}</listPatternPart>
+			<listPatternPart type="middle">{0} {1}</listPatternPart>
+			<listPatternPart type="end">{0} и {1}</listPatternPart>
+			<listPatternPart type="2">{0} и {1}</listPatternPart>
 		</listPattern>
 	</listPatterns>
 	<posix>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ru_BY.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_BY.xml
similarity index 76%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ru_BY.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_BY.xml
index 0a027564cc1..f3a3c921139 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ru_BY.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_BY.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ru"/>
 		<territory type="BY"/>
 	</identity>
@@ -22,3 +21,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ru_KG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_KG.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ru_KG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_KG.xml
index d58176b67b1..8a813a088bc 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ru_KG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_KG.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ru"/>
 		<territory type="KG"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ru_KZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_KZ.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ru_KZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_KZ.xml
index 2b5514a3142..88d182ed954 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ru_KZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_KZ.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ru"/>
 		<territory type="KZ"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ru_MD.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_MD.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ru_MD.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_MD.xml
index a8d558fd3b3..2012d717340 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ru_MD.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_MD.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ru"/>
 		<territory type="MD"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_RU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_RU.xml
new file mode 100644
index 00000000000..d39214881c8
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_RU.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="ru"/>
+		<territory type="RU"/>
+	</identity>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ru_UA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_UA.xml
similarity index 96%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ru_UA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_UA.xml
index d82f114ac48..62583b6ba2d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ru_UA.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_UA.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11248 $"/>
-		<generation date="$Date: 2015-02-18 16:47:15 -0600 (Wed, 18 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ru"/>
 		<territory type="UA"/>
 	</identity>
@@ -119,7 +118,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
 							<greatestDifference id="d" draft="unconfirmed">E, d – E, d MMM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E, d MMM – E, d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
 							<greatestDifference id="d" draft="unconfirmed">E, dd.MM.y – E, dd.MM.y</greatestDifference>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rw.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rw.xml
similarity index 89%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rw.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rw.xml
index e809bdf542e..6d69bcb8ccc 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rw.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rw.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="rw"/>
 	</identity>
 	<localeDisplayNames>
@@ -286,6 +285,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<decimal>,</decimal>
 			<group>.</group>
 		</symbols>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencies>
 			<currency type="RWF">
 				<symbol>RF</symbol>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rw_RW.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rw_RW.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rw_RW.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rw_RW.xml
index 0a16422a5b4..2996dd6478d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rw_RW.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rw_RW.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="rw"/>
 		<territory type="RW"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rwk.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rwk.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rwk.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rwk.xml
index ca3ab8bb4ad..bf895c73879 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rwk.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rwk.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="rwk"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antili za Uholanzi</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Ajentina</territory>
 			<territory type="AS">Samoa ya Marekani</territory>
@@ -448,6 +446,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">utuko</dayPeriod>
+							<dayPeriod type="pm">kyiukonyi</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">utuko</dayPeriod>
 							<dayPeriod type="pm">kyiukonyi</dayPeriod>
@@ -489,22 +491,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -578,6 +580,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0K¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0K¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00K¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000K¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0M¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00M¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000M¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0G¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00G¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000G¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0T¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00T¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000T¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -758,3 +788,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rwk_TZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rwk_TZ.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rwk_TZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rwk_TZ.xml
index e0ee46b78cb..a2937d730ac 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/rwk_TZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rwk_TZ.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="rwk"/>
 		<territory type="TZ"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sah.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sah.xml
similarity index 93%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sah.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sah.xml
index 9b76f6228cf..ed800392b02 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sah.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sah.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10753 $"/>
-		<generation date="$Date: 2014-08-11 11:10:03 -0500 (Mon, 11 Aug 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="sah"/>
 	</identity>
 	<localeDisplayNames>
@@ -78,6 +77,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="003" draft="contributed">Хотугу Эмиэрикэ</territory>
 			<territory type="005" draft="contributed">Соҕуруу Эмиэрикэ</territory>
 			<territory type="CN" draft="contributed">Кытай</territory>
+			<territory type="RU">Арассыыйа</territory>
 		</territories>
 		<measurementSystemNames>
 			<measurementSystemName type="metric" draft="contributed">Мэтриичэскэй</measurementSystemName>
@@ -262,6 +262,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am" draft="contributed">ЭИ</dayPeriod>
+							<dayPeriod type="pm" draft="contributed">ЭК</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am" draft="contributed">ЭИ</dayPeriod>
 							<dayPeriod type="pm" draft="contributed">ЭК</dayPeriod>
@@ -430,14 +434,44 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<decimal draft="contributed">.</decimal>
 			<group draft="contributed">,</group>
 		</symbols>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencies>
 			<currency type="RUB">
-				<symbol>руб.</symbol>
+				<symbol>₽</symbol>
 			</currency>
 		</currencies>
 	</numbers>
 	<units>
 		<unitLength type="long">
+			<unit type="duration-year">
+				<displayName draft="contributed">сыл</displayName>
+				<unitPattern count="other">{0} сыл</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">ый</displayName>
+				<unitPattern count="other">{0} ый</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="contributed">нэдиэлэ</displayName>
+				<unitPattern count="other">{0} нэдиэлэ</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="contributed">күн</displayName>
 				<unitPattern count="other">{0} күн</unitPattern>
@@ -450,24 +484,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName draft="contributed">мүнүүтэ</displayName>
 				<unitPattern count="other">{0} мүнүүтэ</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">ый</displayName>
-				<unitPattern count="other">{0} ый</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="contributed">сөкүүндэ</displayName>
 				<unitPattern count="other">{0} сөкүүндэ</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">нэдиэлэ</displayName>
-				<unitPattern count="other">{0} нэдиэлэ</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">сыл</displayName>
-				<unitPattern count="other">{0} сыл</unitPattern>
-			</unit>
 		</unitLength>
 		<unitLength type="short">
+			<unit type="duration-year">
+				<displayName draft="contributed">сыл</displayName>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">ый</displayName>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="contributed">нэдиэлэ</displayName>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="contributed">күн</displayName>
 			</unit>
@@ -477,18 +508,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="duration-minute">
 				<displayName draft="contributed">мүнүүтэ</displayName>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">ый</displayName>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="contributed">сөкүүндэ</displayName>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">нэдиэлэ</displayName>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">сыл</displayName>
-			</unit>
 		</unitLength>
 	</units>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sah_RU.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sah_RU.xml
new file mode 100644
index 00000000000..0d304e41ce5
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sah_RU.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="sah"/>
+		<territory type="RU"/>
+	</identity>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/saq.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/saq.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/saq.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/saq.xml
index 0a102e22aad..e2c40d37c9b 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/saq.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/saq.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="saq"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antili za Uholanzi</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Ajentina</territory>
 			<territory type="AS">Samoa ya Marekani</territory>
@@ -448,6 +446,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">Tesiran</dayPeriod>
+							<dayPeriod type="pm">Teipa</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">Tesiran</dayPeriod>
 							<dayPeriod type="pm">Teipa</dayPeriod>
@@ -489,22 +491,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -581,6 +583,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/saq_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/saq_KE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/saq_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/saq_KE.xml
index bc54c32f8bc..61144bb8861 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/saq_KE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/saq_KE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="saq"/>
 		<territory type="KE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sbp.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sbp.xml
similarity index 94%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sbp.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sbp.xml
index f869004572a..4ba8299e046 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sbp.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sbp.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="sbp"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Alubaniya</territory>
 			<territory type="AM">Alimeniya</territory>
-			<territory type="AN">Anitili sa Uholansi</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Ajentina</territory>
 			<territory type="AS">Samoya ya Malekani</territory>
@@ -433,6 +431,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">Lwamilawu</dayPeriod>
+							<dayPeriod type="pm">Pashamihe</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">Lwamilawu</dayPeriod>
 							<dayPeriod type="pm">Pashamihe</dayPeriod>
@@ -474,22 +476,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -585,6 +587,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">0K¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sbp_TZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sbp_TZ.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sbp_TZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sbp_TZ.xml
index 6bf610cd4ee..0509f64b0ea 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sbp_TZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sbp_TZ.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="sbp"/>
 		<territory type="TZ"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/se.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se.xml
similarity index 95%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/se.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se.xml
index 3a5c7c61045..acb720f599c 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/se.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10753 $"/>
-		<generation date="$Date: 2014-08-11 11:10:03 -0500 (Mon, 11 Aug 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="se"/>
 	</identity>
 	<localeDisplayNames>
@@ -441,13 +440,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="numbers" draft="contributed">numerála</key>
 		</keys>
 		<types>
-			<type type="buddhist" key="calendar" draft="contributed">buddhista kaleander</type>
-			<type type="chinese" key="calendar" draft="contributed">kiinna</type>
-			<type type="fullwide" key="numbers" draft="contributed">viddis oarjelohkosátni</type>
-			<type type="gregorian" key="calendar" draft="contributed">gregoria kaleander</type>
-			<type type="latn" key="numbers" draft="contributed">oarjelohkosátni</type>
-			<type type="pinyin" key="collation" draft="contributed">pinyin ortnet</type>
-			<type type="traditional" key="collation" draft="contributed">árbevirolaš ortnet</type>
+			<type key="calendar" type="buddhist" draft="contributed">buddhista kaleander</type>
+			<type key="calendar" type="chinese" draft="contributed">kiinna</type>
+			<type key="calendar" type="gregorian" draft="contributed">gregoria kaleander</type>
+			<type key="collation" type="pinyin" draft="contributed">pinyin ortnet</type>
+			<type key="collation" type="traditional" draft="contributed">árbevirolaš ortnet</type>
+			<type key="numbers" type="fullwide" draft="contributed">viddis oarjelohkosátni</type>
+			<type key="numbers" type="latn" draft="contributed">oarjelohkosátni</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric" draft="contributed">SI állan</measurementSystemName>
@@ -893,6 +892,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern draft="contributed">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0 dt ¤</pattern>
+					<pattern type="1000" count="two" draft="provisional">0 dt ¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0 dt ¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00 dt ¤</pattern>
+					<pattern type="10000" count="two" draft="provisional">00 dt ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00 dt ¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000 dt ¤</pattern>
+					<pattern type="100000" count="two" draft="provisional">000 dt ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000 dt ¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0 mn ¤</pattern>
+					<pattern type="1000000" count="two" draft="provisional">0 mn ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0 mn ¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00 mn ¤</pattern>
+					<pattern type="10000000" count="two" draft="provisional">00 mn ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00 mn ¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000 mn ¤</pattern>
+					<pattern type="100000000" count="two" draft="provisional">000 mn ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000 mn ¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0 md ¤</pattern>
+					<pattern type="1000000000" count="two" draft="provisional">0 md ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0 md ¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00 md ¤</pattern>
+					<pattern type="10000000000" count="two" draft="provisional">00 md ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00 md ¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000 md ¤</pattern>
+					<pattern type="100000000000" count="two" draft="provisional">000 md ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000 md ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0 bn ¤</pattern>
+					<pattern type="1000000000000" count="two" draft="provisional">0 bn ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0 bn ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00 bn ¤</pattern>
+					<pattern type="10000000000000" count="two" draft="provisional">00 bn ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00 bn ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000 bn ¤</pattern>
+					<pattern type="100000000000000" count="two" draft="provisional">000 bn ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000 bn ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
 			<unitPattern count="two" draft="contributed">{0} {1}</unitPattern>
 			<unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
@@ -959,6 +998,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} Maapallo gravitaatiovoimat</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} Maapallo gravitaatiovoimat</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<displayName draft="contributed">grádat</displayName>
+				<unitPattern count="one" draft="contributed">{0} grádat</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} grádat</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} grádat</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName draft="contributed">jorbbas minuhtta</displayName>
 				<unitPattern count="one" draft="contributed">{0} jorbbas minuhta</unitPattern>
@@ -971,17 +1016,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} jorbbas sekundda</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} jorbbas sekundda</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName draft="contributed">grádat</displayName>
-				<unitPattern count="one" draft="contributed">{0} grádat</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} grádat</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} grádat</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="contributed">Amerihká tynnyrinala</displayName>
-				<unitPattern count="one" draft="contributed">{0} Amerihká tynnyrinala</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} Amerihká tynnyrinala</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Amerihká tynnyrinala</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName draft="contributed">neliökilomehtera</displayName>
+				<unitPattern count="one" draft="contributed">{0} neliökilomehter</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} neliökilomehtera</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} neliökilomehtera</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName draft="contributed">hehtaaria</displayName>
@@ -989,18 +1028,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} hehtaaria</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} hehtaaria</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<displayName draft="contributed">neliöjuolgi</displayName>
-				<unitPattern count="one" draft="contributed">{0} neliöjuolgi</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} neliöjuolgi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} neliöjuolgi</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="contributed">neliökilomehtera</displayName>
-				<unitPattern count="one" draft="contributed">{0} neliökilomehter</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} neliökilomehtera</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} neliökilomehtera</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<displayName draft="contributed">neliömehtera</displayName>
 				<unitPattern count="one" draft="contributed">{0} neliömehter</unitPattern>
@@ -1013,6 +1040,36 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} eangas neliömiila</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} eangas neliömiila</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<displayName draft="contributed">Amerihká tynnyrinala</displayName>
+				<unitPattern count="one" draft="contributed">{0} Amerihká tynnyrinala</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} Amerihká tynnyrinala</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Amerihká tynnyrinala</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName draft="contributed">neliöjuolgi</displayName>
+				<unitPattern count="one" draft="contributed">{0} neliöjuolgi</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} neliöjuolgi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} neliöjuolgi</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="contributed">jahkki</displayName>
+				<unitPattern count="one" draft="contributed">{0} jahki</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} jahkki</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} jahkki</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">mánotbadji</displayName>
+				<unitPattern count="one" draft="contributed">{0} mánotbadji</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} mánotbaji</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mánotbadji</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="contributed">váhkku</displayName>
+				<unitPattern count="one" draft="contributed">{0} váhku</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} váhkku</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} váhkku</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="contributed">jándora</displayName>
 				<unitPattern count="one" draft="contributed">{0} jándor</unitPattern>
@@ -1025,59 +1082,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} diimmur</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} diibmur</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="contributed">millisekundda</displayName>
-				<unitPattern count="one" draft="contributed">{0} millisekunda</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} millisekundda</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} millisekundda</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="contributed">minuhtta</displayName>
 				<unitPattern count="one" draft="contributed">{0} minuhta</unitPattern>
 				<unitPattern count="two" draft="contributed">{0} minuhtta</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} minuhtta</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">mánotbadji</displayName>
-				<unitPattern count="one" draft="contributed">{0} mánotbadji</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} mánotbaji</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mánotbadji</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="contributed">sekundda</displayName>
 				<unitPattern count="one" draft="contributed">{0} sekunda</unitPattern>
 				<unitPattern count="two" draft="contributed">{0} sekundda</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} sekundda</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">váhkku</displayName>
-				<unitPattern count="one" draft="contributed">{0} váhku</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} váhkku</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} váhkku</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">jahkki</displayName>
-				<unitPattern count="one" draft="contributed">{0} jahki</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} jahkki</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} jahkki</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">sentimehtera</displayName>
-				<unitPattern count="one" draft="contributed">{0} sentimehter</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} sentimehtera</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} sentimehtera</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="contributed">juolgi</displayName>
-				<unitPattern count="one" draft="contributed">{0} juolgi</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} juolgi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} juolgi</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="contributed">bealgi</displayName>
-				<unitPattern count="one" draft="contributed">{0} bealgi</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} bealgi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} bealgi</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="contributed">millisekundda</displayName>
+				<unitPattern count="one" draft="contributed">{0} millisekunda</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} millisekundda</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} millisekundda</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="contributed">kilomehtera</displayName>
@@ -1085,23 +1106,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} kilomehtera</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kilomehtera</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<displayName draft="contributed">chuovgat jagi</displayName>
-				<unitPattern count="one" draft="contributed">{0} chuovgat jagi</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} chuovgat jagi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} chuovgat jagi</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName draft="contributed">mehtera</displayName>
 				<unitPattern count="one" draft="contributed">{0} mehter</unitPattern>
 				<unitPattern count="two" draft="contributed">{0} mehtera</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mehtera</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName draft="contributed">eangas miila</displayName>
-				<unitPattern count="one" draft="contributed">{0} eangas miil</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} eangas miila</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} eangas miila</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="contributed">sentimehtera</displayName>
+				<unitPattern count="one" draft="contributed">{0} sentimehter</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} sentimehtera</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} sentimehtera</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="contributed">millimehtera</displayName>
@@ -1115,17 +1130,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} pikomehtera</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} pikomehtera</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="contributed">eangas miila</displayName>
+				<unitPattern count="one" draft="contributed">{0} eangas miil</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} eangas miila</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} eangas miila</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName draft="contributed">eangas yard</displayName>
 				<unitPattern count="one" draft="contributed">{0} eangas yard</unitPattern>
 				<unitPattern count="two" draft="contributed">{0} eangas yard</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} eangas yard</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="contributed">gram</displayName>
-				<unitPattern count="one" draft="contributed">{0} gram</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} gram</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} gram</unitPattern>
+			<unit type="length-foot">
+				<displayName draft="contributed">juolgi</displayName>
+				<unitPattern count="one" draft="contributed">{0} juolgi</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} juolgi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} juolgi</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="contributed">bealgi</displayName>
+				<unitPattern count="one" draft="contributed">{0} bealgi</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} bealgi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} bealgi</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="contributed">chuovgat jagi</displayName>
+				<unitPattern count="one" draft="contributed">{0} chuovgat jagi</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} chuovgat jagi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} chuovgat jagi</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="contributed">kilogram</displayName>
@@ -1133,11 +1166,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} kilogram</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kilogram</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="contributed">unssi</displayName>
-				<unitPattern count="one" draft="contributed">{0} unssi</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} unssi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} unssi</unitPattern>
+			<unit type="mass-gram">
+				<displayName draft="contributed">gram</displayName>
+				<unitPattern count="one" draft="contributed">{0} gram</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} gram</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} gram</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<displayName draft="contributed">pauna</displayName>
@@ -1145,11 +1178,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} pauna</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} pauna</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="contributed">hevosvoima</displayName>
-				<unitPattern count="one" draft="contributed">{0} hevosvoima</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} hevosvoima</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} hevosvoima</unitPattern>
+			<unit type="mass-ounce">
+				<displayName draft="contributed">unssi</displayName>
+				<unitPattern count="one" draft="contributed">{0} unssi</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} unssi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} unssi</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName draft="contributed">kilowatt</displayName>
@@ -1163,6 +1196,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} watt</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} watt</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<displayName draft="contributed">hevosvoima</displayName>
+				<unitPattern count="one" draft="contributed">{0} hevosvoima</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} hevosvoima</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} hevosvoima</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="contributed">hehtopascal</displayName>
 				<unitPattern count="one" draft="contributed">{0} hehtopascal</unitPattern>
@@ -1229,6 +1268,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} lihtara</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} lihtara</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="unconfirmed">{0} nuorti</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="unconfirmed">{0} davvi</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="unconfirmed">{0} lulli</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="unconfirmed">{0} oarji</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -1240,6 +1285,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} G</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<displayName draft="contributed">grádat</displayName>
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="two" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName draft="contributed">jorbbas minuhtta</displayName>
 				<unitPattern count="one" draft="contributed">{0}′</unitPattern>
@@ -1252,17 +1303,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0}″</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName draft="contributed">grádat</displayName>
-				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="two" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="contributed">Amerihká tynnyrinala</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="two">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName draft="contributed">neliökilomehtera</displayName>
+				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} km²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName draft="contributed">hehtaaria</displayName>
@@ -1270,18 +1315,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} ha</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<displayName draft="contributed">neliöjuolgi</displayName>
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="two">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="contributed">neliökilomehtera</displayName>
-				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<displayName draft="contributed">neliömehtera</displayName>
 				<unitPattern count="one" draft="contributed">{0} m²</unitPattern>
@@ -1294,6 +1327,36 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<displayName draft="contributed">Amerihká tynnyrinala</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="two">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName draft="contributed">neliöjuolgi</displayName>
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="two">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="contributed">jahkki</displayName>
+				<unitPattern count="one" draft="contributed">{0} jah</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} jah</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} jah</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">mánotbadji</displayName>
+				<unitPattern count="one" draft="contributed">{0} mán</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} mán</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mán</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="contributed">váhkku</displayName>
+				<unitPattern count="one" draft="contributed">{0} v</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} v</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} v</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="contributed">jándora</displayName>
 				<unitPattern count="one" draft="contributed">{0} d</unitPattern>
@@ -1306,59 +1369,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} h</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} h</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="contributed">millisekundda</displayName>
-				<unitPattern count="one" draft="contributed">{0} ms</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ms</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="contributed">minuhtta</displayName>
 				<unitPattern count="one" draft="contributed">{0} min</unitPattern>
 				<unitPattern count="two" draft="contributed">{0} min</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} min</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">mánotbadji</displayName>
-				<unitPattern count="one" draft="contributed">{0} mán</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} mán</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mán</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="contributed">sekundda</displayName>
 				<unitPattern count="one" draft="contributed">{0} s</unitPattern>
 				<unitPattern count="two" draft="contributed">{0} s</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">váhkku</displayName>
-				<unitPattern count="one" draft="contributed">{0} v</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} v</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} v</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">jahkki</displayName>
-				<unitPattern count="one" draft="contributed">{0} jah</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} jah</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} jah</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">sentimehtera</displayName>
-				<unitPattern count="one" draft="contributed">{0} cm</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} cm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="contributed">juolgi</displayName>
-				<unitPattern count="one" draft="contributed">{0} juolgi</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} juolgi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} juolgi</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="contributed">bealgi</displayName>
-				<unitPattern count="one" draft="contributed">{0} bealgi</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} bealgi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} bealgi</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="contributed">millisekundda</displayName>
+				<unitPattern count="one" draft="contributed">{0} ms</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} ms</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="contributed">kilomehtera</displayName>
@@ -1366,23 +1393,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} km</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<displayName draft="contributed">chuovgat jagi</displayName>
-				<unitPattern count="one">{0} ly</unitPattern>
-				<unitPattern count="two">{0} ly</unitPattern>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName draft="contributed">mehtera</displayName>
 				<unitPattern count="one" draft="contributed">{0} m</unitPattern>
 				<unitPattern count="two" draft="contributed">{0} m</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName draft="contributed">eangas miila</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="two">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="contributed">sentimehtera</displayName>
+				<unitPattern count="one" draft="contributed">{0} cm</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} cm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="contributed">millimehtera</displayName>
@@ -1396,17 +1417,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} pm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="contributed">eangas miila</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="two">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName draft="contributed">eangas yard</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="two">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="contributed">gram</displayName>
-				<unitPattern count="one" draft="contributed">{0} g</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} g</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} g</unitPattern>
+			<unit type="length-foot">
+				<displayName draft="contributed">juolgi</displayName>
+				<unitPattern count="one" draft="contributed">{0} juolgi</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} juolgi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} juolgi</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="contributed">bealgi</displayName>
+				<unitPattern count="one" draft="contributed">{0} bealgi</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} bealgi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} bealgi</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="contributed">chuovgat jagi</displayName>
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="two">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="contributed">kilogram</displayName>
@@ -1414,11 +1453,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} kg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="contributed">unssi</displayName>
-				<unitPattern count="one" draft="contributed">{0} unssi</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} unssi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} unssi</unitPattern>
+			<unit type="mass-gram">
+				<displayName draft="contributed">gram</displayName>
+				<unitPattern count="one" draft="contributed">{0} g</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} g</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<displayName draft="contributed">pauna</displayName>
@@ -1426,11 +1465,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} pauna</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} pauna</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="contributed">hevosvoima</displayName>
-				<unitPattern count="one" draft="contributed">{0} hv</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} hv</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} hv</unitPattern>
+			<unit type="mass-ounce">
+				<displayName draft="contributed">unssi</displayName>
+				<unitPattern count="one" draft="contributed">{0} unssi</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} unssi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} unssi</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName draft="contributed">kilowatt</displayName>
@@ -1444,6 +1483,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} W</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<displayName draft="contributed">hevosvoima</displayName>
+				<unitPattern count="one" draft="contributed">{0} hv</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} hv</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} hv</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="contributed">hehtopascal</displayName>
 				<unitPattern count="one" draft="contributed">{0} hPa</unitPattern>
@@ -1510,6 +1555,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} l</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} l</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="unconfirmed">{0} N</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="unconfirmed">{0} D</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="unconfirmed">{0} L</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="unconfirmed">{0} O</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -1520,6 +1571,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0}G</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="two" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one" draft="contributed">{0}′</unitPattern>
 				<unitPattern count="two" draft="contributed">{0}′</unitPattern>
@@ -1530,31 +1586,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0}″</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="two" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="two">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one" draft="contributed">{0}km²</unitPattern>
+				<unitPattern count="two" draft="contributed">{0}km²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one" draft="contributed">{0}ha</unitPattern>
 				<unitPattern count="two" draft="contributed">{0}ha</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="two">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one" draft="contributed">{0}km²</unitPattern>
-				<unitPattern count="two" draft="contributed">{0}km²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one" draft="contributed">{0}m²</unitPattern>
 				<unitPattern count="two" draft="contributed">{0}m²</unitPattern>
@@ -1565,6 +1606,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="two">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="two">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<unitPattern count="one" draft="contributed">{0}j</unitPattern>
+				<unitPattern count="two" draft="contributed">{0}j</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}j</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<unitPattern count="one" draft="contributed">{0}m</unitPattern>
+				<unitPattern count="two" draft="contributed">{0}m</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}m</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<unitPattern count="one" draft="contributed">{0}v</unitPattern>
+				<unitPattern count="two" draft="contributed">{0}v</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}v</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<unitPattern count="one" draft="contributed">{0}d</unitPattern>
 				<unitPattern count="two" draft="contributed">{0}d</unitPattern>
@@ -1575,70 +1641,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0}h</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}h</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<unitPattern count="one" draft="contributed">{0}ms</unitPattern>
-				<unitPattern count="two" draft="contributed">{0}ms</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<unitPattern count="one" draft="contributed">{0}m</unitPattern>
 				<unitPattern count="two" draft="contributed">{0}m</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}m</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<unitPattern count="one" draft="contributed">{0}m</unitPattern>
-				<unitPattern count="two" draft="contributed">{0}m</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}m</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<unitPattern count="one" draft="contributed">{0}s</unitPattern>
 				<unitPattern count="two" draft="contributed">{0}s</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<unitPattern count="one" draft="contributed">{0}v</unitPattern>
-				<unitPattern count="two" draft="contributed">{0}v</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}v</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<unitPattern count="one" draft="contributed">{0}j</unitPattern>
-				<unitPattern count="two" draft="contributed">{0}j</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}j</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<unitPattern count="one" draft="contributed">{0}cm</unitPattern>
-				<unitPattern count="two" draft="contributed">{0}cm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one" draft="contributed">{0} juolgi</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} juolgi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} juolgi</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one" draft="contributed">{0} bealgi</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} bealgi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} bealgi</unitPattern>
+			<unit type="duration-millisecond">
+				<unitPattern count="one" draft="contributed">{0}ms</unitPattern>
+				<unitPattern count="two" draft="contributed">{0}ms</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<unitPattern count="one" draft="contributed">{0}km</unitPattern>
 				<unitPattern count="two" draft="contributed">{0}km</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} ly</unitPattern>
-				<unitPattern count="two">{0} ly</unitPattern>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<unitPattern count="one" draft="contributed">{0}m</unitPattern>
 				<unitPattern count="two" draft="contributed">{0}m</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="two">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<unitPattern count="one" draft="contributed">{0}cm</unitPattern>
+				<unitPattern count="two" draft="contributed">{0}cm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<unitPattern count="one" draft="contributed">{0}mm</unitPattern>
@@ -1650,35 +1681,50 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0}pm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="two">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="two">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<unitPattern count="one" draft="contributed">{0}g</unitPattern>
-				<unitPattern count="two" draft="contributed">{0}g</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one" draft="contributed">{0} juolgi</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} juolgi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} juolgi</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one" draft="contributed">{0} bealgi</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} bealgi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} bealgi</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="two">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<unitPattern count="one" draft="contributed">{0}kg</unitPattern>
 				<unitPattern count="two" draft="contributed">{0}kg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one" draft="contributed">{0} unssi</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} unssi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} unssi</unitPattern>
+			<unit type="mass-gram">
+				<unitPattern count="one" draft="contributed">{0}g</unitPattern>
+				<unitPattern count="two" draft="contributed">{0}g</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one" draft="contributed">{0} pauna</unitPattern>
 				<unitPattern count="two" draft="contributed">{0} pauna</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} pauna</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one" draft="contributed">{0}hv</unitPattern>
-				<unitPattern count="two" draft="contributed">{0}hv</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}hv</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one" draft="contributed">{0} unssi</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} unssi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} unssi</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one" draft="contributed">{0}kW</unitPattern>
@@ -1690,6 +1736,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0}W</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one" draft="contributed">{0}hv</unitPattern>
+				<unitPattern count="two" draft="contributed">{0}hv</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}hv</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one" draft="contributed">{0}hPa</unitPattern>
 				<unitPattern count="two" draft="contributed">{0}hPa</unitPattern>
@@ -1745,6 +1796,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0}L</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}L</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="unconfirmed">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="unconfirmed">{0}D</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="unconfirmed">{0}L</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="unconfirmed">{0}O</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
@@ -1789,3 +1846,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/se_FI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se_FI.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/se_FI.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se_FI.xml
index 5b5816e57b5..cd3ac26a529 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/se_FI.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se_FI.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10819 $"/>
-		<generation date="$Date: 2014-08-14 22:53:08 -0500 (Thu, 14 Aug 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="se"/>
 		<territory type="FI"/>
 	</identity>
@@ -68,14 +67,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="TD">Chad</territory>
 		</territories>
 		<types>
-			<type type="buddhist" key="calendar">buddhista kaleandar</type>
-			<type type="chinese" key="calendar">kiinná kaleandar</type>
-			<type type="coptic" key="calendar">koptalaš kaleandar</type>
-			<type type="dangi" key="calendar">dangi kaleandar</type>
-			<type type="ethiopic" key="calendar">etiohpalaš kaleandar</type>
-			<type type="ethiopic-amete-alem" key="calendar">etiohpalaš-amete-alem kaleandar</type>
-			<type type="fullwide" key="numbers">fullwide</type>
-			<type type="gregorian" key="calendar">gregorialaš kalendar</type>
+			<type key="calendar" type="buddhist">buddhista kaleandar</type>
+			<type key="calendar" type="chinese">kiinná kaleandar</type>
+			<type key="calendar" type="coptic">koptalaš kaleandar</type>
+			<type key="calendar" type="dangi">dangi kaleandar</type>
+			<type key="calendar" type="ethiopic">etiohpalaš kaleandar</type>
+			<type key="calendar" type="ethiopic-amete-alem">etiohpalaš-amete-alem kaleandar</type>
+			<type key="calendar" type="gregorian">gregorialaš kalendar</type>
+			<type key="numbers" type="fullwide">fullwide</type>
 		</types>
 		<codePatterns>
 			<codePattern type="script">čállin: {0}</codePattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/se_NO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se_NO.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/se_NO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se_NO.xml
index 8f0e10d7154..1ff1f2f45f3 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/se_NO.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se_NO.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="se"/>
 		<territory type="NO"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/se_SE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se_SE.xml
similarity index 76%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/se_SE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se_SE.xml
index 9b42e99edc4..8db6e71ef6e 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/se_SE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se_SE.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="se"/>
 		<territory type="SE"/>
 	</identity>
@@ -22,3 +21,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/seh.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/seh.xml
similarity index 92%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/seh.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/seh.xml
index a1e943c58e3..253b6a2f671 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/seh.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/seh.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11042 $"/>
-		<generation date="$Date: 2014-10-31 12:11:19 -0500 (Fri, 31 Oct 2014) $"/>
+		<version number="$Revision: 12128 $"/>
 		<language type="seh"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albânia</territory>
 			<territory type="AM">Armênia</territory>
-			<territory type="AN">Antilhas Holandesas</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Argentina</territory>
 			<territory type="AS">Samoa Americana</territory>
@@ -552,6 +550,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0K¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0K¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00K¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000K¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0M¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00M¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000M¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0G¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00G¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000G¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0T¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00T¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000T¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -735,3 +761,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/seh_MZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/seh_MZ.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/seh_MZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/seh_MZ.xml
index 4634b2d4b02..b9e80df5869 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/seh_MZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/seh_MZ.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="seh"/>
 		<territory type="MZ"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ses.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ses.xml
similarity index 95%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ses.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ses.xml
index e4e1e8d0b79..e027d5850a7 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ses.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ses.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="ses"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angiiya</territory>
 			<territory type="AL">Albaani</territory>
 			<territory type="AM">Armeeni</territory>
-			<territory type="AN">Hollandu Antiiyey Laboo</territory>
 			<territory type="AO">Angoola</territory>
 			<territory type="AR">Argentine</territory>
 			<territory type="AS">Ameriki Samoa</territory>
@@ -447,6 +445,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">Adduha</dayPeriod>
+							<dayPeriod type="pm">Aluula</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">Adduha</dayPeriod>
 							<dayPeriod type="pm">Aluula</dayPeriod>
@@ -579,6 +581,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">0K¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -758,3 +776,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ses_ML.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ses_ML.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ses_ML.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ses_ML.xml
index c99d85fcb82..1f0ad50652b 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ses_ML.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ses_ML.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ses"/>
 		<territory type="ML"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sg.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sg.xml
similarity index 94%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sg.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sg.xml
index 05d64b26128..9f8a7ace9bb 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sg.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sg.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="sg"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angûîla</territory>
 			<territory type="AL">Albanïi</territory>
 			<territory type="AM">Armenïi</territory>
-			<territory type="AN">Antîyi tî Holânde</territory>
 			<territory type="AO">Angoläa</territory>
 			<territory type="AR">Arzantîna</territory>
 			<territory type="AS">Samöa tî Amerîka</territory>
@@ -431,10 +429,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<quarters>
 					<quarterContext type="format">
 						<quarterWidth type="abbreviated">
-							<quarter type="1">F4-1</quarter>
-							<quarter type="2">F4-2</quarter>
-							<quarter type="3">F4-3</quarter>
-							<quarter type="4">F4-4</quarter>
+							<quarter type="1">F4–1</quarter>
+							<quarter type="2">F4–2</quarter>
+							<quarter type="3">F4–3</quarter>
+							<quarter type="4">F4–4</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
 							<quarter type="1">Fângbisïö ôko</quarter>
@@ -446,6 +444,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">ND</dayPeriod>
+							<dayPeriod type="pm">LK</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">ND</dayPeriod>
 							<dayPeriod type="pm">LK</dayPeriod>
@@ -580,6 +582,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;¤-#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -756,3 +774,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sg_CF.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sg_CF.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sg_CF.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sg_CF.xml
index e951386b607..5fe02e63bc4 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sg_CF.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sg_CF.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="sg"/>
 		<territory type="CF"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/shi.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi.xml
similarity index 90%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/shi.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi.xml
index b640485f4e9..901f56e2f3c 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/shi.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="shi"/>
 	</identity>
 	<localeDisplayNames>
@@ -45,7 +44,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ro">ⵜⴰⵔⵓⵎⴰⵏⵉⵜ</language>
 			<language type="ru">ⵜⴰⵔⵓⵙⵉⵜ</language>
 			<language type="rw">ⵜⴰⵔⵓⵡⴰⵏⴷⵉⵜ</language>
-			<language type="shi">ⵜⴰⵎⴰⵣⵉⵖⵜ</language>
+			<language type="shi">ⵜⴰⵛⵍⵃⵉⵜ</language>
 			<language type="so">ⵜⴰⵙⵓⵎⴰⵍⵉⵜ</language>
 			<language type="sv">ⵜⴰⵙⵡⵉⴷⵉⵜ</language>
 			<language type="ta">ⵜⴰⵜⴰⵎⵉⵍⵜ</language>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">ⴰⵏⴳⵉⵍⴰ</territory>
 			<territory type="AL">ⴰⵍⴱⴰⵏⵢⴰ</territory>
 			<territory type="AM">ⴰⵔⵎⵉⵏⵢⴰ</territory>
-			<territory type="AN">ⴰⵏⵜⵉⵢ ⵏ ⵀⵓⵍⴰⵏⴷⴰ</territory>
 			<territory type="AO">ⴰⵏⴳⵓⵍⴰ</territory>
 			<territory type="AR">ⴰⵔⵊⴰⵏⵜⵉⵏ</territory>
 			<territory type="AS">ⵙⴰⵎⵡⴰ ⵜⴰⵎⵉⵔⵉⴽⴰⵏⵉⵜ</territory>
@@ -433,6 +431,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">ⵜⵉⴼⴰⵡⵜ</dayPeriod>
+							<dayPeriod type="pm">ⵜⴰⴷⴳⴳⵯⴰⵜ</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">ⵜⵉⴼⴰⵡⵜ</dayPeriod>
 							<dayPeriod type="pm">ⵜⴰⴷⴳⴳⵯⴰⵜ</dayPeriod>
@@ -471,28 +473,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
 				<dateTimeFormats>
 					<availableFormats>
 						<dateFormatItem id="M">M</dateFormatItem>
@@ -567,6 +547,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0K¤</pattern>
+					<pattern type="1000" count="few" draft="provisional">0K¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0K¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00K¤</pattern>
+					<pattern type="10000" count="few" draft="provisional">00K¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000K¤</pattern>
+					<pattern type="100000" count="few" draft="provisional">000K¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0M¤</pattern>
+					<pattern type="1000000" count="few" draft="provisional">0M¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00M¤</pattern>
+					<pattern type="10000000" count="few" draft="provisional">00M¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000M¤</pattern>
+					<pattern type="100000000" count="few" draft="provisional">000M¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0G¤</pattern>
+					<pattern type="1000000000" count="few" draft="provisional">0G¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00G¤</pattern>
+					<pattern type="10000000000" count="few" draft="provisional">00G¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000G¤</pattern>
+					<pattern type="100000000000" count="few" draft="provisional">000G¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0T¤</pattern>
+					<pattern type="1000000000000" count="few" draft="provisional">0T¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00T¤</pattern>
+					<pattern type="10000000000000" count="few" draft="provisional">00T¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000T¤</pattern>
+					<pattern type="100000000000000" count="few" draft="provisional">000T¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -746,3 +766,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/shi_Latn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Latn.xml
similarity index 82%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/shi_Latn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Latn.xml
index 69311bc0e93..fdbaf4aefd3 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/shi_Latn.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Latn.xml
@@ -1,63 +1,62 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="shi"/>
 		<script type="Latn"/>
 	</identity>
 	<localeDisplayNames>
 		<languages>
-			<language type="ak">takant</language>
-			<language type="am">tamharit</language>
-			<language type="ar">taɛrabt</language>
-			<language type="be">tabilarust</language>
-			<language type="bg">tablɣarit</language>
-			<language type="bn">tabnɣalit</language>
-			<language type="cs">tatcikit</language>
-			<language type="de">talimant</language>
-			<language type="el">tagrigit</language>
-			<language type="en">tanglizt</language>
-			<language type="es">tasbnyulit</language>
-			<language type="fa">tafursit</language>
-			<language type="fr">tafransist</language>
-			<language type="ha">tahawsat</language>
-			<language type="hi">tahindit</language>
-			<language type="hu">tahnɣarit</language>
-			<language type="id">tandunisit</language>
-			<language type="ig">tigbut</language>
-			<language type="it">taṭalyant</language>
-			<language type="ja">tajabbunit</language>
-			<language type="jv">tajavanit</language>
-			<language type="km">taxmirt</language>
-			<language type="ko">takurit</language>
-			<language type="ms">tamalawit</language>
-			<language type="my">tabirmanit</language>
-			<language type="ne">tanibalit</language>
-			<language type="nl">tahulandit</language>
-			<language type="pa">tabnjabit</language>
-			<language type="pl">tabulunit</language>
-			<language type="pt">tabṛṭqizt</language>
-			<language type="ro">tarumanit</language>
-			<language type="ru">tarusit</language>
-			<language type="rw">taruwandit</language>
-			<language type="shi">tamazight</language>
-			<language type="so">tasumalit</language>
-			<language type="sv">taswidit</language>
-			<language type="ta">tatamilt</language>
-			<language type="th">tataylandit</language>
-			<language type="tr">taturkit</language>
-			<language type="uk">tukranit</language>
-			<language type="ur">turdut</language>
-			<language type="vi">tafitnamit</language>
-			<language type="yo">tayrubat</language>
-			<language type="zh">tacinwit</language>
-			<language type="zu">tazulut</language>
+			<language type="ak">Takant</language>
+			<language type="am">Tamharit</language>
+			<language type="ar">Taɛrabt</language>
+			<language type="be">Tabilarust</language>
+			<language type="bg">Tablɣarit</language>
+			<language type="bn">Tabnɣalit</language>
+			<language type="cs">Tatcikit</language>
+			<language type="de">Talimant</language>
+			<language type="el">Tagrigit</language>
+			<language type="en">Tanglizt</language>
+			<language type="es">Tasbnyulit</language>
+			<language type="fa">Tafursit</language>
+			<language type="fr">Tafransist</language>
+			<language type="ha">Tahawsat</language>
+			<language type="hi">Tahindit</language>
+			<language type="hu">Tahnɣarit</language>
+			<language type="id">Tandunisit</language>
+			<language type="ig">Tigbut</language>
+			<language type="it">Taṭalyant</language>
+			<language type="ja">Tajabbunit</language>
+			<language type="jv">Tajavanit</language>
+			<language type="km">Taxmirt</language>
+			<language type="ko">Takurit</language>
+			<language type="ms">Tamalawit</language>
+			<language type="my">Tabirmanit</language>
+			<language type="ne">Tanibalit</language>
+			<language type="nl">Tahulandit</language>
+			<language type="pa">Tabnjabit</language>
+			<language type="pl">Tabulunit</language>
+			<language type="pt">Tabṛṭqizt</language>
+			<language type="ro">Tarumanit</language>
+			<language type="ru">Tarusit</language>
+			<language type="rw">Taruwandit</language>
+			<language type="shi">Tashelḥiyt</language>
+			<language type="so">Tasumalit</language>
+			<language type="sv">Taswidit</language>
+			<language type="ta">Tatamilt</language>
+			<language type="th">Tataylandit</language>
+			<language type="tr">Taturkit</language>
+			<language type="uk">Tukranit</language>
+			<language type="ur">Turdut</language>
+			<language type="vi">Tafitnamit</language>
+			<language type="yo">Tayrubat</language>
+			<language type="zh">Tacinwit</language>
+			<language type="zu">Tazulut</language>
 		</languages>
 		<territories>
 			<territory type="AD">andura</territory>
@@ -67,7 +66,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">angila</territory>
 			<territory type="AL">albanya</territory>
 			<territory type="AM">arminya</territory>
-			<territory type="AN">antiy n hulanda</territory>
 			<territory type="AO">angula</territory>
 			<territory type="AR">arjantin</territory>
 			<territory type="AS">samwa tamirikanit</territory>
@@ -435,6 +433,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">tifawt</dayPeriod>
+							<dayPeriod type="pm">tadggʷat</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">tifawt</dayPeriod>
 							<dayPeriod type="pm">tadggʷat</dayPeriod>
@@ -473,28 +475,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
 				<dateTimeFormats>
 					<availableFormats>
 						<dateFormatItem id="M">M</dateFormatItem>
@@ -569,6 +549,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0K¤</pattern>
+					<pattern type="1000" count="few" draft="provisional">0K¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0K¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00K¤</pattern>
+					<pattern type="10000" count="few" draft="provisional">00K¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000K¤</pattern>
+					<pattern type="100000" count="few" draft="provisional">000K¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0M¤</pattern>
+					<pattern type="1000000" count="few" draft="provisional">0M¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00M¤</pattern>
+					<pattern type="10000000" count="few" draft="provisional">00M¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000M¤</pattern>
+					<pattern type="100000000" count="few" draft="provisional">000M¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0G¤</pattern>
+					<pattern type="1000000000" count="few" draft="provisional">0G¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00G¤</pattern>
+					<pattern type="10000000000" count="few" draft="provisional">00G¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000G¤</pattern>
+					<pattern type="100000000000" count="few" draft="provisional">000G¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0T¤</pattern>
+					<pattern type="1000000000000" count="few" draft="provisional">0T¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00T¤</pattern>
+					<pattern type="10000000000000" count="few" draft="provisional">00T¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000T¤</pattern>
+					<pattern type="100000000000000" count="few" draft="provisional">000T¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -748,3 +768,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/shi_Latn_MA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Latn_MA.xml
similarity index 69%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/shi_Latn_MA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Latn_MA.xml
index e5524662d40..67c9dc88f55 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/shi_Latn_MA.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Latn_MA.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="shi"/>
 		<script type="Latn"/>
 		<territory type="MA"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/shi_Tfng.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Tfng.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/shi_Tfng.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Tfng.xml
index 4241aaeb6ef..accc34febf6 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/shi_Tfng.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Tfng.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="shi"/>
 		<script type="Tfng"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/shi_Tfng_MA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Tfng_MA.xml
similarity index 69%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/shi_Tfng_MA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Tfng_MA.xml
index a107d88ab0d..85d545098d2 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/shi_Tfng_MA.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Tfng_MA.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="shi"/>
 		<script type="Tfng"/>
 		<territory type="MA"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/si.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/si.xml
similarity index 90%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/si.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/si.xml
index c7172ce3445..07eeace156b 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/si.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/si.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12384 $"/>
 		<language type="si"/>
 	</identity>
 	<localeDisplayNames>
@@ -35,6 +34,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bem">බෙම්බා</language>
 			<language type="bez">බෙනා</language>
 			<language type="bg">බල්ගේරියානු</language>
+			<language type="bgn">බටහිර බලොචි</language>
 			<language type="bm">බම්බරා</language>
 			<language type="bn">බෙංගාලි</language>
 			<language type="bo">ටිබෙට්</language>
@@ -42,11 +42,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="brx">බොඩො</language>
 			<language type="bs">බොස්නියානු</language>
 			<language type="ca">කැටලන්</language>
+			<language type="ce">චෙච්නියානු</language>
 			<language type="cgg">චිගා</language>
 			<language type="chr">චෙරොකී</language>
 			<language type="ckb">සොරානි කුර්දිෂ්</language>
 			<language type="co">ක්‍රොඑශියානු</language>
 			<language type="cs">චෙත්</language>
+			<language type="cv">චවේෂ්</language>
 			<language type="cy">වේල්ස්</language>
 			<language type="da">ඩැනිශ්</language>
 			<language type="dav">ටයිටා</language>
@@ -140,6 +142,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lkt">ලකොට</language>
 			<language type="ln">ලින්ගලා</language>
 			<language type="lo">ලාඕ</language>
+			<language type="lrc">උතුරු ලුරි</language>
 			<language type="lt">ලිතුවේනියානු</language>
 			<language type="lu">ලු</language>
 			<language type="luo">ලුඔ</language>
@@ -161,9 +164,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mt">මොල්ටිස්</language>
 			<language type="mua">මුන්ඩන්</language>
 			<language type="my">බුරුම</language>
+			<language type="mzn">මැසන්ඩරනි</language>
 			<language type="naq">නාමා</language>
 			<language type="nb">නෝවේජියානු බොක්මාල්</language>
 			<language type="nd">උතුරු එන්ඩිබෙලෙ</language>
+			<language type="nds">පහළ ජර්මන්</language>
+			<language type="nds_NL">පහළ සැක්සන්</language>
 			<language type="ne">නේපාල</language>
 			<language type="nl">ලන්දේසි</language>
 			<language type="nl_BE">ෆ්ලෙමිශ්</language>
@@ -185,6 +191,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="rm">රොමෑන්ශ්</language>
 			<language type="rn">රුන්ඩි</language>
 			<language type="ro">රොමේනියානු</language>
+			<language type="ro_MD">මොල්ඩෝවාව</language>
 			<language type="rof">රෝම්බෝ</language>
 			<language type="ru">රුසියානු</language>
 			<language type="rw">කින්යර්වන්ඩා</language>
@@ -193,6 +200,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="saq">සම්බුරු</language>
 			<language type="sbp">සංගු</language>
 			<language type="sd">සින්ධි</language>
+			<language type="sdh">දකුණු කුර්දි</language>
 			<language type="se">උතුරු සාමි</language>
 			<language type="seh">සෙනා</language>
 			<language type="ses">කෝයිරාබොරො සෙන්නි</language>
@@ -212,7 +220,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="su">සන්ඩනීසියානු</language>
 			<language type="sv">ස්වීඩන්</language>
 			<language type="sw">ස්වාහිලි</language>
-			<language type="swc">කොන්ගෝ ස්වාහිලි</language>
+			<language type="sw_CD">කොන්ගෝ ස්වාහිලි</language>
 			<language type="ta">දෙමළ</language>
 			<language type="te">තෙළිඟු</language>
 			<language type="teo">ටෙසෝ</language>
@@ -233,6 +241,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="vai">වයි</language>
 			<language type="vi">වියට්නාම්</language>
 			<language type="vun">වුන්ජෝ</language>
+			<language type="wbp">වොපිරි</language>
 			<language type="wo">වොලොෆ්</language>
 			<language type="xh">ශෝසා</language>
 			<language type="xog">සොගා</language>
@@ -326,7 +335,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">ඇන්ගුයිලාව</territory>
 			<territory type="AL">ඇල්බේනියාව</territory>
 			<territory type="AM">ආර්මේනියාව</territory>
-			<territory type="AN">නෙදර්ලන්ත ඇන්ටිලීසිය</territory>
 			<territory type="AO">ඇන්ගෝලාව</territory>
 			<territory type="AQ">ඇන්ටාක්ටිකාව</territory>
 			<territory type="AR">ආර්ජෙන්ටිනාව</territory>
@@ -594,59 +602,72 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="calendar">දින දර්ශනය</key>
 			<key type="collation">පෙළගැස්ම</key>
 			<key type="currency">විනිමය</key>
+			<key type="hc">පැය චක්‍රය</key>
+			<key type="lb">පේළි කඩන විලාසය</key>
+			<key type="ms">මිනුම් ක්‍රමය</key>
 			<key type="numbers">ඉලක්කම්</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">ඉන්දු අරාබි ඉලක්කම්</type>
-			<type type="arabext" key="numbers">වැඩි කළ ඉන්දු අරාබි ඉලක්කම්</type>
-			<type type="armn" key="numbers">ඇමරිකානු සංඛ්‍යාංකන</type>
-			<type type="armnlow" key="numbers">ඇමරිකානු කුඩා සංඛ්‍යාංකන</type>
-			<type type="beng" key="numbers">බෙංගාලි ඉලක්කම්</type>
-			<type type="buddhist" key="calendar">බොදු දින දර්ශනය</type>
-			<type type="chinese" key="calendar">චීන දින දර්ශනය</type>
-			<type type="dangi" key="calendar">ඩැන්ගී දින දර්ශනය</type>
-			<type type="deva" key="numbers">දේවනාගරී ඉලක්කම්</type>
-			<type type="dictionary" key="collation">ශබ්දකෝෂ පෙළගැස්ම</type>
-			<type type="ducet" key="collation">යුනිකේත පෙරනිමි පෙළගැස්ම</type>
-			<type type="ethi" key="numbers">ඉතියෝපියානු සංඛ්‍යාංකන</type>
-			<type type="ethiopic" key="calendar">ඉතියෝපියානු දින දර්ශනය</type>
-			<type type="fullwide" key="numbers">සම්පූර්ණ පළල ඉලක්කම්</type>
-			<type type="geor" key="numbers">ජෝජියානු සංඛ්‍යාංකන</type>
-			<type type="gregorian" key="calendar">ග්‍රෙගරියානු දින දර්ශනය</type>
-			<type type="grek" key="numbers">ග්‍රීක සංඛ්‍යාංකන</type>
-			<type type="greklow" key="numbers">ග්‍රීක කුඩා සංඛ්‍යාංකන</type>
-			<type type="gujr" key="numbers">ගුජරාටි ඉලක්කම්</type>
-			<type type="guru" key="numbers">ගුර්මුකී ඉලක්කම්</type>
-			<type type="hanidec" key="numbers">චීන දශමය සංඛ්‍යාංකන</type>
-			<type type="hans" key="numbers">සුළුකළ චීන සංඛ්‍යාංකන</type>
-			<type type="hansfin" key="numbers">සුළුකළ චීන මුල්‍යමය සංඛ්‍යාංකන</type>
-			<type type="hant" key="numbers">සාම්ප්‍රදායික චීන සංඛ්‍යාංකන</type>
-			<type type="hantfin" key="numbers">සාම්ප්‍රදායික චීන මුල්‍යමය සංඛ්‍යාංකන</type>
-			<type type="hebr" key="numbers">හීබෲ සංඛ්‍යාංකන</type>
-			<type type="hebrew" key="calendar">හීබෲ දින දර්ශනය</type>
-			<type type="islamic" key="calendar">ඉස්ලාමීය දින දර්ශනය</type>
-			<type type="iso8601" key="calendar">අඑස්ඔ-8601 දින දර්ශනය</type>
-			<type type="japanese" key="calendar">ජපන් දින දර්ශනය</type>
-			<type type="jpan" key="numbers">ජපාන සංඛ්‍යාංකන</type>
-			<type type="jpanfin" key="numbers">ජපාන මුල්‍යමය සංඛ්‍යාංකන</type>
-			<type type="khmr" key="numbers">කමර් ඉලක්කම්</type>
-			<type type="knda" key="numbers">කන්නඩ ඉලක්කම්</type>
-			<type type="laoo" key="numbers">ලාඕ ඉලක්කම්</type>
-			<type type="latn" key="numbers">බටහිර ඉලක්කම්</type>
-			<type type="mlym" key="numbers">මලයාලම් ඉලක්කම්</type>
-			<type type="mymr" key="numbers">බුරුම ඉලක්කම්</type>
-			<type type="orya" key="numbers">ඔරියා ඉලක්කම්</type>
-			<type type="persian" key="calendar">පර්සියානු දින දර්ශනය</type>
-			<type type="roc" key="calendar">මින්ගා දින දර්ශනය</type>
-			<type type="roman" key="numbers">රෝමානු සංඛ්‍යාංකන</type>
-			<type type="romanlow" key="numbers">රෝමානු කුඩා සංඛ්‍යාංකන</type>
-			<type type="search" key="collation">සාමාන්‍ය සෙවීම</type>
-			<type type="standard" key="collation">සම්මත පෙළගැස්ම</type>
-			<type type="taml" key="numbers">සාම්ප්‍රදායික දෙමළ සංඛ්‍යාංකන</type>
-			<type type="tamldec" key="numbers">දෙමළ ඉලක්කම්</type>
-			<type type="telu" key="numbers">තෙළිඟු ඉලක්කම්</type>
-			<type type="thai" key="numbers">තායි ඉලක්කම්</type>
-			<type type="tibt" key="numbers">ටිබෙට ඉලක්කම්</type>
+			<type key="calendar" type="buddhist">බොදු දින දර්ශනය</type>
+			<type key="calendar" type="chinese">චීන දින දර්ශනය</type>
+			<type key="calendar" type="dangi">ඩැන්ගී දින දර්ශනය</type>
+			<type key="calendar" type="ethiopic">ඉතියෝපියානු දින දර්ශනය</type>
+			<type key="calendar" type="gregorian">ග්‍රෙගරියානු දින දර්ශනය</type>
+			<type key="calendar" type="hebrew">හීබෲ දින දර්ශනය</type>
+			<type key="calendar" type="islamic">ඉස්ලාමීය දින දර්ශනය</type>
+			<type key="calendar" type="iso8601">අඑස්ඔ-8601 දින දර්ශනය</type>
+			<type key="calendar" type="japanese">ජපන් දින දර්ශනය</type>
+			<type key="calendar" type="persian">පර්සියානු දින දර්ශනය</type>
+			<type key="calendar" type="roc">මින්ගා දින දර්ශනය</type>
+			<type key="collation" type="dictionary">ශබ්දකෝෂ පෙළගැස්ම</type>
+			<type key="collation" type="ducet">යුනිකේත පෙරනිමි පෙළගැස්ම</type>
+			<type key="collation" type="search">සාමාන්‍ය සෙවීම</type>
+			<type key="collation" type="standard">සම්මත පෙළගැස්ම</type>
+			<type key="hc" type="h11">පැය 12 ක්‍රමය</type>
+			<type key="hc" type="h12">පැය 12 ක්‍රමය</type>
+			<type key="hc" type="h23">පැය 24 ක්‍රමය</type>
+			<type key="hc" type="h24">පැය 24 ක්‍රමය</type>
+			<type key="lb" type="loose">ලිහිල් කඩන විලාසය</type>
+			<type key="lb" type="normal">සාමාන්‍ය පේළි කඩන විලාසය</type>
+			<type key="lb" type="strict">තද පේළි කඩන විලාසය</type>
+			<type key="ms" type="metric">මෙට්‍රික් ක්‍රමය</type>
+			<type key="ms" type="uksystem">රාජකීය මිනුම් ක්‍රමය</type>
+			<type key="ms" type="ussystem">එජ මිනුම් ක්‍රමය</type>
+			<type key="numbers" type="arab">ඉන්දු අරාබි ඉලක්කම්</type>
+			<type key="numbers" type="arabext">වැඩි කළ ඉන්දු අරාබි ඉලක්කම්</type>
+			<type key="numbers" type="armn">ඇමරිකානු සංඛ්‍යාංකන</type>
+			<type key="numbers" type="armnlow">ඇමරිකානු කුඩා සංඛ්‍යාංකන</type>
+			<type key="numbers" type="beng">බෙංගාලි ඉලක්කම්</type>
+			<type key="numbers" type="deva">දේවනාගරී ඉලක්කම්</type>
+			<type key="numbers" type="ethi">ඉතියෝපියානු සංඛ්‍යාංකන</type>
+			<type key="numbers" type="fullwide">සම්පූර්ණ පළල ඉලක්කම්</type>
+			<type key="numbers" type="geor">ජෝජියානු සංඛ්‍යාංකන</type>
+			<type key="numbers" type="grek">ග්‍රීක සංඛ්‍යාංකන</type>
+			<type key="numbers" type="greklow">ග්‍රීක කුඩා සංඛ්‍යාංකන</type>
+			<type key="numbers" type="gujr">ගුජරාටි ඉලක්කම්</type>
+			<type key="numbers" type="guru">ගුර්මුකී ඉලක්කම්</type>
+			<type key="numbers" type="hanidec">චීන දශමය සංඛ්‍යාංකන</type>
+			<type key="numbers" type="hans">සුළුකළ චීන සංඛ්‍යාංකන</type>
+			<type key="numbers" type="hansfin">සුළුකළ චීන මුල්‍යමය සංඛ්‍යාංකන</type>
+			<type key="numbers" type="hant">සාම්ප්‍රදායික චීන සංඛ්‍යාංකන</type>
+			<type key="numbers" type="hantfin">සාම්ප්‍රදායික චීන මුල්‍යමය සංඛ්‍යාංකන</type>
+			<type key="numbers" type="hebr">හීබෲ සංඛ්‍යාංකන</type>
+			<type key="numbers" type="jpan">ජපාන සංඛ්‍යාංකන</type>
+			<type key="numbers" type="jpanfin">ජපාන මුල්‍යමය සංඛ්‍යාංකන</type>
+			<type key="numbers" type="khmr">කමර් ඉලක්කම්</type>
+			<type key="numbers" type="knda">කන්නඩ ඉලක්කම්</type>
+			<type key="numbers" type="laoo">ලාඕ ඉලක්කම්</type>
+			<type key="numbers" type="latn">බටහිර ඉලක්කම්</type>
+			<type key="numbers" type="mlym">මලයාලම් ඉලක්කම්</type>
+			<type key="numbers" type="mymr">බුරුම ඉලක්කම්</type>
+			<type key="numbers" type="orya">ඔරියා ඉලක්කම්</type>
+			<type key="numbers" type="roman">රෝමානු සංඛ්‍යාංකන</type>
+			<type key="numbers" type="romanlow">රෝමානු කුඩා සංඛ්‍යාංකන</type>
+			<type key="numbers" type="taml">සාම්ප්‍රදායික දෙමළ සංඛ්‍යාංකන</type>
+			<type key="numbers" type="tamldec">දෙමළ ඉලක්කම්</type>
+			<type key="numbers" type="telu">තෙළිඟු ඉලක්කම්</type>
+			<type key="numbers" type="thai">තායි ඉලක්කම්</type>
+			<type key="numbers" type="tibt">ටිබෙට ඉලක්කම්</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">මෙට්රික්</measurementSystemName>
@@ -725,6 +746,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">G y</dateFormatItem>
 						<dateFormatItem id="GyMMM">G y MMM</dateFormatItem>
@@ -742,6 +764,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
 						<dateFormatItem id="MMMEd">MMM d E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="ms">mm.ss</dateFormatItem>
 						<dateFormatItem id="y">G y</dateFormatItem>
 						<dateFormatItem id="yyyy">G y</dateFormatItem>
@@ -751,6 +774,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">G y MMM</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">G y MMM d</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">G y MMM d, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y MMMM</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">G y QQQ</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">G y QQQQ</dateFormatItem>
 					</availableFormats>
@@ -767,22 +791,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="H">HH–HH</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a">a h:mm – a h:mm</greatestDifference>
+							<greatestDifference id="a">a h.mm – a h.mm</greatestDifference>
 							<greatestDifference id="h">a h.mm – h.mm</greatestDifference>
 							<greatestDifference id="m">a h.mm – h.mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hm">
-							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="H">HH.mm–HH.mm</greatestDifference>
+							<greatestDifference id="m">HH.mm–HH.mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
 							<greatestDifference id="a">a h.mm – a hhh.mm v</greatestDifference>
 							<greatestDifference id="h">a h.mm – h.mm v</greatestDifference>
-							<greatestDifference id="m">a h:mm – h.mm v</greatestDifference>
+							<greatestDifference id="m">a h.mm – h.mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H">HH:mm–HH:mm v</greatestDifference>
-							<greatestDifference id="m">HHmm–HHmm v</greatestDifference>
+							<greatestDifference id="H">HH.mm–HH.mm v</greatestDifference>
+							<greatestDifference id="m">HH.mm–HH.mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a">a h – a h v</greatestDifference>
@@ -1064,28 +1088,92 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">පෙ</dayPeriod>
-							<dayPeriod type="noon">ම</dayPeriod>
-							<dayPeriod type="pm">ප</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">මැදියම</dayPeriod>
 							<dayPeriod type="am">පෙ.ව.</dayPeriod>
 							<dayPeriod type="noon">මධ්‍යාහ්නය</dayPeriod>
 							<dayPeriod type="pm">ප.ව.</dayPeriod>
+							<dayPeriod type="morning1">පාන්දර</dayPeriod>
+							<dayPeriod type="morning2">උදේ</dayPeriod>
+							<dayPeriod type="afternoon1">දවල්</dayPeriod>
+							<dayPeriod type="evening1">හවස</dayPeriod>
+							<dayPeriod type="night1">රෑ</dayPeriod>
+							<dayPeriod type="night2">මැදියමට පසු</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">මැ</dayPeriod>
+							<dayPeriod type="am">පෙ</dayPeriod>
+							<dayPeriod type="noon">ම</dayPeriod>
+							<dayPeriod type="pm">ප</dayPeriod>
+							<dayPeriod type="morning1">පා</dayPeriod>
+							<dayPeriod type="morning2">උ</dayPeriod>
+							<dayPeriod type="afternoon1">ද</dayPeriod>
+							<dayPeriod type="evening1">හ</dayPeriod>
+							<dayPeriod type="night1">රෑ</dayPeriod>
+							<dayPeriod type="night2">මැ</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">මැදියම</dayPeriod>
+							<dayPeriod type="am">පෙ.ව.</dayPeriod>
+							<dayPeriod type="noon">මධ්‍යාහ්නය</dayPeriod>
+							<dayPeriod type="pm">ප.ව.</dayPeriod>
+							<dayPeriod type="morning1">පාන්දර</dayPeriod>
+							<dayPeriod type="morning2">උදේ</dayPeriod>
+							<dayPeriod type="afternoon1">දවල්</dayPeriod>
+							<dayPeriod type="evening1">හවස</dayPeriod>
+							<dayPeriod type="night1">රෑ</dayPeriod>
+							<dayPeriod type="night2">මැදියමට පසු</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">මැදියම</dayPeriod>
+							<dayPeriod type="am">පෙ.ව.</dayPeriod>
+							<dayPeriod type="noon">මධ්‍යාහ්නය</dayPeriod>
+							<dayPeriod type="pm">ප.ව.</dayPeriod>
+							<dayPeriod type="morning1">පාන්දර</dayPeriod>
+							<dayPeriod type="morning2">උදේ</dayPeriod>
+							<dayPeriod type="afternoon1">දවල්</dayPeriod>
+							<dayPeriod type="evening1">හවස</dayPeriod>
+							<dayPeriod type="night1">රෑ</dayPeriod>
+							<dayPeriod type="night2">මැදියමට පසු</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">මැ</dayPeriod>
+							<dayPeriod type="am">පෙ</dayPeriod>
+							<dayPeriod type="noon">ද</dayPeriod>
+							<dayPeriod type="pm">ප</dayPeriod>
+							<dayPeriod type="morning1">පා</dayPeriod>
+							<dayPeriod type="morning2">උ</dayPeriod>
+							<dayPeriod type="afternoon1">ද</dayPeriod>
+							<dayPeriod type="evening1">හ</dayPeriod>
+							<dayPeriod type="night1">රෑ</dayPeriod>
+							<dayPeriod type="night2">මැ</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">මැදියම</dayPeriod>
+							<dayPeriod type="am">පෙ.ව.</dayPeriod>
+							<dayPeriod type="noon">මධ්‍යාහ්නය</dayPeriod>
+							<dayPeriod type="pm">ප.ව.</dayPeriod>
+							<dayPeriod type="morning1">පාන්දර</dayPeriod>
+							<dayPeriod type="morning2">උදේ</dayPeriod>
+							<dayPeriod type="afternoon1">දවල්</dayPeriod>
+							<dayPeriod type="evening1">හවස</dayPeriod>
+							<dayPeriod type="night1">රෑ</dayPeriod>
+							<dayPeriod type="night2">මැදියමට පසු</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
-						<era type="0">ක්‍රිස්තු පූර්‍ව</era>
-						<era type="0" alt="variant">පො.යු.පෙ</era>
-						<era type="1">ක්‍රිස්තු වර්‍ෂ</era>
-						<era type="1" alt="variant">පො.යු</era>
+						<era type="0">ක්‍රිස්තු පූර්ව</era>
+						<era type="0" alt="variant">පොදු යුගයට පෙර</era>
+						<era type="1">ක්‍රිස්තු වර්ෂ</era>
+						<era type="1" alt="variant">පොදු යුගය</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">ක්‍රි.පූ.</era>
-						<era type="0" alt="variant">පො.යු.පෙ</era>
+						<era type="0" alt="variant">පොපෙ</era>
 						<era type="1">ක්‍රි.ව.</era>
 						<era type="1" alt="variant">පො.යු</era>
 					</eraAbbr>
@@ -1115,22 +1203,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>a h.mm.ss zzzz</pattern>
+							<pattern>HH.mm.ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>a h.mm.ss z</pattern>
+							<pattern>HH.mm.ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>a h.mm.ss</pattern>
+							<pattern>HH.mm.ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>a h.mm</pattern>
+							<pattern>HH.mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -1160,9 +1248,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Ehm">E a h.mm</dateFormatItem>
-						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
+						<dateFormatItem id="EHm">E HH.mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E a h.mm.ss</dateFormatItem>
-						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="EHms">E HH.mm.ss</dateFormatItem>
 						<dateFormatItem id="Gy">G y</dateFormatItem>
 						<dateFormatItem id="GyMMM">G y MMM</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G y MMM d</dateFormatItem>
@@ -1170,15 +1258,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="h">a h</dateFormatItem>
 						<dateFormatItem id="H">HH</dateFormatItem>
 						<dateFormatItem id="hm">a h.mm</dateFormatItem>
-						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
+						<dateFormatItem id="Hm">HH.mm</dateFormatItem>
 						<dateFormatItem id="hms">a h.mm.ss</dateFormatItem>
-						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="Hms">HH.mm.ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h.mm.ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH.mm.ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h.mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH.mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">M-d</dateFormatItem>
 						<dateFormatItem id="MEd">M-d, E</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
 						<dateFormatItem id="MMMEd">MMM d E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="ms">mm.ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">y-M</dateFormatItem>
@@ -1187,6 +1280,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yMMM">y MMM</dateFormatItem>
 						<dateFormatItem id="yMMMd">y MMM d</dateFormatItem>
 						<dateFormatItem id="yMMMEd">y MMM d, E</dateFormatItem>
+						<dateFormatItem id="yMMMM">y MMMM</dateFormatItem>
 						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
 						<dateFormatItem id="yQQQQ">y QQQQ</dateFormatItem>
 					</availableFormats>
@@ -1211,8 +1305,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="m">a h.mm – h.mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hm">
-							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="H">HH.mm–HH.mm</greatestDifference>
+							<greatestDifference id="m">HH.mm–HH.mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
 							<greatestDifference id="a">a h.mm – a h.mm v</greatestDifference>
@@ -1220,8 +1314,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="m">a h.mm – h.mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H">HH:mm–HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="H">HH.mm–HH.mm v</greatestDifference>
+							<greatestDifference id="m">HH.mm–HH.mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a">a h – a h v</greatestDifference>
@@ -1301,67 +1395,82 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="0">මෙම වසර</relative>
 				<relative type="1">ඊළඟ වසර</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">වසර {0} කින්</relativeTimePattern>
-					<relativeTimePattern count="other">වසර {0} කින්</relativeTimePattern>
+					<relativeTimePattern count="one">වසර {0}කින්</relativeTimePattern>
+					<relativeTimePattern count="other">වසර {0}කින්</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">වසර {0}ට පෙර</relativeTimePattern>
-					<relativeTimePattern count="other">වසර {0}ට පෙර</relativeTimePattern>
+					<relativeTimePattern count="one">වසර {0}කට පෙර</relativeTimePattern>
+					<relativeTimePattern count="other">වසර {0}කට පෙර</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="year-short">
 				<displayName>වර්.</displayName>
+				<relative type="-1">පසුගිය වසර</relative>
+				<relative type="0">මෙම වසර</relative>
+				<relative type="1">ඊළඟ වසර</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">වසර {0} කින්</relativeTimePattern>
-					<relativeTimePattern count="other">වසර {0} කින්</relativeTimePattern>
+					<relativeTimePattern count="one">වසර {0}කින්</relativeTimePattern>
+					<relativeTimePattern count="other">වසර {0}කින්</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">වසර {0}ට පෙර</relativeTimePattern>
-					<relativeTimePattern count="other">වසර {0}ට පෙර</relativeTimePattern>
+					<relativeTimePattern count="one">වසර {0}කට පෙර</relativeTimePattern>
+					<relativeTimePattern count="other">වසර {0}කට පෙර</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="year-narrow">
 				<displayName>වර්.</displayName>
+				<relative type="-1">පසුගිය වසර</relative>
+				<relative type="0">මෙම වසර</relative>
+				<relative type="1">ඊළඟ වසර</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">වසර {0} කින්</relativeTimePattern>
-					<relativeTimePattern count="other">වසර {0} කින්</relativeTimePattern>
+					<relativeTimePattern count="one">වසර {0}කින්</relativeTimePattern>
+					<relativeTimePattern count="other">වසර {0}කින්</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">වසර {0}ට පෙර</relativeTimePattern>
-					<relativeTimePattern count="other">වසර {0}ට පෙර</relativeTimePattern>
+					<relativeTimePattern count="one">වසර {0}කට පෙර</relativeTimePattern>
+					<relativeTimePattern count="other">වසර {0}කට පෙර</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter">
 				<displayName>කාර්තුව</displayName>
+				<relative type="-1">පසුගිය කාර්තුව</relative>
+				<relative type="0">මෙම කාර්තුව</relative>
+				<relative type="1">ඊළඟ කාර්තුව</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">කාර්තුව {0} කින්</relativeTimePattern>
-					<relativeTimePattern count="other">කාර්තුව {0} කින්</relativeTimePattern>
+					<relativeTimePattern count="one">කාර්තු {0}කින්</relativeTimePattern>
+					<relativeTimePattern count="other">කාර්තු {0}කින්</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">කාර්තුව {0} ට පෙර</relativeTimePattern>
-					<relativeTimePattern count="other">කාර්තුව {0} ට පෙර</relativeTimePattern>
+					<relativeTimePattern count="one">කාර්තු {0}කට පෙර</relativeTimePattern>
+					<relativeTimePattern count="other">කාර්තු {0}කට පෙර</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-short">
 				<displayName>කාර්.</displayName>
+				<relative type="-1">පසුගිය කාර්.</relative>
+				<relative type="0">මෙම කාර්.</relative>
+				<relative type="1">ඊළඟ කාර්.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">කාර්. {0} කින්</relativeTimePattern>
-					<relativeTimePattern count="other">කාර්. {0} කින්</relativeTimePattern>
+					<relativeTimePattern count="one">කාර්. {0}කින්</relativeTimePattern>
+					<relativeTimePattern count="other">කාර්. {0}කින්</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">කාර්. {0} ට පෙර</relativeTimePattern>
-					<relativeTimePattern count="other">කාර්. {0} ට පෙර</relativeTimePattern>
+					<relativeTimePattern count="one">කාර්. {0}කට පෙර</relativeTimePattern>
+					<relativeTimePattern count="other">කාර්. {0}කට පෙර</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-narrow">
 				<displayName>කාර්.</displayName>
+				<relative type="-1">පසුගිය කාර්.</relative>
+				<relative type="0">මෙම කාර්.</relative>
+				<relative type="1">ඊළඟ කාර්.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">කාර්. {0} කින්</relativeTimePattern>
-					<relativeTimePattern count="other">කාර්. {0} කින්</relativeTimePattern>
+					<relativeTimePattern count="one">කාර්. {0}කින්</relativeTimePattern>
+					<relativeTimePattern count="other">කාර්. {0}කින්</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">කාර්. {0} ට පෙර</relativeTimePattern>
-					<relativeTimePattern count="other">කාර්. {0} ට පෙර</relativeTimePattern>
+					<relativeTimePattern count="one">කාර්. {0}කට පෙර</relativeTimePattern>
+					<relativeTimePattern count="other">කාර්. {0}කට පෙර</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month">
@@ -1380,6 +1489,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>මාස.</displayName>
+				<relative type="-1">පසුගිය මාස.</relative>
+				<relative type="0">මෙම මාස.</relative>
+				<relative type="1">ඊළඟ මාස.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">මාස {0}කින්</relativeTimePattern>
 					<relativeTimePattern count="other">මාස {0}කින්</relativeTimePattern>
@@ -1391,6 +1503,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>මාස.</displayName>
+				<relative type="-1">පසුගිය මාස.</relative>
+				<relative type="0">මෙම මාස.</relative>
+				<relative type="1">ඊළඟ මාස.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">මාස {0}කින්</relativeTimePattern>
 					<relativeTimePattern count="other">මාස {0}කින්</relativeTimePattern>
@@ -1406,8 +1521,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="0">මෙම සතිය</relative>
 				<relative type="1">ඊළඟ සතිය</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">සති {0} කින්</relativeTimePattern>
-					<relativeTimePattern count="other">සති {0} කින්</relativeTimePattern>
+					<relativeTimePattern count="one">සති {0}කින්</relativeTimePattern>
+					<relativeTimePattern count="other">සති {0}කින්</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">සති {0}කට පෙර</relativeTimePattern>
@@ -1416,9 +1531,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>සති.</displayName>
+				<relative type="-1">පසුගිය සති.</relative>
+				<relative type="0">මෙම සති.</relative>
+				<relative type="1">ඊළඟ සති.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">සති {0} කින්</relativeTimePattern>
-					<relativeTimePattern count="other">සති {0} කින්</relativeTimePattern>
+					<relativeTimePattern count="one">සති {0}කින්</relativeTimePattern>
+					<relativeTimePattern count="other">සති {0}කින්</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">සති {0}කට පෙර</relativeTimePattern>
@@ -1427,9 +1545,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>සති.</displayName>
+				<relative type="-1">පසුගිය සති.</relative>
+				<relative type="0">මෙම සති.</relative>
+				<relative type="1">ඊළඟ සති.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">සති {0} කින්</relativeTimePattern>
-					<relativeTimePattern count="other">සති {0} කින්</relativeTimePattern>
+					<relativeTimePattern count="one">සති {0}කින්</relativeTimePattern>
+					<relativeTimePattern count="other">සති {0}කින්</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">සති {0}කට පෙර</relativeTimePattern>
@@ -1448,8 +1569,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">දින {0}න්</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">දින {0} ට පෙර</relativeTimePattern>
-					<relativeTimePattern count="other">දින {0} ට පෙර</relativeTimePattern>
+					<relativeTimePattern count="one">දින {0}කට පෙර</relativeTimePattern>
+					<relativeTimePattern count="other">දින {0}කට පෙර</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day-short">
@@ -1459,8 +1580,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">දින {0}න්</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">දින {0} ට පෙර</relativeTimePattern>
-					<relativeTimePattern count="other">දින {0} ට පෙර</relativeTimePattern>
+					<relativeTimePattern count="one">දින {0}කට පෙර</relativeTimePattern>
+					<relativeTimePattern count="other">දින {0}කට පෙර</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day-narrow">
@@ -1470,8 +1591,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">දින {0}න්</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">දින {0} ට පෙර</relativeTimePattern>
-					<relativeTimePattern count="other">දින {0} ට පෙර</relativeTimePattern>
+					<relativeTimePattern count="one">දින {0}කට පෙර</relativeTimePattern>
+					<relativeTimePattern count="other">දින {0}කට පෙර</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="weekday">
@@ -1588,75 +1709,75 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="hour">
 				<displayName>පැය</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">පැය {0} කින්</relativeTimePattern>
-					<relativeTimePattern count="other">පැය {0} කින්</relativeTimePattern>
+					<relativeTimePattern count="one">පැය {0}කින්</relativeTimePattern>
+					<relativeTimePattern count="other">පැය {0}කින්</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">පැය {0}ට පෙර</relativeTimePattern>
-					<relativeTimePattern count="other">පැය {0}ට පෙර</relativeTimePattern>
+					<relativeTimePattern count="one">පැය {0}කට පෙර</relativeTimePattern>
+					<relativeTimePattern count="other">පැය {0}කට පෙර</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-short">
 				<displayName>පැය</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">පැය {0} කින්</relativeTimePattern>
-					<relativeTimePattern count="other">පැය {0} කින්</relativeTimePattern>
+					<relativeTimePattern count="one">පැය {0}කින්</relativeTimePattern>
+					<relativeTimePattern count="other">පැය {0}කින්</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">පැය {0}ට පෙර</relativeTimePattern>
-					<relativeTimePattern count="other">පැය {0}ට පෙර</relativeTimePattern>
+					<relativeTimePattern count="one">පැය {0}කට පෙර</relativeTimePattern>
+					<relativeTimePattern count="other">පැය {0}කට පෙර</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-narrow">
 				<displayName>පැ</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">පැය {0} කින්</relativeTimePattern>
-					<relativeTimePattern count="other">පැය {0} කින්</relativeTimePattern>
+					<relativeTimePattern count="one">පැය {0}කින්</relativeTimePattern>
+					<relativeTimePattern count="other">පැය {0}කින්</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">පැය {0}ට පෙර</relativeTimePattern>
-					<relativeTimePattern count="other">පැය {0}ට පෙර</relativeTimePattern>
+					<relativeTimePattern count="one">පැය {0}කට පෙර</relativeTimePattern>
+					<relativeTimePattern count="other">පැය {0}කට පෙර</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute">
 				<displayName>මිනිත්තුව</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">මිනිත්තු {0} කින්</relativeTimePattern>
-					<relativeTimePattern count="other">මිනිත්තු {0} කින්</relativeTimePattern>
+					<relativeTimePattern count="one">මිනිත්තු {0}කින්</relativeTimePattern>
+					<relativeTimePattern count="other">මිනිත්තු {0}කින්</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">මිනිත්තු {0}ට පෙර</relativeTimePattern>
-					<relativeTimePattern count="other">මිනිත්තු {0}ට පෙර</relativeTimePattern>
+					<relativeTimePattern count="one">මිනිත්තු {0}කට පෙර</relativeTimePattern>
+					<relativeTimePattern count="other">මිනිත්තු {0}කට පෙර</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute-short">
 				<displayName>මිනි.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">මිනිත්තු {0} කින්</relativeTimePattern>
-					<relativeTimePattern count="other">මිනිත්තු {0} කින්</relativeTimePattern>
+					<relativeTimePattern count="one">මිනිත්තු {0}කින්</relativeTimePattern>
+					<relativeTimePattern count="other">මිනිත්තු {0}කින්</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">මිනිත්තු {0}ට පෙර</relativeTimePattern>
-					<relativeTimePattern count="other">මිනිත්තු {0}ට පෙර</relativeTimePattern>
+					<relativeTimePattern count="one">මිනිත්තු {0}කට පෙර</relativeTimePattern>
+					<relativeTimePattern count="other">මිනිත්තු {0}කට පෙර</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute-narrow">
 				<displayName>මි</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">මිනිත්තු {0} කින්</relativeTimePattern>
-					<relativeTimePattern count="other">මිනිත්තු {0} කින්</relativeTimePattern>
+					<relativeTimePattern count="one">මිනිත්තු {0}කින්</relativeTimePattern>
+					<relativeTimePattern count="other">මිනිත්තු {0}කින්</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">මිනිත්තු {0}ට පෙර</relativeTimePattern>
-					<relativeTimePattern count="other">මිනිත්තු {0}ට පෙර</relativeTimePattern>
+					<relativeTimePattern count="one">මිනිත්තු {0}කට පෙර</relativeTimePattern>
+					<relativeTimePattern count="other">මිනිත්තු {0}කට පෙර</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second">
 				<displayName>තත්පරය</displayName>
 				<relative type="0">දැන්</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">තත්පර {0} කින්</relativeTimePattern>
-					<relativeTimePattern count="other">තත්පර {0} කින්</relativeTimePattern>
+					<relativeTimePattern count="one">තත්පර {0}කින්</relativeTimePattern>
+					<relativeTimePattern count="other">තත්පර {0}කින්</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">තත්පර {0}කට පෙර</relativeTimePattern>
@@ -1666,8 +1787,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="second-short">
 				<displayName>තත්.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">තත්පර {0} කින්</relativeTimePattern>
-					<relativeTimePattern count="other">තත්පර {0} කින්</relativeTimePattern>
+					<relativeTimePattern count="one">තත්පර {0}කින්</relativeTimePattern>
+					<relativeTimePattern count="other">තත්පර {0}කින්</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">තත්පර {0}කට පෙර</relativeTimePattern>
@@ -1677,8 +1798,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="second-narrow">
 				<displayName>ත</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">තත්පර {0} කින්</relativeTimePattern>
-					<relativeTimePattern count="other">තත්පර {0} කින්</relativeTimePattern>
+					<relativeTimePattern count="one">තත්පර {0}කින්</relativeTimePattern>
+					<relativeTimePattern count="other">තත්පර {0}කින්</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">තත්පර {0}කට පෙර</relativeTimePattern>
@@ -1690,7 +1811,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 		</fields>
 		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
+			<hourFormat>+HH.mm;-HH.mm</hourFormat>
 			<gmtFormat>ග්‍රිමවේ{0}</gmtFormat>
 			<gmtZeroFormat>ග්‍රිමවේ</gmtZeroFormat>
 			<regionFormat>{0} වේලාව</regionFormat>
@@ -2564,6 +2685,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>පොර්ට් මොරෙස්බි</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>බෝගන්විලා</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>මැනිලා</exemplarCity>
 			</zone>
@@ -2648,6 +2772,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>ඉරකුට්ස්ක්</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>චිටා</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>යකුට්ස්ක්</exemplarCity>
 			</zone>
@@ -2666,6 +2793,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>මගඩන්</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>ශ්‍රෙඩ්නෙකෝලිම්සක්</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>කම්චට්කා</exemplarCity>
 			</zone>
@@ -3843,7 +3973,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<perMille>‰</perMille>
 			<infinity>∞</infinity>
 			<nan>NaN</nan>
-			<timeSeparator draft="contributed">:</timeSeparator>
+			<timeSeparator>.</timeSeparator>
 		</symbols>
 		<decimalFormats numberSystem="latn">
 			<decimalFormatLength>
@@ -3931,6 +4061,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">¤ද0</pattern>
+					<pattern type="1000" count="other">¤ද0</pattern>
+					<pattern type="10000" count="one">¤ද00</pattern>
+					<pattern type="10000" count="other">¤ද00</pattern>
+					<pattern type="100000" count="one">¤ද000</pattern>
+					<pattern type="100000" count="other">¤ද000</pattern>
+					<pattern type="1000000" count="one">¤මි0</pattern>
+					<pattern type="1000000" count="other">¤මි0</pattern>
+					<pattern type="10000000" count="one">¤මි00</pattern>
+					<pattern type="10000000" count="other">¤මි00</pattern>
+					<pattern type="100000000" count="one">¤මි000</pattern>
+					<pattern type="100000000" count="other">¤මි000</pattern>
+					<pattern type="1000000000" count="one">¤බි0</pattern>
+					<pattern type="1000000000" count="other">¤බි0</pattern>
+					<pattern type="10000000000" count="one">¤බි00</pattern>
+					<pattern type="10000000000" count="other">¤බි00</pattern>
+					<pattern type="100000000000" count="one">¤බි000</pattern>
+					<pattern type="100000000000" count="other">¤බි000</pattern>
+					<pattern type="1000000000000" count="one">¤ට්‍රි0</pattern>
+					<pattern type="1000000000000" count="other">¤ට්‍රි0</pattern>
+					<pattern type="10000000000000" count="one">¤ට්‍රි00</pattern>
+					<pattern type="10000000000000" count="other">¤ට්‍රි00</pattern>
+					<pattern type="100000000000000" count="one">¤ට්‍රි000</pattern>
+					<pattern type="100000000000000" count="other">¤ට්‍රි000</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{1}{0}</unitPattern>
 			<unitPattern count="other">{1}{0}</unitPattern>
 		</currencyFormats>
@@ -3970,6 +4128,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ඇන්ගෝලානු ක්වන්සා</displayName>
 				<displayName count="other">ඇන්ගෝලානු ක්වන්සා</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="ARS">
 				<displayName>ආර්ජන්ටිනා පෙසෝ</displayName>
@@ -4002,6 +4161,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">බොස්නියා හර්සගොවීනා පරිවර්ත්‍ය මාර්ක්</displayName>
 				<displayName count="other">බොස්නියා හර්සගොවීනා පරිවර්ත්‍ය මාර්ක්</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>බාබේඩියානු ඩොලර්</displayName>
@@ -4054,6 +4214,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">බොලිවියානු බොලිවියානෝ</displayName>
 				<displayName count="other">බොලිවියානු බොලිවියානෝ</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BRL">
 				<displayName>බ්‍රසීල රියල්</displayName>
@@ -4080,6 +4241,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">බොට්ස්වානා පුලා</displayName>
 				<displayName count="other">බොට්ස්වානා පුලා</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYR">
 				<displayName>බෙලරූස් රූබල්</displayName>
@@ -4147,6 +4309,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">මාරුකළ හැකි කියුබානු පැසෝ</displayName>
 				<displayName count="other">මාරුකළ හැකි කියුබානු පැසෝ</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>කියුබානු පැසෝ</displayName>
@@ -4166,6 +4329,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">චෙක් රිපබ්ලික් කොරූනා</displayName>
 				<displayName count="other">චෙක් රිපබ්ලික් කොරූනා</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DJF">
 				<displayName>ජිබූති ෆ්‍රෑන්ක්</displayName>
@@ -4178,6 +4342,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ඩැනිෂ් ක්‍රෝන්</displayName>
 				<displayName count="other">ඩැනිෂ් ක්‍රෝන්</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>ඩොමිනිකානු පෙසෝ</displayName>
@@ -4197,6 +4362,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ඊජිප්තු පවුම්</displayName>
 				<displayName count="other">ඊජිප්තු පවුම්</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>එරිත්‍රියානු නැක්ෆා</displayName>
@@ -4229,6 +4395,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ෆෝක්ලන්ඩ් දූපත් පවුම්</displayName>
 				<displayName count="other">ෆෝක්ලන්ඩ් දූපත් පවුම්</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GBP">
 				<displayName>බ්‍රිතාන්‍ය ස්ටර්ලින් පවුම්</displayName>
@@ -4242,6 +4409,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ජෝජියානු ලැරී</displayName>
 				<displayName count="other">ජෝජියානු ලැරී</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHS">
 				<displayName>ඝානා සෙඩි</displayName>
@@ -4267,12 +4435,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ගිනියානු ෆ්‍රෑන්ක්</displayName>
 				<displayName count="other">ගිනියානු ෆ්‍රෑන්ක්</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GTQ">
 				<displayName>ගෝතමාලානු ක්වෙට්සල්</displayName>
 				<displayName count="one">ගෝතමාලානු ක්වෙට්සල්</displayName>
 				<displayName count="other">ගෝතමාලානු ක්වෙට්සල්</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GYD">
 				<displayName>ගයනා ඩොලර්</displayName>
@@ -4293,12 +4463,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">හොන්ඩුරානු ලෙම්පිරා</displayName>
 				<displayName count="other">හොන්ඩුරානු ලෙම්පිරා</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRK">
 				<displayName>ක්‍රොඒෂියානු කූනා</displayName>
 				<displayName count="one">ක්‍රොඒෂියානු කූනා</displayName>
 				<displayName count="other">ක්‍රොඒෂියානු කූනා</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>හයිටි ගෝර්ඩ්</displayName>
@@ -4311,12 +4483,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">හංගේරියානු ෆරින්ට්</displayName>
 				<displayName count="other">හංගේරියානු ෆරින්ට්</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>ඉන්දුනීසියානු රුපියා</displayName>
 				<displayName count="one">ඉන්දුනීසියානු රුපියා</displayName>
 				<displayName count="other">ඉන්දුනීසියානු රුපියා</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="ILS">
 				<displayName>ඊශ්‍රායල නව ශෙකල්</displayName>
@@ -4349,6 +4523,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">අයිස්ලන්තික ක්‍රෝනා</displayName>
 				<displayName count="other">අයිස්ලන්තික ක්‍රෝනා</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="JMD">
 				<displayName>ජැමෙයිකානු ඩොලර්</displayName>
@@ -4394,12 +4569,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">කොමොරියානු ෆ්‍රෑන්ක්</displayName>
 				<displayName count="other">කොමොරියානු ෆ්‍රෑන්ක්</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>උතුරු කොරියානු වොන්</displayName>
 				<displayName count="one">උතුරු කොරියානු වොන්</displayName>
 				<displayName count="other">උතුරු කොරියානු වොන්</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>දකුණු කොරියානු වොන්</displayName>
@@ -4440,12 +4617,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ලෙබනන පවුම්</displayName>
 				<displayName count="other">ලෙබනන පවුම්</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>ශ්‍රී ලංකා රුපියල</displayName>
 				<displayName count="one">ශ්‍රී ලංකා රුපියල</displayName>
 				<displayName count="other">ශ්‍රී ලංකා රුපියල</displayName>
 				<symbol>රු.</symbol>
+				<symbol alt="narrow" draft="contributed">රු.</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>ලයිබේරියානු ඩොලර්</displayName>
@@ -4486,6 +4665,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">මලගාසි අරියාරි</displayName>
 				<displayName count="other">මලගාසි අරියාරි</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MKD">
 				<displayName>මැසඩෝනියානු ඩිනාර්</displayName>
@@ -4498,6 +4678,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">බුරුම ක්යාට්</displayName>
 				<displayName count="other">බුරුම ක්යාට්</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>මොන්ගෝලියානු ටග්‍රික්</displayName>
@@ -4523,6 +4704,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">මුරිසියානු රුපියල්</displayName>
 				<displayName count="other">මුරිසියානු රුපියල්</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>මාලදිවයින් රුෆියා</displayName>
@@ -4548,6 +4730,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">මැලේසියානු රින්ගිට්</displayName>
 				<displayName count="other">මැලේසියානු රින්ගිට්</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZN">
 				<displayName>මොසැම්බිකන් මෙටිකල්</displayName>
@@ -4574,18 +4757,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">නිකරගුවානු කොඩෝබා</displayName>
 				<displayName count="other">නිකරගුවානු කොඩෝබා</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NOK">
 				<displayName>නොර්වීජියන් ක්‍රෝන්</displayName>
 				<displayName count="one">නොර්වීජියන් ක්‍රෝන්</displayName>
 				<displayName count="other">නොර්වීජියන් ක්‍රෝන්</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>නේපාල රුපියල්</displayName>
 				<displayName count="one">නේපාල රුපියල්</displayName>
 				<displayName count="other">නේපාල රුපියල්</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>නවසීලන්ත ඩොලර්</displayName>
@@ -4630,12 +4816,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">පාකිස්ථාන රුපියල්</displayName>
 				<displayName count="other">පාකිස්ථාන රුපියල්</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>පොලිෂ් ස්ලොටි</displayName>
 				<displayName count="one">පොලිෂ් ස්ලොටි</displayName>
 				<displayName count="other">පොලිෂ් ස්ලොටි</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PYG">
 				<displayName>පැරගුවේ ගුවරානි</displayName>
@@ -4667,6 +4855,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">රුසියන් රූබල්</displayName>
 				<displayName count="other">රුසියන් රූබල්</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 				<symbol alt="variant">₽</symbol>
 			</currency>
 			<currency type="RWF">
@@ -4674,6 +4863,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">රුවන්ඩා ෆ්‍රෑන්ක්</displayName>
 				<displayName count="other">රුවන්ඩා ෆ්‍රෑන්ක්</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>සවුදි රියාල්</displayName>
@@ -4705,6 +4895,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ස්වෙඩිෂ් ක්‍රෝනා</displayName>
 				<displayName count="other">ස්වෙඩිෂ් ක්‍රෝනා</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>සිංගප්පූරු ඩොලර්</displayName>
@@ -4718,6 +4909,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ශාන්ත හෙලේනා පවුම්</displayName>
 				<displayName count="other">ශාන්ත හෙලේනා පවුම්</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SLL">
 				<displayName>සියරා ලියොන් ලියොන්</displayName>
@@ -4750,12 +4942,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">සාඕ තෝම් සහ ප්‍රින්සිප් දොබ්‍රා</displayName>
 				<displayName count="other">සාඕ තෝම් සහ ප්‍රින්සිප් දොබ්‍රා</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SYP">
 				<displayName>සිරියානු පවුම්</displayName>
 				<displayName count="one">සිරියානු පවුම්</displayName>
 				<displayName count="other">සිරියානු පවුම්</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>ස්වාසි ලිලන්ජනි</displayName>
@@ -4768,6 +4962,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">තායි බාත්</displayName>
 				<displayName count="other">තායි බාත්</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJS">
 				<displayName>තජිකිස්ථාන සමොනි</displayName>
@@ -4792,6 +4987,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ටොංගානු පාන්ගා</displayName>
 				<displayName count="other">ටොංගානු පාන්ගා</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TRY">
 				<displayName>තුර්කි ලිරා</displayName>
@@ -4859,6 +5055,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">වෙනිසියුලානු බොලිවර්</displayName>
 				<displayName count="other">වෙනිසියුලානු බොලිවර්</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>වියට්නාම ඩොන්</displayName>
@@ -4890,6 +5087,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">නැගෙනහිර කැරිබියානු ඩොලර්</displayName>
 				<displayName count="other">නැගෙනහිර කැරිබියානු ඩොලර්</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XOF">
 				<displayName>සිෆ්එ ෆ්රෑන්ක් බිසීඊඑඔ</displayName>
@@ -4919,6 +5117,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">දකුණු අප්‍රිකානු රැන්ඩ්</displayName>
 				<displayName count="other">දකුණු අප්‍රිකානු රැන්ඩ්</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>සැම්බියානු ක්වාචා (1968–2012)</displayName>
@@ -4928,6 +5127,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">සැම්බියානු ක්වාචා</displayName>
 				<displayName count="other">සැම්බියානු ක්වාචා</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
@@ -4950,6 +5150,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">තත්පර වර්ගයට මීටර {0}</unitPattern>
 				<unitPattern count="other">තත්පර වර්ගයට මීටර {0}</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>පරිභ්‍රමණය</displayName>
+				<unitPattern count="one">පරිභ්‍රමණ {0}</unitPattern>
+				<unitPattern count="other">පරිභ්‍රමණය {0}</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>රේඩියන්</displayName>
+				<unitPattern count="one">රේඩියන් {0}</unitPattern>
+				<unitPattern count="other">රේඩියන් {0}</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>අංශක</displayName>
+				<unitPattern count="one">අංශක {0}</unitPattern>
+				<unitPattern count="other">අංශක {0}</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>මිනිත්තු</displayName>
 				<unitPattern count="one">මිනිත්තු {0}</unitPattern>
@@ -4960,30 +5175,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">තත්පර {0}</unitPattern>
 				<unitPattern count="other">තත්පර {0}</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>අංශක</displayName>
-				<unitPattern count="one">අංශක {0}</unitPattern>
-				<unitPattern count="other">අංශක {0}</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>රේඩියන්</displayName>
-				<unitPattern count="one">රේඩියන් {0}</unitPattern>
-				<unitPattern count="other">රේඩියන් {0}</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>අක්කර</displayName>
-				<unitPattern count="one">අක්කර {0}</unitPattern>
-				<unitPattern count="other">අක්කර {0}</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>වර්ග කිලෝමීටර්</displayName>
+				<unitPattern count="one">වර්ග කිලෝමීටර් {0}</unitPattern>
+				<unitPattern count="other">වර්ග කිලෝමීටර් {0}</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>හෙක්ටයාර්</displayName>
 				<unitPattern count="one">හෙක්ටයාර් {0}</unitPattern>
 				<unitPattern count="other">හෙක්ටයාර් {0}</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>වර්ග මීටර්</displayName>
+				<unitPattern count="one">වර්ග මීටර් {0}</unitPattern>
+				<unitPattern count="other">වර්ග මීටර් {0}</unitPattern>
+				<perUnitPattern>වර්ග මීටරයට {0}</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>වර්ග සෙන්ටිමීටර</displayName>
 				<unitPattern count="one">වර්ග සෙන්ටිමීටර {0}</unitPattern>
 				<unitPattern count="other">වර්ග සෙන්ටිමීටර {0}</unitPattern>
+				<perUnitPattern>වර්ග සෙන්ටිමීටරයට {0}</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>වර්ග සැතපුම්</displayName>
+				<unitPattern count="one">වර්ග සැතපුම් {0}</unitPattern>
+				<unitPattern count="other">වර්ග සැතපුම් {0}</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>අක්කර</displayName>
+				<unitPattern count="one">අක්කර {0}</unitPattern>
+				<unitPattern count="other">අක්කර {0}</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>වර්ග යාර</displayName>
+				<unitPattern count="one">වර්ග යාර {0}</unitPattern>
+				<unitPattern count="other">වර්ග යාර {0}</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>වර්ග අඩි</displayName>
@@ -4994,91 +5221,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>වර්ග අඟල්</displayName>
 				<unitPattern count="one">වර්ග අඟල් {0}</unitPattern>
 				<unitPattern count="other">වර්ග අඟල් {0}</unitPattern>
+				<perUnitPattern>වර්ග අඟලට {0}</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>වර්ග කිලෝමීටර්</displayName>
-				<unitPattern count="one">වර්ග කිලෝමීටර් {0}</unitPattern>
-				<unitPattern count="other">වර්ග කිලෝමීටර් {0}</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>වර්ග මීටර්</displayName>
-				<unitPattern count="one">වර්ග මීටර් {0}</unitPattern>
-				<unitPattern count="other">වර්ග මීටර් {0}</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>වර්ග සැතපුම්</displayName>
-				<unitPattern count="one">වර්ග සැතපුම් {0}</unitPattern>
-				<unitPattern count="other">වර්ග සැතපුම් {0}</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>වර්ග යාර</displayName>
-				<unitPattern count="one">වර්ග යාර {0}</unitPattern>
-				<unitPattern count="other">වර්ග යාර {0}</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>ක්‍රාත්</displayName>
+				<unitPattern count="one">ක්‍රාත් {0}</unitPattern>
+				<unitPattern count="other">ක්‍රාත් {0}</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>කිලෝ මීටරයට ලීටරය</displayName>
 				<unitPattern count="one">කිලෝ මීටරයට ලීටරය {0}</unitPattern>
 				<unitPattern count="other">කිලෝ මීටරයට ලීටරය {0}</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>කිලෝ මීටර 100 ට ලීටර</displayName>
+				<unitPattern count="one">කිලෝ මීටර 100 ට ලීටර {0}</unitPattern>
+				<unitPattern count="other">කිලෝ මීටර 100 ට ලීටර {0}</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>ගැලුමට හැතැප්ම</displayName>
 				<unitPattern count="one">ගැලුමට හැතැප්ම {0}</unitPattern>
 				<unitPattern count="other">ගැලුමට හැතැප්ම {0}</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>බීට්</displayName>
-				<unitPattern count="one">බීට් {0}</unitPattern>
-				<unitPattern count="other">බීට් {0}</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>බයිට්</displayName>
-				<unitPattern count="one">බයිට් {0}</unitPattern>
-				<unitPattern count="other">බයිට් {0}</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>ගිගාබීට්</displayName>
-				<unitPattern count="one">ගිගාබීට් {0}</unitPattern>
-				<unitPattern count="other">ගිගාබීට් {0}</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>ගිගාබයිට්‌</displayName>
-				<unitPattern count="one">ගිගාබයිට්‌ {0}</unitPattern>
-				<unitPattern count="other">ගිගාබයිට්‌ {0}</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>කිලෝබිට්</displayName>
-				<unitPattern count="one">කිලෝබිට් {0}</unitPattern>
-				<unitPattern count="other">කිලෝබිට් {0}</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>කිලෝබයිට්</displayName>
-				<unitPattern count="one">කිලෝබයිට් {0}</unitPattern>
-				<unitPattern count="other">කිලෝබයිට් {0}</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>මෙගාබීට්</displayName>
-				<unitPattern count="one">මෙගාබීට් {0}</unitPattern>
-				<unitPattern count="other">මෙගාබීට් {0}</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>මෙගාබයිට්</displayName>
-				<unitPattern count="one">මෙගාබයිට් {0}</unitPattern>
-				<unitPattern count="other">මෙගාබයිට් {0}</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>ටෙරාබිට්</displayName>
-				<unitPattern count="one">ටෙරාබිට් {0}</unitPattern>
-				<unitPattern count="other">ටෙරාබිට් {0}</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>ටෙරාබයිට්</displayName>
 				<unitPattern count="one">ටෙරාබයිට් {0}</unitPattern>
 				<unitPattern count="other">ටෙරාබයිට් {0}</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>ටෙරාබිට්</displayName>
+				<unitPattern count="one">ටෙරාබිට් {0}</unitPattern>
+				<unitPattern count="other">ටෙරාබිට් {0}</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>ගිගාබයිට්‌</displayName>
+				<unitPattern count="one">ගිගාබයිට්‌ {0}</unitPattern>
+				<unitPattern count="other">ගිගාබයිට්‌ {0}</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>ගිගාබීට්</displayName>
+				<unitPattern count="one">ගිගාබීට් {0}</unitPattern>
+				<unitPattern count="other">ගිගාබීට් {0}</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>මෙගාබයිට්</displayName>
+				<unitPattern count="one">මෙගාබයිට් {0}</unitPattern>
+				<unitPattern count="other">මෙගාබයිට් {0}</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>මෙගාබීට්</displayName>
+				<unitPattern count="one">මෙගාබීට් {0}</unitPattern>
+				<unitPattern count="other">මෙගාබීට් {0}</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>කිලෝබයිට්</displayName>
+				<unitPattern count="one">කිලෝබයිට් {0}</unitPattern>
+				<unitPattern count="other">කිලෝබයිට් {0}</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>කිලෝබිට්</displayName>
+				<unitPattern count="one">කිලෝබිට් {0}</unitPattern>
+				<unitPattern count="other">කිලෝබිට් {0}</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>බයිට්</displayName>
+				<unitPattern count="one">බයිට් {0}</unitPattern>
+				<unitPattern count="other">බයිට් {0}</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>බීට්</displayName>
+				<unitPattern count="one">බීට් {0}</unitPattern>
+				<unitPattern count="other">බීට් {0}</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>සියවස</displayName>
+				<unitPattern count="one">සියවස් {0}</unitPattern>
+				<unitPattern count="other">සියවස් {0}</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>වසර</displayName>
+				<unitPattern count="one">වසර {0}</unitPattern>
+				<unitPattern count="other">වසර {0}</unitPattern>
+				<perUnitPattern>වසරට {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>මාස</displayName>
+				<unitPattern count="one">මාස {0}</unitPattern>
+				<unitPattern count="other">මාස {0}</unitPattern>
+				<perUnitPattern>මාසයට {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>සති</displayName>
+				<unitPattern count="one">සති {0}</unitPattern>
+				<unitPattern count="other">සති {0}</unitPattern>
+				<perUnitPattern>සතියට {0}</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>දින</displayName>
 				<unitPattern count="one">දින {0}</unitPattern>
 				<unitPattern count="other">දින {0}</unitPattern>
+				<perUnitPattern>දිනයට {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>පැය</displayName>
@@ -5086,47 +5328,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">පැය {0}</unitPattern>
 				<perUnitPattern>පැයට {0}</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>මයික්‍රෝ තත්පර</displayName>
-				<unitPattern count="one">මයික්‍රෝ තත්පර {0}</unitPattern>
-				<unitPattern count="other">මයික්‍රෝ තත්පර {0}</unitPattern>
+			<unit type="duration-minute">
+				<displayName>මිනිත්තු</displayName>
+				<unitPattern count="one">මිනිත්තු {0}</unitPattern>
+				<unitPattern count="other">මිනිත්තු {0}</unitPattern>
+				<perUnitPattern>මිනිත්තුවට {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>තත්පර</displayName>
+				<unitPattern count="one">තත්පර {0}</unitPattern>
+				<unitPattern count="other">තත්පර {0}</unitPattern>
+				<perUnitPattern>තත්පරයට {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>මිලිතත්පර</displayName>
 				<unitPattern count="one">මිලිතත්පර {0}</unitPattern>
 				<unitPattern count="other">මිලිතත්පර {0}</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>මිනිත්තු</displayName>
-				<unitPattern count="one">මිනිත්තු {0}</unitPattern>
-				<unitPattern count="other">මිනිත්තු {0}</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>මාස</displayName>
-				<unitPattern count="one">මාස {0}</unitPattern>
-				<unitPattern count="other">මාස {0}</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>මයික්‍රෝ තත්පර</displayName>
+				<unitPattern count="one">මයික්‍රෝ තත්පර {0}</unitPattern>
+				<unitPattern count="other">මයික්‍රෝ තත්පර {0}</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>නැනෝතත්පර</displayName>
 				<unitPattern count="one">නැනෝතත්පර {0}</unitPattern>
 				<unitPattern count="other">නැනෝතත්පර {0}</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>තත්පර</displayName>
-				<unitPattern count="one">තත්පර {0}</unitPattern>
-				<unitPattern count="other">තත්පර {0}</unitPattern>
-				<perUnitPattern>තත්පරයට</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>සති</displayName>
-				<unitPattern count="one">සති {0}</unitPattern>
-				<unitPattern count="other">සති {0}</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>වසර</displayName>
-				<unitPattern count="one">වසර {0}</unitPattern>
-				<unitPattern count="other">වසර {0}</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>ඇම්පියර</displayName>
 				<unitPattern count="one">ඇම්පියර {0}</unitPattern>
@@ -5147,6 +5375,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">වෝල්ට් {0}</unitPattern>
 				<unitPattern count="other">වෝල්ට් {0}</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>කිලෝ කැලරි</displayName>
+				<unitPattern count="one">කිලෝ කැලරි {0}</unitPattern>
+				<unitPattern count="other">කිලෝ කැලරි {0}</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>කැලරි</displayName>
 				<unitPattern count="one">කැලරි {0}</unitPattern>
@@ -5157,21 +5390,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">කැලරි {0}</unitPattern>
 				<unitPattern count="other">කැලරි {0}</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>ජුල්</displayName>
-				<unitPattern count="one">ජුල් {0}</unitPattern>
-				<unitPattern count="other">ජුල් {0}</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>කිලෝ කැලරි</displayName>
-				<unitPattern count="one">කිලෝ කැලරි {0}</unitPattern>
-				<unitPattern count="other">කිලෝ කැලරි {0}</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>කිලෝ ජුල්</displayName>
 				<unitPattern count="one">කිලෝ ජුල් {0}</unitPattern>
 				<unitPattern count="other">කිලෝ ජුල් {0}</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>ජුල්</displayName>
+				<unitPattern count="one">ජුල් {0}</unitPattern>
+				<unitPattern count="other">ජුල් {0}</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>කිලෝවොට්-පැය</displayName>
 				<unitPattern count="one">කිලෝවොට්-පැය {0}</unitPattern>
@@ -5182,201 +5410,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">ගිගාහට්ස් {0}</unitPattern>
 				<unitPattern count="other">ගිගාහට්ස් {0}</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>හට්ස්</displayName>
-				<unitPattern count="one">හට්ස් {0}</unitPattern>
-				<unitPattern count="other">හට්ස් {0}</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>මෙගාහර්ට්ස්</displayName>
+				<unitPattern count="one">මෙගාහර්ට්ස් {0}</unitPattern>
+				<unitPattern count="other">මෙගාහර්ට්ස් {0}</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>කිලෝහට්ස්</displayName>
 				<unitPattern count="one">කිලෝහට්ස් {0}</unitPattern>
 				<unitPattern count="other">කිලෝහට්ස් {0}</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>මෙගාහර්ට්ස්</displayName>
-				<unitPattern count="one">මෙගාහර්ට්ස් {0}</unitPattern>
-				<unitPattern count="other">මෙගාහර්ට්ස් {0}</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>හට්ස්</displayName>
+				<unitPattern count="one">හට්ස් {0}</unitPattern>
+				<unitPattern count="other">හට්ස් {0}</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>නක්ෂත්‍ර ඒකක</displayName>
-				<unitPattern count="one">නක්ෂත්‍ර ඒකක {0}</unitPattern>
-				<unitPattern count="other">නක්ෂත්‍ර ඒකක {0}</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>කිලෝමීටර්</displayName>
+				<unitPattern count="one">කිලෝමීටර් {0}</unitPattern>
+				<unitPattern count="other">කිලෝමීටර් {0}</unitPattern>
+				<perUnitPattern>කිලෝමීටරයට {0}</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>සෙන්ටිමීටර්</displayName>
-				<unitPattern count="one">සෙන්ටිමීටර් {0}</unitPattern>
-				<unitPattern count="other">සෙන්ටිමීටර් {0}</unitPattern>
+			<unit type="length-meter">
+				<displayName>මීටර්</displayName>
+				<unitPattern count="one">මීටර් {0}</unitPattern>
+				<unitPattern count="other">මීටර් {0}</unitPattern>
+				<perUnitPattern>මීටරයට {0}</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>ඩෙසිමීටර</displayName>
 				<unitPattern count="one">ඩෙසිමීටර {0}</unitPattern>
 				<unitPattern count="other">ඩෙසිමීටර {0}</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>අඩි</displayName>
-				<unitPattern count="one">අඩි {0}</unitPattern>
-				<unitPattern count="other">අඩි {0}</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>අඟල්</displayName>
-				<unitPattern count="one">අඟල් {0}</unitPattern>
-				<unitPattern count="other">අඟල් {0}</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>කිලෝමීටර්</displayName>
-				<unitPattern count="one">කිලෝමීටර් {0}</unitPattern>
-				<unitPattern count="other">කිලෝමීටර් {0}</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ආලෝක වර්ෂ</displayName>
-				<unitPattern count="one">ආලෝක වර්ෂ {0}</unitPattern>
-				<unitPattern count="other">ආලෝක වර්ෂ {0}</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>මීටර්</displayName>
-				<unitPattern count="one">මීටර් {0}</unitPattern>
-				<unitPattern count="other">මීටර් {0}</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>මයික්‍රෝමීටර</displayName>
-				<unitPattern count="one">මයික්‍රෝමීටර {0}</unitPattern>
-				<unitPattern count="other">මයික්‍රෝමීටර {0}</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>සැතපුම්</displayName>
-				<unitPattern count="one">සැතපුම් {0}</unitPattern>
-				<unitPattern count="other">සැතපුම් {0}</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>සෙන්ටිමීටර්</displayName>
+				<unitPattern count="one">සෙන්ටිමීටර් {0}</unitPattern>
+				<unitPattern count="other">සෙන්ටිමීටර් {0}</unitPattern>
+				<perUnitPattern>සෙන්ටිමීටරයට {0}</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>මිලිමීටර්</displayName>
 				<unitPattern count="one">මිලිමීටර් {0}</unitPattern>
 				<unitPattern count="other">මිලිමීටර් {0}</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>මයික්‍රෝමීටර</displayName>
+				<unitPattern count="one">මයික්‍රෝමීටර {0}</unitPattern>
+				<unitPattern count="other">මයික්‍රෝමීටර {0}</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>නැනෝමීටර</displayName>
 				<unitPattern count="one">නැනෝමීටර {0}</unitPattern>
 				<unitPattern count="other">නැනෝමීටර {0}</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>නාවුක සැතපුම්</displayName>
-				<unitPattern count="one">නාවුක සැතපුම් {0}</unitPattern>
-				<unitPattern count="other">නාවුක සැතපුම් {0}</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>පාර්සෙක්</displayName>
-				<unitPattern count="one">පාර්සෙක් {0}</unitPattern>
-				<unitPattern count="other">පාර්සෙක් {0}</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>පිකොමිටර්</displayName>
 				<unitPattern count="one">පිකොමිටර් {0}</unitPattern>
 				<unitPattern count="other">පිකොමිටර් {0}</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>සැතපුම්</displayName>
+				<unitPattern count="one">සැතපුම් {0}</unitPattern>
+				<unitPattern count="other">සැතපුම් {0}</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>යාර</displayName>
 				<unitPattern count="one">යාර {0}</unitPattern>
 				<unitPattern count="other">යාර {0}</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>අඩි</displayName>
+				<unitPattern count="one">අඩි {0}</unitPattern>
+				<unitPattern count="other">අඩි {0}</unitPattern>
+				<perUnitPattern>අඩියට {0}</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>අඟල්</displayName>
+				<unitPattern count="one">අඟල් {0}</unitPattern>
+				<unitPattern count="other">අඟල් {0}</unitPattern>
+				<perUnitPattern>අඟලයට {0}</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>පාර්සෙක්</displayName>
+				<unitPattern count="one">පාර්සෙක් {0}</unitPattern>
+				<unitPattern count="other">පාර්සෙක් {0}</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ආලෝක වර්ෂ</displayName>
+				<unitPattern count="one">ආලෝක වර්ෂ {0}</unitPattern>
+				<unitPattern count="other">ආලෝක වර්ෂ {0}</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>නක්ෂත්‍ර ඒකක</displayName>
+				<unitPattern count="one">නක්ෂත්‍ර ඒකක {0}</unitPattern>
+				<unitPattern count="other">නක්ෂත්‍ර ඒකක {0}</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>නාවුක සැතපුම්</displayName>
+				<unitPattern count="one">නාවුක සැතපුම් {0}</unitPattern>
+				<unitPattern count="other">නාවුක සැතපුම් {0}</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>ස්කැන්ඩිනේවියානු සැතපුම්</displayName>
+				<unitPattern count="one">ස්කැන්ඩිනේවියානු සැතපුම් {0}</unitPattern>
+				<unitPattern count="other">ස්කැන්ඩිනේවියානු සැතපුම් {0}</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>ලක්ස්</displayName>
 				<unitPattern count="one">ලක්ස් {0}</unitPattern>
 				<unitPattern count="other">ලක්ස් {0}</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>කැරට්</displayName>
-				<unitPattern count="one">කැරට් {0}</unitPattern>
-				<unitPattern count="other">කැරට් {0}</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>ග්‍රෑම්</displayName>
-				<unitPattern count="one">ග්‍රෑම් {0}</unitPattern>
-				<unitPattern count="other">ග්‍රෑම් {0}</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>කි.ග්‍රෑ.</displayName>
-				<unitPattern count="one">කි.ග්‍රෑ. {0}</unitPattern>
-				<unitPattern count="other">කි.ග්‍රෑ. {0}</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>මෙට්ට්‍රික් ටොන්</displayName>
 				<unitPattern count="one">මෙට්ට්‍රික් ටොන් {0}</unitPattern>
 				<unitPattern count="other">මෙට්ට්‍රික් ටොන් {0}</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>මයික්‍රෝ ග්‍රෑම්</displayName>
-				<unitPattern count="one">මයික්‍රෝ ග්‍රෑම් {0}</unitPattern>
-				<unitPattern count="other">මයික්‍රෝ ග්‍රෑම් {0}</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>කිලෝග්‍රෑම්</displayName>
+				<unitPattern count="one">කිලෝග්‍රෑම් {0}</unitPattern>
+				<unitPattern count="other">කිලෝග්‍රෑම් {0}</unitPattern>
+				<perUnitPattern>කිලෝග්‍රෑමයට {0}</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>ග්‍රෑම්</displayName>
+				<unitPattern count="one">ග්‍රෑම් {0}</unitPattern>
+				<unitPattern count="other">ග්‍රෑම් {0}</unitPattern>
+				<perUnitPattern>ග්‍රෑමයට {0}</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>මිලිග්‍රෑම්</displayName>
 				<unitPattern count="one">මිලිග්‍රෑම් {0}</unitPattern>
 				<unitPattern count="other">මිලිග්‍රෑම් {0}</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>අවුන්ස</displayName>
-				<unitPattern count="one">අවුන්ස {0}</unitPattern>
-				<unitPattern count="other">අවුන්ස {0}</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ට්‍රෝයි අවුන්ස</displayName>
-				<unitPattern count="one">ට්‍රෝයි අවුන්ස {0}</unitPattern>
-				<unitPattern count="other">ට්‍රෝයි අවුන්ස {0}</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>රාත්තල්</displayName>
-				<unitPattern count="one">රාත්තල් {0}</unitPattern>
-				<unitPattern count="other">රාත්තල් {0}</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>මයික්‍රෝ ග්‍රෑම්</displayName>
+				<unitPattern count="one">මයික්‍රෝ ග්‍රෑම් {0}</unitPattern>
+				<unitPattern count="other">මයික්‍රෝ ග්‍රෑම් {0}</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>ටොන්</displayName>
 				<unitPattern count="one">ටොන් {0}</unitPattern>
 				<unitPattern count="other">ටොන් {0}</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>රාත්තල්</displayName>
+				<unitPattern count="one">රාත්තල් {0}</unitPattern>
+				<unitPattern count="other">රාත්තල් {0}</unitPattern>
+				<perUnitPattern>රාත්තලට {0}</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>අවුන්ස</displayName>
+				<unitPattern count="one">අවුන්ස {0}</unitPattern>
+				<unitPattern count="other">අවුන්ස {0}</unitPattern>
+				<perUnitPattern>අවුන්සයට {0}</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ට්‍රෝයි අවුන්ස</displayName>
+				<unitPattern count="one">ට්‍රෝයි අවුන්ස {0}</unitPattern>
+				<unitPattern count="other">ට්‍රෝයි අවුන්ස {0}</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>කැරට්</displayName>
+				<unitPattern count="one">කැරට් {0}</unitPattern>
+				<unitPattern count="other">කැරට් {0}</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>ගිගා වොට්</displayName>
 				<unitPattern count="one">ගිගා වොට් {0}</unitPattern>
 				<unitPattern count="other">ගිගා වොට් {0}</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>අශ්වබල</displayName>
-				<unitPattern count="one">අශ්වබල {0}</unitPattern>
-				<unitPattern count="other">අශ්වබල {0}</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>කිලෝ වොට්</displayName>
-				<unitPattern count="one">කිලෝ වොට් {0}</unitPattern>
-				<unitPattern count="other">කිලෝ වොට් {0}</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>මෙගාවොට්</displayName>
 				<unitPattern count="one">මෙගාවොට් {0}</unitPattern>
 				<unitPattern count="other">මෙගාවොට් {0}</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>මිලිවොට්</displayName>
-				<unitPattern count="one">මිලිවොට් {0}</unitPattern>
-				<unitPattern count="other">මිලිවොට් {0}</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>කිලෝ වොට්</displayName>
+				<unitPattern count="one">කිලෝ වොට් {0}</unitPattern>
+				<unitPattern count="other">කිලෝ වොට් {0}</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>වොට්</displayName>
 				<unitPattern count="one">වොට් {0}</unitPattern>
 				<unitPattern count="other">වොට් {0}</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>මිලිවොට්</displayName>
+				<unitPattern count="one">මිලිවොට් {0}</unitPattern>
+				<unitPattern count="other">මිලිවොට් {0}</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>අශ්වබල</displayName>
+				<unitPattern count="one">අශ්වබල {0}</unitPattern>
+				<unitPattern count="other">අශ්වබල {0}</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>හෙක්ටොපැස්කල්</displayName>
 				<unitPattern count="one">හෙක්ටොපැස්කල් {0}</unitPattern>
 				<unitPattern count="other">හෙක්ටොපැස්කල් {0}</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>රසදිය අඟල්</displayName>
-				<unitPattern count="one">රසදිය අඟල් {0}</unitPattern>
-				<unitPattern count="other">රසදිය අඟල් {0}</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>මිලිබාර්</displayName>
-				<unitPattern count="one">මිලිබාර් {0}</unitPattern>
-				<unitPattern count="other">මිලිබාර් {0}</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>රසදිය මිලිමීටර</displayName>
 				<unitPattern count="one">රසදිය මිලිමීටර {0}</unitPattern>
@@ -5387,10 +5619,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">වර්ග අලඟකට රාත්තල් {0}</unitPattern>
 				<unitPattern count="other">වර්ග අලඟකට රාත්තල් {0}</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>ක්‍රාත්</displayName>
-				<unitPattern count="one">ක්‍රාත් {0}</unitPattern>
-				<unitPattern count="other">ක්‍රාත් {0}</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>රසදිය අඟල්</displayName>
+				<unitPattern count="one">රසදිය අඟල් {0}</unitPattern>
+				<unitPattern count="other">රසදිය අඟල් {0}</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>මිලිබාර්</displayName>
+				<unitPattern count="one">මිලිබාර් {0}</unitPattern>
+				<unitPattern count="other">මිලිබාර් {0}</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>පැයට කිලෝමීටර්</displayName>
@@ -5407,6 +5644,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">පැයට සැතපුම් {0}</unitPattern>
 				<unitPattern count="other">පැයට සැතපුම් {0}</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>නාවික සැතපුම්</displayName>
+				<unitPattern count="one">නාවික සැතපුම් {0}</unitPattern>
+				<unitPattern count="other">නාවික සැතපුම් {0}</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>සෙල්සියස් අංශක</displayName>
 				<unitPattern count="one">සෙල්සියස් අංශක {0}</unitPattern>
@@ -5422,31 +5669,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">කෙල්වින් අංශක {0}</unitPattern>
 				<unitPattern count="other">කෙල්වින් අංශක {0}</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>අක්කර-අඩි</displayName>
-				<unitPattern count="one">අක්කර-අඩි {0}</unitPattern>
-				<unitPattern count="other">අක්කර-අඩි {0}</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>සෙන්ටිලීටරය</displayName>
-				<unitPattern count="one">සෙන්ටිලීටරය {0}</unitPattern>
-				<unitPattern count="other">සෙන්ටිලීටරය {0}</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>ඝන සෙන්ටිමීටරය</displayName>
-				<unitPattern count="one">ඝන සෙන්ටිමීටරය {0}</unitPattern>
-				<unitPattern count="other">ඝන සෙන්ටිමීටරය {0}</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ඝන අඩි</displayName>
-				<unitPattern count="one">ඝන අඩි {0}</unitPattern>
-				<unitPattern count="other">ඝන අඩි {0}</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>ඝන අඟල්</displayName>
-				<unitPattern count="one">ඝන අඟල් {0}</unitPattern>
-				<unitPattern count="other">ඝන අඟල් {0}</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>ඝන කිලෝමීටර්</displayName>
 				<unitPattern count="one">ඝන කිලෝමීටර් {0}</unitPattern>
@@ -5456,6 +5678,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ඝන මීටර</displayName>
 				<unitPattern count="one">ඝන මීටර {0}</unitPattern>
 				<unitPattern count="other">ඝන මීටර {0}</unitPattern>
+				<perUnitPattern>ඝන මීටරට {0}</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>ඝන සෙන්ටිමීටරය</displayName>
+				<unitPattern count="one">ඝන සෙන්ටිමීටරය {0}</unitPattern>
+				<unitPattern count="other">ඝන සෙන්ටිමීටරය {0}</unitPattern>
+				<perUnitPattern>ඝන සෙන්ටිමීටරයට {0}</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>ඝන සැතපුම්</displayName>
@@ -5467,25 +5696,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">ඝන යාර {0}</unitPattern>
 				<unitPattern count="other">ඝන යාර {0}</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>කෝප්ප</displayName>
-				<unitPattern count="one">කෝප්ප {0}</unitPattern>
-				<unitPattern count="other">කෝප්ප {0}</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ඝන අඩි</displayName>
+				<unitPattern count="one">ඝන අඩි {0}</unitPattern>
+				<unitPattern count="other">ඝන අඩි {0}</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>ඩෙසිලීටර</displayName>
-				<unitPattern count="one">ඩෙසිලීටරය {0}</unitPattern>
-				<unitPattern count="other">ඩෙසිලීටරය {0}</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>ඝන අඟල්</displayName>
+				<unitPattern count="one">ඝන අඟල් {0}</unitPattern>
+				<unitPattern count="other">ඝන අඟල් {0}</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>ද්‍රව අවුන්ස</displayName>
-				<unitPattern count="one">ද්‍රව අවුන්ස {0}</unitPattern>
-				<unitPattern count="other">ද්‍රව අවුන්ස {0}</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>ගැලුම්</displayName>
-				<unitPattern count="one">ගැලුම් {0}</unitPattern>
-				<unitPattern count="other">ගැලුම් {0}</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>මෙගාලීටර්</displayName>
+				<unitPattern count="one">මෙගාලීටර් {0}</unitPattern>
+				<unitPattern count="other">මෙගාලීටර් {0}</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>භෙක්ටොලීටර්</displayName>
@@ -5496,27 +5720,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ලීටර්</displayName>
 				<unitPattern count="one">ලීටර් {0}</unitPattern>
 				<unitPattern count="other">ලීටර් {0}</unitPattern>
+				<perUnitPattern>ලීටරයට {0}</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>මෙගාලීටර්</displayName>
-				<unitPattern count="one">මෙගාලීටර් {0}</unitPattern>
-				<unitPattern count="other">මෙගාලීටර් {0}</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>ඩෙසිලීටර</displayName>
+				<unitPattern count="one">ඩෙසිලීටරය {0}</unitPattern>
+				<unitPattern count="other">ඩෙසිලීටරය {0}</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>සෙන්ටිලීටරය</displayName>
+				<unitPattern count="one">සෙන්ටිලීටරය {0}</unitPattern>
+				<unitPattern count="other">සෙන්ටිලීටරය {0}</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>මිලිලීටර්</displayName>
 				<unitPattern count="one">මිලිලීටර් {0}</unitPattern>
 				<unitPattern count="other">මිලිලීටර් {0}</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>පයින්ට්</displayName>
-				<unitPattern count="one">පයින්ට් {0}</unitPattern>
-				<unitPattern count="other">පයින්ට් {0}</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>මෙට්‍රික් පයින්ට්</displayName>
+				<unitPattern count="one">මෙට්‍රික් පයින්ට් {0}</unitPattern>
+				<unitPattern count="other">මෙට්‍රික් පයින්ට් {0}</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>මෙට්‍රික් කෝප්ප</displayName>
+				<unitPattern count="one">මෙට්‍රික් කෝප්ප {0}</unitPattern>
+				<unitPattern count="other">මෙට්‍රික් කෝප්ප {0}</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>අක්කර-අඩි</displayName>
+				<unitPattern count="one">අක්කර-අඩි {0}</unitPattern>
+				<unitPattern count="other">අක්කර-අඩි {0}</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>ගැලුම්</displayName>
+				<unitPattern count="one">ගැලුම් {0}</unitPattern>
+				<unitPattern count="other">ගැලුම් {0}</unitPattern>
+				<perUnitPattern>ගැලුමට {0}</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>ක්වාට්</displayName>
 				<unitPattern count="one">ක්වාට් {0}</unitPattern>
 				<unitPattern count="other">ක්වාට් {0}</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>පයින්ට්</displayName>
+				<unitPattern count="one">පයින්ට් {0}</unitPattern>
+				<unitPattern count="other">පයින්ට් {0}</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>කෝප්ප</displayName>
+				<unitPattern count="one">කෝප්ප {0}</unitPattern>
+				<unitPattern count="other">කෝප්ප {0}</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>ද්‍රව අවුන්ස</displayName>
+				<unitPattern count="one">ද්‍රව අවුන්ස {0}</unitPattern>
+				<unitPattern count="other">ද්‍රව අවුන්ස {0}</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>මේස හැදී</displayName>
 				<unitPattern count="one">මේස හැදී {0}</unitPattern>
@@ -5527,6 +5788,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">තේ හැදී {0}</unitPattern>
 				<unitPattern count="other">තේ හැදී {0}</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}නැ</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}උ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}ද</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}බ</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -5542,6 +5809,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">මී/තව {0}</unitPattern>
 				<unitPattern count="other">මී/තව {0}</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>පරිභ්‍ර</displayName>
+				<unitPattern count="one">පරිභ්‍ර {0}</unitPattern>
+				<unitPattern count="other">පරිභ්‍ර {0}</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>රේඩියන්</displayName>
+				<unitPattern count="one">රේඩි {0}</unitPattern>
+				<unitPattern count="other">රේඩි {0}</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>අංශක</displayName>
+				<unitPattern count="one">අංශක {0}</unitPattern>
+				<unitPattern count="other">අංශක {0}</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>මිනිත්තු</displayName>
 				<unitPattern count="one">මිනිත්තු {0}</unitPattern>
@@ -5552,30 +5834,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">තත් {0}</unitPattern>
 				<unitPattern count="other">තත් {0}</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>අංශක</displayName>
-				<unitPattern count="one">අංශක {0}</unitPattern>
-				<unitPattern count="other">අංශක {0}</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>රේඩියන්</displayName>
-				<unitPattern count="one">රේඩි {0}</unitPattern>
-				<unitPattern count="other">රේඩි {0}</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>අක්කර</displayName>
-				<unitPattern count="one">අක්කර {0}</unitPattern>
-				<unitPattern count="other">අක්කර {0}</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>ව.කී</displayName>
+				<unitPattern count="one">ව.කී {0}</unitPattern>
+				<unitPattern count="other">ව.කී {0}</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>හෙක්ටයාර්</displayName>
 				<unitPattern count="one">හෙක් {0}</unitPattern>
 				<unitPattern count="other">හෙක් {0}</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>වර්ග මීටර්</displayName>
+				<unitPattern count="one">ව.මී {0}</unitPattern>
+				<unitPattern count="other">ව.මී {0}</unitPattern>
+				<perUnitPattern>{0}/ව.මී</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>වසෙ</displayName>
 				<unitPattern count="one">වසෙ {0}</unitPattern>
 				<unitPattern count="other">වසෙ {0}</unitPattern>
+				<perUnitPattern>{0}/වසෙ</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>වර්ග සැතපුම්</displayName>
+				<unitPattern count="one">ව.සැ {0}</unitPattern>
+				<unitPattern count="other">ව.සැ {0}</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>අක්කර</displayName>
+				<unitPattern count="one">අක්කර {0}</unitPattern>
+				<unitPattern count="other">අක්කර {0}</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>වර්ග යාර</displayName>
+				<unitPattern count="one">වයා {0}</unitPattern>
+				<unitPattern count="other">වයා {0}</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>වර්ග අඩි</displayName>
@@ -5586,91 +5880,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>වර්ග අඟල්</displayName>
 				<unitPattern count="one">වඅ {0}</unitPattern>
 				<unitPattern count="other">වඅ {0}</unitPattern>
+				<perUnitPattern>{0}/වඅ</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>ව.කී</displayName>
-				<unitPattern count="one">ව.කී {0}</unitPattern>
-				<unitPattern count="other">ව.කී {0}</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>වර්ග මීටර්</displayName>
-				<unitPattern count="one">ව.මී {0}</unitPattern>
-				<unitPattern count="other">ව.මී {0}</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>වර්ග සැතපුම්</displayName>
-				<unitPattern count="one">ව.සැ {0}</unitPattern>
-				<unitPattern count="other">ව.සැ {0}</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>වර්ග යාර</displayName>
-				<unitPattern count="one">වයා {0}</unitPattern>
-				<unitPattern count="other">වයා {0}</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>ක්‍රාත්</displayName>
+				<unitPattern count="one">ක්‍රාත් {0}</unitPattern>
+				<unitPattern count="other">ක්‍රාත් {0}</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ලීටරය/කිමී</displayName>
 				<unitPattern count="one">ලී/කිමී {0}</unitPattern>
 				<unitPattern count="other">ලී/කිමී {0}</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ලී/කිමී100</displayName>
+				<unitPattern count="one">ලී/කිමී100 {0}</unitPattern>
+				<unitPattern count="other">ලී/100කිමී {0}</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>හැතැප්ම/ගැලු</displayName>
 				<unitPattern count="one">හැගැ {0}</unitPattern>
 				<unitPattern count="other">හැගැ {0}</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>බීට්</displayName>
-				<unitPattern count="one">බීට් {0}</unitPattern>
-				<unitPattern count="other">බීට් {0}</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>බයිට්</displayName>
-				<unitPattern count="one">බයිට් {0}</unitPattern>
-				<unitPattern count="other">බයිට් {0}</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>ගිබීට්</displayName>
-				<unitPattern count="one">ගිබී {0}</unitPattern>
-				<unitPattern count="other">ගිබී {0}</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>ගිබයිට්‌</displayName>
-				<unitPattern count="one">ගිබ {0}</unitPattern>
-				<unitPattern count="other">ගිබ {0}</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>කිබීට්</displayName>
-				<unitPattern count="one">කිබී {0}</unitPattern>
-				<unitPattern count="other">කිබී {0}</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>කිබයිට්</displayName>
-				<unitPattern count="one">කිබ {0}</unitPattern>
-				<unitPattern count="other">කිබ {0}</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>මෙබීට්</displayName>
-				<unitPattern count="one">මෙබි {0}</unitPattern>
-				<unitPattern count="other">මෙබි {0}</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>මෙබයිට්</displayName>
-				<unitPattern count="one">මෙබ {0}</unitPattern>
-				<unitPattern count="other">මෙබ {0}</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>ටෙබිට්</displayName>
-				<unitPattern count="one">ටේබි {0}</unitPattern>
-				<unitPattern count="other">ටේබි {0}</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>ටෙබයිට්</displayName>
 				<unitPattern count="one">ටෙබ {0}</unitPattern>
 				<unitPattern count="other">ටෙබ {0}</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>ටෙබිට්</displayName>
+				<unitPattern count="one">ටේබි {0}</unitPattern>
+				<unitPattern count="other">ටේබි {0}</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>ගිබයිට්‌</displayName>
+				<unitPattern count="one">ගිබ {0}</unitPattern>
+				<unitPattern count="other">ගිබ {0}</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>ගිබීට්</displayName>
+				<unitPattern count="one">ගිබී {0}</unitPattern>
+				<unitPattern count="other">ගිබී {0}</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>මෙබයිට්</displayName>
+				<unitPattern count="one">මෙබ {0}</unitPattern>
+				<unitPattern count="other">මෙබ {0}</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>මෙබීට්</displayName>
+				<unitPattern count="one">මෙබි {0}</unitPattern>
+				<unitPattern count="other">මෙබි {0}</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>කිබයිට්</displayName>
+				<unitPattern count="one">කිබ {0}</unitPattern>
+				<unitPattern count="other">කිබ {0}</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>කිබීට්</displayName>
+				<unitPattern count="one">කිබී {0}</unitPattern>
+				<unitPattern count="other">කිබී {0}</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>බයිට්</displayName>
+				<unitPattern count="one">බයිට් {0}</unitPattern>
+				<unitPattern count="other">බයිට් {0}</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>බීට්</displayName>
+				<unitPattern count="one">බීට් {0}</unitPattern>
+				<unitPattern count="other">බීට් {0}</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>සි</displayName>
+				<unitPattern count="one">සි {0}</unitPattern>
+				<unitPattern count="other">සි {0}</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>වසර</displayName>
+				<unitPattern count="one">වසර {0}</unitPattern>
+				<unitPattern count="other">වසර {0}</unitPattern>
+				<perUnitPattern>{0}/ව</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>මාස</displayName>
+				<unitPattern count="one">මාස {0}</unitPattern>
+				<unitPattern count="other">මාස {0}</unitPattern>
+				<perUnitPattern>{0}/මා</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>සති</displayName>
+				<unitPattern count="one">සති {0}</unitPattern>
+				<unitPattern count="other">සති {0}</unitPattern>
+				<perUnitPattern>{0}/ස</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>දින</displayName>
 				<unitPattern count="one">දින {0}</unitPattern>
 				<unitPattern count="other">දින {0}</unitPattern>
+				<perUnitPattern>{0}/දි</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>පැය</displayName>
@@ -5678,30 +5987,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">පැය {0}</unitPattern>
 				<perUnitPattern>පැට {0}</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>මතත්</displayName>
-				<unitPattern count="one">මත {0}</unitPattern>
-				<unitPattern count="other">මත {0}</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>මිලිතත්පර</displayName>
-				<unitPattern count="one">මි.ත {0}</unitPattern>
-				<unitPattern count="other">මි.ත {0}</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>මිනි</displayName>
 				<unitPattern count="one">මිනි {0}</unitPattern>
 				<unitPattern count="other">මිනි {0}</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>මාස</displayName>
-				<unitPattern count="one">මාස {0}</unitPattern>
-				<unitPattern count="other">මාස {0}</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>නැනෝතත්</displayName>
-				<unitPattern count="one">නැත {0}</unitPattern>
-				<unitPattern count="other">නැත {0}</unitPattern>
+				<perUnitPattern>{0}/මිනි</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>තත්පර</displayName>
@@ -5709,15 +5999,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">තත් {0}</unitPattern>
 				<perUnitPattern>තය {0}</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>සති</displayName>
-				<unitPattern count="one">සති {0}</unitPattern>
-				<unitPattern count="other">සති {0}</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>මිලිතත්පර</displayName>
+				<unitPattern count="one">මි.ත {0}</unitPattern>
+				<unitPattern count="other">මි.ත {0}</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>වසර</displayName>
-				<unitPattern count="one">වසර {0}</unitPattern>
-				<unitPattern count="other">වසර {0}</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>මතත්</displayName>
+				<unitPattern count="one">මත {0}</unitPattern>
+				<unitPattern count="other">මත {0}</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>නැනෝතත්</displayName>
+				<unitPattern count="one">නැත {0}</unitPattern>
+				<unitPattern count="other">නැත {0}</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ඇම්පිර</displayName>
@@ -5739,6 +6034,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">වෝ {0}</unitPattern>
 				<unitPattern count="other">වෝ {0}</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>කිකැලරි</displayName>
+				<unitPattern count="one">කිකැලරි {0}</unitPattern>
+				<unitPattern count="other">කිකැලරි {0}</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>කැල</displayName>
 				<unitPattern count="one">කැල {0}</unitPattern>
@@ -5749,21 +6049,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">කැල {0}</unitPattern>
 				<unitPattern count="other">කැල {0}</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>ජුල්</displayName>
-				<unitPattern count="one">ජු {0}</unitPattern>
-				<unitPattern count="other">ජු {0}</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>කිකැලරි</displayName>
-				<unitPattern count="one">කිකැලරි {0}</unitPattern>
-				<unitPattern count="other">කිකැලරි {0}</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>කිලෝ ජුල්</displayName>
 				<unitPattern count="one">කිජු {0}</unitPattern>
 				<unitPattern count="other">කිජු {0}</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>ජුල්</displayName>
+				<unitPattern count="one">ජු {0}</unitPattern>
+				<unitPattern count="other">ජු {0}</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>කිවො-පැය</displayName>
 				<unitPattern count="one">කිවො-පැය {0}</unitPattern>
@@ -5774,201 +6069,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">ගිහස් {0}</unitPattern>
 				<unitPattern count="other">ගිහස් {0}</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>හස්</displayName>
-				<unitPattern count="one">හස් {0}</unitPattern>
-				<unitPattern count="other">හස් {0}</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>මෙග</displayName>
+				<unitPattern count="one">මෙහ {0}</unitPattern>
+				<unitPattern count="other">මෙහ {0}</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>කිහස්</displayName>
 				<unitPattern count="one">කිහස් {0}</unitPattern>
 				<unitPattern count="other">කිහස් {0}</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>මෙග</displayName>
-				<unitPattern count="one">මෙහ {0}</unitPattern>
-				<unitPattern count="other">මෙහ {0}</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>හස්</displayName>
+				<unitPattern count="one">හස් {0}</unitPattern>
+				<unitPattern count="other">හස් {0}</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>නඒ</displayName>
-				<unitPattern count="one">නඒ {0}</unitPattern>
-				<unitPattern count="other">නඒ {0}</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>කි.මී</displayName>
+				<unitPattern count="one">කි.මී {0}</unitPattern>
+				<unitPattern count="other">කි.මී {0}</unitPattern>
+				<perUnitPattern>{0}/කි.මී</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>සෙ.මී</displayName>
-				<unitPattern count="one">සෙ.මී {0}</unitPattern>
-				<unitPattern count="other">සෙ.මී {0}</unitPattern>
+			<unit type="length-meter">
+				<displayName>මීටර්</displayName>
+				<unitPattern count="one">මී {0}</unitPattern>
+				<unitPattern count="other">මී {0}</unitPattern>
+				<perUnitPattern>{0}/මී</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>ඩෙමී</displayName>
 				<unitPattern count="one">ඩෙමී {0}</unitPattern>
 				<unitPattern count="other">ඩෙමී {0}</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>අඩි</displayName>
-				<unitPattern count="one">අඩි {0}</unitPattern>
-				<unitPattern count="other">අඩි {0}</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>අඟල්</displayName>
-				<unitPattern count="one">අඟල් {0}</unitPattern>
-				<unitPattern count="other">අඟල් {0}</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>කි.මී</displayName>
-				<unitPattern count="one">කි.මී {0}</unitPattern>
-				<unitPattern count="other">කි.මී {0}</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ආලෝක වර්ෂ</displayName>
-				<unitPattern count="one">ආ.ව {0}</unitPattern>
-				<unitPattern count="other">ආ.ව {0}</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>මීටර්</displayName>
-				<unitPattern count="one">මී {0}</unitPattern>
-				<unitPattern count="other">මී {0}</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>මමීටර</displayName>
-				<unitPattern count="one">මමී {0}</unitPattern>
-				<unitPattern count="other">මමී {0}</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>සැතපුම්</displayName>
-				<unitPattern count="one">සැත {0}</unitPattern>
-				<unitPattern count="other">සැත {0}</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>සෙ.මී</displayName>
+				<unitPattern count="one">සෙ.මී {0}</unitPattern>
+				<unitPattern count="other">සෙ.මී {0}</unitPattern>
+				<perUnitPattern>{0}/සෙ.මී</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>මිමී</displayName>
 				<unitPattern count="one">මිමී {0}</unitPattern>
 				<unitPattern count="other">මිමී {0}</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>මමීටර</displayName>
+				<unitPattern count="one">මමී {0}</unitPattern>
+				<unitPattern count="other">මමී {0}</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>නැමී</displayName>
 				<unitPattern count="one">නැමී {0}</unitPattern>
 				<unitPattern count="other">නැමී {0}</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>නාසැත</displayName>
-				<unitPattern count="one">නාසැත {0}</unitPattern>
-				<unitPattern count="other">නාසැත {0}</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>පාර්සෙක්</displayName>
-				<unitPattern count="one">පාසෙ {0}</unitPattern>
-				<unitPattern count="other">පාසෙ {0}</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>පිකොමිටර්</displayName>
 				<unitPattern count="one">පිමී {0}</unitPattern>
 				<unitPattern count="other">පිමී {0}</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>සැතපුම්</displayName>
+				<unitPattern count="one">සැත {0}</unitPattern>
+				<unitPattern count="other">සැත {0}</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>යාර</displayName>
 				<unitPattern count="one">යාර {0}</unitPattern>
 				<unitPattern count="other">යාර {0}</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>අඩි</displayName>
+				<unitPattern count="one">අඩි {0}</unitPattern>
+				<unitPattern count="other">අඩි {0}</unitPattern>
+				<perUnitPattern>{0}/අඩි</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>අඟල්</displayName>
+				<unitPattern count="one">අඟල් {0}</unitPattern>
+				<unitPattern count="other">අඟල් {0}</unitPattern>
+				<perUnitPattern>{0}/අඟල්</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>පාර්සෙක්</displayName>
+				<unitPattern count="one">පාසෙ {0}</unitPattern>
+				<unitPattern count="other">පාසෙ {0}</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ආලෝක වර්ෂ</displayName>
+				<unitPattern count="one">ආ.ව {0}</unitPattern>
+				<unitPattern count="other">ආ.ව {0}</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>නඒ</displayName>
+				<unitPattern count="one">නඒ {0}</unitPattern>
+				<unitPattern count="other">නඒ {0}</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>නාසැත</displayName>
+				<unitPattern count="one">නාසැත {0}</unitPattern>
+				<unitPattern count="other">නාසැත {0}</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>ස්කැන්සැත</displayName>
+				<unitPattern count="one">ස්කැසැත {0}</unitPattern>
+				<unitPattern count="other">ස්කැසැත {0}</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>ලක්ස්</displayName>
 				<unitPattern count="one">ලක් {0}</unitPattern>
 				<unitPattern count="other">ලක් {0}</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>කැරට්</displayName>
-				<unitPattern count="one">කැට් {0}</unitPattern>
-				<unitPattern count="other">කැට් {0}</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>ග්‍රෑම්</displayName>
-				<unitPattern count="one">ග්‍රෑ. {0}</unitPattern>
-				<unitPattern count="other">ග්‍රෑ. {0}</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>කි.ග්‍රෑ.</displayName>
-				<unitPattern count="one">කි.ග්‍රෑ. {0}</unitPattern>
-				<unitPattern count="other">කි.ග්‍රෑ. {0}</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>ටො</displayName>
 				<unitPattern count="one">ටො {0}</unitPattern>
 				<unitPattern count="other">ටො {0}</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>මග්‍රෑ</displayName>
-				<unitPattern count="one">මග්‍රෑ {0}</unitPattern>
-				<unitPattern count="other">මග්‍රෑ {0}</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>කි.ග්‍රෑ.</displayName>
+				<unitPattern count="one">කි.ග්‍රෑ. {0}</unitPattern>
+				<unitPattern count="other">කි.ග්‍රෑ. {0}</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>ග්‍රෑම්</displayName>
+				<unitPattern count="one">ග්‍රෑ. {0}</unitPattern>
+				<unitPattern count="other">ග්‍රෑ. {0}</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>මිග්‍රෑ</displayName>
 				<unitPattern count="one">මිග්‍රෑ {0}</unitPattern>
 				<unitPattern count="other">මිග්‍රෑ {0}</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>අවුස</displayName>
-				<unitPattern count="one">අවුස {0}</unitPattern>
-				<unitPattern count="other">අවුස {0}</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>අවුස ට්‍රෝයි</displayName>
-				<unitPattern count="one">අවුස ට්‍රෝ {0}</unitPattern>
-				<unitPattern count="other">අවුස ට්‍රෝ {0}</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>රාත්තල්</displayName>
-				<unitPattern count="one">රා {0}</unitPattern>
-				<unitPattern count="other">රා {0}</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>මග්‍රෑ</displayName>
+				<unitPattern count="one">මග්‍රෑ {0}</unitPattern>
+				<unitPattern count="other">මග්‍රෑ {0}</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>ටොන්</displayName>
 				<unitPattern count="one">ටොන් {0}</unitPattern>
 				<unitPattern count="other">ටොන් {0}</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>රාත්තල්</displayName>
+				<unitPattern count="one">රා {0}</unitPattern>
+				<unitPattern count="other">රා {0}</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>අවුස</displayName>
+				<unitPattern count="one">අවුස {0}</unitPattern>
+				<unitPattern count="other">අවුස {0}</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>අවුස ට්‍රෝයි</displayName>
+				<unitPattern count="one">අවුස ට්‍රෝ {0}</unitPattern>
+				<unitPattern count="other">අවුස ට්‍රෝ {0}</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>කැරට්</displayName>
+				<unitPattern count="one">කැට් {0}</unitPattern>
+				<unitPattern count="other">කැට් {0}</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>ගිවො</displayName>
 				<unitPattern count="one">ගිවො {0}</unitPattern>
 				<unitPattern count="other">ගිවො {0}</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>අබ</displayName>
-				<unitPattern count="one">අබ {0}</unitPattern>
-				<unitPattern count="other">අබ {0}</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>කිවො</displayName>
-				<unitPattern count="one">කිවො {0}</unitPattern>
-				<unitPattern count="other">කිවො {0}</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>මෙවො</displayName>
 				<unitPattern count="one">මෙවො {0}</unitPattern>
 				<unitPattern count="other">මෙවො {0}</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>මිවො</displayName>
-				<unitPattern count="one">මිවො {0}</unitPattern>
-				<unitPattern count="other">මිවො {0}</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>කිවො</displayName>
+				<unitPattern count="one">කිවො {0}</unitPattern>
+				<unitPattern count="other">කිවො {0}</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>වොට්</displayName>
 				<unitPattern count="one">වොට් {0}</unitPattern>
 				<unitPattern count="other">වොට් {0}</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>මිවො</displayName>
+				<unitPattern count="one">මිවො {0}</unitPattern>
+				<unitPattern count="other">මිවො {0}</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>අබ</displayName>
+				<unitPattern count="one">අබ {0}</unitPattern>
+				<unitPattern count="other">අබ {0}</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>හෙක්ටොපැස්කල්</displayName>
 				<unitPattern count="one">හෙ.පැ {0}</unitPattern>
 				<unitPattern count="other">හෙ.පැ {0}</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>ර අඟ</displayName>
-				<unitPattern count="one">ර අඟ {0}</unitPattern>
-				<unitPattern count="other">ර අඟ {0}</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>මිලිබාර්</displayName>
-				<unitPattern count="one">මි.බාර් {0}</unitPattern>
-				<unitPattern count="other">මි.බාර් {0}</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>ර මිමී</displayName>
 				<unitPattern count="one">ර මිමී {0}</unitPattern>
@@ -5979,10 +6278,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">වඅ රා {0}</unitPattern>
 				<unitPattern count="other">වඅ රා {0}</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>ක්‍රාත්</displayName>
-				<unitPattern count="one">ක්‍රාත් {0}</unitPattern>
-				<unitPattern count="other">ක්‍රාත් {0}</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>ර අඟ</displayName>
+				<unitPattern count="one">ර අඟ {0}</unitPattern>
+				<unitPattern count="other">ර අඟ {0}</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>මිලිබාර්</displayName>
+				<unitPattern count="one">මි.බාර් {0}</unitPattern>
+				<unitPattern count="other">මි.බාර් {0}</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>පැයට කිලෝමීටර්</displayName>
@@ -5999,6 +6303,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">පැ/සැ {0}</unitPattern>
 				<unitPattern count="other">පැ/සැ {0}</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>නාසැ</displayName>
+				<unitPattern count="one">නාසැ {0}</unitPattern>
+				<unitPattern count="other">නාසැ {0}</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>සෙල්සියස් අංශක</displayName>
 				<unitPattern count="one">සෙල්. {0}°</unitPattern>
@@ -6014,31 +6328,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">කෙල්. {0}°</unitPattern>
 				<unitPattern count="other">කෙල්. {0}°</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>අක්කර-අඩි</displayName>
-				<unitPattern count="one">අක්-අඩි {0}</unitPattern>
-				<unitPattern count="other">අක්-අඩි {0}</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>සෙලී</displayName>
-				<unitPattern count="one">සෙලී {0}</unitPattern>
-				<unitPattern count="other">සෙලී {0}</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>සෙමී³</displayName>
-				<unitPattern count="one">ඝසෙ {0}</unitPattern>
-				<unitPattern count="other">ඝසෙ {0}</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>අඩි³</displayName>
-				<unitPattern count="one">අඩි³ {0}</unitPattern>
-				<unitPattern count="other">අඩි³ {0}</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>අඟල්³</displayName>
-				<unitPattern count="one">අල්³ {0}</unitPattern>
-				<unitPattern count="other">අල්³ {0}</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>කිමී³</displayName>
 				<unitPattern count="one">කිමී³ {0}</unitPattern>
@@ -6048,6 +6337,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>මී³</displayName>
 				<unitPattern count="one">මී³ {0}</unitPattern>
 				<unitPattern count="other">මී³ {0}</unitPattern>
+				<perUnitPattern>{0}/මී³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>සෙමී³</displayName>
+				<unitPattern count="one">ඝසෙ {0}</unitPattern>
+				<unitPattern count="other">ඝසෙ {0}</unitPattern>
+				<perUnitPattern>{0}/ඝසෙ</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>සැත³</displayName>
@@ -6059,25 +6355,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">යාර³ {0}</unitPattern>
 				<unitPattern count="other">යාර³ {0}</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>කෝප්ප</displayName>
-				<unitPattern count="one">කෝ {0}</unitPattern>
-				<unitPattern count="other">කෝ {0}</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>අඩි³</displayName>
+				<unitPattern count="one">අඩි³ {0}</unitPattern>
+				<unitPattern count="other">අඩි³ {0}</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>ඩෙලී</displayName>
-				<unitPattern count="one">ඩෙලී {0}</unitPattern>
-				<unitPattern count="other">ඩෙලී {0}</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>අඟල්³</displayName>
+				<unitPattern count="one">අල්³ {0}</unitPattern>
+				<unitPattern count="other">අල්³ {0}</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>ද්‍රව අවු</displayName>
-				<unitPattern count="one">ද්‍රව අවු {0}</unitPattern>
-				<unitPattern count="other">ද්‍රව අවු {0}</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>ගැලු</displayName>
-				<unitPattern count="one">ගැලු {0}</unitPattern>
-				<unitPattern count="other">ගැලු {0}</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>මෙලී</displayName>
+				<unitPattern count="one">මෙලී {0}</unitPattern>
+				<unitPattern count="other">මෙලී {0}</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>භෙලී</displayName>
@@ -6088,27 +6379,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ලීටර්</displayName>
 				<unitPattern count="one">ලී {0}</unitPattern>
 				<unitPattern count="other">ලී {0}</unitPattern>
+				<perUnitPattern>{0}/ලී</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>මෙලී</displayName>
-				<unitPattern count="one">මෙලී {0}</unitPattern>
-				<unitPattern count="other">මෙලී {0}</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>ඩෙලී</displayName>
+				<unitPattern count="one">ඩෙලී {0}</unitPattern>
+				<unitPattern count="other">ඩෙලී {0}</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>සෙලී</displayName>
+				<unitPattern count="one">සෙලී {0}</unitPattern>
+				<unitPattern count="other">සෙලී {0}</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>මිලී</displayName>
 				<unitPattern count="one">මිලී {0}</unitPattern>
 				<unitPattern count="other">මිලී {0}</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>පයින්ට්</displayName>
-				<unitPattern count="one">පට් {0}</unitPattern>
-				<unitPattern count="other">පට් {0}</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>මෙපට්</displayName>
+				<unitPattern count="one">මෙපට් {0}</unitPattern>
+				<unitPattern count="other">මෙපට් {0}</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>මෙකෝප්ප</displayName>
+				<unitPattern count="one">මෙකෝ {0}</unitPattern>
+				<unitPattern count="other">මෙකෝ {0}</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>අක්කර-අඩි</displayName>
+				<unitPattern count="one">අක්-අඩි {0}</unitPattern>
+				<unitPattern count="other">අක්-අඩි {0}</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>ගැලු</displayName>
+				<unitPattern count="one">ගැලු {0}</unitPattern>
+				<unitPattern count="other">ගැලු {0}</unitPattern>
+				<perUnitPattern>{0}/ගැලු</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>ක්වාට්</displayName>
 				<unitPattern count="one">ක්ට් {0}</unitPattern>
 				<unitPattern count="other">ක්ට් {0}</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>පයින්ට්</displayName>
+				<unitPattern count="one">පට් {0}</unitPattern>
+				<unitPattern count="other">පට් {0}</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>කෝප්ප</displayName>
+				<unitPattern count="one">කෝ {0}</unitPattern>
+				<unitPattern count="other">කෝ {0}</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>ද්‍රව අවු</displayName>
+				<unitPattern count="one">ද්‍රව අවු {0}</unitPattern>
+				<unitPattern count="other">ද්‍රව අවු {0}</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>මේසහැදී</displayName>
 				<unitPattern count="one">මේසහැදී {0}</unitPattern>
@@ -6119,6 +6447,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">තේහැදී {0}</unitPattern>
 				<unitPattern count="other">තේහැදී {0}</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}නැ</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}උ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}ද</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}බ</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -6128,6 +6462,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} G</unitPattern>
 				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">මිනිත්තු {0}</unitPattern>
 				<unitPattern count="other">මිනිත්තු {0}</unitPattern>
@@ -6136,26 +6474,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">තත් {0}</unitPattern>
 				<unitPattern count="other">තත් {0}</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">අක්කර {0}</unitPattern>
-				<unitPattern count="other">අක්කර {0}</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} m²</unitPattern>
 				<unitPattern count="other">{0} m²</unitPattern>
@@ -6164,6 +6490,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">අක්කර {0}</unitPattern>
+				<unitPattern count="other">අක්කර {0}</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ලී/කිමී100</displayName>
+				<unitPattern count="one">ලී/කිමී100 {0}</unitPattern>
+				<unitPattern count="other">ලී/කිමී100 {0}</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>වසර</displayName>
+				<unitPattern count="one">ව {0}</unitPattern>
+				<unitPattern count="other">ව {0}</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>මාස</displayName>
+				<unitPattern count="one">මා {0}</unitPattern>
+				<unitPattern count="other">මා {0}</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>සති</displayName>
+				<unitPattern count="one">ස {0}</unitPattern>
+				<unitPattern count="other">ස {0}</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>දින</displayName>
 				<unitPattern count="one">දි {0}</unitPattern>
@@ -6174,66 +6528,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">පැ {0}</unitPattern>
 				<unitPattern count="other">පැ {0}</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>මිලිතත්</displayName>
-				<unitPattern count="one">මි.ත {0}</unitPattern>
-				<unitPattern count="other">මි.ත {0}</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>මිනි</displayName>
 				<unitPattern count="one">මි {0}</unitPattern>
 				<unitPattern count="other">මි {0}</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>මාස</displayName>
-				<unitPattern count="one">මා {0}</unitPattern>
-				<unitPattern count="other">මා {0}</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>තත්</displayName>
 				<unitPattern count="one">ත {0}</unitPattern>
 				<unitPattern count="other">ත {0}</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>සති</displayName>
-				<unitPattern count="one">ස {0}</unitPattern>
-				<unitPattern count="other">ස {0}</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>වසර</displayName>
-				<unitPattern count="one">ව {0}</unitPattern>
-				<unitPattern count="other">ව {0}</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>සෙ.මී</displayName>
-				<unitPattern count="one">සෙ.මී {0}</unitPattern>
-				<unitPattern count="other">සෙ.මී {0}</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0}'</unitPattern>
-				<unitPattern count="other">{0}'</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0}″</unitPattern>
-				<unitPattern count="other">{0}″</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>මිලිතත්</displayName>
+				<unitPattern count="one">මි.ත {0}</unitPattern>
+				<unitPattern count="other">මි.ත {0}</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>කි.මී</displayName>
 				<unitPattern count="one">කි.මී {0}</unitPattern>
 				<unitPattern count="other">කි.මී {0}</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">ආ.ව {0}</unitPattern>
-				<unitPattern count="other">ආ.ව {0}</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>මීටර්</displayName>
 				<unitPattern count="one">මී {0}</unitPattern>
 				<unitPattern count="other">මී {0}</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">සැත {0}</unitPattern>
-				<unitPattern count="other">සැත {0}</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>සෙ.මී</displayName>
+				<unitPattern count="one">සෙ.මී {0}</unitPattern>
+				<unitPattern count="other">සෙ.මී {0}</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>මිමී</displayName>
@@ -6244,31 +6567,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">පිමී {0}</unitPattern>
 				<unitPattern count="other">පිමී {0}</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">සැත {0}</unitPattern>
+				<unitPattern count="other">සැත {0}</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">යාර {0}</unitPattern>
 				<unitPattern count="other">යාර {0}</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>ග්‍රෑම්</displayName>
-				<unitPattern count="one">ග්‍රෑ. {0}</unitPattern>
-				<unitPattern count="other">ග්‍රෑ. {0}</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0}'</unitPattern>
+				<unitPattern count="other">{0}'</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">ආ.ව {0}</unitPattern>
+				<unitPattern count="other">ආ.ව {0}</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>කි.ග්‍රෑ.</displayName>
 				<unitPattern count="one">කිග්‍රෑ{0}</unitPattern>
 				<unitPattern count="other">කිග්‍රෑ{0}</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">අවුන්ස {0}</unitPattern>
-				<unitPattern count="other">අවුන්ස {0}</unitPattern>
+			<unit type="mass-gram">
+				<displayName>ග්‍රෑම්</displayName>
+				<unitPattern count="one">ග්‍රෑ. {0}</unitPattern>
+				<unitPattern count="other">ග්‍රෑ. {0}</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">රා. {0}</unitPattern>
 				<unitPattern count="other">රා. {0}</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">අවුන්ස {0}</unitPattern>
+				<unitPattern count="other">අවුන්ස {0}</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} kW</unitPattern>
@@ -6278,6 +6613,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
@@ -6325,6 +6664,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">ලී {0}</unitPattern>
 				<unitPattern count="other">ලී {0}</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}නැ</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}උ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}ද</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}බ</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h.mm</durationUnitPattern>
@@ -6347,7 +6692,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<listPatternPart type="start">{0}, {1}</listPatternPart>
 			<listPatternPart type="middle">{0}, {1}</listPatternPart>
 			<listPatternPart type="end">{0}, සහ {1}</listPatternPart>
-			<listPatternPart type="2">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0} සහ {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-narrow">
 			<listPatternPart type="start">{0}, {1}</listPatternPart>
@@ -6369,4 +6714,3 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
-
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/si_LK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/si_LK.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/si_LK.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/si_LK.xml
index 3e8e71d2d9b..5be4d9725e7 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/si_LK.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/si_LK.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="si"/>
 		<territory type="LK"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sk.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sk.xml
similarity index 80%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sk.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sk.xml
index 644c28cfc76..0dcbe43b0f9 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sk.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sk.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12411 $"/>
 		<language type="sk"/>
 	</identity>
 	<localeDisplayNames>
@@ -62,6 +61,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bez">bena</language>
 			<language type="bfd" draft="contributed">bafut</language>
 			<language type="bg">bulharčina</language>
+			<language type="bgn">západná balúčtina</language>
 			<language type="bho">bhódžpurčina</language>
 			<language type="bi">bislama</language>
 			<language type="bik">bikol</language>
@@ -131,7 +131,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="dz">dzongkä</language>
 			<language type="dzg" draft="contributed">dazaga</language>
 			<language type="ebu">embu</language>
-			<language type="ee">ewe</language>
+			<language type="ee">eweština</language>
 			<language type="efi">efik</language>
 			<language type="egy" draft="contributed">staroegyptský</language>
 			<language type="eka">ekadžuk</language>
@@ -181,7 +181,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="gil" draft="contributed">kiribatčina</language>
 			<language type="gl">galícijčina</language>
 			<language type="gmh" draft="contributed">stredná horná nemčina</language>
-			<language type="gn">guaraní</language>
+			<language type="gn">guaraníjčina</language>
 			<language type="goh" draft="contributed">stará horná nemčina</language>
 			<language type="gon" draft="contributed">góndčina</language>
 			<language type="gor" draft="contributed">gorontalo</language>
@@ -289,8 +289,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">laoština</language>
 			<language type="lol">mongo</language>
 			<language type="loz">lozi</language>
+			<language type="lrc">severné luri</language>
 			<language type="lt">litovčina</language>
-			<language type="lu">luba-katanga</language>
+			<language type="lu">lubčina (katanžská)</language>
 			<language type="lua">luba-luluánčina</language>
 			<language type="lui" draft="contributed">luiseňo</language>
 			<language type="lun" draft="contributed">lunda</language>
@@ -337,12 +338,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="my">barmčina</language>
 			<language type="mye" draft="contributed">myene</language>
 			<language type="myv">erzjančina</language>
+			<language type="mzn">mázandaránčina</language>
 			<language type="na">nauru</language>
 			<language type="nap" draft="contributed">neapolčina</language>
 			<language type="naq">nama</language>
-			<language type="nb">nórsky bokmål</language>
+			<language type="nb">nórčina (bokmål)</language>
 			<language type="nd">severné ndebele</language>
-			<language type="nds" draft="contributed">dolná nemčina</language>
+			<language type="nds">dolná nemčina</language>
+			<language type="nds_NL">dolná saština</language>
 			<language type="ne">nepálčina</language>
 			<language type="new" draft="contributed">nevárčina</language>
 			<language type="ng">ndonga</language>
@@ -351,7 +354,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nl">holandčina</language>
 			<language type="nl_BE">flámčina</language>
 			<language type="nmg">kwasio</language>
-			<language type="nn">nórsky nynorsk</language>
+			<language type="nn">nórčina (nynorsk)</language>
 			<language type="nnh" draft="contributed">ngiemboon</language>
 			<language type="no">nórčina</language>
 			<language type="nog" draft="contributed">nogajčina</language>
@@ -391,7 +394,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="pt_BR">portugalčina (brazílska)</language>
 			<language type="pt_PT">portugalčina (európska)</language>
 			<language type="qu">kečuánčina</language>
-			<language type="quc">kʼicheʼ</language>
+			<language type="quc">kičé</language>
 			<language type="raj" draft="contributed">radžastančina</language>
 			<language type="rap" draft="contributed">rapanujčina</language>
 			<language type="rar" draft="contributed">rarotongan</language>
@@ -419,7 +422,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">sicílčina</language>
 			<language type="sco" draft="contributed">škótčina</language>
 			<language type="sd">sindhčina</language>
-			<language type="se">severné sami</language>
+			<language type="sdh">kurdčina (južná)</language>
+			<language type="se">lapončina (severná)</language>
 			<language type="see" draft="contributed">seneca</language>
 			<language type="seh">sena</language>
 			<language type="sel" draft="contributed">selkupčina</language>
@@ -435,10 +439,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sk">slovenčina</language>
 			<language type="sl">slovinčina</language>
 			<language type="sm">samojčina</language>
-			<language type="sma">južné sami</language>
-			<language type="smj">sami (lule)</language>
-			<language type="smn">sami (inari)</language>
-			<language type="sms">sami (skolt)</language>
+			<language type="sma">lapončina (južná)</language>
+			<language type="smj">lapončina (lulská)</language>
+			<language type="smn">lapončina (inarijská)</language>
+			<language type="sms">lapončina (skoltská)</language>
 			<language type="sn">šončina</language>
 			<language type="snk" draft="contributed">soninke</language>
 			<language type="so">somálčina</language>
@@ -456,8 +460,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">sumerčina</language>
 			<language type="sv">švédčina</language>
 			<language type="sw">svahilčina</language>
+			<language type="sw_CD">svahilčina (konžská)</language>
 			<language type="swb" draft="contributed">komorčina</language>
-			<language type="swc">svahilčina (konžská)</language>
 			<language type="syc" draft="contributed">klasická sýrčina</language>
 			<language type="syr">sýrčina</language>
 			<language type="ta">tamilčina</language>
@@ -512,9 +516,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal" draft="contributed">walamo</language>
 			<language type="war" draft="contributed">waray</language>
 			<language type="was" draft="contributed">washo</language>
-			<language type="wo">wolof</language>
+			<language type="wbp">warlpiri</language>
+			<language type="wo">wolofčina</language>
 			<language type="xal" draft="contributed">kalmyčtina</language>
-			<language type="xh">xhosa</language>
+			<language type="xh">xhoština</language>
 			<language type="xog">soga</language>
 			<language type="yao" draft="contributed">jao</language>
 			<language type="yap" draft="contributed">japčina</language>
@@ -543,7 +548,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Bali" draft="contributed">balijský</script>
 			<script type="Beng">bengálske</script>
 			<script type="Bopo">bopomofo</script>
-			<script type="Brai">braillovo písmo</script>
+			<script type="Brai">braillovo</script>
 			<script type="Cyrl">cyrilika</script>
 			<script type="Deva">dévanágarí</script>
 			<script type="Egyp" draft="contributed">egyptské hieroglyfy</script>
@@ -555,11 +560,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Gujr">gudžarátí</script>
 			<script type="Guru">gurmukhi</script>
 			<script type="Hang">hangul</script>
-			<script type="Hani">han</script>
+			<script type="Hani">čínske</script>
 			<script type="Hans">zjednodušené</script>
-			<script type="Hans" alt="stand-alone">han – zjednodušené</script>
+			<script type="Hans" alt="stand-alone">čínske zjednodušené</script>
 			<script type="Hant">tradičné</script>
-			<script type="Hant" alt="stand-alone">han – tradičné</script>
+			<script type="Hant" alt="stand-alone">čínske tradičné</script>
 			<script type="Hebr">hebrejské</script>
 			<script type="Hira">hiragana</script>
 			<script type="Jpan">japonské</script>
@@ -628,7 +633,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albánsko</territory>
 			<territory type="AM">Arménsko</territory>
-			<territory type="AN">Holandské Antily</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antarktída</territory>
 			<territory type="AR">Argentína</territory>
@@ -700,7 +704,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="FI">Fínsko</territory>
 			<territory type="FJ">Fidži</territory>
 			<territory type="FK">Falklandy</territory>
-			<territory type="FK" alt="variant">Malvíny</territory>
+			<territory type="FK" alt="variant">Falklandy (Malvíny)</territory>
 			<territory type="FM">Mikronézia</territory>
 			<territory type="FO">Faerské ostrovy</territory>
 			<territory type="FR">Francúzsko</territory>
@@ -907,6 +911,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">Číselné radenie</key>
 			<key type="colStrength" draft="contributed">Sila radenia</key>
 			<key type="currency">mena</key>
+			<key type="hc">hodinový cyklus (12 vs 24)</key>
+			<key type="lb">štýl koncov riadka</key>
+			<key type="ms">merná sústava</key>
 			<key type="numbers">čísla</key>
 			<key type="timezone" draft="contributed">Časové pásmo</key>
 			<key type="va" draft="contributed">Variant miestneho nastavenia</key>
@@ -914,95 +921,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x" draft="contributed">Súkromné použitie</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">arabsko-indické číslice</type>
-			<type type="arabext" key="numbers">rozšírené arabsko-indické číslice</type>
-			<type type="armn" key="numbers">arménske číslice</type>
-			<type type="armnlow" key="numbers">malé arménske číslice</type>
-			<type type="beng" key="numbers">bengálske číslice</type>
-			<type type="big5han" key="collation" draft="contributed">Tradičný čínsky Big5</type>
-			<type type="buddhist" key="calendar">buddhistický kalendár</type>
-			<type type="chinese" key="calendar">čínsky kalendár</type>
-			<type type="coptic" key="calendar" draft="contributed">Koptický kalendár</type>
-			<type type="dangi" key="calendar">kórejský kalendár</type>
-			<type type="deva" key="numbers">číslice dévanágarí</type>
-			<type type="dictionary" key="collation" draft="contributed">Usporiadanie slovníka</type>
-			<type type="ducet" key="collation">predvolené zoradenie unicode</type>
-			<type type="ethi" key="numbers">etiópske číslice</type>
-			<type type="ethiopic" key="calendar">etiópsky kalendár</type>
-			<type type="ethiopic-amete-alem" key="calendar" draft="contributed">Etiópsky kalendár Amete Alem</type>
-			<type type="finance" key="numbers" draft="contributed">Finančnícky zápis čísiel</type>
-			<type type="fullwide" key="numbers">číslice s celou šírkou</type>
-			<type type="gb2312han" key="collation" draft="contributed">Zjednodušený čínsky GB2312</type>
-			<type type="geor" key="numbers">gruzínske číslice</type>
-			<type type="gregorian" key="calendar">gregoriánsky kalendár</type>
-			<type type="grek" key="numbers">grécke číslice</type>
-			<type type="greklow" key="numbers">malé grécke číslice</type>
-			<type type="gujr" key="numbers">gudžarátske číslice</type>
-			<type type="guru" key="numbers">číslice gurumukhí</type>
-			<type type="hanidec" key="numbers">čínske desiatkové číslice</type>
-			<type type="hans" key="numbers">číslice zjednodušenej čínštiny</type>
-			<type type="hansfin" key="numbers">finančné číslice zjednodušenej čínštiny</type>
-			<type type="hant" key="numbers">číslice tradičnej čínštiny</type>
-			<type type="hantfin" key="numbers">finančné číslice tradičnej čínštiny</type>
-			<type type="hebr" key="numbers">hebrejské číslice</type>
-			<type type="hebrew" key="calendar">židovský kalendár</type>
-			<type type="identical" key="colStrength" draft="contributed">Radiť všetko</type>
-			<type type="indian" key="calendar" draft="contributed">Indický národný kalendár</type>
-			<type type="islamic" key="calendar">islamský kalendár</type>
-			<type type="islamic-civil" key="calendar">Islamský občiansky kalendár</type>
-			<type type="iso8601" key="calendar">kalendár ISO 8601</type>
-			<type type="japanese" key="calendar">japonský kalendár</type>
-			<type type="jpan" key="numbers">japonské číslice</type>
-			<type type="jpanfin" key="numbers">japonské finančné číslice</type>
-			<type type="khmr" key="numbers">khmérske číslice</type>
-			<type type="knda" key="numbers">kannadské číslice</type>
-			<type type="laoo" key="numbers">laoské číslice</type>
-			<type type="latn" key="numbers">arabské číslice</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">Najprv radiť malé písmená</type>
-			<type type="mlym" key="numbers">malajálamske číslice</type>
-			<type type="mong" key="numbers" draft="contributed">Mongolské číslice</type>
-			<type type="mymr" key="numbers">barmské číslice</type>
-			<type type="native" key="numbers" draft="contributed">Natívne číslice</type>
-			<type type="no" key="colBackwards" draft="contributed">Normálne radenie akcentov</type>
-			<type type="no" key="colCaseFirst" draft="contributed">Normálne radenie veľkých a malých písmen</type>
-			<type type="no" key="colCaseLevel" draft="contributed">Pri radení nerozlišovať veľké a malé písmená</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">Radiť slabičné písma (kana) samostatne</type>
-			<type type="no" key="colNormalization" draft="contributed">Radiť bez normalizácie</type>
-			<type type="no" key="colNumeric" draft="contributed">Radiť číslice jednotlivo</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">Radiť symboly</type>
-			<type type="orya" key="numbers">uríjske číslice</type>
-			<type type="persian" key="calendar">perzský kalendár</type>
-			<type type="phonebook" key="collation">Lexikografické triedenie</type>
-			<type type="phonetic" key="collation" draft="contributed">Fonetické radenie</type>
-			<type type="pinyin" key="collation">Triedenie pinyin</type>
-			<type type="primary" key="colStrength" draft="contributed">Radiť iba základné písmená</type>
-			<type type="quaternary" key="colStrength" draft="contributed">Radiť akcenty/veľké a malé písmená/šírku/kana</type>
-			<type type="reformed" key="collation" draft="contributed">Reformované usporiadanie</type>
-			<type type="roc" key="calendar">čínsky republikánsky kalendár</type>
-			<type type="roman" key="numbers">rímske číslice</type>
-			<type type="romanlow" key="numbers">malé rímske číslice</type>
-			<type type="search" key="collation">všeobecné vyhľadávanie</type>
-			<type type="searchjl" key="collation" draft="contributed">Hľadať podľa počiatočnej spoluhlásky písma Hangul</type>
-			<type type="secondary" key="colStrength" draft="contributed">Radiť akcenty</type>
-			<type type="shifted" key="colAlternate" draft="contributed">Pri radení ignorovať symboly</type>
-			<type type="standard" key="collation">štandardné zoradenie</type>
-			<type type="stroke" key="collation">Tiedenie podľa ťahov</type>
-			<type type="taml" key="numbers">číslice tradičnej tamilčiny</type>
-			<type type="tamldec" key="numbers">tamilské číslice</type>
-			<type type="telu" key="numbers">telugské číslice</type>
-			<type type="tertiary" key="colStrength" draft="contributed">Radiť akcenty/veľké a malé písmená/šírku</type>
-			<type type="thai" key="numbers">thajské číslice</type>
-			<type type="tibt" key="numbers">tibetské číslice</type>
-			<type type="traditional" key="collation">Tradičné</type>
-			<type type="traditional" key="numbers" draft="contributed">Tradičné číslovky</type>
-			<type type="unihan" key="collation" draft="contributed">Usporiadanie podľa znakov radikál</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">Najprv radiť veľké písmená</type>
-			<type type="vaii" key="numbers" draft="contributed">Vaiské číslice</type>
-			<type type="yes" key="colBackwards" draft="contributed">Radiť akcenty opačne</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">Pri radení rozlišovať veľké a malé písmená</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">Radiť slabičné písma (kana) inak</type>
-			<type type="yes" key="colNormalization" draft="contributed">Radenie podľa normalizovaného kódovania Unicode</type>
-			<type type="yes" key="colNumeric" draft="contributed">Numerické radenie číslic</type>
+			<type key="calendar" type="buddhist">buddhistický kalendár</type>
+			<type key="calendar" type="chinese">čínsky kalendár</type>
+			<type key="calendar" type="coptic" draft="contributed">Koptický kalendár</type>
+			<type key="calendar" type="dangi">kórejský kalendár</type>
+			<type key="calendar" type="ethiopic">etiópsky kalendár</type>
+			<type key="calendar" type="ethiopic-amete-alem" draft="contributed">Etiópsky kalendár Amete Alem</type>
+			<type key="calendar" type="gregorian">gregoriánsky kalendár</type>
+			<type key="calendar" type="hebrew">židovský kalendár</type>
+			<type key="calendar" type="indian" draft="contributed">Indický národný kalendár</type>
+			<type key="calendar" type="islamic">islamský kalendár</type>
+			<type key="calendar" type="islamic-civil">Islamský občiansky kalendár</type>
+			<type key="calendar" type="iso8601">kalendár ISO 8601</type>
+			<type key="calendar" type="japanese">japonský kalendár</type>
+			<type key="calendar" type="persian">perzský kalendár</type>
+			<type key="calendar" type="roc">čínsky republikánsky kalendár</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">Radiť symboly</type>
+			<type key="colAlternate" type="shifted" draft="contributed">Pri radení ignorovať symboly</type>
+			<type key="colBackwards" type="no" draft="contributed">Normálne radenie akcentov</type>
+			<type key="colBackwards" type="yes" draft="contributed">Radiť akcenty opačne</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">Najprv radiť malé písmená</type>
+			<type key="colCaseFirst" type="no" draft="contributed">Normálne radenie veľkých a malých písmen</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">Najprv radiť veľké písmená</type>
+			<type key="colCaseLevel" type="no" draft="contributed">Pri radení nerozlišovať veľké a malé písmená</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">Pri radení rozlišovať veľké a malé písmená</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">Radiť slabičné písma (kana) samostatne</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">Radiť slabičné písma (kana) inak</type>
+			<type key="collation" type="big5han" draft="contributed">Tradičný čínsky Big5</type>
+			<type key="collation" type="dictionary" draft="contributed">Usporiadanie slovníka</type>
+			<type key="collation" type="ducet">predvolené zoradenie unicode</type>
+			<type key="collation" type="gb2312han" draft="contributed">Zjednodušený čínsky GB2312</type>
+			<type key="collation" type="phonebook">Lexikografické triedenie</type>
+			<type key="collation" type="phonetic" draft="contributed">Fonetické radenie</type>
+			<type key="collation" type="pinyin">Triedenie pinyin</type>
+			<type key="collation" type="reformed" draft="contributed">Reformované usporiadanie</type>
+			<type key="collation" type="search">všeobecné vyhľadávanie</type>
+			<type key="collation" type="searchjl" draft="contributed">Hľadať podľa počiatočnej spoluhlásky písma Hangul</type>
+			<type key="collation" type="standard">štandardné zoradenie</type>
+			<type key="collation" type="stroke">Tiedenie podľa ťahov</type>
+			<type key="collation" type="traditional">Tradičné</type>
+			<type key="collation" type="unihan" draft="contributed">Usporiadanie podľa znakov radikál</type>
+			<type key="colNormalization" type="no" draft="contributed">Radiť bez normalizácie</type>
+			<type key="colNormalization" type="yes" draft="contributed">Radenie podľa normalizovaného kódovania Unicode</type>
+			<type key="colNumeric" type="no" draft="contributed">Radiť číslice jednotlivo</type>
+			<type key="colNumeric" type="yes" draft="contributed">Numerické radenie číslic</type>
+			<type key="colStrength" type="identical" draft="contributed">Radiť všetko</type>
+			<type key="colStrength" type="primary" draft="contributed">Radiť iba základné písmená</type>
+			<type key="colStrength" type="quaternary" draft="contributed">Radiť akcenty/veľké a malé písmená/šírku/kana</type>
+			<type key="colStrength" type="secondary" draft="contributed">Radiť akcenty</type>
+			<type key="colStrength" type="tertiary" draft="contributed">Radiť akcenty/veľké a malé písmená/šírku</type>
+			<type key="hc" type="h11">12-hodinový cyklus (0 – 11)</type>
+			<type key="hc" type="h12">12-hodinový cyklus (1 – 12)</type>
+			<type key="hc" type="h23">24-hodinový cyklus (0 – 23)</type>
+			<type key="hc" type="h24">24-hodinový cyklus (1 – 24)</type>
+			<type key="lb" type="loose">voľný štýl koncov riadka</type>
+			<type key="lb" type="normal">bežný štýl koncov riadka</type>
+			<type key="lb" type="strict">presný štýl koncov riadka</type>
+			<type key="ms" type="metric">metrická sústava</type>
+			<type key="ms" type="uksystem">britská merná sústava</type>
+			<type key="ms" type="ussystem">americká merná sústava</type>
+			<type key="numbers" type="arab">arabsko-indické číslice</type>
+			<type key="numbers" type="arabext">rozšírené arabsko-indické číslice</type>
+			<type key="numbers" type="armn">arménske číslice</type>
+			<type key="numbers" type="armnlow">malé arménske číslice</type>
+			<type key="numbers" type="beng">bengálske číslice</type>
+			<type key="numbers" type="deva">číslice dévanágarí</type>
+			<type key="numbers" type="ethi">etiópske číslice</type>
+			<type key="numbers" type="finance" draft="contributed">Finančnícky zápis čísiel</type>
+			<type key="numbers" type="fullwide">číslice s celou šírkou</type>
+			<type key="numbers" type="geor">gruzínske číslice</type>
+			<type key="numbers" type="grek">grécke číslice</type>
+			<type key="numbers" type="greklow">malé grécke číslice</type>
+			<type key="numbers" type="gujr">gudžarátske číslice</type>
+			<type key="numbers" type="guru">číslice gurumukhí</type>
+			<type key="numbers" type="hanidec">čínske desiatkové číslice</type>
+			<type key="numbers" type="hans">číslice zjednodušenej čínštiny</type>
+			<type key="numbers" type="hansfin">finančné číslice zjednodušenej čínštiny</type>
+			<type key="numbers" type="hant">číslice tradičnej čínštiny</type>
+			<type key="numbers" type="hantfin">finančné číslice tradičnej čínštiny</type>
+			<type key="numbers" type="hebr">hebrejské číslice</type>
+			<type key="numbers" type="jpan">japonské číslice</type>
+			<type key="numbers" type="jpanfin">japonské finančné číslice</type>
+			<type key="numbers" type="khmr">khmérske číslice</type>
+			<type key="numbers" type="knda">kannadské číslice</type>
+			<type key="numbers" type="laoo">laoské číslice</type>
+			<type key="numbers" type="latn">arabské číslice</type>
+			<type key="numbers" type="mlym">malajálamske číslice</type>
+			<type key="numbers" type="mong" draft="contributed">Mongolské číslice</type>
+			<type key="numbers" type="mymr">barmské číslice</type>
+			<type key="numbers" type="native" draft="contributed">Natívne číslice</type>
+			<type key="numbers" type="orya">uríjske číslice</type>
+			<type key="numbers" type="roman">rímske číslice</type>
+			<type key="numbers" type="romanlow">malé rímske číslice</type>
+			<type key="numbers" type="taml">číslice tradičnej tamilčiny</type>
+			<type key="numbers" type="tamldec">tamilské číslice</type>
+			<type key="numbers" type="telu">telugské číslice</type>
+			<type key="numbers" type="thai">thajské číslice</type>
+			<type key="numbers" type="tibt">tibetské číslice</type>
+			<type key="numbers" type="traditional" draft="contributed">Tradičné číslovky</type>
+			<type key="numbers" type="vaii" draft="contributed">Vaiské číslice</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">BGN</transformName>
@@ -1051,8 +1068,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<exemplarCharacters type="index" draft="contributed">[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 Ž]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‐ – , ; \: ! ? . … ‘ ‚ “ „ ( ) \[ \] § @ * / \&amp;]</exemplarCharacters>
 		<ellipsis type="final">{0}…</ellipsis>
-		<ellipsis type="initial">… {0}</ellipsis>
-		<ellipsis type="medial">{0}… {1}</ellipsis>
+		<ellipsis type="initial">…{0}</ellipsis>
+		<ellipsis type="medial">{0}…{1}</ellipsis>
 		<ellipsis type="word-final">{0} …</ellipsis>
 		<ellipsis type="word-initial">… {0}</ellipsis>
 		<ellipsis type="word-medial">{0} … {1}</ellipsis>
@@ -1070,17 +1087,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern>EEEE, d. MMMM y G</pattern>
+							<pattern>EEEE, d. M. y G</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
-							<pattern>d. MMMM y G</pattern>
+							<pattern>d. M. y G</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern>d.M.y G</pattern>
+							<pattern>d. M. y G</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -1092,58 +1109,59 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d.</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d.</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
-						<dateFormatItem id="GyMMMd" draft="contributed">d.M.y G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">E, d. MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMMd" draft="contributed">d. MMMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d. M. y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E d. M. y G</dateFormatItem>
+						<dateFormatItem id="GyMMMMd">d. M. y G</dateFormatItem>
 						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">H:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
-						<dateFormatItem id="M" draft="contributed">L.</dateFormatItem>
-						<dateFormatItem id="Md">d.M.</dateFormatItem>
-						<dateFormatItem id="MEd">E, d.M.</dateFormatItem>
-						<dateFormatItem id="MMM" draft="contributed">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, d. MMM</dateFormatItem>
+						<dateFormatItem id="M">M.</dateFormatItem>
+						<dateFormatItem id="Md">d. M.</dateFormatItem>
+						<dateFormatItem id="MEd">E d. M.</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd">d. M.</dateFormatItem>
+						<dateFormatItem id="MMMEd">E d. M.</dateFormatItem>
 						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E, d. MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMEd">E d. MMMM</dateFormatItem>
 						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
-						<dateFormatItem id="yyyyM">M.y G</dateFormatItem>
-						<dateFormatItem id="yyyyMd" draft="contributed">d.M.y G</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">E d. M. y G</dateFormatItem>
+						<dateFormatItem id="yyyyM">M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMd">d. M. y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E d. M. y GGGGG</dateFormatItem>
 						<dateFormatItem id="yyyyMMM">LLL y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMd" draft="contributed">d.M.y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMEd">E, d. MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">d. M. y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">E d. M. y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMM">LLLL y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMMd" draft="contributed">d. MMMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMMd">d. MMMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
 					</availableFormats>
@@ -1188,57 +1206,57 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">M. – M.</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d.M. – d.M.</greatestDifference>
-							<greatestDifference id="M">d.M. – d.M.</greatestDifference>
+							<greatestDifference id="d">d. M. – d. M.</greatestDifference>
+							<greatestDifference id="M">d. M. – d. M.</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, d.M. – E, d.M.</greatestDifference>
-							<greatestDifference id="M">E, d.M. – E, d.M.</greatestDifference>
+							<greatestDifference id="d">E d. M. – E d. M.</greatestDifference>
+							<greatestDifference id="M">E d. M. – E d. M.</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
 							<greatestDifference id="M">LLL – LLL</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d. – d. MMM</greatestDifference>
-							<greatestDifference id="M">d. MMM – d. MMM</greatestDifference>
+							<greatestDifference id="d">d. – d. M.</greatestDifference>
+							<greatestDifference id="M">d. M. – d. M.</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d. – E, d. MMM</greatestDifference>
-							<greatestDifference id="M">E, d. MMM – E, d. MMM</greatestDifference>
+							<greatestDifference id="d">E d. – E d. M.</greatestDifference>
+							<greatestDifference id="M">E d. M. – E d. M.</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M" draft="contributed">LLLL–LLLL</greatestDifference>
+							<greatestDifference id="M">LLLL – LLLL</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
 							<greatestDifference id="y">y – y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M.y – M.y G</greatestDifference>
-							<greatestDifference id="y">M.y – M.y G</greatestDifference>
+							<greatestDifference id="M">M/y – M/y GGGGG</greatestDifference>
+							<greatestDifference id="y">M/y – M/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d.M.y – d.M.y G</greatestDifference>
-							<greatestDifference id="M">d.M.y – d.M.y G</greatestDifference>
-							<greatestDifference id="y">d.M.y – d.M.y G</greatestDifference>
+							<greatestDifference id="d">d. M. y – d. M. y G</greatestDifference>
+							<greatestDifference id="M">d. M. y – d. M. y G</greatestDifference>
+							<greatestDifference id="y">d. M. y – d. M. y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, d.M.y – E, d.M.y G</greatestDifference>
-							<greatestDifference id="M">E, d.M.y – E, d.M.y G</greatestDifference>
-							<greatestDifference id="y">E, d.M.y – E, d.M.y G</greatestDifference>
+							<greatestDifference id="d">E d. M. y – E d. M. y G</greatestDifference>
+							<greatestDifference id="M">E d. M. y – E d. M. y G</greatestDifference>
+							<greatestDifference id="y">E d. M. y – E d. M. y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
 							<greatestDifference id="M">LLL – LLL y G</greatestDifference>
 							<greatestDifference id="y">LLL y – LLL y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d. – d. MMM y G</greatestDifference>
-							<greatestDifference id="M">d. MMM – d. MMM y G</greatestDifference>
-							<greatestDifference id="y">d. MMM y – d. MMM y G</greatestDifference>
+							<greatestDifference id="d">d. – d. M. y G</greatestDifference>
+							<greatestDifference id="M">d. M. – d. M. y G</greatestDifference>
+							<greatestDifference id="y">d. M. y – d. M. y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d. – E, d. MMM y G</greatestDifference>
-							<greatestDifference id="M">E, d. MMM – E, d. MMM y G</greatestDifference>
-							<greatestDifference id="y">E, d. MMM y – E, d. MMM y G</greatestDifference>
+							<greatestDifference id="d">E d. – E d. M. y G</greatestDifference>
+							<greatestDifference id="M">E d. M. – E d. M. y G</greatestDifference>
+							<greatestDifference id="y">E d. M. y – E d. M. y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
 							<greatestDifference id="M">LLLL – LLLL y G</greatestDifference>
@@ -1350,22 +1368,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<day type="sat">so</day>
 						</dayWidth>
 						<dayWidth type="narrow">
-							<day type="sun" draft="contributed">N</day>
-							<day type="mon" draft="contributed">P</day>
-							<day type="tue" draft="contributed">U</day>
-							<day type="wed" draft="contributed">S</day>
-							<day type="thu" draft="contributed">Š</day>
-							<day type="fri" draft="contributed">P</day>
-							<day type="sat" draft="contributed">S</day>
+							<day type="sun" draft="contributed">n</day>
+							<day type="mon" draft="contributed">p</day>
+							<day type="tue" draft="contributed">u</day>
+							<day type="wed" draft="contributed">s</day>
+							<day type="thu" draft="contributed">š</day>
+							<day type="fri" draft="contributed">p</day>
+							<day type="sat" draft="contributed">s</day>
 						</dayWidth>
 						<dayWidth type="short">
-							<day type="sun">Ne</day>
-							<day type="mon">Po</day>
-							<day type="tue">Ut</day>
-							<day type="wed">St</day>
-							<day type="thu">Št</day>
-							<day type="fri">Pi</day>
-							<day type="sat">So</day>
+							<day type="sun">ne</day>
+							<day type="mon">po</day>
+							<day type="tue">ut</day>
+							<day type="wed">st</day>
+							<day type="thu">št</day>
+							<day type="fri">pi</day>
+							<day type="sat">so</day>
 						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">nedeľa</day>
@@ -1388,22 +1406,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<day type="sat" draft="contributed">so</day>
 						</dayWidth>
 						<dayWidth type="narrow">
-							<day type="sun">N</day>
-							<day type="mon">P</day>
-							<day type="tue">U</day>
-							<day type="wed">S</day>
-							<day type="thu">Š</day>
-							<day type="fri">P</day>
-							<day type="sat">S</day>
+							<day type="sun">n</day>
+							<day type="mon">p</day>
+							<day type="tue">u</day>
+							<day type="wed">s</day>
+							<day type="thu">š</day>
+							<day type="fri">p</day>
+							<day type="sat">s</day>
 						</dayWidth>
 						<dayWidth type="short">
-							<day type="sun">Ne</day>
-							<day type="mon">Po</day>
-							<day type="tue">Ut</day>
-							<day type="wed">St</day>
-							<day type="thu">Št</day>
-							<day type="fri">Pi</day>
-							<day type="sat">So</day>
+							<day type="sun">ne</day>
+							<day type="mon">po</day>
+							<day type="tue">ut</day>
+							<day type="wed">st</day>
+							<day type="thu">št</day>
+							<day type="fri">pi</day>
+							<day type="sat">so</day>
 						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun" draft="contributed">nedeľa</day>
@@ -1460,15 +1478,73 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">o poln.</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">napol.</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">ráno</dayPeriod>
+							<dayPeriod type="morning2">dopol.</dayPeriod>
+							<dayPeriod type="afternoon1">popol.</dayPeriod>
+							<dayPeriod type="evening1">večer</dayPeriod>
+							<dayPeriod type="night1">v noci</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">dop.</dayPeriod>
-							<dayPeriod type="noon">pol.</dayPeriod>
-							<dayPeriod type="pm">odp.</dayPeriod>
+							<dayPeriod type="midnight">o poln.</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">nap.</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">ráno</dayPeriod>
+							<dayPeriod type="morning2">dop.</dayPeriod>
+							<dayPeriod type="afternoon1">pop.</dayPeriod>
+							<dayPeriod type="evening1">več.</dayPeriod>
+							<dayPeriod type="night1">v n.</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">dopoludnia</dayPeriod>
+							<dayPeriod type="midnight">o polnoci</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">napoludnie</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">ráno</dayPeriod>
+							<dayPeriod type="morning2">dopoludnia</dayPeriod>
+							<dayPeriod type="afternoon1">popoludní</dayPeriod>
+							<dayPeriod type="evening1">večer</dayPeriod>
+							<dayPeriod type="night1">v noci</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">poln.</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">pol.</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">ráno</dayPeriod>
+							<dayPeriod type="morning2">dopol.</dayPeriod>
+							<dayPeriod type="afternoon1">popol.</dayPeriod>
+							<dayPeriod type="evening1">večer</dayPeriod>
+							<dayPeriod type="night1">noc</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">poln.</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">pol.</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">ráno</dayPeriod>
+							<dayPeriod type="morning2">dop.</dayPeriod>
+							<dayPeriod type="afternoon1">pop.</dayPeriod>
+							<dayPeriod type="evening1">več.</dayPeriod>
+							<dayPeriod type="night1">noc</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">polnoc</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
 							<dayPeriod type="noon">poludnie</dayPeriod>
-							<dayPeriod type="pm">odpoludnia</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">ráno</dayPeriod>
+							<dayPeriod type="morning2">dopoludnie</dayPeriod>
+							<dayPeriod type="afternoon1">popoludnie</dayPeriod>
+							<dayPeriod type="evening1">večer</dayPeriod>
+							<dayPeriod type="night1">noc</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1504,7 +1580,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>dd.MM.yy</pattern>
+							<pattern>d.M.yy</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -1562,29 +1638,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLLL y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. M. y G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">E, d. MMMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMMd">d. MMMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d. M. y G</dateFormatItem>
+						<dateFormatItem id="GyMMMMd">d. M. y G</dateFormatItem>
 						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">H:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">H:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">H:mm v</dateFormatItem>
 						<dateFormatItem id="M">L.</dateFormatItem>
 						<dateFormatItem id="Md">d. M.</dateFormatItem>
-						<dateFormatItem id="MEd">E, d. M.</dateFormatItem>
+						<dateFormatItem id="MEd">E d. M.</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d. M</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, d. M.</dateFormatItem>
+						<dateFormatItem id="MMMd">d. M.</dateFormatItem>
+						<dateFormatItem id="MMMEd">E d. M.</dateFormatItem>
 						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E, d. MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMEd">E d. MMMM</dateFormatItem>
 						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">M/y</dateFormatItem>
 						<dateFormatItem id="yMd">d. M. y</dateFormatItem>
 						<dateFormatItem id="yMEd">E d. M. y</dateFormatItem>
-						<dateFormatItem id="yMMM">LLLL y</dateFormatItem>
+						<dateFormatItem id="yMMM">M/y</dateFormatItem>
 						<dateFormatItem id="yMMMd">d. M. y</dateFormatItem>
 						<dateFormatItem id="yMMMEd">E d. M. y</dateFormatItem>
 						<dateFormatItem id="yMMMM">LLLL y</dateFormatItem>
@@ -1636,23 +1716,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">M. – M.</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d.M. – d.M.</greatestDifference>
-							<greatestDifference id="M">d.M. – d.M.</greatestDifference>
+							<greatestDifference id="d">d. M. – d. M.</greatestDifference>
+							<greatestDifference id="M">d. M. – d. M.</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, d.M. – E, d.M.</greatestDifference>
-							<greatestDifference id="M">E, d.M. – E, d.M.</greatestDifference>
+							<greatestDifference id="d">E d. M. – E d. M.</greatestDifference>
+							<greatestDifference id="M">E d. M. – E d. M.</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
 							<greatestDifference id="M">LLL – LLL</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d. – d. MMM</greatestDifference>
-							<greatestDifference id="M">d. MMM – d. MMM</greatestDifference>
+							<greatestDifference id="d">d. – d. M.</greatestDifference>
+							<greatestDifference id="M">d. M. – d. M.</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d. – E, d. MMM</greatestDifference>
-							<greatestDifference id="M">E, d. MMM – E, d. MMM</greatestDifference>
+							<greatestDifference id="d">E d. – E d. M.</greatestDifference>
+							<greatestDifference id="M">E d. M. – E d. M.</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMM">
 							<greatestDifference id="M">LLLL – LLLL</greatestDifference>
@@ -1661,35 +1741,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="y">y – y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M.y – M.y</greatestDifference>
-							<greatestDifference id="y">M.y – M.y</greatestDifference>
+							<greatestDifference id="M">M/y – M/y</greatestDifference>
+							<greatestDifference id="y">M/y – M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d.M.y – d.M.y</greatestDifference>
-							<greatestDifference id="M">d.M.y – d.M.y</greatestDifference>
-							<greatestDifference id="y">d.M.y – d.M.y</greatestDifference>
+							<greatestDifference id="d">d. M. y – d. M. y</greatestDifference>
+							<greatestDifference id="M">d. M. y – d. M. y</greatestDifference>
+							<greatestDifference id="y">d. M. y – d. M. y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, d.M.y – E, d.M.y</greatestDifference>
-							<greatestDifference id="M">E, d.M.y – E, d.M.y</greatestDifference>
-							<greatestDifference id="y">E, d.M.y – E, d.M.y</greatestDifference>
+							<greatestDifference id="d">E d. M. y – E d. M. y</greatestDifference>
+							<greatestDifference id="M">E d. M. y – E d. M. y</greatestDifference>
+							<greatestDifference id="y">E d. M. y – E d. M. y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">LLL – LLL y</greatestDifference>
-							<greatestDifference id="y">LLL – LLL y</greatestDifference>
+							<greatestDifference id="M">M – M/y</greatestDifference>
+							<greatestDifference id="y">M/y – M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d. – d. MMM y</greatestDifference>
-							<greatestDifference id="M">y MMM d – MMM d</greatestDifference>
-							<greatestDifference id="y">d. MMM y – d. MMM y</greatestDifference>
+							<greatestDifference id="d">d. – d. M. y</greatestDifference>
+							<greatestDifference id="M">d. M. – d. M. y</greatestDifference>
+							<greatestDifference id="y">d. M. y – d. M. y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d. – E, d. MMM y</greatestDifference>
-							<greatestDifference id="M">E, d. MMM – E, d. MMM y</greatestDifference>
-							<greatestDifference id="y">E, d. MMM y – E, d. MMM y</greatestDifference>
+							<greatestDifference id="d">E d. – E d. M. y</greatestDifference>
+							<greatestDifference id="M">E d. M. – E d. M. y</greatestDifference>
+							<greatestDifference id="y">E d. M. y – E d. M. y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">LLLL y – LLLL y</greatestDifference>
+							<greatestDifference id="M">LLLL – LLLL y</greatestDifference>
 							<greatestDifference id="y">LLLL y – LLLL y</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
@@ -1714,7 +1794,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relativeTime type="past">
 					<relativeTimePattern count="one">pred {0} rokom</relativeTimePattern>
 					<relativeTimePattern count="few">pred {0} rokmi</relativeTimePattern>
-					<relativeTimePattern count="many">pred {0} rokom</relativeTimePattern>
+					<relativeTimePattern count="many">pred {0} roka</relativeTimePattern>
 					<relativeTimePattern count="other">pred {0} rokmi</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -1750,6 +1830,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter">
 				<displayName>štvrťrok</displayName>
+				<relative type="-1" draft="contributed">minulý štvrťrok</relative>
+				<relative type="0" draft="contributed">tento štvrťrok</relative>
+				<relative type="1" draft="contributed">budúci štvrťrok</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">o {0} štvrťrok</relativeTimePattern>
 					<relativeTimePattern count="few">o {0} štvrťroky</relativeTimePattern>
@@ -1759,12 +1842,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relativeTime type="past">
 					<relativeTimePattern count="one">pred {0} štvrťrokom</relativeTimePattern>
 					<relativeTimePattern count="few">pred {0} štvrťrokmi</relativeTimePattern>
-					<relativeTimePattern count="many">pred {0} štvrťrokom</relativeTimePattern>
+					<relativeTimePattern count="many">pred {0} štvrťroka</relativeTimePattern>
 					<relativeTimePattern count="other">pred {0} štvrťrokmi</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-short">
 				<displayName>Q</displayName>
+				<relative type="-1" draft="contributed">minulý štvrťr.</relative>
+				<relative type="0" draft="contributed">tento štvrťr.</relative>
+				<relative type="1" draft="contributed">budúci štvrťr.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">o {0} štvrťr.</relativeTimePattern>
 					<relativeTimePattern count="few">o {0} štvrťr.</relativeTimePattern>
@@ -1780,6 +1866,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>Q</displayName>
+				<relative type="-1" draft="contributed">minulý štvrťr.</relative>
+				<relative type="0" draft="contributed">tento štvrťr.</relative>
+				<relative type="1" draft="contributed">budúci štvrťr.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">o {0} štvrťr.</relativeTimePattern>
 					<relativeTimePattern count="few">o {0} štvrťr.</relativeTimePattern>
@@ -1807,7 +1896,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relativeTime type="past">
 					<relativeTimePattern count="one">pred {0} mesiacom</relativeTimePattern>
 					<relativeTimePattern count="few">pred {0} mesiacmi</relativeTimePattern>
-					<relativeTimePattern count="many">pred {0} mesiacom</relativeTimePattern>
+					<relativeTimePattern count="many">pred {0} mesiaca</relativeTimePattern>
 					<relativeTimePattern count="other">pred {0} mesiacmi</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -1829,16 +1918,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="month-narrow">
 				<displayName>mes.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="contributed">o {0} mes.</relativeTimePattern>
-					<relativeTimePattern count="few" draft="contributed">o {0} mes.</relativeTimePattern>
-					<relativeTimePattern count="many" draft="contributed">o {0} mes.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">o {0} mes.</relativeTimePattern>
+					<relativeTimePattern count="one">o {0} mes.</relativeTimePattern>
+					<relativeTimePattern count="few">o {0} mes.</relativeTimePattern>
+					<relativeTimePattern count="many">o {0} mes.</relativeTimePattern>
+					<relativeTimePattern count="other">o {0} mes.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="contributed">pred {0} mes.</relativeTimePattern>
-					<relativeTimePattern count="few" draft="contributed">pred {0} mes.</relativeTimePattern>
-					<relativeTimePattern count="many" draft="contributed">pred {0} mes.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">pred {0} mes.</relativeTimePattern>
+					<relativeTimePattern count="one">pred {0} mes.</relativeTimePattern>
+					<relativeTimePattern count="few">pred {0} mes.</relativeTimePattern>
+					<relativeTimePattern count="many">pred {0} mes.</relativeTimePattern>
+					<relativeTimePattern count="other">pred {0} mes.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week">
@@ -1855,7 +1944,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relativeTime type="past">
 					<relativeTimePattern count="one">pred {0} týždňom</relativeTimePattern>
 					<relativeTimePattern count="few">pred {0} týždňami</relativeTimePattern>
-					<relativeTimePattern count="many">pred {0} týždňom</relativeTimePattern>
+					<relativeTimePattern count="many">pred {0} týždňa</relativeTimePattern>
 					<relativeTimePattern count="other">pred {0} týždňami</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -1877,16 +1966,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="week-narrow">
 				<displayName>týž.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="contributed">o {0} týž.</relativeTimePattern>
-					<relativeTimePattern count="few" draft="contributed">o {0} týž.</relativeTimePattern>
-					<relativeTimePattern count="many" draft="contributed">o {0} týž.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">o {0} týž.</relativeTimePattern>
+					<relativeTimePattern count="one">o {0} týž.</relativeTimePattern>
+					<relativeTimePattern count="few">o {0} týž.</relativeTimePattern>
+					<relativeTimePattern count="many">o {0} týž.</relativeTimePattern>
+					<relativeTimePattern count="other">o {0} týž.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="contributed">pred {0} týž.</relativeTimePattern>
-					<relativeTimePattern count="few" draft="contributed">pred {0} týž.</relativeTimePattern>
-					<relativeTimePattern count="many" draft="contributed">pred {0} týž.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">pred {0} týž.</relativeTimePattern>
+					<relativeTimePattern count="one">pred {0} týž.</relativeTimePattern>
+					<relativeTimePattern count="few">pred {0} týž.</relativeTimePattern>
+					<relativeTimePattern count="many">pred {0} týž.</relativeTimePattern>
+					<relativeTimePattern count="other">pred {0} týž.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day">
@@ -1905,7 +1994,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relativeTime type="past">
 					<relativeTimePattern count="one">pred {0} dňom</relativeTimePattern>
 					<relativeTimePattern count="few">pred {0} dňami</relativeTimePattern>
-					<relativeTimePattern count="many">pred {0} dňom</relativeTimePattern>
+					<relativeTimePattern count="many">pred {0} dňa</relativeTimePattern>
 					<relativeTimePattern count="other">pred {0} dňami</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -1927,16 +2016,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="day-narrow">
 				<displayName>d.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">o {0} d</relativeTimePattern>
-					<relativeTimePattern count="few">o {0} d</relativeTimePattern>
-					<relativeTimePattern count="many">o {0} d</relativeTimePattern>
-					<relativeTimePattern count="other">o {0} d</relativeTimePattern>
+					<relativeTimePattern count="one">o {0} d.</relativeTimePattern>
+					<relativeTimePattern count="few">o {0} d.</relativeTimePattern>
+					<relativeTimePattern count="many">o {0} d.</relativeTimePattern>
+					<relativeTimePattern count="other">o {0} d.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">pred {0} d</relativeTimePattern>
-					<relativeTimePattern count="few">pred {0} d</relativeTimePattern>
-					<relativeTimePattern count="many">pred {0} d</relativeTimePattern>
-					<relativeTimePattern count="other">pred {0} d</relativeTimePattern>
+					<relativeTimePattern count="one">pred {0} d.</relativeTimePattern>
+					<relativeTimePattern count="few">pred {0} d.</relativeTimePattern>
+					<relativeTimePattern count="many">pred {0} d.</relativeTimePattern>
+					<relativeTimePattern count="other">pred {0} d.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="weekday">
@@ -1978,9 +2067,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">budúci utorok</relative>
 			</field>
 			<field type="tue-short">
-				<relative type="-1">minulý ut.</relative>
-				<relative type="0">tento ut.</relative>
-				<relative type="1">budúci ut.</relative>
+				<relative type="-1">minulý utor.</relative>
+				<relative type="0">tento utor.</relative>
+				<relative type="1">budúci utor.</relative>
 			</field>
 			<field type="tue-narrow">
 				<relative type="-1">minulý ut.</relative>
@@ -2106,7 +2195,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relativeTime type="past">
 					<relativeTimePattern count="one">pred {0} minútou</relativeTimePattern>
 					<relativeTimePattern count="few">pred {0} minútami</relativeTimePattern>
-					<relativeTimePattern count="many">pred {0} minútou</relativeTimePattern>
+					<relativeTimePattern count="many">pred {0} minúty</relativeTimePattern>
 					<relativeTimePattern count="other">pred {0} minútami</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -2152,7 +2241,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relativeTime type="past">
 					<relativeTimePattern count="one">pred {0} sekundou</relativeTimePattern>
 					<relativeTimePattern count="few">pred {0} sekundami</relativeTimePattern>
-					<relativeTimePattern count="many">Pred {0} sekundami</relativeTimePattern>
+					<relativeTimePattern count="many">pred {0} sekundy</relativeTimePattern>
 					<relativeTimePattern count="other">pred {0} sekundami</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -2194,15 +2283,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<hourFormat>+HH:mm;-HH:mm</hourFormat>
 			<gmtFormat>GMT{0}</gmtFormat>
 			<gmtZeroFormat>GMT</gmtZeroFormat>
-			<regionFormat>Časové pásmo {0}</regionFormat>
-			<regionFormat type="daylight" draft="contributed">{0} (+1)</regionFormat>
-			<regionFormat type="standard" draft="contributed">{0} (+0)</regionFormat>
+			<regionFormat>časové pásmo {0}</regionFormat>
+			<regionFormat type="daylight">{0} (+1)</regionFormat>
+			<regionFormat type="standard">{0} (+0)</regionFormat>
 			<fallbackFormat>{1} ({0})</fallbackFormat>
 			<zone type="Etc/Unknown">
-				<exemplarCity>Neznáme mesto</exemplarCity>
+				<exemplarCity>neznáme mesto</exemplarCity>
 			</zone>
 			<zone type="Europe/Andorra">
-				<exemplarCity draft="contributed">Andorra</exemplarCity>
+				<exemplarCity>Andorra</exemplarCity>
 			</zone>
 			<zone type="Asia/Dubai">
 				<exemplarCity>Dubaj</exemplarCity>
@@ -2211,10 +2300,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Kábul</exemplarCity>
 			</zone>
 			<zone type="America/Antigua">
-				<exemplarCity draft="contributed">Antigua</exemplarCity>
+				<exemplarCity>Antigua</exemplarCity>
 			</zone>
 			<zone type="America/Anguilla">
-				<exemplarCity draft="contributed">Anguilla</exemplarCity>
+				<exemplarCity>Anguilla</exemplarCity>
 			</zone>
 			<zone type="Europe/Tirane">
 				<exemplarCity>Tirana</exemplarCity>
@@ -2223,7 +2312,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Jerevan</exemplarCity>
 			</zone>
 			<zone type="Africa/Luanda">
-				<exemplarCity draft="contributed">Luanda</exemplarCity>
+				<exemplarCity>Luanda</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Rothera">
 				<exemplarCity>Rothera</exemplarCity>
@@ -2235,7 +2324,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Troll</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Syowa">
-				<exemplarCity>Syowa</exemplarCity>
+				<exemplarCity>Šówa</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Mawson">
 				<exemplarCity>Mawson</exemplarCity>
@@ -2256,100 +2345,100 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>McMurdo</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity draft="contributed">Rio Gallegos</exemplarCity>
+				<exemplarCity>Rio Gallegos</exemplarCity>
 			</zone>
 			<zone type="America/Mendoza">
-				<exemplarCity draft="contributed">Mendoza</exemplarCity>
+				<exemplarCity>Mendoza</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/San_Juan">
-				<exemplarCity draft="contributed">San Juan</exemplarCity>
+				<exemplarCity>San Juan</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity draft="contributed">Ushuaia</exemplarCity>
+				<exemplarCity>Ushuaia</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity draft="contributed">La Rioja</exemplarCity>
+				<exemplarCity>La Rioja</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/San_Luis">
-				<exemplarCity draft="contributed">San Luis</exemplarCity>
+				<exemplarCity>San Luis</exemplarCity>
 			</zone>
 			<zone type="America/Catamarca">
-				<exemplarCity draft="contributed">Catamarca</exemplarCity>
+				<exemplarCity>Catamarca</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Salta">
-				<exemplarCity draft="contributed">Salta</exemplarCity>
+				<exemplarCity>Salta</exemplarCity>
 			</zone>
 			<zone type="America/Jujuy">
-				<exemplarCity draft="contributed">Jujuy</exemplarCity>
+				<exemplarCity>Jujuy</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Tucuman">
-				<exemplarCity draft="contributed">Tucuman</exemplarCity>
+				<exemplarCity>Tucuman</exemplarCity>
 			</zone>
 			<zone type="America/Cordoba">
 				<exemplarCity>Córdoba</exemplarCity>
 			</zone>
 			<zone type="America/Buenos_Aires">
-				<exemplarCity draft="contributed">Buenos Aires</exemplarCity>
+				<exemplarCity>Buenos Aires</exemplarCity>
 			</zone>
 			<zone type="Pacific/Pago_Pago">
-				<exemplarCity draft="contributed">Pago Pago</exemplarCity>
+				<exemplarCity>Pago Pago</exemplarCity>
 			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Viedeň</exemplarCity>
 			</zone>
 			<zone type="Australia/Perth">
-				<exemplarCity draft="contributed">Perth</exemplarCity>
+				<exemplarCity>Perth</exemplarCity>
 			</zone>
 			<zone type="Australia/Eucla">
-				<exemplarCity draft="contributed">Eucla</exemplarCity>
+				<exemplarCity>Eucla</exemplarCity>
 			</zone>
 			<zone type="Australia/Darwin">
-				<exemplarCity draft="contributed">Darwin</exemplarCity>
+				<exemplarCity>Darwin</exemplarCity>
 			</zone>
 			<zone type="Australia/Adelaide">
-				<exemplarCity draft="contributed">Adelaide</exemplarCity>
+				<exemplarCity>Adelaide</exemplarCity>
 			</zone>
 			<zone type="Australia/Broken_Hill">
-				<exemplarCity draft="contributed">Broken Hill</exemplarCity>
+				<exemplarCity>Broken Hill</exemplarCity>
 			</zone>
 			<zone type="Australia/Currie">
-				<exemplarCity draft="contributed">Currie</exemplarCity>
+				<exemplarCity>Currie</exemplarCity>
 			</zone>
 			<zone type="Australia/Melbourne">
-				<exemplarCity draft="contributed">Melbourne</exemplarCity>
+				<exemplarCity>Melbourne</exemplarCity>
 			</zone>
 			<zone type="Australia/Hobart">
-				<exemplarCity draft="contributed">Hobart</exemplarCity>
+				<exemplarCity>Hobart</exemplarCity>
 			</zone>
 			<zone type="Australia/Lindeman">
-				<exemplarCity draft="contributed">Lindeman</exemplarCity>
+				<exemplarCity>Lindeman</exemplarCity>
 			</zone>
 			<zone type="Australia/Sydney">
-				<exemplarCity draft="contributed">Sydney</exemplarCity>
+				<exemplarCity>Sydney</exemplarCity>
 			</zone>
 			<zone type="Australia/Brisbane">
-				<exemplarCity draft="contributed">Brisbane</exemplarCity>
+				<exemplarCity>Brisbane</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Macquarie">
-				<exemplarCity draft="contributed">Macquarie</exemplarCity>
+				<exemplarCity>Macquarie</exemplarCity>
 			</zone>
 			<zone type="Australia/Lord_Howe">
-				<exemplarCity draft="contributed">Lord Howe</exemplarCity>
+				<exemplarCity>Lord Howe</exemplarCity>
 			</zone>
 			<zone type="America/Aruba">
-				<exemplarCity draft="contributed">Aruba</exemplarCity>
+				<exemplarCity>Aruba</exemplarCity>
 			</zone>
 			<zone type="Europe/Mariehamn">
-				<exemplarCity draft="contributed">Mariehamn</exemplarCity>
+				<exemplarCity>Mariehamn</exemplarCity>
 			</zone>
 			<zone type="Asia/Baku">
-				<exemplarCity draft="contributed">Baku</exemplarCity>
+				<exemplarCity>Baku</exemplarCity>
 			</zone>
 			<zone type="Europe/Sarajevo">
-				<exemplarCity draft="contributed">Sarajevo</exemplarCity>
+				<exemplarCity>Sarajevo</exemplarCity>
 			</zone>
 			<zone type="America/Barbados">
-				<exemplarCity draft="contributed">Barbados</exemplarCity>
+				<exemplarCity>Barbados</exemplarCity>
 			</zone>
 			<zone type="Asia/Dhaka">
 				<exemplarCity>Dháka</exemplarCity>
@@ -2358,19 +2447,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Brusel</exemplarCity>
 			</zone>
 			<zone type="Africa/Ouagadougou">
-				<exemplarCity draft="contributed">Ouagadougou</exemplarCity>
+				<exemplarCity>Ouagadougou</exemplarCity>
 			</zone>
 			<zone type="Europe/Sofia">
-				<exemplarCity draft="contributed">Sofia</exemplarCity>
+				<exemplarCity>Sofia</exemplarCity>
 			</zone>
 			<zone type="Asia/Bahrain">
 				<exemplarCity>Bahrajn</exemplarCity>
 			</zone>
 			<zone type="Africa/Bujumbura">
-				<exemplarCity draft="contributed">Bujumbura</exemplarCity>
+				<exemplarCity>Bujumbura</exemplarCity>
 			</zone>
 			<zone type="Africa/Porto-Novo">
-				<exemplarCity draft="contributed">Porto-Novo</exemplarCity>
+				<exemplarCity>Porto-Novo</exemplarCity>
 			</zone>
 			<zone type="America/St_Barthelemy">
 				<exemplarCity>Svätý Bartolomej</exemplarCity>
@@ -2382,25 +2471,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Brunej</exemplarCity>
 			</zone>
 			<zone type="America/La_Paz">
-				<exemplarCity draft="contributed">La Paz</exemplarCity>
+				<exemplarCity>La Paz</exemplarCity>
 			</zone>
 			<zone type="America/Kralendijk">
-				<exemplarCity draft="contributed">Kralendijk</exemplarCity>
+				<exemplarCity>Kralendijk</exemplarCity>
 			</zone>
 			<zone type="America/Eirunepe">
 				<exemplarCity>Eirunepé</exemplarCity>
 			</zone>
 			<zone type="America/Rio_Branco">
-				<exemplarCity draft="contributed">Rio Branco</exemplarCity>
+				<exemplarCity>Rio Branco</exemplarCity>
 			</zone>
 			<zone type="America/Porto_Velho">
-				<exemplarCity draft="contributed">Porto Velho</exemplarCity>
+				<exemplarCity>Porto Velho</exemplarCity>
 			</zone>
 			<zone type="America/Boa_Vista">
-				<exemplarCity draft="contributed">Boa Vista</exemplarCity>
+				<exemplarCity>Boa Vista</exemplarCity>
 			</zone>
 			<zone type="America/Manaus">
-				<exemplarCity draft="contributed">Manaus</exemplarCity>
+				<exemplarCity>Manaus</exemplarCity>
 			</zone>
 			<zone type="America/Cuiaba">
 				<exemplarCity>Cuiabá</exemplarCity>
@@ -2409,124 +2498,124 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Santarém</exemplarCity>
 			</zone>
 			<zone type="America/Campo_Grande">
-				<exemplarCity draft="contributed">Campo Grande</exemplarCity>
+				<exemplarCity>Campo Grande</exemplarCity>
 			</zone>
 			<zone type="America/Belem">
 				<exemplarCity>Belém</exemplarCity>
 			</zone>
 			<zone type="America/Araguaina">
-				<exemplarCity draft="contributed">Araguaina</exemplarCity>
+				<exemplarCity>Araguaina</exemplarCity>
 			</zone>
 			<zone type="America/Sao_Paulo">
 				<exemplarCity>São Paulo</exemplarCity>
 			</zone>
 			<zone type="America/Bahia">
-				<exemplarCity draft="contributed">Bahia</exemplarCity>
+				<exemplarCity>Bahia</exemplarCity>
 			</zone>
 			<zone type="America/Fortaleza">
-				<exemplarCity draft="contributed">Fortaleza</exemplarCity>
+				<exemplarCity>Fortaleza</exemplarCity>
 			</zone>
 			<zone type="America/Maceio">
 				<exemplarCity>Maceió</exemplarCity>
 			</zone>
 			<zone type="America/Recife">
-				<exemplarCity draft="contributed">Recife</exemplarCity>
+				<exemplarCity>Recife</exemplarCity>
 			</zone>
 			<zone type="America/Noronha">
-				<exemplarCity draft="contributed">Noronha</exemplarCity>
+				<exemplarCity>Noronha</exemplarCity>
 			</zone>
 			<zone type="America/Nassau">
-				<exemplarCity draft="contributed">Nassau</exemplarCity>
+				<exemplarCity>Nassau</exemplarCity>
 			</zone>
 			<zone type="Asia/Thimphu">
-				<exemplarCity draft="contributed">Thimphu</exemplarCity>
+				<exemplarCity>Thimphu</exemplarCity>
 			</zone>
 			<zone type="Africa/Gaborone">
-				<exemplarCity draft="contributed">Gaborone</exemplarCity>
+				<exemplarCity>Gaborone</exemplarCity>
 			</zone>
 			<zone type="Europe/Minsk">
-				<exemplarCity draft="contributed">Minsk</exemplarCity>
+				<exemplarCity>Minsk</exemplarCity>
 			</zone>
 			<zone type="America/Belize">
-				<exemplarCity draft="contributed">Belize</exemplarCity>
+				<exemplarCity>Belize</exemplarCity>
 			</zone>
 			<zone type="America/Dawson">
-				<exemplarCity draft="contributed">Dawson</exemplarCity>
+				<exemplarCity>Dawson</exemplarCity>
 			</zone>
 			<zone type="America/Whitehorse">
-				<exemplarCity draft="contributed">Whitehorse</exemplarCity>
+				<exemplarCity>Whitehorse</exemplarCity>
 			</zone>
 			<zone type="America/Inuvik">
-				<exemplarCity draft="contributed">Inuvik</exemplarCity>
+				<exemplarCity>Inuvik</exemplarCity>
 			</zone>
 			<zone type="America/Vancouver">
-				<exemplarCity draft="contributed">Vancouver</exemplarCity>
+				<exemplarCity>Vancouver</exemplarCity>
 			</zone>
 			<zone type="America/Dawson_Creek">
-				<exemplarCity draft="contributed">Dawson Creek</exemplarCity>
+				<exemplarCity>Dawson Creek</exemplarCity>
 			</zone>
 			<zone type="America/Creston">
-				<exemplarCity draft="contributed">Creston</exemplarCity>
+				<exemplarCity>Creston</exemplarCity>
 			</zone>
 			<zone type="America/Yellowknife">
-				<exemplarCity draft="contributed">Yellowknife</exemplarCity>
+				<exemplarCity>Yellowknife</exemplarCity>
 			</zone>
 			<zone type="America/Edmonton">
-				<exemplarCity draft="contributed">Edmonton</exemplarCity>
+				<exemplarCity>Edmonton</exemplarCity>
 			</zone>
 			<zone type="America/Swift_Current">
-				<exemplarCity draft="contributed">Swift Current</exemplarCity>
+				<exemplarCity>Swift Current</exemplarCity>
 			</zone>
 			<zone type="America/Cambridge_Bay">
-				<exemplarCity draft="contributed">Cambridge Bay</exemplarCity>
+				<exemplarCity>Cambridge Bay</exemplarCity>
 			</zone>
 			<zone type="America/Regina">
-				<exemplarCity draft="contributed">Regina</exemplarCity>
+				<exemplarCity>Regina</exemplarCity>
 			</zone>
 			<zone type="America/Winnipeg">
-				<exemplarCity draft="contributed">Winnipeg</exemplarCity>
+				<exemplarCity>Winnipeg</exemplarCity>
 			</zone>
 			<zone type="America/Resolute">
-				<exemplarCity draft="contributed">Resolute</exemplarCity>
+				<exemplarCity>Resolute</exemplarCity>
 			</zone>
 			<zone type="America/Rainy_River">
-				<exemplarCity draft="contributed">Rainy River</exemplarCity>
+				<exemplarCity>Rainy River</exemplarCity>
 			</zone>
 			<zone type="America/Rankin_Inlet">
-				<exemplarCity draft="contributed">Rankin Inlet</exemplarCity>
+				<exemplarCity>Rankin Inlet</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
-				<exemplarCity draft="contributed">Atikokan</exemplarCity>
+				<exemplarCity>Atikokan</exemplarCity>
 			</zone>
 			<zone type="America/Thunder_Bay">
-				<exemplarCity draft="contributed">Thunder Bay</exemplarCity>
+				<exemplarCity>Thunder Bay</exemplarCity>
 			</zone>
 			<zone type="America/Nipigon">
-				<exemplarCity draft="contributed">Nipigon</exemplarCity>
+				<exemplarCity>Nipigon</exemplarCity>
 			</zone>
 			<zone type="America/Toronto">
-				<exemplarCity draft="contributed">Toronto</exemplarCity>
+				<exemplarCity>Toronto</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
-				<exemplarCity draft="contributed">Iqaluit</exemplarCity>
+				<exemplarCity>Iqaluit</exemplarCity>
 			</zone>
 			<zone type="America/Pangnirtung">
-				<exemplarCity draft="contributed">Pangnirtung</exemplarCity>
+				<exemplarCity>Pangnirtung</exemplarCity>
 			</zone>
 			<zone type="America/Moncton">
-				<exemplarCity draft="contributed">Moncton</exemplarCity>
+				<exemplarCity>Moncton</exemplarCity>
 			</zone>
 			<zone type="America/Halifax">
-				<exemplarCity draft="contributed">Halifax</exemplarCity>
+				<exemplarCity>Halifax</exemplarCity>
 			</zone>
 			<zone type="America/Goose_Bay">
-				<exemplarCity draft="contributed">Goose Bay</exemplarCity>
+				<exemplarCity>Goose Bay</exemplarCity>
 			</zone>
 			<zone type="America/Glace_Bay">
-				<exemplarCity draft="contributed">Glace Bay</exemplarCity>
+				<exemplarCity>Glace Bay</exemplarCity>
 			</zone>
 			<zone type="America/Blanc-Sablon">
-				<exemplarCity draft="contributed">Blanc-Sablon</exemplarCity>
+				<exemplarCity>Blanc-Sablon</exemplarCity>
 			</zone>
 			<zone type="America/St_Johns">
 				<exemplarCity>St. John’s</exemplarCity>
@@ -2535,34 +2624,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Kokosové ostrovy</exemplarCity>
 			</zone>
 			<zone type="Africa/Kinshasa">
-				<exemplarCity draft="contributed">Kinshasa</exemplarCity>
+				<exemplarCity>Kinshasa</exemplarCity>
 			</zone>
 			<zone type="Africa/Lubumbashi">
-				<exemplarCity draft="contributed">Lubumbashi</exemplarCity>
+				<exemplarCity>Lubumbashi</exemplarCity>
 			</zone>
 			<zone type="Africa/Bangui">
-				<exemplarCity draft="contributed">Bangui</exemplarCity>
+				<exemplarCity>Bangui</exemplarCity>
 			</zone>
 			<zone type="Africa/Brazzaville">
-				<exemplarCity draft="contributed">Brazzaville</exemplarCity>
+				<exemplarCity>Brazzaville</exemplarCity>
 			</zone>
 			<zone type="Europe/Zurich">
 				<exemplarCity>Zürich</exemplarCity>
 			</zone>
 			<zone type="Africa/Abidjan">
-				<exemplarCity draft="contributed">Abidjan</exemplarCity>
+				<exemplarCity>Abidjan</exemplarCity>
 			</zone>
 			<zone type="Pacific/Rarotonga">
-				<exemplarCity draft="contributed">Rarotonga</exemplarCity>
+				<exemplarCity>Rarotonga</exemplarCity>
 			</zone>
 			<zone type="Pacific/Easter">
 				<exemplarCity>Veľkonočný ostrov</exemplarCity>
 			</zone>
 			<zone type="America/Santiago">
-				<exemplarCity draft="contributed">Santiago</exemplarCity>
+				<exemplarCity>Santiago</exemplarCity>
 			</zone>
 			<zone type="Africa/Douala">
-				<exemplarCity draft="contributed">Douala</exemplarCity>
+				<exemplarCity>Douala</exemplarCity>
 			</zone>
 			<zone type="Asia/Urumqi">
 				<exemplarCity>Urumči</exemplarCity>
@@ -2571,13 +2660,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Šanghaj</exemplarCity>
 			</zone>
 			<zone type="America/Bogota">
-				<exemplarCity draft="contributed">Bogota</exemplarCity>
+				<exemplarCity>Bogotá</exemplarCity>
 			</zone>
 			<zone type="America/Costa_Rica">
 				<exemplarCity>Kostarika</exemplarCity>
 			</zone>
 			<zone type="America/Havana">
-				<exemplarCity draft="contributed">Havana</exemplarCity>
+				<exemplarCity>Havana</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Cape_Verde">
 				<exemplarCity>Kapverdy</exemplarCity>
@@ -2601,7 +2690,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Berlín</exemplarCity>
 			</zone>
 			<zone type="Africa/Djibouti">
-				<exemplarCity draft="contributed">Džibutsko</exemplarCity>
+				<exemplarCity>Džibuti</exemplarCity>
 			</zone>
 			<zone type="Europe/Copenhagen">
 				<exemplarCity>Kodaň</exemplarCity>
@@ -2610,7 +2699,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Dominika</exemplarCity>
 			</zone>
 			<zone type="America/Santo_Domingo">
-				<exemplarCity draft="contributed">Santo Domingo</exemplarCity>
+				<exemplarCity>Santo Domingo</exemplarCity>
 			</zone>
 			<zone type="Africa/Algiers">
 				<exemplarCity>Alžír</exemplarCity>
@@ -2619,10 +2708,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Galapágy</exemplarCity>
 			</zone>
 			<zone type="America/Guayaquil">
-				<exemplarCity draft="contributed">Guayaquil</exemplarCity>
+				<exemplarCity>Guayaquil</exemplarCity>
 			</zone>
 			<zone type="Europe/Tallinn">
-				<exemplarCity draft="contributed">Tallinn</exemplarCity>
+				<exemplarCity>Tallinn</exemplarCity>
 			</zone>
 			<zone type="Africa/Cairo">
 				<exemplarCity>Káhira</exemplarCity>
@@ -2631,37 +2720,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>El-Aaiún</exemplarCity>
 			</zone>
 			<zone type="Africa/Asmera">
-				<exemplarCity draft="contributed">Asmara</exemplarCity>
+				<exemplarCity>Asmara</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Canary">
 				<exemplarCity>Kanárske ostrovy</exemplarCity>
 			</zone>
 			<zone type="Africa/Ceuta">
-				<exemplarCity draft="contributed">Ceuta</exemplarCity>
+				<exemplarCity>Ceuta</exemplarCity>
 			</zone>
 			<zone type="Europe/Madrid">
-				<exemplarCity draft="contributed">Madrid</exemplarCity>
+				<exemplarCity>Madrid</exemplarCity>
 			</zone>
 			<zone type="Africa/Addis_Ababa">
 				<exemplarCity>Addis Abeba</exemplarCity>
 			</zone>
 			<zone type="Europe/Helsinki">
-				<exemplarCity draft="contributed">Helsinki</exemplarCity>
+				<exemplarCity>Helsinki</exemplarCity>
 			</zone>
 			<zone type="Pacific/Fiji">
 				<exemplarCity>Fidži</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Stanley">
-				<exemplarCity draft="contributed">Stanley</exemplarCity>
+				<exemplarCity>Stanley</exemplarCity>
 			</zone>
 			<zone type="Pacific/Truk">
-				<exemplarCity draft="contributed">Chuuk</exemplarCity>
+				<exemplarCity>Chuuk</exemplarCity>
 			</zone>
 			<zone type="Pacific/Ponape">
-				<exemplarCity draft="contributed">Pohnpei</exemplarCity>
+				<exemplarCity>Pohnpei</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kosrae">
-				<exemplarCity draft="contributed">Kosrae</exemplarCity>
+				<exemplarCity>Kosrae</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Faeroe">
 				<exemplarCity>Faerské ostrovy</exemplarCity>
@@ -2670,55 +2759,55 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Paríž</exemplarCity>
 			</zone>
 			<zone type="Africa/Libreville">
-				<exemplarCity draft="contributed">Libreville</exemplarCity>
+				<exemplarCity>Libreville</exemplarCity>
 			</zone>
 			<zone type="Europe/London">
 				<long>
-					<daylight>Britský letný čas</daylight>
+					<daylight>britský letný čas</daylight>
 				</long>
 				<exemplarCity>Londýn</exemplarCity>
 			</zone>
 			<zone type="America/Grenada">
-				<exemplarCity draft="contributed">Grenada</exemplarCity>
+				<exemplarCity>Grenada</exemplarCity>
 			</zone>
 			<zone type="Asia/Tbilisi">
-				<exemplarCity draft="contributed">Tbilisi</exemplarCity>
+				<exemplarCity>Tbilisi</exemplarCity>
 			</zone>
 			<zone type="America/Cayenne">
-				<exemplarCity draft="contributed">Cayenne</exemplarCity>
+				<exemplarCity>Cayenne</exemplarCity>
 			</zone>
 			<zone type="Europe/Guernsey">
-				<exemplarCity draft="contributed">Guernsey</exemplarCity>
+				<exemplarCity>Guernsey</exemplarCity>
 			</zone>
 			<zone type="Africa/Accra">
-				<exemplarCity draft="contributed">Accra</exemplarCity>
+				<exemplarCity>Accra</exemplarCity>
 			</zone>
 			<zone type="Europe/Gibraltar">
 				<exemplarCity>Gibraltár</exemplarCity>
 			</zone>
 			<zone type="America/Thule">
-				<exemplarCity draft="contributed">Thule</exemplarCity>
+				<exemplarCity>Thule</exemplarCity>
 			</zone>
 			<zone type="America/Godthab">
-				<exemplarCity draft="contributed">Nuuk</exemplarCity>
+				<exemplarCity>Nuuk</exemplarCity>
 			</zone>
 			<zone type="America/Scoresbysund">
-				<exemplarCity draft="contributed">Ittoqqortoormiit</exemplarCity>
+				<exemplarCity>Ittoqqortoormiit</exemplarCity>
 			</zone>
 			<zone type="America/Danmarkshavn">
-				<exemplarCity draft="contributed">Danmarkshavn</exemplarCity>
+				<exemplarCity>Danmarkshavn</exemplarCity>
 			</zone>
 			<zone type="Africa/Banjul">
-				<exemplarCity draft="contributed">Banjul</exemplarCity>
+				<exemplarCity>Banjul</exemplarCity>
 			</zone>
 			<zone type="Africa/Conakry">
-				<exemplarCity draft="contributed">Conakry</exemplarCity>
+				<exemplarCity>Conakry</exemplarCity>
 			</zone>
 			<zone type="America/Guadeloupe">
-				<exemplarCity draft="contributed">Guadeloupe</exemplarCity>
+				<exemplarCity>Guadeloupe</exemplarCity>
 			</zone>
 			<zone type="Africa/Malabo">
-				<exemplarCity draft="contributed">Malabo</exemplarCity>
+				<exemplarCity>Malabo</exemplarCity>
 			</zone>
 			<zone type="Europe/Athens">
 				<exemplarCity>Atény</exemplarCity>
@@ -2727,49 +2816,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Južná Georgia</exemplarCity>
 			</zone>
 			<zone type="America/Guatemala">
-				<exemplarCity draft="contributed">Guatemala</exemplarCity>
+				<exemplarCity>Guatemala</exemplarCity>
 			</zone>
 			<zone type="Pacific/Guam">
-				<exemplarCity draft="contributed">Guam</exemplarCity>
+				<exemplarCity>Guam</exemplarCity>
 			</zone>
 			<zone type="Africa/Bissau">
-				<exemplarCity draft="contributed">Bissau</exemplarCity>
+				<exemplarCity>Bissau</exemplarCity>
 			</zone>
 			<zone type="America/Guyana">
-				<exemplarCity draft="contributed">Guyana</exemplarCity>
+				<exemplarCity>Guyana</exemplarCity>
 			</zone>
 			<zone type="Asia/Hong_Kong">
 				<exemplarCity>Hongkong</exemplarCity>
 			</zone>
 			<zone type="America/Tegucigalpa">
-				<exemplarCity draft="contributed">Tegucigalpa</exemplarCity>
+				<exemplarCity>Tegucigalpa</exemplarCity>
 			</zone>
 			<zone type="Europe/Zagreb">
 				<exemplarCity>Záhreb</exemplarCity>
 			</zone>
 			<zone type="America/Port-au-Prince">
-				<exemplarCity draft="contributed">Port-au-Prince</exemplarCity>
+				<exemplarCity>Port-au-Prince</exemplarCity>
 			</zone>
 			<zone type="Europe/Budapest">
-				<exemplarCity draft="contributed">Budapešť</exemplarCity>
+				<exemplarCity>Budapešť</exemplarCity>
 			</zone>
 			<zone type="Asia/Jakarta">
-				<exemplarCity draft="contributed">Jakarta</exemplarCity>
+				<exemplarCity>Jakarta</exemplarCity>
 			</zone>
 			<zone type="Asia/Pontianak">
-				<exemplarCity draft="contributed">Pontianak</exemplarCity>
+				<exemplarCity>Pontianak</exemplarCity>
 			</zone>
 			<zone type="Asia/Makassar">
-				<exemplarCity draft="contributed">Makassar</exemplarCity>
+				<exemplarCity>Makassar</exemplarCity>
 			</zone>
 			<zone type="Asia/Jayapura">
-				<exemplarCity draft="contributed">Jayapura</exemplarCity>
+				<exemplarCity>Jayapura</exemplarCity>
 			</zone>
 			<zone type="Europe/Dublin">
 				<long>
-					<daylight>Írsky štandardný čas</daylight>
+					<daylight>írsky štandardný čas</daylight>
 				</long>
-				<exemplarCity draft="contributed">Dublin</exemplarCity>
+				<exemplarCity>Dublin</exemplarCity>
 			</zone>
 			<zone type="Asia/Jerusalem">
 				<exemplarCity>Jeruzalem</exemplarCity>
@@ -2796,7 +2885,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Rím</exemplarCity>
 			</zone>
 			<zone type="Europe/Jersey">
-				<exemplarCity draft="contributed">Jersey</exemplarCity>
+				<exemplarCity>Jersey</exemplarCity>
 			</zone>
 			<zone type="America/Jamaica">
 				<exemplarCity>Jamajka</exemplarCity>
@@ -2808,7 +2897,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Tokio</exemplarCity>
 			</zone>
 			<zone type="Africa/Nairobi">
-				<exemplarCity draft="contributed">Nairobi</exemplarCity>
+				<exemplarCity>Nairobi</exemplarCity>
 			</zone>
 			<zone type="Asia/Bishkek">
 				<exemplarCity>Biškek</exemplarCity>
@@ -2817,16 +2906,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Phnom Pénh</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity draft="contributed">Enderbury</exemplarCity>
+				<exemplarCity>Enderbury</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
-				<exemplarCity draft="contributed">Kiritimati</exemplarCity>
+				<exemplarCity>Kiritimati</exemplarCity>
 			</zone>
 			<zone type="Pacific/Tarawa">
-				<exemplarCity draft="contributed">Tarawa</exemplarCity>
+				<exemplarCity>Tarawa</exemplarCity>
 			</zone>
 			<zone type="Indian/Comoro">
-				<exemplarCity draft="contributed">Comoro</exemplarCity>
+				<exemplarCity>Komory</exemplarCity>
 			</zone>
 			<zone type="America/St_Kitts">
 				<exemplarCity>St. Kitts</exemplarCity>
@@ -2841,7 +2930,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Kuvajt</exemplarCity>
 			</zone>
 			<zone type="America/Cayman">
-				<exemplarCity>Cayman</exemplarCity>
+				<exemplarCity>Kajmanie ostrovy</exemplarCity>
 			</zone>
 			<zone type="Asia/Aqtau">
 				<exemplarCity>Aktau</exemplarCity>
@@ -2856,7 +2945,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Kyzylorda</exemplarCity>
 			</zone>
 			<zone type="Asia/Almaty">
-				<exemplarCity>Alma-Ata</exemplarCity>
+				<exemplarCity>Almaty</exemplarCity>
 			</zone>
 			<zone type="Asia/Vientiane">
 				<exemplarCity>Vientian</exemplarCity>
@@ -2865,7 +2954,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Bejrút</exemplarCity>
 			</zone>
 			<zone type="America/St_Lucia">
-				<exemplarCity draft="contributed">Svätá Lucia</exemplarCity>
+				<exemplarCity>Svätá Lucia</exemplarCity>
 			</zone>
 			<zone type="Europe/Vaduz">
 				<exemplarCity>Vaduz</exemplarCity>
@@ -2874,25 +2963,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Kolombo</exemplarCity>
 			</zone>
 			<zone type="Africa/Monrovia">
-				<exemplarCity draft="contributed">Monrovia</exemplarCity>
+				<exemplarCity>Monrovia</exemplarCity>
 			</zone>
 			<zone type="Africa/Maseru">
-				<exemplarCity draft="contributed">Maseru</exemplarCity>
+				<exemplarCity>Maseru</exemplarCity>
 			</zone>
 			<zone type="Europe/Vilnius">
-				<exemplarCity draft="contributed">Vilnius</exemplarCity>
+				<exemplarCity>Vilnius</exemplarCity>
 			</zone>
 			<zone type="Europe/Luxembourg">
 				<exemplarCity>Luxembursko</exemplarCity>
 			</zone>
 			<zone type="Europe/Riga">
-				<exemplarCity draft="contributed">Riga</exemplarCity>
+				<exemplarCity>Riga</exemplarCity>
 			</zone>
 			<zone type="Africa/Tripoli">
 				<exemplarCity>Tripolis</exemplarCity>
 			</zone>
 			<zone type="Africa/Casablanca">
-				<exemplarCity draft="contributed">Casablanca</exemplarCity>
+				<exemplarCity>Casablanca</exemplarCity>
 			</zone>
 			<zone type="Europe/Monaco">
 				<exemplarCity>Monako</exemplarCity>
@@ -2901,31 +2990,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Kišiňov</exemplarCity>
 			</zone>
 			<zone type="Europe/Podgorica">
-				<exemplarCity draft="contributed">Podgorica</exemplarCity>
+				<exemplarCity>Podgorica</exemplarCity>
 			</zone>
 			<zone type="America/Marigot">
-				<exemplarCity draft="contributed">Marigot</exemplarCity>
+				<exemplarCity>Marigot</exemplarCity>
 			</zone>
 			<zone type="Indian/Antananarivo">
-				<exemplarCity draft="contributed">Antananarivo</exemplarCity>
+				<exemplarCity>Antananarivo</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kwajalein">
-				<exemplarCity draft="contributed">Kwajalein</exemplarCity>
+				<exemplarCity>Kwajalein</exemplarCity>
 			</zone>
 			<zone type="Pacific/Majuro">
-				<exemplarCity draft="contributed">Majuro</exemplarCity>
+				<exemplarCity>Majuro</exemplarCity>
 			</zone>
 			<zone type="Europe/Skopje">
-				<exemplarCity draft="contributed">Skopje</exemplarCity>
+				<exemplarCity>Skopje</exemplarCity>
 			</zone>
 			<zone type="Africa/Bamako">
-				<exemplarCity draft="contributed">Bamako</exemplarCity>
+				<exemplarCity>Bamako</exemplarCity>
 			</zone>
 			<zone type="Asia/Rangoon">
 				<exemplarCity>Rangún</exemplarCity>
 			</zone>
 			<zone type="Asia/Hovd">
-				<exemplarCity draft="contributed">Hovd</exemplarCity>
+				<exemplarCity>Chovd</exemplarCity>
 			</zone>
 			<zone type="Asia/Ulaanbaatar">
 				<exemplarCity>Ulanbátar</exemplarCity>
@@ -2937,19 +3026,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Macao</exemplarCity>
 			</zone>
 			<zone type="Pacific/Saipan">
-				<exemplarCity draft="contributed">Saipan</exemplarCity>
+				<exemplarCity>Saipan</exemplarCity>
 			</zone>
 			<zone type="America/Martinique">
 				<exemplarCity>Martinik</exemplarCity>
 			</zone>
 			<zone type="Africa/Nouakchott">
-				<exemplarCity draft="contributed">Nouakchott</exemplarCity>
+				<exemplarCity>Nouakchott</exemplarCity>
 			</zone>
 			<zone type="America/Montserrat">
-				<exemplarCity draft="contributed">Montserrat</exemplarCity>
+				<exemplarCity>Montserrat</exemplarCity>
 			</zone>
 			<zone type="Europe/Malta">
-				<exemplarCity draft="contributed">Malta</exemplarCity>
+				<exemplarCity>Malta</exemplarCity>
 			</zone>
 			<zone type="Indian/Mauritius">
 				<exemplarCity>Maurícius</exemplarCity>
@@ -2958,37 +3047,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Maldivy</exemplarCity>
 			</zone>
 			<zone type="Africa/Blantyre">
-				<exemplarCity draft="contributed">Blantyre</exemplarCity>
+				<exemplarCity>Blantyre</exemplarCity>
 			</zone>
 			<zone type="America/Tijuana">
-				<exemplarCity draft="contributed">Tijuana</exemplarCity>
+				<exemplarCity>Tijuana</exemplarCity>
 			</zone>
 			<zone type="America/Santa_Isabel">
-				<exemplarCity draft="contributed">Santa Isabel</exemplarCity>
+				<exemplarCity>Santa Isabel</exemplarCity>
 			</zone>
 			<zone type="America/Hermosillo">
-				<exemplarCity draft="contributed">Hermosillo</exemplarCity>
+				<exemplarCity>Hermosillo</exemplarCity>
 			</zone>
 			<zone type="America/Mazatlan">
 				<exemplarCity>Mazatlán</exemplarCity>
 			</zone>
 			<zone type="America/Chihuahua">
-				<exemplarCity draft="contributed">Chihuahua</exemplarCity>
+				<exemplarCity>Chihuahua</exemplarCity>
 			</zone>
 			<zone type="America/Bahia_Banderas">
-				<exemplarCity draft="contributed">Bahia Banderas</exemplarCity>
+				<exemplarCity>Bahia Banderas</exemplarCity>
 			</zone>
 			<zone type="America/Ojinaga">
-				<exemplarCity draft="contributed">Ojinaga</exemplarCity>
+				<exemplarCity>Ojinaga</exemplarCity>
 			</zone>
 			<zone type="America/Monterrey">
-				<exemplarCity draft="contributed">Monterrey</exemplarCity>
+				<exemplarCity>Monterrey</exemplarCity>
 			</zone>
 			<zone type="America/Mexico_City">
-				<exemplarCity>Mexiko (mesto)</exemplarCity>
+				<exemplarCity>México</exemplarCity>
 			</zone>
 			<zone type="America/Matamoros">
-				<exemplarCity draft="contributed">Matamoros</exemplarCity>
+				<exemplarCity>Matamoros</exemplarCity>
 			</zone>
 			<zone type="America/Merida">
 				<exemplarCity>Mérida</exemplarCity>
@@ -2997,61 +3086,61 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Cancún</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuala_Lumpur">
-				<exemplarCity draft="contributed">Kuala Lumpur</exemplarCity>
+				<exemplarCity>Kuala Lumpur</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuching">
 				<exemplarCity>Kučing</exemplarCity>
 			</zone>
 			<zone type="Africa/Maputo">
-				<exemplarCity draft="contributed">Maputo</exemplarCity>
+				<exemplarCity>Maputo</exemplarCity>
 			</zone>
 			<zone type="Africa/Windhoek">
-				<exemplarCity draft="contributed">Windhoek</exemplarCity>
+				<exemplarCity>Windhoek</exemplarCity>
 			</zone>
 			<zone type="Pacific/Noumea">
 				<exemplarCity>Nouméa</exemplarCity>
 			</zone>
 			<zone type="Africa/Niamey">
-				<exemplarCity draft="contributed">Niamey</exemplarCity>
+				<exemplarCity>Niamey</exemplarCity>
 			</zone>
 			<zone type="Pacific/Norfolk">
-				<exemplarCity draft="contributed">Norfolk</exemplarCity>
+				<exemplarCity>Norfolk</exemplarCity>
 			</zone>
 			<zone type="Africa/Lagos">
-				<exemplarCity draft="contributed">Lagos</exemplarCity>
+				<exemplarCity>Lagos</exemplarCity>
 			</zone>
 			<zone type="America/Managua">
-				<exemplarCity draft="contributed">Managua</exemplarCity>
+				<exemplarCity>Managua</exemplarCity>
 			</zone>
 			<zone type="Europe/Amsterdam">
 				<exemplarCity>Amsterdam</exemplarCity>
 			</zone>
 			<zone type="Europe/Oslo">
-				<exemplarCity draft="contributed">Oslo</exemplarCity>
+				<exemplarCity>Oslo</exemplarCity>
 			</zone>
 			<zone type="Asia/Katmandu">
 				<exemplarCity>Káthmandu</exemplarCity>
 			</zone>
 			<zone type="Pacific/Nauru">
-				<exemplarCity draft="contributed">Nauru</exemplarCity>
+				<exemplarCity>Nauru</exemplarCity>
 			</zone>
 			<zone type="Pacific/Niue">
-				<exemplarCity draft="contributed">Niue</exemplarCity>
+				<exemplarCity>Niue</exemplarCity>
 			</zone>
 			<zone type="Pacific/Chatham">
-				<exemplarCity draft="contributed">Chatham</exemplarCity>
+				<exemplarCity>Chatham</exemplarCity>
 			</zone>
 			<zone type="Pacific/Auckland">
-				<exemplarCity draft="contributed">Auckland</exemplarCity>
+				<exemplarCity>Auckland</exemplarCity>
 			</zone>
 			<zone type="Asia/Muscat">
 				<exemplarCity>Maskat</exemplarCity>
 			</zone>
 			<zone type="America/Panama">
-				<exemplarCity draft="contributed">Panama</exemplarCity>
+				<exemplarCity>Panama</exemplarCity>
 			</zone>
 			<zone type="America/Lima">
-				<exemplarCity draft="contributed">Lima</exemplarCity>
+				<exemplarCity>Lima</exemplarCity>
 			</zone>
 			<zone type="Pacific/Tahiti">
 				<exemplarCity>Tahiti</exemplarCity>
@@ -3063,10 +3152,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Gambier</exemplarCity>
 			</zone>
 			<zone type="Pacific/Port_Moresby">
-				<exemplarCity draft="contributed">Port Moresby</exemplarCity>
+				<exemplarCity>Port Moresby</exemplarCity>
+			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bougainville</exemplarCity>
 			</zone>
 			<zone type="Asia/Manila">
-				<exemplarCity draft="contributed">Manila</exemplarCity>
+				<exemplarCity>Manila</exemplarCity>
 			</zone>
 			<zone type="Asia/Karachi">
 				<exemplarCity>Karáči</exemplarCity>
@@ -3075,7 +3167,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Varšava</exemplarCity>
 			</zone>
 			<zone type="America/Miquelon">
-				<exemplarCity draft="contributed">Miquelon</exemplarCity>
+				<exemplarCity>Miquelon</exemplarCity>
 			</zone>
 			<zone type="Pacific/Pitcairn">
 				<exemplarCity>Pitcairn</exemplarCity>
@@ -3084,22 +3176,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Portoriko</exemplarCity>
 			</zone>
 			<zone type="Asia/Gaza">
-				<exemplarCity draft="contributed">Gaza</exemplarCity>
+				<exemplarCity>Gaza</exemplarCity>
 			</zone>
 			<zone type="Asia/Hebron">
-				<exemplarCity draft="contributed">Hebron</exemplarCity>
+				<exemplarCity>Hebron</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Azores">
-				<exemplarCity>Azorské ostrovy</exemplarCity>
+				<exemplarCity>Azory</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Madeira">
-				<exemplarCity draft="contributed">Madeira</exemplarCity>
+				<exemplarCity>Madeira</exemplarCity>
 			</zone>
 			<zone type="Europe/Lisbon">
 				<exemplarCity>Lisabon</exemplarCity>
 			</zone>
 			<zone type="Pacific/Palau">
-				<exemplarCity draft="contributed">Palau</exemplarCity>
+				<exemplarCity>Palau</exemplarCity>
 			</zone>
 			<zone type="America/Asuncion">
 				<exemplarCity>Asunción</exemplarCity>
@@ -3117,25 +3209,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Belehrad</exemplarCity>
 			</zone>
 			<zone type="Europe/Kaliningrad">
-				<exemplarCity draft="contributed">Kaliningrad</exemplarCity>
+				<exemplarCity>Kaliningrad</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
-				<exemplarCity draft="contributed">Simferopol</exemplarCity>
+				<exemplarCity>Simferopol</exemplarCity>
 			</zone>
 			<zone type="Europe/Moscow">
 				<exemplarCity>Moskva</exemplarCity>
 			</zone>
 			<zone type="Europe/Volgograd">
-				<exemplarCity draft="contributed">Volgograd</exemplarCity>
+				<exemplarCity>Volgograd</exemplarCity>
 			</zone>
 			<zone type="Europe/Samara">
-				<exemplarCity draft="contributed">Samara</exemplarCity>
+				<exemplarCity>Samara</exemplarCity>
 			</zone>
 			<zone type="Asia/Yekaterinburg">
 				<exemplarCity>Jekaterinburg</exemplarCity>
 			</zone>
 			<zone type="Asia/Omsk">
-				<exemplarCity draft="contributed">Omsk</exemplarCity>
+				<exemplarCity>Omsk</exemplarCity>
 			</zone>
 			<zone type="Asia/Novosibirsk">
 				<exemplarCity>Novosibirsk</exemplarCity>
@@ -3149,6 +3241,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Čita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Jakutsk</exemplarCity>
 			</zone>
@@ -3165,22 +3260,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Usť-Nera</exemplarCity>
 			</zone>
 			<zone type="Asia/Magadan">
-				<exemplarCity draft="contributed">Magadan</exemplarCity>
+				<exemplarCity>Magadan</exemplarCity>
+			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolymsk</exemplarCity>
 			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamčatka</exemplarCity>
 			</zone>
 			<zone type="Asia/Anadyr">
-				<exemplarCity draft="contributed">Anadyr</exemplarCity>
+				<exemplarCity>Anadyr</exemplarCity>
 			</zone>
 			<zone type="Africa/Kigali">
-				<exemplarCity draft="contributed">Kigali</exemplarCity>
+				<exemplarCity>Kigali</exemplarCity>
 			</zone>
 			<zone type="Asia/Riyadh">
-				<exemplarCity draft="contributed">Rijád</exemplarCity>
+				<exemplarCity>Rijád</exemplarCity>
 			</zone>
 			<zone type="Pacific/Guadalcanal">
-				<exemplarCity draft="contributed">Guadalcanal</exemplarCity>
+				<exemplarCity>Guadalcanal</exemplarCity>
 			</zone>
 			<zone type="Indian/Mahe">
 				<exemplarCity>Mahé</exemplarCity>
@@ -3195,34 +3293,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Singapur</exemplarCity>
 			</zone>
 			<zone type="Atlantic/St_Helena">
-				<exemplarCity>Sv. Helena</exemplarCity>
+				<exemplarCity>Svätá Helena</exemplarCity>
 			</zone>
 			<zone type="Europe/Ljubljana">
 				<exemplarCity>Ľubľana</exemplarCity>
 			</zone>
 			<zone type="Arctic/Longyearbyen">
-				<exemplarCity draft="contributed">Longyearbyen</exemplarCity>
+				<exemplarCity>Longyearbyen</exemplarCity>
 			</zone>
 			<zone type="Europe/Bratislava">
 				<exemplarCity>Bratislava</exemplarCity>
 			</zone>
 			<zone type="Africa/Freetown">
-				<exemplarCity draft="contributed">Freetown</exemplarCity>
+				<exemplarCity>Freetown</exemplarCity>
 			</zone>
 			<zone type="Europe/San_Marino">
 				<exemplarCity>San Maríno</exemplarCity>
 			</zone>
 			<zone type="Africa/Dakar">
-				<exemplarCity draft="contributed">Dakar</exemplarCity>
+				<exemplarCity>Dakar</exemplarCity>
 			</zone>
 			<zone type="Africa/Mogadishu">
 				<exemplarCity>Mogadišo</exemplarCity>
 			</zone>
 			<zone type="America/Paramaribo">
-				<exemplarCity draft="contributed">Paramaribo</exemplarCity>
+				<exemplarCity>Paramaribo</exemplarCity>
 			</zone>
 			<zone type="Africa/Juba">
-				<exemplarCity draft="contributed">Juba</exemplarCity>
+				<exemplarCity>Juba</exemplarCity>
 			</zone>
 			<zone type="Africa/Sao_Tome">
 				<exemplarCity>Svätý Tomáš</exemplarCity>
@@ -3237,22 +3335,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Damask</exemplarCity>
 			</zone>
 			<zone type="Africa/Mbabane">
-				<exemplarCity draft="contributed">Mbabane</exemplarCity>
+				<exemplarCity>Mbabane</exemplarCity>
 			</zone>
 			<zone type="America/Grand_Turk">
-				<exemplarCity draft="contributed">Grand Turk</exemplarCity>
+				<exemplarCity>Grand Turk</exemplarCity>
 			</zone>
 			<zone type="Africa/Ndjamena">
-				<exemplarCity draft="contributed">Ndjamena</exemplarCity>
+				<exemplarCity>N’Djamena</exemplarCity>
 			</zone>
 			<zone type="Indian/Kerguelen">
 				<exemplarCity>Kergueleny</exemplarCity>
 			</zone>
 			<zone type="Africa/Lome">
-				<exemplarCity draft="contributed">Lome</exemplarCity>
+				<exemplarCity>Lomé</exemplarCity>
 			</zone>
 			<zone type="Asia/Bangkok">
-				<exemplarCity draft="contributed">Bangkok</exemplarCity>
+				<exemplarCity>Bangkok</exemplarCity>
 			</zone>
 			<zone type="Asia/Dushanbe">
 				<exemplarCity>Dušanbe</exemplarCity>
@@ -3261,22 +3359,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Fakaofo</exemplarCity>
 			</zone>
 			<zone type="Asia/Dili">
-				<exemplarCity draft="contributed">Dili</exemplarCity>
+				<exemplarCity>Dili</exemplarCity>
 			</zone>
 			<zone type="Asia/Ashgabat">
 				<exemplarCity>Ašchabad</exemplarCity>
 			</zone>
 			<zone type="Africa/Tunis">
-				<exemplarCity draft="contributed">Tunis</exemplarCity>
+				<exemplarCity>Tunis</exemplarCity>
 			</zone>
 			<zone type="Pacific/Tongatapu">
 				<exemplarCity>Tongatapu</exemplarCity>
 			</zone>
 			<zone type="Europe/Istanbul">
-				<exemplarCity draft="contributed">Istanbul</exemplarCity>
+				<exemplarCity>Istanbul</exemplarCity>
 			</zone>
 			<zone type="America/Port_of_Spain">
-				<exemplarCity draft="contributed">Port of Spain</exemplarCity>
+				<exemplarCity>Port of Spain</exemplarCity>
 			</zone>
 			<zone type="Pacific/Funafuti">
 				<exemplarCity>Funafuti</exemplarCity>
@@ -3285,7 +3383,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Tchaj-pej</exemplarCity>
 			</zone>
 			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity draft="contributed">Dar es Salaam</exemplarCity>
+				<exemplarCity>Dar es Salaam</exemplarCity>
 			</zone>
 			<zone type="Europe/Uzhgorod">
 				<exemplarCity>Užhorod</exemplarCity>
@@ -3297,7 +3395,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Záporožie</exemplarCity>
 			</zone>
 			<zone type="Africa/Kampala">
-				<exemplarCity draft="contributed">Kampala</exemplarCity>
+				<exemplarCity>Kampala</exemplarCity>
 			</zone>
 			<zone type="Pacific/Midway">
 				<exemplarCity>Midway</exemplarCity>
@@ -3309,40 +3407,40 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Wake</exemplarCity>
 			</zone>
 			<zone type="America/Adak">
-				<exemplarCity draft="contributed">Adak</exemplarCity>
+				<exemplarCity>Adak</exemplarCity>
 			</zone>
 			<zone type="America/Nome">
-				<exemplarCity draft="contributed">Nome</exemplarCity>
+				<exemplarCity>Nome</exemplarCity>
 			</zone>
 			<zone type="Pacific/Honolulu">
-				<exemplarCity draft="contributed">Honolulu</exemplarCity>
+				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Anchorage</exemplarCity>
 			</zone>
 			<zone type="America/Yakutat">
-				<exemplarCity draft="contributed">Yakutat</exemplarCity>
+				<exemplarCity>Yakutat</exemplarCity>
 			</zone>
 			<zone type="America/Sitka">
-				<exemplarCity draft="contributed">Sitka</exemplarCity>
+				<exemplarCity>Sitka</exemplarCity>
 			</zone>
 			<zone type="America/Juneau">
-				<exemplarCity draft="contributed">Juneau</exemplarCity>
+				<exemplarCity>Juneau</exemplarCity>
 			</zone>
 			<zone type="America/Metlakatla">
-				<exemplarCity draft="contributed">Metlakatla</exemplarCity>
+				<exemplarCity>Metlakatla</exemplarCity>
 			</zone>
 			<zone type="America/Los_Angeles">
-				<exemplarCity draft="contributed">Los Angeles</exemplarCity>
+				<exemplarCity>Los Angeles</exemplarCity>
 			</zone>
 			<zone type="America/Boise">
-				<exemplarCity draft="contributed">Boise</exemplarCity>
+				<exemplarCity>Boise</exemplarCity>
 			</zone>
 			<zone type="America/Phoenix">
-				<exemplarCity draft="contributed">Phoenix</exemplarCity>
+				<exemplarCity>Phoenix</exemplarCity>
 			</zone>
 			<zone type="America/Denver">
-				<exemplarCity draft="contributed">Denver</exemplarCity>
+				<exemplarCity>Denver</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/Beulah">
 				<exemplarCity>Beulah, Severná Dakota</exemplarCity>
@@ -3354,52 +3452,52 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Center, Severná Dakota</exemplarCity>
 			</zone>
 			<zone type="America/Chicago">
-				<exemplarCity draft="contributed">Chicago</exemplarCity>
+				<exemplarCity>Chicago</exemplarCity>
 			</zone>
 			<zone type="America/Menominee">
-				<exemplarCity draft="contributed">Menominee</exemplarCity>
+				<exemplarCity>Menominee</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Vincennes">
-				<exemplarCity draft="contributed">Vincennes, Indiana</exemplarCity>
+				<exemplarCity>Vincennes, Indiana</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Petersburg">
-				<exemplarCity draft="contributed">Petersburg, Indiana</exemplarCity>
+				<exemplarCity>Petersburg, Indiana</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Tell_City">
-				<exemplarCity draft="contributed">Tell City, Indiana</exemplarCity>
+				<exemplarCity>Tell City, Indiana</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Knox">
-				<exemplarCity draft="contributed">Knox, Indiana</exemplarCity>
+				<exemplarCity>Knox, Indiana</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Winamac">
-				<exemplarCity draft="contributed">Winamac, Indiana</exemplarCity>
+				<exemplarCity>Winamac, Indiana</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Marengo">
-				<exemplarCity draft="contributed">Marengo, Indiana</exemplarCity>
+				<exemplarCity>Marengo, Indiana</exemplarCity>
 			</zone>
 			<zone type="America/Indianapolis">
-				<exemplarCity draft="contributed">Indianapolis</exemplarCity>
+				<exemplarCity>Indianapolis</exemplarCity>
 			</zone>
 			<zone type="America/Louisville">
-				<exemplarCity draft="contributed">Louisville</exemplarCity>
+				<exemplarCity>Louisville</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Vevay">
-				<exemplarCity draft="contributed">Vevay, Indiana</exemplarCity>
+				<exemplarCity>Vevay, Indiana</exemplarCity>
 			</zone>
 			<zone type="America/Kentucky/Monticello">
-				<exemplarCity draft="contributed">Monticello, Kentucky</exemplarCity>
+				<exemplarCity>Monticello, Kentucky</exemplarCity>
 			</zone>
 			<zone type="America/Detroit">
-				<exemplarCity draft="contributed">Detroit</exemplarCity>
+				<exemplarCity>Detroit</exemplarCity>
 			</zone>
 			<zone type="America/New_York">
-				<exemplarCity draft="contributed">New York</exemplarCity>
+				<exemplarCity>New York</exemplarCity>
 			</zone>
 			<zone type="America/Montevideo">
-				<exemplarCity draft="contributed">Montevideo</exemplarCity>
+				<exemplarCity>Montevideo</exemplarCity>
 			</zone>
 			<zone type="Asia/Samarkand">
-				<exemplarCity draft="contributed">Samarkand</exemplarCity>
+				<exemplarCity>Samarkand</exemplarCity>
 			</zone>
 			<zone type="Asia/Tashkent">
 				<exemplarCity>Taškent</exemplarCity>
@@ -3408,22 +3506,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Vatikán</exemplarCity>
 			</zone>
 			<zone type="America/St_Vincent">
-				<exemplarCity draft="contributed">Sv. Vincent</exemplarCity>
+				<exemplarCity>Sv. Vincent</exemplarCity>
 			</zone>
 			<zone type="America/Caracas">
-				<exemplarCity draft="contributed">Caracas</exemplarCity>
+				<exemplarCity>Caracas</exemplarCity>
 			</zone>
 			<zone type="America/Tortola">
-				<exemplarCity draft="contributed">Tortola</exemplarCity>
+				<exemplarCity>Tortola</exemplarCity>
 			</zone>
 			<zone type="America/St_Thomas">
-				<exemplarCity draft="contributed">Sv. Tomáš</exemplarCity>
+				<exemplarCity>Sv. Tomáš</exemplarCity>
 			</zone>
 			<zone type="Asia/Saigon">
-				<exemplarCity draft="contributed">Hočiminovo Mesto</exemplarCity>
+				<exemplarCity>Hočiminovo Mesto</exemplarCity>
 			</zone>
 			<zone type="Pacific/Efate">
-				<exemplarCity draft="contributed">Efate</exemplarCity>
+				<exemplarCity>Efate</exemplarCity>
 			</zone>
 			<zone type="Pacific/Wallis">
 				<exemplarCity>Wallis</exemplarCity>
@@ -3432,87 +3530,87 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Apia</exemplarCity>
 			</zone>
 			<zone type="Asia/Aden">
-				<exemplarCity draft="contributed">Aden</exemplarCity>
+				<exemplarCity>Aden</exemplarCity>
 			</zone>
 			<zone type="Indian/Mayotte">
-				<exemplarCity draft="contributed">Mayotte</exemplarCity>
+				<exemplarCity>Mayotte</exemplarCity>
 			</zone>
 			<zone type="Africa/Johannesburg">
-				<exemplarCity draft="contributed">Johannesburg</exemplarCity>
+				<exemplarCity>Johannesburg</exemplarCity>
 			</zone>
 			<zone type="Africa/Lusaka">
-				<exemplarCity draft="contributed">Lusaka</exemplarCity>
+				<exemplarCity>Lusaka</exemplarCity>
 			</zone>
 			<zone type="Africa/Harare">
-				<exemplarCity draft="contributed">Harare</exemplarCity>
+				<exemplarCity>Harare</exemplarCity>
 			</zone>
 			<metazone type="Afghanistan">
 				<long>
-					<standard draft="contributed">Afganský čas</standard>
+					<standard>afganský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Central">
 				<long>
-					<standard>Stredoafrický čas</standard>
+					<standard>stredoafrický čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Eastern">
 				<long>
-					<standard>Východoafrický čas</standard>
+					<standard>východoafrický čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Southern">
 				<long>
-					<standard>Juhoafrický čas</standard>
+					<standard>juhoafrický čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Západoafrický čas</generic>
-					<standard>Západoafrický štandardný čas</standard>
-					<daylight>Západoafrický letný čas</daylight>
+					<generic>západoafrický čas</generic>
+					<standard>západoafrický štandardný čas</standard>
+					<daylight>západoafrický letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
 				<long>
-					<generic draft="contributed">Aljašský čas</generic>
-					<standard draft="contributed">Aljašský štandardný čas</standard>
-					<daylight draft="contributed">Aljašský letný čas</daylight>
+					<generic>aljašský čas</generic>
+					<standard>aljašský štandardný čas</standard>
+					<daylight>aljašský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Amazon">
 				<long>
-					<generic draft="contributed">Amazonský čas</generic>
-					<standard draft="contributed">Amazonský štandardný čas</standard>
-					<daylight draft="contributed">Amazonský letný čas</daylight>
+					<generic>amazonský čas</generic>
+					<standard>amazonský štandardný čas</standard>
+					<daylight>amazonský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Central">
 				<long>
-					<generic draft="contributed">Centrálny čas</generic>
-					<standard draft="contributed">Centrálny štandardný čas</standard>
-					<daylight draft="contributed">Centrálny letný čas</daylight>
+					<generic>severoamerický centrálny čas</generic>
+					<standard>severoamerický centrálny štandardný čas</standard>
+					<daylight>severoamerický centrálny letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
-					<generic draft="contributed">Východný čas</generic>
-					<standard draft="contributed">Východný štandardný čas</standard>
-					<daylight draft="contributed">Východný letný čas</daylight>
+					<generic>severoamerický východný čas</generic>
+					<standard>severoamerický východný štandardný čas</standard>
+					<daylight>severoamerický východný letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
-					<generic draft="contributed">Horský čas</generic>
-					<standard draft="contributed">Horský štandardný čas</standard>
-					<daylight draft="contributed">Horský letný čas</daylight>
+					<generic>severoamerický horský čas</generic>
+					<standard>severoamerický horský štandardný čas</standard>
+					<daylight>severoamerický horský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
-					<generic draft="contributed">Tichomorský čas</generic>
-					<standard draft="contributed">Tichomorský štandardný čas</standard>
-					<daylight draft="contributed">Tichomorský letný čas</daylight>
+					<generic>severoamerický tichomorský čas</generic>
+					<standard>severoamerický tichomorský štandardný čas</standard>
+					<daylight>severoamerický tichomorský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Anadyr">
@@ -3524,220 +3622,220 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic draft="contributed">Apijský čas</generic>
-					<standard draft="contributed">Apijský štandardný čas</standard>
-					<daylight draft="contributed">Apijský letný čas</daylight>
+					<generic>apijský čas</generic>
+					<standard>apijský štandardný čas</standard>
+					<daylight>apijský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Arabian">
 				<long>
-					<generic>Arabský čas</generic>
-					<standard>Arabský štandardný čas</standard>
-					<daylight>Arabský letný čas</daylight>
+					<generic>arabský čas</generic>
+					<standard>arabský štandardný čas</standard>
+					<daylight>arabský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina">
 				<long>
-					<generic draft="contributed">Argentínsky čas</generic>
-					<standard draft="contributed">Argentínsky štandardný čas</standard>
-					<daylight draft="contributed">Argentínsky letný čas</daylight>
+					<generic>argentínsky čas</generic>
+					<standard>argentínsky štandardný čas</standard>
+					<daylight>argentínsky letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina_Western">
 				<long>
-					<generic>Západoargentínsky čas</generic>
-					<standard>Západoargentínsky štandardný čas</standard>
-					<daylight>Západoargentínsky letný čas</daylight>
+					<generic>západoargentínsky čas</generic>
+					<standard>západoargentínsky štandardný čas</standard>
+					<daylight>západoargentínsky letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Armenia">
 				<long>
-					<generic draft="contributed">Arménsky čas</generic>
-					<standard draft="contributed">Arménsky štandardný čas</standard>
-					<daylight draft="contributed">Arménsky letný čas</daylight>
+					<generic>arménsky čas</generic>
+					<standard>arménsky štandardný čas</standard>
+					<daylight>arménsky letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Atlantic">
 				<long>
-					<generic>Atlantický čas</generic>
-					<standard>Atlantický štandardný čas</standard>
-					<daylight>Atlantický letný čas</daylight>
+					<generic>atlantický čas</generic>
+					<standard>atlantický štandardný čas</standard>
+					<daylight>atlantický letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
-					<generic>Stredoaustrálsky čas</generic>
-					<standard>Stredoaustrálsky štandardný čas</standard>
-					<daylight>Stredoaustrálsky letný čas</daylight>
+					<generic>stredoaustrálsky čas</generic>
+					<standard>stredoaustrálsky štandardný čas</standard>
+					<daylight>stredoaustrálsky letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_CentralWestern">
 				<long>
-					<generic>Stredozápadný austrálsky čas</generic>
-					<standard>Stredozápadný austrálsky štandardný čas</standard>
-					<daylight>Stredozápadný austrálsky letný čas</daylight>
+					<generic>stredozápadný austrálsky čas</generic>
+					<standard>stredozápadný austrálsky štandardný čas</standard>
+					<daylight>stredozápadný austrálsky letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Eastern">
 				<long>
-					<generic>Východoaustrálsky čas</generic>
-					<standard>Východoaustrálsky štandardný čas</standard>
-					<daylight>Východoaustrálsky letný čas</daylight>
+					<generic>východoaustrálsky čas</generic>
+					<standard>východoaustrálsky štandardný čas</standard>
+					<daylight>východoaustrálsky letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Western">
 				<long>
-					<generic>Západoaustrálsky čas</generic>
-					<standard>Západoaustrálsky štandardný čas</standard>
-					<daylight>Západoaustrálsky letný čas</daylight>
+					<generic>západoaustrálsky čas</generic>
+					<standard>západoaustrálsky štandardný čas</standard>
+					<daylight>západoaustrálsky letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azerbaijan">
 				<long>
-					<generic draft="contributed">Azerbajdžanský čas</generic>
-					<standard draft="contributed">Azerbajdžanský štandardný čas</standard>
-					<daylight draft="contributed">Azerbajdžanský letný čas</daylight>
+					<generic>azerbajdžanský čas</generic>
+					<standard>azerbajdžanský štandardný čas</standard>
+					<daylight>azerbajdžanský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azores">
 				<long>
-					<generic draft="contributed">Azorský čas</generic>
-					<standard draft="contributed">Azorský štandardný čas</standard>
-					<daylight draft="contributed">Azorský letný čas</daylight>
+					<generic>azorský čas</generic>
+					<standard>azorský štandardný čas</standard>
+					<daylight>azorský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Bangladesh">
 				<long>
-					<generic draft="contributed">Bangladéšsky čas</generic>
-					<standard draft="contributed">Bangladéšsky štandardný čas</standard>
-					<daylight draft="contributed">Bangladéšsky letný čas</daylight>
+					<generic>bangladéšsky čas</generic>
+					<standard>bangladéšsky štandardný čas</standard>
+					<daylight>bangladéšsky letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Bhutan">
 				<long>
-					<standard draft="contributed">Bhutánsky čas</standard>
+					<standard>bhutánsky čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Bolivia">
 				<long>
-					<standard draft="contributed">Bolívijský čas</standard>
+					<standard>bolívijský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Brasilia">
 				<long>
-					<generic draft="contributed">Brazílsky čas</generic>
-					<standard draft="contributed">Brazílsky štandardný čas</standard>
-					<daylight draft="contributed">Brazílsky letný čas</daylight>
+					<generic>brazílsky čas</generic>
+					<standard>brazílsky štandardný čas</standard>
+					<daylight>brazílsky letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Brunei">
 				<long>
-					<standard draft="contributed">Brunejský čas</standard>
+					<standard>brunejský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Cape_Verde">
 				<long>
-					<generic draft="contributed">Kapverdský čas</generic>
-					<standard draft="contributed">Kapverdský štandardný čas</standard>
-					<daylight draft="contributed">Kapverdský letný čas</daylight>
+					<generic>kapverdský čas</generic>
+					<standard>kapverdský štandardný čas</standard>
+					<daylight>kapverdský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Chamorro">
 				<long>
-					<standard draft="contributed">Chamorrský štandardný čas</standard>
+					<standard>chamorrský štandardný čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Chatham">
 				<long>
-					<generic draft="contributed">Chathamský čas</generic>
-					<standard draft="contributed">Chathamský štandardný čas</standard>
-					<daylight draft="contributed">Chathamský letný čas</daylight>
+					<generic>chathamský čas</generic>
+					<standard>chathamský štandardný čas</standard>
+					<daylight>chathamský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Chile">
 				<long>
-					<generic draft="contributed">Čilský čas</generic>
-					<standard draft="contributed">Čilský štandardný čas</standard>
-					<daylight draft="contributed">Čilský letný čas</daylight>
+					<generic>čilský čas</generic>
+					<standard>čilský štandardný čas</standard>
+					<daylight>čilský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="China">
 				<long>
-					<generic>Čínsky čas</generic>
-					<standard>Čínsky štandardný čas</standard>
-					<daylight>Čínsky letný čas</daylight>
+					<generic>čínsky čas</generic>
+					<standard>čínsky štandardný čas</standard>
+					<daylight>čínsky letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Choibalsan">
 				<long>
-					<generic>Choibalsanský čas</generic>
-					<standard>Čojbalsanský štandardný čas</standard>
-					<daylight>Choibalsanský letný čas</daylight>
+					<generic>čojbalsanský čas</generic>
+					<standard>čojbalsanský štandardný čas</standard>
+					<daylight>čojbalsanský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Christmas">
 				<long>
-					<standard draft="contributed">Čas Vianočného ostrova</standard>
+					<standard>čas Vianočného ostrova</standard>
 				</long>
 			</metazone>
 			<metazone type="Cocos">
 				<long>
-					<standard draft="contributed">Čas Kokosových ostrovov</standard>
+					<standard>čas Kokosových ostrovov</standard>
 				</long>
 			</metazone>
 			<metazone type="Colombia">
 				<long>
-					<generic draft="contributed">Kolumbijský čas</generic>
-					<standard draft="contributed">Kolumbijský štandardný čas</standard>
-					<daylight draft="contributed">Kolumbijský letný čas</daylight>
+					<generic>kolumbijský čas</generic>
+					<standard>kolumbijský štandardný čas</standard>
+					<daylight>kolumbijský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cook">
 				<long>
-					<generic draft="contributed">Čas Cookových ostrovov</generic>
-					<standard draft="contributed">Štandardný čas Cookových ostrovov</standard>
-					<daylight draft="contributed">Letný čas Cookových ostrovov</daylight>
+					<generic>čas Cookových ostrovov</generic>
+					<standard>štandardný čas Cookových ostrovov</standard>
+					<daylight>letný čas Cookových ostrovov</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cuba">
 				<long>
-					<generic>Kubánsky čas</generic>
-					<standard>Kubánsky štandardný čas</standard>
-					<daylight>Kubánsky letný čas</daylight>
+					<generic>kubánsky čas</generic>
+					<standard>kubánsky štandardný čas</standard>
+					<daylight>kubánsky letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Davis">
 				<long>
-					<standard draft="contributed">Čas Davisovej stanice</standard>
+					<standard>čas Davisovej stanice</standard>
 				</long>
 			</metazone>
 			<metazone type="DumontDUrville">
 				<long>
-					<standard>Čas stanice Dumonta d’Urvillea</standard>
+					<standard>čas stanice Dumonta d’Urvillea</standard>
 				</long>
 			</metazone>
 			<metazone type="East_Timor">
 				<long>
-					<standard draft="contributed">Východotimorský čas</standard>
+					<standard>východotimorský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Easter">
 				<long>
-					<generic draft="contributed">Čas Veľkonočného ostrova</generic>
-					<standard draft="contributed">Štandardný čas Veľkonočného ostrova</standard>
-					<daylight draft="contributed">Letný čas Veľkonočného ostrova</daylight>
+					<generic>čas Veľkonočného ostrova</generic>
+					<standard>štandardný čas Veľkonočného ostrova</standard>
+					<daylight>letný čas Veľkonočného ostrova</daylight>
 				</long>
 			</metazone>
 			<metazone type="Ecuador">
 				<long>
-					<standard draft="contributed">Ekvádorský čas</standard>
+					<standard>ekvádorský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Central">
 				<long>
-					<generic>Stredoeurópsky čas</generic>
-					<standard>Stredoeurópsky štandardný čas</standard>
-					<daylight>Stredoeurópsky letný čas</daylight>
+					<generic>stredoeurópsky čas</generic>
+					<standard>stredoeurópsky štandardný čas</standard>
+					<daylight>stredoeurópsky letný čas</daylight>
 				</long>
 				<short>
 					<generic>SEČ</generic>
@@ -3747,175 +3845,175 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Europe_Eastern">
 				<long>
-					<generic>Východoeurópsky čas</generic>
-					<standard>Východoeurópsky štandardný čas</standard>
-					<daylight>Východoeurópsky letný čas</daylight>
+					<generic>východoeurópsky čas</generic>
+					<standard>východoeurópsky štandardný čas</standard>
+					<daylight>východoeurópsky letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
 				<long>
-					<standard>Ďalší východoeurópsky čas</standard>
+					<standard>minský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
 				<long>
-					<generic>Západoeurópsky čas</generic>
-					<standard>Západoeurópsky štandardný čas</standard>
-					<daylight>Západoeurópsky letný čas</daylight>
+					<generic>západoeurópsky čas</generic>
+					<standard>západoeurópsky štandardný čas</standard>
+					<daylight>západoeurópsky letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Falkland">
 				<long>
-					<generic draft="contributed">Čas Falklandských ostrovov</generic>
-					<standard draft="contributed">Štandardný čas Falklandských ostrovov</standard>
-					<daylight draft="contributed">Letný čas Falklandských ostrovov</daylight>
+					<generic>falklandský čas</generic>
+					<standard>falklandský štandardný čas</standard>
+					<daylight>falklandský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Fiji">
 				<long>
-					<generic draft="contributed">Fidžijský čas</generic>
-					<standard draft="contributed">Fidžijský štandardný čas</standard>
-					<daylight draft="contributed">Fidžijský letný čas</daylight>
+					<generic>fidžijský čas</generic>
+					<standard>fidžijský štandardný čas</standard>
+					<daylight>fidžijský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="French_Guiana">
 				<long>
-					<standard draft="contributed">Čas Francúzskej Guyany</standard>
+					<standard>francúzskoguyanský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="French_Southern">
 				<long>
-					<standard draft="contributed">Francúzsky južný a antarktický čas</standard>
+					<standard>čas Francúzskych južných a antarktických území</standard>
 				</long>
 			</metazone>
 			<metazone type="Galapagos">
 				<long>
-					<standard draft="contributed">Galapágsky čas</standard>
+					<standard>galapágsky čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Gambier">
 				<long>
-					<standard draft="contributed">Gambierský čas</standard>
+					<standard>gambierský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Georgia">
 				<long>
-					<generic draft="contributed">Gruzínsky čas</generic>
-					<standard draft="contributed">Gruzínsky štandardný čas</standard>
-					<daylight draft="contributed">Gruzínsky letný čas</daylight>
+					<generic>gruzínsky čas</generic>
+					<standard>gruzínsky štandardný čas</standard>
+					<daylight>gruzínsky letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Gilbert_Islands">
 				<long>
-					<standard draft="contributed">Čas Gilbertových ostrovov</standard>
+					<standard>čas Gilbertových ostrovov</standard>
 				</long>
 			</metazone>
 			<metazone type="GMT">
 				<long>
-					<standard>Greenwichský čas</standard>
+					<standard>greenwichský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Greenland_Eastern">
 				<long>
-					<generic>Východogrónsky čas</generic>
-					<standard>Východogrónsky štandardný čas</standard>
-					<daylight>Východogrónsky letný čas</daylight>
+					<generic>východogrónsky čas</generic>
+					<standard>východogrónsky štandardný čas</standard>
+					<daylight>východogrónsky letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Greenland_Western">
 				<long>
-					<generic>Západogrónsky čas</generic>
-					<standard>Západogrónsky štandardný čas</standard>
-					<daylight>Západogrónsky letný čas</daylight>
+					<generic>západogrónsky čas</generic>
+					<standard>západogrónsky štandardný čas</standard>
+					<daylight>západogrónsky letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Gulf">
 				<long>
-					<standard draft="contributed">Štandardný čas Perzského zálivu</standard>
+					<standard>štandardný čas Perzského zálivu</standard>
 				</long>
 			</metazone>
 			<metazone type="Guyana">
 				<long>
-					<standard draft="contributed">Guyanský čas</standard>
+					<standard>guyanský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
-					<generic>Havajsko-aleutský čas</generic>
-					<standard>Havajsko-aleutský štandardný čas</standard>
-					<daylight>Havajsko-aleutský letný čas</daylight>
+					<generic>havajsko-aleutský čas</generic>
+					<standard>havajsko-aleutský štandardný čas</standard>
+					<daylight>havajsko-aleutský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>
-					<generic draft="contributed">Hongkongský čas</generic>
-					<standard draft="contributed">Hongkongský štandardný čas</standard>
-					<daylight draft="contributed">Hongkongský letný čas</daylight>
+					<generic>hongkonský čas</generic>
+					<standard>hongkonský štandardný čas</standard>
+					<daylight>hongkonský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hovd">
 				<long>
-					<generic>Chovdský čas</generic>
-					<standard>Chovdský štandardný čas</standard>
-					<daylight>Chovdský letný čas</daylight>
+					<generic>chovdský čas</generic>
+					<standard>chovdský štandardný čas</standard>
+					<daylight>chovdský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="India">
 				<long>
-					<standard>Indický čas</standard>
+					<standard>indický čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Indian_Ocean">
 				<long>
-					<standard draft="contributed">Čas Indického oceánu</standard>
+					<standard>indickooceánsky čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Indochina">
 				<long>
-					<standard>Indočínsky čas</standard>
+					<standard>indočínsky čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Indonesia_Central">
 				<long>
-					<standard>Stredoindonézsky čas</standard>
+					<standard>stredoindonézsky čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Indonesia_Eastern">
 				<long>
-					<standard>Východoindonézsky čas</standard>
+					<standard>východoindonézsky čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Indonesia_Western">
 				<long>
-					<standard>Západoindonézsky čas</standard>
+					<standard>západoindonézsky čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Iran">
 				<long>
-					<generic draft="contributed">Iránsky čas</generic>
-					<standard draft="contributed">Iránsky štandardný čas</standard>
-					<daylight draft="contributed">Iránsky letný čas</daylight>
+					<generic>iránsky čas</generic>
+					<standard>iránsky štandardný čas</standard>
+					<daylight>iránsky letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Irkutsk">
 				<long>
-					<generic draft="contributed">Irkutský čas</generic>
-					<standard draft="contributed">Irkutský štandardný čas</standard>
-					<daylight draft="contributed">Irkutský letný čas</daylight>
+					<generic>irkutský čas</generic>
+					<standard>irkutský štandardný čas</standard>
+					<daylight>irkutský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Israel">
 				<long>
-					<generic>Izraelský čas</generic>
-					<standard>Izraelský štandardný čas</standard>
-					<daylight>Izraelský letný čas</daylight>
+					<generic>izraelský čas</generic>
+					<standard>izraelský štandardný čas</standard>
+					<daylight>izraelský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Japan">
 				<long>
-					<generic>Japonský čas</generic>
-					<standard>Japonský štandardný čas</standard>
-					<daylight>Japonský letný čas</daylight>
+					<generic>japonský čas</generic>
+					<standard>japonský štandardný čas</standard>
+					<daylight>japonský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kamchatka">
@@ -3927,264 +4025,264 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Kazakhstan_Eastern">
 				<long>
-					<standard draft="contributed">Východokazašský čas</standard>
+					<standard>východokazachstanský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Kazakhstan_Western">
 				<long>
-					<standard draft="contributed">Západokazašský čas</standard>
+					<standard>západokazachstanský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Korea">
 				<long>
-					<generic>Kórejský čas</generic>
-					<standard>Kórejský štandardný čas</standard>
-					<daylight>Kórejský letný čas</daylight>
+					<generic>kórejský čas</generic>
+					<standard>kórejský štandardný čas</standard>
+					<daylight>kórejský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kosrae">
 				<long>
-					<standard draft="contributed">Kosraeský čas</standard>
+					<standard>kosrajský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Krasnoyarsk">
 				<long>
-					<generic draft="contributed">Krasnojarský čas</generic>
-					<standard draft="contributed">Krasnojarský štandardný čas</standard>
-					<daylight draft="contributed">Krasnojarský letný čas</daylight>
+					<generic>krasnojarský čas</generic>
+					<standard>krasnojarský štandardný čas</standard>
+					<daylight>krasnojarský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kyrgystan">
 				<long>
-					<standard draft="contributed">Kirgizský čas</standard>
+					<standard>kirgizský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Line_Islands">
 				<long>
-					<standard draft="contributed">Čas Rovníkových ostrovov</standard>
+					<standard>čas Rovníkových ostrovov</standard>
 				</long>
 			</metazone>
 			<metazone type="Lord_Howe">
 				<long>
-					<generic draft="contributed">Čas ostrova lorda Howa</generic>
-					<standard draft="contributed">Štandardný čas ostrova lorda Howa</standard>
-					<daylight draft="contributed">Letný čas ostrova lorda Howa</daylight>
+					<generic>čas ostrova lorda Howa</generic>
+					<standard>štandardný čas ostrova lorda Howa</standard>
+					<daylight>letný čas ostrova lorda Howa</daylight>
 				</long>
 			</metazone>
 			<metazone type="Macquarie">
 				<long>
-					<standard draft="contributed">Čas ostrova Macquarie</standard>
+					<standard>čas ostrova Macquarie</standard>
 				</long>
 			</metazone>
 			<metazone type="Magadan">
 				<long>
-					<generic draft="contributed">Magadanský čas</generic>
-					<standard draft="contributed">Magadanský štandardný čas</standard>
-					<daylight draft="contributed">Magadanský letný čas</daylight>
+					<generic>magadanský čas</generic>
+					<standard>magadanský štandardný čas</standard>
+					<daylight>magadanský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Malaysia">
 				<long>
-					<standard>Malajzijský čas</standard>
+					<standard>malajzijský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Maldives">
 				<long>
-					<standard>Maldivský čas</standard>
+					<standard>maldivský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Marquesas">
 				<long>
-					<standard draft="contributed">Markézsky čas</standard>
+					<standard>markézsky čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Marshall_Islands">
 				<long>
-					<standard draft="contributed">Čas Marshallových ostrovov</standard>
+					<standard>čas Marshallových ostrovov</standard>
 				</long>
 			</metazone>
 			<metazone type="Mauritius">
 				<long>
-					<generic draft="contributed">Maurícijský čas</generic>
-					<standard draft="contributed">Maurícijský štandardný čas</standard>
-					<daylight draft="contributed">Maurícijský letný čas</daylight>
+					<generic>maurícijský čas</generic>
+					<standard>maurícijský štandardný čas</standard>
+					<daylight>maurícijský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mawson">
 				<long>
-					<standard draft="contributed">Čas Mawsonovej stanice</standard>
+					<standard>čas Mawsonovej stanice</standard>
 				</long>
 			</metazone>
 			<metazone type="Mexico_Northwest">
 				<long>
-					<generic draft="contributed">Severozápadný mexický čas</generic>
-					<standard draft="contributed">Severozápadný mexický štandardný čas</standard>
-					<daylight draft="contributed">Severozápadný mexický letný čas</daylight>
+					<generic>severozápadný mexický čas</generic>
+					<standard>severozápadný mexický štandardný čas</standard>
+					<daylight>severozápadný mexický letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
-					<generic draft="contributed">Mexický tichomorský čas</generic>
-					<standard draft="contributed">Mexický tichomorský štandardný čas</standard>
-					<daylight draft="contributed">Mexický tichomorský letný čas</daylight>
+					<generic>mexický tichomorský čas</generic>
+					<standard>mexický tichomorský štandardný čas</standard>
+					<daylight>mexický tichomorský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mongolia">
 				<long>
-					<generic draft="contributed">Ulanbátarský čas</generic>
-					<standard draft="contributed">Ulanbátarský štandardný čas</standard>
-					<daylight draft="contributed">Ulanbátarský letný čas</daylight>
+					<generic>ulanbátarský čas</generic>
+					<standard>ulanbátarský štandardný čas</standard>
+					<daylight>ulanbátarský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Moscow">
 				<long>
-					<generic>Moskovský čas</generic>
-					<standard>Moskovský štandardný čas</standard>
-					<daylight>Moskovský letný čas</daylight>
+					<generic>moskovský čas</generic>
+					<standard>moskovský štandardný čas</standard>
+					<daylight>moskovský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Myanmar">
 				<long>
-					<standard draft="contributed">Mjanmarský čas</standard>
+					<standard>mjanmarský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Nauru">
 				<long>
-					<standard draft="contributed">Čas ostrova Nauru</standard>
+					<standard>nauruský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Nepal">
 				<long>
-					<standard draft="contributed">Nepálsky čas</standard>
+					<standard>nepálsky čas</standard>
 				</long>
 			</metazone>
 			<metazone type="New_Caledonia">
 				<long>
-					<generic draft="contributed">Novokaledónsky čas</generic>
-					<standard draft="contributed">Novokaledónsky štandardný čas</standard>
-					<daylight draft="contributed">Novokaledónsky letný čas</daylight>
+					<generic>novokaledónsky čas</generic>
+					<standard>novokaledónsky štandardný čas</standard>
+					<daylight>novokaledónsky letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="New_Zealand">
 				<long>
-					<generic draft="contributed">Novozélandský čas</generic>
-					<standard draft="contributed">Novozélandský štandardný čas</standard>
-					<daylight draft="contributed">Novozélandský letný čas</daylight>
+					<generic>novozélandský čas</generic>
+					<standard>novozélandský štandardný čas</standard>
+					<daylight>novozélandský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Newfoundland">
 				<long>
-					<generic draft="contributed">Newfoundlandský čas</generic>
-					<standard draft="contributed">Newfoundlandský štandardný čas</standard>
-					<daylight draft="contributed">Newfoundlandský letný čas</daylight>
+					<generic>newfoundlandský čas</generic>
+					<standard>newfoundlandský štandardný čas</standard>
+					<daylight>newfoundlandský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Niue">
 				<long>
-					<standard draft="contributed">Čas ostrova Niue</standard>
+					<standard>niuejský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Norfolk">
 				<long>
-					<standard draft="contributed">Čas Norfolkských ostrovov</standard>
+					<standard>norfolský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Noronha">
 				<long>
-					<generic>Čas ostrova Fernando de Noronha</generic>
-					<standard>Štandardný čas ostrova Fernando de Noronha</standard>
-					<daylight>Letný čas ostrovov Fernanda de Noronha</daylight>
+					<generic>čas súostrovia Fernando de Noronha</generic>
+					<standard>štandardný čas súostrovia Fernando de Noronha</standard>
+					<daylight>letný čas súostrovia Fernando de Noronha</daylight>
 				</long>
 			</metazone>
 			<metazone type="Novosibirsk">
 				<long>
-					<generic>Novosibírsky čas</generic>
-					<standard>Novosibirský štandardný čas</standard>
-					<daylight>Novosibírsky letný čas</daylight>
+					<generic>novosibirský čas</generic>
+					<standard>novosibirský štandardný čas</standard>
+					<daylight>novosibirský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Omsk">
 				<long>
-					<generic draft="contributed">Omský čas</generic>
-					<standard draft="contributed">Omský štandardný čas</standard>
-					<daylight draft="contributed">Omský letný čas</daylight>
+					<generic>omský čas</generic>
+					<standard>omský štandardný čas</standard>
+					<daylight>omský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Pakistan">
 				<long>
-					<generic draft="contributed">Pakistanský čas</generic>
-					<standard draft="contributed">Pakistanský štandardný čas</standard>
-					<daylight draft="contributed">Pakistanský letný čas</daylight>
+					<generic>pakistanský čas</generic>
+					<standard>pakistanský štandardný čas</standard>
+					<daylight>pakistanský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Palau">
 				<long>
-					<standard draft="contributed">Palauský čas</standard>
+					<standard>palauský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Papua_New_Guinea">
 				<long>
-					<standard draft="contributed">Čas Papuy-Novej Guiney</standard>
+					<standard>čas Papuy-Novej Guiney</standard>
 				</long>
 			</metazone>
 			<metazone type="Paraguay">
 				<long>
-					<generic draft="contributed">Paraguajský čas</generic>
-					<standard draft="contributed">Paraguajský štandardný čas</standard>
-					<daylight draft="contributed">Paraguajský letný čas</daylight>
+					<generic>paraguajský čas</generic>
+					<standard>paraguajský štandardný čas</standard>
+					<daylight>paraguajský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Peru">
 				<long>
-					<generic draft="contributed">Peruánsky čas</generic>
-					<standard draft="contributed">Peruánsky štandardný čas</standard>
-					<daylight draft="contributed">Peruánsky letný čas</daylight>
+					<generic>peruánsky čas</generic>
+					<standard>peruánsky štandardný čas</standard>
+					<daylight>peruánsky letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Philippines">
 				<long>
-					<generic draft="contributed">Filipínsky čas</generic>
-					<standard draft="contributed">Filipínsky štandardný čas</standard>
-					<daylight draft="contributed">Filipínsky letný čas</daylight>
+					<generic>filipínsky čas</generic>
+					<standard>filipínsky štandardný čas</standard>
+					<daylight>filipínsky letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Phoenix_Islands">
 				<long>
-					<standard draft="contributed">Čas Fénixových ostrovov</standard>
+					<standard>čas Fénixových ostrovov</standard>
 				</long>
 			</metazone>
 			<metazone type="Pierre_Miquelon">
 				<long>
-					<generic>Čas ostrovov Saint-Pierre a Miquelon</generic>
-					<standard>Štandardný čas ostrovov Saint-Pierre a Miquelon</standard>
-					<daylight>Letný čas ostrovov Saint-Pierre a Miquelon</daylight>
+					<generic>pierre-miquelonský čas</generic>
+					<standard>pierre-miquelonský štandardný čas</standard>
+					<daylight>pierre-miquelonský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Pitcairn">
 				<long>
-					<standard draft="contributed">Čas Pitcairnovho ostrova</standard>
+					<standard>čas Pitcairnových ostrovov</standard>
 				</long>
 			</metazone>
 			<metazone type="Ponape">
 				<long>
-					<standard draft="contributed">Ponapský čas</standard>
+					<standard>ponapský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Reunion">
 				<long>
-					<standard draft="contributed">Réunionský čas</standard>
+					<standard>réunionský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Rothera">
 				<long>
-					<standard draft="contributed">Čas Rotherovej stanice</standard>
+					<standard>čas Rotherovej stanice</standard>
 				</long>
 			</metazone>
 			<metazone type="Sakhalin">
 				<long>
-					<generic draft="contributed">Sachalinský čas</generic>
-					<standard draft="contributed">Sachalinský štandardný čas</standard>
-					<daylight draft="contributed">Sachalinský letný čas</daylight>
+					<generic>sachalinský čas</generic>
+					<standard>sachalinský štandardný čas</standard>
+					<daylight>sachalinský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Samara">
@@ -4196,154 +4294,154 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Samoa">
 				<long>
-					<generic draft="contributed">Samojský čas</generic>
-					<standard draft="contributed">Samojský štandardný čas</standard>
-					<daylight draft="contributed">Samojský letný čas</daylight>
+					<generic>samojský čas</generic>
+					<standard>samojský štandardný čas</standard>
+					<daylight>samojský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Seychelles">
 				<long>
-					<standard draft="contributed">Seychelský čas</standard>
+					<standard>seychelský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Singapore">
 				<long>
-					<standard draft="contributed">Singapurský štandardný čas</standard>
+					<standard>singapurský štandardný čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Solomon">
 				<long>
-					<standard draft="contributed">Čas Šalamúnových ostrovov</standard>
+					<standard>čas Šalamúnových ostrovov</standard>
 				</long>
 			</metazone>
 			<metazone type="South_Georgia">
 				<long>
-					<standard draft="contributed">Čas Južnej Georgie</standard>
+					<standard>čas Južnej Georgie</standard>
 				</long>
 			</metazone>
 			<metazone type="Suriname">
 				<long>
-					<standard>Surinamský čas</standard>
+					<standard>surinamský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Syowa">
 				<long>
-					<standard draft="contributed">Čas stanice Šówa</standard>
+					<standard>čas stanice Šówa</standard>
 				</long>
 			</metazone>
 			<metazone type="Tahiti">
 				<long>
-					<standard draft="contributed">Tahitský čas</standard>
+					<standard>tahitský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Taipei">
 				<long>
-					<generic draft="contributed">Tchajpejský čas</generic>
-					<standard draft="contributed">Tchajpejský štandardný čas</standard>
-					<daylight draft="contributed">Tchajpejský letný čas</daylight>
+					<generic>tchajpejský čas</generic>
+					<standard>tchajpejský štandardný čas</standard>
+					<daylight>tchajpejský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tajikistan">
 				<long>
-					<standard draft="contributed">Tadžický čas</standard>
+					<standard>tadžický čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Tokelau">
 				<long>
-					<standard draft="contributed">Tokelauský čas</standard>
+					<standard>tokelauský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Tonga">
 				<long>
-					<generic draft="contributed">Tonžský čas</generic>
-					<standard draft="contributed">Tonžský štandardný čas</standard>
-					<daylight draft="contributed">Tonžský letný čas</daylight>
+					<generic>tonžský čas</generic>
+					<standard>tonžský štandardný čas</standard>
+					<daylight>tonžský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Truk">
 				<long>
-					<standard draft="contributed">Chuukský čas</standard>
+					<standard>chuukský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
-					<generic draft="contributed">Turkménsky čas</generic>
-					<standard draft="contributed">Turkménsky štandardný čas</standard>
-					<daylight draft="contributed">Turkménsky letný čas</daylight>
+					<generic>turkménsky čas</generic>
+					<standard>turkménsky štandardný čas</standard>
+					<daylight>turkménsky letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tuvalu">
 				<long>
-					<standard draft="contributed">Tuvalský čas</standard>
+					<standard>tuvalský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Uruguay">
 				<long>
-					<generic draft="contributed">Uruguajský čas</generic>
-					<standard draft="contributed">Uruguajský štandardný čas</standard>
-					<daylight draft="contributed">Uruguajský letný čas</daylight>
+					<generic>uruguajský čas</generic>
+					<standard>uruguajský štandardný čas</standard>
+					<daylight>uruguajský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Uzbekistan">
 				<long>
-					<generic draft="contributed">Uzbecký čas</generic>
-					<standard draft="contributed">Uzbecký štandardný čas</standard>
-					<daylight draft="contributed">Uzbecký letný čas</daylight>
+					<generic>uzbecký čas</generic>
+					<standard>uzbecký štandardný čas</standard>
+					<daylight>uzbecký letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Vanuatu">
 				<long>
-					<generic draft="contributed">Vanuatský čas</generic>
-					<standard draft="contributed">Vanuatský štandardný čas</standard>
-					<daylight draft="contributed">Vanuatský letný čas</daylight>
+					<generic>vanuatský čas</generic>
+					<standard>vanuatský štandardný čas</standard>
+					<daylight>vanuatský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Venezuela">
 				<long>
-					<standard draft="contributed">Venezuelský čas</standard>
+					<standard>venezuelský čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Vladivostok">
 				<long>
-					<generic draft="contributed">Vladivostocký čas</generic>
-					<standard draft="contributed">Vladivostocký štandardný čas</standard>
-					<daylight draft="contributed">Vladivostocký letný čas</daylight>
+					<generic>vladivostocký čas</generic>
+					<standard>vladivostocký štandardný čas</standard>
+					<daylight>vladivostocký letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Volgograd">
 				<long>
-					<generic draft="contributed">Volgogradský čas</generic>
-					<standard draft="contributed">Volgogradský štandardný čas</standard>
-					<daylight draft="contributed">Volgogradský letný čas</daylight>
+					<generic>volgogradský čas</generic>
+					<standard>volgogradský štandardný čas</standard>
+					<daylight>volgogradský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Vostok">
 				<long>
-					<standard draft="contributed">Čas stanice Vostok</standard>
+					<standard>čas stanice Vostok</standard>
 				</long>
 			</metazone>
 			<metazone type="Wake">
 				<long>
-					<standard draft="contributed">Čas ostrova Wake</standard>
+					<standard>čas ostrova Wake</standard>
 				</long>
 			</metazone>
 			<metazone type="Wallis">
 				<long>
-					<standard draft="contributed">Čas ostrovov Wallis a Futuna</standard>
+					<standard>čas ostrovov Wallis a Futuna</standard>
 				</long>
 			</metazone>
 			<metazone type="Yakutsk">
 				<long>
-					<generic draft="contributed">Jakutský čas</generic>
-					<standard draft="contributed">Jakutský štandardný čas</standard>
-					<daylight draft="contributed">Jakutský letný čas</daylight>
+					<generic>jakutský čas</generic>
+					<standard>jakutský štandardný čas</standard>
+					<daylight>jakutský letný čas</daylight>
 				</long>
 			</metazone>
 			<metazone type="Yekaterinburg">
 				<long>
-					<generic draft="contributed">Jekaterinburgský čas</generic>
-					<standard draft="contributed">Jekaterinburgský štandardný čas</standard>
-					<daylight draft="contributed">Jekaterinburský letný čas</daylight>
+					<generic>jekaterinburský čas</generic>
+					<standard>jekaterinburský štandardný čas</standard>
+					<daylight>jekaterinburský letný čas</daylight>
 				</long>
 			</metazone>
 		</timeZoneNames>
@@ -4377,52 +4475,52 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<decimalFormatLength type="long">
 				<decimalFormat>
 					<pattern type="1000" count="one">0 tisíc</pattern>
-					<pattern type="1000" count="few">0 tisíc</pattern>
-					<pattern type="1000" count="many">0 tisíc</pattern>
+					<pattern type="1000" count="few">0 tisíce</pattern>
+					<pattern type="1000" count="many">0 tisíca</pattern>
 					<pattern type="1000" count="other">0 tisíc</pattern>
 					<pattern type="10000" count="one">00 tisíc</pattern>
 					<pattern type="10000" count="few">00 tisíc</pattern>
-					<pattern type="10000" count="many">00 tisíc</pattern>
+					<pattern type="10000" count="many">00 tisíca</pattern>
 					<pattern type="10000" count="other">00 tisíc</pattern>
 					<pattern type="100000" count="one">000 tisíc</pattern>
 					<pattern type="100000" count="few">000 tisíc</pattern>
-					<pattern type="100000" count="many">000 tisíc</pattern>
+					<pattern type="100000" count="many">000 tisíca</pattern>
 					<pattern type="100000" count="other">000 tisíc</pattern>
 					<pattern type="1000000" count="one">0 milión</pattern>
 					<pattern type="1000000" count="few">0 milióny</pattern>
-					<pattern type="1000000" count="many">0 miliónov</pattern>
+					<pattern type="1000000" count="many">0 milióna</pattern>
 					<pattern type="1000000" count="other">0 miliónov</pattern>
-					<pattern type="10000000" count="one">00 milión</pattern>
-					<pattern type="10000000" count="few">00 milióny</pattern>
-					<pattern type="10000000" count="many">00 miliónov</pattern>
+					<pattern type="10000000" count="one">00 miliónov</pattern>
+					<pattern type="10000000" count="few">00 miliónov</pattern>
+					<pattern type="10000000" count="many">00 milióna</pattern>
 					<pattern type="10000000" count="other">00 miliónov</pattern>
-					<pattern type="100000000" count="one">000 milión</pattern>
-					<pattern type="100000000" count="few">000 milióny</pattern>
-					<pattern type="100000000" count="many">000 miliónov</pattern>
+					<pattern type="100000000" count="one">000 miliónov</pattern>
+					<pattern type="100000000" count="few">000 miliónov</pattern>
+					<pattern type="100000000" count="many">000 milióna</pattern>
 					<pattern type="100000000" count="other">000 miliónov</pattern>
 					<pattern type="1000000000" count="one">0 miliarda</pattern>
 					<pattern type="1000000000" count="few">0 miliardy</pattern>
-					<pattern type="1000000000" count="many">0 miliard</pattern>
-					<pattern type="1000000000" count="other">0 miliard</pattern>
-					<pattern type="10000000000" count="one">00 miliarda</pattern>
-					<pattern type="10000000000" count="few">00 miliárdy</pattern>
-					<pattern type="10000000000" count="many">00 miliárd</pattern>
+					<pattern type="1000000000" count="many">0 miliardy</pattern>
+					<pattern type="1000000000" count="other">0 miliárd</pattern>
+					<pattern type="10000000000" count="one">00 miliárd</pattern>
+					<pattern type="10000000000" count="few">00 miliárd</pattern>
+					<pattern type="10000000000" count="many">00 miliardy</pattern>
 					<pattern type="10000000000" count="other">00 miliárd</pattern>
-					<pattern type="100000000000" count="one">000 miliarda</pattern>
-					<pattern type="100000000000" count="few">000 miliárdy</pattern>
-					<pattern type="100000000000" count="many">000 miliárd</pattern>
+					<pattern type="100000000000" count="one">000 miliárd</pattern>
+					<pattern type="100000000000" count="few">000 miliárd</pattern>
+					<pattern type="100000000000" count="many">000 miliardy</pattern>
 					<pattern type="100000000000" count="other">000 miliárd</pattern>
 					<pattern type="1000000000000" count="one">0 bilión</pattern>
 					<pattern type="1000000000000" count="few">0 bilióny</pattern>
-					<pattern type="1000000000000" count="many">0 biliónov</pattern>
+					<pattern type="1000000000000" count="many">0 bilióna</pattern>
 					<pattern type="1000000000000" count="other">0 biliónov</pattern>
-					<pattern type="10000000000000" count="one">00 bilión</pattern>
-					<pattern type="10000000000000" count="few">00 bilióny</pattern>
-					<pattern type="10000000000000" count="many">00 biliónov</pattern>
+					<pattern type="10000000000000" count="one">00 biliónov</pattern>
+					<pattern type="10000000000000" count="few">00 biliónov</pattern>
+					<pattern type="10000000000000" count="many">00 bilióna</pattern>
 					<pattern type="10000000000000" count="other">00 biliónov</pattern>
-					<pattern type="100000000000000" count="one">000 bilión</pattern>
-					<pattern type="100000000000000" count="few">000 bilióny</pattern>
-					<pattern type="100000000000000" count="many">000 biliónov</pattern>
+					<pattern type="100000000000000" count="one">000 biliónov</pattern>
+					<pattern type="100000000000000" count="few">000 biliónov</pattern>
+					<pattern type="100000000000000" count="many">000 bilióna</pattern>
 					<pattern type="100000000000000" count="other">000 biliónov</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
@@ -4502,6 +4600,58 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">0 tis'.' ¤</pattern>
+					<pattern type="1000" count="few">0 tis'.' ¤</pattern>
+					<pattern type="1000" count="many">0 tis'.' ¤</pattern>
+					<pattern type="1000" count="other">0 tis'.' ¤</pattern>
+					<pattern type="10000" count="one">00 tis'.' ¤</pattern>
+					<pattern type="10000" count="few">00 tis'.' ¤</pattern>
+					<pattern type="10000" count="many">00 tis'.' ¤</pattern>
+					<pattern type="10000" count="other">00 tis'.' ¤</pattern>
+					<pattern type="100000" count="one">000 tis'.' ¤</pattern>
+					<pattern type="100000" count="few">000 tis'.' ¤</pattern>
+					<pattern type="100000" count="many">000 tis'.' ¤</pattern>
+					<pattern type="100000" count="other">000 tis'.' ¤</pattern>
+					<pattern type="1000000" count="one">0 mil'.' ¤</pattern>
+					<pattern type="1000000" count="few">0 mil'.' ¤</pattern>
+					<pattern type="1000000" count="many">0 mil'.' ¤</pattern>
+					<pattern type="1000000" count="other">0 mil'.' ¤</pattern>
+					<pattern type="10000000" count="one">00 mil'.' ¤</pattern>
+					<pattern type="10000000" count="few">00 mil'.' ¤</pattern>
+					<pattern type="10000000" count="many">00 mil'.' ¤</pattern>
+					<pattern type="10000000" count="other">00 mil'.' ¤</pattern>
+					<pattern type="100000000" count="one">000 mil'.' ¤</pattern>
+					<pattern type="100000000" count="few">000 mil'.' ¤</pattern>
+					<pattern type="100000000" count="many">000 mil'.' ¤</pattern>
+					<pattern type="100000000" count="other">000 mil'.' ¤</pattern>
+					<pattern type="1000000000" count="one">0 mld'.' ¤</pattern>
+					<pattern type="1000000000" count="few">0 mld'.' ¤</pattern>
+					<pattern type="1000000000" count="many">0 mld'.' ¤</pattern>
+					<pattern type="1000000000" count="other">0 mld'.' ¤</pattern>
+					<pattern type="10000000000" count="one">00 mld'.' ¤</pattern>
+					<pattern type="10000000000" count="few">00 mld'.' ¤</pattern>
+					<pattern type="10000000000" count="many">00 mld'.' ¤</pattern>
+					<pattern type="10000000000" count="other">00 mld'.' ¤</pattern>
+					<pattern type="100000000000" count="one">000 mld'.' ¤</pattern>
+					<pattern type="100000000000" count="few">000 mld'.' ¤</pattern>
+					<pattern type="100000000000" count="many">000 mld'.' ¤</pattern>
+					<pattern type="100000000000" count="other">000 mld'.' ¤</pattern>
+					<pattern type="1000000000000" count="one">0 bil'.' ¤</pattern>
+					<pattern type="1000000000000" count="few">0 bil'.' ¤</pattern>
+					<pattern type="1000000000000" count="many">0 bil'.' ¤</pattern>
+					<pattern type="1000000000000" count="other">0 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="one">00 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="few">00 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="many">00 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="other">00 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="one">000 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="few">000 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="many">000 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="other">000 bil'.' ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="few">{0} {1}</unitPattern>
 			<unitPattern count="many">{0} {1}</unitPattern>
@@ -4509,7 +4659,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencyFormats>
 		<currencies>
 			<currency type="ADP">
-				<displayName>Andorská peseta</displayName>
+				<displayName>andorská peseta</displayName>
 			</currency>
 			<currency type="AED">
 				<displayName>SAE dirham</displayName>
@@ -4558,21 +4708,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">angolskej kwanzy</displayName>
 				<displayName count="other">angolských kwánz</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
-				<displayName>Angolská kwanza (1977–1990)</displayName>
+				<displayName>angolská kwanza (1977–1990)</displayName>
 			</currency>
 			<currency type="AON">
 				<displayName>Angolská nová kwanza (1990–2000)</displayName>
 			</currency>
 			<currency type="AOR">
-				<displayName>Angolská kwanza Reajustado (1995–1999)</displayName>
+				<displayName>angolská kwanza reajustado (1995–1999)</displayName>
 			</currency>
 			<currency type="ARA">
-				<displayName>Argentinský austral</displayName>
+				<displayName>argentínsky austral</displayName>
 			</currency>
 			<currency type="ARP">
-				<displayName>Argentinské peso (1983–1985)</displayName>
+				<displayName>argentínske peso (1983 – 1985)</displayName>
 			</currency>
 			<currency type="ARS">
 				<displayName>argentínske peso</displayName>
@@ -4584,7 +4735,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="ATS">
-				<displayName>Rakúsky šiling</displayName>
+				<displayName>rakúsky šiling</displayName>
 			</currency>
 			<currency type="AUD">
 				<displayName>austrálsky dolár</displayName>
@@ -4604,11 +4755,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>AWG</symbol>
 			</currency>
 			<currency type="AZM">
-				<displayName>Azerbajdžanský manat (1993–2006)</displayName>
+				<displayName>azerbajdžanský manat (1993–2006)</displayName>
 				<displayName count="one">azerbajdžanský manat (1993–2006)</displayName>
 				<displayName count="few">azerbajdžanské manaty (1993–2006)</displayName>
 				<displayName count="many">azerbajdžanského manatu (1993–2006)</displayName>
 				<displayName count="other">azerbajdžanských manatov (1993–2006)</displayName>
+				<symbol draft="contributed">AZM</symbol>
 			</currency>
 			<currency type="AZN">
 				<displayName>azerbajdžanský manat</displayName>
@@ -4619,7 +4771,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>AZN</symbol>
 			</currency>
 			<currency type="BAD">
-				<displayName>Bosnianský dinár</displayName>
+				<displayName>bosniansko-hercegovinský dinár (1992–1994)</displayName>
 			</currency>
 			<currency type="BAM">
 				<displayName>konvertibilná marka</displayName>
@@ -4628,6 +4780,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">konvertibilnej marky</displayName>
 				<displayName count="other">konvertibilných mariek</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>barbadoský dolár</displayName>
@@ -4648,16 +4801,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">৳</symbol>
 			</currency>
 			<currency type="BEC">
-				<displayName>Belgický frank (konvertibilný)</displayName>
+				<displayName>belgický frank (konvertibilný)</displayName>
 			</currency>
 			<currency type="BEF">
-				<displayName>Belgický frank</displayName>
+				<displayName>belgický frank</displayName>
 			</currency>
 			<currency type="BEL">
-				<displayName>Belgický frank (finančný)</displayName>
+				<displayName>belgický frank (finančný)</displayName>
 			</currency>
 			<currency type="BGL">
-				<displayName>Bulharský leva</displayName>
+				<displayName>bulharský tvrdý lev</displayName>
 			</currency>
 			<currency type="BGN">
 				<displayName>bulharský lev</displayName>
@@ -4708,21 +4861,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">bolívijského boliviana</displayName>
 				<displayName count="other">bolívijských bolivian</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOP">
-				<displayName>Bolivíjske peso</displayName>
+				<displayName>bolívijské peso</displayName>
 			</currency>
 			<currency type="BOV">
-				<displayName>Bolivíjske mvdol</displayName>
+				<displayName>bolívijské MVDOL</displayName>
 			</currency>
 			<currency type="BRB">
-				<displayName>Bolivíjske Cruzeiro Novo (1967–1986)</displayName>
+				<displayName>brazílske cruzeiro novo (1967–1986)</displayName>
 			</currency>
 			<currency type="BRC">
-				<displayName>Bolivíjske cruzado</displayName>
+				<displayName>brazílske cruzado (1986 – 1989)</displayName>
 			</currency>
 			<currency type="BRE">
-				<displayName>Bolivíjske cruzeiro (1990–1993)</displayName>
+				<displayName>brazílske cruzeiro (1990 – 1993)</displayName>
 			</currency>
 			<currency type="BRL">
 				<displayName>brazílsky real</displayName>
@@ -4766,6 +4920,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">botswanskej puly</displayName>
 				<displayName count="other">botswanských púl</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>Bieloruský nový rubeľ (1994–1999)</displayName>
@@ -4866,6 +5021,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">kubánskeho konvertibilného pesa</displayName>
 				<displayName count="other">kubánskych konvertibilných pesos</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>kubánske peso</displayName>
@@ -4894,6 +5050,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">českej koruny</displayName>
 				<displayName count="other">českých korún</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>Východonemecká marka</displayName>
@@ -4916,6 +5073,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">dánskej koruny</displayName>
 				<displayName count="other">dánskych korún</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>dominikánske peso</displayName>
@@ -4955,6 +5113,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">egyptskej libry</displayName>
 				<displayName count="other">egyptských libier</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>eritrejská nakfa</displayName>
@@ -4981,6 +5140,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">eurá</displayName>
 				<displayName count="many">eura</displayName>
 				<displayName count="other">eur</displayName>
+				<symbol>€</symbol>
+				<symbol alt="narrow">€</symbol>
 			</currency>
 			<currency type="FIM">
 				<displayName>Finská marka</displayName>
@@ -5001,6 +5162,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">falklandskej libry</displayName>
 				<displayName count="other">falklandských libier</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>Francúzsky frank</displayName>
@@ -5024,6 +5186,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">gruzínskeho lari</displayName>
 				<displayName count="other">gruzínskych lari</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>Ghanský cedi (1979–2007)</displayName>
@@ -5064,6 +5227,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">guinejského franku</displayName>
 				<displayName count="other">guinejských frankov</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>Guinejský syli</displayName>
@@ -5081,6 +5245,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">guatemalského quetzala</displayName>
 				<displayName count="other">guatemalských quetzalov</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>Portugalská Guinea eskudo</displayName>
@@ -5118,6 +5283,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">honduraskej lempiry</displayName>
 				<displayName count="other">honduraských lempír</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>Chorvátsky dinár</displayName>
@@ -5129,6 +5295,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">chorvátskej kuny</displayName>
 				<displayName count="other">chorvátskych kún</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>haitské gourde</displayName>
@@ -5145,6 +5312,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">maďarského forinta</displayName>
 				<displayName count="other">maďarských forintov</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>indonézska rupia</displayName>
@@ -5153,6 +5321,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">indonézskej rupie</displayName>
 				<displayName count="other">indonézskych rupií</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>Írska libra</displayName>
@@ -5201,6 +5370,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">islandskej koruny</displayName>
 				<displayName count="other">islandských korún</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>Talianská lira</displayName>
@@ -5263,6 +5433,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">komorského franku</displayName>
 				<displayName count="other">komorských frankov</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>severokórejský won</displayName>
@@ -5271,6 +5442,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">severokórejskeho wonu</displayName>
 				<displayName count="other">severokórejských wonov</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>juhokórejský won</displayName>
@@ -5323,6 +5495,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">libanonskej libry</displayName>
 				<displayName count="other">libanonských libier</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>srílanská rupia</displayName>
@@ -5331,6 +5504,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">srílanskej rupie</displayName>
 				<displayName count="other">srílanských rupií</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>libérijský dolár</displayName>
@@ -5403,6 +5577,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">malgašského ariary</displayName>
 				<displayName count="other">malgašských ariary</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>Madagaskarský frank</displayName>
@@ -5425,6 +5600,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">mjanmarského kyatu</displayName>
 				<displayName count="other">mjanmarských kyatov</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>mongolský tugrik</displayName>
@@ -5464,6 +5640,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">maurícijskej rupie</displayName>
 				<displayName count="other">maurícijských rupií</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>maldivská rupia</displayName>
@@ -5503,6 +5680,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">malajzijského ringgitu</displayName>
 				<displayName count="other">malajzijských ringgitov</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>Mozambické escudo</displayName>
@@ -5559,6 +5737,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">nikaragujskej córdoby</displayName>
 				<displayName count="other">nikaragujských córdob</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>Nizozemský guilder</displayName>
@@ -5570,6 +5749,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">nórskej koruny</displayName>
 				<displayName count="other">nórskych korún</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>nepálska rupia</displayName>
@@ -5578,6 +5758,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">nepálskej rupie</displayName>
 				<displayName count="other">nepálskych rupií</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>novozélandský dolár</displayName>
@@ -5642,6 +5823,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">pakistanskej rupie</displayName>
 				<displayName count="other">pakistanských rupií</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>poľský zlotý</displayName>
@@ -5650,6 +5832,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">poľského zlotého</displayName>
 				<displayName count="other">poľských zlotých</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>Polský zloty (1950–1995)</displayName>
@@ -5708,6 +5891,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">ruského rubľa</displayName>
 				<displayName count="other">ruských rubľov</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 				<symbol alt="variant" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
@@ -5720,6 +5904,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">rwandského franku</displayName>
 				<displayName count="other">rwandských frankov</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>saudskoarabský rial</displayName>
@@ -5771,6 +5956,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">švédskej koruny</displayName>
 				<displayName count="other">švédskych korún</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>singapurský dolár</displayName>
@@ -5788,6 +5974,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">svätohelenskej libry</displayName>
 				<displayName count="other">svätohelenských libier</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>Slovinský Tolar</displayName>
@@ -5839,6 +6026,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">svätotomášskej dobry</displayName>
 				<displayName count="other">svätotomášskych dobier</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>Sovietsky rubeľ</displayName>
@@ -5858,6 +6046,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">sýrskej libry</displayName>
 				<displayName count="other">sýrskych libier</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>svazijské lilangeni</displayName>
@@ -5874,6 +6063,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">thajského bahtu</displayName>
 				<displayName count="other">thajských bahtov</displayName>
 				<symbol>THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>Tadžický rubeľ</displayName>
@@ -5916,6 +6106,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">tongského pa’anga</displayName>
 				<displayName count="other">tongských pa’anga</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>Timorské eskudo</displayName>
@@ -6031,6 +6222,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">venezuelského bolívaru</displayName>
 				<displayName count="other">venezuelských bolívarov</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>vietnamský dong</displayName>
@@ -6075,6 +6267,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">východokaribského dolára</displayName>
 				<displayName count="other">východokaribských dolárov</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>Špeciálne práva čerpania</displayName>
@@ -6138,6 +6331,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">juhoafrického randu</displayName>
 				<displayName count="other">juhoafrických randov</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>Zambijská kwacha (1968–2012)</displayName>
@@ -6153,6 +6347,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">zambijskej kwachy</displayName>
 				<displayName count="other">zambijských kwách</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>Zairský nový zaire</displayName>
@@ -6185,13 +6380,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
-			<pattern type="range" draft="contributed">{0}–{1}</pattern>
+			<pattern type="range">{0} – {1}</pattern>
 		</miscPatterns>
 	</numbers>
 	<units>
 		<unitLength type="long">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0} za {1}</compoundUnitPattern>
+				<compoundUnitPattern>{0} za {1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>jednotky preťaženia</displayName>
@@ -6207,6 +6402,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} metra za sekundu na druhú</unitPattern>
 				<unitPattern count="other">{0} metrov za sekundu na druhú</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>otáčky</displayName>
+				<unitPattern count="one">{0} otáčka</unitPattern>
+				<unitPattern count="few">{0} otáčky</unitPattern>
+				<unitPattern count="many">{0} otáčky</unitPattern>
+				<unitPattern count="other">{0} otáčok</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radiány</displayName>
+				<unitPattern count="one">{0} radián</unitPattern>
+				<unitPattern count="few">{0} radiány</unitPattern>
+				<unitPattern count="many">{0} radiánu</unitPattern>
+				<unitPattern count="other">{0} radiánov</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>stupne</displayName>
+				<unitPattern count="one">{0} stupeň</unitPattern>
+				<unitPattern count="few">{0} stupne</unitPattern>
+				<unitPattern count="many">{0} stupňa</unitPattern>
+				<unitPattern count="other">{0} stupňov</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>minúty</displayName>
 				<unitPattern count="one">{0} minúta</unitPattern>
@@ -6221,26 +6437,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} sekundy</unitPattern>
 				<unitPattern count="other">{0} sekúnd</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>stupne</displayName>
-				<unitPattern count="one">{0} stupeň</unitPattern>
-				<unitPattern count="few">{0} stupne</unitPattern>
-				<unitPattern count="many">{0} stupňa</unitPattern>
-				<unitPattern count="other">{0} stupňov</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radiány</displayName>
-				<unitPattern count="one">{0} radián</unitPattern>
-				<unitPattern count="few">{0} radiány</unitPattern>
-				<unitPattern count="many">{0} radiánu</unitPattern>
-				<unitPattern count="other">{0} radiánov</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>akre</displayName>
-				<unitPattern count="one">{0} aker</unitPattern>
-				<unitPattern count="few">{0} akre</unitPattern>
-				<unitPattern count="many">{0} akra</unitPattern>
-				<unitPattern count="other">{0} akrov</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>štvorcové kilometre</displayName>
+				<unitPattern count="one">{0} kilometer štvorcový</unitPattern>
+				<unitPattern count="few">{0} kilometre štvorcové</unitPattern>
+				<unitPattern count="many">{0} kilometra štvorcového</unitPattern>
+				<unitPattern count="other">{0} kilometrov štvorcových</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektáre</displayName>
@@ -6249,12 +6451,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} hektára</unitPattern>
 				<unitPattern count="other">{0} hektárov</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>štvorcové metre</displayName>
+				<unitPattern count="one">{0} meter štvorcový</unitPattern>
+				<unitPattern count="few">{0} metre štvorcové</unitPattern>
+				<unitPattern count="many">{0} metra štvorcového</unitPattern>
+				<unitPattern count="other">{0} metrov štvorcových</unitPattern>
+				<perUnitPattern>{0} na meter štvorcový</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>štvorcové centimetre</displayName>
 				<unitPattern count="one">{0} štvorcový centimeter</unitPattern>
 				<unitPattern count="few">{0} štvorcové centimetre</unitPattern>
 				<unitPattern count="many">{0} štvorcového centimetra</unitPattern>
 				<unitPattern count="other">{0} štvorcových centimetrov</unitPattern>
+				<perUnitPattern>{0} na štvorcový centimeter</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>štvorcové míle</displayName>
+				<unitPattern count="one">{0} míľa štvorcová</unitPattern>
+				<unitPattern count="few">{0} míle štvorcové</unitPattern>
+				<unitPattern count="many">{0} míle štvorcovej</unitPattern>
+				<unitPattern count="other">{0} míľ štvorcových</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>akre</displayName>
+				<unitPattern count="one">{0} aker</unitPattern>
+				<unitPattern count="few">{0} akre</unitPattern>
+				<unitPattern count="many">{0} akra</unitPattern>
+				<unitPattern count="other">{0} akrov</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>štvorcové yardy</displayName>
+				<unitPattern count="one">{0} štvorcový yard</unitPattern>
+				<unitPattern count="few">{0} štvorcové yardy</unitPattern>
+				<unitPattern count="many">{0} štvorcového yardu</unitPattern>
+				<unitPattern count="other">{0} štvorcových yardov</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>štvorcové stopy</displayName>
@@ -6269,34 +6501,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} štvorcové palce</unitPattern>
 				<unitPattern count="many">{0} štvorcového palca</unitPattern>
 				<unitPattern count="other">{0} štvorcových palcov</unitPattern>
+				<perUnitPattern>{0} na štvorcový palec</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>štvorcové kilometre</displayName>
-				<unitPattern count="one">{0} kilometer štvorcový</unitPattern>
-				<unitPattern count="few">{0} kilometre štvorcové</unitPattern>
-				<unitPattern count="many">{0} kilometra štvorcového</unitPattern>
-				<unitPattern count="other">{0} kilometrov štvorcových</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>štvorcové metre</displayName>
-				<unitPattern count="one">{0} meter štvorcový</unitPattern>
-				<unitPattern count="few">{0} metre štvorcové</unitPattern>
-				<unitPattern count="many">{0} metra štvorcového</unitPattern>
-				<unitPattern count="other">{0} metrov štvorcových</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>štvorcové míle</displayName>
-				<unitPattern count="one">{0} míľa štvorcová</unitPattern>
-				<unitPattern count="few">{0} míle štvorcové</unitPattern>
-				<unitPattern count="many">{0} míle štvorcovej</unitPattern>
-				<unitPattern count="other">{0} míľ štvorcových</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>štvorcové yardy</displayName>
-				<unitPattern count="one">{0} štvorcový yard</unitPattern>
-				<unitPattern count="few">{0} štvorcové yardy</unitPattern>
-				<unitPattern count="many">{0} štvorcového yardu</unitPattern>
-				<unitPattern count="other">{0} štvorcových yardov</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karáty</displayName>
+				<unitPattern count="one">{0} karát</unitPattern>
+				<unitPattern count="few">{0} karáty</unitPattern>
+				<unitPattern count="many">{0} karátu</unitPattern>
+				<unitPattern count="other">{0} karátov</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litre na kilometer</displayName>
@@ -6305,6 +6517,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} litra na kilometer</unitPattern>
 				<unitPattern count="other">{0} litrov na kilometer</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>litre na 100 kilometrov</displayName>
+				<unitPattern count="one">{0} liter na 100 kilometrov</unitPattern>
+				<unitPattern count="few">{0} litre na 100 kilometrov</unitPattern>
+				<unitPattern count="many">{0} litra na 100 kilometrov</unitPattern>
+				<unitPattern count="other">{0} litrov na 100 kilometrov</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>míle na galón</displayName>
 				<unitPattern count="one">{0} míľa na galón</unitPattern>
@@ -6312,69 +6531,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} míle na galón</unitPattern>
 				<unitPattern count="other">{0} míľ na galón</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bity</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="few">{0} bity</unitPattern>
-				<unitPattern count="many">{0} bitu</unitPattern>
-				<unitPattern count="other">{0} bitov</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bajty</displayName>
-				<unitPattern count="one">{0} bajt</unitPattern>
-				<unitPattern count="few">{0} bajty</unitPattern>
-				<unitPattern count="many">{0} bajtu</unitPattern>
-				<unitPattern count="other">{0} bajtov</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabity</displayName>
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="few">{0} gigabity</unitPattern>
-				<unitPattern count="many">{0} gigabitu</unitPattern>
-				<unitPattern count="other">{0} gigabitov</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabajty</displayName>
-				<unitPattern count="one">{0} gigabajt</unitPattern>
-				<unitPattern count="few">{0} gigabajty</unitPattern>
-				<unitPattern count="many">{0} gigabajtu</unitPattern>
-				<unitPattern count="other">{0} gigabajtov</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobity</displayName>
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="few">{0} kilobity</unitPattern>
-				<unitPattern count="many">{0} kilobitu</unitPattern>
-				<unitPattern count="other">{0} kilobitov</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobajty</displayName>
-				<unitPattern count="one">{0} kilobajt</unitPattern>
-				<unitPattern count="few">{0} kilobajty</unitPattern>
-				<unitPattern count="many">{0} kilobajtu</unitPattern>
-				<unitPattern count="other">{0} kilobajtov</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabity</displayName>
-				<unitPattern count="one">{0} megabit</unitPattern>
-				<unitPattern count="few">{0} megabity</unitPattern>
-				<unitPattern count="many">{0} megabitu</unitPattern>
-				<unitPattern count="other">{0} megabitov</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabajty</displayName>
-				<unitPattern count="one">{0} megabajt</unitPattern>
-				<unitPattern count="few">{0} megabajty</unitPattern>
-				<unitPattern count="many">{0} megabajtu</unitPattern>
-				<unitPattern count="other">{0} megabajtov</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabity</displayName>
-				<unitPattern count="one">{0} terabit</unitPattern>
-				<unitPattern count="few">{0} terabity</unitPattern>
-				<unitPattern count="many">{0} terabitu</unitPattern>
-				<unitPattern count="other">{0} terabitov</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabajty</displayName>
 				<unitPattern count="one">{0} terabajt</unitPattern>
@@ -6382,12 +6538,107 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} terabajtu</unitPattern>
 				<unitPattern count="other">{0} terabajtov</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabity</displayName>
+				<unitPattern count="one">{0} terabit</unitPattern>
+				<unitPattern count="few">{0} terabity</unitPattern>
+				<unitPattern count="many">{0} terabitu</unitPattern>
+				<unitPattern count="other">{0} terabitov</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabajty</displayName>
+				<unitPattern count="one">{0} gigabajt</unitPattern>
+				<unitPattern count="few">{0} gigabajty</unitPattern>
+				<unitPattern count="many">{0} gigabajtu</unitPattern>
+				<unitPattern count="other">{0} gigabajtov</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabity</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="few">{0} gigabity</unitPattern>
+				<unitPattern count="many">{0} gigabitu</unitPattern>
+				<unitPattern count="other">{0} gigabitov</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabajty</displayName>
+				<unitPattern count="one">{0} megabajt</unitPattern>
+				<unitPattern count="few">{0} megabajty</unitPattern>
+				<unitPattern count="many">{0} megabajtu</unitPattern>
+				<unitPattern count="other">{0} megabajtov</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabity</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="few">{0} megabity</unitPattern>
+				<unitPattern count="many">{0} megabitu</unitPattern>
+				<unitPattern count="other">{0} megabitov</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobajty</displayName>
+				<unitPattern count="one">{0} kilobajt</unitPattern>
+				<unitPattern count="few">{0} kilobajty</unitPattern>
+				<unitPattern count="many">{0} kilobajtu</unitPattern>
+				<unitPattern count="other">{0} kilobajtov</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobity</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="few">{0} kilobity</unitPattern>
+				<unitPattern count="many">{0} kilobitu</unitPattern>
+				<unitPattern count="other">{0} kilobitov</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bajty</displayName>
+				<unitPattern count="one">{0} bajt</unitPattern>
+				<unitPattern count="few">{0} bajty</unitPattern>
+				<unitPattern count="many">{0} bajtu</unitPattern>
+				<unitPattern count="other">{0} bajtov</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bity</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="few">{0} bity</unitPattern>
+				<unitPattern count="many">{0} bitu</unitPattern>
+				<unitPattern count="other">{0} bitov</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>storočia</displayName>
+				<unitPattern count="one">{0} storočie</unitPattern>
+				<unitPattern count="few">{0} storočia</unitPattern>
+				<unitPattern count="many">{0} storočia</unitPattern>
+				<unitPattern count="other">{0} storočí</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>roky</displayName>
+				<unitPattern count="one">{0} rok</unitPattern>
+				<unitPattern count="few">{0} roky</unitPattern>
+				<unitPattern count="many">{0} roka</unitPattern>
+				<unitPattern count="other">{0} rokov</unitPattern>
+				<perUnitPattern>{0} za rok</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mesiace</displayName>
+				<unitPattern count="one">{0} mesiac</unitPattern>
+				<unitPattern count="few">{0} mesiace</unitPattern>
+				<unitPattern count="many">{0} mesiaca</unitPattern>
+				<unitPattern count="other">{0} mesiacov</unitPattern>
+				<perUnitPattern>{0} za mesiac</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>týždne</displayName>
+				<unitPattern count="one">{0} týždeň</unitPattern>
+				<unitPattern count="few">{0} týždne</unitPattern>
+				<unitPattern count="many">{0} týždňa</unitPattern>
+				<unitPattern count="other">{0} týždňov</unitPattern>
+				<perUnitPattern>{0} za týždeň</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>dni</displayName>
 				<unitPattern count="one">{0} deň</unitPattern>
 				<unitPattern count="few">{0} dni</unitPattern>
 				<unitPattern count="many">{0} dňa</unitPattern>
 				<unitPattern count="other">{0} dní</unitPattern>
+				<perUnitPattern>{0} za deň</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>hodiny</displayName>
@@ -6397,40 +6648,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} hodín</unitPattern>
 				<perUnitPattern>{0} za hodinu</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikrosekundy</displayName>
-				<unitPattern count="one">{0} mikrosekunda</unitPattern>
-				<unitPattern count="few">{0} mikrosekundy</unitPattern>
-				<unitPattern count="many">{0} mikrosekundy</unitPattern>
-				<unitPattern count="other">{0} mikrosekúnd</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milisekundy</displayName>
-				<unitPattern count="one">{0} milisekunda</unitPattern>
-				<unitPattern count="few">{0} milisekundy</unitPattern>
-				<unitPattern count="many">{0} milisekundy</unitPattern>
-				<unitPattern count="other">{0} milisekúnd</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>minúty</displayName>
 				<unitPattern count="one">{0} minúta</unitPattern>
 				<unitPattern count="few">{0} minúty</unitPattern>
 				<unitPattern count="many">{0} minúty</unitPattern>
 				<unitPattern count="other">{0} minút</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>mesiace</displayName>
-				<unitPattern count="one">{0} mesiac</unitPattern>
-				<unitPattern count="few">{0} mesiace</unitPattern>
-				<unitPattern count="many">{0} mesiaca</unitPattern>
-				<unitPattern count="other">{0} mesiacov</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanosekundy</displayName>
-				<unitPattern count="one">{0} nanosekunda</unitPattern>
-				<unitPattern count="few">{0} nanosekundy</unitPattern>
-				<unitPattern count="many">{0} nanosekundy</unitPattern>
-				<unitPattern count="other">{0} nanosekúnd</unitPattern>
+				<perUnitPattern>{0} za minútu</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sekundy</displayName>
@@ -6440,19 +6664,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} sekúnd</unitPattern>
 				<perUnitPattern>{0} za sekundu</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>týždne</displayName>
-				<unitPattern count="one">{0} týždeň</unitPattern>
-				<unitPattern count="few">{0} týždne</unitPattern>
-				<unitPattern count="many">{0} týždňa</unitPattern>
-				<unitPattern count="other">{0} týždňov</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milisekundy</displayName>
+				<unitPattern count="one">{0} milisekunda</unitPattern>
+				<unitPattern count="few">{0} milisekundy</unitPattern>
+				<unitPattern count="many">{0} milisekundy</unitPattern>
+				<unitPattern count="other">{0} milisekúnd</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>roky</displayName>
-				<unitPattern count="one">{0} rok</unitPattern>
-				<unitPattern count="few">{0} roky</unitPattern>
-				<unitPattern count="many">{0} roka</unitPattern>
-				<unitPattern count="other">{0} rokov</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>mikrosekundy</displayName>
+				<unitPattern count="one">{0} mikrosekunda</unitPattern>
+				<unitPattern count="few">{0} mikrosekundy</unitPattern>
+				<unitPattern count="many">{0} mikrosekundy</unitPattern>
+				<unitPattern count="other">{0} mikrosekúnd</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosekundy</displayName>
+				<unitPattern count="one">{0} nanosekunda</unitPattern>
+				<unitPattern count="few">{0} nanosekundy</unitPattern>
+				<unitPattern count="many">{0} nanosekundy</unitPattern>
+				<unitPattern count="other">{0} nanosekúnd</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ampéry</displayName>
@@ -6482,6 +6713,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} voltu</unitPattern>
 				<unitPattern count="other">{0} voltov</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokalórie</displayName>
+				<unitPattern count="one">{0} kilokalória</unitPattern>
+				<unitPattern count="few">{0} kilokalórie</unitPattern>
+				<unitPattern count="many">{0} kilokalórie</unitPattern>
+				<unitPattern count="other">{0} kilokalórií</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kalórie</displayName>
 				<unitPattern count="one">{0} kalória</unitPattern>
@@ -6496,20 +6734,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kalórie</unitPattern>
 				<unitPattern count="other">{0} kalórií</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>jouly</displayName>
-				<unitPattern count="one">joule</unitPattern>
-				<unitPattern count="few">{0} jouly</unitPattern>
-				<unitPattern count="many">{0} joulu</unitPattern>
-				<unitPattern count="other">{0} joulov</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokalórie</displayName>
-				<unitPattern count="one">{0} kilokalória</unitPattern>
-				<unitPattern count="few">{0} kilokalórie</unitPattern>
-				<unitPattern count="many">{0} kilokalórie</unitPattern>
-				<unitPattern count="other">{0} kilokalórií</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojouly</displayName>
 				<unitPattern count="one">{0} kilojoule</unitPattern>
@@ -6517,6 +6741,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kilojoulu</unitPattern>
 				<unitPattern count="other">{0} kilojoulov</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>jouly</displayName>
+				<unitPattern count="one">joule</unitPattern>
+				<unitPattern count="few">{0} jouly</unitPattern>
+				<unitPattern count="many">{0} joulu</unitPattern>
+				<unitPattern count="other">{0} joulov</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilowatthodiny</displayName>
 				<unitPattern count="one">{0} kilowatthodina</unitPattern>
@@ -6531,12 +6762,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} gigahertza</unitPattern>
 				<unitPattern count="other">{0} gigahertzov</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hertze</displayName>
-				<unitPattern count="one">{0} hertz</unitPattern>
-				<unitPattern count="few">{0} hertze</unitPattern>
-				<unitPattern count="many">{0} hertza</unitPattern>
-				<unitPattern count="other">{0} hertzov</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megahertze</displayName>
+				<unitPattern count="one">{0} megahertz</unitPattern>
+				<unitPattern count="few">{0} megahertze</unitPattern>
+				<unitPattern count="many">{0} megahertza</unitPattern>
+				<unitPattern count="other">{0} megahertzov</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kilohertze</displayName>
@@ -6545,26 +6776,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kilohertza</unitPattern>
 				<unitPattern count="other">{0} kilohertzov</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megahertze</displayName>
-				<unitPattern count="one">{0} megahertz</unitPattern>
-				<unitPattern count="few">{0} megahertze</unitPattern>
-				<unitPattern count="many">{0} megahertza</unitPattern>
-				<unitPattern count="other">{0} megahertzov</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hertze</displayName>
+				<unitPattern count="one">{0} hertz</unitPattern>
+				<unitPattern count="few">{0} hertze</unitPattern>
+				<unitPattern count="many">{0} hertza</unitPattern>
+				<unitPattern count="other">{0} hertzov</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>astronomické jednotky</displayName>
-				<unitPattern count="one">{0} astronomická jednotka</unitPattern>
-				<unitPattern count="few">{0} astronomické jednotky</unitPattern>
-				<unitPattern count="many">{0} astronomickej jednotky</unitPattern>
-				<unitPattern count="other">{0} astronomických jednotiek</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometre</displayName>
+				<unitPattern count="one">{0} kilometer</unitPattern>
+				<unitPattern count="few">{0} kilometre</unitPattern>
+				<unitPattern count="many">{0} kilometra</unitPattern>
+				<unitPattern count="other">{0} kilometrov</unitPattern>
+				<perUnitPattern>{0} na kilometer</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>centimetre</displayName>
-				<unitPattern count="one">{0} centimeter</unitPattern>
-				<unitPattern count="few">{0} centimetre</unitPattern>
-				<unitPattern count="many">{0} centimetra</unitPattern>
-				<unitPattern count="other">{0} centimetrov</unitPattern>
+			<unit type="length-meter">
+				<displayName>metre</displayName>
+				<unitPattern count="one">{0} meter</unitPattern>
+				<unitPattern count="few">{0} metre</unitPattern>
+				<unitPattern count="many">{0} metra</unitPattern>
+				<unitPattern count="other">{0} metrov</unitPattern>
+				<perUnitPattern>{0} na meter</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>decimetre</displayName>
@@ -6573,54 +6806,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} decimetra</unitPattern>
 				<unitPattern count="other">{0} decimetrov</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>stopy</displayName>
-				<unitPattern count="one">{0} stopa</unitPattern>
-				<unitPattern count="few">{0} stopy</unitPattern>
-				<unitPattern count="many">{0} stopy</unitPattern>
-				<unitPattern count="other">{0} stôp</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>palce</displayName>
-				<unitPattern count="one">{0} palec</unitPattern>
-				<unitPattern count="few">{0} palce</unitPattern>
-				<unitPattern count="many">{0} palca</unitPattern>
-				<unitPattern count="other">{0} palcov</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometre</displayName>
-				<unitPattern count="one">{0} kilometer</unitPattern>
-				<unitPattern count="few">{0} kilometre</unitPattern>
-				<unitPattern count="many">{0} kilometra</unitPattern>
-				<unitPattern count="other">{0} kilometrov</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>svetelné roky</displayName>
-				<unitPattern count="one">{0} svetelný rok</unitPattern>
-				<unitPattern count="few">{0} svetelné roky</unitPattern>
-				<unitPattern count="many">{0} svetelného roku</unitPattern>
-				<unitPattern count="other">{0} svetelných rokov</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metre</displayName>
-				<unitPattern count="one">{0} meter</unitPattern>
-				<unitPattern count="few">{0} metre</unitPattern>
-				<unitPattern count="many">{0} metra</unitPattern>
-				<unitPattern count="other">{0} metrov</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>mikrometre</displayName>
-				<unitPattern count="one">{0} mikrometer</unitPattern>
-				<unitPattern count="few">{0} mikrometre</unitPattern>
-				<unitPattern count="many">{0} mikrometra</unitPattern>
-				<unitPattern count="other">{0} mikrometrov</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>míle</displayName>
-				<unitPattern count="one">{0} míľa</unitPattern>
-				<unitPattern count="few">{0} míle</unitPattern>
-				<unitPattern count="many">{0} míle</unitPattern>
-				<unitPattern count="other">{0} míľ</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>centimetre</displayName>
+				<unitPattern count="one">{0} centimeter</unitPattern>
+				<unitPattern count="few">{0} centimetre</unitPattern>
+				<unitPattern count="many">{0} centimetra</unitPattern>
+				<unitPattern count="other">{0} centimetrov</unitPattern>
+				<perUnitPattern>{0} na centimeter</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>milimetre</displayName>
@@ -6629,6 +6821,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} milimetra</unitPattern>
 				<unitPattern count="other">{0} milimetrov</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikrometre</displayName>
+				<unitPattern count="one">{0} mikrometer</unitPattern>
+				<unitPattern count="few">{0} mikrometre</unitPattern>
+				<unitPattern count="many">{0} mikrometra</unitPattern>
+				<unitPattern count="other">{0} mikrometrov</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanometre</displayName>
 				<unitPattern count="one">{0} nanometer</unitPattern>
@@ -6636,20 +6835,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} nanometra</unitPattern>
 				<unitPattern count="other">{0} nanometrov</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>námorné míle</displayName>
-				<unitPattern count="one">{0} námorná míľa</unitPattern>
-				<unitPattern count="few">{0} námorné míle</unitPattern>
-				<unitPattern count="many">{0} námornej míle</unitPattern>
-				<unitPattern count="other">{0} námorných míľ</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parseky</displayName>
-				<unitPattern count="one">{0} parsek</unitPattern>
-				<unitPattern count="few">{0} parseky</unitPattern>
-				<unitPattern count="many">{0} parseku</unitPattern>
-				<unitPattern count="other">{0} parsekov</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pikometre</displayName>
 				<unitPattern count="one">{0} pikometer</unitPattern>
@@ -6657,6 +6842,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} pikometra</unitPattern>
 				<unitPattern count="other">{0} pikometrov</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>míle</displayName>
+				<unitPattern count="one">{0} míľa</unitPattern>
+				<unitPattern count="few">{0} míle</unitPattern>
+				<unitPattern count="many">{0} míle</unitPattern>
+				<unitPattern count="other">{0} míľ</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yardy</displayName>
 				<unitPattern count="one">{0} yard</unitPattern>
@@ -6664,6 +6856,57 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} yardu</unitPattern>
 				<unitPattern count="other">{0} yardov</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>stopy</displayName>
+				<unitPattern count="one">{0} stopa</unitPattern>
+				<unitPattern count="few">{0} stopy</unitPattern>
+				<unitPattern count="many">{0} stopy</unitPattern>
+				<unitPattern count="other">{0} stôp</unitPattern>
+				<perUnitPattern>{0} na stopu</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>palce</displayName>
+				<unitPattern count="one">{0} palec</unitPattern>
+				<unitPattern count="few">{0} palce</unitPattern>
+				<unitPattern count="many">{0} palca</unitPattern>
+				<unitPattern count="other">{0} palcov</unitPattern>
+				<perUnitPattern>{0} na palec</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parseky</displayName>
+				<unitPattern count="one">{0} parsek</unitPattern>
+				<unitPattern count="few">{0} parseky</unitPattern>
+				<unitPattern count="many">{0} parseku</unitPattern>
+				<unitPattern count="other">{0} parsekov</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>svetelné roky</displayName>
+				<unitPattern count="one">{0} svetelný rok</unitPattern>
+				<unitPattern count="few">{0} svetelné roky</unitPattern>
+				<unitPattern count="many">{0} svetelného roku</unitPattern>
+				<unitPattern count="other">{0} svetelných rokov</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>astronomické jednotky</displayName>
+				<unitPattern count="one">{0} astronomická jednotka</unitPattern>
+				<unitPattern count="few">{0} astronomické jednotky</unitPattern>
+				<unitPattern count="many">{0} astronomickej jednotky</unitPattern>
+				<unitPattern count="other">{0} astronomických jednotiek</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>námorné míle</displayName>
+				<unitPattern count="one">{0} námorná míľa</unitPattern>
+				<unitPattern count="few">{0} námorné míle</unitPattern>
+				<unitPattern count="many">{0} námornej míle</unitPattern>
+				<unitPattern count="other">{0} námorných míľ</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>škandinávske míle</displayName>
+				<unitPattern count="one">{0} škandinávska míľa</unitPattern>
+				<unitPattern count="few">{0} škandinávske míle</unitPattern>
+				<unitPattern count="many">{0} škandinávskej míle</unitPattern>
+				<unitPattern count="other">{0} škandinávskych míľ</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>luxy</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
@@ -6671,27 +6914,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} luxu</unitPattern>
 				<unitPattern count="other">{0} luxov</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karáty</displayName>
-				<unitPattern count="one">{0} karát</unitPattern>
-				<unitPattern count="few">{0} karáty</unitPattern>
-				<unitPattern count="many">{0} karátu</unitPattern>
-				<unitPattern count="other">{0} karátov</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gramy</displayName>
-				<unitPattern count="one">{0} gram</unitPattern>
-				<unitPattern count="few">{0} gramy</unitPattern>
-				<unitPattern count="many">{0} gramu</unitPattern>
-				<unitPattern count="other">{0} gramov</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogramy</displayName>
-				<unitPattern count="one">{0} kilogram</unitPattern>
-				<unitPattern count="few">{0} kilogramy</unitPattern>
-				<unitPattern count="many">{0} kilogramu</unitPattern>
-				<unitPattern count="other">{0} kilogramov</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>tony</displayName>
 				<unitPattern count="one">{0} tona</unitPattern>
@@ -6699,12 +6921,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} tony</unitPattern>
 				<unitPattern count="other">{0} ton</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mikrogramy</displayName>
-				<unitPattern count="one">{0} mikrogram</unitPattern>
-				<unitPattern count="few">{0} mikrogramy</unitPattern>
-				<unitPattern count="many">{0} mikrogramu</unitPattern>
-				<unitPattern count="other">{0} mikrogramov</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogramy</displayName>
+				<unitPattern count="one">{0} kilogram</unitPattern>
+				<unitPattern count="few">{0} kilogramy</unitPattern>
+				<unitPattern count="many">{0} kilogramu</unitPattern>
+				<unitPattern count="other">{0} kilogramov</unitPattern>
+				<perUnitPattern>{0} na kilogram</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gramy</displayName>
+				<unitPattern count="one">{0} gram</unitPattern>
+				<unitPattern count="few">{0} gramy</unitPattern>
+				<unitPattern count="many">{0} gramu</unitPattern>
+				<unitPattern count="other">{0} gramov</unitPattern>
+				<perUnitPattern>{0} na gram</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>miligramy</displayName>
@@ -6713,26 +6944,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} miligramu</unitPattern>
 				<unitPattern count="other">{0} miligramov</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>unce</displayName>
-				<unitPattern count="one">{0} unca</unitPattern>
-				<unitPattern count="few">{0} unce</unitPattern>
-				<unitPattern count="many">{0} unce</unitPattern>
-				<unitPattern count="other">{0} uncí</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>trojské unce</displayName>
-				<unitPattern count="one">{0} trojská unca</unitPattern>
-				<unitPattern count="few">{0} trojské unce</unitPattern>
-				<unitPattern count="many">{0} trojskej unce</unitPattern>
-				<unitPattern count="other">{0} trojských uncí</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>libry</displayName>
-				<unitPattern count="one">{0} libra</unitPattern>
-				<unitPattern count="few">{0} libry</unitPattern>
-				<unitPattern count="many">{0} libry</unitPattern>
-				<unitPattern count="other">{0} libier</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>mikrogramy</displayName>
+				<unitPattern count="one">{0} mikrogram</unitPattern>
+				<unitPattern count="few">{0} mikrogramy</unitPattern>
+				<unitPattern count="many">{0} mikrogramu</unitPattern>
+				<unitPattern count="other">{0} mikrogramov</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>americké tony</displayName>
@@ -6741,6 +6958,36 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} americkej tony</unitPattern>
 				<unitPattern count="other">{0} amerických ton</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>libry</displayName>
+				<unitPattern count="one">{0} libra</unitPattern>
+				<unitPattern count="few">{0} libry</unitPattern>
+				<unitPattern count="many">{0} libry</unitPattern>
+				<unitPattern count="other">{0} libier</unitPattern>
+				<perUnitPattern>{0} na libru</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>unce</displayName>
+				<unitPattern count="one">{0} unca</unitPattern>
+				<unitPattern count="few">{0} unce</unitPattern>
+				<unitPattern count="many">{0} unce</unitPattern>
+				<unitPattern count="other">{0} uncí</unitPattern>
+				<perUnitPattern>{0} na uncu</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>trojské unce</displayName>
+				<unitPattern count="one">{0} trojská unca</unitPattern>
+				<unitPattern count="few">{0} trojské unce</unitPattern>
+				<unitPattern count="many">{0} trojskej unce</unitPattern>
+				<unitPattern count="other">{0} trojských uncí</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karáty</displayName>
+				<unitPattern count="one">{0} karát</unitPattern>
+				<unitPattern count="few">{0} karáty</unitPattern>
+				<unitPattern count="many">{0} karátu</unitPattern>
+				<unitPattern count="other">{0} karátov</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigawatty</displayName>
 				<unitPattern count="one">{0} gigawatt</unitPattern>
@@ -6748,20 +6995,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} gigawattu</unitPattern>
 				<unitPattern count="other">{0} gigawattov</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>konské sily</displayName>
-				<unitPattern count="one">{0} konská sila</unitPattern>
-				<unitPattern count="few">{0} konské sily</unitPattern>
-				<unitPattern count="many">{0} konskej sily</unitPattern>
-				<unitPattern count="other">{0} konských síl</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilowatty</displayName>
-				<unitPattern count="one">{0} kilowatt</unitPattern>
-				<unitPattern count="few">{0} kilowatty</unitPattern>
-				<unitPattern count="many">{0} kilowattu</unitPattern>
-				<unitPattern count="other">{0} kilowattov</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>megawatty</displayName>
 				<unitPattern count="one">{0} megawatt</unitPattern>
@@ -6769,12 +7002,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} megawattu</unitPattern>
 				<unitPattern count="other">{0} megawattov</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>milliwatty</displayName>
-				<unitPattern count="one">{0} milliwatt</unitPattern>
-				<unitPattern count="few">{0} milliwatty</unitPattern>
-				<unitPattern count="many">{0} milliwattu</unitPattern>
-				<unitPattern count="other">{0} milliwattov</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilowatty</displayName>
+				<unitPattern count="one">{0} kilowatt</unitPattern>
+				<unitPattern count="few">{0} kilowatty</unitPattern>
+				<unitPattern count="many">{0} kilowattu</unitPattern>
+				<unitPattern count="other">{0} kilowattov</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watty</displayName>
@@ -6783,6 +7016,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} wattu</unitPattern>
 				<unitPattern count="other">{0} wattov</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>milliwatty</displayName>
+				<unitPattern count="one">{0} milliwatt</unitPattern>
+				<unitPattern count="few">{0} milliwatty</unitPattern>
+				<unitPattern count="many">{0} milliwattu</unitPattern>
+				<unitPattern count="other">{0} milliwattov</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>konské sily</displayName>
+				<unitPattern count="one">{0} konská sila</unitPattern>
+				<unitPattern count="few">{0} konské sily</unitPattern>
+				<unitPattern count="many">{0} konskej sily</unitPattern>
+				<unitPattern count="other">{0} konských síl</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hektopascaly</displayName>
 				<unitPattern count="one">{0} hektopascal</unitPattern>
@@ -6790,20 +7037,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} hektopascala</unitPattern>
 				<unitPattern count="other">{0} hektopascalov</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>palce ortuťového stĺpca</displayName>
-				<unitPattern count="one">{0} palec ortuťového stĺpca</unitPattern>
-				<unitPattern count="few">{0} palce ortuťového stĺpca</unitPattern>
-				<unitPattern count="many">{0} palca ortuťového stĺpca</unitPattern>
-				<unitPattern count="other">{0} palcov ortuťového stĺpca</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>milibary</displayName>
-				<unitPattern count="one">{0} milibar</unitPattern>
-				<unitPattern count="few">{0} milibary</unitPattern>
-				<unitPattern count="many">{0} milibaru</unitPattern>
-				<unitPattern count="other">{0} milibarov</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>milimetre ortuťového stĺpca</displayName>
 				<unitPattern count="one">{0} milimeter ortuťového stĺpca</unitPattern>
@@ -6818,12 +7051,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} libry sily na štvorcový palec</unitPattern>
 				<unitPattern count="other">{0} libier sily na štvorcový palec</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karáty</displayName>
-				<unitPattern count="one">{0} karát</unitPattern>
-				<unitPattern count="few">{0} karáty</unitPattern>
-				<unitPattern count="many">{0} karátu</unitPattern>
-				<unitPattern count="other">{0} karátov</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>palce ortuťového stĺpca</displayName>
+				<unitPattern count="one">{0} palec ortuťového stĺpca</unitPattern>
+				<unitPattern count="few">{0} palce ortuťového stĺpca</unitPattern>
+				<unitPattern count="many">{0} palca ortuťového stĺpca</unitPattern>
+				<unitPattern count="other">{0} palcov ortuťového stĺpca</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>milibary</displayName>
+				<unitPattern count="one">{0} milibar</unitPattern>
+				<unitPattern count="few">{0} milibary</unitPattern>
+				<unitPattern count="many">{0} milibaru</unitPattern>
+				<unitPattern count="other">{0} milibarov</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometre za hodinu</displayName>
@@ -6846,6 +7086,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} míle za hodinu</unitPattern>
 				<unitPattern count="other">{0} míľ za hodinu</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>uzly</displayName>
+				<unitPattern count="one">{0} uzol</unitPattern>
+				<unitPattern count="few">{0} uzly</unitPattern>
+				<unitPattern count="many">{0} uzla</unitPattern>
+				<unitPattern count="other">{0} uzlov</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0} °</unitPattern>
+				<unitPattern count="few">{0} °</unitPattern>
+				<unitPattern count="many">{0} °</unitPattern>
+				<unitPattern count="other">{0} °</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>stupne Celzia</displayName>
 				<unitPattern count="one">{0} stupeň Celzia</unitPattern>
@@ -6867,41 +7121,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kelvina</unitPattern>
 				<unitPattern count="other">{0} kelvinov</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>akrové stopy</displayName>
-				<unitPattern count="one">{0} akrová stopa</unitPattern>
-				<unitPattern count="few">{0} akrové stopy</unitPattern>
-				<unitPattern count="many">{0} akrovej stopy</unitPattern>
-				<unitPattern count="other">{0} akrových stôp</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>centilitre</displayName>
-				<unitPattern count="one">{0} centiliter</unitPattern>
-				<unitPattern count="few">{0} centilitre</unitPattern>
-				<unitPattern count="many">{0} centilitra</unitPattern>
-				<unitPattern count="other">{0} centilitrov</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>kubické centimetre</displayName>
-				<unitPattern count="one">{0} kubický centimeter</unitPattern>
-				<unitPattern count="few">{0} kubické centimetre</unitPattern>
-				<unitPattern count="many">{0} kubického centimetra</unitPattern>
-				<unitPattern count="other">{0} kubických centimetrov</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>kubické stopy</displayName>
-				<unitPattern count="one">{0} kubická stopa</unitPattern>
-				<unitPattern count="few">{0} kubické stopy</unitPattern>
-				<unitPattern count="many">{0} kubickej stopy</unitPattern>
-				<unitPattern count="other">{0} kubických stôp</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>kubické palce</displayName>
-				<unitPattern count="one">{0} kubický palec</unitPattern>
-				<unitPattern count="few">{0} kubické palce</unitPattern>
-				<unitPattern count="many">{0} kubického palca</unitPattern>
-				<unitPattern count="other">{0} kubických palcov</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kubické kilometre</displayName>
 				<unitPattern count="one">{0} kubický kilometer</unitPattern>
@@ -6915,6 +7134,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kubické metre</unitPattern>
 				<unitPattern count="many">{0} kubického metra</unitPattern>
 				<unitPattern count="other">{0} kubických metrov</unitPattern>
+				<perUnitPattern>{0} na kubický meter</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>kubické centimetre</displayName>
+				<unitPattern count="one">{0} kubický centimeter</unitPattern>
+				<unitPattern count="few">{0} kubické centimetre</unitPattern>
+				<unitPattern count="many">{0} kubického centimetra</unitPattern>
+				<unitPattern count="other">{0} kubických centimetrov</unitPattern>
+				<perUnitPattern>{0} na kubický centimeter</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>kubické míle</displayName>
@@ -6930,33 +7158,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kubického yardu</unitPattern>
 				<unitPattern count="other">{0} kubických yardov</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>hrnčeky</displayName>
-				<unitPattern count="one">{0} hrnček</unitPattern>
-				<unitPattern count="few">{0} hrnčeky</unitPattern>
-				<unitPattern count="many">{0} hrnčeka</unitPattern>
-				<unitPattern count="other">{0} hrnčekov</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>kubické stopy</displayName>
+				<unitPattern count="one">{0} kubická stopa</unitPattern>
+				<unitPattern count="few">{0} kubické stopy</unitPattern>
+				<unitPattern count="many">{0} kubickej stopy</unitPattern>
+				<unitPattern count="other">{0} kubických stôp</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>decilitre</displayName>
-				<unitPattern count="one">{0} deciliter</unitPattern>
-				<unitPattern count="few">{0} decilitre</unitPattern>
-				<unitPattern count="many">{0} decilitra</unitPattern>
-				<unitPattern count="other">{0} decilitrov</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>kubické palce</displayName>
+				<unitPattern count="one">{0} kubický palec</unitPattern>
+				<unitPattern count="few">{0} kubické palce</unitPattern>
+				<unitPattern count="many">{0} kubického palca</unitPattern>
+				<unitPattern count="other">{0} kubických palcov</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>tekuté unce</displayName>
-				<unitPattern count="one">{0} tekutá unca</unitPattern>
-				<unitPattern count="few">{0} tekuté unce</unitPattern>
-				<unitPattern count="many">{0} tekutej unce</unitPattern>
-				<unitPattern count="other">{0} tekutých uncí</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>galóny</displayName>
-				<unitPattern count="one">{0} galón</unitPattern>
-				<unitPattern count="few">{0} galóny</unitPattern>
-				<unitPattern count="many">{0} galónu</unitPattern>
-				<unitPattern count="other">{0} galónov</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megalitre</displayName>
+				<unitPattern count="one">{0} megaliter</unitPattern>
+				<unitPattern count="few">{0} megalitre</unitPattern>
+				<unitPattern count="many">{0} megalitra</unitPattern>
+				<unitPattern count="other">{0} megalitrov</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hektolitre</displayName>
@@ -6971,13 +7192,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} litre</unitPattern>
 				<unitPattern count="many">{0} litra</unitPattern>
 				<unitPattern count="other">{0} litrov</unitPattern>
+				<perUnitPattern>{0} na liter</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalitre</displayName>
-				<unitPattern count="one">{0} megaliter</unitPattern>
-				<unitPattern count="few">{0} megalitre</unitPattern>
-				<unitPattern count="many">{0} megalitra</unitPattern>
-				<unitPattern count="other">{0} megalitrov</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>decilitre</displayName>
+				<unitPattern count="one">{0} deciliter</unitPattern>
+				<unitPattern count="few">{0} decilitre</unitPattern>
+				<unitPattern count="many">{0} decilitra</unitPattern>
+				<unitPattern count="other">{0} decilitrov</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centilitre</displayName>
+				<unitPattern count="one">{0} centiliter</unitPattern>
+				<unitPattern count="few">{0} centilitre</unitPattern>
+				<unitPattern count="many">{0} centilitra</unitPattern>
+				<unitPattern count="other">{0} centilitrov</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mililitre</displayName>
@@ -6986,12 +7215,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mililitra</unitPattern>
 				<unitPattern count="other">{0} mililitrov</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pinty</displayName>
-				<unitPattern count="one">{0} pinta</unitPattern>
-				<unitPattern count="few">{0} pinty</unitPattern>
-				<unitPattern count="many">{0} pinty</unitPattern>
-				<unitPattern count="other">{0} pínt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>metrické pinty</displayName>
+				<unitPattern count="one">{0} metrická pinta</unitPattern>
+				<unitPattern count="few">{0} metrické pinty</unitPattern>
+				<unitPattern count="many">{0} metrickej pinty</unitPattern>
+				<unitPattern count="other">{0} metrických pínt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>metrické hrnčeky</displayName>
+				<unitPattern count="one">{0} metrický hrnček</unitPattern>
+				<unitPattern count="few">{0} metrické hrnčeky</unitPattern>
+				<unitPattern count="many">{0} metrického hrnčeka</unitPattern>
+				<unitPattern count="other">{0} metrických hrnčekov</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>akrové stopy</displayName>
+				<unitPattern count="one">{0} akrová stopa</unitPattern>
+				<unitPattern count="few">{0} akrové stopy</unitPattern>
+				<unitPattern count="many">{0} akrovej stopy</unitPattern>
+				<unitPattern count="other">{0} akrových stôp</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galóny</displayName>
+				<unitPattern count="one">{0} galón</unitPattern>
+				<unitPattern count="few">{0} galóny</unitPattern>
+				<unitPattern count="many">{0} galónu</unitPattern>
+				<unitPattern count="other">{0} galónov</unitPattern>
+				<perUnitPattern>{0} na galón</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>quarty</displayName>
@@ -7000,6 +7251,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} quartu</unitPattern>
 				<unitPattern count="other">{0} quartov</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pinty</displayName>
+				<unitPattern count="one">{0} pinta</unitPattern>
+				<unitPattern count="few">{0} pinty</unitPattern>
+				<unitPattern count="many">{0} pinty</unitPattern>
+				<unitPattern count="other">{0} pínt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>hrnčeky</displayName>
+				<unitPattern count="one">{0} hrnček</unitPattern>
+				<unitPattern count="few">{0} hrnčeky</unitPattern>
+				<unitPattern count="many">{0} hrnčeka</unitPattern>
+				<unitPattern count="other">{0} hrnčekov</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>tekuté unce</displayName>
+				<unitPattern count="one">{0} tekutá unca</unitPattern>
+				<unitPattern count="few">{0} tekuté unce</unitPattern>
+				<unitPattern count="many">{0} tekutej unce</unitPattern>
+				<unitPattern count="other">{0} tekutých uncí</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>polievkové lyžice</displayName>
 				<unitPattern count="one">{0} polievková lyžica</unitPattern>
@@ -7014,10 +7286,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} čajovej lyžice</unitPattern>
 				<unitPattern count="other">{0} čajových lyžíc</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>jednotka preťaženia</displayName>
@@ -7028,10 +7306,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
 				<displayName>m/s²</displayName>
-				<unitPattern count="one" draft="contributed">{0} m/s²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} m/s²</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} m/s²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} m/s²</unitPattern>
+				<unitPattern count="one">{0} m/s²</unitPattern>
+				<unitPattern count="few">{0} m/s²</unitPattern>
+				<unitPattern count="many">{0} m/s²</unitPattern>
+				<unitPattern count="other">{0} m/s²</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>ot.</displayName>
+				<unitPattern count="one">{0} ot.</unitPattern>
+				<unitPattern count="few">{0} ot.</unitPattern>
+				<unitPattern count="many">{0} ot.</unitPattern>
+				<unitPattern count="other">{0} ot.</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="few">{0} rad</unitPattern>
+				<unitPattern count="many">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>′</displayName>
@@ -7047,26 +7346,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>°</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="few">{0}°</unitPattern>
-				<unitPattern count="many">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="few">{0} rad</unitPattern>
-				<unitPattern count="many">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>akre</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="few">{0} ac</unitPattern>
-				<unitPattern count="many">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="few">{0} km²</unitPattern>
+				<unitPattern count="many">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektáre</displayName>
@@ -7075,12 +7360,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="few">{0} m²</unitPattern>
+				<unitPattern count="many">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="few">{0} cm²</unitPattern>
 				<unitPattern count="many">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="few">{0} mi²</unitPattern>
+				<unitPattern count="many">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>akre</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="few">{0} ac</unitPattern>
+				<unitPattern count="many">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="few">{0} yd²</unitPattern>
+				<unitPattern count="many">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ft²</displayName>
@@ -7091,38 +7406,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="area-square-inch">
 				<displayName>in²</displayName>
-				<unitPattern count="one" draft="contributed">{0} in²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} in²</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} in²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} in²</unitPattern>
+				<unitPattern count="one">{0} in²</unitPattern>
+				<unitPattern count="few">{0} in²</unitPattern>
+				<unitPattern count="many">{0} in²</unitPattern>
+				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="few">{0} km²</unitPattern>
-				<unitPattern count="many">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="few">{0} m²</unitPattern>
-				<unitPattern count="many">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="few">{0} mi²</unitPattern>
-				<unitPattern count="many">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one" draft="contributed">{0} yd²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} yd²</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} yd²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="few">{0} kt</unitPattern>
+				<unitPattern count="many">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
@@ -7131,6 +7426,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} l/km</unitPattern>
 				<unitPattern count="other">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="few">{0} l/100 km</unitPattern>
+				<unitPattern count="many">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
@@ -7138,12 +7440,61 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} b</unitPattern>
-				<unitPattern count="few">{0} b</unitPattern>
-				<unitPattern count="many">{0} b</unitPattern>
-				<unitPattern count="other">{0} b</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>TB</displayName>
+				<unitPattern count="one">{0} TB</unitPattern>
+				<unitPattern count="few">{0} TB</unitPattern>
+				<unitPattern count="many">{0} TB</unitPattern>
+				<unitPattern count="other">{0} TB</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="few">{0} Tb</unitPattern>
+				<unitPattern count="many">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="few">{0} GB</unitPattern>
+				<unitPattern count="many">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="few">{0} Gb</unitPattern>
+				<unitPattern count="many">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="few">{0} MB</unitPattern>
+				<unitPattern count="many">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="few">{0} Mb</unitPattern>
+				<unitPattern count="many">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="few">{0} kB</unitPattern>
+				<unitPattern count="many">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="few">{0} kb</unitPattern>
+				<unitPattern count="many">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
 			</unit>
 			<unit type="digital-byte">
 				<displayName>bajt</displayName>
@@ -7152,61 +7503,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} B</unitPattern>
 				<unitPattern count="other">{0} B</unitPattern>
 			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one" draft="contributed">{0} Gb</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} Gb</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} Gb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Gb</unitPattern>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} b</unitPattern>
+				<unitPattern count="few">{0} b</unitPattern>
+				<unitPattern count="many">{0} b</unitPattern>
+				<unitPattern count="other">{0} b</unitPattern>
 			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one" draft="contributed">{0} GB</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} GB</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} GB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} GB</unitPattern>
+			<unit type="duration-century">
+				<displayName>stor.</displayName>
+				<unitPattern count="one">{0} stor.</unitPattern>
+				<unitPattern count="few">{0} stor.</unitPattern>
+				<unitPattern count="many">{0} stor.</unitPattern>
+				<unitPattern count="other">{0} stor.</unitPattern>
 			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one" draft="contributed">{0} kb</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kb</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} kb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kb</unitPattern>
+			<unit type="duration-year">
+				<displayName>r.</displayName>
+				<unitPattern count="one">{0} r.</unitPattern>
+				<unitPattern count="few">{0} r.</unitPattern>
+				<unitPattern count="many">{0} r.</unitPattern>
+				<unitPattern count="other">{0} r.</unitPattern>
+				<perUnitPattern>{0}/r.</perUnitPattern>
 			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one" draft="contributed">{0} kB</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kB</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} kB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kB</unitPattern>
+			<unit type="duration-month">
+				<displayName>mes.</displayName>
+				<unitPattern count="one">{0} mes.</unitPattern>
+				<unitPattern count="few">{0} mes.</unitPattern>
+				<unitPattern count="many">{0} mes.</unitPattern>
+				<unitPattern count="other">{0} mes.</unitPattern>
+				<perUnitPattern>{0}/mes.</perUnitPattern>
 			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one" draft="contributed">{0} Mb</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} Mb</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} Mb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one" draft="contributed">{0} MB</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} MB</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} MB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one" draft="contributed">{0} Tb</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} Tb</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} Tb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Tb</unitPattern>
-			</unit>
-			<unit type="digital-terabyte">
-				<displayName>TB</displayName>
-				<unitPattern count="one" draft="contributed">{0} TB</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} TB</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} TB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} TB</unitPattern>
+			<unit type="duration-week">
+				<displayName>týž.</displayName>
+				<unitPattern count="one">{0} týž.</unitPattern>
+				<unitPattern count="few">{0} týž.</unitPattern>
+				<unitPattern count="many">{0} týž.</unitPattern>
+				<unitPattern count="other">{0} týž.</unitPattern>
+				<perUnitPattern>{0}/týž.</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>dni</displayName>
@@ -7214,6 +7547,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} dni</unitPattern>
 				<unitPattern count="many">{0} dňa</unitPattern>
 				<unitPattern count="other">{0} dní</unitPattern>
+				<perUnitPattern>{0}/deň</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>h</displayName>
@@ -7223,40 +7557,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} h</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one" draft="contributed">{0} μs</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} μs</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} μs</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="few">{0} ms</unitPattern>
-				<unitPattern count="many">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
 				<unitPattern count="few">{0} min</unitPattern>
 				<unitPattern count="many">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>mes.</displayName>
-				<unitPattern count="one">{0} mes.</unitPattern>
-				<unitPattern count="few">{0} mes.</unitPattern>
-				<unitPattern count="many">{0} mes.</unitPattern>
-				<unitPattern count="other">{0} mes.</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="few">{0} ns</unitPattern>
-				<unitPattern count="many">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>s</displayName>
@@ -7266,54 +7573,68 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} s</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>týž.</displayName>
-				<unitPattern count="one">{0} týž.</unitPattern>
-				<unitPattern count="few">{0} týž.</unitPattern>
-				<unitPattern count="many">{0} týž.</unitPattern>
-				<unitPattern count="other">{0} týž.</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="few">{0} ms</unitPattern>
+				<unitPattern count="many">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>r.</displayName>
-				<unitPattern count="one">{0} r.</unitPattern>
-				<unitPattern count="few">{0} r.</unitPattern>
-				<unitPattern count="many">{0} r.</unitPattern>
-				<unitPattern count="other">{0} r.</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="few">{0} μs</unitPattern>
+				<unitPattern count="many">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="few">{0} ns</unitPattern>
+				<unitPattern count="many">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>A</displayName>
-				<unitPattern count="one" draft="contributed">{0} A</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} A</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} A</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} A</unitPattern>
+				<unitPattern count="one">{0} A</unitPattern>
+				<unitPattern count="few">{0} A</unitPattern>
+				<unitPattern count="many">{0} A</unitPattern>
+				<unitPattern count="other">{0} A</unitPattern>
 			</unit>
 			<unit type="electric-milliampere">
 				<displayName>mA</displayName>
-				<unitPattern count="one" draft="contributed">{0} mA</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mA</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} mA</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mA</unitPattern>
+				<unitPattern count="one">{0} mA</unitPattern>
+				<unitPattern count="few">{0} mA</unitPattern>
+				<unitPattern count="many">{0} mA</unitPattern>
+				<unitPattern count="other">{0} mA</unitPattern>
 			</unit>
 			<unit type="electric-ohm">
 				<displayName>Ω</displayName>
-				<unitPattern count="one" draft="contributed">{0} Ω</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} Ω</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} Ω</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Ω</unitPattern>
+				<unitPattern count="one">{0} Ω</unitPattern>
+				<unitPattern count="few">{0} Ω</unitPattern>
+				<unitPattern count="many">{0} Ω</unitPattern>
+				<unitPattern count="other">{0} Ω</unitPattern>
 			</unit>
 			<unit type="electric-volt">
 				<displayName>V</displayName>
-				<unitPattern count="one" draft="contributed">{0} V</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} V</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} V</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} V</unitPattern>
+				<unitPattern count="one">{0} V</unitPattern>
+				<unitPattern count="few">{0} V</unitPattern>
+				<unitPattern count="many">{0} V</unitPattern>
+				<unitPattern count="other">{0} V</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="few">{0} kcal</unitPattern>
+				<unitPattern count="many">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
 			</unit>
 			<unit type="energy-calorie">
-				<displayName draft="contributed">cal</displayName>
-				<unitPattern count="one" draft="contributed">{0} cal</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} cal</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} cal</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cal</unitPattern>
+				<displayName>cal</displayName>
+				<unitPattern count="one">{0} cal</unitPattern>
+				<unitPattern count="few">{0} cal</unitPattern>
+				<unitPattern count="many">{0} cal</unitPattern>
+				<unitPattern count="other">{0} cal</unitPattern>
 			</unit>
 			<unit type="energy-foodcalorie">
 				<displayName>cal</displayName>
@@ -7322,96 +7643,54 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} cal</unitPattern>
 				<unitPattern count="other">{0} cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>J</displayName>
-				<unitPattern count="one" draft="contributed">{0} J</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} J</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} J</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kcal</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} kcal</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
-				<unitPattern count="one" draft="contributed">{0} kJ</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kJ</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} kJ</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kJ</unitPattern>
+				<unitPattern count="one">{0} kJ</unitPattern>
+				<unitPattern count="few">{0} kJ</unitPattern>
+				<unitPattern count="many">{0} kJ</unitPattern>
+				<unitPattern count="other">{0} kJ</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="few">{0} J</unitPattern>
+				<unitPattern count="many">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
 			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
-				<unitPattern count="one" draft="contributed">{0} kWh</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kWh</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} kWh</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kWh</unitPattern>
+				<unitPattern count="one">{0} kWh</unitPattern>
+				<unitPattern count="few">{0} kWh</unitPattern>
+				<unitPattern count="many">{0} kWh</unitPattern>
+				<unitPattern count="other">{0} kWh</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
-				<displayName draft="contributed">GHz</displayName>
-				<unitPattern count="one" draft="contributed">{0} GHz</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} GHz</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} GHz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} GHz</unitPattern>
-			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one" draft="contributed">{0} Hz</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} Hz</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} Hz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Hz</unitPattern>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<displayName>kHz</displayName>
-				<unitPattern count="one" draft="contributed">{0} kHz</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kHz</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} kHz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kHz</unitPattern>
+				<displayName>GHz</displayName>
+				<unitPattern count="one">{0} GHz</unitPattern>
+				<unitPattern count="few">{0} GHz</unitPattern>
+				<unitPattern count="many">{0} GHz</unitPattern>
+				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
 			<unit type="frequency-megahertz">
 				<displayName>MHz</displayName>
-				<unitPattern count="one" draft="contributed">{0} MHz</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} MHz</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} MHz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MHz</unitPattern>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="few">{0} MHz</unitPattern>
+				<unitPattern count="many">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="few">{0} au</unitPattern>
-				<unitPattern count="many">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="frequency-kilohertz">
+				<displayName>kHz</displayName>
+				<unitPattern count="one">{0} kHz</unitPattern>
+				<unitPattern count="few">{0} kHz</unitPattern>
+				<unitPattern count="many">{0} kHz</unitPattern>
+				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="few">{0} cm</unitPattern>
-				<unitPattern count="many">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<displayName draft="contributed">dm</displayName>
-				<unitPattern count="one" draft="contributed">{0} dm</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} dm</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} dm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} dm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>ft</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="few">{0} ft</unitPattern>
-				<unitPattern count="many">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>in</displayName>
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="few">{0} in</unitPattern>
-				<unitPattern count="many">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="few">{0} Hz</unitPattern>
+				<unitPattern count="many">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
@@ -7419,13 +7698,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} km</unitPattern>
 				<unitPattern count="many">{0} km</unitPattern>
 				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ly</displayName>
-				<unitPattern count="one">{0} ly</unitPattern>
-				<unitPattern count="few">{0} ly</unitPattern>
-				<unitPattern count="many">{0} ly</unitPattern>
-				<unitPattern count="other">{0} ly</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
 			<unit type="length-meter">
 				<displayName>m</displayName>
@@ -7433,20 +7706,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} m</unitPattern>
 				<unitPattern count="many">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="few">{0} µm</unitPattern>
-				<unitPattern count="many">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
+			<unit type="length-decimeter">
+				<displayName>dm</displayName>
+				<unitPattern count="one">{0} dm</unitPattern>
+				<unitPattern count="few">{0} dm</unitPattern>
+				<unitPattern count="many">{0} dm</unitPattern>
+				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName>mi</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="few">{0} mi</unitPattern>
-				<unitPattern count="many">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="few">{0} cm</unitPattern>
+				<unitPattern count="many">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -7455,26 +7730,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="few">{0} µm</unitPattern>
+				<unitPattern count="many">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
-				<unitPattern count="one" draft="contributed">{0} nm</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} nm</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} nm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} nm</unitPattern>
-			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>NM</displayName>
-				<unitPattern count="one">{0} NM</unitPattern>
-				<unitPattern count="few">{0} NM</unitPattern>
-				<unitPattern count="many">{0} NM</unitPattern>
-				<unitPattern count="other">{0} NM</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one" draft="contributed">{0} pc</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} pc</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} pc</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pc</unitPattern>
+				<unitPattern count="one">{0} nm</unitPattern>
+				<unitPattern count="few">{0} nm</unitPattern>
+				<unitPattern count="many">{0} nm</unitPattern>
+				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
@@ -7483,6 +7751,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="few">{0} mi</unitPattern>
+				<unitPattern count="many">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yd</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
@@ -7490,6 +7765,57 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ft</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="few">{0} ft</unitPattern>
+				<unitPattern count="many">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>in</displayName>
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="few">{0} in</unitPattern>
+				<unitPattern count="many">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="few">{0} pc</unitPattern>
+				<unitPattern count="many">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ly</displayName>
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="few">{0} ly</unitPattern>
+				<unitPattern count="many">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="few">{0} au</unitPattern>
+				<unitPattern count="many">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>NM</displayName>
+				<unitPattern count="one">{0} NM</unitPattern>
+				<unitPattern count="few">{0} NM</unitPattern>
+				<unitPattern count="many">{0} NM</unitPattern>
+				<unitPattern count="other">{0} NM</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>ŠM</displayName>
+				<unitPattern count="one">{0} ŠM</unitPattern>
+				<unitPattern count="few">{0} ŠM</unitPattern>
+				<unitPattern count="many">{0} ŠM</unitPattern>
+				<unitPattern count="other">{0} ŠM</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
@@ -7497,19 +7823,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>ct</displayName>
-				<unitPattern count="one">{0} ct</unitPattern>
-				<unitPattern count="few">{0} ct</unitPattern>
-				<unitPattern count="many">{0} ct</unitPattern>
-				<unitPattern count="other">{0} ct</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gramy</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="few">{0} g</unitPattern>
-				<unitPattern count="many">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="mass-metric-ton">
+				<displayName>t</displayName>
+				<unitPattern count="one">{0} t</unitPattern>
+				<unitPattern count="few">{0} t</unitPattern>
+				<unitPattern count="many">{0} t</unitPattern>
+				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
@@ -7517,13 +7836,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kg</unitPattern>
 				<unitPattern count="many">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
 			</unit>
-			<unit type="mass-metric-ton">
-				<displayName>t</displayName>
-				<unitPattern count="one">{0} t</unitPattern>
-				<unitPattern count="few">{0} t</unitPattern>
-				<unitPattern count="many">{0} t</unitPattern>
-				<unitPattern count="other">{0} t</unitPattern>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="many">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>mg</displayName>
+				<unitPattern count="one">{0} mg</unitPattern>
+				<unitPattern count="few">{0} mg</unitPattern>
+				<unitPattern count="many">{0} mg</unitPattern>
+				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
 			<unit type="mass-microgram">
 				<displayName>µg</displayName>
@@ -7532,34 +7860,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} µg</unitPattern>
 				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
-			<unit type="mass-milligram">
-				<displayName>mg</displayName>
-				<unitPattern count="one" draft="contributed">{0} mg</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mg</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} mg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mg</unitPattern>
-			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="few">{0} oz</unitPattern>
-				<unitPattern count="many">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="one" draft="contributed">{0} oz t</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} oz t</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} oz t</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="few">{0} lb</unitPattern>
-				<unitPattern count="many">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
-			</unit>
 			<unit type="mass-ton">
 				<displayName>to</displayName>
 				<unitPattern count="one">{0} to</unitPattern>
@@ -7567,19 +7867,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} to</unitPattern>
 				<unitPattern count="other">{0} to</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="few">{0} lb</unitPattern>
+				<unitPattern count="many">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="few">{0} oz</unitPattern>
+				<unitPattern count="many">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="few">{0} oz t</unitPattern>
+				<unitPattern count="many">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>ct</displayName>
+				<unitPattern count="one">{0} ct</unitPattern>
+				<unitPattern count="few">{0} ct</unitPattern>
+				<unitPattern count="many">{0} ct</unitPattern>
+				<unitPattern count="other">{0} ct</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
-				<unitPattern count="one" draft="contributed">{0} GW</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} GW</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} GW</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} GW</unitPattern>
+				<unitPattern count="one">{0} GW</unitPattern>
+				<unitPattern count="few">{0} GW</unitPattern>
+				<unitPattern count="many">{0} GW</unitPattern>
+				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hp</displayName>
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="few">{0} hp</unitPattern>
-				<unitPattern count="many">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
+			<unit type="power-megawatt">
+				<displayName>MW</displayName>
+				<unitPattern count="one">{0} MW</unitPattern>
+				<unitPattern count="few">{0} MW</unitPattern>
+				<unitPattern count="many">{0} MW</unitPattern>
+				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName>kW</displayName>
@@ -7588,20 +7918,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kW</unitPattern>
 				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<displayName>MW</displayName>
-				<unitPattern count="one" draft="contributed">{0} MW</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} MW</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} MW</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MW</unitPattern>
-			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one" draft="contributed">{0} mW</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mW</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} mW</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mW</unitPattern>
-			</unit>
 			<unit type="power-watt">
 				<displayName>W</displayName>
 				<unitPattern count="one">{0} W</unitPattern>
@@ -7609,6 +7925,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="few">{0} mW</unitPattern>
+				<unitPattern count="many">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="few">{0} hp</unitPattern>
+				<unitPattern count="many">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
@@ -7616,6 +7946,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>mm Hg</displayName>
+				<unitPattern count="one">{0} mm Hg</unitPattern>
+				<unitPattern count="few">{0} mm Hg</unitPattern>
+				<unitPattern count="many">{0} mm Hg</unitPattern>
+				<unitPattern count="other">{0} mm Hg</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>psi</displayName>
+				<unitPattern count="one">{0} psi</unitPattern>
+				<unitPattern count="few">{0} psi</unitPattern>
+				<unitPattern count="many">{0} psi</unitPattern>
+				<unitPattern count="other">{0} psi</unitPattern>
+			</unit>
 			<unit type="pressure-inch-hg">
 				<displayName>inHg</displayName>
 				<unitPattern count="one">{0} inHg</unitPattern>
@@ -7630,27 +7974,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mbar</unitPattern>
 				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<displayName>mm Hg</displayName>
-				<unitPattern count="one" draft="contributed">{0} mm Hg</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mm Hg</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} mm Hg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mm Hg</unitPattern>
-			</unit>
-			<unit type="pressure-pound-per-square-inch">
-				<displayName>psi</displayName>
-				<unitPattern count="one" draft="contributed">{0} psi</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} psi</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} psi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} psi</unitPattern>
-			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="few">{0} kt</unitPattern>
-				<unitPattern count="many">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
-			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
 				<unitPattern count="one">{0} km/h</unitPattern>
@@ -7672,6 +7995,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="few">{0} kn</unitPattern>
+				<unitPattern count="many">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0} °</unitPattern>
+				<unitPattern count="few">{0} °</unitPattern>
+				<unitPattern count="many">{0} °</unitPattern>
+				<unitPattern count="other">{0} °</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0} °C</unitPattern>
@@ -7693,41 +8030,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one" draft="contributed">{0} ac ft</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ac ft</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ac ft</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="few">{0} cl</unitPattern>
-				<unitPattern count="many">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one" draft="contributed">{0} cm³</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} cm³</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} cm³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one" draft="contributed">{0} ft³</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ft³</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ft³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one" draft="contributed">{0} in³</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} in³</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} in³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -7737,10 +8039,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="volume-cubic-meter">
 				<displayName>m³</displayName>
-				<unitPattern count="one" draft="contributed">{0} m³</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} m³</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} m³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} m³</unitPattern>
+				<unitPattern count="one">{0} m³</unitPattern>
+				<unitPattern count="few">{0} m³</unitPattern>
+				<unitPattern count="many">{0} m³</unitPattern>
+				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="few">{0} cm³</unitPattern>
+				<unitPattern count="many">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -7751,38 +8062,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="volume-cubic-yard">
 				<displayName>yd³</displayName>
-				<unitPattern count="one" draft="contributed">{0} yd³</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} yd³</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} yd³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} yd³</unitPattern>
+				<unitPattern count="one">{0} yd³</unitPattern>
+				<unitPattern count="few">{0} yd³</unitPattern>
+				<unitPattern count="many">{0} yd³</unitPattern>
+				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>c</displayName>
-				<unitPattern count="one" draft="contributed">{0} c</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} c</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} c</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="few">{0} ft³</unitPattern>
+				<unitPattern count="many">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="few">{0} dl</unitPattern>
-				<unitPattern count="many">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="few">{0} in³</unitPattern>
+				<unitPattern count="many">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one" draft="contributed">{0} fl oz</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} fl oz</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} fl oz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="few">{0} gal</unitPattern>
-				<unitPattern count="many">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="few">{0} Ml</unitPattern>
+				<unitPattern count="many">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -7797,13 +8101,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} l</unitPattern>
 				<unitPattern count="many">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="one">{0} Ml</unitPattern>
-				<unitPattern count="few">{0} Ml</unitPattern>
-				<unitPattern count="many">{0} Ml</unitPattern>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="few">{0} dl</unitPattern>
+				<unitPattern count="many">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="few">{0} cl</unitPattern>
+				<unitPattern count="many">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
@@ -7812,26 +8124,69 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="one" draft="contributed">{0} pt</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} pt</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} pt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="few">{0} mpt</unitPattern>
+				<unitPattern count="many">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mc</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="few">{0} mc</unitPattern>
+				<unitPattern count="many">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="few">{0} ac ft</unitPattern>
+				<unitPattern count="many">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="few">{0} gal</unitPattern>
+				<unitPattern count="many">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
-				<unitPattern count="one" draft="contributed">{0} qt</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} qt</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} qt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} qt</unitPattern>
+				<unitPattern count="one">{0} qt</unitPattern>
+				<unitPattern count="few">{0} qt</unitPattern>
+				<unitPattern count="many">{0} qt</unitPattern>
+				<unitPattern count="other">{0} qt</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="few">{0} pt</unitPattern>
+				<unitPattern count="many">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>c</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="few">{0} c</unitPattern>
+				<unitPattern count="many">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="few">{0} fl oz</unitPattern>
+				<unitPattern count="many">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
-				<displayName draft="contributed">tbsp</displayName>
-				<unitPattern count="one" draft="contributed">{0} tbsp</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} tbsp</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} tbsp</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} tbsp</unitPattern>
+				<displayName>tbsp</displayName>
+				<unitPattern count="one">{0} tbsp</unitPattern>
+				<unitPattern count="few">{0} tbsp</unitPattern>
+				<unitPattern count="many">{0} tbsp</unitPattern>
+				<unitPattern count="other">{0} tbsp</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
 				<displayName>tsp</displayName>
@@ -7840,10 +8195,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} tsp</unitPattern>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<unitPattern count="one">{0}G</unitPattern>
@@ -7857,6 +8218,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} m/s²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-radian">
+				<unitPattern count="one" draft="contributed">{0} rad</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} rad</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} rad</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="few">{0}′</unitPattern>
@@ -7869,23 +8242,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="few">{0}°</unitPattern>
-				<unitPattern count="many">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<unitPattern count="one" draft="contributed">{0} rad</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} rad</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} rad</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0}ac</unitPattern>
-				<unitPattern count="few">{0}ac</unitPattern>
-				<unitPattern count="many">{0}ac</unitPattern>
-				<unitPattern count="other">{0}ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="few">{0} km²</unitPattern>
+				<unitPattern count="many">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0}ha</unitPattern>
@@ -7893,12 +8254,36 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}ha</unitPattern>
 				<unitPattern count="other">{0}ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="few">{0} m²</unitPattern>
+				<unitPattern count="many">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<unitPattern count="one" draft="contributed">{0} cm²</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} cm²</unitPattern>
 				<unitPattern count="many" draft="contributed">{0} cm²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} cm²</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<unitPattern count="one">{0}mi²</unitPattern>
+				<unitPattern count="few">{0}mi²</unitPattern>
+				<unitPattern count="many">{0}mi²</unitPattern>
+				<unitPattern count="other">{0}mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0}ac</unitPattern>
+				<unitPattern count="few">{0}ac</unitPattern>
+				<unitPattern count="many">{0}ac</unitPattern>
+				<unitPattern count="other">{0}ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<unitPattern count="one" draft="contributed">{0} yd²</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} yd²</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} yd²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} yd²</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<unitPattern count="one">{0}ft²</unitPattern>
 				<unitPattern count="few">{0}ft²</unitPattern>
@@ -7911,29 +8296,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} in²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} in²</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="few">{0} km²</unitPattern>
-				<unitPattern count="many">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="few">{0} m²</unitPattern>
-				<unitPattern count="many">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<unitPattern count="one">{0}mi²</unitPattern>
-				<unitPattern count="few">{0}mi²</unitPattern>
-				<unitPattern count="many">{0}mi²</unitPattern>
-				<unitPattern count="other">{0}mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<unitPattern count="one" draft="contributed">{0} yd²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} yd²</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} yd²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<unitPattern count="one" draft="contributed">{0} kt</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kt</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} kt</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="one" draft="contributed">{0} l/km</unitPattern>
@@ -7941,23 +8308,51 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} l/km</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="few">{0} l/100 km</unitPattern>
+				<unitPattern count="many">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<unitPattern count="one" draft="contributed">{0} mpg</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} mpg</unitPattern>
 				<unitPattern count="many" draft="contributed">{0} mpg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mpg</unitPattern>
 			</unit>
+			<unit type="digital-byte">
+				<unitPattern count="one" draft="contributed">{0} B</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} B</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} B</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} B</unitPattern>
+			</unit>
 			<unit type="digital-bit">
 				<unitPattern count="one" draft="contributed">{0} b</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} b</unitPattern>
 				<unitPattern count="many" draft="contributed">{0} b</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} b</unitPattern>
 			</unit>
-			<unit type="digital-byte">
-				<unitPattern count="one" draft="contributed">{0} B</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} B</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} B</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} B</unitPattern>
+			<unit type="duration-year">
+				<displayName>r.</displayName>
+				<unitPattern count="one">{0} r.</unitPattern>
+				<unitPattern count="few">{0} r.</unitPattern>
+				<unitPattern count="many">{0} r.</unitPattern>
+				<unitPattern count="other">{0} r.</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>m.</displayName>
+				<unitPattern count="one">{0} m.</unitPattern>
+				<unitPattern count="few">{0} m.</unitPattern>
+				<unitPattern count="many">{0} m.</unitPattern>
+				<unitPattern count="other">{0} m.</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>t.</displayName>
+				<unitPattern count="one">{0} t.</unitPattern>
+				<unitPattern count="few">{0} t.</unitPattern>
+				<unitPattern count="many">{0} t.</unitPattern>
+				<unitPattern count="other">{0} t.</unitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>d.</displayName>
@@ -7973,19 +8368,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} h</unitPattern>
 				<unitPattern count="other">{0} h</unitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<unitPattern count="one" draft="contributed">{0} μs</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} μs</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} μs</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="few">{0} ms</unitPattern>
-				<unitPattern count="many">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
@@ -7993,19 +8375,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>m.</displayName>
-				<unitPattern count="one">{0} m.</unitPattern>
-				<unitPattern count="few">{0} m.</unitPattern>
-				<unitPattern count="many">{0} m.</unitPattern>
-				<unitPattern count="other">{0} m.</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<unitPattern count="one" draft="contributed">{0} ns</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ns</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ns</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ns</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>s</displayName>
 				<unitPattern count="one">{0} s</unitPattern>
@@ -8013,52 +8382,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} s</unitPattern>
 				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>t.</displayName>
-				<unitPattern count="one">{0} t.</unitPattern>
-				<unitPattern count="few">{0} t.</unitPattern>
-				<unitPattern count="many">{0} t.</unitPattern>
-				<unitPattern count="other">{0} t.</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="few">{0} ms</unitPattern>
+				<unitPattern count="many">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>r.</displayName>
-				<unitPattern count="one">{0} r.</unitPattern>
-				<unitPattern count="few">{0} r.</unitPattern>
-				<unitPattern count="many">{0} r.</unitPattern>
-				<unitPattern count="other">{0} r.</unitPattern>
+			<unit type="duration-microsecond">
+				<unitPattern count="one" draft="contributed">{0} μs</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} μs</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} μs</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} μs</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName draft="contributed">au</displayName>
-				<unitPattern count="one" draft="contributed">{0} au</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} au</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} au</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} au</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="few">{0} cm</unitPattern>
-				<unitPattern count="many">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<displayName draft="contributed">dm</displayName>
-				<unitPattern count="one" draft="contributed">{0} dm</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} dm</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} dm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} dm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0}′</unitPattern>
-				<unitPattern count="few">{0}′</unitPattern>
-				<unitPattern count="many">{0}′</unitPattern>
-				<unitPattern count="other">{0}′</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0}in</unitPattern>
-				<unitPattern count="few">{0}in</unitPattern>
-				<unitPattern count="many">{0}in</unitPattern>
-				<unitPattern count="other">{0}in</unitPattern>
+			<unit type="duration-nanosecond">
+				<unitPattern count="one" draft="contributed">{0} ns</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ns</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ns</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ns</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
@@ -8067,12 +8408,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} km</unitPattern>
 				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0}ly</unitPattern>
-				<unitPattern count="few">{0}ly</unitPattern>
-				<unitPattern count="many">{0}ly</unitPattern>
-				<unitPattern count="other">{0}ly</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>m</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
@@ -8080,18 +8415,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-micrometer">
-				<displayName draft="contributed">µm</displayName>
-				<unitPattern count="one" draft="contributed">{0} µm</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} µm</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} µm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} µm</unitPattern>
+			<unit type="length-decimeter">
+				<displayName draft="contributed">dm</displayName>
+				<unitPattern count="one" draft="contributed">{0} dm</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} dm</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} dm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0}mi</unitPattern>
-				<unitPattern count="few">{0}mi</unitPattern>
-				<unitPattern count="many">{0}mi</unitPattern>
-				<unitPattern count="other">{0}mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="few">{0} cm</unitPattern>
+				<unitPattern count="many">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -8100,6 +8436,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName draft="contributed">µm</displayName>
+				<unitPattern count="one" draft="contributed">{0} µm</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} µm</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} µm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName draft="contributed">nm</displayName>
 				<unitPattern count="one" draft="contributed">{0} nm</unitPattern>
@@ -8113,30 +8456,54 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}pm</unitPattern>
 				<unitPattern count="other">{0}pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0}mi</unitPattern>
+				<unitPattern count="few">{0}mi</unitPattern>
+				<unitPattern count="many">{0}mi</unitPattern>
+				<unitPattern count="other">{0}mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0}yd</unitPattern>
 				<unitPattern count="few">{0}yd</unitPattern>
 				<unitPattern count="many">{0}yd</unitPattern>
 				<unitPattern count="other">{0}yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="few">{0}′</unitPattern>
+				<unitPattern count="many">{0}′</unitPattern>
+				<unitPattern count="other">{0}′</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0}in</unitPattern>
+				<unitPattern count="few">{0}in</unitPattern>
+				<unitPattern count="many">{0}in</unitPattern>
+				<unitPattern count="other">{0}in</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0}ly</unitPattern>
+				<unitPattern count="few">{0}ly</unitPattern>
+				<unitPattern count="many">{0}ly</unitPattern>
+				<unitPattern count="other">{0}ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName draft="contributed">au</displayName>
+				<unitPattern count="one" draft="contributed">{0} au</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} au</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} au</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} au</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<unitPattern count="one" draft="contributed">{0} lx</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} lx</unitPattern>
 				<unitPattern count="many" draft="contributed">{0} lx</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<unitPattern count="one" draft="contributed">{0} ct</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ct</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ct</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ct</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="few">{0} g</unitPattern>
-				<unitPattern count="many">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="mass-metric-ton">
+				<unitPattern count="one" draft="contributed">{0} t</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} t</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} t</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} t</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
@@ -8145,11 +8512,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-metric-ton">
-				<unitPattern count="one" draft="contributed">{0} t</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} t</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} t</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} t</unitPattern>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="many">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<unitPattern count="one" draft="contributed">{0} mg</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mg</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} mg</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mg</unitPattern>
 			</unit>
 			<unit type="mass-microgram">
 				<unitPattern count="one" draft="contributed">{0} µg</unitPattern>
@@ -8157,11 +8531,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} µg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} µg</unitPattern>
 			</unit>
-			<unit type="mass-milligram">
-				<unitPattern count="one" draft="contributed">{0} mg</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mg</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} mg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mg</unitPattern>
+			<unit type="mass-ton">
+				<unitPattern count="one" draft="contributed">{0} to</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} to</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} to</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} to</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<unitPattern count="one">{0}lb</unitPattern>
+				<unitPattern count="few">{0}lb</unitPattern>
+				<unitPattern count="many">{0}lb</unitPattern>
+				<unitPattern count="other">{0}lb</unitPattern>
 			</unit>
 			<unit type="mass-ounce">
 				<unitPattern count="one">{0}oz</unitPattern>
@@ -8175,29 +8555,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} oz t</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} oz t</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<unitPattern count="one">{0}lb</unitPattern>
-				<unitPattern count="few">{0}lb</unitPattern>
-				<unitPattern count="many">{0}lb</unitPattern>
-				<unitPattern count="other">{0}lb</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<unitPattern count="one" draft="contributed">{0} to</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} to</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} to</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} to</unitPattern>
-			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0}hp</unitPattern>
-				<unitPattern count="few">{0}hp</unitPattern>
-				<unitPattern count="many">{0}hp</unitPattern>
-				<unitPattern count="other">{0}hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<unitPattern count="one">{0}kW</unitPattern>
-				<unitPattern count="few">{0}kW</unitPattern>
-				<unitPattern count="many">{0}kW</unitPattern>
-				<unitPattern count="other">{0}kW</unitPattern>
+			<unit type="mass-carat">
+				<unitPattern count="one" draft="contributed">{0} ct</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ct</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ct</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ct</unitPattern>
 			</unit>
 			<unit type="power-megawatt">
 				<unitPattern count="one" draft="contributed">{0} MW</unitPattern>
@@ -8205,11 +8567,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} MW</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<unitPattern count="one" draft="contributed">{0} mW</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mW</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} mW</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<unitPattern count="one">{0}kW</unitPattern>
+				<unitPattern count="few">{0}kW</unitPattern>
+				<unitPattern count="many">{0}kW</unitPattern>
+				<unitPattern count="other">{0}kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<unitPattern count="one">{0}W</unitPattern>
@@ -8217,6 +8579,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}W</unitPattern>
 				<unitPattern count="other">{0}W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<unitPattern count="one" draft="contributed">{0} mW</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mW</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} mW</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0}hp</unitPattern>
+				<unitPattern count="few">{0}hp</unitPattern>
+				<unitPattern count="many">{0}hp</unitPattern>
+				<unitPattern count="other">{0}hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0}hPa</unitPattern>
 				<unitPattern count="few">{0}hPa</unitPattern>
@@ -8235,12 +8609,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0}mb</unitPattern>
 				<unitPattern count="other">{0}mb</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<unitPattern count="one" draft="contributed">{0} kt</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kt</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} kt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kt</unitPattern>
-			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
 				<unitPattern count="one">{0} km/h</unitPattern>
@@ -8279,36 +8647,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} K</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<unitPattern count="one" draft="contributed">{0} ac ft</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ac ft</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ac ft</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<unitPattern count="one" draft="contributed">{0} cl</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} cl</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} cl</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<unitPattern count="one" draft="contributed">{0} cm³</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} cm³</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} cm³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<unitPattern count="one" draft="contributed">{0} ft³</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ft³</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} ft³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<unitPattern count="one" draft="contributed">{0} in³</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} in³</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} in³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<unitPattern count="one">{0}km³</unitPattern>
 				<unitPattern count="few">{0}km³</unitPattern>
@@ -8321,6 +8659,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} m³</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} m³</unitPattern>
 			</unit>
+			<unit type="volume-cubic-centimeter">
+				<unitPattern count="one" draft="contributed">{0} cm³</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} cm³</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} cm³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cm³</unitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<unitPattern count="one">{0}mi³</unitPattern>
 				<unitPattern count="few">{0}mi³</unitPattern>
@@ -8333,29 +8677,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} yd³</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<unitPattern count="one" draft="contributed">{0} c</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} c</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} c</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<unitPattern count="one" draft="contributed">{0} ft³</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ft³</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ft³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<unitPattern count="one" draft="contributed">{0} dl</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} dl</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} dl</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<unitPattern count="one" draft="contributed">{0} in³</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} in³</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} in³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<unitPattern count="one" draft="contributed">{0} fl oz</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} fl oz</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} fl oz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<unitPattern count="one" draft="contributed">{0} gal</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} gal</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} gal</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<unitPattern count="one" draft="contributed">{0} Ml</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Ml</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} Ml</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<unitPattern count="one" draft="contributed">{0} hl</unitPattern>
@@ -8370,11 +8708,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<unitPattern count="one" draft="contributed">{0} Ml</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} Ml</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} Ml</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<unitPattern count="one" draft="contributed">{0} dl</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} dl</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} dl</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<unitPattern count="one" draft="contributed">{0} cl</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} cl</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} cl</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<unitPattern count="one" draft="contributed">{0} ml</unitPattern>
@@ -8382,11 +8726,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} ml</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<unitPattern count="one" draft="contributed">{0} pt</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} pt</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} pt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pt</unitPattern>
+			<unit type="volume-acre-foot">
+				<unitPattern count="one" draft="contributed">{0} ac ft</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ac ft</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ac ft</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<unitPattern count="one" draft="contributed">{0} gal</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} gal</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} gal</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} gal</unitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<unitPattern count="one" draft="contributed">{0} qt</unitPattern>
@@ -8394,6 +8744,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} qt</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<unitPattern count="one" draft="contributed">{0} pt</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} pt</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} pt</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<unitPattern count="one" draft="contributed">{0} c</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} c</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} c</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<unitPattern count="one" draft="contributed">{0} fl oz</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} fl oz</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} fl oz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<unitPattern count="one" draft="contributed">{0} tbsp</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} tbsp</unitPattern>
@@ -8406,6 +8774,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} tsp</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
@@ -8422,7 +8796,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<listPatternPart type="start">{0}, {1}</listPatternPart>
 			<listPatternPart type="middle">{0}, {1}</listPatternPart>
 			<listPatternPart type="end">{0} a {1}</listPatternPart>
-			<listPatternPart type="2">{0} a {1}</listPatternPart>
+			<listPatternPart type="2">{0} a {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit">
 			<listPatternPart type="start">{0}, {1}</listPatternPart>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sk_SK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sk_SK.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sk_SK.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sk_SK.xml
index 5bbcd799ac7..7cbf6d336a0 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sk_SK.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sk_SK.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="sk"/>
 		<territory type="SK"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sl.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sl.xml
similarity index 80%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sl.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sl.xml
index 0012d3b85f0..6f80da8290f 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sl.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sl.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="sl"/>
 	</identity>
 	<localeDisplayNames>
@@ -59,6 +58,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bem">bemba</language>
 			<language type="bez">benajščina</language>
 			<language type="bg">bolgarščina</language>
+			<language type="bgn">zahodnobalučijščina</language>
 			<language type="bho">bodžpuri</language>
 			<language type="bi">bislamščina</language>
 			<language type="bik">bikolski jezik</language>
@@ -230,7 +230,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="kg">kongovščina</language>
 			<language type="kha">kasi</language>
 			<language type="kho">kotanščina</language>
-			<language type="khq" draft="contributed">koyra chiini</language>
+			<language type="khq">koyra chiini</language>
 			<language type="ki">kikujščina</language>
 			<language type="kj">kvanjama</language>
 			<language type="kk">kazaščina</language>
@@ -250,7 +250,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="kru">kuruk</language>
 			<language type="ks">kašmirščina</language>
 			<language type="ksb" draft="contributed">shambala</language>
-			<language type="ksf" draft="contributed">bafia</language>
+			<language type="ksf">bafia</language>
 			<language type="ku">kurdščina</language>
 			<language type="kum">kumiščina</language>
 			<language type="kut">kutenajščina</language>
@@ -271,6 +271,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">laoščina</language>
 			<language type="lol">mongo</language>
 			<language type="loz">lozi</language>
+			<language type="lrc">severnolurijščina</language>
 			<language type="lt">litovščina</language>
 			<language type="lu">luba-katanga</language>
 			<language type="lua">luba-lulua</language>
@@ -289,12 +290,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mdf">mokšavščina</language>
 			<language type="mdr">mandarščina</language>
 			<language type="men">mende</language>
-			<language type="mer" draft="contributed">meru</language>
+			<language type="mer">meru</language>
 			<language type="mfe">morisjenščina</language>
 			<language type="mg">malagaščina</language>
 			<language type="mga">srednja irščina</language>
-			<language type="mgh" draft="contributed">makuva-meto</language>
-			<language type="mgo" draft="contributed">meta</language>
+			<language type="mgh">makuva-meto</language>
+			<language type="mgo">meta</language>
 			<language type="mh">marshallovščina</language>
 			<language type="mi">maorščina</language>
 			<language type="mic">mikmaščina</language>
@@ -309,30 +310,32 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mr">maratščina</language>
 			<language type="ms">malajščina</language>
 			<language type="mt">malteščina</language>
-			<language type="mua" draft="contributed">mundang</language>
+			<language type="mua">mundang</language>
 			<language type="mul">več jezikov</language>
 			<language type="mwl">mirandeščina</language>
 			<language type="mwr">marvarščina</language>
 			<language type="my">burmanščina</language>
 			<language type="myv">erzjanščina</language>
+			<language type="mzn">mazanderanščina</language>
 			<language type="na">naurujščina</language>
 			<language type="nap">napolitanščina</language>
 			<language type="naq" draft="contributed">khoekhoe</language>
 			<language type="nb">knjižna norveščina</language>
 			<language type="nd">severna ndebelščina</language>
 			<language type="nds">nizka nemščina</language>
+			<language type="nds_NL">nizka saščina</language>
 			<language type="ne">nepalščina</language>
 			<language type="new">nevarščina</language>
 			<language type="nia">niaščina</language>
 			<language type="niu">niuejščina</language>
 			<language type="nl">nizozemščina</language>
 			<language type="nl_BE">flamščina</language>
-			<language type="nmg" draft="contributed">kwasio</language>
+			<language type="nmg">kwasio</language>
 			<language type="nn">novonorveščina</language>
 			<language type="no">norveščina</language>
 			<language type="nog">nogajščina</language>
 			<language type="non">stara nordijščina</language>
-			<language type="nqo" draft="contributed">n’ko</language>
+			<language type="nqo">n’ko</language>
 			<language type="nr">južna ndebelščina</language>
 			<language type="nso">severna sotščina</language>
 			<language type="nus">nuerščina</language>
@@ -366,7 +369,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="pt_BR">brazilska portugalščina</language>
 			<language type="pt_PT">iberska portugalščina</language>
 			<language type="qu">kečuanščina</language>
-			<language type="quc" draft="contributed">quiche</language>
+			<language type="quc">quiche</language>
 			<language type="raj">radžastanščina</language>
 			<language type="rap">rapanujščina</language>
 			<language type="rar">rarotongščina</language>
@@ -374,7 +377,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="rn">rundščina</language>
 			<language type="ro">romunščina</language>
 			<language type="ro_MD">moldavščina</language>
-			<language type="rof" draft="contributed">rombo</language>
+			<language type="rof">rombo</language>
 			<language type="rom">romščina</language>
 			<language type="ru">ruščina</language>
 			<language type="rup">aromunščina</language>
@@ -391,10 +394,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">sicilijanščina</language>
 			<language type="sco">škotščina</language>
 			<language type="sd">sindščina</language>
+			<language type="sdh">južna kurdščina</language>
 			<language type="se">severna samijščina</language>
-			<language type="seh" draft="contributed">sena</language>
+			<language type="seh">sena</language>
 			<language type="sel">selkupščina</language>
-			<language type="ses" draft="contributed">koyraboro senni</language>
+			<language type="ses">koyraboro senni</language>
 			<language type="sg">sango</language>
 			<language type="sga">stara irščina</language>
 			<language type="sh">srbohrvaščina</language>
@@ -423,8 +427,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">sumerščina</language>
 			<language type="sv">švedščina</language>
 			<language type="sw">svahili</language>
+			<language type="sw_CD">svahili (Kongo)</language>
 			<language type="swb">šikomor</language>
-			<language type="swc" draft="contributed">svahili (Kongo)</language>
 			<language type="syc">klasična sirščina</language>
 			<language type="syr">sirščina</language>
 			<language type="ta">tamilščina</language>
@@ -457,7 +461,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="twq" draft="contributed">tasawaq</language>
 			<language type="ty">tahitščina</language>
 			<language type="tyv">tuvinščina</language>
-			<language type="tzm" draft="contributed">tamašek (srednji atlas)</language>
+			<language type="tzm">tamašek (srednji atlas)</language>
 			<language type="udm">udmurtščina</language>
 			<language type="ug">ujgurščina</language>
 			<language type="uga">ugaritski jezik</language>
@@ -471,14 +475,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="vi">vietnamščina</language>
 			<language type="vo">volapuk</language>
 			<language type="vot">votjaščina</language>
-			<language type="vun" draft="contributed">vunjo</language>
+			<language type="vun">vunjo</language>
 			<language type="wa">valonščina</language>
 			<language type="wal">valamščina</language>
 			<language type="war">varajščina</language>
 			<language type="was">vašajščina</language>
+			<language type="wbp">varlpirščina</language>
 			<language type="wo">volofščina</language>
 			<language type="xal">kalmiščina</language>
-			<language type="xh">xhosa</language>
+			<language type="xh">koščina</language>
 			<language type="xog">sogščina</language>
 			<language type="yao">jaojščina</language>
 			<language type="yap">japščina</language>
@@ -499,7 +504,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</languages>
 		<scripts>
 			<script type="Arab">arabski</script>
-			<script type="Arab" alt="variant" draft="contributed">Perzijskoarabski</script>
+			<script type="Arab" alt="variant">perzijskoarabski</script>
 			<script type="Armi">imperialno-aramejski</script>
 			<script type="Armn">armenski</script>
 			<script type="Avst">avestanski</script>
@@ -571,7 +576,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Maya">majevska slikovna pisava</script>
 			<script type="Mero">meroitski</script>
 			<script type="Mlym">malajalamski</script>
-			<script type="Mong">mongolski</script>
+			<script type="Mong">mongolska</script>
 			<script type="Moon">Moonova pisava za slepe</script>
 			<script type="Mtei">manipurski</script>
 			<script type="Mymr">mjanmarski</script>
@@ -661,7 +666,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angvila</territory>
 			<territory type="AL">Albanija</territory>
 			<territory type="AM">Armenija</territory>
-			<territory type="AN">Nizozemski Antili</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antarktika</territory>
 			<territory type="AR">Argentina</territory>
@@ -701,6 +705,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CG" alt="variant">Kongo (Republika)</territory>
 			<territory type="CH">Švica</territory>
 			<territory type="CI">Slonokoščena obala</territory>
+			<territory type="CI" alt="variant">Côte d’Ivoire</territory>
 			<territory type="CK">Cookovi otoki</territory>
 			<territory type="CL">Čile</territory>
 			<territory type="CM">Kamerun</territory>
@@ -733,7 +738,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="FI">Finska</territory>
 			<territory type="FJ">Fidži</territory>
 			<territory type="FK">Falklandski otoki</territory>
-			<territory type="FK" alt="variant">Falklandski otoki (Malvinski otoki)</territory>
+			<territory type="FK" alt="variant">Falklandski otoki (Malvini)</territory>
 			<territory type="FM">Mikronezija</territory>
 			<territory type="FO">Ferski otoki</territory>
 			<territory type="FR">Francija</territory>
@@ -970,102 +975,115 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">Številsko razvrščanje</key>
 			<key type="colStrength" draft="contributed">Moč razvrščanja</key>
 			<key type="currency">valuta</key>
-			<key type="numbers" draft="contributed">Številke</key>
+			<key type="hc">urni prikaz (12 ali 24)</key>
+			<key type="lb">Slog preloma vrstic</key>
+			<key type="ms">merski sistem</key>
+			<key type="numbers">številke</key>
 			<key type="timezone" draft="contributed">Časovni pas</key>
 			<key type="va" draft="contributed">Različica območnih nastavitev</key>
 			<key type="variableTop" draft="contributed">Razvrščanje kot simboli</key>
 			<key type="x" draft="contributed">Private-Use</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers" draft="contributed">Arabskoindijske števke</type>
-			<type type="arabext" key="numbers" draft="contributed">Razširjene arabskoindijske števke</type>
-			<type type="armn" key="numbers" draft="contributed">Armenske številke</type>
-			<type type="armnlow" key="numbers" draft="contributed">Armenske majhne številke</type>
-			<type type="beng" key="numbers" draft="contributed">Bengalske števke</type>
-			<type type="big5han" key="collation">razvrščanje po sistemu tradicionalne kitajščine - Big5</type>
-			<type type="buddhist" key="calendar">budistični koledar</type>
-			<type type="chinese" key="calendar">kitajski koledar</type>
-			<type type="coptic" key="calendar" draft="contributed">Koptski koledar</type>
-			<type type="dangi" key="calendar">stari korejski koledar</type>
-			<type type="deva" key="numbers" draft="contributed">Devangarske števke</type>
-			<type type="dictionary" key="collation" draft="contributed">Vrstni red razvrščanja v slovarju</type>
-			<type type="ducet" key="collation" draft="contributed">Privzeto razvrščanje Unicode</type>
-			<type type="ethi" key="numbers" draft="contributed">Etiopijske številke</type>
-			<type type="ethiopic" key="calendar" draft="contributed">Etiopski koledar</type>
-			<type type="ethiopic-amete-alem" key="calendar" draft="contributed">Etiopsko ametsko alemski koledar</type>
-			<type type="finance" key="numbers" draft="contributed">Finančne številke</type>
-			<type type="fullwide" key="numbers" draft="contributed">Števke polne širine</type>
-			<type type="gb2312han" key="collation">razvrščanje po sistemu poenostavljene kitajščine - GB2312</type>
-			<type type="geor" key="numbers" draft="contributed">Gruzijske številke</type>
-			<type type="gregorian" key="calendar">gregorijanski koledar</type>
-			<type type="grek" key="numbers" draft="contributed">Grške številke</type>
-			<type type="greklow" key="numbers" draft="contributed">Grške male številke</type>
-			<type type="gujr" key="numbers" draft="contributed">Gudžaratske števke</type>
-			<type type="guru" key="numbers" draft="contributed">Gurmuške števke</type>
-			<type type="hanidec" key="numbers" draft="contributed">Kitajske decimalne številke</type>
-			<type type="hans" key="numbers" draft="contributed">Poenostavljene kitajske številke</type>
-			<type type="hansfin" key="numbers" draft="contributed">Poenostavljene kitajske finančne številke</type>
-			<type type="hant" key="numbers" draft="contributed">Tradicionalne kitajske številke</type>
-			<type type="hantfin" key="numbers" draft="contributed">Tradicionalne kitajske finančne številke</type>
-			<type type="hebr" key="numbers" draft="contributed">Hebrejske številke</type>
-			<type type="hebrew" key="calendar">hebrejski koledar</type>
-			<type type="identical" key="colStrength" draft="contributed">Razvrščanje vsega</type>
-			<type type="indian" key="calendar">indijanski koledar</type>
-			<type type="islamic" key="calendar">islamski koledar</type>
-			<type type="islamic-civil" key="calendar">islamski civilni koledar</type>
-			<type type="iso8601" key="calendar">koledar ISO-8601</type>
-			<type type="japanese" key="calendar">japonski koledar</type>
-			<type type="jpan" key="numbers" draft="contributed">Japonske številke</type>
-			<type type="jpanfin" key="numbers" draft="contributed">Japonske finančne številke</type>
-			<type type="khmr" key="numbers" draft="contributed">Kmerske števke</type>
-			<type type="knda" key="numbers" draft="contributed">Kanaredske števke</type>
-			<type type="laoo" key="numbers" draft="contributed">Laoške števke</type>
-			<type type="latn" key="numbers" draft="contributed">Zahodne števke</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">Razvrščanje malih črk najprej</type>
-			<type type="mlym" key="numbers" draft="contributed">Malajalamske števke</type>
-			<type type="mong" key="numbers" draft="contributed">Mongolske števke</type>
-			<type type="mymr" key="numbers" draft="contributed">Mjanmarske števke</type>
-			<type type="native" key="numbers" draft="contributed">Domače števke</type>
-			<type type="no" key="colBackwards" draft="contributed">Navadno razvrščanje naglasov</type>
-			<type type="no" key="colCaseFirst" draft="contributed">Razvrščanje v običajnem zaporedju velikih/malih črk</type>
-			<type type="no" key="colCaseLevel" draft="contributed">Razvrščanje ne glede na velike/male črke</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">Razvrščanje kana ločeno</type>
-			<type type="no" key="colNormalization" draft="contributed">Razvrščanje brez normaliziranja</type>
-			<type type="no" key="colNumeric" draft="contributed">Ločeno razvrščanje številk</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">Razvrščanje simbolov</type>
-			<type type="orya" key="numbers" draft="contributed">Orijske števke</type>
-			<type type="persian" key="calendar" draft="contributed">Perzijski koledar</type>
-			<type type="phonebook" key="collation">razvrščanje po abecedi</type>
-			<type type="phonetic" key="collation" draft="contributed">Fonetično razvrščanje</type>
-			<type type="pinyin" key="collation">razvrščanje po sistemu pinjin</type>
-			<type type="primary" key="colStrength" draft="contributed">Razvrščanje samo osnovnih črk</type>
-			<type type="quaternary" key="colStrength" draft="contributed">Razvrščanje po naglasih/velikih črkah/malih črkah/širini/kana</type>
-			<type type="reformed" key="collation" draft="contributed">Reformirano razvrščanje</type>
-			<type type="roc" key="calendar">kitajski državni koledar</type>
-			<type type="roman" key="numbers" draft="contributed">Rimske številke</type>
-			<type type="romanlow" key="numbers" draft="contributed">Rimske male številke</type>
-			<type type="search" key="collation" draft="contributed">Splošno iskanje</type>
-			<type type="searchjl" key="collation" draft="contributed">Iskanje po začetnem soglasniku hangul</type>
-			<type type="secondary" key="colStrength" draft="contributed">Razvrščanje naglasov</type>
-			<type type="shifted" key="colAlternate" draft="contributed">Razvrščanje s prezrtjem simbolov</type>
-			<type type="standard" key="collation" draft="contributed">Standardno razvrščanje</type>
-			<type type="stroke" key="collation">razvrščanje po zaporedju pisanja pismenk</type>
-			<type type="taml" key="numbers" draft="contributed">Tamilske številke</type>
-			<type type="tamldec" key="numbers" draft="contributed">Tamilske števke</type>
-			<type type="telu" key="numbers" draft="contributed">Teluške števke</type>
-			<type type="tertiary" key="colStrength" draft="contributed">Razvrščanje po naglasih/velikih črkah/malih črkah/širini</type>
-			<type type="thai" key="numbers" draft="contributed">Tajske števke</type>
-			<type type="tibt" key="numbers" draft="contributed">Tibetanske števke</type>
-			<type type="traditional" key="collation">razvrščanje po tradicionalnem sistemu</type>
-			<type type="traditional" key="numbers" draft="contributed">Tradicionalne številke</type>
-			<type type="unihan" key="collation" draft="contributed">Razvrščanje koren-poteza</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">Razvrščanje velikih črk najprej</type>
-			<type type="vaii" key="numbers" draft="contributed">Številke vai</type>
-			<type type="yes" key="colBackwards" draft="contributed">Obratno razvrščanje naglasov</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">Razvrščanje ob upoštevanju velikih/malih črk</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">Razvrščanje kana različno</type>
-			<type type="yes" key="colNormalization" draft="contributed">Normalizirano razvrščanje Unicode</type>
-			<type type="yes" key="colNumeric" draft="contributed">Številsko razvrščanje števk</type>
+			<type key="calendar" type="buddhist">budistični koledar</type>
+			<type key="calendar" type="chinese">kitajski koledar</type>
+			<type key="calendar" type="coptic" draft="contributed">Koptski koledar</type>
+			<type key="calendar" type="dangi">stari korejski koledar</type>
+			<type key="calendar" type="ethiopic">etiopski koledar</type>
+			<type key="calendar" type="ethiopic-amete-alem" draft="contributed">Etiopsko ametsko alemski koledar</type>
+			<type key="calendar" type="gregorian">gregorijanski koledar</type>
+			<type key="calendar" type="hebrew">hebrejski koledar</type>
+			<type key="calendar" type="indian">indijanski koledar</type>
+			<type key="calendar" type="islamic">islamski koledar</type>
+			<type key="calendar" type="islamic-civil">islamski civilni koledar</type>
+			<type key="calendar" type="iso8601">koledar ISO-8601</type>
+			<type key="calendar" type="japanese">japonski koledar</type>
+			<type key="calendar" type="persian">perzijski koledar</type>
+			<type key="calendar" type="roc">kitajski državni koledar</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">Razvrščanje simbolov</type>
+			<type key="colAlternate" type="shifted" draft="contributed">Razvrščanje s prezrtjem simbolov</type>
+			<type key="colBackwards" type="no" draft="contributed">Navadno razvrščanje naglasov</type>
+			<type key="colBackwards" type="yes" draft="contributed">Obratno razvrščanje naglasov</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">Razvrščanje malih črk najprej</type>
+			<type key="colCaseFirst" type="no" draft="contributed">Razvrščanje v običajnem zaporedju velikih/malih črk</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">Razvrščanje velikih črk najprej</type>
+			<type key="colCaseLevel" type="no" draft="contributed">Razvrščanje ne glede na velike/male črke</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">Razvrščanje ob upoštevanju velikih/malih črk</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">Razvrščanje kana ločeno</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">Razvrščanje kana različno</type>
+			<type key="collation" type="big5han">razvrščanje po sistemu tradicionalne kitajščine - Big5</type>
+			<type key="collation" type="dictionary" draft="contributed">Vrstni red razvrščanja v slovarju</type>
+			<type key="collation" type="ducet">Privzeto razvrščanje Unicode</type>
+			<type key="collation" type="gb2312han">razvrščanje po sistemu poenostavljene kitajščine - GB2312</type>
+			<type key="collation" type="phonebook">razvrščanje po abecedi</type>
+			<type key="collation" type="phonetic" draft="contributed">Fonetično razvrščanje</type>
+			<type key="collation" type="pinyin">razvrščanje po sistemu pinjin</type>
+			<type key="collation" type="reformed" draft="contributed">Reformirano razvrščanje</type>
+			<type key="collation" type="search">Splošno iskanje</type>
+			<type key="collation" type="searchjl" draft="contributed">Iskanje po začetnem soglasniku hangul</type>
+			<type key="collation" type="standard">Standardno razvrščanje</type>
+			<type key="collation" type="stroke">razvrščanje po zaporedju pisanja pismenk</type>
+			<type key="collation" type="traditional">razvrščanje po tradicionalnem sistemu</type>
+			<type key="collation" type="unihan" draft="contributed">Razvrščanje koren-poteza</type>
+			<type key="colNormalization" type="no" draft="contributed">Razvrščanje brez normaliziranja</type>
+			<type key="colNormalization" type="yes" draft="contributed">Normalizirano razvrščanje Unicode</type>
+			<type key="colNumeric" type="no" draft="contributed">Ločeno razvrščanje številk</type>
+			<type key="colNumeric" type="yes" draft="contributed">Številsko razvrščanje števk</type>
+			<type key="colStrength" type="identical" draft="contributed">Razvrščanje vsega</type>
+			<type key="colStrength" type="primary" draft="contributed">Razvrščanje samo osnovnih črk</type>
+			<type key="colStrength" type="quaternary" draft="contributed">Razvrščanje po naglasih/velikih črkah/malih črkah/širini/kana</type>
+			<type key="colStrength" type="secondary" draft="contributed">Razvrščanje naglasov</type>
+			<type key="colStrength" type="tertiary" draft="contributed">Razvrščanje po naglasih/velikih črkah/malih črkah/širini</type>
+			<type key="hc" type="h11">12-urni sistem (0–11)</type>
+			<type key="hc" type="h12">12-urni sistem (1–12)</type>
+			<type key="hc" type="h23">24-urni sistem (0–23)</type>
+			<type key="hc" type="h24">24-urni sistem (1–24)</type>
+			<type key="lb" type="loose">Prosti slog preloma vrstic</type>
+			<type key="lb" type="normal">Običajni slog preloma vrstic</type>
+			<type key="lb" type="strict">Strogi slog preloma vrstic</type>
+			<type key="ms" type="metric">metrični sistem</type>
+			<type key="ms" type="uksystem">imperialni merski sistem</type>
+			<type key="ms" type="ussystem">merski sistem Združenih držav</type>
+			<type key="numbers" type="arab">arabskoindijske števke</type>
+			<type key="numbers" type="arabext">razširjene arabskoindijske števke</type>
+			<type key="numbers" type="armn">armenske številke</type>
+			<type key="numbers" type="armnlow">armenske majhne številke</type>
+			<type key="numbers" type="beng" draft="contributed">Bengalske števke</type>
+			<type key="numbers" type="deva">devangarske števke</type>
+			<type key="numbers" type="ethi" draft="contributed">Etiopijske številke</type>
+			<type key="numbers" type="finance" draft="contributed">Finančne številke</type>
+			<type key="numbers" type="fullwide">števke polne širine</type>
+			<type key="numbers" type="geor">gruzijske številke</type>
+			<type key="numbers" type="grek">grške številke</type>
+			<type key="numbers" type="greklow">grške male številke</type>
+			<type key="numbers" type="gujr">gudžaratske števke</type>
+			<type key="numbers" type="guru">gurmuške števke</type>
+			<type key="numbers" type="hanidec">kitajske decimalne številke</type>
+			<type key="numbers" type="hans">poenostavljene kitajske številke</type>
+			<type key="numbers" type="hansfin">poenostavljene kitajske finančne številke</type>
+			<type key="numbers" type="hant">tradicionalne kitajske številke</type>
+			<type key="numbers" type="hantfin">tradicionalne kitajske finančne številke</type>
+			<type key="numbers" type="hebr">hebrejske številke</type>
+			<type key="numbers" type="jpan">japonske številke</type>
+			<type key="numbers" type="jpanfin">japonske finančne številke</type>
+			<type key="numbers" type="khmr">kmerske števke</type>
+			<type key="numbers" type="knda" draft="contributed">Kanaredske števke</type>
+			<type key="numbers" type="laoo">laoške števke</type>
+			<type key="numbers" type="latn">zahodne števke</type>
+			<type key="numbers" type="mlym">malajalamske števke</type>
+			<type key="numbers" type="mong" draft="contributed">Mongolske števke</type>
+			<type key="numbers" type="mymr">mjanmarske števke</type>
+			<type key="numbers" type="native" draft="contributed">Domače števke</type>
+			<type key="numbers" type="orya">orijske števke</type>
+			<type key="numbers" type="roman">rimske številke</type>
+			<type key="numbers" type="romanlow">rimske male številke</type>
+			<type key="numbers" type="taml">tamilske številke</type>
+			<type key="numbers" type="tamldec">tamilske števke</type>
+			<type key="numbers" type="telu">teluške števke</type>
+			<type key="numbers" type="thai">tajske števke</type>
+			<type key="numbers" type="tibt">tibetanske števke</type>
+			<type key="numbers" type="traditional" draft="contributed">Tradicionalne številke</type>
+			<type key="numbers" type="vaii" draft="contributed">Številke vai</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">BGN</transformName>
@@ -1081,7 +1099,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</transformNames>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metrični</measurementSystemName>
-			<measurementSystemName type="UK" draft="contributed">Angleški</measurementSystemName>
+			<measurementSystemName type="UK">angleški</measurementSystemName>
 			<measurementSystemName type="US">imperialni</measurementSystemName>
 		</measurementSystemNames>
 		<codePatterns>
@@ -1094,13 +1112,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<exemplarCharacters>[a b c č d e f g h i j k l m n o p r s š t u v z ž]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[á à ă â å ä ā æ ç ć đ é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò ŏ ô ö ø ō œ q ú ù ŭ û ü ū w x y ÿ]</exemplarCharacters>
 		<exemplarCharacters type="index">[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 Ž]</exemplarCharacters>
-		<ellipsis type="final" draft="contributed">{0}…</ellipsis>
-		<ellipsis type="initial" draft="contributed">…{0}</ellipsis>
-		<ellipsis type="medial" draft="contributed">{0}…{1}</ellipsis>
-		<ellipsis type="word-final" draft="contributed">{0} …</ellipsis>
-		<ellipsis type="word-initial" draft="contributed">… {0}</ellipsis>
-		<ellipsis type="word-medial" draft="contributed">{0} … {1}</ellipsis>
-		<moreInformation draft="contributed">?</moreInformation>
+		<ellipsis type="final">{0}…</ellipsis>
+		<ellipsis type="initial">…{0}</ellipsis>
+		<ellipsis type="medial">{0}…{1}</ellipsis>
+		<ellipsis type="word-final">{0} …</ellipsis>
+		<ellipsis type="word-initial">… {0}</ellipsis>
+		<ellipsis type="word-medial">{0} … {1}</ellipsis>
+		<moreInformation>?</moreInformation>
 	</characters>
 	<delimiters>
 		<quotationStart>„</quotationStart>
@@ -1156,6 +1174,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d" draft="contributed">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E, d.</dateFormatItem>
 						<dateFormatItem id="Gy" draft="contributed">y G</dateFormatItem>
 						<dateFormatItem id="GyM" draft="contributed">M/y G</dateFormatItem>
@@ -1174,6 +1193,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM" draft="contributed">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, d. MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yyyy" draft="contributed">y G</dateFormatItem>
@@ -1456,16 +1476,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<quarters>
 					<quarterContext type="format">
 						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
+							<quarter type="1">1. čet.</quarter>
+							<quarter type="2">2. čet.</quarter>
+							<quarter type="3">3. čet.</quarter>
+							<quarter type="4">4. čet.</quarter>
 						</quarterWidth>
 						<quarterWidth type="narrow">
-							<quarter type="1" draft="contributed">1</quarter>
-							<quarter type="2" draft="contributed">2</quarter>
-							<quarter type="3" draft="contributed">3</quarter>
-							<quarter type="4" draft="contributed">4</quarter>
+							<quarter type="1">1</quarter>
+							<quarter type="2">2</quarter>
+							<quarter type="3">3</quarter>
+							<quarter type="4">4</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
 							<quarter type="1">1. četrtletje</quarter>
@@ -1476,16 +1496,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</quarterContext>
 					<quarterContext type="stand-alone">
 						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
+							<quarter type="1">1. čet.</quarter>
+							<quarter type="2">2. čet.</quarter>
+							<quarter type="3">3. čet.</quarter>
+							<quarter type="4">4. čet.</quarter>
 						</quarterWidth>
 						<quarterWidth type="narrow">
-							<quarter type="1" draft="contributed">1</quarter>
-							<quarter type="2" draft="contributed">2</quarter>
-							<quarter type="3" draft="contributed">3</quarter>
-							<quarter type="4" draft="contributed">4</quarter>
+							<quarter type="1">1</quarter>
+							<quarter type="2">2</quarter>
+							<quarter type="3">3</quarter>
+							<quarter type="4">4</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
 							<quarter type="1">1. četrtletje</quarter>
@@ -1497,28 +1517,88 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">poln.</dayPeriod>
+							<dayPeriod type="am">dop.</dayPeriod>
+							<dayPeriod type="noon">pold.</dayPeriod>
+							<dayPeriod type="pm">pop.</dayPeriod>
+							<dayPeriod type="morning1">zjut.</dayPeriod>
+							<dayPeriod type="morning2">dop.</dayPeriod>
+							<dayPeriod type="afternoon1">pop.</dayPeriod>
+							<dayPeriod type="evening1">zveč.</dayPeriod>
+							<dayPeriod type="night1">noč</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am" draft="contributed">d</dayPeriod>
-							<dayPeriod type="noon" draft="contributed">n</dayPeriod>
-							<dayPeriod type="pm" draft="contributed">p</dayPeriod>
+							<dayPeriod type="midnight">24.00</dayPeriod>
+							<dayPeriod type="am">d</dayPeriod>
+							<dayPeriod type="noon">12.00</dayPeriod>
+							<dayPeriod type="pm">p</dayPeriod>
+							<dayPeriod type="morning1">zj</dayPeriod>
+							<dayPeriod type="morning2">d</dayPeriod>
+							<dayPeriod type="afternoon1">p</dayPeriod>
+							<dayPeriod type="evening1">zv</dayPeriod>
+							<dayPeriod type="night1">po</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">polnoč</dayPeriod>
 							<dayPeriod type="am">dop.</dayPeriod>
-							<dayPeriod type="noon" draft="contributed">poldne</dayPeriod>
+							<dayPeriod type="noon">poldne</dayPeriod>
 							<dayPeriod type="pm">pop.</dayPeriod>
+							<dayPeriod type="morning1">jutro</dayPeriod>
+							<dayPeriod type="morning2">dopoldan</dayPeriod>
+							<dayPeriod type="afternoon1">popoldan</dayPeriod>
+							<dayPeriod type="evening1">večer</dayPeriod>
+							<dayPeriod type="night1">noč</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">poln.</dayPeriod>
+							<dayPeriod type="am">dop.</dayPeriod>
+							<dayPeriod type="noon">pold.</dayPeriod>
+							<dayPeriod type="pm">pop.</dayPeriod>
+							<dayPeriod type="morning1">zjut.</dayPeriod>
+							<dayPeriod type="morning2">dop.</dayPeriod>
+							<dayPeriod type="afternoon1">pop.</dayPeriod>
+							<dayPeriod type="evening1">zveč.</dayPeriod>
+							<dayPeriod type="night1">pon.</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">polnoč</dayPeriod>
+							<dayPeriod type="am">dop.</dayPeriod>
+							<dayPeriod type="noon">poldne</dayPeriod>
+							<dayPeriod type="pm">pop.</dayPeriod>
+							<dayPeriod type="morning1">zjutraj</dayPeriod>
+							<dayPeriod type="morning2">dopoldne</dayPeriod>
+							<dayPeriod type="afternoon1">popoldne</dayPeriod>
+							<dayPeriod type="evening1">zvečer</dayPeriod>
+							<dayPeriod type="night1">ponoči</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">polnoč</dayPeriod>
+							<dayPeriod type="am">dopoldne</dayPeriod>
+							<dayPeriod type="noon">poldne</dayPeriod>
+							<dayPeriod type="pm">popoldne</dayPeriod>
+							<dayPeriod type="morning1">zjutraj</dayPeriod>
+							<dayPeriod type="morning2">dopoldne</dayPeriod>
+							<dayPeriod type="afternoon1">popoldne</dayPeriod>
+							<dayPeriod type="evening1">zvečer</dayPeriod>
+							<dayPeriod type="night1">ponoči</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
-						<era type="0">pred našim štetjem</era>
+						<era type="0">pred Kristusom</era>
+						<era type="0" alt="variant">pred našim štetjem</era>
 						<era type="1">naše štetje</era>
-						<era type="1" alt="variant" draft="contributed">po n. št.</era>
+						<era type="1" alt="variant">po n. št.</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0">pr. n. št.</era>
-						<era type="1">po Kr.</era>
-						<era type="1" alt="variant" draft="contributed">po n. št.</era>
+						<era type="0">pr. Kr.</era>
+						<era type="0" alt="variant">pr. n. št.</era>
+						<era type="1">po n. št.</era>
+						<era type="1" alt="variant">n. št.</era>
 					</eraAbbr>
 				</eras>
 				<dateFormats>
@@ -1568,75 +1648,80 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="d" draft="contributed">d</dateFormatItem>
-						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
+						<dateFormatItem id="d">d.</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E, d.</dateFormatItem>
-						<dateFormatItem id="Ehm" draft="contributed">E h:mm a</dateFormatItem>
-						<dateFormatItem id="EHm" draft="contributed">E HH:mm</dateFormatItem>
-						<dateFormatItem id="Ehms" draft="contributed">E h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="EHms" draft="contributed">E HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Gy" draft="contributed">y G</dateFormatItem>
-						<dateFormatItem id="GyM" draft="contributed">M/y G</dateFormatItem>
-						<dateFormatItem id="GyMMM" draft="contributed">MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMd" draft="contributed">d. MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd" draft="contributed">E, d. MMM y G</dateFormatItem>
-						<dateFormatItem id="h" draft="contributed">h a</dateFormatItem>
-						<dateFormatItem id="H" draft="contributed">HH</dateFormatItem>
-						<dateFormatItem id="hm" draft="contributed">h:mm a</dateFormatItem>
+						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
+						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
+						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d. MMM y G</dateFormatItem>
+						<dateFormatItem id="h">h a</dateFormatItem>
+						<dateFormatItem id="H">HH</dateFormatItem>
+						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
-						<dateFormatItem id="hms" draft="contributed">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="M" draft="contributed">L</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
+						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d. M.</dateFormatItem>
-						<dateFormatItem id="MEd">E, d. MM.</dateFormatItem>
-						<dateFormatItem id="MMM" draft="contributed">LLL</dateFormatItem>
+						<dateFormatItem id="MEd">E, d. M.</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, d. MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM" draft="contributed">M/y</dateFormatItem>
+						<dateFormatItem id="yM">M/y</dateFormatItem>
 						<dateFormatItem id="yMd">d. M. y</dateFormatItem>
 						<dateFormatItem id="yMEd">E, d. M. y</dateFormatItem>
 						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMd" draft="contributed">d. MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMd">d. MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMEd">E, d. MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQQQ" draft="contributed">QQQ y</dateFormatItem>
-						<dateFormatItem id="yQQQQ" draft="contributed">QQQQ y</dateFormatItem>
+						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
+						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
 					</availableFormats>
 					<appendItems>
-						<appendItem request="Timezone" draft="contributed">{0} {1}</appendItem>
+						<appendItem request="Timezone">{0} {1}</appendItem>
 					</appendItems>
 					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatFallback>{0}–{1}</intervalFormatFallback>
 						<intervalFormatItem id="d">
 							<greatestDifference id="d">d.–d.</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
+							<greatestDifference id="a">h a–h a</greatestDifference>
 							<greatestDifference id="h">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
-							<greatestDifference id="H" draft="contributed">HH–HH</greatestDifference>
+							<greatestDifference id="H">HH–HH</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
@@ -1644,8 +1729,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hm">
-							<greatestDifference id="H" draft="contributed">HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="m" draft="contributed">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
 							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
@@ -1653,49 +1738,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H" draft="contributed">HH:mm–HH:mm v</greatestDifference>
-							<greatestDifference id="m" draft="contributed">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="H">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a">h a – h a v</greatestDifference>
 							<greatestDifference id="h">h–h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
-							<greatestDifference id="H" draft="contributed">HH–HH v</greatestDifference>
+							<greatestDifference id="H">HH–HH v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M.–M.</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d. – d. M.</greatestDifference>
-							<greatestDifference id="M">d. M. – d. M.</greatestDifference>
+							<greatestDifference id="d">d.–d. M.</greatestDifference>
+							<greatestDifference id="M">d. M.–d. M.</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, d. – E, d. M.</greatestDifference>
-							<greatestDifference id="M">E, d. M. – E, d. M.</greatestDifference>
+							<greatestDifference id="d">E, d.–E, d. M.</greatestDifference>
+							<greatestDifference id="M">E, d. M.–E, d. M.</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
 							<greatestDifference id="M">MMM–MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">d.–d. MMM</greatestDifference>
-							<greatestDifference id="M">d. MMM – d. MMM</greatestDifference>
+							<greatestDifference id="M">d. MMM–d. MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d. – E, d. MMM</greatestDifference>
-							<greatestDifference id="M">E, d. MMM – E, d. MMM</greatestDifference>
+							<greatestDifference id="d">E, d.–E, d. MMM</greatestDifference>
+							<greatestDifference id="M">E, d. MMM–E, d. MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
 							<greatestDifference id="y">y–y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
 							<greatestDifference id="M">M.–M. y</greatestDifference>
-							<greatestDifference id="y">M. y – M. y</greatestDifference>
+							<greatestDifference id="y">M. y–M. y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d. M. y – d. M. y</greatestDifference>
-							<greatestDifference id="M">d. M. – d. M. y</greatestDifference>
-							<greatestDifference id="y">d. M. y – d. M. y</greatestDifference>
+							<greatestDifference id="d">d. M. y–d. M. y</greatestDifference>
+							<greatestDifference id="M">d. M.–d. M. y</greatestDifference>
+							<greatestDifference id="y">d. M. y–d. M. y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
 							<greatestDifference id="d">E, d. – E, d. M. y</greatestDifference>
@@ -1703,22 +1788,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="y">E, d. M. y – E, d. M. y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM – MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
+							<greatestDifference id="M">MMM–MMM y</greatestDifference>
+							<greatestDifference id="y">MMM y–MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
 							<greatestDifference id="d">d.–d. MMM y</greatestDifference>
-							<greatestDifference id="M">d. MMM – d. MMM y</greatestDifference>
-							<greatestDifference id="y">d. MMM y – d. MMM y</greatestDifference>
+							<greatestDifference id="M">d. MMM–d. MMM y</greatestDifference>
+							<greatestDifference id="y">d. MMM y–d. MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d. MMM – E, d. MMM y</greatestDifference>
-							<greatestDifference id="M">E, d. MMM – E, d. MMM y</greatestDifference>
-							<greatestDifference id="y">E, d. MMM y – E, d. MMM y</greatestDifference>
+							<greatestDifference id="d">E, d. MMM–E, d. MMM y</greatestDifference>
+							<greatestDifference id="M">E, d. MMM–E, d. MMM y</greatestDifference>
+							<greatestDifference id="y">E, d. MMM y–E, d. MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M" draft="contributed">MMMM–MMMM y</greatestDifference>
-							<greatestDifference id="y" draft="contributed">MMMM y – MMMM y</greatestDifference>
+							<greatestDifference id="M">MMMM–MMMM y</greatestDifference>
+							<greatestDifference id="y">MMMM y–MMMM y</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -1726,10 +1811,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</calendars>
 		<fields>
 			<field type="era">
-				<displayName>Doba</displayName>
+				<displayName>doba</displayName>
 			</field>
 			<field type="year">
-				<displayName>Leto</displayName>
+				<displayName>leto</displayName>
 				<relative type="-1">lani</relative>
 				<relative type="0">letos</relative>
 				<relative type="1">naslednje leto</relative>
@@ -1777,7 +1862,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="quarter">
-				<displayName>Četrtletje</displayName>
+				<displayName>četrtletje</displayName>
+				<relative type="-1">zadnje četrtletje</relative>
+				<relative type="0">to četrtletje</relative>
+				<relative type="1">naslednje četrtletje</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">čez {0} četrtletje</relativeTimePattern>
 					<relativeTimePattern count="two">čez {0} četrtletji</relativeTimePattern>
@@ -1793,36 +1881,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>četrtl.</displayName>
+				<relative type="-1">zadnje četrtletje</relative>
+				<relative type="0">to četrtletje</relative>
+				<relative type="1">naslednje četrtletje</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">čez {0} četrtletje</relativeTimePattern>
-					<relativeTimePattern count="two">čez {0} četrtletji</relativeTimePattern>
-					<relativeTimePattern count="few">čez {0} četrtletja</relativeTimePattern>
-					<relativeTimePattern count="other">čez {0} četrtletja</relativeTimePattern>
+					<relativeTimePattern count="one">čez {0} četrtl.</relativeTimePattern>
+					<relativeTimePattern count="two">čez {0} četrtl.</relativeTimePattern>
+					<relativeTimePattern count="few">čez {0} četrtl.</relativeTimePattern>
+					<relativeTimePattern count="other">čez {0} četrtl.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">pred {0} četrtletjem</relativeTimePattern>
-					<relativeTimePattern count="two">pred {0} četrtletjema</relativeTimePattern>
-					<relativeTimePattern count="few">pred {0} četrtletji</relativeTimePattern>
-					<relativeTimePattern count="other">pred {0} četrtletji</relativeTimePattern>
+					<relativeTimePattern count="one">pred {0} četrtl.</relativeTimePattern>
+					<relativeTimePattern count="two">pred {0} četrtl.</relativeTimePattern>
+					<relativeTimePattern count="few">pred {0} četrtl.</relativeTimePattern>
+					<relativeTimePattern count="other">pred {0} četrtl.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-narrow">
-				<displayName>čet.</displayName>
+				<displayName>četr.</displayName>
+				<relative type="-1">zadnje četrtletje</relative>
+				<relative type="0">to četrtletje</relative>
+				<relative type="1">naslednje četrtletje</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">čez {0} četrtletje</relativeTimePattern>
-					<relativeTimePattern count="two">čez {0} četrtletji</relativeTimePattern>
-					<relativeTimePattern count="few">čez {0} četrtletja</relativeTimePattern>
-					<relativeTimePattern count="other">čez {0} četrtletij</relativeTimePattern>
+					<relativeTimePattern count="one">čez {0} četr.</relativeTimePattern>
+					<relativeTimePattern count="two">čez {0} četr.</relativeTimePattern>
+					<relativeTimePattern count="few">čez {0} četr.</relativeTimePattern>
+					<relativeTimePattern count="other">čez {0} četr.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">pred {0} četrtletjem</relativeTimePattern>
-					<relativeTimePattern count="two">pred {0} četrtletjema</relativeTimePattern>
-					<relativeTimePattern count="few">pred {0} četrtletji</relativeTimePattern>
-					<relativeTimePattern count="other">pred {0} četrtletji</relativeTimePattern>
+					<relativeTimePattern count="one">pred {0} četr.</relativeTimePattern>
+					<relativeTimePattern count="two">pred {0} četr.</relativeTimePattern>
+					<relativeTimePattern count="few">pred {0} četr.</relativeTimePattern>
+					<relativeTimePattern count="other">pred {0} četr.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month">
-				<displayName>Mesec</displayName>
+				<displayName>mesec</displayName>
 				<relative type="-1">prejšnji mesec</relative>
 				<relative type="0">ta mesec</relative>
 				<relative type="1">naslednji mesec</relative>
@@ -1842,16 +1936,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="month-short">
 				<displayName>mes.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">čez {0} mesec</relativeTimePattern>
-					<relativeTimePattern count="two">čez {0} meseca</relativeTimePattern>
+					<relativeTimePattern count="one">čez {0} mes.</relativeTimePattern>
+					<relativeTimePattern count="two">čez {0} mes.</relativeTimePattern>
 					<relativeTimePattern count="few">čez {0} mesece</relativeTimePattern>
-					<relativeTimePattern count="other">čez {0} mesece</relativeTimePattern>
+					<relativeTimePattern count="other">čez {0} mes.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">pred {0} mesecem</relativeTimePattern>
-					<relativeTimePattern count="two">pred {0} mesecema</relativeTimePattern>
-					<relativeTimePattern count="few">pred {0} meseci</relativeTimePattern>
-					<relativeTimePattern count="other">pred {0} meseci</relativeTimePattern>
+					<relativeTimePattern count="one">pred {0} mes.</relativeTimePattern>
+					<relativeTimePattern count="two">pred {0} mes.</relativeTimePattern>
+					<relativeTimePattern count="few">pred {0} mes.</relativeTimePattern>
+					<relativeTimePattern count="other">pred {0} mes.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month-narrow">
@@ -1870,7 +1964,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="week">
-				<displayName>Teden</displayName>
+				<displayName>teden</displayName>
 				<relative type="-1">prejšnji teden</relative>
 				<relative type="0">ta teden</relative>
 				<relative type="1">naslednji teden</relative>
@@ -1890,31 +1984,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="week-short">
 				<displayName>ted.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">čez {0} teden</relativeTimePattern>
-					<relativeTimePattern count="two">čez {0} tedna</relativeTimePattern>
-					<relativeTimePattern count="few">čez {0} tedne</relativeTimePattern>
-					<relativeTimePattern count="other">čez {0} tednov</relativeTimePattern>
+					<relativeTimePattern count="one">čez {0} ted.</relativeTimePattern>
+					<relativeTimePattern count="two">čez {0} ted.</relativeTimePattern>
+					<relativeTimePattern count="few">čez {0} ted.</relativeTimePattern>
+					<relativeTimePattern count="other">čez {0} ted.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">pred {0} tednom</relativeTimePattern>
-					<relativeTimePattern count="two">pred {0} tednoma</relativeTimePattern>
-					<relativeTimePattern count="few">pred {0} tedni</relativeTimePattern>
-					<relativeTimePattern count="other">pred {0} tedni</relativeTimePattern>
+					<relativeTimePattern count="one">pred {0} ted.</relativeTimePattern>
+					<relativeTimePattern count="two">pred {0} ted.</relativeTimePattern>
+					<relativeTimePattern count="few">pred {0} ted.</relativeTimePattern>
+					<relativeTimePattern count="other">pred {0} ted.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week-narrow">
 				<displayName>ted.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">čez {0} teden</relativeTimePattern>
-					<relativeTimePattern count="two">čez {0} tedna</relativeTimePattern>
-					<relativeTimePattern count="few">čez {0} tedne</relativeTimePattern>
-					<relativeTimePattern count="other">čez {0} tednov</relativeTimePattern>
+					<relativeTimePattern count="one">čez {0} ted.</relativeTimePattern>
+					<relativeTimePattern count="two">čez {0} ted.</relativeTimePattern>
+					<relativeTimePattern count="few">čez {0} ted.</relativeTimePattern>
+					<relativeTimePattern count="other">čez {0} ted.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">pred {0} tednom</relativeTimePattern>
-					<relativeTimePattern count="two">pred {0} tednoma</relativeTimePattern>
-					<relativeTimePattern count="few">pred {0} tedni</relativeTimePattern>
-					<relativeTimePattern count="other">pred {0} tedni</relativeTimePattern>
+					<relativeTimePattern count="one">pred {0} ted.</relativeTimePattern>
+					<relativeTimePattern count="two">pred {0} ted.</relativeTimePattern>
+					<relativeTimePattern count="few">pred {0} ted.</relativeTimePattern>
+					<relativeTimePattern count="other">pred {0} ted.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day">
@@ -1938,37 +2032,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day-short">
-				<displayName>Dan</displayName>
+				<displayName>dan</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">čez {0} d</relativeTimePattern>
-					<relativeTimePattern count="two">čez {0} d</relativeTimePattern>
-					<relativeTimePattern count="few">čez {0} d</relativeTimePattern>
-					<relativeTimePattern count="other">čez {0} d</relativeTimePattern>
+					<relativeTimePattern count="one">čez {0} dan</relativeTimePattern>
+					<relativeTimePattern count="two">čez {0} dneva</relativeTimePattern>
+					<relativeTimePattern count="few">čez {0} dni</relativeTimePattern>
+					<relativeTimePattern count="other">čez {0} dni</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">pred {0} d</relativeTimePattern>
-					<relativeTimePattern count="two">pred {0} d</relativeTimePattern>
-					<relativeTimePattern count="few">pred {0} d</relativeTimePattern>
-					<relativeTimePattern count="other">pred {0} d</relativeTimePattern>
+					<relativeTimePattern count="one">pred {0} dnevom</relativeTimePattern>
+					<relativeTimePattern count="two">pred {0} dnevoma</relativeTimePattern>
+					<relativeTimePattern count="few">pred {0} dnevi</relativeTimePattern>
+					<relativeTimePattern count="other">pred {0} dnevi</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day-narrow">
-				<displayName>Dan</displayName>
+				<displayName>dan</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">čez {0} dan</relativeTimePattern>
-					<relativeTimePattern count="two">čez {0} d</relativeTimePattern>
-					<relativeTimePattern count="few">čez {0} d</relativeTimePattern>
-					<relativeTimePattern count="other">čez {0} d</relativeTimePattern>
+					<relativeTimePattern count="two">čez {0} dneva</relativeTimePattern>
+					<relativeTimePattern count="few">čez {0} dni</relativeTimePattern>
+					<relativeTimePattern count="other">čez {0} dni</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">pred {0} d</relativeTimePattern>
-					<relativeTimePattern count="two">pred {0} d</relativeTimePattern>
-					<relativeTimePattern count="few">pred {0} d</relativeTimePattern>
-					<relativeTimePattern count="other">pred {0} d</relativeTimePattern>
+					<relativeTimePattern count="one">pred {0} dnevom</relativeTimePattern>
+					<relativeTimePattern count="two">pred {0} dnevoma</relativeTimePattern>
+					<relativeTimePattern count="few">pred {0} dnevi</relativeTimePattern>
+					<relativeTimePattern count="other">pred {0} dnevi</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="weekday">
-				<displayName>Dan v tednu</displayName>
+				<displayName>dan v tednu</displayName>
 			</field>
 			<field type="sun">
 				<relative type="-1">prejšnjo nedeljo</relative>
@@ -2001,111 +2095,111 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">nasl. pon.</relative>
 			</field>
 			<field type="tue">
-				<relative type="-1" draft="contributed">Prejšnji torek</relative>
-				<relative type="0" draft="contributed">Ta torek</relative>
-				<relative type="1" draft="contributed">Naslednji torek</relative>
+				<relative type="-1">prejšnji torek</relative>
+				<relative type="0">ta torek</relative>
+				<relative type="1">naslednji torek</relative>
 			</field>
 			<field type="tue-short">
-				<relative type="-1" draft="contributed">Prejšnji tor.</relative>
-				<relative type="0" draft="contributed">Ta tor.</relative>
-				<relative type="1" draft="contributed">Naslednji tor.</relative>
+				<relative type="-1">prejšnji tor.</relative>
+				<relative type="0">ta tor.</relative>
+				<relative type="1">naslednji tor.</relative>
 			</field>
 			<field type="tue-narrow">
-				<relative type="-1" draft="contributed">Prejš. tor.</relative>
-				<relative type="0" draft="contributed">Ta tor.</relative>
-				<relative type="1" draft="contributed">Nasl. tor.</relative>
+				<relative type="-1">prejš. tor.</relative>
+				<relative type="0">ta tor.</relative>
+				<relative type="1">nasl. tor.</relative>
 			</field>
 			<field type="wed">
-				<relative type="-1" draft="contributed">Prejšnjo sredo</relative>
-				<relative type="0" draft="contributed">To sredo</relative>
-				<relative type="1" draft="contributed">Naslednjo sredo</relative>
+				<relative type="-1">prejšnjo sredo</relative>
+				<relative type="0">to sredo</relative>
+				<relative type="1">naslednjo sredo</relative>
 			</field>
 			<field type="wed-short">
-				<relative type="-1" draft="contributed">Prejšnjo sr.</relative>
-				<relative type="0" draft="contributed">To sr.</relative>
-				<relative type="1" draft="contributed">Naslednjo sr.</relative>
+				<relative type="-1">prejšnjo sre.</relative>
+				<relative type="0">to sre.</relative>
+				<relative type="1">naslednjo sre.</relative>
 			</field>
 			<field type="wed-narrow">
-				<relative type="-1" draft="contributed">Prejš. sr.</relative>
-				<relative type="0" draft="contributed">To sr.</relative>
-				<relative type="1" draft="contributed">Nasl. sr.</relative>
+				<relative type="-1">prejš. sre.</relative>
+				<relative type="0">to sre.</relative>
+				<relative type="1">nasl. sre.</relative>
 			</field>
 			<field type="thu">
-				<relative type="-1" draft="contributed">Prejšnji četrtek</relative>
-				<relative type="0" draft="contributed">Ta četrtek</relative>
-				<relative type="1" draft="contributed">Naslednji četrtek</relative>
+				<relative type="-1">prejšnji četrtek</relative>
+				<relative type="0">ta četrtek</relative>
+				<relative type="1">naslednji četrtek</relative>
 			</field>
 			<field type="thu-short">
-				<relative type="-1" draft="contributed">Prejšnji čet.</relative>
-				<relative type="0" draft="contributed">Ta čet.</relative>
-				<relative type="1" draft="contributed">Naslednji čet.</relative>
+				<relative type="-1">prejšnji čet.</relative>
+				<relative type="0">ta čet.</relative>
+				<relative type="1">naslednji čet.</relative>
 			</field>
 			<field type="thu-narrow">
-				<relative type="-1" draft="contributed">Prejš. čet.</relative>
-				<relative type="0" draft="contributed">Ta čet.</relative>
-				<relative type="1" draft="contributed">Nasl. čet.</relative>
+				<relative type="-1">prejš. čet.</relative>
+				<relative type="0">ta čet.</relative>
+				<relative type="1">nasl. čet.</relative>
 			</field>
 			<field type="fri">
-				<relative type="-1" draft="contributed">Prejšnji petek</relative>
-				<relative type="0" draft="contributed">Ta petek</relative>
-				<relative type="1" draft="contributed">Naslednji petek</relative>
+				<relative type="-1">prejšnji petek</relative>
+				<relative type="0">ta petek</relative>
+				<relative type="1">naslednji petek</relative>
 			</field>
 			<field type="fri-short">
-				<relative type="-1" draft="contributed">Prejšnji pet.</relative>
-				<relative type="0" draft="contributed">Ta pet.</relative>
-				<relative type="1" draft="contributed">Naslednji pet.</relative>
+				<relative type="-1">prejšnji pet.</relative>
+				<relative type="0">ta pet.</relative>
+				<relative type="1">naslednji pet.</relative>
 			</field>
 			<field type="fri-narrow">
-				<relative type="-1" draft="contributed">Prejš. pet.</relative>
-				<relative type="0" draft="contributed">Ta pet.</relative>
-				<relative type="1" draft="contributed">Nasl. pet.</relative>
+				<relative type="-1">prejš. pet.</relative>
+				<relative type="0">ta pet.</relative>
+				<relative type="1">nasl. pet.</relative>
 			</field>
 			<field type="sat">
-				<relative type="-1" draft="contributed">Prejšnjo soboto</relative>
-				<relative type="0" draft="contributed">To soboto</relative>
-				<relative type="1" draft="contributed">Naslednjo soboto</relative>
+				<relative type="-1">prejšnjo soboto</relative>
+				<relative type="0">to soboto</relative>
+				<relative type="1">naslednjo soboto</relative>
 			</field>
 			<field type="sat-short">
-				<relative type="-1" draft="contributed">Prejšnjo sob.</relative>
-				<relative type="0" draft="contributed">To sob.</relative>
-				<relative type="1" draft="contributed">Naslednjo sob.</relative>
+				<relative type="-1">prejšnjo sob.</relative>
+				<relative type="0">to sob.</relative>
+				<relative type="1">naslednjo sob.</relative>
 			</field>
 			<field type="sat-narrow">
-				<relative type="-1" draft="contributed">Prejš. sob.</relative>
-				<relative type="0" draft="contributed">To sob.</relative>
-				<relative type="1" draft="contributed">Nasl. sob.</relative>
+				<relative type="-1">prejš. sob.</relative>
+				<relative type="0">to sob.</relative>
+				<relative type="1">nasl. sob.</relative>
 			</field>
 			<field type="dayperiod">
 				<displayName>Čas dneva</displayName>
 			</field>
 			<field type="hour">
-				<displayName>Ura</displayName>
+				<displayName>ura</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">čez {0} h</relativeTimePattern>
-					<relativeTimePattern count="two">čez {0} h</relativeTimePattern>
-					<relativeTimePattern count="few">čez {0} h</relativeTimePattern>
-					<relativeTimePattern count="other">čez {0} h</relativeTimePattern>
+					<relativeTimePattern count="one">čez {0} uro</relativeTimePattern>
+					<relativeTimePattern count="two">čez {0} uri</relativeTimePattern>
+					<relativeTimePattern count="few">čez {0} ure</relativeTimePattern>
+					<relativeTimePattern count="other">čez {0} ur</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">pred {0} h</relativeTimePattern>
-					<relativeTimePattern count="two">pred {0} h</relativeTimePattern>
-					<relativeTimePattern count="few">pred {0} h</relativeTimePattern>
-					<relativeTimePattern count="other">pred {0} h</relativeTimePattern>
+					<relativeTimePattern count="one">pred {0} uro</relativeTimePattern>
+					<relativeTimePattern count="two">pred {0} urama</relativeTimePattern>
+					<relativeTimePattern count="few">pred {0} urami</relativeTimePattern>
+					<relativeTimePattern count="other">pred {0} urami</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-short">
 				<displayName>ura</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">čez {0} h</relativeTimePattern>
-					<relativeTimePattern count="two">čez {0} h</relativeTimePattern>
-					<relativeTimePattern count="few">čez {0} h</relativeTimePattern>
-					<relativeTimePattern count="other">čez {0} h</relativeTimePattern>
+					<relativeTimePattern count="one">čez {0} uro</relativeTimePattern>
+					<relativeTimePattern count="two">čez {0} uri</relativeTimePattern>
+					<relativeTimePattern count="few">čez {0} ure</relativeTimePattern>
+					<relativeTimePattern count="other">čez {0} ur</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">pred {0} h</relativeTimePattern>
-					<relativeTimePattern count="two">pred {0} h</relativeTimePattern>
-					<relativeTimePattern count="few">pred {0} h</relativeTimePattern>
-					<relativeTimePattern count="other">pred {0} h</relativeTimePattern>
+					<relativeTimePattern count="one">pred {0} uro</relativeTimePattern>
+					<relativeTimePattern count="two">pred {0} urama</relativeTimePattern>
+					<relativeTimePattern count="few">pred {0} urami</relativeTimePattern>
+					<relativeTimePattern count="other">pred {0} urami</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-narrow">
@@ -2124,7 +2218,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="minute">
-				<displayName>Minuta</displayName>
+				<displayName>minuta</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">čez {0} minuto</relativeTimePattern>
+					<relativeTimePattern count="two">čez {0} minuti</relativeTimePattern>
+					<relativeTimePattern count="few">čez {0} minute</relativeTimePattern>
+					<relativeTimePattern count="other">čez {0} minut</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">pred {0} minuto</relativeTimePattern>
+					<relativeTimePattern count="two">pred {0} minutama</relativeTimePattern>
+					<relativeTimePattern count="few">pred {0} minutami</relativeTimePattern>
+					<relativeTimePattern count="other">pred {0} minutami</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-short">
+				<displayName>min.</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">čez {0} min.</relativeTimePattern>
 					<relativeTimePattern count="two">čez {0} min.</relativeTimePattern>
@@ -2138,23 +2247,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">pred {0} min.</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="minute-short">
-				<displayName>min.</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">čez {0} min</relativeTimePattern>
-					<relativeTimePattern count="two">čez {0} min</relativeTimePattern>
-					<relativeTimePattern count="few">čez {0} min</relativeTimePattern>
-					<relativeTimePattern count="other">čez {0} min</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">pred {0} min</relativeTimePattern>
-					<relativeTimePattern count="two">pred {0} min</relativeTimePattern>
-					<relativeTimePattern count="few">pred {0} min</relativeTimePattern>
-					<relativeTimePattern count="other">pred {0} min</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="minute-narrow">
-				<displayName>min.</displayName>
+				<displayName>min</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">čez {0} min</relativeTimePattern>
 					<relativeTimePattern count="two">čez {0} min</relativeTimePattern>
@@ -2169,7 +2263,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="second">
-				<displayName>Sekunda</displayName>
+				<displayName>sekunda</displayName>
 				<relative type="0">zdaj</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">čez {0} sekundo</relativeTimePattern>
@@ -2215,19 +2309,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>Časovni pas</displayName>
+				<displayName>časovni pas</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
+			<hourFormat>+HH.mm;-HH.mm</hourFormat>
 			<gmtFormat>GMT{0}</gmtFormat>
 			<gmtZeroFormat draft="contributed">GMT</gmtZeroFormat>
 			<regionFormat draft="contributed">{0} čas</regionFormat>
-			<regionFormat type="daylight" draft="contributed">{0} (+1)</regionFormat>
-			<regionFormat type="standard" draft="contributed">{0} (+0)</regionFormat>
+			<regionFormat type="daylight">{0} poletni čas</regionFormat>
+			<regionFormat type="standard">{0} standardni čas</regionFormat>
 			<fallbackFormat>{1} ({0})</fallbackFormat>
 			<zone type="Etc/Unknown">
-				<exemplarCity>neznano</exemplarCity>
+				<exemplarCity>neznano mesto</exemplarCity>
 			</zone>
 			<zone type="Europe/Andorra">
 				<exemplarCity draft="contributed">Andora</exemplarCity>
@@ -2795,7 +2889,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</zone>
 			<zone type="Europe/Dublin">
 				<long>
-					<daylight draft="contributed">irski poletni čas</daylight>
+					<daylight>irski standardni čas</daylight>
 				</long>
 				<exemplarCity draft="contributed">Dublin</exemplarCity>
 			</zone>
@@ -3093,6 +3187,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity draft="contributed">Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity draft="contributed">Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity draft="contributed">Manila</exemplarCity>
 			</zone>
@@ -3177,6 +3274,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity draft="contributed">Irkutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity draft="contributed">Chita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Jakutsk</exemplarCity>
 			</zone>
@@ -3195,6 +3295,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity draft="contributed">Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity draft="contributed">Srednekolymsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamčatka</exemplarCity>
 			</zone>
@@ -4385,7 +4488,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<plusSign>+</plusSign>
 			<minusSign>-</minusSign>
 			<exponential>e</exponential>
-			<superscriptingExponent draft="contributed">×</superscriptingExponent>
+			<superscriptingExponent>×</superscriptingExponent>
 			<perMille>‰</perMille>
 			<infinity>∞</infinity>
 			<nan>NaN</nan>
@@ -4435,18 +4538,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern type="100000000000" count="two" draft="contributed">000 milijardi</pattern>
 					<pattern type="100000000000" count="few" draft="contributed">000 milijarde</pattern>
 					<pattern type="100000000000" count="other" draft="contributed">000 milijard</pattern>
-					<pattern type="1000000000000" count="one" draft="contributed">0 bilijon</pattern>
-					<pattern type="1000000000000" count="two" draft="contributed">0 bilijona</pattern>
-					<pattern type="1000000000000" count="few" draft="contributed">0 bilijoni</pattern>
-					<pattern type="1000000000000" count="other" draft="contributed">0 bilijonov</pattern>
-					<pattern type="10000000000000" count="one" draft="contributed">00 bilijon</pattern>
-					<pattern type="10000000000000" count="two" draft="contributed">00 bilijona</pattern>
-					<pattern type="10000000000000" count="few" draft="contributed">00 bilijoni</pattern>
-					<pattern type="10000000000000" count="other" draft="contributed">00 bilijonov</pattern>
-					<pattern type="100000000000000" count="one" draft="contributed">000 bilijon</pattern>
-					<pattern type="100000000000000" count="two" draft="contributed">000 bilijona</pattern>
-					<pattern type="100000000000000" count="few" draft="contributed">000 bilijoni(</pattern>
-					<pattern type="100000000000000" count="other" draft="contributed">000 bilijonov</pattern>
+					<pattern type="1000000000000" count="one">0 bilijon</pattern>
+					<pattern type="1000000000000" count="two">0 bilijona</pattern>
+					<pattern type="1000000000000" count="few">0 bilijoni</pattern>
+					<pattern type="1000000000000" count="other">0 bilijonov</pattern>
+					<pattern type="10000000000000" count="one">00 bilijon</pattern>
+					<pattern type="10000000000000" count="two">00 bilijona</pattern>
+					<pattern type="10000000000000" count="few">00 bilijoni</pattern>
+					<pattern type="10000000000000" count="other">00 bilijonov</pattern>
+					<pattern type="100000000000000" count="one">000 bilijon</pattern>
+					<pattern type="100000000000000" count="two">000 bilijona</pattern>
+					<pattern type="100000000000000" count="few">000 bilijoni</pattern>
+					<pattern type="100000000000000" count="other">000 bilijonov</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
 			<decimalFormatLength type="short">
@@ -4463,30 +4566,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern type="100000" count="two" draft="contributed">000 tis'.'</pattern>
 					<pattern type="100000" count="few" draft="contributed">000 tis'.'</pattern>
 					<pattern type="100000" count="other" draft="contributed">000 tis'.'</pattern>
-					<pattern type="1000000" count="one" draft="contributed">0 mio'.'</pattern>
-					<pattern type="1000000" count="two" draft="contributed">0 mio'.'</pattern>
-					<pattern type="1000000" count="few" draft="contributed">0 mio'.'</pattern>
-					<pattern type="1000000" count="other" draft="contributed">0 mio'.'</pattern>
-					<pattern type="10000000" count="one" draft="contributed">00 mio'.'</pattern>
-					<pattern type="10000000" count="two" draft="contributed">00 mio'.'</pattern>
-					<pattern type="10000000" count="few" draft="contributed">00 mio'.'</pattern>
-					<pattern type="10000000" count="other" draft="contributed">00 mio'.'</pattern>
-					<pattern type="100000000" count="one" draft="contributed">000 mio'.'</pattern>
-					<pattern type="100000000" count="two" draft="contributed">000 mio'.'</pattern>
-					<pattern type="100000000" count="few" draft="contributed">000 mio'.'</pattern>
-					<pattern type="100000000" count="other" draft="contributed">000 mio'.'</pattern>
-					<pattern type="1000000000" count="one" draft="contributed">0 mrd'.'</pattern>
-					<pattern type="1000000000" count="two" draft="contributed">0 mrd'.'</pattern>
-					<pattern type="1000000000" count="few" draft="contributed">0 mrd'.'</pattern>
-					<pattern type="1000000000" count="other" draft="contributed">0 mrd'.'</pattern>
-					<pattern type="10000000000" count="one" draft="contributed">00 mrd'.'</pattern>
-					<pattern type="10000000000" count="two" draft="contributed">00 mrd'.'</pattern>
-					<pattern type="10000000000" count="few" draft="contributed">00 mrd'.'</pattern>
-					<pattern type="10000000000" count="other" draft="contributed">00 mrd'.'</pattern>
-					<pattern type="100000000000" count="one" draft="contributed">000 mrd'.'</pattern>
-					<pattern type="100000000000" count="two" draft="contributed">000 mrd'.'</pattern>
-					<pattern type="100000000000" count="few" draft="contributed">000 mrd'.'</pattern>
-					<pattern type="100000000000" count="other" draft="contributed">000 mrd'.'</pattern>
+					<pattern type="1000000" count="one">0 mio'.'</pattern>
+					<pattern type="1000000" count="two">0 mio'.'</pattern>
+					<pattern type="1000000" count="few">0 mio'.'</pattern>
+					<pattern type="1000000" count="other">0 mio'.'</pattern>
+					<pattern type="10000000" count="one">00 mio'.'</pattern>
+					<pattern type="10000000" count="two">00 mio'.'</pattern>
+					<pattern type="10000000" count="few">00 mio'.'</pattern>
+					<pattern type="10000000" count="other">00 mio'.'</pattern>
+					<pattern type="100000000" count="one">000 mio'.'</pattern>
+					<pattern type="100000000" count="two">000 mio'.'</pattern>
+					<pattern type="100000000" count="few">000 mio'.'</pattern>
+					<pattern type="100000000" count="other">000 mio'.'</pattern>
+					<pattern type="1000000000" count="one">0 mrd'.'</pattern>
+					<pattern type="1000000000" count="two">0 mrd'.'</pattern>
+					<pattern type="1000000000" count="few">0 mrd'.'</pattern>
+					<pattern type="1000000000" count="other">0 mrd'.'</pattern>
+					<pattern type="10000000000" count="one">00 mrd'.'</pattern>
+					<pattern type="10000000000" count="two">00 mrd'.'</pattern>
+					<pattern type="10000000000" count="few">00 mrd'.'</pattern>
+					<pattern type="10000000000" count="other">00 mrd'.'</pattern>
+					<pattern type="100000000000" count="one">000 mrd'.'</pattern>
+					<pattern type="100000000000" count="two">000 mrd'.'</pattern>
+					<pattern type="100000000000" count="few">000 mrd'.'</pattern>
+					<pattern type="100000000000" count="other">000 mrd'.'</pattern>
 					<pattern type="1000000000000" count="one" draft="contributed">0 bil'.'</pattern>
 					<pattern type="1000000000000" count="two" draft="contributed">0 bil'.'</pattern>
 					<pattern type="1000000000000" count="few" draft="contributed">0 bil'.'</pattern>
@@ -4522,13 +4625,65 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern draft="contributed">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
-			<unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
-			<unitPattern count="two" draft="contributed">{0} {1}</unitPattern>
-			<unitPattern count="few" draft="contributed">{0} {1}</unitPattern>
-			<unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="contributed">0 tis'.' ¤</pattern>
+					<pattern type="1000" count="two" draft="contributed">0 tis'.' ¤</pattern>
+					<pattern type="1000" count="few" draft="contributed">0 tis'.' ¤</pattern>
+					<pattern type="1000" count="other" draft="contributed">0 tis'.' ¤</pattern>
+					<pattern type="10000" count="one" draft="contributed">00 tis'.' ¤</pattern>
+					<pattern type="10000" count="two" draft="contributed">00 tis'.' ¤</pattern>
+					<pattern type="10000" count="few" draft="contributed">00 tis'.' ¤</pattern>
+					<pattern type="10000" count="other" draft="contributed">00 tis'.' ¤</pattern>
+					<pattern type="100000" count="one" draft="contributed">000 tis'.' ¤</pattern>
+					<pattern type="100000" count="two" draft="contributed">000 tis'.' ¤</pattern>
+					<pattern type="100000" count="few" draft="contributed">000 tis'.' ¤</pattern>
+					<pattern type="100000" count="other" draft="contributed">000 tis'.' ¤</pattern>
+					<pattern type="1000000" count="one" draft="contributed">0 mio'.' ¤</pattern>
+					<pattern type="1000000" count="two" draft="contributed">0 mio'.' ¤</pattern>
+					<pattern type="1000000" count="few" draft="contributed">0 mio'.' ¤</pattern>
+					<pattern type="1000000" count="other" draft="contributed">0 mio'.' ¤</pattern>
+					<pattern type="10000000" count="one" draft="contributed">00 mio'.' ¤</pattern>
+					<pattern type="10000000" count="two" draft="contributed">00 mio'.' ¤</pattern>
+					<pattern type="10000000" count="few" draft="contributed">00 mio'.' ¤</pattern>
+					<pattern type="10000000" count="other" draft="contributed">00 mio'.' ¤</pattern>
+					<pattern type="100000000" count="one" draft="contributed">000 mio'.' ¤</pattern>
+					<pattern type="100000000" count="two" draft="contributed">000 mio'.' ¤</pattern>
+					<pattern type="100000000" count="few" draft="contributed">000 mio'.' ¤</pattern>
+					<pattern type="100000000" count="other" draft="contributed">000 mio'.' ¤</pattern>
+					<pattern type="1000000000" count="one" draft="contributed">0 mrd'.' ¤</pattern>
+					<pattern type="1000000000" count="two" draft="contributed">0 mrd'.' ¤</pattern>
+					<pattern type="1000000000" count="few" draft="contributed">0 mrd'.' ¤</pattern>
+					<pattern type="1000000000" count="other" draft="contributed">0 mrd'.' ¤</pattern>
+					<pattern type="10000000000" count="one" draft="contributed">00 mrd'.' ¤</pattern>
+					<pattern type="10000000000" count="two" draft="contributed">00 mrd'.' ¤</pattern>
+					<pattern type="10000000000" count="few" draft="contributed">00 mrd'.' ¤</pattern>
+					<pattern type="10000000000" count="other" draft="contributed">00 mrd'.' ¤</pattern>
+					<pattern type="100000000000" count="one" draft="contributed">000 mrd'.' ¤</pattern>
+					<pattern type="100000000000" count="two" draft="contributed">000 mrd'.' ¤</pattern>
+					<pattern type="100000000000" count="few" draft="contributed">000 mrd'.' ¤</pattern>
+					<pattern type="100000000000" count="other" draft="contributed">000 mrd'.' ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="contributed">0 bil'.' ¤</pattern>
+					<pattern type="1000000000000" count="two" draft="contributed">0 bil'.' ¤</pattern>
+					<pattern type="1000000000000" count="few" draft="contributed">0 bil'.' ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="contributed">0 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="contributed">00 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="two" draft="contributed">00 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="few" draft="contributed">00 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="contributed">00 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="contributed">000 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="two" draft="contributed">000 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="few" draft="contributed">000 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="contributed">000 bil'.' ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<unitPattern count="one">{0} {1}</unitPattern>
+			<unitPattern count="two">{0} {1}</unitPattern>
+			<unitPattern count="few">{0} {1}</unitPattern>
+			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencies>
 			<currency type="ADP">
@@ -4537,9 +4692,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="AED">
 				<displayName>dirham Združenih arabskih emiratov</displayName>
 				<displayName count="one">dirham Združenih arabskih emiratov</displayName>
-				<displayName count="two">dirham Združenih arabskih emiratov</displayName>
-				<displayName count="few">dirham Združenih arabskih emiratov</displayName>
-				<displayName count="other">dirham Združenih arabskih emiratov</displayName>
+				<displayName count="two">dirhama Združenih arabskih emiratov</displayName>
+				<displayName count="few">dirhami Združenih arabskih emiratov</displayName>
+				<displayName count="other">dirhamov Združenih arabskih emiratov</displayName>
 				<symbol draft="contributed">AED</symbol>
 			</currency>
 			<currency type="AFA">
@@ -4556,8 +4711,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="ALL">
 				<displayName>albanski lek</displayName>
 				<displayName count="one">albanski lek</displayName>
-				<displayName count="two">albanski lek</displayName>
-				<displayName count="few">albanski lek</displayName>
+				<displayName count="two">albanska leka</displayName>
+				<displayName count="few">albanski leki</displayName>
 				<displayName count="other">albanski lek</displayName>
 				<symbol draft="contributed">ALL</symbol>
 			</currency>
@@ -4565,25 +4720,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>armenski dram</displayName>
 				<displayName count="one">armenski dram</displayName>
 				<displayName count="two">armenski dram</displayName>
-				<displayName count="few">armenski dram</displayName>
-				<displayName count="other">armenski dram</displayName>
+				<displayName count="few">armenski drami</displayName>
+				<displayName count="other">armenskih dramov</displayName>
 				<symbol draft="contributed">AMD</symbol>
 			</currency>
 			<currency type="ANG">
 				<displayName>nizozemsko-antilski gulden</displayName>
 				<displayName count="one">nizozemsko-antilski gulden</displayName>
-				<displayName count="two">nizozemsko-antilski gulden</displayName>
-				<displayName count="few">nizozemsko-antilski gulden</displayName>
-				<displayName count="other">nizozemsko-antilski gulden</displayName>
+				<displayName count="two">nizozemsko-antilska guldna</displayName>
+				<displayName count="few">nizozemsko-antilski guldni</displayName>
+				<displayName count="other">nizozemsko-antilskih guldnov</displayName>
 				<symbol draft="contributed">ANG</symbol>
 			</currency>
 			<currency type="AOA">
 				<displayName>angolska kvanza</displayName>
 				<displayName count="one">angolska kvanza</displayName>
-				<displayName count="two">angolska kvanza</displayName>
-				<displayName count="few">angolska kvanza</displayName>
-				<displayName count="other">angolska kvanza</displayName>
+				<displayName count="two">angolski kvanzi</displayName>
+				<displayName count="few">angolske kvanze</displayName>
+				<displayName count="other">angolskih kvanz</displayName>
 				<symbol draft="contributed">AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>stara angolska kvanza (1977–1990)</displayName>
@@ -4603,8 +4759,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="ARS">
 				<displayName>argentinski peso</displayName>
 				<displayName count="one">argentinski peso</displayName>
-				<displayName count="two">argentinski peso</displayName>
-				<displayName count="few">argentinski peso</displayName>
+				<displayName count="two">argentinska pesa</displayName>
+				<displayName count="few">argentinski pesi</displayName>
 				<displayName count="other">argentinski peso</displayName>
 				<symbol draft="contributed">ARS</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
@@ -4635,9 +4791,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="AZN">
 				<displayName>azerbajdžanski manat</displayName>
 				<displayName count="one">azerbajdžanski manat</displayName>
-				<displayName count="two">azerbajdžanski manat</displayName>
-				<displayName count="few">azerbajdžanski manat</displayName>
-				<displayName count="other">azerbajdžanski manat</displayName>
+				<displayName count="two">azerbajdžanska manata</displayName>
+				<displayName count="few">azerbajdžanski manati</displayName>
+				<displayName count="other">azerbajdžanskih manatov</displayName>
 				<symbol draft="contributed">AZN</symbol>
 			</currency>
 			<currency type="BAD">
@@ -4650,22 +4806,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few" draft="contributed">bosansko-hercegovske konvertibilne marke</displayName>
 				<displayName count="other" draft="contributed">bosansko-hercegovskih konvertibilnih mark</displayName>
 				<symbol draft="contributed">BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>barbadoški dolar</displayName>
 				<displayName count="one">barbadoški dolar</displayName>
-				<displayName count="two">barbadoški dolar</displayName>
-				<displayName count="few">barbadoški dolar</displayName>
-				<displayName count="other">barbadoški dolar</displayName>
+				<displayName count="two">barbadoška dolarja</displayName>
+				<displayName count="few">barbadoški dolarji</displayName>
+				<displayName count="other">barbadoških dolarjev</displayName>
 				<symbol draft="contributed">BBD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BDT">
 				<displayName>bangladeška taka</displayName>
 				<displayName count="one">bangladeška taka</displayName>
-				<displayName count="two">bangladeška taka</displayName>
-				<displayName count="few">bangladeška taka</displayName>
-				<displayName count="other">bangladeška taka</displayName>
+				<displayName count="two">bangladeški taki</displayName>
+				<displayName count="few">bangladeške take</displayName>
+				<displayName count="other">bangladeških tak</displayName>
 				<symbol draft="contributed">BDT</symbol>
 				<symbol alt="narrow" draft="contributed">৳</symbol>
 			</currency>
@@ -4688,9 +4845,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="BGN">
 				<displayName>bolgarski lev</displayName>
 				<displayName count="one">bolgarski lev</displayName>
-				<displayName count="two">bolgarski lev</displayName>
-				<displayName count="few">bolgarski lev</displayName>
-				<displayName count="other">bolgarski lev</displayName>
+				<displayName count="two">bolgarska leva</displayName>
+				<displayName count="few">bolgarski levi</displayName>
+				<displayName count="other">bolgarskih levov</displayName>
 				<symbol draft="contributed">BGN</symbol>
 			</currency>
 			<currency type="BHD">
@@ -4704,36 +4861,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="BIF">
 				<displayName>burundski frank</displayName>
 				<displayName count="one">burundski frank</displayName>
-				<displayName count="two">burundski frank</displayName>
-				<displayName count="few">burundski frank</displayName>
-				<displayName count="other">burundski frank</displayName>
+				<displayName count="two">burundska franka</displayName>
+				<displayName count="few">burundski franki</displayName>
+				<displayName count="other">burundskih frankov</displayName>
 				<symbol draft="contributed">BIF</symbol>
 			</currency>
 			<currency type="BMD">
 				<displayName>bermudski dolar</displayName>
 				<displayName count="one">bermudski dolar</displayName>
-				<displayName count="two">bermudski dolar</displayName>
-				<displayName count="few">bermudski dolar</displayName>
-				<displayName count="other">bermudski dolar</displayName>
+				<displayName count="two">bermudska dolarja</displayName>
+				<displayName count="few">bermudski dolarji</displayName>
+				<displayName count="other">bermudskih dolarjev</displayName>
 				<symbol draft="contributed">BMD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BND">
 				<displayName>brunejski dolar</displayName>
 				<displayName count="one">brunejski dolar</displayName>
-				<displayName count="two">brunejski dolar</displayName>
-				<displayName count="few">brunejski dolar</displayName>
-				<displayName count="other">brunejski dolar</displayName>
+				<displayName count="two">brunejska dolarja</displayName>
+				<displayName count="few">brunejski dolarji</displayName>
+				<displayName count="other">brunejskih dolarjev</displayName>
 				<symbol draft="contributed">BND</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BOB">
 				<displayName>bolivijski boliviano</displayName>
 				<displayName count="one">bolivijski boliviano</displayName>
-				<displayName count="two">bolivijski boliviano</displayName>
-				<displayName count="few">bolivijski boliviano</displayName>
-				<displayName count="other">bolivijski boliviano</displayName>
+				<displayName count="two">bolivijska boliviana</displayName>
+				<displayName count="few">bolivijski boliviani</displayName>
+				<displayName count="other">bolivijskih bolivianov</displayName>
 				<symbol draft="contributed">BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOP">
 				<displayName>bolivijski peso</displayName>
@@ -4753,9 +4911,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="BRL">
 				<displayName>brazilski real</displayName>
 				<displayName count="one">brazilski real</displayName>
-				<displayName count="two">brazilski real</displayName>
-				<displayName count="few">brazilski real</displayName>
-				<displayName count="other">brazilski real</displayName>
+				<displayName count="two">brazilska reala</displayName>
+				<displayName count="few">brazilski reali</displayName>
+				<displayName count="other">brazilskih realov</displayName>
 				<symbol draft="contributed">R$</symbol>
 				<symbol alt="narrow" draft="contributed">R$</symbol>
 			</currency>
@@ -4768,18 +4926,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="BSD">
 				<displayName>bahamski dolar</displayName>
 				<displayName count="one">bahamski dolar</displayName>
-				<displayName count="two">bahamski dolar</displayName>
-				<displayName count="few">bahamski dolar</displayName>
-				<displayName count="other">bahamski dolar</displayName>
+				<displayName count="two">bahamska dolarja</displayName>
+				<displayName count="few">bahamski dolarji</displayName>
+				<displayName count="other">bahamskih dolarjev</displayName>
 				<symbol draft="contributed">BSD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BTN">
 				<displayName>butanski ngultrum</displayName>
 				<displayName count="one">butanski ngultrum</displayName>
-				<displayName count="two">butanski ngultrum</displayName>
-				<displayName count="few">butanski ngultrum</displayName>
-				<displayName count="other">butanski ngultrum</displayName>
+				<displayName count="two">butanska ngultruma</displayName>
+				<displayName count="few">butanski ngultrumi</displayName>
+				<displayName count="other">butanskih ngultrumov</displayName>
 				<symbol draft="contributed">BTN</symbol>
 			</currency>
 			<currency type="BUK">
@@ -4788,10 +4946,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="BWP">
 				<displayName>bocvanska pula</displayName>
 				<displayName count="one">bocvanska pula</displayName>
-				<displayName count="two">bocvanska pula</displayName>
-				<displayName count="few">bocvanska pula</displayName>
-				<displayName count="other">bocvanska pula</displayName>
+				<displayName count="two">bocvanski puli</displayName>
+				<displayName count="few">bocvanske pule</displayName>
+				<displayName count="other">bocvanskih pul</displayName>
 				<symbol draft="contributed">BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>beloruski novi rubelj (1994–1999)</displayName>
@@ -4799,34 +4958,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="BYR">
 				<displayName>beloruski rubelj</displayName>
 				<displayName count="one">beloruski rubelj</displayName>
-				<displayName count="two">beloruski rubelj</displayName>
-				<displayName count="few">beloruski rubelj</displayName>
-				<displayName count="other">beloruski rubelj</displayName>
+				<displayName count="two">beloruska rublja</displayName>
+				<displayName count="few">beloruski rublji</displayName>
+				<displayName count="other">beloruskih rubljev</displayName>
 				<symbol draft="contributed">BYR</symbol>
 				<symbol alt="narrow" draft="contributed">р.</symbol>
 			</currency>
 			<currency type="BZD">
 				<displayName>belizejski dolar</displayName>
 				<displayName count="one">belizejski dolar</displayName>
-				<displayName count="two">belizejski dolar</displayName>
-				<displayName count="few">belizejski dolar</displayName>
-				<displayName count="other">belizejski dolar</displayName>
+				<displayName count="two">belizejska dolarja</displayName>
+				<displayName count="few">belizejski dolarji</displayName>
+				<displayName count="other">belizejskih dolarjev</displayName>
 				<symbol draft="contributed">BZD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CAD">
 				<displayName>kanadski dolar</displayName>
 				<displayName count="one">kanadski dolar</displayName>
-				<displayName count="two">kanadski dolar</displayName>
-				<displayName count="few">kanadski dolar</displayName>
-				<displayName count="other">kanadski dolar</displayName>
+				<displayName count="two">kanadska dolarja</displayName>
+				<displayName count="few">kanadski dolarji</displayName>
+				<displayName count="other">kanadskih dolarjev</displayName>
 				<symbol draft="contributed">CAD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CDF">
 				<displayName>kongoški frank</displayName>
 				<displayName count="one">kongoški frank</displayName>
-				<displayName count="two">kongoški frank</displayName>
+				<displayName count="two">kongoška franka</displayName>
 				<displayName count="few">kongoški frank</displayName>
 				<displayName count="other">kongoški frank</displayName>
 				<symbol draft="contributed">CDF</symbol>
@@ -4837,9 +4996,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="CHF">
 				<displayName>švicarski frank</displayName>
 				<displayName count="one">švicarski frank</displayName>
-				<displayName count="two">švicarski frank</displayName>
-				<displayName count="few">švicarski frank</displayName>
-				<displayName count="other">švicarski frank</displayName>
+				<displayName count="two">švicarska franka</displayName>
+				<displayName count="few">švicarski franki</displayName>
+				<displayName count="other">švicarskih frankov</displayName>
 				<symbol draft="contributed">CHF</symbol>
 			</currency>
 			<currency type="CHW">
@@ -4851,14 +5010,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="CLP">
 				<displayName>čilski peso</displayName>
 				<displayName count="one">čilski peso</displayName>
-				<displayName count="two">čilski peso</displayName>
-				<displayName count="few">čilski peso</displayName>
-				<displayName count="other">čilski peso</displayName>
+				<displayName count="two">čilska pesa</displayName>
+				<displayName count="few">čilski pesi</displayName>
+				<displayName count="other">čilskih pesov</displayName>
 				<symbol draft="contributed">CLP</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CNY">
-				<displayName>kitajski juan renminbi</displayName>
+				<displayName>kitajski juan</displayName>
 				<displayName count="one">kitajski juan renminbi</displayName>
 				<displayName count="two">kitajski juan renminbi</displayName>
 				<displayName count="few">kitajski juan renminbi</displayName>
@@ -4869,9 +5028,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="COP">
 				<displayName>kolumbijski peso</displayName>
 				<displayName count="one">kolumbijski peso</displayName>
-				<displayName count="two">kolumbijski peso</displayName>
-				<displayName count="few">kolumbijski peso</displayName>
-				<displayName count="other">kolumbijski peso</displayName>
+				<displayName count="two">kolumbijska pesa</displayName>
+				<displayName count="few">kolumbijski pesi</displayName>
+				<displayName count="other">kolumbijskih pesov</displayName>
 				<symbol draft="contributed">COP</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -4881,9 +5040,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="CRC">
 				<displayName>kostariški kolon</displayName>
 				<displayName count="one">kostariški kolon</displayName>
-				<displayName count="two">kostariški kolon</displayName>
-				<displayName count="few">kostariški kolon</displayName>
-				<displayName count="other">kostariški kolon</displayName>
+				<displayName count="two">kostariška kolona</displayName>
+				<displayName count="few">kostariški koloni</displayName>
+				<displayName count="other">kostariških kolonov</displayName>
 				<symbol draft="contributed">CRC</symbol>
 				<symbol alt="narrow" draft="contributed">₡</symbol>
 			</currency>
@@ -4896,26 +5055,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="CUC">
 				<displayName>kubanski konvertibilni peso</displayName>
 				<displayName count="one">kubanski konvertibilni peso</displayName>
-				<displayName count="two">kubanski konvertibilni peso</displayName>
-				<displayName count="few">kubanski konvertibilni peso</displayName>
-				<displayName count="other">kubanski konvertibilni peso</displayName>
+				<displayName count="two">kubanska konvertibilna pesa</displayName>
+				<displayName count="few">kubanski konvertibilni pesi</displayName>
+				<displayName count="other">kubanskih konvertibilnih pesov</displayName>
 				<symbol draft="contributed">CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>kubanski peso</displayName>
 				<displayName count="one">kubanski peso</displayName>
-				<displayName count="two">kubanski peso</displayName>
-				<displayName count="few">kubanski peso</displayName>
-				<displayName count="other">kubanski peso</displayName>
+				<displayName count="two">kubanska pesa</displayName>
+				<displayName count="few">kubanski pesi</displayName>
+				<displayName count="other">kubanskih pesov</displayName>
 				<symbol draft="contributed">CUP</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CVE">
 				<displayName>zelenortski eskudo</displayName>
 				<displayName count="one">zelenortski eskudo</displayName>
-				<displayName count="two">zelenortski eskudo</displayName>
-				<displayName count="few">zelenortski eskudo</displayName>
-				<displayName count="other">zelenortski eskudo</displayName>
+				<displayName count="two">zelenortska eskuda</displayName>
+				<displayName count="few">zelenortski eskudi</displayName>
+				<displayName count="other">zelenortskih eskudov</displayName>
 				<symbol draft="contributed">CVE</symbol>
 			</currency>
 			<currency type="CYP">
@@ -4924,10 +5084,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="CZK">
 				<displayName>češka krona</displayName>
 				<displayName count="one">češka krona</displayName>
-				<displayName count="two">češka krona</displayName>
-				<displayName count="few">češka krona</displayName>
-				<displayName count="other">češka krona</displayName>
+				<displayName count="two">češki kroni</displayName>
+				<displayName count="few">češke krone</displayName>
+				<displayName count="other">čeških kron</displayName>
 				<symbol draft="contributed">CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>vzhodnonemška marka</displayName>
@@ -4942,9 +5103,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="DJF">
 				<displayName>džibutski frank</displayName>
 				<displayName count="one">džibutski frank</displayName>
-				<displayName count="two">džibutski frank</displayName>
-				<displayName count="few">džibutski frank</displayName>
-				<displayName count="other">džibutski frank</displayName>
+				<displayName count="two">džibutska franka</displayName>
+				<displayName count="few">džibutski franki</displayName>
+				<displayName count="other">džibutskih frankov</displayName>
 				<symbol draft="contributed">DJF</symbol>
 			</currency>
 			<currency type="DKK">
@@ -4954,22 +5115,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few" draft="contributed">danske krone</displayName>
 				<displayName count="other" draft="contributed">danskih kron</displayName>
 				<symbol draft="contributed">DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>dominikanski peso</displayName>
 				<displayName count="one">dominikanski peso</displayName>
-				<displayName count="two">dominikanski peso</displayName>
-				<displayName count="few">dominikanski peso</displayName>
-				<displayName count="other">dominikanski peso</displayName>
+				<displayName count="two">dominikanska pesa</displayName>
+				<displayName count="few">dominikanski pesi</displayName>
+				<displayName count="other">dominikanskih pesov</displayName>
 				<symbol draft="contributed">DOP</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="DZD">
 				<displayName>alžirski dinar</displayName>
 				<displayName count="one">alžirski dinar</displayName>
-				<displayName count="two">alžirski dinar</displayName>
-				<displayName count="few">alžirski dinar</displayName>
-				<displayName count="other">alžirski dinar</displayName>
+				<displayName count="two">alžirska dinarja</displayName>
+				<displayName count="few">alžirski dinarji</displayName>
+				<displayName count="other">alžirskih dinarjev</displayName>
 				<symbol draft="contributed">DZD</symbol>
 			</currency>
 			<currency type="ECS">
@@ -4984,17 +5146,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="EGP">
 				<displayName>egiptovski funt</displayName>
 				<displayName count="one">egiptovski funt</displayName>
-				<displayName count="two">egiptovski funt</displayName>
-				<displayName count="few">egiptovski funt</displayName>
-				<displayName count="other">egiptovski funt</displayName>
+				<displayName count="two">egiptovska funta</displayName>
+				<displayName count="few">egiptovski funti</displayName>
+				<displayName count="other">egiptovskih funtov</displayName>
 				<symbol draft="contributed">EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>eritrejska nakfa</displayName>
 				<displayName count="one">eritrejska nakfa</displayName>
-				<displayName count="two">eritrejska nakfa</displayName>
-				<displayName count="few">eritrejska nakfa</displayName>
-				<displayName count="other">eritrejska nakfa</displayName>
+				<displayName count="two">eritrejski nakfi</displayName>
+				<displayName count="few">eritrejske nakfe</displayName>
+				<displayName count="other">eritrejskih nakf</displayName>
 				<symbol draft="contributed">ERN</symbol>
 			</currency>
 			<currency type="ESA">
@@ -5009,9 +5172,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="ETB">
 				<displayName>etiopski bir</displayName>
 				<displayName count="one">etiopski bir</displayName>
-				<displayName count="two">etiopski bir</displayName>
-				<displayName count="few">etiopski bir</displayName>
-				<displayName count="other">etiopski bir</displayName>
+				<displayName count="two">etiopska bira</displayName>
+				<displayName count="few">etiopski biri</displayName>
+				<displayName count="other">etiopskih birov</displayName>
 				<symbol draft="contributed">ETB</symbol>
 			</currency>
 			<currency type="EUR">
@@ -5029,29 +5192,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="FJD">
 				<displayName>fidžijski dolar</displayName>
 				<displayName count="one">fidžijski dolar</displayName>
-				<displayName count="two">fidžijski dolar</displayName>
-				<displayName count="few">fidžijski dolar</displayName>
-				<displayName count="other">fidžijski dolar</displayName>
+				<displayName count="two">fidžijska dolarja</displayName>
+				<displayName count="few">fidžijski dolarji</displayName>
+				<displayName count="other">fidžijskih dolarjev</displayName>
 				<symbol draft="contributed">FJD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="FKP">
 				<displayName>falklandski funt</displayName>
 				<displayName count="one">falklandski funt</displayName>
-				<displayName count="two">falklandski funt</displayName>
-				<displayName count="few">falklandski funt</displayName>
-				<displayName count="other">falklandski funt</displayName>
+				<displayName count="two">falklandska funta</displayName>
+				<displayName count="few">falklandski funti</displayName>
+				<displayName count="other">falklandskih funtov</displayName>
 				<symbol draft="contributed">FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>francoski frank</displayName>
 			</currency>
 			<currency type="GBP">
 				<displayName>britanski funt</displayName>
-				<displayName count="one" draft="contributed">britanski funt</displayName>
-				<displayName count="two" draft="contributed">britanskih funtov</displayName>
-				<displayName count="few" draft="contributed">britanski funti</displayName>
-				<displayName count="other" draft="contributed">britanskih funtov</displayName>
+				<displayName count="one">britanski funt</displayName>
+				<displayName count="two">britanska funta</displayName>
+				<displayName count="few">britanski funti</displayName>
+				<displayName count="other">britanskih funtov</displayName>
 				<symbol draft="contributed">£</symbol>
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
@@ -5061,10 +5225,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="GEL">
 				<displayName>gruzijski lari</displayName>
 				<displayName count="one">gruzijski lari</displayName>
-				<displayName count="two">gruzijski lari</displayName>
+				<displayName count="two">gruzijska lara</displayName>
 				<displayName count="few">gruzijski lari</displayName>
-				<displayName count="other">gruzijski lari</displayName>
+				<displayName count="other">gruzijskih larov</displayName>
 				<symbol draft="contributed">GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>stari ganski cedi (1979–2007)</displayName>
@@ -5080,27 +5245,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="GIP">
 				<displayName>gibraltarski funt</displayName>
 				<displayName count="one">gibraltarski funt</displayName>
-				<displayName count="two">gibraltarski funt</displayName>
-				<displayName count="few">gibraltarski funt</displayName>
-				<displayName count="other">gibraltarski funt</displayName>
+				<displayName count="two">gibraltarska funta</displayName>
+				<displayName count="few">gibraltarski funti</displayName>
+				<displayName count="other">gibraltarskih funtov</displayName>
 				<symbol draft="contributed">GIP</symbol>
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GMD">
 				<displayName>gambijski dalasi</displayName>
 				<displayName count="one">gambijski dalasi</displayName>
-				<displayName count="two">gambijski dalasi</displayName>
+				<displayName count="two">gambijska dalasa</displayName>
 				<displayName count="few">gambijski dalasi</displayName>
-				<displayName count="other">gambijski dalasi</displayName>
+				<displayName count="other">gambijskih dalasov</displayName>
 				<symbol draft="contributed">GMD</symbol>
 			</currency>
 			<currency type="GNF">
 				<displayName>gvinejski frank</displayName>
 				<displayName count="one">gvinejski frank</displayName>
-				<displayName count="two">gvinejski frank</displayName>
-				<displayName count="few">gvinejski frank</displayName>
-				<displayName count="other">gvinejski frank</displayName>
+				<displayName count="two">gvinejska franka</displayName>
+				<displayName count="few">gvinejski franki</displayName>
+				<displayName count="other">gvinejskih frankov</displayName>
 				<symbol draft="contributed">GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>gvinejski sili</displayName>
@@ -5114,10 +5280,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="GTQ">
 				<displayName>gvatemalski kecal</displayName>
 				<displayName count="one">gvatemalski kecal</displayName>
-				<displayName count="two">gvatemalski kecal</displayName>
-				<displayName count="few">gvatemalski kecal</displayName>
-				<displayName count="other">gvatemalski kecal</displayName>
+				<displayName count="two">gvatemalska kecala</displayName>
+				<displayName count="few">gvatemalski kecali</displayName>
+				<displayName count="other">gvatemalskih kecalov</displayName>
 				<symbol draft="contributed">GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>eskudo Portugalske Gvineje</displayName>
@@ -5128,28 +5295,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="GYD">
 				<displayName>gvajanski dolar</displayName>
 				<displayName count="one">gvajanski dolar</displayName>
-				<displayName count="two">gvajanski dolar</displayName>
-				<displayName count="few">gvajanski dolar</displayName>
-				<displayName count="other">gvajanski dolar</displayName>
+				<displayName count="two">gvajanska dolarja</displayName>
+				<displayName count="few">gvajanski dolarji</displayName>
+				<displayName count="other">gvajanskih dolarjev</displayName>
 				<symbol draft="contributed">GYD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="HKD">
 				<displayName>hongkonški dolar</displayName>
 				<displayName count="one">hongkonški dolar</displayName>
-				<displayName count="two">hongkonški dolar</displayName>
-				<displayName count="few">hongkonški dolar</displayName>
-				<displayName count="other">hongkonški dolar</displayName>
+				<displayName count="two">hongkonška dolarja</displayName>
+				<displayName count="few">hongkonški dolarji</displayName>
+				<displayName count="other">hongkonških dolarjev</displayName>
 				<symbol draft="contributed">HK$</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="HNL">
 				<displayName>honduraška lempira</displayName>
 				<displayName count="one">honduraška lempira</displayName>
-				<displayName count="two">honduraška lempira</displayName>
-				<displayName count="few">honduraška lempira</displayName>
-				<displayName count="other">honduraška lempira</displayName>
+				<displayName count="two">honduraški lempiri</displayName>
+				<displayName count="few">honduraške lempire</displayName>
+				<displayName count="other">honduraških lempir</displayName>
 				<symbol draft="contributed">HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>hrvaški dinar</displayName>
@@ -5157,34 +5325,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="HRK">
 				<displayName>hrvaška kuna</displayName>
 				<displayName count="one">hrvaška kuna</displayName>
-				<displayName count="two">hrvaška kuna</displayName>
-				<displayName count="few">hrvaška kuna</displayName>
-				<displayName count="other">hrvaška kuna</displayName>
+				<displayName count="two">hrvaški kuni</displayName>
+				<displayName count="few">hrvaške kune</displayName>
+				<displayName count="other">hrvaških kun</displayName>
 				<symbol draft="contributed">HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>haitski gurd</displayName>
 				<displayName count="one">haitski gurd</displayName>
-				<displayName count="two">haitski gurd</displayName>
-				<displayName count="few">haitski gurd</displayName>
-				<displayName count="other">haitski gurd</displayName>
+				<displayName count="two">haitska gurda</displayName>
+				<displayName count="few">haitski gurdi</displayName>
+				<displayName count="other">haitskih gurdov</displayName>
 				<symbol draft="contributed">HTG</symbol>
 			</currency>
 			<currency type="HUF">
 				<displayName>madžarski forint</displayName>
 				<displayName count="one">madžarski forint</displayName>
-				<displayName count="two">madžarski forint</displayName>
-				<displayName count="few">madžarski forint</displayName>
-				<displayName count="other">madžarski forint</displayName>
+				<displayName count="two">madžarska forinta</displayName>
+				<displayName count="few">madžarski forinti</displayName>
+				<displayName count="other">madžarskih forintov</displayName>
 				<symbol draft="contributed">HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>indonezijska rupija</displayName>
 				<displayName count="one">indonezijska rupija</displayName>
-				<displayName count="two">indonezijska rupija</displayName>
-				<displayName count="few">indonezijska rupija</displayName>
-				<displayName count="other">indonezijska rupija</displayName>
+				<displayName count="two">indonezijski rupiji</displayName>
+				<displayName count="few">indonezijske rupije</displayName>
+				<displayName count="other">indonezijskih rupij</displayName>
 				<symbol draft="contributed">IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>irski funt</displayName>
@@ -5195,44 +5366,45 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="ILS">
 				<displayName>izraelski šekel</displayName>
 				<displayName count="one">izraelski šekel</displayName>
-				<displayName count="two">izraelski šekel</displayName>
-				<displayName count="few">izraelski šekel</displayName>
-				<displayName count="other">izraelski šekel</displayName>
+				<displayName count="two">izraelska šekela</displayName>
+				<displayName count="few">izraelski šekeli</displayName>
+				<displayName count="other">izraelskih šekelov</displayName>
 				<symbol draft="contributed">₪</symbol>
 				<symbol alt="narrow" draft="contributed">₪</symbol>
 			</currency>
 			<currency type="INR">
 				<displayName>indijska rupija</displayName>
 				<displayName count="one">indijska rupija</displayName>
-				<displayName count="two">indijska rupija</displayName>
-				<displayName count="few">indijska rupija</displayName>
-				<displayName count="other">indijska rupija</displayName>
+				<displayName count="two">indijski rupiji</displayName>
+				<displayName count="few">indijske rupije</displayName>
+				<displayName count="other">indijskih rupij</displayName>
 				<symbol draft="contributed">₹</symbol>
 				<symbol alt="narrow" draft="contributed">₹</symbol>
 			</currency>
 			<currency type="IQD">
 				<displayName>iraški dinar</displayName>
 				<displayName count="one">iraški dinar</displayName>
-				<displayName count="two">iraški dinar</displayName>
-				<displayName count="few">iraški dinar</displayName>
-				<displayName count="other">iraški dinar</displayName>
+				<displayName count="two">iraška dinarja</displayName>
+				<displayName count="few">iraški dinarji</displayName>
+				<displayName count="other">iraških dinarjev</displayName>
 				<symbol draft="contributed">IQD</symbol>
 			</currency>
 			<currency type="IRR">
 				<displayName>iranski rial</displayName>
 				<displayName count="one">iranski rial</displayName>
-				<displayName count="two">iranski rial</displayName>
-				<displayName count="few">iranski rial</displayName>
+				<displayName count="two">iranska riala</displayName>
+				<displayName count="few">iranski riali</displayName>
 				<displayName count="other">iranski rial</displayName>
 				<symbol draft="contributed">IRR</symbol>
 			</currency>
 			<currency type="ISK">
 				<displayName>islandska krona</displayName>
 				<displayName count="one">islandska krona</displayName>
-				<displayName count="two">islandska krona</displayName>
-				<displayName count="few">islandska krona</displayName>
-				<displayName count="other">islandska krona</displayName>
+				<displayName count="two">islandski kroni</displayName>
+				<displayName count="few">islandske krone</displayName>
+				<displayName count="other">islandskih kron</displayName>
 				<symbol draft="contributed">ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>italijanska lira</displayName>
@@ -5240,92 +5412,94 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="JMD">
 				<displayName>jamajški dolar</displayName>
 				<displayName count="one">jamajški dolar</displayName>
-				<displayName count="two">jamajški dolar</displayName>
-				<displayName count="few">jamajški dolar</displayName>
-				<displayName count="other">jamajški dolar</displayName>
+				<displayName count="two">jamajška dolarja</displayName>
+				<displayName count="few">jamajški dolarji</displayName>
+				<displayName count="other">jamajških dolarjev</displayName>
 				<symbol draft="contributed">JMD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="JOD">
 				<displayName>jordanski dinar</displayName>
 				<displayName count="one">jordanski dinar</displayName>
-				<displayName count="two">jordanski dinar</displayName>
-				<displayName count="few">jordanski dinar</displayName>
-				<displayName count="other">jordanski dinar</displayName>
+				<displayName count="two">jordanska dinarja</displayName>
+				<displayName count="few">jordanski dinarji</displayName>
+				<displayName count="other">jordanskih dinarjev</displayName>
 				<symbol draft="contributed">JOD</symbol>
 			</currency>
 			<currency type="JPY">
 				<displayName>japonski jen</displayName>
 				<displayName count="one">japonski jen</displayName>
-				<displayName count="two">japonski jen</displayName>
-				<displayName count="few">japonski jen</displayName>
-				<displayName count="other">japonski jen</displayName>
+				<displayName count="two">japonska jena</displayName>
+				<displayName count="few">japonski jeni</displayName>
+				<displayName count="other">japonskih jenov</displayName>
 				<symbol>¥</symbol>
 				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
 			<currency type="KES">
 				<displayName>kenijski šiling</displayName>
 				<displayName count="one">kenijski šiling</displayName>
-				<displayName count="two">kenijski šiling</displayName>
-				<displayName count="few">kenijski šiling</displayName>
-				<displayName count="other">kenijski šiling</displayName>
+				<displayName count="two">kenijska šilinga</displayName>
+				<displayName count="few">kenijski šilingi</displayName>
+				<displayName count="other">kenijskih šilingov</displayName>
 				<symbol draft="contributed">KES</symbol>
 			</currency>
 			<currency type="KGS">
 				<displayName>kirgiški som</displayName>
 				<displayName count="one">kirgiški som</displayName>
-				<displayName count="two">kirgiški som</displayName>
-				<displayName count="few">kirgiški som</displayName>
-				<displayName count="other">kirgiški som</displayName>
+				<displayName count="two">kirgiška soma</displayName>
+				<displayName count="few">kirgiški somi</displayName>
+				<displayName count="other">kirgiških somov</displayName>
 				<symbol draft="contributed">KGS</symbol>
 			</currency>
 			<currency type="KHR">
 				<displayName>kamboški riel</displayName>
 				<displayName count="one">kamboški riel</displayName>
-				<displayName count="two">kamboški riel</displayName>
-				<displayName count="few">kamboški riel</displayName>
-				<displayName count="other">kamboški riel</displayName>
+				<displayName count="two">kamboška riela</displayName>
+				<displayName count="few">kamboški rieli</displayName>
+				<displayName count="other">kamboških rielov</displayName>
 				<symbol draft="contributed">KHR</symbol>
 				<symbol alt="narrow" draft="contributed">៛</symbol>
 			</currency>
 			<currency type="KMF">
 				<displayName>komorski frank</displayName>
 				<displayName count="one">komorski frank</displayName>
-				<displayName count="two">komorski frank</displayName>
-				<displayName count="few">komorski frank</displayName>
-				<displayName count="other">komorski frank</displayName>
+				<displayName count="two">komorska franka</displayName>
+				<displayName count="few">komorski franki</displayName>
+				<displayName count="other">komorskih frankov</displayName>
 				<symbol draft="contributed">KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>severnokorejski von</displayName>
 				<displayName count="one">severnokorejski von</displayName>
-				<displayName count="two">severnokorejski von</displayName>
-				<displayName count="few">severnokorejski von</displayName>
-				<displayName count="other">severnokorejski von</displayName>
+				<displayName count="two">severnokorejska vona</displayName>
+				<displayName count="few">severnokorejski voni</displayName>
+				<displayName count="other">severnokorejskih vonov</displayName>
 				<symbol draft="contributed">KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>južnokorejski von</displayName>
 				<displayName count="one">južnokorejski von</displayName>
-				<displayName count="two">južnokorejski von</displayName>
-				<displayName count="few">južnokorejski von</displayName>
-				<displayName count="other">južnokorejski von</displayName>
+				<displayName count="two">južnokorejska vona</displayName>
+				<displayName count="few">južnokorejski voni</displayName>
+				<displayName count="other">južnokorejskih vonov</displayName>
 				<symbol draft="contributed">₩</symbol>
 				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KWD">
 				<displayName>kuvajtski dinar</displayName>
 				<displayName count="one">kuvajtski dinar</displayName>
-				<displayName count="two">kuvajtski dinar</displayName>
-				<displayName count="few">kuvajtski dinar</displayName>
-				<displayName count="other">kuvajtski dinar</displayName>
+				<displayName count="two">kuvajtska dinarja</displayName>
+				<displayName count="few">kuvajtski dinarji</displayName>
+				<displayName count="other">kuvajtskih dinarjev</displayName>
 				<symbol draft="contributed">KWD</symbol>
 			</currency>
 			<currency type="KYD">
 				<displayName>kajmanski dolar</displayName>
 				<displayName count="one">kajmanski dolar</displayName>
-				<displayName count="two">kajmanski dolar</displayName>
-				<displayName count="few">kajmanski dolar</displayName>
+				<displayName count="two">kajmanska dolarja</displayName>
+				<displayName count="few">kajmanski dolarji</displayName>
 				<displayName count="other">kajmanski dolar</displayName>
 				<symbol draft="contributed">KYD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
@@ -5342,34 +5516,36 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="LAK">
 				<displayName>laoški kip</displayName>
 				<displayName count="one">laoški kip</displayName>
-				<displayName count="two">laoški kip</displayName>
-				<displayName count="few">laoški kip</displayName>
-				<displayName count="other">laoški kip</displayName>
+				<displayName count="two">laoška kipa</displayName>
+				<displayName count="few">laoški kipi</displayName>
+				<displayName count="other">laoških kipov</displayName>
 				<symbol draft="contributed">LAK</symbol>
 				<symbol alt="narrow" draft="contributed">₭</symbol>
 			</currency>
 			<currency type="LBP">
 				<displayName>libanonski funt</displayName>
 				<displayName count="one">libanonski funt</displayName>
-				<displayName count="two">libanonski funt</displayName>
-				<displayName count="few">libanonski funt</displayName>
-				<displayName count="other">libanonski funt</displayName>
+				<displayName count="two">libanonska funta</displayName>
+				<displayName count="few">libanonski funti</displayName>
+				<displayName count="other">libanonskih funtov</displayName>
 				<symbol draft="contributed">LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>šrilanška rupija</displayName>
 				<displayName count="one">šrilanška rupija</displayName>
-				<displayName count="two">šrilanška rupija</displayName>
-				<displayName count="few">šrilanška rupija</displayName>
-				<displayName count="other">šrilanška rupija</displayName>
+				<displayName count="two">šrilanški rupiji</displayName>
+				<displayName count="few">šrilanške rupije</displayName>
+				<displayName count="other">šrilanških rupij</displayName>
 				<symbol draft="contributed">LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>liberijski dolar</displayName>
 				<displayName count="one">liberijski dolar</displayName>
-				<displayName count="two">liberijski dolar</displayName>
-				<displayName count="few">liberijski dolar</displayName>
-				<displayName count="other">liberijski dolar</displayName>
+				<displayName count="two">liberijska dolarja</displayName>
+				<displayName count="few">liberijski dolarji</displayName>
+				<displayName count="other">liberijskih dolarjev</displayName>
 				<symbol draft="contributed">LRD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -5410,17 +5586,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="LYD">
 				<displayName>libijski dinar</displayName>
 				<displayName count="one">libijski dinar</displayName>
-				<displayName count="two">libijski dinar</displayName>
-				<displayName count="few">libijski dinar</displayName>
-				<displayName count="other">libijski dinar</displayName>
+				<displayName count="two">libijska dinarja</displayName>
+				<displayName count="few">libijski dinarji</displayName>
+				<displayName count="other">libijskih dinarjev</displayName>
 				<symbol draft="contributed">LYD</symbol>
 			</currency>
 			<currency type="MAD">
 				<displayName>maroški dirham</displayName>
 				<displayName count="one">maroški dirham</displayName>
-				<displayName count="two">maroški dirham</displayName>
-				<displayName count="few">maroški dirham</displayName>
-				<displayName count="other">maroški dirham</displayName>
+				<displayName count="two">maroška dirhama</displayName>
+				<displayName count="few">maroški dirhami</displayName>
+				<displayName count="other">maroških dirhamov</displayName>
 				<symbol draft="contributed">MAD</symbol>
 			</currency>
 			<currency type="MAF">
@@ -5437,10 +5613,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="MGA">
 				<displayName>malgaški ariarij</displayName>
 				<displayName count="one">malgaški ariarij</displayName>
-				<displayName count="two">malgaški ariarij</displayName>
-				<displayName count="few">malgaški ariarij</displayName>
-				<displayName count="other">malgaški ariarij</displayName>
+				<displayName count="two">malgaška ariarija</displayName>
+				<displayName count="few">malgaški ariariji</displayName>
+				<displayName count="other">malgaških ariarijev</displayName>
 				<symbol draft="contributed">MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>malgaški frank</displayName>
@@ -5448,9 +5625,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="MKD">
 				<displayName>makedonski denar</displayName>
 				<displayName count="one">makedonski denar</displayName>
-				<displayName count="two">makedonski denar</displayName>
-				<displayName count="few">makedonski denar</displayName>
-				<displayName count="other">makedonski denar</displayName>
+				<displayName count="two">makedonska denarja</displayName>
+				<displayName count="few">makedonski denarji</displayName>
+				<displayName count="other">makedonskih denarjev</displayName>
 				<symbol draft="contributed">MKD</symbol>
 			</currency>
 			<currency type="MLF">
@@ -5459,34 +5636,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="MMK">
 				<displayName>mjanmarski kjat</displayName>
 				<displayName count="one">mjanmarski kjat</displayName>
-				<displayName count="two">mjanmarski kjat</displayName>
-				<displayName count="few">mjanmarski kjat</displayName>
-				<displayName count="other">mjanmarski kjat</displayName>
+				<displayName count="two">mjanmarska kjata</displayName>
+				<displayName count="few">mjanmarski kjati</displayName>
+				<displayName count="other">mjanmarskih kjatov</displayName>
 				<symbol draft="contributed">MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>mongolski tugrik</displayName>
 				<displayName count="one">mongolski tugrik</displayName>
-				<displayName count="two">mongolski tugrik</displayName>
-				<displayName count="few">mongolski tugrik</displayName>
-				<displayName count="other">mongolski tugrik</displayName>
+				<displayName count="two">mongolska tugrika</displayName>
+				<displayName count="few">mongolski tugriki</displayName>
+				<displayName count="other">mongolskih tugrikov</displayName>
 				<symbol draft="contributed">MNT</symbol>
 				<symbol alt="narrow" draft="contributed">₮</symbol>
 			</currency>
 			<currency type="MOP">
 				<displayName>makavska pataka</displayName>
 				<displayName count="one">makavska pataka</displayName>
-				<displayName count="two">makavska pataka</displayName>
-				<displayName count="few">makavska pataka</displayName>
-				<displayName count="other">makavska pataka</displayName>
+				<displayName count="two">makavski pataki</displayName>
+				<displayName count="few">makavske patake</displayName>
+				<displayName count="other">makavskih patak</displayName>
 				<symbol draft="contributed">MOP</symbol>
 			</currency>
 			<currency type="MRO">
 				<displayName>mavretanska uguija</displayName>
 				<displayName count="one">mavretanska uguija</displayName>
-				<displayName count="two">mavretanska uguija</displayName>
-				<displayName count="few">mavretanska uguija</displayName>
-				<displayName count="other">mavretanska uguija</displayName>
+				<displayName count="two">mavretanski uguiji</displayName>
+				<displayName count="few">mavretanske uguije</displayName>
+				<displayName count="other">mavretanskih uguij</displayName>
 				<symbol draft="contributed">MRO</symbol>
 			</currency>
 			<currency type="MTL">
@@ -5498,33 +5676,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="MUR">
 				<displayName>mavricijska rupija</displayName>
 				<displayName count="one">mavricijska rupija</displayName>
-				<displayName count="two">mavricijska rupija</displayName>
-				<displayName count="few">mavricijska rupija</displayName>
-				<displayName count="other">mavricijska rupija</displayName>
+				<displayName count="two">mavricijski rupiji</displayName>
+				<displayName count="few">mavricijske rupije</displayName>
+				<displayName count="other">mavricijskih rupij</displayName>
 				<symbol draft="contributed">MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>maldivska rufija</displayName>
 				<displayName count="one">maldivska rufija</displayName>
-				<displayName count="two">maldivska rufija</displayName>
-				<displayName count="few">maldivska rufija</displayName>
-				<displayName count="other">maldivska rufija</displayName>
+				<displayName count="two">maldivski rufiji</displayName>
+				<displayName count="few">maldivske rufije</displayName>
+				<displayName count="other">maldivskih rufij</displayName>
 				<symbol draft="contributed">MVR</symbol>
 			</currency>
 			<currency type="MWK">
 				<displayName>malavijska kvača</displayName>
 				<displayName count="one">malavijska kvača</displayName>
-				<displayName count="two">malavijska kvača</displayName>
-				<displayName count="few">malavijska kvača</displayName>
-				<displayName count="other">malavijska kvača</displayName>
+				<displayName count="two">malavijski kvači</displayName>
+				<displayName count="few">malavijske kvače</displayName>
+				<displayName count="other">malavijskih kvač</displayName>
 				<symbol draft="contributed">MWK</symbol>
 			</currency>
 			<currency type="MXN">
 				<displayName>mehiški peso</displayName>
 				<displayName count="one">mehiški peso</displayName>
-				<displayName count="two">mehiški peso</displayName>
-				<displayName count="few">mehiški peso</displayName>
-				<displayName count="other">mehiški peso</displayName>
+				<displayName count="two">mehiška pesa</displayName>
+				<displayName count="few">mehiški pesi</displayName>
+				<displayName count="other">mehiških pesov</displayName>
 				<symbol draft="contributed">MX$</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -5537,10 +5716,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="MYR">
 				<displayName>malezijski ringit</displayName>
 				<displayName count="one">malezijski ringit</displayName>
-				<displayName count="two">malezijski ringit</displayName>
-				<displayName count="few">malezijski ringit</displayName>
-				<displayName count="other">malezijski ringit</displayName>
+				<displayName count="two">malezijska ringita</displayName>
+				<displayName count="few">malezijski ringiti</displayName>
+				<displayName count="other">malezijskih ringitov</displayName>
 				<symbol draft="contributed">MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>mozambiški eskudo</displayName>
@@ -5551,26 +5731,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="MZN">
 				<displayName>mozambiški metikal</displayName>
 				<displayName count="one">mozambiški metikal</displayName>
-				<displayName count="two">mozambiški metikal</displayName>
-				<displayName count="few">mozambiški metikal</displayName>
-				<displayName count="other">mozambiški metikal</displayName>
+				<displayName count="two">mozambiška metikala</displayName>
+				<displayName count="few">mozambiški metikali</displayName>
+				<displayName count="other">mozambiških metikalov</displayName>
 				<symbol draft="contributed">MZN</symbol>
 			</currency>
 			<currency type="NAD">
 				<displayName>namibijski dolar</displayName>
 				<displayName count="one">namibijski dolar</displayName>
-				<displayName count="two">namibijski dolar</displayName>
-				<displayName count="few">namibijski dolar</displayName>
-				<displayName count="other">namibijski dolar</displayName>
+				<displayName count="two">namibijska dolarja</displayName>
+				<displayName count="few">namibijski dolarji</displayName>
+				<displayName count="other">namibijskih dolarjev</displayName>
 				<symbol draft="contributed">NAD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="NGN">
 				<displayName>nigerijska naira</displayName>
 				<displayName count="one">nigerijska naira</displayName>
-				<displayName count="two">nigerijska naira</displayName>
-				<displayName count="few">nigerijska naira</displayName>
-				<displayName count="other">nigerijska naira</displayName>
+				<displayName count="two">nigerijski nairi</displayName>
+				<displayName count="few">nigerijske naire</displayName>
+				<displayName count="other">nigerijskih nair</displayName>
 				<symbol draft="contributed">NGN</symbol>
 				<symbol alt="narrow" draft="contributed">₦</symbol>
 			</currency>
@@ -5580,10 +5760,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="NIO">
 				<displayName>nikaraška zlata kordova</displayName>
 				<displayName count="one">nikaraška zlata kordova</displayName>
-				<displayName count="two">nikaraška zlata kordova</displayName>
-				<displayName count="few">nikaraška zlata kordova</displayName>
-				<displayName count="other">nikaraška zlata kordova</displayName>
+				<displayName count="two">nikaraški zlati kordovi</displayName>
+				<displayName count="few">nikaraške zlate kordove</displayName>
+				<displayName count="other">nikaraških zlatih kordov</displayName>
 				<symbol draft="contributed">NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>nizozemski gulden</displayName>
@@ -5591,42 +5772,44 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="NOK">
 				<displayName>norveška krona</displayName>
 				<displayName count="one">norveška krona</displayName>
-				<displayName count="two">norveška krona</displayName>
-				<displayName count="few">norveška krona</displayName>
-				<displayName count="other">norveška krona</displayName>
+				<displayName count="two">norveški kroni</displayName>
+				<displayName count="few">norveške krone</displayName>
+				<displayName count="other">norveških kron</displayName>
 				<symbol draft="contributed">NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>nepalska rupija</displayName>
 				<displayName count="one">nepalska rupija</displayName>
-				<displayName count="two">nepalska rupija</displayName>
-				<displayName count="few">nepalska rupija</displayName>
-				<displayName count="other">nepalska rupija</displayName>
+				<displayName count="two">nepalski rupiji</displayName>
+				<displayName count="few">nepalske rupije</displayName>
+				<displayName count="other">nepalskih rupij</displayName>
 				<symbol draft="contributed">NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>novozelandski dolar</displayName>
 				<displayName count="one">novozelandski dolar</displayName>
-				<displayName count="two">novozelandski dolar</displayName>
-				<displayName count="few">novozelandski dolar</displayName>
-				<displayName count="other">novozelandski dolar</displayName>
+				<displayName count="two">novozelandska dolarja</displayName>
+				<displayName count="few">novozelandski dolarji</displayName>
+				<displayName count="other">novozelandskih dolarjev</displayName>
 				<symbol draft="contributed">NZ$</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="OMR">
 				<displayName>omanski rial</displayName>
 				<displayName count="one">omanski rial</displayName>
-				<displayName count="two">omanski rial</displayName>
-				<displayName count="few">omanski rial</displayName>
-				<displayName count="other">omanski rial</displayName>
+				<displayName count="two">omanska riala</displayName>
+				<displayName count="few">omanski riali</displayName>
+				<displayName count="other">omanskih rialov</displayName>
 				<symbol draft="contributed">OMR</symbol>
 			</currency>
 			<currency type="PAB">
 				<displayName>panamska balboa</displayName>
 				<displayName count="one">panamska balboa</displayName>
-				<displayName count="two">panamska balboa</displayName>
-				<displayName count="few">panamska balboa</displayName>
-				<displayName count="other">panamska balboa</displayName>
+				<displayName count="two">panamski balboi</displayName>
+				<displayName count="few">panamske balboe</displayName>
+				<displayName count="other">panamskih balbov</displayName>
 				<symbol draft="contributed">PAB</symbol>
 			</currency>
 			<currency type="PEI">
@@ -5635,9 +5818,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="PEN">
 				<displayName>perujski novi sol</displayName>
 				<displayName count="one">perujski novi sol</displayName>
-				<displayName count="two">perujski novi sol</displayName>
-				<displayName count="few">perujski novi sol</displayName>
-				<displayName count="other">perujski novi sol</displayName>
+				<displayName count="two">perujska nova sola</displayName>
+				<displayName count="few">perujski novi soli</displayName>
+				<displayName count="other">perujskih novih solov</displayName>
 				<symbol draft="contributed">PEN</symbol>
 			</currency>
 			<currency type="PES">
@@ -5654,27 +5837,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="PHP">
 				<displayName>filipinski peso</displayName>
 				<displayName count="one">filipinski peso</displayName>
-				<displayName count="two">filipinski peso</displayName>
-				<displayName count="few">filipinski peso</displayName>
-				<displayName count="other">filipinski peso</displayName>
+				<displayName count="two">filipinska pesa</displayName>
+				<displayName count="few">filipinski pesi</displayName>
+				<displayName count="other">filipinskih pesov</displayName>
 				<symbol draft="contributed">PHP</symbol>
 				<symbol alt="narrow" draft="contributed">₱</symbol>
 			</currency>
 			<currency type="PKR">
 				<displayName>pakistanska rupija</displayName>
 				<displayName count="one">pakistanska rupija</displayName>
-				<displayName count="two">pakistanska rupija</displayName>
-				<displayName count="few">pakistanska rupija</displayName>
-				<displayName count="other">pakistanska rupija</displayName>
+				<displayName count="two">pakistanski rupiji</displayName>
+				<displayName count="few">pakistanske rupije</displayName>
+				<displayName count="other">pakistanskih rupij</displayName>
 				<symbol draft="contributed">PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>poljski novi zlot</displayName>
 				<displayName count="one">poljski novi zlot</displayName>
-				<displayName count="two">poljski novi zlot</displayName>
-				<displayName count="few">poljski novi zlot</displayName>
-				<displayName count="other">poljski novi zlot</displayName>
+				<displayName count="two">poljska nova zlota</displayName>
+				<displayName count="few">poljski novi zloti</displayName>
+				<displayName count="other">poljskih novih zlotov</displayName>
 				<symbol draft="contributed">PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>stari poljski zlot (1950–1995)</displayName>
@@ -5694,9 +5879,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="QAR">
 				<displayName>katarski rial</displayName>
 				<displayName count="one">katarski rial</displayName>
-				<displayName count="two">katarski rial</displayName>
-				<displayName count="few">katarski rial</displayName>
-				<displayName count="other">katarski rial</displayName>
+				<displayName count="two">katarska riala</displayName>
+				<displayName count="few">katarski riali</displayName>
+				<displayName count="other">katarskih rialov</displayName>
 				<symbol draft="contributed">QAR</symbol>
 			</currency>
 			<currency type="RHD">
@@ -5716,18 +5901,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="RSD">
 				<displayName>srbski dinar</displayName>
 				<displayName count="one">srbski dinar</displayName>
-				<displayName count="two">srbski dinar</displayName>
-				<displayName count="few">srbski dinar</displayName>
-				<displayName count="other">srbski dinar</displayName>
+				<displayName count="two">srbska dinarja</displayName>
+				<displayName count="few">srbski dinarji</displayName>
+				<displayName count="other">srbskih dinarjev</displayName>
 				<symbol draft="contributed">RSD</symbol>
 			</currency>
 			<currency type="RUB">
 				<displayName>ruski rubelj</displayName>
 				<displayName count="one">ruski rubelj</displayName>
-				<displayName count="two">ruski rubelj</displayName>
-				<displayName count="few">ruski rubelj</displayName>
-				<displayName count="other">ruski rubelj</displayName>
+				<displayName count="two">ruska rublja</displayName>
+				<displayName count="few">ruski rublji</displayName>
+				<displayName count="other">ruskih rubljev</displayName>
 				<symbol draft="contributed">RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>ruski rubelj (1991–1998)</displayName>
@@ -5735,34 +5921,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="RWF">
 				<displayName>ruandski frank</displayName>
 				<displayName count="one">ruandski frank</displayName>
-				<displayName count="two">ruandski frank</displayName>
-				<displayName count="few">ruandski frank</displayName>
-				<displayName count="other">ruandski frank</displayName>
+				<displayName count="two">ruandska franka</displayName>
+				<displayName count="few">ruandski franki</displayName>
+				<displayName count="other">ruandskih frankov</displayName>
 				<symbol draft="contributed">RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>saudski rial</displayName>
 				<displayName count="one">saudski rial</displayName>
-				<displayName count="two">saudski rial</displayName>
-				<displayName count="few">saudski rial</displayName>
-				<displayName count="other">saudski rial</displayName>
+				<displayName count="two">saudska riala</displayName>
+				<displayName count="few">saudski riali</displayName>
+				<displayName count="other">saudskih rialov</displayName>
 				<symbol draft="contributed">SAR</symbol>
 			</currency>
 			<currency type="SBD">
 				<displayName>solomonski dolar</displayName>
 				<displayName count="one">solomonski dolar</displayName>
-				<displayName count="two">solomonski dolar</displayName>
-				<displayName count="few">solomonski dolar</displayName>
-				<displayName count="other">solomonski dolar</displayName>
+				<displayName count="two">solomonska dolarja</displayName>
+				<displayName count="few">solomonski dolarji</displayName>
+				<displayName count="other">solomonskih dolarjev</displayName>
 				<symbol draft="contributed">SBD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SCR">
 				<displayName>sejšelska rupija</displayName>
 				<displayName count="one">sejšelska rupija</displayName>
-				<displayName count="two">sejšelska rupija</displayName>
-				<displayName count="few">sejšelska rupija</displayName>
-				<displayName count="other">sejšelska rupija</displayName>
+				<displayName count="two">sejšelski rupiji</displayName>
+				<displayName count="few">sejšelske rupije</displayName>
+				<displayName count="other">sejšelskih rupij</displayName>
 				<symbol draft="contributed">SCR</symbol>
 			</currency>
 			<currency type="SDD">
@@ -5771,9 +5958,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="SDG">
 				<displayName>sudanski funt</displayName>
 				<displayName count="one">sudanski funt</displayName>
-				<displayName count="two">sudanski funt</displayName>
-				<displayName count="few">sudanski funt</displayName>
-				<displayName count="other">sudanski funt</displayName>
+				<displayName count="two">sudanska funta</displayName>
+				<displayName count="few">sudanski funti</displayName>
+				<displayName count="other">sudanskih funtov</displayName>
 				<symbol draft="contributed">SDG</symbol>
 			</currency>
 			<currency type="SDP">
@@ -5782,27 +5969,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="SEK">
 				<displayName>švedska krona</displayName>
 				<displayName count="one">švedska krona</displayName>
-				<displayName count="two">švedska krona</displayName>
-				<displayName count="few">švedska krona</displayName>
-				<displayName count="other">švedska krona</displayName>
+				<displayName count="two">švedski kroni</displayName>
+				<displayName count="few">švedske krone</displayName>
+				<displayName count="other">švedskih kron</displayName>
 				<symbol draft="contributed">SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>singapurski dolar</displayName>
 				<displayName count="one">singapurski dolar</displayName>
-				<displayName count="two">singapurski dolar</displayName>
-				<displayName count="few">singapurski dolar</displayName>
-				<displayName count="other">singapurski dolar</displayName>
+				<displayName count="two">singapurska dolarja</displayName>
+				<displayName count="few">singapurski dolarji</displayName>
+				<displayName count="other">singapurskih dolarjev</displayName>
 				<symbol draft="contributed">SGD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SHP">
 				<displayName>funt Sv. Helene</displayName>
 				<displayName count="one">funt Sv. Helene</displayName>
-				<displayName count="two">funt Sv. Helene</displayName>
-				<displayName count="few">funt Sv. Helene</displayName>
-				<displayName count="other">funt Sv. Helene</displayName>
+				<displayName count="two">funta Sv. Helene</displayName>
+				<displayName count="few">funti Sv. Helene</displayName>
+				<displayName count="other">funtov Sv. Helene</displayName>
 				<symbol draft="contributed">SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>slovenski tolar</displayName>
@@ -5821,25 +6010,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="SLL">
 				<displayName>sieraleonski leone</displayName>
 				<displayName count="one">sieraleonski leone</displayName>
-				<displayName count="two">sieraleonski leone</displayName>
-				<displayName count="few">sieraleonski leone</displayName>
-				<displayName count="other">sieraleonski leone</displayName>
+				<displayName count="two">sieraleonska leona</displayName>
+				<displayName count="few">sieraleonski leoni</displayName>
+				<displayName count="other">sieraleonskih leonov</displayName>
 				<symbol draft="contributed">SLL</symbol>
 			</currency>
 			<currency type="SOS">
 				<displayName>somalski šiling</displayName>
 				<displayName count="one">somalski šiling</displayName>
-				<displayName count="two">somalski šiling</displayName>
-				<displayName count="few">somalski šiling</displayName>
-				<displayName count="other">somalski šiling</displayName>
+				<displayName count="two">somalska šilinga</displayName>
+				<displayName count="few">somalski šilingi</displayName>
+				<displayName count="other">somalskih šilingov</displayName>
 				<symbol draft="contributed">SOS</symbol>
 			</currency>
 			<currency type="SRD">
 				<displayName>surinamski dolar</displayName>
 				<displayName count="one">surinamski dolar</displayName>
-				<displayName count="two">surinamski dolar</displayName>
-				<displayName count="few">surinamski dolar</displayName>
-				<displayName count="other">surinamski dolar</displayName>
+				<displayName count="two">surinamska dolarja</displayName>
+				<displayName count="few">surinamski dolarji</displayName>
+				<displayName count="other">surinamskih dolarjev</displayName>
 				<symbol draft="contributed">SRD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -5858,10 +6047,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="STD">
 				<displayName>saotomejska dobra</displayName>
 				<displayName count="one">saotomejska dobra</displayName>
-				<displayName count="two">saotomejska dobra</displayName>
-				<displayName count="few">saotomejska dobra</displayName>
-				<displayName count="other">saotomejska dobra</displayName>
+				<displayName count="two">saotomejski dobri</displayName>
+				<displayName count="few">saotomejske dobre</displayName>
+				<displayName count="other">saotomejskih dober</displayName>
 				<symbol draft="contributed">STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>sovjetski rubelj</displayName>
@@ -5872,10 +6062,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="SYP">
 				<displayName>sirijski funt</displayName>
 				<displayName count="one">sirijski funt</displayName>
-				<displayName count="two">sirijski funt</displayName>
-				<displayName count="few">sirijski funt</displayName>
-				<displayName count="other">sirijski funt</displayName>
+				<displayName count="two">sirijska funta</displayName>
+				<displayName count="few">sirijski funti</displayName>
+				<displayName count="other">sirijskih funtov</displayName>
 				<symbol draft="contributed">SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>svazijski lilangeni</displayName>
@@ -5888,10 +6079,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="THB">
 				<displayName>tajski baht</displayName>
 				<displayName count="one">tajski baht</displayName>
-				<displayName count="two">tajski baht</displayName>
-				<displayName count="few">tajski baht</displayName>
-				<displayName count="other">tajski baht</displayName>
+				<displayName count="two">tajska bahta</displayName>
+				<displayName count="few">tajski bahti</displayName>
+				<displayName count="other">tajskih bahtov</displayName>
 				<symbol draft="contributed">฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>tadžikistanski rubelj</displayName>
@@ -5910,26 +6102,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="TMT">
 				<displayName>turkmenistanski novi manat</displayName>
 				<displayName count="one">turkmenistanski novi manat</displayName>
-				<displayName count="two">turkmenistanski novi manat</displayName>
-				<displayName count="few">turkmenistanski novi manat</displayName>
-				<displayName count="other">turkmenistanski novi manat</displayName>
+				<displayName count="two">turkmenistanska nova manata</displayName>
+				<displayName count="few">turkmenistanski novi manati</displayName>
+				<displayName count="other">turkmenistanskih novih manatov</displayName>
 				<symbol draft="contributed">TMT</symbol>
 			</currency>
 			<currency type="TND">
 				<displayName>tunizijski dinar</displayName>
 				<displayName count="one">tunizijski dinar</displayName>
-				<displayName count="two">tunizijski dinar</displayName>
-				<displayName count="few">tunizijski dinar</displayName>
+				<displayName count="two">tunizijska dinarja</displayName>
+				<displayName count="few">tunizijski dinarji</displayName>
 				<displayName count="other">tunizijski dinar</displayName>
 				<symbol draft="contributed">TND</symbol>
 			</currency>
 			<currency type="TOP">
 				<displayName>tongovska paanga</displayName>
 				<displayName count="one">tongovska paanga</displayName>
-				<displayName count="two">tongovska paanga</displayName>
-				<displayName count="few">tongovska paanga</displayName>
+				<displayName count="two">tongovski paangi</displayName>
+				<displayName count="few">tongovske paange</displayName>
 				<displayName count="other">tongovska paanga</displayName>
 				<symbol draft="contributed">TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>timorski eskudo</displayName>
@@ -5940,44 +6133,45 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="TRY">
 				<displayName>nova turška lira</displayName>
 				<displayName count="one">nova turška lira</displayName>
-				<displayName count="two">nova turška lira</displayName>
-				<displayName count="few">nova turška lira</displayName>
-				<displayName count="other">nova turška lira</displayName>
+				<displayName count="two">novi turški liri</displayName>
+				<displayName count="few">nove turške lire</displayName>
+				<displayName count="other">novih turških lir</displayName>
 				<symbol draft="contributed">TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>dolar Trinidada in Tobaga</displayName>
 				<displayName count="one">dolar Trinidada in Tobaga</displayName>
-				<displayName count="two">dolar Trinidada in Tobaga</displayName>
-				<displayName count="few">dolar Trinidada in Tobaga</displayName>
-				<displayName count="other">dolar Trinidada in Tobaga</displayName>
+				<displayName count="two">dolarja Trinidada in Tobaga</displayName>
+				<displayName count="few">dolarji Trinidada in Tobaga</displayName>
+				<displayName count="other">dolarjev Trinidada in Tobaga</displayName>
 				<symbol draft="contributed">TTD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="TWD">
 				<displayName>novi tajvanski dolar</displayName>
 				<displayName count="one">novi tajvanski dolar</displayName>
-				<displayName count="two">novi tajvanski dolar</displayName>
-				<displayName count="few">novi tajvanski dolar</displayName>
-				<displayName count="other">novi tajvanski dolar</displayName>
+				<displayName count="two">nova tajvanska dolarja</displayName>
+				<displayName count="few">novi tajvanski dolarji</displayName>
+				<displayName count="other">novih tajvanskih dolarjev</displayName>
 				<symbol draft="contributed">NT$</symbol>
 				<symbol alt="narrow" draft="contributed">NT$</symbol>
 			</currency>
 			<currency type="TZS">
 				<displayName>tanzanijski šiling</displayName>
 				<displayName count="one">tanzanijski šiling</displayName>
-				<displayName count="two">tanzanijski šiling</displayName>
-				<displayName count="few">tanzanijski šiling</displayName>
-				<displayName count="other">tanzanijski šiling</displayName>
+				<displayName count="two">tanzanijska šilinga</displayName>
+				<displayName count="few">tanzanijski šilingi</displayName>
+				<displayName count="other">tanzanijskih šilingov</displayName>
 				<symbol draft="contributed">TZS</symbol>
 			</currency>
 			<currency type="UAH">
 				<displayName>ukrajinska grivna</displayName>
 				<displayName count="one">ukrajinska grivna</displayName>
-				<displayName count="two">ukrajinska grivna</displayName>
-				<displayName count="few">ukrajinska grivna</displayName>
-				<displayName count="other">ukrajinska grivna</displayName>
+				<displayName count="two">ukrajinski grivni</displayName>
+				<displayName count="few">ukrajinske grivne</displayName>
+				<displayName count="other">ukrajinskih grivn</displayName>
 				<symbol draft="contributed">UAH</symbol>
 				<symbol alt="narrow" draft="contributed">₴</symbol>
 			</currency>
@@ -5990,17 +6184,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="UGX">
 				<displayName>ugandski šiling</displayName>
 				<displayName count="one">ugandski šiling</displayName>
-				<displayName count="two">ugandski šiling</displayName>
-				<displayName count="few">ugandski šiling</displayName>
-				<displayName count="other">ugandski šiling</displayName>
+				<displayName count="two">ugandska šilinga</displayName>
+				<displayName count="few">ugandski šilingi</displayName>
+				<displayName count="other">ugandskih šilingov</displayName>
 				<symbol draft="contributed">UGX</symbol>
 			</currency>
 			<currency type="USD">
 				<displayName>ameriški dolar</displayName>
-				<displayName count="one" draft="contributed">ameriški dolar</displayName>
-				<displayName count="two" draft="contributed">ameriška dolarja</displayName>
-				<displayName count="few" draft="contributed">ameriški dolarji</displayName>
-				<displayName count="other" draft="contributed">ameriških dolarjev</displayName>
+				<displayName count="one">ameriški dolar</displayName>
+				<displayName count="two">ameriška dolarja</displayName>
+				<displayName count="few">ameriški dolarji</displayName>
+				<displayName count="other">ameriških dolarjev</displayName>
 				<symbol>$</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -6016,18 +6210,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="UYU">
 				<displayName>urugvajski peso</displayName>
 				<displayName count="one">urugvajski peso</displayName>
-				<displayName count="two">urugvajski peso</displayName>
-				<displayName count="few">urugvajski peso</displayName>
-				<displayName count="other">urugvajski peso</displayName>
+				<displayName count="two">urugvajska pesa</displayName>
+				<displayName count="few">urugvajski pesi</displayName>
+				<displayName count="other">urugvajskih pesov</displayName>
 				<symbol draft="contributed">UYU</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="UZS">
 				<displayName>uzbeški sum</displayName>
 				<displayName count="one">uzbeški sum</displayName>
-				<displayName count="two">uzbeški sum</displayName>
-				<displayName count="few">uzbeški sum</displayName>
-				<displayName count="other">uzbeški sum</displayName>
+				<displayName count="two">uzbeška suma</displayName>
+				<displayName count="few">uzbeški sumi</displayName>
+				<displayName count="other">uzbeških sumov</displayName>
 				<symbol draft="contributed">UZS</symbol>
 			</currency>
 			<currency type="VEB">
@@ -6036,10 +6230,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="VEF">
 				<displayName>venezuelski bolivar</displayName>
 				<displayName count="one">venezuelski bolivar</displayName>
-				<displayName count="two">venezuelski bolivar</displayName>
-				<displayName count="few">venezuelski bolivar</displayName>
-				<displayName count="other">venezuelski bolivar</displayName>
+				<displayName count="two">venezuelska bolivarja</displayName>
+				<displayName count="few">venezuelski bolivarji</displayName>
+				<displayName count="other">venezuelskih bolivarjev</displayName>
 				<symbol draft="contributed">VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>vientnamski dong</displayName>
@@ -6053,25 +6248,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="VUV">
 				<displayName>vanuatujski vatu</displayName>
 				<displayName count="one">vanuatujski vatu</displayName>
-				<displayName count="two">vanuatujski vatu</displayName>
-				<displayName count="few">vanuatujski vatu</displayName>
-				<displayName count="other">vanuatujski vatu</displayName>
+				<displayName count="two">vanuatujska vata</displayName>
+				<displayName count="few">vanuatujski vati</displayName>
+				<displayName count="other">vanuatujskih vatov</displayName>
 				<symbol draft="contributed">VUV</symbol>
 			</currency>
 			<currency type="WST">
 				<displayName>samoanska tala</displayName>
 				<displayName count="one">samoanska tala</displayName>
-				<displayName count="two">samoanska tala</displayName>
-				<displayName count="few">samoanska tala</displayName>
-				<displayName count="other">samoanska tala</displayName>
+				<displayName count="two">samoanski tali</displayName>
+				<displayName count="few">samoanske tale</displayName>
+				<displayName count="other">samoanskih tal</displayName>
 				<symbol draft="contributed">WST</symbol>
 			</currency>
 			<currency type="XAF">
 				<displayName>CFA frank BEAC</displayName>
-				<displayName count="one">CFA frank BEAC</displayName>
-				<displayName count="two">CFA frank BEAC</displayName>
-				<displayName count="few">CFA frank BEAC</displayName>
-				<displayName count="other">CFA frank BEAC</displayName>
+				<displayName count="one">srednjeafriški frank CFA</displayName>
+				<displayName count="two">franka CFA BEAC</displayName>
+				<displayName count="few">franki CFA BEAC</displayName>
+				<displayName count="other">srednjeafriški frank CFA</displayName>
 				<symbol draft="contributed">FCFA</symbol>
 			</currency>
 			<currency type="XAG">
@@ -6095,10 +6290,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="XCD">
 				<displayName>vzhodnokaribski dolar</displayName>
 				<displayName count="one">vzhodnokaribski dolar</displayName>
-				<displayName count="two">vzhodnokaribski dolar</displayName>
-				<displayName count="few">vzhodnokaribski dolar</displayName>
-				<displayName count="other">vzhodnokaribski dolar</displayName>
+				<displayName count="two">vzhodnokaribska dolarja</displayName>
+				<displayName count="few">vzhodnokaribski dolarji</displayName>
+				<displayName count="other">vzhodnokaribskih dolarjev</displayName>
 				<symbol draft="contributed">EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>posebne pravice črpanja</displayName>
@@ -6113,11 +6309,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>frank UIC</displayName>
 			</currency>
 			<currency type="XOF">
-				<displayName>CFA frank BCEAO</displayName>
-				<displayName count="one">CFA frank BCEAO</displayName>
-				<displayName count="two">CFA frank BCEAO</displayName>
-				<displayName count="few">CFA frank BCEAO</displayName>
-				<displayName count="other">CFA frank BCEAO</displayName>
+				<displayName>zahodnoafriški frank CFA</displayName>
+				<displayName count="one">zahodnoafriški frank CFA</displayName>
+				<displayName count="two">franka CFA BCEAO</displayName>
+				<displayName count="few">franki CFA BCEAO</displayName>
+				<displayName count="other">zahodnoafriški frank CFA</displayName>
 				<symbol draft="contributed">CFA</symbol>
 			</currency>
 			<currency type="XPD">
@@ -6126,9 +6322,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="XPF">
 				<displayName>CFP frank</displayName>
 				<displayName count="one">CFP frank</displayName>
-				<displayName count="two">CFP frank</displayName>
-				<displayName count="few">CFP frank</displayName>
-				<displayName count="other">CFP frank</displayName>
+				<displayName count="two">franka CFP</displayName>
+				<displayName count="few">franki CFP</displayName>
+				<displayName count="other">frankov CFP</displayName>
 				<symbol draft="contributed">CFPF</symbol>
 			</currency>
 			<currency type="XPT">
@@ -6138,7 +6334,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>koda za potrebe testiranja</displayName>
 			</currency>
 			<currency type="XXX">
-				<displayName>neznana ali neveljavna valuta</displayName>
+				<displayName>neznana valuta</displayName>
 				<displayName count="one">neznana ali neveljavna valuta</displayName>
 				<displayName count="two">neznana ali neveljavna valuta</displayName>
 				<displayName count="few">neznana ali neveljavna valuta</displayName>
@@ -6150,9 +6346,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="YER">
 				<displayName>jemenski rial</displayName>
 				<displayName count="one">jemenski rial</displayName>
-				<displayName count="two">jemenski rial</displayName>
-				<displayName count="few">jemenski rial</displayName>
-				<displayName count="other">jemenski rial</displayName>
+				<displayName count="two">jemenska riala</displayName>
+				<displayName count="few">jemenski riali</displayName>
+				<displayName count="other">jemenskih rialov</displayName>
 				<symbol draft="contributed">YER</symbol>
 			</currency>
 			<currency type="YUD">
@@ -6170,10 +6366,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="ZAR">
 				<displayName>južnoafriški rand</displayName>
 				<displayName count="one">južnoafriški rand</displayName>
-				<displayName count="two">južnoafriški rand</displayName>
-				<displayName count="few">južnoafriški rand</displayName>
-				<displayName count="other">južnoafriški rand</displayName>
+				<displayName count="two">južnoafriška randa</displayName>
+				<displayName count="few">južnoafriški randi</displayName>
+				<displayName count="other">južnoafriških randov</displayName>
 				<symbol draft="contributed">ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>zambijska kvača (1968–2012)</displayName>
@@ -6181,10 +6378,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="ZMW">
 				<displayName>zambijska kvača</displayName>
 				<displayName count="one">zambijska kvača</displayName>
-				<displayName count="two">zambijska kvača</displayName>
-				<displayName count="few">zambijska kvača</displayName>
-				<displayName count="other">zambijska kvača</displayName>
+				<displayName count="two">zambijski kvači</displayName>
+				<displayName count="few">zambijske kvače</displayName>
+				<displayName count="other">zambijskih kvač</displayName>
 				<symbol draft="contributed">ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>zairski novi zaire</displayName>
@@ -6201,13 +6399,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast" draft="contributed">⩾{0}</pattern>
-			<pattern type="range" draft="contributed">{0}–{1}</pattern>
+			<pattern type="range">{0}–{1}</pattern>
 		</miscPatterns>
 	</numbers>
 	<units>
 		<unitLength type="long">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0} na {1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName draft="contributed">G</displayName>
@@ -6223,26 +6421,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} metri na sekundo kvadrat</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} metrov na sekundo kvadrat</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName draft="contributed">kotna minuta</displayName>
-				<unitPattern count="one" draft="contributed">{0}′</unitPattern>
-				<unitPattern count="two" draft="contributed">{0}′</unitPattern>
-				<unitPattern count="few" draft="contributed">{0}′</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}′</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName draft="contributed">kotna sekunda</displayName>
-				<unitPattern count="one" draft="contributed">{0}″</unitPattern>
-				<unitPattern count="two" draft="contributed">{0}″</unitPattern>
-				<unitPattern count="few" draft="contributed">{0}″</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName draft="contributed">stopinja</displayName>
-				<unitPattern count="one" draft="contributed">{0} °</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} °</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} °</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} °</unitPattern>
+			<unit type="angle-revolution">
+				<displayName>vrtljaj</displayName>
+				<unitPattern count="one">{0} vrtljaj</unitPattern>
+				<unitPattern count="two">{0} vrtljaja</unitPattern>
+				<unitPattern count="few">{0} vrtljaji</unitPattern>
+				<unitPattern count="other">{0} vrtljajev</unitPattern>
 			</unit>
 			<unit type="angle-radian">
 				<displayName draft="contributed">radian</displayName>
@@ -6251,12 +6435,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} radianov</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} radianov</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName draft="contributed">juter</displayName>
-				<unitPattern count="one" draft="contributed">{0} jutro</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} jutri</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} jutra</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} juter</unitPattern>
+			<unit type="angle-degree">
+				<displayName draft="contributed">stopinja</displayName>
+				<unitPattern count="one">{0} stopinja</unitPattern>
+				<unitPattern count="two">{0} stopinji</unitPattern>
+				<unitPattern count="few">{0} stopinje</unitPattern>
+				<unitPattern count="other">{0} stopinj</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName draft="contributed">kotna minuta</displayName>
+				<unitPattern count="one">{0} kotna minuta</unitPattern>
+				<unitPattern count="two">{0} kotni minuti</unitPattern>
+				<unitPattern count="few">{0} kotne minute</unitPattern>
+				<unitPattern count="other">{0} kotnih minut</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName draft="contributed">kotna sekunda</displayName>
+				<unitPattern count="one">{0} kotna sekunda</unitPattern>
+				<unitPattern count="two">{0} kotni sekundi</unitPattern>
+				<unitPattern count="few">{0} kotne sekunde</unitPattern>
+				<unitPattern count="other">{0} kotnih sekund</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName draft="contributed">kvadratni kilometri</displayName>
+				<unitPattern count="one">{0} kvadratni kilometer</unitPattern>
+				<unitPattern count="two">{0} kvadratna kilometra</unitPattern>
+				<unitPattern count="few">{0} kvadratni kilometri</unitPattern>
+				<unitPattern count="other">{0} kvadratnih kilometrov</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName draft="contributed">ha</displayName>
@@ -6265,12 +6470,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} ha</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName draft="contributed">kvadratni metri</displayName>
+				<unitPattern count="one">{0} kvadratni meter</unitPattern>
+				<unitPattern count="two">{0} kvadratna metra</unitPattern>
+				<unitPattern count="few">{0} kvadratni metri</unitPattern>
+				<unitPattern count="other">{0} kvadratnih metrov</unitPattern>
+				<perUnitPattern>{0} na kvadratni meter</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName draft="contributed">kvadratni centimetri</displayName>
 				<unitPattern count="one" draft="contributed">{0} kvadratni centimeter</unitPattern>
 				<unitPattern count="two" draft="contributed">{0} kvadratna centimetra</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} kvadratni centimetri</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kvadratnih centimetrov</unitPattern>
+				<perUnitPattern>{0} na kvadratni centimeter</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName draft="contributed">mi²</displayName>
+				<unitPattern count="one" draft="contributed">{0} mi²</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} mi²</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mi²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName draft="contributed">juter</displayName>
+				<unitPattern count="one" draft="contributed">{0} jutro</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} jutri</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} jutra</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} juter</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName draft="contributed">yd²</displayName>
+				<unitPattern count="one" draft="contributed">{0} yd²</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} yd²</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} yd²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName draft="contributed">ft²</displayName>
@@ -6285,34 +6520,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} in²</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} in²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} in²</unitPattern>
+				<perUnitPattern>{0} na kvadratni palec</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="contributed">kvadratni kilometri</displayName>
-				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName draft="contributed">kvadratni metri</displayName>
-				<unitPattern count="one" draft="contributed">{0} m²</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} m²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} m²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName draft="contributed">mi²</displayName>
-				<unitPattern count="one" draft="contributed">{0} mi²</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} mi²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mi²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName draft="contributed">yd²</displayName>
-				<unitPattern count="one" draft="contributed">{0} yd²</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} yd²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} yd²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName draft="contributed">karat</displayName>
+				<unitPattern count="one" draft="contributed">{0} karat</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} karata</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} karati</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} karatov</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName draft="contributed">litrov na kilometer</displayName>
@@ -6321,6 +6536,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} litrov na kilometer</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} litrov na kilometer</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} liter na 100 kilometrov</unitPattern>
+				<unitPattern count="two">{0} litra na 100 kilometrov</unitPattern>
+				<unitPattern count="few">{0} litri na 100 kilometrov</unitPattern>
+				<unitPattern count="other">{0} litrov na 100 kilometrov</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName draft="contributed">milj na galono</displayName>
 				<unitPattern count="one" draft="contributed">{0} milja na galono</unitPattern>
@@ -6328,69 +6550,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} milj na galono</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} milj na galono</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName draft="contributed">bit</displayName>
-				<unitPattern count="one" draft="contributed">{0} bit</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} bita</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} bite</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} bitov</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName draft="contributed">bajt</displayName>
-				<unitPattern count="one" draft="contributed">{0} bajt</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} bajta</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} bajti</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} bajtov</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName draft="contributed">gigabiti</displayName>
-				<unitPattern count="one" draft="contributed">{0} gigabit</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} gigabita</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} gigabiti</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} gigabitov</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName draft="contributed">gigabajti</displayName>
-				<unitPattern count="one" draft="contributed">{0} gigabajt</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} gigabajta</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} gigabajti</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} gigabajtov</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName draft="contributed">kilobiti</displayName>
-				<unitPattern count="one" draft="contributed">{0} kilobit</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} kilobita</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kilobiti</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kilobitov</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName draft="contributed">kilobajti</displayName>
-				<unitPattern count="one" draft="contributed">{0} kilobajt</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} kilobajta</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kilobajti</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kilobajtov</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName draft="contributed">megabiti</displayName>
-				<unitPattern count="one" draft="contributed">{0} megabit</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} megabita</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} megabiti</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} megabitov</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName draft="contributed">megabajti</displayName>
-				<unitPattern count="one" draft="contributed">{0} megabajt</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} megabajta</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} megabajti</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} megabajtov</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName draft="contributed">terabiti</displayName>
-				<unitPattern count="one" draft="contributed">{0} terabit</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} terabita</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} terabiti</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} terabitov</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName draft="contributed">terabajti</displayName>
 				<unitPattern count="one" draft="contributed">{0} terabajt</unitPattern>
@@ -6398,77 +6557,152 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} terabajti</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} terabajtov</unitPattern>
 			</unit>
-			<unit type="duration-day">
-				<displayName draft="contributed">dni</displayName>
-				<unitPattern count="one" draft="contributed">{0} dan</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} dni</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} dnevi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} dni</unitPattern>
+			<unit type="digital-terabit">
+				<displayName draft="contributed">terabiti</displayName>
+				<unitPattern count="one" draft="contributed">{0} terabit</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} terabita</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} terabiti</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} terabitov</unitPattern>
 			</unit>
-			<unit type="duration-hour">
-				<displayName draft="contributed">ur</displayName>
-				<unitPattern count="one" draft="contributed">{0} ura</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} uri</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ure</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ur</unitPattern>
-				<perUnitPattern draft="contributed">{0}/h</perUnitPattern>
+			<unit type="digital-gigabyte">
+				<displayName draft="contributed">gigabajti</displayName>
+				<unitPattern count="one" draft="contributed">{0} gigabajt</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} gigabajta</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} gigabajti</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} gigabajtov</unitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName draft="contributed">μs</displayName>
-				<unitPattern count="one" draft="contributed">{0} μs</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} μs</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} μs</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} μs</unitPattern>
+			<unit type="digital-gigabit">
+				<displayName draft="contributed">gigabiti</displayName>
+				<unitPattern count="one" draft="contributed">{0} gigabit</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} gigabita</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} gigabiti</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} gigabitov</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="contributed">ms</displayName>
-				<unitPattern count="one" draft="contributed">{0} ms</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ms</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ms</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ms</unitPattern>
+			<unit type="digital-megabyte">
+				<displayName draft="contributed">megabajti</displayName>
+				<unitPattern count="one" draft="contributed">{0} megabajt</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} megabajta</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} megabajti</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} megabajtov</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName draft="contributed">minut</displayName>
-				<unitPattern count="one" draft="contributed">{0} minuta</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} minuti</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} minute</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} minut</unitPattern>
+			<unit type="digital-megabit">
+				<displayName draft="contributed">megabiti</displayName>
+				<unitPattern count="one" draft="contributed">{0} megabit</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} megabita</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} megabiti</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} megabitov</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">mesecev</displayName>
-				<unitPattern count="one" draft="contributed">{0} mesec</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} meseca</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} meseci</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mesecev</unitPattern>
+			<unit type="digital-kilobyte">
+				<displayName draft="contributed">kilobajti</displayName>
+				<unitPattern count="one" draft="contributed">{0} kilobajt</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} kilobajta</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kilobajti</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kilobajtov</unitPattern>
 			</unit>
-			<unit type="duration-nanosecond">
-				<displayName draft="contributed">ns</displayName>
-				<unitPattern count="one" draft="contributed">{0} ns</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ns</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ns</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ns</unitPattern>
+			<unit type="digital-kilobit">
+				<displayName draft="contributed">kilobiti</displayName>
+				<unitPattern count="one" draft="contributed">{0} kilobit</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} kilobita</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kilobiti</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kilobitov</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName draft="contributed">sekund</displayName>
-				<unitPattern count="one" draft="contributed">{0} sekunda</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} sekundi</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} sekunde</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} sekund</unitPattern>
-				<perUnitPattern draft="contributed">{0}/s</perUnitPattern>
+			<unit type="digital-byte">
+				<displayName draft="contributed">bajt</displayName>
+				<unitPattern count="one" draft="contributed">{0} bajt</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} bajta</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} bajti</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} bajtov</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">tednov</displayName>
-				<unitPattern count="one" draft="contributed">{0} teden</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} tedna</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} tedni</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} tednov</unitPattern>
+			<unit type="digital-bit">
+				<displayName draft="contributed">bit</displayName>
+				<unitPattern count="one" draft="contributed">{0} bit</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} bita</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} bite</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} bitov</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>stoletja</displayName>
+				<unitPattern count="one">{0} stoletje</unitPattern>
+				<unitPattern count="two">{0} stoletji</unitPattern>
+				<unitPattern count="few">{0} stoletja</unitPattern>
+				<unitPattern count="other">{0} stoletij</unitPattern>
 			</unit>
 			<unit type="duration-year">
-				<displayName draft="contributed">let</displayName>
-				<unitPattern count="one" draft="contributed">{0} leto</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} leti</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} leta</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} let</unitPattern>
+				<displayName>let</displayName>
+				<unitPattern count="one">{0} leto</unitPattern>
+				<unitPattern count="two">{0} leti</unitPattern>
+				<unitPattern count="few">{0} leta</unitPattern>
+				<unitPattern count="other">{0} let</unitPattern>
+				<perUnitPattern>{0} na leto</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mesecev</displayName>
+				<unitPattern count="one">{0} mesec</unitPattern>
+				<unitPattern count="two">{0} meseca</unitPattern>
+				<unitPattern count="few">{0} meseci</unitPattern>
+				<unitPattern count="other">{0} mesecev</unitPattern>
+				<perUnitPattern>{0} na mesec</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>tednov</displayName>
+				<unitPattern count="one">{0} teden</unitPattern>
+				<unitPattern count="two">{0} tedna</unitPattern>
+				<unitPattern count="few">{0} tedni</unitPattern>
+				<unitPattern count="other">{0} tednov</unitPattern>
+				<perUnitPattern>{0} na teden</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>dni</displayName>
+				<unitPattern count="one">{0} dan</unitPattern>
+				<unitPattern count="two">{0} dneva</unitPattern>
+				<unitPattern count="few">{0} dnevi</unitPattern>
+				<unitPattern count="other">{0} dni</unitPattern>
+				<perUnitPattern>{0} na dan</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>ur</displayName>
+				<unitPattern count="one">{0} ura</unitPattern>
+				<unitPattern count="two">{0} uri</unitPattern>
+				<unitPattern count="few">{0} ure</unitPattern>
+				<unitPattern count="other">{0} ur</unitPattern>
+				<perUnitPattern>{0}/h</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>minut</displayName>
+				<unitPattern count="one">{0} minuta</unitPattern>
+				<unitPattern count="two">{0} minuti</unitPattern>
+				<unitPattern count="few">{0} minute</unitPattern>
+				<unitPattern count="other">{0} minut</unitPattern>
+				<perUnitPattern>{0} na minuto</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>sekund</displayName>
+				<unitPattern count="one">{0} sekunda</unitPattern>
+				<unitPattern count="two">{0} sekundi</unitPattern>
+				<unitPattern count="few">{0} sekunde</unitPattern>
+				<unitPattern count="other">{0} sekund</unitPattern>
+				<perUnitPattern>{0}/s</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="two">{0} millisekundi</unitPattern>
+				<unitPattern count="few">{0} millisekunde</unitPattern>
+				<unitPattern count="other">{0} millisekund</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="two">{0} μs</unitPattern>
+				<unitPattern count="few">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="two">{0} ns</unitPattern>
+				<unitPattern count="few">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName draft="contributed">amperi</displayName>
@@ -6498,6 +6732,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} voltov</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} voltov</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName draft="contributed">kcal</displayName>
+				<unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} kcal</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kcal</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName draft="contributed">cal</displayName>
 				<unitPattern count="one" draft="contributed">{0} cal</unitPattern>
@@ -6512,20 +6753,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} kalorij</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kalorij</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName draft="contributed">joule</displayName>
-				<unitPattern count="one" draft="contributed">{0} J</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} J</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} J</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName draft="contributed">kcal</displayName>
-				<unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} kcal</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kcal</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName draft="contributed">kJ</displayName>
 				<unitPattern count="one" draft="contributed">{0} kJ</unitPattern>
@@ -6533,6 +6760,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} kJ</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName draft="contributed">joule</displayName>
+				<unitPattern count="one" draft="contributed">{0} J</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} J</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} J</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName draft="contributed">kWh</displayName>
 				<unitPattern count="one" draft="contributed">{0} kWh</unitPattern>
@@ -6547,12 +6781,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} gigahertzev</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} gigahertzev</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName draft="contributed">hertz</displayName>
-				<unitPattern count="one" draft="contributed">{0} hertz</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} hertza</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} hertzev</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} hertzev</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName draft="contributed">megahertz</displayName>
+				<unitPattern count="one" draft="contributed">{0} megahertz</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} megahertza</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} megahertzev</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} megahertzev</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName draft="contributed">kilohertz</displayName>
@@ -6561,26 +6795,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} kilohertzev</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kilohertzev</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName draft="contributed">megahertz</displayName>
-				<unitPattern count="one" draft="contributed">{0} megahertz</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} megahertza</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} megahertzev</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} megahertzev</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName draft="contributed">hertz</displayName>
+				<unitPattern count="one" draft="contributed">{0} hertz</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} hertza</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} hertzev</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} hertzev</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName draft="contributed">au</displayName>
-				<unitPattern count="one" draft="contributed">{0} au</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} au</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} au</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName draft="contributed">kilometri</displayName>
+				<unitPattern count="one">{0} kilometer</unitPattern>
+				<unitPattern count="two">{0} kilometra</unitPattern>
+				<unitPattern count="few">{0} kilometri</unitPattern>
+				<unitPattern count="other">{0} kilometrov</unitPattern>
+				<perUnitPattern>{0} na kilometer</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">centimetri</displayName>
-				<unitPattern count="one" draft="contributed">{0} cm</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} cm</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} cm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName draft="contributed">metri</displayName>
+				<unitPattern count="one">{0} meter</unitPattern>
+				<unitPattern count="two">{0} metra</unitPattern>
+				<unitPattern count="few">{0} metri</unitPattern>
+				<unitPattern count="other">{0} metrov</unitPattern>
+				<perUnitPattern>{0} na meter</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName draft="contributed">decimetri</displayName>
@@ -6589,40 +6825,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} decimetri</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} decimetrov</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName draft="contributed">ft</displayName>
-				<unitPattern count="one" draft="contributed">{0} ft</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ft</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ft</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ft</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="contributed">centimetri</displayName>
+				<unitPattern count="one">{0} centimeter</unitPattern>
+				<unitPattern count="two">{0} centimetra</unitPattern>
+				<unitPattern count="few">{0} centimetri</unitPattern>
+				<unitPattern count="other">{0} centimetrov</unitPattern>
+				<perUnitPattern>{0} na centimeter</perUnitPattern>
 			</unit>
-			<unit type="length-inch">
-				<displayName draft="contributed">in</displayName>
-				<unitPattern count="one" draft="contributed">{0} in</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} in</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} in</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName draft="contributed">kilometri</displayName>
-				<unitPattern count="one" draft="contributed">{0} km</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} km</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} km</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName draft="contributed">svetlobnih let</displayName>
-				<unitPattern count="one" draft="contributed">{0} svetlobno leto</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} svetlobni leti</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} svetlobna leta</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} svetlobnih let</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName draft="contributed">metri</displayName>
-				<unitPattern count="one" draft="contributed">{0} m</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} m</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} m</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} m</unitPattern>
+			<unit type="length-millimeter">
+				<displayName draft="contributed">milimetri</displayName>
+				<unitPattern count="one">{0} milimeter</unitPattern>
+				<unitPattern count="two">{0} milimetra</unitPattern>
+				<unitPattern count="few">{0} milimetri</unitPattern>
+				<unitPattern count="other">{0} milimetrov</unitPattern>
 			</unit>
 			<unit type="length-micrometer">
 				<displayName draft="contributed">mikrometri</displayName>
@@ -6631,20 +6847,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} mikrometri</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mikrometrov</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName draft="contributed">milje</displayName>
-				<unitPattern count="one" draft="contributed">{0} mi</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} mi</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mi</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName draft="contributed">milimetri</displayName>
-				<unitPattern count="one" draft="contributed">{0} mm</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} mm</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mm</unitPattern>
-			</unit>
 			<unit type="length-nanometer">
 				<displayName draft="contributed">nanometri</displayName>
 				<unitPattern count="one" draft="contributed">{0} nanometer</unitPattern>
@@ -6652,20 +6854,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} nanometri</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} nanometrov</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName draft="contributed">nmi</displayName>
-				<unitPattern count="one" draft="contributed">{0} nmi</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} nmi</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} nmi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName draft="contributed">pc</displayName>
-				<unitPattern count="one" draft="contributed">{0} pc</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} pc</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} pc</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName draft="contributed">pm</displayName>
 				<unitPattern count="one" draft="contributed">{0} pm</unitPattern>
@@ -6673,6 +6861,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} pm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="contributed">milje</displayName>
+				<unitPattern count="one">{0} milja</unitPattern>
+				<unitPattern count="two">{0} milji</unitPattern>
+				<unitPattern count="few">{0} milje</unitPattern>
+				<unitPattern count="other">{0} milj</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName draft="contributed">yd</displayName>
 				<unitPattern count="one" draft="contributed">{0} yd</unitPattern>
@@ -6680,6 +6875,57 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} yd</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName draft="contributed">ft</displayName>
+				<unitPattern count="one" draft="contributed">{0} ft</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} ft</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ft</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ft</unitPattern>
+				<perUnitPattern>{0} na čevelj</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="contributed">in</displayName>
+				<unitPattern count="one" draft="contributed">{0} in</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} in</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} in</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} in</unitPattern>
+				<perUnitPattern>{0} na palec</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName draft="contributed">pc</displayName>
+				<unitPattern count="one" draft="contributed">{0} pc</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} pc</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} pc</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="contributed">svetlobnih let</displayName>
+				<unitPattern count="one" draft="contributed">{0} svetlobno leto</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} svetlobni leti</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} svetlobna leta</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} svetlobnih let</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName draft="contributed">au</displayName>
+				<unitPattern count="one" draft="contributed">{0} au</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} au</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} au</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName draft="contributed">nmi</displayName>
+				<unitPattern count="one" draft="contributed">{0} nmi</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} nmi</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} nmi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="contributed">skandinavska milja</displayName>
+				<unitPattern count="one">{0} skandinavska milja</unitPattern>
+				<unitPattern count="two">{0} skandinavski milji</unitPattern>
+				<unitPattern count="few">{0} skandinavske milje</unitPattern>
+				<unitPattern count="other">{0} skandinavskih milj</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName draft="contributed">luks</displayName>
 				<unitPattern count="one" draft="contributed">{0} luks</unitPattern>
@@ -6687,27 +6933,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} luksi</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} luksov</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName draft="contributed">CD</displayName>
-				<unitPattern count="one" draft="contributed">{0} CD</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} CD</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} CD</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName draft="contributed">g</displayName>
-				<unitPattern count="one" draft="contributed">{0} g</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} g</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} g</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName draft="contributed">kg</displayName>
-				<unitPattern count="one" draft="contributed">{0} kg</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} kg</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName draft="contributed">t</displayName>
 				<unitPattern count="one" draft="contributed">{0} t</unitPattern>
@@ -6715,12 +6940,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} t</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName draft="contributed">µg</displayName>
-				<unitPattern count="one" draft="contributed">{0} µg</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} µg</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} µg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName draft="contributed">kg</displayName>
+				<unitPattern count="one" draft="contributed">{0} kg</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} kg</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kg</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName draft="contributed">g</displayName>
+				<unitPattern count="one" draft="contributed">{0} g</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} g</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} g</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName draft="contributed">mg</displayName>
@@ -6729,26 +6963,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} mg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="contributed">oz</displayName>
-				<unitPattern count="one" draft="contributed">{0} oz</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} oz</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} oz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName draft="contributed">oz t</displayName>
-				<unitPattern count="one" draft="contributed">{0} oz t</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} oz t</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} oz t</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName draft="contributed">lb</displayName>
-				<unitPattern count="one" draft="contributed">{0} lb</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} lb</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} lb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} lb</unitPattern>
+			<unit type="mass-microgram">
+				<displayName draft="contributed">µg</displayName>
+				<unitPattern count="one" draft="contributed">{0} µg</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} µg</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} µg</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName draft="contributed">tn</displayName>
@@ -6757,6 +6977,36 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} tn</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName draft="contributed">lb</displayName>
+				<unitPattern count="one" draft="contributed">{0} lb</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} lb</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} lb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName draft="contributed">oz</displayName>
+				<unitPattern count="one" draft="contributed">{0} oz</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} oz</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} oz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName draft="contributed">oz t</displayName>
+				<unitPattern count="one" draft="contributed">{0} oz t</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} oz t</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} oz t</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName draft="contributed">CD</displayName>
+				<unitPattern count="one" draft="contributed">{0} CD</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} CD</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} CD</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName draft="contributed">GW</displayName>
 				<unitPattern count="one" draft="contributed">{0} GW</unitPattern>
@@ -6764,20 +7014,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} GW</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="contributed">KM</displayName>
-				<unitPattern count="one" draft="contributed">{0} KM</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} KM</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} KM</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} KM</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName draft="contributed">kW</displayName>
-				<unitPattern count="one" draft="contributed">{0} kW</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} kW</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kW</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName draft="contributed">MW</displayName>
 				<unitPattern count="one" draft="contributed">{0} MW</unitPattern>
@@ -6785,12 +7021,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} MW</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName draft="contributed">mW</displayName>
-				<unitPattern count="one" draft="contributed">{0} mW</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} mW</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mW</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName draft="contributed">kW</displayName>
+				<unitPattern count="one" draft="contributed">{0} kW</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} kW</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kW</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName draft="contributed">W</displayName>
@@ -6799,6 +7035,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} W</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName draft="contributed">mW</displayName>
+				<unitPattern count="one" draft="contributed">{0} mW</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} mW</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mW</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName draft="contributed">KM</displayName>
+				<unitPattern count="one" draft="contributed">{0} KM</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} KM</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} KM</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} KM</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="contributed">hPa</displayName>
 				<unitPattern count="one" draft="contributed">{0} hPa</unitPattern>
@@ -6806,20 +7056,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} hPa</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName draft="contributed">inHg</displayName>
-				<unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} inHg</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} inHg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName draft="contributed">mbar</displayName>
-				<unitPattern count="one" draft="contributed">{0} mbar</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} mbar</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mbar</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName draft="contributed">mm Hg</displayName>
 				<unitPattern count="one" draft="contributed">{0} mm Hg</unitPattern>
@@ -6834,33 +7070,54 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} psi</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName draft="contributed">karat</displayName>
-				<unitPattern count="one" draft="contributed">{0} karat</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} karata</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} karati</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} karatov</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName draft="contributed">inHg</displayName>
+				<unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} inHg</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} inHg</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName draft="contributed">mbar</displayName>
+				<unitPattern count="one" draft="contributed">{0} mbar</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} mbar</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mbar</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName draft="contributed">kilometri na uro</displayName>
-				<unitPattern count="one" draft="contributed">{0} km/h</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} km/h</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} km/h</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} km/h</unitPattern>
+				<unitPattern count="one">{0} kilometer na uro</unitPattern>
+				<unitPattern count="two">{0} kilometra na uro</unitPattern>
+				<unitPattern count="few">{0} kilometri na uro</unitPattern>
+				<unitPattern count="other">{0} kilometrov na uro</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
 				<displayName draft="contributed">metri na sekundo</displayName>
-				<unitPattern count="one" draft="contributed">{0} m/s</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} m/s</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} m/s</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} m/s</unitPattern>
+				<unitPattern count="one">{0} meter na sekundo</unitPattern>
+				<unitPattern count="two">{0} metra na sekundo</unitPattern>
+				<unitPattern count="few">{0} metri na sekundo</unitPattern>
+				<unitPattern count="other">{0} metrov na sekundo</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
 				<displayName draft="contributed">milje na uro</displayName>
-				<unitPattern count="one" draft="contributed">{0} mi/h</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} mi/h</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mi/h</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mi/h</unitPattern>
+				<unitPattern count="one">{0} milja na uro</unitPattern>
+				<unitPattern count="two">{0} milji na uro</unitPattern>
+				<unitPattern count="few">{0} milje na uro</unitPattern>
+				<unitPattern count="other">{0} milj na uro</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>vozel</displayName>
+				<unitPattern count="one">{0} vozel</unitPattern>
+				<unitPattern count="two">{0} vozla</unitPattern>
+				<unitPattern count="few">{0} vozli</unitPattern>
+				<unitPattern count="other">{0} vozlov</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="two">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
 				<displayName draft="contributed">°C</displayName>
@@ -6883,19 +7140,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kelvini</unitPattern>
 				<unitPattern count="other">{0} kelvinov</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName draft="contributed">ac ft</displayName>
-				<unitPattern count="one" draft="contributed">{0} ac ft</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ac ft</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ac ft</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ac ft</unitPattern>
+			<unit type="volume-cubic-kilometer">
+				<displayName draft="contributed">kubičnih kilometrov</displayName>
+				<unitPattern count="one">{0} kubični kilometer</unitPattern>
+				<unitPattern count="two">{0} kubična kilometra</unitPattern>
+				<unitPattern count="few">{0} kubični kilometri</unitPattern>
+				<unitPattern count="other">{0} kubičnih kilometrov</unitPattern>
 			</unit>
-			<unit type="volume-centiliter">
-				<displayName draft="contributed">centilitrov</displayName>
-				<unitPattern count="one" draft="contributed">{0} centiliter</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} centilitra</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} centilitri</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} centilitrov</unitPattern>
+			<unit type="volume-cubic-meter">
+				<displayName draft="contributed">kubičnih metrov</displayName>
+				<unitPattern count="one" draft="contributed">{0} kubični meter</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} kubična metra</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kubični metri</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kubičnih metrov</unitPattern>
+				<perUnitPattern>{0} na kubični meter</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-centimeter">
 				<displayName draft="contributed">kubični centimeter</displayName>
@@ -6903,6 +7161,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} kubična centimetra</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} kubični centimetri</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kubičnih centimetrov</unitPattern>
+				<perUnitPattern>{0} na kubični centimeter</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName draft="contributed">kubične milje</displayName>
+				<unitPattern count="one">{0} kubična milja</unitPattern>
+				<unitPattern count="two">{0} kubični milji</unitPattern>
+				<unitPattern count="few">{0} kubične milje</unitPattern>
+				<unitPattern count="other">{0} kubičnih milj</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName draft="contributed">kubični jard</displayName>
+				<unitPattern count="one" draft="contributed">{0} kubični jard</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} kubična jarda</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kubični jardi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kubičnih jardov</unitPattern>
 			</unit>
 			<unit type="volume-cubic-foot">
 				<displayName draft="contributed">kubični čevlji</displayName>
@@ -6918,61 +7191,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} kubični palci</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kubičnih palcev</unitPattern>
 			</unit>
-			<unit type="volume-cubic-kilometer">
-				<displayName draft="contributed">kubičnih kilometrov</displayName>
-				<unitPattern count="one" draft="contributed">{0} km³</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} km³</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} km³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} km³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-meter">
-				<displayName draft="contributed">kubičnih metrov</displayName>
-				<unitPattern count="one" draft="contributed">{0} kubični meter</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} kubična metra</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kubični metri</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kubičnih metrov</unitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<displayName draft="contributed">kubične milje</displayName>
-				<unitPattern count="one" draft="contributed">{0} mi³</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} mi³</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mi³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mi³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-yard">
-				<displayName draft="contributed">kubični jard</displayName>
-				<unitPattern count="one" draft="contributed">{0} kubični jard</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} kubična jarda</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kubični jardi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kubičnih jardov</unitPattern>
-			</unit>
-			<unit type="volume-cup">
-				<displayName draft="contributed">skodelice</displayName>
-				<unitPattern count="one" draft="contributed">{0} skodelica</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} skodelici</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} skodelice</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} skodelic</unitPattern>
-			</unit>
-			<unit type="volume-deciliter">
-				<displayName draft="contributed">decilitri</displayName>
-				<unitPattern count="one" draft="contributed">{0} deciliter</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} decilitra</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} decilitri</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} decilitrov</unitPattern>
-			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName draft="contributed">fl oz</displayName>
-				<unitPattern count="one" draft="contributed">{0} fl oz</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} fl oz</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} fl oz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName draft="contributed">gal</displayName>
-				<unitPattern count="one" draft="contributed">{0} gal</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} gal</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} gal</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName draft="contributed">megalitri</displayName>
+				<unitPattern count="one" draft="contributed">{0} megaliter</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} megalitra</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} megalitri</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} megalitrov</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName draft="contributed">hektolitri</displayName>
@@ -6983,17 +7207,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="volume-liter">
 				<displayName draft="contributed">litrov</displayName>
-				<unitPattern count="one" draft="contributed">{0} l</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} l</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} l</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} l</unitPattern>
+				<unitPattern count="one">{0} liter</unitPattern>
+				<unitPattern count="two">{0} litra</unitPattern>
+				<unitPattern count="few">{0} litri</unitPattern>
+				<unitPattern count="other">{0} litrov</unitPattern>
+				<perUnitPattern>{0} na liter</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName draft="contributed">megalitri</displayName>
-				<unitPattern count="one" draft="contributed">{0} megaliter</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} megalitra</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} megalitri</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} megalitrov</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName draft="contributed">decilitri</displayName>
+				<unitPattern count="one" draft="contributed">{0} deciliter</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} decilitra</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} decilitri</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} decilitrov</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName draft="contributed">centilitrov</displayName>
+				<unitPattern count="one" draft="contributed">{0} centiliter</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} centilitra</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} centilitri</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} centilitrov</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName draft="contributed">mililitri</displayName>
@@ -7002,12 +7234,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} mililitri</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} militrov</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName draft="contributed">pt</displayName>
-				<unitPattern count="one" draft="contributed">{0} pt</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} pt</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} pt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName draft="contributed">metrične pinte</displayName>
+				<unitPattern count="one" draft="contributed">{0} metrična pinta</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} metrični pinti</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} metrične pinte</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} metričnih pint</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>metrične skodelice</displayName>
+				<unitPattern count="one">{0} metrična skodelica</unitPattern>
+				<unitPattern count="two">{0} metrični skodelici</unitPattern>
+				<unitPattern count="few">{0} metrične skodelice</unitPattern>
+				<unitPattern count="other">{0} metričnih skodelic</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName draft="contributed">ac ft</displayName>
+				<unitPattern count="one" draft="contributed">{0} ac ft</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} ac ft</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ac ft</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName draft="contributed">gal</displayName>
+				<unitPattern count="one" draft="contributed">{0} gal</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} gal</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} gal</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} gal</unitPattern>
+				<perUnitPattern>{0} na galono</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName draft="contributed">qt</displayName>
@@ -7016,6 +7270,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} qt</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName draft="contributed">pt</displayName>
+				<unitPattern count="one" draft="contributed">{0} pt</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} pt</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} pt</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName draft="contributed">skodelice</displayName>
+				<unitPattern count="one" draft="contributed">{0} skodelica</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} skodelici</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} skodelice</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} skodelic</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName draft="contributed">fl oz</displayName>
+				<unitPattern count="one" draft="contributed">{0} fl oz</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} fl oz</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} fl oz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName draft="contributed">jedilne žlice</displayName>
 				<unitPattern count="one" draft="contributed">{0} jedilna žlica</unitPattern>
@@ -7030,6 +7305,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} čajne žličke</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} čajnih žličk</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} V</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} S</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} J</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} Z</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -7049,6 +7330,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} m/s²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>vrt</displayName>
+				<unitPattern count="one">{0} vrt</unitPattern>
+				<unitPattern count="two">{0} vrt</unitPattern>
+				<unitPattern count="few">{0} vrt</unitPattern>
+				<unitPattern count="other">{0} vrt</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName draft="contributed">rad</displayName>
+				<unitPattern count="one" draft="contributed">{0} rad</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} rad</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} rad</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName draft="contributed">°</displayName>
+				<unitPattern count="one" draft="contributed">{0} °</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} °</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} °</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} °</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName draft="contributed">′</displayName>
 				<unitPattern count="one" draft="contributed">{0}′</unitPattern>
@@ -7063,26 +7365,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0}″</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName draft="contributed">°</displayName>
-				<unitPattern count="one" draft="contributed">{0} °</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} °</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} °</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} °</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName draft="contributed">rad</displayName>
-				<unitPattern count="one" draft="contributed">{0} rad</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} rad</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} rad</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="contributed">juter</displayName>
-				<unitPattern count="one" draft="contributed">{0} jut.</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} jut.</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} jut.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} jut.</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName draft="contributed">km²</displayName>
+				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} km²</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} km²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName draft="contributed">ha</displayName>
@@ -7091,12 +7379,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} ha</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName draft="contributed">m²</displayName>
+				<unitPattern count="one" draft="contributed">{0} m²</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} m²</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} m²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} m²</unitPattern>
+				<perUnitPattern>{0} na m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName draft="contributed">cm²</displayName>
 				<unitPattern count="one" draft="contributed">{0} cm²</unitPattern>
 				<unitPattern count="two" draft="contributed">{0} cm²</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} cm²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} cm²</unitPattern>
+				<perUnitPattern>{0} na cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName draft="contributed">mi²</displayName>
+				<unitPattern count="one" draft="contributed">{0} mi²</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} mi²</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mi²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName draft="contributed">juter</displayName>
+				<unitPattern count="one" draft="contributed">{0} jut.</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} jut.</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} jut.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} jut.</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName draft="contributed">yd²</displayName>
+				<unitPattern count="one" draft="contributed">{0} yd²</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} yd²</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} yd²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName draft="contributed">ft²</displayName>
@@ -7111,34 +7429,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} in²</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} in²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} in²</unitPattern>
+				<perUnitPattern>{0} na in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="contributed">km²</displayName>
-				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName draft="contributed">m²</displayName>
-				<unitPattern count="one" draft="contributed">{0} m²</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} m²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} m²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName draft="contributed">mi²</displayName>
-				<unitPattern count="one" draft="contributed">{0} mi²</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} mi²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mi²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName draft="contributed">yd²</displayName>
-				<unitPattern count="one" draft="contributed">{0} yd²</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} yd²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} yd²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName draft="contributed">kt</displayName>
+				<unitPattern count="one" draft="contributed">{0} kt</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} kt</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kt</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName draft="contributed">L/km</displayName>
@@ -7147,6 +7445,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} L/km</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="two">{0} l/100 km</unitPattern>
+				<unitPattern count="few">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName draft="contributed">mpg</displayName>
 				<unitPattern count="one" draft="contributed">{0} mpg</unitPattern>
@@ -7154,69 +7459,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} mpg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName draft="contributed">bit</displayName>
-				<unitPattern count="one" draft="contributed">{0} bit</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} bit</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} bit</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName draft="contributed">bajt</displayName>
-				<unitPattern count="one" draft="contributed">{0} bajt</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} bajta</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} bajti</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} bajtov</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName draft="contributed">Gb</displayName>
-				<unitPattern count="one" draft="contributed">{0} Gb</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} Gb</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} Gb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName draft="contributed">GB</displayName>
-				<unitPattern count="one" draft="contributed">{0} GB</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} GB</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} GB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName draft="contributed">kb</displayName>
-				<unitPattern count="one" draft="contributed">{0} kb</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} kb</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName draft="contributed">kB</displayName>
-				<unitPattern count="one" draft="contributed">{0} kB</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} kB</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName draft="contributed">Mb</displayName>
-				<unitPattern count="one" draft="contributed">{0} Mb</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} Mb</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} Mb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName draft="contributed">MB</displayName>
-				<unitPattern count="one" draft="contributed">{0} MB</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} MB</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} MB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName draft="contributed">Tb</displayName>
-				<unitPattern count="one" draft="contributed">{0} Tb</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} Tb</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} Tb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName draft="contributed">TB</displayName>
 				<unitPattern count="one" draft="contributed">{0} TB</unitPattern>
@@ -7224,77 +7466,152 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} TB</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} TB</unitPattern>
 			</unit>
-			<unit type="duration-day">
-				<displayName draft="contributed">dni</displayName>
-				<unitPattern count="one" draft="contributed">{0} d</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} d</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} d</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} d</unitPattern>
+			<unit type="digital-terabit">
+				<displayName draft="contributed">Tb</displayName>
+				<unitPattern count="one" draft="contributed">{0} Tb</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} Tb</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Tb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Tb</unitPattern>
 			</unit>
-			<unit type="duration-hour">
-				<displayName draft="contributed">ur</displayName>
-				<unitPattern count="one" draft="contributed">{0} h</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} h</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} h</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} h</unitPattern>
-				<perUnitPattern draft="contributed">{0}/h</perUnitPattern>
+			<unit type="digital-gigabyte">
+				<displayName draft="contributed">GB</displayName>
+				<unitPattern count="one" draft="contributed">{0} GB</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} GB</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} GB</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} GB</unitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName draft="contributed">μs</displayName>
-				<unitPattern count="one" draft="contributed">{0} μs</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} μs</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} μs</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} μs</unitPattern>
+			<unit type="digital-gigabit">
+				<displayName draft="contributed">Gb</displayName>
+				<unitPattern count="one" draft="contributed">{0} Gb</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} Gb</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Gb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Gb</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="contributed">ms</displayName>
-				<unitPattern count="one" draft="contributed">{0} ms</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ms</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ms</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ms</unitPattern>
+			<unit type="digital-megabyte">
+				<displayName draft="contributed">MB</displayName>
+				<unitPattern count="one" draft="contributed">{0} MB</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} MB</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} MB</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} MB</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName draft="contributed">minut</displayName>
-				<unitPattern count="one" draft="contributed">{0} min</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} min</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} min</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} min</unitPattern>
+			<unit type="digital-megabit">
+				<displayName draft="contributed">Mb</displayName>
+				<unitPattern count="one" draft="contributed">{0} Mb</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} Mb</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Mb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Mb</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">mesecev</displayName>
-				<unitPattern count="one" draft="contributed">{0} m</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} m</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} m</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} m</unitPattern>
+			<unit type="digital-kilobyte">
+				<displayName draft="contributed">kB</displayName>
+				<unitPattern count="one" draft="contributed">{0} kB</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} kB</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kB</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kB</unitPattern>
 			</unit>
-			<unit type="duration-nanosecond">
-				<displayName draft="contributed">ns</displayName>
-				<unitPattern count="one" draft="contributed">{0} ns</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ns</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ns</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ns</unitPattern>
+			<unit type="digital-kilobit">
+				<displayName draft="contributed">kb</displayName>
+				<unitPattern count="one" draft="contributed">{0} kb</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} kb</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kb</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName draft="contributed">sekund</displayName>
-				<unitPattern count="one" draft="contributed">{0} s</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} s</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} s</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} s</unitPattern>
-				<perUnitPattern draft="contributed">{0}/s</perUnitPattern>
+			<unit type="digital-byte">
+				<displayName draft="contributed">bajt</displayName>
+				<unitPattern count="one" draft="contributed">{0} bajt</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} bajta</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} bajti</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} bajtov</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">tednov</displayName>
-				<unitPattern count="one" draft="contributed">{0} t</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} t</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} t</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} t</unitPattern>
+			<unit type="digital-bit">
+				<displayName draft="contributed">bit</displayName>
+				<unitPattern count="one" draft="contributed">{0} bit</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} bit</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} bit</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>stol.</displayName>
+				<unitPattern count="one">{0} stol.</unitPattern>
+				<unitPattern count="two">{0} stol.</unitPattern>
+				<unitPattern count="few">{0} stol.</unitPattern>
+				<unitPattern count="other">{0} stol.</unitPattern>
 			</unit>
 			<unit type="duration-year">
-				<displayName draft="contributed">let</displayName>
-				<unitPattern count="one" draft="contributed">{0} l</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} l</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} l</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} l</unitPattern>
+				<displayName>let</displayName>
+				<unitPattern count="one">{0} l</unitPattern>
+				<unitPattern count="two">{0} l</unitPattern>
+				<unitPattern count="few">{0} l</unitPattern>
+				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mesecev</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="two">{0} m</unitPattern>
+				<unitPattern count="few">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>tednov</displayName>
+				<unitPattern count="one">{0} t</unitPattern>
+				<unitPattern count="two">{0} t</unitPattern>
+				<unitPattern count="few">{0} t</unitPattern>
+				<unitPattern count="other">{0} t</unitPattern>
+				<perUnitPattern>{0}/t</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>dni</displayName>
+				<unitPattern count="one">{0} d</unitPattern>
+				<unitPattern count="two">{0} d</unitPattern>
+				<unitPattern count="few">{0} d</unitPattern>
+				<unitPattern count="other">{0} d</unitPattern>
+				<perUnitPattern>{0} na dan</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>ur</displayName>
+				<unitPattern count="one">{0} h</unitPattern>
+				<unitPattern count="two">{0} h</unitPattern>
+				<unitPattern count="few">{0} h</unitPattern>
+				<unitPattern count="other">{0} h</unitPattern>
+				<perUnitPattern>{0}/h</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>minut</displayName>
+				<unitPattern count="one">{0} min</unitPattern>
+				<unitPattern count="two">{0} min</unitPattern>
+				<unitPattern count="few">{0} min</unitPattern>
+				<unitPattern count="other">{0} min</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>sekund</displayName>
+				<unitPattern count="one">{0} s</unitPattern>
+				<unitPattern count="two">{0} s</unitPattern>
+				<unitPattern count="few">{0} s</unitPattern>
+				<unitPattern count="other">{0} s</unitPattern>
+				<perUnitPattern>{0}/s</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="two">{0} ms</unitPattern>
+				<unitPattern count="few">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="two">{0} μs</unitPattern>
+				<unitPattern count="few">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="two">{0} ns</unitPattern>
+				<unitPattern count="few">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName draft="contributed">amp</displayName>
@@ -7324,6 +7641,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} V</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName draft="contributed">kcal</displayName>
+				<unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} kcal</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kcal</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName draft="contributed">cal</displayName>
 				<unitPattern count="one" draft="contributed">{0} cal</unitPattern>
@@ -7338,20 +7662,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} Cal</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName draft="contributed">joule</displayName>
-				<unitPattern count="one" draft="contributed">{0} J</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} J</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} J</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName draft="contributed">kcal</displayName>
-				<unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} kcal</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kcal</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName draft="contributed">kJ</displayName>
 				<unitPattern count="one" draft="contributed">{0} kJ</unitPattern>
@@ -7359,6 +7669,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} kJ</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName draft="contributed">joule</displayName>
+				<unitPattern count="one" draft="contributed">{0} J</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} J</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} J</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName draft="contributed">kWh</displayName>
 				<unitPattern count="one" draft="contributed">{0} kWh</unitPattern>
@@ -7373,12 +7690,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} GHz</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName draft="contributed">Hz</displayName>
-				<unitPattern count="one" draft="contributed">{0} Hz</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} Hz</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} Hz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName draft="contributed">MHz</displayName>
+				<unitPattern count="one" draft="contributed">{0} MHz</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} MHz</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} MHz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName draft="contributed">kHz</displayName>
@@ -7387,26 +7704,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} kHz</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName draft="contributed">MHz</displayName>
-				<unitPattern count="one" draft="contributed">{0} MHz</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} MHz</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} MHz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName draft="contributed">Hz</displayName>
+				<unitPattern count="one" draft="contributed">{0} Hz</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} Hz</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Hz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName draft="contributed">au</displayName>
-				<unitPattern count="one" draft="contributed">{0} au</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} au</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} au</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName draft="contributed">km</displayName>
+				<unitPattern count="one" draft="contributed">{0} km</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} km</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} km</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">cm</displayName>
-				<unitPattern count="one" draft="contributed">{0} cm</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} cm</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} cm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName draft="contributed">m</displayName>
+				<unitPattern count="one" draft="contributed">{0} m</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} m</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} m</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName draft="contributed">dm</displayName>
@@ -7415,54 +7734,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} dm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName draft="contributed">ft</displayName>
-				<unitPattern count="one" draft="contributed">{0} ft</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ft</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ft</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="contributed">in</displayName>
-				<unitPattern count="one" draft="contributed">{0} in</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} in</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} in</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName draft="contributed">km</displayName>
-				<unitPattern count="one" draft="contributed">{0} km</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} km</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} km</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName draft="contributed">sv. let</displayName>
-				<unitPattern count="one" draft="contributed">{0} sv. let</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} sv. leti</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} sv. leta</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} sv. let</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName draft="contributed">m</displayName>
-				<unitPattern count="one" draft="contributed">{0} m</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} m</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} m</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName draft="contributed">µm</displayName>
-				<unitPattern count="one" draft="contributed">{0} µm</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} µm</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} µm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName draft="contributed">mi</displayName>
-				<unitPattern count="one" draft="contributed">{0} mi</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} mi</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="contributed">cm</displayName>
+				<unitPattern count="one" draft="contributed">{0} cm</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} cm</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} cm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="contributed">mm</displayName>
@@ -7471,6 +7749,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} mm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName draft="contributed">µm</displayName>
+				<unitPattern count="one" draft="contributed">{0} µm</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} µm</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} µm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName draft="contributed">nm</displayName>
 				<unitPattern count="one" draft="contributed">{0} nm</unitPattern>
@@ -7478,20 +7763,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} nm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName draft="contributed">nmi</displayName>
-				<unitPattern count="one" draft="contributed">{0} nmi</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} nmi</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} nmi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName draft="contributed">pc</displayName>
-				<unitPattern count="one" draft="contributed">{0} pc</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} pc</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} pc</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName draft="contributed">pm</displayName>
 				<unitPattern count="one" draft="contributed">{0} pm</unitPattern>
@@ -7499,6 +7770,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} pm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="contributed">mi</displayName>
+				<unitPattern count="one" draft="contributed">{0} mi</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} mi</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName draft="contributed">yd</displayName>
 				<unitPattern count="one" draft="contributed">{0} yd</unitPattern>
@@ -7506,6 +7784,57 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} yd</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName draft="contributed">ft</displayName>
+				<unitPattern count="one" draft="contributed">{0} ft</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} ft</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ft</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="contributed">in</displayName>
+				<unitPattern count="one" draft="contributed">{0} in</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} in</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} in</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName draft="contributed">pc</displayName>
+				<unitPattern count="one" draft="contributed">{0} pc</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} pc</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} pc</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="contributed">sv. let</displayName>
+				<unitPattern count="one" draft="contributed">{0} sv. let</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} sv. leti</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} sv. leta</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} sv. let</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName draft="contributed">au</displayName>
+				<unitPattern count="one" draft="contributed">{0} au</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} au</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} au</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName draft="contributed">nmi</displayName>
+				<unitPattern count="one" draft="contributed">{0} nmi</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} nmi</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} nmi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="two">{0} smi</unitPattern>
+				<unitPattern count="few">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName draft="contributed">lx</displayName>
 				<unitPattern count="one" draft="contributed">{0} lx</unitPattern>
@@ -7513,19 +7842,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} lx</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName draft="contributed">CD</displayName>
-				<unitPattern count="one" draft="contributed">{0} CD</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} CD</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} CD</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName draft="contributed">g</displayName>
-				<unitPattern count="one" draft="contributed">{0} g</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} g</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} g</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} g</unitPattern>
+			<unit type="mass-metric-ton">
+				<displayName draft="contributed">t</displayName>
+				<unitPattern count="one" draft="contributed">{0} t</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} t</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} t</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} t</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="contributed">kg</displayName>
@@ -7533,13 +7855,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} kg</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} kg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
 			</unit>
-			<unit type="mass-metric-ton">
-				<displayName draft="contributed">t</displayName>
-				<unitPattern count="one" draft="contributed">{0} t</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} t</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} t</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} t</unitPattern>
+			<unit type="mass-gram">
+				<displayName draft="contributed">g</displayName>
+				<unitPattern count="one" draft="contributed">{0} g</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} g</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} g</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName draft="contributed">mg</displayName>
+				<unitPattern count="one">{0} mg</unitPattern>
+				<unitPattern count="two">{0} mg</unitPattern>
+				<unitPattern count="few">{0} mg</unitPattern>
+				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
 			<unit type="mass-microgram">
 				<displayName draft="contributed">µg</displayName>
@@ -7548,12 +7879,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} µg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} µg</unitPattern>
 			</unit>
-			<unit type="mass-milligram">
-				<displayName draft="contributed">mg</displayName>
-				<unitPattern count="one" draft="contributed">{0} mg</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} mg</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mg</unitPattern>
+			<unit type="mass-ton">
+				<displayName draft="contributed">tn</displayName>
+				<unitPattern count="one" draft="contributed">{0} tn</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} tn</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} tn</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} tn</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName draft="contributed">lb</displayName>
+				<unitPattern count="one" draft="contributed">{0} lb</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} lb</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} lb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
 			</unit>
 			<unit type="mass-ounce">
 				<displayName draft="contributed">oz</displayName>
@@ -7561,6 +7900,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} oz</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} oz</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
 			</unit>
 			<unit type="mass-ounce-troy">
 				<displayName draft="contributed">oz t</displayName>
@@ -7569,19 +7909,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} oz t</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} oz t</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<displayName draft="contributed">lb</displayName>
-				<unitPattern count="one" draft="contributed">{0} lb</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} lb</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} lb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} lb</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<displayName draft="contributed">tn</displayName>
-				<unitPattern count="one" draft="contributed">{0} tn</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} tn</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} tn</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} tn</unitPattern>
+			<unit type="mass-carat">
+				<displayName draft="contributed">CD</displayName>
+				<unitPattern count="one" draft="contributed">{0} CD</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} CD</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} CD</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} CD</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<displayName draft="contributed">GW</displayName>
@@ -7590,12 +7923,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} GW</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="contributed">KM</displayName>
-				<unitPattern count="one" draft="contributed">{0} KM</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} KM</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} KM</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} KM</unitPattern>
+			<unit type="power-megawatt">
+				<displayName draft="contributed">MW</displayName>
+				<unitPattern count="one" draft="contributed">{0} MW</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} MW</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} MW</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} MW</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName draft="contributed">kW</displayName>
@@ -7604,12 +7937,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} kW</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kW</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<displayName draft="contributed">MW</displayName>
-				<unitPattern count="one" draft="contributed">{0} MW</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} MW</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} MW</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MW</unitPattern>
+			<unit type="power-watt">
+				<displayName draft="contributed">W</displayName>
+				<unitPattern count="one" draft="contributed">{0} W</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} W</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} W</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} W</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<displayName draft="contributed">mW</displayName>
@@ -7618,12 +7951,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} mW</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mW</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName draft="contributed">W</displayName>
-				<unitPattern count="one" draft="contributed">{0} W</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} W</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} W</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} W</unitPattern>
+			<unit type="power-horsepower">
+				<displayName draft="contributed">KM</displayName>
+				<unitPattern count="one" draft="contributed">{0} KM</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} KM</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} KM</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} KM</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="contributed">hPa</displayName>
@@ -7632,20 +7965,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} hPa</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName draft="contributed">inHg</displayName>
-				<unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} inHg</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} inHg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName draft="contributed">mbar</displayName>
-				<unitPattern count="one" draft="contributed">{0} mbar</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} mbar</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mbar</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName draft="contributed">mm Hg</displayName>
 				<unitPattern count="one" draft="contributed">{0} mm Hg</unitPattern>
@@ -7660,12 +7979,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} psi</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName draft="contributed">kt</displayName>
-				<unitPattern count="one" draft="contributed">{0} kt</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} kt</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName draft="contributed">inHg</displayName>
+				<unitPattern count="one" draft="contributed">{0} inHg</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} inHg</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} inHg</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName draft="contributed">mbar</displayName>
+				<unitPattern count="one" draft="contributed">{0} mbar</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} mbar</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mbar</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName draft="contributed">km/h</displayName>
@@ -7688,6 +8014,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} mi/h</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="two">{0} kn</unitPattern>
+				<unitPattern count="few">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="two">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName draft="contributed">°C</displayName>
 				<unitPattern count="one" draft="contributed">{0} °C</unitPattern>
@@ -7709,41 +8049,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} K</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName draft="contributed">ac ft</displayName>
-				<unitPattern count="one" draft="contributed">{0} ac ft</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ac ft</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ac ft</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName draft="contributed">cL</displayName>
-				<unitPattern count="one" draft="contributed">{0} cL</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} cL</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} cL</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName draft="contributed">cm³</displayName>
-				<unitPattern count="one" draft="contributed">{0} cm³</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} cm³</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} cm³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName draft="contributed">ft³</displayName>
-				<unitPattern count="one" draft="contributed">{0} ft³</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ft³</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ft³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName draft="contributed">in³</displayName>
-				<unitPattern count="one" draft="contributed">{0} in³</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} in³</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} in³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName draft="contributed">km³</displayName>
 				<unitPattern count="one" draft="contributed">{0} km³</unitPattern>
@@ -7757,6 +8062,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} m³</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} m³</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName draft="contributed">cm³</displayName>
+				<unitPattern count="one" draft="contributed">{0} cm³</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} cm³</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} cm³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName draft="contributed">mi³</displayName>
@@ -7772,33 +8086,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} yd³</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName draft="contributed">c</displayName>
-				<unitPattern count="one" draft="contributed">{0} c</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} c</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} c</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName draft="contributed">ft³</displayName>
+				<unitPattern count="one" draft="contributed">{0} ft³</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} ft³</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ft³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName draft="contributed">dL</displayName>
-				<unitPattern count="one" draft="contributed">{0} dL</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} dL</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} dL</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName draft="contributed">in³</displayName>
+				<unitPattern count="one" draft="contributed">{0} in³</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} in³</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} in³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName draft="contributed">fl oz</displayName>
-				<unitPattern count="one" draft="contributed">{0} fl oz</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} fl oz</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} fl oz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName draft="contributed">gal</displayName>
-				<unitPattern count="one" draft="contributed">{0} gal</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} gal</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} gal</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName draft="contributed">Ml</displayName>
+				<unitPattern count="one" draft="contributed">{0} Ml</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} Ml</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Ml</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName draft="contributed">hL</displayName>
@@ -7813,13 +8120,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="two" draft="contributed">{0} l</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} l</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName draft="contributed">Ml</displayName>
-				<unitPattern count="one" draft="contributed">{0} Ml</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} Ml</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} Ml</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName draft="contributed">dL</displayName>
+				<unitPattern count="one" draft="contributed">{0} dL</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} dL</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} dL</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName draft="contributed">cL</displayName>
+				<unitPattern count="one" draft="contributed">{0} cL</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} cL</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} cL</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName draft="contributed">ml</displayName>
@@ -7828,12 +8143,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} ml</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName draft="contributed">pt</displayName>
-				<unitPattern count="one" draft="contributed">{0} pt</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} pt</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} pt</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="two">{0} mpt</unitPattern>
+				<unitPattern count="few">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>m. skod.</displayName>
+				<unitPattern count="one">{0} m. skod.</unitPattern>
+				<unitPattern count="two">{0} m. skod.</unitPattern>
+				<unitPattern count="few">{0} m. skod.</unitPattern>
+				<unitPattern count="other">{0} m. skod.</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName draft="contributed">ac ft</displayName>
+				<unitPattern count="one" draft="contributed">{0} ac ft</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} ac ft</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ac ft</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName draft="contributed">gal</displayName>
+				<unitPattern count="one" draft="contributed">{0} gal</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} gal</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} gal</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName draft="contributed">qt</displayName>
@@ -7842,6 +8179,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} qt</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName draft="contributed">pt</displayName>
+				<unitPattern count="one" draft="contributed">{0} pt</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} pt</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} pt</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName draft="contributed">c</displayName>
+				<unitPattern count="one" draft="contributed">{0} c</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} c</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} c</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName draft="contributed">fl oz</displayName>
+				<unitPattern count="one" draft="contributed">{0} fl oz</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} fl oz</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} fl oz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName draft="contributed">žlica</displayName>
 				<unitPattern count="one" draft="contributed">{0} žlica</unitPattern>
@@ -7856,6 +8214,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} žličke</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} žličk</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} V</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} S</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} J</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} Z</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -7867,6 +8231,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} G</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one" draft="contributed">{0} °</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} °</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} °</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} °</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="two">{0}′</unitPattern>
@@ -7879,17 +8249,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0}″</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one" draft="contributed">{0} °</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} °</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} °</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} °</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one" draft="contributed">{0} jut.</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} jut.</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} jut.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} jut.</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} km²</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} km²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one" draft="contributed">{0} ha</unitPattern>
@@ -7897,18 +8261,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} ha</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one" draft="contributed">{0} ft²</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ft²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ft²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one" draft="contributed">{0} m²</unitPattern>
 				<unitPattern count="two" draft="contributed">{0} m²</unitPattern>
@@ -7921,80 +8273,80 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} mi²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mi²</unitPattern>
 			</unit>
-			<unit type="duration-day">
-				<displayName draft="contributed">dni</displayName>
-				<unitPattern count="one" draft="contributed">{0} d</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} d</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} d</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} d</unitPattern>
+			<unit type="area-acre">
+				<unitPattern count="one" draft="contributed">{0} jut.</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} jut.</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} jut.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} jut.</unitPattern>
 			</unit>
-			<unit type="duration-hour">
-				<displayName draft="contributed">ur</displayName>
-				<unitPattern count="one" draft="contributed">{0} h</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} h</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} h</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} h</unitPattern>
+			<unit type="area-square-foot">
+				<unitPattern count="one" draft="contributed">{0} ft²</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} ft²</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ft²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ft²</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="contributed">ms</displayName>
-				<unitPattern count="one" draft="contributed">{0} ms</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ms</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ms</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ms</unitPattern>
-			</unit>
-			<unit type="duration-minute">
-				<displayName draft="contributed">minut</displayName>
-				<unitPattern count="one" draft="contributed">{0} min</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} min</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} min</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">mesecev</displayName>
-				<unitPattern count="one" draft="contributed">{0} m</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} m</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} m</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} m</unitPattern>
-			</unit>
-			<unit type="duration-second">
-				<displayName draft="contributed">sekund</displayName>
-				<unitPattern count="one" draft="contributed">{0} s</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} s</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} s</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} s</unitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">tednov</displayName>
-				<unitPattern count="one" draft="contributed">{0} t</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} t</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} t</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} t</unitPattern>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName draft="contributed">l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="two">{0} l/100 km</unitPattern>
+				<unitPattern count="few">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
 			</unit>
 			<unit type="duration-year">
-				<displayName draft="contributed">let</displayName>
-				<unitPattern count="one" draft="contributed">{0} l</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} l</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} l</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} l</unitPattern>
+				<displayName>let</displayName>
+				<unitPattern count="one">{0} l</unitPattern>
+				<unitPattern count="two">{0} l</unitPattern>
+				<unitPattern count="few">{0} l</unitPattern>
+				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">cm</displayName>
-				<unitPattern count="one" draft="contributed">{0} cm</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} cm</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} cm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cm</unitPattern>
+			<unit type="duration-month">
+				<displayName>mesecev</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="two">{0} m</unitPattern>
+				<unitPattern count="few">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one" draft="contributed">{0} ft</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} ft</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ft</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ft</unitPattern>
+			<unit type="duration-week">
+				<displayName>tednov</displayName>
+				<unitPattern count="one">{0} t</unitPattern>
+				<unitPattern count="two">{0} t</unitPattern>
+				<unitPattern count="few">{0} t</unitPattern>
+				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one" draft="contributed">{0} in</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} in</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} in</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} in</unitPattern>
+			<unit type="duration-day">
+				<displayName>dni</displayName>
+				<unitPattern count="one">{0} d</unitPattern>
+				<unitPattern count="two">{0} d</unitPattern>
+				<unitPattern count="few">{0} d</unitPattern>
+				<unitPattern count="other">{0} d</unitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>ur</displayName>
+				<unitPattern count="one">{0} h</unitPattern>
+				<unitPattern count="two">{0} h</unitPattern>
+				<unitPattern count="few">{0} h</unitPattern>
+				<unitPattern count="other">{0} h</unitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>minut</displayName>
+				<unitPattern count="one">{0} min</unitPattern>
+				<unitPattern count="two">{0} min</unitPattern>
+				<unitPattern count="few">{0} min</unitPattern>
+				<unitPattern count="other">{0} min</unitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>sekund</displayName>
+				<unitPattern count="one">{0} s</unitPattern>
+				<unitPattern count="two">{0} s</unitPattern>
+				<unitPattern count="few">{0} s</unitPattern>
+				<unitPattern count="other">{0} s</unitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="two">{0} ms</unitPattern>
+				<unitPattern count="few">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="contributed">km</displayName>
@@ -8003,12 +8355,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} km</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one" draft="contributed">{0} ly</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} sv. l.</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} sv. l.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} sv. l.</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName draft="contributed">m</displayName>
 				<unitPattern count="one" draft="contributed">{0} m</unitPattern>
@@ -8016,11 +8362,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} m</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one" draft="contributed">{0} mi</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} mi</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="contributed">cm</displayName>
+				<unitPattern count="one" draft="contributed">{0} cm</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} cm</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} cm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="contributed">mm</displayName>
@@ -8035,18 +8382,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} pm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one" draft="contributed">{0} mi</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} mi</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one" draft="contributed">{0} yd</unitPattern>
 				<unitPattern count="two" draft="contributed">{0} yd</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} yd</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="contributed">g</displayName>
-				<unitPattern count="one" draft="contributed">{0} g</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} g</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} g</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one" draft="contributed">{0} ft</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} ft</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ft</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ft</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one" draft="contributed">{0} in</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} in</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} in</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} in</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one" draft="contributed">{0} ly</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} sv. l.</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} sv. l.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} sv. l.</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="contributed">kg</displayName>
@@ -8055,11 +8419,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} kg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one" draft="contributed">{0} oz</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} oz</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} oz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} oz</unitPattern>
+			<unit type="mass-gram">
+				<displayName draft="contributed">g</displayName>
+				<unitPattern count="one" draft="contributed">{0} g</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} g</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} g</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one" draft="contributed">{0} lb</unitPattern>
@@ -8067,11 +8432,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} lb</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} lb</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one" draft="contributed">{0} KM</unitPattern>
-				<unitPattern count="two" draft="contributed">{0} KM</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} KM</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} hp</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one" draft="contributed">{0} oz</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} oz</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} oz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one" draft="contributed">{0} kW</unitPattern>
@@ -8085,6 +8450,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} W</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one" draft="contributed">{0} KM</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} KM</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} KM</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one" draft="contributed">{0} hPa</unitPattern>
 				<unitPattern count="two" draft="contributed">{0} hPa</unitPattern>
@@ -8154,39 +8525,45 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} l</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} l</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} V</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} S</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} J</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} Z</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
-			<durationUnitPattern>h:mm</durationUnitPattern>
+			<durationUnitPattern>h.mm</durationUnitPattern>
 		</durationUnit>
 		<durationUnit type="hms">
-			<durationUnitPattern>h:mm:ss</durationUnitPattern>
+			<durationUnitPattern>h.mm.ss</durationUnitPattern>
 		</durationUnit>
 		<durationUnit type="ms">
-			<durationUnitPattern>m:ss</durationUnitPattern>
+			<durationUnitPattern>m.ss</durationUnitPattern>
 		</durationUnit>
 	</units>
 	<listPatterns>
 		<listPattern>
-			<listPatternPart type="start" draft="contributed">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle" draft="contributed">{0}, {1}</listPatternPart>
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
 			<listPatternPart type="end">{0} in {1}</listPatternPart>
 			<listPatternPart type="2">{0} in {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit">
-			<listPatternPart type="start" draft="contributed">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle" draft="contributed">{0}, {1}</listPatternPart>
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
 			<listPatternPart type="end">{0} in {1}</listPatternPart>
 			<listPatternPart type="2">{0} in {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-narrow">
-			<listPatternPart type="start" draft="contributed">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle" draft="contributed">{0}, {1}</listPatternPart>
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
 			<listPatternPart type="end">{0} in {1}</listPatternPart>
 			<listPatternPart type="2">{0} in {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-short">
-			<listPatternPart type="start" draft="contributed">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle" draft="contributed">{0}, {1}</listPatternPart>
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
 			<listPatternPart type="end">{0} in {1}</listPatternPart>
 			<listPatternPart type="2">{0} in {1}</listPatternPart>
 		</listPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sl_SI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sl_SI.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sl_SI.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sl_SI.xml
index f9e232f2dd2..ed8c62a6eeb 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sl_SI.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sl_SI.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="sl"/>
 		<territory type="SI"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/smn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/smn.xml
similarity index 77%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/smn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/smn.xml
index 813c172a132..6a33c2ab2ba 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/smn.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/smn.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10811 $"/>
-		<generation date="$Date: 2014-08-14 16:43:15 -0500 (Thu, 14 Aug 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="smn"/>
 	</identity>
 	<localeDisplayNames>
@@ -82,6 +81,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="zh_Hans">oovtâkiärdánis kiinakielâ</language>
 			<language type="zh_Hant">ärbivuáválâš kiinakielâ</language>
 		</languages>
+		<territories>
+			<territory type="FI">Suomâ</territory>
+		</territories>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metrisâš</measurementSystemName>
 			<measurementSystemName type="UK">brittilâš</measurementSystemName>
@@ -175,6 +177,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<quarter type="3">3. niälj.</quarter>
 							<quarter type="4">4. niälj.</quarter>
 						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1">1. niäljádâs</quarter>
+							<quarter type="2">2. niäljádâs</quarter>
+							<quarter type="3">3. niäljádâs</quarter>
+							<quarter type="4">4. niäljádâs</quarter>
+						</quarterWidth>
 					</quarterContext>
 					<quarterContext type="stand-alone">
 						<quarterWidth type="wide">
@@ -234,6 +242,48 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤ 0K</pattern>
+					<pattern type="1000" count="two" draft="provisional">¤ 0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤ 00K</pattern>
+					<pattern type="10000" count="two" draft="provisional">¤ 00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤ 000K</pattern>
+					<pattern type="100000" count="two" draft="provisional">¤ 000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤ 0M</pattern>
+					<pattern type="1000000" count="two" draft="provisional">¤ 0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤ 00M</pattern>
+					<pattern type="10000000" count="two" draft="provisional">¤ 00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤ 000M</pattern>
+					<pattern type="100000000" count="two" draft="provisional">¤ 000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤ 0G</pattern>
+					<pattern type="1000000000" count="two" draft="provisional">¤ 0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤ 00G</pattern>
+					<pattern type="10000000000" count="two" draft="provisional">¤ 00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤ 000G</pattern>
+					<pattern type="100000000000" count="two" draft="provisional">¤ 000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤ 0T</pattern>
+					<pattern type="1000000000000" count="two" draft="provisional">¤ 0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤ 00T</pattern>
+					<pattern type="10000000000000" count="two" draft="provisional">¤ 00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤ 000T</pattern>
+					<pattern type="100000000000000" count="two" draft="provisional">¤ 000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencies>
 			<currency type="DKK">
 				<displayName>Tanska ruvnâ</displayName>
@@ -266,39 +316,39 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</numbers>
 	<units>
 		<unitLength type="long">
+			<unit type="duration-year">
+				<displayName>iveh</displayName>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mánuppajeh</displayName>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ohoh</displayName>
+			</unit>
 			<unit type="duration-day">
 				<displayName>peeivih</displayName>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>tiijmeh</displayName>
 			</unit>
+			<unit type="duration-minute">
+				<displayName>minutteh</displayName>
+			</unit>
+			<unit type="duration-second">
+				<displayName>sekunteh</displayName>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>millisekunteh</displayName>
+			</unit>
 			<unit type="duration-microsecond">
 				<displayName>mikrosekunteh</displayName>
 				<unitPattern count="one">{0} μs</unitPattern>
 				<unitPattern count="two">{0} μs</unitPattern>
 				<unitPattern count="other">{0} μs</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>millisekunteh</displayName>
-			</unit>
-			<unit type="duration-minute">
-				<displayName>minutteh</displayName>
-			</unit>
-			<unit type="duration-month">
-				<displayName>mánuppajeh</displayName>
-			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>nanosekunteh</displayName>
 			</unit>
-			<unit type="duration-second">
-				<displayName>sekunteh</displayName>
-			</unit>
-			<unit type="duration-week">
-				<displayName>ohoh</displayName>
-			</unit>
-			<unit type="duration-year">
-				<displayName>iveh</displayName>
-			</unit>
 		</unitLength>
 	</units>
 </ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/smn_FI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/smn_FI.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/smn_FI.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/smn_FI.xml
index 2cee8ef0d71..450f493ccf1 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/smn_FI.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/smn_FI.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10671 $"/>
-		<generation date="$Date: 2014-07-23 17:52:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="smn"/>
 		<territory type="FI"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sn.xml
similarity index 92%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sn.xml
index 9371dd73854..1088cbdee82 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sn.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sn.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12128 $"/>
 		<language type="sn"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguila</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Netherlands Antilles</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Ajentina</territory>
 			<territory type="AS">Samoa ye Amerika</territory>
@@ -572,6 +570,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -751,3 +777,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sn_ZW.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sn_ZW.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sn_ZW.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sn_ZW.xml
index 83754f5c72f..2e789abf6cd 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sn_ZW.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sn_ZW.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="sn"/>
 		<territory type="ZW"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/so.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so.xml
similarity index 94%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/so.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so.xml
index 99cf8afc7c7..3d235bf1af2 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/so.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11093 $"/>
-		<generation date="$Date: 2015-01-02 21:36:02 -0600 (Fri, 02 Jan 2015) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="so"/>
 	</identity>
 	<localeDisplayNames>
@@ -108,7 +107,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sq" draft="unconfirmed">Albaaniyaan</language>
 			<language type="sr" draft="unconfirmed">Seerbiyaan</language>
 			<language type="st" draft="unconfirmed">Sesooto</language>
-			<language type="su" draft="unconfirmed">Suudaaniis</language>
 			<language type="sv">Swiidhis</language>
 			<language type="sw" draft="unconfirmed">Sawaaxili</language>
 			<language type="ta">Tamiil</language>
@@ -147,7 +145,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albaaniya</territory>
 			<territory type="AM">Armeeniya</territory>
-			<territory type="AN">Netherlands Antilles</territory>
 			<territory type="AO">Angoola</territory>
 			<territory type="AR">Arjantiin</territory>
 			<territory type="AS">Samowa Ameerika</territory>
@@ -373,9 +370,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="currency" draft="unconfirmed">Lacag</key>
 		</keys>
 		<types>
-			<type type="hebrew" key="calendar" draft="unconfirmed">Habeentiriska yuhuudda</type>
-			<type type="islamic" key="calendar" draft="unconfirmed">Habeentiriska islaamka</type>
-			<type type="japanese" key="calendar" draft="unconfirmed">Habeentiriska jabbaanka</type>
+			<type key="calendar" type="hebrew" draft="unconfirmed">Habeentiriska yuhuudda</type>
+			<type key="calendar" type="islamic" draft="unconfirmed">Habeentiriska islaamka</type>
+			<type key="calendar" type="japanese" draft="unconfirmed">Habeentiriska jabbaanka</type>
 		</types>
 	</localeDisplayNames>
 	<characters>
@@ -616,6 +613,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">sn.</dayPeriod>
+							<dayPeriod type="pm">gn.</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">sn.</dayPeriod>
 							<dayPeriod type="pm">gn.</dayPeriod>
@@ -830,6 +831,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="DJF">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/so_DJ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_DJ.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/so_DJ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_DJ.xml
index a99030188d2..212e784b5ea 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/so_DJ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_DJ.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="so"/>
 		<territory type="DJ"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/so_ET.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_ET.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/so_ET.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_ET.xml
index 4c749eec7ca..41934897172 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/so_ET.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_ET.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="so"/>
 		<territory type="ET"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_KE.xml
new file mode 100644
index 00000000000..1708bc615d9
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_KE.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="so"/>
+		<territory type="KE"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="KES">
+				<symbol>Ksh</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/so_SO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_SO.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/so_SO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_SO.xml
index a1327a048c1..476216b11b0 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/so_SO.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_SO.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="so"/>
 		<territory type="SO"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sq.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq.xml
similarity index 86%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sq.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq.xml
index 64182471e57..398e76e00af 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sq.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="sq"/>
 	</identity>
 	<localeDisplayNames>
@@ -21,30 +20,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="af">afrikanisht</language>
 			<language type="agq">agemisht</language>
 			<language type="ak">akanisht</language>
-			<language type="am">amarike</language>
+			<language type="am">amarikisht</language>
 			<language type="ar">arabisht</language>
 			<language type="ar_001">arabishte standarde moderne</language>
 			<language type="arn">mapuçisht</language>
 			<language type="as">asamezisht</language>
 			<language type="asa">asuisht</language>
-			<language type="az">azere</language>
+			<language type="az">azerbajxhanisht</language>
+			<language type="az" alt="short">azerisht</language>
 			<language type="ba">bashkirisht</language>
 			<language type="be">bjellorusisht</language>
-			<language type="bem">bemba</language>
-			<language type="bez">bena</language>
+			<language type="bem">bembaisht</language>
+			<language type="bez">benaisht</language>
 			<language type="bg">bullgarisht</language>
-			<language type="bm">bambara</language>
+			<language type="bgn">balokishte perëndimore</language>
+			<language type="bm">bambarisht</language>
 			<language type="bn">bengalisht</language>
 			<language type="bo">tibetisht</language>
-			<language type="br">bretone</language>
-			<language type="brx">bodo</language>
+			<language type="br">bretonisht</language>
+			<language type="brx">bodoisht</language>
 			<language type="bs">boshnjakisht</language>
 			<language type="ca">katalonisht</language>
+			<language type="ce">çeçenisht</language>
 			<language type="cgg">çigisht</language>
-			<language type="chr">çeroki</language>
+			<language type="chr">çerokisht</language>
 			<language type="ckb">kurdishte sorani</language>
 			<language type="co">korsikanisht</language>
 			<language type="cs">çekisht</language>
+			<language type="cv">çuvashisht</language>
 			<language type="cy">uellsisht</language>
 			<language type="da">danisht</language>
 			<language type="dav">taitisht</language>
@@ -53,9 +56,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="de_CH">gjermanishte zvicerane (dialekti i Alpeve)</language>
 			<language type="dje">zarmisht</language>
 			<language type="dsb">sorbishte e poshtme</language>
-			<language type="dua">dualisht</language>
-			<language type="dyo">xhula-fonji</language>
-			<language type="dz">xongka</language>
+			<language type="dua">dualaisht</language>
+			<language type="dyo">xhulafonjisht</language>
+			<language type="dz">xhongaisht</language>
 			<language type="ebu">embuisht</language>
 			<language type="ee">juisht</language>
 			<language type="el">greqisht</language>
@@ -63,8 +66,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="en_AU">anglishte australiane</language>
 			<language type="en_CA">anglishte kanadeze</language>
 			<language type="en_GB">anglishte britanike</language>
+			<language type="en_GB" alt="short">anglishte e Mbretërisë së Bashkuar</language>
 			<language type="en_US">anglishte amerikane</language>
-			<language type="en_US" alt="short">anglisht (SHBA)</language>
+			<language type="en_US" alt="short">anglishte e SHBA-së</language>
 			<language type="eo">esperanto</language>
 			<language type="es">spanjisht</language>
 			<language type="es_419">spanjishte amerikano-latine</language>
@@ -75,13 +79,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="fa">persisht</language>
 			<language type="fi">finlandisht</language>
 			<language type="fil">filipinase</language>
-			<language type="fj">fixhiane</language>
+			<language type="fj">fixhianisht</language>
 			<language type="fo">faroisht</language>
 			<language type="fr">frëngjisht</language>
 			<language type="fr_CA">frëngjishte kanadeze</language>
 			<language type="fr_CH">frëngjishte zvicerane</language>
 			<language type="fy">frizianisht</language>
-			<language type="ga">irlandezçe</language>
+			<language type="ga">irlandisht</language>
 			<language type="gag">gagauzisht</language>
 			<language type="gd" draft="unconfirmed">Galisht</language>
 			<language type="gl">galike</language>
@@ -89,37 +93,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="gsw">gjermanishte zvicerane</language>
 			<language type="gu">guxharatisht</language>
 			<language type="guz">gusisht</language>
-			<language type="gv">mankse</language>
+			<language type="gv">manksisht</language>
 			<language type="ha">hausisht</language>
-			<language type="haw">hauajane</language>
+			<language type="haw">huajanisht</language>
 			<language type="he">hebraisht</language>
-			<language type="hi">indishte</language>
+			<language type="hi">indisht</language>
 			<language type="hr">kroatisht</language>
 			<language type="hsb">sorbiane e sipërme</language>
-			<language type="ht">haitiançe</language>
+			<language type="ht">haitianisht</language>
 			<language type="hu">hungarisht</language>
 			<language type="hy">armenisht</language>
 			<language type="ia" draft="unconfirmed">Interlingua</language>
 			<language type="id">indonezisht</language>
 			<language type="ie" draft="unconfirmed">Gjuha nderkombtare</language>
-			<language type="ig">igbe</language>
+			<language type="ig">igboisht</language>
 			<language type="ii">sishuanisht</language>
 			<language type="is">islandisht</language>
 			<language type="it">italisht</language>
-			<language type="iu">inuktitut</language>
+			<language type="iu">inuktitutisht</language>
 			<language type="ja">japonisht</language>
 			<language type="jgo">ngombisht</language>
 			<language type="jmc">maçamisht</language>
 			<language type="jv">javanisht</language>
 			<language type="ka">gjeorgjisht</language>
 			<language type="kab">kabilisht</language>
-			<language type="kam">kambishte</language>
+			<language type="kam">kambaisht</language>
 			<language type="kde">makondisht</language>
 			<language type="kea">kabuverdianisht</language>
 			<language type="khq">kojraçinisht</language>
 			<language type="ki">kikujuisht</language>
 			<language type="kk">kazakisht</language>
-			<language type="kl">kalalisute</language>
+			<language type="kl">kalalisutisht</language>
 			<language type="kln">kalenjinisht</language>
 			<language type="km">kmere</language>
 			<language type="kn">kanade</language>
@@ -130,7 +134,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ksb">shambalisht</language>
 			<language type="ksf">bafianisht</language>
 			<language type="ku">kurde</language>
-			<language type="kw">kornisht</language>
+			<language type="kw">kornishisht</language>
 			<language type="ky">kirgizisht</language>
 			<language type="la">latinisht</language>
 			<language type="lag">langisht</language>
@@ -139,20 +143,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lkt">lakotisht</language>
 			<language type="ln">lingalisht</language>
 			<language type="lo">laosisht</language>
+			<language type="lrc">lurishte veriore</language>
 			<language type="lt">lituanisht</language>
-			<language type="lu">Lubakatange</language>
+			<language type="lu">lubakatangisht</language>
 			<language type="luo">luoisht</language>
 			<language type="luy">lujaisht</language>
 			<language type="lv">letonisht</language>
 			<language type="mas">masaisht</language>
 			<language type="mer">meruisht</language>
 			<language type="mfe">norisjene</language>
-			<language type="mg">malageze</language>
-			<language type="mgh">makuamito</language>
+			<language type="mg">malagezisht</language>
+			<language type="mgh">makuamitoisht</language>
 			<language type="mgo">metaisht</language>
 			<language type="mi">maorisht</language>
 			<language type="mk">maqedonisht</language>
-			<language type="ml">malajalame</language>
+			<language type="ml">malajalamisht</language>
 			<language type="mn">mongolisht</language>
 			<language type="moh">mohaukisht</language>
 			<language type="mr">maratisht</language>
@@ -160,12 +165,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mt">maltisht</language>
 			<language type="mua">mundagishte</language>
 			<language type="my">birmanisht</language>
+			<language type="mzn">mazanderanisht</language>
 			<language type="naq">namaishte</language>
 			<language type="nb">bokmalishte norvegjeze</language>
 			<language type="nd">ndebelishte veriore</language>
+			<language type="nds">gjermanishte e vendeve të ulëta</language>
+			<language type="nds_NL">gjermanishte saksone e vendeve të ulëta</language>
 			<language type="ne">nepalisht</language>
 			<language type="nl">holandisht</language>
-			<language type="nl_BE">flamande</language>
+			<language type="nl_BE">flamandisht</language>
 			<language type="nmg">kuasisht</language>
 			<language type="nn">ninorske norvegjeze</language>
 			<language type="no" draft="unconfirmed">Norvegjisht</language>
@@ -174,14 +182,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nyn">niankolisht</language>
 			<language type="oc" draft="unconfirmed">Oksitanisht</language>
 			<language type="om">oromoisht</language>
-			<language type="or">orije</language>
-			<language type="pa">panxhabe</language>
+			<language type="or">orijaisht</language>
+			<language type="pa">panxhabisht</language>
 			<language type="pl">polonisht</language>
-			<language type="ps">pashto</language>
+			<language type="ps">pashtoisht</language>
 			<language type="pt">portugalisht</language>
 			<language type="pt_BR">portugalishte braziliane</language>
 			<language type="pt_PT">portugalishte evropiane</language>
-			<language type="qu">keçua</language>
+			<language type="qu">keçuaisht</language>
 			<language type="quc">kiçeisht</language>
 			<language type="rm">rome</language>
 			<language type="rn">rundisht</language>
@@ -194,14 +202,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sa">sanskritisht</language>
 			<language type="saq">samburisht</language>
 			<language type="sbp">sanguisht</language>
-			<language type="sd">sindi</language>
+			<language type="sd">sindisht</language>
+			<language type="sdh">kurdishte jugore</language>
 			<language type="se">samishte veriore</language>
 			<language type="seh">senaishte</language>
 			<language type="ses">senishte kojrabore</language>
 			<language type="sg">sangoisht</language>
 			<language type="sh" draft="contributed">Serbo-Kroatisht</language>
-			<language type="shi">taçelit</language>
-			<language type="si">sinhale</language>
+			<language type="shi">taçelitisht</language>
+			<language type="si">sinhalisht</language>
 			<language type="sk">sllovakisht</language>
 			<language type="sl">sllovenisht</language>
 			<language type="sma">samishte jugore</language>
@@ -216,7 +225,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="su">sundanisht</language>
 			<language type="sv">suedisht</language>
 			<language type="sw">suahilisht</language>
-			<language type="swc">suahilishte kongoje</language>
+			<language type="sw_CD">suahilishte kongoje</language>
 			<language type="ta">tamile</language>
 			<language type="te">teluge</language>
 			<language type="teo">tezoisht</language>
@@ -239,8 +248,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="vai">vaisht</language>
 			<language type="vi">vietnamisht</language>
 			<language type="vun">vunjisht</language>
+			<language type="wbp">uarlipirisht</language>
 			<language type="wo">ulufisht</language>
-			<language type="xh">xhose</language>
+			<language type="xh">xhozaisht</language>
 			<language type="xog">sogisht</language>
 			<language type="yi" draft="unconfirmed">Jiden</language>
 			<language type="yo">jorubisht</language>
@@ -248,7 +258,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="zh">kinezisht</language>
 			<language type="zh_Hans">kinezishte e thjeshtuar</language>
 			<language type="zh_Hant">kinezishte tradicionale</language>
-			<language type="zu">zulu</language>
+			<language type="zu">zuluisht</language>
 			<language type="zxx">nuk ka përmbajtje gjuhësore</language>
 		</languages>
 		<scripts>
@@ -346,12 +356,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BB">Barbados</territory>
 			<territory type="BD">Bangladesh</territory>
 			<territory type="BE">Belgjikë</territory>
-			<territory type="BF">Burkina Faso</territory>
+			<territory type="BF">Burkina-Faso</territory>
 			<territory type="BG">Bullgari</territory>
 			<territory type="BH">Bahrein</territory>
 			<territory type="BI">Burund</territory>
 			<territory type="BJ">Benin</territory>
-			<territory type="BL">Shën Bartolemeo</territory>
+			<territory type="BL">Shën-Bartolemeo</territory>
 			<territory type="BM">Bermudë</territory>
 			<territory type="BN">Brunej</territory>
 			<territory type="BO">Bolivi</territory>
@@ -359,12 +369,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BR">Brazil</territory>
 			<territory type="BS">Bahamas</territory>
 			<territory type="BT">Butan</territory>
-			<territory type="BV">Ishujt Bove</territory>
-			<territory type="BW">Botsvanë</territory>
+			<territory type="BV">Ishujt Bove’</territory>
+			<territory type="BW">Botsuanë</territory>
 			<territory type="BY">Bjellorusi</territory>
 			<territory type="BZ">Belizë</territory>
 			<territory type="CA">Kanada</territory>
-			<territory type="CC">Ishujt Kokos</territory>
+			<territory type="CC">Ishujt Kokosë</territory>
 			<territory type="CD">Kongo-Kinshasa</territory>
 			<territory type="CD" alt="variant">Kongo (RDK)</territory>
 			<territory type="CF">Republika Afrikano-Qendrore</territory>
@@ -378,7 +388,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CN">Kinë</territory>
 			<territory type="CO">Kolumbi</territory>
 			<territory type="CP">Ishulli Klipërton</territory>
-			<territory type="CR">Kosta Rikë</territory>
+			<territory type="CR">Kosta-Rikë</territory>
 			<territory type="CU">Kubë</territory>
 			<territory type="CV">Kepi i Gjelbër</territory>
 			<territory type="CW">Kuraçao</territory>
@@ -386,7 +396,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CY">Qipro</territory>
 			<territory type="CZ">Republika Çeke</territory>
 			<territory type="DE">Gjermani</territory>
-			<territory type="DG">Diego Garsia</territory>
+			<territory type="DG">Diego-Garsia</territory>
 			<territory type="DJ">Xhibut</territory>
 			<territory type="DK">Danimarkë</territory>
 			<territory type="DM">Dominikë</territory>
@@ -423,14 +433,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GP">Guadalupe</territory>
 			<territory type="GQ">Guineja Ekuatoriale</territory>
 			<territory type="GR">Greqi</territory>
-			<territory type="GS">Xhorxha Jugore dhe Ishujt Senduiç të Jugut</territory>
+			<territory type="GS">Xhorxha Jugore dhe Ishujt Senduiçë të Jugut</territory>
 			<territory type="GT">Guatemalë</territory>
 			<territory type="GU">Guam</territory>
 			<territory type="GW">Guine-Bisau</territory>
 			<territory type="GY">Guajanë</territory>
 			<territory type="HK">RVAK i Hong Kongut</territory>
 			<territory type="HK" alt="short">Hong Kong</territory>
-			<territory type="HM">Ishulli Hërd dhe Ishujt Mekdonald</territory>
+			<territory type="HM">Ishulli Hërd dhe Ishujt Mekdonaldë</territory>
 			<territory type="HN">Honduras</territory>
 			<territory type="HR">Kroaci</territory>
 			<territory type="HT">Haiti</territory>
@@ -455,7 +465,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="KH">Kamboxhia</territory>
 			<territory type="KI">Qiribati</territory>
 			<territory type="KM">Komore</territory>
-			<territory type="KN">Shën Kits e Nevis</territory>
+			<territory type="KN">Shën-Kits dhe Nevis</territory>
 			<territory type="KP">Koreja e Veriut</territory>
 			<territory type="KR">Koreja e Jugut</territory>
 			<territory type="KW">Kuvajt</territory>
@@ -463,9 +473,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="KZ">Kazakistan</territory>
 			<territory type="LA">Laos</territory>
 			<territory type="LB">Liban</territory>
-			<territory type="LC">Shën Luçia</territory>
+			<territory type="LC">Shën-Luçia</territory>
 			<territory type="LI">Lihtënshtajn</territory>
-			<territory type="LK">Sri Lankë</territory>
+			<territory type="LK">Sri-Lankë</territory>
 			<territory type="LR">Liberi</territory>
 			<territory type="LS">Lesoto</territory>
 			<territory type="LT">Lituani</territory>
@@ -476,7 +486,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="MC">Monako</territory>
 			<territory type="MD">Moldavi</territory>
 			<territory type="ME">Mali i Zi</territory>
-			<territory type="MF">Shën Martin</territory>
+			<territory type="MF">Shën-Martin</territory>
 			<territory type="MG">Madagaskar</territory>
 			<territory type="MH">Ishujt Marshallë</territory>
 			<territory type="MK">Maqedoni</territory>
@@ -500,7 +510,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="NA">Namibi</territory>
 			<territory type="NC">Kaledonia e Re</territory>
 			<territory type="NE">Niger</territory>
-			<territory type="NF">Ishujt Norfolkë</territory>
+			<territory type="NF">Ishulli Norfolk</territory>
 			<territory type="NG">Nigeri</territory>
 			<territory type="NI">Nikaragua</territory>
 			<territory type="NL">Holandë</territory>
@@ -517,9 +527,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="PH">Filipine</territory>
 			<territory type="PK">Pakistan</territory>
 			<territory type="PL">Poloni</territory>
-			<territory type="PM">Shën Peir dhe Mikuelon</territory>
+			<territory type="PM">Shën-Peir dhe Mikuelon</territory>
 			<territory type="PN">Ishujt Pitkernë</territory>
-			<territory type="PR">Porto Riko</territory>
+			<territory type="PR">Porto-Riko</territory>
 			<territory type="PS">Territoret Palestineze</territory>
 			<territory type="PS" alt="short">Palestinë</territory>
 			<territory type="PT">Portugali</territory>
@@ -538,22 +548,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="SD">Sudan</territory>
 			<territory type="SE">Suedi</territory>
 			<territory type="SG">Singapor</territory>
-			<territory type="SH">Shën Helena</territory>
+			<territory type="SH">Shën-Helena</territory>
 			<territory type="SI">Slloveni</territory>
-			<territory type="SJ">Svalbard e Zhan Majen</territory>
+			<territory type="SJ">Svalbard e Zhan-Majen</territory>
 			<territory type="SK">Sllovaki</territory>
-			<territory type="SL">Siera Leone</territory>
-			<territory type="SM">San Marino</territory>
+			<territory type="SL">Siera-Leone</territory>
+			<territory type="SM">San-Marino</territory>
 			<territory type="SN">Senegali</territory>
 			<territory type="SO">Somali</territory>
 			<territory type="SR">Surinami</territory>
 			<territory type="SS">Sudani i Jugut</territory>
-			<territory type="ST">Sao Tome e Prinsipe</territory>
+			<territory type="ST">Sao-Tome e Prinsipe</territory>
 			<territory type="SV">El Salvador</territory>
-			<territory type="SX">Shën Martin (Sint Maarten-pjesa e Mbretërisë së Holandës)</territory>
+			<territory type="SX">Shën-Martin (Sint Maarten - pjesa e Mbretërisë së Holandës)</territory>
 			<territory type="SY">Siri</territory>
-			<territory type="SZ">Svazilandë</territory>
-			<territory type="TA">Tristan da Kuna</territory>
+			<territory type="SZ">Suazilandë</territory>
+			<territory type="TA">Tristan-da-Kuna</territory>
 			<territory type="TC">Ishujt Turke dhe Kaike</territory>
 			<territory type="TD">Çad</territory>
 			<territory type="TF">Territoret Australiane Franceze</territory>
@@ -578,7 +588,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="UY">Uruguai</territory>
 			<territory type="UZ">Uzbekistan</territory>
 			<territory type="VA">Vatikan</territory>
-			<territory type="VC">Shën Vinsent dhe Grenadinet</territory>
+			<territory type="VC">Shën-Vinsent dhe Grenadinet</territory>
 			<territory type="VE">Venezuelë</territory>
 			<territory type="VG">Ishujt e Virgjër Britanikë</territory>
 			<territory type="VI">Ishujt e Virgjër Amerikanë</territory>
@@ -598,74 +608,87 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="calendar">Kalendari</key>
 			<key type="collation">Radhitja</key>
 			<key type="currency">Valuta</key>
+			<key type="hc">Cikli orar (12 - 24)</key>
+			<key type="lb">Stili i gjerësisë së rreshtave</key>
+			<key type="ms">Sistemi i njësive matëse</key>
 			<key type="numbers">Numrat</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">shifra indo-arabe</type>
-			<type type="arabext" key="numbers">shifra indo-arabe të zgjatura</type>
-			<type type="armn" key="numbers">numra armenë</type>
-			<type type="armnlow" key="numbers">numra armenë të vegjël</type>
-			<type type="beng" key="numbers">numra bengalë</type>
-			<type type="big5han" key="collation">Radhitje e kinezishtes tradicionale - Big5</type>
-			<type type="buddhist" key="calendar">kalendar budist</type>
-			<type type="chinese" key="calendar">kalendar kinez</type>
-			<type type="coptic" key="calendar">Kalendari Koptik</type>
-			<type type="dangi" key="calendar">kalendar dangi</type>
-			<type type="deva" key="numbers">shifra devanagari</type>
-			<type type="dictionary" key="collation">Radhitje fjalori</type>
-			<type type="ducet" key="collation">radhitje unikode e parazgjedhur</type>
-			<type type="ethi" key="numbers">numra etiopë</type>
-			<type type="ethiopic" key="calendar">kalendar etiop</type>
-			<type type="ethiopic-amete-alem" key="calendar">Kalendari Etiopas Amete Alem</type>
-			<type type="fullwide" key="numbers">shifra me largësi të brendshme</type>
-			<type type="gb2312han" key="collation">Radhitje e kinezishtes së thjeshtësuar - GB2312</type>
-			<type type="geor" key="numbers">numra gjeorgjianë</type>
-			<type type="gregorian" key="calendar">kalendar gregorian</type>
-			<type type="grek" key="numbers">numra grekë</type>
-			<type type="greklow" key="numbers">numra grekë të vegjël</type>
-			<type type="gujr" key="numbers">shifra guxharati</type>
-			<type type="guru" key="numbers">shifra gurmuki</type>
-			<type type="hanidec" key="numbers">numra dhjetorë kinezë</type>
-			<type type="hans" key="numbers">numra të kinezishtes së thjeshtuar</type>
-			<type type="hansfin" key="numbers">numra financiarë të kinezishtes së thjeshtuar</type>
-			<type type="hant" key="numbers">numra të kinezishtes tradicionale</type>
-			<type type="hantfin" key="numbers">numra financiarë të kinezishtes tradicionale</type>
-			<type type="hebr" key="numbers">numra hebraikë</type>
-			<type type="hebrew" key="calendar">kalendar hebraik</type>
-			<type type="indian" key="calendar">Kalendari Kombëtar Indian</type>
-			<type type="islamic" key="calendar">kalendar islamik</type>
-			<type type="islamic-civil" key="calendar">Kalendari Islamik (tabelor, periudha civile)</type>
-			<type type="islamic-tbla" key="calendar">Kalendari Islamik (tabelor, epoka austromikale)</type>
-			<type type="islamic-umalqura" key="calendar">Kalendari Islamik (Um al-Qura)</type>
-			<type type="iso8601" key="calendar">kalendar ISO-8601</type>
-			<type type="japanese" key="calendar">kalendar japonez</type>
-			<type type="jpan" key="numbers">numra japonezë</type>
-			<type type="jpanfin" key="numbers">numra financiarë japonezë</type>
-			<type type="khmr" key="numbers">shifra kmere</type>
-			<type type="knda" key="numbers">shifra kanade</type>
-			<type type="laoo" key="numbers">shifra lao</type>
-			<type type="latn" key="numbers">shifra latino-perëndimore</type>
-			<type type="mlym" key="numbers">shifra malajalame</type>
-			<type type="mymr" key="numbers">shifra mianmari</type>
-			<type type="orya" key="numbers">shifra orije</type>
-			<type type="persian" key="calendar">kalendar persian</type>
-			<type type="phonebook" key="collation">Radhitje libri telefonik</type>
-			<type type="pinyin" key="collation">Radhitje pinini</type>
-			<type type="reformed" key="collation">Radhitje e reformuar</type>
-			<type type="roc" key="calendar">kalendar minguo (kinez)</type>
-			<type type="roman" key="numbers">numra romakë</type>
-			<type type="romanlow" key="numbers">numra romakë të vegjël</type>
-			<type type="search" key="collation">kërkim i përgjithshëm</type>
-			<type type="standard" key="collation">radhitje standarde</type>
-			<type type="taml" key="numbers">numra tamilë tradicionalë</type>
-			<type type="tamldec" key="numbers">shifra tamile</type>
-			<type type="telu" key="numbers">shifra teluguje</type>
-			<type type="thai" key="numbers">shifra tajlandeze</type>
-			<type type="tibt" key="numbers">shifra tibetiane</type>
+			<type key="calendar" type="buddhist">kalendar budist</type>
+			<type key="calendar" type="chinese">kalendar kinez</type>
+			<type key="calendar" type="coptic">Kalendari Koptik</type>
+			<type key="calendar" type="dangi">kalendar dangi</type>
+			<type key="calendar" type="ethiopic">kalendar etiop</type>
+			<type key="calendar" type="ethiopic-amete-alem">Kalendari Etiopas Amete Alem</type>
+			<type key="calendar" type="gregorian">kalendar gregorian</type>
+			<type key="calendar" type="hebrew">kalendar hebraik</type>
+			<type key="calendar" type="indian">Kalendari Kombëtar Indian</type>
+			<type key="calendar" type="islamic">kalendar islamik</type>
+			<type key="calendar" type="islamic-civil">Kalendari Islamik (tabelor, periudha civile)</type>
+			<type key="calendar" type="islamic-tbla">Kalendari Islamik (tabelor, epoka austromikale)</type>
+			<type key="calendar" type="islamic-umalqura">Kalendari Islamik (Um al-Qura)</type>
+			<type key="calendar" type="iso8601">kalendar ISO-8601</type>
+			<type key="calendar" type="japanese">kalendar japonez</type>
+			<type key="calendar" type="persian">kalendar persian</type>
+			<type key="calendar" type="roc">kalendar minguo (kinez)</type>
+			<type key="collation" type="big5han">Radhitje e kinezishtes tradicionale - Big5</type>
+			<type key="collation" type="dictionary">Radhitje fjalori</type>
+			<type key="collation" type="ducet">radhitje unikode e parazgjedhur</type>
+			<type key="collation" type="gb2312han">Radhitje e kinezishtes së thjeshtësuar - GB2312</type>
+			<type key="collation" type="phonebook">Radhitje libri telefonik</type>
+			<type key="collation" type="pinyin">Radhitje pinini</type>
+			<type key="collation" type="reformed">Radhitje e reformuar</type>
+			<type key="collation" type="search">kërkim i përgjithshëm</type>
+			<type key="collation" type="standard">radhitje standarde</type>
+			<type key="hc" type="h11">Sistemi 12-orësh (0 - 11)</type>
+			<type key="hc" type="h12">Sistemi 12-orësh (1 - 12)</type>
+			<type key="hc" type="h23">Sistemi 24-orësh (0 - 23)</type>
+			<type key="hc" type="h24">Sistemi 24-orësh (1 - 24)</type>
+			<type key="lb" type="loose">Stili i gjerësisë së rreshtave - i larguar</type>
+			<type key="lb" type="normal">Stili i gjerësisë së rreshtave - normal</type>
+			<type key="lb" type="strict">Stili i gjerësisë së rreshtave - i ngushtuar</type>
+			<type key="ms" type="metric">Sistemi metrik</type>
+			<type key="ms" type="uksystem">Sistemi imperial (britanik) i njësive matëse</type>
+			<type key="ms" type="ussystem">Sistemi amerikan i njësive matëse</type>
+			<type key="numbers" type="arab">shifra indo-arabe</type>
+			<type key="numbers" type="arabext">shifra indo-arabe të zgjatura</type>
+			<type key="numbers" type="armn">numra armenë</type>
+			<type key="numbers" type="armnlow">numra armenë të vegjël</type>
+			<type key="numbers" type="beng">shifra bengali</type>
+			<type key="numbers" type="deva">shifra devanagari</type>
+			<type key="numbers" type="ethi">numra etiopë</type>
+			<type key="numbers" type="fullwide">shifra me largësi të brendshme</type>
+			<type key="numbers" type="geor">numra gjeorgjianë</type>
+			<type key="numbers" type="grek">numra grekë</type>
+			<type key="numbers" type="greklow">numra grekë të vegjël</type>
+			<type key="numbers" type="gujr">shifra guxharati</type>
+			<type key="numbers" type="guru">shifra gurmuki</type>
+			<type key="numbers" type="hanidec">numra dhjetorë kinezë</type>
+			<type key="numbers" type="hans">numra të kinezishtes së thjeshtuar</type>
+			<type key="numbers" type="hansfin">numra financiarë të kinezishtes së thjeshtuar</type>
+			<type key="numbers" type="hant">numra të kinezishtes tradicionale</type>
+			<type key="numbers" type="hantfin">numra financiarë të kinezishtes tradicionale</type>
+			<type key="numbers" type="hebr">numra hebraikë</type>
+			<type key="numbers" type="jpan">numra japonezë</type>
+			<type key="numbers" type="jpanfin">numra financiarë japonezë</type>
+			<type key="numbers" type="khmr">shifra kmere</type>
+			<type key="numbers" type="knda">shifra kanade</type>
+			<type key="numbers" type="laoo">shifra lao</type>
+			<type key="numbers" type="latn">shifra latino-perëndimore</type>
+			<type key="numbers" type="mlym">shifra malajalame</type>
+			<type key="numbers" type="mymr">shifra mianmari</type>
+			<type key="numbers" type="orya">shifra orije</type>
+			<type key="numbers" type="roman">numra romakë</type>
+			<type key="numbers" type="romanlow">numra romakë të vegjël</type>
+			<type key="numbers" type="taml">numra tamilë tradicionalë</type>
+			<type key="numbers" type="tamldec">shifra tamile</type>
+			<type key="numbers" type="telu">shifra teluguje</type>
+			<type key="numbers" type="thai">shifra tajlandeze</type>
+			<type key="numbers" type="tibt">shifra tibetiane</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metrik</measurementSystemName>
-			<measurementSystemName type="UK">britanik</measurementSystemName>
+			<measurementSystemName type="UK">britanik (imperial)</measurementSystemName>
 			<measurementSystemName type="US">amerikan</measurementSystemName>
 		</measurementSystemNames>
 		<codePatterns>
@@ -678,6 +701,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<exemplarCharacters>[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}]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[w]</exemplarCharacters>
 		<exemplarCharacters type="index">[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}]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐ – — , ; \: ! ? . … ' ‘ ’ &quot; “ ” « » ( ) \[ \] § @ * / \&amp; # ′ ″ ~]</exemplarCharacters>
 		<ellipsis type="final">{0}…</ellipsis>
 		<ellipsis type="word-final">{0} …</ellipsis>
 		<moreInformation>?</moreInformation>
@@ -736,6 +760,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -1065,15 +1090,73 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">mesnatë</dayPeriod>
+							<dayPeriod type="am">e paradites</dayPeriod>
+							<dayPeriod type="noon">mesditë</dayPeriod>
+							<dayPeriod type="pm">e pasdites</dayPeriod>
+							<dayPeriod type="morning1">mëngjes</dayPeriod>
+							<dayPeriod type="morning2">e paradites</dayPeriod>
+							<dayPeriod type="afternoon1">e pasdites</dayPeriod>
+							<dayPeriod type="evening1">mbrëmje</dayPeriod>
+							<dayPeriod type="night1">natë</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="noon">MD</dayPeriod>
-							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="midnight">mesnatë</dayPeriod>
+							<dayPeriod type="am">e paradites</dayPeriod>
+							<dayPeriod type="noon">mesditë</dayPeriod>
+							<dayPeriod type="pm">e pasdites</dayPeriod>
+							<dayPeriod type="morning1">mëngjes</dayPeriod>
+							<dayPeriod type="morning2">e paradites</dayPeriod>
+							<dayPeriod type="afternoon1">e pasdites</dayPeriod>
+							<dayPeriod type="evening1">mbrëmje</dayPeriod>
+							<dayPeriod type="night1">natë</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">mesnatë</dayPeriod>
+							<dayPeriod type="am">e paradites</dayPeriod>
+							<dayPeriod type="noon">mesditë</dayPeriod>
+							<dayPeriod type="pm">e pasdites</dayPeriod>
+							<dayPeriod type="morning1">mëngjes</dayPeriod>
+							<dayPeriod type="morning2">e paradites</dayPeriod>
+							<dayPeriod type="afternoon1">e pasdites</dayPeriod>
+							<dayPeriod type="evening1">mbrëmje</dayPeriod>
+							<dayPeriod type="night1">natë</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">mesnatë</dayPeriod>
 							<dayPeriod type="am">paradite</dayPeriod>
 							<dayPeriod type="noon">mesditë</dayPeriod>
 							<dayPeriod type="pm">pasdite</dayPeriod>
+							<dayPeriod type="morning1">mëngjes</dayPeriod>
+							<dayPeriod type="morning2">paradite</dayPeriod>
+							<dayPeriod type="afternoon1">pasdite</dayPeriod>
+							<dayPeriod type="evening1">mbrëmje</dayPeriod>
+							<dayPeriod type="night1">natë</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">mesnatë</dayPeriod>
+							<dayPeriod type="am">paradite</dayPeriod>
+							<dayPeriod type="noon">mesditë</dayPeriod>
+							<dayPeriod type="pm">pasdite</dayPeriod>
+							<dayPeriod type="morning1">mëngjes</dayPeriod>
+							<dayPeriod type="morning2">paradite</dayPeriod>
+							<dayPeriod type="afternoon1">pasdite</dayPeriod>
+							<dayPeriod type="evening1">mbrëmje</dayPeriod>
+							<dayPeriod type="night1">natë</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">mesnatë</dayPeriod>
+							<dayPeriod type="am">paradite</dayPeriod>
+							<dayPeriod type="noon">mesditë</dayPeriod>
+							<dayPeriod type="pm">pasdite</dayPeriod>
+							<dayPeriod type="morning1">mëngjes</dayPeriod>
+							<dayPeriod type="morning2">paradite</dayPeriod>
+							<dayPeriod type="afternoon1">pasdite</dayPeriod>
+							<dayPeriod type="evening1">mbrëmje</dayPeriod>
+							<dayPeriod type="night1">natë</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1086,7 +1169,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</eraNames>
 					<eraAbbr>
 						<era type="0">p.e.r.</era>
-						<era type="0" alt="variant">p.e.s</era>
+						<era type="0" alt="variant">p.e.s.</era>
 						<era type="1">e.r.</era>
 						<era type="1" alt="variant">e.s.</era>
 					</eraAbbr>
@@ -1122,22 +1205,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
+							<pattern>h:mm:ss a, zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
+							<pattern>h:mm:ss a, z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
+							<pattern>h:mm:ss a</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>HH:mm</pattern>
+							<pattern>h:mm a</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -1180,6 +1263,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a, v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss, v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a, v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm, v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d.M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.M</dateFormatItem>
@@ -1226,20 +1313,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="m">HH:mm – HH:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm – h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm – h:mm a v</greatestDifference>
+							<greatestDifference id="a">h:mm a – h:mm a, v</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a, v</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a, v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H">HH:mm – HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm – HH:mm v</greatestDifference>
+							<greatestDifference id="H">HH:mm – HH:mm, v</greatestDifference>
+							<greatestDifference id="m">HH:mm – HH:mm, v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h – h a v</greatestDifference>
+							<greatestDifference id="a">h a – h a, v</greatestDifference>
+							<greatestDifference id="h">h – h a, v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
-							<greatestDifference id="H">HH – HH v</greatestDifference>
+							<greatestDifference id="H">HH – HH, v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M – M</greatestDifference>
@@ -1316,8 +1403,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">pas {0} vjetësh</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">para {0} viti</relativeTimePattern>
-					<relativeTimePattern count="other">para {0} vjetësh</relativeTimePattern>
+					<relativeTimePattern count="one">{0} vit më parë</relativeTimePattern>
+					<relativeTimePattern count="other">{0} vjet më parë</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="year-short">
@@ -1327,8 +1414,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">pas {0} vjetësh</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">para {0} viti</relativeTimePattern>
-					<relativeTimePattern count="other">para {0} vjetësh</relativeTimePattern>
+					<relativeTimePattern count="one">{0} vit më parë</relativeTimePattern>
+					<relativeTimePattern count="other">{0} vjet më parë</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="year-narrow">
@@ -1338,8 +1425,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">pas {0} vjetësh</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">para {0} viti</relativeTimePattern>
-					<relativeTimePattern count="other">para {0} vjetësh</relativeTimePattern>
+					<relativeTimePattern count="one">{0} vit më parë</relativeTimePattern>
+					<relativeTimePattern count="other">{0} vjet më parë</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter">
@@ -1349,8 +1436,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">pas {0} tremujorësh</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">para {0} tremujori</relativeTimePattern>
-					<relativeTimePattern count="other">para {0} tremujorësh</relativeTimePattern>
+					<relativeTimePattern count="one">{0} tremujor më parë</relativeTimePattern>
+					<relativeTimePattern count="other">{0} tremujorë më parë</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-short">
@@ -1360,8 +1447,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">pas {0} tremujorësh</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">para {0} tremujori</relativeTimePattern>
-					<relativeTimePattern count="other">para {0} tremujorësh</relativeTimePattern>
+					<relativeTimePattern count="one">{0} tremujor më parë</relativeTimePattern>
+					<relativeTimePattern count="other">{0} tremujorë më parë</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-narrow">
@@ -1371,8 +1458,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">pas {0} tremujorësh</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">para {0} tremujori</relativeTimePattern>
-					<relativeTimePattern count="other">para {0} tremujorësh</relativeTimePattern>
+					<relativeTimePattern count="one">{0} tremujor më parë</relativeTimePattern>
+					<relativeTimePattern count="other">{0} tremujorë më parë</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month">
@@ -1385,8 +1472,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">pas {0} muajsh</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">para {0} muaji</relativeTimePattern>
-					<relativeTimePattern count="other">para {0} muajsh</relativeTimePattern>
+					<relativeTimePattern count="one">{0} muaj më parë</relativeTimePattern>
+					<relativeTimePattern count="other">{0} muaj më parë</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month-short">
@@ -1396,8 +1483,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">pas {0} muajsh</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">para {0} muaji</relativeTimePattern>
-					<relativeTimePattern count="other">para {0} muajsh</relativeTimePattern>
+					<relativeTimePattern count="one">{0} muaj më parë</relativeTimePattern>
+					<relativeTimePattern count="other">{0} muaj më parë</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month-narrow">
@@ -1407,8 +1494,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">pas {0} muajsh</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">para {0} muaji</relativeTimePattern>
-					<relativeTimePattern count="other">para {0} muajsh</relativeTimePattern>
+					<relativeTimePattern count="one">{0} muaj më parë</relativeTimePattern>
+					<relativeTimePattern count="other">{0} muaj më parë</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week">
@@ -1421,8 +1508,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">pas {0} javësh</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">para {0} jave</relativeTimePattern>
-					<relativeTimePattern count="other">para {0} javësh</relativeTimePattern>
+					<relativeTimePattern count="one">{0} javë më parë</relativeTimePattern>
+					<relativeTimePattern count="other">{0} javë më parë</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week-short">
@@ -1432,8 +1519,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">pas {0} javësh</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">para {0} jave</relativeTimePattern>
-					<relativeTimePattern count="other">para {0} javësh</relativeTimePattern>
+					<relativeTimePattern count="one">{0} javë më parë</relativeTimePattern>
+					<relativeTimePattern count="other">{0} javë më parë</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week-narrow">
@@ -1443,8 +1530,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">pas {0} javësh</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">para {0} jave</relativeTimePattern>
-					<relativeTimePattern count="other">para {0} javësh</relativeTimePattern>
+					<relativeTimePattern count="one">{0} javë më parë</relativeTimePattern>
+					<relativeTimePattern count="other">{0} javë më parë</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day">
@@ -1457,8 +1544,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">pas {0} ditësh</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">para {0} dite</relativeTimePattern>
-					<relativeTimePattern count="other">para {0} ditësh</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ditë më parë</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ditë më parë</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day-short">
@@ -1468,8 +1555,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">pas {0} ditësh</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">para {0} dite</relativeTimePattern>
-					<relativeTimePattern count="other">para {0} ditësh</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ditë më parë</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ditë më parë</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day-narrow">
@@ -1479,8 +1566,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">pas {0} ditësh</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">para {0} dite</relativeTimePattern>
-					<relativeTimePattern count="other">para {0} ditësh</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ditë më parë</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ditë më parë</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="weekday">
@@ -1592,7 +1679,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">të shtunën e ardhshme</relative>
 			</field>
 			<field type="dayperiod">
-				<displayName>periudhë e ditës</displayName>
+				<displayName>paradite/pasdite</displayName>
 			</field>
 			<field type="hour">
 				<displayName>orë</displayName>
@@ -1601,8 +1688,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">pas {0} orësh</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">para {0} ore</relativeTimePattern>
-					<relativeTimePattern count="other">para {0} orësh</relativeTimePattern>
+					<relativeTimePattern count="one">{0} orë më parë</relativeTimePattern>
+					<relativeTimePattern count="other">{0} orë më parë</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-short">
@@ -1612,8 +1699,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">pas {0} orësh</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">para {0} ore</relativeTimePattern>
-					<relativeTimePattern count="other">para {0} orësh</relativeTimePattern>
+					<relativeTimePattern count="one">{0} orë më parë</relativeTimePattern>
+					<relativeTimePattern count="other">{0} orë më parë</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-narrow">
@@ -1623,8 +1710,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">pas {0} orësh</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">para {0} ore</relativeTimePattern>
-					<relativeTimePattern count="other">para {0} orësh</relativeTimePattern>
+					<relativeTimePattern count="one">{0} orë më parë</relativeTimePattern>
+					<relativeTimePattern count="other">{0} orë më parë</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute">
@@ -1634,8 +1721,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">pas {0} minutash</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">para {0} minute</relativeTimePattern>
-					<relativeTimePattern count="other">para {0} minutash</relativeTimePattern>
+					<relativeTimePattern count="one">{0} minutë më parë</relativeTimePattern>
+					<relativeTimePattern count="other">{0} minuta më parë</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute-short">
@@ -1645,8 +1732,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">pas {0} min.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">para {0} min.</relativeTimePattern>
-					<relativeTimePattern count="other">para {0} min.</relativeTimePattern>
+					<relativeTimePattern count="one">{0} min. më parë</relativeTimePattern>
+					<relativeTimePattern count="other">{0} min. më parë</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute-narrow">
@@ -1656,8 +1743,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">pas {0} min.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">para {0} min.</relativeTimePattern>
-					<relativeTimePattern count="other">para {0} min.</relativeTimePattern>
+					<relativeTimePattern count="one">{0} min. më parë</relativeTimePattern>
+					<relativeTimePattern count="other">{0} min. më parë</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second">
@@ -1668,8 +1755,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">pas {0} sekondash</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">para {0} sekonde</relativeTimePattern>
-					<relativeTimePattern count="other">para {0} sekondash</relativeTimePattern>
+					<relativeTimePattern count="one">{0} sekondë më parë</relativeTimePattern>
+					<relativeTimePattern count="other">{0} sekonda më parë</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second-short">
@@ -1679,8 +1766,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">pas {0} sek.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">para {0} sek.</relativeTimePattern>
-					<relativeTimePattern count="other">para {0} sek.</relativeTimePattern>
+					<relativeTimePattern count="one">{0} sek. më parë</relativeTimePattern>
+					<relativeTimePattern count="other">{0} sek. më parë</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second-narrow">
@@ -1690,8 +1777,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">pas {0} sek.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">para {0} sek.</relativeTimePattern>
-					<relativeTimePattern count="other">para {0} sek.</relativeTimePattern>
+					<relativeTimePattern count="one">{0} sek. më parë</relativeTimePattern>
+					<relativeTimePattern count="other">{0} sek. më parë</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="zone">
@@ -1700,8 +1787,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</fields>
 		<timeZoneNames>
 			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<gmtZeroFormat>GMT</gmtZeroFormat>
+			<gmtFormat>Ora e Grenuiçit: {0}</gmtFormat>
+			<gmtZeroFormat>Ora e Grenuiçit</gmtZeroFormat>
 			<regionFormat>Ora: {0}</regionFormat>
 			<regionFormat type="daylight">Ora verore: {0}</regionFormat>
 			<regionFormat type="standard">Ora standarde: {0}</regionFormat>
@@ -1758,19 +1845,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Kejsi</exemplarCity>
 			</zone>
 			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont d’Urvillë</exemplarCity>
+				<exemplarCity>Dumont-d’Urvilë</exemplarCity>
 			</zone>
 			<zone type="Antarctica/McMurdo">
 				<exemplarCity>Mekmurdo</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Rio Galegos</exemplarCity>
+				<exemplarCity>Rio-Galegos</exemplarCity>
 			</zone>
 			<zone type="America/Mendoza">
 				<exemplarCity>Mendoza</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>San Huan</exemplarCity>
+				<exemplarCity>San-Huan</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Ushuaia">
 				<exemplarCity>Ushuaja</exemplarCity>
@@ -1779,7 +1866,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>La Rioha</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/San_Luis">
-				<exemplarCity>Shën Luis</exemplarCity>
+				<exemplarCity>Shën-Luis</exemplarCity>
 			</zone>
 			<zone type="America/Catamarca">
 				<exemplarCity>Katamarka</exemplarCity>
@@ -1797,10 +1884,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Kordoba</exemplarCity>
 			</zone>
 			<zone type="America/Buenos_Aires">
-				<exemplarCity>Buenos Aires</exemplarCity>
+				<exemplarCity>Buenos-Ajres</exemplarCity>
 			</zone>
 			<zone type="Pacific/Pago_Pago">
-				<exemplarCity>Pago Pago</exemplarCity>
+				<exemplarCity>Pago-Pago</exemplarCity>
 			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Vjenë</exemplarCity>
@@ -1818,7 +1905,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Adelajde</exemplarCity>
 			</zone>
 			<zone type="Australia/Broken_Hill">
-				<exemplarCity>Brokën Hill</exemplarCity>
+				<exemplarCity>Brokën-Hill</exemplarCity>
 			</zone>
 			<zone type="Australia/Currie">
 				<exemplarCity>Kuri</exemplarCity>
@@ -1881,7 +1968,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Porto-Novo</exemplarCity>
 			</zone>
 			<zone type="America/St_Barthelemy">
-				<exemplarCity>Shën Bartolemeo</exemplarCity>
+				<exemplarCity>Shën-Bartolemeo</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Bermuda">
 				<exemplarCity>Bermudë</exemplarCity>
@@ -1899,13 +1986,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Ejrunep</exemplarCity>
 			</zone>
 			<zone type="America/Rio_Branco">
-				<exemplarCity>Rio Branko</exemplarCity>
+				<exemplarCity>Rio-Branko</exemplarCity>
 			</zone>
 			<zone type="America/Porto_Velho">
-				<exemplarCity>Porto Velho</exemplarCity>
+				<exemplarCity>Porto-Velho</exemplarCity>
 			</zone>
 			<zone type="America/Boa_Vista">
-				<exemplarCity>Boa Vista</exemplarCity>
+				<exemplarCity>Boa-Vista</exemplarCity>
 			</zone>
 			<zone type="America/Manaus">
 				<exemplarCity>Manaus</exemplarCity>
@@ -1917,7 +2004,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Santarem</exemplarCity>
 			</zone>
 			<zone type="America/Campo_Grande">
-				<exemplarCity>Kampo Grande</exemplarCity>
+				<exemplarCity>Kampo-Grande</exemplarCity>
 			</zone>
 			<zone type="America/Belem">
 				<exemplarCity>Belem</exemplarCity>
@@ -1926,7 +2013,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Araguajana</exemplarCity>
 			</zone>
 			<zone type="America/Sao_Paulo">
-				<exemplarCity>Sao Paulo</exemplarCity>
+				<exemplarCity>Sao-Paulo</exemplarCity>
 			</zone>
 			<zone type="America/Bahia">
 				<exemplarCity>Bahia</exemplarCity>
@@ -2037,7 +2124,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Blank-Sablon</exemplarCity>
 			</zone>
 			<zone type="America/St_Johns">
-				<exemplarCity>Shën Gjon</exemplarCity>
+				<exemplarCity>Shën-Gjon</exemplarCity>
 			</zone>
 			<zone type="Indian/Cocos">
 				<exemplarCity>Kokos</exemplarCity>
@@ -2082,7 +2169,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Bogotë</exemplarCity>
 			</zone>
 			<zone type="America/Costa_Rica">
-				<exemplarCity>Kosta Rikë</exemplarCity>
+				<exemplarCity>Kosta-Rikë</exemplarCity>
 			</zone>
 			<zone type="America/Havana">
 				<exemplarCity>Havanë</exemplarCity>
@@ -2118,7 +2205,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Dominikë</exemplarCity>
 			</zone>
 			<zone type="America/Santo_Domingo">
-				<exemplarCity>Santo Domingo</exemplarCity>
+				<exemplarCity>Santo-Domingo</exemplarCity>
 			</zone>
 			<zone type="Africa/Algiers">
 				<exemplarCity>Algjer</exemplarCity>
@@ -2151,7 +2238,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Madrid</exemplarCity>
 			</zone>
 			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>Adis Ababë</exemplarCity>
+				<exemplarCity>Adis-Ababë</exemplarCity>
 			</zone>
 			<zone type="Europe/Helsinki">
 				<exemplarCity>Helsinki</exemplarCity>
@@ -2247,7 +2334,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Gujanë</exemplarCity>
 			</zone>
 			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Hong Kong</exemplarCity>
+				<exemplarCity>Hong-Kong</exemplarCity>
 			</zone>
 			<zone type="America/Tegucigalpa">
 				<exemplarCity>Tegusigalpa</exemplarCity>
@@ -2322,7 +2409,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Bishkek</exemplarCity>
 			</zone>
 			<zone type="Asia/Phnom_Penh">
-				<exemplarCity>Pnom Pen</exemplarCity>
+				<exemplarCity>Pnom-Pen</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
 				<exemplarCity>Enderbur</exemplarCity>
@@ -2337,7 +2424,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Komore</exemplarCity>
 			</zone>
 			<zone type="America/St_Kitts">
-				<exemplarCity>Shën Kits</exemplarCity>
+				<exemplarCity>Shën-Kits</exemplarCity>
 			</zone>
 			<zone type="Asia/Pyongyang">
 				<exemplarCity>Penian</exemplarCity>
@@ -2367,13 +2454,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Almati</exemplarCity>
 			</zone>
 			<zone type="Asia/Vientiane">
-				<exemplarCity>Vjentjanë</exemplarCity>
+				<exemplarCity>Vjentianë</exemplarCity>
 			</zone>
 			<zone type="Asia/Beirut">
 				<exemplarCity>Bejrut</exemplarCity>
 			</zone>
 			<zone type="America/St_Lucia">
-				<exemplarCity>Shën Luçia</exemplarCity>
+				<exemplarCity>Shën-Luçia</exemplarCity>
 			</zone>
 			<zone type="Europe/Vaduz">
 				<exemplarCity>Vaduz</exemplarCity>
@@ -2472,7 +2559,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Tihuana</exemplarCity>
 			</zone>
 			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Izabela</exemplarCity>
+				<exemplarCity>Santa-Izabela</exemplarCity>
 			</zone>
 			<zone type="America/Hermosillo">
 				<exemplarCity>Hermosijo</exemplarCity>
@@ -2484,7 +2571,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Çihahua</exemplarCity>
 			</zone>
 			<zone type="America/Bahia_Banderas">
-				<exemplarCity>Bahia Banderas</exemplarCity>
+				<exemplarCity>Bahia-Banderas</exemplarCity>
 			</zone>
 			<zone type="America/Ojinaga">
 				<exemplarCity>Ohinaga</exemplarCity>
@@ -2505,7 +2592,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Kankun</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuala_Lumpur">
-				<exemplarCity>Kuala Lumpur</exemplarCity>
+				<exemplarCity>Kuala-Lumpur</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuching">
 				<exemplarCity>Kuçing</exemplarCity>
@@ -2571,7 +2658,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Gambier</exemplarCity>
 			</zone>
 			<zone type="Pacific/Port_Moresby">
-				<exemplarCity>Port Moresbi</exemplarCity>
+				<exemplarCity>Port-Moresbi</exemplarCity>
+			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bunganvilë</exemplarCity>
 			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
@@ -2589,7 +2679,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Pitkern</exemplarCity>
 			</zone>
 			<zone type="America/Puerto_Rico">
-				<exemplarCity>Porto Riko</exemplarCity>
+				<exemplarCity>Porto-Riko</exemplarCity>
 			</zone>
 			<zone type="Asia/Gaza">
 				<exemplarCity>Gaza</exemplarCity>
@@ -2657,6 +2747,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Çita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Jakutsk</exemplarCity>
 			</zone>
@@ -2675,6 +2768,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolimsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamçatkë</exemplarCity>
 			</zone>
@@ -2703,7 +2799,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Singapor</exemplarCity>
 			</zone>
 			<zone type="Atlantic/St_Helena">
-				<exemplarCity>Shën Helenë</exemplarCity>
+				<exemplarCity>Shën-Helenë</exemplarCity>
 			</zone>
 			<zone type="Europe/Ljubljana">
 				<exemplarCity>Lubjanë</exemplarCity>
@@ -2718,7 +2814,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Fritaun</exemplarCity>
 			</zone>
 			<zone type="Europe/San_Marino">
-				<exemplarCity>San Marino</exemplarCity>
+				<exemplarCity>San-Marino</exemplarCity>
 			</zone>
 			<zone type="Africa/Dakar">
 				<exemplarCity>Dakar</exemplarCity>
@@ -2733,13 +2829,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Xhuba</exemplarCity>
 			</zone>
 			<zone type="Africa/Sao_Tome">
-				<exemplarCity>Sao Tome</exemplarCity>
+				<exemplarCity>Sao-Tome</exemplarCity>
 			</zone>
 			<zone type="America/El_Salvador">
 				<exemplarCity>El Salvador</exemplarCity>
 			</zone>
 			<zone type="America/Lower_Princes">
-				<exemplarCity>Louer Prinsis Kuortër</exemplarCity>
+				<exemplarCity>Louer-Prinsis-Kuortër</exemplarCity>
 			</zone>
 			<zone type="Asia/Damascus">
 				<exemplarCity>Damask</exemplarCity>
@@ -2793,7 +2889,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Tajpej</exemplarCity>
 			</zone>
 			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity>Dar es Salam</exemplarCity>
+				<exemplarCity>Dar-es-Salam</exemplarCity>
 			</zone>
 			<zone type="Europe/Uzhgorod">
 				<exemplarCity>Uzhgorod</exemplarCity>
@@ -2856,7 +2952,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Beula, Dakota e Veriut</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>Nju Salem, Dakota e Veriut</exemplarCity>
+				<exemplarCity>Nju-Salem, Dakota e Veriut</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/Center">
 				<exemplarCity>Qendër, Dakota e Veriut</exemplarCity>
@@ -2874,7 +2970,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Petërsburg, Indiana</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Tell_City">
-				<exemplarCity>Tell Siti, Indiana</exemplarCity>
+				<exemplarCity>Tell-Siti, Indiana</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Knox">
 				<exemplarCity>Noks, Indiana</exemplarCity>
@@ -2901,7 +2997,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Detroit</exemplarCity>
 			</zone>
 			<zone type="America/New_York">
-				<exemplarCity>Nju Jork</exemplarCity>
+				<exemplarCity>Nju-Jork</exemplarCity>
 			</zone>
 			<zone type="America/Montevideo">
 				<exemplarCity>Montevideo</exemplarCity>
@@ -2916,7 +3012,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Vatikan</exemplarCity>
 			</zone>
 			<zone type="America/St_Vincent">
-				<exemplarCity>Shën Vinsent</exemplarCity>
+				<exemplarCity>Shën-Vinsent</exemplarCity>
 			</zone>
 			<zone type="America/Caracas">
 				<exemplarCity>Karakas</exemplarCity>
@@ -2925,10 +3021,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Tortolë</exemplarCity>
 			</zone>
 			<zone type="America/St_Thomas">
-				<exemplarCity>Shën Tomas</exemplarCity>
+				<exemplarCity>Shën-Tomas</exemplarCity>
 			</zone>
 			<zone type="Asia/Saigon">
-				<exemplarCity>Ho Çi Min</exemplarCity>
+				<exemplarCity>Ho-Çi-Min</exemplarCity>
 			</zone>
 			<zone type="Pacific/Efate">
 				<exemplarCity>Efate</exemplarCity>
@@ -3109,9 +3205,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Australia_CentralWestern">
 				<long>
-					<generic>Ora e Australisë Qendrore-Perëndimore</generic>
-					<standard>Ora standarde e Australisë Qendrore-Perëndimore</standard>
-					<daylight>Ora verore e Australisë Qendrore-Perëndimore</daylight>
+					<generic>Ora e Australisë Qendroro-Perëndimore</generic>
+					<standard>Ora standarde e Australisë Qendroro-Perëndimore</standard>
+					<daylight>Ora verore e Australisë Qendroro-Perëndimore</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Eastern">
@@ -3168,7 +3264,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Brunei">
 				<long>
-					<standard>Ora e Brunei Durasalamit</standard>
+					<standard>Ora e Brunei-Durasalamit</standard>
 				</long>
 			</metazone>
 			<metazone type="Cape_Verde">
@@ -3389,9 +3485,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>
-					<generic>Ora e Hong Kongut</generic>
-					<standard>Ora standarde e Hong Kongut</standard>
-					<daylight>Ora verore e Hong Kongut</daylight>
+					<generic>Ora e Hong-Kongut</generic>
+					<standard>Ora standarde e Hong-Kongut</standard>
+					<daylight>Ora verore e Hong-Kongut</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hovd">
@@ -3440,9 +3536,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Irkutsk">
 				<long>
-					<generic>Ora e Irkutskit</generic>
-					<standard>Ora standarde e Irkutskit</standard>
-					<daylight>Ora verore e Irkutskit</daylight>
+					<generic>Ora e Irkutskut</generic>
+					<standard>Ora standarde e Irkutskut</standard>
+					<daylight>Ora verore e Irkutskut</daylight>
 				</long>
 			</metazone>
 			<metazone type="Israel">
@@ -3512,9 +3608,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Lord_Howe">
 				<long>
-					<generic>Ora e Lord Houit</generic>
-					<standard>Ora standarde e Lord Houit</standard>
-					<daylight>Ora verore e Lord Houit</daylight>
+					<generic>Ora e Lord-Houit</generic>
+					<standard>Ora standarde e Lord-Houit</standard>
+					<daylight>Ora verore e Lord-Houit</daylight>
 				</long>
 			</metazone>
 			<metazone type="Macau">
@@ -3584,9 +3680,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Mongolia">
 				<long>
-					<generic>Ora e Ulan Batorit</generic>
-					<standard>Ora standarde e Ulan Batorit</standard>
-					<daylight>Ora verore e Ulan Batorit</daylight>
+					<generic>Ora e Ulan-Batorit</generic>
+					<standard>Ora standarde e Ulan-Batorit</standard>
+					<daylight>Ora verore e Ulan-Batorit</daylight>
 				</long>
 			</metazone>
 			<metazone type="Moscow">
@@ -3644,9 +3740,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Noronha">
 				<long>
-					<generic>Ora e Fernando de Noronjës</generic>
-					<standard>Ora standarde e Fernando de Noronjës</standard>
-					<daylight>Ora verore e Fernando de Noronjës</daylight>
+					<generic>Ora e Fernando-de-Noronjës</generic>
+					<standard>Ora standarde e Fernando-de-Noronjës</standard>
+					<daylight>Ora verore e Fernando-de-Noronjës</daylight>
 				</long>
 			</metazone>
 			<metazone type="North_Mariana">
@@ -3713,9 +3809,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Pierre_Miquelon">
 				<long>
-					<generic>Ora e Shën Pierr dhe Mikuelon</generic>
-					<standard>Ora standarde e Shën Pierr dhe Mikuelon</standard>
-					<daylight>Ora verore e Shën Pierr dhe Mikuelon</daylight>
+					<generic>Ora e Shën-Pier dhe Mikuelon</generic>
+					<standard>Ora standarde e Shën-Pier dhe Mikuelon</standard>
+					<daylight>Ora verore e Shën-Pier dhe Mikuelon</daylight>
 				</long>
 			</metazone>
 			<metazone type="Pitcairn">
@@ -3768,7 +3864,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Seychelles">
 				<long>
-					<standard>Ora e Sejçelës</standard>
+					<standard>Ora e Sishelës</standard>
 				</long>
 			</metazone>
 			<metazone type="Singapore">
@@ -4018,6 +4114,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">0 mijë ¤</pattern>
+					<pattern type="1000" count="other">0 mijë ¤</pattern>
+					<pattern type="10000" count="one">00 mijë ¤</pattern>
+					<pattern type="10000" count="other">00 mijë ¤</pattern>
+					<pattern type="100000" count="one">000 mijë ¤</pattern>
+					<pattern type="100000" count="other">000 mijë ¤</pattern>
+					<pattern type="1000000" count="one">0 Mln ¤</pattern>
+					<pattern type="1000000" count="other">0 Mln ¤</pattern>
+					<pattern type="10000000" count="one">00 Mln ¤</pattern>
+					<pattern type="10000000" count="other">00 Mln ¤</pattern>
+					<pattern type="100000000" count="one">000 Mln ¤</pattern>
+					<pattern type="100000000" count="other">000 Mln ¤</pattern>
+					<pattern type="1000000000" count="one">0 Mld ¤</pattern>
+					<pattern type="1000000000" count="other">0 Mld ¤</pattern>
+					<pattern type="10000000000" count="one">00 Mld ¤</pattern>
+					<pattern type="10000000000" count="other">00 Mld ¤</pattern>
+					<pattern type="100000000000" count="one">000 Mld ¤</pattern>
+					<pattern type="100000000000" count="other">000 Mld ¤</pattern>
+					<pattern type="1000000000000" count="one">0 Bln ¤</pattern>
+					<pattern type="1000000000000" count="other">0 Bln ¤</pattern>
+					<pattern type="10000000000000" count="one">00 Bln ¤</pattern>
+					<pattern type="10000000000000" count="other">00 Bln ¤</pattern>
+					<pattern type="100000000000000" count="one">000 Bln ¤</pattern>
+					<pattern type="100000000000000" count="other">000 Bln ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4105,7 +4229,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">franga burundiane</displayName>
 			</currency>
 			<currency type="BMD">
-				<displayName>Dollari e Bermudeve</displayName>
+				<displayName>Dollari i Bermudeve</displayName>
 				<displayName count="one">dollar bermude</displayName>
 				<displayName count="other">dollarë bermude</displayName>
 			</currency>
@@ -4136,9 +4260,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">ngultrumë butanez</displayName>
 			</currency>
 			<currency type="BWP">
-				<displayName>Pula botsvane</displayName>
-				<displayName count="one">pulë botsvane</displayName>
-				<displayName count="other">pula botsvane</displayName>
+				<displayName>Pula botsuane</displayName>
+				<displayName count="one">pulë botsuane</displayName>
+				<displayName count="other">pula botsuane</displayName>
 			</currency>
 			<currency type="BYR">
 				<displayName>Rubla bjelloruse</displayName>
@@ -4188,14 +4312,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">kolonë kostarikan</displayName>
 			</currency>
 			<currency type="CUC">
-				<displayName>Pezoja kubane e shkëmbyeshme</displayName>
-				<displayName count="one">pezo kubane e shkëmbyeshme</displayName>
-				<displayName count="other">pezo kubane të shkëmbyeshme</displayName>
+				<displayName>Pezoja kubaneze e shkëmbyeshme</displayName>
+				<displayName count="one">pezo kubaneze e shkëmbyeshme</displayName>
+				<displayName count="other">pezo kubaneze të shkëmbyeshme</displayName>
 			</currency>
 			<currency type="CUP">
-				<displayName>Pezoja kubane</displayName>
-				<displayName count="one">pezo kubane</displayName>
-				<displayName count="other">pezo kubane</displayName>
+				<displayName>Pezoja kubaneze</displayName>
+				<displayName count="one">pezo kubaneze</displayName>
+				<displayName count="other">pezo kubaneze</displayName>
 			</currency>
 			<currency type="CVE">
 				<displayName>Eskudoja e Kepit të Gjelbër</displayName>
@@ -4333,7 +4457,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="ILS">
 				<displayName>Shekeli izrealit</displayName>
 				<displayName count="one">shekel izrealit</displayName>
-				<displayName count="other">shekelë izrealite</displayName>
+				<displayName count="other">shekelë izrealit</displayName>
 				<symbol>₪</symbol>
 			</currency>
 			<currency type="INR">
@@ -4430,7 +4554,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">sterlina libaneze</displayName>
 			</currency>
 			<currency type="LKR">
-				<displayName>Rupia e Sri Lankës</displayName>
+				<displayName>Rupia e Sri-Lankës</displayName>
 				<displayName count="one">rupi sri-lanke</displayName>
 				<displayName count="other">rupi sri-lanke</displayName>
 			</currency>
@@ -4627,14 +4751,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">rialë saudit</displayName>
 			</currency>
 			<currency type="SBD">
-				<displayName>Dollari i Ishujve Solomon</displayName>
-				<displayName count="one">dollar i Ishujve Solomon</displayName>
-				<displayName count="other">dollarë të Ishujve Solomon</displayName>
+				<displayName>Dollari i Ishujve Solomonë</displayName>
+				<displayName count="one">dollar i Ishujve Solomonë</displayName>
+				<displayName count="other">dollarë të Ishujve Solomonë</displayName>
 			</currency>
 			<currency type="SCR">
-				<displayName>Rupia e Ishujve Sejçelë</displayName>
-				<displayName count="one">rupi e Ishujve Sejçelë</displayName>
-				<displayName count="other">rupi të Ishujve Sejçelë</displayName>
+				<displayName>Rupia e Ishujve Sishelë</displayName>
+				<displayName count="one">rupi e Ishujve Sishelë</displayName>
+				<displayName count="other">rupi të Ishujve Sishelë</displayName>
 			</currency>
 			<currency type="SDG">
 				<displayName>Stërlina sudaneze</displayName>
@@ -4652,14 +4776,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">dollarë singapori</displayName>
 			</currency>
 			<currency type="SHP">
-				<displayName>Stërlina e Ishullit të Shën Helenës</displayName>
-				<displayName count="one">stërlinë e Ishullit të Shën Helenës</displayName>
-				<displayName count="other">stërlina të Ishullit të Shën Helenës</displayName>
+				<displayName>Stërlina e Ishullit të Shën-Helenës</displayName>
+				<displayName count="one">stërlinë e Ishullit të Shën-Helenës</displayName>
+				<displayName count="other">stërlina të Ishullit të Shën-Helenës</displayName>
 			</currency>
 			<currency type="SLL">
-				<displayName>Leoni i Sierra Leones</displayName>
-				<displayName count="one">leon i Sierra Leones</displayName>
-				<displayName count="other">leonë të Sierra Leones</displayName>
+				<displayName>Leoni i Sierra-Leones</displayName>
+				<displayName count="one">leon i Sierra-Leones</displayName>
+				<displayName count="other">leonë të Sierra-Leones</displayName>
 			</currency>
 			<currency type="SOS">
 				<displayName>Shilinga somaleze</displayName>
@@ -4677,9 +4801,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">stërlina të Sudanit të Jugut</displayName>
 			</currency>
 			<currency type="STD">
-				<displayName>Dobra e Sao Tomes dhe Prinsipes</displayName>
-				<displayName count="one">dobër e Sao Tomes dhe Prinsipes</displayName>
-				<displayName count="other">dobra të Sao Tomes dhe Prinsipes</displayName>
+				<displayName>Dobra e Sao-Tomes dhe Prinsipes</displayName>
+				<displayName count="one">dobër e Sao-Tomes dhe Prinsipes</displayName>
+				<displayName count="other">dobra të Sao-Tomes dhe Prinsipes</displayName>
 			</currency>
 			<currency type="SYP">
 				<displayName>Sterlina siriane</displayName>
@@ -4687,9 +4811,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">sterlina siriane</displayName>
 			</currency>
 			<currency type="SZL">
-				<displayName>Lilangeni i Svazilandit</displayName>
-				<displayName count="one">lilangen svazilandi</displayName>
-				<displayName count="other">lilangenë svazilandi</displayName>
+				<displayName>Lilangeni i Suazilandës</displayName>
+				<displayName count="one">lilangen suazilande</displayName>
+				<displayName count="other">lilangenë suazilande</displayName>
 			</currency>
 			<currency type="THB">
 				<displayName>Bata tajlandeze</displayName>
@@ -4811,8 +4935,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="XXX">
 				<displayName>Valutë e panjohur</displayName>
-				<displayName count="one">(njësi e panjohur valute)</displayName>
-				<displayName count="other">(njësi të panjohura valute)</displayName>
+				<displayName count="one">(njësi e panjohur valutore)</displayName>
+				<displayName count="other">(njësi të panjohura valutore)</displayName>
 			</currency>
 			<currency type="YER">
 				<displayName>Riali i Jemenit</displayName>
@@ -4850,6 +4974,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} metër për sekondë në katror</unitPattern>
 				<unitPattern count="other">{0} metra për sekondë në katror</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>revolucion</displayName>
+				<unitPattern count="one">{0} revolucion</unitPattern>
+				<unitPattern count="other">{0} revolucione</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radianë</displayName>
+				<unitPattern count="one">{0} radianë</unitPattern>
+				<unitPattern count="other">{0} radianë</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>gradë</displayName>
+				<unitPattern count="one">{0} gradë</unitPattern>
+				<unitPattern count="other">{0} gradë</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>hark-minuta</displayName>
 				<unitPattern count="one">{0} hark-minutë</unitPattern>
@@ -4860,30 +4999,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} hark-sekondë</unitPattern>
 				<unitPattern count="other">{0} hark-sekonda</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>gradë</displayName>
-				<unitPattern count="one">{0} gradë</unitPattern>
-				<unitPattern count="other">{0} gradë</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radianë</displayName>
-				<unitPattern count="one">{0} radianë</unitPattern>
-				<unitPattern count="other">{0} radianë</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>akra</displayName>
-				<unitPattern count="one">{0} akër</unitPattern>
-				<unitPattern count="other">{0} akra</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>kilometra katrore</displayName>
+				<unitPattern count="one">{0} kilometër katror</unitPattern>
+				<unitPattern count="other">{0} kilometra katrore</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektarë</displayName>
 				<unitPattern count="one">{0} hektar</unitPattern>
 				<unitPattern count="other">{0} hektarë</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>metra katrore</displayName>
+				<unitPattern count="one">{0} metër katror</unitPattern>
+				<unitPattern count="other">{0} metra katrore</unitPattern>
+				<perUnitPattern>{0}/metër katror</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>centimetra katrore</displayName>
 				<unitPattern count="one">{0} centimetër katror</unitPattern>
 				<unitPattern count="other">{0} centimetra katrore</unitPattern>
+				<perUnitPattern>{0}/centimetër katror</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>milje katrore</displayName>
+				<unitPattern count="one">{0} milje katror</unitPattern>
+				<unitPattern count="other">{0} milje katrore</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>akra</displayName>
+				<unitPattern count="one">{0} akër</unitPattern>
+				<unitPattern count="other">{0} akra</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>jardë katrore</displayName>
+				<unitPattern count="one">{0} jard katror</unitPattern>
+				<unitPattern count="other">{0} jardë katrore</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>këmbë katrore</displayName>
@@ -4894,91 +5045,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>inç katrore</displayName>
 				<unitPattern count="one">{0} inç katror</unitPattern>
 				<unitPattern count="other">{0} inç katrore</unitPattern>
+				<perUnitPattern>{0}/inç katror</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kilometra katrore</displayName>
-				<unitPattern count="one">{0} kilometër katror</unitPattern>
-				<unitPattern count="other">{0} kilometra katrore</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>metra katrore</displayName>
-				<unitPattern count="one">{0} metër katror</unitPattern>
-				<unitPattern count="other">{0} metra katrore</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>milje katrore</displayName>
-				<unitPattern count="one">{0} milje katror</unitPattern>
-				<unitPattern count="other">{0} milje katrore</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>jardë katrore</displayName>
-				<unitPattern count="one">{0} jard katror</unitPattern>
-				<unitPattern count="other">{0} jardë katrore</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karatë</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="other">{0} karatë</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litra për kilometër</displayName>
 				<unitPattern count="one">{0} litër për kilometër</unitPattern>
 				<unitPattern count="other">{0} litra për kilometër</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>litra për 100 kilometra</displayName>
+				<unitPattern count="one">{0} litër për 100 kilometra</unitPattern>
+				<unitPattern count="other">{0} litra për 100 kilometra</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>milje për gallon</displayName>
 				<unitPattern count="one">{0} milje për gallon</unitPattern>
 				<unitPattern count="other">{0} milje për gallon</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bitë</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bajt</displayName>
-				<unitPattern count="one">{0} bajt</unitPattern>
-				<unitPattern count="other">{0} bajt</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabit</displayName>
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="other">{0} gigabitë</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabajt</displayName>
-				<unitPattern count="one">{0} gigabajt</unitPattern>
-				<unitPattern count="other">{0} gigabajt</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobit</displayName>
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="other">{0} kilobitë</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobajt</displayName>
-				<unitPattern count="one">{0} kilobajt</unitPattern>
-				<unitPattern count="other">{0} kilobajt</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabit</displayName>
-				<unitPattern count="one">{0} megabit</unitPattern>
-				<unitPattern count="other">{0} megabitë</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabajt</displayName>
-				<unitPattern count="one">{0} megabajt</unitPattern>
-				<unitPattern count="other">{0} megabajt</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabit</displayName>
-				<unitPattern count="one">{0} terabit</unitPattern>
-				<unitPattern count="other">{0} terabitë</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabajt</displayName>
 				<unitPattern count="one">{0} terabajt</unitPattern>
 				<unitPattern count="other">{0} terabajt</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabit</displayName>
+				<unitPattern count="one">{0} terabit</unitPattern>
+				<unitPattern count="other">{0} terabit</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabajt</displayName>
+				<unitPattern count="one">{0} gigabajt</unitPattern>
+				<unitPattern count="other">{0} gigabajt</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabit</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="other">{0} gigabit</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabajt</displayName>
+				<unitPattern count="one">{0} megabajt</unitPattern>
+				<unitPattern count="other">{0} megabajt</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabit</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="other">{0} megabit</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobajt</displayName>
+				<unitPattern count="one">{0} kilobajt</unitPattern>
+				<unitPattern count="other">{0} kilobajt</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobit</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="other">{0} kilobit</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bajt</displayName>
+				<unitPattern count="one">{0} bajt</unitPattern>
+				<unitPattern count="other">{0} bajt</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>shekuj</displayName>
+				<unitPattern count="one">{0} shekull</unitPattern>
+				<unitPattern count="other">{0} shekuj</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>vjet</displayName>
+				<unitPattern count="one">{0} vit</unitPattern>
+				<unitPattern count="other">{0} vjet</unitPattern>
+				<perUnitPattern>{0}/vit</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>muaj</displayName>
+				<unitPattern count="one">{0} muaj</unitPattern>
+				<unitPattern count="other">{0} muaj</unitPattern>
+				<perUnitPattern>{0}/muaj</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>javë</displayName>
+				<unitPattern count="one">{0} javë</unitPattern>
+				<unitPattern count="other">{0} javë</unitPattern>
+				<perUnitPattern>{0}/javë</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ditë</displayName>
 				<unitPattern count="one">{0} ditë</unitPattern>
 				<unitPattern count="other">{0} ditë</unitPattern>
+				<perUnitPattern>{0}/ditë</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>orë</displayName>
@@ -4986,47 +5152,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} orë</unitPattern>
 				<perUnitPattern>{0}/orë</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikrosekonda</displayName>
-				<unitPattern count="one">{0} mikrosekondë</unitPattern>
-				<unitPattern count="other">{0} mikrosekonda</unitPattern>
+			<unit type="duration-minute">
+				<displayName>minuta</displayName>
+				<unitPattern count="one">{0} minutë</unitPattern>
+				<unitPattern count="other">{0} minuta</unitPattern>
+				<perUnitPattern>{0}/minutë</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>sekonda</displayName>
+				<unitPattern count="one">{0} sekondë</unitPattern>
+				<unitPattern count="other">{0} sekonda</unitPattern>
+				<perUnitPattern>{0}/sekondë</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>milisekonda</displayName>
 				<unitPattern count="one">{0} milisekondë</unitPattern>
 				<unitPattern count="other">{0} milisekonda</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>minuta</displayName>
-				<unitPattern count="one">{0} minutë</unitPattern>
-				<unitPattern count="other">{0} minuta</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>muaj</displayName>
-				<unitPattern count="one">{0} muaj</unitPattern>
-				<unitPattern count="other">{0} muaj</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>mikrosekonda</displayName>
+				<unitPattern count="one">{0} mikrosekondë</unitPattern>
+				<unitPattern count="other">{0} mikrosekonda</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>nanosekonda</displayName>
 				<unitPattern count="one">{0} nanosekondë</unitPattern>
 				<unitPattern count="other">{0} nanosekonda</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>sekonda</displayName>
-				<unitPattern count="one">{0} sekondë</unitPattern>
-				<unitPattern count="other">{0} sekonda</unitPattern>
-				<perUnitPattern>{0}/sek.</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>javë</displayName>
-				<unitPattern count="one">{0} javë</unitPattern>
-				<unitPattern count="other">{0} javë</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>vjet</displayName>
-				<unitPattern count="one">{0} vit</unitPattern>
-				<unitPattern count="other">{0} vjet</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>amper</displayName>
 				<unitPattern count="one">{0} amper</unitPattern>
@@ -5047,6 +5199,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} volt</unitPattern>
 				<unitPattern count="other">{0} volt</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokalori</displayName>
+				<unitPattern count="one">{0} kilokalori</unitPattern>
+				<unitPattern count="other">{0} kilokalori</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kalori</displayName>
 				<unitPattern count="one">{0} kalori</unitPattern>
@@ -5057,21 +5214,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kalori ushqimore</unitPattern>
 				<unitPattern count="other">{0} kalori ushqimore</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>zhul</displayName>
-				<unitPattern count="one">{0} zhul</unitPattern>
-				<unitPattern count="other">{0} zhul</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokalori</displayName>
-				<unitPattern count="one">{0} kilokalori</unitPattern>
-				<unitPattern count="other">{0} kilokalori</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilozhul</displayName>
 				<unitPattern count="one">{0} kilozhul</unitPattern>
 				<unitPattern count="other">{0} kilozhul</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>zhul</displayName>
+				<unitPattern count="one">{0} zhul</unitPattern>
+				<unitPattern count="other">{0} zhul</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilovat-orë</displayName>
 				<unitPattern count="one">{0} kilovat-orë</unitPattern>
@@ -5082,201 +5234,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} gigaherc</unitPattern>
 				<unitPattern count="other">{0} gigaherc</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>herc</displayName>
-				<unitPattern count="one">{0} herc</unitPattern>
-				<unitPattern count="other">{0} herc</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megaherc</displayName>
+				<unitPattern count="one">{0} megaherc</unitPattern>
+				<unitPattern count="other">{0} megaherc</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kiloherc</displayName>
 				<unitPattern count="one">{0} kiloherc</unitPattern>
 				<unitPattern count="other">{0} kiloherc</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megaherc</displayName>
-				<unitPattern count="one">{0} megaherc</unitPattern>
-				<unitPattern count="other">{0} megaherc</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>herc</displayName>
+				<unitPattern count="one">{0} herc</unitPattern>
+				<unitPattern count="other">{0} herc</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>njësi astronomike</displayName>
-				<unitPattern count="one">{0} njësi astronomike</unitPattern>
-				<unitPattern count="other">{0} njësi astronomike</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometra</displayName>
+				<unitPattern count="one">{0} kilometër</unitPattern>
+				<unitPattern count="other">{0} kilometra</unitPattern>
+				<perUnitPattern>{0}/kilometër</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>centimetra</displayName>
-				<unitPattern count="one">{0} centimetër</unitPattern>
-				<unitPattern count="other">{0} centimetra</unitPattern>
+			<unit type="length-meter">
+				<displayName>metra</displayName>
+				<unitPattern count="one">{0} metër</unitPattern>
+				<unitPattern count="other">{0} metra</unitPattern>
+				<perUnitPattern>{0}/metër</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>decimetra</displayName>
 				<unitPattern count="one">{0} decimetër</unitPattern>
 				<unitPattern count="other">{0} decimetra</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>këmbë</displayName>
-				<unitPattern count="one">{0} këmbë</unitPattern>
-				<unitPattern count="other">{0} këmbë</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>inç</displayName>
-				<unitPattern count="one">{0} inç</unitPattern>
-				<unitPattern count="other">{0} inç</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometra</displayName>
-				<unitPattern count="one">{0} kilometër</unitPattern>
-				<unitPattern count="other">{0} kilometra</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>vite dritë</displayName>
-				<unitPattern count="one">{0} vit drite</unitPattern>
-				<unitPattern count="other">{0} vite dritë</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metra</displayName>
-				<unitPattern count="one">{0} metër</unitPattern>
-				<unitPattern count="other">{0} metra</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>mikrometra</displayName>
-				<unitPattern count="one">{0} mikrometër</unitPattern>
-				<unitPattern count="other">{0} mikrometra</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>milje</displayName>
-				<unitPattern count="one">{0} milje</unitPattern>
-				<unitPattern count="other">{0} milje</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>centimetra</displayName>
+				<unitPattern count="one">{0} centimetër</unitPattern>
+				<unitPattern count="other">{0} centimetra</unitPattern>
+				<perUnitPattern>{0}/centimetër</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>milimetra</displayName>
 				<unitPattern count="one">{0} milimetër</unitPattern>
 				<unitPattern count="other">{0} milimetra</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikrometra</displayName>
+				<unitPattern count="one">{0} mikrometër</unitPattern>
+				<unitPattern count="other">{0} mikrometra</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanometra</displayName>
 				<unitPattern count="one">{0} nanometër</unitPattern>
 				<unitPattern count="other">{0} nanometra</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>milje nautike</displayName>
-				<unitPattern count="one">{0} milje nautike</unitPattern>
-				<unitPattern count="other">{0} milje nautike</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsekë</displayName>
-				<unitPattern count="one">{0} parsek</unitPattern>
-				<unitPattern count="other">{0} parsekë</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pikometra</displayName>
 				<unitPattern count="one">{0} pikometër</unitPattern>
 				<unitPattern count="other">{0} pikometra</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>milje</displayName>
+				<unitPattern count="one">{0} milje</unitPattern>
+				<unitPattern count="other">{0} milje</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>jardë</displayName>
 				<unitPattern count="one">{0} jard</unitPattern>
 				<unitPattern count="other">{0} jardë</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>këmbë</displayName>
+				<unitPattern count="one">{0} këmbë</unitPattern>
+				<unitPattern count="other">{0} këmbë</unitPattern>
+				<perUnitPattern>{0}/këmbë</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>inç</displayName>
+				<unitPattern count="one">{0} inç</unitPattern>
+				<unitPattern count="other">{0} inç</unitPattern>
+				<perUnitPattern>{0}/inç</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsekë</displayName>
+				<unitPattern count="one">{0} parsek</unitPattern>
+				<unitPattern count="other">{0} parsekë</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>vite dritë</displayName>
+				<unitPattern count="one">{0} vit drite</unitPattern>
+				<unitPattern count="other">{0} vite dritë</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>njësi astronomike</displayName>
+				<unitPattern count="one">{0} njësi astronomike</unitPattern>
+				<unitPattern count="other">{0} njësi astronomike</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>milje nautike</displayName>
+				<unitPattern count="one">{0} milje nautike</unitPattern>
+				<unitPattern count="other">{0} milje nautike</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>milje skandinave</displayName>
+				<unitPattern count="one">{0} milje skandinave</unitPattern>
+				<unitPattern count="other">{0} milje skandinave</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>luks</displayName>
 				<unitPattern count="one">{0} luks</unitPattern>
 				<unitPattern count="other">{0} luks</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karatë</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="other">{0} karatë</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gramë</displayName>
-				<unitPattern count="one">{0} gram</unitPattern>
-				<unitPattern count="other">{0} gramë</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogram</displayName>
-				<unitPattern count="one">{0} kilogram</unitPattern>
-				<unitPattern count="other">{0} kilogramë</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>tonë metrik</displayName>
 				<unitPattern count="one">{0} ton metrik</unitPattern>
 				<unitPattern count="other">{0} tonë metrik</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mikrogramë</displayName>
-				<unitPattern count="one">{0} mikrogram</unitPattern>
-				<unitPattern count="other">{0} mikrogramë</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogram</displayName>
+				<unitPattern count="one">{0} kilogram</unitPattern>
+				<unitPattern count="other">{0} kilogramë</unitPattern>
+				<perUnitPattern>{0}/kilogram</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gramë</displayName>
+				<unitPattern count="one">{0} gram</unitPattern>
+				<unitPattern count="other">{0} gramë</unitPattern>
+				<perUnitPattern>{0}/gram</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>miligramë</displayName>
 				<unitPattern count="one">{0} miligram</unitPattern>
 				<unitPattern count="other">{0} miligramë</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>onsë</displayName>
-				<unitPattern count="one">{0} ons</unitPattern>
-				<unitPattern count="other">{0} onsë</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>onsë troi</displayName>
-				<unitPattern count="one">{0} ons troi</unitPattern>
-				<unitPattern count="other">{0} onsë troi</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>paund</displayName>
-				<unitPattern count="one">{0} paund</unitPattern>
-				<unitPattern count="other">{0} paund</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>mikrogramë</displayName>
+				<unitPattern count="one">{0} mikrogram</unitPattern>
+				<unitPattern count="other">{0} mikrogramë</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tonë</displayName>
 				<unitPattern count="one">{0} ton</unitPattern>
 				<unitPattern count="other">{0} tonë</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>paund</displayName>
+				<unitPattern count="one">{0} paund</unitPattern>
+				<unitPattern count="other">{0} paund</unitPattern>
+				<perUnitPattern>{0}/paund</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>onsë</displayName>
+				<unitPattern count="one">{0} ons</unitPattern>
+				<unitPattern count="other">{0} onsë</unitPattern>
+				<perUnitPattern>{0}/ons</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>onsë troi</displayName>
+				<unitPattern count="one">{0} ons troi</unitPattern>
+				<unitPattern count="other">{0} onsë troi</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karatë</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="other">{0} karatë</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigavat</displayName>
 				<unitPattern count="one">{0} gigavat</unitPattern>
 				<unitPattern count="other">{0} gigavat</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>kuaj fuqi</displayName>
-				<unitPattern count="one">{0} kalë fuqi</unitPattern>
-				<unitPattern count="other">{0} kuaj fuqi</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilovat</displayName>
-				<unitPattern count="one">{0} kilovat</unitPattern>
-				<unitPattern count="other">{0} kilovat</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>megavat</displayName>
 				<unitPattern count="one">{0} megavat</unitPattern>
 				<unitPattern count="other">{0} megavat</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>milivat</displayName>
-				<unitPattern count="one">{0} milivat</unitPattern>
-				<unitPattern count="other">{0} milivat</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilovat</displayName>
+				<unitPattern count="one">{0} kilovat</unitPattern>
+				<unitPattern count="other">{0} kilovat</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>vat</displayName>
 				<unitPattern count="one">{0} vat</unitPattern>
 				<unitPattern count="other">{0} vat</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>milivat</displayName>
+				<unitPattern count="one">{0} milivat</unitPattern>
+				<unitPattern count="other">{0} milivat</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>kuaj fuqi</displayName>
+				<unitPattern count="one">{0} kalë fuqi</unitPattern>
+				<unitPattern count="other">{0} kuaj fuqi</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hektopaskal</displayName>
 				<unitPattern count="one">{0} hektopaskal</unitPattern>
 				<unitPattern count="other">{0} hektopaskal</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inç merkuri</displayName>
-				<unitPattern count="one">{0} inç merkuri</unitPattern>
-				<unitPattern count="other">{0} inç merkuri</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>milibare</displayName>
-				<unitPattern count="one">{0} milibar</unitPattern>
-				<unitPattern count="other">{0} milibare</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>milimetra mërkuri</displayName>
 				<unitPattern count="one">{0} milimetër mërkuri</unitPattern>
@@ -5287,10 +5443,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} paund për inç në katror</unitPattern>
 				<unitPattern count="other">{0} paund për inç në katror</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karatë</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="other">{0} karatë</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inç merkuri</displayName>
+				<unitPattern count="one">{0} inç merkuri</unitPattern>
+				<unitPattern count="other">{0} inç merkuri</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>milibare</displayName>
+				<unitPattern count="one">{0} milibar</unitPattern>
+				<unitPattern count="other">{0} milibare</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometra në orë</displayName>
@@ -5307,6 +5468,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} milje në orë</unitPattern>
 				<unitPattern count="other">{0} milje në orë</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>milje nautike në orë</displayName>
+				<unitPattern count="one">{0} milje nautike në orë</unitPattern>
+				<unitPattern count="other">{0} milje nautike në orë</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>gradë Celsius</displayName>
 				<unitPattern count="one">{0} gradë Celsius</unitPattern>
@@ -5322,31 +5493,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Kelvin</unitPattern>
 				<unitPattern count="other">{0} Kelvin</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>akra-këmbë</displayName>
-				<unitPattern count="one">{0} akër-këmbë</unitPattern>
-				<unitPattern count="other">{0} akra-këmbë</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>centilitra</displayName>
-				<unitPattern count="one">{0} centilitër</unitPattern>
-				<unitPattern count="other">{0} centilitra</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>centimetra kub</displayName>
-				<unitPattern count="one">{0} centimetër kub</unitPattern>
-				<unitPattern count="other">{0} centimetra kub</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>këmbë kub</displayName>
-				<unitPattern count="one">{0} këmbë kub</unitPattern>
-				<unitPattern count="other">{0} këmbë kub</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>inç në kub</displayName>
-				<unitPattern count="one">{0} inç në kub</unitPattern>
-				<unitPattern count="other">{0} inç në kub</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kilometra kub</displayName>
 				<unitPattern count="one">{0} kilometër kub</unitPattern>
@@ -5356,6 +5502,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>metra kub</displayName>
 				<unitPattern count="one">{0} metër kub</unitPattern>
 				<unitPattern count="other">{0} metra kub</unitPattern>
+				<perUnitPattern>{0}/metër kub</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>centimetra kub</displayName>
+				<unitPattern count="one">{0} centimetër kub</unitPattern>
+				<unitPattern count="other">{0} centimetra kub</unitPattern>
+				<perUnitPattern>{0}/centimetër kub</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>milje në kub</displayName>
@@ -5367,25 +5520,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} jard në kub</unitPattern>
 				<unitPattern count="other">{0} jardë në kub</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>kupa</displayName>
-				<unitPattern count="one">{0} kupë</unitPattern>
-				<unitPattern count="other">{0} kupa</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>këmbë kub</displayName>
+				<unitPattern count="one">{0} këmbë kub</unitPattern>
+				<unitPattern count="other">{0} këmbë kub</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>decilitra</displayName>
-				<unitPattern count="one">{0} decilitër</unitPattern>
-				<unitPattern count="other">{0} decilitra</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>inç në kub</displayName>
+				<unitPattern count="one">{0} inç në kub</unitPattern>
+				<unitPattern count="other">{0} inç në kub</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>onsë fluidë</displayName>
-				<unitPattern count="one">{0} ons fluidë</unitPattern>
-				<unitPattern count="other">{0} onsë fluidë</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gallonë</displayName>
-				<unitPattern count="one">{0} gallon</unitPattern>
-				<unitPattern count="other">{0} gallonë</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megalitra</displayName>
+				<unitPattern count="one">{0} megalitër</unitPattern>
+				<unitPattern count="other">{0} megalitra</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hektolitra</displayName>
@@ -5396,27 +5544,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>litra</displayName>
 				<unitPattern count="one">{0} litër</unitPattern>
 				<unitPattern count="other">{0} litra</unitPattern>
+				<perUnitPattern>{0}/litër</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalitra</displayName>
-				<unitPattern count="one">{0} megalitër</unitPattern>
-				<unitPattern count="other">{0} megalitra</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>decilitra</displayName>
+				<unitPattern count="one">{0} decilitër</unitPattern>
+				<unitPattern count="other">{0} decilitra</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centilitra</displayName>
+				<unitPattern count="one">{0} centilitër</unitPattern>
+				<unitPattern count="other">{0} centilitra</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mililitra</displayName>
 				<unitPattern count="one">{0} mililitër</unitPattern>
 				<unitPattern count="other">{0} mililitra</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pinta</displayName>
-				<unitPattern count="one">{0} pintë</unitPattern>
-				<unitPattern count="other">{0} pinta</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>pinta metrike</displayName>
+				<unitPattern count="one">{0} pintë metrike</unitPattern>
+				<unitPattern count="other">{0} pinta metrike</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>kupa metrike</displayName>
+				<unitPattern count="one">{0} kupë metrike</unitPattern>
+				<unitPattern count="other">{0} kupa metrike</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>akra-këmbë</displayName>
+				<unitPattern count="one">{0} akër-këmbë</unitPattern>
+				<unitPattern count="other">{0} akra-këmbë</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gallonë</displayName>
+				<unitPattern count="one">{0} gallon</unitPattern>
+				<unitPattern count="other">{0} gallonë</unitPattern>
+				<perUnitPattern>{0}/gallon</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>çerekje</displayName>
 				<unitPattern count="one">{0} çerek</unitPattern>
 				<unitPattern count="other">{0} çerekje</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pinta</displayName>
+				<unitPattern count="one">{0} pintë</unitPattern>
+				<unitPattern count="other">{0} pinta</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>kupa</displayName>
+				<unitPattern count="one">{0} kupë</unitPattern>
+				<unitPattern count="other">{0} kupa</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>onsë fluidë</displayName>
+				<unitPattern count="one">{0} ons fluidë</unitPattern>
+				<unitPattern count="other">{0} onsë fluidë</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>lugë gjelle</displayName>
 				<unitPattern count="one">{0} lugë gjelle</unitPattern>
@@ -5427,13 +5612,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} lugë çaji</unitPattern>
 				<unitPattern count="other">{0} lugë çaji</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}Lindje</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}Veri</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}Jug</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}Perëndim</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
 				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
-				<displayName>g-forcë</displayName>
+				<displayName>G</displayName>
 				<unitPattern count="one">{0} G</unitPattern>
 				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
@@ -5442,6 +5633,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="one">{0} rev</unitPattern>
+				<unitPattern count="other">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>hark-min.</displayName>
 				<unitPattern count="one">{0} hark-min.</unitPattern>
@@ -5452,33 +5658,45 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} hark-sek.</unitPattern>
 				<unitPattern count="other">{0} hark-sek.</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>gradë</displayName>
-				<unitPattern count="one">{0} gradë</unitPattern>
-				<unitPattern count="other">{0} gradë</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radianë</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>akra</displayName>
-				<unitPattern count="one">{0} akër</unitPattern>
-				<unitPattern count="other">{0} akra</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
-				<displayName>hektarë</displayName>
+				<displayName>ha</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ac</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
-				<displayName>këmbë katrore</displayName>
+				<displayName>ft²</displayName>
 				<unitPattern count="one">{0} ft²</unitPattern>
 				<unitPattern count="other">{0} ft²</unitPattern>
 			</unit>
@@ -5486,91 +5704,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>in²</displayName>
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>metra katrore</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>milje katrore</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>jd²</displayName>
-				<unitPattern count="one">{0} jd²</unitPattern>
-				<unitPattern count="other">{0} jd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName>litra/km</displayName>
+				<displayName>L/km</displayName>
 				<unitPattern count="one">{0} L/km</unitPattern>
 				<unitPattern count="other">{0} L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} L/100km</unitPattern>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
-				<displayName>milje/gallon</displayName>
+				<displayName>mi/gallon</displayName>
 				<unitPattern count="one">{0} mi/gallon</unitPattern>
 				<unitPattern count="other">{0} mi/gallon</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bajt</displayName>
-				<unitPattern count="one">{0} bajt</unitPattern>
-				<unitPattern count="other">{0} bajt</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gbit</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>Gbajt</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kbit</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kBajt</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mbit</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MBajt</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tbit</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TBajt</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tbit</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GBajt</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gbit</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MBajt</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mbit</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kBajt</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kbit</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bajt</displayName>
+				<unitPattern count="one">{0} bajt</unitPattern>
+				<unitPattern count="other">{0} bajt</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>shek.</displayName>
+				<unitPattern count="one">{0} shek.</unitPattern>
+				<unitPattern count="other">{0} shek.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>vjet</displayName>
+				<unitPattern count="one">{0} vit</unitPattern>
+				<unitPattern count="other">{0} vjet</unitPattern>
+				<perUnitPattern>{0}/vit</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>muaj</displayName>
+				<unitPattern count="one">{0} muaj</unitPattern>
+				<unitPattern count="other">{0} muaj</unitPattern>
+				<perUnitPattern>{0}/muaj</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>javë</displayName>
+				<unitPattern count="one">{0} javë</unitPattern>
+				<unitPattern count="other">{0} javë</unitPattern>
+				<perUnitPattern>{0}/javë</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ditë</displayName>
 				<unitPattern count="one">{0} ditë</unitPattern>
 				<unitPattern count="other">{0} ditë</unitPattern>
+				<perUnitPattern>{0}/ditë</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>orë</displayName>
@@ -5578,30 +5811,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} orë</unitPattern>
 				<perUnitPattern>{0}/orë</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikrosek.</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milisek.</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min.</displayName>
 				<unitPattern count="one">{0} min.</unitPattern>
 				<unitPattern count="other">{0} min.</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>muaj</displayName>
-				<unitPattern count="one">{0} muaj</unitPattern>
-				<unitPattern count="other">{0} muaj</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanosek.</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/min.</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sek.</displayName>
@@ -5609,266 +5823,275 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} sek.</unitPattern>
 				<perUnitPattern>{0}/sek.</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>javë</displayName>
-				<unitPattern count="one">{0} javë</unitPattern>
-				<unitPattern count="other">{0} javë</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milisek.</displayName>
+				<unitPattern count="one">{0} milisek.</unitPattern>
+				<unitPattern count="other">{0} milisek.</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>vjet</displayName>
-				<unitPattern count="one">{0} vit</unitPattern>
-				<unitPattern count="other">{0} vjet</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
-				<displayName>amper</displayName>
+				<displayName>A</displayName>
 				<unitPattern count="one">{0} A</unitPattern>
 				<unitPattern count="other">{0} A</unitPattern>
 			</unit>
 			<unit type="electric-milliampere">
-				<displayName>miliamper</displayName>
+				<displayName>mA</displayName>
 				<unitPattern count="one">{0} mA</unitPattern>
 				<unitPattern count="other">{0} mA</unitPattern>
 			</unit>
 			<unit type="electric-ohm">
-				<displayName>om</displayName>
+				<displayName>Ω</displayName>
 				<unitPattern count="one">{0} Ω</unitPattern>
 				<unitPattern count="other">{0} Ω</unitPattern>
 			</unit>
 			<unit type="electric-volt">
-				<displayName>volt</displayName>
+				<displayName>V</displayName>
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
-				<displayName>kal.</displayName>
-				<unitPattern count="one">{0} kal.</unitPattern>
-				<unitPattern count="other">{0} kal.</unitPattern>
+				<displayName>cal</displayName>
+				<unitPattern count="one">{0} cal</unitPattern>
+				<unitPattern count="other">{0} cal</unitPattern>
 			</unit>
 			<unit type="energy-foodcalorie">
-				<displayName>kal. ushq.</displayName>
-				<unitPattern count="one">{0} kal. ushq.</unitPattern>
-				<unitPattern count="other">{0} kal. ushq.</unitPattern>
-			</unit>
-			<unit type="energy-joule">
-				<displayName>zhul</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokal.</displayName>
-				<unitPattern count="one">{0} kilokal.</unitPattern>
-				<unitPattern count="other">{0} kilokal.</unitPattern>
+				<displayName>Cal</displayName>
+				<unitPattern count="one">{0} Cal</unitPattern>
+				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
 			<unit type="energy-kilojoule">
-				<displayName>kilozhul</displayName>
+				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
-				<displayName>kW/orë</displayName>
-				<unitPattern count="one">{0} kW/orë</unitPattern>
-				<unitPattern count="other">{0} kW/orë</unitPattern>
+				<displayName>kWh</displayName>
+				<unitPattern count="one">{0} kWh</unitPattern>
+				<unitPattern count="other">{0} kWh</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
 				<displayName>GHz</displayName>
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>këmbë</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>inç</displayName>
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>vite dritë</displayName>
-				<unitPattern count="one">{0} v. dr.</unitPattern>
-				<unitPattern count="other">{0} v. dr.</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>mikrometra</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>milje</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="one">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
-				<displayName>nanometra</displayName>
+				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsekë</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
-				<displayName>jardë</displayName>
-				<unitPattern count="one">{0} jd</unitPattern>
-				<unitPattern count="other">{0} jd</unitPattern>
+				<displayName>yd</displayName>
+				<unitPattern count="one">{0} yd</unitPattern>
+				<unitPattern count="other">{0} yd</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>këmbë</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>inç</displayName>
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ly</displayName>
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
 			</unit>
 			<unit type="light-lux">
-				<displayName>luks</displayName>
+				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karatë</displayName>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gramë</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>paund</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tn</displayName>
 				<unitPattern count="one">{0} tn</unitPattern>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>CD</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>kuaj fuqi</displayName>
-				<unitPattern count="one">{0} k-fuqi</unitPattern>
-				<unitPattern count="other">{0} k-fuqi</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>W</displayName>
+				<unitPattern count="one">{0} W</unitPattern>
+				<unitPattern count="other">{0} W</unitPattern>
+			</unit>
 			<unit type="power-milliwatt">
 				<displayName>mW</displayName>
 				<unitPattern count="one">{0} mW</unitPattern>
 				<unitPattern count="other">{0} mW</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName>vat</displayName>
-				<unitPattern count="one">{0} W</unitPattern>
-				<unitPattern count="other">{0} W</unitPattern>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inç Hg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mb</unitPattern>
-				<unitPattern count="other">{0} mb</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -5879,10 +6102,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karatë</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/orë</displayName>
@@ -5895,14 +6123,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} m/s</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<displayName>mi/orë</displayName>
-				<unitPattern count="one">{0} mi/orë</unitPattern>
-				<unitPattern count="other">{0} mi/orë</unitPattern>
+				<displayName>mi/h</displayName>
+				<unitPattern count="one">{0} mi/h</unitPattern>
+				<unitPattern count="other">{0} mi/h</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
 				<displayName>gradë C</displayName>
-				<unitPattern count="one">{0}°C</unitPattern>
-				<unitPattern count="other">{0}°C</unitPattern>
+				<unitPattern count="one">{0} gradë C</unitPattern>
+				<unitPattern count="other">{0} gradë C</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
 				<displayName>°F</displayName>
@@ -5914,20 +6152,32 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>akra-këmbë</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
+			<unit type="volume-cubic-kilometer">
+				<displayName>km³</displayName>
+				<unitPattern count="one">{0} km³</unitPattern>
+				<unitPattern count="other">{0} km³</unitPattern>
 			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cL</displayName>
-				<unitPattern count="one">{0} cL</unitPattern>
-				<unitPattern count="other">{0} cL</unitPattern>
+			<unit type="volume-cubic-meter">
+				<displayName>m³</displayName>
+				<unitPattern count="one">{0} m³</unitPattern>
+				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-centimeter">
 				<displayName>cm³</displayName>
 				<unitPattern count="one">{0} cm³</unitPattern>
 				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>mi³</displayName>
+				<unitPattern count="one">{0} mi³</unitPattern>
+				<unitPattern count="other">{0} mi³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>yd³</displayName>
+				<unitPattern count="one">{0} yd³</unitPattern>
+				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-foot">
 				<displayName>ft³</displayName>
@@ -5939,45 +6189,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} in³</unitPattern>
 				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-cubic-kilometer">
-				<displayName>km³</displayName>
-				<unitPattern count="one">{0} km³</unitPattern>
-				<unitPattern count="other">{0} km³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-meter">
-				<displayName>m³</displayName>
-				<unitPattern count="one">{0} m³</unitPattern>
-				<unitPattern count="other">{0} m³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<displayName>mi³</displayName>
-				<unitPattern count="one">{0} mi³</unitPattern>
-				<unitPattern count="other">{0} mi³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-yard">
-				<displayName>jd³</displayName>
-				<unitPattern count="one">{0} jd³</unitPattern>
-				<unitPattern count="other">{0} jd³</unitPattern>
-			</unit>
-			<unit type="volume-cup">
-				<displayName>kupa</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
-			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="one">{0} dL</unitPattern>
-				<unitPattern count="other">{0} dL</unitPattern>
-			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>onsë fluidë</displayName>
-				<unitPattern count="one">{0} on. fl.</unitPattern>
-				<unitPattern count="other">{0} on. fl.</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -5985,40 +6200,83 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} hL</unitPattern>
 			</unit>
 			<unit type="volume-liter">
-				<displayName>litra</displayName>
-				<unitPattern count="one">{0} l</unitPattern>
-				<unitPattern count="other">{0} l</unitPattern>
+				<displayName>L</displayName>
+				<unitPattern count="one">{0} L</unitPattern>
+				<unitPattern count="other">{0} L</unitPattern>
+				<perUnitPattern>{0}/L</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="one">{0} ML</unitPattern>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0} dL</unitPattern>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="one">{0} cL</unitPattern>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
 				<unitPattern count="one">{0} mL</unitPattern>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pinta</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mc</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gallon</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
-				<displayName>çerekje</displayName>
+				<displayName>qt</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>c</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
-				<displayName>lugë gjelle</displayName>
+				<displayName>tbsp</displayName>
 				<unitPattern count="one">{0} tbsp</unitPattern>
 				<unitPattern count="other">{0} tbsp</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
-				<displayName>lugë çaji</displayName>
+				<displayName>tsp</displayName>
 				<unitPattern count="one">{0} tsp</unitPattern>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}L</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}V</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}J</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}P</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -6028,6 +6286,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} g-forcë</unitPattern>
 				<unitPattern count="other">{0} g-forcë</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -6036,26 +6298,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} m²</unitPattern>
 				<unitPattern count="other">{0} m²</unitPattern>
@@ -6064,11 +6314,39 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} L/100km</unitPattern>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="one">{0}mpg</unitPattern>
 				<unitPattern count="other">{0}mpg</unitPattern>
 			</unit>
+			<unit type="duration-year">
+				<displayName>vjet</displayName>
+				<unitPattern count="one">{0} vit</unitPattern>
+				<unitPattern count="other">{0} vjet</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>muaj</displayName>
+				<unitPattern count="one">{0} muaj</unitPattern>
+				<unitPattern count="other">{0} muaj</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>javë</displayName>
+				<unitPattern count="one">{0} javë</unitPattern>
+				<unitPattern count="other">{0} javë</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ditë</displayName>
 				<unitPattern count="one">{0} ditë</unitPattern>
@@ -6079,70 +6357,39 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} orë</unitPattern>
 				<unitPattern count="other">{0} orë</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milisek.</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min.</displayName>
 				<unitPattern count="one">{0} min.</unitPattern>
 				<unitPattern count="other">{0} min.</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>muaj</displayName>
-				<unitPattern count="one">{0} muaj</unitPattern>
-				<unitPattern count="other">{0} muaj</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>sek.</displayName>
 				<unitPattern count="one">{0} sek.</unitPattern>
 				<unitPattern count="other">{0} sek.</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>javë</displayName>
-				<unitPattern count="one">{0} javë</unitPattern>
-				<unitPattern count="other">{0} javë</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>vjet</displayName>
-				<unitPattern count="one">{0} vit</unitPattern>
-				<unitPattern count="other">{0} vjet</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
 			<unit type="energy-foodcalorie">
 				<unitPattern count="one">{0} Kal.</unitPattern>
 				<unitPattern count="other">{0} Kal.</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0} inç</unitPattern>
-				<unitPattern count="other">{0} inç</unitPattern>
-			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
 				<unitPattern count="one">{0} km</unitPattern>
 				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} v. dr.</unitPattern>
-				<unitPattern count="other">{0} v. dr.</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>m</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -6153,31 +6400,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} jd</unitPattern>
 				<unitPattern count="other">{0} jd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} inç</unitPattern>
+				<unitPattern count="other">{0} inç</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} v. dr.</unitPattern>
+				<unitPattern count="other">{0} v. dr.</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="one">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} ons</unitPattern>
-				<unitPattern count="other">{0} onsë</unitPattern>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} lb</unitPattern>
 				<unitPattern count="other">{0} lb</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} ons</unitPattern>
+				<unitPattern count="other">{0} onsë</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} kW</unitPattern>
@@ -6187,21 +6446,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inç Hg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mb</unitPattern>
-				<unitPattern count="other">{0} mb</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -6212,6 +6465,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
+			<unit type="pressure-inch-hg">
+				<displayName>inç Hg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mb</unitPattern>
+				<unitPattern count="other">{0} mb</unitPattern>
+			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/orë</displayName>
 				<unitPattern count="one">{0} km/orë</unitPattern>
@@ -6249,10 +6512,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} mi³</unitPattern>
 			</unit>
 			<unit type="volume-liter">
-				<displayName>litër</displayName>
-				<unitPattern count="one">{0} l</unitPattern>
-				<unitPattern count="other">{0} l</unitPattern>
+				<displayName>L</displayName>
+				<unitPattern count="one">{0} L</unitPattern>
+				<unitPattern count="other">{0} L</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}L</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}V</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}J</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}P</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sq_AL.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq_AL.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sq_AL.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq_AL.xml
index 884e8f0e858..5298029dd70 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sq_AL.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq_AL.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="sq"/>
 		<territory type="AL"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq_MK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq_MK.xml
new file mode 100644
index 00000000000..7923f667c20
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq_MK.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="sq"/>
+		<territory type="MK"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="MKD">
+				<symbol>den</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq_XK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq_XK.xml
new file mode 100644
index 00000000000..b5c77e7640a
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq_XK.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="sq"/>
+		<territory type="XK"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr.xml
similarity index 88%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr.xml
index 7fa8dbf3481..3e27dfbce30 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="sr"/>
 	</identity>
 	<localeDisplayNames>
@@ -59,6 +58,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bem">бемба</language>
 			<language type="bez">бена</language>
 			<language type="bg">бугарски</language>
+			<language type="bgn" draft="contributed">западни белучки</language>
 			<language type="bho">Бојпури</language>
 			<language type="bi">Бислама</language>
 			<language type="bik">Бикол</language>
@@ -129,6 +129,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="elx">Еламитски</language>
 			<language type="en">енглески</language>
 			<language type="en_GB" alt="short">енглески (УК)</language>
+			<language type="en_US" draft="provisional">амерички енглески</language>
 			<language type="en_US" alt="short">енглески (САД)</language>
 			<language type="enm">Средњи енглески</language>
 			<language type="eo">есперанто</language>
@@ -172,7 +173,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="gsw">Швајцарски немачки</language>
 			<language type="gu">гуџарати</language>
 			<language type="guz">гуси</language>
-			<language type="gv">Манкс</language>
+			<language type="gv">мански</language>
 			<language type="gwi">Гвич’ин</language>
 			<language type="ha">хауса</language>
 			<language type="hai">Хаида</language>
@@ -185,7 +186,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ho">Хири Моту</language>
 			<language type="hr">хрватски</language>
 			<language type="hsb">горњи лужичкосрпски</language>
-			<language type="ht">Хаитски</language>
+			<language type="ht">хаићански</language>
 			<language type="hu">мађарски</language>
 			<language type="hup">Хупа</language>
 			<language type="hy">јерменски</language>
@@ -267,6 +268,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">лаошки</language>
 			<language type="lol">Монго</language>
 			<language type="loz">Лози</language>
+			<language type="lrc" draft="contributed">северни лури</language>
 			<language type="lt">литвански</language>
 			<language type="lu">луба-катанга</language>
 			<language type="lua">Луба-лулуа</language>
@@ -312,12 +314,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mwr">Марвари</language>
 			<language type="my">бурмански</language>
 			<language type="myv">Ерзија</language>
+			<language type="mzn" draft="contributed">мазандерански</language>
 			<language type="na">Науру</language>
 			<language type="nap">Неаполитански</language>
 			<language type="naq">нама</language>
 			<language type="nb">норвешки бокмал</language>
 			<language type="nd">северни ндебеле</language>
 			<language type="nds">Ниски немачки</language>
+			<language type="nds_NL" draft="contributed">нискосаксонски</language>
 			<language type="ne">непалски</language>
 			<language type="new">Невари</language>
 			<language type="ng">Ндонга</language>
@@ -330,7 +334,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="no">Норвешки</language>
 			<language type="nog">Ногаи</language>
 			<language type="non">Стари норски</language>
-			<language type="nqo">Н’ко</language>
+			<language type="nqo">н’ко</language>
 			<language type="nr">Јужни ндебеле</language>
 			<language type="nso">Северни сото</language>
 			<language type="nus">нуер</language>
@@ -393,6 +397,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">Сицилијански</language>
 			<language type="sco">Шкотски</language>
 			<language type="sd">синди</language>
+			<language type="sdh">јужнокурдски</language>
 			<language type="se">северни сами</language>
 			<language type="seh">сена</language>
 			<language type="sel">Селкап</language>
@@ -421,14 +426,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="srr">Серер</language>
 			<language type="ss">Свати</language>
 			<language type="st">Сесото</language>
-			<language type="su">судански</language>
+			<language type="su">сундански</language>
 			<language type="suk">Сукума</language>
 			<language type="sus">Сусу</language>
 			<language type="sux">Сумерски</language>
 			<language type="sv">шведски</language>
 			<language type="sw">свахили</language>
+			<language type="sw_CD">конго свахили</language>
 			<language type="swb">Коморски</language>
-			<language type="swc">конго свахили</language>
 			<language type="syc">Класични сиријски</language>
 			<language type="syr">Сиријски</language>
 			<language type="ta">тамилски</language>
@@ -437,7 +442,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="teo">тесо</language>
 			<language type="ter">Терено</language>
 			<language type="tet">Тетум</language>
-			<language type="tg">Тађик</language>
+			<language type="tg">таџички</language>
 			<language type="th">тајландски</language>
 			<language type="ti">тигриња</language>
 			<language type="tig">Тигре</language>
@@ -481,6 +486,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">Валамо</language>
 			<language type="war">Варај</language>
 			<language type="was">Вашо</language>
+			<language type="wbp" draft="contributed">варлпири</language>
 			<language type="wo">волоф</language>
 			<language type="xal">Калмик</language>
 			<language type="xh">коса</language>
@@ -605,7 +611,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Sgnw">знаковно писмо</script>
 			<script type="Shaw">шавијанско писмо</script>
 			<script type="Sinh">синхалско писмо</script>
-			<script type="Sund">суданско писмо</script>
+			<script type="Sund">сунданско писмо</script>
 			<script type="Sylo">силоти нагри писмо</script>
 			<script type="Syrc">сиријско писмо</script>
 			<script type="Syre">сиријско естрангело писмо</script>
@@ -675,7 +681,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Ангвила</territory>
 			<territory type="AL">Албанија</territory>
 			<territory type="AM">Јерменија</territory>
-			<territory type="AN">Холандски Антили</territory>
 			<territory type="AO">Ангола</territory>
 			<territory type="AQ">Антарктик</territory>
 			<territory type="AR">Аргентина</territory>
@@ -707,7 +712,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BY">Белорусија</territory>
 			<territory type="BZ">Белизе</territory>
 			<territory type="CA">Канада</territory>
-			<territory type="CC">Кокос (Келинг) Острва</territory>
+			<territory type="CC">Кокосова (Килингова) Острва</territory>
 			<territory type="CD">Конго - Киншаса</territory>
 			<territory type="CD" alt="variant">Конго (ДРК)</territory>
 			<territory type="CF">Централноафричка Република</territory>
@@ -771,7 +776,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GU">Гуам</territory>
 			<territory type="GW">Гвинеја-Бисао</territory>
 			<territory type="GY">Гвајана</territory>
-			<territory type="HK">Хонг Конг С. А. Р. Кина</territory>
+			<territory type="HK">САР Хонгконг (Кина)</territory>
 			<territory type="HK" alt="short">Хонг Конг</territory>
 			<territory type="HM">Острва Херд и Мекдоналд</territory>
 			<territory type="HN">Хондурас</territory>
@@ -843,7 +848,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="NA">Намибија</territory>
 			<territory type="NC">Нова Каледонија</territory>
 			<territory type="NE">Нигер</territory>
-			<territory type="NF">Норфолк Острво</territory>
+			<territory type="NF">Острво Норфок</territory>
 			<territory type="NG">Нигерија</territory>
 			<territory type="NI">Никарагва</territory>
 			<territory type="NL">Холандија</territory>
@@ -982,6 +987,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">Нумеричко сортирање</key>
 			<key type="colStrength" draft="contributed">Сортирање према јачини</key>
 			<key type="currency">валута</key>
+			<key type="hc" draft="provisional">hc</key>
+			<key type="lb" draft="contributed">стил прелома реда</key>
+			<key type="ms" draft="provisional">ms</key>
 			<key type="numbers">бројеви</key>
 			<key type="timezone" draft="contributed">Временска зона</key>
 			<key type="va" draft="contributed">Варијанта локалитета</key>
@@ -989,95 +997,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x" draft="contributed">Приватна употреба</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">арапско-индијске цифре</type>
-			<type type="arabext" key="numbers">продужене арапско-индијске цифре</type>
-			<type type="armn" key="numbers">јерменски бројеви</type>
-			<type type="armnlow" key="numbers">мали јерменски бројеви</type>
-			<type type="beng" key="numbers">бенгалске цифре</type>
-			<type type="big5han" key="collation">Традиционално кинеско сортирање</type>
-			<type type="buddhist" key="calendar">будистички календар</type>
-			<type type="chinese" key="calendar">кинески календар</type>
-			<type type="coptic" key="calendar" draft="contributed">коптски календар</type>
-			<type type="dangi" key="calendar">данги календар</type>
-			<type type="deva" key="numbers" draft="contributed">девангари цифре</type>
-			<type type="dictionary" key="collation" draft="contributed">Редослед сортирања у речнику</type>
-			<type type="ducet" key="collation" draft="contributed">Подразумевани Unicode редослед сортирања</type>
-			<type type="ethi" key="numbers">етиопски бројеви</type>
-			<type type="ethiopic" key="calendar">етиопски календар</type>
-			<type type="ethiopic-amete-alem" key="calendar" draft="contributed">етиопски амет алем календар</type>
-			<type type="finance" key="numbers" draft="contributed">Финансијски бројеви</type>
-			<type type="fullwide" key="numbers">цифре пуне ширине</type>
-			<type type="gb2312han" key="collation">Поједностављено кинеско сортирање</type>
-			<type type="geor" key="numbers">грузијски бројеви</type>
-			<type type="gregorian" key="calendar">грегоријански календар</type>
-			<type type="grek" key="numbers">грчки бројеви</type>
-			<type type="greklow" key="numbers">мали грчки бројеви</type>
-			<type type="gujr" key="numbers">гуџаратске цифре</type>
-			<type type="guru" key="numbers">гурмуки цифре</type>
-			<type type="hanidec" key="numbers">кинески децимални бројеви</type>
-			<type type="hans" key="numbers">поједностављени кинески бројеви</type>
-			<type type="hansfin" key="numbers">поједностављени кинески финансијски бројеви</type>
-			<type type="hant" key="numbers">традиционални кинески бројеви</type>
-			<type type="hantfin" key="numbers">традиционални кинески финансијски бројеви</type>
-			<type type="hebr" key="numbers">хебрејски бројеви</type>
-			<type type="hebrew" key="calendar">хебрејски календар</type>
-			<type type="identical" key="colStrength" draft="contributed">Сортирај све</type>
-			<type type="indian" key="calendar">Индијски национални календар</type>
-			<type type="islamic" key="calendar">исламски календар</type>
-			<type type="islamic-civil" key="calendar">Исламски цивилни календар</type>
-			<type type="iso8601" key="calendar">ISO-8601 календар</type>
-			<type type="japanese" key="calendar">јапански календар</type>
-			<type type="jpan" key="numbers">јапански бројеви</type>
-			<type type="jpanfin" key="numbers">јапански финансијски бројеви</type>
-			<type type="khmr" key="numbers">кмерске цифре</type>
-			<type type="knda" key="numbers">канада цифре</type>
-			<type type="laoo" key="numbers">лаошке цифре</type>
-			<type type="latn" key="numbers">западне цифре</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">Сортирај прво мала слова</type>
-			<type type="mlym" key="numbers">малајалам цифре</type>
-			<type type="mong" key="numbers" draft="contributed">монголске цифре</type>
-			<type type="mymr" key="numbers">мијанмарске цифре</type>
-			<type type="native" key="numbers" draft="contributed">Локалне цифре</type>
-			<type type="no" key="colBackwards" draft="contributed">Сортирај акценте нормално</type>
-			<type type="no" key="colCaseFirst" draft="contributed">Сортирај нормалан редослед великих и малих слова</type>
-			<type type="no" key="colCaseLevel" draft="contributed">Сортирај без обзира на велика и мала слова</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">Сортирај кана симболе одвојено</type>
-			<type type="no" key="colNormalization" draft="contributed">Сортирај без нормализације</type>
-			<type type="no" key="colNumeric" draft="contributed">Сортирај цифре појединачно</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">Сортирај симболе</type>
-			<type type="orya" key="numbers">орија цифре</type>
-			<type type="persian" key="calendar">персијски календар</type>
-			<type type="phonebook" key="collation">Сортирање као телефонски именик</type>
-			<type type="phonetic" key="collation" draft="contributed">Фонетски редослед сортирања</type>
-			<type type="pinyin" key="collation">Пињин сортирање</type>
-			<type type="primary" key="colStrength" draft="contributed">Сортирај само основна слова</type>
-			<type type="quaternary" key="colStrength" draft="contributed">Сортирај акценте/мала и велика слова/ширину/кана симболе</type>
-			<type type="reformed" key="collation" draft="contributed">Реформисани редослед сортирања</type>
-			<type type="roc" key="calendar">календар Републике Кине</type>
-			<type type="roman" key="numbers">римски бројеви</type>
-			<type type="romanlow" key="numbers">мали римски бројеви</type>
-			<type type="search" key="collation">претрага опште намене</type>
-			<type type="searchjl" key="collation" draft="contributed">Претрага према хангул почетном сугласнику</type>
-			<type type="secondary" key="colStrength" draft="contributed">Сортирај акценте</type>
-			<type type="shifted" key="colAlternate" draft="contributed">Сортирање уз игнорисање симбола</type>
-			<type type="standard" key="collation">стандардни редослед сортирања</type>
-			<type type="stroke" key="collation">Сортирање по броју црта</type>
-			<type type="taml" key="numbers">тамилски бројеви</type>
-			<type type="tamldec" key="numbers">тамилске цифре</type>
-			<type type="telu" key="numbers">телугу цифре</type>
-			<type type="tertiary" key="colStrength" draft="contributed">Сортирај акценте/мала и велика слова/ширину</type>
-			<type type="thai" key="numbers">тајске цифре</type>
-			<type type="tibt" key="numbers">тибетанске цифре</type>
-			<type type="traditional" key="collation">Традиционално сортирање</type>
-			<type type="traditional" key="numbers" draft="contributed">Традиционални бројеви</type>
-			<type type="unihan" key="collation" draft="contributed">Редослед сортирања радикалним цртицама</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">Сортирај прво велика слова</type>
-			<type type="vaii" key="numbers" draft="contributed">Ваи цифре</type>
-			<type type="yes" key="colBackwards" draft="contributed">Сортирај акценте обрнуто</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">Сортирај мала и велика слова</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">Сортирај кана симболе другачије</type>
-			<type type="yes" key="colNormalization" draft="contributed">Сортирај Unicode нормализовано</type>
-			<type type="yes" key="colNumeric" draft="contributed">Сортирај цифре нумерички</type>
+			<type key="calendar" type="buddhist">будистички календар</type>
+			<type key="calendar" type="chinese">кинески календар</type>
+			<type key="calendar" type="coptic" draft="contributed">коптски календар</type>
+			<type key="calendar" type="dangi">данги календар</type>
+			<type key="calendar" type="ethiopic">етиопски календар</type>
+			<type key="calendar" type="ethiopic-amete-alem" draft="contributed">етиопски амет алем календар</type>
+			<type key="calendar" type="gregorian">грегоријански календар</type>
+			<type key="calendar" type="hebrew">хебрејски календар</type>
+			<type key="calendar" type="indian">Индијски национални календар</type>
+			<type key="calendar" type="islamic">исламски календар</type>
+			<type key="calendar" type="islamic-civil">Исламски цивилни календар</type>
+			<type key="calendar" type="iso8601">ISO-8601 календар</type>
+			<type key="calendar" type="japanese">јапански календар</type>
+			<type key="calendar" type="persian">персијски календар</type>
+			<type key="calendar" type="roc">календар Републике Кине</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">Сортирај симболе</type>
+			<type key="colAlternate" type="shifted" draft="contributed">Сортирање уз игнорисање симбола</type>
+			<type key="colBackwards" type="no" draft="contributed">Сортирај акценте нормално</type>
+			<type key="colBackwards" type="yes" draft="contributed">Сортирај акценте обрнуто</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">Сортирај прво мала слова</type>
+			<type key="colCaseFirst" type="no" draft="contributed">Сортирај нормалан редослед великих и малих слова</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">Сортирај прво велика слова</type>
+			<type key="colCaseLevel" type="no" draft="contributed">Сортирај без обзира на велика и мала слова</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">Сортирај мала и велика слова</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">Сортирај кана симболе одвојено</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">Сортирај кана симболе другачије</type>
+			<type key="collation" type="big5han">Традиционално кинеско сортирање</type>
+			<type key="collation" type="dictionary" draft="contributed">Редослед сортирања у речнику</type>
+			<type key="collation" type="ducet" draft="contributed">Подразумевани Unicode редослед сортирања</type>
+			<type key="collation" type="gb2312han">Поједностављено кинеско сортирање</type>
+			<type key="collation" type="phonebook">Сортирање као телефонски именик</type>
+			<type key="collation" type="phonetic" draft="contributed">Фонетски редослед сортирања</type>
+			<type key="collation" type="pinyin">Пињин сортирање</type>
+			<type key="collation" type="reformed" draft="contributed">Реформисани редослед сортирања</type>
+			<type key="collation" type="search">претрага опште намене</type>
+			<type key="collation" type="searchjl" draft="contributed">Претрага према хангул почетном сугласнику</type>
+			<type key="collation" type="standard">стандардни редослед сортирања</type>
+			<type key="collation" type="stroke">Сортирање по броју црта</type>
+			<type key="collation" type="traditional">Традиционално сортирање</type>
+			<type key="collation" type="unihan" draft="contributed">Редослед сортирања радикалним цртицама</type>
+			<type key="colNormalization" type="no" draft="contributed">Сортирај без нормализације</type>
+			<type key="colNormalization" type="yes" draft="contributed">Сортирај Unicode нормализовано</type>
+			<type key="colNumeric" type="no" draft="contributed">Сортирај цифре појединачно</type>
+			<type key="colNumeric" type="yes" draft="contributed">Сортирај цифре нумерички</type>
+			<type key="colStrength" type="identical" draft="contributed">Сортирај све</type>
+			<type key="colStrength" type="primary" draft="contributed">Сортирај само основна слова</type>
+			<type key="colStrength" type="quaternary" draft="contributed">Сортирај акценте/мала и велика слова/ширину/кана симболе</type>
+			<type key="colStrength" type="secondary" draft="contributed">Сортирај акценте</type>
+			<type key="colStrength" type="tertiary" draft="contributed">Сортирај акценте/мала и велика слова/ширину</type>
+			<type key="hc" type="h11" draft="provisional">12-часовни систем (0-11)</type>
+			<type key="hc" type="h12" draft="provisional">12-часовни систем (1-12)</type>
+			<type key="hc" type="h23" draft="provisional">24-часовни систем (0-23)</type>
+			<type key="hc" type="h24" draft="provisional">24-часовни систем (1-24)</type>
+			<type key="lb" type="loose" draft="provisional">loose</type>
+			<type key="lb" type="normal" draft="provisional">normal</type>
+			<type key="lb" type="strict" draft="provisional">strict</type>
+			<type key="ms" type="metric" draft="provisional">метрички</type>
+			<type key="ms" type="uksystem" draft="provisional">uksystem</type>
+			<type key="ms" type="ussystem" draft="provisional">ussystem</type>
+			<type key="numbers" type="arab">арапско-индијске цифре</type>
+			<type key="numbers" type="arabext">продужене арапско-индијске цифре</type>
+			<type key="numbers" type="armn">јерменски бројеви</type>
+			<type key="numbers" type="armnlow">мали јерменски бројеви</type>
+			<type key="numbers" type="beng">бенгалске цифре</type>
+			<type key="numbers" type="deva">девангари цифре</type>
+			<type key="numbers" type="ethi">етиопски бројеви</type>
+			<type key="numbers" type="finance" draft="contributed">Финансијски бројеви</type>
+			<type key="numbers" type="fullwide">цифре пуне ширине</type>
+			<type key="numbers" type="geor">грузијски бројеви</type>
+			<type key="numbers" type="grek">грчки бројеви</type>
+			<type key="numbers" type="greklow">мали грчки бројеви</type>
+			<type key="numbers" type="gujr">гуџаратске цифре</type>
+			<type key="numbers" type="guru">гурмуки цифре</type>
+			<type key="numbers" type="hanidec">кинески децимални бројеви</type>
+			<type key="numbers" type="hans">поједностављени кинески бројеви</type>
+			<type key="numbers" type="hansfin">поједностављени кинески финансијски бројеви</type>
+			<type key="numbers" type="hant">традиционални кинески бројеви</type>
+			<type key="numbers" type="hantfin">традиционални кинески финансијски бројеви</type>
+			<type key="numbers" type="hebr">хебрејски бројеви</type>
+			<type key="numbers" type="jpan">јапански бројеви</type>
+			<type key="numbers" type="jpanfin">јапански финансијски бројеви</type>
+			<type key="numbers" type="khmr">кмерске цифре</type>
+			<type key="numbers" type="knda">канада цифре</type>
+			<type key="numbers" type="laoo">лаошке цифре</type>
+			<type key="numbers" type="latn">западне цифре</type>
+			<type key="numbers" type="mlym">малајалам цифре</type>
+			<type key="numbers" type="mong" draft="contributed">монголске цифре</type>
+			<type key="numbers" type="mymr">мијанмарске цифре</type>
+			<type key="numbers" type="native" draft="contributed">Локалне цифре</type>
+			<type key="numbers" type="orya">орија цифре</type>
+			<type key="numbers" type="roman">римски бројеви</type>
+			<type key="numbers" type="romanlow">мали римски бројеви</type>
+			<type key="numbers" type="taml">тамилски бројеви</type>
+			<type key="numbers" type="tamldec">тамилске цифре</type>
+			<type key="numbers" type="telu">телугу цифре</type>
+			<type key="numbers" type="thai">тајске цифре</type>
+			<type key="numbers" type="tibt">тибетанске цифре</type>
+			<type key="numbers" type="traditional" draft="contributed">Традиционални бројеви</type>
+			<type key="numbers" type="vaii" draft="contributed">Ваи цифре</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">БГН (BGN)</transformName>
@@ -1198,30 +1216,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d.</dateFormatItem>
 						<dateFormatItem id="Gy">y. G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y. G</dateFormatItem>
-						<dateFormatItem id="GyMMMd" draft="contributed">d. MMM y. G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d. MMM y. G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d. MMM y. G</dateFormatItem>
 						<dateFormatItem id="h">hh a</dateFormatItem>
 						<dateFormatItem id="H" draft="contributed">HH</dateFormatItem>
@@ -1243,19 +1262,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="y">y. G</dateFormatItem>
 						<dateFormatItem id="yyyy">y. G</dateFormatItem>
 						<dateFormatItem id="yyyyM">M.y. G</dateFormatItem>
-						<dateFormatItem id="yyyyMd" draft="contributed">d.M.y. G</dateFormatItem>
-						<dateFormatItem id="yyyyMEd" draft="contributed">E, d.M.y. G</dateFormatItem>
+						<dateFormatItem id="yyyyMd">d.M.y. G</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E, d.M.y. G</dateFormatItem>
 						<dateFormatItem id="yyyyMM">MM.y. G</dateFormatItem>
 						<dateFormatItem id="yyyyMMdd">dd.MM.y. G</dateFormatItem>
 						<dateFormatItem id="yyyyMMM">MMM y. G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMd" draft="contributed">d. MMM y. G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">d. MMM y. G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E, d. MMM y. G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMM">MMMM y. G</dateFormatItem>
-						<dateFormatItem id="yyyyQQQ" draft="contributed">QQQ, y. G</dateFormatItem>
-						<dateFormatItem id="yyyyQQQQ" draft="contributed">QQQQ y. G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">QQQ, y. G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">QQQQ y. G</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
 						<intervalFormatItem id="d">
 							<greatestDifference id="d">d–d</greatestDifference>
 						</intervalFormatItem>
@@ -1306,7 +1325,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">MMM–MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">dd.–dd. MMM</greatestDifference>
+							<greatestDifference id="d">dd – dd. MMM</greatestDifference>
 							<greatestDifference id="M">dd. MMM – dd. MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
@@ -1314,25 +1333,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">E, dd. MMM – E, dd. MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
-							<greatestDifference id="y">y–y</greatestDifference>
+							<greatestDifference id="y">y – y. G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">y M – M</greatestDifference>
-							<greatestDifference id="y">M.y – M.y</greatestDifference>
+							<greatestDifference id="M">M.y – M.y. GGGGG</greatestDifference>
+							<greatestDifference id="y">M.y – M.y. GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d.M.y. – d.M.y.</greatestDifference>
+							<greatestDifference id="d">d.M.y – d.M.y. GGGGG</greatestDifference>
 							<greatestDifference id="M">d.M.y. – d.M.y.</greatestDifference>
-							<greatestDifference id="y">d.M.y. – d.M.y.</greatestDifference>
+							<greatestDifference id="y">d.M.y – d.M.y. GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, d.M.y. – E, d.M.y.</greatestDifference>
-							<greatestDifference id="M">E, d.M.y. – E, d.M.y.</greatestDifference>
-							<greatestDifference id="y">E, d.M.y. – E, d.M.y.</greatestDifference>
+							<greatestDifference id="d">E, d.M.y – E, d.M.y. GGGGG</greatestDifference>
+							<greatestDifference id="M">E, d.M.y – E, d.M.y. GGGGG</greatestDifference>
+							<greatestDifference id="y">E, d.M.y – E, d.M.y. GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
 							<greatestDifference id="M">MMM–MMM y.</greatestDifference>
-							<greatestDifference id="y">MMM y. – MMM y.</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y. G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
 							<greatestDifference id="d">dd.–dd. MMM y.</greatestDifference>
@@ -1346,7 +1365,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
 							<greatestDifference id="M">y-MM – MM</greatestDifference>
-							<greatestDifference id="y">y-MM – y-MM</greatestDifference>
+							<greatestDifference id="y">MMMM y – MMMM y. G</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -1535,10 +1554,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<quarter type="4">4.</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
-							<quarter type="1">Прво тромесечје</quarter>
-							<quarter type="2">Друго тромесечје</quarter>
-							<quarter type="3">Треће тромесечје</quarter>
-							<quarter type="4">Четврто тромесечје</quarter>
+							<quarter type="1">први квартал</quarter>
+							<quarter type="2">други квартал</quarter>
+							<quarter type="3">трећи квартал</quarter>
+							<quarter type="4">четврти квартал</quarter>
 						</quarterWidth>
 					</quarterContext>
 					<quarterContext type="stand-alone">
@@ -1549,39 +1568,91 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<quarter type="4">К4</quarter>
 						</quarterWidth>
 						<quarterWidth type="narrow">
-							<quarter type="1" draft="contributed">1.</quarter>
-							<quarter type="2" draft="contributed">2.</quarter>
-							<quarter type="3" draft="contributed">3.</quarter>
-							<quarter type="4" draft="contributed">4.</quarter>
+							<quarter type="1">1.</quarter>
+							<quarter type="2">2.</quarter>
+							<quarter type="3">3.</quarter>
+							<quarter type="4">4.</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
-							<quarter type="1">Прво тромесечје</quarter>
-							<quarter type="2">Друго тромесечје</quarter>
-							<quarter type="3">Треће тромесечје</quarter>
-							<quarter type="4">Четврто тромесечје</quarter>
+							<quarter type="1">први квартал</quarter>
+							<quarter type="2">други квартал</quarter>
+							<quarter type="3">трећи квартал</quarter>
+							<quarter type="4">четврти квартал</quarter>
 						</quarterWidth>
 					</quarterContext>
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">поноћ</dayPeriod>
+							<dayPeriod type="am">пре подне</dayPeriod>
+							<dayPeriod type="noon">подне</dayPeriod>
+							<dayPeriod type="pm">по подне</dayPeriod>
+							<dayPeriod type="morning1">јутро</dayPeriod>
+							<dayPeriod type="afternoon1">по под.</dayPeriod>
+							<dayPeriod type="evening1">вече</dayPeriod>
+							<dayPeriod type="night1">ноћ</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">у поноћ</dayPeriod>
 							<dayPeriod type="am" draft="contributed">a</dayPeriod>
-							<dayPeriod type="noon" draft="contributed">n</dayPeriod>
+							<dayPeriod type="noon">у подне</dayPeriod>
 							<dayPeriod type="pm" draft="contributed">p</dayPeriod>
+							<dayPeriod type="morning1">ујутру</dayPeriod>
+							<dayPeriod type="afternoon1">по подне</dayPeriod>
+							<dayPeriod type="evening1">увече</dayPeriod>
+							<dayPeriod type="night1">ноћу</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">поноћ</dayPeriod>
 							<dayPeriod type="am">пре подне</dayPeriod>
-							<dayPeriod type="noon" draft="contributed">у подне</dayPeriod>
+							<dayPeriod type="noon">подне</dayPeriod>
 							<dayPeriod type="pm">по подне</dayPeriod>
+							<dayPeriod type="morning1">јутро</dayPeriod>
+							<dayPeriod type="afternoon1">поподне</dayPeriod>
+							<dayPeriod type="evening1">вече</dayPeriod>
+							<dayPeriod type="night1">ноћ</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">поноћ</dayPeriod>
+							<dayPeriod type="am">пре подне</dayPeriod>
+							<dayPeriod type="noon">подне</dayPeriod>
+							<dayPeriod type="pm">по подне</dayPeriod>
+							<dayPeriod type="morning1">јутро</dayPeriod>
+							<dayPeriod type="afternoon1">поподне</dayPeriod>
+							<dayPeriod type="evening1">вече</dayPeriod>
+							<dayPeriod type="night1">ноћ</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">поноћ</dayPeriod>
+							<dayPeriod type="am">пре подне</dayPeriod>
+							<dayPeriod type="noon">подне</dayPeriod>
+							<dayPeriod type="pm">по подне</dayPeriod>
+							<dayPeriod type="morning1">јутро</dayPeriod>
+							<dayPeriod type="afternoon1">поподне</dayPeriod>
+							<dayPeriod type="evening1">вече</dayPeriod>
+							<dayPeriod type="night1">ноћ</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">поноћ</dayPeriod>
+							<dayPeriod type="am">пре подне</dayPeriod>
+							<dayPeriod type="noon">подне</dayPeriod>
+							<dayPeriod type="pm">по подне</dayPeriod>
+							<dayPeriod type="morning1">јутро</dayPeriod>
+							<dayPeriod type="afternoon1">поподне</dayPeriod>
+							<dayPeriod type="evening1">вече</dayPeriod>
+							<dayPeriod type="night1">ноћ</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
-						<era type="0">Пре нове ере</era>
-						<era type="0" alt="variant" draft="contributed">п. н. е.</era>
-						<era type="1">Нове ере</era>
-						<era type="1" alt="variant" draft="contributed">н. е.</era>
+						<era type="0">пре нове ере</era>
+						<era type="0" alt="variant">п. н. е.</era>
+						<era type="1">нове ере</era>
+						<era type="1" alt="variant">н. е.</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">п. н. е.</era>
@@ -1639,61 +1710,65 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="E" draft="contributed">E</dateFormatItem>
+						<dateFormatItem id="E">E</dateFormatItem>
 						<dateFormatItem id="Ed">E d.</dateFormatItem>
-						<dateFormatItem id="Ehm" draft="contributed">E, h:mm a</dateFormatItem>
-						<dateFormatItem id="EHm" draft="contributed">E, HH:mm</dateFormatItem>
-						<dateFormatItem id="Ehms" draft="contributed">E, h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Gy" draft="contributed">y. G</dateFormatItem>
-						<dateFormatItem id="GyMMM" draft="contributed">MMM y. G</dateFormatItem>
-						<dateFormatItem id="GyMMMd" draft="contributed">d. MMM y. G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd" draft="contributed">E, d. MMM y. G</dateFormatItem>
-						<dateFormatItem id="h">hh a</dateFormatItem>
+						<dateFormatItem id="Ehm">E, h.mm a</dateFormatItem>
+						<dateFormatItem id="EHm">E, HH.mm</dateFormatItem>
+						<dateFormatItem id="Ehms">E, h.mm.ss a</dateFormatItem>
+						<dateFormatItem id="EHms">E, HH.mm.ss</dateFormatItem>
+						<dateFormatItem id="Gy">y. G</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM y. G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d. MMM y. G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d. MMM y. G</dateFormatItem>
+						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">HH</dateFormatItem>
 						<dateFormatItem id="hm">hh.mm a</dateFormatItem>
 						<dateFormatItem id="Hm">HH.mm</dateFormatItem>
 						<dateFormatItem id="hms">hh.mm.ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH.mm.ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h.mm.ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH.mm.ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h.mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH.mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">E, M-d</dateFormatItem>
+						<dateFormatItem id="MEd">E, d.M.</dateFormatItem>
 						<dateFormatItem id="MMdd">MM-dd</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
 						<dateFormatItem id="MMMdd">dd.MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d. MMM</dateFormatItem>
 						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E d. MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMEd">E, d. MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm.ss</dateFormatItem>
 						<dateFormatItem id="y">y.</dateFormatItem>
 						<dateFormatItem id="yM">M.y.</dateFormatItem>
-						<dateFormatItem id="yMd" draft="contributed">d.M.y.</dateFormatItem>
+						<dateFormatItem id="yMd">d.M.y.</dateFormatItem>
 						<dateFormatItem id="yMEd">E, d.M.y.</dateFormatItem>
 						<dateFormatItem id="yMM">MM.y.</dateFormatItem>
 						<dateFormatItem id="yMMdd">dd.MM.y.</dateFormatItem>
 						<dateFormatItem id="yMMM">MMM y.</dateFormatItem>
-						<dateFormatItem id="yMMMd" draft="contributed">d. MMM y.</dateFormatItem>
+						<dateFormatItem id="yMMMd">d. MMM y.</dateFormatItem>
 						<dateFormatItem id="yMMMEd">E, d. MMM y.</dateFormatItem>
 						<dateFormatItem id="yMMMM">MMMM y.</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ. y</dateFormatItem>
@@ -1703,7 +1778,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<appendItem request="Timezone">{0} {1}</appendItem>
 					</appendItems>
 					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
 						<intervalFormatItem id="d">
 							<greatestDifference id="d">d–d</greatestDifference>
 						</intervalFormatItem>
@@ -1765,8 +1840,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="y">y–y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">y M – M</greatestDifference>
-							<greatestDifference id="y">y M – M</greatestDifference>
+							<greatestDifference id="M">M – M, y</greatestDifference>
+							<greatestDifference id="y">M.y. – M.y.</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
 							<greatestDifference id="d">d.M.y. – d.M.y.</greatestDifference>
@@ -1793,8 +1868,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="y">E, dd. MMM y. – E, dd. MMM y.</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">y-MM – MM</greatestDifference>
-							<greatestDifference id="y">y-MM – y-MM</greatestDifference>
+							<greatestDifference id="M">MMMM – MMMM y.</greatestDifference>
+							<greatestDifference id="y">MMMM y – MMMM y.</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -1853,7 +1928,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="1" draft="provisional">Мух.</month>
 							<month type="2" draft="provisional">Саф.</month>
 							<month type="3" draft="provisional">Реб. 1</month>
-							<month type="4" draft="provisional">Реб 2</month>
+							<month type="4" draft="provisional">Реб. 2</month>
 							<month type="5" draft="provisional">Џум. 1</month>
 							<month type="6" draft="provisional">Џум. 2</month>
 							<month type="7" draft="provisional">Реџ.</month>
@@ -1904,238 +1979,238 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<calendar type="japanese">
 				<eras>
 					<eraAbbr>
-						<era type="0">Таика (645-650)</era>
-						<era type="1">Хакучи (650-671)</era>
-						<era type="2">Хакухо (672-686)</era>
-						<era type="3">Шучо (686-701)</era>
-						<era type="4">Таихо (701-704)</era>
-						<era type="5">Кеиун (704-708)</era>
-						<era type="6">Вадо (708-715)</era>
-						<era type="7">Реики (715-717)</era>
-						<era type="8">Јоро (717-724)</era>
-						<era type="9">Јинки (724-729)</era>
-						<era type="10">Темпио (729-749)</era>
+						<era type="0">Таика (645–650)</era>
+						<era type="1">Хакучи (650–671)</era>
+						<era type="2">Хакухо (672–686)</era>
+						<era type="3">Шучо (686–701)</era>
+						<era type="4">Таихо (701–704)</era>
+						<era type="5">Кеиун (704–708)</era>
+						<era type="6">Вадо (708–715)</era>
+						<era type="7">Реики (715–717)</era>
+						<era type="8">Јоро (717–724)</era>
+						<era type="9">Јинки (724–729)</era>
+						<era type="10">Темпио (729–749)</era>
 						<era type="11">Темпио-кампо (749-749)</era>
 						<era type="12">Темпио-шохо (749-757)</era>
 						<era type="13">Темпио-хођи (757-765)</era>
 						<era type="14">Темпо-ђинго (765-767)</era>
 						<era type="15">Ђинго-кеиун (767-770)</era>
-						<era type="16">Хоки (770-780)</era>
+						<era type="16">Хоки (770–780)</era>
 						<era type="17">Тен-о (781-782)</era>
-						<era type="18">Енрјаку (782-806)</era>
-						<era type="19">Даидо (806-810)</era>
-						<era type="20">Конин (810-824)</era>
-						<era type="21">Тенчо (824-834)</era>
-						<era type="22">Шова (834-848)</era>
-						<era type="23">Кајо (848-851)</era>
-						<era type="24">Нињу (851-854)</era>
-						<era type="25">Саико (854-857)</era>
-						<era type="26">Тенан (857-859)</era>
-						<era type="27">Јоган (859-877)</era>
-						<era type="28">Генкеи (877-885)</era>
-						<era type="29">Ниња (885-889)</era>
-						<era type="30">Кампјо (889-898)</era>
-						<era type="31">Шотаи (898-901)</era>
-						<era type="32">Енђи (901-923)</era>
-						<era type="33">Енчо (923-931)</era>
-						<era type="34">Шохеи (931-938)</era>
-						<era type="35">Тенгјо (938-947)</era>
-						<era type="36">Тенриаку (947-957)</era>
-						<era type="37">Тентоку (957-961)</era>
-						<era type="38">Ова (961-964)</era>
-						<era type="39">Кохо (964-968)</era>
-						<era type="40">Ана (968-970)</era>
-						<era type="41">Тенроку (970-973)</era>
+						<era type="18">Енрјаку (782–806)</era>
+						<era type="19">Даидо (806–810)</era>
+						<era type="20">Конин (810–824)</era>
+						<era type="21">Тенчо (824–834)</era>
+						<era type="22">Шова (834–848)</era>
+						<era type="23">Кајо (848–851)</era>
+						<era type="24">Нињу (851–854)</era>
+						<era type="25">Саико (854–857)</era>
+						<era type="26">Тенан (857–859)</era>
+						<era type="27">Јоган (859–877)</era>
+						<era type="28">Генкеи (877–885)</era>
+						<era type="29">Ниња (885–889)</era>
+						<era type="30">Кампјо (889–898)</era>
+						<era type="31">Шотаи (898–901)</era>
+						<era type="32">Енђи (901–923)</era>
+						<era type="33">Енчо (923–931)</era>
+						<era type="34">Шохеи (931–938)</era>
+						<era type="35">Тенгјо (938–947)</era>
+						<era type="36">Тенриаку (947–957)</era>
+						<era type="37">Тентоку (957–961)</era>
+						<era type="38">Ова (961–964)</era>
+						<era type="39">Кохо (964–968)</era>
+						<era type="40">Ана (968–970)</era>
+						<era type="41">Тенроку (970–973)</era>
 						<era type="42">Тен-ен (973-976)</era>
-						<era type="43">Јоген (976-978)</era>
-						<era type="44">Тенген (978-983)</era>
-						<era type="45">Еикан (983-985)</era>
-						<era type="46">Кана (985-987)</era>
+						<era type="43">Јоген (976–978)</era>
+						<era type="44">Тенген (978–983)</era>
+						<era type="45">Еикан (983–985)</era>
+						<era type="46">Кана (985–987)</era>
 						<era type="47">Еи-ен (987-989)</era>
-						<era type="48">Еисо (989-990)</era>
-						<era type="49">Шорјаку (990-995)</era>
-						<era type="50">Чотоку (995-999)</era>
-						<era type="51">Чохо (999-1004)</era>
-						<era type="52">Канко (1004-1012)</era>
-						<era type="53">Чова (1012-1017)</era>
-						<era type="54">Канин (1017-1021)</era>
-						<era type="55">Ђиан (1021-1024)</era>
-						<era type="56">Мању (1024-1028)</era>
-						<era type="57">Чоген (1028-1037)</era>
-						<era type="58">Чорјаку (1037-1040)</era>
-						<era type="59">Чокју (1040-1044)</era>
-						<era type="60">Кантоку (1044-1046)</era>
-						<era type="61">Еишо (1046-1053)</era>
-						<era type="62">Тенђи (1053-1058)</era>
-						<era type="63">Кохеи (1058-1065)</era>
-						<era type="64">Ђирјаку (1065-1069)</era>
-						<era type="65">Енкју (1069-1074)</era>
-						<era type="66">Шохо (1074-1077)</era>
-						<era type="67">Шорјаку (1077-1081)</era>
-						<era type="68">Еишо (1081-1084)</era>
-						<era type="69">Отоку (1084-1087)</era>
-						<era type="70">Канђи (1087-1094)</era>
-						<era type="71">Кахо (1094-1096)</era>
-						<era type="72">Еичо (1096-1097)</era>
-						<era type="73">Шотоку (1097-1099)</era>
-						<era type="74">Кова (1099-1104)</era>
-						<era type="75">Чођи (1104-1106)</era>
-						<era type="76">Кашо (1106-1108)</era>
-						<era type="77">Тенин (1108-1110)</era>
+						<era type="48">Еисо (989–990)</era>
+						<era type="49">Шорјаку (990–995)</era>
+						<era type="50">Чотоку (995–999)</era>
+						<era type="51">Чохо (999–1004)</era>
+						<era type="52">Канко (1004–1012)</era>
+						<era type="53">Чова (1012–1017)</era>
+						<era type="54">Канин (1017–1021)</era>
+						<era type="55">Ђиан (1021–1024)</era>
+						<era type="56">Мању (1024–1028)</era>
+						<era type="57">Чоген (1028–1037)</era>
+						<era type="58">Чорјаку (1037–1040)</era>
+						<era type="59">Чокју (1040–1044)</era>
+						<era type="60">Кантоку (1044–1046)</era>
+						<era type="61">Еишо (1046–1053)</era>
+						<era type="62">Тенђи (1053–1058)</era>
+						<era type="63">Кохеи (1058–1065)</era>
+						<era type="64">Ђирјаку (1065–1069)</era>
+						<era type="65">Енкју (1069–1074)</era>
+						<era type="66">Шохо (1074–1077)</era>
+						<era type="67">Шорјаку (1077–1081)</era>
+						<era type="68">Еишо (1081–1084)</era>
+						<era type="69">Отоку (1084–1087)</era>
+						<era type="70">Канђи (1087–1094)</era>
+						<era type="71">Кахо (1094–1096)</era>
+						<era type="72">Еичо (1096–1097)</era>
+						<era type="73">Шотоку (1097–1099)</era>
+						<era type="74">Кова (1099–1104)</era>
+						<era type="75">Чођи (1104–1106)</era>
+						<era type="76">Кашо (1106–1108)</era>
+						<era type="77">Тенин (1108–1110)</era>
 						<era type="78">Тен-еи (1110-1113)</era>
-						<era type="79">Еикју (1113-1118)</era>
+						<era type="79">Еикју (1113–1118)</era>
 						<era type="80">Ђен-еи (1118-1120)</era>
-						<era type="81">Хоан (1120-1124)</era>
-						<era type="82">Тенђи (1124-1126)</era>
-						<era type="83">Даиђи (1126-1131)</era>
-						<era type="84">Теншо (1131-1132)</era>
-						<era type="85">Чошао (1132-1135)</era>
-						<era type="86">Хоен (1135-1141)</era>
-						<era type="87">Еиђи (1141-1142)</era>
-						<era type="88">Кођи (1142-1144)</era>
-						<era type="89">Тењо (1144-1145)</era>
-						<era type="90">Кјуан (1145-1151)</era>
-						<era type="91">Нинпеи (1151-1154)</era>
-						<era type="92">Кјују (1154-1156)</era>
-						<era type="93">Хоген (1156-1159)</era>
-						<era type="94">Хеиђи (1159-1160)</era>
-						<era type="95">Еирјаку (1160-1161)</era>
-						<era type="96">Охо (1161-1163)</era>
-						<era type="97">Чокан (1163-1165)</era>
-						<era type="98">Еиман (1165-1166)</era>
+						<era type="81">Хоан (1120–1124)</era>
+						<era type="82">Тенђи (1124–1126)</era>
+						<era type="83">Даиђи (1126–1131)</era>
+						<era type="84">Теншо (1131–1132)</era>
+						<era type="85">Чошао (1132–1135)</era>
+						<era type="86">Хоен (1135–1141)</era>
+						<era type="87">Еиђи (1141–1142)</era>
+						<era type="88">Кођи (1142–1144)</era>
+						<era type="89">Тењо (1144–1145)</era>
+						<era type="90">Кјуан (1145–1151)</era>
+						<era type="91">Нинпеи (1151–1154)</era>
+						<era type="92">Кјују (1154–1156)</era>
+						<era type="93">Хоген (1156–1159)</era>
+						<era type="94">Хеиђи (1159–1160)</era>
+						<era type="95">Еирјаку (1160–1161)</era>
+						<era type="96">Охо (1161–1163)</era>
+						<era type="97">Чокан (1163–1165)</era>
+						<era type="98">Еиман (1165–1166)</era>
 						<era type="99">Нин-ан (1166-1169)</era>
-						<era type="100">Као (1169-1171)</era>
-						<era type="101">Шоан (1171-1175)</era>
-						<era type="102">Анген (1175-1177)</era>
-						<era type="103">Ђишо (1177-1181)</era>
-						<era type="104">Јова (1181-1182)</era>
-						<era type="105">Ђуеи (1182-1184)</era>
-						<era type="106">Генрјуку (1184-1185)</era>
-						<era type="107">Бунђи (1185-1190)</era>
-						<era type="108">Кенкју (1190-1199)</era>
-						<era type="109">Шођи (1199-1201)</era>
-						<era type="110">Кенин (1201-1204)</era>
-						<era type="111">Генкју (1204-1206)</era>
+						<era type="100">Као (1169–1171)</era>
+						<era type="101">Шоан (1171–1175)</era>
+						<era type="102">Анген (1175–1177)</era>
+						<era type="103">Ђишо (1177–1181)</era>
+						<era type="104">Јова (1181–1182)</era>
+						<era type="105">Ђуеи (1182–1184)</era>
+						<era type="106">Генрјуку (1184–1185)</era>
+						<era type="107">Бунђи (1185–1190)</era>
+						<era type="108">Кенкју (1190–1199)</era>
+						<era type="109">Шођи (1199–1201)</era>
+						<era type="110">Кенин (1201–1204)</era>
+						<era type="111">Генкју (1204–1206)</era>
 						<era type="112">Кен-еи (1206-1207)</era>
-						<era type="113">Шоген (1207-1211)</era>
-						<era type="114">Кенрјаку (1211-1213)</era>
-						<era type="115">Кенпо (1213-1219)</era>
-						<era type="116">Шокју (1219-1222)</era>
-						<era type="117">Ђу (1222-1224)</era>
-						<era type="118">Ђенин (1224-1225)</era>
-						<era type="119">Кароку (1225-1227)</era>
-						<era type="120">Антеи (1227-1229)</era>
-						<era type="121">Канки (1229-1232)</era>
-						<era type="122">Ђоеи (1232-1233)</era>
-						<era type="123">Темпуку (1233-1234)</era>
-						<era type="124">Бунрјаку (1234-1235)</era>
-						<era type="125">Катеи (1235-1238)</era>
-						<era type="126">Рјакунин (1238-1239)</era>
+						<era type="113">Шоген (1207–1211)</era>
+						<era type="114">Кенрјаку (1211–1213)</era>
+						<era type="115">Кенпо (1213–1219)</era>
+						<era type="116">Шокју (1219–1222)</era>
+						<era type="117">Ђу (1222–1224)</era>
+						<era type="118">Ђенин (1224–1225)</era>
+						<era type="119">Кароку (1225–1227)</era>
+						<era type="120">Антеи (1227–1229)</era>
+						<era type="121">Канки (1229–1232)</era>
+						<era type="122">Ђоеи (1232–1233)</era>
+						<era type="123">Темпуку (1233–1234)</era>
+						<era type="124">Бунрјаку (1234–1235)</era>
+						<era type="125">Катеи (1235–1238)</era>
+						<era type="126">Рјакунин (1238–1239)</era>
 						<era type="127">Ен-о (1239-1240)</era>
-						<era type="128">Нињи (1240-1243)</era>
-						<era type="129">Канген (1243-1247)</era>
-						<era type="130">Хођи (1247-1249)</era>
-						<era type="131">Кенчо (1249-1256)</era>
-						<era type="132">Коген (1256-1257)</era>
-						<era type="133">Шока (1257-1259)</era>
-						<era type="134">Шоген (1259-1260)</era>
+						<era type="128">Нињи (1240–1243)</era>
+						<era type="129">Канген (1243–1247)</era>
+						<era type="130">Хођи (1247–1249)</era>
+						<era type="131">Кенчо (1249–1256)</era>
+						<era type="132">Коген (1256–1257)</era>
+						<era type="133">Шока (1257–1259)</era>
+						<era type="134">Шоген (1259–1260)</era>
 						<era type="135">Бун-о (1260-1261)</era>
-						<era type="136">Кочо (1261-1264)</era>
+						<era type="136">Кочо (1261–1264)</era>
 						<era type="137">Бун-еи (1264-1275)</era>
-						<era type="138">Кенђи (1275-1278)</era>
-						<era type="139">Коан (1278-1288)</era>
-						<era type="140">Шу (1288-1293)</era>
-						<era type="141">Еинин (1293-1299)</era>
-						<era type="142">Шоан (1299-1302)</era>
-						<era type="143">Кенген (1302-1303)</era>
-						<era type="144">Каген (1303-1306)</era>
-						<era type="145">Токуђи (1306-1308)</era>
-						<era type="146">Енкеи (1308-1311)</era>
-						<era type="147">Очо (1311-1312)</era>
-						<era type="148">Шова (1312-1317)</era>
-						<era type="149">Бунпо (1317-1319)</era>
-						<era type="150">Ђено (1319-1321)</era>
-						<era type="151">Ђенкјо (1321-1324)</era>
-						<era type="152">Шочу (1324-1326)</era>
-						<era type="153">Кареки (1326-1329)</era>
-						<era type="154">Гентоку (1329-1331)</era>
-						<era type="155">Генко (1331-1334)</era>
-						<era type="156">Кему (1334-1336)</era>
-						<era type="157">Енген (1336-1340)</era>
-						<era type="158">Кококу (1340-1346)</era>
-						<era type="159">Шохеи (1346-1370)</era>
-						<era type="160">Кентоку (1370-1372)</era>
-						<era type="161">Бучу (1372-1375)</era>
-						<era type="162">Тењу (1375-1379)</era>
-						<era type="163">Корјаку (1379-1381)</era>
-						<era type="164">Кова (1381-1384)</era>
-						<era type="165">Генчу (1384-1392)</era>
-						<era type="166">Меитоку (1384-1387)</era>
-						<era type="167">Какеи (1387-1389)</era>
-						<era type="168">Ку (1389-1390)</era>
-						<era type="169">Меитоку (1390-1394)</era>
-						<era type="170">Оеи (1394-1428)</era>
-						<era type="171">Шочо (1428-1429)</era>
-						<era type="172">Еикјо (1429-1441)</era>
-						<era type="173">Какитсу (1441-1444)</era>
+						<era type="138">Кенђи (1275–1278)</era>
+						<era type="139">Коан (1278–1288)</era>
+						<era type="140">Шу (1288–1293)</era>
+						<era type="141">Еинин (1293–1299)</era>
+						<era type="142">Шоан (1299–1302)</era>
+						<era type="143">Кенген (1302–1303)</era>
+						<era type="144">Каген (1303–1306)</era>
+						<era type="145">Токуђи (1306–1308)</era>
+						<era type="146">Енкеи (1308–1311)</era>
+						<era type="147">Очо (1311–1312)</era>
+						<era type="148">Шова (1312–1317)</era>
+						<era type="149">Бунпо (1317–1319)</era>
+						<era type="150">Ђено (1319–1321)</era>
+						<era type="151">Ђенкјо (1321–1324)</era>
+						<era type="152">Шочу (1324–1326)</era>
+						<era type="153">Кареки (1326–1329)</era>
+						<era type="154">Гентоку (1329–1331)</era>
+						<era type="155">Генко (1331–1334)</era>
+						<era type="156">Кему (1334–1336)</era>
+						<era type="157">Енген (1336–1340)</era>
+						<era type="158">Кококу (1340–1346)</era>
+						<era type="159">Шохеи (1346–1370)</era>
+						<era type="160">Кентоку (1370–1372)</era>
+						<era type="161">Бучу (1372–1375)</era>
+						<era type="162">Тењу (1375–1379)</era>
+						<era type="163">Корјаку (1379–1381)</era>
+						<era type="164">Кова (1381–1384)</era>
+						<era type="165">Генчу (1384–1392)</era>
+						<era type="166">Меитоку (1384–1387)</era>
+						<era type="167">Какеи (1387–1389)</era>
+						<era type="168">Ку (1389–1390)</era>
+						<era type="169">Меитоку (1390–1394)</era>
+						<era type="170">Оеи (1394–1428)</era>
+						<era type="171">Шочо (1428–1429)</era>
+						<era type="172">Еикјо (1429–1441)</era>
+						<era type="173">Какитсу (1441–1444)</era>
 						<era type="174">Бун-ан (1444-1449)</era>
-						<era type="175">Хотоку (1449-1452)</era>
-						<era type="176">Кјотоку (1452-1455)</era>
-						<era type="177">Кошо (1455-1457)</era>
-						<era type="178">Чороку (1457-1460)</era>
-						<era type="179">Каншо (1460-1466)</era>
-						<era type="180">Буншо (1466-1467)</era>
-						<era type="181">Онин (1467-1469)</era>
-						<era type="182">Бунмеи (1469-1487)</era>
-						<era type="183">Чокјо (1487-1489)</era>
-						<era type="184">Ентоку (1489-1492)</era>
-						<era type="185">Меио (1492-1501)</era>
-						<era type="186">Бунки (1501-1504)</era>
-						<era type="187">Еишо (1504-1521)</era>
-						<era type="188">Таиеи (1521-1528)</era>
-						<era type="189">Кјороку (1528-1532)</era>
-						<era type="190">Тенмон (1532-1555)</era>
-						<era type="191">Кођи (1555-1558)</era>
-						<era type="192">Еироку (1558-1570)</era>
-						<era type="193">Генки (1570-1573)</era>
-						<era type="194">Теншо (1573-1592)</era>
-						<era type="195">Бунроку (1592-1596)</era>
-						<era type="196">Кеичо (1596-1615)</era>
-						<era type="197">Генва (1615-1624)</era>
+						<era type="175">Хотоку (1449–1452)</era>
+						<era type="176">Кјотоку (1452–1455)</era>
+						<era type="177">Кошо (1455–1457)</era>
+						<era type="178">Чороку (1457–1460)</era>
+						<era type="179">Каншо (1460–1466)</era>
+						<era type="180">Буншо (1466–1467)</era>
+						<era type="181">Онин (1467–1469)</era>
+						<era type="182">Бунмеи (1469–1487)</era>
+						<era type="183">Чокјо (1487–1489)</era>
+						<era type="184">Ентоку (1489–1492)</era>
+						<era type="185">Меио (1492–1501)</era>
+						<era type="186">Бунки (1501–1504)</era>
+						<era type="187">Еишо (1504–1521)</era>
+						<era type="188">Таиеи (1521–1528)</era>
+						<era type="189">Кјороку (1528–1532)</era>
+						<era type="190">Тенмон (1532–1555)</era>
+						<era type="191">Кођи (1555–1558)</era>
+						<era type="192">Еироку (1558–1570)</era>
+						<era type="193">Генки (1570–1573)</era>
+						<era type="194">Теншо (1573–1592)</era>
+						<era type="195">Бунроку (1592–1596)</era>
+						<era type="196">Кеичо (1596–1615)</era>
+						<era type="197">Генва (1615–1624)</era>
 						<era type="198">Кан-еи (1624-1644)</era>
-						<era type="199">Шохо (1644-1648)</era>
-						<era type="200">Кеиан (1648-1652)</era>
-						<era type="201">Шу (1652-1655)</era>
-						<era type="202">Меирјаку (1655-1658)</era>
-						<era type="203">Мањи (1658-1661)</era>
-						<era type="204">Канбун (1661-1673)</era>
-						<era type="205">Енпо (1673-1681)</era>
-						<era type="206">Тенва (1681-1684)</era>
-						<era type="207">Јокјо (1684-1688)</era>
-						<era type="208">Генроку (1688-1704)</era>
-						<era type="209">Хоеи (1704-1711)</era>
-						<era type="210">Шотоку (1711-1716)</era>
-						<era type="211">Кјохо (1716-1736)</era>
-						<era type="212">Генбун (1736-1741)</era>
-						<era type="213">Канпо (1741-1744)</era>
-						<era type="214">Енкјо (1744-1748)</era>
+						<era type="199">Шохо (1644–1648)</era>
+						<era type="200">Кеиан (1648–1652)</era>
+						<era type="201">Шу (1652–1655)</era>
+						<era type="202">Меирјаку (1655–1658)</era>
+						<era type="203">Мањи (1658–1661)</era>
+						<era type="204">Канбун (1661–1673)</era>
+						<era type="205">Енпо (1673–1681)</era>
+						<era type="206">Тенва (1681–1684)</era>
+						<era type="207">Јокјо (1684–1688)</era>
+						<era type="208">Генроку (1688–1704)</era>
+						<era type="209">Хоеи (1704–1711)</era>
+						<era type="210">Шотоку (1711–1716)</era>
+						<era type="211">Кјохо (1716–1736)</era>
+						<era type="212">Генбун (1736–1741)</era>
+						<era type="213">Канпо (1741–1744)</era>
+						<era type="214">Енкјо (1744–1748)</era>
 						<era type="215">Кан-ен (1748-1751)</era>
-						<era type="216">Хорјаку (1751-1764)</era>
-						<era type="217">Меива (1764-1772)</era>
+						<era type="216">Хорјаку (1751–1764)</era>
+						<era type="217">Меива (1764–1772)</era>
 						<era type="218">Ан-еи (1772-1781)</era>
-						<era type="219">Тенмеи (1781-1789)</era>
-						<era type="220">Кансеи (1789-1801)</era>
-						<era type="221">Кјова (1801-1804)</era>
-						<era type="222">Бунка (1804-1818)</era>
-						<era type="223">Бунсеи (1818-1830)</era>
-						<era type="224">Тенпо (1830-1844)</era>
-						<era type="225">Кока (1844-1848)</era>
-						<era type="226">Каеи (1848-1854)</era>
-						<era type="227">Ансеи (1854-1860)</era>
+						<era type="219">Тенмеи (1781–1789)</era>
+						<era type="220">Кансеи (1789–1801)</era>
+						<era type="221">Кјова (1801–1804)</era>
+						<era type="222">Бунка (1804–1818)</era>
+						<era type="223">Бунсеи (1818–1830)</era>
+						<era type="224">Тенпо (1830–1844)</era>
+						<era type="225">Кока (1844–1848)</era>
+						<era type="226">Каеи (1848–1854)</era>
+						<era type="227">Ансеи (1854–1860)</era>
 						<era type="228">Ман-ен (1860-1861)</era>
-						<era type="229">Бункју (1861-1864)</era>
-						<era type="230">Генђи (1864-1865)</era>
-						<era type="231">Кеико (1865-1868)</era>
+						<era type="229">Бункју (1861–1864)</era>
+						<era type="230">Генђи (1864–1865)</era>
+						<era type="231">Кеико (1865–1868)</era>
 						<era type="232">Меиђи</era>
 						<era type="233">Таишо</era>
 						<era type="234">Шова</era>
@@ -2247,6 +2322,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter">
 				<displayName>квартал</displayName>
+				<relative type="-1">прошлог квартала</relative>
+				<relative type="0">овог квартала</relative>
+				<relative type="1">следећег квартала</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">за {0} квартал</relativeTimePattern>
 					<relativeTimePattern count="few">за {0} квартала</relativeTimePattern>
@@ -2259,29 +2337,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="quarter-short">
-				<displayName draft="contributed">квартал</displayName>
+				<displayName>кв.</displayName>
+				<relative type="-1">прошлог квартала</relative>
+				<relative type="0">овог квартала</relative>
+				<relative type="1">следећег квартала</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">за {0} квартала</relativeTimePattern>
-					<relativeTimePattern count="few">за {0} квартала</relativeTimePattern>
-					<relativeTimePattern count="other">за {0} квартала</relativeTimePattern>
+					<relativeTimePattern count="one">за {0} кв.</relativeTimePattern>
+					<relativeTimePattern count="few">за {0} кв.</relativeTimePattern>
+					<relativeTimePattern count="other">за {0} кв.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">пре {0} квартала</relativeTimePattern>
-					<relativeTimePattern count="few">пре {0} квартала</relativeTimePattern>
-					<relativeTimePattern count="other">пре {0} квартала</relativeTimePattern>
+					<relativeTimePattern count="one">пре {0} кв.</relativeTimePattern>
+					<relativeTimePattern count="few">пре {0} кв.</relativeTimePattern>
+					<relativeTimePattern count="other">пре {0} кв.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-narrow">
-				<displayName draft="contributed">квартал</displayName>
+				<displayName>кв.</displayName>
+				<relative type="-1">прошлог квартала</relative>
+				<relative type="0">овог квартала</relative>
+				<relative type="1">следећег квартала</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">за {0} квартала</relativeTimePattern>
-					<relativeTimePattern count="few">за {0} квартала</relativeTimePattern>
-					<relativeTimePattern count="other">за {0} квартала</relativeTimePattern>
+					<relativeTimePattern count="one">за {0} кв.</relativeTimePattern>
+					<relativeTimePattern count="few">за {0} кв.</relativeTimePattern>
+					<relativeTimePattern count="other">за {0} кв.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">пре {0} квартала</relativeTimePattern>
-					<relativeTimePattern count="few">пре {0} квартала</relativeTimePattern>
-					<relativeTimePattern count="other">пре {0} квартала</relativeTimePattern>
+					<relativeTimePattern count="one">пре {0} кв.</relativeTimePattern>
+					<relativeTimePattern count="few">пре {0} кв.</relativeTimePattern>
+					<relativeTimePattern count="other">пре {0} кв.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month">
@@ -2441,9 +2525,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">следећег пон</relative>
 			</field>
 			<field type="mon-narrow">
-				<relative type="-1" draft="contributed">прошлог пон</relative>
-				<relative type="0" draft="contributed">у пон</relative>
-				<relative type="1" draft="contributed">следећег пон</relative>
+				<relative type="-1">прошлог пон</relative>
+				<relative type="0">у пон</relative>
+				<relative type="1">следећег пон</relative>
 			</field>
 			<field type="tue">
 				<relative type="-1">прошлог уторка</relative>
@@ -2768,7 +2852,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Брокен Хил</exemplarCity>
 			</zone>
 			<zone type="Australia/Currie">
-				<exemplarCity>Курие</exemplarCity>
+				<exemplarCity>Кари</exemplarCity>
 			</zone>
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Мелбурн</exemplarCity>
@@ -3129,7 +3213,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</zone>
 			<zone type="Europe/London">
 				<long>
-					<daylight draft="contributed">британско летње време</daylight>
+					<daylight>Британија летње рачунање времена</daylight>
 				</long>
 				<exemplarCity>Лондон</exemplarCity>
 			</zone>
@@ -3222,7 +3306,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</zone>
 			<zone type="Europe/Dublin">
 				<long>
-					<daylight draft="contributed">ирско летње време</daylight>
+					<daylight>Ирска стандардно време</daylight>
 				</long>
 				<exemplarCity>Даблин</exemplarCity>
 			</zone>
@@ -3520,6 +3604,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Порт Морзби</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity draft="contributed">Буганвил</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Манила</exemplarCity>
 			</zone>
@@ -3604,6 +3691,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Иркуцк</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity draft="contributed">Чита</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Јакутск</exemplarCity>
 			</zone>
@@ -3622,6 +3712,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Магадан</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity draft="contributed">Средњеколимск</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Камчатка</exemplarCity>
 			</zone>
@@ -3686,7 +3779,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Салвадор</exemplarCity>
 			</zone>
 			<zone type="America/Lower_Princes">
-				<exemplarCity draft="contributed">Лоуер Принсиз Квортер</exemplarCity>
+				<exemplarCity>Лоуер Принсиз Квортер</exemplarCity>
 			</zone>
 			<zone type="Asia/Damascus">
 				<exemplarCity>Дамаск</exemplarCity>
@@ -3937,9 +4030,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Alaska">
 				<long>
-					<generic draft="contributed">Аљашко време</generic>
-					<standard draft="contributed">Аљашко стандардно време</standard>
-					<daylight draft="contributed">Аљашко летње време</daylight>
+					<generic>Аљаска</generic>
+					<standard>Аљаска, стандардно време</standard>
+					<daylight>Аљаска, летње рачунање времена</daylight>
 				</long>
 			</metazone>
 			<metazone type="Almaty">
@@ -4035,9 +4128,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Armenia">
 				<long>
-					<generic>Арменија време</generic>
-					<standard>Арменија стандардно време</standard>
-					<daylight>Арменија летње рачунање времена</daylight>
+					<generic>Јерменија време</generic>
+					<standard>Јерменија стандардно време</standard>
+					<daylight>Јерменија летње рачунање времена</daylight>
 				</long>
 			</metazone>
 			<metazone type="Atlantic">
@@ -4120,9 +4213,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Cape_Verde">
 				<long>
-					<generic>Зелениртско време</generic>
-					<standard>Зелениртско стандардно време</standard>
-					<daylight>Зеленортско летње рачунање времена</daylight>
+					<generic>Зеленортска Острва време</generic>
+					<standard>Зеленортска Острва стандардно време</standard>
+					<daylight>Зеленортска Острва летње рачунање времена</daylight>
 				</long>
 			</metazone>
 			<metazone type="Chamorro">
@@ -4160,7 +4253,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Christmas">
 				<long>
-					<standard>Божићна острва време</standard>
+					<standard>Божићно острво време</standard>
 				</long>
 			</metazone>
 			<metazone type="Cocos">
@@ -4288,7 +4381,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Gambier">
 				<long>
-					<standard>Гамбијер време</standard>
+					<standard>Гамбије време</standard>
 				</long>
 			</metazone>
 			<metazone type="Georgia">
@@ -4467,7 +4560,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Line_Islands">
 				<long>
-					<standard>Лине Острва време</standard>
+					<standard>Острва Лајн време</standard>
 				</long>
 			</metazone>
 			<metazone type="Lord_Howe">
@@ -4486,7 +4579,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Macquarie">
 				<long>
-					<standard draft="contributed">Макверијско време</standard>
+					<standard>Острво Маквери време</standard>
 				</long>
 			</metazone>
 			<metazone type="Magadan">
@@ -4685,7 +4778,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Ponape">
 				<long>
-					<standard>Понпеи време</standard>
+					<standard>Понпеј време</standard>
 				</long>
 			</metazone>
 			<metazone type="Qyzylorda">
@@ -4748,7 +4841,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Suriname">
 				<long>
-					<standard draft="contributed">Суринам</standard>
+					<standard>Суринам време</standard>
 				</long>
 			</metazone>
 			<metazone type="Syowa">
@@ -4891,7 +4984,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<perMille>‰</perMille>
 			<infinity>∞</infinity>
 			<nan>NaN</nan>
-			<timeSeparator draft="contributed">:</timeSeparator>
+			<timeSeparator>.</timeSeparator>
 		</symbols>
 		<decimalFormats numberSystem="latn">
 			<decimalFormatLength>
@@ -5003,6 +5096,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0 хиљ'.' ¤</pattern>
+					<pattern type="1000" count="few" draft="provisional">0 хиљ'.' ¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0 хиљ'.' ¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00 хиљ'.' ¤</pattern>
+					<pattern type="10000" count="few" draft="provisional">00 хиљ'.' ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00 хиљ'.' ¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000 хиљ'.' ¤</pattern>
+					<pattern type="100000" count="few" draft="provisional">000 хиљ'.' ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000 хиљ'.' ¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0 мил'.' ¤</pattern>
+					<pattern type="1000000" count="few" draft="provisional">0 мил'.' ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0 мил'.' ¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00 мил'.' ¤</pattern>
+					<pattern type="10000000" count="few" draft="provisional">00 мил'.' ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00 мил'.' ¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000 мил'.' ¤</pattern>
+					<pattern type="100000000" count="few" draft="provisional">000 мил'.' ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000 мил'.' ¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0 млрд'.' ¤</pattern>
+					<pattern type="1000000000" count="few" draft="provisional">0 млрд'.' ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0 млрд'.' ¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00 млрд'.' ¤</pattern>
+					<pattern type="10000000000" count="few" draft="provisional">00 млрд'.' ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00 млрд'.' ¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000 млрд'.' ¤</pattern>
+					<pattern type="100000000000" count="few" draft="provisional">000 млрд'.' ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000 млрд'.' ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0 бил'.' ¤</pattern>
+					<pattern type="1000000000000" count="few" draft="provisional">0 бил'.' ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0 бил'.' ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00 бил'.' ¤</pattern>
+					<pattern type="10000000000000" count="few" draft="provisional">00 бил'.' ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00 бил'.' ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000 бил'.' ¤</pattern>
+					<pattern type="100000000000000" count="few" draft="provisional">000 бил'.' ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000 бил'.' ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="few">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
@@ -5066,6 +5199,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">анголске кванзе</displayName>
 				<displayName count="other">анголских кванзи</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>Анголијска кванза (1977–1990)</displayName>
@@ -5126,7 +5260,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="AUD">
 				<displayName>Аустралијски долар</displayName>
 				<displayName count="one">аустралијски долар</displayName>
-				<displayName count="few">Аустралијска долара</displayName>
+				<displayName count="few">аустралијска долара</displayName>
 				<displayName count="other">аустралијских долара</displayName>
 				<symbol>AUD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
@@ -5163,6 +5297,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">босанско-херцеговачке конвертибилне маркe</displayName>
 				<displayName count="other">босанско-херцеговачких конвертибилних марака</displayName>
 				<symbol>КМ</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BAN">
 				<displayName draft="provisional">Босанско-херцеговачки нови динар</displayName>
@@ -5260,11 +5395,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BOB">
-				<displayName>Боливијски Боливиано</displayName>
-				<displayName count="one">боливијски боливиано</displayName>
-				<displayName count="few">боливијска боливиана</displayName>
-				<displayName count="other">боливијских боливиана</displayName>
+				<displayName>Боливијски боливијано</displayName>
+				<displayName count="one">боливијски боливијано</displayName>
+				<displayName count="few">боливијска боливијана</displayName>
+				<displayName count="other">боливијских боливијана</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOL">
 				<displayName draft="provisional">Стари боливијски боливијано</displayName>
@@ -5355,6 +5491,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">боцванске пуле</displayName>
 				<displayName count="other">боцванских пула</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>Белоруска нова рубља (1994–1999)</displayName>
@@ -5368,6 +5505,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">белоруске рубље</displayName>
 				<displayName count="other">белоруских рубљи</displayName>
 				<symbol draft="contributed">[BYR]</symbol>
+				<symbol alt="narrow" draft="contributed">р.</symbol>
 			</currency>
 			<currency type="BZD">
 				<displayName>Белиски долар</displayName>
@@ -5387,9 +5525,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="CDF">
 				<displayName>Конгоански франак</displayName>
-				<displayName count="one">конголски франак</displayName>
-				<displayName count="few">конголска франка</displayName>
-				<displayName count="other">конголских франака</displayName>
+				<displayName count="one">конгоански франак</displayName>
+				<displayName count="few">конгоанска франка</displayName>
+				<displayName count="other">конгоанских франака</displayName>
 				<symbol>CDF</symbol>
 			</currency>
 			<currency type="CHE">
@@ -5485,6 +5623,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">кубанска конвертибилна пезоса</displayName>
 				<displayName count="other">кубанских конвертибилних пезоса</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>Кубански пезос</displayName>
@@ -5513,6 +5652,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">чешке круне</displayName>
 				<displayName count="other">чешких крунa</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>Источно-немачка марка</displayName>
@@ -5539,6 +5679,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">данске круне</displayName>
 				<displayName count="other">данских круна</displayName>
 				<symbol draft="contributed">DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Доминикански пезос</displayName>
@@ -5579,6 +5720,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">египатске фунте</displayName>
 				<displayName count="other">египатских фунти</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>Eритрејска накфa</displayName>
@@ -5606,10 +5748,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">шпанске пезете</displayName>
 			</currency>
 			<currency type="ETB">
-				<displayName>Етиопијски бир</displayName>
-				<displayName count="one">етиопијски бир</displayName>
-				<displayName count="few">етиопијска бира</displayName>
-				<displayName count="other">етиопијских бира</displayName>
+				<displayName>Етиопски бир</displayName>
+				<displayName count="one">етиопски бир</displayName>
+				<displayName count="few">етиопска бира</displayName>
+				<displayName count="other">етиопских бира</displayName>
 				<symbol>ETB</symbol>
 			</currency>
 			<currency type="EUR">
@@ -5618,6 +5760,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">евра</displayName>
 				<displayName count="other">евра</displayName>
 				<symbol draft="contributed">€</symbol>
+				<symbol alt="narrow" draft="contributed">€</symbol>
 			</currency>
 			<currency type="FIM">
 				<displayName>Финска марка</displayName>
@@ -5639,6 +5782,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">фокландске фунте</displayName>
 				<displayName count="other">фокландских фунти</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>Француски франак</displayName>
@@ -5652,6 +5796,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">британске фунте</displayName>
 				<displayName count="other">британских фунти</displayName>
 				<symbol draft="contributed">£</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GEK">
 				<displayName>Грузијски купон ларит</displayName>
@@ -5665,6 +5810,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">грузијска ларија</displayName>
 				<displayName count="other">грузијских ларија</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">ლ</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>Гански цеди (1979–2007)</displayName>
@@ -5691,7 +5837,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Гамбијски даласи</displayName>
 				<displayName count="one">гамбијски даласи</displayName>
 				<displayName count="few">гамбијска даласа</displayName>
-				<displayName count="other">гамбијских даласа</displayName>
+				<displayName count="other">гамбијских даласија</displayName>
 				<symbol>GMD</symbol>
 			</currency>
 			<currency type="GNF">
@@ -5700,6 +5846,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">гвинејска франка</displayName>
 				<displayName count="other">гвинејских франака</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>Гвинејски сили</displayName>
@@ -5725,6 +5872,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">гватемалска кецала</displayName>
 				<displayName count="other">гватемалских кецала</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>Португалска гвинеја ескудо</displayName>
@@ -5756,10 +5904,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="HNL">
 				<displayName>Хондурашка лемпира</displayName>
-				<displayName count="one">хондурашки лемпир</displayName>
-				<displayName count="few">хондурашка лемпира</displayName>
+				<displayName count="one">хондурашка лемпира</displayName>
+				<displayName count="few">хондурашке лемпире</displayName>
 				<displayName count="other">хондурашких лемпира</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>Хрватски динар</displayName>
@@ -5773,6 +5922,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">хрватске куне</displayName>
 				<displayName count="other">хрватских куна</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>Хаићански гурд</displayName>
@@ -5787,6 +5937,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">мађарске форинте</displayName>
 				<displayName count="other">мађарских форинти</displayName>
 				<symbol draft="contributed">HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>Индонежанска рупија</displayName>
@@ -5794,6 +5945,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">индонежанске рупије</displayName>
 				<displayName count="other">индонежанских рупијa</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>Ирска фунта</displayName>
@@ -5855,6 +6007,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">исландске круне</displayName>
 				<displayName count="other">исландских круна</displayName>
 				<symbol draft="contributed">ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>Италијанска лира</displayName>
@@ -5864,9 +6017,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="JMD">
 				<displayName>Јамајчански долар</displayName>
-				<displayName count="one">jамајкански долар</displayName>
-				<displayName count="few">jамајканскa доларa</displayName>
-				<displayName count="other">jамајканскиx доларa</displayName>
+				<displayName count="one">jамајчански долар</displayName>
+				<displayName count="few">jамајчанска долара</displayName>
+				<displayName count="other">jамајчанскиx долара</displayName>
 				<symbol>JMD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -5913,6 +6066,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">коморскa франкa</displayName>
 				<displayName count="other">коморских франакa</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>Севернокорејски вон</displayName>
@@ -5920,6 +6074,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">севернокорејска вона</displayName>
 				<displayName count="other">севернокорејских вона</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRH">
 				<displayName draft="provisional">Јужнокорејски хван</displayName>
@@ -5959,8 +6114,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="KZT">
 				<displayName>Казахстански тенге</displayName>
 				<displayName count="one">казахстански тенге</displayName>
-				<displayName count="few">казахстанске тенге</displayName>
-				<displayName count="other">казахстанских тенги</displayName>
+				<displayName count="few">казахстанска тенгеа</displayName>
+				<displayName count="other">казахстанских тенгеа</displayName>
 				<symbol>KZT</symbol>
 				<symbol alt="narrow" draft="contributed">₸</symbol>
 			</currency>
@@ -5978,6 +6133,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">либанскe фунтe</displayName>
 				<displayName count="other">либанских фунти</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>Шриланканскa рупиja</displayName>
@@ -5985,6 +6141,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">шриланканскe рупијe</displayName>
 				<displayName count="other">шриланканских рупија</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>Либеријски долар</displayName>
@@ -6053,8 +6210,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="MAD">
 				<displayName>Марокански дирхам</displayName>
-				<displayName count="one">мароканска дирхама</displayName>
-				<displayName count="few">мароканске дирхаме</displayName>
+				<displayName count="one">марокански дирхам</displayName>
+				<displayName count="few">мароканска дирхама</displayName>
 				<displayName count="other">мароканских дирхама</displayName>
 				<symbol>MAD</symbol>
 			</currency>
@@ -6084,11 +6241,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>MDL</symbol>
 			</currency>
 			<currency type="MGA">
-				<displayName>Малагасијски ариари</displayName>
+				<displayName>Мадагаскарски ариари</displayName>
 				<displayName count="one">малагасијски ариари</displayName>
 				<displayName count="few">малагасијскa ариариja</displayName>
 				<displayName count="other">малагасијских ариариja</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>Малагасијски франак</displayName>
@@ -6121,6 +6279,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">мјанмарскa кјатa</displayName>
 				<displayName count="other">мјанмарских кјатa</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>Монголски тугрик</displayName>
@@ -6131,10 +6290,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">₮</symbol>
 			</currency>
 			<currency type="MOP">
-				<displayName>Маканишка патака</displayName>
-				<displayName count="one">маканешка патака</displayName>
-				<displayName count="few">маканешке патаке</displayName>
-				<displayName count="other">маканешких патака</displayName>
+				<displayName>Макаоска патака</displayName>
+				<displayName count="one">макаоска патака</displayName>
+				<displayName count="few">макаоске патаке</displayName>
+				<displayName count="other">макаоских патака</displayName>
 				<symbol>MOP</symbol>
 			</currency>
 			<currency type="MRO">
@@ -6162,6 +6321,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">маурицијскe рупијe</displayName>
 				<displayName count="other">маурицијских рупија</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>Малдивска руфија</displayName>
@@ -6198,11 +6358,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">мексичких унидадс де инверзиона</displayName>
 			</currency>
 			<currency type="MYR">
-				<displayName>Малезијски ринггит</displayName>
-				<displayName count="one">малезијски ринггит</displayName>
-				<displayName count="few">малезијска ринггита</displayName>
-				<displayName count="other">малезијских ринггита</displayName>
+				<displayName>Малезијски рингит</displayName>
+				<displayName count="one">малезијски рингит</displayName>
+				<displayName count="few">малезијска рингита</displayName>
+				<displayName count="other">малезијских рингита</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>Мозамбијски ескудо</displayName>
@@ -6217,10 +6378,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">старих мозамбијских метикала</displayName>
 			</currency>
 			<currency type="MZN">
-				<displayName>Мозамбијски метикал</displayName>
-				<displayName count="one">мозамбијски метикал</displayName>
-				<displayName count="few">мозамбијска метикала</displayName>
-				<displayName count="other">мозамбијских метикала</displayName>
+				<displayName>Мозамбички метикал</displayName>
+				<displayName count="one">мозамбички метикал</displayName>
+				<displayName count="few">мозамбичка метикала</displayName>
+				<displayName count="other">мозамбичких метикала</displayName>
 				<symbol>MZN</symbol>
 			</currency>
 			<currency type="NAD">
@@ -6251,6 +6412,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">никарагванске златне кордобе</displayName>
 				<displayName count="other">никарагванских златних кордоба</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>Холандски гулден</displayName>
@@ -6264,6 +6426,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">норвешке круне</displayName>
 				<displayName count="other">норвешких круна</displayName>
 				<symbol draft="contributed">NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>Непалскa рупиja</displayName>
@@ -6271,6 +6434,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">непалске рупије</displayName>
 				<displayName count="other">непалских рупија</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>Новозеландски долар</displayName>
@@ -6301,10 +6465,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">перувијских интија</displayName>
 			</currency>
 			<currency type="PEN">
-				<displayName>Перуански нуево сол</displayName>
-				<displayName count="one">перуански нуево сол</displayName>
-				<displayName count="few">перуанска нуево сола</displayName>
-				<displayName count="other">перуанских нуево сола</displayName>
+				<displayName>Перуански нови сол</displayName>
+				<displayName count="one">перуански нови сол</displayName>
+				<displayName count="few">перуанска нова сола</displayName>
+				<displayName count="other">перуанских нових сола</displayName>
 				<symbol>PEN</symbol>
 			</currency>
 			<currency type="PES">
@@ -6334,6 +6498,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">пакистанске рупије</displayName>
 				<displayName count="other">пакистанских рупија</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>Пољски злот</displayName>
@@ -6341,6 +6506,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">пољска злота</displayName>
 				<displayName count="other">пољских злота</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>Пољски злоти (1950–1995)</displayName>
@@ -6401,6 +6567,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">руске рубље</displayName>
 				<displayName count="other">руских рубљи</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">руб</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>Руска рубља (1991–1998)</displayName>
@@ -6414,6 +6581,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">руандскa франка</displayName>
 				<displayName count="other">руандских франака</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>Саудијски ријал</displayName>
@@ -6462,6 +6630,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">шведске круне</displayName>
 				<displayName count="other">шведских круна</displayName>
 				<symbol draft="contributed">SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>Сингапурски долар</displayName>
@@ -6477,6 +6646,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">св. јеленске фунте</displayName>
 				<displayName count="other">св. јеленских фунти</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>Словеначки толар</displayName>
@@ -6491,7 +6661,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">словачких круна</displayName>
 			</currency>
 			<currency type="SLL">
-				<displayName>Сијера-леоншки леоне</displayName>
+				<displayName>Сијералеонски леоне</displayName>
 				<displayName count="one">сијералеонски леоне</displayName>
 				<displayName count="few">сијералеонска леона</displayName>
 				<displayName count="other">сијералеонских леона</displayName>
@@ -6527,11 +6697,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="STD">
-				<displayName>Сао Томе и Принципе добра</displayName>
-				<displayName count="one">сао томе и принципе добар</displayName>
-				<displayName count="few">сао томе и принципе добра</displayName>
-				<displayName count="other">сао томе и принципе добра</displayName>
+				<displayName>Саотомска добра</displayName>
+				<displayName count="one">саотомска добра</displayName>
+				<displayName count="few">саотомске добре</displayName>
+				<displayName count="other">саотомских добри</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>Совјетска рубља</displayName>
@@ -6551,12 +6722,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">сиријске фунте</displayName>
 				<displayName count="other">сиријских фунти</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
-				<displayName>Свази лилангени</displayName>
-				<displayName count="one">свази емаланген</displayName>
-				<displayName count="few">свази емалангена</displayName>
-				<displayName count="other">свази емалангена</displayName>
+				<displayName>Свазилендски лилангени</displayName>
+				<displayName count="one">свазилендски лилангени</displayName>
+				<displayName count="few">свазилендска лилангенија</displayName>
+				<displayName count="other">свазилендских лилангенија</displayName>
 				<symbol draft="contributed">SZL</symbol>
 			</currency>
 			<currency type="THB">
@@ -6565,6 +6737,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">тајландска бата</displayName>
 				<displayName count="other">тајландских бата</displayName>
 				<symbol>THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>Таџихистанска рубља</displayName>
@@ -6600,10 +6773,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>TND</symbol>
 			</currency>
 			<currency type="TOP">
-				<displayName>Тонгоншка Панга</displayName>
-				<displayName count="one">тонгашка панга</displayName>
-				<displayName count="few">тонгашке панге</displayName>
-				<displayName count="other">тонгашких панга</displayName>
+				<displayName>Тонганска панга</displayName>
+				<displayName count="one">тонганска панга</displayName>
+				<displayName count="few">тонганске панге</displayName>
+				<displayName count="other">тонганских панги</displayName>
 				<symbol>TOP</symbol>
 			</currency>
 			<currency type="TPE">
@@ -6625,6 +6798,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">турских лира</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Тринидад-тобагошки долар</displayName>
@@ -6650,10 +6824,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>TZS</symbol>
 			</currency>
 			<currency type="UAH">
-				<displayName>Украјинска гривна</displayName>
+				<displayName>Украјинска хривња</displayName>
 				<displayName count="one">украјинскa хривњa</displayName>
 				<displayName count="few">украјинскe хривњe</displayName>
-				<displayName count="other">украјинских гривни</displayName>
+				<displayName count="other">украјинских хривњи</displayName>
 				<symbol>UAH</symbol>
 				<symbol alt="narrow" draft="contributed">₴</symbol>
 			</currency>
@@ -6735,6 +6909,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">венецуеланска боливара</displayName>
 				<displayName count="other">венецуеланских боливара</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>Вијетнамски донг</displayName>
@@ -6810,9 +6985,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="XCD">
 				<displayName>Источнокарипски долар</displayName>
 				<displayName count="one">источнокарипски долар</displayName>
-				<displayName count="few">источно-карипскa доларa</displayName>
-				<displayName count="other">источно-карипскиx доларa</displayName>
+				<displayName count="few">источнокарипскa доларa</displayName>
+				<displayName count="other">источнокарипскиx доларa</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>Посебна цртаћа права</displayName>
@@ -6877,10 +7053,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">кодова тестиране валуте</displayName>
 			</currency>
 			<currency type="XXX">
-				<displayName>Непозната или неважећа валута</displayName>
-				<displayName count="one">непозната или неважећа валута</displayName>
-				<displayName count="few">непознате или неважеће валуте</displayName>
-				<displayName count="other">непознатих или неважећих валута</displayName>
+				<displayName>Непозната валута</displayName>
+				<displayName count="one">непозната јединица валуте</displayName>
+				<displayName count="few">непознате валуте</displayName>
+				<displayName count="other">непознатих валута</displayName>
 			</currency>
 			<currency type="YDD">
 				<displayName>Јеменски динар</displayName>
@@ -6926,11 +7102,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">јужноафричких ранда (финансијских)</displayName>
 			</currency>
 			<currency type="ZAR">
-				<displayName>Јужно-афрички ранд</displayName>
-				<displayName count="one">јужно-афрички ранд</displayName>
-				<displayName count="few">јужно-афричка ранда</displayName>
-				<displayName count="other">јужно-афричких ранда</displayName>
+				<displayName>Јужноафрички ранд</displayName>
+				<displayName count="one">јужноафрички ранд</displayName>
+				<displayName count="few">јужноафричка ранда</displayName>
+				<displayName count="other">јужноафричких ранда</displayName>
 				<symbol draft="contributed">ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>Замбијска квача (1968–2012)</displayName>
@@ -6944,6 +7121,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">замбијске кваче</displayName>
 				<displayName count="other">замбијских квача</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>Заирски нови заир</displayName>
@@ -6984,7 +7162,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 	<units>
 		<unitLength type="long">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>ге сила</displayName>
@@ -6998,23 +7176,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} метра у секунди на квадрат</unitPattern>
 				<unitPattern count="other">{0} метара у секунди на квадрат</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName>минути</displayName>
-				<unitPattern count="one">{0} минут</unitPattern>
-				<unitPattern count="few">{0} минута</unitPattern>
-				<unitPattern count="other">{0} минута</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName>секунде</displayName>
-				<unitPattern count="one">{0} секунда</unitPattern>
-				<unitPattern count="few">{0} секунде</unitPattern>
-				<unitPattern count="other">{0} секунди</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName>степени</displayName>
-				<unitPattern count="one">{0} степен</unitPattern>
-				<unitPattern count="few">{0} степена</unitPattern>
-				<unitPattern count="other">{0} степени</unitPattern>
+			<unit type="angle-revolution">
+				<displayName>обртај</displayName>
+				<unitPattern count="one">{0} обртај</unitPattern>
+				<unitPattern count="few">{0} обртаја</unitPattern>
+				<unitPattern count="other">{0} обртаја</unitPattern>
 			</unit>
 			<unit type="angle-radian">
 				<displayName>радијани</displayName>
@@ -7022,11 +7188,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} радијана</unitPattern>
 				<unitPattern count="other">{0} радијана</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName>акери</displayName>
-				<unitPattern count="one">{0} акер</unitPattern>
-				<unitPattern count="few">{0} акера</unitPattern>
-				<unitPattern count="other">{0} акера</unitPattern>
+			<unit type="angle-degree">
+				<displayName>степени</displayName>
+				<unitPattern count="one">{0} степен</unitPattern>
+				<unitPattern count="few">{0} степена</unitPattern>
+				<unitPattern count="other">{0} степени</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>лучни минути</displayName>
+				<unitPattern count="one">{0} лучни минут</unitPattern>
+				<unitPattern count="few">{0} лучна минута</unitPattern>
+				<unitPattern count="other">{0} лучних минута</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>лучне секунде</displayName>
+				<unitPattern count="one">{0} лучна секунда</unitPattern>
+				<unitPattern count="few">{0} лучне секунде</unitPattern>
+				<unitPattern count="other">{0} лучних секунди</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>квадратни километри</displayName>
+				<unitPattern count="one">{0} квадратни километар</unitPattern>
+				<unitPattern count="few">{0} квадратна километра</unitPattern>
+				<unitPattern count="other">{0} квадратних километара</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>хектари</displayName>
@@ -7034,11 +7218,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} хектара</unitPattern>
 				<unitPattern count="other">{0} хектара</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>квадратни метри</displayName>
+				<unitPattern count="one">{0} квадратни метар</unitPattern>
+				<unitPattern count="few">{0} квадратна метра</unitPattern>
+				<unitPattern count="other">{0} квадратних метара</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>квадратни центиметри</displayName>
 				<unitPattern count="one">{0} квадратни центиметар</unitPattern>
 				<unitPattern count="few">{0} квадратна центиметра</unitPattern>
 				<unitPattern count="other">{0} квадратних центиметара</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>квадратне миље</displayName>
+				<unitPattern count="one">{0} квадратна миља</unitPattern>
+				<unitPattern count="few">{0} квадратне миље</unitPattern>
+				<unitPattern count="other">{0} квадратних миља</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>акери</displayName>
+				<unitPattern count="one">{0} акер</unitPattern>
+				<unitPattern count="few">{0} акера</unitPattern>
+				<unitPattern count="other">{0} акера</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>квадратни јарди</displayName>
+				<unitPattern count="one">{0} квадратни јард</unitPattern>
+				<unitPattern count="few">{0} квадратна јарда</unitPattern>
+				<unitPattern count="other">{0} квадратних јарди</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>квадратне стопе</displayName>
@@ -7051,30 +7261,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} квадратни инч</unitPattern>
 				<unitPattern count="few">{0} квадратна инча</unitPattern>
 				<unitPattern count="other">{0} квадратних инча</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>квадратни километри</displayName>
-				<unitPattern count="one">{0} квадратни километар</unitPattern>
-				<unitPattern count="few">{0} квадратна километра</unitPattern>
-				<unitPattern count="other">{0} квадратних километара</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>квадратни метри</displayName>
-				<unitPattern count="one">{0} квадратни метар</unitPattern>
-				<unitPattern count="few">{0} квадратна метра</unitPattern>
-				<unitPattern count="other">{0} квадратних метара</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>квадратне миље</displayName>
-				<unitPattern count="one">{0} квадратна миља</unitPattern>
-				<unitPattern count="few">{0} квадратне миље</unitPattern>
-				<unitPattern count="other">{0} квадратних миља</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>квадратни јарди</displayName>
-				<unitPattern count="one">{0} квадратни јард</unitPattern>
-				<unitPattern count="few">{0} квадратна јарда</unitPattern>
-				<unitPattern count="other">{0} квадратних јарди</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>карати</displayName>
+				<unitPattern count="one">{0} карат</unitPattern>
+				<unitPattern count="few">{0} карата</unitPattern>
+				<unitPattern count="other">{0} карата</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>литри по километру</displayName>
@@ -7082,90 +7275,132 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} литра по километру</unitPattern>
 				<unitPattern count="other">{0} литара по километру</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} литар на 100 километара</unitPattern>
+				<unitPattern count="few">{0} литра на 100 километара</unitPattern>
+				<unitPattern count="other">{0} литара на 100 километара</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>миља по галону</displayName>
 				<unitPattern count="one">{0} миља по галону</unitPattern>
 				<unitPattern count="few">{0} миље по галону</unitPattern>
 				<unitPattern count="other">{0} миља по галону</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>битови</displayName>
-				<unitPattern count="one">{0} бит</unitPattern>
-				<unitPattern count="few">{0} бита</unitPattern>
-				<unitPattern count="other">{0} битова</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>бајтови</displayName>
-				<unitPattern count="one">{0} бајт</unitPattern>
-				<unitPattern count="few">{0} бајта</unitPattern>
-				<unitPattern count="other">{0} бајтова</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>гигабитови</displayName>
-				<unitPattern count="one">{0} гигабит</unitPattern>
-				<unitPattern count="few">{0} гигабита</unitPattern>
-				<unitPattern count="other">{0} гигабита</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>гигабајти</displayName>
-				<unitPattern count="one">{0} гигабајт</unitPattern>
-				<unitPattern count="few">{0} гигабајта</unitPattern>
-				<unitPattern count="other">{0} гигабајта</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>килобитови</displayName>
-				<unitPattern count="one">{0} килобит</unitPattern>
-				<unitPattern count="few">{0} килобита</unitPattern>
-				<unitPattern count="other">{0} килобита</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>килобајти</displayName>
-				<unitPattern count="one">{0} килобајт</unitPattern>
-				<unitPattern count="few">{0} килобајта</unitPattern>
-				<unitPattern count="other">{0} килобајта</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>мегабитови</displayName>
-				<unitPattern count="one">{0} мегабит</unitPattern>
-				<unitPattern count="few">{0} мегабита</unitPattern>
-				<unitPattern count="other">{0} мегабита</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>мегабајти</displayName>
-				<unitPattern count="one">{0} мегабајт</unitPattern>
-				<unitPattern count="few">{0} мегабајта</unitPattern>
-				<unitPattern count="other">{0} мегабајта</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>терабитови</displayName>
-				<unitPattern count="one">{0} терабит</unitPattern>
-				<unitPattern count="few">{0} терабита</unitPattern>
-				<unitPattern count="other">{0} терабита</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>терабајти</displayName>
 				<unitPattern count="one">{0} терабајт</unitPattern>
 				<unitPattern count="few">{0} терабајта</unitPattern>
 				<unitPattern count="other">{0} терабајта</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>терабитови</displayName>
+				<unitPattern count="one">{0} терабит</unitPattern>
+				<unitPattern count="few">{0} терабита</unitPattern>
+				<unitPattern count="other">{0} терабита</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>гигабајти</displayName>
+				<unitPattern count="one">{0} гигабајт</unitPattern>
+				<unitPattern count="few">{0} гигабајта</unitPattern>
+				<unitPattern count="other">{0} гигабајта</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>гигабитови</displayName>
+				<unitPattern count="one">{0} гигабит</unitPattern>
+				<unitPattern count="few">{0} гигабита</unitPattern>
+				<unitPattern count="other">{0} гигабита</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>мегабајти</displayName>
+				<unitPattern count="one">{0} мегабајт</unitPattern>
+				<unitPattern count="few">{0} мегабајта</unitPattern>
+				<unitPattern count="other">{0} мегабајта</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>мегабитови</displayName>
+				<unitPattern count="one">{0} мегабит</unitPattern>
+				<unitPattern count="few">{0} мегабита</unitPattern>
+				<unitPattern count="other">{0} мегабита</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>килобајти</displayName>
+				<unitPattern count="one">{0} килобајт</unitPattern>
+				<unitPattern count="few">{0} килобајта</unitPattern>
+				<unitPattern count="other">{0} килобајта</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>килобитови</displayName>
+				<unitPattern count="one">{0} килобит</unitPattern>
+				<unitPattern count="few">{0} килобита</unitPattern>
+				<unitPattern count="other">{0} килобита</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>бајтови</displayName>
+				<unitPattern count="one">{0} бајт</unitPattern>
+				<unitPattern count="few">{0} бајта</unitPattern>
+				<unitPattern count="other">{0} бајтова</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>битови</displayName>
+				<unitPattern count="one">{0} бит</unitPattern>
+				<unitPattern count="few">{0} бита</unitPattern>
+				<unitPattern count="other">{0} битова</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>векови</displayName>
+				<unitPattern count="one">{0} век</unitPattern>
+				<unitPattern count="few">{0} века</unitPattern>
+				<unitPattern count="other">{0} векова</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>године</displayName>
+				<unitPattern count="one">{0} година</unitPattern>
+				<unitPattern count="few">{0} године</unitPattern>
+				<unitPattern count="other">{0} година</unitPattern>
+				<perUnitPattern>{0} годишње</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>месеци</displayName>
+				<unitPattern count="one">{0} месец</unitPattern>
+				<unitPattern count="few">{0} месеца</unitPattern>
+				<unitPattern count="other">{0} месеци</unitPattern>
+				<perUnitPattern>{0} месечно</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>недеље</displayName>
+				<unitPattern count="one">{0} недеља</unitPattern>
+				<unitPattern count="few">{0} недеље</unitPattern>
+				<unitPattern count="other">{0} недеља</unitPattern>
+				<perUnitPattern>{0} недељно</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>дани</displayName>
 				<unitPattern count="one">{0} дан</unitPattern>
 				<unitPattern count="few">{0} дана</unitPattern>
 				<unitPattern count="other">{0} дана</unitPattern>
+				<perUnitPattern>{0}/дневно</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>сати</displayName>
 				<unitPattern count="one">{0} сат</unitPattern>
 				<unitPattern count="few">{0} сата</unitPattern>
 				<unitPattern count="other">{0} сати</unitPattern>
-				<perUnitPattern draft="contributed">{0}/сат</perUnitPattern>
+				<perUnitPattern>{0}/сат</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>микросекунде</displayName>
-				<unitPattern count="one">{0} микросекунда</unitPattern>
-				<unitPattern count="few">{0} микросекунде</unitPattern>
-				<unitPattern count="other">{0} микросекунди</unitPattern>
+			<unit type="duration-minute">
+				<displayName>минути</displayName>
+				<unitPattern count="one">{0} минут</unitPattern>
+				<unitPattern count="few">{0} минута</unitPattern>
+				<unitPattern count="other">{0} минута</unitPattern>
+				<perUnitPattern>{0} у минуту</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>секунде</displayName>
+				<unitPattern count="one">{0} секунда</unitPattern>
+				<unitPattern count="few">{0} секунде</unitPattern>
+				<unitPattern count="other">{0} секунди</unitPattern>
+				<perUnitPattern>{0}/сек</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>милисекунде</displayName>
@@ -7173,17 +7408,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} милисекунде</unitPattern>
 				<unitPattern count="other">{0} милисекунди</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName draft="contributed">минути</displayName>
-				<unitPattern count="one">{0} минут</unitPattern>
-				<unitPattern count="few">{0} минута</unitPattern>
-				<unitPattern count="other">{0} минута</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>месеци</displayName>
-				<unitPattern count="one">{0} месец</unitPattern>
-				<unitPattern count="few">{0} месеца</unitPattern>
-				<unitPattern count="other">{0} месеци</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>микросекунде</displayName>
+				<unitPattern count="one">{0} микросекунда</unitPattern>
+				<unitPattern count="few">{0} микросекунде</unitPattern>
+				<unitPattern count="other">{0} микросекунди</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>наносекунде</displayName>
@@ -7191,25 +7420,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} наносекунде</unitPattern>
 				<unitPattern count="other">{0} наносекунди</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName draft="contributed">секунде</displayName>
-				<unitPattern count="one">{0} секунда</unitPattern>
-				<unitPattern count="few">{0} секунде</unitPattern>
-				<unitPattern count="other">{0} секунди</unitPattern>
-				<perUnitPattern draft="contributed">{0}/сек</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>недеље</displayName>
-				<unitPattern count="one">{0} недеља</unitPattern>
-				<unitPattern count="few">{0} недеље</unitPattern>
-				<unitPattern count="other">{0} недеља</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>године</displayName>
-				<unitPattern count="one">{0} година</unitPattern>
-				<unitPattern count="few">{0} године</unitPattern>
-				<unitPattern count="other">{0} година</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>ампери</displayName>
 				<unitPattern count="one">{0} ампер</unitPattern>
@@ -7234,6 +7444,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} волта</unitPattern>
 				<unitPattern count="other">{0} волти</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>килокалорије</displayName>
+				<unitPattern count="one">{0} килокалорија</unitPattern>
+				<unitPattern count="few">{0} килокалорије</unitPattern>
+				<unitPattern count="other">{0} килокалорија</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>калорије</displayName>
 				<unitPattern count="one">{0} калорија</unitPattern>
@@ -7246,24 +7462,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} калорије</unitPattern>
 				<unitPattern count="other">{0} калорија</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>џули</displayName>
-				<unitPattern count="one">{0} џул</unitPattern>
-				<unitPattern count="few">{0} џула</unitPattern>
-				<unitPattern count="other">{0} џула</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>килокалорије</displayName>
-				<unitPattern count="one">{0} килокалорија</unitPattern>
-				<unitPattern count="few">{0} килокалорије</unitPattern>
-				<unitPattern count="other">{0} килокалорија</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>килоџули</displayName>
 				<unitPattern count="one">{0} килоџул</unitPattern>
 				<unitPattern count="few">{0} килоџула</unitPattern>
 				<unitPattern count="other">{0} килоџула</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>џули</displayName>
+				<unitPattern count="one">{0} џул</unitPattern>
+				<unitPattern count="few">{0} џула</unitPattern>
+				<unitPattern count="other">{0} џула</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>киловат-сати</displayName>
 				<unitPattern count="one">{0} киловат-сат</unitPattern>
@@ -7276,11 +7486,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} гигахерца</unitPattern>
 				<unitPattern count="other">{0} гигахерца</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>херци</displayName>
-				<unitPattern count="one">{0} херц</unitPattern>
-				<unitPattern count="few">{0} херца</unitPattern>
-				<unitPattern count="other">{0} херца</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>мегахерци</displayName>
+				<unitPattern count="one">{0} мегахерц</unitPattern>
+				<unitPattern count="few">{0} мегахерца</unitPattern>
+				<unitPattern count="other">{0} мегахерца</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>килохерци</displayName>
@@ -7288,23 +7498,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} килохерца</unitPattern>
 				<unitPattern count="other">{0} килохерца</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>мегахерци</displayName>
-				<unitPattern count="one">{0} мегахерц</unitPattern>
-				<unitPattern count="few">{0} мегахерца</unitPattern>
-				<unitPattern count="other">{0} мегахерца</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>херци</displayName>
+				<unitPattern count="one">{0} херц</unitPattern>
+				<unitPattern count="few">{0} херца</unitPattern>
+				<unitPattern count="other">{0} херца</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>астрономске јединице</displayName>
-				<unitPattern count="one">{0} астрономска јединица</unitPattern>
-				<unitPattern count="few">{0} астрономске јединице</unitPattern>
-				<unitPattern count="other">{0} астрономских јединица</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>километри</displayName>
+				<unitPattern count="one">{0} километар</unitPattern>
+				<unitPattern count="few">{0} километра</unitPattern>
+				<unitPattern count="other">{0} километара</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>центиметри</displayName>
-				<unitPattern count="one">{0} центиметар</unitPattern>
-				<unitPattern count="few">{0} центиментра</unitPattern>
-				<unitPattern count="other">{0} центиметара</unitPattern>
+			<unit type="length-meter">
+				<displayName>метри</displayName>
+				<unitPattern count="one">{0} метар</unitPattern>
+				<unitPattern count="few">{0} метра</unitPattern>
+				<unitPattern count="other">{0} метара</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>дециметри</displayName>
@@ -7312,47 +7524,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} дециметра</unitPattern>
 				<unitPattern count="other">{0} дециметара</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>стопе</displayName>
-				<unitPattern count="one">{0} стопа</unitPattern>
-				<unitPattern count="few">{0} стопе</unitPattern>
-				<unitPattern count="other">{0} стопа</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>инчи</displayName>
-				<unitPattern count="one">{0} инч</unitPattern>
-				<unitPattern count="few">{0} инча</unitPattern>
-				<unitPattern count="other">{0} инча</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>километри</displayName>
-				<unitPattern count="one">{0} километар</unitPattern>
-				<unitPattern count="few">{0} километра</unitPattern>
-				<unitPattern count="other">{0} километара</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>светлосне године</displayName>
-				<unitPattern count="one">{0} светлосна година</unitPattern>
-				<unitPattern count="few">{0} светлосне године</unitPattern>
-				<unitPattern count="other">{0} светлосних година</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>метри</displayName>
-				<unitPattern count="one">{0} метар</unitPattern>
-				<unitPattern count="few">{0} метра</unitPattern>
-				<unitPattern count="other">{0} метара</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>микрометри</displayName>
-				<unitPattern count="one">{0} микрометар</unitPattern>
-				<unitPattern count="few">{0} микрометра</unitPattern>
-				<unitPattern count="other">{0} микрометара</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>миље</displayName>
-				<unitPattern count="one">{0} миља</unitPattern>
-				<unitPattern count="few">{0} миље</unitPattern>
-				<unitPattern count="other">{0} миља</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>центиметри</displayName>
+				<unitPattern count="one">{0} центиметар</unitPattern>
+				<unitPattern count="few">{0} центиментра</unitPattern>
+				<unitPattern count="other">{0} центиметара</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>милиметри</displayName>
@@ -7360,71 +7537,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} милиметра</unitPattern>
 				<unitPattern count="other">{0} милиметара</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>микрометри</displayName>
+				<unitPattern count="one">{0} микрометар</unitPattern>
+				<unitPattern count="few">{0} микрометра</unitPattern>
+				<unitPattern count="other">{0} микрометара</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>нанометри</displayName>
 				<unitPattern count="one">{0} нанометар</unitPattern>
 				<unitPattern count="few">{0} нанометра</unitPattern>
 				<unitPattern count="other">{0} нанометара</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>наутичке миље</displayName>
-				<unitPattern count="one">{0} наутичка миља</unitPattern>
-				<unitPattern count="few">{0} наутичке миље</unitPattern>
-				<unitPattern count="other">{0} наутичких миља</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>парсеци</displayName>
-				<unitPattern count="one">{0} парсек</unitPattern>
-				<unitPattern count="few">{0} парсека</unitPattern>
-				<unitPattern count="other">{0} парсека</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>пикометри</displayName>
 				<unitPattern count="one">{0} пикометар</unitPattern>
 				<unitPattern count="few">{0} пикометра</unitPattern>
 				<unitPattern count="other">{0} пикометара</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>миље</displayName>
+				<unitPattern count="one">{0} миља</unitPattern>
+				<unitPattern count="few">{0} миље</unitPattern>
+				<unitPattern count="other">{0} миља</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>јарди</displayName>
 				<unitPattern count="one">{0} јард</unitPattern>
 				<unitPattern count="few">{0} јарда</unitPattern>
 				<unitPattern count="other">{0} јарди</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>стопе</displayName>
+				<unitPattern count="one">{0} стопа</unitPattern>
+				<unitPattern count="few">{0} стопе</unitPattern>
+				<unitPattern count="other">{0} стопа</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>инчи</displayName>
+				<unitPattern count="one">{0} инч</unitPattern>
+				<unitPattern count="few">{0} инча</unitPattern>
+				<unitPattern count="other">{0} инча</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>парсеци</displayName>
+				<unitPattern count="one">{0} парсек</unitPattern>
+				<unitPattern count="few">{0} парсека</unitPattern>
+				<unitPattern count="other">{0} парсека</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>светлосне године</displayName>
+				<unitPattern count="one">{0} светлосна година</unitPattern>
+				<unitPattern count="few">{0} светлосне године</unitPattern>
+				<unitPattern count="other">{0} светлосних година</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>астрономске јединице</displayName>
+				<unitPattern count="one">{0} астрономска јединица</unitPattern>
+				<unitPattern count="few">{0} астрономске јединице</unitPattern>
+				<unitPattern count="other">{0} астрономских јединица</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>наутичке миље</displayName>
+				<unitPattern count="one">{0} наутичка миља</unitPattern>
+				<unitPattern count="few">{0} наутичке миље</unitPattern>
+				<unitPattern count="other">{0} наутичких миља</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>скандинавска миља</displayName>
+				<unitPattern count="one" draft="provisional">{0} smi</unitPattern>
+				<unitPattern count="few" draft="provisional">{0} smi</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>лукс</displayName>
 				<unitPattern count="one">{0} лукс</unitPattern>
 				<unitPattern count="few">{0} лукса</unitPattern>
 				<unitPattern count="other">{0} лукса</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>карати</displayName>
-				<unitPattern count="one">{0} карат</unitPattern>
-				<unitPattern count="few">{0} карата</unitPattern>
-				<unitPattern count="other">{0} карата</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>грами</displayName>
-				<unitPattern count="one">{0} грам</unitPattern>
-				<unitPattern count="few">{0} грама</unitPattern>
-				<unitPattern count="other">{0} грама</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>килограми</displayName>
-				<unitPattern count="one">{0} килограм</unitPattern>
-				<unitPattern count="few">{0} килограма</unitPattern>
-				<unitPattern count="other">{0} килограма</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>метричке тоне</displayName>
 				<unitPattern count="one">{0} метричка тона</unitPattern>
 				<unitPattern count="few">{0} метричке тоне</unitPattern>
 				<unitPattern count="other">{0} метричких тона</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>микрограми</displayName>
-				<unitPattern count="one">{0} микрограм</unitPattern>
-				<unitPattern count="few">{0} микрограма</unitPattern>
-				<unitPattern count="other">{0} микрограма</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>килограми</displayName>
+				<unitPattern count="one">{0} килограм</unitPattern>
+				<unitPattern count="few">{0} килограма</unitPattern>
+				<unitPattern count="other">{0} килограма</unitPattern>
+				<perUnitPattern>{0} по килограму</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>грами</displayName>
+				<unitPattern count="one">{0} грам</unitPattern>
+				<unitPattern count="few">{0} грама</unitPattern>
+				<unitPattern count="other">{0} грама</unitPattern>
+				<perUnitPattern>{0} по граму</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>милиграми</displayName>
@@ -7432,23 +7643,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} милиграма</unitPattern>
 				<unitPattern count="other">{0} милиграма</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>унце</displayName>
-				<unitPattern count="one">{0} унца</unitPattern>
-				<unitPattern count="few">{0} унце</unitPattern>
-				<unitPattern count="other">{0} унци</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>фине унце</displayName>
-				<unitPattern count="one">{0} фина унца</unitPattern>
-				<unitPattern count="few">{0} фине унце</unitPattern>
-				<unitPattern count="other">{0} финих унци</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>фунте</displayName>
-				<unitPattern count="one">{0} фунта</unitPattern>
-				<unitPattern count="few">{0} фунте</unitPattern>
-				<unitPattern count="other">{0} фунти</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>микрограми</displayName>
+				<unitPattern count="one">{0} микрограм</unitPattern>
+				<unitPattern count="few">{0} микрограма</unitPattern>
+				<unitPattern count="other">{0} микрограма</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>тоне</displayName>
@@ -7456,35 +7655,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} тоне</unitPattern>
 				<unitPattern count="other">{0} тона</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>фунте</displayName>
+				<unitPattern count="one">{0} фунта</unitPattern>
+				<unitPattern count="few">{0} фунте</unitPattern>
+				<unitPattern count="other">{0} фунти</unitPattern>
+				<perUnitPattern>{0} по фунти</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>унце</displayName>
+				<unitPattern count="one">{0} унца</unitPattern>
+				<unitPattern count="few">{0} унце</unitPattern>
+				<unitPattern count="other">{0} унци</unitPattern>
+				<perUnitPattern>{0} по унци</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>фине унце</displayName>
+				<unitPattern count="one">{0} фина унца</unitPattern>
+				<unitPattern count="few">{0} фине унце</unitPattern>
+				<unitPattern count="other">{0} финих унци</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>карати</displayName>
+				<unitPattern count="one">{0} карат</unitPattern>
+				<unitPattern count="few">{0} карата</unitPattern>
+				<unitPattern count="other">{0} карата</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>гигавати</displayName>
 				<unitPattern count="one">{0} гигават</unitPattern>
 				<unitPattern count="few">{0} гигавата</unitPattern>
 				<unitPattern count="other">{0} гигавати</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>коњске снаге</displayName>
-				<unitPattern count="one">{0} коњска снага</unitPattern>
-				<unitPattern count="few">{0} коњске снаге</unitPattern>
-				<unitPattern count="other">{0} коњских снага</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>киловати</displayName>
-				<unitPattern count="one">{0} киловат</unitPattern>
-				<unitPattern count="few">{0} киловата</unitPattern>
-				<unitPattern count="other">{0} киловати</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>мегавати</displayName>
 				<unitPattern count="one">{0} мегават</unitPattern>
 				<unitPattern count="few">{0} мегавата</unitPattern>
 				<unitPattern count="other">{0} мегавати</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>миливати</displayName>
-				<unitPattern count="one">{0} миливат</unitPattern>
-				<unitPattern count="few">{0} миливата</unitPattern>
-				<unitPattern count="other">{0} миливати</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>киловати</displayName>
+				<unitPattern count="one">{0} киловат</unitPattern>
+				<unitPattern count="few">{0} киловата</unitPattern>
+				<unitPattern count="other">{0} киловати</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>вати</displayName>
@@ -7492,24 +7705,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} вата</unitPattern>
 				<unitPattern count="other">{0} вати</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>миливати</displayName>
+				<unitPattern count="one">{0} миливат</unitPattern>
+				<unitPattern count="few">{0} миливата</unitPattern>
+				<unitPattern count="other">{0} миливати</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>коњске снаге</displayName>
+				<unitPattern count="one">{0} коњска снага</unitPattern>
+				<unitPattern count="few">{0} коњске снаге</unitPattern>
+				<unitPattern count="other">{0} коњских снага</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>хектопаскали</displayName>
 				<unitPattern count="one">{0} хектопаскал</unitPattern>
 				<unitPattern count="few">{0} хектопаскала</unitPattern>
 				<unitPattern count="other">{0} хектопаскала</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>инчи живиног стуба</displayName>
-				<unitPattern count="one">{0} инч живиног стуба</unitPattern>
-				<unitPattern count="few">{0} инча живиног стуба</unitPattern>
-				<unitPattern count="other">{0} инча живиног стуба</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>милибари</displayName>
-				<unitPattern count="one">{0} милибар</unitPattern>
-				<unitPattern count="few">{0} милибара</unitPattern>
-				<unitPattern count="other">{0} милибара</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>милиметри живиног стуба</displayName>
 				<unitPattern count="one">{0} милиметар живиног стуба</unitPattern>
@@ -7522,11 +7735,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} фунте по квадратном инчу</unitPattern>
 				<unitPattern count="other">{0} фунти по квадратном инчу</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>карати</displayName>
-				<unitPattern count="one">{0} карат</unitPattern>
-				<unitPattern count="few">{0} карата</unitPattern>
-				<unitPattern count="other">{0} карата</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>инчи живиног стуба</displayName>
+				<unitPattern count="one">{0} инч живиног стуба</unitPattern>
+				<unitPattern count="few">{0} инча живиног стуба</unitPattern>
+				<unitPattern count="other">{0} инча живиног стуба</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>милибари</displayName>
+				<unitPattern count="one">{0} милибар</unitPattern>
+				<unitPattern count="few">{0} милибара</unitPattern>
+				<unitPattern count="other">{0} милибара</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>километри на сат</displayName>
@@ -7546,6 +7765,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} миље на сат</unitPattern>
 				<unitPattern count="other">{0} миља на сат</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName draft="provisional">kn</displayName>
+				<unitPattern count="one" draft="provisional">{0} kn</unitPattern>
+				<unitPattern count="few" draft="provisional">{0} kn</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>степени Целзијуса</displayName>
 				<unitPattern count="one">{0} степен Целзијуса</unitPattern>
@@ -7564,36 +7795,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} келвина</unitPattern>
 				<unitPattern count="other">{0} келвина</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>акер стопе</displayName>
-				<unitPattern count="one">{0} акер стопа</unitPattern>
-				<unitPattern count="few">{0} акер стопе</unitPattern>
-				<unitPattern count="other">{0} акер стопа</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>центилитри</displayName>
-				<unitPattern count="one">{0} центилитар</unitPattern>
-				<unitPattern count="few">{0} центилитра</unitPattern>
-				<unitPattern count="other">{0} центилитара</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>кубни центиметри</displayName>
-				<unitPattern count="one">{0} кубни центиметар</unitPattern>
-				<unitPattern count="few">{0} кубна центиметра</unitPattern>
-				<unitPattern count="other">{0} кубних центиметара</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>кубне стопе</displayName>
-				<unitPattern count="one">{0} кубна стопа</unitPattern>
-				<unitPattern count="few">{0} кубне стопе</unitPattern>
-				<unitPattern count="other">{0} кубних стопа</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>кубни инчи</displayName>
-				<unitPattern count="one">{0} кубни инч</unitPattern>
-				<unitPattern count="few">{0} кубна инча</unitPattern>
-				<unitPattern count="other">{0} кубних инча</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>кубни километри</displayName>
 				<unitPattern count="one">{0} кубни километар</unitPattern>
@@ -7605,6 +7806,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} кубни метар</unitPattern>
 				<unitPattern count="few">{0} кубна метра</unitPattern>
 				<unitPattern count="other">{0} кубних метара</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>кубни центиметри</displayName>
+				<unitPattern count="one">{0} кубни центиметар</unitPattern>
+				<unitPattern count="few">{0} кубна центиметра</unitPattern>
+				<unitPattern count="other">{0} кубних центиметара</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>кубне миље</displayName>
@@ -7618,29 +7827,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} кубна јарда</unitPattern>
 				<unitPattern count="other">{0} кубних јарди</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>шоље</displayName>
-				<unitPattern count="one">{0} шоља</unitPattern>
-				<unitPattern count="few">{0} шоље</unitPattern>
-				<unitPattern count="other">{0} шоља</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>кубне стопе</displayName>
+				<unitPattern count="one">{0} кубна стопа</unitPattern>
+				<unitPattern count="few">{0} кубне стопе</unitPattern>
+				<unitPattern count="other">{0} кубних стопа</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>децилитри</displayName>
-				<unitPattern count="one">{0} децилитар</unitPattern>
-				<unitPattern count="few">{0} децилитра</unitPattern>
-				<unitPattern count="other">{0} децилитара</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>кубни инчи</displayName>
+				<unitPattern count="one">{0} кубни инч</unitPattern>
+				<unitPattern count="few">{0} кубна инча</unitPattern>
+				<unitPattern count="other">{0} кубних инча</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>унце течности</displayName>
-				<unitPattern count="one">{0} унца течности</unitPattern>
-				<unitPattern count="few">{0} унце течности</unitPattern>
-				<unitPattern count="other">{0} унци течности</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>галони</displayName>
-				<unitPattern count="one">{0} галон</unitPattern>
-				<unitPattern count="few">{0} галона</unitPattern>
-				<unitPattern count="other">{0} галона</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>мегалитри</displayName>
+				<unitPattern count="one">{0} мегалитар</unitPattern>
+				<unitPattern count="few">{0} мегалитра</unitPattern>
+				<unitPattern count="other">{0} мегалитара</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>хектолитри</displayName>
@@ -7653,12 +7856,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} литар</unitPattern>
 				<unitPattern count="few">{0} литра</unitPattern>
 				<unitPattern count="other">{0} литара</unitPattern>
+				<perUnitPattern>{0} по литри</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>мегалитри</displayName>
-				<unitPattern count="one">{0} мегалитар</unitPattern>
-				<unitPattern count="few">{0} мегалитра</unitPattern>
-				<unitPattern count="other">{0} мегалитара</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>децилитри</displayName>
+				<unitPattern count="one">{0} децилитар</unitPattern>
+				<unitPattern count="few">{0} децилитра</unitPattern>
+				<unitPattern count="other">{0} децилитара</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>центилитри</displayName>
+				<unitPattern count="one">{0} центилитар</unitPattern>
+				<unitPattern count="few">{0} центилитра</unitPattern>
+				<unitPattern count="other">{0} центилитара</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>милилитри</displayName>
@@ -7666,11 +7876,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} милилитра</unitPattern>
 				<unitPattern count="other">{0} милилитара</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>пинте</displayName>
-				<unitPattern count="one">{0} пинта</unitPattern>
-				<unitPattern count="few">{0} пинте</unitPattern>
-				<unitPattern count="other">{0} пинти</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName draft="contributed">метричке пинте</displayName>
+				<unitPattern count="one" draft="contributed">{0} метричка пинта</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} метричке пинте</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} метричких пинти</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>метричка шоља</displayName>
+				<unitPattern count="one">{0} метричка шоља</unitPattern>
+				<unitPattern count="few">{0} метричке шоље</unitPattern>
+				<unitPattern count="other">{0} метричких шоља</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>акер стопе</displayName>
+				<unitPattern count="one">{0} акер стопа</unitPattern>
+				<unitPattern count="few">{0} акер стопе</unitPattern>
+				<unitPattern count="other">{0} акер стопа</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>галони</displayName>
+				<unitPattern count="one">{0} галон</unitPattern>
+				<unitPattern count="few">{0} галона</unitPattern>
+				<unitPattern count="other">{0} галона</unitPattern>
+				<perUnitPattern>{0} по галону</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>кварти</displayName>
@@ -7678,6 +7907,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} кварта</unitPattern>
 				<unitPattern count="other">{0} кварата</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>пинте</displayName>
+				<unitPattern count="one">{0} пинта</unitPattern>
+				<unitPattern count="few">{0} пинте</unitPattern>
+				<unitPattern count="other">{0} пинти</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>шоље</displayName>
+				<unitPattern count="one">{0} шоља</unitPattern>
+				<unitPattern count="few">{0} шоље</unitPattern>
+				<unitPattern count="other">{0} шоља</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>унце течности</displayName>
+				<unitPattern count="one">{0} унца течности</unitPattern>
+				<unitPattern count="few">{0} унце течности</unitPattern>
+				<unitPattern count="other">{0} унци течности</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>кашике</displayName>
 				<unitPattern count="one">{0} кашика</unitPattern>
@@ -7690,10 +7937,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} кашичице</unitPattern>
 				<unitPattern count="other">{0} кашичица</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="provisional">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="provisional">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="provisional">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="provisional">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>ге сила</displayName>
@@ -7707,8 +7960,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="one">{0} rev</unitPattern>
+				<unitPattern count="few">{0} rev</unitPattern>
+				<unitPattern count="other">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="few">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>степени</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
-				<displayName>минути</displayName>
+				<displayName>лучни мин</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="few">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -7719,23 +7990,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>степени</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="few">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="few">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>акери</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="few">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>квадратни километри</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="few">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>хектари</displayName>
@@ -7743,11 +8002,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>квадратни метри</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="few">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="few">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="few">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>акери</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="few">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="few">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>квадратне стопе</displayName>
@@ -7760,30 +8045,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="few">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>квадратни километри</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="few">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>квадратни метри</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="few">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="few">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="few">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="few">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
@@ -7791,90 +8059,132 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} L/km</unitPattern>
 				<unitPattern count="other">{0} L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} L/100km</unitPattern>
+				<unitPattern count="few">{0} L/100km</unitPattern>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="few">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>бит</displayName>
-				<unitPattern count="one">{0} b</unitPattern>
-				<unitPattern count="few">{0} b</unitPattern>
-				<unitPattern count="other">{0} b</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>бајт</displayName>
-				<unitPattern count="one">{0} B</unitPattern>
-				<unitPattern count="few">{0} B</unitPattern>
-				<unitPattern count="other">{0} B</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="few">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="few">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="few">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="few">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="few">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="few">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="few">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="few">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="few">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="few">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="few">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="few">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="few">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="few">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="few">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>бајт</displayName>
+				<unitPattern count="one">{0} B</unitPattern>
+				<unitPattern count="few">{0} B</unitPattern>
+				<unitPattern count="other">{0} B</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>бит</displayName>
+				<unitPattern count="one">{0} b</unitPattern>
+				<unitPattern count="few">{0} b</unitPattern>
+				<unitPattern count="other">{0} b</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>в.</displayName>
+				<unitPattern count="one">{0} в</unitPattern>
+				<unitPattern count="few">{0} в</unitPattern>
+				<unitPattern count="other">{0} в</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>год.</displayName>
+				<unitPattern count="one">{0} год</unitPattern>
+				<unitPattern count="few">{0} год.</unitPattern>
+				<unitPattern count="other">{0} год.</unitPattern>
+				<perUnitPattern>{0}/год</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>месеци</displayName>
+				<unitPattern count="one">{0} мес.</unitPattern>
+				<unitPattern count="few">{0} мес.</unitPattern>
+				<unitPattern count="other">{0} мес.</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>нед.</displayName>
+				<unitPattern count="one">{0} нед.</unitPattern>
+				<unitPattern count="few">{0} нед.</unitPattern>
+				<unitPattern count="other">{0} нед.</unitPattern>
+				<perUnitPattern>{0}/н</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>д.</displayName>
 				<unitPattern count="one">{0} дан</unitPattern>
 				<unitPattern count="few">{0} дана</unitPattern>
 				<unitPattern count="other">{0} дана</unitPattern>
+				<perUnitPattern>{0}/д</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName draft="contributed">сати</displayName>
+				<displayName>сати</displayName>
 				<unitPattern count="one">{0} сат</unitPattern>
 				<unitPattern count="few">{0} сата</unitPattern>
 				<unitPattern count="other">{0} сати</unitPattern>
-				<perUnitPattern draft="contributed">{0}/с</perUnitPattern>
+				<perUnitPattern>{0}/с</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="few">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
+			<unit type="duration-minute">
+				<displayName>мин</displayName>
+				<unitPattern count="one">{0} мин</unitPattern>
+				<unitPattern count="few">{0} мин</unitPattern>
+				<unitPattern count="other">{0} мин</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>сек</displayName>
+				<unitPattern count="one">{0} сек</unitPattern>
+				<unitPattern count="few">{0} сек</unitPattern>
+				<unitPattern count="other">{0} сек</unitPattern>
+				<perUnitPattern>{0}/сек</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>ms</displayName>
@@ -7882,17 +8192,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ms</unitPattern>
 				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName draft="contributed">мин</displayName>
-				<unitPattern count="one">{0} мин</unitPattern>
-				<unitPattern count="few">{0} мин</unitPattern>
-				<unitPattern count="other">{0} мин</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>месеци</displayName>
-				<unitPattern count="one">{0} мес.</unitPattern>
-				<unitPattern count="few">{0} мес.</unitPattern>
-				<unitPattern count="other">{0} мес.</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="few">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>ns</displayName>
@@ -7900,25 +8204,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ns</unitPattern>
 				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName draft="contributed">сек</displayName>
-				<unitPattern count="one">{0} сек</unitPattern>
-				<unitPattern count="few">{0} сек</unitPattern>
-				<unitPattern count="other">{0} сек</unitPattern>
-				<perUnitPattern draft="contributed">{0}/сек</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>нед.</displayName>
-				<unitPattern count="one">{0} нед.</unitPattern>
-				<unitPattern count="few">{0} нед.</unitPattern>
-				<unitPattern count="other">{0} нед.</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>год.</displayName>
-				<unitPattern count="one">{0} год</unitPattern>
-				<unitPattern count="few">{0} год.</unitPattern>
-				<unitPattern count="other">{0} год.</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>ампери</displayName>
 				<unitPattern count="one">{0} A</unitPattern>
@@ -7943,6 +8228,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="few">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -7955,24 +8246,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} Cal</unitPattern>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>џули</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="few">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="few">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="few">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>џули</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="few">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -7985,11 +8270,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="few">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="few">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
@@ -7997,23 +8282,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="few">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="few">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>ај</displayName>
-				<unitPattern count="one">{0} ај</unitPattern>
-				<unitPattern count="few">{0} ај</unitPattern>
-				<unitPattern count="other">{0} ај</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one" draft="contributed">{0} km</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} km</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="few">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>метри</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="few">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
@@ -8021,47 +8308,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ft</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="few">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>инчи</displayName>
-				<unitPattern count="one">{0} инч</unitPattern>
-				<unitPattern count="few">{0} инча</unitPattern>
-				<unitPattern count="other">{0} инча</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one" draft="contributed">{0} km</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} km</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>светлосне год.</displayName>
-				<unitPattern count="one">{0} сг</unitPattern>
-				<unitPattern count="few">{0} сг</unitPattern>
-				<unitPattern count="other">{0} сг</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>метри</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="few">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="few">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>миље</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="few">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="few">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -8069,71 +8321,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="few">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="few">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="few">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>парсеци</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="few">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>пикометри</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="few">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>миље</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="few">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>јарди</displayName>
 				<unitPattern count="one">{0} јрд</unitPattern>
 				<unitPattern count="few">{0} јрд</unitPattern>
 				<unitPattern count="other">{0} јрд</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ft</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="few">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>инчи</displayName>
+				<unitPattern count="one">{0} инч</unitPattern>
+				<unitPattern count="few">{0} инча</unitPattern>
+				<unitPattern count="other">{0} инча</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>парсеци</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="few">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>светлосне год.</displayName>
+				<unitPattern count="one">{0} сг</unitPattern>
+				<unitPattern count="few">{0} сг</unitPattern>
+				<unitPattern count="other">{0} сг</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ај</displayName>
+				<unitPattern count="one">{0} ај</unitPattern>
+				<unitPattern count="few">{0} ај</unitPattern>
+				<unitPattern count="other">{0} ај</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="few">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="few">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="few">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>карати</displayName>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="few">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>грами</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="few">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one" draft="contributed">{0} kg</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="few">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="few">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one" draft="contributed">{0} kg</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kg</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>грами</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
@@ -8141,23 +8427,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="one">{0} унца</unitPattern>
-				<unitPattern count="few">{0} унце</unitPattern>
-				<unitPattern count="other">{0} унци</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="few">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="few">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="few">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tn</displayName>
@@ -8165,35 +8439,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} tn</unitPattern>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="few">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} унца</unitPattern>
+				<unitPattern count="few">{0} унце</unitPattern>
+				<unitPattern count="other">{0} унци</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="few">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>карати</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="few">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="few">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>кс</displayName>
-				<unitPattern count="one">{0} кс</unitPattern>
-				<unitPattern count="few">{0} кс</unitPattern>
-				<unitPattern count="other">{0} кс</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="few">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="few">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="few">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="few">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>вати</displayName>
@@ -8201,24 +8489,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="few">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>кс</displayName>
+				<unitPattern count="one">{0} кс</unitPattern>
+				<unitPattern count="few">{0} кс</unitPattern>
+				<unitPattern count="other">{0} кс</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="few">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="few">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one" draft="contributed">{0} mbar</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mbar</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -8231,11 +8519,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="few">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="few">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one" draft="contributed">{0} mbar</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mbar</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>километри на сат</displayName>
@@ -8255,6 +8549,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName draft="provisional">kn</displayName>
+				<unitPattern count="one" draft="provisional">{0} kn</unitPattern>
+				<unitPattern count="few" draft="provisional">{0} kn</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one" draft="contributed">{0}°C</unitPattern>
@@ -8273,36 +8579,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="few">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cL</displayName>
-				<unitPattern count="one">{0} cL</unitPattern>
-				<unitPattern count="few">{0} cL</unitPattern>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="few">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="few">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="few">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one" draft="contributed">{0} km³</unitPattern>
@@ -8314,6 +8590,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="few">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="few">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -8327,29 +8611,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>шоље</displayName>
-				<unitPattern count="one">{0} ш.</unitPattern>
-				<unitPattern count="few">{0} ш.</unitPattern>
-				<unitPattern count="other">{0} ш.</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="few">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="one">{0} dL</unitPattern>
-				<unitPattern count="few">{0} dL</unitPattern>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="few">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="few">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="few">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="few">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -8362,12 +8640,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} l</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} l</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="one">{0} ML</unitPattern>
-				<unitPattern count="few">{0} ML</unitPattern>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0} dL</unitPattern>
+				<unitPattern count="few">{0} dL</unitPattern>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="one">{0} cL</unitPattern>
+				<unitPattern count="few">{0} cL</unitPattern>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
@@ -8375,11 +8660,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mL</unitPattern>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="few">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="few">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="few">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="few">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="few">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
@@ -8387,6 +8691,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="few">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>шоље</displayName>
+				<unitPattern count="one">{0} ш.</unitPattern>
+				<unitPattern count="few">{0} ш.</unitPattern>
+				<unitPattern count="other">{0} ш.</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="few">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>каш.</displayName>
 				<unitPattern count="one">{0} каш.</unitPattern>
@@ -8399,16 +8721,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} кашич.</unitPattern>
 				<unitPattern count="other">{0} кашич.</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="provisional">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="provisional">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="provisional">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="provisional">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<unitPattern count="one" draft="contributed">{0} G</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} G</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="few" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one" draft="contributed">{0}′</unitPattern>
 				<unitPattern count="few" draft="contributed">{0}′</unitPattern>
@@ -8419,31 +8752,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0}″</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="few" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one" draft="contributed">{0} ac</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ac</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} km²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one" draft="contributed">{0} ha</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} ha</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one" draft="contributed">{0} ft²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ft²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one" draft="contributed">{0} m²</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} m²</unitPattern>
@@ -8454,17 +8772,63 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} mi²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one" draft="contributed">{0} ac</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ac</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one" draft="contributed">{0} ft²</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ft²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} L/100km</unitPattern>
+				<unitPattern count="few">{0} L/100km</unitPattern>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>г.</displayName>
+				<unitPattern count="one">{0} г</unitPattern>
+				<unitPattern count="few">{0} г</unitPattern>
+				<unitPattern count="other">{0} г</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>м.</displayName>
+				<unitPattern count="one">{0} м</unitPattern>
+				<unitPattern count="few">{0} м</unitPattern>
+				<unitPattern count="other">{0} м</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>н.</displayName>
+				<unitPattern count="one">{0} н</unitPattern>
+				<unitPattern count="few">{0} н</unitPattern>
+				<unitPattern count="other">{0} н</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>д.</displayName>
-				<unitPattern count="one" draft="contributed">{0} д</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} д</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} д</unitPattern>
+				<unitPattern count="one">{0} д</unitPattern>
+				<unitPattern count="few">{0} д</unitPattern>
+				<unitPattern count="other">{0} д</unitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName draft="contributed">сати</displayName>
-				<unitPattern count="one" draft="contributed">{0} сат</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} сата</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} сати</unitPattern>
+				<displayName>сат</displayName>
+				<unitPattern count="one">{0} сат</unitPattern>
+				<unitPattern count="few">{0} сата</unitPattern>
+				<unitPattern count="other">{0} сати</unitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>мин</displayName>
+				<unitPattern count="one">{0} м</unitPattern>
+				<unitPattern count="few">{0} м</unitPattern>
+				<unitPattern count="other">{0} м</unitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>сек</displayName>
+				<unitPattern count="one">{0} сек</unitPattern>
+				<unitPattern count="few">{0} сек</unitPattern>
+				<unitPattern count="other">{0} сек</unitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>ms</displayName>
@@ -8472,74 +8836,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ms</unitPattern>
 				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName draft="contributed">мин</displayName>
-				<unitPattern count="one" draft="contributed">{0} м</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} м</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} м</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>м.</displayName>
-				<unitPattern count="one" draft="contributed">{0} м</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} м</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} м</unitPattern>
-			</unit>
-			<unit type="duration-second">
-				<displayName draft="contributed">сек</displayName>
-				<unitPattern count="one" draft="contributed">{0} сек</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} сек</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} сек</unitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>н.</displayName>
-				<unitPattern count="one" draft="contributed">{0} н</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} н</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} н</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>г.</displayName>
-				<unitPattern count="one" draft="contributed">{0} г</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} г</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} г</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="few">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>ft</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="few">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one" draft="contributed">{0} инч</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} инча</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} инча</unitPattern>
-			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
 				<unitPattern count="one" draft="contributed">{0} km</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} km</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one" draft="contributed">{0} сг</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} сг</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} сг</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>метар</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
 				<unitPattern count="few">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one" draft="contributed">{0} миља</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} миље</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} миља</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="few">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -8552,16 +8865,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} pm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one" draft="contributed">{0} миља</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} миље</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} миља</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one" draft="contributed">{0} јрд</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} јрд</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} јрд</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="few">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="length-foot">
+				<displayName>ft</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="few">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one" draft="contributed">{0} инч</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} инча</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} инча</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one" draft="contributed">{0} сг</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} сг</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} сг</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
@@ -8569,20 +8897,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one" draft="contributed">{0} унца</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} унце</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} унци</unitPattern>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one" draft="contributed">{0} lb</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} lb</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} lb</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one" draft="contributed">{0} кс</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} кс</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} кс</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one" draft="contributed">{0} унца</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} унце</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} унци</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one" draft="contributed">{0} kW</unitPattern>
@@ -8594,6 +8923,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} W</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one" draft="contributed">{0} кс</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} кс</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} кс</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one" draft="contributed">{0} hPa</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} hPa</unitPattern>
@@ -8652,15 +8986,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="provisional">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="provisional">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="provisional">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="provisional">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
-			<durationUnitPattern>h:mm</durationUnitPattern>
+			<durationUnitPattern>h.mm</durationUnitPattern>
 		</durationUnit>
 		<durationUnit type="hms">
-			<durationUnitPattern>h:mm:ss</durationUnitPattern>
+			<durationUnitPattern>h.mm.ss</durationUnitPattern>
 		</durationUnit>
 		<durationUnit type="ms">
-			<durationUnitPattern>m:ss</durationUnitPattern>
+			<durationUnitPattern>m.ss</durationUnitPattern>
 		</durationUnit>
 	</units>
 	<listPatterns>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Cyrl.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Cyrl.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl.xml
index 7fa1c272762..5d9bc01be66 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Cyrl.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="sr"/>
 		<script type="Cyrl"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Cyrl_BA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_BA.xml
similarity index 96%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Cyrl_BA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_BA.xml
index ff730377e04..9abb88423a0 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Cyrl_BA.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_BA.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11254 $"/>
-		<generation date="$Date: 2015-02-18 22:16:36 -0600 (Wed, 18 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="sr"/>
 		<script type="Cyrl"/>
 		<territory type="BA"/>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Latn_ME.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_ME.xml
similarity index 73%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Latn_ME.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_ME.xml
index 4de9e260c7b..1a709b1f8db 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Latn_ME.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_ME.xml
@@ -6,10 +6,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11324 $"/>
-		<generation date="$Date: 2015-02-26 16:53:17 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="sr"/>
-		<script type="Latn"/>
+		<script type="Cyrl"/>
 		<territory type="ME"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Cyrl_RS.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_RS.xml
similarity index 69%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Cyrl_RS.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_RS.xml
index fd0f783883e..a30f83891d1 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Cyrl_RS.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_RS.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="sr"/>
 		<script type="Cyrl"/>
 		<territory type="RS"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Latn_XK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_XK.xml
similarity index 73%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Latn_XK.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_XK.xml
index 396305fbcfe..437cbf01129 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Latn_XK.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_XK.xml
@@ -6,10 +6,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11324 $"/>
-		<generation date="$Date: 2015-02-26 16:53:17 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="sr"/>
-		<script type="Latn"/>
+		<script type="Cyrl"/>
 		<territory type="XK"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Latn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn.xml
similarity index 87%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Latn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn.xml
index b2cf5784bdb..4a3b1e9b478 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Latn.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2015 Unicode, Inc.
+<!-- Copyright © 1991-2016 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11324 $"/>
-		<generation date="$Date: 2015-02-26 16:53:17 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 12417 $"/>
 		<language type="sr"/>
 		<script type="Latn"/>
 	</identity>
@@ -60,6 +59,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bem">bemba</language>
 			<language type="bez">bena</language>
 			<language type="bg">bugarski</language>
+			<language type="bgn" draft="contributed">zapadni belučki</language>
 			<language type="bho">Bojpuri</language>
 			<language type="bi">Bislama</language>
 			<language type="bik">Bikol</language>
@@ -130,6 +130,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="elx">Elamitski</language>
 			<language type="en">engleski</language>
 			<language type="en_GB" alt="short">engleski (UK)</language>
+			<language type="en_US" draft="provisional">američki engleski</language>
 			<language type="en_US" alt="short">engleski (SAD)</language>
 			<language type="enm">Srednji engleski</language>
 			<language type="eo">esperanto</language>
@@ -173,7 +174,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="gsw">Švajcarski nemački</language>
 			<language type="gu">gudžarati</language>
 			<language type="guz">gusi</language>
-			<language type="gv">Manks</language>
+			<language type="gv">manski</language>
 			<language type="gwi">Gvič’in</language>
 			<language type="ha">hausa</language>
 			<language type="hai">Haida</language>
@@ -186,7 +187,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ho">Hiri Motu</language>
 			<language type="hr">hrvatski</language>
 			<language type="hsb">gornji lužičkosrpski</language>
-			<language type="ht">Haitski</language>
+			<language type="ht">haićanski</language>
 			<language type="hu">mađarski</language>
 			<language type="hup">Hupa</language>
 			<language type="hy">jermenski</language>
@@ -268,6 +269,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">laoški</language>
 			<language type="lol">Mongo</language>
 			<language type="loz">Lozi</language>
+			<language type="lrc" draft="contributed">severni luri</language>
 			<language type="lt">litvanski</language>
 			<language type="lu">luba-katanga</language>
 			<language type="lua">Luba-lulua</language>
@@ -313,12 +315,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mwr">Marvari</language>
 			<language type="my">burmanski</language>
 			<language type="myv">Erzija</language>
+			<language type="mzn" draft="contributed">mazanderanski</language>
 			<language type="na">Nauru</language>
 			<language type="nap">Neapolitanski</language>
 			<language type="naq">nama</language>
 			<language type="nb">norveški bokmal</language>
 			<language type="nd">severni ndebele</language>
 			<language type="nds">Niski nemački</language>
+			<language type="nds_NL" draft="contributed">niskosaksonski</language>
 			<language type="ne">nepalski</language>
 			<language type="new">Nevari</language>
 			<language type="ng">Ndonga</language>
@@ -331,7 +335,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="no">Norveški</language>
 			<language type="nog">Nogai</language>
 			<language type="non">Stari norski</language>
-			<language type="nqo">N’ko</language>
+			<language type="nqo">n’ko</language>
 			<language type="nr">Južni ndebele</language>
 			<language type="nso">Severni soto</language>
 			<language type="nus">nuer</language>
@@ -394,6 +398,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">Sicilijanski</language>
 			<language type="sco">Škotski</language>
 			<language type="sd">sindi</language>
+			<language type="sdh">južnokurdski</language>
 			<language type="se">severni sami</language>
 			<language type="seh">sena</language>
 			<language type="sel">Selkap</language>
@@ -422,14 +427,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="srr">Serer</language>
 			<language type="ss">Svati</language>
 			<language type="st">Sesoto</language>
-			<language type="su">sudanski</language>
+			<language type="su">sundanski</language>
 			<language type="suk">Sukuma</language>
 			<language type="sus">Susu</language>
 			<language type="sux">Sumerski</language>
 			<language type="sv">švedski</language>
 			<language type="sw">svahili</language>
+			<language type="sw_CD">kongo svahili</language>
 			<language type="swb">Komorski</language>
-			<language type="swc">kongo svahili</language>
 			<language type="syc">Klasični sirijski</language>
 			<language type="syr">Sirijski</language>
 			<language type="ta">tamilski</language>
@@ -438,7 +443,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="teo">teso</language>
 			<language type="ter">Tereno</language>
 			<language type="tet">Tetum</language>
-			<language type="tg">Tađik</language>
+			<language type="tg">tadžički</language>
 			<language type="th">tajlandski</language>
 			<language type="ti">tigrinja</language>
 			<language type="tig">Tigre</language>
@@ -482,6 +487,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">Valamo</language>
 			<language type="war">Varaj</language>
 			<language type="was">Vašo</language>
+			<language type="wbp" draft="contributed">varlpiri</language>
 			<language type="wo">volof</language>
 			<language type="xal">Kalmik</language>
 			<language type="xh">kosa</language>
@@ -606,7 +612,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Sgnw">znakovno pismo</script>
 			<script type="Shaw">šavijansko pismo</script>
 			<script type="Sinh">sinhalsko pismo</script>
-			<script type="Sund">sudansko pismo</script>
+			<script type="Sund">sundansko pismo</script>
 			<script type="Sylo">siloti nagri pismo</script>
 			<script type="Syrc">sirijsko pismo</script>
 			<script type="Syre">sirijsko estrangelo pismo</script>
@@ -676,7 +682,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angvila</territory>
 			<territory type="AL">Albanija</territory>
 			<territory type="AM">Jermenija</territory>
-			<territory type="AN">Holandski Antili</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antarktik</territory>
 			<territory type="AR">Argentina</territory>
@@ -708,7 +713,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BY">Belorusija</territory>
 			<territory type="BZ">Belize</territory>
 			<territory type="CA">Kanada</territory>
-			<territory type="CC">Kokos (Keling) Ostrva</territory>
+			<territory type="CC">Kokosova (Kilingova) Ostrva</territory>
 			<territory type="CD">Kongo - Kinšasa</territory>
 			<territory type="CD" alt="variant">Kongo (DRK)</territory>
 			<territory type="CF">Centralnoafrička Republika</territory>
@@ -772,7 +777,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GU">Guam</territory>
 			<territory type="GW">Gvineja-Bisao</territory>
 			<territory type="GY">Gvajana</territory>
-			<territory type="HK">Hong Kong S. A. R. Kina</territory>
+			<territory type="HK">SAR Hongkong (Kina)</territory>
 			<territory type="HK" alt="short">Hong Kong</territory>
 			<territory type="HM">Ostrva Herd i Mekdonald</territory>
 			<territory type="HN">Honduras</territory>
@@ -844,7 +849,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="NA">Namibija</territory>
 			<territory type="NC">Nova Kaledonija</territory>
 			<territory type="NE">Niger</territory>
-			<territory type="NF">Norfolk Ostrvo</territory>
+			<territory type="NF">Ostrvo Norfok</territory>
 			<territory type="NG">Nigerija</territory>
 			<territory type="NI">Nikaragva</territory>
 			<territory type="NL">Holandija</territory>
@@ -983,6 +988,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">Numeričko sortiranje</key>
 			<key type="colStrength" draft="contributed">Sortiranje prema jačini</key>
 			<key type="currency">valuta</key>
+			<key type="hc" draft="provisional">hc</key>
+			<key type="lb" draft="contributed">stil preloma reda</key>
+			<key type="ms" draft="provisional">ms</key>
 			<key type="numbers">brojevi</key>
 			<key type="timezone" draft="contributed">Vremenska zona</key>
 			<key type="va" draft="contributed">Varijanta lokaliteta</key>
@@ -990,95 +998,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x" draft="contributed">Privatna upotreba</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">arapsko-indijske cifre</type>
-			<type type="arabext" key="numbers">produžene arapsko-indijske cifre</type>
-			<type type="armn" key="numbers">jermenski brojevi</type>
-			<type type="armnlow" key="numbers">mali jermenski brojevi</type>
-			<type type="beng" key="numbers">bengalske cifre</type>
-			<type type="big5han" key="collation">Tradicionalno kinesko sortiranje</type>
-			<type type="buddhist" key="calendar">budistički kalendar</type>
-			<type type="chinese" key="calendar">kineski kalendar</type>
-			<type type="coptic" key="calendar" draft="contributed">koptski kalendar</type>
-			<type type="dangi" key="calendar">dangi kalendar</type>
-			<type type="deva" key="numbers" draft="contributed">devangari cifre</type>
-			<type type="dictionary" key="collation" draft="contributed">Redosled sortiranja u rečniku</type>
-			<type type="ducet" key="collation" draft="contributed">Podrazumevani Unicode redosled sortiranja</type>
-			<type type="ethi" key="numbers">etiopski brojevi</type>
-			<type type="ethiopic" key="calendar">etiopski kalendar</type>
-			<type type="ethiopic-amete-alem" key="calendar" draft="contributed">etiopski amet alem kalendar</type>
-			<type type="finance" key="numbers" draft="contributed">Finansijski brojevi</type>
-			<type type="fullwide" key="numbers">cifre pune širine</type>
-			<type type="gb2312han" key="collation">Pojednostavljeno kinesko sortiranje</type>
-			<type type="geor" key="numbers">gruzijski brojevi</type>
-			<type type="gregorian" key="calendar">gregorijanski kalendar</type>
-			<type type="grek" key="numbers">grčki brojevi</type>
-			<type type="greklow" key="numbers">mali grčki brojevi</type>
-			<type type="gujr" key="numbers">gudžaratske cifre</type>
-			<type type="guru" key="numbers">gurmuki cifre</type>
-			<type type="hanidec" key="numbers">kineski decimalni brojevi</type>
-			<type type="hans" key="numbers">pojednostavljeni kineski brojevi</type>
-			<type type="hansfin" key="numbers">pojednostavljeni kineski finansijski brojevi</type>
-			<type type="hant" key="numbers">tradicionalni kineski brojevi</type>
-			<type type="hantfin" key="numbers">tradicionalni kineski finansijski brojevi</type>
-			<type type="hebr" key="numbers">hebrejski brojevi</type>
-			<type type="hebrew" key="calendar">hebrejski kalendar</type>
-			<type type="identical" key="colStrength" draft="contributed">Sortiraj sve</type>
-			<type type="indian" key="calendar">Indijski nacionalni kalendar</type>
-			<type type="islamic" key="calendar">islamski kalendar</type>
-			<type type="islamic-civil" key="calendar">Islamski civilni kalendar</type>
-			<type type="iso8601" key="calendar">ISO-8601 kalendar</type>
-			<type type="japanese" key="calendar">japanski kalendar</type>
-			<type type="jpan" key="numbers">japanski brojevi</type>
-			<type type="jpanfin" key="numbers">japanski finansijski brojevi</type>
-			<type type="khmr" key="numbers">kmerske cifre</type>
-			<type type="knda" key="numbers">kanada cifre</type>
-			<type type="laoo" key="numbers">laoške cifre</type>
-			<type type="latn" key="numbers">zapadne cifre</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">Sortiraj prvo mala slova</type>
-			<type type="mlym" key="numbers">malajalam cifre</type>
-			<type type="mong" key="numbers" draft="contributed">mongolske cifre</type>
-			<type type="mymr" key="numbers">mijanmarske cifre</type>
-			<type type="native" key="numbers" draft="contributed">Lokalne cifre</type>
-			<type type="no" key="colBackwards" draft="contributed">Sortiraj akcente normalno</type>
-			<type type="no" key="colCaseFirst" draft="contributed">Sortiraj normalan redosled velikih i malih slova</type>
-			<type type="no" key="colCaseLevel" draft="contributed">Sortiraj bez obzira na velika i mala slova</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">Sortiraj kana simbole odvojeno</type>
-			<type type="no" key="colNormalization" draft="contributed">Sortiraj bez normalizacije</type>
-			<type type="no" key="colNumeric" draft="contributed">Sortiraj cifre pojedinačno</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">Sortiraj simbole</type>
-			<type type="orya" key="numbers">orija cifre</type>
-			<type type="persian" key="calendar">persijski kalendar</type>
-			<type type="phonebook" key="collation">Sortiranje kao telefonski imenik</type>
-			<type type="phonetic" key="collation" draft="contributed">Fonetski redosled sortiranja</type>
-			<type type="pinyin" key="collation">Pinjin sortiranje</type>
-			<type type="primary" key="colStrength" draft="contributed">Sortiraj samo osnovna slova</type>
-			<type type="quaternary" key="colStrength" draft="contributed">Sortiraj akcente/mala i velika slova/širinu/kana simbole</type>
-			<type type="reformed" key="collation" draft="contributed">Reformisani redosled sortiranja</type>
-			<type type="roc" key="calendar">kalendar Republike Kine</type>
-			<type type="roman" key="numbers">rimski brojevi</type>
-			<type type="romanlow" key="numbers">mali rimski brojevi</type>
-			<type type="search" key="collation">pretraga opšte namene</type>
-			<type type="searchjl" key="collation" draft="contributed">Pretraga prema hangul početnom suglasniku</type>
-			<type type="secondary" key="colStrength" draft="contributed">Sortiraj akcente</type>
-			<type type="shifted" key="colAlternate" draft="contributed">Sortiranje uz ignorisanje simbola</type>
-			<type type="standard" key="collation">standardni redosled sortiranja</type>
-			<type type="stroke" key="collation">Sortiranje po broju crta</type>
-			<type type="taml" key="numbers">tamilski brojevi</type>
-			<type type="tamldec" key="numbers">tamilske cifre</type>
-			<type type="telu" key="numbers">telugu cifre</type>
-			<type type="tertiary" key="colStrength" draft="contributed">Sortiraj akcente/mala i velika slova/širinu</type>
-			<type type="thai" key="numbers">tajske cifre</type>
-			<type type="tibt" key="numbers">tibetanske cifre</type>
-			<type type="traditional" key="collation">Tradicionalno sortiranje</type>
-			<type type="traditional" key="numbers" draft="contributed">Tradicionalni brojevi</type>
-			<type type="unihan" key="collation" draft="contributed">Redosled sortiranja radikalnim crticama</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">Sortiraj prvo velika slova</type>
-			<type type="vaii" key="numbers" draft="contributed">Vai cifre</type>
-			<type type="yes" key="colBackwards" draft="contributed">Sortiraj akcente obrnuto</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">Sortiraj mala i velika slova</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">Sortiraj kana simbole drugačije</type>
-			<type type="yes" key="colNormalization" draft="contributed">Sortiraj Unicode normalizovano</type>
-			<type type="yes" key="colNumeric" draft="contributed">Sortiraj cifre numerički</type>
+			<type key="calendar" type="buddhist">budistički kalendar</type>
+			<type key="calendar" type="chinese">kineski kalendar</type>
+			<type key="calendar" type="coptic" draft="contributed">koptski kalendar</type>
+			<type key="calendar" type="dangi">dangi kalendar</type>
+			<type key="calendar" type="ethiopic">etiopski kalendar</type>
+			<type key="calendar" type="ethiopic-amete-alem" draft="contributed">etiopski amet alem kalendar</type>
+			<type key="calendar" type="gregorian">gregorijanski kalendar</type>
+			<type key="calendar" type="hebrew">hebrejski kalendar</type>
+			<type key="calendar" type="indian">Indijski nacionalni kalendar</type>
+			<type key="calendar" type="islamic">islamski kalendar</type>
+			<type key="calendar" type="islamic-civil">Islamski civilni kalendar</type>
+			<type key="calendar" type="iso8601">ISO-8601 kalendar</type>
+			<type key="calendar" type="japanese">japanski kalendar</type>
+			<type key="calendar" type="persian">persijski kalendar</type>
+			<type key="calendar" type="roc">kalendar Republike Kine</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">Sortiraj simbole</type>
+			<type key="colAlternate" type="shifted" draft="contributed">Sortiranje uz ignorisanje simbola</type>
+			<type key="colBackwards" type="no" draft="contributed">Sortiraj akcente normalno</type>
+			<type key="colBackwards" type="yes" draft="contributed">Sortiraj akcente obrnuto</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">Sortiraj prvo mala slova</type>
+			<type key="colCaseFirst" type="no" draft="contributed">Sortiraj normalan redosled velikih i malih slova</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">Sortiraj prvo velika slova</type>
+			<type key="colCaseLevel" type="no" draft="contributed">Sortiraj bez obzira na velika i mala slova</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">Sortiraj mala i velika slova</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">Sortiraj kana simbole odvojeno</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">Sortiraj kana simbole drugačije</type>
+			<type key="collation" type="big5han">Tradicionalno kinesko sortiranje</type>
+			<type key="collation" type="dictionary" draft="contributed">Redosled sortiranja u rečniku</type>
+			<type key="collation" type="ducet" draft="contributed">Podrazumevani Unicode redosled sortiranja</type>
+			<type key="collation" type="gb2312han">Pojednostavljeno kinesko sortiranje</type>
+			<type key="collation" type="phonebook">Sortiranje kao telefonski imenik</type>
+			<type key="collation" type="phonetic" draft="contributed">Fonetski redosled sortiranja</type>
+			<type key="collation" type="pinyin">Pinjin sortiranje</type>
+			<type key="collation" type="reformed" draft="contributed">Reformisani redosled sortiranja</type>
+			<type key="collation" type="search">pretraga opšte namene</type>
+			<type key="collation" type="searchjl" draft="contributed">Pretraga prema hangul početnom suglasniku</type>
+			<type key="collation" type="standard">standardni redosled sortiranja</type>
+			<type key="collation" type="stroke">Sortiranje po broju crta</type>
+			<type key="collation" type="traditional">Tradicionalno sortiranje</type>
+			<type key="collation" type="unihan" draft="contributed">Redosled sortiranja radikalnim crticama</type>
+			<type key="colNormalization" type="no" draft="contributed">Sortiraj bez normalizacije</type>
+			<type key="colNormalization" type="yes" draft="contributed">Sortiraj Unicode normalizovano</type>
+			<type key="colNumeric" type="no" draft="contributed">Sortiraj cifre pojedinačno</type>
+			<type key="colNumeric" type="yes" draft="contributed">Sortiraj cifre numerički</type>
+			<type key="colStrength" type="identical" draft="contributed">Sortiraj sve</type>
+			<type key="colStrength" type="primary" draft="contributed">Sortiraj samo osnovna slova</type>
+			<type key="colStrength" type="quaternary" draft="contributed">Sortiraj akcente/mala i velika slova/širinu/kana simbole</type>
+			<type key="colStrength" type="secondary" draft="contributed">Sortiraj akcente</type>
+			<type key="colStrength" type="tertiary" draft="contributed">Sortiraj akcente/mala i velika slova/širinu</type>
+			<type key="hc" type="h11" draft="provisional">12-časovni sistem (0-11)</type>
+			<type key="hc" type="h12" draft="provisional">12-časovni sistem (1-12)</type>
+			<type key="hc" type="h23" draft="provisional">24-časovni sistem (0-23)</type>
+			<type key="hc" type="h24" draft="provisional">24-časovni sistem (1-24)</type>
+			<type key="lb" type="loose" draft="provisional">loose</type>
+			<type key="lb" type="normal" draft="provisional">normal</type>
+			<type key="lb" type="strict" draft="provisional">strict</type>
+			<type key="ms" type="metric" draft="provisional">metrički</type>
+			<type key="ms" type="uksystem" draft="provisional">uksystem</type>
+			<type key="ms" type="ussystem" draft="provisional">ussystem</type>
+			<type key="numbers" type="arab">arapsko-indijske cifre</type>
+			<type key="numbers" type="arabext">produžene arapsko-indijske cifre</type>
+			<type key="numbers" type="armn">jermenski brojevi</type>
+			<type key="numbers" type="armnlow">mali jermenski brojevi</type>
+			<type key="numbers" type="beng">bengalske cifre</type>
+			<type key="numbers" type="deva">devangari cifre</type>
+			<type key="numbers" type="ethi">etiopski brojevi</type>
+			<type key="numbers" type="finance" draft="contributed">Finansijski brojevi</type>
+			<type key="numbers" type="fullwide">cifre pune širine</type>
+			<type key="numbers" type="geor">gruzijski brojevi</type>
+			<type key="numbers" type="grek">grčki brojevi</type>
+			<type key="numbers" type="greklow">mali grčki brojevi</type>
+			<type key="numbers" type="gujr">gudžaratske cifre</type>
+			<type key="numbers" type="guru">gurmuki cifre</type>
+			<type key="numbers" type="hanidec">kineski decimalni brojevi</type>
+			<type key="numbers" type="hans">pojednostavljeni kineski brojevi</type>
+			<type key="numbers" type="hansfin">pojednostavljeni kineski finansijski brojevi</type>
+			<type key="numbers" type="hant">tradicionalni kineski brojevi</type>
+			<type key="numbers" type="hantfin">tradicionalni kineski finansijski brojevi</type>
+			<type key="numbers" type="hebr">hebrejski brojevi</type>
+			<type key="numbers" type="jpan">japanski brojevi</type>
+			<type key="numbers" type="jpanfin">japanski finansijski brojevi</type>
+			<type key="numbers" type="khmr">kmerske cifre</type>
+			<type key="numbers" type="knda">kanada cifre</type>
+			<type key="numbers" type="laoo">laoške cifre</type>
+			<type key="numbers" type="latn">zapadne cifre</type>
+			<type key="numbers" type="mlym">malajalam cifre</type>
+			<type key="numbers" type="mong" draft="contributed">mongolske cifre</type>
+			<type key="numbers" type="mymr">mijanmarske cifre</type>
+			<type key="numbers" type="native" draft="contributed">Lokalne cifre</type>
+			<type key="numbers" type="orya">orija cifre</type>
+			<type key="numbers" type="roman">rimski brojevi</type>
+			<type key="numbers" type="romanlow">mali rimski brojevi</type>
+			<type key="numbers" type="taml">tamilski brojevi</type>
+			<type key="numbers" type="tamldec">tamilske cifre</type>
+			<type key="numbers" type="telu">telugu cifre</type>
+			<type key="numbers" type="thai">tajske cifre</type>
+			<type key="numbers" type="tibt">tibetanske cifre</type>
+			<type key="numbers" type="traditional" draft="contributed">Tradicionalni brojevi</type>
+			<type key="numbers" type="vaii" draft="contributed">Vai cifre</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">BGN (BGN)</transformName>
@@ -1104,9 +1122,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</codePatterns>
 	</localeDisplayNames>
 	<characters>
-		<exemplarCharacters>[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 ž]</exemplarCharacters>
+		<exemplarCharacters>[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 ž]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[å q w x y]</exemplarCharacters>
-		<exemplarCharacters type="index" draft="contributed">[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 Ž]</exemplarCharacters>
+		<exemplarCharacters type="index" draft="contributed">[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 Ž]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‐ – , ; \: ! ? . … ‘ ‚ “ „ ( ) \[ \] \{ \} * #]</exemplarCharacters>
 		<ellipsis type="final">{0}…</ellipsis>
 		<ellipsis type="initial">…{0}</ellipsis>
@@ -1199,30 +1217,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d.</dateFormatItem>
 						<dateFormatItem id="Gy">y. G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y. G</dateFormatItem>
-						<dateFormatItem id="GyMMMd" draft="contributed">d. MMM y. G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d. MMM y. G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d. MMM y. G</dateFormatItem>
 						<dateFormatItem id="h">hh a</dateFormatItem>
 						<dateFormatItem id="H" draft="contributed">HH</dateFormatItem>
@@ -1244,19 +1263,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="y">y. G</dateFormatItem>
 						<dateFormatItem id="yyyy">y. G</dateFormatItem>
 						<dateFormatItem id="yyyyM">M.y. G</dateFormatItem>
-						<dateFormatItem id="yyyyMd" draft="contributed">d.M.y. G</dateFormatItem>
-						<dateFormatItem id="yyyyMEd" draft="contributed">E, d.M.y. G</dateFormatItem>
+						<dateFormatItem id="yyyyMd">d.M.y. G</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E, d.M.y. G</dateFormatItem>
 						<dateFormatItem id="yyyyMM">MM.y. G</dateFormatItem>
 						<dateFormatItem id="yyyyMMdd">dd.MM.y. G</dateFormatItem>
 						<dateFormatItem id="yyyyMMM">MMM y. G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMd" draft="contributed">d. MMM y. G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">d. MMM y. G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E, d. MMM y. G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMM">MMMM y. G</dateFormatItem>
-						<dateFormatItem id="yyyyQQQ" draft="contributed">QQQ, y. G</dateFormatItem>
-						<dateFormatItem id="yyyyQQQQ" draft="contributed">QQQQ y. G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">QQQ, y. G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">QQQQ y. G</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
 						<intervalFormatItem id="d">
 							<greatestDifference id="d">d–d</greatestDifference>
 						</intervalFormatItem>
@@ -1307,7 +1326,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">MMM–MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">dd.–dd. MMM</greatestDifference>
+							<greatestDifference id="d">dd – dd. MMM</greatestDifference>
 							<greatestDifference id="M">dd. MMM – dd. MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
@@ -1315,25 +1334,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">E, dd. MMM – E, dd. MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
-							<greatestDifference id="y">y–y</greatestDifference>
+							<greatestDifference id="y">y – y. G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">y M – M</greatestDifference>
-							<greatestDifference id="y">M.y – M.y</greatestDifference>
+							<greatestDifference id="M">M.y – M.y. GGGGG</greatestDifference>
+							<greatestDifference id="y">M.y – M.y. GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d.M.y. – d.M.y.</greatestDifference>
+							<greatestDifference id="d">d.M.y – d.M.y. GGGGG</greatestDifference>
 							<greatestDifference id="M">d.M.y. – d.M.y.</greatestDifference>
-							<greatestDifference id="y">d.M.y. – d.M.y.</greatestDifference>
+							<greatestDifference id="y">d.M.y – d.M.y. GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, d.M.y. – E, d.M.y.</greatestDifference>
-							<greatestDifference id="M">E, d.M.y. – E, d.M.y.</greatestDifference>
-							<greatestDifference id="y">E, d.M.y. – E, d.M.y.</greatestDifference>
+							<greatestDifference id="d">E, d.M.y – E, d.M.y. GGGGG</greatestDifference>
+							<greatestDifference id="M">E, d.M.y – E, d.M.y. GGGGG</greatestDifference>
+							<greatestDifference id="y">E, d.M.y – E, d.M.y. GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
 							<greatestDifference id="M">MMM–MMM y.</greatestDifference>
-							<greatestDifference id="y">MMM y. – MMM y.</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y. G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
 							<greatestDifference id="d">dd.–dd. MMM y.</greatestDifference>
@@ -1347,7 +1366,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
 							<greatestDifference id="M">y-MM – MM</greatestDifference>
-							<greatestDifference id="y">y-MM – y-MM</greatestDifference>
+							<greatestDifference id="y">MMMM y – MMMM y. G</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -1536,10 +1555,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<quarter type="4">4.</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
-							<quarter type="1">Prvo tromesečje</quarter>
-							<quarter type="2">Drugo tromesečje</quarter>
-							<quarter type="3">Treće tromesečje</quarter>
-							<quarter type="4">Četvrto tromesečje</quarter>
+							<quarter type="1">prvi kvartal</quarter>
+							<quarter type="2">drugi kvartal</quarter>
+							<quarter type="3">treći kvartal</quarter>
+							<quarter type="4">četvrti kvartal</quarter>
 						</quarterWidth>
 					</quarterContext>
 					<quarterContext type="stand-alone">
@@ -1550,39 +1569,91 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<quarter type="4">K4</quarter>
 						</quarterWidth>
 						<quarterWidth type="narrow">
-							<quarter type="1" draft="contributed">1.</quarter>
-							<quarter type="2" draft="contributed">2.</quarter>
-							<quarter type="3" draft="contributed">3.</quarter>
-							<quarter type="4" draft="contributed">4.</quarter>
+							<quarter type="1">1.</quarter>
+							<quarter type="2">2.</quarter>
+							<quarter type="3">3.</quarter>
+							<quarter type="4">4.</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
-							<quarter type="1">Prvo tromesečje</quarter>
-							<quarter type="2">Drugo tromesečje</quarter>
-							<quarter type="3">Treće tromesečje</quarter>
-							<quarter type="4">Četvrto tromesečje</quarter>
+							<quarter type="1">prvi kvartal</quarter>
+							<quarter type="2">drugi kvartal</quarter>
+							<quarter type="3">treći kvartal</quarter>
+							<quarter type="4">četvrti kvartal</quarter>
 						</quarterWidth>
 					</quarterContext>
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">ponoć</dayPeriod>
+							<dayPeriod type="am">pre podne</dayPeriod>
+							<dayPeriod type="noon">podne</dayPeriod>
+							<dayPeriod type="pm">po podne</dayPeriod>
+							<dayPeriod type="morning1">jutro</dayPeriod>
+							<dayPeriod type="afternoon1">po pod.</dayPeriod>
+							<dayPeriod type="evening1">veče</dayPeriod>
+							<dayPeriod type="night1">noć</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">u ponoć</dayPeriod>
 							<dayPeriod type="am" draft="contributed">a</dayPeriod>
-							<dayPeriod type="noon" draft="contributed">n</dayPeriod>
+							<dayPeriod type="noon">u podne</dayPeriod>
 							<dayPeriod type="pm" draft="contributed">p</dayPeriod>
+							<dayPeriod type="morning1">ujutru</dayPeriod>
+							<dayPeriod type="afternoon1">po podne</dayPeriod>
+							<dayPeriod type="evening1">uveče</dayPeriod>
+							<dayPeriod type="night1">noću</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">ponoć</dayPeriod>
 							<dayPeriod type="am">pre podne</dayPeriod>
-							<dayPeriod type="noon" draft="contributed">u podne</dayPeriod>
+							<dayPeriod type="noon">podne</dayPeriod>
 							<dayPeriod type="pm">po podne</dayPeriod>
+							<dayPeriod type="morning1">jutro</dayPeriod>
+							<dayPeriod type="afternoon1">popodne</dayPeriod>
+							<dayPeriod type="evening1">veče</dayPeriod>
+							<dayPeriod type="night1">noć</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">ponoć</dayPeriod>
+							<dayPeriod type="am">pre podne</dayPeriod>
+							<dayPeriod type="noon">podne</dayPeriod>
+							<dayPeriod type="pm">po podne</dayPeriod>
+							<dayPeriod type="morning1">jutro</dayPeriod>
+							<dayPeriod type="afternoon1">popodne</dayPeriod>
+							<dayPeriod type="evening1">veče</dayPeriod>
+							<dayPeriod type="night1">noć</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">ponoć</dayPeriod>
+							<dayPeriod type="am">pre podne</dayPeriod>
+							<dayPeriod type="noon">podne</dayPeriod>
+							<dayPeriod type="pm">po podne</dayPeriod>
+							<dayPeriod type="morning1">jutro</dayPeriod>
+							<dayPeriod type="afternoon1">popodne</dayPeriod>
+							<dayPeriod type="evening1">veče</dayPeriod>
+							<dayPeriod type="night1">noć</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">ponoć</dayPeriod>
+							<dayPeriod type="am">pre podne</dayPeriod>
+							<dayPeriod type="noon">podne</dayPeriod>
+							<dayPeriod type="pm">po podne</dayPeriod>
+							<dayPeriod type="morning1">jutro</dayPeriod>
+							<dayPeriod type="afternoon1">popodne</dayPeriod>
+							<dayPeriod type="evening1">veče</dayPeriod>
+							<dayPeriod type="night1">noć</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
-						<era type="0">Pre nove ere</era>
-						<era type="0" alt="variant" draft="contributed">p. n. e.</era>
-						<era type="1">Nove ere</era>
-						<era type="1" alt="variant" draft="contributed">n. e.</era>
+						<era type="0">pre nove ere</era>
+						<era type="0" alt="variant">p. n. e.</era>
+						<era type="1">nove ere</era>
+						<era type="1" alt="variant">n. e.</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">p. n. e.</era>
@@ -1640,61 +1711,65 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern draft="contributed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="E" draft="contributed">E</dateFormatItem>
+						<dateFormatItem id="E">E</dateFormatItem>
 						<dateFormatItem id="Ed">E d.</dateFormatItem>
-						<dateFormatItem id="Ehm" draft="contributed">E, h:mm a</dateFormatItem>
-						<dateFormatItem id="EHm" draft="contributed">E, HH:mm</dateFormatItem>
-						<dateFormatItem id="Ehms" draft="contributed">E, h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Gy" draft="contributed">y. G</dateFormatItem>
-						<dateFormatItem id="GyMMM" draft="contributed">MMM y. G</dateFormatItem>
-						<dateFormatItem id="GyMMMd" draft="contributed">d. MMM y. G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd" draft="contributed">E, d. MMM y. G</dateFormatItem>
-						<dateFormatItem id="h">hh a</dateFormatItem>
+						<dateFormatItem id="Ehm">E, h.mm a</dateFormatItem>
+						<dateFormatItem id="EHm">E, HH.mm</dateFormatItem>
+						<dateFormatItem id="Ehms">E, h.mm.ss a</dateFormatItem>
+						<dateFormatItem id="EHms">E, HH.mm.ss</dateFormatItem>
+						<dateFormatItem id="Gy">y. G</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM y. G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d. MMM y. G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d. MMM y. G</dateFormatItem>
+						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">HH</dateFormatItem>
 						<dateFormatItem id="hm">hh.mm a</dateFormatItem>
 						<dateFormatItem id="Hm">HH.mm</dateFormatItem>
 						<dateFormatItem id="hms">hh.mm.ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH.mm.ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h.mm.ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH.mm.ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h.mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH.mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">E, M-d</dateFormatItem>
+						<dateFormatItem id="MEd">E, d.M.</dateFormatItem>
 						<dateFormatItem id="MMdd">MM-dd</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
 						<dateFormatItem id="MMMdd">dd.MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d. MMM</dateFormatItem>
 						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E d. MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMEd">E, d. MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm.ss</dateFormatItem>
 						<dateFormatItem id="y">y.</dateFormatItem>
 						<dateFormatItem id="yM">M.y.</dateFormatItem>
-						<dateFormatItem id="yMd" draft="contributed">d.M.y.</dateFormatItem>
+						<dateFormatItem id="yMd">d.M.y.</dateFormatItem>
 						<dateFormatItem id="yMEd">E, d.M.y.</dateFormatItem>
 						<dateFormatItem id="yMM">MM.y.</dateFormatItem>
 						<dateFormatItem id="yMMdd">dd.MM.y.</dateFormatItem>
 						<dateFormatItem id="yMMM">MMM y.</dateFormatItem>
-						<dateFormatItem id="yMMMd" draft="contributed">d. MMM y.</dateFormatItem>
+						<dateFormatItem id="yMMMd">d. MMM y.</dateFormatItem>
 						<dateFormatItem id="yMMMEd">E, d. MMM y.</dateFormatItem>
 						<dateFormatItem id="yMMMM">MMMM y.</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ. y</dateFormatItem>
@@ -1704,7 +1779,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<appendItem request="Timezone">{0} {1}</appendItem>
 					</appendItems>
 					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
 						<intervalFormatItem id="d">
 							<greatestDifference id="d">d–d</greatestDifference>
 						</intervalFormatItem>
@@ -1766,8 +1841,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="y">y–y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">y M – M</greatestDifference>
-							<greatestDifference id="y">y M – M</greatestDifference>
+							<greatestDifference id="M">M – M, y</greatestDifference>
+							<greatestDifference id="y">M.y. – M.y.</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
 							<greatestDifference id="d">d.M.y. – d.M.y.</greatestDifference>
@@ -1794,8 +1869,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="y">E, dd. MMM y. – E, dd. MMM y.</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">y-MM – MM</greatestDifference>
-							<greatestDifference id="y">y-MM – y-MM</greatestDifference>
+							<greatestDifference id="M">MMMM – MMMM y.</greatestDifference>
+							<greatestDifference id="y">MMMM y – MMMM y.</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -1854,7 +1929,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="1" draft="provisional">Muh.</month>
 							<month type="2" draft="provisional">Saf.</month>
 							<month type="3" draft="provisional">Reb. 1</month>
-							<month type="4" draft="provisional">Reb 2</month>
+							<month type="4" draft="provisional">Reb. 2</month>
 							<month type="5" draft="provisional">Džum. 1</month>
 							<month type="6" draft="provisional">Džum. 2</month>
 							<month type="7" draft="provisional">Redž.</month>
@@ -1905,238 +1980,238 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<calendar type="japanese">
 				<eras>
 					<eraAbbr>
-						<era type="0">Taika (645-650)</era>
-						<era type="1">Hakuči (650-671)</era>
-						<era type="2">Hakuho (672-686)</era>
-						<era type="3">Šučo (686-701)</era>
-						<era type="4">Taiho (701-704)</era>
-						<era type="5">Keiun (704-708)</era>
-						<era type="6">Vado (708-715)</era>
-						<era type="7">Reiki (715-717)</era>
-						<era type="8">Joro (717-724)</era>
-						<era type="9">Jinki (724-729)</era>
-						<era type="10">Tempio (729-749)</era>
+						<era type="0">Taika (645–650)</era>
+						<era type="1">Hakuči (650–671)</era>
+						<era type="2">Hakuho (672–686)</era>
+						<era type="3">Šučo (686–701)</era>
+						<era type="4">Taiho (701–704)</era>
+						<era type="5">Keiun (704–708)</era>
+						<era type="6">Vado (708–715)</era>
+						<era type="7">Reiki (715–717)</era>
+						<era type="8">Joro (717–724)</era>
+						<era type="9">Jinki (724–729)</era>
+						<era type="10">Tempio (729–749)</era>
 						<era type="11">Tempio-kampo (749-749)</era>
 						<era type="12">Tempio-šoho (749-757)</era>
 						<era type="13">Tempio-hođi (757-765)</era>
 						<era type="14">Tempo-đingo (765-767)</era>
 						<era type="15">Đingo-keiun (767-770)</era>
-						<era type="16">Hoki (770-780)</era>
+						<era type="16">Hoki (770–780)</era>
 						<era type="17">Ten-o (781-782)</era>
-						<era type="18">Enrjaku (782-806)</era>
-						<era type="19">Daido (806-810)</era>
-						<era type="20">Konin (810-824)</era>
-						<era type="21">Tenčo (824-834)</era>
-						<era type="22">Šova (834-848)</era>
-						<era type="23">Kajo (848-851)</era>
-						<era type="24">Ninju (851-854)</era>
-						<era type="25">Saiko (854-857)</era>
-						<era type="26">Tenan (857-859)</era>
-						<era type="27">Jogan (859-877)</era>
-						<era type="28">Genkei (877-885)</era>
-						<era type="29">Ninja (885-889)</era>
-						<era type="30">Kampjo (889-898)</era>
-						<era type="31">Šotai (898-901)</era>
-						<era type="32">Enđi (901-923)</era>
-						<era type="33">Enčo (923-931)</era>
-						<era type="34">Šohei (931-938)</era>
-						<era type="35">Tengjo (938-947)</era>
-						<era type="36">Tenriaku (947-957)</era>
-						<era type="37">Tentoku (957-961)</era>
-						<era type="38">Ova (961-964)</era>
-						<era type="39">Koho (964-968)</era>
-						<era type="40">Ana (968-970)</era>
-						<era type="41">Tenroku (970-973)</era>
+						<era type="18">Enrjaku (782–806)</era>
+						<era type="19">Daido (806–810)</era>
+						<era type="20">Konin (810–824)</era>
+						<era type="21">Tenčo (824–834)</era>
+						<era type="22">Šova (834–848)</era>
+						<era type="23">Kajo (848–851)</era>
+						<era type="24">Ninju (851–854)</era>
+						<era type="25">Saiko (854–857)</era>
+						<era type="26">Tenan (857–859)</era>
+						<era type="27">Jogan (859–877)</era>
+						<era type="28">Genkei (877–885)</era>
+						<era type="29">Ninja (885–889)</era>
+						<era type="30">Kampjo (889–898)</era>
+						<era type="31">Šotai (898–901)</era>
+						<era type="32">Enđi (901–923)</era>
+						<era type="33">Enčo (923–931)</era>
+						<era type="34">Šohei (931–938)</era>
+						<era type="35">Tengjo (938–947)</era>
+						<era type="36">Tenriaku (947–957)</era>
+						<era type="37">Tentoku (957–961)</era>
+						<era type="38">Ova (961–964)</era>
+						<era type="39">Koho (964–968)</era>
+						<era type="40">Ana (968–970)</era>
+						<era type="41">Tenroku (970–973)</era>
 						<era type="42">Ten-en (973-976)</era>
-						<era type="43">Jogen (976-978)</era>
-						<era type="44">Tengen (978-983)</era>
-						<era type="45">Eikan (983-985)</era>
-						<era type="46">Kana (985-987)</era>
+						<era type="43">Jogen (976–978)</era>
+						<era type="44">Tengen (978–983)</era>
+						<era type="45">Eikan (983–985)</era>
+						<era type="46">Kana (985–987)</era>
 						<era type="47">Ei-en (987-989)</era>
-						<era type="48">Eiso (989-990)</era>
-						<era type="49">Šorjaku (990-995)</era>
-						<era type="50">Čotoku (995-999)</era>
-						<era type="51">Čoho (999-1004)</era>
-						<era type="52">Kanko (1004-1012)</era>
-						<era type="53">Čova (1012-1017)</era>
-						<era type="54">Kanin (1017-1021)</era>
-						<era type="55">Đian (1021-1024)</era>
-						<era type="56">Manju (1024-1028)</era>
-						<era type="57">Čogen (1028-1037)</era>
-						<era type="58">Čorjaku (1037-1040)</era>
-						<era type="59">Čokju (1040-1044)</era>
-						<era type="60">Kantoku (1044-1046)</era>
-						<era type="61">Eišo (1046-1053)</era>
-						<era type="62">Tenđi (1053-1058)</era>
-						<era type="63">Kohei (1058-1065)</era>
-						<era type="64">Đirjaku (1065-1069)</era>
-						<era type="65">Enkju (1069-1074)</era>
-						<era type="66">Šoho (1074-1077)</era>
-						<era type="67">Šorjaku (1077-1081)</era>
-						<era type="68">Eišo (1081-1084)</era>
-						<era type="69">Otoku (1084-1087)</era>
-						<era type="70">Kanđi (1087-1094)</era>
-						<era type="71">Kaho (1094-1096)</era>
-						<era type="72">Eičo (1096-1097)</era>
-						<era type="73">Šotoku (1097-1099)</era>
-						<era type="74">Kova (1099-1104)</era>
-						<era type="75">Čođi (1104-1106)</era>
-						<era type="76">Kašo (1106-1108)</era>
-						<era type="77">Tenin (1108-1110)</era>
+						<era type="48">Eiso (989–990)</era>
+						<era type="49">Šorjaku (990–995)</era>
+						<era type="50">Čotoku (995–999)</era>
+						<era type="51">Čoho (999–1004)</era>
+						<era type="52">Kanko (1004–1012)</era>
+						<era type="53">Čova (1012–1017)</era>
+						<era type="54">Kanin (1017–1021)</era>
+						<era type="55">Đian (1021–1024)</era>
+						<era type="56">Manju (1024–1028)</era>
+						<era type="57">Čogen (1028–1037)</era>
+						<era type="58">Čorjaku (1037–1040)</era>
+						<era type="59">Čokju (1040–1044)</era>
+						<era type="60">Kantoku (1044–1046)</era>
+						<era type="61">Eišo (1046–1053)</era>
+						<era type="62">Tenđi (1053–1058)</era>
+						<era type="63">Kohei (1058–1065)</era>
+						<era type="64">Đirjaku (1065–1069)</era>
+						<era type="65">Enkju (1069–1074)</era>
+						<era type="66">Šoho (1074–1077)</era>
+						<era type="67">Šorjaku (1077–1081)</era>
+						<era type="68">Eišo (1081–1084)</era>
+						<era type="69">Otoku (1084–1087)</era>
+						<era type="70">Kanđi (1087–1094)</era>
+						<era type="71">Kaho (1094–1096)</era>
+						<era type="72">Eičo (1096–1097)</era>
+						<era type="73">Šotoku (1097–1099)</era>
+						<era type="74">Kova (1099–1104)</era>
+						<era type="75">Čođi (1104–1106)</era>
+						<era type="76">Kašo (1106–1108)</era>
+						<era type="77">Tenin (1108–1110)</era>
 						<era type="78">Ten-ei (1110-1113)</era>
-						<era type="79">Eikju (1113-1118)</era>
+						<era type="79">Eikju (1113–1118)</era>
 						<era type="80">Đen-ei (1118-1120)</era>
-						<era type="81">Hoan (1120-1124)</era>
-						<era type="82">Tenđi (1124-1126)</era>
-						<era type="83">Daiđi (1126-1131)</era>
-						<era type="84">Tenšo (1131-1132)</era>
-						<era type="85">Čošao (1132-1135)</era>
-						<era type="86">Hoen (1135-1141)</era>
-						<era type="87">Eiđi (1141-1142)</era>
-						<era type="88">Kođi (1142-1144)</era>
-						<era type="89">Tenjo (1144-1145)</era>
-						<era type="90">Kjuan (1145-1151)</era>
-						<era type="91">Ninpei (1151-1154)</era>
-						<era type="92">Kjuju (1154-1156)</era>
-						<era type="93">Hogen (1156-1159)</era>
-						<era type="94">Heiđi (1159-1160)</era>
-						<era type="95">Eirjaku (1160-1161)</era>
-						<era type="96">Oho (1161-1163)</era>
-						<era type="97">Čokan (1163-1165)</era>
-						<era type="98">Eiman (1165-1166)</era>
+						<era type="81">Hoan (1120–1124)</era>
+						<era type="82">Tenđi (1124–1126)</era>
+						<era type="83">Daiđi (1126–1131)</era>
+						<era type="84">Tenšo (1131–1132)</era>
+						<era type="85">Čošao (1132–1135)</era>
+						<era type="86">Hoen (1135–1141)</era>
+						<era type="87">Eiđi (1141–1142)</era>
+						<era type="88">Kođi (1142–1144)</era>
+						<era type="89">Tenjo (1144–1145)</era>
+						<era type="90">Kjuan (1145–1151)</era>
+						<era type="91">Ninpei (1151–1154)</era>
+						<era type="92">Kjuju (1154–1156)</era>
+						<era type="93">Hogen (1156–1159)</era>
+						<era type="94">Heiđi (1159–1160)</era>
+						<era type="95">Eirjaku (1160–1161)</era>
+						<era type="96">Oho (1161–1163)</era>
+						<era type="97">Čokan (1163–1165)</era>
+						<era type="98">Eiman (1165–1166)</era>
 						<era type="99">Nin-an (1166-1169)</era>
-						<era type="100">Kao (1169-1171)</era>
-						<era type="101">Šoan (1171-1175)</era>
-						<era type="102">Angen (1175-1177)</era>
-						<era type="103">Đišo (1177-1181)</era>
-						<era type="104">Jova (1181-1182)</era>
-						<era type="105">Đuei (1182-1184)</era>
-						<era type="106">Genrjuku (1184-1185)</era>
-						<era type="107">Bunđi (1185-1190)</era>
-						<era type="108">Kenkju (1190-1199)</era>
-						<era type="109">Šođi (1199-1201)</era>
-						<era type="110">Kenin (1201-1204)</era>
-						<era type="111">Genkju (1204-1206)</era>
+						<era type="100">Kao (1169–1171)</era>
+						<era type="101">Šoan (1171–1175)</era>
+						<era type="102">Angen (1175–1177)</era>
+						<era type="103">Đišo (1177–1181)</era>
+						<era type="104">Jova (1181–1182)</era>
+						<era type="105">Đuei (1182–1184)</era>
+						<era type="106">Genrjuku (1184–1185)</era>
+						<era type="107">Bunđi (1185–1190)</era>
+						<era type="108">Kenkju (1190–1199)</era>
+						<era type="109">Šođi (1199–1201)</era>
+						<era type="110">Kenin (1201–1204)</era>
+						<era type="111">Genkju (1204–1206)</era>
 						<era type="112">Ken-ei (1206-1207)</era>
-						<era type="113">Šogen (1207-1211)</era>
-						<era type="114">Kenrjaku (1211-1213)</era>
-						<era type="115">Kenpo (1213-1219)</era>
-						<era type="116">Šokju (1219-1222)</era>
-						<era type="117">Đu (1222-1224)</era>
-						<era type="118">Đenin (1224-1225)</era>
-						<era type="119">Karoku (1225-1227)</era>
-						<era type="120">Antei (1227-1229)</era>
-						<era type="121">Kanki (1229-1232)</era>
-						<era type="122">Đoei (1232-1233)</era>
-						<era type="123">Tempuku (1233-1234)</era>
-						<era type="124">Bunrjaku (1234-1235)</era>
-						<era type="125">Katei (1235-1238)</era>
-						<era type="126">Rjakunin (1238-1239)</era>
+						<era type="113">Šogen (1207–1211)</era>
+						<era type="114">Kenrjaku (1211–1213)</era>
+						<era type="115">Kenpo (1213–1219)</era>
+						<era type="116">Šokju (1219–1222)</era>
+						<era type="117">Đu (1222–1224)</era>
+						<era type="118">Đenin (1224–1225)</era>
+						<era type="119">Karoku (1225–1227)</era>
+						<era type="120">Antei (1227–1229)</era>
+						<era type="121">Kanki (1229–1232)</era>
+						<era type="122">Đoei (1232–1233)</era>
+						<era type="123">Tempuku (1233–1234)</era>
+						<era type="124">Bunrjaku (1234–1235)</era>
+						<era type="125">Katei (1235–1238)</era>
+						<era type="126">Rjakunin (1238–1239)</era>
 						<era type="127">En-o (1239-1240)</era>
-						<era type="128">Ninji (1240-1243)</era>
-						<era type="129">Kangen (1243-1247)</era>
-						<era type="130">Hođi (1247-1249)</era>
-						<era type="131">Kenčo (1249-1256)</era>
-						<era type="132">Kogen (1256-1257)</era>
-						<era type="133">Šoka (1257-1259)</era>
-						<era type="134">Šogen (1259-1260)</era>
+						<era type="128">Ninji (1240–1243)</era>
+						<era type="129">Kangen (1243–1247)</era>
+						<era type="130">Hođi (1247–1249)</era>
+						<era type="131">Kenčo (1249–1256)</era>
+						<era type="132">Kogen (1256–1257)</era>
+						<era type="133">Šoka (1257–1259)</era>
+						<era type="134">Šogen (1259–1260)</era>
 						<era type="135">Bun-o (1260-1261)</era>
-						<era type="136">Kočo (1261-1264)</era>
+						<era type="136">Kočo (1261–1264)</era>
 						<era type="137">Bun-ei (1264-1275)</era>
-						<era type="138">Kenđi (1275-1278)</era>
-						<era type="139">Koan (1278-1288)</era>
-						<era type="140">Šu (1288-1293)</era>
-						<era type="141">Einin (1293-1299)</era>
-						<era type="142">Šoan (1299-1302)</era>
-						<era type="143">Kengen (1302-1303)</era>
-						<era type="144">Kagen (1303-1306)</era>
-						<era type="145">Tokuđi (1306-1308)</era>
-						<era type="146">Enkei (1308-1311)</era>
-						<era type="147">Očo (1311-1312)</era>
-						<era type="148">Šova (1312-1317)</era>
-						<era type="149">Bunpo (1317-1319)</era>
-						<era type="150">Đeno (1319-1321)</era>
-						<era type="151">Đenkjo (1321-1324)</era>
-						<era type="152">Šoču (1324-1326)</era>
-						<era type="153">Kareki (1326-1329)</era>
-						<era type="154">Gentoku (1329-1331)</era>
-						<era type="155">Genko (1331-1334)</era>
-						<era type="156">Kemu (1334-1336)</era>
-						<era type="157">Engen (1336-1340)</era>
-						<era type="158">Kokoku (1340-1346)</era>
-						<era type="159">Šohei (1346-1370)</era>
-						<era type="160">Kentoku (1370-1372)</era>
-						<era type="161">Buču (1372-1375)</era>
-						<era type="162">Tenju (1375-1379)</era>
-						<era type="163">Korjaku (1379-1381)</era>
-						<era type="164">Kova (1381-1384)</era>
-						<era type="165">Genču (1384-1392)</era>
-						<era type="166">Meitoku (1384-1387)</era>
-						<era type="167">Kakei (1387-1389)</era>
-						<era type="168">Ku (1389-1390)</era>
-						<era type="169">Meitoku (1390-1394)</era>
-						<era type="170">Oei (1394-1428)</era>
-						<era type="171">Šočo (1428-1429)</era>
-						<era type="172">Eikjo (1429-1441)</era>
-						<era type="173">Kakitsu (1441-1444)</era>
+						<era type="138">Kenđi (1275–1278)</era>
+						<era type="139">Koan (1278–1288)</era>
+						<era type="140">Šu (1288–1293)</era>
+						<era type="141">Einin (1293–1299)</era>
+						<era type="142">Šoan (1299–1302)</era>
+						<era type="143">Kengen (1302–1303)</era>
+						<era type="144">Kagen (1303–1306)</era>
+						<era type="145">Tokuđi (1306–1308)</era>
+						<era type="146">Enkei (1308–1311)</era>
+						<era type="147">Očo (1311–1312)</era>
+						<era type="148">Šova (1312–1317)</era>
+						<era type="149">Bunpo (1317–1319)</era>
+						<era type="150">Đeno (1319–1321)</era>
+						<era type="151">Đenkjo (1321–1324)</era>
+						<era type="152">Šoču (1324–1326)</era>
+						<era type="153">Kareki (1326–1329)</era>
+						<era type="154">Gentoku (1329–1331)</era>
+						<era type="155">Genko (1331–1334)</era>
+						<era type="156">Kemu (1334–1336)</era>
+						<era type="157">Engen (1336–1340)</era>
+						<era type="158">Kokoku (1340–1346)</era>
+						<era type="159">Šohei (1346–1370)</era>
+						<era type="160">Kentoku (1370–1372)</era>
+						<era type="161">Buču (1372–1375)</era>
+						<era type="162">Tenju (1375–1379)</era>
+						<era type="163">Korjaku (1379–1381)</era>
+						<era type="164">Kova (1381–1384)</era>
+						<era type="165">Genču (1384–1392)</era>
+						<era type="166">Meitoku (1384–1387)</era>
+						<era type="167">Kakei (1387–1389)</era>
+						<era type="168">Ku (1389–1390)</era>
+						<era type="169">Meitoku (1390–1394)</era>
+						<era type="170">Oei (1394–1428)</era>
+						<era type="171">Šočo (1428–1429)</era>
+						<era type="172">Eikjo (1429–1441)</era>
+						<era type="173">Kakitsu (1441–1444)</era>
 						<era type="174">Bun-an (1444-1449)</era>
-						<era type="175">Hotoku (1449-1452)</era>
-						<era type="176">Kjotoku (1452-1455)</era>
-						<era type="177">Košo (1455-1457)</era>
-						<era type="178">Čoroku (1457-1460)</era>
-						<era type="179">Kanšo (1460-1466)</era>
-						<era type="180">Bunšo (1466-1467)</era>
-						<era type="181">Onin (1467-1469)</era>
-						<era type="182">Bunmei (1469-1487)</era>
-						<era type="183">Čokjo (1487-1489)</era>
-						<era type="184">Entoku (1489-1492)</era>
-						<era type="185">Meio (1492-1501)</era>
-						<era type="186">Bunki (1501-1504)</era>
-						<era type="187">Eišo (1504-1521)</era>
-						<era type="188">Taiei (1521-1528)</era>
-						<era type="189">Kjoroku (1528-1532)</era>
-						<era type="190">Tenmon (1532-1555)</era>
-						<era type="191">Kođi (1555-1558)</era>
-						<era type="192">Eiroku (1558-1570)</era>
-						<era type="193">Genki (1570-1573)</era>
-						<era type="194">Tenšo (1573-1592)</era>
-						<era type="195">Bunroku (1592-1596)</era>
-						<era type="196">Keičo (1596-1615)</era>
-						<era type="197">Genva (1615-1624)</era>
+						<era type="175">Hotoku (1449–1452)</era>
+						<era type="176">Kjotoku (1452–1455)</era>
+						<era type="177">Košo (1455–1457)</era>
+						<era type="178">Čoroku (1457–1460)</era>
+						<era type="179">Kanšo (1460–1466)</era>
+						<era type="180">Bunšo (1466–1467)</era>
+						<era type="181">Onin (1467–1469)</era>
+						<era type="182">Bunmei (1469–1487)</era>
+						<era type="183">Čokjo (1487–1489)</era>
+						<era type="184">Entoku (1489–1492)</era>
+						<era type="185">Meio (1492–1501)</era>
+						<era type="186">Bunki (1501–1504)</era>
+						<era type="187">Eišo (1504–1521)</era>
+						<era type="188">Taiei (1521–1528)</era>
+						<era type="189">Kjoroku (1528–1532)</era>
+						<era type="190">Tenmon (1532–1555)</era>
+						<era type="191">Kođi (1555–1558)</era>
+						<era type="192">Eiroku (1558–1570)</era>
+						<era type="193">Genki (1570–1573)</era>
+						<era type="194">Tenšo (1573–1592)</era>
+						<era type="195">Bunroku (1592–1596)</era>
+						<era type="196">Keičo (1596–1615)</era>
+						<era type="197">Genva (1615–1624)</era>
 						<era type="198">Kan-ei (1624-1644)</era>
-						<era type="199">Šoho (1644-1648)</era>
-						<era type="200">Keian (1648-1652)</era>
-						<era type="201">Šu (1652-1655)</era>
-						<era type="202">Meirjaku (1655-1658)</era>
-						<era type="203">Manji (1658-1661)</era>
-						<era type="204">Kanbun (1661-1673)</era>
-						<era type="205">Enpo (1673-1681)</era>
-						<era type="206">Tenva (1681-1684)</era>
-						<era type="207">Jokjo (1684-1688)</era>
-						<era type="208">Genroku (1688-1704)</era>
-						<era type="209">Hoei (1704-1711)</era>
-						<era type="210">Šotoku (1711-1716)</era>
-						<era type="211">Kjoho (1716-1736)</era>
-						<era type="212">Genbun (1736-1741)</era>
-						<era type="213">Kanpo (1741-1744)</era>
-						<era type="214">Enkjo (1744-1748)</era>
+						<era type="199">Šoho (1644–1648)</era>
+						<era type="200">Keian (1648–1652)</era>
+						<era type="201">Šu (1652–1655)</era>
+						<era type="202">Meirjaku (1655–1658)</era>
+						<era type="203">Manji (1658–1661)</era>
+						<era type="204">Kanbun (1661–1673)</era>
+						<era type="205">Enpo (1673–1681)</era>
+						<era type="206">Tenva (1681–1684)</era>
+						<era type="207">Jokjo (1684–1688)</era>
+						<era type="208">Genroku (1688–1704)</era>
+						<era type="209">Hoei (1704–1711)</era>
+						<era type="210">Šotoku (1711–1716)</era>
+						<era type="211">Kjoho (1716–1736)</era>
+						<era type="212">Genbun (1736–1741)</era>
+						<era type="213">Kanpo (1741–1744)</era>
+						<era type="214">Enkjo (1744–1748)</era>
 						<era type="215">Kan-en (1748-1751)</era>
-						<era type="216">Horjaku (1751-1764)</era>
-						<era type="217">Meiva (1764-1772)</era>
+						<era type="216">Horjaku (1751–1764)</era>
+						<era type="217">Meiva (1764–1772)</era>
 						<era type="218">An-ei (1772-1781)</era>
-						<era type="219">Tenmei (1781-1789)</era>
-						<era type="220">Kansei (1789-1801)</era>
-						<era type="221">Kjova (1801-1804)</era>
-						<era type="222">Bunka (1804-1818)</era>
-						<era type="223">Bunsei (1818-1830)</era>
-						<era type="224">Tenpo (1830-1844)</era>
-						<era type="225">Koka (1844-1848)</era>
-						<era type="226">Kaei (1848-1854)</era>
-						<era type="227">Ansei (1854-1860)</era>
+						<era type="219">Tenmei (1781–1789)</era>
+						<era type="220">Kansei (1789–1801)</era>
+						<era type="221">Kjova (1801–1804)</era>
+						<era type="222">Bunka (1804–1818)</era>
+						<era type="223">Bunsei (1818–1830)</era>
+						<era type="224">Tenpo (1830–1844)</era>
+						<era type="225">Koka (1844–1848)</era>
+						<era type="226">Kaei (1848–1854)</era>
+						<era type="227">Ansei (1854–1860)</era>
 						<era type="228">Man-en (1860-1861)</era>
-						<era type="229">Bunkju (1861-1864)</era>
-						<era type="230">Genđi (1864-1865)</era>
-						<era type="231">Keiko (1865-1868)</era>
+						<era type="229">Bunkju (1861–1864)</era>
+						<era type="230">Genđi (1864–1865)</era>
+						<era type="231">Keiko (1865–1868)</era>
 						<era type="232">Meiđi</era>
 						<era type="233">Taišo</era>
 						<era type="234">Šova</era>
@@ -2248,6 +2323,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter">
 				<displayName>kvartal</displayName>
+				<relative type="-1">prošlog kvartala</relative>
+				<relative type="0">ovog kvartala</relative>
+				<relative type="1">sledećeg kvartala</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">za {0} kvartal</relativeTimePattern>
 					<relativeTimePattern count="few">za {0} kvartala</relativeTimePattern>
@@ -2260,29 +2338,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="quarter-short">
-				<displayName draft="contributed">kvartal</displayName>
+				<displayName>kv.</displayName>
+				<relative type="-1">prošlog kvartala</relative>
+				<relative type="0">ovog kvartala</relative>
+				<relative type="1">sledećeg kvartala</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">za {0} kvartala</relativeTimePattern>
-					<relativeTimePattern count="few">za {0} kvartala</relativeTimePattern>
-					<relativeTimePattern count="other">za {0} kvartala</relativeTimePattern>
+					<relativeTimePattern count="one">za {0} kv.</relativeTimePattern>
+					<relativeTimePattern count="few">za {0} kv.</relativeTimePattern>
+					<relativeTimePattern count="other">za {0} kv.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">pre {0} kvartala</relativeTimePattern>
-					<relativeTimePattern count="few">pre {0} kvartala</relativeTimePattern>
-					<relativeTimePattern count="other">pre {0} kvartala</relativeTimePattern>
+					<relativeTimePattern count="one">pre {0} kv.</relativeTimePattern>
+					<relativeTimePattern count="few">pre {0} kv.</relativeTimePattern>
+					<relativeTimePattern count="other">pre {0} kv.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-narrow">
-				<displayName draft="contributed">kvartal</displayName>
+				<displayName>kv.</displayName>
+				<relative type="-1">prošlog kvartala</relative>
+				<relative type="0">ovog kvartala</relative>
+				<relative type="1">sledećeg kvartala</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">za {0} kvartala</relativeTimePattern>
-					<relativeTimePattern count="few">za {0} kvartala</relativeTimePattern>
-					<relativeTimePattern count="other">za {0} kvartala</relativeTimePattern>
+					<relativeTimePattern count="one">za {0} kv.</relativeTimePattern>
+					<relativeTimePattern count="few">za {0} kv.</relativeTimePattern>
+					<relativeTimePattern count="other">za {0} kv.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">pre {0} kvartala</relativeTimePattern>
-					<relativeTimePattern count="few">pre {0} kvartala</relativeTimePattern>
-					<relativeTimePattern count="other">pre {0} kvartala</relativeTimePattern>
+					<relativeTimePattern count="one">pre {0} kv.</relativeTimePattern>
+					<relativeTimePattern count="few">pre {0} kv.</relativeTimePattern>
+					<relativeTimePattern count="other">pre {0} kv.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month">
@@ -2442,9 +2526,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">sledećeg pon</relative>
 			</field>
 			<field type="mon-narrow">
-				<relative type="-1" draft="contributed">prošlog pon</relative>
-				<relative type="0" draft="contributed">u pon</relative>
-				<relative type="1" draft="contributed">sledećeg pon</relative>
+				<relative type="-1">prošlog pon</relative>
+				<relative type="0">u pon</relative>
+				<relative type="1">sledećeg pon</relative>
 			</field>
 			<field type="tue">
 				<relative type="-1">prošlog utorka</relative>
@@ -2769,7 +2853,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Broken Hil</exemplarCity>
 			</zone>
 			<zone type="Australia/Currie">
-				<exemplarCity>Kurie</exemplarCity>
+				<exemplarCity>Kari</exemplarCity>
 			</zone>
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Melburn</exemplarCity>
@@ -3130,7 +3214,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</zone>
 			<zone type="Europe/London">
 				<long>
-					<daylight draft="contributed">britansko letnje vreme</daylight>
+					<daylight>Britanija letnje računanje vremena</daylight>
 				</long>
 				<exemplarCity>London</exemplarCity>
 			</zone>
@@ -3223,7 +3307,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</zone>
 			<zone type="Europe/Dublin">
 				<long>
-					<daylight draft="contributed">irsko letnje vreme</daylight>
+					<daylight>Irska standardno vreme</daylight>
 				</long>
 				<exemplarCity>Dablin</exemplarCity>
 			</zone>
@@ -3521,6 +3605,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Morzbi</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity draft="contributed">Buganvil</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
 			</zone>
@@ -3605,6 +3692,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkuck</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity draft="contributed">Čita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Jakutsk</exemplarCity>
 			</zone>
@@ -3623,6 +3713,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity draft="contributed">Srednjekolimsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamčatka</exemplarCity>
 			</zone>
@@ -3687,7 +3780,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Salvador</exemplarCity>
 			</zone>
 			<zone type="America/Lower_Princes">
-				<exemplarCity draft="contributed">Louer Prinsiz Kvorter</exemplarCity>
+				<exemplarCity>Louer Prinsiz Kvorter</exemplarCity>
 			</zone>
 			<zone type="Asia/Damascus">
 				<exemplarCity>Damask</exemplarCity>
@@ -3938,9 +4031,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Alaska">
 				<long>
-					<generic draft="contributed">Aljaško vreme</generic>
-					<standard draft="contributed">Aljaško standardno vreme</standard>
-					<daylight draft="contributed">Aljaško letnje vreme</daylight>
+					<generic>Aljaska</generic>
+					<standard>Aljaska, standardno vreme</standard>
+					<daylight>Aljaska, letnje računanje vremena</daylight>
 				</long>
 			</metazone>
 			<metazone type="Almaty">
@@ -4036,9 +4129,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Armenia">
 				<long>
-					<generic>Armenija vreme</generic>
-					<standard>Armenija standardno vreme</standard>
-					<daylight>Armenija letnje računanje vremena</daylight>
+					<generic>Jermenija vreme</generic>
+					<standard>Jermenija standardno vreme</standard>
+					<daylight>Jermenija letnje računanje vremena</daylight>
 				</long>
 			</metazone>
 			<metazone type="Atlantic">
@@ -4121,9 +4214,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Cape_Verde">
 				<long>
-					<generic>Zelenirtsko vreme</generic>
-					<standard>Zelenirtsko standardno vreme</standard>
-					<daylight>Zelenortsko letnje računanje vremena</daylight>
+					<generic>Zelenortska Ostrva vreme</generic>
+					<standard>Zelenortska Ostrva standardno vreme</standard>
+					<daylight>Zelenortska Ostrva letnje računanje vremena</daylight>
 				</long>
 			</metazone>
 			<metazone type="Chamorro">
@@ -4161,7 +4254,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Christmas">
 				<long>
-					<standard>Božićna ostrva vreme</standard>
+					<standard>Božićno ostrvo vreme</standard>
 				</long>
 			</metazone>
 			<metazone type="Cocos">
@@ -4289,7 +4382,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Gambier">
 				<long>
-					<standard>Gambijer vreme</standard>
+					<standard>Gambije vreme</standard>
 				</long>
 			</metazone>
 			<metazone type="Georgia">
@@ -4468,7 +4561,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Line_Islands">
 				<long>
-					<standard>Line Ostrva vreme</standard>
+					<standard>Ostrva Lajn vreme</standard>
 				</long>
 			</metazone>
 			<metazone type="Lord_Howe">
@@ -4487,7 +4580,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Macquarie">
 				<long>
-					<standard draft="contributed">Makverijsko vreme</standard>
+					<standard>Ostrvo Makveri vreme</standard>
 				</long>
 			</metazone>
 			<metazone type="Magadan">
@@ -4686,7 +4779,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Ponape">
 				<long>
-					<standard>Ponpei vreme</standard>
+					<standard>Ponpej vreme</standard>
 				</long>
 			</metazone>
 			<metazone type="Qyzylorda">
@@ -4749,7 +4842,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Suriname">
 				<long>
-					<standard draft="contributed">Surinam</standard>
+					<standard>Surinam vreme</standard>
 				</long>
 			</metazone>
 			<metazone type="Syowa">
@@ -4892,7 +4985,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<perMille>‰</perMille>
 			<infinity>∞</infinity>
 			<nan>NaN</nan>
-			<timeSeparator draft="contributed">:</timeSeparator>
+			<timeSeparator>.</timeSeparator>
 		</symbols>
 		<decimalFormats numberSystem="latn">
 			<decimalFormatLength>
@@ -5004,6 +5097,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0 hilj'.' ¤</pattern>
+					<pattern type="1000" count="few" draft="provisional">0 hilj'.' ¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0 hilj'.' ¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00 hilj'.' ¤</pattern>
+					<pattern type="10000" count="few" draft="provisional">00 hilj'.' ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00 hilj'.' ¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000 hilj'.' ¤</pattern>
+					<pattern type="100000" count="few" draft="provisional">000 hilj'.' ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000 hilj'.' ¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0 mil'.' ¤</pattern>
+					<pattern type="1000000" count="few" draft="provisional">0 mil'.' ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0 mil'.' ¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00 mil'.' ¤</pattern>
+					<pattern type="10000000" count="few" draft="provisional">00 mil'.' ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00 mil'.' ¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000 mil'.' ¤</pattern>
+					<pattern type="100000000" count="few" draft="provisional">000 mil'.' ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000 mil'.' ¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0 mlrd'.' ¤</pattern>
+					<pattern type="1000000000" count="few" draft="provisional">0 mlrd'.' ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0 mlrd'.' ¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00 mlrd'.' ¤</pattern>
+					<pattern type="10000000000" count="few" draft="provisional">00 mlrd'.' ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00 mlrd'.' ¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000 mlrd'.' ¤</pattern>
+					<pattern type="100000000000" count="few" draft="provisional">000 mlrd'.' ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000 mlrd'.' ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0 bil'.' ¤</pattern>
+					<pattern type="1000000000000" count="few" draft="provisional">0 bil'.' ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="few" draft="provisional">00 bil'.' ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="few" draft="provisional">000 bil'.' ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000 bil'.' ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="few">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
@@ -5067,6 +5200,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">angolske kvanze</displayName>
 				<displayName count="other">angolskih kvanzi</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>Angolijska kvanza (1977–1990)</displayName>
@@ -5127,7 +5261,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="AUD">
 				<displayName>Australijski dolar</displayName>
 				<displayName count="one">australijski dolar</displayName>
-				<displayName count="few">Australijska dolara</displayName>
+				<displayName count="few">australijska dolara</displayName>
 				<displayName count="other">australijskih dolara</displayName>
 				<symbol>AUD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
@@ -5164,6 +5298,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">bosansko-hercegovačke konvertibilne marke</displayName>
 				<displayName count="other">bosansko-hercegovačkih konvertibilnih maraka</displayName>
 				<symbol>KM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BAN">
 				<displayName draft="provisional">Bosansko-hercegovački novi dinar</displayName>
@@ -5261,11 +5396,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BOB">
-				<displayName>Bolivijski Boliviano</displayName>
-				<displayName count="one">bolivijski boliviano</displayName>
-				<displayName count="few">bolivijska boliviana</displayName>
-				<displayName count="other">bolivijskih boliviana</displayName>
+				<displayName>Bolivijski bolivijano</displayName>
+				<displayName count="one">bolivijski bolivijano</displayName>
+				<displayName count="few">bolivijska bolivijana</displayName>
+				<displayName count="other">bolivijskih bolivijana</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOL">
 				<displayName draft="provisional">Stari bolivijski bolivijano</displayName>
@@ -5356,6 +5492,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">bocvanske pule</displayName>
 				<displayName count="other">bocvanskih pula</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>Beloruska nova rublja (1994–1999)</displayName>
@@ -5369,6 +5506,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">beloruske rublje</displayName>
 				<displayName count="other">beloruskih rublji</displayName>
 				<symbol draft="contributed">[BYR]</symbol>
+				<symbol alt="narrow" draft="contributed">r.</symbol>
 			</currency>
 			<currency type="BZD">
 				<displayName>Beliski dolar</displayName>
@@ -5388,9 +5526,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="CDF">
 				<displayName>Kongoanski franak</displayName>
-				<displayName count="one">kongolski franak</displayName>
-				<displayName count="few">kongolska franka</displayName>
-				<displayName count="other">kongolskih franaka</displayName>
+				<displayName count="one">kongoanski franak</displayName>
+				<displayName count="few">kongoanska franka</displayName>
+				<displayName count="other">kongoanskih franaka</displayName>
 				<symbol>CDF</symbol>
 			</currency>
 			<currency type="CHE">
@@ -5486,6 +5624,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">kubanska konvertibilna pezosa</displayName>
 				<displayName count="other">kubanskih konvertibilnih pezosa</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>Kubanski pezos</displayName>
@@ -5514,6 +5653,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">češke krune</displayName>
 				<displayName count="other">čeških kruna</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>Istočno-nemačka marka</displayName>
@@ -5540,6 +5680,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">danske krune</displayName>
 				<displayName count="other">danskih kruna</displayName>
 				<symbol draft="contributed">DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Dominikanski pezos</displayName>
@@ -5580,6 +5721,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">egipatske funte</displayName>
 				<displayName count="other">egipatskih funti</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>Eritrejska nakfa</displayName>
@@ -5607,10 +5749,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">španske pezete</displayName>
 			</currency>
 			<currency type="ETB">
-				<displayName>Etiopijski bir</displayName>
-				<displayName count="one">etiopijski bir</displayName>
-				<displayName count="few">etiopijska bira</displayName>
-				<displayName count="other">etiopijskih bira</displayName>
+				<displayName>Etiopski bir</displayName>
+				<displayName count="one">etiopski bir</displayName>
+				<displayName count="few">etiopska bira</displayName>
+				<displayName count="other">etiopskih bira</displayName>
 				<symbol>ETB</symbol>
 			</currency>
 			<currency type="EUR">
@@ -5619,6 +5761,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">evra</displayName>
 				<displayName count="other">evra</displayName>
 				<symbol draft="contributed">€</symbol>
+				<symbol alt="narrow" draft="contributed">€</symbol>
 			</currency>
 			<currency type="FIM">
 				<displayName>Finska marka</displayName>
@@ -5640,6 +5783,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">foklandske funte</displayName>
 				<displayName count="other">foklandskih funti</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>Francuski franak</displayName>
@@ -5653,6 +5797,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">britanske funte</displayName>
 				<displayName count="other">britanskih funti</displayName>
 				<symbol draft="contributed">£</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GEK">
 				<displayName>Gruzijski kupon larit</displayName>
@@ -5666,6 +5811,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">gruzijska larija</displayName>
 				<displayName count="other">gruzijskih larija</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">ლ</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>Ganski cedi (1979–2007)</displayName>
@@ -5692,7 +5838,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Gambijski dalasi</displayName>
 				<displayName count="one">gambijski dalasi</displayName>
 				<displayName count="few">gambijska dalasa</displayName>
-				<displayName count="other">gambijskih dalasa</displayName>
+				<displayName count="other">gambijskih dalasija</displayName>
 				<symbol>GMD</symbol>
 			</currency>
 			<currency type="GNF">
@@ -5701,6 +5847,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">gvinejska franka</displayName>
 				<displayName count="other">gvinejskih franaka</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>Gvinejski sili</displayName>
@@ -5726,6 +5873,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">gvatemalska kecala</displayName>
 				<displayName count="other">gvatemalskih kecala</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>Portugalska gvineja eskudo</displayName>
@@ -5757,10 +5905,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="HNL">
 				<displayName>Honduraška lempira</displayName>
-				<displayName count="one">honduraški lempir</displayName>
-				<displayName count="few">honduraška lempira</displayName>
+				<displayName count="one">honduraška lempira</displayName>
+				<displayName count="few">honduraške lempire</displayName>
 				<displayName count="other">honduraških lempira</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>Hrvatski dinar</displayName>
@@ -5774,6 +5923,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">hrvatske kune</displayName>
 				<displayName count="other">hrvatskih kuna</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>Haićanski gurd</displayName>
@@ -5788,6 +5938,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">mađarske forinte</displayName>
 				<displayName count="other">mađarskih forinti</displayName>
 				<symbol draft="contributed">HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>Indonežanska rupija</displayName>
@@ -5795,6 +5946,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">indonežanske rupije</displayName>
 				<displayName count="other">indonežanskih rupija</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>Irska funta</displayName>
@@ -5856,6 +6008,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">islandske krune</displayName>
 				<displayName count="other">islandskih kruna</displayName>
 				<symbol draft="contributed">ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>Italijanska lira</displayName>
@@ -5865,9 +6018,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="JMD">
 				<displayName>Jamajčanski dolar</displayName>
-				<displayName count="one">jamajkanski dolar</displayName>
-				<displayName count="few">jamajkanska dolara</displayName>
-				<displayName count="other">jamajkanskix dolara</displayName>
+				<displayName count="one">jamajčanski dolar</displayName>
+				<displayName count="few">jamajčanska dolara</displayName>
+				<displayName count="other">jamajčanskix dolara</displayName>
 				<symbol>JMD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -5914,6 +6067,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">komorska franka</displayName>
 				<displayName count="other">komorskih franaka</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>Severnokorejski von</displayName>
@@ -5921,6 +6075,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">severnokorejska vona</displayName>
 				<displayName count="other">severnokorejskih vona</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRH">
 				<displayName draft="provisional">Južnokorejski hvan</displayName>
@@ -5960,8 +6115,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="KZT">
 				<displayName>Kazahstanski tenge</displayName>
 				<displayName count="one">kazahstanski tenge</displayName>
-				<displayName count="few">kazahstanske tenge</displayName>
-				<displayName count="other">kazahstanskih tengi</displayName>
+				<displayName count="few">kazahstanska tengea</displayName>
+				<displayName count="other">kazahstanskih tengea</displayName>
 				<symbol>KZT</symbol>
 				<symbol alt="narrow" draft="contributed">₸</symbol>
 			</currency>
@@ -5979,6 +6134,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">libanske funte</displayName>
 				<displayName count="other">libanskih funti</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>Šrilankanska rupija</displayName>
@@ -5986,6 +6142,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">šrilankanske rupije</displayName>
 				<displayName count="other">šrilankanskih rupija</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>Liberijski dolar</displayName>
@@ -6054,8 +6211,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="MAD">
 				<displayName>Marokanski dirham</displayName>
-				<displayName count="one">marokanska dirhama</displayName>
-				<displayName count="few">marokanske dirhame</displayName>
+				<displayName count="one">marokanski dirham</displayName>
+				<displayName count="few">marokanska dirhama</displayName>
 				<displayName count="other">marokanskih dirhama</displayName>
 				<symbol>MAD</symbol>
 			</currency>
@@ -6085,11 +6242,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>MDL</symbol>
 			</currency>
 			<currency type="MGA">
-				<displayName>Malagasijski ariari</displayName>
+				<displayName>Madagaskarski ariari</displayName>
 				<displayName count="one">malagasijski ariari</displayName>
 				<displayName count="few">malagasijska ariarija</displayName>
 				<displayName count="other">malagasijskih ariarija</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>Malagasijski franak</displayName>
@@ -6122,6 +6280,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">mjanmarska kjata</displayName>
 				<displayName count="other">mjanmarskih kjata</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>Mongolski tugrik</displayName>
@@ -6132,10 +6291,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">₮</symbol>
 			</currency>
 			<currency type="MOP">
-				<displayName>Makaniška pataka</displayName>
-				<displayName count="one">makaneška pataka</displayName>
-				<displayName count="few">makaneške patake</displayName>
-				<displayName count="other">makaneških pataka</displayName>
+				<displayName>Makaoska pataka</displayName>
+				<displayName count="one">makaoska pataka</displayName>
+				<displayName count="few">makaoske patake</displayName>
+				<displayName count="other">makaoskih pataka</displayName>
 				<symbol>MOP</symbol>
 			</currency>
 			<currency type="MRO">
@@ -6163,6 +6322,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">mauricijske rupije</displayName>
 				<displayName count="other">mauricijskih rupija</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>Maldivska rufija</displayName>
@@ -6199,11 +6359,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">meksičkih unidads de inverziona</displayName>
 			</currency>
 			<currency type="MYR">
-				<displayName>Malezijski ringgit</displayName>
-				<displayName count="one">malezijski ringgit</displayName>
-				<displayName count="few">malezijska ringgita</displayName>
-				<displayName count="other">malezijskih ringgita</displayName>
+				<displayName>Malezijski ringit</displayName>
+				<displayName count="one">malezijski ringit</displayName>
+				<displayName count="few">malezijska ringita</displayName>
+				<displayName count="other">malezijskih ringita</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>Mozambijski eskudo</displayName>
@@ -6218,10 +6379,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">starih mozambijskih metikala</displayName>
 			</currency>
 			<currency type="MZN">
-				<displayName>Mozambijski metikal</displayName>
-				<displayName count="one">mozambijski metikal</displayName>
-				<displayName count="few">mozambijska metikala</displayName>
-				<displayName count="other">mozambijskih metikala</displayName>
+				<displayName>Mozambički metikal</displayName>
+				<displayName count="one">mozambički metikal</displayName>
+				<displayName count="few">mozambička metikala</displayName>
+				<displayName count="other">mozambičkih metikala</displayName>
 				<symbol>MZN</symbol>
 			</currency>
 			<currency type="NAD">
@@ -6252,6 +6413,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">nikaragvanske zlatne kordobe</displayName>
 				<displayName count="other">nikaragvanskih zlatnih kordoba</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>Holandski gulden</displayName>
@@ -6265,6 +6427,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">norveške krune</displayName>
 				<displayName count="other">norveških kruna</displayName>
 				<symbol draft="contributed">NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>Nepalska rupija</displayName>
@@ -6272,6 +6435,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">nepalske rupije</displayName>
 				<displayName count="other">nepalskih rupija</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>Novozelandski dolar</displayName>
@@ -6302,10 +6466,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">peruvijskih intija</displayName>
 			</currency>
 			<currency type="PEN">
-				<displayName>Peruanski nuevo sol</displayName>
-				<displayName count="one">peruanski nuevo sol</displayName>
-				<displayName count="few">peruanska nuevo sola</displayName>
-				<displayName count="other">peruanskih nuevo sola</displayName>
+				<displayName>Peruanski novi sol</displayName>
+				<displayName count="one">peruanski novi sol</displayName>
+				<displayName count="few">peruanska nova sola</displayName>
+				<displayName count="other">peruanskih novih sola</displayName>
 				<symbol>PEN</symbol>
 			</currency>
 			<currency type="PES">
@@ -6335,6 +6499,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">pakistanske rupije</displayName>
 				<displayName count="other">pakistanskih rupija</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>Poljski zlot</displayName>
@@ -6342,6 +6507,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">poljska zlota</displayName>
 				<displayName count="other">poljskih zlota</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>Poljski zloti (1950–1995)</displayName>
@@ -6402,6 +6568,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">ruske rublje</displayName>
 				<displayName count="other">ruskih rublji</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">rub</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>Ruska rublja (1991–1998)</displayName>
@@ -6415,6 +6582,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">ruandska franka</displayName>
 				<displayName count="other">ruandskih franaka</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>Saudijski rijal</displayName>
@@ -6463,6 +6631,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">švedske krune</displayName>
 				<displayName count="other">švedskih kruna</displayName>
 				<symbol draft="contributed">SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>Singapurski dolar</displayName>
@@ -6478,6 +6647,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">sv. jelenske funte</displayName>
 				<displayName count="other">sv. jelenskih funti</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>Slovenački tolar</displayName>
@@ -6492,7 +6662,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">slovačkih kruna</displayName>
 			</currency>
 			<currency type="SLL">
-				<displayName>Sijera-leonški leone</displayName>
+				<displayName>Sijeraleonski leone</displayName>
 				<displayName count="one">sijeraleonski leone</displayName>
 				<displayName count="few">sijeraleonska leona</displayName>
 				<displayName count="other">sijeraleonskih leona</displayName>
@@ -6528,11 +6698,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="STD">
-				<displayName>Sao Tome i Principe dobra</displayName>
-				<displayName count="one">sao tome i principe dobar</displayName>
-				<displayName count="few">sao tome i principe dobra</displayName>
-				<displayName count="other">sao tome i principe dobra</displayName>
+				<displayName>Saotomska dobra</displayName>
+				<displayName count="one">saotomska dobra</displayName>
+				<displayName count="few">saotomske dobre</displayName>
+				<displayName count="other">saotomskih dobri</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>Sovjetska rublja</displayName>
@@ -6552,12 +6723,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">sirijske funte</displayName>
 				<displayName count="other">sirijskih funti</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
-				<displayName>Svazi lilangeni</displayName>
-				<displayName count="one">svazi emalangen</displayName>
-				<displayName count="few">svazi emalangena</displayName>
-				<displayName count="other">svazi emalangena</displayName>
+				<displayName>Svazilendski lilangeni</displayName>
+				<displayName count="one">svazilendski lilangeni</displayName>
+				<displayName count="few">svazilendska lilangenija</displayName>
+				<displayName count="other">svazilendskih lilangenija</displayName>
 				<symbol draft="contributed">SZL</symbol>
 			</currency>
 			<currency type="THB">
@@ -6566,6 +6738,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">tajlandska bata</displayName>
 				<displayName count="other">tajlandskih bata</displayName>
 				<symbol>THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>Tadžihistanska rublja</displayName>
@@ -6601,10 +6774,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>TND</symbol>
 			</currency>
 			<currency type="TOP">
-				<displayName>Tongonška Panga</displayName>
-				<displayName count="one">tongaška panga</displayName>
-				<displayName count="few">tongaške pange</displayName>
-				<displayName count="other">tongaških panga</displayName>
+				<displayName>Tonganska panga</displayName>
+				<displayName count="one">tonganska panga</displayName>
+				<displayName count="few">tonganske pange</displayName>
+				<displayName count="other">tonganskih pangi</displayName>
 				<symbol>TOP</symbol>
 			</currency>
 			<currency type="TPE">
@@ -6626,6 +6799,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">turskih lira</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Trinidad-tobagoški dolar</displayName>
@@ -6651,10 +6825,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>TZS</symbol>
 			</currency>
 			<currency type="UAH">
-				<displayName>Ukrajinska grivna</displayName>
+				<displayName>Ukrajinska hrivnja</displayName>
 				<displayName count="one">ukrajinska hrivnja</displayName>
 				<displayName count="few">ukrajinske hrivnje</displayName>
-				<displayName count="other">ukrajinskih grivni</displayName>
+				<displayName count="other">ukrajinskih hrivnji</displayName>
 				<symbol>UAH</symbol>
 				<symbol alt="narrow" draft="contributed">₴</symbol>
 			</currency>
@@ -6736,6 +6910,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">venecuelanska bolivara</displayName>
 				<displayName count="other">venecuelanskih bolivara</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>Vijetnamski dong</displayName>
@@ -6811,9 +6986,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="XCD">
 				<displayName>Istočnokaripski dolar</displayName>
 				<displayName count="one">istočnokaripski dolar</displayName>
-				<displayName count="few">istočno-karipska dolara</displayName>
-				<displayName count="other">istočno-karipskix dolara</displayName>
+				<displayName count="few">istočnokaripska dolara</displayName>
+				<displayName count="other">istočnokaripskix dolara</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>Posebna crtaća prava</displayName>
@@ -6878,10 +7054,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">kodova testirane valute</displayName>
 			</currency>
 			<currency type="XXX">
-				<displayName>Nepoznata ili nevažeća valuta</displayName>
-				<displayName count="one">nepoznata ili nevažeća valuta</displayName>
-				<displayName count="few">nepoznate ili nevažeće valute</displayName>
-				<displayName count="other">nepoznatih ili nevažećih valuta</displayName>
+				<displayName>Nepoznata valuta</displayName>
+				<displayName count="one">nepoznata jedinica valute</displayName>
+				<displayName count="few">nepoznate valute</displayName>
+				<displayName count="other">nepoznatih valuta</displayName>
 			</currency>
 			<currency type="YDD">
 				<displayName>Jemenski dinar</displayName>
@@ -6927,11 +7103,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">južnoafričkih randa (finansijskih)</displayName>
 			</currency>
 			<currency type="ZAR">
-				<displayName>Južno-afrički rand</displayName>
-				<displayName count="one">južno-afrički rand</displayName>
-				<displayName count="few">južno-afrička randa</displayName>
-				<displayName count="other">južno-afričkih randa</displayName>
+				<displayName>Južnoafrički rand</displayName>
+				<displayName count="one">južnoafrički rand</displayName>
+				<displayName count="few">južnoafrička randa</displayName>
+				<displayName count="other">južnoafričkih randa</displayName>
 				<symbol draft="contributed">ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>Zambijska kvača (1968–2012)</displayName>
@@ -6945,6 +7122,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="few">zambijske kvače</displayName>
 				<displayName count="other">zambijskih kvača</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>Zairski novi zair</displayName>
@@ -6985,7 +7163,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 	<units>
 		<unitLength type="long">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>ge sila</displayName>
@@ -6999,23 +7177,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} metra u sekundi na kvadrat</unitPattern>
 				<unitPattern count="other">{0} metara u sekundi na kvadrat</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName>minuti</displayName>
-				<unitPattern count="one">{0} minut</unitPattern>
-				<unitPattern count="few">{0} minuta</unitPattern>
-				<unitPattern count="other">{0} minuta</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName>sekunde</displayName>
-				<unitPattern count="one">{0} sekunda</unitPattern>
-				<unitPattern count="few">{0} sekunde</unitPattern>
-				<unitPattern count="other">{0} sekundi</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName>stepeni</displayName>
-				<unitPattern count="one">{0} stepen</unitPattern>
-				<unitPattern count="few">{0} stepena</unitPattern>
-				<unitPattern count="other">{0} stepeni</unitPattern>
+			<unit type="angle-revolution">
+				<displayName>obrtaj</displayName>
+				<unitPattern count="one">{0} obrtaj</unitPattern>
+				<unitPattern count="few">{0} obrtaja</unitPattern>
+				<unitPattern count="other">{0} obrtaja</unitPattern>
 			</unit>
 			<unit type="angle-radian">
 				<displayName>radijani</displayName>
@@ -7023,11 +7189,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} radijana</unitPattern>
 				<unitPattern count="other">{0} radijana</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName>akeri</displayName>
-				<unitPattern count="one">{0} aker</unitPattern>
-				<unitPattern count="few">{0} akera</unitPattern>
-				<unitPattern count="other">{0} akera</unitPattern>
+			<unit type="angle-degree">
+				<displayName>stepeni</displayName>
+				<unitPattern count="one">{0} stepen</unitPattern>
+				<unitPattern count="few">{0} stepena</unitPattern>
+				<unitPattern count="other">{0} stepeni</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>lučni minuti</displayName>
+				<unitPattern count="one">{0} lučni minut</unitPattern>
+				<unitPattern count="few">{0} lučna minuta</unitPattern>
+				<unitPattern count="other">{0} lučnih minuta</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>lučne sekunde</displayName>
+				<unitPattern count="one">{0} lučna sekunda</unitPattern>
+				<unitPattern count="few">{0} lučne sekunde</unitPattern>
+				<unitPattern count="other">{0} lučnih sekundi</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>kvadratni kilometri</displayName>
+				<unitPattern count="one">{0} kvadratni kilometar</unitPattern>
+				<unitPattern count="few">{0} kvadratna kilometra</unitPattern>
+				<unitPattern count="other">{0} kvadratnih kilometara</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektari</displayName>
@@ -7035,11 +7219,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} hektara</unitPattern>
 				<unitPattern count="other">{0} hektara</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>kvadratni metri</displayName>
+				<unitPattern count="one">{0} kvadratni metar</unitPattern>
+				<unitPattern count="few">{0} kvadratna metra</unitPattern>
+				<unitPattern count="other">{0} kvadratnih metara</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>kvadratni centimetri</displayName>
 				<unitPattern count="one">{0} kvadratni centimetar</unitPattern>
 				<unitPattern count="few">{0} kvadratna centimetra</unitPattern>
 				<unitPattern count="other">{0} kvadratnih centimetara</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>kvadratne milje</displayName>
+				<unitPattern count="one">{0} kvadratna milja</unitPattern>
+				<unitPattern count="few">{0} kvadratne milje</unitPattern>
+				<unitPattern count="other">{0} kvadratnih milja</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>akeri</displayName>
+				<unitPattern count="one">{0} aker</unitPattern>
+				<unitPattern count="few">{0} akera</unitPattern>
+				<unitPattern count="other">{0} akera</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>kvadratni jardi</displayName>
+				<unitPattern count="one">{0} kvadratni jard</unitPattern>
+				<unitPattern count="few">{0} kvadratna jarda</unitPattern>
+				<unitPattern count="other">{0} kvadratnih jardi</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>kvadratne stope</displayName>
@@ -7052,30 +7262,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kvadratni inč</unitPattern>
 				<unitPattern count="few">{0} kvadratna inča</unitPattern>
 				<unitPattern count="other">{0} kvadratnih inča</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kvadratni kilometri</displayName>
-				<unitPattern count="one">{0} kvadratni kilometar</unitPattern>
-				<unitPattern count="few">{0} kvadratna kilometra</unitPattern>
-				<unitPattern count="other">{0} kvadratnih kilometara</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>kvadratni metri</displayName>
-				<unitPattern count="one">{0} kvadratni metar</unitPattern>
-				<unitPattern count="few">{0} kvadratna metra</unitPattern>
-				<unitPattern count="other">{0} kvadratnih metara</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>kvadratne milje</displayName>
-				<unitPattern count="one">{0} kvadratna milja</unitPattern>
-				<unitPattern count="few">{0} kvadratne milje</unitPattern>
-				<unitPattern count="other">{0} kvadratnih milja</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>kvadratni jardi</displayName>
-				<unitPattern count="one">{0} kvadratni jard</unitPattern>
-				<unitPattern count="few">{0} kvadratna jarda</unitPattern>
-				<unitPattern count="other">{0} kvadratnih jardi</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karati</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="few">{0} karata</unitPattern>
+				<unitPattern count="other">{0} karata</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litri po kilometru</displayName>
@@ -7083,90 +7276,132 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} litra po kilometru</unitPattern>
 				<unitPattern count="other">{0} litara po kilometru</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} litar na 100 kilometara</unitPattern>
+				<unitPattern count="few">{0} litra na 100 kilometara</unitPattern>
+				<unitPattern count="other">{0} litara na 100 kilometara</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>milja po galonu</displayName>
 				<unitPattern count="one">{0} milja po galonu</unitPattern>
 				<unitPattern count="few">{0} milje po galonu</unitPattern>
 				<unitPattern count="other">{0} milja po galonu</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bitovi</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="few">{0} bita</unitPattern>
-				<unitPattern count="other">{0} bitova</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bajtovi</displayName>
-				<unitPattern count="one">{0} bajt</unitPattern>
-				<unitPattern count="few">{0} bajta</unitPattern>
-				<unitPattern count="other">{0} bajtova</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabitovi</displayName>
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="few">{0} gigabita</unitPattern>
-				<unitPattern count="other">{0} gigabita</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabajti</displayName>
-				<unitPattern count="one">{0} gigabajt</unitPattern>
-				<unitPattern count="few">{0} gigabajta</unitPattern>
-				<unitPattern count="other">{0} gigabajta</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobitovi</displayName>
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="few">{0} kilobita</unitPattern>
-				<unitPattern count="other">{0} kilobita</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobajti</displayName>
-				<unitPattern count="one">{0} kilobajt</unitPattern>
-				<unitPattern count="few">{0} kilobajta</unitPattern>
-				<unitPattern count="other">{0} kilobajta</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabitovi</displayName>
-				<unitPattern count="one">{0} megabit</unitPattern>
-				<unitPattern count="few">{0} megabita</unitPattern>
-				<unitPattern count="other">{0} megabita</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabajti</displayName>
-				<unitPattern count="one">{0} megabajt</unitPattern>
-				<unitPattern count="few">{0} megabajta</unitPattern>
-				<unitPattern count="other">{0} megabajta</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabitovi</displayName>
-				<unitPattern count="one">{0} terabit</unitPattern>
-				<unitPattern count="few">{0} terabita</unitPattern>
-				<unitPattern count="other">{0} terabita</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabajti</displayName>
 				<unitPattern count="one">{0} terabajt</unitPattern>
 				<unitPattern count="few">{0} terabajta</unitPattern>
 				<unitPattern count="other">{0} terabajta</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabitovi</displayName>
+				<unitPattern count="one">{0} terabit</unitPattern>
+				<unitPattern count="few">{0} terabita</unitPattern>
+				<unitPattern count="other">{0} terabita</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabajti</displayName>
+				<unitPattern count="one">{0} gigabajt</unitPattern>
+				<unitPattern count="few">{0} gigabajta</unitPattern>
+				<unitPattern count="other">{0} gigabajta</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabitovi</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="few">{0} gigabita</unitPattern>
+				<unitPattern count="other">{0} gigabita</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabajti</displayName>
+				<unitPattern count="one">{0} megabajt</unitPattern>
+				<unitPattern count="few">{0} megabajta</unitPattern>
+				<unitPattern count="other">{0} megabajta</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabitovi</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="few">{0} megabita</unitPattern>
+				<unitPattern count="other">{0} megabita</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobajti</displayName>
+				<unitPattern count="one">{0} kilobajt</unitPattern>
+				<unitPattern count="few">{0} kilobajta</unitPattern>
+				<unitPattern count="other">{0} kilobajta</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobitovi</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="few">{0} kilobita</unitPattern>
+				<unitPattern count="other">{0} kilobita</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bajtovi</displayName>
+				<unitPattern count="one">{0} bajt</unitPattern>
+				<unitPattern count="few">{0} bajta</unitPattern>
+				<unitPattern count="other">{0} bajtova</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bitovi</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="few">{0} bita</unitPattern>
+				<unitPattern count="other">{0} bitova</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>vekovi</displayName>
+				<unitPattern count="one">{0} vek</unitPattern>
+				<unitPattern count="few">{0} veka</unitPattern>
+				<unitPattern count="other">{0} vekova</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>godine</displayName>
+				<unitPattern count="one">{0} godina</unitPattern>
+				<unitPattern count="few">{0} godine</unitPattern>
+				<unitPattern count="other">{0} godina</unitPattern>
+				<perUnitPattern>{0} godišnje</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>meseci</displayName>
+				<unitPattern count="one">{0} mesec</unitPattern>
+				<unitPattern count="few">{0} meseca</unitPattern>
+				<unitPattern count="other">{0} meseci</unitPattern>
+				<perUnitPattern>{0} mesečno</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>nedelje</displayName>
+				<unitPattern count="one">{0} nedelja</unitPattern>
+				<unitPattern count="few">{0} nedelje</unitPattern>
+				<unitPattern count="other">{0} nedelja</unitPattern>
+				<perUnitPattern>{0} nedeljno</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>dani</displayName>
 				<unitPattern count="one">{0} dan</unitPattern>
 				<unitPattern count="few">{0} dana</unitPattern>
 				<unitPattern count="other">{0} dana</unitPattern>
+				<perUnitPattern>{0}/dnevno</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>sati</displayName>
 				<unitPattern count="one">{0} sat</unitPattern>
 				<unitPattern count="few">{0} sata</unitPattern>
 				<unitPattern count="other">{0} sati</unitPattern>
-				<perUnitPattern draft="contributed">{0}/sat</perUnitPattern>
+				<perUnitPattern>{0}/sat</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikrosekunde</displayName>
-				<unitPattern count="one">{0} mikrosekunda</unitPattern>
-				<unitPattern count="few">{0} mikrosekunde</unitPattern>
-				<unitPattern count="other">{0} mikrosekundi</unitPattern>
+			<unit type="duration-minute">
+				<displayName>minuti</displayName>
+				<unitPattern count="one">{0} minut</unitPattern>
+				<unitPattern count="few">{0} minuta</unitPattern>
+				<unitPattern count="other">{0} minuta</unitPattern>
+				<perUnitPattern>{0} u minutu</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>sekunde</displayName>
+				<unitPattern count="one">{0} sekunda</unitPattern>
+				<unitPattern count="few">{0} sekunde</unitPattern>
+				<unitPattern count="other">{0} sekundi</unitPattern>
+				<perUnitPattern>{0}/sek</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>milisekunde</displayName>
@@ -7174,17 +7409,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} milisekunde</unitPattern>
 				<unitPattern count="other">{0} milisekundi</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName draft="contributed">minuti</displayName>
-				<unitPattern count="one">{0} minut</unitPattern>
-				<unitPattern count="few">{0} minuta</unitPattern>
-				<unitPattern count="other">{0} minuta</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>meseci</displayName>
-				<unitPattern count="one">{0} mesec</unitPattern>
-				<unitPattern count="few">{0} meseca</unitPattern>
-				<unitPattern count="other">{0} meseci</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>mikrosekunde</displayName>
+				<unitPattern count="one">{0} mikrosekunda</unitPattern>
+				<unitPattern count="few">{0} mikrosekunde</unitPattern>
+				<unitPattern count="other">{0} mikrosekundi</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>nanosekunde</displayName>
@@ -7192,25 +7421,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} nanosekunde</unitPattern>
 				<unitPattern count="other">{0} nanosekundi</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName draft="contributed">sekunde</displayName>
-				<unitPattern count="one">{0} sekunda</unitPattern>
-				<unitPattern count="few">{0} sekunde</unitPattern>
-				<unitPattern count="other">{0} sekundi</unitPattern>
-				<perUnitPattern draft="contributed">{0}/sek</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>nedelje</displayName>
-				<unitPattern count="one">{0} nedelja</unitPattern>
-				<unitPattern count="few">{0} nedelje</unitPattern>
-				<unitPattern count="other">{0} nedelja</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>godine</displayName>
-				<unitPattern count="one">{0} godina</unitPattern>
-				<unitPattern count="few">{0} godine</unitPattern>
-				<unitPattern count="other">{0} godina</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>amperi</displayName>
 				<unitPattern count="one">{0} amper</unitPattern>
@@ -7235,6 +7445,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} volta</unitPattern>
 				<unitPattern count="other">{0} volti</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokalorije</displayName>
+				<unitPattern count="one">{0} kilokalorija</unitPattern>
+				<unitPattern count="few">{0} kilokalorije</unitPattern>
+				<unitPattern count="other">{0} kilokalorija</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kalorije</displayName>
 				<unitPattern count="one">{0} kalorija</unitPattern>
@@ -7247,24 +7463,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kalorije</unitPattern>
 				<unitPattern count="other">{0} kalorija</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>džuli</displayName>
-				<unitPattern count="one">{0} džul</unitPattern>
-				<unitPattern count="few">{0} džula</unitPattern>
-				<unitPattern count="other">{0} džula</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokalorije</displayName>
-				<unitPattern count="one">{0} kilokalorija</unitPattern>
-				<unitPattern count="few">{0} kilokalorije</unitPattern>
-				<unitPattern count="other">{0} kilokalorija</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilodžuli</displayName>
 				<unitPattern count="one">{0} kilodžul</unitPattern>
 				<unitPattern count="few">{0} kilodžula</unitPattern>
 				<unitPattern count="other">{0} kilodžula</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>džuli</displayName>
+				<unitPattern count="one">{0} džul</unitPattern>
+				<unitPattern count="few">{0} džula</unitPattern>
+				<unitPattern count="other">{0} džula</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilovat-sati</displayName>
 				<unitPattern count="one">{0} kilovat-sat</unitPattern>
@@ -7277,11 +7487,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} gigaherca</unitPattern>
 				<unitPattern count="other">{0} gigaherca</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>herci</displayName>
-				<unitPattern count="one">{0} herc</unitPattern>
-				<unitPattern count="few">{0} herca</unitPattern>
-				<unitPattern count="other">{0} herca</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megaherci</displayName>
+				<unitPattern count="one">{0} megaherc</unitPattern>
+				<unitPattern count="few">{0} megaherca</unitPattern>
+				<unitPattern count="other">{0} megaherca</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kiloherci</displayName>
@@ -7289,23 +7499,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kiloherca</unitPattern>
 				<unitPattern count="other">{0} kiloherca</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megaherci</displayName>
-				<unitPattern count="one">{0} megaherc</unitPattern>
-				<unitPattern count="few">{0} megaherca</unitPattern>
-				<unitPattern count="other">{0} megaherca</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>herci</displayName>
+				<unitPattern count="one">{0} herc</unitPattern>
+				<unitPattern count="few">{0} herca</unitPattern>
+				<unitPattern count="other">{0} herca</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>astronomske jedinice</displayName>
-				<unitPattern count="one">{0} astronomska jedinica</unitPattern>
-				<unitPattern count="few">{0} astronomske jedinice</unitPattern>
-				<unitPattern count="other">{0} astronomskih jedinica</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometri</displayName>
+				<unitPattern count="one">{0} kilometar</unitPattern>
+				<unitPattern count="few">{0} kilometra</unitPattern>
+				<unitPattern count="other">{0} kilometara</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>centimetri</displayName>
-				<unitPattern count="one">{0} centimetar</unitPattern>
-				<unitPattern count="few">{0} centimentra</unitPattern>
-				<unitPattern count="other">{0} centimetara</unitPattern>
+			<unit type="length-meter">
+				<displayName>metri</displayName>
+				<unitPattern count="one">{0} metar</unitPattern>
+				<unitPattern count="few">{0} metra</unitPattern>
+				<unitPattern count="other">{0} metara</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>decimetri</displayName>
@@ -7313,47 +7525,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} decimetra</unitPattern>
 				<unitPattern count="other">{0} decimetara</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>stope</displayName>
-				<unitPattern count="one">{0} stopa</unitPattern>
-				<unitPattern count="few">{0} stope</unitPattern>
-				<unitPattern count="other">{0} stopa</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>inči</displayName>
-				<unitPattern count="one">{0} inč</unitPattern>
-				<unitPattern count="few">{0} inča</unitPattern>
-				<unitPattern count="other">{0} inča</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometri</displayName>
-				<unitPattern count="one">{0} kilometar</unitPattern>
-				<unitPattern count="few">{0} kilometra</unitPattern>
-				<unitPattern count="other">{0} kilometara</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>svetlosne godine</displayName>
-				<unitPattern count="one">{0} svetlosna godina</unitPattern>
-				<unitPattern count="few">{0} svetlosne godine</unitPattern>
-				<unitPattern count="other">{0} svetlosnih godina</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metri</displayName>
-				<unitPattern count="one">{0} metar</unitPattern>
-				<unitPattern count="few">{0} metra</unitPattern>
-				<unitPattern count="other">{0} metara</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>mikrometri</displayName>
-				<unitPattern count="one">{0} mikrometar</unitPattern>
-				<unitPattern count="few">{0} mikrometra</unitPattern>
-				<unitPattern count="other">{0} mikrometara</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>milje</displayName>
-				<unitPattern count="one">{0} milja</unitPattern>
-				<unitPattern count="few">{0} milje</unitPattern>
-				<unitPattern count="other">{0} milja</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>centimetri</displayName>
+				<unitPattern count="one">{0} centimetar</unitPattern>
+				<unitPattern count="few">{0} centimentra</unitPattern>
+				<unitPattern count="other">{0} centimetara</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>milimetri</displayName>
@@ -7361,71 +7538,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} milimetra</unitPattern>
 				<unitPattern count="other">{0} milimetara</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikrometri</displayName>
+				<unitPattern count="one">{0} mikrometar</unitPattern>
+				<unitPattern count="few">{0} mikrometra</unitPattern>
+				<unitPattern count="other">{0} mikrometara</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanometri</displayName>
 				<unitPattern count="one">{0} nanometar</unitPattern>
 				<unitPattern count="few">{0} nanometra</unitPattern>
 				<unitPattern count="other">{0} nanometara</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nautičke milje</displayName>
-				<unitPattern count="one">{0} nautička milja</unitPattern>
-				<unitPattern count="few">{0} nautičke milje</unitPattern>
-				<unitPattern count="other">{0} nautičkih milja</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parseci</displayName>
-				<unitPattern count="one">{0} parsek</unitPattern>
-				<unitPattern count="few">{0} parseka</unitPattern>
-				<unitPattern count="other">{0} parseka</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pikometri</displayName>
 				<unitPattern count="one">{0} pikometar</unitPattern>
 				<unitPattern count="few">{0} pikometra</unitPattern>
 				<unitPattern count="other">{0} pikometara</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>milje</displayName>
+				<unitPattern count="one">{0} milja</unitPattern>
+				<unitPattern count="few">{0} milje</unitPattern>
+				<unitPattern count="other">{0} milja</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>jardi</displayName>
 				<unitPattern count="one">{0} jard</unitPattern>
 				<unitPattern count="few">{0} jarda</unitPattern>
 				<unitPattern count="other">{0} jardi</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>stope</displayName>
+				<unitPattern count="one">{0} stopa</unitPattern>
+				<unitPattern count="few">{0} stope</unitPattern>
+				<unitPattern count="other">{0} stopa</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>inči</displayName>
+				<unitPattern count="one">{0} inč</unitPattern>
+				<unitPattern count="few">{0} inča</unitPattern>
+				<unitPattern count="other">{0} inča</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parseci</displayName>
+				<unitPattern count="one">{0} parsek</unitPattern>
+				<unitPattern count="few">{0} parseka</unitPattern>
+				<unitPattern count="other">{0} parseka</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>svetlosne godine</displayName>
+				<unitPattern count="one">{0} svetlosna godina</unitPattern>
+				<unitPattern count="few">{0} svetlosne godine</unitPattern>
+				<unitPattern count="other">{0} svetlosnih godina</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>astronomske jedinice</displayName>
+				<unitPattern count="one">{0} astronomska jedinica</unitPattern>
+				<unitPattern count="few">{0} astronomske jedinice</unitPattern>
+				<unitPattern count="other">{0} astronomskih jedinica</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nautičke milje</displayName>
+				<unitPattern count="one">{0} nautička milja</unitPattern>
+				<unitPattern count="few">{0} nautičke milje</unitPattern>
+				<unitPattern count="other">{0} nautičkih milja</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>skandinavska milja</displayName>
+				<unitPattern count="one" draft="provisional">{0} smi</unitPattern>
+				<unitPattern count="few" draft="provisional">{0} smi</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>luks</displayName>
 				<unitPattern count="one">{0} luks</unitPattern>
 				<unitPattern count="few">{0} luksa</unitPattern>
 				<unitPattern count="other">{0} luksa</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karati</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="few">{0} karata</unitPattern>
-				<unitPattern count="other">{0} karata</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>grami</displayName>
-				<unitPattern count="one">{0} gram</unitPattern>
-				<unitPattern count="few">{0} grama</unitPattern>
-				<unitPattern count="other">{0} grama</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogrami</displayName>
-				<unitPattern count="one">{0} kilogram</unitPattern>
-				<unitPattern count="few">{0} kilograma</unitPattern>
-				<unitPattern count="other">{0} kilograma</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>metričke tone</displayName>
 				<unitPattern count="one">{0} metrička tona</unitPattern>
 				<unitPattern count="few">{0} metričke tone</unitPattern>
 				<unitPattern count="other">{0} metričkih tona</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mikrogrami</displayName>
-				<unitPattern count="one">{0} mikrogram</unitPattern>
-				<unitPattern count="few">{0} mikrograma</unitPattern>
-				<unitPattern count="other">{0} mikrograma</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogrami</displayName>
+				<unitPattern count="one">{0} kilogram</unitPattern>
+				<unitPattern count="few">{0} kilograma</unitPattern>
+				<unitPattern count="other">{0} kilograma</unitPattern>
+				<perUnitPattern>{0} po kilogramu</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>grami</displayName>
+				<unitPattern count="one">{0} gram</unitPattern>
+				<unitPattern count="few">{0} grama</unitPattern>
+				<unitPattern count="other">{0} grama</unitPattern>
+				<perUnitPattern>{0} po gramu</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>miligrami</displayName>
@@ -7433,23 +7644,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} miligrama</unitPattern>
 				<unitPattern count="other">{0} miligrama</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>unce</displayName>
-				<unitPattern count="one">{0} unca</unitPattern>
-				<unitPattern count="few">{0} unce</unitPattern>
-				<unitPattern count="other">{0} unci</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>fine unce</displayName>
-				<unitPattern count="one">{0} fina unca</unitPattern>
-				<unitPattern count="few">{0} fine unce</unitPattern>
-				<unitPattern count="other">{0} finih unci</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>funte</displayName>
-				<unitPattern count="one">{0} funta</unitPattern>
-				<unitPattern count="few">{0} funte</unitPattern>
-				<unitPattern count="other">{0} funti</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>mikrogrami</displayName>
+				<unitPattern count="one">{0} mikrogram</unitPattern>
+				<unitPattern count="few">{0} mikrograma</unitPattern>
+				<unitPattern count="other">{0} mikrograma</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tone</displayName>
@@ -7457,35 +7656,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} tone</unitPattern>
 				<unitPattern count="other">{0} tona</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>funte</displayName>
+				<unitPattern count="one">{0} funta</unitPattern>
+				<unitPattern count="few">{0} funte</unitPattern>
+				<unitPattern count="other">{0} funti</unitPattern>
+				<perUnitPattern>{0} po funti</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>unce</displayName>
+				<unitPattern count="one">{0} unca</unitPattern>
+				<unitPattern count="few">{0} unce</unitPattern>
+				<unitPattern count="other">{0} unci</unitPattern>
+				<perUnitPattern>{0} po unci</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>fine unce</displayName>
+				<unitPattern count="one">{0} fina unca</unitPattern>
+				<unitPattern count="few">{0} fine unce</unitPattern>
+				<unitPattern count="other">{0} finih unci</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karati</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="few">{0} karata</unitPattern>
+				<unitPattern count="other">{0} karata</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigavati</displayName>
 				<unitPattern count="one">{0} gigavat</unitPattern>
 				<unitPattern count="few">{0} gigavata</unitPattern>
 				<unitPattern count="other">{0} gigavati</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>konjske snage</displayName>
-				<unitPattern count="one">{0} konjska snaga</unitPattern>
-				<unitPattern count="few">{0} konjske snage</unitPattern>
-				<unitPattern count="other">{0} konjskih snaga</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilovati</displayName>
-				<unitPattern count="one">{0} kilovat</unitPattern>
-				<unitPattern count="few">{0} kilovata</unitPattern>
-				<unitPattern count="other">{0} kilovati</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>megavati</displayName>
 				<unitPattern count="one">{0} megavat</unitPattern>
 				<unitPattern count="few">{0} megavata</unitPattern>
 				<unitPattern count="other">{0} megavati</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>milivati</displayName>
-				<unitPattern count="one">{0} milivat</unitPattern>
-				<unitPattern count="few">{0} milivata</unitPattern>
-				<unitPattern count="other">{0} milivati</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilovati</displayName>
+				<unitPattern count="one">{0} kilovat</unitPattern>
+				<unitPattern count="few">{0} kilovata</unitPattern>
+				<unitPattern count="other">{0} kilovati</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>vati</displayName>
@@ -7493,24 +7706,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} vata</unitPattern>
 				<unitPattern count="other">{0} vati</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>milivati</displayName>
+				<unitPattern count="one">{0} milivat</unitPattern>
+				<unitPattern count="few">{0} milivata</unitPattern>
+				<unitPattern count="other">{0} milivati</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>konjske snage</displayName>
+				<unitPattern count="one">{0} konjska snaga</unitPattern>
+				<unitPattern count="few">{0} konjske snage</unitPattern>
+				<unitPattern count="other">{0} konjskih snaga</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hektopaskali</displayName>
 				<unitPattern count="one">{0} hektopaskal</unitPattern>
 				<unitPattern count="few">{0} hektopaskala</unitPattern>
 				<unitPattern count="other">{0} hektopaskala</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inči živinog stuba</displayName>
-				<unitPattern count="one">{0} inč živinog stuba</unitPattern>
-				<unitPattern count="few">{0} inča živinog stuba</unitPattern>
-				<unitPattern count="other">{0} inča živinog stuba</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>milibari</displayName>
-				<unitPattern count="one">{0} milibar</unitPattern>
-				<unitPattern count="few">{0} milibara</unitPattern>
-				<unitPattern count="other">{0} milibara</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>milimetri živinog stuba</displayName>
 				<unitPattern count="one">{0} milimetar živinog stuba</unitPattern>
@@ -7523,11 +7736,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} funte po kvadratnom inču</unitPattern>
 				<unitPattern count="other">{0} funti po kvadratnom inču</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karati</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="few">{0} karata</unitPattern>
-				<unitPattern count="other">{0} karata</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inči živinog stuba</displayName>
+				<unitPattern count="one">{0} inč živinog stuba</unitPattern>
+				<unitPattern count="few">{0} inča živinog stuba</unitPattern>
+				<unitPattern count="other">{0} inča živinog stuba</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>milibari</displayName>
+				<unitPattern count="one">{0} milibar</unitPattern>
+				<unitPattern count="few">{0} milibara</unitPattern>
+				<unitPattern count="other">{0} milibara</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometri na sat</displayName>
@@ -7547,6 +7766,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} milje na sat</unitPattern>
 				<unitPattern count="other">{0} milja na sat</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName draft="provisional">kn</displayName>
+				<unitPattern count="one" draft="provisional">{0} kn</unitPattern>
+				<unitPattern count="few" draft="provisional">{0} kn</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>stepeni Celzijusa</displayName>
 				<unitPattern count="one">{0} stepen Celzijusa</unitPattern>
@@ -7565,36 +7796,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kelvina</unitPattern>
 				<unitPattern count="other">{0} kelvina</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>aker stope</displayName>
-				<unitPattern count="one">{0} aker stopa</unitPattern>
-				<unitPattern count="few">{0} aker stope</unitPattern>
-				<unitPattern count="other">{0} aker stopa</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>centilitri</displayName>
-				<unitPattern count="one">{0} centilitar</unitPattern>
-				<unitPattern count="few">{0} centilitra</unitPattern>
-				<unitPattern count="other">{0} centilitara</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>kubni centimetri</displayName>
-				<unitPattern count="one">{0} kubni centimetar</unitPattern>
-				<unitPattern count="few">{0} kubna centimetra</unitPattern>
-				<unitPattern count="other">{0} kubnih centimetara</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>kubne stope</displayName>
-				<unitPattern count="one">{0} kubna stopa</unitPattern>
-				<unitPattern count="few">{0} kubne stope</unitPattern>
-				<unitPattern count="other">{0} kubnih stopa</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>kubni inči</displayName>
-				<unitPattern count="one">{0} kubni inč</unitPattern>
-				<unitPattern count="few">{0} kubna inča</unitPattern>
-				<unitPattern count="other">{0} kubnih inča</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kubni kilometri</displayName>
 				<unitPattern count="one">{0} kubni kilometar</unitPattern>
@@ -7606,6 +7807,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kubni metar</unitPattern>
 				<unitPattern count="few">{0} kubna metra</unitPattern>
 				<unitPattern count="other">{0} kubnih metara</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>kubni centimetri</displayName>
+				<unitPattern count="one">{0} kubni centimetar</unitPattern>
+				<unitPattern count="few">{0} kubna centimetra</unitPattern>
+				<unitPattern count="other">{0} kubnih centimetara</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>kubne milje</displayName>
@@ -7619,29 +7828,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kubna jarda</unitPattern>
 				<unitPattern count="other">{0} kubnih jardi</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>šolje</displayName>
-				<unitPattern count="one">{0} šolja</unitPattern>
-				<unitPattern count="few">{0} šolje</unitPattern>
-				<unitPattern count="other">{0} šolja</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>kubne stope</displayName>
+				<unitPattern count="one">{0} kubna stopa</unitPattern>
+				<unitPattern count="few">{0} kubne stope</unitPattern>
+				<unitPattern count="other">{0} kubnih stopa</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>decilitri</displayName>
-				<unitPattern count="one">{0} decilitar</unitPattern>
-				<unitPattern count="few">{0} decilitra</unitPattern>
-				<unitPattern count="other">{0} decilitara</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>kubni inči</displayName>
+				<unitPattern count="one">{0} kubni inč</unitPattern>
+				<unitPattern count="few">{0} kubna inča</unitPattern>
+				<unitPattern count="other">{0} kubnih inča</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>unce tečnosti</displayName>
-				<unitPattern count="one">{0} unca tečnosti</unitPattern>
-				<unitPattern count="few">{0} unce tečnosti</unitPattern>
-				<unitPattern count="other">{0} unci tečnosti</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>galoni</displayName>
-				<unitPattern count="one">{0} galon</unitPattern>
-				<unitPattern count="few">{0} galona</unitPattern>
-				<unitPattern count="other">{0} galona</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megalitri</displayName>
+				<unitPattern count="one">{0} megalitar</unitPattern>
+				<unitPattern count="few">{0} megalitra</unitPattern>
+				<unitPattern count="other">{0} megalitara</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hektolitri</displayName>
@@ -7654,12 +7857,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} litar</unitPattern>
 				<unitPattern count="few">{0} litra</unitPattern>
 				<unitPattern count="other">{0} litara</unitPattern>
+				<perUnitPattern>{0} po litri</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalitri</displayName>
-				<unitPattern count="one">{0} megalitar</unitPattern>
-				<unitPattern count="few">{0} megalitra</unitPattern>
-				<unitPattern count="other">{0} megalitara</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>decilitri</displayName>
+				<unitPattern count="one">{0} decilitar</unitPattern>
+				<unitPattern count="few">{0} decilitra</unitPattern>
+				<unitPattern count="other">{0} decilitara</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centilitri</displayName>
+				<unitPattern count="one">{0} centilitar</unitPattern>
+				<unitPattern count="few">{0} centilitra</unitPattern>
+				<unitPattern count="other">{0} centilitara</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mililitri</displayName>
@@ -7667,11 +7877,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mililitra</unitPattern>
 				<unitPattern count="other">{0} mililitara</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pinte</displayName>
-				<unitPattern count="one">{0} pinta</unitPattern>
-				<unitPattern count="few">{0} pinte</unitPattern>
-				<unitPattern count="other">{0} pinti</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName draft="contributed">metričke pinte</displayName>
+				<unitPattern count="one" draft="contributed">{0} metrička pinta</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} metričke pinte</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} metričkih pinti</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>metrička šolja</displayName>
+				<unitPattern count="one">{0} metrička šolja</unitPattern>
+				<unitPattern count="few">{0} metričke šolje</unitPattern>
+				<unitPattern count="other">{0} metričkih šolja</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>aker stope</displayName>
+				<unitPattern count="one">{0} aker stopa</unitPattern>
+				<unitPattern count="few">{0} aker stope</unitPattern>
+				<unitPattern count="other">{0} aker stopa</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galoni</displayName>
+				<unitPattern count="one">{0} galon</unitPattern>
+				<unitPattern count="few">{0} galona</unitPattern>
+				<unitPattern count="other">{0} galona</unitPattern>
+				<perUnitPattern>{0} po galonu</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>kvarti</displayName>
@@ -7679,6 +7908,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kvarta</unitPattern>
 				<unitPattern count="other">{0} kvarata</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pinte</displayName>
+				<unitPattern count="one">{0} pinta</unitPattern>
+				<unitPattern count="few">{0} pinte</unitPattern>
+				<unitPattern count="other">{0} pinti</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>šolje</displayName>
+				<unitPattern count="one">{0} šolja</unitPattern>
+				<unitPattern count="few">{0} šolje</unitPattern>
+				<unitPattern count="other">{0} šolja</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>unce tečnosti</displayName>
+				<unitPattern count="one">{0} unca tečnosti</unitPattern>
+				<unitPattern count="few">{0} unce tečnosti</unitPattern>
+				<unitPattern count="other">{0} unci tečnosti</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>kašike</displayName>
 				<unitPattern count="one">{0} kašika</unitPattern>
@@ -7691,10 +7938,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kašičice</unitPattern>
 				<unitPattern count="other">{0} kašičica</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="provisional">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="provisional">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="provisional">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="provisional">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>ge sila</displayName>
@@ -7708,8 +7961,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="one">{0} rev</unitPattern>
+				<unitPattern count="few">{0} rev</unitPattern>
+				<unitPattern count="other">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="few">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>stepeni</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
-				<displayName>minuti</displayName>
+				<displayName>lučni min</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="few">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -7720,23 +7991,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>stepeni</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="few">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="few">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>akeri</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="few">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>kvadratni kilometri</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="few">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektari</displayName>
@@ -7744,11 +8003,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>kvadratni metri</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="few">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="few">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="few">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>akeri</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="few">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="few">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>kvadratne stope</displayName>
@@ -7761,30 +8046,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="few">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kvadratni kilometri</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="few">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>kvadratni metri</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="few">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="few">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="few">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="few">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
@@ -7792,90 +8060,132 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} L/km</unitPattern>
 				<unitPattern count="other">{0} L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} L/100km</unitPattern>
+				<unitPattern count="few">{0} L/100km</unitPattern>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="few">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} b</unitPattern>
-				<unitPattern count="few">{0} b</unitPattern>
-				<unitPattern count="other">{0} b</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bajt</displayName>
-				<unitPattern count="one">{0} B</unitPattern>
-				<unitPattern count="few">{0} B</unitPattern>
-				<unitPattern count="other">{0} B</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="few">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="few">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="few">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="few">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="few">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="few">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="few">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="few">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="few">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="few">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="few">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="few">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="few">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="few">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="few">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bajt</displayName>
+				<unitPattern count="one">{0} B</unitPattern>
+				<unitPattern count="few">{0} B</unitPattern>
+				<unitPattern count="other">{0} B</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} b</unitPattern>
+				<unitPattern count="few">{0} b</unitPattern>
+				<unitPattern count="other">{0} b</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>v.</displayName>
+				<unitPattern count="one">{0} v</unitPattern>
+				<unitPattern count="few">{0} v</unitPattern>
+				<unitPattern count="other">{0} v</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>god.</displayName>
+				<unitPattern count="one">{0} god</unitPattern>
+				<unitPattern count="few">{0} god.</unitPattern>
+				<unitPattern count="other">{0} god.</unitPattern>
+				<perUnitPattern>{0}/god</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>meseci</displayName>
+				<unitPattern count="one">{0} mes.</unitPattern>
+				<unitPattern count="few">{0} mes.</unitPattern>
+				<unitPattern count="other">{0} mes.</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ned.</displayName>
+				<unitPattern count="one">{0} ned.</unitPattern>
+				<unitPattern count="few">{0} ned.</unitPattern>
+				<unitPattern count="other">{0} ned.</unitPattern>
+				<perUnitPattern>{0}/n</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>d.</displayName>
 				<unitPattern count="one">{0} dan</unitPattern>
 				<unitPattern count="few">{0} dana</unitPattern>
 				<unitPattern count="other">{0} dana</unitPattern>
+				<perUnitPattern>{0}/d</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName draft="contributed">sati</displayName>
+				<displayName>sati</displayName>
 				<unitPattern count="one">{0} sat</unitPattern>
 				<unitPattern count="few">{0} sata</unitPattern>
 				<unitPattern count="other">{0} sati</unitPattern>
-				<perUnitPattern draft="contributed">{0}/s</perUnitPattern>
+				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="few">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
+			<unit type="duration-minute">
+				<displayName>min</displayName>
+				<unitPattern count="one">{0} min</unitPattern>
+				<unitPattern count="few">{0} min</unitPattern>
+				<unitPattern count="other">{0} min</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>sek</displayName>
+				<unitPattern count="one">{0} sek</unitPattern>
+				<unitPattern count="few">{0} sek</unitPattern>
+				<unitPattern count="other">{0} sek</unitPattern>
+				<perUnitPattern>{0}/sek</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>ms</displayName>
@@ -7883,17 +8193,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ms</unitPattern>
 				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName draft="contributed">min</displayName>
-				<unitPattern count="one">{0} min</unitPattern>
-				<unitPattern count="few">{0} min</unitPattern>
-				<unitPattern count="other">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>meseci</displayName>
-				<unitPattern count="one">{0} mes.</unitPattern>
-				<unitPattern count="few">{0} mes.</unitPattern>
-				<unitPattern count="other">{0} mes.</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="few">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>ns</displayName>
@@ -7901,25 +8205,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ns</unitPattern>
 				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName draft="contributed">sek</displayName>
-				<unitPattern count="one">{0} sek</unitPattern>
-				<unitPattern count="few">{0} sek</unitPattern>
-				<unitPattern count="other">{0} sek</unitPattern>
-				<perUnitPattern draft="contributed">{0}/sek</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>ned.</displayName>
-				<unitPattern count="one">{0} ned.</unitPattern>
-				<unitPattern count="few">{0} ned.</unitPattern>
-				<unitPattern count="other">{0} ned.</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>god.</displayName>
-				<unitPattern count="one">{0} god</unitPattern>
-				<unitPattern count="few">{0} god.</unitPattern>
-				<unitPattern count="other">{0} god.</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>amperi</displayName>
 				<unitPattern count="one">{0} A</unitPattern>
@@ -7944,6 +8229,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="few">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -7956,24 +8247,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} Cal</unitPattern>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>džuli</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="few">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="few">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="few">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>džuli</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="few">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -7986,11 +8271,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="few">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="few">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
@@ -7998,23 +8283,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="few">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="few">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>aj</displayName>
-				<unitPattern count="one">{0} aj</unitPattern>
-				<unitPattern count="few">{0} aj</unitPattern>
-				<unitPattern count="other">{0} aj</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one" draft="contributed">{0} km</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} km</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="few">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>metri</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="few">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
@@ -8022,47 +8309,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ft</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="few">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>inči</displayName>
-				<unitPattern count="one">{0} inč</unitPattern>
-				<unitPattern count="few">{0} inča</unitPattern>
-				<unitPattern count="other">{0} inča</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one" draft="contributed">{0} km</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} km</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>svetlosne god.</displayName>
-				<unitPattern count="one">{0} sg</unitPattern>
-				<unitPattern count="few">{0} sg</unitPattern>
-				<unitPattern count="other">{0} sg</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metri</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="few">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="few">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>milje</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="few">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="few">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -8070,71 +8322,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="few">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="few">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="few">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parseci</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="few">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pikometri</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="few">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>milje</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="few">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>jardi</displayName>
 				<unitPattern count="one">{0} jrd</unitPattern>
 				<unitPattern count="few">{0} jrd</unitPattern>
 				<unitPattern count="other">{0} jrd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ft</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="few">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>inči</displayName>
+				<unitPattern count="one">{0} inč</unitPattern>
+				<unitPattern count="few">{0} inča</unitPattern>
+				<unitPattern count="other">{0} inča</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parseci</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="few">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>svetlosne god.</displayName>
+				<unitPattern count="one">{0} sg</unitPattern>
+				<unitPattern count="few">{0} sg</unitPattern>
+				<unitPattern count="other">{0} sg</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>aj</displayName>
+				<unitPattern count="one">{0} aj</unitPattern>
+				<unitPattern count="few">{0} aj</unitPattern>
+				<unitPattern count="other">{0} aj</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="few">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="few">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="few">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karati</displayName>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="few">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>grami</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="few">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one" draft="contributed">{0} kg</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} kg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="few">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="few">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one" draft="contributed">{0} kg</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} kg</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>grami</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
@@ -8142,23 +8428,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="one">{0} unca</unitPattern>
-				<unitPattern count="few">{0} unce</unitPattern>
-				<unitPattern count="other">{0} unci</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="few">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="few">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="few">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tn</displayName>
@@ -8166,35 +8440,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} tn</unitPattern>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="few">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} unca</unitPattern>
+				<unitPattern count="few">{0} unce</unitPattern>
+				<unitPattern count="other">{0} unci</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="few">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karati</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="few">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="few">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>ks</displayName>
-				<unitPattern count="one">{0} ks</unitPattern>
-				<unitPattern count="few">{0} ks</unitPattern>
-				<unitPattern count="other">{0} ks</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="few">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="few">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="few">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="few">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>vati</displayName>
@@ -8202,24 +8490,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="few">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>ks</displayName>
+				<unitPattern count="one">{0} ks</unitPattern>
+				<unitPattern count="few">{0} ks</unitPattern>
+				<unitPattern count="other">{0} ks</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="few">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="few">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one" draft="contributed">{0} mbar</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} mbar</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -8232,11 +8520,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="few">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="few">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one" draft="contributed">{0} mbar</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} mbar</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometri na sat</displayName>
@@ -8256,6 +8550,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName draft="provisional">kn</displayName>
+				<unitPattern count="one" draft="provisional">{0} kn</unitPattern>
+				<unitPattern count="few" draft="provisional">{0} kn</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one" draft="contributed">{0}°C</unitPattern>
@@ -8274,36 +8580,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="few">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cL</displayName>
-				<unitPattern count="one">{0} cL</unitPattern>
-				<unitPattern count="few">{0} cL</unitPattern>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="few">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="few">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="few">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one" draft="contributed">{0} km³</unitPattern>
@@ -8315,6 +8591,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="few">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="few">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -8328,29 +8612,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>šolje</displayName>
-				<unitPattern count="one">{0} š.</unitPattern>
-				<unitPattern count="few">{0} š.</unitPattern>
-				<unitPattern count="other">{0} š.</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="few">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="one">{0} dL</unitPattern>
-				<unitPattern count="few">{0} dL</unitPattern>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="few">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="few">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="few">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="few">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -8363,12 +8641,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} l</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} l</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="one">{0} ML</unitPattern>
-				<unitPattern count="few">{0} ML</unitPattern>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0} dL</unitPattern>
+				<unitPattern count="few">{0} dL</unitPattern>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="one">{0} cL</unitPattern>
+				<unitPattern count="few">{0} cL</unitPattern>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
@@ -8376,11 +8661,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} mL</unitPattern>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="few">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="few">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="few">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="few">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="few">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
@@ -8388,6 +8692,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="few">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>šolje</displayName>
+				<unitPattern count="one">{0} š.</unitPattern>
+				<unitPattern count="few">{0} š.</unitPattern>
+				<unitPattern count="other">{0} š.</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="few">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>kaš.</displayName>
 				<unitPattern count="one">{0} kaš.</unitPattern>
@@ -8400,16 +8722,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kašič.</unitPattern>
 				<unitPattern count="other">{0} kašič.</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="provisional">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="provisional">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="provisional">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="provisional">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<unitPattern count="one" draft="contributed">{0} G</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} G</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="few" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one" draft="contributed">{0}′</unitPattern>
 				<unitPattern count="few" draft="contributed">{0}′</unitPattern>
@@ -8420,31 +8753,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0}″</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="few" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one" draft="contributed">{0} ac</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ac</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} km²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one" draft="contributed">{0} ha</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} ha</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one" draft="contributed">{0} ft²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ft²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one" draft="contributed">{0} m²</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} m²</unitPattern>
@@ -8455,17 +8773,63 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} mi²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one" draft="contributed">{0} ac</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ac</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one" draft="contributed">{0} ft²</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ft²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} L/100km</unitPattern>
+				<unitPattern count="few">{0} L/100km</unitPattern>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>g.</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>m.</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="few">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>n.</displayName>
+				<unitPattern count="one">{0} n</unitPattern>
+				<unitPattern count="few">{0} n</unitPattern>
+				<unitPattern count="other">{0} n</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>d.</displayName>
-				<unitPattern count="one" draft="contributed">{0} d</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} d</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} d</unitPattern>
+				<unitPattern count="one">{0} d</unitPattern>
+				<unitPattern count="few">{0} d</unitPattern>
+				<unitPattern count="other">{0} d</unitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName draft="contributed">sati</displayName>
-				<unitPattern count="one" draft="contributed">{0} sat</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} sata</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} sati</unitPattern>
+				<displayName>sat</displayName>
+				<unitPattern count="one">{0} sat</unitPattern>
+				<unitPattern count="few">{0} sata</unitPattern>
+				<unitPattern count="other">{0} sati</unitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>min</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="few">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>sek</displayName>
+				<unitPattern count="one">{0} sek</unitPattern>
+				<unitPattern count="few">{0} sek</unitPattern>
+				<unitPattern count="other">{0} sek</unitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>ms</displayName>
@@ -8473,74 +8837,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} ms</unitPattern>
 				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName draft="contributed">min</displayName>
-				<unitPattern count="one" draft="contributed">{0} m</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} m</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} m</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>m.</displayName>
-				<unitPattern count="one" draft="contributed">{0} m</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} m</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} m</unitPattern>
-			</unit>
-			<unit type="duration-second">
-				<displayName draft="contributed">sek</displayName>
-				<unitPattern count="one" draft="contributed">{0} sek</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} sek</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} sek</unitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>n.</displayName>
-				<unitPattern count="one" draft="contributed">{0} n</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} n</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} n</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>g.</displayName>
-				<unitPattern count="one" draft="contributed">{0} g</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} g</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} g</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="few">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>ft</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="few">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one" draft="contributed">{0} inč</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} inča</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} inča</unitPattern>
-			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
 				<unitPattern count="one" draft="contributed">{0} km</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} km</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one" draft="contributed">{0} sg</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} sg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} sg</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>metar</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
 				<unitPattern count="few">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one" draft="contributed">{0} milja</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} milje</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} milja</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="few">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -8553,16 +8866,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} pm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one" draft="contributed">{0} milja</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} milje</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} milja</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one" draft="contributed">{0} jrd</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} jrd</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} jrd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="few">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="length-foot">
+				<displayName>ft</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="few">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one" draft="contributed">{0} inč</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} inča</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} inča</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one" draft="contributed">{0} sg</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} sg</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} sg</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
@@ -8570,20 +8898,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one" draft="contributed">{0} unca</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} unce</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} unci</unitPattern>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="few">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one" draft="contributed">{0} lb</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} lb</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} lb</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one" draft="contributed">{0} ks</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} ks</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ks</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one" draft="contributed">{0} unca</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} unce</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} unci</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one" draft="contributed">{0} kW</unitPattern>
@@ -8595,6 +8924,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few" draft="contributed">{0} W</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one" draft="contributed">{0} ks</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ks</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ks</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one" draft="contributed">{0} hPa</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} hPa</unitPattern>
@@ -8653,15 +8987,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="provisional">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="provisional">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="provisional">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="provisional">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
-			<durationUnitPattern>h:mm</durationUnitPattern>
+			<durationUnitPattern>h.mm</durationUnitPattern>
 		</durationUnit>
 		<durationUnit type="hms">
-			<durationUnitPattern>h:mm:ss</durationUnitPattern>
+			<durationUnitPattern>h.mm.ss</durationUnitPattern>
 		</durationUnit>
 		<durationUnit type="ms">
-			<durationUnitPattern>m:ss</durationUnitPattern>
+			<durationUnitPattern>m.ss</durationUnitPattern>
 		</durationUnit>
 	</units>
 	<listPatterns>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Latn_BA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_BA.xml
similarity index 96%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Latn_BA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_BA.xml
index 86fa571f66f..d1931d82c75 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Latn_BA.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_BA.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2015 Unicode, Inc.
+<!-- Copyright © 1991-2016 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11324 $"/>
-		<generation date="$Date: 2015-02-26 16:53:17 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 12417 $"/>
 		<language type="sr"/>
 		<script type="Latn"/>
 		<territory type="BA"/>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Cyrl_ME.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_ME.xml
similarity index 65%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Cyrl_ME.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_ME.xml
index 10d071ae664..6e1b4eee482 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Cyrl_ME.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_ME.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2016 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12417 $"/>
 		<language type="sr"/>
-		<script type="Cyrl"/>
+		<script type="Latn"/>
 		<territory type="ME"/>
 	</identity>
 </ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Latn_RS.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_RS.xml
similarity index 69%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Latn_RS.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_RS.xml
index 66505b74714..c4d691b9d62 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Latn_RS.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_RS.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="sr"/>
 		<script type="Latn"/>
 		<territory type="RS"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Cyrl_XK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_XK.xml
similarity index 65%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Cyrl_XK.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_XK.xml
index 83aae787f91..a2346516097 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sr_Cyrl_XK.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_XK.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2016 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12417 $"/>
 		<language type="sr"/>
-		<script type="Cyrl"/>
+		<script type="Latn"/>
 		<territory type="XK"/>
 	</identity>
 </ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sv.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv.xml
similarity index 87%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sv.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv.xml
index 3e32da04f84..8451ff847b7 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sv.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12366 $"/>
 		<language type="sv"/>
 	</identity>
 	<localeDisplayNames>
@@ -31,6 +30,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ain">ainu</language>
 			<language type="ak">akan</language>
 			<language type="akk">akkadiska</language>
+			<language type="akz" draft="contributed">Alabama-muskogee</language>
 			<language type="ale">aleutiska</language>
 			<language type="aln" draft="contributed">gegiska</language>
 			<language type="alt">sydaltaiska</language>
@@ -58,13 +58,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ay">aymara</language>
 			<language type="az">azerbajdzjanska</language>
 			<language type="az" alt="short">azeriska</language>
-			<language type="azb" draft="contributed">sydazerbadjanska</language>
 			<language type="ba">basjkiriska</language>
 			<language type="bal">baluchiska</language>
 			<language type="ban">balinesiska</language>
 			<language type="bar" draft="contributed">bayerska</language>
 			<language type="bas">basa</language>
 			<language type="bax">bamunska</language>
+			<language type="bbc" draft="contributed">batak-toba</language>
 			<language type="bbj" draft="contributed">ghomala</language>
 			<language type="be">vitryska</language>
 			<language type="bej">beja</language>
@@ -74,6 +74,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bfd" draft="contributed">bafut</language>
 			<language type="bfq" draft="contributed">bagada</language>
 			<language type="bg">bulgariska</language>
+			<language type="bgn">västbaluchiska</language>
 			<language type="bho">bhojpuri</language>
 			<language type="bi">bislama</language>
 			<language type="bik">bikol</language>
@@ -118,6 +119,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ckb">soranisk kurdiska</language>
 			<language type="co">korsikanska</language>
 			<language type="cop">koptiska</language>
+			<language type="cps" draft="contributed">kapisnon</language>
 			<language type="cr">cree</language>
 			<language type="crh">krimtatariska</language>
 			<language type="cs">tjeckiska</language>
@@ -139,6 +141,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="dje">zarma</language>
 			<language type="doi">dogri</language>
 			<language type="dsb">lågsorbiska</language>
+			<language type="dtp" draft="contributed">centraldusun</language>
 			<language type="dua">duala</language>
 			<language type="dum">medelnederländska</language>
 			<language type="dv">divehi</language>
@@ -158,7 +161,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="en_AU">australisk engelska</language>
 			<language type="en_CA">kanadensisk engelska</language>
 			<language type="en_GB">brittisk engelska</language>
-			<language type="en_GB" alt="short">engelska (UK)</language>
 			<language type="en_US">amerikansk engelska</language>
 			<language type="enm">medelengelska</language>
 			<language type="eo">esperanto</language>
@@ -166,9 +168,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="es_419">latinamerikansk spanska</language>
 			<language type="es_ES">europeisk spanska</language>
 			<language type="es_MX">mexikansk spanska</language>
+			<language type="esu" draft="contributed">centralalaskisk jupiska</language>
 			<language type="et">estniska</language>
 			<language type="eu">baskiska</language>
 			<language type="ewo">ewondo</language>
+			<language type="ext" draft="contributed">extremaduriska</language>
 			<language type="fa">persiska</language>
 			<language type="fan">fang</language>
 			<language type="fat">fanti</language>
@@ -213,6 +217,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="grc">forngrekiska</language>
 			<language type="gsw">schweizertyska</language>
 			<language type="gu">gujarati</language>
+			<language type="guc" draft="contributed">wayuu</language>
+			<language type="gur" draft="contributed">farefare</language>
 			<language type="guz">gusii</language>
 			<language type="gv">manx</language>
 			<language type="gwi">gwichin</language>
@@ -271,13 +277,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="kcg">tyap</language>
 			<language type="kde">makonde</language>
 			<language type="kea">kapverdiska</language>
+			<language type="ken" draft="contributed">kenjang</language>
 			<language type="kfo">koro</language>
 			<language type="kg">kikongo</language>
+			<language type="kgp" draft="contributed">kaingang</language>
 			<language type="kha">khasi</language>
 			<language type="kho">khotanesiska</language>
 			<language type="khq">Timbuktu-songhoy</language>
 			<language type="khw" draft="contributed">khowar</language>
 			<language type="ki">kikuyu</language>
+			<language type="kiu" draft="contributed">kirmanjki</language>
 			<language type="kj">kuanyama</language>
 			<language type="kk">kazakiska</language>
 			<language type="kkj" draft="contributed">mkako</language>
@@ -293,6 +302,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="kpe">kpelle</language>
 			<language type="kr">kanuri</language>
 			<language type="krc">karachay-balkar</language>
+			<language type="kri" draft="contributed">krio</language>
+			<language type="krj" draft="contributed">kinaray-a</language>
 			<language type="krl">karelska</language>
 			<language type="kru">kurukh</language>
 			<language type="ks">kashmiriska</language>
@@ -312,6 +323,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lam">lamba</language>
 			<language type="lb">luxemburgiska</language>
 			<language type="lez">lezghien</language>
+			<language type="lfn" draft="contributed">lingua franca nova</language>
 			<language type="lg">luganda</language>
 			<language type="li">limburgiska</language>
 			<language type="lij" draft="contributed">liguriska</language>
@@ -322,6 +334,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">laotiska</language>
 			<language type="lol">mongo</language>
 			<language type="loz">lozi</language>
+			<language type="lrc">nordluri</language>
 			<language type="lt">litauiska</language>
 			<language type="ltg" draft="contributed">lettgalliska</language>
 			<language type="lu">luba-katanga</language>
@@ -332,6 +345,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lus">lushai</language>
 			<language type="luy">luhya</language>
 			<language type="lv">lettiska</language>
+			<language type="lzh" draft="contributed">litterär kineiska</language>
+			<language type="lzz" draft="contributed">laziska</language>
 			<language type="mad">maduresiska</language>
 			<language type="maf" draft="contributed">mafa</language>
 			<language type="mag">magahi</language>
@@ -369,10 +384,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mus">muskogee</language>
 			<language type="mwl">mirandesiska</language>
 			<language type="mwr">marwari</language>
+			<language type="mwv" draft="contributed">mentawai</language>
 			<language type="my">burmesiska</language>
 			<language type="mye" draft="contributed">myene</language>
 			<language type="myv">erjya</language>
-			<language type="mzn" draft="contributed">mazanderani</language>
+			<language type="mzn">mazanderani</language>
 			<language type="na">nauru</language>
 			<language type="nan" draft="contributed">min nan</language>
 			<language type="nap">napolitanska</language>
@@ -380,11 +396,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nb">norskt bokmål</language>
 			<language type="nd">nordndebele</language>
 			<language type="nds">lågtyska</language>
+			<language type="nds_NL">lågsaxiska</language>
 			<language type="ne">nepalesiska</language>
 			<language type="new">newariska</language>
 			<language type="ng">ndonga</language>
 			<language type="nia">nias</language>
 			<language type="niu">niueanska</language>
+			<language type="njo" draft="contributed">ao-naga</language>
 			<language type="nl">nederländska</language>
 			<language type="nl_BE">flamländska</language>
 			<language type="nmg">kwasio</language>
@@ -393,6 +411,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="no">norska</language>
 			<language type="nog">nogai</language>
 			<language type="non">fornnordiska</language>
+			<language type="nov" draft="contributed">novial</language>
 			<language type="nqo">n-kå</language>
 			<language type="nr">sydndebele</language>
 			<language type="nso">nordsotho</language>
@@ -436,7 +455,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="pt_BR">brasiliansk portugisiska</language>
 			<language type="pt_PT">europeisk portugisiska</language>
 			<language type="qu">quechua</language>
-			<language type="quc">kʼicheʼ</language>
+			<language type="quc">quiché</language>
 			<language type="qug" draft="contributed">Chimborazo-höglandskichwa</language>
 			<language type="raj">rajasthani</language>
 			<language type="rap">rapanui</language>
@@ -472,9 +491,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sco">skotska</language>
 			<language type="sd">sindhi</language>
 			<language type="sdc" draft="contributed">sassaresisk sardiska</language>
+			<language type="sdh">sydkurdiska</language>
 			<language type="se">nordsamiska</language>
 			<language type="see" draft="contributed">seneca</language>
 			<language type="seh">sena</language>
+			<language type="sei" draft="contributed">seri</language>
 			<language type="sel">selkup</language>
 			<language type="ses">Gao-songhay</language>
 			<language type="sg">sango</language>
@@ -489,6 +510,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sk">slovakiska</language>
 			<language type="sl">slovenska</language>
 			<language type="sli" draft="contributed">lågsilesiska</language>
+			<language type="sly" draft="contributed">selayar</language>
 			<language type="sm">samoanska</language>
 			<language type="sma">sydsamiska</language>
 			<language type="smj">lulesamiska</language>
@@ -512,8 +534,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">sumeriska</language>
 			<language type="sv">svenska</language>
 			<language type="sw">swahili</language>
+			<language type="sw_CD">Kongo-swahili</language>
 			<language type="swb">shimaoré</language>
-			<language type="swc">Kongo-swahili</language>
 			<language type="syc">klassisk syriska</language>
 			<language type="syr">syriska</language>
 			<language type="szl" draft="contributed">silesiska</language>
@@ -531,6 +553,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="tiv">tivi</language>
 			<language type="tk">turkmeniska</language>
 			<language type="tkl">tokelauiska</language>
+			<language type="tkr" draft="contributed">tsakhur</language>
 			<language type="tl">tagalog</language>
 			<language type="tlh">klingonska</language>
 			<language type="tli">tlingit</language>
@@ -541,11 +564,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="tog">nyasatonganska</language>
 			<language type="tpi">tok pisin</language>
 			<language type="tr">turkiska</language>
+			<language type="tru" draft="contributed">turoyo</language>
 			<language type="trv" draft="contributed">taroko</language>
 			<language type="ts">tsonga</language>
 			<language type="tsd" draft="contributed">tsakodiska</language>
 			<language type="tsi">tsimshian</language>
 			<language type="tt">tatariska</language>
+			<language type="ttt" draft="contributed">muslimsk tatariska</language>
 			<language type="tum">tumbuka</language>
 			<language type="tvl">tuvaluanska</language>
 			<language type="tw">twi</language>
@@ -578,10 +603,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">walamo</language>
 			<language type="war">waray</language>
 			<language type="was">washo</language>
+			<language type="wbp">warlpiri</language>
 			<language type="wo">wolof</language>
 			<language type="wuu" draft="contributed">wu</language>
 			<language type="xal">kalmuckiska</language>
 			<language type="xh">xhosa</language>
+			<language type="xmf" draft="contributed">mingrelianska</language>
 			<language type="xog">lusoga</language>
 			<language type="yao">kiyao</language>
 			<language type="yap">japetiska</language>
@@ -589,6 +616,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ybb" draft="contributed">bamileké-jemba</language>
 			<language type="yi">jiddisch</language>
 			<language type="yo">yoruba</language>
+			<language type="yrl" draft="contributed">nheengatu</language>
 			<language type="yue">kantonesiska</language>
 			<language type="za">zhuang</language>
 			<language type="zap">zapotek</language>
@@ -607,6 +635,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<scripts>
 			<script type="Afak" draft="contributed">afakiska</script>
 			<script type="Aghb" draft="contributed">kaukasiska albanska</script>
+			<script type="Ahom" draft="contributed">ahom</script>
 			<script type="Arab">arabiska</script>
 			<script type="Armi">imperisk arameiska</script>
 			<script type="Armn">armeniska</script>
@@ -655,6 +684,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Hans" alt="stand-alone">förenklade han-tecken</script>
 			<script type="Hant">traditionella</script>
 			<script type="Hant" alt="stand-alone">traditionella han-tecken</script>
+			<script type="Hatr" draft="contributed">hatran</script>
 			<script type="Hebr">hebreiska</script>
 			<script type="Hira">hiragana</script>
 			<script type="Hluw" draft="contributed">hittitiska hieroglyfer</script>
@@ -701,6 +731,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Moon">moon</script>
 			<script type="Mroo" draft="contributed">mru</script>
 			<script type="Mtei">meitei-mayek</script>
+			<script type="Mult" draft="contributed">multaniska</script>
 			<script type="Mymr">burmesiska</script>
 			<script type="Narb" draft="contributed">fornnordarabiska</script>
 			<script type="Nbat" draft="contributed">nabatateiska</script>
@@ -811,7 +842,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albanien</territory>
 			<territory type="AM">Armenien</territory>
-			<territory type="AN">Nederländska Antillerna</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antarktis</territory>
 			<territory type="AR">Argentina</territory>
@@ -907,7 +937,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GU">Guam</territory>
 			<territory type="GW">Guinea-Bissau</territory>
 			<territory type="GY">Guyana</territory>
-			<territory type="HK">Hongkong (S.A.R. Kina)</territory>
+			<territory type="HK">Hongkong, S.A.R. Kina</territory>
 			<territory type="HK" alt="short">Hongkong</territory>
 			<territory type="HM">Heardön och McDonaldöarna</territory>
 			<territory type="HN">Honduras</territory>
@@ -963,7 +993,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ML">Mali</territory>
 			<territory type="MM">Myanmar (Burma)</territory>
 			<territory type="MN">Mongoliet</territory>
-			<territory type="MO">Macao (S.A.R. Kina)</territory>
+			<territory type="MO">Macao, S.A.R. Kina</territory>
 			<territory type="MO" alt="short">Macao</territory>
 			<territory type="MP">Nordmarianerna</territory>
 			<territory type="MQ">Martinique</territory>
@@ -1105,6 +1135,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<variant type="JAUER" draft="contributed">jauer-dialekt</variant>
 			<variant type="JYUTPING" draft="contributed">jyutping</variant>
 			<variant type="KKCOR" draft="contributed">vanlig stavning</variant>
+			<variant type="KOCIEWIE" draft="contributed">kociewiska</variant>
 			<variant type="KSCOR" draft="contributed">standardstavning</variant>
 			<variant type="LAUKIKA" draft="contributed">laukika-dialekt</variant>
 			<variant type="LIPAW">Lipovaz-dialekt</variant>
@@ -1156,6 +1187,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">Numerisk sortering</key>
 			<key type="colStrength" draft="contributed">Sorteringsstyrka</key>
 			<key type="currency">valuta</key>
+			<key type="hc">12- eller 24-timmarsklocka</key>
+			<key type="lb">radbrytningstyp</key>
+			<key type="ms">enhetssystem</key>
 			<key type="numbers">siffror</key>
 			<key type="timezone" draft="contributed">Tidszon</key>
 			<key type="va" draft="contributed">Språkvariant</key>
@@ -1163,121 +1197,133 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">privat</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">indo-arabiska siffror</type>
-			<type type="arabext" key="numbers">utökade indo-arabiska siffror</type>
-			<type type="armn" key="numbers">armeniska taltecken</type>
-			<type type="armnlow" key="numbers">små armeniska taltecken</type>
-			<type type="bali" key="numbers" draft="contributed">balinesiska siffror</type>
-			<type type="beng" key="numbers">bengaliska siffror</type>
-			<type type="big5han" key="collation">big5-sorteringsordning</type>
-			<type type="brah" key="numbers" draft="contributed">brahmiska siffror</type>
-			<type type="buddhist" key="calendar">buddistisk kalender</type>
-			<type type="cakm" key="numbers" draft="contributed">chakma-siffror</type>
-			<type type="cham" key="numbers" draft="contributed">chamiska siffror</type>
-			<type type="chinese" key="calendar">kinesisk kalender</type>
-			<type type="coptic" key="calendar">koptisk kalender</type>
-			<type type="dangi" key="calendar">koreansk kalender</type>
-			<type type="deva" key="numbers">devanagariska siffror</type>
-			<type type="dictionary" key="collation">ordbokssorteringsordning</type>
-			<type type="ducet" key="collation">grundläggande Unicode-sorteringsordning</type>
-			<type type="eor" key="collation" draft="contributed">sorteringsordning för flerspråkliga europeiska dokument</type>
-			<type type="ethi" key="numbers">etiopiska taltecken</type>
-			<type type="ethiopic" key="calendar">etiopisk kalender</type>
-			<type type="ethiopic-amete-alem" key="calendar">etiopisk amete-alem-kalender</type>
-			<type type="finance" key="numbers" draft="contributed">Finansiella siffror</type>
-			<type type="fullwide" key="numbers">fullbreddssiffror</type>
-			<type type="gb2312han" key="collation">gb2312-sorteringsordning</type>
-			<type type="geor" key="numbers">georgiska taltecken</type>
-			<type type="gregorian" key="calendar">gregoriansk kalender</type>
-			<type type="grek" key="numbers">grekiska taltecken</type>
-			<type type="greklow" key="numbers">små grekiska taltecken</type>
-			<type type="gujr" key="numbers">gujaratiska siffror</type>
-			<type type="guru" key="numbers">gurmukhiska siffror</type>
-			<type type="hanidec" key="numbers">kinesiska decimaltal</type>
-			<type type="hans" key="numbers">förenklat kinesiskt stavade tal</type>
-			<type type="hansfin" key="numbers">förenklat kinesiskt finansiellt stavade tal</type>
-			<type type="hant" key="numbers">traditionellt kinesiskt stavade tal</type>
-			<type type="hantfin" key="numbers">traditionellt kinesiskt finansiellt stavade tal</type>
-			<type type="hebr" key="numbers">hebreiska taltecken</type>
-			<type type="hebrew" key="calendar">hebreisk kalender</type>
-			<type type="identical" key="colStrength" draft="contributed">Sortera alla</type>
-			<type type="indian" key="calendar">indisk kalender</type>
-			<type type="islamic" key="calendar">islamisk kalender</type>
-			<type type="islamic-civil" key="calendar">islamisk civil kalender</type>
-			<type type="islamic-rgsa" key="calendar">islamisk kalender, Saudi-Arabien</type>
-			<type type="islamic-tbla" key="calendar">islamisk kalender, astronomisk</type>
-			<type type="islamic-umalqura" key="calendar">islamisk kalender, Umm al-Qura</type>
-			<type type="iso8601" key="calendar">ISO 8601-kalender</type>
-			<type type="japanese" key="calendar">japansk kalender</type>
-			<type type="java" key="numbers" draft="contributed">javanesiska siffror</type>
-			<type type="jpan" key="numbers">japanskt stavade tal</type>
-			<type type="jpanfin" key="numbers">japanskt finansiellt stavade tal</type>
-			<type type="kali" key="numbers" draft="contributed">kayah li-siffror</type>
-			<type type="khmr" key="numbers">khmeriska siffror</type>
-			<type type="knda" key="numbers">kannadiska siffror</type>
-			<type type="lana" key="numbers" draft="contributed">tai tham hora-siffror</type>
-			<type type="lanatham" key="numbers" draft="contributed">tai tham tham-siffror</type>
-			<type type="laoo" key="numbers">laotiska siffror</type>
-			<type type="latn" key="numbers">västerländska siffror</type>
-			<type type="lepc" key="numbers" draft="contributed">lepcha-siffror</type>
-			<type type="limb" key="numbers" draft="contributed">limbu-siffror</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">Sortera gemener först</type>
-			<type type="mlym" key="numbers">malayalamiska siffror</type>
-			<type type="mong" key="numbers">mongoliska siffror</type>
-			<type type="mtei" key="numbers" draft="contributed">meetei mayek-siffror</type>
-			<type type="mymr" key="numbers">burmesiska siffror</type>
-			<type type="mymrshan" key="numbers" draft="contributed">burmesiska shan-siffror</type>
-			<type type="native" key="numbers" draft="contributed">Språkspecifika siffror</type>
-			<type type="nkoo" key="numbers" draft="contributed">n-kå-siffor</type>
-			<type type="no" key="colBackwards">sortera accenter normalt</type>
-			<type type="no" key="colCaseFirst" draft="contributed">Ordna normalt efter skiftläge</type>
-			<type type="no" key="colCaseLevel" draft="contributed">Sortera oavsett skiftläge</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">Sortera kana separat</type>
-			<type type="no" key="colNormalization">sortera utan normalisering</type>
-			<type type="no" key="colNumeric" draft="contributed">Sortera siffror för sig</type>
-			<type type="non-ignorable" key="colAlternate">sortera symboler</type>
-			<type type="olck" key="numbers" draft="contributed">ol chiki-siffror</type>
-			<type type="orya" key="numbers">oriyiska siffror</type>
-			<type type="osma" key="numbers" draft="contributed">osmanya-siffror</type>
-			<type type="persian" key="calendar">persisk kalender</type>
-			<type type="phonebook" key="collation">telefonkatalogssorteringsordning</type>
-			<type type="phonetic" key="collation">fonetisk sorteringsordning</type>
-			<type type="pinyin" key="collation">pinyin-sorteringsordning</type>
-			<type type="primary" key="colStrength" draft="contributed">Sortera endast efter grundbokstäver</type>
-			<type type="quaternary" key="colStrength" draft="contributed">Sortera efter accent/skiftläge/bredd/kana</type>
-			<type type="reformed" key="collation">reformerad sorteringsordning</type>
-			<type type="roc" key="calendar">kinesiska republikens kalender</type>
-			<type type="roman" key="numbers">romerska taltecken</type>
-			<type type="romanlow" key="numbers">små romerska taltecken</type>
-			<type type="saur" key="numbers" draft="contributed">saurashtra-siffror</type>
-			<type type="search" key="collation">allmän sökning</type>
-			<type type="searchjl" key="collation" draft="contributed">söksorteringsordning för att söka på inledande Hangul-konsonant</type>
-			<type type="secondary" key="colStrength" draft="contributed">Sortera accenter</type>
-			<type type="shifted" key="colAlternate" draft="contributed">Sortera oavsett symboler</type>
-			<type type="shrd" key="numbers" draft="contributed">sharada-siffror</type>
-			<type type="sora" key="numbers" draft="contributed">sora sompeng-siffror</type>
-			<type type="standard" key="collation">normal sorteringsordning</type>
-			<type type="stroke" key="collation">strecksorteringsordning</type>
-			<type type="sund" key="numbers" draft="contributed">sundanesiska siffror</type>
-			<type type="takr" key="numbers" draft="contributed">takri-siffror</type>
-			<type type="talu" key="numbers" draft="contributed">ny tai lü-siffror</type>
-			<type type="taml" key="numbers">traditionella tamilska taltecken</type>
-			<type type="tamldec" key="numbers">tamilska siffror</type>
-			<type type="telu" key="numbers">telugiska siffror</type>
-			<type type="tertiary" key="colStrength" draft="contributed">Sortera accenter/skiftläge/bredd</type>
-			<type type="thai" key="numbers">thailändska siffror</type>
-			<type type="tibt" key="numbers">tibetanska siffror</type>
-			<type type="traditional" key="collation">traditionell ordning</type>
-			<type type="traditional" key="numbers" draft="contributed">Traditionella siffror</type>
-			<type type="unihan" key="collation">radikal-streck-sorteringsordning</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">Sortera versaler först</type>
-			<type type="vaii" key="numbers" draft="contributed">vai-siffror</type>
-			<type type="yes" key="colBackwards">sortera accenter omvänt</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">Sortera efter skiftläge</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">Sortera efter kana</type>
-			<type type="yes" key="colNormalization">sortera med Unicode-normalisering</type>
-			<type type="yes" key="colNumeric" draft="contributed">Sortera siffror numeriskt</type>
-			<type type="zhuyin" key="collation">zhuyin-sorteringsordning</type>
+			<type key="calendar" type="buddhist">buddistisk kalender</type>
+			<type key="calendar" type="chinese">kinesisk kalender</type>
+			<type key="calendar" type="coptic">koptisk kalender</type>
+			<type key="calendar" type="dangi">koreansk kalender</type>
+			<type key="calendar" type="ethiopic">etiopisk kalender</type>
+			<type key="calendar" type="ethiopic-amete-alem">etiopisk amete-alem-kalender</type>
+			<type key="calendar" type="gregorian">gregoriansk kalender</type>
+			<type key="calendar" type="hebrew">hebreisk kalender</type>
+			<type key="calendar" type="indian">indisk kalender</type>
+			<type key="calendar" type="islamic">islamisk kalender</type>
+			<type key="calendar" type="islamic-civil">islamisk civil kalender</type>
+			<type key="calendar" type="islamic-rgsa">islamisk kalender, Saudi-Arabien</type>
+			<type key="calendar" type="islamic-tbla">islamisk kalender, astronomisk</type>
+			<type key="calendar" type="islamic-umalqura">islamisk kalender, Umm al-Qura</type>
+			<type key="calendar" type="iso8601">ISO 8601-kalender</type>
+			<type key="calendar" type="japanese">japansk kalender</type>
+			<type key="calendar" type="persian">persisk kalender</type>
+			<type key="calendar" type="roc">kinesiska republikens kalender</type>
+			<type key="colAlternate" type="non-ignorable">sortera symboler</type>
+			<type key="colAlternate" type="shifted" draft="contributed">Sortera oavsett symboler</type>
+			<type key="colBackwards" type="no">sortera accenter normalt</type>
+			<type key="colBackwards" type="yes">sortera accenter omvänt</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">Sortera gemener först</type>
+			<type key="colCaseFirst" type="no" draft="contributed">Ordna normalt efter skiftläge</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">Sortera versaler först</type>
+			<type key="colCaseLevel" type="no" draft="contributed">Sortera oavsett skiftläge</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">Sortera efter skiftläge</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">Sortera kana separat</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">Sortera efter kana</type>
+			<type key="collation" type="big5han">big5-sorteringsordning</type>
+			<type key="collation" type="compat" draft="contributed">bakåtkompatibel sortering</type>
+			<type key="collation" type="dictionary">ordbokssorteringsordning</type>
+			<type key="collation" type="ducet">grundläggande Unicode-sorteringsordning</type>
+			<type key="collation" type="emoji" draft="contributed">emojisortering</type>
+			<type key="collation" type="eor" draft="contributed">sorteringsordning för flerspråkliga europeiska dokument</type>
+			<type key="collation" type="gb2312han">gb2312-sorteringsordning</type>
+			<type key="collation" type="phonebook">telefonkatalogssorteringsordning</type>
+			<type key="collation" type="phonetic">fonetisk sorteringsordning</type>
+			<type key="collation" type="pinyin">pinyin-sorteringsordning</type>
+			<type key="collation" type="reformed">reformerad sorteringsordning</type>
+			<type key="collation" type="search">allmän sökning</type>
+			<type key="collation" type="searchjl" draft="contributed">söksorteringsordning för att söka på inledande Hangul-konsonant</type>
+			<type key="collation" type="standard">normal sorteringsordning</type>
+			<type key="collation" type="stroke">strecksorteringsordning</type>
+			<type key="collation" type="traditional">traditionell ordning</type>
+			<type key="collation" type="unihan">radikal-streck-sorteringsordning</type>
+			<type key="collation" type="zhuyin">zhuyin-sorteringsordning</type>
+			<type key="colNormalization" type="no">sortera utan normalisering</type>
+			<type key="colNormalization" type="yes">sortera med Unicode-normalisering</type>
+			<type key="colNumeric" type="no" draft="contributed">Sortera siffror för sig</type>
+			<type key="colNumeric" type="yes" draft="contributed">Sortera siffror numeriskt</type>
+			<type key="colStrength" type="identical" draft="contributed">Sortera alla</type>
+			<type key="colStrength" type="primary" draft="contributed">Sortera endast efter grundbokstäver</type>
+			<type key="colStrength" type="quaternary" draft="contributed">Sortera efter accent/skiftläge/bredd/kana</type>
+			<type key="colStrength" type="secondary" draft="contributed">Sortera accenter</type>
+			<type key="colStrength" type="tertiary" draft="contributed">Sortera accenter/skiftläge/bredd</type>
+			<type key="hc" type="h11">12-timmarsklocka (0–11)</type>
+			<type key="hc" type="h12">12-timmarsklocka (1–12)</type>
+			<type key="hc" type="h23">24-timmarsklocka (0–23)</type>
+			<type key="hc" type="h24">24-timmarsklocka (1–24)</type>
+			<type key="lb" type="loose">fri radbrytning</type>
+			<type key="lb" type="normal">normal radbrytning</type>
+			<type key="lb" type="strict">strikt radbrytning</type>
+			<type key="ms" type="metric">SI-enheter</type>
+			<type key="ms" type="uksystem">brittiskt måttsystem</type>
+			<type key="ms" type="ussystem">USA:s måttsystem</type>
+			<type key="numbers" type="arab">indo-arabiska siffror</type>
+			<type key="numbers" type="arabext">utökade indo-arabiska siffror</type>
+			<type key="numbers" type="armn">armeniska taltecken</type>
+			<type key="numbers" type="armnlow">små armeniska taltecken</type>
+			<type key="numbers" type="bali" draft="contributed">balinesiska siffror</type>
+			<type key="numbers" type="beng">bengaliska siffror</type>
+			<type key="numbers" type="brah" draft="contributed">brahmiska siffror</type>
+			<type key="numbers" type="cakm" draft="contributed">chakma-siffror</type>
+			<type key="numbers" type="cham" draft="contributed">chamiska siffror</type>
+			<type key="numbers" type="deva">devanagariska siffror</type>
+			<type key="numbers" type="ethi">etiopiska taltecken</type>
+			<type key="numbers" type="finance" draft="contributed">Finansiella siffror</type>
+			<type key="numbers" type="fullwide">fullbreddssiffror</type>
+			<type key="numbers" type="geor">georgiska taltecken</type>
+			<type key="numbers" type="grek">grekiska taltecken</type>
+			<type key="numbers" type="greklow">små grekiska taltecken</type>
+			<type key="numbers" type="gujr">gujaratiska siffror</type>
+			<type key="numbers" type="guru">gurmukhiska siffror</type>
+			<type key="numbers" type="hanidec">kinesiska decimaltal</type>
+			<type key="numbers" type="hans">förenklat kinesiskt stavade tal</type>
+			<type key="numbers" type="hansfin">förenklat kinesiskt finansiellt stavade tal</type>
+			<type key="numbers" type="hant">traditionellt kinesiskt stavade tal</type>
+			<type key="numbers" type="hantfin">traditionellt kinesiskt finansiellt stavade tal</type>
+			<type key="numbers" type="hebr">hebreiska taltecken</type>
+			<type key="numbers" type="java" draft="contributed">javanesiska siffror</type>
+			<type key="numbers" type="jpan">japanskt stavade tal</type>
+			<type key="numbers" type="jpanfin">japanskt finansiellt stavade tal</type>
+			<type key="numbers" type="kali" draft="contributed">kayah li-siffror</type>
+			<type key="numbers" type="khmr">khmeriska siffror</type>
+			<type key="numbers" type="knda">kannadiska siffror</type>
+			<type key="numbers" type="lana" draft="contributed">tai tham hora-siffror</type>
+			<type key="numbers" type="lanatham" draft="contributed">tai tham tham-siffror</type>
+			<type key="numbers" type="laoo">laotiska siffror</type>
+			<type key="numbers" type="latn">västerländska siffror</type>
+			<type key="numbers" type="lepc" draft="contributed">lepcha-siffror</type>
+			<type key="numbers" type="limb" draft="contributed">limbu-siffror</type>
+			<type key="numbers" type="mlym">malayalamiska siffror</type>
+			<type key="numbers" type="mong">mongoliska siffror</type>
+			<type key="numbers" type="mtei" draft="contributed">meetei mayek-siffror</type>
+			<type key="numbers" type="mymr">burmesiska siffror</type>
+			<type key="numbers" type="mymrshan" draft="contributed">burmesiska shan-siffror</type>
+			<type key="numbers" type="native" draft="contributed">Språkspecifika siffror</type>
+			<type key="numbers" type="nkoo" draft="contributed">n-kå-siffor</type>
+			<type key="numbers" type="olck" draft="contributed">ol chiki-siffror</type>
+			<type key="numbers" type="orya">oriyiska siffror</type>
+			<type key="numbers" type="osma" draft="contributed">osmanya-siffror</type>
+			<type key="numbers" type="roman">romerska taltecken</type>
+			<type key="numbers" type="romanlow">små romerska taltecken</type>
+			<type key="numbers" type="saur" draft="contributed">saurashtra-siffror</type>
+			<type key="numbers" type="shrd" draft="contributed">sharada-siffror</type>
+			<type key="numbers" type="sora" draft="contributed">sora sompeng-siffror</type>
+			<type key="numbers" type="sund" draft="contributed">sundanesiska siffror</type>
+			<type key="numbers" type="takr" draft="contributed">takri-siffror</type>
+			<type key="numbers" type="talu" draft="contributed">ny tai lü-siffror</type>
+			<type key="numbers" type="taml">traditionella tamilska taltecken</type>
+			<type key="numbers" type="tamldec">tamilska siffror</type>
+			<type key="numbers" type="telu">telugiska siffror</type>
+			<type key="numbers" type="thai">thailändska siffror</type>
+			<type key="numbers" type="tibt">tibetanska siffror</type>
+			<type key="numbers" type="traditional" draft="contributed">Traditionella siffror</type>
+			<type key="numbers" type="vaii" draft="contributed">vai-siffror</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">BGN</transformName>
@@ -1592,6 +1638,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -1616,15 +1663,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
-						<dateFormatItem id="yyyyM">G y-MM</dateFormatItem>
-						<dateFormatItem id="yyyyMd">G y-MM-dd</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">E, y-MM-dd G</dateFormatItem>
+						<dateFormatItem id="yyyyM">y-MM G</dateFormatItem>
+						<dateFormatItem id="yyyyMd">y-MM-dd G</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E y-MM-dd G</dateFormatItem>
 						<dateFormatItem id="yyyyMM">G y-MM</dateFormatItem>
 						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E d MMM y G</dateFormatItem>
-						<dateFormatItem id="yyyyQQQ">G y QQQ</dateFormatItem>
-						<dateFormatItem id="yyyyQQQQ">G y QQQQ</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM" draft="contributed">MMMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
@@ -1668,7 +1716,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
 							<greatestDifference id="d">d–d/M</greatestDifference>
-							<greatestDifference id="M">d/M – d/M</greatestDifference>
+							<greatestDifference id="M">d/M–d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
 							<greatestDifference id="d">E d/M – E d/M</greatestDifference>
@@ -1698,9 +1746,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="y">G y-MM-dd – y-MM-dd</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, y-MM-dd – E, y-MM-dd G</greatestDifference>
-							<greatestDifference id="M">E, y-MM-dd – E, y-MM-dd G</greatestDifference>
-							<greatestDifference id="y">E, y-MM-dd – E, y-MM-dd G</greatestDifference>
+							<greatestDifference id="d">E y-MM-dd – E y-MM-dd</greatestDifference>
+							<greatestDifference id="M">E y-MM-dd – E y-MM-dd G</greatestDifference>
+							<greatestDifference id="y">E y-MM-dd – E y-MM-dd G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
 							<greatestDifference id="M">MMM–MMM y G</greatestDifference>
@@ -1771,18 +1819,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</monthContext>
 					<monthContext type="stand-alone">
 						<monthWidth type="abbreviated">
-							<month type="1">Jan.</month>
-							<month type="2">Feb.</month>
-							<month type="3">Mars</month>
-							<month type="4">Apr.</month>
-							<month type="5">Maj</month>
-							<month type="6">Juni</month>
-							<month type="7">Juli</month>
-							<month type="8">Aug.</month>
-							<month type="9">Sep.</month>
-							<month type="10">Okt.</month>
-							<month type="11">Nov.</month>
-							<month type="12">Dec.</month>
+							<month type="1">jan.</month>
+							<month type="2">feb.</month>
+							<month type="3">mars</month>
+							<month type="4">apr.</month>
+							<month type="5">maj</month>
+							<month type="6">juni</month>
+							<month type="7">juli</month>
+							<month type="8">aug.</month>
+							<month type="9">sep.</month>
+							<month type="10">okt.</month>
+							<month type="11">nov.</month>
+							<month type="12">dec.</month>
 						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">J</month>
@@ -1799,18 +1847,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="12">D</month>
 						</monthWidth>
 						<monthWidth type="wide">
-							<month type="1">Januari</month>
-							<month type="2">Februari</month>
-							<month type="3">Mars</month>
-							<month type="4">April</month>
-							<month type="5">Maj</month>
-							<month type="6">Juni</month>
-							<month type="7">Juli</month>
-							<month type="8">Augusti</month>
-							<month type="9">September</month>
-							<month type="10">Oktober</month>
-							<month type="11">November</month>
-							<month type="12">December</month>
+							<month type="1">januari</month>
+							<month type="2">februari</month>
+							<month type="3">mars</month>
+							<month type="4">april</month>
+							<month type="5">maj</month>
+							<month type="6">juni</month>
+							<month type="7">juli</month>
+							<month type="8">augusti</month>
+							<month type="9">september</month>
+							<month type="10">oktober</month>
+							<month type="11">november</month>
+							<month type="12">december</month>
 						</monthWidth>
 					</monthContext>
 				</months>
@@ -1855,13 +1903,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dayContext>
 					<dayContext type="stand-alone">
 						<dayWidth type="abbreviated">
-							<day type="sun">Sön</day>
-							<day type="mon">Mån</day>
-							<day type="tue">Tis</day>
-							<day type="wed">Ons</day>
-							<day type="thu">Tor</day>
-							<day type="fri">Fre</day>
-							<day type="sat">Lör</day>
+							<day type="sun">sön</day>
+							<day type="mon">mån</day>
+							<day type="tue">tis</day>
+							<day type="wed">ons</day>
+							<day type="thu">tors</day>
+							<day type="fri">fre</day>
+							<day type="sat">lör</day>
 						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun">S</day>
@@ -1873,22 +1921,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<day type="sat">L</day>
 						</dayWidth>
 						<dayWidth type="short">
-							<day type="sun">Sö</day>
-							<day type="mon">Må</day>
-							<day type="tue">Ti</day>
-							<day type="wed">On</day>
-							<day type="thu">To</day>
-							<day type="fri">Fr</day>
-							<day type="sat">Lö</day>
+							<day type="sun">sö</day>
+							<day type="mon">må</day>
+							<day type="tue">ti</day>
+							<day type="wed">on</day>
+							<day type="thu">to</day>
+							<day type="fri">fr</day>
+							<day type="sat">lö</day>
 						</dayWidth>
 						<dayWidth type="wide">
-							<day type="sun">Söndag</day>
-							<day type="mon">Måndag</day>
-							<day type="tue">Tisdag</day>
-							<day type="wed">Onsdag</day>
-							<day type="thu">Torsdag</day>
-							<day type="fri">Fredag</day>
-							<day type="sat">Lördag</day>
+							<day type="sun">söndag</day>
+							<day type="mon">måndag</day>
+							<day type="tue">tisdag</day>
+							<day type="wed">onsdag</day>
+							<day type="thu">torsdag</day>
+							<day type="fri">fredag</day>
+							<day type="sat">lördag</day>
 						</dayWidth>
 					</dayContext>
 				</days>
@@ -1937,32 +1985,66 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am" draft="contributed">FM</dayPeriod>
-							<dayPeriod type="pm" draft="contributed">EM</dayPeriod>
+							<dayPeriod type="midnight">midnatt</dayPeriod>
+							<dayPeriod type="am">fm</dayPeriod>
+							<dayPeriod type="pm">em</dayPeriod>
+							<dayPeriod type="morning1">på morg.</dayPeriod>
+							<dayPeriod type="morning2">på förm.</dayPeriod>
+							<dayPeriod type="afternoon1">på efterm.</dayPeriod>
+							<dayPeriod type="evening1">på kvällen</dayPeriod>
+							<dayPeriod type="night1">på natten</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">f</dayPeriod>
-							<dayPeriod type="noon">p.d.</dayPeriod>
-							<dayPeriod type="pm">e</dayPeriod>
+							<dayPeriod type="midnight">midn.</dayPeriod>
+							<dayPeriod type="am">fm</dayPeriod>
+							<dayPeriod type="pm">em</dayPeriod>
+							<dayPeriod type="morning1">på morg.</dayPeriod>
+							<dayPeriod type="morning2">på förm.</dayPeriod>
+							<dayPeriod type="afternoon1">på efterm.</dayPeriod>
+							<dayPeriod type="evening1">på kvällen</dayPeriod>
+							<dayPeriod type="night1">på natten</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">midnatt</dayPeriod>
 							<dayPeriod type="am">fm</dayPeriod>
-							<dayPeriod type="noon">på dagen</dayPeriod>
 							<dayPeriod type="pm">em</dayPeriod>
+							<dayPeriod type="morning1">på morgonen</dayPeriod>
+							<dayPeriod type="morning2">på förmiddagen</dayPeriod>
+							<dayPeriod type="afternoon1">på eftermiddagen</dayPeriod>
+							<dayPeriod type="evening1">på kvällen</dayPeriod>
+							<dayPeriod type="night1">på natten</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am" draft="provisional">fm</dayPeriod>
-							<dayPeriod type="pm" draft="provisional">em</dayPeriod>
+							<dayPeriod type="midnight">midnatt</dayPeriod>
+							<dayPeriod type="am">f.m.</dayPeriod>
+							<dayPeriod type="pm">e.m.</dayPeriod>
+							<dayPeriod type="morning1">morgon</dayPeriod>
+							<dayPeriod type="morning2">förm.</dayPeriod>
+							<dayPeriod type="afternoon1">efterm.</dayPeriod>
+							<dayPeriod type="evening1">kväll</dayPeriod>
+							<dayPeriod type="night1">natt</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am" draft="unconfirmed">f.m.</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">e.m.</dayPeriod>
+							<dayPeriod type="midnight">midn.</dayPeriod>
+							<dayPeriod type="am">fm</dayPeriod>
+							<dayPeriod type="pm">em</dayPeriod>
+							<dayPeriod type="morning1">morg.</dayPeriod>
+							<dayPeriod type="morning2">förm.</dayPeriod>
+							<dayPeriod type="afternoon1">efterm.</dayPeriod>
+							<dayPeriod type="evening1">kväll</dayPeriod>
+							<dayPeriod type="night1">natt</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="am" draft="unconfirmed">förmiddag</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">eftermiddag</dayPeriod>
+							<dayPeriod type="midnight">midnatt</dayPeriod>
+							<dayPeriod type="am">förmiddag</dayPeriod>
+							<dayPeriod type="pm">eftermiddag</dayPeriod>
+							<dayPeriod type="morning1">morgon</dayPeriod>
+							<dayPeriod type="morning2">förmiddag</dayPeriod>
+							<dayPeriod type="afternoon1">eftermiddag</dayPeriod>
+							<dayPeriod type="evening1">kväll</dayPeriod>
+							<dayPeriod type="night1">natt</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -2012,21 +2094,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<timeFormatLength type="full">
 						<timeFormat>
 							<pattern>'kl'. HH:mm:ss zzzz</pattern>
+							<pattern alt="variant">'kl'. HH.mm.ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
 							<pattern>HH:mm:ss z</pattern>
+							<pattern alt="variant">HH.mm.ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
 							<pattern>HH:mm:ss</pattern>
+							<pattern alt="variant">HH.mm.ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
 							<pattern>HH:mm</pattern>
+							<pattern alt="variant">HH.mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -2092,8 +2178,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMEd">E d MMM y</dateFormatItem>
-						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
-						<dateFormatItem id="yQQQQ">y QQQQ</dateFormatItem>
+						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
+						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
+						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
 					</availableFormats>
 					<appendItems>
 						<appendItem request="Timezone">{0} {1}</appendItem>
@@ -2140,7 +2227,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
 							<greatestDifference id="d">d–d/M</greatestDifference>
-							<greatestDifference id="M">d/M – d/M</greatestDifference>
+							<greatestDifference id="M">d/M–d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
 							<greatestDifference id="d">E d/M – E d/M</greatestDifference>
@@ -2386,6 +2473,246 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</eras>
 			</calendar>
 			<calendar type="japanese">
+				<eras>
+					<eraAbbr>
+						<era type="0" draft="contributed">Taika (645–650)</era>
+						<era type="1" draft="contributed">Hakuchi (650–671)</era>
+						<era type="2" draft="contributed">Hakuhō (672–686)</era>
+						<era type="3" draft="contributed">Shuchō (686–701)</era>
+						<era type="4" draft="contributed">Taihō (701–704)</era>
+						<era type="5" draft="contributed">Keiun (704–708)</era>
+						<era type="6" draft="contributed">Wadō (708–715)</era>
+						<era type="7" draft="contributed">Reiki (715–717)</era>
+						<era type="8" draft="contributed">Yōrō (717–724)</era>
+						<era type="9" draft="contributed">Jinki (724–729)</era>
+						<era type="10" draft="contributed">Tempyō (729–749)</era>
+						<era type="11" draft="contributed">Tempyō-kampō (749–749)</era>
+						<era type="12" draft="contributed">Tempyō-shōhō (749–757)</era>
+						<era type="13" draft="contributed">Tempyō-hōji (757–765)</era>
+						<era type="14" draft="contributed">Temphō-jingo (765–767)</era>
+						<era type="15" draft="contributed">Jingo-keiun (767–770)</era>
+						<era type="16" draft="contributed">Hōki (770–780)</era>
+						<era type="17" draft="contributed">Ten-ō (781–782)</era>
+						<era type="18" draft="contributed">Enryaku (782–806)</era>
+						<era type="19" draft="contributed">Daidō (806–810)</era>
+						<era type="20" draft="contributed">Kōnin (810–824)</era>
+						<era type="21" draft="contributed">Tenchō (824–834)</era>
+						<era type="22" draft="contributed">Jōwa (834–848)</era>
+						<era type="23" draft="contributed">Kajō (848–851)</era>
+						<era type="24" draft="contributed">Ninju (851–854)</era>
+						<era type="25" draft="contributed">Saiko (854–857)</era>
+						<era type="26" draft="contributed">Tennan (857–859)</era>
+						<era type="27" draft="contributed">Jōgan (859–877)</era>
+						<era type="28" draft="contributed">Genkei (877–885)</era>
+						<era type="29" draft="contributed">Ninna (885–889)</era>
+						<era type="30" draft="contributed">Kampyō (889–898)</era>
+						<era type="31" draft="contributed">Shōtai (898–901)</era>
+						<era type="32" draft="contributed">Engi (901–923)</era>
+						<era type="33" draft="contributed">Enchō (923–931)</era>
+						<era type="34" draft="contributed">Shōhei (931–938)</era>
+						<era type="35" draft="contributed">Tengyō (938–947)</era>
+						<era type="36" draft="contributed">Tenryaku (947–957)</era>
+						<era type="37" draft="contributed">Tentoku (957–961)</era>
+						<era type="38" draft="contributed">Ōwa (961–964)</era>
+						<era type="39" draft="contributed">Kōhō (964–968)</era>
+						<era type="40" draft="contributed">Anna (968–970)</era>
+						<era type="41" draft="contributed">Tenroku (970–973)</era>
+						<era type="42" draft="contributed">Ten-en (973–976)</era>
+						<era type="43" draft="contributed">Jōgen (976–978)</era>
+						<era type="44" draft="contributed">Tengen (978–983)</era>
+						<era type="45" draft="contributed">Eikan (983–985)</era>
+						<era type="46" draft="contributed">Kanna (985–987)</era>
+						<era type="47" draft="contributed">Ei-en (987–989)</era>
+						<era type="48" draft="contributed">Eiso (989–990)</era>
+						<era type="49" draft="contributed">Shōryaku (990–995)</era>
+						<era type="50" draft="contributed">Chōtoku (995–999)</era>
+						<era type="51" draft="contributed">Chōhō (999–1004)</era>
+						<era type="52" draft="contributed">Kankō (1004–1012)</era>
+						<era type="53" draft="contributed">Chōwa (1012–1017)</era>
+						<era type="54" draft="contributed">Kannin (1017–1021)</era>
+						<era type="55" draft="contributed">Jian (1021–1024)</era>
+						<era type="56" draft="contributed">Manju (1024–1028)</era>
+						<era type="57" draft="contributed">Chōgen (1028–1037)</era>
+						<era type="58" draft="contributed">Chōryaku (1037–1040)</era>
+						<era type="59" draft="contributed">Chōkyū (1040–1044)</era>
+						<era type="60" draft="contributed">Kantoku (1044–1046)</era>
+						<era type="61" draft="contributed">Eishō (1046–1053)</era>
+						<era type="62" draft="contributed">Tengi (1053–1058)</era>
+						<era type="63" draft="contributed">Kōhei (1058–1065)</era>
+						<era type="64" draft="contributed">Jiryaku (1065–1069)</era>
+						<era type="65" draft="contributed">Enkyū (1069–1074)</era>
+						<era type="66" draft="contributed">Shōho (1074–1077)</era>
+						<era type="67" draft="contributed">Shōryaku (1077–1081)</era>
+						<era type="68" draft="contributed">Eiho (1081–1084)</era>
+						<era type="69" draft="contributed">Ōtoku (1084–1087)</era>
+						<era type="70" draft="contributed">Kanji (1087–1094)</era>
+						<era type="71" draft="contributed">Kaho (1094–1096)</era>
+						<era type="72" draft="contributed">Eichō (1096–1097)</era>
+						<era type="73" draft="contributed">Shōtoku (1097–1099)</era>
+						<era type="74" draft="contributed">Kōwa (1099–1104)</era>
+						<era type="75" draft="contributed">Chōji (1104–1106)</era>
+						<era type="76" draft="contributed">Kashō (1106–1108)</era>
+						<era type="77" draft="contributed">Tennin (1108–1110)</era>
+						<era type="78" draft="contributed">Ten-ei (1110–1113)</era>
+						<era type="79" draft="contributed">Eikyū (1113–1118)</era>
+						<era type="80" draft="contributed">Gen-ei (1118–1120)</era>
+						<era type="81" draft="contributed">Hoan (1120–1124)</era>
+						<era type="82" draft="contributed">Tenji (1124–1126)</era>
+						<era type="83" draft="contributed">Daiji (1126–1131)</era>
+						<era type="84" draft="contributed">Tenshō (1131–1132)</era>
+						<era type="85" draft="contributed">Chōshō (1132–1135)</era>
+						<era type="86" draft="contributed">Hoen (1135–1141)</era>
+						<era type="87" draft="contributed">Eiji (1141–1142)</era>
+						<era type="88" draft="contributed">Kōji (1142–1144)</era>
+						<era type="89" draft="contributed">Tenyō (1144–1145)</era>
+						<era type="90" draft="contributed">Kyūan (1145–1151)</era>
+						<era type="91" draft="contributed">Ninpei (1151–1154)</era>
+						<era type="92" draft="contributed">Kyūju (1154–1156)</era>
+						<era type="93" draft="contributed">Hogen (1156–1159)</era>
+						<era type="94" draft="contributed">Heiji (1159–1160)</era>
+						<era type="95" draft="contributed">Eiryaku (1160–1161)</era>
+						<era type="96" draft="contributed">Ōho (1161–1163)</era>
+						<era type="97" draft="contributed">Chōkan (1163–1165)</era>
+						<era type="98" draft="contributed">Eiman (1165–1166)</era>
+						<era type="99" draft="contributed">Nin-an (1166–1169)</era>
+						<era type="100" draft="contributed">Kaō (1169–1171)</era>
+						<era type="101" draft="contributed">Shōan (1171–1175)</era>
+						<era type="102" draft="contributed">Angen (1175–1177)</era>
+						<era type="103" draft="contributed">Jishō (1177–1181)</era>
+						<era type="104" draft="contributed">Yōwa (1181–1182)</era>
+						<era type="105" draft="contributed">Juei (1182–1184)</era>
+						<era type="106" draft="contributed">Genryuku (1184–1185)</era>
+						<era type="107" draft="contributed">Bunji (1185–1190)</era>
+						<era type="108" draft="contributed">Kenkyū (1190–1199)</era>
+						<era type="109" draft="contributed">Shōji (1199–1201)</era>
+						<era type="110" draft="contributed">Kennin (1201–1204)</era>
+						<era type="111" draft="contributed">Genkyū (1204–1206)</era>
+						<era type="112" draft="contributed">Ken-ei (1206–1207)</era>
+						<era type="113" draft="contributed">Shōgen (1207–1211)</era>
+						<era type="114" draft="contributed">Kenryaku (1211–1213)</era>
+						<era type="115" draft="contributed">Kenpō (1213–1219)</era>
+						<era type="116" draft="contributed">Shōkyū (1219–1222)</era>
+						<era type="117" draft="contributed">Jōō (1222–1224)</era>
+						<era type="118" draft="contributed">Gennin (1224–1225)</era>
+						<era type="119" draft="contributed">Karoku (1225–1227)</era>
+						<era type="120" draft="contributed">Antei (1227–1229)</era>
+						<era type="121" draft="contributed">Kanki (1229–1232)</era>
+						<era type="122" draft="contributed">Jōei (1232–1233)</era>
+						<era type="123" draft="contributed">Tempuku (1233–1234)</era>
+						<era type="124" draft="contributed">Bunryaku (1234–1235)</era>
+						<era type="125" draft="contributed">Katei (1235–1238)</era>
+						<era type="126" draft="contributed">Ryakunin (1238–1239)</era>
+						<era type="127" draft="contributed">En-ō (1239–1240)</era>
+						<era type="128" draft="contributed">Ninji (1240–1243)</era>
+						<era type="129" draft="contributed">Kangen (1243–1247)</era>
+						<era type="130" draft="contributed">Hōji (1247–1249)</era>
+						<era type="131" draft="contributed">Kenchō (1249–1256)</era>
+						<era type="132" draft="contributed">Kōgen (1256–1257)</era>
+						<era type="133" draft="contributed">Shōka (1257–1259)</era>
+						<era type="134" draft="contributed">Shōgen (1259–1260)</era>
+						<era type="135" draft="contributed">Bun-ō (1260–1261)</era>
+						<era type="136" draft="contributed">Kōchō (1261–1264)</era>
+						<era type="137" draft="contributed">Bun-ei (1264–1275)</era>
+						<era type="138" draft="contributed">Kenji (1275–1278)</era>
+						<era type="139" draft="contributed">Kōan (1278–1288)</era>
+						<era type="140" draft="contributed">Shōō (1288–1293)</era>
+						<era type="141" draft="contributed">Einin (1293–1299)</era>
+						<era type="142" draft="contributed">Shōan (1299–1302)</era>
+						<era type="143" draft="contributed">Kengen (1302–1303)</era>
+						<era type="144" draft="contributed">Kagen (1303–1306)</era>
+						<era type="145" draft="contributed">Tokuji (1306–1308)</era>
+						<era type="146" draft="contributed">Enkei (1308–1311)</era>
+						<era type="147" draft="contributed">Ōchō (1311–1312)</era>
+						<era type="148" draft="contributed">Shōwa (1312–1317)</era>
+						<era type="149" draft="contributed">Bunpō (1317–1319)</era>
+						<era type="150" draft="contributed">Genō (1319–1321)</era>
+						<era type="151" draft="contributed">Genkyō (1321–1324)</era>
+						<era type="152" draft="contributed">Shōchū (1324–1326)</era>
+						<era type="153" draft="contributed">Kareki (1326–1329)</era>
+						<era type="154" draft="contributed">Gentoku (1329–1331)</era>
+						<era type="155" draft="contributed">Genkō (1331–1334)</era>
+						<era type="156" draft="contributed">Kemmu (1334–1336)</era>
+						<era type="157" draft="contributed">Engen (1336–1340)</era>
+						<era type="158" draft="contributed">Kōkoku (1340–1346)</era>
+						<era type="159" draft="contributed">Shōhei (1346–1370)</era>
+						<era type="160" draft="contributed">Kentoku (1370–1372)</era>
+						<era type="161" draft="contributed">Bunchū (1372–1375)</era>
+						<era type="162" draft="contributed">Tenju (1375–1379)</era>
+						<era type="163" draft="contributed">Kōryaku (1379–1381)</era>
+						<era type="164" draft="contributed">Kōwa (1381–1384)</era>
+						<era type="165" draft="contributed">Genchū (1384–1392)</era>
+						<era type="166" draft="contributed">Meitoku (1384–1387)</era>
+						<era type="167" draft="contributed">Kakei (1387–1389)</era>
+						<era type="168" draft="contributed">Kōō (1389–1390)</era>
+						<era type="169" draft="contributed">Meitoku (1390–1394)</era>
+						<era type="170" draft="contributed">Ōei (1394–1428)</era>
+						<era type="171" draft="contributed">Shōchō (1428–1429)</era>
+						<era type="172" draft="contributed">Eikyō (1429–1441)</era>
+						<era type="173" draft="contributed">Kakitsu (1441–1444)</era>
+						<era type="174" draft="contributed">Bun-an (1444–1449)</era>
+						<era type="175" draft="contributed">Hōtoku (1449–1452)</era>
+						<era type="176" draft="contributed">Kyōtoku (1452–1455)</era>
+						<era type="177" draft="contributed">Kōshō (1455–1457)</era>
+						<era type="178" draft="contributed">Chōroku (1457–1460)</era>
+						<era type="179" draft="contributed">Kanshō (1460–1466)</era>
+						<era type="180" draft="contributed">Bunshō (1466–1467)</era>
+						<era type="181" draft="contributed">Ōnin (1467–1469)</era>
+						<era type="182" draft="contributed">Bunmei (1469–1487)</era>
+						<era type="183" draft="contributed">Chōkyō (1487–1489)</era>
+						<era type="184" draft="contributed">Entoku (1489–1492)</era>
+						<era type="185" draft="contributed">Meiō (1492–1501)</era>
+						<era type="186" draft="contributed">Bunki (1501–1504)</era>
+						<era type="187" draft="contributed">Eishō (1504–1521)</era>
+						<era type="188" draft="contributed">Taiei (1521–1528)</era>
+						<era type="189" draft="contributed">Kyōroku (1528–1532)</era>
+						<era type="190" draft="contributed">Tenmon (1532–1555)</era>
+						<era type="191" draft="contributed">Kōji (1555–1558)</era>
+						<era type="192" draft="contributed">Eiroku (1558–1570)</era>
+						<era type="193" draft="contributed">Genki (1570–1573)</era>
+						<era type="194" draft="contributed">Tenshō (1573–1592)</era>
+						<era type="195" draft="contributed">Bunroku (1592–1596)</era>
+						<era type="196" draft="contributed">Keichō (1596–1615)</era>
+						<era type="197" draft="contributed">Genwa (1615–1624)</era>
+						<era type="198" draft="contributed">Kan-ei (1624–1644)</era>
+						<era type="199" draft="contributed">Shōho (1644–1648)</era>
+						<era type="200" draft="contributed">Keian (1648–1652)</era>
+						<era type="201" draft="contributed">Shōō (1652–1655)</era>
+						<era type="202" draft="contributed">Meiryaku (1655–1658)</era>
+						<era type="203" draft="contributed">Manji (1658–1661)</era>
+						<era type="204" draft="contributed">Kanbun (1661–1673)</era>
+						<era type="205" draft="contributed">Enpō (1673–1681)</era>
+						<era type="206" draft="contributed">Tenwa (1681–1684)</era>
+						<era type="207" draft="contributed">Jōkyō (1684–1688)</era>
+						<era type="208" draft="contributed">Genroku (1688–1704)</era>
+						<era type="209" draft="contributed">Hōei (1704–1711)</era>
+						<era type="210" draft="contributed">Shōtoku (1711–1716)</era>
+						<era type="211" draft="contributed">Kyōhō (1716–1736)</era>
+						<era type="212" draft="contributed">Genbun (1736–1741)</era>
+						<era type="213" draft="contributed">Kanpō (1741–1744)</era>
+						<era type="214" draft="contributed">Enkyō (1744–1748)</era>
+						<era type="215" draft="contributed">Kan-en (1748–1751)</era>
+						<era type="216" draft="contributed">Hōryaku (1751–1764)</era>
+						<era type="217" draft="contributed">Meiwa (1764–1772)</era>
+						<era type="218" draft="contributed">An-ei (1772–1781)</era>
+						<era type="219" draft="contributed">Tenmei (1781–1789)</era>
+						<era type="220" draft="contributed">Kansei (1789–1801)</era>
+						<era type="221" draft="contributed">Kyōwa (1801–1804)</era>
+						<era type="222" draft="contributed">Bunka (1804–1818)</era>
+						<era type="223" draft="contributed">Bunsei (1818–1830)</era>
+						<era type="224" draft="contributed">Tenpō (1830–1844)</era>
+						<era type="225" draft="contributed">Kōka (1844–1848)</era>
+						<era type="226" draft="contributed">Kaei (1848–1854)</era>
+						<era type="227" draft="contributed">Ansei (1854–1860)</era>
+						<era type="228" draft="contributed">Man-en (1860–1861)</era>
+						<era type="229" draft="contributed">Bunkyū (1861–1864)</era>
+						<era type="230" draft="contributed">Genji (1864–1865)</era>
+						<era type="231" draft="contributed">Keiō (1865–1868)</era>
+						<era type="232" draft="contributed">Meiji</era>
+						<era type="233" draft="contributed">Taishō</era>
+						<era type="234" draft="contributed">Shōwa</era>
+						<era type="235" draft="contributed">Heisei</era>
+					</eraAbbr>
+				</eras>
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
@@ -2490,10 +2817,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</calendars>
 		<fields>
 			<field type="era">
-				<displayName>Era</displayName>
+				<displayName>era</displayName>
 			</field>
 			<field type="year">
-				<displayName>År</displayName>
+				<displayName>år</displayName>
 				<relative type="-1">i fjol</relative>
 				<relative type="0">i år</relative>
 				<relative type="1">nästa år</relative>
@@ -2508,6 +2835,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>år</displayName>
+				<relative type="-1">i fjol</relative>
+				<relative type="0">i år</relative>
+				<relative type="1">nästa år</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} år</relativeTimePattern>
 					<relativeTimePattern count="other">om {0} år</relativeTimePattern>
@@ -2519,17 +2849,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>år</displayName>
+				<relative type="-1">i fjol</relative>
+				<relative type="0">i år</relative>
+				<relative type="1">nästa år</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} år</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} år</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} år</relativeTimePattern>
-					<relativeTimePattern count="other">-{0} år</relativeTimePattern>
+					<relativeTimePattern count="one">−{0} år</relativeTimePattern>
+					<relativeTimePattern count="other">−{0} år</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter">
-				<displayName>Kvartal</displayName>
+				<displayName>kvartal</displayName>
+				<relative type="-1">förra kvartalet</relative>
+				<relative type="0">detta kvartal</relative>
+				<relative type="1">nästa kvartal</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} kvartal</relativeTimePattern>
 					<relativeTimePattern count="other">om {0} kvartal</relativeTimePattern>
@@ -2541,6 +2877,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>kv.</displayName>
+				<relative type="-1">förra kv.</relative>
+				<relative type="0">detta kv.</relative>
+				<relative type="1">nästa kv.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} kv.</relativeTimePattern>
 					<relativeTimePattern count="other">om {0} kv.</relativeTimePattern>
@@ -2552,17 +2891,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>kv.</displayName>
+				<relative type="-1">förra kv.</relative>
+				<relative type="0">detta kv.</relative>
+				<relative type="1">nästa kv.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} kv.</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} kv.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} kv.</relativeTimePattern>
-					<relativeTimePattern count="other">-{0} kv.</relativeTimePattern>
+					<relativeTimePattern count="one">−{0} kv</relativeTimePattern>
+					<relativeTimePattern count="other">−{0} kv</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month">
-				<displayName>Månad</displayName>
+				<displayName>månad</displayName>
 				<relative type="-1">förra månaden</relative>
 				<relative type="0">denna månad</relative>
 				<relative type="1">nästa månad</relative>
@@ -2577,6 +2919,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>m</displayName>
+				<relative type="-1">förra mån.</relative>
+				<relative type="0">denna mån.</relative>
+				<relative type="1">nästa mån.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} mån.</relativeTimePattern>
 					<relativeTimePattern count="other">om {0} mån.</relativeTimePattern>
@@ -2588,17 +2933,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>m</displayName>
+				<relative type="-1">förra mån.</relative>
+				<relative type="0">denna mån.</relative>
+				<relative type="1">nästa mån.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} mån.</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} mån.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} mån.</relativeTimePattern>
-					<relativeTimePattern count="other">-{0} mån.</relativeTimePattern>
+					<relativeTimePattern count="one">−{0} mån</relativeTimePattern>
+					<relativeTimePattern count="other">−{0} mån</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week">
-				<displayName>Vecka</displayName>
+				<displayName>vecka</displayName>
 				<relative type="-1">förra veckan</relative>
 				<relative type="0">denna vecka</relative>
 				<relative type="1">nästa vecka</relative>
@@ -2613,6 +2961,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>v</displayName>
+				<relative type="-1">förra v.</relative>
+				<relative type="0">denna v.</relative>
+				<relative type="1">nästa v.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} v.</relativeTimePattern>
 					<relativeTimePattern count="other">om {0} v.</relativeTimePattern>
@@ -2624,17 +2975,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>v</displayName>
+				<relative type="-1">förra v.</relative>
+				<relative type="0">denna v.</relative>
+				<relative type="1">nästa v.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} v.</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} v.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} v.</relativeTimePattern>
-					<relativeTimePattern count="other">-{0} v.</relativeTimePattern>
+					<relativeTimePattern count="one">−{0} v</relativeTimePattern>
+					<relativeTimePattern count="other">−{0} v</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day">
-				<displayName>Dag</displayName>
+				<displayName>dag</displayName>
 				<relative type="-2">i förrgår</relative>
 				<relative type="-1">i går</relative>
 				<relative type="0">i dag</relative>
@@ -2651,6 +3005,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>dag</displayName>
+				<relative type="-2">i förrgår</relative>
+				<relative type="-1">i går</relative>
+				<relative type="0">i dag</relative>
+				<relative type="1">i morgon</relative>
+				<relative type="2">i övermorgon</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} d</relativeTimePattern>
 					<relativeTimePattern count="other">om {0} d</relativeTimePattern>
@@ -2662,6 +3021,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>dag</displayName>
+				<relative type="-2">i förrgår</relative>
+				<relative type="-1">i går</relative>
+				<relative type="0">i dag</relative>
+				<relative type="1">i morgon</relative>
+				<relative type="2">i övermorgon</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} d</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} d</relativeTimePattern>
@@ -2672,7 +3036,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="weekday">
-				<displayName>Veckodag</displayName>
+				<displayName>veckodag</displayName>
 			</field>
 			<field type="sun">
 				<relative type="-1">söndag förra veckan</relative>
@@ -2783,7 +3147,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>fm/em</displayName>
 			</field>
 			<field type="hour">
-				<displayName>Timme</displayName>
+				<displayName>timme</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} timme</relativeTimePattern>
 					<relativeTimePattern count="other">om {0} timmar</relativeTimePattern>
@@ -2816,7 +3180,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="minute">
-				<displayName>Minut</displayName>
+				<displayName>minut</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} minut</relativeTimePattern>
 					<relativeTimePattern count="other">om {0} minuter</relativeTimePattern>
@@ -2840,8 +3204,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="minute-narrow">
 				<displayName>m</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">+{0} m</relativeTimePattern>
-					<relativeTimePattern count="other">+{0} m</relativeTimePattern>
+					<relativeTimePattern count="one">+{0} min</relativeTimePattern>
+					<relativeTimePattern count="other">+{0} min</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">−{0} min</relativeTimePattern>
@@ -2849,7 +3213,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="second">
-				<displayName>Sekund</displayName>
+				<displayName>sekund</displayName>
 				<relative type="0">nu</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">om {0} sekund</relativeTimePattern>
@@ -2883,7 +3247,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>Tidszon</displayName>
+				<displayName>tidszon</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
@@ -3624,7 +3988,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Chovd</exemplarCity>
 			</zone>
 			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Ulan Bator</exemplarCity>
+				<exemplarCity>Ulaanbaatar</exemplarCity>
 			</zone>
 			<zone type="Asia/Choibalsan">
 				<exemplarCity>Tjojbalsan</exemplarCity>
@@ -3761,6 +4125,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manilla</exemplarCity>
 			</zone>
@@ -3845,6 +4212,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Tjita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Jakutsk</exemplarCity>
 			</zone>
@@ -3863,6 +4233,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolymsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamtjatka</exemplarCity>
 			</zone>
@@ -4452,9 +4825,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Easter">
 				<long>
-					<generic>Påsköns tid</generic>
-					<standard>Påsköns normaltid</standard>
-					<daylight>Påsköns sommartid</daylight>
+					<generic>Påskötid</generic>
+					<standard>Påskön, normaltid</standard>
+					<daylight>Påskön, sommartid</daylight>
 				</long>
 			</metazone>
 			<metazone type="Ecuador">
@@ -4488,7 +4861,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
 				<long>
-					<standard draft="contributed">Kaliningradtid</standard>
+					<standard>Kaliningradtid</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
@@ -4506,8 +4879,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="Falkland">
 				<long>
 					<generic>Falklandsöarnas tid</generic>
-					<standard>Falklandsöarnas normaltid</standard>
-					<daylight>Falklandsöarnas sommartid</daylight>
+					<standard>Falklandsöarna, normaltid</standard>
+					<daylight>Falklandsöarna, sommartid</daylight>
 				</long>
 			</metazone>
 			<metazone type="Fiji">
@@ -4776,9 +5149,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Mexico_Northwest">
 				<long>
-					<generic>nordvästra Mexiko-tid</generic>
-					<standard>nordvästra Mexiko, normaltid</standard>
-					<daylight>nordvästra Mexiko, sommartid</daylight>
+					<generic>nordvästmexikansk tid</generic>
+					<standard>nordvästmexikansk normaltid</standard>
+					<daylight>nordvästmexikansk sommartid</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mexico_Pacific">
@@ -5125,6 +5498,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<native draft="contributed">latn</native>
 		</otherNumberingSystems>
 		<minimumGroupingDigits draft="contributed">1</minimumGroupingDigits>
+		<symbols numberSystem="arab">
+			<minusSign>‏−</minusSign>
+			<timeSeparator draft="contributed">:</timeSeparator>
+		</symbols>
+		<symbols numberSystem="arabext">
+			<minusSign>‏−</minusSign>
+			<timeSeparator draft="contributed">:</timeSeparator>
+		</symbols>
 		<symbols numberSystem="latn">
 			<decimal>,</decimal>
 			<group> </group>
@@ -5133,11 +5514,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<plusSign>+</plusSign>
 			<minusSign>−</minusSign>
 			<exponential>×10^</exponential>
-			<superscriptingExponent>·</superscriptingExponent>
+			<superscriptingExponent>×</superscriptingExponent>
 			<perMille>‰</perMille>
 			<infinity>∞</infinity>
 			<nan>¤¤¤</nan>
 			<timeSeparator draft="contributed">:</timeSeparator>
+			<timeSeparator alt="variant" draft="contributed">.</timeSeparator>
 		</symbols>
 		<decimalFormats numberSystem="latn">
 			<decimalFormatLength>
@@ -5225,6 +5607,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">0 tn ¤</pattern>
+					<pattern type="1000" count="other">0 tn ¤</pattern>
+					<pattern type="10000" count="one">00 tn ¤</pattern>
+					<pattern type="10000" count="other">00 tn ¤</pattern>
+					<pattern type="100000" count="one">000 tn ¤</pattern>
+					<pattern type="100000" count="other">000 tn ¤</pattern>
+					<pattern type="1000000" count="one">0 mn ¤</pattern>
+					<pattern type="1000000" count="other">0 mn ¤</pattern>
+					<pattern type="10000000" count="one">00 mn ¤</pattern>
+					<pattern type="10000000" count="other">00 mn ¤</pattern>
+					<pattern type="100000000" count="one">000 mn ¤</pattern>
+					<pattern type="100000000" count="other">000 mn ¤</pattern>
+					<pattern type="1000000000" count="one">0 md ¤</pattern>
+					<pattern type="1000000000" count="other">0 md ¤</pattern>
+					<pattern type="10000000000" count="one">00 md ¤</pattern>
+					<pattern type="10000000000" count="other">00 md ¤</pattern>
+					<pattern type="100000000000" count="one">000 md ¤</pattern>
+					<pattern type="100000000000" count="other">000 md ¤</pattern>
+					<pattern type="1000000000000" count="one">0 bn ¤</pattern>
+					<pattern type="1000000000000" count="other">0 bn ¤</pattern>
+					<pattern type="10000000000000" count="one">00 bn ¤</pattern>
+					<pattern type="10000000000000" count="other">00 bn ¤</pattern>
+					<pattern type="100000000000000" count="one">000 bn ¤</pattern>
+					<pattern type="100000000000000" count="other">000 bn ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -5279,6 +5689,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">angolansk kwanza</displayName>
 				<displayName count="other">angolanska kwanza</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>angolansk kwanza (1977–1990)</displayName>
@@ -5362,6 +5773,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">bosnisk-hercegovinsk mark (konvertibel)</displayName>
 				<displayName count="other">bosnisk-hercegovinska mark (konvertibla)</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BAN">
 				<displayName draft="contributed">bosnisk-hercegovinsk dinar (1994–1998)</displayName>
@@ -5421,7 +5833,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="BHD">
 				<displayName>bahrainsk dinar</displayName>
 				<displayName count="one">bahrainsk dinar</displayName>
-				<displayName count="other">Bahrain-dinar</displayName>
+				<displayName count="other">bahrainska dinarer</displayName>
 				<symbol>BHD</symbol>
 			</currency>
 			<currency type="BIF">
@@ -5449,6 +5861,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">boliviansk boliviano</displayName>
 				<displayName count="other">bolivianska bolivianos</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOL">
 				<displayName draft="contributed">boliviansk boliviano (1864–1963)</displayName>
@@ -5525,6 +5938,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">botswansk pula</displayName>
 				<displayName count="other">botswanska pula</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>vitrysk ny rubel (1994–1999)</displayName>
@@ -5549,7 +5963,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>kanadensisk dollar</displayName>
 				<displayName count="one">kanadensisk dollar</displayName>
 				<displayName count="other">kanadensiska dollar</displayName>
-				<symbol draft="contributed">CAN$</symbol>
+				<symbol draft="contributed">CA$</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CDF">
@@ -5638,6 +6052,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">kubansk peso (konvertibel)</displayName>
 				<displayName count="other">kubanska pesos (konvertibla)</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>kubansk peso</displayName>
@@ -5663,6 +6078,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">tjeckisk koruna</displayName>
 				<displayName count="other">tjeckiska koruna</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>östtysk mark</displayName>
@@ -5685,6 +6101,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dansk krona</displayName>
 				<displayName count="other">danska kronor</displayName>
 				<symbol>Dkr</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>dominikansk peso</displayName>
@@ -5720,6 +6137,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">egyptiskt pund</displayName>
 				<displayName count="other">egyptiska pund</displayName>
 				<symbol>EG£</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>eritreansk nakfa</displayName>
@@ -5773,6 +6191,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Falklandspund</displayName>
 				<displayName count="other">Falklandspund</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>fransk franc</displayName>
@@ -5796,6 +6215,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">georgisk lari</displayName>
 				<displayName count="other">georgiska lari</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>ghanansk cedi (1979–2007)</displayName>
@@ -5826,6 +6246,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">guineansk franc</displayName>
 				<displayName count="other">guineanska franc</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>guineansk syli</displayName>
@@ -5847,6 +6268,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">guatemalansk quetzal</displayName>
 				<displayName count="other">guatemalanska quetzal</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>Portugisiska Guinea-escudo</displayName>
@@ -5877,6 +6299,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">honduransk lempira</displayName>
 				<displayName count="other">honduranska lempira</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>kroatisk dinar</displayName>
@@ -5888,6 +6311,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">kroatisk kuna</displayName>
 				<displayName count="other">kroatiska kunor</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>haitisk gourde</displayName>
@@ -5900,12 +6324,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ungersk forint</displayName>
 				<displayName count="other">ungerska forinter</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>indonesisk rupiah</displayName>
 				<displayName count="one">indonesisk rupiah</displayName>
 				<displayName count="other">indonesiska rupiah</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>irländskt pund</displayName>
@@ -5959,6 +6385,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">isländsk krona</displayName>
 				<displayName count="other">isländska kronor</displayName>
 				<symbol>Ikr</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>italiensk lire</displayName>
@@ -6010,12 +6437,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">komorisk franc</displayName>
 				<displayName count="other">komoriska franc</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>nordkoreansk won</displayName>
 				<displayName count="one">nordkoreansk won</displayName>
 				<displayName count="other">nordkoreanska won</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRH">
 				<displayName draft="contributed">sydkoreansk hwan (1953–1962)</displayName>
@@ -6066,12 +6495,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">libanesiskt pund</displayName>
 				<displayName count="other">libanesiska pund</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>srilankesisk rupie</displayName>
 				<displayName count="one">srilankesisk rupie</displayName>
 				<displayName count="other">srilankesiska rupier</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>liberiansk dollar</displayName>
@@ -6160,6 +6591,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">madagaskisk ariary</displayName>
 				<displayName count="other">madagaskiska ariary</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>madagaskisk franc</displayName>
@@ -6188,6 +6620,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">myanmarisk kyat</displayName>
 				<displayName count="other">myanmariska kyat</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>mongolisk tögrög</displayName>
@@ -6203,9 +6636,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>MOP</symbol>
 			</currency>
 			<currency type="MRO">
-				<displayName>mauretansk ouquiya</displayName>
-				<displayName count="one">mauretansk ouquiya</displayName>
-				<displayName count="other">mauretanska ouquiya</displayName>
+				<displayName>mauretansk ouguiya</displayName>
+				<displayName count="one">mauretansk ouguiya</displayName>
+				<displayName count="other">mauretanska ouguiya</displayName>
 				<symbol>MRO</symbol>
 			</currency>
 			<currency type="MTL">
@@ -6224,6 +6657,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">mauritisk rupie</displayName>
 				<displayName count="other">mauritiska rupier</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVP">
 				<displayName draft="contributed">maldivisk rupie</displayName>
@@ -6265,6 +6699,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">malaysisk ringgit</displayName>
 				<displayName count="other">malaysiska ringgiter</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>moçambikisk escudo</displayName>
@@ -6307,6 +6742,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">nicaraguansk córdoba</displayName>
 				<displayName count="other">nicaraguanska córdobas</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>nederländsk gulden</displayName>
@@ -6318,12 +6754,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">norsk krona</displayName>
 				<displayName count="other">norska kronor</displayName>
 				<symbol>Nkr</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>nepalesisk rupie</displayName>
 				<displayName count="one">nepalesisk rupie</displayName>
 				<displayName count="other">nepalesiska rupier</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>nyzeeländsk dollar</displayName>
@@ -6378,12 +6816,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">pakistansk rupie</displayName>
 				<displayName count="other">pakistanska rupier</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>polsk zloty</displayName>
 				<displayName count="one">polsk zloty</displayName>
 				<displayName count="other">polska zloty</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>polsk zloty (1950–1995)</displayName>
@@ -6435,6 +6875,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">rysk rubel</displayName>
 				<displayName count="other">ryska rubel</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>rysk rubel (1991–1998)</displayName>
@@ -6446,6 +6887,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">rwandisk franc</displayName>
 				<displayName count="other">rwandiska franc</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>saudisk riyal</displayName>
@@ -6487,6 +6929,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">svensk krona</displayName>
 				<displayName count="other">svenska kronor</displayName>
 				<symbol>kr</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>singaporiansk dollar</displayName>
@@ -6500,6 +6943,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">S:t Helena-pund</displayName>
 				<displayName count="other">S:t Helena-pund</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>slovensk tolar</displayName>
@@ -6548,6 +6992,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">saotomeansk dobra</displayName>
 				<displayName count="other">saotomeanska dobra</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>sovjetisk rubel</displayName>
@@ -6564,6 +7009,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">syriskt pund</displayName>
 				<displayName count="other">syriska pund</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>swaziländsk lilangeni</displayName>
@@ -6576,6 +7022,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">thailändsk baht</displayName>
 				<displayName count="other">thailändska baht</displayName>
 				<symbol>THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>tadzjikisk rubel</displayName>
@@ -6610,6 +7057,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">tongansk paʻanga</displayName>
 				<displayName count="other">tonganska paʻanga</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>timoriansk escudo</displayName>
@@ -6628,6 +7076,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">turkiska lira</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Trinidad och Tobago-dollar</displayName>
@@ -6722,6 +7171,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">venezuelansk bolívar</displayName>
 				<displayName count="other">venezuelanska bolívar</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>vietnamesisk dong</displayName>
@@ -6788,6 +7238,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">östkaribisk dollar</displayName>
 				<displayName count="other">östkaribiska dollar</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>IMF särskild dragningsrätt</displayName>
@@ -6853,7 +7304,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other" draft="contributed">afrikanska kontoenheter</displayName>
 			</currency>
 			<currency type="XXX">
-				<displayName>okänd eller ogiltig valuta</displayName>
+				<displayName>okänd valuta</displayName>
 				<displayName count="one">(okänd valutaenhet)</displayName>
 				<displayName count="other">(okända valutaenheter)</displayName>
 			</currency>
@@ -6901,6 +7352,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">sydafrikansk rand</displayName>
 				<displayName count="other">sydafrikanska rand</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>zambisk kwacha (1968–2012)</displayName>
@@ -6912,6 +7364,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">zambisk kwacha</displayName>
 				<displayName count="other">zambiska kwacha</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>zairisk ny zaire</displayName>
@@ -6947,7 +7400,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 	<units>
 		<unitLength type="long">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0} per {1}</compoundUnitPattern>
+				<compoundUnitPattern>{0} per {1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>gånger jordens gravitation</displayName>
@@ -6959,6 +7412,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} meter per kvadratsekund</unitPattern>
 				<unitPattern count="other">{0} meter per kvadratsekund</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>varv</displayName>
+				<unitPattern count="one">{0} varv</unitPattern>
+				<unitPattern count="other">{0} varv</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radianer</displayName>
+				<unitPattern count="one">{0} radian</unitPattern>
+				<unitPattern count="other">{0} radianer</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>grader</displayName>
+				<unitPattern count="one">{0} grad</unitPattern>
+				<unitPattern count="other">{0} grader</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>bågminuter</displayName>
 				<unitPattern count="one">{0} bågminut</unitPattern>
@@ -6969,30 +7437,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} bågsekund</unitPattern>
 				<unitPattern count="other">{0} bågsekunder</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>grader</displayName>
-				<unitPattern count="one">{0} grad</unitPattern>
-				<unitPattern count="other">{0} grader</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radianer</displayName>
-				<unitPattern count="one">{0} radian</unitPattern>
-				<unitPattern count="other">{0} radianer</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>engelska tunnland</displayName>
-				<unitPattern count="one">{0} engelskt tunnland</unitPattern>
-				<unitPattern count="other">{0} engelska tunnland</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>kvadratkilometer</displayName>
+				<unitPattern count="one">{0} kvadratkilometer</unitPattern>
+				<unitPattern count="other">{0} kvadratkilometer</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektar</displayName>
 				<unitPattern count="one">{0} hektar</unitPattern>
 				<unitPattern count="other">{0} hektar</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>kvadratmeter</displayName>
+				<unitPattern count="one">{0} kvadratmeter</unitPattern>
+				<unitPattern count="other">{0} kvadratmeter</unitPattern>
+				<perUnitPattern>{0} per kvadratmeter</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>kvadratcentimeter</displayName>
 				<unitPattern count="one">{0} kvadratcentimeter</unitPattern>
 				<unitPattern count="other">{0} kvadratcentimeter</unitPattern>
+				<perUnitPattern>{0} per kvadratcentimeter</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>engelska kvadratmil</displayName>
+				<unitPattern count="one">{0} engelsk kvadratmil</unitPattern>
+				<unitPattern count="other">{0} engelska kvadratmil</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>engelska tunnland</displayName>
+				<unitPattern count="one">{0} engelskt tunnland</unitPattern>
+				<unitPattern count="other">{0} engelska tunnland</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yard²</displayName>
+				<unitPattern count="one">{0} yard²</unitPattern>
+				<unitPattern count="other">{0} yard²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>kvadratfot</displayName>
@@ -7003,147 +7483,148 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>kvadrattum</displayName>
 				<unitPattern count="one">{0} kvadrattum</unitPattern>
 				<unitPattern count="other">{0} kvadrattum</unitPattern>
+				<perUnitPattern>{0} per kvadrattum</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kvadratkilometer</displayName>
-				<unitPattern count="one">{0} kvadratkilometer</unitPattern>
-				<unitPattern count="other">{0} kvadratkilometer</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>kvadratmeter</displayName>
-				<unitPattern count="one">{0} kvadratmeter</unitPattern>
-				<unitPattern count="other">{0} kvadratmeter</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>engelska kvadratmil</displayName>
-				<unitPattern count="one">{0} engelsk kvadratmil</unitPattern>
-				<unitPattern count="other">{0} engelska kvadratmil</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yard²</displayName>
-				<unitPattern count="one">{0} yard²</unitPattern>
-				<unitPattern count="other">{0} yard²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="other">{0} karat</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liter per kilometer</displayName>
 				<unitPattern count="one">{0} liter per kilometer</unitPattern>
 				<unitPattern count="other">{0} liter per kilometer</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>liter per 100 kilometer</displayName>
+				<unitPattern count="one">{0} liter per 100 kilometer</unitPattern>
+				<unitPattern count="other">{0} liter per 100 kilometer</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>miles per gallon</displayName>
 				<unitPattern count="one">{0} mile per gallon</unitPattern>
 				<unitPattern count="other">{0} miles per gallon</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabit</displayName>
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="other">{0} gigabit</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobit</displayName>
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="other">{0} kilobit</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabit</displayName>
-				<unitPattern count="one">{0} megabit</unitPattern>
-				<unitPattern count="other">{0} megabit</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabit</displayName>
-				<unitPattern count="one">{0} terabit</unitPattern>
-				<unitPattern count="other">{0} terabit</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabyte</displayName>
 				<unitPattern count="one">{0} terabyte</unitPattern>
 				<unitPattern count="other">{0} terabyte</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabit</displayName>
+				<unitPattern count="one">{0} terabit</unitPattern>
+				<unitPattern count="other">{0} terabit</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabit</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="other">{0} gigabit</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabit</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="other">{0} megabit</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobit</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="other">{0} kilobit</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>århundraden</displayName>
+				<unitPattern count="one">{0} århundrade</unitPattern>
+				<unitPattern count="other">{0} århundraden</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>år</displayName>
+				<unitPattern count="one">{0} år</unitPattern>
+				<unitPattern count="other">{0} år</unitPattern>
+				<perUnitPattern>{0} per år</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>månader</displayName>
+				<unitPattern count="one">{0} månad</unitPattern>
+				<unitPattern count="other">{0} månader</unitPattern>
+				<perUnitPattern>{0} per månad</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>veckor</displayName>
+				<unitPattern count="one">{0} vecka</unitPattern>
+				<unitPattern count="other">{0} veckor</unitPattern>
+				<perUnitPattern>{0} per vecka</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>dygn</displayName>
 				<unitPattern count="one">{0} dygn</unitPattern>
 				<unitPattern count="other">{0} dygn</unitPattern>
+				<perUnitPattern>{0} per dygn</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>timmar</displayName>
 				<unitPattern count="one">{0} timme</unitPattern>
 				<unitPattern count="other">{0} timmar</unitPattern>
-				<perUnitPattern>{0}/h</perUnitPattern>
+				<perUnitPattern>{0} per timme</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikrosekunder</displayName>
-				<unitPattern count="one">{0} mikrosekund</unitPattern>
-				<unitPattern count="other">{0} mikrosekunder</unitPattern>
+			<unit type="duration-minute">
+				<displayName>minuter</displayName>
+				<unitPattern count="one">{0} minut</unitPattern>
+				<unitPattern count="other">{0} minuter</unitPattern>
+				<perUnitPattern>{0} per minut</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>sekunder</displayName>
+				<unitPattern count="one">{0} sekund</unitPattern>
+				<unitPattern count="other">{0} sekunder</unitPattern>
+				<perUnitPattern>{0} per sekund</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>millisekunder</displayName>
 				<unitPattern count="one">{0} millisekund</unitPattern>
 				<unitPattern count="other">{0} millisekunder</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>minuter</displayName>
-				<unitPattern count="one">{0} minut</unitPattern>
-				<unitPattern count="other">{0} minuter</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>månader</displayName>
-				<unitPattern count="one">{0} månad</unitPattern>
-				<unitPattern count="other">{0} månader</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>mikrosekunder</displayName>
+				<unitPattern count="one">{0} mikrosekund</unitPattern>
+				<unitPattern count="other">{0} mikrosekunder</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>nanosekunder</displayName>
 				<unitPattern count="one">{0} nanosekund</unitPattern>
 				<unitPattern count="other">{0} nanosekunder</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>sekunder</displayName>
-				<unitPattern count="one">{0} sekund</unitPattern>
-				<unitPattern count="other">{0} sekunder</unitPattern>
-				<perUnitPattern>{0}/s</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>veckor</displayName>
-				<unitPattern count="one">{0} vecka</unitPattern>
-				<unitPattern count="other">{0} veckor</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>år</displayName>
-				<unitPattern count="one">{0} år</unitPattern>
-				<unitPattern count="other">{0} år</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>ampere</displayName>
-				<unitPattern count="one">ampere</unitPattern>
+				<unitPattern count="one">{0} ampere</unitPattern>
 				<unitPattern count="other">{0} ampere</unitPattern>
 			</unit>
 			<unit type="electric-milliampere">
 				<displayName>milliampere</displayName>
-				<unitPattern count="one">milliampere</unitPattern>
+				<unitPattern count="one">{0} milliampere</unitPattern>
 				<unitPattern count="other">{0} milliampere</unitPattern>
 			</unit>
 			<unit type="electric-ohm">
@@ -7156,6 +7637,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} volt</unitPattern>
 				<unitPattern count="other">{0} volt</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokalorier</displayName>
+				<unitPattern count="one">{0} kilokalori</unitPattern>
+				<unitPattern count="other">{0} kilokalorier</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kalorier</displayName>
 				<unitPattern count="one">{0} kalori</unitPattern>
@@ -7166,21 +7652,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kilokalori</unitPattern>
 				<unitPattern count="other">{0} kilokalorier</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="one">{0} joule</unitPattern>
-				<unitPattern count="other">{0} joule</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokalorier</displayName>
-				<unitPattern count="one">{0} kilokalori</unitPattern>
-				<unitPattern count="other">{0} kilokalorier</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojoule</displayName>
 				<unitPattern count="one">{0} kilojoule</unitPattern>
 				<unitPattern count="other">{0} kilojoule</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="one">{0} joule</unitPattern>
+				<unitPattern count="other">{0} joule</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilowattimmar</displayName>
 				<unitPattern count="one">{0} kilowattimme</unitPattern>
@@ -7191,216 +7672,220 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} gigahertz</unitPattern>
 				<unitPattern count="other">{0} gigahertz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hertz</displayName>
-				<unitPattern count="one">{0} hertz</unitPattern>
-				<unitPattern count="other">{0} hertz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kilohertz</displayName>
 				<unitPattern count="one">{0} kilohertz</unitPattern>
 				<unitPattern count="other">{0} kilohertz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hertz</displayName>
+				<unitPattern count="one">{0} hertz</unitPattern>
+				<unitPattern count="other">{0} hertz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>astronomiska enheter</displayName>
-				<unitPattern count="one">{0} astronomisk enhet</unitPattern>
-				<unitPattern count="other">{0} astronomiska enheter</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometer</displayName>
+				<unitPattern count="one">{0} kilometer</unitPattern>
+				<unitPattern count="other">{0} kilometer</unitPattern>
+				<perUnitPattern>{0} per kilometer</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>centimeter</displayName>
-				<unitPattern count="one">{0} centimeter</unitPattern>
-				<unitPattern count="other">{0} centimeter</unitPattern>
+			<unit type="length-meter">
+				<displayName>meter</displayName>
+				<unitPattern count="one">{0} meter</unitPattern>
+				<unitPattern count="other">{0} meter</unitPattern>
+				<perUnitPattern>{0} per meter</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>decimeter</displayName>
 				<unitPattern count="one">{0} decimeter</unitPattern>
 				<unitPattern count="other">{0} decimeter</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName draft="contributed">famnar</displayName>
-				<unitPattern count="one" draft="contributed">{0} famn</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} famnar</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>fot</displayName>
-				<unitPattern count="one">{0} fot</unitPattern>
-				<unitPattern count="other">{0} fot</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName draft="contributed">engelska plogfårelängder</displayName>
-				<unitPattern count="one" draft="contributed">{0} engelsk plogfårelängd</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} engelska plogfårelängder</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>tum</displayName>
-				<unitPattern count="one">{0} tum</unitPattern>
-				<unitPattern count="other">{0} tum</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometer</displayName>
-				<unitPattern count="one">{0} kilometer</unitPattern>
-				<unitPattern count="other">{0} kilometer</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ljusår</displayName>
-				<unitPattern count="one">{0} ljusår</unitPattern>
-				<unitPattern count="other">{0} ljusår</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>meter</displayName>
-				<unitPattern count="one">{0} meter</unitPattern>
-				<unitPattern count="other">{0} meter</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>mikrometer</displayName>
-				<unitPattern count="one">{0} mikrometer</unitPattern>
-				<unitPattern count="other">{0} mikrometer</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>engelska mil</displayName>
-				<unitPattern count="one">{0} engelsk mil</unitPattern>
-				<unitPattern count="other">{0} engelska mil</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>centimeter</displayName>
+				<unitPattern count="one">{0} centimeter</unitPattern>
+				<unitPattern count="other">{0} centimeter</unitPattern>
+				<perUnitPattern>{0} per centimeter</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>millimeter</displayName>
 				<unitPattern count="one">{0} millimeter</unitPattern>
 				<unitPattern count="other">{0} millimeter</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikrometer</displayName>
+				<unitPattern count="one">{0} mikrometer</unitPattern>
+				<unitPattern count="other">{0} mikrometer</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanometer</displayName>
 				<unitPattern count="one">{0} nanometer</unitPattern>
 				<unitPattern count="other">{0} nanometer</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nautiska mil</displayName>
-				<unitPattern count="one">{0} nautisk mil</unitPattern>
-				<unitPattern count="other">{0} nautiska mil</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsec</displayName>
-				<unitPattern count="one">{0} parsec</unitPattern>
-				<unitPattern count="other">{0} parsec</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pikometer</displayName>
 				<unitPattern count="one">{0} pikometer</unitPattern>
 				<unitPattern count="other">{0} pikometer</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>engelska mil</displayName>
+				<unitPattern count="one">{0} engelsk mil</unitPattern>
+				<unitPattern count="other">{0} engelska mil</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>engelska yard</displayName>
 				<unitPattern count="one">{0} engelsk yard</unitPattern>
 				<unitPattern count="other">{0} engelska yard</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>fot</displayName>
+				<unitPattern count="one">{0} fot</unitPattern>
+				<unitPattern count="other">{0} fot</unitPattern>
+				<perUnitPattern>{0} per fot</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>tum</displayName>
+				<unitPattern count="one">{0} tum</unitPattern>
+				<unitPattern count="other">{0} tum</unitPattern>
+				<perUnitPattern>{0} per tum</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsec</displayName>
+				<unitPattern count="one">{0} parsec</unitPattern>
+				<unitPattern count="other">{0} parsec</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ljusår</displayName>
+				<unitPattern count="one">{0} ljusår</unitPattern>
+				<unitPattern count="other">{0} ljusår</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>astronomiska enheter</displayName>
+				<unitPattern count="one">{0} astronomisk enhet</unitPattern>
+				<unitPattern count="other">{0} astronomiska enheter</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName draft="contributed">engelska plogfårelängder</displayName>
+				<unitPattern count="one" draft="contributed">{0} engelsk plogfårelängd</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} engelska plogfårelängder</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName draft="contributed">famnar</displayName>
+				<unitPattern count="one" draft="contributed">{0} famn</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} famnar</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nautiska mil</displayName>
+				<unitPattern count="one">{0} nautisk mil</unitPattern>
+				<unitPattern count="other">{0} nautiska mil</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>mil</displayName>
+				<unitPattern count="one">{0} mil</unitPattern>
+				<unitPattern count="other">{0} mil</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="other">{0} karat</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gram</displayName>
-				<unitPattern count="one">{0} gram</unitPattern>
-				<unitPattern count="other">{0} gram</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogram</displayName>
-				<unitPattern count="one">{0} kilogram</unitPattern>
-				<unitPattern count="other">{0} kilogram</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>ton</displayName>
 				<unitPattern count="one">{0} ton</unitPattern>
 				<unitPattern count="other">{0} ton</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mikrogram</displayName>
-				<unitPattern count="one">{0} mikrogram</unitPattern>
-				<unitPattern count="other">{0} mikrogram</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogram</displayName>
+				<unitPattern count="one">{0} kilogram</unitPattern>
+				<unitPattern count="other">{0} kilogram</unitPattern>
+				<perUnitPattern>{0} per kilogram</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="one">{0} gram</unitPattern>
+				<unitPattern count="other">{0} gram</unitPattern>
+				<perUnitPattern>{0} per gram</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>milligram</displayName>
 				<unitPattern count="one">{0} milligram</unitPattern>
 				<unitPattern count="other">{0} milligram</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>uns</displayName>
-				<unitPattern count="one">{0} uns</unitPattern>
-				<unitPattern count="other">{0} uns</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>troy uns</displayName>
-				<unitPattern count="one">{0} troy uns</unitPattern>
-				<unitPattern count="other">{0} troy uns</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>pund</displayName>
-				<unitPattern count="one">{0} pund</unitPattern>
-				<unitPattern count="other">{0} pund</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="contributed">engelska stenar</displayName>
-				<unitPattern count="one" draft="contributed">{0} engelsk sten</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} engelska stenar</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>mikrogram</displayName>
+				<unitPattern count="one">{0} mikrogram</unitPattern>
+				<unitPattern count="other">{0} mikrogram</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>engelska korta ton</displayName>
 				<unitPattern count="one">{0} engelskt kort ton</unitPattern>
 				<unitPattern count="other">{0} engelska korta ton</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName draft="contributed">engelska stenar</displayName>
+				<unitPattern count="one" draft="contributed">{0} engelsk sten</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} engelska stenar</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>pund</displayName>
+				<unitPattern count="one">{0} pund</unitPattern>
+				<unitPattern count="other">{0} pund</unitPattern>
+				<perUnitPattern>{0} per pund</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>uns</displayName>
+				<unitPattern count="one">{0} uns</unitPattern>
+				<unitPattern count="other">{0} uns</unitPattern>
+				<perUnitPattern>{0} per uns</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>troy uns</displayName>
+				<unitPattern count="one">{0} troy uns</unitPattern>
+				<unitPattern count="other">{0} troy uns</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="other">{0} karat</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigawatt</displayName>
 				<unitPattern count="one">{0} gigawatt</unitPattern>
 				<unitPattern count="other">{0} gigawatt</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hästkrafter</displayName>
-				<unitPattern count="one">{0} hästkraft</unitPattern>
-				<unitPattern count="other">{0} hästkrafter</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilowatt</displayName>
-				<unitPattern count="one">{0} kilowatt</unitPattern>
-				<unitPattern count="other">{0} kilowatt</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>megawatt</displayName>
 				<unitPattern count="one">{0} megawatt</unitPattern>
 				<unitPattern count="other">{0} megawatt</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>milliwatt</displayName>
-				<unitPattern count="one">{0} milliwatt</unitPattern>
-				<unitPattern count="other">{0} milliwatt</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilowatt</displayName>
+				<unitPattern count="one">{0} kilowatt</unitPattern>
+				<unitPattern count="other">{0} kilowatt</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watt</displayName>
 				<unitPattern count="one">{0} watt</unitPattern>
 				<unitPattern count="other">{0} watt</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>milliwatt</displayName>
+				<unitPattern count="one">{0} milliwatt</unitPattern>
+				<unitPattern count="other">{0} milliwatt</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hästkrafter</displayName>
+				<unitPattern count="one">{0} hästkraft</unitPattern>
+				<unitPattern count="other">{0} hästkrafter</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hektopascal</displayName>
 				<unitPattern count="one">{0} hektopascal</unitPattern>
 				<unitPattern count="other">{0} hektopascal</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>tum kvicksilver</displayName>
-				<unitPattern count="one">{0} tum kvicksilver</unitPattern>
-				<unitPattern count="other">{0} tum kvicksilver</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>millibar</displayName>
-				<unitPattern count="one">{0} millibar</unitPattern>
-				<unitPattern count="other">{0} millibar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>millimeter kvicksilver</displayName>
 				<unitPattern count="one">{0} millimeter kvicksilver</unitPattern>
@@ -7411,10 +7896,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} pund per kvadrattum</unitPattern>
 				<unitPattern count="other">{0} pund per kvadrattum</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="other">{0} karat</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>tum kvicksilver</displayName>
+				<unitPattern count="one">{0} tum kvicksilver</unitPattern>
+				<unitPattern count="other">{0} tum kvicksilver</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>millibar</displayName>
+				<unitPattern count="one">{0} millibar</unitPattern>
+				<unitPattern count="other">{0} millibar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometer per timme</displayName>
@@ -7431,6 +7921,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} engelsk mil per timme</unitPattern>
 				<unitPattern count="other">{0} engelska mil per timme</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>knop</displayName>
+				<unitPattern count="one">{0} knop</unitPattern>
+				<unitPattern count="other">{0} knop</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>grader</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>grader Celsius</displayName>
 				<unitPattern count="one">{0} grad Celsius</unitPattern>
@@ -7446,36 +7946,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kelvin</unitPattern>
 				<unitPattern count="other">{0} kelvin</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>engelska tunnland gånger fot</displayName>
-				<unitPattern count="one">{0} engelskt tunnland gånger fot</unitPattern>
-				<unitPattern count="other">{0} engelska tunnland gånger fot</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName draft="contributed">skäppor</displayName>
-				<unitPattern count="one" draft="contributed">{0} skäppa</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} skäppor</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>centiliter</displayName>
-				<unitPattern count="one">{0} centiliter</unitPattern>
-				<unitPattern count="other">{0} centiliter</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>kubikcentimeter</displayName>
-				<unitPattern count="one">{0} kubikcentimeter</unitPattern>
-				<unitPattern count="other">{0} kubikcentimeter</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>kubikfot</displayName>
-				<unitPattern count="one">{0} kubikfot</unitPattern>
-				<unitPattern count="other">{0} kubikfot</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>kubiktum</displayName>
-				<unitPattern count="one">{0} kubiktum</unitPattern>
-				<unitPattern count="other">{0} kubiktum</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kubikkilometer</displayName>
 				<unitPattern count="one">{0} kubikkilometer</unitPattern>
@@ -7485,6 +7955,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>kubikmeter</displayName>
 				<unitPattern count="one">{0} kubikmeter</unitPattern>
 				<unitPattern count="other">{0} kubikmeter</unitPattern>
+				<perUnitPattern>{0} per kubikmeter</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>kubikcentimeter</displayName>
+				<unitPattern count="one">{0} kubikcentimeter</unitPattern>
+				<unitPattern count="other">{0} kubikcentimeter</unitPattern>
+				<perUnitPattern>{0} per kubikcentimeter</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>engelska kubikmil</displayName>
@@ -7496,25 +7973,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} engelsk kubikyard</unitPattern>
 				<unitPattern count="other">{0} engelska kubikyard</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>koppar</displayName>
-				<unitPattern count="one">{0} kopp</unitPattern>
-				<unitPattern count="other">{0} koppar</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>kubikfot</displayName>
+				<unitPattern count="one">{0} kubikfot</unitPattern>
+				<unitPattern count="other">{0} kubikfot</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>deciliter</displayName>
-				<unitPattern count="one">{0} deciliter</unitPattern>
-				<unitPattern count="other">{0} deciliter</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>kubiktum</displayName>
+				<unitPattern count="one">{0} kubiktum</unitPattern>
+				<unitPattern count="other">{0} kubiktum</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fluid ounces</displayName>
-				<unitPattern count="one">{0} fluid ounce</unitPattern>
-				<unitPattern count="other">{0} fluid ounces</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gallon</displayName>
-				<unitPattern count="one">{0} gallon</unitPattern>
-				<unitPattern count="other">{0} gallon</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megaliter</displayName>
+				<unitPattern count="one">{0} megaliter</unitPattern>
+				<unitPattern count="other">{0} megaliter</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hektoliter</displayName>
@@ -7525,27 +7997,69 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>liter</displayName>
 				<unitPattern count="one">{0} liter</unitPattern>
 				<unitPattern count="other">{0} liter</unitPattern>
+				<perUnitPattern>{0} per liter</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megaliter</displayName>
-				<unitPattern count="one">{0} megaliter</unitPattern>
-				<unitPattern count="other">{0} megaliter</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>deciliter</displayName>
+				<unitPattern count="one">{0} deciliter</unitPattern>
+				<unitPattern count="other">{0} deciliter</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centiliter</displayName>
+				<unitPattern count="one">{0} centiliter</unitPattern>
+				<unitPattern count="other">{0} centiliter</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>milliliter</displayName>
 				<unitPattern count="one">{0} milliliter</unitPattern>
 				<unitPattern count="other">{0} milliliter</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pint</displayName>
-				<unitPattern count="one">{0} pint</unitPattern>
-				<unitPattern count="other">{0} pint</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>pint à 500 ml</displayName>
+				<unitPattern count="one">{0} pint à 500 ml</unitPattern>
+				<unitPattern count="other">{0} pint à 500 ml</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>koppar à 2,5 dl</displayName>
+				<unitPattern count="one">{0} kopp à 2,5 dl</unitPattern>
+				<unitPattern count="other">{0} koppar à 2,5 dl</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>engelska tunnland gånger fot</displayName>
+				<unitPattern count="one">{0} engelskt tunnland gånger fot</unitPattern>
+				<unitPattern count="other">{0} engelska tunnland gånger fot</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName draft="contributed">skäppor</displayName>
+				<unitPattern count="one" draft="contributed">{0} skäppa</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} skäppor</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gallon</displayName>
+				<unitPattern count="one">{0} gallon</unitPattern>
+				<unitPattern count="other">{0} gallon</unitPattern>
+				<perUnitPattern>{0} per gallon</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>quart</displayName>
 				<unitPattern count="one">{0} quart</unitPattern>
 				<unitPattern count="other">{0} quart</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pint</displayName>
+				<unitPattern count="one">{0} pint</unitPattern>
+				<unitPattern count="other">{0} pint</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>koppar</displayName>
+				<unitPattern count="one">{0} kopp</unitPattern>
+				<unitPattern count="other">{0} koppar</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fluid ounces</displayName>
+				<unitPattern count="one">{0} fluid ounce</unitPattern>
+				<unitPattern count="other">{0} fluid ounces</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>matskedar</displayName>
 				<unitPattern count="one">{0} matsked</unitPattern>
@@ -7556,10 +8070,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} tesked</unitPattern>
 				<unitPattern count="other">{0} teskedar</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} öst</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} nord</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} syd</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} väst</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>G</displayName>
@@ -7571,6 +8091,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>varv</displayName>
+				<unitPattern count="one">{0} varv</unitPattern>
+				<unitPattern count="other">{0} varv</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radianer</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>grader</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>bågminuter</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
@@ -7581,30 +8116,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>grader</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radianer</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>eng. tunnland</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektar</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>engelska kvadratmil</displayName>
+				<unitPattern count="one">{0} eng.mil²</unitPattern>
+				<unitPattern count="other">{0} eng.mil²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>eng. tunnland</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yard²</displayName>
+				<unitPattern count="one">{0} yard²</unitPattern>
+				<unitPattern count="other">{0} yard²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>kvadratfot</displayName>
@@ -7615,91 +8162,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>tum²</displayName>
 				<unitPattern count="one">{0} tum²</unitPattern>
 				<unitPattern count="other">{0} tum²</unitPattern>
+				<perUnitPattern>{0}/tum²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>engelska kvadratmil</displayName>
-				<unitPattern count="one">{0} eng.mil²</unitPattern>
-				<unitPattern count="other">{0} eng.mil²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yard²</displayName>
-				<unitPattern count="one">{0} yard²</unitPattern>
-				<unitPattern count="other">{0} yard²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liter/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
 				<unitPattern count="other">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>b</displayName>
-				<unitPattern count="one">{0} b</unitPattern>
-				<unitPattern count="other">{0} b</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="one">{0} B</unitPattern>
-				<unitPattern count="other">{0} B</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0} B</unitPattern>
+				<unitPattern count="other">{0} B</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>b</displayName>
+				<unitPattern count="one">{0} b</unitPattern>
+				<unitPattern count="other">{0} b</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>årh</displayName>
+				<unitPattern count="one">{0} årh</unitPattern>
+				<unitPattern count="other">{0} årh</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>år</displayName>
+				<unitPattern count="one">{0} år</unitPattern>
+				<unitPattern count="other">{0} år</unitPattern>
+				<perUnitPattern>{0}/år</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mån</displayName>
+				<unitPattern count="one">{0} mån</unitPattern>
+				<unitPattern count="other">{0} mån</unitPattern>
+				<perUnitPattern>{0}/mån</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>vkr</displayName>
+				<unitPattern count="one">{0} v</unitPattern>
+				<unitPattern count="other">{0} v</unitPattern>
+				<perUnitPattern>{0}/v</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>dygn</displayName>
 				<unitPattern count="one">{0} d</unitPattern>
 				<unitPattern count="other">{0} d</unitPattern>
+				<perUnitPattern>{0}/d</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>tim</displayName>
@@ -7707,30 +8269,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} tim</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>mån</displayName>
-				<unitPattern count="one">{0} mån</unitPattern>
-				<unitPattern count="other">{0} mån</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sek</displayName>
@@ -7738,15 +8281,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} s</unitPattern>
 				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>vkr</displayName>
-				<unitPattern count="one">{0} v</unitPattern>
-				<unitPattern count="other">{0} v</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>år</displayName>
-				<unitPattern count="one">{0} år</unitPattern>
-				<unitPattern count="other">{0} år</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>A</displayName>
@@ -7768,6 +8316,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -7778,21 +8331,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kcal</unitPattern>
 				<unitPattern count="other">{0} kcal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>J</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -7803,216 +8351,220 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>AU</displayName>
-				<unitPattern count="one">{0} AU</unitPattern>
-				<unitPattern count="other">{0} AU</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName draft="contributed">famnar</displayName>
-				<unitPattern count="one" draft="contributed">{0} famn</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} famnar</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>fot</displayName>
-				<unitPattern count="one">{0} fot</unitPattern>
-				<unitPattern count="other">{0} fot</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName draft="contributed">eng. plogfårelgd</displayName>
-				<unitPattern count="one" draft="contributed">{0} eng. plogfårelgd</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} eng. plogfårelgd</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>tum</displayName>
-				<unitPattern count="one">{0} tum</unitPattern>
-				<unitPattern count="other">{0} tum</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ljusår</displayName>
-				<unitPattern count="one">{0} ly</unitPattern>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>μm</displayName>
-				<unitPattern count="one">{0} μm</unitPattern>
-				<unitPattern count="other">{0} μm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>eng. mil</displayName>
-				<unitPattern count="one">{0} eng. mil</unitPattern>
-				<unitPattern count="other">{0} eng. mil</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="one">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>μm</displayName>
+				<unitPattern count="one">{0} μm</unitPattern>
+				<unitPattern count="other">{0} μm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>naut. mil</displayName>
-				<unitPattern count="one">{0} naut. mil</unitPattern>
-				<unitPattern count="other">{0} naut. mil</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsec</displayName>
-				<unitPattern count="one">{0} parsec</unitPattern>
-				<unitPattern count="other">{0} parsec</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>eng. mil</displayName>
+				<unitPattern count="one">{0} eng. mil</unitPattern>
+				<unitPattern count="other">{0} eng. mil</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>engelska yard</displayName>
 				<unitPattern count="one">{0} eng. yard</unitPattern>
 				<unitPattern count="other">{0} eng. yard</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>fot</displayName>
+				<unitPattern count="one">{0} fot</unitPattern>
+				<unitPattern count="other">{0} fot</unitPattern>
+				<perUnitPattern>{0}/fot</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>tum</displayName>
+				<unitPattern count="one">{0} tum</unitPattern>
+				<unitPattern count="other">{0} tum</unitPattern>
+				<perUnitPattern>{0}/tum</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsec</displayName>
+				<unitPattern count="one">{0} parsec</unitPattern>
+				<unitPattern count="other">{0} parsec</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ljusår</displayName>
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>AU</displayName>
+				<unitPattern count="one">{0} AU</unitPattern>
+				<unitPattern count="other">{0} AU</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName draft="contributed">eng. plogfårelgd</displayName>
+				<unitPattern count="one" draft="contributed">{0} eng. plogfårelgd</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} eng. plogfårelgd</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName draft="contributed">famnar</displayName>
+				<unitPattern count="one" draft="contributed">{0} famn</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} famnar</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>naut. mil</displayName>
+				<unitPattern count="one">{0} naut. mil</unitPattern>
+				<unitPattern count="other">{0} naut. mil</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>mil</displayName>
+				<unitPattern count="one">{0} mil</unitPattern>
+				<unitPattern count="other">{0} mil</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">{0} ct</unitPattern>
-				<unitPattern count="other">{0} ct</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>μg</displayName>
-				<unitPattern count="one">{0} μg</unitPattern>
-				<unitPattern count="other">{0} μg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>uns</displayName>
-				<unitPattern count="one">{0} uns</unitPattern>
-				<unitPattern count="other">{0} uns</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ozt</displayName>
-				<unitPattern count="one">{0} ozt</unitPattern>
-				<unitPattern count="other">{0} ozt</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>pund</displayName>
-				<unitPattern count="one">{0} pund</unitPattern>
-				<unitPattern count="other">{0} pund</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="contributed">eng. sten</displayName>
-				<unitPattern count="one" draft="contributed">{0} eng. sten</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} eng. sten</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>μg</displayName>
+				<unitPattern count="one">{0} μg</unitPattern>
+				<unitPattern count="other">{0} μg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>eng. k. ton</displayName>
 				<unitPattern count="one">{0} eng. k. ton</unitPattern>
 				<unitPattern count="other">{0} eng. k. ton</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName draft="contributed">eng. sten</displayName>
+				<unitPattern count="one" draft="contributed">{0} eng. sten</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} eng. sten</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>pund</displayName>
+				<unitPattern count="one">{0} pund</unitPattern>
+				<unitPattern count="other">{0} pund</unitPattern>
+				<perUnitPattern>{0}/pund</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>uns</displayName>
+				<unitPattern count="one">{0} uns</unitPattern>
+				<unitPattern count="other">{0} uns</unitPattern>
+				<perUnitPattern>{0}/uns</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ozt</displayName>
+				<unitPattern count="one">{0} ozt</unitPattern>
+				<unitPattern count="other">{0} ozt</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} ct</unitPattern>
+				<unitPattern count="other">{0} ct</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hästkrafter</displayName>
-				<unitPattern count="one">{0} hk</unitPattern>
-				<unitPattern count="other">{0} hk</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>W</displayName>
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hästkrafter</displayName>
+				<unitPattern count="one">{0} hk</unitPattern>
+				<unitPattern count="other">{0} hk</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>tum Hg</displayName>
-				<unitPattern count="one">{0} tum Hg</unitPattern>
-				<unitPattern count="other">{0} tum Hg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -8023,10 +8575,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>tum Hg</displayName>
+				<unitPattern count="one">{0} tum Hg</unitPattern>
+				<unitPattern count="other">{0} tum Hg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -8043,6 +8600,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>knop</displayName>
+				<unitPattern count="one">{0} knop</unitPattern>
+				<unitPattern count="other">{0} knop</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0} °C</unitPattern>
@@ -8058,36 +8625,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>eng. t:land·fot</displayName>
-				<unitPattern count="one">{0} eng. t:d·fot</unitPattern>
-				<unitPattern count="other">{0} eng. t:d·fot</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName draft="contributed">skäppa</displayName>
-				<unitPattern count="one" draft="contributed">{0} skäppa</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} skäppor</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>fot³</displayName>
-				<unitPattern count="one">{0} fot³</unitPattern>
-				<unitPattern count="other">{0} fot³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>tum³</displayName>
-				<unitPattern count="one">{0} tum³</unitPattern>
-				<unitPattern count="other">{0} tum³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -8097,6 +8634,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>engelska kubikmil</displayName>
@@ -8108,25 +8652,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} eng. yard³</unitPattern>
 				<unitPattern count="other">{0} eng. yard³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>koppar</displayName>
-				<unitPattern count="one">{0} kopp</unitPattern>
-				<unitPattern count="other">{0} koppar</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>fot³</displayName>
+				<unitPattern count="one">{0} fot³</unitPattern>
+				<unitPattern count="other">{0} fot³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>tum³</displayName>
+				<unitPattern count="one">{0} tum³</unitPattern>
+				<unitPattern count="other">{0} tum³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -8137,27 +8676,69 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>liter</displayName>
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="one">{0} Ml</unitPattern>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
 				<unitPattern count="one">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pint</displayName>
-				<unitPattern count="one">{0} pint</unitPattern>
-				<unitPattern count="other">{0} pint</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>pt à 500 ml</displayName>
+				<unitPattern count="one">{0} pt à 500 ml</unitPattern>
+				<unitPattern count="other">{0} pt à 500 ml</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>kp à 2,5 dl</displayName>
+				<unitPattern count="one">{0} kp 2,5dl</unitPattern>
+				<unitPattern count="other">{0} kp 2,5dl</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>eng. t:land·fot</displayName>
+				<unitPattern count="one">{0} eng. t:d·fot</unitPattern>
+				<unitPattern count="other">{0} eng. t:d·fot</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName draft="contributed">skäppa</displayName>
+				<unitPattern count="one" draft="contributed">{0} skäppa</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} skäppor</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>quart</displayName>
 				<unitPattern count="one">{0} quart</unitPattern>
 				<unitPattern count="other">{0} quart</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pint</displayName>
+				<unitPattern count="one">{0} pint</unitPattern>
+				<unitPattern count="other">{0} pint</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>koppar</displayName>
+				<unitPattern count="one">{0} kopp</unitPattern>
+				<unitPattern count="other">{0} koppar</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>msk</displayName>
 				<unitPattern count="one">{0} msk</unitPattern>
@@ -8168,10 +8749,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} tsk</unitPattern>
 				<unitPattern count="other">{0} tsk</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} Ö</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} V</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName draft="contributed">G</displayName>
@@ -8183,6 +8770,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0}m/s²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName draft="contributed">varv</displayName>
+				<unitPattern count="one" draft="contributed">{0}varv</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}varv</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName draft="contributed">rad</displayName>
+				<unitPattern count="one" draft="contributed">{0}rad</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName draft="contributed">°</displayName>
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName draft="contributed">bågmin</displayName>
 				<unitPattern count="one" draft="contributed">{0}′</unitPattern>
@@ -8193,30 +8795,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0}″</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName draft="contributed">°</displayName>
-				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName draft="contributed">rad</displayName>
-				<unitPattern count="one" draft="contributed">{0}rad</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="contributed">eng. tunnland</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName draft="contributed">km²</displayName>
+				<unitPattern count="one">{0}km²</unitPattern>
+				<unitPattern count="other">{0}km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName draft="contributed">ha</displayName>
 				<unitPattern count="one" draft="contributed">{0}ha</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName draft="contributed">m²</displayName>
+				<unitPattern count="one">{0}m²</unitPattern>
+				<unitPattern count="other">{0}m²</unitPattern>
+				<perUnitPattern draft="contributed">{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName draft="contributed">cm²</displayName>
 				<unitPattern count="one" draft="contributed">{0}cm²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}cm²</unitPattern>
+				<perUnitPattern draft="contributed">{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName draft="contributed">eng. mil²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName draft="contributed">eng. tunnland</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName draft="contributed">eng. yard²</displayName>
+				<unitPattern count="one" draft="contributed">{0} en. yrd²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} en. yrd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName draft="contributed">fot²</displayName>
@@ -8227,71 +8841,81 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName draft="contributed">tum²</displayName>
 				<unitPattern count="one" draft="contributed">{0} tum²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} tum²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="contributed">km²</displayName>
-				<unitPattern count="one">{0}km²</unitPattern>
-				<unitPattern count="other">{0}km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName draft="contributed">m²</displayName>
-				<unitPattern count="one">{0}m²</unitPattern>
-				<unitPattern count="other">{0}m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName draft="contributed">eng. mil²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName draft="contributed">eng. yard²</displayName>
-				<unitPattern count="one" draft="contributed">{0} en. yrd²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} en. yrd²</unitPattern>
+				<perUnitPattern draft="contributed">{0}/tum²</perUnitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName draft="contributed">L/km</displayName>
 				<unitPattern count="one" draft="contributed">{0}L/km</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName draft="contributed">eng.mil/gallon</displayName>
 				<unitPattern count="one" draft="contributed">{0}e.mil/gn</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}e.mil/gn</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName draft="contributed">b</displayName>
-				<unitPattern count="one" draft="contributed">{0}b</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}b</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName draft="contributed">B</displayName>
-				<unitPattern count="one" draft="contributed">{0}B</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}B</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName draft="contributed">Gb</displayName>
-				<unitPattern count="one" draft="contributed">{0}Gb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}Gb</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName draft="contributed">kb</displayName>
-				<unitPattern count="one" draft="contributed">{0}kb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}kb</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName draft="contributed">Mb</displayName>
-				<unitPattern count="one" draft="contributed">{0}Mb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}Mb</unitPattern>
-			</unit>
 			<unit type="digital-terabit">
 				<displayName draft="contributed">Tb</displayName>
 				<unitPattern count="one" draft="contributed">{0}Tb</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}Tb</unitPattern>
 			</unit>
+			<unit type="digital-gigabit">
+				<displayName draft="contributed">Gb</displayName>
+				<unitPattern count="one" draft="contributed">{0}Gb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName draft="contributed">Mb</displayName>
+				<unitPattern count="one" draft="contributed">{0}Mb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName draft="contributed">kb</displayName>
+				<unitPattern count="one" draft="contributed">{0}kb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName draft="contributed">B</displayName>
+				<unitPattern count="one" draft="contributed">{0}B</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}B</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName draft="contributed">b</displayName>
+				<unitPattern count="one" draft="contributed">{0}b</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}b</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="contributed">årh</displayName>
+				<unitPattern count="one" draft="contributed">{0}årh</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}årh</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>år</displayName>
+				<unitPattern count="one">{0}å</unitPattern>
+				<unitPattern count="other">{0}å</unitPattern>
+				<perUnitPattern draft="contributed">{0}/år</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0}m</unitPattern>
+				<unitPattern count="other">{0}m</unitPattern>
+				<perUnitPattern draft="contributed">{0}/mån</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>v</displayName>
+				<unitPattern count="one">{0}v</unitPattern>
+				<unitPattern count="other">{0}v</unitPattern>
+				<perUnitPattern draft="contributed">{0}/v</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>d</displayName>
 				<unitPattern count="one">{0}d</unitPattern>
 				<unitPattern count="other">{0}d</unitPattern>
+				<perUnitPattern draft="contributed">{0}/d</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>h</displayName>
@@ -8299,30 +8923,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0}h</unitPattern>
 				<perUnitPattern draft="contributed">{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName draft="contributed">μs</displayName>
-				<unitPattern count="one" draft="contributed">{0}μs</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0}ms</unitPattern>
-				<unitPattern count="other">{0}ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>m</displayName>
 				<unitPattern count="one">{0}m</unitPattern>
 				<unitPattern count="other">{0}m</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>m</displayName>
-				<unitPattern count="one">{0}m</unitPattern>
-				<unitPattern count="other">{0}m</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName draft="contributed">ns</displayName>
-				<unitPattern count="one" draft="contributed">{0}ns</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}ns</unitPattern>
+				<perUnitPattern draft="contributed">{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sek</displayName>
@@ -8330,15 +8935,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0}s</unitPattern>
 				<perUnitPattern draft="contributed">{0}/s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>v</displayName>
-				<unitPattern count="one">{0}v</unitPattern>
-				<unitPattern count="other">{0}v</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0}ms</unitPattern>
+				<unitPattern count="other">{0}ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>år</displayName>
-				<unitPattern count="one">{0}å</unitPattern>
-				<unitPattern count="other">{0}å</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName draft="contributed">μs</displayName>
+				<unitPattern count="one" draft="contributed">{0}μs</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName draft="contributed">ns</displayName>
+				<unitPattern count="one" draft="contributed">{0}ns</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName draft="contributed">A</displayName>
@@ -8360,6 +8970,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0}V</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName draft="contributed">kcal</displayName>
+				<unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName draft="contributed">cal</displayName>
 				<unitPattern count="one" draft="contributed">{0} cal</unitPattern>
@@ -8370,21 +8985,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName draft="contributed">J</displayName>
-				<unitPattern count="one" draft="contributed">{0}J</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName draft="contributed">kcal</displayName>
-				<unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName draft="contributed">kJ</displayName>
 				<unitPattern count="one" draft="contributed">{0}kJ</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName draft="contributed">J</displayName>
+				<unitPattern count="one" draft="contributed">{0}J</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName draft="contributed">kWh</displayName>
 				<unitPattern count="one" draft="contributed">{0}kWh</unitPattern>
@@ -8395,215 +9005,219 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0}GHz</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName draft="contributed">Hz</displayName>
-				<unitPattern count="one" draft="contributed">{0}Hz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName draft="contributed">MHz</displayName>
+				<unitPattern count="one" draft="contributed">{0}MHz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName draft="contributed">kHz</displayName>
 				<unitPattern count="one" draft="contributed">{0}kHz</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName draft="contributed">MHz</displayName>
-				<unitPattern count="one" draft="contributed">{0}MHz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName draft="contributed">Hz</displayName>
+				<unitPattern count="one" draft="contributed">{0}Hz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName draft="contributed">AE</displayName>
-				<unitPattern count="one" draft="contributed">{0}AE</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}AE</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0}km</unitPattern>
+				<unitPattern count="other">{0}km</unitPattern>
+				<perUnitPattern draft="contributed">{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0}cm</unitPattern>
-				<unitPattern count="other">{0}cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0}m</unitPattern>
+				<unitPattern count="other">{0}m</unitPattern>
+				<perUnitPattern draft="contributed">{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName draft="contributed">dm</displayName>
 				<unitPattern count="one" draft="contributed">{0}dm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}dm</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName draft="contributed">famnar</displayName>
-				<unitPattern count="one" draft="contributed">{0} famn</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} famnar</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="contributed">fot</displayName>
-				<unitPattern count="one">{0} fot</unitPattern>
-				<unitPattern count="other">{0} fot</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName draft="contributed">eng. plogfårelgd</displayName>
-				<unitPattern count="one" draft="contributed">{0}en.pfrld</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}en.pfrld</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="contributed">tum</displayName>
-				<unitPattern count="one">{0} tum</unitPattern>
-				<unitPattern count="other">{0} tum</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0}km</unitPattern>
-				<unitPattern count="other">{0}km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName draft="contributed">ljusår</displayName>
-				<unitPattern count="one">{0} ljusår</unitPattern>
-				<unitPattern count="other">{0} ljusår</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-				<unitPattern count="one">{0}m</unitPattern>
-				<unitPattern count="other">{0}m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName draft="contributed">μm</displayName>
-				<unitPattern count="one" draft="contributed">{0}μm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}μm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName draft="contributed">eng. mil</displayName>
-				<unitPattern count="one">{0}mi</unitPattern>
-				<unitPattern count="other">{0}mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0}cm</unitPattern>
+				<unitPattern count="other">{0}cm</unitPattern>
+				<perUnitPattern draft="contributed">{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="one">{0}mm</unitPattern>
 				<unitPattern count="other">{0}mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName draft="contributed">μm</displayName>
+				<unitPattern count="one" draft="contributed">{0}μm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}μm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName draft="contributed">nm</displayName>
 				<unitPattern count="one" draft="contributed">{0}nm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName draft="contributed">naut. mil</displayName>
-				<unitPattern count="one" draft="contributed">{0}M</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}M</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName draft="contributed">parsek</displayName>
-				<unitPattern count="one" draft="contributed">{0} parsek</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} parsek</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName draft="contributed">pm</displayName>
 				<unitPattern count="one">{0}pm</unitPattern>
 				<unitPattern count="other">{0}pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="contributed">eng. mil</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0}mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName draft="contributed">engelska yard</displayName>
 				<unitPattern count="one">{0}yd</unitPattern>
 				<unitPattern count="other">{0}yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName draft="contributed">fot</displayName>
+				<unitPattern count="one">{0} fot</unitPattern>
+				<unitPattern count="other">{0} fot</unitPattern>
+				<perUnitPattern draft="contributed">{0}/fot</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="contributed">tum</displayName>
+				<unitPattern count="one">{0} tum</unitPattern>
+				<unitPattern count="other">{0} tum</unitPattern>
+				<perUnitPattern draft="contributed">{0}/tum</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName draft="contributed">parsek</displayName>
+				<unitPattern count="one" draft="contributed">{0} parsek</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} parsek</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="contributed">ljusår</displayName>
+				<unitPattern count="one">{0} ljusår</unitPattern>
+				<unitPattern count="other">{0} ljusår</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName draft="contributed">AE</displayName>
+				<unitPattern count="one" draft="contributed">{0}AE</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}AE</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName draft="contributed">eng. plogfårelgd</displayName>
+				<unitPattern count="one" draft="contributed">{0}en.pfrld</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}en.pfrld</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName draft="contributed">famnar</displayName>
+				<unitPattern count="one" draft="contributed">{0} famn</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} famnar</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName draft="contributed">naut. mil</displayName>
+				<unitPattern count="one" draft="contributed">{0}M</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}M</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="contributed">mil</displayName>
+				<unitPattern count="one" draft="contributed">{0}mil</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}mil</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName draft="contributed">lx</displayName>
 				<unitPattern count="one" draft="contributed">{0} lx</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName draft="contributed">karat</displayName>
-				<unitPattern count="one" draft="contributed">{0} karat</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} karat</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0}g</unitPattern>
-				<unitPattern count="other">{0}g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0}kg</unitPattern>
-				<unitPattern count="other">{0}kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName draft="contributed">t</displayName>
 				<unitPattern count="one" draft="contributed">{0}t</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName draft="contributed">μg</displayName>
-				<unitPattern count="one" draft="contributed">{0}μg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}μg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0}kg</unitPattern>
+				<unitPattern count="other">{0}kg</unitPattern>
+				<perUnitPattern draft="contributed">{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0}g</unitPattern>
+				<unitPattern count="other">{0}g</unitPattern>
+				<perUnitPattern draft="contributed">{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName draft="contributed">mg</displayName>
 				<unitPattern count="one" draft="contributed">{0}mg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="contributed">uns</displayName>
-				<unitPattern count="one">{0} uns</unitPattern>
-				<unitPattern count="other">{0} uns</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<unitPattern count="one" draft="contributed">{0} tr.uns</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} tr.uns</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName draft="contributed">s:pund</displayName>
-				<unitPattern count="one" draft="contributed">{0} skålpund</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} skålpund</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="contributed">eng. sten</displayName>
-				<unitPattern count="one" draft="contributed">{0} eng. s:n</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} eng. s:n</unitPattern>
+			<unit type="mass-microgram">
+				<displayName draft="contributed">μg</displayName>
+				<unitPattern count="one" draft="contributed">{0}μg</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}μg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName draft="contributed">eng. k. ton</displayName>
 				<unitPattern count="one" draft="contributed">{0} en.k.ton</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} en.k.ton</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName draft="contributed">eng. sten</displayName>
+				<unitPattern count="one" draft="contributed">{0} eng. s:n</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} eng. s:n</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName draft="contributed">s:pund</displayName>
+				<unitPattern count="one" draft="contributed">{0} skålpund</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} skålpund</unitPattern>
+				<perUnitPattern draft="contributed">{0}/libra·454g</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName draft="contributed">uns</displayName>
+				<unitPattern count="one">{0} uns</unitPattern>
+				<unitPattern count="other">{0} uns</unitPattern>
+				<perUnitPattern draft="contributed">{0}/uns·28g</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<unitPattern count="one" draft="contributed">{0} tr.uns</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} tr.uns</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName draft="contributed">karat</displayName>
+				<unitPattern count="one" draft="contributed">{0} karat</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} karat</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName draft="contributed">GW</displayName>
 				<unitPattern count="one" draft="contributed">{0}GW</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="contributed">hk</displayName>
-				<unitPattern count="one" draft="contributed">{0}hk</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}hk</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName draft="contributed">kW</displayName>
-				<unitPattern count="one" draft="contributed">{0}kW</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName draft="contributed">MW</displayName>
 				<unitPattern count="one" draft="contributed">{0}MW</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName draft="contributed">mW</displayName>
-				<unitPattern count="one" draft="contributed">{0}mW</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName draft="contributed">kW</displayName>
+				<unitPattern count="one" draft="contributed">{0}kW</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName draft="contributed">W</displayName>
 				<unitPattern count="one" draft="contributed">{0}W</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName draft="contributed">mW</displayName>
+				<unitPattern count="one" draft="contributed">{0}mW</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName draft="contributed">hk</displayName>
+				<unitPattern count="one" draft="contributed">{0}hk</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}hk</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="contributed">hPa</displayName>
 				<unitPattern count="one">{0}hPa</unitPattern>
 				<unitPattern count="other">{0}hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName draft="contributed">tum Hg</displayName>
-				<unitPattern count="one" draft="contributed">{0} tum Hg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} tum Hg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName draft="contributed">mbar</displayName>
-				<unitPattern count="one">{0}mbar</unitPattern>
-				<unitPattern count="other">{0}mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName draft="contributed">mm Hg</displayName>
 				<unitPattern count="one" draft="contributed">{0}mm Hg</unitPattern>
@@ -8614,6 +9228,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0}s:d/tum²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}s:d/tum²</unitPattern>
 			</unit>
+			<unit type="pressure-inch-hg">
+				<displayName draft="contributed">tum Hg</displayName>
+				<unitPattern count="one" draft="contributed">{0} tum Hg</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} tum Hg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName draft="contributed">mbar</displayName>
+				<unitPattern count="one">{0}mbar</unitPattern>
+				<unitPattern count="other">{0}mbar</unitPattern>
+			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
 				<unitPattern count="one">{0}km/h</unitPattern>
@@ -8629,6 +9253,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName draft="contributed">knop</displayName>
+				<unitPattern count="one" draft="contributed">{0}knop</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}knop</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName draft="contributed">°</displayName>
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0} °C</unitPattern>
@@ -8644,36 +9278,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0}K</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName draft="contributed">eng. t:land·fot</displayName>
-				<unitPattern count="one" draft="contributed">{0}en.td·fot</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}en.td·fot</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName draft="contributed">skäppa</displayName>
-				<unitPattern count="one" draft="contributed">{0} skäppa</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} skäppor</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName draft="contributed">cL</displayName>
-				<unitPattern count="one" draft="contributed">{0}cL</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName draft="contributed">cm³</displayName>
-				<unitPattern count="one" draft="contributed">{0}cm³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName draft="contributed">fot³</displayName>
-				<unitPattern count="one" draft="contributed">{0} fot³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fot³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName draft="contributed">tum³</displayName>
-				<unitPattern count="one" draft="contributed">{0} tum³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} tum³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName draft="contributed">km³</displayName>
 				<unitPattern count="one" draft="contributed">{0}km³</unitPattern>
@@ -8683,6 +9287,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName draft="contributed">m³</displayName>
 				<unitPattern count="one" draft="contributed">{0}m³</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} m³</unitPattern>
+				<perUnitPattern draft="contributed">{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName draft="contributed">cm³</displayName>
+				<unitPattern count="one" draft="contributed">{0}cm³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}cm³</unitPattern>
+				<perUnitPattern draft="contributed">{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName draft="contributed">eng. mil³</displayName>
@@ -8694,25 +9305,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} en. yrd³</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} en. yrd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName draft="contributed">kp·2,5dL</displayName>
-				<unitPattern count="one" draft="contributed">{0}kp·2½dL</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}kp·2½dL</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName draft="contributed">fot³</displayName>
+				<unitPattern count="one" draft="contributed">{0} fot³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fot³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName draft="contributed">dL</displayName>
-				<unitPattern count="one" draft="contributed">{0}dL</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName draft="contributed">tum³</displayName>
+				<unitPattern count="one" draft="contributed">{0} tum³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} tum³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName draft="contributed">vätskeuns</displayName>
-				<unitPattern count="one" draft="contributed">{0} v:euns</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} v:euns</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName draft="contributed">USA vätskegallon</displayName>
-				<unitPattern count="one" draft="contributed">{0} v:egal:n</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} v:egal:n</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName draft="contributed">ML</displayName>
+				<unitPattern count="one" draft="contributed">{0}ML</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName draft="contributed">hL</displayName>
@@ -8723,27 +9329,69 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>liter</displayName>
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern draft="contributed">{0}/L</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName draft="contributed">ML</displayName>
-				<unitPattern count="one" draft="contributed">{0}ML</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName draft="contributed">dL</displayName>
+				<unitPattern count="one" draft="contributed">{0}dL</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName draft="contributed">cL</displayName>
+				<unitPattern count="one" draft="contributed">{0}cL</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName draft="contributed">mL</displayName>
 				<unitPattern count="one" draft="contributed">{0}mL</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName draft="contributed">USA vätskepint</displayName>
-				<unitPattern count="one" draft="contributed">{0} v:epint</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} v:epint</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName draft="contributed">pt à 500 ml</displayName>
+				<unitPattern count="one" draft="contributed">{0}pt·50cL</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}pt·50cL</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName draft="contributed">kp à 2,5 dl</displayName>
+				<unitPattern count="one" draft="contributed">{0}kp·2½dl</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}kp·2½dl</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName draft="contributed">eng. t:land·fot</displayName>
+				<unitPattern count="one" draft="contributed">{0}en.td·fot</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}en.td·fot</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName draft="contributed">skäppa</displayName>
+				<unitPattern count="one" draft="contributed">{0} skäppa</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} skäppor</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName draft="contributed">USA vätskegallon</displayName>
+				<unitPattern count="one" draft="contributed">{0} v:egal:n</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} v:egal:n</unitPattern>
+				<perUnitPattern draft="contributed">{0}/äb·3,8L</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName draft="contributed">USA vätskequart</displayName>
 				<unitPattern count="one" draft="contributed">{0} v:equart</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} v:equart</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName draft="contributed">USA vätskepint</displayName>
+				<unitPattern count="one" draft="contributed">{0} v:epint</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} v:epint</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName draft="contributed">kp·2,5dL</displayName>
+				<unitPattern count="one" draft="contributed">{0}kp·2½dL</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}kp·2½dL</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName draft="contributed">vätskeuns</displayName>
+				<unitPattern count="one" draft="contributed">{0} v:euns</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} v:euns</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName draft="contributed">msk</displayName>
 				<unitPattern count="one" draft="contributed">{0}msk</unitPattern>
@@ -8754,15 +9402,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0}tsk</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}tsk</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}Ö</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}V</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
+			<durationUnitPattern alt="variant">h.mm</durationUnitPattern>
 		</durationUnit>
 		<durationUnit type="hms">
 			<durationUnitPattern>h:mm:ss</durationUnitPattern>
+			<durationUnitPattern alt="variant">h.mm.ss</durationUnitPattern>
 		</durationUnit>
 		<durationUnit type="ms">
 			<durationUnitPattern>m:ss</durationUnitPattern>
+			<durationUnitPattern alt="variant">m.ss</durationUnitPattern>
 		</durationUnit>
 	</units>
 	<listPatterns>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sv_AX.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv_AX.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sv_AX.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv_AX.xml
index b1ec173772f..df01e727abe 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sv_AX.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv_AX.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10819 $"/>
-		<generation date="$Date: 2014-08-14 22:53:08 -0500 (Thu, 14 Aug 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="sv"/>
 		<territory type="AX"/>
 	</identity>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sv_FI.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv_FI.xml
similarity index 78%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sv_FI.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv_FI.xml
index 2dded76956f..434f4692fa9 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sv_FI.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv_FI.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11181 $"/>
-		<generation date="$Date: 2015-02-11 13:14:59 -0600 (Wed, 11 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="sv"/>
 		<territory type="FI"/>
 	</identity>
@@ -22,11 +21,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="timezone" draft="contributed">tidszon</key>
 		</keys>
 		<types>
-			<type type="big5han" key="collation" draft="unconfirmed">kinesiska i big5-sorteringsordning</type>
-			<type type="gb2312han" key="collation" draft="unconfirmed">kinesiska i gb2312-sorteringsordning</type>
-			<type type="pinyin" key="collation" draft="unconfirmed">kinesiska i pinyin-sorteringsordning</type>
-			<type type="stroke" key="collation" draft="unconfirmed">kinesiska i strecksorteringsordning</type>
-			<type type="traditional" key="collation" draft="unconfirmed">traditionell sorteringsordning</type>
+			<type key="collation" type="big5han" draft="unconfirmed">kinesiska i big5-sorteringsordning</type>
+			<type key="collation" type="gb2312han" draft="unconfirmed">kinesiska i gb2312-sorteringsordning</type>
+			<type key="collation" type="pinyin" draft="unconfirmed">kinesiska i pinyin-sorteringsordning</type>
+			<type key="collation" type="stroke" draft="unconfirmed">kinesiska i strecksorteringsordning</type>
+			<type key="collation" type="traditional" draft="unconfirmed">traditionell sorteringsordning</type>
 		</types>
 	</localeDisplayNames>
 	<characters>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sv_SE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv_SE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sv_SE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv_SE.xml
index 5636364451f..5cbd90e68fd 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sv_SE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv_SE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="sv"/>
 		<territory type="SE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sw.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw.xml
similarity index 84%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sw.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw.xml
index b3957550e7d..b997d1615c2 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sw.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="sw"/>
 	</identity>
 	<localeDisplayNames>
@@ -45,22 +44,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bez">Kibena</language>
 			<language type="bfd" draft="unconfirmed">Kibafut</language>
 			<language type="bg">Kibulgaria</language>
+			<language type="bgn">Kibalochi cha Magharibi</language>
 			<language type="bkm" draft="unconfirmed">Kikom</language>
 			<language type="bm">Kibambara</language>
 			<language type="bn">Kibengali</language>
 			<language type="bo">Kitibeti</language>
 			<language type="br">Kibretoni</language>
-			<language type="brx">brx</language>
+			<language type="brx">Kibodo</language>
 			<language type="bs">Kibosnia</language>
 			<language type="bum" draft="unconfirmed">Kibulu</language>
 			<language type="byv" draft="unconfirmed">Kimedumba</language>
 			<language type="ca">Kikatalani</language>
+			<language type="ce">Kichechenia</language>
 			<language type="cgg">Kichiga</language>
 			<language type="chr">Kicherokee</language>
 			<language type="ckb">Kikurdi cha Sorani</language>
 			<language type="co">Kikosikani</language>
 			<language type="cop" draft="unconfirmed">Kikhufti</language>
 			<language type="cs">Kicheki</language>
+			<language type="cv">Kichuvash</language>
 			<language type="cy">Kiwelisi</language>
 			<language type="da">Kidenmaki</language>
 			<language type="dav">Kitaita</language>
@@ -79,15 +81,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="eka" draft="unconfirmed">Kiekajuk</language>
 			<language type="el">Kigiriki</language>
 			<language type="en">Kiingereza</language>
+			<language type="en_US" alt="short">Kiingereza (US)</language>
 			<language type="eo">Kiesperanto</language>
 			<language type="es">Kihispania</language>
-			<language type="es_ES">Kihispania cha Ulaya</language>
 			<language type="et">Kiestonia</language>
 			<language type="eu">Kibasque</language>
 			<language type="ewo" draft="unconfirmed">Kiewondo</language>
 			<language type="fa">Kiajemi</language>
 			<language type="ff" draft="unconfirmed">Kifulfulde</language>
-			<language type="fi">Kifinlandi</language>
+			<language type="fi">Kifini</language>
 			<language type="fil">Kifilipino</language>
 			<language type="fj">Kifiji</language>
 			<language type="fo">Kifaroe</language>
@@ -129,7 +131,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ii">Sichuan Yi</language>
 			<language type="is">Kiaisilandi</language>
 			<language type="it">Kiitaliano</language>
-			<language type="iu">iu</language>
+			<language type="iu">Kiinuktitut</language>
 			<language type="ja">Kijapani</language>
 			<language type="jgo">Kingomba</language>
 			<language type="jmc">Kimachame</language>
@@ -150,11 +152,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="kl">Kikalaallisut</language>
 			<language type="kln">Kikalenjin</language>
 			<language type="km">Kikambodia</language>
-			<language type="kmb" draft="unconfirmed">Kimbundu</language>
+			<language type="kmb">Kimbundu</language>
 			<language type="kn">Kikannada</language>
 			<language type="ko">Kikorea</language>
 			<language type="koi">Kikomipermyak</language>
-			<language type="kok">kok</language>
+			<language type="kok">Kikonkani</language>
 			<language type="kr" draft="unconfirmed">Kikanuri</language>
 			<language type="ks">Kikashmiri</language>
 			<language type="ksb">Kisambaa</language>
@@ -173,6 +175,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">Kilaosi</language>
 			<language type="lol" draft="unconfirmed">Kimongo</language>
 			<language type="loz">Kilozi</language>
+			<language type="lrc">Kiluri cha Kaskazini</language>
 			<language type="lt">Kilithuania</language>
 			<language type="lu">Kiluba-Katanga</language>
 			<language type="lua">Kiluba-Lulua</language>
@@ -202,9 +205,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mua">Kimundang</language>
 			<language type="mul" draft="unconfirmed">Lugha Nyingi</language>
 			<language type="my">Kiburma</language>
+			<language type="mzn">Kimazanderani</language>
 			<language type="naq">Kinama</language>
 			<language type="nb">Kibokmal cha Norwe</language>
 			<language type="nd">Kindebele cha Kaskazini</language>
+			<language type="nds">nds</language>
 			<language type="ne">Kinepali</language>
 			<language type="new">Kinewari</language>
 			<language type="ng" draft="unconfirmed">Kindonga</language>
@@ -249,12 +254,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="saq">Kisamburu</language>
 			<language type="sbp">Kisangu</language>
 			<language type="sd">Kisindhi</language>
+			<language type="sdh">Kikurdi cha Kusini</language>
 			<language type="se">Kisami cha Kaskazini</language>
 			<language type="seh">Kisena</language>
 			<language type="ses">Koyraboro Senni</language>
 			<language type="sg">Kisango</language>
 			<language type="sh" draft="unconfirmed">Kiserbia-kroeshia</language>
-			<language type="shi">Tachelhit</language>
+			<language type="shi">Kitachelhit</language>
 			<language type="shu" draft="unconfirmed">Kiarabu cha Chadi</language>
 			<language type="si">Kisinhala</language>
 			<language type="sk">Kislovakia</language>
@@ -277,8 +283,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sus" draft="unconfirmed">Kisusu</language>
 			<language type="sv">Kiswidi</language>
 			<language type="sw">Kiswahili</language>
+			<language type="sw_CD">Kingwana</language>
 			<language type="swb" draft="unconfirmed">Shikomor</language>
-			<language type="swc">Kingwana</language>
 			<language type="ta">Kitamil</language>
 			<language type="te">Kitelugu</language>
 			<language type="tem" draft="unconfirmed">Kitemne</language>
@@ -300,7 +306,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="twq">Kitasawaq</language>
 			<language type="ty">Kitahiti</language>
 			<language type="tzm">Central Atlas Tamazight</language>
-			<language type="ug">Kiuiguri</language>
+			<language type="ug">Kiuyghur</language>
 			<language type="uk">Kiukrania</language>
 			<language type="und">Lugha Isiyojulikana</language>
 			<language type="ur">Kiurdu</language>
@@ -309,6 +315,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ve">Kivenda</language>
 			<language type="vi">Kivietinamu</language>
 			<language type="vun">Kivunjo</language>
+			<language type="wbp">Kiwarlpiri</language>
 			<language type="wo">Kiwolofu</language>
 			<language type="xh">Kixhosa</language>
 			<language type="xog">Kisoga</language>
@@ -318,6 +325,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="yo">Kiyoruba</language>
 			<language type="zgh">Tamaziti Msingi ya Kimoroko</language>
 			<language type="zh">Kichina</language>
+			<language type="zh_Hans">Kichina (Kilichorahisishwa)</language>
 			<language type="zh_Hant">Kichina cha Jadi</language>
 			<language type="zu">Kizulu</language>
 			<language type="zxx">Hakuna maudhui ya lugha</language>
@@ -352,7 +360,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Laoo">Kilaosi</script>
 			<script type="Latn">Kilatini</script>
 			<script type="Mlym">Kimalayalam</script>
-			<script type="Mong">Mongolia</script>
+			<script type="Mong">Kimongolia</script>
 			<script type="Mymr">Myama</script>
 			<script type="Orya">Kioriya</script>
 			<script type="Sinh">Kisinhala</script>
@@ -380,7 +388,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="018">Afrika ya Kusini</territory>
 			<territory type="019">Amerika</territory>
 			<territory type="021">Amerika ya Kaskazini</territory>
-			<territory type="029">Karibi</territory>
+			<territory type="029">Karibiani</territory>
 			<territory type="030">Asia Mashariki</territory>
 			<territory type="034">Asia ya Kusini</territory>
 			<territory type="035">Asia ya Kusini Mashariki</territory>
@@ -405,7 +413,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antili za Uholanzi</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antaktika</territory>
 			<territory type="AR">Ajentina</territory>
@@ -431,7 +438,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BQ">Uholanzi ya Karibiani</territory>
 			<territory type="BR">Brazili</territory>
 			<territory type="BS">Bahama</territory>
-			<territory type="BT">Butani</territory>
+			<territory type="BT">Bhutan</territory>
 			<territory type="BV">Kisiwa cha Bouvet</territory>
 			<territory type="BW">Botswana</territory>
 			<territory type="BY">Belarusi</territory>
@@ -439,6 +446,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CA">Kanada</territory>
 			<territory type="CC">Visiwa vya Cocos (Keeling)</territory>
 			<territory type="CD">Jamhuri ya Kidemokrasia ya Kongo</territory>
+			<territory type="CD" alt="variant">Kongo (DRC)</territory>
 			<territory type="CF">Jamhuri ya Afrika ya Kati</territory>
 			<territory type="CG">Kongo - Brazzaville</territory>
 			<territory type="CG" alt="variant">Jamhuri ya Kongo</territory>
@@ -456,12 +464,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CV">Kepuvede</territory>
 			<territory type="CW">Kurakao</territory>
 			<territory type="CX">Kisiwa cha Krismasi</territory>
-			<territory type="CY">Saiprasi</territory>
+			<territory type="CY">Cyprus</territory>
 			<territory type="CZ">Jamhuri ya Cheki</territory>
 			<territory type="DE">Ujerumani</territory>
 			<territory type="DG">Diego Garcia</territory>
 			<territory type="DJ">Jibuti</territory>
-			<territory type="DK">Denmaki</territory>
+			<territory type="DK">Denmark</territory>
 			<territory type="DM">Dominika</territory>
 			<territory type="DO">Jamhuri ya Dominika</territory>
 			<territory type="DZ">Aljeria</territory>
@@ -481,7 +489,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="FM">Mikronesia</territory>
 			<territory type="FO">Visiwa vya Faroe</territory>
 			<territory type="FR">Ufaransa</territory>
-			<territory type="GA">Gaboni</territory>
+			<territory type="GA">Gabon</territory>
 			<territory type="GB">Uingereza</territory>
 			<territory type="GB" alt="short">Uingereza</territory>
 			<territory type="GD">Grenada</territory>
@@ -538,11 +546,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="LB">Lebanoni</territory>
 			<territory type="LC">Santalusia</territory>
 			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sirilanka</territory>
+			<territory type="LK">Sri Lanka</territory>
 			<territory type="LR">Liberia</territory>
 			<territory type="LS">Lesoto</territory>
 			<territory type="LT">Litwania</territory>
-			<territory type="LU">Lasembagi</territory>
+			<territory type="LU">Luxembourg</territory>
 			<territory type="LV">Lativia</territory>
 			<territory type="LY">Libya</territory>
 			<territory type="MA">Moroko</territory>
@@ -551,7 +559,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ME">Montenegro</territory>
 			<territory type="MF">Saint Martin</territory>
 			<territory type="MG">Madagaska</territory>
-			<territory type="MH">Visiwa vya Marshal</territory>
+			<territory type="MH">Visiwa vya Marshall</territory>
 			<territory type="MK">Masedonia</territory>
 			<territory type="MK" alt="variant">Masedonia (FYROM)</territory>
 			<territory type="ML">Mali</territory>
@@ -565,20 +573,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="MS">Montserrati</territory>
 			<territory type="MT">Malta</territory>
 			<territory type="MU">Morisi</territory>
-			<territory type="MV">Modivu</territory>
+			<territory type="MV">Maldives</territory>
 			<territory type="MW">Malawi</territory>
 			<territory type="MX">Meksiko</territory>
 			<territory type="MY">Malesia</territory>
 			<territory type="MZ">Msumbiji</territory>
 			<territory type="NA">Namibia</territory>
 			<territory type="NC">Nyukaledonia</territory>
-			<territory type="NE">Nijeri</territory>
+			<territory type="NE">Niger</territory>
 			<territory type="NF">Kisiwa cha Norfolk</territory>
 			<territory type="NG">Nigeria</territory>
 			<territory type="NI">Nikaragwa</territory>
 			<territory type="NL">Uholanzi</territory>
 			<territory type="NO">Norwe</territory>
-			<territory type="NP">Nepali</territory>
+			<territory type="NP">Nepal</territory>
 			<territory type="NR">Nauru</territory>
 			<territory type="NU">Niue</territory>
 			<territory type="NZ">Nyuzilandi</territory>
@@ -586,19 +594,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="PA">Panama</territory>
 			<territory type="PE">Peru</territory>
 			<territory type="PF">Polinesia ya Ufaransa</territory>
-			<territory type="PG">Papua</territory>
-			<territory type="PH">Filipino</territory>
+			<territory type="PG">Papua New Guinea</territory>
+			<territory type="PH">Ufilipino</territory>
 			<territory type="PK">Pakistani</territory>
 			<territory type="PL">Polandi</territory>
-			<territory type="PM">Santapieri na Mikeloni</territory>
-			<territory type="PN">Pitkairni</territory>
-			<territory type="PR">Pwetoriko</territory>
+			<territory type="PM">Santapierre na Miquelon</territory>
+			<territory type="PN">Visiwa vya Pitcairn</territory>
+			<territory type="PR">Puerto Rico</territory>
 			<territory type="PS">Maeneo ya Palestina</territory>
 			<territory type="PS" alt="short">Palestina</territory>
 			<territory type="PT">Ureno</territory>
 			<territory type="PW">Palau</territory>
 			<territory type="PY">Paragwai</territory>
-			<territory type="QA">Katari</territory>
+			<territory type="QA">Qatar</territory>
 			<territory type="QO">Oceania ya Nje</territory>
 			<territory type="RE">Riyunioni</territory>
 			<territory type="RO">Romania</territory>
@@ -610,38 +618,39 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="SC">Shelisheli</territory>
 			<territory type="SD">Sudani</territory>
 			<territory type="SE">Uswidi</territory>
-			<territory type="SG">Singapoo</territory>
+			<territory type="SG">Singapore</territory>
 			<territory type="SH">Santahelena</territory>
 			<territory type="SI">Slovenia</territory>
 			<territory type="SJ">Svalbard na Jan Mayen</territory>
 			<territory type="SK">Slovakia</territory>
 			<territory type="SL">Siera Leoni</territory>
-			<territory type="SM">Samarino</territory>
+			<territory type="SM">San Marino</territory>
 			<territory type="SN">Senegali</territory>
 			<territory type="SO">Somalia</territory>
 			<territory type="SR">Surinamu</territory>
 			<territory type="SS">Sudani Kusini</territory>
 			<territory type="ST">São Tomé na Príncipe</territory>
 			<territory type="SV">Elsavado</territory>
-			<territory type="SX">Santamatini</territory>
-			<territory type="SY">Siria</territory>
+			<territory type="SX">Sint Maarten</territory>
+			<territory type="SY">Syria</territory>
 			<territory type="SZ">Uswazi</territory>
 			<territory type="TA">Tristan da Cunha</territory>
 			<territory type="TC">Visiwa vya Turki na Kaiko</territory>
-			<territory type="TD">Chadi</territory>
+			<territory type="TD">Chad</territory>
 			<territory type="TF">Maeneo ya Kusini ya Ufaransa</territory>
 			<territory type="TG">Togo</territory>
 			<territory type="TH">Tailandi</territory>
 			<territory type="TJ">Tajikistani</territory>
 			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Timor ya Mashariki</territory>
+			<territory type="TL">Timor-Leste</territory>
+			<territory type="TL" alt="variant">Timor ya Mashariki</territory>
 			<territory type="TM">Turukimenistani</territory>
 			<territory type="TN">Tunisia</territory>
 			<territory type="TO">Tonga</territory>
 			<territory type="TR">Uturuki</territory>
 			<territory type="TT">Trinidad na Tobago</territory>
 			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwani</territory>
+			<territory type="TW">Taiwan</territory>
 			<territory type="TZ">Tanzania</territory>
 			<territory type="UA">Ukraini</territory>
 			<territory type="UG">Uganda</territory>
@@ -655,7 +664,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="VE">Venezuela</territory>
 			<territory type="VG">Visiwa vya Virgin vya Uingereza</territory>
 			<territory type="VI">Visiwa vya Virgin vya Marekani</territory>
-			<territory type="VN">Vietinamu</territory>
+			<territory type="VN">Vietnam</territory>
 			<territory type="VU">Vanuatu</territory>
 			<territory type="WF">Walis na Futuna</territory>
 			<territory type="WS">Samoa</territory>
@@ -674,11 +683,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colCaseFirst">Upangaji wa Herufi kubwa/Herufi ndogo</key>
 			<key type="colCaseLevel">Upangaji Unaoathiriwa na Herufi</key>
 			<key type="colHiraganaQuaternary">Upangaji wa Kana</key>
-			<key type="collation">Utaratibu wa Kupanga</key>
+			<key type="collation">Mpangilio</key>
 			<key type="colNormalization">Upangaji wa Kawaida</key>
 			<key type="colNumeric">Upangaji wa Namba</key>
 			<key type="colStrength">Nguvu ya Upangaji</key>
 			<key type="currency">Sarafu</key>
+			<key type="hc">hc</key>
+			<key type="lb">lb</key>
+			<key type="ms">ms</key>
 			<key type="numbers">Nambari</key>
 			<key type="timezone">Ukanda Saa</key>
 			<key type="va">Tofauti ya Mandhari</key>
@@ -686,99 +698,109 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">Matumizi ya Kibinafsi</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Nambari za Kiarabu/Kihindi</type>
-			<type type="arabext" key="numbers">Nambari za Kiarabu/Kihindi Zilizopanuliwa</type>
-			<type type="armn" key="numbers">Nambari za Kiarmenia</type>
-			<type type="armnlow" key="numbers">Nambari Ndogo za Kiamenia</type>
-			<type type="beng" key="numbers">Nambari za Kibengali</type>
-			<type type="big5han" key="collation">Mpangilio wa Kichina cha Jadi - Big5</type>
-			<type type="buddhist" key="calendar">Kalenda ya Kibuddha</type>
-			<type type="cham" key="numbers" draft="unconfirmed">Nambari za Kichami</type>
-			<type type="chinese" key="calendar">Kalenda ya Kichina</type>
-			<type type="coptic" key="calendar">Kalenda ya Koptiki</type>
-			<type type="dangi" key="calendar">Kalenda ya Dangi</type>
-			<type type="deva" key="numbers">Nambari za Kidevanagari</type>
-			<type type="dictionary" key="collation">Mpangilio wa Kamusi</type>
-			<type type="ducet" key="collation">Mpangilio wa Chaguo-Msingi wa Unicode</type>
-			<type type="ethi" key="numbers">Nambari za Kiethiopia</type>
-			<type type="ethiopic" key="calendar">Kalenda ya Kiethiopia</type>
-			<type type="ethiopic-amete-alem" key="calendar">Kalenda ya Kiethiopia ya Amete Alem</type>
-			<type type="finance" key="numbers">Tarakimu za Kifedha</type>
-			<type type="fullwide" key="numbers">Nambari za Upana Kamili</type>
-			<type type="gb2312han" key="collation">Mpangilio wa Kichina Rahisi - GB2312</type>
-			<type type="geor" key="numbers">Nambari za Georgia</type>
-			<type type="gregorian" key="calendar">Kalenda ya Kigregori</type>
-			<type type="grek" key="numbers">Nambari za Kigiriki</type>
-			<type type="greklow" key="numbers">Nambari Ndogo za Kigiriki</type>
-			<type type="gujr" key="numbers">Nambari za Kigujarati</type>
-			<type type="guru" key="numbers">Nambari za Kigurumukhi</type>
-			<type type="hanidec" key="numbers">Nambari za Desimali za Kichina</type>
-			<type type="hans" key="numbers">Nambari za Kichina Rahisi</type>
-			<type type="hansfin" key="numbers">Nambari za Kifedha za Kichina Rahisi</type>
-			<type type="hant" key="numbers">Nambari za Kichina cha Jadi</type>
-			<type type="hantfin" key="numbers">Nambari za Kichina za Fedha</type>
-			<type type="hebr" key="numbers">Nambari za Kihebrania</type>
-			<type type="hebrew" key="calendar">Kalenda ya Kihebrania</type>
-			<type type="identical" key="colStrength">Panga Zote</type>
-			<type type="indian" key="calendar">Kalenda ya Taifa ya India</type>
-			<type type="islamic" key="calendar">Kalenda ya Kiislamu</type>
-			<type type="islamic-civil" key="calendar">Kalenda ya Kiislamu/Rasmi</type>
-			<type type="iso8601" key="calendar">Kalenda ya ISO-8601</type>
-			<type type="japanese" key="calendar">Kalenda ya Kijapani</type>
-			<type type="java" key="numbers" draft="unconfirmed">Nambari za Kijava</type>
-			<type type="jpan" key="numbers">Nambari za Kijapani</type>
-			<type type="jpanfin" key="numbers">Nambari za Kifedha za Kijapani</type>
-			<type type="khmr" key="numbers">Nambari za Kikhmeri</type>
-			<type type="knda" key="numbers">Nambari za Kikannada</type>
-			<type type="laoo" key="numbers">Nambari za Kilao</type>
-			<type type="latn" key="numbers">Nambari za Magharibi</type>
-			<type type="limb" key="numbers" draft="unconfirmed">Nambari za Kilimbu</type>
-			<type type="lower" key="colCaseFirst">Panga Herufi ndogo Kwanza</type>
-			<type type="mlym" key="numbers">Nambari za Kimalayamu</type>
-			<type type="mong" key="numbers">Nambari za Kimongolia</type>
-			<type type="mymr" key="numbers">Nambari za Myama</type>
-			<type type="native" key="numbers">Digiti Asili</type>
-			<type type="no" key="colBackwards">Panga Viinitoni kwa Kawaida</type>
-			<type type="no" key="colCaseFirst">Panga Utaratibu wa Herufi ya Kawaida</type>
-			<type type="no" key="colCaseLevel">Panga Isiyoathiriwa na Herufi</type>
-			<type type="no" key="colHiraganaQuaternary">Panga Kana Kando</type>
-			<type type="no" key="colNormalization">Panga Bila Ukawaida</type>
-			<type type="no" key="colNumeric">Panga Tarakimu Kivyake</type>
-			<type type="non-ignorable" key="colAlternate">Panga Alama</type>
-			<type type="orya" key="numbers">Nambari za Kioriya</type>
-			<type type="persian" key="calendar">Kalenda ya Kiajemi</type>
-			<type type="phonebook" key="collation">Mpangilio wa Orodha za Nambari za Simu</type>
-			<type type="phonetic" key="collation">Utaratibu wa Kupanga Fonetiki</type>
-			<type type="pinyin" key="collation">Mpangilio wa Kipinyin</type>
-			<type type="primary" key="colStrength">Panga Herufi Msingi Tu</type>
-			<type type="quaternary" key="colStrength">Panga Viinitoni/Herufi/Upana/Kana</type>
-			<type type="reformed" key="collation">Mpangilio Uliorekebishwa</type>
-			<type type="roc" key="calendar">Kalenda ya Minguo</type>
-			<type type="roman" key="numbers">Nambari za Kirumi</type>
-			<type type="romanlow" key="numbers">Nambari Ndogo za Kirumi</type>
-			<type type="search" key="collation">Utafutaji wa Kijumla</type>
-			<type type="searchjl" key="collation">Tafuta kwa Konsonanti Halisi ya Hangul</type>
-			<type type="secondary" key="colStrength">Panga Viinitoni</type>
-			<type type="shifted" key="colAlternate">Panga Alama za Kupuuza</type>
-			<type type="standard" key="collation">standard</type>
-			<type type="stroke" key="collation">Mpangilio wa Mikwaju</type>
-			<type type="takr" key="numbers" draft="unconfirmed">Nambari za Kitakri</type>
-			<type type="taml" key="numbers">Nambari za Kitamili</type>
-			<type type="tamldec" key="numbers">Nambari za Kitamili</type>
-			<type type="telu" key="numbers">Nambari za Kitelugu</type>
-			<type type="tertiary" key="colStrength">Panga Viinitoni/Herufi/Upana</type>
-			<type type="thai" key="numbers">Nambari za Kitai</type>
-			<type type="tibt" key="numbers">Nambari za Kitibeti</type>
-			<type type="traditional" key="collation">Mpangilio wa Kawaida</type>
-			<type type="traditional" key="numbers">Tarakimu za Jadi</type>
-			<type type="unihan" key="collation">Mpangilio wa Mikwaju ya Shina</type>
-			<type type="upper" key="colCaseFirst">Panga Herufi kubwa Kwanza</type>
-			<type type="vaii" key="numbers">Dijiti za Vai</type>
-			<type type="yes" key="colBackwards">Panga Viinitoni Kumegeuzwa</type>
-			<type type="yes" key="colCaseLevel">Panga kwa Inayoathiriwa na Herufi</type>
-			<type type="yes" key="colHiraganaQuaternary">Panga Kana Kitofauti</type>
-			<type type="yes" key="colNormalization">Upangaji Msimbosare Umekawaidishwa</type>
-			<type type="yes" key="colNumeric">Panga Dijiti kwa Namba</type>
+			<type key="calendar" type="buddhist">Kalenda ya Kibuddha</type>
+			<type key="calendar" type="chinese">Kalenda ya Kichina</type>
+			<type key="calendar" type="coptic">Kalenda ya Koptiki</type>
+			<type key="calendar" type="dangi">Kalenda ya Dangi</type>
+			<type key="calendar" type="ethiopic">Kalenda ya Kiethiopia</type>
+			<type key="calendar" type="ethiopic-amete-alem">Kalenda ya Kiethiopia ya Amete Alem</type>
+			<type key="calendar" type="gregorian">Kalenda ya Kigregori</type>
+			<type key="calendar" type="hebrew">Kalenda ya Kiebrania</type>
+			<type key="calendar" type="indian">Kalenda ya Taifa ya India</type>
+			<type key="calendar" type="islamic">Kalenda ya Kiislamu</type>
+			<type key="calendar" type="islamic-civil">Kalenda ya Kiislamu/Rasmi</type>
+			<type key="calendar" type="iso8601">Kalenda ya ISO-8601</type>
+			<type key="calendar" type="japanese">Kalenda ya Kijapani</type>
+			<type key="calendar" type="persian">Kalenda ya Kiajemi</type>
+			<type key="calendar" type="roc">Kalenda ya Minguo</type>
+			<type key="colAlternate" type="non-ignorable">Panga Alama</type>
+			<type key="colAlternate" type="shifted">Panga Alama za Kupuuza</type>
+			<type key="colBackwards" type="no">Panga Viinitoni kwa Kawaida</type>
+			<type key="colBackwards" type="yes">Panga Viinitoni Kumegeuzwa</type>
+			<type key="colCaseFirst" type="lower">Panga Herufi ndogo Kwanza</type>
+			<type key="colCaseFirst" type="no">Panga Utaratibu wa Herufi ya Kawaida</type>
+			<type key="colCaseFirst" type="upper">Panga Herufi kubwa Kwanza</type>
+			<type key="colCaseLevel" type="no">Panga Isiyoathiriwa na Herufi</type>
+			<type key="colCaseLevel" type="yes">Panga kwa Inayoathiriwa na Herufi</type>
+			<type key="colHiraganaQuaternary" type="no">Panga Kana Kando</type>
+			<type key="colHiraganaQuaternary" type="yes">Panga Kana Kitofauti</type>
+			<type key="collation" type="big5han">Mpangilio wa Kichina cha Jadi - Big5</type>
+			<type key="collation" type="dictionary">Mpangilio wa Kamusi</type>
+			<type key="collation" type="ducet">Mpangilio Chaguo-Msingi wa Unicode</type>
+			<type key="collation" type="gb2312han">Mpangilio wa Kichina Rahisi - GB2312</type>
+			<type key="collation" type="phonebook">Mpangilio wa Orodha za Nambari za Simu</type>
+			<type key="collation" type="phonetic">Utaratibu wa Kupanga Fonetiki</type>
+			<type key="collation" type="pinyin">Mpangilio wa Kipinyin</type>
+			<type key="collation" type="reformed">Mpangilio Uliorekebishwa</type>
+			<type key="collation" type="search">Utafutaji wa Kijumla</type>
+			<type key="collation" type="searchjl">Tafuta kwa Konsonanti Halisi ya Hangul</type>
+			<type key="collation" type="standard">Mpangilio wa Kawaida</type>
+			<type key="collation" type="stroke">Mpangilio wa Mikwaju</type>
+			<type key="collation" type="traditional">Mpangilio wa Kawaida</type>
+			<type key="collation" type="unihan">Mpangilio wa Mikwaju ya Shina</type>
+			<type key="colNormalization" type="no">Panga Bila Ukawaida</type>
+			<type key="colNormalization" type="yes">Upangaji Msimbosare Umekawaidishwa</type>
+			<type key="colNumeric" type="no">Panga Tarakimu Kivyake</type>
+			<type key="colNumeric" type="yes">Panga Dijiti kwa Namba</type>
+			<type key="colStrength" type="identical">Panga Zote</type>
+			<type key="colStrength" type="primary">Panga Herufi Msingi Tu</type>
+			<type key="colStrength" type="quaternary">Panga Viinitoni/Herufi/Upana/Kana</type>
+			<type key="colStrength" type="secondary">Panga Viinitoni</type>
+			<type key="colStrength" type="tertiary">Panga Viinitoni/Herufi/Upana</type>
+			<type key="hc" type="h11">h11</type>
+			<type key="hc" type="h12">h12</type>
+			<type key="hc" type="h23">h23</type>
+			<type key="hc" type="h24">h24</type>
+			<type key="lb" type="loose">loose</type>
+			<type key="lb" type="normal">normal</type>
+			<type key="lb" type="strict">strict</type>
+			<type key="ms" type="metric">metriki</type>
+			<type key="ms" type="uksystem">mfumo wa UK</type>
+			<type key="ms" type="ussystem">Mfumo wa US</type>
+			<type key="numbers" type="arab">Nambari za Kiarabu/Kihindi</type>
+			<type key="numbers" type="arabext">Nambari za Kiarabu/Kihindi Zilizopanuliwa</type>
+			<type key="numbers" type="armn">Nambari za Kiarmenia</type>
+			<type key="numbers" type="armnlow">Nambari Ndogo za Kiarmenia</type>
+			<type key="numbers" type="beng">Nambari za Kibengali</type>
+			<type key="numbers" type="cham" draft="unconfirmed">Nambari za Kichami</type>
+			<type key="numbers" type="deva">Nambari za Kidevanagari</type>
+			<type key="numbers" type="ethi">Nambari za Kiethiopia</type>
+			<type key="numbers" type="finance">Tarakimu za Kifedha</type>
+			<type key="numbers" type="fullwide">Nambari za Upana Kamili</type>
+			<type key="numbers" type="geor">Nambari za Georgia</type>
+			<type key="numbers" type="grek">Nambari za Kigiriki</type>
+			<type key="numbers" type="greklow">Nambari Ndogo za Kigiriki</type>
+			<type key="numbers" type="gujr">Nambari za Kigujarati</type>
+			<type key="numbers" type="guru">Nambari za Kigurumukhi</type>
+			<type key="numbers" type="hanidec">Nambari za Desimali za Kichina</type>
+			<type key="numbers" type="hans">Nambari za Kichina Rahisi</type>
+			<type key="numbers" type="hansfin">Nambari za Kifedha za Kichina Rahisi</type>
+			<type key="numbers" type="hant">Nambari za Kichina cha Jadi</type>
+			<type key="numbers" type="hantfin">Nambari za Kichina za Fedha</type>
+			<type key="numbers" type="hebr">Nambari za Kiebrania</type>
+			<type key="numbers" type="java" draft="unconfirmed">Nambari za Kijava</type>
+			<type key="numbers" type="jpan">Nambari za Kijapani</type>
+			<type key="numbers" type="jpanfin">Nambari za Kifedha za Kijapani</type>
+			<type key="numbers" type="khmr">Nambari za Kikhmeri</type>
+			<type key="numbers" type="knda">Nambari za Kikannada</type>
+			<type key="numbers" type="laoo">Nambari za Kilao</type>
+			<type key="numbers" type="latn">Nambari za Magharibi</type>
+			<type key="numbers" type="limb" draft="unconfirmed">Nambari za Kilimbu</type>
+			<type key="numbers" type="mlym">Nambari za Kimalayamu</type>
+			<type key="numbers" type="mong">Nambari za Kimongolia</type>
+			<type key="numbers" type="mymr">Nambari za Myama</type>
+			<type key="numbers" type="native">Digiti Asili</type>
+			<type key="numbers" type="orya">Nambari za Kioriya</type>
+			<type key="numbers" type="roman">Nambari za Kirumi</type>
+			<type key="numbers" type="romanlow">Nambari Ndogo za Kirumi</type>
+			<type key="numbers" type="takr" draft="unconfirmed">Nambari za Kitakri</type>
+			<type key="numbers" type="taml">Nambari za Kitamili</type>
+			<type key="numbers" type="tamldec">Nambari za Kitamili</type>
+			<type key="numbers" type="telu">Nambari za Kitelugu</type>
+			<type key="numbers" type="thai">Nambari za Kitai</type>
+			<type key="numbers" type="tibt">Nambari za Kitibeti</type>
+			<type key="numbers" type="traditional">Tarakimu za Jadi</type>
+			<type key="numbers" type="vaii">Dijiti za Vai</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN">BGN</transformName>
@@ -869,6 +891,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -913,7 +936,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a</greatestDifference>
 							<greatestDifference id="m">h:mm – h:mm a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hm">
@@ -1168,10 +1191,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<quarters>
 					<quarterContext type="format">
 						<quarterWidth type="abbreviated">
-							<quarter type="1">R1</quarter>
-							<quarter type="2">R2</quarter>
-							<quarter type="3">R3</quarter>
-							<quarter type="4">R4</quarter>
+							<quarter type="1">Robo ya 1</quarter>
+							<quarter type="2">Robo ya 2</quarter>
+							<quarter type="3">Robo ya 3</quarter>
+							<quarter type="4">Robo ya 4</quarter>
 						</quarterWidth>
 						<quarterWidth type="narrow">
 							<quarter type="1">1</quarter>
@@ -1188,10 +1211,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</quarterContext>
 					<quarterContext type="stand-alone">
 						<quarterWidth type="abbreviated">
-							<quarter type="1">R1</quarter>
-							<quarter type="2">R2</quarter>
-							<quarter type="3">R3</quarter>
-							<quarter type="4">R4</quarter>
+							<quarter type="1">Robo ya 1</quarter>
+							<quarter type="2">Robo ya 2</quarter>
+							<quarter type="3">Robo ya 3</quarter>
+							<quarter type="4">Robo ya 4</quarter>
 						</quarterWidth>
 						<quarterWidth type="narrow">
 							<quarter type="1">1</quarter>
@@ -1209,15 +1232,73 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">saa sita za usiku</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">saa sita za mchana</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">alfajiri</dayPeriod>
+							<dayPeriod type="morning2">asubuhi</dayPeriod>
+							<dayPeriod type="afternoon1">mchana</dayPeriod>
+							<dayPeriod type="evening1">jioni</dayPeriod>
+							<dayPeriod type="night1">usiku</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">saa sita za usiku</dayPeriod>
 							<dayPeriod type="am">am</dayPeriod>
-							<dayPeriod type="noon">PM</dayPeriod>
+							<dayPeriod type="noon">saa sita za mchana</dayPeriod>
 							<dayPeriod type="pm">pm</dayPeriod>
+							<dayPeriod type="morning1">alfajiri</dayPeriod>
+							<dayPeriod type="morning2">asubuhi</dayPeriod>
+							<dayPeriod type="afternoon1">mchana</dayPeriod>
+							<dayPeriod type="evening1">jioni</dayPeriod>
+							<dayPeriod type="night1">usiku</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">saa sita za usiku</dayPeriod>
 							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="noon">PM</dayPeriod>
+							<dayPeriod type="noon">saa sita za mchana</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">alfajiri</dayPeriod>
+							<dayPeriod type="morning2">asubuhi</dayPeriod>
+							<dayPeriod type="afternoon1">mchana</dayPeriod>
+							<dayPeriod type="evening1">jioni</dayPeriod>
+							<dayPeriod type="night1">usiku</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">saa sita za usiku</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">saa sita za mchana</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">alfajiri</dayPeriod>
+							<dayPeriod type="morning2">asubuhi</dayPeriod>
+							<dayPeriod type="afternoon1">mchana</dayPeriod>
+							<dayPeriod type="evening1">jioni</dayPeriod>
+							<dayPeriod type="night1">usiku</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">saa sita za usiku</dayPeriod>
+							<dayPeriod type="am">am</dayPeriod>
+							<dayPeriod type="noon">saa sita za mchana</dayPeriod>
+							<dayPeriod type="pm">pm</dayPeriod>
+							<dayPeriod type="morning1">alfajiri</dayPeriod>
+							<dayPeriod type="morning2">asubuhi</dayPeriod>
+							<dayPeriod type="afternoon1">mchana</dayPeriod>
+							<dayPeriod type="evening1">jioni</dayPeriod>
+							<dayPeriod type="night1">usiku</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">saa sita za usiku</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="noon">saa sita za mchana</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">alfajiri</dayPeriod>
+							<dayPeriod type="morning2">asubuhi</dayPeriod>
+							<dayPeriod type="afternoon1">mchana</dayPeriod>
+							<dayPeriod type="evening1">jioni</dayPeriod>
+							<dayPeriod type="night1">usiku</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1260,22 +1341,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -1318,6 +1399,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
@@ -1335,7 +1420,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMEd">E, MMM d, y</dateFormatItem>
 						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
+						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
 						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
 					</availableFormats>
 					<appendItems>
@@ -1390,18 +1475,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">E, d/M – E, d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM – MMM</greatestDifference>
+							<greatestDifference id="M">LLL–LLL</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">MMM d–d</greatestDifference>
 							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, MMM d– E, MMM d</greatestDifference>
-							<greatestDifference id="M">E, MMM d– E, MMM d</greatestDifference>
+							<greatestDifference id="d">MMM d, E – MMM d, E</greatestDifference>
+							<greatestDifference id="M">MMM d, E – MMM d, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
-							<greatestDifference id="y">y – y</greatestDifference>
+							<greatestDifference id="y">y–y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
 							<greatestDifference id="M">M/y – M/y</greatestDifference>
@@ -1843,7 +1928,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<gmtZeroFormat>GMT</gmtZeroFormat>
 			<regionFormat>Saa za {0}</regionFormat>
 			<regionFormat type="daylight">Saa za Mchana za {0}</regionFormat>
-			<regionFormat type="standard">Saa za Msingi za {0}</regionFormat>
+			<regionFormat type="standard">Saa za wastani za {0}</regionFormat>
 			<fallbackFormat>{1} ({0})</fallbackFormat>
 			<zone type="Etc/Unknown">
 				<exemplarCity>Jiji Lisilojulikana</exemplarCity>
@@ -2227,7 +2312,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Havana</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Kepuvede</exemplarCity>
+				<exemplarCity>Cape Verde</exemplarCity>
 			</zone>
 			<zone type="America/Curacao">
 				<exemplarCity>Kurakao</exemplarCity>
@@ -2712,6 +2797,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
 			</zone>
@@ -2796,6 +2884,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Chita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Yakutsk</exemplarCity>
 			</zone>
@@ -2814,6 +2905,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolymsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamchatka</exemplarCity>
 			</zone>
@@ -3123,7 +3217,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="Alaska">
 				<long>
 					<generic>Saa za Alaska</generic>
-					<standard>Saa Wastani za Alaska</standard>
+					<standard>Saa za Wastani za Alaska</standard>
 					<daylight>Saa za Mchana za Alaska</daylight>
 				</long>
 			</metazone>
@@ -3187,7 +3281,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Saa za Ajentina</generic>
 					<standard>Saa Wastani za Ajentina</standard>
-					<daylight>Saa za Kiangazi za Ajentina</daylight>
+					<daylight>Saa za Majira ya joto za Ajentina</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina_Western">
@@ -3214,14 +3308,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="Australia_Central">
 				<long>
 					<generic>Saa za Australia ya Kati</generic>
-					<standard>Saa za Wastani za Australia ya Kati</standard>
+					<standard>Saa Wastani za Australia ya Kati</standard>
 					<daylight>Saa za Mchana za Australia ya Kati</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_CentralWestern">
 				<long>
 					<generic>Saa za Magharibi ya Kati ya Australia</generic>
-					<standard>Saa za Wastani za Magharibi ya Kati ya Australia</standard>
+					<standard>Saa Wastani za Magharibi ya Kati ya Australia</standard>
 					<daylight>Saa za Mchana za Magharibi ya Kati ya Australia</daylight>
 				</long>
 			</metazone>
@@ -3235,7 +3329,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="Australia_Western">
 				<long>
 					<generic>Saa za Australia Magharibi</generic>
-					<standard>Saa za Wastani za Australia Magharibi</standard>
+					<standard>Saa Wastani za Australia Magharibi</standard>
 					<daylight>Saa za Mchana za Australia Magharibi</daylight>
 				</long>
 			</metazone>
@@ -3248,9 +3342,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Azores">
 				<long>
-					<generic>Saa za Azorena</generic>
-					<standard>Saa Wastani za Azorena</standard>
-					<daylight>Saa za Majira ya joto za Azorerna</daylight>
+					<generic>Saa za Azores</generic>
+					<standard>Saa Wastani za Azores</standard>
+					<daylight>Saa za Majira ya joto za Azores</daylight>
 				</long>
 			</metazone>
 			<metazone type="Bangladesh">
@@ -3274,7 +3368,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Saa za Brasilia</generic>
 					<standard>Saa Wastani za Brasilia</standard>
-					<daylight>Saa za Kiangazi za Brasilia</daylight>
+					<daylight>Saa za Majira ya joto za Brasilia</daylight>
 				</long>
 			</metazone>
 			<metazone type="Brunei">
@@ -3286,7 +3380,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Saa za Cape Verde</generic>
 					<standard>Saa Wastani za Cape Verde</standard>
-					<daylight>Saa ya Majira ya joto ya Cape Verde</daylight>
+					<daylight>Saa za Majira ya joto za Cape Verde</daylight>
 				</long>
 			</metazone>
 			<metazone type="Chamorro">
@@ -3319,7 +3413,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Saa za Choibalsan</generic>
 					<standard>Saa Wastani za Choibalsan</standard>
-					<daylight>Saa za Kiangazi za Choibalsan</daylight>
+					<daylight>Saa za Majira ya joto za Choibalsan</daylight>
 				</long>
 			</metazone>
 			<metazone type="Christmas">
@@ -3343,14 +3437,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Saa za Visiwa vya Cook</generic>
 					<standard>Saa Wastani za Visiwa vya Cook</standard>
-					<daylight>Saa Majira nusu ya joto za Visiwa Cook</daylight>
+					<daylight>Saa za Majira nusu ya joto za Visiwa Cook</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cuba">
 				<long>
-					<generic>Saa ya Kuba</generic>
-					<standard>Saa Wastani ya Kuba</standard>
-					<daylight>Saa ya Mchana ya Kuba</daylight>
+					<generic>Saa za Cuba</generic>
+					<standard>Saa za Wastani ya Cuba</standard>
+					<daylight>Saa za Mchana za Cuba</daylight>
 				</long>
 			</metazone>
 			<metazone type="Davis">
@@ -3396,7 +3490,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
 				<long>
-					<standard>Further-eastern European Time</standard>
+					<standard>Saa za Further-eastern European Time</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
@@ -3459,16 +3553,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Greenland_Eastern">
 				<long>
-					<generic>Saa ya Grinilandi Mashariki</generic>
-					<standard>Saa Wastani ya Grinilandi Mashariki</standard>
-					<daylight>Saa ya Majira ya joto ya Grinilandi Mashariki</daylight>
+					<generic>Saa za Greenland Mashariki</generic>
+					<standard>Saa za Wastani za Greenland Mashariki</standard>
+					<daylight>Saa za Majira ya joto za Greenland Mashariki</daylight>
 				</long>
 			</metazone>
 			<metazone type="Greenland_Western">
 				<long>
-					<generic>Saa ya Grinilandi Magharibi</generic>
-					<standard>Saa Wastani wa Grinilandi Magharibi</standard>
-					<daylight>Saa ya Majira ya joto ya Grinilandi Magharibi</daylight>
+					<generic>Saa za Greenland Magharibi</generic>
+					<standard>Saa za Wastani za Greenland Magharibi</standard>
+					<daylight>Saa za Majira ya joto za Greenland Magharibi</daylight>
 				</long>
 			</metazone>
 			<metazone type="Gulf">
@@ -3484,8 +3578,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Saa za Hawaii-Aleutian</generic>
-					<standard>Saa Wastani ya Hawaii-Aleutian</standard>
-					<daylight>Saa ya Mchana ya Hawaii-Aleutian</daylight>
+					<standard>Saa za Wastani za Hawaii-Aleutian</standard>
+					<daylight>Saa za Mchana za Hawaii-Aleutian</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hong_Kong">
@@ -3499,7 +3593,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Saa za Hovd</generic>
 					<standard>Saa Wastani za Hovd</standard>
-					<daylight>Saa za Kiangazi za Hovd</daylight>
+					<daylight>Saa za Majira ya joto za Hovd</daylight>
 				</long>
 			</metazone>
 			<metazone type="India">
@@ -3543,7 +3637,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Saa za Irkutsk</generic>
 					<standard>Saa Wastani za Irkutsk</standard>
-					<daylight>Saa za Kiangazi za Irkutsk</daylight>
+					<daylight>Saa za Majira ya joto za Irkutsk</daylight>
 				</long>
 			</metazone>
 			<metazone type="Israel">
@@ -3593,7 +3687,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Saa za Krasnoyarsk</generic>
 					<standard>Saa Wastani za Krasnoyaski</standard>
-					<daylight>Saa za Kiangazi za Krasnoyarsk</daylight>
+					<daylight>Saa za Majira ya joto za Krasnoyarsk</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kyrgystan">
@@ -3609,7 +3703,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="Lord_Howe">
 				<long>
 					<generic>Saa za Lord Howe</generic>
-					<standard>Saa za Wastani za Lord Howe</standard>
+					<standard>Saa Wastani za Lord Howe</standard>
 					<daylight>Saa za Mchana za Lord Howe</daylight>
 				</long>
 			</metazone>
@@ -3622,7 +3716,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Saa za Magadan</generic>
 					<standard>Saa Wastani za Magadani</standard>
-					<daylight>Saa za Kiangazi za Magadan</daylight>
+					<daylight>Saa za Majira ya joto za Magadan</daylight>
 				</long>
 			</metazone>
 			<metazone type="Malaysia">
@@ -3659,15 +3753,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Mexico_Northwest">
 				<long>
-					<generic>saa za Meksiko Kaskazini Magharibi</generic>
-					<standard>saa wastani za Meksiko Kaskazini Magharibi</standard>
-					<daylight>saa za mchana za Meksiko Kaskazini Magharibi</daylight>
+					<generic>Saa za Meksiko Kaskazini Magharibi</generic>
+					<standard>Saa za wastani za Meksiko Kaskazini Magharibi</standard>
+					<daylight>Saa za mchana za Meksiko Kaskazini Magharibi</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Saa za pasifiki za Meksiko</generic>
-					<standard>Saa wastani za pasifiki za Meksiko</standard>
+					<standard>Saa za wastani za pasifiki za Meksiko</standard>
 					<daylight>Saa za mchana za pasifiki za Meksiko</daylight>
 				</long>
 			</metazone>
@@ -3675,14 +3769,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Saa za Ulan Bator</generic>
 					<standard>Saa Wastani za Ulan Bator</standard>
-					<daylight>Saa za Kiangazi za Ulan Bator</daylight>
+					<daylight>Saa za Majira ya joto za Ulan Bator</daylight>
 				</long>
 			</metazone>
 			<metazone type="Moscow">
 				<long>
 					<generic>Saa za Moscow</generic>
 					<standard>Saa za Wastani za Moscow</standard>
-					<daylight>Saa za Kiangazi za Moscow</daylight>
+					<daylight>Saa za Majira ya joto za Moscow</daylight>
 				</long>
 			</metazone>
 			<metazone type="Myanmar">
@@ -3735,21 +3829,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Saa za Fernando de Noronha</generic>
 					<standard>Saa Wastani za Fernando de Noronha</standard>
-					<daylight>Saa za Kiangazi za Fernando de Noronha</daylight>
+					<daylight>Saa za Majira ya joto za Fernando de Noronha</daylight>
 				</long>
 			</metazone>
 			<metazone type="Novosibirsk">
 				<long>
 					<generic>Saa za Novosibirsk</generic>
 					<standard>Saa Wastani za Novosibirsk</standard>
-					<daylight>Saa za Kiangazi za Novosibirsk</daylight>
+					<daylight>Saa za Majira ya joto za Novosibirsk</daylight>
 				</long>
 			</metazone>
 			<metazone type="Omsk">
 				<long>
 					<generic>Saa za Omsk</generic>
 					<standard>Saa Wastani za Omsk</standard>
-					<daylight>Saa za Kiangazi za Omsk</daylight>
+					<daylight>Saa za Majira ya joto za Omsk</daylight>
 				</long>
 			</metazone>
 			<metazone type="Pakistan">
@@ -3797,9 +3891,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Pierre_Miquelon">
 				<long>
-					<generic>Saa ya Saint-Pierre na Mikuelon</generic>
-					<standard>Saa Wastani ya Saint-Pierre na Mikuelon</standard>
-					<daylight>Saa ya Mchana ya Saint-Pierre na Mikuelon</daylight>
+					<generic>Saa za Saint-Pierre na Miquelon</generic>
+					<standard>Saa za Wastani ya Saint-Pierre na Miquelon</standard>
+					<daylight>Saa za Mchana za Saint-Pierre na Miquelon</daylight>
 				</long>
 			</metazone>
 			<metazone type="Pitcairn">
@@ -3826,7 +3920,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Saa za Sakhalin</generic>
 					<standard>Saa Wastani za Sakhalin</standard>
-					<daylight>Saa za Kiangazi za Sakhalin</daylight>
+					<daylight>Saa za Majira ya joto za Sakhalin</daylight>
 				</long>
 			</metazone>
 			<metazone type="Samara">
@@ -3949,14 +4043,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Saa za Vladivostok</generic>
 					<standard>Saa Wastani za Vladivostok</standard>
-					<daylight>Saa za Kiangazi za Vladivostok</daylight>
+					<daylight>Saa za Majira ya joto za Vladivostok</daylight>
 				</long>
 			</metazone>
 			<metazone type="Volgograd">
 				<long>
 					<generic>Saa za Volgograd</generic>
 					<standard>Saa Wastani za Volgograd</standard>
-					<daylight>Saa za Kiangazi za Volgograd</daylight>
+					<daylight>Saa za Majira ya joto za Volgograd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Vostok">
@@ -3978,14 +4072,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Saa za Yakutsk</generic>
 					<standard>Saa Wastani za Yakutsk</standard>
-					<daylight>Saa za Kiangazi za Yakutsk</daylight>
+					<daylight>Saa za Majira ya joto za Yakutsk</daylight>
 				</long>
 			</metazone>
 			<metazone type="Yekaterinburg">
 				<long>
 					<generic>Saa za Yekaterinburg</generic>
 					<standard>Saa Wastani za Yekaterinburg</standard>
-					<daylight>Saa za Kiangazi za Yekaterinburg</daylight>
+					<daylight>Saa za Majira ya joto za Yekaterinburg</daylight>
 				</long>
 			</metazone>
 		</timeZoneNames>
@@ -4096,6 +4190,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">¤elfu 0</pattern>
+					<pattern type="1000" count="other">¤elfu 0</pattern>
+					<pattern type="10000" count="one">¤elfu 00</pattern>
+					<pattern type="10000" count="other">¤elfu 00</pattern>
+					<pattern type="100000" count="one">¤elfu 000</pattern>
+					<pattern type="100000" count="other">¤elfu 000</pattern>
+					<pattern type="1000000" count="one">¤M0</pattern>
+					<pattern type="1000000" count="other">¤M0</pattern>
+					<pattern type="10000000" count="one">¤M00</pattern>
+					<pattern type="10000000" count="other">¤M00</pattern>
+					<pattern type="100000000" count="one">¤M000</pattern>
+					<pattern type="100000000" count="other">¤M000</pattern>
+					<pattern type="1000000000" count="one">¤B0</pattern>
+					<pattern type="1000000000" count="other">¤B0</pattern>
+					<pattern type="10000000000" count="one">¤B00</pattern>
+					<pattern type="10000000000" count="other">¤B00</pattern>
+					<pattern type="100000000000" count="one">¤B000</pattern>
+					<pattern type="100000000000" count="other">¤B000</pattern>
+					<pattern type="1000000000000" count="one">¤T0</pattern>
+					<pattern type="1000000000000" count="other">¤T0</pattern>
+					<pattern type="10000000000000" count="one">¤T00</pattern>
+					<pattern type="10000000000000" count="other">¤T00</pattern>
+					<pattern type="100000000000000" count="one">¤T000</pattern>
+					<pattern type="100000000000000" count="other">¤T000</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{1} {0}</unitPattern>
 			<unitPattern count="other">{1} {0}</unitPattern>
 		</currencyFormats>
@@ -4107,9 +4229,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>AED</symbol>
 			</currency>
 			<currency type="AFN">
-				<displayName>Afghani ya Afuganistani</displayName>
-				<displayName count="one">Afghani ya Afuganistani</displayName>
-				<displayName count="other">Afghani za Afuganistani</displayName>
+				<displayName>Afghani ya Afghanistan</displayName>
+				<displayName count="one">Afghani ya Afghanistan</displayName>
+				<displayName count="other">Afghani za Afghanistan</displayName>
 				<symbol>AFN</symbol>
 			</currency>
 			<currency type="ALL">
@@ -4135,6 +4257,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">kwanza ya Angola</displayName>
 				<displayName count="other">kwanza za Angola</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="ARS">
 				<displayName>Peso ya Ajentina</displayName>
@@ -4167,6 +4290,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Convertible Mark ya Bosnia na Hezegovina</displayName>
 				<displayName count="other">Convertible Mark za Bosnia na Hezegovina</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>Dola ya Barbados</displayName>
@@ -4189,9 +4313,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>BGN</symbol>
 			</currency>
 			<currency type="BHD">
-				<displayName>Dinari ya Bahareni</displayName>
-				<displayName count="one">dinari ya Bahareni</displayName>
-				<displayName count="other">dinari za Bahareni</displayName>
+				<displayName>Dinar ya Bahareni</displayName>
+				<displayName count="one">Dinar ya Bahareni</displayName>
+				<displayName count="other">Dinar za Bahareni</displayName>
 				<symbol>BHD</symbol>
 			</currency>
 			<currency type="BIF">
@@ -4219,6 +4343,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Boliviano ya Bolivia</displayName>
 				<displayName count="other">Boliviano za Bolivia</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BRL">
 				<displayName>Real ya Brazil</displayName>
@@ -4245,6 +4370,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">pula ya Botswana</displayName>
 				<displayName count="other">pula za Botswana</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYR">
 				<displayName>Ruble ya Belarusi</displayName>
@@ -4312,6 +4438,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Peso ya Cuba Inayoweza Kubadilishwa</displayName>
 				<displayName count="other">Peso za Cuba Zinazoweza Kubadilishwa</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>Peso ya Cuba</displayName>
@@ -4321,9 +4448,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CVE">
-				<displayName>Eskudo ya Kepuvede</displayName>
-				<displayName count="one">eskudo ya Kepuvede</displayName>
-				<displayName count="other">eskudo za Kepuvede</displayName>
+				<displayName>Eskudo ya Cape Verde</displayName>
+				<displayName count="one">Eskudo ya Cape Verde</displayName>
+				<displayName count="other">Eskudo za Cape Verde</displayName>
 				<symbol>CVE</symbol>
 			</currency>
 			<currency type="CZK">
@@ -4331,6 +4458,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Koruna ya Jamhuri ya Cheki</displayName>
 				<displayName count="other">Koruna za Jamhuri ya Cheki</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DJF">
 				<displayName>Faranga ya Jibuti</displayName>
@@ -4343,6 +4471,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Krone ya Denmaki</displayName>
 				<displayName count="other">Krone za Denmaki</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Peso ya Dominika</displayName>
@@ -4362,6 +4491,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">pauni ya Misri</displayName>
 				<displayName count="other">pauni za Misri</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>Nakfa ya Eritrea</displayName>
@@ -4370,7 +4500,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>ERN</symbol>
 			</currency>
 			<currency type="ETB">
-				<displayName>Nirr ya Uhabeshi</displayName>
+				<displayName>Birr ya Uhabeshi</displayName>
 				<displayName count="one">birr ya Uhabeshi</displayName>
 				<displayName count="other">birr za Uhabeshi</displayName>
 				<symbol>ETB</symbol>
@@ -4394,6 +4524,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Pauni ya Visiwa vya Falkland</displayName>
 				<displayName count="other">Pauni za Visiwa vya Falkland</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GBP">
 				<displayName>Pauni ya Uingereza</displayName>
@@ -4407,6 +4538,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Lari ya Georgia</displayName>
 				<displayName count="other">Lari za Georgia</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>Sedi ya Ghana</displayName>
@@ -4435,6 +4567,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">faranga ya Guinea</displayName>
 				<displayName count="other">faranga za Guinea</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>Faranga ya Gine</displayName>
@@ -4444,6 +4577,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Quetzal ya Guatemala</displayName>
 				<displayName count="other">Quetzal za Guatemala</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GYD">
 				<displayName>Dola ya Guyana</displayName>
@@ -4464,12 +4598,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Lempira ya Hondurasi</displayName>
 				<displayName count="other">Lempira za Hondurasi</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRK">
 				<displayName>Kuna ya Kroeshia</displayName>
 				<displayName count="one">Kuna ya Kroeshia</displayName>
 				<displayName count="other">Kuna za Kroeshia</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>Gourde ya Haiti</displayName>
@@ -4482,12 +4618,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Forint ya Hungaria</displayName>
 				<displayName count="other">Forint za Hungaria</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>Rupiah ya Indonesia</displayName>
 				<displayName count="one">Rupiah ya Indonesia</displayName>
 				<displayName count="other">Rupiah za Indonesia</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="ILS">
 				<displayName>Sheqel Mpya ya Israeli</displayName>
@@ -4504,9 +4642,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">₹</symbol>
 			</currency>
 			<currency type="IQD">
-				<displayName>Dinari ya Iraki</displayName>
-				<displayName count="one">Dinari ya Iraki</displayName>
-				<displayName count="other">Dinari za Iraki</displayName>
+				<displayName>Dinar ya Iraki</displayName>
+				<displayName count="one">Dinar ya Iraki</displayName>
+				<displayName count="other">Dinar za Iraki</displayName>
 				<symbol>IQD</symbol>
 			</currency>
 			<currency type="IRR">
@@ -4516,10 +4654,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>IRR</symbol>
 			</currency>
 			<currency type="ISK">
-				<displayName>Krona ya Isilandi</displayName>
-				<displayName count="one">Krona ya Isilandi</displayName>
-				<displayName count="other">Krona za Isilandi</displayName>
+				<displayName>Krona ya Aisilandi</displayName>
+				<displayName count="one">Krona ya Aisilandi</displayName>
+				<displayName count="other">Krona za Aisilandi</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="JMD">
 				<displayName>Dola ya Jamaica</displayName>
@@ -4529,9 +4668,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="JOD">
-				<displayName>Dinari ya Yordani</displayName>
-				<displayName count="one">Dinari ya Yordani</displayName>
-				<displayName count="other">Dinari za Yordani</displayName>
+				<displayName>Dinar ya Yordani</displayName>
+				<displayName count="one">Dinar ya Yordani</displayName>
+				<displayName count="other">Dinar za Yordani</displayName>
 				<symbol>JOD</symbol>
 			</currency>
 			<currency type="JPY">
@@ -4548,9 +4687,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>Ksh</symbol>
 			</currency>
 			<currency type="KGS">
-				<displayName>Som ya Kirigistani</displayName>
-				<displayName count="one">Som ya Kirigistani</displayName>
-				<displayName count="other">Som za Kirigistani</displayName>
+				<displayName>Som ya Kyrgystani</displayName>
+				<displayName count="one">Som ya Kyrgystani</displayName>
+				<displayName count="other">Som za Kyrgystani</displayName>
 				<symbol>KGS</symbol>
 			</currency>
 			<currency type="KHR">
@@ -4565,12 +4704,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">faranga ya Komoro</displayName>
 				<displayName count="other">faranga za Komoro</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>Won ya Korea Kaskazini</displayName>
 				<displayName count="one">Won ya Korea Kaskazini</displayName>
 				<displayName count="other">Won za Korea Kaskazini</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>Won ya Korea Kusini</displayName>
@@ -4580,9 +4721,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KWD">
-				<displayName>Dinari ya Kuwaiti</displayName>
-				<displayName count="one">Dinari ya Kuwaiti</displayName>
-				<displayName count="other">Dinari za Kuwaiti</displayName>
+				<displayName>Dinar ya Kuwaiti</displayName>
+				<displayName count="one">Dinar ya Kuwaiti</displayName>
+				<displayName count="other">Dinar za Kuwaiti</displayName>
 				<symbol>KWD</symbol>
 			</currency>
 			<currency type="KYD">
@@ -4611,12 +4752,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Pauni ya Lebanon</displayName>
 				<displayName count="other">Pauni za Lebanon</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
-				<displayName>Rupia ya Sirilanka</displayName>
-				<displayName count="one">Rupia ya Sirilanka</displayName>
-				<displayName count="other">Rupia za Sirilanka</displayName>
+				<displayName>Rupia ya Sri Lanka</displayName>
+				<displayName count="one">Rupia ya Sri Lanka</displayName>
+				<displayName count="other">Rupia za Sri Lanka</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>Dola ya Liberia</displayName>
@@ -4663,6 +4806,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Ariari ya Madagaska</displayName>
 				<displayName count="other">Ariari za Madagaska</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MKD">
 				<displayName>Denar ya Masedonia</displayName>
@@ -4675,6 +4819,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Kyat ya Myama</displayName>
 				<displayName count="other">Kyat za Myama</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>Tugrik ya Mongolia</displayName>
@@ -4700,6 +4845,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">rupia ya Morisi</displayName>
 				<displayName count="other">rupia za Morisi</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>Rufiyaa ya Maldivi</displayName>
@@ -4725,6 +4871,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Ringgit ya Malaysia</displayName>
 				<displayName count="other">Ringgit za Malaysia</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZM">
 				<displayName>Metikali ya Msumbiji (1980–2006)</displayName>
@@ -4756,18 +4903,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Cordoba ya Nikaragua</displayName>
 				<displayName count="other">Cordoba za Nikaragua</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NOK">
 				<displayName>Krone ya Norwe</displayName>
 				<displayName count="one">Krone ya Norwe</displayName>
 				<displayName count="other">Krone za Norwe</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>Rupia ya Nepali</displayName>
 				<displayName count="one">Rupia ya Nepali</displayName>
 				<displayName count="other">Rupia za Nepali</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>Dola ya Nyuzilandi</displayName>
@@ -4812,12 +4962,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Rupia ya Pakistani</displayName>
 				<displayName count="other">Rupia za Pakistani</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>Zloty ya Polandi</displayName>
 				<displayName count="one">Zloty ya Polandi</displayName>
 				<displayName count="other">Zloty za Polandi</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PYG">
 				<displayName>Guarani ya Paragwai</displayName>
@@ -4827,9 +4979,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">₲</symbol>
 			</currency>
 			<currency type="QAR">
-				<displayName>Rial ya Katari</displayName>
-				<displayName count="one">Rial ya Katari</displayName>
-				<displayName count="other">Rial za Katari</displayName>
+				<displayName>Rial ya Qatari</displayName>
+				<displayName count="one">Rial ya Qatari</displayName>
+				<displayName count="other">Rial za Qatari</displayName>
 				<symbol>QAR</symbol>
 			</currency>
 			<currency type="RON">
@@ -4849,12 +5001,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Ruble ya Urusi</displayName>
 				<displayName count="other">Ruble za Urusi</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RWF">
 				<displayName>Faranga ya Rwanda</displayName>
 				<displayName count="one">faranga ya Rwanda</displayName>
 				<displayName count="other">faranga za Rwanda</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>Riyal ya Saudia</displayName>
@@ -4891,6 +5045,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Krona ya Uswidi</displayName>
 				<displayName count="other">Krona za Uswidi</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>Dola ya Singapore</displayName>
@@ -4904,11 +5059,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">pauni ya Santahelena</displayName>
 				<displayName count="other">pauni za Santahelena</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SLL">
-				<displayName>Leoni</displayName>
-				<displayName count="one">leoni</displayName>
-				<displayName count="other">leoni</displayName>
+				<displayName>Leone</displayName>
+				<displayName count="one">Leone</displayName>
+				<displayName count="other">Leone</displayName>
 				<symbol>SLL</symbol>
 			</currency>
 			<currency type="SOS">
@@ -4936,12 +5092,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">dobra ya Sao Tome na Principe</displayName>
 				<displayName count="other">dobra za Sao Tome na Principe</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SYP">
 				<displayName>Pauni ya Syria</displayName>
 				<displayName count="one">Pauni ya Syria</displayName>
 				<displayName count="other">Pauni za Syria</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>Lilangeni</displayName>
@@ -4954,6 +5112,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Baht ya Tailandi</displayName>
 				<displayName count="other">Baht za Tailandi</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJS">
 				<displayName>Somoni ya Tajikistani</displayName>
@@ -4978,6 +5137,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Paʻanga ya Tonga</displayName>
 				<displayName count="other">Paʻanga za Tonga</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TRY">
 				<displayName>Lira ya Uturuki</displayName>
@@ -4985,6 +5145,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">Lira za Uturuki</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Dola ya Trinidad na Tobago</displayName>
@@ -5044,11 +5205,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Bolivar ya Venezuela</displayName>
 				<displayName count="other">Bolivar za Venezuela</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
-				<displayName>Dong ya Vietinamu</displayName>
-				<displayName count="one">Dong ya Vietinamu</displayName>
-				<displayName count="other">Dong za Vietinamu</displayName>
+				<displayName>Dong ya Vietnam</displayName>
+				<displayName count="one">Dong ya Vietnam</displayName>
+				<displayName count="other">Dong za Vietnam</displayName>
 				<symbol>₫</symbol>
 				<symbol alt="narrow" draft="contributed">₫</symbol>
 			</currency>
@@ -5075,6 +5237,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Dola ya Karibea ya Mashariki</displayName>
 				<displayName count="other">Dola za Karibea ya Mashariki</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XOF">
 				<displayName>CFA faranga za BCEAO</displayName>
@@ -5089,9 +5252,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>CFPF</symbol>
 			</currency>
 			<currency type="XXX">
-				<displayName>Fedha Zisizojulikana</displayName>
-				<displayName count="one">Fedha Zisizojulikana</displayName>
-				<displayName count="other">Fedha Zisizojulikana</displayName>
+				<displayName>Sarafu isiyojulikana</displayName>
+				<displayName count="one">sarafu isiyojulikana</displayName>
+				<displayName count="other">sarafu zisizojulikana</displayName>
 			</currency>
 			<currency type="YER">
 				<displayName>Rial ya Yemeni</displayName>
@@ -5104,6 +5267,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">randi ya Afrika Kusini</displayName>
 				<displayName count="other">randi za Afrika Kusini</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>Kwacha ya Zambia (1968–2012)</displayName>
@@ -5113,6 +5277,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">kwacha ya Zambia</displayName>
 				<displayName count="other">kwacha za Zambia</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZWD">
 				<displayName>Dola ya Zimbabwe</displayName>
@@ -5126,18 +5291,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 	<units>
 		<unitLength type="long">
 			<compoundUnit type="per">
-				<compoundUnitPattern>{0}kwa kila{1}</compoundUnitPattern>
+				<compoundUnitPattern>{0} kwa kila {1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
-				<displayName>Mvuto wa graviti</displayName>
-				<unitPattern count="one">Mvuto wa graviti {0}</unitPattern>
-				<unitPattern count="other">Mvuto wa graviti {0}</unitPattern>
+				<displayName>mvuto wa graviti</displayName>
+				<unitPattern count="one">mvuto wa graviti {0}</unitPattern>
+				<unitPattern count="other">mvuto wa graviti {0}</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
 				<displayName>mita kwa kila sekunde mraba</displayName>
 				<unitPattern count="one">mita {0} kwa kila sekunde mraba</unitPattern>
 				<unitPattern count="other">mita {0} kwa kila sekunde mraba</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>mzunguko</displayName>
+				<unitPattern count="one">mzunguko {0}</unitPattern>
+				<unitPattern count="other">mizunguko {0}</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radiani</displayName>
+				<unitPattern count="one">radiani {0}</unitPattern>
+				<unitPattern count="other">radiani {0}</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>digrii</displayName>
+				<unitPattern count="one">digrii {0}</unitPattern>
+				<unitPattern count="other">digrii {0}</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>dakika</displayName>
 				<unitPattern count="one">dakika {0}</unitPattern>
@@ -5148,173 +5328,186 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">sekunde {0}</unitPattern>
 				<unitPattern count="other">sekunde {0}</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>digrii</displayName>
-				<unitPattern count="one">digrii {0}</unitPattern>
-				<unitPattern count="other">digrii {0}</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radiani</displayName>
-				<unitPattern count="one">radiani {0}</unitPattern>
-				<unitPattern count="other">radiani {0}</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>Ekari</displayName>
-				<unitPattern count="one">Ekari {0}</unitPattern>
-				<unitPattern count="other">Ekari {0}</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>kilomita za mraba</displayName>
+				<unitPattern count="one">kilomita {0} ya mraba</unitPattern>
+				<unitPattern count="other">kilomita {0} za mraba</unitPattern>
 			</unit>
 			<unit type="area-hectare">
-				<displayName>Hektari</displayName>
-				<unitPattern count="one">Hektari {0}</unitPattern>
-				<unitPattern count="other">Hektari {0}</unitPattern>
+				<displayName>hekta</displayName>
+				<unitPattern count="one">hekta {0}</unitPattern>
+				<unitPattern count="other">hekta {0}</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>mita za mraba</displayName>
+				<unitPattern count="one">mita {0} ya mraba</unitPattern>
+				<unitPattern count="other">mita {0} za mraba</unitPattern>
+				<perUnitPattern>{0} kwa kila mita ya mraba</perUnitPattern>
 			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>sentimita mraba</displayName>
 				<unitPattern count="one">sentimita mraba {0}</unitPattern>
 				<unitPattern count="other">sentimita mraba {0}</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<displayName>futi za mraba</displayName>
-				<unitPattern count="one">Futi {0} ya mraba</unitPattern>
-				<unitPattern count="other">Futi {0} za mraba</unitPattern>
-			</unit>
-			<unit type="area-square-inch">
-				<displayName>inchi za mraba</displayName>
-				<unitPattern count="one">inchi {0} ya mraba</unitPattern>
-				<unitPattern count="other">inchi {0} za mraba</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kilomita za mraba</displayName>
-				<unitPattern count="one">Kilomita {0} ya mraba</unitPattern>
-				<unitPattern count="other">Kilomita {0} za mraba</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>mita za mraba</displayName>
-				<unitPattern count="one">Mita {0} ya mraba</unitPattern>
-				<unitPattern count="other">Mita {0} za mraba</unitPattern>
+				<perUnitPattern>{0} kwa kila sentimita mraba</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
 				<displayName>maili za mraba</displayName>
-				<unitPattern count="one">Maili {0} ya mraba</unitPattern>
-				<unitPattern count="other">Maili {0} za mraba</unitPattern>
+				<unitPattern count="one">maili {0} ya mraba</unitPattern>
+				<unitPattern count="other">maili {0} za mraba</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ekari</displayName>
+				<unitPattern count="one">ekari {0}</unitPattern>
+				<unitPattern count="other">ekari {0}</unitPattern>
 			</unit>
 			<unit type="area-square-yard">
 				<displayName>yadi za mraba</displayName>
 				<unitPattern count="one">yadi {0} ya mraba</unitPattern>
 				<unitPattern count="other">yadi {0} za mraba</unitPattern>
 			</unit>
+			<unit type="area-square-foot">
+				<displayName>futi za mraba</displayName>
+				<unitPattern count="one">futi {0} ya mraba</unitPattern>
+				<unitPattern count="other">futi {0} za mraba</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>inchi za mraba</displayName>
+				<unitPattern count="one">inchi {0} ya mraba</unitPattern>
+				<unitPattern count="other">inchi {0} za mraba</unitPattern>
+				<perUnitPattern>{0} kwa kila inchi ya mraba</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>karati</displayName>
+				<unitPattern count="one">karati {0}</unitPattern>
+				<unitPattern count="other">karati {0}</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName>lita kwa kilomita</displayName>
+				<displayName>lita kwa kila kilomita</displayName>
 				<unitPattern count="one">lita {0} kwa kilomita</unitPattern>
 				<unitPattern count="other">lita {0} kwa kilomita</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>lita kwa kilomita 100</displayName>
+				<unitPattern count="one">lita {0} kwa kilomita 100</unitPattern>
+				<unitPattern count="other">lita {0} kwa kilomita 100</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>maili kwa kila galoni</displayName>
 				<unitPattern count="one">maili {0} kwa kila galoni</unitPattern>
 				<unitPattern count="other">maili {0} kwa kila galoni</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>biti</displayName>
-				<unitPattern count="one">biti {0}</unitPattern>
-				<unitPattern count="other">biti {0}</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>baiti</displayName>
-				<unitPattern count="one">baiti {0}</unitPattern>
-				<unitPattern count="other">baiti {0}</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabiti</displayName>
-				<unitPattern count="one">gigabiti {0}</unitPattern>
-				<unitPattern count="other">gigabiti {0}</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabaiti</displayName>
-				<unitPattern count="one">Gigabaiti {0}</unitPattern>
-				<unitPattern count="other">Gigabaiti {0}</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobiti</displayName>
-				<unitPattern count="one">kilobiti {0}</unitPattern>
-				<unitPattern count="other">kilobiti {0}</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobaiti</displayName>
-				<unitPattern count="one">kilobaiti {0}</unitPattern>
-				<unitPattern count="other">kilobaiti {0}</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabiti</displayName>
-				<unitPattern count="one">megabiti {0}</unitPattern>
-				<unitPattern count="other">megabiti {0}</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabaiti</displayName>
-				<unitPattern count="one">Megabaiti {0}</unitPattern>
-				<unitPattern count="other">Megabaiti {0}</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>terabaiti</displayName>
+				<unitPattern count="one">terabaiti {0}</unitPattern>
+				<unitPattern count="other">terabaiti {0}</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>terabiti</displayName>
 				<unitPattern count="one">terabiti {0}</unitPattern>
 				<unitPattern count="other">terabiti {0}</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>terabaiti</displayName>
-				<unitPattern count="one">terabaiti {0}</unitPattern>
-				<unitPattern count="other">terabaiti {0}</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>gigabaiti</displayName>
+				<unitPattern count="one">gigabaiti {0}</unitPattern>
+				<unitPattern count="other">gigabaiti {0}</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabiti</displayName>
+				<unitPattern count="one">gigabiti {0}</unitPattern>
+				<unitPattern count="other">gigabiti {0}</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabaiti</displayName>
+				<unitPattern count="one">megabaiti {0}</unitPattern>
+				<unitPattern count="other">megabaiti {0}</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabiti</displayName>
+				<unitPattern count="one">megabiti {0}</unitPattern>
+				<unitPattern count="other">megabiti {0}</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobaiti</displayName>
+				<unitPattern count="one">kilobaiti {0}</unitPattern>
+				<unitPattern count="other">kilobaiti {0}</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobiti</displayName>
+				<unitPattern count="one">kilobiti {0}</unitPattern>
+				<unitPattern count="other">kilobiti {0}</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>baiti</displayName>
+				<unitPattern count="one">baiti {0}</unitPattern>
+				<unitPattern count="other">baiti {0}</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>biti</displayName>
+				<unitPattern count="one">biti {0}</unitPattern>
+				<unitPattern count="other">biti {0}</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>karne</displayName>
+				<unitPattern count="one">karne ya {0}</unitPattern>
+				<unitPattern count="other">karne za {0}</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>miaka</displayName>
+				<unitPattern count="one">mwaka {0}</unitPattern>
+				<unitPattern count="other">miaka {0}</unitPattern>
+				<perUnitPattern>{0} kwa mwaka</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>miezi</displayName>
+				<unitPattern count="one">mwezi {0}</unitPattern>
+				<unitPattern count="other">miezi {0}</unitPattern>
+				<perUnitPattern>{0} kwa mwezi</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>wiki</displayName>
+				<unitPattern count="one">wiki {0}</unitPattern>
+				<unitPattern count="other">wiki {0}</unitPattern>
+				<perUnitPattern>{0} kwa wiki</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>siku</displayName>
 				<unitPattern count="one">siku {0}</unitPattern>
 				<unitPattern count="other">siku {0}</unitPattern>
+				<perUnitPattern>{0} kwa siku</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>saa</displayName>
 				<unitPattern count="one">saa {0}</unitPattern>
 				<unitPattern count="other">saa {0}</unitPattern>
-				<perUnitPattern>{0}/h</perUnitPattern>
+				<perUnitPattern>{0} kwa saa</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikrosekunde</displayName>
-				<unitPattern count="one">mikrosekunde {0}</unitPattern>
-				<unitPattern count="other">mikrosekunde {0}</unitPattern>
+			<unit type="duration-minute">
+				<displayName>dakika</displayName>
+				<unitPattern count="one">dakika {0}</unitPattern>
+				<unitPattern count="other">dakika {0}</unitPattern>
+				<perUnitPattern>{0} kwa kila dakika</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>sekunde</displayName>
+				<unitPattern count="one">sekunde {0}</unitPattern>
+				<unitPattern count="other">sekunde {0}</unitPattern>
+				<perUnitPattern>{0} kwa kila sekunde</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>millisekunde</displayName>
 				<unitPattern count="one">millisekunde {0}</unitPattern>
 				<unitPattern count="other">millisekunde {0}</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>dakika</displayName>
-				<unitPattern count="one">dakika {0}</unitPattern>
-				<unitPattern count="other">dakika {0}</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>miezi</displayName>
-				<unitPattern count="one">mwezi {0}</unitPattern>
-				<unitPattern count="other">miezi {0}</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>mikrosekunde</displayName>
+				<unitPattern count="one">mikrosekunde {0}</unitPattern>
+				<unitPattern count="other">mikrosekunde {0}</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>nanosekunde</displayName>
 				<unitPattern count="one">nanosekunde {0}</unitPattern>
 				<unitPattern count="other">nanosekunde {0}</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>sekunde</displayName>
-				<unitPattern count="one">sekunde {0}</unitPattern>
-				<unitPattern count="other">sekunde {0}</unitPattern>
-				<perUnitPattern>{0}/s</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>wiki</displayName>
-				<unitPattern count="one">wiki {0}</unitPattern>
-				<unitPattern count="other">wiki {0}</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>miaka</displayName>
-				<unitPattern count="one">mwaka {0}</unitPattern>
-				<unitPattern count="other">miaka {0}</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>ampea</displayName>
 				<unitPattern count="one">ampea {0}</unitPattern>
@@ -5335,6 +5528,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">volti {0}</unitPattern>
 				<unitPattern count="other">volti {0}</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokalori</displayName>
+				<unitPattern count="one">kilokalori {0}</unitPattern>
+				<unitPattern count="other">kilokalori {0}</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kalori</displayName>
 				<unitPattern count="one">kalori {0}</unitPattern>
@@ -5345,21 +5543,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">kalori {0}</unitPattern>
 				<unitPattern count="other">kalori {0}</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>jouli</displayName>
-				<unitPattern count="one">jouli {0}</unitPattern>
-				<unitPattern count="other">jouli {0}</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokalori</displayName>
-				<unitPattern count="one">kilokalori {0}</unitPattern>
-				<unitPattern count="other">kilokalori {0}</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojuli</displayName>
 				<unitPattern count="one">kilojuli {0}</unitPattern>
 				<unitPattern count="other">kilojuli {0}</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>jouli</displayName>
+				<unitPattern count="one">jouli {0}</unitPattern>
+				<unitPattern count="other">jouli {0}</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilowati kwa saa</displayName>
 				<unitPattern count="one">kilowati {0} kwa saa</unitPattern>
@@ -5370,200 +5563,204 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">gigahezi {0}</unitPattern>
 				<unitPattern count="other">gigahezi {0}</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hezi</displayName>
-				<unitPattern count="one">hezi {0}</unitPattern>
-				<unitPattern count="other">hezi {0}</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megahezi</displayName>
+				<unitPattern count="one">megahezi {0}</unitPattern>
+				<unitPattern count="other">megahezi {0}</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kilohezi</displayName>
 				<unitPattern count="one">kilohezi {0}</unitPattern>
 				<unitPattern count="other">kilohezi {0}</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megahezi</displayName>
-				<unitPattern count="one">megahezi {0}</unitPattern>
-				<unitPattern count="other">megahezi {0}</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hezi</displayName>
+				<unitPattern count="one">hezi {0}</unitPattern>
+				<unitPattern count="other">hezi {0}</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>vipimo vya astronomia</displayName>
-				<unitPattern count="one">kipimo {0} cha astronomia</unitPattern>
-				<unitPattern count="other">vipimo {0} vya astronomia</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilomita</displayName>
+				<unitPattern count="one">kilomita {0}</unitPattern>
+				<unitPattern count="other">kilomita {0}</unitPattern>
+				<perUnitPattern>{0} kwa kila kilomita</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>Sentimita</displayName>
-				<unitPattern count="one">Sentimita {0}</unitPattern>
-				<unitPattern count="other">Sentimita {0}</unitPattern>
+			<unit type="length-meter">
+				<displayName>mita</displayName>
+				<unitPattern count="one">mita {0}</unitPattern>
+				<unitPattern count="other">mita {0}</unitPattern>
+				<perUnitPattern>{0} kwa kila mita</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>desimita</displayName>
 				<unitPattern count="one">desimita {0}</unitPattern>
 				<unitPattern count="other">desimita {0}</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>Futi</displayName>
-				<unitPattern count="one">Futi {0}</unitPattern>
-				<unitPattern count="other">Futi {0}</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>sentimita</displayName>
+				<unitPattern count="one">sentimita {0}</unitPattern>
+				<unitPattern count="other">sentimita {0}</unitPattern>
+				<perUnitPattern>{0} kwa kila sentimita</perUnitPattern>
 			</unit>
-			<unit type="length-inch">
-				<displayName>Inchi</displayName>
-				<unitPattern count="one">Inchi {0}</unitPattern>
-				<unitPattern count="other">Inchi {0}</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>Kilomita</displayName>
-				<unitPattern count="one">Kilomita {0}</unitPattern>
-				<unitPattern count="other">Kilomita {0}</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>Miaka ya mwanga</displayName>
-				<unitPattern count="one">Mwaka wa mwanga {0}</unitPattern>
-				<unitPattern count="other">Miaka ya mwanga {0}</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>Mita</displayName>
-				<unitPattern count="one">Mita {0}</unitPattern>
-				<unitPattern count="other">Mita {0}</unitPattern>
+			<unit type="length-millimeter">
+				<displayName>milimita</displayName>
+				<unitPattern count="one">milimita {0}</unitPattern>
+				<unitPattern count="other">milimita {0}</unitPattern>
 			</unit>
 			<unit type="length-micrometer">
 				<displayName>mikromita</displayName>
 				<unitPattern count="one">mikromita {0}</unitPattern>
 				<unitPattern count="other">mikromita {0}</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName>Maili</displayName>
-				<unitPattern count="one">Maili {0}</unitPattern>
-				<unitPattern count="other">Maili {0}</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>Millimita</displayName>
-				<unitPattern count="one">Millimita {0}</unitPattern>
-				<unitPattern count="other">Millimita {0}</unitPattern>
-			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanomita</displayName>
 				<unitPattern count="one">nanomita {0}</unitPattern>
 				<unitPattern count="other">nanomita {0}</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>maili za kibaharia</displayName>
-				<unitPattern count="one">maili {0} ya kibaharia</unitPattern>
-				<unitPattern count="other">maili {0} za kibaharia</unitPattern>
+			<unit type="length-picometer">
+				<displayName>pikomita</displayName>
+				<unitPattern count="one">pikomita {0}</unitPattern>
+				<unitPattern count="other">pikomita {0}</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>maili</displayName>
+				<unitPattern count="one">maili {0}</unitPattern>
+				<unitPattern count="other">maili {0}</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>yadi</displayName>
+				<unitPattern count="one">yadi {0}</unitPattern>
+				<unitPattern count="other">yadi {0}</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>futi</displayName>
+				<unitPattern count="one">futi {0}</unitPattern>
+				<unitPattern count="other">futi {0}</unitPattern>
+				<perUnitPattern>{0} kwa kila futi</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>inchi</displayName>
+				<unitPattern count="one">inchi {0}</unitPattern>
+				<unitPattern count="other">inchi {0}</unitPattern>
+				<perUnitPattern>{0} kwa kila inchi</perUnitPattern>
 			</unit>
 			<unit type="length-parsec">
 				<displayName>parsecs</displayName>
 				<unitPattern count="one">parsec {0}</unitPattern>
 				<unitPattern count="other">parsecs {0}</unitPattern>
 			</unit>
-			<unit type="length-picometer">
-				<displayName>Pikomita</displayName>
-				<unitPattern count="one">Pikomita {0}</unitPattern>
-				<unitPattern count="other">Pikomita {0}</unitPattern>
+			<unit type="length-light-year">
+				<displayName>miaka ya mwanga</displayName>
+				<unitPattern count="one">miaka ya mwanga {0}</unitPattern>
+				<unitPattern count="other">miaka ya mwanga {0}</unitPattern>
 			</unit>
-			<unit type="length-yard">
-				<displayName>Yadi</displayName>
-				<unitPattern count="one">Yadi {0}</unitPattern>
-				<unitPattern count="other">Yadi {0}</unitPattern>
+			<unit type="length-astronomical-unit">
+				<displayName>vipimo vya astronomia</displayName>
+				<unitPattern count="one">kipimo {0} cha astronomia</unitPattern>
+				<unitPattern count="other">vipimo {0} vya astronomia</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>maili za kibaharia</displayName>
+				<unitPattern count="one">maili {0} ya kibaharia</unitPattern>
+				<unitPattern count="other">maili {0} za kibaharia</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
 			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">lux {0}</unitPattern>
 				<unitPattern count="other">lux {0}</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karati</displayName>
-				<unitPattern count="one">karati {0}</unitPattern>
-				<unitPattern count="other">karati {0}</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>Gramu</displayName>
-				<unitPattern count="one">Gramu {0}</unitPattern>
-				<unitPattern count="other">Gramu {0}</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>Kilogramu</displayName>
-				<unitPattern count="one">Kilogramu {0}</unitPattern>
-				<unitPattern count="other">Kilogramu {0}</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>tani mita</displayName>
 				<unitPattern count="one">tani mita {0}</unitPattern>
 				<unitPattern count="other">tani mita {0}</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mikrogramu</displayName>
-				<unitPattern count="one">mikrogramu {0}</unitPattern>
-				<unitPattern count="other">mikrogramu {0}</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogramu</displayName>
+				<unitPattern count="one">kilogramu {0}</unitPattern>
+				<unitPattern count="other">kilogramu {0}</unitPattern>
+				<perUnitPattern>{0} kwa kila kilogramu</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gramu</displayName>
+				<unitPattern count="one">gramu {0}</unitPattern>
+				<unitPattern count="other">gramu {0}</unitPattern>
+				<perUnitPattern>{0} kwa kila gramu</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>miligramu</displayName>
 				<unitPattern count="one">miligramu {0}</unitPattern>
 				<unitPattern count="other">miligramu {0}</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>Aunsi</displayName>
-				<unitPattern count="one">Aunsi {0}</unitPattern>
-				<unitPattern count="other">Aunsi {0}</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>tola aunsi</displayName>
-				<unitPattern count="one">tola aunsi {0}</unitPattern>
-				<unitPattern count="other">tola aunsi {0}</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>Ratili</displayName>
-				<unitPattern count="one">Ratili {0}</unitPattern>
-				<unitPattern count="other">Ratili {0}</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>mikrogramu</displayName>
+				<unitPattern count="one">mikrogramu {0}</unitPattern>
+				<unitPattern count="other">mikrogramu {0}</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tani</displayName>
 				<unitPattern count="one">tani {0}</unitPattern>
 				<unitPattern count="other">tani {0}</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>ratili</displayName>
+				<unitPattern count="one">ratili {0}</unitPattern>
+				<unitPattern count="other">ratili {0}</unitPattern>
+				<perUnitPattern>{0} kwa kila ratili</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>aunsi</displayName>
+				<unitPattern count="one">aunsi {0}</unitPattern>
+				<unitPattern count="other">aunsi {0}</unitPattern>
+				<perUnitPattern>{0} kwa kila aunsi</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>tola aunsi</displayName>
+				<unitPattern count="one">tola aunsi {0}</unitPattern>
+				<unitPattern count="other">tola aunsi {0}</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karati</displayName>
+				<unitPattern count="one">karati {0}</unitPattern>
+				<unitPattern count="other">karati {0}</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigawati</displayName>
 				<unitPattern count="one">gigawati {0}</unitPattern>
 				<unitPattern count="other">gigawati {0}</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>Kipimo cha Hospawa</displayName>
-				<unitPattern count="one">Kipimo cha Hospawa {0}</unitPattern>
-				<unitPattern count="other">Kipimo cha Hospawa {0}</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>Kilowati</displayName>
-				<unitPattern count="one">Kilowati {0}</unitPattern>
-				<unitPattern count="other">Kilowati {0}</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>megawati</displayName>
 				<unitPattern count="one">megawati {0}</unitPattern>
 				<unitPattern count="other">megawati {0}</unitPattern>
 			</unit>
+			<unit type="power-kilowatt">
+				<displayName>kilowati</displayName>
+				<unitPattern count="one">kilowati {0}</unitPattern>
+				<unitPattern count="other">kilowati {0}</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>wati</displayName>
+				<unitPattern count="one">wati {0}</unitPattern>
+				<unitPattern count="other">wati {0}</unitPattern>
+			</unit>
 			<unit type="power-milliwatt">
 				<displayName>miliwati</displayName>
 				<unitPattern count="one">miliwati {0}</unitPattern>
 				<unitPattern count="other">miliwati {0}</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName>Wati</displayName>
-				<unitPattern count="one">Wati {0}</unitPattern>
-				<unitPattern count="other">Wati {0}</unitPattern>
+			<unit type="power-horsepower">
+				<displayName>kipimo cha hospawa</displayName>
+				<unitPattern count="one">kipimo cha hospawa {0}</unitPattern>
+				<unitPattern count="other">kipimo cha hospawa {0}</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
-				<displayName>Hektopaskali</displayName>
-				<unitPattern count="one">Hektopaskali {0}</unitPattern>
-				<unitPattern count="other">Hektopaskali {0}</unitPattern>
-			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>Inchi za zebaki</displayName>
-				<unitPattern count="one">Inchi za zebaki {0}</unitPattern>
-				<unitPattern count="other">Inchi za zebaki {0}</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>Kipimo cha milibari</displayName>
-				<unitPattern count="one">Kipimo cha milibari {0}</unitPattern>
-				<unitPattern count="other">Kipimo cha milibari {0}</unitPattern>
+				<displayName>hektopaskali</displayName>
+				<unitPattern count="one">hektopaskali {0}</unitPattern>
+				<unitPattern count="other">hektopaskali {0}</unitPattern>
 			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>milimita za zebaki</displayName>
@@ -5575,55 +5772,82 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">pauni {0} kwa kila inchi mraba</unitPattern>
 				<unitPattern count="other">pauni {0} kwa kila inchi mraba</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karati</displayName>
-				<unitPattern count="one">karati {0}</unitPattern>
-				<unitPattern count="other">karati {0}</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inchi za zebaki</displayName>
+				<unitPattern count="one">inchi {0} ya zebaki</unitPattern>
+				<unitPattern count="other">inchi {0} za zebaki</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>kipimo cha milibari</displayName>
+				<unitPattern count="one">kipimo cha milibari {0}</unitPattern>
+				<unitPattern count="other">kipimo cha milibari {0}</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilomita kwa saa</displayName>
-				<unitPattern count="one">Kilomita {0} kwa saa</unitPattern>
-				<unitPattern count="other">Kilomita {0} kwa saa</unitPattern>
+				<unitPattern count="one">kilomita {0} kwa saa</unitPattern>
+				<unitPattern count="other">kilomita {0} kwa saa</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
 				<displayName>mita kwa kila sekunde</displayName>
-				<unitPattern count="one">Mita {0} kwa sekunde</unitPattern>
-				<unitPattern count="other">Mita {0} kwa sekunde</unitPattern>
+				<unitPattern count="one">mita {0} kwa sekunde</unitPattern>
+				<unitPattern count="other">mita {0} kwa sekunde</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
 				<displayName>maili kwa kila saa</displayName>
-				<unitPattern count="one">Maili {0} kwa saa</unitPattern>
-				<unitPattern count="other">Maili {0} kwa saa</unitPattern>
+				<unitPattern count="one">maili {0} kwa saa</unitPattern>
+				<unitPattern count="other">maili {0} kwa saa</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>noti</displayName>
+				<unitPattern count="one">noti {0}</unitPattern>
+				<unitPattern count="other">noti {0}</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
-				<displayName>Nyuzi za Selisiasi</displayName>
-				<unitPattern count="one">Nyuzi za Selisiasi {0}</unitPattern>
-				<unitPattern count="other">Nyuzi za Selisiasi {0}</unitPattern>
+				<displayName>nyuzi za selisiasi</displayName>
+				<unitPattern count="one">nyuzi ya selisiasi {0}</unitPattern>
+				<unitPattern count="other">nyuzi za selisiasi {0}</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
-				<displayName>Nyuzi za Farenheiti</displayName>
-				<unitPattern count="one">Nyuzi za Farenheiti {0}</unitPattern>
-				<unitPattern count="other">Nyuzi za Farenheiti {0}</unitPattern>
+				<displayName>nyuzi za farenheiti</displayName>
+				<unitPattern count="one">nyuzi za farenheiti {0}</unitPattern>
+				<unitPattern count="other">nyuzi za farenheiti {0}</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
 				<displayName>kelvini</displayName>
 				<unitPattern count="one">kelvini {0}</unitPattern>
 				<unitPattern count="other">kelvini {0}</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ekari futi</displayName>
-				<unitPattern count="one">ekari futi {0}</unitPattern>
-				<unitPattern count="other">ekari futi {0}</unitPattern>
+			<unit type="volume-cubic-kilometer">
+				<displayName>kilomita za ujazo</displayName>
+				<unitPattern count="one">kilomita {0} ya ujazo</unitPattern>
+				<unitPattern count="other">kilomita {0} za ujazo</unitPattern>
 			</unit>
-			<unit type="volume-centiliter">
-				<displayName>sentilita</displayName>
-				<unitPattern count="one">sentilita {0}</unitPattern>
-				<unitPattern count="other">sentilita {0}</unitPattern>
+			<unit type="volume-cubic-meter">
+				<displayName>mita za ujazo</displayName>
+				<unitPattern count="one">mita {0} ya ujazo</unitPattern>
+				<unitPattern count="other">mita {0} za ujazo</unitPattern>
+				<perUnitPattern>{0} kwa kila mita ya ujazo</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-centimeter">
 				<displayName>sentimita za ujazo</displayName>
 				<unitPattern count="one">sentimita {0} ya ujazo</unitPattern>
 				<unitPattern count="other">sentimita {0} za ujazo</unitPattern>
+				<perUnitPattern>{0} kwa kila sentimita ya ujazo</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>maili za ujazo</displayName>
+				<unitPattern count="one">maili {0} ya ujazo</unitPattern>
+				<unitPattern count="other">maili {0} za ujazo</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>yadi za ujazo</displayName>
+				<unitPattern count="one">yadi {0} ya ujazo</unitPattern>
+				<unitPattern count="other">yadi {0} za ujazo</unitPattern>
 			</unit>
 			<unit type="volume-cubic-foot">
 				<displayName>futi za ujazo</displayName>
@@ -5635,45 +5859,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">inchi {0} ya ujazo</unitPattern>
 				<unitPattern count="other">inchi {0} za ujazo</unitPattern>
 			</unit>
-			<unit type="volume-cubic-kilometer">
-				<displayName>kilomita za ujazo</displayName>
-				<unitPattern count="one">Kilomita {0} ya ujazo</unitPattern>
-				<unitPattern count="other">Kilomita {0} ya ujazo</unitPattern>
-			</unit>
-			<unit type="volume-cubic-meter">
-				<displayName>mita za ujazo</displayName>
-				<unitPattern count="one">mita {0} ya ujazo</unitPattern>
-				<unitPattern count="other">mita {0} za ujazo</unitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<displayName>maili za ujazo</displayName>
-				<unitPattern count="one">Maili {0} ya ujazo</unitPattern>
-				<unitPattern count="other">Maili {0} ya ujazo</unitPattern>
-			</unit>
-			<unit type="volume-cubic-yard">
-				<displayName>yadi za ujazo</displayName>
-				<unitPattern count="one">yadi {0} ya ujazo</unitPattern>
-				<unitPattern count="other">yadi {0} za ujazo</unitPattern>
-			</unit>
-			<unit type="volume-cup">
-				<displayName>vikombe</displayName>
-				<unitPattern count="one">kikombe {0}</unitPattern>
-				<unitPattern count="other">vikombe {0}</unitPattern>
-			</unit>
-			<unit type="volume-deciliter">
-				<displayName>desilita</displayName>
-				<unitPattern count="one">desilita {0}</unitPattern>
-				<unitPattern count="other">desilita {0}</unitPattern>
-			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>aunsi za ujazo</displayName>
-				<unitPattern count="one">aunsi {0} ya ujazo</unitPattern>
-				<unitPattern count="other">aunsi {0} za ujazo</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>galoni</displayName>
-				<unitPattern count="one">galoni {0}</unitPattern>
-				<unitPattern count="other">galoni {0}</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megalita</displayName>
+				<unitPattern count="one">megalita {0}</unitPattern>
+				<unitPattern count="other">megalita {0}</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hektolita</displayName>
@@ -5681,30 +5870,67 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">hektolita {0}</unitPattern>
 			</unit>
 			<unit type="volume-liter">
-				<displayName>Lita</displayName>
-				<unitPattern count="one">Lita {0}</unitPattern>
-				<unitPattern count="other">Lita {0}</unitPattern>
+				<displayName>lita</displayName>
+				<unitPattern count="one">lita {0}</unitPattern>
+				<unitPattern count="other">lita {0}</unitPattern>
+				<perUnitPattern>{0} kwa kila lita</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalita</displayName>
-				<unitPattern count="one">megalita {0}</unitPattern>
-				<unitPattern count="other">megalita {0}</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>desilita</displayName>
+				<unitPattern count="one">desilita {0}</unitPattern>
+				<unitPattern count="other">desilita {0}</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>sentilita</displayName>
+				<unitPattern count="one">sentilita {0}</unitPattern>
+				<unitPattern count="other">sentilita {0}</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mililita</displayName>
 				<unitPattern count="one">mililita {0}</unitPattern>
 				<unitPattern count="other">mililita {0}</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>painti</displayName>
-				<unitPattern count="one">painti {0}</unitPattern>
-				<unitPattern count="other">painti {0}</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>painti za mizani</displayName>
+				<unitPattern count="one">painti {0} ya mizani</unitPattern>
+				<unitPattern count="other">painti {0} za mizani</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>vikombe vya mizani</displayName>
+				<unitPattern count="one">kikombe {0} cha mizani</unitPattern>
+				<unitPattern count="other">vikombe {0} vya mizani</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ekari futi</displayName>
+				<unitPattern count="one">ekari futi {0}</unitPattern>
+				<unitPattern count="other">ekari futi {0}</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galoni</displayName>
+				<unitPattern count="one">galoni {0}</unitPattern>
+				<unitPattern count="other">galoni {0}</unitPattern>
+				<perUnitPattern>{0} kwa kila galoni</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>kwati</displayName>
 				<unitPattern count="one">kwati {0}</unitPattern>
 				<unitPattern count="other">kwati {0}</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>painti</displayName>
+				<unitPattern count="one">painti {0}</unitPattern>
+				<unitPattern count="other">painti {0}</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>vikombe</displayName>
+				<unitPattern count="one">kikombe {0}</unitPattern>
+				<unitPattern count="other">vikombe {0}</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>aunsi za ujazo</displayName>
+				<unitPattern count="one">aunsi {0} ya ujazo</unitPattern>
+				<unitPattern count="other">aunsi {0} za ujazo</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>vijiko vikubwa</displayName>
 				<unitPattern count="one">kijiko {0} kikubwa</unitPattern>
@@ -5715,13 +5941,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">kijiko {0} kidogo</unitPattern>
 				<unitPattern count="other">vijiko {0} vidogo</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
 				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
-				<displayName>Mvuto wa graviti</displayName>
+				<displayName>mvuto wa graviti</displayName>
 				<unitPattern count="one">G {0}</unitPattern>
 				<unitPattern count="other">G {0}</unitPattern>
 			</unit>
@@ -5730,6 +5962,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">m {0}/s²</unitPattern>
 				<unitPattern count="other">m {0}/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>mzunguko</displayName>
+				<unitPattern count="one">mzunguko {0}</unitPattern>
+				<unitPattern count="other">mizunguko {0}</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radiani</displayName>
+				<unitPattern count="one">radiani {0}</unitPattern>
+				<unitPattern count="other">radiani {0}</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>digrii</displayName>
+				<unitPattern count="one">digrii {0}</unitPattern>
+				<unitPattern count="other">digrii {0}</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>dakika</displayName>
 				<unitPattern count="one">dakika {0}</unitPattern>
@@ -5740,173 +5987,186 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">sekunde {0}</unitPattern>
 				<unitPattern count="other">sekunde {0}</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>digrii</displayName>
-				<unitPattern count="one">digrii {0}</unitPattern>
-				<unitPattern count="other">Digrii {0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radiani</displayName>
-				<unitPattern count="one">radiani {0}</unitPattern>
-				<unitPattern count="other">radiani {0}</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>Ekari</displayName>
-				<unitPattern count="one">Ekari {0}</unitPattern>
-				<unitPattern count="other">Ekari {0}</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>kilomita za mraba</displayName>
+				<unitPattern count="one">km² {0}</unitPattern>
+				<unitPattern count="other">km² {0}</unitPattern>
 			</unit>
 			<unit type="area-hectare">
-				<displayName>Hektari</displayName>
-				<unitPattern count="one">Hektari {0}</unitPattern>
-				<unitPattern count="other">Hektari {0}</unitPattern>
+				<displayName>hekta</displayName>
+				<unitPattern count="one">hekta {0}</unitPattern>
+				<unitPattern count="other">hekta {0}</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>mita za mraba</displayName>
+				<unitPattern count="one">mita {0} ya mraba</unitPattern>
+				<unitPattern count="other">m² {0}</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
 			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>sentimita mraba</displayName>
-				<unitPattern count="one">sentimita mraba {0}</unitPattern>
-				<unitPattern count="other">sentimita mraba {0}</unitPattern>
+				<unitPattern count="one">cm² {0}</unitPattern>
+				<unitPattern count="other">cm² {0}</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>maili za mraba</displayName>
+				<unitPattern count="one">maili {0} ya mraba</unitPattern>
+				<unitPattern count="other">maili {0} za mraba</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ekari</displayName>
+				<unitPattern count="one">ekari {0}</unitPattern>
+				<unitPattern count="other">ekari {0}</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yadi za mraba</displayName>
+				<unitPattern count="one">yadi {0} ya mraba</unitPattern>
+				<unitPattern count="other">yadi {0} za mraba</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
-				<displayName>ft²</displayName>
+				<displayName>futi za mraba</displayName>
 				<unitPattern count="one">ft² {0}</unitPattern>
 				<unitPattern count="other">ft² {0}</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
 				<displayName>inchi za mraba</displayName>
-				<unitPattern count="one">inchi {0} ya mraba</unitPattern>
-				<unitPattern count="other">inchi {0} za mraba</unitPattern>
+				<unitPattern count="one">in² {0}</unitPattern>
+				<unitPattern count="other">in² {0}</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">km² {0}</unitPattern>
-				<unitPattern count="other">km² {0}</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">m² {0}</unitPattern>
-				<unitPattern count="other">m² {0}</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">mi² {0}</unitPattern>
-				<unitPattern count="other">mi² {0}</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">yd² {0}</unitPattern>
-				<unitPattern count="other">yd² {0}</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karati</displayName>
+				<unitPattern count="one">karati {0}</unitPattern>
+				<unitPattern count="other">karati {0}</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName>L/km</displayName>
+				<displayName>lita kwa kila kilomita</displayName>
 				<unitPattern count="one">lita {0} kwa kilomita</unitPattern>
 				<unitPattern count="other">lita {0} kwa kilomita</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>lita kwa kilomita 100</displayName>
+				<unitPattern count="one">lita {0} kwa kilomita 100</unitPattern>
+				<unitPattern count="other">lita {0} kwa kilomita 100</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>maili kwa kila galoni</displayName>
 				<unitPattern count="one">maili {0} kwa kila galoni</unitPattern>
 				<unitPattern count="other">maili {0} kwa kila galoni</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>biti</displayName>
-				<unitPattern count="one">biti {0}</unitPattern>
-				<unitPattern count="other">biti {0}</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>baiti</displayName>
-				<unitPattern count="one">baiti {0}</unitPattern>
-				<unitPattern count="other">baiti {0}</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabiti</displayName>
-				<unitPattern count="one">gigabiti {0}</unitPattern>
-				<unitPattern count="other">gigabiti {0}</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">GB {0}</unitPattern>
-				<unitPattern count="other">GB {0}</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobiti</displayName>
-				<unitPattern count="one">kilobiti {0}</unitPattern>
-				<unitPattern count="other">kilobiti {0}</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobaiti</displayName>
-				<unitPattern count="one">kilobaiti {0}</unitPattern>
-				<unitPattern count="other">kilobaiti {0}</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabiti</displayName>
-				<unitPattern count="one">megabiti {0}</unitPattern>
-				<unitPattern count="other">megabiti {0}</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">MB {0}</unitPattern>
-				<unitPattern count="other">MB {0}</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>terabaiti</displayName>
+				<unitPattern count="one">terabaiti {0}</unitPattern>
+				<unitPattern count="other">terabaiti {0}</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>terabiti</displayName>
 				<unitPattern count="one">terabiti {0}</unitPattern>
 				<unitPattern count="other">terabiti {0}</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>terabaiti</displayName>
-				<unitPattern count="one">terabaiti {0}</unitPattern>
-				<unitPattern count="other">terabaiti {0}</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">GB {0}</unitPattern>
+				<unitPattern count="other">GB {0}</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabiti</displayName>
+				<unitPattern count="one">gigabiti {0}</unitPattern>
+				<unitPattern count="other">gigabiti {0}</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">MB {0}</unitPattern>
+				<unitPattern count="other">MB {0}</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">megabiti {0}</unitPattern>
+				<unitPattern count="other">megabiti {0}</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobaiti</displayName>
+				<unitPattern count="one">kilobaiti {0}</unitPattern>
+				<unitPattern count="other">kilobaiti {0}</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobiti</displayName>
+				<unitPattern count="one">kilobiti {0}</unitPattern>
+				<unitPattern count="other">kilobiti {0}</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>baiti</displayName>
+				<unitPattern count="one">baiti {0}</unitPattern>
+				<unitPattern count="other">baiti {0}</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>biti</displayName>
+				<unitPattern count="one">biti {0}</unitPattern>
+				<unitPattern count="other">biti {0}</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>karne</displayName>
+				<unitPattern count="one">karne ya {0}</unitPattern>
+				<unitPattern count="other">karne za {0}</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>miaka</displayName>
+				<unitPattern count="one">mwaka {0}</unitPattern>
+				<unitPattern count="other">miaka {0}</unitPattern>
+				<perUnitPattern>{0} kwa mwaka</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>miezi</displayName>
+				<unitPattern count="one">mwezi {0}</unitPattern>
+				<unitPattern count="other">miezi {0}</unitPattern>
+				<perUnitPattern>{0} kwa mwezi</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>wiki</displayName>
+				<unitPattern count="one">wiki {0}</unitPattern>
+				<unitPattern count="other">wiki {0}</unitPattern>
+				<perUnitPattern>{0} kwa wiki</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>siku</displayName>
 				<unitPattern count="one">siku {0}</unitPattern>
 				<unitPattern count="other">siku {0}</unitPattern>
+				<perUnitPattern>{0} kwa siku</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>saa</displayName>
 				<unitPattern count="one">saa {0}</unitPattern>
 				<unitPattern count="other">saa {0}</unitPattern>
-				<perUnitPattern>{0}/h</perUnitPattern>
+				<perUnitPattern>{0} kwa saa</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>dakika</displayName>
+				<unitPattern count="one">dakika {0}</unitPattern>
+				<unitPattern count="other">dakika {0}</unitPattern>
+				<perUnitPattern>{0} kwa kila dakika</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>sekunde</displayName>
+				<unitPattern count="one">sekunde {0}</unitPattern>
+				<unitPattern count="other">sekunde {0}</unitPattern>
+				<perUnitPattern>{0} kwa kila sekunde</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>millisekunde</displayName>
+				<unitPattern count="one">millisekunde {0}</unitPattern>
+				<unitPattern count="other">millisekunde {0}</unitPattern>
 			</unit>
 			<unit type="duration-microsecond">
 				<displayName>mikrosekunde</displayName>
 				<unitPattern count="one">mikrosekunde {0}</unitPattern>
 				<unitPattern count="other">mikrosekunde {0}</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>millisekunde</displayName>
-				<unitPattern count="one">ms {0}</unitPattern>
-				<unitPattern count="other">ms {0}</unitPattern>
-			</unit>
-			<unit type="duration-minute">
-				<displayName>dakika</displayName>
-				<unitPattern count="one">dakika {0}</unitPattern>
-				<unitPattern count="other">dakika {0}</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>miezi</displayName>
-				<unitPattern count="one">mwezi {0}</unitPattern>
-				<unitPattern count="other">miezi {0}</unitPattern>
-			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>nanosekunde</displayName>
 				<unitPattern count="one">nanosekunde {0}</unitPattern>
 				<unitPattern count="other">nanosekunde {0}</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>sekunde</displayName>
-				<unitPattern count="one">sekunde {0}</unitPattern>
-				<unitPattern count="other">sekunde {0}</unitPattern>
-				<perUnitPattern>{0}/s</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>wiki</displayName>
-				<unitPattern count="one">wiki {0}</unitPattern>
-				<unitPattern count="other">wiki {0}</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>miaka</displayName>
-				<unitPattern count="one">mwaka {0}</unitPattern>
-				<unitPattern count="other">miaka {0}</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>ampea</displayName>
 				<unitPattern count="one">ampea {0}</unitPattern>
@@ -5927,236 +6187,240 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">volti {0}</unitPattern>
 				<unitPattern count="other">volti {0}</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokalori</displayName>
+				<unitPattern count="one">kilokalori {0}</unitPattern>
+				<unitPattern count="other">kilokalori {0}</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
-				<displayName>kalori</displayName>
+				<displayName>cal</displayName>
 				<unitPattern count="one">kalori {0}</unitPattern>
-				<unitPattern count="other">kalori {0}</unitPattern>
+				<unitPattern count="other">{0} cal</unitPattern>
 			</unit>
 			<unit type="energy-foodcalorie">
 				<displayName>kalori</displayName>
 				<unitPattern count="one">kalori {0}</unitPattern>
 				<unitPattern count="other">kalori {0}</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>jouli</displayName>
-				<unitPattern count="one">jouli {0}</unitPattern>
-				<unitPattern count="other">jouli {0}</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokalori</displayName>
-				<unitPattern count="one">kilokalori {0}</unitPattern>
-				<unitPattern count="other">kilokalori {0}</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojuli</displayName>
 				<unitPattern count="one">kilojuli {0}</unitPattern>
 				<unitPattern count="other">kilojuli {0}</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>jouli</displayName>
+				<unitPattern count="one">jouli {0}</unitPattern>
+				<unitPattern count="other">jouli {0}</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilowati kwa saa</displayName>
-				<unitPattern count="one">kilowati {0} kwa saa</unitPattern>
-				<unitPattern count="other">kilowati {0} kwa saa</unitPattern>
+				<unitPattern count="one">{0} kWh</unitPattern>
+				<unitPattern count="other">{0} kWh</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
 				<displayName>gigahezi</displayName>
 				<unitPattern count="one">gigahezi {0}</unitPattern>
 				<unitPattern count="other">gigahezi {0}</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hezi</displayName>
-				<unitPattern count="one">hezi {0}</unitPattern>
-				<unitPattern count="other">hezi {0}</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megahezi</displayName>
+				<unitPattern count="one">megahezi {0}</unitPattern>
+				<unitPattern count="other">megahezi {0}</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kilohezi</displayName>
 				<unitPattern count="one">kilohezi {0}</unitPattern>
 				<unitPattern count="other">kilohezi {0}</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megahezi</displayName>
-				<unitPattern count="one">megahezi {0}</unitPattern>
-				<unitPattern count="other">megahezi {0}</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hezi</displayName>
+				<unitPattern count="one">hezi {0}</unitPattern>
+				<unitPattern count="other">hezi {0}</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>vipimo vya astronomia</displayName>
-				<unitPattern count="one">au {0}</unitPattern>
-				<unitPattern count="other">au {0}</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilomita</displayName>
+				<unitPattern count="one">km {0}</unitPattern>
+				<unitPattern count="other">km {0}</unitPattern>
+				<perUnitPattern>{0} kwa kila kilomita</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>Sentimita</displayName>
-				<unitPattern count="one">Sentimita {0}</unitPattern>
-				<unitPattern count="other">Sentimita {0}</unitPattern>
+			<unit type="length-meter">
+				<displayName>mita</displayName>
+				<unitPattern count="one">mita {0}</unitPattern>
+				<unitPattern count="other">mita {0}</unitPattern>
+				<perUnitPattern>{0} kwa kila mita</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>desimita</displayName>
 				<unitPattern count="one">desimita {0}</unitPattern>
 				<unitPattern count="other">desimita {0}</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>Futi</displayName>
-				<unitPattern count="one">Futi {0}</unitPattern>
-				<unitPattern count="other">Futi {0}</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>sentimita</displayName>
+				<unitPattern count="one">sentimita {0}</unitPattern>
+				<unitPattern count="other">sentimita {0}</unitPattern>
+				<perUnitPattern>{0} kwa kila sentimita</perUnitPattern>
 			</unit>
-			<unit type="length-inch">
-				<displayName>Inchi</displayName>
-				<unitPattern count="one">Inchi {0}</unitPattern>
-				<unitPattern count="other">Inchi {0}</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>Kilomita</displayName>
-				<unitPattern count="one">Kilomita {0}</unitPattern>
-				<unitPattern count="other">Kilomita {0}</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>Miaka ya mwanga</displayName>
-				<unitPattern count="one">ly {0}</unitPattern>
-				<unitPattern count="other">ly {0}</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>Mita</displayName>
-				<unitPattern count="one">Mita {0}</unitPattern>
-				<unitPattern count="other">Mita {0}</unitPattern>
+			<unit type="length-millimeter">
+				<displayName>milimita</displayName>
+				<unitPattern count="one">milimita {0}</unitPattern>
+				<unitPattern count="other">milimita {0}</unitPattern>
 			</unit>
 			<unit type="length-micrometer">
 				<displayName>mikromita</displayName>
 				<unitPattern count="one">mikromita {0}</unitPattern>
 				<unitPattern count="other">mikromita {0}</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName>Maili</displayName>
-				<unitPattern count="one">Maili {0}</unitPattern>
-				<unitPattern count="other">Maili {0}</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>Millimita</displayName>
-				<unitPattern count="one">Millimita {0}</unitPattern>
-				<unitPattern count="other">Millimita {0}</unitPattern>
-			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanomita</displayName>
 				<unitPattern count="one">nanomita {0}</unitPattern>
 				<unitPattern count="other">nanomita {0}</unitPattern>
 			</unit>
+			<unit type="length-picometer">
+				<displayName>pikomita</displayName>
+				<unitPattern count="one">pikomita {0}</unitPattern>
+				<unitPattern count="other">pikomita {0}</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>maili</displayName>
+				<unitPattern count="one">maili {0}</unitPattern>
+				<unitPattern count="other">maili {0}</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>yadi</displayName>
+				<unitPattern count="one">yadi {0}</unitPattern>
+				<unitPattern count="other">yadi {0}</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>futi</displayName>
+				<unitPattern count="one">futi {0}</unitPattern>
+				<unitPattern count="other">futi {0}</unitPattern>
+				<perUnitPattern>{0} kwa kila futi</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>inchi</displayName>
+				<unitPattern count="one">inchi {0}</unitPattern>
+				<unitPattern count="other">inchi {0}</unitPattern>
+				<perUnitPattern>{0} kwa kila inchi</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsecs</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>miaka ya mwanga</displayName>
+				<unitPattern count="one">ly {0}</unitPattern>
+				<unitPattern count="other">ly {0}</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>vipimo vya astronomia</displayName>
+				<unitPattern count="one">au {0}</unitPattern>
+				<unitPattern count="other">au {0}</unitPattern>
+			</unit>
 			<unit type="length-nautical-mile">
 				<displayName>maili za kibaharia</displayName>
 				<unitPattern count="one">maili {0} ya kibaharia</unitPattern>
 				<unitPattern count="other">maili {0} za kibaharia</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<displayName>parsecs</displayName>
-				<unitPattern count="one">pc {0}</unitPattern>
-				<unitPattern count="other">pc {0}</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName>Pikomita</displayName>
-				<unitPattern count="one">Pikomita {0}</unitPattern>
-				<unitPattern count="other">Pikomita {0}</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<displayName>Yadi</displayName>
-				<unitPattern count="one">Yadi {0}</unitPattern>
-				<unitPattern count="other">Yadi {0}</unitPattern>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
 			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
-				<unitPattern count="one">lux {0}</unitPattern>
-				<unitPattern count="other">lux {0}</unitPattern>
-			</unit>
-			<unit type="mass-carat">
-				<displayName>karati</displayName>
-				<unitPattern count="one">karati {0}</unitPattern>
-				<unitPattern count="other">karati {0}</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>Gramu</displayName>
-				<unitPattern count="one">Gramu {0}</unitPattern>
-				<unitPattern count="other">Gramu {0}</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>Kilogramu</displayName>
-				<unitPattern count="one">kg {0}</unitPattern>
-				<unitPattern count="other">kg {0}</unitPattern>
+				<unitPattern count="one">lx {0}</unitPattern>
+				<unitPattern count="other">lx {0}</unitPattern>
 			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>tani mita</displayName>
 				<unitPattern count="one">tani mita {0}</unitPattern>
 				<unitPattern count="other">tani mita {0}</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mikrogramu</displayName>
-				<unitPattern count="one">mikrogramu {0}</unitPattern>
-				<unitPattern count="other">mikrogramu {0}</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogramu</displayName>
+				<unitPattern count="one">kg {0}</unitPattern>
+				<unitPattern count="other">kg {0}</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gramu</displayName>
+				<unitPattern count="one">gramu {0}</unitPattern>
+				<unitPattern count="other">gramu {0}</unitPattern>
+				<perUnitPattern>{0} kwa kila gramu</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>miligramu</displayName>
 				<unitPattern count="one">mg {0}</unitPattern>
 				<unitPattern count="other">mg {0}</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>Aunsi</displayName>
-				<unitPattern count="one">Aunsi {0}</unitPattern>
-				<unitPattern count="other">Aunsi {0}</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>tola aunsi</displayName>
-				<unitPattern count="one">tola aunsi {0}</unitPattern>
-				<unitPattern count="other">tola aunsi {0}</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>Ratili</displayName>
-				<unitPattern count="one">Ratili {0}</unitPattern>
-				<unitPattern count="other">Ratili {0}</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>mikrogramu</displayName>
+				<unitPattern count="one">mikrogramu {0}</unitPattern>
+				<unitPattern count="other">mikrogramu {0}</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tani</displayName>
 				<unitPattern count="one">tani {0}</unitPattern>
 				<unitPattern count="other">tani {0}</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>ratili</displayName>
+				<unitPattern count="one">ratili {0}</unitPattern>
+				<unitPattern count="other">ratili {0}</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>aunsi</displayName>
+				<unitPattern count="one">aunsi {0}</unitPattern>
+				<unitPattern count="other">aunsi {0}</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>tola aunsi</displayName>
+				<unitPattern count="one">tola aunsi {0}</unitPattern>
+				<unitPattern count="other">tola aunsi {0}</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karati</displayName>
+				<unitPattern count="one">karati {0}</unitPattern>
+				<unitPattern count="other">karati {0}</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigawati</displayName>
 				<unitPattern count="one">gigawati {0}</unitPattern>
 				<unitPattern count="other">gigawati {0}</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>Kipimo cha Hospawa</displayName>
-				<unitPattern count="one">hp {0}</unitPattern>
-				<unitPattern count="other">hp {0}</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>Kilowati</displayName>
-				<unitPattern count="one">Kilowati {0}</unitPattern>
-				<unitPattern count="other">Kilowati {0}</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>megawati</displayName>
 				<unitPattern count="one">megawati {0}</unitPattern>
 				<unitPattern count="other">megawati {0}</unitPattern>
 			</unit>
+			<unit type="power-kilowatt">
+				<displayName>kilowati</displayName>
+				<unitPattern count="one">kilowati {0}</unitPattern>
+				<unitPattern count="other">kilowati {0}</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>wati</displayName>
+				<unitPattern count="one">wati {0}</unitPattern>
+				<unitPattern count="other">wati {0}</unitPattern>
+			</unit>
 			<unit type="power-milliwatt">
 				<displayName>miliwati</displayName>
 				<unitPattern count="one">miliwati {0}</unitPattern>
 				<unitPattern count="other">miliwati {0}</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName>Wati</displayName>
-				<unitPattern count="one">Wati {0}</unitPattern>
-				<unitPattern count="other">Wati {0}</unitPattern>
+			<unit type="power-horsepower">
+				<displayName>kipimo cha hospawa</displayName>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
-				<displayName>Hektopaskali</displayName>
+				<displayName>hektopaskali</displayName>
 				<unitPattern count="one">hPa {0}</unitPattern>
 				<unitPattern count="other">hPa {0}</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>Inchi za zebaki</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>Kipimo cha milibari</displayName>
-				<unitPattern count="one">mbar {0}</unitPattern>
-				<unitPattern count="other">mbar {0}</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>milimita za zebaki</displayName>
 				<unitPattern count="one">milimita {0} ya zebaki</unitPattern>
@@ -6167,10 +6431,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">psi {0}</unitPattern>
 				<unitPattern count="other">psi {0}</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karati</displayName>
-				<unitPattern count="one">karati {0}</unitPattern>
-				<unitPattern count="other">karati {0}</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inchi za zebaki</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>kipimo cha milibari</displayName>
+				<unitPattern count="one">mbar {0}</unitPattern>
+				<unitPattern count="other">mbar {0}</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilomita kwa saa</displayName>
@@ -6179,21 +6448,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="speed-meter-per-second">
 				<displayName>mita kwa kila sekunde</displayName>
-				<unitPattern count="one">m {0}/s</unitPattern>
-				<unitPattern count="other">m {0}/s</unitPattern>
+				<unitPattern count="one">{0} m/s</unitPattern>
+				<unitPattern count="other">{0} m/s</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
 				<displayName>maili kwa kila saa</displayName>
-				<unitPattern count="one">mi {0}/saa</unitPattern>
-				<unitPattern count="other">mi {0}/saa</unitPattern>
+				<unitPattern count="one">{0} mph</unitPattern>
+				<unitPattern count="other">{0} mph</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>noti</displayName>
+				<unitPattern count="one">noti {0}</unitPattern>
+				<unitPattern count="other">noti {0}</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
-				<displayName>Nyuzi za Selisiasi</displayName>
+				<displayName>nyuzi za selisiasi</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
 				<unitPattern count="other">{0}°C</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
-				<displayName>Nyuzi za Farenheiti</displayName>
+				<displayName>nyuzi za farenheiti</displayName>
 				<unitPattern count="one">{0}°F</unitPattern>
 				<unitPattern count="other">{0}°F</unitPattern>
 			</unit>
@@ -6202,31 +6481,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ekari futi</displayName>
-				<unitPattern count="one">ekari futi {0}</unitPattern>
-				<unitPattern count="other">ekari futi {0}</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>sentilita</displayName>
-				<unitPattern count="one">sentilita {0}</unitPattern>
-				<unitPattern count="other">sentilita {0}</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>sentimita za ujazo</displayName>
-				<unitPattern count="one">cm³ {0}</unitPattern>
-				<unitPattern count="other">cm³ {0}</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>futi za ujazo</displayName>
-				<unitPattern count="one">futi {0} ya ujazo</unitPattern>
-				<unitPattern count="other">futi {0} za ujazo</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>inchi za ujazo</displayName>
-				<unitPattern count="one">inchi {0} ya ujazo</unitPattern>
-				<unitPattern count="other">inchi {0} za ujazo</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kilomita za ujazo</displayName>
 				<unitPattern count="one">km³ {0}</unitPattern>
@@ -6234,8 +6488,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="volume-cubic-meter">
 				<displayName>mita za ujazo</displayName>
-				<unitPattern count="one">mita {0} ya ujazo</unitPattern>
+				<unitPattern count="one">m³ {0}</unitPattern>
 				<unitPattern count="other">mita {0} za ujazo</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>sentimita za ujazo</displayName>
+				<unitPattern count="one">cm³ {0}</unitPattern>
+				<unitPattern count="other">cm³ {0}</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>maili za ujazo</displayName>
@@ -6244,28 +6505,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="volume-cubic-yard">
 				<displayName>yadi za ujazo</displayName>
-				<unitPattern count="one">yadi {0} ya ujazo</unitPattern>
-				<unitPattern count="other">yadi {0} za ujazo</unitPattern>
+				<unitPattern count="one">yd³ {0}</unitPattern>
+				<unitPattern count="other">yd³ {0}</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>vikombe</displayName>
-				<unitPattern count="one">kikombe {0}</unitPattern>
-				<unitPattern count="other">vikombe {0}</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>futi za ujazo</displayName>
+				<unitPattern count="one">ft³ {0}</unitPattern>
+				<unitPattern count="other">ft³ {0}</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>desilita</displayName>
-				<unitPattern count="one">desilita {0}</unitPattern>
-				<unitPattern count="other">desilita {0}</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>inchi za ujazo</displayName>
+				<unitPattern count="one">in³ {0}</unitPattern>
+				<unitPattern count="other">in³ {0}</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>aunsi za ujazo</displayName>
-				<unitPattern count="one">aunsi {0} ya ujazo</unitPattern>
-				<unitPattern count="other">aunsi {0} za ujazo</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>galoni</displayName>
-				<unitPattern count="one">galoni {0}</unitPattern>
-				<unitPattern count="other">galoni {0}</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megalita</displayName>
+				<unitPattern count="one">megalita {0}</unitPattern>
+				<unitPattern count="other">megalita {0}</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hektolita</displayName>
@@ -6273,30 +6529,67 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">hektolita {0}</unitPattern>
 			</unit>
 			<unit type="volume-liter">
-				<displayName>Lita</displayName>
-				<unitPattern count="one">Lita {0}</unitPattern>
-				<unitPattern count="other">Lita {0}</unitPattern>
+				<displayName>lita</displayName>
+				<unitPattern count="one">lita {0}</unitPattern>
+				<unitPattern count="other">lita {0}</unitPattern>
+				<perUnitPattern>{0} kwa kila lita</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalita</displayName>
-				<unitPattern count="one">megalita {0}</unitPattern>
-				<unitPattern count="other">megalita {0}</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>desilita</displayName>
+				<unitPattern count="one">desilita {0}</unitPattern>
+				<unitPattern count="other">desilita {0}</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>sentilita</displayName>
+				<unitPattern count="one">sentilita {0}</unitPattern>
+				<unitPattern count="other">sentilita {0}</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mililita</displayName>
 				<unitPattern count="one">mililita {0}</unitPattern>
 				<unitPattern count="other">mililita {0}</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>painti</displayName>
-				<unitPattern count="one">painti {0}</unitPattern>
-				<unitPattern count="other">painti {0}</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>painti za mizani</displayName>
+				<unitPattern count="one">mpt {0}</unitPattern>
+				<unitPattern count="other">mpt {0}</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>vikombe vya mizani</displayName>
+				<unitPattern count="one">mc {0}</unitPattern>
+				<unitPattern count="other">vikombe {0} vya mizani</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ekari futi</displayName>
+				<unitPattern count="one">ekari futi {0}</unitPattern>
+				<unitPattern count="other">ekari futi {0}</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galoni</displayName>
+				<unitPattern count="one">galoni {0}</unitPattern>
+				<unitPattern count="other">galoni {0}</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>kwati</displayName>
 				<unitPattern count="one">kwati {0}</unitPattern>
 				<unitPattern count="other">kwati {0}</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>painti</displayName>
+				<unitPattern count="one">painti {0}</unitPattern>
+				<unitPattern count="other">painti {0}</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>vikombe</displayName>
+				<unitPattern count="one">kikombe {0}</unitPattern>
+				<unitPattern count="other">vikombe {0}</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>aunsi za ujazo</displayName>
+				<unitPattern count="one">fl oz {0}</unitPattern>
+				<unitPattern count="other">fl oz {0}</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>vijiko vikubwa</displayName>
 				<unitPattern count="one">kijiko {0} kikubwa</unitPattern>
@@ -6307,6 +6600,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">kijiko {0} kidogo</unitPattern>
 				<unitPattern count="other">vijiko {0} vidogo</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -6316,6 +6615,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">G {0}</unitPattern>
 				<unitPattern count="other">G {0}</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -6324,26 +6627,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">Ekari {0}</unitPattern>
-				<unitPattern count="other">Ekari {0}</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">km² {0}</unitPattern>
+				<unitPattern count="other">km² {0}</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">ha {0}</unitPattern>
 				<unitPattern count="other">ha {0}</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">ft² {0}</unitPattern>
-				<unitPattern count="other">ft² {0}</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">km² {0}</unitPattern>
-				<unitPattern count="other">km² {0}</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">m² {0}</unitPattern>
 				<unitPattern count="other">m² {0}</unitPattern>
@@ -6352,6 +6643,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">mi² {0}</unitPattern>
 				<unitPattern count="other">mi² {0}</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">Ekari {0}</unitPattern>
+				<unitPattern count="other">Ekari {0}</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">ft² {0}</unitPattern>
+				<unitPattern count="other">ft² {0}</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>lita kwa kilomita 100</displayName>
+				<unitPattern count="one">{0}L/100km</unitPattern>
+				<unitPattern count="other">{0}L/100km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>mwaka</displayName>
+				<unitPattern count="one">mwaka {0}</unitPattern>
+				<unitPattern count="other">miaka {0}</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mwezi</displayName>
+				<unitPattern count="one">mwezi {0}</unitPattern>
+				<unitPattern count="other">miezi {0}</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>wiki</displayName>
+				<unitPattern count="one">wiki {0}</unitPattern>
+				<unitPattern count="other">wiki {0}</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>siku</displayName>
 				<unitPattern count="one">siku {0}</unitPattern>
@@ -6362,110 +6681,100 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">saa {0}</unitPattern>
 				<unitPattern count="other">saa {0}</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>millisekunde</displayName>
-				<unitPattern count="one">ms {0}</unitPattern>
-				<unitPattern count="other">ms {0}</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>dakika</displayName>
 				<unitPattern count="one">dakika {0}</unitPattern>
 				<unitPattern count="other">dakika {0}</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>mwezi</displayName>
-				<unitPattern count="one">mwezi {0}</unitPattern>
-				<unitPattern count="other">miezi {0}</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>sekunde</displayName>
-				<unitPattern count="one">s {0}</unitPattern>
-				<unitPattern count="other">s {0}</unitPattern>
+				<unitPattern count="one">sekunde {0}</unitPattern>
+				<unitPattern count="other">sekunde {0}</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>wiki</displayName>
-				<unitPattern count="one">wiki {0}</unitPattern>
-				<unitPattern count="other">wiki {0}</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>millisekunde</displayName>
+				<unitPattern count="one">ms {0}</unitPattern>
+				<unitPattern count="other">ms {0}</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>mwaka</displayName>
-				<unitPattern count="one">mwaka {0}</unitPattern>
-				<unitPattern count="other">miaka {0}</unitPattern>
+			<unit type="electric-volt">
+				<displayName>volti</displayName>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">km {0}</unitPattern>
+				<unitPattern count="other">km {0}</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>mita</displayName>
+				<unitPattern count="one">mita {0}</unitPattern>
+				<unitPattern count="other">mita {0}</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
-				<displayName>Sentimita</displayName>
-				<unitPattern count="one">cm {0}</unitPattern>
-				<unitPattern count="other">cm {0}</unitPattern>
+				<displayName>sentimita</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>milimita</displayName>
+				<unitPattern count="one">{0} mm</unitPattern>
+				<unitPattern count="other">{0} mm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<unitPattern count="one">pm {0}</unitPattern>
+				<unitPattern count="other">pm {0}</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">Maili {0}</unitPattern>
+				<unitPattern count="other">Maili {0}</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<unitPattern count="one">Yadi {0}</unitPattern>
+				<unitPattern count="other">Yadi {0}</unitPattern>
 			</unit>
 			<unit type="length-foot">
 				<unitPattern count="one">Futi {0}</unitPattern>
 				<unitPattern count="other">Futi {0}</unitPattern>
 			</unit>
 			<unit type="length-inch">
+				<displayName>Inchi</displayName>
 				<unitPattern count="one">Inchi {0}</unitPattern>
 				<unitPattern count="other">Inchi {0}</unitPattern>
 			</unit>
-			<unit type="length-kilometer">
-				<displayName>Kilomita</displayName>
-				<unitPattern count="one">km {0}</unitPattern>
-				<unitPattern count="other">km {0}</unitPattern>
-			</unit>
 			<unit type="length-light-year">
 				<unitPattern count="one">ly {0}</unitPattern>
 				<unitPattern count="other">ly {0}</unitPattern>
 			</unit>
-			<unit type="length-meter">
-				<displayName>Mita</displayName>
-				<unitPattern count="one">Mita {0}</unitPattern>
-				<unitPattern count="other">Mita {0}</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">Maili {0}</unitPattern>
-				<unitPattern count="other">Maili {0}</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>Millimita</displayName>
-				<unitPattern count="one">mm {0}</unitPattern>
-				<unitPattern count="other">mm {0}</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<unitPattern count="one">pm {0}</unitPattern>
-				<unitPattern count="other">pm {0}</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<unitPattern count="one">Yadi {0}</unitPattern>
-				<unitPattern count="other">Yadi {0}</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>Gramu</displayName>
-				<unitPattern count="one">g {0}</unitPattern>
-				<unitPattern count="other">g {0}</unitPattern>
-			</unit>
 			<unit type="mass-kilogram">
-				<displayName>Kilogramu</displayName>
+				<displayName>kilogramu</displayName>
 				<unitPattern count="one">kg {0}</unitPattern>
 				<unitPattern count="other">kg {0}</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">Aunsi {0}</unitPattern>
-				<unitPattern count="other">Aunsi {0}</unitPattern>
+			<unit type="mass-gram">
+				<displayName>gramu</displayName>
+				<unitPattern count="one">gramu {0}</unitPattern>
+				<unitPattern count="other">gramu {0}</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">Ratili {0}</unitPattern>
 				<unitPattern count="other">Ratili {0}</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">hp {0}</unitPattern>
-				<unitPattern count="other">hp {0}</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">Aunsi {0}</unitPattern>
+				<unitPattern count="other">Aunsi {0}</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">kW {0}</unitPattern>
 				<unitPattern count="other">kW {0}</unitPattern>
 			</unit>
 			<unit type="power-watt">
+				<displayName>wati</displayName>
 				<unitPattern count="one">Wati {0}</unitPattern>
 				<unitPattern count="other">Wati {0}</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">hp {0}</unitPattern>
+				<unitPattern count="other">hp {0}</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">hPa {0}</unitPattern>
 				<unitPattern count="other">hPa {0}</unitPattern>
@@ -6492,9 +6801,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">mi {0}/saa</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
-				<displayName>Nyuzi za Selisiasi</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
+				<displayName>nyuzi za selisiasi</displayName>
+				<unitPattern count="one">{0}°C</unitPattern>
+				<unitPattern count="other">{0}°C</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
 				<unitPattern count="one">{0}°F</unitPattern>
@@ -6509,10 +6818,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">mi³ {0}</unitPattern>
 			</unit>
 			<unit type="volume-liter">
-				<displayName>Lita</displayName>
-				<unitPattern count="one">Lita {0}</unitPattern>
-				<unitPattern count="other">Lita {0}</unitPattern>
+				<displayName>lita</displayName>
+				<unitPattern count="one">lita {0}</unitPattern>
+				<unitPattern count="other">lita {0}</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
@@ -6528,25 +6843,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<listPattern>
 			<listPatternPart type="start">{0}, {1}</listPatternPart>
 			<listPatternPart type="middle">{0}, {1}</listPatternPart>
-			<listPatternPart type="end">{0}, na {1}</listPatternPart>
+			<listPatternPart type="end">{0} na {1}</listPatternPart>
 			<listPatternPart type="2">{0} na {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit">
 			<listPatternPart type="start">{0}, {1}</listPatternPart>
 			<listPatternPart type="middle">{0}, {1}</listPatternPart>
-			<listPatternPart type="end">{0}, na {1}</listPatternPart>
+			<listPatternPart type="end">{0} na {1}</listPatternPart>
 			<listPatternPart type="2">{0} na {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-narrow">
 			<listPatternPart type="start">{0}, {1}</listPatternPart>
 			<listPatternPart type="middle">{0}, {1}</listPatternPart>
-			<listPatternPart type="end">{0}, na {1}</listPatternPart>
+			<listPatternPart type="end">{0} na {1}</listPatternPart>
 			<listPatternPart type="2">{0} na {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-short">
 			<listPatternPart type="start">{0}, {1}</listPatternPart>
 			<listPatternPart type="middle">{0}, {1}</listPatternPart>
-			<listPatternPart type="end">{0}, na {1}</listPatternPart>
+			<listPatternPart type="end">{0} na {1}</listPatternPart>
 			<listPatternPart type="2">{0} na {1}</listPatternPart>
 		</listPattern>
 	</listPatterns>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sw_CD.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_CD.xml
similarity index 90%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sw_CD.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_CD.xml
index eb2ac006681..3af71b3a1d9 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sw_CD.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_CD.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11152 $"/>
-		<generation date="$Date: 2015-01-26 15:28:00 -0600 (Mon, 26 Jan 2015) $"/>
+		<version number="$Revision: 12197 $"/>
 		<language type="sw"/>
 		<territory type="CD"/>
 	</identity>
@@ -17,7 +16,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bn">Kibangla</language>
 			<language type="cs">Kichecki</language>
 			<language type="en">Kingereza</language>
-			<language type="swc">Kiswahili ya Kongo</language>
+			<language type="sw_CD">Kiswahili ya Kongo</language>
 		</languages>
 		<territories>
 			<territory type="AF">Afuganistani</territory>
@@ -174,28 +173,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
 				<dateTimeFormats>
 					<availableFormats>
 						<dateFormatItem id="MEd">E d/M</dateFormatItem>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sw_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_KE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sw_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_KE.xml
index 1295fe3bff3..cbf05663738 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sw_KE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_KE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="sw"/>
 		<territory type="KE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sw_TZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_TZ.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sw_TZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_TZ.xml
index 17bd364b18a..d51d2cc7044 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sw_TZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_TZ.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="sw"/>
 		<territory type="TZ"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sw_UG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_UG.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sw_UG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_UG.xml
index 95f88fcc6c2..f9cdba57929 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/sw_UG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_UG.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="sw"/>
 		<territory type="UG"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ta.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta.xml
similarity index 84%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ta.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta.xml
index a724ffa584e..acef4dfaf8b 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ta.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12316 $"/>
 		<language type="ta"/>
 	</identity>
 	<localeDisplayNames>
@@ -38,12 +37,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ang">பழைய ஆங்கிலம்</language>
 			<language type="anp">அங்கிகா</language>
 			<language type="ar">அரபிக்</language>
-			<language type="ar_001">மாடர்ன் ஸ்டாண்டர்ட் அரபிக்</language>
+			<language type="ar_001">நவீன நிலையான அரபிக்</language>
 			<language type="arc">அராமைக்</language>
 			<language type="arn">மபுசே</language>
 			<language type="arp">அரபஹோ</language>
 			<language type="arw">அராவாக்</language>
-			<language type="as">அஸ்ஸாமி</language>
+			<language type="as">அஸ்ஸாமீஸ்</language>
 			<language type="asa">அசு</language>
 			<language type="ast">அஸ்துரியன்</language>
 			<language type="av">அவேரிக்</language>
@@ -51,7 +50,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ay">அய்மரா</language>
 			<language type="az">அஸர்பைஜானி</language>
 			<language type="az" alt="short">அஸேரி</language>
-			<language type="ba">பாஷ்கிர்</language>
+			<language type="ba">பஷ்கிர்</language>
 			<language type="bal">பெலுசி</language>
 			<language type="ban">பலினீஸ்</language>
 			<language type="bas">பாஸா</language>
@@ -61,6 +60,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bez">பெனா</language>
 			<language type="bfq">படகா</language>
 			<language type="bg">பல்கேரியன்</language>
+			<language type="bgn">மேற்கு பலோச்சி</language>
 			<language type="bho">போஜ்பூரி</language>
 			<language type="bi">பிஸ்லாமா</language>
 			<language type="bik">பிகோல்</language>
@@ -81,7 +81,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="cad">கேடோ</language>
 			<language type="car">கரீப்</language>
 			<language type="cch">ஆட்சம்</language>
-			<language type="ce">செசென்</language>
+			<language type="ce">செச்சென்</language>
 			<language type="ceb">செபுவானோ</language>
 			<language type="cgg">சிகா</language>
 			<language type="ch">சாமோரோ</language>
@@ -92,10 +92,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="chn">சினூக் ஜார்கான்</language>
 			<language type="cho">சோக்தௌ</language>
 			<language type="chp">சிபெவ்யான்</language>
-			<language type="chr">செரொகி</language>
+			<language type="chr">செரோகீ</language>
 			<language type="chy">செயேனி</language>
-			<language type="ckb">சொரானி குர்திஷ்</language>
-			<language type="co">கோர்சிகன்</language>
+			<language type="ckb">மத்திய குர்திஷ்</language>
+			<language type="co">கார்சிகன்</language>
 			<language type="cop">காப்டிக்</language>
 			<language type="cr">க்ரீ</language>
 			<language type="crh">கிரிமியன் துர்க்கி</language>
@@ -103,7 +103,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="csb">கஷுபியன்</language>
 			<language type="cu">சர்ச் ஸ்லாவிக்</language>
 			<language type="cv">சுவாஷ்</language>
-			<language type="cy">வெல்ஷ்</language>
+			<language type="cy">வேல்ஷ்</language>
 			<language type="da">டேனிஷ்</language>
 			<language type="dak">தகோடா</language>
 			<language type="dar">தார்குவா</language>
@@ -132,19 +132,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="el">கிரேக்கம்</language>
 			<language type="elx">எலமைட்</language>
 			<language type="en">ஆங்கிலம்</language>
-			<language type="en_AU">ஆஸ்திரேலியன் ஆங்கிலம்</language>
-			<language type="en_CA">கனடியன் ஆங்கிலம்</language>
+			<language type="en_AU">ஆஸ்திரேலிய ஆங்கிலம்</language>
+			<language type="en_CA">கனடிய ஆங்கிலம்</language>
 			<language type="en_GB">பிரிட்டிஷ் ஆங்கிலம்</language>
 			<language type="en_GB" alt="short">ஆங்கிலம் (யூகே)</language>
 			<language type="en_US">அமெரிக்க ஆங்கிலம்</language>
 			<language type="enm">மத்திய ஆங்கிலம்</language>
 			<language type="eo">எஸ்பரேன்டோ</language>
 			<language type="es">ஸ்பானிஷ்</language>
-			<language type="es_419">லத்தின் அமெரிக்க ஸ்பானிஷ்</language>
-			<language type="es_ES">ஐரோப்பிய ஸ்பானிஷ்</language>
-			<language type="es_MX">மெக்சிகன் ஸ்பானிஷ்</language>
+			<language type="es_ES">ஸ்பானிஷ் (ஐரோப்பா)</language>
 			<language type="et">எஸ்டோனியன்</language>
-			<language type="eu">பஸ்க்</language>
+			<language type="eu">பாஸ்க்</language>
 			<language type="ewo">எவோன்டோ</language>
 			<language type="fa">பெர்ஷியன்</language>
 			<language type="fan">ஃபங்க்</language>
@@ -163,7 +161,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="frr">வடக்கு ஃப்ரிஸியான்</language>
 			<language type="frs">கிழக்கு ஃப்ரிஸியான்</language>
 			<language type="fur">ஃப்ரியூலியன்</language>
-			<language type="fy">மேற்கத்திய ஃப்ரிஷியன்</language>
+			<language type="fy">மேற்கு ஃப்ரிஷியன்</language>
 			<language type="ga">ஐரிஷ்</language>
 			<language type="gaa">கா</language>
 			<language type="gag">காகௌஸ்</language>
@@ -181,7 +179,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="got">கோதிக்</language>
 			<language type="grb">க்ரேபோ</language>
 			<language type="grc">பண்டைய கிரேக்கம்</language>
-			<language type="gsw">ஸ்விஸ் ஜெர்மன்</language>
+			<language type="gsw">ஜெர்மன் (ஸ்விஸ்)</language>
 			<language type="gu">குஜராத்தி</language>
 			<language type="guz">குஸி</language>
 			<language type="gv">மேங்க்ஸ்</language>
@@ -213,7 +211,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ilo">இலோகோ</language>
 			<language type="inh">இங்குஷ்</language>
 			<language type="io">இடோ</language>
-			<language type="is">ஐஸ்லென்டிக்</language>
+			<language type="is">ஐஸ்லேண்டிக்</language>
 			<language type="it">இத்தாலியன்</language>
 			<language type="iu">இனுகிடூட்</language>
 			<language type="ja">ஜப்பானியம்</language>
@@ -222,7 +220,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="jmc">மாசெம்</language>
 			<language type="jpr">ஜூதேயோ-பெர்ஷியன்</language>
 			<language type="jrb">ஜூதேயோ-அராபிக்</language>
-			<language type="jv">ஜாவானீஸ்</language>
+			<language type="jv">ஜாவனீஸ்</language>
 			<language type="ka">ஜார்ஜியன்</language>
 			<language type="kaa">காரா-கல்பாக்</language>
 			<language type="kab">கபாய்ல்</language>
@@ -279,6 +277,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">லாவோ</language>
 			<language type="lol">மோங்கோ</language>
 			<language type="loz">லோசி</language>
+			<language type="lrc">வடக்கு லுரி</language>
 			<language type="lt">லிதுவேனியன்</language>
 			<language type="lu">லுபா-கடாங்கா</language>
 			<language type="lua">லுபா-லுலுலா</language>
@@ -312,7 +311,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mn">மங்கோலியன்</language>
 			<language type="mnc">மன்சு</language>
 			<language type="mni">மனிபூரி</language>
-			<language type="moh">மோஹாவ்க்</language>
+			<language type="moh">மொஹாக்</language>
 			<language type="mos">மோஸ்ஸி</language>
 			<language type="mr">மராத்தி</language>
 			<language type="ms">மலாய்</language>
@@ -322,21 +321,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mus">க்ரீக்</language>
 			<language type="mwl">மிரான்டீஸ்</language>
 			<language type="mwr">மார்வாரி</language>
-			<language type="my">பர்மிஸ்</language>
+			<language type="my">பர்மீஸ்</language>
 			<language type="myv">ஏர்ஜியா</language>
+			<language type="mzn">மசந்தேரனி</language>
 			<language type="na">நவ்ரூ</language>
 			<language type="nap">நியோபோலிடன்</language>
 			<language type="naq">நாமா</language>
 			<language type="nb">நார்வேஜியன் பொக்மால்</language>
 			<language type="nd">வடக்கு தெபெலே</language>
 			<language type="nds">லோ ஜெர்மன்</language>
+			<language type="nds_NL">லோ சாக்ஸன்</language>
 			<language type="ne">நேபாளி</language>
 			<language type="new">நெவாரி</language>
 			<language type="ng">தோங்கா</language>
 			<language type="nia">நியாஸ்</language>
 			<language type="niu">நியூவான்</language>
 			<language type="nl">டச்சு</language>
-			<language type="nl_BE">பிலெமிஷ்</language>
+			<language type="nl_BE">ஃப்லெமிஷ்</language>
 			<language type="nmg">க்வாசியோ</language>
 			<language type="nn">நார்வேஜியன் நியூநார்ஸ்க்</language>
 			<language type="no">நார்வே</language>
@@ -377,7 +378,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ps" alt="variant">புஷ்தோ</language>
 			<language type="pt">போர்ச்சுக்கீஸ்</language>
 			<language type="pt_BR">போர்ச்சுகீஸ் (பிரேசில்)</language>
-			<language type="pt_PT">ஐரோப்பிய போர்ச்சுகீஸ்</language>
+			<language type="pt_PT">போர்ச்சுகீஸ் (ஐரோப்பா)</language>
 			<language type="qu">கிவேசுவா</language>
 			<language type="quc">கீசீ</language>
 			<language type="raj">ராஜஸ்தானி</language>
@@ -407,6 +408,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">சிசிலியன்</language>
 			<language type="sco">ஸ்காட்ஸ்</language>
 			<language type="sd">சிந்தி</language>
+			<language type="sdh">தெற்கு குர்திஷ்</language>
 			<language type="se">வடக்கு சமி</language>
 			<language type="seh">செனா</language>
 			<language type="sel">செல்குப்</language>
@@ -441,8 +443,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">சுமேரியன்</language>
 			<language type="sv">ஸ்வீடிஷ்</language>
 			<language type="sw">சுவாஹிலி</language>
+			<language type="sw_CD">காங்கோ சுவாஹிலி</language>
 			<language type="swb">கொமோரியன்</language>
-			<language type="swc">காங்கோ சுவாஹிலி</language>
 			<language type="syc">பாரம்பரிய சிரியாக்</language>
 			<language type="syr">சிரியாக்</language>
 			<language type="ta">தமிழ்</language>
@@ -456,7 +458,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ti">டிக்ரின்யா</language>
 			<language type="tig">டைக்ரே</language>
 			<language type="tiv">டிவ்</language>
-			<language type="tk">டர்க்மென்</language>
+			<language type="tk">துருக்மென்</language>
 			<language type="tkl">டோகேலௌ</language>
 			<language type="tl">டாகாலோக்</language>
 			<language type="tlh">க்ளிங்கோன்</language>
@@ -466,7 +468,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="to">டோங்கான்</language>
 			<language type="tog">நயாசா டோங்கா</language>
 			<language type="tpi">டோக் பிஸின்</language>
-			<language type="tr">டர்கிஷ்</language>
+			<language type="tr">துருக்கிஷ்</language>
 			<language type="ts">ஸோங்கா</language>
 			<language type="tsi">ட்ஸிம்ஷியன்</language>
 			<language type="tt">டாடர்</language>
@@ -476,7 +478,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="twq">டசவாக்</language>
 			<language type="ty">டஹிதியான்</language>
 			<language type="tyv">டுவினியன்</language>
-			<language type="tzm">மத்திய அட்லஸ் தமசைட்</language>
+			<language type="tzm">மத்திய அட்லஸ் டமசைட்</language>
 			<language type="udm">உட்முர்ட்</language>
 			<language type="ug">உய்குர்</language>
 			<language type="uga">உகாரிட்க்</language>
@@ -495,6 +497,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">வாலாமோ</language>
 			<language type="war">வாரே</language>
 			<language type="was">வாஷோ</language>
+			<language type="wbp">வல்பிரி</language>
 			<language type="wo">ஒலூஃப்</language>
 			<language type="xal">கல்மிக்</language>
 			<language type="xh">ஹோசா</language>
@@ -529,7 +532,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Blis">ப்லிஸ்ஸிமிபால்ஸ்</script>
 			<script type="Bopo">போபோமோஃபோ</script>
 			<script type="Brah">பிரம்மி</script>
-			<script type="Brai">பிரைல்</script>
+			<script type="Brai">பிரெயில்</script>
 			<script type="Bugi">புகினீஸ்</script>
 			<script type="Buhd">புகித்</script>
 			<script type="Cakm">சக்மா</script>
@@ -556,13 +559,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Gujr">குஜராத்தி</script>
 			<script type="Guru">குர்முகி</script>
 			<script type="Hang">ஹங்குல்</script>
-			<script type="Hani">ஹான்</script>
+			<script type="Hani">ஹன்</script>
 			<script type="Hano">ஹனுனூ</script>
 			<script type="Hans">எளிதாக்கப்பட்டது</script>
-			<script type="Hans" alt="stand-alone">எளிதாக்கப்பட்ட ஹான்</script>
+			<script type="Hans" alt="stand-alone">எளிதாக்கப்பட்ட ஹன்</script>
 			<script type="Hant">பாரம்பரியம்</script>
-			<script type="Hant" alt="stand-alone">பாரம்பரிய ஹான்</script>
-			<script type="Hebr">ஹிப்ரூ</script>
+			<script type="Hant" alt="stand-alone">பாரம்பரிய ஹன்</script>
+			<script type="Hebr">ஹீப்ரு</script>
 			<script type="Hira">ஹிராகானா</script>
 			<script type="Hmng">பஹாவ் மாங்க்</script>
 			<script type="Hrkt">கடாகானா அல்லது ஹிராகானா</script>
@@ -572,7 +575,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Java">ஜாவனீஸ்</script>
 			<script type="Jpan">ஜப்பானியம்</script>
 			<script type="Kali">கயாஹ் லீ</script>
-			<script type="Kana">கடகனா</script>
+			<script type="Kana">கதகானா</script>
 			<script type="Khar">கரோஷ்டி</script>
 			<script type="Khmr">கமெர்</script>
 			<script type="Knda">கன்னடம்</script>
@@ -649,7 +652,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Zmth">கணிதக்குறியீடு</script>
 			<script type="Zsym">சின்னங்கள்</script>
 			<script type="Zxxx">எழுதப்படாதது</script>
-			<script type="Zyyy">பொதுவான</script>
+			<script type="Zyyy">பொது</script>
 			<script type="Zzzz">அறியப்படாத எழுத்து</script>
 		</scripts>
 		<territories>
@@ -663,7 +666,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="014">கிழக்கு ஆப்ரிக்கா</territory>
 			<territory type="015">வடக்கு ஆப்ரிக்கா</territory>
 			<territory type="017">மத்திய ஆப்ரிக்கா</territory>
-			<territory type="018">தென்னாப்ரிக்கா</territory>
+			<territory type="018">தெற்கு ஆப்ரிக்கா</territory>
 			<territory type="019">அமெரிக்காஸ்</territory>
 			<territory type="021">வடக்கு அமெரிக்கா</territory>
 			<territory type="029">கரீபியன்</territory>
@@ -690,8 +693,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AG">ஆண்டிகுவா மற்றும் பார்புடா</territory>
 			<territory type="AI">அங்குய்லா</territory>
 			<territory type="AL">அல்பேனியா</territory>
-			<territory type="AM">ஆர்மேனியா</territory>
-			<territory type="AN">நெதர்லாந்து ஆண்டில்லெஸ்</territory>
+			<territory type="AM">அர்மேனியா</territory>
 			<territory type="AO">அங்கோலா</territory>
 			<territory type="AQ">அண்டார்டிகா</territory>
 			<territory type="AR">அர்ஜென்டினா</territory>
@@ -701,7 +703,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AW">அரூபா</territory>
 			<territory type="AX">ஆலந்து தீவுகள்</territory>
 			<territory type="AZ">அசர்பைஜான்</territory>
-			<territory type="BA">போஸ்னியா மற்றும் ஹெர்ஸிகோவினா</territory>
+			<territory type="BA">போஸ்னியா &amp; ஹெர்ஸகோவினா</territory>
 			<territory type="BB">பார்படோஸ்</territory>
 			<territory type="BD">பங்களாதேஷ்</territory>
 			<territory type="BE">பெல்ஜியம்</territory>
@@ -752,7 +754,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="DM">டொமினிகா</territory>
 			<territory type="DO">டொமினிகன் குடியரசு</territory>
 			<territory type="DZ">அல்ஜீரியா</territory>
-			<territory type="EA">சியூடா மற்றும் மெலில்லா</territory>
+			<territory type="EA">சியூடா &amp; மெலில்லா</territory>
 			<territory type="EC">ஈக்வடார்</territory>
 			<territory type="EE">எஸ்டோனியா</territory>
 			<territory type="EG">எகிப்து</territory>
@@ -760,7 +762,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ER">எரிட்ரியா</territory>
 			<territory type="ES">ஸ்பெயின்</territory>
 			<territory type="ET">எதியோப்பியா</territory>
-			<territory type="EU">ஐரோப்பியன் யூனியன்</territory>
+			<territory type="EU">ஐரோப்பிய யூனியன்</territory>
 			<territory type="FI">பின்லாந்து</territory>
 			<territory type="FJ">ஃபிஜி</territory>
 			<territory type="FK">ஃபாக்லாந்து தீவுகள்</territory>
@@ -770,7 +772,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="FR">பிரான்ஸ்</territory>
 			<territory type="GA">கேபான்</territory>
 			<territory type="GB">ஐக்கிய பேரரசு</territory>
-			<territory type="GB" alt="short">யூ.கே.</territory>
+			<territory type="GB" alt="short">யூகே</territory>
 			<territory type="GD">கிரனெடா</territory>
 			<territory type="GE">ஜார்ஜியா</territory>
 			<territory type="GF">பிரெஞ்சு கயானா</territory>
@@ -781,22 +783,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GM">காம்பியா</territory>
 			<territory type="GN">கினியா</territory>
 			<territory type="GP">க்வாதேலோப்</territory>
-			<territory type="GQ">ஈக்குவாடோரியல் கினியா</territory>
+			<territory type="GQ">ஈக்வடோரியல் கினியா</territory>
 			<territory type="GR">கிரீஸ்</territory>
 			<territory type="GS">தென் ஜியார்ஜியா மற்றும் தென் சான்ட்விச் தீவுகள்</territory>
 			<territory type="GT">கவுதமாலா</territory>
 			<territory type="GU">குவாம்</territory>
-			<territory type="GW">கினி-பிஸ்ஸாவ்</territory>
+			<territory type="GW">கினியா-பிஸ்ஸாவ்</territory>
 			<territory type="GY">கயானா</territory>
 			<territory type="HK">ஹாங்காங் எஸ்ஏஆர் சீனா</territory>
 			<territory type="HK" alt="short">ஹாங்காங்</territory>
 			<territory type="HM">ஹேர்ட் மற்றும் மெக்டொனால்டு தீவுகள்</territory>
 			<territory type="HN">ஹோண்டூராஸ்</territory>
-			<territory type="HR">குரோசியா</territory>
-			<territory type="HT">ஹெய்தி</territory>
+			<territory type="HR">குரேஷியா</territory>
+			<territory type="HT">ஹைட்டி</territory>
 			<territory type="HU">ஹங்கேரி</territory>
 			<territory type="IC">கேனரி தீவுகள்</territory>
-			<territory type="ID">இந்தோனேஷியா</territory>
+			<territory type="ID">இந்தோனேசியா</territory>
 			<territory type="IE">அயர்லாந்து</territory>
 			<territory type="IL">இஸ்ரேல்</territory>
 			<territory type="IM">ஐல் ஆஃப் மேன்</territory>
@@ -815,11 +817,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="KH">கம்போடியா</territory>
 			<territory type="KI">கிரிபடி</territory>
 			<territory type="KM">கோமரோஸ்</territory>
-			<territory type="KN">செயின்ட் கிட்ஸ் மற்றும் நெவிஸ்</territory>
+			<territory type="KN">செயின்ட் கிட்ஸ் &amp; நெவிஸ்</territory>
 			<territory type="KP">வட கொரியா</territory>
 			<territory type="KR">தென் கொரியா</territory>
 			<territory type="KW">குவைத்</territory>
-			<territory type="KY">கேமென் தீவுகள்</territory>
+			<territory type="KY">கெய்மென் தீவுகள்</territory>
 			<territory type="KZ">கஸகஸ்தான்</territory>
 			<territory type="LA">லாவோஸ்</territory>
 			<territory type="LB">லெபனான்</territory>
@@ -844,23 +846,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ML">மாலி</territory>
 			<territory type="MM">மியான்மார் (பர்மா)</territory>
 			<territory type="MN">மங்கோலியா</territory>
-			<territory type="MO">மகாவோ எஸ்ஏஆர் சீனா</territory>
-			<territory type="MO" alt="short">மகாவோ</territory>
+			<territory type="MO">மகாவ் எஸ்ஏஆர் சீனா</territory>
+			<territory type="MO" alt="short">மகாவ்</territory>
 			<territory type="MP">வடக்கு மரியானா தீவுகள்</territory>
 			<territory type="MQ">மார்டினிக்</territory>
 			<territory type="MR">மௌரிடானியா</territory>
-			<territory type="MS">மௌன்ட்செராட்</territory>
+			<territory type="MS">மாண்ட்செராட்</territory>
 			<territory type="MT">மால்டா</territory>
 			<territory type="MU">மொரிசியஸ்</territory>
 			<territory type="MV">மாலத்தீவு</territory>
-			<territory type="MW">மாலவி</territory>
+			<territory type="MW">மலாவி</territory>
 			<territory type="MX">மெக்சிகோ</territory>
-			<territory type="MY">மலேஷியா</territory>
+			<territory type="MY">மலேசியா</territory>
 			<territory type="MZ">மொசாம்பிக்</territory>
 			<territory type="NA">நமீபியா</territory>
 			<territory type="NC">நியூ கேலிடோனியா</territory>
 			<territory type="NE">நைஜர்</territory>
-			<territory type="NF">நார்ஃபாக் தீவுகள்</territory>
+			<territory type="NF">நார்ஃபோக் தீவுகள்</territory>
 			<territory type="NG">நைஜீரியா</territory>
 			<territory type="NI">நிகரகுவா</territory>
 			<territory type="NL">நெதர்லாந்து</territory>
@@ -873,11 +875,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="PA">பனாமா</territory>
 			<territory type="PE">பெரு</territory>
 			<territory type="PF">பிரெஞ்சு பாலினேஷியா</territory>
-			<territory type="PG">பாப்புவா நியூ கினி</territory>
+			<territory type="PG">பப்புவா நியூ கினியா</territory>
 			<territory type="PH">பிலிப்பைன்ஸ்</territory>
 			<territory type="PK">பாகிஸ்தான்</territory>
 			<territory type="PL">போலந்து</territory>
-			<territory type="PM">செயின்ட் பியர் மற்றும் மிக்வேலான்</territory>
+			<territory type="PM">செயின்ட் பியர் &amp; மிக்வேலான்</territory>
 			<territory type="PN">பிட்கெய்ர்ன் தீவுகள்</territory>
 			<territory type="PR">பியூர்டோ ரிகோ</territory>
 			<territory type="PS">பாலஸ்தீனிய பிரதேசங்கள்</territory>
@@ -886,7 +888,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="PW">பாலோ</territory>
 			<territory type="PY">பராகுவே</territory>
 			<territory type="QA">கத்தார்</territory>
-			<territory type="QO">ஔட்லையிங் ஓசானியா</territory>
+			<territory type="QO">வெளிப்புற ஓஷியானியா</territory>
 			<territory type="RE">ரீயூனியன்</territory>
 			<territory type="RO">ருமேனியா</territory>
 			<territory type="RS">செர்பியா</territory>
@@ -894,27 +896,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="RW">ருவான்டா</territory>
 			<territory type="SA">சவூதி அரேபியா</territory>
 			<territory type="SB">சாலமன் தீவுகள்</territory>
-			<territory type="SC">ஸேசேல்ஸ்</territory>
+			<territory type="SC">சீஷெல்ஸ்</territory>
 			<territory type="SD">சூடான்</territory>
 			<territory type="SE">ஸ்வீடன்</territory>
 			<territory type="SG">சிங்கப்பூர்</territory>
 			<territory type="SH">செயின்ட் ஹெலெனா</territory>
 			<territory type="SI">ஸ்லோவேனியா</territory>
-			<territory type="SJ">ஸ்வல்பார்டு மற்றும் ஜான் மேயன்</territory>
+			<territory type="SJ">ஸ்வல்பார்டு &amp; ஜான் மேயன்</territory>
 			<territory type="SK">ஸ்லோவாகியா</territory>
-			<territory type="SL">சியர்ரா லியோன்</territory>
-			<territory type="SM">சான் மெரினோ</territory>
+			<territory type="SL">சியாரா லியோன்</territory>
+			<territory type="SM">சான் மரினோ</territory>
 			<territory type="SN">செனெகல்</territory>
 			<territory type="SO">சோமாலியா</territory>
 			<territory type="SR">சுரினாம்</territory>
 			<territory type="SS">தெற்கு சூடான்</territory>
-			<territory type="ST">சாவ் தோம் மற்றும் ப்ரின்சிபி</territory>
+			<territory type="ST">சாவ் தோம் &amp; ப்ரின்சிபி</territory>
 			<territory type="SV">எல் சால்வடார்</territory>
 			<territory type="SX">சின்ட் மார்டென்</territory>
 			<territory type="SY">சிரியா</territory>
 			<territory type="SZ">ஸ்வாஸிலாந்து</territory>
 			<territory type="TA">டிரிஸ்டன் டா குன்ஹா</territory>
-			<territory type="TC">டர்க்ஸ் மற்றும் கைகோஸ் தீவுகள்</territory>
+			<territory type="TC">டர்க்ஸ் &amp; கைகோஸ் தீவுகள்</territory>
 			<territory type="TD">சாட்</territory>
 			<territory type="TF">பிரெஞ்சு தெற்கு பிரதேசங்கள்</territory>
 			<territory type="TG">டோகோ</territory>
@@ -922,24 +924,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="TJ">தாஜிகிஸ்தான்</territory>
 			<territory type="TK">டோகேலோ</territory>
 			<territory type="TL">தைமூர்-லெஸ்தே</territory>
-			<territory type="TL" alt="variant">கிழக்கு தைமோர்</territory>
+			<territory type="TL" alt="variant">கிழக்கு தைமூர்</territory>
 			<territory type="TM">துர்க்மெனிஸ்தான்</territory>
 			<territory type="TN">டுனிசியா</territory>
 			<territory type="TO">டோங்கா</territory>
 			<territory type="TR">துருக்கி</territory>
-			<territory type="TT">ட்ரினிடாட் மற்றும் டுபாகோ</territory>
+			<territory type="TT">ட்ரினிடாட் &amp; டொபாகோ</territory>
 			<territory type="TV">துவாலூ</territory>
 			<territory type="TW">தைவான்</territory>
 			<territory type="TZ">தான்சானியா</territory>
 			<territory type="UA">உக்ரைன்</territory>
 			<territory type="UG">உகாண்டா</territory>
-			<territory type="UM">யூஎஸ் அவுட்லேயிங் தீவுகள்</territory>
+			<territory type="UM">யூ.எஸ். வெளிப்புற தீவுகள்</territory>
 			<territory type="US">அமெரிக்கா</territory>
 			<territory type="US" alt="short">யூஎஸ்</territory>
 			<territory type="UY">உருகுவே</territory>
 			<territory type="UZ">உஸ்பெகிஸ்தான்</territory>
 			<territory type="VA">வாடிகன் நகரம்</territory>
-			<territory type="VC">செயின்ட் வின்சென்ட் மற்றும் கிரெனடைன்ஸ்</territory>
+			<territory type="VC">செயின்ட் வின்சென்ட் &amp; கிரெனடைன்ஸ்</territory>
 			<territory type="VE">வெனிசுலா</territory>
 			<territory type="VG">பிரிட்டீஷ் கன்னித் தீவுகள்</territory>
 			<territory type="VI">யூ.எஸ். கன்னித் தீவுகள்</territory>
@@ -949,7 +951,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="WS">சமோவா</territory>
 			<territory type="XK">கொசோவோ</territory>
 			<territory type="YE">ஏமன்</territory>
-			<territory type="YT">மயோத்</territory>
+			<territory type="YT">மயோட்</territory>
 			<territory type="ZA">தென் ஆப்பிரிக்கா</territory>
 			<territory type="ZM">ஜாம்பியா</territory>
 			<territory type="ZW">ஜிம்பாப்வே</territory>
@@ -966,11 +968,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colCaseFirst">பெரெழுத்து/சிற்றெழுத்து வரிசைமுறை</key>
 			<key type="colCaseLevel">எழுத்து உணர்ந்து வரிசைபடுத்துதல்</key>
 			<key type="colHiraganaQuaternary">கானா வரிசைபடுத்துதல்</key>
-			<key type="collation">வரிசைப்படுத்தல் முறை</key>
+			<key type="collation">வரிசை முறை</key>
 			<key type="colNormalization">இயல்பாக்கப்பட்ட வரிசைபடுத்துதல்</key>
 			<key type="colNumeric">எண்முறை வரிசைபடுத்துதல்</key>
 			<key type="colStrength">வரிசைப்படுத்தல் வலிமை</key>
 			<key type="currency">நாணயம்</key>
+			<key type="hc">மணிநேர சுழற்சி (12, 24)</key>
+			<key type="lb">வரி முறிப்பு ஸ்டைல்</key>
+			<key type="ms">அளவிடும் முறை</key>
 			<key type="numbers">எண்கள்</key>
 			<key type="timezone">நேர மண்டலம்</key>
 			<key type="va">மொழி மாறிலி</key>
@@ -978,95 +983,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">தனிப்பட்ட பயன்</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">அரபிய-இந்திய இலக்கங்கள்</type>
-			<type type="arabext" key="numbers">நீட்டிக்கப்பட்ட அரபிய-இந்திய இலக்கங்கள்</type>
-			<type type="armn" key="numbers">ஆர்மேனியன் எண்கள்</type>
-			<type type="armnlow" key="numbers">ஆர்மேனியன் சிற்றெழுத்து எண்கள்</type>
-			<type type="beng" key="numbers">பெங்காலி இலக்கங்கள்</type>
-			<type type="big5han" key="collation">பாரம்பரிய சீன வரிசை வடிவம் - Big5</type>
-			<type type="buddhist" key="calendar">புத்த நாள்காட்டி</type>
-			<type type="chinese" key="calendar">சீன நாள்காட்டி</type>
-			<type type="coptic" key="calendar">காப்டிக் நாள்காட்டி</type>
-			<type type="dangi" key="calendar">டேங்கி நாள்காட்டி</type>
-			<type type="deva" key="numbers">தேவநாகரி இலக்கங்கள்</type>
-			<type type="dictionary" key="collation">அகராதி வரிசை முறை</type>
-			<type type="ducet" key="collation">இயல்புநிலை யுனிகோட் வரிசை முறை</type>
-			<type type="ethi" key="numbers">எத்தியோப்பிக் எண்கள்</type>
-			<type type="ethiopic" key="calendar">எத்தியோப்பிக் நாள்காட்டி</type>
-			<type type="ethiopic-amete-alem" key="calendar">எத்தியோபிக் அமேதே ஆலெம் நாள்காட்டி</type>
-			<type type="finance" key="numbers">நிதி எண்கள்</type>
-			<type type="fullwide" key="numbers">முழு அகல இலக்கங்கள்</type>
-			<type type="gb2312han" key="collation">எளிமையாக்கப்பட்ட சீன வரிசை வடிவம் - GB2312</type>
-			<type type="geor" key="numbers">ஜியாரிஜியன் எண்கள்</type>
-			<type type="gregorian" key="calendar">கிரிகோரியன் நாள்காட்டி</type>
-			<type type="grek" key="numbers">கிரீக் எண்கள்</type>
-			<type type="greklow" key="numbers">கிரீக் சிறியஎழுத்து எண்கள்</type>
-			<type type="gujr" key="numbers">குஜராத்தி இலக்கங்கள்</type>
-			<type type="guru" key="numbers">குர்முகி இலக்கங்கள்</type>
-			<type type="hanidec" key="numbers">சீன பின்ன எண்கள்</type>
-			<type type="hans" key="numbers">எளிதாக்கப்பட்ட சீன எண்கள்</type>
-			<type type="hansfin" key="numbers">எளிதாக்கப்பட்ட சீன நிதி எண்கள்</type>
-			<type type="hant" key="numbers">பாரம்பரிய சீன எண்கள்</type>
-			<type type="hantfin" key="numbers">பாரம்பரிய சீன நிதி எண்கள்</type>
-			<type type="hebr" key="numbers">ஹீப்ரு எண்கள்</type>
-			<type type="hebrew" key="calendar">ஹீப்ரு நாள்காட்டி</type>
-			<type type="identical" key="colStrength">அனைத்தையும் வரிசைப்படுத்து</type>
-			<type type="indian" key="calendar">இந்திய தேச நாள்காட்டி</type>
-			<type type="islamic" key="calendar">இஸ்லாமிய நாள்காட்டி</type>
-			<type type="islamic-civil" key="calendar">இஸ்லாமிய சிவில் நாள்காட்டி</type>
-			<type type="iso8601" key="calendar">ISO-8601 நாள்காட்டி</type>
-			<type type="japanese" key="calendar">ஜப்பானிய நாள்காட்டி</type>
-			<type type="jpan" key="numbers">ஜப்பானிய எண்கள்</type>
-			<type type="jpanfin" key="numbers">ஜப்பானிய நிதி எண்கள்</type>
-			<type type="khmr" key="numbers">கெமெர் இலக்கங்கள்</type>
-			<type type="knda" key="numbers">கன்னட இலக்கங்கள்</type>
-			<type type="laoo" key="numbers">லாவோ இலக்கங்கள்</type>
-			<type type="latn" key="numbers">மேற்கத்திய இலக்கங்கள்</type>
-			<type type="lower" key="colCaseFirst">முதலில் சிற்றெழுத்துகளை வரிசைப்படுத்து</type>
-			<type type="mlym" key="numbers">மலையாள இலக்கங்கள்</type>
-			<type type="mong" key="numbers">மங்கோலியன் இலக்கங்கள்</type>
-			<type type="mymr" key="numbers">மியான்மர் இலக்கங்கள்</type>
-			<type type="native" key="numbers">சொந்த இலக்கங்கள்</type>
-			<type type="no" key="colBackwards">உச்சரிப்புகளை இயல்பாக வரிசைபடுத்து</type>
-			<type type="no" key="colCaseFirst">இயல்பான எழுத்து வடிவில் வரிசைபடுத்து</type>
-			<type type="no" key="colCaseLevel">எழுத்து உணர்வின்றி வரிசைபடுத்து</type>
-			<type type="no" key="colHiraganaQuaternary">கானாவை தனியாக வரிசைப்படுத்து</type>
-			<type type="no" key="colNormalization">இயல்பாக்கம் இல்லாமல் வரிசைபடுத்து</type>
-			<type type="no" key="colNumeric">இலக்கங்களை, தனியாக வரிசைப்படுத்து</type>
-			<type type="non-ignorable" key="colAlternate">சின்னங்களை வரிசைப்படுத்து</type>
-			<type type="orya" key="numbers">ஒரியா இலக்கங்கள்</type>
-			<type type="persian" key="calendar">பெர்சியன் நாள்காட்டி</type>
-			<type type="phonebook" key="collation">தொலைபேசி புத்தக வரிசை முறை</type>
-			<type type="phonetic" key="collation">ஒலியியல் வரிசைப்படுத்தல் முறை</type>
-			<type type="pinyin" key="collation">பின்யின் வரிசை முறை</type>
-			<type type="primary" key="colStrength">அடிப்படை எழுத்துகளை மட்டும் வரிசைபடுத்து</type>
-			<type type="quaternary" key="colStrength">உச்சரிப்புகள்/எழுத்து/அகலம்/கானாவை வரிசைப்படுத்து</type>
-			<type type="reformed" key="collation">சீர்திருத்தப்பட்ட வரிசை முறை</type>
-			<type type="roc" key="calendar">மின்கோ நாள்காட்டி</type>
-			<type type="roman" key="numbers">ரோமன் எண்கள்</type>
-			<type type="romanlow" key="numbers">சிறிய ரோமானிய எண்கள்</type>
-			<type type="search" key="collation">பொதுப்படையான தேடல்</type>
-			<type type="searchjl" key="collation">ஹங்குல் முதன்மை மெய்யெழுத்தின்படி தேடு</type>
-			<type type="secondary" key="colStrength">உச்சரிப்புகளை வரிசைபடுத்து</type>
-			<type type="shifted" key="colAlternate">சின்னங்களைப் புறக்கணித்து வரிசைப்படுத்து</type>
-			<type type="standard" key="collation">நிலையான வரிசை முறை</type>
-			<type type="stroke" key="collation">ஸ்ட்ரோக் வரிசை முறை</type>
-			<type type="taml" key="numbers">பாரம்பரிய தமிழ் எண்கள்</type>
-			<type type="tamldec" key="numbers">தமிழ் இலக்கங்கள்</type>
-			<type type="telu" key="numbers">தெலுங்கு இலக்கங்கள்</type>
-			<type type="tertiary" key="colStrength">உச்சரிப்புகள்/எழுத்து/அகலத்தை வரிசைப்படுத்து</type>
-			<type type="thai" key="numbers">தாய் இலக்கங்கள்</type>
-			<type type="tibt" key="numbers">திபெத்தியன் எண்கள்</type>
-			<type type="traditional" key="collation">பாரம்பரிய வரிசை முறை</type>
-			<type type="traditional" key="numbers">பாரம்பரிய எண்கள்</type>
-			<type type="unihan" key="collation">ரேடியன் ஸ்ட்ரோக் வரிசை முறை</type>
-			<type type="upper" key="colCaseFirst">முதலில் பேரெழுத்துகளை வரிசைப்படுத்து</type>
-			<type type="vaii" key="numbers">வை எண்கள்</type>
-			<type type="yes" key="colBackwards">உச்சரிப்புகளை நேர்மறையாக வரிசைபடுத்து</type>
-			<type type="yes" key="colCaseLevel">எழுத்து உணர்வில் வரிசைபடுத்து</type>
-			<type type="yes" key="colHiraganaQuaternary">கானாவை வேறுபட்டதாக வரிசைப்படுத்து</type>
-			<type type="yes" key="colNormalization">இயல்பாக்கப்பட்ட யூனிகோடை வரிசைப்படுத்து</type>
-			<type type="yes" key="colNumeric">இலக்கங்களை எண்களாக வரிசைப்படுத்து</type>
+			<type key="calendar" type="buddhist">புத்த நாள்காட்டி</type>
+			<type key="calendar" type="chinese">சீன நாள்காட்டி</type>
+			<type key="calendar" type="coptic">காப்டிக் நாள்காட்டி</type>
+			<type key="calendar" type="dangi">டேங்கி நாள்காட்டி</type>
+			<type key="calendar" type="ethiopic">எத்தியோப்பிக் நாள்காட்டி</type>
+			<type key="calendar" type="ethiopic-amete-alem">எத்தியோபிக் அமேதே ஆலெம் நாள்காட்டி</type>
+			<type key="calendar" type="gregorian">கிரிகோரியன் நாள்காட்டி</type>
+			<type key="calendar" type="hebrew">ஹீப்ரு நாள்காட்டி</type>
+			<type key="calendar" type="indian">இந்திய தேச நாள்காட்டி</type>
+			<type key="calendar" type="islamic">இஸ்லாமிய நாள்காட்டி</type>
+			<type key="calendar" type="islamic-civil">இஸ்லாமிய சிவில் நாள்காட்டி</type>
+			<type key="calendar" type="iso8601">ISO-8601 நாள்காட்டி</type>
+			<type key="calendar" type="japanese">ஜப்பானிய நாள்காட்டி</type>
+			<type key="calendar" type="persian">பெர்சியன் நாள்காட்டி</type>
+			<type key="calendar" type="roc">மின்கோ நாள்காட்டி</type>
+			<type key="colAlternate" type="non-ignorable">சின்னங்களை வரிசைப்படுத்து</type>
+			<type key="colAlternate" type="shifted">சின்னங்களைப் புறக்கணித்து வரிசைப்படுத்து</type>
+			<type key="colBackwards" type="no">உச்சரிப்புகளை இயல்பாக வரிசைபடுத்து</type>
+			<type key="colBackwards" type="yes">உச்சரிப்புகளை நேர்மறையாக வரிசைபடுத்து</type>
+			<type key="colCaseFirst" type="lower">முதலில் சிற்றெழுத்துகளை வரிசைப்படுத்து</type>
+			<type key="colCaseFirst" type="no">இயல்பான எழுத்து வடிவில் வரிசைபடுத்து</type>
+			<type key="colCaseFirst" type="upper">முதலில் பேரெழுத்துகளை வரிசைப்படுத்து</type>
+			<type key="colCaseLevel" type="no">எழுத்து உணர்வின்றி வரிசைபடுத்து</type>
+			<type key="colCaseLevel" type="yes">எழுத்து உணர்வில் வரிசைபடுத்து</type>
+			<type key="colHiraganaQuaternary" type="no">கானாவை தனியாக வரிசைப்படுத்து</type>
+			<type key="colHiraganaQuaternary" type="yes">கானாவை வேறுபட்டதாக வரிசைப்படுத்து</type>
+			<type key="collation" type="big5han">பாரம்பரிய சீன வரிசை வடிவம் - Big5</type>
+			<type key="collation" type="dictionary">அகராதி வரிசை முறை</type>
+			<type key="collation" type="ducet">இயல்புநிலை யுனிகோட் வரிசை முறை</type>
+			<type key="collation" type="gb2312han">எளிமையாக்கப்பட்ட சீன வரிசை வடிவம் - GB2312</type>
+			<type key="collation" type="phonebook">தொலைபேசி புத்தக வரிசை முறை</type>
+			<type key="collation" type="phonetic">ஒலியியல் வரிசைப்படுத்தல் முறை</type>
+			<type key="collation" type="pinyin">பின்யின் வரிசை முறை</type>
+			<type key="collation" type="reformed">சீர்திருத்தப்பட்ட வரிசை முறை</type>
+			<type key="collation" type="search">பொதுப்படையான தேடல்</type>
+			<type key="collation" type="searchjl">ஹங்குல் முதன்மை மெய்யெழுத்தின்படி தேடு</type>
+			<type key="collation" type="standard">நிலையான வரிசை முறை</type>
+			<type key="collation" type="stroke">ஸ்ட்ரோக் வரிசை முறை</type>
+			<type key="collation" type="traditional">பாரம்பரிய வரிசை முறை</type>
+			<type key="collation" type="unihan">ரேடியன் ஸ்ட்ரோக் வரிசை முறை</type>
+			<type key="colNormalization" type="no">இயல்பாக்கம் இல்லாமல் வரிசைபடுத்து</type>
+			<type key="colNormalization" type="yes">இயல்பாக்கப்பட்ட யூனிகோடை வரிசைப்படுத்து</type>
+			<type key="colNumeric" type="no">இலக்கங்களை, தனியாக வரிசைப்படுத்து</type>
+			<type key="colNumeric" type="yes">இலக்கங்களை எண்களாக வரிசைப்படுத்து</type>
+			<type key="colStrength" type="identical">அனைத்தையும் வரிசைப்படுத்து</type>
+			<type key="colStrength" type="primary">அடிப்படை எழுத்துகளை மட்டும் வரிசைபடுத்து</type>
+			<type key="colStrength" type="quaternary">உச்சரிப்புகள்/எழுத்து/அகலம்/கானாவை வரிசைப்படுத்து</type>
+			<type key="colStrength" type="secondary">உச்சரிப்புகளை வரிசைபடுத்து</type>
+			<type key="colStrength" type="tertiary">உச்சரிப்புகள்/எழுத்து/அகலத்தை வரிசைப்படுத்து</type>
+			<type key="hc" type="h11">12 மணிநேர முறைமை (0–11)</type>
+			<type key="hc" type="h12">12 மணிநேர முறைமை (1–12)</type>
+			<type key="hc" type="h23">24 மணிநேர முறைமை (0–23)</type>
+			<type key="hc" type="h24">24 மணிநேர முறைமை (1–24)</type>
+			<type key="lb" type="loose">தளர்வான வரி முறிப்பு ஸ்டைல்</type>
+			<type key="lb" type="normal">சாதாரண வரி முறிப்பு ஸ்டைல்</type>
+			<type key="lb" type="strict">கண்டிப்பான வரி முறிப்பு ஸ்டைல்</type>
+			<type key="ms" type="metric">மெட்ரிக் முறை</type>
+			<type key="ms" type="uksystem">இம்பீரியல் அளவிடும் முறை</type>
+			<type key="ms" type="ussystem">அமெரிக்க அளவிடும் முறை</type>
+			<type key="numbers" type="arab">அரபிய-இந்திய இலக்கங்கள்</type>
+			<type key="numbers" type="arabext">நீட்டிக்கப்பட்ட அரபிய-இந்திய இலக்கங்கள்</type>
+			<type key="numbers" type="armn">ஆர்மேனியன் எண்கள்</type>
+			<type key="numbers" type="armnlow">ஆர்மேனியன் சிற்றெழுத்து எண்கள்</type>
+			<type key="numbers" type="beng">பெங்காலி இலக்கங்கள்</type>
+			<type key="numbers" type="deva">தேவநாகரி இலக்கங்கள்</type>
+			<type key="numbers" type="ethi">எத்தியோப்பிய எண்கள்</type>
+			<type key="numbers" type="finance">நிதி எண்கள்</type>
+			<type key="numbers" type="fullwide">முழு-அகல இலக்கங்கள்</type>
+			<type key="numbers" type="geor">ஜார்ஜியன் எண்கள்</type>
+			<type key="numbers" type="grek">கிரீக் எண்கள்</type>
+			<type key="numbers" type="greklow">கிரீக் சிற்றெழுத்து எண்கள்</type>
+			<type key="numbers" type="gujr">குஜராத்தி இலக்கங்கள்</type>
+			<type key="numbers" type="guru">குர்முகி இலக்கங்கள்</type>
+			<type key="numbers" type="hanidec">சீன பின்ன எண்கள்</type>
+			<type key="numbers" type="hans">எளிதாக்கப்பட்ட சீன எண்கள்</type>
+			<type key="numbers" type="hansfin">எளிதாக்கப்பட்ட சீன நிதி எண்கள்</type>
+			<type key="numbers" type="hant">பாரம்பரிய சீன எண்கள்</type>
+			<type key="numbers" type="hantfin">பாரம்பரிய சீன நிதி எண்கள்</type>
+			<type key="numbers" type="hebr">ஹீப்ரு எண்கள்</type>
+			<type key="numbers" type="jpan">ஜப்பானிய எண்கள்</type>
+			<type key="numbers" type="jpanfin">ஜப்பானிய நிதி எண்கள்</type>
+			<type key="numbers" type="khmr">கெமெர் இலக்கங்கள்</type>
+			<type key="numbers" type="knda">கன்னட இலக்கங்கள்</type>
+			<type key="numbers" type="laoo">லாவோ இலக்கங்கள்</type>
+			<type key="numbers" type="latn">மேற்கத்திய இலக்கங்கள்</type>
+			<type key="numbers" type="mlym">மலையாள இலக்கங்கள்</type>
+			<type key="numbers" type="mong">மங்கோலியன் இலக்கங்கள்</type>
+			<type key="numbers" type="mymr">மியான்மர் இலக்கங்கள்</type>
+			<type key="numbers" type="native">சொந்த இலக்கங்கள்</type>
+			<type key="numbers" type="orya">ஒரியா இலக்கங்கள்</type>
+			<type key="numbers" type="roman">ரோமன் எண்கள்</type>
+			<type key="numbers" type="romanlow">ரோமன் சிற்றெழுத்து எண்கள்</type>
+			<type key="numbers" type="taml">பாரம்பரிய தமிழ் எண்கள்</type>
+			<type key="numbers" type="tamldec">தமிழ் இலக்கங்கள்</type>
+			<type key="numbers" type="telu">தெலுங்கு இலக்கங்கள்</type>
+			<type key="numbers" type="thai">தாய் இலக்கங்கள்</type>
+			<type key="numbers" type="tibt">திபெத்தியன் இலக்கங்கள்</type>
+			<type key="numbers" type="traditional">பாரம்பரிய எண்கள்</type>
+			<type key="numbers" type="vaii">வை எண்கள்</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN">BGN</transformName>
@@ -1272,16 +1287,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM, y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
+						<dateFormatItem id="h">a h</dateFormatItem>
 						<dateFormatItem id="H">HH</dateFormatItem>
-						<dateFormatItem id="hm">h:mm a</dateFormatItem>
+						<dateFormatItem id="hm">a h:mm</dateFormatItem>
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
-						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="hms">a h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
@@ -1311,33 +1327,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="d">d–d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
+							<greatestDifference id="a">a h – a h</greatestDifference>
+							<greatestDifference id="h">a h–h</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
 							<greatestDifference id="H">HH–HH</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="a">a h:mm – a h:mm</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hm">
 							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
 							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="a">a h:mm – a h:mm v</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm v</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hmv">
 							<greatestDifference id="H">HH:mm–HH:mm v</greatestDifference>
 							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
+							<greatestDifference id="a">a h – a h v</greatestDifference>
+							<greatestDifference id="h">a h–h v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
 							<greatestDifference id="H">HH–HH v</greatestDifference>
@@ -1496,13 +1512,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<days>
 					<dayContext type="format">
 						<dayWidth type="abbreviated">
-							<day type="sun">ஞா</day>
-							<day type="mon">தி</day>
-							<day type="tue">செ</day>
-							<day type="wed">பு</day>
-							<day type="thu">வி</day>
-							<day type="fri">வெ</day>
-							<day type="sat">ச</day>
+							<day type="sun">ஞாயி.</day>
+							<day type="mon">திங்.</day>
+							<day type="tue">செவ்.</day>
+							<day type="wed">புத.</day>
+							<day type="thu">வியா.</day>
+							<day type="fri">வெள்.</day>
+							<day type="sat">சனி</day>
 						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun">ஞா</day>
@@ -1534,13 +1550,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dayContext>
 					<dayContext type="stand-alone">
 						<dayWidth type="abbreviated">
-							<day type="sun">ஞா</day>
-							<day type="mon">தி</day>
-							<day type="tue">செ</day>
-							<day type="wed">பு</day>
-							<day type="thu">வி</day>
-							<day type="fri">வெ</day>
-							<day type="sat">ச</day>
+							<day type="sun">ஞாயி.</day>
+							<day type="mon">திங்.</day>
+							<day type="tue">செவ்.</day>
+							<day type="wed">புத.</day>
+							<day type="thu">வியா.</day>
+							<day type="fri">வெள்.</day>
+							<day type="sat">சனி</day>
 						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun">ஞா</day>
@@ -1574,10 +1590,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<quarters>
 					<quarterContext type="format">
 						<quarterWidth type="abbreviated">
-							<quarter type="1">காலாண்டு1</quarter>
-							<quarter type="2">காலாண்டு2</quarter>
-							<quarter type="3">காலாண்டு3</quarter>
-							<quarter type="4">காலாண்டு4</quarter>
+							<quarter type="1">காலா.1</quarter>
+							<quarter type="2">காலா.2</quarter>
+							<quarter type="3">காலா.3</quarter>
+							<quarter type="4">காலா.4</quarter>
 						</quarterWidth>
 						<quarterWidth type="narrow">
 							<quarter type="1">1</quarter>
@@ -1586,18 +1602,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<quarter type="4">4</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
-							<quarter type="1">முதல் காலாண்டு</quarter>
-							<quarter type="2">இரண்டாம் காலாண்டு</quarter>
-							<quarter type="3">மூன்றாம் காலாண்டு</quarter>
-							<quarter type="4">நான்காம் காலாண்டு</quarter>
+							<quarter type="1">1ஆம் காலாண்டு</quarter>
+							<quarter type="2">2ஆம் காலாண்டு</quarter>
+							<quarter type="3">3ஆம் காலாண்டு</quarter>
+							<quarter type="4">4ஆம் காலாண்டு</quarter>
 						</quarterWidth>
 					</quarterContext>
 					<quarterContext type="stand-alone">
 						<quarterWidth type="abbreviated">
-							<quarter type="1">காலாண்டு1</quarter>
-							<quarter type="2">காலாண்டு2</quarter>
-							<quarter type="3">காலாண்டு3</quarter>
-							<quarter type="4">காலாண்டு4</quarter>
+							<quarter type="1">காலா.1</quarter>
+							<quarter type="2">காலா.2</quarter>
+							<quarter type="3">காலா.3</quarter>
+							<quarter type="4">காலா.4</quarter>
 						</quarterWidth>
 						<quarterWidth type="narrow">
 							<quarter type="1">1</quarter>
@@ -1606,28 +1622,94 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<quarter type="4">4</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
-							<quarter type="1">முதல் காலாண்டு</quarter>
-							<quarter type="2">இரண்டாம் காலாண்டு</quarter>
-							<quarter type="3">மூன்றாம் காலாண்டு</quarter>
-							<quarter type="4">நான்காம் காலாண்டு</quarter>
+							<quarter type="1">1ஆம் காலாண்டு</quarter>
+							<quarter type="2">2ஆம் காலாண்டு</quarter>
+							<quarter type="3">3ஆம் காலாண்டு</quarter>
+							<quarter type="4">4ஆம் காலாண்டு</quarter>
 						</quarterWidth>
 					</quarterContext>
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am">முற்பகல்</dayPeriod>
-							<dayPeriod type="pm">பிற்பகல்</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">மு.ப</dayPeriod>
-							<dayPeriod type="noon">ம</dayPeriod>
-							<dayPeriod type="pm">பி.ப</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">நள்ளிரவு</dayPeriod>
 							<dayPeriod type="am">முற்பகல்</dayPeriod>
 							<dayPeriod type="noon">நண்பகல்</dayPeriod>
 							<dayPeriod type="pm">பிற்பகல்</dayPeriod>
+							<dayPeriod type="morning1">அதிகாலை</dayPeriod>
+							<dayPeriod type="morning2">காலை</dayPeriod>
+							<dayPeriod type="afternoon1">மதியம்</dayPeriod>
+							<dayPeriod type="afternoon2">பிற்பகல்</dayPeriod>
+							<dayPeriod type="evening1">மாலை</dayPeriod>
+							<dayPeriod type="evening2">அந்தி மாலை</dayPeriod>
+							<dayPeriod type="night1">இரவு</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">நள்.</dayPeriod>
+							<dayPeriod type="am">மு.ப</dayPeriod>
+							<dayPeriod type="noon">நண்.</dayPeriod>
+							<dayPeriod type="pm">பி.ப</dayPeriod>
+							<dayPeriod type="morning1">அதி.</dayPeriod>
+							<dayPeriod type="morning2">கா.</dayPeriod>
+							<dayPeriod type="afternoon1">மதி.</dayPeriod>
+							<dayPeriod type="afternoon2">பிற்.</dayPeriod>
+							<dayPeriod type="evening1">மா.</dayPeriod>
+							<dayPeriod type="evening2">அந்தி மா.</dayPeriod>
+							<dayPeriod type="night1">இர.</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">நள்ளிரவு</dayPeriod>
+							<dayPeriod type="am">முற்பகல்</dayPeriod>
+							<dayPeriod type="noon">நண்பகல்</dayPeriod>
+							<dayPeriod type="pm">பிற்பகல்</dayPeriod>
+							<dayPeriod type="morning1">அதிகாலை</dayPeriod>
+							<dayPeriod type="morning2">காலை</dayPeriod>
+							<dayPeriod type="afternoon1">மதியம்</dayPeriod>
+							<dayPeriod type="afternoon2">பிற்பகல்</dayPeriod>
+							<dayPeriod type="evening1">மாலை</dayPeriod>
+							<dayPeriod type="evening2">அந்தி மாலை</dayPeriod>
+							<dayPeriod type="night1">இரவு</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">நள்ளிரவு</dayPeriod>
+							<dayPeriod type="am">முற்பகல்</dayPeriod>
+							<dayPeriod type="noon">நண்பகல்</dayPeriod>
+							<dayPeriod type="pm">பிற்பகல்</dayPeriod>
+							<dayPeriod type="morning1">அதிகாலை</dayPeriod>
+							<dayPeriod type="morning2">காலை</dayPeriod>
+							<dayPeriod type="afternoon1">மதியம்</dayPeriod>
+							<dayPeriod type="afternoon2">பிற்பகல்</dayPeriod>
+							<dayPeriod type="evening1">மாலை</dayPeriod>
+							<dayPeriod type="evening2">அந்தி மாலை</dayPeriod>
+							<dayPeriod type="night1">இரவு</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">நள்.</dayPeriod>
+							<dayPeriod type="am">மு.ப</dayPeriod>
+							<dayPeriod type="noon">நண்.</dayPeriod>
+							<dayPeriod type="pm">பி.ப</dayPeriod>
+							<dayPeriod type="morning1">அதி.</dayPeriod>
+							<dayPeriod type="morning2">கா.</dayPeriod>
+							<dayPeriod type="afternoon1">மதி.</dayPeriod>
+							<dayPeriod type="afternoon2">பிற்.</dayPeriod>
+							<dayPeriod type="evening1">மா.</dayPeriod>
+							<dayPeriod type="evening2">அந்தி மா.</dayPeriod>
+							<dayPeriod type="night1">இ.</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">நள்ளிரவு</dayPeriod>
+							<dayPeriod type="am">முற்பகல்</dayPeriod>
+							<dayPeriod type="noon">நண்பகல்</dayPeriod>
+							<dayPeriod type="pm">பிற்பகல்</dayPeriod>
+							<dayPeriod type="morning1">அதிகாலை</dayPeriod>
+							<dayPeriod type="morning2">காலை</dayPeriod>
+							<dayPeriod type="afternoon1">மதியம்</dayPeriod>
+							<dayPeriod type="afternoon2">பிற்பகல்</dayPeriod>
+							<dayPeriod type="evening1">மாலை</dayPeriod>
+							<dayPeriod type="evening2">அந்தி மாலை</dayPeriod>
+							<dayPeriod type="night1">இரவு</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1635,7 +1717,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<eraNames>
 						<era type="0">கிறிஸ்துவுக்கு முன்</era>
 						<era type="0" alt="variant">பொ.ச.மு</era>
-						<era type="1">அனோ டோமினி</era>
+						<era type="1">அன்னோ டோமினி</era>
 						<era type="1" alt="variant">பொ.ச</era>
 					</eraNames>
 					<eraAbbr>
@@ -1663,29 +1745,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>d-M-yy</pattern>
+							<pattern>d/M/yy</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>a h:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>a h:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>a h:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>a h:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -1714,9 +1796,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="d">d</dateFormatItem>
 						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
-						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
+						<dateFormatItem id="Ehm">E a h:mm</dateFormatItem>
 						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
-						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Ehms">E a h:mm:ss</dateFormatItem>
 						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">G y</dateFormatItem>
 						<dateFormatItem id="GyMMM">G y MMM</dateFormatItem>
@@ -1728,6 +1810,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">a h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">a h:mm:ss v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">a h:mm v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">MM-dd, E</dateFormatItem>
@@ -1774,17 +1860,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="m">HH:mm – HH:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm – h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm – h:mm a v</greatestDifference>
+							<greatestDifference id="a">a h:mm – a h:mm v</greatestDifference>
+							<greatestDifference id="h">a h:mm – h:mm v</greatestDifference>
+							<greatestDifference id="m">a h:mm – h:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hmv">
 							<greatestDifference id="H">HH:mm – HH:mm v</greatestDifference>
 							<greatestDifference id="m">HH:mm – HH:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h – h a v</greatestDifference>
+							<greatestDifference id="a">a h – a h v</greatestDifference>
+							<greatestDifference id="h">a h – h v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
 							<greatestDifference id="H">HH – HH v</greatestDifference>
@@ -1870,6 +1956,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>ஆண்டு</displayName>
+				<relative type="-1">கடந்த ஆண்டு</relative>
+				<relative type="0">இந்த ஆண்டு</relative>
+				<relative type="1">அடுத்த ஆண்டு</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ஆண்டில்</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ஆண்டுகளில்</relativeTimePattern>
@@ -1880,18 +1969,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="year-narrow">
-				<displayName>ஆண்டு</displayName>
+				<displayName>ஆ.</displayName>
+				<relative type="-1">கடந்த ஆண்டு</relative>
+				<relative type="0">இந்த ஆண்டு</relative>
+				<relative type="1">அடுத்த ஆண்டு</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} ஆண்டில்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} ஆண்டுகளில்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ஆ.</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ஆ.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} ஆண்டிற்கு முன்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} ஆண்டுகளுக்கு முன்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ஆ. முன்</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ஆ. முன்</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter">
 				<displayName>காலாண்டு</displayName>
+				<relative type="-1">இறுதி காலாண்டு</relative>
+				<relative type="0">இந்த காலாண்டு</relative>
+				<relative type="1">அடுத்த காலாண்டு</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} காலாண்டில்</relativeTimePattern>
 					<relativeTimePattern count="other">{0} காலாண்டுகளில்</relativeTimePattern>
@@ -1903,9 +1998,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>காலாண்டு</displayName>
+				<relative type="-1">இறுதி காலாண்டு</relative>
+				<relative type="0">இந்த காலாண்டு</relative>
+				<relative type="1">அடுத்த காலாண்டு</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} காலா.</relativeTimePattern>
-					<relativeTimePattern count="other">{0} காலாண்டுகளில்</relativeTimePattern>
+					<relativeTimePattern count="other">{0} காலா.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} காலா. முன்</relativeTimePattern>
@@ -1914,13 +2012,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>காலாண்டு</displayName>
+				<relative type="-1">இறுதி காலாண்டு</relative>
+				<relative type="0">இந்த காலாண்டு</relative>
+				<relative type="1">அடுத்த காலாண்டு</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} காலாண்டில்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} காலாண்டுகளில்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} கா.</relativeTimePattern>
+					<relativeTimePattern count="other">{0} கா.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">-{0} கா.</relativeTimePattern>
-					<relativeTimePattern count="other">-{0} கா.</relativeTimePattern>
+					<relativeTimePattern count="one">{0} கா. முன்</relativeTimePattern>
+					<relativeTimePattern count="other">{0} கா. முன்</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month">
@@ -1939,24 +2040,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>மாதம்</displayName>
+				<relative type="-1">கடந்த மாதம்</relative>
+				<relative type="0">இந்த மாதம்</relative>
+				<relative type="1">அடுத்த மாதம்</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} மாதத்தில்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} மாதங்களில்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} மாத.</relativeTimePattern>
+					<relativeTimePattern count="other">{0} மாத.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} மாதத்திற்கு முன்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} மாதங்களுக்கு முன்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} மாத. முன்</relativeTimePattern>
+					<relativeTimePattern count="other">{0} மாத. முன்</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month-narrow">
-				<displayName>மாதம்</displayName>
+				<displayName>மா.</displayName>
+				<relative type="-1">கடந்த மாதம்</relative>
+				<relative type="0">இந்த மாதம்</relative>
+				<relative type="1">அடுத்த மாதம்</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} மாதத்தில்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} மாதங்களில்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} மா.</relativeTimePattern>
+					<relativeTimePattern count="other">{0} மா.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} மாதத்திற்கு முன்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} மாதங்களுக்கு முன்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} மா. முன்</relativeTimePattern>
+					<relativeTimePattern count="other">{0} மா. முன்</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week">
@@ -1975,24 +2082,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>வாரம்</displayName>
+				<relative type="-1">கடந்த வாரம்</relative>
+				<relative type="0">இந்த வாரம்</relative>
+				<relative type="1">அடுத்த வாரம்</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} வாரத்தில்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} வாரங்களில்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} வார.</relativeTimePattern>
+					<relativeTimePattern count="other">{0} வார.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} வாரத்திற்கு முன்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} வாரங்களுக்கு முன்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} வார. முன்</relativeTimePattern>
+					<relativeTimePattern count="other">{0} வார. முன்</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week-narrow">
-				<displayName>வாரம்</displayName>
+				<displayName>வா.</displayName>
+				<relative type="-1">கடந்த வாரம்</relative>
+				<relative type="0">இந்த வாரம்</relative>
+				<relative type="1">அடுத்த வாரம்</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} வாரத்தில்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} வாரங்களில்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} வா.</relativeTimePattern>
+					<relativeTimePattern count="other">{0} வா.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} வாரத்திற்கு முன்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} வாரங்களுக்கு முன்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} வா. முன்</relativeTimePattern>
+					<relativeTimePattern count="other">{0} வா. முன்</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day">
@@ -2013,6 +2126,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>நாள்</displayName>
+				<relative type="-2">நேற்று முன் தினம்</relative>
+				<relative type="-1">நேற்று</relative>
+				<relative type="0">இன்று</relative>
+				<relative type="1">நாளை</relative>
+				<relative type="2">நாளை மறுநாள்</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} நாளில்</relativeTimePattern>
 					<relativeTimePattern count="other">{0} நாட்களில்</relativeTimePattern>
@@ -2023,14 +2141,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day-narrow">
-				<displayName>நாள்</displayName>
+				<displayName>நா.</displayName>
+				<relative type="-2">நேற்று முன் தினம்</relative>
+				<relative type="-1">நேற்று</relative>
+				<relative type="0">இன்று</relative>
+				<relative type="1">நாளை</relative>
+				<relative type="2">நாளை மறுநாள்</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} நாளில்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} நாட்களில்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} நா.</relativeTimePattern>
+					<relativeTimePattern count="other">{0} நா.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} நாளைக்கு முன்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} நாட்களுக்கு முன்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} நா. முன்</relativeTimePattern>
+					<relativeTimePattern count="other">{0} நா. முன்</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="weekday">
@@ -2042,14 +2165,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">அடுத்த ஞாயிறு</relative>
 			</field>
 			<field type="sun-short">
-				<relative type="-1">கடந்த ஞாயிறு</relative>
-				<relative type="0">இந்த ஞாயிறு</relative>
-				<relative type="1">அடுத்த ஞாயிறு</relative>
+				<relative type="-1">கடந்த ஞாயி.</relative>
+				<relative type="0">இந்த ஞாயி.</relative>
+				<relative type="1">அடுத்த ஞாயி.</relative>
 			</field>
 			<field type="sun-narrow">
-				<relative type="-1">கடந்த ஞாயிறு</relative>
-				<relative type="0">இந்த ஞாயிறு</relative>
-				<relative type="1">அடுத்த ஞாயிறு</relative>
+				<relative type="-1">கடந்த ஞா.</relative>
+				<relative type="0">இந்த ஞா.</relative>
+				<relative type="1">அடுத்த ஞா.</relative>
 			</field>
 			<field type="mon">
 				<relative type="-1">கடந்த திங்கள்</relative>
@@ -2057,14 +2180,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">அடுத்த திங்கள்</relative>
 			</field>
 			<field type="mon-short">
-				<relative type="-1">கடந்த திங்கள்</relative>
-				<relative type="0">இந்த திங்கள்</relative>
-				<relative type="1">அடுத்த திங்கள்</relative>
+				<relative type="-1">கடந்த திங்.</relative>
+				<relative type="0">இந்த திங்.</relative>
+				<relative type="1">அடுத்த திங்.</relative>
 			</field>
 			<field type="mon-narrow">
-				<relative type="-1">கடந்த திங்கள்</relative>
-				<relative type="0">இந்த திங்கள்</relative>
-				<relative type="1">அடுத்த திங்கள்</relative>
+				<relative type="-1">கடந்த திங்.</relative>
+				<relative type="0">இந்த திங்.</relative>
+				<relative type="1">அடுத்த திங்.</relative>
 			</field>
 			<field type="tue">
 				<relative type="-1">கடந்த செவ்வாய்</relative>
@@ -2072,14 +2195,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">அடுத்த செவ்வாய்</relative>
 			</field>
 			<field type="tue-short">
-				<relative type="-1">கடந்த செவ்வாய்</relative>
-				<relative type="0">இந்த செவ்வாய்</relative>
-				<relative type="1">அடுத்த செவ்வாய்</relative>
+				<relative type="-1">கடந்த செவ்.</relative>
+				<relative type="0">இந்த செவ்.</relative>
+				<relative type="1">அடுத்த செவ்.</relative>
 			</field>
 			<field type="tue-narrow">
-				<relative type="-1">கடந்த செவ்வாய்</relative>
-				<relative type="0">இந்த செவ்வாய்</relative>
-				<relative type="1">அடுத்த செவ்வாய்</relative>
+				<relative type="-1">கடந்த செவ்.</relative>
+				<relative type="0">இந்த செவ்.</relative>
+				<relative type="1">அடுத்த செவ்.</relative>
 			</field>
 			<field type="wed">
 				<relative type="-1">கடந்த புதன்</relative>
@@ -2087,14 +2210,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">அடுத்த புதன்</relative>
 			</field>
 			<field type="wed-short">
-				<relative type="-1">கடந்த புதன்</relative>
-				<relative type="0">இந்த புதன்</relative>
-				<relative type="1">அடுத்த புதன்</relative>
+				<relative type="-1">கடந்த புத.</relative>
+				<relative type="0">இந்த புத.</relative>
+				<relative type="1">அடுத்த புத.</relative>
 			</field>
 			<field type="wed-narrow">
-				<relative type="-1">கடந்த புதன்</relative>
-				<relative type="0">இந்த புதன்</relative>
-				<relative type="1">அடுத்த புதன்</relative>
+				<relative type="-1">கடந்த புத.</relative>
+				<relative type="0">இந்த புத.</relative>
+				<relative type="1">அடுத்த புத.</relative>
 			</field>
 			<field type="thu">
 				<relative type="-1">கடந்த வியாழன்</relative>
@@ -2102,14 +2225,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">அடுத்த வியாழன்</relative>
 			</field>
 			<field type="thu-short">
-				<relative type="-1">கடந்த வியாழன்</relative>
-				<relative type="0">இந்த வியாழன்</relative>
-				<relative type="1">அடுத்த வியாழன்</relative>
+				<relative type="-1">கடந்த வியா.</relative>
+				<relative type="0">இந்த வியா.</relative>
+				<relative type="1">அடுத்த வியா.</relative>
 			</field>
 			<field type="thu-narrow">
-				<relative type="-1">கடந்த வியாழன்</relative>
-				<relative type="0">இந்த வியாழன்</relative>
-				<relative type="1">அடுத்த வியாழன்</relative>
+				<relative type="-1">கடந்த வியா.</relative>
+				<relative type="0">இந்த வியா.</relative>
+				<relative type="1">அடுத்த வியா.</relative>
 			</field>
 			<field type="fri">
 				<relative type="-1">கடந்த வெள்ளி</relative>
@@ -2117,14 +2240,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">அடுத்த வெள்ளி</relative>
 			</field>
 			<field type="fri-short">
-				<relative type="-1">கடந்த வெள்ளி</relative>
-				<relative type="0">இந்த வெள்ளி</relative>
-				<relative type="1">அடுத்த வெள்ளி</relative>
+				<relative type="-1">கடந்த வெள்.</relative>
+				<relative type="0">இந்த வெள்.</relative>
+				<relative type="1">அடுத்த வெள்.</relative>
 			</field>
 			<field type="fri-narrow">
-				<relative type="-1">கடந்த வெள்ளி</relative>
-				<relative type="0">இந்த வெள்ளி</relative>
-				<relative type="1">அடுத்த வெள்ளி</relative>
+				<relative type="-1">கடந்த வெள்.</relative>
+				<relative type="0">இந்த வெள்.</relative>
+				<relative type="1">அடுத்த வெள்.</relative>
 			</field>
 			<field type="sat">
 				<relative type="-1">கடந்த சனி</relative>
@@ -2156,25 +2279,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="hour-short">
-				<displayName>மநே.</displayName>
+				<displayName>மணி.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} மணிநேரத்தில்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} மணிநேரத்தில்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} மணி.</relativeTimePattern>
+					<relativeTimePattern count="other">{0} மணி.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} மணிநேரம் முன்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} மணிநேரம் முன்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} மணி. முன்</relativeTimePattern>
+					<relativeTimePattern count="other">{0} மணி. முன்</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-narrow">
-				<displayName>ம</displayName>
+				<displayName>ம.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} மணிநேரத்தில்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} மணிநேரத்தில்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ம.</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ம.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} மணிநேரம் முன்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} மணிநேரம் முன்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ம. முன்</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ம. முன்</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute">
@@ -2191,23 +2314,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="minute-short">
 				<displayName>நிமி.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} நிமிடங்களில்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} நிமிடங்களில்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} நிமி.</relativeTimePattern>
+					<relativeTimePattern count="other">{0} நிமி.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} நிமிடத்திற்கு முன்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} நிமிடங்களுக்கு முன்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} நிமி. முன்</relativeTimePattern>
+					<relativeTimePattern count="other">{0} நிமி. முன்</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute-narrow">
-				<displayName>நிமி</displayName>
+				<displayName>நிமி.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} நிமிடங்களில்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} நிமிடங்களில்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} நி.</relativeTimePattern>
+					<relativeTimePattern count="other">{0} நி.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} நிமிடத்திற்கு முன்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} நிமிடங்களுக்கு முன்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} நி. முன்</relativeTimePattern>
+					<relativeTimePattern count="other">{0} நி. முன்</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second">
@@ -2225,23 +2348,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="second-short">
 				<displayName>விநா.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} விநாடியில்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} விநாடிகளில்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} விநா.</relativeTimePattern>
+					<relativeTimePattern count="other">{0} விநா.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} விநாடிக்கு முன்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} விநாடிகளுக்கு முன்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} விநா. முன்</relativeTimePattern>
+					<relativeTimePattern count="other">{0} விநா. முன்</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second-narrow">
-				<displayName>வி</displayName>
+				<displayName>வி.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} விநாடியில்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} விநாடிகளில்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} வி.</relativeTimePattern>
+					<relativeTimePattern count="other">{0} வி.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} விநாடிக்கு முன்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} விநாடிகளுக்கு முன்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} வி. முன்</relativeTimePattern>
+					<relativeTimePattern count="other">{0} வி. முன்</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="zone">
@@ -2253,7 +2376,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<gmtFormat>GMT{0}</gmtFormat>
 			<gmtZeroFormat>GMT</gmtZeroFormat>
 			<regionFormat>{0} நேரம்</regionFormat>
-			<regionFormat type="daylight">{0} பகல் நேரம்</regionFormat>
+			<regionFormat type="daylight">{0} பகலொளி நேரம்</regionFormat>
 			<regionFormat type="standard">{0} நிலையான நேரம்</regionFormat>
 			<fallbackFormat>{1} ({0})</fallbackFormat>
 			<zone type="Etc/Unknown">
@@ -2296,7 +2419,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>ஸ்யோவா</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Mawson">
-				<exemplarCity>மவுசன்</exemplarCity>
+				<exemplarCity>மாசன்</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Davis">
 				<exemplarCity>டேவிஸ்</exemplarCity>
@@ -2308,7 +2431,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>கேஸி</exemplarCity>
 			</zone>
 			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>டூமாண்ட் டி’உர்வில்லி</exemplarCity>
+				<exemplarCity>டுமோண்ட்-டி உர்வில்லே</exemplarCity>
 			</zone>
 			<zone type="Antarctica/McMurdo">
 				<exemplarCity>மெக்மர்டோ</exemplarCity>
@@ -2332,7 +2455,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>சான் லூயிஸ்</exemplarCity>
 			</zone>
 			<zone type="America/Catamarca">
-				<exemplarCity>கடமரகா</exemplarCity>
+				<exemplarCity>கடமார்கா</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Salta">
 				<exemplarCity>சால்டா</exemplarCity>
@@ -2341,7 +2464,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>ஜூஜுய்</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>துகுமன்</exemplarCity>
+				<exemplarCity>டுகுமன்</exemplarCity>
 			</zone>
 			<zone type="America/Cordoba">
 				<exemplarCity>கார்டோபா</exemplarCity>
@@ -2377,7 +2500,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>மெல்போர்ன்</exemplarCity>
 			</zone>
 			<zone type="Australia/Hobart">
-				<exemplarCity>ஹொபார்ட்</exemplarCity>
+				<exemplarCity>ஹோபர்ட்</exemplarCity>
 			</zone>
 			<zone type="Australia/Lindeman">
 				<exemplarCity>லின்டெமன்</exemplarCity>
@@ -2389,7 +2512,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>பிரிஸ்பேன்</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Macquarie">
-				<exemplarCity>மேக்வாரி</exemplarCity>
+				<exemplarCity>மாக்கியூரி</exemplarCity>
 			</zone>
 			<zone type="Australia/Lord_Howe">
 				<exemplarCity>லார்டு ஹோவே</exemplarCity>
@@ -2422,7 +2545,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>சோஃபியா</exemplarCity>
 			</zone>
 			<zone type="Asia/Bahrain">
-				<exemplarCity>பஹ்ரெய்ன்</exemplarCity>
+				<exemplarCity>பஹ்ரைன்</exemplarCity>
 			</zone>
 			<zone type="Africa/Bujumbura">
 				<exemplarCity>புஜும்புரா</exemplarCity>
@@ -2458,7 +2581,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>போவா விஸ்டா</exemplarCity>
 			</zone>
 			<zone type="America/Manaus">
-				<exemplarCity>மனாவுஸ்</exemplarCity>
+				<exemplarCity>மனாஸ்</exemplarCity>
 			</zone>
 			<zone type="America/Cuiaba">
 				<exemplarCity>குயாபே</exemplarCity>
@@ -2476,7 +2599,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>அரகுவாய்னா</exemplarCity>
 			</zone>
 			<zone type="America/Sao_Paulo">
-				<exemplarCity>சவோ பவுலோ</exemplarCity>
+				<exemplarCity>சாவோ பவுலோ</exemplarCity>
 			</zone>
 			<zone type="America/Bahia">
 				<exemplarCity>பாஹியா</exemplarCity>
@@ -2485,7 +2608,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>ஃபோர்டாலெசா</exemplarCity>
 			</zone>
 			<zone type="America/Maceio">
-				<exemplarCity>மேகியோ</exemplarCity>
+				<exemplarCity>மேசியோ</exemplarCity>
 			</zone>
 			<zone type="America/Recife">
 				<exemplarCity>ரெஸிஃபி</exemplarCity>
@@ -2518,7 +2641,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>இனுவிக்</exemplarCity>
 			</zone>
 			<zone type="America/Vancouver">
-				<exemplarCity>வாங்கூவர்</exemplarCity>
+				<exemplarCity>வான்கூவர்</exemplarCity>
 			</zone>
 			<zone type="America/Dawson_Creek">
 				<exemplarCity>டாவ்சன் கிரீக்</exemplarCity>
@@ -2539,7 +2662,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>கேம்பிரிட்ஜ் வளைகுடா</exemplarCity>
 			</zone>
 			<zone type="America/Regina">
-				<exemplarCity>ரெகினா</exemplarCity>
+				<exemplarCity>ரெஜினா</exemplarCity>
 			</zone>
 			<zone type="America/Winnipeg">
 				<exemplarCity>வின்னிபெக்</exemplarCity>
@@ -2581,7 +2704,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>கூஸ் பே</exemplarCity>
 			</zone>
 			<zone type="America/Glace_Bay">
-				<exemplarCity>கிலாஸ் வளைகுடா</exemplarCity>
+				<exemplarCity>கிலேஸ் வளைகுடா</exemplarCity>
 			</zone>
 			<zone type="America/Blanc-Sablon">
 				<exemplarCity>ப்லாங்க்-சப்லான்</exemplarCity>
@@ -2599,7 +2722,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>லுபும்பாஷி</exemplarCity>
 			</zone>
 			<zone type="Africa/Bangui">
-				<exemplarCity>பேங்குயீ</exemplarCity>
+				<exemplarCity>பாங்குயீ</exemplarCity>
 			</zone>
 			<zone type="Africa/Brazzaville">
 				<exemplarCity>பிராஸாவில்லி</exemplarCity>
@@ -2638,7 +2761,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>ஹவானா</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>கேப் வெர்ட்</exemplarCity>
+				<exemplarCity>கேப் வெர்டே</exemplarCity>
 			</zone>
 			<zone type="America/Curacao">
 				<exemplarCity>க்யூராகோ</exemplarCity>
@@ -2662,7 +2785,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>டிஜிபவ்டி</exemplarCity>
 			</zone>
 			<zone type="Europe/Copenhagen">
-				<exemplarCity>கோபென்ஹகன்</exemplarCity>
+				<exemplarCity>கோபன்ஹேகன்</exemplarCity>
 			</zone>
 			<zone type="America/Dominica">
 				<exemplarCity>டொமினிகா</exemplarCity>
@@ -2713,7 +2836,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>ஸ்டேன்லி</exemplarCity>
 			</zone>
 			<zone type="Pacific/Truk">
-				<exemplarCity>சூக்</exemplarCity>
+				<exemplarCity>சுக்</exemplarCity>
 			</zone>
 			<zone type="Pacific/Ponape">
 				<exemplarCity>ஃபோன்பெய்</exemplarCity>
@@ -2722,10 +2845,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>கோஸ்ரே</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Faeroe">
-				<exemplarCity>பேரோ</exemplarCity>
+				<exemplarCity>ஃபரோ</exemplarCity>
 			</zone>
 			<zone type="Europe/Paris">
-				<exemplarCity>பாரிஸ்</exemplarCity>
+				<exemplarCity>பாரீஸ்</exemplarCity>
 			</zone>
 			<zone type="Africa/Libreville">
 				<exemplarCity>லிப்ரேவில்லே</exemplarCity>
@@ -2737,7 +2860,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>லண்டன்</exemplarCity>
 			</zone>
 			<zone type="America/Grenada">
-				<exemplarCity>கிரேனடா</exemplarCity>
+				<exemplarCity>கிரனடா</exemplarCity>
 			</zone>
 			<zone type="Asia/Tbilisi">
 				<exemplarCity>த்பிலிசி</exemplarCity>
@@ -3001,10 +3124,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>மார்ட்டினிக்</exemplarCity>
 			</zone>
 			<zone type="Africa/Nouakchott">
-				<exemplarCity>நவுக்சோத்</exemplarCity>
+				<exemplarCity>நோவாக்சோட்</exemplarCity>
 			</zone>
 			<zone type="America/Montserrat">
-				<exemplarCity>மான்ஸ்ரேட்</exemplarCity>
+				<exemplarCity>மான்செரேட்</exemplarCity>
 			</zone>
 			<zone type="Europe/Malta">
 				<exemplarCity>மால்டா</exemplarCity>
@@ -3031,7 +3154,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>மஸட்லன்</exemplarCity>
 			</zone>
 			<zone type="America/Chihuahua">
-				<exemplarCity>சிஹூவாஹுவா</exemplarCity>
+				<exemplarCity>சுவாவா</exemplarCity>
 			</zone>
 			<zone type="America/Bahia_Banderas">
 				<exemplarCity>பஹியா பந்தேராஸ்</exemplarCity>
@@ -3097,7 +3220,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>நியு</exemplarCity>
 			</zone>
 			<zone type="Pacific/Chatham">
-				<exemplarCity>சாதம்</exemplarCity>
+				<exemplarCity>சத்தாம்</exemplarCity>
 			</zone>
 			<zone type="Pacific/Auckland">
 				<exemplarCity>ஆக்லாந்து</exemplarCity>
@@ -3112,10 +3235,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>லிமா</exemplarCity>
 			</zone>
 			<zone type="Pacific/Tahiti">
-				<exemplarCity>தாஹிதி</exemplarCity>
+				<exemplarCity>தஹிதி</exemplarCity>
 			</zone>
 			<zone type="Pacific/Marquesas">
-				<exemplarCity>மார்குசாஸ்</exemplarCity>
+				<exemplarCity>மார்கியூசாஸ்</exemplarCity>
 			</zone>
 			<zone type="Pacific/Gambier">
 				<exemplarCity>கேம்பியர்</exemplarCity>
@@ -3123,6 +3246,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>போர்ட் மோர்ஸ்பை</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>போகெய்ன்வில்லே</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>மணிலா</exemplarCity>
 			</zone>
@@ -3136,10 +3262,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>மிக்யூலன்</exemplarCity>
 			</zone>
 			<zone type="Pacific/Pitcairn">
-				<exemplarCity>பிட்காரின்</exemplarCity>
+				<exemplarCity>பிட்கெய்ர்ன்</exemplarCity>
 			</zone>
 			<zone type="America/Puerto_Rico">
-				<exemplarCity>புயர்டோ ரிகோ</exemplarCity>
+				<exemplarCity>பியூர்டோ ரிகோ</exemplarCity>
 			</zone>
 			<zone type="Asia/Gaza">
 				<exemplarCity>காஸா</exemplarCity>
@@ -3166,7 +3292,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>கத்தார்</exemplarCity>
 			</zone>
 			<zone type="Indian/Reunion">
-				<exemplarCity>ரியூனியன்</exemplarCity>
+				<exemplarCity>ரீயூனியன்</exemplarCity>
 			</zone>
 			<zone type="Europe/Bucharest">
 				<exemplarCity>புசாரெஸ்ட்</exemplarCity>
@@ -3207,6 +3333,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>இர்குட்ஸ்க்</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>சிடா</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>யகுட்ஸ்க்</exemplarCity>
 			</zone>
@@ -3225,6 +3354,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>மகதன்</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>ஸ்ரெட்நிகோலிம்ஸ்க்</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>காம்சட்கா</exemplarCity>
 			</zone>
@@ -3241,7 +3373,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>கவுடால்கேனல்</exemplarCity>
 			</zone>
 			<zone type="Indian/Mahe">
-				<exemplarCity>மாஹி</exemplarCity>
+				<exemplarCity>மாஹே</exemplarCity>
 			</zone>
 			<zone type="Africa/Khartoum">
 				<exemplarCity>கார்டோம்</exemplarCity>
@@ -3253,13 +3385,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>சிங்கப்பூர்</exemplarCity>
 			</zone>
 			<zone type="Atlantic/St_Helena">
-				<exemplarCity>செயின்ட் ஹெலினா</exemplarCity>
+				<exemplarCity>செயின்ட் ஹெலெனா</exemplarCity>
 			</zone>
 			<zone type="Europe/Ljubljana">
-				<exemplarCity>லுஜுபுல்ஜானா</exemplarCity>
+				<exemplarCity>ஜுப்லானா</exemplarCity>
 			</zone>
 			<zone type="Arctic/Longyearbyen">
-				<exemplarCity>லாங்கர்பியன்</exemplarCity>
+				<exemplarCity>லாங்இயர்பியன்</exemplarCity>
 			</zone>
 			<zone type="Europe/Bratislava">
 				<exemplarCity>பிரடிஸ்லாவா</exemplarCity>
@@ -3271,10 +3403,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>சான் மாரினோ</exemplarCity>
 			</zone>
 			<zone type="Africa/Dakar">
-				<exemplarCity>தாக்கர்</exemplarCity>
+				<exemplarCity>டாகர்</exemplarCity>
 			</zone>
 			<zone type="Africa/Mogadishu">
-				<exemplarCity>மோகாதிஷு</exemplarCity>
+				<exemplarCity>மொகாதிஷு</exemplarCity>
 			</zone>
 			<zone type="America/Paramaribo">
 				<exemplarCity>பரமரிபோ</exemplarCity>
@@ -3286,7 +3418,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>சாவோ டோமே</exemplarCity>
 			</zone>
 			<zone type="America/El_Salvador">
-				<exemplarCity>எல் சால்வேடார்</exemplarCity>
+				<exemplarCity>எல் சால்வடோர்</exemplarCity>
 			</zone>
 			<zone type="America/Lower_Princes">
 				<exemplarCity>லோயர் பிரின்ஸஸ் குவார்ட்டர்</exemplarCity>
@@ -3295,13 +3427,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>டமாஸ்கஸ்</exemplarCity>
 			</zone>
 			<zone type="Africa/Mbabane">
-				<exemplarCity>அம்பபான்</exemplarCity>
+				<exemplarCity>பபான்</exemplarCity>
 			</zone>
 			<zone type="America/Grand_Turk">
 				<exemplarCity>கிராண்ட் துர்க்</exemplarCity>
 			</zone>
 			<zone type="Africa/Ndjamena">
-				<exemplarCity>நிட்ஜமேனா</exemplarCity>
+				<exemplarCity>ஜமேனா</exemplarCity>
 			</zone>
 			<zone type="Indian/Kerguelen">
 				<exemplarCity>கெர்யூலென்</exemplarCity>
@@ -3340,10 +3472,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>ஃபுனாஃபுடி</exemplarCity>
 			</zone>
 			<zone type="Asia/Taipei">
-				<exemplarCity>தாய்பே</exemplarCity>
+				<exemplarCity>தைபே</exemplarCity>
 			</zone>
 			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity>தார் ஸ் சலாம்</exemplarCity>
+				<exemplarCity>தார் எஸ் சலாம்</exemplarCity>
 			</zone>
 			<zone type="Europe/Uzhgorod">
 				<exemplarCity>உஜ்கோரோட்</exemplarCity>
@@ -3376,7 +3508,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>ஹோனோலூலூ</exemplarCity>
 			</zone>
 			<zone type="America/Anchorage">
-				<exemplarCity>அங்கரேஜ்</exemplarCity>
+				<exemplarCity>அங்கோரேஜ்</exemplarCity>
 			</zone>
 			<zone type="America/Yakutat">
 				<exemplarCity>யகுடட்</exemplarCity>
@@ -3409,16 +3541,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>நியூ சலேம், வடக்கு டகோடா</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/Center">
-				<exemplarCity>மையம், வடக்கு டகோடா</exemplarCity>
+				<exemplarCity>சென்டர், வடக்கு டகோடா</exemplarCity>
 			</zone>
 			<zone type="America/Chicago">
 				<exemplarCity>சிகாகோ</exemplarCity>
 			</zone>
 			<zone type="America/Menominee">
-				<exemplarCity>மெனோமி</exemplarCity>
+				<exemplarCity>மெனோமினி</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>விண்செனேஸ், இண்டியானா</exemplarCity>
+				<exemplarCity>வின்செனேஸ், இண்டியானா</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Petersburg">
 				<exemplarCity>பீட்டர்ஸ்பெர்க், இண்டியானா</exemplarCity>
@@ -3439,7 +3571,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>இண்டியானாபொலிஸ்</exemplarCity>
 			</zone>
 			<zone type="America/Louisville">
-				<exemplarCity>லோய்ஸ்வில்லே</exemplarCity>
+				<exemplarCity>லூயிஸ்வில்லே</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Vevay">
 				<exemplarCity>வேவே, இண்டியானா</exemplarCity>
@@ -3454,7 +3586,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>நியூயார்க்</exemplarCity>
 			</zone>
 			<zone type="America/Montevideo">
-				<exemplarCity>மொண்டேவீடியோ</exemplarCity>
+				<exemplarCity>மான்டேவீடியோ</exemplarCity>
 			</zone>
 			<zone type="Asia/Samarkand">
 				<exemplarCity>சமார்கண்ட்</exemplarCity>
@@ -3490,7 +3622,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>அபியா</exemplarCity>
 			</zone>
 			<zone type="Asia/Aden">
-				<exemplarCity>ஏதேன்</exemplarCity>
+				<exemplarCity>ஏடன்</exemplarCity>
 			</zone>
 			<zone type="Indian/Mayotte">
 				<exemplarCity>மயோட்டி</exemplarCity>
@@ -3617,9 +3749,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Arabian">
 				<long>
-					<generic>அரேபியன் நேரம்</generic>
-					<standard>அரேபியன் நிலையான நேரம்</standard>
-					<daylight>அரேபியன் பகல் நேரம்</daylight>
+					<generic>அரேபிய நேரம்</generic>
+					<standard>அரேபிய நிலையான நேரம்</standard>
+					<daylight>அரேபிய பகலொளி நேரம்</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina">
@@ -3638,9 +3770,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Armenia">
 				<long>
-					<generic>ஆர்மேனியா நேரம்</generic>
-					<standard>ஆர்மேனியா நிலையான நேரம்</standard>
-					<daylight>ஆர்மேனியா கோடை நேரம்</daylight>
+					<generic>ஆர்மேனிய நேரம்</generic>
+					<standard>ஆர்மேனிய நிலையான நேரம்</standard>
+					<daylight>ஆர்மேனிய கோடை நேரம்</daylight>
 				</long>
 			</metazone>
 			<metazone type="Atlantic">
@@ -3687,8 +3819,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Azores">
 				<long>
-					<generic>அசோர்ஸ் நேரம்</generic>
-					<standard>அசோர்ஸ் நிலையான நேரம்</standard>
+					<generic>அசோரஸ் நேரம்</generic>
+					<standard>அசோரஸ் நிலையான நேரம்</standard>
 					<daylight>அசோர்ஸ் கோடை நேரம்</daylight>
 				</long>
 			</metazone>
@@ -3711,14 +3843,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Brasilia">
 				<long>
-					<generic>ப்ரசிலியா நேரம்</generic>
-					<standard>ப்ரசிலியா நிலையான நேரம்</standard>
-					<daylight>ப்ரசிலியா கோடை நேரம்</daylight>
+					<generic>பிரேசிலியா நேரம்</generic>
+					<standard>பிரேசிலியா நிலையான நேரம்</standard>
+					<daylight>பிரேசிலியா கோடை நேரம்</daylight>
 				</long>
 			</metazone>
 			<metazone type="Brunei">
 				<long>
-					<standard>புருணை டாரு சலாம் நேரம்</standard>
+					<standard>புருனே டருஸ்ஸலாம் நேரம்</standard>
 				</long>
 			</metazone>
 			<metazone type="Cape_Verde">
@@ -3750,8 +3882,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="China">
 				<long>
 					<generic>சீன நேரம்</generic>
-					<standard>சீனா நிலையான நேரம்</standard>
-					<daylight>சீனா பகலொளி நேரம்</daylight>
+					<standard>சீன நிலையான நேரம்</standard>
+					<daylight>சீன பகலொளி நேரம்</daylight>
 				</long>
 			</metazone>
 			<metazone type="Choibalsan">
@@ -3799,7 +3931,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="DumontDUrville">
 				<long>
-					<standard>ட்யூமோண்ட்-டி உர்வில்லே நேரம்</standard>
+					<standard>டுமோண்ட்-டி உர்வில்லே நேரம்</standard>
 				</long>
 			</metazone>
 			<metazone type="East_Timor">
@@ -3816,7 +3948,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Ecuador">
 				<long>
-					<standard>ஈக்வெடார் நேரம்</standard>
+					<standard>ஈக்வடார் நேரம்</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Central">
@@ -3829,8 +3961,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="Europe_Eastern">
 				<long>
 					<generic>கிழக்கத்திய ஐரோப்பிய நேரம்</generic>
-					<standard>கிழக்கத்திய ஐரோப்பியன் நிலையான நேரம்</standard>
-					<daylight>கிழக்கித்திய ஐரோப்பிய கோடை நேரம்</daylight>
+					<standard>கிழக்கத்திய ஐரோப்பிய நிலையான நேரம்</standard>
+					<daylight>கிழக்கத்திய ஐரோப்பிய கோடை நேரம்</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
@@ -3866,7 +3998,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="French_Southern">
 				<long>
-					<standard>ஃபிரஞ்சு தெற்கத்திய மற்றும் அண்டார்டிக் நேரம்</standard>
+					<standard>ஃபிரஞ்சு தெற்கத்திய &amp; அண்டார்டிக் நேரம்</standard>
 				</long>
 			</metazone>
 			<metazone type="Galapagos">
@@ -3899,14 +4031,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="Greenland_Eastern">
 				<long>
 					<generic>கிழக்கு கிரீன்லாந்து நேரம்</generic>
-					<standard>கிழக்கு க்ரீன்லாந்து நிலையான நேரம்</standard>
+					<standard>கிழக்கு கிரீன்லாந்து நிலையான நேரம்</standard>
 					<daylight>கிழக்கு கிரீன்லாந்து கோடை நேரம்</daylight>
 				</long>
 			</metazone>
 			<metazone type="Greenland_Western">
 				<long>
 					<generic>மேற்கு கிரீன்லாந்து நேரம்</generic>
-					<standard>மேற்கு க்ரீன்லாந்து நிலையான நேரம்</standard>
+					<standard>மேற்கு கிரீன்லாந்து நிலையான நேரம்</standard>
 					<daylight>மேற்கு கிரீன்லாந்து கோடை நேரம்</daylight>
 				</long>
 			</metazone>
@@ -3917,7 +4049,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Gulf">
 				<long>
-					<standard>வளைகுடா நேரம்</standard>
+					<standard>வளைகுடா நிலையான நேரம்</standard>
 				</long>
 			</metazone>
 			<metazone type="Guyana">
@@ -3927,16 +4059,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
-					<generic>ஹவாய்-அலேஸியன் நேரம்</generic>
-					<standard>ஹவாய்-அலேஸியன் நிலையான நேரம்</standard>
-					<daylight>ஹவாய்-அலேஸியன் பகலொளி நேரம்</daylight>
+					<generic>ஹவாய்-அலேஷியன் நேரம்</generic>
+					<standard>ஹவாய்-அலேஷியன் நிலையான நேரம்</standard>
+					<daylight>ஹவாய்-அலேஷியன் பகலொளி நேரம்</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>
-					<generic>ஹாங் காங் நேரம்</generic>
-					<standard>ஹாங் காங் நிலையான நேரம்</standard>
-					<daylight>ஹாங் காங் கோடை நேரம்</daylight>
+					<generic>ஹாங்காங் நேரம்</generic>
+					<standard>ஹாங்காங் நிலையான நேரம்</standard>
+					<daylight>ஹாங்காங் கோடை நேரம்</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hovd">
@@ -3966,17 +4098,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Indonesia_Central">
 				<long>
-					<standard>மத்திய இந்தோனேசிய நேரம்</standard>
+					<standard>மத்திய இந்தோனேசியா நேரம்</standard>
 				</long>
 			</metazone>
 			<metazone type="Indonesia_Eastern">
 				<long>
-					<standard>கிழக்கத்திய இந்தோனேசிய நேரம்</standard>
+					<standard>கிழக்கத்திய இந்தோனேசியா நேரம்</standard>
 				</long>
 			</metazone>
 			<metazone type="Indonesia_Western">
 				<long>
-					<standard>மேற்கத்திய இந்தோனேசிய நேரம்</standard>
+					<standard>மேற்கத்திய இந்தோனேசியா நேரம்</standard>
 				</long>
 			</metazone>
 			<metazone type="Iran">
@@ -4026,9 +4158,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Korea">
 				<long>
-					<generic>கொரியன் நேரம்</generic>
-					<standard>கொரியன் நிலையான நேரம்</standard>
-					<daylight>கொரியன் பகலொளி நேரம்</daylight>
+					<generic>கொரிய நேரம்</generic>
+					<standard>கொரிய நிலையான நேரம்</standard>
+					<daylight>கொரிய பகலொளி நேரம்</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kosrae">
@@ -4086,12 +4218,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Malaysia">
 				<long>
-					<standard>மலேசிய நேரம்</standard>
+					<standard>மலேஷிய நேரம்</standard>
 				</long>
 			</metazone>
 			<metazone type="Maldives">
 				<long>
-					<standard>மாலத்தீவு நேரம்</standard>
+					<standard>மாலத்தீவுகள் நேரம்</standard>
 				</long>
 			</metazone>
 			<metazone type="Marquesas">
@@ -4113,13 +4245,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Mawson">
 				<long>
-					<standard>மவுசன் நேரம்</standard>
+					<standard>மாசன் நேரம்</standard>
 				</long>
 			</metazone>
 			<metazone type="Mexico_Northwest">
 				<long>
-					<generic>வடகிழக்கு மெக்ஸிகோ நேரம்</generic>
-					<standard>வடகிழக்கு மெக்ஸிகோ நிலையான நேரம்</standard>
+					<generic>வடமேற்கு மெக்ஸிகோ நேரம்</generic>
+					<standard>வடமேற்கு மெக்ஸிகோ நிலையான நேரம்</standard>
 					<daylight>வடமேற்கு மெக்ஸிகோ பகலொளி நேரம்</daylight>
 				</long>
 			</metazone>
@@ -4175,9 +4307,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Newfoundland">
 				<long>
-					<generic>நியூஃபவுன்லாந்து நேரம்</generic>
-					<standard>நியூஃபவுன்லாந்து நிலையான நேரம்</standard>
-					<daylight>நியூஃபவுன்லாந்து பகலொளி நேரம்</daylight>
+					<generic>நியூஃபவுண்ட்லாந்து நேரம்</generic>
+					<standard>நியூஃபவுண்ட்லாந்து நிலையான நேரம்</standard>
+					<daylight>நியூஃபவுண்ட்லாந்து பகலொளி நேரம்</daylight>
 				</long>
 			</metazone>
 			<metazone type="Niue">
@@ -4250,7 +4382,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="Philippines">
 				<long>
 					<generic>பிலிப்பைன் நேரம்</generic>
-					<standard>பிலிப்பைன் நேரப்படி</standard>
+					<standard>பிலிப்பைன் நிலையான நேரம்</standard>
 					<daylight>பிலிப்பைன் கோடை நேரம்</daylight>
 				</long>
 			</metazone>
@@ -4261,9 +4393,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Pierre_Miquelon">
 				<long>
-					<generic>செயின்ட் பியரி மற்றும் மிக்குயிலான் நேரம்</generic>
-					<standard>செயின்ட் பியரி மற்றும் மிக்குயிலான் நிலையான நேரம்</standard>
-					<daylight>செயின்ட் பியரி மற்றும் மிக்குயிலான் பகலொளி நேரம்</daylight>
+					<generic>செயின்ட் பியரி &amp; மிக்குயிலான் நேரம்</generic>
+					<standard>செயின்ட் பியரி &amp; மிக்குயிலான் நிலையான நேரம்</standard>
+					<daylight>செயின்ட் பியரி &amp; மிக்குயிலான் பகலொளி நேரம்</daylight>
 				</long>
 			</metazone>
 			<metazone type="Pitcairn">
@@ -4321,7 +4453,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Singapore">
 				<long>
-					<standard>சிங்கப்பூர் நேரம்</standard>
+					<standard>சிங்கப்பூர் நிலையான நேரம்</standard>
 				</long>
 			</metazone>
 			<metazone type="Solomon">
@@ -4568,6 +4700,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">¤ 0ஆ</pattern>
+					<pattern type="1000" count="other">¤ 0ஆ</pattern>
+					<pattern type="10000" count="one">¤ 00ஆ</pattern>
+					<pattern type="10000" count="other">¤ 00ஆ</pattern>
+					<pattern type="100000" count="one">¤ 000ஆ</pattern>
+					<pattern type="100000" count="other">¤ 000ஆ</pattern>
+					<pattern type="1000000" count="one">¤ 0மி</pattern>
+					<pattern type="1000000" count="other">¤ 0மி</pattern>
+					<pattern type="10000000" count="one">¤ 00மி</pattern>
+					<pattern type="10000000" count="other">¤ 00மி</pattern>
+					<pattern type="100000000" count="one">¤ 000மி</pattern>
+					<pattern type="100000000" count="other">¤ 000மி</pattern>
+					<pattern type="1000000000" count="one">¤ 0பி</pattern>
+					<pattern type="1000000000" count="other">¤0பி</pattern>
+					<pattern type="10000000000" count="one">¤ 00பி</pattern>
+					<pattern type="10000000000" count="other">¤ 00பி</pattern>
+					<pattern type="100000000000" count="one">¤ 000பி</pattern>
+					<pattern type="100000000000" count="other">¤000பி</pattern>
+					<pattern type="1000000000000" count="one">¤ 0டி</pattern>
+					<pattern type="1000000000000" count="other">¤ 0டி</pattern>
+					<pattern type="10000000000000" count="one">¤ 00டி</pattern>
+					<pattern type="10000000000000" count="other">¤ 00டி</pattern>
+					<pattern type="100000000000000" count="one">¤ 000டி</pattern>
+					<pattern type="100000000000000" count="other">¤ 000டி</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4607,6 +4767,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">அங்கோலன் க்வான்ஸா</displayName>
 				<displayName count="other">அங்கோலன் க்வான்ஸாக்கள்</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="ARS">
 				<displayName>அர்ஜென்டினா பேசோ</displayName>
@@ -4639,6 +4800,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">போஸ்னியா-ஹெர்ஸேகோவினா கன்வெர்டிபில் மார்க்</displayName>
 				<displayName count="other">போஸ்னியா-ஹெர்ஸேகோவினா கன்வெர்டிபில் மார்க்குகள்</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>பார்பேடியன் டாலர்</displayName>
@@ -4655,9 +4817,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">৳</symbol>
 			</currency>
 			<currency type="BGN">
-				<displayName>புல்கேரியன் லெவ்</displayName>
-				<displayName count="one">புல்கேரியன் லெவ்</displayName>
-				<displayName count="other">புல்கேரியன் லெவ்</displayName>
+				<displayName>பல்கேரியன் லேவ்</displayName>
+				<displayName count="one">பல்கேரியன் லேவ்</displayName>
+				<displayName count="other">பல்கேரியன் லேவா</displayName>
 				<symbol>BGN</symbol>
 			</currency>
 			<currency type="BHD">
@@ -4691,6 +4853,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">பொலிவியன் பொலிவியானோ</displayName>
 				<displayName count="other">பொலிவியன் பொலிவியானோக்கள்</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BRL">
 				<displayName>பிரேசிலியன் ரியால்</displayName>
@@ -4707,9 +4870,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BTN">
-				<displayName>பூட்டானிஷ் நிகுல்ட்ரம்</displayName>
-				<displayName count="one">பூட்டானிஷ் நிகுல்ட்ரம்</displayName>
-				<displayName count="other">பூட்டானிஷ் நிகுல்ட்ரம்கள்</displayName>
+				<displayName>பூட்டானீஸ் குல்ட்ரம்</displayName>
+				<displayName count="one">பூட்டானீஸ் குல்ட்ரம்</displayName>
+				<displayName count="other">பூட்டானீஸ் குல்ட்ரம்கள்</displayName>
 				<symbol>BTN</symbol>
 			</currency>
 			<currency type="BWP">
@@ -4717,6 +4880,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">போட்ஸ்வானா புலா</displayName>
 				<displayName count="other">போட்ஸ்வானா புலாக்கள்</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYR">
 				<displayName>பெலருசியன் ரூபில்</displayName>
@@ -4726,9 +4890,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">р.</symbol>
 			</currency>
 			<currency type="BZD">
-				<displayName>பெலீஷ் டாலர்</displayName>
-				<displayName count="one">பெலீஷ் டாலர்</displayName>
-				<displayName count="other">பெலீஷ் டாலர்கள்</displayName>
+				<displayName>பெலீஸ் டாலர்</displayName>
+				<displayName count="one">பெலீஸ் டாலர்</displayName>
+				<displayName count="other">பெலீஸ் டாலர்கள்</displayName>
 				<symbol>BZD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -4784,6 +4948,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">கியூபன் கன்வெர்டிபில் பேசோ</displayName>
 				<displayName count="other">கியூபன் கன்வெர்டிபில் பேசோக்கள்</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>கியூபன் பெசோ</displayName>
@@ -4803,6 +4968,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">செக் குடியரசு கொருனா</displayName>
 				<displayName count="other">செக்குடியரசு கொருனாக்கள்</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DJF">
 				<displayName>ஜிபவ்டியென் ஃப்ராங்க்</displayName>
@@ -4815,6 +4981,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">டானிஷ் க்ரோன்</displayName>
 				<displayName count="other">டானிஷ் க்ரோன்</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>டொமினிக்கன் பேசோ</displayName>
@@ -4834,6 +5001,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">எகிப்திய பவுண்டு</displayName>
 				<displayName count="other">எகிப்திய பவுண்டுகள்</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>இரிடிரியன் நக்ஃபா</displayName>
@@ -4866,6 +5034,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ஃபாக்லாந்து தீவுகள் பவுண்டு</displayName>
 				<displayName count="other">ஃபாக்லாந்து தீவுகள் பவுண்டுகள்</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GBP">
 				<displayName>பிரிட்டிஷ் பவுண்ட் ஸ்டெர்லிங்</displayName>
@@ -4879,6 +5048,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ஜியார்ஜியன் லாரி</displayName>
 				<displayName count="other">ஜியார்ஜியன் லாரிகள்</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHS">
 				<displayName>கானயன் சேடி</displayName>
@@ -4904,12 +5074,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">கினியன் ஃப்ராங்க்</displayName>
 				<displayName count="other">கினியன் ஃப்ராங்குகள்</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GTQ">
 				<displayName>குவாடெமெலன் குயூட்ஸல்</displayName>
 				<displayName count="one">குவாடெமெலன் குயூட்ஸல்</displayName>
 				<displayName count="other">குவாடெமெலன் குயூட்ஸல்கள்</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GYD">
 				<displayName>கயானீஸ் டாலர்</displayName>
@@ -4930,17 +5102,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ஹோன்டூரன் லெம்பீரா</displayName>
 				<displayName count="other">ஹோன்டூரன் லெம்பீராக்கள்</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRK">
 				<displayName>குரோஷியன் குனா</displayName>
 				<displayName count="one">குரோஷியன் குனா</displayName>
 				<displayName count="other">குரோஷியன் குனாக்கள்</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
-				<displayName>ஹயேத்தியன் கோர்டே</displayName>
-				<displayName count="one">ஹயேத்தியன் கோர்டே</displayName>
-				<displayName count="other">ஹயேத்தியன் கோர்டேக்கள்</displayName>
+				<displayName>ஹைட்டியன் கோர்டே</displayName>
+				<displayName count="one">ஹைட்டியன் கோர்டே</displayName>
+				<displayName count="other">ஹைட்டியன் கோர்டேக்கள்</displayName>
 				<symbol>HTG</symbol>
 			</currency>
 			<currency type="HUF">
@@ -4948,12 +5122,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ஹங்கேரியன் ஃபோரின்ட்</displayName>
 				<displayName count="other">ஹங்கேரியன் ஃபோரின்ட்கள்</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>இந்தோனேஷியன் ருபியா</displayName>
 				<displayName count="one">இந்தோனேஷியன் ருபியா</displayName>
 				<displayName count="other">இந்தோனேஷியன் ருபியாக்கள்</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="ILS">
 				<displayName>இஸ்ரேலி நியூ ஷிகேல்</displayName>
@@ -4976,9 +5152,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>IQD</symbol>
 			</currency>
 			<currency type="IRR">
-				<displayName>இரானியன் ரியால்</displayName>
-				<displayName count="one">இரானியன் ரியால்</displayName>
-				<displayName count="other">இரானியன் ரியால்கள்</displayName>
+				<displayName>ஈரானியன் ரியால்</displayName>
+				<displayName count="one">ஈரானியன் ரியால்</displayName>
+				<displayName count="other">ஈரானியன் ரியால்கள்</displayName>
 				<symbol>IRR</symbol>
 			</currency>
 			<currency type="ISK">
@@ -4986,6 +5162,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ஐஸ்லாண்டிக் க்ரோனா</displayName>
 				<displayName count="other">ஐஸ்லாண்டிக் க்ரோனர்</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="JMD">
 				<displayName>ஜமைக்கான் டாலர்</displayName>
@@ -4995,9 +5172,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="JOD">
-				<displayName>ஜோர்டானியன் டைனர்</displayName>
-				<displayName count="one">ஜோர்டானியன் டைனர்</displayName>
-				<displayName count="other">ஜோர்டானியன் டைனர்கள்</displayName>
+				<displayName>ஜோர்டானிய தினார்</displayName>
+				<displayName count="one">ஜோர்டானிய தினார்</displayName>
+				<displayName count="other">ஜோர்டானிய தினார்கள்</displayName>
 				<symbol>JOD</symbol>
 			</currency>
 			<currency type="JPY">
@@ -5031,12 +5208,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">கமோரியன் ஃப்ராங்க்</displayName>
 				<displayName count="other">கமோரியன் ஃப்ராங்க்குகள்</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>வட கொரிய வான்</displayName>
 				<displayName count="one">வட கொரிய வான்</displayName>
 				<displayName count="other">வட கொரிய வான்</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>தென் கொரிய வான்</displayName>
@@ -5066,9 +5245,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">₸</symbol>
 			</currency>
 			<currency type="LAK">
-				<displayName>லவுட்டியன் கிப்</displayName>
-				<displayName count="one">லவுட்டியன் கிப்</displayName>
-				<displayName count="other">லவுட்டியன் கிப்கள்</displayName>
+				<displayName>லவோஷியன் கிப்</displayName>
+				<displayName count="one">லவோஷியன் கிப்</displayName>
+				<displayName count="other">லவோஷியன் கிப்கள்</displayName>
 				<symbol>LAK</symbol>
 				<symbol alt="narrow" draft="contributed">₭</symbol>
 			</currency>
@@ -5077,12 +5256,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">லெபனீஸ் பவுண்ட்</displayName>
 				<displayName count="other">லெபனீஸ் பவுண்டுகள்</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>இலங்கை ரூபாய்</displayName>
 				<displayName count="one">இலங்கை ரூபாய்</displayName>
 				<displayName count="other">இலங்கை ரூபாய்கள்</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>லைபீரியன் டாலர்</displayName>
@@ -5121,7 +5302,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="MDL">
 				<displayName>மால்டோவன் லியூ</displayName>
 				<displayName count="one">மால்டோவன் லியூ</displayName>
-				<displayName count="other">மால்டோவன் லியூ</displayName>
+				<displayName count="other">மால்டோவன் லேய்</displayName>
 				<symbol>MDL</symbol>
 			</currency>
 			<currency type="MGA">
@@ -5129,11 +5310,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">மலகாசி ஏரியரி</displayName>
 				<displayName count="other">மலகாசி ஏரியரிகள்</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MKD">
-				<displayName>மெசிடோனியன் தினார்</displayName>
-				<displayName count="one">மெசிடோனியன் தினார்</displayName>
-				<displayName count="other">மெசிடோனியன் தினாரி</displayName>
+				<displayName>மாசிடோனியன் டேனார்</displayName>
+				<displayName count="one">மாசிடோனியன் டேனார்</displayName>
+				<displayName count="other">மாசிடோனியன் டேனாரி</displayName>
 				<symbol>MKD</symbol>
 			</currency>
 			<currency type="MMK">
@@ -5141,6 +5323,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">மியான்மர் கியாத்</displayName>
 				<displayName count="other">மியான்மர் கியாத்கள்</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>மங்கோலியன் டுக்ரிக்</displayName>
@@ -5166,6 +5349,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">மொரீஷியன் ருபீ</displayName>
 				<displayName count="other">மொரீஷியன் ருபீக்கள்</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>மாலத்தீவு ருஃபியா</displayName>
@@ -5187,10 +5371,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="MYR">
-				<displayName>மலேஷியன் ரிங்கித்</displayName>
-				<displayName count="one">மலேஷியன் ரிங்கித்</displayName>
-				<displayName count="other">மலேஷியன் ரிங்கித்கள்</displayName>
+				<displayName>மலேஷியன் ரிங்கிட்</displayName>
+				<displayName count="one">மலேஷியன் ரிங்கிட்</displayName>
+				<displayName count="other">மலேஷியன் ரிங்கிட்கள்</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZN">
 				<displayName>மொசாம்பிகேன் மெடிகல்</displayName>
@@ -5217,18 +5402,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">நிகாராகுவான் கோர்டோபா</displayName>
 				<displayName count="other">நிகாராகுவான் கோர்டோபாக்கள்</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NOK">
 				<displayName>நார்வேஜியன் க்ரோன்</displayName>
 				<displayName count="one">நார்வேஜியன் க்ரோன்</displayName>
 				<displayName count="other">நார்வேஜியன் க்ரோனர்</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>நேபாளீஸ் ரூபாய்</displayName>
 				<displayName count="one">நேபாளீஸ் ரூபாய்</displayName>
 				<displayName count="other">நேபாளீஸ் ரூபாய்கள்</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>நியூசிலாந்து டாலர்</displayName>
@@ -5244,9 +5432,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>OMR</symbol>
 			</currency>
 			<currency type="PAB">
-				<displayName>பனாமானியன் பால்போபா</displayName>
-				<displayName count="one">பனாமானியன் பால்போபா</displayName>
-				<displayName count="other">பனாமானியன் பால்போபாக்கள்</displayName>
+				<displayName>பனாமானியன் பால்போவா</displayName>
+				<displayName count="one">பனாமானியன் பால்போவா</displayName>
+				<displayName count="other">பனாமானியன் பால்போவாக்கள்</displayName>
 				<symbol>PAB</symbol>
 			</currency>
 			<currency type="PEN">
@@ -5273,12 +5461,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">பாகிஸ்தானி ரூபாய்</displayName>
 				<displayName count="other">பாகிஸ்தானி ரூபாய்கள்</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>போலிஷ் ஸ்லாட்டி</displayName>
 				<displayName count="one">போலிஷ் ஸ்லாட்டி</displayName>
-				<displayName count="other">போலிஷ் ஸ்லாட்டி</displayName>
+				<displayName count="other">போலிஷ் ஸ்லாட்டிகள்</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PYG">
 				<displayName>பராகுவன் குவாரானி</displayName>
@@ -5310,12 +5500,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ரஷியன் ரூபிள்</displayName>
 				<displayName count="other">ரஷியன் ரூபிள்கள்</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RWF">
 				<displayName>ருவாண்டா ஃப்ராங்க்</displayName>
 				<displayName count="one">ருவாண்டா ஃப்ராங்க்</displayName>
 				<displayName count="other">ருவாண்டா ஃப்ராங்க்குகள்</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>சவுதி ரியால்</displayName>
@@ -5343,10 +5535,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>SDG</symbol>
 			</currency>
 			<currency type="SEK">
-				<displayName>ஸ்வேதிஷ் க்ரோனா</displayName>
-				<displayName count="one">ஸ்வேதிஷ் க்ரோனா</displayName>
-				<displayName count="other">ஸ்வேதிஷ் க்ரோனர்</displayName>
+				<displayName>ஸ்வீடிஷ் க்ரோனா</displayName>
+				<displayName count="one">ஸ்வீடிஷ் க்ரோனா</displayName>
+				<displayName count="other">ஸ்வீடிஷ் க்ரோனர்</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>சிங்கப்பூர் டாலர்</displayName>
@@ -5360,6 +5553,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">செயின்ட் ஹெலேனா பவுண்டு</displayName>
 				<displayName count="other">செயின்ட் ஹெலேனா பவுண்டுகள்</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SLL">
 				<displayName>சியாரா லியோனியன் லியோன்</displayName>
@@ -5392,12 +5586,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">சாவ் டோமி மற்றும் பிரின்ஸ்பி டோப்ரா</displayName>
 				<displayName count="other">சாவ் டோமி மற்றும் பிரின்ஸ்பி டோப்ராக்கள்</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SYP">
 				<displayName>சிரியன் பவுண்ட்</displayName>
 				<displayName count="one">சிரியன் பவுண்ட்</displayName>
 				<displayName count="other">சிரியன் பவுண்டுகள்</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>சுவாஸி லிலாங்கனி</displayName>
@@ -5410,6 +5606,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">தாய் பாட்</displayName>
 				<displayName count="other">தாய் பாட்</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJS">
 				<displayName>தஜிகிஸ்தானி சோமோனி</displayName>
@@ -5434,6 +5631,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">தொங்கான் பங்கா</displayName>
 				<displayName count="other">தொங்கான் பங்கா</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TRY">
 				<displayName>துருக்கிஷ் லீரா</displayName>
@@ -5441,11 +5639,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">துருக்கிஷ் லீரா</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
-				<displayName>டிரினாட் மற்றும் டோபாகோ டாலர்</displayName>
-				<displayName count="one">டிரினாட் மற்றும் டோபாகோ டாலர்</displayName>
-				<displayName count="other">டிரினாட் மற்றும் டோபாகோ டாலர்கள்</displayName>
+				<displayName>டிரினிடாட் மற்றும் டோபாகோ டாலர்</displayName>
+				<displayName count="one">டிரினிடாட் மற்றும் டோபாகோ டாலர்</displayName>
+				<displayName count="other">டிரினிடாட் மற்றும் டோபாகோ டாலர்கள்</displayName>
 				<symbol>TTD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -5490,16 +5689,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="UZS">
-				<displayName>உஸ்பெக்கிஸ்தான் சோம்</displayName>
-				<displayName count="one">உஸ்பெக்கிஸ்தான் சோம்</displayName>
-				<displayName count="other">உஸ்பெக்கிஸ்தான் சோம்</displayName>
+				<displayName>உஸ்பெக்கிஸ்தானி சோம்</displayName>
+				<displayName count="one">உஸ்பெக்கிஸ்தானி சோம்</displayName>
+				<displayName count="other">உஸ்பெக்கிஸ்தானி சோம்</displayName>
 				<symbol>UZS</symbol>
 			</currency>
 			<currency type="VEF">
-				<displayName>வெனிசுலியன் போலிவர்</displayName>
-				<displayName count="one">வெனிசுலியன் போலிவர்</displayName>
-				<displayName count="other">வெனிசுலியன் போலிவர்கள்</displayName>
+				<displayName>வெனிசுலன் போலிவர்</displayName>
+				<displayName count="one">வெனிசுலன் போலிவர்</displayName>
+				<displayName count="other">வெனிசுலன் போலிவர்கள்</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>வியட்நாமீஸ் டாங்</displayName>
@@ -5521,9 +5721,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>WST</symbol>
 			</currency>
 			<currency type="XAF">
-				<displayName>ஃப்ராங்க் (CFA BEAC)</displayName>
-				<displayName count="one">ஃப்ராங்க் (CFA BEAC)</displayName>
-				<displayName count="other">ஃப்ராங்குகள் (CFA BEAC)</displayName>
+				<displayName>மத்திய ஆப்பிரிக்க CFA ஃப்ராங்க்</displayName>
+				<displayName count="one">மத்திய ஆப்பிரிக்க CFA ஃப்ராங்க்</displayName>
+				<displayName count="other">மத்திய ஆப்பிரிக்க CFA ஃப்ராங்க்குகள்</displayName>
 				<symbol>FCFA</symbol>
 			</currency>
 			<currency type="XCD">
@@ -5531,11 +5731,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">கிழக்கு கரீபியன் டாலர்</displayName>
 				<displayName count="other">கிழக்கு கரீபியன் டாலர்கள்</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XOF">
-				<displayName>CFA ஃப்ராங்க் BCEAO</displayName>
-				<displayName count="one">CFA ஃப்ராங்க் BCEAO</displayName>
-				<displayName count="other">CFA ஃப்ராங்க் BCEAO</displayName>
+				<displayName>மேற்கு ஆப்பிரிக்கன் CFA ஃப்ராங்க்</displayName>
+				<displayName count="one">மேற்கு ஆப்பிரிக்கன் CFA ஃப்ராங்க்</displayName>
+				<displayName count="other">மேற்கு ஆப்பிரிக்கன் CFA ஃப்ராங்க்குகள்</displayName>
 				<symbol>CFA</symbol>
 			</currency>
 			<currency type="XPF">
@@ -5560,6 +5761,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">தென் ஆப்ரிக்க ராண்ட்</displayName>
 				<displayName count="other">தென் ஆப்ரிக்க ராண்ட்</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>ஸாம்பியன் குவாசா (1968–2012)</displayName>
@@ -5569,6 +5771,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ஸாம்பியன் குவாசா</displayName>
 				<displayName count="other">ஸாம்பியன் குவாசாக்கள்</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
@@ -5591,6 +5794,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">சதுர வினாடிக்கு {0} மீட்டர்</unitPattern>
 				<unitPattern count="other">சதுர வினாடிக்கு {0} மீட்டர்கள்</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>சுழற்சி</displayName>
+				<unitPattern count="one">{0} சுழற்சி</unitPattern>
+				<unitPattern count="other">{0} சுழற்சிகள்</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>ரேடியன்</displayName>
+				<unitPattern count="one">{0} ரேடியன்</unitPattern>
+				<unitPattern count="other">{0} ரேடியன்</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>டிகிரி</displayName>
+				<unitPattern count="one">{0} டிகிரி</unitPattern>
+				<unitPattern count="other">{0} டிகிரி</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>ஆர்க் நிமிடங்கள்</displayName>
 				<unitPattern count="one">{0} ஆர்க் நிமிடம்</unitPattern>
@@ -5598,33 +5816,45 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="angle-arc-second">
 				<displayName>ஆர்க் விநாடிகள்</displayName>
-				<unitPattern count="one">{0}ஆர்க்விநாடி</unitPattern>
+				<unitPattern count="one">{0} ஆர்க் விநாடி</unitPattern>
 				<unitPattern count="other">{0} ஆர்க் விநாடிகள்</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>டிகிரி</displayName>
-				<unitPattern count="one">{0} டிகிரி</unitPattern>
-				<unitPattern count="other">{0} டிகிரி</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>ரேடியன்</displayName>
-				<unitPattern count="one">{0} ரேடியன்</unitPattern>
-				<unitPattern count="other">{0} ரேடியன்</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ஏக்கர்</displayName>
-				<unitPattern count="one">{0} ஏக்கர்</unitPattern>
-				<unitPattern count="other">{0} ஏக்கர்</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>சதுர கிலோமீட்டர்கள்</displayName>
+				<unitPattern count="one">{0} சதுர கிலோமீட்டர்</unitPattern>
+				<unitPattern count="other">{0} சதுர கிலோமீட்டர்கள்</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ஹெக்டேர்</displayName>
 				<unitPattern count="one">{0} ஹெக்டேர்</unitPattern>
 				<unitPattern count="other">{0} ஹெக்டேர்</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>சதுர மீட்டர்கள்</displayName>
+				<unitPattern count="one">{0} சதுர மீட்டர்</unitPattern>
+				<unitPattern count="other">{0} சதுர மீட்டர்</unitPattern>
+				<perUnitPattern>{0}/சதுர மீட்டர்</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>சதுர சென்டி மீட்டர்கள்</displayName>
 				<unitPattern count="one">{0} சதுர சென்டிமீட்டர்</unitPattern>
 				<unitPattern count="other">{0} சதுர சென்டிமீட்டர்கள்</unitPattern>
+				<perUnitPattern>{0}/சதுர சென்டிமீட்டர்</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>சதுர மைல்கள்</displayName>
+				<unitPattern count="one">{0} சதுர மைல்</unitPattern>
+				<unitPattern count="other">{0} சதுர மைல்</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ஏக்கர்</displayName>
+				<unitPattern count="one">{0} ஏக்கர்</unitPattern>
+				<unitPattern count="other">{0} ஏக்கர்</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>சதுர யார்டுகள்</displayName>
+				<unitPattern count="one">{0} சதுர யார்டு</unitPattern>
+				<unitPattern count="other">{0} சதுர யார்டுகள்</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>சதுர அடி</displayName>
@@ -5635,91 +5865,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>சதுர அங்குலங்கள்</displayName>
 				<unitPattern count="one">{0} சதுர அங்குலம்</unitPattern>
 				<unitPattern count="other">{0} சதுர அங்குலங்கள்</unitPattern>
+				<perUnitPattern>{0}/சதுர அங்குலம்</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>சதுர கிலோமீட்டர்கள்</displayName>
-				<unitPattern count="one">{0} சதுர கிலோமீட்டர்</unitPattern>
-				<unitPattern count="other">{0} சதுர கிலோமீட்டர்கள்</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>சதுர மீட்டர்கள்</displayName>
-				<unitPattern count="one">{0} சதுர மீட்டர்</unitPattern>
-				<unitPattern count="other">{0} சதுர மீட்டர்</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>சதுர மைல்கள்</displayName>
-				<unitPattern count="one">{0} சதுர மைல்</unitPattern>
-				<unitPattern count="other">{0} சதுர மைல்</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>சதுர யார்டுகள்</displayName>
-				<unitPattern count="one">{0} சதுர யார்டு</unitPattern>
-				<unitPattern count="other">{0} சதுர யார்டுகள்</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>காரட்கள்</displayName>
+				<unitPattern count="one">{0} காரட்</unitPattern>
+				<unitPattern count="other">{0} காரட்கள்</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>லிட்டர்கள்/கிலோமீட்டர்</displayName>
 				<unitPattern count="one">{0} லிட்டர்/கிலோமீட்டர்</unitPattern>
 				<unitPattern count="other">{0} லிட்டர்கள்/கிலோமீட்டர்</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>லிட்டர்/100கி.மீ</displayName>
+				<unitPattern count="one">{0} லிட்டர்/100கி.மீ</unitPattern>
+				<unitPattern count="other">{0} லிட்டர்/100கி.மீ</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>மைல்கள்/கேலன்</displayName>
 				<unitPattern count="one">{0} மைல்/காலன்</unitPattern>
-				<unitPattern count="other">{0} மைல்/காலன்</unitPattern>
-			</unit>
-			<unit type="digital-bit">
-				<displayName>பிட்கள்</displayName>
-				<unitPattern count="one">{0} பிட்</unitPattern>
-				<unitPattern count="other">{0} பிட்கள்</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>பைட்கள்</displayName>
-				<unitPattern count="one">{0} பைட்</unitPattern>
-				<unitPattern count="other">{0} பைட்கள்</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>கிகாபிட்கள்</displayName>
-				<unitPattern count="one">{0} கிகாபிட்</unitPattern>
-				<unitPattern count="other">{0} கிகாபிட்கள்</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>கிகாபைட்கள்</displayName>
-				<unitPattern count="one">{0} கிகாபைட்</unitPattern>
-				<unitPattern count="other">{0} கிகாபைட்கள்</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>கிலோ பிட்கள்</displayName>
-				<unitPattern count="one">{0} கிலோ பிட்</unitPattern>
-				<unitPattern count="other">{0} கிலோ பிட்கள்</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>கிலோ பைட்கள்</displayName>
-				<unitPattern count="one">{0} கிலோ பைட்</unitPattern>
-				<unitPattern count="other">{0} கிலோ பைட்கள்</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>மெகா பிட்கள்</displayName>
-				<unitPattern count="one">{0} மெகா பிட்</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>மெகாபைட்கள்</displayName>
-				<unitPattern count="one">{0} மெகாபைட்</unitPattern>
-				<unitPattern count="other">{0} மெகாபைட்கள்</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>டெரா பிட்கள்</displayName>
-				<unitPattern count="one">{0} டெரா பிட்</unitPattern>
-				<unitPattern count="other">{0} டெரா பிட்கள்</unitPattern>
+				<unitPattern count="other">{0} மைல்கள்/காலன்</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
 				<displayName>டெராபைட்கள்</displayName>
 				<unitPattern count="one">{0} டெராபைட்</unitPattern>
 				<unitPattern count="other">{0} டெராபைட்கள்</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>டெரா பிட்கள்</displayName>
+				<unitPattern count="one">{0} டெரா பிட்</unitPattern>
+				<unitPattern count="other">{0} டெரா பிட்கள்</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>கிகாபைட்கள்</displayName>
+				<unitPattern count="one">{0} கிகாபைட்</unitPattern>
+				<unitPattern count="other">{0} கிகாபைட்கள்</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>கிகாபிட்கள்</displayName>
+				<unitPattern count="one">{0} கிகாபிட்</unitPattern>
+				<unitPattern count="other">{0} கிகாபிட்கள்</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>மெகாபைட்கள்</displayName>
+				<unitPattern count="one">{0} மெகாபைட்</unitPattern>
+				<unitPattern count="other">{0} மெகாபைட்கள்</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>மெகா பிட்கள்</displayName>
+				<unitPattern count="one">{0} மெகா பிட்</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>கிலோ பைட்கள்</displayName>
+				<unitPattern count="one">{0} கிலோ பைட்</unitPattern>
+				<unitPattern count="other">{0} கிலோ பைட்கள்</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>கிலோ பிட்கள்</displayName>
+				<unitPattern count="one">{0} கிலோ பிட்</unitPattern>
+				<unitPattern count="other">{0} கிலோ பிட்கள்</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>பைட்கள்</displayName>
+				<unitPattern count="one">{0} பைட்</unitPattern>
+				<unitPattern count="other">{0} பைட்கள்</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>பிட்கள்</displayName>
+				<unitPattern count="one">{0} பிட்</unitPattern>
+				<unitPattern count="other">{0} பிட்கள்</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>நூற்றாண்டுகள்</displayName>
+				<unitPattern count="one">{0} நூற்றாண்டு</unitPattern>
+				<unitPattern count="other">{0} நூற்றாண்டுகள்</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ஆண்டுகள்</displayName>
+				<unitPattern count="one">{0} ஆண்டு</unitPattern>
+				<unitPattern count="other">{0} ஆண்டுகள்</unitPattern>
+				<perUnitPattern>ஒரு வருடத்தில் {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>மாதங்கள்</displayName>
+				<unitPattern count="one">{0} மாதம்</unitPattern>
+				<unitPattern count="other">{0} மாதங்கள்</unitPattern>
+				<perUnitPattern>{0}/மா</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>வாரங்கள்</displayName>
+				<unitPattern count="one">{0} வாரம்</unitPattern>
+				<unitPattern count="other">{0} வாரங்கள்</unitPattern>
+				<perUnitPattern>{0}/வா</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>நாட்கள்</displayName>
 				<unitPattern count="one">{0} நாள்</unitPattern>
 				<unitPattern count="other">{0} நாட்கள்</unitPattern>
+				<perUnitPattern>{0}/நாள்</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>மணிநேரங்கள்</displayName>
@@ -5727,47 +5972,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} மணிநேரங்கள்</unitPattern>
 				<perUnitPattern>{0}/மணிநேரம்</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>மைக்ரோவிநாடிகள்</displayName>
-				<unitPattern count="one">{0} மைக்ரோவிநாடி</unitPattern>
-				<unitPattern count="other">{0} மைக்ரோவிநாடிகள்</unitPattern>
+			<unit type="duration-minute">
+				<displayName>நிமிடங்கள்</displayName>
+				<unitPattern count="one">{0} நிமிடம்</unitPattern>
+				<unitPattern count="other">{0} நிமிடங்கள்</unitPattern>
+				<perUnitPattern>{0}/நிமிடம்</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>விநாடிகள்</displayName>
+				<unitPattern count="one">{0} விநாடி</unitPattern>
+				<unitPattern count="other">{0} விநாடிகள்</unitPattern>
+				<perUnitPattern>{0}/விநாடி</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>மில்லிவிநாடிகள்</displayName>
 				<unitPattern count="one">{0} மில்லிவிநாடி</unitPattern>
 				<unitPattern count="other">{0} மில்லிவிநாடிகள்</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>நிமிடங்கள்</displayName>
-				<unitPattern count="one">{0} நிமிடம்</unitPattern>
-				<unitPattern count="other">{0} நிமிடங்கள்</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>மாதங்கள்</displayName>
-				<unitPattern count="one">{0} மாதம்</unitPattern>
-				<unitPattern count="other">{0} மாதங்கள்</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>மைக்ரோவிநாடிகள்</displayName>
+				<unitPattern count="one">{0} மைக்ரோவிநாடி</unitPattern>
+				<unitPattern count="other">{0} மைக்ரோவிநாடிகள்</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>நானோசெகண்டுகள்</displayName>
 				<unitPattern count="one">{0} நானோசெகண்டு</unitPattern>
 				<unitPattern count="other">{0} நானோசெகண்டுகள்</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>விநாடிகள்</displayName>
-				<unitPattern count="one">{0} விநாடி</unitPattern>
-				<unitPattern count="other">{0} விநாடிகள்</unitPattern>
-				<perUnitPattern>{0}/விநாடிக்கு</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>வாரங்கள்</displayName>
-				<unitPattern count="one">{0} வாரம்</unitPattern>
-				<unitPattern count="other">{0} வாரங்கள்</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>ஆண்டுகள்</displayName>
-				<unitPattern count="one">{0} ஆண்டு</unitPattern>
-				<unitPattern count="other">{0} ஆண்டுகள்</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>ஆம்பியர்கள்</displayName>
 				<unitPattern count="one">{0} ஆம்பியர்</unitPattern>
@@ -5788,6 +6019,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} வோல்ட்</unitPattern>
 				<unitPattern count="other">{0} வோல்ட்கள்</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>கிலோகலோரிகள்</displayName>
+				<unitPattern count="one">{0} கிலோகலோரி</unitPattern>
+				<unitPattern count="other">{0} கிலோகலோரிகள்</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>கலோரிகள்</displayName>
 				<unitPattern count="one">{0} கலோரி</unitPattern>
@@ -5798,21 +6034,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} கலோரி</unitPattern>
 				<unitPattern count="other">{0} கலோரிகள்</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>ஜூல்</displayName>
-				<unitPattern count="one">{0} ஜூல்</unitPattern>
-				<unitPattern count="other">{0} ஜூல்கள்</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>கிலோகலோரிகள்</displayName>
-				<unitPattern count="one">{0} கிலோகலோரி</unitPattern>
-				<unitPattern count="other">{0} கிலோகலோரிகள்</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>கிலோஜூல்கள்</displayName>
 				<unitPattern count="one">{0} கிலோஜூல்</unitPattern>
 				<unitPattern count="other">{0} கிலோஜூல்கள்</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>ஜூல்கள்</displayName>
+				<unitPattern count="one">{0} ஜூல்</unitPattern>
+				<unitPattern count="other">{0} ஜூல்கள்</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>கிலோவாட் மணிநேரம்</displayName>
 				<unitPattern count="one">{0} கிலோவாட் மணிநேரம்</unitPattern>
@@ -5823,191 +6054,215 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} கிகாஹெர்ட்ஸ்</unitPattern>
 				<unitPattern count="other">{0} கிகாஹெர்ட்ஸ்</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>ஹெர்ட்ஸ்</displayName>
-				<unitPattern count="one">{0} ஹெர்ட்ஸ்</unitPattern>
-				<unitPattern count="other">{0} ஹெர்ட்ஸ்</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>மெகாஹெர்ட்ஸ்</displayName>
+				<unitPattern count="one">{0} மெகாஹெர்ட்ஸ்</unitPattern>
+				<unitPattern count="other">{0} மெகாஹெர்ட்ஸ்</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>கிலோஹெர்ட்ஸ்</displayName>
 				<unitPattern count="one">{0} கிலோஹெர்ட்ஸ்</unitPattern>
 				<unitPattern count="other">{0} கிலோஹெர்ட்ஸ்</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>மெஹாஹெர்ட்ஸ்</displayName>
-				<unitPattern count="one">{0} மெஹாஹெர்ட்ஸ்</unitPattern>
-				<unitPattern count="other">{0} மெஹாஹெர்ட்ஸ்</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>ஹெர்ட்ஸ்</displayName>
+				<unitPattern count="one">{0} ஹெர்ட்ஸ்</unitPattern>
+				<unitPattern count="other">{0} ஹெர்ட்ஸ்</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>வானியல் அலகு</displayName>
-				<unitPattern count="one">{0} வானியல் அலகு</unitPattern>
-				<unitPattern count="other">{0} வானியல் அலகுகள்</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>கிலோமீட்டர்கள்</displayName>
+				<unitPattern count="one">{0} கிலோமீட்டர்</unitPattern>
+				<unitPattern count="other">{0} கிலோமீட்டர்கள்</unitPattern>
+				<perUnitPattern>{0}/கிலோமீட்டர்</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>சென்டிமீட்டர்கள்</displayName>
-				<unitPattern count="one">{0} சென்டிமீட்டர்</unitPattern>
-				<unitPattern count="other">{0} சென்டிமீட்டர்கள்</unitPattern>
+			<unit type="length-meter">
+				<displayName>மீட்டர்கள்</displayName>
+				<unitPattern count="one">{0} மீட்டர்</unitPattern>
+				<unitPattern count="other">{0} மீட்டர்கள்</unitPattern>
+				<perUnitPattern>{0}/மீ.</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>டெசிமீட்டர்கள்</displayName>
 				<unitPattern count="one">{0} டெசிமீட்டர்</unitPattern>
 				<unitPattern count="other">{0} டெசிமீட்டர்கள்</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>அடி</displayName>
-				<unitPattern count="one">{0} அடி</unitPattern>
-				<unitPattern count="other">{0} அடி</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>அங்குலங்கள்</displayName>
-				<unitPattern count="one">{0} அங்குலம்</unitPattern>
-				<unitPattern count="other">{0} அங்குலங்கள்</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>கிலோமீட்டர்கள்</displayName>
-				<unitPattern count="one">{0} கிலோமீட்டர்</unitPattern>
-				<unitPattern count="other">{0} கிலோமீட்டர்கள்</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ஒளி ஆண்டுகள்</displayName>
-				<unitPattern count="one">{0} ஒளி ஆண்டு</unitPattern>
-				<unitPattern count="other">{0} ஒளி ஆண்டுகள்</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>மீட்டர்கள்</displayName>
-				<unitPattern count="one">{0} மீட்டர்</unitPattern>
-				<unitPattern count="other">{0} மீட்டர்கள்</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>மைக்ரோமீட்டர்கள்</displayName>
-				<unitPattern count="one">{0} மைக்ரோமீட்டர்</unitPattern>
-				<unitPattern count="other">{0} மைக்ரோமீட்டர்கள்</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>மைல்கள்</displayName>
-				<unitPattern count="one">{0} மைல்</unitPattern>
-				<unitPattern count="other">{0} மைல்கள்</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>சென்டிமீட்டர்கள்</displayName>
+				<unitPattern count="one">{0} சென்டிமீட்டர்</unitPattern>
+				<unitPattern count="other">{0} சென்டிமீட்டர்கள்</unitPattern>
+				<perUnitPattern>{0}/செ.மீ.</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>மில்லிமீட்டர்கள்</displayName>
 				<unitPattern count="one">{0} மில்லிமீட்டர்</unitPattern>
 				<unitPattern count="other">{0} மில்லிமீட்டர்கள்</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>மைக்ரோமீட்டர்கள்</displayName>
+				<unitPattern count="one">{0} மைக்ரோமீட்டர்</unitPattern>
+				<unitPattern count="other">{0} மைக்ரோமீட்டர்கள்</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>நானோமீட்டர்கள்</displayName>
 				<unitPattern count="one">{0} நானோமீட்டர்</unitPattern>
 				<unitPattern count="other">{0} நானோமீட்டர்கள்</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>கடல் மைல்கள்</displayName>
-				<unitPattern count="one">{0} கடல் மைல்</unitPattern>
-				<unitPattern count="other">{0} கடல் மைல்கள்</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>புடைநொடிகள்</displayName>
-				<unitPattern count="one">{0} புடைநொடி</unitPattern>
-				<unitPattern count="other">{0} புடைநொடிகள்</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>பைக்கோமீட்டர்கள்</displayName>
 				<unitPattern count="one">{0} பைக்கோமீட்டர்</unitPattern>
 				<unitPattern count="other">{0} பைக்கோமீட்டர்கள்</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>மைல்கள்</displayName>
+				<unitPattern count="one">{0} மைல்</unitPattern>
+				<unitPattern count="other">{0} மைல்கள்</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>கெஜம்</displayName>
 				<unitPattern count="one">{0} கெஜம்</unitPattern>
 				<unitPattern count="other">{0} கெஜம்</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>அடி</displayName>
+				<unitPattern count="one">{0} அடி</unitPattern>
+				<unitPattern count="other">{0} அடி</unitPattern>
+				<perUnitPattern>{0}/அடி</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>அங்குலங்கள்</displayName>
+				<unitPattern count="one">{0} அங்குலம்</unitPattern>
+				<unitPattern count="other">{0} அங்குலங்கள்</unitPattern>
+				<perUnitPattern>{0}/அங்குலம்</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>புடைநொடிகள்</displayName>
+				<unitPattern count="one">{0} புடைநொடி</unitPattern>
+				<unitPattern count="other">{0} புடைநொடிகள்</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ஒளி ஆண்டுகள்</displayName>
+				<unitPattern count="one">{0} ஒளி ஆண்டு</unitPattern>
+				<unitPattern count="other">{0} ஒளி ஆண்டுகள்</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>வானியல் அலகுகள்</displayName>
+				<unitPattern count="one">{0} வானியல் அலகு</unitPattern>
+				<unitPattern count="other">{0} வானியல் அலகுகள்</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>கடல் மைல்கள்</displayName>
+				<unitPattern count="one">{0} கடல் மைல்</unitPattern>
+				<unitPattern count="other">{0} கடல் மைல்கள்</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>ஸ்கேண்டிநேவியன் மைல்</displayName>
+				<unitPattern count="one">{0} ஸ்கேண்டிநேவியன் மைல்</unitPattern>
+				<unitPattern count="other">{0} ஸ்கேண்டிநேவியன் மைல்கள்</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>லக்ஸ்</displayName>
 				<unitPattern count="one">{0} லக்ஸ்</unitPattern>
 				<unitPattern count="other">{0} லக்ஸ்</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>கேரட்கள்</displayName>
-				<unitPattern count="one">{0} கேரட்</unitPattern>
-				<unitPattern count="other">{0} கேரட்கள்</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>கிராம்கள்</displayName>
-				<unitPattern count="one">{0} கிராம்</unitPattern>
-				<unitPattern count="other">{0} கிராம்கள்</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>கிலோகிராம்கள்</displayName>
-				<unitPattern count="one">{0} கிலோகிராம்</unitPattern>
-				<unitPattern count="other">{0} கிலோகிராம்கள்</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>மெட்ரிக் டன்கள்</displayName>
 				<unitPattern count="one">{0} மெட்ரிக் டன்</unitPattern>
 				<unitPattern count="other">{0} மெட்ரிக் டன்கள்</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>மைக்ரோ கிராம்கள்</displayName>
-				<unitPattern count="one">{0} மைக்ரோ கிராம்</unitPattern>
-				<unitPattern count="other">{0} மைக்ரோ கிராம்கள்</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>கிலோகிராம்கள்</displayName>
+				<unitPattern count="one">{0} கிலோகிராம்</unitPattern>
+				<unitPattern count="other">{0} கிலோகிராம்கள்</unitPattern>
+				<perUnitPattern>{0}/கிலோகிராம்</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>கிராம்கள்</displayName>
+				<unitPattern count="one">{0} கிராம்</unitPattern>
+				<unitPattern count="other">{0} கிராம்கள்</unitPattern>
+				<perUnitPattern>{0}/கிராம்</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>மில்லி கிராம்கள்</displayName>
 				<unitPattern count="one">{0} மில்லி கிராம்</unitPattern>
 				<unitPattern count="other">{0} மில்லி கிராம்கள்</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>அவுன்ஸ்கள்</displayName>
-				<unitPattern count="one">{0} அவுன்ஸ்</unitPattern>
-				<unitPattern count="other">{0} அவுன்ஸ்கள்</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ட்ராய் அவுன்ஸ்கள்</displayName>
-				<unitPattern count="one">{0} ட்ராய் அவுன்ஸ்</unitPattern>
-				<unitPattern count="other">{0} ட்ராய் அவுன்ஸ்கள்</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>பவுண்டுகள்</displayName>
-				<unitPattern count="one">{0} பவுண்டு</unitPattern>
-				<unitPattern count="other">{0} பவுண்டுகள்</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>மைக்ரோ கிராம்கள்</displayName>
+				<unitPattern count="one">{0} மைக்ரோ கிராம்</unitPattern>
+				<unitPattern count="other">{0} மைக்ரோ கிராம்கள்</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>டன்கள்</displayName>
 				<unitPattern count="one">{0} டன்</unitPattern>
 				<unitPattern count="other">{0} டன்கள்</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>பவுண்டுகள்</displayName>
+				<unitPattern count="one">{0} பவுண்டு</unitPattern>
+				<unitPattern count="other">{0} பவுண்டுகள்</unitPattern>
+				<perUnitPattern>{0}/பவுண்டு</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>அவுன்ஸ்கள்</displayName>
+				<unitPattern count="one">{0} அவுன்ஸ்</unitPattern>
+				<unitPattern count="other">{0} அவுன்ஸ்கள்</unitPattern>
+				<perUnitPattern>{0}/அவுன்ஸ்</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ட்ராய் அவுன்ஸ்கள்</displayName>
+				<unitPattern count="one">{0} ட்ராய் அவுன்ஸ்</unitPattern>
+				<unitPattern count="other">{0} ட்ராய் அவுன்ஸ்கள்</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>கேரட்கள்</displayName>
+				<unitPattern count="one">{0} கேரட்</unitPattern>
+				<unitPattern count="other">{0} கேரட்கள்</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>கிகாவாட்ஸ்</displayName>
 				<unitPattern count="one">{0} கிகாவாட்</unitPattern>
 				<unitPattern count="other">{0} கிகாவாட்ஸ்</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>குதிரைத்திறன்</displayName>
-				<unitPattern count="one">{0} குதிரைத்திறன்</unitPattern>
-				<unitPattern count="other">{0} குதிரைத்திறன்</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>கிலோவாட்கள்</displayName>
-				<unitPattern count="one">{0} கிலோவாட்</unitPattern>
-				<unitPattern count="other">{0} கிலோவாட்கள்</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>மெகாவாட்ஸ்</displayName>
 				<unitPattern count="one">{0} மெகாவாட்</unitPattern>
 				<unitPattern count="other">{0} மெகாவாட்ஸ்</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>மில்லிவாட்ஸ்</displayName>
-				<unitPattern count="one">{0} மில்லிவாட்</unitPattern>
-				<unitPattern count="other">{0} மில்லிவாட்ஸ்</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>கிலோவாட்கள்</displayName>
+				<unitPattern count="one">{0} கிலோவாட்</unitPattern>
+				<unitPattern count="other">{0} கிலோவாட்கள்</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>வாட்ஸ்</displayName>
 				<unitPattern count="one">{0} வாட்</unitPattern>
 				<unitPattern count="other">{0} வாட்ஸ்</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>மில்லிவாட்ஸ்</displayName>
+				<unitPattern count="one">{0} மில்லிவாட்</unitPattern>
+				<unitPattern count="other">{0} மில்லிவாட்ஸ்</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>குதிரைத்திறன்</displayName>
+				<unitPattern count="one">{0} குதிரைத்திறன்</unitPattern>
+				<unitPattern count="other">{0} குதிரைத்திறன்</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>ஹெக்டோபாஸ்கல்</displayName>
 				<unitPattern count="one">{0} ஹெக்டோபாஸ்கல்</unitPattern>
 				<unitPattern count="other">{0} ஹெக்டோபாஸ்கல்</unitPattern>
 			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>பாதரச மில்லிமீட்டர்கள்</displayName>
+				<unitPattern count="one">{0} பாதரச மில்லிமீட்டர்</unitPattern>
+				<unitPattern count="other">{0} பாதரச மில்லிமீட்டர்கள்</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>பவுண்டுகள்/சதுர அங்குலம்</displayName>
+				<unitPattern count="one">{0} பவுண்டு/சதுர அங்குலம்</unitPattern>
+				<unitPattern count="other">{0} பவுண்டுகள்/சதுர அங்குலம்</unitPattern>
+			</unit>
 			<unit type="pressure-inch-hg">
 				<displayName>பாதரச அங்குலங்கள்</displayName>
 				<unitPattern count="one">{0} பாதரச அங்குலம்</unitPattern>
@@ -6018,21 +6273,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} மில்லிபார்</unitPattern>
 				<unitPattern count="other">{0} மில்லிபார்கள்</unitPattern>
 			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<displayName>பாதரச மில்லிமீட்டர்கள்</displayName>
-				<unitPattern count="one">{0} பாதரச மில்லிமீட்டர்</unitPattern>
-				<unitPattern count="other">{0} பாதரச மில்லிமீட்டர்கள்</unitPattern>
-			</unit>
-			<unit type="pressure-pound-per-square-inch">
-				<displayName>சதுர அங்குலத்திற்கு பவுண்டுகள்</displayName>
-				<unitPattern count="one">{0} சதுர அங்குலத்திற்கு பவுண்டு</unitPattern>
-				<unitPattern count="other">{0} சதுர அங்குலத்திற்கு பவுண்டுகள்</unitPattern>
-			</unit>
-			<unit type="proportion-karat">
-				<displayName>காரட்கள்</displayName>
-				<unitPattern count="one">{0} காரட்கள்</unitPattern>
-				<unitPattern count="other">{0} காரட்கள்</unitPattern>
-			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>கிலோமீட்டர்கள்/மணிநேரம்</displayName>
 				<unitPattern count="one">{0} கிலோமீட்டர்/மணிநேரம்</unitPattern>
@@ -6048,6 +6288,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} மைல்/மணிநேரம்</unitPattern>
 				<unitPattern count="other">{0} மைல்கள்/மணிநேரம்</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>நாட்</displayName>
+				<unitPattern count="one">{0} நாட்</unitPattern>
+				<unitPattern count="other">{0} நாட்</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>டிகிரி செல்சியஸ்</displayName>
 				<unitPattern count="one">{0} டிகிரி செல்சியஸ்</unitPattern>
@@ -6059,34 +6309,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} டிகிரி ஃபாரன்ஹீட்</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
-				<displayName>கெல்வின்கள்</displayName>
+				<displayName>கெல்வின்</displayName>
 				<unitPattern count="one">{0} கெல்வின்</unitPattern>
-				<unitPattern count="other">{0} கெல்வின்கள்</unitPattern>
-			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ஏக்கர் அடி</displayName>
-				<unitPattern count="one">{0} ஏக்கர் அடி</unitPattern>
-				<unitPattern count="other">{0} ஏக்கர் அடி</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>சென்டிலிட்டர்கள்</displayName>
-				<unitPattern count="one">{0} சென்டிலிட்டர்</unitPattern>
-				<unitPattern count="other">{0} சென்டிலிட்டர்கள்</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>கனசதுர சென்டிமீட்டர்கள்</displayName>
-				<unitPattern count="one">{0} கனசதுர சென்டிமீட்டர்</unitPattern>
-				<unitPattern count="other">{0} கனசதுர சென்டிமீட்டர்கள்</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>கனசதுர அடி</displayName>
-				<unitPattern count="one">{0} கனசதுர அடி</unitPattern>
-				<unitPattern count="other">{0} கனசதுர அடி</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>கனசதுர அங்குலங்கள்</displayName>
-				<unitPattern count="one">{0} கனசதுர அங்குலம்</unitPattern>
-				<unitPattern count="other">{0} கனசதுர அங்குலங்கள்</unitPattern>
+				<unitPattern count="other">{0} கெல்வின்</unitPattern>
 			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>கன கிலோமீட்டர்கள்</displayName>
@@ -6097,6 +6322,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>கன மீட்டர்கள்</displayName>
 				<unitPattern count="one">{0} கன மீட்டர்</unitPattern>
 				<unitPattern count="other">{0} கன மீட்டர்கள்</unitPattern>
+				<perUnitPattern>{0}/கன மீட்டர்</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>கனசதுர சென்டிமீட்டர்கள்</displayName>
+				<unitPattern count="one">{0} கனசதுர சென்டிமீட்டர்</unitPattern>
+				<unitPattern count="other">{0} கனசதுர சென்டிமீட்டர்கள்</unitPattern>
+				<perUnitPattern>{0}/கனசதுர சென்டிமீட்டர்</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>கன மைல்கள்</displayName>
@@ -6108,25 +6340,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} கன யார்டு</unitPattern>
 				<unitPattern count="other">{0} கன யார்டுகள்</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>கோப்பைகள்</displayName>
-				<unitPattern count="one">{0} கோப்பை</unitPattern>
-				<unitPattern count="other">{0} கோப்பைகள்</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>கனசதுர அடி</displayName>
+				<unitPattern count="one">{0} கனசதுர அடி</unitPattern>
+				<unitPattern count="other">{0} கனசதுர அடி</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>டெசிலிட்டர்கள்</displayName>
-				<unitPattern count="one">{0} டெசிலிட்டர்</unitPattern>
-				<unitPattern count="other">{0} டெசிலிட்டர்கள்</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>கனசதுர அங்குலங்கள்</displayName>
+				<unitPattern count="one">{0} கனசதுர அங்குலம்</unitPattern>
+				<unitPattern count="other">{0} கனசதுர அங்குலங்கள்</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>திரவ அவுன்ஸ்</displayName>
-				<unitPattern count="one">{0} திரவ அவுன்ஸ்</unitPattern>
-				<unitPattern count="other">{0} திரவ அவுன்ஸ்</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>கேலன்கள்</displayName>
-				<unitPattern count="one">{0} கேலன்</unitPattern>
-				<unitPattern count="other">{0} கேலன்கள்</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>மெகாலிட்டர்கள்</displayName>
+				<unitPattern count="one">{0} மெகாலிட்டர்</unitPattern>
+				<unitPattern count="other">{0} மெகாலிட்டர்கள்</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>ஹெக்டோலிட்டர்கள்</displayName>
@@ -6137,26 +6364,63 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>லிட்டர்கள்</displayName>
 				<unitPattern count="one">{0} லிட்டர்</unitPattern>
 				<unitPattern count="other">{0} லிட்டர்கள்</unitPattern>
+				<perUnitPattern>{0}/லிட்டர்</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>மெகாலிட்டர்கள்</displayName>
-				<unitPattern count="one">{0} மெகாலிட்டர்</unitPattern>
-				<unitPattern count="other">{0} மெகாலிட்டர்கள்</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>டெசிலிட்டர்கள்</displayName>
+				<unitPattern count="one">{0} டெசிலிட்டர்</unitPattern>
+				<unitPattern count="other">{0} டெசிலிட்டர்கள்</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>சென்டிலிட்டர்கள்</displayName>
+				<unitPattern count="one">{0} சென்டிலிட்டர்</unitPattern>
+				<unitPattern count="other">{0} சென்டிலிட்டர்கள்</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>மில்லிலிட்டர்கள்</displayName>
 				<unitPattern count="one">{0} மில்லிலிட்டர்</unitPattern>
 				<unitPattern count="other">{0} மில்லிலிட்டர்கள்</unitPattern>
 			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>மெட்ரிக் பின்ட்கள்</displayName>
+				<unitPattern count="one">{0} மெட்ரிக் பின்ட்</unitPattern>
+				<unitPattern count="other">{0} மெட்ரிக் பின்ட்கள்</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>மெட்ரிக் கோப்பைகள்</displayName>
+				<unitPattern count="one">{0} மெட்ரிக் கோப்பை</unitPattern>
+				<unitPattern count="other">{0} மெட்ரிக் கோப்பைகள்</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ஏக்கர் அடி</displayName>
+				<unitPattern count="one">{0} ஏக்கர் அடி</unitPattern>
+				<unitPattern count="other">{0} ஏக்கர் அடி</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>கேலன்கள்</displayName>
+				<unitPattern count="one">{0} கேலன்</unitPattern>
+				<unitPattern count="other">{0} கேலன்கள்</unitPattern>
+				<perUnitPattern>{0}/கேலன்</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>குவார்ட்ஸ்</displayName>
+				<unitPattern count="one">{0} குவார்ட்</unitPattern>
+				<unitPattern count="other">{0} குவார்ட்ஸ்</unitPattern>
+			</unit>
 			<unit type="volume-pint">
 				<displayName>பின்ட்கள்</displayName>
 				<unitPattern count="one">{0} பின்ட்</unitPattern>
 				<unitPattern count="other">{0} பின்ட்கள்</unitPattern>
 			</unit>
-			<unit type="volume-quart">
-				<displayName>குவார்ட்ஸ்</displayName>
-				<unitPattern count="one">{0} குவார்ட்ஸ்</unitPattern>
-				<unitPattern count="other">{0} குவார்ட்ஸ்</unitPattern>
+			<unit type="volume-cup">
+				<displayName>கோப்பைகள்</displayName>
+				<unitPattern count="one">{0} கோப்பை</unitPattern>
+				<unitPattern count="other">{0} கோப்பைகள்</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>திரவ அவுன்ஸ்</displayName>
+				<unitPattern count="one">{0} திரவ அவுன்ஸ்</unitPattern>
+				<unitPattern count="other">{0} திரவ அவுன்ஸ்</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>மேஜைக்கரண்டி</displayName>
@@ -6168,6 +6432,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} தேக்கரண்டி</unitPattern>
 				<unitPattern count="other">{0} தேக்கரண்டி</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}கி</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}வ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}தெ</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}மே</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -6183,6 +6453,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} மீ/வி²</unitPattern>
 				<unitPattern count="other">{0} மீ/வி²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>சுழற்.</displayName>
+				<unitPattern count="one">{0} சுழற்.</unitPattern>
+				<unitPattern count="other">{0} சுழற்.</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>ரேடி.</displayName>
+				<unitPattern count="one">{0} ரேடி.</unitPattern>
+				<unitPattern count="other">{0} ரேடி.</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>டிகிரி</displayName>
+				<unitPattern count="one">{0} டிகி.</unitPattern>
+				<unitPattern count="other">{0} டிகி.</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>ஆர்க்நிமி.</displayName>
 				<unitPattern count="one">{0} ஆர்க்நிமி.</unitPattern>
@@ -6193,30 +6478,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ஆர்க்விநா.</unitPattern>
 				<unitPattern count="other">{0} ஆர்க்விநா.</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>டிகிரி</displayName>
-				<unitPattern count="one">{0} டிகி.</unitPattern>
-				<unitPattern count="other">{0} டிகி.</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>ரேடி.</displayName>
-				<unitPattern count="one">{0} ரேடி.</unitPattern>
-				<unitPattern count="other">{0} ரேடி.</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ஏக்கர்</displayName>
-				<unitPattern count="one">{0} ஏக்.</unitPattern>
-				<unitPattern count="other">{0} ஏக்.</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>கி.மீ.²</displayName>
+				<unitPattern count="one">{0} கி.மீ.²</unitPattern>
+				<unitPattern count="other">{0} கி.மீ.²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ஹெக்டேர்</displayName>
 				<unitPattern count="one">{0} ஹெக்.</unitPattern>
 				<unitPattern count="other">{0} ஹெக்.</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>மீட்டர்கள்²</displayName>
+				<unitPattern count="one">{0} மீ²</unitPattern>
+				<unitPattern count="other">{0} மீ²</unitPattern>
+				<perUnitPattern>{0}/மீ²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>செ.மீ.²</displayName>
 				<unitPattern count="one">{0} செ.மீ.²</unitPattern>
 				<unitPattern count="other">{0} செ.மீ.²</unitPattern>
+				<perUnitPattern>{0}/செ.மீ.²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>சதுர மைல்கள்</displayName>
+				<unitPattern count="one">{0} ச. மை.</unitPattern>
+				<unitPattern count="other">{0} ச. மை.</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ஏக்கர்</displayName>
+				<unitPattern count="one">{0} ஏக்.</unitPattern>
+				<unitPattern count="other">{0} ஏக்.</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>யார்டுகள்²</displayName>
+				<unitPattern count="one">{0} யா²</unitPattern>
+				<unitPattern count="other">{0} யா.²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>சதுர அடி</displayName>
@@ -6224,125 +6521,121 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ச.அ.</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
-				<displayName>அங்.²</displayName>
+				<displayName>அங்குலங்கள்²</displayName>
 				<unitPattern count="one">{0} அங்.²</unitPattern>
 				<unitPattern count="other">{0} அங்.²</unitPattern>
+				<perUnitPattern>{0}/அங்.²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>கிமீ²</displayName>
-				<unitPattern count="one">{0} கிமீ²</unitPattern>
-				<unitPattern count="other">{0} கிமீ²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>மீட்டர்கள்²</displayName>
-				<unitPattern count="one">{0} மீ²</unitPattern>
-				<unitPattern count="other">{0} மீ²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>சதுர மைல்கள்</displayName>
-				<unitPattern count="one">{0} ச. மை.</unitPattern>
-				<unitPattern count="other">{0} ச. மை.</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>யா.²</displayName>
-				<unitPattern count="one">{0} யா²</unitPattern>
-				<unitPattern count="other">{0} யா.²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>காரட்கள்</displayName>
+				<unitPattern count="one">{0} கார.</unitPattern>
+				<unitPattern count="other">{0} கார.</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName>லி/கி.மீ.</displayName>
-				<unitPattern count="one">{0} லி/கி.மீ.</unitPattern>
-				<unitPattern count="other">{0} லி/கி.மீ.</unitPattern>
+				<displayName>லி./கி.மீ.</displayName>
+				<unitPattern count="one">{0} லி./கி.மீ.</unitPattern>
+				<unitPattern count="other">{0} லி./கி.மீ.</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>லி./100கி.மீ</displayName>
+				<unitPattern count="one">{0} லி./100கி.மீ</unitPattern>
+				<unitPattern count="other">{0} லி./100கி.மீ</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>மைல்கள்/கா.</displayName>
 				<unitPattern count="one">{0} மை./கா.</unitPattern>
 				<unitPattern count="other">{0} மை./கா.</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>பிட்</displayName>
-				<unitPattern count="one">{0} பிட்</unitPattern>
-				<unitPattern count="other">{0} பிட்</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>பைட்</displayName>
-				<unitPattern count="one">{0} பை.</unitPattern>
-				<unitPattern count="other">{0} பை.</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>TB</displayName>
+				<unitPattern count="one">{0} TB</unitPattern>
+				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>Tb</displayName>
 				<unitPattern count="one">{0} Tb</unitPattern>
 				<unitPattern count="other">{0} Tb</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>TB</displayName>
-				<unitPattern count="one">{0} TB</unitPattern>
-				<unitPattern count="other">{0} TB</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>கி.பைட்</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>கி.பிட்</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>பைட்</displayName>
+				<unitPattern count="one">{0} பை.</unitPattern>
+				<unitPattern count="other">{0} பை.</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>பிட்</displayName>
+				<unitPattern count="one">{0} பிட்</unitPattern>
+				<unitPattern count="other">{0} பிட்</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>நூ.</displayName>
+				<unitPattern count="one">{0} நூ.</unitPattern>
+				<unitPattern count="other">{0} நூ.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ஆண்டுகள்</displayName>
+				<unitPattern count="one">{0} ஆண்டு</unitPattern>
+				<unitPattern count="other">{0} ஆண்டு.</unitPattern>
+				<perUnitPattern>{0}/ஆ.</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>மாத</displayName>
+				<unitPattern count="one">{0} மாதம்</unitPattern>
+				<unitPattern count="other">{0} மாத</unitPattern>
+				<perUnitPattern>{0}/மா</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>வார</displayName>
+				<unitPattern count="one">{0} வாரம்</unitPattern>
+				<unitPattern count="other">{0} வார</unitPattern>
+				<perUnitPattern>{0}/வார</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>நாட்கள்</displayName>
 				<unitPattern count="one">{0} நாள்</unitPattern>
 				<unitPattern count="other">{0} நாட்கள்</unitPattern>
+				<perUnitPattern>{0}/நா</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName>மணிநேரங்கள்</displayName>
+				<displayName>மணிநேர</displayName>
 				<unitPattern count="one">{0} மணிநேரம்</unitPattern>
 				<unitPattern count="other">{0} மணிநேரம்</unitPattern>
-				<perUnitPattern>{0} /ம.நே.</perUnitPattern>
-			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μsecs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>மில்லிவிநாடி</displayName>
-				<unitPattern count="one">{0} மி.வி.</unitPattern>
-				<unitPattern count="other">{0} மி.வி.</unitPattern>
+				<perUnitPattern>{0} /ம.நே</perUnitPattern>
 			</unit>
 			<unit type="duration-minute">
-				<displayName>நிமிடங்கள்</displayName>
+				<displayName>நிமிட</displayName>
 				<unitPattern count="one">{0} நிமிடம்</unitPattern>
-				<unitPattern count="other">{0} நிமிடங்கள்</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>மாதங்கள்</displayName>
-				<unitPattern count="one">{0} மாதம்</unitPattern>
-				<unitPattern count="other">{0} மாதங்கள்</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>நானோசெகண்டுகள்</displayName>
-				<unitPattern count="one">{0} நா.செ.</unitPattern>
-				<unitPattern count="other">{0} நா.செ.</unitPattern>
+				<unitPattern count="other">{0} நிமிட</unitPattern>
+				<perUnitPattern>{0}/நிமிட</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>விநாடிகள்</displayName>
@@ -6350,15 +6643,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} விநாடிகள்</unitPattern>
 				<perUnitPattern>{0}/வி</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>வாரங்கள்</displayName>
-				<unitPattern count="one">{0} வாரம்</unitPattern>
-				<unitPattern count="other">{0} வாரங்கள்</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>மில்லிவிநாடி</displayName>
+				<unitPattern count="one">{0} மி.வி.</unitPattern>
+				<unitPattern count="other">{0} மி.வி.</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>ஆண்டுகள்</displayName>
-				<unitPattern count="one">{0} ஆண்டு</unitPattern>
-				<unitPattern count="other">{0} ஆண்டு.</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μsecs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>நானோசெகண்டுகள்</displayName>
+				<unitPattern count="one">{0} நா.செ.</unitPattern>
+				<unitPattern count="other">{0} நா.செ.</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ஆம்ப்.</displayName>
@@ -6380,6 +6678,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} வோ.</unitPattern>
 				<unitPattern count="other">{0} வோ.</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>கி.கலோ.</displayName>
+				<unitPattern count="one">{0} கி.கலோ.</unitPattern>
+				<unitPattern count="other">{0} கி.கலோ.</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>கலோ.</displayName>
 				<unitPattern count="one">{0} கலோ.</unitPattern>
@@ -6390,21 +6693,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} கலோ.</unitPattern>
 				<unitPattern count="other">{0} கலோ.</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>ஜூல்</displayName>
-				<unitPattern count="one">{0} ஜூ.</unitPattern>
-				<unitPattern count="other">{0} ஜூ.</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>கி.கலோ.</displayName>
-				<unitPattern count="one">{0} கி.கலோ.</unitPattern>
-				<unitPattern count="other">{0} கி.கலோ.</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>கி.ஜூ.</displayName>
 				<unitPattern count="one">{0} கி.ஜூ.</unitPattern>
 				<unitPattern count="other">{0} கி.ஜூ.</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>ஜூல்</displayName>
+				<unitPattern count="one">{0} ஜூ.</unitPattern>
+				<unitPattern count="other">{0} ஜூ.</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>கி.வா-ம.நே.</displayName>
 				<unitPattern count="one">{0} கி.வா.ம.நே.</unitPattern>
@@ -6415,218 +6713,227 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ஜி.ஹெஸ்.</unitPattern>
 				<unitPattern count="other">{0} ஜி.ஹெஸ்.</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>ஹெஸ்.</displayName>
-				<unitPattern count="one">{0} ஹெஸ்.</unitPattern>
-				<unitPattern count="other">{0} ஹெஸ்.</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>மெ.ஹெஸ்.</displayName>
+				<unitPattern count="one">{0} மெ.ஹெஸ்.</unitPattern>
+				<unitPattern count="other">{0} மெ.ஹெஸ்.</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>கி.ஹெஸ்.</displayName>
 				<unitPattern count="one">{0} கி.ஹெஸ்.</unitPattern>
 				<unitPattern count="other">{0} கி.ஹெஸ்.</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>மெ.ஹெஸ்.</displayName>
-				<unitPattern count="one">{0} மெ.ஹெஸ்.</unitPattern>
-				<unitPattern count="other">{0} மெ.ஹெஸ்.</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>ஹெஸ்.</displayName>
+				<unitPattern count="one">{0} ஹெஸ்.</unitPattern>
+				<unitPattern count="other">{0} ஹெஸ்.</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>வா.அ.</displayName>
-				<unitPattern count="one">{0} வா.அ.</unitPattern>
-				<unitPattern count="other">{0} வா.அ.</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>கி.மீ.</displayName>
+				<unitPattern count="one">{0} கி.மீ.</unitPattern>
+				<unitPattern count="other">{0} கி.மீ.</unitPattern>
+				<perUnitPattern>{0}/கி.மீ.</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>செ.மீ.</displayName>
-				<unitPattern count="one">{0} செ.மீ.</unitPattern>
-				<unitPattern count="other">{0} செ.மீ.</unitPattern>
+			<unit type="length-meter">
+				<displayName>மீட்டர்கள்</displayName>
+				<unitPattern count="one">{0} மீ.</unitPattern>
+				<unitPattern count="other">{0} மீ.</unitPattern>
+				<perUnitPattern>{0}/மீ.</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>டெ.மீ</displayName>
 				<unitPattern count="one">{0} டெ.மீ</unitPattern>
 				<unitPattern count="other">{0} டெ.மீ</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>அடி</displayName>
-				<unitPattern count="one">{0} அடி</unitPattern>
-				<unitPattern count="other">{0} அடி</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>செ.மீ.</displayName>
+				<unitPattern count="one">{0} செ.மீ.</unitPattern>
+				<unitPattern count="other">{0} செ.மீ.</unitPattern>
+				<perUnitPattern>{0}/செ.மீ.</perUnitPattern>
 			</unit>
-			<unit type="length-inch">
-				<displayName>அங்குலங்கள்</displayName>
-				<unitPattern count="one">{0} அங்.</unitPattern>
-				<unitPattern count="other">{0} அங்.</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>கிமீ</displayName>
-				<unitPattern count="one">{0} கி.மீ.</unitPattern>
-				<unitPattern count="other">{0} கி.மீ.</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ஒளி ஆண்டுகள்</displayName>
-				<unitPattern count="one">{0} ஒ.ஆ.</unitPattern>
-				<unitPattern count="other">{0} ஒ.ஆ.</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>மீட்டர்கள்</displayName>
-				<unitPattern count="one">{0} மீ.</unitPattern>
-				<unitPattern count="other">{0} மீ.</unitPattern>
+			<unit type="length-millimeter">
+				<displayName>மி.மீ.</displayName>
+				<unitPattern count="one">{0} மி.மீ.</unitPattern>
+				<unitPattern count="other">{0} மி.மீ.</unitPattern>
 			</unit>
 			<unit type="length-micrometer">
 				<displayName>µமீ.</displayName>
 				<unitPattern count="one">{0} µமீ.</unitPattern>
 				<unitPattern count="other">{0} µமீ.</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName>மைல்கள்</displayName>
-				<unitPattern count="one">{0} மை.</unitPattern>
-				<unitPattern count="other">{0} மை.</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName>மில்லிமீட்டர்கள்</displayName>
-				<unitPattern count="one">{0} மி.மீ.</unitPattern>
-				<unitPattern count="other">{0} மி.மீ.</unitPattern>
-			</unit>
 			<unit type="length-nanometer">
 				<displayName>நா.மீ.</displayName>
 				<unitPattern count="one">{0} நா.மீ.</unitPattern>
 				<unitPattern count="other">{0} நா.மீ.</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>க.மை.</displayName>
-				<unitPattern count="one">{0} க.மை.</unitPattern>
-				<unitPattern count="other">{0} க.மை.</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>பு.நொ.</displayName>
-				<unitPattern count="one">{0} பு.நொ.</unitPattern>
-				<unitPattern count="other">{0} பு.நொ.</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>பை.மீ</displayName>
 				<unitPattern count="one">{0} பை.மீ.</unitPattern>
 				<unitPattern count="other">{0} பை.மீ.</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>மைல்கள்</displayName>
+				<unitPattern count="one">{0} மை.</unitPattern>
+				<unitPattern count="other">{0} மை.</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>கெஜ.</displayName>
 				<unitPattern count="one">{0} கெஜ.</unitPattern>
 				<unitPattern count="other">{0} கெஜ.</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>அடி</displayName>
+				<unitPattern count="one">{0} அடி</unitPattern>
+				<unitPattern count="other">{0} அடி</unitPattern>
+				<perUnitPattern>{0}/அடி</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>அங்குலங்கள்</displayName>
+				<unitPattern count="one">{0} அங்.</unitPattern>
+				<unitPattern count="other">{0} அங்.</unitPattern>
+				<perUnitPattern>{0}/அங்.</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>பு.நொ.</displayName>
+				<unitPattern count="one">{0} பு.நொ.</unitPattern>
+				<unitPattern count="other">{0} பு.நொ.</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ஒளி ஆண்டுகள்</displayName>
+				<unitPattern count="one">{0} ஒ.ஆ.</unitPattern>
+				<unitPattern count="other">{0} ஒ.ஆ.</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>வா.அ.</displayName>
+				<unitPattern count="one">{0} வா.அ.</unitPattern>
+				<unitPattern count="other">{0} வா.அ.</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>க.மை.</displayName>
+				<unitPattern count="one">{0} க.மை.</unitPattern>
+				<unitPattern count="other">{0} க.மை.</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>ஸ்.மை.</displayName>
+				<unitPattern count="one">{0} ஸ்.மை.</unitPattern>
+				<unitPattern count="other">{0} ஸ்.மை.</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>லக்ஸ்</displayName>
 				<unitPattern count="one">{0} லக்.</unitPattern>
 				<unitPattern count="other">{0} லக்.</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>கேரட்கள்</displayName>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>கிராம்கள்</displayName>
-				<unitPattern count="one">{0} கி.</unitPattern>
-				<unitPattern count="other">{0} கி.</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>கி.கி.</displayName>
-				<unitPattern count="one">{0} கி.கி.</unitPattern>
-				<unitPattern count="other">{0} கி.கி.</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>ட.</displayName>
 				<unitPattern count="one">{0} ட.</unitPattern>
 				<unitPattern count="other">{0} ட.</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µகி</displayName>
-				<unitPattern count="one">{0} µகி</unitPattern>
-				<unitPattern count="other">{0} µகி</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>கி.கி.</displayName>
+				<unitPattern count="one">{0} கி.கி.</unitPattern>
+				<unitPattern count="other">{0} கி.கி.</unitPattern>
+				<perUnitPattern>{0}/கி.கி.</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>கிராம்கள்</displayName>
+				<unitPattern count="one">{0} கி.</unitPattern>
+				<unitPattern count="other">{0} கி.</unitPattern>
+				<perUnitPattern>{0}/கி.</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>மி.கி.</displayName>
 				<unitPattern count="one">{0} மி.கி.</unitPattern>
 				<unitPattern count="other">{0} மி.கி.</unitPattern>
 			</unit>
+			<unit type="mass-microgram">
+				<displayName>µகி</displayName>
+				<unitPattern count="one">{0} µகி</unitPattern>
+				<unitPattern count="other">{0} µகி</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>டன்கள்</displayName>
+				<unitPattern count="one">{0} டன்</unitPattern>
+				<unitPattern count="other">{0} டன்</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>பவுண்டுகள்</displayName>
+				<unitPattern count="one">{0} பவு.</unitPattern>
+				<unitPattern count="other">{0} பவு.</unitPattern>
+				<perUnitPattern>{0}/பவு.</perUnitPattern>
+			</unit>
 			<unit type="mass-ounce">
 				<displayName>அவு.</displayName>
 				<unitPattern count="one">{0} அவு.</unitPattern>
 				<unitPattern count="other">{0} அவு.</unitPattern>
+				<perUnitPattern>{0}/அவு.</perUnitPattern>
 			</unit>
 			<unit type="mass-ounce-troy">
 				<displayName>அவு. டி.</displayName>
 				<unitPattern count="one">{0} அவு. டி.</unitPattern>
 				<unitPattern count="other">{0} அவு. டி.</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<displayName>பவுண்டுகள்</displayName>
-				<unitPattern count="one">{0} பவு.</unitPattern>
-				<unitPattern count="other">{0} பவு.</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<displayName>tn</displayName>
-				<unitPattern count="one">{0} டன்</unitPattern>
-				<unitPattern count="other">{0} டன்</unitPattern>
+			<unit type="mass-carat">
+				<displayName>கேரட்கள்</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<displayName>கி.வாட்.</displayName>
 				<unitPattern count="one">{0} கி.வாட்.</unitPattern>
 				<unitPattern count="other">{0} கி.வாட்.</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>கு.தி.</displayName>
-				<unitPattern count="one">{0} கு.தி.</unitPattern>
-				<unitPattern count="other">{0} கு.தி.</unitPattern>
+			<unit type="power-megawatt">
+				<displayName>மெ.வா.</displayName>
+				<unitPattern count="one">{0} மெ.வா.</unitPattern>
+				<unitPattern count="other">{0} மெ.வா.</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName>கி.வா.</displayName>
 				<unitPattern count="one">{0} கி.வா.</unitPattern>
 				<unitPattern count="other">{0} கி.வா.</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<displayName>மெ.வா.</displayName>
-				<unitPattern count="one">{0} மெ.வா.</unitPattern>
-				<unitPattern count="other">{0} மெ.வா.</unitPattern>
+			<unit type="power-watt">
+				<displayName>வாட்ஸ்</displayName>
+				<unitPattern count="one">{0} வா.</unitPattern>
+				<unitPattern count="other">{0} வா.</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<displayName>மி.வா.</displayName>
 				<unitPattern count="one">{0} மி.வா.</unitPattern>
 				<unitPattern count="other">{0} மி.வா.</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName>வாட்ஸ்</displayName>
-				<unitPattern count="one">{0} வா.</unitPattern>
-				<unitPattern count="other">{0} வா.</unitPattern>
+			<unit type="power-horsepower">
+				<displayName>கு.தி.</displayName>
+				<unitPattern count="one">{0} கு.தி.</unitPattern>
+				<unitPattern count="other">{0} கு.தி.</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>ஹெ.பாஸ்.</displayName>
 				<unitPattern count="one">{0} ஹெ.பாஸ்.</unitPattern>
 				<unitPattern count="other">{0} ஹெ.பாஸ்.</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>பாதரச அங்குலம்</displayName>
-				<unitPattern count="one">{0} பா.அங்.</unitPattern>
-				<unitPattern count="other">{0} பா.அங்.</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>மில்லிபார்</displayName>
-				<unitPattern count="one">{0} மி.பா.</unitPattern>
-				<unitPattern count="other">{0} மி.பா.</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
-				<unitPattern count="one">{0} mm Hg</unitPattern>
-				<unitPattern count="other">{0} mm Hg</unitPattern>
+				<unitPattern count="one">{0} Hg மி.மீ.</unitPattern>
+				<unitPattern count="other">{0} Hg மி.மீ.</unitPattern>
 			</unit>
 			<unit type="pressure-pound-per-square-inch">
 				<displayName>psi</displayName>
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>காரட்கள்</displayName>
-				<unitPattern count="one">{0} கார.</unitPattern>
-				<unitPattern count="other">{0} கார.</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>Hg அங்.</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>மில்லிபார்</displayName>
+				<unitPattern count="one">{0} மி.பா.</unitPattern>
+				<unitPattern count="other">{0} மி.பா.</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName>கிமீ/மணிநேரம்</displayName>
+				<displayName>கி.மீ./மணிநேரம்</displayName>
 				<unitPattern count="one">{0} கி.மீ./ம.நே.</unitPattern>
 				<unitPattern count="other">{0} கி.மீ./ம.நே.</unitPattern>
 			</unit>
@@ -6640,8 +6947,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} மை/ம.நே.</unitPattern>
 				<unitPattern count="other">{0} மை/ம.நே.</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>நா.</displayName>
+				<unitPattern count="one">{0} நா.</unitPattern>
+				<unitPattern count="other">{0} நா.</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
-				<displayName>டிகிரி செல்சியஸ்</displayName>
+				<displayName>டிகிரி செ.</displayName>
 				<unitPattern count="one">{0}°செ.</unitPattern>
 				<unitPattern count="other">{0}°செ.</unitPattern>
 			</unit>
@@ -6655,31 +6972,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} கெல்</unitPattern>
 				<unitPattern count="other">{0} கெல்</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ஏக். அடி</displayName>
-				<unitPattern count="one">{0} ஏக். அடி</unitPattern>
-				<unitPattern count="other">{0} ஏக். அடி</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>செ.லி.</displayName>
-				<unitPattern count="one">{0} செ.லி.</unitPattern>
-				<unitPattern count="other">{0} செ.லி.</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>செ.மீ.³</displayName>
-				<unitPattern count="one">{0} செ.மீ.³</unitPattern>
-				<unitPattern count="other">{0} செ.மீ.³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>அடி³</displayName>
-				<unitPattern count="one">{0} அடி³</unitPattern>
-				<unitPattern count="other">{0} அடி³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>அங்.³</displayName>
-				<unitPattern count="one">{0} அங்.³</unitPattern>
-				<unitPattern count="other">{0} அங்.³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>கிமீ³</displayName>
 				<unitPattern count="one">{0} கிமீ³</unitPattern>
@@ -6689,6 +6981,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>மீ³</displayName>
 				<unitPattern count="one">{0} மீ³</unitPattern>
 				<unitPattern count="other">{0} மீ³</unitPattern>
+				<perUnitPattern>{0}/மீ³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>செ.மீ.³</displayName>
+				<unitPattern count="one">{0} செ.மீ.³</unitPattern>
+				<unitPattern count="other">{0} செ.மீ.³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>மை³</displayName>
@@ -6700,25 +6999,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} யா.³</unitPattern>
 				<unitPattern count="other">{0} யா.³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>கோப்பைகள்</displayName>
-				<unitPattern count="one">{0} கோ.</unitPattern>
-				<unitPattern count="other">{0} கோ.</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>அடி³</displayName>
+				<unitPattern count="one">{0} அடி³</unitPattern>
+				<unitPattern count="other">{0} அடி³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>டெ.லி.</displayName>
-				<unitPattern count="one">{0} டெ.லி.</unitPattern>
-				<unitPattern count="other">{0} டெ.லி.</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>அங்.³</displayName>
+				<unitPattern count="one">{0} அங்.³</unitPattern>
+				<unitPattern count="other">{0} அங்.³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>தி. அவு.</displayName>
-				<unitPattern count="one">{0} தி. அவு.</unitPattern>
-				<unitPattern count="other">{0} தி. அவு.</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>கேல.</displayName>
-				<unitPattern count="one">{0} கேல.</unitPattern>
-				<unitPattern count="other">{0} கேல.</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>மெ.லி.</displayName>
+				<unitPattern count="one">{0} மெ.லி.</unitPattern>
+				<unitPattern count="other">{0} மெ.லி.</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>ஹெ.லி.</displayName>
@@ -6729,27 +7023,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>லிட்டர்கள்</displayName>
 				<unitPattern count="one">{0} லி.</unitPattern>
 				<unitPattern count="other">{0} லி.</unitPattern>
+				<perUnitPattern>{0}/லி.</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>மெ.லி.</displayName>
-				<unitPattern count="one">{0} மெ.லி.</unitPattern>
-				<unitPattern count="other">{0} மெ.லி.</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>டெ.லி.</displayName>
+				<unitPattern count="one">{0} டெ.லி.</unitPattern>
+				<unitPattern count="other">{0} டெ.லி.</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>செ.லி.</displayName>
+				<unitPattern count="one">{0} செ.லி.</unitPattern>
+				<unitPattern count="other">{0} செ.லி.</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>மிலி</displayName>
 				<unitPattern count="one">{0} மிலி</unitPattern>
 				<unitPattern count="other">{0} மிலி</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>பின்.</displayName>
-				<unitPattern count="one">{0} பின்.</unitPattern>
-				<unitPattern count="other">{0} பின்.</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>மெ.பி.</displayName>
+				<unitPattern count="one">{0} மெ.பி.</unitPattern>
+				<unitPattern count="other">{0} மெ.பி.</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>மெ.கோப்பை</displayName>
+				<unitPattern count="one">{0} மெ.கோ.</unitPattern>
+				<unitPattern count="other">{0} மெ.கோ.</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ஏக். அடி</displayName>
+				<unitPattern count="one">{0} ஏக். அடி</unitPattern>
+				<unitPattern count="other">{0} ஏக். அடி</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>கேல.</displayName>
+				<unitPattern count="one">{0} கேல.</unitPattern>
+				<unitPattern count="other">{0} கேல.</unitPattern>
+				<perUnitPattern>{0}/கேல.</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>குவாட்.</displayName>
 				<unitPattern count="one">{0} குவாட்.</unitPattern>
 				<unitPattern count="other">{0} குவாட்.</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>பின்ட்கள்</displayName>
+				<unitPattern count="one">{0} பின்.</unitPattern>
+				<unitPattern count="other">{0} பின்.</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>கோப்பைகள்</displayName>
+				<unitPattern count="one">{0} கோ.</unitPattern>
+				<unitPattern count="other">{0} கோ.</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>தி. அவு.</displayName>
+				<unitPattern count="one">{0} தி. அவு.</unitPattern>
+				<unitPattern count="other">{0} தி. அவு.</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>மே.க.</displayName>
 				<unitPattern count="one">{0} மே.க.</unitPattern>
@@ -6760,6 +7091,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} தே.க.</unitPattern>
 				<unitPattern count="other">{0} தே.க.</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}கி</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}வ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}தெ</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}மே</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -6769,6 +7106,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ஜி.ஃபோ.</unitPattern>
 				<unitPattern count="other">{0} ஜி.ஃபோ.</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}நிமி.</unitPattern>
 				<unitPattern count="other">{0}நிமி.</unitPattern>
@@ -6777,26 +7118,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}வி.</unitPattern>
 				<unitPattern count="other">{0}வி.</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} ஏக்.</unitPattern>
-				<unitPattern count="other">{0} ஏக்.</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} ச.கிமீ.</unitPattern>
+				<unitPattern count="other">{0} ச.கிமீ.</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} ஹெக்.</unitPattern>
 				<unitPattern count="other">{0} ஹெக்.</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} ச.அ.</unitPattern>
-				<unitPattern count="other">{0} ச.அ.</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} ச.கிமீ.</unitPattern>
-				<unitPattern count="other">{0} ச.கிமீ.</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} ச.மீ.</unitPattern>
 				<unitPattern count="other">{0} ச.மீ.</unitPattern>
@@ -6805,77 +7134,74 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ச. மை.</unitPattern>
 				<unitPattern count="other">{0} ச. மை.</unitPattern>
 			</unit>
-			<unit type="duration-day">
-				<displayName>நாள்</displayName>
-				<unitPattern count="one">{0} நா</unitPattern>
-				<unitPattern count="other">{0} நா</unitPattern>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} ஏக்.</unitPattern>
+				<unitPattern count="other">{0} ஏக்.</unitPattern>
 			</unit>
-			<unit type="duration-hour">
-				<displayName>மணிநேரம்</displayName>
-				<unitPattern count="one">{0} ம.நே.</unitPattern>
-				<unitPattern count="other">{0} ம.நே.</unitPattern>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ச.அ.</unitPattern>
+				<unitPattern count="other">{0} ச.அ.</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>மில்லிவிநாடி</displayName>
-				<unitPattern count="one">{0} மி.வி.</unitPattern>
-				<unitPattern count="other">{0} மி.வி.</unitPattern>
-			</unit>
-			<unit type="duration-minute">
-				<displayName>நிமிடம்</displayName>
-				<unitPattern count="one">{0} நிமி.</unitPattern>
-				<unitPattern count="other">{0} நிமி.</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>மாதம்</displayName>
-				<unitPattern count="one">{0} மா</unitPattern>
-				<unitPattern count="other">{0} மா</unitPattern>
-			</unit>
-			<unit type="duration-second">
-				<displayName>விநாடி</displayName>
-				<unitPattern count="one">{0} வி.</unitPattern>
-				<unitPattern count="other">{0} வி.</unitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>வாரம்</displayName>
-				<unitPattern count="one">{0} வா</unitPattern>
-				<unitPattern count="other">{0} வா</unitPattern>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>லி./100கி.மீ</displayName>
+				<unitPattern count="one">{0}லி./100கி.மீ</unitPattern>
+				<unitPattern count="other">{0}லி./100கி.மீ</unitPattern>
 			</unit>
 			<unit type="duration-year">
 				<displayName>ஆண்டு</displayName>
 				<unitPattern count="one">{0} ஆ</unitPattern>
 				<unitPattern count="other">{0} ஆ</unitPattern>
 			</unit>
+			<unit type="duration-month">
+				<displayName>மா</displayName>
+				<unitPattern count="one">{0} மா</unitPattern>
+				<unitPattern count="other">{0} மா</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>வா</displayName>
+				<unitPattern count="one">{0} வா</unitPattern>
+				<unitPattern count="other">{0} வா</unitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>நா</displayName>
+				<unitPattern count="one">{0} நா</unitPattern>
+				<unitPattern count="other">{0} நா</unitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>மணி</displayName>
+				<unitPattern count="one">{0} ம.நே.</unitPattern>
+				<unitPattern count="other">{0} ம.நே.</unitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>நிமி.</displayName>
+				<unitPattern count="one">{0} நிமி.</unitPattern>
+				<unitPattern count="other">{0} நிமி.</unitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>வி.</displayName>
+				<unitPattern count="one">{0} வி.</unitPattern>
+				<unitPattern count="other">{0} வி.</unitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>மி.வி.</displayName>
+				<unitPattern count="one">{0} மி.வி.</unitPattern>
+				<unitPattern count="other">{0} மி.வி.</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>கி.மீ.</displayName>
+				<unitPattern count="one">{0}கி.மீ.</unitPattern>
+				<unitPattern count="other">{0}கி.மீ.</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>மீ.</displayName>
+				<unitPattern count="one">{0}மீ.</unitPattern>
+				<unitPattern count="other">{0}மீ.</unitPattern>
+			</unit>
 			<unit type="length-centimeter">
 				<displayName>செ.மீ.</displayName>
 				<unitPattern count="one">{0}செ.மீ.</unitPattern>
 				<unitPattern count="other">{0}செ.மீ.</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0} அடி</unitPattern>
-				<unitPattern count="other">{0} அடி</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0} அங்.</unitPattern>
-				<unitPattern count="other">{0} அங்.</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>கிமீ</displayName>
-				<unitPattern count="one">{0}கி.மீ.</unitPattern>
-				<unitPattern count="other">{0}கி.மீ.</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} ஒ.ஆ.</unitPattern>
-				<unitPattern count="other">{0} ஒ.ஆ.</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>மீட்டர்</displayName>
-				<unitPattern count="one">{0}மீ.</unitPattern>
-				<unitPattern count="other">{0}மீ.</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} மை.</unitPattern>
-				<unitPattern count="other">{0} மை.</unitPattern>
-			</unit>
 			<unit type="length-millimeter">
 				<displayName>மி.மீ.</displayName>
 				<unitPattern count="one">{0}மி.மீ.</unitPattern>
@@ -6885,31 +7211,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} பை.மீ.</unitPattern>
 				<unitPattern count="other">{0} பை.மீ.</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} மை.</unitPattern>
+				<unitPattern count="other">{0} மை.</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} நீட்.</unitPattern>
 				<unitPattern count="other">{0} நீட்.</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>கிராம்</displayName>
-				<unitPattern count="one">{0} கி.</unitPattern>
-				<unitPattern count="other">{0} கி.</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} அடி</unitPattern>
+				<unitPattern count="other">{0} அடி</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} அங்.</unitPattern>
+				<unitPattern count="other">{0} அங்.</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} ஒ.ஆ.</unitPattern>
+				<unitPattern count="other">{0} ஒ.ஆ.</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>கி.கி.</displayName>
 				<unitPattern count="one">{0}கி.கி.</unitPattern>
 				<unitPattern count="other">{0}கி.கி.</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} அவு.</unitPattern>
-				<unitPattern count="other">{0} அவு.</unitPattern>
+			<unit type="mass-gram">
+				<displayName>கிராம்</displayName>
+				<unitPattern count="one">{0} கி.</unitPattern>
+				<unitPattern count="other">{0} கி.</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} பவு.</unitPattern>
 				<unitPattern count="other">{0} பவு.</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} கு.வே.</unitPattern>
-				<unitPattern count="other">{0} கு.வே.</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} அவு.</unitPattern>
+				<unitPattern count="other">{0} அவு.</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} கி.வா.</unitPattern>
@@ -6919,6 +7257,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} வா.</unitPattern>
 				<unitPattern count="other">{0} வா.</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} கு.வே.</unitPattern>
+				<unitPattern count="other">{0} கு.வே.</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} ஹெ.பா.</unitPattern>
 				<unitPattern count="other">{0} ஹெ.பா.</unitPattern>
@@ -6932,7 +7274,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} மி.பா.</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName>கி.மீ./ம.நே.</displayName>
+				<displayName>கி.மீ./ம.</displayName>
 				<unitPattern count="one">{0}கி.மீ./ம.</unitPattern>
 				<unitPattern count="other">{0}கி.மீ./ம.</unitPattern>
 			</unit>
@@ -6966,6 +7308,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}லி.</unitPattern>
 				<unitPattern count="other">{0}லி.</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}கி</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}வ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}தெ</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}மே</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ta_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_IN.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ta_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_IN.xml
index 8181f5b6eaf..64107740d31 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ta_IN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_IN.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ta"/>
 		<territory type="IN"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_LK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_LK.xml
new file mode 100644
index 00000000000..d3a5b5d5018
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_LK.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="ta"/>
+		<territory type="LK"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="LKR">
+				<symbol>Rs.</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ta_MY.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_MY.xml
similarity index 90%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ta_MY.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_MY.xml
index 80ddbdc3fea..73d1a29aa1d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ta_MY.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_MY.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11174 $"/>
-		<generation date="$Date: 2015-02-10 21:20:32 -0600 (Tue, 10 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ta"/>
 		<territory type="MY"/>
 	</identity>
@@ -62,3 +61,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ta_SG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_SG.xml
similarity index 90%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ta_SG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_SG.xml
index 8f15b5ebe74..ab083555e10 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ta_SG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_SG.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11174 $"/>
-		<generation date="$Date: 2015-02-10 21:20:32 -0600 (Tue, 10 Feb 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ta"/>
 		<territory type="SG"/>
 	</identity>
@@ -65,3 +64,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/te.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/te.xml
similarity index 92%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/te.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/te.xml
index 52c504a26ed..0f6f7f9576d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/te.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/te.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="te"/>
 	</identity>
 	<localeDisplayNames>
@@ -61,6 +60,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bem">బెంబా</language>
 			<language type="bez">బీనా</language>
 			<language type="bg">బల్గేరియన్</language>
+			<language type="bgn">పశ్చిమ బలూచీ</language>
 			<language type="bho">భోజ్ పూరి</language>
 			<language type="bi">బిస్లామా</language>
 			<language type="bik">బికోల్</language>
@@ -94,7 +94,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="chp">చిపెవ్యాన్</language>
 			<language type="chr">చెరోకీ</language>
 			<language type="chy">చేయేన్</language>
-			<language type="ckb">సొరాని కుర్దిష్</language>
+			<language type="ckb">సెంట్రల్ కుర్దిష్</language>
 			<language type="co">కోర్సికన్</language>
 			<language type="cop">కోప్టిక్</language>
 			<language type="cr">క్రి</language>
@@ -260,7 +260,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ks">కాశ్మీరి</language>
 			<language type="ksb">శంబాలా</language>
 			<language type="ksf">బాఫియ</language>
-			<language type="ku">కర్డిష్</language>
+			<language type="ku">కుర్దిష్</language>
 			<language type="kum">కుమ్యిక్</language>
 			<language type="kut">కుటేనై</language>
 			<language type="kv">కోమి</language>
@@ -280,6 +280,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">లావో</language>
 			<language type="lol">మొంగో</language>
 			<language type="loz">లోజి</language>
+			<language type="lrc">ఉత్తర లూరీ</language>
 			<language type="lt">లిథుయేనియన్</language>
 			<language type="lu">లూబ-కటాంగ</language>
 			<language type="lua">లుబా-లులువ</language>
@@ -325,12 +326,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mwr">మార్వాడి</language>
 			<language type="my">బర్మీస్</language>
 			<language type="myv">ఎర్జియా</language>
+			<language type="mzn">మాసన్‌దెరాని</language>
 			<language type="na">నౌరు</language>
 			<language type="nap">నియాపోలిటన్</language>
 			<language type="naq">నమ</language>
 			<language type="nb">నార్వీజియన్ బొక్మాల్</language>
 			<language type="nd">ఉత్తర దెబెలె</language>
 			<language type="nds">లో జర్మన్</language>
+			<language type="nds_NL">లో సాక్సన్</language>
 			<language type="ne">నేపాలి</language>
 			<language type="new">నెవారి</language>
 			<language type="ng">దోంగా</language>
@@ -406,6 +409,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">సిసిలియన్</language>
 			<language type="sco">స్కాట్స్</language>
 			<language type="sd">సింధీ</language>
+			<language type="sdh">దక్షిణ కుర్దిష్</language>
 			<language type="se">ఉత్తర సామి</language>
 			<language type="seh">సెనా</language>
 			<language type="sel">సేల్కప్</language>
@@ -440,8 +444,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">సుమేరియాన్</language>
 			<language type="sv">స్వీడిష్</language>
 			<language type="sw">స్వాహిలి</language>
+			<language type="sw_CD">కాంగో స్వాహిలి</language>
 			<language type="swb">కొమొరియన్</language>
-			<language type="swc">కాంగో స్వాహిలి</language>
 			<language type="syc">సాంప్రదాయ సిరియాక్</language>
 			<language type="syr">సిరియాక్</language>
 			<language type="ta">తమిళము</language>
@@ -495,6 +499,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">వాలామో</language>
 			<language type="war">వారే</language>
 			<language type="was">వాషో</language>
+			<language type="wbp">వార్లపిరి</language>
 			<language type="wo">వొలాఫ్</language>
 			<language type="xal">కల్మిక్</language>
 			<language type="xh">షోసా</language>
@@ -691,7 +696,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">ఆంగవిల్లా</territory>
 			<territory type="AL">అల్బేనియా</territory>
 			<territory type="AM">ఆర్మేనియా</territory>
-			<territory type="AN">నేదేర్లేండ్స్ అంటిల్లిస్</territory>
 			<territory type="AO">అంగోలా</territory>
 			<territory type="AQ">అంటార్కటికా</territory>
 			<territory type="AR">అర్జెంటీనా</territory>
@@ -976,6 +980,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric">సంఖ్యాత్మక క్రమబద్ధీకరణ</key>
 			<key type="colStrength">క్రమబద్ధీకరణ సామర్థ్యం</key>
 			<key type="currency">కరెన్సీ</key>
+			<key type="hc">గంటల పద్ధతి (12 వర్సెస్ 24)</key>
+			<key type="lb">లైన్ బ్రేక్ శైలి</key>
+			<key type="ms">కొలమాన పద్ధతి</key>
 			<key type="numbers">సంఖ్యలు</key>
 			<key type="timezone">సమయ మండలి</key>
 			<key type="va">లొకేల్ రూపాంతరం</key>
@@ -983,95 +990,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">ప్రైవేట్-ఉపయోగం</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">అరబిక్-ఇండిక్ అంకెలు</type>
-			<type type="arabext" key="numbers">పొడిగించబడిన అరబిక్-ఇండిక్ అంకెలు</type>
-			<type type="armn" key="numbers">అమెరికా సంఖ్యలు</type>
-			<type type="armnlow" key="numbers">అమెరికన్ చిన్న సంఖ్యలు</type>
-			<type type="beng" key="numbers">బెంగాలీ అంకెలు</type>
-			<type type="big5han" key="collation">సాంప్రదాయ చైనీస్ క్రమబద్ధీకరణ క్రమం - Big5</type>
-			<type type="buddhist" key="calendar">బుద్ధుల క్యాలెండర్‌</type>
-			<type type="chinese" key="calendar">చైనీస్ క్యాలెండర్</type>
-			<type type="coptic" key="calendar">కాప్టిక్ క్యాలెండర్</type>
-			<type type="dangi" key="calendar">దాంగీ క్యాలెండర్</type>
-			<type type="deva" key="numbers">దేవనాగరి అంకెలు</type>
-			<type type="dictionary" key="collation">నిఘంటువు క్రమబద్ధీకరణ క్రమం</type>
-			<type type="ducet" key="collation">డిఫాల్ట్ యూనీకోడ్ క్రమబద్ధీకరణ క్రమం</type>
-			<type type="ethi" key="numbers">ఎథియోపిక్ సంఖ్యలు</type>
-			<type type="ethiopic" key="calendar">ఎపోథిక్ క్యాలెండర్</type>
-			<type type="ethiopic-amete-alem" key="calendar">ఎథోపిక్ అమేటే అలెమ్ క్యాలెండర్</type>
-			<type type="finance" key="numbers">ఆర్థిక సంఖ్యలు</type>
-			<type type="fullwide" key="numbers">పూర్తి వెడల్పు అంకెలు</type>
-			<type type="gb2312han" key="collation">సరళీకృత చైనీస్ క్రమబద్ధీకరణ క్రమం - GB2312</type>
-			<type type="geor" key="numbers">జార్జియన్ సంఖ్యలు</type>
-			<type type="gregorian" key="calendar">గ్రేగోరియన్ క్యాలెండర్</type>
-			<type type="grek" key="numbers">గ్రీక్ సంఖ్యలు</type>
-			<type type="greklow" key="numbers">గ్రీక్ చిన్న సంఖ్యలు</type>
-			<type type="gujr" key="numbers">గుజరాతీ అంకెలు</type>
-			<type type="guru" key="numbers">గుర్ముఖీ అంకెలు</type>
-			<type type="hanidec" key="numbers">చైనీయుల దశాంశ సంఖ్యలు</type>
-			<type type="hans" key="numbers">సరళీకృతం చెయ్యబడిన చైనీయుల సంఖ్యలు</type>
-			<type type="hansfin" key="numbers">సరళీకృతం చెయ్యబడిన చైనీయుల ఆర్థిక సంఖ్యలు</type>
-			<type type="hant" key="numbers">సాంప్రదాయ చైనీయుల సంఖ్యలు</type>
-			<type type="hantfin" key="numbers">సాంప్రదాయ చైనీయుల ఆర్థిక సంఖ్యలు</type>
-			<type type="hebr" key="numbers">హిబ్రూ సంఖ్యలు</type>
-			<type type="hebrew" key="calendar">హిబ్రూ క్యాలెండర్</type>
-			<type type="identical" key="colStrength">అన్నింటినీ క్రమబద్ధీకరించు</type>
-			<type type="indian" key="calendar">భారతీయ జాతీయ క్యాలెండర్</type>
-			<type type="islamic" key="calendar">ఇస్లామిక్ క్యాలెండర్</type>
-			<type type="islamic-civil" key="calendar">ఇస్లామిక్-సివిల్ క్యాలెండర్</type>
-			<type type="iso8601" key="calendar">(ISO-8601) క్యాలెండర్</type>
-			<type type="japanese" key="calendar">జపానీయుల క్యాలెండర్</type>
-			<type type="jpan" key="numbers">జపానీయుల సంఖ్యలు</type>
-			<type type="jpanfin" key="numbers">జపానీయలు ఆర్థిక సంఖ్యలు</type>
-			<type type="khmr" key="numbers">ఖ్మేర్ అంకెలు</type>
-			<type type="knda" key="numbers">కన్నడ అంకెలు</type>
-			<type type="laoo" key="numbers">లావో అంకెలు</type>
-			<type type="latn" key="numbers">పశ్చిమ అంకెలు</type>
-			<type type="lower" key="colCaseFirst">ముందు లోయర్‌కేస్‌ని క్రమబద్ధీకరించు</type>
-			<type type="mlym" key="numbers">మలయాళం అంకెలు</type>
-			<type type="mong" key="numbers">మంగోలియన్ అంకెలు</type>
-			<type type="mymr" key="numbers">మయన్మార్ అంకెలు</type>
-			<type type="native" key="numbers">స్థానిక అంకెలు</type>
-			<type type="no" key="colBackwards">ఉచ్ఛారణలను సాధారణంగా క్రమబద్ధీకరించు</type>
-			<type type="no" key="colCaseFirst">సాధారణ కేస్ క్రమాన్ని క్రమబద్ధీకరించు</type>
-			<type type="no" key="colCaseLevel">కేస్ ఇన్‌సెన్సిటివ్‌ను క్రమబద్ధీకరించు</type>
-			<type type="no" key="colHiraganaQuaternary">కానాను వేరుగా క్రమబద్ధీకరించు</type>
-			<type type="no" key="colNormalization">సాధారణీకరణ చేయకుండా క్రమబద్ధీకరించు</type>
-			<type type="no" key="colNumeric">అంకెలను ఒక్కొక్కటిగా క్రమబద్ధీకరించు</type>
-			<type type="non-ignorable" key="colAlternate">చిహ్నాలను క్రమబద్ధీకరించు</type>
-			<type type="orya" key="numbers">ఒరియా అంకెలు</type>
-			<type type="persian" key="calendar">పర్షియన్ క్యాలెండర్</type>
-			<type type="phonebook" key="collation">ఫోన్‌బుక్ క్రమబద్ధీకరణ క్రమం</type>
-			<type type="phonetic" key="collation">ధ్వని ఉచ్ఛారిత క్రమబద్ధీకరణ క్రమం</type>
-			<type type="pinyin" key="collation">పిన్‌యిన్ క్రమబద్ధీకరణ క్రమం</type>
-			<type type="primary" key="colStrength">ప్రాథమిక అక్షరాలను మాత్రమే క్రమబద్ధీకరించు</type>
-			<type type="quaternary" key="colStrength">ఉచ్ఛారణలు/కేస్‌/వెడల్పు/కానాను క్రమబద్ధీకరించు</type>
-			<type type="reformed" key="collation">మళ్ళీ ఆకృతీకరించబడిన క్రమబద్ధీకరణ క్రమం</type>
-			<type type="roc" key="calendar">మింగ్యూ క్యాలెండర్</type>
-			<type type="roman" key="numbers">రోమన్ సంఖ్యలు</type>
-			<type type="romanlow" key="numbers">రోమన్ చిన్న సంఖ్యలు</type>
-			<type type="search" key="collation">సాధారణ-ప్రయోజన శోధన</type>
-			<type type="searchjl" key="collation">హాంగుల్ ప్రారంభ హల్లు ద్వారా శోధించు</type>
-			<type type="secondary" key="colStrength">ఉచ్ఛారణలని క్రమబద్ధీకరించు</type>
-			<type type="shifted" key="colAlternate">చిహ్నాలను విస్మరించడాన్ని క్రమబద్ధీకరించు</type>
-			<type type="standard" key="collation">ప్రామాణిక క్రమబద్ధీకరణ క్రమం</type>
-			<type type="stroke" key="collation">స్ట్రోక్ క్రమబద్ధీకరణ క్రమం</type>
-			<type type="taml" key="numbers">సాంప్రదాయ తమిళ సంఖ్యలు</type>
-			<type type="tamldec" key="numbers">తమిళ అంకెలు</type>
-			<type type="telu" key="numbers">తెలుగు అంకెలు</type>
-			<type type="tertiary" key="colStrength">ఉచ్ఛారణలని/కేస్‌ని/వెడల్పుని క్రమబద్ధీకరించు</type>
-			<type type="thai" key="numbers">థాయ్ అంకెలు</type>
-			<type type="tibt" key="numbers">టిబిటన్ అంకెలు</type>
-			<type type="traditional" key="collation">సాంప్రదాయ క్రమబద్ధీకరణ క్రమం</type>
-			<type type="traditional" key="numbers">సాంప్రదాయ సంఖ్యలు</type>
-			<type type="unihan" key="collation">రాడికల్-స్ట్రోక్ క్రమబద్ధీకరణ క్రమం</type>
-			<type type="upper" key="colCaseFirst">ముందు అప్పర్‌కేస్‌ని క్రమబద్ధీకరించు</type>
-			<type type="vaii" key="numbers">వాయ్ అంకెలు</type>
-			<type type="yes" key="colBackwards">ఉచ్ఛారణలను వ్యతిరేక క్రమంలో క్రమబద్ధీకరించు</type>
-			<type type="yes" key="colCaseLevel">కేస్ సెన్సిటివ్‌ని క్రమబద్ధీకరించు</type>
-			<type type="yes" key="colHiraganaQuaternary">కానాని భిన్నంగా క్రమబద్ధీకరించు</type>
-			<type type="yes" key="colNormalization">సాధారణీకరించిన యూనికోడ్‌ని క్రమబద్ధీకరించు</type>
-			<type type="yes" key="colNumeric">అంకెలను సంఖ్యాత్మకంగా క్రమబద్ధీకరించు</type>
+			<type key="calendar" type="buddhist">బుద్ధుల క్యాలెండర్‌</type>
+			<type key="calendar" type="chinese">చైనీస్ క్యాలెండర్</type>
+			<type key="calendar" type="coptic">కాప్టిక్ క్యాలెండర్</type>
+			<type key="calendar" type="dangi">దాంగీ క్యాలెండర్</type>
+			<type key="calendar" type="ethiopic">ఎపోథిక్ క్యాలెండర్</type>
+			<type key="calendar" type="ethiopic-amete-alem">ఎథోపిక్ అమేటే అలెమ్ క్యాలెండర్</type>
+			<type key="calendar" type="gregorian">గ్రేగోరియన్ క్యాలెండర్</type>
+			<type key="calendar" type="hebrew">హిబ్రూ క్యాలెండర్</type>
+			<type key="calendar" type="indian">భారతీయ జాతీయ క్యాలెండర్</type>
+			<type key="calendar" type="islamic">ఇస్లామిక్ క్యాలెండర్</type>
+			<type key="calendar" type="islamic-civil">ఇస్లామిక్-సివిల్ క్యాలెండర్</type>
+			<type key="calendar" type="iso8601">(ISO-8601) క్యాలెండర్</type>
+			<type key="calendar" type="japanese">జపానీయుల క్యాలెండర్</type>
+			<type key="calendar" type="persian">పర్షియన్ క్యాలెండర్</type>
+			<type key="calendar" type="roc">మింగ్యూ క్యాలెండర్</type>
+			<type key="colAlternate" type="non-ignorable">చిహ్నాలను క్రమబద్ధీకరించు</type>
+			<type key="colAlternate" type="shifted">చిహ్నాలను విస్మరించడాన్ని క్రమబద్ధీకరించు</type>
+			<type key="colBackwards" type="no">ఉచ్ఛారణలను సాధారణంగా క్రమబద్ధీకరించు</type>
+			<type key="colBackwards" type="yes">ఉచ్ఛారణలను వ్యతిరేక క్రమంలో క్రమబద్ధీకరించు</type>
+			<type key="colCaseFirst" type="lower">ముందు లోయర్‌కేస్‌ని క్రమబద్ధీకరించు</type>
+			<type key="colCaseFirst" type="no">సాధారణ కేస్ క్రమాన్ని క్రమబద్ధీకరించు</type>
+			<type key="colCaseFirst" type="upper">ముందు అప్పర్‌కేస్‌ని క్రమబద్ధీకరించు</type>
+			<type key="colCaseLevel" type="no">కేస్ ఇన్‌సెన్సిటివ్‌ను క్రమబద్ధీకరించు</type>
+			<type key="colCaseLevel" type="yes">కేస్ సెన్సిటివ్‌ని క్రమబద్ధీకరించు</type>
+			<type key="colHiraganaQuaternary" type="no">కానాను వేరుగా క్రమబద్ధీకరించు</type>
+			<type key="colHiraganaQuaternary" type="yes">కానాని భిన్నంగా క్రమబద్ధీకరించు</type>
+			<type key="collation" type="big5han">సాంప్రదాయ చైనీస్ క్రమబద్ధీకరణ క్రమం - Big5</type>
+			<type key="collation" type="dictionary">నిఘంటువు క్రమబద్ధీకరణ క్రమం</type>
+			<type key="collation" type="ducet">డిఫాల్ట్ యూనీకోడ్ క్రమబద్ధీకరణ క్రమం</type>
+			<type key="collation" type="gb2312han">సరళీకృత చైనీస్ క్రమబద్ధీకరణ క్రమం - GB2312</type>
+			<type key="collation" type="phonebook">ఫోన్‌బుక్ క్రమబద్ధీకరణ క్రమం</type>
+			<type key="collation" type="phonetic">ధ్వని ఉచ్ఛారిత క్రమబద్ధీకరణ క్రమం</type>
+			<type key="collation" type="pinyin">పిన్‌యిన్ క్రమబద్ధీకరణ క్రమం</type>
+			<type key="collation" type="reformed">మళ్ళీ ఆకృతీకరించబడిన క్రమబద్ధీకరణ క్రమం</type>
+			<type key="collation" type="search">సాధారణ-ప్రయోజన శోధన</type>
+			<type key="collation" type="searchjl">హాంగుల్ ప్రారంభ హల్లు ద్వారా శోధించు</type>
+			<type key="collation" type="standard">ప్రామాణిక క్రమబద్ధీకరణ క్రమం</type>
+			<type key="collation" type="stroke">స్ట్రోక్ క్రమబద్ధీకరణ క్రమం</type>
+			<type key="collation" type="traditional">సాంప్రదాయ క్రమబద్ధీకరణ క్రమం</type>
+			<type key="collation" type="unihan">రాడికల్-స్ట్రోక్ క్రమబద్ధీకరణ క్రమం</type>
+			<type key="colNormalization" type="no">సాధారణీకరణ చేయకుండా క్రమబద్ధీకరించు</type>
+			<type key="colNormalization" type="yes">సాధారణీకరించిన యూనికోడ్‌ని క్రమబద్ధీకరించు</type>
+			<type key="colNumeric" type="no">అంకెలను ఒక్కొక్కటిగా క్రమబద్ధీకరించు</type>
+			<type key="colNumeric" type="yes">అంకెలను సంఖ్యాత్మకంగా క్రమబద్ధీకరించు</type>
+			<type key="colStrength" type="identical">అన్నింటినీ క్రమబద్ధీకరించు</type>
+			<type key="colStrength" type="primary">ప్రాథమిక అక్షరాలను మాత్రమే క్రమబద్ధీకరించు</type>
+			<type key="colStrength" type="quaternary">ఉచ్ఛారణలు/కేస్‌/వెడల్పు/కానాను క్రమబద్ధీకరించు</type>
+			<type key="colStrength" type="secondary">ఉచ్ఛారణలని క్రమబద్ధీకరించు</type>
+			<type key="colStrength" type="tertiary">ఉచ్ఛారణలని/కేస్‌ని/వెడల్పుని క్రమబద్ధీకరించు</type>
+			<type key="hc" type="h11">12 గంటల పద్ధతి (0–11)</type>
+			<type key="hc" type="h12">12 గంటల పద్ధతి (1–12)</type>
+			<type key="hc" type="h23">24 గంటల పద్ధతి (0–23)</type>
+			<type key="hc" type="h24">24 గంటల పద్ధతి (1–24)</type>
+			<type key="lb" type="loose">వదులు లైన్ బ్రేక్ శైలి</type>
+			<type key="lb" type="normal">సాధారణ లైన్ బ్రేక్ శైలి</type>
+			<type key="lb" type="strict">కఠిన లైన్ బ్రేక్ శైలి</type>
+			<type key="ms" type="metric">మెట్రిక్ పద్ధతి</type>
+			<type key="ms" type="uksystem">ఇంపీరియల్ కొలమాన పద్ధతి</type>
+			<type key="ms" type="ussystem">యు.ఎస్. కొలమాన పద్ధతి</type>
+			<type key="numbers" type="arab">అరబిక్-ఇండిక్ అంకెలు</type>
+			<type key="numbers" type="arabext">పొడిగించబడిన అరబిక్-ఇండిక్ అంకెలు</type>
+			<type key="numbers" type="armn">అమెరికా సంఖ్యలు</type>
+			<type key="numbers" type="armnlow">అమెరికన్ చిన్న సంఖ్యలు</type>
+			<type key="numbers" type="beng">బెంగాలీ అంకెలు</type>
+			<type key="numbers" type="deva">దేవనాగరి అంకెలు</type>
+			<type key="numbers" type="ethi">ఎథియోపిక్ సంఖ్యలు</type>
+			<type key="numbers" type="finance">ఆర్థిక సంఖ్యలు</type>
+			<type key="numbers" type="fullwide">పూర్తి వెడల్పు అంకెలు</type>
+			<type key="numbers" type="geor">జార్జియన్ సంఖ్యలు</type>
+			<type key="numbers" type="grek">గ్రీక్ సంఖ్యలు</type>
+			<type key="numbers" type="greklow">గ్రీక్ చిన్న సంఖ్యలు</type>
+			<type key="numbers" type="gujr">గుజరాతీ అంకెలు</type>
+			<type key="numbers" type="guru">గుర్ముఖీ అంకెలు</type>
+			<type key="numbers" type="hanidec">చైనీయుల దశాంశ సంఖ్యలు</type>
+			<type key="numbers" type="hans">సరళీకృతం చెయ్యబడిన చైనీయుల సంఖ్యలు</type>
+			<type key="numbers" type="hansfin">సరళీకృతం చెయ్యబడిన చైనీయుల ఆర్థిక సంఖ్యలు</type>
+			<type key="numbers" type="hant">సాంప్రదాయ చైనీయుల సంఖ్యలు</type>
+			<type key="numbers" type="hantfin">సాంప్రదాయ చైనీయుల ఆర్థిక సంఖ్యలు</type>
+			<type key="numbers" type="hebr">హిబ్రూ సంఖ్యలు</type>
+			<type key="numbers" type="jpan">జపానీయుల సంఖ్యలు</type>
+			<type key="numbers" type="jpanfin">జపానీయలు ఆర్థిక సంఖ్యలు</type>
+			<type key="numbers" type="khmr">ఖ్మేర్ అంకెలు</type>
+			<type key="numbers" type="knda">కన్నడ అంకెలు</type>
+			<type key="numbers" type="laoo">లావో అంకెలు</type>
+			<type key="numbers" type="latn">పశ్చిమ అంకెలు</type>
+			<type key="numbers" type="mlym">మలయాళం అంకెలు</type>
+			<type key="numbers" type="mong">మంగోలియన్ అంకెలు</type>
+			<type key="numbers" type="mymr">మయన్మార్ అంకెలు</type>
+			<type key="numbers" type="native">స్థానిక అంకెలు</type>
+			<type key="numbers" type="orya">ఒరియా అంకెలు</type>
+			<type key="numbers" type="roman">రోమన్ సంఖ్యలు</type>
+			<type key="numbers" type="romanlow">రోమన్ చిన్న సంఖ్యలు</type>
+			<type key="numbers" type="taml">సాంప్రదాయ తమిళ సంఖ్యలు</type>
+			<type key="numbers" type="tamldec">తమిళ అంకెలు</type>
+			<type key="numbers" type="telu">తెలుగు అంకెలు</type>
+			<type key="numbers" type="thai">థాయ్ అంకెలు</type>
+			<type key="numbers" type="tibt">టిబిటన్ అంకెలు</type>
+			<type key="numbers" type="traditional">సాంప్రదాయ సంఖ్యలు</type>
+			<type key="numbers" type="vaii">వాయ్ అంకెలు</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN">BGN</transformName>
@@ -1163,6 +1180,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -1277,7 +1295,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d–d MMM, y</greatestDifference>
+							<greatestDifference id="d">G y MMM d–d</greatestDifference>
 							<greatestDifference id="M">d MMM – d MMM, y</greatestDifference>
 							<greatestDifference id="y">d MMM, y – d MMM, y</greatestDifference>
 						</intervalFormatItem>
@@ -1506,20 +1524,61 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">అర్థరాత్రి</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">ఉదయం</dayPeriod>
+							<dayPeriod type="afternoon1">మధ్యాహ్నం</dayPeriod>
+							<dayPeriod type="evening1">సాయంత్రం</dayPeriod>
+							<dayPeriod type="night1">రాత్రి</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">అర్థరాత్రి</dayPeriod>
 							<dayPeriod type="am">ఉ</dayPeriod>
-							<dayPeriod type="noon">మధ్యా</dayPeriod>
 							<dayPeriod type="pm">సా</dayPeriod>
+							<dayPeriod type="morning1">ఉదయం</dayPeriod>
+							<dayPeriod type="afternoon1">మధ్యాహ్నం</dayPeriod>
+							<dayPeriod type="evening1">సాయంత్రం</dayPeriod>
+							<dayPeriod type="night1">రాత్రి</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="afternoon">రాత్రి</dayPeriod>
+							<dayPeriod type="midnight">అర్థరాత్రి</dayPeriod>
 							<dayPeriod type="am">[AM]</dayPeriod>
-							<dayPeriod type="earlyMorning">ఉదయం</dayPeriod>
-							<dayPeriod type="evening">అర్ధరాత్రి</dayPeriod>
-							<dayPeriod type="morning">మధ్యాహ్నం</dayPeriod>
-							<dayPeriod type="night">తెల్లవారుఝాము</dayPeriod>
-							<dayPeriod type="noon">మధ్యాహ్నం</dayPeriod>
 							<dayPeriod type="pm">[PM]</dayPeriod>
+							<dayPeriod type="morning1">ఉదయం</dayPeriod>
+							<dayPeriod type="afternoon1">మధ్యాహ్నం</dayPeriod>
+							<dayPeriod type="evening1">సాయంత్రం</dayPeriod>
+							<dayPeriod type="night1">రాత్రి</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">అర్థరాత్రి</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">ఉదయం</dayPeriod>
+							<dayPeriod type="afternoon1">మధ్యాహ్నం</dayPeriod>
+							<dayPeriod type="evening1">సాయంత్రం</dayPeriod>
+							<dayPeriod type="night1">రాత్రి</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">అర్థరాత్రి</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">ఉదయం</dayPeriod>
+							<dayPeriod type="afternoon1">మధ్యాహ్నం</dayPeriod>
+							<dayPeriod type="evening1">సాయంత్రం</dayPeriod>
+							<dayPeriod type="night1">రాత్రి</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">అర్థరాత్రి</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">ఉదయం</dayPeriod>
+							<dayPeriod type="afternoon1">మధ్యాహ్నం</dayPeriod>
+							<dayPeriod type="evening1">సాయంత్రం</dayPeriod>
+							<dayPeriod type="night1">రాత్రి</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1536,10 +1595,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<era type="1">క్రీశ</era>
 						<era type="1" alt="variant">[CE]</era>
 					</eraAbbr>
-					<eraNarrow>
-						<era type="0">ఈసాపూర్వ.</era>
-						<era type="1">సన్.</era>
-					</eraNarrow>
 				</eras>
 				<dateFormats>
 					<dateFormatLength type="full">
@@ -1624,6 +1679,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
@@ -1880,6 +1939,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>నెల</displayName>
+				<relative type="-1">గత నెల</relative>
+				<relative type="0">ఈ నెల</relative>
+				<relative type="1">తదుపరి నెల</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} నెలలో</relativeTimePattern>
 					<relativeTimePattern count="other">{0} నెలల్లో</relativeTimePattern>
@@ -1891,6 +1953,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>నె</displayName>
+				<relative type="-1">గత నెల</relative>
+				<relative type="0">ఈ నెల</relative>
+				<relative type="1">తదుపరి నెల</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} నెల</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} నెలలు</relativeTimePattern>
@@ -1916,6 +1981,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>వారము</displayName>
+				<relative type="-1">గత వారం</relative>
+				<relative type="0">ఈ వారం</relative>
+				<relative type="1">తదుపరి వారం</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} వారంలో</relativeTimePattern>
 					<relativeTimePattern count="other">{0} వారాల్లో</relativeTimePattern>
@@ -1927,6 +1995,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>వా</displayName>
+				<relative type="-1">గత వారం</relative>
+				<relative type="0">ఈ వారం</relative>
+				<relative type="1">తదుపరి వారం</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} వా.</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} వా.</relativeTimePattern>
@@ -1954,6 +2025,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>దినం</displayName>
+				<relative type="-2">మొన్న</relative>
+				<relative type="-1">నిన్న</relative>
+				<relative type="0">ఈ రోజు</relative>
+				<relative type="1">రేపు</relative>
+				<relative type="2">ఎల్లుండి</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} రోజులో</relativeTimePattern>
 					<relativeTimePattern count="other">{0} రోజుల్లో</relativeTimePattern>
@@ -1965,6 +2041,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>ది</displayName>
+				<relative type="-2">మొన్న</relative>
+				<relative type="-1">నిన్న</relative>
+				<relative type="0">ఈ రోజు</relative>
+				<relative type="1">రేపు</relative>
+				<relative type="2">ఎల్లుండి</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} రోజు</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} రోజులు</relativeTimePattern>
@@ -3064,6 +3145,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>పోర్ట్ మోరెస్బే</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>బొగెయిన్‌విల్లే</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>మనీలా</exemplarCity>
 			</zone>
@@ -3148,6 +3232,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>ఇర్కుట్స్క్</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>చితా</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>యకుట్స్క్</exemplarCity>
 			</zone>
@@ -3166,6 +3253,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>మగడాన్</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>స్రెడ్నెకొలిమ్స్క్</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>కమ్‌చత్కా</exemplarCity>
 			</zone>
@@ -3600,9 +3690,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Australia_CentralWestern">
 				<long>
-					<generic>మధ్యమ ఆస్ట్రేలియా పశ్చిమ సమయం</generic>
+					<generic>మధ్యమ ఆస్ట్రేలియన్ పశ్చిమ సమయం</generic>
 					<standard>మధ్యమ ఆస్ట్రేలియా పశ్చిమ ప్రామాణిక సమయం</standard>
-					<daylight>మధ్యమ ఆస్ట్రేలియా పశ్చిమ పగటి సమయం</daylight>
+					<daylight>మధ్యమ ఆస్ట్రేలియన్ పశ్చిమ పగటి సమయం</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Eastern">
@@ -3615,8 +3705,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="Australia_Western">
 				<long>
 					<generic>పశ్చిమ ఆస్ట్రేలియా సమయం</generic>
-					<standard>పశ్చిమ ఆస్ట్రేలియా ప్రామాణిక సమయం</standard>
-					<daylight>పశ్చిమ ఆస్ట్రేలియా పగటి సమయం</daylight>
+					<standard>పశ్చిమ ఆస్ట్రేలియన్ ప్రామాణిక సమయం</standard>
+					<daylight>పశ్చిమ ఆస్ట్రేలియన్ పగటి సమయం</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azerbaijan">
@@ -3671,7 +3761,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Chamorro">
 				<long>
-					<standard>చామర్రో సమయం</standard>
+					<standard>చామర్రో ప్రామాణిక సమయం</standard>
 				</long>
 			</metazone>
 			<metazone type="Chatham">
@@ -4508,6 +4598,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##,##0.00;(¤#,##,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">¤0వే</pattern>
+					<pattern type="1000" count="other">¤0వే</pattern>
+					<pattern type="10000" count="one">¤00వే</pattern>
+					<pattern type="10000" count="other">¤00వే</pattern>
+					<pattern type="100000" count="one">¤000వే</pattern>
+					<pattern type="100000" count="other">¤000వే</pattern>
+					<pattern type="1000000" count="one">¤0మి</pattern>
+					<pattern type="1000000" count="other">¤0మి</pattern>
+					<pattern type="10000000" count="one">¤00మి</pattern>
+					<pattern type="10000000" count="other">¤00మి</pattern>
+					<pattern type="100000000" count="one">¤000మి</pattern>
+					<pattern type="100000000" count="other">¤000మి</pattern>
+					<pattern type="1000000000" count="one">¤0బి</pattern>
+					<pattern type="1000000000" count="other">¤0బి</pattern>
+					<pattern type="10000000000" count="one">¤00బి</pattern>
+					<pattern type="10000000000" count="other">¤00బి</pattern>
+					<pattern type="100000000000" count="one">¤000బి</pattern>
+					<pattern type="100000000000" count="other">¤000బి</pattern>
+					<pattern type="1000000000000" count="one">¤0ట్రి</pattern>
+					<pattern type="1000000000000" count="other">¤0ట్రి</pattern>
+					<pattern type="10000000000000" count="one">¤00ట్రి</pattern>
+					<pattern type="10000000000000" count="other">¤00ట్రి</pattern>
+					<pattern type="100000000000000" count="one">¤000ట్రి</pattern>
+					<pattern type="100000000000000" count="other">¤000ట్రి</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4547,6 +4665,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">అంగోలాన్ క్వాన్‌జా</displayName>
 				<displayName count="other">అంగోలాన్ క్వాన్‌జా‌లు</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="ARS">
 				<displayName>అర్జెంటీనా పెసో</displayName>
@@ -4579,6 +4698,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">బోస్నియా-హెర్జగోవినా మార్పిడి చెయ్యగలిగే మార్క్</displayName>
 				<displayName count="other">బోస్నియా-హెర్జగోవినా మార్పిడి చెయ్యగలిగే మార్క్‌లు</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>బర్బాడియన్ డాలర్</displayName>
@@ -4631,6 +4751,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">బొలీవియన్ బొలీవియానో</displayName>
 				<displayName count="other">బొలీవియన్ బొలీవియానోలు</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BRL">
 				<displayName>బ్రెజిలియన్ రియల్</displayName>
@@ -4657,6 +4778,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">బోట్స్‌వానా పులా</displayName>
 				<displayName count="other">బోట్స్‌వానా పులాలు</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYR">
 				<displayName>బెలరూసియన్ రూబల్</displayName>
@@ -4724,6 +4846,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">క్యూబన్ కన్వర్టబుల్ పెసో</displayName>
 				<displayName count="other">క్యూబన్ కన్వర్టబుల్ పెసోలు</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>క్యూబన్ పెసో</displayName>
@@ -4743,6 +4866,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">చెక్ రిపబ్లిక్ కోరునా</displayName>
 				<displayName count="other">చెక్ రిపబ్లిక్ కోరునాలు</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DJF">
 				<displayName>జిబోటియన్ ఫ్రాంక్</displayName>
@@ -4755,6 +4879,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">డానిష్ క్రోన్</displayName>
 				<displayName count="other">డానిష్ క్రోనర్</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>డోమినికన్ పెసో</displayName>
@@ -4774,6 +4899,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ఈజిప్షియన్ పౌండ్</displayName>
 				<displayName count="other">ఈజిప్షియన్ పౌండ్‌లు</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>ఎరిట్రీన్ నక్ఫా</displayName>
@@ -4806,11 +4932,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ఫాక్‌ల్యాండ్ దీవులు పౌండ్</displayName>
 				<displayName count="other">ఫాక్‌ల్యాండ్ దీవులు పౌండ్‌లు</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GBP">
-				<displayName>బ్రిటిష్ పౌండ్ స్టెర్లింగ్</displayName>
-				<displayName count="one">బ్రిటిష్ పౌండ్ స్టెర్లింగ్</displayName>
-				<displayName count="other">బ్రిటిష్ పౌండ్‌ల స్టెర్లింగ్</displayName>
+				<displayName>బ్రిటిష్ పౌండ్</displayName>
+				<displayName count="one">బ్రిటిష్ పౌండ్</displayName>
+				<displayName count="other">బ్రిటిష్ పౌండ్‌లు</displayName>
 				<symbol>£</symbol>
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
@@ -4819,6 +4946,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">జార్జియన్ లారి</displayName>
 				<displayName count="other">జార్జియన్ లారీలు</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHS">
 				<displayName>గానెయన్ సెడి</displayName>
@@ -4844,12 +4972,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">గ్వినియన్ ఫ్రాంక్</displayName>
 				<displayName count="other">గ్వినియన్ ఫ్రాంక్‌లు</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GTQ">
 				<displayName>గ్యుటెమాలన్ క్వెట్‌జల్</displayName>
 				<displayName count="one">గ్యుటెమాలన్ క్వెట్‌జల్</displayName>
 				<displayName count="other">గ్యుటెమాలన్ క్వెట్‌జల్‌లు</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GYD">
 				<displayName>గుయనియాస్ డాలర్</displayName>
@@ -4870,12 +5000,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">హోండురన్ లెమిపిరా</displayName>
 				<displayName count="other">హోండురన్ లెమిపిరాలు</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRK">
 				<displayName>క్రొయేషియన్ క్యూన</displayName>
 				<displayName count="one">క్రొయేషియన్ క్యూన</displayName>
 				<displayName count="other">క్రొయేషియన్ క్యూనాలు</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>హైటియన్ గ్వోర్డే</displayName>
@@ -4888,12 +5020,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">హంగేరియన్ ఫోరిన్ట్</displayName>
 				<displayName count="other">హంగేరియన్ ఫోరిన్ట్‌లు</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>ఇండోనేషియా రూపాయి</displayName>
 				<displayName count="one">ఇండోనేషియా రూపాయి</displayName>
 				<displayName count="other">ఇండోనేషియా రూపాయలు</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="ILS">
 				<displayName>ఐరాయిలి న్యూ షెక్యెల్</displayName>
@@ -4926,6 +5060,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ఐస్లాండిక్ క్రోనా</displayName>
 				<displayName count="other">ఐస్లాండిక్ క్రోనర్</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="provisional">kr</symbol>
 			</currency>
 			<currency type="JMD">
 				<displayName>జమైకన్ డాలర్</displayName>
@@ -4971,12 +5106,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">కొమోరియన్ ఫ్రాంక్</displayName>
 				<displayName count="other">కొమోరియన్ ఫ్రాంక్‌లు</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>ఉత్తర కొరియా వోన్</displayName>
 				<displayName count="one">ఉత్తర కొరియా వోన్</displayName>
 				<displayName count="other">ఉత్తర కొరియా వోన్</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>దక్షిణ కొరియా వోన్</displayName>
@@ -5017,12 +5154,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">లెబనీస్ పౌండ్</displayName>
 				<displayName count="other">లెబనీస్ పౌండ్‌లు</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>శ్రీలంక రూపాయి</displayName>
 				<displayName count="one">శ్రీలంక రూపాయి</displayName>
 				<displayName count="other">శ్రీలంక రూపాయలు</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>లిబేరియన్ డాలర్</displayName>
@@ -5069,6 +5208,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">మలగసీ అరియరీ</displayName>
 				<displayName count="other">మలగసీ అరియరీలు</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MKD">
 				<displayName>మెసిడోనియన్ దినార్</displayName>
@@ -5081,6 +5221,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">మయన్మార్ క్యాట్</displayName>
 				<displayName count="other">మయన్మార్ క్యాట్‌లు</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>మంగోలియన్ టుగ్రిక్</displayName>
@@ -5106,6 +5247,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">మారిషన్ రూపాయి</displayName>
 				<displayName count="other">మారిషన్ రూపాయలు</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVP">
 				<displayName draft="unconfirmed">మాల్దీవుల రూపాయి</displayName>
@@ -5136,6 +5278,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">మలేషియా రింగ్గిట్</displayName>
 				<displayName count="other">మలేషియా రింగ్గిట్‌లు</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZN">
 				<displayName>మొజాంబికన్ మెటికల్</displayName>
@@ -5162,18 +5305,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">నికరగ్యుయన్ కొర్‌డుబు</displayName>
 				<displayName count="other">నికరగ్యుయన్ కొర్‌డుబులు</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NOK">
 				<displayName>నార్వేజీయన్ క్రోన్</displayName>
 				<displayName count="one">నార్వేజీయన్ క్రోన్</displayName>
 				<displayName count="other">నార్వేజీయన్ క్రోనర్</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>నేపాలీయుల రూపాయి</displayName>
 				<displayName count="one">నేపాలీయుల రూపాయి</displayName>
 				<displayName count="other">నేపాలీయుల రూపాయలు</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>న్యూజిలాండ్ డాలర్</displayName>
@@ -5218,12 +5364,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">పాకిస్థాన్ రూపాయి</displayName>
 				<displayName count="other">పాకిస్థాన్ రూపాయలు</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>పోలిష్ జ్లోటీ</displayName>
 				<displayName count="one">పోలిష్ జ్లోటీ</displayName>
 				<displayName count="other">పోలిష్ జ్లోటీలు</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PYG">
 				<displayName>పరగ్వాయన్ గ్వారని</displayName>
@@ -5255,12 +5403,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">రష్యన్ రూబల్</displayName>
 				<displayName count="other">రష్యన్ రూబల్‌లు</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RWF">
 				<displayName>ర్వానడాన్ ఫ్రాంక్</displayName>
 				<displayName count="one">ర్వానడాన్ ఫ్రాంక్</displayName>
 				<displayName count="other">ర్వానడాన్ ఫ్రాంక్‌లు</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>సౌది రియల్</displayName>
@@ -5292,6 +5442,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">స్వీడిష్ క్రోనా</displayName>
 				<displayName count="other">స్వీడిష్ క్రోనర్</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>సింగపూర్ డాలర్</displayName>
@@ -5305,6 +5456,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">సెయింట్ హెలెనా పౌండ్</displayName>
 				<displayName count="other">సెయింట్ హెలెనా పౌండ్‌లు</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SLL">
 				<displayName>సీయిరు లియోనియన్ లీయోన్</displayName>
@@ -5337,12 +5489,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">సావో టోమ్ మరియు ప్రిన్సిపి డోబ్రా</displayName>
 				<displayName count="other">సావో టోమ్ మరియు ప్రిన్సిపి డోబ్రాలు</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SYP">
 				<displayName>సిరీయన్ పౌండ్</displayName>
 				<displayName count="one">సిరీయన్ పౌండ్</displayName>
 				<displayName count="other">సిరీయన్ పౌండ్‌లు</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>స్వాజి లిలాన్గేని</displayName>
@@ -5355,6 +5509,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">థాయ్ బాట్</displayName>
 				<displayName count="other">థాయ్ బాట్</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJS">
 				<displayName>తజికిస్థాన్ సమోని</displayName>
@@ -5379,6 +5534,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">టోంగాన్ పాంʻగా</displayName>
 				<displayName count="other">టోంగాన్ పాంʻగా</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TRY">
 				<displayName>తుర్కిష్ లిరా</displayName>
@@ -5386,6 +5542,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">తుర్కిష్ లిరా</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>ట్రినిడాడ్ మరియు టొబాగో డాలర్</displayName>
@@ -5445,6 +5602,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">వెనుజులా బోలివర్</displayName>
 				<displayName count="other">వెనుజులా బోలివర్‌లు</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>వియత్నామీయుల డాంగ్</displayName>
@@ -5482,6 +5640,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">తూర్పు కరీబియన్ డాలర్</displayName>
 				<displayName count="other">తూర్పు కరీబియన్ డాలర్‌లు</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XOF">
 				<displayName>సిఎఫ్‌ఎ ఫ్రాంక్ బిసిఈఏఓ</displayName>
@@ -5514,6 +5673,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">దక్షిణ ఆఫ్రికా ర్యాండ్</displayName>
 				<displayName count="other">దక్షిణ ఆఫ్రికా ర్యాండ్</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>జాంబియన్ క్వాచా (1968–2012)</displayName>
@@ -5523,6 +5683,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">జాంబియన్ క్వాచా</displayName>
 				<displayName count="other">జాంబియన్ క్వాచాలు</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
@@ -5545,6 +5706,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} మీటరు/స్క్వేర్ సెకను</unitPattern>
 				<unitPattern count="other">{0} మీటర్లు/స్క్వేర్ సెకన్లు</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>విప్లవం</displayName>
+				<unitPattern count="one">{0} విప్లవం</unitPattern>
+				<unitPattern count="other">{0} విప్లవంలు</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>రేడియన్లు</displayName>
+				<unitPattern count="one">{0} రేడియన్</unitPattern>
+				<unitPattern count="other">{0} రేడియన్లు</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>డిగ్రీలు</displayName>
+				<unitPattern count="one">{0} డిగ్రీ</unitPattern>
+				<unitPattern count="other">{0} డిగ్రీలు</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>ఆర్క్ నిమిషాలు</displayName>
 				<unitPattern count="one">{0} ఆర్క్ నిమిషం</unitPattern>
@@ -5555,30 +5731,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ఆర్క్ సెకను</unitPattern>
 				<unitPattern count="other">{0} ఆర్క్ సెకన్లు</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>డిగ్రీలు</displayName>
-				<unitPattern count="one">{0} డిగ్రీ</unitPattern>
-				<unitPattern count="other">{0} డిగ్రీలు</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>రేడియన్లు</displayName>
-				<unitPattern count="one">{0} రేడియన్</unitPattern>
-				<unitPattern count="other">{0} రేడియన్లు</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ఎకరాలు</displayName>
-				<unitPattern count="one">{0} ఎకరం</unitPattern>
-				<unitPattern count="other">{0} ఎకరాలు</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>చదరపు కిలోమీటర్లు</displayName>
+				<unitPattern count="one">{0} చదరపు కిలోమీటరు</unitPattern>
+				<unitPattern count="other">{0} చదరపు కిలోమీటర్లు</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>హెక్టార్లు</displayName>
 				<unitPattern count="one">{0} హెక్టారు</unitPattern>
 				<unitPattern count="other">{0} హెక్టార్లు</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>చదరపు మీటర్లు</displayName>
+				<unitPattern count="one">{0} చదరపు మీటరు</unitPattern>
+				<unitPattern count="other">{0} చదరపు మీటర్లు</unitPattern>
+				<perUnitPattern>{0}/చదరపు మీటర్లు</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>చదరపు సెంటీమీటర్లు</displayName>
 				<unitPattern count="one">{0} చదరపు సెంటీమీటరు</unitPattern>
 				<unitPattern count="other">{0} చదరపు సెంటీమీటర్లు</unitPattern>
+				<perUnitPattern>{0}/చదరపు సెంటీమీటర్లు</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>చదరపు మైళ్లు</displayName>
+				<unitPattern count="one">{0} చదరపు మైలు</unitPattern>
+				<unitPattern count="other">{0} చదరపు మైళ్లు</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ఎకరాలు</displayName>
+				<unitPattern count="one">{0} ఎకరం</unitPattern>
+				<unitPattern count="other">{0} ఎకరాలు</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>చదరపు గజాలు</displayName>
+				<unitPattern count="one">{0} చదరపు గజం</unitPattern>
+				<unitPattern count="other">{0} చదరపు గజాలు</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>చదరపు అడుగులు</displayName>
@@ -5589,91 +5777,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>చదరపు అంగుళాలు</displayName>
 				<unitPattern count="one">{0} చదరపు అంగుళం</unitPattern>
 				<unitPattern count="other">{0} చదరపు అంగుళాలు</unitPattern>
+				<perUnitPattern>{0}/చదరపు అంగుళాలు</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>చదరపు కిలోమీటర్లు</displayName>
-				<unitPattern count="one">{0} చదరపు కిలోమీటరు</unitPattern>
-				<unitPattern count="other">{0} చదరపు కిలోమీటర్లు</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>చదరపు మీటర్లు</displayName>
-				<unitPattern count="one">{0} చదరపు మీటరు</unitPattern>
-				<unitPattern count="other">{0} చదరపు మీటర్లు</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>చదరపు మైళ్లు</displayName>
-				<unitPattern count="one">{0} చదరపు మైలు</unitPattern>
-				<unitPattern count="other">{0} చదరపు మైళ్లు</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>చదరపు గజాలు</displayName>
-				<unitPattern count="one">{0} చదరపు గజం</unitPattern>
-				<unitPattern count="other">{0} చదరపు గజాలు</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>కేరట్లు</displayName>
+				<unitPattern count="one">{0} కేరట్</unitPattern>
+				<unitPattern count="other">{0} కేరట్లు</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>లీటర్లు/కిలోమీటరు</displayName>
 				<unitPattern count="one">{0} లీటరు/కిలోమీటరు</unitPattern>
 				<unitPattern count="other">{0} లీటర్లు/కిలోమీటరు</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>లీటర్లు/100 కిలోమీటర్లకు</displayName>
+				<unitPattern count="one">{0} లీటరు/100 కిలోమీటర్లకు</unitPattern>
+				<unitPattern count="other">{0} లీటర్లు/100 కిలోమీటర్లకు</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>మైళ్లు/గ్యాలన్</displayName>
 				<unitPattern count="one">{0} మైలు/గ్యాలన్</unitPattern>
 				<unitPattern count="other">{0} మైళ్లు/గ్యాలన్</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>బిట్లు</displayName>
-				<unitPattern count="one">{0} బిట్</unitPattern>
-				<unitPattern count="other">{0} బిట్లు</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>బైట్లు</displayName>
-				<unitPattern count="one">{0} బైట్</unitPattern>
-				<unitPattern count="other">{0} బైట్‌లు</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>గిగాబిట్లు</displayName>
-				<unitPattern count="one">{0} గిగాబిట్</unitPattern>
-				<unitPattern count="other">{0} గిగాబిట్లు</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>గిగాబైట్లు</displayName>
-				<unitPattern count="one">{0} గిగాబైట్</unitPattern>
-				<unitPattern count="other">{0} గిగాబైట్లు</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>కిలోబిట్లు</displayName>
-				<unitPattern count="one">{0} కిలోబిట్</unitPattern>
-				<unitPattern count="other">{0} కిలోబిట్లు</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>కిలోబైట్లు</displayName>
-				<unitPattern count="one">{0} కిలోబైట్</unitPattern>
-				<unitPattern count="other">{0} కిలోబైట్లు</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>మెగాబిట్లు</displayName>
-				<unitPattern count="one">{0} మెగాబిట్</unitPattern>
-				<unitPattern count="other">{0} మెగాబిట్లు</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>మెగాబైట్లు</displayName>
-				<unitPattern count="one">{0} మెగాబైట్</unitPattern>
-				<unitPattern count="other">{0} మెగాబైట్లు</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>టెరాబిట్లు</displayName>
-				<unitPattern count="one">{0} టెరాబిట్</unitPattern>
-				<unitPattern count="other">{0} టెరాబిట్లు</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>టెరాబైట్లు</displayName>
 				<unitPattern count="one">{0} టెరాబైట్</unitPattern>
 				<unitPattern count="other">{0} టెరాబైట్లు</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>టెరాబిట్లు</displayName>
+				<unitPattern count="one">{0} టెరాబిట్</unitPattern>
+				<unitPattern count="other">{0} టెరాబిట్లు</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>గిగాబైట్లు</displayName>
+				<unitPattern count="one">{0} గిగాబైట్</unitPattern>
+				<unitPattern count="other">{0} గిగాబైట్లు</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>గిగాబిట్లు</displayName>
+				<unitPattern count="one">{0} గిగాబిట్</unitPattern>
+				<unitPattern count="other">{0} గిగాబిట్లు</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>మెగాబైట్లు</displayName>
+				<unitPattern count="one">{0} మెగాబైట్</unitPattern>
+				<unitPattern count="other">{0} మెగాబైట్లు</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>మెగాబిట్లు</displayName>
+				<unitPattern count="one">{0} మెగాబిట్</unitPattern>
+				<unitPattern count="other">{0} మెగాబిట్లు</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>కిలోబైట్లు</displayName>
+				<unitPattern count="one">{0} కిలోబైట్</unitPattern>
+				<unitPattern count="other">{0} కిలోబైట్లు</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>కిలోబిట్లు</displayName>
+				<unitPattern count="one">{0} కిలోబిట్</unitPattern>
+				<unitPattern count="other">{0} కిలోబిట్లు</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>బైట్లు</displayName>
+				<unitPattern count="one">{0} బైట్</unitPattern>
+				<unitPattern count="other">{0} బైట్‌లు</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>బిట్లు</displayName>
+				<unitPattern count="one">{0} బిట్</unitPattern>
+				<unitPattern count="other">{0} బిట్లు</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>శతాబ్దాలు</displayName>
+				<unitPattern count="one">{0} శతాబ్దం</unitPattern>
+				<unitPattern count="other">{0} శతాబ్దాలు</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>సంవత్సరాలు</displayName>
+				<unitPattern count="one">{0} సంవత్సరం</unitPattern>
+				<unitPattern count="other">{0} సంవత్సరాలు</unitPattern>
+				<perUnitPattern>సంవత్సరానికి {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>నెలలు</displayName>
+				<unitPattern count="one">{0} నెల</unitPattern>
+				<unitPattern count="other">{0} నెలలు</unitPattern>
+				<perUnitPattern>నెలకు {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>వారాలు</displayName>
+				<unitPattern count="one">{0} వారం</unitPattern>
+				<unitPattern count="other">{0} వారాలు</unitPattern>
+				<perUnitPattern>వారానికి {0}</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>రోజులు</displayName>
 				<unitPattern count="one">{0} రోజు</unitPattern>
 				<unitPattern count="other">{0} రోజులు</unitPattern>
+				<perUnitPattern>రోజుకు {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>గంటలు</displayName>
@@ -5681,30 +5884,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} గంటలు</unitPattern>
 				<perUnitPattern>{0}/గంట</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>మైక్రోసెకన్లు</displayName>
-				<unitPattern count="one">{0} మైక్రోసెకను</unitPattern>
-				<unitPattern count="other">{0} మైక్రోసెకన్లు</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>మిల్లీసెకన్లు</displayName>
-				<unitPattern count="one">{0} మిల్లీసెకను</unitPattern>
-				<unitPattern count="other">{0} మిల్లీసెకన్లు</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>నిమిషాలు</displayName>
 				<unitPattern count="one">{0} నిమిషం</unitPattern>
 				<unitPattern count="other">{0} నిమిషాలు</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>నెలలు</displayName>
-				<unitPattern count="one">{0} నెల</unitPattern>
-				<unitPattern count="other">{0} నెలలు</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>నానోసెకన్లు</displayName>
-				<unitPattern count="one">{0} నానోసెకను</unitPattern>
-				<unitPattern count="other">{0} నానోసెకన్లు</unitPattern>
+				<perUnitPattern>నిమిషానికి {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>సెకన్లు</displayName>
@@ -5712,15 +5896,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} సెకన్లు</unitPattern>
 				<perUnitPattern>{0}/సెకను</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>వారాలు</displayName>
-				<unitPattern count="one">{0} వారం</unitPattern>
-				<unitPattern count="other">{0} వారాలు</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>మిల్లీసెకన్లు</displayName>
+				<unitPattern count="one">{0} మిల్లీసెకను</unitPattern>
+				<unitPattern count="other">{0} మిల్లీసెకన్లు</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>సంవత్సరాలు</displayName>
-				<unitPattern count="one">{0} సంవత్సరం</unitPattern>
-				<unitPattern count="other">{0} సంవత్సరాలు</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>మైక్రోసెకన్లు</displayName>
+				<unitPattern count="one">{0} మైక్రోసెకను</unitPattern>
+				<unitPattern count="other">{0} మైక్రోసెకన్లు</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>నానోసెకన్లు</displayName>
+				<unitPattern count="one">{0} నానోసెకను</unitPattern>
+				<unitPattern count="other">{0} నానోసెకన్లు</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ఆంపియర్స్</displayName>
@@ -5742,6 +5931,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} వోల్ట్</unitPattern>
 				<unitPattern count="other">{0} వోల్ట్స్</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>కిలోకేలరీలు</displayName>
+				<unitPattern count="one">{0} కిలోకేలరీ</unitPattern>
+				<unitPattern count="other">{0} కిలోకేలరీలు</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>కేలరీలు</displayName>
 				<unitPattern count="one">{0} కేలరీ</unitPattern>
@@ -5752,21 +5946,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} కేలరీ</unitPattern>
 				<unitPattern count="other">{0} కేలరీలు</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>జౌల్స్</displayName>
-				<unitPattern count="one">{0} జౌల్</unitPattern>
-				<unitPattern count="other">{0} జౌల్స్</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>కిలోకేలరీలు</displayName>
-				<unitPattern count="one">{0} కిలోకేలరీ</unitPattern>
-				<unitPattern count="other">{0} కిలోకేలరీలు</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>కిలోజౌల్స్</displayName>
 				<unitPattern count="one">{0} కిలోజౌల్</unitPattern>
 				<unitPattern count="other">{0} కిలోజౌల్స్</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>జౌల్స్</displayName>
+				<unitPattern count="one">{0} జౌల్</unitPattern>
+				<unitPattern count="other">{0} జౌల్స్</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>కిలోవాట్-గంటలు</displayName>
 				<unitPattern count="one">{0} కిలోవాట్ గంట</unitPattern>
@@ -5777,206 +5966,210 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} గిగాహెర్ట్‌జ్</unitPattern>
 				<unitPattern count="other">{0} గిగాహెర్ట్‌జ్</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>హెర్ట్‌జ్</displayName>
-				<unitPattern count="one">{0} హెర్ట్‌జ్</unitPattern>
-				<unitPattern count="other">{0} హెర్ట్‌జ్</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>మెగాహెర్ట్‌జ్</displayName>
+				<unitPattern count="one">{0} మెగాహెర్ట్‌జ్</unitPattern>
+				<unitPattern count="other">{0} మెగాహెర్ట్‌జ్</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>కిలోహెర్ట్‌జ్</displayName>
 				<unitPattern count="one">{0} కిలోహెర్ట్‌జ్</unitPattern>
 				<unitPattern count="other">{0} కిలోహెర్ట్‌జ్</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>మెగాహెర్ట్‌జ్</displayName>
-				<unitPattern count="one">{0} మెగాహెర్ట్‌జ్</unitPattern>
-				<unitPattern count="other">{0} మెగాహెర్ట్‌జ్</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>హెర్ట్‌జ్</displayName>
+				<unitPattern count="one">{0} హెర్ట్‌జ్</unitPattern>
+				<unitPattern count="other">{0} హెర్ట్‌జ్</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>ఖగోళ ప్రమాణాలు</displayName>
-				<unitPattern count="one">{0} ఖగోళ ప్రమాణం</unitPattern>
-				<unitPattern count="other">{0} ఖగోళ ప్రమాణాలు</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>కిలోమీటర్లు</displayName>
+				<unitPattern count="one">{0} కిలోమీటరు</unitPattern>
+				<unitPattern count="other">{0} కిలోమీటర్లు</unitPattern>
+				<perUnitPattern>కిలోమీటరుకు {0}</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>సెంటీమీటర్లు</displayName>
-				<unitPattern count="one">{0} సెంటీమీటరు</unitPattern>
-				<unitPattern count="other">{0} సెంటీమీటర్లు</unitPattern>
+			<unit type="length-meter">
+				<displayName>మీటర్లు</displayName>
+				<unitPattern count="one">{0} మీటరు</unitPattern>
+				<unitPattern count="other">{0} మీటర్లు</unitPattern>
+				<perUnitPattern>మీటరుకు {0}</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>డెసిమీటర్లు</displayName>
 				<unitPattern count="one">{0} డెసిమీటరు</unitPattern>
 				<unitPattern count="other">{0} డెసిమీటర్లు</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>అడుగులు</displayName>
-				<unitPattern count="one">{0} అడుగు</unitPattern>
-				<unitPattern count="other">{0} అడుగులు</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName draft="unconfirmed">ఫర్లాంగులు</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ఫర్లాంగు</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ఫర్లాంగులు</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>అంగుళాలు</displayName>
-				<unitPattern count="one">{0} అంగుళం</unitPattern>
-				<unitPattern count="other">{0} అంగుళాలు</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>కిలోమీటర్లు</displayName>
-				<unitPattern count="one">{0} కిలోమీటరు</unitPattern>
-				<unitPattern count="other">{0} కిలోమీటర్లు</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>కాంతి సంవత్సరాలు</displayName>
-				<unitPattern count="one">{0} కాంతి సంవత్సరం</unitPattern>
-				<unitPattern count="other">{0} కాంతి సంవత్సరాలు</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>మీటర్లు</displayName>
-				<unitPattern count="one">{0} మీటరు</unitPattern>
-				<unitPattern count="other">{0} మీటర్లు</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>మైక్రోమీటర్లు</displayName>
-				<unitPattern count="one">{0} మైక్రోమీటరు</unitPattern>
-				<unitPattern count="other">{0} మైక్రోమీటర్లు</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>మైళ్లు</displayName>
-				<unitPattern count="one">{0} మైలు</unitPattern>
-				<unitPattern count="other">{0} మైళ్లు</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>సెంటీమీటర్లు</displayName>
+				<unitPattern count="one">{0} సెంటీమీటరు</unitPattern>
+				<unitPattern count="other">{0} సెంటీమీటర్లు</unitPattern>
+				<perUnitPattern>సెంటీమీటరుకు {0}</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>మిల్లీమీటర్లు</displayName>
 				<unitPattern count="one">{0} మిల్లీమీటరు</unitPattern>
 				<unitPattern count="other">{0} మిల్లీమీటర్లు</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>మైక్రోమీటర్లు</displayName>
+				<unitPattern count="one">{0} మైక్రోమీటరు</unitPattern>
+				<unitPattern count="other">{0} మైక్రోమీటర్లు</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>నానోమీటర్లు</displayName>
 				<unitPattern count="one">{0} నానోమీటరు</unitPattern>
 				<unitPattern count="other">{0} నానోమీటర్లు</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>నాటికల్ మైళ్లు</displayName>
-				<unitPattern count="one">{0} నాటికల్ మైలు</unitPattern>
-				<unitPattern count="other">{0} నాటికల్ మైళ్లు</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>పార్సెక్‌లు</displayName>
-				<unitPattern count="one">{0} పార్సెక్</unitPattern>
-				<unitPattern count="other">{0} పార్సెక్‌లు</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>పికోమీటర్లు</displayName>
 				<unitPattern count="one">{0} పికోమీటరు</unitPattern>
 				<unitPattern count="other">{0} పికోమీటర్లు</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>మైళ్లు</displayName>
+				<unitPattern count="one">{0} మైలు</unitPattern>
+				<unitPattern count="other">{0} మైళ్లు</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>గజాలు</displayName>
 				<unitPattern count="one">{0} గజం</unitPattern>
 				<unitPattern count="other">{0} గజాలు</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>అడుగులు</displayName>
+				<unitPattern count="one">{0} అడుగు</unitPattern>
+				<unitPattern count="other">{0} అడుగులు</unitPattern>
+				<perUnitPattern>అడుగుకి {0}</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>అంగుళాలు</displayName>
+				<unitPattern count="one">{0} అంగుళం</unitPattern>
+				<unitPattern count="other">{0} అంగుళాలు</unitPattern>
+				<perUnitPattern>అంగుళానికి {0}</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>పార్సెక్‌లు</displayName>
+				<unitPattern count="one">{0} పార్సెక్</unitPattern>
+				<unitPattern count="other">{0} పార్సెక్‌లు</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>కాంతి సంవత్సరాలు</displayName>
+				<unitPattern count="one">{0} కాంతి సంవత్సరం</unitPattern>
+				<unitPattern count="other">{0} కాంతి సంవత్సరాలు</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ఖగోళ ప్రమాణాలు</displayName>
+				<unitPattern count="one">{0} ఖగోళ ప్రమాణం</unitPattern>
+				<unitPattern count="other">{0} ఖగోళ ప్రమాణాలు</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName draft="unconfirmed">ఫర్లాంగులు</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} ఫర్లాంగు</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} ఫర్లాంగులు</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>నాటికల్ మైళ్లు</displayName>
+				<unitPattern count="one">{0} నాటికల్ మైలు</unitPattern>
+				<unitPattern count="other">{0} నాటికల్ మైళ్లు</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>స్కాండినేవియన్ మైలు</displayName>
+				<unitPattern count="one">{0} స్కాండినేవియన్ మైలు</unitPattern>
+				<unitPattern count="other">{0} స్కాండినేవియన్ మైళ్లు</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>లక్స్</displayName>
 				<unitPattern count="one">{0} లక్స్</unitPattern>
 				<unitPattern count="other">{0} లక్స్</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>క్యారెట్లు</displayName>
-				<unitPattern count="one">{0} క్యారెట్</unitPattern>
-				<unitPattern count="other">{0} క్యారెట్లు</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>గ్రాములు</displayName>
-				<unitPattern count="one">{0} గ్రాము</unitPattern>
-				<unitPattern count="other">{0} గ్రాములు</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>కిలోగ్రాములు</displayName>
-				<unitPattern count="one">{0} కిలోగ్రాము</unitPattern>
-				<unitPattern count="other">{0} కిలోగ్రాములు</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>మెట్రిక్ టన్నులు</displayName>
 				<unitPattern count="one">{0} మెట్రిక్ టన్ను</unitPattern>
 				<unitPattern count="other">{0} మెట్రిక్ టన్నులు</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>మైక్రోగ్రాములు</displayName>
-				<unitPattern count="one">{0} మైక్రోగ్రాము</unitPattern>
-				<unitPattern count="other">{0} మైక్రోగ్రాములు</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>కిలోగ్రాములు</displayName>
+				<unitPattern count="one">{0} కిలోగ్రాము</unitPattern>
+				<unitPattern count="other">{0} కిలోగ్రాములు</unitPattern>
+				<perUnitPattern>కిలోగ్రాముకు {0}</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>గ్రాములు</displayName>
+				<unitPattern count="one">{0} గ్రాము</unitPattern>
+				<unitPattern count="other">{0} గ్రాములు</unitPattern>
+				<perUnitPattern>గ్రాముకు {0}</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>మిల్లీగ్రాములు</displayName>
 				<unitPattern count="one">{0} మిల్లీగ్రాము</unitPattern>
 				<unitPattern count="other">{0} మిల్లీగ్రాములు</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ఔన్సులు</displayName>
-				<unitPattern count="one">{0} ఔన్సు</unitPattern>
-				<unitPattern count="other">{0} ఔన్సులు</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ట్రాయ్ ఔన్సులు</displayName>
-				<unitPattern count="one">{0} ట్రాయ్ ఔన్సు</unitPattern>
-				<unitPattern count="other">{0} ట్రాయ్ ఔన్సులు</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>పౌండ్లు</displayName>
-				<unitPattern count="one">{0} పౌండు</unitPattern>
-				<unitPattern count="other">{0} పౌండ్లు</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>మైక్రోగ్రాములు</displayName>
+				<unitPattern count="one">{0} మైక్రోగ్రాము</unitPattern>
+				<unitPattern count="other">{0} మైక్రోగ్రాములు</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>టన్నులు</displayName>
 				<unitPattern count="one">{0} టన్ను</unitPattern>
 				<unitPattern count="other">{0} టన్నులు</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>పౌండ్లు</displayName>
+				<unitPattern count="one">{0} పౌండు</unitPattern>
+				<unitPattern count="other">{0} పౌండ్లు</unitPattern>
+				<perUnitPattern>పౌండుకు {0}</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ఔన్సులు</displayName>
+				<unitPattern count="one">{0} ఔన్సు</unitPattern>
+				<unitPattern count="other">{0} ఔన్సులు</unitPattern>
+				<perUnitPattern>ఔన్సుకు {0}</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ట్రాయ్ ఔన్సులు</displayName>
+				<unitPattern count="one">{0} ట్రాయ్ ఔన్సు</unitPattern>
+				<unitPattern count="other">{0} ట్రాయ్ ఔన్సులు</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>క్యారెట్లు</displayName>
+				<unitPattern count="one">{0} క్యారెట్</unitPattern>
+				<unitPattern count="other">{0} క్యారెట్లు</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>గిగావాట్లు</displayName>
 				<unitPattern count="one">{0} గిగావాట్</unitPattern>
 				<unitPattern count="other">{0} గిగావాట్లు</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>హార్స్‌పవర్</displayName>
-				<unitPattern count="one">{0} హార్స్‌పవర్</unitPattern>
-				<unitPattern count="other">{0} హార్స్‌పవర్</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>కిలోవాట్లు</displayName>
-				<unitPattern count="one">{0} కిలోవాట్</unitPattern>
-				<unitPattern count="other">{0} కిలోవాట్లు</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>మెగావాట్లు</displayName>
 				<unitPattern count="one">{0} మెగావాట్</unitPattern>
 				<unitPattern count="other">{0} మెగావాట్లు</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>మిల్లీవాట్లు</displayName>
-				<unitPattern count="one">{0} మిల్లీవాట్</unitPattern>
-				<unitPattern count="other">{0} మిల్లీవాట్లు</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>కిలోవాట్లు</displayName>
+				<unitPattern count="one">{0} కిలోవాట్</unitPattern>
+				<unitPattern count="other">{0} కిలోవాట్లు</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>వాట్లు</displayName>
 				<unitPattern count="one">{0} వాట్</unitPattern>
 				<unitPattern count="other">{0} వాట్లు</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>మిల్లీవాట్లు</displayName>
+				<unitPattern count="one">{0} మిల్లీవాట్</unitPattern>
+				<unitPattern count="other">{0} మిల్లీవాట్లు</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>హార్స్‌పవర్</displayName>
+				<unitPattern count="one">{0} హార్స్‌పవర్</unitPattern>
+				<unitPattern count="other">{0} హార్స్‌పవర్</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>హెక్టోపాస్కల్‌లు</displayName>
 				<unitPattern count="one">{0} హెక్టోపాస్కల్</unitPattern>
 				<unitPattern count="other">{0} హెక్టోపాస్కల్‌లు</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>అంగుళాల పాదరసం</displayName>
-				<unitPattern count="one">{0} అంగుళం పాదరసం</unitPattern>
-				<unitPattern count="other">{0} అంగుళాల పాదరసం</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>మిల్లీబార్‌లు</displayName>
-				<unitPattern count="one">{0} మిల్లీబార్</unitPattern>
-				<unitPattern count="other">{0} మిల్లీబార్‌లు</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>మిల్లీమీటర్ల పాదరసం</displayName>
 				<unitPattern count="one">{0} మిల్లీమీటర్ పాదరసం</unitPattern>
@@ -5987,10 +6180,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} పౌండు/చదరపు అంగుళం</unitPattern>
 				<unitPattern count="other">{0} పౌండ్లు/చదరపు అంగుళం</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>కేరట్లు</displayName>
-				<unitPattern count="one">{0} కేరట్</unitPattern>
-				<unitPattern count="other">{0} కేరట్లు</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>అంగుళాల పాదరసం</displayName>
+				<unitPattern count="one">{0} అంగుళం పాదరసం</unitPattern>
+				<unitPattern count="other">{0} అంగుళాల పాదరసం</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>మిల్లీబార్‌లు</displayName>
+				<unitPattern count="one">{0} మిల్లీబార్</unitPattern>
+				<unitPattern count="other">{0} మిల్లీబార్‌లు</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>కిలోమీటర్లు/గంట</displayName>
@@ -6007,6 +6205,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} మైలు/గంట</unitPattern>
 				<unitPattern count="other">{0} మైళ్లు/గంట</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>నాట్</displayName>
+				<unitPattern count="one">{0} నాట్</unitPattern>
+				<unitPattern count="other">{0} నాటులు</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>డిగ్రీల సెల్సియస్</displayName>
 				<unitPattern count="one">{0} డిగ్రీ సెల్సియస్</unitPattern>
@@ -6022,31 +6230,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} కెల్విన్</unitPattern>
 				<unitPattern count="other">{0} కెల్విన్స్</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ఎకరా-అడుగులు</displayName>
-				<unitPattern count="one">{0} ఎకరా-అడుగు</unitPattern>
-				<unitPattern count="other">{0} ఎకరా-అడుగులు</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>సెంటీలీటర్లు</displayName>
-				<unitPattern count="one">{0} సెంటీలీటరు</unitPattern>
-				<unitPattern count="other">{0} సెంటీలీటర్లు</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>క్యూబిక్ సెంటీమీటర్లు</displayName>
-				<unitPattern count="one">{0} క్యూబిక్ సెంటీమీటరు</unitPattern>
-				<unitPattern count="other">{0} క్యూబిక్ సెంటీమీటర్లు</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ఘనపు అడుగులు</displayName>
-				<unitPattern count="one">{0} ఘనపు అడుగు</unitPattern>
-				<unitPattern count="other">{0} ఘనపు అడుగులు</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>ఘనపు అంగుళాలు</displayName>
-				<unitPattern count="one">{0} ఘనపు అంగుళం</unitPattern>
-				<unitPattern count="other">{0} ఘనపు అంగుళాలు</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>క్యూబిక్ కిలోమీటర్లు</displayName>
 				<unitPattern count="one">{0} క్యూబిక్ కిలోమీటరు</unitPattern>
@@ -6056,6 +6239,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>క్యూబిక్ మీటర్లు</displayName>
 				<unitPattern count="one">{0} క్యూబిక్ మీటరు</unitPattern>
 				<unitPattern count="other">{0} క్యూబిక్ మీటర్లు</unitPattern>
+				<perUnitPattern>క్యూబిక్ మీటరుకు {0}</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>క్యూబిక్ సెంటీమీటర్లు</displayName>
+				<unitPattern count="one">{0} క్యూబిక్ సెంటీమీటరు</unitPattern>
+				<unitPattern count="other">{0} క్యూబిక్ సెంటీమీటర్లు</unitPattern>
+				<perUnitPattern>క్యూబిక్ సెంటీమీటరుకు {0}</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>క్యూబిక్ మైళ్లు</displayName>
@@ -6067,25 +6257,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} క్యూబిక్ గజం</unitPattern>
 				<unitPattern count="other">{0} క్యూబిక్ గజాలు</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>కప్పులు</displayName>
-				<unitPattern count="one">{0} కప్పు</unitPattern>
-				<unitPattern count="other">{0} కప్పులు</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ఘనపు అడుగులు</displayName>
+				<unitPattern count="one">{0} ఘనపు అడుగు</unitPattern>
+				<unitPattern count="other">{0} ఘనపు అడుగులు</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>డెసిలీటర్లు</displayName>
-				<unitPattern count="one">{0} డెసిలీటరు</unitPattern>
-				<unitPattern count="other">{0} డెసిలీటర్లు</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>ఘనపు అంగుళాలు</displayName>
+				<unitPattern count="one">{0} ఘనపు అంగుళం</unitPattern>
+				<unitPattern count="other">{0} ఘనపు అంగుళాలు</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>ద్రవరూప ఔన్సులు</displayName>
-				<unitPattern count="one">{0} ద్రవరూప ఔన్సు</unitPattern>
-				<unitPattern count="other">{0} ద్రవరూప ఔన్సులు</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>గ్యాలన్లు</displayName>
-				<unitPattern count="one">{0} గ్యాలన్</unitPattern>
-				<unitPattern count="other">{0} గ్యాలన్లు</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>మెగాలీటర్లు</displayName>
+				<unitPattern count="one">{0} మెగాలీటరు</unitPattern>
+				<unitPattern count="other">{0} మెగాలీటర్లు</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>హెక్టాలీటర్లు</displayName>
@@ -6096,27 +6281,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>లీటర్లు</displayName>
 				<unitPattern count="one">{0} లీటరు</unitPattern>
 				<unitPattern count="other">{0} లీటర్లు</unitPattern>
+				<perUnitPattern>లీటరుకు {0}</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>మెగాలీటర్లు</displayName>
-				<unitPattern count="one">{0} మెగాలీటరు</unitPattern>
-				<unitPattern count="other">{0} మెగాలీటర్లు</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>డెసిలీటర్లు</displayName>
+				<unitPattern count="one">{0} డెసిలీటరు</unitPattern>
+				<unitPattern count="other">{0} డెసిలీటర్లు</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>సెంటీలీటర్లు</displayName>
+				<unitPattern count="one">{0} సెంటీలీటరు</unitPattern>
+				<unitPattern count="other">{0} సెంటీలీటర్లు</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>మిల్లీలీటర్లు</displayName>
 				<unitPattern count="one">{0} మిల్లీలీటరు</unitPattern>
 				<unitPattern count="other">{0} మిల్లీలీటర్లు</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>పింట్లు</displayName>
-				<unitPattern count="one">{0} పింట్</unitPattern>
-				<unitPattern count="other">{0} పింట్లు</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>మెట్రిక్ పింట్లు</displayName>
+				<unitPattern count="one">{0} మెట్రిక్ పింటు</unitPattern>
+				<unitPattern count="other">{0} మెట్రిక్ పింట్లు</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>మెట్రిక్ కప్పులు</displayName>
+				<unitPattern count="one">{0} మెట్రిక్ కప్పు</unitPattern>
+				<unitPattern count="other">{0} మెట్రిక్ కప్పులు</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ఎకరా-అడుగులు</displayName>
+				<unitPattern count="one">{0} ఎకరా-అడుగు</unitPattern>
+				<unitPattern count="other">{0} ఎకరా-అడుగులు</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>గ్యాలన్లు</displayName>
+				<unitPattern count="one">{0} గ్యాలన్</unitPattern>
+				<unitPattern count="other">{0} గ్యాలన్లు</unitPattern>
+				<perUnitPattern>గ్యాలనుకు {0}</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>పావు వంతులు</displayName>
 				<unitPattern count="one">{0} పావు వంతు</unitPattern>
 				<unitPattern count="other">{0} పావు వంతులు</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>పింట్లు</displayName>
+				<unitPattern count="one">{0} పింట్</unitPattern>
+				<unitPattern count="other">{0} పింట్లు</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>కప్పులు</displayName>
+				<unitPattern count="one">{0} కప్పు</unitPattern>
+				<unitPattern count="other">{0} కప్పులు</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>ద్రవరూప ఔన్సులు</displayName>
+				<unitPattern count="one">{0} ద్రవరూప ఔన్సు</unitPattern>
+				<unitPattern count="other">{0} ద్రవరూప ఔన్సులు</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>టేబుల్ స్పూన్లు</displayName>
 				<unitPattern count="one">{0} టేబుల్ స్పూన్</unitPattern>
@@ -6127,6 +6349,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} టీ స్పూన్</unitPattern>
 				<unitPattern count="other">{0} టీ స్పూన్లు</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} తూర్పు</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} ఉత్తరం</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} దక్షిణం</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} పశ్చిమం</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -6142,6 +6370,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} మీ/సె²</unitPattern>
 				<unitPattern count="other">{0} మీ/సె²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>వి.</displayName>
+				<unitPattern count="one">{0} వి.</unitPattern>
+				<unitPattern count="other">{0} వి.</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>రేడియన్లు</displayName>
+				<unitPattern count="one">{0} రే.</unitPattern>
+				<unitPattern count="other">{0} రే.</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>డిగ్రీలు</displayName>
+				<unitPattern count="one">{0} డి.</unitPattern>
+				<unitPattern count="other">{0} డి.</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>ఆర్క్ నిమి.</displayName>
 				<unitPattern count="one">{0} ఆర్క్ నిమి.</unitPattern>
@@ -6152,30 +6395,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} ఆర్క్ సెక.</unitPattern>
 				<unitPattern count="other">{0} ఆర్క్ సెక.</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>డిగ్రీలు</displayName>
-				<unitPattern count="one">{0} డి.</unitPattern>
-				<unitPattern count="other">{0} డి.</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>రేడియన్లు</displayName>
-				<unitPattern count="one">{0} రే.</unitPattern>
-				<unitPattern count="other">{0} రే.</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ఎకరాలు</displayName>
-				<unitPattern count="one">{0} ఎక.</unitPattern>
-				<unitPattern count="other">{0} ఎక.</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>కి.మీ²</displayName>
+				<unitPattern count="one">{0} కి.మీ²</unitPattern>
+				<unitPattern count="other">{0} కి.మీ²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>హెక్టార్లు</displayName>
 				<unitPattern count="one">{0} హె.</unitPattern>
 				<unitPattern count="other">{0} హె.</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>మీటర్లు²</displayName>
+				<unitPattern count="one">{0} మీ²</unitPattern>
+				<unitPattern count="other">{0} మీ²</unitPattern>
+				<perUnitPattern>{0}/మీ²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>సెం.మీ²</displayName>
 				<unitPattern count="one">{0} సెం.మీ²</unitPattern>
 				<unitPattern count="other">{0} సెం.మీ²</unitPattern>
+				<perUnitPattern>{0}/సెం.మీ²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>చద. మైళ్లు</displayName>
+				<unitPattern count="one">{0} చద. మై.</unitPattern>
+				<unitPattern count="other">{0} చద. మై.</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ఎకరాలు</displayName>
+				<unitPattern count="one">{0} ఎక.</unitPattern>
+				<unitPattern count="other">{0} ఎక.</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>గజాలు²</displayName>
+				<unitPattern count="one">{0} గ²</unitPattern>
+				<unitPattern count="other">{0} గ²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>చద. అడుగులు</displayName>
@@ -6186,91 +6441,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>అంగుళాలు²</displayName>
 				<unitPattern count="one">{0} అం²</unitPattern>
 				<unitPattern count="other">{0} అం²</unitPattern>
+				<perUnitPattern>{0}/అం²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>కి.మీ²</displayName>
-				<unitPattern count="one">{0} కి.మీ²</unitPattern>
-				<unitPattern count="other">{0} కి.మీ²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>మీటర్లు²</displayName>
-				<unitPattern count="one">{0} మీ²</unitPattern>
-				<unitPattern count="other">{0} మీ²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>చద. మైళ్లు</displayName>
-				<unitPattern count="one">{0} చద. మై.</unitPattern>
-				<unitPattern count="other">{0} చద. మై.</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>గజాలు²</displayName>
-				<unitPattern count="one">{0} గ²</unitPattern>
-				<unitPattern count="other">{0} గ²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>కేరట్లు</displayName>
+				<unitPattern count="one">{0} కేర.</unitPattern>
+				<unitPattern count="other">{0} కేర.</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>లీటర్లు/కి.మీ</displayName>
 				<unitPattern count="one">{0} లీ./కి.మీ</unitPattern>
 				<unitPattern count="other">{0} లీ./కి.మీ</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>లీ/100 కి.మీ.</displayName>
+				<unitPattern count="one">{0} లీ/100 కి.మీ.</unitPattern>
+				<unitPattern count="other">{0} లీ/100 కి.మీ.</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>మైళ్లు/గ్యా.</displayName>
 				<unitPattern count="one">{0} మై./గ్యా.</unitPattern>
 				<unitPattern count="other">{0} మై./గ్యా.</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>బిట్</displayName>
-				<unitPattern count="one">{0} బి</unitPattern>
-				<unitPattern count="other">{0} బి</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>బైట్</displayName>
-				<unitPattern count="one">{0} బై</unitPattern>
-				<unitPattern count="other">{0} బై</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>గి.బిట్</displayName>
-				<unitPattern count="one">{0} గి.బిట్</unitPattern>
-				<unitPattern count="other">{0} గి.బిట్లు</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>గి.బైట్</displayName>
-				<unitPattern count="one">{0} జీబీ</unitPattern>
-				<unitPattern count="other">{0} జీబీ</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>కి.బిట్</displayName>
-				<unitPattern count="one">{0} కి.బిట్</unitPattern>
-				<unitPattern count="other">{0} కి.బిట్లు</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>కి.బైట్</displayName>
-				<unitPattern count="one">{0} కేబీ</unitPattern>
-				<unitPattern count="other">{0} కేబీ</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>మె.బిట్</displayName>
-				<unitPattern count="one">{0} మె.బిట్</unitPattern>
-				<unitPattern count="other">{0} మె.బిట్లు</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>మె.బైట్</displayName>
-				<unitPattern count="one">{0} ఎమ్‌బి</unitPattern>
-				<unitPattern count="other">{0} ఎమ్‌బి</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>టె.బిట్</displayName>
-				<unitPattern count="one">{0} టె.బిట్</unitPattern>
-				<unitPattern count="other">{0} టె.బిట్లు</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>టె.బైట్</displayName>
 				<unitPattern count="one">{0} టీబీ</unitPattern>
 				<unitPattern count="other">{0} టీబీ</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>టె.బిట్</displayName>
+				<unitPattern count="one">{0} టె.బిట్</unitPattern>
+				<unitPattern count="other">{0} టె.బిట్లు</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>గి.బైట్</displayName>
+				<unitPattern count="one">{0} జీబీ</unitPattern>
+				<unitPattern count="other">{0} జీబీ</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>గి.బిట్</displayName>
+				<unitPattern count="one">{0} గి.బిట్</unitPattern>
+				<unitPattern count="other">{0} గి.బిట్లు</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>మె.బైట్</displayName>
+				<unitPattern count="one">{0} ఎమ్‌బి</unitPattern>
+				<unitPattern count="other">{0} ఎమ్‌బి</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>మె.బిట్</displayName>
+				<unitPattern count="one">{0} మె.బిట్</unitPattern>
+				<unitPattern count="other">{0} మె.బిట్లు</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>కి.బైట్</displayName>
+				<unitPattern count="one">{0} కేబీ</unitPattern>
+				<unitPattern count="other">{0} కేబీ</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>కి.బిట్</displayName>
+				<unitPattern count="one">{0} కి.బిట్</unitPattern>
+				<unitPattern count="other">{0} కి.బిట్లు</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>బైట్</displayName>
+				<unitPattern count="one">{0} బై</unitPattern>
+				<unitPattern count="other">{0} బై</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>బిట్</displayName>
+				<unitPattern count="one">{0} బి</unitPattern>
+				<unitPattern count="other">{0} బి</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>శ</displayName>
+				<unitPattern count="one">{0} శ</unitPattern>
+				<unitPattern count="other">{0} శ</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>సంవత్సరాలు</displayName>
+				<unitPattern count="one">{0} సం.</unitPattern>
+				<unitPattern count="other">{0} సం.</unitPattern>
+				<perUnitPattern>{0}/సం.</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>నెలలు</displayName>
+				<unitPattern count="one">{0} నె.</unitPattern>
+				<unitPattern count="other">{0} నె.</unitPattern>
+				<perUnitPattern>{0}/నె.</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>వారాలు</displayName>
+				<unitPattern count="one">{0} వా.</unitPattern>
+				<unitPattern count="other">{0} వా.</unitPattern>
+				<perUnitPattern>{0}/వా.</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>రోజులు</displayName>
 				<unitPattern count="one">{0} రోజు</unitPattern>
 				<unitPattern count="other">{0} రోజులు</unitPattern>
+				<perUnitPattern>{0}/రో</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>గంటలు</displayName>
@@ -6278,30 +6548,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} గం.</unitPattern>
 				<perUnitPattern>{0}/గం</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>మై.సె.</displayName>
-				<unitPattern count="one">{0} మై.సె</unitPattern>
-				<unitPattern count="other">{0} మై.సె</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>మిల్లీసె.</displayName>
-				<unitPattern count="one">{0} మి.సె</unitPattern>
-				<unitPattern count="other">{0} మి.సె</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>నిమి.</displayName>
 				<unitPattern count="one">{0} నిమి.</unitPattern>
 				<unitPattern count="other">{0} నిమి.</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>నెలలు</displayName>
-				<unitPattern count="one">{0} నె.</unitPattern>
-				<unitPattern count="other">{0} నె.</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>నా.సె.</displayName>
-				<unitPattern count="one">{0} నా.సె</unitPattern>
-				<unitPattern count="other">{0} నా.సె</unitPattern>
+				<perUnitPattern>{0}/నిమి.</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>సె.</displayName>
@@ -6309,15 +6560,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} సెక.</unitPattern>
 				<perUnitPattern>{0}/సె</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>వారాలు</displayName>
-				<unitPattern count="one">{0} వా.</unitPattern>
-				<unitPattern count="other">{0} వా.</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>మిల్లీసె.</displayName>
+				<unitPattern count="one">{0} మి.సె</unitPattern>
+				<unitPattern count="other">{0} మి.సె</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>సంవత్సరాలు</displayName>
-				<unitPattern count="one">{0} సం.</unitPattern>
-				<unitPattern count="other">{0} సం.</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>మై.సె.</displayName>
+				<unitPattern count="one">{0} మై.సె</unitPattern>
+				<unitPattern count="other">{0} మై.సె</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>నా.సె.</displayName>
+				<unitPattern count="one">{0} నా.సె</unitPattern>
+				<unitPattern count="other">{0} నా.సె</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ఆంప్స్</displayName>
@@ -6339,6 +6595,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} వో</unitPattern>
 				<unitPattern count="other">{0} వో</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>కి.కే</displayName>
+				<unitPattern count="one">{0} కి.కే</unitPattern>
+				<unitPattern count="other">{0} కి.కే</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>కే</displayName>
 				<unitPattern count="one">{0} కే.</unitPattern>
@@ -6349,21 +6610,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} కే.</unitPattern>
 				<unitPattern count="other">{0} కే.</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>జౌల్స్</displayName>
-				<unitPattern count="one">{0} జౌ.</unitPattern>
-				<unitPattern count="other">{0} జౌ.</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>కి.కే</displayName>
-				<unitPattern count="one">{0} కి.కే</unitPattern>
-				<unitPattern count="other">{0} కి.కే</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>కిలోజౌల్</displayName>
 				<unitPattern count="one">{0} కి.జౌ</unitPattern>
 				<unitPattern count="other">{0} కి.జౌ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>జౌల్స్</displayName>
+				<unitPattern count="one">{0} జౌ.</unitPattern>
+				<unitPattern count="other">{0} జౌ.</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>కి.వా. గంట</displayName>
 				<unitPattern count="one">{0} కి.వా.గం</unitPattern>
@@ -6374,204 +6630,208 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} గిగా హె</unitPattern>
 				<unitPattern count="other">{0} గిగా హె</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>హెర్ట్‌జ్</displayName>
-				<unitPattern count="one">{0} హెర్ట్‌జ్</unitPattern>
-				<unitPattern count="other">{0} హెర్ట్‌జ్</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>మె.హె</displayName>
+				<unitPattern count="one">{0} మె.హె</unitPattern>
+				<unitPattern count="other">{0} మె.హె</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>కి.హె</displayName>
 				<unitPattern count="one">{0} కి.హె</unitPattern>
 				<unitPattern count="other">{0} కి.హె</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>మె.హె</displayName>
-				<unitPattern count="one">{0} మె.హె</unitPattern>
-				<unitPattern count="other">{0} మె.హె</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>హెర్ట్‌జ్</displayName>
+				<unitPattern count="one">{0} హెర్ట్‌జ్</unitPattern>
+				<unitPattern count="other">{0} హెర్ట్‌జ్</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>కి.మీ.</displayName>
+				<unitPattern count="one">{0} కి.మీ.</unitPattern>
+				<unitPattern count="other">{0} కి.మీ.</unitPattern>
+				<perUnitPattern>{0}/కి.మీ.</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>సెం.మీ.</displayName>
-				<unitPattern count="one">{0} సెం.మీ.</unitPattern>
-				<unitPattern count="other">{0} సెం.మీ.</unitPattern>
+			<unit type="length-meter">
+				<displayName>మీటర్లు</displayName>
+				<unitPattern count="one">{0} మీ.</unitPattern>
+				<unitPattern count="other">{0} మీ.</unitPattern>
+				<perUnitPattern>{0}/మీ.</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>డె.మీ.</displayName>
 				<unitPattern count="one">{0} డె.మీ.</unitPattern>
 				<unitPattern count="other">{0} డె.మీ.</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>అడుగులు</displayName>
-				<unitPattern count="one">{0} అ.</unitPattern>
-				<unitPattern count="other">{0} అ.</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName draft="unconfirmed">ఫర్లాంగులు</displayName>
-			</unit>
-			<unit type="length-inch">
-				<displayName>అంగుళాలు</displayName>
-				<unitPattern count="one">{0} అం.</unitPattern>
-				<unitPattern count="other">{0} అం.</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>కి.మీ.</displayName>
-				<unitPattern count="one">{0} కి.మీ.</unitPattern>
-				<unitPattern count="other">{0} కి.మీ.</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>కాంతి సం.</displayName>
-				<unitPattern count="one">{0} కాం. సం</unitPattern>
-				<unitPattern count="other">{0} కాం. సం</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>మీటర్లు</displayName>
-				<unitPattern count="one">{0} మీ.</unitPattern>
-				<unitPattern count="other">{0} మీ.</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>మై.మీటర్లు</displayName>
-				<unitPattern count="one">{0} మై.మీ.</unitPattern>
-				<unitPattern count="other">{0} మై.మీ.</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>మైళ్లు</displayName>
-				<unitPattern count="one">{0} మై.</unitPattern>
-				<unitPattern count="other">{0} మై.</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>సెం.మీ.</displayName>
+				<unitPattern count="one">{0} సెం.మీ.</unitPattern>
+				<unitPattern count="other">{0} సెం.మీ.</unitPattern>
+				<perUnitPattern>{0}/సెం.మీ.</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>మి.మీ.</displayName>
 				<unitPattern count="one">{0} మి.మీ.</unitPattern>
 				<unitPattern count="other">{0} మి.మీ.</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>మై.మీటర్లు</displayName>
+				<unitPattern count="one">{0} మై.మీ.</unitPattern>
+				<unitPattern count="other">{0} మై.మీ.</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>నా.మీ.</displayName>
 				<unitPattern count="one">{0} నా.మీ.</unitPattern>
 				<unitPattern count="other">{0} నా.మీ.</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>నా.మై.</displayName>
-				<unitPattern count="one">{0} నా.మై.</unitPattern>
-				<unitPattern count="other">{0} నా.మై.</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>పార్సెక్‌లు</displayName>
-				<unitPattern count="one">{0} పా.</unitPattern>
-				<unitPattern count="other">{0} పా.</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>పి.మీ.</displayName>
 				<unitPattern count="one">{0} పి.మీ.</unitPattern>
 				<unitPattern count="other">{0} పి.మీ.</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>మైళ్లు</displayName>
+				<unitPattern count="one">{0} మై.</unitPattern>
+				<unitPattern count="other">{0} మై.</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>గజాలు</displayName>
 				<unitPattern count="one">{0} గ.</unitPattern>
 				<unitPattern count="other">{0} గ.</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>అడుగులు</displayName>
+				<unitPattern count="one">{0} అ.</unitPattern>
+				<unitPattern count="other">{0} అ.</unitPattern>
+				<perUnitPattern>{0}/అ.</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>అంగుళాలు</displayName>
+				<unitPattern count="one">{0} అం.</unitPattern>
+				<unitPattern count="other">{0} అం.</unitPattern>
+				<perUnitPattern>{0}/అం.</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>పార్సెక్‌లు</displayName>
+				<unitPattern count="one">{0} పా.</unitPattern>
+				<unitPattern count="other">{0} పా.</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>కాంతి సం.</displayName>
+				<unitPattern count="one">{0} కాం. సం</unitPattern>
+				<unitPattern count="other">{0} కాం. సం</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName draft="unconfirmed">ఫర్లాంగులు</displayName>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>నా.మై.</displayName>
+				<unitPattern count="one">{0} నా.మై.</unitPattern>
+				<unitPattern count="other">{0} నా.మై.</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>స్కాం.మై.</displayName>
+				<unitPattern count="one">{0} స్కాం.మై.</unitPattern>
+				<unitPattern count="other">{0} స్కాం.మై.</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>లక్స్</displayName>
 				<unitPattern count="one">{0} ల.</unitPattern>
 				<unitPattern count="other">{0} ల.</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>క్యారెట్లు</displayName>
-				<unitPattern count="one">{0} క్యారె.</unitPattern>
-				<unitPattern count="other">{0} క్యారె.</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>గ్రాములు</displayName>
-				<unitPattern count="one">{0} గ్రా.</unitPattern>
-				<unitPattern count="other">{0} గ్రా.</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>కి.గ్రా.</displayName>
-				<unitPattern count="one">{0} కి.గ్రా.</unitPattern>
-				<unitPattern count="other">{0} కి.గ్రా.</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>ట</displayName>
 				<unitPattern count="one">{0} ట</unitPattern>
 				<unitPattern count="other">{0} ట</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>మై.గ్రా.</displayName>
-				<unitPattern count="one">{0} మై.గ్రా.</unitPattern>
-				<unitPattern count="other">{0} మై.గ్రా.</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>కి.గ్రా.</displayName>
+				<unitPattern count="one">{0} కి.గ్రా.</unitPattern>
+				<unitPattern count="other">{0} కి.గ్రా.</unitPattern>
+				<perUnitPattern>{0}/కి.గ్రా.</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>గ్రాములు</displayName>
+				<unitPattern count="one">{0} గ్రా.</unitPattern>
+				<unitPattern count="other">{0} గ్రా.</unitPattern>
+				<perUnitPattern>{0}/గ్రా.</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>మి.గ్రా.</displayName>
 				<unitPattern count="one">{0} మి.గ్రా.</unitPattern>
 				<unitPattern count="other">{0} మి.గ్రా.</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ఔ.</displayName>
-				<unitPattern count="one">{0} ఔ.</unitPattern>
-				<unitPattern count="other">{0} ఔ.</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ట్రా.ఔ.</displayName>
-				<unitPattern count="one">{0} ట్రా.ఔ.</unitPattern>
-				<unitPattern count="other">{0} ట్రా.ఔ.</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>పౌండ్లు</displayName>
-				<unitPattern count="one">{0} పౌ.</unitPattern>
-				<unitPattern count="other">{0} పౌ.</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>మై.గ్రా.</displayName>
+				<unitPattern count="one">{0} మై.గ్రా.</unitPattern>
+				<unitPattern count="other">{0} మై.గ్రా.</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>టన్నులు</displayName>
 				<unitPattern count="one">{0} టన్ను</unitPattern>
 				<unitPattern count="other">{0} టన్ను</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>పౌండ్లు</displayName>
+				<unitPattern count="one">{0} పౌ.</unitPattern>
+				<unitPattern count="other">{0} పౌ.</unitPattern>
+				<perUnitPattern>{0}/పౌ.</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ఔ.</displayName>
+				<unitPattern count="one">{0} ఔ.</unitPattern>
+				<unitPattern count="other">{0} ఔ.</unitPattern>
+				<perUnitPattern>{0}/ ఔ.</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ట్రా.ఔ.</displayName>
+				<unitPattern count="one">{0} ట్రా.ఔ.</unitPattern>
+				<unitPattern count="other">{0} ట్రా.ఔ.</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>క్యారెట్లు</displayName>
+				<unitPattern count="one">{0} క్యారె.</unitPattern>
+				<unitPattern count="other">{0} క్యారె.</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>గి.వా</displayName>
 				<unitPattern count="one">{0} గి.వా</unitPattern>
 				<unitPattern count="other">{0} గి.వా</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>హా.ప</displayName>
-				<unitPattern count="one">{0} హా.ప</unitPattern>
-				<unitPattern count="other">{0} హా.ప</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>కి.వా</displayName>
-				<unitPattern count="one">{0} కి.వా</unitPattern>
-				<unitPattern count="other">{0} కి.వా</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>మె.వా</displayName>
 				<unitPattern count="one">{0} మె.వా</unitPattern>
 				<unitPattern count="other">{0} మె.వా</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>మి.వా</displayName>
-				<unitPattern count="one">{0} మి.వా</unitPattern>
-				<unitPattern count="other">{0} మి.వా</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>కి.వా</displayName>
+				<unitPattern count="one">{0} కి.వా</unitPattern>
+				<unitPattern count="other">{0} కి.వా</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>వాట్లు</displayName>
 				<unitPattern count="one">{0} వా.</unitPattern>
 				<unitPattern count="other">{0} వా.</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>మి.వా</displayName>
+				<unitPattern count="one">{0} మి.వా</unitPattern>
+				<unitPattern count="other">{0} మి.వా</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>హా.ప</displayName>
+				<unitPattern count="one">{0} హా.ప</unitPattern>
+				<unitPattern count="other">{0} హా.ప</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>హె.పా</displayName>
 				<unitPattern count="one">{0} హె.పా</unitPattern>
 				<unitPattern count="other">{0} హె.పా</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>అం.పాద</displayName>
-				<unitPattern count="one">{0} అం.పాద</unitPattern>
-				<unitPattern count="other">{0} అం.పాద</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>మి.బార్</displayName>
-				<unitPattern count="one">{0} మి.బార్</unitPattern>
-				<unitPattern count="other">{0} మి.బార్</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>మిమీ. పాద</displayName>
 				<unitPattern count="one">{0} మిమీ. పాద</unitPattern>
@@ -6582,10 +6842,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} పౌ/చ.అం</unitPattern>
 				<unitPattern count="other">{0} పౌ/చ.అం</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>కేరట్లు</displayName>
-				<unitPattern count="one">{0} కేర.</unitPattern>
-				<unitPattern count="other">{0} కేర.</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>అం.పాద</displayName>
+				<unitPattern count="one">{0} అం.పాద</unitPattern>
+				<unitPattern count="other">{0} అం.పాద</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>మి.బార్</displayName>
+				<unitPattern count="one">{0} మి.బార్</unitPattern>
+				<unitPattern count="other">{0} మి.బార్</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>కి.మీ/గంట</displayName>
@@ -6602,6 +6867,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} మై/గం</unitPattern>
 				<unitPattern count="other">{0} మై/గం</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>నా.</displayName>
+				<unitPattern count="one">{0} నా.</unitPattern>
+				<unitPattern count="other">{0} నా.</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>డి.సెల్సి</displayName>
 				<unitPattern count="one">{0}°సెల్సి</unitPattern>
@@ -6617,31 +6892,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} కె</unitPattern>
 				<unitPattern count="other">{0} కె</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ఎ.అ.</displayName>
-				<unitPattern count="one">{0} ఎ.అ.</unitPattern>
-				<unitPattern count="other">{0} ఎ.అ.</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>సె.లీ.</displayName>
-				<unitPattern count="one">{0} సె.లీ.</unitPattern>
-				<unitPattern count="other">{0} సె.లీ.</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>సెం.మీ³</displayName>
-				<unitPattern count="one">{0} సెం.మీ³</unitPattern>
-				<unitPattern count="other">{0} సెం.మీ³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>అ³</displayName>
-				<unitPattern count="one">{0} అ³</unitPattern>
-				<unitPattern count="other">{0} అ³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>అం³</displayName>
-				<unitPattern count="one">{0} అం³</unitPattern>
-				<unitPattern count="other">{0} అం³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>కి.మీ³</displayName>
 				<unitPattern count="one">{0} కి.మీ³</unitPattern>
@@ -6651,6 +6901,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>మీ³</displayName>
 				<unitPattern count="one">{0} మీ³</unitPattern>
 				<unitPattern count="other">{0} మీ³</unitPattern>
+				<perUnitPattern>{0}/మీ³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>సెం.మీ³</displayName>
+				<unitPattern count="one">{0} సెం.మీ³</unitPattern>
+				<unitPattern count="other">{0} సెం.మీ³</unitPattern>
+				<perUnitPattern>{0}/సెం.మీ³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>మై³</displayName>
@@ -6662,25 +6919,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} గ³</unitPattern>
 				<unitPattern count="other">{0} గ³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>కప్పులు</displayName>
-				<unitPattern count="one">{0} క.</unitPattern>
-				<unitPattern count="other">{0} క.</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>అ³</displayName>
+				<unitPattern count="one">{0} అ³</unitPattern>
+				<unitPattern count="other">{0} అ³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>డె.లీ.</displayName>
-				<unitPattern count="one">{0} డె.లీ.</unitPattern>
-				<unitPattern count="other">{0} డె.లీ.</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>అం³</displayName>
+				<unitPattern count="one">{0} అం³</unitPattern>
+				<unitPattern count="other">{0} అం³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>ద్ర.ఔ.</displayName>
-				<unitPattern count="one">{0} ద్ర.ఔ.</unitPattern>
-				<unitPattern count="other">{0} ద్ర.ఔ.</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>గ్యా.</displayName>
-				<unitPattern count="one">{0} గ్యా.</unitPattern>
-				<unitPattern count="other">{0} గ్యా.</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>మె.లీ.</displayName>
+				<unitPattern count="one">{0} మె.లీ.</unitPattern>
+				<unitPattern count="other">{0} మె.లీ.</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>హె.లీ.</displayName>
@@ -6691,27 +6943,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>లీటర్లు</displayName>
 				<unitPattern count="one">{0} లీ.</unitPattern>
 				<unitPattern count="other">{0} లీ.</unitPattern>
+				<perUnitPattern>{0}/లీ.</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>మె.లీ.</displayName>
-				<unitPattern count="one">{0} మె.లీ.</unitPattern>
-				<unitPattern count="other">{0} మె.లీ.</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>డె.లీ.</displayName>
+				<unitPattern count="one">{0} డె.లీ.</unitPattern>
+				<unitPattern count="other">{0} డె.లీ.</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>సె.లీ.</displayName>
+				<unitPattern count="one">{0} సె.లీ.</unitPattern>
+				<unitPattern count="other">{0} సె.లీ.</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>మి.లీ.</displayName>
 				<unitPattern count="one">{0} మి.లీ.</unitPattern>
 				<unitPattern count="other">{0} మి.లీ.</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>పింట్లు</displayName>
-				<unitPattern count="one">{0} పిం.</unitPattern>
-				<unitPattern count="other">{0} పిం.</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>మె.పిం.</displayName>
+				<unitPattern count="one">{0} మె.పిం.</unitPattern>
+				<unitPattern count="other">{0} మె.పిం.</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>మె.కప్పు</displayName>
+				<unitPattern count="one">{0}/మె.క.</unitPattern>
+				<unitPattern count="other">{0}/మె.క.</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ఎ.అ.</displayName>
+				<unitPattern count="one">{0} ఎ.అ.</unitPattern>
+				<unitPattern count="other">{0} ఎ.అ.</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>గ్యా.</displayName>
+				<unitPattern count="one">{0} గ్యా.</unitPattern>
+				<unitPattern count="other">{0} గ్యా.</unitPattern>
+				<perUnitPattern>{0}/గ్యా.</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>పావు వం.</displayName>
 				<unitPattern count="one">{0} పావు వం.</unitPattern>
 				<unitPattern count="other">{0} పావు వం.</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>పింట్లు</displayName>
+				<unitPattern count="one">{0} పిం.</unitPattern>
+				<unitPattern count="other">{0} పిం.</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>కప్పులు</displayName>
+				<unitPattern count="one">{0} క.</unitPattern>
+				<unitPattern count="other">{0} క.</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>ద్ర.ఔ.</displayName>
+				<unitPattern count="one">{0} ద్ర.ఔ.</unitPattern>
+				<unitPattern count="other">{0} ద్ర.ఔ.</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>టే.స్పూ.</displayName>
 				<unitPattern count="one">{0} టే.స్పూ</unitPattern>
@@ -6722,6 +7011,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} టీ.స్పూ.</unitPattern>
 				<unitPattern count="other">{0} టీ.స్పూ.</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} తూ.</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} ఉ.</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}ద</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} ప.</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -6731,6 +7026,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} గు</unitPattern>
 				<unitPattern count="other">{0} గు</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -6739,26 +7038,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} ఎక.</unitPattern>
-				<unitPattern count="other">{0} ఎక.</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} కి.మీ²</unitPattern>
+				<unitPattern count="other">{0} కి.మీ²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} హె.</unitPattern>
 				<unitPattern count="other">{0} హె.</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} అ²</unitPattern>
-				<unitPattern count="other">{0} అ²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} కి.మీ²</unitPattern>
-				<unitPattern count="other">{0} కి.మీ²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} మీ²</unitPattern>
 				<unitPattern count="other">{0} మీ²</unitPattern>
@@ -6767,6 +7054,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} మై²</unitPattern>
 				<unitPattern count="other">{0} మై²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} ఎక.</unitPattern>
+				<unitPattern count="other">{0} ఎక.</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} అ²</unitPattern>
+				<unitPattern count="other">{0} అ²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>లీ/100 కి.మీ.</displayName>
+				<unitPattern count="one">{0}లీ/100 కి.మీ.</unitPattern>
+				<unitPattern count="other">{0}లీ/100 కి.మీ.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>సం</displayName>
+				<unitPattern count="one">{0}సం</unitPattern>
+				<unitPattern count="other">{0}సం</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>నెల</displayName>
+				<unitPattern count="one">{0}నె</unitPattern>
+				<unitPattern count="other">{0}నె</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>వా</displayName>
+				<unitPattern count="one">{0}వా</unitPattern>
+				<unitPattern count="other">{0}వా</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>రోజు</displayName>
 				<unitPattern count="one">{0}రో</unitPattern>
@@ -6777,66 +7092,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}గం</unitPattern>
 				<unitPattern count="other">{0}గం</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>మి.సె.</displayName>
-				<unitPattern count="one">{0}మి.సె</unitPattern>
-				<unitPattern count="other">{0}మి.సె</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>నిమి</displayName>
 				<unitPattern count="one">{0}ని</unitPattern>
 				<unitPattern count="other">{0}ని</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>నెల</displayName>
-				<unitPattern count="one">{0}నె</unitPattern>
-				<unitPattern count="other">{0}నె</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>సె</displayName>
 				<unitPattern count="one">{0}సె</unitPattern>
 				<unitPattern count="other">{0}సె</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>వా</displayName>
-				<unitPattern count="one">{0}వా</unitPattern>
-				<unitPattern count="other">{0}వా</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>సం</displayName>
-				<unitPattern count="one">{0}సం</unitPattern>
-				<unitPattern count="other">{0}సం</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>సెం.మీ</displayName>
-				<unitPattern count="one">{0}సెం.మీ</unitPattern>
-				<unitPattern count="other">{0}సెం.మీ</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0}′</unitPattern>
-				<unitPattern count="other">{0}′</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0}″</unitPattern>
-				<unitPattern count="other">{0}″</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>మి.సె.</displayName>
+				<unitPattern count="one">{0}మి.సె</unitPattern>
+				<unitPattern count="other">{0}మి.సె</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>కి.మీ</displayName>
 				<unitPattern count="one">{0}కి.మీ</unitPattern>
 				<unitPattern count="other">{0}కి.మీ</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} కాం. సం</unitPattern>
-				<unitPattern count="other">{0} కాం. సం</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>మీటరు</displayName>
 				<unitPattern count="one">{0}మీ</unitPattern>
 				<unitPattern count="other">{0}మీ</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} మై</unitPattern>
-				<unitPattern count="other">{0} మై</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>సెం.మీ</displayName>
+				<unitPattern count="one">{0}సెం.మీ</unitPattern>
+				<unitPattern count="other">{0}సెం.మీ</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>మి.మీ</displayName>
@@ -6847,35 +7131,47 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} పి.మీ</unitPattern>
 				<unitPattern count="other">{0} పి.మీ</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} మై</unitPattern>
+				<unitPattern count="other">{0} మై</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} గ.</unitPattern>
 				<unitPattern count="other">{0} గ.</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>గ్రాము</displayName>
-				<unitPattern count="one">{0}గ్రా</unitPattern>
-				<unitPattern count="other">{0}గ్రా</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="other">{0}′</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} కాం. సం</unitPattern>
+				<unitPattern count="other">{0} కాం. సం</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>కి.గ్రా</displayName>
 				<unitPattern count="one">{0}కి.గ్రా</unitPattern>
 				<unitPattern count="other">{0}కి.గ్రా</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} ఔ.</unitPattern>
-				<unitPattern count="other">{0} ఔ.</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<unitPattern count="one">{0} పౌ.</unitPattern>
-				<unitPattern count="other">{0} పౌ.</unitPattern>
+			<unit type="mass-gram">
+				<displayName>గ్రాము</displayName>
+				<unitPattern count="one">{0}గ్రా</unitPattern>
+				<unitPattern count="other">{0}గ్రా</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<unitPattern count="one" draft="unconfirmed">{0} ట</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} ట</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} హా.ప</unitPattern>
-				<unitPattern count="other">{0} హా.ప</unitPattern>
+			<unit type="mass-pound">
+				<unitPattern count="one">{0} పౌ.</unitPattern>
+				<unitPattern count="other">{0} పౌ.</unitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} ఔ.</unitPattern>
+				<unitPattern count="other">{0} ఔ.</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} కి.వా</unitPattern>
@@ -6885,6 +7181,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} వా.</unitPattern>
 				<unitPattern count="other">{0} వా.</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} హా.ప</unitPattern>
+				<unitPattern count="other">{0} హా.ప</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} హె.పా</unitPattern>
 				<unitPattern count="other">{0} హె.పా</unitPattern>
@@ -6932,6 +7232,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}లీ</unitPattern>
 				<unitPattern count="other">{0}లీ</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} తూ.</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} ఉ.</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} ద.</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} ప.</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/te_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/te_IN.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/te_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/te_IN.xml
index 014fef001be..bc6d1f78a88 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/te_IN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/te_IN.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="te"/>
 		<territory type="IN"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/teo.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/teo.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/teo.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/teo.xml
index 516d45e5729..86313aae716 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/teo.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/teo.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="teo"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antili za Uholanzi</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Ajentina</territory>
 			<territory type="AS">Samoa ya Marekani</territory>
@@ -448,6 +446,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">Taparachu</dayPeriod>
+							<dayPeriod type="pm">Ebongi</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">Taparachu</dayPeriod>
 							<dayPeriod type="pm">Ebongi</dayPeriod>
@@ -489,22 +491,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -581,6 +583,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/teo_KE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/teo_KE.xml
similarity index 74%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/teo_KE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/teo_KE.xml
index 825d8844e5e..fa34496daaa 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/teo_KE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/teo_KE.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="teo"/>
 		<territory type="KE"/>
 	</identity>
@@ -19,3 +18,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/teo_UG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/teo_UG.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/teo_UG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/teo_UG.xml
index 99e01935553..1d8f24e3b85 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/teo_UG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/teo_UG.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="teo"/>
 		<territory type="UG"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/th.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/th.xml
similarity index 90%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/th.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/th.xml
index 0094d1ae3b3..8b563cd953a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/th.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/th.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="th"/>
 	</identity>
 	<localeDisplayNames>
@@ -59,7 +58,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ay">ไอย์มารา</language>
 			<language type="az">อาเซอร์ไบจาน</language>
 			<language type="az" alt="short">อะเซอรี</language>
-			<language type="azb" draft="contributed">อาเซอร์ไบจานใต้</language>
 			<language type="ba">บัชคีร์</language>
 			<language type="bal">บาลูชิ</language>
 			<language type="ban">บาหลี</language>
@@ -76,6 +74,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bfd" draft="contributed">บาฟัต</language>
 			<language type="bfq" draft="contributed">พทคะ</language>
 			<language type="bg">บัลแกเรีย</language>
+			<language type="bgn" draft="contributed">บาลูจิตะวันออก</language>
 			<language type="bho">โภชปุรี</language>
 			<language type="bi">บิสลามา</language>
 			<language type="bik">บิกอล</language>
@@ -168,7 +167,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="enm">อังกฤษกลาง</language>
 			<language type="eo">เอสเปอรันโต</language>
 			<language type="es">สเปน</language>
-			<language type="es_ES">สเปน (ยุโรป)</language>
+			<language type="es_419">สเปน - ละตินอเมริกา</language>
+			<language type="es_ES">สเปน - ยุโรป</language>
+			<language type="es_MX">สเปน - เม็กซิโก</language>
 			<language type="esu" draft="contributed">ยูพิกกลาง</language>
 			<language type="et">เอสโตเนีย</language>
 			<language type="eu">บัสเก</language>
@@ -185,6 +186,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="fo">แฟโร</language>
 			<language type="fon">ฟอน</language>
 			<language type="fr">ฝรั่งเศส</language>
+			<language type="fr_CA">ฝรั่งเศส - แคนาดา</language>
 			<language type="fr_CH">ฝรั่งเศส (สวิส)</language>
 			<language type="frc" draft="contributed">ฝรั่งเศสกาฌ็อง</language>
 			<language type="frm">ฝรั่งเศสกลาง</language>
@@ -334,6 +336,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">ลาว</language>
 			<language type="lol">มองโก</language>
 			<language type="loz">โลซิ</language>
+			<language type="lrc" draft="contributed">ลูรีเหนือ</language>
 			<language type="lt">ลิทัวเนีย</language>
 			<language type="ltg" draft="contributed">ลัตเกล</language>
 			<language type="lu">ลูบา-กาตองกา</language>
@@ -395,6 +398,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nb">นอร์เวย์บุคมอล</language>
 			<language type="nd">เอ็นเดเบเลเหนือ</language>
 			<language type="nds">เยอรมันต่ำ - แซกซอนต่ำ</language>
+			<language type="nds_NL" draft="contributed">แซกซอนใต้</language>
 			<language type="ne">เนปาล</language>
 			<language type="new">เนวาร์</language>
 			<language type="ng">ดองกา</language>
@@ -489,6 +493,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sco">สกอตส์</language>
 			<language type="sd">สินธุ</language>
 			<language type="sdc" draft="contributed">ซาร์ดิเนียซาสซารี</language>
+			<language type="sdh">เคอร์ดิชใต้</language>
 			<language type="se">ซามิเหนือ</language>
 			<language type="see" draft="contributed">เซนิกา</language>
 			<language type="seh">เซนา</language>
@@ -531,8 +536,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">ซูเมอ</language>
 			<language type="sv">สวีเดน</language>
 			<language type="sw">สวาฮีลี</language>
+			<language type="sw_CD">สวาฮีลี-คองโก</language>
 			<language type="swb">โคเมอเรียน</language>
-			<language type="swc">สวาฮีลี-คองโก</language>
 			<language type="syc">ซีเรียแบบดั้งเดิม</language>
 			<language type="syr">ซีเรีย</language>
 			<language type="szl" draft="contributed">ไซลีเซีย</language>
@@ -600,6 +605,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">วาลาโม</language>
 			<language type="war">วาเรย์</language>
 			<language type="was">วาโช</language>
+			<language type="wbp">วอล์เพอร์รี</language>
 			<language type="wo">โวลอฟ</language>
 			<language type="wuu" draft="contributed">จีนอู๋</language>
 			<language type="xal">คัลมืยค์</language>
@@ -836,7 +842,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">แองกวิลลา</territory>
 			<territory type="AL">แอลเบเนีย</territory>
 			<territory type="AM">อาร์เมเนีย</territory>
-			<territory type="AN">เนเธอร์แลนด์แอนทิลลิส</territory>
 			<territory type="AO">แองโกลา</territory>
 			<territory type="AQ">แอนตาร์กติกา</territory>
 			<territory type="AR">อาร์เจนตินา</territory>
@@ -1176,6 +1181,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">การจัดเรียงตัวเลข</key>
 			<key type="colStrength" draft="contributed">ความแม่นยำในการจัดเรียง</key>
 			<key type="currency">สกุลเงิน</key>
+			<key type="hc">วงจรชั่วโมง (เทียบ 12 และ 24)</key>
+			<key type="lb">รูปแบบการขึ้นบรรทัดใหม่</key>
+			<key type="ms">ระบบการวัด</key>
 			<key type="numbers">ตัวเลข</key>
 			<key type="timezone" draft="contributed">เขตเวลา</key>
 			<key type="va" draft="contributed">ตัวแปรภาษาถิ่น</key>
@@ -1183,121 +1191,131 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">ใช้งานส่วนบุคคล</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">ตัวเลขอินเดีย-อารบิก</type>
-			<type type="arabext" key="numbers">ตัวเลขอินเดีย-อารบิกตัวเต็ม</type>
-			<type type="armn" key="numbers">ตัวเลขอาร์เมเนีย</type>
-			<type type="armnlow" key="numbers">ตัวเลขอาร์เมเนียพิมพ์เล็ก</type>
-			<type type="bali" key="numbers">ตัวเลขบาหลี</type>
-			<type type="beng" key="numbers">ตัวเลขบังกลาเทศ</type>
-			<type type="big5han" key="collation">เรียงตามอักษรจีนดั้งเดิม</type>
-			<type type="brah" key="numbers" draft="contributed">ตัวเลขพราหมี</type>
-			<type type="buddhist" key="calendar">ปฏิทินพุทธ</type>
-			<type type="cakm" key="numbers" draft="contributed">ตัวเลขชากมา</type>
-			<type type="cham" key="numbers">ตัวเลขชาม</type>
-			<type type="chinese" key="calendar">ปฏิทินจีน</type>
-			<type type="coptic" key="calendar" draft="contributed">ปฏิทินคอปติก</type>
-			<type type="dangi" key="calendar">ปฏิทินทันกิ</type>
-			<type type="deva" key="numbers">ตัวเลขเทวนาครี</type>
-			<type type="dictionary" key="collation" draft="contributed">เรียงตามพจนานุกรม</type>
-			<type type="ducet" key="collation">ลำดับการจัดเรียงตาม Unicode เริ่มต้น</type>
-			<type type="eor" key="collation" draft="contributed">กฎการเรียงลำดับตามแบบยุโรป</type>
-			<type type="ethi" key="numbers">ตัวเลขเอธิโอเปีย</type>
-			<type type="ethiopic" key="calendar">ปฏิทินเอธิโอเปีย</type>
-			<type type="ethiopic-amete-alem" key="calendar" draft="contributed">ปฏิทินปีโลกเอธิโอเปีย</type>
-			<type type="finance" key="numbers" draft="contributed">ตัวเลขทางการเงิน</type>
-			<type type="fullwide" key="numbers">ตัวเลขแบบเต็มขนาด</type>
-			<type type="gb2312han" key="collation">เรียงตามอักษรจีนประยุกต์</type>
-			<type type="geor" key="numbers">ตัวเลขจอร์เจีย</type>
-			<type type="gregorian" key="calendar">ปฏิทินเกรกอเรียน</type>
-			<type type="grek" key="numbers">ตัวเลขกรีก</type>
-			<type type="greklow" key="numbers">ตัวเลขกรีกพิมพ์เล็ก</type>
-			<type type="gujr" key="numbers">ตัวเลขคุชราต</type>
-			<type type="guru" key="numbers">ตัวเลขกูร์มูคี</type>
-			<type type="hanidec" key="numbers">ตัวเลขทศนิยมจีน</type>
-			<type type="hans" key="numbers">ตัวเลขจีนตัวย่อ</type>
-			<type type="hansfin" key="numbers">ตัวเลขทางการเงินแบบตัวย่อของจีน</type>
-			<type type="hant" key="numbers">ตัวเลขจีนตัวเต็ม</type>
-			<type type="hantfin" key="numbers">ตัวเลขทางการเงินแบบตัวเต็มของจีน</type>
-			<type type="hebr" key="numbers">ตัวเลขฮิบรู</type>
-			<type type="hebrew" key="calendar">ปฏิทินฮิบรู</type>
-			<type type="identical" key="colStrength" draft="contributed">จัดเรียงทั้งหมด</type>
-			<type type="indian" key="calendar">ปฏิทินแห่งชาติอินเดีย</type>
-			<type type="islamic" key="calendar">ปฏิทินอิสลาม</type>
-			<type type="islamic-civil" key="calendar">ปฏิทินอิสลามซีวิล</type>
-			<type type="islamic-rgsa" key="calendar" draft="contributed">ปฏิทินอิสลาม (ซาอุดีอาระเบีย แบบพระจันทร์เสี้ยว)</type>
-			<type type="islamic-tbla" key="calendar" draft="contributed">ปฏิทินอิสลาม (แบบตาราง สมัยดาราศาสตร์)</type>
-			<type type="islamic-umalqura" key="calendar" draft="contributed">ปฏิทินอิสลาม (อุมม์อัลกุรา)</type>
-			<type type="iso8601" key="calendar">ปฏิทิน ISO-8601</type>
-			<type type="japanese" key="calendar">ปฏิทินญี่ปุ่น</type>
-			<type type="java" key="numbers">ตัวเลขชวา</type>
-			<type type="jpan" key="numbers">ตัวเลขญี่ปุ่น</type>
-			<type type="jpanfin" key="numbers">ตัวเลขทางการเงินของญี่ปุ่น</type>
-			<type type="kali" key="numbers">ตัวเลขคยาห์</type>
-			<type type="khmr" key="numbers">ตัวเลขเขมร</type>
-			<type type="knda" key="numbers">ตัวเลขกันนาดา</type>
-			<type type="lana" key="numbers">ตัวเลขไททัมโฮรา</type>
-			<type type="lanatham" key="numbers">ตัวเลขไททัมทัม</type>
-			<type type="laoo" key="numbers">ตัวเลขลาว</type>
-			<type type="latn" key="numbers">ตัวเลขอารบิค</type>
-			<type type="lepc" key="numbers">ตัวเลขเลปชา</type>
-			<type type="limb" key="numbers">ตัวเลขลิมบู</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">จัดเรียงลำดับตัวพิมพ์เล็กก่อน</type>
-			<type type="mlym" key="numbers">ตัวเลขมาลายาลัม</type>
-			<type type="mong" key="numbers">ตัวเลขมองโกเลีย</type>
-			<type type="mtei" key="numbers">ตัวเลขเมไตมาเยก</type>
-			<type type="mymr" key="numbers">ตัวเลขพม่า</type>
-			<type type="mymrshan" key="numbers">ตัวเลขชานพม่า</type>
-			<type type="native" key="numbers" draft="contributed">ตัวเลขพื้นเมือง</type>
-			<type type="nkoo" key="numbers">ตัวเลขเอ็นโก</type>
-			<type type="no" key="colBackwards" draft="contributed">จัดเรียงเสียงหนักเบาตามปกติ</type>
-			<type type="no" key="colCaseFirst" draft="contributed">จัดเรียงลำดับตามตัวพิมพ์ปกติ</type>
-			<type type="no" key="colCaseLevel" draft="contributed">จัดเรียงตามความสำคัญของตัวพิมพ์</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">จัดเรียงตัวอักษรคะนะแยกต่างหาก</type>
-			<type type="no" key="colNormalization" draft="contributed">จัดเรียงโดยไม่ต้องทำให้เป็นแบบปกติ</type>
-			<type type="no" key="colNumeric" draft="contributed">จัดเรียงตัวเลขแยก</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">จัดเรียงสัญลักษณ์</type>
-			<type type="olck" key="numbers">ตัวเลขโอลจิกิ</type>
-			<type type="orya" key="numbers">ตัวเลขโอริยา</type>
-			<type type="osma" key="numbers" draft="contributed">ตัวเลขออสมันยา</type>
-			<type type="persian" key="calendar">ปฏิทินเปอร์เชีย</type>
-			<type type="phonebook" key="collation">เรียงตามสมุดโทรศัพท์</type>
-			<type type="phonetic" key="collation" draft="contributed">ลำดักการจัดเรียงตามคำอ่าน</type>
-			<type type="pinyin" key="collation">เรียงตามการถอดเสียงภาษาจีน</type>
-			<type type="primary" key="colStrength" draft="contributed">จัดเรียงตัวอักษรฐานเท่านั้น</type>
-			<type type="quaternary" key="colStrength" draft="contributed">จัดเรียงตามเสียงหนักเบา/ตัวพิมพ์/ความกว้าง/ตัวอักษรคะนะ</type>
-			<type type="reformed" key="collation" draft="contributed">เรียงตามลำดับล่าสุด</type>
-			<type type="roc" key="calendar">ปฏิทินไต้หวัน</type>
-			<type type="roman" key="numbers">ตัวเลขโรมัน</type>
-			<type type="romanlow" key="numbers">ตัวเลขโรมันพิมพ์เล็ก</type>
-			<type type="saur" key="numbers">ตัวเลขเศารัชธรา</type>
-			<type type="search" key="collation">การค้นหาทั่วไป</type>
-			<type type="searchjl" key="collation" draft="contributed">ค้นหาตามพยัญชนะขึ้นต้นที่เป็นฮันกึล</type>
-			<type type="secondary" key="colStrength" draft="contributed">จัดเรียงเสียงหนักเบา</type>
-			<type type="shifted" key="colAlternate" draft="contributed">จัดเรียงสัญลักษณ์ที่ละไว้</type>
-			<type type="shrd" key="numbers" draft="contributed">ตัวเลขชาราดา</type>
-			<type type="sora" key="numbers" draft="contributed">ตัวเลขโสราสมเป็ง</type>
-			<type type="standard" key="collation">ลำดับการจัดเรียงแบบมาตรฐาน</type>
-			<type type="stroke" key="collation">เรียงตามการลากเส้น</type>
-			<type type="sund" key="numbers">ตัวเลขซุนดา</type>
-			<type type="takr" key="numbers" draft="contributed">ตัวเลขทาครี</type>
-			<type type="talu" key="numbers">ตัวเลขไทลื้อใหม่</type>
-			<type type="taml" key="numbers">ตัวเลขทมิฬดั้งเดิม</type>
-			<type type="tamldec" key="numbers">ตัวเลขทมิฬ</type>
-			<type type="telu" key="numbers">ตัวเลขเตลูกู</type>
-			<type type="tertiary" key="colStrength" draft="contributed">จัดเรียงเสียงหนักเบา/ตัวพิมพ์/ความกว้าง</type>
-			<type type="thai" key="numbers">ตัวเลขไทย</type>
-			<type type="tibt" key="numbers">ตัวเลขทิเบต</type>
-			<type type="traditional" key="collation">เรียงตามแบบดั้งเดิม</type>
-			<type type="traditional" key="numbers" draft="contributed">ตัวเลขแบบดั้งเดิม</type>
-			<type type="unihan" key="collation" draft="contributed">เรียงลำดับตามจำนวนขีด</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">จัดเรียงตัวพิมพ์ใหญ่ก่อน</type>
-			<type type="vaii" key="numbers" draft="contributed">ตัวเลขไว</type>
-			<type type="yes" key="colBackwards" draft="contributed">จัดเรียงเสียงหนักเบาในลำดับถอยหลัง</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">จัดเรียงความสำคัญของตัวพิมพ์</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">จัดเรียงตัวอักษรคะนะในแบบอื่น</type>
-			<type type="yes" key="colNormalization" draft="contributed">จัดเรียงยูนิโค้ดแบบที่เป็นปกติ</type>
-			<type type="yes" key="colNumeric" draft="contributed">จัดเรัยงตัวเลขตามลำดับตัวเลข</type>
-			<type type="zhuyin" key="collation" draft="contributed">จัดเรียงตามการสะกดแบบจู้อิน</type>
+			<type key="calendar" type="buddhist">ปฏิทินพุทธ</type>
+			<type key="calendar" type="chinese">ปฏิทินจีน</type>
+			<type key="calendar" type="coptic" draft="contributed">ปฏิทินคอปติก</type>
+			<type key="calendar" type="dangi">ปฏิทินทันกิ</type>
+			<type key="calendar" type="ethiopic">ปฏิทินเอธิโอเปีย</type>
+			<type key="calendar" type="ethiopic-amete-alem" draft="contributed">ปฏิทินปีโลกเอธิโอเปีย</type>
+			<type key="calendar" type="gregorian">ปฏิทินเกรกอเรียน</type>
+			<type key="calendar" type="hebrew">ปฏิทินฮิบรู</type>
+			<type key="calendar" type="indian">ปฏิทินแห่งชาติอินเดีย</type>
+			<type key="calendar" type="islamic">ปฏิทินอิสลาม</type>
+			<type key="calendar" type="islamic-civil">ปฏิทินอิสลามซีวิล</type>
+			<type key="calendar" type="islamic-rgsa" draft="contributed">ปฏิทินอิสลาม (ซาอุดีอาระเบีย แบบพระจันทร์เสี้ยว)</type>
+			<type key="calendar" type="islamic-tbla" draft="contributed">ปฏิทินอิสลาม (แบบตาราง สมัยดาราศาสตร์)</type>
+			<type key="calendar" type="islamic-umalqura" draft="contributed">ปฏิทินอิสลาม (อุมม์อัลกุรา)</type>
+			<type key="calendar" type="iso8601">ปฏิทิน ISO-8601</type>
+			<type key="calendar" type="japanese">ปฏิทินญี่ปุ่น</type>
+			<type key="calendar" type="persian">ปฏิทินเปอร์เชีย</type>
+			<type key="calendar" type="roc">ปฏิทินไต้หวัน</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">จัดเรียงสัญลักษณ์</type>
+			<type key="colAlternate" type="shifted" draft="contributed">จัดเรียงสัญลักษณ์ที่ละไว้</type>
+			<type key="colBackwards" type="no" draft="contributed">จัดเรียงเสียงหนักเบาตามปกติ</type>
+			<type key="colBackwards" type="yes" draft="contributed">จัดเรียงเสียงหนักเบาในลำดับถอยหลัง</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">จัดเรียงลำดับตัวพิมพ์เล็กก่อน</type>
+			<type key="colCaseFirst" type="no" draft="contributed">จัดเรียงลำดับตามตัวพิมพ์ปกติ</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">จัดเรียงตัวพิมพ์ใหญ่ก่อน</type>
+			<type key="colCaseLevel" type="no" draft="contributed">จัดเรียงตามความสำคัญของตัวพิมพ์</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">จัดเรียงความสำคัญของตัวพิมพ์</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">จัดเรียงตัวอักษรคะนะแยกต่างหาก</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">จัดเรียงตัวอักษรคะนะในแบบอื่น</type>
+			<type key="collation" type="big5han">เรียงตามอักษรจีนดั้งเดิม</type>
+			<type key="collation" type="dictionary" draft="contributed">เรียงตามพจนานุกรม</type>
+			<type key="collation" type="ducet">ลำดับการจัดเรียงตาม Unicode เริ่มต้น</type>
+			<type key="collation" type="eor" draft="contributed">กฎการเรียงลำดับตามแบบยุโรป</type>
+			<type key="collation" type="gb2312han">เรียงตามอักษรจีนประยุกต์</type>
+			<type key="collation" type="phonebook">เรียงตามสมุดโทรศัพท์</type>
+			<type key="collation" type="phonetic" draft="contributed">ลำดักการจัดเรียงตามคำอ่าน</type>
+			<type key="collation" type="pinyin">เรียงตามการถอดเสียงภาษาจีน</type>
+			<type key="collation" type="reformed" draft="contributed">เรียงตามลำดับล่าสุด</type>
+			<type key="collation" type="search">การค้นหาทั่วไป</type>
+			<type key="collation" type="searchjl" draft="contributed">ค้นหาตามพยัญชนะขึ้นต้นที่เป็นฮันกึล</type>
+			<type key="collation" type="standard">ลำดับการจัดเรียงแบบมาตรฐาน</type>
+			<type key="collation" type="stroke">เรียงตามการลากเส้น</type>
+			<type key="collation" type="traditional">เรียงตามแบบดั้งเดิม</type>
+			<type key="collation" type="unihan" draft="contributed">เรียงลำดับตามจำนวนขีด</type>
+			<type key="collation" type="zhuyin" draft="contributed">จัดเรียงตามการสะกดแบบจู้อิน</type>
+			<type key="colNormalization" type="no" draft="contributed">จัดเรียงโดยไม่ต้องทำให้เป็นแบบปกติ</type>
+			<type key="colNormalization" type="yes" draft="contributed">จัดเรียงยูนิโค้ดแบบที่เป็นปกติ</type>
+			<type key="colNumeric" type="no" draft="contributed">จัดเรียงตัวเลขแยก</type>
+			<type key="colNumeric" type="yes" draft="contributed">จัดเรัยงตัวเลขตามลำดับตัวเลข</type>
+			<type key="colStrength" type="identical" draft="contributed">จัดเรียงทั้งหมด</type>
+			<type key="colStrength" type="primary" draft="contributed">จัดเรียงตัวอักษรฐานเท่านั้น</type>
+			<type key="colStrength" type="quaternary" draft="contributed">จัดเรียงตามเสียงหนักเบา/ตัวพิมพ์/ความกว้าง/ตัวอักษรคะนะ</type>
+			<type key="colStrength" type="secondary" draft="contributed">จัดเรียงเสียงหนักเบา</type>
+			<type key="colStrength" type="tertiary" draft="contributed">จัดเรียงเสียงหนักเบา/ตัวพิมพ์/ความกว้าง</type>
+			<type key="hc" type="h11">ระบบ 12 ชั่วโมง (0–11)</type>
+			<type key="hc" type="h12">ระบบ 12 ชั่วโมง (1–12)</type>
+			<type key="hc" type="h23">ระบบ 24 ชั่วโมง (0–23)</type>
+			<type key="hc" type="h24">ระบบ 24 ชั่วโมง (1–24)</type>
+			<type key="lb" type="loose">รูปแบบที่ยืดหยุ่นของการขึ้นบรรทัดใหม่</type>
+			<type key="lb" type="normal">รูปแบบปกติของการขึ้นบรรทัดใหม่</type>
+			<type key="lb" type="strict">รูปแบบที่เคร่งครัดของการขึ้นบรรทัดใหม่</type>
+			<type key="ms" type="metric">ระบบเมตริก</type>
+			<type key="ms" type="uksystem">ระบบการวัดอิมพีเรียล</type>
+			<type key="ms" type="ussystem">ระบบการวัดอเมริกัน</type>
+			<type key="numbers" type="arab">ตัวเลขอินเดีย-อารบิก</type>
+			<type key="numbers" type="arabext">ตัวเลขอินเดีย-อารบิกตัวเต็ม</type>
+			<type key="numbers" type="armn">ตัวเลขอาร์เมเนีย</type>
+			<type key="numbers" type="armnlow">ตัวเลขอาร์เมเนียพิมพ์เล็ก</type>
+			<type key="numbers" type="bali">ตัวเลขบาหลี</type>
+			<type key="numbers" type="beng">ตัวเลขบังกลาเทศ</type>
+			<type key="numbers" type="brah" draft="contributed">ตัวเลขพราหมี</type>
+			<type key="numbers" type="cakm" draft="contributed">ตัวเลขชากมา</type>
+			<type key="numbers" type="cham">ตัวเลขชาม</type>
+			<type key="numbers" type="deva">ตัวเลขเทวนาครี</type>
+			<type key="numbers" type="ethi">ตัวเลขเอธิโอเปีย</type>
+			<type key="numbers" type="finance" draft="contributed">ตัวเลขทางการเงิน</type>
+			<type key="numbers" type="fullwide">ตัวเลขแบบเต็มขนาด</type>
+			<type key="numbers" type="geor">ตัวเลขจอร์เจีย</type>
+			<type key="numbers" type="grek">ตัวเลขกรีก</type>
+			<type key="numbers" type="greklow">ตัวเลขกรีกพิมพ์เล็ก</type>
+			<type key="numbers" type="gujr">ตัวเลขคุชราต</type>
+			<type key="numbers" type="guru">ตัวเลขกูร์มูคี</type>
+			<type key="numbers" type="hanidec">ตัวเลขทศนิยมจีน</type>
+			<type key="numbers" type="hans">ตัวเลขจีนตัวย่อ</type>
+			<type key="numbers" type="hansfin">ตัวเลขทางการเงินแบบตัวย่อของจีน</type>
+			<type key="numbers" type="hant">ตัวเลขจีนตัวเต็ม</type>
+			<type key="numbers" type="hantfin">ตัวเลขทางการเงินแบบตัวเต็มของจีน</type>
+			<type key="numbers" type="hebr">ตัวเลขฮิบรู</type>
+			<type key="numbers" type="java">ตัวเลขชวา</type>
+			<type key="numbers" type="jpan">ตัวเลขญี่ปุ่น</type>
+			<type key="numbers" type="jpanfin">ตัวเลขทางการเงินของญี่ปุ่น</type>
+			<type key="numbers" type="kali">ตัวเลขคยาห์</type>
+			<type key="numbers" type="khmr">ตัวเลขเขมร</type>
+			<type key="numbers" type="knda">ตัวเลขกันนาดา</type>
+			<type key="numbers" type="lana">ตัวเลขไททัมโฮรา</type>
+			<type key="numbers" type="lanatham">ตัวเลขไททัมทัม</type>
+			<type key="numbers" type="laoo">ตัวเลขลาว</type>
+			<type key="numbers" type="latn">ตัวเลขอารบิค</type>
+			<type key="numbers" type="lepc">ตัวเลขเลปชา</type>
+			<type key="numbers" type="limb">ตัวเลขลิมบู</type>
+			<type key="numbers" type="mlym">ตัวเลขมาลายาลัม</type>
+			<type key="numbers" type="mong">ตัวเลขมองโกเลีย</type>
+			<type key="numbers" type="mtei">ตัวเลขเมไตมาเยก</type>
+			<type key="numbers" type="mymr">ตัวเลขพม่า</type>
+			<type key="numbers" type="mymrshan">ตัวเลขชานพม่า</type>
+			<type key="numbers" type="native" draft="contributed">ตัวเลขพื้นเมือง</type>
+			<type key="numbers" type="nkoo">ตัวเลขเอ็นโก</type>
+			<type key="numbers" type="olck">ตัวเลขโอลจิกิ</type>
+			<type key="numbers" type="orya">ตัวเลขโอริยา</type>
+			<type key="numbers" type="osma" draft="contributed">ตัวเลขออสมันยา</type>
+			<type key="numbers" type="roman">ตัวเลขโรมัน</type>
+			<type key="numbers" type="romanlow">ตัวเลขโรมันพิมพ์เล็ก</type>
+			<type key="numbers" type="saur">ตัวเลขเศารัชธรา</type>
+			<type key="numbers" type="shrd" draft="contributed">ตัวเลขชาราดา</type>
+			<type key="numbers" type="sora" draft="contributed">ตัวเลขโสราสมเป็ง</type>
+			<type key="numbers" type="sund">ตัวเลขซุนดา</type>
+			<type key="numbers" type="takr" draft="contributed">ตัวเลขทาครี</type>
+			<type key="numbers" type="talu">ตัวเลขไทลื้อใหม่</type>
+			<type key="numbers" type="taml">ตัวเลขทมิฬดั้งเดิม</type>
+			<type key="numbers" type="tamldec">ตัวเลขทมิฬ</type>
+			<type key="numbers" type="telu">ตัวเลขเตลูกู</type>
+			<type key="numbers" type="thai">ตัวเลขไทย</type>
+			<type key="numbers" type="tibt">ตัวเลขทิเบต</type>
+			<type key="numbers" type="traditional" draft="contributed">ตัวเลขแบบดั้งเดิม</type>
+			<type key="numbers" type="vaii" draft="contributed">ตัวเลขไว</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">ชื่อมาตรฐานอังกฤษ (BGN)</transformName>
@@ -1323,10 +1341,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</codePatterns>
 	</localeDisplayNames>
 	<characters>
-		<exemplarCharacters>[\u0E4E \u0E47 \u0E48 \u0E49 \u0E4A \u0E4B \u0E4C \u0E4D ๆ ก ข ฃ ค ฅ ฆ ง จ ฉ ช ซ ฌ ญ ฎ ฏ ฐ ฑ ฒ ณ ด ต ถ ท ธ น บ ป ผ ฝ พ ฟ ภ ม ย ร ฤ ล ฦ ว ศ ษ ส ห ฬ อ ฮ ฯ ะ \u0E31 า ำ \u0E34 \u0E35 \u0E36 \u0E37 \u0E38 \u0E39 \u0E3A เ แ โ ใ ไ ๅ]</exemplarCharacters>
+		<exemplarCharacters>[ฯ ๆ \u0E4E \u0E4C \u0E47 \u0E48 \u0E49 \u0E4A \u0E4B ก ข ฃ ค ฅ ฆ ง จ ฉ ช ซ ฌ ญ ฎ ฏ ฐ ฑ ฒ ณ ด ต ถ ท ธ น บ ป ผ ฝ พ ฟ ภ ม ย ร ฤ ล ฦ ว ศ ษ ส ห ฬ อ ฮ \u0E4D ะ \u0E31 า ๅ ำ \u0E34 \u0E35 \u0E36 \u0E37 \u0E38 \u0E39 เ แ โ ใ ไ \u0E3A]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[\u200B]</exemplarCharacters>
 		<exemplarCharacters type="index" draft="contributed">[ก ข ฃ ค ฅ ฆ ง จ ฉ ช ซ ฌ ญ ฎ ฏ ฐ ฑ ฒ ณ ด ต ถ ท ธ น บ ป ผ ฝ พ ฟ ภ ม ย ร ฤ ล ฦ ว ศ ษ ส ห ฬ อ ฮ]</exemplarCharacters>
-		<exemplarCharacters type="punctuation">[\- ‐ – — , \: ! . … ' ‘ ’ &quot; “ ” ( ) \[ \] @ * / # ′ ″]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[! &quot; # ' ( ) * , \- . / \: @ \[ \] ‐ – — ‘ ’ “ ” … ′ ″]</exemplarCharacters>
 		<ellipsis type="final">{0}…</ellipsis>
 		<ellipsis type="initial">…{0}</ellipsis>
 		<ellipsis type="medial">{0}…{1}</ellipsis>
@@ -1377,6 +1395,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">G y</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM G y</dateFormatItem>
@@ -2204,6 +2223,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">G y</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM G y</dateFormatItem>
@@ -2223,6 +2243,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEEEEd">EEEEที่ d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">G y</dateFormatItem>
 						<dateFormatItem id="yyyy">G y</dateFormatItem>
@@ -2233,6 +2254,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMMd">d MMM G y</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E d MMM G y</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEEEEd">EEEEที่ d MMM G y</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM" draft="contributed">MMMM G y</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">QQQ G y</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">QQQQ G y</dateFormatItem>
 					</availableFormats>
@@ -2555,15 +2577,71 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">a</dayPeriod>
-							<dayPeriod type="noon">n</dayPeriod>
-							<dayPeriod type="pm">p</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">เที่ยงคืน</dayPeriod>
 							<dayPeriod type="am">ก่อนเที่ยง</dayPeriod>
 							<dayPeriod type="noon">เที่ยง</dayPeriod>
 							<dayPeriod type="pm">หลังเที่ยง</dayPeriod>
+							<dayPeriod type="morning1">ในตอนเช้า</dayPeriod>
+							<dayPeriod type="afternoon1">ในตอนบ่าย</dayPeriod>
+							<dayPeriod type="afternoon2">บ่าย</dayPeriod>
+							<dayPeriod type="evening1">ในตอนเย็น</dayPeriod>
+							<dayPeriod type="evening2">ค่ำ</dayPeriod>
+							<dayPeriod type="night1">กลางคืน</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">เที่ยงคืน</dayPeriod>
+							<dayPeriod type="am">a</dayPeriod>
+							<dayPeriod type="noon">n</dayPeriod>
+							<dayPeriod type="pm">p</dayPeriod>
+							<dayPeriod type="morning1">เช้า</dayPeriod>
+							<dayPeriod type="afternoon1">เที่ยง</dayPeriod>
+							<dayPeriod type="afternoon2">บ่าย</dayPeriod>
+							<dayPeriod type="evening1">เย็น</dayPeriod>
+							<dayPeriod type="evening2">ค่ำ</dayPeriod>
+							<dayPeriod type="night1">กลางคืน</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">เที่ยงคืน</dayPeriod>
+							<dayPeriod type="am">ก่อนเที่ยง</dayPeriod>
+							<dayPeriod type="noon">เที่ยง</dayPeriod>
+							<dayPeriod type="pm">หลังเที่ยง</dayPeriod>
+							<dayPeriod type="morning1">ในตอนเช้า</dayPeriod>
+							<dayPeriod type="afternoon1">ในตอนบ่าย</dayPeriod>
+							<dayPeriod type="afternoon2">บ่าย</dayPeriod>
+							<dayPeriod type="evening1">ในตอนเย็น</dayPeriod>
+							<dayPeriod type="evening2">ค่ำ</dayPeriod>
+							<dayPeriod type="night1">กลางคืน</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">ก่อนเที่ยง</dayPeriod>
+							<dayPeriod type="pm">หลังเที่ยง</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">เที่ยงคืน</dayPeriod>
+							<dayPeriod type="am">ก่อนเที่ยง</dayPeriod>
+							<dayPeriod type="noon">เที่ยง</dayPeriod>
+							<dayPeriod type="pm">หลังเที่ยง</dayPeriod>
+							<dayPeriod type="morning1">เช้า</dayPeriod>
+							<dayPeriod type="afternoon1">ช่วงเที่ยง</dayPeriod>
+							<dayPeriod type="afternoon2">บ่าย</dayPeriod>
+							<dayPeriod type="evening1">เย็น</dayPeriod>
+							<dayPeriod type="evening2">ค่ำ</dayPeriod>
+							<dayPeriod type="night1">กลางคืน</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">เที่ยงคืน</dayPeriod>
+							<dayPeriod type="am">ก่อนเที่ยง</dayPeriod>
+							<dayPeriod type="noon">เที่ยง</dayPeriod>
+							<dayPeriod type="pm">หลังเที่ยง</dayPeriod>
+							<dayPeriod type="morning1">เช้า</dayPeriod>
+							<dayPeriod type="afternoon1">ช่วงเที่ยง</dayPeriod>
+							<dayPeriod type="afternoon2">บ่าย</dayPeriod>
+							<dayPeriod type="evening1">เย็น</dayPeriod>
+							<dayPeriod type="evening2">ค่ำ</dayPeriod>
+							<dayPeriod type="night1">กลางคืน</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -2657,7 +2735,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
-						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
+						<dateFormatItem id="EHm">E HH:mm น.</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">G y</dateFormatItem>
@@ -2668,7 +2746,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">HH</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
-						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
+						<dateFormatItem id="Hm">HH:mm น.</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
@@ -2723,8 +2801,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hm">
-							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="H">HH:mm น. – HH:mm น.</greatestDifference>
+							<greatestDifference id="m">HH:mm น. – HH:mm น.</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
 							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
@@ -2732,8 +2810,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H">H:mm–H:mm v</greatestDifference>
-							<greatestDifference id="m">H:mm–H:mm v</greatestDifference>
+							<greatestDifference id="H">H:mm น. – H:mm น. v</greatestDifference>
+							<greatestDifference id="m">H:mm น. – H:mm น. v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a">h a – h a v</greatestDifference>
@@ -3060,10 +3138,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<monthWidth type="abbreviated">
 							<month type="1" draft="contributed">มุฮัร.</month>
 							<month type="2" draft="contributed">เศาะ.</month>
-							<month type="3" draft="contributed">รอบี 1</month>
-							<month type="4" draft="contributed">รอบี 2</month>
-							<month type="5" draft="contributed">ญุมา 1</month>
-							<month type="6" draft="contributed">ญุมา 2</month>
+							<month type="3" draft="contributed">รอบี I</month>
+							<month type="4" draft="contributed">รอบี II</month>
+							<month type="5" draft="contributed">จุมาดา I</month>
+							<month type="6" draft="contributed">จุมาดา II</month>
 							<month type="7" draft="contributed">เราะ.</month>
 							<month type="8" draft="contributed">ชะอ์.</month>
 							<month type="9" draft="contributed">เราะมะ.</month>
@@ -3104,10 +3182,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<monthWidth type="abbreviated">
 							<month type="1" draft="contributed">มุฮัร.</month>
 							<month type="2" draft="contributed">เศาะ.</month>
-							<month type="3" draft="contributed">รอบี 1</month>
-							<month type="4" draft="contributed">รอบี 2</month>
-							<month type="5" draft="contributed">ญุมา 1</month>
-							<month type="6" draft="contributed">ญุมา 2</month>
+							<month type="3" draft="contributed">รอบี I</month>
+							<month type="4" draft="contributed">รอบี II</month>
+							<month type="5" draft="contributed">จุมาดา I</month>
+							<month type="6" draft="contributed">จุมาดา II</month>
 							<month type="7" draft="contributed">เราะ.</month>
 							<month type="8" draft="contributed">ชะอ์.</month>
 							<month type="9" draft="contributed">เราะมะ.</month>
@@ -3205,238 +3283,238 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<calendar type="japanese">
 				<eras>
 					<eraAbbr>
-						<era type="0">ทะอิกะ (645-650)</era>
-						<era type="1">ฮะกุชิ (650-671)</era>
-						<era type="2">ฮากุโฮ (672-686)</era>
-						<era type="3">ชุโช (686-701)</era>
-						<era type="4">ทะอิโฮ (701-704)</era>
-						<era type="5">เคอุง (704-708)</era>
-						<era type="6">วะโด (708-715)</era>
-						<era type="7">เรกิ (715-717)</era>
-						<era type="8">โยโร (717-724)</era>
-						<era type="9">จิงกิ (724-729)</era>
-						<era type="10">เท็มเพียว (729-749)</era>
+						<era type="0">ทะอิกะ (645–650)</era>
+						<era type="1">ฮะกุชิ (650–671)</era>
+						<era type="2">ฮากุโฮ (672–686)</era>
+						<era type="3">ชุโช (686–701)</era>
+						<era type="4">ทะอิโฮ (701–704)</era>
+						<era type="5">เคอุง (704–708)</era>
+						<era type="6">วะโด (708–715)</era>
+						<era type="7">เรกิ (715–717)</era>
+						<era type="8">โยโร (717–724)</era>
+						<era type="9">จิงกิ (724–729)</era>
+						<era type="10">เท็มเพียว (729–749)</era>
 						<era type="11">เท็มเพียว-คัมโป (749-749)</era>
 						<era type="12">เท็มเพียว-โชโฮ (749-757)</era>
 						<era type="13">เท็มเพียว-โฮจิ (757-765)</era>
 						<era type="14">เท็มเพียว-จิงโงะ (765-767)</era>
 						<era type="15">จิงโงะ-เคอุง (767-770)</era>
-						<era type="16">โฮกิ (770-780)</era>
-						<era type="17">เท็นโอ (781-782)</era>
-						<era type="18">เอ็นเรียะกุ (782-806)</era>
-						<era type="19">ดะอิโด (806-810)</era>
-						<era type="20">โคนิง (810-824)</era>
-						<era type="21">เท็นโช (824-834)</era>
-						<era type="22">โชวะ (834-848)</era>
-						<era type="23">คะโจ (848-851)</era>
-						<era type="24">นินจุ (851-854)</era>
-						<era type="25">ซะอิโกะ (854-857)</era>
-						<era type="26">เท็นนัง (857-859)</era>
-						<era type="27">โจงัง (859-877)</era>
-						<era type="28">เก็งเก (877-885)</era>
-						<era type="29">นินนะ (885-889)</era>
-						<era type="30">คัมเพียว (889-898)</era>
-						<era type="31">โชตะอิ (898-901)</era>
-						<era type="32">เอ็งงิ (901-923)</era>
-						<era type="33">เอ็นโช (923-931)</era>
-						<era type="34">โชเฮ (931-938)</era>
-						<era type="35">เท็งเงียว (938-947)</era>
-						<era type="36">เท็นเรียะกุ (947-957)</era>
-						<era type="37">เท็นโตะกุ (957-961)</era>
-						<era type="38">โอวะ (961-964)</era>
-						<era type="39">โคโฮ (964-968)</era>
-						<era type="40">อันนะ (968-970)</era>
-						<era type="41">เท็นโระกุ (970-973)</era>
-						<era type="42">เท็นเอ็ง (973-976)</era>
-						<era type="43">โจเง็ง (976-978)</era>
-						<era type="44">เท็งเง็ง (978-983)</era>
-						<era type="45">เอกัง (983-985)</era>
-						<era type="46">คันนะ (985-987)</era>
-						<era type="47">เอเอ็ง (987-989)</era>
-						<era type="48">เอโซ (989-990)</era>
-						<era type="49">โชเรียะกุ (990-995)</era>
-						<era type="50">โชโตะกุ (995-999)</era>
-						<era type="51">โชโฮ (999-1004)</era>
-						<era type="52">คันโก (1004-1012)</era>
-						<era type="53">โชวะ (1012-1017)</era>
-						<era type="54">คันนิง (1017-1021)</era>
-						<era type="55">จิอัง (1021-1024)</era>
-						<era type="56">มันจุ (1024-1028)</era>
-						<era type="57">โชเง็ง (1028-1037)</era>
-						<era type="58">โชเรียะกุ (1037-1040)</era>
-						<era type="59">โชคีว (1040-1044)</era>
-						<era type="60">คันโตะกุ (1044-1046)</era>
-						<era type="61">เอโช (1046-1053)</era>
-						<era type="62">เท็งงิ (1053-1058)</era>
-						<era type="63">โคเฮ (1058-1065)</era>
-						<era type="64">จิเรียะกุ (1065-1069)</era>
-						<era type="65">เอ็งคีว (1069-1074)</era>
-						<era type="66">โชโฮ (1074-1077)</era>
-						<era type="67">โชเรียะกุ (1077-1081)</era>
-						<era type="68">เอโฮะ (1081-1084)</era>
-						<era type="69">โอโตะกุ (1084-1087)</era>
-						<era type="70">คันจิ (1087-1094)</era>
-						<era type="71">คะโฮะ (1094-1096)</era>
-						<era type="72">เอโช (1096-1097)</era>
-						<era type="73">โชโตะกุ (1097-1099)</era>
-						<era type="74">โควะ (1099-1104)</era>
-						<era type="75">โชจิ (1104-1106)</era>
-						<era type="76">คะโช (1106-1108)</era>
-						<era type="77">เท็นนิง (1108-1110)</era>
-						<era type="78">เท็นเอ (1110-1113)</era>
-						<era type="79">เอกีว (1113-1118)</era>
-						<era type="80">เก็นเอ (1118-1120)</era>
-						<era type="81">โฮะอัง (1120-1124)</era>
-						<era type="82">เท็นจิ (1124-1126)</era>
-						<era type="83">ดะอิจิ (1126-1131)</era>
-						<era type="84">เท็นโช (1131-1132)</era>
-						<era type="85">โชโช (1132-1135)</era>
-						<era type="86">โฮะเอ็ง (1135-1141)</era>
-						<era type="87">เอจิ (1141-1142)</era>
-						<era type="88">โคจิ (1142-1144)</era>
-						<era type="89">เท็นโย (1144-1145)</era>
-						<era type="90">คีวอัง (1145-1151)</era>
-						<era type="91">นิมเป (1151-1154)</era>
-						<era type="92">คีวจุ (1154-1156)</era>
-						<era type="93">โฮะเง็ง (1156-1159)</era>
-						<era type="94">เฮจิ (1159-1160)</era>
-						<era type="95">เอเรียะกุ (1160-1161)</era>
-						<era type="96">โอโฮ (1161-1163)</era>
-						<era type="97">โชกัง (1163-1165)</era>
-						<era type="98">เอมัง (1165-1166)</era>
-						<era type="99">นินอัง (1166-1169)</era>
-						<era type="100">คะโอ (1169-1171)</era>
-						<era type="101">โชอัง (1171-1175)</era>
-						<era type="102">อังเง็ง (1175-1177)</era>
-						<era type="103">จิโช (1177-1181)</era>
-						<era type="104">โยวะ (1181-1182)</era>
-						<era type="105">จุเอ (1182-1184)</era>
-						<era type="106">เก็นเรียะกุ (1184-1185)</era>
-						<era type="107">บุนจิ (1185-1190)</era>
-						<era type="108">เค็งกีว (1190-1199)</era>
-						<era type="109">โชจิ (1199-1201)</era>
-						<era type="110">เค็นนิง (1201-1204)</era>
-						<era type="111">เก็งกีว (1204-1206)</era>
-						<era type="112">เค็นเอ (1206-1207)</era>
-						<era type="113">โชเก็ง (1207-1211)</era>
-						<era type="114">เค็นเรียะกุ (1211-1213)</era>
-						<era type="115">เค็มโป (1213-1219)</era>
-						<era type="116">โชกีว (1219-1222)</era>
-						<era type="117">โจโอ (1222-1224)</era>
-						<era type="118">เก็นนิง (1224-1225)</era>
-						<era type="119">คะโระกุ (1225-1227)</era>
-						<era type="120">อันเต (1227-1229)</era>
-						<era type="121">คังกิ (1229-1232)</era>
-						<era type="122">โจเอ (1232-1233)</era>
-						<era type="123">เท็มปุกุ (1233-1234)</era>
-						<era type="124">บุนเรียะกุ (1234-1235)</era>
-						<era type="125">คะเต (1235-1238)</era>
-						<era type="126">เรียะกุนิง (1238-1239)</era>
-						<era type="127">เอ็นโอ (1239-1240)</era>
-						<era type="128">นินจิ (1240-1243)</era>
-						<era type="129">คังเง็ง (1243-1247)</era>
-						<era type="130">โฮจิ (1247-1249)</era>
-						<era type="131">เค็นโช (1249-1256)</era>
-						<era type="132">โคเง็ง (1256-1257)</era>
-						<era type="133">โชกะ (1257-1259)</era>
-						<era type="134">โชเง็ง (1259-1260)</era>
-						<era type="135">บุนโอ (1260-1261)</era>
-						<era type="136">โคโช (1261-1264)</era>
-						<era type="137">บุนเอ (1264-1275)</era>
-						<era type="138">เค็นจิ (1275-1278)</era>
-						<era type="139">โคอัง (1278-1288)</era>
-						<era type="140">โชโอ (1288-1293)</era>
-						<era type="141">เอนิง (1293-1299)</era>
-						<era type="142">โชอัง (1299-1302)</era>
-						<era type="143">เค็งเง็ง (1302-1303)</era>
-						<era type="144">คะเง็ง (1303-1306)</era>
-						<era type="145">โทะกุจิ (1306-1308)</era>
-						<era type="146">เอ็งเก (1308-1311)</era>
-						<era type="147">โอโช (1311-1312)</era>
-						<era type="148">โชวะ (1312-1317)</era>
-						<era type="149">บุมโป (1317-1319)</era>
-						<era type="150">เก็นโอ (1319-1321)</era>
-						<era type="151">เก็งเกียว (1321-1324)</era>
-						<era type="152">โชชู (1324-1326)</era>
-						<era type="153">คะเระกิ (1326-1329)</era>
-						<era type="154">เก็นโตะกุ (1329-1331)</era>
-						<era type="155">เก็งโก (1331-1334)</era>
-						<era type="156">เค็มมุ (1334-1336)</era>
-						<era type="157">เอ็งเง็ง (1336-1340)</era>
-						<era type="158">โคโกะกุ (1340-1346)</era>
-						<era type="159">โชเฮ (1346-1370)</era>
-						<era type="160">เค็นโตะกุ (1370-1372)</era>
-						<era type="161">บุนชู (1372-1375)</era>
-						<era type="162">เท็นจุ (1375-1379)</era>
-						<era type="163">โคเรียะกุ (1379-1381)</era>
-						<era type="164">โควะ (1381-1384)</era>
-						<era type="165">เก็นชู (1384-1392)</era>
-						<era type="166">เมโตะกุ (1384-1387)</era>
-						<era type="167">คะเค (1387-1389)</era>
-						<era type="168">โคโอ (1389-1390)</era>
-						<era type="169">เมโตะกุ (1390-1394)</era>
-						<era type="170">โอเอ (1394-1428)</era>
-						<era type="171">โชโช (1428-1429)</era>
-						<era type="172">เอเกียว (1429-1441)</era>
-						<era type="173">คะกิสึ (1441-1444)</era>
-						<era type="174">บุนอัง (1444-1449)</era>
-						<era type="175">โฮโตะกุ (1449-1452)</era>
-						<era type="176">เคียวโตะกุ (1452-1455)</era>
-						<era type="177">โคโช (1455-1457)</era>
-						<era type="178">โชโระกุ (1457-1460)</era>
-						<era type="179">คันโช (1460-1466)</era>
-						<era type="180">บุนโช (1466-1467)</era>
-						<era type="181">โอนิง (1467-1469)</era>
-						<era type="182">บุมเม (1469-1487)</era>
-						<era type="183">โชเกียว (1487-1489)</era>
-						<era type="184">เอ็นโตะกุ (1489-1492)</era>
-						<era type="185">เมโอ (1492-1501)</era>
-						<era type="186">บุงกิ (1501-1504)</era>
-						<era type="187">เอโช (1504-1521)</era>
-						<era type="188">ทะอิเอ (1521-1528)</era>
-						<era type="189">เคียวโระกุ (1528-1532)</era>
-						<era type="190">เท็มมน (1532-1555)</era>
-						<era type="191">โคจิ (1555-1558)</era>
-						<era type="192">เอโระกุ (1558-1570)</era>
-						<era type="193">เก็งกิ (1570-1573)</era>
-						<era type="194">เท็นโช (1573-1592)</era>
-						<era type="195">บุนโระกุ (1592-1596)</era>
-						<era type="196">เคโช (1596-1615)</era>
-						<era type="197">เก็งวะ (1615-1624)</era>
-						<era type="198">คันเอ (1624-1644)</era>
-						<era type="199">โชโฮ (1644-1648)</era>
-						<era type="200">เคอัง (1648-1652)</era>
-						<era type="201">โชโอ (1652-1655)</era>
-						<era type="202">เมเรียะกุ (1655-1658)</era>
-						<era type="203">มันจิ (1658-1661)</era>
-						<era type="204">คัมบุง (1661-1673)</era>
-						<era type="205">เอ็มโป (1673-1681)</era>
-						<era type="206">เท็นวะ (1681-1684)</era>
-						<era type="207">โจเกียว (1684-1688)</era>
-						<era type="208">เก็นโระกุ (1688-1704)</era>
-						<era type="209">โฮเอ (1704-1711)</era>
-						<era type="210">โชโตะกุ (1711-1716)</era>
-						<era type="211">เคียวโฮ (1716-1736)</era>
-						<era type="212">เก็มบุง (1736-1741)</era>
-						<era type="213">คัมโป (1741-1744)</era>
-						<era type="214">เอ็งเกียว (1744-1748)</era>
-						<era type="215">คันเอ็ง (1748-1751)</era>
-						<era type="216">โฮเรียะกุ (1751-1764)</era>
-						<era type="217">เมวะ (1764-1772)</era>
-						<era type="218">อันเอ (1772-1781)</era>
-						<era type="219">เท็มเม (1781-1789)</era>
-						<era type="220">คันเซ (1789-1801)</era>
-						<era type="221">เคียววะ (1801-1804)</era>
-						<era type="222">บุงกะ (1804-1818)</era>
-						<era type="223">บุนเซ (1818-1830)</era>
-						<era type="224">เท็มโป (1830-1844)</era>
-						<era type="225">โคกะ (1844-1848)</era>
-						<era type="226">คะเอ (1848-1854)</era>
-						<era type="227">อันเซ (1854-1860)</era>
-						<era type="228">มันเอ็ง (1860-1861)</era>
-						<era type="229">บุงกีว (1861-1864)</era>
-						<era type="230">เก็นจิ (1864-1865)</era>
-						<era type="231">เคโอ (1865-1868)</era>
+						<era type="16">โฮกิ (770–780)</era>
+						<era type="17">เท็นโอ (781–782)</era>
+						<era type="18">เอ็นเรียะกุ (782–806)</era>
+						<era type="19">ดะอิโด (806–810)</era>
+						<era type="20">โคนิง (810–824)</era>
+						<era type="21">เท็นโช (824–834)</era>
+						<era type="22">โชวะ (834–848)</era>
+						<era type="23">คะโจ (848–851)</era>
+						<era type="24">นินจุ (851–854)</era>
+						<era type="25">ซะอิโกะ (854–857)</era>
+						<era type="26">เท็นนัง (857–859)</era>
+						<era type="27">โจงัง (859–877)</era>
+						<era type="28">เก็งเก (877–885)</era>
+						<era type="29">นินนะ (885–889)</era>
+						<era type="30">คัมเพียว (889–898)</era>
+						<era type="31">โชตะอิ (898–901)</era>
+						<era type="32">เอ็งงิ (901–923)</era>
+						<era type="33">เอ็นโช (923–931)</era>
+						<era type="34">โชเฮ (931–938)</era>
+						<era type="35">เท็งเงียว (938–947)</era>
+						<era type="36">เท็นเรียะกุ (947–957)</era>
+						<era type="37">เท็นโตะกุ (957–961)</era>
+						<era type="38">โอวะ (961–964)</era>
+						<era type="39">โคโฮ (964–968)</era>
+						<era type="40">อันนะ (968–970)</era>
+						<era type="41">เท็นโระกุ (970–973)</era>
+						<era type="42">เท็นเอ็ง (973–976)</era>
+						<era type="43">โจเง็ง (976–978)</era>
+						<era type="44">เท็งเง็ง (978–983)</era>
+						<era type="45">เอกัง (983–985)</era>
+						<era type="46">คันนะ (985–987)</era>
+						<era type="47">เอเอ็ง (987–989)</era>
+						<era type="48">เอโซ (989–990)</era>
+						<era type="49">โชเรียะกุ (990–995)</era>
+						<era type="50">โชโตะกุ (995–999)</era>
+						<era type="51">โชโฮ (999–1004)</era>
+						<era type="52">คันโก (1004–1012)</era>
+						<era type="53">โชวะ (1012–1017)</era>
+						<era type="54">คันนิง (1017–1021)</era>
+						<era type="55">จิอัง (1021–1024)</era>
+						<era type="56">มันจุ (1024–1028)</era>
+						<era type="57">โชเง็ง (1028–1037)</era>
+						<era type="58">โชเรียะกุ (1037–1040)</era>
+						<era type="59">โชคีว (1040–1044)</era>
+						<era type="60">คันโตะกุ (1044–1046)</era>
+						<era type="61">เอโช (1046–1053)</era>
+						<era type="62">เท็งงิ (1053–1058)</era>
+						<era type="63">โคเฮ (1058–1065)</era>
+						<era type="64">จิเรียะกุ (1065–1069)</era>
+						<era type="65">เอ็งคีว (1069–1074)</era>
+						<era type="66">โชโฮ (1074–1077)</era>
+						<era type="67">โชเรียะกุ (1077–1081)</era>
+						<era type="68">เอโฮะ (1081–1084)</era>
+						<era type="69">โอโตะกุ (1084–1087)</era>
+						<era type="70">คันจิ (1087–1094)</era>
+						<era type="71">คะโฮะ (1094–1096)</era>
+						<era type="72">เอโช (1096–1097)</era>
+						<era type="73">โชโตะกุ (1097–1099)</era>
+						<era type="74">โควะ (1099–1104)</era>
+						<era type="75">โชจิ (1104–1106)</era>
+						<era type="76">คะโช (1106–1108)</era>
+						<era type="77">เท็นนิง (1108–1110)</era>
+						<era type="78">เท็นเอ (1110–1113)</era>
+						<era type="79">เอกีว (1113–1118)</era>
+						<era type="80">เก็นเอ (1118–1120)</era>
+						<era type="81">โฮะอัง (1120–1124)</era>
+						<era type="82">เท็นจิ (1124–1126)</era>
+						<era type="83">ดะอิจิ (1126–1131)</era>
+						<era type="84">เท็นโช (1131–1132)</era>
+						<era type="85">โชโช (1132–1135)</era>
+						<era type="86">โฮะเอ็ง (1135–1141)</era>
+						<era type="87">เอจิ (1141–1142)</era>
+						<era type="88">โคจิ (1142–1144)</era>
+						<era type="89">เท็นโย (1144–1145)</era>
+						<era type="90">คีวอัง (1145–1151)</era>
+						<era type="91">นิมเป (1151–1154)</era>
+						<era type="92">คีวจุ (1154–1156)</era>
+						<era type="93">โฮะเง็ง (1156–1159)</era>
+						<era type="94">เฮจิ (1159–1160)</era>
+						<era type="95">เอเรียะกุ (1160–1161)</era>
+						<era type="96">โอโฮ (1161–1163)</era>
+						<era type="97">โชกัง (1163–1165)</era>
+						<era type="98">เอมัง (1165–1166)</era>
+						<era type="99">นินอัง (1166–1169)</era>
+						<era type="100">คะโอ (1169–1171)</era>
+						<era type="101">โชอัง (1171–1175)</era>
+						<era type="102">อังเง็ง (1175–1177)</era>
+						<era type="103">จิโช (1177–1181)</era>
+						<era type="104">โยวะ (1181–1182)</era>
+						<era type="105">จุเอ (1182–1184)</era>
+						<era type="106">เก็นเรียะกุ (1184–1185)</era>
+						<era type="107">บุนจิ (1185–1190)</era>
+						<era type="108">เค็งกีว (1190–1199)</era>
+						<era type="109">โชจิ (1199–1201)</era>
+						<era type="110">เค็นนิง (1201–1204)</era>
+						<era type="111">เก็งกีว (1204–1206)</era>
+						<era type="112">เค็นเอ (1206–1207)</era>
+						<era type="113">โชเก็ง (1207–1211)</era>
+						<era type="114">เค็นเรียะกุ (1211–1213)</era>
+						<era type="115">เค็มโป (1213–1219)</era>
+						<era type="116">โชกีว (1219–1222)</era>
+						<era type="117">โจโอ (1222–1224)</era>
+						<era type="118">เก็นนิง (1224–1225)</era>
+						<era type="119">คะโระกุ (1225–1227)</era>
+						<era type="120">อันเต (1227–1229)</era>
+						<era type="121">คังกิ (1229–1232)</era>
+						<era type="122">โจเอ (1232–1233)</era>
+						<era type="123">เท็มปุกุ (1233–1234)</era>
+						<era type="124">บุนเรียะกุ (1234–1235)</era>
+						<era type="125">คะเต (1235–1238)</era>
+						<era type="126">เรียะกุนิง (1238–1239)</era>
+						<era type="127">เอ็นโอ (1239–1240)</era>
+						<era type="128">นินจิ (1240–1243)</era>
+						<era type="129">คังเง็ง (1243–1247)</era>
+						<era type="130">โฮจิ (1247–1249)</era>
+						<era type="131">เค็นโช (1249–1256)</era>
+						<era type="132">โคเง็ง (1256–1257)</era>
+						<era type="133">โชกะ (1257–1259)</era>
+						<era type="134">โชเง็ง (1259–1260)</era>
+						<era type="135">บุนโอ (1260–1261)</era>
+						<era type="136">โคโช (1261–1264)</era>
+						<era type="137">บุนเอ (1264–1275)</era>
+						<era type="138">เค็นจิ (1275–1278)</era>
+						<era type="139">โคอัง (1278–1288)</era>
+						<era type="140">โชโอ (1288–1293)</era>
+						<era type="141">เอนิง (1293–1299)</era>
+						<era type="142">โชอัง (1299–1302)</era>
+						<era type="143">เค็งเง็ง (1302–1303)</era>
+						<era type="144">คะเง็ง (1303–1306)</era>
+						<era type="145">โทะกุจิ (1306–1308)</era>
+						<era type="146">เอ็งเก (1308–1311)</era>
+						<era type="147">โอโช (1311–1312)</era>
+						<era type="148">โชวะ (1312–1317)</era>
+						<era type="149">บุมโป (1317–1319)</era>
+						<era type="150">เก็นโอ (1319–1321)</era>
+						<era type="151">เก็งเกียว (1321–1324)</era>
+						<era type="152">โชชู (1324–1326)</era>
+						<era type="153">คะเระกิ (1326–1329)</era>
+						<era type="154">เก็นโตะกุ (1329–1331)</era>
+						<era type="155">เก็งโก (1331–1334)</era>
+						<era type="156">เค็มมุ (1334–1336)</era>
+						<era type="157">เอ็งเง็ง (1336–1340)</era>
+						<era type="158">โคโกะกุ (1340–1346)</era>
+						<era type="159">โชเฮ (1346–1370)</era>
+						<era type="160">เค็นโตะกุ (1370–1372)</era>
+						<era type="161">บุนชู (1372–1375)</era>
+						<era type="162">เท็นจุ (1375–1379)</era>
+						<era type="163">โคเรียะกุ (1379–1381)</era>
+						<era type="164">โควะ (1381–1384)</era>
+						<era type="165">เก็นชู (1384–1392)</era>
+						<era type="166">เมโตะกุ (1384–1387)</era>
+						<era type="167">คะเค (1387–1389)</era>
+						<era type="168">โคโอ (1389–1390)</era>
+						<era type="169">เมโตะกุ (1390–1394)</era>
+						<era type="170">โอเอ (1394–1428)</era>
+						<era type="171">โชโช (1428–1429)</era>
+						<era type="172">เอเกียว (1429–1441)</era>
+						<era type="173">คะกิสึ (1441–1444)</era>
+						<era type="174">บุนอัง (1444–1449)</era>
+						<era type="175">โฮโตะกุ (1449–1452)</era>
+						<era type="176">เคียวโตะกุ (1452–1455)</era>
+						<era type="177">โคโช (1455–1457)</era>
+						<era type="178">โชโระกุ (1457–1460)</era>
+						<era type="179">คันโช (1460–1466)</era>
+						<era type="180">บุนโช (1466–1467)</era>
+						<era type="181">โอนิง (1467–1469)</era>
+						<era type="182">บุมเม (1469–1487)</era>
+						<era type="183">โชเกียว (1487–1489)</era>
+						<era type="184">เอ็นโตะกุ (1489–1492)</era>
+						<era type="185">เมโอ (1492–1501)</era>
+						<era type="186">บุงกิ (1501–1504)</era>
+						<era type="187">เอโช (1504–1521)</era>
+						<era type="188">ทะอิเอ (1521–1528)</era>
+						<era type="189">เคียวโระกุ (1528–1532)</era>
+						<era type="190">เท็มมน (1532–1555)</era>
+						<era type="191">โคจิ (1555–1558)</era>
+						<era type="192">เอโระกุ (1558–1570)</era>
+						<era type="193">เก็งกิ (1570–1573)</era>
+						<era type="194">เท็นโช (1573–1592)</era>
+						<era type="195">บุนโระกุ (1592–1596)</era>
+						<era type="196">เคโช (1596–1615)</era>
+						<era type="197">เก็งวะ (1615–1624)</era>
+						<era type="198">คันเอ (1624–1644)</era>
+						<era type="199">โชโฮ (1644–1648)</era>
+						<era type="200">เคอัง (1648–1652)</era>
+						<era type="201">โชโอ (1652–1655)</era>
+						<era type="202">เมเรียะกุ (1655–1658)</era>
+						<era type="203">มันจิ (1658–1661)</era>
+						<era type="204">คัมบุง (1661–1673)</era>
+						<era type="205">เอ็มโป (1673–1681)</era>
+						<era type="206">เท็นวะ (1681–1684)</era>
+						<era type="207">โจเกียว (1684–1688)</era>
+						<era type="208">เก็นโระกุ (1688–1704)</era>
+						<era type="209">โฮเอ (1704–1711)</era>
+						<era type="210">โชโตะกุ (1711–1716)</era>
+						<era type="211">เคียวโฮ (1716–1736)</era>
+						<era type="212">เก็มบุง (1736–1741)</era>
+						<era type="213">คัมโป (1741–1744)</era>
+						<era type="214">เอ็งเกียว (1744–1748)</era>
+						<era type="215">คันเอ็ง (1748–1751)</era>
+						<era type="216">โฮเรียะกุ (1751–1764)</era>
+						<era type="217">เมวะ (1764–1772)</era>
+						<era type="218">อันเอ (1772–1781)</era>
+						<era type="219">เท็มเม (1781–1789)</era>
+						<era type="220">คันเซ (1789–1801)</era>
+						<era type="221">เคียววะ (1801–1804)</era>
+						<era type="222">บุงกะ (1804–1818)</era>
+						<era type="223">บุนเซ (1818–1830)</era>
+						<era type="224">เท็มโป (1830–1844)</era>
+						<era type="225">โคกะ (1844–1848)</era>
+						<era type="226">คะเอ (1848–1854)</era>
+						<era type="227">อันเซ (1854–1860)</era>
+						<era type="228">มันเอ็ง (1860–1861)</era>
+						<era type="229">บุงกีว (1861–1864)</era>
+						<era type="230">เก็นจิ (1864–1865)</era>
+						<era type="231">เคโอ (1865–1868)</era>
 						<era type="232">เมจิ</era>
 						<era type="233">ทะอิโช</era>
 						<era type="234">โชวะ</era>
@@ -3697,6 +3775,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>ปี</displayName>
+				<relative type="-1">ปีที่แล้ว</relative>
+				<relative type="0">ปีนี้</relative>
+				<relative type="1">ปีหน้า</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ใน {0} ปี</relativeTimePattern>
 				</relativeTime>
@@ -3706,6 +3787,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>ปี</displayName>
+				<relative type="-1">ปีที่แล้ว</relative>
+				<relative type="0">ปีนี้</relative>
+				<relative type="1">ปีหน้า</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ใน {0} ปี</relativeTimePattern>
 				</relativeTime>
@@ -3754,6 +3838,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>เดือน</displayName>
+				<relative type="-1">เดือนที่แล้ว</relative>
+				<relative type="0">เดือนนี้</relative>
+				<relative type="1">เดือนหน้า</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ใน {0} เดือน</relativeTimePattern>
 				</relativeTime>
@@ -3763,6 +3850,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>เดือน</displayName>
+				<relative type="-1">เดือนที่แล้ว</relative>
+				<relative type="0">เดือนนี้</relative>
+				<relative type="1">เดือนหน้า</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ใน {0} เดือน</relativeTimePattern>
 				</relativeTime>
@@ -3784,6 +3874,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>สัปดาห์</displayName>
+				<relative type="-1">สัปดาห์ที่แล้ว</relative>
+				<relative type="0">สัปดาห์นี้</relative>
+				<relative type="1">สัปดาห์หน้า</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ใน {0} สัปดาห์</relativeTimePattern>
 				</relativeTime>
@@ -3793,6 +3886,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>สัปดาห์</displayName>
+				<relative type="-1">สัปดาห์ที่แล้ว</relative>
+				<relative type="0">สัปดาห์นี้</relative>
+				<relative type="1">สัปดาห์หน้า</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ใน {0} สัปดาห์</relativeTimePattern>
 				</relativeTime>
@@ -3816,6 +3912,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>วัน</displayName>
+				<relative type="-2">เมื่อวานซืน</relative>
+				<relative type="-1">เมื่อวาน</relative>
+				<relative type="0">วันนี้</relative>
+				<relative type="1">พรุ่งนี้</relative>
+				<relative type="2">มะรืนนี้</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ใน {0} วัน</relativeTimePattern>
 				</relativeTime>
@@ -3825,6 +3926,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>วัน</displayName>
+				<relative type="-2">เมื่อวานซืน</relative>
+				<relative type="-1">เมื่อวาน</relative>
+				<relative type="0">วันนี้</relative>
+				<relative type="1">พรุ่งนี้</relative>
+				<relative type="2">มะรืนนี้</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ใน {0} วัน</relativeTimePattern>
 				</relativeTime>
@@ -4137,7 +4243,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>เวียนนา</exemplarCity>
 			</zone>
 			<zone type="Australia/Perth">
-				<exemplarCity>เพิิร์ท</exemplarCity>
+				<exemplarCity>เพิร์ท</exemplarCity>
 			</zone>
 			<zone type="Australia/Eucla">
 				<exemplarCity>ยูคลา</exemplarCity>
@@ -4904,6 +5010,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>พอร์ตมอร์สบี</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>บูเกนวิลล์</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>มะนิลา</exemplarCity>
 			</zone>
@@ -4988,6 +5097,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>อีร์คุตสค์</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>ชิตา</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>ยาคุตสค์</exemplarCity>
 			</zone>
@@ -5006,6 +5118,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>มากาดาน</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>ซเรดเนคโคลิมสก์</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>คามชัตกา</exemplarCity>
 			</zone>
@@ -6326,6 +6441,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤0 พ'.'</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤0 ม'.'</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤0 ส'.'</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0 ล'.'</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00 ล'.'</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000 ล'.'</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0 พ'.'ล'.'</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤0 ม'.'ล'.'</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤0 ส'.'ล'.'</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0 ล'.'ล'.'</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00 ล'.'ล'.'</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000 ล'.'ล'.'</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencies>
@@ -6784,6 +6915,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ลารีจอร์เจีย</displayName>
 				<displayName count="other">ลารีจอร์เจีย</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>เซดีกานา (1979–2007)</displayName>
@@ -6875,6 +7007,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>รูเปียห์อินโดนีเซีย</displayName>
 				<displayName count="other">รูเปียห์อินโดนีเซีย</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>ปอนด์ไอริช</displayName>
@@ -7729,6 +7862,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>เมตรต่อวินาทีกำลังสอง</displayName>
 				<unitPattern count="other">{0} เมตรต่อวินาทีกำลังสอง</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName draft="contributed">รอบ</displayName>
+				<unitPattern count="other" draft="contributed">{0} รอบ</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>เรเดียน</displayName>
+				<unitPattern count="other">{0} เรเดียน</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>องศา</displayName>
+				<unitPattern count="other">{0} องศา</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>ลิปดา</displayName>
 				<unitPattern count="other">{0} ลิปดา</unitPattern>
@@ -7737,25 +7882,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>พิลิปดา</displayName>
 				<unitPattern count="other">{0} พิลิปดา</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>องศา</displayName>
-				<unitPattern count="other">{0} องศา</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>เรเดียน</displayName>
-				<unitPattern count="other">{0} เรเดียน</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>เอเคอร์</displayName>
-				<unitPattern count="other">{0} เอเคอร์</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>ตารางกิโลเมตร</displayName>
+				<unitPattern count="other">{0} ตารางกิโลเมตร</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>เฮกตาร์</displayName>
 				<unitPattern count="other">{0} เฮกตาร์</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>ตารางเมตร</displayName>
+				<unitPattern count="other">{0} ตารางเมตร</unitPattern>
+				<perUnitPattern>{0} ต่อ ตร.ม.</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>ตารางเซนติเมตร</displayName>
 				<unitPattern count="other">{0} ตารางเซนติเมตร</unitPattern>
+				<perUnitPattern>{0} ต่อตารางเซนติเมตร</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>ตารางไมล์</displayName>
+				<unitPattern count="other">{0} ตารางไมล์</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>เอเคอร์</displayName>
+				<unitPattern count="other">{0} เอเคอร์</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>ตารางวา</displayName>
+				<unitPattern count="other">{0} ตารางวา</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ตารางฟุต</displayName>
@@ -7764,112 +7919,114 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="area-square-inch">
 				<displayName>ตารางนิ้ว</displayName>
 				<unitPattern count="other">{0} ตร.นิ้ว</unitPattern>
+				<perUnitPattern>{0} ต่อตารางนิ้ว</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>ตารางกิโลเมตร</displayName>
-				<unitPattern count="other">{0} ตารางกิโลเมตร</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>ตารางเมตร</displayName>
-				<unitPattern count="other">{0} ตารางเมตร</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>ตารางไมล์</displayName>
-				<unitPattern count="other">{0} ตารางไมล์</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>ตารางวา</displayName>
-				<unitPattern count="other">{0} ตารางวา</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>กะรัต</displayName>
+				<unitPattern count="other">{0} กะรัต</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ลิตรต่อกิโลเมตร</displayName>
 				<unitPattern count="other">{0} ลิตรต่อกิโลเมตร</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ลิตรต่อ100 กิโลเมตร</displayName>
+				<unitPattern count="other">{0} ลิตร/100 กิโลเมตร</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>ไมล์ต่อแกลลอน</displayName>
 				<unitPattern count="other">{0} ไมล์ต่อแกลลอน</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>บิต</displayName>
-				<unitPattern count="other">{0} บิต</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>ไบต์</displayName>
-				<unitPattern count="other">{0} ไบต์</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>กิกะบิต</displayName>
-				<unitPattern count="other">{0} กิกะบิต</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>กิกะไบต์</displayName>
-				<unitPattern count="other">{0} กิกะไบต์</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>กิโลบิต</displayName>
-				<unitPattern count="other">{0} กิโลบิต</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>กิโลไบต์</displayName>
-				<unitPattern count="other">{0} กิโลไบต์</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>เมกะบิต</displayName>
-				<unitPattern count="other">{0} เมกะบิต</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>เมกะไบต์</displayName>
-				<unitPattern count="other">{0} เมกะไบต์</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>เทราบิต</displayName>
-				<unitPattern count="other">{0} เทราบิต</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>เทราไบต์</displayName>
 				<unitPattern count="other">{0} เทราไบต์</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>เทราบิต</displayName>
+				<unitPattern count="other">{0} เทราบิต</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>กิกะไบต์</displayName>
+				<unitPattern count="other">{0} กิกะไบต์</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>กิกะบิต</displayName>
+				<unitPattern count="other">{0} กิกะบิต</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>เมกะไบต์</displayName>
+				<unitPattern count="other">{0} เมกะไบต์</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>เมกะบิต</displayName>
+				<unitPattern count="other">{0} เมกะบิต</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>กิโลไบต์</displayName>
+				<unitPattern count="other">{0} กิโลไบต์</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>กิโลบิต</displayName>
+				<unitPattern count="other">{0} กิโลบิต</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>ไบต์</displayName>
+				<unitPattern count="other">{0} ไบต์</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>บิต</displayName>
+				<unitPattern count="other">{0} บิต</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="contributed">ศตวรรษ</displayName>
+				<unitPattern count="other" draft="contributed">{0} ศตวรรษ</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ปี</displayName>
+				<unitPattern count="other">{0} ปี</unitPattern>
+				<perUnitPattern draft="contributed">{0} ต่อปี</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>เดือน</displayName>
+				<unitPattern count="other">{0} เดือน</unitPattern>
+				<perUnitPattern draft="contributed">{0} ต่อเดือน</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>สัปดาห์</displayName>
+				<unitPattern count="other">{0} สัปดาห์</unitPattern>
+				<perUnitPattern draft="contributed">{0} ต่อสัปดาห์</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>วัน</displayName>
 				<unitPattern count="other">{0} วัน</unitPattern>
+				<perUnitPattern draft="contributed">{0} ต่อวัน</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>ชั่วโมง</displayName>
 				<unitPattern count="other">{0} ชั่วโมง</unitPattern>
 				<perUnitPattern>{0} ต่อชั่วโมง</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>ไมโครวินาที</displayName>
-				<unitPattern count="other">{0} ไมโครวินาที</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>มิลลิวินาที</displayName>
-				<unitPattern count="other">{0} มิลลิวินาที</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>นาที</displayName>
 				<unitPattern count="other">{0} นาที</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>เดือน</displayName>
-				<unitPattern count="other">{0} เดือน</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>นาโนวินาที</displayName>
-				<unitPattern count="other">{0} นาโนวินาที</unitPattern>
+				<perUnitPattern draft="contributed">{0} ต่อนาที</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>วินาที</displayName>
 				<unitPattern count="other">{0} วินาที</unitPattern>
 				<perUnitPattern>{0} ต่อวินาที</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>สัปดาห์</displayName>
-				<unitPattern count="other">{0} สัปดาห์</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>มิลลิวินาที</displayName>
+				<unitPattern count="other">{0} มิลลิวินาที</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>ปี</displayName>
-				<unitPattern count="other">{0} ปี</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>ไมโครวินาที</displayName>
+				<unitPattern count="other">{0} ไมโครวินาที</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>นาโนวินาที</displayName>
+				<unitPattern count="other">{0} นาโนวินาที</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>แอมแปร์</displayName>
@@ -7887,6 +8044,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>โวลต์</displayName>
 				<unitPattern count="other">{0} โวลต์</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>กิโลแคลอรี่</displayName>
+				<unitPattern count="other">{0} กิโลแคลอรี่</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>แคลอรี่</displayName>
 				<unitPattern count="other">{0} แคลอรี่</unitPattern>
@@ -7895,18 +8056,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>แคลอรี่</displayName>
 				<unitPattern count="other">{0} แคลอรี่</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>จูล</displayName>
-				<unitPattern count="other">{0} จูล</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>กิโลแคลอรี่</displayName>
-				<unitPattern count="other">{0} กิโลแคลอรี่</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>กิโลจูล</displayName>
 				<unitPattern count="other">{0} กิโลจูล</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>จูล</displayName>
+				<unitPattern count="other">{0} จูล</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>กิโลวัตต์-ชั่วโมง</displayName>
 				<unitPattern count="other">{0} กิโลวัตต์-ชั่วโมง</unitPattern>
@@ -7915,162 +8072,167 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>กิกะเฮิรตซ์</displayName>
 				<unitPattern count="other">{0} กิกะเฮิรตซ์</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>เฮิรตซ์</displayName>
-				<unitPattern count="other">{0} เฮิรตซ์</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>เมกะเฮิรตซ์</displayName>
+				<unitPattern count="other">{0} เมกะเฮิรตซ์</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>กิโลเฮิรตซ์</displayName>
 				<unitPattern count="other">{0} กิโลเฮิรตซ์</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>เมกะเฮิรตซ์</displayName>
-				<unitPattern count="other">{0} เมกะเฮิรตซ์</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>เฮิรตซ์</displayName>
+				<unitPattern count="other">{0} เฮิรตซ์</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>หน่วยดาราศาสตร์</displayName>
-				<unitPattern count="other">{0} หน่วยดาราศาสตร์</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>กิโลเมตร</displayName>
+				<unitPattern count="other">{0} กิโลเมตร</unitPattern>
+				<perUnitPattern>{0} ต่อกิโลเมตร</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>เซนติเมตร</displayName>
-				<unitPattern count="other">{0} เซนติเมตร</unitPattern>
+			<unit type="length-meter">
+				<displayName>เมตร</displayName>
+				<unitPattern count="other">{0} เมตร</unitPattern>
+				<perUnitPattern>{0} ต่อเมตร</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>เดซิเมตร</displayName>
 				<unitPattern count="other">{0} เดซิเมตร</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ฟุต</displayName>
-				<unitPattern count="other">{0} ฟุต</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>นิ้ว</displayName>
-				<unitPattern count="other">{0} นิ้ว</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>กิโลเมตร</displayName>
-				<unitPattern count="other">{0} กิโลเมตร</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ปีแสง</displayName>
-				<unitPattern count="other">{0} ปีแสง</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>เมตร</displayName>
-				<unitPattern count="other">{0} เมตร</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>ไมโครเมตร</displayName>
-				<unitPattern count="other">{0} ไมโครเมตร</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>ไมล์</displayName>
-				<unitPattern count="other">{0} ไมล์</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>เซนติเมตร</displayName>
+				<unitPattern count="other">{0} เซนติเมตร</unitPattern>
+				<perUnitPattern>{0} ต่อเซนติเมตร</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>มิลลิเมตร</displayName>
 				<unitPattern count="other">{0} มิลลิเมตร</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>ไมโครเมตร</displayName>
+				<unitPattern count="other">{0} ไมโครเมตร</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>นาโนเมตร</displayName>
 				<unitPattern count="other">{0} นาโนเมตร</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>ไมล์ทะเล</displayName>
-				<unitPattern count="other">{0} ไมล์ทะเล</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>พาร์เซก</displayName>
-				<unitPattern count="other">{0} พาร์เซก</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>พิโกเมตร</displayName>
 				<unitPattern count="other">{0} พิโกเมตร</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>ไมล์</displayName>
+				<unitPattern count="other">{0} ไมล์</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>หลา</displayName>
 				<unitPattern count="other">{0} หลา</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ฟุต</displayName>
+				<unitPattern count="other">{0} ฟุต</unitPattern>
+				<perUnitPattern>{0} ต่อฟุต</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>นิ้ว</displayName>
+				<unitPattern count="other">{0} นิ้ว</unitPattern>
+				<perUnitPattern>{0} ต่อนิ้ว</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>พาร์เซก</displayName>
+				<unitPattern count="other">{0} พาร์เซก</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ปีแสง</displayName>
+				<unitPattern count="other">{0} ปีแสง</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>หน่วยดาราศาสตร์</displayName>
+				<unitPattern count="other">{0} หน่วยดาราศาสตร์</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>ไมล์ทะเล</displayName>
+				<unitPattern count="other">{0} ไมล์ทะเล</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>ไมล์สแกนดิเนเวีย</displayName>
+				<unitPattern count="other">{0} ไมล์สแกนดิเนเวีย</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>ลักซ์</displayName>
 				<unitPattern count="other">{0} ลักซ์</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>กะรัต</displayName>
-				<unitPattern count="other">{0} กะรัต</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>กรัม</displayName>
-				<unitPattern count="other">{0} กรัม</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>กิโลกรัม</displayName>
-				<unitPattern count="other">{0} กิโลกรัม</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>เมตริกตัน</displayName>
 				<unitPattern count="other">{0} เมตริกตัน</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>ไมโครกรัม</displayName>
-				<unitPattern count="other">{0} ไมโครกรัม</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>กิโลกรัม</displayName>
+				<unitPattern count="other">{0} กิโลกรัม</unitPattern>
+				<perUnitPattern draft="contributed">{0} ต่อกิโลกรัม</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>กรัม</displayName>
+				<unitPattern count="other">{0} กรัม</unitPattern>
+				<perUnitPattern draft="contributed">{0} ต่อกรัม</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>มิลลิกรัม</displayName>
 				<unitPattern count="other">{0} มิลลิกรัม</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ออนซ์</displayName>
-				<unitPattern count="other">{0} ออนซ์</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ทรอยออนซ์</displayName>
-				<unitPattern count="other">{0} ทรอยออนซ์</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>ปอนด์</displayName>
-				<unitPattern count="other">{0} ปอนด์</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>ไมโครกรัม</displayName>
+				<unitPattern count="other">{0} ไมโครกรัม</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>ตัน</displayName>
 				<unitPattern count="other">{0} ตัน</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>ปอนด์</displayName>
+				<unitPattern count="other">{0} ปอนด์</unitPattern>
+				<perUnitPattern draft="contributed">{0} ต่อปอนด์</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ออนซ์</displayName>
+				<unitPattern count="other">{0} ออนซ์</unitPattern>
+				<perUnitPattern draft="contributed">{0} ต่อออนซ์</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ทรอยออนซ์</displayName>
+				<unitPattern count="other">{0} ทรอยออนซ์</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>กะรัต</displayName>
+				<unitPattern count="other">{0} กะรัต</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>กิกะวัตต์</displayName>
 				<unitPattern count="other">{0} กิกะวัตต์</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>แรงม้า</displayName>
-				<unitPattern count="other">{0} แรงม้า</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>กิโลวัตต์</displayName>
-				<unitPattern count="other">{0} กิโลวัตต์</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>เมกะวัตต์</displayName>
 				<unitPattern count="other">{0} เมกะวัตต์</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>มิลลิวัตต์</displayName>
-				<unitPattern count="other">{0} มิลลิวัตต์</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>กิโลวัตต์</displayName>
+				<unitPattern count="other">{0} กิโลวัตต์</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>วัตต์</displayName>
 				<unitPattern count="other">{0} วัตต์</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>มิลลิวัตต์</displayName>
+				<unitPattern count="other">{0} มิลลิวัตต์</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>แรงม้า</displayName>
+				<unitPattern count="other">{0} แรงม้า</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>เฮกโตปาสกาล</displayName>
 				<unitPattern count="other">{0} เฮกโตปาสกาล</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>นิ้วปรอท</displayName>
-				<unitPattern count="other">{0} นิ้วปรอท</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>มิลลิบาร์</displayName>
-				<unitPattern count="other">{0} มิลลิบาร์</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>มิลลิเมตรปรอท</displayName>
 				<unitPattern count="other">{0} มิลลิเมตรปรอท</unitPattern>
@@ -8079,9 +8241,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ปอนด์ต่อตารางนิ้ว</displayName>
 				<unitPattern count="other">{0} ปอนด์ต่อตารางนิ้ว</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>กะรัต</displayName>
-				<unitPattern count="other">{0} กะรัต</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>นิ้วปรอท</displayName>
+				<unitPattern count="other">{0} นิ้วปรอท</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>มิลลิบาร์</displayName>
+				<unitPattern count="other">{0} มิลลิบาร์</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>กิโลเมตรต่อชั่วโมง</displayName>
@@ -8095,6 +8261,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ไมล์ต่อชั่วโมง</displayName>
 				<unitPattern count="other">{0} ไมล์ต่อชั่วโมง</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName draft="contributed">นอต</displayName>
+				<unitPattern count="other" draft="contributed">{0} นอต</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>องศาเซลเซียส</displayName>
 				<unitPattern count="other">{0} องศาเซลเซียส</unitPattern>
@@ -8107,26 +8281,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>เคลวิน</displayName>
 				<unitPattern count="other">{0} เคลวิน</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>เอเคอร์-ฟุต</displayName>
-				<unitPattern count="other">{0} เอเคอร์-ฟุต</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>เซนติลิตร</displayName>
-				<unitPattern count="other">{0} เซนติลิตร</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>ลูกบาศก์เซนติเมตร</displayName>
-				<unitPattern count="other">{0} ลูกบาศก์เซนติเมตร</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ลูกบาศก์ฟุต</displayName>
-				<unitPattern count="other">{0} ลูกบาศก์ฟุต</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>ลูกบาศก์นิ้ว</displayName>
-				<unitPattern count="other">{0} ลูกบาศก์นิ้ว</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>ลูกบาศก์กิโลเมตร</displayName>
 				<unitPattern count="other">{0} ลูกบาศก์กิโลเมตร</unitPattern>
@@ -8134,6 +8288,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-cubic-meter">
 				<displayName>ลูกบาศก์เมตร</displayName>
 				<unitPattern count="other">{0} ลูกบาศก์เมตร</unitPattern>
+				<perUnitPattern>{0} ต่อลูกบาศก์เมตร</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>ลูกบาศก์เซนติเมตร</displayName>
+				<unitPattern count="other">{0} ลูกบาศก์เซนติเมตร</unitPattern>
+				<perUnitPattern>{0} ต่อลูกบาศก์เซนติเมตร</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>ลูกบาศก์ไมล์</displayName>
@@ -8143,21 +8303,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ลูกบาศก์หลา</displayName>
 				<unitPattern count="other">{0} ลูกบาศก์หลา</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>ถ้วย</displayName>
-				<unitPattern count="other">{0} ถ้วย</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ลูกบาศก์ฟุต</displayName>
+				<unitPattern count="other">{0} ลูกบาศก์ฟุต</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>เดซิลิตร</displayName>
-				<unitPattern count="other">{0} เดซิลิตร</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>ลูกบาศก์นิ้ว</displayName>
+				<unitPattern count="other">{0} ลูกบาศก์นิ้ว</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>ฟลูอิดออนซ์</displayName>
-				<unitPattern count="other">{0} ฟลูอิดออนซ์</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>แกลลอน</displayName>
-				<unitPattern count="other">{0} แกลลอน</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>เมกกะลิตร</displayName>
+				<unitPattern count="other">{0} เมกกะลิตร</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>เฮกโตลิตร</displayName>
@@ -8166,23 +8322,53 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-liter">
 				<displayName>ลิตร</displayName>
 				<unitPattern count="other">{0} ลิตร</unitPattern>
+				<perUnitPattern>{0} ต่อลิตร</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>เมกกะลิตร</displayName>
-				<unitPattern count="other">{0} เมกกะลิตร</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>เดซิลิตร</displayName>
+				<unitPattern count="other">{0} เดซิลิตร</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>เซนติลิตร</displayName>
+				<unitPattern count="other">{0} เซนติลิตร</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>มิลลิลิตร</displayName>
 				<unitPattern count="other">{0} มิลลิลิตร</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>ไพนต</displayName>
-				<unitPattern count="other">{0} ไพนต</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>ไพนต์เมตริก</displayName>
+				<unitPattern count="other">{0} ไพนต์เมตริก</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>ถ้วยเมตริก</displayName>
+				<unitPattern count="other">{0} ถ้วยเมตริก</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>เอเคอร์-ฟุต</displayName>
+				<unitPattern count="other">{0} เอเคอร์-ฟุต</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>แกลลอน</displayName>
+				<unitPattern count="other">{0} แกลลอน</unitPattern>
+				<perUnitPattern>{0} ต่อแกลลอน</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>ควอร์ต</displayName>
 				<unitPattern count="other">{0} ควอร์ต</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>ไพนต์</displayName>
+				<unitPattern count="other">{0} ไพนต์</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>ถ้วย</displayName>
+				<unitPattern count="other">{0} ถ้วย</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>ฟลูอิดออนซ์</displayName>
+				<unitPattern count="other">{0} ฟลูอิดออนซ์</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>ช้อนโต๊ะ</displayName>
 				<unitPattern count="other">{0} ช้อนโต๊ะ</unitPattern>
@@ -8191,6 +8377,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ช้อนชา</displayName>
 				<unitPattern count="other">{0} ช้อนชา</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">{0}ตะวันออก</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">{0}เหนือ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">{0}ใต้</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0}ตะวันตก</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -8204,6 +8396,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>เมตร/วินาที²</displayName>
 				<unitPattern count="other">{0} ม./วินาที²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName draft="contributed">รอบ</displayName>
+				<unitPattern count="other" draft="contributed">{0} รอบ</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>เรเดียน</displayName>
+				<unitPattern count="other">{0} เรเดียน</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>องศา</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>ลิปดา</displayName>
 				<unitPattern count="other">{0} ลิปดา</unitPattern>
@@ -8212,25 +8416,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>พิลิปดา</displayName>
 				<unitPattern count="other">{0} พิลิปดา</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>องศา</displayName>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>เรเดียน</displayName>
-				<unitPattern count="other">{0} เรเดียน</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>เอเคอร์</displayName>
-				<unitPattern count="other">{0} เอเคอร์</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>ตร.กม.</displayName>
+				<unitPattern count="other">{0} ตร.กม.</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>เฮกตาร์</displayName>
 				<unitPattern count="other">{0} เฮกตาร์</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>ตร.ม.</displayName>
+				<unitPattern count="other">{0} ตร.ม.</unitPattern>
+				<perUnitPattern>{0} ต่อ ตร.ม.</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>ตร.ซม.</displayName>
 				<unitPattern count="other">{0} ตร.ซม.</unitPattern>
+				<perUnitPattern>{0} ต่อ ตร.ซม.</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>ตร.ไมล์</displayName>
+				<unitPattern count="other">{0} ตร.ไมล์</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>เอเคอร์</displayName>
+				<unitPattern count="other">{0} เอเคอร์</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>ตร.ว.</displayName>
+				<unitPattern count="other">{0} ตร.ว.</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ตร.ฟุต</displayName>
@@ -8239,112 +8453,114 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="area-square-inch">
 				<displayName>ตร.นิ้ว</displayName>
 				<unitPattern count="other">{0} ตร.นิ้ว</unitPattern>
+				<perUnitPattern>{0} ต่อตารางนิ้ว</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>ตร.กม.</displayName>
-				<unitPattern count="other">{0} ตร.กม.</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>ตร.ม.</displayName>
-				<unitPattern count="other">{0} ตร.ม.</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>ตร.ไมล์</displayName>
-				<unitPattern count="other">{0} ตร.ไมล์</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>ตร.ว.</displayName>
-				<unitPattern count="other">{0} ตร.ว.</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>กะรัต</displayName>
+				<unitPattern count="other">{0} กะรัต</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ลิตร/กม.</displayName>
 				<unitPattern count="other">{0} ล./กม.</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ลิตร/100 กิโลเมตร</displayName>
+				<unitPattern count="other">{0} ล./100กม.</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>ไมล์/แกลลอน</displayName>
 				<unitPattern count="other">{0} ไมล์/แกลลอน</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>บิต</displayName>
-				<unitPattern count="other">{0} บิต</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>ไบต์</displayName>
-				<unitPattern count="other">{0} ไบต์</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>ไบต์</displayName>
+				<unitPattern count="other">{0} ไบต์</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>บิต</displayName>
+				<unitPattern count="other">{0} บิต</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="contributed">ศตวรรษ</displayName>
+				<unitPattern count="other" draft="contributed">{0} ศตวรรษ</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ปี</displayName>
+				<unitPattern count="other">{0} ปี</unitPattern>
+				<perUnitPattern draft="contributed">{0}/ปี</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>เดือน</displayName>
+				<unitPattern count="other">{0} เดือน</unitPattern>
+				<perUnitPattern draft="contributed">{0}/เดือน</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>สัปดาห์</displayName>
+				<unitPattern count="other">{0} สัปดาห์</unitPattern>
+				<perUnitPattern draft="contributed">{0}/สัปดาห์</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>วัน</displayName>
 				<unitPattern count="other">{0} วัน</unitPattern>
+				<perUnitPattern draft="contributed">{0}/วัน</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>ชั่วโมง</displayName>
 				<unitPattern count="other">{0} ชม.</unitPattern>
 				<perUnitPattern>{0}/ชม.</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>ไมโครวินาที</displayName>
-				<unitPattern count="other">{0} ไมโครวิ</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>มิลลิวินาที</displayName>
-				<unitPattern count="other">{0} มิลลิวินาที</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>นาที</displayName>
 				<unitPattern count="other">{0} นาที</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>เดือน</displayName>
-				<unitPattern count="other">{0} เดือน</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>นาโนวินาที</displayName>
-				<unitPattern count="other">{0} นาโนวิ</unitPattern>
+				<perUnitPattern draft="contributed">{0}/นาที</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>วินาที</displayName>
 				<unitPattern count="other">{0} วิ</unitPattern>
 				<perUnitPattern>{0}/วิ</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>สัปดาห์</displayName>
-				<unitPattern count="other">{0} สัปดาห์</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>มิลลิวินาที</displayName>
+				<unitPattern count="other">{0} มิลลิวินาที</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>ปี</displayName>
-				<unitPattern count="other">{0} ปี</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>ไมโครวินาที</displayName>
+				<unitPattern count="other">{0} ไมโครวิ</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>นาโนวินาที</displayName>
+				<unitPattern count="other">{0} นาโนวิ</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>แอมป์</displayName>
@@ -8362,6 +8578,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>โวลต์</displayName>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>กิโลแคลอรี่</displayName>
+				<unitPattern count="other">{0} กิโลแคลอรี่</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>แคลอรี่</displayName>
 				<unitPattern count="other">{0} แคลอรี่</unitPattern>
@@ -8370,18 +8590,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>แคลอรี่</displayName>
 				<unitPattern count="other">{0} แคลอรี่</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>จูล</displayName>
-				<unitPattern count="other">{0} จูล</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>กิโลแคลอรี่</displayName>
-				<unitPattern count="other">{0} กิโลแคลอรี่</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>กิโลจูล</displayName>
 				<unitPattern count="other">{0} กิโลจูล</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>จูล</displayName>
+				<unitPattern count="other">{0} จูล</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>กว.-ชม.</displayName>
 				<unitPattern count="other">{0} กว.-ชม.</unitPattern>
@@ -8390,162 +8606,167 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>GHz</displayName>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>หน่วยดาราศาสตร์</displayName>
-				<unitPattern count="other">{0} หน่วยดาราศาสตร์</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>กม.</displayName>
+				<unitPattern count="other">{0} กม.</unitPattern>
+				<perUnitPattern>{0}/กม.</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>ซม.</displayName>
-				<unitPattern count="other">{0} ซม.</unitPattern>
+			<unit type="length-meter">
+				<displayName>เมตร</displayName>
+				<unitPattern count="other">{0} ม.</unitPattern>
+				<perUnitPattern>{0}/ม.</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>ดม.</displayName>
 				<unitPattern count="other">{0} ดม.</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ฟุต</displayName>
-				<unitPattern count="other">{0} ฟุต</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>นิ้ว</displayName>
-				<unitPattern count="other">{0} นิ้ว</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>กม.</displayName>
-				<unitPattern count="other">{0} กม.</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ปีแสง</displayName>
-				<unitPattern count="other">{0} ปีแสง</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>เมตร</displayName>
-				<unitPattern count="other">{0} ม.</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>ไมโครเมตร</displayName>
-				<unitPattern count="other">{0} ไมโครเมตร</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>ไมล์</displayName>
-				<unitPattern count="other">{0} ไมล์</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>ซม.</displayName>
+				<unitPattern count="other">{0} ซม.</unitPattern>
+				<perUnitPattern>{0}/ซม.</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>มม.</displayName>
 				<unitPattern count="other">{0} มม.</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>ไมโครเมตร</displayName>
+				<unitPattern count="other">{0} ไมโครเมตร</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>น.ม.</displayName>
 				<unitPattern count="other">{0} น.ม.</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>ไมล์ทะเล</displayName>
-				<unitPattern count="other">{0} ไมล์ทะเล</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>พาร์เซก</displayName>
-				<unitPattern count="other">{0} พาร์เซก</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>พิโกเมตร</displayName>
 				<unitPattern count="other">{0} พิโกเมตร</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>ไมล์</displayName>
+				<unitPattern count="other">{0} ไมล์</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>หลา</displayName>
 				<unitPattern count="other">{0} หลา</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ฟุต</displayName>
+				<unitPattern count="other">{0} ฟุต</unitPattern>
+				<perUnitPattern>{0}/ฟุต</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>นิ้ว</displayName>
+				<unitPattern count="other">{0} นิ้ว</unitPattern>
+				<perUnitPattern>{0}/นิ้ว</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>พาร์เซก</displayName>
+				<unitPattern count="other">{0} พาร์เซก</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ปีแสง</displayName>
+				<unitPattern count="other">{0} ปีแสง</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>หน่วยดาราศาสตร์</displayName>
+				<unitPattern count="other">{0} หน่วยดาราศาสตร์</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>ไมล์ทะเล</displayName>
+				<unitPattern count="other">{0} ไมล์ทะเล</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>ไมล์สแกนดินีเวีย</displayName>
+				<unitPattern count="other">{0} ไมล์สแกนดินีเวีย</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>ลักซ์</displayName>
 				<unitPattern count="other">{0} ลักซ์</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>กะรัต</displayName>
-				<unitPattern count="other">{0} กะรัต</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>กรัม</displayName>
-				<unitPattern count="other">{0} ก.</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>กก.</displayName>
-				<unitPattern count="other">{0} กก.</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>ต.</displayName>
 				<unitPattern count="other">{0} ต.</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>มคก.</displayName>
-				<unitPattern count="other">{0} มคก.</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>กก.</displayName>
+				<unitPattern count="other">{0} กก.</unitPattern>
+				<perUnitPattern draft="contributed">{0}/ก.ก.</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>กรัม</displayName>
+				<unitPattern count="other">{0} ก.</unitPattern>
+				<perUnitPattern draft="contributed">{0}/กรัม</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>มก.</displayName>
 				<unitPattern count="other">{0} มก.</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ออนซ์</displayName>
-				<unitPattern count="other">{0} ออนซ์</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ทรอยออนซ์</displayName>
-				<unitPattern count="other">{0} ทรอยออนซ์</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>ปอนด์</displayName>
-				<unitPattern count="other">{0} ปอนด์</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>มคก.</displayName>
+				<unitPattern count="other">{0} มคก.</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>ตัน</displayName>
 				<unitPattern count="other">{0} ตัน</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>ปอนด์</displayName>
+				<unitPattern count="other">{0} ปอนด์</unitPattern>
+				<perUnitPattern draft="contributed">{0}/ปอนด์</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ออนซ์</displayName>
+				<unitPattern count="other">{0} ออนซ์</unitPattern>
+				<perUnitPattern draft="contributed">{0}/ออนซ์</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ทรอยออนซ์</displayName>
+				<unitPattern count="other">{0} ทรอยออนซ์</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>กะรัต</displayName>
+				<unitPattern count="other">{0} กะรัต</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>กิกะวัตต์</displayName>
 				<unitPattern count="other">{0} กิกะวัตต์</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>แรงม้า</displayName>
-				<unitPattern count="other">{0} แรงม้า</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>กิโลวัตต์</displayName>
-				<unitPattern count="other">{0} กิโลวัตต์</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>เมกะวัตต์</displayName>
 				<unitPattern count="other">{0} เมกะวัตต์</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>มิลลิวัตต์</displayName>
-				<unitPattern count="other">{0} มิลลิวัตต์</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>กิโลวัตต์</displayName>
+				<unitPattern count="other">{0} กิโลวัตต์</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>วัตต์</displayName>
 				<unitPattern count="other">{0} วัตต์</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>มิลลิวัตต์</displayName>
+				<unitPattern count="other">{0} มิลลิวัตต์</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>แรงม้า</displayName>
+				<unitPattern count="other">{0} แรงม้า</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>เฮกโตปาสกาล</displayName>
 				<unitPattern count="other">{0} เฮกโตปาสกาล</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>นิ้วปรอท</displayName>
-				<unitPattern count="other">{0} นิ้วปรอท</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>มิลลิบาร์</displayName>
-				<unitPattern count="other">{0} มิลลิบาร์</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>มม. ปรอท</displayName>
 				<unitPattern count="other">{0} มม. ปรอท</unitPattern>
@@ -8554,9 +8775,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ปอนด์/ตร.นิ้ว</displayName>
 				<unitPattern count="other">{0} ปอนด์/ตร.นิ้ว</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>กะรัต</displayName>
-				<unitPattern count="other">{0} กะรัต</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>นิ้วปรอท</displayName>
+				<unitPattern count="other">{0} นิ้วปรอท</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>มิลลิบาร์</displayName>
+				<unitPattern count="other">{0} มิลลิบาร์</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>กม./ชั่วโมง</displayName>
@@ -8570,6 +8795,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ไมล์/ชั่วโมง</displayName>
 				<unitPattern count="other">{0} ไมล์/ชม.</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName draft="contributed">นอต</displayName>
+				<unitPattern count="other" draft="contributed">{0} นอต</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>องศาเซลเซียส</displayName>
 				<unitPattern count="other">{0}°C</unitPattern>
@@ -8582,26 +8815,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>K</displayName>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>เอเคอร์-ฟุต</displayName>
-				<unitPattern count="other">{0} เอเคอร์-ฟุต</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>ซล.</displayName>
-				<unitPattern count="other">{0} ซล.</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>ลบ.ซม.</displayName>
-				<unitPattern count="other">{0} ลบ.ซม.</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ลบ.ฟุต</displayName>
-				<unitPattern count="other">{0} ลบ.ฟุต</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>ลบ.นิ้ว</displayName>
-				<unitPattern count="other">{0} ลบ.นิ้ว</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>ลบ.กม.</displayName>
 				<unitPattern count="other">{0} ลบ.กม.</unitPattern>
@@ -8609,6 +8822,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-cubic-meter">
 				<displayName>ลบ.ม.</displayName>
 				<unitPattern count="other">{0} ลบ.ม.</unitPattern>
+				<perUnitPattern>{0}/ลบ.ม.</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>ลบ.ซม.</displayName>
+				<unitPattern count="other">{0} ลบ.ซม.</unitPattern>
+				<perUnitPattern>{0}/ลบ.ซม.</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>ลบ.ไมล์</displayName>
@@ -8618,21 +8837,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ลบ.หลา</displayName>
 				<unitPattern count="other">{0} ลบ.หลา</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>ถ้วย</displayName>
-				<unitPattern count="other">{0} ถ.</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ลบ.ฟุต</displayName>
+				<unitPattern count="other">{0} ลบ.ฟุต</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>ดล.</displayName>
-				<unitPattern count="other">{0} ดล.</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>ลบ.นิ้ว</displayName>
+				<unitPattern count="other">{0} ลบ.นิ้ว</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>ฟลูอิดออนซ์</displayName>
-				<unitPattern count="other">{0} ฟลูอิดออนซ์</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>แกลลอน</displayName>
-				<unitPattern count="other">{0} แกลลอน</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>เมกกะลิตร</displayName>
+				<unitPattern count="other">{0} เมกกะลิตร</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>ฮล.</displayName>
@@ -8641,23 +8856,53 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-liter">
 				<displayName>ลิตร</displayName>
 				<unitPattern count="other">{0} ล.</unitPattern>
+				<perUnitPattern>{0}/ล.</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>เมกกะลิตร</displayName>
-				<unitPattern count="other">{0} เมกกะลิตร</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>ดล.</displayName>
+				<unitPattern count="other">{0} ดล.</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>ซล.</displayName>
+				<unitPattern count="other">{0} ซล.</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>มล.</displayName>
 				<unitPattern count="other">{0} มล.</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>ไพนต</displayName>
-				<unitPattern count="other">{0} ไพนต</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>ไพนต์เมตริก</displayName>
+				<unitPattern count="other">{0} ไพนต์เมตริก</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>ถ. เมตริก</displayName>
+				<unitPattern count="other">{0} ถ. เมตริก</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>เอเคอร์-ฟุต</displayName>
+				<unitPattern count="other">{0} เอเคอร์-ฟุต</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>แกลลอน</displayName>
+				<unitPattern count="other">{0} แกลลอน</unitPattern>
+				<perUnitPattern>{0}/แกลลอน</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>คว.</displayName>
 				<unitPattern count="other">{0} คว.</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>ไพนต์</displayName>
+				<unitPattern count="other">{0} ไพนต์</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>ถ้วย</displayName>
+				<unitPattern count="other">{0} ถ.</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>ฟลูอิดออนซ์</displayName>
+				<unitPattern count="other">{0} ฟลูอิดออนซ์</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>ชต.</displayName>
 				<unitPattern count="other">{0} ชต.</unitPattern>
@@ -8666,6 +8911,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ชช.</displayName>
 				<unitPattern count="other">{0} ชช.</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">{0} ตอ</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">{0} น</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">{0}ใต้</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0} ตต</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -8674,33 +8925,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="acceleration-g-force">
 				<unitPattern count="other">{0}G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="other">{0}นาที</unitPattern>
 			</unit>
 			<unit type="angle-arc-second">
 				<unitPattern count="other">{0}วิ</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="other">{0}เอเคอร์</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="other">{0}ตร.กม.</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="other">{0}เฮกตาร์</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="other">{0}ตร.ฟุต</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="other">{0}ตร.กม.</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="other">{0}ตร.ม.</unitPattern>
 			</unit>
 			<unit type="area-square-mile">
 				<unitPattern count="other">{0}ตร.ไมล์</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="other">{0}เอเคอร์</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="other">{0}ตร.ฟุต</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>ล. /100 กม.</displayName>
+				<unitPattern count="other">{0}ล/100กม</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ปี</displayName>
+				<unitPattern count="other">{0}ปี</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>เดือน</displayName>
+				<unitPattern count="other">{0}เดือน</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>สัปดาห์</displayName>
+				<unitPattern count="other">{0}สัปดาห์</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>วัน</displayName>
 				<unitPattern count="other">{0}วัน</unitPattern>
@@ -8709,53 +8976,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ชั่วโมง</displayName>
 				<unitPattern count="other">{0}ชม.</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>มิลลิวินาที</displayName>
-				<unitPattern count="other">{0} มิลลิวิ</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>นาที</displayName>
 				<unitPattern count="other">{0}นาที</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>เดือน</displayName>
-				<unitPattern count="other">{0}เดือน</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>วิ</displayName>
 				<unitPattern count="other">{0}วิ</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>สัปดาห์</displayName>
-				<unitPattern count="other">{0}สัปดาห์</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>ปี</displayName>
-				<unitPattern count="other">{0}ปี</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>ซม.</displayName>
-				<unitPattern count="other">{0}ซม.</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="other">{0}′</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="other">{0}″</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>มิลลิวินาที</displayName>
+				<unitPattern count="other">{0} มิลลิวิ</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>กม.</displayName>
 				<unitPattern count="other">{0}กม.</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="other">{0}ปีแสง</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>เมตร</displayName>
 				<unitPattern count="other">{0}ม.</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="other">{0}ไมล์</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>ซม.</displayName>
+				<unitPattern count="other">{0}ซม.</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>มม.</displayName>
@@ -8764,25 +9007,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="length-picometer">
 				<unitPattern count="other">{0}พิโกเมตร</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="other">{0}ไมล์</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="other">{0}หลา</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>กรัม</displayName>
-				<unitPattern count="other">{0}ก.</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="other">{0}′</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="other">{0}ปีแสง</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>กก.</displayName>
 				<unitPattern count="other">{0}กก.</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="other">{0}ออนซ์</unitPattern>
+			<unit type="mass-gram">
+				<displayName>กรัม</displayName>
+				<unitPattern count="other">{0}ก.</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="other">{0}#</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="other">{0}แรงม้า</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="other">{0}ออนซ์</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="other">{0}กิโลวัตต์</unitPattern>
@@ -8790,6 +9042,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="power-watt">
 				<unitPattern count="other">{0}วัตต์</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="other">{0}แรงม้า</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="contributed">เฮกโตปาสกาล</displayName>
 				<unitPattern count="other">{0}hPa</unitPattern>
@@ -8827,6 +9082,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ลิตร</displayName>
 				<unitPattern count="other">{0}ล.</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">{0} ตอ</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">{0} น</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">{0}ใต้</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0} ตต</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/th_TH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/th_TH.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/th_TH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/th_TH.xml
index baa38aa4a57..d095086ac5a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/th_TH.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/th_TH.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="th"/>
 		<territory type="TH"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ti.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ti.xml
similarity index 93%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ti.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ti.xml
index e2f2a35608b..e9bbea09316 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ti.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ti.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="ti"/>
 	</identity>
 	<localeDisplayNames>
@@ -141,7 +140,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI" draft="unconfirmed">አንጉኢላ</territory>
 			<territory type="AL" draft="unconfirmed">አልባኒያ</territory>
 			<territory type="AM" draft="unconfirmed">አርሜኒያ</territory>
-			<territory type="AN" draft="unconfirmed">ኔዘርላንድስ አንቲልስ</territory>
 			<territory type="AO" draft="unconfirmed">አንጐላ</territory>
 			<territory type="AQ" draft="unconfirmed">አንታርክቲካ</territory>
 			<territory type="AR" draft="unconfirmed">አርጀንቲና</territory>
@@ -489,6 +487,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</days>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">ንጉሆ ሰዓተ</dayPeriod>
+							<dayPeriod type="pm">ድሕር ሰዓት</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">ንጉሆ ሰዓተ</dayPeriod>
 							<dayPeriod type="pm">ድሕር ሰዓት</dayPeriod>
@@ -573,6 +575,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="BRL">
@@ -606,3 +636,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ti_ER.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ti_ER.xml
similarity index 98%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ti_ER.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ti_ER.xml
index 126f54987a7..4c475e17782 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ti_ER.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ti_ER.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11093 $"/>
-		<generation date="$Date: 2015-01-02 21:36:02 -0600 (Fri, 02 Jan 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ti"/>
 		<territory type="ER"/>
 	</identity>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ti_ET.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ti_ET.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ti_ET.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ti_ET.xml
index f378302cd9e..9709e995b83 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ti_ET.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ti_ET.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ti"/>
 		<territory type="ET"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tk.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tk.xml
new file mode 100644
index 00000000000..ef41e103fa4
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tk.xml
@@ -0,0 +1,5626 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2014 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12293 $"/>
+		<language type="tk"/>
+	</identity>
+	<localeDisplayNames>
+		<languages>
+			<language type="ar" draft="provisional">arapça</language>
+			<language type="az" draft="provisional">azerbaýjança</language>
+			<language type="de" draft="provisional">nemisçe</language>
+			<language type="en" draft="provisional">iňlisçe</language>
+			<language type="es" draft="provisional">ispança</language>
+			<language type="fa" draft="provisional">parsça</language>
+			<language type="fr" draft="provisional">fransuzça</language>
+			<language type="hy" draft="provisional">ermençe</language>
+			<language type="it" draft="provisional">italýança</language>
+			<language type="ja" draft="provisional">ýaponça</language>
+			<language type="ka" draft="provisional">gruzinçe</language>
+			<language type="kk" draft="provisional">gazakça</language>
+			<language type="ky" draft="provisional">gyrgyzça</language>
+			<language type="nl" draft="provisional">golland dilini</language>
+			<language type="ps" draft="provisional">paştoça</language>
+			<language type="ru" draft="provisional">orusça</language>
+			<language type="tg" draft="provisional">täjikçe</language>
+			<language type="tk" draft="provisional">türkmençe</language>
+			<language type="tr" draft="provisional">türkçe</language>
+			<language type="uk" draft="provisional">ukrainça</language>
+			<language type="uz" draft="provisional">özbekçe</language>
+			<language type="zh" draft="provisional">hytaýça</language>
+		</languages>
+		<scripts>
+			<script type="Arab" draft="unconfirmed">arap</script>
+			<script type="Cyrl" draft="unconfirmed">kiril</script>
+			<script type="Latn" draft="unconfirmed">latin</script>
+		</scripts>
+		<territories>
+			<territory type="001" draft="unconfirmed">Dunýä</territory>
+			<territory type="AU" draft="unconfirmed">Awstraliýa</territory>
+			<territory type="AZ" draft="provisional">Azerbaýjan</territory>
+			<territory type="CN" draft="unconfirmed">Hytaý</territory>
+			<territory type="DE" draft="unconfirmed">Germaniýa</territory>
+			<territory type="GB" draft="unconfirmed">Britaniýa</territory>
+			<territory type="IL" draft="provisional">Ysraýyl</territory>
+			<territory type="IN" draft="provisional">Hindistan</territory>
+			<territory type="IR" draft="provisional">Eýran</territory>
+			<territory type="IT" draft="provisional">Italiýa</territory>
+			<territory type="JP" draft="provisional">Ýaponiýa</territory>
+			<territory type="PK" draft="provisional">Pakistan</territory>
+			<territory type="RU" draft="provisional">Orusýet</territory>
+			<territory type="TM" draft="unconfirmed">Türkmenistan</territory>
+			<territory type="TR" draft="provisional">Türkiýe</territory>
+			<territory type="UA" draft="provisional">Ukraina</territory>
+			<territory type="US" draft="provisional">A.B.Ş.</territory>
+			<territory type="UZ" draft="provisional">Özbegistan</territory>
+		</territories>
+		<keys>
+			<key type="calendar">Senenama</key>
+		</keys>
+		<types>
+			<type key="calendar" type="buddhist">Buddist senenamasy</type>
+			<type key="calendar" type="chinese">Hytaý senenamasy</type>
+			<type key="calendar" type="dangi">Dangi senenamasy</type>
+			<type key="calendar" type="ethiopic">Efiopik senenamasy</type>
+			<type key="calendar" type="gregorian">Gregorýan senenamasy</type>
+			<type key="calendar" type="hebrew">Ýewreý senenamasy</type>
+			<type key="calendar" type="islamic">Yslam senenamasy</type>
+			<type key="calendar" type="iso8601">ISO-8601 senenamasy</type>
+			<type key="calendar" type="japanese">Ýapon senenamasy</type>
+			<type key="calendar" type="persian">Pars senenamasy</type>
+			<type key="calendar" type="roc">Minguo senenamasy</type>
+		</types>
+		<measurementSystemNames>
+			<measurementSystemName type="metric">Metrik</measurementSystemName>
+			<measurementSystemName type="UK">BK</measurementSystemName>
+			<measurementSystemName type="US">ABŞ</measurementSystemName>
+		</measurementSystemNames>
+	</localeDisplayNames>
+	<characters>
+		<exemplarCharacters>[a b ç d e ä f g h i j ž k l m n ň o ö p r s ş t u ü w y ý z]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[c q v x]</exemplarCharacters>
+		<exemplarCharacters type="index">[A B Ç D E Ä F G H I J Ž K L M N Ň O Ö P R S Ş T U Ü W Y Ý Z]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- – — , ; \: ! ? . … &quot; “ ” ( ) \[ \] \{ \} § @ * #]</exemplarCharacters>
+		<ellipsis type="final">{0}…</ellipsis>
+		<ellipsis type="initial">…{0}</ellipsis>
+		<ellipsis type="medial">{0}…{1}</ellipsis>
+		<ellipsis type="word-final">{0} …</ellipsis>
+		<ellipsis type="word-initial">… {0}</ellipsis>
+		<ellipsis type="word-medial">{0} … {1}</ellipsis>
+		<moreInformation>?</moreInformation>
+	</characters>
+	<delimiters>
+		<quotationStart>“</quotationStart>
+		<quotationEnd>”</quotationEnd>
+		<alternateQuotationStart>“</alternateQuotationStart>
+		<alternateQuotationEnd>”</alternateQuotationEnd>
+	</delimiters>
+	<dates>
+		<calendars>
+			<calendar type="generic">
+				<days>
+					<dayContext type="format">
+						<dayWidth type="abbreviated">
+							<day type="sun" draft="unconfirmed">ýb</day>
+							<day type="mon" draft="unconfirmed">db</day>
+							<day type="tue" draft="unconfirmed">sb</day>
+							<day type="wed" draft="unconfirmed">çb</day>
+							<day type="thu" draft="unconfirmed">pb</day>
+							<day type="fri" draft="unconfirmed">an</day>
+							<day type="sat" draft="unconfirmed">şb</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun" draft="provisional">ýekşenbe</day>
+							<day type="mon" draft="provisional">duşenbe</day>
+							<day type="tue" draft="provisional">sişenbe</day>
+							<day type="wed" draft="provisional">çarşenbe</day>
+							<day type="thu" draft="provisional">penşenbe</day>
+							<day type="fri" draft="provisional">anna</day>
+							<day type="sat" draft="provisional">şenbe</day>
+						</dayWidth>
+					</dayContext>
+					<dayContext type="stand-alone">
+						<dayWidth type="narrow">
+							<day type="sun">Ý</day>
+							<day type="mon">D</day>
+							<day type="tue">S</day>
+							<day type="wed">Ç</day>
+							<day type="thu">P</day>
+							<day type="fri">A</day>
+							<day type="sat">Ş</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern draft="unconfirmed">d MMMM y G EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern draft="unconfirmed">d MMMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern draft="unconfirmed">d MMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern draft="provisional">dd.MM.y GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern draft="unconfirmed">HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern draft="unconfirmed">HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern draft="provisional">HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern draft="provisional">HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="d" draft="unconfirmed">d</dateFormatItem>
+						<dateFormatItem id="Ed" draft="unconfirmed">d E</dateFormatItem>
+						<dateFormatItem id="H" draft="unconfirmed">HH</dateFormatItem>
+						<dateFormatItem id="hm" draft="unconfirmed">h:mm a</dateFormatItem>
+						<dateFormatItem id="Hm" draft="unconfirmed">HH:mm</dateFormatItem>
+						<dateFormatItem id="hms" draft="unconfirmed">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hms" draft="unconfirmed">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="M" draft="unconfirmed">L</dateFormatItem>
+						<dateFormatItem id="Md" draft="unconfirmed">dd.MM</dateFormatItem>
+						<dateFormatItem id="MEd" draft="unconfirmed">dd.MM E</dateFormatItem>
+						<dateFormatItem id="MMM" draft="unconfirmed">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd" draft="unconfirmed">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd" draft="unconfirmed">d MMM E</dateFormatItem>
+						<dateFormatItem id="MMMMd" draft="unconfirmed">d MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMEd" draft="unconfirmed">d MMMM E</dateFormatItem>
+						<dateFormatItem id="mmss" draft="unconfirmed">mm:ss</dateFormatItem>
+						<dateFormatItem id="ms" draft="unconfirmed">mm:ss</dateFormatItem>
+						<dateFormatItem id="y" draft="unconfirmed">y</dateFormatItem>
+						<dateFormatItem id="yM" draft="unconfirmed">MM.y</dateFormatItem>
+						<dateFormatItem id="yMd" draft="unconfirmed">dd.MM.y</dateFormatItem>
+						<dateFormatItem id="yMEd" draft="unconfirmed">dd.MM.y E</dateFormatItem>
+						<dateFormatItem id="yMMM" draft="unconfirmed">MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMd" draft="unconfirmed">d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMEd" draft="unconfirmed">d MMM y E</dateFormatItem>
+						<dateFormatItem id="yMMMM" draft="unconfirmed">MMMM y</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d" draft="unconfirmed">d–d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a" draft="unconfirmed">h a – h a</greatestDifference>
+							<greatestDifference id="h" draft="unconfirmed">h–h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H" draft="unconfirmed">HH–HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a" draft="unconfirmed">h a – h a v</greatestDifference>
+							<greatestDifference id="h" draft="unconfirmed">h–h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H" draft="unconfirmed">HH–HH v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M" draft="unconfirmed">MM – MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d" draft="unconfirmed">dd.MM – dd.MM</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">dd.MM – dd.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d" draft="unconfirmed">dd.MM E – dd.MM E</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">dd.MM E – dd.MM E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M" draft="unconfirmed">MMM–MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d" draft="unconfirmed">d – d MMM</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d" draft="unconfirmed">d MMM E – d MMM E</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">d MMM E – d MMM E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y" draft="unconfirmed">y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M" draft="unconfirmed">MM.y – MM.y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">MM.y – MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d" draft="unconfirmed">dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">dd.MM.y – dd.MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d" draft="unconfirmed">dd.MM.y E – dd.MM.y E</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">dd.MM.y E – dd.MM.y E</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">dd.MM.y E – dd.MM.y E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M" draft="unconfirmed">MMM–MMM y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">MMM y – MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d" draft="unconfirmed">d – d MMM y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">d MMM y – d MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d" draft="unconfirmed">d MMM y E – d MMM y E</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">d MMM y E – d MMM y E</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">d MMM y E – d MMM y E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M" draft="unconfirmed">MMMM–MMMM y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">MMMM y – MMMM y</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="provisional">ýan</month>
+							<month type="2" draft="provisional">few</month>
+							<month type="3" draft="provisional">mart</month>
+							<month type="4" draft="provisional">apr</month>
+							<month type="5" draft="provisional">maý</month>
+							<month type="6" draft="provisional">iýun</month>
+							<month type="7" draft="provisional">iýul</month>
+							<month type="8" draft="provisional">awg</month>
+							<month type="9" draft="provisional">sen</month>
+							<month type="10" draft="provisional">okt</month>
+							<month type="11" draft="provisional">noý</month>
+							<month type="12" draft="provisional">dek</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="provisional">ýanwar</month>
+							<month type="2" draft="provisional">fewral</month>
+							<month type="3" draft="provisional">mart</month>
+							<month type="4" draft="provisional">aprel</month>
+							<month type="5" draft="provisional">maý</month>
+							<month type="6" draft="provisional">iýun</month>
+							<month type="7" draft="provisional">iýul</month>
+							<month type="8" draft="provisional">awgust</month>
+							<month type="9" draft="provisional">sentýabr</month>
+							<month type="10" draft="provisional">oktýabr</month>
+							<month type="11" draft="provisional">noýabr</month>
+							<month type="12" draft="provisional">dekabr</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="narrow">
+							<month type="1" draft="unconfirmed">Ý</month>
+							<month type="2" draft="unconfirmed">F</month>
+							<month type="3" draft="unconfirmed">M</month>
+							<month type="4" draft="unconfirmed">A</month>
+							<month type="5" draft="unconfirmed">M</month>
+							<month type="6" draft="unconfirmed">I</month>
+							<month type="7" draft="unconfirmed">I</month>
+							<month type="8" draft="unconfirmed">A</month>
+							<month type="9" draft="unconfirmed">S</month>
+							<month type="10" draft="unconfirmed">O</month>
+							<month type="11" draft="unconfirmed">N</month>
+							<month type="12" draft="unconfirmed">D</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="abbreviated">
+							<day type="sun" draft="unconfirmed">ýb</day>
+							<day type="mon" draft="unconfirmed">db</day>
+							<day type="tue" draft="unconfirmed">sb</day>
+							<day type="wed" draft="unconfirmed">çb</day>
+							<day type="thu" draft="unconfirmed">pb</day>
+							<day type="fri" draft="unconfirmed">an</day>
+							<day type="sat" draft="unconfirmed">şb</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun" draft="provisional">ýekşenbe</day>
+							<day type="mon" draft="provisional">duşenbe</day>
+							<day type="tue" draft="provisional">sişenbe</day>
+							<day type="wed" draft="provisional">çarşenbe</day>
+							<day type="thu" draft="provisional">penşenbe</day>
+							<day type="fri" draft="provisional">anna</day>
+							<day type="sat" draft="provisional">şenbe</day>
+						</dayWidth>
+					</dayContext>
+					<dayContext type="stand-alone">
+						<dayWidth type="narrow">
+							<day type="sun">Ý</day>
+							<day type="mon">D</day>
+							<day type="tue">S</day>
+							<day type="wed">Ç</day>
+							<day type="thu">P</day>
+							<day type="fri">A</day>
+							<day type="sat">Ş</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>d MMMM y EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d MMMM y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>d MMM y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>dd.MM.y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern draft="unconfirmed">HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern draft="unconfirmed">HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern draft="provisional">HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern draft="provisional">HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="d" draft="unconfirmed">d</dateFormatItem>
+						<dateFormatItem id="Ed" draft="unconfirmed">d E</dateFormatItem>
+						<dateFormatItem id="H" draft="unconfirmed">HH</dateFormatItem>
+						<dateFormatItem id="hm" draft="unconfirmed">h:mm a</dateFormatItem>
+						<dateFormatItem id="Hm" draft="unconfirmed">HH:mm</dateFormatItem>
+						<dateFormatItem id="hms" draft="unconfirmed">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hms" draft="unconfirmed">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="M" draft="unconfirmed">L</dateFormatItem>
+						<dateFormatItem id="Md" draft="unconfirmed">dd.MM</dateFormatItem>
+						<dateFormatItem id="MEd" draft="unconfirmed">dd.MM E</dateFormatItem>
+						<dateFormatItem id="MMM" draft="unconfirmed">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd" draft="unconfirmed">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd" draft="unconfirmed">d MMM E</dateFormatItem>
+						<dateFormatItem id="MMMMd" draft="unconfirmed">d MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMEd" draft="unconfirmed">d MMMM E</dateFormatItem>
+						<dateFormatItem id="mmss" draft="unconfirmed">mm:ss</dateFormatItem>
+						<dateFormatItem id="ms" draft="unconfirmed">mm:ss</dateFormatItem>
+						<dateFormatItem id="y" draft="unconfirmed">y</dateFormatItem>
+						<dateFormatItem id="yM" draft="unconfirmed">MM.y</dateFormatItem>
+						<dateFormatItem id="yMd" draft="unconfirmed">dd.MM.y</dateFormatItem>
+						<dateFormatItem id="yMEd" draft="unconfirmed">dd.MM.y E</dateFormatItem>
+						<dateFormatItem id="yMMM" draft="unconfirmed">MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMd" draft="unconfirmed">d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMEd" draft="unconfirmed">d MMM y E</dateFormatItem>
+						<dateFormatItem id="yMMMM" draft="unconfirmed">MMMM y</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d" draft="unconfirmed">d–d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a" draft="unconfirmed">h a – h a</greatestDifference>
+							<greatestDifference id="h" draft="unconfirmed">h–h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H" draft="unconfirmed">HH–HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">HH:mm–HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a" draft="unconfirmed">h a – h a v</greatestDifference>
+							<greatestDifference id="h" draft="unconfirmed">h–h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H" draft="unconfirmed">HH–HH v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M" draft="unconfirmed">MM – MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d" draft="unconfirmed">dd.MM – dd.MM</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">dd.MM – dd.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d" draft="unconfirmed">dd.MM E – dd.MM E</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">dd.MM E – dd.MM E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M" draft="unconfirmed">MMM–MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d" draft="unconfirmed">d – d MMM</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d" draft="unconfirmed">d MMM E – d MMM E</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">d MMM E – d MMM E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y" draft="unconfirmed">y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M" draft="unconfirmed">MM.y – MM.y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">MM.y – MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d" draft="unconfirmed">dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">dd.MM.y – dd.MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d" draft="unconfirmed">dd.MM.y E – dd.MM.y E</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">dd.MM.y E – dd.MM.y E</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">dd.MM.y E – dd.MM.y E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M" draft="unconfirmed">MMM–MMM y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">MMM y – MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d" draft="unconfirmed">d – d MMM y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">d MMM y – d MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d" draft="unconfirmed">d MMM y E – d MMM y E</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">d MMM y E – d MMM y E</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">d MMM y E – d MMM y E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M" draft="unconfirmed">MMMM–MMMM y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">MMMM y – MMMM y</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="era">
+				<displayName>döwür</displayName>
+			</field>
+			<field type="year">
+				<displayName>ýyl</displayName>
+				<relative type="-1">geçen ýyl</relative>
+				<relative type="0">şu ýyl</relative>
+				<relative type="1">indiki ýyl</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} ýyldan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ýyldan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} ýyl öň</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ýyl öň</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-short">
+				<displayName>ý.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0}ý.-dan</relativeTimePattern>
+					<relativeTimePattern count="other">{0}ý.-dan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0}ý. öň</relativeTimePattern>
+					<relativeTimePattern count="other">{0}ý. öň</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-narrow">
+				<displayName>ý.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0}ý.-dan</relativeTimePattern>
+					<relativeTimePattern count="other">{0}ý.-dan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0}ý. öň</relativeTimePattern>
+					<relativeTimePattern count="other">{0}ý. öň</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter">
+				<displayName>çarýek</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} çärýekden</relativeTimePattern>
+					<relativeTimePattern count="other">{0} çärýekden</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} çärýek öň</relativeTimePattern>
+					<relativeTimePattern count="other">{0} çärýek öň</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-short">
+				<displayName>çär.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} çär-den</relativeTimePattern>
+					<relativeTimePattern count="other">{0} çär-den</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} çär. öň</relativeTimePattern>
+					<relativeTimePattern count="other">{0} çär. öň</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-narrow">
+				<displayName>çär.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} ç-den</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ç-den</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} ç. öň</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ç. öň</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month">
+				<displayName>aý</displayName>
+				<relative type="-1">geçen aý</relative>
+				<relative type="0">şu aý</relative>
+				<relative type="1">indiki aý</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} aýdan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} aýdan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} aý öň</relativeTimePattern>
+					<relativeTimePattern count="other">{0} aý öň</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-short">
+				<displayName>aý</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} aýdan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} aýdan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} aý öň</relativeTimePattern>
+					<relativeTimePattern count="other">{0} aý öň</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-narrow">
+				<displayName>aý</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} aýdan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} aýdan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} aý öň</relativeTimePattern>
+					<relativeTimePattern count="other">{0} aý öň</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week">
+				<displayName>hepde</displayName>
+				<relative type="-1">geçen hepde</relative>
+				<relative type="0">şu hepde</relative>
+				<relative type="1">indiki hepde</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} hepdeden</relativeTimePattern>
+					<relativeTimePattern count="other">{0} hepdeden</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} hepde öň</relativeTimePattern>
+					<relativeTimePattern count="other">{0} hepde öň</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-short">
+				<displayName>hep.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} hep-den</relativeTimePattern>
+					<relativeTimePattern count="other">{0} hep-den</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} hep. öň</relativeTimePattern>
+					<relativeTimePattern count="other">{0} hep. öň</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-narrow">
+				<displayName>hep.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} h-den</relativeTimePattern>
+					<relativeTimePattern count="other">{0} h-den</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} h. öň</relativeTimePattern>
+					<relativeTimePattern count="other">{0} h. öň</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day">
+				<displayName>gün</displayName>
+				<relative type="-1">düýn</relative>
+				<relative type="0">şu gün</relative>
+				<relative type="1">ertir</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} günden</relativeTimePattern>
+					<relativeTimePattern count="other">{0} günden</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} gün öň</relativeTimePattern>
+					<relativeTimePattern count="other">{0} gün öň</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-short">
+				<displayName>gün</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} g-den</relativeTimePattern>
+					<relativeTimePattern count="other">{0} g-den</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} g. öň</relativeTimePattern>
+					<relativeTimePattern count="other">{0} g. öň</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-narrow">
+				<displayName>gün</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} g-den</relativeTimePattern>
+					<relativeTimePattern count="other">{0} g-den</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} g. öň</relativeTimePattern>
+					<relativeTimePattern count="other">{0} g. öň</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="weekday">
+				<displayName>hepdäniň güni</displayName>
+			</field>
+			<field type="dayperiod">
+				<displayName>güniň dowamy</displayName>
+			</field>
+			<field type="hour">
+				<displayName>sagat</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} sagatdan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} sagatdan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} sagat öň</relativeTimePattern>
+					<relativeTimePattern count="other">{0} sagat öň</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-short">
+				<displayName>sag.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} sag-dan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} sag-dan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} sag. öň</relativeTimePattern>
+					<relativeTimePattern count="other">{0} sag. öň</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-narrow">
+				<displayName>sag.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} sag-dan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} sag-dan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} sag. öň</relativeTimePattern>
+					<relativeTimePattern count="other">{0} sag. öň</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute">
+				<displayName>minut</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} minutdan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} minutdan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} minut öň</relativeTimePattern>
+					<relativeTimePattern count="other">{0} minut öň</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-short">
+				<displayName>min.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} min-dan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} min-dan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} min. öň</relativeTimePattern>
+					<relativeTimePattern count="other">{0} min. öň</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-narrow">
+				<displayName>min.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} min-dan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} min-dan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} min. öň</relativeTimePattern>
+					<relativeTimePattern count="other">{0} min. öň</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second">
+				<displayName>sekunt</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} sekuntdan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} sekuntdan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} sekunt öň</relativeTimePattern>
+					<relativeTimePattern count="other">{0} sekunt öň</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-short">
+				<displayName>sek.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} sek-dan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} sek-dan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} sek. öň</relativeTimePattern>
+					<relativeTimePattern count="other">{0} sek. öň</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-narrow">
+				<displayName>sek.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} sek-dan</relativeTimePattern>
+					<relativeTimePattern count="other">{0} sek-dan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} sek. öň</relativeTimePattern>
+					<relativeTimePattern count="other">{0} sek. öň</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="zone">
+				<displayName>sagat guşaklygy</displayName>
+			</field>
+		</fields>
+		<timeZoneNames>
+			<hourFormat>+HH:mm;-HH:mm</hourFormat>
+			<gmtFormat>GMT{0}</gmtFormat>
+			<gmtZeroFormat>GMT</gmtZeroFormat>
+			<regionFormat>{0} wagty</regionFormat>
+			<regionFormat type="daylight">{0}, tomusky wagt</regionFormat>
+			<regionFormat type="standard">{0}, standart wagt</regionFormat>
+			<fallbackFormat>{1} ({0})</fallbackFormat>
+			<zone type="Etc/Unknown">
+				<exemplarCity>Näbelli</exemplarCity>
+			</zone>
+			<zone type="Europe/Andorra">
+				<exemplarCity>Andorra</exemplarCity>
+			</zone>
+			<zone type="Asia/Dubai">
+				<exemplarCity>Dubaý</exemplarCity>
+			</zone>
+			<zone type="Asia/Kabul">
+				<exemplarCity>Kabul</exemplarCity>
+			</zone>
+			<zone type="America/Antigua">
+				<exemplarCity>Antigua</exemplarCity>
+			</zone>
+			<zone type="America/Anguilla">
+				<exemplarCity>Angilýa</exemplarCity>
+			</zone>
+			<zone type="Europe/Tirane">
+				<exemplarCity>Tirana</exemplarCity>
+			</zone>
+			<zone type="Asia/Yerevan">
+				<exemplarCity>Ýerewan</exemplarCity>
+			</zone>
+			<zone type="Africa/Luanda">
+				<exemplarCity>Luanda</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Rothera">
+				<exemplarCity>Rotera</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Palmer">
+				<exemplarCity>Palmer</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Troll">
+				<exemplarCity>Trol</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Syowa">
+				<exemplarCity>Sýowa</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Mawson">
+				<exemplarCity>Mouson</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Davis">
+				<exemplarCity>Deýwis</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Vostok">
+				<exemplarCity>Wostok</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Casey">
+				<exemplarCity>Keýsi</exemplarCity>
+			</zone>
+			<zone type="Antarctica/DumontDUrville">
+				<exemplarCity>Dýumon-d-Ýurwil</exemplarCity>
+			</zone>
+			<zone type="Antarctica/McMurdo">
+				<exemplarCity>Mak-Merdo</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Rio_Gallegos">
+				<exemplarCity>Rio-Galegos</exemplarCity>
+			</zone>
+			<zone type="America/Mendoza">
+				<exemplarCity>Mendosa</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/San_Juan">
+				<exemplarCity>San-Huan</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Ushuaia">
+				<exemplarCity>Uşuaýa</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/La_Rioja">
+				<exemplarCity>La-Rioha</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/San_Luis">
+				<exemplarCity>San-Luis</exemplarCity>
+			</zone>
+			<zone type="America/Catamarca">
+				<exemplarCity>Katamarka</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Salta">
+				<exemplarCity>Salta</exemplarCity>
+			</zone>
+			<zone type="America/Jujuy">
+				<exemplarCity>Žužuý</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Tucuman">
+				<exemplarCity>Tukuman</exemplarCity>
+			</zone>
+			<zone type="America/Cordoba">
+				<exemplarCity>Kordowa</exemplarCity>
+			</zone>
+			<zone type="America/Buenos_Aires">
+				<exemplarCity>Buenos-Aýres</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pago_Pago">
+				<exemplarCity>Pago-Pago</exemplarCity>
+			</zone>
+			<zone type="Europe/Vienna">
+				<exemplarCity>Wena</exemplarCity>
+			</zone>
+			<zone type="Australia/Perth">
+				<exemplarCity>Pert</exemplarCity>
+			</zone>
+			<zone type="Australia/Eucla">
+				<exemplarCity>Ýukla</exemplarCity>
+			</zone>
+			<zone type="Australia/Darwin">
+				<exemplarCity>Darwin</exemplarCity>
+			</zone>
+			<zone type="Australia/Adelaide">
+				<exemplarCity>Adelaýda</exemplarCity>
+			</zone>
+			<zone type="Australia/Broken_Hill">
+				<exemplarCity>Broken-Hil</exemplarCity>
+			</zone>
+			<zone type="Australia/Currie">
+				<exemplarCity>Kerri</exemplarCity>
+			</zone>
+			<zone type="Australia/Melbourne">
+				<exemplarCity>Melburn</exemplarCity>
+			</zone>
+			<zone type="Australia/Hobart">
+				<exemplarCity>Hobart</exemplarCity>
+			</zone>
+			<zone type="Australia/Lindeman">
+				<exemplarCity>Lindeman</exemplarCity>
+			</zone>
+			<zone type="Australia/Sydney">
+				<exemplarCity>Sidneý</exemplarCity>
+			</zone>
+			<zone type="Australia/Brisbane">
+				<exemplarCity>Brisben</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Macquarie">
+				<exemplarCity>Makkuari</exemplarCity>
+			</zone>
+			<zone type="Australia/Lord_Howe">
+				<exemplarCity>Lord-Hau</exemplarCity>
+			</zone>
+			<zone type="America/Aruba">
+				<exemplarCity>Aruba</exemplarCity>
+			</zone>
+			<zone type="Europe/Mariehamn">
+				<exemplarCity>Mariýehamn</exemplarCity>
+			</zone>
+			<zone type="Asia/Baku">
+				<exemplarCity>Baku</exemplarCity>
+			</zone>
+			<zone type="Europe/Sarajevo">
+				<exemplarCity>Saraýewo</exemplarCity>
+			</zone>
+			<zone type="America/Barbados">
+				<exemplarCity>Barbados</exemplarCity>
+			</zone>
+			<zone type="Asia/Dhaka">
+				<exemplarCity>Dakka</exemplarCity>
+			</zone>
+			<zone type="Europe/Brussels">
+				<exemplarCity>Brýussel</exemplarCity>
+			</zone>
+			<zone type="Africa/Ouagadougou">
+				<exemplarCity>Uagadugu</exemplarCity>
+			</zone>
+			<zone type="Europe/Sofia">
+				<exemplarCity>Sofiýa</exemplarCity>
+			</zone>
+			<zone type="Asia/Bahrain">
+				<exemplarCity>Bahreýn</exemplarCity>
+			</zone>
+			<zone type="Africa/Bujumbura">
+				<exemplarCity>Bujumbura</exemplarCity>
+			</zone>
+			<zone type="Africa/Porto-Novo">
+				<exemplarCity>Porto-Nowo</exemplarCity>
+			</zone>
+			<zone type="America/St_Barthelemy">
+				<exemplarCity>Sen-Bartelmi</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Bermuda">
+				<exemplarCity>Bermuda</exemplarCity>
+			</zone>
+			<zone type="Asia/Brunei">
+				<exemplarCity>Bruneý</exemplarCity>
+			</zone>
+			<zone type="America/La_Paz">
+				<exemplarCity>La-Pas</exemplarCity>
+			</zone>
+			<zone type="America/Kralendijk">
+				<exemplarCity>Kralendeýk</exemplarCity>
+			</zone>
+			<zone type="America/Eirunepe">
+				<exemplarCity>Eýrunepe</exemplarCity>
+			</zone>
+			<zone type="America/Rio_Branco">
+				<exemplarCity>Riu-Branku</exemplarCity>
+			</zone>
+			<zone type="America/Porto_Velho">
+				<exemplarCity>Portu-Welýu</exemplarCity>
+			</zone>
+			<zone type="America/Boa_Vista">
+				<exemplarCity>Boa-Wista</exemplarCity>
+			</zone>
+			<zone type="America/Manaus">
+				<exemplarCity>Manaus</exemplarCity>
+			</zone>
+			<zone type="America/Cuiaba">
+				<exemplarCity>Kuýaba</exemplarCity>
+			</zone>
+			<zone type="America/Santarem">
+				<exemplarCity>Santarem</exemplarCity>
+			</zone>
+			<zone type="America/Campo_Grande">
+				<exemplarCity>Kampu-Grandi</exemplarCity>
+			</zone>
+			<zone type="America/Belem">
+				<exemplarCity>Belen</exemplarCity>
+			</zone>
+			<zone type="America/Araguaina">
+				<exemplarCity>Araguaýna</exemplarCity>
+			</zone>
+			<zone type="America/Sao_Paulo">
+				<exemplarCity>San-Paulu</exemplarCity>
+			</zone>
+			<zone type="America/Bahia">
+				<exemplarCity>Baiýa</exemplarCity>
+			</zone>
+			<zone type="America/Fortaleza">
+				<exemplarCity>Fortaleza</exemplarCity>
+			</zone>
+			<zone type="America/Maceio">
+				<exemplarCity>Maseýo</exemplarCity>
+			</zone>
+			<zone type="America/Recife">
+				<exemplarCity>Resifi</exemplarCity>
+			</zone>
+			<zone type="America/Noronha">
+				<exemplarCity>Noronha</exemplarCity>
+			</zone>
+			<zone type="America/Nassau">
+				<exemplarCity>Nassau</exemplarCity>
+			</zone>
+			<zone type="Asia/Thimphu">
+				<exemplarCity>Timpu</exemplarCity>
+			</zone>
+			<zone type="Africa/Gaborone">
+				<exemplarCity>Gaborone</exemplarCity>
+			</zone>
+			<zone type="Europe/Minsk">
+				<exemplarCity>Minsk</exemplarCity>
+			</zone>
+			<zone type="America/Belize">
+				<exemplarCity>Beliz</exemplarCity>
+			</zone>
+			<zone type="America/Dawson">
+				<exemplarCity>Douson</exemplarCity>
+			</zone>
+			<zone type="America/Whitehorse">
+				<exemplarCity>Waýthors</exemplarCity>
+			</zone>
+			<zone type="America/Inuvik">
+				<exemplarCity>Inuwik</exemplarCity>
+			</zone>
+			<zone type="America/Vancouver">
+				<exemplarCity>Wankuwer</exemplarCity>
+			</zone>
+			<zone type="America/Dawson_Creek">
+				<exemplarCity>Dowson-Krik</exemplarCity>
+			</zone>
+			<zone type="America/Creston">
+				<exemplarCity>Kreston</exemplarCity>
+			</zone>
+			<zone type="America/Yellowknife">
+				<exemplarCity>Ýellounaýf</exemplarCity>
+			</zone>
+			<zone type="America/Edmonton">
+				<exemplarCity>Edmonton</exemplarCity>
+			</zone>
+			<zone type="America/Swift_Current">
+				<exemplarCity>Swift-Karent</exemplarCity>
+			</zone>
+			<zone type="America/Cambridge_Bay">
+				<exemplarCity>Kembrij-Beý</exemplarCity>
+			</zone>
+			<zone type="America/Regina">
+				<exemplarCity>Rejaýna</exemplarCity>
+			</zone>
+			<zone type="America/Winnipeg">
+				<exemplarCity>Winipeg</exemplarCity>
+			</zone>
+			<zone type="America/Resolute">
+				<exemplarCity>Rozulýut</exemplarCity>
+			</zone>
+			<zone type="America/Rainy_River">
+				<exemplarCity>Reýni-Riwer</exemplarCity>
+			</zone>
+			<zone type="America/Rankin_Inlet">
+				<exemplarCity>Rankin-Inlet</exemplarCity>
+			</zone>
+			<zone type="America/Coral_Harbour">
+				<exemplarCity>Atikokan</exemplarCity>
+			</zone>
+			<zone type="America/Thunder_Bay">
+				<exemplarCity>Tander-Beý</exemplarCity>
+			</zone>
+			<zone type="America/Nipigon">
+				<exemplarCity>Nipigon</exemplarCity>
+			</zone>
+			<zone type="America/Toronto">
+				<exemplarCity>Toronto</exemplarCity>
+			</zone>
+			<zone type="America/Iqaluit">
+				<exemplarCity>Ikaluit</exemplarCity>
+			</zone>
+			<zone type="America/Pangnirtung">
+				<exemplarCity>Pangnirtang</exemplarCity>
+			</zone>
+			<zone type="America/Moncton">
+				<exemplarCity>Monkton</exemplarCity>
+			</zone>
+			<zone type="America/Halifax">
+				<exemplarCity>Galifaks</exemplarCity>
+			</zone>
+			<zone type="America/Goose_Bay">
+				<exemplarCity>Gus-Beý</exemplarCity>
+			</zone>
+			<zone type="America/Glace_Bay">
+				<exemplarCity>Gleýs-Beý</exemplarCity>
+			</zone>
+			<zone type="America/Blanc-Sablon">
+				<exemplarCity>Blank-Sablon</exemplarCity>
+			</zone>
+			<zone type="America/St_Johns">
+				<exemplarCity>Sent-Džons</exemplarCity>
+			</zone>
+			<zone type="Indian/Cocos">
+				<exemplarCity>Kokos</exemplarCity>
+			</zone>
+			<zone type="Africa/Kinshasa">
+				<exemplarCity>Kinşasa</exemplarCity>
+			</zone>
+			<zone type="Africa/Lubumbashi">
+				<exemplarCity>Lubumbaşi</exemplarCity>
+			</zone>
+			<zone type="Africa/Bangui">
+				<exemplarCity>Bangi</exemplarCity>
+			</zone>
+			<zone type="Africa/Brazzaville">
+				<exemplarCity>Brazzawil</exemplarCity>
+			</zone>
+			<zone type="Europe/Zurich">
+				<exemplarCity>Tsýürih</exemplarCity>
+			</zone>
+			<zone type="Africa/Abidjan">
+				<exemplarCity>Abijan</exemplarCity>
+			</zone>
+			<zone type="Pacific/Rarotonga">
+				<exemplarCity>Rarotonga</exemplarCity>
+			</zone>
+			<zone type="Pacific/Easter">
+				<exemplarCity>Pashi adasy</exemplarCity>
+			</zone>
+			<zone type="America/Santiago">
+				<exemplarCity>Santiago</exemplarCity>
+			</zone>
+			<zone type="Africa/Douala">
+				<exemplarCity>Duala</exemplarCity>
+			</zone>
+			<zone type="Asia/Urumqi">
+				<exemplarCity>Urumçy</exemplarCity>
+			</zone>
+			<zone type="Asia/Shanghai">
+				<exemplarCity>Şanhaý</exemplarCity>
+			</zone>
+			<zone type="America/Bogota">
+				<exemplarCity>Bogota</exemplarCity>
+			</zone>
+			<zone type="America/Costa_Rica">
+				<exemplarCity>Kosta-Rika</exemplarCity>
+			</zone>
+			<zone type="America/Havana">
+				<exemplarCity>Gawana</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Cape_Verde">
+				<exemplarCity>Kabo-Werde</exemplarCity>
+			</zone>
+			<zone type="America/Curacao">
+				<exemplarCity>Kýurasao</exemplarCity>
+			</zone>
+			<zone type="Indian/Christmas">
+				<exemplarCity>Krismas</exemplarCity>
+			</zone>
+			<zone type="Asia/Nicosia">
+				<exemplarCity>Nikosiýa</exemplarCity>
+			</zone>
+			<zone type="Europe/Prague">
+				<exemplarCity>Praga</exemplarCity>
+			</zone>
+			<zone type="Europe/Busingen">
+				<exemplarCity>Býuzingen</exemplarCity>
+			</zone>
+			<zone type="Europe/Berlin">
+				<exemplarCity>Berlin</exemplarCity>
+			</zone>
+			<zone type="Africa/Djibouti">
+				<exemplarCity>Jibuti</exemplarCity>
+			</zone>
+			<zone type="Europe/Copenhagen">
+				<exemplarCity>Kopengagen</exemplarCity>
+			</zone>
+			<zone type="America/Dominica">
+				<exemplarCity>Dominika</exemplarCity>
+			</zone>
+			<zone type="America/Santo_Domingo">
+				<exemplarCity>Santo-Domingo</exemplarCity>
+			</zone>
+			<zone type="Africa/Algiers">
+				<exemplarCity>Aljir</exemplarCity>
+			</zone>
+			<zone type="Pacific/Galapagos">
+				<exemplarCity>Galapagos adalary</exemplarCity>
+			</zone>
+			<zone type="America/Guayaquil">
+				<exemplarCity>Guýakil</exemplarCity>
+			</zone>
+			<zone type="Europe/Tallinn">
+				<exemplarCity>Tallin</exemplarCity>
+			</zone>
+			<zone type="Africa/Cairo">
+				<exemplarCity>Kair</exemplarCity>
+			</zone>
+			<zone type="Africa/El_Aaiun">
+				<exemplarCity>El-Aýun</exemplarCity>
+			</zone>
+			<zone type="Africa/Asmera">
+				<exemplarCity>Asmera</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Canary">
+				<exemplarCity>Kanar adalary</exemplarCity>
+			</zone>
+			<zone type="Africa/Ceuta">
+				<exemplarCity>Seuta</exemplarCity>
+			</zone>
+			<zone type="Europe/Madrid">
+				<exemplarCity>Madrid</exemplarCity>
+			</zone>
+			<zone type="Africa/Addis_Ababa">
+				<exemplarCity>Addid-Abeba</exemplarCity>
+			</zone>
+			<zone type="Europe/Helsinki">
+				<exemplarCity>Helsinki</exemplarCity>
+			</zone>
+			<zone type="Pacific/Fiji">
+				<exemplarCity>Fiji</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Stanley">
+				<exemplarCity>Stenli</exemplarCity>
+			</zone>
+			<zone type="Pacific/Truk">
+				<exemplarCity>Çuuk</exemplarCity>
+			</zone>
+			<zone type="Pacific/Ponape">
+				<exemplarCity>Ponape</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kosrae">
+				<exemplarCity>Kosraýe</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Faeroe">
+				<exemplarCity>Farer adalary</exemplarCity>
+			</zone>
+			<zone type="Europe/Paris">
+				<exemplarCity>Pariž</exemplarCity>
+			</zone>
+			<zone type="Africa/Libreville">
+				<exemplarCity>Librewil</exemplarCity>
+			</zone>
+			<zone type="Europe/London">
+				<long>
+					<daylight>Beýik Britaniýa, tomusky wagt</daylight>
+				</long>
+				<exemplarCity>London</exemplarCity>
+			</zone>
+			<zone type="America/Grenada">
+				<exemplarCity>Grenada</exemplarCity>
+			</zone>
+			<zone type="Asia/Tbilisi">
+				<exemplarCity>Tbilisi</exemplarCity>
+			</zone>
+			<zone type="America/Cayenne">
+				<exemplarCity>Kaýenna</exemplarCity>
+			</zone>
+			<zone type="Europe/Guernsey">
+				<exemplarCity>Gernsi</exemplarCity>
+			</zone>
+			<zone type="Africa/Accra">
+				<exemplarCity>Akkra</exemplarCity>
+			</zone>
+			<zone type="Europe/Gibraltar">
+				<exemplarCity>Gibraltar</exemplarCity>
+			</zone>
+			<zone type="America/Thule">
+				<exemplarCity>Tule</exemplarCity>
+			</zone>
+			<zone type="America/Godthab">
+				<exemplarCity>Nuk</exemplarCity>
+			</zone>
+			<zone type="America/Scoresbysund">
+				<exemplarCity>Illokkortoormiut</exemplarCity>
+			</zone>
+			<zone type="America/Danmarkshavn">
+				<exemplarCity>Denmarkshawn</exemplarCity>
+			</zone>
+			<zone type="Africa/Banjul">
+				<exemplarCity>Banjul</exemplarCity>
+			</zone>
+			<zone type="Africa/Conakry">
+				<exemplarCity>Konakri</exemplarCity>
+			</zone>
+			<zone type="America/Guadeloupe">
+				<exemplarCity>Gwadelupa</exemplarCity>
+			</zone>
+			<zone type="Africa/Malabo">
+				<exemplarCity>Malabo</exemplarCity>
+			</zone>
+			<zone type="Europe/Athens">
+				<exemplarCity>Afiny</exemplarCity>
+			</zone>
+			<zone type="Atlantic/South_Georgia">
+				<exemplarCity>Günorta Georgiýa</exemplarCity>
+			</zone>
+			<zone type="America/Guatemala">
+				<exemplarCity>Gwatemala</exemplarCity>
+			</zone>
+			<zone type="Pacific/Guam">
+				<exemplarCity>Guam</exemplarCity>
+			</zone>
+			<zone type="Africa/Bissau">
+				<exemplarCity>Bisau</exemplarCity>
+			</zone>
+			<zone type="America/Guyana">
+				<exemplarCity>Gaýana</exemplarCity>
+			</zone>
+			<zone type="Asia/Hong_Kong">
+				<exemplarCity>Gonkong</exemplarCity>
+			</zone>
+			<zone type="America/Tegucigalpa">
+				<exemplarCity>Tegusigalpa</exemplarCity>
+			</zone>
+			<zone type="Europe/Zagreb">
+				<exemplarCity>Zagreb</exemplarCity>
+			</zone>
+			<zone type="America/Port-au-Prince">
+				<exemplarCity>Port-o-Prens</exemplarCity>
+			</zone>
+			<zone type="Europe/Budapest">
+				<exemplarCity>Budapeşt</exemplarCity>
+			</zone>
+			<zone type="Asia/Jakarta">
+				<exemplarCity>Jakarta</exemplarCity>
+			</zone>
+			<zone type="Asia/Pontianak">
+				<exemplarCity>Pontianak</exemplarCity>
+			</zone>
+			<zone type="Asia/Makassar">
+				<exemplarCity>Makasar</exemplarCity>
+			</zone>
+			<zone type="Asia/Jayapura">
+				<exemplarCity>Jaýapura</exemplarCity>
+			</zone>
+			<zone type="Europe/Dublin">
+				<long>
+					<daylight>Irlandiýa, standart wagt</daylight>
+				</long>
+				<exemplarCity>Dublin</exemplarCity>
+			</zone>
+			<zone type="Asia/Jerusalem">
+				<exemplarCity>Iýerusalim</exemplarCity>
+			</zone>
+			<zone type="Europe/Isle_of_Man">
+				<exemplarCity>Men adasy</exemplarCity>
+			</zone>
+			<zone type="Asia/Calcutta">
+				<exemplarCity>Kalkutta</exemplarCity>
+			</zone>
+			<zone type="Indian/Chagos">
+				<exemplarCity>Çagos</exemplarCity>
+			</zone>
+			<zone type="Asia/Baghdad">
+				<exemplarCity>Bagdat</exemplarCity>
+			</zone>
+			<zone type="Asia/Tehran">
+				<exemplarCity>Tähran</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Reykjavik">
+				<exemplarCity>Reýkýawik</exemplarCity>
+			</zone>
+			<zone type="Europe/Rome">
+				<exemplarCity>Rim</exemplarCity>
+			</zone>
+			<zone type="Europe/Jersey">
+				<exemplarCity>Jersi</exemplarCity>
+			</zone>
+			<zone type="America/Jamaica">
+				<exemplarCity>Ýamaýka</exemplarCity>
+			</zone>
+			<zone type="Asia/Amman">
+				<exemplarCity>Amman</exemplarCity>
+			</zone>
+			<zone type="Asia/Tokyo">
+				<exemplarCity>Tokýo</exemplarCity>
+			</zone>
+			<zone type="Africa/Nairobi">
+				<exemplarCity>Naýrobi</exemplarCity>
+			</zone>
+			<zone type="Asia/Bishkek">
+				<exemplarCity>Bişkek</exemplarCity>
+			</zone>
+			<zone type="Asia/Phnom_Penh">
+				<exemplarCity>Pnompen</exemplarCity>
+			</zone>
+			<zone type="Pacific/Enderbury">
+				<exemplarCity>Enderberi</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kiritimati">
+				<exemplarCity>Kiritimati</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tarawa">
+				<exemplarCity>Tarawa</exemplarCity>
+			</zone>
+			<zone type="Indian/Comoro">
+				<exemplarCity>Komor adalary</exemplarCity>
+			</zone>
+			<zone type="America/St_Kitts">
+				<exemplarCity>Sent-Kits</exemplarCity>
+			</zone>
+			<zone type="Asia/Pyongyang">
+				<exemplarCity>Phenýan</exemplarCity>
+			</zone>
+			<zone type="Asia/Seoul">
+				<exemplarCity>Seul</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuwait">
+				<exemplarCity>Kuweýt</exemplarCity>
+			</zone>
+			<zone type="America/Cayman">
+				<exemplarCity>Kaýman adalary</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtau">
+				<exemplarCity>Aktau</exemplarCity>
+			</zone>
+			<zone type="Asia/Oral">
+				<exemplarCity>Oral</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtobe">
+				<exemplarCity>Aktobe</exemplarCity>
+			</zone>
+			<zone type="Asia/Qyzylorda">
+				<exemplarCity>Gyzylorda</exemplarCity>
+			</zone>
+			<zone type="Asia/Almaty">
+				<exemplarCity>Almaty</exemplarCity>
+			</zone>
+			<zone type="Asia/Vientiane">
+				<exemplarCity>Wýentýan</exemplarCity>
+			</zone>
+			<zone type="Asia/Beirut">
+				<exemplarCity>Beýrut</exemplarCity>
+			</zone>
+			<zone type="America/St_Lucia">
+				<exemplarCity>Sent-Lýusia</exemplarCity>
+			</zone>
+			<zone type="Europe/Vaduz">
+				<exemplarCity>Waduz</exemplarCity>
+			</zone>
+			<zone type="Asia/Colombo">
+				<exemplarCity>Kolombo</exemplarCity>
+			</zone>
+			<zone type="Africa/Monrovia">
+				<exemplarCity>Monrowiýa</exemplarCity>
+			</zone>
+			<zone type="Africa/Maseru">
+				<exemplarCity>Maseru</exemplarCity>
+			</zone>
+			<zone type="Europe/Vilnius">
+				<exemplarCity>Wilnýus</exemplarCity>
+			</zone>
+			<zone type="Europe/Luxembourg">
+				<exemplarCity>Lýuksemburg</exemplarCity>
+			</zone>
+			<zone type="Europe/Riga">
+				<exemplarCity>Riga</exemplarCity>
+			</zone>
+			<zone type="Africa/Tripoli">
+				<exemplarCity>Tripoli</exemplarCity>
+			</zone>
+			<zone type="Africa/Casablanca">
+				<exemplarCity>Kasablanka</exemplarCity>
+			</zone>
+			<zone type="Europe/Monaco">
+				<exemplarCity>Monako</exemplarCity>
+			</zone>
+			<zone type="Europe/Chisinau">
+				<exemplarCity>Kişinýow</exemplarCity>
+			</zone>
+			<zone type="Europe/Podgorica">
+				<exemplarCity>Podgorisa</exemplarCity>
+			</zone>
+			<zone type="America/Marigot">
+				<exemplarCity>Marigo</exemplarCity>
+			</zone>
+			<zone type="Indian/Antananarivo">
+				<exemplarCity>Antananariwu</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kwajalein">
+				<exemplarCity>Kwajaleýn</exemplarCity>
+			</zone>
+			<zone type="Pacific/Majuro">
+				<exemplarCity>Majuro</exemplarCity>
+			</zone>
+			<zone type="Europe/Skopje">
+				<exemplarCity>Skopýe</exemplarCity>
+			</zone>
+			<zone type="Africa/Bamako">
+				<exemplarCity>Bamako</exemplarCity>
+			</zone>
+			<zone type="Asia/Rangoon">
+				<exemplarCity>Rangun</exemplarCity>
+			</zone>
+			<zone type="Asia/Hovd">
+				<exemplarCity>Howd</exemplarCity>
+			</zone>
+			<zone type="Asia/Ulaanbaatar">
+				<exemplarCity>Ulan-Bator</exemplarCity>
+			</zone>
+			<zone type="Asia/Choibalsan">
+				<exemplarCity>Çoýbalsan</exemplarCity>
+			</zone>
+			<zone type="Asia/Macau">
+				<exemplarCity>Makao</exemplarCity>
+			</zone>
+			<zone type="Pacific/Saipan">
+				<exemplarCity>Saýpan</exemplarCity>
+			</zone>
+			<zone type="America/Martinique">
+				<exemplarCity>Martinika</exemplarCity>
+			</zone>
+			<zone type="Africa/Nouakchott">
+				<exemplarCity>Nuakşot</exemplarCity>
+			</zone>
+			<zone type="America/Montserrat">
+				<exemplarCity>Monserrat</exemplarCity>
+			</zone>
+			<zone type="Europe/Malta">
+				<exemplarCity>Malta</exemplarCity>
+			</zone>
+			<zone type="Indian/Mauritius">
+				<exemplarCity>Mawrikiý</exemplarCity>
+			</zone>
+			<zone type="Indian/Maldives">
+				<exemplarCity>Maldiwler</exemplarCity>
+			</zone>
+			<zone type="Africa/Blantyre">
+				<exemplarCity>Blantaýr</exemplarCity>
+			</zone>
+			<zone type="America/Tijuana">
+				<exemplarCity>Tihuana</exemplarCity>
+			</zone>
+			<zone type="America/Santa_Isabel">
+				<exemplarCity>Santa-Izabel</exemplarCity>
+			</zone>
+			<zone type="America/Hermosillo">
+				<exemplarCity>Ermosilo</exemplarCity>
+			</zone>
+			<zone type="America/Mazatlan">
+				<exemplarCity>Mazatlan</exemplarCity>
+			</zone>
+			<zone type="America/Chihuahua">
+				<exemplarCity>Çiuaua</exemplarCity>
+			</zone>
+			<zone type="America/Bahia_Banderas">
+				<exemplarCity>Baiýa-de-Banderas</exemplarCity>
+			</zone>
+			<zone type="America/Ojinaga">
+				<exemplarCity>Ohinaga</exemplarCity>
+			</zone>
+			<zone type="America/Monterrey">
+				<exemplarCity>Monterreý</exemplarCity>
+			</zone>
+			<zone type="America/Mexico_City">
+				<exemplarCity>Mehiko</exemplarCity>
+			</zone>
+			<zone type="America/Matamoros">
+				<exemplarCity>Matamoros</exemplarCity>
+			</zone>
+			<zone type="America/Merida">
+				<exemplarCity>Merida</exemplarCity>
+			</zone>
+			<zone type="America/Cancun">
+				<exemplarCity>Kankun</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuala_Lumpur">
+				<exemplarCity>Kuala-Lumpur</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuching">
+				<exemplarCity>Kuçing</exemplarCity>
+			</zone>
+			<zone type="Africa/Maputo">
+				<exemplarCity>Maputo</exemplarCity>
+			</zone>
+			<zone type="Africa/Windhoek">
+				<exemplarCity>Windhuk</exemplarCity>
+			</zone>
+			<zone type="Pacific/Noumea">
+				<exemplarCity>Numea</exemplarCity>
+			</zone>
+			<zone type="Africa/Niamey">
+				<exemplarCity>Niameý</exemplarCity>
+			</zone>
+			<zone type="Pacific/Norfolk">
+				<exemplarCity>Norfolk</exemplarCity>
+			</zone>
+			<zone type="Africa/Lagos">
+				<exemplarCity>Lagos</exemplarCity>
+			</zone>
+			<zone type="America/Managua">
+				<exemplarCity>Managua</exemplarCity>
+			</zone>
+			<zone type="Europe/Amsterdam">
+				<exemplarCity>Amsterdam</exemplarCity>
+			</zone>
+			<zone type="Europe/Oslo">
+				<exemplarCity>Oslo</exemplarCity>
+			</zone>
+			<zone type="Asia/Katmandu">
+				<exemplarCity>Katmandu</exemplarCity>
+			</zone>
+			<zone type="Pacific/Nauru">
+				<exemplarCity>Nauru</exemplarCity>
+			</zone>
+			<zone type="Pacific/Niue">
+				<exemplarCity>Niue</exemplarCity>
+			</zone>
+			<zone type="Pacific/Chatham">
+				<exemplarCity>Çatem</exemplarCity>
+			</zone>
+			<zone type="Pacific/Auckland">
+				<exemplarCity>Oklend</exemplarCity>
+			</zone>
+			<zone type="Asia/Muscat">
+				<exemplarCity>Maskat</exemplarCity>
+			</zone>
+			<zone type="America/Panama">
+				<exemplarCity>Panama</exemplarCity>
+			</zone>
+			<zone type="America/Lima">
+				<exemplarCity>Lima</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tahiti">
+				<exemplarCity>Taýiti</exemplarCity>
+			</zone>
+			<zone type="Pacific/Marquesas">
+				<exemplarCity>Markiz adalary</exemplarCity>
+			</zone>
+			<zone type="Pacific/Gambier">
+				<exemplarCity>Gambýe</exemplarCity>
+			</zone>
+			<zone type="Pacific/Port_Moresby">
+				<exemplarCity>Port-Morsbi</exemplarCity>
+			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bugenwil</exemplarCity>
+			</zone>
+			<zone type="Asia/Manila">
+				<exemplarCity>Manila</exemplarCity>
+			</zone>
+			<zone type="Asia/Karachi">
+				<exemplarCity>Karaçi</exemplarCity>
+			</zone>
+			<zone type="Europe/Warsaw">
+				<exemplarCity>Warşawa</exemplarCity>
+			</zone>
+			<zone type="America/Miquelon">
+				<exemplarCity>Mikelon</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pitcairn">
+				<exemplarCity>Pitkern</exemplarCity>
+			</zone>
+			<zone type="America/Puerto_Rico">
+				<exemplarCity>Puerto-Riko</exemplarCity>
+			</zone>
+			<zone type="Asia/Gaza">
+				<exemplarCity>Gaza</exemplarCity>
+			</zone>
+			<zone type="Asia/Hebron">
+				<exemplarCity>Hewron</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Azores">
+				<exemplarCity>Azor adalary</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Madeira">
+				<exemplarCity>Madeýra adalary</exemplarCity>
+			</zone>
+			<zone type="Europe/Lisbon">
+				<exemplarCity>Lissabon</exemplarCity>
+			</zone>
+			<zone type="Pacific/Palau">
+				<exemplarCity>Palau</exemplarCity>
+			</zone>
+			<zone type="America/Asuncion">
+				<exemplarCity>Asunsýon</exemplarCity>
+			</zone>
+			<zone type="Asia/Qatar">
+				<exemplarCity>Katar</exemplarCity>
+			</zone>
+			<zone type="Indian/Reunion">
+				<exemplarCity>Reýunion</exemplarCity>
+			</zone>
+			<zone type="Europe/Bucharest">
+				<exemplarCity>Buharest</exemplarCity>
+			</zone>
+			<zone type="Europe/Belgrade">
+				<exemplarCity>Belgrad</exemplarCity>
+			</zone>
+			<zone type="Europe/Kaliningrad">
+				<exemplarCity>Kaliningrad</exemplarCity>
+			</zone>
+			<zone type="Europe/Simferopol">
+				<exemplarCity>Simferopol</exemplarCity>
+			</zone>
+			<zone type="Europe/Moscow">
+				<exemplarCity>Moskwa</exemplarCity>
+			</zone>
+			<zone type="Europe/Volgograd">
+				<exemplarCity>Wolgograd</exemplarCity>
+			</zone>
+			<zone type="Europe/Samara">
+				<exemplarCity>Samara</exemplarCity>
+			</zone>
+			<zone type="Asia/Yekaterinburg">
+				<exemplarCity>Ýekaterinburg</exemplarCity>
+			</zone>
+			<zone type="Asia/Omsk">
+				<exemplarCity>Omsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Novosibirsk">
+				<exemplarCity>Nowosibirsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Novokuznetsk">
+				<exemplarCity>Nowokuznetsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Krasnoyarsk">
+				<exemplarCity>Krasnoýarsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Irkutsk">
+				<exemplarCity>Irkutsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Çita</exemplarCity>
+			</zone>
+			<zone type="Asia/Yakutsk">
+				<exemplarCity>Ýakutsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Vladivostok">
+				<exemplarCity>Wladiwostok</exemplarCity>
+			</zone>
+			<zone type="Asia/Khandyga">
+				<exemplarCity>Handyga</exemplarCity>
+			</zone>
+			<zone type="Asia/Sakhalin">
+				<exemplarCity>Sahalin</exemplarCity>
+			</zone>
+			<zone type="Asia/Ust-Nera">
+				<exemplarCity>Ust-Nera</exemplarCity>
+			</zone>
+			<zone type="Asia/Magadan">
+				<exemplarCity>Magadan</exemplarCity>
+			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolymsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Kamchatka">
+				<exemplarCity>Kamçatka</exemplarCity>
+			</zone>
+			<zone type="Asia/Anadyr">
+				<exemplarCity>Anadyr</exemplarCity>
+			</zone>
+			<zone type="Africa/Kigali">
+				<exemplarCity>Kigali</exemplarCity>
+			</zone>
+			<zone type="Asia/Riyadh">
+				<exemplarCity>Er-Riýad</exemplarCity>
+			</zone>
+			<zone type="Pacific/Guadalcanal">
+				<exemplarCity>Gwadalkanal</exemplarCity>
+			</zone>
+			<zone type="Indian/Mahe">
+				<exemplarCity>Maýe</exemplarCity>
+			</zone>
+			<zone type="Africa/Khartoum">
+				<exemplarCity>Hartum</exemplarCity>
+			</zone>
+			<zone type="Europe/Stockholm">
+				<exemplarCity>Stokgolm</exemplarCity>
+			</zone>
+			<zone type="Asia/Singapore">
+				<exemplarCity>Singapur</exemplarCity>
+			</zone>
+			<zone type="Atlantic/St_Helena">
+				<exemplarCity>Keramatly Elena adalary</exemplarCity>
+			</zone>
+			<zone type="Europe/Ljubljana">
+				<exemplarCity>Lýublýana</exemplarCity>
+			</zone>
+			<zone type="Arctic/Longyearbyen">
+				<exemplarCity>Longir</exemplarCity>
+			</zone>
+			<zone type="Europe/Bratislava">
+				<exemplarCity>Bratislawa</exemplarCity>
+			</zone>
+			<zone type="Africa/Freetown">
+				<exemplarCity>Fritaun</exemplarCity>
+			</zone>
+			<zone type="Europe/San_Marino">
+				<exemplarCity>San-Marino</exemplarCity>
+			</zone>
+			<zone type="Africa/Dakar">
+				<exemplarCity>Dakar</exemplarCity>
+			</zone>
+			<zone type="Africa/Mogadishu">
+				<exemplarCity>Mogadişo</exemplarCity>
+			</zone>
+			<zone type="America/Paramaribo">
+				<exemplarCity>Paramaribo</exemplarCity>
+			</zone>
+			<zone type="Africa/Juba">
+				<exemplarCity>Juba</exemplarCity>
+			</zone>
+			<zone type="Africa/Sao_Tome">
+				<exemplarCity>San-Tome</exemplarCity>
+			</zone>
+			<zone type="America/El_Salvador">
+				<exemplarCity>El Salwador</exemplarCity>
+			</zone>
+			<zone type="America/Lower_Princes">
+				<exemplarCity>Lower-Prinses-Kuorter</exemplarCity>
+			</zone>
+			<zone type="Asia/Damascus">
+				<exemplarCity>Damask</exemplarCity>
+			</zone>
+			<zone type="Africa/Mbabane">
+				<exemplarCity>Mbabane</exemplarCity>
+			</zone>
+			<zone type="America/Grand_Turk">
+				<exemplarCity>Grand Türk</exemplarCity>
+			</zone>
+			<zone type="Africa/Ndjamena">
+				<exemplarCity>Jamena</exemplarCity>
+			</zone>
+			<zone type="Indian/Kerguelen">
+				<exemplarCity>Kergelen</exemplarCity>
+			</zone>
+			<zone type="Africa/Lome">
+				<exemplarCity>Lome</exemplarCity>
+			</zone>
+			<zone type="Asia/Bangkok">
+				<exemplarCity>Bangkok</exemplarCity>
+			</zone>
+			<zone type="Asia/Dushanbe">
+				<exemplarCity>Duşanbe</exemplarCity>
+			</zone>
+			<zone type="Pacific/Fakaofo">
+				<exemplarCity>Fakaofo</exemplarCity>
+			</zone>
+			<zone type="Asia/Dili">
+				<exemplarCity>Dili</exemplarCity>
+			</zone>
+			<zone type="Asia/Ashgabat">
+				<exemplarCity>Aşgabat</exemplarCity>
+			</zone>
+			<zone type="Africa/Tunis">
+				<exemplarCity>Tunis</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tongatapu">
+				<exemplarCity>Tongatapu</exemplarCity>
+			</zone>
+			<zone type="Europe/Istanbul">
+				<exemplarCity>Stambul</exemplarCity>
+			</zone>
+			<zone type="America/Port_of_Spain">
+				<exemplarCity>Port-of-Speýn</exemplarCity>
+			</zone>
+			<zone type="Pacific/Funafuti">
+				<exemplarCity>Funafuti</exemplarCity>
+			</zone>
+			<zone type="Asia/Taipei">
+				<exemplarCity>Taýbeý</exemplarCity>
+			</zone>
+			<zone type="Africa/Dar_es_Salaam">
+				<exemplarCity>Dar-es-Salam</exemplarCity>
+			</zone>
+			<zone type="Europe/Uzhgorod">
+				<exemplarCity>Užgorod</exemplarCity>
+			</zone>
+			<zone type="Europe/Kiev">
+				<exemplarCity>Kiýew</exemplarCity>
+			</zone>
+			<zone type="Europe/Zaporozhye">
+				<exemplarCity>Zaporožýe</exemplarCity>
+			</zone>
+			<zone type="Africa/Kampala">
+				<exemplarCity>Kampala</exemplarCity>
+			</zone>
+			<zone type="Pacific/Midway">
+				<exemplarCity>Midweý</exemplarCity>
+			</zone>
+			<zone type="Pacific/Johnston">
+				<exemplarCity>Jonston</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wake">
+				<exemplarCity>Weýk</exemplarCity>
+			</zone>
+			<zone type="America/Adak">
+				<exemplarCity>Adak adasy</exemplarCity>
+			</zone>
+			<zone type="America/Nome">
+				<exemplarCity>Nom</exemplarCity>
+			</zone>
+			<zone type="Pacific/Honolulu">
+				<exemplarCity>Gonolulu</exemplarCity>
+			</zone>
+			<zone type="America/Anchorage">
+				<exemplarCity>Ankoridž</exemplarCity>
+			</zone>
+			<zone type="America/Yakutat">
+				<exemplarCity>Ýakutat</exemplarCity>
+			</zone>
+			<zone type="America/Sitka">
+				<exemplarCity>Sitka</exemplarCity>
+			</zone>
+			<zone type="America/Juneau">
+				<exemplarCity>Džuno</exemplarCity>
+			</zone>
+			<zone type="America/Metlakatla">
+				<exemplarCity>Metlakatla</exemplarCity>
+			</zone>
+			<zone type="America/Los_Angeles">
+				<exemplarCity>Los-Anjeles</exemplarCity>
+			</zone>
+			<zone type="America/Boise">
+				<exemplarCity>Boýse</exemplarCity>
+			</zone>
+			<zone type="America/Phoenix">
+				<exemplarCity>Feniks</exemplarCity>
+			</zone>
+			<zone type="America/Denver">
+				<exemplarCity>Denwer</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Beulah">
+				<exemplarCity>Boýla, Demirgazyk Dakota</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/New_Salem">
+				<exemplarCity>Nýu-Salem, D.g. Dakota</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Center">
+				<exemplarCity>Sentr, Demirgazyk Dakota</exemplarCity>
+			</zone>
+			<zone type="America/Chicago">
+				<exemplarCity>Çikago</exemplarCity>
+			</zone>
+			<zone type="America/Menominee">
+				<exemplarCity>Menomini</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Vincennes">
+				<exemplarCity>Winsens, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Petersburg">
+				<exemplarCity>Petersburg, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Tell_City">
+				<exemplarCity>Tell-Siti, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Knox">
+				<exemplarCity>Noks, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Winamac">
+				<exemplarCity>Winamak, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Marengo">
+				<exemplarCity>Marengo, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indianapolis">
+				<exemplarCity>Indianapolis</exemplarCity>
+			</zone>
+			<zone type="America/Louisville">
+				<exemplarCity>Luiswill</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Vevay">
+				<exemplarCity>Wiweý, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Kentucky/Monticello">
+				<exemplarCity>Montisello, Kentuki</exemplarCity>
+			</zone>
+			<zone type="America/Detroit">
+				<exemplarCity>Detroit</exemplarCity>
+			</zone>
+			<zone type="America/New_York">
+				<exemplarCity>Nýu-Ýork</exemplarCity>
+			</zone>
+			<zone type="America/Montevideo">
+				<exemplarCity>Montewideo</exemplarCity>
+			</zone>
+			<zone type="Asia/Samarkand">
+				<exemplarCity>Samarkand</exemplarCity>
+			</zone>
+			<zone type="Asia/Tashkent">
+				<exemplarCity>Taşkent</exemplarCity>
+			</zone>
+			<zone type="Europe/Vatican">
+				<exemplarCity>Watikan</exemplarCity>
+			</zone>
+			<zone type="America/St_Vincent">
+				<exemplarCity>Sent-Winsent</exemplarCity>
+			</zone>
+			<zone type="America/Caracas">
+				<exemplarCity>Karakas</exemplarCity>
+			</zone>
+			<zone type="America/Tortola">
+				<exemplarCity>Tortola</exemplarCity>
+			</zone>
+			<zone type="America/St_Thomas">
+				<exemplarCity>Sent-Tomas</exemplarCity>
+			</zone>
+			<zone type="Asia/Saigon">
+				<exemplarCity>Hoşimin</exemplarCity>
+			</zone>
+			<zone type="Pacific/Efate">
+				<exemplarCity>Efate</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wallis">
+				<exemplarCity>Wollis</exemplarCity>
+			</zone>
+			<zone type="Pacific/Apia">
+				<exemplarCity>Apiýa</exemplarCity>
+			</zone>
+			<zone type="Asia/Aden">
+				<exemplarCity>Aden</exemplarCity>
+			</zone>
+			<zone type="Indian/Mayotte">
+				<exemplarCity>Maýotta</exemplarCity>
+			</zone>
+			<zone type="Africa/Johannesburg">
+				<exemplarCity>Ýohannesburg</exemplarCity>
+			</zone>
+			<zone type="Africa/Lusaka">
+				<exemplarCity>Lusaka</exemplarCity>
+			</zone>
+			<zone type="Africa/Harare">
+				<exemplarCity>Harare</exemplarCity>
+			</zone>
+			<metazone type="Afghanistan">
+				<long>
+					<standard>Owganystan</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Central">
+				<long>
+					<standard>Merkezi Afrika</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Eastern">
+				<long>
+					<standard>Gündogar Afrika</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Southern">
+				<long>
+					<standard>Günorta Afrika, standart wagt</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Western">
+				<long>
+					<generic>Günbatar Afrika</generic>
+					<standard>Günbatar Afrika, standart wagt</standard>
+					<daylight>Günbatar Afrika, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Alaska">
+				<long>
+					<generic>Alýaska</generic>
+					<standard>Alýaska, standart wagt</standard>
+					<daylight>Alýaska, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Amazon">
+				<long>
+					<generic>Amazonka</generic>
+					<standard>Amazonka, standart wagt</standard>
+					<daylight>Amazonka, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Central">
+				<long>
+					<generic>Merkezi Amerika</generic>
+					<standard>Merkezi Amerika, standart wagt</standard>
+					<daylight>Merkezi Amerika, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Eastern">
+				<long>
+					<generic>Günorta Amerika</generic>
+					<standard>Günorta Amerika, standart wagt</standard>
+					<daylight>Günorta Amerika, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Mountain">
+				<long>
+					<generic>Daglyk ýeri (ABŞ)</generic>
+					<standard>Daglyk ýeri, standart wagt (ABŞ)</standard>
+					<daylight>Daglyk ýeri, tomusky wagt (ABŞ)</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Pacific">
+				<long>
+					<generic>Ýuwaş umman</generic>
+					<standard>Ýuwaş umman, standart wagt</standard>
+					<daylight>Ýuwaş umman, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Apia">
+				<long>
+					<generic>Apia</generic>
+					<standard>Apia, standart wagt</standard>
+					<daylight>Apia, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Arabian">
+				<long>
+					<generic>Arap ýurtlary</generic>
+					<standard>Arap ýurtlary, standart wagt</standard>
+					<daylight>Arap ýurtlary, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Argentina">
+				<long>
+					<generic>Argentina</generic>
+					<standard>Argentina, standart wagt</standard>
+					<daylight>Argentina, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Argentina_Western">
+				<long>
+					<generic>Günbatar Argentina</generic>
+					<standard>Günbatar Argentina, standart wagt</standard>
+					<daylight>Günbatar Argentina, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Armenia">
+				<long>
+					<generic>Ermenistan</generic>
+					<standard>Ermenistan, standart wagt</standard>
+					<daylight>Ermenistan, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Atlantic">
+				<long>
+					<generic>Atlantika</generic>
+					<standard>Atlantika, standart wagt</standard>
+					<daylight>Atlantika, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Central">
+				<long>
+					<generic>Merkezi Awstraliýa</generic>
+					<standard>Merkezi Awstraliýa, standart wagt</standard>
+					<daylight>Merkezi Awstraliýa, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_CentralWestern">
+				<long>
+					<generic>Merkezi Awstraliýa, günbatar tarap</generic>
+					<standard>Merkezi Awstraliýa, günbatar tarap, standart wagt</standard>
+					<daylight>Merkezi Awstraliýa, günbatar tarap, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Eastern">
+				<long>
+					<generic>Gündogar Awstraliýa</generic>
+					<standard>Gündogar Awstraliýa, standart wagt</standard>
+					<daylight>Gündogar Awstraliýa, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Western">
+				<long>
+					<generic>Günbatar Awstraliýa</generic>
+					<standard>Günbatar Awstraliýa, standart wagt</standard>
+					<daylight>Günbatar Awstraliýa, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Azerbaijan">
+				<long>
+					<generic>Azerbaýjan</generic>
+					<standard>Azerbaýjan, standart wagt</standard>
+					<daylight>Azerbaýjan, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Azores">
+				<long>
+					<generic>Azor adalary</generic>
+					<standard>Azor adalary, standart wagt</standard>
+					<daylight>Azor adalary, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Bangladesh">
+				<long>
+					<generic>Bangladeş</generic>
+					<standard>Bangladeş, standart wagt</standard>
+					<daylight>Bangladeş, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Bhutan">
+				<long>
+					<standard>Butan</standard>
+				</long>
+			</metazone>
+			<metazone type="Bolivia">
+				<long>
+					<standard>Boliwiýa</standard>
+				</long>
+			</metazone>
+			<metazone type="Brasilia">
+				<long>
+					<generic>Braziliýa</generic>
+					<standard>Braziliýa, standart wagt</standard>
+					<daylight>Braziliýa, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Brunei">
+				<long>
+					<standard>Bruneý-Darussalam</standard>
+				</long>
+			</metazone>
+			<metazone type="Cape_Verde">
+				<long>
+					<generic>Kabo-Werde</generic>
+					<standard>Kabo-Werde, standart wagt</standard>
+					<daylight>Kabo-Werde, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Chamorro">
+				<long>
+					<standard>Çamorro</standard>
+				</long>
+			</metazone>
+			<metazone type="Chatham">
+				<long>
+					<generic>Çatem</generic>
+					<standard>Çatem, standart wagt</standard>
+					<daylight>Çatem, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Chile">
+				<long>
+					<generic>Çili</generic>
+					<standard>Çili, standart wagt</standard>
+					<daylight>Çili, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="China">
+				<long>
+					<generic>Hytaý</generic>
+					<standard>Hytaý, standart wagt</standard>
+					<daylight>Hytaý, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Choibalsan">
+				<long>
+					<generic>Çoýbalsan</generic>
+					<standard>Çoýbalsan, standart wagt</standard>
+					<daylight>Çoýbalsan, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Christmas">
+				<long>
+					<standard>Krismas adasy</standard>
+				</long>
+			</metazone>
+			<metazone type="Cocos">
+				<long>
+					<standard>Kokos adalary</standard>
+				</long>
+			</metazone>
+			<metazone type="Colombia">
+				<long>
+					<generic>Kolumbiýa</generic>
+					<standard>Kolumbiýa, standart wagt</standard>
+					<daylight>Kolumbiýa, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cook">
+				<long>
+					<generic>Kuka adalary</generic>
+					<standard>Kuka adalary, standart wagt</standard>
+					<daylight>Kuka adalary, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cuba">
+				<long>
+					<generic>Kuba</generic>
+					<standard>Kuba, standart wagt</standard>
+					<daylight>Kuba, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Davis">
+				<long>
+					<standard>Deýwis</standard>
+				</long>
+			</metazone>
+			<metazone type="DumontDUrville">
+				<long>
+					<standard>Dýumon-d-Ýurwil</standard>
+				</long>
+			</metazone>
+			<metazone type="East_Timor">
+				<long>
+					<standard>Gündogar Timor</standard>
+				</long>
+			</metazone>
+			<metazone type="Easter">
+				<long>
+					<generic>Pasha adasy</generic>
+					<standard>Pasha adasy, standart wagt</standard>
+					<daylight>Pasha adasy, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Ecuador">
+				<long>
+					<standard>Ekwador</standard>
+				</long>
+			</metazone>
+			<metazone type="Europe_Central">
+				<long>
+					<generic>Merkezi Ýewropa</generic>
+					<standard>Merkezi Ýewropa, standart wagt</standard>
+					<daylight>Merkezi Ýewropa, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Europe_Eastern">
+				<long>
+					<generic>Gündogar Ýewropa</generic>
+					<standard>Gündogar Ýewropa, standart wagt</standard>
+					<daylight>Gündogar Ýewropa, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Europe_Further_Eastern">
+				<long>
+					<standard>Uzak Gündogar Ýewropa</standard>
+				</long>
+			</metazone>
+			<metazone type="Europe_Western">
+				<long>
+					<generic>Günbatar Ýewropa</generic>
+					<standard>Günbatar Ýewropa, standart wagt</standard>
+					<daylight>Günbatar Ýewropa, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Falkland">
+				<long>
+					<generic>Folklend adalary</generic>
+					<standard>Folklend adalary, standart wagt</standard>
+					<daylight>Folklend adalary, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Fiji">
+				<long>
+					<generic>Fiji</generic>
+					<standard>Fiji, standart wagt</standard>
+					<daylight>Fiji, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="French_Guiana">
+				<long>
+					<standard>Fransuz Gwiana</standard>
+				</long>
+			</metazone>
+			<metazone type="French_Southern">
+				<long>
+					<standard>Günorta Fransuz we Antarktika</standard>
+				</long>
+			</metazone>
+			<metazone type="Galapagos">
+				<long>
+					<standard>Galapagos adalary</standard>
+				</long>
+			</metazone>
+			<metazone type="Gambier">
+				<long>
+					<standard>Gambýe</standard>
+				</long>
+			</metazone>
+			<metazone type="Georgia">
+				<long>
+					<generic>Gruziýa</generic>
+					<standard>Gruziýa, standart wagt</standard>
+					<daylight>Gruziýa, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Gilbert_Islands">
+				<long>
+					<standard>Gilberta adalary</standard>
+				</long>
+			</metazone>
+			<metazone type="GMT">
+				<long>
+					<standard>Grinwiç boýunça orta wagt</standard>
+				</long>
+			</metazone>
+			<metazone type="Greenland_Eastern">
+				<long>
+					<generic>Gündogar Grenlandiýa</generic>
+					<standard>Gündogar Grenlandiýa, standart wagt</standard>
+					<daylight>Gündogar Grenlandiýa, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Greenland_Western">
+				<long>
+					<generic>Günbatar Grenlandiýa</generic>
+					<standard>Günbatar Grenlandiýa, standart wagt</standard>
+					<daylight>Günbatar Grenlandiýa, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Gulf">
+				<long>
+					<standard>Pars aýlagy, standart wagt</standard>
+				</long>
+			</metazone>
+			<metazone type="Guyana">
+				<long>
+					<standard>Gaýana</standard>
+				</long>
+			</metazone>
+			<metazone type="Hawaii_Aleutian">
+				<long>
+					<generic>Gawaý-Aleut</generic>
+					<standard>Gawaý-Aleut, standart wagt</standard>
+					<daylight>Gawaý-Aleut, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Hong_Kong">
+				<long>
+					<generic>Gonkong</generic>
+					<standard>Gonkong, standart wagt</standard>
+					<daylight>Gonkong, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Hovd">
+				<long>
+					<generic>Howd</generic>
+					<standard>Howd, standart wagt</standard>
+					<daylight>Howd, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="India">
+				<long>
+					<standard>Hindistan</standard>
+				</long>
+			</metazone>
+			<metazone type="Indian_Ocean">
+				<long>
+					<standard>Hindi ummany</standard>
+				</long>
+			</metazone>
+			<metazone type="Indochina">
+				<long>
+					<standard>Hindihytaý</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Central">
+				<long>
+					<standard>Merkezi Indoneziýa</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Eastern">
+				<long>
+					<standard>Gündogar Indoneziýa</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Western">
+				<long>
+					<standard>Günbatar Indoneziýa</standard>
+				</long>
+			</metazone>
+			<metazone type="Iran">
+				<long>
+					<generic>Eýran</generic>
+					<standard>Eýran, standart wagt</standard>
+					<daylight>Eýran, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Irkutsk">
+				<long>
+					<generic>Irkutsk</generic>
+					<standard>Irkutsk, standart wagt</standard>
+					<daylight>Irkutsk, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Israel">
+				<long>
+					<generic>Ysraýyl</generic>
+					<standard>Ysraýyl, standart wagt</standard>
+					<daylight>Ysraýyl, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Japan">
+				<long>
+					<generic>Ýaponiýa</generic>
+					<standard>Ýaponiýa, standart wagt</standard>
+					<daylight>Ýaponiýa, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Eastern">
+				<long>
+					<standard>Gündogar Gazagystan</standard>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Western">
+				<long>
+					<standard>Günbatar Gazagystan</standard>
+				</long>
+			</metazone>
+			<metazone type="Korea">
+				<long>
+					<generic>Koreýa</generic>
+					<standard>Koreýa, standart wagt</standard>
+					<daylight>Koreýa, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kosrae">
+				<long>
+					<standard>Kosraýe</standard>
+				</long>
+			</metazone>
+			<metazone type="Krasnoyarsk">
+				<long>
+					<generic>Krasnoýarsk</generic>
+					<standard>Krasnoýarsk, standart wagt</standard>
+					<daylight>Krasnoýarsk, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kyrgystan">
+				<long>
+					<standard>Gyrgyzstan</standard>
+				</long>
+			</metazone>
+			<metazone type="Line_Islands">
+				<long>
+					<standard>Laýn adalary</standard>
+				</long>
+			</metazone>
+			<metazone type="Lord_Howe">
+				<long>
+					<generic>Lord-Hau</generic>
+					<standard>Lord-Hau, standart wagt</standard>
+					<daylight>Lord-Hau, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Macquarie">
+				<long>
+					<standard>Makkuori</standard>
+				</long>
+			</metazone>
+			<metazone type="Magadan">
+				<long>
+					<generic>Magadan</generic>
+					<standard>Magadan, standart wagt</standard>
+					<daylight>Magadan, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Malaysia">
+				<long>
+					<standard>Malaýziýa</standard>
+				</long>
+			</metazone>
+			<metazone type="Maldives">
+				<long>
+					<standard>Maldiwler</standard>
+				</long>
+			</metazone>
+			<metazone type="Marquesas">
+				<long>
+					<standard>Markiz adalary</standard>
+				</long>
+			</metazone>
+			<metazone type="Marshall_Islands">
+				<long>
+					<standard>Marşal adalary</standard>
+				</long>
+			</metazone>
+			<metazone type="Mauritius">
+				<long>
+					<generic>Mawrikiý</generic>
+					<standard>Mawrikiý, standart wagt</standard>
+					<daylight>Mawrikiý, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mawson">
+				<long>
+					<standard>Mouson</standard>
+				</long>
+			</metazone>
+			<metazone type="Mexico_Northwest">
+				<long>
+					<generic>D.g.-G.b. Meksika</generic>
+					<standard>D.g.-G.b. Meksika, standart wagt</standard>
+					<daylight>D.g.-G.b. Meksika, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mexico_Pacific">
+				<long>
+					<generic>Meksikan Ýuwaş umman</generic>
+					<standard>Meksikan Ýuwaş umman, standart wagt</standard>
+					<daylight>Meksikan Ýuwaş umman, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mongolia">
+				<long>
+					<generic>Ulan-Bator</generic>
+					<standard>Ulan-Bator, standart wagt</standard>
+					<daylight>Ulan-Bator, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Moscow">
+				<long>
+					<generic>Moskwa</generic>
+					<standard>Moskwa, standart wagt</standard>
+					<daylight>Moskwa, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Myanmar">
+				<long>
+					<standard>Mýanma</standard>
+				</long>
+			</metazone>
+			<metazone type="Nauru">
+				<long>
+					<standard>Nauru</standard>
+				</long>
+			</metazone>
+			<metazone type="Nepal">
+				<long>
+					<standard>Nepal</standard>
+				</long>
+			</metazone>
+			<metazone type="New_Caledonia">
+				<long>
+					<generic>Täze Kaledoniýa</generic>
+					<standard>Täze Kaledoniýa, standart wagt</standard>
+					<daylight>Täze Kaledoniýa, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="New_Zealand">
+				<long>
+					<generic>Täze Zelandiýa</generic>
+					<standard>Täze Zelandiýa, standart wagt</standard>
+					<daylight>Täze Zelandiýa, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Newfoundland">
+				<long>
+					<generic>Nýufaundlend</generic>
+					<standard>Nýufaundlend, standart wagt</standard>
+					<daylight>Nýufaundlend, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Niue">
+				<long>
+					<standard>Niue</standard>
+				</long>
+			</metazone>
+			<metazone type="Norfolk">
+				<long>
+					<standard>Norfolk</standard>
+				</long>
+			</metazone>
+			<metazone type="Noronha">
+				<long>
+					<generic>Fernandu-di-Noronýa</generic>
+					<standard>Fernandu-di-Noronýa, standart wagt</standard>
+					<daylight>Fernandu-di-Noronýa, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Novosibirsk">
+				<long>
+					<generic>Nowosibirsk</generic>
+					<standard>Nowosibirsk, standart wagt</standard>
+					<daylight>Nowosibisk, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Omsk">
+				<long>
+					<generic>Omsk</generic>
+					<standard>Omsk, standart wagt</standard>
+					<daylight>Omsk, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pakistan">
+				<long>
+					<generic>Päkistan</generic>
+					<standard>Päkistan, standart wagt</standard>
+					<daylight>Päkistan, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Palau">
+				<long>
+					<standard>Palau</standard>
+				</long>
+			</metazone>
+			<metazone type="Papua_New_Guinea">
+				<long>
+					<standard>Papua - Täze Gwineýa</standard>
+				</long>
+			</metazone>
+			<metazone type="Paraguay">
+				<long>
+					<generic>Paragwaý</generic>
+					<standard>Paragwaý, standart wagt</standard>
+					<daylight>Paragwaý, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Peru">
+				<long>
+					<generic>Peru</generic>
+					<standard>Peru, standart wagt</standard>
+					<daylight>Peru, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Philippines">
+				<long>
+					<generic>Filippinler</generic>
+					<standard>Filippinler, standart wagt</standard>
+					<daylight>Filippinler, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Phoenix_Islands">
+				<long>
+					<standard>Feniks adalary</standard>
+				</long>
+			</metazone>
+			<metazone type="Pierre_Miquelon">
+				<long>
+					<generic>Sen Pýer we Mikelon</generic>
+					<standard>Sen Pýer we Mikelon, standart wagt</standard>
+					<daylight>Sen Pýer we Mikelon, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pitcairn">
+				<long>
+					<standard>Pitkern</standard>
+				</long>
+			</metazone>
+			<metazone type="Ponape">
+				<long>
+					<standard>Ponape</standard>
+				</long>
+			</metazone>
+			<metazone type="Reunion">
+				<long>
+					<standard>Reýunýon</standard>
+				</long>
+			</metazone>
+			<metazone type="Rothera">
+				<long>
+					<standard>Rotera</standard>
+				</long>
+			</metazone>
+			<metazone type="Sakhalin">
+				<long>
+					<generic>Sahalin</generic>
+					<standard>Sahalin, standart wagt</standard>
+					<daylight>Sahalin, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Samoa">
+				<long>
+					<generic>Samoa</generic>
+					<standard>Samoa, standart wagt</standard>
+					<daylight>Samoa, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Seychelles">
+				<long>
+					<standard>Seýşel adalary</standard>
+				</long>
+			</metazone>
+			<metazone type="Singapore">
+				<long>
+					<standard>Singapur, standart wagt</standard>
+				</long>
+			</metazone>
+			<metazone type="Solomon">
+				<long>
+					<standard>Solomon adalary</standard>
+				</long>
+			</metazone>
+			<metazone type="South_Georgia">
+				<long>
+					<standard>Günorta Georgiýa</standard>
+				</long>
+			</metazone>
+			<metazone type="Suriname">
+				<long>
+					<standard>Surinam</standard>
+				</long>
+			</metazone>
+			<metazone type="Syowa">
+				<long>
+					<standard>Sýowa</standard>
+				</long>
+			</metazone>
+			<metazone type="Tahiti">
+				<long>
+					<standard>Taýiti</standard>
+				</long>
+			</metazone>
+			<metazone type="Taipei">
+				<long>
+					<generic>Taýbeý</generic>
+					<standard>Taýbeý, standart wagt</standard>
+					<daylight>Taýbeý, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Tajikistan">
+				<long>
+					<standard>Täjigistan</standard>
+				</long>
+			</metazone>
+			<metazone type="Tokelau">
+				<long>
+					<standard>Tokelau</standard>
+				</long>
+			</metazone>
+			<metazone type="Tonga">
+				<long>
+					<generic>Tonga</generic>
+					<standard>Tonga, standart wagt</standard>
+					<daylight>Tonga, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Truk">
+				<long>
+					<standard>Çuuk</standard>
+				</long>
+			</metazone>
+			<metazone type="Turkmenistan">
+				<long>
+					<generic>Türkmenistan</generic>
+					<standard>Türkmenistan, standart wagt</standard>
+					<daylight>Türkmenistan, tomusky wagt</daylight>
+				</long>
+				<short>
+					<generic draft="unconfirmed">TMT</generic>
+					<standard draft="unconfirmed">TMT</standard>
+					<daylight draft="unconfirmed">TMST</daylight>
+				</short>
+			</metazone>
+			<metazone type="Tuvalu">
+				<long>
+					<standard>Tuwalu</standard>
+				</long>
+			</metazone>
+			<metazone type="Uruguay">
+				<long>
+					<generic>Urugwaý</generic>
+					<standard>Urugwaý, standart wagt</standard>
+					<daylight>Urugwaý, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Uzbekistan">
+				<long>
+					<generic>Özbekistan</generic>
+					<standard>Özbekistan, standart wagt</standard>
+					<daylight>Özbekistan, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Vanuatu">
+				<long>
+					<generic>Wanuatu</generic>
+					<standard>Wanuatu, standart wagt</standard>
+					<daylight>Wanuatu, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Venezuela">
+				<long>
+					<standard>Wenesuela</standard>
+				</long>
+			</metazone>
+			<metazone type="Vladivostok">
+				<long>
+					<generic>Wladiwostok</generic>
+					<standard>Wladiwostok, standart wagt</standard>
+					<daylight>Wladiwostok, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Volgograd">
+				<long>
+					<generic>Wolgograd</generic>
+					<standard>Wolgograd, standart wagt</standard>
+					<daylight>Wolgograd, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Vostok">
+				<long>
+					<standard>Wostok</standard>
+				</long>
+			</metazone>
+			<metazone type="Wake">
+				<long>
+					<standard>Weýk adasy</standard>
+				</long>
+			</metazone>
+			<metazone type="Wallis">
+				<long>
+					<standard>Wollis we Futuna</standard>
+				</long>
+			</metazone>
+			<metazone type="Yakutsk">
+				<long>
+					<generic>Ýakutsk</generic>
+					<standard>Ýakutsk, standart wagt</standard>
+					<daylight>Ýakutsk, tomusky wagt</daylight>
+				</long>
+			</metazone>
+			<metazone type="Yekaterinburg">
+				<long>
+					<generic>Ýekaterinburg</generic>
+					<standard>Ýekaterinburg, standart wagt</standard>
+					<daylight>Ýekaterinburg, tomusky wagt</daylight>
+				</long>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<defaultNumberingSystem draft="contributed">latn</defaultNumberingSystem>
+		<otherNumberingSystems>
+			<native draft="contributed">latn</native>
+		</otherNumberingSystems>
+		<minimumGroupingDigits draft="contributed">1</minimumGroupingDigits>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group> </group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>san däl</nan>
+			<timeSeparator draft="contributed">:</timeSeparator>
+		</symbols>
+		<decimalFormats numberSystem="latn">
+			<decimalFormatLength>
+				<decimalFormat>
+					<pattern>#,##0.###</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+			<decimalFormatLength type="long">
+				<decimalFormat>
+					<pattern type="1000" count="one">0 müň</pattern>
+					<pattern type="1000" count="other">0 müň</pattern>
+					<pattern type="10000" count="one">00 müň</pattern>
+					<pattern type="10000" count="other">00 müň</pattern>
+					<pattern type="100000" count="one">000 müň</pattern>
+					<pattern type="100000" count="other">000 müň</pattern>
+					<pattern type="1000000" count="one">0 million</pattern>
+					<pattern type="1000000" count="other">0 million</pattern>
+					<pattern type="10000000" count="one">00 million</pattern>
+					<pattern type="10000000" count="other">00 million</pattern>
+					<pattern type="100000000" count="one">000 million</pattern>
+					<pattern type="100000000" count="other">000 million</pattern>
+					<pattern type="1000000000" count="one">0 milliard</pattern>
+					<pattern type="1000000000" count="other">0 milliard</pattern>
+					<pattern type="10000000000" count="one">00 milliard</pattern>
+					<pattern type="10000000000" count="other">00 milliard</pattern>
+					<pattern type="100000000000" count="one">000 milliard</pattern>
+					<pattern type="100000000000" count="other">000 milliard</pattern>
+					<pattern type="1000000000000" count="one">0 trillion</pattern>
+					<pattern type="1000000000000" count="other">0 trillion</pattern>
+					<pattern type="10000000000000" count="one">00 trillion</pattern>
+					<pattern type="10000000000000" count="other">00 trillion</pattern>
+					<pattern type="100000000000000" count="one">000 trillion</pattern>
+					<pattern type="100000000000000" count="other">000 trillion</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+			<decimalFormatLength type="short">
+				<decimalFormat>
+					<pattern type="1000" count="one">0 müň</pattern>
+					<pattern type="1000" count="other">0 müň</pattern>
+					<pattern type="10000" count="one">00 müň</pattern>
+					<pattern type="10000" count="other">00 müň</pattern>
+					<pattern type="100000" count="one">000 müň</pattern>
+					<pattern type="100000" count="other">000 müň</pattern>
+					<pattern type="1000000" count="one">0 mln</pattern>
+					<pattern type="1000000" count="other">0 mln</pattern>
+					<pattern type="10000000" count="one">00 mln</pattern>
+					<pattern type="10000000" count="other">00 mln</pattern>
+					<pattern type="100000000" count="one">000 mln</pattern>
+					<pattern type="100000000" count="other">000 mln</pattern>
+					<pattern type="1000000000" count="one">0 mlrd</pattern>
+					<pattern type="1000000000" count="other">0 mlrd</pattern>
+					<pattern type="10000000000" count="one">00 mlrd</pattern>
+					<pattern type="10000000000" count="other">00 mlrd</pattern>
+					<pattern type="100000000000" count="one">000 mlrd</pattern>
+					<pattern type="100000000000" count="other">000 mlrd</pattern>
+					<pattern type="1000000000000" count="one">0 trln</pattern>
+					<pattern type="1000000000000" count="other">0 trln</pattern>
+					<pattern type="10000000000000" count="one">00 trln</pattern>
+					<pattern type="10000000000000" count="other">00 trln</pattern>
+					<pattern type="100000000000000" count="one">000 trln</pattern>
+					<pattern type="100000000000000" count="other">000 trln</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+		</decimalFormats>
+		<scientificFormats numberSystem="latn">
+			<scientificFormatLength>
+				<scientificFormat>
+					<pattern>#E0</pattern>
+				</scientificFormat>
+			</scientificFormatLength>
+		</scientificFormats>
+		<percentFormats numberSystem="latn">
+			<percentFormatLength>
+				<percentFormat>
+					<pattern>#,##0 %</pattern>
+				</percentFormat>
+			</percentFormatLength>
+		</percentFormats>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">0 müň ¤</pattern>
+					<pattern type="1000" count="other">0 müň ¤</pattern>
+					<pattern type="10000" count="one">00 müň ¤</pattern>
+					<pattern type="10000" count="other">00 müň ¤</pattern>
+					<pattern type="100000" count="one">000 müň ¤</pattern>
+					<pattern type="100000" count="other">000 müň ¤</pattern>
+					<pattern type="1000000" count="one">0 mln ¤</pattern>
+					<pattern type="1000000" count="other">0 mln ¤</pattern>
+					<pattern type="10000000" count="one">00 mln ¤</pattern>
+					<pattern type="10000000" count="other">00 mln ¤</pattern>
+					<pattern type="100000000" count="one">000 mln ¤</pattern>
+					<pattern type="100000000" count="other">000 mln ¤</pattern>
+					<pattern type="1000000000" count="one">0 mlrd ¤</pattern>
+					<pattern type="1000000000" count="other">0 mlrd ¤</pattern>
+					<pattern type="10000000000" count="one">00 mlrd ¤</pattern>
+					<pattern type="10000000000" count="other">00 mlrd ¤</pattern>
+					<pattern type="100000000000" count="one">000 mlrd ¤</pattern>
+					<pattern type="100000000000" count="other">000 mlrd ¤</pattern>
+					<pattern type="1000000000000" count="one">0 trln ¤</pattern>
+					<pattern type="1000000000000" count="other">0 trln ¤</pattern>
+					<pattern type="10000000000000" count="one">00 trln ¤</pattern>
+					<pattern type="10000000000000" count="other">00 trln ¤</pattern>
+					<pattern type="100000000000000" count="one">000 trln ¤</pattern>
+					<pattern type="100000000000000" count="other">000 trln ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<unitPattern count="one">{0} {1}</unitPattern>
+			<unitPattern count="other">{0} {1}</unitPattern>
+		</currencyFormats>
+		<currencies>
+			<currency type="AED">
+				<displayName>BAE dirhemi</displayName>
+				<displayName count="one">BAE dirhemi</displayName>
+				<displayName count="other">BAE dirhemi</displayName>
+				<symbol draft="contributed">AED</symbol>
+			</currency>
+			<currency type="AFN">
+				<displayName>Owgan afganisi</displayName>
+				<displayName count="one">owgan afganisi</displayName>
+				<displayName count="other">owgan afganisi</displayName>
+				<symbol draft="contributed">AFN</symbol>
+			</currency>
+			<currency type="ALL">
+				<displayName>Alban leki</displayName>
+				<displayName count="one">alban leki</displayName>
+				<displayName count="other">alban leki</displayName>
+				<symbol draft="contributed">ALL</symbol>
+			</currency>
+			<currency type="AMD">
+				<displayName>Ermeni dramy</displayName>
+				<displayName count="one">ermeni dramy</displayName>
+				<displayName count="other">ermeni dramy</displayName>
+				<symbol draft="contributed">AMD</symbol>
+			</currency>
+			<currency type="ANG">
+				<displayName>Niderland antil guldeni</displayName>
+				<displayName count="one">niderland antil guldeni</displayName>
+				<displayName count="other">niderland antil guldeni</displayName>
+				<symbol draft="contributed">ANG</symbol>
+			</currency>
+			<currency type="AOA">
+				<displayName>Angol kwanzasy</displayName>
+				<displayName count="one">angol kwanzasy</displayName>
+				<displayName count="other">angol kwanzasy</displayName>
+				<symbol draft="contributed">AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
+			</currency>
+			<currency type="ARS">
+				<displayName>Argentin pesosy</displayName>
+				<displayName count="one">argentin pesosy</displayName>
+				<displayName count="other">argentin pesosy</displayName>
+				<symbol draft="contributed">ARS</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="AUD">
+				<displayName>Awstraliýa dollary</displayName>
+				<displayName count="one">awstraliýa dollary</displayName>
+				<displayName count="other">awstraliýa dollary</displayName>
+				<symbol draft="contributed">A$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="AWG">
+				<displayName>Aruba florini</displayName>
+				<displayName count="one">aruba florini</displayName>
+				<displayName count="other">aruba florini</displayName>
+				<symbol draft="contributed">AWG</symbol>
+			</currency>
+			<currency type="AZN">
+				<displayName>Azerbaýjan manaty</displayName>
+				<displayName count="one">azerbaýjan manaty</displayName>
+				<displayName count="other">azerbaýjan manaty</displayName>
+				<symbol draft="contributed">AZN</symbol>
+			</currency>
+			<currency type="BAM">
+				<displayName>Konwertirlenýän bosniýa we gersogowina markasy</displayName>
+				<displayName count="one">konwertirlenýän bosniýa we gersogowina markasy</displayName>
+				<displayName count="other">konwertirlenýän bosniýa we gersogowina markasy</displayName>
+				<symbol draft="contributed">BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
+			</currency>
+			<currency type="BBD">
+				<displayName>Barbados dollary</displayName>
+				<displayName count="one">barbados dollary</displayName>
+				<displayName count="other">barbados dollary</displayName>
+				<symbol draft="contributed">BBD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BDT">
+				<displayName>Bangladeş takasy</displayName>
+				<displayName count="one">bangladeş takasy</displayName>
+				<displayName count="other">bangladeş takasy</displayName>
+				<symbol draft="contributed">BDT</symbol>
+				<symbol alt="narrow" draft="contributed">৳</symbol>
+			</currency>
+			<currency type="BGN">
+				<displayName>Bolgar lewy</displayName>
+				<displayName count="one">bolgar lewy</displayName>
+				<displayName count="other">bolgar lewy</displayName>
+				<symbol draft="contributed">BGN</symbol>
+			</currency>
+			<currency type="BHD">
+				<displayName>Bahreýn dinary</displayName>
+				<displayName count="one">bahreýn dinary</displayName>
+				<displayName count="other">bahreýn dinary</displayName>
+				<symbol draft="contributed">BHD</symbol>
+			</currency>
+			<currency type="BIF">
+				<displayName>Burundiý franky</displayName>
+				<displayName count="one">burundiý franky</displayName>
+				<displayName count="other">burundiý franky</displayName>
+				<symbol draft="contributed">BIF</symbol>
+			</currency>
+			<currency type="BMD">
+				<displayName>Bermuda dollary</displayName>
+				<displayName count="one">bermuda dollary</displayName>
+				<displayName count="other">bermuda dollary</displayName>
+				<symbol draft="contributed">BMD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BND">
+				<displayName>Bruneý dollary</displayName>
+				<displayName count="one">bruneý dollary</displayName>
+				<displayName count="other">bruneý dollary</displayName>
+				<symbol draft="contributed">BND</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BOB">
+				<displayName>Boliwiýa boliwianosy</displayName>
+				<displayName count="one">boliwiýa boliwianosy</displayName>
+				<displayName count="other">boliwiýa boliwianosy</displayName>
+				<symbol draft="contributed">BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
+			</currency>
+			<currency type="BRL">
+				<displayName>Brazil realy</displayName>
+				<displayName count="one">brazil realy</displayName>
+				<displayName count="other">brazil realy</displayName>
+				<symbol draft="contributed">R$</symbol>
+				<symbol alt="narrow" draft="contributed">R$</symbol>
+			</currency>
+			<currency type="BSD">
+				<displayName>Bagama dollary</displayName>
+				<displayName count="one">bagama dollary</displayName>
+				<displayName count="other">bagama dollary</displayName>
+				<symbol draft="contributed">BSD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BTN">
+				<displayName>Butan ngultrumy</displayName>
+				<displayName count="one">butan ngultrumy</displayName>
+				<displayName count="other">butan ngultrumy</displayName>
+				<symbol draft="contributed">BTN</symbol>
+			</currency>
+			<currency type="BWP">
+				<displayName>Botswana pulasy</displayName>
+				<displayName count="one">botswana pulasy</displayName>
+				<displayName count="other">botswana pulasy</displayName>
+				<symbol draft="contributed">BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
+			</currency>
+			<currency type="BYR">
+				<displayName>Belorus rubly</displayName>
+				<displayName count="one">belorus rubly</displayName>
+				<displayName count="other">belorus rubly</displayName>
+				<symbol draft="contributed">BYR</symbol>
+				<symbol alt="narrow" draft="contributed">р.</symbol>
+			</currency>
+			<currency type="BZD">
+				<displayName>Beliz dollary</displayName>
+				<displayName count="one">beliz dollary</displayName>
+				<displayName count="other">beliz dollary</displayName>
+				<symbol draft="contributed">BZD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CAD">
+				<displayName>Kanada dollary</displayName>
+				<displayName count="one">kanada dollary</displayName>
+				<displayName count="other">kanada dollary</displayName>
+				<symbol draft="contributed">CA$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CDF">
+				<displayName>Kongolez franky</displayName>
+				<displayName count="one">kongolez franky</displayName>
+				<displayName count="other">kongolez franky</displayName>
+				<symbol draft="contributed">CDF</symbol>
+			</currency>
+			<currency type="CHF">
+				<displayName>Şweýsar franky</displayName>
+				<displayName count="one">şweýsar franky</displayName>
+				<displayName count="other">şweýsar franky</displayName>
+				<symbol draft="contributed">CHF</symbol>
+			</currency>
+			<currency type="CLP">
+				<displayName>Çili pesosy</displayName>
+				<displayName count="one">çili pesosy</displayName>
+				<displayName count="other">çili pesosy</displayName>
+				<symbol draft="contributed">CLP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CNY">
+				<displayName>Hytaý ýuany</displayName>
+				<displayName count="one">hytaý ýuany</displayName>
+				<displayName count="other">hytaý ýuany</displayName>
+				<symbol draft="contributed">CN¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
+			</currency>
+			<currency type="COP">
+				<displayName>Kolumbiýa pesosy</displayName>
+				<displayName count="one">kolumbiýa pesosy</displayName>
+				<displayName count="other">kolumbiýa pesosy</displayName>
+				<symbol draft="contributed">COP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CRC">
+				<displayName>Kosta-Rika kolony</displayName>
+				<displayName count="one">kosta-rika kolony</displayName>
+				<displayName count="other">kosta-rika kolony</displayName>
+				<symbol draft="contributed">CRC</symbol>
+				<symbol alt="narrow" draft="contributed">₡</symbol>
+			</currency>
+			<currency type="CUC">
+				<displayName>Konwertirlenýän kuba pesosy</displayName>
+				<displayName count="one">konwertirlenýän kuba pesosy</displayName>
+				<displayName count="other">konwertirlenýän kuba pesosy</displayName>
+				<symbol draft="contributed">CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CUP">
+				<displayName>Kuba pesosy</displayName>
+				<displayName count="one">kuba pesosy</displayName>
+				<displayName count="other">kuba pesosy</displayName>
+				<symbol draft="contributed">CUP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CVE">
+				<displayName>Kabo-Werde eskudosy</displayName>
+				<displayName count="one">kabo-werde eskudosy</displayName>
+				<displayName count="other">kabo-werde eskudosy</displayName>
+				<symbol draft="contributed">CVE</symbol>
+			</currency>
+			<currency type="CZK">
+				<displayName>Çeh kronasy</displayName>
+				<displayName count="one">çeh kronasy</displayName>
+				<displayName count="other">çeh kronasy</displayName>
+				<symbol draft="contributed">CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
+			</currency>
+			<currency type="DJF">
+				<displayName>Jibuti franky</displayName>
+				<displayName count="one">jibuti franky</displayName>
+				<displayName count="other">jibuti franky</displayName>
+				<symbol draft="contributed">DJF</symbol>
+			</currency>
+			<currency type="DKK">
+				<displayName>Daniýa kronasy</displayName>
+				<displayName count="one">daniýa kronasy</displayName>
+				<displayName count="other">daniýa kronasy</displayName>
+				<symbol draft="contributed">DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="DOP">
+				<displayName>Dominikan pesosy</displayName>
+				<displayName count="one">dominikan pesosy</displayName>
+				<displayName count="other">dominikan pesosy</displayName>
+				<symbol draft="contributed">DOP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="DZD">
+				<displayName>Aljir dinary</displayName>
+				<displayName count="one">aljir dinary</displayName>
+				<displayName count="other">aljir dinary</displayName>
+				<symbol draft="contributed">DZD</symbol>
+			</currency>
+			<currency type="EGP">
+				<displayName>Müsür funty</displayName>
+				<displayName count="one">müsür funty</displayName>
+				<displayName count="other">müsür funty</displayName>
+				<symbol draft="contributed">EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
+			</currency>
+			<currency type="ERN">
+				<displayName>Eritreýa nakfasy</displayName>
+				<displayName count="one">eritreýa nakfasy</displayName>
+				<displayName count="other">eritreýa nakfasy</displayName>
+				<symbol draft="contributed">ERN</symbol>
+			</currency>
+			<currency type="ETB">
+				<displayName>Efiopiýa byry</displayName>
+				<displayName count="one">efiopiýa byry</displayName>
+				<displayName count="other">efiopiýa byry</displayName>
+				<symbol draft="contributed">ETB</symbol>
+			</currency>
+			<currency type="EUR">
+				<displayName>Ýewro</displayName>
+				<displayName count="one">ýewro</displayName>
+				<displayName count="other">ýewro</displayName>
+				<symbol draft="contributed">EUR</symbol>
+				<symbol alt="narrow" draft="contributed">€</symbol>
+			</currency>
+			<currency type="FJD">
+				<displayName>Fiji dollary</displayName>
+				<displayName count="one">fiji dollary</displayName>
+				<displayName count="other">fiji dollary</displayName>
+				<symbol draft="contributed">FJD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="FKP">
+				<displayName>Folklend adalarynyň funty</displayName>
+				<displayName count="one">folklend adalarynyň funty</displayName>
+				<displayName count="other">folklend adalarynyň funty</displayName>
+				<symbol draft="contributed">FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="GBP">
+				<displayName>Iňlis funt sterlingi</displayName>
+				<displayName count="one">iňlis funt sterlingi</displayName>
+				<displayName count="other">iňlis funt sterlingi</displayName>
+				<symbol draft="contributed">GBP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="GEL">
+				<displayName>Gruzin lari</displayName>
+				<displayName count="one">gruzin lari</displayName>
+				<displayName count="other">gruzin lari</displayName>
+				<symbol draft="contributed">GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
+			</currency>
+			<currency type="GHS">
+				<displayName>Gano sedisi</displayName>
+				<displayName count="one">gano sedisi</displayName>
+				<displayName count="other">gano sedisi</displayName>
+				<symbol draft="contributed">GHS</symbol>
+			</currency>
+			<currency type="GIP">
+				<displayName>Gibraltar funty</displayName>
+				<displayName count="one">gibraltar funty</displayName>
+				<displayName count="other">gibraltar funty</displayName>
+				<symbol draft="contributed">GIP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="GMD">
+				<displayName>Gambiýa dalasy</displayName>
+				<displayName count="one">gambiýa dalasy</displayName>
+				<displayName count="other">gambiýa dalasy</displayName>
+				<symbol draft="contributed">GMD</symbol>
+			</currency>
+			<currency type="GNF">
+				<displayName>Gwineý franky</displayName>
+				<displayName count="one">gwineý franky</displayName>
+				<displayName count="other">gwineý franky</displayName>
+				<symbol draft="contributed">GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
+			</currency>
+			<currency type="GTQ">
+				<displayName>Gwatemala ketsaly</displayName>
+				<displayName count="one">gwatemala ketsaly</displayName>
+				<displayName count="other">gwatemala ketsaly</displayName>
+				<symbol draft="contributed">GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
+			</currency>
+			<currency type="GYD">
+				<displayName>Gaýan dollary</displayName>
+				<displayName count="one">gaýan dollary</displayName>
+				<displayName count="other">gaýan dollary</displayName>
+				<symbol draft="contributed">GYD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="HKD">
+				<displayName>Gonkong dollary</displayName>
+				<displayName count="one">gonkong dollary</displayName>
+				<displayName count="other">gonkong dollary</displayName>
+				<symbol draft="contributed">HK$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="HNL">
+				<displayName>Gonduras lempirasy</displayName>
+				<displayName count="one">gonduras lempirasy</displayName>
+				<displayName count="other">gonduras lempirasy</displayName>
+				<symbol draft="contributed">HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
+			</currency>
+			<currency type="HRK">
+				<displayName>Horwat kunasy</displayName>
+				<displayName count="one">horwat kunasy</displayName>
+				<displayName count="other">horwat kunasy</displayName>
+				<symbol draft="contributed">HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
+			</currency>
+			<currency type="HTG">
+				<displayName>Gaitýan gurdy</displayName>
+				<displayName count="one">gaitýan gurdy</displayName>
+				<displayName count="other">gaitýan gurdy</displayName>
+				<symbol draft="contributed">HTG</symbol>
+			</currency>
+			<currency type="HUF">
+				<displayName>Wenger forinty</displayName>
+				<displayName count="one">wenger forinty</displayName>
+				<displayName count="other">wenger forinty</displayName>
+				<symbol draft="contributed">HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
+			</currency>
+			<currency type="IDR">
+				<displayName>Indoneziýa rupiýasy</displayName>
+				<displayName count="one">indoneziýa rupiýasy</displayName>
+				<displayName count="other">indoneziýa rupiýasy</displayName>
+				<symbol draft="contributed">IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
+			</currency>
+			<currency type="ILS">
+				<displayName>Täze Ysraýyl şekeli</displayName>
+				<displayName count="one">täze ysraýyl şekeli</displayName>
+				<displayName count="other">täze ysraýl şekeli</displayName>
+				<symbol draft="contributed">₪</symbol>
+				<symbol alt="narrow" draft="contributed">₪</symbol>
+			</currency>
+			<currency type="INR">
+				<displayName>Hindi rupiýasy</displayName>
+				<displayName count="one">hindi rupiýasy</displayName>
+				<displayName count="other">hindi rupiýasy</displayName>
+				<symbol draft="contributed">₹</symbol>
+				<symbol alt="narrow" draft="contributed">₹</symbol>
+			</currency>
+			<currency type="IQD">
+				<displayName>Yrak dinary</displayName>
+				<displayName count="one">yrak dinary</displayName>
+				<displayName count="other">yrak dinary</displayName>
+				<symbol draft="contributed">IQD</symbol>
+			</currency>
+			<currency type="IRR">
+				<displayName>Eýran rialy</displayName>
+				<displayName count="one">eýran rialy</displayName>
+				<displayName count="other">eýran rialy</displayName>
+				<symbol draft="contributed">IRR</symbol>
+			</currency>
+			<currency type="ISK">
+				<displayName>Islandiýa kronasy</displayName>
+				<displayName count="one">islandiýa kronasy</displayName>
+				<displayName count="other">islandiýa kronasy</displayName>
+				<symbol draft="contributed">ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="JMD">
+				<displayName>Ýamaýka dollary</displayName>
+				<displayName count="one">ýamaýka dollary</displayName>
+				<displayName count="other">ýamaýka dollary</displayName>
+				<symbol draft="contributed">JMD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="JOD">
+				<displayName>Iordaniýa dinary</displayName>
+				<displayName count="one">iordaniýa dinary</displayName>
+				<displayName count="other">iordaniýa dinary</displayName>
+				<symbol draft="contributed">JOD</symbol>
+			</currency>
+			<currency type="JPY">
+				<displayName>Ýapon ýeni</displayName>
+				<displayName count="one">ýapon ýeni</displayName>
+				<displayName count="other">ýapon ýeni</displayName>
+				<symbol draft="contributed">JP¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
+			</currency>
+			<currency type="KES">
+				<displayName>Keniýa şillingi</displayName>
+				<displayName count="one">keniýa şillingi</displayName>
+				<displayName count="other">keniýa şillingi</displayName>
+				<symbol draft="contributed">KES</symbol>
+			</currency>
+			<currency type="KGS">
+				<displayName>Gyrgyz somy</displayName>
+				<displayName count="one">gyrgyz somy</displayName>
+				<displayName count="other">gyrgyz somy</displayName>
+				<symbol draft="contributed">KGS</symbol>
+			</currency>
+			<currency type="KHR">
+				<displayName>Kamboja riýeli</displayName>
+				<displayName count="one">kamboja riýeli</displayName>
+				<displayName count="other">kamboja riýeli</displayName>
+				<symbol draft="contributed">KHR</symbol>
+				<symbol alt="narrow" draft="contributed">៛</symbol>
+			</currency>
+			<currency type="KMF">
+				<displayName>Komor adalar franky</displayName>
+				<displayName count="one">komor adalar franky</displayName>
+				<displayName count="other">komor adalar franky</displayName>
+				<symbol draft="contributed">KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
+			</currency>
+			<currency type="KPW">
+				<displayName>Demirgazyk Koreýa wony</displayName>
+				<displayName count="one">demirgazyk koreýa wony</displayName>
+				<displayName count="other">demirgazyk koreýa wony</displayName>
+				<symbol draft="contributed">KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
+			</currency>
+			<currency type="KRW">
+				<displayName>Günorta Koreýa wony</displayName>
+				<displayName count="one">günorta koreýa wony</displayName>
+				<displayName count="other">günorta koreýa wony</displayName>
+				<symbol draft="contributed">₩</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
+			</currency>
+			<currency type="KWD">
+				<displayName>Kuweýt dinary</displayName>
+				<displayName count="one">kuweýt dinary</displayName>
+				<displayName count="other">kuweýt dinary</displayName>
+				<symbol draft="contributed">KWD</symbol>
+			</currency>
+			<currency type="KYD">
+				<displayName>Kaýman adalarynyň dollary</displayName>
+				<displayName count="one">kaýman adalarynyň dollary</displayName>
+				<displayName count="other">kaýman adalarynyň dollary</displayName>
+				<symbol draft="contributed">KYD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="KZT">
+				<displayName>Gazak teňňesi</displayName>
+				<displayName count="one">gazak teňňesi</displayName>
+				<displayName count="other">gazak teňňesi</displayName>
+				<symbol draft="contributed">KZT</symbol>
+				<symbol alt="narrow" draft="contributed">₸</symbol>
+			</currency>
+			<currency type="LAK">
+				<displayName>Laos kipi</displayName>
+				<displayName count="one">laos kipi</displayName>
+				<displayName count="other">laos kipi</displayName>
+				<symbol draft="contributed">LAK</symbol>
+				<symbol alt="narrow" draft="contributed">₭</symbol>
+			</currency>
+			<currency type="LBP">
+				<displayName>Liwan funty</displayName>
+				<displayName count="one">liwan funty</displayName>
+				<displayName count="other">liwan funty</displayName>
+				<symbol draft="contributed">LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
+			</currency>
+			<currency type="LKR">
+				<displayName>Şri-Lanka rupiýasy</displayName>
+				<displayName count="one">şri-lanka rupiýasy</displayName>
+				<displayName count="other">şri-lanka rupiýasy</displayName>
+				<symbol draft="contributed">LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="LRD">
+				<displayName>Liberiýa dollary</displayName>
+				<displayName count="one">liberiýa dollary</displayName>
+				<displayName count="other">liberiýa dollary</displayName>
+				<symbol draft="contributed">LRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="LYD">
+				<displayName>Liwiýa dinary</displayName>
+				<displayName count="one">liwiýa dinary</displayName>
+				<displayName count="other">liwiýa dinary</displayName>
+				<symbol draft="contributed">LYD</symbol>
+			</currency>
+			<currency type="MAD">
+				<displayName>Marokka dirhamy</displayName>
+				<displayName count="one">marokka dirhamy</displayName>
+				<displayName count="other">marokka dirhamy</displayName>
+				<symbol draft="contributed">MAD</symbol>
+			</currency>
+			<currency type="MDL">
+				<displayName>Moldaw leýi</displayName>
+				<displayName count="one">moldaw leýi</displayName>
+				<displayName count="other">moldaw leýi</displayName>
+				<symbol draft="contributed">MDL</symbol>
+			</currency>
+			<currency type="MGA">
+				<displayName>Malagasiý ariarisi</displayName>
+				<displayName count="one">malagasiý ariarisi</displayName>
+				<displayName count="other">malagasiý ariarisi</displayName>
+				<symbol draft="contributed">MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
+			</currency>
+			<currency type="MKD">
+				<displayName>Makedon dinary</displayName>
+				<displayName count="one">makedon dinary</displayName>
+				<displayName count="other">makedon dinary</displayName>
+				<symbol draft="contributed">MKD</symbol>
+			</currency>
+			<currency type="MMK">
+				<displayName>Mýanma kýaty</displayName>
+				<displayName count="one">mýanma kýaty</displayName>
+				<displayName count="other">mýanma kýaty</displayName>
+				<symbol draft="contributed">MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
+			</currency>
+			<currency type="MNT">
+				<displayName>Mongol tugrigi</displayName>
+				<displayName count="one">mongol tugrigi</displayName>
+				<displayName count="other">mongol tugrigi</displayName>
+				<symbol draft="contributed">MNT</symbol>
+				<symbol alt="narrow" draft="contributed">₮</symbol>
+			</currency>
+			<currency type="MOP">
+				<displayName>Makao patakasy</displayName>
+				<displayName count="one">makao patakasy</displayName>
+				<displayName count="other">makao patakasy</displayName>
+				<symbol draft="contributed">MOP</symbol>
+			</currency>
+			<currency type="MRO">
+				<displayName>Mawritan ugiýasy</displayName>
+				<displayName count="one">mawritan ugiýasy</displayName>
+				<displayName count="other">mawritan ugiýasy</displayName>
+				<symbol draft="contributed">MRO</symbol>
+			</currency>
+			<currency type="MUR">
+				<displayName>Mawrikiý rupiýasy</displayName>
+				<displayName count="one">mawrikiý rupiýasy</displayName>
+				<displayName count="other">mawrikiý rupiýasy</displayName>
+				<symbol draft="contributed">MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="MVR">
+				<displayName>Maldiw rufiýasy</displayName>
+				<displayName count="one">maldiw rufiýasy</displayName>
+				<displayName count="other">maldiw rufiýasy</displayName>
+				<symbol draft="contributed">MVR</symbol>
+			</currency>
+			<currency type="MWK">
+				<displayName>Malawi kwaçasy</displayName>
+				<displayName count="one">malawi kwaçasy</displayName>
+				<displayName count="other">malawi kwaçasy</displayName>
+				<symbol draft="contributed">MWK</symbol>
+			</currency>
+			<currency type="MXN">
+				<displayName>Meksikan pesosy</displayName>
+				<displayName count="one">meksikan pesosy</displayName>
+				<displayName count="other">meksikan pesosy</displayName>
+				<symbol draft="contributed">MX$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="MYR">
+				<displayName>Malaýziýa ringgiti</displayName>
+				<displayName count="one">malaýziýa ringgiti</displayName>
+				<displayName count="other">malaýziýa ringgiti</displayName>
+				<symbol draft="contributed">MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
+			</currency>
+			<currency type="MZN">
+				<displayName>Mozambik metikal</displayName>
+				<displayName count="one">mozambik metikal</displayName>
+				<displayName count="other">mozambik metikal</displayName>
+				<symbol draft="contributed">MZN</symbol>
+			</currency>
+			<currency type="NAD">
+				<displayName>Namibiýa dollary</displayName>
+				<displayName count="one">namibiýa dollary</displayName>
+				<displayName count="other">namibiýa dollary</displayName>
+				<symbol draft="contributed">NAD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="NGN">
+				<displayName>Nigeriýa naýrasy</displayName>
+				<displayName count="one">nigeriýa naýrasy</displayName>
+				<displayName count="other">nigeriýa naýrasy</displayName>
+				<symbol draft="contributed">NGN</symbol>
+				<symbol alt="narrow" draft="contributed">₦</symbol>
+			</currency>
+			<currency type="NIO">
+				<displayName>Nikaragua kordobasy</displayName>
+				<displayName count="one">nikaragua kordobasy</displayName>
+				<displayName count="other">nikaragua kordobasy</displayName>
+				<symbol draft="contributed">NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
+			</currency>
+			<currency type="NOK">
+				<displayName>Norwegiýa kronasy</displayName>
+				<displayName count="one">norwegiýa kronasy</displayName>
+				<displayName count="other">norwegiýa kronasy</displayName>
+				<symbol draft="contributed">NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="NPR">
+				<displayName>Nepal rupiýasy</displayName>
+				<displayName count="one">nepal rupiýasy</displayName>
+				<displayName count="other">nepal rupiýasy</displayName>
+				<symbol draft="contributed">NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="NZD">
+				<displayName>Täze Zelandiýa dollary</displayName>
+				<displayName count="one">täze zelandiýa dollary</displayName>
+				<displayName count="other">täze zelandiýa dollary</displayName>
+				<symbol draft="contributed">NZ$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="OMR">
+				<displayName>Oman rialy</displayName>
+				<displayName count="one">oman rialy</displayName>
+				<displayName count="other">oman rialy</displayName>
+				<symbol draft="contributed">OMR</symbol>
+			</currency>
+			<currency type="PAB">
+				<displayName>Panama balboasy</displayName>
+				<displayName count="one">panama balboasy</displayName>
+				<displayName count="other">panama balboasy</displayName>
+				<symbol draft="contributed">PAB</symbol>
+			</currency>
+			<currency type="PEN">
+				<displayName>Täze peru soly</displayName>
+				<displayName count="one">täze peru soly</displayName>
+				<displayName count="other">täze peru soly</displayName>
+				<symbol draft="contributed">PEN</symbol>
+			</currency>
+			<currency type="PGK">
+				<displayName>Papua — Täze Gwineýa kinasy</displayName>
+				<displayName count="one">papua — täze gwineýa kinasy</displayName>
+				<displayName count="other">papua — täze gwineýa kinasy</displayName>
+				<symbol draft="contributed">PGK</symbol>
+			</currency>
+			<currency type="PHP">
+				<displayName>Filippin pesosy</displayName>
+				<displayName count="one">filippin pesosy</displayName>
+				<displayName count="other">filippin pesosy</displayName>
+				<symbol draft="contributed">PHP</symbol>
+				<symbol alt="narrow" draft="contributed">₱</symbol>
+			</currency>
+			<currency type="PKR">
+				<displayName>Päkistan rupiýasy</displayName>
+				<displayName count="one">päkistan rupiýasy</displayName>
+				<displayName count="other">päkistan rupiýasy</displayName>
+				<symbol draft="contributed">PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="PLN">
+				<displayName>Polýak zloty</displayName>
+				<displayName count="one">polýak zloty</displayName>
+				<displayName count="other">polýak zloty</displayName>
+				<symbol draft="contributed">PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
+			</currency>
+			<currency type="PYG">
+				<displayName>Paragwaý guarani</displayName>
+				<displayName count="one">paragwaý guarani</displayName>
+				<displayName count="other">paragwaý guarani</displayName>
+				<symbol draft="contributed">PYG</symbol>
+				<symbol alt="narrow" draft="contributed">₲</symbol>
+			</currency>
+			<currency type="QAR">
+				<displayName>Katar rialy</displayName>
+				<displayName count="one">katar rialy</displayName>
+				<displayName count="other">katar rialy</displayName>
+				<symbol draft="contributed">QAR</symbol>
+			</currency>
+			<currency type="RON">
+				<displayName>Rumyn leýi</displayName>
+				<displayName count="one">rumyn leýi</displayName>
+				<displayName count="other">rumyn leýi</displayName>
+				<symbol draft="contributed">RON</symbol>
+			</currency>
+			<currency type="RSD">
+				<displayName>Serb dinary</displayName>
+				<displayName count="one">serb dinary</displayName>
+				<displayName count="other">serb dinary</displayName>
+				<symbol draft="contributed">RSD</symbol>
+			</currency>
+			<currency type="RUB">
+				<displayName>Rus rubly</displayName>
+				<displayName count="one">rus rubly</displayName>
+				<displayName count="other">rus rubly</displayName>
+				<symbol draft="contributed">RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
+			</currency>
+			<currency type="RWF">
+				<displayName>Rwanda franky</displayName>
+				<displayName count="one">rwanda franky</displayName>
+				<displayName count="other">rwanda franky</displayName>
+				<symbol draft="contributed">RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
+			</currency>
+			<currency type="SAR">
+				<displayName>Saud rialy</displayName>
+				<displayName count="one">saud rialy</displayName>
+				<displayName count="other">saud rialy</displayName>
+				<symbol draft="contributed">SAR</symbol>
+			</currency>
+			<currency type="SBD">
+				<displayName>Solomon adalarynyň dollary</displayName>
+				<displayName count="one">solomon adalarynyň dollary</displayName>
+				<displayName count="other">solomon adalarynyň dollary</displayName>
+				<symbol draft="contributed">SBD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="SCR">
+				<displayName>Seýşel rupiýasy</displayName>
+				<displayName count="one">seýşel rupiýasy</displayName>
+				<displayName count="other">seýşel rupiýasy</displayName>
+				<symbol draft="contributed">SCR</symbol>
+			</currency>
+			<currency type="SDG">
+				<displayName>Sudan funty</displayName>
+				<displayName count="one">sudan funty</displayName>
+				<displayName count="other">sudan funty</displayName>
+				<symbol draft="contributed">SDG</symbol>
+			</currency>
+			<currency type="SEK">
+				<displayName>Şwed kronasy</displayName>
+				<displayName count="one">şwed kronasy</displayName>
+				<displayName count="other">şwed kronasy</displayName>
+				<symbol draft="contributed">SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="SGD">
+				<displayName>Singapur dollary</displayName>
+				<displayName count="one">singapur dollary</displayName>
+				<displayName count="other">singapur dollary</displayName>
+				<symbol draft="contributed">SGD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="SHP">
+				<displayName>Keramatly Ýelena adasynyň funty</displayName>
+				<displayName count="one">keramatly ýelena adasynyň funty</displayName>
+				<displayName count="other">keramatly ýelena adasynyň funty</displayName>
+				<symbol draft="contributed">SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="SLL">
+				<displayName>Leon</displayName>
+				<displayName count="one">leon</displayName>
+				<displayName count="other">leon</displayName>
+				<symbol draft="contributed">SLL</symbol>
+			</currency>
+			<currency type="SOS">
+				<displayName>Somali şilingi</displayName>
+				<displayName count="one">somali şilingi</displayName>
+				<displayName count="other">somali şilingi</displayName>
+				<symbol draft="contributed">SOS</symbol>
+			</currency>
+			<currency type="SRD">
+				<displayName>Surinam dollary</displayName>
+				<displayName count="one">surinam dollary</displayName>
+				<displayName count="other">surinam dollary</displayName>
+				<symbol draft="contributed">SRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="SSP">
+				<displayName>Günorta sudan funty</displayName>
+				<displayName count="one">günorta sudan funty</displayName>
+				<displayName count="other">günorta sudan funty</displayName>
+				<symbol draft="contributed">SSP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="STD">
+				<displayName>San-Tome we Prinsipi dobrasy</displayName>
+				<displayName count="one">san-tome we prinsipi dobrasy</displayName>
+				<displayName count="other">san-tome we prinsipi dobrasy</displayName>
+				<symbol draft="contributed">STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
+			</currency>
+			<currency type="SYP">
+				<displayName>Siriýa funty</displayName>
+				<displayName count="one">siriýa funty</displayName>
+				<displayName count="other">siriýa funty</displayName>
+				<symbol draft="contributed">SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="SZL">
+				<displayName>Swazi lilangeni</displayName>
+				<displayName count="one">swazi lilangeni</displayName>
+				<displayName count="other">swazi lilangeni</displayName>
+				<symbol draft="contributed">SZL</symbol>
+			</currency>
+			<currency type="THB">
+				<displayName>Taýland baty</displayName>
+				<displayName count="one">taýland baty</displayName>
+				<displayName count="other">taýland baty</displayName>
+				<symbol draft="contributed">THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
+			</currency>
+			<currency type="TJS">
+				<displayName>Täjik somonisy</displayName>
+				<displayName count="one">täjik somonisy</displayName>
+				<displayName count="other">täjik somonisy</displayName>
+				<symbol draft="contributed">TJS</symbol>
+			</currency>
+			<currency type="TMT">
+				<displayName>Türkmen manaty</displayName>
+				<displayName count="one">türkmen manaty</displayName>
+				<displayName count="other">türkmen manaty</displayName>
+				<symbol draft="contributed">TMT</symbol>
+			</currency>
+			<currency type="TND">
+				<displayName>Tunis dinary</displayName>
+				<displayName count="one">tunis dinary</displayName>
+				<displayName count="other">tunis dinary</displayName>
+				<symbol draft="contributed">TND</symbol>
+			</currency>
+			<currency type="TOP">
+				<displayName>Tonga paangasy</displayName>
+				<displayName count="one">tonga paangasy</displayName>
+				<displayName count="other">tonga paangasy</displayName>
+				<symbol draft="contributed">TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
+			</currency>
+			<currency type="TRY">
+				<displayName>Türk lirasy</displayName>
+				<displayName count="one">türk lirasy</displayName>
+				<displayName count="other">türk lirasy</displayName>
+				<symbol draft="contributed">TRY</symbol>
+				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
+			</currency>
+			<currency type="TTD">
+				<displayName>Trininad we Tobago dollary</displayName>
+				<displayName count="one">trininad we tobago dollary</displayName>
+				<displayName count="other">trininad we tobago dollary</displayName>
+				<symbol draft="contributed">TTD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="TWD">
+				<displayName>Täze Taýwan dollary</displayName>
+				<displayName count="one">täze taýwan dollary</displayName>
+				<displayName count="other">täze taýwan dollary</displayName>
+				<symbol draft="contributed">NT$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="TZS">
+				<displayName>Tanzaniýa şilingi</displayName>
+				<displayName count="one">tanzaniýa şilingi</displayName>
+				<displayName count="other">tanzaniýa şilingi</displayName>
+				<symbol draft="contributed">TZS</symbol>
+			</currency>
+			<currency type="UAH">
+				<displayName>Ukrain griwnasy</displayName>
+				<displayName count="one">ukrain griwnasy</displayName>
+				<displayName count="other">ukrain griwnasy</displayName>
+				<symbol draft="contributed">UAH</symbol>
+				<symbol alt="narrow" draft="contributed">₴</symbol>
+			</currency>
+			<currency type="UGX">
+				<displayName>Uganda şilingi</displayName>
+				<displayName count="one">uganda şilingi</displayName>
+				<displayName count="other">uganda şilingi</displayName>
+				<symbol draft="contributed">UGX</symbol>
+			</currency>
+			<currency type="USD">
+				<displayName>ABŞ dollary</displayName>
+				<displayName count="one">ABŞ dollary</displayName>
+				<displayName count="other">ABŞ dollary</displayName>
+				<symbol draft="contributed">US$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="UYU">
+				<displayName>Urugwaý pesosy</displayName>
+				<displayName count="one">urugwaý pesosy</displayName>
+				<displayName count="other">urugwaý pesosy</displayName>
+				<symbol draft="contributed">UYU</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="UZS">
+				<displayName>Özbek somy</displayName>
+				<displayName count="one">özbek somy</displayName>
+				<displayName count="other">özbek somy</displayName>
+				<symbol draft="contributed">UZS</symbol>
+			</currency>
+			<currency type="VEF">
+				<displayName>Wenezuela boliwary</displayName>
+				<displayName count="one">wenezuela boliwary</displayName>
+				<displayName count="other">wenezuela boliwary</displayName>
+				<symbol draft="contributed">VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
+			</currency>
+			<currency type="VND">
+				<displayName>Wýetnam dongy</displayName>
+				<displayName count="one">wýetnam dongy</displayName>
+				<displayName count="other">wýetnam dongy</displayName>
+				<symbol draft="contributed">₫</symbol>
+				<symbol alt="narrow" draft="contributed">₫</symbol>
+			</currency>
+			<currency type="VUV">
+				<displayName>Wanuatu watusy</displayName>
+				<displayName count="one">wanuatu watusy</displayName>
+				<displayName count="other">wanuatu watusy</displayName>
+				<symbol draft="contributed">VUV</symbol>
+			</currency>
+			<currency type="WST">
+				<displayName>Samoa talasy</displayName>
+				<displayName count="one">samoa talasy</displayName>
+				<displayName count="other">samoa talasy</displayName>
+				<symbol draft="contributed">WST</symbol>
+			</currency>
+			<currency type="XAF">
+				<displayName>KFA BEAC franky</displayName>
+				<displayName count="one">KFA BEAC franky</displayName>
+				<displayName count="other">KFA BEAC franky</displayName>
+				<symbol draft="contributed">FCFA</symbol>
+			</currency>
+			<currency type="XCD">
+				<displayName>Gündogar karib dollary</displayName>
+				<displayName count="one">gündogar karib dollary</displayName>
+				<displayName count="other">gündogar karib dollary</displayName>
+				<symbol draft="contributed">EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="XOF">
+				<displayName>KFA BCEAO franky</displayName>
+				<displayName count="one">KFA BCEAO franky</displayName>
+				<displayName count="other">KFA BCEAO franky</displayName>
+				<symbol draft="contributed">CFA</symbol>
+			</currency>
+			<currency type="XPF">
+				<displayName>Fransuz ýuwaş umman franky</displayName>
+				<displayName count="one">fransuz ýuwaş umman franky</displayName>
+				<displayName count="other">fransuz ýuwaş umman franky</displayName>
+				<symbol draft="contributed">CFPF</symbol>
+			</currency>
+			<currency type="XXX">
+				<displayName>Näbelli ýa-da ýöremeýän pul birligi</displayName>
+				<displayName count="one">näbelli ýa-da ýöremeýän pul birligi</displayName>
+				<displayName count="other">näbelli ýa-da ýöremeýän pul birligi</displayName>
+			</currency>
+			<currency type="YER">
+				<displayName>Ýemen rialy</displayName>
+				<displayName count="one">ýemen rialy</displayName>
+				<displayName count="other">ýemen rialy</displayName>
+				<symbol draft="contributed">YER</symbol>
+			</currency>
+			<currency type="ZAR">
+				<displayName>Günorta Afrika rendi</displayName>
+				<displayName count="one">günorta afrika rendi</displayName>
+				<displayName count="other">günorta afrika rendi</displayName>
+				<symbol draft="contributed">ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
+			</currency>
+			<currency type="ZMW">
+				<displayName>Zambiýa kwaçasy</displayName>
+				<displayName count="one">zambiýa kwaçasy</displayName>
+				<displayName count="other">zambiýa kwaçasy</displayName>
+				<symbol draft="contributed">ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
+			</currency>
+		</currencies>
+		<miscPatterns numberSystem="latn">
+			<pattern type="atLeast">≥{0}</pattern>
+			<pattern type="range">{0}–{1}</pattern>
+		</miscPatterns>
+	</numbers>
+	<units>
+		<unitLength type="long">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{1} başyna {0}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<displayName>erkin düşüş tizlenmesi</displayName>
+				<unitPattern count="one">{0} G</unitPattern>
+				<unitPattern count="other">{0} G</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-second-squared">
+				<displayName>inedördül sekuntda metr</displayName>
+				<unitPattern count="one">{0} inedördül sekuntda metr</unitPattern>
+				<unitPattern count="other">{0} inedördül sekuntda metr</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>aýlaw</displayName>
+				<unitPattern count="one">{0} aýlaw</unitPattern>
+				<unitPattern count="other">{0} aýlaw</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radian</displayName>
+				<unitPattern count="one">{0} radian</unitPattern>
+				<unitPattern count="other">{0} radian</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>dereje</displayName>
+				<unitPattern count="one">{0} dereje</unitPattern>
+				<unitPattern count="other">{0} dereje</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>minut</displayName>
+				<unitPattern count="one">{0} minut</unitPattern>
+				<unitPattern count="other">{0} minut</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>sekunt</displayName>
+				<unitPattern count="one">{0} sekunt</unitPattern>
+				<unitPattern count="other">{0} sekunt</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>inedördül kilometr</displayName>
+				<unitPattern count="one">{0} inedördül kilometr</unitPattern>
+				<unitPattern count="other">{0} inedördül kilometr</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>gektar</displayName>
+				<unitPattern count="one">{0} gektar</unitPattern>
+				<unitPattern count="other">{0} gektar</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>inedördül metr</displayName>
+				<unitPattern count="one">{0} inedördül metr</unitPattern>
+				<unitPattern count="other">{0} inedördül metr</unitPattern>
+				<perUnitPattern>{0}/inedördül metr</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>inedördül santimetr</displayName>
+				<unitPattern count="one">{0} inedördül santimetr</unitPattern>
+				<unitPattern count="other">{0} inedördül santimetr</unitPattern>
+				<perUnitPattern>{0}/inedördül santimetr</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>inedördül mil</displayName>
+				<unitPattern count="one">{0} inedördül mil</unitPattern>
+				<unitPattern count="other">{0} inedördül mil</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>akra</displayName>
+				<unitPattern count="one">{0} akr</unitPattern>
+				<unitPattern count="other">{0} akr</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>inedördül ýard</displayName>
+				<unitPattern count="one">{0} inedördül ýard</unitPattern>
+				<unitPattern count="other">{0} inedördül ýard</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>inedördül fut</displayName>
+				<unitPattern count="one">{0} inedördül fut</unitPattern>
+				<unitPattern count="other">{0} inedördül fut</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>inedördül dýuým</displayName>
+				<unitPattern count="one">{0} inedördül dýuým</unitPattern>
+				<unitPattern count="other">{0} inedördül dýuým</unitPattern>
+				<perUnitPattern>{0}/inedördül dýuým</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="other">{0} karat</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>kilometrde litr</displayName>
+				<unitPattern count="one">kilometrde {0} litr</unitPattern>
+				<unitPattern count="other">kilometrde {0} litr</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>100 kilometrde litr</displayName>
+				<unitPattern count="one">100 kilometrde {0} litr</unitPattern>
+				<unitPattern count="other">100 kilometrde {0} litr</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>galonda mil</displayName>
+				<unitPattern count="one">galonda {0} mil</unitPattern>
+				<unitPattern count="other">galonda {0} mil</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<displayName>terabaýt</displayName>
+				<unitPattern count="one">{0} terabaýt</unitPattern>
+				<unitPattern count="other">{0} terabaýt</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabit</displayName>
+				<unitPattern count="one">{0} terabit</unitPattern>
+				<unitPattern count="other">{0} terabit</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabaýt</displayName>
+				<unitPattern count="one">{0} gigabaýt</unitPattern>
+				<unitPattern count="other">{0} gigabaýt</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabit</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="other">{0} gigabit</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabaýt</displayName>
+				<unitPattern count="one">{0} megabaýt</unitPattern>
+				<unitPattern count="other">{0} megabaýt</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabit</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="other">{0} megabit</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobaýt</displayName>
+				<unitPattern count="one">{0} kilobaýt</unitPattern>
+				<unitPattern count="other">{0} kilobaýt</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobit</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="other">{0} kilobit</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>baýt</displayName>
+				<unitPattern count="one">{0} baýt</unitPattern>
+				<unitPattern count="other">{0} baýt</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>asyr</displayName>
+				<unitPattern count="one">{0} asyr</unitPattern>
+				<unitPattern count="other">{0} asyr</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ýyl</displayName>
+				<unitPattern count="one">{0} ýyl</unitPattern>
+				<unitPattern count="other">{0} ýyl</unitPattern>
+				<perUnitPattern>{0}/ý</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>aý</displayName>
+				<unitPattern count="one">{0} aý</unitPattern>
+				<unitPattern count="other">{0} aý</unitPattern>
+				<perUnitPattern>{0}/aý</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>hepde</displayName>
+				<unitPattern count="one">{0} hepde</unitPattern>
+				<unitPattern count="other">{0} hepde</unitPattern>
+				<perUnitPattern>{0}/hepde</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>gün</displayName>
+				<unitPattern count="one">{0} gün</unitPattern>
+				<unitPattern count="other">{0} gün</unitPattern>
+				<perUnitPattern>{0}/gün</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>sagat</displayName>
+				<unitPattern count="one">{0} sagat</unitPattern>
+				<unitPattern count="other">{0} sagat</unitPattern>
+				<perUnitPattern>{0}/sagat</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>minut</displayName>
+				<unitPattern count="one">{0} minut</unitPattern>
+				<unitPattern count="other">{0} minut</unitPattern>
+				<perUnitPattern>{0}/minut</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>sekunt</displayName>
+				<unitPattern count="one">{0} sekunt</unitPattern>
+				<unitPattern count="other">{0} sekunt</unitPattern>
+				<perUnitPattern>{0}/sekunt</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>millisekunt</displayName>
+				<unitPattern count="one">{0} millisekunt</unitPattern>
+				<unitPattern count="other">{0} millisekunt</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>mikrosekunt</displayName>
+				<unitPattern count="one">{0} mikrosekunt</unitPattern>
+				<unitPattern count="other">{0} mikrosekunt</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosekunt</displayName>
+				<unitPattern count="one">{0} nanosekunt</unitPattern>
+				<unitPattern count="other">{0} nanosekunt</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName>amper</displayName>
+				<unitPattern count="one">{0} amper</unitPattern>
+				<unitPattern count="other">{0} amper</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>milliamper</displayName>
+				<unitPattern count="one">{0} milliamper</unitPattern>
+				<unitPattern count="other">{0} milliamper</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<displayName>om</displayName>
+				<unitPattern count="one">{0} om</unitPattern>
+				<unitPattern count="other">{0} om</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>wolt</displayName>
+				<unitPattern count="one">{0} wolt</unitPattern>
+				<unitPattern count="other">{0} wolt</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokaloriýa</displayName>
+				<unitPattern count="one">{0} kilokaloriýa</unitPattern>
+				<unitPattern count="other">{0} kilokaloriýa</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>kaloriýa</displayName>
+				<unitPattern count="one">{0} kaloriýa</unitPattern>
+				<unitPattern count="other">{0} kaloriýa</unitPattern>
+			</unit>
+			<unit type="energy-foodcalorie">
+				<displayName>Kaloriýa</displayName>
+				<unitPattern count="one">{0} Kaloriýa</unitPattern>
+				<unitPattern count="other">{0} Kaloriýa</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>kilodžul</displayName>
+				<unitPattern count="one">{0} kilodžul</unitPattern>
+				<unitPattern count="other">{0} kilodžul</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>dž</displayName>
+				<unitPattern count="one">{0} džul</unitPattern>
+				<unitPattern count="other">{0} džul</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>kilowat-sagat</displayName>
+				<unitPattern count="one">{0} kilowat-sagat</unitPattern>
+				<unitPattern count="other">{0} kilowat-sagat</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<displayName>gigagerts</displayName>
+				<unitPattern count="one">{0} gigagerts</unitPattern>
+				<unitPattern count="other">{0} gigagerts</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<displayName>megagerts</displayName>
+				<unitPattern count="one">{0} megagerts</unitPattern>
+				<unitPattern count="other">{0} megagerts</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>kilogerts</displayName>
+				<unitPattern count="one">{0} kilogerts</unitPattern>
+				<unitPattern count="other">{0} kilogerts</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<displayName>gerts</displayName>
+				<unitPattern count="one">{0} gerts</unitPattern>
+				<unitPattern count="other">{0} gerts</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>kilometr</displayName>
+				<unitPattern count="one">{0} kilometr</unitPattern>
+				<unitPattern count="other">{0} kilometr</unitPattern>
+				<perUnitPattern>{0}/kilometr</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>metr</displayName>
+				<unitPattern count="one">{0} metr</unitPattern>
+				<unitPattern count="other">{0} metr</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>desimetr</displayName>
+				<unitPattern count="one">{0} desimetr</unitPattern>
+				<unitPattern count="other">{0} desimetr</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>santimetr</displayName>
+				<unitPattern count="one">{0} santimetr</unitPattern>
+				<unitPattern count="other">{0} santimetr</unitPattern>
+				<perUnitPattern>{0}/sm</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>millimetr</displayName>
+				<unitPattern count="one">{0} millimetr</unitPattern>
+				<unitPattern count="other">{0} millimetr</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikrometr</displayName>
+				<unitPattern count="one">{0} mikrometr</unitPattern>
+				<unitPattern count="other">{0} mikrometr</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nanometr</displayName>
+				<unitPattern count="one">{0} nanometr</unitPattern>
+				<unitPattern count="other">{0} nanometr</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>pikometr</displayName>
+				<unitPattern count="one">{0} pikometr</unitPattern>
+				<unitPattern count="other">{0} pikometr</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>mil</displayName>
+				<unitPattern count="one">{0} mil</unitPattern>
+				<unitPattern count="other">{0} mil</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>ýard</displayName>
+				<unitPattern count="one">{0} ýard</unitPattern>
+				<unitPattern count="other">{0} ýard</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>fut</displayName>
+				<unitPattern count="one">{0} fut</unitPattern>
+				<unitPattern count="other">{0} fut</unitPattern>
+				<perUnitPattern>{0}/fut</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>dýuým</displayName>
+				<unitPattern count="one">{0} dýuým</unitPattern>
+				<unitPattern count="other">{0} dýuým</unitPattern>
+				<perUnitPattern>{0}/dýuým</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsek</displayName>
+				<unitPattern count="one">{0} parsek</unitPattern>
+				<unitPattern count="other">{0} parsek</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ýagtylyk ýyly</displayName>
+				<unitPattern count="one">{0} ýagtylyk ýyly</unitPattern>
+				<unitPattern count="other">{0} ýagtylyk ýyly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>astronomik birlik</displayName>
+				<unitPattern count="one">{0} astronomik birlik</unitPattern>
+				<unitPattern count="other">{0} astronomik birlik</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>deňiz mili</displayName>
+				<unitPattern count="one">{0} deňiz mili</unitPattern>
+				<unitPattern count="other">{0} deňiz mili</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>skandinaw mili</displayName>
+				<unitPattern count="one">{0} skandinaw mili</unitPattern>
+				<unitPattern count="other">{0} skandinaw mili</unitPattern>
+			</unit>
+			<unit type="light-lux">
+				<displayName>lýuks</displayName>
+				<unitPattern count="one">{0} lýuks</unitPattern>
+				<unitPattern count="other">{0} lýuks</unitPattern>
+			</unit>
+			<unit type="mass-metric-ton">
+				<displayName>metrik tonna</displayName>
+				<unitPattern count="one">{0} metrik tonna</unitPattern>
+				<unitPattern count="other">{0} metrik tonna</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>kilogram</displayName>
+				<unitPattern count="one">{0} kilogram</unitPattern>
+				<unitPattern count="other">{0} kilogram</unitPattern>
+				<perUnitPattern>{0}/kilogram</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="one">{0} gram</unitPattern>
+				<unitPattern count="other">{0} gram</unitPattern>
+				<perUnitPattern>{0}/gram</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>milligram</displayName>
+				<unitPattern count="one">{0} milligram</unitPattern>
+				<unitPattern count="other">{0} milligram</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>mikrogram</displayName>
+				<unitPattern count="one">{0} mikrogram</unitPattern>
+				<unitPattern count="other">{0} mikrogram</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>tonna</displayName>
+				<unitPattern count="one">{0} tonna</unitPattern>
+				<unitPattern count="other">{0} tonna</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>funt</displayName>
+				<unitPattern count="one">{0} funt</unitPattern>
+				<unitPattern count="other">{0} funt</unitPattern>
+				<perUnitPattern>{0}/funt</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>unsiý</displayName>
+				<unitPattern count="one">{0} unsiý</unitPattern>
+				<unitPattern count="other">{0} unsiý</unitPattern>
+				<perUnitPattern>{0}/unsiý</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>troý unsiý</displayName>
+				<unitPattern count="one">{0} troý unsiý</unitPattern>
+				<unitPattern count="other">{0} troý unsiý</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="other">{0} karat</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<displayName>gigawatt</displayName>
+				<unitPattern count="one">{0} gigawatt</unitPattern>
+				<unitPattern count="other">{0} gigawatt</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>megawatt</displayName>
+				<unitPattern count="one">{0} megawatt</unitPattern>
+				<unitPattern count="other">{0} megawatt</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>kilowatt</displayName>
+				<unitPattern count="one">{0} kilowatt</unitPattern>
+				<unitPattern count="other">{0} kilowatt</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>watt</displayName>
+				<unitPattern count="one">{0} watt</unitPattern>
+				<unitPattern count="other">{0} watt</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>milliwatt</displayName>
+				<unitPattern count="one">{0} milliwatt</unitPattern>
+				<unitPattern count="other">{0} milliwatt</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>at güýji</displayName>
+				<unitPattern count="one">{0} at güýji</unitPattern>
+				<unitPattern count="other">{0} at güýji</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<displayName>gektopaskal</displayName>
+				<unitPattern count="one">{0} gektopaskal</unitPattern>
+				<unitPattern count="other">{0} gektopaskal</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>simap sütüniň millimetri</displayName>
+				<unitPattern count="one">{0} simap sütüniň millimetri</unitPattern>
+				<unitPattern count="other">{0} simap sütüniň millimetri</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>inedörül dýuým başyna funt</displayName>
+				<unitPattern count="one">inedörül dýuým başyna {0} funt</unitPattern>
+				<unitPattern count="other">inedörül dýuým başyna {0} funt</unitPattern>
+			</unit>
+			<unit type="pressure-inch-hg">
+				<displayName>simap sütüniň dýuýmy</displayName>
+				<unitPattern count="one">{0} simap sütüniň dýuýmy</unitPattern>
+				<unitPattern count="other">{0} simap sütüniň dýuýmy</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>millibar</displayName>
+				<unitPattern count="one">{0} millibar</unitPattern>
+				<unitPattern count="other">{0} millibar</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>sagatda kilometr</displayName>
+				<unitPattern count="one">sagatda {0} kilometr</unitPattern>
+				<unitPattern count="other">sagatda {0} kilometr</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>sekuntda metr</displayName>
+				<unitPattern count="one">sekuntda {0} metr</unitPattern>
+				<unitPattern count="other">sekuntda {0} metr</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>sagatda mil</displayName>
+				<unitPattern count="one">sagatda {0} mil</unitPattern>
+				<unitPattern count="other">sagatda {0} mil</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>uzel</displayName>
+				<unitPattern count="one">{0} uzel</unitPattern>
+				<unitPattern count="other">{0} uzel</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>Selsiý gradusy</displayName>
+				<unitPattern count="one">{0} Selsiý gradusy</unitPattern>
+				<unitPattern count="other">{0} Selsiý gradusy</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName>Farangeýt gradusy</displayName>
+				<unitPattern count="one">{0} Farangeýt gradusy</unitPattern>
+				<unitPattern count="other">{0} Farangeýt gradusy</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>Kelwin gradusy</displayName>
+				<unitPattern count="one">{0} Kelwin gradusy</unitPattern>
+				<unitPattern count="other">{0} Kelwin gradusy</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>kub kilometr</displayName>
+				<unitPattern count="one">{0} kub kilometr</unitPattern>
+				<unitPattern count="other">{0} kub kilometr</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>kub metr</displayName>
+				<unitPattern count="one">{0} kub metr</unitPattern>
+				<unitPattern count="other">{0} kub metr</unitPattern>
+				<perUnitPattern>{0}/kub metr</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>kub santimetr</displayName>
+				<unitPattern count="one">{0} kub santimetr</unitPattern>
+				<unitPattern count="other">{0} kub santimetr</unitPattern>
+				<perUnitPattern>{0}/kub santimetr</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>kub mil</displayName>
+				<unitPattern count="one">{0} kub mil</unitPattern>
+				<unitPattern count="other">{0} kub mil</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>kub ýard</displayName>
+				<unitPattern count="one">{0} kub ýard</unitPattern>
+				<unitPattern count="other">{0} kub ýard</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>kub fut</displayName>
+				<unitPattern count="one">{0} kub fut</unitPattern>
+				<unitPattern count="other">{0} kub fut</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>kub dýuým</displayName>
+				<unitPattern count="one">{0} kub dýuým</unitPattern>
+				<unitPattern count="other">{0} kub dýuým</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>megalitr</displayName>
+				<unitPattern count="one">{0} megalitr</unitPattern>
+				<unitPattern count="other">{0} megalitr</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>gektolitr</displayName>
+				<unitPattern count="one">{0} gektolitr</unitPattern>
+				<unitPattern count="other">{0} gektolitr</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>litr</displayName>
+				<unitPattern count="one">{0} litr</unitPattern>
+				<unitPattern count="other">{0} litr</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>desilitr</displayName>
+				<unitPattern count="one">{0} desilitr</unitPattern>
+				<unitPattern count="other">{0} desilitr</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>santilitr</displayName>
+				<unitPattern count="one">{0} santilitr</unitPattern>
+				<unitPattern count="other">{0} santilitr</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>millilitr</displayName>
+				<unitPattern count="one">{0} millilitr</unitPattern>
+				<unitPattern count="other">{0} millilitr</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>metrik pint</displayName>
+				<unitPattern count="one">{0} metrik pint</unitPattern>
+				<unitPattern count="other">{0} metrik pint</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>metrik käse</displayName>
+				<unitPattern count="one">{0} metrik käse</unitPattern>
+				<unitPattern count="other">{0} metrik käse</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>akrfut</displayName>
+				<unitPattern count="one">{0} akrfut</unitPattern>
+				<unitPattern count="other">{0} akrfut</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gallon</displayName>
+				<unitPattern count="one">{0} galon</unitPattern>
+				<unitPattern count="other">{0} galon</unitPattern>
+				<perUnitPattern>{0}/galon</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>kwarta</displayName>
+				<unitPattern count="one">{0} kwarta</unitPattern>
+				<unitPattern count="other">{0} kwarta</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>pint</displayName>
+				<unitPattern count="one">{0} pint</unitPattern>
+				<unitPattern count="other">{0} pint</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>käse</displayName>
+				<unitPattern count="one">{0} käse</unitPattern>
+				<unitPattern count="other">{0} käse</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>suwuklyk unsiý</displayName>
+				<unitPattern count="one">{0} suwuklyk unsiý</unitPattern>
+				<unitPattern count="other">{0} suwuklyk unsiý</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>nahar çemçesi</displayName>
+				<unitPattern count="one">{0} nahar çemçe</unitPattern>
+				<unitPattern count="other">{0} nahar çemçe</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>çaý çemçesi</displayName>
+				<unitPattern count="one">{0} çaý çemçe</unitPattern>
+				<unitPattern count="other">{0} çaý çemçe</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} gündogar</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} günorta</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} demirgazyk</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} günbatar</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<unitLength type="short">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<displayName>G</displayName>
+				<unitPattern count="one">{0} G</unitPattern>
+				<unitPattern count="other">{0} G</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-second-squared">
+				<displayName>m/s²</displayName>
+				<unitPattern count="one">{0} m/s²</unitPattern>
+				<unitPattern count="other">{0} m/s²</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>aýl.</displayName>
+				<unitPattern count="one">{0} aýl.</unitPattern>
+				<unitPattern count="other">{0} aýl.</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>′</displayName>
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="other">{0}′</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>″</displayName>
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>ga</displayName>
+				<unitPattern count="one">{0} ga</unitPattern>
+				<unitPattern count="other">{0} ga</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>cm²</displayName>
+				<unitPattern count="one">{0} cm²</unitPattern>
+				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>akr</displayName>
+				<unitPattern count="one">{0} akr</unitPattern>
+				<unitPattern count="other">{0} akr</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>ýd²</displayName>
+				<unitPattern count="one">{0} ýd²</unitPattern>
+				<unitPattern count="other">{0} ýd²</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>ft²</displayName>
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>dý²</displayName>
+				<unitPattern count="one">{0} dý²</unitPattern>
+				<unitPattern count="other">{0} dý²</unitPattern>
+				<perUnitPattern>{0}/dý²</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>kar</displayName>
+				<unitPattern count="one">{0} kar</unitPattern>
+				<unitPattern count="other">{0} kar</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>l/km</displayName>
+				<unitPattern count="one">{0} l/km</unitPattern>
+				<unitPattern count="other">{0} l/km</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>mil/gal.</displayName>
+				<unitPattern count="one">{0} mil/gal.</unitPattern>
+				<unitPattern count="other">{0} mil/gal.</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<displayName>TB</displayName>
+				<unitPattern count="one">{0} TB</unitPattern>
+				<unitPattern count="other">{0} TB</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tbit</displayName>
+				<unitPattern count="one">{0} Tbit</unitPattern>
+				<unitPattern count="other">{0} Tbit</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gbit</displayName>
+				<unitPattern count="one">{0} Gbit</unitPattern>
+				<unitPattern count="other">{0} Gbit</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mbit</displayName>
+				<unitPattern count="one">{0} Mbit</unitPattern>
+				<unitPattern count="other">{0} Mbit</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kbit</displayName>
+				<unitPattern count="one">{0} kbit</unitPattern>
+				<unitPattern count="other">{0} kbit</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>B</displayName>
+				<unitPattern count="one">{0} B</unitPattern>
+				<unitPattern count="other">{0} B</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>as</displayName>
+				<unitPattern count="one">{0} as</unitPattern>
+				<unitPattern count="other">{0} as</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ý.</displayName>
+				<unitPattern count="one">{0} ý.</unitPattern>
+				<unitPattern count="other">{0} ý.</unitPattern>
+				<perUnitPattern>{0}/ý.</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>aý</displayName>
+				<unitPattern count="one">{0} a</unitPattern>
+				<unitPattern count="other">{0} a</unitPattern>
+				<perUnitPattern>{0}/a</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>hep</displayName>
+				<unitPattern count="one">{0} hep</unitPattern>
+				<unitPattern count="other">{0} hep</unitPattern>
+				<perUnitPattern>{0}/hep</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>gün</displayName>
+				<unitPattern count="one">{0} gün</unitPattern>
+				<unitPattern count="other">{0} gün</unitPattern>
+				<perUnitPattern>{0}/gün</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>sag</displayName>
+				<unitPattern count="one">{0} sag</unitPattern>
+				<unitPattern count="other">{0} sag</unitPattern>
+				<perUnitPattern>{0}/sag</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>min</displayName>
+				<unitPattern count="one">{0} min</unitPattern>
+				<unitPattern count="other">{0} min</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>sek</displayName>
+				<unitPattern count="one">{0} sek</unitPattern>
+				<unitPattern count="other">{0} sek</unitPattern>
+				<perUnitPattern>{0}/sek</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>msek</displayName>
+				<unitPattern count="one">{0} msek</unitPattern>
+				<unitPattern count="other">{0} msek</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName>A</displayName>
+				<unitPattern count="one">{0} A</unitPattern>
+				<unitPattern count="other">{0} A</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>mA</displayName>
+				<unitPattern count="one">{0} mA</unitPattern>
+				<unitPattern count="other">{0} mA</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<displayName>Om</displayName>
+				<unitPattern count="one">{0} Om</unitPattern>
+				<unitPattern count="other">{0} Om</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>W</displayName>
+				<unitPattern count="one">{0} W</unitPattern>
+				<unitPattern count="other">{0} W</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kkal</displayName>
+				<unitPattern count="one">{0} kkal</unitPattern>
+				<unitPattern count="other">{0} kkal</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>kal</displayName>
+				<unitPattern count="one">{0} kal</unitPattern>
+				<unitPattern count="other">{0} kal</unitPattern>
+			</unit>
+			<unit type="energy-foodcalorie">
+				<displayName>Kal</displayName>
+				<unitPattern count="one">{0} Kal</unitPattern>
+				<unitPattern count="other">{0} Kal</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>kdž</displayName>
+				<unitPattern count="one">{0} kdž</unitPattern>
+				<unitPattern count="other">{0} kdž</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>dž</displayName>
+				<unitPattern count="one">{0} dž</unitPattern>
+				<unitPattern count="other">{0} dž</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>kWt-sag</displayName>
+				<unitPattern count="one">{0} kWt-sag</unitPattern>
+				<unitPattern count="other">{0} kWt-sag</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<displayName>GGs</displayName>
+				<unitPattern count="one">{0} GGs</unitPattern>
+				<unitPattern count="other">{0} GGs</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<displayName>MGs</displayName>
+				<unitPattern count="one">{0} MGs</unitPattern>
+				<unitPattern count="other">{0} MGs</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>kGs</displayName>
+				<unitPattern count="one">{0} kGs</unitPattern>
+				<unitPattern count="other">{0} kGs</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<displayName>Gs</displayName>
+				<unitPattern count="one">{0} Gs</unitPattern>
+				<unitPattern count="other">{0} Gs</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>metr</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>dm</displayName>
+				<unitPattern count="one">{0} dm</unitPattern>
+				<unitPattern count="other">{0} dm</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>sm</displayName>
+				<unitPattern count="one">{0} sm</unitPattern>
+				<unitPattern count="other">{0} sm</unitPattern>
+				<perUnitPattern>{0}/sm</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>mm</displayName>
+				<unitPattern count="one">{0} mm</unitPattern>
+				<unitPattern count="other">{0} mm</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>mkm</displayName>
+				<unitPattern count="one">{0} mkm</unitPattern>
+				<unitPattern count="other">{0} mkm</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nm</displayName>
+				<unitPattern count="one">{0} nm</unitPattern>
+				<unitPattern count="other">{0} nm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>pm</displayName>
+				<unitPattern count="one">{0} pm</unitPattern>
+				<unitPattern count="other">{0} pm</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>ýd</displayName>
+				<unitPattern count="one">{0} ýd</unitPattern>
+				<unitPattern count="other">{0} ýd</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>ft</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>dý</displayName>
+				<unitPattern count="one">{0} dý</unitPattern>
+				<unitPattern count="other">{0} dý</unitPattern>
+				<perUnitPattern>{0}/dý</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pk</displayName>
+				<unitPattern count="one">{0} pk</unitPattern>
+				<unitPattern count="other">{0} pk</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ýý</displayName>
+				<unitPattern count="one">{0} ýý</unitPattern>
+				<unitPattern count="other">{0} ýý</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ab</displayName>
+				<unitPattern count="one">{0} ab</unitPattern>
+				<unitPattern count="other">{0} ab</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>dmi</displayName>
+				<unitPattern count="one">{0} dmi</unitPattern>
+				<unitPattern count="other">{0} dmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
+			<unit type="light-lux">
+				<displayName>lk</displayName>
+				<unitPattern count="one">{0} lk</unitPattern>
+				<unitPattern count="other">{0} lk</unitPattern>
+			</unit>
+			<unit type="mass-metric-ton">
+				<displayName>m. t</displayName>
+				<unitPattern count="one">{0} m. t</unitPattern>
+				<unitPattern count="other">{0} m. t</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>mg</displayName>
+				<unitPattern count="one">{0} mg</unitPattern>
+				<unitPattern count="other">{0} mg</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>mkg</displayName>
+				<unitPattern count="one">{0} mkg</unitPattern>
+				<unitPattern count="other">{0} mkg</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>t</displayName>
+				<unitPattern count="one">{0} t</unitPattern>
+				<unitPattern count="other">{0} t</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>funt</displayName>
+				<unitPattern count="one">{0} funt</unitPattern>
+				<unitPattern count="other">{0} funt</unitPattern>
+				<perUnitPattern>{0}/funt</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>uns.</displayName>
+				<unitPattern count="one">{0} uns.</unitPattern>
+				<unitPattern count="other">{0} uns.</unitPattern>
+				<perUnitPattern>{0}/uns.</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>kar</displayName>
+				<unitPattern count="one">{0} kar</unitPattern>
+				<unitPattern count="other">{0} kar</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<displayName>GWt</displayName>
+				<unitPattern count="one">{0} GWt</unitPattern>
+				<unitPattern count="other">{0} GWt</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>MWt</displayName>
+				<unitPattern count="one">{0} MWt</unitPattern>
+				<unitPattern count="other">{0} MWt</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>kWt</displayName>
+				<unitPattern count="one">{0} kWt</unitPattern>
+				<unitPattern count="other">{0} kWt</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>Wt</displayName>
+				<unitPattern count="one">{0} Wt</unitPattern>
+				<unitPattern count="other">{0} Wt</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mWt</displayName>
+				<unitPattern count="one">{0} mWt</unitPattern>
+				<unitPattern count="other">{0} mWt</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>a.g.</displayName>
+				<unitPattern count="one">{0} a.g.</unitPattern>
+				<unitPattern count="other">{0} a.g.</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<displayName>gPa</displayName>
+				<unitPattern count="one">{0} gPa</unitPattern>
+				<unitPattern count="other">{0} gPa</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>s. s. mm</displayName>
+				<unitPattern count="one">{0} s. s. mm</unitPattern>
+				<unitPattern count="other">{0} s. s. mm</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>f./dý²</displayName>
+				<unitPattern count="one">{0} f./dý²</unitPattern>
+				<unitPattern count="other">{0} f./dý²</unitPattern>
+			</unit>
+			<unit type="pressure-inch-hg">
+				<displayName>s. s. dý.</displayName>
+				<unitPattern count="one">{0} s. s. dý.</unitPattern>
+				<unitPattern count="other">{0} s. s. dý.</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>km/sag</displayName>
+				<unitPattern count="one">{0} km/sag</unitPattern>
+				<unitPattern count="other">{0} km/sag</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>m/s</displayName>
+				<unitPattern count="one">{0} m/s</unitPattern>
+				<unitPattern count="other">{0} m/s</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>mil/sag</displayName>
+				<unitPattern count="one">{0} mil/sag</unitPattern>
+				<unitPattern count="other">{0} mil/sag</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>uz.</displayName>
+				<unitPattern count="one">{0} uz.</unitPattern>
+				<unitPattern count="other">{0} uz.</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>°C</displayName>
+				<unitPattern count="one">{0}°C</unitPattern>
+				<unitPattern count="other">{0}°C</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName>°F</displayName>
+				<unitPattern count="one">{0}°F</unitPattern>
+				<unitPattern count="other">{0}°F</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>K</displayName>
+				<unitPattern count="one">{0} K</unitPattern>
+				<unitPattern count="other">{0} K</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>km³</displayName>
+				<unitPattern count="one">{0} km³</unitPattern>
+				<unitPattern count="other">{0} km³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>m³</displayName>
+				<unitPattern count="one">{0} m³</unitPattern>
+				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>sm³</displayName>
+				<unitPattern count="one">{0} sm³</unitPattern>
+				<unitPattern count="other">{0} sm³</unitPattern>
+				<perUnitPattern>{0}/sm³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>mi³</displayName>
+				<unitPattern count="one">{0} mi³</unitPattern>
+				<unitPattern count="other">{0} mi³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>ýd³</displayName>
+				<unitPattern count="one">{0} ýd³</unitPattern>
+				<unitPattern count="other">{0} ýd³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>dý³</displayName>
+				<unitPattern count="one">{0} dý³</unitPattern>
+				<unitPattern count="other">{0} dý³</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>gl</displayName>
+				<unitPattern count="one">{0} gl</unitPattern>
+				<unitPattern count="other">{0} gl</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>l</displayName>
+				<unitPattern count="one">{0} l</unitPattern>
+				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>sl</displayName>
+				<unitPattern count="one">{0} sl</unitPattern>
+				<unitPattern count="other">{0} sl</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>ml</displayName>
+				<unitPattern count="one">{0} ml</unitPattern>
+				<unitPattern count="other">{0} ml</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mkä</displayName>
+				<unitPattern count="one">{0} mkä</unitPattern>
+				<unitPattern count="other">{0} mkä</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>akft</displayName>
+				<unitPattern count="one">{0} akft</unitPattern>
+				<unitPattern count="other">{0} akft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal.</displayName>
+				<unitPattern count="one">{0} gal.</unitPattern>
+				<unitPattern count="other">{0} gal.</unitPattern>
+				<perUnitPattern>{0}/gal.</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>kwt</displayName>
+				<unitPattern count="one">{0} kwt</unitPattern>
+				<unitPattern count="other">{0} kwt</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>käse</displayName>
+				<unitPattern count="one">{0} kä</unitPattern>
+				<unitPattern count="other">{0} kä</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>suw. uns.</displayName>
+				<unitPattern count="one">{0} suw. uns.</unitPattern>
+				<unitPattern count="other">{0} suw. uns.</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>n. ç.</displayName>
+				<unitPattern count="one">{0} n. ç.</unitPattern>
+				<unitPattern count="other">{0} n. ç.</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>ç. ç.</displayName>
+				<unitPattern count="one">{0} ç. ç.</unitPattern>
+				<unitPattern count="other">{0} ç. ç.</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} g.d.</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} g.o.</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} d.g.</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} g.b.</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<unitLength type="narrow">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ý</displayName>
+				<unitPattern count="one">{0}ý</unitPattern>
+				<unitPattern count="other">{0}ý</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>a</displayName>
+				<unitPattern count="one">{0}a</unitPattern>
+				<unitPattern count="other">{0}a</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>h</displayName>
+				<unitPattern count="one">{0}h</unitPattern>
+				<unitPattern count="other">{0}h</unitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0}g</unitPattern>
+				<unitPattern count="other">{0}g</unitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>sg</displayName>
+				<unitPattern count="one">{0}sg</unitPattern>
+				<unitPattern count="other">{0}sg</unitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0}m</unitPattern>
+				<unitPattern count="other">{0}m</unitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>se</displayName>
+				<unitPattern count="one">{0}se</unitPattern>
+				<unitPattern count="other">{0}se</unitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0}ms</unitPattern>
+				<unitPattern count="other">{0}ms</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0}km</unitPattern>
+				<unitPattern count="other">{0}km</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0}m</unitPattern>
+				<unitPattern count="other">{0}m</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>sm</displayName>
+				<unitPattern count="one">{0}sm</unitPattern>
+				<unitPattern count="other">{0}sm</unitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>mm</displayName>
+				<unitPattern count="one">{0}mm</unitPattern>
+				<unitPattern count="other">{0}mm</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0}kg</unitPattern>
+				<unitPattern count="other">{0}kg</unitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0}g</unitPattern>
+				<unitPattern count="other">{0}g</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>km/sag</displayName>
+				<unitPattern count="one">{0}km/sag</unitPattern>
+				<unitPattern count="other">{0}km/sag</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>°C</displayName>
+				<unitPattern count="one">{0}°C</unitPattern>
+				<unitPattern count="other">{0}°C</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>l</displayName>
+				<unitPattern count="one">{0}l</unitPattern>
+				<unitPattern count="other">{0}l</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}g.d.</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}g.o.</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}d.g.</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}g.b.</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<durationUnit type="hm">
+			<durationUnitPattern>hh:mm</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="hms">
+			<durationUnitPattern>hh:mm:ss</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="ms">
+			<durationUnitPattern>m:ss</durationUnitPattern>
+		</durationUnit>
+	</units>
+	<listPatterns>
+		<listPattern>
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0} we {1}</listPatternPart>
+			<listPatternPart type="2">{0} we {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0} we {1}</listPatternPart>
+			<listPatternPart type="2">{0} we {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-narrow">
+			<listPatternPart type="start">{0} {1}</listPatternPart>
+			<listPatternPart type="middle">{0} {1}</listPatternPart>
+			<listPatternPart type="end">{0} {1}</listPatternPart>
+			<listPatternPart type="2">{0} {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-short">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0} we {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
+		</listPattern>
+	</listPatterns>
+	<posix>
+		<messages>
+			<yesstr>hawa:h</yesstr>
+			<nostr>ýok:ý</nostr>
+		</messages>
+	</posix>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ha_Latn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tk_TM.xml
similarity index 67%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ha_Latn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tk_TM.xml
index 594a056b4f6..3f03954c98d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ha_Latn.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tk_TM.xml
@@ -6,9 +6,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="ha"/>
-		<script type="Latn"/>
+		<version number="$Revision: 11914 $"/>
+		<language type="tk"/>
+		<territory type="TM"/>
 	</identity>
 </ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/to.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/to.xml
similarity index 89%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/to.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/to.xml
index f27aeece7e2..16ce05c77f9 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/to.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/to.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12379 $"/>
 		<language type="to"/>
 	</identity>
 	<localeDisplayNames>
@@ -58,7 +57,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="awa">lea fakaʻauati</language>
 			<language type="ay">lea fakaʻaimala</language>
 			<language type="az">lea fakaʻasapaisani</language>
-			<language type="azb">lea fakaʻasapaisani-tonga</language>
+			<language type="az" alt="short">lea fakaʻasapaisani</language>
 			<language type="ba">lea fakapasikili</language>
 			<language type="bal">lea fakapalusi</language>
 			<language type="ban">lea fakapali</language>
@@ -75,6 +74,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bfd">lea fakapafuti</language>
 			<language type="bfq">lea fakapataka</language>
 			<language type="bg">lea fakapulukalia</language>
+			<language type="bgn">lea fakapalusi-hihifo</language>
 			<language type="bho">lea fakaposipuli</language>
 			<language type="bi">lea fakapisilama</language>
 			<language type="bik">lea fakapikoli</language>
@@ -116,7 +116,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="chp">lea fakasipeuiani</language>
 			<language type="chr">lea fakaselokī</language>
 			<language type="chy">lea fakaseiene</language>
-			<language type="ckb">lea fakakūtisi-solani</language>
+			<language type="ckb">lea fakakūtisi-loloto</language>
 			<language type="co">lea fakakōsika</language>
 			<language type="cop">lea fakakopitika</language>
 			<language type="cps">lea fakakapiseno</language>
@@ -230,7 +230,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="haw">lea fakahauaiʻi</language>
 			<language type="he">lea fakahepelū</language>
 			<language type="hi">lea fakahinitī</language>
-			<language type="hif">lea fakahihitī-fisi</language>
+			<language type="hif">lea fakahinitī-fisi</language>
 			<language type="hil">lea fakahilikainoni</language>
 			<language type="hit">lea fakahitite</language>
 			<language type="hmn">lea fakamōngi</language>
@@ -336,6 +336,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">lea fakalau</language>
 			<language type="lol">lea fakamongikō</language>
 			<language type="loz">lea fakalosi</language>
+			<language type="lrc">lea fakaluli-tokelau</language>
 			<language type="lt">lea fakalituania</language>
 			<language type="ltg">lea fakalatakale</language>
 			<language type="lu">lea fakalupa-katanga</language>
@@ -379,7 +380,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mr">lea fakamalati</language>
 			<language type="mrj">lea fakamali-hihifo</language>
 			<language type="ms">lea fakamalei</language>
-			<language type="mt">lea fakamolota</language>
+			<language type="mt">lea fakamalita</language>
 			<language type="mua">lea fakamunitangi</language>
 			<language type="mul">lea tuifio</language>
 			<language type="mus">lea fakakileki</language>
@@ -397,6 +398,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nb">lea fakanouaē-pokimali</language>
 			<language type="nd">lea fakanetepele-tokelau</language>
 			<language type="nds">lea fakasiamane-hifo</language>
+			<language type="nds_NL">lea fakasakisoni-hifo</language>
 			<language type="ne">lea fakanepali</language>
 			<language type="new">lea fakaneuali</language>
 			<language type="ng">lea fakanetongikā</language>
@@ -408,7 +410,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nmg">lea fakakuasio</language>
 			<language type="nn">lea fakanoauē-ninosiki</language>
 			<language type="nnh">lea fakangiemipōni</language>
-			<language type="no">lea fakanouē</language>
+			<language type="no">lea fakanouaē</language>
 			<language type="nog">lea fakanokai</language>
 			<language type="non">lea fakanoauē-motuʻa</language>
 			<language type="nov">lea fakanoviale</language>
@@ -443,7 +445,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="pfl">lea fakasiamane-palatine</language>
 			<language type="phn">lea fakafoinikia</language>
 			<language type="pi">lea fakapāli</language>
-			<language type="pl">lea fakapōlani</language>
+			<language type="pl">lea fakapolani</language>
 			<language type="pms">lea fakapiemonite</language>
 			<language type="pnt">lea fakaponitiki</language>
 			<language type="pon">lea fakaponapē</language>
@@ -459,7 +461,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="raj">lea fakalasasitani</language>
 			<language type="rap">lea fakalapanui</language>
 			<language type="rar">lea fakalalotonga</language>
-			<language type="rgn">lea fakaromaniolo</language>
+			<language type="rgn">lea fakalomaniolo</language>
 			<language type="rif">lea fakalifi</language>
 			<language type="rm">lea fakalaito-lomēnia</language>
 			<language type="rn">lea fakaluaniti</language>
@@ -490,6 +492,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sco">lea fakasikotilani</language>
 			<language type="sd">lea fakasīniti</language>
 			<language type="sdc">lea fakasaletīnia-sasalesu</language>
+			<language type="sdh">lea faka-tonga ‘o Ketesi</language>
 			<language type="se">lea fakasami-tokelau</language>
 			<language type="see">lea fakaseneka</language>
 			<language type="seh">lea fakasena</language>
@@ -522,7 +525,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sr">lea fakasēpia</language>
 			<language type="srn">lea fakasuranane-tongikō</language>
 			<language type="srr">lea fakasēlēle</language>
-			<language type="ss">lea fakasuasilani</language>
+			<language type="ss">lea fakasuati</language>
 			<language type="ssy">lea fakasaho</language>
 			<language type="st">lea fakasoto-tonga</language>
 			<language type="stq">lea fakafilisia-satēlani</language>
@@ -532,8 +535,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">lea fakasumelia</language>
 			<language type="sv">lea fakasuēteni</language>
 			<language type="sw">lea fakasuahili</language>
+			<language type="sw_CD">lea fakasuahili-kongikō</language>
 			<language type="swb">lea fakakomolo</language>
-			<language type="swc">lea fakasuahili-kongikō</language>
 			<language type="syc">lea fakasuliāiā-muʻa</language>
 			<language type="syr">lea fakasuliāiā</language>
 			<language type="szl">lea fakasilesia</language>
@@ -547,7 +550,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="tg">lea fakatāsiki</language>
 			<language type="th">lea fakatailani</language>
 			<language type="ti">lea fakatikilinia</language>
-			<language type="tig">lea fakatikilīnia</language>
+			<language type="tig">lea fakatikilē</language>
 			<language type="tiv">lea fakativi</language>
 			<language type="tk">lea fakatēkimeni</language>
 			<language type="tkl">lea fakatokelau</language>
@@ -600,6 +603,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">lea fakaʻuolaita</language>
 			<language type="war">lea fakaʻualai</language>
 			<language type="was">lea fakaʻuasiō</language>
+			<language type="wbp">lea fakaʻuālipili</language>
 			<language type="wo">lea fakaʻuolofo</language>
 			<language type="wuu">lea fakasiaina-uū</language>
 			<language type="xal">lea fakakalimiki</language>
@@ -631,6 +635,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<scripts>
 			<script type="Afak">tohinima fakaʻafaka</script>
 			<script type="Aghb">tohinima fakaʻalapēnia-kaukasia</script>
+			<script type="Ahom" draft="unconfirmed">tohinima fakaʻahomi</script>
 			<script type="Arab">tohinima fakaʻalepea</script>
 			<script type="Armi">tohinima fakaʻalāmiti-ʻemipaea</script>
 			<script type="Armn">tohinima fakaʻāmenia</script>
@@ -679,6 +684,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Hans" alt="stand-alone">tohinima fakasiaina-fakafaingofua</script>
 			<script type="Hant">tohinima fakasiaina-tukufakaholo</script>
 			<script type="Hant" alt="stand-alone">tohinima fakasiaina-tukufakaholo</script>
+			<script type="Hatr" draft="unconfirmed">tohinima fakahatalani</script>
 			<script type="Hebr">tohinima fakahepelū</script>
 			<script type="Hira">tohinima fakasiapani-hilakana</script>
 			<script type="Hluw">tohinima tongitapu-fakaʻanatolia</script>
@@ -725,6 +731,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Moon">tohinima laukonga ki he kui-māhina</script>
 			<script type="Mroo">tohinima fakamolō</script>
 			<script type="Mtei">tohinima fakametei-maieki</script>
+			<script type="Mult" draft="unconfirmed">tohinima fakamulitani</script>
 			<script type="Mymr">tohinima fakapema</script>
 			<script type="Narb">tohinima fakaʻalepea-tokelau-motuʻa</script>
 			<script type="Nbat">tohinima fakanapatea</script>
@@ -746,6 +753,54 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Phnx">tohinima fakafoinikia</script>
 			<script type="Plrd">tohinima fakafonētiki-polāti</script>
 			<script type="Prti">tohinima fakapātia-tongi</script>
+			<script type="Qaaa" draft="unconfirmed">tohinima fakapulipuli-aaa</script>
+			<script type="Qaab" draft="unconfirmed">tohinima fakapulipuli-aab</script>
+			<script type="Qaac" draft="unconfirmed">tohinima fakapulipuli-aac</script>
+			<script type="Qaad" draft="unconfirmed">tohinima fakapulipuli-aad</script>
+			<script type="Qaae" draft="unconfirmed">tohinima fakapulipuli-aae</script>
+			<script type="Qaaf" draft="unconfirmed">tohinima fakapulipuli-aaf</script>
+			<script type="Qaag" draft="unconfirmed">tohinima fakapulipuli-aag</script>
+			<script type="Qaah" draft="unconfirmed">tohinima fakapulipuli-aah</script>
+			<script type="Qaak" draft="unconfirmed">tohinima fakapulipuli-aak</script>
+			<script type="Qaal" draft="unconfirmed">tohinima fakapulipuli-aal</script>
+			<script type="Qaam" draft="unconfirmed">tohinima fakapulipuli-aam</script>
+			<script type="Qaan" draft="unconfirmed">tohinima fakapulipuli-aan</script>
+			<script type="Qaao" draft="unconfirmed">tohinima fakapulipuli-aao</script>
+			<script type="Qaap" draft="unconfirmed">tohinima fakapulipuli-aap</script>
+			<script type="Qaaq" draft="unconfirmed">tohinima fakapulipuli-aaq</script>
+			<script type="Qaar" draft="unconfirmed">tohinima fakapulipuli-aar</script>
+			<script type="Qaas" draft="unconfirmed">tohinima fakapulipuli-aas</script>
+			<script type="Qaat" draft="unconfirmed">tohinima fakapulipuli-aat</script>
+			<script type="Qaau" draft="unconfirmed">tohinima fakapulipuli-aau</script>
+			<script type="Qaav" draft="unconfirmed">tohinima fakapulipuli-aav</script>
+			<script type="Qaaw" draft="unconfirmed">tohinima fakapulipuli-aaw</script>
+			<script type="Qaax" draft="unconfirmed">tohinima fakapulipuli-aax</script>
+			<script type="Qaay" draft="unconfirmed">tohinima fakapulipuli-aay</script>
+			<script type="Qaaz" draft="unconfirmed">tohinima fakapulipuli-aaz</script>
+			<script type="Qaba" draft="unconfirmed">tohinima fakapulipuli-aba</script>
+			<script type="Qabb" draft="unconfirmed">tohinima fakapulipuli-abb</script>
+			<script type="Qabc" draft="unconfirmed">tohinima fakapulipuli-abc</script>
+			<script type="Qabd" draft="unconfirmed">tohinima fakapulipuli-abd</script>
+			<script type="Qabe" draft="unconfirmed">tohinima fakapulipuli-abe</script>
+			<script type="Qabf" draft="unconfirmed">tohinima fakapulipuli-abf</script>
+			<script type="Qabg" draft="unconfirmed">tohinima fakapulipuli-abg</script>
+			<script type="Qabh" draft="unconfirmed">tohinima fakapulipuli-abh</script>
+			<script type="Qabi" draft="unconfirmed">tohinima fakapulipuli-abi</script>
+			<script type="Qabj" draft="unconfirmed">tohinima fakapulipuli-abj</script>
+			<script type="Qabk" draft="unconfirmed">tohinima fakapulipuli-abk</script>
+			<script type="Qabl" draft="unconfirmed">tohinima fakapulipuli-abl</script>
+			<script type="Qabm" draft="unconfirmed">tohinima fakapulipuli-abm</script>
+			<script type="Qabn" draft="unconfirmed">tohinima fakapulipuli-abn</script>
+			<script type="Qabo" draft="unconfirmed">tohinima fakapulipuli-abo</script>
+			<script type="Qabp" draft="unconfirmed">tohinima fakapulipuli-abp</script>
+			<script type="Qabq" draft="unconfirmed">tohinima fakapulipuli-abq</script>
+			<script type="Qabr" draft="unconfirmed">tohinima fakapulipuli-abr</script>
+			<script type="Qabs" draft="unconfirmed">tohinima fakapulipuli-abs</script>
+			<script type="Qabt" draft="unconfirmed">tohinima fakapulipuli-abt</script>
+			<script type="Qabu" draft="unconfirmed">tohinima fakapulipuli-abu</script>
+			<script type="Qabv" draft="unconfirmed">tohinima fakapulipuli-abv</script>
+			<script type="Qabw" draft="unconfirmed">tohinima fakapulipuli-abw</script>
+			<script type="Qabx" draft="unconfirmed">tohinima fakapulipuli-abx</script>
 			<script type="Rjng">tohinima fakalesiangi</script>
 			<script type="Roro">tohinima fakalongolongo</script>
 			<script type="Runr">tohinima fakaluniki</script>
@@ -781,7 +836,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Thai">tohinima fakatailani</script>
 			<script type="Tibt">tohinima fakataipeti</script>
 			<script type="Tirh">tohinima fakatīhuta</script>
-			<script type="Ugar">lea fakaʻūkaliti</script>
+			<script type="Ugar">tohinima fakaʻūkaliti</script>
 			<script type="Vaii">tohinima fakavai</script>
 			<script type="Visp">tohinima fakafonētiki-hāmai</script>
 			<script type="Wara">tohinima fakavalangi-kisitī</script>
@@ -835,7 +890,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anikuila</territory>
 			<territory type="AL">ʻAlipania</territory>
 			<territory type="AM">ʻĀmenia</territory>
-			<territory type="AN">Anitila fakahōlani</territory>
 			<territory type="AO">ʻAngikola</territory>
 			<territory type="AQ">ʻAnitātika</territory>
 			<territory type="AR">ʻAsenitina</territory>
@@ -1063,7 +1117,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="TH">Tailani</territory>
 			<territory type="TJ">Tasikitani</territory>
 			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Timoa Hahake</territory>
+			<territory type="TL">Timoa hahake</territory>
 			<territory type="TM">Tūkimenisitani</territory>
 			<territory type="TN">Tunīsia</territory>
 			<territory type="TO">Tonga</territory>
@@ -1100,100 +1154,114 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="calendar">tohi māhina</key>
 			<key type="collation">tohi hokohoko</key>
 			<key type="currency">paʻanga</key>
+			<key type="hc">takai houa</key>
+			<key type="lb">fesiʻilaine</key>
+			<key type="ms">founga fakafuofua</key>
 			<key type="numbers">fika</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">fika fakaʻalepea</type>
-			<type type="arabext" key="numbers">fika fakaʻalepea fakalahi</type>
-			<type type="armn" key="numbers">fika fakaʻāmenia</type>
-			<type type="armnlow" key="numbers">fika fakaʻāmenia fakalalo</type>
-			<type type="bali" key="numbers" draft="unconfirmed">fika fakapali</type>
-			<type type="beng" key="numbers">fika fakapengikali</type>
-			<type type="big5han" key="collation" draft="unconfirmed">siaina-nimalahi</type>
-			<type type="brah" key="numbers" draft="unconfirmed">fika fakapalami</type>
-			<type type="buddhist" key="calendar">fakaputa</type>
-			<type type="cakm" key="numbers" draft="unconfirmed">fika fakakakema</type>
-			<type type="cham" key="numbers" draft="unconfirmed">fika fakakami</type>
-			<type type="chinese" key="calendar">fakasiaina</type>
-			<type type="coptic" key="calendar" draft="unconfirmed">fakakopitika</type>
-			<type type="dangi" key="calendar">fakataniki</type>
-			<type type="deva" key="numbers">fika fakatevanākalī</type>
-			<type type="dictionary" key="collation" draft="unconfirmed">tikisinale</type>
-			<type type="ducet" key="collation">ʻunikōti</type>
-			<type type="eor" key="collation" draft="unconfirmed">fakaʻiulope</type>
-			<type type="ethi" key="numbers">fika fakaʻītiōpia</type>
-			<type type="ethiopic" key="calendar">fakaʻītiōpia</type>
-			<type type="ethiopic-amete-alem" key="calendar" draft="unconfirmed">fakaʻītiōpia-ʻamete-ʻalemi</type>
-			<type type="fullwide" key="numbers">fika laulahi</type>
-			<type type="gb2312han" key="collation" draft="unconfirmed">siaina-fakafaingofua</type>
-			<type type="geor" key="numbers">fika fakaseōsia</type>
-			<type type="gregorian" key="calendar">fakakelekolia</type>
-			<type type="grek" key="numbers">fika fakakalisi</type>
-			<type type="greklow" key="numbers">fika fakakalisi fakalalo</type>
-			<type type="gujr" key="numbers">fika fakakutalati</type>
-			<type type="guru" key="numbers">fika fakakūmuki</type>
-			<type type="hanidec" key="numbers">fika fakasiaina</type>
-			<type type="hans" key="numbers">fika fakasiaina fakafaingofua</type>
-			<type type="hansfin" key="numbers">fika fakasiaina fakafaingofua fakapaʻanga</type>
-			<type type="hant" key="numbers">fika fakasiaina tukufakaholo</type>
-			<type type="hantfin" key="numbers">fika fakasiaina tukufakaholo fakapaʻanga</type>
-			<type type="hebr" key="numbers">fika fakahepelū</type>
-			<type type="hebrew" key="calendar">fakahepelū</type>
-			<type type="indian" key="calendar">fakaʻinitia</type>
-			<type type="islamic" key="calendar">fakamohameti</type>
-			<type type="islamic-civil" key="calendar">fakamohameti-sivile</type>
-			<type type="islamic-rgsa" key="calendar" draft="unconfirmed">fakamohameti-ʻasimāhina</type>
-			<type type="islamic-tbla" key="calendar" draft="unconfirmed">fakamohameti -fakatēpile</type>
-			<type type="islamic-umalqura" key="calendar" draft="unconfirmed">fakamohameti-ʻumalakula</type>
-			<type type="iso8601" key="calendar">faka-iso8601</type>
-			<type type="japanese" key="calendar">fakasiapani</type>
-			<type type="java" key="numbers" draft="unconfirmed">fika fakasava</type>
-			<type type="jpan" key="numbers">fika fakasiapani</type>
-			<type type="jpanfin" key="numbers">fika fakasiapani fakapaʻanga</type>
-			<type type="kali" key="numbers" draft="unconfirmed">fika fakakaialī</type>
-			<type type="khmr" key="numbers">fika fakakamipōtia</type>
-			<type type="knda" key="numbers">fika fakakanata</type>
-			<type type="lana" key="numbers" draft="unconfirmed">fika fakatai-tami-hola</type>
-			<type type="lanatham" key="numbers" draft="unconfirmed">fika fakatai-tami-tami</type>
-			<type type="laoo" key="numbers">fika fakalau</type>
-			<type type="latn" key="numbers">fika fakalatina</type>
-			<type type="lepc" key="numbers" draft="unconfirmed">fika fakalepasā</type>
-			<type type="limb" key="numbers" draft="unconfirmed">fika fakalimipū</type>
-			<type type="mlym" key="numbers">fika fakamalāialami</type>
-			<type type="mong" key="numbers" draft="unconfirmed">fika fakamongokōlia</type>
-			<type type="mtei" key="numbers" draft="unconfirmed">fika fakametei-maieki</type>
-			<type type="mymr" key="numbers">fika fakapema</type>
-			<type type="mymrshan" key="numbers" draft="unconfirmed">fika fakapema-siani</type>
-			<type type="nkoo" key="numbers" draft="unconfirmed">fika fakanikō</type>
-			<type type="olck" key="numbers" draft="unconfirmed">fika fakaʻolisiki</type>
-			<type type="orya" key="numbers">fika fakaʻolia</type>
-			<type type="osma" key="numbers" draft="unconfirmed">fika fakaʻosimania</type>
-			<type type="persian" key="calendar">fakapēsia</type>
-			<type type="phonebook" key="collation">fika telefoni</type>
-			<type type="pinyin" key="collation" draft="unconfirmed">piniini</type>
-			<type type="reformed" key="collation" draft="unconfirmed">fakafoʻou</type>
-			<type type="roc" key="calendar">fakalēpupelika siaina</type>
-			<type type="roman" key="numbers">fika fakaloma</type>
-			<type type="romanlow" key="numbers">fika fakaloma fakalalo</type>
-			<type type="saur" key="numbers" draft="unconfirmed">fika fakasaulasitā</type>
-			<type type="search" key="collation">fakakumi ʻi hono anga lahi</type>
-			<type type="searchjl" key="collation" draft="unconfirmed">konisinanite ʻuluaki</type>
-			<type type="shrd" key="numbers" draft="unconfirmed">fika fakasalata</type>
-			<type type="sora" key="numbers" draft="unconfirmed">fika fakasola-somipenga</type>
-			<type type="standard" key="collation">fakasīpinga</type>
-			<type type="stroke" key="collation" draft="unconfirmed">tongi</type>
-			<type type="sund" key="numbers" draft="unconfirmed">fika fakasunitā</type>
-			<type type="takr" key="numbers" draft="unconfirmed">fika fakatakili</type>
-			<type type="talu" key="numbers" draft="unconfirmed">fika fakatai-lue foʻou</type>
-			<type type="taml" key="numbers">fika fakatamili tukufakaholo</type>
-			<type type="tamldec" key="numbers">fika fakatamili</type>
-			<type type="telu" key="numbers">fika fakateluku</type>
-			<type type="thai" key="numbers">fika fakatailani</type>
-			<type type="tibt" key="numbers">fika fakatipeti</type>
-			<type type="traditional" key="collation">tukufakaholo</type>
-			<type type="unihan" key="collation" draft="unconfirmed">tongi tefitoʻi</type>
-			<type type="vaii" key="numbers" draft="unconfirmed">fika fakavai</type>
-			<type type="zhuyin" key="collation" draft="unconfirmed">sūini</type>
+			<type key="calendar" type="buddhist">fakaputa</type>
+			<type key="calendar" type="chinese">fakasiaina</type>
+			<type key="calendar" type="coptic" draft="unconfirmed">fakakopitika</type>
+			<type key="calendar" type="dangi">fakataniki</type>
+			<type key="calendar" type="ethiopic">fakaʻītiōpia</type>
+			<type key="calendar" type="ethiopic-amete-alem" draft="unconfirmed">fakaʻītiōpia-ʻamete-ʻalemi</type>
+			<type key="calendar" type="gregorian">fakakelekolia</type>
+			<type key="calendar" type="hebrew">fakahepelū</type>
+			<type key="calendar" type="indian">fakaʻinitia</type>
+			<type key="calendar" type="islamic">fakamohameti</type>
+			<type key="calendar" type="islamic-civil">fakamohameti-sivile</type>
+			<type key="calendar" type="islamic-rgsa" draft="unconfirmed">fakamohameti-ʻasimāhina</type>
+			<type key="calendar" type="islamic-tbla" draft="unconfirmed">fakamohameti -fakatēpile</type>
+			<type key="calendar" type="islamic-umalqura" draft="unconfirmed">fakamohameti-ʻumalakula</type>
+			<type key="calendar" type="iso8601">faka-iso8601</type>
+			<type key="calendar" type="japanese">fakasiapani</type>
+			<type key="calendar" type="persian">fakapēsia</type>
+			<type key="calendar" type="roc">fakalēpupelika siaina</type>
+			<type key="collation" type="big5han" draft="unconfirmed">siaina-nimalahi</type>
+			<type key="collation" type="dictionary" draft="unconfirmed">tikisinale</type>
+			<type key="collation" type="ducet">ʻunikōti</type>
+			<type key="collation" type="emoji" draft="unconfirmed">ʻemosi</type>
+			<type key="collation" type="eor" draft="unconfirmed">fakaʻiulope</type>
+			<type key="collation" type="gb2312han" draft="unconfirmed">siaina-fakafaingofua</type>
+			<type key="collation" type="phonebook">fika telefoni</type>
+			<type key="collation" type="pinyin" draft="unconfirmed">piniini</type>
+			<type key="collation" type="reformed" draft="unconfirmed">fakafoʻou</type>
+			<type key="collation" type="search">fakakumi ʻi hono anga lahi</type>
+			<type key="collation" type="searchjl" draft="unconfirmed">konisinanite ʻuluaki</type>
+			<type key="collation" type="standard">fakasīpinga</type>
+			<type key="collation" type="stroke" draft="unconfirmed">tongi</type>
+			<type key="collation" type="traditional">tukufakaholo</type>
+			<type key="collation" type="unihan" draft="unconfirmed">tongi tefitoʻi</type>
+			<type key="collation" type="zhuyin" draft="unconfirmed">sūini</type>
+			<type key="hc" type="h11">takai houa 0–11</type>
+			<type key="hc" type="h12">takai houa 1–12</type>
+			<type key="hc" type="h23">takai houa 0–23</type>
+			<type key="hc" type="h24">taki houa 1–24</type>
+			<type key="lb" type="loose">fesiʻilaine ngaloku</type>
+			<type key="lb" type="normal">fesiʻilaine faʻafai</type>
+			<type key="lb" type="strict">fesiʻilaine mafao</type>
+			<type key="ms" type="metric">founga fakamita</type>
+			<type key="ms" type="uksystem">founga fakapilitānia</type>
+			<type key="ms" type="ussystem">founga fakaʻamelika</type>
+			<type key="numbers" type="arab">fika fakaʻalepea</type>
+			<type key="numbers" type="arabext">fika fakaʻalepea fakalahi</type>
+			<type key="numbers" type="armn">fika fakaʻāmenia</type>
+			<type key="numbers" type="armnlow">fika fakaʻāmenia fakalalo</type>
+			<type key="numbers" type="bali" draft="unconfirmed">fika fakapali</type>
+			<type key="numbers" type="beng">fika fakapengikali</type>
+			<type key="numbers" type="brah" draft="unconfirmed">fika fakapalami</type>
+			<type key="numbers" type="cakm" draft="unconfirmed">fika fakakakema</type>
+			<type key="numbers" type="cham" draft="unconfirmed">fika fakakami</type>
+			<type key="numbers" type="deva">fika fakatevanākalī</type>
+			<type key="numbers" type="ethi">fika fakaʻītiōpia</type>
+			<type key="numbers" type="fullwide">fika laulahi</type>
+			<type key="numbers" type="geor">fika fakaseōsia</type>
+			<type key="numbers" type="grek">fika fakakalisi</type>
+			<type key="numbers" type="greklow">fika fakakalisi fakalalo</type>
+			<type key="numbers" type="gujr">fika fakakutalati</type>
+			<type key="numbers" type="guru">fika fakakūmuki</type>
+			<type key="numbers" type="hanidec">fika fakasiaina</type>
+			<type key="numbers" type="hans">fika fakasiaina fakafaingofua</type>
+			<type key="numbers" type="hansfin">fika fakasiaina fakafaingofua fakapaʻanga</type>
+			<type key="numbers" type="hant">fika fakasiaina tukufakaholo</type>
+			<type key="numbers" type="hantfin">fika fakasiaina tukufakaholo fakapaʻanga</type>
+			<type key="numbers" type="hebr">fika fakahepelū</type>
+			<type key="numbers" type="java" draft="unconfirmed">fika fakasava</type>
+			<type key="numbers" type="jpan">fika fakasiapani</type>
+			<type key="numbers" type="jpanfin">fika fakasiapani fakapaʻanga</type>
+			<type key="numbers" type="kali" draft="unconfirmed">fika fakakaialī</type>
+			<type key="numbers" type="khmr">fika fakakamipōtia</type>
+			<type key="numbers" type="knda">fika fakakanata</type>
+			<type key="numbers" type="lana" draft="unconfirmed">fika fakatai-tami-hola</type>
+			<type key="numbers" type="lanatham" draft="unconfirmed">fika fakatai-tami-tami</type>
+			<type key="numbers" type="laoo">fika fakalau</type>
+			<type key="numbers" type="latn">fika fakalatina</type>
+			<type key="numbers" type="lepc" draft="unconfirmed">fika fakalepasā</type>
+			<type key="numbers" type="limb" draft="unconfirmed">fika fakalimipū</type>
+			<type key="numbers" type="mlym">fika fakamalāialami</type>
+			<type key="numbers" type="mong" draft="unconfirmed">fika fakamongokōlia</type>
+			<type key="numbers" type="mtei" draft="unconfirmed">fika fakametei-maieki</type>
+			<type key="numbers" type="mymr">fika fakapema</type>
+			<type key="numbers" type="mymrshan" draft="unconfirmed">fika fakapema-siani</type>
+			<type key="numbers" type="nkoo" draft="unconfirmed">fika fakanikō</type>
+			<type key="numbers" type="olck" draft="unconfirmed">fika fakaʻolisiki</type>
+			<type key="numbers" type="orya">fika fakaʻolia</type>
+			<type key="numbers" type="osma" draft="unconfirmed">fika fakaʻosimania</type>
+			<type key="numbers" type="roman">fika fakaloma</type>
+			<type key="numbers" type="romanlow">fika fakaloma fakalalo</type>
+			<type key="numbers" type="saur" draft="unconfirmed">fika fakasaulasitā</type>
+			<type key="numbers" type="shrd" draft="unconfirmed">fika fakasalata</type>
+			<type key="numbers" type="sora" draft="unconfirmed">fika fakasola-somipenga</type>
+			<type key="numbers" type="sund" draft="unconfirmed">fika fakasunitā</type>
+			<type key="numbers" type="takr" draft="unconfirmed">fika fakatakili</type>
+			<type key="numbers" type="talu" draft="unconfirmed">fika fakatai-lue foʻou</type>
+			<type key="numbers" type="taml">fika fakatamili tukufakaholo</type>
+			<type key="numbers" type="tamldec">fika fakatamili</type>
+			<type key="numbers" type="telu">fika fakateluku</type>
+			<type key="numbers" type="thai">fika fakatailani</type>
+			<type key="numbers" type="tibt">fika fakatipeti</type>
+			<type key="numbers" type="vaii" draft="unconfirmed">fika fakavai</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">fakamita</measurementSystemName>
@@ -1273,6 +1341,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -1311,6 +1380,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E d MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y MMMM</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">y QQQ G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">y QQQQ G</dateFormatItem>
 					</availableFormats>
@@ -1624,14 +1694,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="noon">h</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="noon">hoʻatā</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
@@ -1645,16 +1731,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</eraNames>
 					<eraAbbr>
 						<era type="0">KM</era>
-						<era type="0" alt="variant">BCE</era>
 						<era type="1">TS</era>
-						<era type="1" alt="variant">CE</era>
 					</eraAbbr>
-					<eraNarrow>
-						<era type="0">KāMā</era>
-						<era type="0" alt="variant" draft="unconfirmed">KM</era>
-						<era type="1">TāSā</era>
-						<era type="1" alt="variant" draft="unconfirmed">TS</era>
-					</eraNarrow>
 				</eras>
 				<dateFormats>
 					<dateFormatLength type="full">
@@ -1739,6 +1817,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E d/M</dateFormatItem>
@@ -1879,6 +1961,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>taʻu</displayName>
+				<relative type="-1">taʻu kuoʻosi</relative>
+				<relative type="0">taʻú ni</relative>
+				<relative type="1">taʻu kahaʻu</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ʻi he taʻu ʻe {0}</relativeTimePattern>
 				</relativeTime>
@@ -1888,6 +1973,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>taʻu</displayName>
+				<relative type="-1">taʻu kuoʻosi</relative>
+				<relative type="0">taʻú ni</relative>
+				<relative type="1">taʻu kahaʻu</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ʻi he taʻu ʻe {0}</relativeTimePattern>
 				</relativeTime>
@@ -1897,6 +1985,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter">
 				<displayName>kuata</displayName>
+				<relative type="-1">kuata kuoʻosi</relative>
+				<relative type="0">kuata koʻeni</relative>
+				<relative type="1">kuata hoko</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ʻi he kuata ʻe {0}</relativeTimePattern>
 				</relativeTime>
@@ -1906,6 +1997,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>kuata</displayName>
+				<relative type="-1">kuata kuoʻosi</relative>
+				<relative type="0">kuata koʻeni</relative>
+				<relative type="1">kuata hoko</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ʻi he kuata ʻe {0}</relativeTimePattern>
 				</relativeTime>
@@ -1915,6 +2009,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>kuata</displayName>
+				<relative type="-1">kuata kuoʻosi</relative>
+				<relative type="0">kuata koʻeni</relative>
+				<relative type="1">kuata hoko</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ʻi he kuata ʻe {0}</relativeTimePattern>
 				</relativeTime>
@@ -1936,6 +2033,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>māhina</displayName>
+				<relative type="-1">māhina kuoʻosi</relative>
+				<relative type="0">māhiná ni</relative>
+				<relative type="1">māhina kahaʻu</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ʻi he māhina ʻe {0}</relativeTimePattern>
 				</relativeTime>
@@ -1945,6 +2045,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>māhina</displayName>
+				<relative type="-1">māhina kuoʻosi</relative>
+				<relative type="0">māhiná ni</relative>
+				<relative type="1">māhina kahaʻu</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ʻi he māhina ʻe {0}</relativeTimePattern>
 				</relativeTime>
@@ -1966,6 +2069,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>uike</displayName>
+				<relative type="-1">uike kuoʻosi</relative>
+				<relative type="0">uiké ni</relative>
+				<relative type="1">uike kahaʻu</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ʻi he uike ʻe {0}</relativeTimePattern>
 				</relativeTime>
@@ -1975,6 +2081,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>uike</displayName>
+				<relative type="-1">uike kuoʻosi</relative>
+				<relative type="0">uiké ni</relative>
+				<relative type="1">uike kahaʻu</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ʻi he uike ʻe {0}</relativeTimePattern>
 				</relativeTime>
@@ -1998,6 +2107,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>ʻaho</displayName>
+				<relative type="-2">ʻaneheafi</relative>
+				<relative type="-1">ʻaneafi</relative>
+				<relative type="0">ʻahó ni</relative>
+				<relative type="1">ʻapongipongi</relative>
+				<relative type="2">ʻahepongipongi</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ʻi he ʻaho ʻe {0}</relativeTimePattern>
 				</relativeTime>
@@ -2007,6 +2121,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>ʻaho</displayName>
+				<relative type="-2">ʻaneheafi</relative>
+				<relative type="-1">ʻaneafi</relative>
+				<relative type="0">ʻahó ni</relative>
+				<relative type="1">ʻapongipongi</relative>
+				<relative type="2">ʻahepongipongi</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">ʻi he ʻaho ʻe {0}</relativeTimePattern>
 				</relativeTime>
@@ -2394,7 +2513,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Porto-Novo</exemplarCity>
 			</zone>
 			<zone type="America/St_Barthelemy">
-				<exemplarCity>St. Barthelemy</exemplarCity>
+				<exemplarCity>St. Barthélemy</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Bermuda">
 				<exemplarCity>Bermuda</exemplarCity>
@@ -3086,6 +3205,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity draft="unconfirmed">Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
 			</zone>
@@ -3123,13 +3245,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Palau</exemplarCity>
 			</zone>
 			<zone type="America/Asuncion">
-				<exemplarCity>Asuncion</exemplarCity>
+				<exemplarCity>Asunción</exemplarCity>
 			</zone>
 			<zone type="Asia/Qatar">
 				<exemplarCity>Qatar</exemplarCity>
 			</zone>
 			<zone type="Indian/Reunion">
-				<exemplarCity>Reunion</exemplarCity>
+				<exemplarCity>Réunion</exemplarCity>
 			</zone>
 			<zone type="Europe/Bucharest">
 				<exemplarCity>Bucharest</exemplarCity>
@@ -3170,6 +3292,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity draft="unconfirmed">Chita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Yakutsk</exemplarCity>
 			</zone>
@@ -3188,6 +3313,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity draft="unconfirmed">Srednekolymsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamchatka</exemplarCity>
 			</zone>
@@ -3246,7 +3374,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Juba</exemplarCity>
 			</zone>
 			<zone type="Africa/Sao_Tome">
-				<exemplarCity>Sao Tome</exemplarCity>
+				<exemplarCity>São Tomé</exemplarCity>
 			</zone>
 			<zone type="America/El_Salvador">
 				<exemplarCity>El Salvador</exemplarCity>
@@ -3309,7 +3437,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Dar es Salaam</exemplarCity>
 			</zone>
 			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uzhgorod</exemplarCity>
+				<exemplarCity>Uzhhorod</exemplarCity>
 			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiev</exemplarCity>
@@ -4508,6 +4636,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤ #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤ 0k</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00k</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000k</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0Ki</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00Ki</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000Ki</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="other">{1} {0}</unitPattern>
 		</currencyFormats>
 		<currencies>
@@ -4515,10 +4659,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>AUD$</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
+			<currency type="BRL">
+				<displayName>BRL</displayName>
+			</currency>
 			<currency type="FJD">
 				<symbol>FJD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
+			<currency type="GEL">
+				<symbol alt="variant" draft="contributed">₾</symbol>
+			</currency>
 			<currency type="NZD">
 				<symbol>NZD$</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
@@ -4535,6 +4685,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">Paʻanga fakatonga</displayName>
 				<symbol>T$</symbol>
 			</currency>
+			<currency type="TWD">
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
 			<currency type="VUV">
 				<symbol>VUV</symbol>
 			</currency>
@@ -4546,6 +4699,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="XPF">
 				<symbol>CFPF</symbol>
 			</currency>
+			<currency type="XXX">
+				<displayName>Pa’anga Ta’e’ilo</displayName>
+				<displayName count="other">Pa’anga Ta’e’ilo</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -4565,6 +4722,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>mita he sekoni sikuea</displayName>
 				<unitPattern count="other">mita he sekoni sikuea ʻe {0}</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>takai</displayName>
+				<unitPattern count="other">takai ʻe {0}</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>lētiani</displayName>
+				<unitPattern count="other">lētiani ʻe {0}</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>tikili seakale</displayName>
+				<unitPattern count="other">tikili seakale ʻe {0}</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>miniti seakale</displayName>
 				<unitPattern count="other">miniti seakale ʻe {0}</unitPattern>
@@ -4573,25 +4742,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>sekoni seakale</displayName>
 				<unitPattern count="other">sekoni seakale ʻe {0}</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>tikili seakale</displayName>
-				<unitPattern count="other">tikili seakale ʻe {0}</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>lētiani</displayName>
-				<unitPattern count="other">lētiani ʻe {0}</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ʻeka ʻe</displayName>
-				<unitPattern count="other">ʻeka ʻe {0}</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>kilomita sikuea</displayName>
+				<unitPattern count="other">kilomita sikuea ʻe {0}</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hekitale</displayName>
 				<unitPattern count="other">hekitale ʻe {0}</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>mita sikuea ʻe</displayName>
+				<unitPattern count="other">mita sikuea ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} ki he mita sikuea</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>senitimita sikuea</displayName>
 				<unitPattern count="other">senitimita sikuea ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} ki he senitimita sikuea</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>maile sikuea</displayName>
+				<unitPattern count="other">maile sikuea ʻe {0}</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ʻeka ʻe</displayName>
+				<unitPattern count="other">ʻeka ʻe {0}</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>iate sikuea</displayName>
+				<unitPattern count="other">iate sikuea ʻe {0}</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>fute sikuea</displayName>
@@ -4600,112 +4779,114 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="area-square-inch">
 				<displayName>ʻinisi sikuea</displayName>
 				<unitPattern count="other">ʻinisi sikuea ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} ki he ʻinisi sikuea</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kilomita sikuea</displayName>
-				<unitPattern count="other">kilomita sikuea ʻe {0}</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>mita sikuea ʻe</displayName>
-				<unitPattern count="other">mita sikuea ʻe {0}</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>maile sikuea</displayName>
-				<unitPattern count="other">maile sikuea ʻe {0}</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>iate sikuea</displayName>
-				<unitPattern count="other">iate sikuea ʻe {0}</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kalati</displayName>
+				<unitPattern count="other">kalati ʻe {0}</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>lita he kilomita</displayName>
-				<unitPattern count="other">lita he kilomita ʻe {0}</unitPattern>
+				<unitPattern count="other">lita ʻe {0} he kilomita</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>lita he kilomita ʻe 100</displayName>
+				<unitPattern count="other">lita ʻe {0} he kilomita ʻe 100</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>maile he kālani</displayName>
-				<unitPattern count="other">maile he kālani ʻe {0}</unitPattern>
-			</unit>
-			<unit type="digital-bit">
-				<displayName>ʻū piti</displayName>
-				<unitPattern count="other">piti ʻe {0}</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>paiti</displayName>
-				<unitPattern count="other">paiti ʻe {0}</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>kikapiti</displayName>
-				<unitPattern count="other">kikapiti ʻe {0}</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>kikapaiti</displayName>
-				<unitPattern count="other">kikapaiti ʻe {0}</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilopiti</displayName>
-				<unitPattern count="other">kilopiti ʻe {0}</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilopaiti</displayName>
-				<unitPattern count="other">kilopaiti ʻe {0}</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>mekapiti</displayName>
-				<unitPattern count="other">mekapiti ʻe {0}</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>mekapaiti</displayName>
-				<unitPattern count="other">mekapaiti ʻe {0}</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>telapiti</displayName>
-				<unitPattern count="other">telapiti ʻe {0}</unitPattern>
+				<unitPattern count="other">maile ʻe {0} he kālani</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
 				<displayName>telapaiti</displayName>
 				<unitPattern count="other">telapaiti ʻe {0}</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>telapiti</displayName>
+				<unitPattern count="other">telapiti ʻe {0}</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>kikapaiti</displayName>
+				<unitPattern count="other">kikapaiti ʻe {0}</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>kikapiti</displayName>
+				<unitPattern count="other">kikapiti ʻe {0}</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>mekapaiti</displayName>
+				<unitPattern count="other">mekapaiti ʻe {0}</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>mekapiti</displayName>
+				<unitPattern count="other">mekapiti ʻe {0}</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilopaiti</displayName>
+				<unitPattern count="other">kilopaiti ʻe {0}</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilopiti</displayName>
+				<unitPattern count="other">kilopiti ʻe {0}</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>paiti</displayName>
+				<unitPattern count="other">paiti ʻe {0}</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>ʻū piti</displayName>
+				<unitPattern count="other">piti ʻe {0}</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="unconfirmed">teautaʻu</displayName>
+				<unitPattern count="other" draft="unconfirmed">teautaʻu ʻe {0}</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>taʻu</displayName>
+				<unitPattern count="other">taʻu ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} ki he taʻu</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>māhina</displayName>
+				<unitPattern count="other">māhina ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} ki he māhina</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>uike</displayName>
+				<unitPattern count="other">uike ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} ki he uike</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ʻaho</displayName>
 				<unitPattern count="other">ʻaho ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} ki he ʻaho</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>houa</displayName>
 				<unitPattern count="other">houa ʻe {0}</unitPattern>
 				<perUnitPattern>{0} ki he houa</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikolosekoni</displayName>
-				<unitPattern count="other">mikolosekoni ʻe {0}</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milisekoni</displayName>
-				<unitPattern count="other">milisekoni ʻe {0}</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>miniti</displayName>
 				<unitPattern count="other">miniti ʻe {0}</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>māhina</displayName>
-				<unitPattern count="other">māhina ʻe {0}</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanosekoni</displayName>
-				<unitPattern count="other">nanosekoni ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} ki he miniti</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sekoni</displayName>
 				<unitPattern count="other">sekoni ʻe {0}</unitPattern>
 				<perUnitPattern>{0} ki he sekoni</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>uike</displayName>
-				<unitPattern count="other">uike ʻe {0}</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milisekoni</displayName>
+				<unitPattern count="other">milisekoni ʻe {0}</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>taʻu</displayName>
-				<unitPattern count="other">taʻu ʻe {0}</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>mikolosekoni</displayName>
+				<unitPattern count="other">mikolosekoni ʻe {0}</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosekoni</displayName>
+				<unitPattern count="other">nanosekoni ʻe {0}</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ʻamipele</displayName>
@@ -4723,6 +4904,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>volotā</displayName>
 				<unitPattern count="other">volotā ʻe {0}</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokaloli</displayName>
+				<unitPattern count="other">kilokaloli ʻe {0}</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>ʻū kaloli</displayName>
 				<unitPattern count="other">kaloli ʻe {0}</unitPattern>
@@ -4731,18 +4916,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ʻū kaloli-kai</displayName>
 				<unitPattern count="other">kaloli-kai ʻe {0}</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>siule</displayName>
-				<unitPattern count="other">siule ʻe {0}</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokaloli</displayName>
-				<unitPattern count="other">kilokaloli ʻe {0}</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilosiule</displayName>
 				<unitPattern count="other">kilosiule ʻe {0}</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>siule</displayName>
+				<unitPattern count="other">siule ʻe {0}</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilouate-houa</displayName>
 				<unitPattern count="other">kilouate-houa ʻe {0}</unitPattern>
@@ -4751,174 +4932,175 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>kikahēti</displayName>
 				<unitPattern count="other">kikahēti ʻe {0}</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hēti</displayName>
-				<unitPattern count="other">hēti ʻe {0}</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megahēti</displayName>
+				<unitPattern count="other">megahēti ʻe {0}</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kilohēti</displayName>
 				<unitPattern count="other">kilohēti ʻe {0}</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megahēti</displayName>
-				<unitPattern count="other">megahēti ʻe {0}</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hēti</displayName>
+				<unitPattern count="other">hēti ʻe {0}</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>ʻiuniti fakaʻasitalōnoma</displayName>
-				<unitPattern count="other">ʻiuniti fakaʻasitalōnoma ʻe {0}</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilomita</displayName>
+				<unitPattern count="other">kilomita ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} ki he kilomita</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>senitimita</displayName>
-				<unitPattern count="other">senitimita ʻe {0}</unitPattern>
+			<unit type="length-meter">
+				<displayName>mita</displayName>
+				<unitPattern count="other">mita ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} ki he mita</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>tesimita</displayName>
 				<unitPattern count="other">tesimita ʻe {0}</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName>ofa</displayName>
-				<unitPattern count="other">ofa ʻe {0}</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>fute</displayName>
-				<unitPattern count="other">fute ʻe {0}</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>fālongo</displayName>
-				<unitPattern count="other">fālongo ʻe {0}</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>ʻinisi</displayName>
-				<unitPattern count="other">ʻinisi ʻe {0}</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilomita</displayName>
-				<unitPattern count="other">kilomita ʻe {0}</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>taʻumaama</displayName>
-				<unitPattern count="other">taʻumaama ʻe {0}</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>mita</displayName>
-				<unitPattern count="other">mita ʻe {0}</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>maikolomita</displayName>
-				<unitPattern count="other">maikolomita ʻe {0}</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>maile</displayName>
-				<unitPattern count="other">maile ʻe {0}</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>senitimita</displayName>
+				<unitPattern count="other">senitimita ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} ki he senitimita</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>milimita</displayName>
 				<unitPattern count="other">milimita ʻe {0}</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>maikolomita</displayName>
+				<unitPattern count="other">maikolomita ʻe {0}</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanomita</displayName>
 				<unitPattern count="other">nanomita ʻe {0}</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>maile ʻi tahi</displayName>
-				<unitPattern count="other">maile ʻi tahi ʻe {0}</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>ngaofesekoni</displayName>
-				<unitPattern count="other">ngaofesekoni ʻe {0}</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pikomita</displayName>
 				<unitPattern count="other">pikomita ʻe {0}</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>maile</displayName>
+				<unitPattern count="other">maile ʻe {0}</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>iate</displayName>
 				<unitPattern count="other">iate ʻe {0}</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>fute</displayName>
+				<unitPattern count="other">fute ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} ki he fute</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>ʻinisi</displayName>
+				<unitPattern count="other">ʻinisi ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} ki he ʻinise</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>ngaofesekoni</displayName>
+				<unitPattern count="other">ngaofesekoni ʻe {0}</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>taʻumaama</displayName>
+				<unitPattern count="other">taʻumaama ʻe {0}</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ʻiuniti fakaʻasitalōnoma</displayName>
+				<unitPattern count="other">ʻiuniti fakaʻasitalōnoma ʻe {0}</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>fālongo</displayName>
+				<unitPattern count="other">fālongo ʻe {0}</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>ofa</displayName>
+				<unitPattern count="other">ofa ʻe {0}</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>maile ʻi tahi</displayName>
+				<unitPattern count="other">maile ʻi tahi ʻe {0}</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lukisi</displayName>
 				<unitPattern count="other">lukisi ʻe {0}</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>kalati</displayName>
-				<unitPattern count="other">kalati ʻe {0}</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>kalami</displayName>
-				<unitPattern count="other">kalami ʻe {0}</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilokalami</displayName>
-				<unitPattern count="other">kilokalami ʻe {0}</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>toni</displayName>
 				<unitPattern count="other">toni ʻe {0}</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>maikolokalami</displayName>
-				<unitPattern count="other">maikolokalami ʻe {0}</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilokalami</displayName>
+				<unitPattern count="other">kilokalami ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} ki he kilokalami</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>kalami</displayName>
+				<unitPattern count="other">kalami ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} ki he kalami</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>milikalami</displayName>
 				<unitPattern count="other">milikalami ʻe {0}</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ʻaunise</displayName>
-				<unitPattern count="other">ʻaunisi ʻe {0}</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ʻaunisi koula</displayName>
-				<unitPattern count="other">ʻaunisi koula ʻe {0}</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>pāuni</displayName>
-				<unitPattern count="other">pāuni ʻe {0}</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>sitoni</displayName>
-				<unitPattern count="other">sitoni ʻe {0}</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>maikolokalami</displayName>
+				<unitPattern count="other">maikolokalami ʻe {0}</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>toni nounou</displayName>
 				<unitPattern count="other">toni nounou ʻe {0}</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName>sitoni</displayName>
+				<unitPattern count="other">sitoni ʻe {0}</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>pāuni</displayName>
+				<unitPattern count="other">pāuni ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} ki he pāuni</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ʻaunise</displayName>
+				<unitPattern count="other">ʻaunisi ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} ki he ʻaunise</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ʻaunisi koula</displayName>
+				<unitPattern count="other">ʻaunisi koula ʻe {0}</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>kalati</displayName>
+				<unitPattern count="other">kalati ʻe {0}</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>kikauate</displayName>
 				<unitPattern count="other">kikauate ʻe {0}</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hoosipaoa</displayName>
-				<unitPattern count="other">hoosipaoa ʻe {0}</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilouate</displayName>
-				<unitPattern count="other">kilouate ʻe {0}</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>mekauate</displayName>
 				<unitPattern count="other">mekauate ʻe {0}</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>miliuate</displayName>
-				<unitPattern count="other">miliuate ʻe {0}</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilouate</displayName>
+				<unitPattern count="other">kilouate ʻe {0}</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>uate</displayName>
 				<unitPattern count="other">uate ʻe {0}</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>miliuate</displayName>
+				<unitPattern count="other">miliuate ʻe {0}</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hoosipaoa</displayName>
+				<unitPattern count="other">hoosipaoa ʻe {0}</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hēkitopasikale</displayName>
 				<unitPattern count="other">hēkitopasikale ʻe {0}</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>ʻinisi mēkuli</displayName>
-				<unitPattern count="other">ʻinisi mēkuli ʻe {0}</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>milipā</displayName>
-				<unitPattern count="other">milipā ʻe {0}</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>milimita mēkuli</displayName>
 				<unitPattern count="other">milimita mēkuli ʻe {0}</unitPattern>
@@ -4927,9 +5109,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>pāuni he ʻinisi sikuea</displayName>
 				<unitPattern count="other">pāuni he ʻinisi sikuea ʻe {0}</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kalati</displayName>
-				<unitPattern count="other">kalati ʻe {0}</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>ʻinisi mēkuli</displayName>
+				<unitPattern count="other">ʻinisi mēkuli ʻe {0}</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>milipā</displayName>
+				<unitPattern count="other">milipā ʻe {0}</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilomita he houa</displayName>
@@ -4943,6 +5129,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>maile he houa</displayName>
 				<unitPattern count="other">maile he houa ʻe {0}</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName draft="unconfirmed">fakapona</displayName>
+				<unitPattern count="other" draft="unconfirmed">fakapona ʻe {0}</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName draft="unconfirmed">°</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>tikili selisiasi</displayName>
 				<unitPattern count="other">tikili selisiasi ʻe {0}</unitPattern>
@@ -4955,30 +5149,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>kelevini</displayName>
 				<unitPattern count="other">kelevini ʻe {0}</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ʻeka-fute</displayName>
-				<unitPattern count="other">ʻeka-fute ʻe {0}</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>pūseli</displayName>
-				<unitPattern count="other">pūseli ʻe {0}</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>senitilita</displayName>
-				<unitPattern count="other">senitilita ʻe {0}</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>senitimita kiupiki</displayName>
-				<unitPattern count="other">senitimita kiupiki ʻe {0}</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>fute kiupiki</displayName>
-				<unitPattern count="other">fute kiupiki ʻe {0}</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>ʻinisi kiupiki</displayName>
-				<unitPattern count="other">ʻinisi kiupiki ʻe {0}</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kilomita kiupiki</displayName>
 				<unitPattern count="other">kilomita kiupiki ʻe {0}</unitPattern>
@@ -4986,6 +5156,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-cubic-meter">
 				<displayName>mita kiupiki</displayName>
 				<unitPattern count="other">mita kiupiki ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} ki he mita kiupiki</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>senitimita kiupiki</displayName>
+				<unitPattern count="other">senitimita kiupiki ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} ki he senitimita kiupiki</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>maile kiupiki</displayName>
@@ -4995,21 +5171,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>iate kiupiki</displayName>
 				<unitPattern count="other">iate kiupiki ʻe {0}</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>ipu</displayName>
-				<unitPattern count="other">ipu ʻe {0}</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>fute kiupiki</displayName>
+				<unitPattern count="other">fute kiupiki ʻe {0}</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>tesilita</displayName>
-				<unitPattern count="other">tesilita ʻe {0}</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>ʻinisi kiupiki</displayName>
+				<unitPattern count="other">ʻinisi kiupiki ʻe {0}</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>ʻaunise tafe</displayName>
-				<unitPattern count="other">ʻaunise tafe ʻe {0}</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>kālani</displayName>
-				<unitPattern count="other">kālani ʻe {0}</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>mekalita</displayName>
+				<unitPattern count="other">mekalita ʻe {0}</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hēkitolita</displayName>
@@ -5018,23 +5190,57 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-liter">
 				<displayName>lita</displayName>
 				<unitPattern count="other">lita ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} ki he lita</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>mekalita</displayName>
-				<unitPattern count="other">mekalita ʻe {0}</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>tesilita</displayName>
+				<unitPattern count="other">tesilita ʻe {0}</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>senitilita</displayName>
+				<unitPattern count="other">senitilita ʻe {0}</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mililita</displayName>
 				<unitPattern count="other">mililita ʻe {0}</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>painite</displayName>
-				<unitPattern count="other">painite ʻe {0}</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName draft="unconfirmed">painite fakamita</displayName>
+				<unitPattern count="other" draft="unconfirmed">painite fakamita ʻe {0}</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName draft="unconfirmed">ipu fakamita</displayName>
+				<unitPattern count="other" draft="unconfirmed">ipu fakamita ʻe {0}</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ʻeka-fute</displayName>
+				<unitPattern count="other">ʻeka-fute ʻe {0}</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>pūseli</displayName>
+				<unitPattern count="other">pūseli ʻe {0}</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>kālani</displayName>
+				<unitPattern count="other">kālani ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} ki he kālani</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>kuata</displayName>
 				<unitPattern count="other">kuata ʻe {0}</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>painite</displayName>
+				<unitPattern count="other">painite ʻe {0}</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>ipu</displayName>
+				<unitPattern count="other">ipu ʻe {0}</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>ʻaunise tafe</displayName>
+				<unitPattern count="other">ʻaunise tafe ʻe {0}</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>sēpuni tēpile</displayName>
 				<unitPattern count="other">sēpuni tēpile ʻe {0}</unitPattern>
@@ -5043,6 +5249,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>sēpuni tī</displayName>
 				<unitPattern count="other">sēpuni tī ʻe {0}</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="unconfirmed">hahake ʻe {0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="unconfirmed">tokelau ʻe {0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="unconfirmed">tonga ʻe {0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="unconfirmed">hihifo ʻe {0}</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -5056,6 +5268,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m/s²</displayName>
 				<unitPattern count="other">m/s² ʻe {0}</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>tak</displayName>
+				<unitPattern count="other">tak ʻe {0}</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>lēt</displayName>
+				<unitPattern count="other">lēt ʻe {0}</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>tsk</displayName>
+				<unitPattern count="other">tsk ʻe {0}</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>msk</displayName>
 				<unitPattern count="other">msk ʻe {0}</unitPattern>
@@ -5064,139 +5288,151 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>ssk</displayName>
 				<unitPattern count="other">ssk ʻe {0}</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>tsk</displayName>
-				<unitPattern count="other">tsk ʻe {0}</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>lēt</displayName>
-				<unitPattern count="other">lēt ʻe {0}</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ʻeka ʻe</displayName>
-				<unitPattern count="other">ʻek ʻe {0}</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="other">km² ʻe {0}</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ha</displayName>
 				<unitPattern count="other">ha ʻe {0}</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>mita sikuea ʻe</displayName>
+				<unitPattern count="other">m² ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>sm²</displayName>
 				<unitPattern count="other">sm² ʻe {0}</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<displayName>ft²</displayName>
-				<unitPattern count="other">sk ft² ʻe {0}</unitPattern>
-			</unit>
-			<unit type="area-square-inch">
-				<displayName>in²</displayName>
-				<unitPattern count="other">sk in² ʻe {0}</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="other">sk km² ʻe {0}</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>mita sikuea ʻe</displayName>
-				<unitPattern count="other">sk m² ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /sm²</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
 				<displayName>maile sikuea ʻe</displayName>
-				<unitPattern count="other">sk mi² ʻe {0}</unitPattern>
+				<unitPattern count="other">mi² ʻe {0}</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ʻeka ʻe</displayName>
+				<unitPattern count="other">ʻek ʻe {0}</unitPattern>
 			</unit>
 			<unit type="area-square-yard">
 				<displayName>it²</displayName>
 				<unitPattern count="other">it² ʻe {0}</unitPattern>
 			</unit>
+			<unit type="area-square-foot">
+				<displayName>ft²</displayName>
+				<unitPattern count="other">ft² ʻe {0}</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>in²</displayName>
+				<unitPattern count="other">in² ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /in²</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="other">kt ʻe {0}</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
-				<unitPattern count="other">l/km ʻe {0}</unitPattern>
+				<unitPattern count="other">l ʻe {0}/km</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100km</displayName>
+				<unitPattern count="other">l ʻe {0}/100km</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mi/kā</displayName>
-				<unitPattern count="other">mi/kā ʻe {0}</unitPattern>
-			</unit>
-			<unit type="digital-bit">
-				<displayName>piti</displayName>
-				<unitPattern count="other">piti ʻe {0}</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>ʻū paiti</displayName>
-				<unitPattern count="other">paiti ʻe {0}</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="other">Gb ʻe {0}</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>kikapaiti</displayName>
-				<unitPattern count="other">KP ʻe {0}</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilopiti</displayName>
-				<unitPattern count="other">kb ʻe {0}</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilopaiti</displayName>
-				<unitPattern count="other">kB ʻe {0}</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>mekapiti</displayName>
-				<unitPattern count="other">Mb ʻe {0}</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>mekapaiti</displayName>
-				<unitPattern count="other">MB ʻe {0}</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>telapiti</displayName>
-				<unitPattern count="other">Tb ʻe {0}</unitPattern>
+				<unitPattern count="other">mi ʻe {0}/kā</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
 				<displayName>telapaiti</displayName>
 				<unitPattern count="other">TB ʻe {0}</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>telapiti</displayName>
+				<unitPattern count="other">Tb ʻe {0}</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>kikapaiti</displayName>
+				<unitPattern count="other">GB ʻe {0}</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>kikapiti</displayName>
+				<unitPattern count="other">Gb ʻe {0}</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>mekapaiti</displayName>
+				<unitPattern count="other">MB ʻe {0}</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>mekapiti</displayName>
+				<unitPattern count="other">Mb ʻe {0}</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilopaiti</displayName>
+				<unitPattern count="other">kB ʻe {0}</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilopiti</displayName>
+				<unitPattern count="other">kb ʻe {0}</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>ʻū paiti</displayName>
+				<unitPattern count="other">paiti ʻe {0}</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>piti</displayName>
+				<unitPattern count="other">piti ʻe {0}</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="unconfirmed">tt</displayName>
+				<unitPattern count="other" draft="unconfirmed">tt ʻe {0}</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>taʻu</displayName>
+				<unitPattern count="other">taʻu ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /t</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mā</displayName>
+				<unitPattern count="other">mā ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /mā</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>u</displayName>
+				<unitPattern count="other">u ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /u</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ʻa</displayName>
 				<unitPattern count="other">ʻa ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /ʻa</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>h</displayName>
 				<unitPattern count="other">h ʻe {0}</unitPattern>
 				<perUnitPattern>{0} /h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="other">μs ʻe {0}</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="other">ms ʻe {0}</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>m</displayName>
 				<unitPattern count="other">m ʻe {0}</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>mā</displayName>
-				<unitPattern count="other">mā ʻe {0}</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="other">ns ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /m</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>s</displayName>
 				<unitPattern count="other">s ʻe {0}</unitPattern>
 				<perUnitPattern>{0} /s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>u</displayName>
-				<unitPattern count="other">u ʻe {0}</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="other">ms ʻe {0}</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>taʻu</displayName>
-				<unitPattern count="other">taʻu ʻe {0}</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="other">μs ʻe {0}</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="other">ns ʻe {0}</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>A</displayName>
@@ -5214,6 +5450,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>volotā</displayName>
 				<unitPattern count="other">V ʻe {0}</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kkal</displayName>
+				<unitPattern count="other">kkal ʻe {0}</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kal</displayName>
 				<unitPattern count="other">kal ʻe {0}</unitPattern>
@@ -5222,18 +5462,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>kal-k</displayName>
 				<unitPattern count="other">kal-k ʻe {0}</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>J</displayName>
-				<unitPattern count="other">J ʻe {0}</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kkal</displayName>
-				<unitPattern count="other">kkal ʻe {0}</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="other">kJ ʻe {0}</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="other">J ʻe {0}</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="other">kWh ʻe {0}</unitPattern>
@@ -5242,174 +5478,175 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>GHz</displayName>
 				<unitPattern count="other">GHz ʻe {0}</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="other">Hz ʻe {0}</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="other">MHz ʻe {0}</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="other">kHz ʻe {0}</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="other">MHz ʻe {0}</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="other">Hz ʻe {0}</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>ʻiʻa</displayName>
-				<unitPattern count="other">ʻiʻa ʻe {0}</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="other">km ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>sm</displayName>
-				<unitPattern count="other">sm ʻe {0}</unitPattern>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="other">m ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>tm</displayName>
 				<unitPattern count="other">tm ʻe {0}</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName>ofa</displayName>
-				<unitPattern count="other">ofa ʻe {0}</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>ft</displayName>
-				<unitPattern count="other">ft ʻe {0}</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>fāl</displayName>
-				<unitPattern count="other">fāl ʻe {0}</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>in</displayName>
-				<unitPattern count="other">in ʻe {0}</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="other">km ʻe {0}</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>tma</displayName>
-				<unitPattern count="other">tma ʻe {0}</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-				<unitPattern count="other">m ʻe {0}</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="other">µm ʻe {0}</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mi</displayName>
-				<unitPattern count="other">mi ʻe {0}</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>sm</displayName>
+				<unitPattern count="other">sm ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /sm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="other">mm ʻe {0}</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="other">µm ʻe {0}</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="other">nm ʻe {0}</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>mt</displayName>
-				<unitPattern count="other">mt ʻe {0}</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>ngs</displayName>
-				<unitPattern count="other">ngs ʻe {0}</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="other">pm ʻe {0}</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="other">mi ʻe {0}</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>it</displayName>
 				<unitPattern count="other">it ʻe {0}</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ft</displayName>
+				<unitPattern count="other">ft ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>in</displayName>
+				<unitPattern count="other">in ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>ngs</displayName>
+				<unitPattern count="other">ngs ʻe {0}</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>tma</displayName>
+				<unitPattern count="other">tma ʻe {0}</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ʻiʻa</displayName>
+				<unitPattern count="other">ʻiʻa ʻe {0}</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>fāl</displayName>
+				<unitPattern count="other">fāl ʻe {0}</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>ofa</displayName>
+				<unitPattern count="other">ofa ʻe {0}</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>mt</displayName>
+				<unitPattern count="other">mt ʻe {0}</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="other">lx ʻe {0}</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>kt</displayName>
-				<unitPattern count="other">kt ʻe {0}</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>k</displayName>
-				<unitPattern count="other">k ʻe {0}</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kk</displayName>
-				<unitPattern count="other">kk ʻe {0}</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>to</displayName>
 				<unitPattern count="other">to ʻe {0}</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>μk</displayName>
-				<unitPattern count="other">μk ʻe {0}</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kk</displayName>
+				<unitPattern count="other">kk ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /kk</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>k</displayName>
+				<unitPattern count="other">k ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /k</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mk</displayName>
 				<unitPattern count="other">mk ʻe {0}</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ʻau</displayName>
-				<unitPattern count="other">ʻau ʻe {0}</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ʻau-k</displayName>
-				<unitPattern count="other">ʻau-k ʻe {0}</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>pā</displayName>
-				<unitPattern count="other">pā ʻe {0}</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName>st</displayName>
-				<unitPattern count="other">st ʻe {0}</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>μk</displayName>
+				<unitPattern count="other">μk ʻe {0}</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tn</displayName>
 				<unitPattern count="other">tn ʻe {0}</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName>st</displayName>
+				<unitPattern count="other">st ʻe {0}</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>pā</displayName>
+				<unitPattern count="other">pā ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /pā</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ʻau</displayName>
+				<unitPattern count="other">ʻau ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /ʻau</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ʻau-k</displayName>
+				<unitPattern count="other">ʻau-k ʻe {0}</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>kt</displayName>
+				<unitPattern count="other">kt ʻe {0}</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="other">GW ʻe {0}</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hp</displayName>
-				<unitPattern count="other">hp ʻe {0}</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="other">kW ʻe {0}</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="other">MW ʻe {0}</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="other">mW ʻe {0}</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="other">kW ʻe {0}</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>uate</displayName>
 				<unitPattern count="other">W ʻe {0}</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="other">mW ʻe {0}</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="other">hp ʻe {0}</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="other">hPa ʻe {0}</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>in-Hg</displayName>
-				<unitPattern count="other">in-Hg ʻe {0}</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mpā</displayName>
-				<unitPattern count="other">mpā ʻe {0}</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm-Hg</displayName>
 				<unitPattern count="other">mm-Hg ʻe {0}</unitPattern>
@@ -5418,9 +5655,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>pā/in²</displayName>
 				<unitPattern count="other">pā/in² ʻe {0}</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="other">kt ʻe {0}</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>in-Hg</displayName>
+				<unitPattern count="other">in-Hg ʻe {0}</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mpā</displayName>
+				<unitPattern count="other">mpā ʻe {0}</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -5434,6 +5675,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>mi/h</displayName>
 				<unitPattern count="other">mi/h ʻe {0}</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName draft="unconfirmed">fp</displayName>
+				<unitPattern count="other" draft="unconfirmed">fp ʻe {0}</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName draft="unconfirmed">°</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°S</displayName>
 				<unitPattern count="other">°S ʻe {0}</unitPattern>
@@ -5446,30 +5695,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>K</displayName>
 				<unitPattern count="other">K ʻe {0}</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ʻe-ft</displayName>
-				<unitPattern count="other">ʻe-ft ʻe {0}</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>pū</displayName>
-				<unitPattern count="other">pū ʻe {0}</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>sl</displayName>
-				<unitPattern count="other">sl ʻe {0}</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>sm³</displayName>
-				<unitPattern count="other">sm³ ʻe {0}</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="other">ft³ ʻe {0}</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="other">in³ ʻe {0}</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="other">km³ ʻe {0}</unitPattern>
@@ -5477,6 +5702,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-cubic-meter">
 				<displayName>m³</displayName>
 				<unitPattern count="other">m³ ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>sm³</displayName>
+				<unitPattern count="other">sm³ ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /sm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -5486,21 +5717,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>it³</displayName>
 				<unitPattern count="other">it³ ʻe {0}</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>ip</displayName>
-				<unitPattern count="other">ip ʻe {0}</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="other">ft³ ʻe {0}</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>tl</displayName>
-				<unitPattern count="other">tl ʻe {0}</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="other">in³ ʻe {0}</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>ʻau-tf</displayName>
-				<unitPattern count="other">ʻau-tf ʻe {0}</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>kā</displayName>
-				<unitPattern count="other">kā ʻe {0}</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="other">Ml ʻe {0}</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -5509,23 +5736,57 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-liter">
 				<displayName>l</displayName>
 				<unitPattern count="other">l ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="other">Ml ʻe {0}</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>tl</displayName>
+				<unitPattern count="other">tl ʻe {0}</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>sl</displayName>
+				<unitPattern count="other">sl ʻe {0}</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
 				<unitPattern count="other">ml ʻe {0}</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="other">pt ʻe {0}</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName draft="unconfirmed">ptm</displayName>
+				<unitPattern count="other" draft="unconfirmed">ptm ʻe {0}</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName draft="unconfirmed">ipm</displayName>
+				<unitPattern count="other" draft="unconfirmed">ipm ʻe {0}</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ʻe-ft</displayName>
+				<unitPattern count="other">ʻe-ft ʻe {0}</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>pū</displayName>
+				<unitPattern count="other">pū ʻe {0}</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>kā</displayName>
+				<unitPattern count="other">kā ʻe {0}</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /kā</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>ku</displayName>
 				<unitPattern count="other">ku ʻe {0}</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="other">pt ʻe {0}</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>ip</displayName>
+				<unitPattern count="other">ip ʻe {0}</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>ʻau-tf</displayName>
+				<unitPattern count="other">ʻau-tf ʻe {0}</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>sētē</displayName>
 				<unitPattern count="other">sētē ʻe {0}</unitPattern>
@@ -5534,6 +5795,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>sētī</displayName>
 				<unitPattern count="other">sētī ʻe {0}</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="unconfirmed">ha ʻe {0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="unconfirmed">tk ʻe {0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="unconfirmed">to ʻe {0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="unconfirmed">hi ʻe {0}</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -5547,6 +5814,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m/s²</displayName>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>tak</displayName>
+				<unitPattern count="other">{0} tak</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>lēt</displayName>
+				<unitPattern count="other">{0} lēt</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>°</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>′</displayName>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -5555,25 +5834,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>″</displayName>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>°</displayName>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>lēt</displayName>
-				<unitPattern count="other">{0} lēt</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ʻek</displayName>
-				<unitPattern count="other">{0} ʻek</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ha</displayName>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>sm²</displayName>
 				<unitPattern count="other">{0} sm²</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /sm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ʻek</displayName>
+				<unitPattern count="other">{0} ʻek</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>it²</displayName>
+				<unitPattern count="other">{0} it²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ft²</displayName>
@@ -5582,112 +5871,114 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="area-square-inch">
 				<displayName>in²</displayName>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>it²</displayName>
-				<unitPattern count="other">{0} it²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="other">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>l/100km</displayName>
+				<unitPattern count="other">{0} l/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mi/kā</displayName>
 				<unitPattern count="other">{0} mi/kā</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>b</displayName>
-				<unitPattern count="other">{0} b</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>B</displayName>
-				<unitPattern count="other">{0} B</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>kikapaiti</displayName>
+				<unitPattern count="other">KP ʻe {0}</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>B</displayName>
+				<unitPattern count="other">{0} B</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>b</displayName>
+				<unitPattern count="other">{0} b</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="unconfirmed">tt</displayName>
+				<unitPattern count="other" draft="unconfirmed">tt ʻe {0}</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>t</displayName>
+				<unitPattern count="other">{0} t</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /t</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>m</displayName>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /m</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>u</displayName>
+				<unitPattern count="other">{0} u</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /u</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ʻa</displayName>
 				<unitPattern count="other">{0} ʻa</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /ʻa</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>h</displayName>
 				<unitPattern count="other">{0} h</unitPattern>
 				<perUnitPattern>{0} /h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>m</displayName>
 				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>m</displayName>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /m</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>s</displayName>
 				<unitPattern count="other">{0} s</unitPattern>
 				<perUnitPattern>{0} /s</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>u</displayName>
-				<unitPattern count="other">{0} u</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>t</displayName>
-				<unitPattern count="other">{0} t</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>A</displayName>
@@ -5705,6 +5996,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>V</displayName>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kkal</displayName>
+				<unitPattern count="other">{0} kkal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kal</displayName>
 				<unitPattern count="other">{0} kal</unitPattern>
@@ -5713,18 +6008,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>kal-k</displayName>
 				<unitPattern count="other">{0} kal-k</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>J</displayName>
-				<unitPattern count="other">J ʻe {0}</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kkal</displayName>
-				<unitPattern count="other">{0} kkal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="other">{0} kWh</unitPattern>
@@ -5733,174 +6024,174 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>GHz</displayName>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>ʻiʻa</displayName>
-				<unitPattern count="other">{0} ʻiʻa</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>sm</displayName>
-				<unitPattern count="other">{0} sm</unitPattern>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>tm</displayName>
 				<unitPattern count="other">{0} tm</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName>o</displayName>
-				<unitPattern count="other">{0} o</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>ft</displayName>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>fāl</displayName>
-				<unitPattern count="other">{0} fāl</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>in</displayName>
-				<unitPattern count="other">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>tma</displayName>
-				<unitPattern count="other">{0} tma</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mi</displayName>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>sm</displayName>
+				<unitPattern count="other">{0} sm</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /sm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>mt</displayName>
-				<unitPattern count="other">{0} mt</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>ngs</displayName>
-				<unitPattern count="other">{0} ngs</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>it</displayName>
 				<unitPattern count="other">{0} it</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ft</displayName>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>in</displayName>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>ngs</displayName>
+				<unitPattern count="other">{0} ngs</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>tma</displayName>
+				<unitPattern count="other">{0} tma</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ʻiʻa</displayName>
+				<unitPattern count="other">{0} ʻiʻa</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>fāl</displayName>
+				<unitPattern count="other">{0} fāl</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>o</displayName>
+				<unitPattern count="other">{0} o</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>mt</displayName>
+				<unitPattern count="other">{0} mt</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>kt</displayName>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="mass-metric-ton">
+				<displayName>to</displayName>
+				<unitPattern count="other">{0} to</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>kk</displayName>
+				<unitPattern count="other">{0} kk</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /kk</perUnitPattern>
 			</unit>
 			<unit type="mass-gram">
 				<displayName>k</displayName>
 				<unitPattern count="other">{0} k</unitPattern>
 			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kk</displayName>
-				<unitPattern count="other">{0} kk</unitPattern>
-			</unit>
-			<unit type="mass-metric-ton">
-				<displayName>to</displayName>
-				<unitPattern count="other">{0} to</unitPattern>
+			<unit type="mass-milligram">
+				<displayName>mk</displayName>
+				<unitPattern count="other">{0} mk</unitPattern>
 			</unit>
 			<unit type="mass-microgram">
 				<displayName>μk</displayName>
 				<unitPattern count="other">{0} μk</unitPattern>
 			</unit>
-			<unit type="mass-milligram">
-				<displayName>mk</displayName>
-				<unitPattern count="other">{0} mk</unitPattern>
-			</unit>
-			<unit type="mass-ounce">
-				<displayName>ʻau</displayName>
-				<unitPattern count="other">{0} ʻau</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>ʻau-k</displayName>
-				<unitPattern count="other">{0} ʻau-k</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>pā</displayName>
-				<unitPattern count="other">{0} pā</unitPattern>
+			<unit type="mass-ton">
+				<displayName>tn</displayName>
+				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
 			<unit type="mass-stone">
 				<displayName>st</displayName>
 				<unitPattern count="other">{0} st</unitPattern>
 			</unit>
-			<unit type="mass-ton">
-				<displayName>tn</displayName>
-				<unitPattern count="other">{0} tn</unitPattern>
+			<unit type="mass-pound">
+				<displayName>pā</displayName>
+				<unitPattern count="other">{0} pā</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /pā</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ʻau</displayName>
+				<unitPattern count="other">{0} ʻau</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /ʻau</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ʻau-k</displayName>
+				<unitPattern count="other">{0} ʻau-k</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>kt</displayName>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hp</displayName>
-				<unitPattern count="other">{0} hp</unitPattern>
+			<unit type="power-megawatt">
+				<displayName>MW</displayName>
+				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName>kW</displayName>
 				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<displayName>MW</displayName>
-				<unitPattern count="other">{0} MW</unitPattern>
+			<unit type="power-watt">
+				<displayName>W</displayName>
+				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<displayName>mW</displayName>
 				<unitPattern count="other">{0} mW</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName>W</displayName>
-				<unitPattern count="other">{0} W</unitPattern>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="other">{0} hp</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>in-Hg</displayName>
-				<unitPattern count="other">{0} in-Hg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mpā</displayName>
-				<unitPattern count="other">{0} mpā</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm-Hg</displayName>
 				<unitPattern count="other">{0} mm-Hg</unitPattern>
@@ -5909,9 +6200,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>pā/in²</displayName>
 				<unitPattern count="other">{0} pā/in²</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>in-Hg</displayName>
+				<unitPattern count="other">{0} in-Hg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mpā</displayName>
+				<unitPattern count="other">{0} mpā</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -5925,6 +6220,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>mi/h</displayName>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName draft="unconfirmed">fp</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} fp</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName draft="unconfirmed">°</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°S</displayName>
 				<unitPattern count="other">{0}°S</unitPattern>
@@ -5937,30 +6240,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>K</displayName>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ʻe-ft</displayName>
-				<unitPattern count="other">{0} ʻe-ft</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName>pū</displayName>
-				<unitPattern count="other">{0} pū</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>sl</displayName>
-				<unitPattern count="other">{0} sl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>sm³</displayName>
-				<unitPattern count="other">{0} sm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="other">{0} km³</unitPattern>
@@ -5968,6 +6247,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-cubic-meter">
 				<displayName>m³</displayName>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>sm³</displayName>
+				<unitPattern count="other">{0} sm³</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /sm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -5977,21 +6262,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>it³</displayName>
 				<unitPattern count="other">{0} it³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>ip</displayName>
-				<unitPattern count="other">{0} ip</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>tl</displayName>
-				<unitPattern count="other">{0} tl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>ʻau-tf</displayName>
-				<unitPattern count="other">{0} ʻau-tf</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>kā</displayName>
-				<unitPattern count="other">{0} kā</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -6000,23 +6281,57 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-liter">
 				<displayName>l</displayName>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>tl</displayName>
+				<unitPattern count="other">{0} tl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>sl</displayName>
+				<unitPattern count="other">{0} sl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName draft="unconfirmed">ptm</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} ptm</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName draft="unconfirmed">ipm</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} ipm</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ʻe-ft</displayName>
+				<unitPattern count="other">{0} ʻe-ft</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>pū</displayName>
+				<unitPattern count="other">{0} pū</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>kā</displayName>
+				<unitPattern count="other">{0} kā</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} /kā</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>ku</displayName>
 				<unitPattern count="other">{0} ku</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>ip</displayName>
+				<unitPattern count="other">{0} ip</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>ʻau-tf</displayName>
+				<unitPattern count="other">{0} ʻau-tf</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>sētē</displayName>
 				<unitPattern count="other">{0} sētē</unitPattern>
@@ -6025,6 +6340,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>sētī</displayName>
 				<unitPattern count="other">{0} sētī</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="unconfirmed">{0} ha</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="unconfirmed">{0} tk</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="unconfirmed">{0} to</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="unconfirmed">{0} hi</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/to_TO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/to_TO.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/to_TO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/to_TO.xml
index e120f987d99..38bf6d40f1b 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/to_TO.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/to_TO.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="to"/>
 		<territory type="TO"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/tr.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tr.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/tr.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tr.xml
index 7c0d0d5a025..7adb40b8012 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/tr.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tr.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12373 $"/>
 		<language type="tr"/>
 	</identity>
 	<localeDisplayNames>
@@ -59,7 +58,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ay">Aymara</language>
 			<language type="az">Azerice</language>
 			<language type="az" alt="short">Azerice</language>
-			<language type="azb" draft="contributed">Güney Azerice</language>
+			<language type="az_Arab">Güney Azerice</language>
 			<language type="ba">Başkırtça</language>
 			<language type="bal">Baluchi</language>
 			<language type="ban">Bali Dili</language>
@@ -76,6 +75,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bfd">Bafut</language>
 			<language type="bfq" draft="contributed">Badaga</language>
 			<language type="bg">Bulgarca</language>
+			<language type="bgn">Batı Balochi</language>
 			<language type="bho">Arayanice</language>
 			<language type="bi">Bislama</language>
 			<language type="bik">Bikol</language>
@@ -162,7 +162,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="en_AU">Avustralya İngilizcesi</language>
 			<language type="en_CA">Kanada İngilizcesi</language>
 			<language type="en_GB">İngiliz İngilizcesi</language>
-			<language type="en_GB" alt="short">İngilizce (BK)</language>
 			<language type="en_US">Amerikan İngilizcesi</language>
 			<language type="enm">Ortaçağ İngilizcesi</language>
 			<language type="eo">Esperanto</language>
@@ -198,7 +197,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="fy">Batı Frizcesi</language>
 			<language type="ga">İrlandaca</language>
 			<language type="gaa">Ga</language>
-			<language type="gag" draft="contributed">Gagavuzca</language>
+			<language type="gag">Gagavuzca</language>
 			<language type="gan" draft="contributed">Gan Çincesi</language>
 			<language type="gay">Gayo</language>
 			<language type="gba">Gbaya</language>
@@ -261,7 +260,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ja">Japonca</language>
 			<language type="jam" draft="contributed">Jamaika Patois Dili</language>
 			<language type="jbo">Lojban</language>
-			<language type="jgo" draft="contributed">Ngomba</language>
+			<language type="jgo">Ngomba</language>
 			<language type="jmc">Machame</language>
 			<language type="jpr">Yahudi Farsçası</language>
 			<language type="jrb">Yahudi Arapçası</language>
@@ -298,7 +297,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="kmb">Kimbundu</language>
 			<language type="kn">Kannada</language>
 			<language type="ko">Korece</language>
-			<language type="koi" draft="contributed">Komi-Permyak</language>
+			<language type="koi">Komi-Permyak</language>
 			<language type="kok">Konkani</language>
 			<language type="kos">Kosraean</language>
 			<language type="kpe">Kpelle</language>
@@ -330,13 +329,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="li">Limburgca</language>
 			<language type="lij" draft="contributed">Ligurca</language>
 			<language type="liv" draft="contributed">Livonca</language>
-			<language type="lkt" draft="contributed">Lakotaca</language>
+			<language type="lkt">Lakotaca</language>
 			<language type="lmo" draft="contributed">Lombardça</language>
 			<language type="ln">Lingala</language>
 			<language type="lo">Laoca</language>
 			<language type="lol">Mongo</language>
 			<language type="loz">Lozi</language>
-			<language type="lt">Litvanyaca</language>
+			<language type="lrc">Kuzey Luri</language>
+			<language type="lt">Litvanca</language>
 			<language type="ltg" draft="contributed">Latgalian</language>
 			<language type="lu">Luba-Katanga</language>
 			<language type="lua">Luba-Lulua</language>
@@ -364,7 +364,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mg">Malgaşça</language>
 			<language type="mga">Ortaçağ İrlandacası</language>
 			<language type="mgh">Makhuwa-Meetto</language>
-			<language type="mgo" draft="contributed">Meta’</language>
+			<language type="mgo">Meta’</language>
 			<language type="mh">Marshall Adaları Dili</language>
 			<language type="mi">Maori Dili</language>
 			<language type="mic">Micmac</language>
@@ -389,7 +389,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="my">Burmaca</language>
 			<language type="mye">Myene</language>
 			<language type="myv">Erzya</language>
-			<language type="mzn" draft="contributed">Mazenderanca</language>
+			<language type="mzn">Mazenderanca</language>
 			<language type="na">Nauru Dili</language>
 			<language type="nan" draft="contributed">Min Nan Çincesi</language>
 			<language type="nap">Napolice</language>
@@ -397,6 +397,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nb">Norveççe Bokmål</language>
 			<language type="nd">Kuzey Ndebele</language>
 			<language type="nds">Aşağı Almanca</language>
+			<language type="nds_NL">Aşağı Saksonca</language>
 			<language type="ne">Nepalce</language>
 			<language type="new">Nevari</language>
 			<language type="ng">Ndonga</language>
@@ -454,7 +455,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="pt_BR">Brezilya Portekizcesi</language>
 			<language type="pt_PT">Avrupa Portekizcesi</language>
 			<language type="qu">Keçuvaca</language>
-			<language type="quc" draft="contributed">Kiçece</language>
+			<language type="quc">Kiçece</language>
 			<language type="qug" draft="contributed">Chimborazo Highland Quichua</language>
 			<language type="raj">Rajasthani</language>
 			<language type="rap">Rapanui</language>
@@ -490,6 +491,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sco">Scots</language>
 			<language type="sd">Sindhi</language>
 			<language type="sdc" draft="contributed">Sassari Sarduca</language>
+			<language type="sdh">Güney Kürtçesi</language>
 			<language type="se">Kuzey Sami</language>
 			<language type="see">Seneca</language>
 			<language type="seh">Sena</language>
@@ -532,8 +534,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">Sümerce</language>
 			<language type="sv">İsveççe</language>
 			<language type="sw">Svahili</language>
+			<language type="sw_CD">Kongo Svahili</language>
 			<language type="swb">Komorca</language>
-			<language type="swc">Kongo Svahili</language>
 			<language type="syc">Klasik Süryanice</language>
 			<language type="syr">Süryanice</language>
 			<language type="szl" draft="contributed">Silezyaca</language>
@@ -600,6 +602,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">Valamo</language>
 			<language type="war">Varay</language>
 			<language type="was">Vaşo</language>
+			<language type="wbp">Warlpiri</language>
 			<language type="wo">Volofça</language>
 			<language type="wuu">Wu Çincesi</language>
 			<language type="xal">Kalmıkça</language>
@@ -836,7 +839,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Arnavutluk</territory>
 			<territory type="AM">Ermenistan</territory>
-			<territory type="AN">Hollanda Antilleri</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Antarktika</territory>
 			<territory type="AR">Arjantin</territory>
@@ -887,7 +889,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CV">Cape Verde</territory>
 			<territory type="CW">Curaçao</territory>
 			<territory type="CX">Christmas Adası</territory>
-			<territory type="CY">Güney Kıbrıs Rum Kesimi</territory>
+			<territory type="CY">Kıbrıs</territory>
 			<territory type="CZ">Çek Cumhuriyeti</territory>
 			<territory type="DE">Almanya</territory>
 			<territory type="DG">Diego Garcia</territory>
@@ -1146,6 +1148,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric">Sayısal Sıralama</key>
 			<key type="colStrength">Sıralama Gücü</key>
 			<key type="currency">Para Birimi</key>
+			<key type="hc">Saat Sistemi (12 - 24)</key>
+			<key type="lb">lb</key>
+			<key type="ms">Ölçü Sistemi</key>
 			<key type="numbers">Rakamlar</key>
 			<key type="timezone">Saat Dilimi</key>
 			<key type="va">Yerel Varyant</key>
@@ -1153,114 +1158,124 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">Özel Kullanım</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Hint-Arap Rakamları</type>
-			<type type="arabext" key="numbers">Genişletilmiş Hint-Arap Rakamları</type>
-			<type type="armn" key="numbers">Ermeni Rakamları</type>
-			<type type="armnlow" key="numbers">Küçük Harf Ermeni Rakamları</type>
-			<type type="bali" key="numbers" draft="contributed">Bali Rakamları</type>
-			<type type="beng" key="numbers">Bengal Rakamları</type>
-			<type type="big5han" key="collation">Geleneksel Çince Sıralaması - Big5</type>
-			<type type="brah" key="numbers" draft="contributed">Brahmi Rakamları</type>
-			<type type="buddhist" key="calendar">Budist Takvimi</type>
-			<type type="cakm" key="numbers" draft="contributed">Chakma Rakamları</type>
-			<type type="cham" key="numbers" draft="contributed">Cham Rakamları</type>
-			<type type="chinese" key="calendar">Çin Takvimi</type>
-			<type type="coptic" key="calendar">Kıpti Takvim</type>
-			<type type="dangi" key="calendar">Dangi Takvimi</type>
-			<type type="deva" key="numbers">Devanagari Rakamları</type>
-			<type type="dictionary" key="collation">Sözlük Sıralama Düzeni</type>
-			<type type="ducet" key="collation">Saptanmış Unicode Sıralaması</type>
-			<type type="eor" key="collation" draft="contributed">Avrupa Sıralama Kuralları</type>
-			<type type="ethi" key="numbers">Ge’ez Rakamları</type>
-			<type type="ethiopic" key="calendar">Etiyopik Takvim</type>
-			<type type="ethiopic-amete-alem" key="calendar">Etiyopik Amete Alem Takvimi</type>
-			<type type="finance" key="numbers">Finansal Sayılar</type>
-			<type type="fullwide" key="numbers">Tam Genişlikte Rakamlar</type>
-			<type type="gb2312han" key="collation">Basitleştirilmiş Çince Sıralaması - GB2312</type>
-			<type type="geor" key="numbers">Gürcü Rakamları</type>
-			<type type="gregorian" key="calendar">Miladi Takvim</type>
-			<type type="grek" key="numbers">Yunan Rakamları</type>
-			<type type="greklow" key="numbers">Küçük Harf Yunan Rakamları</type>
-			<type type="gujr" key="numbers">Gücerat Rakamları</type>
-			<type type="guru" key="numbers">Gurmukhi Rakamları</type>
-			<type type="hanidec" key="numbers">Çin Rakamları</type>
-			<type type="hans" key="numbers">Basitleştirilmiş Çin Rakamları</type>
-			<type type="hansfin" key="numbers">Finansal Basitleştirilmiş Çin Rakamları</type>
-			<type type="hant" key="numbers">Geleneksel Çin Rakamları</type>
-			<type type="hantfin" key="numbers">Finansal Geleneksel Çin Rakamları</type>
-			<type type="hebr" key="numbers">İbrani Rakamları</type>
-			<type type="hebrew" key="calendar">Yahudi Takvimi</type>
-			<type type="identical" key="colStrength">Tümünü Sıralama</type>
-			<type type="indian" key="calendar">Ulusal Hint Takvimi</type>
-			<type type="islamic" key="calendar">Hicri Takvim</type>
-			<type type="islamic-civil" key="calendar">Arap Takvimi</type>
-			<type type="islamic-rgsa" key="calendar" draft="contributed">Hicri Takvim (Suudi)</type>
-			<type type="islamic-tbla" key="calendar" draft="contributed">Hicri Takvim (Astronomik Evreler)</type>
-			<type type="islamic-umalqura" key="calendar" draft="contributed">Hicri Takvim (Ümmü-l Kurra Takvimi)</type>
-			<type type="iso8601" key="calendar">ISO-8601 Takvimi</type>
-			<type type="japanese" key="calendar">Japon Takvimi</type>
-			<type type="java" key="numbers" draft="contributed">Cava Rakamları</type>
-			<type type="jpan" key="numbers">Japon Rakamları</type>
-			<type type="jpanfin" key="numbers">Finansal Japon Rakamları</type>
-			<type type="kali" key="numbers" draft="contributed">Kayah Li Rakamları</type>
-			<type type="khmr" key="numbers">Kmer Rakamları</type>
-			<type type="knda" key="numbers">Kannada Rakamları</type>
-			<type type="lana" key="numbers" draft="contributed">Tai Tham Hora Rakamları</type>
-			<type type="lanatham" key="numbers" draft="contributed">Tai Tham Tham Rakamları</type>
-			<type type="laoo" key="numbers">Lao Rakamları</type>
-			<type type="latn" key="numbers">Batı Rakamları</type>
-			<type type="lepc" key="numbers" draft="contributed">Lepça Rakamları</type>
-			<type type="limb" key="numbers" draft="contributed">Limbu Rakamları</type>
-			<type type="lower" key="colCaseFirst">Önce Küçük Harfleri Sıralama</type>
-			<type type="mlym" key="numbers">Malayalam Rakamları</type>
-			<type type="mong" key="numbers">Moğolca Rakamlar</type>
-			<type type="mtei" key="numbers" draft="contributed">Meetei Mayek Rakamları</type>
-			<type type="mymr" key="numbers">Myanmar Rakamları</type>
-			<type type="mymrshan" key="numbers" draft="contributed">Myanmar Shan Rakamları</type>
-			<type type="native" key="numbers">Yerel Rakamlar</type>
-			<type type="nkoo" key="numbers" draft="contributed">N’Ko Rakamları</type>
-			<type type="no" key="colBackwards">Aksanları Normal Olarak Sıralama</type>
-			<type type="no" key="colCaseFirst">Normal Büyük/Küçük Harf Düzeninde Sıralama</type>
-			<type type="no" key="colCaseLevel">Büyük/Küçük Harfe Duyarlı Olmadan Sıralama</type>
-			<type type="no" key="colHiraganaQuaternary">Kana’yı Ayrı Sıralama</type>
-			<type type="no" key="colNormalization">Normalleştirme Olmadan Sıralama</type>
-			<type type="no" key="colNumeric">Rakamları Ayrı Sıralama</type>
-			<type type="non-ignorable" key="colAlternate">Sembolleri Sıralama</type>
-			<type type="olck" key="numbers" draft="contributed">Ol Chiki Rakamları</type>
-			<type type="orya" key="numbers">Oriya Rakamları</type>
-			<type type="persian" key="calendar">İran Takvimi</type>
-			<type type="phonebook" key="collation">Telefon Defteri Sıralaması</type>
-			<type type="phonetic" key="collation">Fonetik Sıralama Düzeni</type>
-			<type type="pinyin" key="collation">Basitleştirilmiş Çince Pinyin Sıralaması</type>
-			<type type="primary" key="colStrength">Yalnızca Taban Harflerini Sıralama</type>
-			<type type="quaternary" key="colStrength">Aksanları/Büyük-Küçük Harfleri/Genişliği/Kana’yı Sıralama</type>
-			<type type="reformed" key="collation">Yeni Sıralama Düzeni</type>
-			<type type="roc" key="calendar">Çin Cumhuriyeti Takvimi</type>
-			<type type="roman" key="numbers">Roma Rakamları</type>
-			<type type="romanlow" key="numbers">Küçük Harf Roma Rakamları</type>
-			<type type="search" key="collation">Genel Amaçlı Arama</type>
-			<type type="searchjl" key="collation">Hangul İlk Sessiz Harfe Göre Arama</type>
-			<type type="secondary" key="colStrength">Aksanları Sıralama</type>
-			<type type="shifted" key="colAlternate">Sembolleri Yoksayarak Sıralama</type>
-			<type type="standard" key="collation">Standart Sıralama</type>
-			<type type="stroke" key="collation">Geleneksel Çince Vuruş Sıralaması</type>
-			<type type="taml" key="numbers">Geleneksel Tamil Rakamları</type>
-			<type type="tamldec" key="numbers">Tamil Rakamları</type>
-			<type type="telu" key="numbers">Telugu Rakamları</type>
-			<type type="tertiary" key="colStrength">Aksanları/Büyük-Küçük Harfleri/Genişliği Sıralama</type>
-			<type type="thai" key="numbers">Tay Rakamları</type>
-			<type type="tibt" key="numbers">Tibet Rakamları</type>
-			<type type="traditional" key="collation">Geleneksel Sıralama</type>
-			<type type="traditional" key="numbers">Geleneksel Rakamlar</type>
-			<type type="unihan" key="collation">Radical-Stroke Sıralama Düzeni</type>
-			<type type="upper" key="colCaseFirst">Önce Büyük Harfleri Sıralama</type>
-			<type type="vaii" key="numbers">Vai Rakamları</type>
-			<type type="yes" key="colBackwards">Aksanları Ters Sıralama</type>
-			<type type="yes" key="colCaseLevel">Büyük/Küçük Harfe Duyarla Sıralama</type>
-			<type type="yes" key="colHiraganaQuaternary">Kana’yı Farklı Sıralama</type>
-			<type type="yes" key="colNormalization">Unicode Normalleştirilmiş Olarak Sıralama</type>
-			<type type="yes" key="colNumeric">Rakamları Sayısal Olarak Sıralama</type>
-			<type type="zhuyin" key="collation" draft="contributed">Zhuyin Sıralaması</type>
+			<type key="calendar" type="buddhist">Budist Takvimi</type>
+			<type key="calendar" type="chinese">Çin Takvimi</type>
+			<type key="calendar" type="coptic">Kıpti Takvim</type>
+			<type key="calendar" type="dangi">Dangi Takvimi</type>
+			<type key="calendar" type="ethiopic">Etiyopik Takvim</type>
+			<type key="calendar" type="ethiopic-amete-alem">Etiyopik Amete Alem Takvimi</type>
+			<type key="calendar" type="gregorian">Miladi Takvim</type>
+			<type key="calendar" type="hebrew">Yahudi Takvimi</type>
+			<type key="calendar" type="indian">Ulusal Hint Takvimi</type>
+			<type key="calendar" type="islamic">Hicri Takvim</type>
+			<type key="calendar" type="islamic-civil">Arap Takvimi</type>
+			<type key="calendar" type="islamic-rgsa" draft="contributed">Hicri Takvim (Suudi)</type>
+			<type key="calendar" type="islamic-tbla" draft="contributed">Hicri Takvim (Astronomik Evreler)</type>
+			<type key="calendar" type="islamic-umalqura" draft="contributed">Hicri Takvim (Ümmü-l Kurra Takvimi)</type>
+			<type key="calendar" type="iso8601">ISO-8601 Takvimi</type>
+			<type key="calendar" type="japanese">Japon Takvimi</type>
+			<type key="calendar" type="persian">İran Takvimi</type>
+			<type key="calendar" type="roc">Çin Cumhuriyeti Takvimi</type>
+			<type key="colAlternate" type="non-ignorable">Sembolleri Sıralama</type>
+			<type key="colAlternate" type="shifted">Sembolleri Yoksayarak Sıralama</type>
+			<type key="colBackwards" type="no">Aksanları Normal Olarak Sıralama</type>
+			<type key="colBackwards" type="yes">Aksanları Ters Sıralama</type>
+			<type key="colCaseFirst" type="lower">Önce Küçük Harfleri Sıralama</type>
+			<type key="colCaseFirst" type="no">Normal Büyük/Küçük Harf Düzeninde Sıralama</type>
+			<type key="colCaseFirst" type="upper">Önce Büyük Harfleri Sıralama</type>
+			<type key="colCaseLevel" type="no">Büyük/Küçük Harfe Duyarlı Olmadan Sıralama</type>
+			<type key="colCaseLevel" type="yes">Büyük/Küçük Harfe Duyarla Sıralama</type>
+			<type key="colHiraganaQuaternary" type="no">Kana’yı Ayrı Sıralama</type>
+			<type key="colHiraganaQuaternary" type="yes">Kana’yı Farklı Sıralama</type>
+			<type key="collation" type="big5han">Geleneksel Çince Sıralaması - Big5</type>
+			<type key="collation" type="dictionary">Sözlük Sıralama Düzeni</type>
+			<type key="collation" type="ducet">Saptanmış Unicode Sıralaması</type>
+			<type key="collation" type="eor" draft="contributed">Avrupa Sıralama Kuralları</type>
+			<type key="collation" type="gb2312han">Basitleştirilmiş Çince Sıralaması - GB2312</type>
+			<type key="collation" type="phonebook">Telefon Defteri Sıralaması</type>
+			<type key="collation" type="phonetic">Fonetik Sıralama Düzeni</type>
+			<type key="collation" type="pinyin">Basitleştirilmiş Çince Pinyin Sıralaması</type>
+			<type key="collation" type="reformed">Yeni Sıralama Düzeni</type>
+			<type key="collation" type="search">Genel Amaçlı Arama</type>
+			<type key="collation" type="searchjl">Hangul İlk Sessiz Harfe Göre Arama</type>
+			<type key="collation" type="standard">Standart Sıralama</type>
+			<type key="collation" type="stroke">Geleneksel Çince Vuruş Sıralaması</type>
+			<type key="collation" type="traditional">Geleneksel Sıralama</type>
+			<type key="collation" type="unihan">Radical-Stroke Sıralama Düzeni</type>
+			<type key="collation" type="zhuyin" draft="contributed">Zhuyin Sıralaması</type>
+			<type key="colNormalization" type="no">Normalleştirme Olmadan Sıralama</type>
+			<type key="colNormalization" type="yes">Unicode Normalleştirilmiş Olarak Sıralama</type>
+			<type key="colNumeric" type="no">Rakamları Ayrı Sıralama</type>
+			<type key="colNumeric" type="yes">Rakamları Sayısal Olarak Sıralama</type>
+			<type key="colStrength" type="identical">Tümünü Sıralama</type>
+			<type key="colStrength" type="primary">Yalnızca Taban Harflerini Sıralama</type>
+			<type key="colStrength" type="quaternary">Aksanları/Büyük-Küçük Harfleri/Genişliği/Kana’yı Sıralama</type>
+			<type key="colStrength" type="secondary">Aksanları Sıralama</type>
+			<type key="colStrength" type="tertiary">Aksanları/Büyük-Küçük Harfleri/Genişliği Sıralama</type>
+			<type key="hc" type="h11">12 Saat Sistemi (0–11)</type>
+			<type key="hc" type="h12">12 Saat Sistemi (1–12)</type>
+			<type key="hc" type="h23">24 Saat Sistemi (0–23)</type>
+			<type key="hc" type="h24">24 Saat Sistemi (1–24)</type>
+			<type key="lb" type="loose">loose</type>
+			<type key="lb" type="normal">normal</type>
+			<type key="lb" type="strict">strict</type>
+			<type key="ms" type="metric">Metrik Sistem</type>
+			<type key="ms" type="uksystem" draft="provisional">İmperial Ölçü Sistemi</type>
+			<type key="ms" type="ussystem">ABD Ölçü Sistemi</type>
+			<type key="numbers" type="arab">Hint-Arap Rakamları</type>
+			<type key="numbers" type="arabext">Genişletilmiş Hint-Arap Rakamları</type>
+			<type key="numbers" type="armn">Ermeni Rakamları</type>
+			<type key="numbers" type="armnlow">Küçük Harf Ermeni Rakamları</type>
+			<type key="numbers" type="bali" draft="contributed">Bali Rakamları</type>
+			<type key="numbers" type="beng">Bengal Rakamları</type>
+			<type key="numbers" type="brah" draft="contributed">Brahmi Rakamları</type>
+			<type key="numbers" type="cakm" draft="contributed">Chakma Rakamları</type>
+			<type key="numbers" type="cham" draft="contributed">Cham Rakamları</type>
+			<type key="numbers" type="deva">Devanagari Rakamları</type>
+			<type key="numbers" type="ethi">Ge’ez Rakamları</type>
+			<type key="numbers" type="finance">Finansal Sayılar</type>
+			<type key="numbers" type="fullwide">Tam Genişlikte Rakamlar</type>
+			<type key="numbers" type="geor">Gürcü Rakamları</type>
+			<type key="numbers" type="grek">Yunan Rakamları</type>
+			<type key="numbers" type="greklow">Küçük Harf Yunan Rakamları</type>
+			<type key="numbers" type="gujr">Gücerat Rakamları</type>
+			<type key="numbers" type="guru">Gurmukhi Rakamları</type>
+			<type key="numbers" type="hanidec">Çin Rakamları</type>
+			<type key="numbers" type="hans">Basitleştirilmiş Çin Rakamları</type>
+			<type key="numbers" type="hansfin">Finansal Basitleştirilmiş Çin Rakamları</type>
+			<type key="numbers" type="hant">Geleneksel Çin Rakamları</type>
+			<type key="numbers" type="hantfin">Finansal Geleneksel Çin Rakamları</type>
+			<type key="numbers" type="hebr">İbrani Rakamları</type>
+			<type key="numbers" type="java" draft="contributed">Cava Rakamları</type>
+			<type key="numbers" type="jpan">Japon Rakamları</type>
+			<type key="numbers" type="jpanfin">Finansal Japon Rakamları</type>
+			<type key="numbers" type="kali" draft="contributed">Kayah Li Rakamları</type>
+			<type key="numbers" type="khmr">Kmer Rakamları</type>
+			<type key="numbers" type="knda">Kannada Rakamları</type>
+			<type key="numbers" type="lana" draft="contributed">Tai Tham Hora Rakamları</type>
+			<type key="numbers" type="lanatham" draft="contributed">Tai Tham Tham Rakamları</type>
+			<type key="numbers" type="laoo">Lao Rakamları</type>
+			<type key="numbers" type="latn">Batı Rakamları</type>
+			<type key="numbers" type="lepc" draft="contributed">Lepça Rakamları</type>
+			<type key="numbers" type="limb" draft="contributed">Limbu Rakamları</type>
+			<type key="numbers" type="mlym">Malayalam Rakamları</type>
+			<type key="numbers" type="mong">Moğolca Rakamlar</type>
+			<type key="numbers" type="mtei" draft="contributed">Meetei Mayek Rakamları</type>
+			<type key="numbers" type="mymr">Myanmar Rakamları</type>
+			<type key="numbers" type="mymrshan" draft="contributed">Myanmar Shan Rakamları</type>
+			<type key="numbers" type="native">Yerel Rakamlar</type>
+			<type key="numbers" type="nkoo" draft="contributed">N’Ko Rakamları</type>
+			<type key="numbers" type="olck" draft="contributed">Ol Chiki Rakamları</type>
+			<type key="numbers" type="orya">Oriya Rakamları</type>
+			<type key="numbers" type="roman">Roma Rakamları</type>
+			<type key="numbers" type="romanlow">Küçük Harf Roma Rakamları</type>
+			<type key="numbers" type="taml">Geleneksel Tamil Rakamları</type>
+			<type key="numbers" type="tamldec">Tamil Rakamları</type>
+			<type key="numbers" type="telu">Telugu Rakamları</type>
+			<type key="numbers" type="thai">Tay Rakamları</type>
+			<type key="numbers" type="tibt">Tibet Rakamları</type>
+			<type key="numbers" type="traditional">Geleneksel Rakamlar</type>
+			<type key="numbers" type="vaii">Vai Rakamları</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN">BGN</transformName>
@@ -1407,6 +1422,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">G y</dateFormatItem>
 						<dateFormatItem id="GyMMM">G MMM y</dateFormatItem>
@@ -1751,15 +1767,79 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">öö</dayPeriod>
-							<dayPeriod type="noon">ö</dayPeriod>
-							<dayPeriod type="pm">ös</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">gece yarısı</dayPeriod>
 							<dayPeriod type="am">ÖÖ</dayPeriod>
 							<dayPeriod type="noon">öğle</dayPeriod>
 							<dayPeriod type="pm">ÖS</dayPeriod>
+							<dayPeriod type="morning1">sabah</dayPeriod>
+							<dayPeriod type="morning2">öğleden önce</dayPeriod>
+							<dayPeriod type="afternoon1">öğleden sonra</dayPeriod>
+							<dayPeriod type="afternoon2">akşamüstü</dayPeriod>
+							<dayPeriod type="evening1">akşam</dayPeriod>
+							<dayPeriod type="night1">gece</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">gece</dayPeriod>
+							<dayPeriod type="am">öö</dayPeriod>
+							<dayPeriod type="noon">ö</dayPeriod>
+							<dayPeriod type="pm">ös</dayPeriod>
+							<dayPeriod type="morning1">sabah</dayPeriod>
+							<dayPeriod type="morning2">öğleden önce</dayPeriod>
+							<dayPeriod type="afternoon1">öğleden sonra</dayPeriod>
+							<dayPeriod type="afternoon2">akşamüstü</dayPeriod>
+							<dayPeriod type="evening1">akşam</dayPeriod>
+							<dayPeriod type="night1">gece</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">gece yarısı</dayPeriod>
+							<dayPeriod type="am">ÖÖ</dayPeriod>
+							<dayPeriod type="noon">öğle</dayPeriod>
+							<dayPeriod type="pm">ÖS</dayPeriod>
+							<dayPeriod type="morning1">sabah</dayPeriod>
+							<dayPeriod type="morning2">öğleden önce</dayPeriod>
+							<dayPeriod type="afternoon1">öğleden sonra</dayPeriod>
+							<dayPeriod type="afternoon2">akşamüstü</dayPeriod>
+							<dayPeriod type="evening1">akşam</dayPeriod>
+							<dayPeriod type="night1">gece</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">gece yarısı</dayPeriod>
+							<dayPeriod type="am">ÖÖ</dayPeriod>
+							<dayPeriod type="noon">öğle</dayPeriod>
+							<dayPeriod type="pm">ÖS</dayPeriod>
+							<dayPeriod type="morning1">sabah</dayPeriod>
+							<dayPeriod type="morning2">öğleden önce</dayPeriod>
+							<dayPeriod type="afternoon1">öğleden sonra</dayPeriod>
+							<dayPeriod type="afternoon2">akşamüstü</dayPeriod>
+							<dayPeriod type="evening1">akşam</dayPeriod>
+							<dayPeriod type="night1">gece</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">gece yarısı</dayPeriod>
+							<dayPeriod type="am">ÖÖ</dayPeriod>
+							<dayPeriod type="noon">öğle</dayPeriod>
+							<dayPeriod type="pm">ÖS</dayPeriod>
+							<dayPeriod type="morning1">sabah</dayPeriod>
+							<dayPeriod type="morning2">öğleden önce</dayPeriod>
+							<dayPeriod type="afternoon1">öğleden sonra</dayPeriod>
+							<dayPeriod type="afternoon2">akşamüstü</dayPeriod>
+							<dayPeriod type="evening1">akşam</dayPeriod>
+							<dayPeriod type="night1">gece</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">gece yarısı</dayPeriod>
+							<dayPeriod type="am">ÖÖ</dayPeriod>
+							<dayPeriod type="noon">öğle</dayPeriod>
+							<dayPeriod type="pm">ÖS</dayPeriod>
+							<dayPeriod type="morning1">sabah</dayPeriod>
+							<dayPeriod type="morning2">öğleden önce</dayPeriod>
+							<dayPeriod type="afternoon1">öğleden sonra</dayPeriod>
+							<dayPeriod type="afternoon2">akşamüstü</dayPeriod>
+							<dayPeriod type="evening1">akşam</dayPeriod>
+							<dayPeriod type="night1">gece</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -2078,9 +2158,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</eras>
 			</calendar>
 			<calendar type="japanese">
-				<!-- need some non-empty element here to make inheritance work,
-					 this copy of generic dateFormats above is smaller than root japanese eras
-				-->
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
@@ -2153,6 +2230,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>yıl</displayName>
+				<relative type="-1">geçen yıl</relative>
+				<relative type="0">bu yıl</relative>
+				<relative type="1">gelecek yıl</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} yıl sonra</relativeTimePattern>
 					<relativeTimePattern count="other">{0} yıl sonra</relativeTimePattern>
@@ -2164,6 +2244,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>yıl</displayName>
+				<relative type="-1">geçen yıl</relative>
+				<relative type="0">bu yıl</relative>
+				<relative type="1">gelecek yıl</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} yıl sonra</relativeTimePattern>
 					<relativeTimePattern count="other">{0} yıl sonra</relativeTimePattern>
@@ -2222,6 +2305,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>ay</displayName>
+				<relative type="-1">geçen ay</relative>
+				<relative type="0">bu ay</relative>
+				<relative type="1">gelecek ay</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ay sonra</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ay sonra</relativeTimePattern>
@@ -2233,6 +2319,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>ay</displayName>
+				<relative type="-1">geçen ay</relative>
+				<relative type="0">bu ay</relative>
+				<relative type="1">gelecek ay</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ay sonra</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ay sonra</relativeTimePattern>
@@ -2296,6 +2385,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>gün</displayName>
+				<relative type="-2">evvelsi gün</relative>
+				<relative type="-1">dün</relative>
+				<relative type="0">bugün</relative>
+				<relative type="1">yarın</relative>
+				<relative type="2">öbür gün</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} gün sonra</relativeTimePattern>
 					<relativeTimePattern count="other">{0} gün sonra</relativeTimePattern>
@@ -2307,6 +2401,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>gün</displayName>
+				<relative type="-2">evvelsi gün</relative>
+				<relative type="-1">dün</relative>
+				<relative type="0">bugün</relative>
+				<relative type="1">yarın</relative>
+				<relative type="2">öbür gün</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} gün sonra</relativeTimePattern>
 					<relativeTimePattern count="other">{0} gün sonra</relativeTimePattern>
@@ -3406,6 +3505,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
 			</zone>
@@ -3490,6 +3592,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>İrkutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Chita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Yakutsk</exemplarCity>
 			</zone>
@@ -3508,6 +3613,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolymsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamçatka</exemplarCity>
 			</zone>
@@ -3879,9 +3987,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic draft="contributed">Apia Saati</generic>
-					<standard draft="contributed">Apia Standart Saati</standard>
-					<daylight draft="contributed">Apia Yaz Saati</daylight>
+					<generic>Apia Saati</generic>
+					<standard>Apia Standart Saati</standard>
+					<daylight>Apia Yaz Saati</daylight>
 				</long>
 			</metazone>
 			<metazone type="Aqtau">
@@ -4123,7 +4231,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
 				<long>
-					<standard draft="contributed">Daha Doğu Avrupa Saati</standard>
+					<standard>Daha Doğu Avrupa Saati</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
@@ -4852,6 +4960,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="contributed">0 B ¤</pattern>
+					<pattern type="1000" count="other" draft="contributed">0 B ¤</pattern>
+					<pattern type="10000" count="one" draft="contributed">00 B ¤</pattern>
+					<pattern type="10000" count="other" draft="contributed">00 B ¤</pattern>
+					<pattern type="100000" count="one" draft="contributed">000 B ¤</pattern>
+					<pattern type="100000" count="other" draft="contributed">000 B ¤</pattern>
+					<pattern type="1000000" count="one" draft="contributed">0 Mn ¤</pattern>
+					<pattern type="1000000" count="other" draft="contributed">0 Mn ¤</pattern>
+					<pattern type="10000000" count="one" draft="contributed">00 Mn ¤</pattern>
+					<pattern type="10000000" count="other" draft="contributed">00 Mn ¤</pattern>
+					<pattern type="100000000" count="one" draft="contributed">000 Mn ¤</pattern>
+					<pattern type="100000000" count="other" draft="contributed">000 Mn ¤</pattern>
+					<pattern type="1000000000" count="one" draft="contributed">0 Mr ¤</pattern>
+					<pattern type="1000000000" count="other" draft="contributed">0 Mr ¤</pattern>
+					<pattern type="10000000000" count="one" draft="contributed">00 Mr ¤</pattern>
+					<pattern type="10000000000" count="other" draft="contributed">00 Mr ¤</pattern>
+					<pattern type="100000000000" count="one" draft="contributed">000 Mr ¤</pattern>
+					<pattern type="100000000000" count="other" draft="contributed">000 Mr ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="contributed">0 Tn ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="contributed">0 Tn ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="contributed">00 Tn ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="contributed">00 Tn ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="contributed">000 Tn ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="contributed">000 Tn ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4907,6 +5043,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Angola kvanzası</displayName>
 				<displayName count="other">Angola kvanzası</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>Angola Kvanzası (1977–1990)</displayName>
@@ -4990,6 +5127,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Konvertibl Bosna Hersek markı</displayName>
 				<displayName count="other">Konvertibl Bosna Hersek markı</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BAN">
 				<displayName draft="contributed">Yeni Bosna Hersek Dinarı (1994–1997)</displayName>
@@ -5084,6 +5222,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Bolivya bolivyanosu</displayName>
 				<displayName count="other">Bolivya bolivyanosu</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOL">
 				<displayName draft="contributed">Bolivya Bolivyanosu (1863–1963)</displayName>
@@ -5170,6 +5309,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Botsvana pulası</displayName>
 				<displayName count="other">Botsvana pulası</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>Yeni Beyaz Rusya Rublesi (1994–1999)</displayName>
@@ -5290,6 +5430,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Konvertibl Küba pesosu</displayName>
 				<displayName count="other">Konvertibl Küba pesosu</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>Küba Pesosu</displayName>
@@ -5315,6 +5456,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Çek Cumhuriyeti korunası</displayName>
 				<displayName count="other">Çek Cumhuriyeti korunası</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>Doğu Alman Markı</displayName>
@@ -5339,6 +5481,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Danimarka kronu</displayName>
 				<displayName count="other">Danimarka kronu</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Dominik Pesosu</displayName>
@@ -5376,6 +5519,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Mısır lirası</displayName>
 				<displayName count="other">Mısır lirası</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>Eritre Nakfası</displayName>
@@ -5433,6 +5577,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Falkland Adaları lirası</displayName>
 				<displayName count="other">Falkland Adaları lirası</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>Fransız Frangı</displayName>
@@ -5458,6 +5603,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Gürcistan larisi</displayName>
 				<displayName count="other">Gürcistan larisi</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>Gana Sedisi (1979–2007)</displayName>
@@ -5486,6 +5632,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Gine frangı</displayName>
 				<displayName count="other">Gine frangı</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>Gine Sylisi</displayName>
@@ -5504,6 +5651,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Guatemala quetzalı</displayName>
 				<displayName count="other">Guatemala quetzalı</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>Portekiz Ginesi Esküdosu</displayName>
@@ -5530,6 +5678,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Honduras lempirası</displayName>
 				<displayName count="other">Honduras lempirası</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>Hırvatistan Dinarı</displayName>
@@ -5542,6 +5691,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Hırvatistan kunası</displayName>
 				<displayName count="other">Hırvatistan kunası</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>Haiti Gurdu</displayName>
@@ -5554,12 +5704,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Macar forinti</displayName>
 				<displayName count="other">Macar forinti</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>Endonezya Rupiahı</displayName>
 				<displayName count="one">Endonezya rupiahı</displayName>
 				<displayName count="other">Endonezya rupiahı</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>İrlanda Lirası</displayName>
@@ -5614,6 +5766,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">İzlanda kronu</displayName>
 				<displayName count="other">İzlanda kronu</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>İtalyan Lireti</displayName>
@@ -5665,12 +5818,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Komorlar frangı</displayName>
 				<displayName count="other">Komorlar frangı</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>Kuzey Kore Wonu</displayName>
 				<displayName count="one">Kuzey Kore wonu</displayName>
 				<displayName count="other">Kuzey Kore wonu</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRH">
 				<displayName draft="contributed">Güney Kore Hwanı (1953–1962)</displayName>
@@ -5723,12 +5878,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Lübnan lirası</displayName>
 				<displayName count="other">Lübnan lirası</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>Sri Lanka Rupisi</displayName>
 				<displayName count="one">Sri Lanka rupisi</displayName>
 				<displayName count="other">Sri Lanka rupisi</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>Liberya Doları</displayName>
@@ -5820,6 +5977,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Madagaskar ariarisi</displayName>
 				<displayName count="other">Madagaskar ariarisi</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>Madagaskar Frangı</displayName>
@@ -5844,6 +6002,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Myanmar kyatı</displayName>
 				<displayName count="other">Myanmar kyatı</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>Moğolistan Tugriki</displayName>
@@ -5881,6 +6040,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Mauritius rupisi</displayName>
 				<displayName count="other">Mauritius rupisi</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVP">
 				<displayName draft="contributed">Maldiv Rupisi</displayName>
@@ -5923,6 +6083,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Malezya ringgiti</displayName>
 				<displayName count="other">Malezya ringgiti</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>Mozambik Esküdosu</displayName>
@@ -5961,6 +6122,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Nikaragua kordobası</displayName>
 				<displayName count="other">Nikaragua kordobası</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>Hollanda Florini</displayName>
@@ -5973,12 +6135,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Norveç kronu</displayName>
 				<displayName count="other">Norveç kronu</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>Nepal Rupisi</displayName>
 				<displayName count="one">Nepal rupisi</displayName>
 				<displayName count="other">Nepal rupisi</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>Yeni Zelanda Doları</displayName>
@@ -6035,12 +6199,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Pakistan rupisi</displayName>
 				<displayName count="other">Pakistan rupisi</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>Polonya Zlotisi</displayName>
 				<displayName count="one">Polonya zlotisi</displayName>
 				<displayName count="other">Polonya zlotisi</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>Polonya Zlotisi (1950–1995)</displayName>
@@ -6093,6 +6259,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Rus rublesi</displayName>
 				<displayName count="other">Rus rublesi</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>Rus Rublesi (1991–1998)</displayName>
@@ -6106,6 +6273,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Ruanda frangı</displayName>
 				<displayName count="other">Ruanda frangı</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>Suudi Arabistan Riyali</displayName>
@@ -6143,6 +6311,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">İsveç kronu</displayName>
 				<displayName count="other">İsveç kronu</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>Singapur Doları</displayName>
@@ -6156,6 +6325,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Saint Helena lirası</displayName>
 				<displayName count="other">Saint Helena lirası</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>Slovenya Toları</displayName>
@@ -6206,6 +6376,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">São Tomé ve Príncipe dobrası</displayName>
 				<displayName count="other">São Tomé ve Príncipe dobrası</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>Sovyet Rublesi</displayName>
@@ -6224,6 +6395,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Suriye lirası</displayName>
 				<displayName count="other">Suriye lirası</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>Svaziland Lilangenisi</displayName>
@@ -6236,6 +6408,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Tayland bahtı</displayName>
 				<displayName count="other">Tayland bahtı</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>Tacikistan Rublesi</displayName>
@@ -6272,6 +6445,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Tonga paʻangası</displayName>
 				<displayName count="other">Tonga paʻangası</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>Timor Esküdosu</displayName>
@@ -6292,6 +6466,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">Türk lirası</displayName>
 				<symbol>₺</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Trinidad ve Tobago Doları</displayName>
@@ -6390,6 +6565,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Venezuela bolivarı</displayName>
 				<displayName count="other">Venezuela bolivarı</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>Vietnam Dongu</displayName>
@@ -6451,6 +6627,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Doğu Karayip doları</displayName>
 				<displayName count="other">Doğu Karayip doları</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>Özel Çekme Hakkı (SDR)</displayName>
@@ -6559,6 +6736,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Güney Afrika randı</displayName>
 				<displayName count="other">Güney Afrika randı</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>Zambiya Kvaçası (1968–2012)</displayName>
@@ -6568,6 +6746,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Zambiya kvaçası</displayName>
 				<displayName count="other">Zambiya kvaçası</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>Yeni Zaire Zairesi</displayName>
@@ -6608,6 +6787,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} metre/saniye²</unitPattern>
 				<unitPattern count="other">{0} metre/saniye²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>devir</displayName>
+				<unitPattern count="one">{0} devir</unitPattern>
+				<unitPattern count="other">{0} devir</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radyan</displayName>
+				<unitPattern count="one">{0} radyan</unitPattern>
+				<unitPattern count="other">{0} radyan</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>derece</displayName>
+				<unitPattern count="one">{0} derece</unitPattern>
+				<unitPattern count="other">{0} derece</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>açısal dakika</displayName>
 				<unitPattern count="one">{0} açısal dakika</unitPattern>
@@ -6618,30 +6812,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} açısal saniye</unitPattern>
 				<unitPattern count="other">{0} açısal saniye</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>derece</displayName>
-				<unitPattern count="one">{0} derece</unitPattern>
-				<unitPattern count="other">{0} derece</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radyan</displayName>
-				<unitPattern count="one">{0} radyan</unitPattern>
-				<unitPattern count="other">{0} radyan</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>akre</displayName>
-				<unitPattern count="one">{0} akre</unitPattern>
-				<unitPattern count="other">{0} akre</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>kilometrekare</displayName>
+				<unitPattern count="one">{0} kilometrekare</unitPattern>
+				<unitPattern count="other">{0} kilometrekare</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektar</displayName>
 				<unitPattern count="one">{0} hektar</unitPattern>
 				<unitPattern count="other">{0} hektar</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>metrekare</displayName>
+				<unitPattern count="one">{0} metrekare</unitPattern>
+				<unitPattern count="other">{0} metrekare</unitPattern>
+				<perUnitPattern>{0}/metrekare</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>santimetrekare</displayName>
 				<unitPattern count="one">{0} santimetrekare</unitPattern>
 				<unitPattern count="other">{0} santimetrekare</unitPattern>
+				<perUnitPattern>{0}/santimetrekare</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mil kare</displayName>
+				<unitPattern count="one">{0} mil kare</unitPattern>
+				<unitPattern count="other">{0} mil kare</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>akre</displayName>
+				<unitPattern count="one">{0} akre</unitPattern>
+				<unitPattern count="other">{0} akre</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yarda kare</displayName>
+				<unitPattern count="one">{0} yarda kare</unitPattern>
+				<unitPattern count="other">{0} yarda kare</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>fit kare</displayName>
@@ -6649,94 +6855,109 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} fit kare</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
-				<displayName draft="contributed">inç kare</displayName>
-				<unitPattern count="one" draft="contributed">{0} inç kare</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} inç kare</unitPattern>
+				<displayName>inç kare</displayName>
+				<unitPattern count="one">{0} inç kare</unitPattern>
+				<unitPattern count="other">{0} inç kare</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="contributed">kilometrekare</displayName>
-				<unitPattern count="one" draft="contributed">{0} kilometrekare</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kilometrekare</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName draft="contributed">metrekare</displayName>
-				<unitPattern count="one" draft="contributed">{0} metrekare</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} metrekare</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName draft="contributed">mil kare</displayName>
-				<unitPattern count="one" draft="contributed">{0} mil kare</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mil kare</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName draft="contributed">yarda kare</displayName>
-				<unitPattern count="one" draft="contributed">{0} yarda kare</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} yarda kare</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>ayar</displayName>
+				<unitPattern count="one">{0} ayar</unitPattern>
+				<unitPattern count="other">{0} ayar</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName draft="contributed">litre/kilometre</displayName>
+				<displayName>litre/kilometre</displayName>
 				<unitPattern count="one">{0} litre/kilometre</unitPattern>
 				<unitPattern count="other">{0} litre/kilometre</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>litre/100 kilometre</displayName>
+				<unitPattern count="one">{0} litre/100 kilometre</unitPattern>
+				<unitPattern count="other">{0} litre/100 kilometre</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mil/galon</displayName>
 				<unitPattern count="one">{0} mil/galon</unitPattern>
 				<unitPattern count="other">{0} mil/galon</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bayt</displayName>
-				<unitPattern count="one">{0} bayt</unitPattern>
-				<unitPattern count="other">{0} bayt</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName draft="contributed">gigabit</displayName>
-				<unitPattern count="one" draft="contributed">{0} gigabit</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} gigabit</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabayt</displayName>
-				<unitPattern count="one">{0} gigabayt</unitPattern>
-				<unitPattern count="other">{0} gigabayt</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobit</displayName>
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="other">{0} kilobit</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobayt</displayName>
-				<unitPattern count="one">{0} kilobayt</unitPattern>
-				<unitPattern count="other">{0} kilobyte</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabit</displayName>
-				<unitPattern count="one">{0} megabit</unitPattern>
-				<unitPattern count="other">{0} megabit</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabayt</displayName>
-				<unitPattern count="one">{0} megabayt</unitPattern>
-				<unitPattern count="other">{0} megabayt</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>terabayt</displayName>
+				<unitPattern count="one">{0} terabayt</unitPattern>
+				<unitPattern count="other">{0} terabayt</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>terabit</displayName>
 				<unitPattern count="one">{0} terabit</unitPattern>
 				<unitPattern count="other">{0} terabit</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>terabayt</displayName>
-				<unitPattern count="one">{0} terabayt</unitPattern>
-				<unitPattern count="other">{0} terabayt</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>gigabayt</displayName>
+				<unitPattern count="one">{0} gigabayt</unitPattern>
+				<unitPattern count="other">{0} gigabayt</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabit</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="other">{0} gigabit</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabayt</displayName>
+				<unitPattern count="one">{0} megabayt</unitPattern>
+				<unitPattern count="other">{0} megabayt</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabit</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="other">{0} megabit</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobayt</displayName>
+				<unitPattern count="one">{0} kilobayt</unitPattern>
+				<unitPattern count="other">{0} kilobyte</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobit</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="other">{0} kilobit</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bayt</displayName>
+				<unitPattern count="one">{0} bayt</unitPattern>
+				<unitPattern count="other">{0} bayt</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>yüzyıl</displayName>
+				<unitPattern count="one">{0} yüzyıl</unitPattern>
+				<unitPattern count="other">{0} yüzyıl</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>yıl</displayName>
+				<unitPattern count="one">{0} yıl</unitPattern>
+				<unitPattern count="other">{0} yıl</unitPattern>
+				<perUnitPattern>{0}/yıl</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ay</displayName>
+				<unitPattern count="one">{0} ay</unitPattern>
+				<unitPattern count="other">{0} ay</unitPattern>
+				<perUnitPattern>{0}/ay</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>hafta</displayName>
+				<unitPattern count="one">{0} hafta</unitPattern>
+				<unitPattern count="other">{0} hafta</unitPattern>
+				<perUnitPattern>{0}/hafta</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>gün</displayName>
 				<unitPattern count="one">{0} gün</unitPattern>
 				<unitPattern count="other">{0} gün</unitPattern>
+				<perUnitPattern>{0}/gün</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>saat</displayName>
@@ -6744,30 +6965,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} saat</unitPattern>
 				<perUnitPattern>{0}/saat</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikrosaniye</displayName>
-				<unitPattern count="one">{0} mikrosaniye</unitPattern>
-				<unitPattern count="other">{0} mikrosaniye</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milisaniye</displayName>
-				<unitPattern count="one">{0} milisaniye</unitPattern>
-				<unitPattern count="other">{0} milisaniye</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>dakika</displayName>
 				<unitPattern count="one">{0} dakika</unitPattern>
 				<unitPattern count="other">{0} dakika</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>ay</displayName>
-				<unitPattern count="one">{0} ay</unitPattern>
-				<unitPattern count="other">{0} ay</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanosaniye</displayName>
-				<unitPattern count="one">{0} nanosaniye</unitPattern>
-				<unitPattern count="other">{0} nanosaniye</unitPattern>
+				<perUnitPattern>{0}/dakika</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>saniye</displayName>
@@ -6775,15 +6977,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} saniye</unitPattern>
 				<perUnitPattern>{0}/saniye</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>hafta</displayName>
-				<unitPattern count="one">{0} hafta</unitPattern>
-				<unitPattern count="other">{0} hafta</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milisaniye</displayName>
+				<unitPattern count="one">{0} milisaniye</unitPattern>
+				<unitPattern count="other">{0} milisaniye</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>yıl</displayName>
-				<unitPattern count="one">{0} yıl</unitPattern>
-				<unitPattern count="other">{0} yıl</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>mikrosaniye</displayName>
+				<unitPattern count="one">{0} mikrosaniye</unitPattern>
+				<unitPattern count="other">{0} mikrosaniye</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosaniye</displayName>
+				<unitPattern count="one">{0} nanosaniye</unitPattern>
+				<unitPattern count="other">{0} nanosaniye</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amper</displayName>
@@ -6805,6 +7012,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} volt</unitPattern>
 				<unitPattern count="other">{0} volt</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokalori</displayName>
+				<unitPattern count="one">{0} kilokalori</unitPattern>
+				<unitPattern count="other">{0} kilokalori</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kalori</displayName>
 				<unitPattern count="one">{0} kalori</unitPattern>
@@ -6815,21 +7027,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kilokalori</unitPattern>
 				<unitPattern count="other">{0} kilokalori</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>jul</displayName>
-				<unitPattern count="one">{0} jul</unitPattern>
-				<unitPattern count="other">{0} jul</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokalori</displayName>
-				<unitPattern count="one">{0} kilokalori</unitPattern>
-				<unitPattern count="other">{0} kilokalori</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojul</displayName>
 				<unitPattern count="one">{0} kilojul</unitPattern>
 				<unitPattern count="other">{0} kilojul</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>jul</displayName>
+				<unitPattern count="one">{0} jul</unitPattern>
+				<unitPattern count="other">{0} jul</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilovatsaat</displayName>
 				<unitPattern count="one">{0} kilovatsaat</unitPattern>
@@ -6840,216 +7047,220 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} gigahertz</unitPattern>
 				<unitPattern count="other">{0} gigahertz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>hertz</displayName>
-				<unitPattern count="one">{0} hertz</unitPattern>
-				<unitPattern count="other">{0} hertz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>megahertz</displayName>
+				<unitPattern count="one">{0} megahertz</unitPattern>
+				<unitPattern count="other">{0} megahertz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kilohertz</displayName>
 				<unitPattern count="one">{0} kilohertz</unitPattern>
 				<unitPattern count="other">{0} kilohertz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>megahertz</displayName>
-				<unitPattern count="one">{0} megahertz</unitPattern>
-				<unitPattern count="other">{0} megahertz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>hertz</displayName>
+				<unitPattern count="one">{0} hertz</unitPattern>
+				<unitPattern count="other">{0} hertz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>astronomik birim</displayName>
-				<unitPattern count="one">{0} astronomik birim</unitPattern>
-				<unitPattern count="other">{0} astronomik birim</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilometre</displayName>
+				<unitPattern count="one">{0} kilometre</unitPattern>
+				<unitPattern count="other">{0} kilometre</unitPattern>
+				<perUnitPattern>{0}/kilometre</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>santimetre</displayName>
-				<unitPattern count="one">{0} santimetre</unitPattern>
-				<unitPattern count="other">{0} santimetre</unitPattern>
+			<unit type="length-meter">
+				<displayName>metre</displayName>
+				<unitPattern count="one">{0} metre</unitPattern>
+				<unitPattern count="other">{0} metre</unitPattern>
+				<perUnitPattern>{0}/metre</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>desimetre</displayName>
 				<unitPattern count="one">{0} desimetre</unitPattern>
 				<unitPattern count="other">{0} desimetre</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName draft="contributed">fathom</displayName>
-				<unitPattern count="one" draft="contributed">{0} fathom</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fathom</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>santimetre</displayName>
+				<unitPattern count="one">{0} santimetre</unitPattern>
+				<unitPattern count="other">{0} santimetre</unitPattern>
+				<perUnitPattern>{0}/santimetre</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>milimetre</displayName>
+				<unitPattern count="one">{0} milimetre</unitPattern>
+				<unitPattern count="other">{0} milimetre</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikrometre</displayName>
+				<unitPattern count="one">{0} mikrometre</unitPattern>
+				<unitPattern count="other">{0} mikrometre</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nanometre</displayName>
+				<unitPattern count="one">{0} nanometre</unitPattern>
+				<unitPattern count="other">{0} nanometre</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>pikometre</displayName>
+				<unitPattern count="one">{0} pikometre</unitPattern>
+				<unitPattern count="other">{0} pikometre</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>mil</displayName>
+				<unitPattern count="one">{0} mil</unitPattern>
+				<unitPattern count="other">{0} mil</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>yarda</displayName>
+				<unitPattern count="one">{0} yarda</unitPattern>
+				<unitPattern count="other">{0} yarda</unitPattern>
 			</unit>
 			<unit type="length-foot">
 				<displayName>fit</displayName>
 				<unitPattern count="one">{0} fit</unitPattern>
 				<unitPattern count="other">{0} fit</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName draft="contributed">furlong</displayName>
-				<unitPattern count="one" draft="contributed">{0} furlong</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} furlong</unitPattern>
+				<perUnitPattern>{0}/fit</perUnitPattern>
 			</unit>
 			<unit type="length-inch">
 				<displayName>inç</displayName>
 				<unitPattern count="one">{0} inç</unitPattern>
 				<unitPattern count="other">{0} inç</unitPattern>
+				<perUnitPattern>{0}/inç</perUnitPattern>
 			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometre</displayName>
-				<unitPattern count="one">{0} kilometre</unitPattern>
-				<unitPattern count="other">{0} kilometre</unitPattern>
+			<unit type="length-parsec">
+				<displayName>parsek</displayName>
+				<unitPattern count="one">{0} parsek</unitPattern>
+				<unitPattern count="other">{0} parsek</unitPattern>
 			</unit>
 			<unit type="length-light-year">
 				<displayName>ışık yılı</displayName>
 				<unitPattern count="one">{0} ışık yılı</unitPattern>
 				<unitPattern count="other">{0} ışık yılı</unitPattern>
 			</unit>
-			<unit type="length-meter">
-				<displayName>metre</displayName>
-				<unitPattern count="one">{0} metre</unitPattern>
-				<unitPattern count="other">{0} metre</unitPattern>
+			<unit type="length-astronomical-unit">
+				<displayName>astronomik birim</displayName>
+				<unitPattern count="one">{0} astronomik birim</unitPattern>
+				<unitPattern count="other">{0} astronomik birim</unitPattern>
 			</unit>
-			<unit type="length-micrometer">
-				<displayName draft="contributed">mikrometre</displayName>
-				<unitPattern count="one" draft="contributed">{0} mikrometre</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mikrometre</unitPattern>
+			<unit type="length-furlong">
+				<displayName draft="contributed">furlong</displayName>
+				<unitPattern count="one" draft="contributed">{0} furlong</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} furlong</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName draft="contributed">mil</displayName>
-				<unitPattern count="one" draft="contributed">{0} mil</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mil</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName draft="contributed">milimetre</displayName>
-				<unitPattern count="one" draft="contributed">{0} milimetre</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} milimetre</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<displayName draft="contributed">nanometre</displayName>
-				<unitPattern count="one" draft="contributed">{0} nanometre</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} nanometre</unitPattern>
+			<unit type="length-fathom">
+				<displayName draft="contributed">fathom</displayName>
+				<unitPattern count="one" draft="contributed">{0} fathom</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fathom</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
-				<displayName draft="contributed">deniz mili</displayName>
-				<unitPattern count="one" draft="contributed">{0} deniz mili</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} deniz mili</unitPattern>
+				<displayName>deniz mili</displayName>
+				<unitPattern count="one">{0} deniz mili</unitPattern>
+				<unitPattern count="other">{0} deniz mili</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<displayName draft="contributed">parsek</displayName>
-				<unitPattern count="one" draft="contributed">{0} parsek</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} parsek</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName draft="contributed">pikometre</displayName>
-				<unitPattern count="one" draft="contributed">{0} pikometre</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pikometre</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<displayName draft="contributed">yarda</displayName>
-				<unitPattern count="one" draft="contributed">{0} yarda</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} yarda</unitPattern>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
 			</unit>
 			<unit type="light-lux">
 				<displayName>lüks</displayName>
 				<unitPattern count="one">{0} lüks</unitPattern>
 				<unitPattern count="other">{0} lüks</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="other">{0} karat</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gram</displayName>
-				<unitPattern count="one">{0} gram</unitPattern>
-				<unitPattern count="other">{0} gram</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogram</displayName>
-				<unitPattern count="one">{0} kilogram</unitPattern>
-				<unitPattern count="other">{0} kilogram</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>ton</displayName>
 				<unitPattern count="one">{0} ton</unitPattern>
 				<unitPattern count="other">{0} ton</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mikrogram</displayName>
-				<unitPattern count="one">{0} mikrogram</unitPattern>
-				<unitPattern count="other">{0} mikrogram</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogram</displayName>
+				<unitPattern count="one">{0} kilogram</unitPattern>
+				<unitPattern count="other">{0} kilogram</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="one">{0} gram</unitPattern>
+				<unitPattern count="other">{0} gram</unitPattern>
+				<perUnitPattern>{0}/gram</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>miligram</displayName>
 				<unitPattern count="one">{0} miligram</unitPattern>
 				<unitPattern count="other">{0} miligram</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ons</displayName>
-				<unitPattern count="one">{0} ons</unitPattern>
-				<unitPattern count="other">{0} ons</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>troy ons</displayName>
-				<unitPattern count="one">{0} troy ons</unitPattern>
-				<unitPattern count="other">{0} troy ons</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>libre</displayName>
-				<unitPattern count="one">{0} libre</unitPattern>
-				<unitPattern count="other">{0} libre</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="contributed">stone</displayName>
-				<unitPattern count="one" draft="contributed">{0} stone</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} stone</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>mikrogram</displayName>
+				<unitPattern count="one">{0} mikrogram</unitPattern>
+				<unitPattern count="other">{0} mikrogram</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>Amerikan tonu</displayName>
 				<unitPattern count="one">{0} Amerikan tonu</unitPattern>
 				<unitPattern count="other">{0} Amerikan tonu</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName draft="contributed">stone</displayName>
+				<unitPattern count="one" draft="contributed">{0} stone</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} stone</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>libre</displayName>
+				<unitPattern count="one">{0} libre</unitPattern>
+				<unitPattern count="other">{0} libre</unitPattern>
+				<perUnitPattern>{0}/libre</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ons</displayName>
+				<unitPattern count="one">{0} ons</unitPattern>
+				<unitPattern count="other">{0} ons</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>troy ons</displayName>
+				<unitPattern count="one">{0} troy ons</unitPattern>
+				<unitPattern count="other">{0} troy ons</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="other">{0} karat</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigavat</displayName>
 				<unitPattern count="one">{0} gigavat</unitPattern>
 				<unitPattern count="other">{0} gigavat</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>beygir gücü</displayName>
-				<unitPattern count="one">{0} beygir gücü</unitPattern>
-				<unitPattern count="other">{0} beygir gücü</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilovat</displayName>
-				<unitPattern count="one">{0} kilovat</unitPattern>
-				<unitPattern count="other">{0} kilovat</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>megavat</displayName>
 				<unitPattern count="one">{0} megavat</unitPattern>
 				<unitPattern count="other">{0} megavat</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>milivat</displayName>
-				<unitPattern count="one">{0} milivat</unitPattern>
-				<unitPattern count="other">{0} milivat</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilovat</displayName>
+				<unitPattern count="one">{0} kilovat</unitPattern>
+				<unitPattern count="other">{0} kilovat</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>vat</displayName>
 				<unitPattern count="one">{0} vat</unitPattern>
 				<unitPattern count="other">{0} vat</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>milivat</displayName>
+				<unitPattern count="one">{0} milivat</unitPattern>
+				<unitPattern count="other">{0} milivat</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>beygir gücü</displayName>
+				<unitPattern count="one">{0} beygir gücü</unitPattern>
+				<unitPattern count="other">{0} beygir gücü</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hektopaskal</displayName>
 				<unitPattern count="one">{0} hektopaskal</unitPattern>
 				<unitPattern count="other">{0} hektopaskal</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inç cıva</displayName>
-				<unitPattern count="one">{0} inç cıva</unitPattern>
-				<unitPattern count="other">{0} inç cıva</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>milibar</displayName>
-				<unitPattern count="one">{0} milibar</unitPattern>
-				<unitPattern count="other">{0} milibar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>milimetre cıva</displayName>
 				<unitPattern count="one">{0} milimetre cıva</unitPattern>
@@ -7060,10 +7271,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} libre/inç kare</unitPattern>
 				<unitPattern count="other">{0} libre/inç kare</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>ayar</displayName>
-				<unitPattern count="one">{0} ayar</unitPattern>
-				<unitPattern count="other">{0} ayar</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inç cıva</displayName>
+				<unitPattern count="one">{0} inç cıva</unitPattern>
+				<unitPattern count="other">{0} inç cıva</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>milibar</displayName>
+				<unitPattern count="one">{0} milibar</unitPattern>
+				<unitPattern count="other">{0} milibar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometre/saat</displayName>
@@ -7080,6 +7296,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mil/saat</unitPattern>
 				<unitPattern count="other">{0} mil/saat</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>knot</displayName>
+				<unitPattern count="one">{0} knot</unitPattern>
+				<unitPattern count="other">{0} knot</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>santigrat derece</displayName>
 				<unitPattern count="one">{0} santigrat derece</unitPattern>
@@ -7095,45 +7321,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kelvin</unitPattern>
 				<unitPattern count="other">{0} kelvin</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>akre fit</displayName>
-				<unitPattern count="one">{0} akre fit</unitPattern>
-				<unitPattern count="other">{0} akre fit</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName draft="contributed">buşel</displayName>
-				<unitPattern count="one" draft="contributed">{0} buşel</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} buşel</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>santilitre</displayName>
-				<unitPattern count="one">{0} santilitre</unitPattern>
-				<unitPattern count="other">{0} santilitre</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>santimetreküp</displayName>
-				<unitPattern count="one">{0} santimetreküp</unitPattern>
-				<unitPattern count="other">{0} santimetreküp</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>fit küp</displayName>
-				<unitPattern count="one">{0} fit küp</unitPattern>
-				<unitPattern count="other">{0} fit küp</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>inç küp</displayName>
-				<unitPattern count="one">{0} inç küp</unitPattern>
-				<unitPattern count="other">{0} inç küp</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
-				<displayName>kilometre küp</displayName>
-				<unitPattern count="one">{0} kilometre küp</unitPattern>
-				<unitPattern count="other">{0} kilometre küp</unitPattern>
+				<displayName>kilometreküp</displayName>
+				<unitPattern count="one">{0} kilometreküp</unitPattern>
+				<unitPattern count="other">{0} kilometreküp</unitPattern>
 			</unit>
 			<unit type="volume-cubic-meter">
 				<displayName>metreküp</displayName>
 				<unitPattern count="one">{0} metreküp</unitPattern>
 				<unitPattern count="other">{0} metreküp</unitPattern>
+				<perUnitPattern>{0}/metreküp</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>santimetreküp</displayName>
+				<unitPattern count="one">{0} santimetreküp</unitPattern>
+				<unitPattern count="other">{0} santimetreküp</unitPattern>
+				<perUnitPattern>{0} /santimetreküp</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mil küp</displayName>
@@ -7145,25 +7348,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yarda küp</unitPattern>
 				<unitPattern count="other">{0} yarda küp</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>su bardağı</displayName>
-				<unitPattern count="one">{0} su bardağı</unitPattern>
-				<unitPattern count="other">{0} su bardağı</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>fit küp</displayName>
+				<unitPattern count="one">{0} fit küp</unitPattern>
+				<unitPattern count="other">{0} fit küp</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>desilitre</displayName>
-				<unitPattern count="one">{0} desilitre</unitPattern>
-				<unitPattern count="other">{0} desilitre</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>inç küp</displayName>
+				<unitPattern count="one">{0} inç küp</unitPattern>
+				<unitPattern count="other">{0} inç küp</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>sıvı ons</displayName>
-				<unitPattern count="one">{0} sıvı ons</unitPattern>
-				<unitPattern count="other">{0} sıvı ons</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>galon</displayName>
-				<unitPattern count="one">{0} galon</unitPattern>
-				<unitPattern count="other">{0} galon</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megalitre</displayName>
+				<unitPattern count="one">{0} megalitre</unitPattern>
+				<unitPattern count="other">{0} megalitre</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hektolitre</displayName>
@@ -7174,37 +7372,85 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>litre</displayName>
 				<unitPattern count="one">{0} litre</unitPattern>
 				<unitPattern count="other">{0} litre</unitPattern>
+				<perUnitPattern>{0}/litre</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalitre</displayName>
-				<unitPattern count="one">{0} megalitre</unitPattern>
-				<unitPattern count="other">{0} megalitre</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>desilitre</displayName>
+				<unitPattern count="one">{0} desilitre</unitPattern>
+				<unitPattern count="other">{0} desilitre</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>santilitre</displayName>
+				<unitPattern count="one">{0} santilitre</unitPattern>
+				<unitPattern count="other">{0} santilitre</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mililitre</displayName>
 				<unitPattern count="one">{0} mililitre</unitPattern>
 				<unitPattern count="other">{0} mililitre</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pint</displayName>
-				<unitPattern count="one">{0} pint</unitPattern>
-				<unitPattern count="other">{0} pint</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} metrik pint</unitPattern>
+				<unitPattern count="other">{0} metrik pint</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>akre fit</displayName>
+				<unitPattern count="one">{0} akre fit</unitPattern>
+				<unitPattern count="other">{0} akre fit</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName draft="contributed">buşel</displayName>
+				<unitPattern count="one" draft="contributed">{0} buşel</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} buşel</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galon</displayName>
+				<unitPattern count="one">{0} galon</unitPattern>
+				<unitPattern count="other">{0} galon</unitPattern>
+				<perUnitPattern>{0}/galon</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>quart</displayName>
 				<unitPattern count="one">{0} quart</unitPattern>
 				<unitPattern count="other">{0} quart</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pint</displayName>
+				<unitPattern count="one">{0} pint</unitPattern>
+				<unitPattern count="other">{0} pint</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>su bardağı</displayName>
+				<unitPattern count="one">{0} su bardağı</unitPattern>
+				<unitPattern count="other">{0} su bardağı</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>sıvı ons</displayName>
+				<unitPattern count="one">{0} sıvı ons</unitPattern>
+				<unitPattern count="other">{0} sıvı ons</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>yemek kaşığı</displayName>
 				<unitPattern count="one">{0} yemek kaşığı</unitPattern>
 				<unitPattern count="other">{0} yemek kaşığı</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
-				<displayName>çay kaşığı</displayName>
-				<unitPattern count="one">{0} çay kaşığı</unitPattern>
-				<unitPattern count="other">{0} çay kaşığı</unitPattern>
+				<displayName>tatlı kaşığı</displayName>
+				<unitPattern count="one">{0} tatlı kaşığı</unitPattern>
+				<unitPattern count="other">{0} tatlı kaşığı</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}Doğu</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}Kuzey</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}Güney</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}Batı</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -7220,6 +7466,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/sn²</unitPattern>
 				<unitPattern count="other">{0} m/sn²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>dev</displayName>
+				<unitPattern count="one">{0} dev</unitPattern>
+				<unitPattern count="other">{0} dev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radyan</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>derece</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>dakika</displayName>
 				<unitPattern count="one">{0} dk.</unitPattern>
@@ -7230,30 +7491,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} sn.</unitPattern>
 				<unitPattern count="other">{0} sn.</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>derece</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radyan</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>akre</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hektar</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>akre</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ft²</displayName>
@@ -7261,94 +7534,109 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} ft²</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
-				<displayName draft="contributed">in²</displayName>
-				<unitPattern count="one" draft="contributed">{0} in²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} in²</unitPattern>
+				<displayName>in²</displayName>
+				<unitPattern count="one">{0} in²</unitPattern>
+				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="contributed">km²</displayName>
-				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName draft="contributed">m²</displayName>
-				<unitPattern count="one" draft="contributed">{0} m²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName draft="contributed">mi²</displayName>
-				<unitPattern count="one" draft="contributed">{0} mi²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName draft="contributed">yd²</displayName>
-				<unitPattern count="one" draft="contributed">{0} yd²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>ayar</displayName>
+				<unitPattern count="one">{0} ayar</unitPattern>
+				<unitPattern count="other">{0} ayar</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
 				<unitPattern count="other">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} L/100km</unitPattern>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mil/galon</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bayt</displayName>
-				<unitPattern count="one">{0} bayt</unitPattern>
-				<unitPattern count="other">{0} bayt</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName draft="contributed">Gbit</displayName>
-				<unitPattern count="one" draft="contributed">{0} Gb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kbit</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mbit</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tbit</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tbit</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gbit</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mbit</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kbit</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bayt</displayName>
+				<unitPattern count="one">{0} bayt</unitPattern>
+				<unitPattern count="other">{0} bayt</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>yy</displayName>
+				<unitPattern count="one">{0} yy</unitPattern>
+				<unitPattern count="other">{0} yy</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>yıl</displayName>
+				<unitPattern count="one">{0} yıl</unitPattern>
+				<unitPattern count="other">{0} yıl</unitPattern>
+				<perUnitPattern>{0}/y</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ay</displayName>
+				<unitPattern count="one">{0} ay</unitPattern>
+				<unitPattern count="other">{0} ay</unitPattern>
+				<perUnitPattern>{0}/ay</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>hafta</displayName>
+				<unitPattern count="one">{0} hf.</unitPattern>
+				<unitPattern count="other">{0} hf.</unitPattern>
+				<perUnitPattern>{0}/hf.</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>gün</displayName>
 				<unitPattern count="one">{0} gün</unitPattern>
 				<unitPattern count="other">{0} gün</unitPattern>
+				<perUnitPattern>{0}/gün</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>saat</displayName>
@@ -7356,30 +7644,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} sa.</unitPattern>
 				<perUnitPattern>{0}/sa</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μsn</displayName>
-				<unitPattern count="one">{0} μsn</unitPattern>
-				<unitPattern count="other">{0} μsn</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>milisaniye</displayName>
-				<unitPattern count="one">{0} msn</unitPattern>
-				<unitPattern count="other">{0} msn</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>dakika</displayName>
 				<unitPattern count="one">{0} dk.</unitPattern>
 				<unitPattern count="other">{0} dk.</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>ay</displayName>
-				<unitPattern count="one">{0} ay</unitPattern>
-				<unitPattern count="other">{0} ay</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanosaniye</displayName>
-				<unitPattern count="one">{0} nsn</unitPattern>
-				<unitPattern count="other">{0} nsn</unitPattern>
+				<perUnitPattern>{0}/dk.</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>saniye</displayName>
@@ -7387,15 +7656,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} sn.</unitPattern>
 				<perUnitPattern>{0}/sn</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>hafta</displayName>
-				<unitPattern count="one">{0} hf.</unitPattern>
-				<unitPattern count="other">{0} hf.</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>milisaniye</displayName>
+				<unitPattern count="one">{0} msn</unitPattern>
+				<unitPattern count="other">{0} msn</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>yıl</displayName>
-				<unitPattern count="one">{0} yıl</unitPattern>
-				<unitPattern count="other">{0} yıl</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μsn</displayName>
+				<unitPattern count="one">{0} μsn</unitPattern>
+				<unitPattern count="other">{0} μsn</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosaniye</displayName>
+				<unitPattern count="one">{0} nsn</unitPattern>
+				<unitPattern count="other">{0} nsn</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amper</displayName>
@@ -7417,6 +7691,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -7427,21 +7706,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kcal</unitPattern>
 				<unitPattern count="other">{0} kcal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>jul</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>jul</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -7452,216 +7726,220 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>AU</displayName>
-				<unitPattern count="one">{0} AU</unitPattern>
-				<unitPattern count="other">{0} AU</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>metre</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName draft="contributed">fathom</displayName>
-				<unitPattern count="one" draft="contributed">{0} fm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fm</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>mm</displayName>
+				<unitPattern count="one">{0} mm</unitPattern>
+				<unitPattern count="other">{0} mm</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikron</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nm</displayName>
+				<unitPattern count="one">{0} nm</unitPattern>
+				<unitPattern count="other">{0} nm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>pm</displayName>
+				<unitPattern count="one">{0} pm</unitPattern>
+				<unitPattern count="other">{0} pm</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>mil</displayName>
+				<unitPattern count="one">{0} mil</unitPattern>
+				<unitPattern count="other">{0} mil</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>yarda</displayName>
+				<unitPattern count="one">{0} yd</unitPattern>
+				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
 			<unit type="length-foot">
 				<displayName>fit</displayName>
 				<unitPattern count="one">{0} fit</unitPattern>
 				<unitPattern count="other">{0} fit</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName draft="contributed">furlong</displayName>
-				<unitPattern count="one" draft="contributed">{0} fur</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fur</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
 			</unit>
 			<unit type="length-inch">
 				<displayName>inç</displayName>
 				<unitPattern count="one">{0} inç</unitPattern>
 				<unitPattern count="other">{0} inç</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
 			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
+			<unit type="length-parsec">
+				<displayName>parsek</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
 			</unit>
 			<unit type="length-light-year">
 				<displayName>ışık yılı</displayName>
 				<unitPattern count="one">{0} IY</unitPattern>
 				<unitPattern count="other">{0} IY</unitPattern>
 			</unit>
-			<unit type="length-meter">
-				<displayName>metre</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
+			<unit type="length-astronomical-unit">
+				<displayName>AU</displayName>
+				<unitPattern count="one">{0} AU</unitPattern>
+				<unitPattern count="other">{0} AU</unitPattern>
 			</unit>
-			<unit type="length-micrometer">
-				<displayName draft="contributed">mikron</displayName>
-				<unitPattern count="one" draft="contributed">{0} µm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} µm</unitPattern>
+			<unit type="length-furlong">
+				<displayName draft="contributed">furlong</displayName>
+				<unitPattern count="one" draft="contributed">{0} fur</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fur</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName draft="contributed">mil</displayName>
-				<unitPattern count="one" draft="contributed">{0} mil</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mil</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName draft="contributed">mm</displayName>
-				<unitPattern count="one" draft="contributed">{0} mm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mm</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<displayName draft="contributed">nm</displayName>
-				<unitPattern count="one" draft="contributed">{0} nm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} nm</unitPattern>
+			<unit type="length-fathom">
+				<displayName draft="contributed">fathom</displayName>
+				<unitPattern count="one" draft="contributed">{0} fm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fm</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
-				<displayName draft="contributed">nmi</displayName>
-				<unitPattern count="one" draft="contributed">{0} nmi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} nmi</unitPattern>
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<displayName draft="contributed">parsek</displayName>
-				<unitPattern count="one" draft="contributed">{0} pc</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pc</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName draft="contributed">pm</displayName>
-				<unitPattern count="one" draft="contributed">{0} pm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pm</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<displayName draft="contributed">yarda</displayName>
-				<unitPattern count="one" draft="contributed">{0} yd</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} yd</unitPattern>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
 			</unit>
 			<unit type="light-lux">
 				<displayName>lüks</displayName>
 				<unitPattern count="one">{0} lüks</unitPattern>
 				<unitPattern count="other">{0} lüks</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">{0} ct</unitPattern>
-				<unitPattern count="other">{0} ct</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gram</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ons</displayName>
-				<unitPattern count="one" draft="contributed">{0} oz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>troy ons</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>libre</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="contributed">stone</displayName>
-				<unitPattern count="one" draft="contributed">{0} st</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} st</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>Amerikan tonu</displayName>
 				<unitPattern count="one">{0} kısa ton</unitPattern>
 				<unitPattern count="other">{0} kısa ton</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName draft="contributed">stone</displayName>
+				<unitPattern count="one" draft="contributed">{0} st</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>libre</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>troy ons</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} ct</unitPattern>
+				<unitPattern count="other">{0} ct</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>bg</displayName>
-				<unitPattern count="one">{0} bg</unitPattern>
-				<unitPattern count="other">{0} bg</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>vat</displayName>
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>bg</displayName>
+				<unitPattern count="one">{0} bg</unitPattern>
+				<unitPattern count="other">{0} bg</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -7672,10 +7950,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} lb/in²</unitPattern>
 				<unitPattern count="other">{0} lb/in²</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>ayar</displayName>
-				<unitPattern count="one">{0} ayar</unitPattern>
-				<unitPattern count="other">{0} ayar</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/sa</displayName>
@@ -7692,6 +7975,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mil/sa</unitPattern>
 				<unitPattern count="other">{0} mil/sa</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -7707,36 +8000,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}K</unitPattern>
 				<unitPattern count="other">{0}K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>akre fit</displayName>
-				<unitPattern count="one">{0} akre fit</unitPattern>
-				<unitPattern count="other">{0} akre fit</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName draft="contributed">buşel</displayName>
-				<unitPattern count="one" draft="contributed">{0} bu</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} bu</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>fit³</displayName>
-				<unitPattern count="one">{0} fit³</unitPattern>
-				<unitPattern count="other">{0} fit³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>inç³</displayName>
-				<unitPattern count="one">{0} inç³</unitPattern>
-				<unitPattern count="other">{0} inç³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -7746,6 +8009,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mil³</displayName>
@@ -7757,25 +8027,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yarda³</unitPattern>
 				<unitPattern count="other">{0} yarda³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>su b.</displayName>
-				<unitPattern count="one">{0} sb</unitPattern>
-				<unitPattern count="other">{0} sb</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>fit³</displayName>
+				<unitPattern count="one">{0} fit³</unitPattern>
+				<unitPattern count="other">{0} fit³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>inç³</displayName>
+				<unitPattern count="one">{0} inç³</unitPattern>
+				<unitPattern count="other">{0} inç³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>sıvı ons</displayName>
-				<unitPattern count="one">{0} sıvı ons</unitPattern>
-				<unitPattern count="other">{0} sıvı ons</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>galon</displayName>
-				<unitPattern count="one">{0} galon</unitPattern>
-				<unitPattern count="other">{0} galon</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hl</displayName>
@@ -7786,37 +8051,85 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>litre</displayName>
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-				<unitPattern count="one">{0} Ml</unitPattern>
-				<unitPattern count="other">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>ml</displayName>
 				<unitPattern count="one">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pint</displayName>
-				<unitPattern count="one">{0} pint</unitPattern>
-				<unitPattern count="other">{0} pint</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>akre fit</displayName>
+				<unitPattern count="one">{0} akre fit</unitPattern>
+				<unitPattern count="other">{0} akre fit</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName draft="contributed">buşel</displayName>
+				<unitPattern count="one" draft="contributed">{0} bu</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} bu</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galon</displayName>
+				<unitPattern count="one">{0} galon</unitPattern>
+				<unitPattern count="other">{0} galon</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>quart</displayName>
 				<unitPattern count="one">{0} quart</unitPattern>
 				<unitPattern count="other">{0} quart</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pint</displayName>
+				<unitPattern count="one">{0} pint</unitPattern>
+				<unitPattern count="other">{0} pint</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>su b.</displayName>
+				<unitPattern count="one">{0} sb</unitPattern>
+				<unitPattern count="other">{0} sb</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>sıvı ons</displayName>
+				<unitPattern count="one">{0} sıvı ons</unitPattern>
+				<unitPattern count="other">{0} sıvı ons</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>yk</displayName>
 				<unitPattern count="one">{0} yk</unitPattern>
 				<unitPattern count="other">{0} yk</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
-				<displayName>çk</displayName>
-				<unitPattern count="one">{0} çk</unitPattern>
-				<unitPattern count="other">{0} çk</unitPattern>
+				<displayName>tk</displayName>
+				<unitPattern count="one">{0} tk</unitPattern>
+				<unitPattern count="other">{0} tk</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}D</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}K</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}G</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}B</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -7830,6 +8143,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} m/sn²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} m/sn²</unitPattern>
 			</unit>
+			<unit type="angle-radian">
+				<unitPattern count="one" draft="contributed">{0} rad</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one" draft="contributed">{0}′</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}′</unitPattern>
@@ -7838,26 +8159,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0}″</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<unitPattern count="one" draft="contributed">{0} rad</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one" draft="contributed">{0} ac</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one" draft="contributed">{0} ha</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<unitPattern count="one" draft="contributed">{0} m²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} m²</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<unitPattern count="one" draft="contributed">{0} cm²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} cm²</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<unitPattern count="one" draft="contributed">{0} mi²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one" draft="contributed">{0} ac</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<unitPattern count="one" draft="contributed">{0} yd²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} yd²</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<unitPattern count="one" draft="contributed">{0} ft²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ft²</unitPattern>
@@ -7866,69 +8195,77 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} in²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} in²</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<unitPattern count="one" draft="contributed">{0} m²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<unitPattern count="one" draft="contributed">{0} mi²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<unitPattern count="one" draft="contributed">{0} yd²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<unitPattern count="one" draft="contributed">{0} ayar</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ayar</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="one" draft="contributed">{0} l/km</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} L/100km</unitPattern>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<unitPattern count="one" draft="contributed">{0} mpg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<unitPattern count="one" draft="contributed">{0} bit</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<unitPattern count="one" draft="contributed">{0} byte</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<unitPattern count="one" draft="contributed">{0} Gb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<unitPattern count="one" draft="contributed">{0} GB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<unitPattern count="one" draft="contributed">{0} kb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<unitPattern count="one" draft="contributed">{0} kB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<unitPattern count="one" draft="contributed">{0} Mb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<unitPattern count="one" draft="contributed">{0} MB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MB</unitPattern>
+			<unit type="digital-terabyte">
+				<unitPattern count="one" draft="contributed">{0} TB</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} TB</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<unitPattern count="one" draft="contributed">{0} Tb</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} Tb</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<unitPattern count="one" draft="contributed">{0} TB</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} TB</unitPattern>
+			<unit type="digital-gigabyte">
+				<unitPattern count="one" draft="contributed">{0} GB</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<unitPattern count="one" draft="contributed">{0} Gb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<unitPattern count="one" draft="contributed">{0} MB</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<unitPattern count="one" draft="contributed">{0} Mb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<unitPattern count="one" draft="contributed">{0} kB</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<unitPattern count="one" draft="contributed">{0} kb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<unitPattern count="one" draft="contributed">{0} byte</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<unitPattern count="one" draft="contributed">{0} bit</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>yıl</displayName>
+				<unitPattern count="one">{0}y</unitPattern>
+				<unitPattern count="other">{0}y</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ay</displayName>
+				<unitPattern count="one">{0}a</unitPattern>
+				<unitPattern count="other">{0}a</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>hafta</displayName>
+				<unitPattern count="one">{0}h</unitPattern>
+				<unitPattern count="other">{0}h</unitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>gün</displayName>
@@ -7937,46 +8274,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="duration-hour">
 				<displayName>saat</displayName>
-				<unitPattern count="one">{0}s</unitPattern>
+				<unitPattern count="one">{0} sa</unitPattern>
 				<unitPattern count="other">{0}s</unitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<unitPattern count="one" draft="contributed">{0} μsn</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} μsn</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>msn</displayName>
-				<unitPattern count="one">{0}msn</unitPattern>
-				<unitPattern count="other">{0}msn</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>dakika</displayName>
 				<unitPattern count="one">{0}d</unitPattern>
 				<unitPattern count="other">{0}d</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>ay</displayName>
-				<unitPattern count="one">{0}a</unitPattern>
-				<unitPattern count="other">{0}a</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<unitPattern count="one" draft="contributed">{0} nsn</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} nsn</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>saniye</displayName>
 				<unitPattern count="one">{0}sn</unitPattern>
 				<unitPattern count="other">{0}sn</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>hafta</displayName>
-				<unitPattern count="one">{0}h</unitPattern>
-				<unitPattern count="other">{0}h</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>msn</displayName>
+				<unitPattern count="one">{0}msn</unitPattern>
+				<unitPattern count="other">{0}msn</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>yıl</displayName>
-				<unitPattern count="one">{0}y</unitPattern>
-				<unitPattern count="other">{0}y</unitPattern>
+			<unit type="duration-microsecond">
+				<unitPattern count="one" draft="contributed">{0} μsn</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} μsn</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<unitPattern count="one" draft="contributed">{0} nsn</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} nsn</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<unitPattern count="one" draft="contributed">{0} A</unitPattern>
@@ -7994,6 +8316,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} V</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<unitPattern count="one" draft="contributed">{0} cal</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} cal</unitPattern>
@@ -8002,18 +8328,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<unitPattern count="one" draft="contributed">{0} J</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<unitPattern count="one" draft="contributed">{0} kcal</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<unitPattern count="one" draft="contributed">{0} kJ</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<unitPattern count="one" draft="contributed">{0} J</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<unitPattern count="one" draft="contributed">{0} kWh</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kWh</unitPattern>
@@ -8022,125 +8344,134 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} GHz</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<unitPattern count="one" draft="contributed">{0} Hz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<unitPattern count="one" draft="contributed">{0} MHz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<unitPattern count="one" draft="contributed">{0} kHz</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<unitPattern count="one" draft="contributed">{0} MHz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MHz</unitPattern>
-			</unit>
-			<unit type="length-astronomical-unit">
-				<unitPattern count="one" draft="contributed">{0} AU</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} AU</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<unitPattern count="one" draft="contributed">{0} dm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} dm</unitPattern>
-			</unit>
-			<unit type="length-fathom">
-				<displayName draft="contributed">fathom</displayName>
-				<unitPattern count="one" draft="contributed">{0} fm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one" draft="contributed">{0}′</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}′</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName draft="contributed">furlong</displayName>
-				<unitPattern count="one" draft="contributed">{0} fur</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fur</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one" draft="contributed">{0}″</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
+			<unit type="frequency-hertz">
+				<unitPattern count="one" draft="contributed">{0} Hz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Hz</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
 				<unitPattern count="one">{0} km</unitPattern>
 				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one" draft="contributed">{0} IY</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} IY</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>metre</displayName>
-				<unitPattern count="one" draft="contributed">{0} m</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} m</unitPattern>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<unitPattern count="one" draft="contributed">{0} dm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} dm</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>mm</displayName>
+				<unitPattern count="one">{0} mm</unitPattern>
+				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
 			<unit type="length-micrometer">
 				<unitPattern count="one" draft="contributed">{0} µm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} µm</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one" draft="contributed">{0} mil</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mil</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName draft="contributed">mm</displayName>
-				<unitPattern count="one" draft="contributed">{0} mm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mm</unitPattern>
-			</unit>
 			<unit type="length-nanometer">
 				<unitPattern count="one" draft="contributed">{0} nm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<unitPattern count="one" draft="contributed">{0} nmi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<unitPattern count="one" draft="contributed">{0} pc</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<unitPattern count="one" draft="contributed">{0} pm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one" draft="contributed">{0} mil</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mil</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one" draft="contributed">{0} yd</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<unitPattern count="one" draft="contributed">{0}′</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}′</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one" draft="contributed">{0}″</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<unitPattern count="one" draft="contributed">{0} pc</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one" draft="contributed">{0} IY</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} IY</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<unitPattern count="one" draft="contributed">{0} AU</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} AU</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName draft="contributed">furlong</displayName>
+				<unitPattern count="one" draft="contributed">{0} fur</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fur</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName draft="contributed">fathom</displayName>
+				<unitPattern count="one" draft="contributed">{0} fm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fm</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<unitPattern count="one" draft="contributed">{0} nmi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} nmi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<unitPattern count="one" draft="contributed">{0} lüks</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} lüks</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<unitPattern count="one" draft="contributed">{0} ct</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ct</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gram</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+			<unit type="mass-metric-ton">
+				<unitPattern count="one" draft="contributed">{0} t</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} t</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="one">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-metric-ton">
-				<unitPattern count="one" draft="contributed">{0} t</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} t</unitPattern>
+			<unit type="mass-gram">
+				<displayName>gram</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<unitPattern count="one" draft="contributed">{0} mg</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mg</unitPattern>
 			</unit>
 			<unit type="mass-microgram">
 				<unitPattern count="one" draft="contributed">{0} µg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} µg</unitPattern>
 			</unit>
-			<unit type="mass-milligram">
-				<unitPattern count="one" draft="contributed">{0} mg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mg</unitPattern>
+			<unit type="mass-ton">
+				<unitPattern count="one" draft="contributed">{0} kısa ton</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kısa ton</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName draft="contributed">stone</displayName>
+				<unitPattern count="one" draft="contributed">{0} st</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<unitPattern count="one" draft="contributed">{0} lb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} lb</unitPattern>
 			</unit>
 			<unit type="mass-ounce">
 				<unitPattern count="one" draft="contributed">{0} oz</unitPattern>
@@ -8150,55 +8481,38 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} oz t</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} oz t</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<unitPattern count="one" draft="contributed">{0} lb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} lb</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="contributed">stone</displayName>
-				<unitPattern count="one" draft="contributed">{0} st</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} st</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<unitPattern count="one" draft="contributed">{0} kısa ton</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} kısa ton</unitPattern>
+			<unit type="mass-carat">
+				<unitPattern count="one" draft="contributed">{0} ct</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ct</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<unitPattern count="one" draft="contributed">{0} GW</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one" draft="contributed">{0} hp</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} hp</unitPattern>
+			<unit type="power-megawatt">
+				<unitPattern count="one" draft="contributed">{0} MW</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} MW</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one" draft="contributed">{0} kW</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kW</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<unitPattern count="one" draft="contributed">{0} MW</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} MW</unitPattern>
+			<unit type="power-watt">
+				<unitPattern count="one" draft="contributed">{0} W</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} W</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<unitPattern count="one" draft="contributed">{0} mW</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mW</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<unitPattern count="one" draft="contributed">{0} W</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} W</unitPattern>
+			<unit type="power-horsepower">
+				<unitPattern count="one" draft="contributed">{0} hp</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} hp</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one" draft="contributed">{0} hPa</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<unitPattern count="one" draft="contributed">{0}&quot; Hg</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}&quot; Hg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<unitPattern count="one" draft="contributed">{0} mb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} mb</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<unitPattern count="one" draft="contributed">{0} mm Hg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mm Hg</unitPattern>
@@ -8207,9 +8521,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} lb/in²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} lb/in²</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<unitPattern count="one" draft="contributed">{0} ayar</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ayar</unitPattern>
+			<unit type="pressure-inch-hg">
+				<unitPattern count="one" draft="contributed">{0}&quot; Hg</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}&quot; Hg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<unitPattern count="one" draft="contributed">{0} mb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} mb</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/sa</displayName>
@@ -8237,31 +8555,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0}°K</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}°K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<unitPattern count="one" draft="contributed">{0} akre fit</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} akre fit</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName draft="contributed">buşel</displayName>
-				<unitPattern count="one" draft="contributed">{0} bu</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} bu</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<unitPattern count="one" draft="contributed">{0} cl</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<unitPattern count="one" draft="contributed">{0} cm³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<unitPattern count="one" draft="contributed">{0} fit³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} fit³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<unitPattern count="one" draft="contributed">{0} inç³</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} inç³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<unitPattern count="one" draft="contributed">{0} km³</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} km³</unitPattern>
@@ -8270,6 +8563,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} m³</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} m³</unitPattern>
 			</unit>
+			<unit type="volume-cubic-centimeter">
+				<unitPattern count="one" draft="contributed">{0} cm³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cm³</unitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<unitPattern count="one" draft="contributed">{0} mi³</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} mi³</unitPattern>
@@ -8278,21 +8575,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} yarda³</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} yarda³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<unitPattern count="one" draft="contributed">{0} sb</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} sb</unitPattern>
+			<unit type="volume-cubic-foot">
+				<unitPattern count="one" draft="contributed">{0} fit³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fit³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<unitPattern count="one" draft="contributed">{0} dl</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} dl</unitPattern>
+			<unit type="volume-cubic-inch">
+				<unitPattern count="one" draft="contributed">{0} inç³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} inç³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<unitPattern count="one" draft="contributed">{0} sıvı ons</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} sıvı ons</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<unitPattern count="one" draft="contributed">{0} galon</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} galon</unitPattern>
+			<unit type="volume-megaliter">
+				<unitPattern count="one" draft="contributed">{0} Ml</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Ml</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<unitPattern count="one" draft="contributed">{0} hl</unitPattern>
@@ -8303,22 +8596,47 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<unitPattern count="one" draft="contributed">{0} Ml</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Ml</unitPattern>
+			<unit type="volume-deciliter">
+				<unitPattern count="one" draft="contributed">{0} dl</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<unitPattern count="one" draft="contributed">{0} cl</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cl</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<unitPattern count="one" draft="contributed">{0} ml</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ml</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<unitPattern count="one" draft="contributed">{0} pint</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} pint</unitPattern>
+			<unit type="volume-acre-foot">
+				<unitPattern count="one" draft="contributed">{0} akre fit</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} akre fit</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName draft="contributed">buşel</displayName>
+				<unitPattern count="one" draft="contributed">{0} bu</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} bu</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<unitPattern count="one" draft="contributed">{0} galon</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} galon</unitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<unitPattern count="one" draft="contributed">{0} quart</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} quart</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<unitPattern count="one" draft="contributed">{0} pint</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} pint</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<unitPattern count="one" draft="contributed">{0} sb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} sb</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<unitPattern count="one" draft="contributed">{0} sıvı ons</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} sıvı ons</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<unitPattern count="one" draft="contributed">{0} yk</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} yk</unitPattern>
@@ -8327,6 +8645,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one" draft="contributed">{0} çk</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} çk</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}D</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}K</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}G</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}B</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tr_CY.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tr_CY.xml
new file mode 100644
index 00000000000..dc3f0df9904
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tr_CY.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 11914 $"/>
+		<language type="tr"/>
+		<territory type="CY"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>h:mm:ss a zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>h:mm:ss a z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>h:mm:ss a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>h:mm a</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/tr_TR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tr_TR.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/tr_TR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tr_TR.xml
index 8752d37c4a3..f74f0576569 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/tr_TR.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tr_TR.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="tr"/>
 		<territory type="TR"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/twq.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/twq.xml
similarity index 95%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/twq.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/twq.xml
index febc368ca00..c50132207f6 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/twq.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/twq.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="twq"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angiiya</territory>
 			<territory type="AL">Albaani</territory>
 			<territory type="AM">Armeeni</territory>
-			<territory type="AN">Hollandu Antiiyey Laboo</territory>
 			<territory type="AO">Angoola</territory>
 			<territory type="AR">Argentine</territory>
 			<territory type="AS">Ameriki Samoa</territory>
@@ -449,6 +447,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">Subbaahi</dayPeriod>
+							<dayPeriod type="pm">Zaarikay b</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">Subbaahi</dayPeriod>
 							<dayPeriod type="pm">Zaarikay b</dayPeriod>
@@ -598,6 +600,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">0K¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -777,3 +795,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/twq_NE.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/twq_NE.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/twq_NE.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/twq_NE.xml
index ccf4826caa3..2d5fbd5cb7f 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/twq_NE.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/twq_NE.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="twq"/>
 		<territory type="NE"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/tzm.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tzm.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/tzm.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tzm.xml
index 43e2b754930..29c246ab47f 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/tzm.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tzm.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11042 $"/>
-		<generation date="$Date: 2014-10-31 12:11:19 -0500 (Fri, 31 Oct 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="tzm"/>
 	</identity>
 	<localeDisplayNames>
@@ -50,7 +49,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ta">Tatamilt</language>
 			<language type="th">Taṭayt</language>
 			<language type="tr">Taturkit</language>
-			<language type="tzm">Tamaziɣt</language>
+			<language type="tzm">Tamaziɣt n laṭlaṣ</language>
 			<language type="uk">Tukranit</language>
 			<language type="ur">Turdut</language>
 			<language type="vi">Taviṭnamit</language>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angwilla</territory>
 			<territory type="AL">Albanya</territory>
 			<territory type="AM">Arminya</territory>
-			<territory type="AN">Antil Tihulanḍiyyin</territory>
 			<territory type="AO">Angula</territory>
 			<territory type="AR">Arjuntin</territory>
 			<territory type="AS">Samwa Imirikaniyyin</territory>
@@ -448,6 +446,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">Zdat azal</dayPeriod>
+							<dayPeriod type="pm">Ḍeffir aza</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">Zdat azal</dayPeriod>
 							<dayPeriod type="pm">Ḍeffir aza</dayPeriod>
@@ -486,28 +488,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
 				<dateTimeFormats>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
@@ -585,6 +565,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0K ¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0K ¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00K ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K ¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000K ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K ¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0M ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M ¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00M ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M ¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000M ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M ¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0G ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G ¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00G ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G ¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000G ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0T ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00T ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000T ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -764,3 +772,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/tzm_Latn_MA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tzm_MA.xml
similarity index 65%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/tzm_Latn_MA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tzm_MA.xml
index 49375040a1b..10aec7fb7e8 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/tzm_Latn_MA.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tzm_MA.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="tzm"/>
-		<script type="Latn"/>
 		<territory type="MA"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ug.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ug.xml
similarity index 97%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ug.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ug.xml
index 327628b3137..2348c6f1425 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ug.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ug.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Science Association http://ukij.org
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12313 $"/>
 		<language type="ug"/>
 	</identity>
 	<localeDisplayNames>
@@ -449,8 +448,8 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 			<language type="sux" draft="contributed">سۈمەرچە</language>
 			<language type="sv" draft="contributed">شۋېدچە</language>
 			<language type="sw" draft="contributed">سىۋالىچە</language>
+			<language type="sw_CD">كونگو سىۋالىچە</language>
 			<language type="swb" draft="contributed">كومورىچە</language>
-			<language type="swc" draft="contributed">كونگو سىۋالىچە</language>
 			<language type="syc" draft="contributed">كلاسسىك سۈرىيەچە</language>
 			<language type="syr" draft="contributed">سۈرىيەچە</language>
 			<language type="ta" draft="contributed">تامىلچە</language>
@@ -1045,97 +1044,97 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 			<key type="numbers" draft="contributed">سان</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers" draft="contributed">ئەرەبچە-ھىندىچە رەقەملەر</type>
-			<type type="arabext" key="numbers" draft="contributed">كېڭەيتىلگەن ئەرەبچە-ھىندىچە رەقەملەر</type>
-			<type type="armn" key="numbers" draft="contributed">ئەرمەنچە رەقەملەر</type>
-			<type type="armnlow" key="numbers" draft="contributed">ئەرەبچە رەقەملەر (كىچىك ھەرپ)</type>
-			<type type="bali" key="numbers" draft="contributed">بالىچە رەقەملەر</type>
-			<type type="beng" key="numbers" draft="contributed">بېنگالچە رەقەملەر</type>
-			<type type="big5han" key="collation" draft="contributed">مۇرەككەپ خەنچە تىزىش تەرتىپى - Big5</type>
-			<type type="brah" key="numbers" draft="contributed">بىراخمىچە رەقەملەر</type>
-			<type type="buddhist" key="calendar" draft="contributed">بۇددا يىلنامەسى</type>
-			<type type="cakm" key="numbers" draft="contributed">چاكماچە رەقەملەر</type>
-			<type type="cham" key="numbers" draft="contributed">چامچە رەقەملەر</type>
-			<type type="chinese" key="calendar" draft="contributed">دېھقانلار يىلنامەسى</type>
-			<type type="coptic" key="calendar" draft="contributed">كوپتىك يىلنامەسى</type>
-			<type type="dangi" key="calendar" draft="contributed">دانگى يىلنامەسى</type>
-			<type type="deva" key="numbers" draft="contributed">دېۋاناگارىچە رەقەملەر</type>
-			<type type="dictionary" key="collation" draft="contributed">لۇغەت تىزىش تەرتىپى</type>
-			<type type="ducet" key="collation" draft="contributed">كۆڭۈلدىكى يۇنىكود تىزىش تەرتىپى</type>
-			<type type="eor" key="collation" draft="contributed">ياۋروپا تەرتىپلەش قائىدىسى</type>
-			<type type="ethi" key="numbers" draft="contributed">ئېفىيوپىيەچە رەقەملەر</type>
-			<type type="ethiopic" key="calendar" draft="contributed">ئېفىيوپىيە يىلنامەسى</type>
-			<type type="ethiopic-amete-alem" key="calendar" draft="contributed">ئېفىيوپىيە ئامېتې ئالېم يىلنامەسى</type>
-			<type type="fullwide" key="numbers" draft="contributed">تولۇق كەڭلىكتىكى رەقەملەر</type>
-			<type type="gb2312han" key="collation" draft="contributed">ئاددىي خەنچە تىزىش تەرتىپى - GB2312</type>
-			<type type="geor" key="numbers" draft="contributed">گىرۇزىنچە رەقەملەر</type>
-			<type type="gregorian" key="calendar" draft="contributed">مىلادىيە يىلنامەسى</type>
-			<type type="grek" key="numbers" draft="contributed">گىرېكچە رەقەملەر</type>
-			<type type="greklow" key="numbers" draft="contributed">گىرېكچە رەقەملەر (كىچىك ھەرپ)</type>
-			<type type="gujr" key="numbers" draft="contributed">گۇجاراتچە رەقەملەر</type>
-			<type type="guru" key="numbers" draft="contributed">گۇرمۇكىچە رەقەملەر</type>
-			<type type="hanidec" key="numbers" draft="contributed">خەنچە ئونلۇق رەقەملەر</type>
-			<type type="hans" key="numbers" draft="contributed">ئاددىي خەنچە رەقەملەر</type>
-			<type type="hansfin" key="numbers" draft="contributed">ئاددىي خەنچە پۇل-مۇئامىلە رەقەملەر</type>
-			<type type="hant" key="numbers" draft="contributed">مۇرەككەپ خەنچە رەقەملەر</type>
-			<type type="hantfin" key="numbers" draft="contributed">مۇرەككەپ خەنچە پۇل-مۇئامىلە رەقەملەر</type>
-			<type type="hebr" key="numbers" draft="contributed">ئىبرانىچە رەقەملەر</type>
-			<type type="hebrew" key="calendar" draft="contributed">يەھۇدى يىلنامەسى</type>
-			<type type="indian" key="calendar" draft="contributed">ھىندىستان دۆلەت يىلنامەسى</type>
-			<type type="islamic" key="calendar" draft="contributed">ئىسلام ھىجرىيە يىلنامەسى</type>
-			<type type="islamic-civil" key="calendar" draft="contributed">ئىسلام ھىجرىيە يىلنامەسى (مەدىنە)</type>
-			<type type="islamic-rgsa" key="calendar" draft="contributed">ئىسلام ھىجرىيە يىلنامەسى (سەئۇدى ئەرەبىستان ئاي)</type>
-			<type type="islamic-tbla" key="calendar" draft="contributed">ئىسلام ھىجرىيە يىلنامەسى (ئاسترونومىيە دەۋرى)</type>
-			<type type="islamic-umalqura" key="calendar" draft="contributed">ئىسلام ھىجرىيە يىلنامەسى (ئۇم ئەلقۇرا)</type>
-			<type type="iso8601" key="calendar" draft="contributed">ISO-8601 يىلنامەسى</type>
-			<type type="japanese" key="calendar" draft="contributed">ياپونىيە يىلنامەسى</type>
-			<type type="java" key="numbers" draft="contributed">ياۋاچە رەقەملەر</type>
-			<type type="jpan" key="numbers" draft="contributed">ياپونچە رەقەملەر</type>
-			<type type="jpanfin" key="numbers" draft="contributed">ياپونچە پۇل-مۇئامىلە رەقەملەر</type>
-			<type type="kali" key="numbers" draft="contributed">كاياھچە رەقەملەر</type>
-			<type type="khmr" key="numbers" draft="contributed">كېخمېرچە رەقەملەر</type>
-			<type type="knda" key="numbers" draft="contributed">كانناداچە رەقەملەر</type>
-			<type type="lana" key="numbers" draft="contributed">تاي تامچە خورا رەقەملەر</type>
-			<type type="lanatham" key="numbers" draft="contributed">تاي تامچە تام رەقەملەر</type>
-			<type type="laoo" key="numbers" draft="contributed">لائوسچە رەقەملەر</type>
-			<type type="latn" key="numbers" draft="contributed">غەربچە رەقەملەر</type>
-			<type type="lepc" key="numbers" draft="contributed">لەپچاچە رەقەملەر</type>
-			<type type="limb" key="numbers" draft="contributed">لىمبۇچە رەقەملەر</type>
-			<type type="mlym" key="numbers" draft="contributed">مالايالامچە رەقەملەر</type>
-			<type type="mong" key="numbers" draft="contributed">موڭغۇلچە رەقەملەر</type>
-			<type type="mtei" key="numbers" draft="contributed">مانىپۇرىچە رەقەملەر</type>
-			<type type="mymr" key="numbers" draft="contributed">بېرماچە رەقەملەر</type>
-			<type type="mymrshan" key="numbers" draft="contributed">بېرما شانچە رەقەملەر</type>
-			<type type="nkoo" key="numbers" draft="contributed">نىكوچە رەقەملەر</type>
-			<type type="olck" key="numbers" draft="contributed">ئول-چىكىچە رەقەملەر</type>
-			<type type="orya" key="numbers" draft="contributed">ئورىياچە رەقەملەر</type>
-			<type type="osma" key="numbers" draft="contributed">ئوسمانىيە رەقەملەر</type>
-			<type type="persian" key="calendar" draft="contributed">پارىس يىلنامەسى</type>
-			<type type="phonebook" key="collation" draft="contributed">تېلېفون نومۇر تىزىش تەرتىپى</type>
-			<type type="pinyin" key="collation" draft="contributed">پىنيىن تىزىش تەرتىپى</type>
-			<type type="reformed" key="collation" draft="contributed">ياخشىلانغان تەرتىپلەش تەرتىپى</type>
-			<type type="roc" key="calendar" draft="contributed">مىنگو يىلنامەسى</type>
-			<type type="roman" key="numbers" draft="contributed">رىم رەقەملەر</type>
-			<type type="romanlow" key="numbers" draft="contributed">رىم رەقەملەر (كىچىك ھەرپ)</type>
-			<type type="saur" key="numbers" draft="contributed">سائۇراشتىراچە رەقەملەر</type>
-			<type type="search" key="collation" draft="contributed">ئادەتتىكى ئىزدەش</type>
-			<type type="searchjl" key="collation" draft="contributed">كورىيەچە ئۈزۈك تاۋۇش بويىچە ئىزدەش</type>
-			<type type="shrd" key="numbers" draft="contributed">شاراداچە رەقەملەر</type>
-			<type type="sora" key="numbers" draft="contributed">سورا سومپېڭ رەقەملەر</type>
-			<type type="standard" key="collation" draft="contributed">ئۆلچەملىك تەرتىپلەش تەرتىپى</type>
-			<type type="stroke" key="collation" draft="contributed">سىزىق بويىچە تەرتىپلەش</type>
-			<type type="sund" key="numbers" draft="contributed">سۇنداچە رەقەملەر</type>
-			<type type="takr" key="numbers" draft="contributed">تاكرىچە رەقەملەر</type>
-			<type type="talu" key="numbers" draft="contributed">يېڭى تاي-لەچە رەقەملەر</type>
-			<type type="taml" key="numbers" draft="contributed">ئەنئەنىۋى تامىلچە رەقەملەر</type>
-			<type type="tamldec" key="numbers" draft="contributed">تامىلچە رەقەملەر</type>
-			<type type="telu" key="numbers" draft="contributed">تېلۇگۇچە رەقەملەر</type>
-			<type type="thai" key="numbers" draft="contributed">تايلاندچە رەقەملەر</type>
-			<type type="tibt" key="numbers" draft="contributed">تىبەتچە رەقەملەر</type>
-			<type type="traditional" key="collation" draft="contributed">ئەنئەنىۋى تەرتىپلەش تەرتىپى</type>
-			<type type="unihan" key="collation" draft="contributed">يان بۆلەك سىزىق بويچە تەرتىپلەش تەرتىپى</type>
-			<type type="vaii" key="numbers" draft="contributed">ۋايچە رەقەملەر</type>
-			<type type="zhuyin" key="collation" draft="contributed">ترانسكرىپسىيە تەرتىپلەش تەرتىپى</type>
+			<type key="calendar" type="buddhist" draft="contributed">بۇددا يىلنامەسى</type>
+			<type key="calendar" type="chinese" draft="contributed">دېھقانلار يىلنامەسى</type>
+			<type key="calendar" type="coptic" draft="contributed">كوپتىك يىلنامەسى</type>
+			<type key="calendar" type="dangi" draft="contributed">دانگى يىلنامەسى</type>
+			<type key="calendar" type="ethiopic" draft="contributed">ئېفىيوپىيە يىلنامەسى</type>
+			<type key="calendar" type="ethiopic-amete-alem" draft="contributed">ئېفىيوپىيە ئامېتې ئالېم يىلنامەسى</type>
+			<type key="calendar" type="gregorian" draft="contributed">مىلادىيە يىلنامەسى</type>
+			<type key="calendar" type="hebrew" draft="contributed">يەھۇدى يىلنامەسى</type>
+			<type key="calendar" type="indian" draft="contributed">ھىندىستان دۆلەت يىلنامەسى</type>
+			<type key="calendar" type="islamic" draft="contributed">ئىسلام ھىجرىيە يىلنامەسى</type>
+			<type key="calendar" type="islamic-civil" draft="contributed">ئىسلام ھىجرىيە يىلنامەسى (مەدىنە)</type>
+			<type key="calendar" type="islamic-rgsa" draft="contributed">ئىسلام ھىجرىيە يىلنامەسى (سەئۇدى ئەرەبىستان ئاي)</type>
+			<type key="calendar" type="islamic-tbla" draft="contributed">ئىسلام ھىجرىيە يىلنامەسى (ئاسترونومىيە دەۋرى)</type>
+			<type key="calendar" type="islamic-umalqura" draft="contributed">ئىسلام ھىجرىيە يىلنامەسى (ئۇم ئەلقۇرا)</type>
+			<type key="calendar" type="iso8601" draft="contributed">ISO-8601 يىلنامەسى</type>
+			<type key="calendar" type="japanese" draft="contributed">ياپونىيە يىلنامەسى</type>
+			<type key="calendar" type="persian" draft="contributed">پارىس يىلنامەسى</type>
+			<type key="calendar" type="roc" draft="contributed">مىنگو يىلنامەسى</type>
+			<type key="collation" type="big5han" draft="contributed">مۇرەككەپ خەنچە تىزىش تەرتىپى - Big5</type>
+			<type key="collation" type="dictionary" draft="contributed">لۇغەت تىزىش تەرتىپى</type>
+			<type key="collation" type="ducet" draft="contributed">كۆڭۈلدىكى يۇنىكود تىزىش تەرتىپى</type>
+			<type key="collation" type="eor" draft="contributed">ياۋروپا تەرتىپلەش قائىدىسى</type>
+			<type key="collation" type="gb2312han" draft="contributed">ئاددىي خەنچە تىزىش تەرتىپى - GB2312</type>
+			<type key="collation" type="phonebook" draft="contributed">تېلېفون نومۇر تىزىش تەرتىپى</type>
+			<type key="collation" type="pinyin" draft="contributed">پىنيىن تىزىش تەرتىپى</type>
+			<type key="collation" type="reformed" draft="contributed">ياخشىلانغان تەرتىپلەش تەرتىپى</type>
+			<type key="collation" type="search" draft="contributed">ئادەتتىكى ئىزدەش</type>
+			<type key="collation" type="searchjl" draft="contributed">كورىيەچە ئۈزۈك تاۋۇش بويىچە ئىزدەش</type>
+			<type key="collation" type="standard" draft="contributed">ئۆلچەملىك تەرتىپلەش تەرتىپى</type>
+			<type key="collation" type="stroke" draft="contributed">سىزىق بويىچە تەرتىپلەش</type>
+			<type key="collation" type="traditional" draft="contributed">ئەنئەنىۋى تەرتىپلەش تەرتىپى</type>
+			<type key="collation" type="unihan" draft="contributed">يان بۆلەك سىزىق بويچە تەرتىپلەش تەرتىپى</type>
+			<type key="collation" type="zhuyin" draft="contributed">ترانسكرىپسىيە تەرتىپلەش تەرتىپى</type>
+			<type key="numbers" type="arab" draft="contributed">ئەرەبچە-ھىندىچە رەقەملەر</type>
+			<type key="numbers" type="arabext" draft="contributed">كېڭەيتىلگەن ئەرەبچە-ھىندىچە رەقەملەر</type>
+			<type key="numbers" type="armn" draft="contributed">ئەرمەنچە رەقەملەر</type>
+			<type key="numbers" type="armnlow" draft="contributed">ئەرەبچە رەقەملەر (كىچىك ھەرپ)</type>
+			<type key="numbers" type="bali" draft="contributed">بالىچە رەقەملەر</type>
+			<type key="numbers" type="beng" draft="contributed">بېنگالچە رەقەملەر</type>
+			<type key="numbers" type="brah" draft="contributed">بىراخمىچە رەقەملەر</type>
+			<type key="numbers" type="cakm" draft="contributed">چاكماچە رەقەملەر</type>
+			<type key="numbers" type="cham" draft="contributed">چامچە رەقەملەر</type>
+			<type key="numbers" type="deva" draft="contributed">دېۋاناگارىچە رەقەملەر</type>
+			<type key="numbers" type="ethi" draft="contributed">ئېفىيوپىيەچە رەقەملەر</type>
+			<type key="numbers" type="fullwide" draft="contributed">تولۇق كەڭلىكتىكى رەقەملەر</type>
+			<type key="numbers" type="geor" draft="contributed">گىرۇزىنچە رەقەملەر</type>
+			<type key="numbers" type="grek" draft="contributed">گىرېكچە رەقەملەر</type>
+			<type key="numbers" type="greklow" draft="contributed">گىرېكچە رەقەملەر (كىچىك ھەرپ)</type>
+			<type key="numbers" type="gujr" draft="contributed">گۇجاراتچە رەقەملەر</type>
+			<type key="numbers" type="guru" draft="contributed">گۇرمۇكىچە رەقەملەر</type>
+			<type key="numbers" type="hanidec" draft="contributed">خەنچە ئونلۇق رەقەملەر</type>
+			<type key="numbers" type="hans" draft="contributed">ئاددىي خەنچە رەقەملەر</type>
+			<type key="numbers" type="hansfin" draft="contributed">ئاددىي خەنچە پۇل-مۇئامىلە رەقەملەر</type>
+			<type key="numbers" type="hant" draft="contributed">مۇرەككەپ خەنچە رەقەملەر</type>
+			<type key="numbers" type="hantfin" draft="contributed">مۇرەككەپ خەنچە پۇل-مۇئامىلە رەقەملەر</type>
+			<type key="numbers" type="hebr" draft="contributed">ئىبرانىچە رەقەملەر</type>
+			<type key="numbers" type="java" draft="contributed">ياۋاچە رەقەملەر</type>
+			<type key="numbers" type="jpan" draft="contributed">ياپونچە رەقەملەر</type>
+			<type key="numbers" type="jpanfin" draft="contributed">ياپونچە پۇل-مۇئامىلە رەقەملەر</type>
+			<type key="numbers" type="kali" draft="contributed">كاياھچە رەقەملەر</type>
+			<type key="numbers" type="khmr" draft="contributed">كېخمېرچە رەقەملەر</type>
+			<type key="numbers" type="knda" draft="contributed">كانناداچە رەقەملەر</type>
+			<type key="numbers" type="lana" draft="contributed">تاي تامچە خورا رەقەملەر</type>
+			<type key="numbers" type="lanatham" draft="contributed">تاي تامچە تام رەقەملەر</type>
+			<type key="numbers" type="laoo" draft="contributed">لائوسچە رەقەملەر</type>
+			<type key="numbers" type="latn" draft="contributed">غەربچە رەقەملەر</type>
+			<type key="numbers" type="lepc" draft="contributed">لەپچاچە رەقەملەر</type>
+			<type key="numbers" type="limb" draft="contributed">لىمبۇچە رەقەملەر</type>
+			<type key="numbers" type="mlym" draft="contributed">مالايالامچە رەقەملەر</type>
+			<type key="numbers" type="mong" draft="contributed">موڭغۇلچە رەقەملەر</type>
+			<type key="numbers" type="mtei" draft="contributed">مانىپۇرىچە رەقەملەر</type>
+			<type key="numbers" type="mymr" draft="contributed">بېرماچە رەقەملەر</type>
+			<type key="numbers" type="mymrshan" draft="contributed">بېرما شانچە رەقەملەر</type>
+			<type key="numbers" type="nkoo" draft="contributed">نىكوچە رەقەملەر</type>
+			<type key="numbers" type="olck" draft="contributed">ئول-چىكىچە رەقەملەر</type>
+			<type key="numbers" type="orya" draft="contributed">ئورىياچە رەقەملەر</type>
+			<type key="numbers" type="osma" draft="contributed">ئوسمانىيە رەقەملەر</type>
+			<type key="numbers" type="roman" draft="contributed">رىم رەقەملەر</type>
+			<type key="numbers" type="romanlow" draft="contributed">رىم رەقەملەر (كىچىك ھەرپ)</type>
+			<type key="numbers" type="saur" draft="contributed">سائۇراشتىراچە رەقەملەر</type>
+			<type key="numbers" type="shrd" draft="contributed">شاراداچە رەقەملەر</type>
+			<type key="numbers" type="sora" draft="contributed">سورا سومپېڭ رەقەملەر</type>
+			<type key="numbers" type="sund" draft="contributed">سۇنداچە رەقەملەر</type>
+			<type key="numbers" type="takr" draft="contributed">تاكرىچە رەقەملەر</type>
+			<type key="numbers" type="talu" draft="contributed">يېڭى تاي-لەچە رەقەملەر</type>
+			<type key="numbers" type="taml" draft="contributed">ئەنئەنىۋى تامىلچە رەقەملەر</type>
+			<type key="numbers" type="tamldec" draft="contributed">تامىلچە رەقەملەر</type>
+			<type key="numbers" type="telu" draft="contributed">تېلۇگۇچە رەقەملەر</type>
+			<type key="numbers" type="thai" draft="contributed">تايلاندچە رەقەملەر</type>
+			<type key="numbers" type="tibt" draft="contributed">تىبەتچە رەقەملەر</type>
+			<type key="numbers" type="vaii" draft="contributed">ۋايچە رەقەملەر</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric" draft="contributed">مېتىر</measurementSystemName>
@@ -1167,9 +1166,15 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 		<calendars>
 			<calendar type="buddhist">
 				<eras>
+					<eraNames>
+						<era type="0">بۇددا يىلنامەسى</era>
+					</eraNames>
 					<eraAbbr>
-						<era type="0" draft="contributed">بۇددا يىلنامەسى</era>
+						<era type="0">BE</era>
 					</eraAbbr>
+					<eraNarrow>
+						<era type="0">BE</era>
+					</eraNarrow>
 				</eras>
 			</calendar>
 			<calendar type="chinese">
@@ -1409,7 +1414,7 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 							<month type="8" draft="contributed">ئاۋغۇست</month>
 							<month type="9" draft="contributed">سېنتەبىر</month>
 							<month type="10" draft="contributed">ئۆكتەبىر</month>
-							<month type="11" draft="contributed">بويابىر</month>
+							<month type="11" draft="contributed">نويابىر</month>
 							<month type="12" draft="contributed">دېكابىر</month>
 						</monthWidth>
 					</monthContext>
@@ -1438,7 +1443,7 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 							<day type="tue" draft="contributed">سە</day>
 							<day type="wed" draft="contributed">چا</day>
 							<day type="thu" draft="contributed">پە</day>
-							<day type="fri" draft="contributed">چۈ</day>
+							<day type="fri" draft="contributed">جۈ</day>
 							<day type="sat" draft="contributed">شە</day>
 						</dayWidth>
 						<dayWidth type="short">
@@ -1498,14 +1503,16 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am" draft="contributed">AM</dayPeriod>
+							<dayPeriod type="pm" draft="contributed">PM</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am" draft="contributed">چۈشتىن بۇرۇن</dayPeriod>
-							<dayPeriod type="noon" draft="contributed">چۈش</dayPeriod>
 							<dayPeriod type="pm" draft="contributed">چۈشتىن كېيىن</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am" draft="contributed">چۈشتىن بۇرۇن</dayPeriod>
-							<dayPeriod type="noon" draft="contributed">چۈش</dayPeriod>
 							<dayPeriod type="pm" draft="contributed">چۈشتىن كېيىن</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
@@ -1516,11 +1523,11 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 						<era type="1" draft="contributed">مىلادىيە</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0" draft="contributed">مىلادىيەدىن بۇرۇن</era>
+						<era type="0">BCE</era>
 						<era type="1" draft="contributed">مىلادىيە</era>
 					</eraAbbr>
 					<eraNarrow>
-						<era type="0" draft="contributed">مىلادىيەدىن بۇرۇن</era>
+						<era type="0">BCE</era>
 						<era type="1" draft="contributed">مىلادىيە</era>
 					</eraNarrow>
 				</eras>
@@ -1828,9 +1835,13 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 			</calendar>
 			<calendar type="roc">
 				<eras>
+					<eraNames>
+						<era type="0">جۇڭخۇا مىنگودىن بۇرۇن</era>
+						<era type="1">مىنگو</era>
+					</eraNames>
 					<eraAbbr>
-						<era type="0" draft="contributed">جۇڭخۇا مىنگودىن بۇرۇن</era>
-						<era type="1" draft="contributed">مىنگو</era>
+						<era type="0">Before R.O.C.</era>
+						<era type="1">مىنگو</era>
 					</eraAbbr>
 				</eras>
 			</calendar>
@@ -3063,6 +3074,34 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 					<pattern draft="contributed">¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤0مىڭ</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤0مىڭ</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤00مىڭ</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00مىڭ</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤000مىڭ</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000مىڭ</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤0مىليون</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0مىليون</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤00مىليون</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00مىليون</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤000مىليون</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000مىليون</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤0مىليارد</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0مىليارد</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤00مىليارد</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00مىليارد</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤000مىليارد</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000مىليارد</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
 			<unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4574,26 +4613,16 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 				<unitPattern count="one" draft="contributed">{0} گىرادۇس</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} گىرادۇس</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName draft="provisional">ئىنگلىز موسى</displayName>
-				<unitPattern count="one" draft="contributed">{0} ئىنگلىز موسى</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ئىنگلىز موسى</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName draft="provisional">كۋادرات كىلومېتىر</displayName>
+				<unitPattern count="one" draft="contributed">{0} كۋادرات كىلومېتىر</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كۋادرات كىلومېتىر</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName draft="provisional">hectares</displayName>
 				<unitPattern count="one" draft="contributed">{0} گېكتار</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} hectares</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<displayName draft="provisional">كۋادرات فۇت</displayName>
-				<unitPattern count="one" draft="contributed">{0} كۋادرات فۇت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كۋادرات فۇت</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="provisional">كۋادرات كىلومېتىر</displayName>
-				<unitPattern count="one" draft="contributed">{0} كۋادرات كىلومېتىر</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كۋادرات كىلومېتىر</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<displayName draft="provisional">كۋادرات مېتىر</displayName>
 				<unitPattern count="one" draft="contributed">{0} كۋادرات مېتىر</unitPattern>
@@ -4604,6 +4633,31 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 				<unitPattern count="one" draft="contributed">{0} كۋادرات مىل</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} كۋادرات مىل</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<displayName draft="provisional">ئىنگلىز موسى</displayName>
+				<unitPattern count="one" draft="contributed">{0} ئىنگلىز موسى</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ئىنگلىز موسى</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName draft="provisional">كۋادرات فۇت</displayName>
+				<unitPattern count="one" draft="contributed">{0} كۋادرات فۇت</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كۋادرات فۇت</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="provisional">يىل</displayName>
+				<unitPattern count="one" draft="contributed">{0} يىل</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} يىل</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="provisional">ئاي</displayName>
+				<unitPattern count="one" draft="contributed">{0} ئاي</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ئاي</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="provisional">ھەپتە</displayName>
+				<unitPattern count="one" draft="contributed">{0} ھەپتە</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ھەپتە</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">كۈن</displayName>
 				<unitPattern count="one" draft="contributed">{0} كۈن</unitPattern>
@@ -4614,70 +4668,35 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 				<unitPattern count="one" draft="contributed">{0} سائەت</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} سائەت</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="provisional">مىللى سېكۇنت</displayName>
-				<unitPattern count="one" draft="contributed">{0} مىللى سېكۇنت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} مىللى سېكۇنت</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="provisional">مىنۇت</displayName>
 				<unitPattern count="one" draft="contributed">{0} مىنۇت</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} مىنۇت</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">ئاي</displayName>
-				<unitPattern count="one" draft="contributed">{0} ئاي</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ئاي</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="provisional">سېكۇنت</displayName>
 				<unitPattern count="one" draft="contributed">{0} سېكۇنت</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} سېكۇنت</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">ھەپتە</displayName>
-				<unitPattern count="one" draft="contributed">{0} ھەپتە</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ھەپتە</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">يىل</displayName>
-				<unitPattern count="one" draft="contributed">{0} يىل</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} يىل</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="provisional">سانتىمېتىر</displayName>
-				<unitPattern count="one" draft="contributed">{0} سانتىمېتىر</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} سانتىمېتىر</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="provisional">فۇت</displayName>
-				<unitPattern count="one" draft="contributed">{0} فۇت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} فۇت</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="provisional">ديۇيم</displayName>
-				<unitPattern count="one" draft="contributed">{0} ديۇيم</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ديۇيم</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="provisional">مىللى سېكۇنت</displayName>
+				<unitPattern count="one" draft="contributed">{0} مىللى سېكۇنت</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} مىللى سېكۇنت</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="provisional">كىلومېتىر</displayName>
 				<unitPattern count="one" draft="contributed">{0} كىلومېتىر</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} كىلومېتىر</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<displayName draft="provisional">يورۇقلۇق يىلى</displayName>
-				<unitPattern count="one" draft="contributed">{0} يورۇقلۇق يىلى</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} يورۇقلۇق يىلى</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName draft="provisional">مېتىر</displayName>
 				<unitPattern count="one" draft="contributed">{0} مېتىر</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} مېتىر</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName draft="provisional">مىل</displayName>
-				<unitPattern count="one" draft="contributed">{0} مىل</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} مىل</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="provisional">سانتىمېتىر</displayName>
+				<unitPattern count="one" draft="contributed">{0} سانتىمېتىر</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} سانتىمېتىر</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="provisional">مىللىمېتىر</displayName>
@@ -4689,35 +4708,50 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 				<unitPattern count="one" draft="contributed">{0} پىكومېتىر</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} پىكومېتىر</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="provisional">مىل</displayName>
+				<unitPattern count="one" draft="contributed">{0} مىل</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} مىل</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName draft="provisional">يارد</displayName>
 				<unitPattern count="one" draft="contributed">{0} يارد</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} يارد</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="provisional">گرام</displayName>
-				<unitPattern count="one" draft="contributed">{0} گرام</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} گرام</unitPattern>
+			<unit type="length-foot">
+				<displayName draft="provisional">فۇت</displayName>
+				<unitPattern count="one" draft="contributed">{0} فۇت</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} فۇت</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="provisional">ديۇيم</displayName>
+				<unitPattern count="one" draft="contributed">{0} ديۇيم</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ديۇيم</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="provisional">يورۇقلۇق يىلى</displayName>
+				<unitPattern count="one" draft="contributed">{0} يورۇقلۇق يىلى</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} يورۇقلۇق يىلى</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="provisional">كىلوگرام</displayName>
 				<unitPattern count="one" draft="contributed">{0} كىلوگرام</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} كىلوگرام</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="provisional">ئۇنسىيە</displayName>
-				<unitPattern count="one" draft="contributed">{0} ئۇنسىيە</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ئۇنسىيە</unitPattern>
+			<unit type="mass-gram">
+				<displayName draft="provisional">گرام</displayName>
+				<unitPattern count="one" draft="contributed">{0} گرام</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} گرام</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<displayName draft="provisional">قاداق</displayName>
 				<unitPattern count="one" draft="contributed">{0} قاداق</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} قاداق</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="provisional">ئات كۈچى</displayName>
-				<unitPattern count="one" draft="contributed">{0} ئات كۈچى</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ئات كۈچى</unitPattern>
+			<unit type="mass-ounce">
+				<displayName draft="provisional">ئۇنسىيە</displayName>
+				<unitPattern count="one" draft="contributed">{0} ئۇنسىيە</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ئۇنسىيە</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName draft="provisional">كىلوۋات</displayName>
@@ -4729,6 +4763,11 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 				<unitPattern count="one" draft="contributed">{0} ۋات</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ۋات</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<displayName draft="provisional">ئات كۈچى</displayName>
+				<unitPattern count="one" draft="contributed">{0} ئات كۈچى</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ئات كۈچى</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="provisional">يۈز پاسكال</displayName>
 				<unitPattern count="one" draft="contributed">{0} يۈز پاسكال</unitPattern>
@@ -4799,26 +4838,16 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 				<unitPattern count="one" draft="contributed">{0} گىرادۇس</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} گىرادۇس</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName draft="provisional">ئىنگلىز موسى</displayName>
-				<unitPattern count="one" draft="contributed">{0} ئىنگلىز موسى</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ئىنگلىز موسى</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName draft="provisional">كۋادرات كىلومېتىر</displayName>
+				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName draft="provisional">hectares</displayName>
 				<unitPattern count="one" draft="contributed">{0} گېكتار</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} گېكتار</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<displayName draft="provisional">كۋادرات فۇت</displayName>
-				<unitPattern count="one" draft="contributed">{0} كۋادرات فۇت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} كۋادرات فۇت</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="provisional">كۋادرات كىلومېتىر</displayName>
-				<unitPattern count="one" draft="contributed">{0} km²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<displayName draft="provisional">كۋادرات مېتىر</displayName>
 				<unitPattern count="one" draft="contributed">{0} m²</unitPattern>
@@ -4829,6 +4858,31 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 				<unitPattern count="one" draft="contributed">{0} كۋادرات مىل</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} كۋادرات مىل</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<displayName draft="provisional">ئىنگلىز موسى</displayName>
+				<unitPattern count="one" draft="contributed">{0} ئىنگلىز موسى</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ئىنگلىز موسى</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName draft="provisional">كۋادرات فۇت</displayName>
+				<unitPattern count="one" draft="contributed">{0} كۋادرات فۇت</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كۋادرات فۇت</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="provisional">يىل</displayName>
+				<unitPattern count="one" draft="contributed">{0} يىل</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} يىل</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="provisional">ئاي</displayName>
+				<unitPattern count="one" draft="contributed">{0} ئاي</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ئاي</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="provisional">ھەپتە</displayName>
+				<unitPattern count="one" draft="contributed">{0} ھەپتە</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ھەپتە</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">كۈن</displayName>
 				<unitPattern count="one" draft="contributed">{0} كۈن</unitPattern>
@@ -4839,70 +4893,35 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 				<unitPattern count="one" draft="contributed">{0} سائەت</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} سائەت</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="provisional">مىللى سېكۇنت</displayName>
-				<unitPattern count="one" draft="contributed">{0} مىللىسېكۇنت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} مىللىسېكۇنت</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="provisional">مىنۇت</displayName>
 				<unitPattern count="one" draft="contributed">{0} مىنۇت</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} مىنۇت</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">ئاي</displayName>
-				<unitPattern count="one" draft="contributed">{0} ئاي</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ئاي</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="provisional">سېكۇنت</displayName>
 				<unitPattern count="one" draft="contributed">{0} سېكۇنت</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} سېكۇنت</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">ھەپتە</displayName>
-				<unitPattern count="one" draft="contributed">{0} ھەپتە</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ھەپتە</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">يىل</displayName>
-				<unitPattern count="one" draft="contributed">{0} يىل</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} يىل</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="provisional">سانتىمېتىر</displayName>
-				<unitPattern count="one" draft="contributed">{0} سانتىمېتىر</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} سانتىمېتىر</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="provisional">فۇت</displayName>
-				<unitPattern count="one" draft="contributed">{0} پۇت</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} پۇت</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="provisional">ديۇيم</displayName>
-				<unitPattern count="one" draft="contributed">{0} ئىنگلىز چىسى</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ئىنگلىز چىسى</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="provisional">مىللى سېكۇنت</displayName>
+				<unitPattern count="one" draft="contributed">{0} مىللىسېكۇنت</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} مىللىسېكۇنت</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="provisional">كىلومېتىر</displayName>
 				<unitPattern count="one" draft="contributed">{0} كىلومېتىر</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} كىلومېتىر</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<displayName draft="provisional">يورۇقلۇق يىلى</displayName>
-				<unitPattern count="one" draft="contributed">{0} يورۇقلۇق يىلى</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} يورۇقلۇق يىلى</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName draft="provisional">مېتىر</displayName>
 				<unitPattern count="one" draft="contributed">{0} مېتىر</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} مېتىر</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName draft="provisional">مىل</displayName>
-				<unitPattern count="one" draft="contributed">{0} مىل</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} مىل</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="provisional">سانتىمېتىر</displayName>
+				<unitPattern count="one" draft="contributed">{0} سانتىمېتىر</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} سانتىمېتىر</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="provisional">مىللىمېتىر</displayName>
@@ -4914,35 +4933,50 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 				<unitPattern count="one" draft="contributed">{0} پىكومېتىر</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} پىكومېتىر</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="provisional">مىل</displayName>
+				<unitPattern count="one" draft="contributed">{0} مىل</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} مىل</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName draft="provisional">يارد</displayName>
 				<unitPattern count="one" draft="contributed">{0} يارد</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} يارد</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="provisional">گرام</displayName>
-				<unitPattern count="one" draft="contributed">{0} g</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} g</unitPattern>
+			<unit type="length-foot">
+				<displayName draft="provisional">فۇت</displayName>
+				<unitPattern count="one" draft="contributed">{0} پۇت</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} پۇت</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="provisional">ديۇيم</displayName>
+				<unitPattern count="one" draft="contributed">{0} ئىنگلىز چىسى</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ئىنگلىز چىسى</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="provisional">يورۇقلۇق يىلى</displayName>
+				<unitPattern count="one" draft="contributed">{0} يورۇقلۇق يىلى</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} يورۇقلۇق يىلى</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="provisional">كىلوگرام</displayName>
 				<unitPattern count="one" draft="contributed">{0} kg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="provisional">ئۇنسىيە</displayName>
-				<unitPattern count="one" draft="contributed">{0} ئۇنسىيە</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ئۇنسىيە</unitPattern>
+			<unit type="mass-gram">
+				<displayName draft="provisional">گرام</displayName>
+				<unitPattern count="one" draft="contributed">{0} g</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<displayName draft="provisional">قاداق</displayName>
 				<unitPattern count="one" draft="contributed">{0} قاداق</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} قاداق</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="provisional">ئات كۈچى</displayName>
-				<unitPattern count="one" draft="contributed">{0} ئات كۈچى</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ئات كۈچى</unitPattern>
+			<unit type="mass-ounce">
+				<displayName draft="provisional">ئۇنسىيە</displayName>
+				<unitPattern count="one" draft="contributed">{0} ئۇنسىيە</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ئۇنسىيە</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName draft="provisional">كىلوۋات</displayName>
@@ -4954,6 +4988,11 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 				<unitPattern count="one" draft="contributed">{0} W</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<displayName draft="provisional">ئات كۈچى</displayName>
+				<unitPattern count="one" draft="contributed">{0} ئات كۈچى</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ئات كۈچى</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="provisional">يۈز پاسكال</displayName>
 				<unitPattern count="one" draft="contributed">{0} ھېكتوپاسكال</unitPattern>
@@ -5019,21 +5058,33 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0}ac</unitPattern>
-				<unitPattern count="other">{0}ac</unitPattern>
-			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one" draft="contributed">{0}گېكتار</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}گېكتار</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<unitPattern count="one" draft="contributed">{0}mi²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0}ac</unitPattern>
+				<unitPattern count="other">{0}ac</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<unitPattern count="one" draft="contributed">{0}ft²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}ft²</unitPattern>
 			</unit>
-			<unit type="area-square-mile">
-				<unitPattern count="one" draft="contributed">{0}mi²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}mi²</unitPattern>
+			<unit type="duration-year">
+				<unitPattern count="one" draft="contributed">{0} يىل</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} يىل</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<unitPattern count="one" draft="contributed">{0} ئاي</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ئاي</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<unitPattern count="one" draft="contributed">{0} ھەپتە</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ھەپتە</unitPattern>
 			</unit>
 			<unit type="duration-day">
 				<unitPattern count="one" draft="contributed">{0} كۈن</unitPattern>
@@ -5043,57 +5094,29 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 				<unitPattern count="one" draft="contributed">{0}h</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}h</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<unitPattern count="one" draft="contributed">{0}ms</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<unitPattern count="one" draft="contributed">{0}m</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}m</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<unitPattern count="one" draft="contributed">{0} ئاي</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ئاي</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<unitPattern count="one" draft="contributed">{0}s</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<unitPattern count="one" draft="contributed">{0} ھەپتە</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} ھەپتە</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<unitPattern count="one" draft="contributed">{0} يىل</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} يىل</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<unitPattern count="one" draft="contributed">{0}cm</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one" draft="contributed">{0}′</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}′</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one" draft="contributed">{0}″</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
+			<unit type="duration-millisecond">
+				<unitPattern count="one" draft="contributed">{0}ms</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<unitPattern count="one" draft="contributed">{0}km</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one" draft="contributed">{0}ly</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}ly</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<unitPattern count="one" draft="contributed">{0}m</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one" draft="contributed">{0}mi</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}mi</unitPattern>
+			<unit type="length-centimeter">
+				<unitPattern count="one" draft="contributed">{0}cm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<unitPattern count="one" draft="contributed">{0}mm</unitPattern>
@@ -5103,29 +5126,41 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 				<unitPattern count="one" draft="contributed">{0}pm</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one" draft="contributed">{0}mi</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one" draft="contributed">{0}yd</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<unitPattern count="one" draft="contributed">{0}g</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one" draft="contributed">{0}′</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}′</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one" draft="contributed">{0}″</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one" draft="contributed">{0}ly</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}ly</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<unitPattern count="one" draft="contributed">{0}kg</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one" draft="contributed">{0}oz</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}oz</unitPattern>
+			<unit type="mass-gram">
+				<unitPattern count="one" draft="contributed">{0}g</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one" draft="contributed">{0}#</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}#</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one" draft="contributed">{0}hp</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}hp</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one" draft="contributed">{0}oz</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one" draft="contributed">{0}kW</unitPattern>
@@ -5135,6 +5170,10 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 				<unitPattern count="one" draft="contributed">{0}W</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one" draft="contributed">{0}hp</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one" draft="contributed">{0}hPa</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}hPa</unitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ug_Arab_CN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ug_CN.xml
similarity index 65%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ug_Arab_CN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ug_CN.xml
index 6e142fda68c..76ea466c496 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ug_Arab_CN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ug_CN.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ug"/>
-		<script type="Arab"/>
 		<territory type="CN"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uk.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uk.xml
similarity index 87%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uk.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uk.xml
index 8ef2fdc9081..4d04877681d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uk.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uk.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="uk"/>
 	</identity>
 	<localeDisplayNames>
@@ -30,6 +29,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ain">айнська</language>
 			<language type="ak">акан</language>
 			<language type="akk">аккадська</language>
+			<language type="akz" draft="contributed">алабама</language>
 			<language type="ale">алеутська</language>
 			<language type="alt">південноалтайська</language>
 			<language type="am">амхарська</language>
@@ -40,37 +40,48 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ar_001">сучасна стандартна арабська</language>
 			<language type="arc">арамейська</language>
 			<language type="arn">арауканська</language>
+			<language type="aro" draft="contributed">араона</language>
 			<language type="arp">арапахо</language>
+			<language type="arq" draft="contributed">алжирська арабська</language>
 			<language type="arw">аравакська</language>
 			<language type="as">ассамська</language>
 			<language type="asa">асу</language>
+			<language type="ase" draft="contributed">американська мова рухів</language>
 			<language type="ast">астурська</language>
 			<language type="av">аварська</language>
 			<language type="awa">авадхі</language>
 			<language type="ay">аймара</language>
 			<language type="az">азербайджанська</language>
 			<language type="az" alt="short">азербайджанська</language>
+			<language type="az_Arab" draft="contributed">південноазербайджанська</language>
 			<language type="ba">башкирська</language>
 			<language type="bal">балучі</language>
 			<language type="ban">балійська</language>
+			<language type="bar" draft="contributed">баеріш</language>
 			<language type="bas">баса</language>
 			<language type="bax" draft="contributed">бамум</language>
+			<language type="bbc" draft="contributed">батак тоба</language>
 			<language type="bbj" draft="contributed">гомала</language>
 			<language type="be">білоруська</language>
 			<language type="bej">беджа</language>
 			<language type="bem">бемба</language>
+			<language type="bew" draft="contributed">бетаві</language>
 			<language type="bez">бена</language>
 			<language type="bfd" draft="contributed">бафут</language>
+			<language type="bfq" draft="contributed">бадага</language>
 			<language type="bg">болгарська</language>
+			<language type="bgn" draft="contributed">східнобелуджійська</language>
 			<language type="bho">бходжпурі</language>
 			<language type="bi">біслама</language>
 			<language type="bik">бікольська</language>
 			<language type="bin">біні</language>
+			<language type="bjn" draft="contributed">банджарська</language>
 			<language type="bkm" draft="contributed">ком</language>
 			<language type="bla">сіксіка</language>
 			<language type="bm">бамбара</language>
 			<language type="bn">бенгальська</language>
 			<language type="bo">тибетська</language>
+			<language type="bqi" draft="contributed">бахтіарі</language>
 			<language type="br">бретонська</language>
 			<language type="bra">брадж</language>
 			<language type="brx">бодо</language>
@@ -157,10 +168,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="fr">французька</language>
 			<language type="frm">середньофранцузька</language>
 			<language type="fro">давньофранцузька</language>
+			<language type="frp" draft="contributed">арпітанська</language>
 			<language type="frr">фризька північна</language>
 			<language type="frs">фризька східна</language>
 			<language type="fur">фріульська</language>
-			<language type="fy">західно-фризька</language>
+			<language type="fy">західнофризька</language>
 			<language type="ga">ірландська</language>
 			<language type="gaa">га</language>
 			<language type="gag">гагаузька</language>
@@ -178,7 +190,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="got">готська</language>
 			<language type="grb">гребо</language>
 			<language type="grc">давньогрецька</language>
-			<language type="gsw">німецька швейцарська</language>
+			<language type="gsw">німецька (Швейцарія)</language>
 			<language type="gu">гуджараті</language>
 			<language type="guz">гусії</language>
 			<language type="gv">менкська</language>
@@ -279,6 +291,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">лаоська</language>
 			<language type="lol">монго</language>
 			<language type="loz">лозі</language>
+			<language type="lrc">північна лурська</language>
 			<language type="lt">литовська</language>
 			<language type="lu">луба-катанга</language>
 			<language type="lua">луба-лулуа</language>
@@ -327,17 +340,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="my">бірманська</language>
 			<language type="mye" draft="contributed">миін</language>
 			<language type="myv">ерзя</language>
+			<language type="mzn">мазандеранська</language>
 			<language type="na">науру</language>
 			<language type="nap">неаполітанська</language>
 			<language type="naq">нама</language>
 			<language type="nb">букмол (Норвегія)</language>
 			<language type="nd">ндебелє північна</language>
 			<language type="nds">нижньонімецька</language>
+			<language type="nds_NL">нижньосаксонська</language>
 			<language type="ne">непальська</language>
 			<language type="new">неварі</language>
 			<language type="ng">ндонга</language>
 			<language type="nia">ніаська</language>
 			<language type="niu">ніуе</language>
+			<language type="njo" draft="contributed">ао нага</language>
 			<language type="nl">голландська</language>
 			<language type="nl_BE">фламандська</language>
 			<language type="nmg">квазіо</language>
@@ -394,7 +410,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ru">російська</language>
 			<language type="rup">арумунська</language>
 			<language type="rw">кіньяруанда</language>
-			<language type="rwk" draft="contributed">Рва</language>
+			<language type="rwk">рва</language>
 			<language type="sa">санскрит</language>
 			<language type="sad">сандаве</language>
 			<language type="sah">якутська</language>
@@ -408,6 +424,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">сицилійська</language>
 			<language type="sco">шотландська</language>
 			<language type="sd">сіндхі</language>
+			<language type="sdh" draft="contributed">південнокурдська</language>
 			<language type="se">саамська північна</language>
 			<language type="see" draft="contributed">сенека</language>
 			<language type="seh">сена</language>
@@ -424,7 +441,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sk">словацька</language>
 			<language type="sl">словенська</language>
 			<language type="sm">самоанська</language>
-			<language type="sma">саамська південна</language>
+			<language type="sma">південносаамська</language>
 			<language type="smj">саамська луле</language>
 			<language type="smn">саамська інарі</language>
 			<language type="sms">саамська скольт</language>
@@ -445,8 +462,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">шумерська</language>
 			<language type="sv">шведська</language>
 			<language type="sw">суахілі</language>
+			<language type="sw_CD">конгійське суахілі</language>
 			<language type="swb">коморська</language>
-			<language type="swc">конгійське суахілі</language>
 			<language type="syc">сирійська класична</language>
 			<language type="syr">сирійська</language>
 			<language type="ta">тамільська</language>
@@ -497,10 +514,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="vot">водська</language>
 			<language type="vun">вуньо</language>
 			<language type="wa">валлонська</language>
-			<language type="wae" draft="contributed">Валзерська</language>
+			<language type="wae" draft="contributed">валзерська</language>
 			<language type="wal">валамо</language>
 			<language type="war">варай</language>
 			<language type="was">вашо</language>
+			<language type="wbp" draft="contributed">валпірі</language>
 			<language type="wo">волоф</language>
 			<language type="xal">калмицька</language>
 			<language type="xh">кхоса</language>
@@ -518,14 +536,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="zen">зенага</language>
 			<language type="zgh">стандартна марокканська берберська</language>
 			<language type="zh">китайська</language>
+			<language type="zh_Hans">китайська спрощена</language>
+			<language type="zh_Hant">китайська традиційна</language>
 			<language type="zu">зулуська</language>
 			<language type="zun">зуньї</language>
 			<language type="zxx">немає мовного вмісту</language>
 			<language type="zza">зазакі</language>
 		</languages>
 		<scripts>
+			<script type="Afak" draft="contributed">афака</script>
 			<script type="Aghb" draft="contributed">кавказька албанська</script>
-			<script type="Arab">арабська</script>
+			<script type="Ahom" draft="contributed">ахом</script>
+			<script type="Arab">арабиця</script>
 			<script type="Arab" alt="variant">персько-арабська</script>
 			<script type="Armi">Армі</script>
 			<script type="Armn">вірменська</script>
@@ -535,14 +557,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Bass" draft="contributed">басса</script>
 			<script type="Batk">Батак</script>
 			<script type="Beng">бенгальська</script>
-			<script type="Blis">Символи Блісса</script>
+			<script type="Blis">символи Блісса</script>
 			<script type="Bopo">бопомофо</script>
 			<script type="Brah">Брахмі</script>
 			<script type="Brai">шрифт Брайля</script>
 			<script type="Bugi">Бугійський</script>
 			<script type="Buhd">Бухід</script>
 			<script type="Cakm">Чакма</script>
-			<script type="Cans">Уніфіковані символи канадських тубільців</script>
+			<script type="Cans">уніфіковані символи канадських тубільців</script>
 			<script type="Cari">Каріанський</script>
 			<script type="Cham">Хамітський</script>
 			<script type="Cher">Черокі</script>
@@ -564,7 +586,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Grek">грецька</script>
 			<script type="Gujr">гуджараті</script>
 			<script type="Guru">гурмухі</script>
-			<script type="Hang">хангул</script>
+			<script type="Hang">хангиль</script>
 			<script type="Hani">китайська</script>
 			<script type="Hano">Хануну</script>
 			<script type="Hans">спрощена</script>
@@ -591,12 +613,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Laoo">лаоська</script>
 			<script type="Latf">Латинський фрактурний</script>
 			<script type="Latg">Латинський гельський</script>
-			<script type="Latn">латинська</script>
+			<script type="Latn">латиниця</script>
 			<script type="Lepc">Лепча</script>
 			<script type="Limb">Лімбу</script>
 			<script type="Lina">Лінійний А</script>
 			<script type="Linb">Лінійний В</script>
 			<script type="Lisu" draft="contributed">абетка Фрейзера</script>
+			<script type="Loma" draft="contributed">лома</script>
 			<script type="Lyci">Лікійський</script>
 			<script type="Lydi">Лідійський</script>
 			<script type="Mand">Мандейський</script>
@@ -620,7 +643,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Phlp">Пехлеві релігійний</script>
 			<script type="Phlv">Пехлеві літературний</script>
 			<script type="Phnx">Фінікійський</script>
-			<script type="Plrd">Писемність Полларда</script>
+			<script type="Plrd">писемність Полларда</script>
 			<script type="Prti">Парфянський</script>
 			<script type="Rjng">Реджанг</script>
 			<script type="Roro">Ронго-ронго</script>
@@ -641,6 +664,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Tale">Тай-лі</script>
 			<script type="Talu">Новий тайський луе</script>
 			<script type="Taml">тамільська</script>
+			<script type="Tang" draft="contributed">тангут</script>
 			<script type="Tavt">Тай-вʼєт</script>
 			<script type="Telu">телугу</script>
 			<script type="Teng">Тенгвар</script>
@@ -651,12 +675,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Tibt">тибетська</script>
 			<script type="Ugar">Угаритський</script>
 			<script type="Vaii">Ваї</script>
-			<script type="Visp">Фонетична транскрипція Белла</script>
+			<script type="Visp">видиме мовлення</script>
 			<script type="Xpeo">Давньоперський</script>
 			<script type="Xsux">Шумеро-аккадський клінопис</script>
 			<script type="Yiii">Йї</script>
-			<script type="Zinh">Успадкований</script>
-			<script type="Zmth">Математичний</script>
+			<script type="Zinh">успадкована</script>
+			<script type="Zmth">математична</script>
 			<script type="Zsym">символьна</script>
 			<script type="Zxxx">безписемна</script>
 			<script type="Zyyy">звичайна</script>
@@ -665,7 +689,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<territories>
 			<territory type="001">Світ</territory>
 			<territory type="002">Африка</territory>
-			<territory type="003">Північноамериканський континент</territory>
+			<territory type="003">Північна Америка</territory>
 			<territory type="005">Південна Америка</territory>
 			<territory type="009">Океанія</territory>
 			<territory type="011">Західна Африка</territory>
@@ -675,13 +699,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="017">Центральна Африка</territory>
 			<territory type="018">Південна Африка</territory>
 			<territory type="019">Америка</territory>
-			<territory type="021">Північна Америка</territory>
+			<territory type="021">Північна Америка (регіон)</territory>
 			<territory type="029">Карибський басейн</territory>
 			<territory type="030">Східна Азія</territory>
 			<territory type="034">Південна Азія</territory>
 			<territory type="035">Південно-Східна Азія</territory>
 			<territory type="039">Південна Європа</territory>
-			<territory type="053">Австралія та Нова Зеландія</territory>
+			<territory type="053">Австралазія</territory>
 			<territory type="054">Меланезія</territory>
 			<territory type="057">Мікронезійський регіон</territory>
 			<territory type="061">Полінезія</territory>
@@ -701,7 +725,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Ангілья</territory>
 			<territory type="AL">Албанія</territory>
 			<territory type="AM">Вірменія</territory>
-			<territory type="AN">Нідерландські Антильські Острови</territory>
 			<territory type="AO">Ангола</territory>
 			<territory type="AQ">Антарктика</territory>
 			<territory type="AR">Аргентина</territory>
@@ -721,12 +744,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BI">Бурунді</territory>
 			<territory type="BJ">Бенін</territory>
 			<territory type="BL">Сен-Бартельмі</territory>
-			<territory type="BM">Бермуди</territory>
+			<territory type="BM">Бермудські острови</territory>
 			<territory type="BN">Бруней</territory>
 			<territory type="BO">Болівія</territory>
 			<territory type="BQ">Нідерландські Карибські острови</territory>
 			<territory type="BR">Бразилія</territory>
-			<territory type="BS">Багами</territory>
+			<territory type="BS">Багамські Острови</territory>
 			<territory type="BT">Бутан</territory>
 			<territory type="BV">Острів Буве</territory>
 			<territory type="BW">Ботсвана</territory>
@@ -855,7 +878,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ML">Малі</territory>
 			<territory type="MM">Мʼянма (Бірма)</territory>
 			<territory type="MN">Монголія</territory>
-			<territory type="MO">Макао О.А.Р. Китаю</territory>
+			<territory type="MO">Макао, О.А.Р Китаю</territory>
 			<territory type="MO" alt="short">Макао</territory>
 			<territory type="MP">Північні Маріанські острови</territory>
 			<territory type="MQ">Мартиніка</territory>
@@ -932,7 +955,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="TH">Таїланд</territory>
 			<territory type="TJ">Таджикистан</territory>
 			<territory type="TK">Токелау</territory>
-			<territory type="TL">Східний Тимор</territory>
+			<territory type="TL">Тимор-Лешті</territory>
+			<territory type="TL" alt="variant">Східний Тимор</territory>
 			<territory type="TM">Туркменістан</territory>
 			<territory type="TN">Туніс</territory>
 			<territory type="TO">Тонга</territory>
@@ -960,7 +984,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="XK">Косово</territory>
 			<territory type="YE">Ємен</territory>
 			<territory type="YT">Майотта</territory>
-			<territory type="ZA">ПАР</territory>
+			<territory type="ZA">Південно-Африканська Республіка</territory>
 			<territory type="ZM">Замбія</territory>
 			<territory type="ZW">Зімбабве</territory>
 			<territory type="ZZ">Невідомий регіон</territory>
@@ -1001,113 +1025,130 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<variant type="WADEGILE">Романізація Вейда-Джайлза</variant>
 		</variants>
 		<keys>
-			<key type="calendar">Календар</key>
-			<key type="colAlternate" draft="contributed">Ігнорувати сортування за символами</key>
-			<key type="colBackwards" draft="contributed">Зворотне сортування за діактричними знаками</key>
-			<key type="colCaseFirst" draft="contributed">Упорядкування за великими/малими символами</key>
-			<key type="colCaseLevel" draft="contributed">Сортування з урахуванням регістру</key>
-			<key type="colHiraganaQuaternary" draft="contributed">Сортування кана</key>
-			<key type="collation">Порядок сортування</key>
-			<key type="colNormalization" draft="contributed">Уніфіковане сортування</key>
-			<key type="colNumeric" draft="contributed">Цифрове сортування</key>
-			<key type="colStrength" draft="contributed">Інтенсивність сортування</key>
-			<key type="currency">Валюта</key>
-			<key type="numbers">Цифри</key>
-			<key type="timezone" draft="contributed">Часовий пояс</key>
-			<key type="va" draft="contributed">Варіант мовного коду</key>
-			<key type="variableTop" draft="contributed">Сортувати як символи</key>
-			<key type="x" draft="contributed">Особисте використання</key>
+			<key type="calendar">календар</key>
+			<key type="colAlternate" draft="contributed">ігнорувати сортування за символами</key>
+			<key type="colBackwards">зворотне сортування за діакритичними знаками</key>
+			<key type="colCaseFirst">порядок верхнього/нижнього регістру</key>
+			<key type="colCaseLevel" draft="contributed">сортування з урахуванням регістру</key>
+			<key type="colHiraganaQuaternary" draft="contributed">сортування кана</key>
+			<key type="collation">порядок сортування</key>
+			<key type="colNormalization" draft="contributed">уніфіковане сортування</key>
+			<key type="colNumeric" draft="contributed">цифрове сортування</key>
+			<key type="colStrength" draft="contributed">інтенсивність сортування</key>
+			<key type="currency">валюта</key>
+			<key type="hc">формат часу (12 або 24 години)</key>
+			<key type="lb">стиль розриву рядка</key>
+			<key type="ms">система вимірювання</key>
+			<key type="numbers">цифри</key>
+			<key type="timezone" draft="contributed">часовий пояс</key>
+			<key type="va" draft="contributed">варіант мовного коду</key>
+			<key type="variableTop" draft="contributed">сортувати як символи</key>
+			<key type="x" draft="contributed">особисте використання</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Арабсько-індійські цифри</type>
-			<type type="arabext" key="numbers">Арабсько-індійські розширені цифри</type>
-			<type type="armn" key="numbers">Вірменські цифри</type>
-			<type type="armnlow" key="numbers">Вірменські малі цифри</type>
-			<type type="beng" key="numbers">Бенгальські цифри</type>
-			<type type="big5han" key="collation">Китайський традиційний</type>
-			<type type="buddhist" key="calendar">Буддійський календар</type>
-			<type type="chinese" key="calendar">Китайський календар</type>
-			<type type="coptic" key="calendar" draft="contributed">Коптський календар</type>
-			<type type="dangi" key="calendar">Календар Дангі</type>
-			<type type="deva" key="numbers">Цифри деванагарі</type>
-			<type type="dictionary" key="collation" draft="contributed">Порядок сортування: за словником</type>
-			<type type="ducet" key="collation" draft="contributed">Порядок сортування: Unicode за умовчанням</type>
-			<type type="ethi" key="numbers">Ефіопські цифри</type>
-			<type type="ethiopic" key="calendar">Ефіопський календар</type>
-			<type type="ethiopic-amete-alem" key="calendar" draft="contributed">Ефіопський Амете Алем календар</type>
-			<type type="finance" key="numbers" draft="contributed">Фінансові символи чисел</type>
-			<type type="fullwide" key="numbers">Цифри повної ширини</type>
-			<type type="gb2312han" key="collation">Китайський спрощений</type>
-			<type type="geor" key="numbers">Грузинські цифри</type>
-			<type type="gregorian" key="calendar">Григоріанський календар</type>
-			<type type="grek" key="numbers">Грецькі цифри</type>
-			<type type="greklow" key="numbers">Грецькі малі цифри</type>
-			<type type="gujr" key="numbers">Цифри гуджараті</type>
-			<type type="guru" key="numbers">Цифри гурмукхі</type>
-			<type type="hanidec" key="numbers">Китайські десяткові цифри</type>
-			<type type="hans" key="numbers">Китайські символи чисел (спрощене письмо)</type>
-			<type type="hansfin" key="numbers">Китайські фінансові символи чисел (спрощене письмо)</type>
-			<type type="hant" key="numbers">Китайські символи чисел (традиційне письмо)</type>
-			<type type="hantfin" key="numbers">Китайські фінансові символи чисел (традиційне письмо)</type>
-			<type type="hebr" key="numbers">Цифри івриту</type>
-			<type type="hebrew" key="calendar">Єврейський календар</type>
-			<type type="identical" key="colStrength" draft="contributed">Сортувати всі</type>
-			<type type="indian" key="calendar">Індійський світський календар</type>
-			<type type="islamic" key="calendar">Мусульманський календар</type>
-			<type type="islamic-civil" key="calendar">Мусульманський світський календар</type>
-			<type type="iso8601" key="calendar">Календар ISO-8601</type>
-			<type type="japanese" key="calendar">Японський календар</type>
-			<type type="jpan" key="numbers">Японські цифри</type>
-			<type type="jpanfin" key="numbers">Японські фінансові цифри</type>
-			<type type="khmr" key="numbers">Кхмерські цифри</type>
-			<type type="knda" key="numbers">Цифри каннада</type>
-			<type type="laoo" key="numbers">Лаоські цифри</type>
-			<type type="latn" key="numbers">Західні цифри</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">Сортувати спершу за малими символами</type>
-			<type type="mlym" key="numbers">Малаяламські цифри</type>
-			<type type="mong" key="numbers" draft="contributed">Монгольські цифри</type>
-			<type type="mymr" key="numbers">М’янмські цифри</type>
-			<type type="native" key="numbers" draft="contributed">Місцеві цифри</type>
-			<type type="no" key="colBackwards" draft="contributed">Сортувати за діактричними знаками уніфіковано</type>
-			<type type="no" key="colCaseFirst" draft="contributed">Сортувати в порядку звичайного регістру</type>
-			<type type="no" key="colCaseLevel" draft="contributed">Сортувати без урахування регістру</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">Сортувати за кана окремо</type>
-			<type type="no" key="colNormalization" draft="contributed">Сортувати без уніфікації</type>
-			<type type="no" key="colNumeric" draft="contributed">Сортувати за цифрами окремо</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">Сортувати за символами</type>
-			<type type="orya" key="numbers">Цифри орія</type>
-			<type type="persian" key="calendar">Перський календар</type>
-			<type type="phonebook" key="collation">Телефонна книга</type>
-			<type type="phonetic" key="collation" draft="contributed">Фонетичний порядок сортування</type>
-			<type type="pinyin" key="collation">Порядок піньїн</type>
-			<type type="primary" key="colStrength" draft="contributed">Сортувати лише за основними літерами</type>
-			<type type="quaternary" key="colStrength" draft="contributed">Сортувати за діактричними знаками/регістром/шириною/кана</type>
-			<type type="reformed" key="collation" draft="contributed">Порядок сортування: за виправленнями</type>
-			<type type="roc" key="calendar">Китайський григоріанський календар</type>
-			<type type="roman" key="numbers">Римські цифри</type>
-			<type type="romanlow" key="numbers">Римські малі цифри</type>
-			<type type="search" key="collation">Універсальний пошук</type>
-			<type type="searchjl" key="collation" draft="contributed">Пошук за початковою приголосною хангул</type>
-			<type type="secondary" key="colStrength" draft="contributed">Сортувати за діактричними знаками</type>
-			<type type="shifted" key="colAlternate" draft="contributed">Сортувати, ігноруючи символи</type>
-			<type type="standard" key="collation">Стандартний порядок сортування</type>
-			<type type="stroke" key="collation">Порядок натискання клавіш</type>
-			<type type="taml" key="numbers">Тамільські традиційні цифри</type>
-			<type type="tamldec" key="numbers">Тамільські цифри</type>
-			<type type="telu" key="numbers">Цифри телугу</type>
-			<type type="tertiary" key="colStrength" draft="contributed">Сортувати за діактричними знаками/регістром/шириною</type>
-			<type type="thai" key="numbers">Тайські цифри</type>
-			<type type="tibt" key="numbers">Тибетські цифри</type>
-			<type type="traditional" key="collation">Традиційний</type>
-			<type type="traditional" key="numbers" draft="contributed">Традиційні символи чисел</type>
-			<type type="unihan" key="collation" draft="contributed">Порядок сортування: за штрихами в корені</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">Сортувати спершу за великими символами</type>
-			<type type="vaii" key="numbers" draft="contributed">Цифри ваї</type>
-			<type type="yes" key="colBackwards" draft="contributed">Сортувати за діактричними знаками у зворотньому порядку</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">Сортувати з урахуванням регістру</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">Сортувати за кана інакше</type>
-			<type type="yes" key="colNormalization" draft="contributed">Сортувати за Unicode уніфіковано</type>
-			<type type="yes" key="colNumeric" draft="contributed">Сортувати за цифрами чисельно</type>
+			<type key="calendar" type="buddhist">буддійський календар</type>
+			<type key="calendar" type="chinese">китайський календар</type>
+			<type key="calendar" type="coptic" draft="contributed">коптський календар</type>
+			<type key="calendar" type="dangi">календар дангі</type>
+			<type key="calendar" type="ethiopic">ефіопський календар</type>
+			<type key="calendar" type="ethiopic-amete-alem" draft="contributed">ефіопський амете алем календар</type>
+			<type key="calendar" type="gregorian">григоріанський календар</type>
+			<type key="calendar" type="hebrew">єврейський календар</type>
+			<type key="calendar" type="indian">індійський світський календар</type>
+			<type key="calendar" type="islamic">мусульманський календар</type>
+			<type key="calendar" type="islamic-civil">мусульманський світський календар</type>
+			<type key="calendar" type="iso8601">календар ISO-8601</type>
+			<type key="calendar" type="japanese">японський календар</type>
+			<type key="calendar" type="persian">перський календар</type>
+			<type key="calendar" type="roc">китайський григоріанський календар</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">сортувати за символами</type>
+			<type key="colAlternate" type="shifted" draft="contributed">сортувати, ігноруючи символи</type>
+			<type key="colBackwards" type="no">сортувати за діакритичними знаками уніфіковано</type>
+			<type key="colBackwards" type="yes" draft="contributed">сортувати за діактричними знаками у зворотньому порядку</type>
+			<type key="colCaseFirst" type="lower">сортувати нижній регістр наперед</type>
+			<type key="colCaseFirst" type="no" draft="contributed">сортувати в порядку звичайного регістру</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">сортувати спершу за великими символами</type>
+			<type key="colCaseLevel" type="no" draft="contributed">сортувати без урахування регістру</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">сортувати з урахуванням регістру</type>
+			<type key="colHiraganaQuaternary" type="no">сортувати кана окремо</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">сортувати за кана інакше</type>
+			<type key="collation" type="big5han">китайський традиційний порядок сортування Big5</type>
+			<type key="collation" type="compat" draft="contributed">попередній порядок сортування, для сумісності</type>
+			<type key="collation" type="dictionary">порядок сортування за словником</type>
+			<type key="collation" type="ducet">типовий порядок сортування Unicode</type>
+			<type key="collation" type="emoji" draft="contributed">порядок сортування за емодзі</type>
+			<type key="collation" type="eor" draft="contributed">європейські правила упорядкування</type>
+			<type key="collation" type="gb2312han">китайський спрощений</type>
+			<type key="collation" type="phonebook">порядок сортування за телефонним довідником</type>
+			<type key="collation" type="phonetic" draft="contributed">фонетичний порядок сортування</type>
+			<type key="collation" type="pinyin">порядок сортування піньїнь</type>
+			<type key="collation" type="reformed">реформований порядок сортування</type>
+			<type key="collation" type="search">універсальний пошук</type>
+			<type key="collation" type="searchjl" draft="contributed">пошук за початковою приголосною хангул</type>
+			<type key="collation" type="standard">стандартний порядок сортування</type>
+			<type key="collation" type="stroke">порядок сортування за рисками</type>
+			<type key="collation" type="traditional">традиційний порядок сортування</type>
+			<type key="collation" type="unihan">порядок сортування за ключами ієрогліфів</type>
+			<type key="collation" type="zhuyin" draft="contributed">порядок сортування чжуїнь</type>
+			<type key="colNormalization" type="no" draft="contributed">сортувати без уніфікації</type>
+			<type key="colNormalization" type="yes" draft="contributed">сортувати за Unicode уніфіковано</type>
+			<type key="colNumeric" type="no">сортувати цифри окремо</type>
+			<type key="colNumeric" type="yes" draft="contributed">сортувати за цифрами чисельно</type>
+			<type key="colStrength" type="identical" draft="contributed">сортувати всі</type>
+			<type key="colStrength" type="primary" draft="contributed">сортувати лише за основними літерами</type>
+			<type key="colStrength" type="quaternary" draft="contributed">сортувати за діактричними знаками/регістром/шириною/кана</type>
+			<type key="colStrength" type="secondary" draft="contributed">сортувати за діактричними знаками</type>
+			<type key="colStrength" type="tertiary" draft="contributed">сортувати за діактричними знаками/регістром/шириною</type>
+			<type key="hc" type="h11">12-годинний формат (0–11)</type>
+			<type key="hc" type="h12">12-годинний формат (1–12)</type>
+			<type key="hc" type="h23">24-годинний формат (0–23)</type>
+			<type key="hc" type="h24">24-годинний формат (1–24)</type>
+			<type key="lb" type="loose">вільний стиль розриву рядка</type>
+			<type key="lb" type="normal">типовий стиль розриву рядка</type>
+			<type key="lb" type="strict">строгий стиль розриву рядка</type>
+			<type key="ms" type="metric">мертична система</type>
+			<type key="ms" type="uksystem">англійська система мір</type>
+			<type key="ms" type="ussystem">американська система мір</type>
+			<type key="numbers" type="arab">арабсько-індійські цифри</type>
+			<type key="numbers" type="arabext">арабсько-індійські розширені цифри</type>
+			<type key="numbers" type="armn">вірменські цифри</type>
+			<type key="numbers" type="armnlow">вірменські малі цифри</type>
+			<type key="numbers" type="beng">бенгальські цифри</type>
+			<type key="numbers" type="deva">цифри деванагарі</type>
+			<type key="numbers" type="ethi">ефіопські цифри</type>
+			<type key="numbers" type="finance" draft="contributed">фінансові символи чисел</type>
+			<type key="numbers" type="fullwide">цифри повної ширини</type>
+			<type key="numbers" type="geor">грузинські цифри</type>
+			<type key="numbers" type="grek">грецькі цифри</type>
+			<type key="numbers" type="greklow">грецькі малі цифри</type>
+			<type key="numbers" type="gujr">цифри гуджараті</type>
+			<type key="numbers" type="guru">цифри гурмукхі</type>
+			<type key="numbers" type="hanidec">китайські десяткові цифри</type>
+			<type key="numbers" type="hans">китайські символи чисел (спрощене письмо)</type>
+			<type key="numbers" type="hansfin">китайські фінансові символи чисел (спрощене письмо)</type>
+			<type key="numbers" type="hant">китайські символи чисел (традиційне письмо)</type>
+			<type key="numbers" type="hantfin">китайські фінансові символи чисел (традиційне письмо)</type>
+			<type key="numbers" type="hebr">цифри івриту</type>
+			<type key="numbers" type="jpan">японські цифри</type>
+			<type key="numbers" type="jpanfin">японські фінансові цифри</type>
+			<type key="numbers" type="khmr">кхмерські цифри</type>
+			<type key="numbers" type="knda">цифри каннада</type>
+			<type key="numbers" type="laoo">лаоські цифри</type>
+			<type key="numbers" type="latn">західні цифри</type>
+			<type key="numbers" type="mlym">малаяламські цифри</type>
+			<type key="numbers" type="mong" draft="contributed">монгольські цифри</type>
+			<type key="numbers" type="mymr">м’янмські цифри</type>
+			<type key="numbers" type="native" draft="contributed">місцеві цифри</type>
+			<type key="numbers" type="orya">цифри орія</type>
+			<type key="numbers" type="roman">римські цифри</type>
+			<type key="numbers" type="romanlow">римські малі цифри</type>
+			<type key="numbers" type="taml">тамільські традиційні цифри</type>
+			<type key="numbers" type="tamldec">тамільські цифри</type>
+			<type key="numbers" type="telu">цифри телугу</type>
+			<type key="numbers" type="thai">тайські цифри</type>
+			<type key="numbers" type="tibt">тибетські цифри</type>
+			<type key="numbers" type="traditional" draft="contributed">традиційні символи чисел</type>
+			<type key="numbers" type="vaii" draft="contributed">цифри ваї</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">BGN</transformName>
@@ -1124,7 +1165,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Метрична</measurementSystemName>
 			<measurementSystemName type="UK">Британська</measurementSystemName>
-			<measurementSystemName type="US">США</measurementSystemName>
+			<measurementSystemName type="US">Американська</measurementSystemName>
 		</measurementSystemNames>
 		<codePatterns>
 			<codePattern type="language">Мова: {0}</codePattern>
@@ -1159,7 +1200,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</contextTransformUsage>
 	</contextTransforms>
 	<characters>
-		<exemplarCharacters>[ʼ а б в г ґ д е є ж з и і ї й к л м н о п р с т у ф х ц ч ш щ ь ю я]</exemplarCharacters>
+		<exemplarCharacters>[а б в г ґ д е є ж з и і ї й к л м н о п р с т у ф х ц ч ш щ ь ю я ʼ]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[{а\u0301} {е\u0301} ё {є\u0301} {и\u0301} {і\u0301} {ї\u0301} {о\u0301} {у\u0301} ъ ы э {ю\u0301} {я\u0301}]</exemplarCharacters>
 		<exemplarCharacters type="index">[А Б В Г Ґ Д Е Є Ж З И І Ї Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ю Я]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- – , ; \: ! ? . ' &quot; “ „ « » ( ) \[ \] \{ \} § @ * / \\ №]</exemplarCharacters>
@@ -1183,7 +1224,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<months>
 					<monthContext type="format">
 						<monthWidth type="abbreviated">
-							<month type="1" draft="provisional">тот.</month>
+							<month type="1" draft="provisional">тот</month>
 							<month type="2" draft="provisional">баб.</month>
 							<month type="3" draft="provisional">хат.</month>
 							<month type="4" draft="provisional">кіх.</month>
@@ -1236,69 +1277,112 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<months>
 					<monthContext type="format">
 						<monthWidth type="abbreviated">
-							<month type="1" draft="provisional">мес.</month>
-							<month type="2" draft="provisional">тек.</month>
-							<month type="3" draft="provisional">хед.</month>
-							<month type="4" draft="provisional">тах.</month>
-							<month type="5" draft="provisional">тер.</month>
-							<month type="6" draft="provisional">єкат.</month>
-							<month type="7" draft="provisional">мег.</month>
-							<month type="8" draft="provisional">міяз.</month>
-							<month type="9" draft="provisional">ген.</month>
-							<month type="10" draft="provisional">сен.</month>
-							<month type="11" draft="provisional">хам.</month>
-							<month type="12" draft="provisional">нех.</month>
-							<month type="13" draft="provisional">паг.</month>
+							<month type="1" draft="contributed">мес.</month>
+							<month type="2" draft="contributed">тек.</month>
+							<month type="3" draft="contributed">хед.</month>
+							<month type="4" draft="contributed">тах.</month>
+							<month type="5" draft="contributed">тер.</month>
+							<month type="6" draft="contributed">єкат.</month>
+							<month type="7" draft="contributed">мег.</month>
+							<month type="8" draft="contributed">міяз.</month>
+							<month type="9" draft="contributed">ген.</month>
+							<month type="10" draft="contributed">сен.</month>
+							<month type="11" draft="contributed">хам.</month>
+							<month type="12" draft="contributed">нех.</month>
+							<month type="13" draft="contributed">паг.</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">01</month>
+							<month type="2" draft="contributed">02</month>
+							<month type="3" draft="contributed">03</month>
+							<month type="4" draft="contributed">04</month>
+							<month type="5" draft="contributed">05</month>
+							<month type="6" draft="contributed">06</month>
+							<month type="7" draft="contributed">07</month>
+							<month type="8" draft="contributed">08</month>
+							<month type="9" draft="contributed">09</month>
+							<month type="10" draft="contributed">10</month>
+							<month type="11" draft="contributed">11</month>
+							<month type="12" draft="contributed">12</month>
+							<month type="13" draft="contributed">13</month>
 						</monthWidth>
 						<monthWidth type="wide">
-							<month type="1" draft="provisional">мескерема</month>
-							<month type="2" draft="provisional">текемта</month>
-							<month type="3" draft="provisional">хедара</month>
-							<month type="4" draft="provisional">тахсаса</month>
-							<month type="5" draft="provisional">тера</month>
-							<month type="6" draft="provisional">єкатіта</month>
-							<month type="7" draft="provisional">мегабіта</month>
-							<month type="8" draft="provisional">міязія</month>
-							<month type="9" draft="provisional">генбота</month>
-							<month type="10" draft="provisional">сене</month>
-							<month type="11" draft="provisional">хамле</month>
-							<month type="12" draft="provisional">нехасе</month>
-							<month type="13" draft="provisional">пагумена</month>
+							<month type="1" draft="contributed">мескерема</month>
+							<month type="2" draft="contributed">текемта</month>
+							<month type="3" draft="contributed">хедара</month>
+							<month type="4" draft="contributed">тахсаса</month>
+							<month type="5" draft="contributed">тера</month>
+							<month type="6" draft="contributed">єкатіта</month>
+							<month type="7" draft="contributed">мегабіта</month>
+							<month type="8" draft="contributed">міязія</month>
+							<month type="9" draft="contributed">генбота</month>
+							<month type="10" draft="contributed">сене</month>
+							<month type="11" draft="contributed">хамле</month>
+							<month type="12" draft="contributed">нехасе</month>
+							<month type="13" draft="contributed">пагумена</month>
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
 						<monthWidth type="abbreviated">
-							<month type="1" draft="provisional">Мес</month>
-							<month type="2" draft="provisional">Тек</month>
-							<month type="3" draft="provisional">Хед</month>
-							<month type="4" draft="provisional">Тах</month>
-							<month type="5" draft="provisional">Тер</month>
-							<month type="6" draft="provisional">Єкат</month>
-							<month type="7" draft="provisional">Мег</month>
-							<month type="8" draft="provisional">Міяз</month>
-							<month type="9" draft="provisional">Ген</month>
-							<month type="10" draft="provisional">Сен</month>
-							<month type="11" draft="provisional">Хам</month>
-							<month type="12" draft="provisional">Нех</month>
-							<month type="13" draft="provisional">Паг</month>
+							<month type="1" draft="contributed">мес.</month>
+							<month type="2" draft="contributed">тек.</month>
+							<month type="3" draft="contributed">хед.</month>
+							<month type="4" draft="contributed">тах.</month>
+							<month type="5" draft="contributed">тер.</month>
+							<month type="6" draft="contributed">єкат.</month>
+							<month type="7" draft="contributed">мег.</month>
+							<month type="8" draft="contributed">міяз.</month>
+							<month type="9" draft="contributed">ген.</month>
+							<month type="10" draft="contributed">сен.</month>
+							<month type="11" draft="contributed">хам.</month>
+							<month type="12" draft="contributed">нех.</month>
+							<month type="13" draft="contributed">паг.</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">01</month>
+							<month type="2" draft="contributed">02</month>
+							<month type="3" draft="contributed">03</month>
+							<month type="4" draft="contributed">04</month>
+							<month type="5" draft="contributed">05</month>
+							<month type="6" draft="contributed">06</month>
+							<month type="7" draft="contributed">07</month>
+							<month type="8" draft="contributed">08</month>
+							<month type="9" draft="contributed">09</month>
+							<month type="10" draft="contributed">10</month>
+							<month type="11" draft="contributed">11</month>
+							<month type="12" draft="contributed">12</month>
+							<month type="13" draft="contributed">13</month>
 						</monthWidth>
 						<monthWidth type="wide">
-							<month type="1" draft="provisional">Мескерем</month>
-							<month type="2" draft="provisional">Текемт</month>
-							<month type="3" draft="provisional">Хедар</month>
-							<month type="4" draft="provisional">Тахсас</month>
-							<month type="5" draft="provisional">Тер</month>
-							<month type="6" draft="provisional">Єкатіт</month>
-							<month type="7" draft="provisional">Мегабіт</month>
-							<month type="8" draft="provisional">Міязія</month>
-							<month type="9" draft="provisional">Генбот</month>
-							<month type="10" draft="provisional">Сене</month>
-							<month type="11" draft="provisional">Хамле</month>
-							<month type="12" draft="provisional">Нехасе</month>
-							<month type="13" draft="provisional">Пагумен</month>
+							<month type="1" draft="contributed">мескерема</month>
+							<month type="2" draft="contributed">Текемт</month>
+							<month type="3" draft="contributed">хедара</month>
+							<month type="4" draft="contributed">тахсаса</month>
+							<month type="5" draft="contributed">тера</month>
+							<month type="6" draft="contributed">єкатіта</month>
+							<month type="7" draft="contributed">мегабіта</month>
+							<month type="8" draft="contributed">міязія</month>
+							<month type="9" draft="contributed">генбота</month>
+							<month type="10" draft="contributed">сене</month>
+							<month type="11" draft="contributed">хамле</month>
+							<month type="12" draft="contributed">нехасе</month>
+							<month type="13" draft="contributed">пагумена</month>
 						</monthWidth>
 					</monthContext>
 				</months>
+				<eras>
+					<eraNames>
+						<era type="0" draft="contributed">ERA0</era>
+						<era type="1" draft="contributed">ERA1</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0" draft="contributed">ERA0</era>
+						<era type="1" draft="contributed">ERA1</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="1" draft="contributed">ERA1</era>
+					</eraNarrow>
+				</eras>
 			</calendar>
 			<calendar type="generic">
 				<dateFormats>
@@ -1326,12 +1410,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1} 'о' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1} 'о' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
@@ -1346,6 +1430,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
@@ -1353,10 +1438,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
 						<dateFormatItem id="h" draft="contributed">h a</dateFormatItem>
 						<dateFormatItem id="H" draft="contributed">HH</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
-						<dateFormatItem id="Hm" draft="contributed">HH:mm</dateFormatItem>
+						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
@@ -1432,43 +1515,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">LLL–LLL</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d" draft="contributed">d–d MMM</greatestDifference>
+							<greatestDifference id="d">d–d MMM</greatestDifference>
 							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d" draft="contributed">E, d – E, d MMM</greatestDifference>
-							<greatestDifference id="M" draft="contributed">E, d MMM – E, d MMM</greatestDifference>
+							<greatestDifference id="d">E, d – E, d MMM</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
-							<greatestDifference id="y" draft="contributed">y–y</greatestDifference>
+							<greatestDifference id="y">y–y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="contributed">MM.y – MM.y</greatestDifference>
-							<greatestDifference id="y" draft="contributed">MM.y – MM.y</greatestDifference>
+							<greatestDifference id="M">MM.y – MM.y</greatestDifference>
+							<greatestDifference id="y">MM.y – MM.y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="contributed">dd.MM.y – dd.MM.y</greatestDifference>
-							<greatestDifference id="M" draft="contributed">dd.MM.y – dd.MM.y</greatestDifference>
-							<greatestDifference id="y" draft="contributed">dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="d">dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="M">dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="y">dd.MM.y – dd.MM.y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="contributed">E, dd.MM.y – E, dd.MM.y</greatestDifference>
-							<greatestDifference id="M" draft="contributed">E, dd.MM.y – E, dd.MM.y</greatestDifference>
-							<greatestDifference id="y" draft="contributed">E, dd.MM.y – E, dd.MM.y</greatestDifference>
+							<greatestDifference id="d">E, dd.MM.y – E, dd.MM.y</greatestDifference>
+							<greatestDifference id="M">E, dd.MM.y – E, dd.MM.y</greatestDifference>
+							<greatestDifference id="y">E, dd.MM.y – E, dd.MM.y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M" draft="contributed">LLL–LLL y</greatestDifference>
-							<greatestDifference id="y" draft="contributed">LLL y – LLL y</greatestDifference>
+							<greatestDifference id="M">LLL–LLL y</greatestDifference>
+							<greatestDifference id="y">LLL y – LLL y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d" draft="contributed">d–d MMM y</greatestDifference>
-							<greatestDifference id="M" draft="contributed">d MMM – d MMM y</greatestDifference>
-							<greatestDifference id="y" draft="contributed">d MMM y – d MMM y</greatestDifference>
+							<greatestDifference id="d">d–d MMM y</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d" draft="contributed">E, d – E, d MMM y</greatestDifference>
-							<greatestDifference id="M" draft="contributed">E, d MMM – E, d MMM y</greatestDifference>
-							<greatestDifference id="y" draft="contributed">E, d MMM y – E, d MMM y</greatestDifference>
+							<greatestDifference id="d">E, d – E, d MMM y</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM y</greatestDifference>
+							<greatestDifference id="y">E, d MMM y – E, d MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
 							<greatestDifference id="M">LLLL – LLLL y</greatestDifference>
@@ -1553,18 +1636,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="12">Г</month>
 						</monthWidth>
 						<monthWidth type="wide">
-							<month type="1">Січень</month>
-							<month type="2">Лютий</month>
-							<month type="3">Березень</month>
-							<month type="4">Квітень</month>
-							<month type="5">Травень</month>
-							<month type="6">Червень</month>
-							<month type="7">Липень</month>
-							<month type="8">Серпень</month>
-							<month type="9">Вересень</month>
-							<month type="10">Жовтень</month>
-							<month type="11">Листопад</month>
-							<month type="12">Грудень</month>
+							<month type="1">січень</month>
+							<month type="2">лютий</month>
+							<month type="3">березень</month>
+							<month type="4">квітень</month>
+							<month type="5">травень</month>
+							<month type="6">червень</month>
+							<month type="7">липень</month>
+							<month type="8">серпень</month>
+							<month type="9">вересень</month>
+							<month type="10">жовтень</month>
+							<month type="11">листопад</month>
+							<month type="12">грудень</month>
 						</monthWidth>
 					</monthContext>
 				</months>
@@ -1636,23 +1719,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<day type="sat">Сб</day>
 						</dayWidth>
 						<dayWidth type="wide">
-							<day type="sun">Неділя</day>
-							<day type="mon">Понеділок</day>
-							<day type="tue">Вівторок</day>
-							<day type="wed">Середа</day>
-							<day type="thu">Четвер</day>
-							<day type="fri">Пʼятниця</day>
-							<day type="sat">Субота</day>
+							<day type="sun">неділя</day>
+							<day type="mon">понеділок</day>
+							<day type="tue">вівторок</day>
+							<day type="wed">середа</day>
+							<day type="thu">четвер</day>
+							<day type="fri">пʼятниця</day>
+							<day type="sat">субота</day>
 						</dayWidth>
 					</dayContext>
 				</days>
 				<quarters>
 					<quarterContext type="format">
 						<quarterWidth type="abbreviated">
-							<quarter type="1">I кв.</quarter>
-							<quarter type="2">II кв.</quarter>
-							<quarter type="3">III кв.</quarter>
-							<quarter type="4">IV кв.</quarter>
+							<quarter type="1">1-й кв.</quarter>
+							<quarter type="2">2-й кв.</quarter>
+							<quarter type="3">3-й кв.</quarter>
+							<quarter type="4">4-й кв.</quarter>
 						</quarterWidth>
 						<quarterWidth type="narrow">
 							<quarter type="1">1</quarter>
@@ -1661,10 +1744,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<quarter type="4">4</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
-							<quarter type="1">I квартал</quarter>
-							<quarter type="2">II квартал</quarter>
-							<quarter type="3">III квартал</quarter>
-							<quarter type="4">IV квартал</quarter>
+							<quarter type="1">1-й квартал</quarter>
+							<quarter type="2">2-й квартал</quarter>
+							<quarter type="3">3-й квартал</quarter>
+							<quarter type="4">4-й квартал</quarter>
 						</quarterWidth>
 					</quarterContext>
 					<quarterContext type="stand-alone">
@@ -1690,40 +1773,76 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="afternoon" draft="contributed">дня</dayPeriod>
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">північ</dayPeriod>
+							<dayPeriod type="am">дп</dayPeriod>
+							<dayPeriod type="noon">пополудні</dayPeriod>
+							<dayPeriod type="pm">пп</dayPeriod>
+							<dayPeriod type="morning1">ранку</dayPeriod>
+							<dayPeriod type="afternoon1">дня</dayPeriod>
+							<dayPeriod type="evening1">вечора</dayPeriod>
+							<dayPeriod type="night1">ночі</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">північ</dayPeriod>
+							<dayPeriod type="am">дп</dayPeriod>
+							<dayPeriod type="noon">п</dayPeriod>
+							<dayPeriod type="pm">пп</dayPeriod>
+							<dayPeriod type="morning1">ранку</dayPeriod>
+							<dayPeriod type="afternoon1">дня</dayPeriod>
+							<dayPeriod type="evening1">вечора</dayPeriod>
+							<dayPeriod type="night1">ночі</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">північ</dayPeriod>
+							<dayPeriod type="am">дп</dayPeriod>
+							<dayPeriod type="noon">пополудні</dayPeriod>
+							<dayPeriod type="pm">пп</dayPeriod>
+							<dayPeriod type="morning1">ранку</dayPeriod>
+							<dayPeriod type="afternoon1">дня</dayPeriod>
+							<dayPeriod type="evening1">вечора</dayPeriod>
+							<dayPeriod type="night1">ночі</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">дп</dayPeriod>
+							<dayPeriod type="noon">полудень</dayPeriod>
+							<dayPeriod type="pm">пп</dayPeriod>
+							<dayPeriod type="morning1">ранок</dayPeriod>
+							<dayPeriod type="afternoon1">день</dayPeriod>
+							<dayPeriod type="evening1">вечір</dayPeriod>
+							<dayPeriod type="night1">ніч</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am">дп</dayPeriod>
-							<dayPeriod type="evening" draft="contributed">вечора</dayPeriod>
-							<dayPeriod type="morning" draft="contributed">ранку</dayPeriod>
-							<dayPeriod type="noon" draft="contributed">п</dayPeriod>
 							<dayPeriod type="pm">пп</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="afternoon" draft="contributed">дня</dayPeriod>
 							<dayPeriod type="am">дп</dayPeriod>
-							<dayPeriod type="evening" draft="contributed">вечора</dayPeriod>
-							<dayPeriod type="morning" draft="contributed">ранку</dayPeriod>
-							<dayPeriod type="night" draft="contributed">ночі</dayPeriod>
-							<dayPeriod type="noon">полудня</dayPeriod>
+							<dayPeriod type="noon">полудень</dayPeriod>
 							<dayPeriod type="pm">пп</dayPeriod>
+							<dayPeriod type="morning1">ранок</dayPeriod>
+							<dayPeriod type="afternoon1">день</dayPeriod>
+							<dayPeriod type="evening1">вечір</dayPeriod>
+							<dayPeriod type="night1">ніч</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
 						<era type="0">до нашої ери</era>
+						<era type="0" alt="variant">до нової ери</era>
 						<era type="1">нашої ери</era>
+						<era type="1" alt="variant">нової ери</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0">до н.е.</era>
-						<era type="1">н.е.</era>
-						<era type="1" alt="variant" draft="provisional">н. е.</era>
+						<era type="0">до н. е.</era>
+						<era type="1">н. е.</era>
 					</eraAbbr>
 					<eraNarrow>
 						<era type="0">до н.е.</era>
-						<era type="0" alt="variant" draft="contributed">до н. е.</era>
 						<era type="1">н.е.</era>
-						<era type="1" alt="variant" draft="contributed">н. е.</era>
 					</eraNarrow>
 				</eras>
 				<dateFormats>
@@ -1773,27 +1892,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1} 'о' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1} 'о' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
@@ -1805,13 +1924,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
 						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">HH</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
+						<dateFormatItem id="M">LL</dateFormatItem>
 						<dateFormatItem id="Md">dd.MM</dateFormatItem>
 						<dateFormatItem id="MEd">E, dd.MM</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
@@ -1975,65 +2096,76 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<months>
 					<monthContext type="format">
 						<monthWidth type="abbreviated">
-							<month type="1" draft="provisional">чайт.</month>
-							<month type="2" draft="provisional">вайс.</month>
-							<month type="3" draft="provisional">джай.</month>
-							<month type="4" draft="provisional">асад.</month>
-							<month type="5" draft="provisional">шрав.</month>
-							<month type="6" draft="provisional">бхад.</month>
-							<month type="7" draft="provisional">асв.</month>
-							<month type="8" draft="provisional">кар.</month>
-							<month type="9" draft="provisional">агр.</month>
-							<month type="10" draft="provisional">паус.</month>
-							<month type="11" draft="provisional">маг.</month>
-							<month type="12" draft="provisional">фаль.</month>
+							<month type="1" draft="contributed">чайт.</month>
+							<month type="2" draft="contributed">вайс.</month>
+							<month type="3" draft="contributed">джай.</month>
+							<month type="4" draft="contributed">асад.</month>
+							<month type="5" draft="contributed">шрав.</month>
+							<month type="6" draft="contributed">бхад.</month>
+							<month type="7" draft="contributed">асв.</month>
+							<month type="8" draft="contributed">кар.</month>
+							<month type="9" draft="contributed">агр.</month>
+							<month type="10" draft="contributed">паус.</month>
+							<month type="11" draft="contributed">маг.</month>
+							<month type="12" draft="contributed">фаль.</month>
 						</monthWidth>
 						<monthWidth type="wide">
-							<month type="1" draft="provisional">чайтра</month>
-							<month type="2" draft="provisional">вайсакха</month>
-							<month type="3" draft="provisional">джайстха</month>
-							<month type="4" draft="provisional">асадха</month>
-							<month type="5" draft="provisional">шравана</month>
-							<month type="6" draft="provisional">бхадра</month>
-							<month type="7" draft="provisional">асвіна</month>
-							<month type="8" draft="provisional">картіка</month>
-							<month type="9" draft="provisional">аграхаяна</month>
-							<month type="10" draft="provisional">пауса</month>
-							<month type="11" draft="provisional">магха</month>
-							<month type="12" draft="provisional">фальгуна</month>
+							<month type="1" draft="contributed">чайтра</month>
+							<month type="2" draft="contributed">вайсакха</month>
+							<month type="3" draft="contributed">джайстха</month>
+							<month type="4" draft="contributed">асадха</month>
+							<month type="5" draft="contributed">шравана</month>
+							<month type="6" draft="contributed">бхадра</month>
+							<month type="7" draft="contributed">асвіна</month>
+							<month type="8" draft="contributed">картіка</month>
+							<month type="9" draft="contributed">аграхаяна</month>
+							<month type="10" draft="contributed">пауса</month>
+							<month type="11" draft="contributed">магха</month>
+							<month type="12" draft="contributed">фальгуна</month>
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
 						<monthWidth type="abbreviated">
-							<month type="1" draft="provisional">Чайт</month>
-							<month type="2" draft="provisional">Вайс</month>
-							<month type="3" draft="provisional">Джай</month>
-							<month type="4" draft="provisional">Асад</month>
-							<month type="5" draft="provisional">Шрав</month>
-							<month type="6" draft="provisional">Бхад</month>
-							<month type="7" draft="provisional">Асв</month>
-							<month type="8" draft="provisional">Кар</month>
-							<month type="9" draft="provisional">Агр</month>
-							<month type="10" draft="provisional">Паус</month>
-							<month type="11" draft="provisional">Маг</month>
-							<month type="12" draft="provisional">Фаль</month>
+							<month type="1" draft="contributed">чайт.</month>
+							<month type="2" draft="contributed">вайс.</month>
+							<month type="3" draft="contributed">джай.</month>
+							<month type="4" draft="contributed">асад.</month>
+							<month type="5" draft="contributed">шрав.</month>
+							<month type="6" draft="contributed">бхад.</month>
+							<month type="7" draft="contributed">асв.</month>
+							<month type="8" draft="contributed">кар.</month>
+							<month type="9" draft="contributed">агр.</month>
+							<month type="10" draft="contributed">паус.</month>
+							<month type="11" draft="contributed">маг.</month>
+							<month type="12" draft="contributed">фаль.</month>
 						</monthWidth>
 						<monthWidth type="wide">
-							<month type="1" draft="provisional">Чайтра</month>
-							<month type="2" draft="provisional">Вайсакха</month>
-							<month type="3" draft="provisional">Джайстха</month>
-							<month type="4" draft="provisional">Асадха</month>
-							<month type="5" draft="provisional">Шравана</month>
-							<month type="6" draft="provisional">Бхадра</month>
-							<month type="7" draft="provisional">Асвіна</month>
-							<month type="8" draft="provisional">Картіка</month>
-							<month type="9" draft="provisional">Аграхаяна</month>
-							<month type="10" draft="provisional">Пауса</month>
-							<month type="11" draft="provisional">Магха</month>
-							<month type="12" draft="provisional">Фальгуна</month>
+							<month type="1" draft="contributed">чайтра</month>
+							<month type="2" draft="contributed">вайсакха</month>
+							<month type="3" draft="contributed">джайстха</month>
+							<month type="4" draft="contributed">асадха</month>
+							<month type="5" draft="contributed">шравана</month>
+							<month type="6" draft="contributed">бхадра</month>
+							<month type="7" draft="contributed">асвіна</month>
+							<month type="8" draft="contributed">картіка</month>
+							<month type="9" draft="contributed">аграхаяна</month>
+							<month type="10" draft="contributed">пауса</month>
+							<month type="11" draft="contributed">магха</month>
+							<month type="12" draft="contributed">фальгуна</month>
 						</monthWidth>
 					</monthContext>
 				</months>
+				<eras>
+					<eraNames>
+						<era type="0" draft="contributed">Saka</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0" draft="contributed">Saka</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0" draft="contributed">Saka</era>
+					</eraNarrow>
+				</eras>
 			</calendar>
 			<calendar type="islamic">
 				<months>
@@ -2041,8 +2173,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<monthWidth type="abbreviated">
 							<month type="1" draft="provisional">мух.</month>
 							<month type="2" draft="provisional">саф.</month>
-							<month type="3" draft="provisional">раб. I</month>
-							<month type="4" draft="provisional">раб. II</month>
+							<month type="3" draft="provisional">рабі I</month>
+							<month type="4" draft="provisional">рабі II</month>
 							<month type="5" draft="provisional">джум. I</month>
 							<month type="6" draft="provisional">джум. II</month>
 							<month type="7" draft="provisional">радж.</month>
@@ -2071,8 +2203,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<monthWidth type="abbreviated">
 							<month type="1" draft="provisional">Мух</month>
 							<month type="2" draft="provisional">Саф</month>
-							<month type="3" draft="provisional">Раб I</month>
-							<month type="4" draft="provisional">Раб.II</month>
+							<month type="3" draft="provisional">Рабі I</month>
+							<month type="4" draft="provisional">Рабі II</month>
 							<month type="5" draft="provisional">Джум I</month>
 							<month type="6" draft="provisional">Джум II</month>
 							<month type="7" draft="provisional">Радж</month>
@@ -2334,13 +2466,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="1" draft="provisional">фар.</month>
 							<month type="2" draft="provisional">орд.</month>
 							<month type="3" draft="provisional">хор.</month>
-							<month type="4" draft="provisional">тір.</month>
+							<month type="4" draft="provisional">тір</month>
 							<month type="5" draft="provisional">мор.</month>
 							<month type="6" draft="provisional">шах.</month>
 							<month type="7" draft="provisional">мех.</month>
-							<month type="8" draft="provisional">абан.</month>
-							<month type="9" draft="provisional">азер.</month>
-							<month type="10" draft="provisional">дея</month>
+							<month type="8" draft="provisional">абан</month>
+							<month type="9" draft="provisional">азер</month>
+							<month type="10" draft="provisional">дей</month>
 							<month type="11" draft="provisional">бах.</month>
 							<month type="12" draft="provisional">есф.</month>
 						</monthWidth>
@@ -2370,7 +2502,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="7" draft="provisional">Мех</month>
 							<month type="8" draft="provisional">Абан</month>
 							<month type="9" draft="provisional">Азер</month>
-							<month type="10" draft="provisional">Дея</month>
+							<month type="10" draft="provisional">Дей</month>
 							<month type="11" draft="provisional">Бах</month>
 							<month type="12" draft="provisional">Есф</month>
 						</monthWidth>
@@ -2380,10 +2512,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</calendars>
 		<fields>
 			<field type="era">
-				<displayName>Ера</displayName>
+				<displayName>ера</displayName>
 			</field>
 			<field type="year">
-				<displayName>Рік</displayName>
+				<displayName>рік</displayName>
 				<relative type="-1">торік</relative>
 				<relative type="0">цього року</relative>
 				<relative type="1">наступного року</relative>
@@ -2402,6 +2534,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>р.</displayName>
+				<relative type="-1">торік</relative>
+				<relative type="0">цього року</relative>
+				<relative type="1">наступного року</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">через {0} р.</relativeTimePattern>
 					<relativeTimePattern count="few">через {0} р.</relativeTimePattern>
@@ -2417,6 +2552,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>р.</displayName>
+				<relative type="-1">торік</relative>
+				<relative type="0">цього року</relative>
+				<relative type="1">наступного року</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} р.</relativeTimePattern>
 					<relativeTimePattern count="few">+{0} р.</relativeTimePattern>
@@ -2431,7 +2569,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="quarter">
-				<displayName>Квартал</displayName>
+				<displayName>квартал</displayName>
+				<relative type="-1">минулого кварталу</relative>
+				<relative type="0">цього кварталу</relative>
+				<relative type="1">наступного кварталу</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">через {0} квартал</relativeTimePattern>
 					<relativeTimePattern count="few">через {0} квартали</relativeTimePattern>
@@ -2447,6 +2588,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>кв.</displayName>
+				<relative type="-1">минулого кв.</relative>
+				<relative type="0">цього кв.</relative>
+				<relative type="1">наступного кв.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">через {0} кв.</relativeTimePattern>
 					<relativeTimePattern count="few">через {0} кв.</relativeTimePattern>
@@ -2462,6 +2606,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>кв.</displayName>
+				<relative type="-1" draft="contributed">минулого кв.</relative>
+				<relative type="0" draft="contributed">цього кв.</relative>
+				<relative type="1" draft="contributed">наступного кв.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} кв.</relativeTimePattern>
 					<relativeTimePattern count="few">+{0} кв.</relativeTimePattern>
@@ -2476,7 +2623,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="month">
-				<displayName>Місяць</displayName>
+				<displayName>місяць</displayName>
 				<relative type="-1">минулого місяця</relative>
 				<relative type="0">цього місяця</relative>
 				<relative type="1">наступного місяця</relative>
@@ -2524,7 +2671,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="week">
-				<displayName>Тиждень</displayName>
+				<displayName>тиждень</displayName>
 				<relative type="-1">минулого тижня</relative>
 				<relative type="0">цього тижня</relative>
 				<relative type="1">наступного тижня</relative>
@@ -2572,7 +2719,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day">
-				<displayName>День</displayName>
+				<displayName>день</displayName>
 				<relative type="-2">позавчора</relative>
 				<relative type="-1">учора</relative>
 				<relative type="0">сьогодні</relative>
@@ -2593,6 +2740,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>д.</displayName>
+				<relative type="-2">позавчора</relative>
+				<relative type="-1">учора</relative>
+				<relative type="0">сьогодні</relative>
+				<relative type="1">завтра</relative>
+				<relative type="2">післязавтра</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">через {0} д.</relativeTimePattern>
 					<relativeTimePattern count="few">через {0} дн.</relativeTimePattern>
@@ -2608,6 +2760,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>д.</displayName>
+				<relative type="-2">позавчора</relative>
+				<relative type="-1">учора</relative>
+				<relative type="0">сьогодні</relative>
+				<relative type="1">завтра</relative>
+				<relative type="2">післязавтра</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} день</relativeTimePattern>
 					<relativeTimePattern count="few">+{0} дн.</relativeTimePattern>
@@ -2622,7 +2779,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="weekday">
-				<displayName>День тижня</displayName>
+				<displayName>день тижня</displayName>
 			</field>
 			<field type="sun">
 				<relative type="-1">минулої неділі</relative>
@@ -2730,10 +2887,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">наст. сб</relative>
 			</field>
 			<field type="dayperiod">
-				<displayName>Частина доби</displayName>
+				<displayName>частина доби</displayName>
 			</field>
 			<field type="hour">
-				<displayName>Година</displayName>
+				<displayName>година</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">через {0} годину</relativeTimePattern>
 					<relativeTimePattern count="few">через {0} години</relativeTimePattern>
@@ -2778,7 +2935,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="minute">
-				<displayName>Хвилина</displayName>
+				<displayName>хвилина</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">через {0} хвилину</relativeTimePattern>
 					<relativeTimePattern count="few">через {0} хвилини</relativeTimePattern>
@@ -2823,7 +2980,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="second">
-				<displayName>Секунда</displayName>
+				<displayName>секунда</displayName>
 				<relative type="0">зараз</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">через {0} секунду</relativeTimePattern>
@@ -2869,7 +3026,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>Часовий пояс</displayName>
+				<displayName>часовий пояс</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
@@ -3295,7 +3452,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Санто-Домінго</exemplarCity>
 			</zone>
 			<zone type="Africa/Algiers">
-				<exemplarCity>м. Алжир</exemplarCity>
+				<exemplarCity>Алжир</exemplarCity>
 			</zone>
 			<zone type="Pacific/Galapagos">
 				<exemplarCity>Галапагоські острови</exemplarCity>
@@ -3356,7 +3513,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</zone>
 			<zone type="Europe/London">
 				<long>
-					<daylight draft="contributed">за літнім часом у Великобританії</daylight>
+					<daylight>за літнім часом у Великій Британії</daylight>
 				</long>
 				<exemplarCity>Лондон</exemplarCity>
 			</zone>
@@ -3747,6 +3904,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Порт-Морсбі</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Бугенвіль</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Маніла</exemplarCity>
 			</zone>
@@ -3831,6 +3991,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Іркутськ</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Чита</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Якутськ</exemplarCity>
 			</zone>
@@ -3849,6 +4012,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Магадан</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Середньоколимськ</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Камчатка</exemplarCity>
 			</zone>
@@ -3907,7 +4073,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Джуба</exemplarCity>
 			</zone>
 			<zone type="Africa/Sao_Tome">
-				<exemplarCity>Сан-Томе і Принсіпі</exemplarCity>
+				<exemplarCity>Сан-Томе</exemplarCity>
 			</zone>
 			<zone type="America/El_Salvador">
 				<exemplarCity>Сальвадор</exemplarCity>
@@ -3949,7 +4115,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Ашгабат</exemplarCity>
 			</zone>
 			<zone type="Africa/Tunis">
-				<exemplarCity>м. Туніс</exemplarCity>
+				<exemplarCity>Туніс</exemplarCity>
 			</zone>
 			<zone type="Pacific/Tongatapu">
 				<exemplarCity>Тонгатапу</exemplarCity>
@@ -4213,9 +4379,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic draft="contributed">за часом в Апіа</generic>
-					<standard draft="contributed">за стандартним часом в Апіа</standard>
-					<daylight draft="contributed">за літнім часом в Апіа</daylight>
+					<generic>за часом в Апіа</generic>
+					<standard>за стандартним часом в Апіа</standard>
+					<daylight>за літнім часом в Апіа</daylight>
 				</long>
 			</metazone>
 			<metazone type="Arabian">
@@ -4309,7 +4475,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Bolivia">
 				<long>
-					<standard>за часом у Болівії</standard>
+					<standard>за болівійським часом</standard>
 				</long>
 			</metazone>
 			<metazone type="Brasilia">
@@ -4438,7 +4604,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
 				<long>
-					<standard draft="contributed">за далекосхідним європейським часом</standard>
+					<standard>за далекосхідним європейським часом</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
@@ -5066,7 +5232,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<superscriptingExponent>×</superscriptingExponent>
 			<perMille>‰</perMille>
 			<infinity>∞</infinity>
-			<nan>Не число</nan>
+			<nan>NaN</nan>
 			<timeSeparator draft="contributed">:</timeSeparator>
 		</symbols>
 		<decimalFormats numberSystem="latn">
@@ -5077,82 +5243,82 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</decimalFormatLength>
 			<decimalFormatLength type="long">
 				<decimalFormat>
-					<pattern type="1000" count="one" draft="contributed">0 тисяча</pattern>
-					<pattern type="1000" count="few" draft="contributed">0 тисячі</pattern>
-					<pattern type="1000" count="many" draft="contributed">0 тисяч</pattern>
-					<pattern type="1000" count="other" draft="contributed">0 тисячі</pattern>
-					<pattern type="10000" count="one" draft="contributed">00 тисяча</pattern>
-					<pattern type="10000" count="few" draft="contributed">00 тисячі</pattern>
-					<pattern type="10000" count="many" draft="contributed">00 тисяч</pattern>
-					<pattern type="10000" count="other" draft="contributed">00 тисячі</pattern>
-					<pattern type="100000" count="one" draft="contributed">000 тисяча</pattern>
-					<pattern type="100000" count="few" draft="contributed">000 тисячі</pattern>
-					<pattern type="100000" count="many" draft="contributed">000 тисяч</pattern>
-					<pattern type="100000" count="other" draft="contributed">000 тисячі</pattern>
-					<pattern type="1000000" count="one" draft="contributed">0 мільйон</pattern>
-					<pattern type="1000000" count="few" draft="contributed">0 мільйони</pattern>
-					<pattern type="1000000" count="many" draft="contributed">0 мільйонів</pattern>
-					<pattern type="1000000" count="other" draft="contributed">0 мільйона</pattern>
-					<pattern type="10000000" count="one" draft="contributed">00 мільйон</pattern>
-					<pattern type="10000000" count="few" draft="contributed">00 мільйони</pattern>
-					<pattern type="10000000" count="many" draft="contributed">00 мільйонів</pattern>
-					<pattern type="10000000" count="other" draft="contributed">00 мільйона</pattern>
-					<pattern type="100000000" count="one" draft="contributed">000 мільйон</pattern>
-					<pattern type="100000000" count="few" draft="contributed">000 мільйони</pattern>
-					<pattern type="100000000" count="many" draft="contributed">000 мільйонів</pattern>
-					<pattern type="100000000" count="other" draft="contributed">000 мільйона</pattern>
-					<pattern type="1000000000" count="one" draft="contributed">0 мільярд</pattern>
-					<pattern type="1000000000" count="few" draft="contributed">0 мільярди</pattern>
-					<pattern type="1000000000" count="many" draft="contributed">0 мільярдів</pattern>
-					<pattern type="1000000000" count="other" draft="contributed">0 мільярда</pattern>
-					<pattern type="10000000000" count="one" draft="contributed">00 мільярд</pattern>
-					<pattern type="10000000000" count="few" draft="contributed">00 мільярди</pattern>
-					<pattern type="10000000000" count="many" draft="contributed">00 мільярдів</pattern>
-					<pattern type="10000000000" count="other" draft="contributed">00 мільярда</pattern>
-					<pattern type="100000000000" count="one" draft="contributed">000 мільярд</pattern>
-					<pattern type="100000000000" count="few" draft="contributed">000 мільярди</pattern>
-					<pattern type="100000000000" count="many" draft="contributed">000 мільярдів</pattern>
-					<pattern type="100000000000" count="other" draft="contributed">000 мільярда</pattern>
-					<pattern type="1000000000000" count="one" draft="contributed">0 трильйон</pattern>
-					<pattern type="1000000000000" count="few" draft="contributed">0 трильйони</pattern>
-					<pattern type="1000000000000" count="many" draft="contributed">0 трильйонів</pattern>
-					<pattern type="1000000000000" count="other" draft="contributed">0 трильйона</pattern>
-					<pattern type="10000000000000" count="one" draft="contributed">00 трильйон</pattern>
-					<pattern type="10000000000000" count="few" draft="contributed">00 трильйони</pattern>
-					<pattern type="10000000000000" count="many" draft="contributed">00 трильйонів</pattern>
-					<pattern type="10000000000000" count="other" draft="contributed">00 трильйона</pattern>
-					<pattern type="100000000000000" count="one" draft="contributed">000 трильйон</pattern>
-					<pattern type="100000000000000" count="few" draft="contributed">000 трильйони</pattern>
-					<pattern type="100000000000000" count="many" draft="contributed">000 трильйонів</pattern>
-					<pattern type="100000000000000" count="other" draft="contributed">000 трильйона</pattern>
+					<pattern type="1000" count="one">0 тисяча</pattern>
+					<pattern type="1000" count="few">0 тисячі</pattern>
+					<pattern type="1000" count="many">0 тисяч</pattern>
+					<pattern type="1000" count="other">0 тисячі</pattern>
+					<pattern type="10000" count="one">00 тисяча</pattern>
+					<pattern type="10000" count="few">00 тисячі</pattern>
+					<pattern type="10000" count="many">00 тисяч</pattern>
+					<pattern type="10000" count="other">00 тисячі</pattern>
+					<pattern type="100000" count="one">000 тисяча</pattern>
+					<pattern type="100000" count="few">000 тисячі</pattern>
+					<pattern type="100000" count="many">000 тисяч</pattern>
+					<pattern type="100000" count="other">000 тисячі</pattern>
+					<pattern type="1000000" count="one">0 мільйон</pattern>
+					<pattern type="1000000" count="few">0 мільйони</pattern>
+					<pattern type="1000000" count="many">0 мільйонів</pattern>
+					<pattern type="1000000" count="other">0 мільйона</pattern>
+					<pattern type="10000000" count="one">00 мільйон</pattern>
+					<pattern type="10000000" count="few">00 мільйони</pattern>
+					<pattern type="10000000" count="many">00 мільйонів</pattern>
+					<pattern type="10000000" count="other">00 мільйона</pattern>
+					<pattern type="100000000" count="one">000 мільйон</pattern>
+					<pattern type="100000000" count="few">000 мільйони</pattern>
+					<pattern type="100000000" count="many">000 мільйонів</pattern>
+					<pattern type="100000000" count="other">000 мільйона</pattern>
+					<pattern type="1000000000" count="one">0 мільярд</pattern>
+					<pattern type="1000000000" count="few">0 мільярди</pattern>
+					<pattern type="1000000000" count="many">0 мільярдів</pattern>
+					<pattern type="1000000000" count="other">0 мільярда</pattern>
+					<pattern type="10000000000" count="one">00 мільярд</pattern>
+					<pattern type="10000000000" count="few">00 мільярди</pattern>
+					<pattern type="10000000000" count="many">00 мільярдів</pattern>
+					<pattern type="10000000000" count="other">00 мільярда</pattern>
+					<pattern type="100000000000" count="one">000 мільярд</pattern>
+					<pattern type="100000000000" count="few">000 мільярди</pattern>
+					<pattern type="100000000000" count="many">000 мільярдів</pattern>
+					<pattern type="100000000000" count="other">000 мільярда</pattern>
+					<pattern type="1000000000000" count="one">0 трильйон</pattern>
+					<pattern type="1000000000000" count="few">0 трильйони</pattern>
+					<pattern type="1000000000000" count="many">0 трильйонів</pattern>
+					<pattern type="1000000000000" count="other">0 трильйона</pattern>
+					<pattern type="10000000000000" count="one">00 трильйон</pattern>
+					<pattern type="10000000000000" count="few">00 трильйони</pattern>
+					<pattern type="10000000000000" count="many">00 трильйонів</pattern>
+					<pattern type="10000000000000" count="other">00 трильйона</pattern>
+					<pattern type="100000000000000" count="one">000 трильйон</pattern>
+					<pattern type="100000000000000" count="few">000 трильйони</pattern>
+					<pattern type="100000000000000" count="many">000 трильйонів</pattern>
+					<pattern type="100000000000000" count="other">000 трильйона</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
 			<decimalFormatLength type="short">
 				<decimalFormat>
-					<pattern type="1000" count="one" draft="contributed">0 тис</pattern>
-					<pattern type="1000" count="few" draft="contributed">0 тис</pattern>
-					<pattern type="1000" count="many" draft="contributed">0 тис</pattern>
-					<pattern type="1000" count="other" draft="contributed">0 тис</pattern>
-					<pattern type="10000" count="one" draft="contributed">00 тис</pattern>
-					<pattern type="10000" count="few" draft="contributed">00 тис</pattern>
-					<pattern type="10000" count="many" draft="contributed">00 тис</pattern>
-					<pattern type="10000" count="other" draft="contributed">00 тис</pattern>
-					<pattern type="100000" count="one" draft="contributed">000 тис</pattern>
-					<pattern type="100000" count="few" draft="contributed">000 тис</pattern>
-					<pattern type="100000" count="many" draft="contributed">000 тис</pattern>
-					<pattern type="100000" count="other" draft="contributed">000 тис</pattern>
-					<pattern type="1000000" count="one" draft="contributed">0 млн</pattern>
-					<pattern type="1000000" count="few" draft="contributed">0 млн</pattern>
-					<pattern type="1000000" count="many" draft="contributed">0 млн</pattern>
-					<pattern type="1000000" count="other" draft="contributed">0 млн</pattern>
-					<pattern type="10000000" count="one" draft="contributed">00 млн</pattern>
-					<pattern type="10000000" count="few" draft="contributed">00 млн</pattern>
-					<pattern type="10000000" count="many" draft="contributed">00 млн</pattern>
-					<pattern type="10000000" count="other" draft="contributed">00 млн</pattern>
-					<pattern type="100000000" count="one" draft="contributed">000 млн</pattern>
-					<pattern type="100000000" count="few" draft="contributed">000 млн</pattern>
-					<pattern type="100000000" count="many" draft="contributed">000 млн</pattern>
-					<pattern type="100000000" count="other" draft="contributed">000 млн</pattern>
+					<pattern type="1000" count="one">0 тис'.'</pattern>
+					<pattern type="1000" count="few">0 тис'.'</pattern>
+					<pattern type="1000" count="many">0 тис'.'</pattern>
+					<pattern type="1000" count="other">0 тис'.'</pattern>
+					<pattern type="10000" count="one">00 тис'.'</pattern>
+					<pattern type="10000" count="few">00 тис'.'</pattern>
+					<pattern type="10000" count="many">00 тис'.'</pattern>
+					<pattern type="10000" count="other">00 тис'.'</pattern>
+					<pattern type="100000" count="one">000 тис'.'</pattern>
+					<pattern type="100000" count="few">000 тис'.'</pattern>
+					<pattern type="100000" count="many">000 тис'.'</pattern>
+					<pattern type="100000" count="other">000 тис'.'</pattern>
+					<pattern type="1000000" count="one">0 млн</pattern>
+					<pattern type="1000000" count="few">0 млн</pattern>
+					<pattern type="1000000" count="many">0 млн</pattern>
+					<pattern type="1000000" count="other">0 млн</pattern>
+					<pattern type="10000000" count="one">00 млн</pattern>
+					<pattern type="10000000" count="few">00 млн</pattern>
+					<pattern type="10000000" count="many">00 млн</pattern>
+					<pattern type="10000000" count="other">00 млн</pattern>
+					<pattern type="100000000" count="one">000 млн</pattern>
+					<pattern type="100000000" count="few">000 млн</pattern>
+					<pattern type="100000000" count="many">000 млн</pattern>
+					<pattern type="100000000" count="other">000 млн</pattern>
 					<pattern type="1000000000" count="one">0 млрд</pattern>
 					<pattern type="1000000000" count="few">0 млрд</pattern>
 					<pattern type="1000000000" count="many">0 млрд</pattern>
@@ -5203,6 +5369,58 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00¤;(#,##0.00¤)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">0 тис'.' ¤</pattern>
+					<pattern type="1000" count="few">0 тис'.' ¤</pattern>
+					<pattern type="1000" count="many">0 тис'.' ¤</pattern>
+					<pattern type="1000" count="other">0 тис'.' ¤</pattern>
+					<pattern type="10000" count="one">00 тис'.' ¤</pattern>
+					<pattern type="10000" count="few">00 тис'.' ¤</pattern>
+					<pattern type="10000" count="many">00 тис'.' ¤</pattern>
+					<pattern type="10000" count="other">00 тис'.' ¤</pattern>
+					<pattern type="100000" count="one">000 тис'.' ¤</pattern>
+					<pattern type="100000" count="few">000 тис'.' ¤</pattern>
+					<pattern type="100000" count="many">000 тис'.' ¤</pattern>
+					<pattern type="100000" count="other">000 тис'.' ¤</pattern>
+					<pattern type="1000000" count="one">0 млн ¤</pattern>
+					<pattern type="1000000" count="few">0 млн ¤</pattern>
+					<pattern type="1000000" count="many">0 млн ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="one">00 млн ¤</pattern>
+					<pattern type="10000000" count="few">00 млн ¤</pattern>
+					<pattern type="10000000" count="many">00 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="one">000 млн ¤</pattern>
+					<pattern type="100000000" count="few">000 млн ¤</pattern>
+					<pattern type="100000000" count="many">000 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="one">0 млрд ¤</pattern>
+					<pattern type="1000000000" count="few">0 млрд ¤</pattern>
+					<pattern type="1000000000" count="many">0 млрд ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="one">00 млрд ¤</pattern>
+					<pattern type="10000000000" count="few">00 млрд ¤</pattern>
+					<pattern type="10000000000" count="many">00 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="one">000 млрд ¤</pattern>
+					<pattern type="100000000000" count="few">000 млрд ¤</pattern>
+					<pattern type="100000000000" count="many">000 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="one">0 трлн ¤</pattern>
+					<pattern type="1000000000000" count="few">0 трлн ¤</pattern>
+					<pattern type="1000000000000" count="many">0 трлн ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="one">00 трлн ¤</pattern>
+					<pattern type="10000000000000" count="few">00 трлн ¤</pattern>
+					<pattern type="10000000000000" count="many">00 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="one">000 трлн ¤</pattern>
+					<pattern type="100000000000000" count="few">000 трлн ¤</pattern>
+					<pattern type="100000000000000" count="many">000 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="few">{0} {1}</unitPattern>
 			<unitPattern count="many">{0} {1}</unitPattern>
@@ -5266,6 +5484,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">ангольських кванз</displayName>
 				<displayName count="other">ангольської кванзи</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>ангольська кванза (1977–1990)</displayName>
@@ -5336,10 +5555,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="AZN">
 				<displayName>азербайджанський манат</displayName>
-				<displayName count="one" draft="contributed">азербайджанський манат</displayName>
-				<displayName count="few" draft="contributed">азербайджанські манати</displayName>
-				<displayName count="many" draft="contributed">азербайджанських манатів</displayName>
-				<displayName count="other" draft="contributed">азербайджанського маната</displayName>
+				<displayName count="one">азербайджанський манат</displayName>
+				<displayName count="few">азербайджанські манати</displayName>
+				<displayName count="many">азербайджанських манатів</displayName>
+				<displayName count="other">азербайджанського маната</displayName>
 				<symbol>AZN</symbol>
 			</currency>
 			<currency type="BAD">
@@ -5352,6 +5571,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">конвертованих марок Боснії і Герцеговини</displayName>
 				<displayName count="other">конвертованої марки Боснії і Герцеговини</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>барбадоський долар</displayName>
@@ -5432,6 +5652,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">болівійських болівіано</displayName>
 				<displayName count="other">болівійського болівіано</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOP">
 				<displayName>болівійське песо</displayName>
@@ -5490,6 +5711,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">ботсванських пул</displayName>
 				<displayName count="other">ботсванської пули</displayName>
 				<symbol draft="contributed">BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>білоруський новий рубль (1994–1999)</displayName>
@@ -5505,7 +5727,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">білоруських рублів</displayName>
 				<displayName count="other">білоруського рубля</displayName>
 				<symbol>BYR</symbol>
-				<symbol alt="narrow" draft="contributed">руб.</symbol>
+				<symbol alt="narrow" draft="contributed">р.</symbol>
 			</currency>
 			<currency type="BZD">
 				<displayName>белізький долар</displayName>
@@ -5602,6 +5824,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">кубинських конвертованих песо</displayName>
 				<displayName count="other">кубинського конвертованого песо</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>кубинський песо</displayName>
@@ -5630,6 +5853,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">чеських крон</displayName>
 				<displayName count="other">чеської крони</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>марка НДР</displayName>
@@ -5652,6 +5876,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">данських крон</displayName>
 				<displayName count="other">данської крони</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>домініканський песо</displayName>
@@ -5690,6 +5915,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">єгипетських фунтів</displayName>
 				<displayName count="other">єгипетського фунта</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>еритрейська накфа</displayName>
@@ -5744,6 +5970,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">фунтів Фолклендських островів</displayName>
 				<displayName count="other">фунта Фолклендських островів</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>французький франк</displayName>
@@ -5766,11 +5993,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="GEL">
 				<displayName>грузинський ларі</displayName>
-				<displayName count="one" draft="contributed">грузинський ларі</displayName>
-				<displayName count="few" draft="contributed">грузинські ларі</displayName>
-				<displayName count="many" draft="contributed">грузинських ларі</displayName>
-				<displayName count="other" draft="contributed">грузинського ларі</displayName>
+				<displayName count="one">грузинський ларі</displayName>
+				<displayName count="few">грузинські ларі</displayName>
+				<displayName count="many">грузинських ларі</displayName>
+				<displayName count="other">грузинського ларі</displayName>
 				<symbol draft="contributed">GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>ганський седі (1979–2007)</displayName>
@@ -5807,6 +6035,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">гвінейських франків</displayName>
 				<displayName count="other">гвінейського франка</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>гвінейське сілі</displayName>
@@ -5824,6 +6053,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">гватемальських кетсалів</displayName>
 				<displayName count="other">гватемальського кетсаля</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>ескудо португальської гвінеї</displayName>
@@ -5856,6 +6086,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">гондураських лемпір</displayName>
 				<displayName count="other">гондураської лемпіри</displayName>
 				<symbol draft="contributed">HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>хорватський динар</displayName>
@@ -5867,6 +6098,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">хорватських кун</displayName>
 				<displayName count="other">хорватської куни</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>гаїтянський гурд</displayName>
@@ -5883,6 +6115,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">угорських форинтів</displayName>
 				<displayName count="other">угорського форинта</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>індонезійська рупія</displayName>
@@ -5891,6 +6124,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">індонезійських рупій</displayName>
 				<displayName count="other">індонезійські рупії</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>ірландський фунт</displayName>
@@ -5900,19 +6134,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="ILS">
 				<displayName>ізраїльський новий шекель</displayName>
-				<displayName count="one" draft="contributed">ізраїльський новий шекель</displayName>
-				<displayName count="few" draft="contributed">ізраїльські нові шекелі</displayName>
-				<displayName count="many" draft="contributed">ізраїльських нових шекелів</displayName>
-				<displayName count="other" draft="contributed">ізраїльського нового шекеля</displayName>
+				<displayName count="one">ізраїльський новий шекель</displayName>
+				<displayName count="few">ізраїльські нові шекелі</displayName>
+				<displayName count="many">ізраїльських нових шекелів</displayName>
+				<displayName count="other">ізраїльського нового шекеля</displayName>
 				<symbol draft="contributed">ILS</symbol>
 				<symbol alt="narrow" draft="contributed">₪</symbol>
 			</currency>
 			<currency type="INR">
 				<displayName>індійська рупія</displayName>
-				<displayName count="one" draft="contributed">індійська рупія</displayName>
-				<displayName count="few" draft="contributed">індійські рупії</displayName>
-				<displayName count="many" draft="contributed">індійських рупій</displayName>
-				<displayName count="other" draft="contributed">індійської рупії</displayName>
+				<displayName count="one">індійська рупія</displayName>
+				<displayName count="few">індійські рупії</displayName>
+				<displayName count="many">індійських рупій</displayName>
+				<displayName count="other">індійської рупії</displayName>
 				<symbol draft="contributed">INR</symbol>
 				<symbol alt="narrow" draft="contributed">₹</symbol>
 			</currency>
@@ -5939,6 +6173,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">ісландських крон</displayName>
 				<displayName count="other">ісландської крони</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>італійська ліра</displayName>
@@ -5979,10 +6214,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="KGS">
 				<displayName>киргизький сом</displayName>
-				<displayName count="one" draft="contributed">киргизький сом</displayName>
-				<displayName count="few" draft="contributed">киргизькі соми</displayName>
-				<displayName count="many" draft="contributed">киргизьких сомів</displayName>
-				<displayName count="other" draft="contributed">киргизького сома</displayName>
+				<displayName count="one">киргизький сом</displayName>
+				<displayName count="few">киргизькі соми</displayName>
+				<displayName count="many">киргизьких сомів</displayName>
+				<displayName count="other">киргизького сома</displayName>
 				<symbol draft="contributed">KGS</symbol>
 			</currency>
 			<currency type="KHR">
@@ -6001,6 +6236,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">коморських франків</displayName>
 				<displayName count="other">коморського франка</displayName>
 				<symbol draft="contributed">KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>північнокорейський вон</displayName>
@@ -6009,6 +6245,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">північнокорейських вонів</displayName>
 				<displayName count="other">північнокорейського вона</displayName>
 				<symbol draft="contributed">KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>південнокорейський вон</displayName>
@@ -6038,10 +6275,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="KZT">
 				<displayName>казахстанський тенге</displayName>
-				<displayName count="one" draft="contributed">казахстанський тенге</displayName>
-				<displayName count="few" draft="contributed">казахстанські тенге</displayName>
-				<displayName count="many" draft="contributed">казахстанських тенге</displayName>
-				<displayName count="other" draft="contributed">казахстанського тенге</displayName>
+				<displayName count="one">казахстанський тенге</displayName>
+				<displayName count="few">казахстанські тенге</displayName>
+				<displayName count="many">казахстанських тенге</displayName>
+				<displayName count="other">казахстанського тенге</displayName>
 				<symbol draft="contributed">KZT</symbol>
 				<symbol alt="narrow" draft="contributed">₸</symbol>
 			</currency>
@@ -6061,6 +6298,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">ліванських фунтів</displayName>
 				<displayName count="other">ліванського фунта</displayName>
 				<symbol draft="contributed">LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>шрі-ланкійська рупія</displayName>
@@ -6069,6 +6307,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">шрі-ланкійських рупій</displayName>
 				<displayName count="other">шрі-ланкійської рупії</displayName>
 				<symbol draft="contributed">LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>ліберійський долар</displayName>
@@ -6147,6 +6386,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">малагасійських аріарі</displayName>
 				<displayName count="other">малагасійського аріарі</displayName>
 				<symbol draft="contributed">MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>мадагаскарський франк</displayName>
@@ -6169,6 +6409,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">кʼятів Мʼянми</displayName>
 				<displayName count="other">кʼята Мʼянми</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>монгольський тугрик</displayName>
@@ -6208,6 +6449,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">маврикійських рупій</displayName>
 				<displayName count="other">маврикійської рупії</displayName>
 				<symbol draft="contributed">MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>мальдівська руфія</displayName>
@@ -6247,6 +6489,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">малайзійських рингітів</displayName>
 				<displayName count="other">малайзійського рингіта</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>мозамбіцький ескудо</displayName>
@@ -6281,15 +6524,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">₦</symbol>
 			</currency>
 			<currency type="NIC">
-				<displayName>нікарагуанська кордоба</displayName>
+				<displayName>нікарагуанська кордоба (1988–1991)</displayName>
+				<displayName count="one">нікарагуанська кордоба (1988–1991)</displayName>
+				<displayName count="few">нікарагуанські кордоби (1988–1991)</displayName>
+				<displayName count="many">нікарагуанських кордоб (1988–1991)</displayName>
+				<displayName count="other">нікарагуанської кордоби (1988–1991)</displayName>
 			</currency>
 			<currency type="NIO">
-				<displayName>нікарагуанська кордоба оро</displayName>
-				<displayName count="one">нікарагуанська кордоба оро</displayName>
-				<displayName count="few">нікарагуанські кордоби оро</displayName>
-				<displayName count="many">нікарагуанських кордоб оро</displayName>
-				<displayName count="other">нікарагуанської кордоби оро</displayName>
+				<displayName>нікарагуанська кордоба</displayName>
+				<displayName count="one">нікарагуанська кордоба</displayName>
+				<displayName count="few">нікарагуанські кордоби</displayName>
+				<displayName count="many">нікарагуанських кордоб</displayName>
+				<displayName count="other">нікарагуанської кордоби</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>нідерландський гульден</displayName>
@@ -6301,6 +6549,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">норвезьких крон</displayName>
 				<displayName count="other">норвезької крони</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>непальська рупія</displayName>
@@ -6309,6 +6558,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">непальських рупій</displayName>
 				<displayName count="other">непальської рупії</displayName>
 				<symbol draft="contributed">NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>новозеландський долар</displayName>
@@ -6373,6 +6623,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">пакистанських рупій</displayName>
 				<displayName count="other">пакистанської рупії</displayName>
 				<symbol draft="contributed">PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>польський злотий</displayName>
@@ -6381,6 +6632,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">польських злотих</displayName>
 				<displayName count="other">польського злотого</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>польський злотий (1950–1995)</displayName>
@@ -6434,6 +6686,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">російських рублів</displayName>
 				<displayName count="other">російського рубля</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>російський рубль (1991–1998)</displayName>
@@ -6449,13 +6702,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">руандійських франків</displayName>
 				<displayName count="other">руандійського франка</displayName>
 				<symbol draft="contributed">RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>саудівський ріал</displayName>
-				<displayName count="one" draft="contributed">саудівський ріал</displayName>
-				<displayName count="few" draft="contributed">саудівські ріали</displayName>
-				<displayName count="many" draft="contributed">саудівських ріалів</displayName>
-				<displayName count="other" draft="contributed">саудівського ріала</displayName>
+				<displayName count="one">саудівський ріал</displayName>
+				<displayName count="few">саудівські ріали</displayName>
+				<displayName count="many">саудівських ріалів</displayName>
+				<displayName count="other">саудівського ріала</displayName>
 				<symbol draft="contributed">SAR</symbol>
 			</currency>
 			<currency type="SBD">
@@ -6496,6 +6750,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">шведських крон</displayName>
 				<displayName count="other">шведської крони</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>сінгапурський долар</displayName>
@@ -6513,6 +6768,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">фунтів острова Святої Єлени</displayName>
 				<displayName count="other">фунта острова Святої Єлени</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>словенський толар</displayName>
@@ -6568,6 +6824,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">добр Сан-Томе і Принсіпі</displayName>
 				<displayName count="other">добри Сан-Томе і Принсіпі</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>радянський рубль</displayName>
@@ -6586,6 +6843,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">сирійських фунтів</displayName>
 				<displayName count="other">сирійського фунта</displayName>
 				<symbol draft="contributed">SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>свазілендський лілангені</displayName>
@@ -6602,16 +6860,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">таїландських батів</displayName>
 				<displayName count="other">таїландського бата</displayName>
 				<symbol>THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>таджицький рубль</displayName>
 			</currency>
 			<currency type="TJS">
 				<displayName>таджицький сомоні</displayName>
-				<displayName count="one" draft="contributed">таджицький сомоні</displayName>
-				<displayName count="few" draft="contributed">таджицькі сомоні</displayName>
-				<displayName count="many" draft="contributed">таджицьких сомоні</displayName>
-				<displayName count="other" draft="contributed">таджицького сомоні</displayName>
+				<displayName count="one">таджицький сомоні</displayName>
+				<displayName count="few">таджицькі сомоні</displayName>
+				<displayName count="many">таджицьких сомоні</displayName>
+				<displayName count="other">таджицького сомоні</displayName>
 				<symbol draft="contributed">TJS</symbol>
 			</currency>
 			<currency type="TMM">
@@ -6644,6 +6903,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">тонганських паанг</displayName>
 				<displayName count="other">тонганської паанги</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>тіморський ескудо</displayName>
@@ -6657,12 +6917,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="TRY">
 				<displayName>турецька ліра</displayName>
-				<displayName count="one" draft="contributed">турецька ліра</displayName>
-				<displayName count="few" draft="contributed">турецькі ліри</displayName>
-				<displayName count="many" draft="contributed">турецьких лір</displayName>
-				<displayName count="other" draft="contributed">турецької ліри</displayName>
+				<displayName count="one">турецька ліра</displayName>
+				<displayName count="few">турецькі ліри</displayName>
+				<displayName count="many">турецьких лір</displayName>
+				<displayName count="other">турецької ліри</displayName>
 				<symbol draft="contributed">TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>долар Тринідаду і Тобаго</displayName>
@@ -6675,10 +6936,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="TWD">
 				<displayName>новий тайванський долар</displayName>
-				<displayName count="one" draft="contributed">новий тайванський долар</displayName>
-				<displayName count="few" draft="contributed">нові тайванські долари</displayName>
-				<displayName count="many" draft="contributed">нових тайванських доларів</displayName>
-				<displayName count="other" draft="contributed">нового тайванського долара</displayName>
+				<displayName count="one">новий тайванський долар</displayName>
+				<displayName count="few">нові тайванські долари</displayName>
+				<displayName count="many">нових тайванських доларів</displayName>
+				<displayName count="other">нового тайванського долара</displayName>
 				<symbol draft="contributed">TWD</symbol>
 				<symbol alt="narrow" draft="contributed">NT$</symbol>
 			</currency>
@@ -6697,6 +6958,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">гривень</displayName>
 				<displayName count="other">гривні</displayName>
 				<symbol>₴</symbol>
+				<symbol alt="narrow" draft="contributed">₴</symbol>
+				<symbol alt="variant">грн.</symbol>
 			</currency>
 			<currency type="UAK">
 				<displayName>український карбованець</displayName>
@@ -6749,10 +7012,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="UZS">
 				<displayName>узбецький сум</displayName>
-				<displayName count="one" draft="contributed">узбецький сум</displayName>
-				<displayName count="few" draft="contributed">узбецькі суми</displayName>
-				<displayName count="many" draft="contributed">узбецьких сумів</displayName>
-				<displayName count="other" draft="contributed">узбецького сума</displayName>
+				<displayName count="one">узбецький сум</displayName>
+				<displayName count="few">узбецькі суми</displayName>
+				<displayName count="many">узбецьких сумів</displayName>
+				<displayName count="other">узбецького сума</displayName>
 				<symbol draft="contributed">UZS</symbol>
 			</currency>
 			<currency type="VEB">
@@ -6765,6 +7028,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">венесуельських боліварів</displayName>
 				<displayName count="other">венесуельського болівара</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>вʼєтнамський донг</displayName>
@@ -6824,6 +7088,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">східнокарибських доларів</displayName>
 				<displayName count="other">східнокарибського долара</displayName>
 				<symbol>XCD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>спеціальні права запозичення</displayName>
@@ -6842,7 +7107,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>французький франк UIC</displayName>
 			</currency>
 			<currency type="XOF">
-				<displayName>західноафриканський франк BCEAO</displayName>
+				<displayName>західноафриканський франк</displayName>
 				<displayName count="one">західноафриканський франк</displayName>
 				<displayName count="few">західноафриканські франки</displayName>
 				<displayName count="many">західноафриканських франків</displayName>
@@ -6901,11 +7166,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="ZAR">
 				<displayName>південноафриканський ранд</displayName>
-				<displayName count="one" draft="contributed">південноафриканський ранд</displayName>
-				<displayName count="few" draft="contributed">південноафриканські ранди</displayName>
-				<displayName count="many" draft="contributed">південноафриканських рандів</displayName>
-				<displayName count="other" draft="contributed">південноафриканського ранда</displayName>
+				<displayName count="one">південноафриканський ранд</displayName>
+				<displayName count="few">південноафриканські ранди</displayName>
+				<displayName count="many">південноафриканських рандів</displayName>
+				<displayName count="other">південноафриканського ранда</displayName>
 				<symbol draft="contributed">ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>замбійська квача (1968–2012)</displayName>
@@ -6921,6 +7187,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="many">замбійських квач</displayName>
 				<displayName count="other">замбійської квачі</displayName>
 				<symbol draft="contributed">ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>заїрський новий заїр</displayName>
@@ -6961,10 +7228,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>сили тяжіння</displayName>
-				<unitPattern count="one" draft="contributed">{0} сила тяжіння</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} сили тяжіння</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} сил тяжіння</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} сили тяжіння</unitPattern>
+				<unitPattern count="one">{0} сила тяжіння</unitPattern>
+				<unitPattern count="few">{0} сили тяжіння</unitPattern>
+				<unitPattern count="many">{0} сил тяжіння</unitPattern>
+				<unitPattern count="other">{0} сили тяжіння</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
 				<displayName>метри на секунду в квадраті</displayName>
@@ -6973,6 +7240,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} метрів на секунду в квадраті</unitPattern>
 				<unitPattern count="other">{0} метра на секунду в квадраті</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>оберти</displayName>
+				<unitPattern count="one">{0} оберт</unitPattern>
+				<unitPattern count="few">{0} оберти</unitPattern>
+				<unitPattern count="many">{0} обертів</unitPattern>
+				<unitPattern count="other">{0} оберта</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>радіани</displayName>
+				<unitPattern count="one">{0} радіан</unitPattern>
+				<unitPattern count="few">{0} радіани</unitPattern>
+				<unitPattern count="many">{0} радіанів</unitPattern>
+				<unitPattern count="other">{0} радіана</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>градуси</displayName>
+				<unitPattern count="one">{0} градус</unitPattern>
+				<unitPattern count="few">{0} градуси</unitPattern>
+				<unitPattern count="many">{0} градусів</unitPattern>
+				<unitPattern count="other">{0} градуса</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>мінути</displayName>
 				<unitPattern count="one">{0} мінута</unitPattern>
@@ -6987,26 +7275,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} кутових секунд</unitPattern>
 				<unitPattern count="other">{0} кутової секунди</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>градуси</displayName>
-				<unitPattern count="one">{0} градус</unitPattern>
-				<unitPattern count="few">{0} градуси</unitPattern>
-				<unitPattern count="many">{0} градусів</unitPattern>
-				<unitPattern count="other">{0} градуса</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>радіани</displayName>
-				<unitPattern count="one">{0} радіан</unitPattern>
-				<unitPattern count="few">{0} радіани</unitPattern>
-				<unitPattern count="many">{0} радіанів</unitPattern>
-				<unitPattern count="other">{0} радіана</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>акри</displayName>
-				<unitPattern count="one">{0} акр</unitPattern>
-				<unitPattern count="few">{0} акри</unitPattern>
-				<unitPattern count="many">{0} акрів</unitPattern>
-				<unitPattern count="other">{0} акра</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>квадратні кілометри</displayName>
+				<unitPattern count="one">{0} квадратний кілометр</unitPattern>
+				<unitPattern count="few">{0} квадратні кілометри</unitPattern>
+				<unitPattern count="many">{0} квадратних кілометрів</unitPattern>
+				<unitPattern count="other">{0} квадратного кілометра</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>гектари</displayName>
@@ -7015,12 +7289,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} гектарів</unitPattern>
 				<unitPattern count="other">{0} гектара</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>квадтратні метри</displayName>
+				<unitPattern count="one">{0} квадратний метр</unitPattern>
+				<unitPattern count="few">{0} квадратні метри</unitPattern>
+				<unitPattern count="many">{0} квадратних метрів</unitPattern>
+				<unitPattern count="other">{0} квадратного метра</unitPattern>
+				<perUnitPattern draft="provisional">{0} на квадратний метр</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>квадратні сантиметри</displayName>
 				<unitPattern count="one">{0} квадратний сантиметр</unitPattern>
 				<unitPattern count="few">{0} квадратні сантиметри</unitPattern>
 				<unitPattern count="many">{0} квадратних сантиметрів</unitPattern>
 				<unitPattern count="other">{0} квадратного сантиметра</unitPattern>
+				<perUnitPattern>{0} на квадратний сантиметр</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>квадратні милі</displayName>
+				<unitPattern count="one">{0} квадратна миля</unitPattern>
+				<unitPattern count="few">{0} квадратні милі</unitPattern>
+				<unitPattern count="many">{0} квадратних миль</unitPattern>
+				<unitPattern count="other">{0} квадратної милі</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>акри</displayName>
+				<unitPattern count="one">{0} акр</unitPattern>
+				<unitPattern count="few">{0} акри</unitPattern>
+				<unitPattern count="many">{0} акрів</unitPattern>
+				<unitPattern count="other">{0} акра</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>квадратні ярди</displayName>
+				<unitPattern count="one">{0} квадратний ярд</unitPattern>
+				<unitPattern count="few">{0} квадратні ярди</unitPattern>
+				<unitPattern count="many">{0} квадратних ярдів</unitPattern>
+				<unitPattern count="other">{0} квадратного ярда</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>квадратні фути</displayName>
@@ -7035,34 +7339,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} квадратні дюйми</unitPattern>
 				<unitPattern count="many">{0} квадратних дюймів</unitPattern>
 				<unitPattern count="other">{0} квадратного дюйма</unitPattern>
+				<perUnitPattern draft="provisional">{0} квадратний дюйм</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>квадратні кілометри</displayName>
-				<unitPattern count="one">{0} квадратний кілометр</unitPattern>
-				<unitPattern count="few">{0} квадратні кілометри</unitPattern>
-				<unitPattern count="many">{0} квадратних кілометрів</unitPattern>
-				<unitPattern count="other">{0} квадратного кілометра</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>квадтратні метри</displayName>
-				<unitPattern count="one">{0} квадратний метр</unitPattern>
-				<unitPattern count="few">{0} квадратні метри</unitPattern>
-				<unitPattern count="many">{0} квадратних метрів</unitPattern>
-				<unitPattern count="other">{0} квадратного метра</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>квадратні милі</displayName>
-				<unitPattern count="one">{0} квадратна миля</unitPattern>
-				<unitPattern count="few">{0} квадратні милі</unitPattern>
-				<unitPattern count="many">{0} квадратних миль</unitPattern>
-				<unitPattern count="other">{0} квадратної милі</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>квадратні ярди</displayName>
-				<unitPattern count="one">{0} квадратний ярд</unitPattern>
-				<unitPattern count="few">{0} квадратні ярди</unitPattern>
-				<unitPattern count="many">{0} квадратних ярдів</unitPattern>
-				<unitPattern count="other">{0} квадратного ярда</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>карати</displayName>
+				<unitPattern count="one">{0} карат</unitPattern>
+				<unitPattern count="few">{0} карати</unitPattern>
+				<unitPattern count="many">{0} каратів</unitPattern>
+				<unitPattern count="other">{0} карата</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>літри на кілометр</displayName>
@@ -7071,6 +7355,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} літрів на кілометр</unitPattern>
 				<unitPattern count="other">{0} літра на кілометр</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>літри на 100 кілометрів</displayName>
+				<unitPattern count="one">{0} літр на 100 кілометрів</unitPattern>
+				<unitPattern count="few">{0} літри на 100 кілометрів</unitPattern>
+				<unitPattern count="many">{0} літрів на 100 кілометрів</unitPattern>
+				<unitPattern count="other">{0} літра на 100 кілометрів</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>милі на галон</displayName>
 				<unitPattern count="one">{0} миля на галон</unitPattern>
@@ -7078,69 +7369,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} миль на галон</unitPattern>
 				<unitPattern count="other">{0} милі на галон</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>біти</displayName>
-				<unitPattern count="one">{0} біт</unitPattern>
-				<unitPattern count="few">{0} біти</unitPattern>
-				<unitPattern count="many">{0} бітів</unitPattern>
-				<unitPattern count="other">{0} біта</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>байти</displayName>
-				<unitPattern count="one">{0} байт</unitPattern>
-				<unitPattern count="few">{0} байти</unitPattern>
-				<unitPattern count="many">{0} байтів</unitPattern>
-				<unitPattern count="other">{0} байта</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>гігабіти</displayName>
-				<unitPattern count="one">{0} гігабіт</unitPattern>
-				<unitPattern count="few">{0} гігабіти</unitPattern>
-				<unitPattern count="many">{0} гігабітів</unitPattern>
-				<unitPattern count="other">{0} гігабіта</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>гігабайти</displayName>
-				<unitPattern count="one">{0} гігабайт</unitPattern>
-				<unitPattern count="few">{0} гігабайти</unitPattern>
-				<unitPattern count="many">{0} гігабайтів</unitPattern>
-				<unitPattern count="other">{0} гігабайта</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>кілобіти</displayName>
-				<unitPattern count="one">{0} кілобіт</unitPattern>
-				<unitPattern count="few">{0} кілобіти</unitPattern>
-				<unitPattern count="many">{0} кілобітів</unitPattern>
-				<unitPattern count="other">{0} кілобіта</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>кілобайти</displayName>
-				<unitPattern count="one">{0} кілобайт</unitPattern>
-				<unitPattern count="few">{0} кілобайти</unitPattern>
-				<unitPattern count="many">{0} кілобайтів</unitPattern>
-				<unitPattern count="other">{0} кілобайта</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>мегабіти</displayName>
-				<unitPattern count="one">{0} мегабіт</unitPattern>
-				<unitPattern count="few">{0} мегабіти</unitPattern>
-				<unitPattern count="many">{0} мегабітів</unitPattern>
-				<unitPattern count="other">{0} мегабіта</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>мегабайти</displayName>
-				<unitPattern count="one">{0} мегабайт</unitPattern>
-				<unitPattern count="few">{0} мегабайти</unitPattern>
-				<unitPattern count="many">{0} мегабайтів</unitPattern>
-				<unitPattern count="other">{0} мегабайта</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>терабіти</displayName>
-				<unitPattern count="one">{0} терабіт</unitPattern>
-				<unitPattern count="few">{0} терабіти</unitPattern>
-				<unitPattern count="many">{0} терабітів</unitPattern>
-				<unitPattern count="other">{0} терабіта</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>терабайти</displayName>
 				<unitPattern count="one">{0} терабайт</unitPattern>
@@ -7148,12 +7376,107 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} терабайтів</unitPattern>
 				<unitPattern count="other">{0} терабайта</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>терабіти</displayName>
+				<unitPattern count="one">{0} терабіт</unitPattern>
+				<unitPattern count="few">{0} терабіти</unitPattern>
+				<unitPattern count="many">{0} терабітів</unitPattern>
+				<unitPattern count="other">{0} терабіта</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>гігабайти</displayName>
+				<unitPattern count="one">{0} гігабайт</unitPattern>
+				<unitPattern count="few">{0} гігабайти</unitPattern>
+				<unitPattern count="many">{0} гігабайтів</unitPattern>
+				<unitPattern count="other">{0} гігабайта</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>гігабіти</displayName>
+				<unitPattern count="one">{0} гігабіт</unitPattern>
+				<unitPattern count="few">{0} гігабіти</unitPattern>
+				<unitPattern count="many">{0} гігабітів</unitPattern>
+				<unitPattern count="other">{0} гігабіта</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>мегабайти</displayName>
+				<unitPattern count="one">{0} мегабайт</unitPattern>
+				<unitPattern count="few">{0} мегабайти</unitPattern>
+				<unitPattern count="many">{0} мегабайтів</unitPattern>
+				<unitPattern count="other">{0} мегабайта</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>мегабіти</displayName>
+				<unitPattern count="one">{0} мегабіт</unitPattern>
+				<unitPattern count="few">{0} мегабіти</unitPattern>
+				<unitPattern count="many">{0} мегабітів</unitPattern>
+				<unitPattern count="other">{0} мегабіта</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>кілобайти</displayName>
+				<unitPattern count="one">{0} кілобайт</unitPattern>
+				<unitPattern count="few">{0} кілобайти</unitPattern>
+				<unitPattern count="many">{0} кілобайтів</unitPattern>
+				<unitPattern count="other">{0} кілобайта</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>кілобіти</displayName>
+				<unitPattern count="one">{0} кілобіт</unitPattern>
+				<unitPattern count="few">{0} кілобіти</unitPattern>
+				<unitPattern count="many">{0} кілобітів</unitPattern>
+				<unitPattern count="other">{0} кілобіта</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>байти</displayName>
+				<unitPattern count="one">{0} байт</unitPattern>
+				<unitPattern count="few">{0} байти</unitPattern>
+				<unitPattern count="many">{0} байтів</unitPattern>
+				<unitPattern count="other">{0} байта</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>біти</displayName>
+				<unitPattern count="one">{0} біт</unitPattern>
+				<unitPattern count="few">{0} біти</unitPattern>
+				<unitPattern count="many">{0} бітів</unitPattern>
+				<unitPattern count="other">{0} біта</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>століття</displayName>
+				<unitPattern count="one">{0} століття</unitPattern>
+				<unitPattern count="few">{0} століття</unitPattern>
+				<unitPattern count="many">{0} століть</unitPattern>
+				<unitPattern count="other">{0} століття</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>роки</displayName>
+				<unitPattern count="one">{0} рік</unitPattern>
+				<unitPattern count="few">{0} роки</unitPattern>
+				<unitPattern count="many">{0} років</unitPattern>
+				<unitPattern count="other">{0} року</unitPattern>
+				<perUnitPattern>{0} на рік</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>місяці</displayName>
+				<unitPattern count="one">{0} місяць</unitPattern>
+				<unitPattern count="few">{0} місяці</unitPattern>
+				<unitPattern count="many">{0} місяців</unitPattern>
+				<unitPattern count="other">{0} місяця</unitPattern>
+				<perUnitPattern draft="provisional">{0} на місяць</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>тижні</displayName>
+				<unitPattern count="one">{0} тиждень</unitPattern>
+				<unitPattern count="few">{0} тижні</unitPattern>
+				<unitPattern count="many">{0} тижнів</unitPattern>
+				<unitPattern count="other">{0} тижня</unitPattern>
+				<perUnitPattern>{0} на тиждень</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>дні</displayName>
 				<unitPattern count="one">{0} день</unitPattern>
 				<unitPattern count="few">{0} дні</unitPattern>
 				<unitPattern count="many">{0} днів</unitPattern>
 				<unitPattern count="other">{0} дня</unitPattern>
+				<perUnitPattern>{0} на день</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>години</displayName>
@@ -7163,40 +7486,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} години</unitPattern>
 				<perUnitPattern>{0} на годину</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>мікросекунди</displayName>
-				<unitPattern count="one">{0} мікросекунда</unitPattern>
-				<unitPattern count="few">{0} мікросекунди</unitPattern>
-				<unitPattern count="many">{0} мікросекунд</unitPattern>
-				<unitPattern count="other">{0} мікросекунди</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>мілісекунди</displayName>
-				<unitPattern count="one">{0} мілісекунда</unitPattern>
-				<unitPattern count="few">{0} мілісекунди</unitPattern>
-				<unitPattern count="many">{0} мілісекунд</unitPattern>
-				<unitPattern count="other">{0} мілісекунди</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>хвилини</displayName>
 				<unitPattern count="one">{0} хвилина</unitPattern>
 				<unitPattern count="few">{0} хвилини</unitPattern>
 				<unitPattern count="many">{0} хвилин</unitPattern>
 				<unitPattern count="other">{0} хвилини</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>місяці</displayName>
-				<unitPattern count="one">{0} місяць</unitPattern>
-				<unitPattern count="few">{0} місяці</unitPattern>
-				<unitPattern count="many">{0} місяців</unitPattern>
-				<unitPattern count="other">{0} місяця</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>наносекунди</displayName>
-				<unitPattern count="one">{0} наносекунда</unitPattern>
-				<unitPattern count="few">{0} наносекунди</unitPattern>
-				<unitPattern count="many">{0} наносекунд</unitPattern>
-				<unitPattern count="other">{0} наносекунди</unitPattern>
+				<perUnitPattern draft="provisional">{0} на хв</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>секунди</displayName>
@@ -7206,19 +7502,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} секунди</unitPattern>
 				<perUnitPattern>{0} на секунду</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>тижні</displayName>
-				<unitPattern count="one">{0} тиждень</unitPattern>
-				<unitPattern count="few">{0} тижні</unitPattern>
-				<unitPattern count="many">{0} тижнів</unitPattern>
-				<unitPattern count="other">{0} тижня</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>мілісекунди</displayName>
+				<unitPattern count="one">{0} мілісекунда</unitPattern>
+				<unitPattern count="few">{0} мілісекунди</unitPattern>
+				<unitPattern count="many">{0} мілісекунд</unitPattern>
+				<unitPattern count="other">{0} мілісекунди</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>роки</displayName>
-				<unitPattern count="one">{0} рік</unitPattern>
-				<unitPattern count="few">{0} роки</unitPattern>
-				<unitPattern count="many">{0} років</unitPattern>
-				<unitPattern count="other">{0} року</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>мікросекунди</displayName>
+				<unitPattern count="one">{0} мікросекунда</unitPattern>
+				<unitPattern count="few">{0} мікросекунди</unitPattern>
+				<unitPattern count="many">{0} мікросекунд</unitPattern>
+				<unitPattern count="other">{0} мікросекунди</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>наносекунди</displayName>
+				<unitPattern count="one">{0} наносекунда</unitPattern>
+				<unitPattern count="few">{0} наносекунди</unitPattern>
+				<unitPattern count="many">{0} наносекунд</unitPattern>
+				<unitPattern count="other">{0} наносекунди</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ампери</displayName>
@@ -7248,6 +7551,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} вольтів</unitPattern>
 				<unitPattern count="other">{0} вольта</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>кілокалорії</displayName>
+				<unitPattern count="one">{0} кілокалорія</unitPattern>
+				<unitPattern count="few">{0} кілокалорії</unitPattern>
+				<unitPattern count="many">{0} кілокалорій</unitPattern>
+				<unitPattern count="other">{0} кілокалорії</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>калорії</displayName>
 				<unitPattern count="one">{0} калорія</unitPattern>
@@ -7262,20 +7572,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} Калорій</unitPattern>
 				<unitPattern count="other">{0} Калорії</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>джоулі</displayName>
-				<unitPattern count="one">{0} джоуль</unitPattern>
-				<unitPattern count="few">{0} джоулі</unitPattern>
-				<unitPattern count="many">{0} джоулів</unitPattern>
-				<unitPattern count="other">{0} джоуля</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>кілокалорії</displayName>
-				<unitPattern count="one">{0} кілокалорія</unitPattern>
-				<unitPattern count="few">{0} кілокалорії</unitPattern>
-				<unitPattern count="many">{0} кілокалорій</unitPattern>
-				<unitPattern count="other">{0} кілокалорії</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>кілоджоулі</displayName>
 				<unitPattern count="one">{0} кілоджоуль</unitPattern>
@@ -7283,6 +7579,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} кілоджоулів</unitPattern>
 				<unitPattern count="other">{0} кілоджоуля</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>джоулі</displayName>
+				<unitPattern count="one">{0} джоуль</unitPattern>
+				<unitPattern count="few">{0} джоулі</unitPattern>
+				<unitPattern count="many">{0} джоулів</unitPattern>
+				<unitPattern count="other">{0} джоуля</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>кіловат-години</displayName>
 				<unitPattern count="one">{0} кіловат-година</unitPattern>
@@ -7297,12 +7600,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} гігагерців</unitPattern>
 				<unitPattern count="other">{0} гігагерца</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>герци</displayName>
-				<unitPattern count="one">{0} герц</unitPattern>
-				<unitPattern count="few">{0} герци</unitPattern>
-				<unitPattern count="many">{0} герців</unitPattern>
-				<unitPattern count="other">{0} герца</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>мегагерци</displayName>
+				<unitPattern count="one">{0} мегагерц</unitPattern>
+				<unitPattern count="few">{0} мегагерци</unitPattern>
+				<unitPattern count="many">{0} мегагерців</unitPattern>
+				<unitPattern count="other">{0} мегагерца</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>кілогерци</displayName>
@@ -7311,26 +7614,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} кілогерців</unitPattern>
 				<unitPattern count="other">{0} кілогерца</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>мегагерци</displayName>
-				<unitPattern count="one">{0} мегагерц</unitPattern>
-				<unitPattern count="few">{0} мегагерци</unitPattern>
-				<unitPattern count="many">{0} мегагерців</unitPattern>
-				<unitPattern count="other">{0} мегагерца</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>герци</displayName>
+				<unitPattern count="one">{0} герц</unitPattern>
+				<unitPattern count="few">{0} герци</unitPattern>
+				<unitPattern count="many">{0} герців</unitPattern>
+				<unitPattern count="other">{0} герца</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>астрономічні одиниці</displayName>
-				<unitPattern count="one">{0} астрономічна одиниця</unitPattern>
-				<unitPattern count="few">{0} астрономічні одиниці</unitPattern>
-				<unitPattern count="many">{0} астрономічних одиниць</unitPattern>
-				<unitPattern count="other">{0} астрономічної одиниці</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>кілометри</displayName>
+				<unitPattern count="one">{0} кілометр</unitPattern>
+				<unitPattern count="few">{0} кілометри</unitPattern>
+				<unitPattern count="many">{0} кілометрів</unitPattern>
+				<unitPattern count="other">{0} кілометра</unitPattern>
+				<perUnitPattern>{0} на кілометр</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>сантиметри</displayName>
-				<unitPattern count="one">{0} сантиметр</unitPattern>
-				<unitPattern count="few">{0} сантиметри</unitPattern>
-				<unitPattern count="many">{0} сантиметрів</unitPattern>
-				<unitPattern count="other">{0} сантиметра</unitPattern>
+			<unit type="length-meter">
+				<displayName>метри</displayName>
+				<unitPattern count="one">{0} метр</unitPattern>
+				<unitPattern count="few">{0} метри</unitPattern>
+				<unitPattern count="many">{0} метрів</unitPattern>
+				<unitPattern count="other">{0} метра</unitPattern>
+				<perUnitPattern>{0} на метр</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>дециметри</displayName>
@@ -7339,54 +7644,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} дециметрів</unitPattern>
 				<unitPattern count="other">{0} дециметра</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>фути</displayName>
-				<unitPattern count="one">{0} фут</unitPattern>
-				<unitPattern count="few">{0} фути</unitPattern>
-				<unitPattern count="many">{0} футів</unitPattern>
-				<unitPattern count="other">{0} фута</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>дюйми</displayName>
-				<unitPattern count="one">{0} дюйм</unitPattern>
-				<unitPattern count="few">{0} дюйми</unitPattern>
-				<unitPattern count="many">{0} дюймів</unitPattern>
-				<unitPattern count="other">{0} дюйма</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>кілометри</displayName>
-				<unitPattern count="one">{0} кілометр</unitPattern>
-				<unitPattern count="few">{0} кілометри</unitPattern>
-				<unitPattern count="many">{0} кілометрів</unitPattern>
-				<unitPattern count="other">{0} кілометра</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>світлові роки</displayName>
-				<unitPattern count="one">{0} світловий рік</unitPattern>
-				<unitPattern count="few">{0} світлові роки</unitPattern>
-				<unitPattern count="many">{0} світлових років</unitPattern>
-				<unitPattern count="other">{0} світлового року</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>метри</displayName>
-				<unitPattern count="one">{0} метр</unitPattern>
-				<unitPattern count="few">{0} метри</unitPattern>
-				<unitPattern count="many">{0} метрів</unitPattern>
-				<unitPattern count="other">{0} метра</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>мікрометри</displayName>
-				<unitPattern count="one">{0} мікрометр</unitPattern>
-				<unitPattern count="few">{0} мікрометри</unitPattern>
-				<unitPattern count="many">{0} мікрометрів</unitPattern>
-				<unitPattern count="other">{0} мікрометра</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>милі</displayName>
-				<unitPattern count="one">{0} миля</unitPattern>
-				<unitPattern count="few">{0} милі</unitPattern>
-				<unitPattern count="many">{0} миль</unitPattern>
-				<unitPattern count="other">{0} милі</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>сантиметри</displayName>
+				<unitPattern count="one">{0} сантиметр</unitPattern>
+				<unitPattern count="few">{0} сантиметри</unitPattern>
+				<unitPattern count="many">{0} сантиметрів</unitPattern>
+				<unitPattern count="other">{0} сантиметра</unitPattern>
+				<perUnitPattern draft="provisional">{0} на сантиметр</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>міліметри</displayName>
@@ -7395,6 +7659,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} міліметрів</unitPattern>
 				<unitPattern count="other">{0} міліметра</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>мікрометри</displayName>
+				<unitPattern count="one">{0} мікрометр</unitPattern>
+				<unitPattern count="few">{0} мікрометри</unitPattern>
+				<unitPattern count="many">{0} мікрометрів</unitPattern>
+				<unitPattern count="other">{0} мікрометра</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>нанометри</displayName>
 				<unitPattern count="one">{0} нанометр</unitPattern>
@@ -7402,20 +7673,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} нанометрів</unitPattern>
 				<unitPattern count="other">{0} нанометра</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>морські милі</displayName>
-				<unitPattern count="one">{0} морська миля</unitPattern>
-				<unitPattern count="few">{0} морські милі</unitPattern>
-				<unitPattern count="many">{0} морських миль</unitPattern>
-				<unitPattern count="other">{0} морської милі</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>парсеки</displayName>
-				<unitPattern count="one">{0} парсек</unitPattern>
-				<unitPattern count="few">{0} парсеки</unitPattern>
-				<unitPattern count="many">{0} парсеків</unitPattern>
-				<unitPattern count="other">{0} парсека</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>пікометри</displayName>
 				<unitPattern count="one">{0} пікометр</unitPattern>
@@ -7423,6 +7680,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} пікометрів</unitPattern>
 				<unitPattern count="other">{0} пікометра</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>милі</displayName>
+				<unitPattern count="one">{0} миля</unitPattern>
+				<unitPattern count="few">{0} милі</unitPattern>
+				<unitPattern count="many">{0} миль</unitPattern>
+				<unitPattern count="other">{0} милі</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>ярди</displayName>
 				<unitPattern count="one">{0} ярд</unitPattern>
@@ -7430,6 +7694,57 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ярдів</unitPattern>
 				<unitPattern count="other">{0} ярда</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>фути</displayName>
+				<unitPattern count="one">{0} фут</unitPattern>
+				<unitPattern count="few">{0} фути</unitPattern>
+				<unitPattern count="many">{0} футів</unitPattern>
+				<unitPattern count="other">{0} фута</unitPattern>
+				<perUnitPattern draft="provisional">{0} на фут</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>дюйми</displayName>
+				<unitPattern count="one">{0} дюйм</unitPattern>
+				<unitPattern count="few">{0} дюйми</unitPattern>
+				<unitPattern count="many">{0} дюймів</unitPattern>
+				<unitPattern count="other">{0} дюйма</unitPattern>
+				<perUnitPattern>{0} на дюйм</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>парсеки</displayName>
+				<unitPattern count="one">{0} парсек</unitPattern>
+				<unitPattern count="few">{0} парсеки</unitPattern>
+				<unitPattern count="many">{0} парсеків</unitPattern>
+				<unitPattern count="other">{0} парсека</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>світлові роки</displayName>
+				<unitPattern count="one">{0} світловий рік</unitPattern>
+				<unitPattern count="few">{0} світлові роки</unitPattern>
+				<unitPattern count="many">{0} світлових років</unitPattern>
+				<unitPattern count="other">{0} світлового року</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>астрономічні одиниці</displayName>
+				<unitPattern count="one">{0} астрономічна одиниця</unitPattern>
+				<unitPattern count="few">{0} астрономічні одиниці</unitPattern>
+				<unitPattern count="many">{0} астрономічних одиниць</unitPattern>
+				<unitPattern count="other">{0} астрономічної одиниці</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>морські милі</displayName>
+				<unitPattern count="one">{0} морська миля</unitPattern>
+				<unitPattern count="few">{0} морські милі</unitPattern>
+				<unitPattern count="many">{0} морських миль</unitPattern>
+				<unitPattern count="other">{0} морської милі</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>скандинавська миля</displayName>
+				<unitPattern count="one">{0} скандинавська миля</unitPattern>
+				<unitPattern count="few">{0} скандинавські милі</unitPattern>
+				<unitPattern count="many">{0} скандинавських миль</unitPattern>
+				<unitPattern count="other">{0} скандинавської милі</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>люкси</displayName>
 				<unitPattern count="one">{0} люкс</unitPattern>
@@ -7437,27 +7752,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} люксів</unitPattern>
 				<unitPattern count="other">{0} люкса</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>карати</displayName>
-				<unitPattern count="one">{0} карат</unitPattern>
-				<unitPattern count="few">{0} карати</unitPattern>
-				<unitPattern count="many">{0} каратів</unitPattern>
-				<unitPattern count="other">{0} карата</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>грами</displayName>
-				<unitPattern count="one">{0} грам</unitPattern>
-				<unitPattern count="few">{0} грами</unitPattern>
-				<unitPattern count="many">{0} грамів</unitPattern>
-				<unitPattern count="other">{0} грама</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>кілограми</displayName>
-				<unitPattern count="one">{0} кілограм</unitPattern>
-				<unitPattern count="few">{0} кілограми</unitPattern>
-				<unitPattern count="many">{0} кілограмів</unitPattern>
-				<unitPattern count="other">{0} кілограма</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>метричні тонни</displayName>
 				<unitPattern count="one">{0} метрична тонна</unitPattern>
@@ -7465,12 +7759,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} метричних тонн</unitPattern>
 				<unitPattern count="other">{0} метричної тонни</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>мікрограми</displayName>
-				<unitPattern count="one">{0} мікрограм</unitPattern>
-				<unitPattern count="few">{0} мікрограми</unitPattern>
-				<unitPattern count="many">{0} мікрограм</unitPattern>
-				<unitPattern count="other">{0} мікрограма</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>кілограми</displayName>
+				<unitPattern count="one">{0} кілограм</unitPattern>
+				<unitPattern count="few">{0} кілограми</unitPattern>
+				<unitPattern count="many">{0} кілограмів</unitPattern>
+				<unitPattern count="other">{0} кілограма</unitPattern>
+				<perUnitPattern>{0} на кілограм</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>грами</displayName>
+				<unitPattern count="one">{0} грам</unitPattern>
+				<unitPattern count="few">{0} грами</unitPattern>
+				<unitPattern count="many">{0} грамів</unitPattern>
+				<unitPattern count="other">{0} грама</unitPattern>
+				<perUnitPattern>{0} на грам</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>міліграми</displayName>
@@ -7479,26 +7782,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} міліграм</unitPattern>
 				<unitPattern count="other">{0} міліграма</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>унції</displayName>
-				<unitPattern count="one">{0} унція</unitPattern>
-				<unitPattern count="few">{0} унції</unitPattern>
-				<unitPattern count="many">{0} унцій</unitPattern>
-				<unitPattern count="other">{0} унції</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>тройські унції</displayName>
-				<unitPattern count="one">{0} тройська унція</unitPattern>
-				<unitPattern count="few">{0} тройські унції</unitPattern>
-				<unitPattern count="many">{0} тройських унцій</unitPattern>
-				<unitPattern count="other">{0} тройської унції</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>фунти</displayName>
-				<unitPattern count="one">{0} фунт</unitPattern>
-				<unitPattern count="few">{0} фунти</unitPattern>
-				<unitPattern count="many">{0} фунтів</unitPattern>
-				<unitPattern count="other">{0} фунта</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>мікрограми</displayName>
+				<unitPattern count="one">{0} мікрограм</unitPattern>
+				<unitPattern count="few">{0} мікрограми</unitPattern>
+				<unitPattern count="many">{0} мікрограм</unitPattern>
+				<unitPattern count="other">{0} мікрограма</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>тонни</displayName>
@@ -7507,6 +7796,36 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} тонн</unitPattern>
 				<unitPattern count="other">{0} тонни</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>фунти</displayName>
+				<unitPattern count="one">{0} фунт</unitPattern>
+				<unitPattern count="few">{0} фунти</unitPattern>
+				<unitPattern count="many">{0} фунтів</unitPattern>
+				<unitPattern count="other">{0} фунта</unitPattern>
+				<perUnitPattern>{0} на фунт</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>унції</displayName>
+				<unitPattern count="one">{0} унція</unitPattern>
+				<unitPattern count="few">{0} унції</unitPattern>
+				<unitPattern count="many">{0} унцій</unitPattern>
+				<unitPattern count="other">{0} унції</unitPattern>
+				<perUnitPattern>{0} на унцію</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>тройські унції</displayName>
+				<unitPattern count="one">{0} тройська унція</unitPattern>
+				<unitPattern count="few">{0} тройські унції</unitPattern>
+				<unitPattern count="many">{0} тройських унцій</unitPattern>
+				<unitPattern count="other">{0} тройської унції</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>карати</displayName>
+				<unitPattern count="one">{0} карат</unitPattern>
+				<unitPattern count="few">{0} карати</unitPattern>
+				<unitPattern count="many">{0} каратів</unitPattern>
+				<unitPattern count="other">{0} карата</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>гігавати</displayName>
 				<unitPattern count="one">{0} гігават</unitPattern>
@@ -7514,20 +7833,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} гігаватів</unitPattern>
 				<unitPattern count="other">{0} гігавата</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>кінські сили</displayName>
-				<unitPattern count="one">{0} кінська сила</unitPattern>
-				<unitPattern count="few">{0} кінські сили</unitPattern>
-				<unitPattern count="many">{0} кінських сил</unitPattern>
-				<unitPattern count="other">{0} кінської сили</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>кіловати</displayName>
-				<unitPattern count="one">{0} кіловат</unitPattern>
-				<unitPattern count="few">{0} кіловати</unitPattern>
-				<unitPattern count="many">{0} кіловатів</unitPattern>
-				<unitPattern count="other">{0} кіловата</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>мегавати</displayName>
 				<unitPattern count="one">{0} мегават</unitPattern>
@@ -7535,12 +7840,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} мегават</unitPattern>
 				<unitPattern count="other">{0} мегавата</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>мілівати</displayName>
-				<unitPattern count="one">{0} міліват</unitPattern>
-				<unitPattern count="few">{0} мілівати</unitPattern>
-				<unitPattern count="many">{0} міліват</unitPattern>
-				<unitPattern count="other">{0} мілівата</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>кіловати</displayName>
+				<unitPattern count="one">{0} кіловат</unitPattern>
+				<unitPattern count="few">{0} кіловати</unitPattern>
+				<unitPattern count="many">{0} кіловатів</unitPattern>
+				<unitPattern count="other">{0} кіловата</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>вати</displayName>
@@ -7549,6 +7854,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ватів</unitPattern>
 				<unitPattern count="other">{0} вата</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>мілівати</displayName>
+				<unitPattern count="one">{0} міліват</unitPattern>
+				<unitPattern count="few">{0} мілівати</unitPattern>
+				<unitPattern count="many">{0} міліват</unitPattern>
+				<unitPattern count="other">{0} мілівата</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>кінські сили</displayName>
+				<unitPattern count="one">{0} кінська сила</unitPattern>
+				<unitPattern count="few">{0} кінські сили</unitPattern>
+				<unitPattern count="many">{0} кінських сил</unitPattern>
+				<unitPattern count="other">{0} кінської сили</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>гектопаскалі</displayName>
 				<unitPattern count="one">{0} гектопаскаль</unitPattern>
@@ -7556,20 +7875,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} гектопаскалів</unitPattern>
 				<unitPattern count="other">{0} гектопаскаля</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>дюйми ртутного стовпа</displayName>
-				<unitPattern count="one">{0} дюйм ртутного стовпа</unitPattern>
-				<unitPattern count="few">{0} дюйми ртутного стовпа</unitPattern>
-				<unitPattern count="many">{0} дюймів ртутного стовпа</unitPattern>
-				<unitPattern count="other">{0} дюйма ртутного стовпа</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>мілібари</displayName>
-				<unitPattern count="one">{0} мілібар</unitPattern>
-				<unitPattern count="few">{0} мілібари</unitPattern>
-				<unitPattern count="many">{0} мілібарів</unitPattern>
-				<unitPattern count="other">{0} мілібара</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>міліметри ртутного стовпа</displayName>
 				<unitPattern count="one">{0} міліметр ртутного стовпа</unitPattern>
@@ -7584,12 +7889,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} фунтів на квадратний дюйм</unitPattern>
 				<unitPattern count="other">{0} фунта на квадратний дюйм</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName draft="contributed">Карати</displayName>
-				<unitPattern count="one" draft="contributed">{0} Карат</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} Карати</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} Каратів</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} Карата</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>дюйми ртутного стовпа</displayName>
+				<unitPattern count="one">{0} дюйм ртутного стовпа</unitPattern>
+				<unitPattern count="few">{0} дюйми ртутного стовпа</unitPattern>
+				<unitPattern count="many">{0} дюймів ртутного стовпа</unitPattern>
+				<unitPattern count="other">{0} дюйма ртутного стовпа</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>мілібари</displayName>
+				<unitPattern count="one">{0} мілібар</unitPattern>
+				<unitPattern count="few">{0} мілібари</unitPattern>
+				<unitPattern count="many">{0} мілібарів</unitPattern>
+				<unitPattern count="other">{0} мілібара</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>кілометри на годину</displayName>
@@ -7612,6 +7924,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} миль на годину</unitPattern>
 				<unitPattern count="other">{0} милі на годину</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>вузол</displayName>
+				<unitPattern count="one">{0} вузол</unitPattern>
+				<unitPattern count="few">{0} вузли</unitPattern>
+				<unitPattern count="many">{0} вузлів</unitPattern>
+				<unitPattern count="other">{0} вузла</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>градуси Цельсія</displayName>
 				<unitPattern count="one">{0} градус Цельсія</unitPattern>
@@ -7633,41 +7959,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} кельвінів</unitPattern>
 				<unitPattern count="other">{0} кельвіна</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>акр-фути</displayName>
-				<unitPattern count="one">{0} акр-фут</unitPattern>
-				<unitPattern count="few">{0} акр-фути</unitPattern>
-				<unitPattern count="many">{0} акр-футів</unitPattern>
-				<unitPattern count="other">{0} акр-фута</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>сантилітри</displayName>
-				<unitPattern count="one">{0} сантилітр</unitPattern>
-				<unitPattern count="few">{0} сантилітри</unitPattern>
-				<unitPattern count="many">{0} сантилітрів</unitPattern>
-				<unitPattern count="other">{0} сантилітра</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>кубічні сантиметри</displayName>
-				<unitPattern count="one">{0} кубічний сантиметр</unitPattern>
-				<unitPattern count="few">{0} кубічні сантиметри</unitPattern>
-				<unitPattern count="many">{0} кубічних сантиметрів</unitPattern>
-				<unitPattern count="other">{0} кубічного сантиметра</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>кубічні фути</displayName>
-				<unitPattern count="one">{0} кубічний фут</unitPattern>
-				<unitPattern count="few">{0} кубічні фути</unitPattern>
-				<unitPattern count="many">{0} кубічних футів</unitPattern>
-				<unitPattern count="other">{0} кубічного фута</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>кубічні дюйми</displayName>
-				<unitPattern count="one">{0} кубічний дюйм</unitPattern>
-				<unitPattern count="few">{0} кубічні дюйми</unitPattern>
-				<unitPattern count="many">{0} кубічних дюймів</unitPattern>
-				<unitPattern count="other">{0} кубічного дюйма</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>кубічні кілометри</displayName>
 				<unitPattern count="one">{0} кубічний кілометр</unitPattern>
@@ -7681,6 +7972,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} кубічні метри</unitPattern>
 				<unitPattern count="many">{0} кубічних метрів</unitPattern>
 				<unitPattern count="other">{0} кубічного метра</unitPattern>
+				<perUnitPattern>{0} на кубічний метр</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>кубічні сантиметри</displayName>
+				<unitPattern count="one">{0} кубічний сантиметр</unitPattern>
+				<unitPattern count="few">{0} кубічні сантиметри</unitPattern>
+				<unitPattern count="many">{0} кубічних сантиметрів</unitPattern>
+				<unitPattern count="other">{0} кубічного сантиметра</unitPattern>
+				<perUnitPattern>{0} на кубічний сантиметр</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>кубічні милі</displayName>
@@ -7696,33 +7996,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} кубічних ярдів</unitPattern>
 				<unitPattern count="other">{0} кубічного ярда</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>чашки</displayName>
-				<unitPattern count="one">{0} чашка</unitPattern>
-				<unitPattern count="few">{0} чашки</unitPattern>
-				<unitPattern count="many">{0} чашок</unitPattern>
-				<unitPattern count="other">{0} чашки</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>кубічні фути</displayName>
+				<unitPattern count="one">{0} кубічний фут</unitPattern>
+				<unitPattern count="few">{0} кубічні фути</unitPattern>
+				<unitPattern count="many">{0} кубічних футів</unitPattern>
+				<unitPattern count="other">{0} кубічного фута</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>децилітри</displayName>
-				<unitPattern count="one">{0} децилітр</unitPattern>
-				<unitPattern count="few">{0} децилітри</unitPattern>
-				<unitPattern count="many">{0} децилітрів</unitPattern>
-				<unitPattern count="other">{0} децилітра</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>кубічні дюйми</displayName>
+				<unitPattern count="one">{0} кубічний дюйм</unitPattern>
+				<unitPattern count="few">{0} кубічні дюйми</unitPattern>
+				<unitPattern count="many">{0} кубічних дюймів</unitPattern>
+				<unitPattern count="other">{0} кубічного дюйма</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>рідкі унції</displayName>
-				<unitPattern count="one">{0} рідка унція</unitPattern>
-				<unitPattern count="few">{0} рідкі унції</unitPattern>
-				<unitPattern count="many">{0} рідких унцій</unitPattern>
-				<unitPattern count="other">{0} рідкої унції</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>галони</displayName>
-				<unitPattern count="one">{0} галон</unitPattern>
-				<unitPattern count="few">{0} галони</unitPattern>
-				<unitPattern count="many">{0} галонів</unitPattern>
-				<unitPattern count="other">{0} галона</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>мегалітри</displayName>
+				<unitPattern count="one">{0} мегалітр</unitPattern>
+				<unitPattern count="few">{0} мегалітри</unitPattern>
+				<unitPattern count="many">{0} мегалітрів</unitPattern>
+				<unitPattern count="other">{0} мегалітра</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>гектолітри</displayName>
@@ -7737,13 +8030,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} літри</unitPattern>
 				<unitPattern count="many">{0} літрів</unitPattern>
 				<unitPattern count="other">{0} літра</unitPattern>
+				<perUnitPattern>{0} на літр</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>мегалітри</displayName>
-				<unitPattern count="one">{0} мегалітр</unitPattern>
-				<unitPattern count="few">{0} мегалітри</unitPattern>
-				<unitPattern count="many">{0} мегалітрів</unitPattern>
-				<unitPattern count="other">{0} мегалітра</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>децилітри</displayName>
+				<unitPattern count="one">{0} децилітр</unitPattern>
+				<unitPattern count="few">{0} децилітри</unitPattern>
+				<unitPattern count="many">{0} децилітрів</unitPattern>
+				<unitPattern count="other">{0} децилітра</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>сантилітри</displayName>
+				<unitPattern count="one">{0} сантилітр</unitPattern>
+				<unitPattern count="few">{0} сантилітри</unitPattern>
+				<unitPattern count="many">{0} сантилітрів</unitPattern>
+				<unitPattern count="other">{0} сантилітра</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>мілілітри</displayName>
@@ -7752,12 +8053,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} мілілітрів</unitPattern>
 				<unitPattern count="other">{0} мілілітра</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>пінти</displayName>
-				<unitPattern count="one">{0} пінта</unitPattern>
-				<unitPattern count="few">{0} пінти</unitPattern>
-				<unitPattern count="many">{0} пінт</unitPattern>
-				<unitPattern count="other">{0} пінти</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>метрична пінта</displayName>
+				<unitPattern count="one">{0} метрична пінта</unitPattern>
+				<unitPattern count="few">{0} метричні пінти</unitPattern>
+				<unitPattern count="many">{0} метричних пінт</unitPattern>
+				<unitPattern count="other">{0} метричної пінти</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>метричні склянки</displayName>
+				<unitPattern count="one">{0} метрична склянка</unitPattern>
+				<unitPattern count="few">{0} метричні склянки</unitPattern>
+				<unitPattern count="many">{0} метричних склянок</unitPattern>
+				<unitPattern count="other">{0} метричної склянки</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>акр-фути</displayName>
+				<unitPattern count="one">{0} акр-фут</unitPattern>
+				<unitPattern count="few">{0} акр-фути</unitPattern>
+				<unitPattern count="many">{0} акр-футів</unitPattern>
+				<unitPattern count="other">{0} акр-фута</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>галони</displayName>
+				<unitPattern count="one">{0} галон</unitPattern>
+				<unitPattern count="few">{0} галони</unitPattern>
+				<unitPattern count="many">{0} галонів</unitPattern>
+				<unitPattern count="other">{0} галона</unitPattern>
+				<perUnitPattern>{0} на галон</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>кварти</displayName>
@@ -7766,6 +8089,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} кварт</unitPattern>
 				<unitPattern count="other">{0} кварти</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>пінти</displayName>
+				<unitPattern count="one">{0} пінта</unitPattern>
+				<unitPattern count="few">{0} пінти</unitPattern>
+				<unitPattern count="many">{0} пінт</unitPattern>
+				<unitPattern count="other">{0} пінти</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>склянки</displayName>
+				<unitPattern count="one">{0} склянка</unitPattern>
+				<unitPattern count="few">{0} склянки</unitPattern>
+				<unitPattern count="many">{0} склянок</unitPattern>
+				<unitPattern count="other">{0} склянки</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>рідкі унції</displayName>
+				<unitPattern count="one">{0} рідка унція</unitPattern>
+				<unitPattern count="few">{0} рідкі унції</unitPattern>
+				<unitPattern count="many">{0} рідких унцій</unitPattern>
+				<unitPattern count="other">{0} рідкої унції</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>cтолові ложки</displayName>
 				<unitPattern count="one">{0} столова ложка</unitPattern>
@@ -7780,6 +8124,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} чайних ложок</unitPattern>
 				<unitPattern count="other">{0} чайної ложки</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} на Схід</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} на Північ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} на Південь</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} на Захід</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -7799,6 +8149,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} м/с²</unitPattern>
 				<unitPattern count="other">{0} м/с²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>об</displayName>
+				<unitPattern count="one">{0} об</unitPattern>
+				<unitPattern count="few">{0} об</unitPattern>
+				<unitPattern count="many">{0} об</unitPattern>
+				<unitPattern count="other">{0} об</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>радіани</displayName>
+				<unitPattern count="one">{0} рад.</unitPattern>
+				<unitPattern count="few">{0} рад.</unitPattern>
+				<unitPattern count="many">{0} рад.</unitPattern>
+				<unitPattern count="other">{0} рад.</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>градуси</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>мінути</displayName>
 				<unitPattern count="one">{0} мін.</unitPattern>
@@ -7813,26 +8184,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} кут. сек.</unitPattern>
 				<unitPattern count="other">{0} кут. сек.</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>градуси</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="few">{0}°</unitPattern>
-				<unitPattern count="many">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>радіани</displayName>
-				<unitPattern count="one">{0} рад.</unitPattern>
-				<unitPattern count="few">{0} рад.</unitPattern>
-				<unitPattern count="many">{0} рад.</unitPattern>
-				<unitPattern count="other">{0} рад.</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>акри</displayName>
-				<unitPattern count="one">{0} акр</unitPattern>
-				<unitPattern count="few">{0} акри</unitPattern>
-				<unitPattern count="many">{0} акрів</unitPattern>
-				<unitPattern count="other">{0} акра</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>км²</displayName>
+				<unitPattern count="one">{0} км²</unitPattern>
+				<unitPattern count="few">{0} км²</unitPattern>
+				<unitPattern count="many">{0} км²</unitPattern>
+				<unitPattern count="other">{0} км²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>гектари</displayName>
@@ -7841,12 +8198,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} га</unitPattern>
 				<unitPattern count="other">{0} га</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>м²</displayName>
+				<unitPattern count="one">{0} м²</unitPattern>
+				<unitPattern count="few">{0} м²</unitPattern>
+				<unitPattern count="many">{0} м²</unitPattern>
+				<unitPattern count="other">{0} м²</unitPattern>
+				<perUnitPattern>{0}/м²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>см²</displayName>
 				<unitPattern count="one">{0} см²</unitPattern>
 				<unitPattern count="few">{0} см²</unitPattern>
 				<unitPattern count="many">{0} см²</unitPattern>
 				<unitPattern count="other">{0} см²</unitPattern>
+				<perUnitPattern>{0}/см²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>милі²</displayName>
+				<unitPattern count="one">{0} миля²</unitPattern>
+				<unitPattern count="few">{0} милі²</unitPattern>
+				<unitPattern count="many">{0} миль²</unitPattern>
+				<unitPattern count="other">{0} милі²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>акри</displayName>
+				<unitPattern count="one">{0} акр</unitPattern>
+				<unitPattern count="few">{0} акри</unitPattern>
+				<unitPattern count="many">{0} акрів</unitPattern>
+				<unitPattern count="other">{0} акра</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>ярди²</displayName>
+				<unitPattern count="one">{0} ярд²</unitPattern>
+				<unitPattern count="few">{0} ярди²</unitPattern>
+				<unitPattern count="many">{0} ярдів²</unitPattern>
+				<unitPattern count="other">{0} ярда²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>фути²</displayName>
@@ -7861,34 +8248,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} дюйми²</unitPattern>
 				<unitPattern count="many">{0} дюймів²</unitPattern>
 				<unitPattern count="other">{0} дюйма²</unitPattern>
+				<perUnitPattern>{0}/дюйм²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>км²</displayName>
-				<unitPattern count="one">{0} км²</unitPattern>
-				<unitPattern count="few">{0} км²</unitPattern>
-				<unitPattern count="many">{0} км²</unitPattern>
-				<unitPattern count="other">{0} км²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>м²</displayName>
-				<unitPattern count="one">{0} м²</unitPattern>
-				<unitPattern count="few">{0} м²</unitPattern>
-				<unitPattern count="many">{0} м²</unitPattern>
-				<unitPattern count="other">{0} м²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>милі²</displayName>
-				<unitPattern count="one">{0} миля²</unitPattern>
-				<unitPattern count="few">{0} милі²</unitPattern>
-				<unitPattern count="many">{0} миль²</unitPattern>
-				<unitPattern count="other">{0} милі²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>ярди²</displayName>
-				<unitPattern count="one">{0} ярд²</unitPattern>
-				<unitPattern count="few">{0} ярди²</unitPattern>
-				<unitPattern count="many">{0} ярдів²</unitPattern>
-				<unitPattern count="other">{0} ярда²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>карати</displayName>
+				<unitPattern count="one">{0} кар.</unitPattern>
+				<unitPattern count="few">{0} кар.</unitPattern>
+				<unitPattern count="many">{0} кар.</unitPattern>
+				<unitPattern count="other">{0} кар.</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>літри/км</displayName>
@@ -7897,6 +8264,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} л/км</unitPattern>
 				<unitPattern count="other">{0} л/км</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>л/100 км</displayName>
+				<unitPattern count="one">{0} л/100 км</unitPattern>
+				<unitPattern count="few">{0} л/100 км</unitPattern>
+				<unitPattern count="many">{0} л/100 км</unitPattern>
+				<unitPattern count="other">{0} л/100 км</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>милі/галон</displayName>
 				<unitPattern count="one">{0} миля/галон</unitPattern>
@@ -7904,69 +8278,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} миль/галон</unitPattern>
 				<unitPattern count="other">{0} милі/галон</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>біт</displayName>
-				<unitPattern count="one">{0} б</unitPattern>
-				<unitPattern count="few">{0} б</unitPattern>
-				<unitPattern count="many">{0} б</unitPattern>
-				<unitPattern count="other">{0} б</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName draft="contributed">байт</displayName>
-				<unitPattern count="one">{0} Б</unitPattern>
-				<unitPattern count="few">{0} Б</unitPattern>
-				<unitPattern count="many">{0} Б</unitPattern>
-				<unitPattern count="other">{0} Б</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Гбіт</displayName>
-				<unitPattern count="one">{0} Гб</unitPattern>
-				<unitPattern count="few">{0} Гб</unitPattern>
-				<unitPattern count="many">{0} Гб</unitPattern>
-				<unitPattern count="other">{0} Гб</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>Гбайт</displayName>
-				<unitPattern count="one">{0} ГБ</unitPattern>
-				<unitPattern count="few">{0} ГБ</unitPattern>
-				<unitPattern count="many">{0} ГБ</unitPattern>
-				<unitPattern count="other">{0} ГБ</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>кбіт</displayName>
-				<unitPattern count="one">{0} кб</unitPattern>
-				<unitPattern count="few">{0} кб</unitPattern>
-				<unitPattern count="many">{0} кб</unitPattern>
-				<unitPattern count="other">{0} кб</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>кбайт</displayName>
-				<unitPattern count="one">{0} кБ</unitPattern>
-				<unitPattern count="few">{0} кБ</unitPattern>
-				<unitPattern count="many">{0} кБ</unitPattern>
-				<unitPattern count="other">{0} кБ</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Мбіт</displayName>
-				<unitPattern count="one">{0} Мб</unitPattern>
-				<unitPattern count="few">{0} Мб</unitPattern>
-				<unitPattern count="many">{0} Мб</unitPattern>
-				<unitPattern count="other">{0} Мб</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>Мбайт</displayName>
-				<unitPattern count="one">{0} МБ</unitPattern>
-				<unitPattern count="few">{0} МБ</unitPattern>
-				<unitPattern count="many">{0} МБ</unitPattern>
-				<unitPattern count="other">{0} МБ</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Тбіт</displayName>
-				<unitPattern count="one">{0} Тб</unitPattern>
-				<unitPattern count="few">{0} Тб</unitPattern>
-				<unitPattern count="many">{0} Тб</unitPattern>
-				<unitPattern count="other">{0} Тб</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>Тбайт</displayName>
 				<unitPattern count="one">{0} ТБ</unitPattern>
@@ -7974,27 +8285,131 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ТБ</unitPattern>
 				<unitPattern count="other">{0} ТБ</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Тбіт</displayName>
+				<unitPattern count="one">{0} Тб</unitPattern>
+				<unitPattern count="few">{0} Тб</unitPattern>
+				<unitPattern count="many">{0} Тб</unitPattern>
+				<unitPattern count="other">{0} Тб</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>Гбайт</displayName>
+				<unitPattern count="one">{0} ГБ</unitPattern>
+				<unitPattern count="few">{0} ГБ</unitPattern>
+				<unitPattern count="many">{0} ГБ</unitPattern>
+				<unitPattern count="other">{0} ГБ</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Гбіт</displayName>
+				<unitPattern count="one">{0} Гб</unitPattern>
+				<unitPattern count="few">{0} Гб</unitPattern>
+				<unitPattern count="many">{0} Гб</unitPattern>
+				<unitPattern count="other">{0} Гб</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>Мбайт</displayName>
+				<unitPattern count="one">{0} МБ</unitPattern>
+				<unitPattern count="few">{0} МБ</unitPattern>
+				<unitPattern count="many">{0} МБ</unitPattern>
+				<unitPattern count="other">{0} МБ</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Мбіт</displayName>
+				<unitPattern count="one">{0} Мб</unitPattern>
+				<unitPattern count="few">{0} Мб</unitPattern>
+				<unitPattern count="many">{0} Мб</unitPattern>
+				<unitPattern count="other">{0} Мб</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>кбайт</displayName>
+				<unitPattern count="one">{0} кБ</unitPattern>
+				<unitPattern count="few">{0} кБ</unitPattern>
+				<unitPattern count="many">{0} кБ</unitPattern>
+				<unitPattern count="other">{0} кБ</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>кбіт</displayName>
+				<unitPattern count="one">{0} кб</unitPattern>
+				<unitPattern count="few">{0} кб</unitPattern>
+				<unitPattern count="many">{0} кб</unitPattern>
+				<unitPattern count="other">{0} кб</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>байт</displayName>
+				<unitPattern count="one">{0} Б</unitPattern>
+				<unitPattern count="few">{0} Б</unitPattern>
+				<unitPattern count="many">{0} Б</unitPattern>
+				<unitPattern count="other">{0} Б</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>біт</displayName>
+				<unitPattern count="one">{0} б</unitPattern>
+				<unitPattern count="few">{0} б</unitPattern>
+				<unitPattern count="many">{0} б</unitPattern>
+				<unitPattern count="other">{0} б</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>ст.</displayName>
+				<unitPattern count="one">{0} ст.</unitPattern>
+				<unitPattern count="few">{0} ст.</unitPattern>
+				<unitPattern count="many">{0} ст.</unitPattern>
+				<unitPattern count="other">{0} ст.</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>р.</displayName>
+				<unitPattern count="one">{0} р.</unitPattern>
+				<unitPattern count="few">{0} р.</unitPattern>
+				<unitPattern count="many">{0} р.</unitPattern>
+				<unitPattern count="other">{0} р.</unitPattern>
+				<perUnitPattern>{0}/р.</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>міс.</displayName>
+				<unitPattern count="one">{0} міс.</unitPattern>
+				<unitPattern count="few">{0} міс.</unitPattern>
+				<unitPattern count="many">{0} міс.</unitPattern>
+				<unitPattern count="other">{0} міс.</unitPattern>
+				<perUnitPattern>{0}/міс.</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>тиж.</displayName>
+				<unitPattern count="one">{0} тиж.</unitPattern>
+				<unitPattern count="few">{0} тиж.</unitPattern>
+				<unitPattern count="many">{0} тиж.</unitPattern>
+				<unitPattern count="other">{0} тиж.</unitPattern>
+				<perUnitPattern>{0}/тиж.</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>дні</displayName>
 				<unitPattern count="one">{0} д.</unitPattern>
 				<unitPattern count="few">{0} дн.</unitPattern>
 				<unitPattern count="many">{0} дн.</unitPattern>
 				<unitPattern count="other">{0} дн.</unitPattern>
+				<perUnitPattern>{0}/дн.</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName>години</displayName>
+				<displayName>год</displayName>
 				<unitPattern count="one">{0} год</unitPattern>
 				<unitPattern count="few">{0} год</unitPattern>
 				<unitPattern count="many">{0} год</unitPattern>
 				<unitPattern count="other">{0} год</unitPattern>
-				<perUnitPattern>на год</perUnitPattern>
+				<perUnitPattern>{0}/год</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>мкс</displayName>
-				<unitPattern count="one">{0} мкс</unitPattern>
-				<unitPattern count="few">{0} мкс</unitPattern>
-				<unitPattern count="many">{0} мкс</unitPattern>
-				<unitPattern count="other">{0} мкс</unitPattern>
+			<unit type="duration-minute">
+				<displayName>хв</displayName>
+				<unitPattern count="one">{0} хв</unitPattern>
+				<unitPattern count="few">{0} хв</unitPattern>
+				<unitPattern count="many">{0} хв</unitPattern>
+				<unitPattern count="other">{0} хв</unitPattern>
+				<perUnitPattern>{0}/хв</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>с</displayName>
+				<unitPattern count="one">{0} с</unitPattern>
+				<unitPattern count="few">{0} с</unitPattern>
+				<unitPattern count="many">{0} с</unitPattern>
+				<unitPattern count="other">{0} с</unitPattern>
+				<perUnitPattern>{0}/с</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>мс</displayName>
@@ -8003,19 +8418,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} мс</unitPattern>
 				<unitPattern count="other">{0} мс</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>хв</displayName>
-				<unitPattern count="one">{0} хв</unitPattern>
-				<unitPattern count="few">{0} хв</unitPattern>
-				<unitPattern count="many">{0} хв</unitPattern>
-				<unitPattern count="other">{0} хв</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>міс.</displayName>
-				<unitPattern count="one">{0} міс.</unitPattern>
-				<unitPattern count="few">{0} міс.</unitPattern>
-				<unitPattern count="many">{0} міс.</unitPattern>
-				<unitPattern count="other">{0} міс.</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>мкс</displayName>
+				<unitPattern count="one">{0} мкс</unitPattern>
+				<unitPattern count="few">{0} мкс</unitPattern>
+				<unitPattern count="many">{0} мкс</unitPattern>
+				<unitPattern count="other">{0} мкс</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>нс</displayName>
@@ -8024,28 +8432,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} нс</unitPattern>
 				<unitPattern count="other">{0} нс</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>с</displayName>
-				<unitPattern count="one">{0} с</unitPattern>
-				<unitPattern count="few">{0} с</unitPattern>
-				<unitPattern count="many">{0} с</unitPattern>
-				<unitPattern count="other">{0} с</unitPattern>
-				<perUnitPattern>на с</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>тиж.</displayName>
-				<unitPattern count="one">{0} тиж.</unitPattern>
-				<unitPattern count="few">{0} тиж.</unitPattern>
-				<unitPattern count="many">{0} тиж.</unitPattern>
-				<unitPattern count="other">{0} тиж.</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>р.</displayName>
-				<unitPattern count="one">{0} р.</unitPattern>
-				<unitPattern count="few">{0} р.</unitPattern>
-				<unitPattern count="many">{0} р.</unitPattern>
-				<unitPattern count="other">{0} р.</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>А</displayName>
 				<unitPattern count="one">{0} А</unitPattern>
@@ -8074,6 +8460,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} В</unitPattern>
 				<unitPattern count="other">{0} В</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>Ккал</displayName>
+				<unitPattern count="one">{0} Ккал</unitPattern>
+				<unitPattern count="few">{0} Ккал</unitPattern>
+				<unitPattern count="many">{0} Ккал</unitPattern>
+				<unitPattern count="other">{0} Ккал</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>кал</displayName>
 				<unitPattern count="one">{0} кал</unitPattern>
@@ -8088,20 +8481,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} Кал</unitPattern>
 				<unitPattern count="other">{0} Кал</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>джоулі</displayName>
-				<unitPattern count="one">{0} Дж</unitPattern>
-				<unitPattern count="few">{0} Дж</unitPattern>
-				<unitPattern count="many">{0} Дж</unitPattern>
-				<unitPattern count="other">{0} Дж</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>Ккал</displayName>
-				<unitPattern count="one">{0} Ккал</unitPattern>
-				<unitPattern count="few">{0} Ккал</unitPattern>
-				<unitPattern count="many">{0} Ккал</unitPattern>
-				<unitPattern count="other">{0} Ккал</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>кілоджоуль</displayName>
 				<unitPattern count="one">{0} кДж</unitPattern>
@@ -8109,6 +8488,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} кДж</unitPattern>
 				<unitPattern count="other">{0} кДж</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>джоулі</displayName>
+				<unitPattern count="one">{0} Дж</unitPattern>
+				<unitPattern count="few">{0} Дж</unitPattern>
+				<unitPattern count="many">{0} Дж</unitPattern>
+				<unitPattern count="other">{0} Дж</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>кВт год</displayName>
 				<unitPattern count="one">{0} кВт год</unitPattern>
@@ -8123,12 +8509,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ГГц</unitPattern>
 				<unitPattern count="other">{0} ГГц</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Гц</displayName>
-				<unitPattern count="one">{0} Гц</unitPattern>
-				<unitPattern count="few">{0} Гц</unitPattern>
-				<unitPattern count="many">{0} Гц</unitPattern>
-				<unitPattern count="other">{0} Гц</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>МГц</displayName>
+				<unitPattern count="one">{0} МГц</unitPattern>
+				<unitPattern count="few">{0} МГц</unitPattern>
+				<unitPattern count="many">{0} МГц</unitPattern>
+				<unitPattern count="other">{0} МГц</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>кГц</displayName>
@@ -8137,26 +8523,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} кГц</unitPattern>
 				<unitPattern count="other">{0} кГц</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>МГц</displayName>
-				<unitPattern count="one">{0} МГц</unitPattern>
-				<unitPattern count="few">{0} МГц</unitPattern>
-				<unitPattern count="many">{0} МГц</unitPattern>
-				<unitPattern count="other">{0} МГц</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Гц</displayName>
+				<unitPattern count="one">{0} Гц</unitPattern>
+				<unitPattern count="few">{0} Гц</unitPattern>
+				<unitPattern count="many">{0} Гц</unitPattern>
+				<unitPattern count="other">{0} Гц</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>а. о.</displayName>
-				<unitPattern count="one">{0} а. о.</unitPattern>
-				<unitPattern count="few">{0} а. о.</unitPattern>
-				<unitPattern count="many">{0} а. о.</unitPattern>
-				<unitPattern count="other">{0} а. о.</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>км</displayName>
+				<unitPattern count="one">{0} км</unitPattern>
+				<unitPattern count="few">{0} км</unitPattern>
+				<unitPattern count="many">{0} км</unitPattern>
+				<unitPattern count="other">{0} км</unitPattern>
+				<perUnitPattern>{0}/км</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>см</displayName>
-				<unitPattern count="one">{0} см</unitPattern>
-				<unitPattern count="few">{0} см</unitPattern>
-				<unitPattern count="many">{0} см</unitPattern>
-				<unitPattern count="other">{0} см</unitPattern>
+			<unit type="length-meter">
+				<displayName>метри</displayName>
+				<unitPattern count="one">{0} м</unitPattern>
+				<unitPattern count="few">{0} м</unitPattern>
+				<unitPattern count="many">{0} м</unitPattern>
+				<unitPattern count="other">{0} м</unitPattern>
+				<perUnitPattern>{0}/м</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>дм</displayName>
@@ -8165,54 +8553,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} дм</unitPattern>
 				<unitPattern count="other">{0} дм</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>фут</displayName>
-				<unitPattern count="one">{0} фут</unitPattern>
-				<unitPattern count="few">{0} фути</unitPattern>
-				<unitPattern count="many">{0} футів</unitPattern>
-				<unitPattern count="other">{0} фута</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>дюйми</displayName>
-				<unitPattern count="one">{0} дюйм</unitPattern>
-				<unitPattern count="few">{0} дюйми</unitPattern>
-				<unitPattern count="many">{0} дюймів</unitPattern>
-				<unitPattern count="other">{0} дюйма</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>км</displayName>
-				<unitPattern count="one">{0} км</unitPattern>
-				<unitPattern count="few">{0} км</unitPattern>
-				<unitPattern count="many">{0} км</unitPattern>
-				<unitPattern count="other">{0} км</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>св. р.</displayName>
-				<unitPattern count="one">{0} св. р.</unitPattern>
-				<unitPattern count="few">{0} св. р.</unitPattern>
-				<unitPattern count="many">{0} св. р.</unitPattern>
-				<unitPattern count="other">{0} св. р.</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>метри</displayName>
-				<unitPattern count="one">{0} м</unitPattern>
-				<unitPattern count="few">{0} м</unitPattern>
-				<unitPattern count="many">{0} м</unitPattern>
-				<unitPattern count="other">{0} м</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>мкм</displayName>
-				<unitPattern count="one">{0} мкм</unitPattern>
-				<unitPattern count="few">{0} мкм</unitPattern>
-				<unitPattern count="many">{0} мкм</unitPattern>
-				<unitPattern count="other">{0} мкм</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>милі</displayName>
-				<unitPattern count="one">{0} миля</unitPattern>
-				<unitPattern count="few">{0} милі</unitPattern>
-				<unitPattern count="many">{0} миль</unitPattern>
-				<unitPattern count="other">{0} милі</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>см</displayName>
+				<unitPattern count="one">{0} см</unitPattern>
+				<unitPattern count="few">{0} см</unitPattern>
+				<unitPattern count="many">{0} см</unitPattern>
+				<unitPattern count="other">{0} см</unitPattern>
+				<perUnitPattern>{0}/см</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>мм</displayName>
@@ -8221,6 +8568,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} мм</unitPattern>
 				<unitPattern count="other">{0} мм</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>мкм</displayName>
+				<unitPattern count="one">{0} мкм</unitPattern>
+				<unitPattern count="few">{0} мкм</unitPattern>
+				<unitPattern count="many">{0} мкм</unitPattern>
+				<unitPattern count="other">{0} мкм</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>нм</displayName>
 				<unitPattern count="one">{0} нм</unitPattern>
@@ -8228,20 +8582,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} нм</unitPattern>
 				<unitPattern count="other">{0} нм</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>м. милі</displayName>
-				<unitPattern count="one">{0} м. миля</unitPattern>
-				<unitPattern count="few">{0} м. милі</unitPattern>
-				<unitPattern count="many">{0} м. миль</unitPattern>
-				<unitPattern count="other">{0} м. милі</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>парсеки</displayName>
-				<unitPattern count="one">{0} пк</unitPattern>
-				<unitPattern count="few">{0} пк</unitPattern>
-				<unitPattern count="many">{0} пк</unitPattern>
-				<unitPattern count="other">{0} пк</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>пм</displayName>
 				<unitPattern count="one">{0} пм</unitPattern>
@@ -8249,6 +8589,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} пм</unitPattern>
 				<unitPattern count="other">{0} пм</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>милі</displayName>
+				<unitPattern count="one">{0} миля</unitPattern>
+				<unitPattern count="few">{0} милі</unitPattern>
+				<unitPattern count="many">{0} миль</unitPattern>
+				<unitPattern count="other">{0} милі</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>ярди</displayName>
 				<unitPattern count="one">{0} ярд</unitPattern>
@@ -8256,6 +8603,57 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ярдів</unitPattern>
 				<unitPattern count="other">{0} ярда</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>фут</displayName>
+				<unitPattern count="one">{0} фут</unitPattern>
+				<unitPattern count="few">{0} фути</unitPattern>
+				<unitPattern count="many">{0} футів</unitPattern>
+				<unitPattern count="other">{0} фута</unitPattern>
+				<perUnitPattern>{0}/фут</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>дюйми</displayName>
+				<unitPattern count="one">{0} дюйм</unitPattern>
+				<unitPattern count="few">{0} дюйми</unitPattern>
+				<unitPattern count="many">{0} дюймів</unitPattern>
+				<unitPattern count="other">{0} дюйма</unitPattern>
+				<perUnitPattern>{0}/дюйм</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>парсеки</displayName>
+				<unitPattern count="one">{0} пк</unitPattern>
+				<unitPattern count="few">{0} пк</unitPattern>
+				<unitPattern count="many">{0} пк</unitPattern>
+				<unitPattern count="other">{0} пк</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>св. р.</displayName>
+				<unitPattern count="one">{0} св. р.</unitPattern>
+				<unitPattern count="few">{0} св. р.</unitPattern>
+				<unitPattern count="many">{0} св. р.</unitPattern>
+				<unitPattern count="other">{0} св. р.</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>а. о.</displayName>
+				<unitPattern count="one">{0} а. о.</unitPattern>
+				<unitPattern count="few">{0} а. о.</unitPattern>
+				<unitPattern count="many">{0} а. о.</unitPattern>
+				<unitPattern count="other">{0} а. о.</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>м. милі</displayName>
+				<unitPattern count="one">{0} м. миля</unitPattern>
+				<unitPattern count="few">{0} м. милі</unitPattern>
+				<unitPattern count="many">{0} м. миль</unitPattern>
+				<unitPattern count="other">{0} м. милі</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="contributed">сканд. миля</displayName>
+				<unitPattern count="one" draft="contributed">{0} сканд. миля</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} сканд. милі</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} сканд. миль</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} сканд. милі</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>люкс</displayName>
 				<unitPattern count="one">{0} лк</unitPattern>
@@ -8263,27 +8661,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} лк</unitPattern>
 				<unitPattern count="other">{0} лк</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>карати</displayName>
-				<unitPattern count="one">{0} кар</unitPattern>
-				<unitPattern count="few">{0} кар</unitPattern>
-				<unitPattern count="many">{0} кар</unitPattern>
-				<unitPattern count="other">{0} кар</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>грами</displayName>
-				<unitPattern count="one">{0} г</unitPattern>
-				<unitPattern count="few">{0} г</unitPattern>
-				<unitPattern count="many">{0} г</unitPattern>
-				<unitPattern count="other">{0} г</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>кг</displayName>
-				<unitPattern count="one">{0} кг</unitPattern>
-				<unitPattern count="few">{0} кг</unitPattern>
-				<unitPattern count="many">{0} кг</unitPattern>
-				<unitPattern count="other">{0} кг</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>метр. т</displayName>
 				<unitPattern count="one">{0} метр. т</unitPattern>
@@ -8291,12 +8668,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} метр. т</unitPattern>
 				<unitPattern count="other">{0} метр. т</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>мкг</displayName>
-				<unitPattern count="one">{0} мкг</unitPattern>
-				<unitPattern count="few">{0} мкг</unitPattern>
-				<unitPattern count="many">{0} мкг</unitPattern>
-				<unitPattern count="other">{0} мкг</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>кг</displayName>
+				<unitPattern count="one">{0} кг</unitPattern>
+				<unitPattern count="few">{0} кг</unitPattern>
+				<unitPattern count="many">{0} кг</unitPattern>
+				<unitPattern count="other">{0} кг</unitPattern>
+				<perUnitPattern draft="contributed">{0}/кг</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>грами</displayName>
+				<unitPattern count="one">{0} г</unitPattern>
+				<unitPattern count="few">{0} г</unitPattern>
+				<unitPattern count="many">{0} г</unitPattern>
+				<unitPattern count="other">{0} г</unitPattern>
+				<perUnitPattern>{0}/г</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>мг</displayName>
@@ -8305,26 +8691,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} мг</unitPattern>
 				<unitPattern count="other">{0} мг</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>унції</displayName>
-				<unitPattern count="one">{0} унція</unitPattern>
-				<unitPattern count="few">{0} унції</unitPattern>
-				<unitPattern count="many">{0} унцій</unitPattern>
-				<unitPattern count="other">{0} унції</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>тр. унції</displayName>
-				<unitPattern count="one">{0} тр. унція</unitPattern>
-				<unitPattern count="few">{0} тр. унції</unitPattern>
-				<unitPattern count="many">{0} тр. унцій</unitPattern>
-				<unitPattern count="other">{0} тр. унції</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>фунти</displayName>
-				<unitPattern count="one">{0} фунт</unitPattern>
-				<unitPattern count="few">{0} фунти</unitPattern>
-				<unitPattern count="many">{0} фунтів</unitPattern>
-				<unitPattern count="other">{0} фунта</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>мкг</displayName>
+				<unitPattern count="one">{0} мкг</unitPattern>
+				<unitPattern count="few">{0} мкг</unitPattern>
+				<unitPattern count="many">{0} мкг</unitPattern>
+				<unitPattern count="other">{0} мкг</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>тонни</displayName>
@@ -8333,6 +8705,36 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} т</unitPattern>
 				<unitPattern count="other">{0} т</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>фунти</displayName>
+				<unitPattern count="one">{0} фунт</unitPattern>
+				<unitPattern count="few">{0} фунти</unitPattern>
+				<unitPattern count="many">{0} фунтів</unitPattern>
+				<unitPattern count="other">{0} фунта</unitPattern>
+				<perUnitPattern>{0}/фунт</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>унц.</displayName>
+				<unitPattern count="one">{0} унц.</unitPattern>
+				<unitPattern count="few">{0} унц.</unitPattern>
+				<unitPattern count="many">{0} унц.</unitPattern>
+				<unitPattern count="other">{0} унц.</unitPattern>
+				<perUnitPattern>{0}/унц.</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>тр. унції</displayName>
+				<unitPattern count="one">{0} тр. унція</unitPattern>
+				<unitPattern count="few">{0} тр. унції</unitPattern>
+				<unitPattern count="many">{0} тр. унцій</unitPattern>
+				<unitPattern count="other">{0} тр. унції</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>карати</displayName>
+				<unitPattern count="one">{0} кар</unitPattern>
+				<unitPattern count="few">{0} кар</unitPattern>
+				<unitPattern count="many">{0} кар</unitPattern>
+				<unitPattern count="other">{0} кар</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>ГВт</displayName>
 				<unitPattern count="one">{0} ГВт</unitPattern>
@@ -8340,20 +8742,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ГВт</unitPattern>
 				<unitPattern count="other">{0} ГВт</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>к. с.</displayName>
-				<unitPattern count="one">{0} к. с.</unitPattern>
-				<unitPattern count="few">{0} к. с.</unitPattern>
-				<unitPattern count="many">{0} к. с.</unitPattern>
-				<unitPattern count="other">{0} к. с.</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>кВт</displayName>
-				<unitPattern count="one">{0} кВт</unitPattern>
-				<unitPattern count="few">{0} кВт</unitPattern>
-				<unitPattern count="many">{0} кВт</unitPattern>
-				<unitPattern count="other">{0} кВт</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>МВт</displayName>
 				<unitPattern count="one">{0} МВт</unitPattern>
@@ -8361,12 +8749,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} МВт</unitPattern>
 				<unitPattern count="other">{0} МВт</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>мВт</displayName>
-				<unitPattern count="one">{0} мВт</unitPattern>
-				<unitPattern count="few">{0} мВт</unitPattern>
-				<unitPattern count="many">{0} мВт</unitPattern>
-				<unitPattern count="other">{0} мВт</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>кВт</displayName>
+				<unitPattern count="one">{0} кВт</unitPattern>
+				<unitPattern count="few">{0} кВт</unitPattern>
+				<unitPattern count="many">{0} кВт</unitPattern>
+				<unitPattern count="other">{0} кВт</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>вати</displayName>
@@ -8375,6 +8763,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} Вт</unitPattern>
 				<unitPattern count="other">{0} Вт</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>мВт</displayName>
+				<unitPattern count="one">{0} мВт</unitPattern>
+				<unitPattern count="few">{0} мВт</unitPattern>
+				<unitPattern count="many">{0} мВт</unitPattern>
+				<unitPattern count="other">{0} мВт</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>к. с.</displayName>
+				<unitPattern count="one">{0} к. с.</unitPattern>
+				<unitPattern count="few">{0} к. с.</unitPattern>
+				<unitPattern count="many">{0} к. с.</unitPattern>
+				<unitPattern count="other">{0} к. с.</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>гПа</displayName>
 				<unitPattern count="one">{0} гПа</unitPattern>
@@ -8382,20 +8784,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} гПа</unitPattern>
 				<unitPattern count="other">{0} гПа</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>дюйми рт. ст.</displayName>
-				<unitPattern count="one">{0} дюйм рт. ст.</unitPattern>
-				<unitPattern count="few">{0} дюйми рт. ст.</unitPattern>
-				<unitPattern count="many">{0} дюймів рт. ст.</unitPattern>
-				<unitPattern count="other">{0} дюйма рт. ст.</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>мбар</displayName>
-				<unitPattern count="one">{0} мбар</unitPattern>
-				<unitPattern count="few">{0} мбари</unitPattern>
-				<unitPattern count="many">{0} мбарів</unitPattern>
-				<unitPattern count="other">{0} мбара</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>мм рт. ст.</displayName>
 				<unitPattern count="one">{0} мм рт. ст.</unitPattern>
@@ -8410,12 +8798,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} фунтів/дюйм²</unitPattern>
 				<unitPattern count="other">{0} фунта/дюйм²</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName draft="contributed">Карати</displayName>
-				<unitPattern count="one">{0} Кар.</unitPattern>
-				<unitPattern count="few">{0} Кар.</unitPattern>
-				<unitPattern count="many">{0} Кар.</unitPattern>
-				<unitPattern count="other">{0} Кар.</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>дюйми рт. ст.</displayName>
+				<unitPattern count="one">{0} дюйм рт. ст.</unitPattern>
+				<unitPattern count="few">{0} дюйми рт. ст.</unitPattern>
+				<unitPattern count="many">{0} дюймів рт. ст.</unitPattern>
+				<unitPattern count="other">{0} дюйма рт. ст.</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>мбар</displayName>
+				<unitPattern count="one">{0} мбар</unitPattern>
+				<unitPattern count="few">{0} мбари</unitPattern>
+				<unitPattern count="many">{0} мбарів</unitPattern>
+				<unitPattern count="other">{0} мбара</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>км/годину</displayName>
@@ -8438,6 +8833,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} миль/год</unitPattern>
 				<unitPattern count="other">{0} милі/год</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="few">{0} kn</unitPattern>
+				<unitPattern count="many">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="few">{0}°</unitPattern>
+				<unitPattern count="many">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>градус Цельсія</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -8459,41 +8868,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} К</unitPattern>
 				<unitPattern count="other">{0} К</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>акр-фути</displayName>
-				<unitPattern count="one">{0} акр-фут</unitPattern>
-				<unitPattern count="few">{0} акр-фути</unitPattern>
-				<unitPattern count="many">{0} акр-футів</unitPattern>
-				<unitPattern count="other">{0} акр-фута</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>сл</displayName>
-				<unitPattern count="one">{0} сл</unitPattern>
-				<unitPattern count="few">{0} сл</unitPattern>
-				<unitPattern count="many">{0} сл</unitPattern>
-				<unitPattern count="other">{0} сл</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>см³</displayName>
-				<unitPattern count="one">{0} см³</unitPattern>
-				<unitPattern count="few">{0} см³</unitPattern>
-				<unitPattern count="many">{0} см³</unitPattern>
-				<unitPattern count="other">{0} см³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>фути³</displayName>
-				<unitPattern count="one">{0} фут³</unitPattern>
-				<unitPattern count="few">{0} фути³</unitPattern>
-				<unitPattern count="many">{0} футів³</unitPattern>
-				<unitPattern count="other">{0} фута³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>дюйми³</displayName>
-				<unitPattern count="one">{0} дюйм³</unitPattern>
-				<unitPattern count="few">{0} дюйми³</unitPattern>
-				<unitPattern count="many">{0} дюймів³</unitPattern>
-				<unitPattern count="other">{0} дюйма³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>км³</displayName>
 				<unitPattern count="one">{0} км³</unitPattern>
@@ -8507,6 +8881,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} м³</unitPattern>
 				<unitPattern count="many">{0} м³</unitPattern>
 				<unitPattern count="other">{0} м³</unitPattern>
+				<perUnitPattern>{0}/м³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>см³</displayName>
+				<unitPattern count="one">{0} см³</unitPattern>
+				<unitPattern count="few">{0} см³</unitPattern>
+				<unitPattern count="many">{0} см³</unitPattern>
+				<unitPattern count="other">{0} см³</unitPattern>
+				<perUnitPattern>{0}/см³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>милі³</displayName>
@@ -8522,33 +8905,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ярдів³</unitPattern>
 				<unitPattern count="other">{0} ярда³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>чашка</displayName>
-				<unitPattern count="one">{0} чаш.</unitPattern>
-				<unitPattern count="few">{0} чаш.</unitPattern>
-				<unitPattern count="many">{0} чаш.</unitPattern>
-				<unitPattern count="other">{0} чаш.</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>фути³</displayName>
+				<unitPattern count="one">{0} фут³</unitPattern>
+				<unitPattern count="few">{0} фути³</unitPattern>
+				<unitPattern count="many">{0} футів³</unitPattern>
+				<unitPattern count="other">{0} фута³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>дл</displayName>
-				<unitPattern count="one">{0} дл</unitPattern>
-				<unitPattern count="few">{0} дл</unitPattern>
-				<unitPattern count="many">{0} дл</unitPattern>
-				<unitPattern count="other">{0} дл</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>дюйми³</displayName>
+				<unitPattern count="one">{0} дюйм³</unitPattern>
+				<unitPattern count="few">{0} дюйми³</unitPattern>
+				<unitPattern count="many">{0} дюймів³</unitPattern>
+				<unitPattern count="other">{0} дюйма³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>рід. ун.</displayName>
-				<unitPattern count="one">{0} рід. ун.</unitPattern>
-				<unitPattern count="few">{0} рід. ун.</unitPattern>
-				<unitPattern count="many">{0} рід. ун.</unitPattern>
-				<unitPattern count="other">{0} рід. ун.</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>гал.</displayName>
-				<unitPattern count="one">{0} гал.</unitPattern>
-				<unitPattern count="few">{0} гал.</unitPattern>
-				<unitPattern count="many">{0} гал.</unitPattern>
-				<unitPattern count="other">{0} гал.</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>Мл</displayName>
+				<unitPattern count="one">{0} Мл</unitPattern>
+				<unitPattern count="few">{0} Мл</unitPattern>
+				<unitPattern count="many">{0} Мл</unitPattern>
+				<unitPattern count="other">{0} Мл</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>гл</displayName>
@@ -8563,13 +8939,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="few">{0} л</unitPattern>
 				<unitPattern count="many">{0} л</unitPattern>
 				<unitPattern count="other">{0} л</unitPattern>
+				<perUnitPattern>{0}/л</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Мл</displayName>
-				<unitPattern count="one">{0} Мл</unitPattern>
-				<unitPattern count="few">{0} Мл</unitPattern>
-				<unitPattern count="many">{0} Мл</unitPattern>
-				<unitPattern count="other">{0} Мл</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>дл</displayName>
+				<unitPattern count="one">{0} дл</unitPattern>
+				<unitPattern count="few">{0} дл</unitPattern>
+				<unitPattern count="many">{0} дл</unitPattern>
+				<unitPattern count="other">{0} дл</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>сл</displayName>
+				<unitPattern count="one">{0} сл</unitPattern>
+				<unitPattern count="few">{0} сл</unitPattern>
+				<unitPattern count="many">{0} сл</unitPattern>
+				<unitPattern count="other">{0} сл</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>мл</displayName>
@@ -8578,12 +8962,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} мл</unitPattern>
 				<unitPattern count="other">{0} мл</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>пінти</displayName>
-				<unitPattern count="one">{0} пінта</unitPattern>
-				<unitPattern count="few">{0} пінти</unitPattern>
-				<unitPattern count="many">{0} пінт</unitPattern>
-				<unitPattern count="other">{0} пінти</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>метрична пінта</displayName>
+				<unitPattern count="one">{0} метрична пінта</unitPattern>
+				<unitPattern count="few">{0} метричні пінти</unitPattern>
+				<unitPattern count="many">{0} метричних пінт</unitPattern>
+				<unitPattern count="other">{0} метричної пінти</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>метричні скл.</displayName>
+				<unitPattern count="one">{0} метрична скл.</unitPattern>
+				<unitPattern count="few">{0} метричні скл.</unitPattern>
+				<unitPattern count="many">{0} метричних скл.</unitPattern>
+				<unitPattern count="other">{0} метричної скл.</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>акр-фути</displayName>
+				<unitPattern count="one">{0} акр-фут</unitPattern>
+				<unitPattern count="few">{0} акр-фути</unitPattern>
+				<unitPattern count="many">{0} акр-футів</unitPattern>
+				<unitPattern count="other">{0} акр-фута</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>гал.</displayName>
+				<unitPattern count="one">{0} гал.</unitPattern>
+				<unitPattern count="few">{0} гал.</unitPattern>
+				<unitPattern count="many">{0} гал.</unitPattern>
+				<unitPattern count="other">{0} гал.</unitPattern>
+				<perUnitPattern>{0}/гал.</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>квар.</displayName>
@@ -8592,6 +8998,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} квар.</unitPattern>
 				<unitPattern count="other">{0} квар.</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>пінти</displayName>
+				<unitPattern count="one">{0} пінта</unitPattern>
+				<unitPattern count="few">{0} пінти</unitPattern>
+				<unitPattern count="many">{0} пінт</unitPattern>
+				<unitPattern count="other">{0} пінти</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>склянки</displayName>
+				<unitPattern count="one">{0} скл.</unitPattern>
+				<unitPattern count="few">{0} скл.</unitPattern>
+				<unitPattern count="many">{0} скл.</unitPattern>
+				<unitPattern count="other">{0} скл.</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>рід. ун.</displayName>
+				<unitPattern count="one">{0} рід. ун.</unitPattern>
+				<unitPattern count="few">{0} рід. ун.</unitPattern>
+				<unitPattern count="many">{0} рід. ун.</unitPattern>
+				<unitPattern count="other">{0} рід. ун.</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>ст. л.</displayName>
 				<unitPattern count="one">{0} ст. л.</unitPattern>
@@ -8606,6 +9033,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} ч. л.</unitPattern>
 				<unitPattern count="other">{0} ч. л.</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} на Сх</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} на Пн</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} на Пд</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} на Зх</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -8617,6 +9050,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} G</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="few" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="many" draft="contributed">{0}°</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one" draft="contributed">{0}′</unitPattern>
 				<unitPattern count="few" draft="contributed">{0}′</unitPattern>
@@ -8629,17 +9068,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0}″</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="few" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="many" draft="contributed">{0}°</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one" draft="contributed">{0} акр</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} акри</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} акрів</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} акра</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one" draft="contributed">{0} км²</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} км²</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} км²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} км²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one" draft="contributed">{0} га</unitPattern>
@@ -8647,18 +9080,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} га</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} га</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one" draft="contributed">{0} фут²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} фути²</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} футів²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} фута²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one" draft="contributed">{0} км²</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} км²</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} км²</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} км²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one" draft="contributed">{0} м²</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} м²</unitPattern>
@@ -8671,9 +9092,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} миль²</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} милі²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one" draft="contributed">{0} акр</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} акри</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} акрів</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} акра</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one" draft="contributed">{0} фут²</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} фути²</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} футів²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} фута²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>л/100 км</displayName>
+				<unitPattern count="one">{0} л/100 км</unitPattern>
+				<unitPattern count="few">{0} л/100 км</unitPattern>
+				<unitPattern count="many">{0} л/100 км</unitPattern>
+				<unitPattern count="other">{0} л/100 км</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>р.</displayName>
+				<unitPattern count="one">{0} р.</unitPattern>
+				<unitPattern count="few">{0} р.</unitPattern>
+				<unitPattern count="many">{0} р.</unitPattern>
+				<unitPattern count="other">{0} р.</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>міс.</displayName>
+				<unitPattern count="one">{0} міс.</unitPattern>
+				<unitPattern count="few">{0} міс.</unitPattern>
+				<unitPattern count="many">{0} міс.</unitPattern>
+				<unitPattern count="other">{0} міс.</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>тиж.</displayName>
+				<unitPattern count="one">{0} тиж.</unitPattern>
+				<unitPattern count="few">{0} тиж.</unitPattern>
+				<unitPattern count="many">{0} тиж.</unitPattern>
+				<unitPattern count="other">{0} тиж.</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>день</displayName>
-				<unitPattern count="one">{0} д.</unitPattern>
+				<unitPattern count="one">{0} дн.</unitPattern>
 				<unitPattern count="few">{0} дн.</unitPattern>
 				<unitPattern count="many">{0} дн.</unitPattern>
 				<unitPattern count="other">{0} дн.</unitPattern>
@@ -8685,20 +9146,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} год</unitPattern>
 				<unitPattern count="other">{0} год</unitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName draft="contributed">мкс</displayName>
-				<unitPattern count="one" draft="contributed">{0} мкс</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} мкс</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} мкс</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} мкс</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>мс</displayName>
-				<unitPattern count="one">{0} мс</unitPattern>
-				<unitPattern count="few">{0} мс</unitPattern>
-				<unitPattern count="many">{0} мс</unitPattern>
-				<unitPattern count="other">{0} мс</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>хв</displayName>
 				<unitPattern count="one">{0} хв</unitPattern>
@@ -8706,13 +9153,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} хв</unitPattern>
 				<unitPattern count="other">{0} хв</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>міс.</displayName>
-				<unitPattern count="one">{0} міс.</unitPattern>
-				<unitPattern count="few">{0} міс.</unitPattern>
-				<unitPattern count="many">{0} міс.</unitPattern>
-				<unitPattern count="other">{0} міс.</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>с</displayName>
 				<unitPattern count="one">{0} с</unitPattern>
@@ -8720,38 +9160,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} с</unitPattern>
 				<unitPattern count="other">{0} с</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>тиж.</displayName>
-				<unitPattern count="one">{0} тиж.</unitPattern>
-				<unitPattern count="few">{0} тиж.</unitPattern>
-				<unitPattern count="many">{0} тиж.</unitPattern>
-				<unitPattern count="other">{0} тиж.</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>мс</displayName>
+				<unitPattern count="one">{0} мс</unitPattern>
+				<unitPattern count="few">{0} мс</unitPattern>
+				<unitPattern count="many">{0} мс</unitPattern>
+				<unitPattern count="other">{0} мс</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>р.</displayName>
-				<unitPattern count="one">{0} р.</unitPattern>
-				<unitPattern count="few">{0} р.</unitPattern>
-				<unitPattern count="many">{0} р.</unitPattern>
-				<unitPattern count="other">{0} р.</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>см</displayName>
-				<unitPattern count="one">{0} см</unitPattern>
-				<unitPattern count="few">{0} см</unitPattern>
-				<unitPattern count="many">{0} см</unitPattern>
-				<unitPattern count="other">{0} см</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one" draft="contributed">{0} фут</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} фути</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} футів</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} фута</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one" draft="contributed">{0} дюйм</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} дюйми</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} дюймів</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} дюйма</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName draft="contributed">мкс</displayName>
+				<unitPattern count="one" draft="contributed">{0} мкс</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} мкс</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} мкс</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} мкс</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>км</displayName>
@@ -8760,12 +9181,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} км</unitPattern>
 				<unitPattern count="other">{0} км</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one" draft="contributed">{0} св. р.</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} св. р.</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} св. р.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} св. р.</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>метр</displayName>
 				<unitPattern count="one">{0} м</unitPattern>
@@ -8773,11 +9188,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} м</unitPattern>
 				<unitPattern count="other">{0} м</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one" draft="contributed">{0} миля</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} милі</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} миль</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} милі</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>см</displayName>
+				<unitPattern count="one">{0} см</unitPattern>
+				<unitPattern count="few">{0} см</unitPattern>
+				<unitPattern count="many">{0} см</unitPattern>
+				<unitPattern count="other">{0} см</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>мм</displayName>
@@ -8792,18 +9208,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} пм</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} пм</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one" draft="contributed">{0} миля</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} милі</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} миль</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} милі</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one" draft="contributed">{0} ярд</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} ярди</unitPattern>
 				<unitPattern count="many" draft="contributed">{0} ярдів</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ярда</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>грам</displayName>
-				<unitPattern count="one">{0} г</unitPattern>
-				<unitPattern count="few">{0} г</unitPattern>
-				<unitPattern count="many">{0} г</unitPattern>
-				<unitPattern count="other">{0} г</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one" draft="contributed">{0} фут</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} фути</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} футів</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} фута</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one" draft="contributed">{0} дюйм</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} дюйми</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} дюймів</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} дюйма</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one" draft="contributed">{0} св. р.</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} св. р.</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} св. р.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} св. р.</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>кг</displayName>
@@ -8812,11 +9245,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} кг</unitPattern>
 				<unitPattern count="other">{0} кг</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one" draft="contributed">{0} унція</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} унції</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} унцій</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} унції</unitPattern>
+			<unit type="mass-gram">
+				<displayName>грам</displayName>
+				<unitPattern count="one">{0} г</unitPattern>
+				<unitPattern count="few">{0} г</unitPattern>
+				<unitPattern count="many">{0} г</unitPattern>
+				<unitPattern count="other">{0} г</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one" draft="contributed">{0} фунт</unitPattern>
@@ -8824,11 +9258,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} фунтів</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} фунта</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one" draft="contributed">{0} к.с.</unitPattern>
-				<unitPattern count="few" draft="contributed">{0} к.с.</unitPattern>
-				<unitPattern count="many" draft="contributed">{0} к.с.</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} к.с.</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one" draft="contributed">{0} унція</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} унції</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} унцій</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} унції</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one" draft="contributed">{0} кВт</unitPattern>
@@ -8842,6 +9276,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many" draft="contributed">{0} Вт</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} Вт</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one" draft="contributed">{0} к.с.</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} к.с.</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} к.с.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} к.с.</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one" draft="contributed">{0} гПа</unitPattern>
 				<unitPattern count="few" draft="contributed">{0} гПа</unitPattern>
@@ -8917,6 +9357,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="many">{0} л</unitPattern>
 				<unitPattern count="other">{0} л</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0} Сх</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} Пн</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} Пд</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} Зх</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uk_UA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uk_UA.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uk_UA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uk_UA.xml
index 5aea328ddb3..a1c019b08d7 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uk_UA.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uk_UA.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="uk"/>
 		<territory type="UA"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ur.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ur.xml
similarity index 90%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ur.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ur.xml
index 67a5e83eed3..f7fab5db13a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ur.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ur.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12311 $"/>
 		<language type="ur"/>
 	</identity>
 	<localeDisplayNames>
@@ -31,23 +30,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ay">ایمارا</language>
 			<language type="az">آزربائیجانی</language>
 			<language type="az" alt="short">ازیری</language>
+			<language type="az_Arab">جنوبی آزربائیجانی</language>
 			<language type="ba">باشکیر</language>
 			<language type="be">بیلاروسی</language>
 			<language type="bem">بیمبا</language>
 			<language type="bez">بینا</language>
 			<language type="bg">بلغاری</language>
+			<language type="bgn">مغربی بلوچی</language>
 			<language type="bm">بمبارا</language>
 			<language type="bn">بنگالی</language>
 			<language type="bo">تبتی</language>
 			<language type="br">بریٹن</language>
 			<language type="brx">بوڈو</language>
 			<language type="bs">بوسنی</language>
-			<language type="ca" draft="contributed">کیٹالان</language>
+			<language type="ca">کیٹالان</language>
+			<language type="ce">چیچن</language>
 			<language type="cgg">چیگا</language>
 			<language type="chr">چیروکی</language>
 			<language type="ckb">سورانی کردش</language>
 			<language type="co">کوراسیکن</language>
 			<language type="cs">چیک</language>
+			<language type="cv">چوواش</language>
 			<language type="cy">ویلش</language>
 			<language type="da">ڈینش</language>
 			<language type="dav">تائتا</language>
@@ -112,9 +115,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ii">سچوان ای</language>
 			<language type="is">آئس لینڈک</language>
 			<language type="it">اطالوی</language>
-			<language type="iu" draft="contributed">اینُکٹیٹٹ</language>
+			<language type="iu">اینُکٹیٹٹ</language>
 			<language type="ja">جاپانی</language>
-			<language type="jgo" draft="contributed">نگومبا</language>
+			<language type="jgo">نگومبا</language>
 			<language type="jmc">ماشیم</language>
 			<language type="jv">جاوی</language>
 			<language type="ka">جارجی</language>
@@ -124,7 +127,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="kea">كابويرديانو</language>
 			<language type="kg">کانگو</language>
 			<language type="khq">كويرا شيني</language>
-			<language type="ki" draft="contributed">کیکویو</language>
+			<language type="ki">کیکویو</language>
 			<language type="kk">قزاخ</language>
 			<language type="kl">كالاليست</language>
 			<language type="kln">كالينجين</language>
@@ -141,12 +144,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ky">کرغیزی</language>
 			<language type="la">لاطینی</language>
 			<language type="lag">لانگی</language>
-			<language type="lb" draft="contributed">لگژمبرگش</language>
+			<language type="lb">لگژمبرگش</language>
 			<language type="lg">گینڈا</language>
 			<language type="lkt">لاکوٹا</language>
 			<language type="ln">لِنگَلا</language>
 			<language type="lo">لاؤ</language>
 			<language type="loz">لوزی</language>
+			<language type="lrc">شمالی لری</language>
 			<language type="lt">لتھُواینین</language>
 			<language type="lu">لبا-كاتانجا</language>
 			<language type="lua">لیوبا لولوآ</language>
@@ -162,16 +166,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mi">ماؤری</language>
 			<language type="mk">مقدونیائی</language>
 			<language type="ml">مالایالم</language>
-			<language type="mn" draft="contributed">منگؤلی</language>
-			<language type="moh" draft="contributed">موہاک</language>
+			<language type="mn">منگؤلی</language>
+			<language type="moh">موہاک</language>
 			<language type="mr">مراٹهی</language>
 			<language type="ms">مالائی</language>
 			<language type="mt">مالٹی</language>
 			<language type="mua">منڈانگ</language>
 			<language type="my">برمی</language>
+			<language type="mzn">مزندرانی</language>
 			<language type="naq">ناما</language>
 			<language type="nb">نارویجین بوکمل</language>
 			<language type="nd">شمالی دبیل</language>
+			<language type="nds">ادنی جرمن</language>
+			<language type="nds_NL">ادنی سیکسن</language>
 			<language type="ne">نیپالی</language>
 			<language type="nl">ڈچ</language>
 			<language type="nl_BE">فلیمِش</language>
@@ -197,20 +204,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="quc">كيشی</language>
 			<language type="rm">رومانش</language>
 			<language type="rn">رونڈی</language>
-			<language type="ro" draft="contributed">رومینین</language>
-			<language type="ro_MD" draft="provisional">مالدووا</language>
+			<language type="ro">رومینین</language>
+			<language type="ro_MD">مالدووا</language>
 			<language type="rof">رومبو</language>
 			<language type="ru">روسی</language>
 			<language type="rw">کینیاروانڈا</language>
-			<language type="rwk" draft="contributed">روا</language>
+			<language type="rwk">روا</language>
 			<language type="sa">سَنسکرِت</language>
 			<language type="saq">سامبورو</language>
 			<language type="sbp">سانگو</language>
 			<language type="sd">سندھی</language>
+			<language type="sdh">جنوبی کرد</language>
 			<language type="se">شمالی سامی</language>
 			<language type="seh">سینا</language>
 			<language type="ses">كويرابورو سينی</language>
-			<language type="sg" draft="contributed">سانجو</language>
+			<language type="sg">ساںغو</language>
 			<language type="sh" draft="contributed">سربو-کروئیشین</language>
 			<language type="shi">تشلحيت</language>
 			<language type="si">سنہالا</language>
@@ -220,7 +228,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sma">جنوبی سامی</language>
 			<language type="smj">لول سامی</language>
 			<language type="smn">اناری سامی</language>
-			<language type="sms" draft="contributed">سکولٹ سامی</language>
+			<language type="sms">سکولٹ سامی</language>
 			<language type="sn">شونا</language>
 			<language type="so">صومالی</language>
 			<language type="sq">البانی</language>
@@ -230,7 +238,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="su">سنڈانیز</language>
 			<language type="sv">سویڈش</language>
 			<language type="sw">سواحلی</language>
-			<language type="swc">کانگو سواحلی</language>
+			<language type="sw_CD">کانگو سواحلی</language>
 			<language type="ta">تمل</language>
 			<language type="te">تیلگو</language>
 			<language type="teo">تیسو</language>
@@ -260,13 +268,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="vai">وائی</language>
 			<language type="ve">وینڈا</language>
 			<language type="vi">ویتنامی</language>
-			<language type="vun" draft="contributed">ونجو</language>
+			<language type="vun">ونجو</language>
+			<language type="wbp">وارلپیری</language>
 			<language type="wo">وولوف</language>
 			<language type="xh">ژوسا</language>
 			<language type="xog">سوگا</language>
 			<language type="yi">یدش</language>
 			<language type="yo">یوروبا</language>
-			<language type="zgh" draft="contributed">اسٹینڈرڈ مراقشی تمازیقی</language>
+			<language type="zgh">اسٹینڈرڈ مراقشی تمازیقی</language>
 			<language type="zh">چینی</language>
 			<language type="zh_Hans">چینی (آسان کردہ)</language>
 			<language type="zh_Hant">روایتی چینی</language>
@@ -348,7 +357,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="154">شمالی یورپ</territory>
 			<territory type="155">مغربی یورپ</territory>
 			<territory type="419">لاطینی امریکہ</territory>
-			<territory type="AC" draft="contributed">اسینشن آئلینڈ</territory>
+			<territory type="AC">اسینشن آئلینڈ</territory>
 			<territory type="AD">انڈورا</territory>
 			<territory type="AE">متحدہ عرب امارات</territory>
 			<territory type="AF">افغانستان</territory>
@@ -356,7 +365,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">انگوئیلا</territory>
 			<territory type="AL">البانیہ</territory>
 			<territory type="AM">آرمینیا</territory>
-			<territory type="AN">نیدرلینڈز انٹیلیز</territory>
 			<territory type="AO">انگولا</territory>
 			<territory type="AQ">انٹارکٹیکا</territory>
 			<territory type="AR">ارجنٹینا</territory>
@@ -367,7 +375,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AX">آلینڈ آئلینڈز</territory>
 			<territory type="AZ">آذربائجان</territory>
 			<territory type="BA">بوسنیا اور ہرزیگووینا</territory>
-			<territory type="BB" draft="contributed">بارباڈوس</territory>
+			<territory type="BB">بارباڈوس</territory>
 			<territory type="BD">بنگلہ دیش</territory>
 			<territory type="BE">بیلجیم</territory>
 			<territory type="BF">برکینا فاسو</territory>
@@ -380,7 +388,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BN">برونئی</territory>
 			<territory type="BO">بولیویا</territory>
 			<territory type="BQ">کریبیائی نیدرلینڈز</territory>
-			<territory type="BR" draft="contributed">برازیل</territory>
+			<territory type="BR">برازیل</territory>
 			<territory type="BS">بہاماس</territory>
 			<territory type="BT">بھوٹان</territory>
 			<territory type="BV">بؤویٹ آئلینڈ</territory>
@@ -402,7 +410,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CM">کیمرون</territory>
 			<territory type="CN">چین</territory>
 			<territory type="CO">کولمبیا</territory>
-			<territory type="CP" draft="contributed">کلپرٹن آئلینڈ</territory>
+			<territory type="CP">کلپرٹن آئلینڈ</territory>
 			<territory type="CR">کوسٹا ریکا</territory>
 			<territory type="CU">کیوبا</territory>
 			<territory type="CV">کیپ ورڈی</territory>
@@ -431,12 +439,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="FK">فاکلینڈ جزائر</territory>
 			<territory type="FK" alt="variant">فاکلینڈ جزائر (مالویناس)</territory>
 			<territory type="FM">مائکرونیشیا</territory>
-			<territory type="FO">فیرو آئلینڈز</territory>
+			<territory type="FO">جزائر فارو</territory>
 			<territory type="FR">فرانس</territory>
 			<territory type="GA">گیبون</territory>
 			<territory type="GB">سلطنت متحدہ</territory>
 			<territory type="GB" alt="short">یو کے</territory>
-			<territory type="GD" draft="contributed">گریناڈا</territory>
+			<territory type="GD">گریناڈا</territory>
 			<territory type="GE">جارجیا</territory>
 			<territory type="GF">فرینچ گیانا</territory>
 			<territory type="GG">گوئرنسی</territory>
@@ -525,7 +533,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="NA">نامیبیا</territory>
 			<territory type="NC">نیو کلیڈونیا</territory>
 			<territory type="NE">نائجر</territory>
-			<territory type="NF" draft="contributed">نارفوک آئلینڈ</territory>
+			<territory type="NF">نارفوک آئلینڈ</territory>
 			<territory type="NG">نائجیریا</territory>
 			<territory type="NI">نکاراگووا</territory>
 			<territory type="NL">نیدر لینڈز</territory>
@@ -555,7 +563,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="RE">ری یونین</territory>
 			<territory type="RO">رومانیا</territory>
 			<territory type="RS">سربیا</territory>
-			<territory type="RU" draft="contributed">روس</territory>
+			<territory type="RU">روس</territory>
 			<territory type="RW">روانڈا</territory>
 			<territory type="SA">سعودی عرب</territory>
 			<territory type="SB">سولومن آئلینڈز</territory>
@@ -632,6 +640,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric">عددی چھٹائی</key>
 			<key type="colStrength">چھٹائی کی قوت</key>
 			<key type="currency">کرنسی</key>
+			<key type="hc">گھنٹہ سائیکل (12 بنام 24)</key>
+			<key type="lb">لائن بریک انداز</key>
+			<key type="ms">پیمائش کا نظام</key>
 			<key type="numbers">اعداد</key>
 			<key type="timezone">منطقۂ وقت</key>
 			<key type="va">مقام کا متغیرہ</key>
@@ -639,95 +650,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">نجی-استعمال</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">عربی ہندی ہندسے</type>
-			<type type="arabext" key="numbers">توسیع شدہ عربی ہندی ہندسے</type>
-			<type type="armn" key="numbers">آرمینیائی اعداد</type>
-			<type type="armnlow" key="numbers">آرمینیائی زیریں اعداد</type>
-			<type type="beng" key="numbers">بنگالی ہندسے</type>
-			<type type="big5han" key="collation">روایتی چینی کی چھٹائی کی ترتیب - Big5</type>
-			<type type="buddhist" key="calendar">بودھ کلینڈر</type>
-			<type type="chinese" key="calendar">چینی کیلنڈر</type>
-			<type type="coptic" key="calendar">کاپٹک کیلنڈر</type>
-			<type type="dangi" key="calendar">ڈینگی کیلنڈر</type>
-			<type type="deva" key="numbers">دیوناگری ہندسے</type>
-			<type type="dictionary" key="collation">لغت کی چھٹنی کی ترتیب</type>
-			<type type="ducet" key="collation">ڈیفالٹ یونیکوڈ کی چھٹنی کی ترتیب</type>
-			<type type="ethi" key="numbers">ایتھوپیائی اعداد</type>
-			<type type="ethiopic" key="calendar">ایتھوپیائی کیلنڈر</type>
-			<type type="ethiopic-amete-alem" key="calendar">ایتھوپک امیٹ الیم کیلنڈر</type>
-			<type type="finance" key="numbers">مالیاتی ہندسے</type>
-			<type type="fullwide" key="numbers">پورے عرض والے ہندسے</type>
-			<type type="gb2312han" key="collation">آسان چینی کی چھٹائی کی ترتیب - GB2312</type>
-			<type type="geor" key="numbers">جارجیائی اعداد</type>
-			<type type="gregorian" key="calendar">جارجیائی کیلنڈر</type>
-			<type type="grek" key="numbers">یونانی اعداد</type>
-			<type type="greklow" key="numbers">یونانی زیریں اعداد</type>
-			<type type="gujr" key="numbers">گجراتی ہندسے</type>
-			<type type="guru" key="numbers">گرمکھی ہندسے</type>
-			<type type="hanidec" key="numbers">چینی اعشاری اعداد</type>
-			<type type="hans" key="numbers">آسان چینی اعداد</type>
-			<type type="hansfin" key="numbers">آسان چینی مالی اعداد</type>
-			<type type="hant" key="numbers">روایتی چینی اعداد</type>
-			<type type="hantfin" key="numbers">روایتی چینی مالی اعداد</type>
-			<type type="hebr" key="numbers">عبرانی اعداد</type>
-			<type type="hebrew" key="calendar">عبرانی کیلنڈر</type>
-			<type type="identical" key="colStrength">سبھی کی چھٹائی کریں</type>
-			<type type="indian" key="calendar">ہندوستانی قومی کیلنڈر</type>
-			<type type="islamic" key="calendar">اسلامی کیلنڈر</type>
-			<type type="islamic-civil" key="calendar">اسلامی شہری کیلنڈر</type>
-			<type type="iso8601" key="calendar">ISO-8601 کیلنڈر</type>
-			<type type="japanese" key="calendar">جاپانی کیلنڈر</type>
-			<type type="jpan" key="numbers">جاپانی اعداد</type>
-			<type type="jpanfin" key="numbers">جاپانی مالی اعداد</type>
-			<type type="khmr" key="numbers">خمیر ہندسے</type>
-			<type type="knda" key="numbers">کنڑ ہندسے</type>
-			<type type="laoo" key="numbers">لاؤ ہندسے</type>
-			<type type="latn" key="numbers">مغربی ہندسے</type>
-			<type type="lower" key="colCaseFirst">پہلے چھوٹے حروف کی چھٹائی کریں</type>
-			<type type="mlym" key="numbers">ملیالم ہندسے</type>
-			<type type="mong" key="numbers">منگولیائی ہندسے</type>
-			<type type="mymr" key="numbers">میانمار کے ہندسے</type>
-			<type type="native" key="numbers">اصل ہندسے</type>
-			<type type="no" key="colBackwards">لہجوں کی چھٹائی معمول کے انداز میں کریں</type>
-			<type type="no" key="colCaseFirst">معمول کے حروف کی ترتیب کی چھٹائی کریں</type>
-			<type type="no" key="colCaseLevel">حروف کی عدم حساسیت کی چھٹائی کریں</type>
-			<type type="no" key="colHiraganaQuaternary">Kana کی چھٹائی الگ الگ کریں</type>
-			<type type="no" key="colNormalization">حسب معمول بنائے بغیر چھٹائی کریں</type>
-			<type type="no" key="colNumeric">انفرادی طور پر ہندسوں کی چھٹائی کریں</type>
-			<type type="non-ignorable" key="colAlternate">علامات کی چھٹائی کریں</type>
-			<type type="orya" key="numbers">اڑیہ ہندسے</type>
-			<type type="persian" key="calendar">فارسی کیلنڈر</type>
-			<type type="phonebook" key="collation">فون بک کی چھٹنی کی ترتیب</type>
-			<type type="phonetic" key="collation">صوتی چھٹائی کی ترتیب</type>
-			<type type="pinyin" key="collation">پن ین کی چھٹنی کی ترتیب</type>
-			<type type="primary" key="colStrength">صرف اساسی حروف کی چھٹائی کریں</type>
-			<type type="quaternary" key="colStrength">لہجہ/ بڑے چھوٹے حروف/چوڑائی/Kana کی چھٹائی کریں</type>
-			<type type="reformed" key="collation">دوبارہ تشکیل شدہ چھٹنی کی ترتیب</type>
-			<type type="roc" key="calendar">منگوو کیلنڈر</type>
-			<type type="roman" key="numbers">رومن اعداد</type>
-			<type type="romanlow" key="numbers">رومن زیریں اعداد</type>
-			<type type="search" key="collation">عام-مقصد کی تلاش</type>
-			<type type="searchjl" key="collation">Hangul Initial Consonant کے لحاظ سے تلاش کریں</type>
-			<type type="secondary" key="colStrength">لہجوں کی چھٹائی کریں</type>
-			<type type="shifted" key="colAlternate">علامات کو نظرانداز کرکے چھٹائی کریں</type>
-			<type type="standard" key="collation">معیاری چھنٹائی کی ترتیب</type>
-			<type type="stroke" key="collation">سٹروک کی چھٹنی کی ترتیب</type>
-			<type type="taml" key="numbers">روایتی تمل اعداد</type>
-			<type type="tamldec" key="numbers">تمل اعداد</type>
-			<type type="telu" key="numbers">تیلگو ہندسے</type>
-			<type type="tertiary" key="colStrength">لہجوں/حروف/چوڑائی کی چھٹائی کریں</type>
-			<type type="thai" key="numbers">تھائی ہندسے</type>
-			<type type="tibt" key="numbers">تبتی اعداد</type>
-			<type type="traditional" key="collation">روایتی چھٹنی کی ترتیب</type>
-			<type type="traditional" key="numbers">روایتی اعداد</type>
-			<type type="unihan" key="collation">اساسی-سٹروک کی چھٹنی کی ترتیب</type>
-			<type type="upper" key="colCaseFirst">پہلے بالائی حروف کی چھٹائی کریں</type>
-			<type type="vaii" key="numbers">وائی ہندسے</type>
-			<type type="yes" key="colBackwards">لہجوں کی معکوس چھٹائی کریں</type>
-			<type type="yes" key="colCaseLevel">حروف کے تئیں حساس کی چھٹائی کریں</type>
-			<type type="yes" key="colHiraganaQuaternary">Kana کی مختلف طریقے سے چھٹائی کریں</type>
-			<type type="yes" key="colNormalization">معمول کے یونیکوڈ کی چھٹائی کریں</type>
-			<type type="yes" key="colNumeric">اعداد کے لحاظ سے ہندسوں کی چھٹائی کریں</type>
+			<type key="calendar" type="buddhist">بودھ کلینڈر</type>
+			<type key="calendar" type="chinese">چینی کیلنڈر</type>
+			<type key="calendar" type="coptic">کاپٹک کیلنڈر</type>
+			<type key="calendar" type="dangi">ڈانگی کیلنڈر</type>
+			<type key="calendar" type="ethiopic">ایتھوپیائی کیلنڈر</type>
+			<type key="calendar" type="ethiopic-amete-alem">ایتھوپک امیٹ الیم کیلنڈر</type>
+			<type key="calendar" type="gregorian">جارجیائی کیلنڈر</type>
+			<type key="calendar" type="hebrew">عبرانی کیلنڈر</type>
+			<type key="calendar" type="indian">ہندوستانی قومی کیلنڈر</type>
+			<type key="calendar" type="islamic">اسلامی کیلنڈر</type>
+			<type key="calendar" type="islamic-civil">اسلامی شہری کیلنڈر</type>
+			<type key="calendar" type="iso8601">ISO-8601 کیلنڈر</type>
+			<type key="calendar" type="japanese">جاپانی کیلنڈر</type>
+			<type key="calendar" type="persian">فارسی کیلنڈر</type>
+			<type key="calendar" type="roc">منگوو کیلنڈر</type>
+			<type key="colAlternate" type="non-ignorable">علامات کی چھٹائی کریں</type>
+			<type key="colAlternate" type="shifted">علامات کو نظرانداز کرکے چھٹائی کریں</type>
+			<type key="colBackwards" type="no">لہجوں کی چھٹائی معمول کے انداز میں کریں</type>
+			<type key="colBackwards" type="yes">لہجوں کی معکوس چھٹائی کریں</type>
+			<type key="colCaseFirst" type="lower">پہلے چھوٹے حروف کی چھٹائی کریں</type>
+			<type key="colCaseFirst" type="no">معمول کے حروف کی ترتیب کی چھٹائی کریں</type>
+			<type key="colCaseFirst" type="upper">پہلے بالائی حروف کی چھٹائی کریں</type>
+			<type key="colCaseLevel" type="no">حروف کی عدم حساسیت کی چھٹائی کریں</type>
+			<type key="colCaseLevel" type="yes">حروف کے تئیں حساس کی چھٹائی کریں</type>
+			<type key="colHiraganaQuaternary" type="no">Kana کی چھٹائی الگ الگ کریں</type>
+			<type key="colHiraganaQuaternary" type="yes">Kana کی مختلف طریقے سے چھٹائی کریں</type>
+			<type key="collation" type="big5han">روایتی چینی کی چھٹائی کی ترتیب - Big5</type>
+			<type key="collation" type="dictionary">لغت کی چھٹنی کی ترتیب</type>
+			<type key="collation" type="ducet">ڈیفالٹ یونیکوڈ کی چھٹنی کی ترتیب</type>
+			<type key="collation" type="gb2312han">آسان چینی کی چھٹائی کی ترتیب - GB2312</type>
+			<type key="collation" type="phonebook">فون بک کی چھٹنی کی ترتیب</type>
+			<type key="collation" type="phonetic">صوتی چھٹائی کی ترتیب</type>
+			<type key="collation" type="pinyin">پن ین کی چھٹنی کی ترتیب</type>
+			<type key="collation" type="reformed">دوبارہ تشکیل شدہ چھٹنی کی ترتیب</type>
+			<type key="collation" type="search">عام-مقصد کی تلاش</type>
+			<type key="collation" type="searchjl">Hangul Initial Consonant کے لحاظ سے تلاش کریں</type>
+			<type key="collation" type="standard">معیاری چھنٹائی کی ترتیب</type>
+			<type key="collation" type="stroke">سٹروک کی چھٹنی کی ترتیب</type>
+			<type key="collation" type="traditional">روایتی چھٹنی کی ترتیب</type>
+			<type key="collation" type="unihan">اساسی-سٹروک کی چھٹنی کی ترتیب</type>
+			<type key="colNormalization" type="no">حسب معمول بنائے بغیر چھٹائی کریں</type>
+			<type key="colNormalization" type="yes">معمول کے یونیکوڈ کی چھٹائی کریں</type>
+			<type key="colNumeric" type="no">انفرادی طور پر ہندسوں کی چھٹائی کریں</type>
+			<type key="colNumeric" type="yes">اعداد کے لحاظ سے ہندسوں کی چھٹائی کریں</type>
+			<type key="colStrength" type="identical">سبھی کی چھٹائی کریں</type>
+			<type key="colStrength" type="primary">صرف اساسی حروف کی چھٹائی کریں</type>
+			<type key="colStrength" type="quaternary">لہجہ/ بڑے چھوٹے حروف/چوڑائی/Kana کی چھٹائی کریں</type>
+			<type key="colStrength" type="secondary">لہجوں کی چھٹائی کریں</type>
+			<type key="colStrength" type="tertiary">لہجوں/حروف/چوڑائی کی چھٹائی کریں</type>
+			<type key="hc" type="h11">12 گھنٹے کا نظام (0–11)</type>
+			<type key="hc" type="h12">12 گھنٹے کا نظام (1–12)</type>
+			<type key="hc" type="h23">24 گھنٹے کا نظام (0–23)</type>
+			<type key="hc" type="h24">24 گھنٹے کا نظام (1–24)</type>
+			<type key="lb" type="loose">ڈھیلا لائن بریک انداز</type>
+			<type key="lb" type="normal">عمومی لائن بریک انداز</type>
+			<type key="lb" type="strict">سخت لائن بریک انداز</type>
+			<type key="ms" type="metric" draft="provisional">میٹرک نظام</type>
+			<type key="ms" type="uksystem">پیمائش کا امپیریل نظام</type>
+			<type key="ms" type="ussystem">پیمائش کا برطانوی نظام</type>
+			<type key="numbers" type="arab">عربی ہندی ہندسے</type>
+			<type key="numbers" type="arabext">توسیع شدہ عربی ہندی ہندسے</type>
+			<type key="numbers" type="armn">آرمینیائی اعداد</type>
+			<type key="numbers" type="armnlow">آرمینیائی زیریں اعداد</type>
+			<type key="numbers" type="beng">بنگالی ہندسے</type>
+			<type key="numbers" type="deva">دیوناگری ہندسے</type>
+			<type key="numbers" type="ethi">ایتھوپیائی اعداد</type>
+			<type key="numbers" type="finance">مالیاتی ہندسے</type>
+			<type key="numbers" type="fullwide">پورے عرض والے ہندسے</type>
+			<type key="numbers" type="geor">جارجیائی اعداد</type>
+			<type key="numbers" type="grek">یونانی اعداد</type>
+			<type key="numbers" type="greklow">یونانی زیریں اعداد</type>
+			<type key="numbers" type="gujr">گجراتی ہندسے</type>
+			<type key="numbers" type="guru">گرمکھی ہندسے</type>
+			<type key="numbers" type="hanidec">چینی اعشاری اعداد</type>
+			<type key="numbers" type="hans">آسان چینی اعداد</type>
+			<type key="numbers" type="hansfin">آسان چینی مالی اعداد</type>
+			<type key="numbers" type="hant">روایتی چینی اعداد</type>
+			<type key="numbers" type="hantfin">روایتی چینی مالی اعداد</type>
+			<type key="numbers" type="hebr">عبرانی اعداد</type>
+			<type key="numbers" type="jpan">جاپانی اعداد</type>
+			<type key="numbers" type="jpanfin">جاپانی مالی اعداد</type>
+			<type key="numbers" type="khmr">خمیر ہندسے</type>
+			<type key="numbers" type="knda">کنڑ ہندسے</type>
+			<type key="numbers" type="laoo">لاؤ ہندسے</type>
+			<type key="numbers" type="latn">مغربی ہندسے</type>
+			<type key="numbers" type="mlym">ملیالم ہندسے</type>
+			<type key="numbers" type="mong">منگولیائی ہندسے</type>
+			<type key="numbers" type="mymr">میانمار کے ہندسے</type>
+			<type key="numbers" type="native">اصل ہندسے</type>
+			<type key="numbers" type="orya">اڑیہ ہندسے</type>
+			<type key="numbers" type="roman">رومن اعداد</type>
+			<type key="numbers" type="romanlow">رومن زیریں اعداد</type>
+			<type key="numbers" type="taml">روایتی تمل اعداد</type>
+			<type key="numbers" type="tamldec">تمل اعداد</type>
+			<type key="numbers" type="telu">تیلگو ہندسے</type>
+			<type key="numbers" type="thai">تھائی ہندسے</type>
+			<type key="numbers" type="tibt">تبتی اعداد</type>
+			<type key="numbers" type="traditional">روایتی اعداد</type>
+			<type key="numbers" type="vaii">وائی ہندسے</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN">BGN</transformName>
@@ -824,6 +845,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -841,6 +863,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E، d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
@@ -850,6 +873,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">d MMM، y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E، d MMM، y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y MMMM</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
 					</availableFormats>
@@ -1164,31 +1188,77 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am">ق.د.</dayPeriod>
-							<dayPeriod type="pm">ب.د.</dayPeriod>
+							<dayPeriod type="midnight">آدھی رات</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">صبح</dayPeriod>
+							<dayPeriod type="afternoon1">دوپہر</dayPeriod>
+							<dayPeriod type="afternoon2">سہ پہر</dayPeriod>
+							<dayPeriod type="evening1">شام</dayPeriod>
+							<dayPeriod type="night1">رات</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">آدھی رات</dayPeriod>
 							<dayPeriod type="am">a</dayPeriod>
-							<dayPeriod type="noon">n</dayPeriod>
 							<dayPeriod type="pm">p</dayPeriod>
+							<dayPeriod type="morning1">صبح</dayPeriod>
+							<dayPeriod type="afternoon1">دوپہر</dayPeriod>
+							<dayPeriod type="afternoon2">سہ پہر</dayPeriod>
+							<dayPeriod type="evening1">شام</dayPeriod>
+							<dayPeriod type="night1">رات</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">آدھی رات</dayPeriod>
 							<dayPeriod type="am">قبل دوپہر</dayPeriod>
-							<dayPeriod type="noon">دوپہر</dayPeriod>
 							<dayPeriod type="pm">بعد دوپہر</dayPeriod>
+							<dayPeriod type="morning1">صبح</dayPeriod>
+							<dayPeriod type="afternoon1">دوپہر</dayPeriod>
+							<dayPeriod type="afternoon2">سہ پہر</dayPeriod>
+							<dayPeriod type="evening1">شام</dayPeriod>
+							<dayPeriod type="night1">رات</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">آدھی رات</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">صبح</dayPeriod>
+							<dayPeriod type="afternoon1">دوپہر</dayPeriod>
+							<dayPeriod type="afternoon2">سہ پہر</dayPeriod>
+							<dayPeriod type="evening1">شام</dayPeriod>
+							<dayPeriod type="night1">رات</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">آدھی رات</dayPeriod>
+							<dayPeriod type="am">a</dayPeriod>
+							<dayPeriod type="pm">p</dayPeriod>
+							<dayPeriod type="morning1">صبح</dayPeriod>
+							<dayPeriod type="afternoon1">دوپہر</dayPeriod>
+							<dayPeriod type="afternoon2">سہ پہر</dayPeriod>
+							<dayPeriod type="evening1">شام</dayPeriod>
+							<dayPeriod type="night1">رات</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">آدھی رات</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">صبح</dayPeriod>
+							<dayPeriod type="afternoon1">دوپہر</dayPeriod>
+							<dayPeriod type="afternoon2">سہ پہر</dayPeriod>
+							<dayPeriod type="evening1">شام</dayPeriod>
+							<dayPeriod type="night1">رات</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
 						<era type="0">قبل مسیح</era>
-						<era type="1">عیسوی سن</era>
-						<era type="1" alt="variant">CE</era>
+						<era type="1">عیسوی</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0">ق م</era>
-						<era type="1">عیسوی سن</era>
-						<era type="1" alt="variant">CE</era>
+						<era type="0">قبل مسیح</era>
+						<era type="1">عیسوی</era>
 					</eraAbbr>
 				</eras>
 				<dateFormats>
@@ -1274,12 +1344,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E، d/M</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E، d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">M/y</dateFormatItem>
@@ -1288,6 +1363,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMd">d MMM، y</dateFormatItem>
 						<dateFormatItem id="yMMMEd">E، d MMM، y</dateFormatItem>
+						<dateFormatItem id="yMMMM">y MMMM</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
 						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
 					</availableFormats>
@@ -1375,7 +1451,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d–d MMM، y</greatestDifference>
+							<greatestDifference id="d">y MMM d–d</greatestDifference>
 							<greatestDifference id="M">d MMM – d MMM، y</greatestDifference>
 							<greatestDifference id="y">d MMM، y – d MMM، y</greatestDifference>
 						</intervalFormatItem>
@@ -1438,6 +1514,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>سال</displayName>
+				<relative type="-1">گزشتہ سال</relative>
+				<relative type="0">اس سال</relative>
+				<relative type="1">اگلے سال</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} سال میں</relativeTimePattern>
 					<relativeTimePattern count="other">{0} سال میں</relativeTimePattern>
@@ -1449,6 +1528,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>سال</displayName>
+				<relative type="-1">گزشتہ سال</relative>
+				<relative type="0">اس سال</relative>
+				<relative type="1">اگلے سال</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} سال میں</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} سال میں</relativeTimePattern>
@@ -1487,8 +1569,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">{0} سہ ماہی میں</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="contributed">{0} سہ ماہی پہلے</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">{0} سہ ماہی پہلے</relativeTimePattern>
+					<relativeTimePattern count="one">{0} سہ ماہی پہلے</relativeTimePattern>
+					<relativeTimePattern count="other">{0} سہ ماہی پہلے</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month">
@@ -1507,6 +1589,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>ماہ</displayName>
+				<relative type="-1">پچھلے مہینہ</relative>
+				<relative type="0">اس مہینہ</relative>
+				<relative type="1">اگلے مہینہ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ماہ میں</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ماہ میں</relativeTimePattern>
@@ -1523,8 +1608,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<relativeTimePattern count="other">+{0} ماہ میں</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="contributed">{0} ماہ پہلے</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">{0} ماہ پہلے</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ماہ پہلے</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ماہ پہلے</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week">
@@ -1543,6 +1628,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>ہفتہ</displayName>
+				<relative type="-1">پچھلے ہفتہ</relative>
+				<relative type="0">اس ہفتہ</relative>
+				<relative type="1">اگلے ہفتہ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ہفتے میں</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ہفتے میں</relativeTimePattern>
@@ -1554,13 +1642,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>ہفتہ</displayName>
+				<relative type="-1">پچھلے ہفتہ</relative>
+				<relative type="0">اس ہفتہ</relative>
+				<relative type="1">اگلے ہفتہ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ہفتہ میں</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ہفتے میں</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="contributed">{0} ہفتہ پہلے</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">{0} ہفتے پہلے</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ہفتہ پہلے</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ہفتے پہلے</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day">
@@ -1581,6 +1672,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-short">
 				<displayName>دن</displayName>
+				<relative type="-2">گزشتہ پرسوں</relative>
+				<relative type="-1">گزشتہ کل</relative>
+				<relative type="0">آج</relative>
+				<relative type="1">آئندہ کل</relative>
+				<relative type="2">آنے والا پرسوں</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} دن میں</relativeTimePattern>
 					<relativeTimePattern count="other">{0} دنوں میں</relativeTimePattern>
@@ -1592,13 +1688,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day-narrow">
 				<displayName>دن</displayName>
+				<relative type="-2">گزشتہ پرسوں</relative>
+				<relative type="-1">گزشتہ کل</relative>
+				<relative type="0">آج</relative>
+				<relative type="1">آئندہ کل</relative>
+				<relative type="2">آنے والا پرسوں</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} دنوں میں</relativeTimePattern>
 					<relativeTimePattern count="other">{0} دنوں میں</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="contributed">{0} دن پہلے</relativeTimePattern>
-					<relativeTimePattern count="other" draft="contributed">{0} دن پہلے</relativeTimePattern>
+					<relativeTimePattern count="one">{0} دن پہلے</relativeTimePattern>
+					<relativeTimePattern count="other">{0} دن پہلے</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="weekday">
@@ -1695,9 +1796,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="1">اگلے جمعہ</relative>
 			</field>
 			<field type="sat">
-				<relative type="-1">گزشتہ ہفتہ</relative>
-				<relative type="0">یہ ہفتہ</relative>
-				<relative type="1">اگلے ہفتہ</relative>
+				<relative type="-1">گزشتہ سنیچر</relative>
+				<relative type="0">اس سنیچر</relative>
+				<relative type="1">اگلے سنیچر</relative>
 			</field>
 			<field type="sat-short">
 				<relative type="-1">گزشتہ سنیچر</relative>
@@ -2290,7 +2391,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>کوسرائی</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Faeroe">
-				<exemplarCity>فروئی</exemplarCity>
+				<exemplarCity>فارو</exemplarCity>
 			</zone>
 			<zone type="Europe/Paris">
 				<exemplarCity>پیرس</exemplarCity>
@@ -2377,7 +2478,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>پورٹ او پرنس</exemplarCity>
 			</zone>
 			<zone type="Europe/Budapest">
-				<exemplarCity>بدھاپیسٹ</exemplarCity>
+				<exemplarCity>بڈاپسٹ</exemplarCity>
 			</zone>
 			<zone type="Asia/Jakarta">
 				<exemplarCity>جکارتہ</exemplarCity>
@@ -2691,6 +2792,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>پورٹ موریسبی</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>بوگینولے</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>منیلا</exemplarCity>
 			</zone>
@@ -2775,6 +2879,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>ارکتسک</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>چیتا</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>یکوتسک</exemplarCity>
 			</zone>
@@ -2793,6 +2900,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>میگیدن</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>سرہدنیکولیمسک</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>کیمچٹکا</exemplarCity>
 			</zone>
@@ -3375,7 +3485,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
 				<long>
-					<standard>مزید مشرقی یورپی وقت</standard>
+					<standard>بعید مشرقی یورپی وقت</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
@@ -4087,6 +4197,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤ #,##,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">¤ 0 ہزار</pattern>
+					<pattern type="1000" count="other">¤ 0 ہزار</pattern>
+					<pattern type="10000" count="one">¤ 00 ہزار</pattern>
+					<pattern type="10000" count="other">¤ 00 ہزار</pattern>
+					<pattern type="100000" count="one">¤ 0 لاکھ</pattern>
+					<pattern type="100000" count="other">¤ 0 لاکھ</pattern>
+					<pattern type="1000000" count="one">¤ 00 لاکھ</pattern>
+					<pattern type="1000000" count="other">¤ 00 لاکھ</pattern>
+					<pattern type="10000000" count="one">¤ 0 کروڑ</pattern>
+					<pattern type="10000000" count="other">¤ 0 کروڑ</pattern>
+					<pattern type="100000000" count="one">¤ 00 کروڑ</pattern>
+					<pattern type="100000000" count="other">¤ 00 کروڑ</pattern>
+					<pattern type="1000000000" count="one">¤ 0 ارب</pattern>
+					<pattern type="1000000000" count="other">¤ 0 ارب</pattern>
+					<pattern type="10000000000" count="one">¤ 00 ارب</pattern>
+					<pattern type="10000000000" count="other">¤ 00 ارب</pattern>
+					<pattern type="100000000000" count="one">¤ 0 کھرب</pattern>
+					<pattern type="100000000000" count="other">¤ 0 کھرب</pattern>
+					<pattern type="1000000000000" count="one">¤0 ٹریلین</pattern>
+					<pattern type="1000000000000" count="other">¤0 ٹریلین</pattern>
+					<pattern type="10000000000000" count="one">¤ 00 ٹریلین</pattern>
+					<pattern type="10000000000000" count="other">¤ 00 ٹریلین</pattern>
+					<pattern type="100000000000000" count="one">¤ 000 ٹریلین</pattern>
+					<pattern type="100000000000000" count="other">¤ 000 ٹریلین</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -4126,6 +4264,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">انگولا کا کوانزا</displayName>
 				<displayName count="other">انگولا کا کوانزا</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="ARS">
 				<displayName>ارجنٹائن پیسہ</displayName>
@@ -4158,6 +4297,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">بوسنیا ہرزیگووینا کا قابل منتقلی نشان</displayName>
 				<displayName count="other">بوسنیا ہرزیگووینا کا قابل منتقلی نشان</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>باربیڈین ڈالر</displayName>
@@ -4210,6 +4350,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">بولیوین بولیویانو</displayName>
 				<displayName count="other">بولیوین بولیویانو</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BRL">
 				<displayName>برازیلی ریئل</displayName>
@@ -4236,6 +4377,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">بوتسوانا کا پولا</displayName>
 				<displayName count="other">بوتسوانا کا پولا</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYR">
 				<displayName>بیلاروسی روبل</displayName>
@@ -4303,6 +4445,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">کیوبا کا قابل منتقلی پیسو</displayName>
 				<displayName count="other">کیوبا کا قابل منتقلی پیسو</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>کیوبا کا پیسو</displayName>
@@ -4322,6 +4465,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">جمہوریہ چیک کرونا</displayName>
 				<displayName count="other">جمہوریہ چیک کروناز</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DEM">
 				<displayName draft="contributed">ڈچ مارکس</displayName>
@@ -4333,10 +4477,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>DJF</symbol>
 			</currency>
 			<currency type="DKK">
-				<displayName draft="contributed">ڈنمارک کرون</displayName>
-				<displayName count="one" draft="contributed">ڈنمارک کرون</displayName>
-				<displayName count="other" draft="contributed">ڈنمارک کرون</displayName>
+				<displayName>ڈنمارک کرون</displayName>
+				<displayName count="one">ڈنمارک کرون</displayName>
+				<displayName count="other">ڈنمارک کرون</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>ڈومنیکن پیسو</displayName>
@@ -4359,6 +4504,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">مصری پاؤنڈ</displayName>
 				<displayName count="other">مصری پاؤنڈ</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>اریٹیریا کا نافکا</displayName>
@@ -4391,6 +4537,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">فاکلینڈ آئلینڈز پونڈ</displayName>
 				<displayName count="other">فاکلینڈ آئلینڈز پونڈ</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName draft="provisional">فرانسیسی فرانک</displayName>
@@ -4407,6 +4554,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">جارجیائی لاری</displayName>
 				<displayName count="other">جارجیائی لاری</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHS">
 				<displayName>گھانا کا سیڈی</displayName>
@@ -4432,12 +4580,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">گنی فرانک</displayName>
 				<displayName count="other">گنی فرانک</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GTQ">
 				<displayName>گواٹے مالا کا کوئٹزل</displayName>
 				<displayName count="one">گواٹے مالا کا کوئٹزل</displayName>
 				<displayName count="other">گواٹے مالا کا کوئٹزل</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GYD">
 				<displayName>گویانیز ڈالر</displayName>
@@ -4458,12 +4608,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ہونڈوران لیمپیرا</displayName>
 				<displayName count="other">ہونڈوران لیمپیرا</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRK">
 				<displayName>کروشین کونا</displayName>
 				<displayName count="one">کروشین کونا</displayName>
 				<displayName count="other">کروشین کونا</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>ہیتی کا گؤرڈی</displayName>
@@ -4476,12 +4628,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ہنگرین فورنٹ</displayName>
 				<displayName count="other">ہنگرین فورنٹ</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>انڈونیشین روپیہ</displayName>
 				<displayName count="one">انڈونیشین روپیہ</displayName>
 				<displayName count="other">انڈونیشین روپیہ</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="ILS">
 				<displayName>اسرائیلی نیا شیکل</displayName>
@@ -4514,6 +4668,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">آئس لينڈی کرونا</displayName>
 				<displayName count="other">آئس لينڈی کرونوں</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="JMD">
 				<displayName>جمائیکن ڈالر</displayName>
@@ -4559,12 +4714,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">کوموریئن فرانک</displayName>
 				<displayName count="other">کوموریئن فرانک</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>شمالی کوریائی وون</displayName>
 				<displayName count="one">شمالی کوریائی وون</displayName>
 				<displayName count="other">شمالی کوریائی وون</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>جنوبی کوریائی وون</displayName>
@@ -4605,12 +4762,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">لبنانی پونڈ</displayName>
 				<displayName count="other">لبنانی پونڈ</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>سری لنکائی روپیہ</displayName>
 				<displayName count="one">سری لنکائی روپیہ</displayName>
 				<displayName count="other">سری لنکائی روپیہ</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>لائبریائی ڈالر</displayName>
@@ -4657,6 +4816,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ملاگاسی اریاری</displayName>
 				<displayName count="other">ملاگاسی اریاری</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MKD">
 				<displayName>مقدونیائی دینار</displayName>
@@ -4669,6 +4829,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">میانما کیاٹ</displayName>
 				<displayName count="other">میانما کیاٹ</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>منگولیائی ٹگرِ</displayName>
@@ -4694,6 +4855,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ماریشس کا روپیہ</displayName>
 				<displayName count="other">ماریشس کا روپیہ</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>مالدیپ کا روفیہ</displayName>
@@ -4719,6 +4881,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ملیشیائی رنگِٹ</displayName>
 				<displayName count="other">ملیشیائی رنگِٹ</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZN">
 				<displayName>موزامبیقی میٹیکل</displayName>
@@ -4745,18 +4908,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">نکارا گوا کا کورڈوبا</displayName>
 				<displayName count="other">نکارا گوا کا کورڈوبا</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NOK">
-				<displayName draft="contributed">ناروے کرون</displayName>
-				<displayName count="one" draft="contributed">ناروے کرون</displayName>
-				<displayName count="other" draft="contributed">ناروے کرون</displayName>
+				<displayName>ناروے کرون</displayName>
+				<displayName count="one">ناروے کرون</displayName>
+				<displayName count="other">ناروے کرون</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>نیپالی روپیہ</displayName>
 				<displayName count="one">نیپالی روپیہ</displayName>
 				<displayName count="other">نیپالی روپیہ</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>نیوزی لینڈ ڈالر</displayName>
@@ -4801,12 +4967,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">پاکستانی روپیہ</displayName>
 				<displayName count="other">پاکستانی روپیہ</displayName>
 				<symbol>Rs</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>پولش زلوٹی</displayName>
 				<displayName count="one">پولش زلوٹی</displayName>
 				<displayName count="other">پولش زلوٹی</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PYG">
 				<displayName>پیراگوئے کا گوآرنی</displayName>
@@ -4838,12 +5006,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">روسی روبل</displayName>
 				<displayName count="other">روسی روبل</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RWF">
 				<displayName>روانڈا کا فرانک</displayName>
 				<displayName count="one">روانڈا کا فرانک</displayName>
 				<displayName count="other">روانڈا کا فرانک</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>سعودی ریال</displayName>
@@ -4875,6 +5045,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">سویڈن کرونا</displayName>
 				<displayName count="other">سویڈن کرونر</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>سنگا پور ڈالر</displayName>
@@ -4888,6 +5059,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">سینٹ ہیلینا پاؤنڈ</displayName>
 				<displayName count="other">سینٹ ہیلینا پاؤنڈ</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName draft="contributed">سلوانین ٹولر</displayName>
@@ -4926,12 +5098,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ساؤ ٹوم اور پرنسپے ڈوبرا</displayName>
 				<displayName count="other">ساؤ ٹوم اور پرنسپے ڈوبرا</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SYP">
 				<displayName>شامی پونڈ</displayName>
 				<displayName count="one">شامی پونڈ</displayName>
 				<displayName count="other">شامی پونڈ</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>سوازی لیلانجینی</displayName>
@@ -4944,6 +5118,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">تھائی باہت</displayName>
 				<displayName count="other">تھائی باہت</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJS">
 				<displayName>تاجکستانی سومونی</displayName>
@@ -4968,6 +5143,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">ٹونگن پانگا</displayName>
 				<displayName count="other">ٹونگن پانگا</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TRY">
 				<displayName>ترکی لیرا</displayName>
@@ -4975,6 +5151,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">ترکی لیرا</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>ترینیداد اور ٹوباگو کا ڈالر</displayName>
@@ -5037,6 +5214,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">وینزویلا بولیور</displayName>
 				<displayName count="other">وینزویلا بولیور</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>ویتنامی ڈانگ</displayName>
@@ -5058,9 +5236,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>WST</symbol>
 			</currency>
 			<currency type="XAF">
-				<displayName>CFA فرانک BEAC</displayName>
-				<displayName count="one">CFA فرانک BEAC</displayName>
-				<displayName count="other">CFA فرانکس BEAC</displayName>
+				<displayName>وسطی افریقی [CFA] فرانک</displayName>
+				<displayName count="one">وسطی افریقی [CFA] فرانک</displayName>
+				<displayName count="other">وسطی افریقی [CFA] فرانک</displayName>
 				<symbol>FCFA</symbol>
 			</currency>
 			<currency type="XCD">
@@ -5068,11 +5246,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">مشرقی کریبیا کا ڈالر</displayName>
 				<displayName count="other">مشرقی کریبیا کا ڈالر</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XOF">
-				<displayName>CFA فرانک BCEAO</displayName>
-				<displayName count="one">CFA فرانک BCEAO</displayName>
-				<displayName count="other">CFA فرانکس BCEAO</displayName>
+				<displayName>مغربی افریقی [CFA] فرانک</displayName>
+				<displayName count="one">مغربی افریقی [CFA] فرانک</displayName>
+				<displayName count="other">مغربی افریقی [CFA] فرانک</displayName>
 				<symbol>CFA</symbol>
 			</currency>
 			<currency type="XPF">
@@ -5097,6 +5276,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">جنوبی افریقی رانڈ</displayName>
 				<displayName count="other">جنوبی افریقی رانڈ</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>زامبیائی کواچا (1968–2012)</displayName>
@@ -5106,6 +5286,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">زامبیائی کواچا</displayName>
 				<displayName count="other">زامبیائی کواچا</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
@@ -5128,6 +5309,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="one">{0} rev</unitPattern>
+				<unitPattern count="other">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>ڈگری</displayName>
+				<unitPattern count="one">{0} ڈگری</unitPattern>
+				<unitPattern count="other">{0} ڈگری</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>آرک منٹ</displayName>
 				<unitPattern count="one">{0} آرک منٹ</unitPattern>
@@ -5138,30 +5334,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} آرک سیکنڈ</unitPattern>
 				<unitPattern count="other">{0} آرک سیکنڈ</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>ڈگری</displayName>
-				<unitPattern count="one">{0} ڈگری</unitPattern>
-				<unitPattern count="other">{0} ڈگری</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>ایکڑ</displayName>
-				<unitPattern count="one">{0} ایکڑ</unitPattern>
-				<unitPattern count="other">{0} ایکڑ</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>سکویر کلو میٹر</displayName>
+				<unitPattern count="one">{0} سکویر کلو میٹر</unitPattern>
+				<unitPattern count="other">{0} سکویر کلو میٹر</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ہیکٹر</displayName>
 				<unitPattern count="one">{0} ہیکٹر</unitPattern>
 				<unitPattern count="other">{0} ہیکٹر</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>سکویر میٹر</displayName>
+				<unitPattern count="one">{0} سکویر میٹر</unitPattern>
+				<unitPattern count="other">{0} سکویر میٹر</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>مربع سینٹی میٹر</displayName>
 				<unitPattern count="one">{0} مربع سینٹی میٹر</unitPattern>
 				<unitPattern count="other">{0} مربع سینٹی میٹر</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>سکویر میل</displayName>
+				<unitPattern count="one">{0} سکویر میل</unitPattern>
+				<unitPattern count="other">{0} سکویر میل</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ایکڑ</displayName>
+				<unitPattern count="one">{0} ایکڑ</unitPattern>
+				<unitPattern count="other">{0} ایکڑ</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>مربع گز</displayName>
+				<unitPattern count="one">{0} مربع گز</unitPattern>
+				<unitPattern count="other">{0} مربع گز</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>سکویر فٹ</displayName>
@@ -5172,91 +5380,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>مربع انچ</displayName>
 				<unitPattern count="one">{0} مربع انچ</unitPattern>
 				<unitPattern count="other">{0} مربع انچ</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>سکویر کلو میٹر</displayName>
-				<unitPattern count="one">{0} سکویر کلو میٹر</unitPattern>
-				<unitPattern count="other">{0} سکویر کلو میٹر</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>سکویر میٹر</displayName>
-				<unitPattern count="one">{0} سکویر میٹر</unitPattern>
-				<unitPattern count="other">{0} سکویر میٹر</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>سکویر میل</displayName>
-				<unitPattern count="one">{0} سکویر میل</unitPattern>
-				<unitPattern count="other">{0} سکویر میل</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>مربع گز</displayName>
-				<unitPattern count="one">{0} مربع گز</unitPattern>
-				<unitPattern count="other">{0} مربع گز</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>قیراط</displayName>
+				<unitPattern count="one">{0} قیراط</unitPattern>
+				<unitPattern count="other">{0} قیراط</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
 				<unitPattern count="one">{0} L/km</unitPattern>
 				<unitPattern count="other">{0} L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>لیٹر فی 100 کلو میٹر</displayName>
+				<unitPattern count="one">{0} لیٹر فی 100 کلو میٹر</unitPattern>
+				<unitPattern count="other">{0} لیٹر فی 100 کلو میٹر</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>صدیاں</displayName>
+				<unitPattern count="one">{0} صدی</unitPattern>
+				<unitPattern count="other">{0} صدیاں</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>سال</displayName>
+				<unitPattern count="one">{0} سال</unitPattern>
+				<unitPattern count="other">{0} سال</unitPattern>
+				<perUnitPattern>فی سال {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>مہینے</displayName>
+				<unitPattern count="one">{0} مہینہ</unitPattern>
+				<unitPattern count="other">{0} مہینے</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ہفتے</displayName>
+				<unitPattern count="one">{0} ہفتہ</unitPattern>
+				<unitPattern count="other">{0} ہفتے</unitPattern>
+				<perUnitPattern>{0}/w</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>دن</displayName>
 				<unitPattern count="one">{0} دن</unitPattern>
 				<unitPattern count="other">{0} دن</unitPattern>
+				<perUnitPattern>{0}/d</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>گھنٹے</displayName>
@@ -5264,30 +5487,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} گھنٹے</unitPattern>
 				<perUnitPattern>{0} فی گھنٹہ</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>مائیکرو سیکنڈز</displayName>
-				<unitPattern count="one">{0} مائیکرو سیکنڈ</unitPattern>
-				<unitPattern count="other">{0} مائیکرو سیکنڈز</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ملی سیکنڈز</displayName>
-				<unitPattern count="one">{0} ملی سیکنڈ</unitPattern>
-				<unitPattern count="other">{0} میل سیکنڈ</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>منٹ</displayName>
 				<unitPattern count="one">{0} منٹ</unitPattern>
 				<unitPattern count="other">{0} منٹ</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>مہینے</displayName>
-				<unitPattern count="one">{0} مہینہ</unitPattern>
-				<unitPattern count="other">{0} مہینے</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>نینو سیکنڈز</displayName>
-				<unitPattern count="one">{0} نینو سیکنڈ</unitPattern>
-				<unitPattern count="other">{0} نینو سیکنڈ</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>سیکنڈ</displayName>
@@ -5295,15 +5499,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} سیکنڈ</unitPattern>
 				<perUnitPattern>{0} فی سیکنڈ</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>ہفتے</displayName>
-				<unitPattern count="one">{0} ہفتہ</unitPattern>
-				<unitPattern count="other">{0} ہفتے</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ملی سیکنڈز</displayName>
+				<unitPattern count="one">{0} ملی سیکنڈ</unitPattern>
+				<unitPattern count="other">{0} میل سیکنڈ</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>سال</displayName>
-				<unitPattern count="one">{0} سال</unitPattern>
-				<unitPattern count="other">{0} سال</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>مائیکرو سیکنڈز</displayName>
+				<unitPattern count="one">{0} مائیکرو سیکنڈ</unitPattern>
+				<unitPattern count="other">{0} مائیکرو سیکنڈز</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>نینو سیکنڈز</displayName>
+				<unitPattern count="one">{0} نینو سیکنڈ</unitPattern>
+				<unitPattern count="other">{0} نینو سیکنڈ</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amp</displayName>
@@ -5325,6 +5534,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -5335,21 +5549,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Cal</unitPattern>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -5360,201 +5569,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>ایسٹرونومیکل یونٹس</displayName>
-				<unitPattern count="one">{0} ایسٹرونومیکل یونٹ</unitPattern>
-				<unitPattern count="other">{0} ایسٹرونومیکل یونٹس</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>کلو میٹر</displayName>
+				<unitPattern count="one">{0} کلو میٹر</unitPattern>
+				<unitPattern count="other">{0} کلو میٹر</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>سینٹی میٹر</displayName>
-				<unitPattern count="one">{0} سینٹی میٹر</unitPattern>
-				<unitPattern count="other">{0} سینٹی میٹر</unitPattern>
+			<unit type="length-meter">
+				<displayName>میٹر</displayName>
+				<unitPattern count="one">{0} میٹر</unitPattern>
+				<unitPattern count="other">{0} میٹر</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>فیٹ</displayName>
-				<unitPattern count="one">{0} فیٹ</unitPattern>
-				<unitPattern count="other">{0} فیٹ</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>انچ</displayName>
-				<unitPattern count="one">{0} انچ</unitPattern>
-				<unitPattern count="other">{0} انچ</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>کلو میٹر</displayName>
-				<unitPattern count="one">{0} کلو میٹر</unitPattern>
-				<unitPattern count="other">{0} کلو میٹر</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>نوری سال</displayName>
-				<unitPattern count="one">{0} نوری سال</unitPattern>
-				<unitPattern count="other">{0} نوری سال</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>میٹر</displayName>
-				<unitPattern count="one">{0} میٹر</unitPattern>
-				<unitPattern count="other">{0} میٹر</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>مائیکرو میٹر</displayName>
-				<unitPattern count="one">{0} مائیکرو میٹر</unitPattern>
-				<unitPattern count="other">{0} مائیکرو میٹر</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>میل</displayName>
-				<unitPattern count="one">{0} میل</unitPattern>
-				<unitPattern count="other">{0} میل</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>سینٹی میٹر</displayName>
+				<unitPattern count="one">{0} سینٹی میٹر</unitPattern>
+				<unitPattern count="other">{0} سینٹی میٹر</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>ملی میٹر</displayName>
 				<unitPattern count="one">{0} ملیمیٹر</unitPattern>
 				<unitPattern count="other">{0} ملیمیٹر</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>مائیکرو میٹر</displayName>
+				<unitPattern count="one">{0} مائیکرو میٹر</unitPattern>
+				<unitPattern count="other">{0} مائیکرو میٹر</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>بحری میل</displayName>
-				<unitPattern count="one">{0} بحری میل</unitPattern>
-				<unitPattern count="other">{0} بحری میل</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>پارسیک</displayName>
-				<unitPattern count="one">{0} پارسیک</unitPattern>
-				<unitPattern count="other">{0} پارسیک</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>پیکو میٹر</displayName>
 				<unitPattern count="one">{0} پیکو میٹر</unitPattern>
 				<unitPattern count="other">{0} پیکو میٹر</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>میل</displayName>
+				<unitPattern count="one">{0} میل</unitPattern>
+				<unitPattern count="other">{0} میل</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>گز</displayName>
 				<unitPattern count="one">{0} یارڈ</unitPattern>
 				<unitPattern count="other">{0} یارڈ</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>فیٹ</displayName>
+				<unitPattern count="one">{0} فیٹ</unitPattern>
+				<unitPattern count="other">{0} فیٹ</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>انچ</displayName>
+				<unitPattern count="one">{0} انچ</unitPattern>
+				<unitPattern count="other">{0} انچ</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>پارسیک</displayName>
+				<unitPattern count="one">{0} پارسیک</unitPattern>
+				<unitPattern count="other">{0} پارسیک</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>نوری سال</displayName>
+				<unitPattern count="one">{0} نوری سال</unitPattern>
+				<unitPattern count="other">{0} نوری سال</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ایسٹرونومیکل یونٹس</displayName>
+				<unitPattern count="one">{0} ایسٹرونومیکل یونٹ</unitPattern>
+				<unitPattern count="other">{0} ایسٹرونومیکل یونٹس</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>بحری میل</displayName>
+				<unitPattern count="one">{0} بحری میل</unitPattern>
+				<unitPattern count="other">{0} بحری میل</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>اسکینڈی نیویائی میل</displayName>
+				<unitPattern count="one">{0} اسکینڈی نیویائی میل</unitPattern>
+				<unitPattern count="other">{0} اسکینڈی نیویائی میل</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>قیراط</displayName>
-				<unitPattern count="one">{0} قیراط</unitPattern>
-				<unitPattern count="other">{0} قیراط</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>گرام</displayName>
-				<unitPattern count="one">{0} گرام</unitPattern>
-				<unitPattern count="other">{0} گرام</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>کلو گرام</displayName>
-				<unitPattern count="one">{0} کلو گرام</unitPattern>
-				<unitPattern count="other">{0} کلو گرام</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>میٹرک ٹن</displayName>
 				<unitPattern count="one">{0} میٹرک ٹن</unitPattern>
 				<unitPattern count="other">{0} میٹرک ٹن</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>کلو گرام</displayName>
+				<unitPattern count="one">{0} کلو گرام</unitPattern>
+				<unitPattern count="other">{0} کلو گرام</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>گرام</displayName>
+				<unitPattern count="one">{0} گرام</unitPattern>
+				<unitPattern count="other">{0} گرام</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>ملی گرام</displayName>
 				<unitPattern count="one">{0} ملی گرام</unitPattern>
 				<unitPattern count="other">{0} ملی گرام</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>اونس</displayName>
-				<unitPattern count="one">{0} ونس</unitPattern>
-				<unitPattern count="other">{0} ونس</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>پاؤنڈ</displayName>
-				<unitPattern count="one">{0} پونڈ</unitPattern>
-				<unitPattern count="other">{0} پونڈ</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>ٹن</displayName>
 				<unitPattern count="one">{0} ٹن</unitPattern>
 				<unitPattern count="other">{0} ٹن</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>پاؤنڈ</displayName>
+				<unitPattern count="one">{0} پونڈ</unitPattern>
+				<unitPattern count="other">{0} پونڈ</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>اونس</displayName>
+				<unitPattern count="one">{0} ونس</unitPattern>
+				<unitPattern count="other">{0} ونس</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>قیراط</displayName>
+				<unitPattern count="one">{0} قیراط</unitPattern>
+				<unitPattern count="other">{0} قیراط</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>ہارس پاور</displayName>
-				<unitPattern count="one">{0} ہارس پاور</unitPattern>
-				<unitPattern count="other">{0} ہارس پاور</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>کلو واٹ</displayName>
-				<unitPattern count="one">{0} کلو واٹ</unitPattern>
-				<unitPattern count="other">{0} کلو واٹ</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>کلو واٹ</displayName>
+				<unitPattern count="one">{0} کلو واٹ</unitPattern>
+				<unitPattern count="other">{0} کلو واٹ</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>واٹ</displayName>
 				<unitPattern count="one">{0} واٹ</unitPattern>
 				<unitPattern count="other">{0} واٹ</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>ہارس پاور</displayName>
+				<unitPattern count="one">{0} ہارس پاور</unitPattern>
+				<unitPattern count="other">{0} ہارس پاور</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>ہیکٹو پاسکل</displayName>
 				<unitPattern count="one">{0} ہیکٹو پاسکل</unitPattern>
 				<unitPattern count="other">{0} ہیکٹو پاسکل</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>انچ مرکری</displayName>
-				<unitPattern count="one">{0} انچ مرکری</unitPattern>
-				<unitPattern count="other">{0} انچ مرکری</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>ملی بار</displayName>
-				<unitPattern count="one">{0} ملی بار</unitPattern>
-				<unitPattern count="other">{0} ملی بار</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -5565,10 +5778,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>قیراط</displayName>
-				<unitPattern count="one">{0} قیراط</unitPattern>
-				<unitPattern count="other">{0} قیراط</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>انچ مرکری</displayName>
+				<unitPattern count="one">{0} انچ مرکری</unitPattern>
+				<unitPattern count="other">{0} انچ مرکری</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>ملی بار</displayName>
+				<unitPattern count="one">{0} ملی بار</unitPattern>
+				<unitPattern count="other">{0} ملی بار</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>کلومیٹر فی گھنٹہ</displayName>
@@ -5585,6 +5803,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} میل فی گھنٹہ</unitPattern>
 				<unitPattern count="other">{0} میل فی گھنٹہ</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>ڈگری سیلسیس</displayName>
 				<unitPattern count="one">{0} ڈگری سیلسیس</unitPattern>
@@ -5600,31 +5828,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} کیلون</unitPattern>
 				<unitPattern count="other">{0} کیلون</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ایکڑ فٹ</displayName>
-				<unitPattern count="one">{0} ایکڑ فٹ</unitPattern>
-				<unitPattern count="other">{0} ایکڑ فٹ</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>سینٹی لیٹر</displayName>
-				<unitPattern count="one">{0} سینٹی لیٹر</unitPattern>
-				<unitPattern count="other">{0} سینٹی لیٹر</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>کیوبک سینٹی میٹر</displayName>
-				<unitPattern count="one">{0} کیوبک سینٹی میٹر</unitPattern>
-				<unitPattern count="other">{0} کیوبک سینٹی میٹر</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>کیوبک فیٹ</displayName>
-				<unitPattern count="one">{0} کیوبک فیٹ</unitPattern>
-				<unitPattern count="other">{0} کیوبک فٹ</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>کیوبک کلو میٹر</displayName>
 				<unitPattern count="one">{0} کیوبک کلو میٹر</unitPattern>
@@ -5634,6 +5837,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>کیوبک سینٹی میٹر</displayName>
+				<unitPattern count="one">{0} کیوبک سینٹی میٹر</unitPattern>
+				<unitPattern count="other">{0} کیوبک سینٹی میٹر</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>کیوبک میل</displayName>
@@ -5645,25 +5855,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} کیوبک گز</unitPattern>
 				<unitPattern count="other">{0} کیوبک گز</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>کپ</displayName>
-				<unitPattern count="one">{0} کپ</unitPattern>
-				<unitPattern count="other">{0} کپ</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>کیوبک فیٹ</displayName>
+				<unitPattern count="one">{0} کیوبک فیٹ</unitPattern>
+				<unitPattern count="other">{0} کیوبک فٹ</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>ڈیسی لیٹر</displayName>
-				<unitPattern count="one">{0} ڈیسی لیٹر</unitPattern>
-				<unitPattern count="other">{0} ڈیسی لیٹر</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>فلوئڈ اونس</displayName>
-				<unitPattern count="one">{0} فلوئڈ اونس</unitPattern>
-				<unitPattern count="other">{0} فلوئڈ اونس</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -5674,27 +5879,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>لیٹر</displayName>
 				<unitPattern count="one">{0} لیٹر</unitPattern>
 				<unitPattern count="other">{0} لیٹر</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="one">{0} ML</unitPattern>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>ڈیسی لیٹر</displayName>
+				<unitPattern count="one">{0} ڈیسی لیٹر</unitPattern>
+				<unitPattern count="other">{0} ڈیسی لیٹر</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>سینٹی لیٹر</displayName>
+				<unitPattern count="one">{0} سینٹی لیٹر</unitPattern>
+				<unitPattern count="other">{0} سینٹی لیٹر</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
 				<unitPattern count="one">{0} mL</unitPattern>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ایکڑ فٹ</displayName>
+				<unitPattern count="one">{0} ایکڑ فٹ</unitPattern>
+				<unitPattern count="other">{0} ایکڑ فٹ</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>کپ</displayName>
+				<unitPattern count="one">{0} کپ</unitPattern>
+				<unitPattern count="other">{0} کپ</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>فلوئڈ اونس</displayName>
+				<unitPattern count="one">{0} فلوئڈ اونس</unitPattern>
+				<unitPattern count="other">{0} فلوئڈ اونس</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>tbsp</displayName>
 				<unitPattern count="one">{0} tbsp</unitPattern>
@@ -5705,6 +5947,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} tsp</unitPattern>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -5720,39 +5968,67 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName>arcmin</displayName>
-				<unitPattern count="one">{0} آرک منٹ</unitPattern>
-				<unitPattern count="other">{0} آرک منٹ</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<unitPattern count="one" draft="contributed">{0} آرک سیکنڈ</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} آرک سیکنڈ</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName>ڈگری</displayName>
-				<unitPattern count="one">{0} ڈگری</unitPattern>
-				<unitPattern count="other">{0} ڈگری</unitPattern>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="one">{0} rev</unitPattern>
+				<unitPattern count="other">{0} rev</unitPattern>
 			</unit>
 			<unit type="angle-radian">
 				<displayName>rad</displayName>
 				<unitPattern count="one">{0} rad</unitPattern>
 				<unitPattern count="other">{0} rad</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName>ایکڑ</displayName>
-				<unitPattern count="one">{0} ایکڑ</unitPattern>
-				<unitPattern count="other">{0} ایکڑ</unitPattern>
+			<unit type="angle-degree">
+				<displayName>ڈگری</displayName>
+				<unitPattern count="one">{0} ڈگری</unitPattern>
+				<unitPattern count="other">{0} ڈگری</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>arcmin</displayName>
+				<unitPattern count="one">{0} آرک منٹ</unitPattern>
+				<unitPattern count="other">{0} آرک منٹ</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>arcsec</displayName>
+				<unitPattern count="one">{0} آرک سیکنڈ</unitPattern>
+				<unitPattern count="other">{0} آرک سیکنڈ</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ہیکٹر</displayName>
 				<unitPattern count="one">{0} ہیکٹر</unitPattern>
 				<unitPattern count="other">{0} ہیکٹر</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>سکویر میٹر</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>سکویر میل</displayName>
+				<unitPattern count="one">{0} سکویر میل</unitPattern>
+				<unitPattern count="other">{0} سکویر میل</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ایکڑ</displayName>
+				<unitPattern count="one">{0} ایکڑ</unitPattern>
+				<unitPattern count="other">{0} ایکڑ</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>مربع گز</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>سکویر فٹ</displayName>
@@ -5763,91 +6039,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>مربع انچ</displayName>
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>سکویر میٹر</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>سکویر میل</displayName>
-				<unitPattern count="one">{0} سکویر میل</unitPattern>
-				<unitPattern count="other">{0} سکویر میل</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>مربع گز</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>قیراط</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
 				<unitPattern count="one">{0} L/km</unitPattern>
 				<unitPattern count="other">{0} L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>لیٹر/100 کلو میٹر</displayName>
+				<unitPattern count="one" draft="provisional">{0} L/100km</unitPattern>
+				<unitPattern count="other" draft="provisional">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>صدی</displayName>
+				<unitPattern count="one">{0} صدی</unitPattern>
+				<unitPattern count="other">{0} صدیاں</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>سال</displayName>
+				<unitPattern count="one">{0} سال</unitPattern>
+				<unitPattern count="other">{0} سال</unitPattern>
+				<perUnitPattern>{0}/y</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>مہینے</displayName>
+				<unitPattern count="one">{0} مہینہ</unitPattern>
+				<unitPattern count="other">{0} مہینے</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ہفتے</displayName>
+				<unitPattern count="one">{0} ہفتہ</unitPattern>
+				<unitPattern count="other">{0} ہفتے</unitPattern>
+				<perUnitPattern>{0}/w</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>دن</displayName>
 				<unitPattern count="one">{0} دن</unitPattern>
 				<unitPattern count="other">{0} دن</unitPattern>
+				<perUnitPattern>{0}/d</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>گھنٹے</displayName>
@@ -5855,30 +6146,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} گھنٹے</unitPattern>
 				<perUnitPattern>{0} فی گھنٹہ</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName draft="contributed">مائیکرو سیکنڈ</displayName>
-				<unitPattern count="one" draft="contributed">{0} مائیکرو سیکنڈ</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} مائیکرو سیکنڈ</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ملی سیکنڈ</displayName>
-				<unitPattern count="one">{0} ملی سیکنڈ</unitPattern>
-				<unitPattern count="other">{0} ملی سیکنڈ</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>منٹ</displayName>
 				<unitPattern count="one">{0} منٹ</unitPattern>
 				<unitPattern count="other">{0} منٹ</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>مہینے</displayName>
-				<unitPattern count="one">{0} مہینہ</unitPattern>
-				<unitPattern count="other">{0} مہینے</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>نینو سیکنڈز</displayName>
-				<unitPattern count="one">{0} نینو سیکنڈ</unitPattern>
-				<unitPattern count="other">{0} نینو سیکنڈ</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>سیکنڈ</displayName>
@@ -5886,15 +6158,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} سیکنڈ</unitPattern>
 				<perUnitPattern>{0} فی سیکنڈ</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>ہفتے</displayName>
-				<unitPattern count="one">{0} ہفتہ</unitPattern>
-				<unitPattern count="other">{0} ہفتے</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ملی سیکنڈ</displayName>
+				<unitPattern count="one">{0} ملی سیکنڈ</unitPattern>
+				<unitPattern count="other">{0} ملی سیکنڈ</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>سال</displayName>
-				<unitPattern count="one">{0} سال</unitPattern>
-				<unitPattern count="other">{0} سال</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>مائیکرو سیکنڈ</displayName>
+				<unitPattern count="one" draft="contributed">{0} مائیکرو سیکنڈ</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} مائیکرو سیکنڈ</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>نینو سیکنڈز</displayName>
+				<unitPattern count="one">{0} نینو سیکنڈ</unitPattern>
+				<unitPattern count="other">{0} نینو سیکنڈ</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amp</displayName>
@@ -5916,6 +6193,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -5926,21 +6208,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Cal</unitPattern>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kW-hour</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -5951,201 +6228,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>کلو میٹر</displayName>
+				<unitPattern count="one">{0} کلو میٹر</unitPattern>
+				<unitPattern count="other">{0} کلو میٹر</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>سینٹی میٹر</displayName>
-				<unitPattern count="one">{0} سینٹی میٹر</unitPattern>
-				<unitPattern count="other">{0} سینٹی میٹر</unitPattern>
+			<unit type="length-meter">
+				<displayName>میٹر</displayName>
+				<unitPattern count="one">{0} میٹر</unitPattern>
+				<unitPattern count="other">{0} میٹر</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>فیٹ</displayName>
-				<unitPattern count="one">{0} فیٹ</unitPattern>
-				<unitPattern count="other">{0} فیٹ</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>انچ</displayName>
-				<unitPattern count="one">{0} انچ</unitPattern>
-				<unitPattern count="other">{0} انچ</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>کلو میٹر</displayName>
-				<unitPattern count="one">{0} کلو میٹر</unitPattern>
-				<unitPattern count="other">{0} کلو میٹر</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>نوری سال</displayName>
-				<unitPattern count="one">{0} ly</unitPattern>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>میٹر</displayName>
-				<unitPattern count="one">{0} میٹر</unitPattern>
-				<unitPattern count="other">{0} میٹر</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>میل</displayName>
-				<unitPattern count="one">{0} میل</unitPattern>
-				<unitPattern count="other">{0} میل</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>سینٹی میٹر</displayName>
+				<unitPattern count="one">{0} سینٹی میٹر</unitPattern>
+				<unitPattern count="other">{0} سینٹی میٹر</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>ملی میٹر</displayName>
 				<unitPattern count="one">{0} ملیمیٹر</unitPattern>
 				<unitPattern count="other">{0} ملیمیٹر</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>پارسیک</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>پیکو میٹر</displayName>
 				<unitPattern count="one">{0} پیکو میٹر</unitPattern>
 				<unitPattern count="other">{0} پیکو میٹر</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>میل</displayName>
+				<unitPattern count="one">{0} میل</unitPattern>
+				<unitPattern count="other">{0} میل</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>گز</displayName>
 				<unitPattern count="one">{0} یارڈ</unitPattern>
 				<unitPattern count="other">{0} یارڈ</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>فیٹ</displayName>
+				<unitPattern count="one">{0} فیٹ</unitPattern>
+				<unitPattern count="other">{0} فیٹ</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>انچ</displayName>
+				<unitPattern count="one">{0} انچ</unitPattern>
+				<unitPattern count="other">{0} انچ</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>پارسیک</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>نوری سال</displayName>
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>قیراط</displayName>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>گرام</displayName>
-				<unitPattern count="one">{0} گرام</unitPattern>
-				<unitPattern count="other">{0} گرام</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} کلو گرام</unitPattern>
-				<unitPattern count="other">{0} کلو گرام</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} کلو گرام</unitPattern>
+				<unitPattern count="other">{0} کلو گرام</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>گرام</displayName>
+				<unitPattern count="one">{0} گرام</unitPattern>
+				<unitPattern count="other">{0} گرام</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="one">{0} ونس</unitPattern>
-				<unitPattern count="other">{0} ونس</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>پاؤنڈ</displayName>
-				<unitPattern count="one">{0} پونڈ</unitPattern>
-				<unitPattern count="other">{0} پونڈ</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>ٹن</displayName>
 				<unitPattern count="one">{0} tn</unitPattern>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>پاؤنڈ</displayName>
+				<unitPattern count="one">{0} پونڈ</unitPattern>
+				<unitPattern count="other">{0} پونڈ</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} ونس</unitPattern>
+				<unitPattern count="other">{0} ونس</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>قیراط</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hp</displayName>
-				<unitPattern count="one">{0} ہارس پاور</unitPattern>
-				<unitPattern count="other">{0} ہارس پاور</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} کلو واٹ</unitPattern>
-				<unitPattern count="other">{0} کلو واٹ</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} کلو واٹ</unitPattern>
+				<unitPattern count="other">{0} کلو واٹ</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watt</displayName>
 				<unitPattern count="one">{0} واٹ</unitPattern>
 				<unitPattern count="other">{0} واٹ</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="one">{0} ہارس پاور</unitPattern>
+				<unitPattern count="other">{0} ہارس پاور</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>انچ مرکری</displayName>
-				<unitPattern count="one">{0} انچ مرکری</unitPattern>
-				<unitPattern count="other">{0} انچ مرکری</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} ملی بار</unitPattern>
-				<unitPattern count="other">{0} ملی بار</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -6156,10 +6437,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>قیراط</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>انچ مرکری</displayName>
+				<unitPattern count="one">{0} انچ مرکری</unitPattern>
+				<unitPattern count="other">{0} انچ مرکری</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} ملی بار</unitPattern>
+				<unitPattern count="other">{0} ملی بار</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>کلومیٹر/گھنٹہ</displayName>
@@ -6176,6 +6462,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mph</unitPattern>
 				<unitPattern count="other">{0} mph</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>ڈگری سیلسیس</displayName>
 				<unitPattern count="one">{0}‎°C</unitPattern>
@@ -6191,31 +6487,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ایکڑ فٹ</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>سینٹی لیٹر</displayName>
-				<unitPattern count="one">{0} cL</unitPattern>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>کیوبک سینٹی میٹر</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>کیوبک فٹ</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -6225,6 +6496,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>کیوبک سینٹی میٹر</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>کیوبک میل</displayName>
@@ -6236,25 +6514,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>کپ</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>کیوبک فٹ</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>ڈیسی لیٹر</displayName>
-				<unitPattern count="one">{0} dL</unitPattern>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -6265,27 +6538,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>لیٹر</displayName>
 				<unitPattern count="one">{0} لیٹر</unitPattern>
 				<unitPattern count="other">{0} لیٹر</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="one">{0} ML</unitPattern>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>ڈیسی لیٹر</displayName>
+				<unitPattern count="one">{0} dL</unitPattern>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>سینٹی لیٹر</displayName>
+				<unitPattern count="one">{0} cL</unitPattern>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
 				<unitPattern count="one">{0} mL</unitPattern>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ایکڑ فٹ</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>کپ</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>tbsp</displayName>
 				<unitPattern count="one">{0} tbsp</unitPattern>
@@ -6296,6 +6606,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} tsp</unitPattern>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -6305,6 +6621,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}g</unitPattern>
 				<unitPattern count="other">{0}g</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0} ڈگری</unitPattern>
+				<unitPattern count="other">{0} ڈگری</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0} منٹ</unitPattern>
 				<unitPattern count="other">{0} منٹ</unitPattern>
@@ -6313,26 +6633,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0} ڈگری</unitPattern>
-				<unitPattern count="other">{0} ڈگری</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} ایکڑ</unitPattern>
-				<unitPattern count="other">{0} ایکڑ</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} ہیکٹر</unitPattern>
 				<unitPattern count="other">{0} ہیکٹر</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0}ft²</unitPattern>
-				<unitPattern count="other">{0}ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} m²</unitPattern>
 				<unitPattern count="other">{0} m²</unitPattern>
@@ -6341,6 +6649,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}mi²</unitPattern>
 				<unitPattern count="other">{0}mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} ایکڑ</unitPattern>
+				<unitPattern count="other">{0} ایکڑ</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0}ft²</unitPattern>
+				<unitPattern count="other">{0}ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>لیٹر/100 کلو میٹر</displayName>
+				<unitPattern count="one">{0}L/100km</unitPattern>
+				<unitPattern count="other">{0}L/100km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>سال</displayName>
+				<unitPattern count="one">{0} سال</unitPattern>
+				<unitPattern count="other">{0} سال</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>مہینہ</displayName>
+				<unitPattern count="one">{0} مہینہ</unitPattern>
+				<unitPattern count="other">{0} مہینے</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ہفتہ</displayName>
+				<unitPattern count="one">{0} ہفتہ</unitPattern>
+				<unitPattern count="other">{0} ہفتے</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>دن</displayName>
 				<unitPattern count="one">{0} دن</unitPattern>
@@ -6351,66 +6687,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} گھنٹہ</unitPattern>
 				<unitPattern count="other">{0} گھنٹے</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ملی سیکنڈ</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>منٹ</displayName>
 				<unitPattern count="one">{0} منٹ</unitPattern>
 				<unitPattern count="other">{0} منٹ</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>مہینہ</displayName>
-				<unitPattern count="one">{0} مہینہ</unitPattern>
-				<unitPattern count="other">{0} مہینے</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>سیکنڈ</displayName>
 				<unitPattern count="one">{0}s</unitPattern>
 				<unitPattern count="other">{0}s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>ہفتہ</displayName>
-				<unitPattern count="one">{0} ہفتہ</unitPattern>
-				<unitPattern count="other">{0} ہفتے</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>سال</displayName>
-				<unitPattern count="one">{0} سال</unitPattern>
-				<unitPattern count="other">{0} سال</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>سینٹی میٹر</displayName>
-				<unitPattern count="one">{0}cm</unitPattern>
-				<unitPattern count="other">{0}cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">'{0}</unitPattern>
-				<unitPattern count="other">{0}′</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0} انچ</unitPattern>
-				<unitPattern count="other">{0} انچ</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ملی سیکنڈ</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>کلو میٹر</displayName>
 				<unitPattern count="one">{0}km</unitPattern>
 				<unitPattern count="other">{0}km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0}ly</unitPattern>
-				<unitPattern count="other">{0}ly</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>میٹر</displayName>
 				<unitPattern count="one">{0} میٹر</unitPattern>
 				<unitPattern count="other">{0} میٹر</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} میل</unitPattern>
-				<unitPattern count="other">{0} میل</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>سینٹی میٹر</displayName>
+				<unitPattern count="one">{0}cm</unitPattern>
+				<unitPattern count="other">{0}cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>ملی میٹر</displayName>
@@ -6421,31 +6726,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}pm</unitPattern>
 				<unitPattern count="other">{0}pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} میل</unitPattern>
+				<unitPattern count="other">{0} میل</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} یارڈ</unitPattern>
 				<unitPattern count="other">{0} یارڈ</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>گرام</displayName>
-				<unitPattern count="one">{0} گرام</unitPattern>
-				<unitPattern count="other">{0} گرام</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="other">{0}′</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} انچ</unitPattern>
+				<unitPattern count="other">{0} انچ</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0}ly</unitPattern>
+				<unitPattern count="other">{0}ly</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="one">{0}kg</unitPattern>
 				<unitPattern count="other">{0}kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} ونس</unitPattern>
-				<unitPattern count="other">{0} ونس</unitPattern>
+			<unit type="mass-gram">
+				<displayName>گرام</displayName>
+				<unitPattern count="one">{0} گرام</unitPattern>
+				<unitPattern count="other">{0} گرام</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} پونڈ</unitPattern>
 				<unitPattern count="other">{0} پونڈ</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0}hp</unitPattern>
-				<unitPattern count="other">{0}hp</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} ونس</unitPattern>
+				<unitPattern count="other">{0} ونس</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0}kW</unitPattern>
@@ -6455,6 +6772,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} واٹ</unitPattern>
 				<unitPattern count="other">{0} واٹ</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0}hp</unitPattern>
+				<unitPattern count="other">{0}hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0}hPa</unitPattern>
 				<unitPattern count="other">{0}hPa</unitPattern>
@@ -6504,6 +6825,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} لیٹر</unitPattern>
 				<unitPattern count="other">{0} لیٹر</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ur_IN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ur_IN.xml
similarity index 96%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ur_IN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ur_IN.xml
index a37dd6d39d5..51f96186cde 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ur_IN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ur_IN.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 12217 $"/>
 		<language type="ur"/>
 		<territory type="IN"/>
 	</identity>
@@ -53,9 +52,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="VI">امریکی جزائر ورجن</territory>
 		</territories>
 		<types>
-			<type type="armnlow" key="numbers">آرمینیائی لوئر کیس اعداد</type>
-			<type type="greklow" key="numbers">یونانی لوئر کیس اعداد</type>
-			<type type="tibt" key="numbers">تبتی ہندسے</type>
+			<type key="numbers" type="armnlow">آرمینیائی لوئر کیس اعداد</type>
+			<type key="numbers" type="greklow">یونانی لوئر کیس اعداد</type>
+			<type key="numbers" type="tibt">تبتی ہندسے</type>
 		</types>
 	</localeDisplayNames>
 	<dates>
@@ -69,17 +68,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateFormatLength>
 				</dateFormats>
 			</calendar>
-			<calendar type="gregorian">
-				<eras>
-					<eraNames>
-						<era type="1">عیسوی</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">قبل مسیح</era>
-						<era type="1">عیسوی</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
 		</calendars>
 		<fields>
 			<field type="era">
@@ -126,6 +114,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week">
 				<relative type="-1">گزشتہ ہفتہ</relative>
+				<relative type="0">اس ہفتہ</relative>
+				<relative type="1">اگلے ہفتہ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} ہفتہ میں</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ہفتوں میں</relativeTimePattern>
@@ -161,22 +151,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="mon">
 				<relative type="-1">پچھلے سوموار</relative>
+				<relative type="0">اس سوموار</relative>
+				<relative type="1">اگلے سوموار</relative>
 			</field>
 			<field type="tue">
 				<relative type="-1">پچھلے منگل</relative>
+				<relative type="0">اس منگل</relative>
+				<relative type="1">اگلے منگل</relative>
 			</field>
 			<field type="wed">
 				<relative type="-1">پچھلے بدھ</relative>
+				<relative type="0">اس بدھ</relative>
+				<relative type="1">اگلے بدھ</relative>
 			</field>
 			<field type="thu">
 				<relative type="-1">پچھلے جمعرات</relative>
+				<relative type="0">اس جمعرات</relative>
+				<relative type="1">اگلے جمعرات</relative>
 			</field>
 			<field type="fri">
 				<relative type="-1">پچھلے جمعہ</relative>
-			</field>
-			<field type="sat">
-				<relative type="-1">پچھلے ہفتہ</relative>
-				<relative type="0">اس ہفتہ</relative>
+				<relative type="0">اس جمعہ</relative>
+				<relative type="1">اگلے جمعہ</relative>
 			</field>
 			<field type="hour-short">
 				<relativeTime type="past">
@@ -243,9 +239,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="America/Glace_Bay">
 				<exemplarCity>گلیس بے</exemplarCity>
 			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>فارو</exemplarCity>
-			</zone>
 			<zone type="Africa/Accra">
 				<exemplarCity>اکرا</exemplarCity>
 			</zone>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ur_PK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ur_PK.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ur_PK.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ur_PK.xml
index a45ebaa73cb..5a1c076f927 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ur_PK.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ur_PK.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="ur"/>
 		<territory type="PK"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uz.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz.xml
similarity index 61%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uz.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz.xml
index 7e861f28674..32eb86af52c 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uz.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="uz"/>
 	</identity>
 	<localeDisplayNames>
@@ -17,291 +16,303 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<localeKeyTypePattern>{0}: {1}</localeKeyTypePattern>
 		</localeDisplayPattern>
 		<languages>
-			<language type="ab">abxazcha</language>
-			<language type="af">afrikancha</language>
-			<language type="agq">ag‘emcha</language>
-			<language type="ak">akancha</language>
-			<language type="am">amxarcha</language>
-			<language type="ar">arabcha</language>
-			<language type="ar_001">zamonavij standart arabcha</language>
-			<language type="arn">mapuchiycha</language>
-			<language type="as">assamcha</language>
-			<language type="asa">asucha</language>
-			<language type="az">ozarbayjoncha</language>
-			<language type="ba">boshqircha</language>
-			<language type="be">belaruscha</language>
-			<language type="bem">bembacha</language>
-			<language type="bez">benacha</language>
-			<language type="bg">bolgarcha</language>
-			<language type="bm">bambarcha</language>
-			<language type="bn">bengalcha</language>
-			<language type="bo">tibetcha</language>
-			<language type="br">bretoncha</language>
-			<language type="brx">bodocha</language>
-			<language type="bs">bosniycha</language>
-			<language type="ca">katalancha</language>
-			<language type="cgg">chigcha</language>
-			<language type="chr">cherokcha</language>
-			<language type="ckb">sorani kurd tili</language>
-			<language type="co">korsiancha</language>
-			<language type="cs">chexcha</language>
-			<language type="cy">uelscha</language>
-			<language type="da">datcha</language>
-			<language type="dav">taitcha</language>
+			<language type="ab">abxaz</language>
+			<language type="af">afrikaans</language>
+			<language type="agq">agem</language>
+			<language type="ak">akan</language>
+			<language type="am">amxar</language>
+			<language type="ar">arab</language>
+			<language type="ar_001">standart arab</language>
+			<language type="arn">araukan</language>
+			<language type="as">assam</language>
+			<language type="asa">asu</language>
+			<language type="az">ozarbayjon</language>
+			<language type="az" alt="short">ozar</language>
+			<language type="ba">boshqird</language>
+			<language type="be">belarus</language>
+			<language type="bem">bemba</language>
+			<language type="bez">bena</language>
+			<language type="bg">bolgar</language>
+			<language type="bgn">g‘arbiy beluji</language>
+			<language type="bm">bambar</language>
+			<language type="bn">bengal</language>
+			<language type="bo">tibet</language>
+			<language type="br">breton</language>
+			<language type="brx">bodo</language>
+			<language type="bs">bosniy</language>
+			<language type="ca">katalan</language>
+			<language type="ce">chechen</language>
+			<language type="cgg">chiga</language>
+			<language type="chr">cheroki</language>
+			<language type="ckb">sorani-kurd</language>
+			<language type="co">korsikan</language>
+			<language type="cs">chex</language>
+			<language type="cv">chuvash</language>
+			<language type="cy">valliy</language>
+			<language type="da">dat</language>
+			<language type="dav">taita</language>
 			<language type="de">nemischa</language>
-			<language type="de_AT">Avstriya olmonchasi</language>
-			<language type="de_CH">Shvesariya olmonchasi</language>
-			<language type="dje">zarmacha</language>
+			<language type="de_AT">nemis (Avstriya)</language>
+			<language type="de_CH">yuqori nemis (Shveytsariya)</language>
+			<language type="dje">zarma</language>
 			<language type="dsb">quyi sorbcha</language>
-			<language type="dua">dualcha</language>
-			<language type="dyo">yola-fonyicha</language>
-			<language type="dz">yovoncha</language>
-			<language type="ebu">embucha</language>
-			<language type="ee">ivicha</language>
-			<language type="el">yunoncha</language>
+			<language type="dua">duala</language>
+			<language type="dyo">diola-fogni</language>
+			<language type="dz">dzongka</language>
+			<language type="ebu">embu</language>
+			<language type="ee">eve</language>
+			<language type="el">grek</language>
 			<language type="en">inglizcha</language>
-			<language type="en_AU">Avstraliya inglizchasi</language>
-			<language type="en_CA">Kanada inglizchasi</language>
-			<language type="en_GB">Britaniya inglizchasi</language>
-			<language type="en_GB" alt="short">Britaniya inglizchasi</language>
-			<language type="en_US" alt="short">inglizcha (AQSH)</language>
-			<language type="eo">esperantocha</language>
+			<language type="en_AU">ingliz (Avstraliya)</language>
+			<language type="en_CA">ingliz (Kanada)</language>
+			<language type="en_GB">ingliz (Britaniya)</language>
+			<language type="en_GB" alt="short">ingliz (Buyuk Britaniya)</language>
+			<language type="en_US">ingliz (Amerika)</language>
+			<language type="en_US" alt="short">ingliz (AQSH)</language>
+			<language type="eo">esperanto</language>
 			<language type="es">ispancha</language>
-			<language type="es_419">Lotin Amerika ispanchasi</language>
-			<language type="es_ES">Yevropa ispanchasi</language>
-			<language type="es_MX">Meksika ispanchasi</language>
+			<language type="es_419">ispan (Lotin Amerikasi)</language>
+			<language type="es_ES">ispan (Yevropa)</language>
+			<language type="es_MX">ispan (Meksika)</language>
 			<language type="et">estoncha</language>
-			<language type="eu">baskcha</language>
-			<language type="fa">forscha</language>
+			<language type="eu">bask</language>
+			<language type="fa">fors</language>
 			<language type="fi">fincha</language>
 			<language type="fil">filipincha</language>
-			<language type="fj">fijcha</language>
+			<language type="fj">fiji</language>
 			<language type="fo">farercha</language>
 			<language type="fr">fransuzcha</language>
-			<language type="fr_CA">Kanada fransuzchasi</language>
-			<language type="fr_CH">Shvesariya fransuzchasi</language>
-			<language type="fy">gʻarbiy friziancha</language>
-			<language type="ga">irlandcha</language>
-			<language type="gag">gagozcha</language>
-			<language type="gl">galitsiycha</language>
-			<language type="gn">gorancha</language>
-			<language type="gsw">shveysariya nemischasi</language>
-			<language type="gu">gujoratcha</language>
-			<language type="guz">guzcha</language>
-			<language type="gv">mencha</language>
-			<language type="ha">xauscha</language>
+			<language type="fr_CA">fransuz (Kanada)</language>
+			<language type="fr_CH">fransuz (Shveytsariya)</language>
+			<language type="fy">g‘arbiy friz</language>
+			<language type="ga">irland</language>
+			<language type="gag">gagauz</language>
+			<language type="gl">galisiy</language>
+			<language type="gn">guarani</language>
+			<language type="gsw">nemis (Shveytsariya)</language>
+			<language type="gu">gujarot</language>
+			<language type="guz">gusii</language>
+			<language type="gv">men</language>
+			<language type="ha">xausa</language>
 			<language type="haw">gavaycha</language>
 			<language type="he">ibroniy</language>
-			<language type="hi">hindcha</language>
-			<language type="hr">xorvatcha</language>
-			<language type="hsb">yuqori sorbcha</language>
-			<language type="ht">gaitcha</language>
-			<language type="hu">vengrcha</language>
-			<language type="hy">armancha</language>
-			<language type="id">indoneyzcha</language>
-			<language type="ig">igbocha</language>
-			<language type="ii">zichuan yicha</language>
-			<language type="is">islandcha</language>
-			<language type="it">italyancha</language>
-			<language type="iu">inuktitutcha</language>
-			<language type="ja">yaponcha</language>
-			<language type="jgo">ngombcha</language>
-			<language type="jmc">machamcha</language>
-			<language type="jv">yavancha</language>
+			<language type="hi">hind</language>
+			<language type="hr">xorvat</language>
+			<language type="hsb">yuqori sorb</language>
+			<language type="ht">gaityan</language>
+			<language type="hu">venger</language>
+			<language type="hy">arman</language>
+			<language type="id">indonez</language>
+			<language type="ig">igbo</language>
+			<language type="ii">sichuan</language>
+			<language type="is">island</language>
+			<language type="it">italyan</language>
+			<language type="iu">inuktitut</language>
+			<language type="ja">yapon</language>
+			<language type="jgo">ngomba</language>
+			<language type="jmc">machame</language>
+			<language type="jv">yavan</language>
 			<language type="ka">gruzincha</language>
-			<language type="kab">qobilcha</language>
-			<language type="kam">kambcha</language>
-			<language type="kde">maqondiy</language>
-			<language type="kea">kabuverdiancha</language>
-			<language type="khq">qoyra-chincha</language>
-			<language type="ki">kikuycha</language>
+			<language type="kab">kabil</language>
+			<language type="kam">kamba</language>
+			<language type="kde">makonde</language>
+			<language type="kea">kabuverdianu</language>
+			<language type="khq">koyra-chiini</language>
+			<language type="ki">kikuyu</language>
 			<language type="kk">qozoqcha</language>
-			<language type="kl">kalallisutcha</language>
-			<language type="kln">kalenjincha</language>
+			<language type="kl">grenland</language>
+			<language type="kln">kalenjin</language>
 			<language type="km">xmercha</language>
-			<language type="kn">kannadcha</language>
+			<language type="kn">kannada</language>
 			<language type="ko">koreyscha</language>
-			<language type="koi">komi-permyakcha</language>
-			<language type="kok">konkancha</language>
+			<language type="koi">komi-permyak</language>
+			<language type="kok">konkan</language>
 			<language type="ks">kashmircha</language>
-			<language type="ksb">shambalacha</language>
-			<language type="ksf">bafiycha</language>
+			<language type="ksb">shambala</language>
+			<language type="ksf">bafiya</language>
 			<language type="ku">kurdcha</language>
-			<language type="kw">kornishcha</language>
+			<language type="kw">korn</language>
 			<language type="ky">qirgʻizcha</language>
 			<language type="la">lotincha</language>
-			<language type="lag">langcha</language>
+			<language type="lag">langi</language>
 			<language type="lb">lyuksemburgcha</language>
-			<language type="lg">gandcha</language>
-			<language type="lkt">lakotcha</language>
-			<language type="ln">lingalcha</language>
+			<language type="lg">ganda</language>
+			<language type="lkt">lakota</language>
+			<language type="ln">lingala</language>
 			<language type="lo">laoscha</language>
-			<language type="lt">litovcha</language>
-			<language type="lu">luba-katangcha</language>
-			<language type="luo">luocha</language>
-			<language type="luy">luycha</language>
+			<language type="lrc">shimoliy luri</language>
+			<language type="lt">litva</language>
+			<language type="lu">luba-katanga</language>
+			<language type="luo">luo</language>
+			<language type="luy">luhya</language>
 			<language type="lv">latishcha</language>
-			<language type="mas">masaycha</language>
-			<language type="mer">merucha</language>
-			<language type="mfe">morisyencha</language>
-			<language type="mg">malagasiycha</language>
-			<language type="mgh">makuva-mittocha</language>
-			<language type="mgo">metacha</language>
-			<language type="mi">maoriycha</language>
-			<language type="mk">makedoncha</language>
-			<language type="ml">malayamcha</language>
-			<language type="mn">mo‘g‘ulcha</language>
-			<language type="moh">mohaukcha</language>
-			<language type="mr">maratcha</language>
-			<language type="ms">malaycha</language>
-			<language type="mt">maltacha</language>
-			<language type="mua">mundangcha</language>
-			<language type="my">birmancha</language>
-			<language type="naq">namacha</language>
-			<language type="nb">norvegcha bokmal</language>
-			<language type="nd">shimoliy ndebelcha</language>
-			<language type="ne">nepalcha</language>
-			<language type="nl">gollandcha</language>
-			<language type="nl_BE">flamandcha</language>
-			<language type="nmg">kvaziycha</language>
-			<language type="nn">norvegcha ninorsk</language>
-			<language type="nqo">nqoancha</language>
-			<language type="nus">noyrcha</language>
-			<language type="nyn">nyankolcha</language>
-			<language type="om">oromocha</language>
-			<language type="or">oriycha</language>
+			<language type="mas">masay</language>
+			<language type="men">mende</language>
+			<language type="mer">meru</language>
+			<language type="mfe">morisyen</language>
+			<language type="mg">malagasiy</language>
+			<language type="mgh">maxuva-mitto</language>
+			<language type="mgo">meta</language>
+			<language type="mi">maori</language>
+			<language type="mk">makedon</language>
+			<language type="ml">malayalam</language>
+			<language type="mn">mo‘g‘ul</language>
+			<language type="moh">mohauk</language>
+			<language type="mr">maratxi</language>
+			<language type="ms">malay</language>
+			<language type="mt">maltiy</language>
+			<language type="mua">mundang</language>
+			<language type="my">birman</language>
+			<language type="mzn">mazanderan</language>
+			<language type="naq">nama</language>
+			<language type="nb">norveg-bokmal</language>
+			<language type="nd">shimoliy ndebele</language>
+			<language type="nds">quyi nemis</language>
+			<language type="nds_NL">quyi sakson</language>
+			<language type="ne">nepal</language>
+			<language type="nl">golland</language>
+			<language type="nl_BE">flamand</language>
+			<language type="nmg">kvasio</language>
+			<language type="nn">norveg-nyunorsk</language>
+			<language type="nqo">nko</language>
+			<language type="nus">nuer</language>
+			<language type="nyn">nyankole</language>
+			<language type="om">oromo</language>
+			<language type="or">oriya</language>
 			<language type="pa">panjobcha</language>
 			<language type="pl">polyakcha</language>
-			<language type="ps">pushtu tili</language>
+			<language type="ps">pushtu</language>
 			<language type="pt">portugalcha</language>
-			<language type="pt_BR">Braziliya portugalchasi</language>
-			<language type="pt_PT">Yevropa portugalchasi</language>
-			<language type="qu">qvechuancha</language>
-			<language type="quc">qichiancha</language>
-			<language type="rm">romancha</language>
-			<language type="rn">rundcha</language>
+			<language type="pt_BR">portugal (Braziliya)</language>
+			<language type="pt_PT">portugal (Yevropa)</language>
+			<language type="qu">kechua</language>
+			<language type="quc">kiche</language>
+			<language type="rm">romansh</language>
+			<language type="rn">rundi</language>
 			<language type="ro">rumincha</language>
-			<language type="ro_MD">moldovan rumincha</language>
-			<language type="rof">rombacha</language>
+			<language type="ro_MD">moldovan</language>
+			<language type="rof">rombo</language>
 			<language type="ru">ruscha</language>
-			<language type="rw">kinyarvandcha</language>
-			<language type="rwk">ruandcha</language>
-			<language type="sa">sanskritcha</language>
-			<language type="saq">samburcha</language>
-			<language type="sbp">sanguancha</language>
-			<language type="sd">sindxiycha</language>
-			<language type="se">shimoliy semiycha</language>
-			<language type="seh">seniycha</language>
-			<language type="ses">koryaboro senniycha</language>
-			<language type="sg">sangoancha</language>
-			<language type="shi">tachilgitcha</language>
-			<language type="si">sinholcha</language>
+			<language type="rw">kinyaruanda</language>
+			<language type="rwk">ruanda</language>
+			<language type="sa">sanskrit</language>
+			<language type="saq">samburu</language>
+			<language type="sbp">sangu</language>
+			<language type="sd">sindxi</language>
+			<language type="sdh">janubiy kurd</language>
+			<language type="se">shimoliy saam</language>
+			<language type="seh">sena</language>
+			<language type="ses">koyraboro-senni</language>
+			<language type="sg">sango</language>
+			<language type="shi">tashelxit</language>
+			<language type="si">singal</language>
 			<language type="sk">slovakcha</language>
 			<language type="sl">slovencha</language>
-			<language type="sma">janubiy semiycha</language>
-			<language type="smj">luli semiycha</language>
-			<language type="smn">inari semiycha</language>
-			<language type="sms">shkolt semiycha</language>
-			<language type="sn">shoniycha</language>
+			<language type="sma">janubiy saam</language>
+			<language type="smj">lule-saam</language>
+			<language type="smn">inari-saam</language>
+			<language type="sms">skolt-saam</language>
+			<language type="sn">shona</language>
 			<language type="so">somalicha</language>
-			<language type="sq">albancha</language>
+			<language type="sq">alban</language>
 			<language type="sr">serbcha</language>
-			<language type="su">sundancha</language>
-			<language type="sv">shvedcha</language>
-			<language type="sw">svahilcha</language>
-			<language type="swc">kongo svahiliycha</language>
-			<language type="ta">tamilcha</language>
-			<language type="te">telugvancha</language>
-			<language type="teo">tesoancha</language>
-			<language type="tg">tojikcha</language>
-			<language type="th">taycha</language>
-			<language type="ti">tigrincha</language>
-			<language type="tk">turkmancha</language>
-			<language type="to">tongocha</language>
-			<language type="tr">turkcha</language>
-			<language type="tt">tatarcha</language>
-			<language type="twq">tosovoqcha</language>
-			<language type="tzm">markaziy atlas vaqt zonasi</language>
-			<language type="ug">uygʻurcha</language>
-			<language type="uk">ukraincha</language>
-			<language type="und">nomaʼlum til</language>
-			<language type="ur">urducha</language>
-			<language type="uz">oʻzbekcha</language>
-			<language type="vai">vayancha</language>
-			<language type="vi">vyetnamcha</language>
-			<language type="vun">vunjoancha</language>
-			<language type="wo">volofcha</language>
-			<language type="xh">xosancha</language>
-			<language type="xog">sogancha</language>
-			<language type="yo">yorubcha</language>
-			<language type="zgh">standart marokash tamazit</language>
-			<language type="zh">xitoycha</language>
-			<language type="zh_Hans">soddalashtirilgan xitoycha</language>
-			<language type="zh_Hant">anʼanaviy xitoycha</language>
-			<language type="zu">zuluancha</language>
-			<language type="zxx">til tarkibi yoʻq</language>
+			<language type="su">sundan</language>
+			<language type="sv">shved</language>
+			<language type="sw">suaxili</language>
+			<language type="sw_CD">kongo-suaxili</language>
+			<language type="ta">tamil</language>
+			<language type="te">telugu</language>
+			<language type="teo">teso</language>
+			<language type="tg">tojik</language>
+			<language type="th">tay</language>
+			<language type="ti">tigrinya</language>
+			<language type="tk">turkman</language>
+			<language type="to">tongan</language>
+			<language type="tr">turk</language>
+			<language type="tt">tatar</language>
+			<language type="twq">tasavaq</language>
+			<language type="tzm">markaziy atlas tamazigxt</language>
+			<language type="ug">uyg‘ur</language>
+			<language type="uk">ukrain</language>
+			<language type="und">noma’lum til</language>
+			<language type="ur">urdu</language>
+			<language type="uz">o‘zbek</language>
+			<language type="vai">vai</language>
+			<language type="vi">vyetnam</language>
+			<language type="vun">vunjo</language>
+			<language type="wbp">valbiri</language>
+			<language type="wo">volof</language>
+			<language type="xh">kxosa</language>
+			<language type="xog">soga</language>
+			<language type="yo">yoruba</language>
+			<language type="zgh">tamazigxt</language>
+			<language type="zh">xitoy</language>
+			<language type="zh_Hans">soddalashgan xitoy</language>
+			<language type="zh_Hant">an’anaviy xitoy</language>
+			<language type="zu">zulu</language>
+			<language type="zxx">til tarkibi yo‘q</language>
 		</languages>
 		<scripts>
-			<script type="Arab">Arab</script>
-			<script type="Armn">Arman</script>
-			<script type="Beng">Bengali</script>
-			<script type="Bopo">Bopomofo</script>
-			<script type="Brai">Braille</script>
-			<script type="Cyrl">Kiril</script>
-			<script type="Deva">Devangari</script>
-			<script type="Ethi">Habash</script>
-			<script type="Geor">Gruzin</script>
-			<script type="Grek">Yunon</script>
-			<script type="Gujr">Gujarati</script>
-			<script type="Guru">Gurmuxi</script>
-			<script type="Hang">Xangul</script>
-			<script type="Hani">Xan</script>
-			<script type="Hans">Soddalashtirilgan</script>
-			<script type="Hans" alt="stand-alone">Soddalashtirilgan</script>
-			<script type="Hant">Anʼanaviy</script>
-			<script type="Hant" alt="stand-alone">Anʼanaviy</script>
-			<script type="Hebr">Ibroniy</script>
-			<script type="Hira">Xiragana</script>
-			<script type="Jpan">Yapon</script>
-			<script type="Kana">Katakana</script>
-			<script type="Khmr">Xmer</script>
-			<script type="Knda">Kannada</script>
-			<script type="Kore">Koreya</script>
-			<script type="Laoo">Lao</script>
-			<script type="Latn">Lotin</script>
-			<script type="Mlym">Malayalam</script>
-			<script type="Mong">Moʻgʻulcha</script>
-			<script type="Mymr">Myanma</script>
-			<script type="Orya">Oriya</script>
-			<script type="Sinh">Sinxala</script>
-			<script type="Taml">Tamil</script>
-			<script type="Telu">Telugu</script>
-			<script type="Thaa">Taana</script>
-			<script type="Thai">Tay</script>
-			<script type="Tibt">Tibet</script>
-			<script type="Zsym">Ramzlar</script>
-			<script type="Zxxx">Yozilmagan</script>
-			<script type="Zyyy">Umumiy</script>
-			<script type="Zzzz">Nomaʼlum shrift</script>
+			<script type="Arab">arab</script>
+			<script type="Armn">arman</script>
+			<script type="Beng">bengal</script>
+			<script type="Bopo">bopomofo</script>
+			<script type="Brai">Brayl</script>
+			<script type="Cyrl">kirill</script>
+			<script type="Deva">devanagar</script>
+			<script type="Ethi">habash</script>
+			<script type="Geor">gruzin</script>
+			<script type="Grek">grek</script>
+			<script type="Gujr">gujarot</script>
+			<script type="Guru">gurmukxi</script>
+			<script type="Hang">hangul</script>
+			<script type="Hani">xitoy</script>
+			<script type="Hans">soddalashgan xitoy</script>
+			<script type="Hans" alt="stand-alone">soddalashgan xitoy</script>
+			<script type="Hant">an’anaviy xitoy</script>
+			<script type="Hant" alt="stand-alone">an’anaviy xitoy</script>
+			<script type="Hebr">ibroniy</script>
+			<script type="Hira">hiragana</script>
+			<script type="Jpan">yapon</script>
+			<script type="Kana">katakana</script>
+			<script type="Khmr">xmer</script>
+			<script type="Knda">kannada</script>
+			<script type="Kore">koreys</script>
+			<script type="Laoo">laos</script>
+			<script type="Latn">lotin</script>
+			<script type="Mlym">malayalam</script>
+			<script type="Mong">mo‘g‘ul</script>
+			<script type="Mymr">myanma</script>
+			<script type="Orya">oriya</script>
+			<script type="Sinh">singal</script>
+			<script type="Taml">tamil</script>
+			<script type="Telu">telugu</script>
+			<script type="Thaa">taana</script>
+			<script type="Thai">tay</script>
+			<script type="Tibt">tibet</script>
+			<script type="Zsym">belgilar</script>
+			<script type="Zxxx">yozuvsiz</script>
+			<script type="Zyyy">umumiy</script>
+			<script type="Zzzz">noma’lum yozuv</script>
 		</scripts>
 		<territories>
 			<territory type="001">Dunyo</territory>
 			<territory type="002">Afrika</territory>
-			<territory type="003">Shimoli-Amerika</territory>
+			<territory type="003">Shimoliy Amerika</territory>
 			<territory type="005">Janubiy Amerika</territory>
 			<territory type="009">Okeaniya</territory>
-			<territory type="011">Gʻarbiy Afrika</territory>
+			<territory type="011">G‘arbiy Afrika</territory>
 			<territory type="013">Markaziy Amerika</territory>
 			<territory type="014">Sharqiy Afrika</territory>
 			<territory type="015">Shimoliy Afrika</territory>
 			<territory type="017">Markaziy Afrika</territory>
 			<territory type="018">Janubiy Afrika</territory>
 			<territory type="019">Amerika</territory>
-			<territory type="021">Shimoliy Amerika</territory>
+			<territory type="021">Shimoliy Amerika – AQSH va Kanada</territory>
 			<territory type="029">Karib havzasi</territory>
 			<territory type="030">Sharqiy Osiyo</territory>
 			<territory type="034">Janubiy Osiyo</territory>
-			<territory type="035">Janubiy-Sharqiy Osiyo</territory>
+			<territory type="035">Janubi-sharqiy Osiyo</territory>
 			<territory type="039">Janubiy Yevropa</territory>
 			<territory type="053">Avstralaziya</territory>
 			<territory type="054">Melaneziya</territory>
@@ -309,22 +320,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="061">Polineziya</territory>
 			<territory type="142">Osiyo</territory>
 			<territory type="143">Markaziy Osiyo</territory>
-			<territory type="145">Gʻarbiy Osiyo</territory>
+			<territory type="145">G‘arbiy Osiyo</territory>
 			<territory type="150">Yevropa</territory>
 			<territory type="151">Sharqiy Yevropa</territory>
 			<territory type="154">Shimoliy Yevropa</territory>
-			<territory type="155">Gʻarbiy Yevropa</territory>
+			<territory type="155">G‘arbiy Yevropa</territory>
 			<territory type="419">Lotin Amerikasi</territory>
-			<territory type="AC">Vozneseniye oroli</territory>
+			<territory type="AC">Me’roj oroli</territory>
 			<territory type="AD">Andorra</territory>
 			<territory type="AE">Birlashgan Arab Amirliklari</territory>
 			<territory type="AF">Afgʻoniston</territory>
 			<territory type="AG">Antigua va Barbados</territory>
-			<territory type="AI">Angila</territory>
+			<territory type="AI">Angilya</territory>
 			<territory type="AL">Albaniya</territory>
 			<territory type="AM">Armaniston</territory>
 			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarktika</territory>
+			<territory type="AQ">Antarktida</territory>
 			<territory type="AR">Argentina</territory>
 			<territory type="AS">Amerika Samoasi</territory>
 			<territory type="AT">Avstriya</territory>
@@ -341,28 +352,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BH">Bahrayn</territory>
 			<territory type="BI">Burundi</territory>
 			<territory type="BJ">Benin</territory>
-			<territory type="BL">Avliyo Varfolomey</territory>
-			<territory type="BM">Bermuda</territory>
+			<territory type="BL">Sen-Bartelemi</territory>
+			<territory type="BM">Bermuda orollari</territory>
 			<territory type="BN">Bruney</territory>
 			<territory type="BO">Boliviya</territory>
-			<territory type="BQ">Karib Niderlandiyasi</territory>
+			<territory type="BQ">Boneyr, Sint-Estatius va Saba</territory>
 			<territory type="BR">Braziliya</territory>
 			<territory type="BS">Bagama orollari</territory>
 			<territory type="BT">Butan</territory>
-			<territory type="BV">Buvet oroli</territory>
-			<territory type="BW">Botsvanna</territory>
-			<territory type="BY">Belorusiya</territory>
+			<territory type="BV">Buve oroli</territory>
+			<territory type="BW">Botsvana</territory>
+			<territory type="BY">Belarus</territory>
 			<territory type="BZ">Beliz</territory>
 			<territory type="CA">Kanada</territory>
 			<territory type="CC">Kokos (Kiling) orollari</territory>
-			<territory type="CD">Kongo-Kinshasa</territory>
+			<territory type="CD">Kongo – Kinshasa</territory>
 			<territory type="CD" alt="variant">Kongo (KDR)</territory>
 			<territory type="CF">Markaziy Afrika Respublikasi</territory>
-			<territory type="CG">Kongo Brazzavil</territory>
+			<territory type="CG">Kongo – Brazzavil</territory>
 			<territory type="CG" alt="variant">Kongo (Respublika)</territory>
-			<territory type="CH">Shveysariya</territory>
-			<territory type="CI">Kot-d-Ivuar</territory>
-			<territory type="CI" alt="variant">Fil Suyagi Qirgʻogʻi</territory>
+			<territory type="CH">Shveytsariya</territory>
+			<territory type="CI">Kot-d’Ivuar</territory>
+			<territory type="CI" alt="variant">Fil suyagi qirg‘og‘i</territory>
 			<territory type="CK">Kuk orollari</territory>
 			<territory type="CL">Chili</territory>
 			<territory type="CM">Kamerun</territory>
@@ -372,30 +383,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="CR">Kosta-Rika</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Kabo-Verde</territory>
-			<territory type="CW">Kurasao</territory>
+			<territory type="CW">Kyurasao</territory>
 			<territory type="CX">Rojdestvo oroli</territory>
 			<territory type="CY">Kipr</territory>
 			<territory type="CZ">Chexiya Respublikasi</territory>
 			<territory type="DE">Germaniya</territory>
-			<territory type="DG">Diyego Garsiya</territory>
-			<territory type="DJ">Djibuti</territory>
+			<territory type="DG">Diyego-Garsiya</territory>
+			<territory type="DJ">Jibuti</territory>
 			<territory type="DK">Daniya</territory>
 			<territory type="DM">Dominika</territory>
 			<territory type="DO">Dominikan Respublikasi</territory>
 			<territory type="DZ">Jazoir</territory>
-			<territory type="EA">Seyta va Melilla</territory>
+			<territory type="EA">Seuta va Melilya</territory>
 			<territory type="EC">Ekvador</territory>
 			<territory type="EE">Estoniya</territory>
 			<territory type="EG">Misr</territory>
-			<territory type="EH">Gʻarbiy Sahroi Kabir</territory>
+			<territory type="EH">G‘arbiy Sahroi Kabir</territory>
 			<territory type="ER">Eritreya</territory>
 			<territory type="ES">Ispaniya</territory>
 			<territory type="ET">Efiopiya</territory>
 			<territory type="EU">Yevropa Ittifoqi</territory>
-			<territory type="FI">Finlyandiya</territory>
-			<territory type="FJ">Fiji orollari</territory>
+			<territory type="FI">Finlandiya</territory>
+			<territory type="FJ">Fiji</territory>
 			<territory type="FK">Folklend orollari</territory>
-			<territory type="FK" alt="variant">Folklend orollari (Malvin orollari)</territory>
+			<territory type="FK" alt="variant">Folklend (Malvin) orollari</territory>
 			<territory type="FM">Mikroneziya</territory>
 			<territory type="FO">Farer orollari</territory>
 			<territory type="FR">Fransiya</territory>
@@ -404,7 +415,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GB" alt="short">B.Q.</territory>
 			<territory type="GD">Grenada</territory>
 			<territory type="GE">Gruziya</territory>
-			<territory type="GF">Frantsuz Gvianasi</territory>
+			<territory type="GF">Fransuz Gvianasi</territory>
 			<territory type="GG">Gernsi</territory>
 			<territory type="GH">Gana</territory>
 			<territory type="GI">Gibraltar</territory>
@@ -414,14 +425,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GP">Gvadelupe</territory>
 			<territory type="GQ">Ekvatorial Gvineya</territory>
 			<territory type="GR">Gretsiya</territory>
-			<territory type="GS">Janubiy Djordjiya va Janubiy Sendvich orollari</territory>
+			<territory type="GS">Janubiy Georgiya va Janubiy Sendvich orollari</territory>
 			<territory type="GT">Gvatemala</territory>
 			<territory type="GU">Guam</territory>
 			<territory type="GW">Gvineya-Bisau</territory>
 			<territory type="GY">Gayana</territory>
-			<territory type="HK">Gonkong Xitoy MMH</territory>
+			<territory type="HK">Gonkong (Xitoy MMH)</territory>
 			<territory type="HK" alt="short">Gonkong</territory>
-			<territory type="HM">Gerd oroli va MakDonald orollari</territory>
+			<territory type="HM">Xerd va Makdonald orollari</territory>
 			<territory type="HN">Gonduras</territory>
 			<territory type="HR">Xorvatiya</territory>
 			<territory type="HT">Gaiti</territory>
@@ -432,12 +443,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="IL">Isroil</territory>
 			<territory type="IM">Men oroli</territory>
 			<territory type="IN">Hindiston</territory>
-			<territory type="IO">Britaniya Hind okeani hududi</territory>
+			<territory type="IO">Britaniyaning Hind okeanidagi hududi</territory>
 			<territory type="IQ">Iroq</territory>
 			<territory type="IR">Eron</territory>
 			<territory type="IS">Islandiya</territory>
 			<territory type="IT">Italiya</territory>
-			<territory type="JE">Djersi</territory>
+			<territory type="JE">Jersi</territory>
 			<territory type="JM">Yamayka</territory>
 			<territory type="JO">Iordaniya</territory>
 			<territory type="JP">Yaponiya</territory>
@@ -449,7 +460,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="KN">Sent-Kits va Nevis</territory>
 			<territory type="KP">Shimoliy Koreya</territory>
 			<territory type="KR">Janubiy Koreya</territory>
-			<territory type="KW">Quveyt</territory>
+			<territory type="KW">Quvayt</territory>
 			<territory type="KY">Kayman orollari</territory>
 			<territory type="KZ">Qozogʻiston</territory>
 			<territory type="LA">Laos</territory>
@@ -469,15 +480,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ME">Chernogoriya</territory>
 			<territory type="MF">Sent-Martin</territory>
 			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Marshal orollari</territory>
+			<territory type="MH">Marshall orollari</territory>
 			<territory type="MK">Makedoniya</territory>
-			<territory type="MK" alt="variant">Makedoniya (SYUR)</territory>
+			<territory type="MK" alt="variant">Makedoniya (SYRM)</territory>
 			<territory type="ML">Mali</territory>
 			<territory type="MM">Myanma (Birma)</territory>
-			<territory type="MN">Mo‘g‘uliston</territory>
-			<territory type="MO">Makao Xitoy MMH</territory>
+			<territory type="MN">Mongoliya</territory>
+			<territory type="MO">Makao (Xitoy MMH)</territory>
 			<territory type="MO" alt="short">Makao</territory>
-			<territory type="MP">Shimoliy Marianna orollari</territory>
+			<territory type="MP">Shimoliy Mariana orollari</territory>
 			<territory type="MQ">Martinika</territory>
 			<territory type="MR">Mavritaniya</territory>
 			<territory type="MS">Montserrat</territory>
@@ -491,25 +502,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="NA">Namibiya</territory>
 			<territory type="NC">Yangi Kaledoniya</territory>
 			<territory type="NE">Niger</territory>
-			<territory type="NF">Norfolk orollari</territory>
+			<territory type="NF">Norfolk oroli</territory>
 			<territory type="NG">Nigeriya</territory>
 			<territory type="NI">Nikaragua</territory>
 			<territory type="NL">Niderlandiya</territory>
 			<territory type="NO">Norvegiya</territory>
 			<territory type="NP">Nepal</territory>
 			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niuye</territory>
+			<territory type="NU">Niue</territory>
 			<territory type="NZ">Yangi Zelandiya</territory>
-			<territory type="OM">Omon</territory>
+			<territory type="OM">Ummon</territory>
 			<territory type="PA">Panama</territory>
 			<territory type="PE">Peru</territory>
-			<territory type="PF">Frantsuz Polineziyasi</territory>
-			<territory type="PG">Papua Yangi Gvineya</territory>
+			<territory type="PF">Fransuz Polineziyasi</territory>
+			<territory type="PG">Papua – Yangi Gvineya</territory>
 			<territory type="PH">Filippin</territory>
 			<territory type="PK">Pokiston</territory>
 			<territory type="PL">Polsha</territory>
 			<territory type="PM">Sent-Pyer va Mikelon</territory>
-			<territory type="PN">Pitkarin orollari</territory>
+			<territory type="PN">Pitkern orollari</territory>
 			<territory type="PR">Puerto-Riko</territory>
 			<territory type="PS">Falastin hududi</territory>
 			<territory type="PS" alt="short">Falastin</territory>
@@ -518,7 +529,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="PY">Paragvay</territory>
 			<territory type="QA">Qatar</territory>
 			<territory type="QO">Yondosh Okeaniya</territory>
-			<territory type="RE">Reyunon</territory>
+			<territory type="RE">Reyunion</territory>
 			<territory type="RO">Ruminiya</territory>
 			<territory type="RS">Serbiya</territory>
 			<territory type="RU">Rossiya</territory>
@@ -529,9 +540,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="SD">Sudan</territory>
 			<territory type="SE">Shvetsiya</territory>
 			<territory type="SG">Singapur</territory>
-			<territory type="SH">Muqaddas Yelena orollari</territory>
+			<territory type="SH">Muqaddas Yelena oroli</territory>
 			<territory type="SI">Sloveniya</territory>
-			<territory type="SJ">Savlbard va Jan Mayen</territory>
+			<territory type="SJ">Svalbard va Yan-Mayen</territory>
 			<territory type="SK">Slovakiya</territory>
 			<territory type="SL">Syerra-Leone</territory>
 			<territory type="SM">San-Marino</territory>
@@ -541,18 +552,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="SS">Janubiy Sudan</territory>
 			<territory type="ST">San-Tome va Prinsipi</territory>
 			<territory type="SV">Salvador</territory>
-			<territory type="SX">Sint Martin</territory>
+			<territory type="SX">Sint-Marten</territory>
 			<territory type="SY">Suriya</territory>
 			<territory type="SZ">Svazilend</territory>
-			<territory type="TA">Tristan de Kuna</territory>
+			<territory type="TA">Tristan-da-Kunya</territory>
 			<territory type="TC">Turks va Kaykos orollari</territory>
 			<territory type="TD">Chad</territory>
-			<territory type="TF">Frantsiya janubiy xududlari</territory>
+			<territory type="TF">Fransuz Janubiy hududlari</territory>
 			<territory type="TG">Togo</territory>
-			<territory type="TH">Tayland</territory>
+			<territory type="TH">Tailand</territory>
 			<territory type="TJ">Tojikiston</territory>
 			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Sharqiy-Timor</territory>
+			<territory type="TL">Timor</territory>
 			<territory type="TL" alt="variant">Sharqiy Timor</territory>
 			<territory type="TM">Turkmaniston</territory>
 			<territory type="TN">Tunis</territory>
@@ -572,85 +583,98 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="VA">Vatikan</territory>
 			<territory type="VC">Sent-Vinsent va Grenadin</territory>
 			<territory type="VE">Venesuela</territory>
-			<territory type="VG">Britaniya Virdjiniya orollari</territory>
-			<territory type="VI">AQSH Virdjiniya orollari</territory>
+			<territory type="VG">Britaniya Virgin orollari</territory>
+			<territory type="VI">AQSH Virgin orollari</territory>
 			<territory type="VN">Vyetnam</territory>
 			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Uellis va Futuna</territory>
+			<territory type="WF">Uollis va Futuna</territory>
 			<territory type="WS">Samoa</territory>
 			<territory type="XK">Kosovo</territory>
 			<territory type="YE">Yaman</territory>
 			<territory type="YT">Mayotta</territory>
-			<territory type="ZA">Janubi-Afrika</territory>
+			<territory type="ZA">Janubiy Afrika Respublikasi</territory>
 			<territory type="ZM">Zambiya</territory>
 			<territory type="ZW">Zimbabve</territory>
-			<territory type="ZZ">Nomaʼlum hudud</territory>
+			<territory type="ZZ">Noma’lum mintaqa</territory>
 		</territories>
 		<keys>
-			<key type="calendar">Taqvim</key>
-			<key type="collation">Saralash tartibi</key>
-			<key type="currency">Valyuta</key>
-			<key type="numbers">Raqamlar</key>
+			<key type="calendar">taqvim</key>
+			<key type="collation">saralash tartibi</key>
+			<key type="currency">valyuta</key>
+			<key type="hc">soat tizimi (12 yoki 24)</key>
+			<key type="lb">qatorni uzish uslubi</key>
+			<key type="ms">o‘lchov tizimi</key>
+			<key type="numbers">raqamlar</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Arab-hind raqamlari</type>
-			<type type="arabext" key="numbers">Kengaytirilgan arab-hind raqamlari</type>
-			<type type="armn" key="numbers">Arman sonlari</type>
-			<type type="armnlow" key="numbers">Arman kichik sonlari</type>
-			<type type="beng" key="numbers">Bengali raqamlari</type>
-			<type type="buddhist" key="calendar">buddistcha taqvim</type>
-			<type type="chinese" key="calendar">xitoycha taqvim</type>
-			<type type="dangi" key="calendar">dangiycha taqvim</type>
-			<type type="deva" key="numbers">Devanagari raqamlari</type>
-			<type type="ducet" key="collation">standart yunikod saralash tartibi</type>
-			<type type="ethi" key="numbers">Habash sonlari</type>
-			<type type="ethiopic" key="calendar">efiopcha taqvim</type>
-			<type type="fullwide" key="numbers">Toʻliq kenglikdagi raqamlar</type>
-			<type type="geor" key="numbers">Gruzin sonlari</type>
-			<type type="gregorian" key="calendar">grigoriancha taqvim</type>
-			<type type="grek" key="numbers">Yunon sonlari</type>
-			<type type="greklow" key="numbers">Yunon kichik raqamlari</type>
-			<type type="gujr" key="numbers">Gujarati raqamlari</type>
-			<type type="guru" key="numbers">Gurmuxi raqamlari</type>
-			<type type="hanidec" key="numbers">Xitoy oʻnlik sonlari</type>
-			<type type="hans" key="numbers">Soddalashtirilgan Xitoy sonlari</type>
-			<type type="hansfin" key="numbers">Soddalashtirilgan Xitoy moliya sonlari</type>
-			<type type="hant" key="numbers">Anʼanaviy Xitoy sonlari</type>
-			<type type="hantfin" key="numbers">Anʼanaviy Xitoy moliya sonlari</type>
-			<type type="hebr" key="numbers">Ibroniy sonlari</type>
-			<type type="hebrew" key="calendar">ibroniy taqvim</type>
-			<type type="islamic" key="calendar">islomiy taqvim</type>
-			<type type="iso8601" key="calendar">iso8601 taqvimi</type>
-			<type type="japanese" key="calendar">yaponcha taqvim</type>
-			<type type="jpan" key="numbers">Yaponiya sonlari</type>
-			<type type="jpanfin" key="numbers">Yaponiya moliya sonlari</type>
-			<type type="khmr" key="numbers">Xmer raqamlari</type>
-			<type type="knda" key="numbers">Kannada raqamlari</type>
-			<type type="laoo" key="numbers">Lao raqamlari</type>
-			<type type="latn" key="numbers">Gʻarb raqamlari</type>
-			<type type="mlym" key="numbers">Malayalam raqamlari</type>
-			<type type="mymr" key="numbers">Myanma raqamlari</type>
-			<type type="orya" key="numbers">Oriya raqamlari</type>
-			<type type="persian" key="calendar">forscha taqvim</type>
-			<type type="roc" key="calendar">xitoy respublikasi taqvimi</type>
-			<type type="roman" key="numbers">Rim sonlari</type>
-			<type type="romanlow" key="numbers">Rim kichik sonlari</type>
-			<type type="search" key="collation">umumiy qidiruv</type>
-			<type type="standard" key="collation">Standart tariblash</type>
-			<type type="taml" key="numbers">Anʼanaviy Tamil sonlari</type>
-			<type type="tamldec" key="numbers">Tamil raqamlari</type>
-			<type type="telu" key="numbers">Telugu raqamlari</type>
-			<type type="thai" key="numbers">Tay raqamlari</type>
-			<type type="tibt" key="numbers">Tibet raqamlari</type>
+			<type key="calendar" type="buddhist">buddistlar taqvimi</type>
+			<type key="calendar" type="chinese">xitoy taqvimi</type>
+			<type key="calendar" type="dangi">dangi taqvimi</type>
+			<type key="calendar" type="ethiopic">habash taqvimi</type>
+			<type key="calendar" type="gregorian">grigorian taqvimi</type>
+			<type key="calendar" type="hebrew">ibroniy taqvim</type>
+			<type key="calendar" type="islamic">islomiy taqvim</type>
+			<type key="calendar" type="iso8601">ISO-8601 taqvimi</type>
+			<type key="calendar" type="japanese">yapon taqvimi</type>
+			<type key="calendar" type="persian">fors taqvimi</type>
+			<type key="calendar" type="roc">xitoy taqvimi</type>
+			<type key="collation" type="ducet">standart YUNIKOD saralash tartibi</type>
+			<type key="collation" type="search">qidiruv</type>
+			<type key="collation" type="standard">standart saralash tartibi</type>
+			<type key="hc" type="h11">12 soatlik tizim (0–11)</type>
+			<type key="hc" type="h12">12 soatlik tizim (1–12)</type>
+			<type key="hc" type="h23">24 soatlik tizim (0–23)</type>
+			<type key="hc" type="h24">24 soatlik tizim (1–24)</type>
+			<type key="lb" type="loose">qatorni yumshoq uzish</type>
+			<type key="lb" type="normal">qatorni odatiy uzish</type>
+			<type key="lb" type="strict">qatorni qat’iy uzish</type>
+			<type key="ms" type="metric">metrik tizim</type>
+			<type key="ms" type="uksystem">Britaniya o‘lchov tizimi</type>
+			<type key="ms" type="ussystem">AQSH o‘lchov tizimi</type>
+			<type key="numbers" type="arab">arab-hind raqamlari</type>
+			<type key="numbers" type="arabext">kengaytirilgan arab-hind raqamlari</type>
+			<type key="numbers" type="armn">arman raqamlari</type>
+			<type key="numbers" type="armnlow">arman kichik raqamlari</type>
+			<type key="numbers" type="beng">bengal raqamlari</type>
+			<type key="numbers" type="deva">devanagar raqamlari</type>
+			<type key="numbers" type="ethi">habash raqamlari</type>
+			<type key="numbers" type="fullwide">to‘liq kenglikdagi raqamlar</type>
+			<type key="numbers" type="geor">gruzin raqamlari</type>
+			<type key="numbers" type="grek">grek raqamlari</type>
+			<type key="numbers" type="greklow">kichik grek raqamlari</type>
+			<type key="numbers" type="gujr">gujarot raqamlari</type>
+			<type key="numbers" type="guru">gurmukxi raqamlari</type>
+			<type key="numbers" type="hanidec">xitoy o‘nli raqamlari</type>
+			<type key="numbers" type="hans">soddalashgan xitoy raqamlari</type>
+			<type key="numbers" type="hansfin">soddalashgan xitoy raqamlari (moliyaviy)</type>
+			<type key="numbers" type="hant">an’anaviy xitoy raqamlari</type>
+			<type key="numbers" type="hantfin">an’anaviy xitoy raqamlari (moliyaviy)</type>
+			<type key="numbers" type="hebr">ibroniy raqamlar</type>
+			<type key="numbers" type="jpan">yapon raqamlari</type>
+			<type key="numbers" type="jpanfin">yapon raqamlari (moliyaviy)</type>
+			<type key="numbers" type="khmr">xmer raqamlari</type>
+			<type key="numbers" type="knda">kannada raqamlari</type>
+			<type key="numbers" type="laoo">laos raqamlari</type>
+			<type key="numbers" type="latn">zamonaviy arab raqamlari</type>
+			<type key="numbers" type="mlym">malayalam raqamlari</type>
+			<type key="numbers" type="mymr">birman raqamlari</type>
+			<type key="numbers" type="orya">oriya raqamlari</type>
+			<type key="numbers" type="roman">rim raqamlari</type>
+			<type key="numbers" type="romanlow">kichik rim raqamlari</type>
+			<type key="numbers" type="taml">an’anaviy tamil raqamlari</type>
+			<type key="numbers" type="tamldec">tamil raqamlari</type>
+			<type key="numbers" type="telu">telugu raqamlari</type>
+			<type key="numbers" type="thai">tay raqamlari</type>
+			<type key="numbers" type="tibt">tibet raqamlari</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Metrik</measurementSystemName>
-			<measurementSystemName type="UK">BQ</measurementSystemName>
+			<measurementSystemName type="UK">Buyuk Britaniya</measurementSystemName>
 			<measurementSystemName type="US">AQSH</measurementSystemName>
 		</measurementSystemNames>
 		<codePatterns>
 			<codePattern type="language">Til: {0}</codePattern>
-			<codePattern type="script">Skript: {0}</codePattern>
+			<codePattern type="script">Yozuv: {0}</codePattern>
 			<codePattern type="territory">Mintaqa: {0}</codePattern>
 		</codePatterns>
 	</localeDisplayNames>
@@ -668,10 +692,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<moreInformation>?</moreInformation>
 	</characters>
 	<delimiters>
-		<quotationStart>&quot;</quotationStart>
-		<quotationEnd>&quot;</quotationEnd>
-		<alternateQuotationStart>'</alternateQuotationStart>
-		<alternateQuotationEnd>'</alternateQuotationEnd>
+		<quotationStart>“</quotationStart>
+		<quotationEnd>”</quotationEnd>
+		<alternateQuotationStart>’</alternateQuotationStart>
+		<alternateQuotationEnd>‘</alternateQuotationEnd>
 	</delimiters>
 	<dates>
 		<calendars>
@@ -679,69 +703,72 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern>EEEE, G y MMMM dd</pattern>
+							<pattern>EEEE, d-MMMM, G y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
-							<pattern>G y MMMM d</pattern>
+							<pattern>d-MMMM, G y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern>G y MMM d</pattern>
+							<pattern>d-MMM, G y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>GGGGG y/MM/dd</pattern>
+							<pattern>GGGGG dd/MM/y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d, E</dateFormatItem>
 						<dateFormatItem id="Gy">G y</dateFormatItem>
-						<dateFormatItem id="GyMMM">G y MMM</dateFormatItem>
-						<dateFormatItem id="GyMMMd">G y MMM d</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">G y MMM d, E</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">MM-dd</dateFormatItem>
-						<dateFormatItem id="MEd">MM-dd, E</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM, G y</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d-MMM, G y</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d-MMM, G y</dateFormatItem>
+						<dateFormatItem id="M">LL</dateFormatItem>
+						<dateFormatItem id="Md">dd/MM</dateFormatItem>
+						<dateFormatItem id="MEd">E, dd/MM</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
-						<dateFormatItem id="MMMEd">MMM d, E</dateFormatItem>
+						<dateFormatItem id="MMMd">d-MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, d-MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d-MMMM</dateFormatItem>
 						<dateFormatItem id="y">G y</dateFormatItem>
 						<dateFormatItem id="yyyy">G y</dateFormatItem>
-						<dateFormatItem id="yyyyM">GGGGG y-MM</dateFormatItem>
-						<dateFormatItem id="yyyyMd">GGGGG y-MM-dd</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">GGGGG y-MM-dd, E</dateFormatItem>
-						<dateFormatItem id="yyyyMMM">G y MMM</dateFormatItem>
-						<dateFormatItem id="yyyyMMMd">G y MMM d</dateFormatItem>
-						<dateFormatItem id="yyyyMMMEd">G y MMM d, E</dateFormatItem>
-						<dateFormatItem id="yyyyQQQ">G y QQQ</dateFormatItem>
-						<dateFormatItem id="yyyyQQQQ">G y QQQQ</dateFormatItem>
+						<dateFormatItem id="yyyyM">MM/y (GGGGG)</dateFormatItem>
+						<dateFormatItem id="yyyyMd">dd/MM/y (GGGGG)</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E, dd/MM/y (GGGGG)</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">MMM, G y</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">d-MMM, G y</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">E, d-MMM, G y</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">MMMM, G y</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">y (G), QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">y (G), QQQQ</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
@@ -752,58 +779,58 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">MM–MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d">MM-dd – MM-dd</greatestDifference>
-							<greatestDifference id="M">MM-dd – MM-dd</greatestDifference>
+							<greatestDifference id="d">dd/MM – dd/MM</greatestDifference>
+							<greatestDifference id="M">dd/MM – dd/MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">MM-dd, E – MM-dd, E</greatestDifference>
-							<greatestDifference id="M">MM-dd, E – MM-dd, E</greatestDifference>
+							<greatestDifference id="d">E, dd/MM – E, dd/MM</greatestDifference>
+							<greatestDifference id="M">E, dd/MM – E, dd/MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL–LLL</greatestDifference>
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MMM d–d</greatestDifference>
-							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
+							<greatestDifference id="d">d – d-MMM</greatestDifference>
+							<greatestDifference id="M">d-MMM – d-MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="M">MMM d, E – MMM d, E</greatestDifference>
+							<greatestDifference id="d">E, d-MMM – E, d-MMM</greatestDifference>
+							<greatestDifference id="M">E, d-MMM – E, d-MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
 							<greatestDifference id="y">G y–y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">GGGGG y-MM – y-MM</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM – y-MM</greatestDifference>
+							<greatestDifference id="M">MM/y – MM/y (GGGGG)</greatestDifference>
+							<greatestDifference id="y">MM/y – MM/y (GGGGG)</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="M">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="d">dd/MM/y – dd/MM/y (GGGGG)</greatestDifference>
+							<greatestDifference id="M">dd/MM/y – dd/MM/y (GGGGG)</greatestDifference>
+							<greatestDifference id="y">dd/MM/y – dd/MM/y (GGGGG)</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="M">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
+							<greatestDifference id="d">E, dd/MM/y – E, dd/MM/y (GGGGG)</greatestDifference>
+							<greatestDifference id="M">E, dd/MM/y – E, dd/MM/y (GGGGG)</greatestDifference>
+							<greatestDifference id="y">E, dd/MM/y – E, dd/MM/y (GGGGG)</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">G y MMM–MMM</greatestDifference>
-							<greatestDifference id="y">G y MMM – y MMM</greatestDifference>
+							<greatestDifference id="M">MMM – MMM, G y</greatestDifference>
+							<greatestDifference id="y">MMM, y – MMM, y (G)</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">G y MMM d–d</greatestDifference>
-							<greatestDifference id="M">G y MMM d – MMM d</greatestDifference>
-							<greatestDifference id="y">G y MMM d – y MMM d</greatestDifference>
+							<greatestDifference id="d">d – d-MMM, G y</greatestDifference>
+							<greatestDifference id="M">d-MMM – d-MMM, G y</greatestDifference>
+							<greatestDifference id="y">d-MMM, y – d-MMM, y (G)</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">G y MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="M">G y MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="y">G y MMM d, E – y MMM d, E</greatestDifference>
+							<greatestDifference id="d">E, d-MMM – E, d-MMM, y (G)</greatestDifference>
+							<greatestDifference id="M">E, d-MMM – E, d-MMM, y (G)</greatestDifference>
+							<greatestDifference id="y">E, d-MMM, y – E, d-MMM, y (G)</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">G y MMMM–MMMM</greatestDifference>
-							<greatestDifference id="y">G y MMMM – y MMMM</greatestDifference>
+							<greatestDifference id="M">MMMM – MMMM, y (G)</greatestDifference>
+							<greatestDifference id="y">MMMM, y – MMMM, y (G)</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -812,18 +839,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<months>
 					<monthContext type="format">
 						<monthWidth type="abbreviated">
-							<month type="1">Yanv</month>
-							<month type="2">Fev</month>
-							<month type="3">Mar</month>
-							<month type="4">Apr</month>
-							<month type="5">May</month>
-							<month type="6">Iyun</month>
-							<month type="7">Iyul</month>
-							<month type="8">Avg</month>
-							<month type="9">Sen</month>
-							<month type="10">Okt</month>
-							<month type="11">Noya</month>
-							<month type="12">Dek</month>
+							<month type="1">yan</month>
+							<month type="2">fev</month>
+							<month type="3">mar</month>
+							<month type="4">apr</month>
+							<month type="5">may</month>
+							<month type="6">iyn</month>
+							<month type="7">iyl</month>
+							<month type="8">avg</month>
+							<month type="9">sen</month>
+							<month type="10">okt</month>
+							<month type="11">noy</month>
+							<month type="12">dek</month>
 						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">Y</month>
@@ -840,18 +867,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="12">D</month>
 						</monthWidth>
 						<monthWidth type="wide">
-							<month type="1">Yanvar</month>
-							<month type="2">Fevral</month>
-							<month type="3">Mart</month>
-							<month type="4">Aprel</month>
-							<month type="5">May</month>
-							<month type="6">Iyun</month>
-							<month type="7">Iyul</month>
-							<month type="8">Avgust</month>
+							<month type="1">yanvar</month>
+							<month type="2">fevral</month>
+							<month type="3">mart</month>
+							<month type="4">aprel</month>
+							<month type="5">may</month>
+							<month type="6">iyun</month>
+							<month type="7">iyul</month>
+							<month type="8">avgust</month>
 							<month type="9">Sentabr</month>
 							<month type="10">Oktabr</month>
-							<month type="11">Noyabr</month>
-							<month type="12">Dekabr</month>
+							<month type="11">noyabr</month>
+							<month type="12">dekabr</month>
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
@@ -902,51 +929,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<days>
 					<dayContext type="format">
 						<dayWidth type="abbreviated">
-							<day type="sun">Yaksh</day>
-							<day type="mon">Dush</day>
-							<day type="tue">Sesh</day>
-							<day type="wed">Chor</day>
-							<day type="thu">Pay</day>
-							<day type="fri">Jum</day>
-							<day type="sat">Shan</day>
-						</dayWidth>
-						<dayWidth type="narrow">
-							<day type="sun">Y</day>
-							<day type="mon">D</day>
-							<day type="tue">S</day>
-							<day type="wed">C</day>
-							<day type="thu">P</day>
-							<day type="fri">J</day>
-							<day type="sat">S</day>
-						</dayWidth>
-						<dayWidth type="short">
-							<day type="sun">Yaksh</day>
-							<day type="mon">Dush</day>
-							<day type="tue">Sesh</day>
-							<day type="wed">Chor</day>
-							<day type="thu">Pay</day>
-							<day type="fri">Jum</day>
-							<day type="sat">Shan</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">yakshanba</day>
-							<day type="mon">dushanba</day>
-							<day type="tue">seshanba</day>
-							<day type="wed">chorshanba</day>
-							<day type="thu">payshanba</day>
-							<day type="fri">juma</day>
-							<day type="sat">shanba</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="abbreviated">
-							<day type="sun">Yaksh</day>
-							<day type="mon">Dush</day>
-							<day type="tue">Sesh</day>
-							<day type="wed">Chor</day>
-							<day type="thu">Pay</day>
-							<day type="fri">Jum</day>
-							<day type="sat">Shan</day>
+							<day type="sun">Ya</day>
+							<day type="mon">Du</day>
+							<day type="tue">Se</day>
+							<day type="wed">Ch</day>
+							<day type="thu">Pa</day>
+							<day type="fri">Ju</day>
+							<day type="sat">Sh</day>
 						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun">Y</day>
@@ -961,10 +950,48 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<day type="sun">Ya</day>
 							<day type="mon">Du</day>
 							<day type="tue">Se</day>
-							<day type="wed">Cho</day>
+							<day type="wed">Ch</day>
 							<day type="thu">Pa</day>
 							<day type="fri">Ju</day>
-							<day type="sat">Sha</day>
+							<day type="sat">Sh</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun">yakshanba</day>
+							<day type="mon">dushanba</day>
+							<day type="tue">seshanba</day>
+							<day type="wed">chorshanba</day>
+							<day type="thu">payshanba</day>
+							<day type="fri">juma</day>
+							<day type="sat">shanba</day>
+						</dayWidth>
+					</dayContext>
+					<dayContext type="stand-alone">
+						<dayWidth type="abbreviated">
+							<day type="sun">Ya</day>
+							<day type="mon">Du</day>
+							<day type="tue">Se</day>
+							<day type="wed">Ch</day>
+							<day type="thu">Pa</day>
+							<day type="fri">Ju</day>
+							<day type="sat">Sh</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun">Y</day>
+							<day type="mon">D</day>
+							<day type="tue">S</day>
+							<day type="wed">C</day>
+							<day type="thu">P</day>
+							<day type="fri">J</day>
+							<day type="sat">S</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">Ya</day>
+							<day type="mon">Du</day>
+							<day type="tue">Se</day>
+							<day type="wed">Ch</day>
+							<day type="thu">Pa</day>
+							<day type="fri">Ju</day>
+							<day type="sat">Sh</day>
 						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">yakshanba</day>
@@ -1021,28 +1048,80 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">o</dayPeriod>
-							<dayPeriod type="noon">t.p.</dayPeriod>
-							<dayPeriod type="pm">k</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">yarim kechasi</dayPeriod>
 							<dayPeriod type="am">TO</dayPeriod>
 							<dayPeriod type="noon">tush payti</dayPeriod>
 							<dayPeriod type="pm">TK</dayPeriod>
+							<dayPeriod type="morning1">ertalab</dayPeriod>
+							<dayPeriod type="afternoon1">kunduzi</dayPeriod>
+							<dayPeriod type="evening1">kechqurun</dayPeriod>
+							<dayPeriod type="night1">kechasi</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">yarim kechasi</dayPeriod>
+							<dayPeriod type="am">TO</dayPeriod>
+							<dayPeriod type="noon">tush payti</dayPeriod>
+							<dayPeriod type="pm">TK</dayPeriod>
+							<dayPeriod type="morning1">ertalab</dayPeriod>
+							<dayPeriod type="afternoon1">kunduzi</dayPeriod>
+							<dayPeriod type="evening1">kechqurun</dayPeriod>
+							<dayPeriod type="night1">kechasi</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">yarim kechasi</dayPeriod>
+							<dayPeriod type="am">TO</dayPeriod>
+							<dayPeriod type="noon">tush payti</dayPeriod>
+							<dayPeriod type="pm">TK</dayPeriod>
+							<dayPeriod type="morning1">ertalab</dayPeriod>
+							<dayPeriod type="afternoon1">kunduzi</dayPeriod>
+							<dayPeriod type="evening1">kechqurun</dayPeriod>
+							<dayPeriod type="night1">kechasi</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">yarim kechasi</dayPeriod>
+							<dayPeriod type="am">TO</dayPeriod>
+							<dayPeriod type="noon">tush payti</dayPeriod>
+							<dayPeriod type="pm">TK</dayPeriod>
+							<dayPeriod type="morning1">ertalab</dayPeriod>
+							<dayPeriod type="afternoon1">kunduzi</dayPeriod>
+							<dayPeriod type="evening1">kechqurun</dayPeriod>
+							<dayPeriod type="night1">kechasi</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">yarim kechasi</dayPeriod>
+							<dayPeriod type="am">TO</dayPeriod>
+							<dayPeriod type="noon">tush payti</dayPeriod>
+							<dayPeriod type="pm">TK</dayPeriod>
+							<dayPeriod type="morning1">ertalab</dayPeriod>
+							<dayPeriod type="afternoon1">kunduzi</dayPeriod>
+							<dayPeriod type="evening1">kechqurun</dayPeriod>
+							<dayPeriod type="night1">kechasi</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">yarim kechasi</dayPeriod>
+							<dayPeriod type="am">TO</dayPeriod>
+							<dayPeriod type="noon">tush payti</dayPeriod>
+							<dayPeriod type="pm">TK</dayPeriod>
+							<dayPeriod type="morning1">ertalab</dayPeriod>
+							<dayPeriod type="afternoon1">kunduzi</dayPeriod>
+							<dayPeriod type="evening1">kechqurun</dayPeriod>
+							<dayPeriod type="night1">kechasi</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
-						<era type="0">M.A.</era>
-						<era type="0" alt="variant">Eramizdan avvalgi</era>
+						<era type="0">miloddan avvalgi</era>
+						<era type="0" alt="variant">eramizdan avvalgi</era>
+						<era type="1">milodiy</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0">M.A.</era>
-						<era type="0" alt="variant">Eramizdan avvalgi</era>
-						<era type="1">E</era>
-						<era type="1" alt="variant">CE</era>
+						<era type="0">m.a.</era>
+						<era type="0" alt="variant">e.a.</era>
+						<era type="1">milodiy</era>
 					</eraAbbr>
 				</eras>
 				<dateFormats>
@@ -1053,29 +1132,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
-							<pattern>y MMMM d</pattern>
+							<pattern>d-MMMM, y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern>y MMM d</pattern>
+							<pattern>d-MMM, y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
+							<pattern>dd/MM/yy</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
+							<pattern>H:mm:ss (zzzz)</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
+							<pattern>H:mm:ss (z)</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
@@ -1092,58 +1171,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
 						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d, E</dateFormatItem>
-						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
-						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
-						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="Ehm">E, h:mm a</dateFormatItem>
+						<dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
+						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">G y</dateFormatItem>
-						<dateFormatItem id="GyMMM">G y MMM</dateFormatItem>
-						<dateFormatItem id="GyMMMd">G y MMM d</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">G y MMM d, E</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM, G y</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d-MMM, G y</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d-MMM, G y</dateFormatItem>
 						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">HH</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">MM-dd</dateFormatItem>
-						<dateFormatItem id="MEd">MM-dd, E</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss (v)</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss (v)</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm (v)</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm (v)</dateFormatItem>
+						<dateFormatItem id="M">LL</dateFormatItem>
+						<dateFormatItem id="Md">dd/MM</dateFormatItem>
+						<dateFormatItem id="MEd">E, dd/MM</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
-						<dateFormatItem id="MMMEd">MMM d, E</dateFormatItem>
+						<dateFormatItem id="MMMd">d-MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, d-MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d-MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">y-MM</dateFormatItem>
-						<dateFormatItem id="yMd">y-MM-dd</dateFormatItem>
-						<dateFormatItem id="yMEd">y-MM-dd, E</dateFormatItem>
-						<dateFormatItem id="yMMM">y MMM</dateFormatItem>
-						<dateFormatItem id="yMMMd">y MMM d</dateFormatItem>
-						<dateFormatItem id="yMMMEd">y MMM d, E</dateFormatItem>
-						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
-						<dateFormatItem id="yQQQQ">y QQQQ</dateFormatItem>
+						<dateFormatItem id="yM">MM/y</dateFormatItem>
+						<dateFormatItem id="yMd">dd/MM/y</dateFormatItem>
+						<dateFormatItem id="yMEd">E, dd/MM/y</dateFormatItem>
+						<dateFormatItem id="yMMM">MMM, y</dateFormatItem>
+						<dateFormatItem id="yMMMd">d-MMM, y</dateFormatItem>
+						<dateFormatItem id="yMMMEd">E, d-MMM, y</dateFormatItem>
+						<dateFormatItem id="yMMMM">MMMM, y</dateFormatItem>
+						<dateFormatItem id="yQQQ">y, QQQ</dateFormatItem>
+						<dateFormatItem id="yQQQQ">y, QQQQ</dateFormatItem>
 					</availableFormats>
 					<appendItems>
 						<appendItem request="Timezone">{0} {1}</appendItem>
@@ -1186,61 +1271,61 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="H">HH–HH v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
-							<greatestDifference id="M">MM–MM</greatestDifference>
+							<greatestDifference id="M">M–M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d">MM-dd – MM-dd</greatestDifference>
-							<greatestDifference id="M">MM-dd – MM-dd</greatestDifference>
+							<greatestDifference id="d">dd/MM – dd/MM</greatestDifference>
+							<greatestDifference id="M">dd/MM – dd/MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">MM-dd, E – MM-dd, E</greatestDifference>
-							<greatestDifference id="M">MM-dd, E – MM-dd, E</greatestDifference>
+							<greatestDifference id="d">E, dd/MM – E, dd/MM</greatestDifference>
+							<greatestDifference id="M">E, dd/MM – E, dd/MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL–LLL</greatestDifference>
+							<greatestDifference id="M">MMM–MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MMM d–d</greatestDifference>
-							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
+							<greatestDifference id="d">d – d-MMM</greatestDifference>
+							<greatestDifference id="M">d-MMM – d-MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="M">MMM d, E – MMM d, E</greatestDifference>
+							<greatestDifference id="d">E, d-MMM – E, d-MMM</greatestDifference>
+							<greatestDifference id="M">E, d-MMM – E, d-MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
 							<greatestDifference id="y">y–y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">y-MM – y-MM</greatestDifference>
-							<greatestDifference id="y">y-MM – y-MM</greatestDifference>
+							<greatestDifference id="M">MM/y – MM/y</greatestDifference>
+							<greatestDifference id="y">MM/y – MM/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="M">y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="y">y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="d">dd/MM/y – dd/MM/y</greatestDifference>
+							<greatestDifference id="M">dd/MM/y – dd/MM/y</greatestDifference>
+							<greatestDifference id="y">dd/MM/y – dd/MM/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="M">y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="y">y-MM-dd, E – y-MM-dd, E</greatestDifference>
+							<greatestDifference id="d">E, dd/MM/y – E, dd/MM/y</greatestDifference>
+							<greatestDifference id="M">E, dd/MM/y – E, dd/MM/y</greatestDifference>
+							<greatestDifference id="y">E, dd/MM/y – E, dd/MM/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">y MMM–MMM</greatestDifference>
-							<greatestDifference id="y">y MMM – y MMM</greatestDifference>
+							<greatestDifference id="M">MMM – MMM, y</greatestDifference>
+							<greatestDifference id="y">MMM, y – MMM, y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">y MMM d–d</greatestDifference>
-							<greatestDifference id="M">y MMM d – MMM d</greatestDifference>
-							<greatestDifference id="y">y MMM d – y MMM d</greatestDifference>
+							<greatestDifference id="d">d – d-MMM, y</greatestDifference>
+							<greatestDifference id="M">d-MMM – d-MMM, y</greatestDifference>
+							<greatestDifference id="y">d-MMM, y – d-MMM, y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">y MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="M">y MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="y">y MMM d, E – y MMM d, E</greatestDifference>
+							<greatestDifference id="d">E, d-MMM – E, d-MMM, y</greatestDifference>
+							<greatestDifference id="M">E, d-MMM – E, d-MMM, y</greatestDifference>
+							<greatestDifference id="y">E, d-MMM, y – E, d-MMM, y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">y MMMM–MMMM</greatestDifference>
-							<greatestDifference id="y">y MMMM – y MMMM</greatestDifference>
+							<greatestDifference id="M">MMMM – MMMM, y</greatestDifference>
+							<greatestDifference id="y">MMMM, y – MMMM, y</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -1268,85 +1353,149 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</calendars>
 		<fields>
 			<field type="era">
-				<displayName>Era</displayName>
+				<displayName>era</displayName>
 			</field>
 			<field type="year">
-				<displayName>Yil</displayName>
+				<displayName>yil</displayName>
 				<relative type="-1">oʻtgan yil</relative>
 				<relative type="0">bu yil</relative>
 				<relative type="1">keyingi yil</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} yildan soʻng</relativeTimePattern>
-					<relativeTimePattern count="other">{0} yildan soʻng</relativeTimePattern>
+					<relativeTimePattern count="other">{0} yildan so‘ng</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} yil avval</relativeTimePattern>
-					<relativeTimePattern count="other">{0} yil avval</relativeTimePattern>
+					<relativeTimePattern count="one">{0} yil oldin</relativeTimePattern>
+					<relativeTimePattern count="other">{0} yil oldin</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="year-short">
-				<displayName>Yil</displayName>
+				<displayName>yil</displayName>
+				<relative type="-1">oʻtgan yil</relative>
+				<relative type="0">bu yil</relative>
+				<relative type="1">keyingi yil</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} yildan soʻng</relativeTimePattern>
-					<relativeTimePattern count="other">{0} yildan soʻng</relativeTimePattern>
+					<relativeTimePattern count="other">{0} yildan so‘ng</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} yil avval</relativeTimePattern>
-					<relativeTimePattern count="other">{0} yil avval</relativeTimePattern>
+					<relativeTimePattern count="one">{0} yil oldin</relativeTimePattern>
+					<relativeTimePattern count="other">{0} yil oldin</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="year-narrow">
-				<displayName>Yil</displayName>
-			</field>
-			<field type="quarter">
-				<displayName>Chorak</displayName>
+				<displayName>yil</displayName>
+				<relative type="-1">oʻtgan yil</relative>
+				<relative type="0">bu yil</relative>
+				<relative type="1">keyingi yil</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} chorakda</relativeTimePattern>
-					<relativeTimePattern count="other">{0} chorakda</relativeTimePattern>
+					<relativeTimePattern count="one">{0} yildan so‘ng</relativeTimePattern>
+					<relativeTimePattern count="other">{0} yildan so‘ng</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} chorak avval</relativeTimePattern>
-					<relativeTimePattern count="other">{0} chorak avval</relativeTimePattern>
+					<relativeTimePattern count="one">{0} yil oldin</relativeTimePattern>
+					<relativeTimePattern count="other">{0} yil oldin</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter">
+				<displayName>chorak</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} chorakdan so‘ng</relativeTimePattern>
+					<relativeTimePattern count="other">{0} chorakdan so‘ng</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} chorak oldin</relativeTimePattern>
+					<relativeTimePattern count="other">{0} chorak oldin</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-short">
+				<displayName>ch</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} chorakdan so‘ng</relativeTimePattern>
+					<relativeTimePattern count="other">{0} chorakdan so‘ng</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} chorak oldin</relativeTimePattern>
+					<relativeTimePattern count="other">{0} chorak oldin</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-narrow">
+				<displayName>ch</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} chorakda</relativeTimePattern>
-					<relativeTimePattern count="other">{0} chorakda</relativeTimePattern>
+					<relativeTimePattern count="one">{0} chorakdan so‘ng</relativeTimePattern>
+					<relativeTimePattern count="other">{0} chorakdan so‘ng</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} chorak avval</relativeTimePattern>
-					<relativeTimePattern count="other">{0} chorak avval</relativeTimePattern>
+					<relativeTimePattern count="one">{0} chorak oldin</relativeTimePattern>
+					<relativeTimePattern count="other">{0} chorak oldin</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month">
-				<displayName>Oy</displayName>
-				<relative type="-1">oʻtgan oy</relative>
-				<relative type="0">bu oy</relative>
+				<displayName>oy</displayName>
+				<relative type="-1">o‘tgan oy</relative>
+				<relative type="0">shu oy</relative>
 				<relative type="1">keyingi oy</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} oydan soʻng</relativeTimePattern>
-					<relativeTimePattern count="other">{0} oydan soʻng</relativeTimePattern>
+					<relativeTimePattern count="one">{0} oydan so‘ng</relativeTimePattern>
+					<relativeTimePattern count="other">{0} oydan so‘ng</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} oy avval</relativeTimePattern>
-					<relativeTimePattern count="other">{0} oy avval</relativeTimePattern>
+					<relativeTimePattern count="one">{0} oy oldin</relativeTimePattern>
+					<relativeTimePattern count="other">{0} oy oldin</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month-short">
-				<displayName>Oy</displayName>
+				<displayName>oy</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} oydan so‘ng</relativeTimePattern>
+					<relativeTimePattern count="other">{0} oydan so‘ng</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} oy oldin</relativeTimePattern>
+					<relativeTimePattern count="other">{0} oy oldin</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="month-narrow">
-				<displayName>Oy</displayName>
+				<displayName>oy</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} oydan so‘ng</relativeTimePattern>
+					<relativeTimePattern count="other">{0} oydan so‘ng</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} oy oldin</relativeTimePattern>
+					<relativeTimePattern count="other">{0} oy oldin</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="week">
-				<displayName>Hafta</displayName>
-				<relative type="-1">oʻtgan hafta</relative>
-				<relative type="0">bu hafta</relative>
+				<displayName>hafta</displayName>
+				<relative type="-1">o‘tgan hafta</relative>
+				<relative type="0">shu hafta</relative>
 				<relative type="1">keyingi hafta</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} haftadan soʻng</relativeTimePattern>
-					<relativeTimePattern count="other">{0} haftadan soʻng</relativeTimePattern>
+					<relativeTimePattern count="one">{0} haftadan so‘ng</relativeTimePattern>
+					<relativeTimePattern count="other">{0} haftadan so‘ng</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} hafta oldin</relativeTimePattern>
+					<relativeTimePattern count="other">{0} hafta oldin</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-short">
+				<displayName>hafta</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} haftadan so‘ng</relativeTimePattern>
+					<relativeTimePattern count="other">{0} haftadan so‘ng</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} hafta oldin</relativeTimePattern>
+					<relativeTimePattern count="other">{0} hafta oldin</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-narrow">
+				<displayName>hafta</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} haftadan so‘ng</relativeTimePattern>
+					<relativeTimePattern count="other">{0} haftadan so‘ng</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} hafta oldin</relativeTimePattern>
@@ -1354,13 +1503,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day">
-				<displayName>Kun</displayName>
+				<displayName>kun</displayName>
 				<relative type="-1">kecha</relative>
 				<relative type="0">bugun</relative>
 				<relative type="1">ertaga</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} kundan soʻng</relativeTimePattern>
-					<relativeTimePattern count="other">{0} kundan soʻng</relativeTimePattern>
+					<relativeTimePattern count="one">{0} kundan so‘ng</relativeTimePattern>
+					<relativeTimePattern count="other">{0} kundan so‘ng</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} kun oldin</relativeTimePattern>
@@ -1368,10 +1517,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day-short">
-				<displayName>Kun</displayName>
+				<displayName>kun</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} kundan soʻng</relativeTimePattern>
-					<relativeTimePattern count="other">{0} kundan soʻng</relativeTimePattern>
+					<relativeTimePattern count="one">{0} kundan so‘ng</relativeTimePattern>
+					<relativeTimePattern count="other">{0} kundan so‘ng</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} kun oldin</relativeTimePattern>
@@ -1379,54 +1528,154 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day-narrow">
-				<displayName>Kun</displayName>
+				<displayName>kun</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} kundan so‘ng</relativeTimePattern>
+					<relativeTimePattern count="other">{0} kundan so‘ng</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} kun oldin</relativeTimePattern>
+					<relativeTimePattern count="other">{0} kun oldin</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="weekday">
-				<displayName>Hafta kuni</displayName>
+				<displayName>hafta kuni</displayName>
 			</field>
 			<field type="sun">
-				<relative type="-1">oʻtgan yakshanba</relative>
-				<relative type="0">bu yakshanba</relative>
+				<relative type="-1">o‘tgan yakshanba</relative>
+				<relative type="0">shu yakshanba</relative>
+				<relative type="1">keyingi yakshanba</relative>
+			</field>
+			<field type="sun-short">
+				<relative type="-1">o‘tgan yakshanba</relative>
+				<relative type="0">shu yakshanba</relative>
+				<relative type="1">keyingi yakshanba</relative>
+			</field>
+			<field type="sun-narrow">
+				<relative type="-1">o‘tgan yakshanba</relative>
+				<relative type="0">shu yakshanba</relative>
 				<relative type="1">keyingi yakshanba</relative>
 			</field>
 			<field type="mon">
-				<relative type="-1">oʻtgan dushanba</relative>
-				<relative type="0">bu dushanba</relative>
+				<relative type="-1">o‘tgan dushanba</relative>
+				<relative type="0">shu dushanba</relative>
+				<relative type="1">keyingi dushanba</relative>
+			</field>
+			<field type="mon-short">
+				<relative type="-1">o‘tgan dushanba</relative>
+				<relative type="0">shu dushanba</relative>
+				<relative type="1">keyingi dushanba</relative>
+			</field>
+			<field type="mon-narrow">
+				<relative type="-1">o‘tgan dushanba</relative>
+				<relative type="0">shu dushanba</relative>
 				<relative type="1">keyingi dushanba</relative>
 			</field>
 			<field type="tue">
-				<relative type="-1">oʻtgan seshanba</relative>
-				<relative type="0">bu seshanba</relative>
+				<relative type="-1">o‘tgan seshanba</relative>
+				<relative type="0">shu seshanba</relative>
+				<relative type="1">keyingi seshanba</relative>
+			</field>
+			<field type="tue-short">
+				<relative type="-1">o‘tgan seshanba</relative>
+				<relative type="0">shu seshanba</relative>
+				<relative type="1">keyingi seshanba</relative>
+			</field>
+			<field type="tue-narrow">
+				<relative type="-1">o‘tgan seshanba</relative>
+				<relative type="0">shu seshanba</relative>
 				<relative type="1">keyingi seshanba</relative>
 			</field>
 			<field type="wed">
-				<relative type="-1">oʻtgan chorshanba</relative>
-				<relative type="0">bu chorshanba</relative>
+				<relative type="-1">o‘tgan chorshanba</relative>
+				<relative type="0">shu chorshanba</relative>
+				<relative type="1">keyingi chorshanba</relative>
+			</field>
+			<field type="wed-short">
+				<relative type="-1">o‘tgan chorshanba</relative>
+				<relative type="0">shu chorshanba</relative>
+				<relative type="1">keyingi chorshanba</relative>
+			</field>
+			<field type="wed-narrow">
+				<relative type="-1">o‘tgan chorshanba</relative>
+				<relative type="0">shu chorshanba</relative>
 				<relative type="1">keyingi chorshanba</relative>
 			</field>
 			<field type="thu">
-				<relative type="-1">oʻtgan payshanba</relative>
-				<relative type="0">bu payshanba</relative>
+				<relative type="-1">o‘tgan payshanba</relative>
+				<relative type="0">shu payshanba</relative>
+				<relative type="1">keyingi payshanba</relative>
+			</field>
+			<field type="thu-short">
+				<relative type="-1">o‘tgan payshanba</relative>
+				<relative type="0">shu payshanba</relative>
+				<relative type="1">keyingi payshanba</relative>
+			</field>
+			<field type="thu-narrow">
+				<relative type="-1">o‘tgan payshanba</relative>
+				<relative type="0">shu payshanba</relative>
 				<relative type="1">keyingi payshanba</relative>
 			</field>
 			<field type="fri">
-				<relative type="-1">oʻtgan juma</relative>
-				<relative type="0">bu juma</relative>
+				<relative type="-1">o‘tgan juma</relative>
+				<relative type="0">shu juma</relative>
+				<relative type="1">keyingi juma</relative>
+			</field>
+			<field type="fri-short">
+				<relative type="-1">o‘tgan juma</relative>
+				<relative type="0">shu juma</relative>
+				<relative type="1">keyingi juma</relative>
+			</field>
+			<field type="fri-narrow">
+				<relative type="-1">o‘tgan juma</relative>
+				<relative type="0">shu juma</relative>
 				<relative type="1">keyingi juma</relative>
 			</field>
 			<field type="sat">
-				<relative type="-1">oʻtgan shanba</relative>
-				<relative type="0">bu shanba</relative>
+				<relative type="-1">o‘tgan shanba</relative>
+				<relative type="0">shu shanba</relative>
+				<relative type="1">keyingi shanba</relative>
+			</field>
+			<field type="sat-short">
+				<relative type="-1">o‘tgan shanba</relative>
+				<relative type="0">shu shanba</relative>
+				<relative type="1">keyingi shanba</relative>
+			</field>
+			<field type="sat-narrow">
+				<relative type="-1">o‘tgan shanba</relative>
+				<relative type="0">shu shanba</relative>
 				<relative type="1">keyingi shanba</relative>
 			</field>
 			<field type="dayperiod">
-				<displayName>Kun vaqti</displayName>
+				<displayName>kun qismi</displayName>
 			</field>
 			<field type="hour">
-				<displayName>Soat</displayName>
+				<displayName>soat</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} soatdan soʻng</relativeTimePattern>
-					<relativeTimePattern count="other">{0} soatdan soʻng</relativeTimePattern>
+					<relativeTimePattern count="one">{0} soatdan so‘ng</relativeTimePattern>
+					<relativeTimePattern count="other">{0} soatdan so‘ng</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} soat oldin</relativeTimePattern>
+					<relativeTimePattern count="other">{0} soat oldin</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-short">
+				<displayName>soat</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} soatdan so‘ng</relativeTimePattern>
+					<relativeTimePattern count="other">{0} soatdan so‘ng</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} soat oldin</relativeTimePattern>
+					<relativeTimePattern count="other">{0} soat oldin</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-narrow">
+				<displayName>soat</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} soatdan so‘ng</relativeTimePattern>
+					<relativeTimePattern count="other">{0} soatdan so‘ng</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} soat oldin</relativeTimePattern>
@@ -1434,10 +1683,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="minute">
-				<displayName>Daqiqa</displayName>
+				<displayName>daqiqa</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} daqiqadan soʻng</relativeTimePattern>
-					<relativeTimePattern count="other">{0} daqiqadan soʻng</relativeTimePattern>
+					<relativeTimePattern count="one">{0} daqiqadan so‘ng</relativeTimePattern>
+					<relativeTimePattern count="other">{0} daqiqadan so‘ng</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} daqiqa oldin</relativeTimePattern>
@@ -1446,12 +1695,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="minute-short">
 				<displayName>daq.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} daqiqadan so‘ng</relativeTimePattern>
+					<relativeTimePattern count="other">{0} daqiqadan so‘ng</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} daqiqa oldin</relativeTimePattern>
+					<relativeTimePattern count="other">{0} daqiqa oldin</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="minute-narrow">
 				<displayName>daq.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} daqiqadan soʻng</relativeTimePattern>
-					<relativeTimePattern count="other">{0} daqiqadan soʻng</relativeTimePattern>
+					<relativeTimePattern count="one">{0} daqiqadan so‘ng</relativeTimePattern>
+					<relativeTimePattern count="other">{0} daqiqadan so‘ng</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} daqiqa oldin</relativeTimePattern>
@@ -1459,11 +1716,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="second">
-				<displayName>Soniya</displayName>
+				<displayName>soniya</displayName>
 				<relative type="0">hozir</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} soniyadan soʻng</relativeTimePattern>
-					<relativeTimePattern count="other">{0} soniyadan soʻng</relativeTimePattern>
+					<relativeTimePattern count="one">{0} soniyadan so‘ng</relativeTimePattern>
+					<relativeTimePattern count="other">{0} soniyadan so‘ng</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} soniya oldin</relativeTimePattern>
@@ -1472,12 +1729,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="second-short">
 				<displayName>son.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} soniyadan so‘ng</relativeTimePattern>
+					<relativeTimePattern count="other">{0} soniyadan so‘ng</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} soniya oldin</relativeTimePattern>
+					<relativeTimePattern count="other">{0} soniya oldin</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="second-narrow">
 				<displayName>son.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} soniyadan so‘ng</relativeTimePattern>
+					<relativeTimePattern count="other">{0} soniyadan so‘ng</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} soniya oldin</relativeTimePattern>
+					<relativeTimePattern count="other">{0} soniya oldin</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>Mintaqa</displayName>
+				<displayName>vaqt mintaqasi</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
@@ -1485,29 +1758,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<gmtFormat>GMT{0}</gmtFormat>
 			<gmtZeroFormat>GMT</gmtZeroFormat>
 			<regionFormat>{0} vaqti</regionFormat>
-			<regionFormat type="daylight">{0} kunduzgi vaqti</regionFormat>
+			<regionFormat type="daylight">{0} yozgi vaqti</regionFormat>
 			<regionFormat type="standard">{0} standart vaqti</regionFormat>
 			<fallbackFormat>{1} ({0})</fallbackFormat>
 			<zone type="Etc/Unknown">
-				<exemplarCity>Nomaʼlum</exemplarCity>
+				<exemplarCity>Noma’lum shahar</exemplarCity>
 			</zone>
 			<zone type="Europe/Andorra">
 				<exemplarCity>Andorra</exemplarCity>
 			</zone>
 			<zone type="Asia/Dubai">
-				<exemplarCity>Dubai</exemplarCity>
+				<exemplarCity>Dubay</exemplarCity>
 			</zone>
 			<zone type="Asia/Kabul">
-				<exemplarCity>Kabul</exemplarCity>
+				<exemplarCity>Qobul</exemplarCity>
 			</zone>
 			<zone type="America/Antigua">
 				<exemplarCity>Antigua</exemplarCity>
 			</zone>
 			<zone type="America/Anguilla">
-				<exemplarCity>Anguilla</exemplarCity>
+				<exemplarCity>Angilya</exemplarCity>
 			</zone>
 			<zone type="Europe/Tirane">
-				<exemplarCity>Tirane</exemplarCity>
+				<exemplarCity>Tirana</exemplarCity>
 			</zone>
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Yerevan</exemplarCity>
@@ -1516,52 +1789,55 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Luanda</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Rothera">
-				<exemplarCity>Rothera</exemplarCity>
+				<exemplarCity>Rotera</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Palmer">
 				<exemplarCity>Palmer</exemplarCity>
 			</zone>
+			<zone type="Antarctica/Troll">
+				<exemplarCity>Troll</exemplarCity>
+			</zone>
 			<zone type="Antarctica/Syowa">
-				<exemplarCity>Syowa</exemplarCity>
+				<exemplarCity>Syova</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Mawson">
-				<exemplarCity>Mawson</exemplarCity>
+				<exemplarCity>Mouson</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Davis">
-				<exemplarCity>Davis</exemplarCity>
+				<exemplarCity>Deyvis</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Vostok">
 				<exemplarCity>Vostok</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Casey">
-				<exemplarCity>Casey</exemplarCity>
+				<exemplarCity>Keysi</exemplarCity>
 			</zone>
 			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont d’Urville</exemplarCity>
+				<exemplarCity>Dyumon-d’Yurvil</exemplarCity>
 			</zone>
 			<zone type="Antarctica/McMurdo">
-				<exemplarCity>McMurdo</exemplarCity>
+				<exemplarCity>Mak-Merdo</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Rio Gallegos</exemplarCity>
+				<exemplarCity>Rio-Gallegos</exemplarCity>
 			</zone>
 			<zone type="America/Mendoza">
 				<exemplarCity>Mendoza</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>San Juan</exemplarCity>
+				<exemplarCity>San-Xuan</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>Ushuaia</exemplarCity>
+				<exemplarCity>Ushuaya</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity>La Rioja</exemplarCity>
+				<exemplarCity>La-Rioxa</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/San_Luis">
-				<exemplarCity>San Luis</exemplarCity>
+				<exemplarCity>San-Luis</exemplarCity>
 			</zone>
 			<zone type="America/Catamarca">
-				<exemplarCity>Catamarca</exemplarCity>
+				<exemplarCity>Katamarka</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Salta">
 				<exemplarCity>Salta</exemplarCity>
@@ -1570,88 +1846,88 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Jujuy</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tucuman</exemplarCity>
+				<exemplarCity>Tukuman</exemplarCity>
 			</zone>
 			<zone type="America/Cordoba">
-				<exemplarCity>Cordoba</exemplarCity>
+				<exemplarCity>Kordoba</exemplarCity>
 			</zone>
 			<zone type="America/Buenos_Aires">
-				<exemplarCity>Buenos Aires</exemplarCity>
+				<exemplarCity>Buenos-Ayres</exemplarCity>
 			</zone>
 			<zone type="Pacific/Pago_Pago">
-				<exemplarCity>Pago Pago</exemplarCity>
+				<exemplarCity>Pago-Pago</exemplarCity>
 			</zone>
 			<zone type="Europe/Vienna">
-				<exemplarCity>Vienna</exemplarCity>
+				<exemplarCity>Vena</exemplarCity>
 			</zone>
 			<zone type="Australia/Perth">
-				<exemplarCity>Perth</exemplarCity>
+				<exemplarCity>Pert</exemplarCity>
 			</zone>
 			<zone type="Australia/Eucla">
-				<exemplarCity>Eucla</exemplarCity>
+				<exemplarCity>Yukla</exemplarCity>
 			</zone>
 			<zone type="Australia/Darwin">
-				<exemplarCity>Darwin</exemplarCity>
+				<exemplarCity>Darvin</exemplarCity>
 			</zone>
 			<zone type="Australia/Adelaide">
-				<exemplarCity>Adelaide</exemplarCity>
+				<exemplarCity>Adelaida</exemplarCity>
 			</zone>
 			<zone type="Australia/Broken_Hill">
-				<exemplarCity>Broken Hill</exemplarCity>
+				<exemplarCity>Broken-Xill</exemplarCity>
 			</zone>
 			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
+				<exemplarCity>Kerri</exemplarCity>
 			</zone>
 			<zone type="Australia/Melbourne">
-				<exemplarCity>Melbourne</exemplarCity>
+				<exemplarCity>Melburn</exemplarCity>
 			</zone>
 			<zone type="Australia/Hobart">
-				<exemplarCity>Hobart</exemplarCity>
+				<exemplarCity>Xobart</exemplarCity>
 			</zone>
 			<zone type="Australia/Lindeman">
 				<exemplarCity>Lindeman</exemplarCity>
 			</zone>
 			<zone type="Australia/Sydney">
-				<exemplarCity>Sydney</exemplarCity>
+				<exemplarCity>Sidney</exemplarCity>
 			</zone>
 			<zone type="Australia/Brisbane">
-				<exemplarCity>Brisbane</exemplarCity>
+				<exemplarCity>Brisben</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Macquarie">
-				<exemplarCity>Macquarie</exemplarCity>
+				<exemplarCity>Makkuori</exemplarCity>
 			</zone>
 			<zone type="Australia/Lord_Howe">
-				<exemplarCity>Lord Howe</exemplarCity>
+				<exemplarCity>Lord-Xau oroli</exemplarCity>
 			</zone>
 			<zone type="America/Aruba">
 				<exemplarCity>Aruba</exemplarCity>
 			</zone>
 			<zone type="Europe/Mariehamn">
-				<exemplarCity>Mariehamn</exemplarCity>
+				<exemplarCity>Mariyexamn</exemplarCity>
 			</zone>
 			<zone type="Asia/Baku">
 				<exemplarCity>Baku</exemplarCity>
 			</zone>
 			<zone type="Europe/Sarajevo">
-				<exemplarCity>Sarajevo</exemplarCity>
+				<exemplarCity>Sarayevo</exemplarCity>
 			</zone>
 			<zone type="America/Barbados">
 				<exemplarCity>Barbados</exemplarCity>
 			</zone>
 			<zone type="Asia/Dhaka">
-				<exemplarCity>Dhaka</exemplarCity>
+				<exemplarCity>Dakka</exemplarCity>
 			</zone>
 			<zone type="Europe/Brussels">
-				<exemplarCity>Brussels</exemplarCity>
+				<exemplarCity>Brussel</exemplarCity>
 			</zone>
 			<zone type="Africa/Ouagadougou">
-				<exemplarCity>Ouagadougou</exemplarCity>
+				<exemplarCity>Uagadugu</exemplarCity>
 			</zone>
 			<zone type="Europe/Sofia">
-				<exemplarCity>Sofia</exemplarCity>
+				<exemplarCity>Sofiya</exemplarCity>
 			</zone>
 			<zone type="Asia/Bahrain">
-				<exemplarCity>Bahrain</exemplarCity>
+				<exemplarCity>Bahrayn</exemplarCity>
 			</zone>
 			<zone type="Africa/Bujumbura">
 				<exemplarCity>Bujumbura</exemplarCity>
@@ -1660,43 +1936,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Porto-Novo</exemplarCity>
 			</zone>
 			<zone type="America/St_Barthelemy">
-				<exemplarCity>St. Barthelemy</exemplarCity>
+				<exemplarCity>Sen-Bartelmi</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Bermuda">
-				<exemplarCity>Bermuda</exemplarCity>
+				<exemplarCity>Bermuda orollari</exemplarCity>
 			</zone>
 			<zone type="Asia/Brunei">
-				<exemplarCity>Brunei</exemplarCity>
+				<exemplarCity>Bruney</exemplarCity>
 			</zone>
 			<zone type="America/La_Paz">
-				<exemplarCity>La Paz</exemplarCity>
+				<exemplarCity>La-Pas</exemplarCity>
 			</zone>
 			<zone type="America/Kralendijk">
-				<exemplarCity>Kralendijk</exemplarCity>
+				<exemplarCity>Kralendeyk</exemplarCity>
 			</zone>
 			<zone type="America/Eirunepe">
-				<exemplarCity>Eirunepe</exemplarCity>
+				<exemplarCity>Eyrunepe</exemplarCity>
 			</zone>
 			<zone type="America/Rio_Branco">
-				<exemplarCity>Rio Branco</exemplarCity>
+				<exemplarCity>Riu-Branku</exemplarCity>
 			</zone>
 			<zone type="America/Porto_Velho">
-				<exemplarCity>Porto Velho</exemplarCity>
+				<exemplarCity>Portu-Velyu</exemplarCity>
 			</zone>
 			<zone type="America/Boa_Vista">
-				<exemplarCity>Boa Vista</exemplarCity>
+				<exemplarCity>Boa-Vista</exemplarCity>
 			</zone>
 			<zone type="America/Manaus">
 				<exemplarCity>Manaus</exemplarCity>
 			</zone>
 			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiaba</exemplarCity>
+				<exemplarCity>Kuyaba</exemplarCity>
 			</zone>
 			<zone type="America/Santarem">
 				<exemplarCity>Santarem</exemplarCity>
 			</zone>
 			<zone type="America/Campo_Grande">
-				<exemplarCity>Campo Grande</exemplarCity>
+				<exemplarCity>Kampu-Grandi</exemplarCity>
 			</zone>
 			<zone type="America/Belem">
 				<exemplarCity>Belem</exemplarCity>
@@ -1705,28 +1981,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Araguaina</exemplarCity>
 			</zone>
 			<zone type="America/Sao_Paulo">
-				<exemplarCity>Sao Paulo</exemplarCity>
+				<exemplarCity>San-Paulu</exemplarCity>
 			</zone>
 			<zone type="America/Bahia">
-				<exemplarCity>Bahia</exemplarCity>
+				<exemplarCity>Bahiya</exemplarCity>
 			</zone>
 			<zone type="America/Fortaleza">
 				<exemplarCity>Fortaleza</exemplarCity>
 			</zone>
 			<zone type="America/Maceio">
-				<exemplarCity>Maceio</exemplarCity>
+				<exemplarCity>Maseyo</exemplarCity>
 			</zone>
 			<zone type="America/Recife">
-				<exemplarCity>Recife</exemplarCity>
+				<exemplarCity>Resifi</exemplarCity>
 			</zone>
 			<zone type="America/Noronha">
-				<exemplarCity>Noronha</exemplarCity>
+				<exemplarCity>Noronxa</exemplarCity>
 			</zone>
 			<zone type="America/Nassau">
 				<exemplarCity>Nassau</exemplarCity>
 			</zone>
 			<zone type="Asia/Thimphu">
-				<exemplarCity>Thimphu</exemplarCity>
+				<exemplarCity>Timpu</exemplarCity>
 			</zone>
 			<zone type="Africa/Gaborone">
 				<exemplarCity>Gaborone</exemplarCity>
@@ -1741,7 +2017,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Douson</exemplarCity>
 			</zone>
 			<zone type="America/Whitehorse">
-				<exemplarCity>Whitehorse</exemplarCity>
+				<exemplarCity>Uaytxors</exemplarCity>
 			</zone>
 			<zone type="America/Inuvik">
 				<exemplarCity>Inuvik</exemplarCity>
@@ -1750,7 +2026,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Vankuver</exemplarCity>
 			</zone>
 			<zone type="America/Dawson_Creek">
-				<exemplarCity>Douson Krik</exemplarCity>
+				<exemplarCity>Douson-Krik</exemplarCity>
 			</zone>
 			<zone type="America/Creston">
 				<exemplarCity>Kreston</exemplarCity>
@@ -1762,13 +2038,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Edmonton</exemplarCity>
 			</zone>
 			<zone type="America/Swift_Current">
-				<exemplarCity>Swift Current</exemplarCity>
+				<exemplarCity>Svift-Karrent</exemplarCity>
 			</zone>
 			<zone type="America/Cambridge_Bay">
-				<exemplarCity>Kembridj Bey</exemplarCity>
+				<exemplarCity>Kembrij-Bey</exemplarCity>
 			</zone>
 			<zone type="America/Regina">
-				<exemplarCity>Regina</exemplarCity>
+				<exemplarCity>Rejayna</exemplarCity>
 			</zone>
 			<zone type="America/Winnipeg">
 				<exemplarCity>Vinnipeg</exemplarCity>
@@ -1777,16 +2053,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Rezolyut</exemplarCity>
 			</zone>
 			<zone type="America/Rainy_River">
-				<exemplarCity>Reyni River</exemplarCity>
+				<exemplarCity>Reyni-River</exemplarCity>
 			</zone>
 			<zone type="America/Rankin_Inlet">
-				<exemplarCity>Rankin Inlet</exemplarCity>
+				<exemplarCity>Rankin-Inlet</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
-				<exemplarCity>Atikokan</exemplarCity>
+				<exemplarCity>Koral-Xarbor</exemplarCity>
 			</zone>
 			<zone type="America/Thunder_Bay">
-				<exemplarCity>Tandr Bey</exemplarCity>
+				<exemplarCity>Tander-Bey</exemplarCity>
 			</zone>
 			<zone type="America/Nipigon">
 				<exemplarCity>Nipigon</exemplarCity>
@@ -1798,28 +2074,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Ikaluit</exemplarCity>
 			</zone>
 			<zone type="America/Pangnirtung">
-				<exemplarCity>Pangnirtung</exemplarCity>
+				<exemplarCity>Pangnirtang</exemplarCity>
 			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>Monkton</exemplarCity>
 			</zone>
 			<zone type="America/Halifax">
-				<exemplarCity>Halifaks</exemplarCity>
+				<exemplarCity>Galifaks</exemplarCity>
 			</zone>
 			<zone type="America/Goose_Bay">
-				<exemplarCity>Gus Bey</exemplarCity>
+				<exemplarCity>Gus-Bey</exemplarCity>
 			</zone>
 			<zone type="America/Glace_Bay">
-				<exemplarCity>Gleys Bey</exemplarCity>
+				<exemplarCity>Gleys-Bey</exemplarCity>
 			</zone>
 			<zone type="America/Blanc-Sablon">
 				<exemplarCity>Blank-Sablon</exemplarCity>
 			</zone>
 			<zone type="America/St_Johns">
-				<exemplarCity>Avliyo Jon‘s</exemplarCity>
+				<exemplarCity>Sent-Jons</exemplarCity>
 			</zone>
 			<zone type="Indian/Cocos">
-				<exemplarCity>Cocos</exemplarCity>
+				<exemplarCity>Kokos orollari</exemplarCity>
 			</zone>
 			<zone type="Africa/Kinshasa">
 				<exemplarCity>Kinshasa</exemplarCity>
@@ -1828,13 +2104,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Lubumbashi</exemplarCity>
 			</zone>
 			<zone type="Africa/Bangui">
-				<exemplarCity>Bangui</exemplarCity>
+				<exemplarCity>Bangi</exemplarCity>
 			</zone>
 			<zone type="Africa/Brazzaville">
-				<exemplarCity>Brazzaville</exemplarCity>
+				<exemplarCity>Brazzavil</exemplarCity>
 			</zone>
 			<zone type="Europe/Zurich">
-				<exemplarCity>Zurich</exemplarCity>
+				<exemplarCity>Syurix</exemplarCity>
 			</zone>
 			<zone type="Africa/Abidjan">
 				<exemplarCity>Abidjan</exemplarCity>
@@ -1843,121 +2119,121 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Rarotonga</exemplarCity>
 			</zone>
 			<zone type="Pacific/Easter">
-				<exemplarCity>Easter</exemplarCity>
+				<exemplarCity>Pasxa oroli</exemplarCity>
 			</zone>
 			<zone type="America/Santiago">
-				<exemplarCity>Santiago</exemplarCity>
+				<exemplarCity>Santyago</exemplarCity>
 			</zone>
 			<zone type="Africa/Douala">
-				<exemplarCity>Douala</exemplarCity>
+				<exemplarCity>Duala</exemplarCity>
 			</zone>
 			<zone type="Asia/Urumqi">
-				<exemplarCity>Urumqi</exemplarCity>
+				<exemplarCity>Urumchi</exemplarCity>
 			</zone>
 			<zone type="Asia/Shanghai">
-				<exemplarCity>Shanghai</exemplarCity>
+				<exemplarCity>Shanxay</exemplarCity>
 			</zone>
 			<zone type="America/Bogota">
 				<exemplarCity>Bogota</exemplarCity>
 			</zone>
 			<zone type="America/Costa_Rica">
-				<exemplarCity>Kosta Rika</exemplarCity>
+				<exemplarCity>Kosta-Rika</exemplarCity>
 			</zone>
 			<zone type="America/Havana">
 				<exemplarCity>Gavana</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Cape Verde</exemplarCity>
+				<exemplarCity>Kabo-Verde</exemplarCity>
 			</zone>
 			<zone type="America/Curacao">
-				<exemplarCity>Kurakao</exemplarCity>
+				<exemplarCity>Kyurasao</exemplarCity>
 			</zone>
 			<zone type="Indian/Christmas">
-				<exemplarCity>Christmas</exemplarCity>
+				<exemplarCity>Rojdestvo oroli</exemplarCity>
 			</zone>
 			<zone type="Asia/Nicosia">
-				<exemplarCity>Nicosia</exemplarCity>
+				<exemplarCity>Nikosiya</exemplarCity>
 			</zone>
 			<zone type="Europe/Prague">
-				<exemplarCity>Prague</exemplarCity>
+				<exemplarCity>Praga</exemplarCity>
 			</zone>
 			<zone type="Europe/Busingen">
-				<exemplarCity>Busingen</exemplarCity>
+				<exemplarCity>Byuzingen</exemplarCity>
 			</zone>
 			<zone type="Europe/Berlin">
 				<exemplarCity>Berlin</exemplarCity>
 			</zone>
 			<zone type="Africa/Djibouti">
-				<exemplarCity>Djibouti</exemplarCity>
+				<exemplarCity>Jibuti</exemplarCity>
 			</zone>
 			<zone type="Europe/Copenhagen">
-				<exemplarCity>Copenhagen</exemplarCity>
+				<exemplarCity>Kopengagen</exemplarCity>
 			</zone>
 			<zone type="America/Dominica">
 				<exemplarCity>Dominika</exemplarCity>
 			</zone>
 			<zone type="America/Santo_Domingo">
-				<exemplarCity>Santo Domingo</exemplarCity>
+				<exemplarCity>Santo-Domingo</exemplarCity>
 			</zone>
 			<zone type="Africa/Algiers">
-				<exemplarCity>Algiers</exemplarCity>
+				<exemplarCity>Jazoir</exemplarCity>
 			</zone>
 			<zone type="Pacific/Galapagos">
 				<exemplarCity>Galapagos</exemplarCity>
 			</zone>
 			<zone type="America/Guayaquil">
-				<exemplarCity>Guayaquil</exemplarCity>
+				<exemplarCity>Guayakil</exemplarCity>
 			</zone>
 			<zone type="Europe/Tallinn">
-				<exemplarCity>Tallinn</exemplarCity>
+				<exemplarCity>Tallin</exemplarCity>
 			</zone>
 			<zone type="Africa/Cairo">
-				<exemplarCity>Cairo</exemplarCity>
+				<exemplarCity>Qohira</exemplarCity>
 			</zone>
 			<zone type="Africa/El_Aaiun">
-				<exemplarCity>El Aaiun</exemplarCity>
+				<exemplarCity>El-Ayun</exemplarCity>
 			</zone>
 			<zone type="Africa/Asmera">
-				<exemplarCity>Asmara</exemplarCity>
+				<exemplarCity>Asmera</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Canary">
-				<exemplarCity>Canary</exemplarCity>
+				<exemplarCity>Kanar orollari</exemplarCity>
 			</zone>
 			<zone type="Africa/Ceuta">
-				<exemplarCity>Ceuta</exemplarCity>
+				<exemplarCity>Seuta</exemplarCity>
 			</zone>
 			<zone type="Europe/Madrid">
 				<exemplarCity>Madrid</exemplarCity>
 			</zone>
 			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>Addis Ababa</exemplarCity>
+				<exemplarCity>Addis-Abeba</exemplarCity>
 			</zone>
 			<zone type="Europe/Helsinki">
-				<exemplarCity>Helsinki</exemplarCity>
+				<exemplarCity>Xelsinki</exemplarCity>
 			</zone>
 			<zone type="Pacific/Fiji">
 				<exemplarCity>Fiji</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Stanley">
-				<exemplarCity>Stanley</exemplarCity>
+				<exemplarCity>Stenli</exemplarCity>
 			</zone>
 			<zone type="Pacific/Truk">
-				<exemplarCity>Chuuk</exemplarCity>
+				<exemplarCity>Truk orollari</exemplarCity>
 			</zone>
 			<zone type="Pacific/Ponape">
-				<exemplarCity>Pohnpei</exemplarCity>
+				<exemplarCity>Ponape oroli</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kosrae">
 				<exemplarCity>Kosrae</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Faroe</exemplarCity>
+				<exemplarCity>Farer orollari</exemplarCity>
 			</zone>
 			<zone type="Europe/Paris">
-				<exemplarCity>Paris</exemplarCity>
+				<exemplarCity>Parij</exemplarCity>
 			</zone>
 			<zone type="Africa/Libreville">
-				<exemplarCity>Libreville</exemplarCity>
+				<exemplarCity>Librevil</exemplarCity>
 			</zone>
 			<zone type="Europe/London">
 				<long>
@@ -1972,34 +2248,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Tbilisi</exemplarCity>
 			</zone>
 			<zone type="America/Cayenne">
-				<exemplarCity>Cayenne</exemplarCity>
+				<exemplarCity>Kayenna</exemplarCity>
 			</zone>
 			<zone type="Europe/Guernsey">
-				<exemplarCity>Guernsey</exemplarCity>
+				<exemplarCity>Gernsi</exemplarCity>
 			</zone>
 			<zone type="Africa/Accra">
-				<exemplarCity>Accra</exemplarCity>
+				<exemplarCity>Akkra</exemplarCity>
 			</zone>
 			<zone type="Europe/Gibraltar">
 				<exemplarCity>Gibraltar</exemplarCity>
 			</zone>
 			<zone type="America/Thule">
-				<exemplarCity>Tula</exemplarCity>
+				<exemplarCity>Tule</exemplarCity>
 			</zone>
 			<zone type="America/Godthab">
-				<exemplarCity>Nuuk</exemplarCity>
+				<exemplarCity>Gotxob</exemplarCity>
 			</zone>
 			<zone type="America/Scoresbysund">
-				<exemplarCity>Ittoqqortoormiit</exemplarCity>
+				<exemplarCity>Skorsbisunn</exemplarCity>
 			</zone>
 			<zone type="America/Danmarkshavn">
-				<exemplarCity>Danmarkshavn</exemplarCity>
+				<exemplarCity>Denmarksxavn</exemplarCity>
 			</zone>
 			<zone type="Africa/Banjul">
 				<exemplarCity>Banjul</exemplarCity>
 			</zone>
 			<zone type="Africa/Conakry">
-				<exemplarCity>Conakry</exemplarCity>
+				<exemplarCity>Konakri</exemplarCity>
 			</zone>
 			<zone type="America/Guadeloupe">
 				<exemplarCity>Gvadelupa</exemplarCity>
@@ -2008,10 +2284,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Malabo</exemplarCity>
 			</zone>
 			<zone type="Europe/Athens">
-				<exemplarCity>Athens</exemplarCity>
+				<exemplarCity>Afina</exemplarCity>
 			</zone>
 			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>South Georgia</exemplarCity>
+				<exemplarCity>Janubiy Georgiya</exemplarCity>
 			</zone>
 			<zone type="America/Guatemala">
 				<exemplarCity>Gvatemala</exemplarCity>
@@ -2020,25 +2296,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Guam</exemplarCity>
 			</zone>
 			<zone type="Africa/Bissau">
-				<exemplarCity>Bissau</exemplarCity>
+				<exemplarCity>Bisau</exemplarCity>
 			</zone>
 			<zone type="America/Guyana">
-				<exemplarCity>Guyana</exemplarCity>
+				<exemplarCity>Gayana</exemplarCity>
 			</zone>
 			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Hong Kong</exemplarCity>
+				<exemplarCity>Gonkong</exemplarCity>
 			</zone>
 			<zone type="America/Tegucigalpa">
-				<exemplarCity>Tegucigalpa</exemplarCity>
+				<exemplarCity>Tegusigalpa</exemplarCity>
 			</zone>
 			<zone type="Europe/Zagreb">
 				<exemplarCity>Zagreb</exemplarCity>
 			</zone>
 			<zone type="America/Port-au-Prince">
-				<exemplarCity>Port-au-Prince</exemplarCity>
+				<exemplarCity>Port-o-Prens</exemplarCity>
 			</zone>
 			<zone type="Europe/Budapest">
-				<exemplarCity>Budapest</exemplarCity>
+				<exemplarCity>Budapesht</exemplarCity>
 			</zone>
 			<zone type="Asia/Jakarta">
 				<exemplarCity>Jakarta</exemplarCity>
@@ -2047,10 +2323,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Pontianak</exemplarCity>
 			</zone>
 			<zone type="Asia/Makassar">
-				<exemplarCity>Makassar</exemplarCity>
+				<exemplarCity>Makasar</exemplarCity>
 			</zone>
 			<zone type="Asia/Jayapura">
-				<exemplarCity>Jayapura</exemplarCity>
+				<exemplarCity>Jaypur</exemplarCity>
 			</zone>
 			<zone type="Europe/Dublin">
 				<long>
@@ -2059,31 +2335,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Dublin</exemplarCity>
 			</zone>
 			<zone type="Asia/Jerusalem">
-				<exemplarCity>Jerusalem</exemplarCity>
+				<exemplarCity>Ierusalim</exemplarCity>
 			</zone>
 			<zone type="Europe/Isle_of_Man">
-				<exemplarCity>Isle of Man</exemplarCity>
+				<exemplarCity>Men oroli</exemplarCity>
 			</zone>
 			<zone type="Asia/Calcutta">
-				<exemplarCity>Kolkata</exemplarCity>
+				<exemplarCity>Kalkutta</exemplarCity>
 			</zone>
 			<zone type="Indian/Chagos">
 				<exemplarCity>Chagos</exemplarCity>
 			</zone>
 			<zone type="Asia/Baghdad">
-				<exemplarCity>Baghdad</exemplarCity>
+				<exemplarCity>Bag‘dod</exemplarCity>
 			</zone>
 			<zone type="Asia/Tehran">
-				<exemplarCity>Tehran</exemplarCity>
+				<exemplarCity>Tehron</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Reykjavik">
-				<exemplarCity>Reykjavik</exemplarCity>
+				<exemplarCity>Reykyavik</exemplarCity>
 			</zone>
 			<zone type="Europe/Rome">
-				<exemplarCity>Rome</exemplarCity>
+				<exemplarCity>Rim</exemplarCity>
 			</zone>
 			<zone type="Europe/Jersey">
-				<exemplarCity>Jersey</exemplarCity>
+				<exemplarCity>Jersi</exemplarCity>
 			</zone>
 			<zone type="America/Jamaica">
 				<exemplarCity>Yamayka</exemplarCity>
@@ -2092,85 +2368,85 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Amman</exemplarCity>
 			</zone>
 			<zone type="Asia/Tokyo">
-				<exemplarCity>Tokyo</exemplarCity>
+				<exemplarCity>Tokio</exemplarCity>
 			</zone>
 			<zone type="Africa/Nairobi">
-				<exemplarCity>Nairobi</exemplarCity>
+				<exemplarCity>Nayrobi</exemplarCity>
 			</zone>
 			<zone type="Asia/Bishkek">
 				<exemplarCity>Bishkek</exemplarCity>
 			</zone>
 			<zone type="Asia/Phnom_Penh">
-				<exemplarCity>Phnom Penh</exemplarCity>
+				<exemplarCity>Pnompen</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
+				<exemplarCity>Enderberi oroli</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
 				<exemplarCity>Kiritimati</exemplarCity>
 			</zone>
 			<zone type="Pacific/Tarawa">
-				<exemplarCity>Tarawa</exemplarCity>
+				<exemplarCity>Tarava</exemplarCity>
 			</zone>
 			<zone type="Indian/Comoro">
-				<exemplarCity>Comoro</exemplarCity>
+				<exemplarCity>Komor orollari</exemplarCity>
 			</zone>
 			<zone type="America/St_Kitts">
-				<exemplarCity>Sent Kits</exemplarCity>
+				<exemplarCity>Sent-Kits</exemplarCity>
 			</zone>
 			<zone type="Asia/Pyongyang">
-				<exemplarCity>Pyongyang</exemplarCity>
+				<exemplarCity>Pxenyan</exemplarCity>
 			</zone>
 			<zone type="Asia/Seoul">
-				<exemplarCity>Seoul</exemplarCity>
+				<exemplarCity>Seul</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuwait">
-				<exemplarCity>Kuwait</exemplarCity>
+				<exemplarCity>Quvayt</exemplarCity>
 			</zone>
 			<zone type="America/Cayman">
-				<exemplarCity>Kayman</exemplarCity>
+				<exemplarCity>Kayman orollari</exemplarCity>
 			</zone>
 			<zone type="Asia/Aqtau">
-				<exemplarCity>Aqtau</exemplarCity>
+				<exemplarCity>Oqtov</exemplarCity>
 			</zone>
 			<zone type="Asia/Oral">
 				<exemplarCity>Oral</exemplarCity>
 			</zone>
 			<zone type="Asia/Aqtobe">
-				<exemplarCity>Aqtobe</exemplarCity>
+				<exemplarCity>Aktobe</exemplarCity>
 			</zone>
 			<zone type="Asia/Qyzylorda">
-				<exemplarCity>Qyzylorda</exemplarCity>
+				<exemplarCity>Qizilo‘rda</exemplarCity>
 			</zone>
 			<zone type="Asia/Almaty">
-				<exemplarCity>Almaty</exemplarCity>
+				<exemplarCity>Olma-Ota</exemplarCity>
 			</zone>
 			<zone type="Asia/Vientiane">
-				<exemplarCity>Vientiane</exemplarCity>
+				<exemplarCity>Vyentyan</exemplarCity>
 			</zone>
 			<zone type="Asia/Beirut">
-				<exemplarCity>Beirut</exemplarCity>
+				<exemplarCity>Bayrut</exemplarCity>
 			</zone>
 			<zone type="America/St_Lucia">
-				<exemplarCity>Sent Lusia</exemplarCity>
+				<exemplarCity>Sent-Lyusiya</exemplarCity>
 			</zone>
 			<zone type="Europe/Vaduz">
 				<exemplarCity>Vaduz</exemplarCity>
 			</zone>
 			<zone type="Asia/Colombo">
-				<exemplarCity>Colombo</exemplarCity>
+				<exemplarCity>Kolombo</exemplarCity>
 			</zone>
 			<zone type="Africa/Monrovia">
-				<exemplarCity>Monrovia</exemplarCity>
+				<exemplarCity>Monroviya</exemplarCity>
 			</zone>
 			<zone type="Africa/Maseru">
 				<exemplarCity>Maseru</exemplarCity>
 			</zone>
 			<zone type="Europe/Vilnius">
-				<exemplarCity>Vilnius</exemplarCity>
+				<exemplarCity>Vilnyus</exemplarCity>
 			</zone>
 			<zone type="Europe/Luxembourg">
-				<exemplarCity>Luxembourg</exemplarCity>
+				<exemplarCity>Lyuksemburg</exemplarCity>
 			</zone>
 			<zone type="Europe/Riga">
 				<exemplarCity>Riga</exemplarCity>
@@ -2179,58 +2455,58 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Tripoli</exemplarCity>
 			</zone>
 			<zone type="Africa/Casablanca">
-				<exemplarCity>Casablanca</exemplarCity>
+				<exemplarCity>Kasablanka</exemplarCity>
 			</zone>
 			<zone type="Europe/Monaco">
-				<exemplarCity>Monaco</exemplarCity>
+				<exemplarCity>Monako</exemplarCity>
 			</zone>
 			<zone type="Europe/Chisinau">
-				<exemplarCity>Chisinau</exemplarCity>
+				<exemplarCity>Kishinev</exemplarCity>
 			</zone>
 			<zone type="Europe/Podgorica">
-				<exemplarCity>Podgorica</exemplarCity>
+				<exemplarCity>Podgoritsa</exemplarCity>
 			</zone>
 			<zone type="America/Marigot">
-				<exemplarCity>Marigot</exemplarCity>
+				<exemplarCity>Marigo</exemplarCity>
 			</zone>
 			<zone type="Indian/Antananarivo">
-				<exemplarCity>Antananarivo</exemplarCity>
+				<exemplarCity>Antananarivu</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kwajalein">
-				<exemplarCity>Kwajalein</exemplarCity>
+				<exemplarCity>Kvajaleyn</exemplarCity>
 			</zone>
 			<zone type="Pacific/Majuro">
 				<exemplarCity>Majuro</exemplarCity>
 			</zone>
 			<zone type="Europe/Skopje">
-				<exemplarCity>Skopje</exemplarCity>
+				<exemplarCity>Skopye</exemplarCity>
 			</zone>
 			<zone type="Africa/Bamako">
 				<exemplarCity>Bamako</exemplarCity>
 			</zone>
 			<zone type="Asia/Rangoon">
-				<exemplarCity>Rangoon</exemplarCity>
+				<exemplarCity>Rangun</exemplarCity>
 			</zone>
 			<zone type="Asia/Hovd">
-				<exemplarCity>Hovd</exemplarCity>
+				<exemplarCity>Xovd</exemplarCity>
 			</zone>
 			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Ulaanbaatar</exemplarCity>
+				<exemplarCity>Ulan-Bator</exemplarCity>
 			</zone>
 			<zone type="Asia/Choibalsan">
-				<exemplarCity>Choibalsan</exemplarCity>
+				<exemplarCity>Choybalsan</exemplarCity>
 			</zone>
 			<zone type="Asia/Macau">
-				<exemplarCity>Macau</exemplarCity>
+				<exemplarCity>Makao</exemplarCity>
 			</zone>
 			<zone type="Pacific/Saipan">
-				<exemplarCity>Saipan</exemplarCity>
+				<exemplarCity>Saypan</exemplarCity>
 			</zone>
 			<zone type="America/Martinique">
-				<exemplarCity>Martinikua</exemplarCity>
+				<exemplarCity>Martinika</exemplarCity>
 			</zone>
 			<zone type="Africa/Nouakchott">
-				<exemplarCity>Nouakchott</exemplarCity>
+				<exemplarCity>Nuakshot</exemplarCity>
 			</zone>
 			<zone type="America/Montserrat">
 				<exemplarCity>Montserrat</exemplarCity>
@@ -2239,40 +2515,40 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Malta</exemplarCity>
 			</zone>
 			<zone type="Indian/Mauritius">
-				<exemplarCity>Mauritius</exemplarCity>
+				<exemplarCity>Mavrikiy</exemplarCity>
 			</zone>
 			<zone type="Indian/Maldives">
-				<exemplarCity>Maldives</exemplarCity>
+				<exemplarCity>Maldiv orollari</exemplarCity>
 			</zone>
 			<zone type="Africa/Blantyre">
-				<exemplarCity>Blantyre</exemplarCity>
+				<exemplarCity>Blantayr</exemplarCity>
 			</zone>
 			<zone type="America/Tijuana">
-				<exemplarCity>Tijuana</exemplarCity>
+				<exemplarCity>Tixuana</exemplarCity>
 			</zone>
 			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Izabel</exemplarCity>
+				<exemplarCity>Santa-Izabel</exemplarCity>
 			</zone>
 			<zone type="America/Hermosillo">
-				<exemplarCity>Hermosillo</exemplarCity>
+				<exemplarCity>Ermosillo</exemplarCity>
 			</zone>
 			<zone type="America/Mazatlan">
-				<exemplarCity>Mazatlan</exemplarCity>
+				<exemplarCity>Masatlan</exemplarCity>
 			</zone>
 			<zone type="America/Chihuahua">
 				<exemplarCity>Chihuahua</exemplarCity>
 			</zone>
 			<zone type="America/Bahia_Banderas">
-				<exemplarCity>Bahia Banderas</exemplarCity>
+				<exemplarCity>Bahiya-Banderas</exemplarCity>
 			</zone>
 			<zone type="America/Ojinaga">
-				<exemplarCity>Ojinaga</exemplarCity>
+				<exemplarCity>Oxinaga</exemplarCity>
 			</zone>
 			<zone type="America/Monterrey">
 				<exemplarCity>Monterrey</exemplarCity>
 			</zone>
 			<zone type="America/Mexico_City">
-				<exemplarCity>Mexico City</exemplarCity>
+				<exemplarCity>Mexiko</exemplarCity>
 			</zone>
 			<zone type="America/Matamoros">
 				<exemplarCity>Matamoros</exemplarCity>
@@ -2284,19 +2560,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Kankun</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuala_Lumpur">
-				<exemplarCity>Kuala Lumpur</exemplarCity>
+				<exemplarCity>Kuala-Lumpur</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuching">
 				<exemplarCity>Kuching</exemplarCity>
 			</zone>
 			<zone type="Africa/Maputo">
-				<exemplarCity>Maputo</exemplarCity>
+				<exemplarCity>Maputu</exemplarCity>
 			</zone>
 			<zone type="Africa/Windhoek">
-				<exemplarCity>Windhoek</exemplarCity>
+				<exemplarCity>Vindxuk</exemplarCity>
 			</zone>
 			<zone type="Pacific/Noumea">
-				<exemplarCity>Noumea</exemplarCity>
+				<exemplarCity>Numea</exemplarCity>
 			</zone>
 			<zone type="Africa/Niamey">
 				<exemplarCity>Niamey</exemplarCity>
@@ -2317,7 +2593,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Oslo</exemplarCity>
 			</zone>
 			<zone type="Asia/Katmandu">
-				<exemplarCity>Kathmandu</exemplarCity>
+				<exemplarCity>Katmandu</exemplarCity>
 			</zone>
 			<zone type="Pacific/Nauru">
 				<exemplarCity>Nauru</exemplarCity>
@@ -2326,13 +2602,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Niue</exemplarCity>
 			</zone>
 			<zone type="Pacific/Chatham">
-				<exemplarCity>Chatham</exemplarCity>
+				<exemplarCity>Chatem oroli</exemplarCity>
 			</zone>
 			<zone type="Pacific/Auckland">
-				<exemplarCity>Auckland</exemplarCity>
+				<exemplarCity>Oklend</exemplarCity>
 			</zone>
 			<zone type="Asia/Muscat">
-				<exemplarCity>Muscat</exemplarCity>
+				<exemplarCity>Maskat</exemplarCity>
 			</zone>
 			<zone type="America/Panama">
 				<exemplarCity>Panama</exemplarCity>
@@ -2341,16 +2617,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Lima</exemplarCity>
 			</zone>
 			<zone type="Pacific/Tahiti">
-				<exemplarCity>Tahiti</exemplarCity>
+				<exemplarCity>Taiti oroli</exemplarCity>
 			</zone>
 			<zone type="Pacific/Marquesas">
-				<exemplarCity>Marquesas</exemplarCity>
+				<exemplarCity>Markiz orollari</exemplarCity>
 			</zone>
 			<zone type="Pacific/Gambier">
-				<exemplarCity>Gambier</exemplarCity>
+				<exemplarCity>Gambye oroli</exemplarCity>
 			</zone>
 			<zone type="Pacific/Port_Moresby">
-				<exemplarCity>Port Moresby</exemplarCity>
+				<exemplarCity>Port-Morsbi</exemplarCity>
+			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bugenvil</exemplarCity>
 			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
@@ -2359,49 +2638,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Karachi</exemplarCity>
 			</zone>
 			<zone type="Europe/Warsaw">
-				<exemplarCity>Warsaw</exemplarCity>
+				<exemplarCity>Varshava</exemplarCity>
 			</zone>
 			<zone type="America/Miquelon">
-				<exemplarCity>Miquelon</exemplarCity>
+				<exemplarCity>Mikelon</exemplarCity>
 			</zone>
 			<zone type="Pacific/Pitcairn">
-				<exemplarCity>Pitcairn</exemplarCity>
+				<exemplarCity>Pitkern</exemplarCity>
 			</zone>
 			<zone type="America/Puerto_Rico">
-				<exemplarCity>Puerto Riko</exemplarCity>
+				<exemplarCity>Puerto-Riko</exemplarCity>
 			</zone>
 			<zone type="Asia/Gaza">
-				<exemplarCity>Gaza</exemplarCity>
+				<exemplarCity>G‘azo</exemplarCity>
 			</zone>
 			<zone type="Asia/Hebron">
-				<exemplarCity>Hebron</exemplarCity>
+				<exemplarCity>Xevron</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Azores">
-				<exemplarCity>Azores</exemplarCity>
+				<exemplarCity>Azor orollari</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Madeira">
-				<exemplarCity>Madeira</exemplarCity>
+				<exemplarCity>Madeyra oroli</exemplarCity>
 			</zone>
 			<zone type="Europe/Lisbon">
-				<exemplarCity>Lisbon</exemplarCity>
+				<exemplarCity>Lissabon</exemplarCity>
 			</zone>
 			<zone type="Pacific/Palau">
 				<exemplarCity>Palau</exemplarCity>
 			</zone>
 			<zone type="America/Asuncion">
-				<exemplarCity>Asuncion</exemplarCity>
+				<exemplarCity>Asunson</exemplarCity>
 			</zone>
 			<zone type="Asia/Qatar">
 				<exemplarCity>Qatar</exemplarCity>
 			</zone>
 			<zone type="Indian/Reunion">
-				<exemplarCity>Reunion</exemplarCity>
+				<exemplarCity>Reyunion</exemplarCity>
 			</zone>
 			<zone type="Europe/Bucharest">
-				<exemplarCity>Bucharest</exemplarCity>
+				<exemplarCity>Buxarest</exemplarCity>
 			</zone>
 			<zone type="Europe/Belgrade">
-				<exemplarCity>Belgrade</exemplarCity>
+				<exemplarCity>Belgrad</exemplarCity>
 			</zone>
 			<zone type="Europe/Kaliningrad">
 				<exemplarCity>Kaliningrad</exemplarCity>
@@ -2410,7 +2689,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Simferopol</exemplarCity>
 			</zone>
 			<zone type="Europe/Moscow">
-				<exemplarCity>Moscow</exemplarCity>
+				<exemplarCity>Moskva</exemplarCity>
 			</zone>
 			<zone type="Europe/Volgograd">
 				<exemplarCity>Volgograd</exemplarCity>
@@ -2436,6 +2715,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Chita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Yakutsk</exemplarCity>
 			</zone>
@@ -2443,10 +2725,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Vladivostok</exemplarCity>
 			</zone>
 			<zone type="Asia/Khandyga">
-				<exemplarCity>Khandyga</exemplarCity>
+				<exemplarCity>Xandiga</exemplarCity>
 			</zone>
 			<zone type="Asia/Sakhalin">
-				<exemplarCity>Sakhalin</exemplarCity>
+				<exemplarCity>Saxalin</exemplarCity>
 			</zone>
 			<zone type="Asia/Ust-Nera">
 				<exemplarCity>Ust-Nera</exemplarCity>
@@ -2454,56 +2736,59 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolimsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamchatka</exemplarCity>
 			</zone>
 			<zone type="Asia/Anadyr">
-				<exemplarCity>Anadyr</exemplarCity>
+				<exemplarCity>Anadir</exemplarCity>
 			</zone>
 			<zone type="Africa/Kigali">
 				<exemplarCity>Kigali</exemplarCity>
 			</zone>
 			<zone type="Asia/Riyadh">
-				<exemplarCity>Riyadh</exemplarCity>
+				<exemplarCity>Ar-Riyod</exemplarCity>
 			</zone>
 			<zone type="Pacific/Guadalcanal">
-				<exemplarCity>Guadalcanal</exemplarCity>
+				<exemplarCity>Gvadalkanal</exemplarCity>
 			</zone>
 			<zone type="Indian/Mahe">
 				<exemplarCity>Mahe</exemplarCity>
 			</zone>
 			<zone type="Africa/Khartoum">
-				<exemplarCity>Khartoum</exemplarCity>
+				<exemplarCity>Xartum</exemplarCity>
 			</zone>
 			<zone type="Europe/Stockholm">
-				<exemplarCity>Stockholm</exemplarCity>
+				<exemplarCity>Stokgolm</exemplarCity>
 			</zone>
 			<zone type="Asia/Singapore">
-				<exemplarCity>Singapore</exemplarCity>
+				<exemplarCity>Singapur</exemplarCity>
 			</zone>
 			<zone type="Atlantic/St_Helena">
-				<exemplarCity>St. Helena</exemplarCity>
+				<exemplarCity>Muqaddas Yelena oroli</exemplarCity>
 			</zone>
 			<zone type="Europe/Ljubljana">
-				<exemplarCity>Ljubljana</exemplarCity>
+				<exemplarCity>Lyublyana</exemplarCity>
 			</zone>
 			<zone type="Arctic/Longyearbyen">
-				<exemplarCity>Longyearbyen</exemplarCity>
+				<exemplarCity>Longyir</exemplarCity>
 			</zone>
 			<zone type="Europe/Bratislava">
 				<exemplarCity>Bratislava</exemplarCity>
 			</zone>
 			<zone type="Africa/Freetown">
-				<exemplarCity>Freetown</exemplarCity>
+				<exemplarCity>Fritaun</exemplarCity>
 			</zone>
 			<zone type="Europe/San_Marino">
-				<exemplarCity>San Marino</exemplarCity>
+				<exemplarCity>San-Marino</exemplarCity>
 			</zone>
 			<zone type="Africa/Dakar">
 				<exemplarCity>Dakar</exemplarCity>
 			</zone>
 			<zone type="Africa/Mogadishu">
-				<exemplarCity>Mogadishu</exemplarCity>
+				<exemplarCity>Mogadisho</exemplarCity>
 			</zone>
 			<zone type="America/Paramaribo">
 				<exemplarCity>Paramaribo</exemplarCity>
@@ -2512,16 +2797,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Juba</exemplarCity>
 			</zone>
 			<zone type="Africa/Sao_Tome">
-				<exemplarCity>Sao Tome</exemplarCity>
+				<exemplarCity>San-Tome</exemplarCity>
 			</zone>
 			<zone type="America/El_Salvador">
-				<exemplarCity>El Salvador</exemplarCity>
+				<exemplarCity>Salvador</exemplarCity>
 			</zone>
 			<zone type="America/Lower_Princes">
-				<exemplarCity>Lower Princeʼs Quarter</exemplarCity>
+				<exemplarCity>Louer-Prinses-Kuorter</exemplarCity>
 			</zone>
 			<zone type="Asia/Damascus">
-				<exemplarCity>Damascus</exemplarCity>
+				<exemplarCity>Damashq</exemplarCity>
 			</zone>
 			<zone type="Africa/Mbabane">
 				<exemplarCity>Mbabane</exemplarCity>
@@ -2533,7 +2818,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Ndjamena</exemplarCity>
 			</zone>
 			<zone type="Indian/Kerguelen">
-				<exemplarCity>Kerguelen</exemplarCity>
+				<exemplarCity>Kergelen</exemplarCity>
 			</zone>
 			<zone type="Africa/Lome">
 				<exemplarCity>Lome</exemplarCity>
@@ -2551,7 +2836,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Dili</exemplarCity>
 			</zone>
 			<zone type="Asia/Ashgabat">
-				<exemplarCity>Ashgabat</exemplarCity>
+				<exemplarCity>Ashxobod</exemplarCity>
 			</zone>
 			<zone type="Africa/Tunis">
 				<exemplarCity>Tunis</exemplarCity>
@@ -2563,67 +2848,67 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Istanbul</exemplarCity>
 			</zone>
 			<zone type="America/Port_of_Spain">
-				<exemplarCity>Port of Spain</exemplarCity>
+				<exemplarCity>Port-of-Speyn</exemplarCity>
 			</zone>
 			<zone type="Pacific/Funafuti">
 				<exemplarCity>Funafuti</exemplarCity>
 			</zone>
 			<zone type="Asia/Taipei">
-				<exemplarCity>Taipei</exemplarCity>
+				<exemplarCity>Taypey</exemplarCity>
 			</zone>
 			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity>Dar es Salaam</exemplarCity>
+				<exemplarCity>Dor-us-Salom</exemplarCity>
 			</zone>
 			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uzhgorod</exemplarCity>
+				<exemplarCity>Ujgorod</exemplarCity>
 			</zone>
 			<zone type="Europe/Kiev">
-				<exemplarCity>Kiev</exemplarCity>
+				<exemplarCity>Kiyev</exemplarCity>
 			</zone>
 			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporozhye</exemplarCity>
+				<exemplarCity>Zaporojye</exemplarCity>
 			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>Kampala</exemplarCity>
 			</zone>
 			<zone type="Pacific/Midway">
-				<exemplarCity>Midway</exemplarCity>
+				<exemplarCity>Midvey orollari</exemplarCity>
 			</zone>
 			<zone type="Pacific/Johnston">
-				<exemplarCity>Johnston</exemplarCity>
+				<exemplarCity>Jonston</exemplarCity>
 			</zone>
 			<zone type="Pacific/Wake">
-				<exemplarCity>Wake</exemplarCity>
+				<exemplarCity>Ueyk oroli</exemplarCity>
 			</zone>
 			<zone type="America/Adak">
-				<exemplarCity>Adak</exemplarCity>
+				<exemplarCity>Adak oroli</exemplarCity>
 			</zone>
 			<zone type="America/Nome">
 				<exemplarCity>Nom</exemplarCity>
 			</zone>
 			<zone type="Pacific/Honolulu">
-				<exemplarCity>Honolulu</exemplarCity>
+				<exemplarCity>Gonolulu</exemplarCity>
 			</zone>
 			<zone type="America/Anchorage">
-				<exemplarCity>Anchorage</exemplarCity>
+				<exemplarCity>Ankorij</exemplarCity>
 			</zone>
 			<zone type="America/Yakutat">
-				<exemplarCity>Yakutiya</exemplarCity>
+				<exemplarCity>Yakutat</exemplarCity>
 			</zone>
 			<zone type="America/Sitka">
 				<exemplarCity>Sitka</exemplarCity>
 			</zone>
 			<zone type="America/Juneau">
-				<exemplarCity>Yunau</exemplarCity>
+				<exemplarCity>Juno</exemplarCity>
 			</zone>
 			<zone type="America/Metlakatla">
 				<exemplarCity>Metlakatla</exemplarCity>
 			</zone>
 			<zone type="America/Los_Angeles">
-				<exemplarCity>Los Angeles</exemplarCity>
+				<exemplarCity>Los-Anjeles</exemplarCity>
 			</zone>
 			<zone type="America/Boise">
-				<exemplarCity>Boise</exemplarCity>
+				<exemplarCity>Boyse</exemplarCity>
 			</zone>
 			<zone type="America/Phoenix">
 				<exemplarCity>Feniks</exemplarCity>
@@ -2635,7 +2920,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Boyla, Shimoliy Dakota</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>Yangi Salim, Shimoliy Dakota</exemplarCity>
+				<exemplarCity>Nyu-Salem, Shimoliy Dakota</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/Center">
 				<exemplarCity>Markaz, Shimoliy Dakota</exemplarCity>
@@ -2644,22 +2929,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Chikago</exemplarCity>
 			</zone>
 			<zone type="America/Menominee">
-				<exemplarCity>Menominee</exemplarCity>
+				<exemplarCity>Menomini</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>Vincennes, Indiana</exemplarCity>
+				<exemplarCity>Vinsens, Indiana</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Petersburg">
 				<exemplarCity>Peterburg, Indiana</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Tell_City">
-				<exemplarCity>Tel siti, Indiana</exemplarCity>
+				<exemplarCity>Tell-Siti, Indiana</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Knox">
-				<exemplarCity>Knoks, Indiana</exemplarCity>
+				<exemplarCity>Noks, Indiana</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Winamac">
-				<exemplarCity>Winamac, Indiana</exemplarCity>
+				<exemplarCity>Vinamak, Indiana</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Marengo">
 				<exemplarCity>Marengo, Indiana</exemplarCity>
@@ -2668,52 +2953,52 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Indianapolis</exemplarCity>
 			</zone>
 			<zone type="America/Louisville">
-				<exemplarCity>Louisville</exemplarCity>
+				<exemplarCity>Luisvill</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Vevay">
-				<exemplarCity>Vevay, Indiana</exemplarCity>
+				<exemplarCity>Vivey, Indiana</exemplarCity>
 			</zone>
 			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>Montichello, Kentuki</exemplarCity>
+				<exemplarCity>Montisello, Kentukki</exemplarCity>
 			</zone>
 			<zone type="America/Detroit">
-				<exemplarCity>Detroit</exemplarCity>
+				<exemplarCity>Detroyt</exemplarCity>
 			</zone>
 			<zone type="America/New_York">
-				<exemplarCity>Nyu York</exemplarCity>
+				<exemplarCity>Nyu-York</exemplarCity>
 			</zone>
 			<zone type="America/Montevideo">
 				<exemplarCity>Montevideo</exemplarCity>
 			</zone>
 			<zone type="Asia/Samarkand">
-				<exemplarCity>Samarkand</exemplarCity>
+				<exemplarCity>Samarqand</exemplarCity>
 			</zone>
 			<zone type="Asia/Tashkent">
 				<exemplarCity>Toshkent</exemplarCity>
 			</zone>
 			<zone type="Europe/Vatican">
-				<exemplarCity>Vatican</exemplarCity>
+				<exemplarCity>Vatikan</exemplarCity>
 			</zone>
 			<zone type="America/St_Vincent">
-				<exemplarCity>St. Vincent</exemplarCity>
+				<exemplarCity>Sent-Vinsent</exemplarCity>
 			</zone>
 			<zone type="America/Caracas">
-				<exemplarCity>Caracas</exemplarCity>
+				<exemplarCity>Karakas</exemplarCity>
 			</zone>
 			<zone type="America/Tortola">
 				<exemplarCity>Tortola</exemplarCity>
 			</zone>
 			<zone type="America/St_Thomas">
-				<exemplarCity>St. Thomas</exemplarCity>
+				<exemplarCity>Sent-Tomas</exemplarCity>
 			</zone>
 			<zone type="Asia/Saigon">
-				<exemplarCity>Ho Chi Minh</exemplarCity>
+				<exemplarCity>Xoshimin</exemplarCity>
 			</zone>
 			<zone type="Pacific/Efate">
 				<exemplarCity>Efate</exemplarCity>
 			</zone>
 			<zone type="Pacific/Wallis">
-				<exemplarCity>Wallis</exemplarCity>
+				<exemplarCity>Uollis</exemplarCity>
 			</zone>
 			<zone type="Pacific/Apia">
 				<exemplarCity>Apia</exemplarCity>
@@ -2722,16 +3007,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Aden</exemplarCity>
 			</zone>
 			<zone type="Indian/Mayotte">
-				<exemplarCity>Mayotte</exemplarCity>
+				<exemplarCity>Mayorka</exemplarCity>
 			</zone>
 			<zone type="Africa/Johannesburg">
-				<exemplarCity>Johannesburg</exemplarCity>
+				<exemplarCity>Yoxannesburg</exemplarCity>
 			</zone>
 			<zone type="Africa/Lusaka">
 				<exemplarCity>Lusaka</exemplarCity>
 			</zone>
 			<zone type="Africa/Harare">
-				<exemplarCity>Harare</exemplarCity>
+				<exemplarCity>Xarare</exemplarCity>
 			</zone>
 			<metazone type="Afghanistan">
 				<long>
@@ -2750,7 +3035,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Africa_Southern">
 				<long>
-					<standard>Janubiy Afrika vaqti</standard>
+					<standard>Janubiy Afrika standart vaqti</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Western">
@@ -2764,7 +3049,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Alyaska vaqti</generic>
 					<standard>Alyaska standart vaqti</standard>
-					<daylight>Alyaska kunduzgi vaqti</daylight>
+					<daylight>Alyaska yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Amazon">
@@ -2776,44 +3061,44 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="America_Central">
 				<long>
-					<generic>Shimoliy Amerika markaziy vaqti</generic>
-					<standard>Shimoliy Amerika markaziy standart vaqti</standard>
-					<daylight>Shimoliy Amerika markaziy kunduzgi vaqti</daylight>
+					<generic>Markaziy Amerika vaqti</generic>
+					<standard>Markaziy Amerika standart vaqti</standard>
+					<daylight>Markaziy Amerika yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
-					<generic>Shimoliy Amerika sharqiy vaqti</generic>
-					<standard>Shimoliy Amerika sharqiy standart vaqti</standard>
-					<daylight>Shimoliy Amerika sharqiy kunduzgi vaqti</daylight>
+					<generic>Sharqiy Amerika vaqti</generic>
+					<standard>Sharqiy Amerika standart vaqti</standard>
+					<daylight>Sharqiy Amerika yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
 					<generic>Shimoliy Amerika togʻ vaqti</generic>
 					<standard>Shimoliy Amerika togʻ standart vaqti</standard>
-					<daylight>Shimoliy Amerika togʻ kunduzgi vaqti</daylight>
+					<daylight>Shimoliy Amerika togʻ yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
-					<generic>Shimoliy Amerika tinch okeani vaqti</generic>
-					<standard>Shimoliy Amerika tinch okeani standart vaqti</standard>
-					<daylight>Shimoliy Amerika tinch okeani kunduzgi vaqti</daylight>
+					<generic>Shimoliy Amerika Tinch okeani vaqti</generic>
+					<standard>Shimoliy Amerika Tinch okeani standart vaqti</standard>
+					<daylight>Shimoliy Amerika Tinch okeani yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Apia">
 				<long>
 					<generic>Apia vaqti</generic>
 					<standard>Apia standart vaqti</standard>
-					<daylight>Apia kunduzgi vaqti</daylight>
+					<daylight>Apia yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Arabian">
 				<long>
-					<generic>Arabiston vaqti</generic>
-					<standard>Arabiston standart vaqti</standard>
-					<daylight>Arabiston kunduzgi vaqti</daylight>
+					<generic>Saudiya Arabistoni vaqti</generic>
+					<standard>Saudiya Arabistoni standart vaqti</standard>
+					<daylight>Saudiya Arabistoni yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina">
@@ -2841,35 +3126,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Atlantika vaqti</generic>
 					<standard>Atlantika standart vaqti</standard>
-					<daylight>Atlantika kunduzgi vaqti</daylight>
+					<daylight>Atlantika yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
 					<generic>Markaziy Avstraliya vaqti</generic>
 					<standard>Markaziy Avstraliya standart vaqti</standard>
-					<daylight>Markaziy Avstraliya kunduzgi vaqti</daylight>
+					<daylight>Markaziy Avstraliya yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_CentralWestern">
 				<long>
-					<generic>Markaziy Avstraliya Gʻarbiy vaqti</generic>
-					<standard>Markaziy Avstraliya Gʻarbiy standart vaqti</standard>
-					<daylight>Markaziy Avstraliya Gʻarbiy kunduzgi vaqti</daylight>
+					<generic>Markaziy Avstraliya g‘arbiy vaqti</generic>
+					<standard>Markaziy Avstraliya g‘arbiy standart vaqti</standard>
+					<daylight>Markaziy Avstraliya g‘arbiy yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Eastern">
 				<long>
 					<generic>Sharqiy Avstraliya vaqti</generic>
 					<standard>Sharqiy Avstraliya standart vaqti</standard>
-					<daylight>Sharqiy Avstraliya kunduzgi vaqti</daylight>
+					<daylight>Sharqiy Avstraliya yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Western">
 				<long>
-					<generic>Gʻarbiy Avstraliya vaqti</generic>
-					<standard>Gʻarbiy Avstraliya standart vaqti</standard>
-					<daylight>Gʻarbiy Avstraliya kunduzgi vaqti</daylight>
+					<generic>G‘arbiy Avstraliya vaqti</generic>
+					<standard>G‘arbiy Avstraliya standart vaqti</standard>
+					<daylight>G‘arbiy Avstraliya yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azerbaijan">
@@ -2881,9 +3166,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Azores">
 				<long>
-					<generic>Azor vaqti</generic>
-					<standard>Azor standart vaqti</standard>
-					<daylight>Azor yozgi vaqti</daylight>
+					<generic>Azor orollari vaqti</generic>
+					<standard>Azor orollari standart vaqti</standard>
+					<daylight>Azor orollari yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Bangladesh">
@@ -2912,7 +3197,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Brunei">
 				<long>
-					<standard>Bruney Darussalom vaqti</standard>
+					<standard>Bruney-Dorussalom vaqti</standard>
 				</long>
 			</metazone>
 			<metazone type="Cape_Verde">
@@ -2924,14 +3209,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Chamorro">
 				<long>
-					<standard>Kamorro vaqti</standard>
+					<standard>Chamorro standart vaqti</standard>
 				</long>
 			</metazone>
 			<metazone type="Chatham">
 				<long>
-					<generic>Chatxam vaqti</generic>
-					<standard>Chatxam standart vaqti</standard>
-					<daylight>Chatxam kunduzgi vaqti</daylight>
+					<generic>Chatem vaqti</generic>
+					<standard>Chatem standart vaqti</standard>
+					<daylight>Chatem yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Chile">
@@ -2945,7 +3230,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Xitoy vaqti</generic>
 					<standard>Xitoy standart vaqti</standard>
-					<daylight>Xitoy kunduzgi vaqti</daylight>
+					<daylight>Xitoy yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Choibalsan">
@@ -2983,17 +3268,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Kuba vaqti</generic>
 					<standard>Kuba standart vaqti</standard>
-					<daylight>Kuba kunduzgi vaqti</daylight>
+					<daylight>Kuba yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Davis">
 				<long>
-					<standard>Devis vaqti</standard>
+					<standard>Deyvis vaqti</standard>
 				</long>
 			</metazone>
 			<metazone type="DumontDUrville">
 				<long>
-					<standard>Dumont-d-Urvil vaqti</standard>
+					<standard>Dyumon-d’Yurvil vaqti</standard>
 				</long>
 			</metazone>
 			<metazone type="East_Timor">
@@ -3003,9 +3288,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Easter">
 				<long>
-					<generic>Pasxi Oroli vaqti</generic>
-					<standard>Pasxi oroli standart vaqti</standard>
-					<daylight>Pasxi oroli yozgi vaqti</daylight>
+					<generic>Pasxa oroli vaqti</generic>
+					<standard>Pasxa oroli standart vaqti</standard>
+					<daylight>Pasxa oroli yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Ecuador">
@@ -3029,14 +3314,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
 				<long>
-					<standard>Uzoq-sharqiy Yevropa vaqti</standard>
+					<standard>Kaliningrad va Minsk vaqti</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
 				<long>
-					<generic>Gʻarbiy Yevropa vaqti</generic>
-					<standard>Gʻarbiy Yevropa standart vaqti</standard>
-					<daylight>Gʻarbiy Yevropa yozgi vaqti</daylight>
+					<generic>G‘arbiy Yevropa vaqti</generic>
+					<standard>G‘arbiy Yevropa standart vaqti</standard>
+					<daylight>G‘arbiy Yevropa yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Falkland">
@@ -3055,12 +3340,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="French_Guiana">
 				<long>
-					<standard>Frantsuz Gvianasi vaqti</standard>
+					<standard>Fransuz Gvianasi vaqti</standard>
 				</long>
 			</metazone>
 			<metazone type="French_Southern">
 				<long>
-					<standard>Frantsuz janubiy va Antarktika vaqti</standard>
+					<standard>Fransuz Janubiy va Antarktika vaqti</standard>
 				</long>
 			</metazone>
 			<metazone type="Galapagos">
@@ -3070,7 +3355,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Gambier">
 				<long>
-					<standard>Gambiyer vaqti</standard>
+					<standard>Gambye vaqti</standard>
 				</long>
 			</metazone>
 			<metazone type="Georgia">
@@ -3087,7 +3372,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="GMT">
 				<long>
-					<standard>Grinvich vaqti</standard>
+					<standard>Grinvich o‘rtacha vaqti</standard>
 				</long>
 			</metazone>
 			<metazone type="Greenland_Eastern">
@@ -3106,7 +3391,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Gulf">
 				<long>
-					<standard>Koʻrfaz vaqti</standard>
+					<standard>Fors ko‘rfazi standart vaqti</standard>
 				</long>
 			</metazone>
 			<metazone type="Guyana">
@@ -3118,7 +3403,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Gavayi-aleut vaqti</generic>
 					<standard>Gavayi-aleut standart vaqti</standard>
-					<daylight>Gavayi-aleut kunduzgi vaqti</daylight>
+					<daylight>Gavayi-aleut yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hong_Kong">
@@ -3147,7 +3432,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Indochina">
 				<long>
-					<standard>Hind-Xitoy vaqti</standard>
+					<standard>Hindixitoy vaqti</standard>
 				</long>
 			</metazone>
 			<metazone type="Indonesia_Central">
@@ -3169,7 +3454,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Eron vaqti</generic>
 					<standard>Eron standart vaqti</standard>
-					<daylight>Eron kunduzgi vaqti</daylight>
+					<daylight>Eron yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Irkutsk">
@@ -3183,14 +3468,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Isroil vaqti</generic>
 					<standard>Isroil standart vaqti</standard>
-					<daylight>Isroil kunduzgi vaqti</daylight>
+					<daylight>Isroil yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Japan">
 				<long>
 					<generic>Yaponiya vaqti</generic>
 					<standard>Yaponiya standart vaqti</standard>
-					<daylight>Yaponiya kunduzgi vaqti</daylight>
+					<daylight>Yaponiya yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kazakhstan_Eastern">
@@ -3207,12 +3492,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Koreya vaqti</generic>
 					<standard>Koreya standart vaqti</standard>
-					<daylight>Koreya kunduzgi vaqti</daylight>
+					<daylight>Koreya yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kosrae">
 				<long>
-					<standard>Kosraye vaqti</standard>
+					<standard>Kosrae vaqti</standard>
 				</long>
 			</metazone>
 			<metazone type="Krasnoyarsk">
@@ -3234,14 +3519,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Lord_Howe">
 				<long>
-					<generic>Lord Xove vaqti</generic>
-					<standard>Lord Xove standart vaqti</standard>
-					<daylight>Lord Xove kunduzgi vaqti</daylight>
+					<generic>Lord-Xau vaqti</generic>
+					<standard>Lord-Xau standart vaqti</standard>
+					<daylight>Lord-Xau yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Macquarie">
 				<long>
-					<standard>Makvari oroli vaqti</standard>
+					<standard>Makkuori oroli vaqti</standard>
 				</long>
 			</metazone>
 			<metazone type="Magadan">
@@ -3263,12 +3548,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Marquesas">
 				<long>
-					<standard>Markezas vaqti</standard>
+					<standard>Markiz orollari vaqti</standard>
 				</long>
 			</metazone>
 			<metazone type="Marshall_Islands">
 				<long>
-					<standard>Marshal orollari vaqti</standard>
+					<standard>Marshall orollari vaqti</standard>
 				</long>
 			</metazone>
 			<metazone type="Mauritius">
@@ -3280,21 +3565,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Mawson">
 				<long>
-					<standard>Mouvson vaqti</standard>
+					<standard>Mouson vaqti</standard>
 				</long>
 			</metazone>
 			<metazone type="Mexico_Northwest">
 				<long>
-					<generic>Shimoliy Mexiko vaqti</generic>
-					<standard>Shimoliy Mexiko Standart vaqti</standard>
-					<daylight>Shimoliy Mexiko kunduzgi vaqti</daylight>
+					<generic>Shimoli-g‘arbiy Meksika vaqti</generic>
+					<standard>Shimoli-g‘arbiy Meksika standart vaqti</standard>
+					<daylight>Shimoli-g‘arbiy Meksika yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
-					<generic>Meksikan tinch okeani vaqti</generic>
-					<standard>Meksikan tinch okeani standart vaqti</standard>
-					<daylight>Meksikan tinch okeani kunduzgi vaqti</daylight>
+					<generic>Meksika Tinch okeani vaqti</generic>
+					<standard>Meksika Tinch okeani standart vaqti</standard>
+					<daylight>Meksika Tinch okeani yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mongolia">
@@ -3337,14 +3622,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Yangi Zelandiya vaqti</generic>
 					<standard>Yangi Zelandiya standart vaqti</standard>
-					<daylight>Yangi Zelandiya kunduzgi vaqti</daylight>
+					<daylight>Yangi Zelandiya yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Newfoundland">
 				<long>
 					<generic>Nyufaundlend vaqti</generic>
 					<standard>Nyufaundlend standart vaqti</standard>
-					<daylight>Nyufaundlend kunduzgi vaqti</daylight>
+					<daylight>Nyufaundlend yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Niue">
@@ -3359,9 +3644,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Noronha">
 				<long>
-					<generic>Fernando de Noronya vaqti</generic>
-					<standard>Fernando de Noronya standart vaqti</standard>
-					<daylight>Fernando de Noronya yozgi vaqti</daylight>
+					<generic>Fernandu-di-Noronya vaqti</generic>
+					<standard>Fernandu-di-Noronya standart vaqti</standard>
+					<daylight>Fernandu-di-Noronya yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Novosibirsk">
@@ -3423,9 +3708,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Pierre_Miquelon">
 				<long>
-					<generic>Sent-Pyer va Mikelon vaqti</generic>
-					<standard>Sent-Pyer va Mikelon standart vaqti</standard>
-					<daylight>Sent-Pyer va Mikelon kunduzgi vaqti</daylight>
+					<generic>Sen-Pyer va Mikelon vaqti</generic>
+					<standard>Sen-Pyer va Mikelon standart vaqti</standard>
+					<daylight>Sen-Pyer va Mikelon yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Pitcairn">
@@ -3440,7 +3725,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Reunion">
 				<long>
-					<standard>Reyunon vaqti</standard>
+					<standard>Reyunion vaqti</standard>
 				</long>
 			</metazone>
 			<metazone type="Rothera">
@@ -3459,7 +3744,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<long>
 					<generic>Samoa vaqti</generic>
 					<standard>Samoa standart vaqti</standard>
-					<daylight>Samoa kunduzgi vaqti</daylight>
+					<daylight>Samoa yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Seychelles">
@@ -3479,7 +3764,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="South_Georgia">
 				<long>
-					<standard>Janubiy Djordjiya vaqti</standard>
+					<standard>Janubiy Georgiya vaqti</standard>
 				</long>
 			</metazone>
 			<metazone type="Suriname">
@@ -3489,7 +3774,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Syowa">
 				<long>
-					<standard>Sova vaqti</standard>
+					<standard>Syova vaqti</standard>
 				</long>
 			</metazone>
 			<metazone type="Tahiti">
@@ -3499,9 +3784,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Taipei">
 				<long>
-					<generic>Taypey vaqti</generic>
-					<standard>Taypey standart vaqti</standard>
-					<daylight>Taypey kunduzgi vaqti</daylight>
+					<generic>Tayvan vaqti</generic>
+					<standard>Tayvan standart vaqti</standard>
+					<daylight>Tayvan yozgi vaqti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tajikistan">
@@ -3590,7 +3875,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Wallis">
 				<long>
-					<standard>Uellis va Futuna vaqti</standard>
+					<standard>Uollis va Futuna vaqti</standard>
 				</long>
 			</metazone>
 			<metazone type="Yakutsk">
@@ -3610,6 +3895,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</timeZoneNames>
 	</dates>
 	<numbers>
+		<defaultNumberingSystem draft="contributed">latn</defaultNumberingSystem>
+		<otherNumberingSystems>
+			<native draft="contributed">latn</native>
+		</otherNumberingSystems>
 		<minimumGroupingDigits draft="contributed">1</minimumGroupingDigits>
 		<symbols numberSystem="arabext">
 			<decimal>٫</decimal>
@@ -3621,8 +3910,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<superscriptingExponent>×</superscriptingExponent>
 			<perMille>؉</perMille>
 			<infinity>∞</infinity>
-			<nan>NaN</nan>
-			<timeSeparator draft="contributed">٫</timeSeparator>
+			<nan>haqiqiy son emas</nan>
 		</symbols>
 		<symbols numberSystem="latn">
 			<decimal>,</decimal>
@@ -3634,7 +3922,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<superscriptingExponent>×</superscriptingExponent>
 			<perMille>‰</perMille>
 			<infinity>∞</infinity>
-			<nan>NaN</nan>
+			<nan>haqiqiy son emas</nan>
 			<timeSeparator draft="contributed">:</timeSeparator>
 		</symbols>
 		<decimalFormats numberSystem="arabext">
@@ -3670,40 +3958,40 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern type="10000000000" count="other">00 milliard</pattern>
 					<pattern type="100000000000" count="one">000 milliard</pattern>
 					<pattern type="100000000000" count="other">000 milliard</pattern>
-					<pattern type="1000000000000" count="one">0 trilion</pattern>
-					<pattern type="1000000000000" count="other">0 trilion</pattern>
-					<pattern type="10000000000000" count="one">00 trilion</pattern>
-					<pattern type="10000000000000" count="other">00 trilion</pattern>
-					<pattern type="100000000000000" count="one">000 trilion</pattern>
-					<pattern type="100000000000000" count="other">000 trilion</pattern>
+					<pattern type="1000000000000" count="one">0 trillion</pattern>
+					<pattern type="1000000000000" count="other">0 trillion</pattern>
+					<pattern type="10000000000000" count="one">00 trillion</pattern>
+					<pattern type="10000000000000" count="other">00 trillion</pattern>
+					<pattern type="100000000000000" count="one">000 trillion</pattern>
+					<pattern type="100000000000000" count="other">000 trillion</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
 			<decimalFormatLength type="short">
 				<decimalFormat>
-					<pattern type="1000" count="one">0ming</pattern>
-					<pattern type="1000" count="other">0ming</pattern>
-					<pattern type="10000" count="one">00ming</pattern>
-					<pattern type="10000" count="other">00ming</pattern>
-					<pattern type="100000" count="one">000ming</pattern>
-					<pattern type="100000" count="other">000ming</pattern>
-					<pattern type="1000000" count="one">0mln</pattern>
-					<pattern type="1000000" count="other">0mln</pattern>
-					<pattern type="10000000" count="one">00mln</pattern>
-					<pattern type="10000000" count="other">00mln</pattern>
-					<pattern type="100000000" count="one">000mln</pattern>
-					<pattern type="100000000" count="other">000mln</pattern>
-					<pattern type="1000000000" count="one">0mlrd</pattern>
-					<pattern type="1000000000" count="other">0mlrd</pattern>
-					<pattern type="10000000000" count="one">00mlrd</pattern>
-					<pattern type="10000000000" count="other">00mlrd</pattern>
-					<pattern type="100000000000" count="one">000mlrd</pattern>
-					<pattern type="100000000000" count="other">000mlrd</pattern>
-					<pattern type="1000000000000" count="one">0trln</pattern>
-					<pattern type="1000000000000" count="other">0trln</pattern>
-					<pattern type="10000000000000" count="one">00trln</pattern>
-					<pattern type="10000000000000" count="other">00trln</pattern>
-					<pattern type="100000000000000" count="one">000trln</pattern>
-					<pattern type="100000000000000" count="other">000trln</pattern>
+					<pattern type="1000" count="one">0 ming</pattern>
+					<pattern type="1000" count="other">0 ming</pattern>
+					<pattern type="10000" count="one">00 ming</pattern>
+					<pattern type="10000" count="other">00 ming</pattern>
+					<pattern type="100000" count="one">000 ming</pattern>
+					<pattern type="100000" count="other">000 ming</pattern>
+					<pattern type="1000000" count="one">0 mln</pattern>
+					<pattern type="1000000" count="other">0 mln</pattern>
+					<pattern type="10000000" count="one">00 mln</pattern>
+					<pattern type="10000000" count="other">00 mln</pattern>
+					<pattern type="100000000" count="one">000 mln</pattern>
+					<pattern type="100000000" count="other">000 mln</pattern>
+					<pattern type="1000000000" count="one">0 mlrd</pattern>
+					<pattern type="1000000000" count="other">0 mlrd</pattern>
+					<pattern type="10000000000" count="one">00 mlrd</pattern>
+					<pattern type="10000000000" count="other">00 mlrd</pattern>
+					<pattern type="100000000000" count="one">000 mlrd</pattern>
+					<pattern type="100000000000" count="other">000 mlrd</pattern>
+					<pattern type="1000000000000" count="one">0 trln</pattern>
+					<pattern type="1000000000000" count="other">0 trln</pattern>
+					<pattern type="10000000000000" count="one">00 trln</pattern>
+					<pattern type="10000000000000" count="other">00 trln</pattern>
+					<pattern type="100000000000000" count="one">000 trln</pattern>
+					<pattern type="100000000000000" count="other">000 trln</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
@@ -3745,10 +4033,38 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
-					<pattern>¤ #,##0.00</pattern>
+					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern>¤ #,##0.00</pattern>
+					<pattern>#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">0 ming ¤</pattern>
+					<pattern type="1000" count="other">0 ming ¤</pattern>
+					<pattern type="10000" count="one">00 ming ¤</pattern>
+					<pattern type="10000" count="other">00 ming ¤</pattern>
+					<pattern type="100000" count="one">000 ming ¤</pattern>
+					<pattern type="100000" count="other">000 ming ¤</pattern>
+					<pattern type="1000000" count="one">0 mln ¤</pattern>
+					<pattern type="1000000" count="other">0 mln ¤</pattern>
+					<pattern type="10000000" count="one">00 mln ¤</pattern>
+					<pattern type="10000000" count="other">00 mln ¤</pattern>
+					<pattern type="100000000" count="one">000 mln ¤</pattern>
+					<pattern type="100000000" count="other">000 mln ¤</pattern>
+					<pattern type="1000000000" count="one">0 mlrd ¤</pattern>
+					<pattern type="1000000000" count="other">0 mlrd ¤</pattern>
+					<pattern type="10000000000" count="one">00 mlrd ¤</pattern>
+					<pattern type="10000000000" count="other">00 mlrd ¤</pattern>
+					<pattern type="100000000000" count="one">000 mlrd ¤</pattern>
+					<pattern type="100000000000" count="other">000 mlrd ¤</pattern>
+					<pattern type="1000000000000" count="one">0 trln ¤</pattern>
+					<pattern type="1000000000000" count="other">0 trln ¤</pattern>
+					<pattern type="10000000000000" count="one">00 trln ¤</pattern>
+					<pattern type="10000000000000" count="other">00 trln ¤</pattern>
+					<pattern type="100000000000000" count="one">000 trln ¤</pattern>
+					<pattern type="100000000000000" count="other">000 trln ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
@@ -3756,40 +4072,41 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
-				<displayName>AED</displayName>
+				<displayName>Birlashgan Arab Amirliklari dirhami</displayName>
 				<displayName count="one">BAA dirhami</displayName>
-				<displayName count="other">AED</displayName>
+				<displayName count="other">BAA dirhami</displayName>
 				<symbol>AED</symbol>
 			</currency>
 			<currency type="AFN">
-				<displayName>AFN</displayName>
+				<displayName>Afg‘oniston afg‘oni</displayName>
 				<displayName count="one">Afg‘oniston afg‘oni</displayName>
-				<displayName count="other">AFN</displayName>
+				<displayName count="other">Afg‘oniston afg‘oni</displayName>
 				<symbol>AFN</symbol>
 			</currency>
 			<currency type="ALL">
-				<displayName>Alban leki</displayName>
-				<displayName count="one">Alban leki</displayName>
-				<displayName count="other">Alban leki</displayName>
+				<displayName>Albaniya leki</displayName>
+				<displayName count="one">Albaniya leki</displayName>
+				<displayName count="other">Albaniya leki</displayName>
 				<symbol>ALL</symbol>
 			</currency>
 			<currency type="AMD">
-				<displayName>AMD</displayName>
+				<displayName>Armaniston drami</displayName>
 				<displayName count="one">Armaniston drami</displayName>
-				<displayName count="other">AMD</displayName>
+				<displayName count="other">Armaniston drami</displayName>
 				<symbol>AMD</symbol>
 			</currency>
 			<currency type="ANG">
-				<displayName>Golland Antil guldeni</displayName>
-				<displayName count="one">Golland Antil guldeni</displayName>
-				<displayName count="other">Golland Antil guldeni</displayName>
+				<displayName>Niderland antil guldeni</displayName>
+				<displayName count="one">Niderland antil guldeni</displayName>
+				<displayName count="other">Niderland antil guldeni</displayName>
 				<symbol>ANG</symbol>
 			</currency>
 			<currency type="AOA">
-				<displayName>AOA</displayName>
+				<displayName>Angola kvanzasi</displayName>
 				<displayName count="one">Angola kvanzasi</displayName>
-				<displayName count="other">AOA</displayName>
+				<displayName count="other">Angola kvanzasi</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="ARS">
 				<displayName>Argentina pesosi</displayName>
@@ -3803,6 +4120,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Avstraliya dollari</displayName>
 				<displayName count="other">Avstraliya dollari</displayName>
 				<symbol>A$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="AWG">
 				<displayName>Aruba florini</displayName>
@@ -3811,16 +4129,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>AWG</symbol>
 			</currency>
 			<currency type="AZN">
-				<displayName>AZN</displayName>
+				<displayName>Ozarbayjon manati</displayName>
 				<displayName count="one">Ozarbayjon manati</displayName>
-				<displayName count="other">AZN</displayName>
+				<displayName count="other">Ozarbayjon manati</displayName>
 				<symbol>AZN</symbol>
 			</currency>
 			<currency type="BAM">
-				<displayName>Bosniya va Gertsogovina ayriboshlash markasi</displayName>
-				<displayName count="one">Bosniya va Gertsogovina ayriboshlash markasi</displayName>
-				<displayName count="other">Bosniya va Gertsogovina ayriboshlash markasi</displayName>
+				<displayName>Bosniya va Gertsegovina ayirboshlash markasi</displayName>
+				<displayName count="one">Bosniya va Gertsegovina ayirboshlash markasi</displayName>
+				<displayName count="other">Bosniya va Gertsegovina ayirboshlash markasi</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>Barbados dollari</displayName>
@@ -3830,10 +4149,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BDT">
-				<displayName>BDT</displayName>
+				<displayName>Bangladesh takasi</displayName>
 				<displayName count="one">Bangladesh takasi</displayName>
-				<displayName count="other">BDT</displayName>
+				<displayName count="other">Bangladesh takasi</displayName>
 				<symbol>BDT</symbol>
+				<symbol alt="narrow" draft="contributed">৳</symbol>
 			</currency>
 			<currency type="BGN">
 				<displayName>Bolgariya levi</displayName>
@@ -3842,15 +4162,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>BGN</symbol>
 			</currency>
 			<currency type="BHD">
-				<displayName>BHD</displayName>
+				<displayName>Bahrayn dinori</displayName>
 				<displayName count="one">Bahrayn dinori</displayName>
-				<displayName count="other">BHD</displayName>
+				<displayName count="other">Bahrayn dinori</displayName>
 				<symbol>BHD</symbol>
 			</currency>
 			<currency type="BIF">
-				<displayName>BIF</displayName>
+				<displayName>Burundi franki</displayName>
 				<displayName count="one">Burundi franki</displayName>
-				<displayName count="other">BIF</displayName>
+				<displayName count="other">Burundi franki</displayName>
 				<symbol>BIF</symbol>
 			</currency>
 			<currency type="BMD">
@@ -3861,21 +4181,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BND">
-				<displayName>BND</displayName>
+				<displayName>Bruney dollari</displayName>
 				<displayName count="one">Bruney dollari</displayName>
-				<displayName count="other">BND</displayName>
+				<displayName count="other">Bruney dollari</displayName>
 				<symbol>BND</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BOB">
-				<displayName>Boliviya bolivyani</displayName>
-				<displayName count="one">Boliviya bolivyani</displayName>
-				<displayName count="other">Boliviya bolivyani</displayName>
+				<displayName>Boliviya bolivianosi</displayName>
+				<displayName count="one">Boliviya bolivianosi</displayName>
+				<displayName count="other">Boliviya bolivianosi</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BRL">
-				<displayName>Brazil reali</displayName>
-				<displayName count="one">Brazil reali</displayName>
-				<displayName count="other">Brazil reali</displayName>
+				<displayName>Braziliya reali</displayName>
+				<displayName count="one">Braziliya reali</displayName>
+				<displayName count="other">Braziliya reali</displayName>
 				<symbol>R$</symbol>
 				<symbol alt="narrow" draft="contributed">R$</symbol>
 			</currency>
@@ -3887,16 +4209,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BTN">
-				<displayName>BTN</displayName>
+				<displayName>Butan ngultrumi</displayName>
 				<displayName count="one">Butan ngultrumi</displayName>
-				<displayName count="other">BTN</displayName>
+				<displayName count="other">Butan ngultrumi</displayName>
 				<symbol>BTN</symbol>
 			</currency>
 			<currency type="BWP">
-				<displayName>BWP</displayName>
+				<displayName>Botsvana pulasi</displayName>
 				<displayName count="one">Botsvana pulasi</displayName>
-				<displayName count="other">BWP</displayName>
+				<displayName count="other">Botsvana pulasi</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYR">
 				<displayName>Belarus rubli</displayName>
@@ -3920,15 +4243,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CDF">
-				<displayName>CDF</displayName>
+				<displayName>Kongo franki</displayName>
 				<displayName count="one">Kongo franki</displayName>
-				<displayName count="other">CDF</displayName>
+				<displayName count="other">Kongo franki</displayName>
 				<symbol>CDF</symbol>
 			</currency>
 			<currency type="CHF">
-				<displayName>Shvetsariya franki</displayName>
-				<displayName count="one">Shvetsariya franki</displayName>
-				<displayName count="other">Shvetsariya franki</displayName>
+				<displayName>Shveytsariya franki</displayName>
+				<displayName count="one">Shveytsariya franki</displayName>
+				<displayName count="other">Shveytsariya franki</displayName>
 				<symbol>CHF</symbol>
 			</currency>
 			<currency type="CLP">
@@ -3943,6 +4266,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Xitoy yuani</displayName>
 				<displayName count="other">Xitoy yuani</displayName>
 				<symbol>CN¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
 			<currency type="COP">
 				<displayName>Kolumbiya pesosi</displayName>
@@ -3959,10 +4283,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">₡</symbol>
 			</currency>
 			<currency type="CUC">
-				<displayName>Kuba Ayirboshlash pesosi</displayName>
+				<displayName>Kuba ayirboshlash pesosi</displayName>
 				<displayName count="one">Kuba ayirboshlash pesosi</displayName>
 				<displayName count="other">Kuba ayirboshlash pesosi</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>Kuba pesosi</displayName>
@@ -3972,21 +4297,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CVE">
-				<displayName>CVE</displayName>
-				<displayName count="one">Keyp Verdin eskudosi</displayName>
-				<displayName count="other">CVE</displayName>
+				<displayName>Kabo-Verde eskudosi</displayName>
+				<displayName count="one">Kabo-Verde eskudosi</displayName>
+				<displayName count="other">Kabo-Verde eskudosi</displayName>
 				<symbol>CVE</symbol>
 			</currency>
 			<currency type="CZK">
-				<displayName>Chex kronasi</displayName>
-				<displayName count="one">Chex kronasi</displayName>
-				<displayName count="other">Chex kronasi</displayName>
+				<displayName>Chexiya kronasi</displayName>
+				<displayName count="one">Chexiya kronasi</displayName>
+				<displayName count="other">Chexiya kronasi</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DJF">
-				<displayName>DJF</displayName>
+				<displayName>Jibuti franki</displayName>
 				<displayName count="one">Jibuti franki</displayName>
-				<displayName count="other">DJF</displayName>
+				<displayName count="other">Jibuti franki</displayName>
 				<symbol>DJF</symbol>
 			</currency>
 			<currency type="DKK">
@@ -3994,6 +4320,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Daniya kronasi</displayName>
 				<displayName count="other">Daniya kronasi</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Dominikan pesosi</displayName>
@@ -4013,17 +4340,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Misr funti</displayName>
 				<displayName count="other">Misr funti</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
-				<displayName>ERN</displayName>
-				<displayName count="one">Eritreya nafkasi</displayName>
-				<displayName count="other">ERN</displayName>
+				<displayName>Eritreya nakfasi</displayName>
+				<displayName count="one">Eritreya nakfasi</displayName>
+				<displayName count="other">Eritreya nakfasi</displayName>
 				<symbol>ERN</symbol>
 			</currency>
 			<currency type="ETB">
-				<displayName>ETB</displayName>
+				<displayName>Efiopiya biri</displayName>
 				<displayName count="one">Efiopiya biri</displayName>
-				<displayName count="other">ETB</displayName>
+				<displayName count="other">Efiopiya biri</displayName>
 				<symbol>ETB</symbol>
 			</currency>
 			<currency type="EUR">
@@ -4034,34 +4362,37 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">€</symbol>
 			</currency>
 			<currency type="FJD">
-				<displayName>FJD</displayName>
+				<displayName>Fiji dollari</displayName>
 				<displayName count="one">Fiji dollari</displayName>
-				<displayName count="other">FJD</displayName>
+				<displayName count="other">Fiji dollari</displayName>
 				<symbol>FJD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="FKP">
-				<displayName>Folklend oroli funti</displayName>
-				<displayName count="one">Folklend oroli funti</displayName>
-				<displayName count="other">Folklend oroli funti</displayName>
+				<displayName>Folklend orollari funti</displayName>
+				<displayName count="one">Folklend orollari funti</displayName>
+				<displayName count="other">Folklend orollari funti</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GBP">
-				<displayName>Ingliz funt</displayName>
-				<displayName count="one">Ingliz funt</displayName>
-				<displayName count="other">Ingliz funt</displayName>
+				<displayName>Angliya funt sterlingi</displayName>
+				<displayName count="one">Angliya funt sterlingi</displayName>
+				<displayName count="other">Angliya funt sterlingi</displayName>
 				<symbol>£</symbol>
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GEL">
-				<displayName>GEL</displayName>
-				<displayName count="one">Gujiston larisi</displayName>
-				<displayName count="other">GEL</displayName>
+				<displayName>Gruziya larisi</displayName>
+				<displayName count="one">Gruziya larisi</displayName>
+				<displayName count="other">Gruziya larisi</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHS">
-				<displayName>GHS</displayName>
-				<displayName count="one">Gana kedisi</displayName>
-				<displayName count="other">GHS</displayName>
+				<displayName>Gana sedisi</displayName>
+				<displayName count="one">Gana sedisi</displayName>
+				<displayName count="other">Gana sedisi</displayName>
 				<symbol>GHS</symbol>
 			</currency>
 			<currency type="GIP">
@@ -4072,22 +4403,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GMD">
-				<displayName>GMD</displayName>
+				<displayName>Gambiya dalasisi</displayName>
 				<displayName count="one">Gambiya dalisisi</displayName>
-				<displayName count="other">GMD</displayName>
+				<displayName count="other">Gambiya dalasisi</displayName>
 				<symbol>GMD</symbol>
 			</currency>
 			<currency type="GNF">
-				<displayName>GNF</displayName>
+				<displayName>Gvineya franki</displayName>
 				<displayName count="one">Gvineya franki</displayName>
-				<displayName count="other">GNF</displayName>
+				<displayName count="other">Gvineya franki</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GTQ">
-				<displayName>Gvatemala kvetzali</displayName>
-				<displayName count="one">Gvatemala kvetzali</displayName>
-				<displayName count="other">Gvatemala kvetzali</displayName>
+				<displayName>Gvatemala ketsali</displayName>
+				<displayName count="one">Gvatemala ketsali</displayName>
+				<displayName count="other">Gvatemala ketsali</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GYD">
 				<displayName>Gayana dollari</displayName>
@@ -4101,18 +4434,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Gonkong dollari</displayName>
 				<displayName count="other">Gonkong dollari</displayName>
 				<symbol>HK$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="HNL">
 				<displayName>Gonduras lempirasi</displayName>
 				<displayName count="one">Gonduras lempirasi</displayName>
 				<displayName count="other">Gonduras lempirasi</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRK">
-				<displayName>Horvat kunasi</displayName>
-				<displayName count="one">Horvat kunasi</displayName>
-				<displayName count="other">Horvat kunasi</displayName>
+				<displayName>Xorvatiya kunasi</displayName>
+				<displayName count="one">Xorvatiya kunasi</displayName>
+				<displayName count="other">Xorvatiya kunasi</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>Gaiti gurdasi</displayName>
@@ -4125,35 +4461,39 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Vengriya forinti</displayName>
 				<displayName count="other">Vengriya forinti</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>Indoneziya rupiyasi</displayName>
 				<displayName count="one">Indoneziya rupiyasi</displayName>
 				<displayName count="other">Indoneziya rupiyasi</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="ILS">
-				<displayName>ILS</displayName>
-				<displayName count="one">Isroil shekeli</displayName>
-				<displayName count="other">ILS</displayName>
+				<displayName>Isroil yangi shekeli</displayName>
+				<displayName count="one">Isroil yangi shekeli</displayName>
+				<displayName count="other">Isroil yangi shekeli</displayName>
 				<symbol>₪</symbol>
+				<symbol alt="narrow" draft="contributed">₪</symbol>
 			</currency>
 			<currency type="INR">
-				<displayName>Hind rupiyasi</displayName>
-				<displayName count="one">Hind rupiyasi</displayName>
-				<displayName count="other">Hind rupiyasi</displayName>
+				<displayName>Hindiston rupiyasi</displayName>
+				<displayName count="one">Hindiston rupiyasi</displayName>
+				<displayName count="other">Hindiston rupiyasi</displayName>
 				<symbol>₹</symbol>
+				<symbol alt="narrow" draft="contributed">₹</symbol>
 			</currency>
 			<currency type="IQD">
-				<displayName>IQD</displayName>
+				<displayName>Iroq dinori</displayName>
 				<displayName count="one">Iroq dinori</displayName>
-				<displayName count="other">IQD</displayName>
+				<displayName count="other">Iroq dinori</displayName>
 				<symbol>IQD</symbol>
 			</currency>
 			<currency type="IRR">
-				<displayName>IRR</displayName>
+				<displayName>Eron riali</displayName>
 				<displayName count="one">Eron riali</displayName>
-				<displayName count="other">IRR</displayName>
+				<displayName count="other">Eron riali</displayName>
 				<symbol>IRR</symbol>
 			</currency>
 			<currency type="ISK">
@@ -4161,6 +4501,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Islandiya kronasi</displayName>
 				<displayName count="other">Islandiya kronasi</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="JMD">
 				<displayName>Yamayka dollari</displayName>
@@ -4170,95 +4511,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="JOD">
-				<displayName>JOD</displayName>
+				<displayName>Iordaniya dinori</displayName>
 				<displayName count="one">Yordaniya dinori</displayName>
-				<displayName count="other">JOD</displayName>
+				<displayName count="other">Iordaniya dinori</displayName>
 				<symbol>JOD</symbol>
 			</currency>
 			<currency type="JPY">
-				<displayName>Yapon yenasi</displayName>
-				<displayName count="one">Yapon yenasi</displayName>
-				<displayName count="other">Yapon yenasi</displayName>
+				<displayName>Yaponiya iyenasi</displayName>
+				<displayName count="one">Yaponiya iyenasi</displayName>
+				<displayName count="other">Yaponiya iyenasi</displayName>
 				<symbol>JP¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
 			<currency type="KES">
-				<displayName>KES</displayName>
+				<displayName>Keniya shillingi</displayName>
 				<displayName count="one">Keniya shillingi</displayName>
-				<displayName count="other">KES</displayName>
+				<displayName count="other">Keniya shillingi</displayName>
 				<symbol>KES</symbol>
 			</currency>
 			<currency type="KGS">
-				<displayName>KGS</displayName>
+				<displayName>Qirg‘iziston so‘mi</displayName>
 				<displayName count="one">Qirg‘iziston so‘mi</displayName>
-				<displayName count="other">KGS</displayName>
+				<displayName count="other">Qirg‘iziston so‘mi</displayName>
 				<symbol>KGS</symbol>
 			</currency>
 			<currency type="KHR">
-				<displayName>KHR</displayName>
-				<displayName count="one">Kambodja riyeli</displayName>
-				<displayName count="other">KHR</displayName>
+				<displayName>Kamboja rieli</displayName>
+				<displayName count="one">Kamboja rieli</displayName>
+				<displayName count="other">Kamboja rieli</displayName>
 				<symbol>KHR</symbol>
+				<symbol alt="narrow" draft="contributed">៛</symbol>
 			</currency>
 			<currency type="KMF">
-				<displayName>KMF</displayName>
-				<displayName count="one">Komor franki</displayName>
-				<displayName count="other">KMF</displayName>
+				<displayName>Komor orollari franki</displayName>
+				<displayName count="one">Komor orollari franki</displayName>
+				<displayName count="other">Komor orollari franki</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
-				<displayName>KPW</displayName>
-				<displayName count="one">Shimoliy Koreya uoni</displayName>
-				<displayName count="other">KPW</displayName>
+				<displayName>Shimoliy Koreya voni</displayName>
+				<displayName count="one">Shimoliy Koreya voni</displayName>
+				<displayName count="other">Shimoliy Koreya voni</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>Janubiy Koreya voni</displayName>
 				<displayName count="one">Janubiy Koreya voni</displayName>
 				<displayName count="other">Janubiy Koreya voni</displayName>
 				<symbol>₩</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KWD">
-				<displayName>KWD</displayName>
+				<displayName>Quvayt dinori</displayName>
 				<displayName count="one">Quvayt dinori</displayName>
-				<displayName count="other">KWD</displayName>
+				<displayName count="other">Quvayt dinori</displayName>
 				<symbol>KWD</symbol>
 			</currency>
 			<currency type="KYD">
-				<displayName>Kayman Orollari Dollari</displayName>
+				<displayName>Kayman orollari dollari</displayName>
 				<displayName count="one">Kayman orollari dollari</displayName>
 				<displayName count="other">Kayman orollari dollari</displayName>
 				<symbol>KYD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="KZT">
-				<displayName>KZT</displayName>
-				<displayName count="one">Qozogʻiston tengesi</displayName>
-				<displayName count="other">KZT</displayName>
+				<displayName>Qozog‘iston tengesi</displayName>
+				<displayName count="one">Qozog‘iston tengesi</displayName>
+				<displayName count="other">Qozog‘iston tengesi</displayName>
 				<symbol>KZT</symbol>
+				<symbol alt="narrow" draft="contributed">₸</symbol>
 			</currency>
 			<currency type="LAK">
-				<displayName>LAK</displayName>
+				<displayName>Laos kipi</displayName>
 				<displayName count="one">Laos kipi</displayName>
-				<displayName count="other">LAK</displayName>
+				<displayName count="other">Laos kipi</displayName>
 				<symbol>LAK</symbol>
+				<symbol alt="narrow" draft="contributed">₭</symbol>
 			</currency>
 			<currency type="LBP">
-				<displayName>LBP</displayName>
+				<displayName>Livan funti</displayName>
 				<displayName count="one">Livan funti</displayName>
-				<displayName count="other">LBP</displayName>
+				<displayName count="other">Livan funti</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
-				<displayName>LKR</displayName>
-				<displayName count="one">Shri Lanka rupisi</displayName>
-				<displayName count="other">LKR</displayName>
+				<displayName>Shri-Lanka rupiyasi</displayName>
+				<displayName count="one">Shri-Lanka rupiyasi</displayName>
+				<displayName count="other">Shri-Lanka rupiyasi</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
-				<displayName>LRD</displayName>
+				<displayName>Liberiya dollari</displayName>
 				<displayName count="one">Liberiya dollari</displayName>
-				<displayName count="other">LRD</displayName>
+				<displayName count="other">Liberiya dollari</displayName>
 				<symbol>LRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="LTL">
 				<displayName>Litva liti</displayName>
@@ -4285,16 +4636,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>MAD</symbol>
 			</currency>
 			<currency type="MDL">
-				<displayName>Moldova leusi</displayName>
-				<displayName count="one">Moldova leusi</displayName>
-				<displayName count="other">Moldova leusi</displayName>
+				<displayName>Moldova leyi</displayName>
+				<displayName count="one">Moldova leyi</displayName>
+				<displayName count="other">Moldova leyi</displayName>
 				<symbol>MDL</symbol>
 			</currency>
 			<currency type="MGA">
-				<displayName>MGA</displayName>
-				<displayName count="one">Malagas Aryari</displayName>
-				<displayName count="other">MGA</displayName>
+				<displayName>Malagasi ariarisi</displayName>
+				<displayName count="one">Malagasi ariarisi</displayName>
+				<displayName count="other">Malagasi ariarisi</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MKD">
 				<displayName>Makedoniya dinori</displayName>
@@ -4303,45 +4655,48 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>MKD</symbol>
 			</currency>
 			<currency type="MMK">
-				<displayName>MMK</displayName>
+				<displayName>Myanma kyati</displayName>
 				<displayName count="one">Myanma kyati</displayName>
-				<displayName count="other">MMK</displayName>
+				<displayName count="other">Myanma kyati</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
-				<displayName>MNT</displayName>
-				<displayName count="one">Mo‘g‘ul tugriki</displayName>
-				<displayName count="other">MNT</displayName>
+				<displayName>Mongoliya tugriki</displayName>
+				<displayName count="one">Mongoliya tugriki</displayName>
+				<displayName count="other">Mongoliya tugriki</displayName>
 				<symbol>MNT</symbol>
+				<symbol alt="narrow" draft="contributed">₮</symbol>
 			</currency>
 			<currency type="MOP">
-				<displayName>MOP</displayName>
-				<displayName count="one">Makanis patakasi</displayName>
-				<displayName count="other">MOP</displayName>
+				<displayName>Makao patakasi</displayName>
+				<displayName count="one">Makao patakasi</displayName>
+				<displayName count="other">Makao patakasi</displayName>
 				<symbol>MOP</symbol>
 			</currency>
 			<currency type="MRO">
-				<displayName>MRO</displayName>
+				<displayName>Mavritaniya ugiyasi</displayName>
 				<displayName count="one">Mavritaniya ugiyasi</displayName>
-				<displayName count="other">MRO</displayName>
+				<displayName count="other">Mavritaniya ugiyasi</displayName>
 				<symbol>MRO</symbol>
 			</currency>
 			<currency type="MUR">
-				<displayName>MUR</displayName>
-				<displayName count="one">Mavritaniya rupisi</displayName>
-				<displayName count="other">MUR</displayName>
+				<displayName>Mavritaniya rupiyasi</displayName>
+				<displayName count="one">Mavritaniya rupiyasi</displayName>
+				<displayName count="other">Mavritaniya rupiyasi</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
-				<displayName>MVR</displayName>
-				<displayName count="one">Maldiv rufiyaasi</displayName>
-				<displayName count="other">MVR</displayName>
+				<displayName>Maldiv rupiyasi</displayName>
+				<displayName count="one">Maldiv rupiyasi</displayName>
+				<displayName count="other">Maldiv rupiyasi</displayName>
 				<symbol>MVR</symbol>
 			</currency>
 			<currency type="MWK">
-				<displayName>MWK</displayName>
+				<displayName>Malavi kvachasi</displayName>
 				<displayName count="one">Malavi kvachasi</displayName>
-				<displayName count="other">MWK</displayName>
+				<displayName count="other">Malavi kvachasi</displayName>
 				<symbol>MWK</symbol>
 			</currency>
 			<currency type="MXN">
@@ -4352,57 +4707,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="MYR">
-				<displayName>MYR</displayName>
-				<displayName count="one">Malayziya ringiti</displayName>
-				<displayName count="other">MYR</displayName>
+				<displayName>Malayziya ringgiti</displayName>
+				<displayName count="one">Malayziya ringgiti</displayName>
+				<displayName count="other">Malayziya ringgiti</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZN">
-				<displayName>MZN</displayName>
+				<displayName>Mozambik metikali</displayName>
 				<displayName count="one">Mozambik metikali</displayName>
-				<displayName count="other">MZN</displayName>
+				<displayName count="other">Mozambik metikali</displayName>
 				<symbol>MZN</symbol>
 			</currency>
 			<currency type="NAD">
-				<displayName>NAD</displayName>
+				<displayName>Nambiya dollari</displayName>
 				<displayName count="one">Nambiya dollari</displayName>
-				<displayName count="other">NAD</displayName>
+				<displayName count="other">Nambiya dollari</displayName>
 				<symbol>NAD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="NGN">
-				<displayName>NGN</displayName>
+				<displayName>Nigeriya nayrasi</displayName>
 				<displayName count="one">Nigeriya nayrasi</displayName>
-				<displayName count="other">NGN</displayName>
+				<displayName count="other">Nigeriya nayrasi</displayName>
 				<symbol>NGN</symbol>
+				<symbol alt="narrow" draft="contributed">₦</symbol>
 			</currency>
 			<currency type="NIO">
 				<displayName>Nikaragua kordobasi</displayName>
 				<displayName count="one">Nikaragua kordobasi</displayName>
 				<displayName count="other">Nikaragua kordobasi</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NOK">
 				<displayName>Norvegiya kronasi</displayName>
 				<displayName count="one">Norvegiya kronasi</displayName>
 				<displayName count="other">Norvegiya kronasi</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
-				<displayName>NPR</displayName>
-				<displayName count="one">Nepal rupisi</displayName>
-				<displayName count="other">NPR</displayName>
+				<displayName>Nepal rupiyasi</displayName>
+				<displayName count="one">Nepal rupiyasi</displayName>
+				<displayName count="other">Nepal rupiyasi</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
-				<displayName>NZD</displayName>
+				<displayName>Yangi Zelandiya dollari</displayName>
 				<displayName count="one">Yangi Zelandiya dollari</displayName>
-				<displayName count="other">NZD</displayName>
+				<displayName count="other">Yangi Zelandiya dollari</displayName>
 				<symbol>NZ$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="OMR">
-				<displayName>OMR</displayName>
-				<displayName count="one">Omon riali</displayName>
-				<displayName count="other">OMR</displayName>
+				<displayName>Ummon riali</displayName>
+				<displayName count="one">Ummon riali</displayName>
+				<displayName count="other">Ummon riali</displayName>
 				<symbol>OMR</symbol>
 			</currency>
 			<currency type="PAB">
@@ -4412,52 +4774,55 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>PAB</symbol>
 			</currency>
 			<currency type="PEN">
-				<displayName>Peru noyvo soli</displayName>
-				<displayName count="one">Peru noyvo soli</displayName>
-				<displayName count="other">Peru noyvo soli</displayName>
+				<displayName>Peru yangi soli</displayName>
+				<displayName count="one">Peru yangi soli</displayName>
+				<displayName count="other">Peru yangi soli</displayName>
 				<symbol>PEN</symbol>
 			</currency>
 			<currency type="PGK">
-				<displayName>PGK</displayName>
-				<displayName count="one">Papua Yangi Gvineya kinasi</displayName>
-				<displayName count="other">PGK</displayName>
+				<displayName>Papua – Yangi Gvineya kinasi</displayName>
+				<displayName count="one">Papua – Yangi Gvineya kinasi</displayName>
+				<displayName count="other">Papua – Yangi Gvineya kinasi</displayName>
 				<symbol>PGK</symbol>
 			</currency>
 			<currency type="PHP">
-				<displayName>PHP</displayName>
-				<displayName count="one">Fillipin pesosi</displayName>
-				<displayName count="other">PHP</displayName>
+				<displayName>Filippin pesosi</displayName>
+				<displayName count="one">Filippin pesosi</displayName>
+				<displayName count="other">Filippin pesosi</displayName>
 				<symbol>PHP</symbol>
+				<symbol alt="narrow" draft="contributed">₱</symbol>
 			</currency>
 			<currency type="PKR">
-				<displayName>PKR</displayName>
-				<displayName count="one">Pokiston rupisi</displayName>
-				<displayName count="other">PKR</displayName>
+				<displayName>Pokiston rupiyasi</displayName>
+				<displayName count="one">Pokiston rupiyasi</displayName>
+				<displayName count="other">Pokiston rupiyasi</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>Polsha zlotiyi</displayName>
 				<displayName count="one">Polsha zlotiyi</displayName>
 				<displayName count="other">Polsha zlotiyi</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PYG">
-				<displayName>Paragvay guarani</displayName>
-				<displayName count="one">Paragvay guarani</displayName>
-				<displayName count="other">Paragvay guarani</displayName>
+				<displayName>Paragvay guaranisi</displayName>
+				<displayName count="one">Paragvay guaranisi</displayName>
+				<displayName count="other">Paragvay guaranisi</displayName>
 				<symbol>PYG</symbol>
 				<symbol alt="narrow" draft="contributed">₲</symbol>
 			</currency>
 			<currency type="QAR">
-				<displayName>QAR</displayName>
+				<displayName>Qatar riali</displayName>
 				<displayName count="one">Qatar riali</displayName>
-				<displayName count="other">QAR</displayName>
+				<displayName count="other">Qatar riali</displayName>
 				<symbol>QAR</symbol>
 			</currency>
 			<currency type="RON">
-				<displayName>Rumin leusi</displayName>
-				<displayName count="one">Rumin leusi</displayName>
-				<displayName count="other">Rumin leusi</displayName>
+				<displayName>Ruminiya leyi</displayName>
+				<displayName count="one">Ruminiya leyi</displayName>
+				<displayName count="other">Ruminiya leyi</displayName>
 				<symbol>RON</symbol>
 			</currency>
 			<currency type="RSD">
@@ -4467,16 +4832,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>RSD</symbol>
 			</currency>
 			<currency type="RUB">
-				<displayName>Rus rubli</displayName>
-				<displayName count="one">Rus rubli</displayName>
-				<displayName count="other">Rus rubli</displayName>
+				<displayName>Rossiya rubli</displayName>
+				<displayName count="one">Rossiya rubli</displayName>
+				<displayName count="other">Rossiya rubli</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RWF">
-				<displayName>RWF</displayName>
+				<displayName>Ruanda franki</displayName>
 				<displayName count="one">Ruanda franki</displayName>
-				<displayName count="other">RWF</displayName>
+				<displayName count="other">Ruanda franki</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>Saudiya Arabistoni riyoli</displayName>
@@ -4485,15 +4852,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>SAR</symbol>
 			</currency>
 			<currency type="SBD">
-				<displayName>SBD</displayName>
-				<displayName count="one">Solomon Orollari dollari</displayName>
-				<displayName count="other">SBD</displayName>
+				<displayName>Solomon orollari dollari</displayName>
+				<displayName count="one">Solomon orollari dollari</displayName>
+				<displayName count="other">Solomon orollari dollari</displayName>
 				<symbol>SBD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SCR">
-				<displayName>SCR</displayName>
-				<displayName count="one">Seyshel rupisi</displayName>
-				<displayName count="other">SCR</displayName>
+				<displayName>Seyshel rupiyasi</displayName>
+				<displayName count="one">Seyshel rupiyasi</displayName>
+				<displayName count="other">Seyshel rupiyasi</displayName>
 				<symbol>SCR</symbol>
 			</currency>
 			<currency type="SDG">
@@ -4507,29 +4875,32 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Shvetsiya kronasi</displayName>
 				<displayName count="other">Shvetsiya kronasi</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
-				<displayName>SGD</displayName>
+				<displayName>Singapur dollari</displayName>
 				<displayName count="one">Singapur dollari</displayName>
-				<displayName count="other">SGD</displayName>
+				<displayName count="other">Singapur dollari</displayName>
 				<symbol>SGD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SHP">
-				<displayName>SHP</displayName>
-				<displayName count="one">Muqaddas Yelena funti</displayName>
-				<displayName count="other">SHP</displayName>
+				<displayName>Muqaddas Yelena oroli funti</displayName>
+				<displayName count="one">Muqaddas Yelena oroli funti</displayName>
+				<displayName count="other">Muqaddas Yelena oroli funti</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SLL">
-				<displayName>SLL</displayName>
-				<displayName count="one">Sierra Lion lioni</displayName>
-				<displayName count="other">SLL</displayName>
+				<displayName>Syerra-Leone leonesi</displayName>
+				<displayName count="one">Syerra-Leone leonesi</displayName>
+				<displayName count="other">Syerra-Leone leonesi</displayName>
 				<symbol>SLL</symbol>
 			</currency>
 			<currency type="SOS">
-				<displayName>SOS</displayName>
-				<displayName count="one">Somaliya shillingi</displayName>
-				<displayName count="other">SOS</displayName>
+				<displayName>Somali shillingi</displayName>
+				<displayName count="one">Somali shillingi</displayName>
+				<displayName count="other">Somali shillingi</displayName>
 				<symbol>SOS</symbol>
 			</currency>
 			<currency type="SRD">
@@ -4547,39 +4918,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="STD">
-				<displayName>STD</displayName>
+				<displayName>San-Tome va Prinsipi dobrasi</displayName>
 				<displayName count="one">San-Tome va Prinsipi dobrasi</displayName>
-				<displayName count="other">STD</displayName>
+				<displayName count="other">San-Tome va Prinsipi dobrasi</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SYP">
-				<displayName>SYP</displayName>
+				<displayName>Suriya funti</displayName>
 				<displayName count="one">Suriya funti</displayName>
-				<displayName count="other">SYP</displayName>
+				<displayName count="other">Suriya funti</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
-				<displayName>SZL</displayName>
+				<displayName>Svazilend lilangenisi</displayName>
 				<displayName count="one">Svazilend lilangenisi</displayName>
-				<displayName count="other">SZL</displayName>
+				<displayName count="other">Svazilend lilangenisi</displayName>
 				<symbol>SZL</symbol>
 			</currency>
 			<currency type="THB">
-				<displayName>Tayland bahti</displayName>
-				<displayName count="one">Tayland bahti</displayName>
-				<displayName count="other">Tayland bahti</displayName>
-				<symbol>฿</symbol>
+				<displayName>Tailand bati</displayName>
+				<displayName count="one">Tailand bati</displayName>
+				<displayName count="other">Tailand bati</displayName>
+				<symbol>THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJS">
-				<displayName>TJS</displayName>
+				<displayName>Tojikiston somoniysi</displayName>
 				<displayName count="one">Tojikiston somoniysi</displayName>
-				<displayName count="other">TJS</displayName>
+				<displayName count="other">Tojikiston somoniysi</displayName>
 				<symbol>TJS</symbol>
 			</currency>
 			<currency type="TMT">
-				<displayName>TMT</displayName>
+				<displayName>Turkmaniston manati</displayName>
 				<displayName count="one">Turkmaniston manati</displayName>
-				<displayName count="other">TMT</displayName>
+				<displayName count="other">Turkmaniston manati</displayName>
 				<symbol>TMT</symbol>
 			</currency>
 			<currency type="TND">
@@ -4589,16 +4963,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol>TND</symbol>
 			</currency>
 			<currency type="TOP">
-				<displayName>TOP</displayName>
-				<displayName count="one">Tonga paangasi</displayName>
-				<displayName count="other">TOP</displayName>
+				<displayName>Tonga pangasi</displayName>
+				<displayName count="one">Tonga pangasi</displayName>
+				<displayName count="other">Tonga pangasi</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TRY">
 				<displayName>Turk lirasi</displayName>
 				<displayName count="one">Turk lirasi</displayName>
 				<displayName count="other">Turk lirasi</displayName>
 				<symbol>TRY</symbol>
+				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Trinidad va Tobago dollari</displayName>
@@ -4612,24 +4989,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Yangi Tayvan dollari</displayName>
 				<displayName count="other">Yangi Tayvan dollari</displayName>
 				<symbol>NT$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="TZS">
-				<displayName>TZS</displayName>
+				<displayName>Tanzaniya shillingi</displayName>
 				<displayName count="one">Tanzaniya shillingi</displayName>
-				<displayName count="other">TZS</displayName>
+				<displayName count="other">Tanzaniya shillingi</displayName>
 				<symbol>TZS</symbol>
 			</currency>
 			<currency type="UAH">
-				<displayName>Ukrain grivnasi</displayName>
-				<displayName count="one">Ukrain grivnasi</displayName>
-				<displayName count="other">Ukrain grivnasi</displayName>
+				<displayName>Ukraina grivnasi</displayName>
+				<displayName count="one">Ukraina grivnasi</displayName>
+				<displayName count="other">Ukraina grivnasi</displayName>
 				<symbol>UAH</symbol>
 				<symbol alt="narrow" draft="contributed">₴</symbol>
 			</currency>
 			<currency type="UGX">
-				<displayName>UGX</displayName>
+				<displayName>Uganda shillingi</displayName>
 				<displayName count="one">Uganda shillingi</displayName>
-				<displayName count="other">UGX</displayName>
+				<displayName count="other">Uganda shillingi</displayName>
 				<symbol>UGX</symbol>
 			</currency>
 			<currency type="USD">
@@ -4647,9 +5025,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="UZS">
-				<displayName>Oʻzbekiston soʻm</displayName>
-				<displayName count="one">Oʻzbekiston soʻm</displayName>
-				<displayName count="other">Oʻzbekiston soʻm</displayName>
+				<displayName>Oʻzbekiston soʻmi</displayName>
+				<displayName count="one">Oʻzbekiston soʻmi</displayName>
+				<displayName count="other">Oʻzbekiston soʻmi</displayName>
 				<symbol>soʻm</symbol>
 			</currency>
 			<currency type="VEF">
@@ -4657,29 +5035,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Venesuela bolivari</displayName>
 				<displayName count="other">Venesuela bolivari</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
-				<displayName>VND</displayName>
+				<displayName>Vyetnam dongi</displayName>
 				<displayName count="one">Vyetnam dongi</displayName>
-				<displayName count="other">VND</displayName>
+				<displayName count="other">Vyetnam dongi</displayName>
 				<symbol>₫</symbol>
+				<symbol alt="narrow" draft="contributed">₫</symbol>
 			</currency>
 			<currency type="VUV">
-				<displayName>VUV</displayName>
+				<displayName>Vanuatu vatusi</displayName>
 				<displayName count="one">Vanuatu vatusi</displayName>
-				<displayName count="other">VUV</displayName>
+				<displayName count="other">Vanuatu vatusi</displayName>
 				<symbol>VUV</symbol>
 			</currency>
 			<currency type="WST">
-				<displayName>WST</displayName>
+				<displayName>Samoa talasi</displayName>
 				<displayName count="one">Samoa talasi</displayName>
-				<displayName count="other">WST</displayName>
+				<displayName count="other">Samoa talasi</displayName>
 				<symbol>WST</symbol>
 			</currency>
 			<currency type="XAF">
-				<displayName>XAF</displayName>
-				<displayName count="one">Kamerun franki</displayName>
-				<displayName count="other">XAF</displayName>
+				<displayName>Markaziy Afrika CFA franki</displayName>
+				<displayName count="one">Markaziy Afrika CFA franki</displayName>
+				<displayName count="other">Markaziy Afrika CFA franki</displayName>
 				<symbol>FCFA</symbol>
 			</currency>
 			<currency type="XCD">
@@ -4687,44 +5067,48 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Sharqiy Karib dollari</displayName>
 				<displayName count="other">Sharqiy Karib dollari</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XOF">
-				<displayName>XOF</displayName>
-				<displayName count="one">Kot d-ivuar franki</displayName>
-				<displayName count="other">XOF</displayName>
+				<displayName>G‘arbiy Afrika CFA franki</displayName>
+				<displayName count="one">G‘arbiy Afrika CFA franki</displayName>
+				<displayName count="other">G‘arbiy Afrika CFA franki</displayName>
 				<symbol>CFA</symbol>
 			</currency>
 			<currency type="XPF">
-				<displayName>XPF</displayName>
+				<displayName>Fransuz Polineziyasi franki</displayName>
 				<displayName count="one">Fransuz Polineziyasi franki</displayName>
-				<displayName count="other">XPF</displayName>
+				<displayName count="other">Fransuz Polineziyasi franki</displayName>
 				<symbol>CFPF</symbol>
 			</currency>
 			<currency type="XXX">
-				<displayName>Nomaʼlum valyuta</displayName>
-				<displayName count="one">Nomaʼlum valyuta</displayName>
-				<displayName count="other">Nomaʼlum valyuta</displayName>
+				<displayName>Noma’lum pul birligi</displayName>
+				<displayName count="one">(noma’lum pul birligi)</displayName>
+				<displayName count="other">(noma’lum pul birligi)</displayName>
 			</currency>
 			<currency type="YER">
-				<displayName>YER</displayName>
+				<displayName>Yaman riali</displayName>
 				<displayName count="one">Yaman riali</displayName>
-				<displayName count="other">YER</displayName>
+				<displayName count="other">Yaman riali</displayName>
 				<symbol>YER</symbol>
 			</currency>
 			<currency type="ZAR">
-				<displayName>Janubiy Afrika randi</displayName>
-				<displayName count="one">Janubiy Afrika randi</displayName>
-				<displayName count="other">Janubiy Afrika randi</displayName>
+				<displayName>Janubiy Afrika rendi</displayName>
+				<displayName count="one">Janubiy Afrika rendi</displayName>
+				<displayName count="other">Janubiy Afrika rendi</displayName>
+				<symbol draft="contributed">ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMW">
-				<displayName>ZMW</displayName>
+				<displayName>Zambiya kvachasi</displayName>
 				<displayName count="one">Zambiya kvachasi</displayName>
-				<displayName count="other">ZMW</displayName>
+				<displayName count="other">Zambiya kvachasi</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
-			<pattern type="atLeast">⩾{0}</pattern>
+			<pattern type="atLeast">{0}+</pattern>
 			<pattern type="range">{0}–{1}</pattern>
 		</miscPatterns>
 	</numbers>
@@ -4734,49 +5118,76 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
-				<displayName>Erkin tushish tezlanishi</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+				<displayName>gravitatsiya kuchi</displayName>
+				<unitPattern count="one">{0} grav. kuchi</unitPattern>
+				<unitPattern count="other">{0} grav. kuchi</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
 				<displayName>metr taqsim soniyaning kvadrati</displayName>
-				<unitPattern count="one">{0} metr taqsim soniyaning kvadrati</unitPattern>
-				<unitPattern count="other">{0} metr taqsim soniyaning kvadrati</unitPattern>
+				<unitPattern count="one">{0} metr/soniya kvadrat</unitPattern>
+				<unitPattern count="other">{0} metr/soniya kvadrat</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName>daqiqa</displayName>
-				<unitPattern count="one">{0} daqiqa</unitPattern>
-				<unitPattern count="other">{0} arkdaqiqa</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName>soniya</displayName>
-				<unitPattern count="one">{0} soniya</unitPattern>
-				<unitPattern count="other">{0} soniya</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName>daraja</displayName>
-				<unitPattern count="one">{0}° daraja</unitPattern>
-				<unitPattern count="other">{0}° daraja</unitPattern>
+			<unit type="angle-revolution">
+				<displayName>aylanish</displayName>
+				<unitPattern count="one">{0} marta aylanish</unitPattern>
+				<unitPattern count="other">{0} marta aylanish</unitPattern>
 			</unit>
 			<unit type="angle-radian">
 				<displayName>radian</displayName>
 				<unitPattern count="one">{0} radian</unitPattern>
 				<unitPattern count="other">{0} radian</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName>akr</displayName>
-				<unitPattern count="one">{0} akr</unitPattern>
-				<unitPattern count="other">{0} akr</unitPattern>
+			<unit type="angle-degree">
+				<displayName>gradus</displayName>
+				<unitPattern count="one">{0} gradus</unitPattern>
+				<unitPattern count="other">{0} gradus</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>yoy daqiqasi</displayName>
+				<unitPattern count="one">{0} yoy daqiqasi</unitPattern>
+				<unitPattern count="other">{0} yoy daqiqasi</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>yoy soniyasi</displayName>
+				<unitPattern count="one">{0} yoy soniyasi</unitPattern>
+				<unitPattern count="other">{0} yoy soniyasi</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>kvadrat kilometr</displayName>
+				<unitPattern count="one">{0} kvadrat kilometr</unitPattern>
+				<unitPattern count="other">{0} kvadrat kilometr</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>gektar</displayName>
 				<unitPattern count="one">{0} gektar</unitPattern>
 				<unitPattern count="other">{0} gektar</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>kvadrat metr</displayName>
+				<unitPattern count="one">{0} kvadrat metr</unitPattern>
+				<unitPattern count="other">{0} kvadrat metr</unitPattern>
+				<perUnitPattern>{0}/kvadrat metr</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>kvadrat santimetr</displayName>
 				<unitPattern count="one">{0} kvadrat santimetr</unitPattern>
 				<unitPattern count="other">{0} kvadrat santimetr</unitPattern>
+				<perUnitPattern>{0}/kvadrat santimetr</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>kvadrat mil</displayName>
+				<unitPattern count="one">{0} kvadrat mil</unitPattern>
+				<unitPattern count="other">{0} kvadrat mil</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>akr</displayName>
+				<unitPattern count="one">{0} akr</unitPattern>
+				<unitPattern count="other">{0} akr</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>kvadrat yard</displayName>
+				<unitPattern count="one">{0} kvadrat yard</unitPattern>
+				<unitPattern count="other">{0} kvadrat yard</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>kvadrat fut</displayName>
@@ -4784,142 +5195,143 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} kvadrat fut</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
-				<displayName>kvadrat dyum</displayName>
+				<displayName>kvadrat duym</displayName>
 				<unitPattern count="one">{0} kvadrat dyum</unitPattern>
 				<unitPattern count="other">{0} kvadrat dyum</unitPattern>
+				<perUnitPattern>{0}/kvadrat duym</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kvadrat kilometr</displayName>
-				<unitPattern count="one">{0} kvadrat kilometr</unitPattern>
-				<unitPattern count="other">{0} kvadrat kilometr</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>kvadrat metr</displayName>
-				<unitPattern count="one">{0} kvadrat metr</unitPattern>
-				<unitPattern count="other">{0} kvadrat metr</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>kvadrat mil</displayName>
-				<unitPattern count="one">{0} kvadrat mil</unitPattern>
-				<unitPattern count="other">{0} kvadrat mil</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>kvadrat yard</displayName>
-				<unitPattern count="one">{0} kvadrat yard</unitPattern>
-				<unitPattern count="other">{0} kvadrat yard</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="other">{0} karat</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName>kilometriga litr</displayName>
-				<unitPattern count="one">kilometriga {0} litr</unitPattern>
-				<unitPattern count="other">kilometriga {0} litr</unitPattern>
+				<displayName>litr/kilometr</displayName>
+				<unitPattern count="one">{0} litr/kilometr</unitPattern>
+				<unitPattern count="other">{0} litr/kilometr</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>litr/100 km</displayName>
+				<unitPattern count="one">{0} litr/100 km</unitPattern>
+				<unitPattern count="other">{0} litr/100 km</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
-				<displayName>galloniga mil</displayName>
-				<unitPattern count="one">galloniga {0} mil</unitPattern>
-				<unitPattern count="other">galloniga {0} mil</unitPattern>
-			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bayt</displayName>
-				<unitPattern count="one">{0} bayt</unitPattern>
-				<unitPattern count="other">{0} bayt</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabit</displayName>
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="other">{0} gigabit</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabayt</displayName>
-				<unitPattern count="one">{0} gigabayt</unitPattern>
-				<unitPattern count="other">{0} gigabayt</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobit</displayName>
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="other">{0} kilobit</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobayt</displayName>
-				<unitPattern count="one">{0} kilobayt</unitPattern>
-				<unitPattern count="other">{0} kilobayt</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabit</displayName>
-				<unitPattern count="one">{0} megabit</unitPattern>
-				<unitPattern count="other">{0} megabit</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabayt</displayName>
-				<unitPattern count="one">{0} megabayt</unitPattern>
-				<unitPattern count="other">{0} megabayt</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabit</displayName>
-				<unitPattern count="one">{0} terabit</unitPattern>
-				<unitPattern count="other">{0} terabit</unitPattern>
+				<displayName>mil/gallon</displayName>
+				<unitPattern count="one">{0} mil/gallon</unitPattern>
+				<unitPattern count="other">{0} mil/gallon</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabayt</displayName>
 				<unitPattern count="one">{0} terabayt</unitPattern>
 				<unitPattern count="other">{0} terabayt</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabit</displayName>
+				<unitPattern count="one">{0} terabit</unitPattern>
+				<unitPattern count="other">{0} terabit</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabayt</displayName>
+				<unitPattern count="one">{0} gigabayt</unitPattern>
+				<unitPattern count="other">{0} gigabayt</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabit</displayName>
+				<unitPattern count="one">{0} gigabit</unitPattern>
+				<unitPattern count="other">{0} gigabit</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabayt</displayName>
+				<unitPattern count="one">{0} megabayt</unitPattern>
+				<unitPattern count="other">{0} megabayt</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabit</displayName>
+				<unitPattern count="one">{0} megabit</unitPattern>
+				<unitPattern count="other">{0} megabit</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobayt</displayName>
+				<unitPattern count="one">{0} kilobayt</unitPattern>
+				<unitPattern count="other">{0} kilobayt</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobit</displayName>
+				<unitPattern count="one">{0} kilobit</unitPattern>
+				<unitPattern count="other">{0} kilobit</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bayt</displayName>
+				<unitPattern count="one">{0} bayt</unitPattern>
+				<unitPattern count="other">{0} bayt</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>asr</displayName>
+				<unitPattern count="one">{0} asr</unitPattern>
+				<unitPattern count="other">{0} asr</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>yil</displayName>
+				<unitPattern count="one">{0} yil</unitPattern>
+				<unitPattern count="other">{0} yil</unitPattern>
+				<perUnitPattern>{0}/yil</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>oy</displayName>
+				<unitPattern count="one">{0} oy</unitPattern>
+				<unitPattern count="other">{0} oy</unitPattern>
+				<perUnitPattern>{0}/oy</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>hafta</displayName>
+				<unitPattern count="one">{0} hafta</unitPattern>
+				<unitPattern count="other">{0} hafta</unitPattern>
+				<perUnitPattern>{0}/hafta</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>kun</displayName>
 				<unitPattern count="one">{0} kun</unitPattern>
 				<unitPattern count="other">{0} kun</unitPattern>
+				<perUnitPattern>{0}/kun</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>soat</displayName>
 				<unitPattern count="one">{0} soat</unitPattern>
 				<unitPattern count="other">{0} soat</unitPattern>
-				<perUnitPattern>soatiga {0}</perUnitPattern>
+				<perUnitPattern>{0}/soat</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>mikrosoniya</displayName>
-				<unitPattern count="one">{0} mikrosoniya</unitPattern>
-				<unitPattern count="other">{0} mikrosoniya</unitPattern>
+			<unit type="duration-minute">
+				<displayName>daqiqa</displayName>
+				<unitPattern count="one">{0} daqiqa</unitPattern>
+				<unitPattern count="other">{0} daqiqa</unitPattern>
+				<perUnitPattern>{0}/daqiqa</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>soniya</displayName>
+				<unitPattern count="one">{0} soniya</unitPattern>
+				<unitPattern count="other">{0} soniya</unitPattern>
+				<perUnitPattern>{0}/soniya</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>millisoniya</displayName>
 				<unitPattern count="one">{0} millisoniya</unitPattern>
 				<unitPattern count="other">{0} millisoniya</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>daqiqa</displayName>
-				<unitPattern count="one">{0} daqiqa</unitPattern>
-				<unitPattern count="other">{0} daqiqa</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>oy</displayName>
-				<unitPattern count="one">{0} oy</unitPattern>
-				<unitPattern count="other">{0} oy</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>mikrosoniya</displayName>
+				<unitPattern count="one">{0} mikrosoniya</unitPattern>
+				<unitPattern count="other">{0} mikrosoniya</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>nanosoniya</displayName>
 				<unitPattern count="one">{0} nanosoniya</unitPattern>
 				<unitPattern count="other">{0} nanosoniya</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>soniya</displayName>
-				<unitPattern count="one">{0} soniya</unitPattern>
-				<unitPattern count="other">{0} soniya</unitPattern>
-				<perUnitPattern>{0}/s</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>hafta</displayName>
-				<unitPattern count="one">{0} hafta</unitPattern>
-				<unitPattern count="other">{0} hafta</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>yil</displayName>
-				<unitPattern count="one">{0} yil</unitPattern>
-				<unitPattern count="other">{0} yil</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>amper</displayName>
 				<unitPattern count="one">{0} amper</unitPattern>
@@ -4940,306 +5352,300 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} volt</unitPattern>
 				<unitPattern count="other">{0} volt</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokaloriya</displayName>
+				<unitPattern count="one">{0} kilokaloriya</unitPattern>
+				<unitPattern count="other">{0} kilokaloriya</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kaloriya</displayName>
 				<unitPattern count="one">kaloriya</unitPattern>
 				<unitPattern count="other">{0} kaloriya</unitPattern>
 			</unit>
 			<unit type="energy-foodcalorie">
-				<displayName>Kaloriya</displayName>
+				<displayName>kaloriya</displayName>
 				<unitPattern count="one">{0} kaloriya</unitPattern>
 				<unitPattern count="other">{0} kaloriya</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joul</displayName>
-				<unitPattern count="one">{0} joul</unitPattern>
-				<unitPattern count="other">{0} joul</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilokaloriya</displayName>
-				<unitPattern count="one">{0} kilokaloriya</unitPattern>
-				<unitPattern count="other">{0} kilokaloriya</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojoul</displayName>
 				<unitPattern count="one">{0} kilojoul</unitPattern>
 				<unitPattern count="other">{0} kilojoul</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joul</displayName>
+				<unitPattern count="one">{0} joul</unitPattern>
+				<unitPattern count="other">{0} joul</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilovatt-soat</displayName>
 				<unitPattern count="one">{0} kilovatt-soat</unitPattern>
 				<unitPattern count="other">{0} kilovatt-soat</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
-				<displayName>gigagerts</displayName>
-				<unitPattern count="one">{0} gigagerts</unitPattern>
-				<unitPattern count="other">{0} gigagerts</unitPattern>
-			</unit>
-			<unit type="frequency-hertz">
-				<displayName>gerts</displayName>
-				<unitPattern count="one">{0} gerts</unitPattern>
-				<unitPattern count="other">{0} gerts</unitPattern>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<displayName>kilogerts</displayName>
-				<unitPattern count="one">{0} kilogerts</unitPattern>
-				<unitPattern count="other">{0} kilogerts</unitPattern>
+				<displayName>gigagers</displayName>
+				<unitPattern count="one">{0} gigagers</unitPattern>
+				<unitPattern count="other">{0} gigagers</unitPattern>
 			</unit>
 			<unit type="frequency-megahertz">
-				<displayName>megagerts</displayName>
-				<unitPattern count="one">{0} megagerts</unitPattern>
-				<unitPattern count="other">{0} megagerts</unitPattern>
+				<displayName>megagers</displayName>
+				<unitPattern count="one">{0} megagers</unitPattern>
+				<unitPattern count="other">{0} megagers</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>astronomik birlik</displayName>
-				<unitPattern count="one">{0} astronomik birlik</unitPattern>
-				<unitPattern count="other">{0} astronomik birlik</unitPattern>
+			<unit type="frequency-kilohertz">
+				<displayName>kilogers</displayName>
+				<unitPattern count="one">{0} kilogers</unitPattern>
+				<unitPattern count="other">{0} kilogers</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>santimetr</displayName>
-				<unitPattern count="one">{0} santimetr</unitPattern>
-				<unitPattern count="other">{0} santimetr</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>gers</displayName>
+				<unitPattern count="one">{0} gers</unitPattern>
+				<unitPattern count="other">{0} gers</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>kilometr</displayName>
+				<unitPattern count="one">{0} kilometr</unitPattern>
+				<unitPattern count="other">{0} kilometr</unitPattern>
+				<perUnitPattern>{0}/kilometr</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>metr</displayName>
+				<unitPattern count="one">{0} metr</unitPattern>
+				<unitPattern count="other">{0} metr</unitPattern>
+				<perUnitPattern>{0}/metr</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>detsimetr</displayName>
 				<unitPattern count="one">{0} detsimetr</unitPattern>
 				<unitPattern count="other">{0} detsimetr</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>fut</displayName>
-				<unitPattern count="one">{0} fut</unitPattern>
-				<unitPattern count="other">{0} fut</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>dyum</displayName>
-				<unitPattern count="one">{0} dyum</unitPattern>
-				<unitPattern count="other">{0} dyum</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilometr</displayName>
-				<unitPattern count="one">{0} kilometr</unitPattern>
-				<unitPattern count="other">{0} kilometr</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>yorug‘lik yili</displayName>
-				<unitPattern count="one">{0} yorug‘lik yili</unitPattern>
-				<unitPattern count="other">{0} yorug‘lik yili</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metr</displayName>
-				<unitPattern count="one">{0} metr</unitPattern>
-				<unitPattern count="other">{0} metr</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>mikrometr</displayName>
-				<unitPattern count="one">{0} mikrometr</unitPattern>
-				<unitPattern count="other">{0} mikrometr</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mil</displayName>
-				<unitPattern count="one">{0} mil</unitPattern>
-				<unitPattern count="other">{0} mil</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>santimetr</displayName>
+				<unitPattern count="one">{0} santimetr</unitPattern>
+				<unitPattern count="other">{0} santimetr</unitPattern>
+				<perUnitPattern>{0}/santimetr</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>millimetr</displayName>
 				<unitPattern count="one">{0} millimetr</unitPattern>
 				<unitPattern count="other">{0} millimetr</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>mikrometr</displayName>
+				<unitPattern count="one">{0} mikrometr</unitPattern>
+				<unitPattern count="other">{0} mikrometr</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanometr</displayName>
 				<unitPattern count="one">{0} nanometr</unitPattern>
 				<unitPattern count="other">{0} nanometr</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>dengiz mili</displayName>
-				<unitPattern count="one">{0} dengiz mili</unitPattern>
-				<unitPattern count="other">{0} dengiz mili</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsek</displayName>
-				<unitPattern count="one">{0} parsek</unitPattern>
-				<unitPattern count="other">{0} parsek</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pikometr</displayName>
 				<unitPattern count="one">{0} pikometr</unitPattern>
 				<unitPattern count="other">{0} pikometr</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mil</displayName>
+				<unitPattern count="one">{0} mil</unitPattern>
+				<unitPattern count="other">{0} mil</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yard</displayName>
 				<unitPattern count="one">{0} yard</unitPattern>
 				<unitPattern count="other">{0} yard</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>fut</displayName>
+				<unitPattern count="one">{0} fut</unitPattern>
+				<unitPattern count="other">{0} fut</unitPattern>
+				<perUnitPattern>{0}/fut</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>dyum</displayName>
+				<unitPattern count="one">{0} dyum</unitPattern>
+				<unitPattern count="other">{0} dyum</unitPattern>
+				<perUnitPattern draft="provisional">{0}/duym</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsek</displayName>
+				<unitPattern count="one">{0} parsek</unitPattern>
+				<unitPattern count="other">{0} parsek</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>yorug‘lik yili</displayName>
+				<unitPattern count="one">{0} yorug‘lik yili</unitPattern>
+				<unitPattern count="other">{0} yorug‘lik yili</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>astronomik birlik</displayName>
+				<unitPattern count="one">{0} astronomik birlik</unitPattern>
+				<unitPattern count="other">{0} astronomik birlik</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>dengiz mili</displayName>
+				<unitPattern count="one">{0} dengiz mili</unitPattern>
+				<unitPattern count="other">{0} dengiz mili</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>Skandinaviya mili</displayName>
+				<unitPattern count="one">{0} Skandinaviya mili</unitPattern>
+				<unitPattern count="other">{0} Skandinaviya mili</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lyuks</displayName>
 				<unitPattern count="one">{0} lyuks</unitPattern>
 				<unitPattern count="other">{0} lyuks</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="other">{0} karat</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gramm</displayName>
-				<unitPattern count="one">{0} gramm</unitPattern>
-				<unitPattern count="other">{0} gramm</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilogramm</displayName>
-				<unitPattern count="one">{0} kilogramm</unitPattern>
-				<unitPattern count="other">{0} kilogramm</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>tonna</displayName>
 				<unitPattern count="one">{0} tonna</unitPattern>
 				<unitPattern count="other">{0} tonna</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mikrogramm</displayName>
-				<unitPattern count="one">{0} mikrogramm</unitPattern>
-				<unitPattern count="other">{0} mikrogramm</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilogramm</displayName>
+				<unitPattern count="one">{0} kilogramm</unitPattern>
+				<unitPattern count="other">{0} kilogramm</unitPattern>
+				<perUnitPattern>{0}/kilogramm</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gramm</displayName>
+				<unitPattern count="one">{0} gramm</unitPattern>
+				<unitPattern count="other">{0} gramm</unitPattern>
+				<perUnitPattern>{0}/gramm</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>milligramm</displayName>
 				<unitPattern count="one">{0} milligramm</unitPattern>
 				<unitPattern count="other">{0} milligramm</unitPattern>
 			</unit>
+			<unit type="mass-microgram">
+				<displayName>mikrogramm</displayName>
+				<unitPattern count="one">{0} mikrogramm</unitPattern>
+				<unitPattern count="other">{0} mikrogramm</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>amerika tonnasi</displayName>
+				<unitPattern count="one">{0} amerika tonnasi</unitPattern>
+				<unitPattern count="other">{0} amerika tonnasi</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>funt</displayName>
+				<unitPattern count="one">{0} funt</unitPattern>
+				<unitPattern count="other">{0} funt</unitPattern>
+				<perUnitPattern>{0}/funt</perUnitPattern>
+			</unit>
 			<unit type="mass-ounce">
-				<displayName>untsiya</displayName>
-				<unitPattern count="one">{0} untsiya</unitPattern>
-				<unitPattern count="other">{0} untsiya</unitPattern>
+				<displayName>unsiya</displayName>
+				<unitPattern count="one">{0} unsiya</unitPattern>
+				<unitPattern count="other">{0} unsiya</unitPattern>
+				<perUnitPattern>{0}/unsiya</perUnitPattern>
 			</unit>
 			<unit type="mass-ounce-troy">
 				<displayName>troya unsiyasi</displayName>
 				<unitPattern count="one">{0} troya unsiyasi</unitPattern>
 				<unitPattern count="other">{0} troya unsiyasi</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<displayName>funt</displayName>
-				<unitPattern count="one">{0} funt</unitPattern>
-				<unitPattern count="other">{0} funt</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<displayName>amerika tonnasi</displayName>
-				<unitPattern count="one">{0} amerikacha tonna</unitPattern>
-				<unitPattern count="other">{0} amerikacha tonna</unitPattern>
+			<unit type="mass-carat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} karat</unitPattern>
+				<unitPattern count="other">{0} karat</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigavatt</displayName>
 				<unitPattern count="one">{0} gigavatt</unitPattern>
 				<unitPattern count="other">{0} gigavatt</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>ot kuchi</displayName>
-				<unitPattern count="one">{0} ot kuchi</unitPattern>
-				<unitPattern count="other">{0} ot kuchi</unitPattern>
+			<unit type="power-megawatt">
+				<displayName>megavatt</displayName>
+				<unitPattern count="one">{0} megavatt</unitPattern>
+				<unitPattern count="other">{0} megavatt</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName>kilovatt</displayName>
 				<unitPattern count="one">{0} kilovatt</unitPattern>
 				<unitPattern count="other">{0} kilovatt</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<displayName>megavatt</displayName>
-				<unitPattern count="one">{0} megavatt</unitPattern>
-				<unitPattern count="other">{0} megavatt</unitPattern>
+			<unit type="power-watt">
+				<displayName>vatt</displayName>
+				<unitPattern count="one">{0} vatt</unitPattern>
+				<unitPattern count="other">{0} vatt</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<displayName>millivatt</displayName>
 				<unitPattern count="one">{0} millivatt</unitPattern>
 				<unitPattern count="other">{0} millivatt</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName>vatt</displayName>
-				<unitPattern count="one">{0} vatt</unitPattern>
-				<unitPattern count="other">{0} vatt</unitPattern>
+			<unit type="power-horsepower">
+				<displayName>ot kuchi</displayName>
+				<unitPattern count="one">{0} ot kuchi</unitPattern>
+				<unitPattern count="other">{0} ot kuchi</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>gektopaskal</displayName>
 				<unitPattern count="one">{0} gektopaskal</unitPattern>
 				<unitPattern count="other">{0} gektopaskal</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>dyum simob ustuni</displayName>
-				<unitPattern count="one">{0} dyum simob ustuni</unitPattern>
-				<unitPattern count="other">{0} dyum simob ustuni</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>milibar</displayName>
-				<unitPattern count="one">{0} milibar</unitPattern>
-				<unitPattern count="other">{0} milibar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm simob ustuni</displayName>
 				<unitPattern count="one">{0} mm simob ustuni</unitPattern>
 				<unitPattern count="other">{0} mm simob ustuni</unitPattern>
 			</unit>
 			<unit type="pressure-pound-per-square-inch">
-				<displayName>Funt-kuch taqsim dyum kvadrat</displayName>
-				<unitPattern count="one">{0} funt-kuch taqsim dyum kvadrat</unitPattern>
-				<unitPattern count="other">{0} funt-kuch taqsim dyum kvadrat</unitPattern>
+				<displayName>funt/kvadrat duym</displayName>
+				<unitPattern count="one">{0} funt/kvadrat duym</unitPattern>
+				<unitPattern count="other">{0} funt/kvadrat duym</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">{0} karat</unitPattern>
-				<unitPattern count="other">{0} karat</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>duym simob ustuni</displayName>
+				<unitPattern count="one">{0} duym simob ustuni</unitPattern>
+				<unitPattern count="other">{0} duym simob ustuni</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>millibar</displayName>
+				<unitPattern count="one">{0} millibar</unitPattern>
+				<unitPattern count="other">{0} millibar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName>soatiga kilometr</displayName>
+				<displayName>km/soat</displayName>
 				<unitPattern count="one">soatiga {0} kilometr</unitPattern>
 				<unitPattern count="other">soatiga {0} kilometr</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
-				<displayName>sekundiga metr</displayName>
-				<unitPattern count="one">sekundiga {0} metr</unitPattern>
-				<unitPattern count="other">sekundiga {0} metr</unitPattern>
+				<displayName>metr/soniya</displayName>
+				<unitPattern count="one">{0} metr/soniya</unitPattern>
+				<unitPattern count="other">{0} metr/soniya</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<displayName>soatiga mil</displayName>
-				<unitPattern count="one">soatiga {0} mil</unitPattern>
-				<unitPattern count="other">soatiga {0} mil</unitPattern>
+				<displayName>mil/soat</displayName>
+				<unitPattern count="one">{0} mil/soat</unitPattern>
+				<unitPattern count="other">{0} mil/soat</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>uzel</displayName>
+				<unitPattern count="one">{0} uzel</unitPattern>
+				<unitPattern count="other">{0} uzel</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
-				<displayName>tselsiy darajasi</displayName>
-				<unitPattern count="one">{0} tselsiy darajasi</unitPattern>
-				<unitPattern count="other">{0} tselsiy darajasi</unitPattern>
+				<displayName>Selsiy darajasi</displayName>
+				<unitPattern count="one">{0} Selsiy darajasi</unitPattern>
+				<unitPattern count="other">{0} Selsiy darajasi</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
-				<displayName>farengeyt</displayName>
-				<unitPattern count="one">{0} farengeyt</unitPattern>
-				<unitPattern count="other">{0} farengeyt</unitPattern>
+				<displayName>Farengeyt darajasi</displayName>
+				<unitPattern count="one">{0} Farengeyt darajasi</unitPattern>
+				<unitPattern count="other">{0} Farengeyt darajasi</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
 				<displayName>kelvin</displayName>
 				<unitPattern count="one">{0} kelvin</unitPattern>
 				<unitPattern count="other">{0} kelvin</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>akrofut</displayName>
-				<unitPattern count="one">{0} akrofut</unitPattern>
-				<unitPattern count="other">{0} akrofut</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>santilitr</displayName>
-				<unitPattern count="one">{0} santilitr</unitPattern>
-				<unitPattern count="other">{0} santilitr</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>kub santimetr</displayName>
-				<unitPattern count="one">{0} kub santimetr</unitPattern>
-				<unitPattern count="other">{0} kub santimetr</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>kub fut</displayName>
-				<unitPattern count="one">{0} kub fut</unitPattern>
-				<unitPattern count="other">{0} kub fut</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>kub dyum</displayName>
-				<unitPattern count="one">{0} kub dyum</unitPattern>
-				<unitPattern count="other">{0} kub dyum</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kub kilometr</displayName>
 				<unitPattern count="one">{0} kub kilometr</unitPattern>
@@ -5249,6 +5655,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>kub metr</displayName>
 				<unitPattern count="one">{0} kub metr</unitPattern>
 				<unitPattern count="other">{0} kub metr</unitPattern>
+				<perUnitPattern>{0}/kub metr</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>kub santimetr</displayName>
+				<unitPattern count="one">{0} kub santimetr</unitPattern>
+				<unitPattern count="other">{0} kub santimetr</unitPattern>
+				<perUnitPattern>{0}/kub santimetr</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>kub mil</displayName>
@@ -5260,25 +5673,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kub yard</unitPattern>
 				<unitPattern count="other">{0} kub yard</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>piyola</displayName>
-				<unitPattern count="one">{0} piyola</unitPattern>
-				<unitPattern count="other">{0} piyola</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>kub fut</displayName>
+				<unitPattern count="one">{0} kub fut</unitPattern>
+				<unitPattern count="other">{0} kub fut</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>detsilitr</displayName>
-				<unitPattern count="one">{0} detsilitr</unitPattern>
-				<unitPattern count="other">{0} detsilitr</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>kub duym</displayName>
+				<unitPattern count="one">{0} kub duym</unitPattern>
+				<unitPattern count="other">{0} kub duym</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>suyuq untsiya</displayName>
-				<unitPattern count="one">{0} suyuq untsiya</unitPattern>
-				<unitPattern count="other">{0} suyuq untsiya</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gallon</displayName>
-				<unitPattern count="one">{0} gallon</unitPattern>
-				<unitPattern count="other">{0} gallon</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megalitr</displayName>
+				<unitPattern count="one">{0} megalitr</unitPattern>
+				<unitPattern count="other">{0} megalitr</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>gektolitr</displayName>
@@ -5289,27 +5697,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>litr</displayName>
 				<unitPattern count="one">{0} litr</unitPattern>
 				<unitPattern count="other">{0} litr</unitPattern>
+				<perUnitPattern>{0}/litr</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalitr</displayName>
-				<unitPattern count="one">{0} megalitr</unitPattern>
-				<unitPattern count="other">{0} megalitr</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>detsilitr</displayName>
+				<unitPattern count="one">{0} detsilitr</unitPattern>
+				<unitPattern count="other">{0} detsilitr</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>santilitr</displayName>
+				<unitPattern count="one">{0} santilitr</unitPattern>
+				<unitPattern count="other">{0} santilitr</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>millilitr</displayName>
 				<unitPattern count="one">{0} millilitr</unitPattern>
 				<unitPattern count="other">{0} millilitr</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pint</displayName>
-				<unitPattern count="one">{0} pint</unitPattern>
-				<unitPattern count="other">{0} pint</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>metrik pint</displayName>
+				<unitPattern count="one">{0} metrik pint</unitPattern>
+				<unitPattern count="other">{0} metrik pint</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>metrik piyola</displayName>
+				<unitPattern count="one">{0} metrik piyola</unitPattern>
+				<unitPattern count="other">{0} metrik piyola</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>akrofut</displayName>
+				<unitPattern count="one">{0} akrofut</unitPattern>
+				<unitPattern count="other">{0} akrofut</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gallon</displayName>
+				<unitPattern count="one">{0} gallon</unitPattern>
+				<unitPattern count="other">{0} gallon</unitPattern>
+				<perUnitPattern>{0}/gallon</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>kvart</displayName>
 				<unitPattern count="one">{0} kvart</unitPattern>
 				<unitPattern count="other">{0} kvart</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pint</displayName>
+				<unitPattern count="one">{0} pint</unitPattern>
+				<unitPattern count="other">{0} pint</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>piyola</displayName>
+				<unitPattern count="one">{0} piyola</unitPattern>
+				<unitPattern count="other">{0} piyola</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>suyuq unsiya</displayName>
+				<unitPattern count="one">{0} suyuq unsiya</unitPattern>
+				<unitPattern count="other">{0} suyuq unsiya</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>osh qoshiq</displayName>
 				<unitPattern count="one">{0} osh qoshiq</unitPattern>
@@ -5320,200 +5765,234 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} choy qoshiq</unitPattern>
 				<unitPattern count="other">{0} choy qoshiq</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
 				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
+				<displayName>grav. kuchi</displayName>
+				<unitPattern count="one">{0} G</unitPattern>
+				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
-				<displayName>m/s²</displayName>
+				<displayName>metr/soniya²</displayName>
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName>daq.</displayName>
-				<unitPattern count="one">{0} daq.</unitPattern>
-				<unitPattern count="other">{0} daq.</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName>soniya</displayName>
-				<unitPattern count="one">{0}″</unitPattern>
-				<unitPattern count="other">{0}″</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName>°</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
+			<unit type="angle-revolution">
+				<displayName>aylanish</displayName>
+				<unitPattern count="one">{0} marta ayl.</unitPattern>
+				<unitPattern count="other">{0} marta ayl.</unitPattern>
 			</unit>
 			<unit type="angle-radian">
 				<displayName>rad</displayName>
 				<unitPattern count="one">{0} rad</unitPattern>
 				<unitPattern count="other">{0} rad</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName>akr</displayName>
-				<unitPattern count="one">{0} akr</unitPattern>
-				<unitPattern count="other">{0} akr</unitPattern>
+			<unit type="angle-degree">
+				<displayName>gradus</displayName>
+				<unitPattern count="one">{0} grad</unitPattern>
+				<unitPattern count="other">{0} grad</unitPattern>
 			</unit>
-			<unit type="area-hectare">
-				<displayName>ga</displayName>
-				<unitPattern count="one">{0} ga</unitPattern>
-				<unitPattern count="other">{0} ga</unitPattern>
+			<unit type="angle-arc-minute">
+				<displayName>yoy daqiqasi</displayName>
+				<unitPattern count="one">{0} yoy daq.</unitPattern>
+				<unitPattern count="other">{0} yoy daq.</unitPattern>
 			</unit>
-			<unit type="area-square-centimeter">
-				<displayName>sm²</displayName>
-				<unitPattern count="one">{0} sm²</unitPattern>
-				<unitPattern count="other">{0} sm²</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<displayName>fut²</displayName>
-				<unitPattern count="one">{0} fut²</unitPattern>
-				<unitPattern count="other">{0} fut²</unitPattern>
-			</unit>
-			<unit type="area-square-inch">
-				<displayName>dyum²</displayName>
-				<unitPattern count="one">{0} dyum²</unitPattern>
-				<unitPattern count="other">{0} dyum²</unitPattern>
+			<unit type="angle-arc-second">
+				<displayName>yoy soniyasi</displayName>
+				<unitPattern count="one">{0} yoy son.</unitPattern>
+				<unitPattern count="other">{0} yoy son.</unitPattern>
 			</unit>
 			<unit type="area-square-kilometer">
 				<displayName>km²</displayName>
 				<unitPattern count="one">{0} km²</unitPattern>
 				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
+			<unit type="area-hectare">
+				<displayName>gektar</displayName>
+				<unitPattern count="one">{0} ga</unitPattern>
+				<unitPattern count="other">{0} ga</unitPattern>
+			</unit>
 			<unit type="area-square-meter">
 				<displayName>m²</displayName>
 				<unitPattern count="one">{0} m²</unitPattern>
 				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>sm²</displayName>
+				<unitPattern count="one">{0} sm²</unitPattern>
+				<unitPattern count="other">{0} sm²</unitPattern>
+				<perUnitPattern>{0}/sm²</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
-				<displayName>mil²</displayName>
-				<unitPattern count="one">{0} mil²</unitPattern>
-				<unitPattern count="other">{0} mil²</unitPattern>
+				<displayName>kv. mil</displayName>
+				<unitPattern count="one">{0} kv. mil</unitPattern>
+				<unitPattern count="other">{0} kv. mil</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>akr</displayName>
+				<unitPattern count="one">{0} akr</unitPattern>
+				<unitPattern count="other">{0} akr</unitPattern>
 			</unit>
 			<unit type="area-square-yard">
 				<displayName>yard²</displayName>
 				<unitPattern count="one">{0} yard²</unitPattern>
 				<unitPattern count="other">{0} yard²</unitPattern>
 			</unit>
+			<unit type="area-square-foot">
+				<displayName>kv. fut</displayName>
+				<unitPattern count="one">{0} kv. fut</unitPattern>
+				<unitPattern count="other">{0} kv. fut</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>kvadrat duym</displayName>
+				<unitPattern count="one">{0} kv. duym</unitPattern>
+				<unitPattern count="other">{0} kv. duym</unitPattern>
+				<perUnitPattern>{0} kv. duym</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName>L/km</displayName>
+				<displayName>litr/km</displayName>
 				<unitPattern count="one">{0} L/km</unitPattern>
 				<unitPattern count="other">{0} L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100 km</displayName>
+				<unitPattern count="one">{0} L/100 km</unitPattern>
+				<unitPattern count="other">{0} L/100 km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mil/gal</displayName>
-				<unitPattern count="one">galloniga {0} mil</unitPattern>
-				<unitPattern count="other">galloniga {0} mil</unitPattern>
-			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bayt</displayName>
-				<unitPattern count="one">{0} bayt</unitPattern>
-				<unitPattern count="other">{0} bayt</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gbit</displayName>
-				<unitPattern count="one">{0} Gbit</unitPattern>
-				<unitPattern count="other">{0} Gbit</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kbit</displayName>
-				<unitPattern count="one">{0} kbit</unitPattern>
-				<unitPattern count="other">{0} kbit</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mbit</displayName>
-				<unitPattern count="one">{0} Mbit</unitPattern>
-				<unitPattern count="other">{0} Mbit</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tbit</displayName>
-				<unitPattern count="one">{0} Tbit</unitPattern>
-				<unitPattern count="other">{0} Tbit</unitPattern>
+				<unitPattern count="one">{0} mil/gal</unitPattern>
+				<unitPattern count="other">{0} mil/gal</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
-			<unit type="duration-day">
-				<displayName>kun</displayName>
-				<unitPattern count="one">{0} kun</unitPattern>
-				<unitPattern count="other">{0} kun</unitPattern>
+			<unit type="digital-terabit">
+				<displayName>Tbit</displayName>
+				<unitPattern count="one">{0} Tbit</unitPattern>
+				<unitPattern count="other">{0} Tbit</unitPattern>
 			</unit>
-			<unit type="duration-hour">
-				<displayName>soat</displayName>
-				<unitPattern count="one">{0} soat</unitPattern>
-				<unitPattern count="other">{0} soat</unitPattern>
-				<perUnitPattern>{0}/soat</perUnitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μson.</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
+			<unit type="digital-gigabit">
+				<displayName>Gbit</displayName>
+				<unitPattern count="one">{0} Gbit</unitPattern>
+				<unitPattern count="other">{0} Gbit</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>millison.</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>daqiqa</displayName>
-				<unitPattern count="one">{0} daq</unitPattern>
-				<unitPattern count="other">{0} daq</unitPattern>
+			<unit type="digital-megabit">
+				<displayName>Mbit</displayName>
+				<unitPattern count="one">{0} Mbit</unitPattern>
+				<unitPattern count="other">{0} Mbit</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>oy</displayName>
-				<unitPattern count="one">{0} oy</unitPattern>
-				<unitPattern count="other">{0} oy</unitPattern>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
 			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nanoson.</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+			<unit type="digital-kilobit">
+				<displayName>kbit</displayName>
+				<unitPattern count="one">{0} kbit</unitPattern>
+				<unitPattern count="other">{0} kbit</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>soniya</displayName>
-				<unitPattern count="one">{0} soniya</unitPattern>
-				<unitPattern count="other">{0} soniya</unitPattern>
-				<perUnitPattern>{0}/s</perUnitPattern>
+			<unit type="digital-byte">
+				<displayName>bayt</displayName>
+				<unitPattern count="one">{0} bayt</unitPattern>
+				<unitPattern count="other">{0} bayt</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>hafta</displayName>
-				<unitPattern count="one">{0} haft</unitPattern>
-				<unitPattern count="other">{0} haft</unitPattern>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>asr</displayName>
+				<unitPattern count="one">{0} asr</unitPattern>
+				<unitPattern count="other">{0} asr</unitPattern>
 			</unit>
 			<unit type="duration-year">
 				<displayName>yil</displayName>
 				<unitPattern count="one">{0} yil</unitPattern>
 				<unitPattern count="other">{0} yil</unitPattern>
+				<perUnitPattern>{0}/yil</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>oy</displayName>
+				<unitPattern count="one">{0} oy</unitPattern>
+				<unitPattern count="other">{0} oy</unitPattern>
+				<perUnitPattern>{0}/oy</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>hafta</displayName>
+				<unitPattern count="one">{0} hafta</unitPattern>
+				<unitPattern count="other">{0} hafta</unitPattern>
+				<perUnitPattern>{0}/hafta</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>kun</displayName>
+				<unitPattern count="one">{0} kun</unitPattern>
+				<unitPattern count="other">{0} kun</unitPattern>
+				<perUnitPattern>{0}/kun</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>soat</displayName>
+				<unitPattern count="one">{0} st</unitPattern>
+				<unitPattern count="other">{0} st</unitPattern>
+				<perUnitPattern>{0}/st</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>daq</displayName>
+				<unitPattern count="one">{0} daq</unitPattern>
+				<unitPattern count="other">{0} daq</unitPattern>
+				<perUnitPattern>{0}/daq</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>son</displayName>
+				<unitPattern count="one">{0} son</unitPattern>
+				<unitPattern count="other">{0} son</unitPattern>
+				<perUnitPattern>{0}/s</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>millisoniya</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>mks</displayName>
+				<unitPattern count="one">{0} mks</unitPattern>
+				<unitPattern count="other">{0} mks</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosoniya</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
-				<displayName>amp</displayName>
+				<displayName>amper</displayName>
 				<unitPattern count="one">{0} A</unitPattern>
 				<unitPattern count="other">{0} A</unitPattern>
 			</unit>
@@ -5524,14 +6003,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="electric-ohm">
 				<displayName>om</displayName>
-				<unitPattern count="one">{0} om</unitPattern>
-				<unitPattern count="other">{0} om</unitPattern>
+				<unitPattern count="one">{0} Ω</unitPattern>
+				<unitPattern count="other">{0} Ω</unitPattern>
 			</unit>
 			<unit type="electric-volt">
 				<displayName>volt</displayName>
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kkal</displayName>
+				<unitPattern count="one">{0} kkal</unitPattern>
+				<unitPattern count="other">{0} kkal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kal</displayName>
 				<unitPattern count="one">{0} kal</unitPattern>
@@ -5542,241 +6026,245 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} kal</unitPattern>
 				<unitPattern count="other">{0} kal</unitPattern>
 			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>kilojoul</displayName>
+				<unitPattern count="one">{0} kJ</unitPattern>
+				<unitPattern count="other">{0} kJ</unitPattern>
+			</unit>
 			<unit type="energy-joule">
 				<displayName>joul</displayName>
 				<unitPattern count="one">{0} J</unitPattern>
 				<unitPattern count="other">{0} J</unitPattern>
 			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kkal</displayName>
-				<unitPattern count="one">{0} kkal</unitPattern>
-				<unitPattern count="other">{0} kkal</unitPattern>
-			</unit>
-			<unit type="energy-kilojoule">
-				<displayName>kJ</displayName>
-				<unitPattern count="one">{0} kJ</unitPattern>
-				<unitPattern count="other">{0} kJ</unitPattern>
-			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kVt-soat</displayName>
 				<unitPattern count="one">{0} kVt-soat</unitPattern>
 				<unitPattern count="other">{0} kVt-soat</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
-				<displayName>GGts</displayName>
-				<unitPattern count="one">{0} GGts</unitPattern>
-				<unitPattern count="other">{0} GGts</unitPattern>
-			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Gts</displayName>
-				<unitPattern count="one">{0} Gts</unitPattern>
-				<unitPattern count="other">{0} Gts</unitPattern>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<displayName>kGts</displayName>
-				<unitPattern count="one">{0} kGts</unitPattern>
-				<unitPattern count="other">{0} kGts</unitPattern>
+				<displayName>GGs</displayName>
+				<unitPattern count="one">{0} GGs</unitPattern>
+				<unitPattern count="other">{0} GGs</unitPattern>
 			</unit>
 			<unit type="frequency-megahertz">
-				<displayName>MGts</displayName>
-				<unitPattern count="one">{0} MGts</unitPattern>
-				<unitPattern count="other">{0} MGts</unitPattern>
+				<displayName>MGs</displayName>
+				<unitPattern count="one">{0} MGs</unitPattern>
+				<unitPattern count="other">{0} MGs</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>a.b.</displayName>
-				<unitPattern count="one">{0} a.b.</unitPattern>
-				<unitPattern count="other">{0} a.b.</unitPattern>
+			<unit type="frequency-kilohertz">
+				<displayName>kGs</displayName>
+				<unitPattern count="one">{0} kGs</unitPattern>
+				<unitPattern count="other">{0} kGs</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>sm</displayName>
-				<unitPattern count="one">{0} sm</unitPattern>
-				<unitPattern count="other">{0} sm</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Gs</displayName>
+				<unitPattern count="one">{0} Gs</unitPattern>
+				<unitPattern count="other">{0} Gs</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>metr</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>fut</displayName>
-				<unitPattern count="one">{0} fut</unitPattern>
-				<unitPattern count="other">{0} fut</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>dyum</displayName>
-				<unitPattern count="one">{0} dyum</unitPattern>
-				<unitPattern count="other">{0} dyum</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>yo.y.</displayName>
-				<unitPattern count="one">{0} yo.y.</unitPattern>
-				<unitPattern count="other">{0} yo.y.</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>metr</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µmetr</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mil</displayName>
-				<unitPattern count="one">{0} mil</unitPattern>
-				<unitPattern count="other">{0} mil</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>sm</displayName>
+				<unitPattern count="one">{0} sm</unitPattern>
+				<unitPattern count="other">{0} sm</unitPattern>
+				<perUnitPattern>{0}/sm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="one">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µmetr</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>den.mili</displayName>
-				<unitPattern count="one">{0} den.mili</unitPattern>
-				<unitPattern count="other">{0} den.mili</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pk</displayName>
-				<unitPattern count="one">{0} pk</unitPattern>
-				<unitPattern count="other">{0} pk</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mil</displayName>
+				<unitPattern count="one">{0} mil</unitPattern>
+				<unitPattern count="other">{0} mil</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yard</displayName>
 				<unitPattern count="one">{0} yard</unitPattern>
 				<unitPattern count="other">{0} yard</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>fut</displayName>
+				<unitPattern count="one">{0} fut</unitPattern>
+				<unitPattern count="other">{0} fut</unitPattern>
+				<perUnitPattern>{0} fut</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>dyum</displayName>
+				<unitPattern count="one">{0} dy</unitPattern>
+				<unitPattern count="other">{0} dy</unitPattern>
+				<perUnitPattern>{0}/dy</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pk</displayName>
+				<unitPattern count="one">{0} pk</unitPattern>
+				<unitPattern count="other">{0} pk</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>yorug‘lik yili</displayName>
+				<unitPattern count="one">{0} y.y.</unitPattern>
+				<unitPattern count="other">{0} y.y.</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>a.b.</displayName>
+				<unitPattern count="one">{0} a.b.</unitPattern>
+				<unitPattern count="other">{0} a.b.</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>den.mili</displayName>
+				<unitPattern count="one">{0} den.mili</unitPattern>
+				<unitPattern count="other">{0} den.mili</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>s-mil</displayName>
+				<unitPattern count="one">{0} s-mil</unitPattern>
+				<unitPattern count="other">{0} s-mil</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lk</displayName>
 				<unitPattern count="one">{0} lk</unitPattern>
 				<unitPattern count="other">{0} lk</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>kar</displayName>
-				<unitPattern count="one">{0} kar</unitPattern>
-				<unitPattern count="other">{0} kar</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gr</displayName>
-				<unitPattern count="one">{0} gr</unitPattern>
-				<unitPattern count="other">{0} gr</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>mkg</displayName>
-				<unitPattern count="one">{0} mkg</unitPattern>
-				<unitPattern count="other">{0} mkg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gramm</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>unt.</displayName>
-				<unitPattern count="one">{0} unt.</unitPattern>
-				<unitPattern count="other">{0} unt.</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>t. unt.</displayName>
-				<unitPattern count="one">t. unt.</unitPattern>
-				<unitPattern count="other">{0} t. unt.</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>funt</displayName>
-				<unitPattern count="one">{0} funt</unitPattern>
-				<unitPattern count="other">{0} funt</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>amer. t</displayName>
 				<unitPattern count="one">{0} amer. t</unitPattern>
 				<unitPattern count="other">{0} amer. t</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>funt</displayName>
+				<unitPattern count="one">{0} funt</unitPattern>
+				<unitPattern count="other">{0} funt</unitPattern>
+				<perUnitPattern>{0}/funt</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>unsiya</displayName>
+				<unitPattern count="one">{0} unsiya</unitPattern>
+				<unitPattern count="other">{0} unsiya</unitPattern>
+				<perUnitPattern>{0}/unsiya</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>troya unsiyasi</displayName>
+				<unitPattern count="one">{0} troya unsiyasi</unitPattern>
+				<unitPattern count="other">{0} troya unsiyasi</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karat</displayName>
+				<unitPattern count="one">{0} kar</unitPattern>
+				<unitPattern count="other">{0} kar</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GVt</displayName>
 				<unitPattern count="one">{0} GVt</unitPattern>
 				<unitPattern count="other">{0} GVt</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>o.k.</displayName>
-				<unitPattern count="one">{0} o.k.</unitPattern>
-				<unitPattern count="other">{0} o.k.</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kVt</displayName>
-				<unitPattern count="one">{0} kVt</unitPattern>
-				<unitPattern count="other">{0} kVt</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MVt</displayName>
 				<unitPattern count="one">{0} MVt</unitPattern>
 				<unitPattern count="other">{0} MVt</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mVt</displayName>
-				<unitPattern count="one">{0} mVt</unitPattern>
-				<unitPattern count="other">{0} mVt</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kVt</displayName>
+				<unitPattern count="one">{0} kVt</unitPattern>
+				<unitPattern count="other">{0} kVt</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>Vt</displayName>
 				<unitPattern count="one">{0} Vt</unitPattern>
 				<unitPattern count="other">{0} Vt</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mVt</displayName>
+				<unitPattern count="one">{0} mVt</unitPattern>
+				<unitPattern count="other">{0} mVt</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>o.k.</displayName>
+				<unitPattern count="one">{0} o.k.</unitPattern>
+				<unitPattern count="other">{0} o.k.</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>gPa</displayName>
 				<unitPattern count="one">{0} gPa</unitPattern>
 				<unitPattern count="other">{0} gPa</unitPattern>
 			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>mm sim.ust</displayName>
+				<unitPattern count="one">{0} mm sim.ust</unitPattern>
+				<unitPattern count="other">{0} mm sim.ust</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>funt/kv.dy</displayName>
+				<unitPattern count="one">{0} funt/kv.dy</unitPattern>
+				<unitPattern count="other">{0} funt/kv.dy</unitPattern>
+			</unit>
 			<unit type="pressure-inch-hg">
-				<displayName>dyum sim. ust.</displayName>
-				<unitPattern count="one">{0} dyum sim. ust.</unitPattern>
-				<unitPattern count="other">{0} dyum sim. ust.</unitPattern>
+				<displayName>dy sim.ust</displayName>
+				<unitPattern count="one">{0} dy sim.ust</unitPattern>
+				<unitPattern count="other">{0} dy sim.ust</unitPattern>
 			</unit>
 			<unit type="pressure-millibar">
 				<displayName>mbar</displayName>
 				<unitPattern count="one">{0} mbar</unitPattern>
 				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<displayName>mm sim. ust.</displayName>
-				<unitPattern count="one">{0} mm sim. ust.</unitPattern>
-				<unitPattern count="other">{0} mm sim. ust.</unitPattern>
-			</unit>
-			<unit type="pressure-pound-per-square-inch">
-				<displayName>psi</displayName>
-				<unitPattern count="one">{0} psi</unitPattern>
-				<unitPattern count="other">{0} psi</unitPattern>
-			</unit>
-			<unit type="proportion-karat">
-				<displayName>kar</displayName>
-				<unitPattern count="one">{0} kar</unitPattern>
-				<unitPattern count="other">{0} kar</unitPattern>
-			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/soat</displayName>
 				<unitPattern count="one">{0} km/soat</unitPattern>
@@ -5792,6 +6280,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mil/soat</unitPattern>
 				<unitPattern count="other">{0} mil/soat</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>uzel</displayName>
+				<unitPattern count="one">{0} uzel</unitPattern>
+				<unitPattern count="other">{0} uzel</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -5807,31 +6305,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>akrofut</displayName>
-				<unitPattern count="one">{0} akrofut</unitPattern>
-				<unitPattern count="other">{0} akrofut</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>sL</displayName>
-				<unitPattern count="one">{0} sL</unitPattern>
-				<unitPattern count="other">{0} sL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>sm³</displayName>
-				<unitPattern count="one">{0} sm³</unitPattern>
-				<unitPattern count="other">{0} sm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>fut³</displayName>
-				<unitPattern count="one">{0} fut³</unitPattern>
-				<unitPattern count="other">{0} fut³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>dyum³</displayName>
-				<unitPattern count="one">{0} dyum³</unitPattern>
-				<unitPattern count="other">{0} dyum³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -5841,36 +6314,38 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>sm³</displayName>
+				<unitPattern count="one">{0} sm³</unitPattern>
+				<unitPattern count="other">{0} sm³</unitPattern>
+				<perUnitPattern>{0}/sm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
-				<displayName>mil³</displayName>
-				<unitPattern count="one">{0} mil³</unitPattern>
-				<unitPattern count="other">{0} mil³</unitPattern>
+				<displayName>kub mil</displayName>
+				<unitPattern count="one">{0} kub mil</unitPattern>
+				<unitPattern count="other">{0} kub mil</unitPattern>
 			</unit>
 			<unit type="volume-cubic-yard">
-				<displayName>yard³</displayName>
+				<displayName>kub yard</displayName>
 				<unitPattern count="one">{0} yard³</unitPattern>
 				<unitPattern count="other">{0} yard³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>piyola</displayName>
-				<unitPattern count="one">{0} piyola</unitPattern>
-				<unitPattern count="other">{0} piyola</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>kub fut</displayName>
+				<unitPattern count="one">{0} kub fut</unitPattern>
+				<unitPattern count="other">{0} kub fut</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="one">{0} dL</unitPattern>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>kub duym</displayName>
+				<unitPattern count="one">{0} kub duym</unitPattern>
+				<unitPattern count="other">{0} kub duym</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>su. unt.</displayName>
-				<unitPattern count="one">{0} su. unt.</unitPattern>
-				<unitPattern count="other">{0} su. unt.</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>gL</displayName>
@@ -5881,37 +6356,80 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>litr</displayName>
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="one">{0} ML</unitPattern>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0} dL</unitPattern>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>sL</displayName>
+				<unitPattern count="one">{0} sL</unitPattern>
+				<unitPattern count="other">{0} sL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
 				<unitPattern count="one">{0} mL</unitPattern>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pint</displayName>
-				<unitPattern count="one">{0} pint</unitPattern>
-				<unitPattern count="other">{0} pint</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>m. piyola</displayName>
+				<unitPattern count="one">{0} m. piyola</unitPattern>
+				<unitPattern count="other">{0} m. piyola</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>akrofut</displayName>
+				<unitPattern count="one">{0} akrofut</unitPattern>
+				<unitPattern count="other">{0} akrofut</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>kvart</displayName>
 				<unitPattern count="one">{0} kvart</unitPattern>
 				<unitPattern count="other">{0} kvart</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pint</displayName>
+				<unitPattern count="one">{0} pint</unitPattern>
+				<unitPattern count="other">{0} pint</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>piyola</displayName>
+				<unitPattern count="one">{0} piyola</unitPattern>
+				<unitPattern count="other">{0} piyola</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>suyuq unsiya</displayName>
+				<unitPattern count="one">{0} suyuq unsiya</unitPattern>
+				<unitPattern count="other">{0} suyuq unsiya</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
-				<displayName>osh.q.</displayName>
-				<unitPattern count="one">{0} osh.q.</unitPattern>
-				<unitPattern count="other">{0} osh.q.</unitPattern>
+				<displayName>osh qoshiq</displayName>
+				<unitPattern count="one">{0} osh qoshiq</unitPattern>
+				<unitPattern count="other">{0} osh qoshiq</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
-				<displayName>ch.q.</displayName>
-				<unitPattern count="one">{0} ch.q.</unitPattern>
-				<unitPattern count="other">{0} ch.q.</unitPattern>
+				<displayName>choy qoshiq</displayName>
+				<unitPattern count="one">{0} choy qoshiq</unitPattern>
+				<unitPattern count="other">{0} choy qoshiq</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -5921,6 +6439,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} G</unitPattern>
 				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -5929,26 +6451,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} m²</unitPattern>
 				<unitPattern count="other">{0} m²</unitPattern>
@@ -5957,76 +6467,73 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
-			<unit type="duration-day">
-				<displayName>kun</displayName>
-				<unitPattern count="one">{0} k</unitPattern>
-				<unitPattern count="other">{0} k</unitPattern>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
 			</unit>
-			<unit type="duration-hour">
-				<displayName>soat</displayName>
-				<unitPattern count="one">{0} soat</unitPattern>
-				<unitPattern count="other">{0} soat</unitPattern>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>mson.</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100 km</displayName>
+				<unitPattern count="one">{0}L/100km</unitPattern>
+				<unitPattern count="other">{0}L/100km</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>daqiqa</displayName>
-				<unitPattern count="one">{0} daq</unitPattern>
-				<unitPattern count="other">{0} daq</unitPattern>
+			<unit type="duration-year">
+				<displayName>yil</displayName>
+				<unitPattern count="one">{0} yil</unitPattern>
+				<unitPattern count="other">{0} yil</unitPattern>
 			</unit>
 			<unit type="duration-month">
 				<displayName>oy</displayName>
 				<unitPattern count="one">{0} oy</unitPattern>
 				<unitPattern count="other">{0} oy</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>son</displayName>
-				<unitPattern count="one">{0} son</unitPattern>
-				<unitPattern count="other">{0} son</unitPattern>
-			</unit>
 			<unit type="duration-week">
 				<displayName>hafta</displayName>
-				<unitPattern count="one">{0} haft</unitPattern>
-				<unitPattern count="other">{0} haft</unitPattern>
+				<unitPattern count="one">{0} hafta</unitPattern>
+				<unitPattern count="other">{0} hafta</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>yil</displayName>
-				<unitPattern count="one">{0} y</unitPattern>
-				<unitPattern count="other">{0} y</unitPattern>
+			<unit type="duration-day">
+				<displayName>kun</displayName>
+				<unitPattern count="one">{0} kun</unitPattern>
+				<unitPattern count="other">{0} kun</unitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>sm</displayName>
-				<unitPattern count="one">{0} sm</unitPattern>
-				<unitPattern count="other">{0} sm</unitPattern>
+			<unit type="duration-hour">
+				<displayName>soat</displayName>
+				<unitPattern count="one">{0} st</unitPattern>
+				<unitPattern count="other">{0} st</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0} fut</unitPattern>
-				<unitPattern count="other">{0} fut</unitPattern>
+			<unit type="duration-minute">
+				<displayName>daq</displayName>
+				<unitPattern count="one">{0} d</unitPattern>
+				<unitPattern count="other">{0} d</unitPattern>
 			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0} dyuym</unitPattern>
-				<unitPattern count="other">{0} dyuym</unitPattern>
+			<unit type="duration-second">
+				<displayName>son</displayName>
+				<unitPattern count="one">{0} s</unitPattern>
+				<unitPattern count="other">{0} s</unitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>mson</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
 				<unitPattern count="one">{0} km</unitPattern>
 				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} yo.y.</unitPattern>
-				<unitPattern count="other">{0} yo.y.</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>metr</displayName>
 				<unitPattern count="one">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} milya</unitPattern>
-				<unitPattern count="other">{0} milya</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>sm</displayName>
+				<unitPattern count="one">{0} sm</unitPattern>
+				<unitPattern count="other">{0} sm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -6037,31 +6544,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} milya</unitPattern>
+				<unitPattern count="other">{0} milya</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} yard</unitPattern>
 				<unitPattern count="other">{0} yard</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>gr</displayName>
-				<unitPattern count="one">{0} gr</unitPattern>
-				<unitPattern count="other">{0} gr</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} fut</unitPattern>
+				<unitPattern count="other">{0} fut</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} dyuym</unitPattern>
+				<unitPattern count="other">{0} dyuym</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} yo.y.</unitPattern>
+				<unitPattern count="other">{0} yo.y.</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="one">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} untsiya</unitPattern>
-				<unitPattern count="other">{0} untsiya</unitPattern>
+			<unit type="mass-gram">
+				<displayName>gramm</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} funt</unitPattern>
 				<unitPattern count="other">{0} funt</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} untsiya</unitPattern>
+				<unitPattern count="other">{0} untsiya</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} kW</unitPattern>
@@ -6071,6 +6590,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
@@ -6118,6 +6641,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
@@ -6139,26 +6668,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<listPattern type="unit">
 			<listPatternPart type="start">{0}, {1}</listPatternPart>
 			<listPatternPart type="middle">{0}, {1}</listPatternPart>
-			<listPatternPart type="end">{0}, {1}</listPatternPart>
-			<listPatternPart type="2">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0} {1}</listPatternPart>
+			<listPatternPart type="2">{0} {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-narrow">
 			<listPatternPart type="start">{0}, {1}</listPatternPart>
 			<listPatternPart type="middle">{0}, {1}</listPatternPart>
-			<listPatternPart type="end">{0}, {1}</listPatternPart>
-			<listPatternPart type="2">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0} {1}</listPatternPart>
+			<listPatternPart type="2">{0} {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-short">
 			<listPatternPart type="start">{0}, {1}</listPatternPart>
 			<listPatternPart type="middle">{0}, {1}</listPatternPart>
-			<listPatternPart type="end">{0}, {1}</listPatternPart>
-			<listPatternPart type="2">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0} {1}</listPatternPart>
+			<listPatternPart type="2">{0} {1}</listPatternPart>
 		</listPattern>
 	</listPatterns>
 	<posix>
 		<messages>
 			<yesstr>ha:h</yesstr>
-			<nostr>yoʻq:y</nostr>
+			<nostr>yo‘q:y</nostr>
 		</messages>
 	</posix>
 </ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uz_Arab.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Arab.xml
similarity index 78%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uz_Arab.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Arab.xml
index 77e3f80945b..bdc2f579bbf 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uz_Arab.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Arab.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="uz"/>
 		<script type="Arab"/>
 	</identity>
@@ -74,7 +73,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="2" draft="contributed">فبر</month>
 							<month type="3" draft="contributed">مار</month>
 							<month type="4" draft="contributed">اپر</month>
-							<month type="5" draft="contributed">مـی</month>
+							<month type="5" draft="contributed">می</month>
 							<month type="6" draft="contributed">جون</month>
 							<month type="7" draft="contributed">جول</month>
 							<month type="8" draft="contributed">اگس</month>
@@ -213,6 +212,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern draft="unconfirmed">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0K ¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0K ¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00K ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K ¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000K ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K ¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0M ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M ¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00M ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M ¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000M ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M ¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0G ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G ¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00G ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G ¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000G ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0T ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00T ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000T ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AFN">
@@ -222,3 +249,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</currencies>
 	</numbers>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uz_Arab_AF.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Arab_AF.xml
similarity index 72%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uz_Arab_AF.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Arab_AF.xml
index 93888a9362a..6679dafc9d0 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uz_Arab_AF.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Arab_AF.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="uz"/>
 		<script type="Arab"/>
 		<territory type="AF"/>
 		<!-- stub file for completing the tree -->
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uz_Cyrl.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Cyrl.xml
similarity index 96%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uz_Cyrl.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Cyrl.xml
index cc8d4120f9a..7432618cee4 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uz_Cyrl.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Cyrl.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11042 $"/>
-		<generation date="$Date: 2014-10-31 12:11:19 -0500 (Fri, 31 Oct 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="uz"/>
 		<script type="Cyrl"/>
 	</identity>
@@ -489,45 +488,45 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="numbers">Рақамлар</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Араб-ҳинд рақамлари</type>
-			<type type="arabext" key="numbers">Кенгайтирилган араб-ҳинд рақамлари</type>
-			<type type="armn" key="numbers">Арман сонлари</type>
-			<type type="armnlow" key="numbers">Арман кичик сонлари</type>
-			<type type="beng" key="numbers">Бенгали рақамлари</type>
-			<type type="deva" key="numbers">Деванагари рақамлари</type>
-			<type type="ducet" key="collation">Сукут бўйича саралаш тартиби</type>
-			<type type="ethi" key="numbers">Ҳабаш сонлари</type>
-			<type type="fullwide" key="numbers">Тўлиқ кенгликдаги рақамлар</type>
-			<type type="geor" key="numbers">Грузин сонлари</type>
-			<type type="gregorian" key="calendar">Григориан календари</type>
-			<type type="grek" key="numbers">Грек сонлари</type>
-			<type type="greklow" key="numbers">Грек кичик сонлари</type>
-			<type type="gujr" key="numbers">Гужарати рақамлари</type>
-			<type type="guru" key="numbers">Гурмухи рақамлари</type>
-			<type type="hanidec" key="numbers">Хитой ўнлик сонлари</type>
-			<type type="hans" key="numbers">Соддалаштирилган Хитой сонлари</type>
-			<type type="hansfin" key="numbers">Соддалаштирилган Хитой молия сонлари</type>
-			<type type="hant" key="numbers">Анъанавий Хитой сонлари</type>
-			<type type="hantfin" key="numbers">Анъанавий Хитой молия сонлари</type>
-			<type type="hebr" key="numbers">Иброний сонлари</type>
-			<type type="jpan" key="numbers">Япония сонлари</type>
-			<type type="jpanfin" key="numbers">Япония молия сонлари</type>
-			<type type="khmr" key="numbers">Хмер рақамлари</type>
-			<type type="knda" key="numbers">Каннада рақамлари</type>
-			<type type="laoo" key="numbers">Лао рақамлари</type>
-			<type type="latn" key="numbers">Ғарб рақамлари</type>
-			<type type="mlym" key="numbers">Малайалам рақамлари</type>
-			<type type="mymr" key="numbers">Мьянма рақамлари</type>
-			<type type="orya" key="numbers">Ория рақамлари</type>
-			<type type="roman" key="numbers">Рим сонлари</type>
-			<type type="romanlow" key="numbers">Рим кичик сонлари</type>
-			<type type="search" key="collation">Умумий қидириш</type>
-			<type type="standard" key="collation">Стандарт саралаш тартиби</type>
-			<type type="taml" key="numbers">Анъанавий Тамил сонлари</type>
-			<type type="tamldec" key="numbers">Тамил рақамлари</type>
-			<type type="telu" key="numbers">Телугу рақамлари</type>
-			<type type="thai" key="numbers">Тай рақамлари</type>
-			<type type="tibt" key="numbers">Тибет рақамлари</type>
+			<type key="calendar" type="gregorian">Григориан календари</type>
+			<type key="collation" type="ducet">Сукут бўйича саралаш тартиби</type>
+			<type key="collation" type="search">Умумий қидириш</type>
+			<type key="collation" type="standard">Стандарт саралаш тартиби</type>
+			<type key="numbers" type="arab">Араб-ҳинд рақамлари</type>
+			<type key="numbers" type="arabext">Кенгайтирилган араб-ҳинд рақамлари</type>
+			<type key="numbers" type="armn">Арман сонлари</type>
+			<type key="numbers" type="armnlow">Арман кичик сонлари</type>
+			<type key="numbers" type="beng">Бенгали рақамлари</type>
+			<type key="numbers" type="deva">Деванагари рақамлари</type>
+			<type key="numbers" type="ethi">Ҳабаш сонлари</type>
+			<type key="numbers" type="fullwide">Тўлиқ кенгликдаги рақамлар</type>
+			<type key="numbers" type="geor">Грузин сонлари</type>
+			<type key="numbers" type="grek">Грек сонлари</type>
+			<type key="numbers" type="greklow">Грек кичик сонлари</type>
+			<type key="numbers" type="gujr">Гужарати рақамлари</type>
+			<type key="numbers" type="guru">Гурмухи рақамлари</type>
+			<type key="numbers" type="hanidec">Хитой ўнлик сонлари</type>
+			<type key="numbers" type="hans">Соддалаштирилган Хитой сонлари</type>
+			<type key="numbers" type="hansfin">Соддалаштирилган Хитой молия сонлари</type>
+			<type key="numbers" type="hant">Анъанавий Хитой сонлари</type>
+			<type key="numbers" type="hantfin">Анъанавий Хитой молия сонлари</type>
+			<type key="numbers" type="hebr">Иброний сонлари</type>
+			<type key="numbers" type="jpan">Япония сонлари</type>
+			<type key="numbers" type="jpanfin">Япония молия сонлари</type>
+			<type key="numbers" type="khmr">Хмер рақамлари</type>
+			<type key="numbers" type="knda">Каннада рақамлари</type>
+			<type key="numbers" type="laoo">Лао рақамлари</type>
+			<type key="numbers" type="latn">Ғарб рақамлари</type>
+			<type key="numbers" type="mlym">Малайалам рақамлари</type>
+			<type key="numbers" type="mymr">Мьянма рақамлари</type>
+			<type key="numbers" type="orya">Ория рақамлари</type>
+			<type key="numbers" type="roman">Рим сонлари</type>
+			<type key="numbers" type="romanlow">Рим кичик сонлари</type>
+			<type key="numbers" type="taml">Анъанавий Тамил сонлари</type>
+			<type key="numbers" type="tamldec">Тамил рақамлари</type>
+			<type key="numbers" type="telu">Телугу рақамлари</type>
+			<type key="numbers" type="thai">Тай рақамлари</type>
+			<type key="numbers" type="tibt">Тибет рақамлари</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Metric</measurementSystemName>
@@ -904,14 +903,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</quarterWidth>
 					</quarterContext>
 				</quarters>
-				<dayPeriods>
-					<dayPeriodContext type="format">
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="pm">PM</dayPeriod>
-						</dayPeriodWidth>
-					</dayPeriodContext>
-				</dayPeriods>
 				<eras>
 					<eraAbbr>
 						<era type="0">М.А.</era>
@@ -936,7 +927,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
+							<pattern>dd/MM/yy</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -1014,6 +1005,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yMMM">y MMM</dateFormatItem>
 						<dateFormatItem id="yMMMd">y MMM d</dateFormatItem>
 						<dateFormatItem id="yMMMEd">y MMM d, E</dateFormatItem>
+						<dateFormatItem id="yMMMM">y MMMM</dateFormatItem>
 						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
 						<dateFormatItem id="yQQQQ">y QQQQ</dateFormatItem>
 					</availableFormats>
@@ -2374,6 +2366,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤ #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤ 0минг</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤ 0минг</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤ 00минг</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00минг</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤ 000минг</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000минг</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤ 0млн</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0млн</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤ 00млн</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00млн</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤ 000млн</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000млн</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤ 0млрд</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0млрд</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤ 00млрд</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00млрд</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤ 000млрд</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000млрд</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤ 0трлн</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0трлн</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤ 00трлн</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00трлн</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤ 000трлн</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000трлн</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -2584,6 +2604,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">Парагвай гуарани</displayName>
 				<displayName count="other">Парагвай гуарани</displayName>
 			</currency>
+			<currency type="RON">
+				<symbol draft="contributed">RON</symbol>
+			</currency>
 			<currency type="RUB">
 				<displayName>Рус рубли</displayName>
 				<displayName count="one">Рус рубли</displayName>
@@ -2661,6 +2684,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} G</unitPattern>
 				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<displayName draft="provisional">°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName draft="provisional">′</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
@@ -2671,31 +2699,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName draft="provisional">°</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="provisional">ac</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName draft="provisional">km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName draft="provisional">ha</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<displayName draft="provisional">ft²</displayName>
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="provisional">km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<displayName draft="provisional">m²</displayName>
 				<unitPattern count="one">{0} m²</unitPattern>
@@ -2706,6 +2719,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<displayName draft="provisional">ac</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName draft="provisional">ft²</displayName>
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="provisional">йил</displayName>
+				<unitPattern count="one">{0} йил</unitPattern>
+				<unitPattern count="other">{0} йил</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="provisional">ой</displayName>
+				<unitPattern count="one">{0} ой</unitPattern>
+				<unitPattern count="other">{0} ой</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="provisional">ҳафта</displayName>
+				<unitPattern count="one">{0} ҳафта</unitPattern>
+				<unitPattern count="other">{0} ҳафта</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">кун</displayName>
 				<unitPattern count="one">{0} кун</unitPattern>
@@ -2716,70 +2754,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} соат</unitPattern>
 				<unitPattern count="other">{0} соат</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="provisional">миллисония</displayName>
-				<unitPattern count="one">{0} миллисония</unitPattern>
-				<unitPattern count="other">{0} миллисония</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="provisional">дақиқа</displayName>
 				<unitPattern count="one">{0} дақиқа</unitPattern>
 				<unitPattern count="other">{0} дақиқа</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">ой</displayName>
-				<unitPattern count="one">{0} ой</unitPattern>
-				<unitPattern count="other">{0} ой</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="provisional">сония</displayName>
 				<unitPattern count="one">{0} сония</unitPattern>
 				<unitPattern count="other">{0} сония</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">ҳафта</displayName>
-				<unitPattern count="one">{0} ҳафта</unitPattern>
-				<unitPattern count="other">{0} ҳафта</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">йил</displayName>
-				<unitPattern count="one">{0} йил</unitPattern>
-				<unitPattern count="other">{0} йил</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="provisional">см</displayName>
-				<unitPattern count="one">{0} см</unitPattern>
-				<unitPattern count="other">{0} см</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="provisional">фут</displayName>
-				<unitPattern count="one">{0} фут</unitPattern>
-				<unitPattern count="other">{0} фут</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="provisional">дюйм</displayName>
-				<unitPattern count="one">{0} дюйм</unitPattern>
-				<unitPattern count="other">{0} дюйм</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="provisional">миллисония</displayName>
+				<unitPattern count="one">{0} миллисония</unitPattern>
+				<unitPattern count="other">{0} миллисония</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="provisional">км</displayName>
 				<unitPattern count="one">{0} км</unitPattern>
 				<unitPattern count="other">{0} км</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<displayName draft="provisional">ё.й.</displayName>
-				<unitPattern count="one">{0} ё.й.</unitPattern>
-				<unitPattern count="other">{0} ё.й.</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName draft="provisional">м</displayName>
 				<unitPattern count="one">{0} м</unitPattern>
 				<unitPattern count="other">{0} м</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName draft="provisional">миля</displayName>
-				<unitPattern count="one">{0} миля</unitPattern>
-				<unitPattern count="other">{0} миля</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="provisional">см</displayName>
+				<unitPattern count="one">{0} см</unitPattern>
+				<unitPattern count="other">{0} см</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="provisional">мм</displayName>
@@ -2791,35 +2794,50 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} пм</unitPattern>
 				<unitPattern count="other">{0} пм</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="provisional">миля</displayName>
+				<unitPattern count="one">{0} миля</unitPattern>
+				<unitPattern count="other">{0} миля</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName draft="provisional">ярд</displayName>
 				<unitPattern count="one">{0} ярд</unitPattern>
 				<unitPattern count="other">{0} ярд</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="provisional">г</displayName>
-				<unitPattern count="one">{0} г</unitPattern>
-				<unitPattern count="other">{0} г</unitPattern>
+			<unit type="length-foot">
+				<displayName draft="provisional">фут</displayName>
+				<unitPattern count="one">{0} фут</unitPattern>
+				<unitPattern count="other">{0} фут</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="provisional">дюйм</displayName>
+				<unitPattern count="one">{0} дюйм</unitPattern>
+				<unitPattern count="other">{0} дюйм</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="provisional">ё.й.</displayName>
+				<unitPattern count="one">{0} ё.й.</unitPattern>
+				<unitPattern count="other">{0} ё.й.</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="provisional">кг</displayName>
 				<unitPattern count="one">{0} кг</unitPattern>
 				<unitPattern count="other">{0} кг</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="provisional">унция</displayName>
-				<unitPattern count="one">{0} унция</unitPattern>
-				<unitPattern count="other">{0} унция</unitPattern>
+			<unit type="mass-gram">
+				<displayName draft="provisional">г</displayName>
+				<unitPattern count="one">{0} г</unitPattern>
+				<unitPattern count="other">{0} г</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<displayName draft="provisional">фунт</displayName>
 				<unitPattern count="one">{0} фунт</unitPattern>
 				<unitPattern count="other">{0} фунт</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="provisional">hp</displayName>
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
+			<unit type="mass-ounce">
+				<displayName draft="provisional">унция</displayName>
+				<unitPattern count="one">{0} унция</unitPattern>
+				<unitPattern count="other">{0} унция</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName draft="provisional">kW</displayName>
@@ -2831,6 +2849,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<displayName draft="provisional">hp</displayName>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="provisional">hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
@@ -2896,6 +2919,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} G</unitPattern>
 				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<displayName draft="provisional">°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName draft="provisional">′</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
@@ -2906,31 +2934,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName draft="provisional">°</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="provisional">ac</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName draft="provisional">km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName draft="provisional">ha</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<displayName draft="provisional">ft²</displayName>
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="provisional">km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<displayName draft="provisional">m²</displayName>
 				<unitPattern count="one">{0} m²</unitPattern>
@@ -2941,6 +2954,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<displayName draft="provisional">ac</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName draft="provisional">ft²</displayName>
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="provisional">йил</displayName>
+				<unitPattern count="one">{0} й</unitPattern>
+				<unitPattern count="other">{0} й</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="provisional">ой</displayName>
+				<unitPattern count="one">{0} ой</unitPattern>
+				<unitPattern count="other">{0} ой</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="provisional">ҳафта</displayName>
+				<unitPattern count="one">{0} ҳафт</unitPattern>
+				<unitPattern count="other">{0} ҳафт</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="provisional">кун</displayName>
 				<unitPattern count="one">{0} кун</unitPattern>
@@ -2951,70 +2989,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} соат</unitPattern>
 				<unitPattern count="other">{0} соат</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="provisional">миллисония</displayName>
-				<unitPattern count="one">{0} мс</unitPattern>
-				<unitPattern count="other">{0} мс</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName draft="provisional">дақиқа</displayName>
 				<unitPattern count="one">{0} дақ</unitPattern>
 				<unitPattern count="other">{0} дақ</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="provisional">ой</displayName>
-				<unitPattern count="one">{0} ой</unitPattern>
-				<unitPattern count="other">{0} ой</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="provisional">сония</displayName>
 				<unitPattern count="one">{0} сония</unitPattern>
 				<unitPattern count="other">{0} сония</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="provisional">ҳафта</displayName>
-				<unitPattern count="one">{0} ҳафт</unitPattern>
-				<unitPattern count="other">{0} ҳафт</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="provisional">йил</displayName>
-				<unitPattern count="one">{0} й</unitPattern>
-				<unitPattern count="other">{0} й</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="provisional">см</displayName>
-				<unitPattern count="one">{0} см</unitPattern>
-				<unitPattern count="other">{0} см</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="provisional">фут</displayName>
-				<unitPattern count="one">{0} фут</unitPattern>
-				<unitPattern count="other">{0} фут</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="provisional">дюйм</displayName>
-				<unitPattern count="one">{0} дюйм</unitPattern>
-				<unitPattern count="other">{0} дюйм</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName draft="provisional">миллисония</displayName>
+				<unitPattern count="one">{0} мс</unitPattern>
+				<unitPattern count="other">{0} мс</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="provisional">км</displayName>
 				<unitPattern count="one">{0} км</unitPattern>
 				<unitPattern count="other">{0} км</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<displayName draft="provisional">ё.й.</displayName>
-				<unitPattern count="one">{0} ё.й.</unitPattern>
-				<unitPattern count="other">{0} ё.й.</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName draft="provisional">м</displayName>
 				<unitPattern count="one">{0} м</unitPattern>
 				<unitPattern count="other">{0} м</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<displayName draft="provisional">миля</displayName>
-				<unitPattern count="one">{0} миля</unitPattern>
-				<unitPattern count="other">{0} миля</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="provisional">см</displayName>
+				<unitPattern count="one">{0} см</unitPattern>
+				<unitPattern count="other">{0} см</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="provisional">мм</displayName>
@@ -3026,35 +3029,50 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} пм</unitPattern>
 				<unitPattern count="other">{0} пм</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="provisional">миля</displayName>
+				<unitPattern count="one">{0} миля</unitPattern>
+				<unitPattern count="other">{0} миля</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName draft="provisional">ярд</displayName>
 				<unitPattern count="one">{0} ярд</unitPattern>
 				<unitPattern count="other">{0} ярд</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName draft="provisional">г</displayName>
-				<unitPattern count="one">{0} г</unitPattern>
-				<unitPattern count="other">{0} г</unitPattern>
+			<unit type="length-foot">
+				<displayName draft="provisional">фут</displayName>
+				<unitPattern count="one">{0} фут</unitPattern>
+				<unitPattern count="other">{0} фут</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="provisional">дюйм</displayName>
+				<unitPattern count="one">{0} дюйм</unitPattern>
+				<unitPattern count="other">{0} дюйм</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="provisional">ё.й.</displayName>
+				<unitPattern count="one">{0} ё.й.</unitPattern>
+				<unitPattern count="other">{0} ё.й.</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="provisional">кг</displayName>
 				<unitPattern count="one">{0} кг</unitPattern>
 				<unitPattern count="other">{0} кг</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="provisional">унция</displayName>
-				<unitPattern count="one">{0} унция</unitPattern>
-				<unitPattern count="other">{0} унция</unitPattern>
+			<unit type="mass-gram">
+				<displayName draft="provisional">г</displayName>
+				<unitPattern count="one">{0} г</unitPattern>
+				<unitPattern count="other">{0} г</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<displayName draft="provisional">фунт</displayName>
 				<unitPattern count="one">{0} фунт</unitPattern>
 				<unitPattern count="other">{0} фунт</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="provisional">hp</displayName>
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
+			<unit type="mass-ounce">
+				<displayName draft="provisional">унция</displayName>
+				<unitPattern count="one">{0} унция</unitPattern>
+				<unitPattern count="other">{0} унция</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName draft="provisional">kW</displayName>
@@ -3066,6 +3084,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<displayName draft="provisional">hp</displayName>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="provisional">hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
@@ -3130,6 +3153,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} G</unitPattern>
 				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -3138,26 +3165,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} ft²</unitPattern>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} m²</unitPattern>
 				<unitPattern count="other">{0} m²</unitPattern>
@@ -3166,6 +3181,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi²</unitPattern>
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<unitPattern count="one">{0} й</unitPattern>
+				<unitPattern count="other">{0} й</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<unitPattern count="one">{0} ой</unitPattern>
+				<unitPattern count="other">{0} ой</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<unitPattern count="one">{0} ҳафт</unitPattern>
+				<unitPattern count="other">{0} ҳафт</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<unitPattern count="one">{0} к</unitPattern>
 				<unitPattern count="other">{0} к</unitPattern>
@@ -3174,57 +3209,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} с</unitPattern>
 				<unitPattern count="other">{0} с</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<unitPattern count="one">{0} мс</unitPattern>
-				<unitPattern count="other">{0} мс</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<unitPattern count="one">{0} дақ</unitPattern>
 				<unitPattern count="other">{0} дақ</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<unitPattern count="one">{0} ой</unitPattern>
-				<unitPattern count="other">{0} ой</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<unitPattern count="one">{0} сон</unitPattern>
 				<unitPattern count="other">{0} сон</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<unitPattern count="one">{0} ҳафт</unitPattern>
-				<unitPattern count="other">{0} ҳафт</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<unitPattern count="one">{0} й</unitPattern>
-				<unitPattern count="other">{0} й</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<unitPattern count="one">{0} см</unitPattern>
-				<unitPattern count="other">{0} см</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="one">{0} фут</unitPattern>
-				<unitPattern count="other">{0} фут</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0} дюйм</unitPattern>
-				<unitPattern count="other">{0} дюйм</unitPattern>
+			<unit type="duration-millisecond">
+				<unitPattern count="one">{0} мс</unitPattern>
+				<unitPattern count="other">{0} мс</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<unitPattern count="one">{0} км</unitPattern>
 				<unitPattern count="other">{0} км</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} ё.й.</unitPattern>
-				<unitPattern count="other">{0} ё.й.</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<unitPattern count="one">{0} м</unitPattern>
 				<unitPattern count="other">{0} м</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} миля</unitPattern>
-				<unitPattern count="other">{0} миля</unitPattern>
+			<unit type="length-centimeter">
+				<unitPattern count="one">{0} см</unitPattern>
+				<unitPattern count="other">{0} см</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<unitPattern count="one">{0} мм</unitPattern>
@@ -3234,29 +3241,41 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} пм</unitPattern>
 				<unitPattern count="other">{0} пм</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} миля</unitPattern>
+				<unitPattern count="other">{0} миля</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="one">{0} ярд</unitPattern>
 				<unitPattern count="other">{0} ярд</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<unitPattern count="one">{0} г</unitPattern>
-				<unitPattern count="other">{0} г</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} фут</unitPattern>
+				<unitPattern count="other">{0} фут</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} дюйм</unitPattern>
+				<unitPattern count="other">{0} дюйм</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0} ё.й.</unitPattern>
+				<unitPattern count="other">{0} ё.й.</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<unitPattern count="one">{0} кг</unitPattern>
 				<unitPattern count="other">{0} кг</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} унция</unitPattern>
-				<unitPattern count="other">{0} унция</unitPattern>
+			<unit type="mass-gram">
+				<unitPattern count="one">{0} г</unitPattern>
+				<unitPattern count="other">{0} г</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} фунт</unitPattern>
 				<unitPattern count="other">{0} фунт</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} унция</unitPattern>
+				<unitPattern count="other">{0} унция</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} kW</unitPattern>
@@ -3266,6 +3285,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
@@ -3334,6 +3357,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<listPatternPart type="end">{0}, {1}</listPatternPart>
 			<listPatternPart type="2">{0}, {1}</listPatternPart>
 		</listPattern>
+		<listPattern type="unit-narrow">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+		</listPattern>
 		<listPattern type="unit-short">
 			<listPatternPart type="start">{0}, {1}</listPatternPart>
 			<listPatternPart type="middle">{0}, {1}</listPatternPart>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uz_Cyrl_UZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Cyrl_UZ.xml
similarity index 69%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uz_Cyrl_UZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Cyrl_UZ.xml
index 122abe8bbd0..e56442bd1aa 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uz_Cyrl_UZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Cyrl_UZ.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="uz"/>
 		<script type="Cyrl"/>
 		<territory type="UZ"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uz_Latn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Latn.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uz_Latn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Latn.xml
index 585dd6f2e7c..a8cbad7fd20 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uz_Latn.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Latn.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="uz"/>
 		<script type="Latn"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uz_Latn_UZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Latn_UZ.xml
similarity index 69%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uz_Latn_UZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Latn_UZ.xml
index 16a00c70e7a..26a23c44921 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/uz_Latn_UZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Latn_UZ.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="uz"/>
 		<script type="Latn"/>
 		<territory type="UZ"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vai.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai.xml
similarity index 95%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vai.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai.xml
index 1b4fa053ed9..0174e509cf7 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vai.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11351 $"/>
-		<generation date="$Date: 2015-03-06 12:59:09 -0600 (Fri, 06 Mar 2015) $"/>
+		<version number="$Revision: 12128 $"/>
 		<language type="vai"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">ꕉꕄꕞ</territory>
 			<territory type="AL">ꕉꔷꕑꕇꕩ</territory>
 			<territory type="AM">ꕉꕆꕯ</territory>
-			<territory type="AN">ꘉꕜ ꖨꕮꕊ ꕉꘋꔳꔷ</territory>
 			<territory type="AO">ꕉꖐꕞ</territory>
 			<territory type="AR">ꕉꘀꘋꔳꕯ</territory>
 			<territory type="AS">ꕶꕱ ꕢꕹꕎ</territory>
@@ -504,6 +502,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vai_Latn.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Latn.xml
similarity index 95%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vai_Latn.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Latn.xml
index f6deff84437..fdbaac808c4 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vai_Latn.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Latn.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11042 $"/>
-		<generation date="$Date: 2014-10-31 12:11:19 -0500 (Fri, 31 Oct 2014) $"/>
+		<version number="$Revision: 12128 $"/>
 		<language type="vai"/>
 		<script type="Latn"/>
 	</identity>
@@ -67,7 +66,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Aŋgíla</territory>
 			<territory type="AL">Abhaniya</territory>
 			<territory type="AM">Améniya</territory>
-			<territory type="AN">Nidɔlɛŋ Aŋtili</territory>
 			<territory type="AO">Aŋgóla</territory>
 			<territory type="AR">Ajɛŋtína</territory>
 			<territory type="AS">Poo Sambowa</territory>
@@ -507,6 +505,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -681,3 +695,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vai_Latn_LR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Latn_LR.xml
similarity index 69%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vai_Latn_LR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Latn_LR.xml
index 88aa619e823..b8494daaaf2 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vai_Latn_LR.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Latn_LR.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="vai"/>
 		<script type="Latn"/>
 		<territory type="LR"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vai_Vaii.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Vaii.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vai_Vaii.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Vaii.xml
index b92a5ea5bc7..eae912143d7 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vai_Vaii.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Vaii.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="vai"/>
 		<script type="Vaii"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vai_Vaii_LR.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Vaii_LR.xml
similarity index 69%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vai_Vaii_LR.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Vaii_LR.xml
index 3bb487fd770..c0888e13ad8 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vai_Vaii_LR.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Vaii_LR.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="vai"/>
 		<script type="Vaii"/>
 		<territory type="LR"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vi.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vi.xml
similarity index 87%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vi.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vi.xml
index f9c75bf4c9a..6eafee0edc2 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vi.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vi.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12312 $"/>
 		<language type="vi"/>
 	</identity>
 	<localeDisplayNames>
@@ -30,7 +29,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ain" draft="contributed">Tiếng Ainu</language>
 			<language type="ak">Tiếng Akan</language>
 			<language type="akk" draft="contributed">Tiếng Akkadia</language>
+			<language type="akz" draft="contributed">Tiếng Alabama</language>
 			<language type="ale" draft="contributed">Tiếng Aleut</language>
+			<language type="aln" draft="contributed">Tiếng Gheg Albani</language>
 			<language type="alt" draft="contributed">Tiếng Altai Miền Nam</language>
 			<language type="am">Tiếng Amharic</language>
 			<language type="an" draft="contributed">Tiếng Aragon</language>
@@ -40,10 +41,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ar_001">Tiếng Ả Rập Hiện đại</language>
 			<language type="arc" draft="contributed">Tiếng Aramaic</language>
 			<language type="arn" draft="contributed">Tiếng Araucanian</language>
+			<language type="aro" draft="contributed">Tiếng Araona</language>
 			<language type="arp" draft="contributed">Tiếng Arapaho</language>
+			<language type="arq" draft="contributed">Tiếng Ả Rập Algeria</language>
 			<language type="arw" draft="contributed">Tiếng Arawak</language>
+			<language type="arz" draft="contributed">Tiếng Ả Rập Ai Cập</language>
 			<language type="as">Tiếng Assam</language>
 			<language type="asa">Tiếng Asu</language>
+			<language type="ase" draft="contributed">Ngôn ngữ Ký hiệu Mỹ</language>
 			<language type="ast" draft="contributed">Tiếng Asturias</language>
 			<language type="av" draft="contributed">Tiếng Avaric</language>
 			<language type="awa" draft="contributed">Tiếng Awadhi</language>
@@ -53,26 +58,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ba">Tiếng Bashkir</language>
 			<language type="bal" draft="contributed">Tiếng Baluchi</language>
 			<language type="ban" draft="contributed">Tiếng Bali</language>
+			<language type="bar" draft="contributed">Tiếng Bavaria</language>
 			<language type="bas" draft="contributed">Tiếng Basaa</language>
 			<language type="bax" draft="contributed">Tiếng Bamun</language>
+			<language type="bbc" draft="contributed">Tiếng Batak Toba</language>
 			<language type="bbj" draft="contributed">Tiếng Ghomala</language>
 			<language type="be">Tiếng Belarus</language>
 			<language type="bej" draft="contributed">Tiếng Beja</language>
 			<language type="bem">Tiếng Bemba</language>
+			<language type="bew" draft="contributed">Tiếng Betawi</language>
 			<language type="bez">Tiếng Bena</language>
 			<language type="bfd" draft="contributed">Tiếng Bafut</language>
+			<language type="bfq" draft="contributed">Tiếng Badaga</language>
 			<language type="bg">Tiếng Bulgaria</language>
+			<language type="bgn">Tiếng Tây Balochi</language>
 			<language type="bho" draft="contributed">Tiếng Bhojpuri</language>
 			<language type="bi" draft="contributed">Tiếng Bislama</language>
 			<language type="bik" draft="contributed">Tiếng Bikol</language>
 			<language type="bin" draft="contributed">Tiếng Bini</language>
+			<language type="bjn" draft="contributed">Tiếng Banjar</language>
 			<language type="bkm" draft="contributed">Tiếng Kom</language>
 			<language type="bla" draft="contributed">Tiếng Siksika</language>
 			<language type="bm">Tiếng Bambara</language>
 			<language type="bn">Tiếng Bengali</language>
 			<language type="bo">Tiếng Tây Tạng</language>
+			<language type="bpy" draft="contributed">Tiếng Bishnupriya</language>
+			<language type="bqi" draft="contributed">Tiếng Bakhtiari</language>
 			<language type="br">Tiếng Breton</language>
 			<language type="bra" draft="contributed">Tiếng Braj</language>
+			<language type="brh" draft="contributed">Tiếng Brahui</language>
 			<language type="brx">Tiếng Bodo</language>
 			<language type="bs">Tiếng Nam Tư</language>
 			<language type="bss" draft="contributed">Tiếng Akoose</language>
@@ -86,7 +100,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="car" draft="contributed">Tiếng Carib</language>
 			<language type="cay" draft="contributed">Tiếng Cayuga</language>
 			<language type="cch" draft="contributed">Tiếng Atsam</language>
-			<language type="ce" draft="contributed">Tiếng Chechen</language>
+			<language type="ce">Tiếng Chechen</language>
 			<language type="ceb" draft="contributed">Tiếng Cebuano</language>
 			<language type="cgg">Tiếng Chiga</language>
 			<language type="ch" draft="contributed">Tiếng Chamorro</language>
@@ -99,9 +113,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="chp" draft="contributed">Tiếng Chipewyan</language>
 			<language type="chr">Tiếng Cherokee</language>
 			<language type="chy" draft="contributed">Tiếng Cheyenne</language>
-			<language type="ckb">Tiếng Kurd Sorani</language>
+			<language type="ckb">Tiếng Kurd Miền Trung</language>
 			<language type="co">Tiếng Corsica</language>
 			<language type="cop" draft="contributed">Tiếng Coptic</language>
+			<language type="cps" draft="contributed">Tiếng Capiznon</language>
 			<language type="cr" draft="contributed">Tiếng Cree</language>
 			<language type="crh" draft="contributed">Tiếng Thổ Nhĩ Kỳ Crimean</language>
 			<language type="cs">Tiếng Séc</language>
@@ -122,6 +137,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="dje">Tiếng Zarma</language>
 			<language type="doi" draft="contributed">Tiếng Dogri</language>
 			<language type="dsb">Tiếng Hạ Sorbia</language>
+			<language type="dtp" draft="contributed">Tiếng Dusun Miền Trung</language>
 			<language type="dua">Tiếng Duala</language>
 			<language type="dum" draft="contributed">Tiếng Hà Lan Trung cổ</language>
 			<language type="dv">Tiếng Divehi</language>
@@ -132,6 +148,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ebu">Tiếng Embu</language>
 			<language type="ee">Tiếng Ewe</language>
 			<language type="efi">Tiếng Efik</language>
+			<language type="egl" draft="contributed">Tiếng Emilia</language>
 			<language type="egy" draft="contributed">Tiếng Ai Cập cổ</language>
 			<language type="eka" draft="contributed">Tiếng Ekajuk</language>
 			<language type="el">Tiếng Hy Lạp</language>
@@ -145,9 +162,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="eo">Tiếng Quốc Tế Ngữ</language>
 			<language type="es">Tiếng Tây Ban Nha</language>
 			<language type="es_419">Tiếng Tây Ban Nha (Mỹ La tinh)</language>
+			<language type="es_ES">Tiếng Tây Ban Nha (Châu Âu)</language>
+			<language type="esu" draft="contributed">Tiếng Yupik Miền Trung</language>
 			<language type="et">Tiếng Estonia</language>
 			<language type="eu">Tiếng Basque</language>
 			<language type="ewo" draft="contributed">Tiếng Ewondo</language>
+			<language type="ext" draft="contributed">Tiếng Extremadura</language>
 			<language type="fa">Tiếng Ba Tư</language>
 			<language type="fan" draft="contributed">Tiếng Fang</language>
 			<language type="fat" draft="contributed">Tiếng Fanti</language>
@@ -158,8 +178,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="fo">Tiếng Faore</language>
 			<language type="fon" draft="contributed">Tiếng Fon</language>
 			<language type="fr">Tiếng Pháp</language>
+			<language type="frc" draft="contributed">Tiếng Pháp Cajun</language>
 			<language type="frm" draft="contributed">Tiếng Pháp Trung cổ</language>
 			<language type="fro" draft="contributed">Tiếng Pháp cổ</language>
+			<language type="frp" draft="contributed">Tiếng Arpitan</language>
 			<language type="frr" draft="contributed">Tiếng Frisian Miền Bắc</language>
 			<language type="frs" draft="contributed">Tiếng Frisian Miền Đông</language>
 			<language type="fur" draft="contributed">Tiếng Friulian</language>
@@ -173,9 +195,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="gez" draft="contributed">Tiếng Geez</language>
 			<language type="gil" draft="contributed">Tiếng Gilbert</language>
 			<language type="gl">Tiếng Galician</language>
+			<language type="glk" draft="contributed">Tiếng Gilaki</language>
 			<language type="gmh" draft="contributed">Tiếng Thượng Giéc-man Trung cổ</language>
 			<language type="gn">Tiếng Guarani</language>
 			<language type="goh" draft="contributed">Tiếng Thượng Giéc-man cổ</language>
+			<language type="gom" draft="contributed">Tiếng Goan Konkani</language>
 			<language type="gon" draft="contributed">Tiếng Gondi</language>
 			<language type="gor" draft="contributed">Tiếng Gorontalo</language>
 			<language type="got" draft="contributed">Tiếng Gô-tích</language>
@@ -183,14 +207,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="grc" draft="contributed">Tiếng Hy Lạp cổ</language>
 			<language type="gsw">Tiếng Đức (Thụy Sĩ)</language>
 			<language type="gu">Tiếng Gujarati</language>
+			<language type="gur" draft="contributed">Tiếng Frafra</language>
 			<language type="guz">Tiếng Gusii</language>
 			<language type="gv">Tiếng Manx</language>
 			<language type="gwi" draft="contributed">Tiếng Gwichʼin</language>
 			<language type="ha">Tiếng Hausa</language>
 			<language type="hai" draft="contributed">Tiếng Haida</language>
+			<language type="hak" draft="contributed">Tiếng Trung Hakka</language>
 			<language type="haw">Tiếng Hawaii</language>
 			<language type="he">Tiếng Do Thái</language>
 			<language type="hi">Tiếng Hindi</language>
+			<language type="hif" draft="contributed">Tiếng Fiji Hindi</language>
 			<language type="hil" draft="contributed">Tiếng Hiligaynon</language>
 			<language type="hit" draft="contributed">Tiếng Hittite</language>
 			<language type="hmn" draft="contributed">Tiếng Hmông</language>
@@ -216,12 +243,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="is">Tiếng Iceland</language>
 			<language type="it">Tiếng Ý</language>
 			<language type="iu">Tiếng Inuktitut</language>
+			<language type="izh" draft="contributed">Tiếng Ingria</language>
 			<language type="ja">Tiếng Nhật</language>
+			<language type="jam" draft="contributed">Tiếng Anh Jamaica Creole</language>
 			<language type="jbo" draft="contributed">Tiếng Lojban</language>
 			<language type="jgo">Tiếng Ngomba</language>
 			<language type="jmc">Tiếng Machame</language>
 			<language type="jpr" draft="contributed">Tiếng Judeo-Ba Tư</language>
 			<language type="jrb" draft="contributed">Tiếng Judeo-Ả Rập</language>
+			<language type="jut" draft="contributed">Tiếng Jutish</language>
 			<language type="jv">Tiếng Java</language>
 			<language type="ka">Tiếng Gruzia</language>
 			<language type="kaa" draft="contributed">Tiếng Kara-Kalpak</language>
@@ -282,6 +312,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">Tiếng Lào</language>
 			<language type="lol" draft="contributed">Tiếng Mongo</language>
 			<language type="loz">Tiếng Lozi</language>
+			<language type="lrc">Tiếng Bắc Luri</language>
 			<language type="lt">Tiếng Lít-va</language>
 			<language type="lu">Tiếng Luba-Katanga</language>
 			<language type="lua">Tiếng Luba-Lulua</language>
@@ -330,17 +361,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="my">Tiếng Miến Điện</language>
 			<language type="mye" draft="contributed">Tiếng Myene</language>
 			<language type="myv" draft="contributed">Tiếng Erzya</language>
+			<language type="mzn">Tiếng Mazanderani</language>
 			<language type="na" draft="contributed">Tiếng Nauru</language>
 			<language type="nap" draft="contributed">Tiếng Napoli</language>
 			<language type="naq">Tiếng Nama</language>
 			<language type="nb">Tiếng Na Uy (Bokmål)</language>
 			<language type="nd">Tiếng Ndebele Miền Bắc</language>
 			<language type="nds" draft="contributed">Tiếng Hạ Giéc-man</language>
+			<language type="nds_NL">Tiếng Hạ Saxon</language>
 			<language type="ne">Tiếng Nepal</language>
 			<language type="new" draft="contributed">Tiếng Newari</language>
 			<language type="ng" draft="contributed">Tiếng Ndonga</language>
 			<language type="nia" draft="contributed">Tiếng Nias</language>
 			<language type="niu" draft="contributed">Tiếng Niuean</language>
+			<language type="njo" draft="contributed">Tiếng Ao Naga</language>
 			<language type="nl">Tiếng Hà Lan</language>
 			<language type="nl_BE">Tiếng Flemish</language>
 			<language type="nmg">Tiếng Kwasio</language>
@@ -349,7 +383,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="no">Tiếng Na Uy</language>
 			<language type="nog" draft="contributed">Tiếng Nogai</language>
 			<language type="non" draft="contributed">Tiếng Na Uy cổ</language>
-			<language type="nqo" draft="contributed">Tiếng N’Ko</language>
+			<language type="nqo">Tiếng N’Ko</language>
 			<language type="nr" draft="contributed">Tiếng Ndebele Miền Nam</language>
 			<language type="nso" draft="contributed">Bắc Sotho</language>
 			<language type="nus">Tiếng Nuer</language>
@@ -383,8 +417,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ps" alt="variant">Tiếng Pushto</language>
 			<language type="pt">Tiếng Bồ Đào Nha</language>
 			<language type="pt_BR">Tiếng Bồ Đào Nha (Braxin)</language>
+			<language type="pt_PT">Tiếng Bồ Đào Nha (Châu Âu)</language>
 			<language type="qu">Tiếng Quechua</language>
 			<language type="quc">Tiếng Kʼicheʼ</language>
+			<language type="qug" draft="contributed">Tiếng Quechua ở Cao nguyên Chimborazo</language>
 			<language type="raj" draft="contributed">Tiếng Rajasthani</language>
 			<language type="rap" draft="contributed">Tiếng Rapanui</language>
 			<language type="rar" draft="contributed">Tiếng Rarotongan</language>
@@ -412,6 +448,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn" draft="contributed">Tiếng Sicilia</language>
 			<language type="sco" draft="contributed">Tiếng Scots</language>
 			<language type="sd">Tiếng Sindhi</language>
+			<language type="sdh">Tiếng Kurd Miền Nam</language>
 			<language type="se">Tiếng Sami Miền Bắc</language>
 			<language type="see" draft="contributed">Tiếng Seneca</language>
 			<language type="seh">Tiếng Sena</language>
@@ -443,14 +480,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ss" draft="contributed">Tiếng Swati</language>
 			<language type="ssy" draft="contributed">Tiếng Saho</language>
 			<language type="st">Tiếng Sesotho</language>
-			<language type="su">Tiếng Sudan</language>
+			<language type="su">Tiếng Sunda</language>
 			<language type="suk" draft="contributed">Tiếng Sukuma</language>
 			<language type="sus" draft="contributed">Tiếng Susu</language>
 			<language type="sux" draft="contributed">Tiếng Sumeria</language>
 			<language type="sv">Tiếng Thụy Điển</language>
 			<language type="sw">Tiếng Swahili</language>
+			<language type="sw_CD">Tiếng Swahili Congo</language>
 			<language type="swb" draft="contributed">Tiếng Cômo</language>
-			<language type="swc">Tiếng Swahili Congo</language>
 			<language type="syc" draft="contributed">Tiếng Syria Cổ điển</language>
 			<language type="syr" draft="contributed">Tiếng Syriac</language>
 			<language type="ta">Tiếng Tamil</language>
@@ -505,6 +542,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal" draft="contributed">Tiếng Walamo</language>
 			<language type="war" draft="contributed">Tiếng Waray</language>
 			<language type="was" draft="contributed">Tiếng Washo</language>
+			<language type="wbp">Tiếng Warlpiri</language>
 			<language type="wo">Tiếng Wolof</language>
 			<language type="xal" draft="contributed">Tiếng Kalmyk</language>
 			<language type="xh">Tiếng Xhosa</language>
@@ -729,7 +767,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albani</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Tây Ấn Hà Lan</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AQ">Nam Cực</territory>
 			<territory type="AR">Argentina</territory>
@@ -748,7 +785,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BH">Bahrain</territory>
 			<territory type="BI">Burundi</territory>
 			<territory type="BJ">Benin</territory>
-			<territory type="BL">Saint Barthélemy</territory>
+			<territory type="BL">St. Barthélemy</territory>
 			<territory type="BM">Bermuda</territory>
 			<territory type="BN">Brunei</territory>
 			<territory type="BO">Bolivia</territory>
@@ -825,9 +862,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GU">Guam</territory>
 			<territory type="GW">Guinea-Bissau</territory>
 			<territory type="GY">Guyana</territory>
-			<territory type="HK">Đặc khu hành chính Hồng Kông - Trung Quốc</territory>
+			<territory type="HK">Hồng Kông, Trung Quốc</territory>
 			<territory type="HK" alt="short">Hồng Kông</territory>
-			<territory type="HM">Đảo Heard và Quần đảo McDonald</territory>
+			<territory type="HM">Quần đảo Heard và McDonald</territory>
 			<territory type="HN">Honduras</territory>
 			<territory type="HR">Croatia</territory>
 			<territory type="HT">Haiti</territory>
@@ -852,7 +889,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="KH">Campuchia</territory>
 			<territory type="KI">Kiribati</territory>
 			<territory type="KM">Comoros</territory>
-			<territory type="KN">Saint Kitts và Nevis</territory>
+			<territory type="KN">St. Kitts và Nevis</territory>
 			<territory type="KP">Triều Tiên</territory>
 			<territory type="KR">Hàn Quốc</territory>
 			<territory type="KW">Cô-oét</territory>
@@ -860,7 +897,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="KZ">Kazakhstan</territory>
 			<territory type="LA">Lào</territory>
 			<territory type="LB">Li-băng</territory>
-			<territory type="LC">Saint Lucia</territory>
+			<territory type="LC">St. Lucia</territory>
 			<territory type="LI">Liechtenstein</territory>
 			<territory type="LK">Sri Lanka</territory>
 			<territory type="LR">Liberia</territory>
@@ -873,7 +910,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="MC">Monaco</territory>
 			<territory type="MD">Moldova</territory>
 			<territory type="ME">Montenegro</territory>
-			<territory type="MF">Saint Martin</territory>
+			<territory type="MF">St. Martin</territory>
 			<territory type="MG">Madagascar</territory>
 			<territory type="MH">Quần đảo Marshall</territory>
 			<territory type="MK">Macedonia</territory>
@@ -881,7 +918,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ML">Mali</territory>
 			<territory type="MM">Myanmar (Miến Điện)</territory>
 			<territory type="MN">Mông Cổ</territory>
-			<territory type="MO">Đặc khu hành chính Macao - Trung Quốc</territory>
+			<territory type="MO">Macao, Trung Quốc</territory>
 			<territory type="MO" alt="short">Macao</territory>
 			<territory type="MP">Quần đảo Bắc Mariana</territory>
 			<territory type="MQ">Martinique</territory>
@@ -935,7 +972,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="SD">Sudan</territory>
 			<territory type="SE">Thụy Điển</territory>
 			<territory type="SG">Singapore</territory>
-			<territory type="SH">Saint Helena</territory>
+			<territory type="SH">St. Helena</territory>
 			<territory type="SI">Slovenia</territory>
 			<territory type="SJ">Svalbard và Jan Mayen</territory>
 			<territory type="SK">Slovakia</territory>
@@ -975,7 +1012,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="UY">Uruguay</territory>
 			<territory type="UZ">Uzbekistan</territory>
 			<territory type="VA">Thành Vatican</territory>
-			<territory type="VC">Saint Vincent và Grenadines</territory>
+			<territory type="VC">St. Vincent và Grenadines</territory>
 			<territory type="VE">Venezuela</territory>
 			<territory type="VG">Quần đảo Virgin thuộc Anh</territory>
 			<territory type="VI">Quần đảo Virgin thuộc Mỹ</territory>
@@ -1068,6 +1105,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">Sắp xếp theo số</key>
 			<key type="colStrength" draft="contributed">Cường độ sắp xếp</key>
 			<key type="currency">Tiền tệ</key>
+			<key type="hc">Chu kỳ giờ (12 vs 24)</key>
+			<key type="lb">Kiểu xuống dòng</key>
+			<key type="ms">Hệ thống đo lường</key>
 			<key type="numbers">Số</key>
 			<key type="timezone" draft="contributed">Múi giờ</key>
 			<key type="va" draft="contributed">Biến thể ngôn ngữ</key>
@@ -1075,120 +1115,130 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">Sử dụng cá nhân</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">Chữ số Ả Rập - Ấn Độ</type>
-			<type type="arabext" key="numbers">Chữ số Ả Rập - Ấn Độ mở rộng</type>
-			<type type="armn" key="numbers">Chữ số Armenia</type>
-			<type type="armnlow" key="numbers">Chữ số Armenia viết thường</type>
-			<type type="bali" key="numbers" draft="contributed">Chữ số Bali</type>
-			<type type="beng" key="numbers">Chữ số Bangladesh</type>
-			<type type="big5han" key="collation">Thứ tự sắp xếp theo tiếng Trung phồn thể - Big5</type>
-			<type type="brah" key="numbers" draft="contributed">Chữ số Brahmi</type>
-			<type type="buddhist" key="calendar">Lịch Phật Giáo</type>
-			<type type="cakm" key="numbers" draft="contributed">Chữ số Chakma</type>
-			<type type="cham" key="numbers" draft="contributed">Chữ số Chăm</type>
-			<type type="chinese" key="calendar">Lịch Trung Quốc</type>
-			<type type="coptic" key="calendar">Lịch Copts</type>
-			<type type="dangi" key="calendar">Lịch Dangi</type>
-			<type type="deva" key="numbers">Chữ số Devanagari</type>
-			<type type="dictionary" key="collation">Thứ tự sắp xếp theo từ điển</type>
-			<type type="ducet" key="collation">Thứ tự sắp xếp unicode mặc định</type>
-			<type type="ethi" key="numbers">Chữ số Ethiopia</type>
-			<type type="ethiopic" key="calendar">Lịch Ethiopia</type>
-			<type type="ethiopic-amete-alem" key="calendar">Lịch Ethiopic Amete Alem</type>
-			<type type="finance" key="numbers" draft="contributed">Chữ số dùng trong tài chính</type>
-			<type type="fullwide" key="numbers">Chữ số có độ rộng đầy đủ</type>
-			<type type="gb2312han" key="collation">Thứ tự sắp xếp theo tiếng Trung giản thể - GB2312</type>
-			<type type="geor" key="numbers">Chữ số Gruzia</type>
-			<type type="gregorian" key="calendar">Lịch Gregory</type>
-			<type type="grek" key="numbers">Chữ số Hy Lạp</type>
-			<type type="greklow" key="numbers">Chữ số Hy Lạp viết thường</type>
-			<type type="gujr" key="numbers">Chữ số Gujarati</type>
-			<type type="guru" key="numbers">Chữ số Gurmukhi</type>
-			<type type="hanidec" key="numbers">Chữ số thập phân Trung Quốc</type>
-			<type type="hans" key="numbers">Chữ số của tiếng Trung giản thể</type>
-			<type type="hansfin" key="numbers">Chữ số dùng trong tài chính của tiếng Trung giản thể</type>
-			<type type="hant" key="numbers">Chữ số tiếng Trung phồn thể</type>
-			<type type="hantfin" key="numbers">Chữ số dùng trong tài chính của tiếng Trung phồn thể</type>
-			<type type="hebr" key="numbers">Chữ số Do Thái</type>
-			<type type="hebrew" key="calendar">Lịch Do Thái</type>
-			<type type="identical" key="colStrength" draft="contributed">Sắp xếp tất cả</type>
-			<type type="indian" key="calendar">Lịch Quốc gia Ấn Độ</type>
-			<type type="islamic" key="calendar">Lịch Hồi Giáo</type>
-			<type type="islamic-civil" key="calendar">Lịch Islamic-Civil</type>
-			<type type="islamic-rgsa" key="calendar" draft="contributed">Lịch Hồi Giáo - Ả Rập Xê-út</type>
-			<type type="islamic-tbla" key="calendar" draft="contributed">Lịch Hồi Giáo - Thiên văn</type>
-			<type type="islamic-umalqura" key="calendar" draft="contributed">Lịch Hồi Giáo - Umm al-Qura</type>
-			<type type="iso8601" key="calendar">Lịch ISO-8601</type>
-			<type type="japanese" key="calendar">Lịch Nhật Bản</type>
-			<type type="java" key="numbers" draft="contributed">Chữ số Java</type>
-			<type type="jpan" key="numbers">Chữ số Nhật Bản</type>
-			<type type="jpanfin" key="numbers">Chữ số dùng trong tài chính của tiếng Nhật</type>
-			<type type="kali" key="numbers" draft="contributed">Chữ số Kayah Li</type>
-			<type type="khmr" key="numbers">Chữ số Khơ-me</type>
-			<type type="knda" key="numbers">Chữ số Kannada</type>
-			<type type="lana" key="numbers" draft="contributed">Chữ số Hora Thái Đam</type>
-			<type type="lanatham" key="numbers" draft="contributed">Chữ số Tham Thái Đam</type>
-			<type type="laoo" key="numbers">Chữ số Lào</type>
-			<type type="latn" key="numbers">Chữ số phương Tây</type>
-			<type type="lepc" key="numbers" draft="contributed">Chữ số Lepcha</type>
-			<type type="limb" key="numbers" draft="contributed">Chữ số Limbu</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">Sắp xếp chữ thường đầu tiên</type>
-			<type type="mlym" key="numbers">Chữ số Malayalam</type>
-			<type type="mong" key="numbers">Chữ số Mông Cổ</type>
-			<type type="mtei" key="numbers" draft="contributed">Chữ số Meetei Mayek</type>
-			<type type="mymr" key="numbers">Chữ số Myanma</type>
-			<type type="mymrshan" key="numbers" draft="contributed">Chữ số Myanmar Shan</type>
-			<type type="native" key="numbers" draft="contributed">Chữ số tự nhiên</type>
-			<type type="nkoo" key="numbers" draft="contributed">Chữ số N’Ko</type>
-			<type type="no" key="colBackwards" draft="contributed">Sắp xếp dấu trọng âm bình thường</type>
-			<type type="no" key="colCaseFirst" draft="contributed">Sắp xếp thứ tự chữ cái bình thường</type>
-			<type type="no" key="colCaseLevel" draft="contributed">Sắp xếp không phân biệt chữ hoa/chữ thường</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">Sắp xếp chữ Kana riêng biệt</type>
-			<type type="no" key="colNormalization" draft="contributed">Sắp xếp không theo chuẩn hóa</type>
-			<type type="no" key="colNumeric" draft="contributed">Sắp xếp từng chữ số</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">Sắp xếp biểu tượng</type>
-			<type type="olck" key="numbers" draft="contributed">Chữ số Ol Chiki</type>
-			<type type="orya" key="numbers">Chữ số Oriya</type>
-			<type type="osma" key="numbers" draft="contributed">Chữ số Osmanya</type>
-			<type type="persian" key="calendar">Lịch Ba Tư</type>
-			<type type="phonebook" key="collation">Thứ tự sắp xếp theo danh bạ điện thoại</type>
-			<type type="phonetic" key="collation" draft="contributed">Thứ tự sắp xếp theo ngữ âm</type>
-			<type type="pinyin" key="collation">Thứ tự sắp xếp theo bính âm</type>
-			<type type="primary" key="colStrength" draft="contributed">Chỉ sắp xếp chữ cái cơ sở</type>
-			<type type="quaternary" key="colStrength" draft="contributed">Sắp xếp dấu trọng âm/chữ cái/độ rộng/chữ Kana</type>
-			<type type="reformed" key="collation">Thứ tự sắp xếp đã sửa đổi</type>
-			<type type="roc" key="calendar">Lịch Trung Hoa Dân Quốc</type>
-			<type type="roman" key="numbers">Chữ số La mã</type>
-			<type type="romanlow" key="numbers">Chữ số La Mã viết thường</type>
-			<type type="saur" key="numbers" draft="contributed">Chữ số Saurashtra</type>
-			<type type="search" key="collation">Tìm kiếm mục đích chung</type>
-			<type type="searchjl" key="collation" draft="contributed">Tìm kiếm theo Phụ âm Đầu Hangul</type>
-			<type type="secondary" key="colStrength" draft="contributed">Sắp xếp dấu trọng âm</type>
-			<type type="shifted" key="colAlternate" draft="contributed">Sắp xếp biểu tượng bỏ qua</type>
-			<type type="shrd" key="numbers" draft="contributed">Chữ số Sharada</type>
-			<type type="sora" key="numbers" draft="contributed">Chữ số Sora Sompeng</type>
-			<type type="standard" key="collation">Thứ tự sắp xếp chuẩn</type>
-			<type type="stroke" key="collation">Thứ tự sắp xếp theo nét chữ</type>
-			<type type="sund" key="numbers" draft="contributed">Chữ số Sudan</type>
-			<type type="takr" key="numbers" draft="contributed">Chữ số Takri</type>
-			<type type="talu" key="numbers" draft="contributed">Chữ số Thái Lặc mới</type>
-			<type type="taml" key="numbers">Chữ số Tamil Truyền thống</type>
-			<type type="tamldec" key="numbers">Chữ số Tamil</type>
-			<type type="telu" key="numbers">Chữ số Telugu</type>
-			<type type="tertiary" key="colStrength" draft="contributed">Sắp xếp dấu trọng âm/chữ cái/độ rộng</type>
-			<type type="thai" key="numbers">Chữ số Thái</type>
-			<type type="tibt" key="numbers">Chữ số Tây Tạng</type>
-			<type type="traditional" key="collation">Thứ tự sắp xếp truyền thống</type>
-			<type type="traditional" key="numbers" draft="contributed">Số truyền thống</type>
-			<type type="unihan" key="collation">Trình tự sắp xếp theo bộ-nét</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">Sắp xếp chữ hoa đầu tiên</type>
-			<type type="vaii" key="numbers">Chữ số Vai</type>
-			<type type="yes" key="colBackwards" draft="contributed">Sắp xếp dấu trọng âm đảo ngược</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">Sắp xếp phân biệt chữ hoa/chữ thường</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">Sắp xếp chữ Kana khác nhau</type>
-			<type type="yes" key="colNormalization" draft="contributed">Sắp xếp unicode được chuẩn hóa</type>
-			<type type="yes" key="colNumeric" draft="contributed">Sắp xếp chữ số theo số</type>
-			<type type="zhuyin" key="collation" draft="contributed">Thứ tự sắp xếp Zhuyin</type>
+			<type key="calendar" type="buddhist">Lịch Phật Giáo</type>
+			<type key="calendar" type="chinese">Lịch Trung Quốc</type>
+			<type key="calendar" type="coptic">Lịch Copts</type>
+			<type key="calendar" type="dangi">Lịch Dangi</type>
+			<type key="calendar" type="ethiopic">Lịch Ethiopia</type>
+			<type key="calendar" type="ethiopic-amete-alem">Lịch Ethiopic Amete Alem</type>
+			<type key="calendar" type="gregorian">Lịch Gregory</type>
+			<type key="calendar" type="hebrew">Lịch Do Thái</type>
+			<type key="calendar" type="indian">Lịch Quốc gia Ấn Độ</type>
+			<type key="calendar" type="islamic">Lịch Hồi Giáo</type>
+			<type key="calendar" type="islamic-civil">Lịch Islamic-Civil</type>
+			<type key="calendar" type="islamic-rgsa" draft="contributed">Lịch Hồi Giáo - Ả Rập Xê-út</type>
+			<type key="calendar" type="islamic-tbla" draft="contributed">Lịch Hồi Giáo - Thiên văn</type>
+			<type key="calendar" type="islamic-umalqura" draft="contributed">Lịch Hồi Giáo - Umm al-Qura</type>
+			<type key="calendar" type="iso8601">Lịch ISO-8601</type>
+			<type key="calendar" type="japanese">Lịch Nhật Bản</type>
+			<type key="calendar" type="persian">Lịch Ba Tư</type>
+			<type key="calendar" type="roc">Lịch Trung Hoa Dân Quốc</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">Sắp xếp biểu tượng</type>
+			<type key="colAlternate" type="shifted" draft="contributed">Sắp xếp biểu tượng bỏ qua</type>
+			<type key="colBackwards" type="no" draft="contributed">Sắp xếp dấu trọng âm bình thường</type>
+			<type key="colBackwards" type="yes" draft="contributed">Sắp xếp dấu trọng âm đảo ngược</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">Sắp xếp chữ thường đầu tiên</type>
+			<type key="colCaseFirst" type="no" draft="contributed">Sắp xếp thứ tự chữ cái bình thường</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">Sắp xếp chữ hoa đầu tiên</type>
+			<type key="colCaseLevel" type="no" draft="contributed">Sắp xếp không phân biệt chữ hoa/chữ thường</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">Sắp xếp phân biệt chữ hoa/chữ thường</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">Sắp xếp chữ Kana riêng biệt</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">Sắp xếp chữ Kana khác nhau</type>
+			<type key="collation" type="big5han">Thứ tự sắp xếp theo tiếng Trung phồn thể - Big5</type>
+			<type key="collation" type="dictionary">Thứ tự sắp xếp theo từ điển</type>
+			<type key="collation" type="ducet">Thứ tự sắp xếp unicode mặc định</type>
+			<type key="collation" type="gb2312han">Thứ tự sắp xếp theo tiếng Trung giản thể - GB2312</type>
+			<type key="collation" type="phonebook">Thứ tự sắp xếp theo danh bạ điện thoại</type>
+			<type key="collation" type="phonetic" draft="contributed">Thứ tự sắp xếp theo ngữ âm</type>
+			<type key="collation" type="pinyin">Thứ tự sắp xếp theo bính âm</type>
+			<type key="collation" type="reformed">Thứ tự sắp xếp đã sửa đổi</type>
+			<type key="collation" type="search">Tìm kiếm mục đích chung</type>
+			<type key="collation" type="searchjl" draft="contributed">Tìm kiếm theo Phụ âm Đầu Hangul</type>
+			<type key="collation" type="standard">Thứ tự sắp xếp chuẩn</type>
+			<type key="collation" type="stroke">Thứ tự sắp xếp theo nét chữ</type>
+			<type key="collation" type="traditional">Thứ tự sắp xếp truyền thống</type>
+			<type key="collation" type="unihan">Trình tự sắp xếp theo bộ-nét</type>
+			<type key="collation" type="zhuyin" draft="contributed">Thứ tự sắp xếp Zhuyin</type>
+			<type key="colNormalization" type="no" draft="contributed">Sắp xếp không theo chuẩn hóa</type>
+			<type key="colNormalization" type="yes" draft="contributed">Sắp xếp unicode được chuẩn hóa</type>
+			<type key="colNumeric" type="no" draft="contributed">Sắp xếp từng chữ số</type>
+			<type key="colNumeric" type="yes" draft="contributed">Sắp xếp chữ số theo số</type>
+			<type key="colStrength" type="identical" draft="contributed">Sắp xếp tất cả</type>
+			<type key="colStrength" type="primary" draft="contributed">Chỉ sắp xếp chữ cái cơ sở</type>
+			<type key="colStrength" type="quaternary" draft="contributed">Sắp xếp dấu trọng âm/chữ cái/độ rộng/chữ Kana</type>
+			<type key="colStrength" type="secondary" draft="contributed">Sắp xếp dấu trọng âm</type>
+			<type key="colStrength" type="tertiary" draft="contributed">Sắp xếp dấu trọng âm/chữ cái/độ rộng</type>
+			<type key="hc" type="h11">Hệ thống 12 giờ (0–11)</type>
+			<type key="hc" type="h12">Hệ thống 12 giờ (1–12)</type>
+			<type key="hc" type="h23">Hệ thống 24 giờ (0–23)</type>
+			<type key="hc" type="h24">Hệ thống 24 giờ (1–24)</type>
+			<type key="lb" type="loose">Kiểu xuống dòng thoáng</type>
+			<type key="lb" type="normal">Kiểu xuống dòng thường</type>
+			<type key="lb" type="strict">Kiểu xuống dòng hẹp</type>
+			<type key="ms" type="metric">Hệ mét</type>
+			<type key="ms" type="uksystem">Hệ đo lường Anh</type>
+			<type key="ms" type="ussystem">Hệ đo lường Mỹ</type>
+			<type key="numbers" type="arab">Chữ số Ả Rập - Ấn Độ</type>
+			<type key="numbers" type="arabext">Chữ số Ả Rập - Ấn Độ mở rộng</type>
+			<type key="numbers" type="armn">Chữ số Armenia</type>
+			<type key="numbers" type="armnlow">Chữ số Armenia viết thường</type>
+			<type key="numbers" type="bali" draft="contributed">Chữ số Bali</type>
+			<type key="numbers" type="beng">Chữ số Bangladesh</type>
+			<type key="numbers" type="brah" draft="contributed">Chữ số Brahmi</type>
+			<type key="numbers" type="cakm" draft="contributed">Chữ số Chakma</type>
+			<type key="numbers" type="cham" draft="contributed">Chữ số Chăm</type>
+			<type key="numbers" type="deva">Chữ số Devanagari</type>
+			<type key="numbers" type="ethi">Chữ số Ethiopia</type>
+			<type key="numbers" type="finance" draft="contributed">Chữ số dùng trong tài chính</type>
+			<type key="numbers" type="fullwide">Chữ số có độ rộng đầy đủ</type>
+			<type key="numbers" type="geor">Chữ số Gruzia</type>
+			<type key="numbers" type="grek">Chữ số Hy Lạp</type>
+			<type key="numbers" type="greklow">Chữ số Hy Lạp viết thường</type>
+			<type key="numbers" type="gujr">Chữ số Gujarati</type>
+			<type key="numbers" type="guru">Chữ số Gurmukhi</type>
+			<type key="numbers" type="hanidec">Chữ số thập phân Trung Quốc</type>
+			<type key="numbers" type="hans">Chữ số của tiếng Trung giản thể</type>
+			<type key="numbers" type="hansfin">Chữ số dùng trong tài chính của tiếng Trung giản thể</type>
+			<type key="numbers" type="hant">Chữ số tiếng Trung phồn thể</type>
+			<type key="numbers" type="hantfin">Chữ số dùng trong tài chính của tiếng Trung phồn thể</type>
+			<type key="numbers" type="hebr">Chữ số Do Thái</type>
+			<type key="numbers" type="java" draft="contributed">Chữ số Java</type>
+			<type key="numbers" type="jpan">Chữ số Nhật Bản</type>
+			<type key="numbers" type="jpanfin">Chữ số dùng trong tài chính của tiếng Nhật</type>
+			<type key="numbers" type="kali" draft="contributed">Chữ số Kayah Li</type>
+			<type key="numbers" type="khmr">Chữ số Khơ-me</type>
+			<type key="numbers" type="knda">Chữ số Kannada</type>
+			<type key="numbers" type="lana" draft="contributed">Chữ số Hora Thái Đam</type>
+			<type key="numbers" type="lanatham" draft="contributed">Chữ số Tham Thái Đam</type>
+			<type key="numbers" type="laoo">Chữ số Lào</type>
+			<type key="numbers" type="latn">Chữ số phương Tây</type>
+			<type key="numbers" type="lepc" draft="contributed">Chữ số Lepcha</type>
+			<type key="numbers" type="limb" draft="contributed">Chữ số Limbu</type>
+			<type key="numbers" type="mlym">Chữ số Malayalam</type>
+			<type key="numbers" type="mong">Chữ số Mông Cổ</type>
+			<type key="numbers" type="mtei" draft="contributed">Chữ số Meetei Mayek</type>
+			<type key="numbers" type="mymr">Chữ số Myanma</type>
+			<type key="numbers" type="mymrshan" draft="contributed">Chữ số Myanmar Shan</type>
+			<type key="numbers" type="native" draft="contributed">Chữ số tự nhiên</type>
+			<type key="numbers" type="nkoo" draft="contributed">Chữ số N’Ko</type>
+			<type key="numbers" type="olck" draft="contributed">Chữ số Ol Chiki</type>
+			<type key="numbers" type="orya">Chữ số Oriya</type>
+			<type key="numbers" type="osma" draft="contributed">Chữ số Osmanya</type>
+			<type key="numbers" type="roman">Chữ số La mã</type>
+			<type key="numbers" type="romanlow">Chữ số La Mã viết thường</type>
+			<type key="numbers" type="saur" draft="contributed">Chữ số Saurashtra</type>
+			<type key="numbers" type="shrd" draft="contributed">Chữ số Sharada</type>
+			<type key="numbers" type="sora" draft="contributed">Chữ số Sora Sompeng</type>
+			<type key="numbers" type="sund" draft="contributed">Chữ số Sudan</type>
+			<type key="numbers" type="takr" draft="contributed">Chữ số Takri</type>
+			<type key="numbers" type="talu" draft="contributed">Chữ số Thái Lặc mới</type>
+			<type key="numbers" type="taml">Chữ số Tamil Truyền thống</type>
+			<type key="numbers" type="tamldec">Chữ số Tamil</type>
+			<type key="numbers" type="telu">Chữ số Telugu</type>
+			<type key="numbers" type="thai">Chữ số Thái</type>
+			<type key="numbers" type="tibt">Chữ số Tây Tạng</type>
+			<type key="numbers" type="traditional" draft="contributed">Số truyền thống</type>
+			<type key="numbers" type="vaii">Chữ số Vai</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">BGN</transformName>
@@ -1662,7 +1712,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern>EEEE, 'ngày' dd MMMM 'năm' y G</pattern>
+							<pattern>EEEE, 'ngày' dd 'tháng' MM 'năm' y G</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
@@ -1684,31 +1734,32 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern>{0} {1}</pattern>
+							<pattern>{1} 'lúc' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern>{0} {1}</pattern>
+							<pattern>{1} 'lúc' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern>{0} {1}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern>{0} {1}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">'Ngày' dd</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">E, dd</dateFormatItem>
-						<dateFormatItem id="Gy">'Năm' y G</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMd">dd MMM, y G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">E, dd MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d MMM, y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d MMM, y G</dateFormatItem>
 						<dateFormatItem id="h" draft="contributed">h'h' a</dateFormatItem>
 						<dateFormatItem id="H" draft="contributed">HH'h'</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
@@ -1720,20 +1771,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MEd">E, dd-M</dateFormatItem>
 						<dateFormatItem id="MMdd" draft="contributed">dd-MM</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">dd MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, dd MMM</dateFormatItem>
+						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
 						<dateFormatItem id="MMMMd">dd MMMM</dateFormatItem>
 						<dateFormatItem id="MMMMEd">E, dd MMMM</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">'Năm' y G</dateFormatItem>
-						<dateFormatItem id="yyyy">'Năm' y G</dateFormatItem>
+						<dateFormatItem id="y">y G</dateFormatItem>
+						<dateFormatItem id="yyyy">y G</dateFormatItem>
 						<dateFormatItem id="yyyyM">M/y G</dateFormatItem>
 						<dateFormatItem id="yyyyMd">d/M/y G</dateFormatItem>
 						<dateFormatItem id="yyyyMEd">E, dd-M-y G</dateFormatItem>
 						<dateFormatItem id="yyyyMM">MM-y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMd">dd MMM, y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMEd">E, dd MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">d MMM, y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">E, d MMM, y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMM">MMMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
@@ -2039,35 +2090,91 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<quarter type="4">4</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
-							<quarter type="1">Quý 1</quarter>
-							<quarter type="2">Quý 2</quarter>
-							<quarter type="3">Quý 3</quarter>
-							<quarter type="4">Quý 4</quarter>
+							<quarter type="1">quý 1</quarter>
+							<quarter type="2">quý 2</quarter>
+							<quarter type="3">quý 3</quarter>
+							<quarter type="4">quý 4</quarter>
 						</quarterWidth>
 					</quarterContext>
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">s</dayPeriod>
-							<dayPeriod type="noon">tr</dayPeriod>
-							<dayPeriod type="pm">c</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">nửa đêm</dayPeriod>
 							<dayPeriod type="am">SA</dayPeriod>
 							<dayPeriod type="noon">TR</dayPeriod>
 							<dayPeriod type="pm">CH</dayPeriod>
+							<dayPeriod type="morning1">sáng</dayPeriod>
+							<dayPeriod type="afternoon1">chiều</dayPeriod>
+							<dayPeriod type="evening1">tối</dayPeriod>
+							<dayPeriod type="night1">đêm</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">nửa đêm</dayPeriod>
+							<dayPeriod type="am">s</dayPeriod>
+							<dayPeriod type="noon">tr</dayPeriod>
+							<dayPeriod type="pm">c</dayPeriod>
+							<dayPeriod type="morning1">sáng</dayPeriod>
+							<dayPeriod type="afternoon1">chiều</dayPeriod>
+							<dayPeriod type="evening1">tối</dayPeriod>
+							<dayPeriod type="night1">đêm</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">nửa đêm</dayPeriod>
+							<dayPeriod type="am">SA</dayPeriod>
+							<dayPeriod type="noon">TR</dayPeriod>
+							<dayPeriod type="pm">CH</dayPeriod>
+							<dayPeriod type="morning1">sáng</dayPeriod>
+							<dayPeriod type="afternoon1">chiều</dayPeriod>
+							<dayPeriod type="evening1">tối</dayPeriod>
+							<dayPeriod type="night1">đêm</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">nửa đêm</dayPeriod>
+							<dayPeriod type="am">SA</dayPeriod>
+							<dayPeriod type="noon">TR</dayPeriod>
+							<dayPeriod type="pm">CH</dayPeriod>
+							<dayPeriod type="morning1">sáng</dayPeriod>
+							<dayPeriod type="afternoon1">chiều</dayPeriod>
+							<dayPeriod type="evening1">tối</dayPeriod>
+							<dayPeriod type="night1">đêm</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">nửa đêm</dayPeriod>
+							<dayPeriod type="am">SA</dayPeriod>
+							<dayPeriod type="noon">trưa</dayPeriod>
+							<dayPeriod type="pm">CH</dayPeriod>
+							<dayPeriod type="morning1">sáng</dayPeriod>
+							<dayPeriod type="afternoon1">chiều</dayPeriod>
+							<dayPeriod type="evening1">tối</dayPeriod>
+							<dayPeriod type="night1">đêm</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">nửa đêm</dayPeriod>
+							<dayPeriod type="am" draft="contributed">SA</dayPeriod>
+							<dayPeriod type="noon">trưa</dayPeriod>
+							<dayPeriod type="pm" draft="contributed">CH</dayPeriod>
+							<dayPeriod type="morning1">sáng</dayPeriod>
+							<dayPeriod type="afternoon1">chiều</dayPeriod>
+							<dayPeriod type="evening1">tối</dayPeriod>
+							<dayPeriod type="night1">đêm</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
 						<era type="0">tr. CN</era>
+						<era type="0" alt="variant">BCE</era>
 						<era type="1">sau CN</era>
+						<era type="1" alt="variant">CE</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">tr. CN</era>
+						<era type="0" alt="variant">BCE</era>
 						<era type="1">sau CN</era>
+						<era type="1" alt="variant">CE</era>
 					</eraAbbr>
 					<eraNarrow>
 						<era type="0">tr. CN</era>
@@ -2087,7 +2194,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern>dd-MM-y</pattern>
+							<pattern>d MMM, y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -2131,18 +2238,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern>{0} {1}</pattern>
+							<pattern>{0}, {1}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern>{0} {1}</pattern>
+							<pattern>{0}, {1}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
 						<dateFormatItem id="E">ccc</dateFormatItem>
-						<dateFormatItem id="Ed">E, dd</dateFormatItem>
+						<dateFormatItem id="Ed">E, 'ngày' d</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
@@ -2150,20 +2257,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">dd MMM, y G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">E, dd MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d MMM, y G</dateFormatItem>
 						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">HH</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">H:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">dd-M</dateFormatItem>
-						<dateFormatItem id="MEd">E, dd-M</dateFormatItem>
+						<dateFormatItem id="Md">dd/M</dateFormatItem>
+						<dateFormatItem id="MEd">E, dd/M</dateFormatItem>
 						<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, dd MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
 						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="MMMMEd">E, d MMMM</dateFormatItem>
 						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
@@ -2171,14 +2282,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">M/y</dateFormatItem>
 						<dateFormatItem id="yMd">d/M/y</dateFormatItem>
-						<dateFormatItem id="yMEd">E, dd-M-y</dateFormatItem>
+						<dateFormatItem id="yMEd">E, dd/M/y</dateFormatItem>
 						<dateFormatItem id="yMM">'tháng' MM, y</dateFormatItem>
 						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMd">dd MMM, y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">E, dd MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMd">d MMM, y</dateFormatItem>
+						<dateFormatItem id="yMMMEd">E, d MMM, y</dateFormatItem>
 						<dateFormatItem id="yMMMM">MMMM 'năm' y</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
+						<dateFormatItem id="yQQQQ">QQQQ 'năm' y</dateFormatItem>
 					</availableFormats>
 					<appendItems>
 						<appendItem request="Timezone">{0} {1}</appendItem>
@@ -2189,7 +2300,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="d">'Ngày' dd–dd</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">h'h' a – h'h' a</greatestDifference>
+							<greatestDifference id="a">h a – h a</greatestDifference>
 							<greatestDifference id="h">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
@@ -2214,7 +2325,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h'h' a – h'h' a v</greatestDifference>
+							<greatestDifference id="a">h a – h a v</greatestDifference>
 							<greatestDifference id="h">h–h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
@@ -2239,8 +2350,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="M">'Ngày' dd 'tháng' M - 'Ngày' dd 'tháng' M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">EEEE, 'ngày' dd – EEEE, 'ngày' dd 'tháng' M</greatestDifference>
-							<greatestDifference id="M">EEEE, 'ngày' dd 'tháng' M – EEEE, 'ngày' dd 'tháng' M</greatestDifference>
+							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
 							<greatestDifference id="y">y–y</greatestDifference>
@@ -2264,8 +2375,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<greatestDifference id="y">'Tháng' M 'năm' y - 'Tháng' M 'năm' y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">'Ngày' dd - 'Ngày' dd 'tháng' M 'năm' y</greatestDifference>
-							<greatestDifference id="M">'Ngày' dd 'tháng' M - 'Ngày' dd 'tháng' M 'năm' y</greatestDifference>
+							<greatestDifference id="d">d – d MMM, y</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM, y</greatestDifference>
 							<greatestDifference id="y">'Ngày' dd 'tháng' M 'năm' y - 'Ngày' dd 'tháng' M 'năm' y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
@@ -2275,7 +2386,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
 							<greatestDifference id="M">MMMM–MMMM 'năm' y</greatestDifference>
-							<greatestDifference id="y">MMMM y – MMMM y</greatestDifference>
+							<greatestDifference id="y">MMMM, y – MMMM, y</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -2530,7 +2641,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="0">năm nay</relative>
 				<relative type="1">năm sau</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">trong {0} năm nữa</relativeTimePattern>
+					<relativeTimePattern count="other">sau {0} năm nữa</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} năm trước</relativeTimePattern>
@@ -2538,8 +2649,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>Năm</displayName>
+				<relative type="-1">năm ngoái</relative>
+				<relative type="0">năm nay</relative>
+				<relative type="1">năm sau</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">trong {0} năm nữa</relativeTimePattern>
+					<relativeTimePattern count="other">sau {0} năm nữa</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} năm trước</relativeTimePattern>
@@ -2547,8 +2661,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>Năm</displayName>
+				<relative type="-1">năm ngoái</relative>
+				<relative type="0">năm nay</relative>
+				<relative type="1">năm sau</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">trong {0} năm nữa</relativeTimePattern>
+					<relativeTimePattern count="other">sau {0} năm nữa</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} năm trước</relativeTimePattern>
@@ -2556,8 +2673,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter">
 				<displayName>Quý</displayName>
+				<relative type="-1" draft="contributed">quý trước</relative>
+				<relative type="0" draft="contributed">quý này</relative>
+				<relative type="1" draft="contributed">quý sau</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">trong {0} quý nữa</relativeTimePattern>
+					<relativeTimePattern count="other">sau {0} quý nữa</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} quý trước</relativeTimePattern>
@@ -2565,8 +2685,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>Quý</displayName>
+				<relative type="-1" draft="contributed">quý trước</relative>
+				<relative type="0" draft="contributed">quý này</relative>
+				<relative type="1" draft="contributed">quý sau</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">trong {0} quý nữa</relativeTimePattern>
+					<relativeTimePattern count="other">sau {0} quý nữa</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} quý trước</relativeTimePattern>
@@ -2574,8 +2697,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>Quý</displayName>
+				<relative type="-1" draft="contributed">quý trước</relative>
+				<relative type="0" draft="contributed">quý này</relative>
+				<relative type="1" draft="contributed">quý sau</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">trong {0} quý nữa</relativeTimePattern>
+					<relativeTimePattern count="other">sau {0} quý nữa</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} quý trước</relativeTimePattern>
@@ -2587,7 +2713,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="0">tháng này</relative>
 				<relative type="1">tháng sau</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">trong {0} tháng nữa</relativeTimePattern>
+					<relativeTimePattern count="other">sau {0} tháng nữa</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} tháng trước</relativeTimePattern>
@@ -2595,8 +2721,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-short">
 				<displayName>Tháng</displayName>
+				<relative type="-1">tháng trước</relative>
+				<relative type="0">tháng này</relative>
+				<relative type="1">tháng sau</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">trong {0} tháng nữa</relativeTimePattern>
+					<relativeTimePattern count="other">sau {0} tháng nữa</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} tháng trước</relativeTimePattern>
@@ -2604,8 +2733,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="month-narrow">
 				<displayName>Tháng</displayName>
+				<relative type="-1">tháng trước</relative>
+				<relative type="0">tháng này</relative>
+				<relative type="1">tháng sau</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">trong {0} tháng nữa</relativeTimePattern>
+					<relativeTimePattern count="other">sau {0} tháng nữa</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} tháng trước</relativeTimePattern>
@@ -2617,7 +2749,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="0">tuần này</relative>
 				<relative type="1">tuần sau</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">trong {0} tuần nữa</relativeTimePattern>
+					<relativeTimePattern count="other">sau {0} tuần nữa</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} tuần trước</relativeTimePattern>
@@ -2625,8 +2757,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-short">
 				<displayName>Tuần</displayName>
+				<relative type="-1">tuần trước</relative>
+				<relative type="0">tuần này</relative>
+				<relative type="1">tuần sau</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">trong {0} tuần nữa</relativeTimePattern>
+					<relativeTimePattern count="other">sau {0} tuần nữa</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} tuần trước</relativeTimePattern>
@@ -2634,8 +2769,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week-narrow">
 				<displayName>Tuần</displayName>
+				<relative type="-1">tuần trước</relative>
+				<relative type="0">tuần này</relative>
+				<relative type="1">tuần sau</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">trong {0} tuần nữa</relativeTimePattern>
+					<relativeTimePattern count="other">sau {0} tuần nữa</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} tuần trước</relativeTimePattern>
@@ -2643,13 +2781,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="day">
 				<displayName>Ngày</displayName>
-				<relative type="-2">hôm kia</relative>
-				<relative type="-1">hôm qua</relative>
-				<relative type="0">hôm nay</relative>
-				<relative type="1">ngày mai</relative>
-				<relative type="2">ngày kia</relative>
+				<relative type="-2">Hôm kia</relative>
+				<relative type="-1">Hôm qua</relative>
+				<relative type="0">Hôm nay</relative>
+				<relative type="1">Ngày mai</relative>
+				<relative type="2">Ngày kia</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">trong {0} ngày nữa</relativeTimePattern>
+					<relativeTimePattern count="other">sau {0} ngày nữa</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} ngày trước</relativeTimePattern>
@@ -2658,7 +2796,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="day-short">
 				<displayName draft="contributed">Ngày</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">trong {0} ngày nữa</relativeTimePattern>
+					<relativeTimePattern count="other">sau {0} ngày nữa</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} ngày trước</relativeTimePattern>
@@ -2667,7 +2805,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="day-narrow">
 				<displayName>Ngày</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">trong {0} ngày</relativeTimePattern>
+					<relativeTimePattern count="other">sau {0} ngày nữa</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} ngày trước</relativeTimePattern>
@@ -2787,7 +2925,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="hour">
 				<displayName>Giờ</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">trong {0} giờ nữa</relativeTimePattern>
+					<relativeTimePattern count="other">sau {0} giờ nữa</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} giờ trước</relativeTimePattern>
@@ -2796,7 +2934,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="hour-short">
 				<displayName>Giờ</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">trong {0} giờ nữa</relativeTimePattern>
+					<relativeTimePattern count="other">sau {0} giờ nữa</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} giờ trước</relativeTimePattern>
@@ -2805,7 +2943,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="hour-narrow">
 				<displayName>Giờ</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">trong {0} giờ</relativeTimePattern>
+					<relativeTimePattern count="other">sau {0} giờ nữa</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} giờ trước</relativeTimePattern>
@@ -2814,7 +2952,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="minute">
 				<displayName>Phút</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">trong {0} phút nữa</relativeTimePattern>
+					<relativeTimePattern count="other">sau {0} phút nữa</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} phút trước</relativeTimePattern>
@@ -2823,7 +2961,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="minute-short">
 				<displayName>Phút</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">trong {0} phút nữa</relativeTimePattern>
+					<relativeTimePattern count="other">sau {0} phút nữa</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} phút trước</relativeTimePattern>
@@ -2832,7 +2970,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="minute-narrow">
 				<displayName>Phút</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">trong {0} phút</relativeTimePattern>
+					<relativeTimePattern count="other">sau {0} phút nữa</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} phút trước</relativeTimePattern>
@@ -2842,7 +2980,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Giây</displayName>
 				<relative type="0">bây giờ</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">trong {0} giây nữa</relativeTimePattern>
+					<relativeTimePattern count="other">sau {0} giây nữa</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} giây trước</relativeTimePattern>
@@ -2851,7 +2989,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="second-short">
 				<displayName>Giây</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">trong {0} giây nữa</relativeTimePattern>
+					<relativeTimePattern count="other">sau {0} giây nữa</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} giây trước</relativeTimePattern>
@@ -2860,7 +2998,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="second-narrow">
 				<displayName>Giây</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">trong {0} giây</relativeTimePattern>
+					<relativeTimePattern count="other">sau {0} giây nữa</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} giây trước</relativeTimePattern>
@@ -3245,7 +3383,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Douala</exemplarCity>
 			</zone>
 			<zone type="Asia/Urumqi">
-				<exemplarCity>Ô Lỗ Mộc Tề</exemplarCity>
+				<exemplarCity>Urumqi</exemplarCity>
 			</zone>
 			<zone type="Asia/Shanghai">
 				<exemplarCity>Thượng Hải</exemplarCity>
@@ -3745,6 +3883,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Port Moresby</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Bougainville</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>Manila</exemplarCity>
 			</zone>
@@ -3782,7 +3923,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>Palau</exemplarCity>
 			</zone>
 			<zone type="America/Asuncion">
-				<exemplarCity>Asuncion</exemplarCity>
+				<exemplarCity>Asunción</exemplarCity>
 			</zone>
 			<zone type="Asia/Qatar">
 				<exemplarCity>Qatar</exemplarCity>
@@ -3829,6 +3970,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>Irkutsk</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Chita</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Yakutsk</exemplarCity>
 			</zone>
@@ -3847,6 +3991,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>Magadan</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Srednekolymsk</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamchatka</exemplarCity>
 			</zone>
@@ -4880,8 +5027,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Pierre_Miquelon">
 				<long>
-					<generic>Giờ Saint Pierre và Miquelon</generic>
-					<standard>Giờ Chuẩn Saint Pierre và Miquelon</standard>
+					<generic>Giờ St. Pierre và Miquelon</generic>
+					<standard>Giờ Chuẩn St. Pierre và Miquelon</standard>
 					<daylight>Giờ Mùa Hè Saint Pierre và Miquelon</daylight>
 				</long>
 			</metazone>
@@ -5156,12 +5303,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
-					<pattern>#,##0.00 ¤</pattern>
+					<pattern>¤ #,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="contributed">0 N ¤</pattern>
+					<pattern type="10000" count="other" draft="contributed">00 N ¤</pattern>
+					<pattern type="100000" count="other" draft="contributed">000 N ¤</pattern>
+					<pattern type="1000000" count="other" draft="contributed">0 Tr ¤</pattern>
+					<pattern type="10000000" count="other" draft="contributed">00 Tr ¤</pattern>
+					<pattern type="100000000" count="other" draft="contributed">000 Tr ¤</pattern>
+					<pattern type="1000000000" count="other" draft="contributed">0 T ¤</pattern>
+					<pattern type="10000000000" count="other" draft="contributed">00 T ¤</pattern>
+					<pattern type="100000000000" count="other" draft="contributed">000 T ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="contributed">0 NT ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="contributed">00 NT ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="contributed">000 NT ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencies>
@@ -5171,7 +5334,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="AED">
 				<displayName>Dirham UAE</displayName>
-				<displayName count="other">dirham UAE</displayName>
+				<displayName count="other">Dirham UAE</displayName>
 				<symbol>AED</symbol>
 			</currency>
 			<currency type="AFA">
@@ -5180,28 +5343,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="AFN">
 				<displayName>Afghani Afghanistan</displayName>
-				<displayName count="other">afghani Afghanistan</displayName>
+				<displayName count="other">Afghani Afghanistan</displayName>
 				<symbol>AFN</symbol>
 			</currency>
 			<currency type="ALL">
 				<displayName>Lek Albania</displayName>
-				<displayName count="other">lek Albania</displayName>
+				<displayName count="other">Lek Albania</displayName>
 				<symbol>ALL</symbol>
 			</currency>
 			<currency type="AMD">
 				<displayName>Dram Armenia</displayName>
-				<displayName count="other">dram Armenia</displayName>
+				<displayName count="other">Dram Armenia</displayName>
 				<symbol>AMD</symbol>
 			</currency>
 			<currency type="ANG">
 				<displayName>Guilder Tây Ấn Hà Lan</displayName>
-				<displayName count="other">guilder Tây Ấn Hà Lan</displayName>
+				<displayName count="other">Guilder Tây Ấn Hà Lan</displayName>
 				<symbol>ANG</symbol>
 			</currency>
 			<currency type="AOA">
 				<displayName>Kwanza Angola</displayName>
-				<displayName count="other">kwanza Angola</displayName>
+				<displayName count="other">Kwanza Angola</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName draft="contributed">Đồng Kwanza của Angola (1977–1991)</displayName>
@@ -5233,7 +5397,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="ARS">
 				<displayName>Peso Argentina</displayName>
-				<displayName count="other">peso Argentina</displayName>
+				<displayName count="other">Peso Argentina</displayName>
 				<symbol>ARS</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -5243,13 +5407,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="AUD">
 				<displayName>Đô la Australia</displayName>
-				<displayName count="other">đô la Australia</displayName>
+				<displayName count="other">Đô la Australia</displayName>
 				<symbol>AU$</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="AWG">
 				<displayName>Florin Aruba</displayName>
-				<displayName count="other">florin Aruba</displayName>
+				<displayName count="other">Florin Aruba</displayName>
 				<symbol>AWG</symbol>
 			</currency>
 			<currency type="AZM">
@@ -5258,7 +5422,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="AZN">
 				<displayName>Manat Azerbaijan</displayName>
-				<displayName count="other">manat Azerbaijan</displayName>
+				<displayName count="other">Manat Azerbaijan</displayName>
 				<symbol>AZN</symbol>
 			</currency>
 			<currency type="BAD">
@@ -5267,8 +5431,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="BAM">
 				<displayName>Mark Bosnia-Herzegovina có thể chuyển đổi</displayName>
-				<displayName count="other">mark Bosnia-Herzegovina có thể chuyển đổi</displayName>
+				<displayName count="other">Mark Bosnia-Herzegovina có thể chuyển đổi</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BAN">
 				<displayName draft="contributed">Đồng Dinar Mới của Bosnia-Herzegovina (1994–1997)</displayName>
@@ -5276,13 +5441,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="BBD">
 				<displayName>Đô la Barbados</displayName>
-				<displayName count="other">đô la Barbados</displayName>
+				<displayName count="other">Đô la Barbados</displayName>
 				<symbol>BBD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BDT">
 				<displayName>Taka Bangladesh</displayName>
-				<displayName count="other">taka Bangladesh</displayName>
+				<displayName count="other">Taka Bangladesh</displayName>
 				<symbol>BDT</symbol>
 				<symbol alt="narrow" draft="contributed">৳</symbol>
 			</currency>
@@ -5308,7 +5473,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="BGN">
 				<displayName>Lev Bulgaria</displayName>
-				<displayName count="other">lev Bulgaria</displayName>
+				<displayName count="other">Lev Bulgaria</displayName>
 				<symbol>BGN</symbol>
 			</currency>
 			<currency type="BGO">
@@ -5317,30 +5482,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="BHD">
 				<displayName>Dinar Bahrain</displayName>
-				<displayName count="other">dinar Bahrain</displayName>
+				<displayName count="other">Dinar Bahrain</displayName>
 				<symbol>BHD</symbol>
 			</currency>
 			<currency type="BIF">
 				<displayName>Franc Burundi</displayName>
-				<displayName count="other">franc Burundi</displayName>
+				<displayName count="other">Franc Burundi</displayName>
 				<symbol>BIF</symbol>
 			</currency>
 			<currency type="BMD">
 				<displayName>Đô la Bermuda</displayName>
-				<displayName count="other">đô la Bermuda</displayName>
+				<displayName count="other">Đô la Bermuda</displayName>
 				<symbol>BMD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BND">
 				<displayName>Đô la Brunei</displayName>
-				<displayName count="other">đô la Brunei</displayName>
+				<displayName count="other">Đô la Brunei</displayName>
 				<symbol>BND</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BOB">
 				<displayName>Boliviano Bolivia</displayName>
-				<displayName count="other">boliviano Bolivia</displayName>
+				<displayName count="other">Boliviano Bolivia</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOL">
 				<displayName draft="contributed">Đồng Boliviano của Bolivia (1863–1963)</displayName>
@@ -5368,7 +5534,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="BRL">
 				<displayName>Real Braxin</displayName>
-				<displayName count="other">real Braxin</displayName>
+				<displayName count="other">Real Braxin</displayName>
 				<symbol>R$</symbol>
 				<symbol alt="narrow" draft="contributed">R$</symbol>
 			</currency>
@@ -5386,13 +5552,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="BSD">
 				<displayName>Đô la Bahamas</displayName>
-				<displayName count="other">đô la Bahamas</displayName>
+				<displayName count="other">Đô la Bahamas</displayName>
 				<symbol>BSD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BTN">
 				<displayName>Ngultrum Bhutan</displayName>
-				<displayName count="other">ngultrum Bhutan</displayName>
+				<displayName count="other">Ngultrum Bhutan</displayName>
 				<symbol>BTN</symbol>
 			</currency>
 			<currency type="BUK">
@@ -5401,8 +5567,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="BWP">
 				<displayName>Pula Botswana</displayName>
-				<displayName count="other">pula Botswana</displayName>
+				<displayName count="other">Pula Botswana</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName draft="contributed">Đồng Rúp Mới của Belarus (1994–1999)</displayName>
@@ -5410,25 +5577,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="BYR">
 				<displayName>Rúp Belarus</displayName>
-				<displayName count="other">rúp Belarus</displayName>
+				<displayName count="other">Rúp Belarus</displayName>
 				<symbol>BYR</symbol>
 				<symbol alt="narrow" draft="contributed">р.</symbol>
 			</currency>
 			<currency type="BZD">
 				<displayName>Đô la Belize</displayName>
-				<displayName count="other">đô la Belize</displayName>
+				<displayName count="other">Đô la Belize</displayName>
 				<symbol>BZD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CAD">
 				<displayName>Đô la Canada</displayName>
-				<displayName count="other">đô la Canada</displayName>
+				<displayName count="other">Đô la Canada</displayName>
 				<symbol>CA$</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CDF">
 				<displayName>Franc Congo</displayName>
-				<displayName count="other">franc Congo</displayName>
+				<displayName count="other">Franc Congo</displayName>
 				<symbol>CDF</symbol>
 			</currency>
 			<currency type="CHE">
@@ -5437,7 +5604,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="CHF">
 				<displayName>Franc Thụy sĩ</displayName>
-				<displayName count="other">franc Thụy sĩ</displayName>
+				<displayName count="other">Franc Thụy sĩ</displayName>
 				<symbol>CHF</symbol>
 			</currency>
 			<currency type="CHW">
@@ -5454,19 +5621,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="CLP">
 				<displayName>Peso Chile</displayName>
-				<displayName count="other">peso Chile</displayName>
+				<displayName count="other">Peso Chile</displayName>
 				<symbol>CLP</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CNY">
 				<displayName>Nhân dân tệ</displayName>
-				<displayName count="other">nhân dân tệ</displayName>
+				<displayName count="other">Nhân dân tệ</displayName>
 				<symbol>CN¥</symbol>
 				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
 			<currency type="COP">
 				<displayName>Peso Colombia</displayName>
-				<displayName count="other">peso Colombia</displayName>
+				<displayName count="other">Peso Colombia</displayName>
 				<symbol>COP</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -5476,7 +5643,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="CRC">
 				<displayName>Colón Costa Rica</displayName>
-				<displayName count="other">colón Costa Rica</displayName>
+				<displayName count="other">Colón Costa Rica</displayName>
 				<symbol>CRC</symbol>
 				<symbol alt="narrow" draft="contributed">₡</symbol>
 			</currency>
@@ -5490,18 +5657,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="CUC">
 				<displayName>Peso Cuba có thể chuyển đổi</displayName>
-				<displayName count="other">peso Cuba có thể chuyển đổi</displayName>
+				<displayName count="other">Peso Cuba có thể chuyển đổi</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>Peso Cuba</displayName>
-				<displayName count="other">peso Cuba</displayName>
+				<displayName count="other">Peso Cuba</displayName>
 				<symbol>CUP</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CVE">
 				<displayName>Escudo Cape Verde</displayName>
-				<displayName count="other">escudo Cape Verde</displayName>
+				<displayName count="other">Escudo Cape Verde</displayName>
 				<symbol>CVE</symbol>
 			</currency>
 			<currency type="CYP">
@@ -5510,8 +5678,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="CZK">
 				<displayName>Koruna Cộng hòa Séc</displayName>
-				<displayName count="other">koruna Cộng hòa Séc</displayName>
+				<displayName count="other">Koruna Cộng hòa Séc</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName draft="contributed">Đồng Mark Đông Đức</displayName>
@@ -5523,23 +5692,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="DJF">
 				<displayName>Franc Djibouti</displayName>
-				<displayName count="other">franc Djibouti</displayName>
+				<displayName count="other">Franc Djibouti</displayName>
 				<symbol>DJF</symbol>
 			</currency>
 			<currency type="DKK">
 				<displayName>Krone Đan Mạch</displayName>
-				<displayName count="other">krone Đan Mạch</displayName>
+				<displayName count="other">Krone Đan Mạch</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Peso Dominica</displayName>
-				<displayName count="other">peso Dominica</displayName>
+				<displayName count="other">Peso Dominica</displayName>
 				<symbol>DOP</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="DZD">
 				<displayName>Dinar Algeria</displayName>
-				<displayName count="other">dinar Algeria</displayName>
+				<displayName count="other">Dinar Algeria</displayName>
 				<symbol>DZD</symbol>
 			</currency>
 			<currency type="ECS">
@@ -5556,12 +5726,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="EGP">
 				<displayName>Bảng Ai Cập</displayName>
-				<displayName count="other">bảng Ai Cập</displayName>
+				<displayName count="other">Bảng Ai Cập</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>Nakfa Eritrea</displayName>
-				<displayName count="other">nakfa Eritrea</displayName>
+				<displayName count="other">Nakfa Eritrea</displayName>
 				<symbol>ERN</symbol>
 			</currency>
 			<currency type="ESA">
@@ -5578,7 +5749,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="ETB">
 				<displayName>Birr Ethiopia</displayName>
-				<displayName count="other">birr Ethiopia</displayName>
+				<displayName count="other">Birr Ethiopia</displayName>
 				<symbol>ETB</symbol>
 			</currency>
 			<currency type="EUR">
@@ -5593,14 +5764,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="FJD">
 				<displayName>Đô la Fiji</displayName>
-				<displayName count="other">đô la Fiji</displayName>
+				<displayName count="other">Đô la Fiji</displayName>
 				<symbol>FJD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="FKP">
 				<displayName>Bảng Quần đảo Falkland</displayName>
-				<displayName count="other">bảng Quần đảo Falkland</displayName>
+				<displayName count="other">Bảng Quần đảo Falkland</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName draft="contributed">Franc Pháp</displayName>
@@ -5608,7 +5780,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="GBP">
 				<displayName>Bảng Anh</displayName>
-				<displayName count="other">bảng Anh</displayName>
+				<displayName count="other">Bảng Anh</displayName>
 				<symbol>£</symbol>
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
@@ -5620,6 +5792,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Lari Gruzia</displayName>
 				<displayName count="other">Lari Gruzia</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName draft="contributed">Cedi Ghana (1979–2007)</displayName>
@@ -5627,24 +5800,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="GHS">
 				<displayName>Cedi Ghana</displayName>
-				<displayName count="other">cedi Ghana</displayName>
+				<displayName count="other">Cedi Ghana</displayName>
 				<symbol>GHS</symbol>
 			</currency>
 			<currency type="GIP">
 				<displayName>Bảng Gibraltar</displayName>
-				<displayName count="other">bảng Gibraltar</displayName>
+				<displayName count="other">Bảng Gibraltar</displayName>
 				<symbol>GIP</symbol>
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GMD">
 				<displayName>Dalasi Gambia</displayName>
-				<displayName count="other">dalasi Gambia</displayName>
+				<displayName count="other">Dalasi Gambia</displayName>
 				<symbol>GMD</symbol>
 			</currency>
 			<currency type="GNF">
 				<displayName>Franc Guinea</displayName>
-				<displayName count="other">franc Guinea</displayName>
+				<displayName count="other">Franc Guinea</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName draft="contributed">Syli Guinea</displayName>
@@ -5660,8 +5834,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="GTQ">
 				<displayName>Quetzal Guatemala</displayName>
-				<displayName count="other">quetzal Guatemala</displayName>
+				<displayName count="other">Quetzal Guatemala</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName draft="contributed">Đồng Guinea Escudo Bồ Đào Nha</displayName>
@@ -5673,20 +5848,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="GYD">
 				<displayName>Đô la Guyana</displayName>
-				<displayName count="other">đô la Guyana</displayName>
+				<displayName count="other">Đô la Guyana</displayName>
 				<symbol>GYD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="HKD">
 				<displayName>Đô la Hồng Kông</displayName>
-				<displayName count="other">đô la Hồng Kông</displayName>
+				<displayName count="other">Đô la Hồng Kông</displayName>
 				<symbol>HK$</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="HNL">
 				<displayName>Lempira Honduras</displayName>
-				<displayName count="other">lempira Honduras</displayName>
+				<displayName count="other">Lempira Honduras</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName draft="contributed">Đồng Dinar Croatia</displayName>
@@ -5694,23 +5870,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="HRK">
 				<displayName>Kuna Croatia</displayName>
-				<displayName count="other">kuna Croatia</displayName>
+				<displayName count="other">Kuna Croatia</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>Gourde Haiti</displayName>
-				<displayName count="other">gourde Haiti</displayName>
+				<displayName count="other">Gourde Haiti</displayName>
 				<symbol>HTG</symbol>
 			</currency>
 			<currency type="HUF">
-				<displayName>Forint Hungaria</displayName>
+				<displayName>Forint Hungary</displayName>
 				<displayName count="other">forint Hungary</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>Rupiah Indonesia</displayName>
-				<displayName count="other">rupiah Indonesia</displayName>
+				<displayName count="other">Rupiah Indonesia</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName draft="contributed">Pao Ai-len</displayName>
@@ -5722,30 +5901,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="ILS">
 				<displayName>Sheqel Israel mới</displayName>
-				<displayName count="other">sheqel Israel mới</displayName>
+				<displayName count="other">Sheqel Israel mới</displayName>
 				<symbol>₪</symbol>
 				<symbol alt="narrow" draft="contributed">₪</symbol>
 			</currency>
 			<currency type="INR">
 				<displayName>Rupee Ấn Độ</displayName>
-				<displayName count="other">rupee Ấn Độ</displayName>
+				<displayName count="other">Rupee Ấn Độ</displayName>
 				<symbol>₹</symbol>
 				<symbol alt="narrow" draft="contributed">₹</symbol>
 			</currency>
 			<currency type="IQD">
 				<displayName>Dinar I-rắc</displayName>
-				<displayName count="other">dinar I-rắc</displayName>
+				<displayName count="other">Dinar I-rắc</displayName>
 				<symbol>IQD</symbol>
 			</currency>
 			<currency type="IRR">
 				<displayName>Rial Iran</displayName>
-				<displayName count="other">rial Iran</displayName>
+				<displayName count="other">Rial Iran</displayName>
 				<symbol>IRR</symbol>
 			</currency>
 			<currency type="ISK">
 				<displayName>Króna Iceland</displayName>
 				<displayName count="other">króna Iceland</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName draft="contributed">Lia Ý</displayName>
@@ -5753,46 +5933,48 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="JMD">
 				<displayName>Đô la Jamaica</displayName>
-				<displayName count="other">đô la Jamaica</displayName>
+				<displayName count="other">Đô la Jamaica</displayName>
 				<symbol>JMD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="JOD">
 				<displayName>Dinar Jordan</displayName>
-				<displayName count="other">dinar Jordan</displayName>
+				<displayName count="other">Dinar Jordan</displayName>
 				<symbol>JOD</symbol>
 			</currency>
 			<currency type="JPY">
 				<displayName>Yên Nhật</displayName>
-				<displayName count="other">yên Nhật</displayName>
+				<displayName count="other">Yên Nhật</displayName>
 				<symbol>JP¥</symbol>
 				<symbol alt="narrow" draft="contributed">¥</symbol>
 			</currency>
 			<currency type="KES">
 				<displayName>Shilling Kenya</displayName>
-				<displayName count="other">shilling Kenya</displayName>
+				<displayName count="other">Shilling Kenya</displayName>
 				<symbol>KES</symbol>
 			</currency>
 			<currency type="KGS">
 				<displayName>Som Kyrgyzstan</displayName>
-				<displayName count="other">som Kyrgyzstan</displayName>
+				<displayName count="other">Som Kyrgyzstan</displayName>
 				<symbol>KGS</symbol>
 			</currency>
 			<currency type="KHR">
 				<displayName>Riel Campuchia</displayName>
-				<displayName count="other">riel Campuchia</displayName>
+				<displayName count="other">Riel Campuchia</displayName>
 				<symbol>KHR</symbol>
 				<symbol alt="narrow" draft="contributed">៛</symbol>
 			</currency>
 			<currency type="KMF">
 				<displayName>Franc Comoros</displayName>
-				<displayName count="other">franc Comoros</displayName>
+				<displayName count="other">Franc Comoros</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>Won Triều Tiên</displayName>
-				<displayName count="other">won Triều Tiên</displayName>
+				<displayName count="other">Won Triều Tiên</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRH">
 				<displayName draft="contributed">Đồng Hwan Hàn Quốc (1953–1962)</displayName>
@@ -5804,46 +5986,48 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="KRW">
 				<displayName>Won Hàn Quốc</displayName>
-				<displayName count="other">won Hàn Quốc</displayName>
+				<displayName count="other">Won Hàn Quốc</displayName>
 				<symbol>₩</symbol>
 				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KWD">
 				<displayName>Dinar Kuwait</displayName>
-				<displayName count="other">dinar Kuwait</displayName>
+				<displayName count="other">Dinar Kuwait</displayName>
 				<symbol>KWD</symbol>
 			</currency>
 			<currency type="KYD">
 				<displayName>Đô la Quần đảo Cayman</displayName>
-				<displayName count="other">đô la Quần đảo Cayman</displayName>
+				<displayName count="other">Đô la Quần đảo Cayman</displayName>
 				<symbol>KYD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="KZT">
 				<displayName>Tenge Kazakhstan</displayName>
-				<displayName count="other">tenge Kazakhstan</displayName>
+				<displayName count="other">Tenge Kazakhstan</displayName>
 				<symbol>KZT</symbol>
 				<symbol alt="narrow" draft="contributed">₸</symbol>
 			</currency>
 			<currency type="LAK">
 				<displayName>Kip Lào</displayName>
-				<displayName count="other">kip Lào</displayName>
+				<displayName count="other">Kip Lào</displayName>
 				<symbol>LAK</symbol>
 				<symbol alt="narrow" draft="contributed">₭</symbol>
 			</currency>
 			<currency type="LBP">
 				<displayName>Bảng Li-băng</displayName>
-				<displayName count="other">bảng Li-băng</displayName>
+				<displayName count="other">Bảng Li-băng</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>Rupee Sri Lanka</displayName>
-				<displayName count="other">rupee Sri Lanka</displayName>
+				<displayName count="other">Rupee Sri Lanka</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>Đô la Liberia</displayName>
-				<displayName count="other">đô la Liberia</displayName>
+				<displayName count="other">Đô la Liberia</displayName>
 				<symbol>LRD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -5883,12 +6067,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="LYD">
 				<displayName>Dinar Libi</displayName>
-				<displayName count="other">dinar Libi</displayName>
+				<displayName count="other">Dinar Libi</displayName>
 				<symbol>LYD</symbol>
 			</currency>
 			<currency type="MAD">
 				<displayName>Dirham Ma-rốc</displayName>
-				<displayName count="other">dirham Ma-rốc</displayName>
+				<displayName count="other">Dirham Ma-rốc</displayName>
 				<symbol>MAD</symbol>
 			</currency>
 			<currency type="MAF">
@@ -5905,13 +6089,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="MDL">
 				<displayName>Leu Moldova</displayName>
-				<displayName count="other">leu Moldova</displayName>
+				<displayName count="other">Leu Moldova</displayName>
 				<symbol>MDL</symbol>
 			</currency>
 			<currency type="MGA">
 				<displayName>Ariary Malagasy</displayName>
-				<displayName count="other">ariary Malagasy</displayName>
+				<displayName count="other">Ariary Malagasy</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName draft="contributed">Đồng Franc Magalasy</displayName>
@@ -5919,7 +6104,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="MKD">
 				<displayName>Denar Macedonia</displayName>
-				<displayName count="other">denar Macedonia</displayName>
+				<displayName count="other">Denar Macedonia</displayName>
 				<symbol>MKD</symbol>
 			</currency>
 			<currency type="MKN">
@@ -5932,23 +6117,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="MMK">
 				<displayName>Kyat Myanma</displayName>
-				<displayName count="other">kyat Myanma</displayName>
+				<displayName count="other">Kyat Myanma</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>Tugrik Mông Cổ</displayName>
-				<displayName count="other">tugrik Mông Cổ</displayName>
+				<displayName count="other">Tugrik Mông Cổ</displayName>
 				<symbol>MNT</symbol>
 				<symbol alt="narrow" draft="contributed">₮</symbol>
 			</currency>
 			<currency type="MOP">
 				<displayName>Pataca Ma Cao</displayName>
-				<displayName count="other">pataca Ma Cao</displayName>
+				<displayName count="other">Pataca Ma Cao</displayName>
 				<symbol>MOP</symbol>
 			</currency>
 			<currency type="MRO">
 				<displayName>Ouguiya Mauritania</displayName>
-				<displayName count="other">ouguiya Mauritania</displayName>
+				<displayName count="other">Ouguiya Mauritania</displayName>
 				<symbol>MRO</symbol>
 			</currency>
 			<currency type="MTL">
@@ -5961,22 +6147,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="MUR">
 				<displayName>Rupee Mauritius</displayName>
-				<displayName count="other">rupee Mauritius</displayName>
+				<displayName count="other">Rupee Mauritius</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>Rufiyaa Maldives</displayName>
-				<displayName count="other">rufiyaa Maldives</displayName>
+				<displayName count="other">Rufiyaa Maldives</displayName>
 				<symbol>MVR</symbol>
 			</currency>
 			<currency type="MWK">
 				<displayName>Kwacha Malawi</displayName>
-				<displayName count="other">kwacha Malawi</displayName>
+				<displayName count="other">Kwacha Malawi</displayName>
 				<symbol>MWK</symbol>
 			</currency>
 			<currency type="MXN">
 				<displayName>Peso Mexico</displayName>
-				<displayName count="other">peso Mexico</displayName>
+				<displayName count="other">Peso Mexico</displayName>
 				<symbol>MX$</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -5990,8 +6177,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="MYR">
 				<displayName>Ringgit Malaysia</displayName>
-				<displayName count="other">ringgit Malaysia</displayName>
+				<displayName count="other">Ringgit Malaysia</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName draft="contributed">Escudo Mozambique</displayName>
@@ -6003,18 +6191,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="MZN">
 				<displayName>Metical Mozambique</displayName>
-				<displayName count="other">metical Mozambique</displayName>
+				<displayName count="other">Metical Mozambique</displayName>
 				<symbol>MZN</symbol>
 			</currency>
 			<currency type="NAD">
 				<displayName>Đô la Namibia</displayName>
-				<displayName count="other">đô la Namibia</displayName>
+				<displayName count="other">Đô la Namibia</displayName>
 				<symbol>NAD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="NGN">
 				<displayName>Naira Nigeria</displayName>
-				<displayName count="other">naira Nigeria</displayName>
+				<displayName count="other">Naira Nigeria</displayName>
 				<symbol>NGN</symbol>
 				<symbol alt="narrow" draft="contributed">₦</symbol>
 			</currency>
@@ -6024,8 +6212,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="NIO">
 				<displayName>Córdoba Nicaragua</displayName>
-				<displayName count="other">córdoba Nicaragua</displayName>
+				<displayName count="other">Córdoba Nicaragua</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName draft="contributed">Đồng Guilder Hà Lan</displayName>
@@ -6033,28 +6222,30 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="NOK">
 				<displayName>Krone Na Uy</displayName>
-				<displayName count="other">krone Na Uy</displayName>
+				<displayName count="other">Krone Na Uy</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>Rupee Nepal</displayName>
-				<displayName count="other">rupee Nepal</displayName>
+				<displayName count="other">Rupee Nepal</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>Đô la New Zealand</displayName>
-				<displayName count="other">đô la New Zealand</displayName>
+				<displayName count="other">Đô la New Zealand</displayName>
 				<symbol>NZ$</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="OMR">
 				<displayName>Rial Oman</displayName>
-				<displayName count="other">rial Oman</displayName>
+				<displayName count="other">Rial Oman</displayName>
 				<symbol>OMR</symbol>
 			</currency>
 			<currency type="PAB">
 				<displayName>Balboa Panama</displayName>
-				<displayName count="other">balboa Panama</displayName>
+				<displayName count="other">Balboa Panama</displayName>
 				<symbol>PAB</symbol>
 			</currency>
 			<currency type="PEI">
@@ -6063,7 +6254,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="PEN">
 				<displayName>Nuevo Sol Peru</displayName>
-				<displayName count="other">nuevo sol Peru</displayName>
+				<displayName count="other">Nuevo Sol Peru</displayName>
 				<symbol>PEN</symbol>
 			</currency>
 			<currency type="PES">
@@ -6072,24 +6263,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="PGK">
 				<displayName>Kina Papua New Guinean</displayName>
-				<displayName count="other">kina Papua New Guinean</displayName>
+				<displayName count="other">Kina Papua New Guinean</displayName>
 				<symbol>PGK</symbol>
 			</currency>
 			<currency type="PHP">
 				<displayName>Peso Philipin</displayName>
-				<displayName count="other">peso Philipin</displayName>
+				<displayName count="other">Peso Philipin</displayName>
 				<symbol>PHP</symbol>
 				<symbol alt="narrow" draft="contributed">₱</symbol>
 			</currency>
 			<currency type="PKR">
 				<displayName>Rupee Pakistan</displayName>
-				<displayName count="other">rupee Pakistan</displayName>
+				<displayName count="other">Rupee Pakistan</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>Zloty Ba Lan</displayName>
 				<displayName count="other">Zloty Ba Lan</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName draft="contributed">Đồng Zloty Ba Lan (1950–1995)</displayName>
@@ -6101,13 +6294,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="PYG">
 				<displayName>Guarani Paraguay</displayName>
-				<displayName count="other">guarani Paraguay</displayName>
+				<displayName count="other">Guarani Paraguay</displayName>
 				<symbol>PYG</symbol>
 				<symbol alt="narrow" draft="contributed">₲</symbol>
 			</currency>
 			<currency type="QAR">
 				<displayName>Rial Qatar</displayName>
-				<displayName count="other">rial Qatar</displayName>
+				<displayName count="other">Rial Qatar</displayName>
 				<symbol>QAR</symbol>
 			</currency>
 			<currency type="RHD">
@@ -6120,18 +6313,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="RON">
 				<displayName>Leu Romania</displayName>
-				<displayName count="other">leu Romania</displayName>
+				<displayName count="other">Leu Romania</displayName>
 				<symbol>RON</symbol>
 			</currency>
 			<currency type="RSD">
 				<displayName>Dinar Serbia</displayName>
-				<displayName count="other">dinar Serbia</displayName>
+				<displayName count="other">Dinar Serbia</displayName>
 				<symbol>RSD</symbol>
 			</currency>
 			<currency type="RUB">
 				<displayName>Rúp Nga</displayName>
 				<displayName count="other">Rúp Nga</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName draft="contributed">Đồng Rúp Nga (1991–1998)</displayName>
@@ -6139,23 +6333,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="RWF">
 				<displayName>Franc Rwanda</displayName>
-				<displayName count="other">franc Rwanda</displayName>
+				<displayName count="other">Franc Rwanda</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>Riyal Ả Rập Xê-út</displayName>
-				<displayName count="other">riyal Ả Rập Xê-út</displayName>
+				<displayName count="other">Riyal Ả Rập Xê-út</displayName>
 				<symbol>SAR</symbol>
 			</currency>
 			<currency type="SBD">
 				<displayName>Đô la quần đảo Solomon</displayName>
-				<displayName count="other">đô la quần đảo Solomon</displayName>
+				<displayName count="other">Đô la quần đảo Solomon</displayName>
 				<symbol>SBD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SCR">
 				<displayName>Rupee Seychelles</displayName>
-				<displayName count="other">rupee Seychelles</displayName>
+				<displayName count="other">Rupee Seychelles</displayName>
 				<symbol>SCR</symbol>
 			</currency>
 			<currency type="SDD">
@@ -6164,7 +6359,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="SDG">
 				<displayName>Bảng Sudan</displayName>
-				<displayName count="other">bảng Sudan</displayName>
+				<displayName count="other">Bảng Sudan</displayName>
 				<symbol>SDG</symbol>
 			</currency>
 			<currency type="SDP">
@@ -6173,19 +6368,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="SEK">
 				<displayName>Krona Thụy Điển</displayName>
-				<displayName count="other">krona Thụy Điển</displayName>
+				<displayName count="other">Krona Thụy Điển</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>Đô la Singapore</displayName>
-				<displayName count="other">đô la Singapore</displayName>
+				<displayName count="other">Đô la Singapore</displayName>
 				<symbol>SGD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SHP">
-				<displayName>Bảng Saint Helena</displayName>
-				<displayName count="other">bảng Saint Helena</displayName>
+				<displayName>Bảng St. Helena</displayName>
+				<displayName count="other">bảng St. Helena</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName draft="contributed">Tôla Xlôvênia</displayName>
@@ -6197,17 +6394,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="SLL">
 				<displayName>Leone Sierra Leone</displayName>
-				<displayName count="other">leone Sierra Leone</displayName>
+				<displayName count="other">Leone Sierra Leone</displayName>
 				<symbol>SLL</symbol>
 			</currency>
 			<currency type="SOS">
 				<displayName>Schilling Somali</displayName>
-				<displayName count="other">schilling Somali</displayName>
+				<displayName count="other">Schilling Somali</displayName>
 				<symbol>SOS</symbol>
 			</currency>
 			<currency type="SRD">
 				<displayName>Đô la Suriname</displayName>
-				<displayName count="other">đô la Suriname</displayName>
+				<displayName count="other">Đô la Suriname</displayName>
 				<symbol>SRD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -6217,14 +6414,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="SSP">
 				<displayName>Bảng Nam Sudan</displayName>
-				<displayName count="other">bảng Nam Sudan</displayName>
+				<displayName count="other">Bảng Nam Sudan</displayName>
 				<symbol>SSP</symbol>
 				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="STD">
 				<displayName>Dobra São Tomé và Príncipe</displayName>
-				<displayName count="other">dobra São Tomé và Príncipe</displayName>
+				<displayName count="other">Dobra São Tomé và Príncipe</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName draft="contributed">Đồng Rúp Sô viết</displayName>
@@ -6236,18 +6434,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="SYP">
 				<displayName>Bảng Syria</displayName>
-				<displayName count="other">bảng Syria</displayName>
+				<displayName count="other">Bảng Syria</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>Lilangeni Swaziland</displayName>
-				<displayName count="other">emalangeni Swaziland</displayName>
+				<displayName count="other">Lilangeni Swaziland</displayName>
 				<symbol>SZL</symbol>
 			</currency>
 			<currency type="THB">
 				<displayName>Bạt Thái Lan</displayName>
-				<displayName count="other">bạt Thái Lan</displayName>
+				<displayName count="other">Bạt Thái Lan</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName draft="contributed">Đồng Rúp Tajikistan</displayName>
@@ -6255,7 +6455,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="TJS">
 				<displayName>Somoni Tajikistan</displayName>
-				<displayName count="other">somoni Tajikistan</displayName>
+				<displayName count="other">Somoni Tajikistan</displayName>
 				<symbol>TJS</symbol>
 			</currency>
 			<currency type="TMM">
@@ -6264,18 +6464,19 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="TMT">
 				<displayName>Manat Turkmenistan</displayName>
-				<displayName count="other">manat Turkmenistan</displayName>
+				<displayName count="other">Manat Turkmenistan</displayName>
 				<symbol>TMT</symbol>
 			</currency>
 			<currency type="TND">
 				<displayName>Dinar Tunisia</displayName>
-				<displayName count="other">dinar Tunisia</displayName>
+				<displayName count="other">Dinar Tunisia</displayName>
 				<symbol>TND</symbol>
 			</currency>
 			<currency type="TOP">
 				<displayName>Paʻanga Tonga</displayName>
-				<displayName count="other">paʻanga Tonga</displayName>
+				<displayName count="other">Paʻanga Tonga</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName draft="contributed">Đồng Escudo Timor</displayName>
@@ -6288,30 +6489,31 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="TRY">
 				<displayName>Lia Thổ Nhĩ Kỳ</displayName>
-				<displayName count="other">lia Thổ Nhĩ Kỳ</displayName>
+				<displayName count="other">Lia Thổ Nhĩ Kỳ</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Đô la Trinidad và Tobago</displayName>
-				<displayName count="other">đô la Trinidad và Tobago</displayName>
+				<displayName count="other">Đô la Trinidad và Tobago</displayName>
 				<symbol>TTD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="TWD">
 				<displayName>Đô la Đài Loan mới</displayName>
-				<displayName count="other">đô la Đài Loan mới</displayName>
+				<displayName count="other">Đô la Đài Loan mới</displayName>
 				<symbol>NT$</symbol>
 				<symbol alt="narrow" draft="contributed">NT$</symbol>
 			</currency>
 			<currency type="TZS">
 				<displayName>Shilling Tanzania</displayName>
-				<displayName count="other">shilling Tanzania</displayName>
+				<displayName count="other">Shilling Tanzania</displayName>
 				<symbol>TZS</symbol>
 			</currency>
 			<currency type="UAH">
 				<displayName>Hryvnia Ucraina</displayName>
-				<displayName count="other">hryvnia Ucraina</displayName>
+				<displayName count="other">Hryvnia Ucraina</displayName>
 				<symbol>UAH</symbol>
 				<symbol alt="narrow" draft="contributed">₴</symbol>
 			</currency>
@@ -6325,12 +6527,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="UGX">
 				<displayName>Shilling Uganda</displayName>
-				<displayName count="other">shilling Uganda</displayName>
+				<displayName count="other">Shilling Uganda</displayName>
 				<symbol>UGX</symbol>
 			</currency>
 			<currency type="USD">
 				<displayName>Đô la Mỹ</displayName>
-				<displayName count="other">đô la Mỹ</displayName>
+				<displayName count="other">Đô la Mỹ</displayName>
 				<symbol>US$</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -6352,13 +6554,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="UYU">
 				<displayName>Peso Uruguay</displayName>
-				<displayName count="other">peso Uruguay</displayName>
+				<displayName count="other">Peso Uruguay</displayName>
 				<symbol>UYU</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="UZS">
 				<displayName>Som Uzbekistan</displayName>
-				<displayName count="other">som Uzbekistan</displayName>
+				<displayName count="other">Som Uzbekistan</displayName>
 				<symbol>UZS</symbol>
 			</currency>
 			<currency type="VEB">
@@ -6367,12 +6569,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="VEF">
 				<displayName>Bolívar Venezuela</displayName>
-				<displayName count="other">bolívar Venezuela</displayName>
+				<displayName count="other">Bolívar Venezuela</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>Đồng Việt Nam</displayName>
-				<displayName count="other">đồng Việt Nam</displayName>
+				<displayName count="other">Đồng Việt Nam</displayName>
 				<symbol>₫</symbol>
 				<symbol alt="narrow" draft="contributed">₫</symbol>
 			</currency>
@@ -6382,17 +6585,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="VUV">
 				<displayName>Vatu Vanuatu</displayName>
-				<displayName count="other">vatu Vanuatu</displayName>
+				<displayName count="other">Vatu Vanuatu</displayName>
 				<symbol>VUV</symbol>
 			</currency>
 			<currency type="WST">
 				<displayName>Tala Samoa</displayName>
-				<displayName count="other">tala Samoa</displayName>
+				<displayName count="other">Tala Samoa</displayName>
 				<symbol>WST</symbol>
 			</currency>
 			<currency type="XAF">
-				<displayName>CFA Franc BEAC</displayName>
-				<displayName count="other">CFA Franc BEAC</displayName>
+				<displayName>Franc CFA Trung Phi</displayName>
+				<displayName count="other">franc CFA Trung Phi</displayName>
 				<symbol>FCFA</symbol>
 			</currency>
 			<currency type="XAG">
@@ -6421,8 +6624,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="XCD">
 				<displayName>Đô la Đông Caribê</displayName>
-				<displayName count="other">đô la Đông Caribê</displayName>
+				<displayName count="other">Đô la Đông Caribê</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName draft="contributed">Quyền Rút vốn Đặc biệt</displayName>
@@ -6441,8 +6645,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol draft="contributed">XFU</symbol>
 			</currency>
 			<currency type="XOF">
-				<displayName>Franc CFA BCEAO</displayName>
-				<displayName count="other">franc CFA BCEAO</displayName>
+				<displayName>Franc CFA Tây Phi</displayName>
+				<displayName count="other">franc CFA Tây Phi</displayName>
 				<symbol>CFA</symbol>
 			</currency>
 			<currency type="XPD">
@@ -6451,7 +6655,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="XPF">
 				<displayName>Franc CFP</displayName>
-				<displayName count="other">franc CFP</displayName>
+				<displayName count="other">Franc CFP</displayName>
 				<symbol>CFPF</symbol>
 			</currency>
 			<currency type="XPT">
@@ -6477,7 +6681,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="YER">
 				<displayName>Rial Yemen</displayName>
-				<displayName count="other">rial Yemen</displayName>
+				<displayName count="other">Rial Yemen</displayName>
 				<symbol>YER</symbol>
 			</currency>
 			<currency type="YUD">
@@ -6502,8 +6706,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="ZAR">
 				<displayName>Rand Nam Phi</displayName>
-				<displayName count="other">rand Nam Phi</displayName>
+				<displayName count="other">Rand Nam Phi</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>Đồng kwacha của Zambia (1968–2012)</displayName>
@@ -6511,8 +6716,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="ZMW">
 				<displayName>Kwacha Zambia</displayName>
-				<displayName count="other">kwacha Zambia</displayName>
+				<displayName count="other">Kwacha Zambia</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName draft="contributed">Đồng Zaire Mới (1993–1998)</displayName>
@@ -6553,6 +6759,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m/s²</displayName>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>vòng</displayName>
+				<unitPattern count="other">{0} vòng</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radian</displayName>
+				<unitPattern count="other">{0} radian</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>độ</displayName>
+				<unitPattern count="other">{0} độ</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>phút</displayName>
 				<unitPattern count="other">{0} phút</unitPattern>
@@ -6561,25 +6779,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>giây</displayName>
 				<unitPattern count="other">{0} giây</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>độ</displayName>
-				<unitPattern count="other">{0} độ</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radian</displayName>
-				<unitPattern count="other">{0} radian</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>mẫu</displayName>
-				<unitPattern count="other">{0} mẫu</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>kilômét vuông</displayName>
+				<unitPattern count="other">{0} kilômét vuông</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>héc-ta</displayName>
 				<unitPattern count="other">{0} héc-ta</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>mét vuông</displayName>
+				<unitPattern count="other">{0} mét vuông</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>xentimét vuông</displayName>
 				<unitPattern count="other">{0} xentimét vuông</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>dặm vuông</displayName>
+				<unitPattern count="other">{0} dặm vuông</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>mẫu</displayName>
+				<unitPattern count="other">{0} mẫu</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yard vuông</displayName>
+				<unitPattern count="other">{0} yard vuông</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>feet vuông</displayName>
@@ -6588,112 +6816,114 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="area-square-inch">
 				<displayName>inch vuông</displayName>
 				<unitPattern count="other">{0} inch vuông</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>kilômét vuông</displayName>
-				<unitPattern count="other">{0} kilômét vuông</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>mét vuông</displayName>
-				<unitPattern count="other">{0} mét vuông</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>dặm vuông</displayName>
-				<unitPattern count="other">{0} dặm vuông</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yard vuông</displayName>
-				<unitPattern count="other">{0} yard vuông</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karat</displayName>
+				<unitPattern count="other">{0} karat</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>lít/km</displayName>
 				<unitPattern count="other">{0} lít/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>lít/100km</displayName>
+				<unitPattern count="other">{0} l/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>dặm/gallon</displayName>
 				<unitPattern count="other">{0} dặm/gallon</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabit</displayName>
-				<unitPattern count="other">{0} gigabit</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>gigabyte</displayName>
-				<unitPattern count="other">{0} gigabyte</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobit</displayName>
-				<unitPattern count="other">{0} kilobit</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kilobyte</displayName>
-				<unitPattern count="other">{0} kilobyte</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabit</displayName>
-				<unitPattern count="other">{0} megabit</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>megabyte</displayName>
-				<unitPattern count="other">{0} megabyte</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabit</displayName>
-				<unitPattern count="other">{0} terabit</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>terabyte</displayName>
 				<unitPattern count="other">{0} terabyte</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabit</displayName>
+				<unitPattern count="other">{0} terabit</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabyte</displayName>
+				<unitPattern count="other">{0} gigabyte</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabit</displayName>
+				<unitPattern count="other">{0} gigabit</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabyte</displayName>
+				<unitPattern count="other">{0} megabyte</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabit</displayName>
+				<unitPattern count="other">{0} megabit</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobyte</displayName>
+				<unitPattern count="other">{0} kilobyte</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobit</displayName>
+				<unitPattern count="other">{0} kilobit</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>thế kỷ</displayName>
+				<unitPattern count="other">{0} thế kỷ</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>năm</displayName>
+				<unitPattern count="other">{0} năm</unitPattern>
+				<perUnitPattern>{0}/năm</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>tháng</displayName>
+				<unitPattern count="other">{0} tháng</unitPattern>
+				<perUnitPattern>{0}/tháng</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>tuần</displayName>
+				<unitPattern count="other">{0} tuần</unitPattern>
+				<perUnitPattern>{0}/tuần</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ngày</displayName>
 				<unitPattern count="other">{0} ngày</unitPattern>
+				<perUnitPattern>{0}/ngày</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>giờ</displayName>
 				<unitPattern count="other">{0} giờ</unitPattern>
 				<perUnitPattern>{0}/giờ</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>micrô giây</displayName>
-				<unitPattern count="other">{0} micrô giây</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>mili giây</displayName>
-				<unitPattern count="other">{0} mili giây</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>phút</displayName>
 				<unitPattern count="other">{0} phút</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>tháng</displayName>
-				<unitPattern count="other">{0} tháng</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>nano giây</displayName>
-				<unitPattern count="other">{0} nano giây</unitPattern>
+				<perUnitPattern>{0}/phút</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>giây</displayName>
 				<unitPattern count="other">{0} giây</unitPattern>
 				<perUnitPattern>{0}/giây</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>tuần</displayName>
-				<unitPattern count="other">{0} tuần</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>mili giây</displayName>
+				<unitPattern count="other">{0} mili giây</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>năm</displayName>
-				<unitPattern count="other">{0} năm</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>micrô giây</displayName>
+				<unitPattern count="other">{0} micrô giây</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nano giây</displayName>
+				<unitPattern count="other">{0} nano giây</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>ampe</displayName>
@@ -6711,6 +6941,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>vôn</displayName>
 				<unitPattern count="other">{0} vôn</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilô calo</displayName>
+				<unitPattern count="other">{0} kilô calo</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>calo</displayName>
 				<unitPattern count="other">{0} calo</unitPattern>
@@ -6719,18 +6953,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Calo</displayName>
 				<unitPattern count="other">{0} Calo</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>jun</displayName>
-				<unitPattern count="other">{0} jun</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kilô calo</displayName>
-				<unitPattern count="other">{0} kilô calo</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilô jun</displayName>
 				<unitPattern count="other">{0} kilô jun</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>jun</displayName>
+				<unitPattern count="other">{0} jun</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kilôoát giờ</displayName>
 				<unitPattern count="other">{0} kilôoát giờ</unitPattern>
@@ -6739,162 +6969,167 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>GHz</displayName>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>kilômét</displayName>
+				<unitPattern count="other">{0} kilômét</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>xentimét</displayName>
-				<unitPattern count="other">{0} xentimét</unitPattern>
+			<unit type="length-meter">
+				<displayName>mét</displayName>
+				<unitPattern count="other">{0} mét</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>đềximét</displayName>
 				<unitPattern count="other">{0} đềximét</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>feet</displayName>
-				<unitPattern count="other">{0} feet</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>inch</displayName>
-				<unitPattern count="other">{0} inch</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>kilômét</displayName>
-				<unitPattern count="other">{0} kilômét</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>năm ánh sáng</displayName>
-				<unitPattern count="other">{0} năm ánh sáng</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>mét</displayName>
-				<unitPattern count="other">{0} mét</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>micrômét</displayName>
-				<unitPattern count="other">{0} micrômét</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>dặm</displayName>
-				<unitPattern count="other">{0} dặm</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>xentimét</displayName>
+				<unitPattern count="other">{0} xentimét</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>milimét</displayName>
 				<unitPattern count="other">{0} milimét</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>micrômét</displayName>
+				<unitPattern count="other">{0} micrômét</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nanomét</displayName>
 				<unitPattern count="other">{0} nanomét</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>hải lý</displayName>
-				<unitPattern count="other">{0} hải lý</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>parsec</displayName>
-				<unitPattern count="other">{0} parsec</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>picômét</displayName>
 				<unitPattern count="other">{0} picômét</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>dặm</displayName>
+				<unitPattern count="other">{0} dặm</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yard</displayName>
 				<unitPattern count="other">{0} yard</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>feet</displayName>
+				<unitPattern count="other">{0} feet</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>inch</displayName>
+				<unitPattern count="other">{0} inch</unitPattern>
+				<perUnitPattern>{0}/inch</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsec</displayName>
+				<unitPattern count="other">{0} parsec</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>năm ánh sáng</displayName>
+				<unitPattern count="other">{0} năm ánh sáng</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>hải lý</displayName>
+				<unitPattern count="other">{0} hải lý</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>dặm scandinavia</displayName>
+				<unitPattern count="other">{0} dặm scandinavia</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>carat</displayName>
-				<unitPattern count="other">{0} carat</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>gam</displayName>
-				<unitPattern count="other">{0} gam</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kilôgam</displayName>
-				<unitPattern count="other">{0} kilôgam</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>MT</displayName>
 				<unitPattern count="other">{0} MT</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>micrôgam</displayName>
-				<unitPattern count="other">{0} micrô gam</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kilôgam</displayName>
+				<unitPattern count="other">{0} kilôgam</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>gam</displayName>
+				<unitPattern count="other">{0} gam</unitPattern>
+				<perUnitPattern>{0}/gam</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>miligam</displayName>
 				<unitPattern count="other">{0} miligam</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>ao-xơ</displayName>
-				<unitPattern count="other">{0} ao-xơ</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>pao</displayName>
-				<unitPattern count="other">{0} pao</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>micrôgam</displayName>
+				<unitPattern count="other">{0} micrô gam</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tấn</displayName>
 				<unitPattern count="other">{0} tấn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>pao</displayName>
+				<unitPattern count="other">{0} pao</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ao-xơ</displayName>
+				<unitPattern count="other">{0} ao-xơ</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>carat</displayName>
+				<unitPattern count="other">{0} carat</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>gigaoát</displayName>
 				<unitPattern count="other">{0} gigaoát</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>mã lực</displayName>
-				<unitPattern count="other">{0} mã lực</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kilôoát</displayName>
-				<unitPattern count="other">{0} kilôoát</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>Megaoát</displayName>
 				<unitPattern count="other">{0} Megaoát</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>milioát</displayName>
-				<unitPattern count="other">{0} milioát</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kilôoát</displayName>
+				<unitPattern count="other">{0} kilôoát</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>oát</displayName>
 				<unitPattern count="other">{0} oát</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>milioát</displayName>
+				<unitPattern count="other">{0} milioát</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>mã lực</displayName>
+				<unitPattern count="other">{0} mã lực</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>héctô pascal</displayName>
 				<unitPattern count="other">{0} héctô pascal</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inch thủy ngân</displayName>
-				<unitPattern count="other">{0} inch thủy ngân</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>millibar</displayName>
-				<unitPattern count="other">{0} millibar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="other">{0} mm Hg</unitPattern>
@@ -6903,9 +7138,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>psi</displayName>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karat</displayName>
-				<unitPattern count="other">{0} karat</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inch thủy ngân</displayName>
+				<unitPattern count="other">{0} inch thủy ngân</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>millibar</displayName>
+				<unitPattern count="other">{0} millibar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilômét/giờ</displayName>
@@ -6919,6 +7158,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>dặm/giờ</displayName>
 				<unitPattern count="other">{0} dặm/giờ</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>nút</displayName>
+				<unitPattern count="other">{0} nút</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>độ C</displayName>
 				<unitPattern count="other">{0} độ C</unitPattern>
@@ -6931,26 +7178,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>độ K</displayName>
 				<unitPattern count="other">{0} độ K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>xentilít</displayName>
-				<unitPattern count="other">{0} xentilít</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>xentimét khối</displayName>
-				<unitPattern count="other">{0} xentimét khối</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>foot khối</displayName>
-				<unitPattern count="other">{0} foot khối</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>inch khối</displayName>
-				<unitPattern count="other">{0} inch khối</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>kilômét khối</displayName>
 				<unitPattern count="other">{0} kilômét khối</unitPattern>
@@ -6958,6 +7185,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-cubic-meter">
 				<displayName>mét khối</displayName>
 				<unitPattern count="other">{0} mét khối</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>xentimét khối</displayName>
+				<unitPattern count="other">{0} xentimét khối</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>dặm khối</displayName>
@@ -6967,21 +7200,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>yard khối</displayName>
 				<unitPattern count="other">{0} yard khối</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>cup</displayName>
-				<unitPattern count="other">{0} cup</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>foot khối</displayName>
+				<unitPattern count="other">{0} foot khối</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>đềxilít</displayName>
-				<unitPattern count="other">{0} đềxilít</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>inch khối</displayName>
+				<unitPattern count="other">{0} inch khối</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gallon</displayName>
-				<unitPattern count="other">{0} gallon</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>megalít</displayName>
+				<unitPattern count="other">{0} megalít</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hectolit</displayName>
@@ -6990,23 +7219,53 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-liter">
 				<displayName>lít</displayName>
 				<unitPattern count="other">{0} lít</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>megalít</displayName>
-				<unitPattern count="other">{0} megalít</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>đềxilít</displayName>
+				<unitPattern count="other">{0} đềxilít</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>xentilít</displayName>
+				<unitPattern count="other">{0} xentilít</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mililít</displayName>
 				<unitPattern count="other">{0} mililít</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pint</displayName>
-				<unitPattern count="other">{0} pint</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>panh khối</displayName>
+				<unitPattern count="other">{0} panh khối</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>cup khối</displayName>
+				<unitPattern count="other">{0} cup khối</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gallon</displayName>
+				<unitPattern count="other">{0} gallon</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>quart</displayName>
 				<unitPattern count="other">{0} quart</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pint</displayName>
+				<unitPattern count="other">{0} pint</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cup</displayName>
+				<unitPattern count="other">{0} cup</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>muỗng canh</displayName>
 				<unitPattern count="other">{0} muỗng canh</unitPattern>
@@ -7015,6 +7274,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>muỗng cà phê</displayName>
 				<unitPattern count="other">{0} muỗng cà phê</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -7028,6 +7293,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m/s²</displayName>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="other">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>độ</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>phút</displayName>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -7036,139 +7313,151 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>giây</displayName>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>độ</displayName>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>mẫu</displayName>
-				<unitPattern count="other">{0} mẫu</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ha</displayName>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
-			<unit type="area-square-centimeter">
-				<displayName>cm²</displayName>
-				<unitPattern count="other">{0} cm²</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<displayName>ft²</displayName>
-				<unitPattern count="other">{0} feet vuông</unitPattern>
-			</unit>
-			<unit type="area-square-inch">
-				<displayName>in²</displayName>
-				<unitPattern count="other">{0} in²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<displayName>m²</displayName>
 				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>cm²</displayName>
+				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
-				<displayName>dặm vuông</displayName>
-				<unitPattern count="other">{0} dặm vuông</unitPattern>
+				<displayName>mi²</displayName>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>mẫu</displayName>
+				<unitPattern count="other">{0} mẫu</unitPattern>
 			</unit>
 			<unit type="area-square-yard">
 				<displayName>yd²</displayName>
 				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
+			<unit type="area-square-foot">
+				<displayName>ft²</displayName>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>in²</displayName>
+				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>kt</displayName>
+				<unitPattern count="other">{0} kt</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="other">{0} l/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="other">{0} MB</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>TB</displayName>
+				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>Tb</displayName>
 				<unitPattern count="other">{0} Tb</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>TB</displayName>
-				<unitPattern count="other">{0} TB</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>c</displayName>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>năm</displayName>
+				<unitPattern count="other">{0} năm</unitPattern>
+				<perUnitPattern>{0}/năm</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>tháng</displayName>
+				<unitPattern count="other">{0} tháng</unitPattern>
+				<perUnitPattern>{0}/tháng</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>tuần</displayName>
+				<unitPattern count="other">{0} tuần</unitPattern>
+				<perUnitPattern>{0}/tuần</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>ngày</displayName>
 				<unitPattern count="other">{0} ngày</unitPattern>
+				<perUnitPattern>{0}/ngày</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>giờ</displayName>
 				<unitPattern count="other">{0} giờ</unitPattern>
 				<perUnitPattern>{0}/giờ</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μs</displayName>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>phút</displayName>
 				<unitPattern count="other">{0} phút</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>tháng</displayName>
-				<unitPattern count="other">{0} tháng</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/phút</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>giây</displayName>
 				<unitPattern count="other">{0} giây</unitPattern>
 				<perUnitPattern>{0}/giây</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>tuần</displayName>
-				<unitPattern count="other">{0} tuần</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>năm</displayName>
-				<unitPattern count="other">{0} năm</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μs</displayName>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>A</displayName>
@@ -7186,6 +7475,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>v</displayName>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="other">{0} cal</unitPattern>
@@ -7194,18 +7487,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>Cal</displayName>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>J</displayName>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="other">{0} kWh</unitPattern>
@@ -7214,162 +7503,167 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>GHz</displayName>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ft</displayName>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>inch</displayName>
-				<unitPattern count="other">{0} inch</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ly</displayName>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>dặm</displayName>
-				<unitPattern count="other">{0} dặm</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>hải lý</displayName>
-				<unitPattern count="other">{0} hải lý</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>dặm</displayName>
+				<unitPattern count="other">{0} dặm</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yd</displayName>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ft</displayName>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>inch</displayName>
+				<unitPattern count="other">{0} inch</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ly</displayName>
+				<unitPattern count="other">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lx</displayName>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>CD</displayName>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>pao</displayName>
-				<unitPattern count="other">{0} lb</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tn</displayName>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>pao</displayName>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>CD</displayName>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hp</displayName>
-				<unitPattern count="other">{0} hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>W</displayName>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="other">{0} mm Hg</unitPattern>
@@ -7378,9 +7672,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>psi</displayName>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>kt</displayName>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -7392,7 +7690,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="speed-mile-per-hour">
 				<displayName>mi/h</displayName>
-				<unitPattern count="other">{0} mph</unitPattern>
+				<unitPattern count="other">{0} mi/h</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
@@ -7406,26 +7712,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>K</displayName>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cL</displayName>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="other">{0} km³</unitPattern>
@@ -7433,6 +7719,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-cubic-meter">
 				<displayName>m³</displayName>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -7442,21 +7734,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>yd³</displayName>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>c</displayName>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -7464,24 +7752,54 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="volume-liter">
 				<displayName>l</displayName>
-				<unitPattern count="other">{0} l</unitPattern>
+				<unitPattern count="other">{0} L</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>c</displayName>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>tbsp</displayName>
 				<unitPattern count="other">{0} tbsp</unitPattern>
@@ -7490,6 +7808,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>tsp</displayName>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -7498,33 +7822,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="acceleration-g-force">
 				<unitPattern count="other">{0}G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="other">{0}′</unitPattern>
 			</unit>
 			<unit type="angle-arc-second">
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="other">{0} mẫu</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="other">{0}ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="other">{0} m²</unitPattern>
 			</unit>
 			<unit type="area-square-mile">
 				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="other">{0} mẫu</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="other">{0}L/100km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>năm</displayName>
+				<unitPattern count="other">{0} năm</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>tháng</displayName>
+				<unitPattern count="other">{0} tháng</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>tuần</displayName>
+				<unitPattern count="other">{0} tuần</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>ngày</displayName>
 				<unitPattern count="other">{0} ngày</unitPattern>
@@ -7533,53 +7873,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>giờ</displayName>
 				<unitPattern count="other">{0} giờ</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="other">{0}ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>phút</displayName>
 				<unitPattern count="other">{0} phút</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>tháng</displayName>
-				<unitPattern count="other">{0} tháng</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>giây</displayName>
 				<unitPattern count="other">{0} giây</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>tuần</displayName>
-				<unitPattern count="other">{0} tuần</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>năm</displayName>
-				<unitPattern count="other">{0} năm</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="other">{0}cm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="other">{0}'</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="other">{0}&quot;</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="other">{0}ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
 				<unitPattern count="other">{0}km</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="other">{0}ly</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>m</displayName>
 				<unitPattern count="other">{0}m</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="other">{0}mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="other">{0}cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
@@ -7588,25 +7904,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="length-picometer">
 				<unitPattern count="other">{0}pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="other">{0}mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="other">{0}yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="other">{0}g</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="other">{0}'</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="other">{0}&quot;</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="other">{0}ly</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="other">{0}kg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="other">{0}oz</unitPattern>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="other">{0}g</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="other">{0}lb</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="other">{0}hp</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="other">{0}oz</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="other">{0}kW</unitPattern>
@@ -7614,6 +7939,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="power-watt">
 				<unitPattern count="other">{0}W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="other">{0}hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="other">{0}hPa</unitPattern>
 			</unit>
@@ -7648,8 +7976,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="volume-liter">
 				<displayName>l</displayName>
-				<unitPattern count="other">{0}l</unitPattern>
+				<unitPattern count="other">{0}L</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vi_VN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vi_VN.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vi_VN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vi_VN.xml
index 4f65aaac42e..e04d869de50 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vi_VN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vi_VN.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="vi"/>
 		<territory type="VN"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vo.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vo.xml
new file mode 100644
index 00000000000..5e96ac636e9
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vo.xml
@@ -0,0 +1,388 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2014 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12319 $"/>
+		<language type="vo"/>
+	</identity>
+	<localeDisplayNames>
+		<languages>
+			<language type="de" draft="unconfirmed">Deutänapük</language>
+			<language type="en" draft="unconfirmed">Linglänapük</language>
+			<language type="eo" draft="unconfirmed">Sperantapük</language>
+			<language type="es" draft="unconfirmed">Spanyänapük</language>
+			<language type="fr" draft="unconfirmed">Fransänapük</language>
+			<language type="it" draft="unconfirmed">Litaliyänapük</language>
+			<language type="ja" draft="unconfirmed">Yapänapük</language>
+			<language type="pt" draft="unconfirmed">Portugänapük</language>
+			<language type="ru" draft="unconfirmed">Rusänapük</language>
+			<language type="vo" draft="unconfirmed">Volapük</language>
+			<language type="zh" draft="unconfirmed">Tsyinänapük</language>
+		</languages>
+		<territories>
+			<territory type="BR" draft="unconfirmed">Brasilän</territory>
+			<territory type="CN" draft="unconfirmed">Tsyinän</territory>
+			<territory type="DE" draft="unconfirmed">Deutän</territory>
+			<territory type="ES" draft="unconfirmed">Spanyän</territory>
+			<territory type="FR" draft="unconfirmed">Fransän</territory>
+			<territory type="GB" draft="unconfirmed">Regän Pebalöl</territory>
+			<territory type="GE" draft="unconfirmed">Grusiyän</territory>
+			<territory type="GR" draft="unconfirmed">Grikän</territory>
+			<territory type="IN" draft="unconfirmed">Lindän</territory>
+			<territory type="IT" draft="unconfirmed">Litaliyän</territory>
+			<territory type="JP" draft="unconfirmed">Yapän</territory>
+			<territory type="MX" draft="unconfirmed">Mäxikän</territory>
+			<territory type="NR" draft="unconfirmed">Naureän</territory>
+			<territory type="PT" draft="unconfirmed">Portugän</territory>
+			<territory type="PW" draft="unconfirmed">Palauäns</territory>
+			<territory type="RU" draft="unconfirmed">Rusän</territory>
+			<territory type="US" draft="unconfirmed">Lamerikän</territory>
+		</territories>
+		<codePatterns>
+			<codePattern type="language" draft="unconfirmed">Pük: {0}</codePattern>
+			<codePattern type="territory" draft="unconfirmed">Topäd: {0}</codePattern>
+		</codePatterns>
+	</localeDisplayNames>
+	<characters>
+		<exemplarCharacters>[a ä b c d e f g h i j k l m n o ö p r s t u ü v x y z]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[q w]</exemplarCharacters>
+		<exemplarCharacters type="index">[A Ä B C D E F G H I J K L M N O Ö P R S T U Ü V X Y Z]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐ – — , ; \: ! ? . … ' ‘ ’ &quot; “ ” « » ( ) \[ \] \{ \} § @ * / \&amp; #]</exemplarCharacters>
+		<ellipsis type="final" draft="unconfirmed">{0}…</ellipsis>
+		<ellipsis type="initial" draft="unconfirmed">… {0}</ellipsis>
+		<ellipsis type="medial" draft="unconfirmed">{0} … {1}</ellipsis>
+	</characters>
+	<delimiters>
+		<quotationStart draft="unconfirmed">“</quotationStart>
+		<quotationEnd draft="unconfirmed">”</quotationEnd>
+		<alternateQuotationStart draft="unconfirmed">‘</alternateQuotationStart>
+		<alternateQuotationEnd draft="unconfirmed">’</alternateQuotationEnd>
+	</delimiters>
+	<dates>
+		<calendars>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern draft="unconfirmed">G y MMMM'a' 'd'. d'id'</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern draft="unconfirmed">G y MMMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern draft="unconfirmed">G y MMM. d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern draft="unconfirmed">GGGGG y-MM-dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="unconfirmed">yan</month>
+							<month type="2" draft="unconfirmed">feb</month>
+							<month type="3" draft="unconfirmed">mäz</month>
+							<month type="4" draft="unconfirmed">prl</month>
+							<month type="5" draft="unconfirmed">may</month>
+							<month type="6" draft="unconfirmed">yun</month>
+							<month type="7" draft="unconfirmed">yul</month>
+							<month type="8" draft="unconfirmed">gst</month>
+							<month type="9" draft="unconfirmed">set</month>
+							<month type="10" draft="unconfirmed">ton</month>
+							<month type="11" draft="unconfirmed">nov</month>
+							<month type="12" draft="unconfirmed">dek</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="unconfirmed">Y</month>
+							<month type="2" draft="unconfirmed">F</month>
+							<month type="3" draft="unconfirmed">M</month>
+							<month type="4" draft="unconfirmed">P</month>
+							<month type="5" draft="unconfirmed">M</month>
+							<month type="6" draft="unconfirmed">Y</month>
+							<month type="7" draft="unconfirmed">Y</month>
+							<month type="8" draft="unconfirmed">G</month>
+							<month type="9" draft="unconfirmed">S</month>
+							<month type="10" draft="unconfirmed">T</month>
+							<month type="11" draft="unconfirmed">N</month>
+							<month type="12" draft="unconfirmed">D</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">yanul</month>
+							<month type="2" draft="unconfirmed">febul</month>
+							<month type="3" draft="unconfirmed">mäzul</month>
+							<month type="4" draft="unconfirmed">prilul</month>
+							<month type="5" draft="unconfirmed">mayul</month>
+							<month type="6" draft="unconfirmed">yunul</month>
+							<month type="7" draft="unconfirmed">yulul</month>
+							<month type="8" draft="unconfirmed">gustul</month>
+							<month type="9" draft="unconfirmed">setul</month>
+							<month type="10" draft="unconfirmed">tobul</month>
+							<month type="11" draft="unconfirmed">novul</month>
+							<month type="12" draft="unconfirmed">dekul</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="unconfirmed">yan</month>
+							<month type="2" draft="unconfirmed">feb</month>
+							<month type="3" draft="unconfirmed">mäz</month>
+							<month type="4" draft="unconfirmed">prl</month>
+							<month type="5" draft="unconfirmed">may</month>
+							<month type="6" draft="unconfirmed">yun</month>
+							<month type="7" draft="unconfirmed">yul</month>
+							<month type="8" draft="unconfirmed">gst</month>
+							<month type="9" draft="unconfirmed">set</month>
+							<month type="10" draft="unconfirmed">tob</month>
+							<month type="11" draft="unconfirmed">nov</month>
+							<month type="12" draft="unconfirmed">dek</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="unconfirmed">Y</month>
+							<month type="2" draft="unconfirmed">F</month>
+							<month type="3" draft="unconfirmed">M</month>
+							<month type="4" draft="unconfirmed">P</month>
+							<month type="5" draft="unconfirmed">M</month>
+							<month type="6" draft="unconfirmed">Y</month>
+							<month type="7" draft="unconfirmed">Y</month>
+							<month type="8" draft="unconfirmed">G</month>
+							<month type="9" draft="unconfirmed">S</month>
+							<month type="10" draft="unconfirmed">T</month>
+							<month type="11" draft="unconfirmed">N</month>
+							<month type="12" draft="unconfirmed">D</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">yanul</month>
+							<month type="2" draft="unconfirmed">febul</month>
+							<month type="3" draft="unconfirmed">mäzul</month>
+							<month type="4" draft="unconfirmed">prilul</month>
+							<month type="5" draft="unconfirmed">mayul</month>
+							<month type="6" draft="unconfirmed">yunul</month>
+							<month type="7" draft="unconfirmed">yulul</month>
+							<month type="8" draft="unconfirmed">gustul</month>
+							<month type="9" draft="unconfirmed">setul</month>
+							<month type="10" draft="unconfirmed">tobul</month>
+							<month type="11" draft="unconfirmed">novul</month>
+							<month type="12" draft="unconfirmed">dekul</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="abbreviated">
+							<day type="sun" draft="unconfirmed">su.</day>
+							<day type="mon" draft="unconfirmed">mu.</day>
+							<day type="tue" draft="unconfirmed">tu.</day>
+							<day type="wed" draft="unconfirmed">ve.</day>
+							<day type="thu" draft="unconfirmed">dö.</day>
+							<day type="fri" draft="unconfirmed">fr.</day>
+							<day type="sat" draft="unconfirmed">zä.</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun" draft="unconfirmed">sudel</day>
+							<day type="mon" draft="unconfirmed">mudel</day>
+							<day type="tue" draft="unconfirmed">tudel</day>
+							<day type="wed" draft="unconfirmed">vedel</day>
+							<day type="thu" draft="unconfirmed">dödel</day>
+							<day type="fri" draft="unconfirmed">fridel</day>
+							<day type="sat" draft="unconfirmed">zädel</day>
+						</dayWidth>
+					</dayContext>
+					<dayContext type="stand-alone">
+						<dayWidth type="abbreviated">
+							<day type="sun" draft="unconfirmed">Su</day>
+							<day type="mon" draft="unconfirmed">Mu</day>
+							<day type="tue" draft="unconfirmed">Tu</day>
+							<day type="wed" draft="unconfirmed">Ve</day>
+							<day type="thu" draft="unconfirmed">Dö</day>
+							<day type="fri" draft="unconfirmed">Fr</day>
+							<day type="sat" draft="unconfirmed">Zä</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun" draft="unconfirmed">S</day>
+							<day type="mon" draft="unconfirmed">M</day>
+							<day type="tue" draft="unconfirmed">T</day>
+							<day type="wed" draft="unconfirmed">V</day>
+							<day type="thu" draft="unconfirmed">D</day>
+							<day type="fri" draft="unconfirmed">F</day>
+							<day type="sat" draft="unconfirmed">Z</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun" draft="unconfirmed">sudel</day>
+							<day type="mon" draft="unconfirmed">mudel</day>
+							<day type="tue" draft="unconfirmed">tudel</day>
+							<day type="wed" draft="unconfirmed">vedel</day>
+							<day type="thu" draft="unconfirmed">dödel</day>
+							<day type="fri" draft="unconfirmed">fridel</day>
+							<day type="sat" draft="unconfirmed">zädel</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<quarters>
+					<quarterContext type="format">
+						<quarterWidth type="abbreviated">
+							<quarter type="1" draft="unconfirmed">Yf1</quarter>
+							<quarter type="2" draft="unconfirmed">Yf2</quarter>
+							<quarter type="3" draft="unconfirmed">Yf3</quarter>
+							<quarter type="4" draft="unconfirmed">Yf4</quarter>
+						</quarterWidth>
+						<quarterWidth type="narrow">
+							<quarter type="1" draft="unconfirmed">1</quarter>
+							<quarter type="2" draft="unconfirmed">2</quarter>
+							<quarter type="3" draft="unconfirmed">3</quarter>
+							<quarter type="4" draft="unconfirmed">4</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1" draft="unconfirmed">1id yelafoldil</quarter>
+							<quarter type="2" draft="unconfirmed">2id yelafoldil</quarter>
+							<quarter type="3" draft="unconfirmed">3id yelafoldil</quarter>
+							<quarter type="4" draft="unconfirmed">4id yelafoldil</quarter>
+						</quarterWidth>
+					</quarterContext>
+				</quarters>
+				<eras>
+					<eraNames>
+						<era type="0" draft="unconfirmed">b. t. kr.</era>
+						<era type="1" draft="unconfirmed">p. t. kr.</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0" draft="unconfirmed">b. t. kr.</era>
+						<era type="1" draft="unconfirmed">p. t. kr.</era>
+					</eraAbbr>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern draft="unconfirmed">y MMMM'a' 'd'. d'id'</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern draft="unconfirmed">y MMMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern draft="unconfirmed">y MMM. d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern draft="unconfirmed">y-MM-dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern draft="unconfirmed">HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern draft="unconfirmed">HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern draft="unconfirmed">HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern draft="unconfirmed">HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="era">
+				<displayName draft="unconfirmed">Epoche</displayName>
+			</field>
+			<field type="year">
+				<displayName draft="unconfirmed">yel</displayName>
+				<relative type="-1" draft="unconfirmed">äyelo</relative>
+				<relative type="0" draft="unconfirmed">ayelo</relative>
+				<relative type="1" draft="unconfirmed">oyelo</relative>
+			</field>
+			<field type="month">
+				<displayName draft="unconfirmed">mul</displayName>
+				<relative type="-1" draft="unconfirmed">ämulo</relative>
+				<relative type="0" draft="unconfirmed">amulo</relative>
+				<relative type="1" draft="unconfirmed">omulo</relative>
+			</field>
+			<field type="week">
+				<displayName draft="unconfirmed">vig</displayName>
+				<relative type="-1" draft="unconfirmed">ävigo</relative>
+				<relative type="0" draft="unconfirmed">avigo</relative>
+				<relative type="1" draft="unconfirmed">ovigo</relative>
+			</field>
+			<field type="day">
+				<displayName draft="unconfirmed">Tag</displayName>
+				<relative type="-2" draft="unconfirmed">edelo</relative>
+				<relative type="-1" draft="unconfirmed">ädelo</relative>
+				<relative type="0" draft="unconfirmed">adelo</relative>
+				<relative type="1" draft="unconfirmed">odelo</relative>
+				<relative type="2" draft="unconfirmed">udelo</relative>
+			</field>
+			<field type="weekday">
+				<displayName draft="unconfirmed">vodabel</displayName>
+			</field>
+			<field type="dayperiod">
+				<displayName draft="unconfirmed">delalaf</displayName>
+			</field>
+			<field type="hour">
+				<displayName draft="unconfirmed">düp</displayName>
+			</field>
+			<field type="minute">
+				<displayName draft="unconfirmed">minut</displayName>
+			</field>
+			<field type="second">
+				<displayName draft="unconfirmed">sekun</displayName>
+			</field>
+			<field type="zone">
+				<displayName draft="unconfirmed">zon</displayName>
+			</field>
+		</fields>
+	</dates>
+	<units>
+		<unitLength type="long">
+			<unit type="duration-year">
+				<displayName draft="unconfirmed">yels</displayName>
+				<unitPattern count="one" draft="unconfirmed">yel {0}</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">yels {0}</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="unconfirmed">muls</displayName>
+				<unitPattern count="one" draft="unconfirmed">mul {0}</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">muls {0}</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="unconfirmed">vigs</displayName>
+			</unit>
+			<unit type="duration-day">
+				<displayName draft="unconfirmed">dels</displayName>
+			</unit>
+		</unitLength>
+	</units>
+	<posix>
+		<messages>
+			<yesstr draft="unconfirmed">si:s</yesstr>
+			<nostr draft="unconfirmed">no:n</nostr>
+		</messages>
+	</posix>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_001.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vo_001.xml
similarity index 72%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_001.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vo_001.xml
index 6380ead7b75..f429d885676 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/ar_001.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vo_001.xml
@@ -6,9 +6,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
-		<language type="ar"/>
+		<version number="$Revision: 11914 $"/>
+		<language type="vo"/>
 		<territory type="001"/>
 	</identity>
 </ldml>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vun.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vun.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vun.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vun.xml
index 65e10a2cc8f..9c81f3a37d8 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vun.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vun.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="vun"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antili za Uholanzi</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Ajentina</territory>
 			<territory type="AS">Samoa ya Marekani</territory>
@@ -448,6 +446,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">utuko</dayPeriod>
+							<dayPeriod type="pm">kyiukonyi</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">utuko</dayPeriod>
 							<dayPeriod type="pm">kyiukonyi</dayPeriod>
@@ -489,22 +491,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -578,6 +580,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -758,3 +788,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vun_TZ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vun_TZ.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vun_TZ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vun_TZ.xml
index 179c2e57f36..2883ecd7492 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/vun_TZ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vun_TZ.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="vun"/>
 		<territory type="TZ"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/wae.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/wae.xml
similarity index 96%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/wae.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/wae.xml
index 5f9f26264fd..6e477305869 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/wae.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/wae.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11093 $"/>
-		<generation date="$Date: 2015-01-02 21:36:02 -0600 (Fri, 02 Jan 2015) $"/>
+		<version number="$Revision: 12128 $"/>
 		<language type="wae"/>
 	</identity>
 	<localeDisplayNames>
@@ -230,7 +229,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI" draft="contributed">Anguilla</territory>
 			<territory type="AL" draft="contributed">Albanie</territory>
 			<territory type="AM" draft="contributed">Armenie</territory>
-			<territory type="AN" draft="contributed">Holändiši Antillä</territory>
 			<territory type="AO" draft="contributed">Angola</territory>
 			<territory type="AQ" draft="contributed">Antarktis</territory>
 			<territory type="AR" draft="contributed">Argentinie</territory>
@@ -487,10 +485,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="ZZ" draft="contributed">Unbekannti Regio</territory>
 		</territories>
 		<types>
-			<type type="ducet" key="collation" draft="contributed">Standard Unicode Sortierreiefolg</type>
-			<type type="gregorian" key="calendar" draft="contributed">Gregorianišä Kaländer</type>
-			<type type="latn" key="numbers" draft="contributed">Arabiši Zálä</type>
-			<type type="search" key="collation" draft="contributed">Allgmeini Süeč</type>
+			<type key="calendar" type="gregorian" draft="contributed">Gregorianišä Kaländer</type>
+			<type key="collation" type="ducet" draft="contributed">Standard Unicode Sortierreiefolg</type>
+			<type key="collation" type="search" draft="contributed">Allgmeini Süeč</type>
+			<type key="numbers" type="latn" draft="contributed">Arabiši Zálä</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric" draft="contributed">Metriš</measurementSystemName>
@@ -1238,6 +1236,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<group draft="contributed">’</group>
 		</symbols>
 		<currencyFormats numberSystem="latn">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤ 0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤ 00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤ 000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤ 0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤ 00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤ 000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤ 0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤ 00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤ 000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤ 0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤ 00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤ 000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
 			<unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -1277,7 +1303,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName draft="contributed">Rubel</displayName>
 				<displayName count="one" draft="contributed">Rubel</displayName>
 				<displayName count="other" draft="contributed">Rubel</displayName>
-				<symbol draft="contributed">руб</symbol>
 			</currency>
 			<currency type="USD">
 				<displayName draft="contributed">Dollar</displayName>
@@ -1294,6 +1319,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</numbers>
 	<units>
 		<unitLength type="long">
+			<unit type="duration-year">
+				<displayName draft="contributed">jár</displayName>
+				<unitPattern count="one">{0} jár</unitPattern>
+				<unitPattern count="other">{0} jár</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">mánet</displayName>
+				<unitPattern count="one">{0} mánet</unitPattern>
+				<unitPattern count="other">{0} mánet</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="contributed">wučä</displayName>
+				<unitPattern count="one">{0} wuča</unitPattern>
+				<unitPattern count="other">{0} wučä</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="contributed">täg</displayName>
 				<unitPattern count="one">{0} täg</unitPattern>
@@ -1309,28 +1349,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} minüta</unitPattern>
 				<unitPattern count="other">{0} minüte</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">mánet</displayName>
-				<unitPattern count="one">{0} mánet</unitPattern>
-				<unitPattern count="other">{0} mánet</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="contributed">sekunde</displayName>
 				<unitPattern count="one">{0} sekund</unitPattern>
 				<unitPattern count="other">{0} sekunde</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">wučä</displayName>
-				<unitPattern count="one">{0} wuča</unitPattern>
-				<unitPattern count="other">{0} wučä</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">jár</displayName>
-				<unitPattern count="one">{0} jár</unitPattern>
-				<unitPattern count="other">{0} jár</unitPattern>
-			</unit>
 		</unitLength>
 		<unitLength type="short">
+			<unit type="duration-year">
+				<displayName draft="contributed">jár</displayName>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">mánet</displayName>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="contributed">wučä</displayName>
+			</unit>
 			<unit type="duration-day">
 				<displayName draft="contributed">täg</displayName>
 			</unit>
@@ -1340,18 +1374,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="duration-minute">
 				<displayName draft="contributed">minüte</displayName>
 			</unit>
-			<unit type="duration-month">
-				<displayName draft="contributed">mánet</displayName>
-			</unit>
 			<unit type="duration-second">
 				<displayName draft="contributed">sekunde</displayName>
 			</unit>
-			<unit type="duration-week">
-				<displayName draft="contributed">wučä</displayName>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="contributed">jár</displayName>
-			</unit>
 		</unitLength>
 	</units>
 	<listPatterns>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/wae_CH.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/wae_CH.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/wae_CH.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/wae_CH.xml
index a10aa818dc7..18c50065c1a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/wae_CH.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/wae_CH.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="wae"/>
 		<territory type="CH"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/xog.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/xog.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/xog.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/xog.xml
index 8b97d74aa0f..2e9f1e924a6 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/xog.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/xog.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10739 $"/>
-		<generation date="$Date: 2014-08-07 12:54:13 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="xog"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Angwila</territory>
 			<territory type="AL">Alibaniya</territory>
 			<territory type="AM">Arameniya</territory>
-			<territory type="AN">Ebizinga bya Antile by’abaHolandi</territory>
 			<territory type="AO">Angola</territory>
 			<territory type="AR">Arigentina</territory>
 			<territory type="AS">Samowa omumerika</territory>
@@ -446,6 +444,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">Munkyo</dayPeriod>
+							<dayPeriod type="pm">Eigulo</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">Munkyo</dayPeriod>
 							<dayPeriod type="pm">Eigulo</dayPeriod>
@@ -487,22 +489,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>h:mm a</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -579,6 +581,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">0K ¤</pattern>
+					<pattern type="1000" count="other" draft="provisional">0K ¤</pattern>
+					<pattern type="10000" count="one" draft="provisional">00K ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K ¤</pattern>
+					<pattern type="100000" count="one" draft="provisional">000K ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K ¤</pattern>
+					<pattern type="1000000" count="one" draft="provisional">0M ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M ¤</pattern>
+					<pattern type="10000000" count="one" draft="provisional">00M ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M ¤</pattern>
+					<pattern type="100000000" count="one" draft="provisional">000M ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M ¤</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">0G ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G ¤</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">00G ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G ¤</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">000G ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G ¤</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">0T ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T ¤</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">00T ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T ¤</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">000T ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/xog_UG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/xog_UG.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/xog_UG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/xog_UG.xml
index da5c5b2aedf..dc6dca1c765 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/xog_UG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/xog_UG.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="xog"/>
 		<territory type="UG"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/yav.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yav.xml
similarity index 94%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/yav.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yav.xml
index dede047c0ee..397e8139441 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/yav.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yav.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="yav"/>
 	</identity>
 	<localeDisplayNames>
@@ -66,7 +65,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Aŋkíla</territory>
 			<territory type="AL">Alpaní</territory>
 			<territory type="AM">Almanía</territory>
-			<territory type="AN">andíiy u nitililáand</territory>
 			<territory type="AO">Aŋkúla</territory>
 			<territory type="AR">Alsaŋtín</territory>
 			<territory type="AS">Sámua u Amelíka</territory>
@@ -432,6 +430,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">kiɛmɛ́ɛm</dayPeriod>
+							<dayPeriod type="pm">kisɛ́ndɛ</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">kiɛmɛ́ɛm</dayPeriod>
 							<dayPeriod type="pm">kisɛ́ndɛ</dayPeriod>
@@ -587,6 +589,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">0K ¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K ¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K ¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M ¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M ¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M ¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G ¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G ¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G ¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T ¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T ¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AOA">
@@ -667,3 +685,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/yav_CM.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yav_CM.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/yav_CM.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yav_CM.xml
index 3a204d86c8c..449b346c4f8 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/yav_CM.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yav_CM.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="yav"/>
 		<territory type="CM"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/yi.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yi.xml
similarity index 90%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/yi.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yi.xml
index 4342c74a741..ba1985fc542 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/yi.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yi.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10741 $"/>
-		<generation date="$Date: 2014-08-07 13:24:47 -0500 (Thu, 07 Aug 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="yi"/>
 	</identity>
 	<localeDisplayNames>
@@ -27,7 +26,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="arc">אַראַמיש</language>
 			<language type="as">אַסאַמיש</language>
 			<language type="az">אַזערביידזשאַניש</language>
-			<language type="azb">דרום אַזערביידזשאַניש</language>
 			<language type="ban">באַלינעזיש</language>
 			<language type="bar">בײַעריש</language>
 			<language type="be">בעלאַרוסיש</language>
@@ -54,7 +52,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="enm">מיטל ענגליש</language>
 			<language type="eo">עספּעראַנטא</language>
 			<language type="es">שפּאַניש</language>
-			<language type="es_ES">שפּאַניש (ES)</language>
 			<language type="et">עסטיש</language>
 			<language type="eu">באַסקיש</language>
 			<language type="fa">פּערסיש</language>
@@ -151,8 +148,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">סומעריש</language>
 			<language type="sv">שוועדיש</language>
 			<language type="sw">סוואַהיליש</language>
+			<language type="sw_CD">קאנגא־סוואַהיליש</language>
 			<language type="swb">קאמאריש</language>
-			<language type="swc">קאנגא־סוואַהיליש</language>
 			<language type="szl">שלעזיש</language>
 			<language type="ta">טאַמיל</language>
 			<language type="tig">טיגרע</language>
@@ -175,6 +172,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Cyrl">ציריליש</script>
 			<script type="Deva">דעוואַנאַגאַרי</script>
 			<script type="Grek">גריכיש</script>
+			<script type="Hebr">Hebr</script>
 			<script type="Latn">גַלחיש</script>
 		</scripts>
 		<territories>
@@ -406,6 +404,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<keys>
 			<key type="numbers">נומערן</key>
 		</keys>
+		<types>
+			<type key="calendar" type="gregorian">גרעגארישער קאַלענדאַר</type>
+		</types>
+		<measurementSystemNames>
+			<measurementSystemName type="metric">מעטריש</measurementSystemName>
+		</measurementSystemNames>
 		<codePatterns>
 			<codePattern type="language">שפראַך: {0}</codePattern>
 			<codePattern type="script">שריפֿט: {0}</codePattern>
@@ -424,10 +428,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<exemplarCharacters type="punctuation" draft="contributed">[\- ‐ – — , ; \: ! ? . ׳ ' &quot; ( ) \[ \] / ״ ־]</exemplarCharacters>
 	</characters>
 	<delimiters>
-		<quotationStart draft="contributed">&quot;</quotationStart>
-		<quotationEnd draft="contributed">&quot;</quotationEnd>
-		<alternateQuotationStart draft="contributed">'</alternateQuotationStart>
-		<alternateQuotationEnd draft="contributed">'</alternateQuotationEnd>
+		<quotationStart draft="contributed">”</quotationStart>
+		<quotationEnd draft="contributed">”</quotationEnd>
+		<alternateQuotationStart draft="contributed">’</alternateQuotationStart>
+		<alternateQuotationEnd draft="contributed">’</alternateQuotationEnd>
 	</delimiters>
 	<dates>
 		<calendars>
@@ -457,7 +461,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern draft="provisional">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
@@ -648,7 +652,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="5">מיי</month>
 							<month type="6">יוני</month>
 							<month type="7">יולי</month>
-							<month type="8">אויגוסט</month>
+							<month type="8">אויג</month>
 							<month type="9">סעפּ</month>
 							<month type="10">אקט</month>
 							<month type="11">נאוו</month>
@@ -732,10 +736,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</days>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">פֿאַרמיטאָג</dayPeriod>
+							<dayPeriod type="pm">נאָכמיטאָג</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="am" draft="provisional">פארמיטאג</dayPeriod>
-							<dayPeriod type="noon">האַלבערטאָג</dayPeriod>
-							<dayPeriod type="pm" draft="provisional">נאכמיטאג</dayPeriod>
+							<dayPeriod type="am">פֿאַרמיטאָג</dayPeriod>
+							<dayPeriod type="pm">נאָכמיטאָג</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -786,22 +793,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern draft="provisional">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern draft="provisional">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern draft="provisional">{1}, {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern draft="provisional">{1}, {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
@@ -826,8 +833,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="Md" draft="provisional">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
 						<dateFormatItem id="MMM" draft="provisional">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd" draft="provisional">d בMMM</dateFormatItem>
-						<dateFormatItem id="MMMEd" draft="provisional">E, d בMMM</dateFormatItem>
+						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM d, E</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y" draft="provisional">y</dateFormatItem>
 						<dateFormatItem id="yM" draft="provisional">M.y</dateFormatItem>
@@ -1055,12 +1062,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern numbers="hebr">EEEE, d בMMMM y</pattern>
+							<pattern numbers="hebr">EEEE, d MMMM y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
-							<pattern numbers="hebr">d בMMMM y</pattern>
+							<pattern numbers="hebr">d MMMM y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
@@ -1178,8 +1185,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</calendar>
 		</calendars>
 		<fields>
+			<field type="era">
+				<displayName>תקופֿה</displayName>
+			</field>
 			<field type="year">
-				<displayName draft="provisional">יאָהר</displayName>
+				<displayName>יאָר</displayName>
 				<relative type="-1">פֿאַראַיאָר</relative>
 				<relative type="0">הײַ יאָר</relative>
 				<relative type="1">איבער א יאָר</relative>
@@ -1215,7 +1225,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="month">
-				<displayName draft="provisional">מאנאַט</displayName>
+				<displayName>מאנאַט</displayName>
 				<relative type="-1">פֿאַרגאנגענעם חודש</relative>
 				<relative type="0">דעם חודש</relative>
 				<relative type="1">קומענדיקן חודש</relative>
@@ -1252,6 +1262,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="week">
 				<displayName>וואך</displayName>
+				<relative type="-1">last week</relative>
+				<relative type="0">this week</relative>
 				<relative type="1">איבער אַכט טאָג</relative>
 			</field>
 			<field type="week-short">
@@ -1261,9 +1273,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>וואך</displayName>
 			</field>
 			<field type="day">
-				<displayName draft="provisional">טאג</displayName>
+				<displayName>טאָג</displayName>
 				<relative type="-1">נעכטן</relative>
-				<relative type="0" draft="provisional">היינט</relative>
+				<relative type="0">היינט</relative>
 				<relative type="1">מארגן</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">אין {0} טאָג אַרום</relativeTimePattern>
@@ -1279,9 +1291,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="weekday">
 				<displayName>טאָג אין דער וואך</displayName>
 			</field>
-			<field type="sun">
-				<relative type="1">קומענדיקן זונטיק</relative>
-			</field>
 			<field type="hour">
 				<displayName>שעה</displayName>
 			</field>
@@ -1315,7 +1324,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</fields>
 		<timeZoneNames>
 			<zone type="Etc/Unknown">
-				<exemplarCity draft="provisional">אומבאַוואוסטע שטאָט</exemplarCity>
+				<exemplarCity>אומבאַוואוסטע שטאָט</exemplarCity>
 			</zone>
 			<zone type="Africa/Abidjan">
 				<exemplarCity>אַבידזשאַן</exemplarCity>
@@ -1352,28 +1361,128 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<infinity draft="contributed">∞</infinity>
 			<nan draft="contributed">NaN</nan>
 		</symbols>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one" draft="provisional">¤ 0K</pattern>
+					<pattern type="1000" count="other" draft="provisional">¤ 0K</pattern>
+					<pattern type="10000" count="one" draft="provisional">¤ 00K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤ 00K</pattern>
+					<pattern type="100000" count="one" draft="provisional">¤ 000K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤ 000K</pattern>
+					<pattern type="1000000" count="one" draft="provisional">¤ 0M</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤ 0M</pattern>
+					<pattern type="10000000" count="one" draft="provisional">¤ 00M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤ 00M</pattern>
+					<pattern type="100000000" count="one" draft="provisional">¤ 000M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤ 000M</pattern>
+					<pattern type="1000000000" count="one" draft="provisional">¤ 0G</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤ 0G</pattern>
+					<pattern type="10000000000" count="one" draft="provisional">¤ 00G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤ 00G</pattern>
+					<pattern type="100000000000" count="one" draft="provisional">¤ 000G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤ 000G</pattern>
+					<pattern type="1000000000000" count="one" draft="provisional">¤ 0T</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤ 0T</pattern>
+					<pattern type="10000000000000" count="one" draft="provisional">¤ 00T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤ 00T</pattern>
+					<pattern type="100000000000000" count="one" draft="provisional">¤ 000T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencies>
+			<currency type="BRL">
+				<displayName>בראזיל רעאל</displayName>
+				<displayName count="one">בראזיל רעאל</displayName>
+				<displayName count="other">בראזיל רעאלן</displayName>
+			</currency>
 			<currency type="BZD">
 				<displayName>בעליז דאלאַר</displayName>
 			</currency>
 			<currency type="CHF">
 				<displayName>שווייצער פֿראַנק</displayName>
 			</currency>
+			<currency type="CNY">
+				<displayName>כינעזישער יואן</displayName>
+				<displayName count="one">כינעזישער יואן</displayName>
+				<displayName count="other">כינעזישע יואן</displayName>
+			</currency>
 			<currency type="EUR">
 				<displayName>איירא</displayName>
 				<displayName count="one">איירא</displayName>
 				<displayName count="other">איירא</displayName>
+				<symbol draft="contributed">€</symbol>
+				<symbol alt="narrow" draft="contributed">€</symbol>
+			</currency>
+			<currency type="GBP">
+				<displayName>פֿונט שטערלינג</displayName>
+				<displayName count="one">פֿונט שטערלינג</displayName>
+				<displayName count="other">פֿונט שטערלינג</displayName>
+				<symbol draft="contributed">£</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="INR">
+				<displayName>אינדישער רופי</displayName>
+				<displayName count="one">אינדישער רופי</displayName>
+				<displayName count="other">אינדישע רופי</displayName>
+				<symbol draft="contributed">₹</symbol>
+				<symbol alt="narrow" draft="contributed">₹</symbol>
+			</currency>
+			<currency type="JPY">
+				<displayName>יאפאנעזישער יען</displayName>
+				<displayName count="one">יאפאנעזישער יען</displayName>
+				<displayName count="other">יאפאנעזישע יען</displayName>
+				<symbol draft="contributed">JP¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
+			</currency>
+			<currency type="RUB">
+				<displayName>רוסישער רובל</displayName>
+				<displayName count="one">רוסישער רובל</displayName>
+				<displayName count="other">רוסישע רובל</displayName>
+				<symbol draft="contributed">RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="SEK">
 				<displayName>שוועדישע קראנע</displayName>
 			</currency>
+			<currency type="USD">
+				<displayName>אמעריקאנער דאלאר</displayName>
+				<displayName count="one">אמעריקאנער דאלאר</displayName>
+				<displayName count="other">אמעריקאנער דאלארן</displayName>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
 			<currency type="XAG">
 				<displayName>זילבער</displayName>
 			</currency>
 			<currency type="XAU">
 				<displayName>גאלד</displayName>
 			</currency>
+			<currency type="XXX">
+				<displayName>אומבאַוואוסטע וואַלוטע</displayName>
+				<displayName count="one">אומבאַוואוסטע וואַלוטע</displayName>
+				<displayName count="other">אומבאַוואוסטע וואַלוטע</displayName>
+			</currency>
 		</currencies>
 	</numbers>
+	<units>
+		<durationUnit type="hm">
+			<durationUnitPattern>h:mm</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="hms">
+			<durationUnitPattern>h:mm:ss</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="ms">
+			<durationUnitPattern>m:ss</durationUnitPattern>
+		</durationUnit>
+	</units>
+	<listPatterns>
+		<listPattern>
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0} און {1}</listPatternPart>
+			<listPatternPart type="2">{0} און {1}</listPatternPart>
+		</listPattern>
+	</listPatterns>
 </ldml>
 
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/yi_001.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yi_001.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/yi_001.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yi_001.xml
index 0a42aadaaf1..a57e901fecf 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/yi_001.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yi_001.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10671 $"/>
-		<generation date="$Date: 2014-07-23 17:52:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="yi"/>
 		<territory type="001"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/yo.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yo.xml
similarity index 95%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/yo.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yo.xml
index 453fa1b90a2..7fcda098cc2 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/yo.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yo.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="yo"/>
 	</identity>
 	<localeDisplayNames>
@@ -119,7 +118,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Orílẹ́ède Ààngúlílà</territory>
 			<territory type="AL">Orílẹ́ède Àlùbàníánì</territory>
 			<territory type="AM">Orílẹ́ède Améníà</territory>
-			<territory type="AN">Orílẹ́ède Nedalandi ti Antelisi</territory>
 			<territory type="AO">Orílẹ́ède Ààngólà</territory>
 			<territory type="AR">Orílẹ́ède Agentínà</territory>
 			<territory type="AS">Sámóánì ti Orílẹ́ède Àméríkà</territory>
@@ -343,7 +341,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 	<characters>
 		<exemplarCharacters>[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]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[c q v x z]</exemplarCharacters>
-		<exemplarCharacters type="index">[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]</exemplarCharacters>
+		<exemplarCharacters type="index">[A B D E F G H I J K L M N O P R S T U W Y]</exemplarCharacters>
 	</characters>
 	<delimiters>
 		<quotationStart>“</quotationStart>
@@ -475,6 +473,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">Àárọ̀</dayPeriod>
+							<dayPeriod type="pm">Ọ̀sán</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">Àárọ̀</dayPeriod>
 							<dayPeriod type="pm">Ọ̀sán</dayPeriod>
@@ -613,6 +615,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">¤0K</pattern>
+					<pattern type="10000" count="other" draft="provisional">¤00K</pattern>
+					<pattern type="100000" count="other" draft="provisional">¤000K</pattern>
+					<pattern type="1000000" count="other" draft="provisional">¤0M</pattern>
+					<pattern type="10000000" count="other" draft="provisional">¤00M</pattern>
+					<pattern type="100000000" count="other" draft="provisional">¤000M</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">¤0G</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">¤00G</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">¤000G</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">¤0T</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">¤00T</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -793,3 +811,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/yo_BJ.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yo_BJ.xml
similarity index 69%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/yo_BJ.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yo_BJ.xml
index c2084f7a504..2edd819a3e8 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/yo_BJ.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yo_BJ.xml
@@ -1,115 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2015 Unicode, Inc.
+<!-- Copyright © 1991-2016 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11324 $"/>
-		<generation date="$Date: 2015-02-26 16:53:17 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 12417 $"/>
 		<language type="yo"/>
 		<territory type="BJ"/>
 	</identity>
 	<localeDisplayNames>
 		<languages>
-			<language type="af">Èdè Afrikani</language>
-			<language type="ak">Èdè Akani</language>
-			<language type="am">Èdè Amariki</language>
-			<language type="ar">Èdè Arabiki</language>
-			<language type="as">Ti Assam</language>
-			<language type="az">Èdè Azerbaijani</language>
-			<language type="be">Èdè Belarusi</language>
-			<language type="bg">Èdè Bugaria</language>
-			<language type="bn">Èdè Bengali</language>
-			<language type="br">Èdè Bretoni</language>
-			<language type="bs">Èdè Bosnia</language>
-			<language type="ca">Èdè Catala</language>
-			<language type="cs">Èdè seeki</language>
-			<language type="cy">Èdè Welshi</language>
 			<language type="da">Èdè Ilɛ̀ Denmark</language>
 			<language type="de">Èdè Ilɛ̀ Gemani</language>
-			<language type="el">Èdè Giriki</language>
 			<language type="en">Èdè Gɛ̀ɛ́sì</language>
-			<language type="eo">Èdè Esperanto</language>
-			<language type="es">Èdè Sipanisi</language>
-			<language type="et">Èdè Estonia</language>
-			<language type="eu">Èdè Baski</language>
-			<language type="fa">Èdè Pasia</language>
-			<language type="fi">Èdè Finisi</language>
-			<language type="fil">Èdè Tagalogi</language>
-			<language type="fo">Èdè Faroesi</language>
-			<language type="fr">Èdè Faransé</language>
-			<language type="fy">Èdè Frisia</language>
-			<language type="ga">Èdè Ireland</language>
-			<language type="gd">Èdè Gaelik ti Ilu Scotland</language>
-			<language type="gl">Èdè Galicia</language>
-			<language type="gn">Èdè Guarani</language>
-			<language type="gu">Èdè Gujarati</language>
-			<language type="ha">Èdè Hausa</language>
-			<language type="he">Èdè Heberu</language>
-			<language type="hi">Èdè Hindi</language>
-			<language type="hr">Èdè Kroatia</language>
-			<language type="hu">Èdè Hungaria</language>
-			<language type="hy">Èdè Ile Armenia</language>
-			<language type="ia">Èdè pipo</language>
-			<language type="id">Èdè Indonasia</language>
-			<language type="ie">Iru Èdè</language>
-			<language type="ig">Èdè Ibo</language>
-			<language type="is">Èdè Icelandic</language>
-			<language type="it">Èdè Italiani</language>
-			<language type="ja">Èdè Japanisi</language>
-			<language type="jv">Èdè Javanasi</language>
-			<language type="ka">Èdè Georgia</language>
-			<language type="km">Èdè kameri</language>
-			<language type="kn">Èdè Kannada</language>
-			<language type="ko">Èdè Koria</language>
-			<language type="la">Èdè Latini</language>
-			<language type="lt">Èdè Lithuania</language>
-			<language type="lv">Èdè Latvianu</language>
-			<language type="mk">Èdè Macedonia</language>
-			<language type="mr">Èdè marathi</language>
-			<language type="ms">Èdè Malaya</language>
-			<language type="mt">Èdè Malta</language>
-			<language type="my">Èdè Bumiisi</language>
-			<language type="ne">Èdè Nepali</language>
-			<language type="nl">Èdè Duki</language>
-			<language type="no">Èdè Norway</language>
-			<language type="oc">Èdè Occitani</language>
-			<language type="pa">Èdè Punjabi</language>
 			<language type="pl">Èdè Ilɛ̀ Polandi</language>
 			<language type="pt">Èdè Pɔtugi</language>
-			<language type="ro">Èdè Romania</language>
 			<language type="ru">Èdè ̣Rɔɔsia</language>
-			<language type="rw">Èdè Ruwanda</language>
-			<language type="sa">Èdè awon ara Indo</language>
-			<language type="sd">Èdè Sindhi</language>
-			<language type="sh">Èdè Serbo-Croatiani</language>
-			<language type="si">Èdè Sinhalese</language>
-			<language type="sk">Èdè Slovaki</language>
-			<language type="sl">Èdè Slovenia</language>
-			<language type="so">Èdè ara Somalia</language>
-			<language type="sq">Èdè Albania</language>
-			<language type="sr">Èdè Serbia</language>
-			<language type="st">Èdè Sesoto</language>
-			<language type="su">Èdè Sudani</language>
-			<language type="sv">Èdè Suwidiisi</language>
-			<language type="sw">Èdè Swahili</language>
-			<language type="ta">Èdè Tamili</language>
-			<language type="te">Èdè Telugu</language>
-			<language type="th">Èdè Tai</language>
-			<language type="ti">Èdè Tigrinya</language>
-			<language type="tk">Èdè Turkmen</language>
-			<language type="tlh">Èdè Klingoni</language>
 			<language type="tr">Èdè Tɔɔkisi</language>
-			<language type="uk">Èdè Ukania</language>
-			<language type="ur">Èdè Udu</language>
-			<language type="uz">Èdè Uzbek</language>
-			<language type="vi">Èdè Jetinamu</language>
-			<language type="xh">Èdè Xhosa</language>
-			<language type="yi">Èdè Yiddishi</language>
-			<language type="yo">Èdè Yorùbá</language>
-			<language type="zh">Èdè Mandari</language>
 			<language type="zu">Èdè Shulu</language>
 		</languages>
 		<territories>
@@ -120,7 +29,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">Orílɛ́ède Ààngúlílà</territory>
 			<territory type="AL">Orílɛ́ède Àlùbàníánì</territory>
 			<territory type="AM">Orílɛ́ède Améníà</territory>
-			<territory type="AN">Orílɛ́ède Nedalandi ti Antelisi</territory>
 			<territory type="AO">Orílɛ́ède Ààngólà</territory>
 			<territory type="AR">Orílɛ́ède Agentínà</territory>
 			<territory type="AS">Sámóánì ti Orílɛ́ède Àméríkà</territory>
@@ -300,7 +208,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="SN">Orílɛ́ède Sɛnɛga</territory>
 			<territory type="SO">Orílɛ́ède Somalia</territory>
 			<territory type="SR">Orílɛ́ède Surinami</territory>
-			<territory type="SS" draft="provisional">Gúúsù Sudan</territory>
 			<territory type="ST">Orílɛ́ède Sao tomi ati piriishipi</territory>
 			<territory type="SV">Orílɛ́ède Ɛɛsáfádò</territory>
 			<territory type="SY">Orílɛ́ède Siria</territory>
@@ -343,66 +250,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</localeDisplayNames>
 	<characters>
 		<exemplarCharacters>[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]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[c q v x z]</exemplarCharacters>
-		<exemplarCharacters type="index">[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]</exemplarCharacters>
 	</characters>
-	<delimiters>
-		<quotationStart>“</quotationStart>
-		<quotationEnd>”</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
 	<dates>
 		<calendars>
-			<calendar type="generic">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/y GGGGG</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="hm">h:mm a</dateFormatItem>
-						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
-						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">M/d</dateFormatItem>
-						<dateFormatItem id="MEd">E, M/d</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E, MMMM d</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M/y</dateFormatItem>
-						<dateFormatItem id="yMEd">E, M/d/y</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">E, MMM d, y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
 			<calendar type="gregorian">
 				<months>
 					<monthContext type="format">
@@ -460,12 +310,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</days>
 				<quarters>
 					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">K1</quarter>
-							<quarter type="2">K2</quarter>
-							<quarter type="3">K3</quarter>
-							<quarter type="4">K4</quarter>
-						</quarterWidth>
 						<quarterWidth type="wide">
 							<quarter type="1">Kɔ́tà Kínní</quarter>
 							<quarter type="2">Kɔ́tà Kejì</quarter>
@@ -476,103 +320,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">Àárɔ̀</dayPeriod>
+							<dayPeriod type="pm">Ɔ̀sán</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">Àárɔ̀</dayPeriod>
 							<dayPeriod type="pm">Ɔ̀sán</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
-				<eras>
-					<eraNames>
-						<era type="0">Saju Kristi</era>
-						<era type="1">Lehin Kristi</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">SK</era>
-						<era type="1">LK</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="hm">h:mm a</dateFormatItem>
-						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
-						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">M/d</dateFormatItem>
-						<dateFormatItem id="MEd">E, M/d</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E, MMMM d</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M/y</dateFormatItem>
-						<dateFormatItem id="yMEd">E, M/d/y</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">E, MMM d, y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
 			</calendar>
 		</calendars>
 		<fields>
-			<field type="era">
-				<displayName>Ìgbà</displayName>
-			</field>
 			<field type="year">
 				<displayName>Ɔdún</displayName>
 			</field>
-			<field type="month">
-				<displayName>Osù</displayName>
-			</field>
 			<field type="week">
 				<displayName>Ɔ̀sè</displayName>
 			</field>
@@ -590,31 +353,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="dayperiod">
 				<displayName>Àárɔ̀/ɔ̀sán</displayName>
 			</field>
-			<field type="hour">
-				<displayName>wákàtí</displayName>
-			</field>
 			<field type="minute">
 				<displayName>Ìsɛ́jú</displayName>
 			</field>
 			<field type="second">
 				<displayName>Ìsɛ́jú Ààyá</displayName>
 			</field>
-			<field type="zone">
-				<displayName>Ibi Àkókò Àgbáyé</displayName>
-			</field>
 		</fields>
 	</dates>
 	<numbers>
-		<currencyFormats numberSystem="latn">
-			<currencyFormatLength>
-				<currencyFormat type="standard">
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-				<currencyFormat type="accounting">
-					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
 		<currencies>
 			<currency type="AED">
 				<displayName>Diami ti Awon Orílɛ́ède Arabu</displayName>
@@ -664,9 +411,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="ETB">
 				<displayName>Biri ti Orílɛ́ède Eutopia</displayName>
 			</currency>
-			<currency type="EUR">
-				<displayName>Uro</displayName>
-			</currency>
 			<currency type="GBP">
 				<displayName>Pɔɔn ti Orílɛ́ède Bírítísì</displayName>
 			</currency>
@@ -723,7 +467,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="NGN">
 				<displayName>Naira ti Orílɛ́ède Nàìjíríà</displayName>
-				<symbol>₦</symbol>
 			</currency>
 			<currency type="RWF">
 				<displayName>Faransi ti Orílɛ́ède Ruwanda</displayName>
@@ -743,18 +486,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="SHP">
 				<displayName>Pɔɔun ti Orílɛ́ède ̣Elena</displayName>
 			</currency>
-			<currency type="SLL">
-				<displayName>Lioni</displayName>
-			</currency>
 			<currency type="SOS">
 				<displayName>Sile ti Orílɛ́ède Somali</displayName>
 			</currency>
 			<currency type="STD">
 				<displayName>Dobira ti Orílɛ́ède Sao tome Ati Pirisipe</displayName>
 			</currency>
-			<currency type="SZL">
-				<displayName>Lilangeni</displayName>
-			</currency>
 			<currency type="TND">
 				<displayName>Dina ti Orílɛ́ède Tunisia</displayName>
 			</currency>
@@ -794,3 +531,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/yo_NG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yo_NG.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/yo_NG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yo_NG.xml
index 83b7de86b70..1880d8e4bcf 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/yo_NG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yo_NG.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="yo"/>
 		<territory type="NG"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yue.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yue.xml
new file mode 100644
index 00000000000..1bddd1891bb
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yue.xml
@@ -0,0 +1,9556 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12347 $"/>
+		<language type="yue"/>
+	</identity>
+	<localeDisplayNames>
+		<localeDisplayPattern>
+			<localePattern>{0} ({1})</localePattern>
+			<localeSeparator>{0}，{1}</localeSeparator>
+			<localeKeyTypePattern>{0}：{1}</localeKeyTypePattern>
+		</localeDisplayPattern>
+		<languages>
+			<language type="aa">阿法文</language>
+			<language type="ab">阿布哈茲文</language>
+			<language type="ace">亞齊文</language>
+			<language type="ach">阿僑利文</language>
+			<language type="ada">阿當莫文</language>
+			<language type="ady">阿迪各文</language>
+			<language type="ae">阿緯斯陀文</language>
+			<language type="aeb" draft="contributed">突尼斯阿拉伯文</language>
+			<language type="af">南非荷蘭文</language>
+			<language type="afh">阿弗里希利文</language>
+			<language type="agq">亞罕文</language>
+			<language type="ain">阿伊努文</language>
+			<language type="ak">阿坎文</language>
+			<language type="akk">阿卡德文</language>
+			<language type="akz" draft="contributed">阿拉巴馬文</language>
+			<language type="ale">阿留申文</language>
+			<language type="aln" draft="contributed">蓋格阿爾巴尼亞文</language>
+			<language type="alt">南阿爾泰文</language>
+			<language type="am">阿姆哈拉文</language>
+			<language type="an">阿拉貢文</language>
+			<language type="ang">古英文</language>
+			<language type="anp">昂加文</language>
+			<language type="ar">阿拉伯文</language>
+			<language type="ar_001">現代標準阿拉伯文</language>
+			<language type="arc">阿拉米文</language>
+			<language type="arn">馬普切文</language>
+			<language type="aro" draft="contributed">阿拉奧納文</language>
+			<language type="arp">阿拉帕霍文</language>
+			<language type="arq" draft="contributed">阿爾及利亞阿拉伯文</language>
+			<language type="arw">阿拉瓦克文</language>
+			<language type="ary" draft="contributed">摩洛哥阿拉伯文</language>
+			<language type="arz" draft="contributed">埃及阿拉伯文</language>
+			<language type="as">阿薩姆文</language>
+			<language type="asa">阿蘇文</language>
+			<language type="ase" draft="contributed">美國手語</language>
+			<language type="ast">阿斯圖里亞文</language>
+			<language type="av">阿瓦爾文</language>
+			<language type="avk" draft="contributed">科塔瓦文</language>
+			<language type="awa">阿瓦文</language>
+			<language type="ay">艾馬拉文</language>
+			<language type="az">亞塞拜然文</language>
+			<language type="az" alt="short">亞塞拜然文</language>
+			<language type="ba">巴什客爾文</language>
+			<language type="bal">俾路支文</language>
+			<language type="ban">峇里文</language>
+			<language type="bar" draft="contributed">巴伐利亞文</language>
+			<language type="bas">巴薩文</language>
+			<language type="bax" draft="contributed">巴姆穆文</language>
+			<language type="bbc" draft="contributed">巴塔克托巴文</language>
+			<language type="bbj" draft="contributed">戈馬拉文</language>
+			<language type="be">白俄羅斯文</language>
+			<language type="bej">貝扎文</language>
+			<language type="bem">別姆巴文</language>
+			<language type="bew" draft="contributed">貝塔維文</language>
+			<language type="bez">貝納文</language>
+			<language type="bfd" draft="contributed">富特文</language>
+			<language type="bfq" draft="contributed">巴達加文</language>
+			<language type="bg">保加利亞文</language>
+			<language type="bgn">西俾路支文</language>
+			<language type="bho">博傑普爾文</language>
+			<language type="bi">比斯拉馬文</language>
+			<language type="bik">比科爾文</language>
+			<language type="bin">比尼文</language>
+			<language type="bjn" draft="contributed">班亞爾文</language>
+			<language type="bkm" draft="contributed">康姆文</language>
+			<language type="bla">錫克錫卡文</language>
+			<language type="bm">班巴拉文</language>
+			<language type="bn">孟加拉文</language>
+			<language type="bo">藏文</language>
+			<language type="bpy" draft="contributed">比什奴普萊利亞文</language>
+			<language type="bqi" draft="contributed">巴赫蒂亞里文</language>
+			<language type="br">布列塔尼文</language>
+			<language type="bra">布拉杰文</language>
+			<language type="brh" draft="contributed">布拉維文</language>
+			<language type="brx">博多文</language>
+			<language type="bs">波士尼亞文</language>
+			<language type="bss" draft="contributed">阿庫色文</language>
+			<language type="bua">布里阿特文</language>
+			<language type="bug">布吉斯文</language>
+			<language type="bum" draft="contributed">布魯文</language>
+			<language type="byn" draft="contributed">比林文</language>
+			<language type="byv" draft="contributed">梅敦巴文</language>
+			<language type="ca">加泰羅尼亞文</language>
+			<language type="cad">卡多文</language>
+			<language type="car" draft="contributed">加勒比文</language>
+			<language type="cay" draft="contributed">卡尤加文</language>
+			<language type="cch">阿燦文</language>
+			<language type="ce">車臣文</language>
+			<language type="ceb">宿霧文</language>
+			<language type="cgg">奇加文</language>
+			<language type="ch">查莫洛文</language>
+			<language type="chb">奇布查文</language>
+			<language type="chg">查加文</language>
+			<language type="chk">處奇斯文</language>
+			<language type="chm">馬里文</language>
+			<language type="chn">契奴克文</language>
+			<language type="cho">喬克托文</language>
+			<language type="chp">奇佩瓦揚文</language>
+			<language type="chr">柴羅基文</language>
+			<language type="chy">沙伊安文</language>
+			<language type="ckb">索拉尼庫爾德文</language>
+			<language type="co">科西嘉文</language>
+			<language type="cop">科普特文</language>
+			<language type="cps" draft="contributed">卡皮茲文</language>
+			<language type="cr">克裡文</language>
+			<language type="crh">克里米亞半島的土耳其文；克里米亞半島的塔塔爾文</language>
+			<language type="cs">捷克文</language>
+			<language type="csb">卡舒布文</language>
+			<language type="cu">宗教斯拉夫文</language>
+			<language type="cv">楚瓦什文</language>
+			<language type="cy">威爾斯文</language>
+			<language type="da">丹麥文</language>
+			<language type="dak">達科他文</language>
+			<language type="dar">達爾格瓦文</language>
+			<language type="dav">台塔文</language>
+			<language type="de">德文</language>
+			<language type="de_CH">高地德文（瑞士）</language>
+			<language type="del">德拉瓦文</language>
+			<language type="den">斯拉夫</language>
+			<language type="dgr">多格里布文</language>
+			<language type="din">丁卡文</language>
+			<language type="dje">扎爾馬文</language>
+			<language type="doi">多格來文</language>
+			<language type="dsb">下索布文</language>
+			<language type="dtp" draft="contributed">中部杜順文</language>
+			<language type="dua">杜亞拉文</language>
+			<language type="dum" draft="contributed">中古荷蘭文</language>
+			<language type="dv">迪維西文</language>
+			<language type="dyo">朱拉文</language>
+			<language type="dyu">迪尤拉文</language>
+			<language type="dz">宗卡文</language>
+			<language type="dzg" draft="contributed">達薩文</language>
+			<language type="ebu">恩布文</language>
+			<language type="ee">埃維文</language>
+			<language type="efi">埃菲克文</language>
+			<language type="egl" draft="contributed">埃米利安文</language>
+			<language type="egy">古埃及文</language>
+			<language type="eka">艾卡朱克文</language>
+			<language type="el">希臘文</language>
+			<language type="elx" draft="contributed">埃蘭文</language>
+			<language type="en">英文</language>
+			<language type="enm">中古英文</language>
+			<language type="eo">世界文</language>
+			<language type="es">西班牙文</language>
+			<language type="esu" draft="contributed">中尤皮克文</language>
+			<language type="et">愛沙尼亞文</language>
+			<language type="eu">巴斯克文</language>
+			<language type="ewo">依汪都文</language>
+			<language type="ext" draft="contributed">埃斯特雷馬杜拉文</language>
+			<language type="fa">波斯文</language>
+			<language type="fan">芳族文</language>
+			<language type="fat">芳蒂文</language>
+			<language type="ff">富拉文</language>
+			<language type="fi">芬蘭文</language>
+			<language type="fil">菲律賓文</language>
+			<language type="fit" draft="contributed">托爾訥芬蘭文</language>
+			<language type="fj">斐濟文</language>
+			<language type="fo">法羅文</language>
+			<language type="fon">豐文</language>
+			<language type="fr">法文</language>
+			<language type="frc" draft="contributed">卡真法文</language>
+			<language type="frm">中古法文</language>
+			<language type="fro">古法文</language>
+			<language type="frp" draft="contributed">法蘭克-普羅旺斯文</language>
+			<language type="frr">北弗里西亞文</language>
+			<language type="frs" draft="contributed">東弗里西亞文</language>
+			<language type="fur">弗留利文</language>
+			<language type="fy">西弗里西亞文</language>
+			<language type="ga">愛爾蘭文</language>
+			<language type="gaa">加族文</language>
+			<language type="gag">加告茲文</language>
+			<language type="gan" draft="contributed">贛語</language>
+			<language type="gay">加約文</language>
+			<language type="gba">葛巴亞文</language>
+			<language type="gbz" draft="contributed">索羅亞斯德教達里文</language>
+			<language type="gd">蘇格蘭蓋爾文</language>
+			<language type="gez">吉茲文</language>
+			<language type="gil">吉爾伯特群島文</language>
+			<language type="gl">加利西亞文</language>
+			<language type="glk" draft="contributed">吉拉基文</language>
+			<language type="gmh">中古高地德文</language>
+			<language type="gn">瓜拉尼文</language>
+			<language type="goh" draft="contributed">古高地日耳曼文</language>
+			<language type="gom" draft="contributed">孔卡尼文</language>
+			<language type="gon">岡德文</language>
+			<language type="gor">科隆達羅文</language>
+			<language type="got">哥德文</language>
+			<language type="grb">格列博文</language>
+			<language type="grc">古希臘文</language>
+			<language type="gsw">德文（瑞士）</language>
+			<language type="gu">古吉拉特文</language>
+			<language type="guc" draft="contributed">瓦尤文</language>
+			<language type="gur" draft="contributed">弗拉弗拉文</language>
+			<language type="guz">古西文</language>
+			<language type="gv">曼島文</language>
+			<language type="gwi">圭契文</language>
+			<language type="ha">豪撒文</language>
+			<language type="hai">海達文</language>
+			<language type="hak" draft="contributed">客家話</language>
+			<language type="haw">夏威夷文</language>
+			<language type="he">希伯來文</language>
+			<language type="hi">北印度文</language>
+			<language type="hif" draft="contributed">斐濟印地文</language>
+			<language type="hil">希利蓋農文</language>
+			<language type="hit">赫梯文</language>
+			<language type="hmn">孟文</language>
+			<language type="ho">西里莫圖土文</language>
+			<language type="hr">克羅埃西亞文</language>
+			<language type="hsb">上索布文</language>
+			<language type="hsn" draft="contributed">湘語</language>
+			<language type="ht">海地文</language>
+			<language type="hu">匈牙利文</language>
+			<language type="hup">胡帕文</language>
+			<language type="hy">亞美尼亞文</language>
+			<language type="hz">赫雷羅文</language>
+			<language type="ia">國際文</language>
+			<language type="iba">伊班文</language>
+			<language type="ibb" draft="contributed">伊比比奧文</language>
+			<language type="id">印尼文</language>
+			<language type="ie">國際文（E）</language>
+			<language type="ig">伊布文</language>
+			<language type="ii">四川彝文</language>
+			<language type="ik">依奴皮維克文</language>
+			<language type="ilo">伊洛闊文</language>
+			<language type="inh">印古什文</language>
+			<language type="io">伊多文</language>
+			<language type="is">冰島文</language>
+			<language type="it">義大利文</language>
+			<language type="iu">因紐特文</language>
+			<language type="izh" draft="contributed">英格裏亞文</language>
+			<language type="ja">日文</language>
+			<language type="jam" draft="contributed">牙買加克裏奧爾英文</language>
+			<language type="jbo">邏輯文</language>
+			<language type="jgo">恩格姆巴文</language>
+			<language type="jmc">馬恰美文</language>
+			<language type="jpr">猶太教-波斯文</language>
+			<language type="jrb">猶太阿拉伯文</language>
+			<language type="jut" draft="contributed">日德蘭文</language>
+			<language type="jv">爪哇文</language>
+			<language type="ka">喬治亞文</language>
+			<language type="kaa">卡拉卡爾帕克文</language>
+			<language type="kab">卡比爾文</language>
+			<language type="kac">卡琴文</language>
+			<language type="kaj" draft="contributed">卡捷文</language>
+			<language type="kam">卡姆巴文</language>
+			<language type="kaw">卡威文</language>
+			<language type="kbd">卡巴爾達文</language>
+			<language type="kbl" draft="contributed">卡念布文</language>
+			<language type="kcg" draft="contributed">卡塔布文</language>
+			<language type="kde">馬孔德文</language>
+			<language type="kea">卡布威爾第文</language>
+			<language type="ken" draft="contributed">肯揚文</language>
+			<language type="kfo">科羅文</language>
+			<language type="kg">剛果文</language>
+			<language type="kgp" draft="contributed">坎剛文</language>
+			<language type="kha">卡西文</language>
+			<language type="kho">和闐文</language>
+			<language type="khq">西桑海文</language>
+			<language type="khw" draft="contributed">科瓦文</language>
+			<language type="ki">吉庫尤文</language>
+			<language type="kiu" draft="contributed">北紮紮其文</language>
+			<language type="kj">廣亞馬文</language>
+			<language type="kk">哈薩克文</language>
+			<language type="kkj" draft="contributed">卡庫文</language>
+			<language type="kl">格陵蘭文</language>
+			<language type="kln">卡倫金文</language>
+			<language type="km">高棉文</language>
+			<language type="kmb">金邦杜文</language>
+			<language type="kn">坎那達文</language>
+			<language type="ko">韓文</language>
+			<language type="koi">科米-彼爾米亞克文</language>
+			<language type="kok">貢根文</language>
+			<language type="kos">科斯雷恩文</language>
+			<language type="kpe">克佩列文</language>
+			<language type="kr">卡努裡文</language>
+			<language type="krc">卡拉柴-包爾卡爾文</language>
+			<language type="kri" draft="contributed">塞拉利昂克裏奧爾文</language>
+			<language type="krj" draft="contributed">基那來阿文</language>
+			<language type="krl">卡累利阿文</language>
+			<language type="kru">庫魯科文</language>
+			<language type="ks">喀什米爾文</language>
+			<language type="ksb">尚巴拉文</language>
+			<language type="ksf">巴菲亞文</language>
+			<language type="ksh" draft="contributed">科隆文</language>
+			<language type="ku">庫爾德文</language>
+			<language type="kum">庫密克文</language>
+			<language type="kut">庫特奈文</language>
+			<language type="kv">科米文</language>
+			<language type="kw">康瓦耳文</language>
+			<language type="ky">吉爾吉斯文</language>
+			<language type="la">拉丁文</language>
+			<language type="lad">拉迪諾文</language>
+			<language type="lag">朗吉文</language>
+			<language type="lah">拉亨達文</language>
+			<language type="lam">蘭巴文</language>
+			<language type="lb">盧森堡文</language>
+			<language type="lez" draft="contributed">列茲干文</language>
+			<language type="lfn" draft="contributed">新共同語言</language>
+			<language type="lg">干達文</language>
+			<language type="li">林堡文</language>
+			<language type="lij" draft="contributed">利古里亞文</language>
+			<language type="liv" draft="contributed">利伏尼亞文</language>
+			<language type="lkt">拉科塔文</language>
+			<language type="lmo" draft="contributed">倫巴底文</language>
+			<language type="ln">林加拉文</language>
+			<language type="lo">寮文</language>
+			<language type="lol">芒戈文</language>
+			<language type="loz">洛齊文</language>
+			<language type="lrc">北盧爾文</language>
+			<language type="lt">立陶宛文</language>
+			<language type="ltg" draft="contributed">拉特加萊文</language>
+			<language type="lu">魯巴加丹加文</language>
+			<language type="lua">魯巴魯魯亞文</language>
+			<language type="lui">路易塞諾文</language>
+			<language type="lun">盧恩達文</language>
+			<language type="luo">盧奧文</language>
+			<language type="lus">盧晒文</language>
+			<language type="luy">盧雅文</language>
+			<language type="lv">拉脫維亞文</language>
+			<language type="lzh" draft="contributed">文言文</language>
+			<language type="lzz" draft="contributed">拉茲文</language>
+			<language type="mad">馬都拉文</language>
+			<language type="maf" draft="contributed">馬法文</language>
+			<language type="mag">馬加伊文</language>
+			<language type="mai">邁蒂利文</language>
+			<language type="mak">望加錫文</language>
+			<language type="man">曼丁哥文</language>
+			<language type="mas">馬賽文</language>
+			<language type="mde" draft="contributed">馬巴文</language>
+			<language type="mdf">莫克沙文</language>
+			<language type="mdr">曼達文</language>
+			<language type="men">門德文</language>
+			<language type="mer">梅魯文</language>
+			<language type="mfe">克里奧文（模里西斯）</language>
+			<language type="mg">馬拉加什文</language>
+			<language type="mga" draft="contributed">中古愛爾蘭文</language>
+			<language type="mgh">馬夸文</language>
+			<language type="mgo">美塔文</language>
+			<language type="mh">馬紹爾文</language>
+			<language type="mi">毛利文</language>
+			<language type="mic">米克馬克文</language>
+			<language type="min">米南卡堡文</language>
+			<language type="mk">馬其頓文</language>
+			<language type="ml">馬來亞拉姆文</language>
+			<language type="mn">蒙古文</language>
+			<language type="mnc">滿族文</language>
+			<language type="mni">曼尼普裡文</language>
+			<language type="moh">莫霍克文</language>
+			<language type="mos">莫西文</language>
+			<language type="mr">馬拉地文</language>
+			<language type="mrj" draft="contributed">西馬裏文</language>
+			<language type="ms">馬來文</language>
+			<language type="mt">馬爾他文</language>
+			<language type="mua">蒙當文</language>
+			<language type="mul">多種語言</language>
+			<language type="mus">克里克文</language>
+			<language type="mwl" draft="contributed">米蘭德斯文</language>
+			<language type="mwr">馬爾尼裡文</language>
+			<language type="mwv" draft="contributed">明打威文</language>
+			<language type="my">緬甸文</language>
+			<language type="mye" draft="contributed">姆耶內文</language>
+			<language type="myv">厄爾茲亞文</language>
+			<language type="mzn">馬贊德蘭文</language>
+			<language type="na">諾魯文</language>
+			<language type="nan" draft="contributed">閩南語</language>
+			<language type="nap">拿波里文</language>
+			<language type="naq">納馬文</language>
+			<language type="nb">巴克摩挪威文</language>
+			<language type="nd">北地畢列文</language>
+			<language type="nds">低地德文</language>
+			<language type="nds_NL">低地薩克遜文</language>
+			<language type="ne">尼泊爾文</language>
+			<language type="new">尼瓦爾文</language>
+			<language type="ng">恩東加文</language>
+			<language type="nia">尼亞斯文</language>
+			<language type="niu">紐埃文</language>
+			<language type="njo" draft="contributed">阿沃那加文</language>
+			<language type="nl">荷蘭文</language>
+			<language type="nl_BE">佛蘭芒文</language>
+			<language type="nmg">夸西奧文</language>
+			<language type="nn">耐諾斯克挪威文</language>
+			<language type="nnh" draft="contributed">恩甘澎文</language>
+			<language type="no">挪威文</language>
+			<language type="nog">諾蓋文</language>
+			<language type="non">古諾爾斯文</language>
+			<language type="nov" draft="contributed">諾維亞文</language>
+			<language type="nqo">曼德文字 (N’Ko)</language>
+			<language type="nr">南地畢列文</language>
+			<language type="nso">北索托文</language>
+			<language type="nus">努埃爾文</language>
+			<language type="nv">納瓦霍文</language>
+			<language type="nwc">古尼瓦爾文</language>
+			<language type="ny">尼揚賈文</language>
+			<language type="nym">尼揚韋齊文</language>
+			<language type="nyn">尼揚科萊文</language>
+			<language type="nyo">尼奧囉文</language>
+			<language type="nzi">尼茲馬文</language>
+			<language type="oc">奧克西坦文</language>
+			<language type="oj">奧杰布瓦文</language>
+			<language type="om">奧羅莫文</language>
+			<language type="or">歐利亞文</language>
+			<language type="os">奧塞提文</language>
+			<language type="osa">歐塞奇文</language>
+			<language type="ota">鄂圖曼土耳其文</language>
+			<language type="pa">旁遮普文</language>
+			<language type="pag">潘加辛文</language>
+			<language type="pal">巴列維文</language>
+			<language type="pam">潘帕嘉文</language>
+			<language type="pap">帕皮阿門托文</language>
+			<language type="pau">帛琉文</language>
+			<language type="pcd" draft="contributed">庇卡底文</language>
+			<language type="pdc" draft="contributed">賓夕法尼亞德文</language>
+			<language type="pdt" draft="contributed">門諾低地德文</language>
+			<language type="peo">古波斯文</language>
+			<language type="pfl" draft="contributed">普法爾茨德文</language>
+			<language type="phn">腓尼基文</language>
+			<language type="pi">巴利文</language>
+			<language type="pl">波蘭文</language>
+			<language type="pms" draft="contributed">皮埃蒙特文</language>
+			<language type="pnt" draft="contributed">旁狄希臘文</language>
+			<language type="pon">波那貝文</language>
+			<language type="prg" draft="contributed">普魯士文</language>
+			<language type="pro" draft="contributed">古普羅旺斯文</language>
+			<language type="ps">普什圖文</language>
+			<language type="pt">葡萄牙文</language>
+			<language type="qu">蓋楚瓦文</language>
+			<language type="quc">基切文</language>
+			<language type="qug" draft="contributed">欽博拉索海蘭蓋丘亞文</language>
+			<language type="raj">拉賈斯坦諸文</language>
+			<language type="rap">復活島文</language>
+			<language type="rar">拉羅通加文</language>
+			<language type="rgn" draft="contributed">羅馬格諾里文</language>
+			<language type="rif" draft="contributed">里菲亞諾文</language>
+			<language type="rm">羅曼斯文</language>
+			<language type="rn">隆迪文</language>
+			<language type="ro">羅馬尼亞文</language>
+			<language type="ro_MD">摩爾多瓦文</language>
+			<language type="rof">蘭博文</language>
+			<language type="rom">吉普賽文</language>
+			<language type="root">根語言</language>
+			<language type="rtm" draft="contributed">羅圖馬島文</language>
+			<language type="ru">俄文</language>
+			<language type="rue" draft="contributed">盧森尼亞文</language>
+			<language type="rug" draft="contributed">羅維阿納文</language>
+			<language type="rup">羅馬尼亞語系</language>
+			<language type="rw">盧安達文</language>
+			<language type="rwk">羅瓦文</language>
+			<language type="sa">梵文</language>
+			<language type="sad">桑達韋文</language>
+			<language type="sah">雅庫特文</language>
+			<language type="sam">薩瑪利亞阿拉姆文</language>
+			<language type="saq">薩布魯文</language>
+			<language type="sas">撒撒克文</language>
+			<language type="sat">散塔利文</language>
+			<language type="saz" draft="contributed">索拉什特拉文</language>
+			<language type="sba" draft="contributed">甘拜文</language>
+			<language type="sbp">桑古文</language>
+			<language type="sc">撒丁文</language>
+			<language type="scn">西西里文</language>
+			<language type="sco">蘇格蘭文</language>
+			<language type="sd">信德文</language>
+			<language type="sdc" draft="contributed">薩丁尼亞-薩薩里文</language>
+			<language type="sdh">南庫爾德文</language>
+			<language type="se">北方薩米文</language>
+			<language type="see" draft="contributed">塞訥卡文</language>
+			<language type="seh">賽納文</language>
+			<language type="sei" draft="contributed">瑟里文</language>
+			<language type="sel">瑟爾卡普文</language>
+			<language type="ses">東桑海文</language>
+			<language type="sg">桑戈文</language>
+			<language type="sga">古愛爾蘭文</language>
+			<language type="sgs" draft="contributed">薩莫吉希亞文</language>
+			<language type="sh">塞爾維亞克羅埃西亞文</language>
+			<language type="shi">希爾哈文</language>
+			<language type="shn">撣文</language>
+			<language type="shu" draft="contributed">阿拉伯文（查德）</language>
+			<language type="si">僧伽羅文</language>
+			<language type="sid">希達摩文</language>
+			<language type="sk">斯洛伐克文</language>
+			<language type="sl">斯洛維尼亞文</language>
+			<language type="sli" draft="contributed">下西利西亞文</language>
+			<language type="sly" draft="contributed">塞拉亞文</language>
+			<language type="sm">薩摩亞文</language>
+			<language type="sma">南薩米文</language>
+			<language type="smj">魯勒薩米文</language>
+			<language type="smn">伊納裡薩米文</language>
+			<language type="sms">斯科特薩米文</language>
+			<language type="sn">塞內加爾文</language>
+			<language type="snk">索尼基文</language>
+			<language type="so">索馬利文</language>
+			<language type="sog">索格底亞納文</language>
+			<language type="sq">阿爾巴尼亞文</language>
+			<language type="sr">塞爾維亞文</language>
+			<language type="srn" draft="contributed">蘇拉南東墎文</language>
+			<language type="srr">塞雷爾文</language>
+			<language type="ss">斯瓦特文</language>
+			<language type="ssy" draft="contributed">薩霍文</language>
+			<language type="st">塞索托文</language>
+			<language type="stq" draft="contributed">沙特菲士蘭文</language>
+			<language type="su">巽他文</language>
+			<language type="suk">蘇庫馬文</language>
+			<language type="sus">蘇蘇文</language>
+			<language type="sux">蘇美文</language>
+			<language type="sv">瑞典文</language>
+			<language type="sw">史瓦希里文</language>
+			<language type="sw_CD">史瓦希里文（剛果）</language>
+			<language type="swb">葛摩文</language>
+			<language type="syc">古敘利亞文</language>
+			<language type="syr">敘利亞文</language>
+			<language type="szl" draft="contributed">西利西亞文</language>
+			<language type="ta">坦米爾文</language>
+			<language type="tcy" draft="contributed">圖盧文</language>
+			<language type="te">泰盧固文</language>
+			<language type="tem">提姆文</language>
+			<language type="teo">特索文</language>
+			<language type="ter">泰雷諾文</language>
+			<language type="tet">泰頓文</language>
+			<language type="tg">塔吉克文</language>
+			<language type="th">泰文</language>
+			<language type="ti">提格利尼亞文</language>
+			<language type="tig">蒂格雷文</language>
+			<language type="tiv">提夫文</language>
+			<language type="tk">土庫曼文</language>
+			<language type="tkl">托克勞文</language>
+			<language type="tkr" draft="contributed">查庫爾文</language>
+			<language type="tl">塔加路族文</language>
+			<language type="tlh">克林貢文</language>
+			<language type="tli">特林基特文</language>
+			<language type="tly" draft="contributed">塔里什文</language>
+			<language type="tmh">塔馬奇克文</language>
+			<language type="tn">突尼西亞文</language>
+			<language type="to">東加文</language>
+			<language type="tog">東加文（尼亞薩）</language>
+			<language type="tpi">托比辛文</language>
+			<language type="tr">土耳其文</language>
+			<language type="tru" draft="contributed">圖羅尤文</language>
+			<language type="trv" draft="contributed">太魯閣文</language>
+			<language type="ts">特松加文</language>
+			<language type="tsd" draft="contributed">特薩克尼恩文</language>
+			<language type="tsi">欽西安文</language>
+			<language type="tt">韃靼文</language>
+			<language type="ttt" draft="contributed">穆斯林塔特文</language>
+			<language type="tum">圖姆布卡文</language>
+			<language type="tvl">吐瓦魯文</language>
+			<language type="tw">特威文</language>
+			<language type="twq">北桑海文</language>
+			<language type="ty">大溪地文</language>
+			<language type="tyv">土凡文</language>
+			<language type="tzm">塔馬齊格特文</language>
+			<language type="udm">沃蒂艾克文</language>
+			<language type="ug">維吾爾文</language>
+			<language type="uga">烏加列文</language>
+			<language type="uk">烏克蘭文</language>
+			<language type="umb">姆本杜文</language>
+			<language type="und">未知語言</language>
+			<language type="ur">烏都文</language>
+			<language type="uz">烏茲別克文</language>
+			<language type="vai">瓦伊文</language>
+			<language type="ve">溫達文</language>
+			<language type="vec" draft="contributed">威尼斯文</language>
+			<language type="vep" draft="contributed">維普森文</language>
+			<language type="vi">越南文</language>
+			<language type="vls" draft="contributed">西佛蘭德文</language>
+			<language type="vmf" draft="contributed">美茵-法蘭克尼亞文</language>
+			<language type="vo">沃拉普克文</language>
+			<language type="vot">沃提克文</language>
+			<language type="vro" draft="contributed">佛羅文</language>
+			<language type="vun">溫舊文</language>
+			<language type="wa">瓦隆文</language>
+			<language type="wae" draft="contributed">瓦瑟文</language>
+			<language type="wal">瓦拉莫文</language>
+			<language type="war">瓦瑞文</language>
+			<language type="was">瓦紹文</language>
+			<language type="wbp">沃皮瑞文</language>
+			<language type="wo">沃洛夫文</language>
+			<language type="wuu" draft="contributed">吳語</language>
+			<language type="xal">卡爾梅克文</language>
+			<language type="xh">科薩文</language>
+			<language type="xmf" draft="contributed">明格列爾文</language>
+			<language type="xog">索加文</language>
+			<language type="yao">瑤文</language>
+			<language type="yap">雅浦文</language>
+			<language type="yav" draft="contributed">洋卞文</language>
+			<language type="ybb" draft="contributed">耶姆巴文</language>
+			<language type="yi">意第緒文</language>
+			<language type="yo">約魯巴文</language>
+			<language type="yrl" draft="contributed">奈恩加圖文</language>
+			<language type="yue">粵語</language>
+			<language type="za">壯文</language>
+			<language type="zap">薩波特克文</language>
+			<language type="zbl">布列斯符號</language>
+			<language type="zea" draft="contributed">西蘭文</language>
+			<language type="zen">澤納加文</language>
+			<language type="zgh">標準摩洛哥塔馬塞特文</language>
+			<language type="zh">中文</language>
+			<language type="zh_Hans">簡體中文</language>
+			<language type="zh_Hant">繁體中文</language>
+			<language type="zu">祖魯文</language>
+			<language type="zun">祖尼文</language>
+			<language type="zxx">無語言內容</language>
+			<language type="zza">扎扎文</language>
+		</languages>
+		<scripts>
+			<script type="Afak" draft="contributed">阿法卡文字</script>
+			<script type="Aghb" draft="contributed">高加索阿爾巴尼亞文</script>
+			<script type="Arab">阿拉伯文</script>
+			<script type="Arab" alt="variant">波斯阿拉伯文字</script>
+			<script type="Armi">皇室亞美尼亞文</script>
+			<script type="Armn">亞美尼亞文</script>
+			<script type="Avst" draft="contributed">阿維斯陀文</script>
+			<script type="Bali">峇里文</script>
+			<script type="Bamu" draft="contributed">巴姆穆文</script>
+			<script type="Bass" draft="contributed">巴薩文</script>
+			<script type="Batk">巴塔克文</script>
+			<script type="Beng">孟加拉文</script>
+			<script type="Blis">布列斯文</script>
+			<script type="Bopo">注音符號</script>
+			<script type="Brah">婆羅米文</script>
+			<script type="Brai">盲人用點字</script>
+			<script type="Bugi">布吉斯文</script>
+			<script type="Buhd">布希德文</script>
+			<script type="Cakm">查克馬文</script>
+			<script type="Cans">加拿大原住民通用字符</script>
+			<script type="Cari">卡里亞文</script>
+			<script type="Cham">占文</script>
+			<script type="Cher">柴羅基文</script>
+			<script type="Cirt">色斯文</script>
+			<script type="Copt">科普特文</script>
+			<script type="Cprt">塞浦路斯文</script>
+			<script type="Cyrl">斯拉夫文</script>
+			<script type="Cyrs">西里爾文（古教會斯拉夫文變體）</script>
+			<script type="Deva">天城文</script>
+			<script type="Dsrt">德瑟雷特文</script>
+			<script type="Dupl" draft="contributed">杜普洛伊速記</script>
+			<script type="Egyd">古埃及世俗體</script>
+			<script type="Egyh">古埃及僧侶體</script>
+			<script type="Egyp">古埃及象形文字</script>
+			<script type="Elba" draft="contributed">愛爾巴桑文</script>
+			<script type="Ethi">衣索比亞文</script>
+			<script type="Geok">喬治亞語系（阿索他路里和努斯克胡里文）</script>
+			<script type="Geor">喬治亞文</script>
+			<script type="Glag">格拉哥里文</script>
+			<script type="Goth">歌德文</script>
+			<script type="Gran" draft="contributed">格蘭他文字</script>
+			<script type="Grek">希臘文</script>
+			<script type="Gujr">古吉拉特文</script>
+			<script type="Guru">古魯穆奇文</script>
+			<script type="Hang">韓文字</script>
+			<script type="Hani">漢語</script>
+			<script type="Hano">哈努諾文</script>
+			<script type="Hans">簡體</script>
+			<script type="Hans" alt="stand-alone">簡體中文</script>
+			<script type="Hant">繁體</script>
+			<script type="Hant" alt="stand-alone">繁體中文</script>
+			<script type="Hebr">希伯來文</script>
+			<script type="Hira">平假名</script>
+			<script type="Hluw" draft="contributed">安那托利亞象形文字</script>
+			<script type="Hmng">楊松錄苗文</script>
+			<script type="Hrkt">片假名或平假名</script>
+			<script type="Hung">古匈牙利文</script>
+			<script type="Inds">印度河流域（哈拉帕文）</script>
+			<script type="Ital">古意大利文</script>
+			<script type="Java">爪哇文</script>
+			<script type="Jpan">日文</script>
+			<script type="Jurc" draft="contributed">女真文字</script>
+			<script type="Kali">克耶李文</script>
+			<script type="Kana">片假名</script>
+			<script type="Khar">卡羅須提文</script>
+			<script type="Khmr">高棉文</script>
+			<script type="Khoj" draft="contributed">克吉奇文字</script>
+			<script type="Knda">坎那達文</script>
+			<script type="Kore">韓文</script>
+			<script type="Kpel" draft="contributed">克培列文</script>
+			<script type="Kthi" draft="contributed">凱提文</script>
+			<script type="Lana">藍拿文</script>
+			<script type="Laoo">寮國文</script>
+			<script type="Latf">拉丁文（尖角體活字變體）</script>
+			<script type="Latg">拉丁文（蓋爾語變體）</script>
+			<script type="Latn">拉丁文</script>
+			<script type="Lepc">雷布查文</script>
+			<script type="Limb">林佈文</script>
+			<script type="Lina">線性文字（A）</script>
+			<script type="Linb">線性文字（B）</script>
+			<script type="Lisu" draft="contributed">栗僳文</script>
+			<script type="Loma" draft="contributed">洛馬文</script>
+			<script type="Lyci">呂西亞語</script>
+			<script type="Lydi">里底亞語</script>
+			<script type="Mand">曼底安文</script>
+			<script type="Mani" draft="contributed">摩尼教文</script>
+			<script type="Maya">瑪雅象形文字</script>
+			<script type="Mend" draft="contributed">門德文</script>
+			<script type="Merc" draft="contributed">麥羅埃文（曲線字體）</script>
+			<script type="Mero">麥羅埃文</script>
+			<script type="Mlym">馬來亞拉姆文</script>
+			<script type="Mong">蒙古文</script>
+			<script type="Moon" draft="contributed">蒙氏點字</script>
+			<script type="Mroo" draft="contributed">謬文</script>
+			<script type="Mtei">曼尼普爾文</script>
+			<script type="Mymr">緬甸文</script>
+			<script type="Narb" draft="contributed">古北阿拉伯文</script>
+			<script type="Nbat" draft="contributed">納巴泰文字</script>
+			<script type="Nkgb" draft="contributed">納西格巴文</script>
+			<script type="Nkoo">西非書面語言 (N’Ko)</script>
+			<script type="Nshu" draft="contributed">女書文字</script>
+			<script type="Ogam">歐甘文</script>
+			<script type="Olck">桑塔利文</script>
+			<script type="Orkh">鄂爾渾文</script>
+			<script type="Orya">歐利亞文</script>
+			<script type="Osma">歐斯曼亞文</script>
+			<script type="Palm" draft="contributed">帕米瑞拉文字</script>
+			<script type="Perm">古彼爾姆諸文</script>
+			<script type="Phag">八思巴文</script>
+			<script type="Phli" draft="contributed">巴列維文（碑銘體）</script>
+			<script type="Phlp" draft="contributed">巴列維文（聖詩體）</script>
+			<script type="Phlv" draft="contributed">巴列維文（書體）</script>
+			<script type="Phnx">腓尼基文</script>
+			<script type="Plrd">柏格理拼音符</script>
+			<script type="Prti" draft="contributed">帕提亞文（碑銘體）</script>
+			<script type="Rjng">拉讓文</script>
+			<script type="Roro">朗格朗格象形文</script>
+			<script type="Runr">古北歐文字</script>
+			<script type="Samr" draft="contributed">撒馬利亞文</script>
+			<script type="Sara" draft="contributed">沙拉堤文</script>
+			<script type="Sarb" draft="contributed">古南阿拉伯文</script>
+			<script type="Saur">索拉什特拉文</script>
+			<script type="Sgnw">手語書寫符號</script>
+			<script type="Shaw">簫柏納字符</script>
+			<script type="Shrd" draft="contributed">夏拉達文</script>
+			<script type="Sidd" draft="contributed">悉曇文字</script>
+			<script type="Sind" draft="contributed">信德文</script>
+			<script type="Sinh">錫蘭文</script>
+			<script type="Sora" draft="contributed">索朗桑朋文字</script>
+			<script type="Sund" draft="contributed">巽他文</script>
+			<script type="Sylo">希洛弟納格里文</script>
+			<script type="Syrc">敍利亞文</script>
+			<script type="Syre">敘利亞文（福音體文字變體）</script>
+			<script type="Syrj">敘利亞文（西方文字變體）</script>
+			<script type="Syrn">敘利亞文（東方文字變體）</script>
+			<script type="Tagb">南島文</script>
+			<script type="Takr" draft="contributed">塔卡里文字</script>
+			<script type="Tale">傣哪文</script>
+			<script type="Talu" draft="contributed">西雙版納新傣文</script>
+			<script type="Taml">坦米爾文</script>
+			<script type="Tang" draft="contributed">西夏文</script>
+			<script type="Tavt" draft="contributed">傣擔文</script>
+			<script type="Telu">泰盧固文</script>
+			<script type="Teng">談格瓦文</script>
+			<script type="Tfng">提非納文</script>
+			<script type="Tglg">塔加拉文</script>
+			<script type="Thaa">塔安那文</script>
+			<script type="Thai">泰文</script>
+			<script type="Tibt">西藏文</script>
+			<script type="Tirh" draft="contributed">邁蒂利文</script>
+			<script type="Ugar">烏加列文</script>
+			<script type="Vaii" draft="contributed">瓦依文</script>
+			<script type="Visp" draft="contributed">視覺語音文字</script>
+			<script type="Wara" draft="contributed">瓦郎奇蒂文字</script>
+			<script type="Wole" draft="contributed">沃雷艾文</script>
+			<script type="Xpeo">古波斯文</script>
+			<script type="Xsux">蘇米魯亞甲文楔形文字</script>
+			<script type="Yiii">彞文</script>
+			<script type="Zinh" draft="contributed">繼承文字（Unicode）</script>
+			<script type="Zmth" draft="contributed">數學符號</script>
+			<script type="Zsym">符號</script>
+			<script type="Zxxx">非書寫語言</script>
+			<script type="Zyyy">一般文字</script>
+			<script type="Zzzz">未知文字</script>
+		</scripts>
+		<territories>
+			<territory type="001">世界</territory>
+			<territory type="002">非洲</territory>
+			<territory type="003">北美洲</territory>
+			<territory type="005">南美洲</territory>
+			<territory type="009">大洋洲</territory>
+			<territory type="011">西非</territory>
+			<territory type="013">中美</territory>
+			<territory type="014">東非</territory>
+			<territory type="015">北非</territory>
+			<territory type="017">中非</territory>
+			<territory type="018">非洲南部</territory>
+			<territory type="019">美洲</territory>
+			<territory type="021">北美</territory>
+			<territory type="029">加勒比海</territory>
+			<territory type="030">東亞</territory>
+			<territory type="034">南亞</territory>
+			<territory type="035">東南亞</territory>
+			<territory type="039">南歐</territory>
+			<territory type="053">澳洲同紐西蘭</territory>
+			<territory type="054">美拉尼西亞</territory>
+			<territory type="057">密克羅尼西亞</territory>
+			<territory type="061">玻里尼西亞</territory>
+			<territory type="142">亞洲</territory>
+			<territory type="143">中亞</territory>
+			<territory type="145">西亞</territory>
+			<territory type="150">歐洲</territory>
+			<territory type="151">東歐</territory>
+			<territory type="154">北歐</territory>
+			<territory type="155">西歐</territory>
+			<territory type="419">拉丁美洲</territory>
+			<territory type="AC">阿森松島</territory>
+			<territory type="AD">安道爾</territory>
+			<territory type="AE">阿拉伯聯合大公國</territory>
+			<territory type="AF">阿富汗</territory>
+			<territory type="AG">安提瓜同巴布達</territory>
+			<territory type="AI">安圭拉</territory>
+			<territory type="AL">阿爾巴尼亞</territory>
+			<territory type="AM">亞美尼亞</territory>
+			<territory type="AO">安哥拉</territory>
+			<territory type="AQ">南極洲</territory>
+			<territory type="AR">阿根廷</territory>
+			<territory type="AS">美屬薩摩亞</territory>
+			<territory type="AT">奧地利</territory>
+			<territory type="AU">澳洲</territory>
+			<territory type="AW">荷屬阿魯巴</territory>
+			<territory type="AX">奧蘭群島</territory>
+			<territory type="AZ">亞塞拜然</territory>
+			<territory type="BA">波斯尼亞同黑塞哥維那</territory>
+			<territory type="BB">巴貝多</territory>
+			<territory type="BD">孟加拉</territory>
+			<territory type="BE">比利時</territory>
+			<territory type="BF">布吉納法索</territory>
+			<territory type="BG">保加利亞</territory>
+			<territory type="BH">巴林</territory>
+			<territory type="BI">蒲隆地</territory>
+			<territory type="BJ">貝南</territory>
+			<territory type="BL">聖巴瑟米</territory>
+			<territory type="BM">百慕達</territory>
+			<territory type="BN">汶萊</territory>
+			<territory type="BO">玻利維亞</territory>
+			<territory type="BQ">荷蘭加勒比區</territory>
+			<territory type="BR">巴西</territory>
+			<territory type="BS">巴哈馬</territory>
+			<territory type="BT">不丹</territory>
+			<territory type="BV">布威島</territory>
+			<territory type="BW">波札那</territory>
+			<territory type="BY">白俄羅斯</territory>
+			<territory type="BZ">貝里斯</territory>
+			<territory type="CA">加拿大</territory>
+			<territory type="CC">科科斯（基林）群島</territory>
+			<territory type="CD">剛果（金夏沙）</territory>
+			<territory type="CD" alt="variant">剛果民主共和國</territory>
+			<territory type="CF">中非共和國</territory>
+			<territory type="CG">剛果（布拉薩）</territory>
+			<territory type="CG" alt="variant">剛果共和國</territory>
+			<territory type="CH">瑞士</territory>
+			<territory type="CI">象牙海岸</territory>
+			<territory type="CK">庫克群島</territory>
+			<territory type="CL">智利</territory>
+			<territory type="CM">喀麥隆</territory>
+			<territory type="CN">中華人民共和國</territory>
+			<territory type="CO">哥倫比亞</territory>
+			<territory type="CP">克里派頓島</territory>
+			<territory type="CR">哥斯大黎加</territory>
+			<territory type="CU">古巴</territory>
+			<territory type="CV">維德角</territory>
+			<territory type="CW">庫拉索</territory>
+			<territory type="CX">聖誕島</territory>
+			<territory type="CY">賽普勒斯</territory>
+			<territory type="CZ">捷克共和國</territory>
+			<territory type="DE">德國</territory>
+			<territory type="DG">迪亞哥加西亞島</territory>
+			<territory type="DJ">吉布地</territory>
+			<territory type="DK">丹麥</territory>
+			<territory type="DM">多米尼克</territory>
+			<territory type="DO">多明尼加共和國</territory>
+			<territory type="DZ">阿爾及利亞</territory>
+			<territory type="EA">休達與梅利利亞</territory>
+			<territory type="EC">厄瓜多</territory>
+			<territory type="EE">愛沙尼亞</territory>
+			<territory type="EG">埃及</territory>
+			<territory type="EH">西撒哈拉</territory>
+			<territory type="ER">厄利垂亞</territory>
+			<territory type="ES">西班牙</territory>
+			<territory type="ET">衣索比亞</territory>
+			<territory type="EU">歐盟</territory>
+			<territory type="FI">芬蘭</territory>
+			<territory type="FJ">斐濟</territory>
+			<territory type="FK">福克蘭群島</territory>
+			<territory type="FK" alt="variant">福克蘭群島 (馬爾維納斯群島)</territory>
+			<territory type="FM">密克羅尼西亞群島</territory>
+			<territory type="FO">法羅群島</territory>
+			<territory type="FR">法國</territory>
+			<territory type="GA">加彭</territory>
+			<territory type="GB">英國</territory>
+			<territory type="GB" alt="short">英國</territory>
+			<territory type="GD">格瑞那達</territory>
+			<territory type="GE">喬治亞共和國</territory>
+			<territory type="GF">法屬圭亞那</territory>
+			<territory type="GG">根西島</territory>
+			<territory type="GH">迦納</territory>
+			<territory type="GI">直布羅陀</territory>
+			<territory type="GL">格陵蘭</territory>
+			<territory type="GM">甘比亞</territory>
+			<territory type="GN">幾內亞</territory>
+			<territory type="GP">瓜地洛普</territory>
+			<territory type="GQ">赤道幾內亞</territory>
+			<territory type="GR">希臘</territory>
+			<territory type="GS">南佐治亞島同南桑威奇群島</territory>
+			<territory type="GT">瓜地馬拉</territory>
+			<territory type="GU">關島</territory>
+			<territory type="GW">幾內亞比索</territory>
+			<territory type="GY">蓋亞那</territory>
+			<territory type="HK">中華人民共和國香港特別行政區</territory>
+			<territory type="HK" alt="short">香港</territory>
+			<territory type="HM">赫德島同麥克唐納群島</territory>
+			<territory type="HN">宏都拉斯</territory>
+			<territory type="HR">克羅埃西亞</territory>
+			<territory type="HT">海地</territory>
+			<territory type="HU">匈牙利</territory>
+			<territory type="IC">加那利群島</territory>
+			<territory type="ID">印尼</territory>
+			<territory type="IE">愛爾蘭</territory>
+			<territory type="IL">以色列</territory>
+			<territory type="IM">曼島</territory>
+			<territory type="IN">印度</territory>
+			<territory type="IO">英屬印度洋領地</territory>
+			<territory type="IQ">伊拉克</territory>
+			<territory type="IR">伊朗</territory>
+			<territory type="IS">冰島</territory>
+			<territory type="IT">義大利</territory>
+			<territory type="JE">澤西島</territory>
+			<territory type="JM">牙買加</territory>
+			<territory type="JO">約旦</territory>
+			<territory type="JP">日本</territory>
+			<territory type="KE">肯亞</territory>
+			<territory type="KG">吉爾吉斯</territory>
+			<territory type="KH">柬埔寨</territory>
+			<territory type="KI">吉里巴斯</territory>
+			<territory type="KM">葛摩</territory>
+			<territory type="KN">聖基茨同尼維斯</territory>
+			<territory type="KP">北韓</territory>
+			<territory type="KR">南韓</territory>
+			<territory type="KW">科威特</territory>
+			<territory type="KY">開曼群島</territory>
+			<territory type="KZ">哈薩克</territory>
+			<territory type="LA">寮國</territory>
+			<territory type="LB">黎巴嫩</territory>
+			<territory type="LC">聖露西亞</territory>
+			<territory type="LI">列支敦斯登</territory>
+			<territory type="LK">斯里蘭卡</territory>
+			<territory type="LR">賴比瑞亞</territory>
+			<territory type="LS">賴索托</territory>
+			<territory type="LT">立陶宛</territory>
+			<territory type="LU">盧森堡</territory>
+			<territory type="LV">拉脫維亞</territory>
+			<territory type="LY">利比亞</territory>
+			<territory type="MA">摩洛哥</territory>
+			<territory type="MC">摩納哥</territory>
+			<territory type="MD">摩爾多瓦</territory>
+			<territory type="ME">蒙特內哥羅</territory>
+			<territory type="MF">法屬聖馬丁</territory>
+			<territory type="MG">馬達加斯加</territory>
+			<territory type="MH">馬紹爾群島</territory>
+			<territory type="MK">馬其頓</territory>
+			<territory type="MK" alt="variant">前南斯拉夫馬其頓共和國</territory>
+			<territory type="ML">馬利</territory>
+			<territory type="MM">緬甸</territory>
+			<territory type="MN">蒙古</territory>
+			<territory type="MO">中華人民共和國澳門特別行政區</territory>
+			<territory type="MO" alt="short">澳門</territory>
+			<territory type="MP">北馬里亞納群島</territory>
+			<territory type="MQ">馬丁尼克島</territory>
+			<territory type="MR">茅利塔尼亞</territory>
+			<territory type="MS">蒙哲臘</territory>
+			<territory type="MT">馬爾他</territory>
+			<territory type="MU">模里西斯</territory>
+			<territory type="MV">馬爾地夫</territory>
+			<territory type="MW">馬拉威</territory>
+			<territory type="MX">墨西哥</territory>
+			<territory type="MY">馬來西亞</territory>
+			<territory type="MZ">莫三比克</territory>
+			<territory type="NA">納米比亞</territory>
+			<territory type="NC">新喀里多尼亞</territory>
+			<territory type="NE">尼日</territory>
+			<territory type="NF">諾福克島</territory>
+			<territory type="NG">奈及利亞</territory>
+			<territory type="NI">尼加拉瓜</territory>
+			<territory type="NL">荷蘭</territory>
+			<territory type="NO">挪威</territory>
+			<territory type="NP">尼泊爾</territory>
+			<territory type="NR">諾魯</territory>
+			<territory type="NU">紐埃島</territory>
+			<territory type="NZ">紐西蘭</territory>
+			<territory type="OM">阿曼王國</territory>
+			<territory type="PA">巴拿馬</territory>
+			<territory type="PE">秘魯</territory>
+			<territory type="PF">法屬玻里尼西亞</territory>
+			<territory type="PG">巴布亞紐幾內亞</territory>
+			<territory type="PH">菲律賓</territory>
+			<territory type="PK">巴基斯坦</territory>
+			<territory type="PL">波蘭</territory>
+			<territory type="PM">聖皮埃爾同密克隆群島</territory>
+			<territory type="PN">皮特肯群島</territory>
+			<territory type="PR">波多黎各</territory>
+			<territory type="PS">巴勒斯坦自治區</territory>
+			<territory type="PS" alt="short">巴勒斯坦</territory>
+			<territory type="PT">葡萄牙</territory>
+			<territory type="PW">帛琉</territory>
+			<territory type="PY">巴拉圭</territory>
+			<territory type="QA">卡達</territory>
+			<territory type="QO">大洋洲邊疆群島</territory>
+			<territory type="RE">留尼旺</territory>
+			<territory type="RO">羅馬尼亞</territory>
+			<territory type="RS">塞爾維亞</territory>
+			<territory type="RU">俄羅斯</territory>
+			<territory type="RW">盧安達</territory>
+			<territory type="SA">沙烏地阿拉伯</territory>
+			<territory type="SB">索羅門群島</territory>
+			<territory type="SC">塞席爾</territory>
+			<territory type="SD">蘇丹</territory>
+			<territory type="SE">瑞典</territory>
+			<territory type="SG">新加坡</territory>
+			<territory type="SH">聖赫勒拿島</territory>
+			<territory type="SI">斯洛維尼亞</territory>
+			<territory type="SJ">斯瓦爾巴特群島同揚馬延島</territory>
+			<territory type="SK">斯洛伐克</territory>
+			<territory type="SL">獅子山</territory>
+			<territory type="SM">聖馬利諾</territory>
+			<territory type="SN">塞內加爾</territory>
+			<territory type="SO">索馬利亞</territory>
+			<territory type="SR">蘇利南</territory>
+			<territory type="SS">南蘇丹</territory>
+			<territory type="ST">聖多美同普林西比</territory>
+			<territory type="SV">薩爾瓦多</territory>
+			<territory type="SX">荷屬聖馬丁</territory>
+			<territory type="SY">敘利亞</territory>
+			<territory type="SZ">史瓦濟蘭</territory>
+			<territory type="TA">特里斯坦達庫尼亞群島</territory>
+			<territory type="TC">土克斯及開科斯群島</territory>
+			<territory type="TD">查德</territory>
+			<territory type="TF">法屬南方屬地</territory>
+			<territory type="TG">多哥</territory>
+			<territory type="TH">泰國</territory>
+			<territory type="TJ">塔吉克</territory>
+			<territory type="TK">托克勞群島</territory>
+			<territory type="TL">東帝汶</territory>
+			<territory type="TM">土庫曼</territory>
+			<territory type="TN">突尼西亞</territory>
+			<territory type="TO">東加</territory>
+			<territory type="TR">土耳其</territory>
+			<territory type="TT">千里達同多巴哥</territory>
+			<territory type="TV">吐瓦魯</territory>
+			<territory type="TW">台灣</territory>
+			<territory type="TZ">坦尚尼亞</territory>
+			<territory type="UA">烏克蘭</territory>
+			<territory type="UG">烏干達</territory>
+			<territory type="UM">美國本土外小島嶼</territory>
+			<territory type="US">美國</territory>
+			<territory type="US" alt="short">美國</territory>
+			<territory type="UY">烏拉圭</territory>
+			<territory type="UZ">烏茲別克</territory>
+			<territory type="VA">梵蒂岡</territory>
+			<territory type="VC">聖文森特同格林納丁斯</territory>
+			<territory type="VE">委內瑞拉</territory>
+			<territory type="VG">英屬維京群島</territory>
+			<territory type="VI">美屬維京群島</territory>
+			<territory type="VN">越南</territory>
+			<territory type="VU">萬那杜</territory>
+			<territory type="WF">瓦利斯同富圖納群島</territory>
+			<territory type="WS">薩摩亞</territory>
+			<territory type="XK">科索沃</territory>
+			<territory type="YE">葉門</territory>
+			<territory type="YT">馬約特</territory>
+			<territory type="ZA">南非</territory>
+			<territory type="ZM">尚比亞</territory>
+			<territory type="ZW">辛巴威</territory>
+			<territory type="ZZ">未知區域</territory>
+		</territories>
+		<variants>
+			<variant type="1901">傳統德語拼字學</variant>
+			<variant type="1994" draft="contributed">標準雷西亞拼字</variant>
+			<variant type="1996">1996 年的德語拼字學</variant>
+			<variant type="1606NICT" draft="contributed">中世紀晚期法文（至1606年）</variant>
+			<variant type="1694ACAD" draft="contributed">早期現代法文</variant>
+			<variant type="1959ACAD" draft="contributed">白俄羅斯文（學術）</variant>
+			<variant type="ALALC97" draft="contributed">美國國會圖書館標準方案羅馬化（1997年版）</variant>
+			<variant type="ALUKU" draft="contributed">阿魯庫方言</variant>
+			<variant type="AREVELA">亞美尼亞東部</variant>
+			<variant type="AREVMDA">亞美尼亞西部</variant>
+			<variant type="BAKU1926" draft="contributed">統一土耳其拉丁字母</variant>
+			<variant type="BAUDDHA" draft="contributed">佛教混合梵文</variant>
+			<variant type="BISCAYAN" draft="contributed">比斯開方言</variant>
+			<variant type="BISKE" draft="contributed">San Giorgio/Bila 方言</variant>
+			<variant type="BOONT" draft="contributed">布恩特林方言</variant>
+			<variant type="EMODENG" draft="contributed">早期現代英語</variant>
+			<variant type="FONIPA">IPA 拼音</variant>
+			<variant type="FONUPA">UPA 拼音</variant>
+			<variant type="FONXSAMP" draft="contributed">X-SAMPA 音標</variant>
+			<variant type="HEPBURN" draft="contributed">平文式羅馬字</variant>
+			<variant type="HOGNORSK" draft="contributed">高地挪威文</variant>
+			<variant type="ITIHASA" draft="contributed">史詩梵文</variant>
+			<variant type="JAUER" draft="contributed">米茲泰爾方言</variant>
+			<variant type="JYUTPING" draft="contributed">香港語言學學會粵語拼音</variant>
+			<variant type="KKCOR" draft="contributed">通用康沃爾文拼字</variant>
+			<variant type="LAUKIKA" draft="contributed">傳統梵文</variant>
+			<variant type="LIPAW" draft="contributed">雷西亞利波瓦方言</variant>
+			<variant type="LUNA1918" draft="contributed">俄羅斯文拼字（1917年後）</variant>
+			<variant type="MONOTON" draft="contributed">希臘文單調正字法</variant>
+			<variant type="NDYUKA" draft="contributed">蘇利南恩都卡方言</variant>
+			<variant type="NEDIS" draft="contributed">那提松尼方言</variant>
+			<variant type="NJIVA" draft="contributed">雷西亞尼瓦方言</variant>
+			<variant type="OSOJS" draft="contributed">雷西亞歐西亞柯方言</variant>
+			<variant type="PAMAKA" draft="contributed">蘇利南帕馬卡方言</variant>
+			<variant type="PETR1708" draft="contributed">俄羅斯文拼字（1708 年）</variant>
+			<variant type="PINYIN">漢語拼音</variant>
+			<variant type="POLYTON" draft="contributed">希臘文多調正字法</variant>
+			<variant type="POSIX">電腦</variant>
+			<variant type="PUTER" draft="contributed">瑞士普特爾方言</variant>
+			<variant type="REVISED">已修訂的拼字學</variant>
+			<variant type="ROZAJ" draft="contributed">雷西亞方言</variant>
+			<variant type="RUMGR" draft="contributed">羅曼什文</variant>
+			<variant type="SAAHO" draft="contributed">薩霍文</variant>
+			<variant type="SCOTLAND" draft="contributed">蘇格蘭標準英語</variant>
+			<variant type="SCOUSE" draft="contributed">利物浦方言</variant>
+			<variant type="SOLBA" draft="contributed">雷西亞史托維薩方言</variant>
+			<variant type="SURMIRAN" draft="contributed">瑞士蘇邁拉方言</variant>
+			<variant type="SURSILV" draft="contributed">瑞士蘇瑟瓦方言</variant>
+			<variant type="SUTSILV" draft="contributed">瑞士蘇希瓦方言</variant>
+			<variant type="TARASK" draft="contributed">白俄羅斯文傳統拼字</variant>
+			<variant type="UCCOR" draft="contributed">統一康沃爾文拼字</variant>
+			<variant type="UCRCOR" draft="contributed">統一康沃爾文修訂拼字</variant>
+			<variant type="ULSTER" draft="contributed">愛爾蘭阿爾斯特方言</variant>
+			<variant type="VAIDIKA" draft="contributed">吠陀梵文</variant>
+			<variant type="VALENCIA" draft="contributed">瓦倫西亞文</variant>
+			<variant type="VALLADER" draft="contributed">瑞士瓦勒德方言</variant>
+			<variant type="WADEGILE">威妥瑪式拼音</variant>
+		</variants>
+		<keys>
+			<key type="calendar">曆法</key>
+			<key type="colAlternate" draft="contributed">略過符號排序</key>
+			<key type="colBackwards" draft="contributed">反向重音排序</key>
+			<key type="colCaseFirst" draft="contributed">大寫/小寫排列</key>
+			<key type="colCaseLevel" draft="contributed">區分大小寫排序</key>
+			<key type="colHiraganaQuaternary" draft="contributed">假名排序</key>
+			<key type="collation">排序</key>
+			<key type="colNormalization" draft="contributed">正規化排序</key>
+			<key type="colNumeric" draft="contributed">數字排序</key>
+			<key type="colStrength" draft="contributed">排序強度</key>
+			<key type="currency">貨幣</key>
+			<key type="hc">時間週期（12 小時制與 24 小時制）</key>
+			<key type="lb">換行樣式</key>
+			<key type="ms">度量單位系統</key>
+			<key type="numbers">數字</key>
+			<key type="timezone" draft="contributed">時區</key>
+			<key type="va" draft="contributed">區域變異</key>
+			<key type="variableTop" draft="contributed">以符號排序</key>
+			<key type="x" draft="contributed">專用區</key>
+		</keys>
+		<types>
+			<type key="calendar" type="buddhist">佛曆</type>
+			<type key="calendar" type="chinese">農曆</type>
+			<type key="calendar" type="coptic">科普特曆</type>
+			<type key="calendar" type="dangi">檀紀曆</type>
+			<type key="calendar" type="ethiopic">衣索比亞曆</type>
+			<type key="calendar" type="ethiopic-amete-alem">衣索比亞曆 (Amete Alem)</type>
+			<type key="calendar" type="gregorian">公曆</type>
+			<type key="calendar" type="hebrew">希伯來曆</type>
+			<type key="calendar" type="indian">印度國曆</type>
+			<type key="calendar" type="islamic">伊斯蘭曆</type>
+			<type key="calendar" type="islamic-civil">伊斯蘭民用曆</type>
+			<type key="calendar" type="islamic-rgsa" draft="contributed">伊斯蘭新月曆</type>
+			<type key="calendar" type="islamic-tbla" draft="contributed">伊斯蘭天文曆</type>
+			<type key="calendar" type="islamic-umalqura" draft="contributed">烏姆庫拉曆</type>
+			<type key="calendar" type="iso8601">國際標準 ISO 8601</type>
+			<type key="calendar" type="japanese">日本曆</type>
+			<type key="calendar" type="persian">波斯曆</type>
+			<type key="calendar" type="roc">民國曆</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">排序符號</type>
+			<type key="colAlternate" type="shifted" draft="contributed">略過符號排序</type>
+			<type key="colBackwards" type="no" draft="contributed">正常排序重音</type>
+			<type key="colBackwards" type="yes" draft="contributed">依反向重音排序</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">優先排序小寫</type>
+			<type key="colCaseFirst" type="no" draft="contributed">正常大小寫順序排序</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">優先排序大寫</type>
+			<type key="colCaseLevel" type="no" draft="contributed">不分大小寫排序</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">依大小寫排序</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">個別排序假名</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">分別排序假名</type>
+			<type key="collation" type="big5han">繁體中文排序 - Big5</type>
+			<type key="collation" type="dictionary">字典排序</type>
+			<type key="collation" type="ducet">預設 Unicode 排序</type>
+			<type key="collation" type="eor" draft="contributed">歐洲排序規則</type>
+			<type key="collation" type="gb2312han">簡體中文排序 - GB2312</type>
+			<type key="collation" type="phonebook">電話簿排序</type>
+			<type key="collation" type="phonetic">發音排序</type>
+			<type key="collation" type="pinyin">拼音排序</type>
+			<type key="collation" type="reformed">改良排序</type>
+			<type key="collation" type="search">一般用途搜尋</type>
+			<type key="collation" type="searchjl" draft="contributed">韓文子音排序</type>
+			<type key="collation" type="standard">標準排序</type>
+			<type key="collation" type="stroke">筆畫排序</type>
+			<type key="collation" type="traditional">傳統排序</type>
+			<type key="collation" type="unihan">部首筆畫排序</type>
+			<type key="collation" type="zhuyin">注音排序</type>
+			<type key="colNormalization" type="no" draft="contributed">非正規化排序</type>
+			<type key="colNormalization" type="yes" draft="contributed">依正規化排序 Unicode</type>
+			<type key="colNumeric" type="no" draft="contributed">個別排序數字</type>
+			<type key="colNumeric" type="yes" draft="contributed">依數字順序排序數字</type>
+			<type key="colStrength" type="identical" draft="contributed">全部排序</type>
+			<type key="colStrength" type="primary" draft="contributed">僅排序基礎字母</type>
+			<type key="colStrength" type="quaternary" draft="contributed">排序重音/大小寫/全半形/假名</type>
+			<type key="colStrength" type="secondary" draft="contributed">排序重音</type>
+			<type key="colStrength" type="tertiary" draft="contributed">排序重音/大小寫/全半形</type>
+			<type key="hc" type="h11">12 小時制 (0–11)</type>
+			<type key="hc" type="h12">12 小時制 (1–12)</type>
+			<type key="hc" type="h23">24 小時制 (0–23)</type>
+			<type key="hc" type="h24">24 小時制 (1–24)</type>
+			<type key="lb" type="loose">寬鬆換行樣式</type>
+			<type key="lb" type="normal">一般換行樣式</type>
+			<type key="lb" type="strict">強制換行樣式</type>
+			<type key="ms" type="metric">公制</type>
+			<type key="ms" type="uksystem">英制度量單位系統</type>
+			<type key="ms" type="ussystem">美制度量單位系統</type>
+			<type key="numbers" type="arab">阿拉伯-印度數字</type>
+			<type key="numbers" type="arabext">阿拉伯-印度擴充數字</type>
+			<type key="numbers" type="armn">亞美尼亞數字</type>
+			<type key="numbers" type="armnlow">小寫亞美尼亞數字</type>
+			<type key="numbers" type="bali" draft="contributed">峇里文數字</type>
+			<type key="numbers" type="beng">孟加拉數字</type>
+			<type key="numbers" type="brah" draft="contributed">婆羅米數字</type>
+			<type key="numbers" type="cakm" draft="contributed">查克馬數字</type>
+			<type key="numbers" type="cham" draft="contributed">占文數字</type>
+			<type key="numbers" type="deva">梵文數字</type>
+			<type key="numbers" type="ethi">衣索比亞數字</type>
+			<type key="numbers" type="finance" draft="contributed">金融數字</type>
+			<type key="numbers" type="fullwide">全形數字</type>
+			<type key="numbers" type="geor">喬治亞數字</type>
+			<type key="numbers" type="grek">希臘數字</type>
+			<type key="numbers" type="greklow">小寫希臘數字</type>
+			<type key="numbers" type="gujr">古吉拉特數字</type>
+			<type key="numbers" type="guru">古爾穆奇數字</type>
+			<type key="numbers" type="hanidec">中文十進位數字</type>
+			<type key="numbers" type="hans">小寫簡體中文數字</type>
+			<type key="numbers" type="hansfin">大寫簡體中文數字</type>
+			<type key="numbers" type="hant">小寫繁體中文數字</type>
+			<type key="numbers" type="hantfin">大寫繁體中文數字</type>
+			<type key="numbers" type="hebr">希伯來數字</type>
+			<type key="numbers" type="java" draft="contributed">爪哇文數字</type>
+			<type key="numbers" type="jpan">小寫日文數字</type>
+			<type key="numbers" type="jpanfin">大寫日文數字</type>
+			<type key="numbers" type="kali" draft="contributed">克耶數字</type>
+			<type key="numbers" type="khmr">高棉數字</type>
+			<type key="numbers" type="knda">坎那達數字</type>
+			<type key="numbers" type="lana" draft="contributed">老傣文數字</type>
+			<type key="numbers" type="lanatham" draft="contributed">蘭納文數字</type>
+			<type key="numbers" type="laoo">寮國數字</type>
+			<type key="numbers" type="latn">阿拉伯數字</type>
+			<type key="numbers" type="lepc" draft="contributed">西納文數字</type>
+			<type key="numbers" type="limb" draft="contributed">林布文數字</type>
+			<type key="numbers" type="mlym">馬來亞拉姆數字</type>
+			<type key="numbers" type="mong">蒙古數字</type>
+			<type key="numbers" type="mtei" draft="contributed">曼尼普爾數字</type>
+			<type key="numbers" type="mymr">緬甸數字</type>
+			<type key="numbers" type="mymrshan" draft="contributed">緬甸撣文數字</type>
+			<type key="numbers" type="native" draft="contributed">原始數字</type>
+			<type key="numbers" type="nkoo" draft="contributed">曼德數字</type>
+			<type key="numbers" type="olck" draft="contributed">桑塔利文數字</type>
+			<type key="numbers" type="orya">歐利亞數字</type>
+			<type key="numbers" type="osma" draft="contributed">奧斯曼亞數字</type>
+			<type key="numbers" type="roman">羅馬數字</type>
+			<type key="numbers" type="romanlow">小寫羅馬數字</type>
+			<type key="numbers" type="saur" draft="contributed">索拉什特拉文數字</type>
+			<type key="numbers" type="shrd" draft="contributed">夏拉達數字</type>
+			<type key="numbers" type="sora" draft="contributed">索朗桑朋數字</type>
+			<type key="numbers" type="sund">巽他數字</type>
+			<type key="numbers" type="takr" draft="contributed">塔卡里數字</type>
+			<type key="numbers" type="talu" draft="contributed">新傣仂文數字</type>
+			<type key="numbers" type="taml">坦米爾數字</type>
+			<type key="numbers" type="tamldec">坦米爾數字</type>
+			<type key="numbers" type="telu">泰盧固數字</type>
+			<type key="numbers" type="thai">泰文數字</type>
+			<type key="numbers" type="tibt">西藏數字</type>
+			<type key="numbers" type="traditional" draft="contributed">傳統數字</type>
+			<type key="numbers" type="vaii" draft="contributed">瓦伊文數字</type>
+		</types>
+		<transformNames>
+			<transformName type="BGN" draft="contributed">美國地名委員會</transformName>
+			<transformName type="Numeric" draft="contributed">數值</transformName>
+			<transformName type="Tone" draft="contributed">聲調</transformName>
+			<transformName type="UNGEGN" draft="contributed">聯合國地名專家組</transformName>
+			<transformName type="x-Accents" draft="contributed">重音</transformName>
+			<transformName type="x-Fullwidth" draft="contributed">全形</transformName>
+			<transformName type="x-Halfwidth" draft="contributed">半形</transformName>
+			<transformName type="x-Jamo">韓文字母</transformName>
+			<transformName type="x-Pinyin" draft="contributed">拼音</transformName>
+			<transformName type="x-Publishing" draft="contributed">出版</transformName>
+		</transformNames>
+		<measurementSystemNames>
+			<measurementSystemName type="metric">公制</measurementSystemName>
+			<measurementSystemName type="UK">英制</measurementSystemName>
+			<measurementSystemName type="US">美制</measurementSystemName>
+		</measurementSystemNames>
+		<codePatterns>
+			<codePattern type="language">語言：{0}</codePattern>
+			<codePattern type="script">文字：{0}</codePattern>
+			<codePattern type="territory">地區：{0}</codePattern>
+		</codePatterns>
+	</localeDisplayNames>
+	<characters>
+		<exemplarCharacters>[一 丁 七 丈-不 丑 且 世 丘 丙 丟 並 中 串 丸 丹 主 乃 久 么 之 乎 乏 乖 乘 乙 九 也 乾 亂 了 予 事 二 于 云 互 五 井 些 亞 亡 交-亦 亨 享 京 亮 人 什 仁 仇 今 介 仍 仔 他 付 仙 代-以 仰 仲 件 任 份 企 伊 伍 伐 休 伙 伯 估 伴 伸 似 伽 但 佈 佉 位-住 佔 何 余 佛 作 你 佩 佳 使 來 例 供 依 侯 侵 便 係-俄 俊 俗 保 俠 信 修 俱 俾 個 倍 們 倒 候 倚 借 倫 值 假 偉 偏 做 停 健 側-偷 傑 備 傢 傣 傲 傳 傷 傻 傾 僅 像 僑 僧 價 儀 億 儒 儘 優 允 元-充 兇-光 克 免 兒 兔 入 內-兩 八-兮 共 兵-典 兼 冊 再 冒 冠 冬 冰 冷 准 凌 凝 凡 凰 凱 出 函 刀 分 切 刊 列 初 判 別 利 刪 到 制 刷 刺 刻 則 剌 前 剛 剩 剪 副 割 創 劃 劇 劉 劍 力 功 加 助-劫 勁 勇 勉 勒 動 務 勝 勞 勢 勤 勵 勸 勿 包 匈 化 北 匹 區 十 千 升 午 半 卒-協 南 博 卜 卡 卯-危 即 卷 卻 厄 厘 厚 原 厭 厲 去 參 又 及 友 反 叔 取 受 口-另 只-叭 可 台 史 右 司 吃 各 合-吊 同-后 吐-吒 君 吝-吠 否 吧 含 吳 吵 吸 吹 吾 呀 呂 呆 告 呢 周 味 呵 呼 命 和 咖 咦 咧 咪 咬 咱 哀 品 哇-哉 哎 員 哥 哦 哩 哪 哭 哲 唉 唐 唔 唬 售 唯 唱 唷 唸 商 啊 問 啟 啡 啥 啦 啪 喀 喂 善 喇 喊 喔 喜 喝 喬 單 喵 嗎 嗚 嗨 嗯 嘆 嘉 嘗 嘛 嘴 嘻 嘿 器 噴 嚇 嚴 囉 四 回 因 困 固 圈 國 圍 園 圓 圖 團 圜 土 在 圭 地 圾 址 均 坎 坐 坡 坤 坦 坪 垂 垃 型 埃 城 埔 域 執 培 基 堂 堅 堆 堡 堪 報 場 塊 塔 塗 塞 填 塵 境 增 墨 墮 壁 壇 壓 壘 壞 壢 士 壬 壯 壽 夏 夕 外 多 夜 夠 夢 夥 大 天-夫 央 失 夷 夸 夾 奇-奉 奎 奏 契 奔 套 奧 奪 奮 女 奴 奶 她 好 如 妙 妝 妥 妨 妮 妳 妹 妻 姆 姊 始 姐 姑 姓 委 姿 威 娃 娘 娛 婁 婆 婚 婦 媒 媽 嫌 嫩 子 孔 字 存 孝 孟 季 孤 孩 孫 學 它 宅 宇-安 宋 完 宏 宗-宜 客-室 宮 害 家 容 宿 寂 寄-密 富 寒 寞 察 寢 實-審 寫 寬 寮 寵 寶 封 射 將 專 尊 尋 對-小 少 尖 尚 尤 就 尺 尼 尾 局 屁 居 屆 屋 屏 展 屠 層 屬 山 岡 岩 岸 峰 島 峽 崇 崙 崴 嵐 嶺 川 州 巡 工-巨 巫 差 己-巴 巷 市 布 希 帕 帖 帛 帝 帥 師 席 帳 帶 常 帽 幅 幕 幣 幫 干-年 幸 幹 幻-幾 庇 床 序 底 店 庚 府 度 座 庫 庭 康 庸 廉 廖 廠 廢 廣 廳 延 廷 建 弄 式 引 弗 弘 弟 弦 弱 張 強 彈 彊 彌 彎 彝 彞 形 彥 彩 彬 彭 彰 影 役 彼 往 征 待 很 律 後 徐-徒 得 從 復 微 徵 德 徹 心 必 忌 忍 志-忙 忠 快 念 忽 怎 怒 怕 怖 思 怡 急 性 怨 怪 恆 恐 恢 恥 恨 恩 恭 息 恰 悅 悉 悔 悟 悠 您 悲 悶 情 惑 惜 惠 惡 惱 想 惹 愁 愈 愉 意 愚 愛 感 慈 態 慕 慘 慢 慣 慧 慮 慰 慶 慾 憂 憐 憑 憲 憶 憾 懂 應 懶 懷 懼 戀 戈 戊 戌 成-戒 或 截 戰 戲 戴 戶 房-扁 扇 手 才 扎 打 托 扣 扥 扭 扯 批 找-技 抄 把 抓 投 抗 折 披 抬 抱 抵 抹 抽 拆 拉 拋 拍 拏 拒 拔 拖 招 拜 括 拳 拼 拾 拿 持 指 按 挑 挖 挪 振 挺 捐 捕 捨 捲 捷 掃 授 掉 掌 排 掛 採 探 接 控 推 措 描 提 插 揚 換 握 揮 援 損 搖 搜 搞 搬 搭 搶 摘 摩 摸 撐 撒 撞 撣 撥 播 撾 撿 擁 擇 擊 擋 操 擎 擔 據 擠 擦 擬 擴 擺 擾 攝 支 收 改 攻 放 政 故 效 敍 敏 救 敗-教 敝 敢 散 敦 敬 整 敵 數 文 斐 斗 料 斯 新 斷 方 於 施 旁 旅 旋 族 旗 既 日 旦 早 旭 旺 昂 昆 昇 昌 明 昏 易 星 映 春 昨 昭 是 時 晉 晒 晚 晨 普 景 晴 晶 智 暑 暖 暗 暫 暴 曆 曉 曰 曲 更 書 曼 曾-最 會 月 有 朋 服 朗 望 朝 期 木 未-札 朱 朵 杉 李 材 村 杜 束 杯-東 松 板 析 林 果 枝 架 柏 某 染 柔 查 柬 柯 柳 柴 校 核 根 格 桃 案 桌 桑 梁 梅 條 梨 梯 械 梵 棄 棉 棋 棒 棚 森 椅 植 椰 楊 楓 楚 業 極 概 榜 榮 構 槍 樂 樓 標 樞 模 樣 樹 橋 機 橫 檀 檔 檢 欄 權 次 欣 欲 欺 欽 款 歉 歌 歐 歡-武 歲 歷 歸 死 殊 殘 段 殺 殼 毀 毅 母 每 毒 比 毛 毫 氏 民 氣 水 永 求 汗 汝 江-污 汪 汶 決 汽 沃 沈 沉 沒 沖 沙 河 油 治 沿 況 泉 泊 法 泡 波 泥 注 泰 泳 洋 洗 洛 洞 洩 洪 洲 活 洽 派 流 浦 浩 浪 浮 海 涇-涉 涯 液 涵 涼 淑 淚 淡 淨 深 混 淺 清 減 渡 測 港 游 湖 湯 源 準 溝 溪 溫 滄 滅 滋 滑 滴 滾 滿 漂 漏 演 漠 漢 漫 漲 漸 潔 潘 潛 潮 澤 澳 激 濃 濟 濤 濫 濱 瀏 灌 灣 火 灰 災 炎 炮 炸 為 烈 烏 烤 無 焦 然 煙 煞 照 煩 熊 熟 熱 燃 燈 燒 營 爆 爐 爛 爪 爬 爭 爵 父 爸 爺 爽 爾 牆-版 牌 牙 牛 牠 牧 物 牲 特 牽 犧 犯 狀 狂 狐 狗 狠 狼 猛 猜 猴 猶 獄 獅 獎 獨 獲 獸 獻 玄 率 玉 王 玩 玫 玲 玻 珊 珍 珠 珥 班 現 球 理 琉 琪 琴 瑙 瑜 瑞 瑟 瑤 瑪 瑰 環 瓜 瓦 瓶 甘 甚 甜 生 產 用 田-申 男 甸 界 留 畢 略 番 畫 異 當 疆 疏 疑 疼 病 痕 痛 痴 瘋 療 癡 癸 登-百 的 皆 皇 皮 盃 益 盛 盜 盟 盡 監 盤 盧 目 盲 直 相 盼 盾 省 眉 看 真 眠 眼 眾 睛 睡 督 瞧 瞭 矛 矣 知 短 石 砂 砍 研 砲 破 硬 碎 碗 碟 碧 碩 碰 確 碼 磁 磨 磯 礎 礙 示 社 祕 祖 祚 祛 祝 神 祥 票 祿 禁 禍-福 禪 禮 秀 私 秋 科 秒 秘 租 秤 秦 移 稅 程 稍 種 稱 稿 穆 穌 積 穩 究 穹 空 穿 突 窗 窩 窮 窶 立 站 竟 章 童 端 競 竹 笑 笛 符 笨 第 筆 等 筋 答 策 简 算 管 箭 箱 節 範 篇 築 簡 簫 簽 簿 籃 籌 籍 籤 米 粉 粗 粵 精 糊 糕 糟 系 糾 紀 約 紅 納 紐 純 紙-紛 素 索 紫 累 細 紹 終 組 結 絕 絡 給 統 絲 經 綜 綠 維 綱 網 緊 緒 線 緣 編 緩 緬 緯 練 縛 縣 縮 縱 總 績 繁 繆 織 繞 繪 繳 繼 續 缸 缺 罕 罪 置 罰 署 罵 罷 羅 羊 美 羞 群 義 羽 翁 習 翔 翰 翹 翻 翼 耀 老 考 者 而 耍 耐 耗 耳 耶 聊 聖 聚 聞 聯 聰 聲 職 聽 肉 肚 股 肥 肩 肯 育 背 胎 胖 胞 胡 胸 能 脆 脫 腓 腔 腦 腰 腳 腿 膽 臉 臘 臣 臥 臨 自 臭 至 致 臺 與-舊 舌 舍 舒 舞 舟 航 般 船 艦 良 色 艾 芝 芬 花 芳 若 苦 英 茅 茫 茲 茶 草 荒 荷 荼 莉 莊 莎 莫 菜 菩 華 菲 萄 萊 萬 落 葉 著 葛 葡 蒂 蒙 蒲 蒼 蓋 蓮 蔕 蔡 蔣 蕭 薄 薦 薩 薪 藉 藍 藏 藝 藤 藥 蘆 蘇 蘭 虎 處 虛 號 虧 蛇 蛋 蛙 蜂 蜜 蝶 融 螢 蟲 蟹 蠍 蠻 血 行 術 街 衛 衝 衡 衣 表 袋 被 裁 裂 裕 補 裝 裡 製 複 褲 西 要 覆 見 規 視 親 覺 覽 觀 角 解 觸 言 訂 計 訊 討 訓 託 記 訥 訪 設 許 訴 註 証 評 詞 詢 試 詩 話-詳 誇 誌 認 誓 誕 語 誠 誤 說 誰 課 誼 調 談 請 諒 論 諸 諺 諾 謀 謂 講 謝 證 識 譜 警 譯 議 護 譽 讀 變 讓 讚 谷 豆 豈 豐 象 豪 豬 貌 貓 貝 貞 負-貢 貨 貪-責 貴 買 費 貼 賀 資 賈 賓 賜 賞 賢-賤 賦 質 賭 賴 賺 購 賽 贈 贊 贏 赤 赫 走 起 超 越 趕 趙 趣 趨 足 跌 跎 跑 距 跟 跡 路 跳 踏 踢 蹟 蹤 躍 身 躲 車 軌 軍 軒 軟 較 載 輔 輕 輛 輝 輩 輪 輯 輸 轉 轟 辛 辦 辨 辭 辯-農 迅 迎 近 返 迦 迪 迫 述 迴 迷 追 退 送 逃 逆 透 逐 途 這-逛 逝 速 造 逢 連 週 進 逸 逼 遇 遊 運 遍 過 道-違 遙 遜 遠 適 遭 遮 遲 遷 選 遺 避-邁 還 邊 邏 那 邦 邪 邱 郎 部 郭 郵 都 鄂 鄉 鄭 鄰 酉 配 酒 酷 酸 醉 醒 醜 醫 采 釋-量 金 針 釣 鈴 鉢 銀 銅 銖 銘 銳 銷 鋒 鋼 錄 錢 錦 錫 錯 鍋 鍵 鍾 鎊 鎖 鎮 鏡 鐘 鐵 鑑 長 門 閃 閉 開 閏 閒 間 閣 閱 闆 闊 闍 闐 關 闡 防 阻 阿 陀 附 降 限 院-除 陪 陰 陳 陵-陸 陽 隆 隊 階 隔 際 障 隨 險 隱 隻 雄-集 雉 雖 雙 雜 雞 離 難 雨 雪 雲 零 雷 電 需 震 霍 霧 露 霸 霹 靂 靈 青 靖 靜 非 靠 面 革 靼 鞋 韃 韋 韓 音 韻 響 頁 頂 項 順 須 預 頑 頓 頗 領 頞 頭 頻 顆 題 額 顏 願 類 顧 顯 風 飄 飛 食 飯 飲 飽 飾 餅 養 餐 餘 館 首 香 馬 駐 駕 駛 騎 騙 騷 驅 驗 驚 骨 體 高 髮 鬆 鬥 鬧 鬱 鬼 魁 魂 魅 魔 魚 魯 鮮 鳥 鳳 鳴 鴻 鵝 鷹 鹿 麗 麥 麵 麻 麼 黃 黎 黑 默 點 黨 鼓 鼠 鼻 齊 齋 齒 齡 龍 龜]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[乍 仂 伏 佐 侶 僳 兆 兌 兹 别 券 勳 卑 卞 占 叶 堤 墎 壤 奥 孜 峇 嶼 巽 栗 楔 涅 渾 澎 燦 狄 琳 瑚 甫 碑 礁 芒 苗 茨 蓬 蚩 蜀 裘 謬 酋 隴]</exemplarCharacters>
+		<exemplarCharacters type="index">[一 丁 丈 不 且 丞 並 串 乘 乾 亂 亭 傀 僎 僵 儐 償 儳 儷 儻 叢 嚴 囌 囑 廳]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[‾ ﹉﹊﹋﹌ _ ＿ ﹍﹎﹏ ︳︴ \- － ﹣ ‐ – ︲ — ﹘ ︱ , ， ﹐ 、 ﹑ ; ； ﹔ \: ： ﹕ ! ！ ﹗ ? ？ ﹖ . ． ﹒ ‥ ︰ … 。 · ＇ ‘ ’ &quot; ＂ “ ” 〝 〞 ( （ ﹙ ︵ ) ） ﹚ ︶ \[ ［ \] ］ \{ ｛ ﹛ ︷ \} ｝ ﹜ ︸ 〈 ︿ 〉 ﹀ 《 ︽ 》 ︾ 「 ﹁ 」 ﹂ 『 ﹃ 』 ﹄ 【 ︻ 】 ︼ 〔 ﹝ ︹ 〕 ﹞ ︺ § @ ＠ ﹫ * ＊ ﹡ / ／ \\ ＼ ﹨ \&amp; ＆ ﹠ # ＃ ﹟ % ％ ﹪ ‰ † ‡ ‧ ′ ″ ‵ 〃 ※]</exemplarCharacters>
+		<ellipsis type="final">{0}…</ellipsis>
+		<ellipsis type="initial">…{0}</ellipsis>
+		<ellipsis type="medial">{0}…{1}</ellipsis>
+		<ellipsis type="word-final">{0} …</ellipsis>
+		<ellipsis type="word-initial">… {0}</ellipsis>
+		<ellipsis type="word-medial">{0} … {1}</ellipsis>
+		<moreInformation>？</moreInformation>
+	</characters>
+	<delimiters>
+		<quotationStart>「</quotationStart>
+		<quotationEnd>」</quotationEnd>
+		<alternateQuotationStart>『</alternateQuotationStart>
+		<alternateQuotationEnd>』</alternateQuotationEnd>
+	</delimiters>
+	<dates>
+		<calendars>
+			<calendar type="buddhist">
+				<eras>
+					<eraAbbr>
+						<era type="0" draft="contributed">佛曆</era>
+					</eraAbbr>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>Gy年M月d日EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>Gy年M月d日</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>Gy年M月d日</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>Gy/M/d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="d">d日</dateFormatItem>
+						<dateFormatItem id="Ed">d日（E）</dateFormatItem>
+						<dateFormatItem id="Gy">Gy年</dateFormatItem>
+						<dateFormatItem id="GyMMM">Gy年M月</dateFormatItem>
+						<dateFormatItem id="GyMMMd">Gy年M月d日</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">Gy年M月d日E</dateFormatItem>
+						<dateFormatItem id="M">M月</dateFormatItem>
+						<dateFormatItem id="Md">M/d</dateFormatItem>
+						<dateFormatItem id="MEd">M/d（E）</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
+						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
+						<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
+						<dateFormatItem id="y">Gy年</dateFormatItem>
+						<dateFormatItem id="yyyy">Gy年</dateFormatItem>
+						<dateFormatItem id="yyyyM">Gy/M</dateFormatItem>
+						<dateFormatItem id="yyyyMd">Gy/M/d</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">Gy/M/d（E）</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">Gy年M月</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">Gy年M月d日</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">Gy年M月d日E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">Gy年M月</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">Gy年QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">Gy年QQQQ</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="chinese">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">正月</month>
+							<month type="2">二月</month>
+							<month type="3">三月</month>
+							<month type="4">四月</month>
+							<month type="5">五月</month>
+							<month type="6">六月</month>
+							<month type="7">七月</month>
+							<month type="8">八月</month>
+							<month type="9">九月</month>
+							<month type="10">十月</month>
+							<month type="11">冬月</month>
+							<month type="12">臘月</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">正</month>
+							<month type="2">二</month>
+							<month type="3">三</month>
+							<month type="4">四</month>
+							<month type="5">五</month>
+							<month type="6">六</month>
+							<month type="7">七</month>
+							<month type="8">八</month>
+							<month type="9">九</month>
+							<month type="10">十</month>
+							<month type="11">冬</month>
+							<month type="12">臘</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">正月</month>
+							<month type="2">二月</month>
+							<month type="3">三月</month>
+							<month type="4">四月</month>
+							<month type="5">五月</month>
+							<month type="6">六月</month>
+							<month type="7">七月</month>
+							<month type="8">八月</month>
+							<month type="9">九月</month>
+							<month type="10">十月</month>
+							<month type="11">冬月</month>
+							<month type="12">臘月</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">正月</month>
+							<month type="2">二月</month>
+							<month type="3">三月</month>
+							<month type="4">四月</month>
+							<month type="5">五月</month>
+							<month type="6">六月</month>
+							<month type="7">七月</month>
+							<month type="8">八月</month>
+							<month type="9">九月</month>
+							<month type="10">十月</month>
+							<month type="11">冬月</month>
+							<month type="12">臘月</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">正</month>
+							<month type="2">二</month>
+							<month type="3">三</month>
+							<month type="4">四</month>
+							<month type="5">五</month>
+							<month type="6">六</month>
+							<month type="7">七</month>
+							<month type="8">八</month>
+							<month type="9">九</month>
+							<month type="10">十</month>
+							<month type="11">冬</month>
+							<month type="12">臘</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">正月</month>
+							<month type="2">二月</month>
+							<month type="3">三月</month>
+							<month type="4">四月</month>
+							<month type="5">五月</month>
+							<month type="6">六月</month>
+							<month type="7">七月</month>
+							<month type="8">八月</month>
+							<month type="9">九月</month>
+							<month type="10">十月</month>
+							<month type="11">冬月</month>
+							<month type="12">臘月</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<monthPatterns>
+					<monthPatternContext type="format">
+						<monthPatternWidth type="wide">
+							<monthPattern type="leap">閏{0}</monthPattern>
+						</monthPatternWidth>
+					</monthPatternContext>
+					<monthPatternContext type="numeric">
+						<monthPatternWidth type="all">
+							<monthPattern type="leap">閏{0}</monthPattern>
+						</monthPatternWidth>
+					</monthPatternContext>
+					<monthPatternContext type="stand-alone">
+						<monthPatternWidth type="narrow">
+							<monthPattern type="leap">閏{0}</monthPattern>
+						</monthPatternWidth>
+					</monthPatternContext>
+				</monthPatterns>
+				<cyclicNameSets>
+					<cyclicNameSet type="dayParts">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">子</cyclicName>
+								<cyclicName type="2">丑</cyclicName>
+								<cyclicName type="3">寅</cyclicName>
+								<cyclicName type="4">卯</cyclicName>
+								<cyclicName type="5">辰</cyclicName>
+								<cyclicName type="6">巳</cyclicName>
+								<cyclicName type="7">午</cyclicName>
+								<cyclicName type="8">未</cyclicName>
+								<cyclicName type="9">申</cyclicName>
+								<cyclicName type="10">酉</cyclicName>
+								<cyclicName type="11">戌</cyclicName>
+								<cyclicName type="12">亥</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+					<cyclicNameSet type="solarTerms">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">立春</cyclicName>
+								<cyclicName type="2">雨水</cyclicName>
+								<cyclicName type="3">驚蟄</cyclicName>
+								<cyclicName type="4">春分</cyclicName>
+								<cyclicName type="5">清明</cyclicName>
+								<cyclicName type="6">穀雨</cyclicName>
+								<cyclicName type="7">立夏</cyclicName>
+								<cyclicName type="8">小滿</cyclicName>
+								<cyclicName type="9">芒種</cyclicName>
+								<cyclicName type="10">夏至</cyclicName>
+								<cyclicName type="11">小暑</cyclicName>
+								<cyclicName type="12">大暑</cyclicName>
+								<cyclicName type="13">立秋</cyclicName>
+								<cyclicName type="14">處暑</cyclicName>
+								<cyclicName type="15">白露</cyclicName>
+								<cyclicName type="16">秋分</cyclicName>
+								<cyclicName type="17">寒露</cyclicName>
+								<cyclicName type="18">霜降</cyclicName>
+								<cyclicName type="19">立冬</cyclicName>
+								<cyclicName type="20">小雪</cyclicName>
+								<cyclicName type="21">大雪</cyclicName>
+								<cyclicName type="22">冬至</cyclicName>
+								<cyclicName type="23">小寒</cyclicName>
+								<cyclicName type="24">大寒</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+					<cyclicNameSet type="years">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">甲子</cyclicName>
+								<cyclicName type="2">乙丑</cyclicName>
+								<cyclicName type="3">丙寅</cyclicName>
+								<cyclicName type="4">丁卯</cyclicName>
+								<cyclicName type="5">戊辰</cyclicName>
+								<cyclicName type="6">己巳</cyclicName>
+								<cyclicName type="7">庚午</cyclicName>
+								<cyclicName type="8">辛未</cyclicName>
+								<cyclicName type="9">壬申</cyclicName>
+								<cyclicName type="10">癸酉</cyclicName>
+								<cyclicName type="11">甲戌</cyclicName>
+								<cyclicName type="12">乙亥</cyclicName>
+								<cyclicName type="13">丙子</cyclicName>
+								<cyclicName type="14">丁丑</cyclicName>
+								<cyclicName type="15">戊寅</cyclicName>
+								<cyclicName type="16">己卯</cyclicName>
+								<cyclicName type="17">庚辰</cyclicName>
+								<cyclicName type="18">辛巳</cyclicName>
+								<cyclicName type="19">壬午</cyclicName>
+								<cyclicName type="20">癸未</cyclicName>
+								<cyclicName type="21">甲申</cyclicName>
+								<cyclicName type="22">乙酉</cyclicName>
+								<cyclicName type="23">丙戌</cyclicName>
+								<cyclicName type="24">丁亥</cyclicName>
+								<cyclicName type="25">戊子</cyclicName>
+								<cyclicName type="26">己丑</cyclicName>
+								<cyclicName type="27">庚寅</cyclicName>
+								<cyclicName type="28">辛卯</cyclicName>
+								<cyclicName type="29">壬辰</cyclicName>
+								<cyclicName type="30">癸巳</cyclicName>
+								<cyclicName type="31">甲午</cyclicName>
+								<cyclicName type="32">乙未</cyclicName>
+								<cyclicName type="33">丙申</cyclicName>
+								<cyclicName type="34">丁酉</cyclicName>
+								<cyclicName type="35">戊戌</cyclicName>
+								<cyclicName type="36">己亥</cyclicName>
+								<cyclicName type="37">庚子</cyclicName>
+								<cyclicName type="38">辛丑</cyclicName>
+								<cyclicName type="39">壬寅</cyclicName>
+								<cyclicName type="40">癸卯</cyclicName>
+								<cyclicName type="41">甲辰</cyclicName>
+								<cyclicName type="42">乙巳</cyclicName>
+								<cyclicName type="43">丙午</cyclicName>
+								<cyclicName type="44">丁未</cyclicName>
+								<cyclicName type="45">戊申</cyclicName>
+								<cyclicName type="46">己酉</cyclicName>
+								<cyclicName type="47">庚戌</cyclicName>
+								<cyclicName type="48">辛亥</cyclicName>
+								<cyclicName type="49">壬子</cyclicName>
+								<cyclicName type="50">癸丑</cyclicName>
+								<cyclicName type="51">甲寅</cyclicName>
+								<cyclicName type="52">乙卯</cyclicName>
+								<cyclicName type="53">丙辰</cyclicName>
+								<cyclicName type="54">丁巳</cyclicName>
+								<cyclicName type="55">戊午</cyclicName>
+								<cyclicName type="56">己未</cyclicName>
+								<cyclicName type="57">庚申</cyclicName>
+								<cyclicName type="58">辛酉</cyclicName>
+								<cyclicName type="59">壬戌</cyclicName>
+								<cyclicName type="60">癸亥</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+					<cyclicNameSet type="zodiacs">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">鼠</cyclicName>
+								<cyclicName type="2">牛</cyclicName>
+								<cyclicName type="3">虎</cyclicName>
+								<cyclicName type="4">兔</cyclicName>
+								<cyclicName type="5">龍</cyclicName>
+								<cyclicName type="6">蛇</cyclicName>
+								<cyclicName type="7">馬</cyclicName>
+								<cyclicName type="8">羊</cyclicName>
+								<cyclicName type="9">猴</cyclicName>
+								<cyclicName type="10">雞</cyclicName>
+								<cyclicName type="11">狗</cyclicName>
+								<cyclicName type="12">豬</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+				</cyclicNameSets>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern numbers="d=hanidays">U (r) 年MMMdEEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern numbers="d=hanidays">U (r) 年MMMd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern numbers="d=hanidays">r年MMMd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>r/M/d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="d">d日</dateFormatItem>
+						<dateFormatItem id="Ed">d日E</dateFormatItem>
+						<dateFormatItem id="Gy">rU年</dateFormatItem>
+						<dateFormatItem id="GyMMM">rU年MMM</dateFormatItem>
+						<dateFormatItem id="GyMMMd">r年MMMd</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">rU年MMMdE</dateFormatItem>
+						<dateFormatItem id="M">MMM</dateFormatItem>
+						<dateFormatItem id="Md">M/d</dateFormatItem>
+						<dateFormatItem id="MEd">M/dE</dateFormatItem>
+						<dateFormatItem id="MMMd">MMMd日</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMMd日E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMMd日</dateFormatItem>
+						<dateFormatItem id="UM">U年MMM</dateFormatItem>
+						<dateFormatItem id="UMd">U年MMMd</dateFormatItem>
+						<dateFormatItem id="UMMM">U年MMM</dateFormatItem>
+						<dateFormatItem id="UMMMd">U年MMMd</dateFormatItem>
+						<dateFormatItem id="y">rU年</dateFormatItem>
+						<dateFormatItem id="yMd">r年MMMd</dateFormatItem>
+						<dateFormatItem id="yyyy">rU年</dateFormatItem>
+						<dateFormatItem id="yyyyM">rU年MMM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">r年MMMd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">rU年MMMd，E</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">rU年MMM</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">r年MMMd</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">rU年MMMdE</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">rU年MMMM</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">rU年QQQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">rU年QQQQ</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback>{0}至{1}</intervalFormatFallback>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d日至d日</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">ah時至ah時</greatestDifference>
+							<greatestDifference id="h">ah時至h時</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">ah:mm至ah:mm</greatestDifference>
+							<greatestDifference id="h">ah:mm至h:mm</greatestDifference>
+							<greatestDifference id="m">ah:mm至h:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a" draft="contributed">ah:mm至ah:mm [v]</greatestDifference>
+							<greatestDifference id="h" draft="contributed">ah:mm至h:mm [v]</greatestDifference>
+							<greatestDifference id="m" draft="contributed">ah:mm至h:mm [v]</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm–HH:mm [v]</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm [v]</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a" draft="contributed">ah時至ah時 [v]</greatestDifference>
+							<greatestDifference id="h" draft="contributed">ah時至h時 [v]</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH [v]</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">MMM至MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">M/d至M/d</greatestDifference>
+							<greatestDifference id="M">M/d至M/d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">M/dE至M/dE</greatestDifference>
+							<greatestDifference id="M">M/dE至M/dE</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">LLL至LLL</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">MMMd日至d日</greatestDifference>
+							<greatestDifference id="M">MMMd日至MMMd日</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMMd日E至d日E</greatestDifference>
+							<greatestDifference id="M">MMMd日E至MMMd日E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMM">
+							<greatestDifference id="M">LLLL至LLLL</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">rU至rU</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">r/M至r/M</greatestDifference>
+							<greatestDifference id="y">r/M至r/M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">r/M/d至r/M/d</greatestDifference>
+							<greatestDifference id="M">r/M/d至r/M/d</greatestDifference>
+							<greatestDifference id="y">r/M/d至r/M/d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">r/M/dE至r/M/dE</greatestDifference>
+							<greatestDifference id="M">r/M/dE至r/M/dE</greatestDifference>
+							<greatestDifference id="y">r/M/dE至r/M/dE</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">rU年MMM至MMM</greatestDifference>
+							<greatestDifference id="y">rU年MMM至rU年MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">r年MMMd至d</greatestDifference>
+							<greatestDifference id="M">r年MMMd至MMMd</greatestDifference>
+							<greatestDifference id="y">r年MMMd至r年MMMd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">rU年MMMdE至dE</greatestDifference>
+							<greatestDifference id="M">rU年MMMdE至MMMdE</greatestDifference>
+							<greatestDifference id="y">rU年MMMdE至rU年MMMdE</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">rU年MMMM至MMMM</greatestDifference>
+							<greatestDifference id="y">rU年MMMM至rU年MMMM</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="coptic">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">1月</month>
+							<month type="2" draft="contributed">2月</month>
+							<month type="3" draft="contributed">3月</month>
+							<month type="4" draft="contributed">4月</month>
+							<month type="5" draft="contributed">5月</month>
+							<month type="6" draft="contributed">6月</month>
+							<month type="7" draft="contributed">7月</month>
+							<month type="8" draft="contributed">8月</month>
+							<month type="9" draft="contributed">9月</month>
+							<month type="10" draft="contributed">10月</month>
+							<month type="11" draft="contributed">11月</month>
+							<month type="12" draft="contributed">12月</month>
+							<month type="13" draft="contributed">13月</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">1</month>
+							<month type="2" draft="contributed">2</month>
+							<month type="3" draft="contributed">3</month>
+							<month type="4" draft="contributed">4</month>
+							<month type="5" draft="contributed">5</month>
+							<month type="6" draft="contributed">6</month>
+							<month type="7" draft="contributed">7</month>
+							<month type="8" draft="contributed">8</month>
+							<month type="9" draft="contributed">9</month>
+							<month type="10" draft="contributed">10</month>
+							<month type="11" draft="contributed">11</month>
+							<month type="12" draft="contributed">12</month>
+							<month type="13" draft="contributed">13</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">1月</month>
+							<month type="2" draft="contributed">2月</month>
+							<month type="3" draft="contributed">3月</month>
+							<month type="4" draft="contributed">4月</month>
+							<month type="5" draft="contributed">5月</month>
+							<month type="6" draft="contributed">6月</month>
+							<month type="7" draft="contributed">7月</month>
+							<month type="8" draft="contributed">8月</month>
+							<month type="9" draft="contributed">9月</month>
+							<month type="10" draft="contributed">10月</month>
+							<month type="11" draft="contributed">11月</month>
+							<month type="12" draft="contributed">12月</month>
+							<month type="13" draft="contributed">13月</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">1月</month>
+							<month type="2" draft="contributed">2月</month>
+							<month type="3" draft="contributed">3月</month>
+							<month type="4" draft="contributed">4月</month>
+							<month type="5" draft="contributed">5月</month>
+							<month type="6" draft="contributed">6月</month>
+							<month type="7" draft="contributed">7月</month>
+							<month type="8" draft="contributed">8月</month>
+							<month type="9" draft="contributed">9月</month>
+							<month type="10" draft="contributed">10月</month>
+							<month type="11" draft="contributed">11月</month>
+							<month type="12" draft="contributed">12月</month>
+							<month type="13" draft="contributed">13月</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">1</month>
+							<month type="2" draft="contributed">2</month>
+							<month type="3" draft="contributed">3</month>
+							<month type="4" draft="contributed">4</month>
+							<month type="5" draft="contributed">5</month>
+							<month type="6" draft="contributed">6</month>
+							<month type="7" draft="contributed">7</month>
+							<month type="8" draft="contributed">8</month>
+							<month type="9" draft="contributed">9</month>
+							<month type="10" draft="contributed">10</month>
+							<month type="11" draft="contributed">11</month>
+							<month type="12" draft="contributed">12</month>
+							<month type="13" draft="contributed">13</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">1月</month>
+							<month type="2" draft="contributed">2月</month>
+							<month type="3" draft="contributed">3月</month>
+							<month type="4" draft="contributed">4月</month>
+							<month type="5" draft="contributed">5月</month>
+							<month type="6" draft="contributed">6月</month>
+							<month type="7" draft="contributed">7月</month>
+							<month type="8" draft="contributed">8月</month>
+							<month type="9" draft="contributed">9月</month>
+							<month type="10" draft="contributed">10月</month>
+							<month type="11" draft="contributed">11月</month>
+							<month type="12" draft="contributed">12月</month>
+							<month type="13" draft="contributed">13月</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+			</calendar>
+			<calendar type="dangi">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">正月</month>
+							<month type="2">二月</month>
+							<month type="3">三月</month>
+							<month type="4">四月</month>
+							<month type="5">五月</month>
+							<month type="6">六月</month>
+							<month type="7">七月</month>
+							<month type="8">八月</month>
+							<month type="9">九月</month>
+							<month type="10">十月</month>
+							<month type="11">十一月</month>
+							<month type="12">十二月</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">正</month>
+							<month type="2">二</month>
+							<month type="3">三</month>
+							<month type="4">四</month>
+							<month type="5">五</month>
+							<month type="6">六</month>
+							<month type="7">七</month>
+							<month type="8">八</month>
+							<month type="9">九</month>
+							<month type="10">十</month>
+							<month type="11">十一</month>
+							<month type="12">十二</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">正月</month>
+							<month type="2">二月</month>
+							<month type="3">三月</month>
+							<month type="4">四月</month>
+							<month type="5">五月</month>
+							<month type="6">六月</month>
+							<month type="7">七月</month>
+							<month type="8">八月</month>
+							<month type="9">九月</month>
+							<month type="10">十月</month>
+							<month type="11">十一月</month>
+							<month type="12">十二月</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">正月</month>
+							<month type="2">二月</month>
+							<month type="3">三月</month>
+							<month type="4">四月</month>
+							<month type="5">五月</month>
+							<month type="6">六月</month>
+							<month type="7">七月</month>
+							<month type="8">八月</month>
+							<month type="9">九月</month>
+							<month type="10">十月</month>
+							<month type="11">十一月</month>
+							<month type="12">十二月</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">正</month>
+							<month type="2">二</month>
+							<month type="3">三</month>
+							<month type="4">四</month>
+							<month type="5">五</month>
+							<month type="6">六</month>
+							<month type="7">七</month>
+							<month type="8">八</month>
+							<month type="9">九</month>
+							<month type="10">十</month>
+							<month type="11">十一</month>
+							<month type="12">十二</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">正月</month>
+							<month type="2">二月</month>
+							<month type="3">三月</month>
+							<month type="4">四月</month>
+							<month type="5">五月</month>
+							<month type="6">六月</month>
+							<month type="7">七月</month>
+							<month type="8">八月</month>
+							<month type="9">九月</month>
+							<month type="10">十月</month>
+							<month type="11">十一月</month>
+							<month type="12">十二月</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<cyclicNameSets>
+					<cyclicNameSet type="dayParts">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">子</cyclicName>
+								<cyclicName type="2">丑</cyclicName>
+								<cyclicName type="3">寅</cyclicName>
+								<cyclicName type="4">卯</cyclicName>
+								<cyclicName type="5">辰</cyclicName>
+								<cyclicName type="6">巳</cyclicName>
+								<cyclicName type="7">午</cyclicName>
+								<cyclicName type="8">未</cyclicName>
+								<cyclicName type="9">申</cyclicName>
+								<cyclicName type="10">酉</cyclicName>
+								<cyclicName type="11">戌</cyclicName>
+								<cyclicName type="12">亥</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+					<cyclicNameSet type="years">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">甲子</cyclicName>
+								<cyclicName type="2">乙丑</cyclicName>
+								<cyclicName type="3">丙寅</cyclicName>
+								<cyclicName type="4">丁卯</cyclicName>
+								<cyclicName type="5">戊辰</cyclicName>
+								<cyclicName type="6">己巳</cyclicName>
+								<cyclicName type="7">庚午</cyclicName>
+								<cyclicName type="8">辛未</cyclicName>
+								<cyclicName type="9">壬申</cyclicName>
+								<cyclicName type="10">癸酉</cyclicName>
+								<cyclicName type="11">甲戌</cyclicName>
+								<cyclicName type="12">乙亥</cyclicName>
+								<cyclicName type="13">丙子</cyclicName>
+								<cyclicName type="14">丁丑</cyclicName>
+								<cyclicName type="15">戊寅</cyclicName>
+								<cyclicName type="16">己卯</cyclicName>
+								<cyclicName type="17">庚辰</cyclicName>
+								<cyclicName type="18">辛巳</cyclicName>
+								<cyclicName type="19">壬午</cyclicName>
+								<cyclicName type="20">癸未</cyclicName>
+								<cyclicName type="21">甲申</cyclicName>
+								<cyclicName type="22">乙酉</cyclicName>
+								<cyclicName type="23">丙戌</cyclicName>
+								<cyclicName type="24">丁亥</cyclicName>
+								<cyclicName type="25">戊子</cyclicName>
+								<cyclicName type="26">己丑</cyclicName>
+								<cyclicName type="27">庚寅</cyclicName>
+								<cyclicName type="28">辛卯</cyclicName>
+								<cyclicName type="29">壬辰</cyclicName>
+								<cyclicName type="30">癸巳</cyclicName>
+								<cyclicName type="31">甲午</cyclicName>
+								<cyclicName type="32">乙未</cyclicName>
+								<cyclicName type="33">丙申</cyclicName>
+								<cyclicName type="34">丁酉</cyclicName>
+								<cyclicName type="35">戊戌</cyclicName>
+								<cyclicName type="36">己亥</cyclicName>
+								<cyclicName type="37">庚子</cyclicName>
+								<cyclicName type="38">辛丑</cyclicName>
+								<cyclicName type="39">壬寅</cyclicName>
+								<cyclicName type="40">癸卯</cyclicName>
+								<cyclicName type="41">甲辰</cyclicName>
+								<cyclicName type="42">乙巳</cyclicName>
+								<cyclicName type="43">丙午</cyclicName>
+								<cyclicName type="44">丁未</cyclicName>
+								<cyclicName type="45">戊申</cyclicName>
+								<cyclicName type="46">己酉</cyclicName>
+								<cyclicName type="47">庚戌</cyclicName>
+								<cyclicName type="48">辛亥</cyclicName>
+								<cyclicName type="49">壬子</cyclicName>
+								<cyclicName type="50">癸丑</cyclicName>
+								<cyclicName type="51">甲寅</cyclicName>
+								<cyclicName type="52">乙卯</cyclicName>
+								<cyclicName type="53">丙辰</cyclicName>
+								<cyclicName type="54">丁巳</cyclicName>
+								<cyclicName type="55">戊午</cyclicName>
+								<cyclicName type="56">己未</cyclicName>
+								<cyclicName type="57">庚申</cyclicName>
+								<cyclicName type="58">辛酉</cyclicName>
+								<cyclicName type="59">壬戌</cyclicName>
+								<cyclicName type="60">癸亥</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+					<cyclicNameSet type="zodiacs">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">鼠</cyclicName>
+								<cyclicName type="2">牛</cyclicName>
+								<cyclicName type="3">虎</cyclicName>
+								<cyclicName type="4">兔</cyclicName>
+								<cyclicName type="5">龍</cyclicName>
+								<cyclicName type="6">蛇</cyclicName>
+								<cyclicName type="7">馬</cyclicName>
+								<cyclicName type="8">羊</cyclicName>
+								<cyclicName type="9">猴</cyclicName>
+								<cyclicName type="10">雞</cyclicName>
+								<cyclicName type="11">狗</cyclicName>
+								<cyclicName type="12">豬</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+				</cyclicNameSets>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>U年MMMd日EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>U年MMMd日</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>U年MMMd日</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>U/M/d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+			</calendar>
+			<calendar type="ethiopic">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">1月</month>
+							<month type="2" draft="contributed">2月</month>
+							<month type="3" draft="contributed">3月</month>
+							<month type="4" draft="contributed">4月</month>
+							<month type="5" draft="contributed">5月</month>
+							<month type="6" draft="contributed">6月</month>
+							<month type="7" draft="contributed">7月</month>
+							<month type="8" draft="contributed">8月</month>
+							<month type="9" draft="contributed">9月</month>
+							<month type="10" draft="contributed">10月</month>
+							<month type="11" draft="contributed">11月</month>
+							<month type="12" draft="contributed">12月</month>
+							<month type="13" draft="contributed">13月</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">1</month>
+							<month type="2" draft="contributed">2</month>
+							<month type="3" draft="contributed">3</month>
+							<month type="4" draft="contributed">4</month>
+							<month type="5" draft="contributed">5</month>
+							<month type="6" draft="contributed">6</month>
+							<month type="7" draft="contributed">7</month>
+							<month type="8" draft="contributed">8</month>
+							<month type="9" draft="contributed">9</month>
+							<month type="10" draft="contributed">10</month>
+							<month type="11" draft="contributed">11</month>
+							<month type="12" draft="contributed">12</month>
+							<month type="13" draft="contributed">13</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">1月</month>
+							<month type="2" draft="contributed">2月</month>
+							<month type="3" draft="contributed">3月</month>
+							<month type="4" draft="contributed">4月</month>
+							<month type="5" draft="contributed">5月</month>
+							<month type="6" draft="contributed">6月</month>
+							<month type="7" draft="contributed">7月</month>
+							<month type="8" draft="contributed">8月</month>
+							<month type="9" draft="contributed">9月</month>
+							<month type="10" draft="contributed">10月</month>
+							<month type="11" draft="contributed">11月</month>
+							<month type="12" draft="contributed">12月</month>
+							<month type="13" draft="contributed">13月</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">1月</month>
+							<month type="2" draft="contributed">2月</month>
+							<month type="3" draft="contributed">3月</month>
+							<month type="4" draft="contributed">4月</month>
+							<month type="5" draft="contributed">5月</month>
+							<month type="6" draft="contributed">6月</month>
+							<month type="7" draft="contributed">7月</month>
+							<month type="8" draft="contributed">8月</month>
+							<month type="9" draft="contributed">9月</month>
+							<month type="10" draft="contributed">10月</month>
+							<month type="11" draft="contributed">11月</month>
+							<month type="12" draft="contributed">12月</month>
+							<month type="13" draft="contributed">13月</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">1</month>
+							<month type="2" draft="contributed">2</month>
+							<month type="3" draft="contributed">3</month>
+							<month type="4" draft="contributed">4</month>
+							<month type="5" draft="contributed">5</month>
+							<month type="6" draft="contributed">6</month>
+							<month type="7" draft="contributed">7</month>
+							<month type="8" draft="contributed">8</month>
+							<month type="9" draft="contributed">9</month>
+							<month type="10" draft="contributed">10</month>
+							<month type="11" draft="contributed">11</month>
+							<month type="12" draft="contributed">12</month>
+							<month type="13" draft="contributed">13</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">1月</month>
+							<month type="2" draft="contributed">2月</month>
+							<month type="3" draft="contributed">3月</month>
+							<month type="4" draft="contributed">4月</month>
+							<month type="5" draft="contributed">5月</month>
+							<month type="6" draft="contributed">6月</month>
+							<month type="7" draft="contributed">7月</month>
+							<month type="8" draft="contributed">8月</month>
+							<month type="9" draft="contributed">9月</month>
+							<month type="10" draft="contributed">10月</month>
+							<month type="11" draft="contributed">11月</month>
+							<month type="12" draft="contributed">12月</month>
+							<month type="13" draft="contributed">13月</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+			</calendar>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G y年M月d日 EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G y年M月d日</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G y年M月d日</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>G y/M/d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1}{0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="d">d日</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
+						<dateFormatItem id="Ed">d E</dateFormatItem>
+						<dateFormatItem id="Gy">G y年</dateFormatItem>
+						<dateFormatItem id="GyMMM">G y年M月</dateFormatItem>
+						<dateFormatItem id="GyMMMd">G y年M月d日</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y年M月d日 E</dateFormatItem>
+						<dateFormatItem id="h">ah時</dateFormatItem>
+						<dateFormatItem id="H">H時</dateFormatItem>
+						<dateFormatItem id="hm">ah:mm</dateFormatItem>
+						<dateFormatItem id="Hm">H:mm</dateFormatItem>
+						<dateFormatItem id="hms">ah:mm:ss</dateFormatItem>
+						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+						<dateFormatItem id="M">M月</dateFormatItem>
+						<dateFormatItem id="Md">M/d</dateFormatItem>
+						<dateFormatItem id="MEd">M/d（E）</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
+						<dateFormatItem id="MMMEd">M月d日 E</dateFormatItem>
+						<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
+						<dateFormatItem id="ms">mm:ss</dateFormatItem>
+						<dateFormatItem id="y">G y年</dateFormatItem>
+						<dateFormatItem id="yyyy">G y年</dateFormatItem>
+						<dateFormatItem id="yyyyM">G y/M</dateFormatItem>
+						<dateFormatItem id="yyyyMd">G y/M/d</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">G y/M/d（E）</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">G y年M月</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">G y年M月d日</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y年M月d日 E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y年M月</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">G y年QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">G y年QQQQ</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback>{0}至{1}</intervalFormatFallback>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d日至d日</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">ah時至ah時</greatestDifference>
+							<greatestDifference id="h">ah時至h時</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">ah:mm至ah:mm</greatestDifference>
+							<greatestDifference id="h">ah:mm至h:mm</greatestDifference>
+							<greatestDifference id="m">ah:mm至h:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="m" draft="provisional">HH:mm–HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a" draft="contributed">ah:mm至ah:mm [v]</greatestDifference>
+							<greatestDifference id="h" draft="contributed">ah:mm至h:mm [v]</greatestDifference>
+							<greatestDifference id="m" draft="contributed">ah:mm至h:mm [v]</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm–HH:mm [v]</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm [v]</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a" draft="contributed">ah時至ah時 [v]</greatestDifference>
+							<greatestDifference id="h" draft="contributed">ah時至h時 [v]</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH [v]</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">M月至M月</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">M/d至M/d</greatestDifference>
+							<greatestDifference id="M">M/d至M/d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">d/M (E) 至 d/M (E)</greatestDifference>
+							<greatestDifference id="M">d/M (E) 至 d/M (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">LLL至LLL</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">M月d日至d日</greatestDifference>
+							<greatestDifference id="M">M月d日至M月d日</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">M月d日E至d日E</greatestDifference>
+							<greatestDifference id="M">M月d日E至M月d日E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMM">
+							<greatestDifference id="M">LLLL至LLLL</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">G y至y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">G y/M至y/M</greatestDifference>
+							<greatestDifference id="y">G y/M至y/M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">G y/M/d至y/M/d</greatestDifference>
+							<greatestDifference id="M">G y/M/d至y/M/d</greatestDifference>
+							<greatestDifference id="y">G y/M/d至y/M/d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">G y/M/dE至y/M/dE</greatestDifference>
+							<greatestDifference id="M">G y/M/dE至y/M/dE</greatestDifference>
+							<greatestDifference id="y">G y/M/dE至y/M/dE</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">G y年M月至M月</greatestDifference>
+							<greatestDifference id="y">G y年M月至y年M月</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">G y年M月d日至d日</greatestDifference>
+							<greatestDifference id="M">G y年M月d日至M月d日</greatestDifference>
+							<greatestDifference id="y">G y年M月d日至y年M月d日</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">G y年M月d日E至d日E</greatestDifference>
+							<greatestDifference id="M">G y年M月d日E至M月d日E</greatestDifference>
+							<greatestDifference id="y">G y年M月d日E至y年M月d日E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">G y年M月至M月</greatestDifference>
+							<greatestDifference id="y">G y年M月至y年M月</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">1月</month>
+							<month type="2">2月</month>
+							<month type="3">3月</month>
+							<month type="4">4月</month>
+							<month type="5">5月</month>
+							<month type="6">6月</month>
+							<month type="7">7月</month>
+							<month type="8">8月</month>
+							<month type="9">9月</month>
+							<month type="10">10月</month>
+							<month type="11">11月</month>
+							<month type="12">12月</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">1</month>
+							<month type="2">2</month>
+							<month type="3">3</month>
+							<month type="4">4</month>
+							<month type="5">5</month>
+							<month type="6">6</month>
+							<month type="7">7</month>
+							<month type="8">8</month>
+							<month type="9">9</month>
+							<month type="10">10</month>
+							<month type="11">11</month>
+							<month type="12">12</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">1月</month>
+							<month type="2">2月</month>
+							<month type="3">3月</month>
+							<month type="4">4月</month>
+							<month type="5">5月</month>
+							<month type="6">6月</month>
+							<month type="7">7月</month>
+							<month type="8">8月</month>
+							<month type="9">9月</month>
+							<month type="10">10月</month>
+							<month type="11">11月</month>
+							<month type="12">12月</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">1月</month>
+							<month type="2">2月</month>
+							<month type="3">3月</month>
+							<month type="4">4月</month>
+							<month type="5">5月</month>
+							<month type="6">6月</month>
+							<month type="7">7月</month>
+							<month type="8">8月</month>
+							<month type="9">9月</month>
+							<month type="10">10月</month>
+							<month type="11">11月</month>
+							<month type="12">12月</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">1</month>
+							<month type="2">2</month>
+							<month type="3">3</month>
+							<month type="4">4</month>
+							<month type="5">5</month>
+							<month type="6">6</month>
+							<month type="7">7</month>
+							<month type="8">8</month>
+							<month type="9">9</month>
+							<month type="10">10</month>
+							<month type="11">11</month>
+							<month type="12">12</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">1月</month>
+							<month type="2">2月</month>
+							<month type="3">3月</month>
+							<month type="4">4月</month>
+							<month type="5">5月</month>
+							<month type="6">6月</month>
+							<month type="7">7月</month>
+							<month type="8">8月</month>
+							<month type="9">9月</month>
+							<month type="10">10月</month>
+							<month type="11">11月</month>
+							<month type="12">12月</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="abbreviated">
+							<day type="sun">週日</day>
+							<day type="mon">週一</day>
+							<day type="tue">週二</day>
+							<day type="wed">週三</day>
+							<day type="thu">週四</day>
+							<day type="fri">週五</day>
+							<day type="sat">週六</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun">日</day>
+							<day type="mon">一</day>
+							<day type="tue">二</day>
+							<day type="wed">三</day>
+							<day type="thu">四</day>
+							<day type="fri">五</day>
+							<day type="sat">六</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">日</day>
+							<day type="mon">一</day>
+							<day type="tue">二</day>
+							<day type="wed">三</day>
+							<day type="thu">四</day>
+							<day type="fri">五</day>
+							<day type="sat">六</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun">星期日</day>
+							<day type="mon">星期一</day>
+							<day type="tue">星期二</day>
+							<day type="wed">星期三</day>
+							<day type="thu">星期四</day>
+							<day type="fri">星期五</day>
+							<day type="sat">星期六</day>
+						</dayWidth>
+					</dayContext>
+					<dayContext type="stand-alone">
+						<dayWidth type="abbreviated">
+							<day type="sun">週日</day>
+							<day type="mon">週一</day>
+							<day type="tue">週二</day>
+							<day type="wed">週三</day>
+							<day type="thu">週四</day>
+							<day type="fri">週五</day>
+							<day type="sat">週六</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun">日</day>
+							<day type="mon">一</day>
+							<day type="tue">二</day>
+							<day type="wed">三</day>
+							<day type="thu">四</day>
+							<day type="fri">五</day>
+							<day type="sat">六</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">日</day>
+							<day type="mon">一</day>
+							<day type="tue">二</day>
+							<day type="wed">三</day>
+							<day type="thu">四</day>
+							<day type="fri">五</day>
+							<day type="sat">六</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun">星期日</day>
+							<day type="mon">星期一</day>
+							<day type="tue">星期二</day>
+							<day type="wed">星期三</day>
+							<day type="thu">星期四</day>
+							<day type="fri">星期五</day>
+							<day type="sat">星期六</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<quarters>
+					<quarterContext type="format">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">1季</quarter>
+							<quarter type="2">2季</quarter>
+							<quarter type="3">3季</quarter>
+							<quarter type="4">4季</quarter>
+						</quarterWidth>
+						<quarterWidth type="narrow">
+							<quarter type="1">1</quarter>
+							<quarter type="2">2</quarter>
+							<quarter type="3">3</quarter>
+							<quarter type="4">4</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1">第1季</quarter>
+							<quarter type="2">第2季</quarter>
+							<quarter type="3">第3季</quarter>
+							<quarter type="4">第4季</quarter>
+						</quarterWidth>
+					</quarterContext>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">1季</quarter>
+							<quarter type="2">2季</quarter>
+							<quarter type="3">3季</quarter>
+							<quarter type="4">4季</quarter>
+						</quarterWidth>
+						<quarterWidth type="narrow">
+							<quarter type="1">1</quarter>
+							<quarter type="2">2</quarter>
+							<quarter type="3">3</quarter>
+							<quarter type="4">4</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1">第1季</quarter>
+							<quarter type="2">第2季</quarter>
+							<quarter type="3">第3季</quarter>
+							<quarter type="4">第4季</quarter>
+						</quarterWidth>
+					</quarterContext>
+				</quarters>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">午夜</dayPeriod>
+							<dayPeriod type="am">上午</dayPeriod>
+							<dayPeriod type="pm">下午</dayPeriod>
+							<dayPeriod type="morning1">清晨</dayPeriod>
+							<dayPeriod type="morning2">朝早</dayPeriod>
+							<dayPeriod type="afternoon1">中午</dayPeriod>
+							<dayPeriod type="afternoon2">下晝</dayPeriod>
+							<dayPeriod type="evening1">夜晚</dayPeriod>
+							<dayPeriod type="night1">凌晨</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">午夜</dayPeriod>
+							<dayPeriod type="am">朝早</dayPeriod>
+							<dayPeriod type="pm">下晝</dayPeriod>
+							<dayPeriod type="morning1">清晨</dayPeriod>
+							<dayPeriod type="morning2">朝早</dayPeriod>
+							<dayPeriod type="afternoon1">中午</dayPeriod>
+							<dayPeriod type="afternoon2">下晝</dayPeriod>
+							<dayPeriod type="evening1">夜晚</dayPeriod>
+							<dayPeriod type="night1">凌晨</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">午夜</dayPeriod>
+							<dayPeriod type="am">上午</dayPeriod>
+							<dayPeriod type="pm">下午</dayPeriod>
+							<dayPeriod type="morning1">清晨</dayPeriod>
+							<dayPeriod type="morning2">朝早</dayPeriod>
+							<dayPeriod type="afternoon1">中午</dayPeriod>
+							<dayPeriod type="afternoon2">下晝</dayPeriod>
+							<dayPeriod type="evening1">夜晚</dayPeriod>
+							<dayPeriod type="night1">凌晨</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">午夜</dayPeriod>
+							<dayPeriod type="morning1">清晨</dayPeriod>
+							<dayPeriod type="morning2">朝早</dayPeriod>
+							<dayPeriod type="afternoon1">中午</dayPeriod>
+							<dayPeriod type="afternoon2">下晝</dayPeriod>
+							<dayPeriod type="evening1">夜晚</dayPeriod>
+							<dayPeriod type="night1">凌晨</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">下晝</dayPeriod>
+							<dayPeriod type="am">朝早</dayPeriod>
+							<dayPeriod type="pm">下午</dayPeriod>
+							<dayPeriod type="morning1">夜晚</dayPeriod>
+							<dayPeriod type="morning2">朝早</dayPeriod>
+							<dayPeriod type="afternoon1">中午</dayPeriod>
+							<dayPeriod type="afternoon2">下晝</dayPeriod>
+							<dayPeriod type="evening1">夜晚</dayPeriod>
+							<dayPeriod type="night1">凌晨</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">午夜</dayPeriod>
+							<dayPeriod type="morning1">清晨</dayPeriod>
+							<dayPeriod type="morning2">朝早</dayPeriod>
+							<dayPeriod type="afternoon1">中午</dayPeriod>
+							<dayPeriod type="afternoon2">下晝</dayPeriod>
+							<dayPeriod type="evening1">夜晚</dayPeriod>
+							<dayPeriod type="night1">凌晨</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<eras>
+					<eraNames>
+						<era type="0">西元前</era>
+						<era type="0" alt="variant">公元前</era>
+						<era type="1">西元</era>
+						<era type="1" alt="variant">公元</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">西元前</era>
+						<era type="0" alt="variant">公元前</era>
+						<era type="1">西元</era>
+						<era type="1" alt="variant">公元</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0">西元前</era>
+						<era type="0" alt="variant" draft="contributed">公元前</era>
+						<era type="1">西元</era>
+						<era type="1" alt="variant" draft="contributed">公元</era>
+					</eraNarrow>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>y年M月d日 EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>y年M月d日</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>y年M月d日</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>y/M/d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>ah:mm:ss [zzzz]</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>ah:mm:ss [z]</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>ah:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>ah:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="d">d日</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
+						<dateFormatItem id="Ed">d E</dateFormatItem>
+						<dateFormatItem id="Ehm">E ah:mm</dateFormatItem>
+						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
+						<dateFormatItem id="Ehms">E ah:mm:ss</dateFormatItem>
+						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="Gy">Gy年</dateFormatItem>
+						<dateFormatItem id="GyMMM">Gy年M月</dateFormatItem>
+						<dateFormatItem id="GyMMMd">Gy年M月d日</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">Gy年M月d日 E</dateFormatItem>
+						<dateFormatItem id="h">ah時</dateFormatItem>
+						<dateFormatItem id="H">H時</dateFormatItem>
+						<dateFormatItem id="hm">ah:mm</dateFormatItem>
+						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
+						<dateFormatItem id="hms">ah:mm:ss</dateFormatItem>
+						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">ah:mm:ss [v]</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss [v]</dateFormatItem>
+						<dateFormatItem id="hmv">ah:mm [v]</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm [v]</dateFormatItem>
+						<dateFormatItem id="M">M月</dateFormatItem>
+						<dateFormatItem id="Md">M/d</dateFormatItem>
+						<dateFormatItem id="MEd">M/d（E）</dateFormatItem>
+						<dateFormatItem id="MMdd">MM/dd</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
+						<dateFormatItem id="MMMEd">M月d日 E</dateFormatItem>
+						<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
+						<dateFormatItem id="ms">mm:ss</dateFormatItem>
+						<dateFormatItem id="y">y年</dateFormatItem>
+						<dateFormatItem id="yM">y/M</dateFormatItem>
+						<dateFormatItem id="yMd">y/M/d</dateFormatItem>
+						<dateFormatItem id="yMEd">y/M/d（E）</dateFormatItem>
+						<dateFormatItem id="yMM">y/MM</dateFormatItem>
+						<dateFormatItem id="yMMM">y年M月</dateFormatItem>
+						<dateFormatItem id="yMMMd">y年M月d日</dateFormatItem>
+						<dateFormatItem id="yMMMEd">y年M月d日 E</dateFormatItem>
+						<dateFormatItem id="yMMMM">y年M月</dateFormatItem>
+						<dateFormatItem id="yQQQ">y年QQQ</dateFormatItem>
+						<dateFormatItem id="yQQQQ">y年QQQQ</dateFormatItem>
+					</availableFormats>
+					<appendItems>
+						<appendItem request="Timezone">{0} {1}</appendItem>
+					</appendItems>
+					<intervalFormats>
+						<intervalFormatFallback>{0}至{1}</intervalFormatFallback>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d日至d日</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">ah時至ah時</greatestDifference>
+							<greatestDifference id="h">ah時至h時</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">ah:mm至ah:mm</greatestDifference>
+							<greatestDifference id="h">ah:mm至h:mm</greatestDifference>
+							<greatestDifference id="m">ah:mm至h:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm至HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">ah:mm至ah:mm [v]</greatestDifference>
+							<greatestDifference id="h">ah:mm至h:mm [v]</greatestDifference>
+							<greatestDifference id="m">ah:mm至h:mm [v]</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm–HH:mm [v]</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm [v]</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">ah時至ah時 [v]</greatestDifference>
+							<greatestDifference id="h">ah時至h時 [v]</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH [v]</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">M月至M月</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">M/d至M/d</greatestDifference>
+							<greatestDifference id="M">M/d至M/d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">d/M (E) 至 d/M (E)</greatestDifference>
+							<greatestDifference id="M">d/M (E) 至 d/M (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">LLL至LLL</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">M月d日至d日</greatestDifference>
+							<greatestDifference id="M">M月d日至M月d日</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">M月d日E至d日E</greatestDifference>
+							<greatestDifference id="M">M月d日E至M月d日E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMM">
+							<greatestDifference id="M">LLLL至LLLL</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">y至y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">y/M至y/M</greatestDifference>
+							<greatestDifference id="y">y/M至y/M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">y/M/d至y/M/d</greatestDifference>
+							<greatestDifference id="M">y/M/d至y/M/d</greatestDifference>
+							<greatestDifference id="y">y/M/d至y/M/d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">d/M/y (E) 至 d/M/y (E)</greatestDifference>
+							<greatestDifference id="M">d/M/y (E) 至 d/M/y (E)</greatestDifference>
+							<greatestDifference id="y">d/M/y (E) 至 d/M/y (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">y年M月至M月</greatestDifference>
+							<greatestDifference id="y">y年M月至y年M月</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">y年M月d日至d日</greatestDifference>
+							<greatestDifference id="M">y年M月d日至M月d日</greatestDifference>
+							<greatestDifference id="y">y年M月d日至y年M月d日</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">y年M月d日E至d日E</greatestDifference>
+							<greatestDifference id="M">y年M月d日E至M月d日E</greatestDifference>
+							<greatestDifference id="y">y年M月d日E至y年M月d日E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">y年M月至M月</greatestDifference>
+							<greatestDifference id="y">y年M月至y年M月</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="hebrew">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">提斯利月</month>
+							<month type="2" draft="contributed">瑪西班月</month>
+							<month type="3" draft="contributed">基斯流月</month>
+							<month type="4" draft="contributed">提別月</month>
+							<month type="5" draft="contributed">細罷特月</month>
+							<month type="6" draft="contributed">亞達月 I</month>
+							<month type="7" draft="contributed">亞達月</month>
+							<month type="7" yeartype="leap" draft="contributed">亞達月 II</month>
+							<month type="8" draft="contributed">尼散月</month>
+							<month type="9" draft="contributed">以珥月</month>
+							<month type="10" draft="contributed">西彎月</month>
+							<month type="11" draft="contributed">搭模斯月</month>
+							<month type="12" draft="contributed">埃波月</month>
+							<month type="13" draft="contributed">以祿月</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">1</month>
+							<month type="2">2</month>
+							<month type="3">3</month>
+							<month type="4">4</month>
+							<month type="5">5</month>
+							<month type="6">6</month>
+							<month type="7">7</month>
+							<month type="7" yeartype="leap">7</month>
+							<month type="8">8</month>
+							<month type="9">9</month>
+							<month type="10">10</month>
+							<month type="11">11</month>
+							<month type="12">12</month>
+							<month type="13">13</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">提斯利月</month>
+							<month type="2" draft="contributed">瑪西班月</month>
+							<month type="3" draft="contributed">基斯流月</month>
+							<month type="4" draft="contributed">提別月</month>
+							<month type="5" draft="contributed">細罷特月</month>
+							<month type="6" draft="contributed">亞達月 I</month>
+							<month type="7" draft="contributed">亞達月</month>
+							<month type="7" yeartype="leap" draft="contributed">亞達月 II</month>
+							<month type="8" draft="contributed">尼散月</month>
+							<month type="9" draft="contributed">以珥月</month>
+							<month type="10" draft="contributed">西彎月</month>
+							<month type="11" draft="contributed">搭模斯月</month>
+							<month type="12" draft="contributed">埃波月</month>
+							<month type="13" draft="contributed">以祿月</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">提斯利月</month>
+							<month type="2" draft="contributed">瑪西班月</month>
+							<month type="3" draft="contributed">基斯流月</month>
+							<month type="4" draft="contributed">提別月</month>
+							<month type="5" draft="contributed">細罷特月</month>
+							<month type="6" draft="contributed">亞達月 I</month>
+							<month type="7" draft="contributed">亞達月</month>
+							<month type="7" yeartype="leap" draft="contributed">亞達月 II</month>
+							<month type="8" draft="contributed">尼散月</month>
+							<month type="9" draft="contributed">以珥月</month>
+							<month type="10" draft="contributed">西彎月</month>
+							<month type="11" draft="contributed">搭模斯月</month>
+							<month type="12" draft="contributed">埃波月</month>
+							<month type="13" draft="contributed">以祿月</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">1</month>
+							<month type="2">2</month>
+							<month type="3">3</month>
+							<month type="4">4</month>
+							<month type="5">5</month>
+							<month type="6">6</month>
+							<month type="7">7</month>
+							<month type="7" yeartype="leap">7</month>
+							<month type="8">8</month>
+							<month type="9">9</month>
+							<month type="10">10</month>
+							<month type="11">11</month>
+							<month type="12">12</month>
+							<month type="13">13</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">提斯利月</month>
+							<month type="2" draft="contributed">瑪西班月</month>
+							<month type="3" draft="contributed">基斯流月</month>
+							<month type="4" draft="contributed">提別月</month>
+							<month type="5" draft="contributed">細罷特月</month>
+							<month type="6" draft="contributed">亞達月 I</month>
+							<month type="7" draft="contributed">亞達月</month>
+							<month type="7" yeartype="leap" draft="contributed">亞達月 II</month>
+							<month type="8" draft="contributed">尼散月</month>
+							<month type="9" draft="contributed">以珥月</month>
+							<month type="10" draft="contributed">西彎月</month>
+							<month type="11" draft="contributed">搭模斯月</month>
+							<month type="12" draft="contributed">埃波月</month>
+							<month type="13" draft="contributed">以祿月</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<eras>
+					<eraAbbr>
+						<era type="0" draft="contributed">創世紀元</era>
+					</eraAbbr>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>Gy年M月d日EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>Gy年M月d日</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>Gy年M月d日</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>Gy/M/d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+			</calendar>
+			<calendar type="indian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">制檀邏月</month>
+							<month type="2" draft="contributed">吠舍佉月</month>
+							<month type="3" draft="contributed">逝瑟吒月</month>
+							<month type="4" draft="contributed">頞沙荼月</month>
+							<month type="5" draft="contributed">室羅伐拏月</month>
+							<month type="6" draft="contributed">婆羅鉢陀月</month>
+							<month type="7" draft="contributed">頞涇縛庚闍月</month>
+							<month type="8" draft="contributed">迦剌底迦月</month>
+							<month type="9" draft="contributed">末伽始羅月</month>
+							<month type="10" draft="contributed">報沙月</month>
+							<month type="11" draft="contributed">磨祛月</month>
+							<month type="12" draft="contributed">頗勒窶拏月</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">1</month>
+							<month type="2" draft="contributed">2</month>
+							<month type="3" draft="contributed">3</month>
+							<month type="4" draft="contributed">4</month>
+							<month type="5" draft="contributed">5</month>
+							<month type="6" draft="contributed">6</month>
+							<month type="7" draft="contributed">7</month>
+							<month type="8" draft="contributed">8</month>
+							<month type="9" draft="contributed">9</month>
+							<month type="10" draft="contributed">10</month>
+							<month type="11" draft="contributed">11</month>
+							<month type="12" draft="contributed">12</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">制檀邏月</month>
+							<month type="2" draft="contributed">吠舍佉月</month>
+							<month type="3" draft="contributed">逝瑟吒月</month>
+							<month type="4" draft="contributed">頞沙荼月</month>
+							<month type="5" draft="contributed">室羅伐拏月</month>
+							<month type="6" draft="contributed">婆羅鉢陀月</month>
+							<month type="7" draft="contributed">頞涇縛庚闍月</month>
+							<month type="8" draft="contributed">迦剌底迦月</month>
+							<month type="9" draft="contributed">末伽始羅月</month>
+							<month type="10" draft="contributed">報沙月</month>
+							<month type="11" draft="contributed">磨祛月</month>
+							<month type="12" draft="contributed">頗勒窶拏月</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">制檀邏月</month>
+							<month type="2" draft="contributed">吠舍佉月</month>
+							<month type="3" draft="contributed">逝瑟吒月</month>
+							<month type="4" draft="contributed">頞沙荼月</month>
+							<month type="5" draft="contributed">室羅伐拏月</month>
+							<month type="6" draft="contributed">婆羅鉢陀月</month>
+							<month type="7" draft="contributed">頞涇縛庚闍月</month>
+							<month type="8" draft="contributed">迦剌底迦月</month>
+							<month type="9" draft="contributed">末伽始羅月</month>
+							<month type="10" draft="contributed">報沙月</month>
+							<month type="11" draft="contributed">磨祛月</month>
+							<month type="12" draft="contributed">頗勒窶拏月</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">1</month>
+							<month type="2" draft="contributed">2</month>
+							<month type="3" draft="contributed">3</month>
+							<month type="4" draft="contributed">4</month>
+							<month type="5" draft="contributed">5</month>
+							<month type="6" draft="contributed">6</month>
+							<month type="7" draft="contributed">7</month>
+							<month type="8" draft="contributed">8</month>
+							<month type="9" draft="contributed">9</month>
+							<month type="10" draft="contributed">10</month>
+							<month type="11" draft="contributed">11</month>
+							<month type="12" draft="contributed">12</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">制檀邏月</month>
+							<month type="2" draft="contributed">吠舍佉月</month>
+							<month type="3" draft="contributed">逝瑟吒月</month>
+							<month type="4" draft="contributed">頞沙荼月</month>
+							<month type="5" draft="contributed">室羅伐拏月</month>
+							<month type="6" draft="contributed">婆羅鉢陀月</month>
+							<month type="7" draft="contributed">頞涇縛庚闍月</month>
+							<month type="8" draft="contributed">迦剌底迦月</month>
+							<month type="9" draft="contributed">末伽始羅月</month>
+							<month type="10" draft="contributed">報沙月</month>
+							<month type="11" draft="contributed">磨祛月</month>
+							<month type="12" draft="contributed">頗勒窶拏月</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<eras>
+					<eraAbbr>
+						<era type="0" draft="contributed">印度曆</era>
+					</eraAbbr>
+				</eras>
+			</calendar>
+			<calendar type="islamic">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">穆哈蘭姆月</month>
+							<month type="2" draft="contributed">色法爾月</month>
+							<month type="3" draft="contributed">賴比月 I</month>
+							<month type="4" draft="contributed">賴比月 II</month>
+							<month type="5" draft="contributed">主馬達月 I</month>
+							<month type="6" draft="contributed">主馬達月 II</month>
+							<month type="7" draft="contributed">賴哲卜月</month>
+							<month type="8" draft="contributed">舍爾邦月</month>
+							<month type="9" draft="contributed">賴買丹月</month>
+							<month type="10" draft="contributed">閃瓦魯月</month>
+							<month type="11" draft="contributed">都爾喀爾德月</month>
+							<month type="12" draft="contributed">都爾黑哲月</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">1</month>
+							<month type="2" draft="contributed">2</month>
+							<month type="3" draft="contributed">3</month>
+							<month type="4" draft="contributed">4</month>
+							<month type="5" draft="contributed">5</month>
+							<month type="6" draft="contributed">6</month>
+							<month type="7" draft="contributed">7</month>
+							<month type="8" draft="contributed">8</month>
+							<month type="9" draft="contributed">9</month>
+							<month type="10" draft="contributed">10</month>
+							<month type="11" draft="contributed">11</month>
+							<month type="12" draft="contributed">12</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">穆哈蘭姆月</month>
+							<month type="2" draft="contributed">色法爾月</month>
+							<month type="3" draft="contributed">賴比月 I</month>
+							<month type="4" draft="contributed">賴比月 II</month>
+							<month type="5" draft="contributed">主馬達月 I</month>
+							<month type="6" draft="contributed">主馬達月 II</month>
+							<month type="7" draft="contributed">賴哲卜月</month>
+							<month type="8" draft="contributed">舍爾邦月</month>
+							<month type="9" draft="contributed">賴買丹月</month>
+							<month type="10" draft="contributed">閃瓦魯月</month>
+							<month type="11" draft="contributed">都爾喀爾德月</month>
+							<month type="12" draft="contributed">都爾黑哲月</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">穆哈蘭姆月</month>
+							<month type="2" draft="contributed">色法爾月</month>
+							<month type="3" draft="contributed">賴比月 I</month>
+							<month type="4" draft="contributed">賴比月 II</month>
+							<month type="5" draft="contributed">主馬達月 I</month>
+							<month type="6" draft="contributed">主馬達月 II</month>
+							<month type="7" draft="contributed">賴哲卜月</month>
+							<month type="8" draft="contributed">舍爾邦月</month>
+							<month type="9" draft="contributed">賴買丹月</month>
+							<month type="10" draft="contributed">閃瓦魯月</month>
+							<month type="11" draft="contributed">都爾喀爾德月</month>
+							<month type="12" draft="contributed">都爾黑哲月</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">1</month>
+							<month type="2" draft="contributed">2</month>
+							<month type="3" draft="contributed">3</month>
+							<month type="4" draft="contributed">4</month>
+							<month type="5" draft="contributed">5</month>
+							<month type="6" draft="contributed">6</month>
+							<month type="7" draft="contributed">7</month>
+							<month type="8" draft="contributed">8</month>
+							<month type="9" draft="contributed">9</month>
+							<month type="10" draft="contributed">10</month>
+							<month type="11" draft="contributed">11</month>
+							<month type="12" draft="contributed">12</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">穆哈蘭姆月</month>
+							<month type="2" draft="contributed">色法爾月</month>
+							<month type="3" draft="contributed">賴比月 I</month>
+							<month type="4" draft="contributed">賴比月 II</month>
+							<month type="5" draft="contributed">主馬達月 I</month>
+							<month type="6" draft="contributed">主馬達月 II</month>
+							<month type="7" draft="contributed">賴哲卜月</month>
+							<month type="8" draft="contributed">舍爾邦月</month>
+							<month type="9" draft="contributed">賴買丹月</month>
+							<month type="10" draft="contributed">閃瓦魯月</month>
+							<month type="11" draft="contributed">都爾喀爾德月</month>
+							<month type="12" draft="contributed">都爾黑哲月</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<eras>
+					<eraAbbr>
+						<era type="0" draft="contributed">伊斯蘭曆</era>
+					</eraAbbr>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>Gy年M月d日EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>Gy年M月d日</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>Gy年M月d日</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>Gy/M/d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="d">d日</dateFormatItem>
+						<dateFormatItem id="Ed">d日（E）</dateFormatItem>
+						<dateFormatItem id="Gy">Gy年</dateFormatItem>
+						<dateFormatItem id="GyMMM">Gy年M月</dateFormatItem>
+						<dateFormatItem id="GyMMMd">Gy年M月d日</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">Gy年M月d日E</dateFormatItem>
+						<dateFormatItem id="M">M月</dateFormatItem>
+						<dateFormatItem id="Md">M/d</dateFormatItem>
+						<dateFormatItem id="MEd">M/d（E）</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
+						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
+						<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
+						<dateFormatItem id="y">Gy年</dateFormatItem>
+						<dateFormatItem id="yyyy">Gy年</dateFormatItem>
+						<dateFormatItem id="yyyyM">Gy/M</dateFormatItem>
+						<dateFormatItem id="yyyyMd">Gy/M/d</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">Gy/M/d（E）</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">Gy年M月</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">Gy年M月d日</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">Gy年M月d日E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">Gy年M月</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">Gy年QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">Gy年QQQQ</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="japanese">
+				<eras>
+					<!-- per cldrbug 2835, accept provisional -->
+					<eraAbbr>
+						<era type="0">大化</era>
+						<era type="1">白雉</era>
+						<era type="2">白鳳</era>
+						<era type="3">朱鳥</era>
+						<era type="4">大寶</era>
+						<era type="5">慶雲</era>
+						<era type="6">和銅</era>
+						<era type="7">靈龜</era>
+						<era type="8">養老</era>
+						<era type="9">神龜</era>
+						<era type="10">天平</era>
+						<era type="11">天平感寶</era>
+						<era type="12">天平勝寶</era>
+						<era type="13">天平寶字</era>
+						<era type="14">天平神護</era>
+						<era type="15">神護景雲</era>
+						<era type="16">寶龜</era>
+						<era type="17">天應</era>
+						<era type="18">延曆</era>
+						<era type="19">大同</era>
+						<era type="20">弘仁</era>
+						<era type="21">天長</era>
+						<era type="22">承和</era>
+						<era type="23">嘉祥</era>
+						<era type="24">仁壽</era>
+						<era type="25">齊衡</era>
+						<era type="26">天安</era>
+						<era type="27">貞觀</era>
+						<era type="28">元慶</era>
+						<era type="29">仁和</era>
+						<era type="30">寬平</era>
+						<era type="31">昌泰</era>
+						<era type="32">延喜</era>
+						<era type="33">延長</era>
+						<era type="34">承平</era>
+						<era type="35">天慶</era>
+						<era type="36">天曆</era>
+						<era type="37">天德</era>
+						<era type="38">應和</era>
+						<era type="39">康保</era>
+						<era type="40">安和</era>
+						<era type="41">天祿</era>
+						<era type="42">天延</era>
+						<era type="43">貞元</era>
+						<era type="44">天元</era>
+						<era type="45">永觀</era>
+						<era type="46">寬和</era>
+						<era type="47">永延</era>
+						<era type="48">永祚</era>
+						<era type="49">正曆</era>
+						<era type="50">長德</era>
+						<era type="51">長保</era>
+						<era type="52">寬弘</era>
+						<era type="53">長和</era>
+						<era type="54">寬仁</era>
+						<era type="55">治安</era>
+						<era type="56">萬壽</era>
+						<era type="57">長元</era>
+						<era type="58">長曆</era>
+						<era type="59">長久</era>
+						<era type="60">寬德</era>
+						<era type="61">永承</era>
+						<era type="62">天喜</era>
+						<era type="63">康平</era>
+						<era type="64">治曆</era>
+						<era type="65">延久</era>
+						<era type="66">承保</era>
+						<era type="67">承曆</era>
+						<era type="68">永保</era>
+						<era type="69">應德</era>
+						<era type="70">寬治</era>
+						<era type="71">嘉保</era>
+						<era type="72">永長</era>
+						<era type="73">承德</era>
+						<era type="74">康和</era>
+						<era type="75">長治</era>
+						<era type="76">嘉承</era>
+						<era type="77">天仁</era>
+						<era type="78">天永</era>
+						<era type="79">永久</era>
+						<era type="80">元永</era>
+						<era type="81">保安</era>
+						<era type="82">天治</era>
+						<era type="83">大治</era>
+						<era type="84">天承</era>
+						<era type="85">長承</era>
+						<era type="86">保延</era>
+						<era type="87">永治</era>
+						<era type="88">康治</era>
+						<era type="89">天養</era>
+						<era type="90">久安</era>
+						<era type="91">仁平</era>
+						<era type="92">久壽</era>
+						<era type="93">保元</era>
+						<era type="94">平治</era>
+						<era type="95">永曆</era>
+						<era type="96">應保</era>
+						<era type="97">長寬</era>
+						<era type="98">永萬</era>
+						<era type="99">仁安</era>
+						<era type="100">嘉應</era>
+						<era type="101">承安</era>
+						<era type="102">安元</era>
+						<era type="103">治承</era>
+						<era type="104">養和</era>
+						<era type="105">壽永</era>
+						<era type="106">元曆</era>
+						<era type="107">文治</era>
+						<era type="108">建久</era>
+						<era type="109">正治</era>
+						<era type="110">建仁</era>
+						<era type="111">元久</era>
+						<era type="112">建永</era>
+						<era type="113">承元</era>
+						<era type="114">建曆</era>
+						<era type="115">建保</era>
+						<era type="116">承久</era>
+						<era type="117">貞應</era>
+						<era type="118">元仁</era>
+						<era type="119">嘉祿</era>
+						<era type="120">安貞</era>
+						<era type="121">寬喜</era>
+						<era type="122">貞永</era>
+						<era type="123">天福</era>
+						<era type="124">文曆</era>
+						<era type="125">嘉禎</era>
+						<era type="126">曆仁</era>
+						<era type="127">延應</era>
+						<era type="128">仁治</era>
+						<era type="129">寬元</era>
+						<era type="130">寶治</era>
+						<era type="131">建長</era>
+						<era type="132">康元</era>
+						<era type="133">正嘉</era>
+						<era type="134">正元</era>
+						<era type="135">文應</era>
+						<era type="136">弘長</era>
+						<era type="137">文永</era>
+						<era type="138">建治</era>
+						<era type="139">弘安</era>
+						<era type="140">正應</era>
+						<era type="141">永仁</era>
+						<era type="142">正安</era>
+						<era type="143">乾元</era>
+						<era type="144">嘉元</era>
+						<era type="145">德治</era>
+						<era type="146">延慶</era>
+						<era type="147">應長</era>
+						<era type="148">正和</era>
+						<era type="149">文保</era>
+						<era type="150">元應</era>
+						<era type="151">元亨</era>
+						<era type="152">正中</era>
+						<era type="153">嘉曆</era>
+						<era type="154">元德</era>
+						<era type="155">元弘</era>
+						<era type="156">建武</era>
+						<era type="157">延元</era>
+						<era type="158">興國</era>
+						<era type="159">正平</era>
+						<era type="160">建德</era>
+						<era type="161">文中</era>
+						<era type="162">天授</era>
+						<era type="163">康曆</era>
+						<era type="164">弘和</era>
+						<era type="165">元中</era>
+						<era type="166">至德</era>
+						<era type="167">嘉慶</era>
+						<era type="168">康應</era>
+						<era type="169">明德</era>
+						<era type="170">應永</era>
+						<era type="171">正長</era>
+						<era type="172">永享</era>
+						<era type="173">嘉吉</era>
+						<era type="174">文安</era>
+						<era type="175">寶德</era>
+						<era type="176">享德</era>
+						<era type="177">康正</era>
+						<era type="178">長祿</era>
+						<era type="179">寬正</era>
+						<era type="180">文正</era>
+						<era type="181">應仁</era>
+						<era type="182">文明</era>
+						<era type="183">長享</era>
+						<era type="184">延德</era>
+						<era type="185">明應</era>
+						<era type="186">文龜</era>
+						<era type="187">永正</era>
+						<era type="188">大永</era>
+						<era type="189">享祿</era>
+						<era type="190">天文</era>
+						<era type="191">弘治</era>
+						<era type="192">永祿</era>
+						<era type="193">元龜</era>
+						<era type="194">天正</era>
+						<era type="195">文祿</era>
+						<era type="196">慶長</era>
+						<era type="197">元和</era>
+						<era type="198">寬永</era>
+						<era type="199">正保</era>
+						<era type="200">慶安</era>
+						<era type="201">承應</era>
+						<era type="202">明曆</era>
+						<era type="203">萬治</era>
+						<era type="204">寬文</era>
+						<era type="205">延寶</era>
+						<era type="206">天和</era>
+						<era type="207">貞享</era>
+						<era type="208">元祿</era>
+						<era type="209">寶永</era>
+						<era type="210">正德</era>
+						<era type="211">享保</era>
+						<era type="212">元文</era>
+						<era type="213">寬保</era>
+						<era type="214">延享</era>
+						<era type="215">寬延</era>
+						<era type="216">寶曆</era>
+						<era type="217">明和</era>
+						<era type="218">安永</era>
+						<era type="219">天明</era>
+						<era type="220">寬政</era>
+						<era type="221">享和</era>
+						<era type="222">文化</era>
+						<era type="223">文政</era>
+						<era type="224">天保</era>
+						<era type="225">弘化</era>
+						<era type="226">嘉永</era>
+						<era type="227">安政</era>
+						<era type="228">萬延</era>
+						<era type="229">文久</era>
+						<era type="230">元治</era>
+						<era type="231">慶應</era>
+						<era type="232">明治</era>
+						<era type="233">大正</era>
+						<era type="234">昭和</era>
+						<era type="235">平成</era>
+					</eraAbbr>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>Gy年M月d日EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>Gy年M月d日</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>Gy年M月d日</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>Gy/M/d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern draft="contributed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern draft="contributed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern draft="contributed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern draft="contributed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<!-- per cldrbug 2835, accept provisional with adjustments/additions -->
+						<dateFormatItem id="d">d日</dateFormatItem>
+						<dateFormatItem id="Ed">d日（E）</dateFormatItem>
+						<dateFormatItem id="Gy">Gy年</dateFormatItem>
+						<dateFormatItem id="GyMMM">Gy年M月</dateFormatItem>
+						<dateFormatItem id="GyMMMd">Gy年M月d日</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">Gy年M月d日E</dateFormatItem>
+						<dateFormatItem id="h">ah時</dateFormatItem>
+						<dateFormatItem id="H">H時</dateFormatItem>
+						<dateFormatItem id="hm">ah:mm</dateFormatItem>
+						<dateFormatItem id="Hm" draft="contributed">HH:mm</dateFormatItem>
+						<dateFormatItem id="hms">ah:mm:ss</dateFormatItem>
+						<dateFormatItem id="Hms" draft="contributed">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="M">M月</dateFormatItem>
+						<dateFormatItem id="Md">M/d</dateFormatItem>
+						<dateFormatItem id="MEd">M/d（E）</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd" draft="contributed">MMM d</dateFormatItem>
+						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
+						<dateFormatItem id="MMMMd" draft="contributed">MMMM d</dateFormatItem>
+						<dateFormatItem id="ms" draft="contributed">mm:ss</dateFormatItem>
+						<dateFormatItem id="y">Gy年</dateFormatItem>
+						<dateFormatItem id="yyyy">Gy年</dateFormatItem>
+						<dateFormatItem id="yyyyM">Gy/M</dateFormatItem>
+						<dateFormatItem id="yyyyMd">Gy/M/d</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">Gy/M/d（E）</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">Gy年M月</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">Gy年M月d日</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">Gy年M月d日E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">Gy年M月</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">Gy年QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">Gy年QQQQ</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="persian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">1月</month>
+							<month type="2" draft="contributed">2月</month>
+							<month type="3" draft="contributed">3月</month>
+							<month type="4" draft="contributed">4月</month>
+							<month type="5" draft="contributed">5月</month>
+							<month type="6" draft="contributed">6月</month>
+							<month type="7" draft="contributed">7月</month>
+							<month type="8" draft="contributed">8月</month>
+							<month type="9" draft="contributed">9月</month>
+							<month type="10" draft="contributed">10月</month>
+							<month type="11" draft="contributed">11月</month>
+							<month type="12" draft="contributed">12月</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">1</month>
+							<month type="2" draft="contributed">2</month>
+							<month type="3" draft="contributed">3</month>
+							<month type="4" draft="contributed">4</month>
+							<month type="5" draft="contributed">5</month>
+							<month type="6" draft="contributed">6</month>
+							<month type="7" draft="contributed">7</month>
+							<month type="8" draft="contributed">8</month>
+							<month type="9" draft="contributed">9</month>
+							<month type="10" draft="contributed">10</month>
+							<month type="11" draft="contributed">11</month>
+							<month type="12" draft="contributed">12</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">1月</month>
+							<month type="2" draft="contributed">2月</month>
+							<month type="3" draft="contributed">3月</month>
+							<month type="4" draft="contributed">4月</month>
+							<month type="5" draft="contributed">5月</month>
+							<month type="6" draft="contributed">6月</month>
+							<month type="7" draft="contributed">7月</month>
+							<month type="8" draft="contributed">8月</month>
+							<month type="9" draft="contributed">9月</month>
+							<month type="10" draft="contributed">10月</month>
+							<month type="11" draft="contributed">11月</month>
+							<month type="12" draft="contributed">12月</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="contributed">1月</month>
+							<month type="2" draft="contributed">2月</month>
+							<month type="3" draft="contributed">3月</month>
+							<month type="4" draft="contributed">4月</month>
+							<month type="5" draft="contributed">5月</month>
+							<month type="6" draft="contributed">6月</month>
+							<month type="7" draft="contributed">7月</month>
+							<month type="8" draft="contributed">8月</month>
+							<month type="9" draft="contributed">9月</month>
+							<month type="10" draft="contributed">10月</month>
+							<month type="11" draft="contributed">11月</month>
+							<month type="12" draft="contributed">12月</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="contributed">1</month>
+							<month type="2" draft="contributed">2</month>
+							<month type="3" draft="contributed">3</month>
+							<month type="4" draft="contributed">4</month>
+							<month type="5" draft="contributed">5</month>
+							<month type="6" draft="contributed">6</month>
+							<month type="7" draft="contributed">7</month>
+							<month type="8" draft="contributed">8</month>
+							<month type="9" draft="contributed">9</month>
+							<month type="10" draft="contributed">10</month>
+							<month type="11" draft="contributed">11</month>
+							<month type="12" draft="contributed">12</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="contributed">1月</month>
+							<month type="2" draft="contributed">2月</month>
+							<month type="3" draft="contributed">3月</month>
+							<month type="4" draft="contributed">4月</month>
+							<month type="5" draft="contributed">5月</month>
+							<month type="6" draft="contributed">6月</month>
+							<month type="7" draft="contributed">7月</month>
+							<month type="8" draft="contributed">8月</month>
+							<month type="9" draft="contributed">9月</month>
+							<month type="10" draft="contributed">10月</month>
+							<month type="11" draft="contributed">11月</month>
+							<month type="12" draft="contributed">12月</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<eras>
+					<eraNames>
+						<era type="0">波斯曆</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">波斯曆</era>
+					</eraAbbr>
+				</eras>
+			</calendar>
+			<calendar type="roc">
+				<eras>
+					<eraAbbr>
+						<era type="0">民國前</era>
+						<era type="1">民國</era>
+					</eraAbbr>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>Gy年M月d日 EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>Gy年M月d日</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>Gy年M月d日</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>Gy/M/d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="d">d日</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
+						<dateFormatItem id="Ed">d日（E）</dateFormatItem>
+						<dateFormatItem id="Gy">Gy年</dateFormatItem>
+						<dateFormatItem id="GyMMM">Gy年M月</dateFormatItem>
+						<dateFormatItem id="GyMMMd">Gy年M月d日</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">Gy年M月d日E</dateFormatItem>
+						<dateFormatItem id="M">M月</dateFormatItem>
+						<dateFormatItem id="Md">M/d</dateFormatItem>
+						<dateFormatItem id="MEd">M/d（E）</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
+						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
+						<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
+						<dateFormatItem id="y">Gy年</dateFormatItem>
+						<dateFormatItem id="yyyy">Gy年</dateFormatItem>
+						<dateFormatItem id="yyyyM">Gy/M</dateFormatItem>
+						<dateFormatItem id="yyyyMd">Gy/M/d</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">Gy/M/d（E）</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">Gy年M月</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">Gy年M月d日</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">Gy年M月d日E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">Gy年M月</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">Gy年QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">Gy年QQQQ</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="era">
+				<displayName>年代</displayName>
+			</field>
+			<field type="year">
+				<displayName>年</displayName>
+				<relative type="-1">去年</relative>
+				<relative type="0">今年</relative>
+				<relative type="1">明年</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} 年後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} 年前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-short">
+				<displayName>年</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} 年後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} 年前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-narrow">
+				<displayName>年</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} 年後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} 年前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter">
+				<displayName>季</displayName>
+				<relative type="-1" draft="contributed">上一季</relative>
+				<relative type="0" draft="contributed">今季</relative>
+				<relative type="1" draft="contributed">下一季</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} 季後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} 季前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-short">
+				<displayName>季</displayName>
+				<relative type="-1" draft="contributed">上季</relative>
+				<relative type="0" draft="contributed">今季</relative>
+				<relative type="1" draft="contributed">下季</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} 季後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} 季前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-narrow">
+				<displayName>季</displayName>
+				<relative type="-1" draft="contributed">上季</relative>
+				<relative type="0" draft="contributed">今季</relative>
+				<relative type="1" draft="contributed">下季</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0}季後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0}季前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month">
+				<displayName>月</displayName>
+				<relative type="-1">上個月</relative>
+				<relative type="0">本月</relative>
+				<relative type="1">下個月</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} 個月後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} 個月前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-short">
+				<displayName>月</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} 個月後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} 個月前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-narrow">
+				<displayName>月</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} 個月後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} 個月前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week">
+				<displayName>週</displayName>
+				<relative type="-1">上週</relative>
+				<relative type="0">本週</relative>
+				<relative type="1">下週</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} 週後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} 週前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-short">
+				<displayName>週</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} 週後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} 週前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-narrow">
+				<displayName>週</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} 週後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} 週前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day">
+				<displayName>日</displayName>
+				<relative type="-2">前天</relative>
+				<relative type="-1">尋日</relative>
+				<relative type="0">今天</relative>
+				<relative type="1">聽日</relative>
+				<relative type="2">後天</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} 天後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} 天前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-short">
+				<displayName>日</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} 天後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} 天前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-narrow">
+				<displayName>日</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} 天後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} 天前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="weekday">
+				<displayName>週天</displayName>
+			</field>
+			<field type="sun">
+				<relative type="-1">上週日</relative>
+				<relative type="0">本週日</relative>
+				<relative type="1">下週日</relative>
+			</field>
+			<field type="sun-short">
+				<relative type="-1">上週日</relative>
+				<relative type="0">本週日</relative>
+				<relative type="1">下週日</relative>
+			</field>
+			<field type="sun-narrow">
+				<relative type="-1">上週日</relative>
+				<relative type="0">本週日</relative>
+				<relative type="1">下週日</relative>
+			</field>
+			<field type="mon">
+				<relative type="-1">上週一</relative>
+				<relative type="0">本週一</relative>
+				<relative type="1">下週一</relative>
+			</field>
+			<field type="mon-short">
+				<relative type="-1">上週一</relative>
+				<relative type="0">本週一</relative>
+				<relative type="1">下週一</relative>
+			</field>
+			<field type="mon-narrow">
+				<relative type="-1">上週一</relative>
+				<relative type="0">本週一</relative>
+				<relative type="1">下週一</relative>
+			</field>
+			<field type="tue">
+				<relative type="-1">上週二</relative>
+				<relative type="0">本週二</relative>
+				<relative type="1">下週二</relative>
+			</field>
+			<field type="tue-short">
+				<relative type="-1">上週二</relative>
+				<relative type="0">本週二</relative>
+				<relative type="1">下週二</relative>
+			</field>
+			<field type="tue-narrow">
+				<relative type="-1">上週二</relative>
+				<relative type="0">本週二</relative>
+				<relative type="1">下週二</relative>
+			</field>
+			<field type="wed">
+				<relative type="-1">上週三</relative>
+				<relative type="0">本週三</relative>
+				<relative type="1">下週三</relative>
+			</field>
+			<field type="wed-short">
+				<relative type="-1">上週三</relative>
+				<relative type="0">本週三</relative>
+				<relative type="1">下週三</relative>
+			</field>
+			<field type="wed-narrow">
+				<relative type="-1">上週三</relative>
+				<relative type="0">本週三</relative>
+				<relative type="1">下週三</relative>
+			</field>
+			<field type="thu">
+				<relative type="-1">上週四</relative>
+				<relative type="0">本週四</relative>
+				<relative type="1">下週四</relative>
+			</field>
+			<field type="thu-short">
+				<relative type="-1">上週四</relative>
+				<relative type="0">本週四</relative>
+				<relative type="1">下週四</relative>
+			</field>
+			<field type="thu-narrow">
+				<relative type="-1">上週四</relative>
+				<relative type="0">本週四</relative>
+				<relative type="1">下週四</relative>
+			</field>
+			<field type="fri">
+				<relative type="-1">上週五</relative>
+				<relative type="0">本週五</relative>
+				<relative type="1">下週五</relative>
+			</field>
+			<field type="fri-short">
+				<relative type="-1">上週五</relative>
+				<relative type="0">本週五</relative>
+				<relative type="1">下週五</relative>
+			</field>
+			<field type="fri-narrow">
+				<relative type="-1">上週五</relative>
+				<relative type="0">本週五</relative>
+				<relative type="1">下週五</relative>
+			</field>
+			<field type="sat">
+				<relative type="-1">上週六</relative>
+				<relative type="0">本週六</relative>
+				<relative type="1">下週六</relative>
+			</field>
+			<field type="sat-short">
+				<relative type="-1">上週六</relative>
+				<relative type="0">本週六</relative>
+				<relative type="1">下週六</relative>
+			</field>
+			<field type="sat-narrow">
+				<relative type="-1">上週六</relative>
+				<relative type="0">本週六</relative>
+				<relative type="1">下週六</relative>
+			</field>
+			<field type="dayperiod">
+				<displayName>上午/下午</displayName>
+			</field>
+			<field type="hour">
+				<displayName>小時</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} 小時後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} 小時前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-short">
+				<displayName>小時</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} 小時後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} 小時前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-narrow">
+				<displayName>小時</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} 小時後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} 小時前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute">
+				<displayName>分鐘</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} 分鐘後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} 分鐘前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-short">
+				<displayName>分鐘</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} 分鐘後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} 分鐘前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-narrow">
+				<displayName>分鐘</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} 分鐘後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} 分鐘前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second">
+				<displayName>秒</displayName>
+				<relative type="0">現在</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} 秒後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} 秒前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-short">
+				<displayName>秒</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} 秒後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} 秒前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-narrow">
+				<displayName>秒</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} 秒後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} 秒前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="zone">
+				<displayName>時區</displayName>
+			</field>
+		</fields>
+		<timeZoneNames>
+			<hourFormat>+HH:mm;-HH:mm</hourFormat>
+			<gmtFormat>GMT{0}</gmtFormat>
+			<gmtZeroFormat>GMT</gmtZeroFormat>
+			<regionFormat>{0}時間</regionFormat>
+			<regionFormat type="daylight">{0} (+1)</regionFormat>
+			<regionFormat type="standard">{0} (+0)</regionFormat>
+			<fallbackFormat>{1} ({0})</fallbackFormat>
+			<zone type="Etc/Unknown">
+				<exemplarCity>未知城市</exemplarCity>
+			</zone>
+			<zone type="Europe/Andorra">
+				<exemplarCity>安道爾</exemplarCity>
+			</zone>
+			<zone type="Asia/Dubai">
+				<exemplarCity>杜拜</exemplarCity>
+			</zone>
+			<zone type="Asia/Kabul">
+				<exemplarCity>喀布爾</exemplarCity>
+			</zone>
+			<zone type="America/Antigua">
+				<exemplarCity>安地卡</exemplarCity>
+			</zone>
+			<zone type="America/Anguilla">
+				<exemplarCity>安吉拉</exemplarCity>
+			</zone>
+			<zone type="Europe/Tirane">
+				<exemplarCity>地拉那</exemplarCity>
+			</zone>
+			<zone type="Asia/Yerevan">
+				<exemplarCity>葉里溫</exemplarCity>
+			</zone>
+			<zone type="Africa/Luanda">
+				<exemplarCity>羅安達</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Rothera">
+				<exemplarCity>羅瑟拉</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Palmer">
+				<exemplarCity>帕麥</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Troll">
+				<exemplarCity>綽爾</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Syowa">
+				<exemplarCity>昭和基地</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Mawson">
+				<exemplarCity>莫森</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Davis">
+				<exemplarCity>戴維斯</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Vostok">
+				<exemplarCity>沃斯托克</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Casey">
+				<exemplarCity>凱西</exemplarCity>
+			</zone>
+			<zone type="Antarctica/DumontDUrville">
+				<exemplarCity>杜蒙杜比爾</exemplarCity>
+			</zone>
+			<zone type="Antarctica/McMurdo">
+				<exemplarCity>麥克默多</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Rio_Gallegos">
+				<exemplarCity>里奧加耶戈斯</exemplarCity>
+			</zone>
+			<zone type="America/Mendoza">
+				<exemplarCity>門多薩</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/San_Juan">
+				<exemplarCity>聖胡安</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Ushuaia">
+				<exemplarCity>烏斯懷亞</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/La_Rioja">
+				<exemplarCity>拉略哈</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/San_Luis">
+				<exemplarCity>聖路易</exemplarCity>
+			</zone>
+			<zone type="America/Catamarca">
+				<exemplarCity>卡塔馬卡</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Salta">
+				<exemplarCity>薩爾塔</exemplarCity>
+			</zone>
+			<zone type="America/Jujuy">
+				<exemplarCity>胡胡伊</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Tucuman">
+				<exemplarCity>吐庫曼</exemplarCity>
+			</zone>
+			<zone type="America/Cordoba">
+				<exemplarCity>哥多華</exemplarCity>
+			</zone>
+			<zone type="America/Buenos_Aires">
+				<exemplarCity>布宜諾斯艾利斯</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pago_Pago">
+				<exemplarCity>巴哥巴哥</exemplarCity>
+			</zone>
+			<zone type="Europe/Vienna">
+				<exemplarCity>維也納</exemplarCity>
+			</zone>
+			<zone type="Australia/Perth">
+				<exemplarCity>伯斯</exemplarCity>
+			</zone>
+			<zone type="Australia/Eucla">
+				<exemplarCity>尤克拉</exemplarCity>
+			</zone>
+			<zone type="Australia/Darwin">
+				<exemplarCity>達爾文</exemplarCity>
+			</zone>
+			<zone type="Australia/Adelaide">
+				<exemplarCity>阿得雷德</exemplarCity>
+			</zone>
+			<zone type="Australia/Broken_Hill">
+				<exemplarCity>布羅肯希爾</exemplarCity>
+			</zone>
+			<zone type="Australia/Currie">
+				<exemplarCity>克黎</exemplarCity>
+			</zone>
+			<zone type="Australia/Melbourne">
+				<exemplarCity>墨爾本</exemplarCity>
+			</zone>
+			<zone type="Australia/Hobart">
+				<exemplarCity>荷巴特</exemplarCity>
+			</zone>
+			<zone type="Australia/Lindeman">
+				<exemplarCity>林德曼</exemplarCity>
+			</zone>
+			<zone type="Australia/Sydney">
+				<exemplarCity>雪梨</exemplarCity>
+			</zone>
+			<zone type="Australia/Brisbane">
+				<exemplarCity>布利斯班</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Macquarie">
+				<exemplarCity>麥覺理</exemplarCity>
+			</zone>
+			<zone type="Australia/Lord_Howe">
+				<exemplarCity>豪勳爵島</exemplarCity>
+			</zone>
+			<zone type="America/Aruba">
+				<exemplarCity>阿路巴</exemplarCity>
+			</zone>
+			<zone type="Europe/Mariehamn">
+				<exemplarCity>瑪麗港</exemplarCity>
+			</zone>
+			<zone type="Asia/Baku">
+				<exemplarCity>巴庫</exemplarCity>
+			</zone>
+			<zone type="Europe/Sarajevo">
+				<exemplarCity>塞拉耶佛</exemplarCity>
+			</zone>
+			<zone type="America/Barbados">
+				<exemplarCity>巴貝多</exemplarCity>
+			</zone>
+			<zone type="Asia/Dhaka">
+				<exemplarCity>達卡</exemplarCity>
+			</zone>
+			<zone type="Europe/Brussels">
+				<exemplarCity>布魯塞爾</exemplarCity>
+			</zone>
+			<zone type="Africa/Ouagadougou">
+				<exemplarCity>瓦加杜古</exemplarCity>
+			</zone>
+			<zone type="Europe/Sofia">
+				<exemplarCity>索菲亞</exemplarCity>
+			</zone>
+			<zone type="Asia/Bahrain">
+				<exemplarCity>巴林</exemplarCity>
+			</zone>
+			<zone type="Africa/Bujumbura">
+				<exemplarCity>布松布拉</exemplarCity>
+			</zone>
+			<zone type="Africa/Porto-Novo">
+				<exemplarCity>波多諾佛</exemplarCity>
+			</zone>
+			<zone type="America/St_Barthelemy">
+				<exemplarCity>聖巴托洛繆島</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Bermuda">
+				<exemplarCity>百慕達</exemplarCity>
+			</zone>
+			<zone type="Asia/Brunei">
+				<exemplarCity>汶萊</exemplarCity>
+			</zone>
+			<zone type="America/La_Paz">
+				<exemplarCity>拉巴斯</exemplarCity>
+			</zone>
+			<zone type="America/Kralendijk">
+				<exemplarCity>克拉倫代克</exemplarCity>
+			</zone>
+			<zone type="America/Eirunepe">
+				<exemplarCity>艾魯內佩</exemplarCity>
+			</zone>
+			<zone type="America/Rio_Branco">
+				<exemplarCity>里約布蘭</exemplarCity>
+			</zone>
+			<zone type="America/Porto_Velho">
+				<exemplarCity>維留港</exemplarCity>
+			</zone>
+			<zone type="America/Boa_Vista">
+				<exemplarCity>保維斯塔</exemplarCity>
+			</zone>
+			<zone type="America/Manaus">
+				<exemplarCity>瑪瑙斯</exemplarCity>
+			</zone>
+			<zone type="America/Cuiaba">
+				<exemplarCity>古雅巴</exemplarCity>
+			</zone>
+			<zone type="America/Santarem">
+				<exemplarCity>聖塔倫</exemplarCity>
+			</zone>
+			<zone type="America/Campo_Grande">
+				<exemplarCity>格蘭場</exemplarCity>
+			</zone>
+			<zone type="America/Belem">
+				<exemplarCity>貝倫</exemplarCity>
+			</zone>
+			<zone type="America/Araguaina">
+				<exemplarCity>阿拉圭那</exemplarCity>
+			</zone>
+			<zone type="America/Sao_Paulo">
+				<exemplarCity>聖保羅</exemplarCity>
+			</zone>
+			<zone type="America/Bahia">
+				<exemplarCity>巴伊阿</exemplarCity>
+			</zone>
+			<zone type="America/Fortaleza">
+				<exemplarCity>福塔力莎</exemplarCity>
+			</zone>
+			<zone type="America/Maceio">
+				<exemplarCity>馬瑟歐</exemplarCity>
+			</zone>
+			<zone type="America/Recife">
+				<exemplarCity>雷西非</exemplarCity>
+			</zone>
+			<zone type="America/Noronha">
+				<exemplarCity>諾倫哈</exemplarCity>
+			</zone>
+			<zone type="America/Nassau">
+				<exemplarCity>拿索</exemplarCity>
+			</zone>
+			<zone type="Asia/Thimphu">
+				<exemplarCity>廷布</exemplarCity>
+			</zone>
+			<zone type="Africa/Gaborone">
+				<exemplarCity>嘉柏隆里</exemplarCity>
+			</zone>
+			<zone type="Europe/Minsk">
+				<exemplarCity>明斯克</exemplarCity>
+			</zone>
+			<zone type="America/Belize">
+				<exemplarCity>貝里斯</exemplarCity>
+			</zone>
+			<zone type="America/Dawson">
+				<exemplarCity>道森</exemplarCity>
+			</zone>
+			<zone type="America/Whitehorse">
+				<exemplarCity>懷特霍斯</exemplarCity>
+			</zone>
+			<zone type="America/Inuvik">
+				<exemplarCity>伊奴維克</exemplarCity>
+			</zone>
+			<zone type="America/Vancouver">
+				<exemplarCity>溫哥華</exemplarCity>
+			</zone>
+			<zone type="America/Dawson_Creek">
+				<exemplarCity>道森克里克</exemplarCity>
+			</zone>
+			<zone type="America/Creston">
+				<exemplarCity>克雷斯頓</exemplarCity>
+			</zone>
+			<zone type="America/Yellowknife">
+				<exemplarCity>耶洛奈夫</exemplarCity>
+			</zone>
+			<zone type="America/Edmonton">
+				<exemplarCity>艾德蒙吞</exemplarCity>
+			</zone>
+			<zone type="America/Swift_Current">
+				<exemplarCity>斯威夫特卡倫特</exemplarCity>
+			</zone>
+			<zone type="America/Cambridge_Bay">
+				<exemplarCity>劍橋灣</exemplarCity>
+			</zone>
+			<zone type="America/Regina">
+				<exemplarCity>里賈納</exemplarCity>
+			</zone>
+			<zone type="America/Winnipeg">
+				<exemplarCity>溫尼伯</exemplarCity>
+			</zone>
+			<zone type="America/Resolute">
+				<exemplarCity>羅斯魯特</exemplarCity>
+			</zone>
+			<zone type="America/Rainy_River">
+				<exemplarCity>雨河鎮</exemplarCity>
+			</zone>
+			<zone type="America/Rankin_Inlet">
+				<exemplarCity>蘭今灣</exemplarCity>
+			</zone>
+			<zone type="America/Coral_Harbour">
+				<exemplarCity>阿蒂科肯</exemplarCity>
+			</zone>
+			<zone type="America/Thunder_Bay">
+				<exemplarCity>珊德灣</exemplarCity>
+			</zone>
+			<zone type="America/Nipigon">
+				<exemplarCity>尼皮岡</exemplarCity>
+			</zone>
+			<zone type="America/Toronto">
+				<exemplarCity>多倫多</exemplarCity>
+			</zone>
+			<zone type="America/Iqaluit">
+				<exemplarCity>伊魁特</exemplarCity>
+			</zone>
+			<zone type="America/Pangnirtung">
+				<exemplarCity>潘尼爾東</exemplarCity>
+			</zone>
+			<zone type="America/Moncton">
+				<exemplarCity>蒙克頓</exemplarCity>
+			</zone>
+			<zone type="America/Halifax">
+				<exemplarCity>哈里法克斯</exemplarCity>
+			</zone>
+			<zone type="America/Goose_Bay">
+				<exemplarCity>鵝灣</exemplarCity>
+			</zone>
+			<zone type="America/Glace_Bay">
+				<exemplarCity>格雷斯貝</exemplarCity>
+			</zone>
+			<zone type="America/Blanc-Sablon">
+				<exemplarCity>白朗薩布隆</exemplarCity>
+			</zone>
+			<zone type="America/St_Johns">
+				<exemplarCity>聖約翰</exemplarCity>
+			</zone>
+			<zone type="Indian/Cocos">
+				<exemplarCity>科科斯群島</exemplarCity>
+			</zone>
+			<zone type="Africa/Kinshasa">
+				<exemplarCity>金夏沙</exemplarCity>
+			</zone>
+			<zone type="Africa/Lubumbashi">
+				<exemplarCity>盧本巴希</exemplarCity>
+			</zone>
+			<zone type="Africa/Bangui">
+				<exemplarCity>班吉</exemplarCity>
+			</zone>
+			<zone type="Africa/Brazzaville">
+				<exemplarCity>布拉柴維爾</exemplarCity>
+			</zone>
+			<zone type="Europe/Zurich">
+				<exemplarCity>蘇黎世</exemplarCity>
+			</zone>
+			<zone type="Africa/Abidjan">
+				<exemplarCity>阿比讓</exemplarCity>
+			</zone>
+			<zone type="Pacific/Rarotonga">
+				<exemplarCity>拉羅湯加</exemplarCity>
+			</zone>
+			<zone type="Pacific/Easter">
+				<exemplarCity>復活島</exemplarCity>
+			</zone>
+			<zone type="America/Santiago">
+				<exemplarCity>聖地牙哥</exemplarCity>
+			</zone>
+			<zone type="Africa/Douala">
+				<exemplarCity>杜阿拉</exemplarCity>
+			</zone>
+			<zone type="Asia/Urumqi">
+				<exemplarCity>烏魯木齊</exemplarCity>
+			</zone>
+			<zone type="Asia/Shanghai">
+				<exemplarCity>上海</exemplarCity>
+			</zone>
+			<zone type="America/Bogota">
+				<exemplarCity>波哥大</exemplarCity>
+			</zone>
+			<zone type="America/Costa_Rica">
+				<exemplarCity>哥斯大黎加</exemplarCity>
+			</zone>
+			<zone type="America/Havana">
+				<exemplarCity>哈瓦那</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Cape_Verde">
+				<exemplarCity>維德角</exemplarCity>
+			</zone>
+			<zone type="America/Curacao">
+				<exemplarCity>庫拉索</exemplarCity>
+			</zone>
+			<zone type="Indian/Christmas">
+				<exemplarCity>聖誕島</exemplarCity>
+			</zone>
+			<zone type="Asia/Nicosia">
+				<exemplarCity>尼古西亞</exemplarCity>
+			</zone>
+			<zone type="Europe/Prague">
+				<exemplarCity>布拉格</exemplarCity>
+			</zone>
+			<zone type="Europe/Busingen">
+				<exemplarCity>布辛根</exemplarCity>
+			</zone>
+			<zone type="Europe/Berlin">
+				<exemplarCity>柏林</exemplarCity>
+			</zone>
+			<zone type="Africa/Djibouti">
+				<exemplarCity>吉布地</exemplarCity>
+			</zone>
+			<zone type="Europe/Copenhagen">
+				<exemplarCity>哥本哈根</exemplarCity>
+			</zone>
+			<zone type="America/Dominica">
+				<exemplarCity>多明尼加</exemplarCity>
+			</zone>
+			<zone type="America/Santo_Domingo">
+				<exemplarCity>聖多明哥</exemplarCity>
+			</zone>
+			<zone type="Africa/Algiers">
+				<exemplarCity>阿爾及爾</exemplarCity>
+			</zone>
+			<zone type="Pacific/Galapagos">
+				<exemplarCity>加拉巴哥群島</exemplarCity>
+			</zone>
+			<zone type="America/Guayaquil">
+				<exemplarCity>瓜亞基爾</exemplarCity>
+			</zone>
+			<zone type="Europe/Tallinn">
+				<exemplarCity>塔林</exemplarCity>
+			</zone>
+			<zone type="Africa/Cairo">
+				<exemplarCity>開羅</exemplarCity>
+			</zone>
+			<zone type="Africa/El_Aaiun">
+				<exemplarCity>阿尤恩</exemplarCity>
+			</zone>
+			<zone type="Africa/Asmera">
+				<exemplarCity>阿斯瑪拉</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Canary">
+				<exemplarCity>加納利</exemplarCity>
+			</zone>
+			<zone type="Africa/Ceuta">
+				<exemplarCity>休達</exemplarCity>
+			</zone>
+			<zone type="Europe/Madrid">
+				<exemplarCity>馬德里</exemplarCity>
+			</zone>
+			<zone type="Africa/Addis_Ababa">
+				<exemplarCity>阿迪斯阿貝巴</exemplarCity>
+			</zone>
+			<zone type="Europe/Helsinki">
+				<exemplarCity>赫爾辛基</exemplarCity>
+			</zone>
+			<zone type="Pacific/Fiji">
+				<exemplarCity>斐濟</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Stanley">
+				<exemplarCity>史坦利</exemplarCity>
+			</zone>
+			<zone type="Pacific/Truk">
+				<exemplarCity>楚克</exemplarCity>
+			</zone>
+			<zone type="Pacific/Ponape">
+				<exemplarCity>波納佩</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kosrae">
+				<exemplarCity>科斯瑞</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Faeroe">
+				<exemplarCity>法羅群島</exemplarCity>
+			</zone>
+			<zone type="Europe/Paris">
+				<exemplarCity>巴黎</exemplarCity>
+			</zone>
+			<zone type="Africa/Libreville">
+				<exemplarCity>自由市</exemplarCity>
+			</zone>
+			<zone type="Europe/London">
+				<long>
+					<daylight>英國夏令時間</daylight>
+				</long>
+				<exemplarCity>倫敦</exemplarCity>
+			</zone>
+			<zone type="America/Grenada">
+				<exemplarCity>格瑞納達</exemplarCity>
+			</zone>
+			<zone type="Asia/Tbilisi">
+				<exemplarCity>第比利斯</exemplarCity>
+			</zone>
+			<zone type="America/Cayenne">
+				<exemplarCity>開雲</exemplarCity>
+			</zone>
+			<zone type="Europe/Guernsey">
+				<exemplarCity>根息島</exemplarCity>
+			</zone>
+			<zone type="Africa/Accra">
+				<exemplarCity>阿克拉</exemplarCity>
+			</zone>
+			<zone type="Europe/Gibraltar">
+				<exemplarCity>直布羅陀</exemplarCity>
+			</zone>
+			<zone type="America/Thule">
+				<exemplarCity>杜里</exemplarCity>
+			</zone>
+			<zone type="America/Godthab">
+				<exemplarCity>努克</exemplarCity>
+			</zone>
+			<zone type="America/Scoresbysund">
+				<exemplarCity>伊托科爾托米特</exemplarCity>
+			</zone>
+			<zone type="America/Danmarkshavn">
+				<exemplarCity>丹馬沙文</exemplarCity>
+			</zone>
+			<zone type="Africa/Banjul">
+				<exemplarCity>班竹</exemplarCity>
+			</zone>
+			<zone type="Africa/Conakry">
+				<exemplarCity>柯那克里</exemplarCity>
+			</zone>
+			<zone type="America/Guadeloupe">
+				<exemplarCity>瓜地洛普</exemplarCity>
+			</zone>
+			<zone type="Africa/Malabo">
+				<exemplarCity>馬拉博</exemplarCity>
+			</zone>
+			<zone type="Europe/Athens">
+				<exemplarCity>雅典</exemplarCity>
+			</zone>
+			<zone type="Atlantic/South_Georgia">
+				<exemplarCity>南喬治亞</exemplarCity>
+			</zone>
+			<zone type="America/Guatemala">
+				<exemplarCity>瓜地馬拉</exemplarCity>
+			</zone>
+			<zone type="Pacific/Guam">
+				<exemplarCity>關島</exemplarCity>
+			</zone>
+			<zone type="Africa/Bissau">
+				<exemplarCity>比紹</exemplarCity>
+			</zone>
+			<zone type="America/Guyana">
+				<exemplarCity>蓋亞那</exemplarCity>
+			</zone>
+			<zone type="Asia/Hong_Kong">
+				<exemplarCity>中華人民共和國香港特別行政區</exemplarCity>
+			</zone>
+			<zone type="America/Tegucigalpa">
+				<exemplarCity>德古斯加巴</exemplarCity>
+			</zone>
+			<zone type="Europe/Zagreb">
+				<exemplarCity>札格瑞布</exemplarCity>
+			</zone>
+			<zone type="America/Port-au-Prince">
+				<exemplarCity>太子港</exemplarCity>
+			</zone>
+			<zone type="Europe/Budapest">
+				<exemplarCity>布達佩斯</exemplarCity>
+			</zone>
+			<zone type="Asia/Jakarta">
+				<exemplarCity>雅加達</exemplarCity>
+			</zone>
+			<zone type="Asia/Pontianak">
+				<exemplarCity>坤甸</exemplarCity>
+			</zone>
+			<zone type="Asia/Makassar">
+				<exemplarCity>馬卡沙爾</exemplarCity>
+			</zone>
+			<zone type="Asia/Jayapura">
+				<exemplarCity>加亞布拉</exemplarCity>
+			</zone>
+			<zone type="Europe/Dublin">
+				<long>
+					<daylight>愛爾蘭標準時間</daylight>
+				</long>
+				<exemplarCity>都柏林</exemplarCity>
+			</zone>
+			<zone type="Asia/Jerusalem">
+				<exemplarCity>耶路撒冷</exemplarCity>
+			</zone>
+			<zone type="Europe/Isle_of_Man">
+				<exemplarCity>曼島</exemplarCity>
+			</zone>
+			<zone type="Asia/Calcutta">
+				<exemplarCity>加爾各答</exemplarCity>
+			</zone>
+			<zone type="Indian/Chagos">
+				<exemplarCity>查戈斯</exemplarCity>
+			</zone>
+			<zone type="Asia/Baghdad">
+				<exemplarCity>巴格達</exemplarCity>
+			</zone>
+			<zone type="Asia/Tehran">
+				<exemplarCity>德黑蘭</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Reykjavik">
+				<exemplarCity>雷克雅維克</exemplarCity>
+			</zone>
+			<zone type="Europe/Rome">
+				<exemplarCity>羅馬</exemplarCity>
+			</zone>
+			<zone type="Europe/Jersey">
+				<exemplarCity>澤西島</exemplarCity>
+			</zone>
+			<zone type="America/Jamaica">
+				<exemplarCity>牙買加</exemplarCity>
+			</zone>
+			<zone type="Asia/Amman">
+				<exemplarCity>安曼</exemplarCity>
+			</zone>
+			<zone type="Asia/Tokyo">
+				<exemplarCity>東京</exemplarCity>
+			</zone>
+			<zone type="Africa/Nairobi">
+				<exemplarCity>奈洛比</exemplarCity>
+			</zone>
+			<zone type="Asia/Bishkek">
+				<exemplarCity>比什凱克</exemplarCity>
+			</zone>
+			<zone type="Asia/Phnom_Penh">
+				<exemplarCity>金邊</exemplarCity>
+			</zone>
+			<zone type="Pacific/Enderbury">
+				<exemplarCity>恩得伯理島</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kiritimati">
+				<exemplarCity>基里地馬地島</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tarawa">
+				<exemplarCity>塔拉瓦</exemplarCity>
+			</zone>
+			<zone type="Indian/Comoro">
+				<exemplarCity>科摩羅群島</exemplarCity>
+			</zone>
+			<zone type="America/St_Kitts">
+				<exemplarCity>聖基茨</exemplarCity>
+			</zone>
+			<zone type="Asia/Pyongyang">
+				<exemplarCity>平壤</exemplarCity>
+			</zone>
+			<zone type="Asia/Seoul">
+				<exemplarCity>首爾</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuwait">
+				<exemplarCity>科威特</exemplarCity>
+			</zone>
+			<zone type="America/Cayman">
+				<exemplarCity>開曼群島</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtau">
+				<exemplarCity>阿克套</exemplarCity>
+			</zone>
+			<zone type="Asia/Oral">
+				<exemplarCity>烏拉爾</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtobe">
+				<exemplarCity>阿克托比</exemplarCity>
+			</zone>
+			<zone type="Asia/Qyzylorda">
+				<exemplarCity>克孜勒奧爾達</exemplarCity>
+			</zone>
+			<zone type="Asia/Almaty">
+				<exemplarCity>阿拉木圖</exemplarCity>
+			</zone>
+			<zone type="Asia/Vientiane">
+				<exemplarCity>永珍</exemplarCity>
+			</zone>
+			<zone type="Asia/Beirut">
+				<exemplarCity>貝魯特</exemplarCity>
+			</zone>
+			<zone type="America/St_Lucia">
+				<exemplarCity>聖露西亞</exemplarCity>
+			</zone>
+			<zone type="Europe/Vaduz">
+				<exemplarCity>瓦都茲</exemplarCity>
+			</zone>
+			<zone type="Asia/Colombo">
+				<exemplarCity>可倫坡</exemplarCity>
+			</zone>
+			<zone type="Africa/Monrovia">
+				<exemplarCity>蒙羅維亞</exemplarCity>
+			</zone>
+			<zone type="Africa/Maseru">
+				<exemplarCity>馬賽魯</exemplarCity>
+			</zone>
+			<zone type="Europe/Vilnius">
+				<exemplarCity>維爾紐斯</exemplarCity>
+			</zone>
+			<zone type="Europe/Luxembourg">
+				<exemplarCity>盧森堡</exemplarCity>
+			</zone>
+			<zone type="Europe/Riga">
+				<exemplarCity>里加</exemplarCity>
+			</zone>
+			<zone type="Africa/Tripoli">
+				<exemplarCity>的黎波里</exemplarCity>
+			</zone>
+			<zone type="Africa/Casablanca">
+				<exemplarCity>卡薩布蘭卡</exemplarCity>
+			</zone>
+			<zone type="Europe/Monaco">
+				<exemplarCity>摩納哥</exemplarCity>
+			</zone>
+			<zone type="Europe/Chisinau">
+				<exemplarCity>奇西瑙</exemplarCity>
+			</zone>
+			<zone type="Europe/Podgorica">
+				<exemplarCity>波多里察</exemplarCity>
+			</zone>
+			<zone type="America/Marigot">
+				<exemplarCity>馬里戈特</exemplarCity>
+			</zone>
+			<zone type="Indian/Antananarivo">
+				<exemplarCity>安塔那那利佛</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kwajalein">
+				<exemplarCity>瓜加林島</exemplarCity>
+			</zone>
+			<zone type="Pacific/Majuro">
+				<exemplarCity>馬朱諾</exemplarCity>
+			</zone>
+			<zone type="Europe/Skopje">
+				<exemplarCity>史高比耶</exemplarCity>
+			</zone>
+			<zone type="Africa/Bamako">
+				<exemplarCity>巴馬科</exemplarCity>
+			</zone>
+			<zone type="Asia/Rangoon">
+				<exemplarCity>仰光</exemplarCity>
+			</zone>
+			<zone type="Asia/Hovd">
+				<exemplarCity>科布多</exemplarCity>
+			</zone>
+			<zone type="Asia/Ulaanbaatar">
+				<exemplarCity>烏蘭巴托</exemplarCity>
+			</zone>
+			<zone type="Asia/Choibalsan">
+				<exemplarCity>喬巴山</exemplarCity>
+			</zone>
+			<zone type="Asia/Macau">
+				<exemplarCity>中華人民共和國澳門特別行政區</exemplarCity>
+			</zone>
+			<zone type="Pacific/Saipan">
+				<exemplarCity>塞班</exemplarCity>
+			</zone>
+			<zone type="America/Martinique">
+				<exemplarCity>馬丁尼克</exemplarCity>
+			</zone>
+			<zone type="Africa/Nouakchott">
+				<exemplarCity>諾克少</exemplarCity>
+			</zone>
+			<zone type="America/Montserrat">
+				<exemplarCity>蒙哲臘</exemplarCity>
+			</zone>
+			<zone type="Europe/Malta">
+				<exemplarCity>馬爾他</exemplarCity>
+			</zone>
+			<zone type="Indian/Mauritius">
+				<exemplarCity>模里西斯</exemplarCity>
+			</zone>
+			<zone type="Indian/Maldives">
+				<exemplarCity>馬爾地夫</exemplarCity>
+			</zone>
+			<zone type="Africa/Blantyre">
+				<exemplarCity>布蘭太爾</exemplarCity>
+			</zone>
+			<zone type="America/Tijuana">
+				<exemplarCity>提華納</exemplarCity>
+			</zone>
+			<zone type="America/Santa_Isabel">
+				<exemplarCity>聖伊薩貝爾</exemplarCity>
+			</zone>
+			<zone type="America/Hermosillo">
+				<exemplarCity>埃莫西約</exemplarCity>
+			</zone>
+			<zone type="America/Mazatlan">
+				<exemplarCity>馬薩特蘭</exemplarCity>
+			</zone>
+			<zone type="America/Chihuahua">
+				<exemplarCity>奇華華</exemplarCity>
+			</zone>
+			<zone type="America/Bahia_Banderas">
+				<exemplarCity>巴伊亞班德拉斯</exemplarCity>
+			</zone>
+			<zone type="America/Ojinaga">
+				<exemplarCity>奧希納加</exemplarCity>
+			</zone>
+			<zone type="America/Monterrey">
+				<exemplarCity>蒙特瑞</exemplarCity>
+			</zone>
+			<zone type="America/Mexico_City">
+				<exemplarCity>墨西哥市</exemplarCity>
+			</zone>
+			<zone type="America/Matamoros">
+				<exemplarCity>馬塔莫羅斯</exemplarCity>
+			</zone>
+			<zone type="America/Merida">
+				<exemplarCity>梅里達</exemplarCity>
+			</zone>
+			<zone type="America/Cancun">
+				<exemplarCity>坎昆</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuala_Lumpur">
+				<exemplarCity>吉隆坡</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuching">
+				<exemplarCity>古晉</exemplarCity>
+			</zone>
+			<zone type="Africa/Maputo">
+				<exemplarCity>馬普托</exemplarCity>
+			</zone>
+			<zone type="Africa/Windhoek">
+				<exemplarCity>溫得和克</exemplarCity>
+			</zone>
+			<zone type="Pacific/Noumea">
+				<exemplarCity>諾美亞</exemplarCity>
+			</zone>
+			<zone type="Africa/Niamey">
+				<exemplarCity>尼亞美</exemplarCity>
+			</zone>
+			<zone type="Pacific/Norfolk">
+				<exemplarCity>諾福克</exemplarCity>
+			</zone>
+			<zone type="Africa/Lagos">
+				<exemplarCity>拉哥斯</exemplarCity>
+			</zone>
+			<zone type="America/Managua">
+				<exemplarCity>馬拿瓜</exemplarCity>
+			</zone>
+			<zone type="Europe/Amsterdam">
+				<exemplarCity>阿姆斯特丹</exemplarCity>
+			</zone>
+			<zone type="Europe/Oslo">
+				<exemplarCity>奧斯陸</exemplarCity>
+			</zone>
+			<zone type="Asia/Katmandu">
+				<exemplarCity>加德滿都</exemplarCity>
+			</zone>
+			<zone type="Pacific/Nauru">
+				<exemplarCity>諾魯</exemplarCity>
+			</zone>
+			<zone type="Pacific/Niue">
+				<exemplarCity>紐埃島</exemplarCity>
+			</zone>
+			<zone type="Pacific/Chatham">
+				<exemplarCity>查坦</exemplarCity>
+			</zone>
+			<zone type="Pacific/Auckland">
+				<exemplarCity>奧克蘭</exemplarCity>
+			</zone>
+			<zone type="Asia/Muscat">
+				<exemplarCity>馬斯開特</exemplarCity>
+			</zone>
+			<zone type="America/Panama">
+				<exemplarCity>巴拿馬</exemplarCity>
+			</zone>
+			<zone type="America/Lima">
+				<exemplarCity>利馬</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tahiti">
+				<exemplarCity>大溪地</exemplarCity>
+			</zone>
+			<zone type="Pacific/Marquesas">
+				<exemplarCity>馬可薩斯島</exemplarCity>
+			</zone>
+			<zone type="Pacific/Gambier">
+				<exemplarCity>甘比爾群島</exemplarCity>
+			</zone>
+			<zone type="Pacific/Port_Moresby">
+				<exemplarCity>莫士比港</exemplarCity>
+			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>布干維爾</exemplarCity>
+			</zone>
+			<zone type="Asia/Manila">
+				<exemplarCity>馬尼拉</exemplarCity>
+			</zone>
+			<zone type="Asia/Karachi">
+				<exemplarCity>喀拉蚩</exemplarCity>
+			</zone>
+			<zone type="Europe/Warsaw">
+				<exemplarCity>華沙</exemplarCity>
+			</zone>
+			<zone type="America/Miquelon">
+				<exemplarCity>密啟崙</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pitcairn">
+				<exemplarCity>皮特肯群島</exemplarCity>
+			</zone>
+			<zone type="America/Puerto_Rico">
+				<exemplarCity>波多黎各</exemplarCity>
+			</zone>
+			<zone type="Asia/Gaza">
+				<exemplarCity>加薩</exemplarCity>
+			</zone>
+			<zone type="Asia/Hebron">
+				<exemplarCity>赫布隆</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Azores">
+				<exemplarCity>亞速爾群島</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Madeira">
+				<exemplarCity>馬得拉群島</exemplarCity>
+			</zone>
+			<zone type="Europe/Lisbon">
+				<exemplarCity>里斯本</exemplarCity>
+			</zone>
+			<zone type="Pacific/Palau">
+				<exemplarCity>帛琉</exemplarCity>
+			</zone>
+			<zone type="America/Asuncion">
+				<exemplarCity>亞松森</exemplarCity>
+			</zone>
+			<zone type="Asia/Qatar">
+				<exemplarCity>卡達</exemplarCity>
+			</zone>
+			<zone type="Indian/Reunion">
+				<exemplarCity>留尼旺島</exemplarCity>
+			</zone>
+			<zone type="Europe/Bucharest">
+				<exemplarCity>布加勒斯特</exemplarCity>
+			</zone>
+			<zone type="Europe/Belgrade">
+				<exemplarCity>貝爾格勒</exemplarCity>
+			</zone>
+			<zone type="Europe/Kaliningrad">
+				<exemplarCity>加里寧格勒</exemplarCity>
+			</zone>
+			<zone type="Europe/Simferopol">
+				<exemplarCity>辛非洛浦</exemplarCity>
+			</zone>
+			<zone type="Europe/Moscow">
+				<exemplarCity>莫斯科</exemplarCity>
+			</zone>
+			<zone type="Europe/Volgograd">
+				<exemplarCity>伏爾加格勒</exemplarCity>
+			</zone>
+			<zone type="Europe/Samara">
+				<exemplarCity>沙馬拉</exemplarCity>
+			</zone>
+			<zone type="Asia/Yekaterinburg">
+				<exemplarCity>葉卡捷林堡</exemplarCity>
+			</zone>
+			<zone type="Asia/Omsk">
+				<exemplarCity>鄂木斯克</exemplarCity>
+			</zone>
+			<zone type="Asia/Novosibirsk">
+				<exemplarCity>新西伯利亞</exemplarCity>
+			</zone>
+			<zone type="Asia/Novokuznetsk">
+				<exemplarCity>新庫茲涅茨克</exemplarCity>
+			</zone>
+			<zone type="Asia/Krasnoyarsk">
+				<exemplarCity>克拉斯諾亞爾斯克</exemplarCity>
+			</zone>
+			<zone type="Asia/Irkutsk">
+				<exemplarCity>伊爾庫次克</exemplarCity>
+			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity draft="contributed">赤塔</exemplarCity>
+			</zone>
+			<zone type="Asia/Yakutsk">
+				<exemplarCity>雅庫次克</exemplarCity>
+			</zone>
+			<zone type="Asia/Vladivostok">
+				<exemplarCity>海參崴</exemplarCity>
+			</zone>
+			<zone type="Asia/Khandyga">
+				<exemplarCity>堪地加</exemplarCity>
+			</zone>
+			<zone type="Asia/Sakhalin">
+				<exemplarCity>庫頁島</exemplarCity>
+			</zone>
+			<zone type="Asia/Ust-Nera">
+				<exemplarCity>烏斯內拉</exemplarCity>
+			</zone>
+			<zone type="Asia/Magadan">
+				<exemplarCity>馬加丹</exemplarCity>
+			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>中科雷姆斯克</exemplarCity>
+			</zone>
+			<zone type="Asia/Kamchatka">
+				<exemplarCity>堪察加</exemplarCity>
+			</zone>
+			<zone type="Asia/Anadyr">
+				<exemplarCity>阿那底</exemplarCity>
+			</zone>
+			<zone type="Africa/Kigali">
+				<exemplarCity>基加利</exemplarCity>
+			</zone>
+			<zone type="Asia/Riyadh">
+				<exemplarCity>利雅德</exemplarCity>
+			</zone>
+			<zone type="Pacific/Guadalcanal">
+				<exemplarCity>瓜達康納爾島</exemplarCity>
+			</zone>
+			<zone type="Indian/Mahe">
+				<exemplarCity>馬埃島</exemplarCity>
+			</zone>
+			<zone type="Africa/Khartoum">
+				<exemplarCity>喀土穆</exemplarCity>
+			</zone>
+			<zone type="Europe/Stockholm">
+				<exemplarCity>斯德哥爾摩</exemplarCity>
+			</zone>
+			<zone type="Asia/Singapore">
+				<exemplarCity>新加坡</exemplarCity>
+			</zone>
+			<zone type="Atlantic/St_Helena">
+				<exemplarCity>聖赫勒拿島</exemplarCity>
+			</zone>
+			<zone type="Europe/Ljubljana">
+				<exemplarCity>盧比安納</exemplarCity>
+			</zone>
+			<zone type="Arctic/Longyearbyen">
+				<exemplarCity>隆意耳拜恩</exemplarCity>
+			</zone>
+			<zone type="Europe/Bratislava">
+				<exemplarCity>布拉提斯拉瓦</exemplarCity>
+			</zone>
+			<zone type="Africa/Freetown">
+				<exemplarCity>自由城</exemplarCity>
+			</zone>
+			<zone type="Europe/San_Marino">
+				<exemplarCity>聖馬利諾</exemplarCity>
+			</zone>
+			<zone type="Africa/Dakar">
+				<exemplarCity>達喀爾</exemplarCity>
+			</zone>
+			<zone type="Africa/Mogadishu">
+				<exemplarCity>摩加迪休</exemplarCity>
+			</zone>
+			<zone type="America/Paramaribo">
+				<exemplarCity>巴拉馬利波</exemplarCity>
+			</zone>
+			<zone type="Africa/Juba">
+				<exemplarCity>朱巴</exemplarCity>
+			</zone>
+			<zone type="Africa/Sao_Tome">
+				<exemplarCity>聖多美</exemplarCity>
+			</zone>
+			<zone type="America/El_Salvador">
+				<exemplarCity>薩爾瓦多</exemplarCity>
+			</zone>
+			<zone type="America/Lower_Princes">
+				<exemplarCity>下太子區</exemplarCity>
+			</zone>
+			<zone type="Asia/Damascus">
+				<exemplarCity>大馬士革</exemplarCity>
+			</zone>
+			<zone type="Africa/Mbabane">
+				<exemplarCity>墨巴本</exemplarCity>
+			</zone>
+			<zone type="America/Grand_Turk">
+				<exemplarCity>大特克島</exemplarCity>
+			</zone>
+			<zone type="Africa/Ndjamena">
+				<exemplarCity>恩賈梅納</exemplarCity>
+			</zone>
+			<zone type="Indian/Kerguelen">
+				<exemplarCity>凱爾蓋朗島</exemplarCity>
+			</zone>
+			<zone type="Africa/Lome">
+				<exemplarCity>洛美</exemplarCity>
+			</zone>
+			<zone type="Asia/Bangkok">
+				<exemplarCity>曼谷</exemplarCity>
+			</zone>
+			<zone type="Asia/Dushanbe">
+				<exemplarCity>杜桑貝</exemplarCity>
+			</zone>
+			<zone type="Pacific/Fakaofo">
+				<exemplarCity>法考福</exemplarCity>
+			</zone>
+			<zone type="Asia/Dili">
+				<exemplarCity>帝力</exemplarCity>
+			</zone>
+			<zone type="Asia/Ashgabat">
+				<exemplarCity>阿什哈巴特</exemplarCity>
+			</zone>
+			<zone type="Africa/Tunis">
+				<exemplarCity>突尼斯</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tongatapu">
+				<exemplarCity>東加塔布島</exemplarCity>
+			</zone>
+			<zone type="Europe/Istanbul">
+				<exemplarCity>伊斯坦堡</exemplarCity>
+			</zone>
+			<zone type="America/Port_of_Spain">
+				<exemplarCity>西班牙港</exemplarCity>
+			</zone>
+			<zone type="Pacific/Funafuti">
+				<exemplarCity>富那富提</exemplarCity>
+			</zone>
+			<zone type="Asia/Taipei">
+				<exemplarCity>台北</exemplarCity>
+			</zone>
+			<zone type="Africa/Dar_es_Salaam">
+				<exemplarCity>沙蘭港</exemplarCity>
+			</zone>
+			<zone type="Europe/Uzhgorod">
+				<exemplarCity>烏茲哥洛</exemplarCity>
+			</zone>
+			<zone type="Europe/Kiev">
+				<exemplarCity>基輔</exemplarCity>
+			</zone>
+			<zone type="Europe/Zaporozhye">
+				<exemplarCity>札波羅結</exemplarCity>
+			</zone>
+			<zone type="Africa/Kampala">
+				<exemplarCity>坎帕拉</exemplarCity>
+			</zone>
+			<zone type="Pacific/Midway">
+				<exemplarCity>中途島</exemplarCity>
+			</zone>
+			<zone type="Pacific/Johnston">
+				<exemplarCity>強斯頓</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wake">
+				<exemplarCity>威克</exemplarCity>
+			</zone>
+			<zone type="America/Adak">
+				<exemplarCity>艾達克</exemplarCity>
+			</zone>
+			<zone type="America/Nome">
+				<exemplarCity>諾姆</exemplarCity>
+			</zone>
+			<zone type="Pacific/Honolulu">
+				<exemplarCity>檀香山</exemplarCity>
+			</zone>
+			<zone type="America/Anchorage">
+				<exemplarCity>安克拉治</exemplarCity>
+			</zone>
+			<zone type="America/Yakutat">
+				<exemplarCity>雅庫塔</exemplarCity>
+			</zone>
+			<zone type="America/Sitka">
+				<exemplarCity>錫特卡</exemplarCity>
+			</zone>
+			<zone type="America/Juneau">
+				<exemplarCity>朱諾</exemplarCity>
+			</zone>
+			<zone type="America/Metlakatla">
+				<exemplarCity>梅特拉卡特拉</exemplarCity>
+			</zone>
+			<zone type="America/Los_Angeles">
+				<exemplarCity>洛杉磯</exemplarCity>
+			</zone>
+			<zone type="America/Boise">
+				<exemplarCity>波夕</exemplarCity>
+			</zone>
+			<zone type="America/Phoenix">
+				<exemplarCity>鳳凰城</exemplarCity>
+			</zone>
+			<zone type="America/Denver">
+				<exemplarCity>丹佛</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Beulah">
+				<exemplarCity>北達科他州布由拉</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/New_Salem">
+				<exemplarCity>北達科他州紐沙倫</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Center">
+				<exemplarCity>北達科他州中心</exemplarCity>
+			</zone>
+			<!-- start zone translations added per ticket #2753 -->
+			<zone type="America/Chicago">
+				<exemplarCity>芝加哥</exemplarCity>
+			</zone>
+			<zone type="America/Menominee">
+				<exemplarCity>美諾米尼</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Vincennes">
+				<exemplarCity>印第安那州溫森斯</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Petersburg">
+				<exemplarCity>印第安那州彼得堡</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Tell_City">
+				<exemplarCity>印第安那州泰爾城</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Knox">
+				<exemplarCity>印第安那州諾克斯</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Winamac">
+				<exemplarCity>印第安那州威納馬克</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Marengo">
+				<exemplarCity>印第安那州馬倫哥</exemplarCity>
+			</zone>
+			<zone type="America/Indianapolis">
+				<exemplarCity>印第安那波里斯</exemplarCity>
+			</zone>
+			<zone type="America/Louisville">
+				<exemplarCity>路易斯維爾</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Vevay">
+				<exemplarCity>印第安那州維威</exemplarCity>
+			</zone>
+			<zone type="America/Kentucky/Monticello">
+				<exemplarCity>肯塔基州蒙地卻羅</exemplarCity>
+			</zone>
+			<zone type="America/Detroit">
+				<exemplarCity>底特律</exemplarCity>
+			</zone>
+			<zone type="America/New_York">
+				<exemplarCity>紐約</exemplarCity>
+			</zone>
+			<zone type="America/Montevideo">
+				<exemplarCity>蒙特維多</exemplarCity>
+			</zone>
+			<zone type="Asia/Samarkand">
+				<exemplarCity>撒馬爾罕</exemplarCity>
+			</zone>
+			<zone type="Asia/Tashkent">
+				<exemplarCity>塔什干</exemplarCity>
+			</zone>
+			<zone type="Europe/Vatican">
+				<exemplarCity>梵蒂岡</exemplarCity>
+			</zone>
+			<zone type="America/St_Vincent">
+				<exemplarCity>聖文森</exemplarCity>
+			</zone>
+			<zone type="America/Caracas">
+				<exemplarCity>卡拉卡斯</exemplarCity>
+			</zone>
+			<zone type="America/Tortola">
+				<exemplarCity>托爾托拉</exemplarCity>
+			</zone>
+			<zone type="America/St_Thomas">
+				<exemplarCity>聖托馬斯</exemplarCity>
+			</zone>
+			<zone type="Asia/Saigon">
+				<exemplarCity>胡志明市</exemplarCity>
+			</zone>
+			<zone type="Pacific/Efate">
+				<exemplarCity>埃法特</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wallis">
+				<exemplarCity>瓦利斯</exemplarCity>
+			</zone>
+			<zone type="Pacific/Apia">
+				<exemplarCity>阿皮亞</exemplarCity>
+			</zone>
+			<zone type="Asia/Aden">
+				<exemplarCity>亞丁</exemplarCity>
+			</zone>
+			<zone type="Indian/Mayotte">
+				<exemplarCity>馬約特島</exemplarCity>
+			</zone>
+			<zone type="Africa/Johannesburg">
+				<exemplarCity>約翰尼斯堡</exemplarCity>
+			</zone>
+			<zone type="Africa/Lusaka">
+				<exemplarCity>路沙卡</exemplarCity>
+			</zone>
+			<zone type="Africa/Harare">
+				<exemplarCity>哈拉雷</exemplarCity>
+			</zone>
+			<!-- end zone translations added per ticket #2753 -->
+			<metazone type="Acre">
+				<long>
+					<generic>艾克時間</generic>
+					<standard>艾克標準時間</standard>
+					<daylight>艾克夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Afghanistan">
+				<long>
+					<standard>阿富汗時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Central">
+				<long>
+					<standard>中非時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Eastern">
+				<long>
+					<standard>東非時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Southern">
+				<long>
+					<standard>南非標準時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Western">
+				<long>
+					<generic>西非時間</generic>
+					<standard>西非標準時間</standard>
+					<daylight>西非夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Alaska">
+				<long>
+					<generic>阿拉斯加時間</generic>
+					<standard>阿拉斯加標準時間</standard>
+					<daylight>阿拉斯加夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Almaty">
+				<long>
+					<generic>阿拉木圖時間</generic>
+					<standard>阿拉木圖標準時間</standard>
+					<daylight>阿拉木圖夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Amazon">
+				<long>
+					<generic>亞馬遜時間</generic>
+					<standard>亞馬遜標準時間</standard>
+					<daylight>亞馬遜夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Central">
+				<long>
+					<generic>中部時間</generic>
+					<standard>中部標準時間</standard>
+					<daylight>中部夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Eastern">
+				<long>
+					<generic>東部時間</generic>
+					<standard>東部標準時間</standard>
+					<daylight>東部夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Mountain">
+				<long>
+					<generic>山區時間</generic>
+					<standard>山區標準時間</standard>
+					<daylight>山區夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Pacific">
+				<long>
+					<generic>太平洋時間</generic>
+					<standard>太平洋標準時間</standard>
+					<daylight>太平洋夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Anadyr">
+				<long>
+					<generic>阿納德爾時間</generic>
+					<standard>阿那底河標準時間</standard>
+					<daylight>阿那底河夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Apia">
+				<long>
+					<generic>阿皮亞時間</generic>
+					<standard>阿皮亞標準時間</standard>
+					<daylight>阿皮亞夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Aqtau">
+				<long>
+					<generic>阿克陶時間</generic>
+					<standard>阿克陶標準時間</standard>
+					<daylight>阿克陶夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Aqtobe">
+				<long>
+					<generic>阿克托比時間</generic>
+					<standard>阿克托比標準時間</standard>
+					<daylight>阿克托比夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Arabian">
+				<long>
+					<generic>阿拉伯時間</generic>
+					<standard>阿拉伯標準時間</standard>
+					<daylight>阿拉伯夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Argentina">
+				<long>
+					<generic>阿根廷時間</generic>
+					<standard>阿根廷標準時間</standard>
+					<daylight>阿根廷夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Argentina_Western">
+				<long>
+					<generic>阿根廷西部時間</generic>
+					<standard>阿根廷西部標準時間</standard>
+					<daylight>阿根廷西部夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Armenia">
+				<long>
+					<generic>亞美尼亞時間</generic>
+					<standard>亞美尼亞標準時間</standard>
+					<daylight>亞美尼亞夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Atlantic">
+				<long>
+					<generic>大西洋時間</generic>
+					<standard>大西洋標準時間</standard>
+					<daylight>大西洋夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Central">
+				<long>
+					<generic>澳洲中部時間</generic>
+					<standard>澳洲中部標準時間</standard>
+					<daylight>澳洲中部夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_CentralWestern">
+				<long>
+					<generic>澳洲中西部時間</generic>
+					<standard>澳洲中西部標準時間</standard>
+					<daylight>澳洲中西部夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Eastern">
+				<long>
+					<generic>澳洲東部時間</generic>
+					<standard>澳洲東部標準時間</standard>
+					<daylight>澳洲東部夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Western">
+				<long>
+					<generic>澳洲西部時間</generic>
+					<standard>澳洲西部標準時間</standard>
+					<daylight>澳洲西部夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Azerbaijan">
+				<long>
+					<generic>亞塞拜然時間</generic>
+					<standard>亞塞拜然標準時間</standard>
+					<daylight>亞塞拜然夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Azores">
+				<long>
+					<generic>亞速爾群島時間</generic>
+					<standard>亞速爾群島標準時間</standard>
+					<daylight>亞速爾群島夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Bangladesh">
+				<long>
+					<generic>孟加拉時間</generic>
+					<standard>孟加拉標準時間</standard>
+					<daylight>孟加拉夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Bhutan">
+				<long>
+					<standard>不丹時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Bolivia">
+				<long>
+					<standard>玻利維亞時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Brasilia">
+				<long>
+					<generic>巴西利亞時間</generic>
+					<standard>巴西利亞標準時間</standard>
+					<daylight>巴西利亞夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Brunei">
+				<long>
+					<standard>汶萊時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Cape_Verde">
+				<long>
+					<generic>維德角時間</generic>
+					<standard>維德角標準時間</standard>
+					<daylight>維德角夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Casey">
+				<long>
+					<standard draft="contributed">凱西站時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Chamorro">
+				<long>
+					<standard>查莫洛時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Chatham">
+				<long>
+					<generic>查坦群島時間</generic>
+					<standard>查坦群島標準時間</standard>
+					<daylight>查坦群島夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Chile">
+				<long>
+					<generic>智利時間</generic>
+					<standard>智利標準時間</standard>
+					<daylight>智利夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="China">
+				<long>
+					<generic>中國時間</generic>
+					<standard>中國標準時間</standard>
+					<daylight>中國夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Choibalsan">
+				<long>
+					<generic>喬巴山時間</generic>
+					<standard>喬巴山標準時間</standard>
+					<daylight>喬巴山夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Christmas">
+				<long>
+					<standard>聖誕島時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Cocos">
+				<long>
+					<standard>科科斯群島時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Colombia">
+				<long>
+					<generic>哥倫比亞時間</generic>
+					<standard>哥倫比亞標準時間</standard>
+					<daylight>哥倫比亞夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cook">
+				<long>
+					<generic>庫克群島時間</generic>
+					<standard>庫克群島標準時間</standard>
+					<daylight>庫克群島半夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cuba">
+				<long>
+					<generic>古巴時間</generic>
+					<standard>古巴標準時間</standard>
+					<daylight>古巴夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Davis">
+				<long>
+					<standard>戴維斯時間</standard>
+				</long>
+			</metazone>
+			<metazone type="DumontDUrville">
+				<long>
+					<standard>杜蒙杜比爾時間</standard>
+				</long>
+			</metazone>
+			<metazone type="East_Timor">
+				<long>
+					<standard>東帝汶時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Easter">
+				<long>
+					<generic>復活節島時間</generic>
+					<standard>復活節島標準時間</standard>
+					<daylight>復活節島夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Ecuador">
+				<long>
+					<standard>厄瓜多時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Europe_Central">
+				<long>
+					<generic>中歐時間</generic>
+					<standard>中歐標準時間</standard>
+					<daylight>中歐夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Europe_Eastern">
+				<long>
+					<generic>東歐時間</generic>
+					<standard>東歐標準時間</standard>
+					<daylight>東歐夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Europe_Further_Eastern">
+				<long>
+					<standard>歐洲遠東時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Europe_Western">
+				<long>
+					<generic>西歐時間</generic>
+					<standard>西歐標準時間</standard>
+					<daylight>西歐夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Falkland">
+				<long>
+					<generic>福克蘭群島時間</generic>
+					<standard>福克蘭群島標準時間</standard>
+					<daylight>福克蘭群島夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Fiji">
+				<long>
+					<generic>斐濟時間</generic>
+					<standard>斐濟標準時間</standard>
+					<daylight>斐濟夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="French_Guiana">
+				<long>
+					<standard>法屬圭亞那時間</standard>
+				</long>
+			</metazone>
+			<metazone type="French_Southern">
+				<long>
+					<standard>法國南方及南極時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Galapagos">
+				<long>
+					<standard>加拉巴哥群島時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Gambier">
+				<long>
+					<standard>甘比爾群島時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Georgia">
+				<long>
+					<generic>喬治亞時間</generic>
+					<standard>喬治亞標準時間</standard>
+					<daylight>喬治亞夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Gilbert_Islands">
+				<long>
+					<standard>吉爾伯特群島時間</standard>
+				</long>
+			</metazone>
+			<metazone type="GMT">
+				<long>
+					<standard>格林威治標準時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Greenland_Eastern">
+				<long>
+					<generic>格陵蘭東部時間</generic>
+					<standard>格陵蘭東部標準時間</standard>
+					<daylight>格陵蘭東部夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Greenland_Western">
+				<long>
+					<generic>格陵蘭西部時間</generic>
+					<standard>格陵蘭西部標準時間</standard>
+					<daylight>格陵蘭西部夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Guam">
+				<long>
+					<standard>關島標準時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Gulf">
+				<long>
+					<standard>波斯灣海域標準時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Guyana">
+				<long>
+					<standard>蓋亞那時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Hawaii_Aleutian">
+				<long>
+					<generic>夏威夷-阿留申時間</generic>
+					<standard>夏威夷-阿留申標準時間</standard>
+					<daylight>夏威夷-阿留申夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Hong_Kong">
+				<long>
+					<generic>香港時間</generic>
+					<standard>香港標準時間</standard>
+					<daylight>香港夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Hovd">
+				<long>
+					<generic>科布多時間</generic>
+					<standard>科布多標準時間</standard>
+					<daylight>科布多夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="India">
+				<long>
+					<standard>印度標準時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Indian_Ocean">
+				<long>
+					<standard>印度洋時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Indochina">
+				<long>
+					<standard>印度支那時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Central">
+				<long>
+					<standard>印尼中部時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Eastern">
+				<long>
+					<standard>印尼東部時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Western">
+				<long>
+					<standard>印尼西部時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Iran">
+				<long>
+					<generic>伊朗時間</generic>
+					<standard>伊朗標準時間</standard>
+					<daylight>伊朗夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Irkutsk">
+				<long>
+					<generic>伊爾庫次克時間</generic>
+					<standard>伊爾庫次克標準時間</standard>
+					<daylight>伊爾庫次克夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Israel">
+				<long>
+					<generic>以色列時間</generic>
+					<standard>以色列標準時間</standard>
+					<daylight>以色列夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Japan">
+				<long>
+					<generic>日本時間</generic>
+					<standard>日本標準時間</standard>
+					<daylight>日本夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kamchatka">
+				<long>
+					<generic>彼得羅巴甫洛夫斯克時間</generic>
+					<standard>彼得羅巴甫洛夫斯克標準時間</standard>
+					<daylight>彼得羅巴甫洛夫斯克日光節約時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Eastern">
+				<long>
+					<standard>東哈薩克時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Western">
+				<long>
+					<standard>西哈薩克時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Korea">
+				<long>
+					<generic>韓國時間</generic>
+					<standard>韓國標準時間</standard>
+					<daylight>韓國夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kosrae">
+				<long>
+					<standard>科斯瑞時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Krasnoyarsk">
+				<long>
+					<generic>克拉斯諾亞爾斯克時間</generic>
+					<standard>克拉斯諾亞爾斯克標準時間</standard>
+					<daylight>克拉斯諾亞爾斯克夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kyrgystan">
+				<long>
+					<standard>吉爾吉斯時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Lanka">
+				<long>
+					<standard>蘭卡時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Line_Islands">
+				<long>
+					<standard>萊恩群島時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Lord_Howe">
+				<long>
+					<generic>豪勳爵島時間</generic>
+					<standard>豪勳爵島標準時間</standard>
+					<daylight>豪勳爵島夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Macau">
+				<long>
+					<generic>澳門時間</generic>
+					<standard>澳門標準時間</standard>
+					<daylight>澳門夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Macquarie">
+				<long>
+					<standard>麥覺理時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Magadan">
+				<long>
+					<generic>馬加丹時間</generic>
+					<standard>馬加丹標準時間</standard>
+					<daylight>馬加丹夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Malaysia">
+				<long>
+					<standard>馬來西亞時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Maldives">
+				<long>
+					<standard>馬爾地夫時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Marquesas">
+				<long>
+					<standard>馬可薩斯時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Marshall_Islands">
+				<long>
+					<standard>馬紹爾群島時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Mauritius">
+				<long>
+					<generic>模里西斯時間</generic>
+					<standard>模里西斯標準時間</standard>
+					<daylight>模里西斯夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mawson">
+				<long>
+					<standard>莫森時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Mexico_Northwest">
+				<long>
+					<generic>墨西哥西北部時間</generic>
+					<standard>墨西哥西北部標準時間</standard>
+					<daylight>墨西哥西北部夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mexico_Pacific">
+				<long>
+					<generic>墨西哥太平洋時間</generic>
+					<standard>墨西哥太平洋標準時間</standard>
+					<daylight>墨西哥太平洋夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mongolia">
+				<long>
+					<generic>烏蘭巴托時間</generic>
+					<standard>烏蘭巴托標準時間</standard>
+					<daylight>烏蘭巴托夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Moscow">
+				<long>
+					<generic>莫斯科時間</generic>
+					<standard>莫斯科標準時間</standard>
+					<daylight>莫斯科夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Myanmar">
+				<long>
+					<standard>緬甸時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Nauru">
+				<long>
+					<standard>諾魯時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Nepal">
+				<long>
+					<standard>尼泊爾時間</standard>
+				</long>
+			</metazone>
+			<metazone type="New_Caledonia">
+				<long>
+					<generic>新喀里多尼亞時間</generic>
+					<standard>新喀里多尼亞標準時間</standard>
+					<daylight>新喀里多尼亞群島夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="New_Zealand">
+				<long>
+					<generic>紐西蘭時間</generic>
+					<standard>紐西蘭標準時間</standard>
+					<daylight>紐西蘭夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Newfoundland">
+				<long>
+					<generic>紐芬蘭時間</generic>
+					<standard>紐芬蘭標準時間</standard>
+					<daylight>紐芬蘭夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Niue">
+				<long>
+					<standard>紐埃島時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Norfolk">
+				<long>
+					<standard>諾福克島時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Noronha">
+				<long>
+					<generic>費爾南多 - 迪諾羅尼亞時間</generic>
+					<standard>費爾南多 - 迪諾羅尼亞標準時間</standard>
+					<daylight>費爾南多 - 迪諾羅尼亞夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="North_Mariana">
+				<long>
+					<standard>北馬里亞納群島時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Novosibirsk">
+				<long>
+					<generic>新西伯利亞時間</generic>
+					<standard>新西伯利亞標準時間</standard>
+					<daylight>新西伯利亞夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Omsk">
+				<long>
+					<generic>鄂木斯克時間</generic>
+					<standard>鄂木斯克標準時間</standard>
+					<daylight>鄂木斯克夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pakistan">
+				<long>
+					<generic>巴基斯坦時間</generic>
+					<standard>巴基斯坦標準時間</standard>
+					<daylight>巴基斯坦夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Palau">
+				<long>
+					<standard>帛琉時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Papua_New_Guinea">
+				<long>
+					<standard>巴布亞紐幾內亞時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Paraguay">
+				<long>
+					<generic>巴拉圭時間</generic>
+					<standard>巴拉圭標準時間</standard>
+					<daylight>巴拉圭夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Peru">
+				<long>
+					<generic>秘魯時間</generic>
+					<standard>秘魯標準時間</standard>
+					<daylight>秘魯夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Philippines">
+				<long>
+					<generic>菲律賓時間</generic>
+					<standard>菲律賓標準時間</standard>
+					<daylight>菲律賓夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Phoenix_Islands">
+				<long>
+					<standard>鳳凰群島時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Pierre_Miquelon">
+				<long>
+					<generic>聖皮埃爾和密克隆群島時間</generic>
+					<standard>聖皮埃爾和密克隆群島標準時間</standard>
+					<daylight>聖皮埃爾和密克隆群島夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pitcairn">
+				<long>
+					<standard>皮特肯時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Ponape">
+				<long>
+					<standard>波納佩時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Qyzylorda">
+				<long>
+					<generic>克孜勒奧爾達時間</generic>
+					<standard>克孜勒奧爾達標準時間</standard>
+					<daylight>克孜勒奧爾達夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Reunion">
+				<long>
+					<standard>留尼旺時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Rothera">
+				<long>
+					<standard>羅瑟拉時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Sakhalin">
+				<long>
+					<generic>庫頁島時間</generic>
+					<standard>庫頁島標準時間</standard>
+					<daylight>庫頁島夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Samara">
+				<long>
+					<generic>薩馬拉時間</generic>
+					<standard>薩馬拉標準時間</standard>
+					<daylight>薩馬拉夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Samoa">
+				<long>
+					<generic>薩摩亞時間</generic>
+					<standard>薩摩亞標準時間</standard>
+					<daylight>薩摩亞夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Seychelles">
+				<long>
+					<standard>塞席爾時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Singapore">
+				<long>
+					<standard>新加坡標準時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Solomon">
+				<long>
+					<standard>索羅門群島時間</standard>
+				</long>
+			</metazone>
+			<metazone type="South_Georgia">
+				<long>
+					<standard>南喬治亞時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Suriname">
+				<long>
+					<standard>蘇利南時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Syowa">
+				<long>
+					<standard>昭和基地時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Tahiti">
+				<long>
+					<standard>大溪地時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Taipei">
+				<long>
+					<generic>台北時間</generic>
+					<standard>台北標準時間</standard>
+					<daylight>台北夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Tajikistan">
+				<long>
+					<standard>塔吉克時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Tokelau">
+				<long>
+					<standard>托克勞群島時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Tonga">
+				<long>
+					<generic>東加時間</generic>
+					<standard>東加標準時間</standard>
+					<daylight>東加夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Truk">
+				<long>
+					<standard>楚克島時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Turkmenistan">
+				<long>
+					<generic>土庫曼時間</generic>
+					<standard>土庫曼標準時間</standard>
+					<daylight>土庫曼夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Tuvalu">
+				<long>
+					<standard>吐瓦魯時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Uruguay">
+				<long>
+					<generic>烏拉圭時間</generic>
+					<standard>烏拉圭標準時間</standard>
+					<daylight>烏拉圭夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Uzbekistan">
+				<long>
+					<generic>烏茲別克時間</generic>
+					<standard>烏茲別克標準時間</standard>
+					<daylight>烏茲別克夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Vanuatu">
+				<long>
+					<generic>萬那杜時間</generic>
+					<standard>萬那杜標準時間</standard>
+					<daylight>萬那杜夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Venezuela">
+				<long>
+					<standard>委內瑞拉時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Vladivostok">
+				<long>
+					<generic>海參崴時間</generic>
+					<standard>海參崴標準時間</standard>
+					<daylight>海參崴夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Volgograd">
+				<long>
+					<generic>伏爾加格勒時間</generic>
+					<standard>伏爾加格勒標準時間</standard>
+					<daylight>伏爾加格勒夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Vostok">
+				<long>
+					<standard>沃斯托克時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Wake">
+				<long>
+					<standard>威克島時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Wallis">
+				<long>
+					<standard>瓦利斯和富圖納群島時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Yakutsk">
+				<long>
+					<generic>雅庫次克時間</generic>
+					<standard>雅庫次克標準時間</standard>
+					<daylight>雅庫次克夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Yekaterinburg">
+				<long>
+					<generic>葉卡捷琳堡時間</generic>
+					<standard>葉卡捷琳堡標準時間</standard>
+					<daylight>葉卡捷琳堡夏令時間</daylight>
+				</long>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<defaultNumberingSystem>latn</defaultNumberingSystem>
+		<otherNumberingSystems>
+			<native>hanidec</native>
+			<traditional>hant</traditional>
+			<finance>hantfin</finance>
+		</otherNumberingSystems>
+		<symbols numberSystem="latn">
+			<decimal>.</decimal>
+			<group>,</group>
+			<list>;</list>
+			<percentSign>%</percentSign>
+			<plusSign>+</plusSign>
+			<minusSign>-</minusSign>
+			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>‰</perMille>
+			<infinity>∞</infinity>
+			<nan>非數值</nan>
+			<timeSeparator draft="contributed">:</timeSeparator>
+		</symbols>
+		<decimalFormats numberSystem="latn">
+			<decimalFormatLength>
+				<decimalFormat>
+					<pattern>#,##0.###</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+			<decimalFormatLength type="long">
+				<decimalFormat>
+					<pattern type="1000" count="other">0</pattern>
+					<pattern type="10000" count="other">0萬</pattern>
+					<pattern type="100000" count="other">00萬</pattern>
+					<pattern type="1000000" count="other">000萬</pattern>
+					<pattern type="10000000" count="other">0000萬</pattern>
+					<pattern type="100000000" count="other">0億</pattern>
+					<pattern type="1000000000" count="other">00億</pattern>
+					<pattern type="10000000000" count="other">000億</pattern>
+					<pattern type="100000000000" count="other">0000億</pattern>
+					<pattern type="1000000000000" count="other">0兆</pattern>
+					<pattern type="10000000000000" count="other">00兆</pattern>
+					<pattern type="100000000000000" count="other">000兆</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+			<decimalFormatLength type="short">
+				<decimalFormat>
+					<pattern type="1000" count="other">0</pattern>
+					<pattern type="10000" count="other">0萬</pattern>
+					<pattern type="100000" count="other">00萬</pattern>
+					<pattern type="1000000" count="other">000萬</pattern>
+					<pattern type="10000000" count="other">0000萬</pattern>
+					<pattern type="100000000" count="other">0億</pattern>
+					<pattern type="1000000000" count="other">00億</pattern>
+					<pattern type="10000000000" count="other">000億</pattern>
+					<pattern type="100000000000" count="other">0000億</pattern>
+					<pattern type="1000000000000" count="other">0兆</pattern>
+					<pattern type="10000000000000" count="other">00兆</pattern>
+					<pattern type="100000000000000" count="other">000兆</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+		</decimalFormats>
+		<scientificFormats numberSystem="latn">
+			<scientificFormatLength>
+				<scientificFormat>
+					<pattern>#E0</pattern>
+				</scientificFormat>
+			</scientificFormatLength>
+		</scientificFormats>
+		<percentFormats numberSystem="latn">
+			<percentFormatLength>
+				<percentFormat>
+					<pattern>#,##0%</pattern>
+				</percentFormat>
+			</percentFormatLength>
+		</percentFormats>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>¤#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0</pattern>
+					<pattern type="10000" count="other">¤0萬</pattern>
+					<pattern type="100000" count="other">¤00萬</pattern>
+					<pattern type="1000000" count="other">¤000萬</pattern>
+					<pattern type="10000000" count="other">¤0000萬</pattern>
+					<pattern type="100000000" count="other">¤0億</pattern>
+					<pattern type="1000000000" count="other">¤00億</pattern>
+					<pattern type="10000000000" count="other">¤000億</pattern>
+					<pattern type="100000000000" count="other">¤0000億</pattern>
+					<pattern type="1000000000000" count="other">¤0兆</pattern>
+					<pattern type="10000000000000" count="other">¤00兆</pattern>
+					<pattern type="100000000000000" count="other">¤000兆</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<unitPattern count="other">{0} {1}</unitPattern>
+		</currencyFormats>
+		<currencies>
+			<currency type="ADP">
+				<displayName>安道爾陪士特</displayName>
+				<displayName count="other">安道爾陪士特</displayName>
+				<symbol draft="contributed">ADP</symbol>
+			</currency>
+			<currency type="AED">
+				<displayName>阿拉伯聯合大公國迪爾汗</displayName>
+				<displayName count="other">阿拉伯聯合大公國迪爾汗</displayName>
+				<symbol>AED</symbol>
+			</currency>
+			<currency type="AFA">
+				<displayName>阿富汗尼 (1927–2002)</displayName>
+				<displayName count="other">阿富汗尼 (1927–2002)</displayName>
+				<symbol draft="contributed">AFA</symbol>
+			</currency>
+			<currency type="AFN">
+				<displayName>阿富汗尼</displayName>
+				<displayName count="other">阿富汗尼</displayName>
+				<symbol>AFN</symbol>
+			</currency>
+			<currency type="ALK">
+				<displayName draft="contributed">阿爾巴尼亞列克 (1946–1965)</displayName>
+				<displayName count="other" draft="contributed">阿爾巴尼亞列克 (1946–1965)</displayName>
+				<symbol draft="contributed">ALK</symbol>
+			</currency>
+			<currency type="ALL">
+				<displayName>阿爾巴尼亞列克</displayName>
+				<displayName count="other">阿爾巴尼亞列克</displayName>
+				<symbol>ALL</symbol>
+			</currency>
+			<currency type="AMD">
+				<displayName>亞美尼亞德拉姆</displayName>
+				<displayName count="other">亞美尼亞德拉姆</displayName>
+				<symbol>AMD</symbol>
+			</currency>
+			<currency type="ANG">
+				<displayName>荷屬安地列斯盾</displayName>
+				<displayName count="other">荷屬安地列斯盾</displayName>
+				<symbol>ANG</symbol>
+			</currency>
+			<currency type="AOA">
+				<displayName>安哥拉寬扎</displayName>
+				<displayName count="other">安哥拉寬扎</displayName>
+				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
+			</currency>
+			<currency type="AOK">
+				<displayName>安哥拉寬扎 (1977–1990)</displayName>
+				<displayName count="other">安哥拉寬扎 (1977–1990)</displayName>
+				<symbol draft="contributed">AOK</symbol>
+			</currency>
+			<currency type="AON">
+				<displayName>安哥拉新寬扎 (1990–2000)</displayName>
+				<displayName count="other">安哥拉新寬扎 (1990–2000)</displayName>
+				<symbol draft="contributed">AON</symbol>
+			</currency>
+			<currency type="AOR">
+				<displayName>安哥拉新調寬扎 (1995–1999)</displayName>
+				<displayName count="other">安哥拉新調寬扎 (1995–1999)</displayName>
+				<symbol draft="contributed">AOR</symbol>
+			</currency>
+			<currency type="ARA">
+				<displayName>阿根廷奧斯特納爾</displayName>
+				<displayName count="other">阿根廷奧斯特納爾</displayName>
+				<symbol draft="contributed">ARA</symbol>
+			</currency>
+			<currency type="ARL">
+				<displayName>阿根廷披索 (1970–1983)</displayName>
+				<displayName count="other">阿根廷披索 (1970–1983)</displayName>
+				<symbol draft="contributed">ARL</symbol>
+			</currency>
+			<currency type="ARM">
+				<displayName>阿根廷披索 (1881–1970)</displayName>
+				<displayName count="other">阿根廷披索 (1881–1970)</displayName>
+				<symbol draft="contributed">ARM</symbol>
+			</currency>
+			<currency type="ARP">
+				<displayName>阿根廷披索 (1983–1985)</displayName>
+				<displayName count="other">阿根廷披索 (1983–1985)</displayName>
+				<symbol draft="contributed">ARP</symbol>
+			</currency>
+			<currency type="ARS">
+				<displayName>阿根廷披索</displayName>
+				<displayName count="other">阿根廷披索</displayName>
+				<symbol>ARS</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="ATS">
+				<displayName>奧地利先令</displayName>
+				<displayName count="other">奧地利先令</displayName>
+				<symbol draft="contributed">ATS</symbol>
+			</currency>
+			<currency type="AUD">
+				<displayName>澳幣</displayName>
+				<displayName count="other">澳幣</displayName>
+				<symbol>AU$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="AWG">
+				<displayName>阿路巴盾</displayName>
+				<displayName count="other">阿路巴盾</displayName>
+				<symbol>AWG</symbol>
+			</currency>
+			<currency type="AZM">
+				<displayName>亞塞拜然馬納特 (1993–2006)</displayName>
+				<displayName count="other">亞塞拜然馬納特 (1993–2006)</displayName>
+				<symbol draft="contributed">AZM</symbol>
+			</currency>
+			<currency type="AZN">
+				<displayName>亞塞拜然馬納特</displayName>
+				<displayName count="other">亞塞拜然馬納特</displayName>
+				<symbol>AZN</symbol>
+			</currency>
+			<currency type="BAD">
+				<displayName>波士尼亞-赫塞哥維納第納爾</displayName>
+				<displayName count="other">波士尼亞-赫塞哥維納第納爾</displayName>
+				<symbol draft="contributed">BAD</symbol>
+			</currency>
+			<currency type="BAM">
+				<displayName>波士尼亞-赫塞哥維納可轉換馬克</displayName>
+				<displayName count="other">波士尼亞-赫塞哥維納可轉換馬克</displayName>
+				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
+			</currency>
+			<currency type="BAN">
+				<displayName>波士尼亞-赫塞哥維納新第納爾</displayName>
+				<displayName count="other">波士尼亞-赫塞哥維納新第納爾</displayName>
+				<symbol draft="contributed">BAN</symbol>
+			</currency>
+			<currency type="BBD">
+				<displayName>巴貝多元</displayName>
+				<displayName count="other">巴貝多元</displayName>
+				<symbol>BBD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BDT">
+				<displayName>孟加拉塔卡</displayName>
+				<displayName count="other">孟加拉塔卡</displayName>
+				<symbol>BDT</symbol>
+				<symbol alt="narrow" draft="contributed">৳</symbol>
+			</currency>
+			<currency type="BEC">
+				<displayName>比利時法郎（可轉換）</displayName>
+				<displayName count="other">比利時法郎（可轉換）</displayName>
+				<symbol draft="contributed">BEC</symbol>
+			</currency>
+			<currency type="BEF">
+				<displayName>比利時法郎</displayName>
+				<displayName count="other">比利時法郎</displayName>
+				<symbol draft="contributed">BEF</symbol>
+			</currency>
+			<currency type="BEL">
+				<displayName>比利時法郎（金融）</displayName>
+				<displayName count="other">比利時法郎（金融）</displayName>
+				<symbol draft="contributed">BEL</symbol>
+			</currency>
+			<currency type="BGL">
+				<displayName>保加利亞硬列弗</displayName>
+				<displayName count="other">保加利亞硬列弗</displayName>
+				<symbol draft="contributed">BGL</symbol>
+			</currency>
+			<currency type="BGM">
+				<displayName draft="contributed">保加利亞社會黨列弗</displayName>
+				<displayName count="other" draft="contributed">保加利亞社會黨列弗</displayName>
+				<symbol draft="contributed">BGM</symbol>
+			</currency>
+			<currency type="BGN">
+				<displayName>保加利亞新列弗</displayName>
+				<displayName count="other">保加利亞新列弗</displayName>
+				<symbol>BGN</symbol>
+			</currency>
+			<currency type="BGO">
+				<displayName>保加利亞列弗 (1879–1952)</displayName>
+				<displayName count="other">保加利亞列弗 (1879–1952)</displayName>
+				<symbol draft="contributed">BGO</symbol>
+			</currency>
+			<currency type="BHD">
+				<displayName>巴林第納爾</displayName>
+				<displayName count="other">巴林第納爾</displayName>
+				<symbol>BHD</symbol>
+			</currency>
+			<currency type="BIF">
+				<displayName>蒲隆地法郎</displayName>
+				<displayName count="other">蒲隆地法郎</displayName>
+				<symbol>BIF</symbol>
+			</currency>
+			<currency type="BMD">
+				<displayName>百慕達幣</displayName>
+				<displayName count="other">百慕達幣</displayName>
+				<symbol>BMD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BND">
+				<displayName>汶萊元</displayName>
+				<displayName count="other">汶萊元</displayName>
+				<symbol>BND</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BOB">
+				<displayName>玻利維亞諾</displayName>
+				<displayName count="other">玻利維亞諾</displayName>
+				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
+			</currency>
+			<currency type="BOL">
+				<displayName>玻利維亞玻利維亞諾 (1863–1963)</displayName>
+				<displayName count="other">玻利維亞玻利維亞諾 (1863–1963)</displayName>
+				<symbol draft="contributed">BOL</symbol>
+			</currency>
+			<currency type="BOP">
+				<displayName>玻利維亞披索</displayName>
+				<displayName count="other">玻利維亞披索</displayName>
+				<symbol draft="contributed">BOP</symbol>
+			</currency>
+			<currency type="BOV">
+				<displayName>玻利維亞幕多</displayName>
+				<displayName count="other">玻利維亞幕多</displayName>
+				<symbol draft="contributed">BOV</symbol>
+			</currency>
+			<currency type="BRB">
+				<displayName>巴西克魯薩多農瓦 (1967–1986)</displayName>
+				<displayName count="other">巴西克魯薩多農瓦 (1967–1986)</displayName>
+				<symbol draft="contributed">BRB</symbol>
+			</currency>
+			<currency type="BRC">
+				<displayName>巴西克魯賽羅 (1986–1989)</displayName>
+				<displayName count="other">巴西克魯賽羅 (1986–1989)</displayName>
+				<symbol draft="contributed">BRC</symbol>
+			</currency>
+			<currency type="BRE">
+				<displayName>巴西克魯賽羅 (1990–1993)</displayName>
+				<displayName count="other">巴西克魯賽羅 (1990–1993)</displayName>
+				<symbol draft="contributed">BRE</symbol>
+			</currency>
+			<currency type="BRL">
+				<displayName>巴西里拉</displayName>
+				<displayName count="other">巴西里拉</displayName>
+				<symbol>R$</symbol>
+				<symbol alt="narrow" draft="contributed">R$</symbol>
+			</currency>
+			<currency type="BRN">
+				<displayName>巴西克如爾達農瓦</displayName>
+				<displayName count="other">巴西克如爾達農瓦</displayName>
+				<symbol draft="contributed">BRN</symbol>
+			</currency>
+			<currency type="BRR">
+				<displayName>巴西克魯賽羅 (1993–1994)</displayName>
+				<displayName count="other">巴西克魯賽羅 (1993–1994)</displayName>
+				<symbol draft="contributed">BRR</symbol>
+			</currency>
+			<currency type="BRZ">
+				<displayName>巴西克魯賽羅 (1942 –1967)</displayName>
+				<displayName count="other">巴西克魯賽羅 (1942 –1967)</displayName>
+				<symbol draft="contributed">BRZ</symbol>
+			</currency>
+			<currency type="BSD">
+				<displayName>巴哈馬元</displayName>
+				<displayName count="other">巴哈馬元</displayName>
+				<symbol>BSD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="BTN">
+				<displayName>不丹那特倫</displayName>
+				<displayName count="other">不丹那特倫</displayName>
+				<symbol>BTN</symbol>
+			</currency>
+			<currency type="BUK">
+				<displayName>緬甸基雅特</displayName>
+				<displayName count="other">緬甸基雅特</displayName>
+				<symbol draft="contributed">BUK</symbol>
+			</currency>
+			<currency type="BWP">
+				<displayName>波札那普拉</displayName>
+				<displayName count="other">波札那普拉</displayName>
+				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
+			</currency>
+			<currency type="BYB">
+				<displayName>白俄羅斯新盧布 (1994–1999)</displayName>
+				<displayName count="other">白俄羅斯新盧布 (1994–1999)</displayName>
+				<symbol draft="contributed">BYB</symbol>
+			</currency>
+			<currency type="BYR">
+				<displayName>白俄羅斯盧布</displayName>
+				<displayName count="other">白俄羅斯盧布</displayName>
+				<symbol>BYR</symbol>
+				<symbol alt="narrow" draft="contributed">р.</symbol>
+			</currency>
+			<currency type="BZD">
+				<displayName>貝里斯元</displayName>
+				<displayName count="other">貝里斯元</displayName>
+				<symbol>BZD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CAD">
+				<displayName>加幣</displayName>
+				<displayName count="other">加幣</displayName>
+				<symbol>CA$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CDF">
+				<displayName>剛果法郎</displayName>
+				<displayName count="other">剛果法郎</displayName>
+				<symbol>CDF</symbol>
+			</currency>
+			<currency type="CHE">
+				<displayName draft="contributed">歐元 (WIR)</displayName>
+				<displayName count="other" draft="contributed">歐元 (WIR)</displayName>
+				<symbol draft="contributed">CHE</symbol>
+			</currency>
+			<currency type="CHF">
+				<displayName>瑞士法郎</displayName>
+				<displayName count="other">瑞士法郎</displayName>
+				<symbol>CHF</symbol>
+			</currency>
+			<currency type="CHW">
+				<displayName draft="contributed">法郎 (WIR)</displayName>
+				<displayName count="other" draft="contributed">法郎 (WIR)</displayName>
+				<symbol draft="contributed">CHW</symbol>
+			</currency>
+			<currency type="CLE">
+				<displayName draft="contributed">智利埃斯庫多</displayName>
+				<displayName count="other" draft="contributed">智利埃斯庫多</displayName>
+				<symbol draft="contributed">CLE</symbol>
+			</currency>
+			<currency type="CLF">
+				<displayName>卡林油達佛曼跎</displayName>
+				<displayName count="other">卡林油達佛曼跎</displayName>
+				<symbol draft="contributed">CLF</symbol>
+			</currency>
+			<currency type="CLP">
+				<displayName>智利披索</displayName>
+				<displayName count="other">智利披索</displayName>
+				<symbol>CLP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CNX">
+				<symbol draft="contributed">CNX</symbol>
+			</currency>
+			<currency type="CNY">
+				<displayName>人民幣</displayName>
+				<displayName count="other">人民幣</displayName>
+				<symbol>CN¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
+			</currency>
+			<currency type="COP">
+				<displayName>哥倫比亞披索</displayName>
+				<displayName count="other">哥倫比亞披索</displayName>
+				<symbol>COP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="COU">
+				<displayName>哥倫比亞幣 (COU)</displayName>
+				<displayName count="other">哥倫比亞幣 (COU)</displayName>
+				<symbol draft="contributed">COU</symbol>
+			</currency>
+			<currency type="CRC">
+				<displayName>哥斯大黎加科朗</displayName>
+				<displayName count="other">哥斯大黎加科朗</displayName>
+				<symbol>CRC</symbol>
+				<symbol alt="narrow" draft="contributed">₡</symbol>
+			</currency>
+			<currency type="CSD">
+				<displayName draft="contributed">舊塞爾維亞第納爾</displayName>
+				<displayName count="other" draft="contributed">舊塞爾維亞第納爾</displayName>
+				<symbol draft="contributed">CSD</symbol>
+			</currency>
+			<currency type="CSK">
+				<displayName>捷克斯洛伐克硬克朗</displayName>
+				<displayName count="other">捷克斯洛伐克硬克朗</displayName>
+				<symbol draft="contributed">CSK</symbol>
+			</currency>
+			<currency type="CUC">
+				<displayName>古巴可轉換披索</displayName>
+				<displayName count="other">古巴可轉換披索</displayName>
+				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CUP">
+				<displayName>古巴披索</displayName>
+				<displayName count="other">古巴披索</displayName>
+				<symbol>CUP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="CVE">
+				<displayName>維德角埃斯庫多</displayName>
+				<displayName count="other">維德角埃斯庫多</displayName>
+				<symbol>CVE</symbol>
+			</currency>
+			<currency type="CYP">
+				<displayName>賽普勒斯鎊</displayName>
+				<displayName count="other">賽普勒斯鎊</displayName>
+				<symbol draft="contributed">CYP</symbol>
+			</currency>
+			<currency type="CZK">
+				<displayName>捷克克朗</displayName>
+				<displayName count="other">捷克克朗</displayName>
+				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
+			</currency>
+			<currency type="DDM">
+				<displayName draft="contributed">東德奧斯特馬克</displayName>
+				<displayName count="other" draft="contributed">東德奧斯特馬克</displayName>
+				<symbol draft="contributed">DDM</symbol>
+			</currency>
+			<currency type="DEM">
+				<displayName>德國馬克</displayName>
+				<displayName count="other">德國馬克</displayName>
+				<symbol draft="contributed">DEM</symbol>
+			</currency>
+			<currency type="DJF">
+				<displayName>吉布地法郎</displayName>
+				<displayName count="other">吉布地法郎</displayName>
+				<symbol>DJF</symbol>
+			</currency>
+			<currency type="DKK">
+				<displayName>丹麥克朗</displayName>
+				<displayName count="other">丹麥克朗</displayName>
+				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="DOP">
+				<displayName>多明尼加披索</displayName>
+				<displayName count="other">多明尼加披索</displayName>
+				<symbol>DOP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="DZD">
+				<displayName>阿爾及利亞第納爾</displayName>
+				<displayName count="other">阿爾及利亞第納爾</displayName>
+				<symbol>DZD</symbol>
+			</currency>
+			<currency type="ECS">
+				<displayName>厄瓜多蘇克雷</displayName>
+				<displayName count="other">厄瓜多蘇克雷</displayName>
+				<symbol draft="contributed">ECS</symbol>
+			</currency>
+			<currency type="ECV">
+				<displayName>厄瓜多爾由里達瓦康斯坦 (UVC)</displayName>
+				<displayName count="other">厄瓜多爾由里達瓦康斯坦 (UVC)</displayName>
+				<symbol draft="contributed">ECV</symbol>
+			</currency>
+			<currency type="EEK">
+				<displayName>愛沙尼亞克朗</displayName>
+				<displayName count="other">愛沙尼亞克朗</displayName>
+				<symbol draft="contributed">EEK</symbol>
+			</currency>
+			<currency type="EGP">
+				<displayName>埃及鎊</displayName>
+				<displayName count="other">埃及鎊</displayName>
+				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
+			</currency>
+			<currency type="ERN">
+				<displayName>厄立特里亞納克法</displayName>
+				<displayName count="other">厄立特里亞納克法</displayName>
+				<symbol>ERN</symbol>
+			</currency>
+			<currency type="ESA">
+				<displayName draft="contributed">西班牙比塞塔（會計單位）</displayName>
+				<displayName count="other" draft="contributed">西班牙比塞塔（會計單位）</displayName>
+				<symbol draft="contributed">ESA</symbol>
+			</currency>
+			<currency type="ESB">
+				<displayName draft="contributed">西班牙比塞塔（可轉換會計單位）</displayName>
+				<displayName count="other" draft="contributed">西班牙比塞塔（可轉換會計單位）</displayName>
+				<symbol draft="contributed">ESB</symbol>
+			</currency>
+			<currency type="ESP">
+				<displayName>西班牙陪士特</displayName>
+				<displayName count="other">西班牙陪士特</displayName>
+				<symbol draft="contributed">ESP</symbol>
+				<symbol alt="narrow" draft="contributed">₧</symbol>
+			</currency>
+			<currency type="ETB">
+				<displayName>衣索比亞比爾</displayName>
+				<displayName count="other">衣索比亞比爾</displayName>
+				<symbol>ETB</symbol>
+			</currency>
+			<currency type="EUR">
+				<displayName>歐元</displayName>
+				<displayName count="other">歐元</displayName>
+				<symbol>€</symbol>
+				<symbol alt="narrow" draft="contributed">€</symbol>
+			</currency>
+			<currency type="FIM">
+				<displayName>芬蘭馬克</displayName>
+				<displayName count="other">芬蘭馬克</displayName>
+				<symbol draft="contributed">FIM</symbol>
+			</currency>
+			<currency type="FJD">
+				<displayName>斐濟元</displayName>
+				<displayName count="other">斐濟元</displayName>
+				<symbol>FJD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="FKP">
+				<displayName>福克蘭群島鎊</displayName>
+				<displayName count="other">福克蘭群島鎊</displayName>
+				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="FRF">
+				<displayName>法國法郎</displayName>
+				<displayName count="other">法國法郎</displayName>
+				<symbol draft="contributed">FRF</symbol>
+			</currency>
+			<currency type="GBP">
+				<displayName>英鎊</displayName>
+				<displayName count="other">英鎊</displayName>
+				<symbol>£</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="GEK">
+				<displayName draft="contributed">喬治亞庫旁拉里</displayName>
+				<displayName count="other" draft="contributed">喬治亞庫旁拉里</displayName>
+				<symbol draft="contributed">GEK</symbol>
+			</currency>
+			<currency type="GEL">
+				<displayName>喬治亞拉里</displayName>
+				<displayName count="other">喬治亞拉里</displayName>
+				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
+			</currency>
+			<currency type="GHC">
+				<displayName>迦納賽地 (1979–2007)</displayName>
+				<displayName count="other">迦納賽地 (1979–2007)</displayName>
+				<symbol draft="contributed">GHC</symbol>
+			</currency>
+			<currency type="GHS">
+				<displayName>迦納塞地</displayName>
+				<displayName count="other">迦納塞地</displayName>
+				<symbol>GHS</symbol>
+			</currency>
+			<currency type="GIP">
+				<displayName>直布羅陀鎊</displayName>
+				<displayName count="other">直布羅陀鎊</displayName>
+				<symbol>GIP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="GMD">
+				<displayName>甘比亞達拉西</displayName>
+				<displayName count="other">甘比亞達拉西</displayName>
+				<symbol>GMD</symbol>
+			</currency>
+			<currency type="GNF">
+				<displayName>幾內亞法郎</displayName>
+				<displayName count="other">幾內亞法郎</displayName>
+				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
+			</currency>
+			<currency type="GNS">
+				<displayName>幾內亞西里</displayName>
+				<displayName count="other">幾內亞西里</displayName>
+				<symbol draft="contributed">GNS</symbol>
+			</currency>
+			<currency type="GQE">
+				<displayName>赤道幾內亞埃奎勒</displayName>
+				<displayName count="other">赤道幾內亞埃奎勒</displayName>
+				<symbol draft="contributed">GQE</symbol>
+			</currency>
+			<currency type="GRD">
+				<displayName>希臘德拉克馬</displayName>
+				<displayName count="other">希臘德拉克馬</displayName>
+				<symbol draft="contributed">GRD</symbol>
+			</currency>
+			<currency type="GTQ">
+				<displayName>瓜地馬拉格查爾</displayName>
+				<displayName count="other">瓜地馬拉格查爾</displayName>
+				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
+			</currency>
+			<currency type="GWE">
+				<displayName>葡屬幾內亞埃斯庫多</displayName>
+				<displayName count="other">葡屬幾內亞埃斯庫多</displayName>
+				<symbol draft="contributed">GWE</symbol>
+			</currency>
+			<currency type="GWP">
+				<displayName>幾內亞比索披索</displayName>
+				<displayName count="other">幾內亞比索披索</displayName>
+				<symbol draft="contributed">GWP</symbol>
+			</currency>
+			<currency type="GYD">
+				<displayName>圭亞那元</displayName>
+				<displayName count="other">圭亞那元</displayName>
+				<symbol>GYD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="HKD">
+				<displayName>港幣</displayName>
+				<displayName count="other">港幣</displayName>
+				<symbol>HK$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="HNL">
+				<displayName>洪都拉斯倫皮拉</displayName>
+				<displayName count="other">洪都拉斯倫皮拉</displayName>
+				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
+			</currency>
+			<currency type="HRD">
+				<displayName>克羅埃西亞第納爾</displayName>
+				<displayName count="other">克羅埃西亞第納爾</displayName>
+				<symbol draft="contributed">HRD</symbol>
+			</currency>
+			<currency type="HRK">
+				<displayName>克羅埃西亞庫納</displayName>
+				<displayName count="other">克羅埃西亞庫納</displayName>
+				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
+			</currency>
+			<currency type="HTG">
+				<displayName>海地古德</displayName>
+				<displayName count="other">海地古德</displayName>
+				<symbol>HTG</symbol>
+			</currency>
+			<currency type="HUF">
+				<displayName>匈牙利福林</displayName>
+				<displayName count="other">匈牙利福林</displayName>
+				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
+			</currency>
+			<currency type="IDR">
+				<displayName>印尼盾</displayName>
+				<displayName count="other">印尼盾</displayName>
+				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
+			</currency>
+			<currency type="IEP">
+				<displayName>愛爾蘭鎊</displayName>
+				<displayName count="other">愛爾蘭鎊</displayName>
+				<symbol draft="contributed">IEP</symbol>
+			</currency>
+			<currency type="ILP">
+				<displayName>以色列鎊</displayName>
+				<displayName count="other">以色列鎊</displayName>
+				<symbol draft="contributed">ILP</symbol>
+			</currency>
+			<currency type="ILR">
+				<displayName draft="contributed">以色列謝克爾 (1980–1985)</displayName>
+				<displayName count="other" draft="contributed">以色列謝克爾 (1980–1985)</displayName>
+				<symbol draft="contributed">ILR</symbol>
+			</currency>
+			<currency type="ILS">
+				<displayName>以色列新謝克爾</displayName>
+				<displayName count="other">以色列新謝克爾</displayName>
+				<symbol>₪</symbol>
+				<symbol alt="narrow" draft="contributed">₪</symbol>
+			</currency>
+			<currency type="INR">
+				<displayName>印度盧比</displayName>
+				<displayName count="other">印度盧比</displayName>
+				<symbol>₹</symbol>
+				<symbol alt="narrow" draft="contributed">₹</symbol>
+			</currency>
+			<currency type="IQD">
+				<displayName>伊拉克第納爾</displayName>
+				<displayName count="other">伊拉克第納爾</displayName>
+				<symbol>IQD</symbol>
+			</currency>
+			<currency type="IRR">
+				<displayName>伊朗里亞爾</displayName>
+				<displayName count="other">伊朗里亞爾</displayName>
+				<symbol>IRR</symbol>
+			</currency>
+			<currency type="ISJ">
+				<displayName draft="contributed">冰島克朗 (1918–1981)</displayName>
+				<displayName count="other" draft="contributed">冰島克朗 (1918–1981)</displayName>
+				<symbol draft="contributed">ISJ</symbol>
+			</currency>
+			<currency type="ISK">
+				<displayName>冰島克朗</displayName>
+				<displayName count="other">冰島克朗</displayName>
+				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="ITL">
+				<displayName>義大利里拉</displayName>
+				<displayName count="other">義大利里拉</displayName>
+				<symbol draft="contributed">ITL</symbol>
+			</currency>
+			<currency type="JMD">
+				<displayName>牙買加元</displayName>
+				<displayName count="other">牙買加元</displayName>
+				<symbol>JMD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="JOD">
+				<displayName>約旦第納爾</displayName>
+				<displayName count="other">約旦第納爾</displayName>
+				<symbol>JOD</symbol>
+			</currency>
+			<currency type="JPY">
+				<displayName>日圓</displayName>
+				<displayName count="other">日圓</displayName>
+				<symbol>¥</symbol>
+				<symbol alt="narrow" draft="contributed">¥</symbol>
+			</currency>
+			<currency type="KES">
+				<displayName>肯尼亞先令</displayName>
+				<displayName count="other">肯尼亞先令</displayName>
+				<symbol>KES</symbol>
+			</currency>
+			<currency type="KGS">
+				<displayName>吉爾吉斯索姆</displayName>
+				<displayName count="other">吉爾吉斯索姆</displayName>
+				<symbol>KGS</symbol>
+			</currency>
+			<currency type="KHR">
+				<displayName>柬埔寨瑞爾</displayName>
+				<displayName count="other">柬埔寨瑞爾</displayName>
+				<symbol>KHR</symbol>
+				<symbol alt="narrow" draft="contributed">៛</symbol>
+			</currency>
+			<currency type="KMF">
+				<displayName>科摩羅法郎</displayName>
+				<displayName count="other">科摩羅法郎</displayName>
+				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
+			</currency>
+			<currency type="KPW">
+				<displayName>北韓圓</displayName>
+				<displayName count="other">北韓圓</displayName>
+				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
+			</currency>
+			<currency type="KRH">
+				<displayName draft="contributed">南韓圜</displayName>
+				<displayName count="other" draft="contributed">南韓圜</displayName>
+				<symbol draft="contributed">KRH</symbol>
+			</currency>
+			<currency type="KRO">
+				<displayName draft="contributed">南韓圓</displayName>
+				<displayName count="other" draft="contributed">南韓圓</displayName>
+				<symbol draft="contributed">KRO</symbol>
+			</currency>
+			<currency type="KRW">
+				<displayName>韓圓</displayName>
+				<displayName count="other">韓圓</displayName>
+				<symbol>￦</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
+			</currency>
+			<currency type="KWD">
+				<displayName>科威特第納爾</displayName>
+				<displayName count="other">科威特第納爾</displayName>
+				<symbol>KWD</symbol>
+			</currency>
+			<currency type="KYD">
+				<displayName>開曼群島元</displayName>
+				<displayName count="other">開曼群島元</displayName>
+				<symbol>KYD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="KZT">
+				<displayName>卡扎克斯坦坦吉</displayName>
+				<displayName count="other">卡扎克斯坦坦吉</displayName>
+				<symbol>KZT</symbol>
+				<symbol alt="narrow" draft="contributed">₸</symbol>
+			</currency>
+			<currency type="LAK">
+				<displayName>寮國基普</displayName>
+				<displayName count="other">寮國基普</displayName>
+				<symbol>LAK</symbol>
+				<symbol alt="narrow" draft="contributed">₭</symbol>
+			</currency>
+			<currency type="LBP">
+				<displayName>黎巴嫩鎊</displayName>
+				<displayName count="other">黎巴嫩鎊</displayName>
+				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
+			</currency>
+			<currency type="LKR">
+				<displayName>斯里蘭卡盧比</displayName>
+				<displayName count="other">斯里蘭卡盧比</displayName>
+				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="LRD">
+				<displayName>賴比瑞亞元</displayName>
+				<displayName count="other">賴比瑞亞元</displayName>
+				<symbol>LRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="LSL">
+				<displayName>賴索托洛蒂</displayName>
+				<displayName count="other">賴索托洛蒂</displayName>
+				<symbol draft="contributed">LSL</symbol>
+			</currency>
+			<currency type="LTL">
+				<displayName>立陶宛立特</displayName>
+				<displayName count="other">立陶宛立特</displayName>
+				<symbol>LTL</symbol>
+			</currency>
+			<currency type="LTT">
+				<displayName>立陶宛特羅</displayName>
+				<displayName count="other">立陶宛特羅</displayName>
+				<symbol draft="contributed">LTT</symbol>
+			</currency>
+			<currency type="LUC">
+				<displayName draft="contributed">盧森堡可兌換法郎</displayName>
+				<displayName count="other" draft="contributed">盧森堡可兌換法郎</displayName>
+				<symbol draft="contributed">LUC</symbol>
+			</currency>
+			<currency type="LUF">
+				<displayName>盧森堡法郎</displayName>
+				<displayName count="other">盧森堡法郎</displayName>
+				<symbol draft="contributed">LUF</symbol>
+			</currency>
+			<currency type="LUL">
+				<displayName draft="contributed">盧森堡金融法郎</displayName>
+				<displayName count="other" draft="contributed">盧森堡金融法郎</displayName>
+				<symbol draft="contributed">LUL</symbol>
+			</currency>
+			<currency type="LVL">
+				<displayName>拉脫維亞拉特銀幣</displayName>
+				<displayName count="other">拉脫維亞拉特銀幣</displayName>
+				<symbol draft="contributed">LVL</symbol>
+			</currency>
+			<currency type="LVR">
+				<displayName>拉脫維亞盧布</displayName>
+				<displayName count="other">拉脫維亞盧布</displayName>
+				<symbol draft="contributed">LVR</symbol>
+			</currency>
+			<currency type="LYD">
+				<displayName>利比亞第納爾</displayName>
+				<displayName count="other">利比亞第納爾</displayName>
+				<symbol>LYD</symbol>
+			</currency>
+			<currency type="MAD">
+				<displayName>摩洛哥迪拉姆</displayName>
+				<displayName count="other">摩洛哥迪拉姆</displayName>
+				<symbol>MAD</symbol>
+			</currency>
+			<currency type="MAF">
+				<displayName>摩洛哥法郎</displayName>
+				<displayName count="other">摩洛哥法郎</displayName>
+				<symbol draft="contributed">MAF</symbol>
+			</currency>
+			<currency type="MCF">
+				<displayName draft="contributed">摩納哥法郎</displayName>
+				<displayName count="other" draft="contributed">摩納哥法郎</displayName>
+				<symbol draft="contributed">MCF</symbol>
+			</currency>
+			<currency type="MDC">
+				<displayName draft="contributed">摩爾多瓦券</displayName>
+				<displayName count="other" draft="contributed">摩爾多瓦券</displayName>
+				<symbol draft="contributed">MDC</symbol>
+			</currency>
+			<currency type="MDL">
+				<displayName>摩杜雲列伊</displayName>
+				<displayName count="other">摩杜雲列伊</displayName>
+				<symbol>MDL</symbol>
+			</currency>
+			<currency type="MGA">
+				<displayName>馬達加斯加阿里亞里</displayName>
+				<displayName count="other">馬達加斯加阿里亞里</displayName>
+				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
+			</currency>
+			<currency type="MGF">
+				<displayName>馬達加斯加法郎</displayName>
+				<displayName count="other">馬達加斯加法郎</displayName>
+				<symbol draft="contributed">MGF</symbol>
+			</currency>
+			<currency type="MKD">
+				<displayName>馬其頓第納爾</displayName>
+				<displayName count="other">馬其頓第納爾</displayName>
+				<symbol>MKD</symbol>
+			</currency>
+			<currency type="MKN">
+				<displayName>馬其頓第納爾 (1992–1993)</displayName>
+				<displayName count="other">馬其頓第納爾 (1992–1993)</displayName>
+				<symbol draft="contributed">MKN</symbol>
+			</currency>
+			<currency type="MLF">
+				<displayName>馬里法郎</displayName>
+				<displayName count="other">馬里法郎</displayName>
+				<symbol draft="contributed">MLF</symbol>
+			</currency>
+			<currency type="MMK">
+				<displayName>緬甸元</displayName>
+				<displayName count="other">緬甸元</displayName>
+				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
+			</currency>
+			<currency type="MNT">
+				<displayName>蒙古圖格里克</displayName>
+				<displayName count="other">蒙古圖格里克</displayName>
+				<symbol>MNT</symbol>
+				<symbol alt="narrow" draft="contributed">₮</symbol>
+			</currency>
+			<currency type="MOP">
+				<displayName>澳門元</displayName>
+				<displayName count="other">澳門元</displayName>
+				<symbol>MOP</symbol>
+			</currency>
+			<currency type="MRO">
+				<displayName>茅利塔尼亞烏吉亞</displayName>
+				<displayName count="other">茅利塔尼亞烏吉亞</displayName>
+				<symbol>MRO</symbol>
+			</currency>
+			<currency type="MTL">
+				<displayName>馬爾他里拉</displayName>
+				<displayName count="other">馬爾他里拉</displayName>
+				<symbol draft="contributed">MTL</symbol>
+			</currency>
+			<currency type="MTP">
+				<displayName>馬爾他鎊</displayName>
+				<displayName count="other">馬爾他鎊</displayName>
+				<symbol draft="contributed">MTP</symbol>
+			</currency>
+			<currency type="MUR">
+				<displayName>模里西斯盧比</displayName>
+				<displayName count="other">模里西斯盧比</displayName>
+				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="MVP">
+				<displayName draft="contributed">馬爾地夫盧比</displayName>
+				<displayName count="other" draft="contributed">馬爾地夫盧比</displayName>
+				<symbol draft="contributed">MVP</symbol>
+			</currency>
+			<currency type="MVR">
+				<displayName>馬爾地夫盧非亞</displayName>
+				<displayName count="other">馬爾地夫盧非亞</displayName>
+				<symbol>MVR</symbol>
+			</currency>
+			<currency type="MWK">
+				<displayName>馬拉維克瓦查</displayName>
+				<displayName count="other">馬拉維克瓦查</displayName>
+				<symbol>MWK</symbol>
+			</currency>
+			<currency type="MXN">
+				<displayName>墨西哥披索</displayName>
+				<displayName count="other">墨西哥披索</displayName>
+				<symbol>MX$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="MXP">
+				<displayName>墨西哥銀披索 (1861–1992)</displayName>
+				<displayName count="other">墨西哥銀披索 (1861–1992)</displayName>
+				<symbol draft="contributed">MXP</symbol>
+			</currency>
+			<currency type="MXV">
+				<displayName draft="contributed">墨西哥轉換單位 (UDI)</displayName>
+				<displayName count="other" draft="contributed">墨西哥轉換單位 (UDI)</displayName>
+				<symbol draft="contributed">MXV</symbol>
+			</currency>
+			<currency type="MYR">
+				<displayName>馬來西亞令吉</displayName>
+				<displayName count="other">馬來西亞令吉</displayName>
+				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
+			</currency>
+			<currency type="MZE">
+				<displayName>莫三比克埃斯庫多</displayName>
+				<displayName count="other">莫三比克埃斯庫多</displayName>
+				<symbol draft="contributed">MZE</symbol>
+			</currency>
+			<currency type="MZM">
+				<displayName>莫三比克梅蒂卡爾 (1980–2006)</displayName>
+				<displayName count="other">莫三比克梅蒂卡爾 (1980–2006)</displayName>
+				<symbol draft="contributed">MZM</symbol>
+			</currency>
+			<currency type="MZN">
+				<displayName>莫三比克梅蒂卡爾</displayName>
+				<displayName count="other">莫三比克梅蒂卡爾</displayName>
+				<symbol>MZN</symbol>
+			</currency>
+			<currency type="NAD">
+				<displayName>納米比亞元</displayName>
+				<displayName count="other">納米比亞元</displayName>
+				<symbol>NAD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="NGN">
+				<displayName>奈及利亞奈拉</displayName>
+				<displayName count="other">奈及利亞奈拉</displayName>
+				<symbol>NGN</symbol>
+				<symbol alt="narrow" draft="contributed">₦</symbol>
+			</currency>
+			<currency type="NIC">
+				<displayName>尼加拉瓜科多巴</displayName>
+				<displayName count="other">尼加拉瓜科多巴</displayName>
+				<symbol draft="contributed">NIC</symbol>
+			</currency>
+			<currency type="NIO">
+				<displayName>尼加拉瓜金科多巴</displayName>
+				<displayName count="other">尼加拉瓜金科多巴</displayName>
+				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
+			</currency>
+			<currency type="NLG">
+				<displayName>荷蘭盾</displayName>
+				<displayName count="other">荷蘭盾</displayName>
+				<symbol draft="contributed">NLG</symbol>
+			</currency>
+			<currency type="NOK">
+				<displayName>挪威克朗</displayName>
+				<displayName count="other">挪威克朗</displayName>
+				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="NPR">
+				<displayName>尼泊爾盧比</displayName>
+				<displayName count="other">尼泊爾盧比</displayName>
+				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="NZD">
+				<displayName>紐西蘭幣</displayName>
+				<displayName count="other">紐西蘭幣</displayName>
+				<symbol>NZ$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="OMR">
+				<displayName>阿曼里亞爾</displayName>
+				<displayName count="other">阿曼里亞爾</displayName>
+				<symbol>OMR</symbol>
+			</currency>
+			<currency type="PAB">
+				<displayName>巴拿馬巴波亞</displayName>
+				<displayName count="other">巴拿馬巴波亞</displayName>
+				<symbol>PAB</symbol>
+			</currency>
+			<currency type="PEI">
+				<displayName>祕魯因蒂</displayName>
+				<displayName count="other">祕魯因蒂</displayName>
+				<symbol draft="contributed">PEI</symbol>
+			</currency>
+			<currency type="PEN">
+				<displayName>秘魯新太陽幣</displayName>
+				<displayName count="other">秘魯新太陽幣</displayName>
+				<symbol>PEN</symbol>
+			</currency>
+			<currency type="PES">
+				<displayName>秘魯索爾 (1863–1965)</displayName>
+				<displayName count="other">秘魯索爾 (1863–1965)</displayName>
+				<symbol draft="contributed">PES</symbol>
+			</currency>
+			<currency type="PGK">
+				<displayName>巴布亞紐幾內亞基那</displayName>
+				<displayName count="other">巴布亞紐幾內亞基那</displayName>
+				<symbol>PGK</symbol>
+			</currency>
+			<currency type="PHP">
+				<displayName>菲律賓披索</displayName>
+				<displayName count="other">菲律賓披索</displayName>
+				<symbol>PHP</symbol>
+				<symbol alt="narrow" draft="contributed">₱</symbol>
+			</currency>
+			<currency type="PKR">
+				<displayName>巴基斯坦盧比</displayName>
+				<displayName count="other">巴基斯坦盧比</displayName>
+				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
+			</currency>
+			<currency type="PLN">
+				<displayName>波蘭茲羅提</displayName>
+				<displayName count="other">波蘭茲羅提</displayName>
+				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
+			</currency>
+			<currency type="PLZ">
+				<displayName>波蘭茲羅提 (1950–1995)</displayName>
+				<displayName count="other">波蘭茲羅提 (1950–1995)</displayName>
+				<symbol draft="contributed">PLZ</symbol>
+			</currency>
+			<currency type="PTE">
+				<displayName>葡萄牙埃斯庫多</displayName>
+				<displayName count="other">葡萄牙埃斯庫多</displayName>
+				<symbol draft="contributed">PTE</symbol>
+			</currency>
+			<currency type="PYG">
+				<displayName>巴拉圭瓜拉尼</displayName>
+				<displayName count="other">巴拉圭瓜拉尼</displayName>
+				<symbol>PYG</symbol>
+				<symbol alt="narrow" draft="contributed">₲</symbol>
+			</currency>
+			<currency type="QAR">
+				<displayName>卡達里亞爾</displayName>
+				<displayName count="other">卡達里亞爾</displayName>
+				<symbol>QAR</symbol>
+			</currency>
+			<currency type="RHD">
+				<displayName draft="contributed">羅德西亞元</displayName>
+				<displayName count="other" draft="contributed">羅德西亞元</displayName>
+				<symbol draft="contributed">RHD</symbol>
+			</currency>
+			<currency type="ROL">
+				<displayName draft="contributed">舊羅馬尼亞列伊</displayName>
+				<displayName count="other" draft="contributed">舊羅馬尼亞列伊</displayName>
+				<symbol draft="contributed">ROL</symbol>
+			</currency>
+			<currency type="RON">
+				<displayName>羅馬尼亞列伊</displayName>
+				<displayName count="other">羅馬尼亞列伊</displayName>
+				<symbol>RON</symbol>
+			</currency>
+			<currency type="RSD">
+				<displayName>塞爾維亞戴納</displayName>
+				<displayName count="other">塞爾維亞戴納</displayName>
+				<symbol>RSD</symbol>
+			</currency>
+			<currency type="RUB">
+				<displayName>俄羅斯盧布</displayName>
+				<displayName count="other">俄羅斯盧布</displayName>
+				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
+			</currency>
+			<currency type="RUR">
+				<displayName>俄羅斯盧布 (1991–1998)</displayName>
+				<displayName count="other">俄羅斯盧布 (1991–1998)</displayName>
+				<symbol draft="contributed">RUR</symbol>
+				<symbol alt="narrow" draft="contributed">р.</symbol>
+			</currency>
+			<currency type="RWF">
+				<displayName>盧安達法郎</displayName>
+				<displayName count="other">盧安達法郎</displayName>
+				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
+			</currency>
+			<currency type="SAR">
+				<displayName>沙烏地里亞爾</displayName>
+				<displayName count="other">沙烏地里亞爾</displayName>
+				<symbol>SAR</symbol>
+			</currency>
+			<currency type="SBD">
+				<displayName>索羅門群島元</displayName>
+				<displayName count="other">索羅門群島元</displayName>
+				<symbol>SBD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="SCR">
+				<displayName>塞席爾盧比</displayName>
+				<displayName count="other">塞席爾盧比</displayName>
+				<symbol>SCR</symbol>
+			</currency>
+			<currency type="SDD">
+				<displayName>蘇丹第納爾</displayName>
+				<displayName count="other">蘇丹第納爾</displayName>
+				<symbol draft="contributed">SDD</symbol>
+			</currency>
+			<currency type="SDG">
+				<displayName>蘇丹鎊</displayName>
+				<displayName count="other">蘇丹鎊</displayName>
+				<symbol>SDG</symbol>
+			</currency>
+			<currency type="SDP">
+				<displayName>舊蘇丹鎊</displayName>
+				<displayName count="other">舊蘇丹鎊</displayName>
+				<symbol draft="contributed">SDP</symbol>
+			</currency>
+			<currency type="SEK">
+				<displayName>瑞典克朗</displayName>
+				<displayName count="other">瑞典克朗</displayName>
+				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
+			</currency>
+			<currency type="SGD">
+				<displayName>新加坡幣</displayName>
+				<displayName count="other">新加坡幣</displayName>
+				<symbol>SGD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="SHP">
+				<displayName>聖赫勒拿鎊</displayName>
+				<displayName count="other">聖赫勒拿鎊</displayName>
+				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="SIT">
+				<displayName>斯洛維尼亞托勒</displayName>
+				<displayName count="other">斯洛維尼亞托勒</displayName>
+				<symbol draft="contributed">SIT</symbol>
+			</currency>
+			<currency type="SKK">
+				<displayName>斯洛伐克克朗</displayName>
+				<displayName count="other">斯洛伐克克朗</displayName>
+				<symbol draft="contributed">SKK</symbol>
+			</currency>
+			<currency type="SLL">
+				<displayName>獅子山利昂</displayName>
+				<displayName count="other">獅子山利昂</displayName>
+				<symbol>SLL</symbol>
+			</currency>
+			<currency type="SOS">
+				<displayName>索馬利亞先令</displayName>
+				<displayName count="other">索馬利亞先令</displayName>
+				<symbol>SOS</symbol>
+			</currency>
+			<currency type="SRD">
+				<displayName>蘇利南元</displayName>
+				<displayName count="other">蘇利南元</displayName>
+				<symbol>SRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="SRG">
+				<displayName>蘇利南基爾</displayName>
+				<displayName count="other">蘇利南基爾</displayName>
+				<symbol draft="contributed">SRG</symbol>
+			</currency>
+			<currency type="SSP">
+				<displayName>南蘇丹鎊</displayName>
+				<displayName count="other">南蘇丹鎊</displayName>
+				<symbol>SSP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="STD">
+				<displayName>聖多美島和普林西比島多布拉</displayName>
+				<displayName count="other">聖多美島和普林西比島多布拉</displayName>
+				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
+			</currency>
+			<currency type="SUR">
+				<displayName>蘇聯盧布</displayName>
+				<displayName count="other">蘇聯盧布</displayName>
+				<symbol draft="contributed">SUR</symbol>
+			</currency>
+			<currency type="SVC">
+				<displayName draft="contributed">薩爾瓦多科郎</displayName>
+				<displayName count="other" draft="contributed">薩爾瓦多科郎</displayName>
+				<symbol draft="contributed">SVC</symbol>
+			</currency>
+			<currency type="SYP">
+				<displayName>敘利亞鎊</displayName>
+				<displayName count="other">敘利亞鎊</displayName>
+				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
+			</currency>
+			<currency type="SZL">
+				<displayName>史瓦濟蘭里朗吉尼</displayName>
+				<displayName count="other">史瓦濟蘭里朗吉尼</displayName>
+				<symbol>SZL</symbol>
+			</currency>
+			<currency type="THB">
+				<displayName>泰銖</displayName>
+				<displayName count="other">泰銖</displayName>
+				<symbol>THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
+			</currency>
+			<currency type="TJR">
+				<displayName>塔吉克盧布</displayName>
+				<displayName count="other">塔吉克盧布</displayName>
+				<symbol draft="contributed">TJR</symbol>
+			</currency>
+			<currency type="TJS">
+				<displayName>塔吉克索莫尼</displayName>
+				<displayName count="other">塔吉克索莫尼</displayName>
+				<symbol>TJS</symbol>
+			</currency>
+			<currency type="TMM">
+				<displayName>土庫曼馬納特 (1993–2009)</displayName>
+				<displayName count="other">土庫曼馬納特 (1993–2009)</displayName>
+				<symbol draft="contributed">TMM</symbol>
+			</currency>
+			<currency type="TMT">
+				<displayName>土庫曼馬納特</displayName>
+				<displayName count="other">土庫曼馬納特</displayName>
+				<symbol>TMT</symbol>
+			</currency>
+			<currency type="TND">
+				<displayName>突尼西亞第納爾</displayName>
+				<displayName count="other">突尼西亞第納爾</displayName>
+				<symbol>TND</symbol>
+			</currency>
+			<currency type="TOP">
+				<displayName>東加潘加</displayName>
+				<displayName count="other">東加潘加</displayName>
+				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
+			</currency>
+			<currency type="TPE">
+				<displayName draft="contributed">帝汶埃斯庫多</displayName>
+				<displayName count="other" draft="contributed">帝汶埃斯庫多</displayName>
+				<symbol draft="contributed">TPE</symbol>
+			</currency>
+			<currency type="TRL">
+				<displayName>土耳其里拉</displayName>
+				<displayName count="other">土耳其里拉</displayName>
+				<symbol draft="contributed">TRL</symbol>
+			</currency>
+			<currency type="TRY">
+				<displayName>新土耳其里拉</displayName>
+				<displayName count="other">新土耳其里拉</displayName>
+				<symbol>TRY</symbol>
+				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
+			</currency>
+			<currency type="TTD">
+				<displayName>千里達及托巴哥元</displayName>
+				<displayName count="other">千里達及托巴哥元</displayName>
+				<symbol>TTD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="TWD">
+				<displayName>新台幣</displayName>
+				<displayName count="other">新台幣</displayName>
+				<symbol>$</symbol>
+				<symbol alt="narrow">$</symbol>
+			</currency>
+			<currency type="TZS">
+				<displayName>坦尚尼亞先令</displayName>
+				<displayName count="other">坦尚尼亞先令</displayName>
+				<symbol>TZS</symbol>
+			</currency>
+			<currency type="UAH">
+				<displayName>烏克蘭格里夫納</displayName>
+				<displayName count="other">烏克蘭格里夫納</displayName>
+				<symbol>UAH</symbol>
+				<symbol alt="narrow" draft="contributed">₴</symbol>
+			</currency>
+			<currency type="UAK">
+				<displayName draft="contributed">烏克蘭卡本瓦那茲</displayName>
+				<displayName count="other" draft="contributed">烏克蘭卡本瓦那茲</displayName>
+				<symbol draft="contributed">UAK</symbol>
+			</currency>
+			<currency type="UGS">
+				<displayName>烏干達先令 (1966–1987)</displayName>
+				<displayName count="other">烏干達先令 (1966–1987)</displayName>
+				<symbol draft="contributed">UGS</symbol>
+			</currency>
+			<currency type="UGX">
+				<displayName>烏干達先令</displayName>
+				<displayName count="other">烏干達先令</displayName>
+				<symbol>UGX</symbol>
+			</currency>
+			<currency type="USD">
+				<displayName>美元</displayName>
+				<displayName count="other">美元</displayName>
+				<symbol>US$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="USN">
+				<displayName>美元（次日）</displayName>
+				<displayName count="other">美元（次日）</displayName>
+				<symbol draft="contributed">USN</symbol>
+			</currency>
+			<currency type="USS">
+				<displayName>美元（當日）</displayName>
+				<displayName count="other">美元（當日）</displayName>
+				<symbol draft="contributed">USS</symbol>
+			</currency>
+			<currency type="UYI">
+				<displayName draft="contributed">烏拉圭披索（指數單位）</displayName>
+				<displayName count="other" draft="contributed">烏拉圭披索（指數單位）</displayName>
+				<symbol draft="contributed">UYI</symbol>
+			</currency>
+			<currency type="UYP">
+				<displayName>烏拉圭披索 (1975–1993)</displayName>
+				<displayName count="other">烏拉圭披索 (1975–1993)</displayName>
+				<symbol draft="contributed">UYP</symbol>
+			</currency>
+			<currency type="UYU">
+				<displayName>烏拉圭披索</displayName>
+				<displayName count="other">烏拉圭披索</displayName>
+				<symbol>UYU</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="UZS">
+				<displayName>烏茲別克索姆</displayName>
+				<displayName count="other">烏茲別克索姆</displayName>
+				<symbol>UZS</symbol>
+			</currency>
+			<currency type="VEB">
+				<displayName>委內瑞拉玻利瓦 (1871–2008)</displayName>
+				<displayName count="other">委內瑞拉玻利瓦 (1871–2008)</displayName>
+				<symbol draft="contributed">VEB</symbol>
+			</currency>
+			<currency type="VEF">
+				<displayName>委內瑞拉玻利瓦</displayName>
+				<displayName count="other">委內瑞拉玻利瓦</displayName>
+				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
+			</currency>
+			<currency type="VND">
+				<displayName>越南盾</displayName>
+				<displayName count="other">越南盾</displayName>
+				<symbol>₫</symbol>
+				<symbol alt="narrow" draft="contributed">₫</symbol>
+			</currency>
+			<currency type="VNN">
+				<displayName>越南盾 (1978–1985)</displayName>
+				<displayName count="other">越南盾 (1978–1985)</displayName>
+				<symbol draft="contributed">VNN</symbol>
+			</currency>
+			<currency type="VUV">
+				<displayName>萬那杜瓦圖</displayName>
+				<displayName count="other">萬那杜瓦圖</displayName>
+				<symbol>VUV</symbol>
+			</currency>
+			<currency type="WST">
+				<displayName>西薩摩亞塔拉</displayName>
+				<displayName count="other">西薩摩亞塔拉</displayName>
+				<symbol>WST</symbol>
+			</currency>
+			<currency type="XAF">
+				<displayName>法郎 (CFA–BEAC)</displayName>
+				<displayName count="other">法郎 (CFA–BEAC)</displayName>
+				<symbol>FCFA</symbol>
+			</currency>
+			<currency type="XAG">
+				<displayName draft="contributed">白銀</displayName>
+				<displayName count="other" draft="contributed">白銀</displayName>
+				<symbol draft="contributed">XAG</symbol>
+			</currency>
+			<currency type="XAU">
+				<displayName>黃金</displayName>
+				<displayName count="other">黃金</displayName>
+				<symbol draft="contributed">XAU</symbol>
+			</currency>
+			<currency type="XBA">
+				<displayName>歐洲綜合單位</displayName>
+				<displayName count="other">歐洲綜合單位</displayName>
+				<symbol draft="contributed">XBA</symbol>
+			</currency>
+			<currency type="XBB">
+				<displayName>歐洲貨幣單位 (XBB)</displayName>
+				<displayName count="other">歐洲貨幣單位 (XBB)</displayName>
+				<symbol draft="contributed">XBB</symbol>
+			</currency>
+			<currency type="XBC">
+				<displayName>歐洲會計單位 (XBC)</displayName>
+				<displayName count="other">歐洲會計單位 (XBC)</displayName>
+				<symbol draft="contributed">XBC</symbol>
+			</currency>
+			<currency type="XBD">
+				<displayName>歐洲會計單位 (XBD)</displayName>
+				<displayName count="other">歐洲會計單位 (XBD)</displayName>
+				<symbol draft="contributed">XBD</symbol>
+			</currency>
+			<currency type="XCD">
+				<displayName>格瑞那達元</displayName>
+				<displayName count="other">格瑞那達元</displayName>
+				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
+			</currency>
+			<currency type="XDR">
+				<displayName>特殊提款權</displayName>
+				<displayName count="other">特殊提款權</displayName>
+				<symbol draft="contributed">XDR</symbol>
+			</currency>
+			<currency type="XEU">
+				<displayName>歐洲貨幣單位 (XEU)</displayName>
+				<displayName count="other">歐洲貨幣單位 (XEU)</displayName>
+				<symbol draft="contributed">XEU</symbol>
+			</currency>
+			<currency type="XFO">
+				<displayName>法國金法郎</displayName>
+				<displayName count="other">法國金法郎</displayName>
+				<symbol draft="contributed">XFO</symbol>
+			</currency>
+			<currency type="XFU">
+				<displayName>法國法郎 (UIC)</displayName>
+				<displayName count="other">法國法郎 (UIC)</displayName>
+				<symbol draft="contributed">XFU</symbol>
+			</currency>
+			<currency type="XOF">
+				<displayName>法郎 (CFA–BCEAO)</displayName>
+				<displayName count="other">法郎 (CFA–BCEAO)</displayName>
+				<symbol>CFA</symbol>
+			</currency>
+			<currency type="XPD">
+				<displayName draft="contributed">帕拉狄昂</displayName>
+				<displayName count="other" draft="contributed">帕拉狄昂</displayName>
+				<symbol draft="contributed">XPD</symbol>
+			</currency>
+			<currency type="XPF">
+				<displayName>法郎 (CFP)</displayName>
+				<displayName count="other">法郎 (CFP)</displayName>
+				<symbol>CFPF</symbol>
+			</currency>
+			<currency type="XPT">
+				<displayName draft="contributed">白金</displayName>
+				<displayName count="other" draft="contributed">白金</displayName>
+				<symbol draft="contributed">XPT</symbol>
+			</currency>
+			<currency type="XRE">
+				<displayName>RINET 基金</displayName>
+				<displayName count="other">RINET 基金</displayName>
+				<symbol draft="contributed">XRE</symbol>
+			</currency>
+			<currency type="XSU">
+				<displayName draft="contributed">蘇克雷貨幣</displayName>
+				<displayName count="other" draft="contributed">蘇克雷貨幣</displayName>
+				<symbol draft="contributed">XSU</symbol>
+			</currency>
+			<currency type="XTS">
+				<displayName draft="contributed">測試用貨幣代碼</displayName>
+				<displayName count="other" draft="contributed">測試用貨幣代碼</displayName>
+				<symbol draft="contributed">XTS</symbol>
+			</currency>
+			<currency type="XUA">
+				<displayName draft="contributed">亞洲開發銀行計價單位</displayName>
+				<displayName count="other" draft="contributed">亞洲開發銀行計價單位</displayName>
+				<symbol draft="contributed">XUA</symbol>
+			</currency>
+			<currency type="XXX">
+				<displayName>未知貨幣</displayName>
+				<displayName count="other">(未知貨幣)</displayName>
+				<symbol draft="contributed">XXX</symbol>
+			</currency>
+			<currency type="YDD">
+				<displayName>葉門第納爾</displayName>
+				<displayName count="other">葉門第納爾</displayName>
+				<symbol draft="contributed">YDD</symbol>
+			</currency>
+			<currency type="YER">
+				<displayName>葉門里亞爾</displayName>
+				<displayName count="other">葉門里亞爾</displayName>
+				<symbol>YER</symbol>
+			</currency>
+			<currency type="YUD">
+				<displayName>南斯拉夫第納爾硬幣</displayName>
+				<displayName count="other">南斯拉夫第納爾硬幣</displayName>
+				<symbol draft="contributed">YUD</symbol>
+			</currency>
+			<currency type="YUM">
+				<displayName>南斯拉夫挪威亞第納爾</displayName>
+				<displayName count="other">南斯拉夫挪威亞第納爾</displayName>
+				<symbol draft="contributed">YUM</symbol>
+			</currency>
+			<currency type="YUN">
+				<displayName>南斯拉夫可轉換第納爾</displayName>
+				<displayName count="other">南斯拉夫可轉換第納爾</displayName>
+				<symbol draft="contributed">YUN</symbol>
+			</currency>
+			<currency type="YUR">
+				<displayName>南斯拉夫改革第納爾 (1992–1993)</displayName>
+				<displayName count="other">南斯拉夫改革第納爾 (1992–1993)</displayName>
+				<symbol draft="contributed">YUR</symbol>
+			</currency>
+			<currency type="ZAL">
+				<displayName>南非蘭特（金融）</displayName>
+				<displayName count="other">南非蘭特（金融）</displayName>
+				<symbol draft="contributed">ZAL</symbol>
+			</currency>
+			<currency type="ZAR">
+				<displayName>南非蘭特</displayName>
+				<displayName count="other">南非蘭特</displayName>
+				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
+			</currency>
+			<currency type="ZMK">
+				<displayName>尚比亞克瓦查 (1968–2012)</displayName>
+				<displayName count="other">尚比亞克瓦查 (1968–2012)</displayName>
+				<symbol draft="contributed">ZMK</symbol>
+			</currency>
+			<currency type="ZMW">
+				<displayName>尚比亞克瓦查</displayName>
+				<displayName count="other">尚比亞克瓦查</displayName>
+				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
+			</currency>
+			<currency type="ZRN">
+				<displayName>薩伊新扎伊爾</displayName>
+				<displayName count="other">薩伊新扎伊爾</displayName>
+				<symbol draft="contributed">ZRN</symbol>
+			</currency>
+			<currency type="ZRZ">
+				<displayName>薩伊扎伊爾</displayName>
+				<displayName count="other">薩伊扎伊爾</displayName>
+				<symbol draft="contributed">ZRZ</symbol>
+			</currency>
+			<currency type="ZWD">
+				<displayName>辛巴威元 (1980–2008)</displayName>
+				<displayName count="other">辛巴威元 (1980–2008)</displayName>
+				<symbol draft="contributed">ZWD</symbol>
+			</currency>
+			<currency type="ZWL">
+				<displayName>辛巴威元 (2009)</displayName>
+				<displayName count="other">辛巴威元 (2009)</displayName>
+				<symbol draft="contributed">ZWL</symbol>
+			</currency>
+			<currency type="ZWR">
+				<displayName>辛巴威元 (2008)</displayName>
+				<displayName count="other">辛巴威元 (2008)</displayName>
+				<symbol draft="contributed">ZWR</symbol>
+			</currency>
+		</currencies>
+		<miscPatterns numberSystem="latn">
+			<pattern type="atLeast">{0}+</pattern>
+			<pattern type="range">{0}-{1}</pattern>
+		</miscPatterns>
+	</numbers>
+	<units>
+		<unitLength type="long">
+			<compoundUnit type="per">
+				<compoundUnitPattern>每 {1} {0}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<displayName>G 力</displayName>
+				<unitPattern count="other">{0} G 力</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-second-squared">
+				<displayName>每平方秒公尺</displayName>
+				<unitPattern count="other">每平方秒 {0} 米</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>圈數</displayName>
+				<unitPattern count="other">{0} 圈</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>弧度</displayName>
+				<unitPattern count="other">{0} 弧度</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>角度</displayName>
+				<unitPattern count="other">{0} 度</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>角分</displayName>
+				<unitPattern count="other">{0} 角分</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>角秒</displayName>
+				<unitPattern count="other">{0} 角秒</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>平方公里</displayName>
+				<unitPattern count="other">{0} 平方公里</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>公頃</displayName>
+				<unitPattern count="other">{0} 公頃</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>平方公尺</displayName>
+				<unitPattern count="other">{0} 平方公尺</unitPattern>
+				<perUnitPattern>每平方米 {0}</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>平方公分</displayName>
+				<unitPattern count="other">{0} 平方公分</unitPattern>
+				<perUnitPattern>每平方厘米 {0}</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>平方英里</displayName>
+				<unitPattern count="other">{0} 平方英里</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>英畝</displayName>
+				<unitPattern count="other">{0} 英畝</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>平方碼</displayName>
+				<unitPattern count="other">{0} 平方碼</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>平方英尺</displayName>
+				<unitPattern count="other">{0} 平方英尺</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>平方英寸</displayName>
+				<unitPattern count="other">{0} 平方英寸</unitPattern>
+				<perUnitPattern>每平方吋 {0}</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>克拉</displayName>
+				<unitPattern count="other">{0} 克拉</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>每公里公升</displayName>
+				<unitPattern count="other">每公里 {0} 公升</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>每 100 公里公升</displayName>
+				<unitPattern count="other">每 100 公里 {0} 公升</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>每加侖英里</displayName>
+				<unitPattern count="other">每加侖 {0} 英里</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<displayName>TB</displayName>
+				<unitPattern count="other">{0} TB</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>世紀</displayName>
+				<unitPattern count="other">{0} 個世紀</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>年</displayName>
+				<unitPattern count="other">{0} 年</unitPattern>
+				<perUnitPattern>每年 {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>月</displayName>
+				<unitPattern count="other">{0} 個月</unitPattern>
+				<perUnitPattern>每月 {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>週</displayName>
+				<unitPattern count="other">{0} 週</unitPattern>
+				<perUnitPattern>每星期 {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>天</displayName>
+				<unitPattern count="other">{0} 天</unitPattern>
+				<perUnitPattern>每日 {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>小時</displayName>
+				<unitPattern count="other">{0} 小時</unitPattern>
+				<perUnitPattern>每小時 {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>分鐘</displayName>
+				<unitPattern count="other">{0} 分鐘</unitPattern>
+				<perUnitPattern>每分鐘 {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>秒</displayName>
+				<unitPattern count="other">{0} 秒</unitPattern>
+				<perUnitPattern>每秒 {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>毫秒</displayName>
+				<unitPattern count="other">{0} 毫秒</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>微秒</displayName>
+				<unitPattern count="other">{0} 微秒</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>奈秒</displayName>
+				<unitPattern count="other">{0} 奈秒</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName>安培</displayName>
+				<unitPattern count="other">{0} 安培</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>毫安培</displayName>
+				<unitPattern count="other">{0} 毫安培</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<displayName>歐姆</displayName>
+				<unitPattern count="other">{0} 歐姆</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>伏特</displayName>
+				<unitPattern count="other">{0} 伏特</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>千卡路里</displayName>
+				<unitPattern count="other">{0} 千卡路里</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>卡路里</displayName>
+				<unitPattern count="other">{0} 卡路里</unitPattern>
+			</unit>
+			<unit type="energy-foodcalorie">
+				<displayName>卡路里</displayName>
+				<unitPattern count="other">{0} 大卡</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>千焦耳</displayName>
+				<unitPattern count="other">{0} 千焦耳</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>焦耳</displayName>
+				<unitPattern count="other">{0} 焦耳</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>千瓦小時</displayName>
+				<unitPattern count="other">{0} 千瓦小時</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<displayName>吉赫</displayName>
+				<unitPattern count="other">{0} 吉赫</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<displayName>兆赫</displayName>
+				<unitPattern count="other">{0} 兆赫</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>千赫</displayName>
+				<unitPattern count="other">{0} 千赫</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<displayName>赫茲</displayName>
+				<unitPattern count="other">{0} 赫茲</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>公里</displayName>
+				<unitPattern count="other">{0} 公里</unitPattern>
+				<perUnitPattern>每公里 {0}</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>公尺</displayName>
+				<unitPattern count="other">{0} 公尺</unitPattern>
+				<perUnitPattern>每米 {0}</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>公寸</displayName>
+				<unitPattern count="other">{0} 公寸</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>公分</displayName>
+				<unitPattern count="other">{0} 公分</unitPattern>
+				<perUnitPattern>每厘米 {0}</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>公釐</displayName>
+				<unitPattern count="other">{0} 公釐</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>微米</displayName>
+				<unitPattern count="other">{0} 微米</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>奈米</displayName>
+				<unitPattern count="other">{0} 奈米</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>皮米</displayName>
+				<unitPattern count="other">{0} 皮米</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>英里</displayName>
+				<unitPattern count="other">{0} 英里</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>碼</displayName>
+				<unitPattern count="other">{0} 碼</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>英尺</displayName>
+				<unitPattern count="other">{0} 英尺</unitPattern>
+				<perUnitPattern>每呎 {0}</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>英寸</displayName>
+				<unitPattern count="other">{0} 英寸</unitPattern>
+				<perUnitPattern>每吋 {0}</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>秒差距</displayName>
+				<unitPattern count="other">{0} 秒差距</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>光年</displayName>
+				<unitPattern count="other">{0} 光年</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>天文單位</displayName>
+				<unitPattern count="other">{0} 天文單位</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName draft="contributed">化朗</displayName>
+				<unitPattern count="other" draft="contributed">{0} 化朗</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName draft="contributed">英尋</displayName>
+				<unitPattern count="other" draft="contributed">{0} 英尋</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>海里</displayName>
+				<unitPattern count="other">{0} 海里</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>斯堪地那維亞英里</displayName>
+				<unitPattern count="other">{0} 斯堪地那維亞英里</unitPattern>
+			</unit>
+			<unit type="light-lux">
+				<displayName>勒克斯</displayName>
+				<unitPattern count="other">{0} 勒克斯</unitPattern>
+			</unit>
+			<unit type="mass-metric-ton">
+				<displayName>公噸</displayName>
+				<unitPattern count="other">{0} 公噸</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>公斤</displayName>
+				<unitPattern count="other">{0} 公斤</unitPattern>
+				<perUnitPattern>每公斤 {0}</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>克</displayName>
+				<unitPattern count="other">{0} 克</unitPattern>
+				<perUnitPattern>每克 {0}</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>毫克</displayName>
+				<unitPattern count="other">{0} 毫克</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>微克</displayName>
+				<unitPattern count="other">{0} 微克</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>英噸</displayName>
+				<unitPattern count="other">{0} 英噸</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName draft="contributed">英石</displayName>
+				<unitPattern count="other" draft="contributed">{0} 英石</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>磅</displayName>
+				<unitPattern count="other">{0} 磅</unitPattern>
+				<perUnitPattern>每磅 {0}</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>盎司</displayName>
+				<unitPattern count="other">{0} 盎司</unitPattern>
+				<perUnitPattern>每安士 {0}</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>金衡盎司</displayName>
+				<unitPattern count="other">{0} 金衡盎司</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>克拉</displayName>
+				<unitPattern count="other">{0} 克拉</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<displayName>吉瓦</displayName>
+				<unitPattern count="other">{0} 吉瓦</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>百萬瓦特</displayName>
+				<unitPattern count="other">{0} 百萬瓦特</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>千瓦特</displayName>
+				<unitPattern count="other">{0} 千瓦特</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>瓦特</displayName>
+				<unitPattern count="other">{0} 瓦特</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>毫瓦特</displayName>
+				<unitPattern count="other">{0} 毫瓦特</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>馬力</displayName>
+				<unitPattern count="other">{0} 匹馬力</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<displayName>百帕</displayName>
+				<unitPattern count="other">{0} 百帕</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>毫米汞柱</displayName>
+				<unitPattern count="other">{0} 毫米汞柱</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>每平方英寸磅力</displayName>
+				<unitPattern count="other">每平方吋 {0} 磅</unitPattern>
+			</unit>
+			<unit type="pressure-inch-hg">
+				<displayName>英寸汞柱</displayName>
+				<unitPattern count="other">{0} 英寸汞柱</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>毫巴</displayName>
+				<unitPattern count="other">{0} 毫巴</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>每小時公里</displayName>
+				<unitPattern count="other">每小時 {0} 公里</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>每秒公尺</displayName>
+				<unitPattern count="other">每秒 {0} 米</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>每小時英里</displayName>
+				<unitPattern count="other">每小時 {0} 英里</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>節</displayName>
+				<unitPattern count="other">{0} 節</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>攝氏度數</displayName>
+				<unitPattern count="other">攝氏 {0} 度</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName>華氏度數</displayName>
+				<unitPattern count="other">華氏 {0} 度</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>克耳文</displayName>
+				<unitPattern count="other">{0} 克耳文</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>立方公里</displayName>
+				<unitPattern count="other">{0} 立方公里</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>立方公尺</displayName>
+				<unitPattern count="other">{0} 立方公尺</unitPattern>
+				<perUnitPattern>每立方米 {0}</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>立方公分</displayName>
+				<unitPattern count="other">{0} 立方公分</unitPattern>
+				<perUnitPattern>每立方厘米 {0}</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>立方英里</displayName>
+				<unitPattern count="other">{0} 立方英里</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>立方碼</displayName>
+				<unitPattern count="other">{0} 立方碼</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>立方英尺</displayName>
+				<unitPattern count="other">{0} 立方英尺</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>立方英寸</displayName>
+				<unitPattern count="other">{0} 立方英寸</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>兆升</displayName>
+				<unitPattern count="other">{0} 兆升</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>公石</displayName>
+				<unitPattern count="other">{0} 公石</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>公升</displayName>
+				<unitPattern count="other">{0} 公升</unitPattern>
+				<perUnitPattern>每公升 {0}</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>公合</displayName>
+				<unitPattern count="other">{0} 公合</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>釐升</displayName>
+				<unitPattern count="other">{0} 釐升</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>毫升</displayName>
+				<unitPattern count="other">{0} 毫升</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>公制品脫</displayName>
+				<unitPattern count="other">{0} 公制品脫</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>公制量杯</displayName>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>英畝英尺</displayName>
+				<unitPattern count="other">{0} 英畝英尺</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName draft="contributed">蒲式耳</displayName>
+				<unitPattern count="other" draft="contributed">{0} 蒲式耳</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>加侖</displayName>
+				<unitPattern count="other">{0} 加侖</unitPattern>
+				<perUnitPattern>每加侖 {0}</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>夸脫</displayName>
+				<unitPattern count="other">{0} 夸脫</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>品脫</displayName>
+				<unitPattern count="other">{0} 品脫</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>量杯</displayName>
+				<unitPattern count="other">{0} 杯</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>液盎司</displayName>
+				<unitPattern count="other">{0} 液盎司</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>湯匙</displayName>
+				<unitPattern count="other">{0} 湯匙</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>茶匙</displayName>
+				<unitPattern count="other">{0} 茶匙</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">東經{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">北緯{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">南緯{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">西經{0}</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<unitLength type="short">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<displayName>G 力</displayName>
+				<unitPattern count="other">{0} G 力</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-second-squared">
+				<displayName>公尺/平方秒</displayName>
+				<unitPattern count="other">每平方秒{0}米</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>圈數</displayName>
+				<unitPattern count="other">{0} 圈</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>弧度</displayName>
+				<unitPattern count="other">{0} 弧度</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>角度</displayName>
+				<unitPattern count="other">{0} 度</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>角分</displayName>
+				<unitPattern count="other">{0} 角分</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>角秒</displayName>
+				<unitPattern count="other">{0} 角秒</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>平方公里</displayName>
+				<unitPattern count="other">{0} 平方公里</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>公頃</displayName>
+				<unitPattern count="other">{0} 公頃</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>平方公尺</displayName>
+				<unitPattern count="other">{0} 平方公尺</unitPattern>
+				<perUnitPattern>每平方米{0}</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>平方公分</displayName>
+				<unitPattern count="other">{0} 平方公分</unitPattern>
+				<perUnitPattern>每平方厘米{0}</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>平方英里</displayName>
+				<unitPattern count="other">{0} 平方英里</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>英畝</displayName>
+				<unitPattern count="other">{0} 英畝</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>平方碼</displayName>
+				<unitPattern count="other">{0} 平方碼</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>平方英尺</displayName>
+				<unitPattern count="other">{0} 平方英尺</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>平方英寸</displayName>
+				<unitPattern count="other">{0} 平方英寸</unitPattern>
+				<perUnitPattern>每平方吋{0}</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>克拉</displayName>
+				<unitPattern count="other">{0} 克拉</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>公升/公里</displayName>
+				<unitPattern count="other">每公里{0}公升</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>升/100 公里</displayName>
+				<unitPattern count="other">每100公里 {0} 升</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>英里/加侖</displayName>
+				<unitPattern count="other">每加侖{0}英里</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<displayName>TB</displayName>
+				<unitPattern count="other">{0} TB</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>世紀</displayName>
+				<unitPattern count="other">{0} 世紀</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>年</displayName>
+				<unitPattern count="other">{0} 年</unitPattern>
+				<perUnitPattern>每年{0}</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>月</displayName>
+				<unitPattern count="other">{0} 個月</unitPattern>
+				<perUnitPattern>每月{0}</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>週</displayName>
+				<unitPattern count="other">{0} 週</unitPattern>
+				<perUnitPattern>每週{0}</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>天</displayName>
+				<unitPattern count="other">{0} 天</unitPattern>
+				<perUnitPattern>每日{0}</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>小時</displayName>
+				<unitPattern count="other">{0} 小時</unitPattern>
+				<perUnitPattern>每小時{0}</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>分鐘</displayName>
+				<unitPattern count="other">{0} 分鐘</unitPattern>
+				<perUnitPattern>每分鐘{0}</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>秒</displayName>
+				<unitPattern count="other">{0} 秒</unitPattern>
+				<perUnitPattern>每秒{0}</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>毫秒</displayName>
+				<unitPattern count="other">{0} 毫秒</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>微秒</displayName>
+				<unitPattern count="other">{0} 微秒</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>奈秒</displayName>
+				<unitPattern count="other">{0} 奈秒</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName>安培</displayName>
+				<unitPattern count="other">{0} 安培</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>毫安培</displayName>
+				<unitPattern count="other">{0} 毫安培</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<displayName>歐姆</displayName>
+				<unitPattern count="other">{0} 歐姆</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>伏特</displayName>
+				<unitPattern count="other">{0} 伏</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>千卡</displayName>
+				<unitPattern count="other">{0} 千卡</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>卡路里</displayName>
+				<unitPattern count="other">{0} 卡</unitPattern>
+			</unit>
+			<unit type="energy-foodcalorie">
+				<displayName>大卡</displayName>
+				<unitPattern count="other">{0} 大卡</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>千焦耳</displayName>
+				<unitPattern count="other">{0} 千焦</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>焦耳</displayName>
+				<unitPattern count="other">{0} 焦</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>千瓦小時</displayName>
+				<unitPattern count="other">{0} 千瓦小時</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<displayName>吉赫</displayName>
+				<unitPattern count="other">{0} 吉赫</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<displayName>兆赫</displayName>
+				<unitPattern count="other">{0} 兆赫</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>千赫</displayName>
+				<unitPattern count="other">{0} 千赫</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<displayName>赫茲</displayName>
+				<unitPattern count="other">{0} 赫茲</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>公里</displayName>
+				<unitPattern count="other">{0} 公里</unitPattern>
+				<perUnitPattern>每公里{0}</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>公尺</displayName>
+				<unitPattern count="other">{0} 公尺</unitPattern>
+				<perUnitPattern>每米{0}</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>公寸</displayName>
+				<unitPattern count="other">{0} 公寸</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>公分</displayName>
+				<unitPattern count="other">{0} 公分</unitPattern>
+				<perUnitPattern>每厘米{0}</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>公釐</displayName>
+				<unitPattern count="other">{0} 公釐</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>微米</displayName>
+				<unitPattern count="other">{0} 微米</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>奈米</displayName>
+				<unitPattern count="other">{0} 奈米</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>皮米</displayName>
+				<unitPattern count="other">{0} 皮米</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>英里</displayName>
+				<unitPattern count="other">{0} 英里</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>碼</displayName>
+				<unitPattern count="other">{0} 碼</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>英尺</displayName>
+				<unitPattern count="other">{0} 呎</unitPattern>
+				<perUnitPattern>每呎{0}</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>英寸</displayName>
+				<unitPattern count="other">{0} 吋</unitPattern>
+				<perUnitPattern>每吋{0}</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>秒差距</displayName>
+				<unitPattern count="other">{0} 秒差距</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>光年</displayName>
+				<unitPattern count="other">{0} 光年</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>天文單位</displayName>
+				<unitPattern count="other">{0} 天文單位</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName draft="contributed">化朗</displayName>
+				<unitPattern count="other" draft="contributed">{0} 化朗</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName draft="contributed">fm</displayName>
+				<unitPattern count="other" draft="contributed">{0} 英尋</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>海里</displayName>
+				<unitPattern count="other">{0} 海里</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>斯堪地那維亞英里</displayName>
+				<unitPattern count="other">{0} 斯堪地那維亞英里</unitPattern>
+			</unit>
+			<unit type="light-lux">
+				<displayName>勒克斯</displayName>
+				<unitPattern count="other">{0} 勒克斯</unitPattern>
+			</unit>
+			<unit type="mass-metric-ton">
+				<displayName>公噸</displayName>
+				<unitPattern count="other">{0} 公噸</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>公斤</displayName>
+				<unitPattern count="other">{0} 公斤</unitPattern>
+				<perUnitPattern>每公斤{0}</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>克</displayName>
+				<unitPattern count="other">{0} 克</unitPattern>
+				<perUnitPattern>每克{0}</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>毫克</displayName>
+				<unitPattern count="other">{0} 毫克</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>微克</displayName>
+				<unitPattern count="other">{0} 微克</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>英噸</displayName>
+				<unitPattern count="other">{0} 英噸</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName draft="contributed">st</displayName>
+				<unitPattern count="other" draft="contributed">{0} 英石</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>磅</displayName>
+				<unitPattern count="other">{0} 磅</unitPattern>
+				<perUnitPattern>每磅{0}</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>盎司</displayName>
+				<unitPattern count="other">{0} 盎司</unitPattern>
+				<perUnitPattern>每安士{0}</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>金衡盎司</displayName>
+				<unitPattern count="other">{0} 金衡盎司</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>克拉</displayName>
+				<unitPattern count="other">{0} 克拉</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<displayName>吉瓦</displayName>
+				<unitPattern count="other">{0} 吉瓦</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>百萬瓦</displayName>
+				<unitPattern count="other">{0} 百萬瓦</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>千瓦</displayName>
+				<unitPattern count="other">{0} 千瓦</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>瓦特</displayName>
+				<unitPattern count="other">{0} 瓦</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>毫瓦</displayName>
+				<unitPattern count="other">{0} 毫瓦</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>匹</displayName>
+				<unitPattern count="other">{0} 匹</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<displayName>百帕</displayName>
+				<unitPattern count="other">{0} 百帕</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>毫米汞柱</displayName>
+				<unitPattern count="other">{0} 毫米汞柱</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>磅力/平方英寸</displayName>
+				<unitPattern count="other">每平方吋{0}磅</unitPattern>
+			</unit>
+			<unit type="pressure-inch-hg">
+				<displayName>英寸汞柱</displayName>
+				<unitPattern count="other">{0} 英寸汞柱</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>毫巴</displayName>
+				<unitPattern count="other">{0} 毫巴</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>公里/小時</displayName>
+				<unitPattern count="other">每小時{0}公里</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>公尺/秒</displayName>
+				<unitPattern count="other">每秒{0}米</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>英里/小時</displayName>
+				<unitPattern count="other">每小時{0}英里</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>節</displayName>
+				<unitPattern count="other">{0} 節</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>攝氏</displayName>
+				<unitPattern count="other">{0}°C</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName>華氏</displayName>
+				<unitPattern count="other">{0}°F</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>K</displayName>
+				<unitPattern count="other">{0} K</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>立方公里</displayName>
+				<unitPattern count="other">{0} 立方公里</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>立方公尺</displayName>
+				<unitPattern count="other">{0} 立方公尺</unitPattern>
+				<perUnitPattern>每立方米{0}</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>立方公分</displayName>
+				<unitPattern count="other">{0} 立方公分</unitPattern>
+				<perUnitPattern>每立方厘米{0}</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>立方英里</displayName>
+				<unitPattern count="other">{0} 立方英里</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>立方碼</displayName>
+				<unitPattern count="other">{0} 立方碼</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>立方英尺</displayName>
+				<unitPattern count="other">{0} 立方英尺</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>立方英寸</displayName>
+				<unitPattern count="other">{0} 立方英寸</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>兆升</displayName>
+				<unitPattern count="other">{0} 兆升</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>公石</displayName>
+				<unitPattern count="other">{0} 公石</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>公升</displayName>
+				<unitPattern count="other">{0} 升</unitPattern>
+				<perUnitPattern>每升{0}</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>公合</displayName>
+				<unitPattern count="other">{0} 公合</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>釐升</displayName>
+				<unitPattern count="other">{0} 釐升</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>毫升</displayName>
+				<unitPattern count="other">{0} 毫升</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>公制品脫</displayName>
+				<unitPattern count="other">{0} 公制品脫</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>公制量杯</displayName>
+				<unitPattern count="other">{0} 公制杯</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>英畝英尺</displayName>
+				<unitPattern count="other">{0} 英畝英尺</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName draft="contributed">bu</displayName>
+				<unitPattern count="other" draft="contributed">{0} 蒲式耳</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>加侖</displayName>
+				<unitPattern count="other">{0} 加侖</unitPattern>
+				<perUnitPattern>每加侖{0}</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>夸脫</displayName>
+				<unitPattern count="other">{0} 夸脫</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>品脫</displayName>
+				<unitPattern count="other">{0} 品脫</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>量杯</displayName>
+				<unitPattern count="other">{0} 杯</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>液盎司</displayName>
+				<unitPattern count="other">{0} 液盎司</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>湯匙</displayName>
+				<unitPattern count="other">{0} 湯匙</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>茶匙</displayName>
+				<unitPattern count="other">{0} 茶匙</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">東經{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">北緯{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">南緯{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">西經{0}</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<unitLength type="narrow">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<unitPattern count="other">{0}G</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-second-squared">
+				<unitPattern count="other" draft="contributed">{0}m/s²</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<unitPattern count="other" draft="contributed">{0}弧度</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="other">{0}度</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<unitPattern count="other">{0}角分</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<unitPattern count="other">{0}角秒</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<unitPattern count="other" draft="contributed">{0}km²</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<unitPattern count="other">{0}公頃</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<unitPattern count="other" draft="contributed">{0}m²</unitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<unitPattern count="other" draft="contributed">{0}cm²</unitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<unitPattern count="other">{0}平方英里</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<unitPattern count="other">{0}英畝</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<unitPattern count="other" draft="contributed">{0}yd²</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="other">{0}平方英尺</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<unitPattern count="other" draft="contributed">{0}in²</unitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<unitPattern count="other" draft="contributed">{0}kt</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<unitPattern count="other" draft="contributed">{0}L/km</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>升/100公里</displayName>
+				<unitPattern count="other">每100公里{0}升</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<unitPattern count="other" draft="contributed">{0}mpg</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<unitPattern count="other" draft="contributed">{0}TB</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<unitPattern count="other" draft="contributed">{0}Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<unitPattern count="other" draft="contributed">{0}GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<unitPattern count="other" draft="contributed">{0}Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<unitPattern count="other" draft="contributed">{0}MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<unitPattern count="other" draft="contributed">{0}Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<unitPattern count="other" draft="contributed">{0}kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<unitPattern count="other" draft="contributed">{0}kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<unitPattern count="other" draft="contributed">{0}byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<unitPattern count="other" draft="contributed">{0}bit</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>年</displayName>
+				<unitPattern count="other">{0}年</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>月</displayName>
+				<unitPattern count="other">{0}月</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>週</displayName>
+				<unitPattern count="other">{0}週</unitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>天</displayName>
+				<unitPattern count="other">{0}天</unitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>小時</displayName>
+				<unitPattern count="other">{0}時</unitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>分鐘</displayName>
+				<unitPattern count="other">{0}分</unitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>秒</displayName>
+				<unitPattern count="other">{0}秒</unitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>毫秒</displayName>
+				<unitPattern count="other">{0}毫秒</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<unitPattern count="other" draft="contributed">{0}μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<unitPattern count="other" draft="contributed">{0}ns</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<unitPattern count="other" draft="contributed">{0}A</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<unitPattern count="other" draft="contributed">{0}mA</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<unitPattern count="other" draft="contributed">{0}Ω</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<unitPattern count="other" draft="contributed">{0}V</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<unitPattern count="other" draft="contributed">{0}千卡</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<unitPattern count="other" draft="contributed">{0}卡</unitPattern>
+			</unit>
+			<unit type="energy-foodcalorie">
+				<unitPattern count="other" draft="contributed">{0}大卡</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<unitPattern count="other" draft="contributed">{0}千焦耳</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<unitPattern count="other" draft="contributed">{0}焦</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<unitPattern count="other" draft="contributed">{0}kWh</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<unitPattern count="other" draft="contributed">{0}GHz</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<unitPattern count="other" draft="contributed">{0}MHz</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<unitPattern count="other" draft="contributed">{0}kHz</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<unitPattern count="other" draft="contributed">{0}Hz</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>公里</displayName>
+				<unitPattern count="other">{0}公里</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>公尺</displayName>
+				<unitPattern count="other">{0}公尺</unitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<unitPattern count="other" draft="contributed">{0}dm</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>公分</displayName>
+				<unitPattern count="other">{0}公分</unitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>公釐</displayName>
+				<unitPattern count="other">{0}公釐</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<unitPattern count="other" draft="contributed">{0}µm</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<unitPattern count="other" draft="contributed">{0}nm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<unitPattern count="other">{0}皮米</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<unitPattern count="other">{0}英里</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<unitPattern count="other">{0}碼</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<unitPattern count="other">{0}呎</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="other">{0}吋</unitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<unitPattern count="other" draft="contributed">{0}pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="other">{0}光年</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<unitPattern count="other" draft="contributed">{0}au</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName draft="contributed">化朗</displayName>
+				<unitPattern count="other" draft="contributed">{0}化朗</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName draft="contributed">英尋</displayName>
+				<unitPattern count="other" draft="contributed">{0}fm</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<unitPattern count="other" draft="contributed">{0}nmi</unitPattern>
+			</unit>
+			<unit type="light-lux">
+				<unitPattern count="other" draft="contributed">{0}lx</unitPattern>
+			</unit>
+			<unit type="mass-metric-ton">
+				<unitPattern count="other" draft="contributed">{0}t</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>公斤</displayName>
+				<unitPattern count="other">{0}公斤</unitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>克</displayName>
+				<unitPattern count="other">{0}克</unitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<unitPattern count="other" draft="contributed">{0}mg</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<unitPattern count="other" draft="contributed">{0}µg</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<unitPattern count="other" draft="contributed">{0}tn</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName draft="contributed">英石</displayName>
+				<unitPattern count="other" draft="contributed">{0}st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<unitPattern count="other">{0}磅</unitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<unitPattern count="other">{0}盎司</unitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<unitPattern count="other" draft="contributed">{0}oz-t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<unitPattern count="other" draft="contributed">{0}CD</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<unitPattern count="other" draft="contributed">{0}GW</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<unitPattern count="other" draft="contributed">{0}MW</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<unitPattern count="other">{0}千瓦</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<unitPattern count="other">{0}瓦特</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<unitPattern count="other" draft="contributed">{0}mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="other">{0}匹</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<unitPattern count="other">{0}百帕</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<unitPattern count="other" draft="contributed">{0}mmHg</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<unitPattern count="other" draft="contributed">{0}psi</unitPattern>
+			</unit>
+			<unit type="pressure-inch-hg">
+				<unitPattern count="other" draft="contributed">{0}″ Hg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<unitPattern count="other">{0}毫巴</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>公里/小時</displayName>
+				<unitPattern count="other">{0}公里/小時</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<unitPattern count="other" draft="contributed">{0}m/s</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<unitPattern count="other">{0}英里/小時</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>°C</displayName>
+				<unitPattern count="other">{0}°C</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<unitPattern count="other">{0}°F</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName draft="contributed">K</displayName>
+				<unitPattern count="other" draft="contributed">{0}°K</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<unitPattern count="other">{0}km³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<unitPattern count="other" draft="contributed">{0}m³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<unitPattern count="other" draft="contributed">{0}cm³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<unitPattern count="other">{0}立方英里</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<unitPattern count="other" draft="contributed">{0}yd³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<unitPattern count="other" draft="contributed">{0}ft³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<unitPattern count="other" draft="contributed">{0}in³</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<unitPattern count="other" draft="contributed">{0}ML</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<unitPattern count="other" draft="contributed">{0}hL</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>公升</displayName>
+				<unitPattern count="other">{0}升</unitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<unitPattern count="other" draft="contributed">{0}dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<unitPattern count="other" draft="contributed">{0}cL</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<unitPattern count="other" draft="contributed">{0}mL</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<unitPattern count="other" draft="contributed">{0}ac-ft</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName draft="contributed">蒲式耳</displayName>
+				<unitPattern count="other" draft="contributed">{0}bu</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<unitPattern count="other" draft="contributed">{0}gal</unitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<unitPattern count="other" draft="contributed">{0}qt</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<unitPattern count="other" draft="contributed">{0}pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<unitPattern count="other" draft="contributed">{0}c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<unitPattern count="other" draft="contributed">{0}fl-oz</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<unitPattern count="other" draft="contributed">{0}匙</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<unitPattern count="other" draft="contributed">{0}tsp</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">東經{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">北緯{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">南緯{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">西經{0}</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<durationUnit type="hm">
+			<durationUnitPattern>h:mm</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="hms">
+			<durationUnitPattern>h:mm:ss</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="ms">
+			<durationUnitPattern>m:ss</durationUnitPattern>
+		</durationUnit>
+	</units>
+	<listPatterns>
+		<listPattern>
+			<listPatternPart type="start">{0}、{1}</listPatternPart>
+			<listPatternPart type="middle">{0}、{1}</listPatternPart>
+			<listPatternPart type="end">{0}同{1}</listPatternPart>
+			<listPatternPart type="2">{0}同{1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit">
+			<listPatternPart type="start">{0} {1}</listPatternPart>
+			<listPatternPart type="middle">{0} {1}</listPatternPart>
+			<listPatternPart type="end">{0} {1}</listPatternPart>
+			<listPatternPart type="2">{0} {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-narrow">
+			<listPatternPart type="start">{0}{1}</listPatternPart>
+			<listPatternPart type="middle">{0}{1}</listPatternPart>
+			<listPatternPart type="end">{0}{1}</listPatternPart>
+			<listPatternPart type="2">{0}{1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-short">
+			<listPatternPart type="start">{0} {1}</listPatternPart>
+			<listPatternPart type="middle">{0} {1}</listPatternPart>
+			<listPatternPart type="end">{0} {1}</listPatternPart>
+			<listPatternPart type="2">{0} {1}</listPatternPart>
+		</listPattern>
+	</listPatterns>
+	<posix>
+		<messages>
+			<yesstr>係</yesstr>
+			<nostr>唔係</nostr>
+		</messages>
+	</posix>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yue_HK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yue_HK.xml
new file mode 100644
index 00000000000..32b433b32eb
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yue_HK.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12347 $"/>
+		<language type="yue"/>
+		<territory type="HK"/>
+	</identity>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zgh.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zgh.xml
similarity index 95%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zgh.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zgh.xml
index ab16e63b1b6..89c4060a485 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zgh.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zgh.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 12307 $"/>
 		<language type="zgh"/>
 	</identity>
 	<localeDisplayNames>
@@ -293,10 +292,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="currency">ⴰⴷⵔⵉⵎ</key>
 		</keys>
 		<types>
-			<type type="coptic" key="calendar">ⴰⵙⵎⵍⵓⵙⵙⴰⵏ ⴰⵇⴱⵟⵉ</type>
-			<type type="ethiopic" key="calendar">ⴰⵙⵎⵍⵓⵙⵙⴰⵏ ⵏ ⵉⵜⵢⵓⴱⵢⴰ</type>
-			<type type="gregorian" key="calendar">ⴰⵙⵎⵍⵓⵙⵙⴰⵏ ⴰⴳⵔⵉⴳⵓⵔ</type>
-			<type type="islamic" key="calendar">ⴰⵙⵎⵍⵓⵙⵙⴰⵏ ⵏ ⵍⵉⵙⵍⴰⵎ</type>
+			<type key="calendar" type="coptic">ⴰⵙⵎⵍⵓⵙⵙⴰⵏ ⴰⵇⴱⵟⵉ</type>
+			<type key="calendar" type="ethiopic">ⴰⵙⵎⵍⵓⵙⵙⴰⵏ ⵏ ⵉⵜⵢⵓⴱⵢⴰ</type>
+			<type key="calendar" type="gregorian">ⴰⵙⵎⵍⵓⵙⵙⴰⵏ ⴰⴳⵔⵉⴳⵓⵔ</type>
+			<type key="calendar" type="islamic">ⴰⵙⵎⵍⵓⵙⵙⴰⵏ ⵏ ⵍⵉⵙⵍⴰⵎ</type>
 		</types>
 	</localeDisplayNames>
 	<characters>
@@ -434,6 +433,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">ⵜⵉⴼⴰⵡⵜ</dayPeriod>
+							<dayPeriod type="pm">ⵜⴰⴷⴳⴳⵯⴰⵜ</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">ⵜⵉⴼⴰⵡⵜ</dayPeriod>
 							<dayPeriod type="pm">ⵜⴰⴷⴳⴳⵯⴰⵜ</dayPeriod>
@@ -472,28 +475,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
 				<dateTimeFormats>
 					<availableFormats>
 						<dateFormatItem id="M">M</dateFormatItem>
@@ -570,6 +551,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>#,##0.00¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="provisional">0K¤</pattern>
+					<pattern type="10000" count="other" draft="provisional">00K¤</pattern>
+					<pattern type="100000" count="other" draft="provisional">000K¤</pattern>
+					<pattern type="1000000" count="other" draft="provisional">0M¤</pattern>
+					<pattern type="10000000" count="other" draft="provisional">00M¤</pattern>
+					<pattern type="100000000" count="other" draft="provisional">000M¤</pattern>
+					<pattern type="1000000000" count="other" draft="provisional">0G¤</pattern>
+					<pattern type="10000000000" count="other" draft="provisional">00G¤</pattern>
+					<pattern type="100000000000" count="other" draft="provisional">000G¤</pattern>
+					<pattern type="1000000000000" count="other" draft="provisional">0T¤</pattern>
+					<pattern type="10000000000000" count="other" draft="provisional">00T¤</pattern>
+					<pattern type="100000000000000" count="other" draft="provisional">000T¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -752,3 +749,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 		</messages>
 	</posix>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zgh_MA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zgh_MA.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zgh_MA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zgh_MA.xml
index 28311193d7f..593826dd8fc 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zgh_MA.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zgh_MA.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="zgh"/>
 		<territory type="MA"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh.xml
similarity index 93%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh.xml
index 47edf7990cd..196dff72409 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="zh"/>
 	</identity>
 	<localeDisplayNames>
@@ -50,6 +49,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ay">艾马拉文</language>
 			<language type="az">阿塞拜疆文</language>
 			<language type="az" alt="short">阿塞拜疆文</language>
+			<language type="az_Arab" draft="contributed">南阿塞拜疆文</language>
 			<language type="ba">巴什客尔文</language>
 			<language type="bal">俾路支文</language>
 			<language type="ban">巴里文</language>
@@ -62,6 +62,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bez">贝纳文</language>
 			<language type="bfd">巴非特文</language>
 			<language type="bg">保加利亚文</language>
+			<language type="bgn">西俾路支文</language>
 			<language type="bho">博杰普尔文</language>
 			<language type="bi">比斯拉马文</language>
 			<language type="bik">毕库尔文</language>
@@ -289,6 +290,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">老挝文</language>
 			<language type="lol">芒戈文</language>
 			<language type="loz">洛兹文</language>
+			<language type="lrc">北卢尔文</language>
 			<language type="lt">立陶宛文</language>
 			<language type="lu">鲁巴加丹加文</language>
 			<language type="lua">鲁巴鲁瓦文</language>
@@ -337,6 +339,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="my">缅甸文</language>
 			<language type="mye">姆耶内文</language>
 			<language type="myv">俄日亚文</language>
+			<language type="mzn">马赞德兰文</language>
 			<language type="na">瑙鲁文</language>
 			<language type="nap">拿波里文</language>
 			<language type="naq">纳马文</language>
@@ -419,6 +422,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="scn">西西里文</language>
 			<language type="sco">苏格兰文</language>
 			<language type="sd">信德文</language>
+			<language type="sdh" draft="contributed">南库尔德文</language>
 			<language type="se">北萨米文</language>
 			<language type="see">塞内卡文</language>
 			<language type="seh">塞纳文</language>
@@ -456,8 +460,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">苏马文</language>
 			<language type="sv">瑞典文</language>
 			<language type="sw">斯瓦希里文</language>
+			<language type="sw_CD">刚果斯瓦希里文</language>
 			<language type="swb">科摩罗文</language>
-			<language type="swc">刚果斯瓦希里文</language>
 			<language type="syc">经典叙利亚文</language>
 			<language type="syr">叙利亚文</language>
 			<language type="ta">泰米尔文</language>
@@ -503,6 +507,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="uz">乌兹别克文</language>
 			<language type="vai">瓦伊文</language>
 			<language type="ve">文达文</language>
+			<language type="vep" draft="contributed">维普森文</language>
 			<language type="vi">越南文</language>
 			<language type="vo">沃拉普克文</language>
 			<language type="vot">沃提克文</language>
@@ -512,6 +517,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">瓦拉莫文</language>
 			<language type="war">瓦赖文</language>
 			<language type="was">瓦绍文</language>
+			<language type="wbp">瓦尔皮瑞文</language>
 			<language type="wo">沃洛夫文</language>
 			<language type="xal">卡尔梅克文</language>
 			<language type="xh">科萨文</language>
@@ -738,7 +744,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">安圭拉</territory>
 			<territory type="AL">阿尔巴尼亚</territory>
 			<territory type="AM">亚美尼亚</territory>
-			<territory type="AN">荷属安的列斯群岛</territory>
 			<territory type="AO">安哥拉</territory>
 			<territory type="AQ">南极洲</territory>
 			<territory type="AR">阿根廷</territory>
@@ -1071,6 +1076,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">数字排序</key>
 			<key type="colStrength" draft="contributed">排序强度</key>
 			<key type="currency">货币</key>
+			<key type="hc" draft="contributed">小时制（12或24）</key>
+			<key type="lb" draft="contributed">换行符样式</key>
+			<key type="ms" draft="contributed">度量系统</key>
 			<key type="numbers">数字</key>
 			<key type="timezone" draft="contributed">时区</key>
 			<key type="va" draft="contributed">语言区域别名</key>
@@ -1078,111 +1086,121 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">专用</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">阿拉伯印度文数字</type>
-			<type type="arabext" key="numbers">扩展阿拉伯印度文数字</type>
-			<type type="armn" key="numbers">亚美尼亚文数字</type>
-			<type type="armnlow" key="numbers">亚美尼亚文小写数字</type>
-			<type type="bali" key="numbers">巴厘文数字</type>
-			<type type="beng" key="numbers">孟加拉文数字</type>
-			<type type="big5han" key="collation">繁体中文排序 - Big5</type>
-			<type type="buddhist" key="calendar">佛教日历</type>
-			<type type="cham" key="numbers">占文数字</type>
-			<type type="chinese" key="calendar">农历</type>
-			<type type="coptic" key="calendar">科普特日历</type>
-			<type type="dangi" key="calendar">檀纪日历</type>
-			<type type="deva" key="numbers">梵文数字</type>
-			<type type="dictionary" key="collation">字典排序顺序</type>
-			<type type="ducet" key="collation">默认 Unicode 排序</type>
-			<type type="ethi" key="numbers">埃塞俄比亚文数字</type>
-			<type type="ethiopic" key="calendar">埃塞俄比亚日历</type>
-			<type type="ethiopic-amete-alem" key="calendar">埃塞俄比亚阿米特阿莱姆日历</type>
-			<type type="finance" key="numbers" draft="contributed">金融数字</type>
-			<type type="fullwide" key="numbers">全角数字</type>
-			<type type="gb2312han" key="collation">简体中文排序 - GB2312</type>
-			<type type="geor" key="numbers">格鲁吉亚文数字</type>
-			<type type="gregorian" key="calendar">公历</type>
-			<type type="grek" key="numbers">希腊文数字</type>
-			<type type="greklow" key="numbers">希腊文小写数字</type>
-			<type type="gujr" key="numbers">古吉拉特文数字</type>
-			<type type="guru" key="numbers">果鲁穆奇文数字</type>
-			<type type="hanidec" key="numbers">中文十进制数字</type>
-			<type type="hans" key="numbers">简体中文数字</type>
-			<type type="hansfin" key="numbers">简体中文大写数字</type>
-			<type type="hant" key="numbers">繁体中文数字</type>
-			<type type="hantfin" key="numbers">繁体中文大写数字</type>
-			<type type="hebr" key="numbers">希伯来文数字</type>
-			<type type="hebrew" key="calendar">希伯来日历</type>
-			<type type="identical" key="colStrength" draft="contributed">对所有内容进行排序</type>
-			<type type="indian" key="calendar">印度国家日历</type>
-			<type type="islamic" key="calendar">伊斯兰日历</type>
-			<type type="islamic-civil" key="calendar">伊斯兰希吉来日历</type>
-			<type type="iso8601" key="calendar">国际标准历法</type>
-			<type type="japanese" key="calendar">日本日历</type>
-			<type type="java" key="numbers">爪哇文数字</type>
-			<type type="jpan" key="numbers">日文数字</type>
-			<type type="jpanfin" key="numbers">日文大写数字</type>
-			<type type="kali" key="numbers">克耶字母数字</type>
-			<type type="khmr" key="numbers">高棉文数字</type>
-			<type type="knda" key="numbers">卡纳达文数字</type>
-			<type type="lana" key="numbers">老傣文数字</type>
-			<type type="lanatham" key="numbers">兰纳文数字</type>
-			<type type="laoo" key="numbers">老挝文数字</type>
-			<type type="latn" key="numbers">西方数字</type>
-			<type type="lepc" key="numbers">雷布查文数字</type>
-			<type type="limb" key="numbers">林布文数字</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">先对小写字母进行排序</type>
-			<type type="mlym" key="numbers">马拉雅拉姆文数字</type>
-			<type type="mong" key="numbers">蒙古文数字</type>
-			<type type="mtei" key="numbers">曼尼普尔数字</type>
-			<type type="mymr" key="numbers">缅甸文数字</type>
-			<type type="mymrshan" key="numbers">缅甸掸文数字</type>
-			<type type="native" key="numbers" draft="contributed">当地数字</type>
-			<type type="nkoo" key="numbers">曼德数字</type>
-			<type type="no" key="colBackwards" draft="contributed">对重音进行正常排序</type>
-			<type type="no" key="colCaseFirst" draft="contributed">对正常大小写顺序进行排序</type>
-			<type type="no" key="colCaseLevel" draft="contributed">不区分大小写进行排序</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">对假名进行单独排序</type>
-			<type type="no" key="colNormalization" draft="contributed">非规范化排序</type>
-			<type type="no" key="colNumeric" draft="contributed">对数字进行单独排序</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">对符号进行排序</type>
-			<type type="olck" key="numbers">桑塔利文数字</type>
-			<type type="orya" key="numbers">奥里亚文数字</type>
-			<type type="persian" key="calendar">波斯日历</type>
-			<type type="phonebook" key="collation">电话簿排序顺序</type>
-			<type type="phonetic" key="collation" draft="contributed">语音排序顺序</type>
-			<type type="pinyin" key="collation">拼音排序</type>
-			<type type="primary" key="colStrength" draft="contributed">只对基本字母进行排序</type>
-			<type type="quaternary" key="colStrength" draft="contributed">对重音/大小写/长度/假名进行排序</type>
-			<type type="reformed" key="collation">改良排序顺序</type>
-			<type type="roc" key="calendar">民国日历</type>
-			<type type="roman" key="numbers">罗马数字</type>
-			<type type="romanlow" key="numbers">罗马小写数字</type>
-			<type type="saur" key="numbers">索拉什特拉文数字</type>
-			<type type="search" key="collation">常规搜索</type>
-			<type type="searchjl" key="collation">按韩文字开首辅音来搜索</type>
-			<type type="secondary" key="colStrength" draft="contributed">对重音进行排序</type>
-			<type type="shifted" key="colAlternate" draft="contributed">忽略符号进行排序</type>
-			<type type="standard" key="collation">标准排序</type>
-			<type type="stroke" key="collation">笔画排序</type>
-			<type type="sund" key="numbers">苏丹文数字</type>
-			<type type="talu" key="numbers">新傣仂文数字</type>
-			<type type="taml" key="numbers">传统泰米尔文数字</type>
-			<type type="tamldec" key="numbers">泰米尔文数字</type>
-			<type type="telu" key="numbers">泰卢固文数字</type>
-			<type type="tertiary" key="colStrength" draft="contributed">对重音/大小写/长度进行排序</type>
-			<type type="thai" key="numbers">泰文数字</type>
-			<type type="tibt" key="numbers">藏文数字</type>
-			<type type="traditional" key="collation">传统排序顺序</type>
-			<type type="traditional" key="numbers" draft="contributed">传统数字</type>
-			<type type="unihan" key="collation">部首笔画排序</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">先对大写字母进行排序</type>
-			<type type="vaii" key="numbers">瓦伊文数字</type>
-			<type type="yes" key="colBackwards" draft="contributed">对重音进行逆向排序</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">区分大小写进行排序</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">对假名进行区别排序</type>
-			<type type="yes" key="colNormalization" draft="contributed">对 Unicode 进行规范化排序</type>
-			<type type="yes" key="colNumeric" draft="contributed">按数字顺序对数字进行排序</type>
-			<type type="zhuyin" key="collation">注音排序</type>
+			<type key="calendar" type="buddhist">佛教日历</type>
+			<type key="calendar" type="chinese">农历</type>
+			<type key="calendar" type="coptic">科普特日历</type>
+			<type key="calendar" type="dangi">檀纪日历</type>
+			<type key="calendar" type="ethiopic">埃塞俄比亚日历</type>
+			<type key="calendar" type="ethiopic-amete-alem">埃塞俄比亚阿米特阿莱姆日历</type>
+			<type key="calendar" type="gregorian">公历</type>
+			<type key="calendar" type="hebrew">希伯来日历</type>
+			<type key="calendar" type="indian">印度国家日历</type>
+			<type key="calendar" type="islamic">伊斯兰日历</type>
+			<type key="calendar" type="islamic-civil">伊斯兰希吉来日历</type>
+			<type key="calendar" type="iso8601">国际标准历法</type>
+			<type key="calendar" type="japanese">日本日历</type>
+			<type key="calendar" type="persian">波斯日历</type>
+			<type key="calendar" type="roc">民国日历</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">对符号进行排序</type>
+			<type key="colAlternate" type="shifted" draft="contributed">忽略符号进行排序</type>
+			<type key="colBackwards" type="no" draft="contributed">对重音进行正常排序</type>
+			<type key="colBackwards" type="yes" draft="contributed">对重音进行逆向排序</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">先对小写字母进行排序</type>
+			<type key="colCaseFirst" type="no" draft="contributed">对正常大小写顺序进行排序</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">先对大写字母进行排序</type>
+			<type key="colCaseLevel" type="no" draft="contributed">不区分大小写进行排序</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">区分大小写进行排序</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">对假名进行单独排序</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">对假名进行区别排序</type>
+			<type key="collation" type="big5han">繁体中文排序 - Big5</type>
+			<type key="collation" type="dictionary">字典排序</type>
+			<type key="collation" type="ducet">默认 Unicode 排序</type>
+			<type key="collation" type="gb2312han">简体中文排序 - GB2312</type>
+			<type key="collation" type="phonebook">电话簿排序</type>
+			<type key="collation" type="phonetic" draft="contributed">语音排序</type>
+			<type key="collation" type="pinyin">拼音排序</type>
+			<type key="collation" type="reformed">改良排序</type>
+			<type key="collation" type="search">常规搜索</type>
+			<type key="collation" type="searchjl">按韩文字开首辅音来搜索</type>
+			<type key="collation" type="standard">标准排序</type>
+			<type key="collation" type="stroke">笔画排序</type>
+			<type key="collation" type="traditional">传统排序</type>
+			<type key="collation" type="unihan">部首笔画排序</type>
+			<type key="collation" type="zhuyin">注音排序</type>
+			<type key="colNormalization" type="no" draft="contributed">非规范化排序</type>
+			<type key="colNormalization" type="yes" draft="contributed">对 Unicode 进行规范化排序</type>
+			<type key="colNumeric" type="no" draft="contributed">对数字进行单独排序</type>
+			<type key="colNumeric" type="yes" draft="contributed">按数字顺序对数字进行排序</type>
+			<type key="colStrength" type="identical" draft="contributed">对所有内容进行排序</type>
+			<type key="colStrength" type="primary" draft="contributed">只对基本字母进行排序</type>
+			<type key="colStrength" type="quaternary" draft="contributed">对重音/大小写/长度/假名进行排序</type>
+			<type key="colStrength" type="secondary" draft="contributed">对重音进行排序</type>
+			<type key="colStrength" type="tertiary" draft="contributed">对重音/大小写/长度进行排序</type>
+			<type key="hc" type="h11">12小时制（0–11）</type>
+			<type key="hc" type="h12">12小时制（1–12）</type>
+			<type key="hc" type="h23">24小时制（0–23）</type>
+			<type key="hc" type="h24">24小时制（1–24）</type>
+			<type key="lb" type="loose" draft="contributed">宽</type>
+			<type key="lb" type="normal" draft="contributed">默认</type>
+			<type key="lb" type="strict" draft="contributed">窄</type>
+			<type key="ms" type="metric">公制</type>
+			<type key="ms" type="uksystem">英制</type>
+			<type key="ms" type="ussystem">美制</type>
+			<type key="numbers" type="arab">阿拉伯印度文数字</type>
+			<type key="numbers" type="arabext">扩展阿拉伯印度文数字</type>
+			<type key="numbers" type="armn">亚美尼亚文数字</type>
+			<type key="numbers" type="armnlow">亚美尼亚文小写数字</type>
+			<type key="numbers" type="bali">巴厘文数字</type>
+			<type key="numbers" type="beng">孟加拉文数字</type>
+			<type key="numbers" type="cham">占文数字</type>
+			<type key="numbers" type="deva">梵文数字</type>
+			<type key="numbers" type="ethi">埃塞俄比亚文数字</type>
+			<type key="numbers" type="finance" draft="contributed">金融数字</type>
+			<type key="numbers" type="fullwide">全角数字</type>
+			<type key="numbers" type="geor">格鲁吉亚文数字</type>
+			<type key="numbers" type="grek">希腊文数字</type>
+			<type key="numbers" type="greklow">希腊文小写数字</type>
+			<type key="numbers" type="gujr">古吉拉特文数字</type>
+			<type key="numbers" type="guru">果鲁穆奇文数字</type>
+			<type key="numbers" type="hanidec">中文十进制数字</type>
+			<type key="numbers" type="hans">简体中文数字</type>
+			<type key="numbers" type="hansfin">简体中文大写数字</type>
+			<type key="numbers" type="hant">繁体中文数字</type>
+			<type key="numbers" type="hantfin">繁体中文大写数字</type>
+			<type key="numbers" type="hebr">希伯来文数字</type>
+			<type key="numbers" type="java">爪哇文数字</type>
+			<type key="numbers" type="jpan">日文数字</type>
+			<type key="numbers" type="jpanfin">日文大写数字</type>
+			<type key="numbers" type="kali">克耶字母数字</type>
+			<type key="numbers" type="khmr">高棉文数字</type>
+			<type key="numbers" type="knda">卡纳达文数字</type>
+			<type key="numbers" type="lana">老傣文数字</type>
+			<type key="numbers" type="lanatham">兰纳文数字</type>
+			<type key="numbers" type="laoo">老挝文数字</type>
+			<type key="numbers" type="latn">西方数字</type>
+			<type key="numbers" type="lepc">雷布查文数字</type>
+			<type key="numbers" type="limb">林布文数字</type>
+			<type key="numbers" type="mlym">马拉雅拉姆文数字</type>
+			<type key="numbers" type="mong">蒙古文数字</type>
+			<type key="numbers" type="mtei">曼尼普尔数字</type>
+			<type key="numbers" type="mymr">缅甸文数字</type>
+			<type key="numbers" type="mymrshan">缅甸掸文数字</type>
+			<type key="numbers" type="native" draft="contributed">当地数字</type>
+			<type key="numbers" type="nkoo">曼德数字</type>
+			<type key="numbers" type="olck">桑塔利文数字</type>
+			<type key="numbers" type="orya">奥里亚文数字</type>
+			<type key="numbers" type="roman">罗马数字</type>
+			<type key="numbers" type="romanlow">罗马小写数字</type>
+			<type key="numbers" type="saur">索拉什特拉文数字</type>
+			<type key="numbers" type="sund">苏丹文数字</type>
+			<type key="numbers" type="talu">新傣仂文数字</type>
+			<type key="numbers" type="taml">传统泰米尔文数字</type>
+			<type key="numbers" type="tamldec">泰米尔文数字</type>
+			<type key="numbers" type="telu">泰卢固文数字</type>
+			<type key="numbers" type="thai">泰文数字</type>
+			<type key="numbers" type="tibt">藏文数字</type>
+			<type key="numbers" type="traditional" draft="contributed">传统数字</type>
+			<type key="numbers" type="vaii">瓦伊文数字</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN">美国地名委员会 (BGN)</transformName>
@@ -1266,6 +1284,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
+						<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="y">Gy年</dateFormatItem>
 						<dateFormatItem id="yyyy">Gy年</dateFormatItem>
 						<dateFormatItem id="yyyyM">Gy-M</dateFormatItem>
@@ -1557,6 +1576,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MEd">M-dE</dateFormatItem>
 						<dateFormatItem id="MMMd">MMMd日</dateFormatItem>
 						<dateFormatItem id="MMMEd">MMMd日E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMMd日</dateFormatItem>
 						<dateFormatItem id="UM">U年MMM</dateFormatItem>
 						<dateFormatItem id="UMd">U年MMMd</dateFormatItem>
 						<dateFormatItem id="UMMM">U年MMM</dateFormatItem>
@@ -1570,6 +1590,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">rU年MMM</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">r年MMMd</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">rU年MMMdE</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">rU年MMMM</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">rU年QQQQ</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">rU年QQQQ</dateFormatItem>
 					</availableFormats>
@@ -1901,6 +1922,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d日</dateFormatItem>
+						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d日E</dateFormatItem>
 						<dateFormatItem id="Gy">Gy年</dateFormatItem>
 						<dateFormatItem id="GyMMM">Gy年M月</dateFormatItem>
@@ -1918,6 +1940,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
+						<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">Gy年</dateFormatItem>
 						<dateFormatItem id="yyyy">Gy年</dateFormatItem>
@@ -2241,38 +2264,88 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="afternoon">下午</dayPeriod>
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">午夜</dayPeriod>
 							<dayPeriod type="am">上午</dayPeriod>
-							<dayPeriod type="earlyMorning">清晨</dayPeriod>
-							<dayPeriod type="midDay">中午</dayPeriod>
-							<dayPeriod type="morning">上午</dayPeriod>
-							<dayPeriod type="night">晚上</dayPeriod>
-							<dayPeriod type="noon">中午</dayPeriod>
 							<dayPeriod type="pm">下午</dayPeriod>
-							<dayPeriod type="weeHours">凌晨</dayPeriod>
+							<dayPeriod type="morning1">清晨</dayPeriod>
+							<dayPeriod type="morning2">上午</dayPeriod>
+							<dayPeriod type="afternoon1">下午</dayPeriod>
+							<dayPeriod type="afternoon2">下午</dayPeriod>
+							<dayPeriod type="evening1">晚上</dayPeriod>
+							<dayPeriod type="night1">凌晨</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">午夜</dayPeriod>
+							<dayPeriod type="am">上午</dayPeriod>
+							<dayPeriod type="pm">下午</dayPeriod>
+							<dayPeriod type="morning1">清晨</dayPeriod>
+							<dayPeriod type="morning2">上午</dayPeriod>
+							<dayPeriod type="afternoon1">中午</dayPeriod>
+							<dayPeriod type="afternoon2">下午</dayPeriod>
+							<dayPeriod type="evening1">晚上</dayPeriod>
+							<dayPeriod type="night1">凌晨</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="afternoon">下午</dayPeriod>
+							<dayPeriod type="midnight">午夜</dayPeriod>
 							<dayPeriod type="am">上午</dayPeriod>
-							<dayPeriod type="earlyMorning">清晨</dayPeriod>
-							<dayPeriod type="midDay">中午</dayPeriod>
-							<dayPeriod type="morning">上午</dayPeriod>
-							<dayPeriod type="night">晚上</dayPeriod>
-							<dayPeriod type="noon">中午</dayPeriod>
 							<dayPeriod type="pm">下午</dayPeriod>
-							<dayPeriod type="weeHours">凌晨</dayPeriod>
+							<dayPeriod type="morning1">清晨</dayPeriod>
+							<dayPeriod type="morning2">上午</dayPeriod>
+							<dayPeriod type="afternoon1">下午</dayPeriod>
+							<dayPeriod type="afternoon2">下午</dayPeriod>
+							<dayPeriod type="evening1">晚上</dayPeriod>
+							<dayPeriod type="night1">凌晨</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">午夜</dayPeriod>
+							<dayPeriod type="am">上午</dayPeriod>
+							<dayPeriod type="pm">下午</dayPeriod>
+							<dayPeriod type="morning1">早上</dayPeriod>
+							<dayPeriod type="morning2">上午</dayPeriod>
+							<dayPeriod type="afternoon1">中午</dayPeriod>
+							<dayPeriod type="afternoon2">下午</dayPeriod>
+							<dayPeriod type="evening1">晚上</dayPeriod>
+							<dayPeriod type="night1">凌晨</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">午夜</dayPeriod>
+							<dayPeriod type="am">上午</dayPeriod>
+							<dayPeriod type="pm">下午</dayPeriod>
+							<dayPeriod type="morning1">早上</dayPeriod>
+							<dayPeriod type="morning2">上午</dayPeriod>
+							<dayPeriod type="afternoon1">中午</dayPeriod>
+							<dayPeriod type="afternoon2">下午</dayPeriod>
+							<dayPeriod type="evening1">晚上</dayPeriod>
+							<dayPeriod type="night1">凌晨</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">午夜</dayPeriod>
+							<dayPeriod type="am">上午</dayPeriod>
+							<dayPeriod type="pm">下午</dayPeriod>
+							<dayPeriod type="morning1">早上</dayPeriod>
+							<dayPeriod type="morning2">上午</dayPeriod>
+							<dayPeriod type="afternoon1">中午</dayPeriod>
+							<dayPeriod type="afternoon2">下午</dayPeriod>
+							<dayPeriod type="evening1">晚上</dayPeriod>
+							<dayPeriod type="night1">凌晨</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
 						<era type="0">公元前</era>
+						<era type="0" alt="variant" draft="contributed">西元前</era>
 						<era type="1">公元</era>
+						<era type="1" alt="variant" draft="contributed">西元</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">公元前</era>
+						<era type="0" alt="variant" draft="contributed">西元前</era>
 						<era type="1">公元</era>
+						<era type="1" alt="variant" draft="contributed">西元</era>
 					</eraAbbr>
 					<eraNarrow>
 						<era type="0">公元前</era>
@@ -2297,7 +2370,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>yy/M/d</pattern>
+							<pattern>y/M/d</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -2348,9 +2421,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="d">d日</dateFormatItem>
 						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d日E</dateFormatItem>
-						<dateFormatItem id="Ehm">Eah:mm</dateFormatItem>
+						<dateFormatItem id="Ehm">E ah:mm</dateFormatItem>
 						<dateFormatItem id="EHm">EHH:mm</dateFormatItem>
-						<dateFormatItem id="Ehms">Eah:mm:ss</dateFormatItem>
+						<dateFormatItem id="Ehms">E ah:mm:ss</dateFormatItem>
 						<dateFormatItem id="EHms">EHH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">Gy年</dateFormatItem>
 						<dateFormatItem id="GyMMM">Gy年M月</dateFormatItem>
@@ -2373,7 +2446,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
-						<dateFormatItem id="MMMMdd">M月dd日</dateFormatItem>
+						<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y年</dateFormatItem>
 						<dateFormatItem id="yM">y年M月</dateFormatItem>
@@ -2776,7 +2849,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</months>
 				<eras>
 					<eraAbbr>
-						<era type="0">回历</era>
+						<era type="0">伊斯兰历</era>
 					</eraAbbr>
 				</eras>
 				<dateFormats>
@@ -2805,6 +2878,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
+						<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
 					</availableFormats>
 				</dateTimeFormats>
 			</calendar>
@@ -3114,6 +3188,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
+						<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="ms" draft="contributed">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">Gy年</dateFormatItem>
 						<dateFormatItem id="yyyy">Gy年</dateFormatItem>
@@ -3123,6 +3198,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">Gy年M月d日</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">Gy年M月d日E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">Gy年第Q季度</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">Gy年QQQQ</dateFormatItem>
 					</availableFormats>
@@ -3257,6 +3333,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<availableFormats>
 						<dateFormatItem id="d">d日</dateFormatItem>
+						<dateFormatItem id="E" draft="contributed">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d日E</dateFormatItem>
 						<dateFormatItem id="Gy">Gy年</dateFormatItem>
 						<dateFormatItem id="GyMMM">Gy年M月</dateFormatItem>
@@ -3268,6 +3345,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
+						<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="y">Gy年</dateFormatItem>
 						<dateFormatItem id="yyyy">Gy年</dateFormatItem>
 						<dateFormatItem id="yyyyM">Gy年M月</dateFormatItem>
@@ -4508,6 +4586,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>莫尔兹比港</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>布干维尔</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>马尼拉</exemplarCity>
 			</zone>
@@ -4592,6 +4673,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>伊尔库茨克</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>赤塔</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>雅库茨克</exemplarCity>
 			</zone>
@@ -4610,6 +4694,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>马加丹</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>中科雷姆斯克</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>堪察加</exemplarCity>
 			</zone>
@@ -5878,7 +5965,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</decimalFormatLength>
 			<decimalFormatLength type="long">
 				<decimalFormat>
-					<pattern type="1000" count="other">0千</pattern>
+					<pattern type="1000" count="other">0</pattern>
 					<pattern type="10000" count="other">0万</pattern>
 					<pattern type="100000" count="other">00万</pattern>
 					<pattern type="1000000" count="other">000万</pattern>
@@ -5894,7 +5981,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</decimalFormatLength>
 			<decimalFormatLength type="short">
 				<decimalFormat>
-					<pattern type="1000" count="other">0千</pattern>
+					<pattern type="1000" count="other">0</pattern>
 					<pattern type="10000" count="other">0万</pattern>
 					<pattern type="100000" count="other">00万</pattern>
 					<pattern type="1000000" count="other">000万</pattern>
@@ -5926,12 +6013,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
-					<pattern>¤ #,##0.00</pattern>
+					<pattern>¤#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="contributed">0</pattern>
+					<pattern type="10000" count="other" draft="contributed">¤0万</pattern>
+					<pattern type="100000" count="other" draft="contributed">¤00万</pattern>
+					<pattern type="1000000" count="other" draft="contributed">¤000万</pattern>
+					<pattern type="10000000" count="other" draft="contributed">¤0000万</pattern>
+					<pattern type="100000000" count="other" draft="contributed">¤0亿</pattern>
+					<pattern type="1000000000" count="other" draft="contributed">¤00亿</pattern>
+					<pattern type="10000000000" count="other" draft="contributed">¤000亿</pattern>
+					<pattern type="100000000000" count="other" draft="contributed">¤0000亿</pattern>
+					<pattern type="1000000000000" count="other" draft="contributed">¤0兆</pattern>
+					<pattern type="10000000000000" count="other" draft="contributed">¤00兆</pattern>
+					<pattern type="100000000000000" count="other" draft="contributed">¤000兆</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="other">{0}{1}</unitPattern>
 		</currencyFormats>
 		<currencies>
@@ -5977,6 +6080,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>安哥拉宽扎</displayName>
 				<displayName count="other">安哥拉宽扎</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>安哥拉宽扎 (1977–1990)</displayName>
@@ -6054,6 +6158,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>波斯尼亚-黑塞哥维那可兑换马克</displayName>
 				<displayName count="other">波斯尼亚-黑塞哥维那可兑换马克</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BAN">
 				<displayName>波士尼亚-赫塞哥维纳新第纳尔 (1994–1997)</displayName>
@@ -6133,6 +6238,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>玻利维亚诺</displayName>
 				<displayName count="other">玻利维亚诺</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOL">
 				<displayName>玻利维亚诺 (1863–1963)</displayName>
@@ -6203,6 +6309,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>博茨瓦纳普拉</displayName>
 				<displayName count="other">博茨瓦纳普拉</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>白俄罗斯新卢布 (1994–1999)</displayName>
@@ -6300,6 +6407,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>古巴可兑换比索</displayName>
 				<displayName count="other">古巴可兑换比索</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>古巴比索</displayName>
@@ -6321,6 +6429,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>捷克克郎</displayName>
 				<displayName count="other">捷克克郎</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>东德奥斯特马克</displayName>
@@ -6341,6 +6450,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>丹麦克朗</displayName>
 				<displayName count="other">丹麦克朗</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>多米尼加比索</displayName>
@@ -6372,6 +6482,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>埃及镑</displayName>
 				<displayName count="other">埃及镑</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>厄立特里亚纳克法</displayName>
@@ -6420,6 +6531,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>福克兰群岛镑</displayName>
 				<displayName count="other">福克兰群岛镑</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>法国法郎</displayName>
@@ -6441,6 +6553,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>格鲁吉亚拉里</displayName>
 				<displayName count="other">格鲁吉亚拉里</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>加纳塞第</displayName>
@@ -6467,6 +6580,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>几内亚法郎</displayName>
 				<displayName count="other">几内亚法郎</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>几内亚西里</displayName>
@@ -6487,6 +6601,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>危地马拉格查尔</displayName>
 				<displayName count="other">危地马拉格查尔</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>葡萄牙几内亚埃斯库多</displayName>
@@ -6514,6 +6629,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>洪都拉斯伦皮拉</displayName>
 				<displayName count="other">洪都拉斯伦皮拉</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>克罗地亚第纳尔</displayName>
@@ -6524,6 +6640,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>克罗地亚库纳</displayName>
 				<displayName count="other">克罗地亚库纳</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>海地古德</displayName>
@@ -6534,11 +6651,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>匈牙利福林</displayName>
 				<displayName count="other">匈牙利福林</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>印度尼西亚盾</displayName>
 				<displayName count="other">印度尼西亚盾</displayName>
 				<symbol draft="contributed">IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>爱尔兰镑</displayName>
@@ -6586,6 +6705,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>冰岛克朗</displayName>
 				<displayName count="other">冰岛克朗</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>意大利里拉</displayName>
@@ -6629,11 +6749,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>科摩罗法郎</displayName>
 				<displayName count="other">科摩罗法郎</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>朝鲜元</displayName>
 				<displayName count="other">朝鲜元</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRH">
 				<displayName>韩元 (1953–1962)</displayName>
@@ -6674,11 +6796,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>黎巴嫩镑</displayName>
 				<displayName count="other">黎巴嫩镑</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>斯里兰卡卢比</displayName>
 				<displayName count="other">斯里兰卡卢比</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>利比里亚元</displayName>
@@ -6760,6 +6884,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>马达加斯加阿里亚里</displayName>
 				<displayName count="other">马达加斯加阿里亚里</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>马达加斯加法郎</displayName>
@@ -6785,6 +6910,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>缅甸元</displayName>
 				<displayName count="other">缅甸元</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>蒙古图格里克</displayName>
@@ -6816,6 +6942,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>毛里求斯卢比</displayName>
 				<displayName count="other">毛里求斯卢比</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>马尔代夫卢菲亚</displayName>
@@ -6847,6 +6974,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>马来西亚林吉特</displayName>
 				<displayName count="other">马来西亚林吉特</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>莫桑比克埃斯库多</displayName>
@@ -6884,6 +7012,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>尼加拉瓜金科多巴</displayName>
 				<displayName count="other">尼加拉瓜金科多巴</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>荷兰盾</displayName>
@@ -6894,11 +7023,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>挪威克朗</displayName>
 				<displayName count="other">挪威克朗</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>尼泊尔卢比</displayName>
 				<displayName count="other">尼泊尔卢比</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>新西兰元</displayName>
@@ -6946,11 +7077,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>巴基斯坦卢比</displayName>
 				<displayName count="other">巴基斯坦卢比</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>波兰兹罗提</displayName>
 				<displayName count="other">波兰兹罗提</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>波兰兹罗提 (1950–1995)</displayName>
@@ -6997,6 +7130,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>俄罗斯卢布</displayName>
 				<displayName count="other">俄罗斯卢布</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>俄国卢布 (1991–1998)</displayName>
@@ -7008,6 +7142,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>卢旺达法郎</displayName>
 				<displayName count="other">卢旺达法郎</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>沙特里亚尔</displayName>
@@ -7044,6 +7179,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>瑞典克朗</displayName>
 				<displayName count="other">瑞典克朗</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>新加坡元</displayName>
@@ -7055,6 +7191,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>圣赫勒拿群岛磅</displayName>
 				<displayName count="other">圣赫勒拿群岛磅</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>斯洛文尼亚托拉尔</displayName>
@@ -7097,6 +7234,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>圣多美和普林西比多布拉</displayName>
 				<displayName count="other">圣多美和普林西比多布拉</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>苏联卢布</displayName>
@@ -7112,6 +7250,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>叙利亚镑</displayName>
 				<displayName count="other">叙利亚镑</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>斯威士兰里兰吉尼</displayName>
@@ -7121,7 +7260,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="THB">
 				<displayName>泰铢</displayName>
 				<displayName count="other">泰铢</displayName>
-				<symbol>฿</symbol>
+				<symbol>THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>塔吉克斯坦卢布</displayName>
@@ -7152,6 +7292,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>汤加潘加</displayName>
 				<displayName count="other">汤加潘加</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>帝汶埃斯库多</displayName>
@@ -7166,6 +7307,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">土耳其里拉</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>特立尼达和多巴哥元</displayName>
@@ -7251,6 +7393,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>委内瑞拉玻利瓦尔</displayName>
 				<displayName count="other">委内瑞拉玻利瓦尔</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>越南盾</displayName>
@@ -7298,6 +7441,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>东加勒比元</displayName>
 				<displayName count="other">东加勒比元</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>特别提款权</displayName>
@@ -7378,6 +7522,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>南非兰特</displayName>
 				<displayName count="other">南非兰特</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>赞比亚克瓦查 (1968–2012)</displayName>
@@ -7388,6 +7533,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>赞比亚克瓦查</displayName>
 				<displayName count="other">赞比亚克瓦查</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>新扎伊尔 (1993–1998)</displayName>
@@ -7433,6 +7579,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>米/秒²</displayName>
 				<unitPattern count="other">{0}米/秒²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName draft="contributed">转</displayName>
+				<unitPattern count="other" draft="contributed">{0}转</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>弧度</displayName>
+				<unitPattern count="other">{0}弧度</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>度</displayName>
+				<unitPattern count="other">{0}度</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>弧分</displayName>
 				<unitPattern count="other">{0}弧分</unitPattern>
@@ -7441,25 +7599,35 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>弧秒</displayName>
 				<unitPattern count="other">{0}弧秒</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>度</displayName>
-				<unitPattern count="other">{0}度</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>弧度</displayName>
-				<unitPattern count="other">{0}弧度</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>英亩</displayName>
-				<unitPattern count="other">{0}英亩</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>平方公里</displayName>
+				<unitPattern count="other">{0}平方公里</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>公顷</displayName>
 				<unitPattern count="other">{0}公顷</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>平方米</displayName>
+				<unitPattern count="other">{0}平方米</unitPattern>
+				<perUnitPattern draft="contributed">每平方米{0}</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>平方厘米</displayName>
 				<unitPattern count="other">{0}平方厘米</unitPattern>
+				<perUnitPattern draft="contributed">每平方厘米{0}</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>平方英里</displayName>
+				<unitPattern count="other">{0}平方英里</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>英亩</displayName>
+				<unitPattern count="other">{0}英亩</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>平方码</displayName>
+				<unitPattern count="other">{0}平方码</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>平方英尺</displayName>
@@ -7468,112 +7636,114 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="area-square-inch">
 				<displayName>平方英寸</displayName>
 				<unitPattern count="other">{0}平方英寸</unitPattern>
+				<perUnitPattern draft="contributed">每平方英寸{0}</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>平方公里</displayName>
-				<unitPattern count="other">{0}平方公里</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>平方米</displayName>
-				<unitPattern count="other">{0}平方米</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>平方英里</displayName>
-				<unitPattern count="other">{0}平方英里</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>平方码</displayName>
-				<unitPattern count="other">{0}平方码</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>克拉</displayName>
+				<unitPattern count="other">{0}克拉</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>升每公里</displayName>
-				<unitPattern count="other">{0}升每公里</unitPattern>
+				<unitPattern count="other">每公里{0}升</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName draft="contributed">升/100千米</displayName>
+				<unitPattern count="other" draft="contributed">{0}升/100千米</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>英里每加仑</displayName>
-				<unitPattern count="other">{0}英里每加仑</unitPattern>
-			</unit>
-			<unit type="digital-bit">
-				<displayName>比特</displayName>
-				<unitPattern count="other">{0}比特</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>字节</displayName>
-				<unitPattern count="other">{0}字节</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>吉比特</displayName>
-				<unitPattern count="other">{0}吉比特</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>吉字节</displayName>
-				<unitPattern count="other">{0}吉字节</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>千比特</displayName>
-				<unitPattern count="other">{0}千比特</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>千字节</displayName>
-				<unitPattern count="other">{0}千字节</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>兆比特</displayName>
-				<unitPattern count="other">{0}兆比特</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>兆字节</displayName>
-				<unitPattern count="other">{0}兆字节</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>太比特</displayName>
-				<unitPattern count="other">{0}太比特</unitPattern>
+				<unitPattern count="other">每加仑{0}英里</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
 				<displayName>太字节</displayName>
 				<unitPattern count="other">{0}太字节</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>太比特</displayName>
+				<unitPattern count="other">{0}太比特</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>吉字节</displayName>
+				<unitPattern count="other">{0}吉字节</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>吉比特</displayName>
+				<unitPattern count="other">{0}吉比特</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>兆字节</displayName>
+				<unitPattern count="other">{0}兆字节</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>兆比特</displayName>
+				<unitPattern count="other">{0}兆比特</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>千字节</displayName>
+				<unitPattern count="other">{0}千字节</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>千比特</displayName>
+				<unitPattern count="other">{0}千比特</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>字节</displayName>
+				<unitPattern count="other">{0}字节</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>比特</displayName>
+				<unitPattern count="other">{0}比特</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="contributed">世纪</displayName>
+				<unitPattern count="other" draft="contributed">{0}世纪</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>年</displayName>
+				<unitPattern count="other">{0}年</unitPattern>
+				<perUnitPattern draft="contributed">每年{0}</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>个月</displayName>
+				<unitPattern count="other">{0}个月</unitPattern>
+				<perUnitPattern draft="contributed">每月{0}</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>周</displayName>
+				<unitPattern count="other">{0}周</unitPattern>
+				<perUnitPattern draft="contributed">每周{0}</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>天</displayName>
 				<unitPattern count="other">{0}天</unitPattern>
+				<perUnitPattern draft="contributed">每天{0}</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>小时</displayName>
 				<unitPattern count="other">{0}小时</unitPattern>
 				<perUnitPattern>{0}/小时</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>微秒</displayName>
-				<unitPattern count="other">{0}微秒</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>毫秒</displayName>
-				<unitPattern count="other">{0}毫秒</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>分钟</displayName>
 				<unitPattern count="other">{0}分钟</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>个月</displayName>
-				<unitPattern count="other">{0}个月</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>纳秒</displayName>
-				<unitPattern count="other">{0}纳秒</unitPattern>
+				<perUnitPattern draft="contributed">每分钟{0}</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>秒钟</displayName>
 				<unitPattern count="other">{0}秒钟</unitPattern>
 				<perUnitPattern>{0}/秒</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>周</displayName>
-				<unitPattern count="other">{0}周</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>毫秒</displayName>
+				<unitPattern count="other">{0}毫秒</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>年</displayName>
-				<unitPattern count="other">{0}年</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>微秒</displayName>
+				<unitPattern count="other">{0}微秒</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>纳秒</displayName>
+				<unitPattern count="other">{0}纳秒</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>安培</displayName>
@@ -7591,6 +7761,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>伏特</displayName>
 				<unitPattern count="other">{0}伏特</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>千卡</displayName>
+				<unitPattern count="other">{0}千卡</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>卡路里</displayName>
 				<unitPattern count="other">{0}卡路里</unitPattern>
@@ -7599,18 +7773,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>卡路里</displayName>
 				<unitPattern count="other">{0}卡路里</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>焦耳</displayName>
-				<unitPattern count="other">{0}焦耳</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>千卡</displayName>
-				<unitPattern count="other">{0}千卡</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>千焦</displayName>
 				<unitPattern count="other">{0}千焦</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>焦耳</displayName>
+				<unitPattern count="other">{0}焦耳</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>千瓦时</displayName>
 				<unitPattern count="other">{0}千瓦时</unitPattern>
@@ -7619,154 +7789,175 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>吉赫</displayName>
 				<unitPattern count="other">{0}吉赫</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>赫兹</displayName>
-				<unitPattern count="other">{0}赫兹</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>兆赫</displayName>
+				<unitPattern count="other">{0}兆赫</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>千赫</displayName>
 				<unitPattern count="other">{0}千赫</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>兆赫</displayName>
-				<unitPattern count="other">{0}兆赫</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>赫兹</displayName>
+				<unitPattern count="other">{0}赫兹</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName draft="contributed">天文单位</displayName>
-				<unitPattern count="other" draft="contributed">{0}天文单位</unitPattern>
+			<unit type="length-kilometer">
+				<displayName draft="contributed">公里</displayName>
+				<unitPattern count="other">{0}公里</unitPattern>
+				<perUnitPattern draft="contributed">每公里{0}</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">厘米</displayName>
-				<unitPattern count="other">{0}厘米</unitPattern>
+			<unit type="length-meter">
+				<displayName draft="contributed">米</displayName>
+				<unitPattern count="other">{0}米</unitPattern>
+				<perUnitPattern draft="contributed">每米{0}</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName draft="contributed">分米</displayName>
 				<unitPattern count="other" draft="contributed">{0}分米</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName draft="contributed">英尺</displayName>
-				<unitPattern count="other">{0}英尺</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="contributed">英寸</displayName>
-				<unitPattern count="other">{0}英寸</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName draft="contributed">公里</displayName>
-				<unitPattern count="other">{0}公里</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName draft="contributed">光年</displayName>
-				<unitPattern count="other">{0}光年</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName draft="contributed">米</displayName>
-				<unitPattern count="other">{0}米</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName draft="contributed">微米</displayName>
-				<unitPattern count="other" draft="contributed">{0}微米</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName draft="contributed">英里</displayName>
-				<unitPattern count="other">{0}英里</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="contributed">厘米</displayName>
+				<unitPattern count="other">{0}厘米</unitPattern>
+				<perUnitPattern draft="contributed">每厘米{0}</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>毫米</displayName>
 				<unitPattern count="other">{0}毫米</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName draft="contributed">微米</displayName>
+				<unitPattern count="other" draft="contributed">{0}微米</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>纳米</displayName>
 				<unitPattern count="other">{0}纳米</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>海里</displayName>
-				<unitPattern count="other">{0}海里</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>秒差距</displayName>
-				<unitPattern count="other">{0}秒差距</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>皮米</displayName>
 				<unitPattern count="other">{0}皮米</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName draft="contributed">英里</displayName>
+				<unitPattern count="other">{0}英里</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>码</displayName>
 				<unitPattern count="other">{0}码</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName draft="contributed">英尺</displayName>
+				<unitPattern count="other">{0}英尺</unitPattern>
+				<perUnitPattern draft="contributed">每英尺{0}</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="contributed">英寸</displayName>
+				<unitPattern count="other">{0}英寸</unitPattern>
+				<perUnitPattern draft="contributed">每英寸{0}</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>秒差距</displayName>
+				<unitPattern count="other">{0}秒差距</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="contributed">光年</displayName>
+				<unitPattern count="other">{0}光年</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName draft="contributed">天文单位</displayName>
+				<unitPattern count="other" draft="contributed">{0}天文单位</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>海里</displayName>
+				<unitPattern count="other">{0}海里</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="contributed">斯堪的纳维亚英里</displayName>
+				<unitPattern count="other" draft="contributed">{0}斯堪的纳维亚英里</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>勒克斯</displayName>
 				<unitPattern count="other">{0}勒克斯</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>克拉</displayName>
-				<unitPattern count="other">{0}克拉</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>克</displayName>
-				<unitPattern count="other">{0}克</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>千克</displayName>
-				<unitPattern count="other">{0}千克</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>公吨</displayName>
 				<unitPattern count="other">{0}公吨</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>微克</displayName>
-				<unitPattern count="other">{0}微克</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>千克</displayName>
+				<unitPattern count="other">{0}千克</unitPattern>
+				<perUnitPattern draft="contributed">每千克{0}</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>克</displayName>
+				<unitPattern count="other">{0}克</unitPattern>
+				<perUnitPattern draft="contributed">每克{0}</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>毫克</displayName>
 				<unitPattern count="other">{0}毫克</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>盎司</displayName>
-				<unitPattern count="other">{0}盎司</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>金衡制盎司</displayName>
-				<unitPattern count="other">{0}金衡制盎司</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>磅</displayName>
-				<unitPattern count="other">{0}磅</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>微克</displayName>
+				<unitPattern count="other">{0}微克</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>吨</displayName>
 				<unitPattern count="other">{0}吨</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>磅</displayName>
+				<unitPattern count="other">{0}磅</unitPattern>
+				<perUnitPattern draft="contributed">每磅{0}</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>盎司</displayName>
+				<unitPattern count="other">{0}盎司</unitPattern>
+				<perUnitPattern draft="contributed">每盎司{0}</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>金衡制盎司</displayName>
+				<unitPattern count="other">{0}金衡制盎司</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>克拉</displayName>
+				<unitPattern count="other">{0}克拉</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>吉瓦</displayName>
 				<unitPattern count="other">{0}吉瓦</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>马力</displayName>
-				<unitPattern count="other">{0}马力</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>千瓦</displayName>
-				<unitPattern count="other">{0}千瓦</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>兆瓦</displayName>
 				<unitPattern count="other">{0}兆瓦</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>毫瓦</displayName>
-				<unitPattern count="other">{0}毫瓦</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>千瓦</displayName>
+				<unitPattern count="other">{0}千瓦</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>瓦特</displayName>
 				<unitPattern count="other">{0}瓦特</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>毫瓦</displayName>
+				<unitPattern count="other">{0}毫瓦</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>马力</displayName>
+				<unitPattern count="other">{0}马力</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>百帕斯卡</displayName>
 				<unitPattern count="other">{0}百帕斯卡</unitPattern>
 			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>毫米汞柱</displayName>
+				<unitPattern count="other">{0}毫米汞柱</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>磅/平方英寸</displayName>
+				<unitPattern count="other">每平方英寸{0}磅</unitPattern>
+			</unit>
 			<unit type="pressure-inch-hg">
 				<displayName>英寸汞柱</displayName>
 				<unitPattern count="other">{0}英寸汞柱</unitPattern>
@@ -7775,29 +7966,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>毫巴</displayName>
 				<unitPattern count="other">{0}毫巴</unitPattern>
 			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<displayName>毫米汞柱</displayName>
-				<unitPattern count="other">{0}毫米汞柱</unitPattern>
-			</unit>
-			<unit type="pressure-pound-per-square-inch">
-				<displayName>磅/平方英寸</displayName>
-				<unitPattern count="other">{0}磅每平方英寸</unitPattern>
-			</unit>
-			<unit type="proportion-karat">
-				<displayName>克拉</displayName>
-				<unitPattern count="other">{0}克拉</unitPattern>
-			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>千米每小时</displayName>
-				<unitPattern count="other">{0}千米每小时</unitPattern>
+				<unitPattern count="other">每小时{0}公里</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
 				<displayName>米每秒</displayName>
-				<unitPattern count="other">{0}米每秒</unitPattern>
+				<unitPattern count="other">每秒{0}米</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
 				<displayName>英里每小时</displayName>
-				<unitPattern count="other">{0}英里每小时</unitPattern>
+				<unitPattern count="other">每小时{0}英里</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName draft="contributed">海里/小时</displayName>
+				<unitPattern count="other" draft="contributed">{0}海里/小时</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName draft="provisional">°</displayName>
+				<unitPattern count="other" draft="provisional">{0}°</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
 				<displayName>摄氏度</displayName>
@@ -7811,26 +7998,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>开尔文</displayName>
 				<unitPattern count="other">{0}开尔文</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>英亩英尺</displayName>
-				<unitPattern count="other">{0}英亩英尺</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>厘升</displayName>
-				<unitPattern count="other">{0}厘升</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>立方厘米</displayName>
-				<unitPattern count="other">{0}立方厘米</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>立方英尺</displayName>
-				<unitPattern count="other">{0}立方英尺</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>立方英寸</displayName>
-				<unitPattern count="other">{0}立方英寸</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>立方公里</displayName>
 				<unitPattern count="other">{0}立方公里</unitPattern>
@@ -7838,6 +8005,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-cubic-meter">
 				<displayName>立方米</displayName>
 				<unitPattern count="other">{0}立方米</unitPattern>
+				<perUnitPattern draft="contributed">每立方米{0}</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>立方厘米</displayName>
+				<unitPattern count="other">{0}立方厘米</unitPattern>
+				<perUnitPattern draft="contributed">每立方厘米{0}</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>立方英里</displayName>
@@ -7847,21 +8020,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>立方码</displayName>
 				<unitPattern count="other">{0}立方码</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>杯</displayName>
-				<unitPattern count="other">{0}杯</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>立方英尺</displayName>
+				<unitPattern count="other">{0}立方英尺</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>分升</displayName>
-				<unitPattern count="other">{0}分升</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>立方英寸</displayName>
+				<unitPattern count="other">{0}立方英寸</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>液盎司</displayName>
-				<unitPattern count="other">{0}液盎司</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>加仑</displayName>
-				<unitPattern count="other">{0}加仑</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>兆升</displayName>
+				<unitPattern count="other">{0}兆升</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>公石</displayName>
@@ -7870,23 +8039,53 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-liter">
 				<displayName>公升</displayName>
 				<unitPattern count="other">{0}公升</unitPattern>
+				<perUnitPattern draft="contributed">每公升{0}</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>兆升</displayName>
-				<unitPattern count="other">{0}兆升</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>分升</displayName>
+				<unitPattern count="other">{0}分升</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>厘升</displayName>
+				<unitPattern count="other">{0}厘升</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>毫升</displayName>
 				<unitPattern count="other">{0}毫升</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>品脱</displayName>
-				<unitPattern count="other">{0}品脱</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName draft="contributed">公制品脱</displayName>
+				<unitPattern count="other" draft="contributed">{0}公制品脱</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName draft="contributed">公制杯</displayName>
+				<unitPattern count="other" draft="contributed">{0}公制杯</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>英亩英尺</displayName>
+				<unitPattern count="other">{0}英亩英尺</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>加仑</displayName>
+				<unitPattern count="other">{0}加仑</unitPattern>
+				<perUnitPattern draft="contributed">每加仑{0}</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>夸脱</displayName>
 				<unitPattern count="other">{0}夸脱</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>品脱</displayName>
+				<unitPattern count="other">{0}品脱</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>杯</displayName>
+				<unitPattern count="other">{0}杯</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>液盎司</displayName>
+				<unitPattern count="other">{0}液盎司</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>汤匙</displayName>
 				<unitPattern count="other">{0}汤匙</unitPattern>
@@ -7895,6 +8094,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>茶匙</displayName>
 				<unitPattern count="other">{0}茶匙</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">东经{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">北纬{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">南纬{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">西经{0}</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -7908,6 +8113,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>米/秒²</displayName>
 				<unitPattern count="other">{0}米/秒²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName draft="contributed">转</displayName>
+				<unitPattern count="other" draft="contributed">{0}转</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>弧度</displayName>
+				<unitPattern count="other">{0}弧度</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>度</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>弧分</displayName>
 				<unitPattern count="other">{0}弧分</unitPattern>
@@ -7916,139 +8133,151 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>弧秒</displayName>
 				<unitPattern count="other">{0}弧秒</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>度</displayName>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>弧度</displayName>
-				<unitPattern count="other">{0}弧度</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>英亩</displayName>
-				<unitPattern count="other">{0}英亩</unitPattern>
-			</unit>
-			<unit type="area-hectare">
-				<displayName>公顷</displayName>
-				<unitPattern count="other">{0} ha</unitPattern>
-			</unit>
-			<unit type="area-square-centimeter">
-				<displayName>平方厘米</displayName>
-				<unitPattern count="other">{0}平方厘米</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<displayName>平方英尺</displayName>
-				<unitPattern count="other">{0} ft²</unitPattern>
-			</unit>
-			<unit type="area-square-inch">
-				<displayName>平方英寸</displayName>
-				<unitPattern count="other">{0}平方英寸</unitPattern>
-			</unit>
 			<unit type="area-square-kilometer">
 				<displayName>平方公里</displayName>
 				<unitPattern count="other">{0}平方公里</unitPattern>
 			</unit>
+			<unit type="area-hectare">
+				<displayName>公顷</displayName>
+				<unitPattern count="other">{0}公顷</unitPattern>
+			</unit>
 			<unit type="area-square-meter">
 				<displayName>平方米</displayName>
 				<unitPattern count="other">{0}平方米</unitPattern>
+				<perUnitPattern draft="contributed">{0}/平方米</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>平方厘米</displayName>
+				<unitPattern count="other">{0}平方厘米</unitPattern>
+				<perUnitPattern draft="contributed">{0}/平方厘米</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
 				<displayName>平方英里</displayName>
 				<unitPattern count="other">{0}平方英里</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<displayName>英亩</displayName>
+				<unitPattern count="other">{0}英亩</unitPattern>
+			</unit>
 			<unit type="area-square-yard">
 				<displayName>平方码</displayName>
 				<unitPattern count="other">{0}平方码</unitPattern>
 			</unit>
+			<unit type="area-square-foot">
+				<displayName>平方英尺</displayName>
+				<unitPattern count="other">{0}平方英尺</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>平方英寸</displayName>
+				<unitPattern count="other">{0}平方英寸</unitPattern>
+				<perUnitPattern draft="contributed">{0}/平方英寸</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>克拉</displayName>
+				<unitPattern count="other">{0}克拉</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>升/公里</displayName>
-				<unitPattern count="other">{0}升/公里</unitPattern>
+				<unitPattern count="other">每公里{0}升</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName draft="contributed">升/100千米</displayName>
+				<unitPattern count="other">{0}升/100千米</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>英里/加仑</displayName>
-				<unitPattern count="other">{0}英里/加仑</unitPattern>
-			</unit>
-			<unit type="digital-bit">
-				<displayName>比特</displayName>
-				<unitPattern count="other">{0}比特</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>字节</displayName>
-				<unitPattern count="other">{0}字节</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>吉比特</displayName>
-				<unitPattern count="other">{0}吉比特</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>吉字节</displayName>
-				<unitPattern count="other">{0}吉字节</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>千比特</displayName>
-				<unitPattern count="other">{0}千比特</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>千字节</displayName>
-				<unitPattern count="other">{0}千字节</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>兆比特</displayName>
-				<unitPattern count="other">{0}兆比特</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>兆字节</displayName>
-				<unitPattern count="other">{0}兆字节</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>太比特</displayName>
-				<unitPattern count="other">{0}太比特</unitPattern>
+				<unitPattern count="other">每加仑{0}英里</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
 				<displayName>太字节</displayName>
 				<unitPattern count="other">{0}太字节</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>太比特</displayName>
+				<unitPattern count="other">{0}太比特</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>吉字节</displayName>
+				<unitPattern count="other">{0}吉字节</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>吉比特</displayName>
+				<unitPattern count="other">{0}吉比特</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>兆字节</displayName>
+				<unitPattern count="other">{0}兆字节</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>兆比特</displayName>
+				<unitPattern count="other">{0}兆比特</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>千字节</displayName>
+				<unitPattern count="other">{0}千字节</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>千比特</displayName>
+				<unitPattern count="other">{0}千比特</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>字节</displayName>
+				<unitPattern count="other">{0}字节</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>比特</displayName>
+				<unitPattern count="other">{0}比特</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="contributed">世纪</displayName>
+				<unitPattern count="other" draft="contributed">{0}世纪</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>年</displayName>
+				<unitPattern count="other">{0}年</unitPattern>
+				<perUnitPattern draft="contributed">{0}/年</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>个月</displayName>
+				<unitPattern count="other">{0}个月</unitPattern>
+				<perUnitPattern draft="contributed">{0}/月</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>周</displayName>
+				<unitPattern count="other">{0}周</unitPattern>
+				<perUnitPattern draft="contributed">{0}/周</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>天</displayName>
 				<unitPattern count="other">{0}天</unitPattern>
+				<perUnitPattern draft="contributed">{0}/天</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>小时</displayName>
 				<unitPattern count="other">{0}小时</unitPattern>
 				<perUnitPattern>{0}/小时</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>微秒</displayName>
-				<unitPattern count="other">{0}微秒</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>毫秒</displayName>
-				<unitPattern count="other">{0}毫秒</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>分钟</displayName>
 				<unitPattern count="other">{0}分钟</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>个月</displayName>
-				<unitPattern count="other">{0}个月</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>纳秒</displayName>
-				<unitPattern count="other">{0}纳秒</unitPattern>
+				<perUnitPattern draft="contributed">{0}/分钟</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>秒</displayName>
 				<unitPattern count="other">{0}秒</unitPattern>
 				<perUnitPattern>{0}/秒</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>周</displayName>
-				<unitPattern count="other">{0}周</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>毫秒</displayName>
+				<unitPattern count="other">{0}毫秒</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>年</displayName>
-				<unitPattern count="other">{0}年</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>微秒</displayName>
+				<unitPattern count="other">{0}微秒</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>纳秒</displayName>
+				<unitPattern count="other">{0}纳秒</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>安培</displayName>
@@ -8066,6 +8295,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>伏特</displayName>
 				<unitPattern count="other">{0}伏</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>千卡</displayName>
+				<unitPattern count="other">{0}千卡</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>卡</displayName>
 				<unitPattern count="other">{0}卡</unitPattern>
@@ -8074,18 +8307,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>卡</displayName>
 				<unitPattern count="other">{0}卡</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>焦耳</displayName>
-				<unitPattern count="other">{0}焦耳</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>千卡</displayName>
-				<unitPattern count="other">{0}千卡</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>千焦</displayName>
 				<unitPattern count="other">{0}千焦</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>焦耳</displayName>
+				<unitPattern count="other">{0}焦耳</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>千瓦时</displayName>
 				<unitPattern count="other">{0}千瓦时</unitPattern>
@@ -8094,154 +8323,175 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>吉赫</displayName>
 				<unitPattern count="other">{0}吉赫</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>赫兹</displayName>
-				<unitPattern count="other">{0}赫</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>兆赫</displayName>
+				<unitPattern count="other">{0}兆赫</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>千赫</displayName>
 				<unitPattern count="other">{0}千赫</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>兆赫</displayName>
-				<unitPattern count="other">{0}兆赫</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>赫兹</displayName>
+				<unitPattern count="other">{0}赫</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName draft="contributed">天文单位</displayName>
-				<unitPattern count="other" draft="contributed">{0}天文单位</unitPattern>
+			<unit type="length-kilometer">
+				<displayName draft="contributed">公里</displayName>
+				<unitPattern count="other">{0}公里</unitPattern>
+				<perUnitPattern draft="contributed">{0}/公里</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">厘米</displayName>
-				<unitPattern count="other">{0}厘米</unitPattern>
+			<unit type="length-meter">
+				<displayName draft="contributed">米</displayName>
+				<unitPattern count="other">{0}米</unitPattern>
+				<perUnitPattern draft="contributed">{0}/米</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName draft="contributed">分米</displayName>
 				<unitPattern count="other" draft="contributed">{0}分米</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName draft="contributed">英尺</displayName>
-				<unitPattern count="other">{0}英尺</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="contributed">英寸</displayName>
-				<unitPattern count="other">{0}英寸</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName draft="contributed">公里</displayName>
-				<unitPattern count="other">{0}公里</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName draft="contributed">光年</displayName>
-				<unitPattern count="other" draft="contributed">{0} ly</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName draft="contributed">米</displayName>
-				<unitPattern count="other" draft="contributed">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName draft="contributed">微米</displayName>
-				<unitPattern count="other" draft="contributed">{0}微米</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName draft="contributed">英里</displayName>
-				<unitPattern count="other">{0}英里</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="contributed">厘米</displayName>
+				<unitPattern count="other">{0}厘米</unitPattern>
+				<perUnitPattern draft="contributed">{0}/厘米</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>毫米</displayName>
 				<unitPattern count="other">{0}毫米</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName draft="contributed">微米</displayName>
+				<unitPattern count="other" draft="contributed">{0}微米</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>纳米</displayName>
 				<unitPattern count="other">{0}纳米</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>海里</displayName>
-				<unitPattern count="other">{0}海里</unitPattern>
+			<unit type="length-picometer">
+				<displayName>皮米</displayName>
+				<unitPattern count="other">{0} 皮米</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName draft="contributed">英里</displayName>
+				<unitPattern count="other">{0}英里</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>码</displayName>
+				<unitPattern count="other">{0} 码</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName draft="contributed">英尺</displayName>
+				<unitPattern count="other">{0}英尺</unitPattern>
+				<perUnitPattern draft="contributed">{0}/英尺</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="contributed">英寸</displayName>
+				<unitPattern count="other">{0}英寸</unitPattern>
+				<perUnitPattern draft="contributed">{0}/英寸</perUnitPattern>
 			</unit>
 			<unit type="length-parsec">
 				<displayName>秒差距</displayName>
 				<unitPattern count="other">{0}秒差距</unitPattern>
 			</unit>
-			<unit type="length-picometer">
-				<displayName>皮米</displayName>
-				<unitPattern count="other" draft="contributed">{0} pm</unitPattern>
+			<unit type="length-light-year">
+				<displayName draft="contributed">光年</displayName>
+				<unitPattern count="other">{0}光年</unitPattern>
 			</unit>
-			<unit type="length-yard">
-				<displayName>码</displayName>
-				<unitPattern count="other" draft="contributed">{0} yd</unitPattern>
+			<unit type="length-astronomical-unit">
+				<displayName draft="contributed">天文单位</displayName>
+				<unitPattern count="other" draft="contributed">{0}天文单位</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>海里</displayName>
+				<unitPattern count="other">{0}海里</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="contributed">斯堪的纳维亚英里</displayName>
+				<unitPattern count="other" draft="contributed">{0}斯堪的纳维亚英里</unitPattern>
 			</unit>
 			<unit type="light-lux">
 				<displayName>勒克斯</displayName>
 				<unitPattern count="other">{0}勒克斯</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>克拉</displayName>
-				<unitPattern count="other">{0}克拉</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>克</displayName>
-				<unitPattern count="other">{0}克</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>千克</displayName>
-				<unitPattern count="other">{0}千克</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>公吨</displayName>
 				<unitPattern count="other">{0}公吨</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>微克</displayName>
-				<unitPattern count="other">{0}微克</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>千克</displayName>
+				<unitPattern count="other">{0}千克</unitPattern>
+				<perUnitPattern draft="contributed">{0}/千克</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>克</displayName>
+				<unitPattern count="other">{0}克</unitPattern>
+				<perUnitPattern draft="contributed">{0}/克</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>毫克</displayName>
 				<unitPattern count="other">{0}毫克</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>盎司</displayName>
-				<unitPattern count="other">{0}盎司</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>金衡制盎司</displayName>
-				<unitPattern count="other">{0}金衡制盎司</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>磅</displayName>
-				<unitPattern count="other">{0}磅</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>微克</displayName>
+				<unitPattern count="other">{0}微克</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>吨</displayName>
 				<unitPattern count="other">{0}吨</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>磅</displayName>
+				<unitPattern count="other">{0}磅</unitPattern>
+				<perUnitPattern draft="contributed">{0}/磅</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>盎司</displayName>
+				<unitPattern count="other">{0}盎司</unitPattern>
+				<perUnitPattern draft="contributed">{0}/盎司</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>金衡制盎司</displayName>
+				<unitPattern count="other">{0}金衡制盎司</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>克拉</displayName>
+				<unitPattern count="other">{0}克拉</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>吉瓦</displayName>
 				<unitPattern count="other">{0}吉瓦</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>马力</displayName>
-				<unitPattern count="other">{0}马力</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>千瓦</displayName>
-				<unitPattern count="other">{0}千瓦</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>兆瓦</displayName>
 				<unitPattern count="other">{0}兆瓦</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>毫瓦</displayName>
-				<unitPattern count="other">{0}毫瓦</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>千瓦</displayName>
+				<unitPattern count="other">{0}千瓦</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>瓦特</displayName>
 				<unitPattern count="other">{0}瓦</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>毫瓦</displayName>
+				<unitPattern count="other">{0}毫瓦</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>马力</displayName>
+				<unitPattern count="other">{0}马力</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>百帕斯卡</displayName>
 				<unitPattern count="other">{0}百帕</unitPattern>
 			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>毫米汞柱</displayName>
+				<unitPattern count="other">{0}毫米汞柱</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>磅/平方英寸</displayName>
+				<unitPattern count="other">每平方英寸{0}磅</unitPattern>
+			</unit>
 			<unit type="pressure-inch-hg">
 				<displayName>英寸汞柱</displayName>
 				<unitPattern count="other">{0}英寸汞柱</unitPattern>
@@ -8250,29 +8500,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>毫巴</displayName>
 				<unitPattern count="other">{0}毫巴</unitPattern>
 			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<displayName>毫米汞柱</displayName>
-				<unitPattern count="other">{0}毫米汞柱</unitPattern>
-			</unit>
-			<unit type="pressure-pound-per-square-inch">
-				<displayName>磅/平方英寸</displayName>
-				<unitPattern count="other">{0}磅/平方英寸</unitPattern>
-			</unit>
-			<unit type="proportion-karat">
-				<displayName>克拉</displayName>
-				<unitPattern count="other">{0}克拉</unitPattern>
-			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>千米/小时</displayName>
-				<unitPattern count="other">{0}千米/小时</unitPattern>
+				<unitPattern count="other">每小时{0}公里</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
 				<displayName>米/秒</displayName>
-				<unitPattern count="other">{0}米/秒</unitPattern>
+				<unitPattern count="other">每秒{0}米</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
 				<displayName>英里/小时</displayName>
-				<unitPattern count="other">{0}英里/小时</unitPattern>
+				<unitPattern count="other">每小时{0}英里</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName draft="contributed">海里/小时</displayName>
+				<unitPattern count="other" draft="contributed">{0}海里/小时</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName draft="contributed">°</displayName>
+				<unitPattern count="other" draft="contributed">{0}°</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
 				<displayName>摄氏度</displayName>
@@ -8286,26 +8532,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>开</displayName>
 				<unitPattern count="other">{0}K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>英亩英尺</displayName>
-				<unitPattern count="other">{0}英亩英尺</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>厘升</displayName>
-				<unitPattern count="other">{0}厘升</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>立方厘米</displayName>
-				<unitPattern count="other">{0}立方厘米</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>立方英尺</displayName>
-				<unitPattern count="other">{0}立方英尺</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>立方英寸</displayName>
-				<unitPattern count="other">{0}立方英寸</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>立方公里</displayName>
 				<unitPattern count="other">{0}立方公里</unitPattern>
@@ -8313,6 +8539,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-cubic-meter">
 				<displayName>立方米</displayName>
 				<unitPattern count="other">{0}立方米</unitPattern>
+				<perUnitPattern draft="contributed">{0}/立方米</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>立方厘米</displayName>
+				<unitPattern count="other">{0}立方厘米</unitPattern>
+				<perUnitPattern draft="contributed">{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>立方英里</displayName>
@@ -8322,21 +8554,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>立方码</displayName>
 				<unitPattern count="other">{0}立方码</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>杯</displayName>
-				<unitPattern count="other">{0}杯</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>立方英尺</displayName>
+				<unitPattern count="other">{0}立方英尺</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>分升</displayName>
-				<unitPattern count="other">{0}分升</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>立方英寸</displayName>
+				<unitPattern count="other">{0}立方英寸</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>液盎司</displayName>
-				<unitPattern count="other">{0}液盎司</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>加仑</displayName>
-				<unitPattern count="other">{0}加仑</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>兆升</displayName>
+				<unitPattern count="other">{0}兆升</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>公石</displayName>
@@ -8345,23 +8573,53 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-liter">
 				<displayName>公升</displayName>
 				<unitPattern count="other">{0}升</unitPattern>
+				<perUnitPattern draft="contributed">{0}/公升</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>兆升</displayName>
-				<unitPattern count="other">{0}兆升</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>分升</displayName>
+				<unitPattern count="other">{0}分升</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>厘升</displayName>
+				<unitPattern count="other">{0}厘升</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>毫升</displayName>
 				<unitPattern count="other">{0}毫升</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>品脱</displayName>
-				<unitPattern count="other">{0}品脱</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName draft="contributed">公制品脱</displayName>
+				<unitPattern count="other" draft="contributed">{0}公制品脱</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName draft="contributed">公制杯</displayName>
+				<unitPattern count="other" draft="contributed">{0}公制杯</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>英亩英尺</displayName>
+				<unitPattern count="other">{0}英亩英尺</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>加仑</displayName>
+				<unitPattern count="other">{0}加仑</unitPattern>
+				<perUnitPattern draft="contributed">{0}/加仑</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>夸脱</displayName>
 				<unitPattern count="other">{0}夸脱</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>品脱</displayName>
+				<unitPattern count="other">{0}品脱</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>杯</displayName>
+				<unitPattern count="other">{0}杯</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>液盎司</displayName>
+				<unitPattern count="other">{0}液盎司</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>汤匙</displayName>
 				<unitPattern count="other">{0}汤匙</unitPattern>
@@ -8370,6 +8628,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>茶匙</displayName>
 				<unitPattern count="other">{0}茶匙</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">东经{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">北纬{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">南纬{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">西经{0}</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -8378,33 +8642,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="acceleration-g-force">
 				<unitPattern count="other">{0}G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="other">{0}′</unitPattern>
 			</unit>
 			<unit type="angle-arc-second">
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="other">{0}ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<unitPattern count="other">{0}km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="other">{0}ha</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="other">{0}ft²</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="other">{0}km²</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="other">{0}m²</unitPattern>
 			</unit>
 			<unit type="area-square-mile">
 				<unitPattern count="other">{0}mi²</unitPattern>
 			</unit>
+			<unit type="area-acre">
+				<unitPattern count="other">{0}ac</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="other">{0}ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName draft="contributed">L/100km</displayName>
+				<unitPattern count="other" draft="contributed">{0}L/100km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>年</displayName>
+				<unitPattern count="other">{0}年</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>个月</displayName>
+				<unitPattern count="other">{0}个月</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>周</displayName>
+				<unitPattern count="other">{0}周</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>天</displayName>
 				<unitPattern count="other">{0}天</unitPattern>
@@ -8413,53 +8693,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>小时</displayName>
 				<unitPattern count="other">{0}小时</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>毫秒</displayName>
-				<unitPattern count="other">{0}毫秒</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>分钟</displayName>
 				<unitPattern count="other">{0}分钟</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>个月</displayName>
-				<unitPattern count="other">{0}个月</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>秒</displayName>
 				<unitPattern count="other">{0}秒</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>周</displayName>
-				<unitPattern count="other">{0}周</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>年</displayName>
-				<unitPattern count="other">{0}年</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="contributed">厘米</displayName>
-				<unitPattern count="other">{0}厘米</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="other" draft="contributed">{0}′</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>毫秒</displayName>
+				<unitPattern count="other">{0}毫秒</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="contributed">公里</displayName>
 				<unitPattern count="other">{0}公里</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="other" draft="contributed">{0}ly</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName draft="contributed">米</displayName>
 				<unitPattern count="other">{0}米</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="other" draft="contributed">{0}mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName draft="contributed">厘米</displayName>
+				<unitPattern count="other">{0}厘米</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>毫米</displayName>
@@ -8468,25 +8724,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="length-picometer">
 				<unitPattern count="other" draft="contributed">{0}pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="other" draft="contributed">{0}mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="other" draft="contributed">{0}yd</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>克</displayName>
-				<unitPattern count="other">{0}克</unitPattern>
+			<unit type="length-foot">
+				<unitPattern count="other" draft="contributed">{0}′</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="other" draft="contributed">{0}″</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="other" draft="contributed">{0}ly</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>千克</displayName>
 				<unitPattern count="other">{0}千克</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="other">{0}盎司</unitPattern>
+			<unit type="mass-gram">
+				<displayName>克</displayName>
+				<unitPattern count="other">{0}克</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="other">{0}磅</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="other">{0}hp</unitPattern>
+			<unit type="mass-ounce">
+				<unitPattern count="other">{0}盎司</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="other">{0}kW</unitPattern>
@@ -8494,6 +8759,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="power-watt">
 				<unitPattern count="other">{0}W</unitPattern>
 			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="other">{0}hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="other">{0}hPa</unitPattern>
 			</unit>
@@ -8505,7 +8773,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>千米/小时</displayName>
-				<unitPattern count="other">{0}千米/小时</unitPattern>
+				<unitPattern count="other">每小时{0}公里</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
 				<unitPattern count="other">{0}m/s</unitPattern>
@@ -8514,7 +8782,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0}mi/h</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
-				<displayName>摄氏度</displayName>
+				<displayName>°C</displayName>
 				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
@@ -8530,6 +8798,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>升</displayName>
 				<unitPattern count="other">{0}升</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hans.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hans.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans.xml
index 38cc686dbba..6646316d53c 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hans.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="zh"/>
 		<script type="Hans"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hans_CN.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_CN.xml
similarity index 69%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hans_CN.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_CN.xml
index 46499cc0feb..688b6789ec2 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hans_CN.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_CN.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="zh"/>
 		<script type="Hans"/>
 		<territory type="CN"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hans_HK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_HK.xml
similarity index 92%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hans_HK.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_HK.xml
index 65014ed6f38..4d225bdeac2 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hans_HK.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_HK.xml
@@ -1,25 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="zh"/>
 		<script type="Hans"/>
 		<territory type="HK"/>
 	</identity>
-	<localeDisplayNames>
-		<types>
-			<type type="dictionary" key="collation" draft="contributed">字典排序</type>
-			<type type="phonebook" key="collation" draft="contributed">电话簿排序</type>
-			<type type="reformed" key="collation" draft="contributed">改良排序</type>
-			<type type="traditional" key="collation" draft="contributed">传统排序</type>
-		</types>
-	</localeDisplayNames>
 	<dates>
 		<calendars>
 			<calendar type="buddhist">
@@ -231,11 +222,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</decimalFormatLength>
 		</decimalFormats>
 		<currencyFormats numberSystem="latn">
-			<currencyFormatLength>
-				<currencyFormat type="standard">
-					<pattern draft="contributed">¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
 			<unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencies>
@@ -264,13 +250,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<compoundUnit type="per">
 				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
-			<unit type="duration-second">
-				<unitPattern count="other" draft="contributed">{0}秒</unitPattern>
-			</unit>
-			<unit type="proportion-karat">
+			<unit type="concentr-karat">
 				<displayName draft="unconfirmed">开</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0}开</unitPattern>
 			</unit>
+			<unit type="duration-second">
+				<unitPattern count="other" draft="contributed">{0}秒</unitPattern>
+			</unit>
 			<unit type="temperature-kelvin">
 				<displayName draft="contributed">开氏度</displayName>
 				<unitPattern count="other" draft="contributed">{0}开氏度</unitPattern>
@@ -280,11 +266,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="acceleration-g-force">
 				<unitPattern count="other" draft="unconfirmed">{0}G力</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="other" draft="unconfirmed">{0}光年</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<unitPattern count="other" draft="unconfirmed">{0}米</unitPattern>
+			<unit type="concentr-karat">
+				<displayName draft="unconfirmed">开</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}开</unitPattern>
 			</unit>
 			<unit type="length-picometer">
 				<unitPattern count="other" draft="unconfirmed">{0}皮米</unitPattern>
@@ -292,16 +276,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="length-yard">
 				<unitPattern count="other" draft="unconfirmed">{0}码</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName draft="unconfirmed">开</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0}开</unitPattern>
-			</unit>
 			<unit type="temperature-kelvin">
 				<displayName draft="unconfirmed">开氏度</displayName>
 				<unitPattern count="other" draft="contributed">{0}°K</unitPattern>
 			</unit>
 		</unitLength>
 		<unitLength type="narrow">
+			<unit type="length-picometer">
+				<unitPattern count="other" draft="unconfirmed">{0}皮米</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<unitPattern count="other" draft="unconfirmed">{0}英里</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<unitPattern count="other" draft="unconfirmed">{0}码</unitPattern>
+			</unit>
 			<unit type="length-foot">
 				<unitPattern count="other" draft="unconfirmed">{0}英尺</unitPattern>
 			</unit>
@@ -311,15 +300,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="length-light-year">
 				<unitPattern count="other" draft="unconfirmed">{0}光年</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="other" draft="unconfirmed">{0}英里</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<unitPattern count="other" draft="unconfirmed">{0}皮米</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<unitPattern count="other" draft="unconfirmed">{0}码</unitPattern>
-			</unit>
 			<unit type="temperature-celsius">
 				<unitPattern count="other" draft="contributed">{0}°C</unitPattern>
 			</unit>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hans_MO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_MO.xml
similarity index 89%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hans_MO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_MO.xml
index 263674004f2..28b0ebb6028 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hans_MO.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_MO.xml
@@ -1,25 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="zh"/>
 		<script type="Hans"/>
 		<territory type="MO"/>
 	</identity>
-	<localeDisplayNames>
-		<types>
-			<type type="dictionary" key="collation" draft="contributed">字典排序</type>
-			<type type="phonebook" key="collation" draft="contributed">电话簿排序</type>
-			<type type="reformed" key="collation" draft="contributed">改良排序</type>
-			<type type="traditional" key="collation" draft="contributed">传统排序</type>
-		</types>
-	</localeDisplayNames>
 	<dates>
 		<calendars>
 			<calendar type="chinese">
@@ -195,11 +186,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</dates>
 	<numbers>
 		<currencyFormats numberSystem="latn">
-			<currencyFormatLength>
-				<currencyFormat type="standard">
-					<pattern draft="contributed">¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
 			<unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencies>
@@ -230,13 +216,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<compoundUnit type="per">
 				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
-			<unit type="duration-second">
-				<unitPattern count="other" draft="contributed">{0}秒</unitPattern>
-			</unit>
-			<unit type="proportion-karat">
+			<unit type="concentr-karat">
 				<displayName draft="unconfirmed">开</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0}开</unitPattern>
 			</unit>
+			<unit type="duration-second">
+				<unitPattern count="other" draft="contributed">{0}秒</unitPattern>
+			</unit>
 			<unit type="temperature-kelvin">
 				<displayName draft="contributed">开氏度</displayName>
 				<unitPattern count="other" draft="contributed">{0}开氏度</unitPattern>
@@ -246,17 +232,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="acceleration-g-force">
 				<unitPattern count="other" draft="unconfirmed">{0}G力</unitPattern>
 			</unit>
-			<unit type="area-hectare">
-				<unitPattern count="other" draft="unconfirmed">{0}公顷</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="other" draft="unconfirmed">{0}平方英尺</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="other" draft="unconfirmed">{0}光年</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<unitPattern count="other" draft="unconfirmed">{0}米</unitPattern>
+			<unit type="concentr-karat">
+				<displayName draft="unconfirmed">开</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}开</unitPattern>
 			</unit>
 			<unit type="length-picometer">
 				<unitPattern count="other" draft="unconfirmed">{0}皮米</unitPattern>
@@ -264,16 +242,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="length-yard">
 				<unitPattern count="other" draft="unconfirmed">{0}码</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName draft="unconfirmed">开</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0}开</unitPattern>
-			</unit>
 			<unit type="temperature-kelvin">
 				<displayName draft="unconfirmed">开氏度</displayName>
 				<unitPattern count="other" draft="contributed">{0}°K</unitPattern>
 			</unit>
 		</unitLength>
 		<unitLength type="narrow">
+			<unit type="length-picometer">
+				<unitPattern count="other" draft="unconfirmed">{0}皮米</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<unitPattern count="other" draft="unconfirmed">{0}英里</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<unitPattern count="other" draft="unconfirmed">{0}码</unitPattern>
+			</unit>
 			<unit type="length-foot">
 				<unitPattern count="other" draft="unconfirmed">{0}英尺</unitPattern>
 			</unit>
@@ -283,15 +266,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="length-light-year">
 				<unitPattern count="other" draft="unconfirmed">{0}光年</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="other" draft="unconfirmed">{0}英里</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<unitPattern count="other" draft="unconfirmed">{0}皮米</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<unitPattern count="other" draft="unconfirmed">{0}码</unitPattern>
-			</unit>
 			<unit type="temperature-celsius">
 				<unitPattern count="other" draft="contributed">{0}°C</unitPattern>
 			</unit>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hans_SG.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_SG.xml
similarity index 91%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hans_SG.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_SG.xml
index d65511c97e9..e87bd745f7b 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hans_SG.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_SG.xml
@@ -1,24 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11323 $"/>
-		<generation date="$Date: 2015-02-26 15:25:28 -0600 (Thu, 26 Feb 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="zh"/>
 		<script type="Hans"/>
 		<territory type="SG"/>
 	</identity>
-	<localeDisplayNames>
-		<types>
-			<type type="dictionary" key="collation" draft="contributed">字典排序</type>
-			<type type="phonebook" key="collation" draft="contributed">电话簿排序</type>
-			<type type="traditional" key="collation" draft="contributed">传统排序</type>
-		</types>
-	</localeDisplayNames>
 	<dates>
 		<calendars>
 			<calendar type="buddhist">
@@ -228,11 +220,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 	</dates>
 	<numbers>
 		<currencyFormats numberSystem="latn">
-			<currencyFormatLength>
-				<currencyFormat type="standard">
-					<pattern draft="contributed">¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
 			<unitPattern count="other" draft="contributed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencies>
@@ -263,13 +250,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<compoundUnit type="per">
 				<compoundUnitPattern draft="contributed">{0}/{1}</compoundUnitPattern>
 			</compoundUnit>
-			<unit type="duration-second">
-				<unitPattern count="other" draft="contributed">{0}秒</unitPattern>
-			</unit>
-			<unit type="proportion-karat">
+			<unit type="concentr-karat">
 				<displayName draft="unconfirmed">开</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0}开</unitPattern>
 			</unit>
+			<unit type="duration-second">
+				<unitPattern count="other" draft="contributed">{0}秒</unitPattern>
+			</unit>
 			<unit type="temperature-kelvin">
 				<displayName draft="contributed">开氏度</displayName>
 				<unitPattern count="other" draft="contributed">{0}开氏度</unitPattern>
@@ -279,17 +266,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="acceleration-g-force">
 				<unitPattern count="other" draft="unconfirmed">{0}G力</unitPattern>
 			</unit>
-			<unit type="area-hectare">
-				<unitPattern count="other" draft="unconfirmed">{0}公顷</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="other" draft="unconfirmed">{0}平方英尺</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="other" draft="unconfirmed">{0}光年</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<unitPattern count="other" draft="unconfirmed">{0}米</unitPattern>
+			<unit type="concentr-karat">
+				<displayName draft="unconfirmed">开</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}开</unitPattern>
 			</unit>
 			<unit type="length-picometer">
 				<unitPattern count="other" draft="unconfirmed">{0}皮米</unitPattern>
@@ -297,16 +276,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="length-yard">
 				<unitPattern count="other" draft="unconfirmed">{0}码</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName draft="unconfirmed">开</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0}开</unitPattern>
-			</unit>
 			<unit type="temperature-kelvin">
 				<displayName draft="unconfirmed">开氏度</displayName>
 				<unitPattern count="other" draft="contributed">{0}°K</unitPattern>
 			</unit>
 		</unitLength>
 		<unitLength type="narrow">
+			<unit type="length-picometer">
+				<unitPattern count="other" draft="unconfirmed">{0}皮米</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<unitPattern count="other" draft="unconfirmed">{0}英里</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<unitPattern count="other" draft="unconfirmed">{0}码</unitPattern>
+			</unit>
 			<unit type="length-foot">
 				<unitPattern count="other" draft="unconfirmed">{0}英尺</unitPattern>
 			</unit>
@@ -316,15 +300,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="length-light-year">
 				<unitPattern count="other" draft="unconfirmed">{0}光年</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="other" draft="unconfirmed">{0}英里</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<unitPattern count="other" draft="unconfirmed">{0}皮米</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<unitPattern count="other" draft="unconfirmed">{0}码</unitPattern>
-			</unit>
 			<unit type="temperature-celsius">
 				<unitPattern count="other" draft="contributed">{0}°C</unitPattern>
 			</unit>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hant.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant.xml
similarity index 92%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hant.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant.xml
index f8f72f9419e..3642dd4a91f 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hant.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant.xml
@@ -6,8 +6,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11294 $"/>
-		<generation date="$Date: 2015-02-23 16:50:24 -0600 (Mon, 23 Feb 2015) $"/>
+		<version number="$Revision: 12390 $"/>
 		<language type="zh"/>
 		<script type="Hant"/>
 	</identity>
@@ -60,7 +59,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="ay">艾馬拉文</language>
 			<language type="az">亞塞拜然文</language>
 			<language type="az" alt="short">亞塞拜然文</language>
-			<language type="azb" draft="contributed">南亞塞拜然文</language>
 			<language type="ba">巴什客爾文</language>
 			<language type="bal">俾路支文</language>
 			<language type="ban">峇里文</language>
@@ -77,6 +75,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="bfd" draft="contributed">富特文</language>
 			<language type="bfq" draft="contributed">巴達加文</language>
 			<language type="bg">保加利亞文</language>
+			<language type="bgn">西俾路支文</language>
 			<language type="bho">博傑普爾文</language>
 			<language type="bi">比斯拉馬文</language>
 			<language type="bik">比科爾文</language>
@@ -162,7 +161,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="enm">中古英文</language>
 			<language type="eo">世界文</language>
 			<language type="es">西班牙文</language>
-			<language type="es_ES" draft="provisional">西班牙文（歐洲）</language>
 			<language type="esu" draft="contributed">中尤皮克文</language>
 			<language type="et">愛沙尼亞文</language>
 			<language type="eu">巴斯克文</language>
@@ -327,6 +325,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lo">寮文</language>
 			<language type="lol">芒戈文</language>
 			<language type="loz">洛齊文</language>
+			<language type="lrc">北盧爾文</language>
 			<language type="lt">立陶宛文</language>
 			<language type="ltg" draft="contributed">拉特加萊文</language>
 			<language type="lu">魯巴加丹加文</language>
@@ -351,7 +350,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mdr">曼達文</language>
 			<language type="men">門德文</language>
 			<language type="mer">梅魯文</language>
-			<language type="mfe" draft="contributed">克里奧文（模里西斯）</language>
+			<language type="mfe">克里奧文（模里西斯）</language>
 			<language type="mg">馬拉加什文</language>
 			<language type="mga" draft="contributed">中古愛爾蘭文</language>
 			<language type="mgh">馬夸文</language>
@@ -368,7 +367,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="moh">莫霍克文</language>
 			<language type="mos">莫西文</language>
 			<language type="mr">馬拉地文</language>
-			<language type="mrj" draft="contributed">西馬裏文</language>
+			<language type="mrj">馬里</language>
 			<language type="ms">馬來文</language>
 			<language type="mt">馬爾他文</language>
 			<language type="mua">蒙當文</language>
@@ -380,14 +379,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="my">緬甸文</language>
 			<language type="mye" draft="contributed">姆耶內文</language>
 			<language type="myv">厄爾茲亞文</language>
-			<language type="mzn" draft="contributed">瑪詹德拉尼文</language>
+			<language type="mzn">馬贊德蘭文</language>
 			<language type="na">諾魯文</language>
 			<language type="nan" draft="contributed">閩南語</language>
 			<language type="nap">拿波里文</language>
 			<language type="naq">納馬文</language>
 			<language type="nb">巴克摩挪威文</language>
 			<language type="nd">北地畢列文</language>
-			<language type="nds" draft="contributed">低地德文</language>
+			<language type="nds">低地德文</language>
+			<language type="nds_NL">低地薩克遜文</language>
 			<language type="ne">尼泊爾文</language>
 			<language type="new">尼瓦爾文</language>
 			<language type="ng">恩東加文</language>
@@ -442,7 +442,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="pro" draft="contributed">古普羅旺斯文</language>
 			<language type="ps">普什圖文</language>
 			<language type="pt">葡萄牙文</language>
-			<language type="pt_PT" draft="provisional">葡萄牙文（歐洲）</language>
 			<language type="qu">蓋楚瓦文</language>
 			<language type="quc">基切文</language>
 			<language type="qug" draft="contributed">欽博拉索海蘭蓋丘亞文</language>
@@ -480,6 +479,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sco">蘇格蘭文</language>
 			<language type="sd">信德文</language>
 			<language type="sdc" draft="contributed">薩丁尼亞-薩薩里文</language>
+			<language type="sdh">南庫爾德文</language>
 			<language type="se">北方薩米文</language>
 			<language type="see" draft="contributed">塞訥卡文</language>
 			<language type="seh">賽納文</language>
@@ -504,7 +504,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="smj">魯勒薩米文</language>
 			<language type="smn">伊納裡薩米文</language>
 			<language type="sms">斯科特薩米文</language>
-			<language type="sn">塞內加爾文</language>
+			<language type="sn">紹納文</language>
 			<language type="snk">索尼基文</language>
 			<language type="so">索馬利文</language>
 			<language type="sog">索格底亞納文</language>
@@ -522,8 +522,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="sux">蘇美文</language>
 			<language type="sv">瑞典文</language>
 			<language type="sw">史瓦希里文</language>
+			<language type="sw_CD">史瓦希里文（剛果）</language>
 			<language type="swb">葛摩文</language>
-			<language type="swc" draft="contributed">史瓦希里文（剛果）</language>
 			<language type="syc">古敘利亞文</language>
 			<language type="syr">敘利亞文</language>
 			<language type="szl" draft="contributed">西利西亞文</language>
@@ -547,7 +547,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="tli">特林基特文</language>
 			<language type="tly" draft="contributed">塔里什文</language>
 			<language type="tmh">塔馬奇克文</language>
-			<language type="tn">突尼西亞文</language>
+			<language type="tn">札那文</language>
 			<language type="to">東加文</language>
 			<language type="tog">東加文（尼亞薩）</language>
 			<language type="tpi">托比辛文</language>
@@ -590,6 +590,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="wal">瓦拉莫文</language>
 			<language type="war">瓦瑞文</language>
 			<language type="was">瓦紹文</language>
+			<language type="wbp">沃皮瑞文</language>
 			<language type="wo">沃洛夫文</language>
 			<language type="wuu" draft="contributed">吳語</language>
 			<language type="xal">卡爾梅克文</language>
@@ -823,7 +824,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">安圭拉</territory>
 			<territory type="AL">阿爾巴尼亞</territory>
 			<territory type="AM">亞美尼亞</territory>
-			<territory type="AN">荷屬安地列斯</territory>
 			<territory type="AO">安哥拉</territory>
 			<territory type="AQ">南極洲</territory>
 			<territory type="AR">阿根廷</territory>
@@ -921,7 +921,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GY">蓋亞那</territory>
 			<territory type="HK">中華人民共和國香港特別行政區</territory>
 			<territory type="HK" alt="short">香港</territory>
-			<territory type="HM">赫德及麥當勞群島</territory>
+			<territory type="HM">赫德島和麥克唐納群島</territory>
 			<territory type="HN">宏都拉斯</territory>
 			<territory type="HR">克羅埃西亞</territory>
 			<territory type="HT">海地</territory>
@@ -1045,7 +1045,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="SY">敘利亞</territory>
 			<territory type="SZ">史瓦濟蘭</territory>
 			<territory type="TA">特里斯坦達庫尼亞群島</territory>
-			<territory type="TC">英屬土克凱可群島</territory>
+			<territory type="TC">土克斯及開科斯群島</territory>
 			<territory type="TD">查德</territory>
 			<territory type="TF">法屬南方屬地</territory>
 			<territory type="TG">多哥</territory>
@@ -1076,7 +1076,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="VN">越南</territory>
 			<territory type="VU">萬那杜</territory>
 			<territory type="WF">瓦利斯和富圖納群島</territory>
-			<territory type="WS">薩摩亞群島</territory>
+			<territory type="WS">薩摩亞</territory>
 			<territory type="XK">科索沃</territory>
 			<territory type="YE">葉門</territory>
 			<territory type="YT">馬約特</territory>
@@ -1156,6 +1156,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric" draft="contributed">數字排序</key>
 			<key type="colStrength" draft="contributed">排序強度</key>
 			<key type="currency">貨幣</key>
+			<key type="hc">時間週期（12 小時制與 24 小時制）</key>
+			<key type="lb">換行樣式</key>
+			<key type="ms">度量單位系統</key>
 			<key type="numbers">數字</key>
 			<key type="timezone" draft="contributed">時區</key>
 			<key type="va" draft="contributed">區域變異</key>
@@ -1163,121 +1166,131 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x" draft="contributed">私人使用</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">阿拉伯-印度數字</type>
-			<type type="arabext" key="numbers">阿拉伯-印度擴充數字</type>
-			<type type="armn" key="numbers">亞美尼亞數字</type>
-			<type type="armnlow" key="numbers">小寫亞美尼亞數字</type>
-			<type type="bali" key="numbers" draft="contributed">峇里文數字</type>
-			<type type="beng" key="numbers">孟加拉數字</type>
-			<type type="big5han" key="collation">繁體中文排序 - Big5</type>
-			<type type="brah" key="numbers" draft="contributed">婆羅米數字</type>
-			<type type="buddhist" key="calendar">佛曆</type>
-			<type type="cakm" key="numbers" draft="contributed">查克馬數字</type>
-			<type type="cham" key="numbers" draft="contributed">占文數字</type>
-			<type type="chinese" key="calendar">農曆</type>
-			<type type="coptic" key="calendar">科普特曆</type>
-			<type type="dangi" key="calendar">檀紀曆</type>
-			<type type="deva" key="numbers">梵文數字</type>
-			<type type="dictionary" key="collation">字典排序</type>
-			<type type="ducet" key="collation">預設 Unicode 排序</type>
-			<type type="eor" key="collation" draft="contributed">歐洲排序規則</type>
-			<type type="ethi" key="numbers">衣索比亞數字</type>
-			<type type="ethiopic" key="calendar">衣索比亞曆</type>
-			<type type="ethiopic-amete-alem" key="calendar">衣索比亞曆 (Amete Alem)</type>
-			<type type="finance" key="numbers" draft="contributed">金融數字</type>
-			<type type="fullwide" key="numbers">全形數字</type>
-			<type type="gb2312han" key="collation">簡體中文排序 - GB2312</type>
-			<type type="geor" key="numbers">喬治亞數字</type>
-			<type type="gregorian" key="calendar">公曆</type>
-			<type type="grek" key="numbers">希臘數字</type>
-			<type type="greklow" key="numbers">小寫希臘數字</type>
-			<type type="gujr" key="numbers">古吉拉特數字</type>
-			<type type="guru" key="numbers">古爾穆奇數字</type>
-			<type type="hanidec" key="numbers">中文十進位數字</type>
-			<type type="hans" key="numbers">小寫簡體中文數字</type>
-			<type type="hansfin" key="numbers">大寫簡體中文數字</type>
-			<type type="hant" key="numbers">小寫繁體中文數字</type>
-			<type type="hantfin" key="numbers">大寫繁體中文數字</type>
-			<type type="hebr" key="numbers">希伯來數字</type>
-			<type type="hebrew" key="calendar">希伯來曆</type>
-			<type type="identical" key="colStrength" draft="contributed">全部排序</type>
-			<type type="indian" key="calendar">印度國曆</type>
-			<type type="islamic" key="calendar">伊斯蘭曆</type>
-			<type type="islamic-civil" key="calendar">伊斯蘭民用曆</type>
-			<type type="islamic-rgsa" key="calendar" draft="contributed">伊斯蘭新月曆</type>
-			<type type="islamic-tbla" key="calendar" draft="contributed">伊斯蘭天文曆</type>
-			<type type="islamic-umalqura" key="calendar" draft="contributed">烏姆庫拉曆</type>
-			<type type="iso8601" key="calendar">國際標準 ISO 8601</type>
-			<type type="japanese" key="calendar">日本曆</type>
-			<type type="java" key="numbers" draft="contributed">爪哇文數字</type>
-			<type type="jpan" key="numbers">小寫日文數字</type>
-			<type type="jpanfin" key="numbers">大寫日文數字</type>
-			<type type="kali" key="numbers" draft="contributed">克耶數字</type>
-			<type type="khmr" key="numbers">高棉數字</type>
-			<type type="knda" key="numbers">坎那達數字</type>
-			<type type="lana" key="numbers" draft="contributed">老傣文數字</type>
-			<type type="lanatham" key="numbers" draft="contributed">蘭納文數字</type>
-			<type type="laoo" key="numbers">寮國數字</type>
-			<type type="latn" key="numbers">阿拉伯數字</type>
-			<type type="lepc" key="numbers" draft="contributed">西納文數字</type>
-			<type type="limb" key="numbers" draft="contributed">林布文數字</type>
-			<type type="lower" key="colCaseFirst" draft="contributed">優先排序小寫</type>
-			<type type="mlym" key="numbers">馬來亞拉姆數字</type>
-			<type type="mong" key="numbers">蒙古數字</type>
-			<type type="mtei" key="numbers" draft="contributed">曼尼普爾數字</type>
-			<type type="mymr" key="numbers">緬甸數字</type>
-			<type type="mymrshan" key="numbers" draft="contributed">緬甸撣文數字</type>
-			<type type="native" key="numbers" draft="contributed">原始數字</type>
-			<type type="nkoo" key="numbers" draft="contributed">曼德數字</type>
-			<type type="no" key="colBackwards" draft="contributed">正常排序重音</type>
-			<type type="no" key="colCaseFirst" draft="contributed">正常大小寫順序排序</type>
-			<type type="no" key="colCaseLevel" draft="contributed">不分大小寫排序</type>
-			<type type="no" key="colHiraganaQuaternary" draft="contributed">個別排序假名</type>
-			<type type="no" key="colNormalization" draft="contributed">非正規化排序</type>
-			<type type="no" key="colNumeric" draft="contributed">個別排序數字</type>
-			<type type="non-ignorable" key="colAlternate" draft="contributed">排序符號</type>
-			<type type="olck" key="numbers" draft="contributed">桑塔利文數字</type>
-			<type type="orya" key="numbers">歐利亞數字</type>
-			<type type="osma" key="numbers" draft="contributed">奧斯曼亞數字</type>
-			<type type="persian" key="calendar">波斯曆</type>
-			<type type="phonebook" key="collation">電話簿排序</type>
-			<type type="phonetic" key="collation">發音排序</type>
-			<type type="pinyin" key="collation">拼音排序</type>
-			<type type="primary" key="colStrength" draft="contributed">僅排序基礎字母</type>
-			<type type="quaternary" key="colStrength" draft="contributed">排序重音/大小寫/全半形/假名</type>
-			<type type="reformed" key="collation">改良排序</type>
-			<type type="roc" key="calendar">民國曆</type>
-			<type type="roman" key="numbers">羅馬數字</type>
-			<type type="romanlow" key="numbers">小寫羅馬數字</type>
-			<type type="saur" key="numbers" draft="contributed">索拉什特拉文數字</type>
-			<type type="search" key="collation">一般用途搜尋</type>
-			<type type="searchjl" key="collation" draft="contributed">韓文子音排序</type>
-			<type type="secondary" key="colStrength" draft="contributed">排序重音</type>
-			<type type="shifted" key="colAlternate" draft="contributed">略過符號排序</type>
-			<type type="shrd" key="numbers" draft="contributed">夏拉達數字</type>
-			<type type="sora" key="numbers" draft="contributed">索朗桑朋數字</type>
-			<type type="standard" key="collation">標準排序</type>
-			<type type="stroke" key="collation">筆畫排序</type>
-			<type type="sund" key="numbers">巽他數字</type>
-			<type type="takr" key="numbers" draft="contributed">塔卡里數字</type>
-			<type type="talu" key="numbers" draft="contributed">新傣仂文數字</type>
-			<type type="taml" key="numbers">坦米爾數字</type>
-			<type type="tamldec" key="numbers">坦米爾數字</type>
-			<type type="telu" key="numbers">泰盧固數字</type>
-			<type type="tertiary" key="colStrength" draft="contributed">排序重音/大小寫/全半形</type>
-			<type type="thai" key="numbers">泰文數字</type>
-			<type type="tibt" key="numbers">西藏數字</type>
-			<type type="traditional" key="collation">傳統排序</type>
-			<type type="traditional" key="numbers" draft="contributed">傳統數字</type>
-			<type type="unihan" key="collation">部首筆畫排序</type>
-			<type type="upper" key="colCaseFirst" draft="contributed">優先排序大寫</type>
-			<type type="vaii" key="numbers" draft="contributed">瓦伊文數字</type>
-			<type type="yes" key="colBackwards" draft="contributed">依反向重音排序</type>
-			<type type="yes" key="colCaseLevel" draft="contributed">依大小寫排序</type>
-			<type type="yes" key="colHiraganaQuaternary" draft="contributed">分別排序假名</type>
-			<type type="yes" key="colNormalization" draft="contributed">依正規化排序 Unicode</type>
-			<type type="yes" key="colNumeric" draft="contributed">依數字順序排序數字</type>
-			<type type="zhuyin" key="collation">注音排序</type>
+			<type key="calendar" type="buddhist">佛曆</type>
+			<type key="calendar" type="chinese">農曆</type>
+			<type key="calendar" type="coptic">科普特曆</type>
+			<type key="calendar" type="dangi">檀紀曆</type>
+			<type key="calendar" type="ethiopic">衣索比亞曆</type>
+			<type key="calendar" type="ethiopic-amete-alem">衣索比亞曆 (Amete Alem)</type>
+			<type key="calendar" type="gregorian">公曆</type>
+			<type key="calendar" type="hebrew">希伯來曆</type>
+			<type key="calendar" type="indian">印度國曆</type>
+			<type key="calendar" type="islamic">伊斯蘭曆</type>
+			<type key="calendar" type="islamic-civil">伊斯蘭民用曆</type>
+			<type key="calendar" type="islamic-rgsa" draft="contributed">伊斯蘭新月曆</type>
+			<type key="calendar" type="islamic-tbla" draft="contributed">伊斯蘭天文曆</type>
+			<type key="calendar" type="islamic-umalqura" draft="contributed">烏姆庫拉曆</type>
+			<type key="calendar" type="iso8601">國際標準 ISO 8601</type>
+			<type key="calendar" type="japanese">日本曆</type>
+			<type key="calendar" type="persian">波斯曆</type>
+			<type key="calendar" type="roc">民國曆</type>
+			<type key="colAlternate" type="non-ignorable" draft="contributed">排序符號</type>
+			<type key="colAlternate" type="shifted" draft="contributed">略過符號排序</type>
+			<type key="colBackwards" type="no" draft="contributed">正常排序重音</type>
+			<type key="colBackwards" type="yes" draft="contributed">依反向重音排序</type>
+			<type key="colCaseFirst" type="lower" draft="contributed">優先排序小寫</type>
+			<type key="colCaseFirst" type="no" draft="contributed">正常大小寫順序排序</type>
+			<type key="colCaseFirst" type="upper" draft="contributed">優先排序大寫</type>
+			<type key="colCaseLevel" type="no" draft="contributed">不分大小寫排序</type>
+			<type key="colCaseLevel" type="yes" draft="contributed">依大小寫排序</type>
+			<type key="colHiraganaQuaternary" type="no" draft="contributed">個別排序假名</type>
+			<type key="colHiraganaQuaternary" type="yes" draft="contributed">分別排序假名</type>
+			<type key="collation" type="big5han">繁體中文排序 - Big5</type>
+			<type key="collation" type="dictionary">字典排序</type>
+			<type key="collation" type="ducet">預設 Unicode 排序</type>
+			<type key="collation" type="eor" draft="contributed">歐洲排序規則</type>
+			<type key="collation" type="gb2312han">簡體中文排序 - GB2312</type>
+			<type key="collation" type="phonebook">電話簿排序</type>
+			<type key="collation" type="phonetic">發音排序</type>
+			<type key="collation" type="pinyin">拼音排序</type>
+			<type key="collation" type="reformed">改良排序</type>
+			<type key="collation" type="search">一般用途搜尋</type>
+			<type key="collation" type="searchjl" draft="contributed">韓文子音排序</type>
+			<type key="collation" type="standard">標準排序</type>
+			<type key="collation" type="stroke">筆畫排序</type>
+			<type key="collation" type="traditional">傳統排序</type>
+			<type key="collation" type="unihan">部首筆畫排序</type>
+			<type key="collation" type="zhuyin">注音排序</type>
+			<type key="colNormalization" type="no" draft="contributed">非正規化排序</type>
+			<type key="colNormalization" type="yes" draft="contributed">依正規化排序 Unicode</type>
+			<type key="colNumeric" type="no" draft="contributed">個別排序數字</type>
+			<type key="colNumeric" type="yes" draft="contributed">依數字順序排序數字</type>
+			<type key="colStrength" type="identical" draft="contributed">全部排序</type>
+			<type key="colStrength" type="primary" draft="contributed">僅排序基礎字母</type>
+			<type key="colStrength" type="quaternary" draft="contributed">排序重音/大小寫/全半形/假名</type>
+			<type key="colStrength" type="secondary" draft="contributed">排序重音</type>
+			<type key="colStrength" type="tertiary" draft="contributed">排序重音/大小寫/全半形</type>
+			<type key="hc" type="h11">12 小時制 (0–11)</type>
+			<type key="hc" type="h12">12 小時制 (1–12)</type>
+			<type key="hc" type="h23">24 小時制 (0–23)</type>
+			<type key="hc" type="h24">24 小時制 (1–24)</type>
+			<type key="lb" type="loose">寬鬆換行樣式</type>
+			<type key="lb" type="normal">一般換行樣式</type>
+			<type key="lb" type="strict">強制換行樣式</type>
+			<type key="ms" type="metric">公制</type>
+			<type key="ms" type="uksystem">英制度量單位系統</type>
+			<type key="ms" type="ussystem">美制度量單位系統</type>
+			<type key="numbers" type="arab">阿拉伯-印度數字</type>
+			<type key="numbers" type="arabext">阿拉伯-印度擴充數字</type>
+			<type key="numbers" type="armn">亞美尼亞數字</type>
+			<type key="numbers" type="armnlow">小寫亞美尼亞數字</type>
+			<type key="numbers" type="bali" draft="contributed">峇里文數字</type>
+			<type key="numbers" type="beng">孟加拉數字</type>
+			<type key="numbers" type="brah" draft="contributed">婆羅米數字</type>
+			<type key="numbers" type="cakm" draft="contributed">查克馬數字</type>
+			<type key="numbers" type="cham" draft="contributed">占文數字</type>
+			<type key="numbers" type="deva">梵文數字</type>
+			<type key="numbers" type="ethi">衣索比亞數字</type>
+			<type key="numbers" type="finance" draft="contributed">金融數字</type>
+			<type key="numbers" type="fullwide">全形數字</type>
+			<type key="numbers" type="geor">喬治亞數字</type>
+			<type key="numbers" type="grek">希臘數字</type>
+			<type key="numbers" type="greklow">小寫希臘數字</type>
+			<type key="numbers" type="gujr">古吉拉特數字</type>
+			<type key="numbers" type="guru">古爾穆奇數字</type>
+			<type key="numbers" type="hanidec">中文十進位數字</type>
+			<type key="numbers" type="hans">小寫簡體中文數字</type>
+			<type key="numbers" type="hansfin">大寫簡體中文數字</type>
+			<type key="numbers" type="hant">小寫繁體中文數字</type>
+			<type key="numbers" type="hantfin">大寫繁體中文數字</type>
+			<type key="numbers" type="hebr">希伯來數字</type>
+			<type key="numbers" type="java" draft="contributed">爪哇文數字</type>
+			<type key="numbers" type="jpan">小寫日文數字</type>
+			<type key="numbers" type="jpanfin">大寫日文數字</type>
+			<type key="numbers" type="kali" draft="contributed">克耶數字</type>
+			<type key="numbers" type="khmr">高棉數字</type>
+			<type key="numbers" type="knda">坎那達數字</type>
+			<type key="numbers" type="lana" draft="contributed">老傣文數字</type>
+			<type key="numbers" type="lanatham" draft="contributed">蘭納文數字</type>
+			<type key="numbers" type="laoo">寮國數字</type>
+			<type key="numbers" type="latn">阿拉伯數字</type>
+			<type key="numbers" type="lepc" draft="contributed">西納文數字</type>
+			<type key="numbers" type="limb" draft="contributed">林布文數字</type>
+			<type key="numbers" type="mlym">馬來亞拉姆數字</type>
+			<type key="numbers" type="mong">蒙古數字</type>
+			<type key="numbers" type="mtei" draft="contributed">曼尼普爾數字</type>
+			<type key="numbers" type="mymr">緬甸數字</type>
+			<type key="numbers" type="mymrshan" draft="contributed">緬甸撣文數字</type>
+			<type key="numbers" type="native" draft="contributed">原始數字</type>
+			<type key="numbers" type="nkoo" draft="contributed">曼德數字</type>
+			<type key="numbers" type="olck" draft="contributed">桑塔利文數字</type>
+			<type key="numbers" type="orya">歐利亞數字</type>
+			<type key="numbers" type="osma" draft="contributed">奧斯曼亞數字</type>
+			<type key="numbers" type="roman">羅馬數字</type>
+			<type key="numbers" type="romanlow">小寫羅馬數字</type>
+			<type key="numbers" type="saur" draft="contributed">索拉什特拉文數字</type>
+			<type key="numbers" type="shrd" draft="contributed">夏拉達數字</type>
+			<type key="numbers" type="sora" draft="contributed">索朗桑朋數字</type>
+			<type key="numbers" type="sund">巽他數字</type>
+			<type key="numbers" type="takr" draft="contributed">塔卡里數字</type>
+			<type key="numbers" type="talu" draft="contributed">新傣仂文數字</type>
+			<type key="numbers" type="taml">坦米爾數字</type>
+			<type key="numbers" type="tamldec">坦米爾數字</type>
+			<type key="numbers" type="telu">泰盧固數字</type>
+			<type key="numbers" type="thai">泰文數字</type>
+			<type key="numbers" type="tibt">西藏數字</type>
+			<type key="numbers" type="traditional" draft="contributed">傳統數字</type>
+			<type key="numbers" type="vaii" draft="contributed">瓦伊文數字</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN" draft="contributed">美國地名委員會</transformName>
@@ -1365,6 +1378,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
+						<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="y">Gy年</dateFormatItem>
 						<dateFormatItem id="yyyy">Gy年</dateFormatItem>
 						<dateFormatItem id="yyyyM">Gy/M</dateFormatItem>
@@ -1373,6 +1387,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">Gy年M月d日</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">Gy年M月d日E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">Gy年QQQ</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">Gy年QQQQ</dateFormatItem>
 					</availableFormats>
@@ -1623,7 +1638,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern numbers="d=hanidays">rU年MMMdEEEE</pattern>
+							<pattern numbers="d=hanidays">rU年MMMd EEEE</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
@@ -1655,6 +1670,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MEd">M/dE</dateFormatItem>
 						<dateFormatItem id="MMMd">MMMd日</dateFormatItem>
 						<dateFormatItem id="MMMEd">MMMd日E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMMd日</dateFormatItem>
 						<dateFormatItem id="UM">U年MMM</dateFormatItem>
 						<dateFormatItem id="UMd">U年MMMd</dateFormatItem>
 						<dateFormatItem id="UMMM">U年MMM</dateFormatItem>
@@ -1668,6 +1684,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">rU年MMM</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">r年MMMd</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">rU年MMMdE</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">rU年MMMM</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">rU年QQQQ</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">rU年QQQQ</dateFormatItem>
 					</availableFormats>
@@ -2204,7 +2221,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}{0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
@@ -2224,7 +2241,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d日</dateFormatItem>
-						<dateFormatItem id="Ed">d日（E）</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
+						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">G y年</dateFormatItem>
 						<dateFormatItem id="GyMMM">G y年M月</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G y年M月d日</dateFormatItem>
@@ -2241,6 +2259,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="MMMEd">M月d日 E</dateFormatItem>
+						<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">G y年</dateFormatItem>
 						<dateFormatItem id="yyyy">G y年</dateFormatItem>
@@ -2250,6 +2269,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">G y年M月</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">G y年M月d日</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">G y年M月d日 E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y年M月</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">G y年QQQ</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">G y年QQQQ</dateFormatItem>
 					</availableFormats>
@@ -2566,27 +2586,69 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="afternoon" draft="contributed">下午</dayPeriod>
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">午夜</dayPeriod>
 							<dayPeriod type="am">上午</dayPeriod>
-							<dayPeriod type="earlyMorning" draft="contributed">清晨</dayPeriod>
-							<dayPeriod type="midDay" draft="contributed">中午</dayPeriod>
-							<dayPeriod type="morning" draft="contributed">上午</dayPeriod>
-							<dayPeriod type="night" draft="contributed">晚上</dayPeriod>
-							<dayPeriod type="noon">中午</dayPeriod>
 							<dayPeriod type="pm">下午</dayPeriod>
-							<dayPeriod type="weeHours" draft="contributed">凌晨</dayPeriod>
+							<dayPeriod type="morning1">清晨</dayPeriod>
+							<dayPeriod type="morning2">上午</dayPeriod>
+							<dayPeriod type="afternoon1">中午</dayPeriod>
+							<dayPeriod type="afternoon2">下午</dayPeriod>
+							<dayPeriod type="evening1">晚上</dayPeriod>
+							<dayPeriod type="night1">凌晨</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">午夜</dayPeriod>
+							<dayPeriod type="am">上午</dayPeriod>
+							<dayPeriod type="pm">下午</dayPeriod>
+							<dayPeriod type="morning1">清晨</dayPeriod>
+							<dayPeriod type="morning2">上午</dayPeriod>
+							<dayPeriod type="afternoon1">中午</dayPeriod>
+							<dayPeriod type="afternoon2">下午</dayPeriod>
+							<dayPeriod type="evening1">晚上</dayPeriod>
+							<dayPeriod type="night1">凌晨</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="afternoon" draft="contributed">下午</dayPeriod>
+							<dayPeriod type="midnight">午夜</dayPeriod>
 							<dayPeriod type="am">上午</dayPeriod>
-							<dayPeriod type="earlyMorning" draft="contributed">清晨</dayPeriod>
-							<dayPeriod type="midDay" draft="contributed">中午</dayPeriod>
-							<dayPeriod type="morning" draft="contributed">上午</dayPeriod>
-							<dayPeriod type="night" draft="contributed">晚上</dayPeriod>
-							<dayPeriod type="noon">中午</dayPeriod>
 							<dayPeriod type="pm">下午</dayPeriod>
-							<dayPeriod type="weeHours" draft="contributed">凌晨</dayPeriod>
+							<dayPeriod type="morning1">清晨</dayPeriod>
+							<dayPeriod type="morning2">上午</dayPeriod>
+							<dayPeriod type="afternoon1">中午</dayPeriod>
+							<dayPeriod type="afternoon2">下午</dayPeriod>
+							<dayPeriod type="evening1">晚上</dayPeriod>
+							<dayPeriod type="night1">凌晨</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">午夜</dayPeriod>
+							<dayPeriod type="morning1">清晨</dayPeriod>
+							<dayPeriod type="morning2">上午</dayPeriod>
+							<dayPeriod type="afternoon1">中午</dayPeriod>
+							<dayPeriod type="afternoon2">下午</dayPeriod>
+							<dayPeriod type="evening1">晚上</dayPeriod>
+							<dayPeriod type="night1">凌晨</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">午夜</dayPeriod>
+							<dayPeriod type="am">上午</dayPeriod>
+							<dayPeriod type="pm">下午</dayPeriod>
+							<dayPeriod type="morning1">清晨</dayPeriod>
+							<dayPeriod type="morning2">上午</dayPeriod>
+							<dayPeriod type="afternoon1">中午</dayPeriod>
+							<dayPeriod type="afternoon2">下午</dayPeriod>
+							<dayPeriod type="evening1">晚上</dayPeriod>
+							<dayPeriod type="night1">凌晨</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">午夜</dayPeriod>
+							<dayPeriod type="morning1">清晨</dayPeriod>
+							<dayPeriod type="morning2">上午</dayPeriod>
+							<dayPeriod type="afternoon1">中午</dayPeriod>
+							<dayPeriod type="afternoon2">下午</dayPeriod>
+							<dayPeriod type="evening1">晚上</dayPeriod>
+							<dayPeriod type="night1">凌晨</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -2678,10 +2740,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<availableFormats>
 						<dateFormatItem id="d">d日</dateFormatItem>
 						<dateFormatItem id="E">ccc</dateFormatItem>
-						<dateFormatItem id="Ed">d日（E）</dateFormatItem>
-						<dateFormatItem id="Ehm">E a h:mm</dateFormatItem>
+						<dateFormatItem id="Ed">d E</dateFormatItem>
+						<dateFormatItem id="Ehm">E ah:mm</dateFormatItem>
 						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
-						<dateFormatItem id="Ehms">E a h:mm:ss</dateFormatItem>
+						<dateFormatItem id="Ehms">E ah:mm:ss</dateFormatItem>
 						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">Gy年</dateFormatItem>
 						<dateFormatItem id="GyMMM">Gy年M月</dateFormatItem>
@@ -2704,13 +2766,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="MMMEd">M月d日 E</dateFormatItem>
-						<dateFormatItem id="MMMMdd">M月dd日</dateFormatItem>
+						<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y年</dateFormatItem>
 						<dateFormatItem id="yM">y/M</dateFormatItem>
 						<dateFormatItem id="yMd">y/M/d</dateFormatItem>
 						<dateFormatItem id="yMEd">y/M/d（E）</dateFormatItem>
-						<dateFormatItem id="yMM">y-MM</dateFormatItem>
+						<dateFormatItem id="yMM">y/MM</dateFormatItem>
 						<dateFormatItem id="yMMM">y年M月</dateFormatItem>
 						<dateFormatItem id="yMMMd">y年M月d日</dateFormatItem>
 						<dateFormatItem id="yMMMEd">y年M月d日 E</dateFormatItem>
@@ -3181,6 +3243,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
+						<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="y">Gy年</dateFormatItem>
 						<dateFormatItem id="yyyy">Gy年</dateFormatItem>
 						<dateFormatItem id="yyyyM">Gy/M</dateFormatItem>
@@ -3189,6 +3252,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">Gy年M月d日</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">Gy年M月d日E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">Gy年QQQ</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">Gy年QQQQ</dateFormatItem>
 					</availableFormats>
@@ -3499,6 +3563,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd" draft="contributed">MMM d</dateFormatItem>
 						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
+						<dateFormatItem id="MMMMd" draft="contributed">MMMM d</dateFormatItem>
 						<dateFormatItem id="ms" draft="contributed">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">Gy年</dateFormatItem>
 						<dateFormatItem id="yyyy">Gy年</dateFormatItem>
@@ -3508,6 +3573,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">Gy年M月d日</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">Gy年M月d日E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">Gy年QQQ</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">Gy年QQQQ</dateFormatItem>
 					</availableFormats>
@@ -3623,7 +3689,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern>Gy年M月d日EEEE</pattern>
+							<pattern>Gy年M月d日 EEEE</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
@@ -3645,6 +3711,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<dateTimeFormats>
 					<availableFormats>
 						<dateFormatItem id="d">d日</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d日（E）</dateFormatItem>
 						<dateFormatItem id="Gy">Gy年</dateFormatItem>
 						<dateFormatItem id="GyMMM">Gy年M月</dateFormatItem>
@@ -3656,6 +3723,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
+						<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="y">Gy年</dateFormatItem>
 						<dateFormatItem id="yyyy">Gy年</dateFormatItem>
 						<dateFormatItem id="yyyyM">Gy/M</dateFormatItem>
@@ -3664,6 +3732,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">Gy年M月d日</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">Gy年M月d日E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">Gy年QQQ</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">Gy年QQQQ</dateFormatItem>
 					</availableFormats>
@@ -3706,6 +3775,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter">
 				<displayName>季</displayName>
+				<relative type="-1" draft="contributed">上一季</relative>
+				<relative type="0" draft="contributed">這一季</relative>
+				<relative type="1" draft="contributed">下一季</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">{0} 季後</relativeTimePattern>
 				</relativeTime>
@@ -3715,6 +3787,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-short">
 				<displayName>季</displayName>
+				<relative type="-1" draft="contributed">上一季</relative>
+				<relative type="0" draft="contributed">這一季</relative>
+				<relative type="1" draft="contributed">下一季</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">{0} 季後</relativeTimePattern>
 				</relativeTime>
@@ -3724,6 +3799,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="quarter-narrow">
 				<displayName>季</displayName>
+				<relative type="-1" draft="contributed">上一季</relative>
+				<relative type="0" draft="contributed">這一季</relative>
+				<relative type="1" draft="contributed">下一季</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="other">{0} 季後</relativeTimePattern>
 				</relativeTime>
@@ -4575,7 +4653,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>德古斯加巴</exemplarCity>
 			</zone>
 			<zone type="Europe/Zagreb">
-				<exemplarCity>札格雷布</exemplarCity>
+				<exemplarCity>札格瑞布</exemplarCity>
 			</zone>
 			<zone type="America/Port-au-Prince">
 				<exemplarCity>太子港</exemplarCity>
@@ -4656,7 +4734,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>塔拉瓦</exemplarCity>
 			</zone>
 			<zone type="Indian/Comoro">
-				<exemplarCity>葛摩</exemplarCity>
+				<exemplarCity>科摩羅群島</exemplarCity>
 			</zone>
 			<zone type="America/St_Kitts">
 				<exemplarCity>聖基茨</exemplarCity>
@@ -4875,7 +4953,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<exemplarCity>奧克蘭</exemplarCity>
 			</zone>
 			<zone type="Asia/Muscat">
-				<exemplarCity>馬斯喀特</exemplarCity>
+				<exemplarCity>馬斯開特</exemplarCity>
 			</zone>
 			<zone type="America/Panama">
 				<exemplarCity>巴拿馬</exemplarCity>
@@ -4895,6 +4973,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>莫士比港</exemplarCity>
 			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>布干維爾</exemplarCity>
+			</zone>
 			<zone type="Asia/Manila">
 				<exemplarCity>馬尼拉</exemplarCity>
 			</zone>
@@ -4979,6 +5060,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Irkutsk">
 				<exemplarCity>伊爾庫次克</exemplarCity>
 			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity draft="contributed">赤塔</exemplarCity>
+			</zone>
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>雅庫次克</exemplarCity>
 			</zone>
@@ -4997,6 +5081,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<zone type="Asia/Magadan">
 				<exemplarCity>馬加丹</exemplarCity>
 			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>中科雷姆斯克</exemplarCity>
+			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>堪察加</exemplarCity>
 			</zone>
@@ -6244,7 +6331,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<traditional>hant</traditional>
 			<finance>hantfin</finance>
 		</otherNumberingSystems>
-		<minimumGroupingDigits draft="contributed">3</minimumGroupingDigits>
 		<symbols numberSystem="latn">
 			<decimal>.</decimal>
 			<group>,</group>
@@ -6267,7 +6353,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</decimalFormatLength>
 			<decimalFormatLength type="long">
 				<decimalFormat>
-					<pattern type="1000" count="other">0 千</pattern>
+					<pattern type="1000" count="other">0</pattern>
 					<pattern type="10000" count="other">0萬</pattern>
 					<pattern type="100000" count="other">00萬</pattern>
 					<pattern type="1000000" count="other">000萬</pattern>
@@ -6283,18 +6369,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</decimalFormatLength>
 			<decimalFormatLength type="short">
 				<decimalFormat>
-					<pattern type="1000" count="other">0K</pattern>
-					<pattern type="10000" count="other">00K</pattern>
-					<pattern type="100000" count="other">000K</pattern>
-					<pattern type="1000000" count="other">0M</pattern>
-					<pattern type="10000000" count="other">00M</pattern>
-					<pattern type="100000000" count="other">000M</pattern>
-					<pattern type="1000000000" count="other">0B</pattern>
-					<pattern type="10000000000" count="other">00B</pattern>
-					<pattern type="100000000000" count="other">000B</pattern>
-					<pattern type="1000000000000" count="other">0T</pattern>
-					<pattern type="10000000000000" count="other">00T</pattern>
-					<pattern type="100000000000000" count="other">000T</pattern>
+					<pattern type="1000" count="other">0</pattern>
+					<pattern type="10000" count="other">0萬</pattern>
+					<pattern type="100000" count="other">00萬</pattern>
+					<pattern type="1000000" count="other">000萬</pattern>
+					<pattern type="10000000" count="other">0000萬</pattern>
+					<pattern type="100000000" count="other">0億</pattern>
+					<pattern type="1000000000" count="other">00億</pattern>
+					<pattern type="10000000000" count="other">000億</pattern>
+					<pattern type="100000000000" count="other">0000億</pattern>
+					<pattern type="1000000000000" count="other">0兆</pattern>
+					<pattern type="10000000000000" count="other">00兆</pattern>
+					<pattern type="100000000000000" count="other">000兆</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
@@ -6321,6 +6407,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0</pattern>
+					<pattern type="10000" count="other">¤0萬</pattern>
+					<pattern type="100000" count="other">¤00萬</pattern>
+					<pattern type="1000000" count="other">¤000萬</pattern>
+					<pattern type="10000000" count="other">¤0000萬</pattern>
+					<pattern type="100000000" count="other">¤0億</pattern>
+					<pattern type="1000000000" count="other">¤00億</pattern>
+					<pattern type="10000000000" count="other">¤000億</pattern>
+					<pattern type="100000000000" count="other">¤0000億</pattern>
+					<pattern type="1000000000000" count="other">¤0兆</pattern>
+					<pattern type="10000000000000" count="other">¤00兆</pattern>
+					<pattern type="100000000000000" count="other">¤000兆</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencies>
@@ -6368,6 +6470,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>安哥拉寬扎</displayName>
 				<displayName count="other">安哥拉寬扎</displayName>
 				<symbol>AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>安哥拉寬扎 (1977–1990)</displayName>
@@ -6445,6 +6548,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>波士尼亞-赫塞哥維納可轉換馬克</displayName>
 				<displayName count="other">波士尼亞-赫塞哥維納可轉換馬克</displayName>
 				<symbol>BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BAN">
 				<displayName>波士尼亞-赫塞哥維納新第納爾</displayName>
@@ -6524,6 +6628,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>玻利維亞諾</displayName>
 				<displayName count="other">玻利維亞諾</displayName>
 				<symbol>BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BOL">
 				<displayName>玻利維亞玻利維亞諾 (1863–1963)</displayName>
@@ -6596,6 +6701,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>波札那普拉</displayName>
 				<displayName count="other">波札那普拉</displayName>
 				<symbol>BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>白俄羅斯新盧布 (1994–1999)</displayName>
@@ -6696,6 +6802,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>古巴可轉換披索</displayName>
 				<displayName count="other">古巴可轉換披索</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>古巴披索</displayName>
@@ -6717,6 +6824,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>捷克克朗</displayName>
 				<displayName count="other">捷克克朗</displayName>
 				<symbol>CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName draft="contributed">東德奧斯特馬克</displayName>
@@ -6737,6 +6845,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>丹麥克朗</displayName>
 				<displayName count="other">丹麥克朗</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>多明尼加披索</displayName>
@@ -6768,6 +6877,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>埃及鎊</displayName>
 				<displayName count="other">埃及鎊</displayName>
 				<symbol>EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>厄立特里亞納克法</displayName>
@@ -6816,6 +6926,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>福克蘭群島鎊</displayName>
 				<displayName count="other">福克蘭群島鎊</displayName>
 				<symbol>FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>法國法郎</displayName>
@@ -6837,6 +6948,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>喬治亞拉里</displayName>
 				<displayName count="other">喬治亞拉里</displayName>
 				<symbol>GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>迦納賽地 (1979–2007)</displayName>
@@ -6863,6 +6975,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>幾內亞法郎</displayName>
 				<displayName count="other">幾內亞法郎</displayName>
 				<symbol>GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>幾內亞西里</displayName>
@@ -6883,6 +6996,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>瓜地馬拉格查爾</displayName>
 				<displayName count="other">瓜地馬拉格查爾</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>葡屬幾內亞埃斯庫多</displayName>
@@ -6895,8 +7009,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol draft="contributed">GWP</symbol>
 			</currency>
 			<currency type="GYD">
-				<displayName>蓋亞那元</displayName>
-				<displayName count="other">蓋亞那元</displayName>
+				<displayName>圭亞那元</displayName>
+				<displayName count="other">圭亞那元</displayName>
 				<symbol>GYD</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
@@ -6910,6 +7024,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>洪都拉斯倫皮拉</displayName>
 				<displayName count="other">洪都拉斯倫皮拉</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>克羅埃西亞第納爾</displayName>
@@ -6920,6 +7035,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>克羅埃西亞庫納</displayName>
 				<displayName count="other">克羅埃西亞庫納</displayName>
 				<symbol>HRK</symbol>
+				<symbol alt="narrow" draft="contributed">kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>海地古德</displayName>
@@ -6930,11 +7046,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>匈牙利福林</displayName>
 				<displayName count="other">匈牙利福林</displayName>
 				<symbol>HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>印尼盾</displayName>
 				<displayName count="other">印尼盾</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>愛爾蘭鎊</displayName>
@@ -6982,6 +7100,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>冰島克朗</displayName>
 				<displayName count="other">冰島克朗</displayName>
 				<symbol>ISK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>義大利里拉</displayName>
@@ -7025,11 +7144,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>科摩羅法郎</displayName>
 				<displayName count="other">科摩羅法郎</displayName>
 				<symbol>KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>北韓圓</displayName>
 				<displayName count="other">北韓圓</displayName>
 				<symbol>KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRH">
 				<displayName draft="contributed">南韓圜</displayName>
@@ -7074,11 +7195,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>黎巴嫩鎊</displayName>
 				<displayName count="other">黎巴嫩鎊</displayName>
 				<symbol>LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>斯里蘭卡盧比</displayName>
 				<displayName count="other">斯里蘭卡盧比</displayName>
 				<symbol>LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>賴比瑞亞元</displayName>
@@ -7160,6 +7283,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>馬達加斯加阿里亞里</displayName>
 				<displayName count="other">馬達加斯加阿里亞里</displayName>
 				<symbol>MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>馬達加斯加法郎</displayName>
@@ -7185,6 +7309,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>緬甸元</displayName>
 				<displayName count="other">緬甸元</displayName>
 				<symbol>MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>蒙古圖格里克</displayName>
@@ -7213,9 +7338,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol draft="contributed">MTP</symbol>
 			</currency>
 			<currency type="MUR">
-				<displayName>模里西斯盧布</displayName>
-				<displayName count="other">模里西斯盧布</displayName>
+				<displayName>模里西斯盧比</displayName>
+				<displayName count="other">模里西斯盧比</displayName>
 				<symbol>MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVP">
 				<displayName draft="contributed">馬爾地夫盧比</displayName>
@@ -7252,6 +7378,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>馬來西亞令吉</displayName>
 				<displayName count="other">馬來西亞令吉</displayName>
 				<symbol>MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>莫三比克埃斯庫多</displayName>
@@ -7289,6 +7416,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>尼加拉瓜金科多巴</displayName>
 				<displayName count="other">尼加拉瓜金科多巴</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>荷蘭盾</displayName>
@@ -7299,11 +7427,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>挪威克朗</displayName>
 				<displayName count="other">挪威克朗</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>尼泊爾盧比</displayName>
 				<displayName count="other">尼泊爾盧比</displayName>
 				<symbol>NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>紐西蘭幣</displayName>
@@ -7351,11 +7481,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>巴基斯坦盧比</displayName>
 				<displayName count="other">巴基斯坦盧比</displayName>
 				<symbol>PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>波蘭茲羅提</displayName>
 				<displayName count="other">波蘭茲羅提</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">zł</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>波蘭茲羅提 (1950–1995)</displayName>
@@ -7402,6 +7534,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>俄羅斯盧布</displayName>
 				<displayName count="other">俄羅斯盧布</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>俄羅斯盧布 (1991–1998)</displayName>
@@ -7413,6 +7546,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>盧安達法郎</displayName>
 				<displayName count="other">盧安達法郎</displayName>
 				<symbol>RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>沙烏地里亞爾</displayName>
@@ -7449,6 +7583,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>瑞典克朗</displayName>
 				<displayName count="other">瑞典克朗</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>新加坡幣</displayName>
@@ -7460,6 +7595,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>聖赫勒拿鎊</displayName>
 				<displayName count="other">聖赫勒拿鎊</displayName>
 				<symbol>SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>斯洛維尼亞托勒</displayName>
@@ -7502,6 +7638,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>聖多美島和普林西比島多布拉</displayName>
 				<displayName count="other">聖多美島和普林西比島多布拉</displayName>
 				<symbol>STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>蘇聯盧布</displayName>
@@ -7517,6 +7654,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>敘利亞鎊</displayName>
 				<displayName count="other">敘利亞鎊</displayName>
 				<symbol>SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>史瓦濟蘭里朗吉尼</displayName>
@@ -7526,7 +7664,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="THB">
 				<displayName>泰銖</displayName>
 				<displayName count="other">泰銖</displayName>
-				<symbol>฿</symbol>
+				<symbol>THB</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>塔吉克盧布</displayName>
@@ -7557,6 +7696,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>東加潘加</displayName>
 				<displayName count="other">東加潘加</displayName>
 				<symbol>TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName draft="contributed">帝汶埃斯庫多</displayName>
@@ -7573,6 +7713,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">新土耳其里拉</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>千里達及托巴哥元</displayName>
@@ -7581,10 +7722,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="TWD">
-				<displayName>新臺幣</displayName>
-				<displayName count="other">新臺幣</displayName>
-				<symbol>NT$</symbol>
-				<symbol alt="narrow" draft="contributed">NT$</symbol>
+				<displayName>新台幣</displayName>
+				<displayName count="other">新台幣</displayName>
+				<symbol>$</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="TZS">
 				<displayName>坦尚尼亞先令</displayName>
@@ -7615,7 +7756,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<currency type="USD">
 				<displayName>美元</displayName>
 				<displayName count="other">美元</displayName>
-				<symbol>$</symbol>
+				<symbol>US$</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="USN">
@@ -7658,6 +7799,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>委內瑞拉玻利瓦</displayName>
 				<displayName count="other">委內瑞拉玻利瓦</displayName>
 				<symbol>VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>越南盾</displayName>
@@ -7719,6 +7861,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>格瑞那達元</displayName>
 				<displayName count="other">格瑞那達元</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XDR">
 				<displayName>特殊提款權</displayName>
@@ -7782,7 +7925,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="XXX">
 				<displayName>未知貨幣</displayName>
-				<displayName count="other">未知貨幣</displayName>
+				<displayName count="other">（未知貨幣）</displayName>
 				<symbol draft="contributed">XXX</symbol>
 			</currency>
 			<currency type="YDD">
@@ -7824,6 +7967,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>南非蘭特</displayName>
 				<displayName count="other">南非蘭特</displayName>
 				<symbol>ZAR</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>尚比亞克瓦查 (1968–2012)</displayName>
@@ -7834,6 +7978,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>尚比亞克瓦查</displayName>
 				<displayName count="other">尚比亞克瓦查</displayName>
 				<symbol>ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>薩伊新扎伊爾</displayName>
@@ -7869,43 +8014,65 @@ For terms of use, see http://www.unicode.org/copyright.html
 	<units>
 		<unitLength type="long">
 			<compoundUnit type="per">
-				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+				<compoundUnitPattern>每{1} {0}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>G 力</displayName>
 				<unitPattern count="other">{0} G 力</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
-				<displayName>公尺/秒平方</displayName>
-				<unitPattern count="other">{0} 公尺/秒平方</unitPattern>
+				<displayName>每平方秒公尺</displayName>
+				<unitPattern count="other">每平方秒 {0} 公尺</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName>分鐘</displayName>
-				<unitPattern count="other">{0} 分鐘</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName>秒</displayName>
-				<unitPattern count="other">{0} 秒</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName>度</displayName>
-				<unitPattern count="other">{0} 度</unitPattern>
+			<unit type="angle-revolution">
+				<displayName>圈數</displayName>
+				<unitPattern count="other">{0} 圈</unitPattern>
 			</unit>
 			<unit type="angle-radian">
 				<displayName>弧度</displayName>
 				<unitPattern count="other">{0} 弧度</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName>英畝</displayName>
-				<unitPattern count="other">{0} 英畝</unitPattern>
+			<unit type="angle-degree">
+				<displayName>角度</displayName>
+				<unitPattern count="other">{0} 度</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>角分</displayName>
+				<unitPattern count="other">{0} 角分</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>角秒</displayName>
+				<unitPattern count="other">{0} 角秒</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>平方公里</displayName>
+				<unitPattern count="other">{0} 平方公里</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>公頃</displayName>
 				<unitPattern count="other">{0} 公頃</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>平方公尺</displayName>
+				<unitPattern count="other">{0} 平方公尺</unitPattern>
+				<perUnitPattern>每平方公尺 {0}</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>平方公分</displayName>
 				<unitPattern count="other">{0} 平方公分</unitPattern>
+				<perUnitPattern>每平方公分 {0}</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>平方英里</displayName>
+				<unitPattern count="other">{0} 平方英里</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>英畝</displayName>
+				<unitPattern count="other">{0} 英畝</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>平方碼</displayName>
+				<unitPattern count="other">{0} 平方碼</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>平方英尺</displayName>
@@ -7914,113 +8081,115 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="area-square-inch">
 				<displayName>平方英寸</displayName>
 				<unitPattern count="other">{0} 平方英寸</unitPattern>
+				<perUnitPattern>每平方英寸 {0}</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>平方公里</displayName>
-				<unitPattern count="other">{0} 平方公里</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>平方公尺</displayName>
-				<unitPattern count="other">{0} 平方公尺</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>平方英里</displayName>
-				<unitPattern count="other">{0} 平方英里</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>平方碼</displayName>
-				<unitPattern count="other">{0} 平方碼</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>克拉</displayName>
+				<unitPattern count="other">{0} 克拉</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName>升/公里</displayName>
-				<unitPattern count="other">{0} 升/公里</unitPattern>
+				<displayName>每公里公升</displayName>
+				<unitPattern count="other">每公里 {0} 公升</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>每 100 公里公升</displayName>
+				<unitPattern count="other">每 100 公里 {0} 公升</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
-				<displayName>英里/加侖</displayName>
-				<unitPattern count="other">{0} 英里/加侖</unitPattern>
-			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tb</displayName>
-				<unitPattern count="other">{0} Tb</unitPattern>
+				<displayName>每加侖英里</displayName>
+				<unitPattern count="other">每加侖 {0} 英里</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>世紀</displayName>
+				<unitPattern count="other">{0} 個世紀</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>年</displayName>
+				<unitPattern count="other">{0} 年</unitPattern>
+				<perUnitPattern>每年 {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>月</displayName>
+				<unitPattern count="other">{0} 個月</unitPattern>
+				<perUnitPattern>每月 {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>週</displayName>
+				<unitPattern count="other">{0} 週</unitPattern>
+				<perUnitPattern>每週 {0}</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>天</displayName>
 				<unitPattern count="other">{0} 天</unitPattern>
+				<perUnitPattern>每天 {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>小時</displayName>
 				<unitPattern count="other">{0} 小時</unitPattern>
-				<perUnitPattern>{0}/小時</perUnitPattern>
+				<perUnitPattern>每小時 {0}</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>微秒</displayName>
-				<unitPattern count="other">{0} 微秒</unitPattern>
+			<unit type="duration-minute">
+				<displayName>分鐘</displayName>
+				<unitPattern count="other">{0} 分鐘</unitPattern>
+				<perUnitPattern>每分鐘 {0}</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>秒</displayName>
+				<unitPattern count="other">{0} 秒</unitPattern>
+				<perUnitPattern>每秒 {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>毫秒</displayName>
 				<unitPattern count="other">{0} 毫秒</unitPattern>
 			</unit>
-			<unit type="duration-minute">
-				<displayName>分鐘</displayName>
-				<unitPattern count="other">{0} 分鐘</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>個月</displayName>
-				<unitPattern count="other">{0} 個月</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>微秒</displayName>
+				<unitPattern count="other">{0} 微秒</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>奈秒</displayName>
 				<unitPattern count="other">{0} 奈秒</unitPattern>
 			</unit>
-			<unit type="duration-second">
-				<displayName>秒</displayName>
-				<unitPattern count="other">{0} 秒</unitPattern>
-				<perUnitPattern>{0}/秒</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName>週</displayName>
-				<unitPattern count="other">{0} 週</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>年</displayName>
-				<unitPattern count="other">{0} 年</unitPattern>
-			</unit>
 			<unit type="electric-ampere">
 				<displayName>安培</displayName>
 				<unitPattern count="other">{0} 安培</unitPattern>
@@ -8037,26 +8206,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>伏特</displayName>
 				<unitPattern count="other">{0} 伏特</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>千卡路里</displayName>
+				<unitPattern count="other">{0} 千卡路里</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>卡路里</displayName>
 				<unitPattern count="other">{0} 卡路里</unitPattern>
 			</unit>
 			<unit type="energy-foodcalorie">
-				<displayName>大卡</displayName>
+				<displayName>卡路里</displayName>
 				<unitPattern count="other">{0} 大卡</unitPattern>
 			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>千焦耳</displayName>
+				<unitPattern count="other">{0} 千焦耳</unitPattern>
+			</unit>
 			<unit type="energy-joule">
 				<displayName>焦耳</displayName>
 				<unitPattern count="other">{0} 焦耳</unitPattern>
 			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>千卡</displayName>
-				<unitPattern count="other">{0} 千卡</unitPattern>
-			</unit>
-			<unit type="energy-kilojoule">
-				<displayName>千焦</displayName>
-				<unitPattern count="other">{0} 千焦</unitPattern>
-			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>千瓦小時</displayName>
 				<unitPattern count="other">{0} 千瓦小時</unitPattern>
@@ -8065,233 +8234,226 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>吉赫</displayName>
 				<unitPattern count="other">{0} 吉赫</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>赫茲</displayName>
-				<unitPattern count="other">{0} 赫茲</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>兆赫</displayName>
+				<unitPattern count="other">{0} 兆赫</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>千赫</displayName>
 				<unitPattern count="other">{0} 千赫</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>兆赫</displayName>
-				<unitPattern count="other">{0} 兆赫</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>赫茲</displayName>
+				<unitPattern count="other">{0} 赫茲</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>天文單位</displayName>
-				<unitPattern count="other">{0} 天文單位</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>公里</displayName>
+				<unitPattern count="other">{0} 公里</unitPattern>
+				<perUnitPattern>每公里 {0}</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>公分</displayName>
-				<unitPattern count="other">{0} 公分</unitPattern>
+			<unit type="length-meter">
+				<displayName>公尺</displayName>
+				<unitPattern count="other">{0} 公尺</unitPattern>
+				<perUnitPattern>每公尺 {0}</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>公寸</displayName>
 				<unitPattern count="other">{0} 公寸</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName draft="contributed">英尋</displayName>
-				<unitPattern count="other" draft="contributed">{0} 英尋</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>呎</displayName>
-				<unitPattern count="other">{0} 呎</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName draft="contributed">化朗</displayName>
-				<unitPattern count="other" draft="contributed">{0} 化朗</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>吋</displayName>
-				<unitPattern count="other">{0} 吋</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>公里</displayName>
-				<unitPattern count="other">{0} 公里</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>光年</displayName>
-				<unitPattern count="other">{0} 光年</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>公尺</displayName>
-				<unitPattern count="other">{0} 公尺</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>微米</displayName>
-				<unitPattern count="other">{0} 微米</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>英里</displayName>
-				<unitPattern count="other">{0} 英里</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>公分</displayName>
+				<unitPattern count="other">{0} 公分</unitPattern>
+				<perUnitPattern>每公分 {0}</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>公釐</displayName>
 				<unitPattern count="other">{0} 公釐</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>微米</displayName>
+				<unitPattern count="other">{0} 微米</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>奈米</displayName>
 				<unitPattern count="other">{0} 奈米</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>海里</displayName>
-				<unitPattern count="other">{0} 海里</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>秒差距</displayName>
-				<unitPattern count="other">{0} 秒差距</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>皮米</displayName>
 				<unitPattern count="other">{0} 皮米</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>英里</displayName>
+				<unitPattern count="other">{0} 英里</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>碼</displayName>
 				<unitPattern count="other">{0} 碼</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>英尺</displayName>
+				<unitPattern count="other">{0} 英尺</unitPattern>
+				<perUnitPattern>每英尺 {0}</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>英寸</displayName>
+				<unitPattern count="other">{0} 英寸</unitPattern>
+				<perUnitPattern>每英寸 {0}</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>秒差距</displayName>
+				<unitPattern count="other">{0} 秒差距</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>光年</displayName>
+				<unitPattern count="other">{0} 光年</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>天文單位</displayName>
+				<unitPattern count="other">{0} 天文單位</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName draft="contributed">化朗</displayName>
+				<unitPattern count="other" draft="contributed">{0} 化朗</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName draft="contributed">英尋</displayName>
+				<unitPattern count="other" draft="contributed">{0} 英尋</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>海里</displayName>
+				<unitPattern count="other">{0} 海里</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>斯堪地那維亞英里</displayName>
+				<unitPattern count="other">{0} 斯堪地那維亞英里</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>勒克斯</displayName>
 				<unitPattern count="other">{0} 勒克斯</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>克拉</displayName>
-				<unitPattern count="other">{0} 克拉</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>克</displayName>
-				<unitPattern count="other">{0} 克</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>公斤</displayName>
-				<unitPattern count="other">{0} 公斤</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>公噸</displayName>
 				<unitPattern count="other">{0} 公噸</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>微克</displayName>
-				<unitPattern count="other">{0} 微克</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>公斤</displayName>
+				<unitPattern count="other">{0} 公斤</unitPattern>
+				<perUnitPattern>每公斤 {0}</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>克</displayName>
+				<unitPattern count="other">{0} 克</unitPattern>
+				<perUnitPattern>每克 {0}</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>毫克</displayName>
 				<unitPattern count="other">{0} 毫克</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>盎司</displayName>
-				<unitPattern count="other">{0} 盎司</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>金衡盎司</displayName>
-				<unitPattern count="other">{0} 金衡盎司</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>磅</displayName>
-				<unitPattern count="other">{0} 磅</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="contributed">英石</displayName>
-				<unitPattern count="other" draft="contributed">{0} 英石</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>微克</displayName>
+				<unitPattern count="other">{0} 微克</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>英噸</displayName>
 				<unitPattern count="other">{0} 英噸</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName draft="contributed">英石</displayName>
+				<unitPattern count="other" draft="contributed">{0} 英石</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>磅</displayName>
+				<unitPattern count="other">{0} 磅</unitPattern>
+				<perUnitPattern>每磅 {0}</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>盎司</displayName>
+				<unitPattern count="other">{0} 盎司</unitPattern>
+				<perUnitPattern>每盎司 {0}</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>金衡盎司</displayName>
+				<unitPattern count="other">{0} 金衡盎司</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>克拉</displayName>
+				<unitPattern count="other">{0} 克拉</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>吉瓦</displayName>
 				<unitPattern count="other">{0} 吉瓦</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>匹</displayName>
-				<unitPattern count="other">{0} 匹</unitPattern>
+			<unit type="power-megawatt">
+				<displayName>百萬瓦特</displayName>
+				<unitPattern count="other">{0} 百萬瓦特</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
-				<displayName>千瓦</displayName>
-				<unitPattern count="other">{0} 千瓦</unitPattern>
-			</unit>
-			<unit type="power-megawatt">
-				<displayName>百萬瓦</displayName>
-				<unitPattern count="other">{0} 百萬瓦</unitPattern>
-			</unit>
-			<unit type="power-milliwatt">
-				<displayName>毫瓦</displayName>
-				<unitPattern count="other">{0} 毫瓦</unitPattern>
+				<displayName>千瓦特</displayName>
+				<unitPattern count="other">{0} 千瓦特</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>瓦特</displayName>
 				<unitPattern count="other">{0} 瓦特</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>毫瓦特</displayName>
+				<unitPattern count="other">{0} 毫瓦特</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>馬力</displayName>
+				<unitPattern count="other">{0} 匹馬力</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>百帕</displayName>
 				<unitPattern count="other">{0} 百帕</unitPattern>
 			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>毫米汞柱</displayName>
+				<unitPattern count="other">{0} 毫米汞柱</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>每平方英寸磅力</displayName>
+				<unitPattern count="other">每平方英寸 {0} 磅力</unitPattern>
+			</unit>
 			<unit type="pressure-inch-hg">
-				<displayName>英吋水銀柱</displayName>
-				<unitPattern count="other">{0} 英吋水銀柱</unitPattern>
+				<displayName>英寸汞柱</displayName>
+				<unitPattern count="other">{0} 英寸汞柱</unitPattern>
 			</unit>
 			<unit type="pressure-millibar">
 				<displayName>毫巴</displayName>
 				<unitPattern count="other">{0} 毫巴</unitPattern>
 			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<displayName>毫米水銀柱</displayName>
-				<unitPattern count="other">{0} 毫米水銀柱</unitPattern>
-			</unit>
-			<unit type="pressure-pound-per-square-inch">
-				<displayName>磅力/平方英寸</displayName>
-				<unitPattern count="other">{0} 磅力/平方英寸</unitPattern>
-			</unit>
-			<unit type="proportion-karat">
-				<displayName>克拉</displayName>
-				<unitPattern count="other">{0} 克拉</unitPattern>
-			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName>公里/小時</displayName>
-				<unitPattern count="other">{0} 公里/小時</unitPattern>
+				<displayName>每小時公里</displayName>
+				<unitPattern count="other">每小時 {0} 公里</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
-				<displayName>公尺/秒</displayName>
-				<unitPattern count="other">{0} 公尺/秒</unitPattern>
+				<displayName>每秒公尺</displayName>
+				<unitPattern count="other">每秒 {0} 公尺</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<displayName>英里/小時</displayName>
-				<unitPattern count="other">{0} 英里/小時</unitPattern>
+				<displayName>每小時英里</displayName>
+				<unitPattern count="other">每小時 {0} 英里</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>節</displayName>
+				<unitPattern count="other">{0} 節</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
-				<displayName>°C</displayName>
-				<unitPattern count="other">{0}°C</unitPattern>
+				<displayName>攝氏度數</displayName>
+				<unitPattern count="other">攝氏 {0} 度</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
-				<displayName>°F</displayName>
-				<unitPattern count="other">{0}°F</unitPattern>
+				<displayName>華氏度數</displayName>
+				<unitPattern count="other">華氏 {0} 度</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
-				<displayName>K</displayName>
-				<unitPattern count="other">{0} K</unitPattern>
-			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>英畝英尺</displayName>
-				<unitPattern count="other">{0} 英畝英尺</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName draft="contributed">蒲式耳</displayName>
-				<unitPattern count="other" draft="contributed">{0} 蒲式耳</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>釐升</displayName>
-				<unitPattern count="other">{0} 釐升</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>立方公分</displayName>
-				<unitPattern count="other">{0} 立方公分</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>立方英尺</displayName>
-				<unitPattern count="other">{0} 立方英尺</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>立方英寸</displayName>
-				<unitPattern count="other">{0} 立方英寸</unitPattern>
+				<displayName>克耳文</displayName>
+				<unitPattern count="other">{0} 克耳文</unitPattern>
 			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>立方公里</displayName>
@@ -8300,6 +8462,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-cubic-meter">
 				<displayName>立方公尺</displayName>
 				<unitPattern count="other">{0} 立方公尺</unitPattern>
+				<perUnitPattern>每立方公尺 {0}</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>立方公分</displayName>
+				<unitPattern count="other">{0} 立方公分</unitPattern>
+				<perUnitPattern>每立方公分 {0}</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>立方英里</displayName>
@@ -8309,21 +8477,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>立方碼</displayName>
 				<unitPattern count="other">{0} 立方碼</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>量杯</displayName>
-				<unitPattern count="other">{0} 量杯</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>立方英尺</displayName>
+				<unitPattern count="other">{0} 立方英尺</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>公合</displayName>
-				<unitPattern count="other">{0} 公合</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>立方英寸</displayName>
+				<unitPattern count="other">{0} 立方英寸</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>液盎司</displayName>
-				<unitPattern count="other">{0} 液盎司</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>加侖</displayName>
-				<unitPattern count="other">{0} 加侖</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>兆升</displayName>
+				<unitPattern count="other">{0} 兆升</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>公石</displayName>
@@ -8332,23 +8496,56 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-liter">
 				<displayName>公升</displayName>
 				<unitPattern count="other">{0} 公升</unitPattern>
+				<perUnitPattern>每公升 {0}</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>兆升</displayName>
-				<unitPattern count="other">{0} 兆升</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>公合</displayName>
+				<unitPattern count="other">{0} 公合</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>釐升</displayName>
+				<unitPattern count="other">{0} 釐升</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>毫升</displayName>
 				<unitPattern count="other">{0} 毫升</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>品脫</displayName>
-				<unitPattern count="other">{0} 品脫</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>公制品脫</displayName>
+				<unitPattern count="other">{0} 公制品脫</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>公制量杯</displayName>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>英畝英尺</displayName>
+				<unitPattern count="other">{0} 英畝英尺</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName draft="contributed">蒲式耳</displayName>
+				<unitPattern count="other" draft="contributed">{0} 蒲式耳</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>加侖</displayName>
+				<unitPattern count="other">{0} 加侖</unitPattern>
+				<perUnitPattern>每加侖 {0}</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>夸脫</displayName>
 				<unitPattern count="other">{0} 夸脫</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>品脫</displayName>
+				<unitPattern count="other">{0} 品脫</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>量杯</displayName>
+				<unitPattern count="other">{0} 杯</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>液盎司</displayName>
+				<unitPattern count="other">{0} 液盎司</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>湯匙</displayName>
 				<unitPattern count="other">{0} 湯匙</unitPattern>
@@ -8357,6 +8554,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>茶匙</displayName>
 				<unitPattern count="other">{0} 茶匙</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">東經{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">北緯{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">南緯{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">西經{0}</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -8367,36 +8570,58 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} G 力</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-second-squared">
-				<displayName>公尺/秒平方</displayName>
-				<unitPattern count="other">{0} m/s²</unitPattern>
+				<displayName>公尺/平方秒</displayName>
+				<unitPattern count="other">{0} 公尺/平方秒</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName>分鐘</displayName>
-				<unitPattern count="other">{0} 分鐘</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName>秒</displayName>
-				<unitPattern count="other">{0} 秒</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName>度</displayName>
-				<unitPattern count="other">{0} 度</unitPattern>
+			<unit type="angle-revolution">
+				<displayName>圈數</displayName>
+				<unitPattern count="other">{0} 圈</unitPattern>
 			</unit>
 			<unit type="angle-radian">
 				<displayName>弧度</displayName>
 				<unitPattern count="other">{0} 弧度</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<displayName>英畝</displayName>
-				<unitPattern count="other">{0} 英畝</unitPattern>
+			<unit type="angle-degree">
+				<displayName>角度</displayName>
+				<unitPattern count="other">{0} 度</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>角分</displayName>
+				<unitPattern count="other">{0} 角分</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>角秒</displayName>
+				<unitPattern count="other">{0} 角秒</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>平方公里</displayName>
+				<unitPattern count="other">{0} 平方公里</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>公頃</displayName>
 				<unitPattern count="other">{0} 公頃</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>平方公尺</displayName>
+				<unitPattern count="other">{0} 平方公尺</unitPattern>
+				<perUnitPattern>{0}/平方公尺</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>平方公分</displayName>
 				<unitPattern count="other">{0} 平方公分</unitPattern>
+				<perUnitPattern>{0}/平分公分</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>平方英里</displayName>
+				<unitPattern count="other">{0} 平方英里</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>英畝</displayName>
+				<unitPattern count="other">{0} 英畝</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>平方碼</displayName>
+				<unitPattern count="other">{0} 平方碼</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>平方英尺</displayName>
@@ -8405,112 +8630,114 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="area-square-inch">
 				<displayName>平方英寸</displayName>
 				<unitPattern count="other">{0} 平方英寸</unitPattern>
+				<perUnitPattern>{0}/平方英寸</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>平方公里</displayName>
-				<unitPattern count="other">{0} 平方公里</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>平方公尺</displayName>
-				<unitPattern count="other">{0} 平方公尺</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>平方英里</displayName>
-				<unitPattern count="other">{0} 平方英里</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>平方碼</displayName>
-				<unitPattern count="other">{0} 平方碼</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>克拉</displayName>
+				<unitPattern count="other">{0} 克拉</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName>升/公里</displayName>
+				<displayName>公升/公里</displayName>
 				<unitPattern count="other">{0} 升/公里</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>升/100 公里</displayName>
+				<unitPattern count="other">{0} 升/100 公里</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>英里/加侖</displayName>
 				<unitPattern count="other">{0} 英里/加侖</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gb</displayName>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kb</displayName>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mb</displayName>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="other">{0} MB</unitPattern>
+			<unit type="digital-terabyte">
+				<displayName>TB</displayName>
+				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>Tb</displayName>
 				<unitPattern count="other">{0} Tb</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>TB</displayName>
-				<unitPattern count="other">{0} TB</unitPattern>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>世紀</displayName>
+				<unitPattern count="other">{0} 世紀</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>年</displayName>
+				<unitPattern count="other">{0} 年</unitPattern>
+				<perUnitPattern>{0}/年</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>月</displayName>
+				<unitPattern count="other">{0} 個月</unitPattern>
+				<perUnitPattern>{0}/月</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>週</displayName>
+				<unitPattern count="other">{0} 週</unitPattern>
+				<perUnitPattern>{0}/週</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>天</displayName>
 				<unitPattern count="other">{0} 天</unitPattern>
+				<perUnitPattern>{0}/天</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>小時</displayName>
 				<unitPattern count="other">{0} 小時</unitPattern>
 				<perUnitPattern>{0}/小時</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>微秒</displayName>
-				<unitPattern count="other">{0} 微秒</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>毫秒</displayName>
-				<unitPattern count="other">{0} 毫秒</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>分鐘</displayName>
 				<unitPattern count="other">{0} 分鐘</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>個月</displayName>
-				<unitPattern count="other">{0} 個月</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>奈秒</displayName>
-				<unitPattern count="other">{0} 奈秒</unitPattern>
+				<perUnitPattern>{0}/分鐘</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>秒</displayName>
 				<unitPattern count="other">{0} 秒</unitPattern>
 				<perUnitPattern>{0}/秒</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>週</displayName>
-				<unitPattern count="other">{0} 週</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>毫秒</displayName>
+				<unitPattern count="other">{0} 毫秒</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>年</displayName>
-				<unitPattern count="other">{0} 年</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>微秒</displayName>
+				<unitPattern count="other">{0} 微秒</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>奈秒</displayName>
+				<unitPattern count="other">{0} 奈秒</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>安培</displayName>
@@ -8526,7 +8753,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="electric-volt">
 				<displayName>伏特</displayName>
-				<unitPattern count="other">{0} 伏特</unitPattern>
+				<unitPattern count="other">{0} 伏</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>千卡</displayName>
+				<unitPattern count="other">{0} 千卡</unitPattern>
 			</unit>
 			<unit type="energy-calorie">
 				<displayName>卡路里</displayName>
@@ -8536,17 +8767,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>大卡</displayName>
 				<unitPattern count="other">{0} 大卡</unitPattern>
 			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>千焦耳</displayName>
+				<unitPattern count="other">{0} 千焦</unitPattern>
+			</unit>
 			<unit type="energy-joule">
 				<displayName>焦耳</displayName>
-				<unitPattern count="other">{0} 焦耳</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>千卡</displayName>
-				<unitPattern count="other">{0} 千卡</unitPattern>
-			</unit>
-			<unit type="energy-kilojoule">
-				<displayName>千焦</displayName>
-				<unitPattern count="other">{0} 千焦</unitPattern>
+				<unitPattern count="other">{0} 焦</unitPattern>
 			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>千瓦小時</displayName>
@@ -8556,186 +8783,195 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>吉赫</displayName>
 				<unitPattern count="other">{0} 吉赫</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>赫茲</displayName>
-				<unitPattern count="other">{0} 赫茲</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>兆赫</displayName>
+				<unitPattern count="other">{0} 兆赫</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>千赫</displayName>
 				<unitPattern count="other">{0} 千赫</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>兆赫</displayName>
-				<unitPattern count="other">{0} 兆赫</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>赫茲</displayName>
+				<unitPattern count="other">{0} 赫茲</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>天文單位</displayName>
-				<unitPattern count="other">{0} 天文單位</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>公里</displayName>
+				<unitPattern count="other">{0} 公里</unitPattern>
+				<perUnitPattern>{0}/公里</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>公分</displayName>
-				<unitPattern count="other">{0} 公分</unitPattern>
+			<unit type="length-meter">
+				<displayName>公尺</displayName>
+				<unitPattern count="other">{0} 公尺</unitPattern>
+				<perUnitPattern>{0}/公尺</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>公寸</displayName>
 				<unitPattern count="other">{0} 公寸</unitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName draft="contributed">fm</displayName>
-				<unitPattern count="other" draft="contributed">{0} 英尋</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName>呎</displayName>
-				<unitPattern count="other">{0} 呎</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName draft="contributed">化朗</displayName>
-				<unitPattern count="other" draft="contributed">{0} 化朗</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>吋</displayName>
-				<unitPattern count="other">{0} 吋</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>公里</displayName>
-				<unitPattern count="other">{0} 公里</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>光年</displayName>
-				<unitPattern count="other">{0} 光年</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>公尺</displayName>
-				<unitPattern count="other">{0} 公尺</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>微米</displayName>
-				<unitPattern count="other">{0} 微米</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>英里</displayName>
-				<unitPattern count="other">{0} 英里</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>公分</displayName>
+				<unitPattern count="other">{0} 公分</unitPattern>
+				<perUnitPattern>{0}/公分</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>公釐</displayName>
 				<unitPattern count="other">{0} 公釐</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>微米</displayName>
+				<unitPattern count="other">{0} 微米</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>奈米</displayName>
 				<unitPattern count="other">{0} 奈米</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>海里</displayName>
-				<unitPattern count="other">{0} 海里</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>秒差距</displayName>
-				<unitPattern count="other">{0} 秒差距</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>皮米</displayName>
 				<unitPattern count="other">{0} 皮米</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>英里</displayName>
+				<unitPattern count="other">{0} 英里</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>碼</displayName>
 				<unitPattern count="other">{0} 碼</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>英尺</displayName>
+				<unitPattern count="other">{0} 呎</unitPattern>
+				<perUnitPattern>{0}/呎</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>英寸</displayName>
+				<unitPattern count="other">{0} 吋</unitPattern>
+				<perUnitPattern>{0}/吋</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>秒差距</displayName>
+				<unitPattern count="other">{0} 秒差距</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>光年</displayName>
+				<unitPattern count="other">{0} 光年</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>天文單位</displayName>
+				<unitPattern count="other">{0} 天文單位</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName draft="contributed">化朗</displayName>
+				<unitPattern count="other" draft="contributed">{0} 化朗</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName draft="contributed">fm</displayName>
+				<unitPattern count="other" draft="contributed">{0} 英尋</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>海里</displayName>
+				<unitPattern count="other">{0} 海里</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>斯堪地那維亞英里</displayName>
+				<unitPattern count="other">{0} 斯堪地那維亞英里</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>勒克斯</displayName>
 				<unitPattern count="other">{0} 勒克斯</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>克拉</displayName>
-				<unitPattern count="other">{0} 克拉</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>克</displayName>
-				<unitPattern count="other">{0} 克</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>公斤</displayName>
-				<unitPattern count="other">{0} 公斤</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>公噸</displayName>
 				<unitPattern count="other">{0} 公噸</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>微克</displayName>
-				<unitPattern count="other">{0} 微克</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>公斤</displayName>
+				<unitPattern count="other">{0} 公斤</unitPattern>
+				<perUnitPattern>{0}/公斤</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>克</displayName>
+				<unitPattern count="other">{0} 克</unitPattern>
+				<perUnitPattern>{0}/克</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>毫克</displayName>
 				<unitPattern count="other">{0} 毫克</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>盎司</displayName>
-				<unitPattern count="other">{0} 盎司</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>金衡盎司</displayName>
-				<unitPattern count="other">{0} 金衡盎司</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>磅</displayName>
-				<unitPattern count="other">{0} 磅</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="contributed">st</displayName>
-				<unitPattern count="other" draft="contributed">{0} 英石</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>微克</displayName>
+				<unitPattern count="other">{0} 微克</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>英噸</displayName>
 				<unitPattern count="other">{0} 英噸</unitPattern>
 			</unit>
+			<unit type="mass-stone">
+				<displayName draft="contributed">st</displayName>
+				<unitPattern count="other" draft="contributed">{0} 英石</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>磅</displayName>
+				<unitPattern count="other">{0} 磅</unitPattern>
+				<perUnitPattern>{0}/磅</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>盎司</displayName>
+				<unitPattern count="other">{0} 盎司</unitPattern>
+				<perUnitPattern>{0}/盎司</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>金衡盎司</displayName>
+				<unitPattern count="other">{0} 金衡盎司</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>克拉</displayName>
+				<unitPattern count="other">{0} 克拉</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>吉瓦</displayName>
 				<unitPattern count="other">{0} 吉瓦</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>匹</displayName>
-				<unitPattern count="other">{0} 匹</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>千瓦</displayName>
-				<unitPattern count="other">{0} 千瓦</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>百萬瓦</displayName>
 				<unitPattern count="other">{0} 百萬瓦</unitPattern>
 			</unit>
+			<unit type="power-kilowatt">
+				<displayName>千瓦</displayName>
+				<unitPattern count="other">{0} 千瓦</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>瓦特</displayName>
+				<unitPattern count="other">{0} 瓦</unitPattern>
+			</unit>
 			<unit type="power-milliwatt">
 				<displayName>毫瓦</displayName>
 				<unitPattern count="other">{0} 毫瓦</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName>瓦特</displayName>
-				<unitPattern count="other">{0} 瓦特</unitPattern>
+			<unit type="power-horsepower">
+				<displayName>匹</displayName>
+				<unitPattern count="other">{0} 匹</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>百帕</displayName>
 				<unitPattern count="other">{0} 百帕</unitPattern>
 			</unit>
+			<unit type="pressure-millimeter-of-mercury">
+				<displayName>毫米汞柱</displayName>
+				<unitPattern count="other">{0} 毫米汞柱</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>磅力/平方英寸</displayName>
+				<unitPattern count="other">{0} 磅力/平方英寸</unitPattern>
+			</unit>
 			<unit type="pressure-inch-hg">
-				<displayName>英吋水銀柱</displayName>
-				<unitPattern count="other">{0} inHg</unitPattern>
+				<displayName>英寸汞柱</displayName>
+				<unitPattern count="other">{0} 英寸汞柱</unitPattern>
 			</unit>
 			<unit type="pressure-millibar">
 				<displayName>毫巴</displayName>
 				<unitPattern count="other">{0} 毫巴</unitPattern>
 			</unit>
-			<unit type="pressure-millimeter-of-mercury">
-				<displayName>毫米水銀柱</displayName>
-				<unitPattern count="other">{0} mm Hg</unitPattern>
-			</unit>
-			<unit type="pressure-pound-per-square-inch">
-				<displayName>磅力/平方英寸</displayName>
-				<unitPattern count="other">{0} psi</unitPattern>
-			</unit>
-			<unit type="proportion-karat">
-				<displayName>克拉</displayName>
-				<unitPattern count="other">{0} 克拉</unitPattern>
-			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>公里/小時</displayName>
 				<unitPattern count="other">{0} 公里/小時</unitPattern>
@@ -8748,42 +8984,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>英里/小時</displayName>
 				<unitPattern count="other">{0} 英里/小時</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>節</displayName>
+				<unitPattern count="other">{0} 節</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
-				<displayName>°C</displayName>
+				<displayName>攝氏</displayName>
 				<unitPattern count="other">{0}°C</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
-				<displayName>°F</displayName>
+				<displayName>華氏</displayName>
 				<unitPattern count="other">{0}°F</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
 				<displayName>K</displayName>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>英畝英尺</displayName>
-				<unitPattern count="other">{0} 英畝英尺</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName draft="contributed">bu</displayName>
-				<unitPattern count="other" draft="contributed">{0} 蒲式耳</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>釐升</displayName>
-				<unitPattern count="other">{0} 釐升</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>立方公分</displayName>
-				<unitPattern count="other">{0} 立方公分</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>立方英尺</displayName>
-				<unitPattern count="other" draft="contributed">{0} 立方英尺</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>立方英寸</displayName>
-				<unitPattern count="other">{0} 立方英寸</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>立方公里</displayName>
 				<unitPattern count="other">{0} 立方公里</unitPattern>
@@ -8791,6 +9011,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="volume-cubic-meter">
 				<displayName>立方公尺</displayName>
 				<unitPattern count="other">{0} 立方公尺</unitPattern>
+				<perUnitPattern>{0}/立方公尺</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>立方公分</displayName>
+				<unitPattern count="other">{0} 立方公分</unitPattern>
+				<perUnitPattern>{0}/立方公分</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>立方英里</displayName>
@@ -8800,21 +9026,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>立方碼</displayName>
 				<unitPattern count="other">{0} 立方碼</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>量杯</displayName>
-				<unitPattern count="other">{0} 量杯</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>立方英尺</displayName>
+				<unitPattern count="other">{0} 立方英尺</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>公合</displayName>
-				<unitPattern count="other">{0} 公合</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>立方英寸</displayName>
+				<unitPattern count="other">{0} 立方英寸</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>液盎司</displayName>
-				<unitPattern count="other">{0} 液盎司</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>加侖</displayName>
-				<unitPattern count="other">{0} 加侖</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>兆升</displayName>
+				<unitPattern count="other">{0} 兆升</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>公石</displayName>
@@ -8822,24 +9044,58 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</unit>
 			<unit type="volume-liter">
 				<displayName>公升</displayName>
-				<unitPattern count="other">{0} 公升</unitPattern>
+				<unitPattern count="other">{0} 升</unitPattern>
+				<perUnitPattern>{0}/升</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>兆升</displayName>
-				<unitPattern count="other">{0} 兆升</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>公合</displayName>
+				<unitPattern count="other">{0} 公合</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>釐升</displayName>
+				<unitPattern count="other">{0} 釐升</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>毫升</displayName>
 				<unitPattern count="other">{0} 毫升</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>品脫</displayName>
-				<unitPattern count="other">{0} 品脫</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>公制品脫</displayName>
+				<unitPattern count="other">{0} 公制品脫</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>公制量杯</displayName>
+				<unitPattern count="other">{0} 公制杯</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>英畝英尺</displayName>
+				<unitPattern count="other">{0} 英畝英尺</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName draft="contributed">bu</displayName>
+				<unitPattern count="other" draft="contributed">{0} 蒲式耳</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>加侖</displayName>
+				<unitPattern count="other">{0} 加侖</unitPattern>
+				<perUnitPattern>{0}/加侖</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>夸脫</displayName>
 				<unitPattern count="other">{0} 夸脫</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>品脫</displayName>
+				<unitPattern count="other">{0} 品脫</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>量杯</displayName>
+				<unitPattern count="other">{0} 杯</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>液盎司</displayName>
+				<unitPattern count="other">{0} 液盎司</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>湯匙</displayName>
 				<unitPattern count="other">{0} 湯匙</unitPattern>
@@ -8848,6 +9104,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>茶匙</displayName>
 				<unitPattern count="other">{0} 茶匙</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">東經{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">北緯{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">南緯{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">西經{0}</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -8859,80 +9121,99 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="acceleration-meter-per-second-squared">
 				<unitPattern count="other" draft="contributed">{0}m/s²</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<unitPattern count="other">{0}分鐘</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<unitPattern count="other">{0}秒</unitPattern>
+			<unit type="angle-radian">
+				<unitPattern count="other" draft="contributed">{0}弧度</unitPattern>
 			</unit>
 			<unit type="angle-degree">
 				<unitPattern count="other">{0}度</unitPattern>
 			</unit>
-			<unit type="angle-radian">
-				<unitPattern count="other" draft="contributed">{0}弧度</unitPattern>
+			<unit type="angle-arc-minute">
+				<unitPattern count="other">{0}角分</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<unitPattern count="other">{0}英畝</unitPattern>
+			<unit type="angle-arc-second">
+				<unitPattern count="other">{0}角秒</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<unitPattern count="other" draft="contributed">{0}km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<unitPattern count="other">{0}公頃</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<unitPattern count="other" draft="contributed">{0}m²</unitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<unitPattern count="other" draft="contributed">{0}cm²</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<unitPattern count="other">{0}平方英里</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<unitPattern count="other">{0}英畝</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<unitPattern count="other" draft="contributed">{0}yd²</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<unitPattern count="other">{0}平方英尺</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
 				<unitPattern count="other" draft="contributed">{0}in²</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="other" draft="contributed">{0}km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<unitPattern count="other" draft="contributed">{0}m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<unitPattern count="other">{0}平方英里</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<unitPattern count="other" draft="contributed">{0}yd²</unitPattern>
+			<unit type="concentr-karat">
+				<unitPattern count="other" draft="contributed">{0}kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="other" draft="contributed">{0}L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>升/100公里</displayName>
+				<unitPattern count="other">{0}升/100公里</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<unitPattern count="other" draft="contributed">{0}mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<unitPattern count="other" draft="contributed">{0}bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<unitPattern count="other" draft="contributed">{0}byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<unitPattern count="other" draft="contributed">{0}Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<unitPattern count="other" draft="contributed">{0}GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<unitPattern count="other" draft="contributed">{0}kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<unitPattern count="other" draft="contributed">{0}kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<unitPattern count="other" draft="contributed">{0}Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<unitPattern count="other" draft="contributed">{0}MB</unitPattern>
+			<unit type="digital-terabyte">
+				<unitPattern count="other" draft="contributed">{0}TB</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<unitPattern count="other" draft="contributed">{0}Tb</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<unitPattern count="other" draft="contributed">{0}TB</unitPattern>
+			<unit type="digital-gigabyte">
+				<unitPattern count="other" draft="contributed">{0}GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<unitPattern count="other" draft="contributed">{0}Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<unitPattern count="other" draft="contributed">{0}MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<unitPattern count="other" draft="contributed">{0}Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<unitPattern count="other" draft="contributed">{0}kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<unitPattern count="other" draft="contributed">{0}kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<unitPattern count="other" draft="contributed">{0}byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<unitPattern count="other" draft="contributed">{0}bit</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>年</displayName>
+				<unitPattern count="other">{0}年</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>月</displayName>
+				<unitPattern count="other">{0}月</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>週</displayName>
+				<unitPattern count="other">{0}週</unitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>天</displayName>
@@ -8942,35 +9223,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>小時</displayName>
 				<unitPattern count="other">{0}時</unitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<unitPattern count="other" draft="contributed">{0}μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>毫秒</displayName>
-				<unitPattern count="other">{0}毫秒</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>分鐘</displayName>
 				<unitPattern count="other">{0}分</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>個月</displayName>
-				<unitPattern count="other">{0}個月</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<unitPattern count="other" draft="contributed">{0}ns</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>秒</displayName>
 				<unitPattern count="other">{0}秒</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>週</displayName>
-				<unitPattern count="other">{0}週</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>毫秒</displayName>
+				<unitPattern count="other">{0}毫秒</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>年</displayName>
-				<unitPattern count="other">{0}年</unitPattern>
+			<unit type="duration-microsecond">
+				<unitPattern count="other" draft="contributed">{0}μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<unitPattern count="other" draft="contributed">{0}ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<unitPattern count="other" draft="contributed">{0}A</unitPattern>
@@ -8984,118 +9253,125 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="electric-volt">
 				<unitPattern count="other" draft="contributed">{0}V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<unitPattern count="other" draft="contributed">{0}千卡</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<unitPattern count="other" draft="contributed">{0}卡</unitPattern>
 			</unit>
 			<unit type="energy-foodcalorie">
 				<unitPattern count="other" draft="contributed">{0}大卡</unitPattern>
 			</unit>
+			<unit type="energy-kilojoule">
+				<unitPattern count="other" draft="contributed">{0}千焦耳</unitPattern>
+			</unit>
 			<unit type="energy-joule">
 				<unitPattern count="other" draft="contributed">{0}焦</unitPattern>
 			</unit>
-			<unit type="energy-kilocalorie">
-				<unitPattern count="other" draft="contributed">{0}千卡</unitPattern>
-			</unit>
-			<unit type="energy-kilojoule">
-				<unitPattern count="other" draft="contributed">{0}千焦</unitPattern>
-			</unit>
 			<unit type="energy-kilowatt-hour">
 				<unitPattern count="other" draft="contributed">{0}kWh</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
 				<unitPattern count="other" draft="contributed">{0}GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<unitPattern count="other" draft="contributed">{0}Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<unitPattern count="other" draft="contributed">{0}MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<unitPattern count="other" draft="contributed">{0}kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<unitPattern count="other" draft="contributed">{0}MHz</unitPattern>
-			</unit>
-			<unit type="length-astronomical-unit">
-				<unitPattern count="other" draft="contributed">{0}au</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>公分</displayName>
-				<unitPattern count="other">{0}公分</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<unitPattern count="other" draft="contributed">{0}dm</unitPattern>
-			</unit>
-			<unit type="length-fathom">
-				<displayName draft="contributed">英尋</displayName>
-				<unitPattern count="other" draft="contributed">{0}fm</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="other">{0}呎</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName draft="contributed">化朗</displayName>
-				<unitPattern count="other" draft="contributed">{0}化朗</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="other">{0}吋</unitPattern>
+			<unit type="frequency-hertz">
+				<unitPattern count="other" draft="contributed">{0}Hz</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>公里</displayName>
 				<unitPattern count="other">{0}公里</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="other">{0}光年</unitPattern>
-			</unit>
 			<unit type="length-meter">
 				<displayName>公尺</displayName>
 				<unitPattern count="other">{0}公尺</unitPattern>
 			</unit>
-			<unit type="length-micrometer">
-				<unitPattern count="other" draft="contributed">{0}µm</unitPattern>
+			<unit type="length-decimeter">
+				<unitPattern count="other" draft="contributed">{0}dm</unitPattern>
 			</unit>
-			<unit type="length-mile">
-				<unitPattern count="other">{0}英里</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>公分</displayName>
+				<unitPattern count="other">{0}公分</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>公釐</displayName>
 				<unitPattern count="other">{0}公釐</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<unitPattern count="other" draft="contributed">{0}µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<unitPattern count="other" draft="contributed">{0}nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<unitPattern count="other" draft="contributed">{0}nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<unitPattern count="other" draft="contributed">{0}pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<unitPattern count="other">{0}皮米</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<unitPattern count="other">{0}英里</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<unitPattern count="other">{0}碼</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<unitPattern count="other">{0}呎</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="other">{0}吋</unitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<unitPattern count="other" draft="contributed">{0}pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="other">{0}光年</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<unitPattern count="other" draft="contributed">{0}au</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName draft="contributed">化朗</displayName>
+				<unitPattern count="other" draft="contributed">{0}化朗</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName draft="contributed">英尋</displayName>
+				<unitPattern count="other" draft="contributed">{0}fm</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<unitPattern count="other" draft="contributed">{0}nmi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<unitPattern count="other" draft="contributed">{0}lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<unitPattern count="other" draft="contributed">{0}CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>克</displayName>
-				<unitPattern count="other">{0}克</unitPattern>
+			<unit type="mass-metric-ton">
+				<unitPattern count="other" draft="contributed">{0}t</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>公斤</displayName>
 				<unitPattern count="other">{0}公斤</unitPattern>
 			</unit>
-			<unit type="mass-metric-ton">
-				<unitPattern count="other" draft="contributed">{0}t</unitPattern>
+			<unit type="mass-gram">
+				<displayName>克</displayName>
+				<unitPattern count="other">{0}克</unitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<unitPattern count="other" draft="contributed">{0}mg</unitPattern>
 			</unit>
 			<unit type="mass-microgram">
 				<unitPattern count="other" draft="contributed">{0}µg</unitPattern>
 			</unit>
-			<unit type="mass-milligram">
-				<unitPattern count="other" draft="contributed">{0}mg</unitPattern>
+			<unit type="mass-ton">
+				<unitPattern count="other" draft="contributed">{0}tn</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName draft="contributed">英石</displayName>
+				<unitPattern count="other" draft="contributed">{0}st</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<unitPattern count="other">{0}磅</unitPattern>
 			</unit>
 			<unit type="mass-ounce">
 				<unitPattern count="other">{0}盎司</unitPattern>
@@ -9103,55 +9379,45 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<unit type="mass-ounce-troy">
 				<unitPattern count="other" draft="contributed">{0}oz-t</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<unitPattern count="other">{0}磅</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="contributed">英石</displayName>
-				<unitPattern count="other" draft="contributed">{0}st</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<unitPattern count="other" draft="contributed">{0}tn</unitPattern>
+			<unit type="mass-carat">
+				<unitPattern count="other" draft="contributed">{0}CD</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<unitPattern count="other" draft="contributed">{0}GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="other">{0}匹</unitPattern>
+			<unit type="power-megawatt">
+				<unitPattern count="other" draft="contributed">{0}MW</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="other">{0}千瓦</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<unitPattern count="other" draft="contributed">{0}MW</unitPattern>
+			<unit type="power-watt">
+				<unitPattern count="other">{0}瓦特</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<unitPattern count="other" draft="contributed">{0}mW</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<unitPattern count="other">{0}瓦特</unitPattern>
+			<unit type="power-horsepower">
+				<unitPattern count="other">{0}匹</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<unitPattern count="other">{0}百帕</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<unitPattern count="other" draft="contributed">{0}英吋汞柱</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<unitPattern count="other">{0}毫巴</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<unitPattern count="other" draft="contributed">{0}mmHg</unitPattern>
 			</unit>
 			<unit type="pressure-pound-per-square-inch">
 				<unitPattern count="other" draft="contributed">{0}psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<unitPattern count="other" draft="contributed">{0}kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<unitPattern count="other" draft="contributed">{0}英吋汞柱</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<unitPattern count="other">{0}毫巴</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>公里/小時</displayName>
-				<unitPattern count="other">{0}km/h</unitPattern>
+				<unitPattern count="other">{0}公里/小時</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
 				<unitPattern count="other" draft="contributed">{0}公尺/秒</unitPattern>
@@ -9170,74 +9436,80 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName draft="contributed">K</displayName>
 				<unitPattern count="other" draft="contributed">{0}°K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<unitPattern count="other" draft="contributed">{0}ac-ft</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName draft="contributed">蒲式耳</displayName>
-				<unitPattern count="other" draft="contributed">{0}bu</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<unitPattern count="other" draft="contributed">{0}cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<unitPattern count="other" draft="contributed">{0}cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<unitPattern count="other" draft="contributed">{0}ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<unitPattern count="other" draft="contributed">{0}in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<unitPattern count="other">{0}km³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-meter">
 				<unitPattern count="other" draft="contributed">{0}m³</unitPattern>
 			</unit>
+			<unit type="volume-cubic-centimeter">
+				<unitPattern count="other" draft="contributed">{0}cm³</unitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<unitPattern count="other">{0}立方英里</unitPattern>
 			</unit>
 			<unit type="volume-cubic-yard">
 				<unitPattern count="other" draft="contributed">{0}yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<unitPattern count="other" draft="contributed">{0}c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<unitPattern count="other" draft="contributed">{0}ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<unitPattern count="other" draft="contributed">{0}dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<unitPattern count="other" draft="contributed">{0}in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<unitPattern count="other" draft="contributed">{0}fl-oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<unitPattern count="other" draft="contributed">{0}gal</unitPattern>
+			<unit type="volume-megaliter">
+				<unitPattern count="other" draft="contributed">{0}ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<unitPattern count="other" draft="contributed">{0}hL</unitPattern>
 			</unit>
 			<unit type="volume-liter">
 				<displayName>公升</displayName>
-				<unitPattern count="other">{0}公升</unitPattern>
+				<unitPattern count="other">{0}升</unitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<unitPattern count="other" draft="contributed">{0}ML</unitPattern>
+			<unit type="volume-deciliter">
+				<unitPattern count="other" draft="contributed">{0}dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<unitPattern count="other" draft="contributed">{0}cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<unitPattern count="other" draft="contributed">{0}mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<unitPattern count="other" draft="contributed">{0}pt</unitPattern>
+			<unit type="volume-acre-foot">
+				<unitPattern count="other" draft="contributed">{0}ac-ft</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName draft="contributed">蒲式耳</displayName>
+				<unitPattern count="other" draft="contributed">{0}bu</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<unitPattern count="other" draft="contributed">{0}gal</unitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<unitPattern count="other" draft="contributed">{0}qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<unitPattern count="other" draft="contributed">{0}pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<unitPattern count="other" draft="contributed">{0}c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<unitPattern count="other" draft="contributed">{0}fl-oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<unitPattern count="other" draft="contributed">{0}匙</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
 				<unitPattern count="other" draft="contributed">{0}tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">東經{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">北緯{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">南緯{0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">西經{0}</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant_HK.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant_HK.xml
new file mode 100644
index 00000000000..682a697977c
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant_HK.xml
@@ -0,0 +1,2391 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2015 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml>
+	<identity>
+		<version number="$Revision: 12217 $"/>
+		<language type="zh"/>
+		<script type="Hant"/>
+		<territory type="HK"/>
+	</identity>
+	<localeDisplayNames>
+		<languages>
+			<language type="az" draft="contributed">阿塞拜疆文</language>
+			<language type="az" alt="short" draft="contributed">阿澤里</language>
+			<language type="az_Arab" draft="contributed">南阿塞拜疆文</language>
+			<language type="ba" draft="contributed">巴什基爾文</language>
+			<language type="br" draft="contributed">布里多尼文</language>
+			<language type="bs" draft="contributed">波斯尼亞文</language>
+			<language type="ca" draft="contributed">加泰隆尼亞文</language>
+			<language type="de_AT" draft="contributed">奧地利德文</language>
+			<language type="de_CH" draft="contributed">瑞士德語</language>
+			<language type="en_AU" draft="contributed">澳洲英文</language>
+			<language type="en_CA" draft="contributed">加拿大英文</language>
+			<language type="en_GB" draft="contributed">英國英文</language>
+			<language type="en_GB" alt="short" draft="contributed">英式英文</language>
+			<language type="en_US" draft="contributed">美國英文</language>
+			<language type="en_US" alt="short" draft="contributed">美式英文</language>
+			<language type="eo" draft="contributed">世界語</language>
+			<language type="es_419" draft="contributed">拉丁美洲西班牙文</language>
+			<language type="es_ES" draft="contributed">歐洲西班牙文</language>
+			<language type="es_MX" draft="contributed">墨西哥西班牙文</language>
+			<language type="fr_CA" draft="contributed">加拿大法文</language>
+			<language type="fr_CH" draft="contributed">瑞士法文</language>
+			<language type="gl" draft="contributed">加里西亞文</language>
+			<language type="gsw" draft="contributed">瑞士德文</language>
+			<language type="hr" draft="contributed">克羅地亞文</language>
+			<language type="it">意大利文</language>
+			<language type="ka" draft="contributed">格魯吉亞文</language>
+			<language type="kn" draft="contributed">坎納達文</language>
+			<language type="lo" draft="contributed">老撾文</language>
+			<language type="lol" draft="unconfirmed">蒙古語</language>
+			<language type="mfe" draft="contributed">毛里裘斯克里奧爾文</language>
+			<language type="mg" draft="contributed">馬拉加斯文</language>
+			<language type="ml" draft="contributed">馬拉雅拉姆文</language>
+			<language type="mt" draft="contributed">馬耳他文</language>
+			<language type="nds_NL" draft="contributed">荷蘭低地德文</language>
+			<language type="nqo" draft="contributed">西非書面語言（N’ko）</language>
+			<language type="or" draft="contributed">奧里雅文</language>
+			<language type="ps" alt="variant">普什圖語</language>
+			<language type="pt_BR" draft="contributed">巴西葡萄牙語</language>
+			<language type="pt_PT" draft="contributed">歐洲葡萄牙文</language>
+			<language type="ro_MD" draft="contributed">摩爾多瓦羅馬尼亞文</language>
+			<language type="rw" draft="contributed">盧旺達文</language>
+			<language type="sd" draft="contributed">信德語</language>
+			<language type="sl" draft="contributed">斯洛文尼亞文</language>
+			<language type="smn" draft="contributed">伊納里薩米文</language>
+			<language type="sn" draft="contributed">修納文</language>
+			<language type="so" draft="contributed">索馬里文</language>
+			<language type="sw_CD">剛果史瓦希里文</language>
+			<language type="ta" draft="contributed">泰米爾文</language>
+			<language type="to" draft="contributed">湯加文</language>
+			<language type="ug" alt="variant">維吾爾語</language>
+			<language type="ur" draft="contributed">烏爾都文</language>
+			<language type="wbp" draft="contributed">瓦爾皮里文</language>
+			<language type="zgh" draft="contributed">摩洛哥標準塔馬齊格特文</language>
+		</languages>
+		<scripts>
+			<script type="Cyrl" draft="contributed">西里爾文</script>
+			<script type="Deva" draft="contributed">梵文</script>
+			<script type="Ethi" draft="contributed">埃塞俄比亞文</script>
+			<script type="Geor" draft="contributed">格魯吉亞文</script>
+			<script type="Guru" draft="contributed">古木基文</script>
+			<script type="Hang" draft="contributed">韓文字母</script>
+			<script type="Hans" draft="contributed">簡體字</script>
+			<script type="Hant" draft="contributed">繁體字</script>
+			<script type="Knda" draft="contributed">坎納達文</script>
+			<script type="Laoo" draft="contributed">老撾文</script>
+			<script type="Latn" draft="contributed">拉丁字母</script>
+			<script type="Mlym" draft="contributed">馬拉雅拉姆文</script>
+			<script type="Orya" draft="contributed">奧里雅文</script>
+			<script type="Sinh" draft="contributed">僧伽羅文</script>
+			<script type="Taml" draft="contributed">泰米爾文</script>
+			<script type="Thaa" draft="contributed">它拿字母</script>
+			<script type="Tibt" draft="contributed">藏文</script>
+		</scripts>
+		<territories>
+			<territory type="013">中美洲</territory>
+			<territory type="029" draft="contributed">加勒比</territory>
+			<territory type="061" draft="contributed">波利尼西亞</territory>
+			<territory type="AE">阿拉伯聯合酋長國</territory>
+			<territory type="AG" draft="contributed">安提瓜和巴布達</territory>
+			<territory type="AW">阿魯巴</territory>
+			<territory type="AZ">阿塞拜疆</territory>
+			<territory type="BA">波斯尼亞和黑塞哥維那</territory>
+			<territory type="BB" draft="contributed">巴巴多斯</territory>
+			<territory type="BF" draft="contributed">布基納法索</territory>
+			<territory type="BI" draft="contributed">布隆迪</territory>
+			<territory type="BJ" draft="contributed">貝寧</territory>
+			<territory type="BL" draft="contributed">聖巴泰勒米</territory>
+			<territory type="BV" draft="contributed">鮑威特島</territory>
+			<territory type="BW" draft="contributed">博茨瓦納</territory>
+			<territory type="BZ" draft="contributed">伯利茲</territory>
+			<territory type="CC" draft="contributed">可可斯群島</territory>
+			<territory type="CD" draft="contributed">剛果 - 金夏沙</territory>
+			<territory type="CG" draft="contributed">剛果 - 布拉薩</territory>
+			<territory type="CI" draft="contributed">科特迪瓦</territory>
+			<territory type="CI" alt="variant">象牙海岸</territory>
+			<territory type="CP" draft="contributed">克里珀頓島</territory>
+			<territory type="CR">哥斯達黎加</territory>
+			<territory type="CV" draft="contributed">佛得角</territory>
+			<territory type="CY" draft="contributed">塞浦路斯</territory>
+			<territory type="DJ" draft="contributed">吉布提</territory>
+			<territory type="DO" draft="contributed">多米尼加共和國</territory>
+			<territory type="EC" draft="contributed">厄瓜多爾</territory>
+			<territory type="ER" draft="contributed">厄立特里亞</territory>
+			<territory type="ET">埃塞俄比亞</territory>
+			<territory type="GA" draft="contributed">加蓬</territory>
+			<territory type="GD">格林納達</territory>
+			<territory type="GE">格魯吉亞</territory>
+			<territory type="GH" draft="contributed">加納</territory>
+			<territory type="GM" draft="contributed">岡比亞</territory>
+			<territory type="GS" draft="contributed">南佐治亞島與南桑威奇群島</territory>
+			<territory type="GT">危地馬拉</territory>
+			<territory type="GW" draft="contributed">幾內亞比紹</territory>
+			<territory type="GY" draft="contributed">圭亞那</territory>
+			<territory type="HN" draft="contributed">洪都拉斯</territory>
+			<territory type="HR" draft="contributed">克羅地亞</territory>
+			<territory type="IM" draft="contributed">馬恩島</territory>
+			<territory type="IO" draft="contributed">英屬印度洋領土</territory>
+			<territory type="IT">意大利</territory>
+			<territory type="KE">肯雅</territory>
+			<territory type="KM" draft="contributed">科摩羅</territory>
+			<territory type="KN" draft="contributed">聖基茨和尼維斯</territory>
+			<territory type="LA" draft="contributed">老撾</territory>
+			<territory type="LC" draft="contributed">聖盧西亞</territory>
+			<territory type="LI">列支敦士登</territory>
+			<territory type="LR" draft="contributed">利比里亞</territory>
+			<territory type="LS" draft="contributed">萊索托</territory>
+			<territory type="ME">黑山</territory>
+			<territory type="ML" draft="contributed">馬里</territory>
+			<territory type="MR" draft="contributed">毛里塔尼亞</territory>
+			<territory type="MS" draft="contributed">蒙特塞拉特</territory>
+			<territory type="MT" draft="contributed">馬耳他</territory>
+			<territory type="MU">毛里裘斯</territory>
+			<territory type="MV">馬爾代夫</territory>
+			<territory type="MW" draft="contributed">馬拉維</territory>
+			<territory type="MZ">莫桑比克</territory>
+			<territory type="NE" draft="contributed">尼日爾</territory>
+			<territory type="NG">尼日利亞</territory>
+			<territory type="NR" draft="contributed">瑙魯</territory>
+			<territory type="OM" draft="contributed">阿曼</territory>
+			<territory type="PF" draft="contributed">法屬波利尼西亞</territory>
+			<territory type="PG" draft="contributed">巴布亞新幾內亞</territory>
+			<territory type="PN" draft="contributed">皮特凱恩島</territory>
+			<territory type="QA">卡塔爾</territory>
+			<territory type="RW" draft="contributed">盧旺達</territory>
+			<territory type="SA">沙特阿拉伯</territory>
+			<territory type="SB" draft="contributed">所羅門群島</territory>
+			<territory type="SC" draft="contributed">塞舌爾</territory>
+			<territory type="SI" draft="contributed">斯洛文尼亞</territory>
+			<territory type="SJ" draft="contributed">斯瓦爾巴特群島及揚馬延島</territory>
+			<territory type="SL">塞拉利昂</territory>
+			<territory type="SO" draft="contributed">索馬里</territory>
+			<territory type="SR" draft="contributed">蘇里南</territory>
+			<territory type="ST" draft="contributed">聖多美和普林西比</territory>
+			<territory type="SZ">斯威士蘭</territory>
+			<territory type="TC">特克斯和凱科斯群島</territory>
+			<territory type="TD" draft="contributed">乍得</territory>
+			<territory type="TF" draft="contributed">法屬南部地區</territory>
+			<territory type="TG" draft="contributed">多哥共和國</territory>
+			<territory type="TO" draft="contributed">湯加</territory>
+			<territory type="TT" draft="contributed">千里達和多巴哥</territory>
+			<territory type="TV">圖瓦盧</territory>
+			<territory type="TZ">坦桑尼亞</territory>
+			<territory type="VC" draft="contributed">聖文森特和格林納丁斯</territory>
+			<territory type="VG" draft="contributed">英屬維爾京群島</territory>
+			<territory type="VI" draft="contributed">美屬維爾京群島</territory>
+			<territory type="VU">瓦努阿圖</territory>
+			<territory type="YE" draft="contributed">也門</territory>
+			<territory type="ZM" draft="contributed">贊比亞</territory>
+			<territory type="ZW" draft="contributed">津巴布韋</territory>
+		</territories>
+		<variants>
+			<variant type="1901" draft="contributed">傳統德國拼字法</variant>
+			<variant type="1996" draft="contributed">1996 德國拼字法</variant>
+			<variant type="BISKE" draft="unconfirmed">San Giorgio/Bila 方言</variant>
+			<variant type="REVISED" draft="contributed">已修訂拼字法</variant>
+			<variant type="SCOTLAND" draft="contributed">蘇格蘭標準英語</variant>
+		</variants>
+		<keys>
+			<key type="ms" draft="contributed">度量衡系統</key>
+			<key type="x" draft="unconfirmed">專用區</key>
+		</keys>
+		<types>
+			<type key="calendar" type="ethiopic" draft="contributed">埃及曆</type>
+			<type key="calendar" type="ethiopic-amete-alem" draft="contributed">埃塞俄比亞阿美德阿萊姆曆</type>
+			<type key="collation" type="big5han">繁體中文排序 (Big5)</type>
+			<type key="collation" type="dictionary" draft="contributed">詞典排序</type>
+			<type key="collation" type="gb2312han">簡體中文排序 (GB2312)</type>
+			<type key="collation" type="reformed" draft="contributed">改革版排序</type>
+			<type key="ms" type="uksystem" draft="contributed">英制</type>
+			<type key="ms" type="ussystem" draft="contributed">美制</type>
+			<type key="numbers" type="deva" draft="contributed">天城體數字</type>
+			<type key="numbers" type="ethi">埃塞俄比亞數字</type>
+			<type key="numbers" type="geor" draft="contributed">格魯吉亞數字</type>
+			<type key="numbers" type="knda">卡納達數字</type>
+			<type key="numbers" type="laoo">老撾數字</type>
+			<type key="numbers" type="mlym" draft="contributed">馬拉雅拉姆數字</type>
+			<type key="numbers" type="mong" draft="unconfirmed">蒙古文位數</type>
+			<type key="numbers" type="orya">奧里亞數字</type>
+			<type key="numbers" type="taml">泰米爾數字</type>
+			<type key="numbers" type="tamldec" draft="contributed">泰米爾數字</type>
+		</types>
+		<transformNames>
+			<transformName type="Numeric" draft="unconfirmed">數值</transformName>
+			<transformName type="x-Accents" draft="unconfirmed">重音</transformName>
+			<transformName type="x-Jamo" draft="unconfirmed">韓文</transformName>
+		</transformNames>
+	</localeDisplayNames>
+	<characters>
+		<ellipsis type="final" draft="contributed">{0}⋯</ellipsis>
+		<ellipsis type="initial" draft="contributed">⋯{0}</ellipsis>
+		<ellipsis type="medial" draft="contributed">{0}⋯{1}</ellipsis>
+		<ellipsis type="word-final" draft="contributed">{0}⋯</ellipsis>
+		<ellipsis type="word-initial" draft="contributed">⋯{0}</ellipsis>
+		<ellipsis type="word-medial" draft="contributed">{0}⋯{1}</ellipsis>
+	</characters>
+	<dates>
+		<calendars>
+			<calendar type="buddhist">
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="Md" draft="contributed">M-d</dateFormatItem>
+						<dateFormatItem id="MEd" draft="contributed">M-d（E）</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="chinese">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">正月</month>
+							<month type="2">二月</month>
+							<month type="3">三月</month>
+							<month type="4">四月</month>
+							<month type="5">五月</month>
+							<month type="6">六月</month>
+							<month type="7">七月</month>
+							<month type="8">八月</month>
+							<month type="9">九月</month>
+							<month type="10">十月</month>
+							<month type="11">十一月</month>
+							<month type="12">十二月</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">正</month>
+							<month type="2">二</month>
+							<month type="3">三</month>
+							<month type="4">四</month>
+							<month type="5">五</month>
+							<month type="6">六</month>
+							<month type="7">七</month>
+							<month type="8">八</month>
+							<month type="9">九</month>
+							<month type="10">十</month>
+							<month type="11">十一</month>
+							<month type="12">十二</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">正月</month>
+							<month type="2">二月</month>
+							<month type="3">三月</month>
+							<month type="4">四月</month>
+							<month type="5">五月</month>
+							<month type="6">六月</month>
+							<month type="7">七月</month>
+							<month type="8">八月</month>
+							<month type="9">九月</month>
+							<month type="10">十月</month>
+							<month type="11">十一月</month>
+							<month type="12">十二月</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">正月</month>
+							<month type="2">二月</month>
+							<month type="3">三月</month>
+							<month type="4">四月</month>
+							<month type="5">五月</month>
+							<month type="6">六月</month>
+							<month type="7">七月</month>
+							<month type="8">八月</month>
+							<month type="9">九月</month>
+							<month type="10">十月</month>
+							<month type="11">十一月</month>
+							<month type="12">十二月</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">正</month>
+							<month type="2">二</month>
+							<month type="3">三</month>
+							<month type="4">四</month>
+							<month type="5">五</month>
+							<month type="6">六</month>
+							<month type="7">七</month>
+							<month type="8">八</month>
+							<month type="9">九</month>
+							<month type="10">十</month>
+							<month type="11">十一</month>
+							<month type="12">十二</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">正月</month>
+							<month type="2">二月</month>
+							<month type="3">三月</month>
+							<month type="4">四月</month>
+							<month type="5">五月</month>
+							<month type="6">六月</month>
+							<month type="7">七月</month>
+							<month type="8">八月</month>
+							<month type="9">九月</month>
+							<month type="10">十月</month>
+							<month type="11">十一月</month>
+							<month type="12">十二月</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern draft="contributed">U（r）年MMMdEEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern draft="contributed">U（r）年MMMd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern draft="contributed">U年MMMd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern draft="contributed">U/M/d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+			</calendar>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>Gy年M月d日EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>Gy年M月d日</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>Gy年M月d日</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>Gy/M/d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern draft="contributed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Ed">d日E</dateFormatItem>
+						<dateFormatItem id="Gy">Gy年</dateFormatItem>
+						<dateFormatItem id="GyMMM">Gy年M月</dateFormatItem>
+						<dateFormatItem id="GyMMMd">Gy年M月d日</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">Gy年M月d日E</dateFormatItem>
+						<dateFormatItem id="Md" draft="contributed">d/M</dateFormatItem>
+						<dateFormatItem id="MEd" draft="contributed">E, d/M</dateFormatItem>
+						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
+						<dateFormatItem id="y">Gy年</dateFormatItem>
+						<dateFormatItem id="yyyy">Gy年</dateFormatItem>
+						<dateFormatItem id="yyyyM">Gy/M</dateFormatItem>
+						<dateFormatItem id="yyyyMd">Gy/M/d</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">Gy/M/dE</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">Gy年M月</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">Gy年M月d日</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">Gy年M月d日E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM" draft="contributed">Gy年M月</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">Gy年QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">Gy年QQQQ</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d" draft="contributed">d/M 至 d/M</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d/M 至 d/M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d" draft="contributed">d/M（E） 至 d/M（E）</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d/M（E） 至 d/M（E）</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">Gy年至y年</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">Gy/M至y/M</greatestDifference>
+							<greatestDifference id="y">Gy/M至y/M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">Gy/M/d至y/M/d</greatestDifference>
+							<greatestDifference id="M">Gy/M/d至y/M/d</greatestDifference>
+							<greatestDifference id="y">Gy/M/d至y/M/d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">Gy/M/dE至y/M/dE</greatestDifference>
+							<greatestDifference id="M">Gy/M/dE至y/M/dE</greatestDifference>
+							<greatestDifference id="y">Gy/M/dE至y/M/dE</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">Gy年M月至M月</greatestDifference>
+							<greatestDifference id="y">Gy年M月至y年M月</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">Gy年M月d日至d日</greatestDifference>
+							<greatestDifference id="M">Gy年M月d日至M月d日</greatestDifference>
+							<greatestDifference id="y">Gy年M月d日至y年M月d日</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">Gy年M月d日E至d日E</greatestDifference>
+							<greatestDifference id="M">Gy年M月d日E至M月d日E</greatestDifference>
+							<greatestDifference id="y">Gy年M月d日E至y年M月d日E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">Gy年M月至M月</greatestDifference>
+							<greatestDifference id="y">Gy年M月至y年M月</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<quarters>
+					<quarterContext type="format">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">Q1</quarter>
+							<quarter type="2">Q2</quarter>
+							<quarter type="3">Q3</quarter>
+							<quarter type="4">Q4</quarter>
+						</quarterWidth>
+					</quarterContext>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">Q1</quarter>
+							<quarter type="2">Q2</quarter>
+							<quarter type="3">Q3</quarter>
+							<quarter type="4">Q4</quarter>
+						</quarterWidth>
+					</quarterContext>
+				</quarters>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight" draft="contributed">午夜</dayPeriod>
+							<dayPeriod type="morning1" draft="contributed">清晨</dayPeriod>
+							<dayPeriod type="morning2" draft="contributed">早上</dayPeriod>
+							<dayPeriod type="afternoon1" draft="contributed">中午</dayPeriod>
+							<dayPeriod type="afternoon2" draft="contributed">下午</dayPeriod>
+							<dayPeriod type="evening1" draft="contributed">晚上</dayPeriod>
+							<dayPeriod type="night1" draft="contributed">凌晨</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight" draft="contributed">午夜</dayPeriod>
+							<dayPeriod type="morning1" draft="contributed">清晨</dayPeriod>
+							<dayPeriod type="morning2" draft="contributed">早上</dayPeriod>
+							<dayPeriod type="afternoon1" draft="contributed">中午</dayPeriod>
+							<dayPeriod type="afternoon2" draft="contributed">下午</dayPeriod>
+							<dayPeriod type="evening1" draft="contributed">晚上</dayPeriod>
+							<dayPeriod type="night1" draft="contributed">凌晨</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight" draft="contributed">午夜</dayPeriod>
+							<dayPeriod type="morning1" draft="contributed">清晨</dayPeriod>
+							<dayPeriod type="morning2" draft="contributed">早上</dayPeriod>
+							<dayPeriod type="afternoon1" draft="contributed">中午</dayPeriod>
+							<dayPeriod type="afternoon2" draft="contributed">下午</dayPeriod>
+							<dayPeriod type="evening1" draft="contributed">晚上</dayPeriod>
+							<dayPeriod type="night1" draft="contributed">凌晨</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="morning1" draft="contributed">清晨</dayPeriod>
+							<dayPeriod type="morning2" draft="contributed">早上</dayPeriod>
+							<dayPeriod type="afternoon1" draft="contributed">中午</dayPeriod>
+							<dayPeriod type="afternoon2" draft="contributed">下午</dayPeriod>
+							<dayPeriod type="evening1" draft="contributed">晚上</dayPeriod>
+							<dayPeriod type="night1" draft="contributed">凌晨</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="morning1" draft="contributed">清晨</dayPeriod>
+							<dayPeriod type="morning2" draft="contributed">早上</dayPeriod>
+							<dayPeriod type="afternoon1" draft="contributed">中午</dayPeriod>
+							<dayPeriod type="afternoon2" draft="contributed">下午</dayPeriod>
+							<dayPeriod type="evening1" draft="contributed">晚上</dayPeriod>
+							<dayPeriod type="night1" draft="contributed">凌晨</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="morning1" draft="contributed">清晨</dayPeriod>
+							<dayPeriod type="morning2" draft="contributed">早上</dayPeriod>
+							<dayPeriod type="afternoon1" draft="contributed">中午</dayPeriod>
+							<dayPeriod type="afternoon2" draft="contributed">下午</dayPeriod>
+							<dayPeriod type="evening1" draft="contributed">晚上</dayPeriod>
+							<dayPeriod type="night1" draft="contributed">凌晨</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<eras>
+					<eraNames>
+						<era type="0" draft="contributed">公元前</era>
+						<era type="1" draft="contributed">公元</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0" draft="contributed">公元前</era>
+						<era type="1" draft="contributed">公元</era>
+					</eraAbbr>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>y年M月d日EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>d/M/y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="E" draft="contributed">cccc</dateFormatItem>
+						<dateFormatItem id="Ed">d日E</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">Gy年M月d日E</dateFormatItem>
+						<dateFormatItem id="Md" draft="contributed">d/M</dateFormatItem>
+						<dateFormatItem id="MEd" draft="contributed">E, d/M</dateFormatItem>
+						<dateFormatItem id="MMdd" draft="contributed">dd/MM</dateFormatItem>
+						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
+						<dateFormatItem id="yM" draft="contributed">M/y</dateFormatItem>
+						<dateFormatItem id="yMd" draft="contributed">d/M/y</dateFormatItem>
+						<dateFormatItem id="yMEd">y/M/dE</dateFormatItem>
+						<dateFormatItem id="yMM" draft="contributed">MM/y</dateFormatItem>
+						<dateFormatItem id="yMMMEd">y年M月d日E</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d" draft="contributed">d/M 至 d/M</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d/M 至 d/M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d" draft="contributed">d/M（E） 至 d/M（E）</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d/M（E） 至 d/M（E）</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M" draft="contributed">M/y 至 M/y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">M/y 至 M/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d" draft="contributed">d/M/y 至 d/M/y</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d/M/y 至 d/M/y</greatestDifference>
+							<greatestDifference id="y" draft="contributed">d/M/y 至 d/M/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d" draft="contributed">d/M/y（E） 至 d/M/y（E）</greatestDifference>
+							<greatestDifference id="M" draft="contributed">d/M/y（E） 至 d/M/y（E）</greatestDifference>
+							<greatestDifference id="y" draft="contributed">d/M/y（E） 至 d/M/y（E）</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="roc">
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="Ed">d日E</dateFormatItem>
+						<dateFormatItem id="Md" draft="contributed">d-M</dateFormatItem>
+						<dateFormatItem id="MEd" draft="contributed">d-M（E）</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">Gy/M/dE</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="year">
+				<relative type="-1">上年</relative>
+				<relative type="0">今年</relative>
+				<relative type="1">下年</relative>
+			</field>
+			<field type="year-short">
+				<relative type="-1">上年</relative>
+				<relative type="0">今年</relative>
+				<relative type="1">下年</relative>
+			</field>
+			<field type="year-narrow">
+				<relative type="-1">上年</relative>
+				<relative type="0">今年</relative>
+				<relative type="1">下年</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other" draft="contributed">{0}年後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other" draft="contributed">{0}年前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter">
+				<relative type="-1" draft="contributed">上一季</relative>
+				<relative type="0" draft="contributed">今季</relative>
+				<relative type="1" draft="contributed">下一季</relative>
+			</field>
+			<field type="quarter-short">
+				<relative type="-1" draft="contributed">上季</relative>
+				<relative type="0" draft="contributed">今季</relative>
+				<relative type="1" draft="contributed">下季</relative>
+			</field>
+			<field type="quarter-narrow">
+				<relative type="-1" draft="contributed">上季</relative>
+				<relative type="0" draft="contributed">今季</relative>
+				<relative type="1" draft="contributed">下季</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other" draft="contributed">+{0}Q</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other" draft="contributed">-{0}Q</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-narrow">
+				<relative type="-1" draft="contributed">上月</relative>
+				<relative type="0" draft="contributed">本月</relative>
+				<relative type="1" draft="contributed">下月</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other" draft="contributed">{0}個月後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other" draft="contributed">{0}個月前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week">
+				<displayName>星期</displayName>
+				<relative type="-1" draft="contributed">上星期</relative>
+				<relative type="0" draft="contributed">本星期</relative>
+				<relative type="1" draft="contributed">下星期</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other" draft="contributed">{0} 星期後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other" draft="contributed">{0} 星期前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-short">
+				<displayName draft="contributed">星期</displayName>
+				<relative type="-1" draft="contributed">上星期</relative>
+				<relative type="0" draft="contributed">本星期</relative>
+				<relative type="1" draft="contributed">下星期</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other" draft="contributed">{0} 星期後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other" draft="contributed">{0} 星期前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="other" draft="contributed">{0}週後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other" draft="contributed">{0}週前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day">
+				<relative type="-2" draft="contributed">前日</relative>
+				<relative type="-1" draft="contributed">昨日</relative>
+				<relative type="0" draft="contributed">今日</relative>
+				<relative type="1" draft="contributed">明日</relative>
+				<relative type="2" draft="contributed">後日</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other" draft="contributed">{0} 日後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other" draft="contributed">{0} 日前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-short">
+				<relative type="-2" draft="contributed">前日</relative>
+				<relative type="-1" draft="contributed">昨日</relative>
+				<relative type="0" draft="contributed">今日</relative>
+				<relative type="1" draft="contributed">明日</relative>
+				<relative type="2" draft="contributed">後日</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other" draft="contributed">{0} 日後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other" draft="contributed">{0} 日前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-narrow">
+				<relative type="-2" draft="contributed">前日</relative>
+				<relative type="-1" draft="contributed">昨日</relative>
+				<relative type="0" draft="contributed">今日</relative>
+				<relative type="1" draft="contributed">明日</relative>
+				<relative type="2" draft="contributed">後日</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other" draft="contributed">{0}日後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other" draft="contributed">{0}日前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="weekday">
+				<displayName>星期幾</displayName>
+			</field>
+			<field type="sun">
+				<relative type="-1">上星期日</relative>
+				<relative type="0">本星期日</relative>
+				<relative type="1">下星期日</relative>
+			</field>
+			<field type="sun-short">
+				<relative type="-1" draft="contributed">上星期日</relative>
+				<relative type="0" draft="contributed">本星期日</relative>
+				<relative type="1" draft="contributed">下星期日</relative>
+			</field>
+			<field type="mon">
+				<relative type="-1" draft="contributed">上星期一</relative>
+				<relative type="0" draft="contributed">本星期一</relative>
+				<relative type="1" draft="contributed">下星期一</relative>
+			</field>
+			<field type="mon-short">
+				<relative type="-1" draft="contributed">上星期一</relative>
+				<relative type="0" draft="contributed">本星期一</relative>
+				<relative type="1" draft="contributed">下星期一</relative>
+			</field>
+			<field type="tue">
+				<relative type="-1" draft="contributed">上星期二</relative>
+				<relative type="0" draft="contributed">本星期二</relative>
+				<relative type="1" draft="contributed">下星期二</relative>
+			</field>
+			<field type="tue-short">
+				<relative type="-1" draft="contributed">上星期二</relative>
+				<relative type="0" draft="contributed">本星期二</relative>
+				<relative type="1" draft="contributed">下星期二</relative>
+			</field>
+			<field type="wed">
+				<relative type="-1" draft="contributed">上星期三</relative>
+				<relative type="0" draft="contributed">本星期三</relative>
+				<relative type="1" draft="contributed">下星期三</relative>
+			</field>
+			<field type="wed-short">
+				<relative type="-1" draft="contributed">上星期三</relative>
+				<relative type="0" draft="contributed">本星期三</relative>
+				<relative type="1" draft="contributed">下星期三</relative>
+			</field>
+			<field type="thu">
+				<relative type="-1" draft="contributed">上星期四</relative>
+				<relative type="0" draft="contributed">本星期四</relative>
+				<relative type="1" draft="contributed">下星期四</relative>
+			</field>
+			<field type="thu-short">
+				<relative type="-1" draft="contributed">上星期四</relative>
+				<relative type="0" draft="contributed">本星期四</relative>
+				<relative type="1" draft="contributed">下星期四</relative>
+			</field>
+			<field type="fri">
+				<relative type="-1" draft="contributed">上星期五</relative>
+				<relative type="0" draft="contributed">本星期五</relative>
+				<relative type="1" draft="contributed">下星期五</relative>
+			</field>
+			<field type="fri-short">
+				<relative type="-1" draft="contributed">上星期五</relative>
+				<relative type="0" draft="contributed">本星期五</relative>
+				<relative type="1" draft="contributed">下星期五</relative>
+			</field>
+			<field type="sat">
+				<relative type="-1">上星期六</relative>
+				<relative type="0">本星期六</relative>
+				<relative type="1">下星期六</relative>
+			</field>
+			<field type="sat-short">
+				<relative type="-1">上星期六</relative>
+				<relative type="0">本星期六</relative>
+				<relative type="1">下星期六</relative>
+			</field>
+			<field type="hour-narrow">
+				<displayName>時</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other" draft="contributed">{0}小時後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other" draft="contributed">{0}小時前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-narrow">
+				<displayName draft="contributed">分</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other" draft="contributed">{0}分後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other" draft="contributed">{0}分前</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="other" draft="contributed">{0}秒後</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other" draft="contributed">{0}秒前</relativeTimePattern>
+				</relativeTime>
+			</field>
+		</fields>
+		<timeZoneNames>
+			<regionFormat type="daylight">{0}夏令時間</regionFormat>
+			<regionFormat type="standard">{0}標準時間</regionFormat>
+			<zone type="America/Antigua">
+				<exemplarCity draft="contributed">安提瓜</exemplarCity>
+			</zone>
+			<zone type="America/Anguilla">
+				<exemplarCity draft="contributed">安圭拉</exemplarCity>
+			</zone>
+			<zone type="Asia/Yerevan">
+				<exemplarCity draft="contributed">耶烈萬</exemplarCity>
+			</zone>
+			<zone type="Africa/Luanda">
+				<exemplarCity draft="contributed">盧安達</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Rothera">
+				<exemplarCity draft="contributed">羅瑟拉站</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Palmer">
+				<exemplarCity draft="contributed">帕爾默</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Troll">
+				<exemplarCity draft="contributed">特羅爾站</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Syowa">
+				<exemplarCity draft="contributed">昭和站</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Mawson">
+				<exemplarCity draft="contributed">莫森站</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Davis">
+				<exemplarCity draft="contributed">戴維斯站</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Casey">
+				<exemplarCity draft="contributed">凱西站</exemplarCity>
+			</zone>
+			<zone type="Antarctica/DumontDUrville">
+				<exemplarCity draft="contributed">杜蒙迪維爾站</exemplarCity>
+			</zone>
+			<zone type="Antarctica/McMurdo">
+				<exemplarCity draft="contributed">麥克默多站</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/La_Rioja">
+				<exemplarCity draft="contributed">拉里奧哈</exemplarCity>
+			</zone>
+			<zone type="America/Cordoba">
+				<exemplarCity draft="contributed">科爾多瓦</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pago_Pago">
+				<exemplarCity draft="contributed">帕果帕果</exemplarCity>
+			</zone>
+			<zone type="Australia/Perth">
+				<exemplarCity draft="contributed">珀斯</exemplarCity>
+			</zone>
+			<zone type="Australia/Adelaide">
+				<exemplarCity draft="contributed">阿德萊德</exemplarCity>
+			</zone>
+			<zone type="Australia/Currie">
+				<exemplarCity draft="contributed">卡里</exemplarCity>
+			</zone>
+			<zone type="Australia/Hobart">
+				<exemplarCity draft="contributed">荷伯特</exemplarCity>
+			</zone>
+			<zone type="Australia/Sydney">
+				<exemplarCity draft="contributed">悉尼</exemplarCity>
+			</zone>
+			<zone type="Australia/Brisbane">
+				<exemplarCity draft="contributed">布里斯本</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Macquarie">
+				<exemplarCity draft="contributed">麥夸里</exemplarCity>
+			</zone>
+			<zone type="America/Aruba">
+				<exemplarCity>阿魯巴</exemplarCity>
+			</zone>
+			<zone type="Europe/Sarajevo">
+				<exemplarCity>薩拉熱窩</exemplarCity>
+			</zone>
+			<zone type="America/Barbados">
+				<exemplarCity draft="contributed">巴巴多斯</exemplarCity>
+			</zone>
+			<zone type="America/St_Barthelemy">
+				<exemplarCity draft="contributed">聖巴泰勒米</exemplarCity>
+			</zone>
+			<zone type="America/Rio_Branco">
+				<exemplarCity draft="contributed">里約布蘭科</exemplarCity>
+			</zone>
+			<zone type="America/Porto_Velho">
+				<exemplarCity draft="contributed">韋柳港</exemplarCity>
+			</zone>
+			<zone type="America/Boa_Vista">
+				<exemplarCity draft="contributed">博阿維斯塔</exemplarCity>
+			</zone>
+			<zone type="America/Cuiaba">
+				<exemplarCity draft="contributed">庫亞巴</exemplarCity>
+			</zone>
+			<zone type="America/Campo_Grande">
+				<exemplarCity draft="contributed">大坎普</exemplarCity>
+			</zone>
+			<zone type="America/Araguaina">
+				<exemplarCity draft="contributed">阿拉瓜伊納</exemplarCity>
+			</zone>
+			<zone type="America/Bahia">
+				<exemplarCity draft="contributed">巴希雅</exemplarCity>
+			</zone>
+			<zone type="America/Fortaleza">
+				<exemplarCity draft="contributed">福塔萊薩</exemplarCity>
+			</zone>
+			<zone type="America/Maceio">
+				<exemplarCity draft="contributed">馬塞約</exemplarCity>
+			</zone>
+			<zone type="America/Recife">
+				<exemplarCity draft="contributed">累西腓</exemplarCity>
+			</zone>
+			<zone type="America/Noronha">
+				<exemplarCity draft="contributed">諾羅尼亞</exemplarCity>
+			</zone>
+			<zone type="America/Nassau">
+				<exemplarCity draft="contributed">拿騷</exemplarCity>
+			</zone>
+			<zone type="America/Belize">
+				<exemplarCity draft="contributed">伯利茲</exemplarCity>
+			</zone>
+			<zone type="America/Whitehorse">
+				<exemplarCity draft="contributed">白馬市</exemplarCity>
+			</zone>
+			<zone type="America/Inuvik">
+				<exemplarCity draft="contributed">伊努維克</exemplarCity>
+			</zone>
+			<zone type="America/Dawson_Creek">
+				<exemplarCity draft="contributed">道森灣</exemplarCity>
+			</zone>
+			<zone type="America/Yellowknife">
+				<exemplarCity draft="contributed">黃刀鎮</exemplarCity>
+			</zone>
+			<zone type="America/Edmonton">
+				<exemplarCity draft="contributed">愛民頓</exemplarCity>
+			</zone>
+			<zone type="America/Thunder_Bay">
+				<exemplarCity draft="contributed">雷灣</exemplarCity>
+			</zone>
+			<zone type="America/Nipigon">
+				<exemplarCity draft="contributed">尼皮貢</exemplarCity>
+			</zone>
+			<zone type="America/Halifax">
+				<exemplarCity draft="contributed">哈利法克斯</exemplarCity>
+			</zone>
+			<zone type="America/Glace_Bay">
+				<exemplarCity draft="contributed">格萊斯灣</exemplarCity>
+			</zone>
+			<zone type="America/St_Johns">
+				<exemplarCity draft="contributed">聖約翰斯</exemplarCity>
+			</zone>
+			<zone type="Indian/Cocos">
+				<exemplarCity draft="contributed">可可斯群島</exemplarCity>
+			</zone>
+			<zone type="Africa/Kinshasa">
+				<exemplarCity draft="contributed">金沙薩</exemplarCity>
+			</zone>
+			<zone type="Africa/Bangui">
+				<exemplarCity draft="contributed">班基</exemplarCity>
+			</zone>
+			<zone type="Africa/Abidjan">
+				<exemplarCity draft="contributed">阿比贊</exemplarCity>
+			</zone>
+			<zone type="America/Santiago">
+				<exemplarCity draft="contributed">聖地亞哥</exemplarCity>
+			</zone>
+			<zone type="America/Costa_Rica">
+				<exemplarCity>哥斯達黎加</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Cape_Verde">
+				<exemplarCity draft="contributed">佛得角</exemplarCity>
+			</zone>
+			<zone type="Asia/Nicosia">
+				<exemplarCity draft="contributed">尼科西亞</exemplarCity>
+			</zone>
+			<zone type="Africa/Djibouti">
+				<exemplarCity draft="contributed">吉布提</exemplarCity>
+			</zone>
+			<zone type="America/Dominica">
+				<exemplarCity draft="contributed">多米尼克</exemplarCity>
+			</zone>
+			<zone type="America/Santo_Domingo">
+				<exemplarCity draft="contributed">聖多明各</exemplarCity>
+			</zone>
+			<zone type="Africa/Asmera">
+				<exemplarCity>阿斯馬拉</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Canary">
+				<exemplarCity draft="contributed">加那利</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Stanley">
+				<exemplarCity draft="contributed">史丹利</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kosrae">
+				<exemplarCity draft="contributed">科斯雷</exemplarCity>
+			</zone>
+			<zone type="Africa/Libreville">
+				<exemplarCity draft="contributed">利布維</exemplarCity>
+			</zone>
+			<zone type="America/Grenada">
+				<exemplarCity draft="contributed">格林納達</exemplarCity>
+			</zone>
+			<zone type="America/Cayenne">
+				<exemplarCity draft="contributed">卡宴</exemplarCity>
+			</zone>
+			<zone type="Europe/Guernsey">
+				<exemplarCity draft="contributed">根西島</exemplarCity>
+			</zone>
+			<zone type="America/Thule">
+				<exemplarCity draft="contributed">圖勒</exemplarCity>
+			</zone>
+			<zone type="Africa/Conakry">
+				<exemplarCity draft="contributed">科納克里</exemplarCity>
+			</zone>
+			<zone type="America/Guatemala">
+				<exemplarCity draft="contributed">危地馬拉</exemplarCity>
+			</zone>
+			<zone type="America/Guyana">
+				<exemplarCity>圭亞那</exemplarCity>
+			</zone>
+			<zone type="Asia/Hong_Kong">
+				<exemplarCity draft="contributed">香港</exemplarCity>
+			</zone>
+			<zone type="America/Tegucigalpa">
+				<exemplarCity draft="contributed">特古西加爾巴</exemplarCity>
+			</zone>
+			<zone type="Europe/Zagreb">
+				<exemplarCity draft="contributed">薩格勒布</exemplarCity>
+			</zone>
+			<zone type="Asia/Makassar">
+				<exemplarCity draft="contributed">錫江</exemplarCity>
+			</zone>
+			<zone type="Asia/Jayapura">
+				<exemplarCity draft="contributed">查雅普拉</exemplarCity>
+			</zone>
+			<zone type="Europe/Isle_of_Man">
+				<exemplarCity draft="contributed">馬恩島</exemplarCity>
+			</zone>
+			<zone type="Indian/Chagos">
+				<exemplarCity draft="contributed">查戈斯群島</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Reykjavik">
+				<exemplarCity draft="contributed">雷克雅未克</exemplarCity>
+			</zone>
+			<zone type="Africa/Nairobi">
+				<exemplarCity draft="contributed">內羅畢</exemplarCity>
+			</zone>
+			<zone type="Asia/Bishkek">
+				<exemplarCity draft="contributed">比斯凱克</exemplarCity>
+			</zone>
+			<zone type="Pacific/Enderbury">
+				<exemplarCity draft="contributed">恩德伯里島</exemplarCity>
+			</zone>
+			<zone type="Indian/Comoro">
+				<exemplarCity>科摩羅</exemplarCity>
+			</zone>
+			<zone type="America/St_Lucia">
+				<exemplarCity draft="contributed">聖盧西亞</exemplarCity>
+			</zone>
+			<zone type="Europe/Vaduz">
+				<exemplarCity draft="contributed">華杜茲</exemplarCity>
+			</zone>
+			<zone type="Asia/Colombo">
+				<exemplarCity draft="contributed">科倫坡</exemplarCity>
+			</zone>
+			<zone type="Africa/Maseru">
+				<exemplarCity draft="contributed">馬塞魯</exemplarCity>
+			</zone>
+			<zone type="Europe/Chisinau">
+				<exemplarCity>基希訥烏</exemplarCity>
+			</zone>
+			<zone type="Europe/Podgorica">
+				<exemplarCity>波德戈里察</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kwajalein">
+				<exemplarCity draft="contributed">瓜加林環礁</exemplarCity>
+			</zone>
+			<zone type="Pacific/Majuro">
+				<exemplarCity draft="contributed">馬久羅</exemplarCity>
+			</zone>
+			<zone type="Europe/Skopje">
+				<exemplarCity draft="contributed">斯科普里</exemplarCity>
+			</zone>
+			<zone type="Asia/Macau">
+				<exemplarCity draft="contributed">澳門</exemplarCity>
+			</zone>
+			<zone type="America/Martinique">
+				<exemplarCity draft="contributed">馬提尼克</exemplarCity>
+			</zone>
+			<zone type="Africa/Nouakchott">
+				<exemplarCity draft="contributed">努瓦克肖特</exemplarCity>
+			</zone>
+			<zone type="America/Montserrat">
+				<exemplarCity draft="contributed">蒙塞拉特島</exemplarCity>
+			</zone>
+			<zone type="Europe/Malta">
+				<exemplarCity draft="contributed">馬耳他</exemplarCity>
+			</zone>
+			<zone type="Indian/Mauritius">
+				<exemplarCity draft="contributed">毛里裘斯</exemplarCity>
+			</zone>
+			<zone type="Indian/Maldives">
+				<exemplarCity draft="contributed">馬爾代夫</exemplarCity>
+			</zone>
+			<zone type="America/Tijuana">
+				<exemplarCity draft="contributed">蒂華納</exemplarCity>
+			</zone>
+			<zone type="America/Chihuahua">
+				<exemplarCity draft="contributed">芝華華</exemplarCity>
+			</zone>
+			<zone type="America/Bahia_Banderas">
+				<exemplarCity draft="contributed">巴伊亞德班德拉斯</exemplarCity>
+			</zone>
+			<zone type="America/Monterrey">
+				<exemplarCity draft="contributed">蒙特雷</exemplarCity>
+			</zone>
+			<zone type="America/Mexico_City">
+				<exemplarCity draft="contributed">墨西哥城</exemplarCity>
+			</zone>
+			<zone type="Africa/Windhoek">
+				<exemplarCity draft="contributed">溫特和克</exemplarCity>
+			</zone>
+			<zone type="Pacific/Noumea">
+				<exemplarCity draft="contributed">努美阿</exemplarCity>
+			</zone>
+			<zone type="Africa/Lagos">
+				<exemplarCity>拉各斯</exemplarCity>
+			</zone>
+			<zone type="America/Managua">
+				<exemplarCity draft="contributed">馬那瓜</exemplarCity>
+			</zone>
+			<zone type="Pacific/Nauru">
+				<exemplarCity draft="contributed">瑙魯</exemplarCity>
+			</zone>
+			<zone type="Pacific/Chatham">
+				<exemplarCity draft="contributed">查塔姆</exemplarCity>
+			</zone>
+			<zone type="Asia/Muscat">
+				<exemplarCity draft="contributed">馬斯喀特</exemplarCity>
+			</zone>
+			<zone type="Pacific/Marquesas">
+				<exemplarCity draft="contributed">馬克薩斯群島</exemplarCity>
+			</zone>
+			<zone type="Pacific/Gambier">
+				<exemplarCity draft="contributed">甘比爾</exemplarCity>
+			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity draft="contributed">布干維爾島</exemplarCity>
+			</zone>
+			<zone type="Asia/Karachi">
+				<exemplarCity>卡拉奇</exemplarCity>
+			</zone>
+			<zone type="America/Miquelon">
+				<exemplarCity draft="contributed">密克隆</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pitcairn">
+				<exemplarCity draft="contributed">皮特康群島</exemplarCity>
+			</zone>
+			<zone type="Asia/Gaza">
+				<exemplarCity draft="contributed">加沙</exemplarCity>
+			</zone>
+			<zone type="Asia/Hebron">
+				<exemplarCity draft="contributed">希伯侖</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Madeira">
+				<exemplarCity draft="contributed">馬德拉島</exemplarCity>
+			</zone>
+			<zone type="America/Asuncion">
+				<exemplarCity draft="contributed">阿松森</exemplarCity>
+			</zone>
+			<zone type="Asia/Qatar">
+				<exemplarCity draft="contributed">卡塔爾</exemplarCity>
+			</zone>
+			<zone type="Indian/Reunion">
+				<exemplarCity draft="contributed">留尼旺</exemplarCity>
+			</zone>
+			<zone type="Europe/Belgrade">
+				<exemplarCity>貝爾格萊德</exemplarCity>
+			</zone>
+			<zone type="Asia/Yekaterinburg">
+				<exemplarCity draft="contributed">葉卡捷琳堡</exemplarCity>
+			</zone>
+			<zone type="Asia/Irkutsk">
+				<exemplarCity draft="contributed">伊爾庫茨克</exemplarCity>
+			</zone>
+			<zone type="Asia/Yakutsk">
+				<exemplarCity draft="contributed">雅庫茨克</exemplarCity>
+			</zone>
+			<zone type="Asia/Anadyr">
+				<exemplarCity draft="contributed">阿納德爾</exemplarCity>
+			</zone>
+			<zone type="Asia/Riyadh">
+				<exemplarCity draft="contributed">利雅得</exemplarCity>
+			</zone>
+			<zone type="Pacific/Guadalcanal">
+				<exemplarCity>瓜達爾卡納爾島</exemplarCity>
+			</zone>
+			<zone type="Europe/Ljubljana">
+				<exemplarCity>盧布爾雅那</exemplarCity>
+			</zone>
+			<zone type="Arctic/Longyearbyen">
+				<exemplarCity draft="contributed">朗伊爾城</exemplarCity>
+			</zone>
+			<zone type="Europe/Bratislava">
+				<exemplarCity draft="contributed">伯拉第斯拉瓦</exemplarCity>
+			</zone>
+			<zone type="Africa/Mogadishu">
+				<exemplarCity>摩加迪沙</exemplarCity>
+			</zone>
+			<zone type="Indian/Kerguelen">
+				<exemplarCity draft="contributed">凱爾蓋朗群島</exemplarCity>
+			</zone>
+			<zone type="Asia/Dushanbe">
+				<exemplarCity draft="contributed">杜尚別</exemplarCity>
+			</zone>
+			<zone type="Pacific/Fakaofo">
+				<exemplarCity draft="contributed">法考福環礁</exemplarCity>
+			</zone>
+			<zone type="Asia/Ashgabat">
+				<exemplarCity draft="contributed">阿什哈巴德</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tongatapu">
+				<exemplarCity>湯加塔布島</exemplarCity>
+			</zone>
+			<zone type="Africa/Dar_es_Salaam">
+				<exemplarCity>達累斯薩拉姆</exemplarCity>
+			</zone>
+			<zone type="Europe/Uzhgorod">
+				<exemplarCity draft="contributed">烏日哥羅德</exemplarCity>
+			</zone>
+			<zone type="Pacific/Johnston">
+				<exemplarCity draft="contributed">約翰斯頓環礁</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wake">
+				<exemplarCity draft="contributed">威克島</exemplarCity>
+			</zone>
+			<zone type="America/Adak">
+				<exemplarCity draft="contributed">埃達克</exemplarCity>
+			</zone>
+			<zone type="America/Anchorage">
+				<exemplarCity draft="contributed">安克雷奇</exemplarCity>
+			</zone>
+			<zone type="America/Yakutat">
+				<exemplarCity draft="contributed">亞庫塔特</exemplarCity>
+			</zone>
+			<zone type="America/Boise">
+				<exemplarCity draft="contributed">博伊西</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Beulah">
+				<exemplarCity>北達科他州比尤拉</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/New_Salem">
+				<exemplarCity draft="contributed">北達科他州新薩勒姆</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Center">
+				<exemplarCity draft="contributed">北達科他州中心市</exemplarCity>
+			</zone>
+			<zone type="America/Menominee">
+				<exemplarCity draft="contributed">梅諾米尼</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Vincennes">
+				<exemplarCity draft="contributed">印第安納州溫森斯</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Petersburg">
+				<exemplarCity draft="contributed">印第安納州彼得堡</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Tell_City">
+				<exemplarCity draft="contributed">印第安納州特爾城</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Knox">
+				<exemplarCity draft="contributed">印第安納州諾克斯</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Winamac">
+				<exemplarCity draft="contributed">印第安納州威納馬克</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Marengo">
+				<exemplarCity draft="contributed">印第安納州馬倫哥</exemplarCity>
+			</zone>
+			<zone type="America/Indianapolis">
+				<exemplarCity draft="contributed">印第安納波利斯</exemplarCity>
+			</zone>
+			<zone type="America/Louisville">
+				<exemplarCity draft="contributed">路易維爾</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Vevay">
+				<exemplarCity draft="contributed">印第安納州韋韋</exemplarCity>
+			</zone>
+			<zone type="America/Kentucky/Monticello">
+				<exemplarCity draft="contributed">肯塔基州蒙蒂塞洛</exemplarCity>
+			</zone>
+			<zone type="America/Montevideo">
+				<exemplarCity draft="contributed">蒙得維的亞</exemplarCity>
+			</zone>
+			<zone type="America/St_Vincent">
+				<exemplarCity draft="contributed">聖文森特</exemplarCity>
+			</zone>
+			<zone type="America/Caracas">
+				<exemplarCity draft="contributed">加拉加斯</exemplarCity>
+			</zone>
+			<zone type="Indian/Mayotte">
+				<exemplarCity draft="contributed">馬約特</exemplarCity>
+			</zone>
+			<zone type="Africa/Johannesburg">
+				<exemplarCity draft="contributed">約翰內斯堡</exemplarCity>
+			</zone>
+			<zone type="Africa/Lusaka">
+				<exemplarCity>盧薩卡</exemplarCity>
+			</zone>
+			<metazone type="Africa_Southern">
+				<long>
+					<standard draft="contributed">南非時間</standard>
+				</long>
+			</metazone>
+			<metazone type="America_Central">
+				<long>
+					<generic draft="contributed">北美中部時間</generic>
+					<standard draft="contributed">北美中部標準時間</standard>
+					<daylight draft="contributed">中部夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Eastern">
+				<long>
+					<generic draft="contributed">北美東部時間</generic>
+					<standard draft="contributed">北美東部標準時間</standard>
+					<daylight draft="contributed">北美東部夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Mountain">
+				<long>
+					<generic draft="contributed">北美山區時間</generic>
+					<standard draft="contributed">北美山區標準時間</standard>
+					<daylight draft="contributed">北美山區夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Pacific">
+				<long>
+					<generic draft="contributed">北美太平洋時間</generic>
+					<standard draft="contributed">北美太平洋標準時間</standard>
+					<daylight draft="contributed">北美太平洋夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Azerbaijan">
+				<long>
+					<generic draft="contributed">亞塞拜疆時間</generic>
+					<standard draft="contributed">亞塞拜疆標準時間</standard>
+					<daylight draft="contributed">亞塞拜疆夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cape_Verde">
+				<long>
+					<generic draft="contributed">佛得角時間</generic>
+					<standard draft="contributed">佛得角標準時間</standard>
+					<daylight draft="contributed">佛得角夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cocos">
+				<long>
+					<standard>可可斯群島時間</standard>
+				</long>
+			</metazone>
+			<metazone type="DumontDUrville">
+				<long>
+					<standard draft="contributed">迪蒙迪維爾時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Ecuador">
+				<long>
+					<standard draft="contributed">厄瓜多爾時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Galapagos">
+				<long>
+					<standard draft="contributed">加拉帕戈群島時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Georgia">
+				<long>
+					<generic draft="contributed">格魯吉亞時間</generic>
+					<standard draft="contributed">格魯吉亞標準時間</standard>
+					<daylight draft="contributed">格魯吉亞夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Gulf">
+				<long>
+					<standard draft="contributed">波斯灣海域時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Guyana">
+				<long>
+					<standard draft="contributed">圭亞那時間</standard>
+				</long>
+			</metazone>
+			<metazone type="India">
+				<long>
+					<standard draft="contributed">印度時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Indochina">
+				<long>
+					<standard draft="contributed">中南半島時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Irkutsk">
+				<long>
+					<generic draft="contributed">伊爾庫茨克時間</generic>
+					<standard draft="contributed">伊爾庫茨克標準時間</standard>
+					<daylight draft="contributed">伊爾庫茨克夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kosrae">
+				<long>
+					<standard draft="contributed">科斯雷時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Macquarie">
+				<long>
+					<standard draft="contributed">麥夸里群島時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Maldives">
+				<long>
+					<standard draft="contributed">馬爾代夫時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Marquesas">
+				<long>
+					<standard draft="contributed">馬克薩斯時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Mauritius">
+				<long>
+					<generic draft="contributed">毛里裘斯時間</generic>
+					<standard draft="contributed">毛里裘斯標準時間</standard>
+					<daylight draft="contributed">毛里裘斯夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Nauru">
+				<long>
+					<standard draft="contributed">瑙魯時間</standard>
+				</long>
+			</metazone>
+			<metazone type="New_Caledonia">
+				<long>
+					<generic>新喀里多尼亞時間</generic>
+					<standard>新喀里多尼亞標準時間</standard>
+					<daylight>新喀里多尼亞夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Noronha">
+				<long>
+					<generic draft="contributed">費爾南多迪諾羅尼亞時間</generic>
+					<standard draft="contributed">費爾南多迪諾羅尼亞標準時間</standard>
+					<daylight draft="contributed">費爾南多迪諾羅尼亞夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Papua_New_Guinea">
+				<long>
+					<standard draft="contributed">巴布亞新畿內亞時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Pitcairn">
+				<long>
+					<standard>皮特康時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Seychelles">
+				<long>
+					<standard draft="contributed">塞舌爾時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Singapore">
+				<long>
+					<standard draft="contributed">新加坡時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Solomon">
+				<long>
+					<standard>所羅門群島時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Suriname">
+				<long>
+					<standard draft="contributed">蘇里南時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Tonga">
+				<long>
+					<generic draft="contributed">湯加時間</generic>
+					<standard draft="contributed">湯加標準時間</standard>
+					<daylight draft="contributed">湯加夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Tuvalu">
+				<long>
+					<standard draft="contributed">圖瓦盧時間</standard>
+				</long>
+			</metazone>
+			<metazone type="Vanuatu">
+				<long>
+					<generic draft="contributed">瓦努阿圖時間</generic>
+					<standard draft="contributed">瓦努阿圖標準時間</standard>
+					<daylight draft="contributed">瓦努阿圖夏令時間</daylight>
+				</long>
+			</metazone>
+			<metazone type="Yakutsk">
+				<long>
+					<generic draft="contributed">雅庫茨克時間</generic>
+					<standard draft="contributed">雅庫茨克標準時間</standard>
+					<daylight draft="contributed">雅庫茨克夏令時間</daylight>
+				</long>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<decimalFormats numberSystem="latn">
+			<decimalFormatLength type="short">
+				<decimalFormat>
+					<pattern type="1000" count="other" draft="contributed">0K</pattern>
+					<pattern type="10000" count="other" draft="contributed">00K</pattern>
+					<pattern type="100000" count="other" draft="contributed">000K</pattern>
+					<pattern type="1000000" count="other" draft="contributed">0M</pattern>
+					<pattern type="10000000" count="other" draft="contributed">00M</pattern>
+					<pattern type="100000000" count="other" draft="contributed">000M</pattern>
+					<pattern type="1000000000" count="other" draft="contributed">0B</pattern>
+					<pattern type="10000000000" count="other" draft="contributed">00B</pattern>
+					<pattern type="100000000000" count="other" draft="contributed">000B</pattern>
+					<pattern type="1000000000000" count="other" draft="contributed">0T</pattern>
+					<pattern type="10000000000000" count="other" draft="contributed">00T</pattern>
+					<pattern type="100000000000000" count="other" draft="contributed">000T</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+		</decimalFormats>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="contributed">¤0K</pattern>
+					<pattern type="10000" count="other" draft="contributed">¤00K</pattern>
+					<pattern type="100000" count="other" draft="contributed">¤000K</pattern>
+					<pattern type="1000000" count="other" draft="contributed">¤0M</pattern>
+					<pattern type="10000000" count="other" draft="contributed">¤00M</pattern>
+					<pattern type="100000000" count="other" draft="contributed">¤000M</pattern>
+					<pattern type="1000000000" count="other" draft="contributed">¤0B</pattern>
+					<pattern type="10000000000" count="other" draft="contributed">¤00B</pattern>
+					<pattern type="100000000000" count="other" draft="contributed">¤000B</pattern>
+					<pattern type="1000000000000" count="other" draft="contributed">¤0T</pattern>
+					<pattern type="10000000000000" count="other" draft="contributed">¤00T</pattern>
+					<pattern type="100000000000000" count="other" draft="contributed">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencies>
+			<currency type="AED">
+				<displayName draft="contributed">阿拉伯聯合酋長國迪爾汗</displayName>
+				<displayName count="other" draft="contributed">阿拉伯聯合酋長國迪爾汗</displayName>
+			</currency>
+			<currency type="AUD">
+				<displayName draft="contributed">澳元</displayName>
+				<displayName count="other" draft="contributed">澳元</displayName>
+			</currency>
+			<currency type="AWG">
+				<displayName>阿魯巴盾</displayName>
+				<displayName count="other">阿魯巴盾</displayName>
+			</currency>
+			<currency type="AZN">
+				<displayName draft="contributed">亞塞拜疆馬納特</displayName>
+				<displayName count="other" draft="contributed">亞塞拜疆馬納特</displayName>
+			</currency>
+			<currency type="BAD">
+				<displayName draft="contributed">波斯尼亞-赫塞哥維納第納爾</displayName>
+			</currency>
+			<currency type="BAM">
+				<displayName>波斯尼亞-赫塞哥維納可轉換馬克</displayName>
+				<displayName count="other">波斯尼亞-赫塞哥維納可轉換馬克</displayName>
+			</currency>
+			<currency type="BBD">
+				<displayName draft="contributed">巴巴多斯元</displayName>
+				<displayName count="other" draft="contributed">巴巴多斯元</displayName>
+			</currency>
+			<currency type="BIF">
+				<displayName draft="contributed">布隆迪法郎</displayName>
+				<displayName count="other" draft="contributed">布隆迪法郎</displayName>
+			</currency>
+			<currency type="BWP">
+				<displayName draft="contributed">博茨瓦納普拉</displayName>
+				<displayName count="other" draft="contributed">博茨瓦納普拉</displayName>
+			</currency>
+			<currency type="BZD">
+				<displayName draft="contributed">伯利茲元</displayName>
+				<displayName count="other" draft="contributed">伯利茲元</displayName>
+			</currency>
+			<currency type="CAD">
+				<displayName draft="contributed">加拿大元</displayName>
+				<displayName count="other" draft="contributed">加拿大元</displayName>
+			</currency>
+			<currency type="CRC">
+				<displayName>哥斯達黎加科郎</displayName>
+				<displayName count="other">哥斯達黎加科郎</displayName>
+			</currency>
+			<currency type="CVE">
+				<displayName draft="contributed">佛得角埃斯庫多</displayName>
+				<displayName count="other" draft="contributed">佛得角埃斯庫多</displayName>
+			</currency>
+			<currency type="DJF">
+				<displayName draft="contributed">吉布提法郎</displayName>
+				<displayName count="other" draft="contributed">吉布提法郎</displayName>
+			</currency>
+			<currency type="DKK">
+				<displayName count="other" draft="contributed">丹麥克羅納</displayName>
+			</currency>
+			<currency type="DOP">
+				<displayName draft="contributed">多米尼加披索</displayName>
+				<displayName count="other" draft="contributed">多米尼加披索</displayName>
+			</currency>
+			<currency type="ETB">
+				<displayName draft="contributed">埃塞俄比亞比爾</displayName>
+				<displayName count="other" draft="contributed">埃塞俄比亞比爾</displayName>
+			</currency>
+			<currency type="GEL">
+				<displayName draft="contributed">格魯吉亞拉里</displayName>
+				<displayName count="other" draft="contributed">格魯吉亞拉里</displayName>
+			</currency>
+			<currency type="GHS">
+				<displayName draft="contributed">加納塞地</displayName>
+				<displayName count="other" draft="contributed">加納塞地</displayName>
+			</currency>
+			<currency type="GMD">
+				<displayName draft="contributed">岡比亞達拉西</displayName>
+				<displayName count="other" draft="contributed">岡比亞達拉西</displayName>
+			</currency>
+			<currency type="GTQ">
+				<displayName draft="contributed">危地馬拉格查爾</displayName>
+				<displayName count="other" draft="contributed">危地馬拉格查爾</displayName>
+			</currency>
+			<currency type="HKD">
+				<displayName>港元</displayName>
+				<displayName count="other">港元</displayName>
+			</currency>
+			<currency type="HRK">
+				<displayName draft="contributed">克羅地亞庫納</displayName>
+				<displayName count="other">克羅地亞庫納</displayName>
+			</currency>
+			<currency type="ITL">
+				<displayName draft="contributed">意大利里拉</displayName>
+			</currency>
+			<currency type="KES">
+				<displayName draft="contributed">肯雅先令</displayName>
+				<displayName count="other" draft="contributed">肯雅先令</displayName>
+			</currency>
+			<currency type="KHR">
+				<displayName draft="contributed">柬埔寨里爾</displayName>
+				<displayName count="other" draft="contributed">柬埔寨里爾</displayName>
+			</currency>
+			<currency type="KPW">
+				<displayName>北韓圜</displayName>
+				<displayName count="other">北韓圜</displayName>
+			</currency>
+			<currency type="KRW">
+				<symbol draft="contributed">₩</symbol>
+			</currency>
+			<currency type="KYD">
+				<displayName count="other">開曼群島美元</displayName>
+			</currency>
+			<currency type="KZT">
+				<displayName draft="contributed">哈薩克坦吉</displayName>
+				<displayName count="other" draft="contributed">哈薩克坦吉</displayName>
+			</currency>
+			<currency type="LAK">
+				<displayName draft="contributed">老撾基普</displayName>
+				<displayName count="other" draft="contributed">老撾基普</displayName>
+			</currency>
+			<currency type="LRD">
+				<displayName draft="contributed">利比利亞元</displayName>
+				<displayName count="other" draft="contributed">利比利亞元</displayName>
+			</currency>
+			<currency type="LTL">
+				<displayName count="other" draft="contributed">立陶宛里塔</displayName>
+			</currency>
+			<currency type="MDL">
+				<displayName draft="contributed">摩爾多瓦列伊</displayName>
+				<displayName count="other" draft="contributed">摩爾多瓦列伊</displayName>
+			</currency>
+			<currency type="MRO">
+				<displayName draft="contributed">毛里塔尼亞烏吉亞</displayName>
+				<displayName count="other" draft="contributed">毛里塔尼亞烏吉亞</displayName>
+			</currency>
+			<currency type="MUR">
+				<displayName>毛里裘斯盧布</displayName>
+				<displayName count="other">毛里裘斯盧布</displayName>
+			</currency>
+			<currency type="MVR">
+				<displayName draft="contributed">馬爾代夫盧非亞</displayName>
+				<displayName count="other" draft="contributed">馬爾代夫盧非亞</displayName>
+			</currency>
+			<currency type="MZN">
+				<displayName>莫桑比克梅蒂卡爾</displayName>
+				<displayName count="other">莫桑比克梅蒂卡爾</displayName>
+			</currency>
+			<currency type="NGN">
+				<displayName>尼日利亞奈拉</displayName>
+				<displayName count="other">尼日利亞奈拉</displayName>
+			</currency>
+			<currency type="NOK">
+				<displayName count="other" draft="contributed">挪威克羅納</displayName>
+			</currency>
+			<currency type="NZD">
+				<displayName draft="contributed">紐西蘭元</displayName>
+				<displayName count="other" draft="contributed">紐西蘭元</displayName>
+			</currency>
+			<currency type="OMR">
+				<displayName draft="contributed">阿曼里奧</displayName>
+				<displayName count="other" draft="contributed">阿曼里奧</displayName>
+			</currency>
+			<currency type="PGK">
+				<displayName draft="contributed">巴布亞新幾內亞基那</displayName>
+				<displayName count="other" draft="contributed">巴布亞新幾內亞基那</displayName>
+			</currency>
+			<currency type="QAR">
+				<displayName draft="contributed">卡塔爾里亞爾</displayName>
+				<displayName count="other" draft="contributed">卡塔爾里亞爾</displayName>
+			</currency>
+			<currency type="RSD">
+				<displayName draft="contributed">塞爾維亞第納爾</displayName>
+				<displayName count="other" draft="contributed">塞爾維亞第納爾</displayName>
+			</currency>
+			<currency type="RWF">
+				<displayName>盧旺達法郎</displayName>
+				<displayName count="other">盧旺達法郎</displayName>
+			</currency>
+			<currency type="SAR">
+				<displayName draft="contributed">沙特阿拉伯里亞爾</displayName>
+				<displayName count="other" draft="contributed">沙特阿拉伯里亞爾</displayName>
+			</currency>
+			<currency type="SBD">
+				<displayName draft="contributed">所羅門群島元</displayName>
+				<displayName count="other" draft="contributed">所羅門群島元</displayName>
+			</currency>
+			<currency type="SCR">
+				<displayName draft="contributed">塞舌爾盧比</displayName>
+				<displayName count="other" draft="contributed">塞舌爾盧比</displayName>
+			</currency>
+			<currency type="SEK">
+				<displayName count="other" draft="contributed">瑞典克羅納</displayName>
+			</currency>
+			<currency type="SGD">
+				<displayName draft="contributed">新加坡元</displayName>
+				<displayName count="other" draft="contributed">新加坡元</displayName>
+			</currency>
+			<currency type="SLL">
+				<displayName draft="contributed">塞拉利昂利昂</displayName>
+				<displayName count="other" draft="contributed">塞拉利昂利昂</displayName>
+			</currency>
+			<currency type="SOS">
+				<displayName draft="contributed">索馬里先令</displayName>
+				<displayName count="other" draft="contributed">索馬里先令</displayName>
+			</currency>
+			<currency type="SRD">
+				<displayName draft="contributed">蘇里南元</displayName>
+				<displayName count="other" draft="contributed">蘇里南元</displayName>
+			</currency>
+			<currency type="STD">
+				<displayName draft="contributed">聖多美和普林西比多布拉</displayName>
+				<displayName count="other" draft="contributed">聖多美和普林西比多布拉</displayName>
+			</currency>
+			<currency type="SZL">
+				<displayName draft="contributed">斯威士蘭里朗吉尼</displayName>
+				<displayName count="other" draft="contributed">斯威士蘭里朗吉尼</displayName>
+			</currency>
+			<currency type="TOP">
+				<displayName draft="contributed">湯加潘加</displayName>
+				<displayName count="other" draft="contributed">湯加潘加</displayName>
+			</currency>
+			<currency type="TTD">
+				<displayName draft="contributed">千里達和多巴哥元</displayName>
+				<displayName count="other" draft="contributed">千里達和多巴哥元</displayName>
+			</currency>
+			<currency type="TWD">
+				<symbol>NT$</symbol>
+			</currency>
+			<currency type="TZS">
+				<displayName draft="contributed">坦桑尼亞先令</displayName>
+				<displayName count="other" draft="contributed">坦桑尼亞先令</displayName>
+			</currency>
+			<currency type="VUV">
+				<displayName draft="contributed">瓦努阿圖瓦圖</displayName>
+				<displayName count="other" draft="contributed">瓦努阿圖瓦圖</displayName>
+			</currency>
+			<currency type="XAF">
+				<displayName>中非法郎</displayName>
+				<displayName count="other">中非法郎</displayName>
+			</currency>
+			<currency type="XCD">
+				<displayName draft="contributed">東加勒比元</displayName>
+				<displayName count="other" draft="contributed">東加勒比元</displayName>
+			</currency>
+			<currency type="XOF">
+				<displayName draft="contributed">多哥非洲共同體法郎</displayName>
+				<displayName count="other" draft="contributed">西非法郎</displayName>
+			</currency>
+			<currency type="XPF">
+				<displayName>太平洋法郎</displayName>
+				<displayName count="other">太平洋法郎</displayName>
+			</currency>
+			<currency type="YER">
+				<displayName draft="contributed">也門里雅</displayName>
+				<displayName count="other" draft="contributed">也門里雅</displayName>
+			</currency>
+			<currency type="ZMW">
+				<displayName draft="contributed">贊比亞克瓦查</displayName>
+				<displayName count="other" draft="contributed">贊比亞克瓦查</displayName>
+			</currency>
+		</currencies>
+	</numbers>
+	<units>
+		<unitLength type="long">
+			<compoundUnit type="per">
+				<compoundUnitPattern draft="contributed">{0}每{1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="acceleration-meter-per-second-squared">
+				<displayName>米/平方秒</displayName>
+				<unitPattern count="other">{0} 米/平方秒</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName draft="contributed">周</displayName>
+				<unitPattern count="other" draft="contributed">{0} 周</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>度</displayName>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>平方米</displayName>
+				<unitPattern count="other">{0} 平方米</unitPattern>
+				<perUnitPattern draft="contributed">{0} 每平方米</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>平方厘米</displayName>
+				<unitPattern count="other">{0} 平方厘米</unitPattern>
+				<perUnitPattern draft="contributed">{0} 每平方厘米</perUnitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>平方呎</displayName>
+				<unitPattern count="other">{0} 平方呎</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>平方吋</displayName>
+				<unitPattern count="other">{0} 平方吋</unitPattern>
+				<perUnitPattern draft="contributed">{0} 每平方吋</perUnitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>公升/公里</displayName>
+				<unitPattern count="other">{0} 公升/公里</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName draft="contributed">英里每加侖</displayName>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>位元組</displayName>
+				<unitPattern count="other">{0} 位元組</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>位元</displayName>
+				<unitPattern count="other">{0} 個位元</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<unitPattern count="other" draft="contributed">{0} 世紀</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<perUnitPattern draft="contributed">{0} 每年</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">個月</displayName>
+				<perUnitPattern draft="contributed">{0} 每個月</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="contributed">星期</displayName>
+				<unitPattern count="other" draft="contributed">{0} 星期</unitPattern>
+				<perUnitPattern draft="contributed">{0} 每星期</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName draft="contributed">日</displayName>
+				<unitPattern count="other" draft="contributed">{0} 日</unitPattern>
+				<perUnitPattern draft="contributed">{0} 每日</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<perUnitPattern draft="contributed">{0} 每小時</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<perUnitPattern draft="contributed">{0} 每分鐘</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<perUnitPattern draft="contributed">{0}每秒</perUnitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>納秒</displayName>
+				<unitPattern count="other">{0} 納秒</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName draft="contributed">千卡</displayName>
+				<unitPattern count="other" draft="contributed">{0} 千卡</unitPattern>
+			</unit>
+			<unit type="energy-foodcalorie">
+				<unitPattern count="other">{0} 卡路里</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<perUnitPattern draft="contributed">{0} 每公里</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>米</displayName>
+				<unitPattern count="other">{0} 米</unitPattern>
+				<perUnitPattern draft="contributed">{0} 每米</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>分米</displayName>
+				<unitPattern count="other">{0} 分米</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>厘米</displayName>
+				<unitPattern count="other">{0} 厘米</unitPattern>
+				<perUnitPattern draft="contributed">{0} 每厘米</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>毫米</displayName>
+				<unitPattern count="other">{0} 毫米</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>納米</displayName>
+				<unitPattern count="other">{0} 納米</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<unitPattern count="other" draft="contributed">{0} 呎</unitPattern>
+				<perUnitPattern draft="contributed">{0} 每呎</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="other" draft="contributed">{0} 吋</unitPattern>
+				<perUnitPattern draft="contributed">{0} 每吋</perUnitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<perUnitPattern draft="contributed">{0} 每公斤</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<perUnitPattern draft="contributed">{0} 每克</perUnitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<perUnitPattern draft="contributed">{0} 每磅</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>安士</displayName>
+				<unitPattern count="other">{0} 安士</unitPattern>
+				<perUnitPattern draft="contributed">{0} 每安士</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>金衡安士</displayName>
+				<unitPattern count="other">{0} 金衡安士</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>兆瓦</displayName>
+				<unitPattern count="other">{0} 兆瓦</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName draft="contributed">千瓦</displayName>
+				<unitPattern count="other" draft="contributed">{0} 千瓦</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName draft="contributed">毫瓦</displayName>
+				<unitPattern count="other" draft="contributed">{0} 毫瓦</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName draft="contributed">匹</displayName>
+				<unitPattern count="other" draft="contributed">{0} 匹</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<displayName>百帕斯卡</displayName>
+				<unitPattern count="other">{0} 百帕斯卡</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName>磅/平方吋</displayName>
+				<unitPattern count="other">{0} 磅/平方吋</unitPattern>
+			</unit>
+			<unit type="pressure-inch-hg">
+				<displayName draft="contributed">英吋汞柱</displayName>
+				<unitPattern count="other" draft="contributed">{0} 英吋汞柱</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName draft="contributed">公里每小時</displayName>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>米/秒</displayName>
+				<unitPattern count="other">{0} 米/秒</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName draft="contributed">英里每小時</displayName>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName draft="contributed">攝氏度</displayName>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName draft="contributed">華氏度</displayName>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName draft="contributed">開爾文</displayName>
+				<unitPattern count="other" draft="contributed">{0} 開爾文</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>立方米</displayName>
+				<unitPattern count="other">{0} 立方米</unitPattern>
+				<perUnitPattern draft="contributed">{0} 每立方米</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>立方厘米</displayName>
+				<unitPattern count="other">{0} 立方厘米</unitPattern>
+				<perUnitPattern draft="contributed">{0} 每立方厘米</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>立方呎</displayName>
+				<unitPattern count="other">{0} 立方呎</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>立方吋</displayName>
+				<unitPattern count="other">{0} 立方吋</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<perUnitPattern draft="contributed">{0} 每公升</perUnitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>厘升</displayName>
+				<unitPattern count="other">{0} 厘升</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<unitPattern count="other" draft="contributed">{0} 公制量杯</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName draft="contributed">英畝呎</displayName>
+				<unitPattern count="other" draft="contributed">{0} 英畝呎</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<perUnitPattern draft="contributed">{0} 每加侖</perUnitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<unitPattern count="other" draft="contributed">{0} 量杯</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>液安士</displayName>
+				<unitPattern count="other">{0} 液安士</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">東經 {0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">北緯 {0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">南緯 {0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">西經 {0}</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<unitLength type="short">
+			<unit type="acceleration-g-force">
+				<unitPattern count="other">{0} G</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-second-squared">
+				<displayName draft="contributed">米每平方秒</displayName>
+				<unitPattern count="other" draft="contributed">{0} 米每平方秒</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName draft="contributed">周</displayName>
+				<unitPattern count="other" draft="contributed">{0} 周</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>度</displayName>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>分</displayName>
+				<unitPattern count="other" draft="provisional">{0} 分</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<unitPattern count="other" draft="provisional">{0} 秒</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>平方米</displayName>
+				<unitPattern count="other" draft="contributed">{0} 平方米</unitPattern>
+				<perUnitPattern draft="contributed">{0} 每平方米</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName draft="contributed">平方厘米</displayName>
+				<unitPattern count="other" draft="contributed">{0} 平方厘米</unitPattern>
+				<perUnitPattern draft="contributed">{0} 每平方厘米</perUnitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>平方呎</displayName>
+				<unitPattern count="other" draft="contributed">{0} 平方呎</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>平方吋</displayName>
+				<unitPattern count="other" draft="contributed">{0} 平方吋</unitPattern>
+				<perUnitPattern draft="contributed">{0} 每平方吋</perUnitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<unitPattern count="other" draft="provisional">{0} 升每公里</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<unitPattern count="other" draft="provisional">{0} L/100km</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<unitPattern count="other" draft="provisional">{0} 英里每加侖</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<perUnitPattern draft="contributed">{0} 每年</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="contributed">個月</displayName>
+				<perUnitPattern draft="contributed">{0} 每月</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="contributed">星期</displayName>
+				<perUnitPattern draft="contributed">{0} 每週</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName draft="contributed">日</displayName>
+				<unitPattern count="other" draft="contributed">{0} 日</unitPattern>
+				<perUnitPattern draft="contributed">{0} 每日</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<perUnitPattern draft="contributed">{0} 每小時</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<perUnitPattern draft="contributed">{0} 每分鐘</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<perUnitPattern draft="contributed">{0}每秒</perUnitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName draft="contributed">納秒</displayName>
+				<unitPattern count="other" draft="contributed">{0} 納秒</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<unitPattern count="other" draft="contributed">{0} 伏特</unitPattern>
+			</unit>
+			<unit type="energy-foodcalorie">
+				<displayName draft="contributed">千卡</displayName>
+				<unitPattern count="other" draft="contributed">{0} 千卡</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName draft="contributed">千焦</displayName>
+			</unit>
+			<unit type="energy-joule">
+				<unitPattern count="other" draft="contributed">{0} 焦耳</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<perUnitPattern draft="contributed">{0} 每公里</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>米</displayName>
+				<unitPattern count="other" draft="contributed">{0} 米</unitPattern>
+				<perUnitPattern draft="contributed">{0} 每米</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName draft="contributed">分米</displayName>
+				<unitPattern count="other" draft="contributed">{0} 分米</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName draft="contributed">厘米</displayName>
+				<unitPattern count="other" draft="contributed">{0} 厘米</unitPattern>
+				<perUnitPattern draft="contributed">{0} 每厘米</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName draft="contributed">毫米</displayName>
+				<unitPattern count="other" draft="contributed">{0} 毫米</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName draft="contributed">納米</displayName>
+				<unitPattern count="other" draft="contributed">{0} 納米</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName draft="contributed">哩</displayName>
+				<unitPattern count="other" draft="contributed">{0} 哩</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName draft="contributed">呎</displayName>
+				<perUnitPattern draft="contributed">{0} 每呎</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="contributed">吋</displayName>
+				<perUnitPattern draft="contributed">{0} 每吋</perUnitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName draft="contributed">浬</displayName>
+				<unitPattern count="other" draft="contributed">{0} 浬</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<perUnitPattern draft="contributed">{0} 每公斤</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<perUnitPattern draft="contributed">{0} 每克</perUnitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<perUnitPattern draft="contributed">{0} 每磅</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName draft="contributed">安士</displayName>
+				<unitPattern count="other" draft="contributed">{0} 安士</unitPattern>
+				<perUnitPattern draft="contributed">{0} 每安士</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>金衡安士</displayName>
+				<unitPattern count="other" draft="contributed">{0} 金衡安士</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName draft="contributed">兆瓦</displayName>
+				<unitPattern count="other" draft="contributed">{0} 兆瓦</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>瓦</displayName>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<displayName draft="contributed">磅每平方吋</displayName>
+				<unitPattern count="other" draft="contributed">{0} 磅每平方吋</unitPattern>
+			</unit>
+			<unit type="pressure-inch-hg">
+				<displayName draft="contributed">英吋汞柱</displayName>
+				<unitPattern count="other" draft="contributed">{0} 英吋汞柱</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName draft="contributed">公里每小時</displayName>
+				<unitPattern count="other" draft="contributed">{0} 公里每小時</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName draft="contributed">米每秒</displayName>
+				<unitPattern count="other">{0} 米/秒</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName draft="contributed">英里每小時</displayName>
+				<unitPattern count="other" draft="contributed">{0} 英里每小時</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName draft="contributed">°C</displayName>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName draft="contributed">°F</displayName>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName draft="contributed">立方米</displayName>
+				<unitPattern count="other" draft="contributed">{0} 立方米</unitPattern>
+				<perUnitPattern draft="contributed">{0} 每立方米</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName draft="contributed">立方厘米</displayName>
+				<unitPattern count="other" draft="contributed">{0} 立方厘米</unitPattern>
+				<perUnitPattern draft="contributed">{0} 每立方厘米</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>立方呎</displayName>
+				<unitPattern count="other" draft="contributed">{0} 立方呎</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>立方吋</displayName>
+				<unitPattern count="other" draft="contributed">{0} 立方吋</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName draft="contributed">升</displayName>
+				<perUnitPattern draft="contributed">{0} 每升</perUnitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName draft="contributed">厘升</displayName>
+				<unitPattern count="other" draft="contributed">{0} 厘升</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<unitPattern count="other" draft="contributed">{0} 公制量杯</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName draft="contributed">英畝呎</displayName>
+				<unitPattern count="other" draft="contributed">{0} 英畝呎</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<perUnitPattern draft="contributed">{0} 每加侖</perUnitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<unitPattern count="other" draft="contributed">{0} 量杯</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName draft="contributed">液安士</displayName>
+				<unitPattern count="other" draft="contributed">{0} 液安士</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">{0} 東</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">{0} 北</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">{0} 南</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0} 西</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<unitLength type="narrow">
+			<unit type="area-square-mile">
+				<unitPattern count="other" draft="contributed">{0}mi²</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="other">{0}ft²</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<unitPattern count="other" draft="provisional">{0}L/100km</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<unitPattern count="other" draft="contributed">{0}個月</unitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName draft="contributed">日</displayName>
+				<unitPattern count="other" draft="contributed">{0}日</unitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<unitPattern count="other" draft="contributed">{0}小時</unitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName draft="contributed">分</displayName>
+			</unit>
+			<unit type="length-meter">
+				<displayName>米</displayName>
+				<unitPattern count="other" draft="contributed">{0}米</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName draft="contributed">厘米</displayName>
+				<unitPattern count="other" draft="contributed">{0}厘米</unitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName draft="contributed">毫米</displayName>
+				<unitPattern count="other" draft="contributed">{0}毫米</unitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<unitPattern count="other" draft="contributed">{0} 安士</unitPattern>
+			</unit>
+			<unit type="pressure-inch-hg">
+				<unitPattern count="other" draft="contributed">{0}″ Hg</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName draft="contributed">公里每小時</displayName>
+				<unitPattern count="other" draft="contributed">{0}kph</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<unitPattern count="other" draft="contributed">{0}m/s</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<unitPattern count="other" draft="contributed">{0}mph</unitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<unitPattern count="other" draft="contributed">{0}mi³</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName draft="contributed">升</displayName>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east" draft="contributed">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="contributed">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="contributed">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+	</units>
+	<listPatterns>
+		<listPattern>
+			<listPatternPart type="end" draft="contributed">{0}及{1}</listPatternPart>
+			<listPatternPart type="2" draft="contributed">{0}及{1}</listPatternPart>
+		</listPattern>
+	</listPatterns>
+	<posix>
+		<messages>
+			<yesstr>是</yesstr>
+			<nostr>否</nostr>
+		</messages>
+	</posix>
+</ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hant_MO.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant_MO.xml
similarity index 75%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hant_MO.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant_MO.xml
index 65a94b7a08f..cf03947a927 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hant_MO.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant_MO.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11135 $"/>
-		<generation date="$Date: 2015-01-19 14:58:31 -0600 (Mon, 19 Jan 2015) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="zh"/>
 		<script type="Hant"/>
 		<territory type="MO"/>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hant_TW.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant_TW.xml
similarity index 69%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hant_TW.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant_TW.xml
index 2186bd8b279..1586273dd11 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zh_Hant_TW.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant_TW.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="zh"/>
 		<script type="Hant"/>
 		<territory type="TW"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zu.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zu.xml
similarity index 62%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zu.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zu.xml
index 4299017df79..f261626ea6d 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zu.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zu.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 11093 $"/>
-		<generation date="$Date: 2015-01-02 21:36:02 -0600 (Fri, 02 Jan 2015) $"/>
+		<version number="$Revision: 12293 $"/>
 		<language type="zu"/>
 	</identity>
 	<localeDisplayNames>
@@ -19,41 +18,44 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<languages>
 			<language type="ab">isi-Abkhazian</language>
 			<language type="ach">Isi-Acoli</language>
-			<language type="af">isi-Afrikaans</language>
+			<language type="af">i-Afrikaans</language>
 			<language type="agq">isi-Aghem</language>
 			<language type="ak">isi-Akan</language>
 			<language type="am">isi-Amharic</language>
 			<language type="ar">isi-Arabic</language>
-			<language type="ar_001">Isi-Arabic Esijwayelekile Samanje</language>
+			<language type="ar_001">isi-Arabic esivamile sesimanje</language>
 			<language type="arn">isi-Mapuche</language>
 			<language type="as">isi-Assamese</language>
-			<language type="asa">asa</language>
+			<language type="asa">isi-Asu</language>
 			<language type="ay">isi-Aymara</language>
 			<language type="az">isi-Azerbaijani</language>
 			<language type="az" alt="short">isi-Azeria</language>
 			<language type="ba">isi-Bashkir</language>
 			<language type="be">isi-Belarusian</language>
-			<language type="bem">Isi-Bemba</language>
+			<language type="bem">isi-Bemba</language>
 			<language type="bez">isi-Bena</language>
 			<language type="bg">isi-Bulgari</language>
+			<language type="bgn">isi-Western Balochi</language>
 			<language type="bm">isi-Bambara</language>
 			<language type="bn">isi-Bengali</language>
 			<language type="bo">isi-Tibetan</language>
-			<language type="br">Isi-Breton</language>
+			<language type="br">isi-Breton</language>
 			<language type="brx">isi-Bodo</language>
 			<language type="bs">isi-Bosnian</language>
 			<language type="ca">isi-Catalan</language>
+			<language type="ce">isi-Chechen</language>
 			<language type="cgg">isi-Chiga</language>
-			<language type="chr">Isi-Cherokee</language>
-			<language type="ckb">Isi-Sorani Kurdish</language>
+			<language type="chr">isi-Cherokee</language>
+			<language type="ckb">isi-Central Kurdish</language>
 			<language type="co">isi-Corsican</language>
 			<language type="cs">isi-Czech</language>
+			<language type="cv">isi-Chuvash</language>
 			<language type="cy">isi-Welsh</language>
 			<language type="da">isi-Danish</language>
 			<language type="dav">isi-Taita</language>
 			<language type="de">isi-German</language>
 			<language type="de_AT">isi-Austrian German</language>
-			<language type="de_CH">isi-Swiss High German</language>
+			<language type="de_CH">i-Swiss High German</language>
 			<language type="dje">isi-Zarma</language>
 			<language type="dsb">isi-Lower Sorbian</language>
 			<language type="dua">isi-Duala</language>
@@ -61,20 +63,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="dyo">isi-Jola-Fonyl</language>
 			<language type="dz">isi-Dzongkha</language>
 			<language type="ebu">isi-Embu</language>
-			<language type="ee">Isi-Ewe</language>
+			<language type="ee">isi-Ewe</language>
 			<language type="efi">isi-Efik</language>
 			<language type="el">isi-Greek</language>
 			<language type="en">i-English</language>
 			<language type="en_AU">isi-Austrillian English</language>
 			<language type="en_CA">i-Canadian English</language>
 			<language type="en_GB">i-British English</language>
-			<language type="en_GB" alt="short">i-U.K Englishi</language>
+			<language type="en_GB" alt="short">i-UK English</language>
 			<language type="en_US">i-American English</language>
 			<language type="en_US" alt="short">i-English (US)</language>
 			<language type="eo">isi-Esperanto</language>
 			<language type="es">isi-Spanish</language>
 			<language type="es_419">isi-Latin American Spanish</language>
-			<language type="es_MX">isi-Mexican Spanish</language>
+			<language type="es_ES">i-European Spanish</language>
+			<language type="es_MX">i-Mexican Spanish</language>
 			<language type="et">isi-Estonia</language>
 			<language type="eu">isi-Basque</language>
 			<language type="fa">isi-Persian</language>
@@ -83,8 +86,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="fj">isi-Fijian</language>
 			<language type="fo">isi-Faroese</language>
 			<language type="fr">isi-French</language>
-			<language type="fr_CA">isi-Canadian French</language>
-			<language type="fr_CH">isi-Swiss French</language>
+			<language type="fr_CA">i-Canadian French</language>
+			<language type="fr_CH">i-Swiss French</language>
 			<language type="fy">isi-Western Frisian</language>
 			<language type="ga">isi-Irish</language>
 			<language type="gaa">Isi-Ga</language>
@@ -134,7 +137,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="koi">isi-Komi-Permyak</language>
 			<language type="kok">isi-Konkani</language>
 			<language type="ks">isi-Kashmiri</language>
-			<language type="ksb">isi-Shambala</language>
+			<language type="ksb">isiShambala</language>
 			<language type="ksf">isi-Bafia</language>
 			<language type="ku">isi-Kurdish</language>
 			<language type="kw">isi-Cornish</language>
@@ -142,11 +145,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="la">isi-Latin</language>
 			<language type="lag">isi-Langi</language>
 			<language type="lb">isi-Luxembourgish</language>
-			<language type="lg">Isi-Ganda</language>
+			<language type="lg">isi-Ganda</language>
 			<language type="lkt">isi-Lakota</language>
 			<language type="ln">isi-Lingala</language>
 			<language type="lo">i-Lao</language>
 			<language type="loz">Isi-Lozi</language>
+			<language type="lrc">isi-Northern Luri</language>
 			<language type="lt">isi-Lithuanian</language>
 			<language type="lu">isi-Luba-Katanga</language>
 			<language type="lua">Isi-Luba-Lulua</language>
@@ -155,7 +159,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="lv">isi-Latvian</language>
 			<language type="mas">isi-Masai</language>
 			<language type="mer">isi-Meru</language>
-			<language type="mfe">Isi-Morisyen</language>
+			<language type="mfe">isi-Morisyen</language>
 			<language type="mg">isi-Malagasy</language>
 			<language type="mgh">isi-Makhuwa-Meetto</language>
 			<language type="mgo">isi-Meta’</language>
@@ -169,9 +173,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="mt">isi-Maltese</language>
 			<language type="mua">isi-Mundang</language>
 			<language type="my">isi-Burmese</language>
+			<language type="mzn">isi-Mazanderani</language>
 			<language type="naq">isi-Nama</language>
 			<language type="nb">isi-Norwegian Bokmål</language>
 			<language type="nd">isi-North Ndebele</language>
+			<language type="nds">nds</language>
+			<language type="nds_NL">isi-Low Saxon</language>
 			<language type="ne">isi-Nepali</language>
 			<language type="nl">isi-Dutch</language>
 			<language type="nl_BE">isi-Flemish</language>
@@ -182,9 +189,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="nso">isi-Northern Sotho</language>
 			<language type="nus">isi-Nuer</language>
 			<language type="ny">isi-Nyanja</language>
-			<language type="nyn">Isi-Nyankole</language>
+			<language type="nyn">isi-Nyankole</language>
 			<language type="oc">Isi-Osithani</language>
-			<language type="om">Isi-Oromo</language>
+			<language type="om">i-Oromo</language>
 			<language type="or">isi-Oriya</language>
 			<language type="os">isi-Ossetic</language>
 			<language type="pa">isi-Punjabi</language>
@@ -208,6 +215,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="saq">isi-Samburu</language>
 			<language type="sbp">isi-Sangu</language>
 			<language type="sd">isi-Sindhi</language>
+			<language type="sdh">i-Southern Kurdish</language>
 			<language type="se">isi-Northern Sami</language>
 			<language type="seh">isi-Sena</language>
 			<language type="ses">isi-Koyraboro Senni</language>
@@ -222,7 +230,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="smj">isi-Lule Sami</language>
 			<language type="smn">isi-Inari Sami</language>
 			<language type="sms">isi-Skolt Sami</language>
-			<language type="sn">isi-Shona</language>
+			<language type="sn">isiShona</language>
 			<language type="so">isi-Somali</language>
 			<language type="sq">isi-Albania</language>
 			<language type="sr">isi-Serbian</language>
@@ -230,8 +238,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="st">isiSuthu</language>
 			<language type="su">isi-Sundanese</language>
 			<language type="sv">isi-Swedish</language>
-			<language type="sw">isi-Swahili</language>
-			<language type="swc">isi-Congo Swahili</language>
+			<language type="sw">isiSwahili</language>
+			<language type="sw_CD">isi-Congo Swahili</language>
 			<language type="ta">isi-Tamil</language>
 			<language type="te">isi-Telugu</language>
 			<language type="teo">isi-Teso</language>
@@ -242,7 +250,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="tk">isi-Turkmen</language>
 			<language type="tlh">Isi-Klingon</language>
 			<language type="tn">isi-Tswana</language>
-			<language type="to">Isi-Tongan</language>
+			<language type="to">isi-Tongan</language>
 			<language type="tpi">isi-Tok Pisin</language>
 			<language type="tr">isi-Turkish</language>
 			<language type="ts">isi-Tsonga</language>
@@ -254,13 +262,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="tzm">isi-Central Atlas Tamazight</language>
 			<language type="ug">isi-Uighur</language>
 			<language type="uk">isi-Ukrainian</language>
-			<language type="und">Ulimi olungaziwa</language>
+			<language type="und">ulimi olungaziwa</language>
 			<language type="ur">isi-Urdu</language>
 			<language type="uz">isi-Uzbek</language>
 			<language type="vai">isi-Vai</language>
 			<language type="ve">isi-Venda</language>
 			<language type="vi">isi-Vietnamese</language>
-			<language type="vun">isi-Vunjo</language>
+			<language type="vun">isiVunjo</language>
+			<language type="wbp">isi-Warlpiri</language>
 			<language type="wo">isi-Wolof</language>
 			<language type="xh">isiXhosa</language>
 			<language type="xog">isi-Soga</language>
@@ -268,10 +277,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<language type="yo">isi-Yoruba</language>
 			<language type="zgh">isi-Standard Moroccan Tamazight</language>
 			<language type="zh">isi-Chinese</language>
-			<language type="zh_Hans">isi-Sipmlified Chinese</language>
-			<language type="zh_Hant">isi-Traditional Chinese</language>
+			<language type="zh_Hant">isi-Chinese (Okosiko)</language>
 			<language type="zu">isiZulu</language>
-			<language type="zxx">Akukho okuqukethwe kolimi</language>
+			<language type="zxx">akukho okuqukethwe kolimi</language>
 		</languages>
 		<scripts>
 			<script type="Arab">i-Arab</script>
@@ -291,7 +299,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Hani">i-Han</script>
 			<script type="Hans">i-Simplified</script>
 			<script type="Hans" alt="stand-alone">i-Simplified Han</script>
-			<script type="Hant">Okosiko</script>
+			<script type="Hant">okosiko</script>
 			<script type="Hant" alt="stand-alone">i-Traditional Han</script>
 			<script type="Hebr">i-Hebrew</script>
 			<script type="Hira">i-Hiragana</script>
@@ -312,13 +320,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<script type="Thaa">i-Thaana</script>
 			<script type="Thai">i-Thai</script>
 			<script type="Tibt">i-Tibetan</script>
-			<script type="Zsym">Amasimbuli</script>
-			<script type="Zxxx">Okungabhaliwe</script>
-			<script type="Zyyy">Ejwayelekile</script>
-			<script type="Zzzz">Iskripthi esingaziwa</script>
+			<script type="Zsym">amasimbuli</script>
+			<script type="Zxxx">okungabhaliwe</script>
+			<script type="Zyyy">ejwayelekile</script>
+			<script type="Zzzz">iskripthi esingaziwa</script>
 		</scripts>
 		<territories>
-			<territory type="001">Umhlaba</territory>
+			<territory type="001">umhlaba</territory>
 			<territory type="002">i-Africa</territory>
 			<territory type="003">i-North America</territory>
 			<territory type="005">i-South America</territory>
@@ -329,7 +337,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="015">i-Northern Africa</territory>
 			<territory type="017">i-Middle Africa</territory>
 			<territory type="018">i-Southern Africa</territory>
-			<territory type="019">Americas</territory>
+			<territory type="019">i-Americas</territory>
 			<territory type="021">i-Northern America</territory>
 			<territory type="029">i-Caribbean</territory>
 			<territory type="030">i-Eastern Asia</territory>
@@ -356,7 +364,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="AI">i-Anguilla</territory>
 			<territory type="AL">i-Albania</territory>
 			<territory type="AM">i-Armenia</territory>
-			<territory type="AN">i-Netherlands Antilles</territory>
 			<territory type="AO">i-Angola</territory>
 			<territory type="AQ">i-Antarctica</territory>
 			<territory type="AR">i-Argentina</territory>
@@ -384,7 +391,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="BS">i-Bahamas</territory>
 			<territory type="BT">i-Bhutan</territory>
 			<territory type="BV">i-Bouvet Island</territory>
-			<territory type="BW">i-Botswana</territory>
+			<territory type="BW">iBotswana</territory>
 			<territory type="BY">i-Belarus</territory>
 			<territory type="BZ">i-Belize</territory>
 			<territory type="CA">i-Canada</territory>
@@ -438,7 +445,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="GB" alt="short">i-U.K.</territory>
 			<territory type="GD">i-Grenada</territory>
 			<territory type="GE">i-Georgia</territory>
-			<territory type="GF">isi-French Guiana</territory>
+			<territory type="GF">i-French Guiana</territory>
 			<territory type="GG">i-Guernsey</territory>
 			<territory type="GH">i-Ghana</territory>
 			<territory type="GI">i-Gibraltar</territory>
@@ -463,7 +470,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="IC">i-Canary Islands</territory>
 			<territory type="ID">i-Indonesia</territory>
 			<territory type="IE">i-Ireland</territory>
-			<territory type="IL">i-Israel</territory>
+			<territory type="IL">kwa-Israel</territory>
 			<territory type="IM">i-Isle of Man</territory>
 			<territory type="IN">i-India</territory>
 			<territory type="IO">i-British Indian Ocean Territory</territory>
@@ -492,7 +499,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="LI">i-Liechtenstein</territory>
 			<territory type="LK">i-Sri Lanka</territory>
 			<territory type="LR">i-Liberia</territory>
-			<territory type="LS">i-Lesotho</territory>
+			<territory type="LS">iLesotho</territory>
 			<territory type="LT">i-Lithuania</territory>
 			<territory type="LU">i-Luxembourg</territory>
 			<territory type="LV">i-Latvia</territory>
@@ -506,7 +513,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="MH">i-Marshall Islands</territory>
 			<territory type="MK">i-Macedonia</territory>
 			<territory type="MK" alt="variant">i-Macedonia (FYROM)</territory>
-			<territory type="ML">i-Mali</territory>
+			<territory type="ML">iMali</territory>
 			<territory type="MM">i-Myanmar (Burma)</territory>
 			<territory type="MN">i-Mongolia</territory>
 			<territory type="MO">i-Macau SAR China</territory>
@@ -518,7 +525,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="MT">i-Malta</territory>
 			<territory type="MU">i-Mauritius</territory>
 			<territory type="MV">i-Maldives</territory>
-			<territory type="MW">i-Malawi</territory>
+			<territory type="MW">iMalawi</territory>
 			<territory type="MX">i-Mexico</territory>
 			<territory type="MY">i-Malaysia</territory>
 			<territory type="MZ">i-Mozambique</territory>
@@ -575,7 +582,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="SS">i-South Sudan</territory>
 			<territory type="ST">i-São Tomé kanye ne-Príncipe</territory>
 			<territory type="SV">i-El Salvador</territory>
-			<territory type="SX">I-Sint Maarten</territory>
+			<territory type="SX">i-Sint Maarten</territory>
 			<territory type="SY">i-Syria</territory>
 			<territory type="SZ">i-Swaziland</territory>
 			<territory type="TA">i-Tristan da Cunha</territory>
@@ -617,7 +624,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<territory type="YT">i-Mayotte</territory>
 			<territory type="ZA">i-South Africa</territory>
 			<territory type="ZM">i-Zambia</territory>
-			<territory type="ZW">i-Zimbabwe</territory>
+			<territory type="ZW">iZimbabwe</territory>
 			<territory type="ZZ">iSifunda esingaziwa</territory>
 		</territories>
 		<keys>
@@ -632,6 +639,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="colNumeric">Ukuhlelwa Ngezinombolo</key>
 			<key type="colStrength">Amandla Okuhlelwa</key>
 			<key type="currency">Ikharensi</key>
+			<key type="hc">Umjikelezo wehora (12 vs 24</key>
+			<key type="lb">I-Line Break Style</key>
+			<key type="ms">Isistimu yokulinganisa</key>
 			<key type="numbers">Izinombolo</key>
 			<key type="timezone">Izoni yesikhathi:</key>
 			<key type="va">Okokwehlukanisa Kwasendaweni</key>
@@ -639,95 +649,105 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<key type="x">i-Private-Use</key>
 		</keys>
 		<types>
-			<type type="arab" key="numbers">i-Arabic-Indic Digits</type>
-			<type type="arabext" key="numbers">i-Extended Arabic-Indic Digits</type>
-			<type type="armn" key="numbers">i-Armenian Numerals</type>
-			<type type="armnlow" key="numbers">i-Armenian Lowercase Numerals</type>
-			<type type="beng" key="numbers">i-Bengali Digits</type>
-			<type type="big5han" key="collation">Ukuhlunga kwe-Traditional Chinese - Big5</type>
-			<type type="buddhist" key="calendar">i-Buddhist Calender</type>
-			<type type="chinese" key="calendar">i-Chinese Calender</type>
-			<type type="coptic" key="calendar">i-Coptic Calender</type>
-			<type type="dangi" key="calendar">i-Dangi Calendar</type>
-			<type type="deva" key="numbers">i-Devanagari Digits</type>
-			<type type="dictionary" key="collation">Ukuhlunga kwesichazimazwi</type>
-			<type type="ducet" key="collation">Ukuhlunga okuzenzakalelayo kwe-Unicode</type>
-			<type type="ethi" key="numbers">i-Ethiopic Numerals</type>
-			<type type="ethiopic" key="calendar">i-Ethipic Calender</type>
-			<type type="ethiopic-amete-alem" key="calendar">i-Ethiopic Amete Alem Calender</type>
-			<type type="finance" key="numbers">Izinombolo Zezomnotho</type>
-			<type type="fullwide" key="numbers">i-Full Width Digits</type>
-			<type type="gb2312han" key="collation">Ukuhlunga kwe-Simplified Chinese - GB2312</type>
-			<type type="geor" key="numbers">i-Georgian Numerals</type>
-			<type type="gregorian" key="calendar">i-Gregorian Calender</type>
-			<type type="grek" key="numbers">i-Greek Numerals</type>
-			<type type="greklow" key="numbers">i-Greek Lowercase Numerals</type>
-			<type type="gujr" key="numbers">i-Gujarati Digits</type>
-			<type type="guru" key="numbers">i-Gurmukhi Digits</type>
-			<type type="hanidec" key="numbers">i-Chinese Decimal Numerals</type>
-			<type type="hans" key="numbers">i-Simplified Chinese Numerals</type>
-			<type type="hansfin" key="numbers">i-Simplified Chinese Financial Numerals</type>
-			<type type="hant" key="numbers">i-Traditional Chinese Numerals</type>
-			<type type="hantfin" key="numbers">i-Traditional Chinese Financial Numerals</type>
-			<type type="hebr" key="numbers">i-Hebrew Numerals</type>
-			<type type="hebrew" key="calendar">i-Hebrew Calender</type>
-			<type type="identical" key="colStrength">Hlela konke</type>
-			<type type="indian" key="calendar">i-Indian National Calender</type>
-			<type type="islamic" key="calendar">i-Islamic Calender</type>
-			<type type="islamic-civil" key="calendar">i-Islamic-Civil Calendar</type>
-			<type type="iso8601" key="calendar">I-ISO-8601 Khalenda</type>
-			<type type="japanese" key="calendar">i-Japanese Calendar</type>
-			<type type="jpan" key="numbers">i-Japanese Numerals</type>
-			<type type="jpanfin" key="numbers">i-Japanese Financial Numerals</type>
-			<type type="khmr" key="numbers">i-Khmer Digits</type>
-			<type type="knda" key="numbers">i-Kannada Digits</type>
-			<type type="laoo" key="numbers">i-Lao Digits</type>
-			<type type="latn" key="numbers">i-Western Digits</type>
-			<type type="lower" key="colCaseFirst">Hlela Okwezinhlamvu Eziphansi Kuqala</type>
-			<type type="mlym" key="numbers">i-Malayalam Digits</type>
-			<type type="mong" key="numbers">i-Mongolian Digits</type>
-			<type type="mymr" key="numbers">i-Myanmar Digits</type>
-			<type type="native" key="numbers">Izinkinobho Zasendaweni</type>
-			<type type="no" key="colBackwards">Hlela Izindlela Zokuphimisela Ngokujwayelekile</type>
-			<type type="no" key="colCaseFirst">Hlela Ngokwenhlamvu Ezejwayelekile</type>
-			<type type="no" key="colCaseLevel">Hlela Okungancikile Ezinkinobhweni</type>
-			<type type="no" key="colHiraganaQuaternary">Hlela i-Kana Eceleni</type>
-			<type type="no" key="colNormalization">Hlela Ngaphandle Kokulinganisa</type>
-			<type type="no" key="colNumeric">Hlela Izinhlamvu Zenombolo Ngazinye</type>
-			<type type="non-ignorable" key="colAlternate">Hlela Izimpawu</type>
-			<type type="orya" key="numbers">i-Oriya Digits</type>
-			<type type="persian" key="calendar">i-Persian Calendar</type>
-			<type type="phonebook" key="collation">Ukuhlunga kwebhuku lefoni</type>
-			<type type="phonetic" key="collation">Hlela Ngokwefonetiki</type>
-			<type type="pinyin" key="collation">Ukuhlunga nge-Pinyin</type>
-			<type type="primary" key="colStrength">Hlela Izinhlamvu Zaphansi Kuphela</type>
-			<type type="quaternary" key="colStrength">Hlola Ukuphimisela/Ukuma kwezinhlamvu/Ububanzi/i-Kana</type>
-			<type type="reformed" key="collation">Ukuhlunga okwenziwe kabusha</type>
-			<type type="roc" key="calendar">i-Minguo Calender</type>
-			<type type="roman" key="numbers">i-Roman Numerals</type>
-			<type type="romanlow" key="numbers">i-Roman Lowercase Numerals</type>
-			<type type="search" key="collation">Usesho olujwayelekile</type>
-			<type type="searchjl" key="collation">Sesha nge-Hangul Ongwaqa Basekuqaleni</type>
-			<type type="secondary" key="colStrength">Hlela Ukuphimisela</type>
-			<type type="shifted" key="colAlternate">Hlela Ukuziba Izimpawu</type>
-			<type type="standard" key="collation">I-oda yokuhlunga ejwayelekile</type>
-			<type type="stroke" key="collation">Ukuhlunga kwe-Stroke</type>
-			<type type="taml" key="numbers">i-Tamil Numerals</type>
-			<type type="tamldec" key="numbers">i-Tamil Digits</type>
-			<type type="telu" key="numbers">i-Telegu Digits</type>
-			<type type="tertiary" key="colStrength">Hlela Ukuphimisela/Ukuma kwezinhlamvu/Ububanzi</type>
-			<type type="thai" key="numbers">i-Thai Digits</type>
-			<type type="tibt" key="numbers">i-Tibetan Digits</type>
-			<type type="traditional" key="collation">Ukuhlunga ngokisiko</type>
-			<type type="traditional" key="numbers">Izinombolo Ezijwayelekile</type>
-			<type type="unihan" key="collation">Ukuhlunga kwe-Radical-Stroke</type>
-			<type type="upper" key="colCaseFirst">Hlela Izinhlamvu Ezinkulu Kuqala</type>
-			<type type="vaii" key="numbers">Izinhlazu Zezinombolo ze-Vai</type>
-			<type type="yes" key="colBackwards">Ukuhlelwa Kokuphimisela Kuhlehlisiwe</type>
-			<type type="yes" key="colCaseLevel">Hlela Okuncike Ekumeni Kwezinkinobho</type>
-			<type type="yes" key="colHiraganaQuaternary">Hlela i-Kana Ngendlela Ehlukile</type>
-			<type type="yes" key="colNormalization">Ukuhlelwa Khekhodi Enye Kulinganisiwe</type>
-			<type type="yes" key="colNumeric">Hlela Izinhlamvu Ngokwezinombolo</type>
+			<type key="calendar" type="buddhist">ikhalenda lesi-Buddhist</type>
+			<type key="calendar" type="chinese">ikhalenda lesi-Chinese</type>
+			<type key="calendar" type="coptic">i-Coptic Calender</type>
+			<type key="calendar" type="dangi">ikhalenda lesi-Dangi</type>
+			<type key="calendar" type="ethiopic">ikhalenda lesi-Ethiopic</type>
+			<type key="calendar" type="ethiopic-amete-alem">i-Ethiopic Amete Alem Calender</type>
+			<type key="calendar" type="gregorian">ikhalenda lesi-Gregorian</type>
+			<type key="calendar" type="hebrew">ikhalenda lesi-Hebrew</type>
+			<type key="calendar" type="indian">i-Indian National Calender</type>
+			<type key="calendar" type="islamic">ikhalenda lesi-Islamic</type>
+			<type key="calendar" type="islamic-civil">i-Islamic-Civil Calendar</type>
+			<type key="calendar" type="iso8601">ikhalenda le-ISO-8601</type>
+			<type key="calendar" type="japanese">ikhalenda lesi-Japanese</type>
+			<type key="calendar" type="persian">ikhalenda lesi-Persian</type>
+			<type key="calendar" type="roc">ikhalenda lesi-Minguo</type>
+			<type key="colAlternate" type="non-ignorable">Hlela Izimpawu</type>
+			<type key="colAlternate" type="shifted">Hlela Ukuziba Izimpawu</type>
+			<type key="colBackwards" type="no">Hlela Izindlela Zokuphimisela Ngokujwayelekile</type>
+			<type key="colBackwards" type="yes">Ukuhlelwa Kokuphimisela Kuhlehlisiwe</type>
+			<type key="colCaseFirst" type="lower">Hlela Okwezinhlamvu Eziphansi Kuqala</type>
+			<type key="colCaseFirst" type="no">Hlela Ngokwenhlamvu Ezejwayelekile</type>
+			<type key="colCaseFirst" type="upper">Hlela Izinhlamvu Ezinkulu Kuqala</type>
+			<type key="colCaseLevel" type="no">Hlela Okungancikile Ezinkinobhweni</type>
+			<type key="colCaseLevel" type="yes">Hlela Okuncike Ekumeni Kwezinkinobho</type>
+			<type key="colHiraganaQuaternary" type="no">Hlela i-Kana Eceleni</type>
+			<type key="colHiraganaQuaternary" type="yes">Hlela i-Kana Ngendlela Ehlukile</type>
+			<type key="collation" type="big5han">Ukuhlunga kwe-Traditional Chinese - Big5</type>
+			<type key="collation" type="dictionary">Ukuhlunga kwesichazimazwi</type>
+			<type key="collation" type="ducet">Ukuhlunga okuzenzakalelayo kwe-Unicode</type>
+			<type key="collation" type="gb2312han">Ukuhlunga kwe-Simplified Chinese - GB2312</type>
+			<type key="collation" type="phonebook">Ukuhlunga kwebhuku lefoni</type>
+			<type key="collation" type="phonetic">Hlela Ngokwefonetiki</type>
+			<type key="collation" type="pinyin">Ukuhlunga nge-Pinyin</type>
+			<type key="collation" type="reformed">Ukuhlunga okwenziwe kabusha</type>
+			<type key="collation" type="search">Usesho olujwayelekile</type>
+			<type key="collation" type="searchjl">Sesha nge-Hangul Ongwaqa Basekuqaleni</type>
+			<type key="collation" type="standard">I-oda yokuhlunga ejwayelekile</type>
+			<type key="collation" type="stroke">Ukuhlunga kwe-Stroke</type>
+			<type key="collation" type="traditional">Ukuhlunga ngokisiko</type>
+			<type key="collation" type="unihan">Ukuhlunga kwe-Radical-Stroke</type>
+			<type key="colNormalization" type="no">Hlela Ngaphandle Kokulinganisa</type>
+			<type key="colNormalization" type="yes">Ukuhlelwa Khekhodi Enye Kulinganisiwe</type>
+			<type key="colNumeric" type="no">Hlela Izinhlamvu Zenombolo Ngazinye</type>
+			<type key="colNumeric" type="yes">Hlela Izinhlamvu Ngokwezinombolo</type>
+			<type key="colStrength" type="identical">Hlela konke</type>
+			<type key="colStrength" type="primary">Hlela Izinhlamvu Zaphansi Kuphela</type>
+			<type key="colStrength" type="quaternary">Hlola Ukuphimisela/Ukuma kwezinhlamvu/Ububanzi/i-Kana</type>
+			<type key="colStrength" type="secondary">Hlela Ukuphimisela</type>
+			<type key="colStrength" type="tertiary">Hlela Ukuphimisela/Ukuma kwezinhlamvu/Ububanzi</type>
+			<type key="hc" type="h11">isistimu yamahora angu-12 (0-11)</type>
+			<type key="hc" type="h12">isistimu yamahora angu-12 (1-12)</type>
+			<type key="hc" type="h23">isistimu yamahora angu-24 (0-23)</type>
+			<type key="hc" type="h24">isistimu yamahora angu-24 (1-24)</type>
+			<type key="lb" type="loose">i-Line Break Style exegayo</type>
+			<type key="lb" type="normal">i-Line Break Style ekahle</type>
+			<type key="lb" type="strict">i-Line Break Style enomthetho oqinile</type>
+			<type key="ms" type="metric">isistimu ye-Metric</type>
+			<type key="ms" type="uksystem">isistimu yokulinganisa ebusayo</type>
+			<type key="ms" type="ussystem">isistimu yokulinganisa yase-US</type>
+			<type key="numbers" type="arab">amadijithi esi-Arabic-Indic</type>
+			<type key="numbers" type="arabext">amadijithi esi-Arabic-Indic eluliwe</type>
+			<type key="numbers" type="armn">izinombolo zesi-Armenian</type>
+			<type key="numbers" type="armnlow">izinombolo ezincane zesi-Armenian</type>
+			<type key="numbers" type="beng">izinombolo zesi-Bengali</type>
+			<type key="numbers" type="deva">izinombolo zesi-Devanagari</type>
+			<type key="numbers" type="ethi">izinombolo zesi-Ethiopic</type>
+			<type key="numbers" type="finance">Izinombolo Zezomnotho</type>
+			<type key="numbers" type="fullwide">ububanzi obugcwele bamadijithi</type>
+			<type key="numbers" type="geor">izinombolo zesi-Georgian</type>
+			<type key="numbers" type="grek">izinombolo zesi-Greek</type>
+			<type key="numbers" type="greklow">izinombolo ezincane zesi-Greek</type>
+			<type key="numbers" type="gujr">amadijithi esi-Gujarati</type>
+			<type key="numbers" type="guru">amadijithi esi-Gurmukhi</type>
+			<type key="numbers" type="hanidec">izinombolo zezinombolo zesi-Chinese</type>
+			<type key="numbers" type="hans">izinombolo ezicacile zesi-Chinese</type>
+			<type key="numbers" type="hansfin">izinombolo ezicacile zezezimali zesi-Chinese</type>
+			<type key="numbers" type="hant">izinombolo zosiko zesi-Chinese</type>
+			<type key="numbers" type="hantfin">izinombolo zosiko zezezimali zesi-Chinese</type>
+			<type key="numbers" type="hebr">izinombolo zesi-Hebrew</type>
+			<type key="numbers" type="jpan">izinombolo zesi-Japanese</type>
+			<type key="numbers" type="jpanfin">izinombolo zezezimali zesi-Japanese</type>
+			<type key="numbers" type="khmr">amadijithi esi-Khmer</type>
+			<type key="numbers" type="knda">amadijithi esi-Kannada</type>
+			<type key="numbers" type="laoo">amadijithi esi-Lao</type>
+			<type key="numbers" type="latn">amadijithi ase-Western</type>
+			<type key="numbers" type="mlym">amadijithi esi-Malayalam</type>
+			<type key="numbers" type="mong">i-Mongolian Digits</type>
+			<type key="numbers" type="mymr">amadijithi esi-Maynmar</type>
+			<type key="numbers" type="native">Izinkinobho Zasendaweni</type>
+			<type key="numbers" type="orya">amadijithi esi-Oriya</type>
+			<type key="numbers" type="roman">izinombolo zesi-Roman</type>
+			<type key="numbers" type="romanlow">izinombolo zesi-Tamil</type>
+			<type key="numbers" type="taml">izinombolo zesi-Tamil</type>
+			<type key="numbers" type="tamldec">amadijithi esi-Tamil</type>
+			<type key="numbers" type="telu">amadijithi esi-Telegu</type>
+			<type key="numbers" type="thai">amadijithi esi-Thai</type>
+			<type key="numbers" type="tibt">amadijithi esi-Tibetan</type>
+			<type key="numbers" type="traditional">Izinombolo Ezijwayelekile</type>
+			<type key="numbers" type="vaii">Izinhlazu Zezinombolo ze-Vai</type>
 		</types>
 		<transformNames>
 			<transformName type="BGN">I-BGN</transformName>
@@ -818,6 +838,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -835,6 +856,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yM">yM</dateFormatItem>
@@ -852,6 +874,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">MMM d, y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E, MMM d, y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">MMMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
 					</availableFormats>
@@ -959,7 +982,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="1">Jan</month>
 							<month type="2">Feb</month>
 							<month type="3">Mas</month>
-							<month type="4">Apr</month>
+							<month type="4">Eph</month>
 							<month type="5">Mey</month>
 							<month type="6">Jun</month>
 							<month type="7">Jul</month>
@@ -973,7 +996,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="1">J</month>
 							<month type="2">F</month>
 							<month type="3">M</month>
-							<month type="4">A</month>
+							<month type="4">E</month>
 							<month type="5">M</month>
 							<month type="6">J</month>
 							<month type="7">J</month>
@@ -987,7 +1010,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="1">Januwari</month>
 							<month type="2">Februwari</month>
 							<month type="3">Mashi</month>
-							<month type="4">Apreli</month>
+							<month type="4">Ephreli</month>
 							<month type="5">Meyi</month>
 							<month type="6">Juni</month>
 							<month type="7">Julayi</month>
@@ -1003,7 +1026,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="1">Jan</month>
 							<month type="2">Feb</month>
 							<month type="3">Mas</month>
-							<month type="4">Apr</month>
+							<month type="4">Eph</month>
 							<month type="5">Mey</month>
 							<month type="6">Jun</month>
 							<month type="7">Jul</month>
@@ -1031,7 +1054,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<month type="1">Januwari</month>
 							<month type="2">Februwari</month>
 							<month type="3">Mashi</month>
-							<month type="4">Apreli</month>
+							<month type="4">Ephreli</month>
 							<month type="5">Meyi</month>
 							<month type="6">Juni</month>
 							<month type="7">Julayi</month>
@@ -1057,7 +1080,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dayWidth type="narrow">
 							<day type="sun">S</day>
 							<day type="mon">M</day>
-							<day type="tue">T</day>
+							<day type="tue">B</day>
 							<day type="wed">T</day>
 							<day type="thu">S</day>
 							<day type="fri">H</day>
@@ -1073,13 +1096,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<day type="sat">Mgq</day>
 						</dayWidth>
 						<dayWidth type="wide">
-							<day type="sun">Sonto</day>
-							<day type="mon">Msombuluko</day>
-							<day type="tue">Lwesibili</day>
-							<day type="wed">Lwesithathu</day>
-							<day type="thu">Lwesine</day>
-							<day type="fri">Lwesihlanu</day>
-							<day type="sat">Mgqibelo</day>
+							<day type="sun">ISonto</day>
+							<day type="mon">UMsombuluko</day>
+							<day type="tue">ULwesibili</day>
+							<day type="wed">ULwesithathu</day>
+							<day type="thu">ULwesine</day>
+							<day type="fri">ULwesihlanu</day>
+							<day type="sat">UMgqibelo</day>
 						</dayWidth>
 					</dayContext>
 					<dayContext type="stand-alone">
@@ -1102,22 +1125,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<day type="sat">M</day>
 						</dayWidth>
 						<dayWidth type="short">
-							<day type="sun">Isonto</day>
-							<day type="mon">Umsombuluko</day>
-							<day type="tue">Ulwesibili</day>
-							<day type="wed">Ulwesithathu</day>
-							<day type="thu">Ulwesine</day>
-							<day type="fri">Ulwesihlanu</day>
-							<day type="sat">Umgqibelo</day>
+							<day type="sun">Son</day>
+							<day type="mon">Mso</day>
+							<day type="tue">Bil</day>
+							<day type="wed">Tha</day>
+							<day type="thu">Sin</day>
+							<day type="fri">Hla</day>
+							<day type="sat">Mgq</day>
 						</dayWidth>
 						<dayWidth type="wide">
-							<day type="sun">Sonto</day>
-							<day type="mon">Msombuluko</day>
-							<day type="tue">Lwesibili</day>
-							<day type="wed">Lwesithathu</day>
-							<day type="thu">Lwesine</day>
-							<day type="fri">Lwesihlanu</day>
-							<day type="sat">Mgqibelo</day>
+							<day type="sun">ISonto</day>
+							<day type="mon">UMsombuluko</day>
+							<day type="tue">ULwesibili</day>
+							<day type="wed">ULwesithathu</day>
+							<day type="thu">ULwesine</day>
+							<day type="fri">ULwesihlanu</day>
+							<day type="sat">UMgqibelo</day>
 						</dayWidth>
 					</dayContext>
 				</days>
@@ -1136,10 +1159,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<quarter type="4">4</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
-							<quarter type="1">ikota engu-1</quarter>
-							<quarter type="2">ikota engu-2</quarter>
-							<quarter type="3">ikota engu-3</quarter>
-							<quarter type="4">ikota engu-4</quarter>
+							<quarter type="1">ikota yesi-1</quarter>
+							<quarter type="2">ikota yesi-2</quarter>
+							<quarter type="3">ikota yesi-3</quarter>
+							<quarter type="4">ikota yesi-4</quarter>
 						</quarterWidth>
 					</quarterContext>
 					<quarterContext type="stand-alone">
@@ -1156,10 +1179,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 							<quarter type="4">4</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
-							<quarter type="1">ikota engu-1</quarter>
-							<quarter type="2">ikota engu-2</quarter>
-							<quarter type="3">ikota engu-3</quarter>
-							<quarter type="4">ikota engu-4</quarter>
+							<quarter type="1">ikota yesi-1</quarter>
+							<quarter type="2">ikota yesi-2</quarter>
+							<quarter type="3">ikota yesi-3</quarter>
+							<quarter type="4">ikota yesi-4</quarter>
 						</quarterWidth>
 					</quarterContext>
 				</quarters>
@@ -1168,16 +1191,58 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dayPeriodWidth type="abbreviated">
 							<dayPeriod type="am">AM</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">ekuseni</dayPeriod>
+							<dayPeriod type="morning2">ekuseni</dayPeriod>
+							<dayPeriod type="afternoon1">ntambama</dayPeriod>
+							<dayPeriod type="evening1">ntambama</dayPeriod>
+							<dayPeriod type="night1">ebusuku</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am">a</dayPeriod>
-							<dayPeriod type="noon">n</dayPeriod>
 							<dayPeriod type="pm">p</dayPeriod>
+							<dayPeriod type="morning1">ekuseni</dayPeriod>
+							<dayPeriod type="morning2">ekuseni</dayPeriod>
+							<dayPeriod type="afternoon1">ntambama</dayPeriod>
+							<dayPeriod type="evening1">ntambama</dayPeriod>
+							<dayPeriod type="night1">ebusuku</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">Ekuseni</dayPeriod>
-							<dayPeriod type="noon">Emini</dayPeriod>
-							<dayPeriod type="pm">Ntambama</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">ekuseni</dayPeriod>
+							<dayPeriod type="morning2">ekuseni2</dayPeriod>
+							<dayPeriod type="afternoon1">ntambama</dayPeriod>
+							<dayPeriod type="evening1">ntambama</dayPeriod>
+							<dayPeriod type="night1">ebusuku</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">entathakusa</dayPeriod>
+							<dayPeriod type="morning2">ekuseni</dayPeriod>
+							<dayPeriod type="afternoon1">emini</dayPeriod>
+							<dayPeriod type="evening1">ebusuku1</dayPeriod>
+							<dayPeriod type="night1">ebusuku</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">a</dayPeriod>
+							<dayPeriod type="pm">p</dayPeriod>
+							<dayPeriod type="morning1">entathakusa</dayPeriod>
+							<dayPeriod type="morning2">ekuseni</dayPeriod>
+							<dayPeriod type="afternoon1">emini</dayPeriod>
+							<dayPeriod type="evening1">ebusuku1</dayPeriod>
+							<dayPeriod type="night1">ebusuku</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">entathakusa</dayPeriod>
+							<dayPeriod type="morning2">ekuseni2</dayPeriod>
+							<dayPeriod type="afternoon1">emini</dayPeriod>
+							<dayPeriod type="evening1">ebusuku1</dayPeriod>
+							<dayPeriod type="night1">ebusuku</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1268,22 +1333,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Gy">y G</dateFormatItem>
-						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
+						<dateFormatItem id="Gy">G y</dateFormatItem>
+						<dateFormatItem id="GyMMM">G y MMM</dateFormatItem>
+						<dateFormatItem id="GyMMMd">G y MMM d</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y MMM d, E</dateFormatItem>
 						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">HH</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
 						<dateFormatItem id="MEd">E, M/d</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">M/y</dateFormatItem>
@@ -1292,6 +1362,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMd">MMM d, y</dateFormatItem>
 						<dateFormatItem id="yMMMEd">E, MMM d, y</dateFormatItem>
+						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
 						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
 					</availableFormats>
@@ -1406,8 +1477,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="0">kulo nyaka</relative>
 				<relative type="1">unyaka ozayo</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">onyakeni ongu-{0}</relativeTimePattern>
-					<relativeTimePattern count="other">Eminyakeni engu-{0}</relativeTimePattern>
+					<relativeTimePattern count="one">onyakeni ongu-{0} ozayo</relativeTimePattern>
+					<relativeTimePattern count="other">eminyakeni engu-{0} ezayo</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} unyaka odlule</relativeTimePattern>
@@ -1416,6 +1487,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-short">
 				<displayName>Unyaka</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">onyakeni ongu-{0} ozayo</relativeTimePattern>
+					<relativeTimePattern count="other">eminyakeni engu-{0} ezayo</relativeTimePattern>
+				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} unyaka odlule</relativeTimePattern>
 					<relativeTimePattern count="other">{0} unyaka odlule</relativeTimePattern>
@@ -1423,12 +1498,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="year-narrow">
 				<displayName>Unyaka</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">onyakeni ongu-{0} ozayo</relativeTimePattern>
+					<relativeTimePattern count="other">eminyakeni engu-{0} ezayo</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} unyaka odlule</relativeTimePattern>
+					<relativeTimePattern count="other">{0} unyaka odlule</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="quarter">
 				<displayName>Ikota</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">kwikota engu-{0}</relativeTimePattern>
-					<relativeTimePattern count="other">kumakota angu-{0}</relativeTimePattern>
+					<relativeTimePattern count="one">kwikota engu-{0} ezayo</relativeTimePattern>
+					<relativeTimePattern count="other">kumakota angu-{0} ezayo</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} ikota edlule</relativeTimePattern>
@@ -1436,25 +1519,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="quarter-short">
-				<displayName>ikota</displayName>
+				<displayName>Ikota</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">kumakota angu-{0}</relativeTimePattern>
-					<relativeTimePattern count="other">kumakota angu-{0}</relativeTimePattern>
+					<relativeTimePattern count="one">kwikota engu-{0} ezayo</relativeTimePattern>
+					<relativeTimePattern count="other">kumakota angu-{0} ezayo</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} amakota adlule</relativeTimePattern>
-					<relativeTimePattern count="other">{0} amakota adlule</relativeTimePattern>
+					<relativeTimePattern count="other">{0} amakota edlule</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-narrow">
-				<displayName>ikota</displayName>
+				<displayName>Ikota</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">kumakota angu-{0}</relativeTimePattern>
 					<relativeTimePattern count="other">kumakota angu-{0}</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} amakota adlule</relativeTimePattern>
-					<relativeTimePattern count="other">{0} amakota adlule</relativeTimePattern>
+					<relativeTimePattern count="other">{0} amakota edlule</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month">
@@ -1463,8 +1546,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="0">le nyanga</relative>
 				<relative type="1">inyanga ezayo</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Enyangeni engu-{0}</relativeTimePattern>
-					<relativeTimePattern count="other">Ezinyangeni ezingu-{0}</relativeTimePattern>
+					<relativeTimePattern count="one">enyangeni engu-{0}</relativeTimePattern>
+					<relativeTimePattern count="other">ezinyangeni ezingu-{0} ezizayo</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} inyanga edlule</relativeTimePattern>
@@ -1472,10 +1555,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="month-short">
-				<displayName>inyanga</displayName>
+				<displayName>Inyanga</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">ezinyangeni ezingu-{0} ezizayo</relativeTimePattern>
+					<relativeTimePattern count="other">ezinyangeni ezingu-{0} ezizayo</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} izinyanga ezedlule</relativeTimePattern>
+					<relativeTimePattern count="other">{0} izinyanga ezedlule</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="month-narrow">
-				<displayName>inyanga</displayName>
+				<displayName>Inyanga</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">enyangeni engu-{0} ezayo</relativeTimePattern>
+					<relativeTimePattern count="other">enyangeni engu-{0} ezayo</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} izinyanga ezedlule</relativeTimePattern>
+					<relativeTimePattern count="other">{0} izinyanga ezedlule</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="week">
 				<displayName>Iviki</displayName>
@@ -1483,30 +1582,46 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<relative type="0">leli viki</relative>
 				<relative type="1">iviki elizayo</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Evikini elingu-{0}</relativeTimePattern>
-					<relativeTimePattern count="other">Emavikini angu-{0}</relativeTimePattern>
+					<relativeTimePattern count="one">evikini elingu-{0}</relativeTimePattern>
+					<relativeTimePattern count="other">emavikini angu-{0}</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">evikini elingu-{0} eledlule</relativeTimePattern>
-					<relativeTimePattern count="other">amaviki angu-{0} adlule</relativeTimePattern>
+					<relativeTimePattern count="other">amaviki angu-{0} edlule</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week-short">
 				<displayName>Iviki</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">evikini elingu-{0} elizayo</relativeTimePattern>
+					<relativeTimePattern count="other">emavikini angu-{0} ezayo</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">amaviki angu-{0} edlule</relativeTimePattern>
+					<relativeTimePattern count="other">amaviki angu-{0} edlule</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="week-narrow">
 				<displayName>Iviki</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">emavikini angu-{0} ezayo</relativeTimePattern>
+					<relativeTimePattern count="other">emavikini angu-{0} ezayo</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">amaviki angu-{0} edlule</relativeTimePattern>
+					<relativeTimePattern count="other">amaviki angu-{0} edlule</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="day">
-				<displayName>usuku</displayName>
-				<relative type="-2">Usuku olwandulela olwayizolo</relative>
+				<displayName>Usuku</displayName>
+				<relative type="-2">usuku olwandulela olwayizolo</relative>
 				<relative type="-1">izolo</relative>
 				<relative type="0">namhlanje</relative>
 				<relative type="1">kusasa</relative>
-				<relative type="2">Usuku olulandela olakusasa</relative>
+				<relative type="2">usuku olulandela olwakusasa</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Osukwini olungu-{0}</relativeTimePattern>
-					<relativeTimePattern count="other">Ezinsukwini ezingu-{0}</relativeTimePattern>
+					<relativeTimePattern count="one">osukwini olungu-{0} oluzayo</relativeTimePattern>
+					<relativeTimePattern count="other">ezinsukwini ezingu-{0} ezizayo</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">osukwini olungu-{0} olwedlule</relativeTimePattern>
@@ -1514,10 +1629,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day-short">
-				<displayName>usuku</displayName>
+				<displayName>Usuku</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">osukwini olungu{0}</relativeTimePattern>
-					<relativeTimePattern count="other">ezinsukwini ezingu{0}</relativeTimePattern>
+					<relativeTimePattern count="one">osukwini olungu-{0} oluzayo</relativeTimePattern>
+					<relativeTimePattern count="other">ezinsukwini ezingu-{0} ezizayo</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} usuku olwedlule</relativeTimePattern>
@@ -1525,10 +1640,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				</relativeTime>
 			</field>
 			<field type="day-narrow">
-				<displayName>usuku</displayName>
+				<displayName>Usuku</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">osukwini olungu{0}</relativeTimePattern>
-					<relativeTimePattern count="other">ezinsukwini ezingu{0}</relativeTimePattern>
+					<relativeTimePattern count="one">osukwini olungu-{0} oluzayo</relativeTimePattern>
+					<relativeTimePattern count="other">ezinsukwini ezingu-{0} ezizayo</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} usuku olwedlule</relativeTimePattern>
@@ -1540,38 +1655,108 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</field>
 			<field type="sun">
 				<relative type="-1">iSonto eledlule</relative>
-				<relative type="0">leli Sonto</relative>
+				<relative type="0">kuleli Sonto</relative>
+				<relative type="1">iSonto elizayo</relative>
+			</field>
+			<field type="sun-short">
+				<relative type="-1">iSonto eledlule</relative>
+				<relative type="0">kuleli Sonto</relative>
+				<relative type="1">iSonto elizayo</relative>
+			</field>
+			<field type="sun-narrow">
+				<relative type="-1">iSonto eledlule</relative>
+				<relative type="0">kuleli Sonto</relative>
 				<relative type="1">iSonto elizayo</relative>
 			</field>
 			<field type="mon">
-				<relative type="-1">ngoMsombuluko odlule</relative>
+				<relative type="-1">uMsombuluko odlule</relative>
 				<relative type="0">kulo Msombuluko</relative>
-				<relative type="1">uMsombuluko olandelayo</relative>
+				<relative type="1">uMsombuluko ozayo</relative>
+			</field>
+			<field type="mon-short">
+				<relative type="-1">uMsombuluko odlule</relative>
+				<relative type="0">kulo Msombuluko</relative>
+				<relative type="1">uMsombuluko ozayo</relative>
+			</field>
+			<field type="mon-narrow">
+				<relative type="-1">uMsombuluko odlule</relative>
+				<relative type="0">kulo Msombuluko</relative>
+				<relative type="1">uMsombuluko ozayo</relative>
 			</field>
 			<field type="tue">
-				<relative type="-1">uLwesibili odlule</relative>
+				<relative type="-1">uLwesibili oludlule</relative>
 				<relative type="0">kulo Lwesibili</relative>
-				<relative type="1">uLwesibili olandelayo</relative>
+				<relative type="1">uLwesibili oluzayo</relative>
+			</field>
+			<field type="tue-short">
+				<relative type="-1">uLwesibili oludlule</relative>
+				<relative type="0">kulo Lwesibili</relative>
+				<relative type="1">uLwesibili oluzayo</relative>
+			</field>
+			<field type="tue-narrow">
+				<relative type="-1">uLwesibili oludlule</relative>
+				<relative type="0">kulo Lwesibili</relative>
+				<relative type="1">uLwesibili oluzayo</relative>
 			</field>
 			<field type="wed">
-				<relative type="-1">uLwesithathu odlule</relative>
-				<relative type="0">lo Lwesithathu</relative>
-				<relative type="1">lo Lwesithathu</relative>
+				<relative type="-1">uLwesithathu oludlule</relative>
+				<relative type="0">kulo Lwesithathu</relative>
+				<relative type="1">uLwesithathu oluzayo</relative>
+			</field>
+			<field type="wed-short">
+				<relative type="-1">uLwesithathu oludlule</relative>
+				<relative type="0">kulo Lwesithathu</relative>
+				<relative type="1">uLwesithathu oluzayo</relative>
+			</field>
+			<field type="wed-narrow">
+				<relative type="-1">uLwesithathu oludlule</relative>
+				<relative type="0">kulo Lwesithathu</relative>
+				<relative type="1">uLwesithathu oluzayo</relative>
 			</field>
 			<field type="thu">
-				<relative type="-1">uLwesine odlule</relative>
-				<relative type="0">lo Lwesine</relative>
-				<relative type="1">uLwesine olandelayo</relative>
+				<relative type="-1">uLwesine oludlule</relative>
+				<relative type="0">kulo Lwesine</relative>
+				<relative type="1">uLwesine oluzayo</relative>
+			</field>
+			<field type="thu-short">
+				<relative type="-1">uLwesine oludlule</relative>
+				<relative type="0">kulo Lwesine</relative>
+				<relative type="1">uLwesine oluzayo</relative>
+			</field>
+			<field type="thu-narrow">
+				<relative type="-1">uLwesine oludlule</relative>
+				<relative type="0">kulo Lwesine</relative>
+				<relative type="1">uLwesine oluzayo</relative>
 			</field>
 			<field type="fri">
-				<relative type="-1">uLwesihlanu odlule</relative>
-				<relative type="0">lo Lwesihlanu</relative>
-				<relative type="1">uLwesihlanu olandelayo</relative>
+				<relative type="-1">uLwesihlanu oludlule</relative>
+				<relative type="0">kulo Lwesihlanu</relative>
+				<relative type="1">uLwesihlanu oluzayo</relative>
+			</field>
+			<field type="fri-short">
+				<relative type="-1">uLwesihlanu oludlule</relative>
+				<relative type="0">kulo Lwesihlanu</relative>
+				<relative type="1">uLwesihlanu oluzayo</relative>
+			</field>
+			<field type="fri-narrow">
+				<relative type="-1">uLwesihlanu oludlule</relative>
+				<relative type="0">kulo Lwesihlanu</relative>
+				<relative type="1">uLwesihlanu oluzayo</relative>
 			</field>
 			<field type="sat">
 				<relative type="-1">uMgqibelo odlule</relative>
-				<relative type="0">lo Mgqibelo</relative>
-				<relative type="1">Next Saturday</relative>
+				<relative type="0">kulo Mgqibelo</relative>
+				<relative type="1">uMgqibelo ozayo</relative>
+			</field>
+			<field type="sat-short">
+				<relative type="-1">uMgqibelo odlule</relative>
+				<relative type="0">kulo Mgqibelo</relative>
+				<relative type="1">uMgqibelo ozayo</relative>
+			</field>
+			<field type="sat-narrow">
+				<relative type="-1">uMgqibelo odlule</relative>
+				<relative type="0">kulo Mgqibelo</relative>
+				<relative type="1">uMgqibelo ozayo</relative>
 			</field>
 			<field type="dayperiod">
 				<displayName>AM/PM</displayName>
@@ -1579,101 +1764,101 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<field type="hour">
 				<displayName>Ihora</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Ehoreni elingu-{0}</relativeTimePattern>
-					<relativeTimePattern count="other">Emahoreni angu-{0}</relativeTimePattern>
+					<relativeTimePattern count="one">ehoreni elingu-{0} elizayo</relativeTimePattern>
+					<relativeTimePattern count="other">emahoreni angu-{0} ezayo</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">ehoreni eligu-{0} eledluli</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ihora eledlule</relativeTimePattern>
 					<relativeTimePattern count="other">emahoreni angu-{0} edlule</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-short">
 				<displayName>Ihora</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">ehoreni elingu{0}</relativeTimePattern>
-					<relativeTimePattern count="other">emahoreni angu{0}</relativeTimePattern>
+					<relativeTimePattern count="one">ehoreni elingu-{0} elizayo</relativeTimePattern>
+					<relativeTimePattern count="other">emahoreni angu-{0} ezayo</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} ihora eledlule</relativeTimePattern>
-					<relativeTimePattern count="other">{0} amahora adlule</relativeTimePattern>
+					<relativeTimePattern count="other">{0} amahora edlule</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-narrow">
 				<displayName>Ihora</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">ehoreni elingu{0}</relativeTimePattern>
-					<relativeTimePattern count="other">emahoreni angu{0}</relativeTimePattern>
+					<relativeTimePattern count="one">ehoreni elingu-{0} elizayo</relativeTimePattern>
+					<relativeTimePattern count="other">emahoreni angu-{0} ezayo</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} ihora eledlule</relativeTimePattern>
-					<relativeTimePattern count="other">{0} amahora adlule</relativeTimePattern>
+					<relativeTimePattern count="other">{0} amahora edlule</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute">
 				<displayName>Iminithi</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Kumunithi engu-{0}</relativeTimePattern>
-					<relativeTimePattern count="other">Emaminithini angu-{0}</relativeTimePattern>
+					<relativeTimePattern count="one">kuminithi elingu-{0} elizayo</relativeTimePattern>
+					<relativeTimePattern count="other">kumaminithi angu-{0} ezayo</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">eminithini elingu-{0} eledlule</relativeTimePattern>
-					<relativeTimePattern count="other">amaminithi angu-{0} adlule</relativeTimePattern>
+					<relativeTimePattern count="one">{0} iminithi eledlule</relativeTimePattern>
+					<relativeTimePattern count="other">{0} amaminithi edlule</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute-short">
 				<displayName>Iminithi</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">eminithini engu{0}</relativeTimePattern>
-					<relativeTimePattern count="other">emaminithini angu{0}</relativeTimePattern>
+					<relativeTimePattern count="one">kuminithi elingu-{0} elizayo</relativeTimePattern>
+					<relativeTimePattern count="other">kumaminithi angu-{0} ezayo</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} iminithi eledlule</relativeTimePattern>
-					<relativeTimePattern count="other">{0} amaminithi adlule</relativeTimePattern>
+					<relativeTimePattern count="other">{0} amaminithi edlule</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute-narrow">
 				<displayName>Iminithi</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">eminithini engu{0}</relativeTimePattern>
-					<relativeTimePattern count="other">emaminithini angu{0}</relativeTimePattern>
+					<relativeTimePattern count="one">kuminithi elingu-{0} elizayo</relativeTimePattern>
+					<relativeTimePattern count="other">kumaminithi angu-{0} ezayo</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} iminithi eledlule</relativeTimePattern>
-					<relativeTimePattern count="other">{0} amaminithi adlule</relativeTimePattern>
+					<relativeTimePattern count="other">{0} amaminithi edlule</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second">
 				<displayName>Isekhondi</displayName>
 				<relative type="0">manje</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">Kusekhondi elingu-{0}</relativeTimePattern>
-					<relativeTimePattern count="other">Kumasekhondi angu-{0}</relativeTimePattern>
+					<relativeTimePattern count="one">kusekhondi elingu-{0} elizayo</relativeTimePattern>
+					<relativeTimePattern count="other">kumasekhondi angu-{0} ezayo</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">isekhondi elingu-{0} eledlule</relativeTimePattern>
-					<relativeTimePattern count="other">amasekhondi angu-{0} adlule</relativeTimePattern>
+					<relativeTimePattern count="one">{0} isekhondi eledlule</relativeTimePattern>
+					<relativeTimePattern count="other">{0} amasekhondi edlule</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second-short">
 				<displayName>Isekhondi</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">esekhondini elingu{0}</relativeTimePattern>
-					<relativeTimePattern count="other">emasekhondini angu{0}</relativeTimePattern>
+					<relativeTimePattern count="one">kusekhondi elingu-{0} elizayo</relativeTimePattern>
+					<relativeTimePattern count="other">kumasekhondi angu-{0} ezayo</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} isekhondi eledlule</relativeTimePattern>
-					<relativeTimePattern count="other">{0} amasekhondi adlule</relativeTimePattern>
+					<relativeTimePattern count="other">{0} amasekhondi edlule</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second-narrow">
 				<displayName>Isekhondi</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">esekhondini elingu{0}</relativeTimePattern>
-					<relativeTimePattern count="other">emasekhondini angu{0}</relativeTimePattern>
+					<relativeTimePattern count="one">kusekhondi elingu-{0} elizayo</relativeTimePattern>
+					<relativeTimePattern count="other">kumasekhondi angu-{0} ezayo</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} isekhondi eledlule</relativeTimePattern>
-					<relativeTimePattern count="other">{0} amasekhondi adlule</relativeTimePattern>
+					<relativeTimePattern count="other">{0} amasekhondi edlule</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="zone">
@@ -1686,158 +1871,1264 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<gmtZeroFormat>GMT</gmtZeroFormat>
 			<regionFormat>Isikhathi sase-{0}</regionFormat>
 			<regionFormat type="daylight">{0} Isikhathi sasemini</regionFormat>
-			<regionFormat type="standard">{0} Isikhathi esijwayelekile</regionFormat>
+			<regionFormat type="standard">{0} isikhathi esivamile</regionFormat>
 			<fallbackFormat>{1} ({0})</fallbackFormat>
 			<zone type="Etc/Unknown">
-				<exemplarCity>esase-Uknown City</exemplarCity>
+				<exemplarCity>idolobha elingaziwa</exemplarCity>
+			</zone>
+			<zone type="Europe/Andorra">
+				<exemplarCity>i-Andorra</exemplarCity>
+			</zone>
+			<zone type="Asia/Dubai">
+				<exemplarCity>i-Dubai</exemplarCity>
 			</zone>
 			<zone type="Asia/Kabul">
-				<exemplarCity>esase-Kabul</exemplarCity>
+				<exemplarCity>i-Kabul</exemplarCity>
+			</zone>
+			<zone type="America/Antigua">
+				<exemplarCity>i-Antigua</exemplarCity>
+			</zone>
+			<zone type="America/Anguilla">
+				<exemplarCity>i-Anguilla</exemplarCity>
+			</zone>
+			<zone type="Europe/Tirane">
+				<exemplarCity>i-Tirane</exemplarCity>
+			</zone>
+			<zone type="Asia/Yerevan">
+				<exemplarCity>i-Yerevan</exemplarCity>
+			</zone>
+			<zone type="Africa/Luanda">
+				<exemplarCity>i-Luanda</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Rothera">
+				<exemplarCity>i-Rothera</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Palmer">
+				<exemplarCity>i-Palmer</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Troll">
+				<exemplarCity>i-Troll</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Syowa">
+				<exemplarCity>i-Syowa</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Mawson">
+				<exemplarCity>i-Mawson</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Davis">
+				<exemplarCity>i-Davis</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Vostok">
+				<exemplarCity>i-Vostok</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Casey">
+				<exemplarCity>i-Casey</exemplarCity>
+			</zone>
+			<zone type="Antarctica/DumontDUrville">
+				<exemplarCity>i-Dumont d’Urville</exemplarCity>
+			</zone>
+			<zone type="Antarctica/McMurdo">
+				<exemplarCity>i-McMurdo</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Rio_Gallegos">
+				<exemplarCity>i-Rio Gallegos</exemplarCity>
+			</zone>
+			<zone type="America/Mendoza">
+				<exemplarCity>i-Mendoza</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/San_Juan">
+				<exemplarCity>i-San Juan</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Ushuaia">
+				<exemplarCity>i-Ushuaia</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/La_Rioja">
+				<exemplarCity>i-La Rioja</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/San_Luis">
+				<exemplarCity>i-San Luis</exemplarCity>
+			</zone>
+			<zone type="America/Catamarca">
+				<exemplarCity>i-Catamarca</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Salta">
+				<exemplarCity>i-Salta</exemplarCity>
+			</zone>
+			<zone type="America/Jujuy">
+				<exemplarCity>i-Jujuy</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Tucuman">
+				<exemplarCity>i-Tucuman</exemplarCity>
+			</zone>
+			<zone type="America/Cordoba">
+				<exemplarCity>i-Cordoba</exemplarCity>
+			</zone>
+			<zone type="America/Buenos_Aires">
+				<exemplarCity>i-Buenos Aires</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pago_Pago">
+				<exemplarCity>i-Pago Pago</exemplarCity>
+			</zone>
+			<zone type="Europe/Vienna">
+				<exemplarCity>i-Vienna</exemplarCity>
+			</zone>
+			<zone type="Australia/Perth">
+				<exemplarCity>i-Perth</exemplarCity>
+			</zone>
+			<zone type="Australia/Eucla">
+				<exemplarCity>i-Eucla</exemplarCity>
+			</zone>
+			<zone type="Australia/Darwin">
+				<exemplarCity>i-Darwin</exemplarCity>
+			</zone>
+			<zone type="Australia/Adelaide">
+				<exemplarCity>i-Adelaide</exemplarCity>
+			</zone>
+			<zone type="Australia/Broken_Hill">
+				<exemplarCity>i-Broken Hill</exemplarCity>
+			</zone>
+			<zone type="Australia/Currie">
+				<exemplarCity>i-Currie</exemplarCity>
+			</zone>
+			<zone type="Australia/Melbourne">
+				<exemplarCity>i-Melbourne</exemplarCity>
+			</zone>
+			<zone type="Australia/Hobart">
+				<exemplarCity>i-Hobart</exemplarCity>
+			</zone>
+			<zone type="Australia/Lindeman">
+				<exemplarCity>i-Lindeman</exemplarCity>
+			</zone>
+			<zone type="Australia/Sydney">
+				<exemplarCity>i-Sydney</exemplarCity>
+			</zone>
+			<zone type="Australia/Brisbane">
+				<exemplarCity>i-Brisbane</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Macquarie">
+				<exemplarCity>i-Macquarie</exemplarCity>
+			</zone>
+			<zone type="Australia/Lord_Howe">
+				<exemplarCity>i-Lord Howe</exemplarCity>
+			</zone>
+			<zone type="America/Aruba">
+				<exemplarCity>i-Aruba</exemplarCity>
+			</zone>
+			<zone type="Europe/Mariehamn">
+				<exemplarCity>i-Mariehamn</exemplarCity>
+			</zone>
+			<zone type="Asia/Baku">
+				<exemplarCity>i-Baku</exemplarCity>
+			</zone>
+			<zone type="Europe/Sarajevo">
+				<exemplarCity>i-Sarajevo</exemplarCity>
+			</zone>
+			<zone type="America/Barbados">
+				<exemplarCity>i-Barbados</exemplarCity>
 			</zone>
 			<zone type="Asia/Dhaka">
-				<exemplarCity>esase-Dhaka</exemplarCity>
+				<exemplarCity>i-Dhaka</exemplarCity>
+			</zone>
+			<zone type="Europe/Brussels">
+				<exemplarCity>i-Brussels</exemplarCity>
+			</zone>
+			<zone type="Africa/Ouagadougou">
+				<exemplarCity>i-Ouagadougou</exemplarCity>
+			</zone>
+			<zone type="Europe/Sofia">
+				<exemplarCity>i-Sofia</exemplarCity>
+			</zone>
+			<zone type="Asia/Bahrain">
+				<exemplarCity>i-Bahrain</exemplarCity>
+			</zone>
+			<zone type="Africa/Bujumbura">
+				<exemplarCity>i-Bujumbura</exemplarCity>
+			</zone>
+			<zone type="Africa/Porto-Novo">
+				<exemplarCity>i-Porto-Novo</exemplarCity>
 			</zone>
 			<zone type="America/St_Barthelemy">
-				<exemplarCity>esase-Saint Barthélemy</exemplarCity>
+				<exemplarCity>i-St. Barthélemy</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Bermuda">
+				<exemplarCity>i-Bermuda</exemplarCity>
+			</zone>
+			<zone type="Asia/Brunei">
+				<exemplarCity>i-Brunei</exemplarCity>
+			</zone>
+			<zone type="America/La_Paz">
+				<exemplarCity>i-La Paz</exemplarCity>
+			</zone>
+			<zone type="America/Kralendijk">
+				<exemplarCity>i-Kralendijk</exemplarCity>
+			</zone>
+			<zone type="America/Eirunepe">
+				<exemplarCity>i-Eirunepe</exemplarCity>
+			</zone>
+			<zone type="America/Rio_Branco">
+				<exemplarCity>i-Rio Branco</exemplarCity>
+			</zone>
+			<zone type="America/Porto_Velho">
+				<exemplarCity>i-Porto Velho</exemplarCity>
+			</zone>
+			<zone type="America/Boa_Vista">
+				<exemplarCity>i-Boa Vista</exemplarCity>
+			</zone>
+			<zone type="America/Manaus">
+				<exemplarCity>i-Manaus</exemplarCity>
+			</zone>
+			<zone type="America/Cuiaba">
+				<exemplarCity>i-Cuiaba</exemplarCity>
+			</zone>
+			<zone type="America/Santarem">
+				<exemplarCity>i-Santarem</exemplarCity>
+			</zone>
+			<zone type="America/Campo_Grande">
+				<exemplarCity>i-Campo Grande</exemplarCity>
+			</zone>
+			<zone type="America/Belem">
+				<exemplarCity>i-Belem</exemplarCity>
+			</zone>
+			<zone type="America/Araguaina">
+				<exemplarCity>i-Araguaina</exemplarCity>
+			</zone>
+			<zone type="America/Sao_Paulo">
+				<exemplarCity>i-Sao Paulo</exemplarCity>
+			</zone>
+			<zone type="America/Bahia">
+				<exemplarCity>i-Bahia</exemplarCity>
+			</zone>
+			<zone type="America/Fortaleza">
+				<exemplarCity>i-Fortaleza</exemplarCity>
+			</zone>
+			<zone type="America/Maceio">
+				<exemplarCity>i-Maceio</exemplarCity>
+			</zone>
+			<zone type="America/Recife">
+				<exemplarCity>i-Recife</exemplarCity>
+			</zone>
+			<zone type="America/Noronha">
+				<exemplarCity>i-Noronha</exemplarCity>
+			</zone>
+			<zone type="America/Nassau">
+				<exemplarCity>i-Nassau</exemplarCity>
 			</zone>
 			<zone type="Asia/Thimphu">
-				<exemplarCity>esase-Thimphu</exemplarCity>
+				<exemplarCity>i-Thimphu</exemplarCity>
+			</zone>
+			<zone type="Africa/Gaborone">
+				<exemplarCity>i-Gaborone</exemplarCity>
+			</zone>
+			<zone type="Europe/Minsk">
+				<exemplarCity>i-Minsk</exemplarCity>
+			</zone>
+			<zone type="America/Belize">
+				<exemplarCity>i-Belize</exemplarCity>
+			</zone>
+			<zone type="America/Dawson">
+				<exemplarCity>i-Dawson</exemplarCity>
 			</zone>
 			<zone type="America/Whitehorse">
-				<exemplarCity>esase-Whitehorse</exemplarCity>
+				<exemplarCity>i-Whitehorse</exemplarCity>
+			</zone>
+			<zone type="America/Inuvik">
+				<exemplarCity>i-Inuvik</exemplarCity>
 			</zone>
 			<zone type="America/Vancouver">
-				<exemplarCity>esase-Vancouver</exemplarCity>
+				<exemplarCity>i-Vancouver</exemplarCity>
+			</zone>
+			<zone type="America/Dawson_Creek">
+				<exemplarCity>i-Dawson Creek</exemplarCity>
+			</zone>
+			<zone type="America/Creston">
+				<exemplarCity>i-Creston</exemplarCity>
 			</zone>
 			<zone type="America/Yellowknife">
-				<exemplarCity>esase-Yellowknife</exemplarCity>
+				<exemplarCity>i-Yellowknife</exemplarCity>
+			</zone>
+			<zone type="America/Edmonton">
+				<exemplarCity>i-Edmonton</exemplarCity>
 			</zone>
 			<zone type="America/Swift_Current">
-				<exemplarCity>esase-Swift Current</exemplarCity>
+				<exemplarCity>i-Swift Current</exemplarCity>
+			</zone>
+			<zone type="America/Cambridge_Bay">
+				<exemplarCity>i-Cambridge Bay</exemplarCity>
 			</zone>
 			<zone type="America/Regina">
-				<exemplarCity>esase-Regina</exemplarCity>
+				<exemplarCity>i-Regina</exemplarCity>
 			</zone>
 			<zone type="America/Winnipeg">
-				<exemplarCity>esase-Winnipeg</exemplarCity>
+				<exemplarCity>i-Winnipeg</exemplarCity>
 			</zone>
 			<zone type="America/Resolute">
-				<exemplarCity>esase-Resolute</exemplarCity>
+				<exemplarCity>i-Resolute</exemplarCity>
 			</zone>
 			<zone type="America/Rainy_River">
-				<exemplarCity>esase-Rainy River</exemplarCity>
+				<exemplarCity>i-Rainy River</exemplarCity>
 			</zone>
 			<zone type="America/Rankin_Inlet">
-				<exemplarCity>esase-Rankin Inlet</exemplarCity>
+				<exemplarCity>i-Rankin Inlet</exemplarCity>
+			</zone>
+			<zone type="America/Coral_Harbour">
+				<exemplarCity>i-Atikokan</exemplarCity>
 			</zone>
 			<zone type="America/Thunder_Bay">
-				<exemplarCity>esase-Thunder Bay</exemplarCity>
+				<exemplarCity>i-Thunder Bay</exemplarCity>
+			</zone>
+			<zone type="America/Nipigon">
+				<exemplarCity>i-Nipigon</exemplarCity>
 			</zone>
 			<zone type="America/Toronto">
-				<exemplarCity>esase-Toronto</exemplarCity>
+				<exemplarCity>i-Toronto</exemplarCity>
+			</zone>
+			<zone type="America/Iqaluit">
+				<exemplarCity>i-Iqaluit</exemplarCity>
+			</zone>
+			<zone type="America/Pangnirtung">
+				<exemplarCity>i-Pangnirtung</exemplarCity>
+			</zone>
+			<zone type="America/Moncton">
+				<exemplarCity>i-Moncton</exemplarCity>
+			</zone>
+			<zone type="America/Halifax">
+				<exemplarCity>i-Halifax</exemplarCity>
+			</zone>
+			<zone type="America/Goose_Bay">
+				<exemplarCity>i-Goose Bay</exemplarCity>
+			</zone>
+			<zone type="America/Glace_Bay">
+				<exemplarCity>i-Glace Bay</exemplarCity>
+			</zone>
+			<zone type="America/Blanc-Sablon">
+				<exemplarCity>i-Blanc-Sablon</exemplarCity>
 			</zone>
 			<zone type="America/St_Johns">
-				<exemplarCity>esase-St. John’s</exemplarCity>
+				<exemplarCity>i-St. John’s</exemplarCity>
+			</zone>
+			<zone type="Indian/Cocos">
+				<exemplarCity>i-Cocos</exemplarCity>
+			</zone>
+			<zone type="Africa/Kinshasa">
+				<exemplarCity>i-Kinshasa</exemplarCity>
+			</zone>
+			<zone type="Africa/Lubumbashi">
+				<exemplarCity>i-Lubumbashi</exemplarCity>
+			</zone>
+			<zone type="Africa/Bangui">
+				<exemplarCity>i-Bangui</exemplarCity>
+			</zone>
+			<zone type="Africa/Brazzaville">
+				<exemplarCity>i-Brazzaville</exemplarCity>
+			</zone>
+			<zone type="Europe/Zurich">
+				<exemplarCity>i-Zurich</exemplarCity>
+			</zone>
+			<zone type="Africa/Abidjan">
+				<exemplarCity>i-Abidjan</exemplarCity>
+			</zone>
+			<zone type="Pacific/Rarotonga">
+				<exemplarCity>i-Rarotonga</exemplarCity>
+			</zone>
+			<zone type="Pacific/Easter">
+				<exemplarCity>i-Easter</exemplarCity>
+			</zone>
+			<zone type="America/Santiago">
+				<exemplarCity>i-Santiago</exemplarCity>
+			</zone>
+			<zone type="Africa/Douala">
+				<exemplarCity>i-Douala</exemplarCity>
+			</zone>
+			<zone type="Asia/Urumqi">
+				<exemplarCity>i-Urumqi</exemplarCity>
+			</zone>
+			<zone type="Asia/Shanghai">
+				<exemplarCity>i-Shanghai</exemplarCity>
+			</zone>
+			<zone type="America/Bogota">
+				<exemplarCity>i-Bogota</exemplarCity>
+			</zone>
+			<zone type="America/Costa_Rica">
+				<exemplarCity>i-Costa Rica</exemplarCity>
+			</zone>
+			<zone type="America/Havana">
+				<exemplarCity>i-Havana</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Cape_Verde">
+				<exemplarCity>i-Cape Verde</exemplarCity>
 			</zone>
 			<zone type="America/Curacao">
-				<exemplarCity>I-Curaçao</exemplarCity>
+				<exemplarCity>i-Curaçao</exemplarCity>
+			</zone>
+			<zone type="Indian/Christmas">
+				<exemplarCity>i-Christmas</exemplarCity>
+			</zone>
+			<zone type="Asia/Nicosia">
+				<exemplarCity>i-Nicosia</exemplarCity>
+			</zone>
+			<zone type="Europe/Prague">
+				<exemplarCity>i-Prague</exemplarCity>
+			</zone>
+			<zone type="Europe/Busingen">
+				<exemplarCity>i-Busingen</exemplarCity>
+			</zone>
+			<zone type="Europe/Berlin">
+				<exemplarCity>i-Berlin</exemplarCity>
+			</zone>
+			<zone type="Africa/Djibouti">
+				<exemplarCity>i-Djibouti</exemplarCity>
+			</zone>
+			<zone type="Europe/Copenhagen">
+				<exemplarCity>i-Copenhagen</exemplarCity>
+			</zone>
+			<zone type="America/Dominica">
+				<exemplarCity>i-Dominica</exemplarCity>
 			</zone>
 			<zone type="America/Santo_Domingo">
-				<exemplarCity>esase-Santo Domingo</exemplarCity>
+				<exemplarCity>i-Santo Domingo</exemplarCity>
+			</zone>
+			<zone type="Africa/Algiers">
+				<exemplarCity>i-Algiers</exemplarCity>
+			</zone>
+			<zone type="Pacific/Galapagos">
+				<exemplarCity>i-Galapagos</exemplarCity>
+			</zone>
+			<zone type="America/Guayaquil">
+				<exemplarCity>i-Guayaquil</exemplarCity>
+			</zone>
+			<zone type="Europe/Tallinn">
+				<exemplarCity>i-Tallinn</exemplarCity>
+			</zone>
+			<zone type="Africa/Cairo">
+				<exemplarCity>i-Cairo</exemplarCity>
+			</zone>
+			<zone type="Africa/El_Aaiun">
+				<exemplarCity>i-El Aaiun</exemplarCity>
+			</zone>
+			<zone type="Africa/Asmera">
+				<exemplarCity>i-Asmara</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Canary">
+				<exemplarCity>i-Canary</exemplarCity>
+			</zone>
+			<zone type="Africa/Ceuta">
+				<exemplarCity>i-Ceuta</exemplarCity>
+			</zone>
+			<zone type="Europe/Madrid">
+				<exemplarCity>i-Madrid</exemplarCity>
+			</zone>
+			<zone type="Africa/Addis_Ababa">
+				<exemplarCity>i-Addis Ababa</exemplarCity>
+			</zone>
+			<zone type="Europe/Helsinki">
+				<exemplarCity>i-Helsinki</exemplarCity>
+			</zone>
+			<zone type="Pacific/Fiji">
+				<exemplarCity>i-Fiji</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Stanley">
+				<exemplarCity>i-Stanley</exemplarCity>
+			</zone>
+			<zone type="Pacific/Truk">
+				<exemplarCity>i-Chuuk</exemplarCity>
+			</zone>
+			<zone type="Pacific/Ponape">
+				<exemplarCity>i-Pohnpei</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kosrae">
+				<exemplarCity>i-Kosrae</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Faeroe">
+				<exemplarCity>i-Faroe</exemplarCity>
+			</zone>
+			<zone type="Europe/Paris">
+				<exemplarCity>i-Paris</exemplarCity>
+			</zone>
+			<zone type="Africa/Libreville">
+				<exemplarCity>i-Libreville</exemplarCity>
 			</zone>
 			<zone type="Europe/London">
 				<long>
-					<daylight>esase-British Summer Time</daylight>
+					<daylight>isikhathi sase-British sasehlobo</daylight>
 				</long>
+				<exemplarCity>i-London</exemplarCity>
+			</zone>
+			<zone type="America/Grenada">
+				<exemplarCity>i-Grenada</exemplarCity>
+			</zone>
+			<zone type="Asia/Tbilisi">
+				<exemplarCity>i-Tbilisi</exemplarCity>
+			</zone>
+			<zone type="America/Cayenne">
+				<exemplarCity>i-Cayenne</exemplarCity>
+			</zone>
+			<zone type="Europe/Guernsey">
+				<exemplarCity>i-Guernsey</exemplarCity>
+			</zone>
+			<zone type="Africa/Accra">
+				<exemplarCity>i-Accra</exemplarCity>
+			</zone>
+			<zone type="Europe/Gibraltar">
+				<exemplarCity>i-Gibraltar</exemplarCity>
 			</zone>
 			<zone type="America/Thule">
-				<exemplarCity>esase-Thule</exemplarCity>
+				<exemplarCity>i-Thule</exemplarCity>
+			</zone>
+			<zone type="America/Godthab">
+				<exemplarCity>i-Nuuk</exemplarCity>
 			</zone>
 			<zone type="America/Scoresbysund">
-				<exemplarCity>esase-Ittoqqortoormiit</exemplarCity>
+				<exemplarCity>i-Ittoqqortoormiit</exemplarCity>
+			</zone>
+			<zone type="America/Danmarkshavn">
+				<exemplarCity>i-Danmarkshavn</exemplarCity>
+			</zone>
+			<zone type="Africa/Banjul">
+				<exemplarCity>i-Banjul</exemplarCity>
+			</zone>
+			<zone type="Africa/Conakry">
+				<exemplarCity>i-Conakry</exemplarCity>
+			</zone>
+			<zone type="America/Guadeloupe">
+				<exemplarCity>i-Guadeloupe</exemplarCity>
+			</zone>
+			<zone type="Africa/Malabo">
+				<exemplarCity>iMalabo</exemplarCity>
+			</zone>
+			<zone type="Europe/Athens">
+				<exemplarCity>i-Athens</exemplarCity>
+			</zone>
+			<zone type="Atlantic/South_Georgia">
+				<exemplarCity>i-South Georgia</exemplarCity>
+			</zone>
+			<zone type="America/Guatemala">
+				<exemplarCity>i-Guatemala</exemplarCity>
+			</zone>
+			<zone type="Pacific/Guam">
+				<exemplarCity>i-Guam</exemplarCity>
+			</zone>
+			<zone type="Africa/Bissau">
+				<exemplarCity>i-Bissau</exemplarCity>
+			</zone>
+			<zone type="America/Guyana">
+				<exemplarCity>i-Guyana</exemplarCity>
+			</zone>
+			<zone type="Asia/Hong_Kong">
+				<exemplarCity>i-Hong Kong</exemplarCity>
 			</zone>
 			<zone type="America/Tegucigalpa">
-				<exemplarCity>esase-Tegucigalpa</exemplarCity>
+				<exemplarCity>i-Tegucigalpa</exemplarCity>
+			</zone>
+			<zone type="Europe/Zagreb">
+				<exemplarCity>i-Zagreb</exemplarCity>
 			</zone>
 			<zone type="America/Port-au-Prince">
-				<exemplarCity>esase-Port-au-Prince</exemplarCity>
+				<exemplarCity>i-Port-au-Prince</exemplarCity>
+			</zone>
+			<zone type="Europe/Budapest">
+				<exemplarCity>i-Budapest</exemplarCity>
+			</zone>
+			<zone type="Asia/Jakarta">
+				<exemplarCity>i-Jakarta</exemplarCity>
+			</zone>
+			<zone type="Asia/Pontianak">
+				<exemplarCity>i-Pontianak</exemplarCity>
+			</zone>
+			<zone type="Asia/Makassar">
+				<exemplarCity>i-Makassar</exemplarCity>
+			</zone>
+			<zone type="Asia/Jayapura">
+				<exemplarCity>i-Jayapura</exemplarCity>
 			</zone>
 			<zone type="Europe/Dublin">
 				<long>
-					<daylight>esase-Irish Standard Time</daylight>
+					<daylight>isikhathi sase-Irish esivamile</daylight>
 				</long>
+				<exemplarCity>i-Dublin</exemplarCity>
+			</zone>
+			<zone type="Asia/Jerusalem">
+				<exemplarCity>i-Jerusalem</exemplarCity>
+			</zone>
+			<zone type="Europe/Isle_of_Man">
+				<exemplarCity>i-Isle of Man</exemplarCity>
 			</zone>
 			<zone type="Asia/Calcutta">
-				<exemplarCity>esase-Kolkata</exemplarCity>
+				<exemplarCity>i-Kolkata</exemplarCity>
+			</zone>
+			<zone type="Indian/Chagos">
+				<exemplarCity>i-Chagos</exemplarCity>
+			</zone>
+			<zone type="Asia/Baghdad">
+				<exemplarCity>i-Baghdad</exemplarCity>
 			</zone>
 			<zone type="Asia/Tehran">
-				<exemplarCity>esase-Tehran</exemplarCity>
+				<exemplarCity>i-Tehran</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Reykjavik">
+				<exemplarCity>i-Reykjavik</exemplarCity>
+			</zone>
+			<zone type="Europe/Rome">
+				<exemplarCity>i-Rome</exemplarCity>
+			</zone>
+			<zone type="Europe/Jersey">
+				<exemplarCity>i-Jersey</exemplarCity>
+			</zone>
+			<zone type="America/Jamaica">
+				<exemplarCity>i-Jamaica</exemplarCity>
+			</zone>
+			<zone type="Asia/Amman">
+				<exemplarCity>i-Amman</exemplarCity>
+			</zone>
+			<zone type="Asia/Tokyo">
+				<exemplarCity>i-Tokyo</exemplarCity>
+			</zone>
+			<zone type="Africa/Nairobi">
+				<exemplarCity>i-Nairobi</exemplarCity>
+			</zone>
+			<zone type="Asia/Bishkek">
+				<exemplarCity>i-Bishkek</exemplarCity>
+			</zone>
+			<zone type="Asia/Phnom_Penh">
+				<exemplarCity>i-Phnom Penh</exemplarCity>
+			</zone>
+			<zone type="Pacific/Enderbury">
+				<exemplarCity>i-Enderbury</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kiritimati">
+				<exemplarCity>i-Kiritimati</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tarawa">
+				<exemplarCity>i-Tarawa</exemplarCity>
+			</zone>
+			<zone type="Indian/Comoro">
+				<exemplarCity>i-Comoro</exemplarCity>
 			</zone>
 			<zone type="America/St_Kitts">
-				<exemplarCity>esase-St. Kitts</exemplarCity>
+				<exemplarCity>i-St. Kitts</exemplarCity>
+			</zone>
+			<zone type="Asia/Pyongyang">
+				<exemplarCity>i-Pyongyang</exemplarCity>
+			</zone>
+			<zone type="Asia/Seoul">
+				<exemplarCity>i-Seoul</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuwait">
+				<exemplarCity>i-Kuwait</exemplarCity>
+			</zone>
+			<zone type="America/Cayman">
+				<exemplarCity>i-Cayman</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtau">
+				<exemplarCity>i-Aqtau</exemplarCity>
+			</zone>
+			<zone type="Asia/Oral">
+				<exemplarCity>i-Oral</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtobe">
+				<exemplarCity>i-Aqtobe</exemplarCity>
+			</zone>
+			<zone type="Asia/Qyzylorda">
+				<exemplarCity>i-Qyzylorda</exemplarCity>
+			</zone>
+			<zone type="Asia/Almaty">
+				<exemplarCity>i-Almaty</exemplarCity>
+			</zone>
+			<zone type="Asia/Vientiane">
+				<exemplarCity>i-Vientiane</exemplarCity>
+			</zone>
+			<zone type="Asia/Beirut">
+				<exemplarCity>i-Beirut</exemplarCity>
 			</zone>
 			<zone type="America/St_Lucia">
-				<exemplarCity>esase-St. Lucia</exemplarCity>
+				<exemplarCity>i-</exemplarCity>
+			</zone>
+			<zone type="Europe/Vaduz">
+				<exemplarCity>i-Vaduz</exemplarCity>
 			</zone>
 			<zone type="Asia/Colombo">
-				<exemplarCity>esase-Colombo</exemplarCity>
+				<exemplarCity>i-Colombo</exemplarCity>
+			</zone>
+			<zone type="Africa/Monrovia">
+				<exemplarCity>i-Monrovia</exemplarCity>
+			</zone>
+			<zone type="Africa/Maseru">
+				<exemplarCity>iMaseru</exemplarCity>
+			</zone>
+			<zone type="Europe/Vilnius">
+				<exemplarCity>i-Vilnius</exemplarCity>
+			</zone>
+			<zone type="Europe/Luxembourg">
+				<exemplarCity>i-Luxembourg</exemplarCity>
+			</zone>
+			<zone type="Europe/Riga">
+				<exemplarCity>i-Riga</exemplarCity>
+			</zone>
+			<zone type="Africa/Tripoli">
+				<exemplarCity>i-Tripoli</exemplarCity>
+			</zone>
+			<zone type="Africa/Casablanca">
+				<exemplarCity>i-Casablanca</exemplarCity>
+			</zone>
+			<zone type="Europe/Monaco">
+				<exemplarCity>i-Monaco</exemplarCity>
+			</zone>
+			<zone type="Europe/Chisinau">
+				<exemplarCity>i-Chisinau</exemplarCity>
+			</zone>
+			<zone type="Europe/Podgorica">
+				<exemplarCity>i-Podgorica</exemplarCity>
+			</zone>
+			<zone type="America/Marigot">
+				<exemplarCity>i-Marigot</exemplarCity>
+			</zone>
+			<zone type="Indian/Antananarivo">
+				<exemplarCity>i-Antananarivo</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kwajalein">
+				<exemplarCity>i-Kwajalein</exemplarCity>
+			</zone>
+			<zone type="Pacific/Majuro">
+				<exemplarCity>i-Majuro</exemplarCity>
+			</zone>
+			<zone type="Europe/Skopje">
+				<exemplarCity>i-Skopje</exemplarCity>
+			</zone>
+			<zone type="Africa/Bamako">
+				<exemplarCity>i-Bamako</exemplarCity>
+			</zone>
+			<zone type="Asia/Rangoon">
+				<exemplarCity>i-Rangoon</exemplarCity>
+			</zone>
+			<zone type="Asia/Hovd">
+				<exemplarCity>i-Hovd</exemplarCity>
+			</zone>
+			<zone type="Asia/Ulaanbaatar">
+				<exemplarCity>i-Ulaanbaatar</exemplarCity>
+			</zone>
+			<zone type="Asia/Choibalsan">
+				<exemplarCity>i-Choibalsan</exemplarCity>
+			</zone>
+			<zone type="Asia/Macau">
+				<exemplarCity>i-Macau</exemplarCity>
+			</zone>
+			<zone type="Pacific/Saipan">
+				<exemplarCity>i-Saipan</exemplarCity>
+			</zone>
+			<zone type="America/Martinique">
+				<exemplarCity>i-Martinique</exemplarCity>
+			</zone>
+			<zone type="Africa/Nouakchott">
+				<exemplarCity>i-Nouakchott</exemplarCity>
+			</zone>
+			<zone type="America/Montserrat">
+				<exemplarCity>i-Montserrat</exemplarCity>
+			</zone>
+			<zone type="Europe/Malta">
+				<exemplarCity>i-Malta</exemplarCity>
+			</zone>
+			<zone type="Indian/Mauritius">
+				<exemplarCity>i-Mauritius</exemplarCity>
 			</zone>
 			<zone type="Indian/Maldives">
-				<exemplarCity>esase-Maldives</exemplarCity>
+				<exemplarCity>i-Maldives</exemplarCity>
+			</zone>
+			<zone type="Africa/Blantyre">
+				<exemplarCity>i-Blantyre</exemplarCity>
 			</zone>
 			<zone type="America/Tijuana">
-				<exemplarCity>esase-Tijuana</exemplarCity>
+				<exemplarCity>i-Tijuana</exemplarCity>
 			</zone>
 			<zone type="America/Santa_Isabel">
-				<exemplarCity>esase-Santa Isabel</exemplarCity>
+				<exemplarCity>i-Santa Isabel</exemplarCity>
+			</zone>
+			<zone type="America/Hermosillo">
+				<exemplarCity>i-Hermosillo</exemplarCity>
+			</zone>
+			<zone type="America/Mazatlan">
+				<exemplarCity>i-Mazatlan</exemplarCity>
+			</zone>
+			<zone type="America/Chihuahua">
+				<exemplarCity>i-Chihuahua</exemplarCity>
+			</zone>
+			<zone type="America/Bahia_Banderas">
+				<exemplarCity>i-Bahia Banderas</exemplarCity>
+			</zone>
+			<zone type="America/Ojinaga">
+				<exemplarCity>i-Ojinaga</exemplarCity>
+			</zone>
+			<zone type="America/Monterrey">
+				<exemplarCity>i-Monterrey</exemplarCity>
+			</zone>
+			<zone type="America/Mexico_City">
+				<exemplarCity>i-Mexico City</exemplarCity>
+			</zone>
+			<zone type="America/Matamoros">
+				<exemplarCity>i-Matamoros</exemplarCity>
+			</zone>
+			<zone type="America/Merida">
+				<exemplarCity>i-Merida</exemplarCity>
+			</zone>
+			<zone type="America/Cancun">
+				<exemplarCity>i-Cancun</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuala_Lumpur">
+				<exemplarCity>i-Kuala Lumpur</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuching">
+				<exemplarCity>i-Kuching</exemplarCity>
+			</zone>
+			<zone type="Africa/Maputo">
+				<exemplarCity>iMaputo</exemplarCity>
+			</zone>
+			<zone type="Africa/Windhoek">
+				<exemplarCity>i-Windhoek</exemplarCity>
+			</zone>
+			<zone type="Pacific/Noumea">
+				<exemplarCity>i-Noumea</exemplarCity>
+			</zone>
+			<zone type="Africa/Niamey">
+				<exemplarCity>i-Niamey</exemplarCity>
+			</zone>
+			<zone type="Pacific/Norfolk">
+				<exemplarCity>i-Norfolk</exemplarCity>
+			</zone>
+			<zone type="Africa/Lagos">
+				<exemplarCity>i-Lagos</exemplarCity>
+			</zone>
+			<zone type="America/Managua">
+				<exemplarCity>i-Managua</exemplarCity>
+			</zone>
+			<zone type="Europe/Amsterdam">
+				<exemplarCity>i-Amsterdam</exemplarCity>
+			</zone>
+			<zone type="Europe/Oslo">
+				<exemplarCity>i-Oslo</exemplarCity>
 			</zone>
 			<zone type="Asia/Katmandu">
-				<exemplarCity>esase-Kathmandu</exemplarCity>
+				<exemplarCity>i-Kathmandu</exemplarCity>
+			</zone>
+			<zone type="Pacific/Nauru">
+				<exemplarCity>i-Nauru</exemplarCity>
+			</zone>
+			<zone type="Pacific/Niue">
+				<exemplarCity>i-Niue</exemplarCity>
+			</zone>
+			<zone type="Pacific/Chatham">
+				<exemplarCity>i-Chatham</exemplarCity>
+			</zone>
+			<zone type="Pacific/Auckland">
+				<exemplarCity>i-Auckland</exemplarCity>
+			</zone>
+			<zone type="Asia/Muscat">
+				<exemplarCity>i-Muscat</exemplarCity>
+			</zone>
+			<zone type="America/Panama">
+				<exemplarCity>i-Panama</exemplarCity>
+			</zone>
+			<zone type="America/Lima">
+				<exemplarCity>i-Lima</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tahiti">
+				<exemplarCity>i-Tahiti</exemplarCity>
+			</zone>
+			<zone type="Pacific/Marquesas">
+				<exemplarCity>i-Marquesas</exemplarCity>
+			</zone>
+			<zone type="Pacific/Gambier">
+				<exemplarCity>i-Gambier</exemplarCity>
+			</zone>
+			<zone type="Pacific/Port_Moresby">
+				<exemplarCity>i-Port Moresby</exemplarCity>
+			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>i-Bougainville</exemplarCity>
+			</zone>
+			<zone type="Asia/Manila">
+				<exemplarCity>i-Manila</exemplarCity>
 			</zone>
 			<zone type="Asia/Karachi">
-				<exemplarCity>esase-Karachi</exemplarCity>
+				<exemplarCity>i-Karachi</exemplarCity>
+			</zone>
+			<zone type="Europe/Warsaw">
+				<exemplarCity>i-Warsaw</exemplarCity>
+			</zone>
+			<zone type="America/Miquelon">
+				<exemplarCity>i-Miquelon</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pitcairn">
+				<exemplarCity>i-Pitcairn</exemplarCity>
 			</zone>
 			<zone type="America/Puerto_Rico">
-				<exemplarCity>esase-Puerto Rico</exemplarCity>
+				<exemplarCity>i-Puerto Rico</exemplarCity>
+			</zone>
+			<zone type="Asia/Gaza">
+				<exemplarCity>iGaza</exemplarCity>
+			</zone>
+			<zone type="Asia/Hebron">
+				<exemplarCity>i-Hebron</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Azores">
+				<exemplarCity>i-Azores</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Madeira">
+				<exemplarCity>i-Madeira</exemplarCity>
+			</zone>
+			<zone type="Europe/Lisbon">
+				<exemplarCity>i-Lisbon</exemplarCity>
+			</zone>
+			<zone type="Pacific/Palau">
+				<exemplarCity>i-Palau</exemplarCity>
 			</zone>
 			<zone type="America/Asuncion">
-				<exemplarCity>I-Asunción</exemplarCity>
+				<exemplarCity>i-Asunción</exemplarCity>
+			</zone>
+			<zone type="Asia/Qatar">
+				<exemplarCity>i-Qatar</exemplarCity>
 			</zone>
 			<zone type="Indian/Reunion">
-				<exemplarCity>I-Réunion</exemplarCity>
+				<exemplarCity>i-Réunion</exemplarCity>
+			</zone>
+			<zone type="Europe/Bucharest">
+				<exemplarCity>i-Bucharest</exemplarCity>
+			</zone>
+			<zone type="Europe/Belgrade">
+				<exemplarCity>i-Belgrade</exemplarCity>
+			</zone>
+			<zone type="Europe/Kaliningrad">
+				<exemplarCity>i-Kaliningrad</exemplarCity>
+			</zone>
+			<zone type="Europe/Simferopol">
+				<exemplarCity>i-Simferopol</exemplarCity>
+			</zone>
+			<zone type="Europe/Moscow">
+				<exemplarCity>i-Moscow</exemplarCity>
+			</zone>
+			<zone type="Europe/Volgograd">
+				<exemplarCity>i-Volgograd</exemplarCity>
+			</zone>
+			<zone type="Europe/Samara">
+				<exemplarCity>i-Samara</exemplarCity>
+			</zone>
+			<zone type="Asia/Yekaterinburg">
+				<exemplarCity>i-Yekaterinburg</exemplarCity>
+			</zone>
+			<zone type="Asia/Omsk">
+				<exemplarCity>i-Omsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Novosibirsk">
+				<exemplarCity>i-Novosibirsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Novokuznetsk">
+				<exemplarCity>i-Novokuznetsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Krasnoyarsk">
+				<exemplarCity>i-Krasnoyarsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Irkutsk">
+				<exemplarCity>i-Irkutsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>i-Chita</exemplarCity>
+			</zone>
+			<zone type="Asia/Yakutsk">
+				<exemplarCity>i-Yakutsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Vladivostok">
+				<exemplarCity>i-Vladivostok</exemplarCity>
+			</zone>
+			<zone type="Asia/Khandyga">
+				<exemplarCity>i-Khandyga</exemplarCity>
+			</zone>
+			<zone type="Asia/Sakhalin">
+				<exemplarCity>i-Sakhalin</exemplarCity>
+			</zone>
+			<zone type="Asia/Ust-Nera">
+				<exemplarCity>i-Ust-Nera</exemplarCity>
+			</zone>
+			<zone type="Asia/Magadan">
+				<exemplarCity>i-Magadan</exemplarCity>
+			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>i-Srednekolymsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Kamchatka">
+				<exemplarCity>i-Kamchatka</exemplarCity>
+			</zone>
+			<zone type="Asia/Anadyr">
+				<exemplarCity>i-Anadyr</exemplarCity>
+			</zone>
+			<zone type="Africa/Kigali">
+				<exemplarCity>i-Kigali</exemplarCity>
+			</zone>
+			<zone type="Asia/Riyadh">
+				<exemplarCity>i-Riyadh</exemplarCity>
+			</zone>
+			<zone type="Pacific/Guadalcanal">
+				<exemplarCity>i-Guadalcanal</exemplarCity>
+			</zone>
+			<zone type="Indian/Mahe">
+				<exemplarCity>iMahe</exemplarCity>
+			</zone>
+			<zone type="Africa/Khartoum">
+				<exemplarCity>i-Khartoum</exemplarCity>
+			</zone>
+			<zone type="Europe/Stockholm">
+				<exemplarCity>i-Stockholm</exemplarCity>
+			</zone>
+			<zone type="Asia/Singapore">
+				<exemplarCity>i-Singapore</exemplarCity>
+			</zone>
+			<zone type="Atlantic/St_Helena">
+				<exemplarCity>i-St. Helena</exemplarCity>
+			</zone>
+			<zone type="Europe/Ljubljana">
+				<exemplarCity>i-Ljubljana</exemplarCity>
+			</zone>
+			<zone type="Arctic/Longyearbyen">
+				<exemplarCity>i-Longyearbyen</exemplarCity>
+			</zone>
+			<zone type="Europe/Bratislava">
+				<exemplarCity>i-Bratislava</exemplarCity>
+			</zone>
+			<zone type="Africa/Freetown">
+				<exemplarCity>i-Freetown</exemplarCity>
+			</zone>
+			<zone type="Europe/San_Marino">
+				<exemplarCity>i-San Marino</exemplarCity>
+			</zone>
+			<zone type="Africa/Dakar">
+				<exemplarCity>i-Dakar</exemplarCity>
+			</zone>
+			<zone type="Africa/Mogadishu">
+				<exemplarCity>i-Mogadishu</exemplarCity>
+			</zone>
+			<zone type="America/Paramaribo">
+				<exemplarCity>i-Paramaribo</exemplarCity>
+			</zone>
+			<zone type="Africa/Juba">
+				<exemplarCity>iJuba</exemplarCity>
 			</zone>
 			<zone type="Africa/Sao_Tome">
-				<exemplarCity>I-São Tomé</exemplarCity>
+				<exemplarCity>i-São Tomé</exemplarCity>
+			</zone>
+			<zone type="America/El_Salvador">
+				<exemplarCity>i-El Salvador</exemplarCity>
 			</zone>
 			<zone type="America/Lower_Princes">
-				<exemplarCity>I-Lower Prince’s Quarter</exemplarCity>
+				<exemplarCity>i-Lower Prince’s Quarter</exemplarCity>
+			</zone>
+			<zone type="Asia/Damascus">
+				<exemplarCity>i-Damascus</exemplarCity>
+			</zone>
+			<zone type="Africa/Mbabane">
+				<exemplarCity>iMbabane</exemplarCity>
+			</zone>
+			<zone type="America/Grand_Turk">
+				<exemplarCity>i-Grand Turk</exemplarCity>
+			</zone>
+			<zone type="Africa/Ndjamena">
+				<exemplarCity>i-Ndjamena</exemplarCity>
+			</zone>
+			<zone type="Indian/Kerguelen">
+				<exemplarCity>i-Kerguelen</exemplarCity>
+			</zone>
+			<zone type="Africa/Lome">
+				<exemplarCity>i-Lome</exemplarCity>
+			</zone>
+			<zone type="Asia/Bangkok">
+				<exemplarCity>i-Bangkok</exemplarCity>
+			</zone>
+			<zone type="Asia/Dushanbe">
+				<exemplarCity>i-Dushanbe</exemplarCity>
+			</zone>
+			<zone type="Pacific/Fakaofo">
+				<exemplarCity>i-Fakaofo</exemplarCity>
+			</zone>
+			<zone type="Asia/Dili">
+				<exemplarCity>i-Dili</exemplarCity>
+			</zone>
+			<zone type="Asia/Ashgabat">
+				<exemplarCity>i-Ashgabat</exemplarCity>
+			</zone>
+			<zone type="Africa/Tunis">
+				<exemplarCity>i-Tunis</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tongatapu">
+				<exemplarCity>i-Tongatapu</exemplarCity>
+			</zone>
+			<zone type="Europe/Istanbul">
+				<exemplarCity>i-Istanbul</exemplarCity>
 			</zone>
 			<zone type="America/Port_of_Spain">
-				<exemplarCity>esase-Port of Spain</exemplarCity>
+				<exemplarCity>i-Port of Spain</exemplarCity>
+			</zone>
+			<zone type="Pacific/Funafuti">
+				<exemplarCity>i-Funafuti</exemplarCity>
+			</zone>
+			<zone type="Asia/Taipei">
+				<exemplarCity>i-Taipei</exemplarCity>
+			</zone>
+			<zone type="Africa/Dar_es_Salaam">
+				<exemplarCity>i-Dar es Salaam</exemplarCity>
+			</zone>
+			<zone type="Europe/Uzhgorod">
+				<exemplarCity>i-Uzhhorod</exemplarCity>
+			</zone>
+			<zone type="Europe/Kiev">
+				<exemplarCity>i-Kiev</exemplarCity>
+			</zone>
+			<zone type="Europe/Zaporozhye">
+				<exemplarCity>i-Zaporozhye</exemplarCity>
+			</zone>
+			<zone type="Africa/Kampala">
+				<exemplarCity>i-Kampala</exemplarCity>
+			</zone>
+			<zone type="Pacific/Midway">
+				<exemplarCity>i-Midway</exemplarCity>
+			</zone>
+			<zone type="Pacific/Johnston">
+				<exemplarCity>i-Johnston</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wake">
+				<exemplarCity>i-Wake</exemplarCity>
 			</zone>
 			<zone type="America/Adak">
-				<exemplarCity>esase-Adak</exemplarCity>
+				<exemplarCity>i-Adak</exemplarCity>
+			</zone>
+			<zone type="America/Nome">
+				<exemplarCity>i-Nome</exemplarCity>
+			</zone>
+			<zone type="Pacific/Honolulu">
+				<exemplarCity>i-Honolulu</exemplarCity>
+			</zone>
+			<zone type="America/Anchorage">
+				<exemplarCity>i-Anchorage</exemplarCity>
 			</zone>
 			<zone type="America/Yakutat">
-				<exemplarCity>esase-Yakutat</exemplarCity>
+				<exemplarCity>i-Yakutat</exemplarCity>
 			</zone>
 			<zone type="America/Sitka">
-				<exemplarCity>esase-Sitka</exemplarCity>
+				<exemplarCity>i-Sitka</exemplarCity>
+			</zone>
+			<zone type="America/Juneau">
+				<exemplarCity>i-Juneau</exemplarCity>
+			</zone>
+			<zone type="America/Metlakatla">
+				<exemplarCity>i-Metlakatla</exemplarCity>
+			</zone>
+			<zone type="America/Los_Angeles">
+				<exemplarCity>i-Los Angeles</exemplarCity>
+			</zone>
+			<zone type="America/Boise">
+				<exemplarCity>i-Boise</exemplarCity>
 			</zone>
 			<zone type="America/Phoenix">
-				<exemplarCity>esase-Phoenix</exemplarCity>
+				<exemplarCity>i-Phoenix</exemplarCity>
+			</zone>
+			<zone type="America/Denver">
+				<exemplarCity>i-Denver</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Beulah">
+				<exemplarCity>i-Beulah, North Dakota</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/New_Salem">
+				<exemplarCity>i-New Salem, North Dakota</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Center">
+				<exemplarCity>i-Center, North Dakota</exemplarCity>
+			</zone>
+			<zone type="America/Chicago">
+				<exemplarCity>i-Chicago</exemplarCity>
+			</zone>
+			<zone type="America/Menominee">
+				<exemplarCity>i-Menominee</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Vincennes">
+				<exemplarCity>i-Vincennes, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Petersburg">
+				<exemplarCity>i-Petersburg, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Tell_City">
+				<exemplarCity>i-Tell City, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Knox">
+				<exemplarCity>i-Knox, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Winamac">
+				<exemplarCity>i-Winamac, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Marengo">
+				<exemplarCity>i-Marengo, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Indianapolis">
+				<exemplarCity>i-Indianapolis</exemplarCity>
+			</zone>
+			<zone type="America/Louisville">
+				<exemplarCity>i-Louisville</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Vevay">
+				<exemplarCity>i-Vevay, Indiana</exemplarCity>
+			</zone>
+			<zone type="America/Kentucky/Monticello">
+				<exemplarCity>i-Monticello, Kentucky</exemplarCity>
+			</zone>
+			<zone type="America/Detroit">
+				<exemplarCity>i-Detroit</exemplarCity>
+			</zone>
+			<zone type="America/New_York">
+				<exemplarCity>i-New York</exemplarCity>
+			</zone>
+			<zone type="America/Montevideo">
+				<exemplarCity>i-Montevideo</exemplarCity>
+			</zone>
+			<zone type="Asia/Samarkand">
+				<exemplarCity>i-Samarkand</exemplarCity>
+			</zone>
+			<zone type="Asia/Tashkent">
+				<exemplarCity>i-Tashkent</exemplarCity>
+			</zone>
+			<zone type="Europe/Vatican">
+				<exemplarCity>i-Vatican</exemplarCity>
 			</zone>
 			<zone type="America/St_Vincent">
-				<exemplarCity>esase-St. Vincent</exemplarCity>
+				<exemplarCity>i-St. Vincent</exemplarCity>
+			</zone>
+			<zone type="America/Caracas">
+				<exemplarCity>i-Caracas</exemplarCity>
 			</zone>
 			<zone type="America/Tortola">
-				<exemplarCity>esase-Tortola</exemplarCity>
+				<exemplarCity>i-Tortola</exemplarCity>
 			</zone>
 			<zone type="America/St_Thomas">
-				<exemplarCity>esase-St. Thomas</exemplarCity>
+				<exemplarCity>i-St. Thomas</exemplarCity>
+			</zone>
+			<zone type="Asia/Saigon">
+				<exemplarCity>i-Ho Chi Minh City</exemplarCity>
+			</zone>
+			<zone type="Pacific/Efate">
+				<exemplarCity>i-Efate</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wallis">
+				<exemplarCity>i-Wallis</exemplarCity>
+			</zone>
+			<zone type="Pacific/Apia">
+				<exemplarCity>i-Apia</exemplarCity>
+			</zone>
+			<zone type="Asia/Aden">
+				<exemplarCity>i-Aden</exemplarCity>
+			</zone>
+			<zone type="Indian/Mayotte">
+				<exemplarCity>i-Mayotte</exemplarCity>
 			</zone>
 			<zone type="Africa/Johannesburg">
-				<exemplarCity>Johannesburg</exemplarCity>
+				<exemplarCity>i-Johannesburg</exemplarCity>
+			</zone>
+			<zone type="Africa/Lusaka">
+				<exemplarCity>iLusaka</exemplarCity>
+			</zone>
+			<zone type="Africa/Harare">
+				<exemplarCity>i-Harare</exemplarCity>
 			</zone>
 			<metazone type="Afghanistan">
 				<long>
@@ -1856,56 +3147,56 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Africa_Southern">
 				<long>
-					<standard>Isikhathi esivamile saseNingizimu Afrika</standard>
+					<standard>Isikhathi esijwayelekile saseNingizimu Afrika</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
 					<generic>Isikhathi saseNtshonalanga Afrika</generic>
-					<standard>Isikhathi esivamile saseNtshonalanga Afrika</standard>
-					<daylight>Isikhathi sehlobo saseNtshonalanga Afrika</daylight>
+					<standard>Isikhathi esijwayelekile saseNtshonalanga Afrika</standard>
+					<daylight>Isikhathi sasehlobo saseNtshonalanga Afrika</daylight>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
 				<long>
-					<generic>esase-Alaska Time</generic>
-					<standard>esase-Alaska Standard Time</standard>
-					<daylight>esase-Alaska Daylight Time</daylight>
+					<generic>isikhathi sase-Alaska</generic>
+					<standard>isikhathi sase-Alaska esijwayelekile</standard>
+					<daylight>Isikhathi sase-Alaska sasemini</daylight>
 				</long>
 			</metazone>
 			<metazone type="Amazon">
 				<long>
-					<generic>esase-Amazon Time</generic>
-					<standard>Isikhathi esivamile sase-Amazon</standard>
-					<daylight>Isikhathi sehlobo sase-Amazon</daylight>
+					<generic>Isikhathi sase-Amazon</generic>
+					<standard>Isikhathi sase-Amazon esijwayelekile</standard>
+					<daylight>Isikhathi sase-Amazon sasehlobo</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Central">
 				<long>
-					<generic>esase-Central Time</generic>
-					<standard>esase-Central Standard Time</standard>
-					<daylight>esase-Central Daylight Time</daylight>
+					<generic>isikhathi sase-North American Central</generic>
+					<standard>isikhathi sase-North American Central esijwayelekile</standard>
+					<daylight>isikhathi sase-North American Central sasemini</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
-					<generic>esase-Eastern Time</generic>
-					<standard>esase-Eastern Standard Time</standard>
-					<daylight>esase-Eastern Daylight Time</daylight>
+					<generic>isikhathi sase-North American East</generic>
+					<standard>isikhathi sase-North American East esijwayelekile</standard>
+					<daylight>isikhathi sase-North American East sasemini</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
-					<generic>esase-Mountain Time</generic>
-					<standard>esase-Mountain Standard Time</standard>
-					<daylight>esase-Mountain Daylight Time</daylight>
+					<generic>isikhathi sase-North American Mountain</generic>
+					<standard>isikhathi sase-North American Mountain esijwayelekile</standard>
+					<daylight>isikhathi sase-North American Mountain sasemini</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
-					<generic>esase-Pacific Time</generic>
-					<standard>esase-Pacific Standard Time</standard>
-					<daylight>esase-Pacific Daylight Time</daylight>
+					<generic>isikhathi sase-North American Pacific</generic>
+					<standard>isikhathi sase-North American Pacific esijwayelekile</standard>
+					<daylight>isikhathi sase-North American Pacific sasemini</daylight>
 				</long>
 			</metazone>
 			<metazone type="Anadyr">
@@ -1931,16 +3222,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Argentina">
 				<long>
-					<generic>esase-Argentina Time</generic>
-					<standard>Isikhathi esimisiwe sase-Argentina</standard>
-					<daylight>esase-Argentina Summer Time</daylight>
+					<generic>Isikhathi sase-Argentina</generic>
+					<standard>Isikhathi sase-Argentina esijwayelekile</standard>
+					<daylight>Isikhathi sase-Argentina sasehlobo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina_Western">
 				<long>
 					<generic>Isikhathi saseNyakatho ne-Argentina</generic>
-					<standard>Isikhathi esimisiwe sase-Ntshonalanga ne-Argentina</standard>
-					<daylight>Isikhathi sasehlobo sase-Ntshonalanga ne-Argentina</daylight>
+					<standard>Isikhathi saseNyakatho ne-Argentina esijwayelekile</standard>
+					<daylight>Isikhathi saseNyakatho ne-Argentina sasehlobo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Armenia">
@@ -1952,9 +3243,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Atlantic">
 				<long>
-					<generic>esase-Atlantic Time</generic>
-					<standard>esase-Atlantic Standard Time</standard>
-					<daylight>esase-Atlantic Daylight Time</daylight>
+					<generic>isikhathi sase-Atlantic</generic>
+					<standard>isikhathi sase-Atlantic esijwayelekile</standard>
+					<daylight>isikhathi sase-Atlantic sasemini</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Central">
@@ -1966,23 +3257,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Australia_CentralWestern">
 				<long>
-					<generic>esase-Austrilian Central Western Time</generic>
-					<standard>esase-Austrilian Central Western Standard Time</standard>
-					<daylight>esase-Austrilian Central Western Daylight Time</daylight>
+					<generic>Isikhathi sase-Australian Central West</generic>
+					<standard>Isikhathi sase-Australian Central West esivamile</standard>
+					<daylight>Isikhathi sasemini sase-Australian Central West</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Eastern">
 				<long>
-					<generic>esase-Austrilian Eastern Time</generic>
-					<standard>esase-Australian Eastern Standard Time</standard>
-					<daylight>esase-Australian Eastern Daylight Time</daylight>
+					<generic>Isikhathi sase-Eastern Australia</generic>
+					<standard>Isikhathi esivamile sase-Australian East</standard>
+					<daylight>Isikhathi sasemini sase-Australian East</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Western">
 				<long>
-					<generic>esase-Western Australia Time</generic>
-					<standard>esase-Austrilian Western Standard Time</standard>
-					<daylight>esase-Austrilian Western Daylight Time</daylight>
+					<generic>Isikhathi sase-Western Australia</generic>
+					<standard>I-Australian Western Standard Time</standard>
+					<daylight>I-Australian Western Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azerbaijan">
@@ -1995,8 +3286,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="Azores">
 				<long>
 					<generic>Isikhathi sase-Azores</generic>
-					<standard>Isikhathi esivamile sase-Azores</standard>
-					<daylight>Isikhathi sehlobo sase-Azores</daylight>
+					<standard>Isikhathi esijwayelekile sase-Azores</standard>
+					<daylight>Isikhathi sasehlobo sase-Azores</daylight>
 				</long>
 			</metazone>
 			<metazone type="Bangladesh">
@@ -2018,9 +3309,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Brasilia">
 				<long>
-					<generic>esase-Brasilia Time</generic>
-					<standard>Isikhathi esimisiwe sase-Brasilia</standard>
-					<daylight>esase-Brasilia Summer Time</daylight>
+					<generic>Isikhathi sase-Brasilia</generic>
+					<standard>Isikhathi sase-Brasilia esijwayelekile</standard>
+					<daylight>Isikhathi sase-Brasilia sasehlobo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Brunei">
@@ -2037,7 +3328,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Chamorro">
 				<long>
-					<standard>Isikhathi esezingeni sase-Chamorro</standard>
+					<standard>Isikhathi esijwayelekile sase-Chamorro</standard>
 				</long>
 			</metazone>
 			<metazone type="Chatham">
@@ -2050,8 +3341,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="Chile">
 				<long>
 					<generic>Isikhathi sase-Chile</generic>
-					<standard>Isikhathi esivamile sase-Chile</standard>
-					<daylight>Isikhathi sehlobo sase-Chile</daylight>
+					<standard>Isikhathi sase-Chile esijwayelekile</standard>
+					<daylight>Isikhathi sase-Chile sasehlobo</daylight>
 				</long>
 			</metazone>
 			<metazone type="China">
@@ -2063,7 +3354,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Choibalsan">
 				<long>
-					<generic>esase-Choibalsan Time</generic>
+					<generic>Isikhathi sase-Choibalsan</generic>
 					<standard>Isikhathi Esimisiwe sase-Choibalsan</standard>
 					<daylight>esase-Choibalsan Summer Time</daylight>
 				</long>
@@ -2081,8 +3372,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="Colombia">
 				<long>
 					<generic>Isikhathi sase-Colombia</generic>
-					<standard>Isikhathi esivamile sase-Colombia</standard>
-					<daylight>Isikhathi sehlobo sase-Colombia</daylight>
+					<standard>Isikhathi sase-Colombia esijwayelekile</standard>
+					<daylight>Isikhathi sase-Colombia sasehlobo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cook">
@@ -2094,9 +3385,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Cuba">
 				<long>
-					<generic>esase-Cuba Time</generic>
-					<standard>esase-Cuba Standard Time</standard>
-					<daylight>esase-Cuba Daylight Time</daylight>
+					<generic>isikhathi sase-Cuba</generic>
+					<standard>isikhathi sase-Cuba esijwayelekile</standard>
+					<daylight>isikhathi sase-Cuba sasemini</daylight>
 				</long>
 			</metazone>
 			<metazone type="Davis">
@@ -2117,8 +3408,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="Easter">
 				<long>
 					<generic>Isikhathi sase-Easter Island</generic>
-					<standard>Isikhathi esivamile sase-Easter Island</standard>
-					<daylight>Isikhathi sehlobo sase-Easter Island</daylight>
+					<standard>Isikhathi sase-Easter Island esijwayelekile</standard>
+					<daylight>Isikhathi sase-Easter Island sasehlobo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Ecuador">
@@ -2129,34 +3420,34 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="Europe_Central">
 				<long>
 					<generic>Isikhathi sase-Central Europe</generic>
-					<standard>Isikhathi esivamile sase-Central Europe</standard>
-					<daylight>Isikhathi sehlobo sase-Central Europe</daylight>
+					<standard>Isikhathi esijwayelekile sase-Central Europe</standard>
+					<daylight>Isikhathi sasehlobo sase-Central Europe</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Eastern">
 				<long>
 					<generic>Isikhathi sase-Eastern Europe</generic>
-					<standard>Isikhathi esivamile sase-Eastern Europe</standard>
-					<daylight>Isikhathi sehlobo sase-Eastern Europe</daylight>
+					<standard>Isikhathi esijwayelekile sase-Eastern Europe</standard>
+					<daylight>Isikhathi sasehlobo sase-Eastern Europe</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
 				<long>
-					<standard>esase-Further-eastern European Time</standard>
+					<standard>Isikhathi sase-Further-eastern Europe</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
 				<long>
 					<generic>Isikhathi sase-Western Europe</generic>
-					<standard>Isikhathi esivamile sase-Western Europe</standard>
-					<daylight>Isikhathi sehlobo sase-Western Europe</daylight>
+					<standard>Isikhathi esijwayelekile sase-Western Europe</standard>
+					<daylight>Isikhathi sasehlobo sase-Western Europe</daylight>
 				</long>
 			</metazone>
 			<metazone type="Falkland">
 				<long>
 					<generic>Isikhathi sase-Falkland Islands</generic>
-					<standard>Isikhathi esivamile sase-Falkland Islands</standard>
-					<daylight>Isikhathi sehlobo sase-Falkland Islands</daylight>
+					<standard>Isikhathi sase-Falkland Islands esijwayelekile</standard>
+					<daylight>Isikhathi sase-Falkland Islands sasehlobo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Fiji">
@@ -2205,16 +3496,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Greenland_Eastern">
 				<long>
-					<generic>esase-East Greenland Time</generic>
-					<standard>esase-East Greenland Standard Time</standard>
-					<daylight>esase-East Greenland Summer Time</daylight>
+					<generic>isikhathi sase-East Greenland</generic>
+					<standard>isikhathi sase-East Greenland esijwayelekile</standard>
+					<daylight>isikhathi sase-East Greenland sasemini</daylight>
 				</long>
 			</metazone>
 			<metazone type="Greenland_Western">
 				<long>
-					<generic>esase-West Greenland Time</generic>
-					<standard>esase-West Greenland Standard Time</standard>
-					<daylight>esase-West Greenland Summer Time</daylight>
+					<generic>isikhathi sase-West Greenland</generic>
+					<standard>isikhathi sase-West Greenland esijwayelekile</standard>
+					<daylight>isikhathi sase-West Greenland sasemini</daylight>
 				</long>
 			</metazone>
 			<metazone type="Gulf">
@@ -2229,9 +3520,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
-					<generic>esase-Hawaii-Aleutian Time</generic>
-					<standard>esase-Hawaii-Aleutian Standard Time</standard>
-					<daylight>esase-Hawaii-Aleutian Daylight Time</daylight>
+					<generic>isikhathi sase-Hawaii-Aleutia</generic>
+					<standard>isikhathi sase-Hawaii-Aleutia esijwayelekile</standard>
+					<daylight>isikhathi sase-Hawaii-Aleutia sasemini</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hong_Kong">
@@ -2243,7 +3534,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Hovd">
 				<long>
-					<generic>esase-Hovd Time</generic>
+					<generic>Isikhathi sase-Hovd</generic>
 					<standard>Isikhathi Esimisiwe sase-Hovd</standard>
 					<daylight>esase-Hovd Summer Time</daylight>
 				</long>
@@ -2287,7 +3578,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Irkutsk">
 				<long>
-					<generic>esase-Irkutsk Time</generic>
+					<generic>Isikhathi sase-Irkutsk</generic>
 					<standard>Isikhathi Esimisiwe sase-Irkutsk</standard>
 					<daylight>esase-Irkutsk Summer Time</daylight>
 				</long>
@@ -2337,9 +3628,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Krasnoyarsk">
 				<long>
-					<generic>esase-Krasnoyarsk Time</generic>
+					<generic>Isikhathi sase-Krasnoyarsk</generic>
 					<standard>Isikhathi Esimisiwe sase-Krasnoyarsk</standard>
-					<daylight>esase-Krasnoyarsk Summer Time</daylight>
+					<daylight>Isikhathi sase-Krasnoyarsk sasehlobo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kyrgystan">
@@ -2354,9 +3645,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Lord_Howe">
 				<long>
-					<generic>esase-Lord Howe Time</generic>
-					<standard>esase-Lord Howe Standard Time</standard>
-					<daylight>esase-Lord Howe Daylight Time</daylight>
+					<generic>Isikhathi sase-Lord Howe</generic>
+					<standard>Isikhathi sase-Lord Howe esivamile</standard>
+					<daylight>Isikhathi sase-Lord Howe sasemini</daylight>
 				</long>
 			</metazone>
 			<metazone type="Macquarie">
@@ -2366,7 +3657,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Magadan">
 				<long>
-					<generic>esase-Magadan Time</generic>
+					<generic>Isikhathi sase-Magadan</generic>
 					<standard>Isikhathi Esimisiwe sase-Magadan</standard>
 					<daylight>esase-Magadan Summer Time</daylight>
 				</long>
@@ -2405,16 +3696,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Mexico_Northwest">
 				<long>
-					<generic>esase-Northwest Mexico Time</generic>
-					<standard>esase-Northwest Mexico Standard Time</standard>
-					<daylight>esase-Northwest Mexico Daylight Time</daylight>
+					<generic>isikhathi sase-Northwest Mexico</generic>
+					<standard>isikhathi sase-Northwest Mexico esijwayelekile</standard>
+					<daylight>isikhathi sase-Northwest Mexico sasemini</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
-					<generic>esase-Mexican Pacific Time</generic>
-					<standard>esase-Mexican Pacific Standard Time</standard>
-					<daylight>esase-Mexican Pacific Daylight Time</daylight>
+					<generic>isikhathi sase-Mexican Pacific</generic>
+					<standard>isikhathi sase-Mexican Pacific esijwayelekile</standard>
+					<daylight>isikhathi sase-Mexican Pacific sasemini</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mongolia">
@@ -2449,8 +3740,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="New_Caledonia">
 				<long>
 					<generic>Isikhathi sase-New Caledonia</generic>
-					<standard>Isikhathi esivamile sase-New Caledonia</standard>
-					<daylight>Isikhathi sehlobo sase-New Caledonia</daylight>
+					<standard>Isikhathi sase-New Caledonia esijwayelekile</standard>
+					<daylight>Isikhathi sase-New Caledonia sasehlobo</daylight>
 				</long>
 			</metazone>
 			<metazone type="New_Zealand">
@@ -2462,9 +3753,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Newfoundland">
 				<long>
-					<generic>esase-Newfoundland Time</generic>
-					<standard>esase-Newfoundland Standard Time</standard>
-					<daylight>esase-Newfoundland Daylight Time</daylight>
+					<generic>isikhathi sase-Newfoundland</generic>
+					<standard>isikhathi sase-Newfoundland esijwayelekile</standard>
+					<daylight>isikhathi sase-Newfoundland sasemini</daylight>
 				</long>
 			</metazone>
 			<metazone type="Niue">
@@ -2480,20 +3771,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="Noronha">
 				<long>
 					<generic>Isikhathi sase-Fernando de Noronha</generic>
-					<standard>Isikhathi esimisiwe sase-Fernando de Noronha</standard>
-					<daylight>esase-Fernando de Noronha Summer Time</daylight>
+					<standard>Isikhathi sase-Fernando de Noronha esijwayelekile</standard>
+					<daylight>Isikhathi sase-Fernando de Noronha sasehlobo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Novosibirsk">
 				<long>
-					<generic>esase-Novosibirsk Time</generic>
+					<generic>Isikhathi sase-Novosibirsk</generic>
 					<standard>Isikhathi Esimisiwe sase-Novosibirsk</standard>
 					<daylight>esase-Novosibirsk Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Omsk">
 				<long>
-					<generic>esase-Omsk Time</generic>
+					<generic>Isikhathi sase-Omsk</generic>
 					<standard>Isikhathi Esimisiwe sase-Omsk</standard>
 					<daylight>esase-Omsk Summer Time</daylight>
 				</long>
@@ -2518,15 +3809,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="Paraguay">
 				<long>
 					<generic>Isikhathi sase-Paraguay</generic>
-					<standard>Isikhathi esivamile sase-Paraguay</standard>
-					<daylight>Isikhathi sehlobo sase-Paraguay</daylight>
+					<standard>Isikhathi sase-Paraguay esijwayelekile</standard>
+					<daylight>Isikhathi sase-Paraguay sasehlobo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Peru">
 				<long>
 					<generic>Isikhathi sase-Peru</generic>
-					<standard>Isikhathi esivamile sase-Peru</standard>
-					<daylight>Isikhathi sehlobo sase-Peru</daylight>
+					<standard>Isikhathi sase-Peru esijwayelekile</standard>
+					<daylight>Isikhathi sase-Peru sasehlobo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Philippines">
@@ -2543,9 +3834,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Pierre_Miquelon">
 				<long>
-					<generic>esase-Saint Pierre and Miquelon Time</generic>
-					<standard>esase-Saint Pierre and Miquelon Standard Time</standard>
-					<daylight>esase-Saint Pierre and Miquelon Daylight Time</daylight>
+					<generic>isikhathi sase-Saint Pierre nase-Miquelon</generic>
+					<standard>isikhathi sase-Saint Pierre nase-Miquelon esijwayelekile</standard>
+					<daylight>isikhathi sase-Saint Pierre nase-Miquelon sasemini</daylight>
 				</long>
 			</metazone>
 			<metazone type="Pitcairn">
@@ -2570,7 +3861,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Sakhalin">
 				<long>
-					<generic>esase-Sakhalin Time</generic>
+					<generic>Isikhathi sase-Sakhalin</generic>
 					<standard>Isikhathi Esimisiwe sase-Sakhalin</standard>
 					<daylight>esase-Sakhalin Summer Time</daylight>
 				</long>
@@ -2585,8 +3876,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="Samoa">
 				<long>
 					<generic>Isikhathi sase-Samoa</generic>
-					<standard>Isikhathi esivamile sase-Samoa</standard>
-					<daylight>Isikhathi sehlobo sase-Samoa</daylight>
+					<standard>Isikhathi sase-Samoa esijwayelekile</standard>
+					<daylight>Isikhathi sase-Samoa sasemini</daylight>
 				</long>
 			</metazone>
 			<metazone type="Seychelles">
@@ -2644,8 +3935,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="Tonga">
 				<long>
 					<generic>Isikhathi sase-Tonga</generic>
-					<standard>Isikhathi esivamile sase-Tonga</standard>
-					<daylight>Isikhathi sehlobo sase-Tonga</daylight>
+					<standard>Isikhathi sase-Tonga esijwayelekile</standard>
+					<daylight>Isikhathi sase-Tonga sasehlobo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Truk">
@@ -2668,8 +3959,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="Uruguay">
 				<long>
 					<generic>Isikhathi sase-Uruguay</generic>
-					<standard>Isikhathi esivamile sase-Uruguay</standard>
-					<daylight>Isikhathi sehlobo sase-Uruguay</daylight>
+					<standard>Isikhathi sase-Uruguay esijwayelekile</standard>
+					<daylight>Isikhathi sase-Uruguay sasehlobo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Uzbekistan">
@@ -2682,8 +3973,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazone type="Vanuatu">
 				<long>
 					<generic>Isikhathi sase-Vanuatu</generic>
-					<standard>Isikhathi esivamile sase-Vanuatu</standard>
-					<daylight>Isikhathi sehlobo sase-Vanuatu</daylight>
+					<standard>Isikhathi sase-Vanuatu esijwayelekile</standard>
+					<daylight>Isikhathi sase-Vanuatu sasehlobo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Venezuela">
@@ -2693,14 +3984,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Vladivostok">
 				<long>
-					<generic>esase-Vladivostok Time</generic>
+					<generic>Isikhathi sase-Vladivostok</generic>
 					<standard>Isikhathi Esimisiwe sase-Vladivostok</standard>
 					<daylight>esase-Vladivostok Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Volgograd">
 				<long>
-					<generic>esase-Volgograd Time</generic>
+					<generic>Isikhathi sase-Volgograd</generic>
 					<standard>Isikhathi Esimisiwe sase-Volgograd</standard>
 					<daylight>esase-Volgograd Summer Time</daylight>
 				</long>
@@ -2722,14 +4013,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</metazone>
 			<metazone type="Yakutsk">
 				<long>
-					<generic>esase-Yakutsk Time</generic>
+					<generic>Isikhathi sase-Yakutsk</generic>
 					<standard>Isikhathi Esimisiwe sase-Yakutsk</standard>
 					<daylight>esase-Yakutsk Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Yekaterinburg">
 				<long>
-					<generic>esase-Yekaterinburg Time</generic>
+					<generic>Isikhathi sase-Yekaterinburg</generic>
 					<standard>Isikhathi Esimisiwe sase-Yekaterinburg</standard>
 					<daylight>esase-Yekaterinburg Summer Time</daylight>
 				</long>
@@ -2753,7 +4044,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<superscriptingExponent>×</superscriptingExponent>
 			<perMille>‰</perMille>
 			<infinity>∞</infinity>
-			<nan>I-NaN</nan>
+			<nan>NaN</nan>
 			<timeSeparator draft="contributed">:</timeSeparator>
 		</symbols>
 		<decimalFormats numberSystem="latn">
@@ -2842,21 +4133,61 @@ For terms of use, see http://www.unicode.org/copyright.html
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">¤0K</pattern>
+					<pattern type="1000" count="other">¤0K</pattern>
+					<pattern type="10000" count="one">¤00K</pattern>
+					<pattern type="10000" count="other">¤00K</pattern>
+					<pattern type="100000" count="one">¤000K</pattern>
+					<pattern type="100000" count="other">¤000K</pattern>
+					<pattern type="1000000" count="one">¤0M</pattern>
+					<pattern type="1000000" count="other">¤ 0M</pattern>
+					<pattern type="10000000" count="one">¤00M</pattern>
+					<pattern type="10000000" count="other">¤ 00M</pattern>
+					<pattern type="100000000" count="one">¤000M</pattern>
+					<pattern type="100000000" count="other">¤000M</pattern>
+					<pattern type="1000000000" count="one">¤0B</pattern>
+					<pattern type="1000000000" count="other">¤0B</pattern>
+					<pattern type="10000000000" count="one">¤00B</pattern>
+					<pattern type="10000000000" count="other">¤00B</pattern>
+					<pattern type="100000000000" count="one">¤000B</pattern>
+					<pattern type="100000000000" count="other">¤000B</pattern>
+					<pattern type="1000000000000" count="one">¤0T</pattern>
+					<pattern type="1000000000000" count="other">¤0T</pattern>
+					<pattern type="10000000000000" count="one">¤00T</pattern>
+					<pattern type="10000000000000" count="other">¤00T</pattern>
+					<pattern type="100000000000000" count="one">¤000T</pattern>
+					<pattern type="100000000000000" count="other">¤000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
 				<displayName>i-Dirham yase-United Arab Emirates</displayName>
+				<displayName count="one">i-Dirham yase-United Arab Emirates</displayName>
+				<displayName count="other">i-Dirham yase-United Arab Emirates</displayName>
+				<symbol draft="contributed">AED</symbol>
 			</currency>
 			<currency type="AFN">
 				<displayName>i-Afghan Afghani</displayName>
+				<displayName count="one">i-Afghan Afghani</displayName>
+				<displayName count="other">i-Afghan Afghani</displayName>
+				<symbol draft="contributed">AFN</symbol>
 			</currency>
 			<currency type="ALL">
 				<displayName>i-Albanian Lek</displayName>
+				<displayName count="one">i-Albanian Lek</displayName>
+				<displayName count="other">i-Albanian Lek</displayName>
+				<symbol draft="contributed">ALL</symbol>
 			</currency>
 			<currency type="AMD">
 				<displayName>i-Armenian Dram</displayName>
+				<displayName count="one">i-Armenian Dram</displayName>
+				<displayName count="other">i-Armenian Dram</displayName>
+				<symbol draft="contributed">AMD</symbol>
 			</currency>
 			<currency type="ANG">
 				<displayName>i-Netherlands Antillean Guilder</displayName>
@@ -2866,9 +4197,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="AOA">
 				<displayName>i-Angolan Kwanza</displayName>
+				<displayName count="one">i-Angolan Kwanza</displayName>
+				<displayName count="other">i-Angolan Kwanza</displayName>
+				<symbol draft="contributed">AOA</symbol>
+				<symbol alt="narrow" draft="contributed">Kz</symbol>
 			</currency>
 			<currency type="ARS">
 				<displayName>i-Argentina Peso</displayName>
+				<displayName count="one">i-Argentina Peso</displayName>
+				<displayName count="other">i-Argentina Peso</displayName>
+				<symbol draft="contributed">ARS</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="AUD">
 				<displayName>i-Austrilian Dollar</displayName>
@@ -2885,9 +4224,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="AZN">
 				<displayName>i-Azerbaijani Manat</displayName>
+				<displayName count="one">i-Azerbaijani Manat</displayName>
+				<displayName count="other">i-Azerbaijani Manat</displayName>
+				<symbol draft="contributed">AZN</symbol>
 			</currency>
 			<currency type="BAM">
 				<displayName>i-Bosnia-Herzegovina Convertible Mark</displayName>
+				<displayName count="one">i-Bosnia-Herzegovina Convertible Mark</displayName>
+				<displayName count="other">i-Bosnia-Herzegovina Convertible Mark</displayName>
+				<symbol draft="contributed">BAM</symbol>
+				<symbol alt="narrow" draft="contributed">KM</symbol>
 			</currency>
 			<currency type="BBD">
 				<displayName>i-Barbadian Dollar</displayName>
@@ -2898,15 +4244,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="BDT">
 				<displayName>i-Bangladeshi Taka</displayName>
+				<displayName count="one">i-Bangladeshi Taka</displayName>
+				<displayName count="other">i-Bangladeshi Taka</displayName>
+				<symbol draft="contributed">BDT</symbol>
+				<symbol alt="narrow" draft="contributed">৳</symbol>
 			</currency>
 			<currency type="BGN">
 				<displayName>i-Bulgarian Lev</displayName>
+				<displayName count="one">i-Bulgarian Lev</displayName>
+				<displayName count="other">i-Bulgarian Lev</displayName>
+				<symbol draft="contributed">BGN</symbol>
 			</currency>
 			<currency type="BHD">
 				<displayName>i-Bahraini Dinar</displayName>
+				<displayName count="one">i-Bahraini Dinar</displayName>
+				<displayName count="other">i-Bahraini Dinar</displayName>
+				<symbol draft="contributed">BHD</symbol>
 			</currency>
 			<currency type="BIF">
 				<displayName>i-Burundian Franc</displayName>
+				<displayName count="one">i-Burundian Franc</displayName>
+				<displayName count="other">i-Burundian Franc</displayName>
+				<symbol draft="contributed">BIF</symbol>
 			</currency>
 			<currency type="BMD">
 				<displayName>i-Bermudan Dollar</displayName>
@@ -2917,9 +4276,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="BND">
 				<displayName>i-Brunei Dollar</displayName>
+				<displayName count="one">i-Brunei Dollar</displayName>
+				<displayName count="other">i-Brunei Dollar</displayName>
+				<symbol draft="contributed">BND</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="BOB">
 				<displayName>i-Bolivian Boliviano</displayName>
+				<displayName count="one">i-Bolivian Boliviano</displayName>
+				<displayName count="other">i-Bolivian Boliviano</displayName>
+				<symbol draft="contributed">BOB</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="BRL">
 				<displayName>i-Brazilian Real</displayName>
@@ -2937,12 +4304,23 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="BTN">
 				<displayName>i-Bhutanese Ngultrum</displayName>
+				<displayName count="one">i-Bhutanese Ngultrum</displayName>
+				<displayName count="other">i-Bhutanese Ngultrum</displayName>
+				<symbol draft="contributed">BTN</symbol>
 			</currency>
 			<currency type="BWP">
 				<displayName>i-Botswana Pula</displayName>
+				<displayName count="one">i-Botswana Pula</displayName>
+				<displayName count="other">i-Botswana Pula</displayName>
+				<symbol draft="contributed">BWP</symbol>
+				<symbol alt="narrow" draft="contributed">P</symbol>
 			</currency>
 			<currency type="BYR">
 				<displayName>i-Belarusian Ruble</displayName>
+				<displayName count="one">i-Belarusian Ruble</displayName>
+				<displayName count="other">i-Belarusian Ruble</displayName>
+				<symbol draft="contributed">BYR</symbol>
+				<symbol alt="narrow" draft="contributed">P.</symbol>
 			</currency>
 			<currency type="BZD">
 				<displayName>i-Belize Dollar</displayName>
@@ -2960,6 +4338,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="CDF">
 				<displayName>i-Congolese Franc</displayName>
+				<displayName count="one">i-Congolese Franc</displayName>
+				<displayName count="other">i-Congolese Franc</displayName>
+				<symbol draft="contributed">CDF</symbol>
 			</currency>
 			<currency type="CHF">
 				<displayName>i-Swiss Franc</displayName>
@@ -2969,6 +4350,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="CLP">
 				<displayName>i-Chilean Peso</displayName>
+				<displayName count="one">i-Chilean Peso</displayName>
+				<displayName count="other">i-Chilean Peso</displayName>
+				<symbol draft="contributed">CLP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CNY">
 				<displayName>i-Chinese Yuan</displayName>
@@ -2979,6 +4364,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="COP">
 				<displayName>i-Colombian Peso</displayName>
+				<displayName count="one">i-Colombian Peso</displayName>
+				<displayName count="other">i-Colombian Peso</displayName>
+				<symbol draft="contributed">COP</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CRC">
 				<displayName>i-Costa Rican Colón</displayName>
@@ -2992,28 +4381,40 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">i-Cuban Convertable Peso</displayName>
 				<displayName count="other">i-Cuban Convertable Peso</displayName>
 				<symbol>CUC</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CUP">
-				<displayName>I-Cuban Peso</displayName>
-				<displayName count="one">I-Cuban Peso</displayName>
-				<displayName count="other">I-Cuban Peso</displayName>
+				<displayName>i-Cuban Peso</displayName>
+				<displayName count="one">i-Cuban pesos</displayName>
+				<displayName count="other">i-Cuban pesos</displayName>
 				<symbol>CUP</symbol>
 				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="CVE">
 				<displayName>i-Cape Verdean Escudo</displayName>
+				<displayName count="one">i-Cape Verdean Escudo</displayName>
+				<displayName count="other">i-Cape Verdean Escudo</displayName>
+				<symbol draft="contributed">CVE</symbol>
 			</currency>
 			<currency type="CZK">
 				<displayName>i-Czech Republic Koruna</displayName>
+				<displayName count="one">i-Czech Republic Koruna</displayName>
+				<displayName count="other">i-Czech Republic Koruna</displayName>
+				<symbol draft="contributed">CZK</symbol>
+				<symbol alt="narrow" draft="contributed">Kč</symbol>
 			</currency>
 			<currency type="DJF">
 				<displayName>i-Djiboutian Franc</displayName>
+				<displayName count="one">i-Djiboutian Franc</displayName>
+				<displayName count="other">i-Djiboutian Franc</displayName>
+				<symbol draft="contributed">DJF</symbol>
 			</currency>
 			<currency type="DKK">
 				<displayName>i-Danish Krone</displayName>
 				<displayName count="one">i-Danish Krone</displayName>
 				<displayName count="other">i-Danish Krone</displayName>
 				<symbol>DKK</symbol>
+				<symbol alt="narrow" draft="contributed">Kr</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>i-Dominican Peso</displayName>
@@ -3024,15 +4425,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="DZD">
 				<displayName>i-Algerian Dinar</displayName>
+				<displayName count="one">i-Algerian Dinar</displayName>
+				<displayName count="other">i-Algerian Dinar</displayName>
+				<symbol draft="contributed">DZD</symbol>
 			</currency>
 			<currency type="EGP">
 				<displayName>i-Egyptian Pound</displayName>
+				<displayName count="one">i-Egyptian Pound</displayName>
+				<displayName count="other">i-Egyptian Pound</displayName>
+				<symbol draft="contributed">EGP</symbol>
+				<symbol alt="narrow" draft="contributed">E£</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>i-Eritrean Nakfa</displayName>
+				<displayName count="one">i-Eritrean Nakfa</displayName>
+				<displayName count="other">i-Eritrean Nakfa</displayName>
+				<symbol draft="contributed">ERN</symbol>
 			</currency>
 			<currency type="ETB">
 				<displayName>i-Ethopian Birr</displayName>
+				<displayName count="one">i-Ethopian Birr</displayName>
+				<displayName count="other">i-Ethopian Birr</displayName>
+				<symbol draft="contributed">ETB</symbol>
 			</currency>
 			<currency type="EUR">
 				<displayName>i-Euro</displayName>
@@ -3043,9 +4457,17 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="FJD">
 				<displayName>i-Fijian Dollar</displayName>
+				<displayName count="one">i-Fijian Dollar</displayName>
+				<displayName count="other">i-Fijian Dollar</displayName>
+				<symbol draft="contributed">FJD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="FKP">
 				<displayName>i-Falkland Islands Pound</displayName>
+				<displayName count="one">i-Falkland Islands Pound</displayName>
+				<displayName count="other">i-Falkland Islands Pound</displayName>
+				<symbol draft="contributed">FKP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GBP">
 				<displayName>i-British Pound</displayName>
@@ -3056,27 +4478,50 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="GEL">
 				<displayName>i-Georgian Lari</displayName>
+				<displayName count="one">i-Georgian Lari</displayName>
+				<displayName count="other">i-Georgian Lari</displayName>
+				<symbol draft="contributed">GEL</symbol>
+				<symbol alt="variant" draft="contributed">₾</symbol>
 			</currency>
 			<currency type="GHS">
 				<displayName>i-Ghanaian Cedi</displayName>
+				<displayName count="one">i-Ghanaian Cedi</displayName>
+				<displayName count="other">i-Ghanaian Cedi</displayName>
+				<symbol draft="contributed">GHS</symbol>
 			</currency>
 			<currency type="GIP">
 				<displayName>i-Gibraltar Pound</displayName>
+				<displayName count="one">i-Gibraltar Pound</displayName>
+				<displayName count="other">i-Gibraltar Pound</displayName>
+				<symbol draft="contributed">GIP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="GMD">
 				<displayName>i-Gambian Dalasi</displayName>
+				<displayName count="one">i-Gambian Dalasi</displayName>
+				<displayName count="other">i-Gambian Dalasi</displayName>
+				<symbol draft="contributed">GMD</symbol>
 			</currency>
 			<currency type="GNF">
 				<displayName>i-Gunean Franc</displayName>
+				<displayName count="one">i-Gunean Franc</displayName>
+				<displayName count="other">i-Gunean Franc</displayName>
+				<symbol draft="contributed">GNF</symbol>
+				<symbol alt="narrow" draft="contributed">FG</symbol>
 			</currency>
 			<currency type="GTQ">
 				<displayName>i-Guatemalan Quetzal</displayName>
 				<displayName count="one">i-Guatemalan Quetzal</displayName>
 				<displayName count="other">i-Guatemalan Quetzal</displayName>
 				<symbol>GTQ</symbol>
+				<symbol alt="narrow" draft="contributed">Q</symbol>
 			</currency>
 			<currency type="GYD">
 				<displayName>i-Guyanaese Dollar</displayName>
+				<displayName count="one">i-Guyanaese Dollar</displayName>
+				<displayName count="other">i-Guyanaese Dollar</displayName>
+				<symbol draft="contributed">GYD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="HKD">
 				<displayName>i-Hong Kong Dollar</displayName>
@@ -3090,9 +4535,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="one">i-Honduran Lempira</displayName>
 				<displayName count="other">i-Honduran lempiras</displayName>
 				<symbol>HNL</symbol>
+				<symbol alt="narrow" draft="contributed">L</symbol>
 			</currency>
 			<currency type="HRK">
 				<displayName>i-Croatian Kuna</displayName>
+				<displayName count="one">i-Croatian Kuna</displayName>
+				<displayName count="other">i-Croatian Kuna</displayName>
+				<symbol draft="contributed">HRK</symbol>
+				<symbol alt="narrow" draft="contributed">Kn</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>i-Haitian Gourde</displayName>
@@ -3102,15 +4552,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="HUF">
 				<displayName>i-Hungarian Forint</displayName>
+				<displayName count="one">i-Hungarian Forint</displayName>
+				<displayName count="other">i-Hungarian Forint</displayName>
+				<symbol draft="contributed">HUF</symbol>
+				<symbol alt="narrow" draft="contributed">Ft</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>i-Indonesian Rupiah</displayName>
 				<displayName count="one">i-Indonesian Rupiah</displayName>
 				<displayName count="other">i-Indonesian Rupiah</displayName>
 				<symbol>IDR</symbol>
+				<symbol alt="narrow" draft="contributed">Rp</symbol>
 			</currency>
 			<currency type="ILS">
 				<displayName>i-Israeli New Sheqel</displayName>
+				<displayName count="one">i-Israeli New Sheqel</displayName>
+				<displayName count="other">i-Israeli New Sheqel</displayName>
+				<symbol draft="contributed">₪</symbol>
+				<symbol alt="narrow" draft="contributed">₪</symbol>
 			</currency>
 			<currency type="INR">
 				<displayName>i-Indian Rupee</displayName>
@@ -3121,12 +4580,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="IQD">
 				<displayName>i-Iraqi Dinar</displayName>
+				<displayName count="one">i-Iraqi Dinar</displayName>
+				<displayName count="other">i-Iraqi Dinar</displayName>
+				<symbol draft="contributed">IQD</symbol>
 			</currency>
 			<currency type="IRR">
 				<displayName>i-Iranian Rial</displayName>
+				<displayName count="one">i-Iranian Rial</displayName>
+				<displayName count="other">i-Iranian Rial</displayName>
+				<symbol draft="contributed">IRR</symbol>
 			</currency>
 			<currency type="ISK">
 				<displayName>i-Icelandic Króna</displayName>
+				<displayName count="one">i-Icelandic Króna</displayName>
+				<displayName count="other">i-Icelandic Króna</displayName>
+				<symbol draft="contributed">ISK</symbol>
+				<symbol alt="narrow" draft="contributed">Kr</symbol>
 			</currency>
 			<currency type="JMD">
 				<displayName>i-Jamaican Dollar</displayName>
@@ -3137,6 +4606,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="JOD">
 				<displayName>i-Jordanian Dinar</displayName>
+				<displayName count="one">i-Jordanian Dinar</displayName>
+				<displayName count="other">i-Jordanian Dinar</displayName>
+				<symbol draft="contributed">JOD</symbol>
 			</currency>
 			<currency type="JPY">
 				<displayName>i-Japanese Yen</displayName>
@@ -3147,18 +4619,36 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="KES">
 				<displayName>i-Kenyan Shilling</displayName>
+				<displayName count="one">i-Kenyan Shilling</displayName>
+				<displayName count="other">i-Kenyan Shilling</displayName>
+				<symbol draft="contributed">KES</symbol>
 			</currency>
 			<currency type="KGS">
 				<displayName>i-Kyrgystani Som</displayName>
+				<displayName count="one">i-Kyrgystani Som</displayName>
+				<displayName count="other">i-Kyrgystani Som</displayName>
+				<symbol draft="contributed">KGS</symbol>
 			</currency>
 			<currency type="KHR">
 				<displayName>i-Cambodian Riel</displayName>
+				<displayName count="one">i-Cambodian Riel</displayName>
+				<displayName count="other">i-Cambodian Riel</displayName>
+				<symbol draft="contributed">KHR</symbol>
+				<symbol alt="narrow" draft="contributed">៛</symbol>
 			</currency>
 			<currency type="KMF">
 				<displayName>i-Comorian Franc</displayName>
+				<displayName count="one">i-Comorian Franc</displayName>
+				<displayName count="other">i-Comorian Franc</displayName>
+				<symbol draft="contributed">KMF</symbol>
+				<symbol alt="narrow" draft="contributed">CF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>i-North Korean Won</displayName>
+				<displayName count="one">i-North Korean Won</displayName>
+				<displayName count="other">i-North Korean Won</displayName>
+				<symbol draft="contributed">KPW</symbol>
+				<symbol alt="narrow" draft="contributed">₩</symbol>
 			</currency>
 			<currency type="KRW">
 				<displayName>i-South Korean Won</displayName>
@@ -3169,6 +4659,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="KWD">
 				<displayName>i-Kuwaiti Dinar</displayName>
+				<displayName count="one">i-Kuwaiti Dinar</displayName>
+				<displayName count="other">i-Kuwaiti Dinar</displayName>
+				<symbol draft="contributed">KWD</symbol>
 			</currency>
 			<currency type="KYD">
 				<displayName>i-Cayman Islands Dollar</displayName>
@@ -3179,18 +4672,38 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="KZT">
 				<displayName>i-Kazakhstani Tenge</displayName>
+				<displayName count="one">i-Kazakhstani Tenge</displayName>
+				<displayName count="other">i-Kazakhstani Tenge</displayName>
+				<symbol draft="contributed">KZT</symbol>
+				<symbol alt="narrow" draft="contributed">₸</symbol>
 			</currency>
 			<currency type="LAK">
 				<displayName>i-Laotian Kip</displayName>
+				<displayName count="one">i-Laotian Kip</displayName>
+				<displayName count="other">i-Laotian Kip</displayName>
+				<symbol draft="contributed">LAK</symbol>
+				<symbol alt="narrow" draft="contributed">₭</symbol>
 			</currency>
 			<currency type="LBP">
 				<displayName>i-Lebanese Pound</displayName>
+				<displayName count="one">i-Lebanese Pound</displayName>
+				<displayName count="other">i-Lebanese Pound</displayName>
+				<symbol draft="contributed">LBP</symbol>
+				<symbol alt="narrow" draft="contributed">L£</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>i-Sri Lankan Rupee</displayName>
+				<displayName count="one">i-Sri Lankan Rupee</displayName>
+				<displayName count="other">i-Sri Lankan Rupee</displayName>
+				<symbol draft="contributed">LKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>i-Liberian Dollar</displayName>
+				<displayName count="one">i-Liberian Dollar</displayName>
+				<displayName count="other">i-Liberian Dollar</displayName>
+				<symbol draft="contributed">LRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="LSL">
 				<displayName>i-Lesotho Loti</displayName>
@@ -3203,39 +4716,79 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="LYD">
 				<displayName>i-Libyan Dinar</displayName>
+				<displayName count="one">i-Libyan Dinar</displayName>
+				<displayName count="other">i-Libyan Dinar</displayName>
+				<symbol draft="contributed">LYD</symbol>
 			</currency>
 			<currency type="MAD">
 				<displayName>i-Moroccan Dirham</displayName>
+				<displayName count="one">i-Moroccan Dirham</displayName>
+				<displayName count="other">i-Moroccan Dirham</displayName>
+				<symbol draft="contributed">MAD</symbol>
 			</currency>
 			<currency type="MDL">
 				<displayName>i-Moldovan Leu</displayName>
+				<displayName count="one">i-Moldovan Leu</displayName>
+				<displayName count="other">i-Moldovan Leu</displayName>
+				<symbol draft="contributed">MDL</symbol>
 			</currency>
 			<currency type="MGA">
 				<displayName>i-Malagasy Ariary</displayName>
+				<displayName count="one">i-Malagasy Ariary</displayName>
+				<displayName count="other">i-Malagasy Ariary</displayName>
+				<symbol draft="contributed">MGA</symbol>
+				<symbol alt="narrow" draft="contributed">Ar</symbol>
 			</currency>
 			<currency type="MKD">
 				<displayName>i-Macedonian Denar</displayName>
+				<displayName count="one">i-Macedonian Denar</displayName>
+				<displayName count="other">i-Macedonian Denar</displayName>
+				<symbol draft="contributed">MKD</symbol>
 			</currency>
 			<currency type="MMK">
 				<displayName>i-Myanma Kyat</displayName>
+				<displayName count="one">i-Myanma Kyat</displayName>
+				<displayName count="other">i-Myanma Kyat</displayName>
+				<symbol draft="contributed">MMK</symbol>
+				<symbol alt="narrow" draft="contributed">K</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>i-Mongolian Tugrik</displayName>
+				<displayName count="one">i-Mongolian Tugrik</displayName>
+				<displayName count="other">i-Mongolian Tugrik</displayName>
+				<symbol draft="contributed">MNT</symbol>
+				<symbol alt="narrow" draft="contributed">₮</symbol>
 			</currency>
 			<currency type="MOP">
 				<displayName>i-Macanese Pataca</displayName>
+				<displayName count="one">i-Macanese Pataca</displayName>
+				<displayName count="other">i-Macanese Pataca</displayName>
+				<symbol draft="contributed">MOP</symbol>
 			</currency>
 			<currency type="MRO">
 				<displayName>i-Mauritanian Ouguiya</displayName>
+				<displayName count="one">i-Mauritanian Ouguiya</displayName>
+				<displayName count="other">i-Mauritanian Ouguiya</displayName>
+				<symbol draft="contributed">MRO</symbol>
 			</currency>
 			<currency type="MUR">
 				<displayName>i-Mauritian Rupee</displayName>
+				<displayName count="one">i-Mauritian Rupee</displayName>
+				<displayName count="other">i-Mauritian Rupee</displayName>
+				<symbol draft="contributed">MUR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="MVR">
 				<displayName>i-Maldivian Rufiyana</displayName>
+				<displayName count="one">i-Maldivian Rufiyana</displayName>
+				<displayName count="other">i-Maldivian Rufiyana</displayName>
+				<symbol draft="contributed">MVR</symbol>
 			</currency>
 			<currency type="MWK">
 				<displayName>i-Malawian Kwacha</displayName>
+				<displayName count="one">i-Malawian Kwacha</displayName>
+				<displayName count="other">i-Malawian Kwacha</displayName>
+				<symbol draft="contributed">MWK</symbol>
 			</currency>
 			<currency type="MXN">
 				<displayName>i-Mexican Peso</displayName>
@@ -3246,36 +4799,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="MYR">
 				<displayName>i-Malaysian Ringgit</displayName>
+				<displayName count="one">i-Malaysian Ringgit</displayName>
+				<displayName count="other">i-Malaysian Ringgit</displayName>
+				<symbol draft="contributed">MYR</symbol>
+				<symbol alt="narrow" draft="contributed">RM</symbol>
 			</currency>
 			<currency type="MZN">
-				<displayName>I-Metical yase-Mozambicque</displayName>
+				<displayName>i-Mozambican Metical</displayName>
+				<displayName count="one">i-Mozambican Metical</displayName>
+				<displayName count="other">i-Mozambican Metical</displayName>
+				<symbol draft="contributed">MZN</symbol>
 			</currency>
 			<currency type="NAD">
 				<displayName>i-Namibian Dollar</displayName>
+				<displayName count="one">i-Namibian Dollar</displayName>
+				<displayName count="other">i-Namibian Dollar</displayName>
+				<symbol draft="contributed">NAD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="NGN">
 				<displayName>i-Nigerian Naira</displayName>
+				<displayName count="one">i-Nigerian Naira</displayName>
+				<displayName count="other">i-Nigerian Naira</displayName>
+				<symbol draft="contributed">NGN</symbol>
+				<symbol alt="narrow" draft="contributed">₦</symbol>
 			</currency>
 			<currency type="NIO">
 				<displayName>i-Nicaraguan Córdoba</displayName>
 				<displayName count="one">i-Nicaraguan Córdoba</displayName>
 				<displayName count="other">i-Nicaraguan Córdoba</displayName>
 				<symbol>NIO</symbol>
+				<symbol alt="narrow" draft="contributed">C$</symbol>
 			</currency>
 			<currency type="NOK">
 				<displayName>i-Norwegian Krone</displayName>
 				<displayName count="one">i-Norwegian Krone</displayName>
 				<displayName count="other">i-Norwegian Krone</displayName>
 				<symbol>NOK</symbol>
+				<symbol alt="narrow" draft="contributed">Kr</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>i-Nepalese Rupee</displayName>
+				<displayName count="one">i-Nepalese Rupee</displayName>
+				<displayName count="other">i-Nepalese Rupee</displayName>
+				<symbol draft="contributed">NPR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>i-New Zealand Dollar</displayName>
+				<displayName count="one">i-New Zealand Dollar</displayName>
+				<displayName count="other">i-New Zealand Dollar</displayName>
+				<symbol draft="contributed">NZ$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="OMR">
 				<displayName>i-Omani Rial</displayName>
+				<displayName count="one">i-Omani Rial</displayName>
+				<displayName count="other">i-Omani Rial</displayName>
+				<symbol draft="contributed">OMR</symbol>
 			</currency>
 			<currency type="PAB">
 				<displayName>i-Panamanian Balboa</displayName>
@@ -3285,42 +4866,75 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="PEN">
 				<displayName>i-Peruvian Nuevo Sol</displayName>
+				<displayName count="one">i-Peruvian Nuevo Sol</displayName>
+				<displayName count="other">i-Peruvian Nuevo Sol</displayName>
+				<symbol draft="contributed">PEN</symbol>
 			</currency>
 			<currency type="PGK">
 				<displayName>i-Papua New Guinean Kina</displayName>
+				<displayName count="one">i-Papua New Guinean Kina</displayName>
+				<displayName count="other">i-Papua New Guinean Kina</displayName>
+				<symbol draft="contributed">PGK</symbol>
 			</currency>
 			<currency type="PHP">
 				<displayName>i-Philippine Peso</displayName>
+				<displayName count="one">i-Philippine Peso</displayName>
+				<displayName count="other">i-Philippine Peso</displayName>
+				<symbol draft="contributed">PHP</symbol>
+				<symbol alt="narrow" draft="contributed">₱</symbol>
 			</currency>
 			<currency type="PKR">
 				<displayName>i-Pakistani Rupee</displayName>
+				<displayName count="one">i-Pakistani Rupee</displayName>
+				<displayName count="other">i-Pakistani Rupee</displayName>
+				<symbol draft="contributed">PKR</symbol>
+				<symbol alt="narrow" draft="contributed">Rs</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>i-Polish Zloty</displayName>
 				<displayName count="one">i-Polish Zloty</displayName>
 				<displayName count="other">i-Polish Zloty</displayName>
 				<symbol>PLN</symbol>
+				<symbol alt="narrow" draft="contributed">Zł</symbol>
 			</currency>
 			<currency type="PYG">
 				<displayName>i-Paraguayan Guarani</displayName>
+				<displayName count="one">i-Paraguayan Guarani</displayName>
+				<displayName count="other">i-Paraguayan Guarani</displayName>
+				<symbol draft="contributed">PYG</symbol>
+				<symbol alt="narrow" draft="contributed">₲</symbol>
 			</currency>
 			<currency type="QAR">
 				<displayName>i-Qatari Rial</displayName>
+				<displayName count="one">i-Qatari Rial</displayName>
+				<displayName count="other">i-Qatari Rial</displayName>
+				<symbol draft="contributed">QAR</symbol>
 			</currency>
 			<currency type="RON">
-				<displayName>I-Romanian Leu</displayName>
+				<displayName>i-Romanian Leu</displayName>
+				<displayName count="one">i-Romanian leu</displayName>
+				<displayName count="other">i-Romanian lei</displayName>
+				<symbol draft="contributed">RON</symbol>
 			</currency>
 			<currency type="RSD">
 				<displayName>i-Serbian Dinar</displayName>
+				<displayName count="one">i-Serbian Dinar</displayName>
+				<displayName count="other">i-Serbian Dinar</displayName>
+				<symbol draft="contributed">RSD</symbol>
 			</currency>
 			<currency type="RUB">
 				<displayName>i-Russian Ruble</displayName>
 				<displayName count="one">i-Russian Ruble</displayName>
 				<displayName count="other">i-Russian Ruble</displayName>
 				<symbol>RUB</symbol>
+				<symbol alt="narrow" draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RWF">
 				<displayName>i-Rwandan Franc</displayName>
+				<displayName count="one">i-Rwandan Franc</displayName>
+				<displayName count="other">i-Rwandan Franc</displayName>
+				<symbol draft="contributed">RWF</symbol>
+				<symbol alt="narrow" draft="contributed">RF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>i-Saudi Riyal</displayName>
@@ -3330,63 +4944,121 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="SBD">
 				<displayName>i-Solomon Islands Dollar</displayName>
+				<displayName count="one">i-Solomon Islands Dollar</displayName>
+				<displayName count="other">i-Solomon Islands Dollar</displayName>
+				<symbol draft="contributed">SBD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SCR">
 				<displayName>i-Seychellois Rupee</displayName>
+				<displayName count="one">i-Seychellois Rupee</displayName>
+				<displayName count="other">i-Seychellois Rupee</displayName>
+				<symbol draft="contributed">SCR</symbol>
 			</currency>
 			<currency type="SDG">
 				<displayName>i-Sudanese Pound</displayName>
+				<displayName count="one">i-Sudanese Pound</displayName>
+				<displayName count="other">i-Sudanese Pound</displayName>
+				<symbol draft="contributed">SDG</symbol>
 			</currency>
 			<currency type="SEK">
 				<displayName>i-Swedish Krona</displayName>
 				<displayName count="one">i-Swedish Krona</displayName>
 				<displayName count="other">i-Swedish Krona</displayName>
 				<symbol>SEK</symbol>
+				<symbol alt="narrow" draft="contributed">Kr</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>i-Singapore Dollar</displayName>
+				<displayName count="one">i-Singapore Dollar</displayName>
+				<displayName count="other">i-Singapore Dollar</displayName>
+				<symbol draft="contributed">SGD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SHP">
 				<displayName>i-Saint Helena Pound</displayName>
+				<displayName count="one">i-Saint Helena Pound</displayName>
+				<displayName count="other">i-Saint Helena Pound</displayName>
+				<symbol draft="contributed">SHP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SLL">
 				<displayName>i-Sierra Leonean Leone</displayName>
+				<displayName count="one">i-Sierra Leonean Leone</displayName>
+				<displayName count="other">i-Sierra Leonean Leone</displayName>
+				<symbol draft="contributed">SLL</symbol>
 			</currency>
 			<currency type="SOS">
 				<displayName>i-Somali Shilling</displayName>
+				<displayName count="one">i-Somali Shilling</displayName>
+				<displayName count="other">i-Somali Shilling</displayName>
+				<symbol draft="contributed">SOS</symbol>
 			</currency>
 			<currency type="SRD">
 				<displayName>i-Surinamese Dollar</displayName>
+				<displayName count="one">i-Surinamese Dollar</displayName>
+				<displayName count="other">i-Surinamese Dollar</displayName>
+				<symbol draft="contributed">SRD</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="SSP">
-				<displayName>Upondo waseNingizimu Sudan</displayName>
+				<displayName>i-South Sudanese Pound</displayName>
+				<displayName count="one">i-South Sudanese Pound</displayName>
+				<displayName count="other">i-South Sudanese Pound</displayName>
+				<symbol draft="contributed">SSP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="STD">
 				<displayName>i-São Tomé kanye ne-Príncipe Dobra</displayName>
+				<displayName count="one">i-São Tomé kanye ne-Príncipe Dobra</displayName>
+				<displayName count="other">i-São Tomé kanye ne-Príncipe Dobra</displayName>
+				<symbol draft="contributed">STD</symbol>
+				<symbol alt="narrow" draft="contributed">Db</symbol>
 			</currency>
 			<currency type="SYP">
 				<displayName>i-Syrian Pound</displayName>
+				<displayName count="one">i-Syrian Pound</displayName>
+				<displayName count="other">i-Syrian Pound</displayName>
+				<symbol draft="contributed">SYP</symbol>
+				<symbol alt="narrow" draft="contributed">£</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>i-Swazi Lilangeni</displayName>
+				<displayName count="one">i-Swazi Lilangeni</displayName>
+				<displayName count="other">i-Swazi Lilangeni</displayName>
+				<symbol draft="contributed">SZL</symbol>
 			</currency>
 			<currency type="THB">
 				<displayName>i-Thai Baht</displayName>
 				<displayName count="one">i-Thai Baht</displayName>
 				<displayName count="other">i-Thai Baht</displayName>
 				<symbol>฿</symbol>
+				<symbol alt="narrow" draft="contributed">฿</symbol>
 			</currency>
 			<currency type="TJS">
 				<displayName>i-Tajikistani Somoni</displayName>
+				<displayName count="one">i-Tajikistani Somoni</displayName>
+				<displayName count="other">i-Tajikistani Somoni</displayName>
+				<symbol draft="contributed">TJS</symbol>
 			</currency>
 			<currency type="TMT">
 				<displayName>i-Turkmenistani Manat</displayName>
+				<displayName count="one">i-Turkmenistani Manat</displayName>
+				<displayName count="other">i-Turkmenistani Manat</displayName>
+				<symbol draft="contributed">TMT</symbol>
 			</currency>
 			<currency type="TND">
 				<displayName>i-Tunisian Dinar</displayName>
+				<displayName count="one">i-Tunisian Dinar</displayName>
+				<displayName count="other">i-Tunisian Dinar</displayName>
+				<symbol draft="contributed">TND</symbol>
 			</currency>
 			<currency type="TOP">
 				<displayName>i-Tongan Paʻanga</displayName>
+				<displayName count="one">i-Tongan Paʻanga</displayName>
+				<displayName count="other">i-Tongan Paʻanga</displayName>
+				<symbol draft="contributed">TOP</symbol>
+				<symbol alt="narrow" draft="contributed">T$</symbol>
 			</currency>
 			<currency type="TRY">
 				<displayName>i-Turkish Lira</displayName>
@@ -3394,6 +5066,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName count="other">i-Turkish Lira</displayName>
 				<symbol>TRY</symbol>
 				<symbol alt="narrow" draft="contributed">₺</symbol>
+				<symbol alt="variant" draft="contributed">TL</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>i-Trinidad and Tobago Dollar</displayName>
@@ -3411,12 +5084,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="TZS">
 				<displayName>i-Tanzanian Shilling</displayName>
+				<displayName count="one">i-Tanzanian Shilling</displayName>
+				<displayName count="other">i-Tanzanian Shilling</displayName>
+				<symbol draft="contributed">TZS</symbol>
 			</currency>
 			<currency type="UAH">
 				<displayName>i-Ukrainian Hryvnia</displayName>
+				<displayName count="one">i-Ukrainian Hryvnia</displayName>
+				<displayName count="other">i-Ukrainian Hryvnia</displayName>
+				<symbol draft="contributed">UAH</symbol>
+				<symbol alt="narrow" draft="contributed">₴</symbol>
 			</currency>
 			<currency type="UGX">
 				<displayName>i-Ugandan Shilling</displayName>
+				<displayName count="one">i-Ugandan Shilling</displayName>
+				<displayName count="other">i-Ugandan Shilling</displayName>
+				<symbol draft="contributed">UGX</symbol>
 			</currency>
 			<currency type="USD">
 				<displayName>i-US Dollar</displayName>
@@ -3427,56 +5110,95 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</currency>
 			<currency type="UYU">
 				<displayName>i-Uruguayan Peso</displayName>
+				<displayName count="one">i-Uruguayan Peso</displayName>
+				<displayName count="other">i-Uruguayan Peso</displayName>
+				<symbol draft="contributed">UYU</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="UZS">
 				<displayName>i-Uzbekistan Som</displayName>
+				<displayName count="one">i-Uzbekistan Som</displayName>
+				<displayName count="other">i-Uzbekistan Som</displayName>
+				<symbol draft="contributed">UZS</symbol>
 			</currency>
 			<currency type="VEF">
 				<displayName>i-Venezuelan Bolívar</displayName>
+				<displayName count="one">i-Venezuelan Bolívar</displayName>
+				<displayName count="other">i-Venezuelan Bolívar</displayName>
+				<symbol draft="contributed">VEF</symbol>
+				<symbol alt="narrow" draft="contributed">Bs</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>i-Vietnamese Dong</displayName>
+				<displayName count="one">i-Vietnamese Dong</displayName>
+				<displayName count="other">i-Vietnamese Dong</displayName>
+				<symbol draft="contributed">₫</symbol>
+				<symbol alt="narrow" draft="contributed">₫</symbol>
 			</currency>
 			<currency type="VUV">
 				<displayName>i-Vanuatu Vatu</displayName>
+				<displayName count="one">i-Vanuatu Vatu</displayName>
+				<displayName count="other">i-Vanuatu Vatu</displayName>
+				<symbol draft="contributed">VUV</symbol>
 			</currency>
 			<currency type="WST">
 				<displayName>i-Samoan Tala</displayName>
+				<displayName count="one">i-Samoan Tala</displayName>
+				<displayName count="other">i-Samoan Tala</displayName>
+				<symbol draft="contributed">WST</symbol>
 			</currency>
 			<currency type="XAF">
 				<displayName>i-CFA Franc BCEA</displayName>
+				<displayName count="one">i-CFA Franc BCEA</displayName>
+				<displayName count="other">i-CFA Franc BCEA</displayName>
+				<symbol draft="contributed">FCFA</symbol>
 			</currency>
 			<currency type="XCD">
 				<displayName>i-East Caribbean Dollar</displayName>
 				<displayName count="one">i-East Caribbean Dollar</displayName>
 				<displayName count="other">i-East Caribbean Dollar</displayName>
 				<symbol>EC$</symbol>
+				<symbol alt="narrow" draft="contributed">$</symbol>
 			</currency>
 			<currency type="XOF">
 				<displayName>i-CFA Franc BCEAO</displayName>
+				<displayName count="one">i-CFA Franc BCEAO</displayName>
+				<displayName count="other">i-CFA Franc BCEAO</displayName>
+				<symbol draft="contributed">CFA</symbol>
 			</currency>
 			<currency type="XPF">
 				<displayName>i-CFP Franc</displayName>
+				<displayName count="one">i-CFP Franc</displayName>
+				<displayName count="other">i-CFP Franc</displayName>
+				<symbol draft="contributed">CFPF</symbol>
 			</currency>
 			<currency type="XXX">
-				<displayName>Imali engaziwa</displayName>
-				<displayName count="one">Imali engaziwa</displayName>
-				<displayName count="other">Imali engaziwa</displayName>
+				<displayName>imali engaziwa</displayName>
+				<displayName count="one">imali engaziwa</displayName>
+				<displayName count="other">imali engaziwa</displayName>
 			</currency>
 			<currency type="YER">
 				<displayName>i-Yemeni Rial</displayName>
+				<displayName count="one">i-Yemeni Rial</displayName>
+				<displayName count="other">i-Yemeni Rial</displayName>
+				<symbol draft="contributed">YER</symbol>
 			</currency>
 			<currency type="ZAR">
 				<displayName>i-South African Rand</displayName>
 				<displayName count="one">i-South African Rand</displayName>
 				<displayName count="other">i-South African Rand</displayName>
 				<symbol>R</symbol>
+				<symbol alt="narrow" draft="contributed">R</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>i-Zambian Kwacha (1968–2012)</displayName>
 			</currency>
 			<currency type="ZMW">
 				<displayName>i-Zambian Kwacha</displayName>
+				<displayName count="one">i-Zambian Kwacha</displayName>
+				<displayName count="other">i-Zambian Kwacha</displayName>
+				<symbol draft="contributed">ZMW</symbol>
+				<symbol alt="narrow" draft="contributed">ZK</symbol>
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
@@ -3499,6 +5221,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="one">{0} revolution</unitPattern>
+				<unitPattern count="other">{0} revolutions</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0} i-radian</unitPattern>
+				<unitPattern count="other">{0} radians</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>arcminutes</displayName>
 				<unitPattern count="one">{0} arcminute</unitPattern>
@@ -3509,30 +5246,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} arcsecond</unitPattern>
 				<unitPattern count="other">{0} arcseconds</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>°</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>rad</displayName>
-				<unitPattern count="one">{0} i-radian</unitPattern>
-				<unitPattern count="other">{0} radians</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>acre</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hectare</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0} per m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acre</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ft²</displayName>
@@ -3543,91 +5292,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>in²</displayName>
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karats</displayName>
+				<unitPattern count="one">{0} i-karat</unitPattern>
+				<unitPattern count="other">{0} ama-karats</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
 				<unitPattern count="one">{0} L/km</unitPattern>
 				<unitPattern count="other">{0} L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} L/100km</unitPattern>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} i-bit</unitPattern>
-				<unitPattern count="other">{0} ama-bits</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>bytes</displayName>
-				<unitPattern count="one">{0} i-byte</unitPattern>
-				<unitPattern count="other">{0} ama-bytes</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>gigabits</displayName>
-				<unitPattern count="one">{0} i-gigabit</unitPattern>
-				<unitPattern count="other">{0} ama-gigabits</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kilobits</displayName>
-				<unitPattern count="one">{0} i-kilobit</unitPattern>
-				<unitPattern count="other">{0} ama-kilobits</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>megabits</displayName>
-				<unitPattern count="one">{0} i-megabit</unitPattern>
-				<unitPattern count="other">{0} megabits</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>terabits</displayName>
-				<unitPattern count="one">{0} i-terabit</unitPattern>
-				<unitPattern count="other">{0} ama-terabits</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabits</displayName>
+				<unitPattern count="one">{0} i-terabit</unitPattern>
+				<unitPattern count="other">{0} ama-terabits</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabits</displayName>
+				<unitPattern count="one">{0} i-gigabit</unitPattern>
+				<unitPattern count="other">{0} ama-gigabits</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabits</displayName>
+				<unitPattern count="one">{0} i-megabit</unitPattern>
+				<unitPattern count="other">{0} megabits</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobits</displayName>
+				<unitPattern count="one">{0} i-kilobit</unitPattern>
+				<unitPattern count="other">{0} ama-kilobits</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bytes</displayName>
+				<unitPattern count="one">{0} i-byte</unitPattern>
+				<unitPattern count="other">{0} ama-bytes</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bits</displayName>
+				<unitPattern count="one">{0} i-bit</unitPattern>
+				<unitPattern count="other">{0} ama-bits</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>c</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>y</displayName>
+				<unitPattern count="one">{0} y</unitPattern>
+				<unitPattern count="other">{0} y</unitPattern>
+				<perUnitPattern>{0}/y</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>izinyanga</displayName>
+				<unitPattern count="one">{0} inyanga</unitPattern>
+				<unitPattern count="other">{0} izinyanga</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>amaviki</displayName>
+				<unitPattern count="one">{0} iviki</unitPattern>
+				<unitPattern count="other">{0} amaviki</unitPattern>
+				<perUnitPattern>{0}/w</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>izinsuku</displayName>
 				<unitPattern count="one">{0} usuku</unitPattern>
 				<unitPattern count="other">{0} izinsuku</unitPattern>
+				<perUnitPattern>{0}/d</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>amahora</displayName>
@@ -3635,30 +5399,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} amahora</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>microseconds</displayName>
-				<unitPattern count="one">{0} ama-microsecond</unitPattern>
-				<unitPattern count="other">{0} microseconds</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>amaminithi</displayName>
 				<unitPattern count="one">{0} iminithi</unitPattern>
 				<unitPattern count="other">{0} amaminithi</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>izinyanga</displayName>
-				<unitPattern count="one">{0} inyanga</unitPattern>
-				<unitPattern count="other">{0} izinyanga</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>amasekhondi</displayName>
@@ -3666,15 +5411,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} amasekhondi</unitPattern>
 				<perUnitPattern>{0}ps</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>amaviki</displayName>
-				<unitPattern count="one">{0} iviki</unitPattern>
-				<unitPattern count="other">{0} amaviki</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>y</displayName>
-				<unitPattern count="one">{0} y</unitPattern>
-				<unitPattern count="other">{0} y</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>microseconds</displayName>
+				<unitPattern count="one">{0} ama-microsecond</unitPattern>
+				<unitPattern count="other">{0} microseconds</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amp</displayName>
@@ -3696,6 +5446,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -3706,21 +5461,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Calorie</unitPattern>
 				<unitPattern count="other">{0} Calories</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joule</displayName>
-				<unitPattern count="one">{0} i-joule</unitPattern>
-				<unitPattern count="other">{0} ama-joules</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joule</displayName>
+				<unitPattern count="one">{0} i-joule</unitPattern>
+				<unitPattern count="other">{0} ama-joules</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -3731,201 +5481,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ft</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>in</displayName>
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ly</displayName>
-				<unitPattern count="one">{0} ly</unitPattern>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mi</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="one">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yd</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ft</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>in</displayName>
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ly</displayName>
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} i-lux</unitPattern>
 				<unitPattern count="other">{0} i-lux</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>CD</displayName>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tn</displayName>
 				<unitPattern count="one">{0} tn</unitPattern>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>CD</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hp</displayName>
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watt</displayName>
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -3936,10 +5690,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karats</displayName>
-				<unitPattern count="one">{0} i-karat</unitPattern>
-				<unitPattern count="other">{0} ama-karats</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -3956,6 +5715,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>knot</displayName>
+				<unitPattern count="one">{0} knots</unitPattern>
+				<unitPattern count="other">{0} knots</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -3971,31 +5740,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cL</displayName>
-				<unitPattern count="one">{0} cL</unitPattern>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -4005,6 +5749,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -4016,25 +5767,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>cup</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="one">{0} dL</unitPattern>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -4045,27 +5791,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>l</displayName>
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="one">{0} ML</unitPattern>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0} dL</unitPattern>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="one">{0} cL</unitPattern>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
 				<unitPattern count="one">{0} mL</unitPattern>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cup</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>tbsp</displayName>
 				<unitPattern count="one">{0} tbsp</unitPattern>
@@ -4076,6 +5859,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} tsp</unitPattern>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="per">
@@ -4091,6 +5880,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="one">{0} rev</unitPattern>
+				<unitPattern count="other">{0} rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radians</displayName>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>arcmins</displayName>
 				<unitPattern count="one">{0} arcmin</unitPattern>
@@ -4101,30 +5905,42 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} arcsec</unitPattern>
 				<unitPattern count="other">{0} arcsecs</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<displayName>°</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName>radians</displayName>
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName>acre</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+			<unit type="area-square-kilometer">
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>hectare</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<displayName>m²</displayName>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+				<perUnitPattern>{0}/m²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>cm²</displayName>
 				<unitPattern count="one">{0} cm²</unitPattern>
 				<unitPattern count="other">{0} cm²</unitPattern>
+				<perUnitPattern>{0}/cm²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acre</displayName>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>ft²</displayName>
@@ -4135,91 +5951,106 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>in²</displayName>
 				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="other">{0} in²</unitPattern>
+				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<displayName>km²</displayName>
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>m²</displayName>
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mi²</displayName>
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yd²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
+			<unit type="concentr-karat">
+				<displayName>karats</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
 				<unitPattern count="one">{0} L/km</unitPattern>
 				<unitPattern count="other">{0} L/km</unitPattern>
 			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0} L/100km</unitPattern>
+				<unitPattern count="other">{0} L/100km</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>miles/gal</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
-			<unit type="digital-bit">
-				<displayName>bit</displayName>
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName>byte</displayName>
-				<unitPattern count="one">{0} byte</unitPattern>
-				<unitPattern count="other">{0} byte</unitPattern>
-			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gbit</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
-			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GB</displayName>
-				<unitPattern count="one">{0} GB</unitPattern>
-				<unitPattern count="other">{0} GB</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kbit</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kB</displayName>
-				<unitPattern count="one">{0} kB</unitPattern>
-				<unitPattern count="other">{0} kB</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mbit</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
-			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MB</displayName>
-				<unitPattern count="one">{0} MB</unitPattern>
-				<unitPattern count="other">{0} MB</unitPattern>
-			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tbit</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
-			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
 				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tbit</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gbit</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mbit</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kbit</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>byte</displayName>
+				<unitPattern count="one">{0} byte</unitPattern>
+				<unitPattern count="other">{0} byte</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>bit</displayName>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>c</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>y</displayName>
+				<unitPattern count="one">{0} y</unitPattern>
+				<unitPattern count="other">{0} yrs</unitPattern>
+				<perUnitPattern>{0}/y</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>izinyanga</displayName>
+				<unitPattern count="one">{0} nyanga</unitPattern>
+				<unitPattern count="other">{0} izinyanga</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>amaviki</displayName>
+				<unitPattern count="one">{0} viki</unitPattern>
+				<unitPattern count="other">{0} amaviki</unitPattern>
+				<perUnitPattern>{0}/w</perUnitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>izinsuku</displayName>
 				<unitPattern count="one">{0} usuku</unitPattern>
 				<unitPattern count="other">{0} izinsuku</unitPattern>
+				<perUnitPattern>{0}/d</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>amahora</displayName>
@@ -4227,30 +6058,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} amahora</unitPattern>
 				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μsecs</displayName>
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>amaminithi</displayName>
 				<unitPattern count="one">{0} iminithi</unitPattern>
-				<unitPattern count="other">{0} amaminithi</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName>izinyanga</displayName>
-				<unitPattern count="one">{0} nyanga</unitPattern>
-				<unitPattern count="other">{0} izinyanga</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName>ns</displayName>
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<unitPattern count="other">{0} iminithi</unitPattern>
+				<perUnitPattern>{0}/min</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>amasekhondi</displayName>
@@ -4258,15 +6070,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="other">{0} s</unitPattern>
 				<perUnitPattern>{0}ps</perUnitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>amaviki</displayName>
-				<unitPattern count="one">{0} viki</unitPattern>
-				<unitPattern count="other">{0} amaviki</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>y</displayName>
-				<unitPattern count="one">{0} y</unitPattern>
-				<unitPattern count="other">{0} yrs</unitPattern>
+			<unit type="duration-microsecond">
+				<displayName>μsecs</displayName>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ns</displayName>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>amp</displayName>
@@ -4288,6 +6105,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -4298,21 +6120,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} Cal</unitPattern>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<displayName>joules</displayName>
-				<unitPattern count="one">{0} J</unitPattern>
-				<unitPattern count="other">{0} J</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>kcal</displayName>
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>joules</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
 				<unitPattern count="one">{0} kWh</unitPattern>
@@ -4323,201 +6140,205 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<displayName>Hz</displayName>
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>kHz</displayName>
 				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>MHz</displayName>
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>au</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
+			<unit type="length-kilometer">
+				<displayName>km</displayName>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
+				<perUnitPattern>{0}/km</perUnitPattern>
 			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>dm</displayName>
 				<unitPattern count="one">{0} dm</unitPattern>
 				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
-			<unit type="length-foot">
-				<displayName>ft</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName>in</displayName>
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName>km</displayName>
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>ly</displayName>
-				<unitPattern count="one">{0} ly</unitPattern>
-				<unitPattern count="other">{0} ly</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName>µm</displayName>
-				<unitPattern count="one">{0} µm</unitPattern>
-				<unitPattern count="other">{0} µm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName>mi</displayName>
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+				<perUnitPattern>{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="one">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>µm</displayName>
+				<unitPattern count="one">{0} µm</unitPattern>
+				<unitPattern count="other">{0} µm</unitPattern>
+			</unit>
 			<unit type="length-nanometer">
 				<displayName>nm</displayName>
 				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<displayName>nmi</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName>pc</displayName>
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>pm</displayName>
 				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
+			<unit type="length-mile">
+				<displayName>mi</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
 			<unit type="length-yard">
 				<displayName>yd</displayName>
 				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} yd</unitPattern>
 			</unit>
+			<unit type="length-foot">
+				<displayName>ft</displayName>
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+				<perUnitPattern>{0}/ft</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>in</displayName>
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+				<perUnitPattern>{0}/in</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>pc</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ly</displayName>
+				<unitPattern count="one">{0} ly</unitPattern>
+				<unitPattern count="other">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>smi</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
 			<unit type="light-lux">
 				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
-			<unit type="mass-carat">
-				<displayName>CD</displayName>
-				<unitPattern count="one">{0} CD</unitPattern>
-				<unitPattern count="other">{0} CD</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName>kg</displayName>
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-metric-ton">
 				<displayName>t</displayName>
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>µg</displayName>
-				<unitPattern count="one">{0} µg</unitPattern>
-				<unitPattern count="other">{0} µg</unitPattern>
+			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>mg</displayName>
 				<unitPattern count="one">{0} mg</unitPattern>
 				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName>oz</displayName>
-				<unitPattern count="one">{0} oz</unitPattern>
-				<unitPattern count="other">{0} oz</unitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz t</displayName>
-				<unitPattern count="one">{0} oz t</unitPattern>
-				<unitPattern count="other">{0} oz t</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>lb</displayName>
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
+			<unit type="mass-microgram">
+				<displayName>µg</displayName>
+				<unitPattern count="one">{0} µg</unitPattern>
+				<unitPattern count="other">{0} µg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>tn</displayName>
 				<unitPattern count="one">{0} tn</unitPattern>
 				<unitPattern count="other">{0} tn</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>CD</displayName>
+				<unitPattern count="one">{0} CD</unitPattern>
+				<unitPattern count="other">{0} CD</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>GW</displayName>
 				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName>hp</displayName>
-				<unitPattern count="one">{0} hp</unitPattern>
-				<unitPattern count="other">{0} hp</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>kW</displayName>
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
 				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName>mW</displayName>
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>watt</displayName>
 				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>hp</displayName>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>hPa</displayName>
 				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
-			<unit type="pressure-inch-hg">
-				<displayName>inHg</displayName>
-				<unitPattern count="one">{0} inHg</unitPattern>
-				<unitPattern count="other">{0} inHg</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName>mbar</displayName>
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@@ -4528,10 +6349,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
-			<unit type="proportion-karat">
-				<displayName>karats</displayName>
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
+			<unit type="pressure-inch-hg">
+				<displayName>inHg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>mbar</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
@@ -4548,6 +6374,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<displayName>kn</displayName>
+				<unitPattern count="one">{0} kn</unitPattern>
+				<unitPattern count="other">{0} kn</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>°</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 				<unitPattern count="one">{0}°C</unitPattern>
@@ -4563,31 +6399,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
-			<unit type="volume-acre-foot">
-				<displayName>ac ft</displayName>
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cL</displayName>
-				<unitPattern count="one">{0} cL</unitPattern>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName>cm³</displayName>
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName>ft³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName>in³</displayName>
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>km³</displayName>
 				<unitPattern count="one">{0} km³</unitPattern>
@@ -4597,6 +6408,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>m³</displayName>
 				<unitPattern count="one">{0} m³</unitPattern>
 				<unitPattern count="other">{0} m³</unitPattern>
+				<perUnitPattern>{0}/m³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cm³</displayName>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+				<perUnitPattern>{0}/cm³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>mi³</displayName>
@@ -4608,25 +6426,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>cup</displayName>
-				<unitPattern count="one">{0} c</unitPattern>
-				<unitPattern count="other">{0} c</unitPattern>
+			<unit type="volume-cubic-foot">
+				<displayName>ft³</displayName>
+				<unitPattern count="one">{0} ft³</unitPattern>
+				<unitPattern count="other">{0} ft³</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dL</displayName>
-				<unitPattern count="one">{0} dL</unitPattern>
-				<unitPattern count="other">{0} dL</unitPattern>
+			<unit type="volume-cubic-inch">
+				<displayName>in³</displayName>
+				<unitPattern count="one">{0} in³</unitPattern>
+				<unitPattern count="other">{0} in³</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
-				<unitPattern count="other">{0} fl oz</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName>gal</displayName>
-				<unitPattern count="one">{0} gal</unitPattern>
-				<unitPattern count="other">{0} gal</unitPattern>
+			<unit type="volume-megaliter">
+				<displayName>ML</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
+				<unitPattern count="other">{0} ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>hL</displayName>
@@ -4637,27 +6450,64 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<displayName>l</displayName>
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
+				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ML</displayName>
-				<unitPattern count="one">{0} ML</unitPattern>
-				<unitPattern count="other">{0} ML</unitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dL</displayName>
+				<unitPattern count="one">{0} dL</unitPattern>
+				<unitPattern count="other">{0} dL</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cL</displayName>
+				<unitPattern count="one">{0} cL</unitPattern>
+				<unitPattern count="other">{0} cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>mL</displayName>
 				<unitPattern count="one">{0} mL</unitPattern>
 				<unitPattern count="other">{0} mL</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pt</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
+			<unit type="volume-pint-metric">
+				<displayName>mpt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>mcup</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ac ft</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
+				<unitPattern count="other">{0} ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
 				<unitPattern count="one">{0} qt</unitPattern>
 				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
+			<unit type="volume-pint">
+				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cup</displayName>
+				<unitPattern count="one">{0} c</unitPattern>
+				<unitPattern count="other">{0} c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>tbsp</displayName>
 				<unitPattern count="one">{0} tbsp</unitPattern>
@@ -4668,6 +6518,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} tsp</unitPattern>
 				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
 			<compoundUnit type="per">
@@ -4677,6 +6533,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} G</unitPattern>
 				<unitPattern count="other">{0} G</unitPattern>
 			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -4685,9 +6545,25 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
+			<unit type="consumption-liter-per-100kilometers">
+				<displayName>L/100km</displayName>
+				<unitPattern count="one">{0}L/100km</unitPattern>
+				<unitPattern count="other">{0}L/100km</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>y</displayName>
+				<unitPattern count="one">{0} y</unitPattern>
+				<unitPattern count="other">{0} y</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>izinyanga</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>amaviki</displayName>
+				<unitPattern count="one">{0} w</unitPattern>
+				<unitPattern count="other">{0} w</unitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>izinsuku</displayName>
@@ -4699,40 +6575,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} hora</unitPattern>
 				<unitPattern count="other">{0} hora</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<displayName>ms</displayName>
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
-			</unit>
 			<unit type="duration-minute">
 				<displayName>amaminithi</displayName>
 				<unitPattern count="one">{0} min</unitPattern>
 				<unitPattern count="other">{0} min</unitPattern>
 			</unit>
-			<unit type="duration-month">
-				<displayName>izinyanga</displayName>
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
-			</unit>
 			<unit type="duration-second">
 				<displayName>isekhondi</displayName>
 				<unitPattern count="one">{0} s</unitPattern>
 				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
-			<unit type="duration-week">
-				<displayName>amaviki</displayName>
-				<unitPattern count="one">{0} w</unitPattern>
-				<unitPattern count="other">{0} w</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName>y</displayName>
-				<unitPattern count="one">{0} y</unitPattern>
-				<unitPattern count="other">{0} y</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName>cm</displayName>
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+			<unit type="duration-millisecond">
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>km</displayName>
@@ -4744,21 +6600,26 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} m</unitPattern>
 				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
+			<unit type="length-centimeter">
+				<displayName>cm</displayName>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+			</unit>
 			<unit type="length-millimeter">
 				<displayName>mm</displayName>
 				<unitPattern count="one">{0} mm</unitPattern>
 				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
-			<unit type="mass-gram">
-				<displayName>g</displayName>
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kg</displayName>
 				<unitPattern count="one">{0} kg</unitPattern>
 				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
+			<unit type="mass-gram">
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
 				<unitPattern count="one">{0}kph</unitPattern>
@@ -4778,6 +6639,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}W</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>h:mm</durationUnitPattern>
@@ -4797,12 +6664,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<listPatternPart type="2">I-{0} ne-{1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
 			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-narrow">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
 			<listPatternPart type="end">{0} {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-short">
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
 			<listPatternPart type="end">{0}, {1}</listPatternPart>
 			<listPatternPart type="2">{0}, {1}</listPatternPart>
 		</listPattern>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zu_ZA.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zu_ZA.xml
similarity index 68%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zu_ZA.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zu_ZA.xml
index e066e58dcaa..05671a7bb8a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/main/zu_ZA.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zu_ZA.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2014 Unicode, Inc.
+<!-- Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 16:10:33 -0500 (Wed, 23 Jul 2014) $"/>
+		<version number="$Revision: 11914 $"/>
 		<language type="zu"/>
 		<territory type="ZA"/>
 	</identity>
 </ldml>
+
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/attributeValueValidity.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/attributeValueValidity.xml
new file mode 100644
index 00000000000..7b088a3d5c7
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/attributeValueValidity.xml
@@ -0,0 +1,433 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE supplementalData SYSTEM '../../common/dtd/ldmlSupplemental.dtd'>
+<!-- Copyright © 1991-2014 Unicode, Inc. CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) For terms 
+	of use, see http://www.unicode.org/copyright.html -->
+<supplementalData>
+	<version number='$Revision: 12197 $'/>
+	<metadata>
+		<validity>
+			<!-- BCP 47 contains many more language codes than we are interested in maintaining as a part of the CLDR -->
+			<!-- This list contains ONLY those languages considered to be 'of interest' as part of CLDR, -->
+			<!-- and is maintained manually by the CLDR TC -->
+			<variable id='$language' type='choice'>
+				af agq ak am ar as asa ast ay az
+				ba bal bas be bem bez bg bm bn bo br brx bs
+				ca ce ceb cgg chr ckb cs cu cy
+				da dav de dje dsb dua dyo dz
+				ebu ee el en eo es et eu ewo
+				fa ff fi fil fo fr fur fy
+				ga gd gl gn gsw gu guz gv
+				ha haw he hi hr hsb ht hu hy
+				id ig ii ilo is it
+				ja jgo jmc
+				ka kab kam kbd kde kea khq ki kk kkj kl kln km kn ko kok ks ksb ksf ksh kw ky
+				lag lb lg lkt ln lo lrc lt lu lua luo luy lv
+				mai mas mdh mer mfe mg mgh mgo mis mk ml mn mr ms mt mua mul my mzn
+				naq nb nd ne nl nmg nn nnh nso nus ny nyn
+				om or os
+				pa pag pl prg ps pt
+				qu
+				rm rn ro rof root ru rw rwk
+				sah saq sat sbp sd se seh ses sg shi si sk sl smn sn so sq sr ss st sv sw
+				ta te teo tg th ti tk tn to tpi tr ts tt twq tzm
+				ug uk und ur uz
+				vai vi vo vun
+				wae war wo
+				xh xog
+				yav yi yo
+				za zgh zh zu zxx </variable>
+			<variable id='$languageExceptions' type='choice'>
+				aa ab ace ach ada ady ae aeb afh ain akk akz ale aln alt an ang anp arc arn aro arp arq arw ary arz ase av avk awa
+				ban bar bax bbc bbj bfd bej bew bfq bgn bho bi bik bin bjn bkm bla
+				bpy bqi bra brh bss bua bug bum byn byv
+				cad car cay cch ch chb chg chk chm chn cho chp chy co cop cps cr crh csb cv
+				dak dar del den dgr din doi dtp dum dv dyu dzg
+				efi egl egy eka elx enm esu ext
+				fan fat fit fj fon frc frm fro frp frr frs fy
+				gaa gag gan gay gba gbz gez gil glk gmh goh gom gon gor got grb grc guc gur gwi
+				hai hak hif hil hit hmn ho hsn hup hz
+				ia iba ibb ie ik inh io iu izh
+				jam jbo jpr jrb jut jv
+				kaa kac kaj kaw kbl kcg ken kfo kg kgp kha kho khw kiu kj kmb
+				koi kos kpe kr krc kri krj krl kru ku kum kut kv
+				la lad lah lam lez lfn li lij liv lmo lol loz ltg lui lun lus lzh lzz
+				mad maf mag mak man mde mdf mdr men mer mfe mg mga mgh mh mi mic min
+				mnc mni moh mos mrj mus mwl mwr mwv mye myv
+				na nan nap nds new ng nia niu njo no nog non nov nqo nr nv nwc nym nyo nzi
+				oc oj osa ota
+				pal pam pap pau pcd pdc pdt peo pfl phn pi pms pnt pon pro
+				quc qug
+				raj rap rar rgn rif rom rtm rue rug rup
+				sa sad sam sas saz sba sc scn sco sdc sdh see sei sel sga sgs sh shn shu sid sli sly sm sma smj sms
+				snk sog srn srr ssy stq su suk sus sux swb syc syr szl
+				tcy tem ter tet tig tiv tkl tkr tl tlh tli tly tmh tog tru trv tsd tsi ttt tum tvl tw ty tyv
+				udm uga umb
+				ve vec vep vls vmf vot vro
+				wa wal was wbp wuu
+				xal xmf
+				yao yap ybb yrl yue
+				zap zbl zea zen zun zza 
+			</variable>
+			<variable id='$scriptNonUnicode' type='choice'> Adlm Afak Aran Blis Cirt Cyrs Egyd Egyh Geok Inds Jurc Kitl Kits Kpel Latf Latg Loma Marc Maya Moon
+				Nkgb Nshu Osge Phlv Roro Sara Syre Syrj Syrn Tang Teng Visp Wole 
+			</variable>				
+			<!--  <variable id='$language' type='choice'>$languageExceptions|$_language_cldr</variable> -->
+			<variable id='$casing' type='choice'>titlecase-words titlecase-firstword lowercase-words mixed</variable>
+			<!-- allow may expand in future to a space separated list i.e. ((newitem)?( )?)?(verbatim)? -->
+			<variable id='$allow' type='regex'>(verbatim)</variable>
+			<variable id='$alt' type='regex'>((stand-alone|variant|list|secondary|email|www|short|narrow|new|accounting|limitedAvailability)(-proposed.*)?|(proposed.*))</variable>
+			<variable id='$append' type='choice'>Era Year Quarter Month Week Day-Of-Week Day Hour Minute Second Timezone</variable>
+			<!-- Separate date format for currencies; some where introduced long before the 2000s -->
+			<variable id='$currencyDate' type='regex'>([12][0-9][0-9][0-9])-((0[0-9])|1[0-2])-([0-2][0-9]|3[01])</variable>
+			<variable id='$date' type='regex'>-?[0-9]{1,4}-[0-9]{1,2}-[0-9]{1,2}</variable>
+			<variable id='$dateRecent' type='regex'>20[0-9][0-9]-([0-9]|1[0-2])-([12][0-9]|3[01])</variable>
+			<variable id='$time' type='regex'>([01][0-9]|2[0-4]):[0-5][0-9]</variable>
+			<variable id='$timeHour' type='regex'>([01]?[0-9]|2[0-4]):00</variable>
+			<variable id='$datetime' type='regex'>[0-9]{4}-[0-9]{1,2}-[0-9]{1,2}\s([01][0-9]|2[0-4]):[0-5][0-9]</variable>
+			<variable id='$double' type='regex'>[0-9]+(\.[0-9]+)?</variable>
+			<variable id='$integer' type='regex'>[0-9]+</variable>
+			<variable id='$format' type='choice'>standard</variable>
+			<variable id='$fullTzid' type='TODO'/>
+			<variable id='$genDate' type='regex'>\$.*\$</variable>
+			<variable id='$locale' type='locale'/>
+			<variable id='$localeAll' type='locale'>all</variable>
+			<variable id='$reference' type='regex'>([R|S]|RP)[0-9]+</variable>
+			<variable id='$uri' type='TODO'/>
+			<!-- Certain segmentation files need underscores in variable names -->
+			<variable id='$variableID' type='regex'>[$][a-zA-Z0-9_]+</variable>
+			<variable id='$version' type='regex'>\$.*\$</variable>
+			<variable id='$versionDotted' type='regex'>[0-9]+(\.[0-9]+(\.[0-9]+)?)?</variable>
+			<variable id='$emoji' type='unicodeSet'>[©®‼⁉™ℹ↔-↙↩↪⌚⌛⌨⏏⏩-⏳⏸-⏺ Ⓜ▪▫▶◀◻-◾☀-☄☎☑☔☕☘☝☠☢☣☦ ☪☮☯☸-☺♈-♓♠♣♥♦♨♻♿⚒-⚔⚖⚗ ⚙⚛⚜⚠⚡⚪⚫⚰⚱⚽⚾⛄⛅⛈⛎⛏⛑⛓⛔⛩⛪ ⛰-⛵⛷-⛺⛽✂✅✈-✍✏✒✔✖✝✡✨✳✴
+				❄❇❌❎❓-❕❗❣❤➕-➗➡➰➿⤴⤵⬅-⬇ ⬛⬜⭐⭕〰〽㊗㊙🀄🃏🅰🅱🅾🅿🆎🆑-🆚🈁🈂🈚 🈯🈲-🈺🉐🉑🌀-🌡🌤-🎓🎖🎗🎙-🎛🎞-🏰🏳-🏵 🏷-📽📿-🔽🕉-🕎🕐-🕧🕯🕰🕳-🕹🖇🖊-🖍
+				🖐🖕🖖🖥🖨🖱🖲🖼🗂-🗄🗑-🗓🗜-🗞🗡🗣🗯🗳 🗺-🙏🚀-🛅🛋-🛐🛠-🛥🛩🛫🛬🛰🛳🤐-🤘🦀-🦄
+				🧀{#⃣}{*⃣}{0⃣}{1⃣}{2⃣}{3⃣}{4⃣}{5⃣}{6⃣}{7⃣}{8⃣}{9⃣}{☝🏻}{☝🏼}{☝🏽}{☝🏾}{☝🏿}{✊🏻}{✊🏼}{✊🏽}{✊🏾}{✊🏿}{✋🏻}{✋🏼}{✋🏽}{✋🏾}{✋🏿}{✌🏻}{✌🏼}{✌🏽}{✌🏾}{✌🏿}{✍🏻}{✍🏼}{✍🏽}{✍🏾}{✍🏿}{🇦🇨}{🇦🇩}{🇦🇪}{🇦🇫}{🇦🇬}{🇦🇮}{🇦🇱}{🇦🇲}{🇦🇴}{🇦🇶}{🇦🇷}{🇦🇸}{🇦🇹}{🇦🇺}{🇦🇼}{🇦🇽}{🇦🇿}{🇧🇦}{🇧🇧}{🇧🇩}{🇧🇪}{🇧🇫}{🇧🇬}{🇧🇭}{🇧🇮}{🇧🇯}{🇧🇱}{🇧🇲}{🇧🇳}{🇧🇴}{🇧🇶}{🇧🇷}{🇧🇸}{🇧🇹}{🇧🇻}{🇧🇼}{🇧🇾}{🇧🇿}{🇨🇦}{🇨🇨}{🇨🇩}{🇨🇫}{🇨🇬}{🇨🇭}{🇨🇮}{🇨🇰}{🇨🇱}{🇨🇲}{🇨🇳}{🇨🇴}{🇨🇵}{🇨🇷}{🇨🇺}{🇨🇻}{🇨🇼}{🇨🇽}{🇨🇾}{🇨🇿}{🇩🇪}{🇩🇬}{🇩🇯}{🇩🇰}{🇩🇲}{🇩🇴}{🇩🇿}{🇪🇦}{🇪🇨}{🇪🇪}{🇪🇬}{🇪🇭}{🇪🇷}{🇪🇸}{🇪🇹}{🇪🇺}{🇫🇮}{🇫🇯}{🇫🇰}{🇫🇲}{🇫🇴}{🇫🇷}{🇬🇦}{🇬🇧}{🇬🇩}{🇬🇪}{🇬🇫}{🇬🇬}{🇬🇭}{🇬🇮}{🇬🇱}{🇬🇲}{🇬🇳}{🇬🇵}{🇬🇶}{🇬🇷}{🇬🇸}{🇬🇹}{🇬🇺}{🇬🇼}{🇬🇾}{🇭🇰}{🇭🇲}{🇭🇳}{🇭🇷}{🇭🇹}{🇭🇺}{🇮🇨}{🇮🇩}{🇮🇪}{🇮🇱}{🇮🇲}{🇮🇳}{🇮🇴}{🇮🇶}{🇮🇷}{🇮🇸}{🇮🇹}{🇯🇪}{🇯🇲}{🇯🇴}{🇯🇵}{🇰🇪}{🇰🇬}{🇰🇭}{🇰🇮}{🇰🇲}{🇰🇳}{🇰🇵}{🇰🇷}{🇰🇼}{🇰🇾}{🇰🇿}{🇱🇦}{🇱🇧}{🇱🇨}{🇱🇮}{🇱🇰}{🇱🇷}{🇱🇸}{🇱🇹}{🇱🇺}{🇱🇻}{🇱🇾}{🇲🇦}{🇲🇨}{🇲🇩}{🇲🇪}{🇲🇫}{🇲🇬}{🇲🇭}{🇲🇰}{🇲🇱}{🇲🇲}{🇲🇳}{🇲🇴}{🇲🇵}{🇲🇶}{🇲🇷}{🇲🇸}{🇲🇹}{🇲🇺}{🇲🇻}{🇲🇼}{🇲🇽}{🇲🇾}{🇲🇿}{🇳🇦}{🇳🇨}{🇳🇪}{🇳🇫}{🇳🇬}{🇳🇮}{🇳🇱}{🇳🇴}{🇳🇵}{🇳🇷}{🇳🇺}{🇳🇿}{🇴🇲}{🇵🇦}{🇵🇪}{🇵🇫}{🇵🇬}{🇵🇭}{🇵🇰}{🇵🇱}{🇵🇲}{🇵🇳}{🇵🇷}{🇵🇸}{🇵🇹}{🇵🇼}{🇵🇾}{🇶🇦}{🇷🇪}{🇷🇴}{🇷🇸}{🇷🇺}{🇷🇼}{🇸🇦}{🇸🇧}{🇸🇨}{🇸🇩}{🇸🇪}{🇸🇬}{🇸🇭}{🇸🇮}{🇸🇯}{🇸🇰}{🇸🇱}{🇸🇲}{🇸🇳}{🇸🇴}{🇸🇷}{🇸🇸}{🇸🇹}{🇸🇻}{🇸🇽}{🇸🇾}{🇸🇿}{🇹🇦}{🇹🇨}{🇹🇩}{🇹🇫}{🇹🇬}{🇹🇭}{🇹🇯}{🇹🇰}{🇹🇱}{🇹🇲}{🇹🇳}{🇹🇴}{🇹🇷}{🇹🇹}{🇹🇻}{🇹🇼}{🇹🇿}{🇺🇦}{🇺🇬}{🇺🇲}{🇺🇸}{🇺🇾}{🇺🇿}{🇻🇦}{🇻🇨}{🇻🇪}{🇻🇬}{🇻🇮}{🇻🇳}{🇻🇺}{🇼🇫}{🇼🇸}{🇽🇰}{🇾🇪}{🇾🇹}{🇿🇦}{🇿🇲}{🇿🇼}{🎅🏻}{🎅🏼}{🎅🏽}{🎅🏾}{🎅🏿}{🏂🏻}{🏂🏼}{🏂🏽}{🏂🏾}{🏂🏿}{🏃🏻}{🏃🏼}{🏃🏽}{🏃🏾}{🏃🏿}{🏄🏻}{🏄🏼}{🏄🏽}{🏄🏾}{🏄🏿}{🏇🏻}{🏇🏼}{🏇🏽}{🏇🏾}{🏇🏿}{🏊🏻}{🏊🏼}{🏊🏽}{🏊🏾}{🏊🏿}{👂🏻}{👂🏼}{👂🏽}{👂🏾}{👂🏿}{👃🏻}{👃🏼}{👃🏽}{👃🏾}{👃🏿}{👆🏻}{👆🏼}{👆🏽}{👆🏾}{👆🏿}{👇🏻}{👇🏼}{👇🏽}{👇🏾}{👇🏿}{👈🏻}{👈🏼}{👈🏽}{👈🏾}{👈🏿}{👉🏻}{👉🏼}{👉🏽}{👉🏾}{👉🏿}{👊🏻}{👊🏼}{👊🏽}{👊🏾}{👊🏿}{👋🏻}{👋🏼}{👋🏽}{👋🏾}{👋🏿}{👌🏻}{👌🏼}{👌🏽}{👌🏾}{👌🏿}{👍🏻}{👍🏼}{👍🏽}{👍🏾}{👍🏿}{👎🏻}{👎🏼}{👎🏽}{👎🏾}{👎🏿}{👏🏻}{👏🏼}{👏🏽}{👏🏾}{👏🏿}{👐🏻}{👐🏼}{👐🏽}{👐🏾}{👐🏿}{👦🏻}{👦🏼}{👦🏽}{👦🏾}{👦🏿}{👧🏻}{👧🏼}{👧🏽}{👧🏾}{👧🏿}{👨
+				‍❤‍👨}{👨‍❤‍💋‍👨}{👨‍👨‍👦}{👨 ‍👨‍👦‍👦}{👨‍👨‍👧}{👨‍👨‍👧‍ 👦}{👨‍👨‍👧‍👧}{👨‍👩‍👦}{👨‍ 👩‍👦‍👦}{👨‍👩‍👧}{👨‍👩‍👧‍👦}{👨
+				‍👩‍👧‍👧}{👨🏻}{👨🏼}{👨🏽}{👨🏾}{👨🏿}{👩 ‍❤‍👩}{👩‍❤‍💋‍👩}{👩‍👩‍👦}{👩 ‍👩‍👦‍👦}{👩‍👩‍👧}{👩‍👩‍👧‍
+				👦}{👩‍👩‍👧‍👧}{👩🏻}{👩🏼}{👩🏽}{👩🏾}{👩🏿}{👮🏻}{👮🏼}{👮🏽}{👮🏾}{👮🏿}{👰🏻}{👰🏼}{👰🏽}{👰🏾}{👰🏿}{👱🏻}{👱🏼}{👱🏽}{👱🏾}{👱🏿}{👲🏻}{👲🏼}{👲🏽}{👲🏾}{👲🏿}{👳🏻}{👳🏼}{👳🏽}{👳🏾}{👳🏿}{👴🏻}{👴🏼}{👴🏽}{👴🏾}{👴🏿}{👵🏻}{👵🏼}{👵🏽}{👵🏾}{👵🏿}{👶🏻}{👶🏼}{👶🏽}{👶🏾}{👶🏿}{👷🏻}{👷🏼}{👷🏽}{👷🏾}{👷🏿}{👸🏻}{👸🏼}{👸🏽}{👸🏾}{👸🏿}{👼🏻}{👼🏼}{👼🏽}{👼🏾}{👼🏿}{💁🏻}{💁🏼}{💁🏽}{💁🏾}{💁🏿}{💂🏻}{💂🏼}{💂🏽}{💂🏾}{💂🏿}{💃🏻}{💃🏼}{💃🏽}{💃🏾}{💃🏿}{💅🏻}{💅🏼}{💅🏽}{💅🏾}{💅🏿}{💆🏻}{💆🏼}{💆🏽}{💆🏾}{💆🏿}{💇🏻}{💇🏼}{💇🏽}{💇🏾}{💇🏿}{💪🏻}{💪🏼}{💪🏽}{💪🏾}{💪🏿}{🖐🏻}{🖐🏼}{🖐🏽}{🖐🏾}{🖐🏿}{🖕🏻}{🖕🏼}{🖕🏽}{🖕🏾}{🖕🏿}{🖖🏻}{🖖🏼}{🖖🏽}{🖖🏾}{🖖🏿}{🙅🏻}{🙅🏼}{🙅🏽}{🙅🏾}{🙅🏿}{🙆🏻}{🙆🏼}{🙆🏽}{🙆🏾}{🙆🏿}{🙇🏻}{🙇🏼}{🙇🏽}{🙇🏾}{🙇🏿}{🙋🏻}{🙋🏼}{🙋🏽}{🙋🏾}{🙋🏿}{🙌🏻}{🙌🏼}{🙌🏽}{🙌🏾}{🙌🏿}{🙍🏻}{🙍🏼}{🙍🏽}{🙍🏾}{🙍🏿}{🙎🏻}{🙎🏼}{🙎🏽}{🙎🏾}{🙎🏿}{🙏🏻}{🙏🏼}{🙏🏽}{🙏🏾}{🙏🏿}{🚣🏻}{🚣🏼}{🚣🏽}{🚣🏾}{🚣🏿}{🚴🏻}{🚴🏼}{🚴🏽}{🚴🏾}{🚴🏿}{🚵🏻}{🚵🏼}{🚵🏽}{🚵🏾}{🚵🏿}{🚶🏻}{🚶🏼}{🚶🏽}{🚶🏾}{🚶🏿}{🛀🏻}{🛀🏼}{🛀🏽}{🛀🏾}{🛀🏿}{🤘🏻}{🤘🏼}{🤘🏽}{🤘🏾}{🤘🏿}]</variable>
+			<variable id='$percent' type='regex'>0|[1-9][0-9]?|100</variable>
+			<variable id='$percentFraction' type='regex'>(0|[1-9][0-9]?)(\.[0-9]+)?|100</variable>
+			<variable id='$subdivisionSuffix' type='regex'>[0-9A-Z]{0,3}</variable>
+			<variable id='$digit' type='regex'>(\p{Nd}|[〇一二三四五六七八九])+</variable>
+			<variable id='$hourStyle' type='regex'>[HKhk]</variable>
+			<variable id='$internet' type='regex'>[A-Z]+|XN--[A-Z0-9]+([-][A-Z0-9]+)*</variable>
+			<variable id='$coverageSpecial' type='choice'>* Cldr:modern</variable>
+			<variable id='$collationPrivate' type='choice'>digits-after private-unihan private-kana private-pinyin</variable>
+			<variable id='$languageDeprecated' type='choice'>no sh tw tl fat in mo ji iw jw</variable>
+			<variable id='$localeOrDeprecated'>$locale|$languageDeprecated</variable>
+			<variable id='$name' type='regex'>[a-zA-Z]+([-_][a-zA-Z]+)*[.]?|\d+|\([A-Z][a-z]+\)</variable>
+			<variable id='$defaultCurrencyInfo' type='choice'>DEFAULT</variable>
+			<variable id='$utc' type='regex'>UTC[-+]\d+</variable>
+			<variable id='$AX' type='choice'>AX</variable>
+			<variable id='$skipDefaultLocale' type='choice'>segmentation collation</variable>
+			<variable id='$transformId' type='choice'> Amharic Any Arabic Armenian Azerbaijani Belarusian Bengali Bulgarian Cyrillic Devanagari Fullwidth
+				Georgian Greek Gujarati Gurmukhi Han Hangul Hebrew Hiragana IPA InterIndic Jamo Kannada Katakana Kazakh Kirghiz Korean Latin Macedonian Malayalam
+				Maldivian Mongolian Oriya Pashto Persian Pinyin Russian Serbian Simplified Syriac Tamil Telugu Thai ThaiLogical Turkmen Ukrainian Uzbek az ch cs
+				cs_FONIPA dsb el es es_419 es_FONIPA it ja_Latn la lt nl pl pl_FONIPA ro ro_FONIPA ru sk sk_FONIPA tlh tr ug uz_Cyrl yo zh_Latn_PINYIN ASCII
+				Accents Armenian Bengali Bopomofo CanadianAboriginal ConjoiningJamo Devanagari Ethiopic Gujarati Gurmukhi Halfwidth Hangul InterIndic Jamo Kannada
+				Katakana Latin Lower Malayalam NumericPinyin Oriya Publishing Spacedhan Tamil Telugu Thaana Thai ThaiLogical ThaiSemi Title Traditional Upper
+				XSampa am ch_FONIPA cs_FONIPA dsb_FONIPA es_419_FONIPA es_FONIPA ja ko la_FONIPA pl_FONIPA ro_FONIPA ru sk_FONIPA tlh_FONIPA uz_Latn yo_BJ zh</variable>
+			<attributeValues attributes='alt' type='choice'>$alt</attributeValues>
+			<attributeValues attributes='_q' type='choice'>$integer</attributeValues>
+			<attributeValues attributes='validSubLocales' type='list'>$locale</attributeValues>
+			<attributeValues dtds='ldml' elements='alias' attributes='path' type='TODO'/>
+			<attributeValues dtds='ldml' elements='alias' attributes='source' type='choice'>locale</attributeValues>
+			<!-- <attributeValues dtds='ldml' elements='alternate' attributes='iso4217' type='bcp47'>cu</attributeValues> -->
+			<attributeValues dtds='ldml' elements='appendItem' attributes='request'>$append</attributeValues>
+			<attributeValues dtds='ldml' elements='calendar' attributes='type'>$_bcp47_ca</attributeValues>
+			<attributeValues dtds='supplementalData' elements='character' attributes='value' type='regex'>.</attributeValues>
+			<attributeValues dtds='ldml' elements='collation' attributes='type'>$_bcp47_collation|$collationPrivate</attributeValues>
+			<attributeValues dtds='ldml' elements='collations' attributes='version'>$version</attributeValues>
+			<attributeValues dtds='ldml' elements='contextTransform' attributes='type' type='choice'>uiListOrMenu stand-alone</attributeValues>
+			<attributeValues dtds='ldml' elements='contextTransformUsage' attributes='type' type='regex'>[a-zA-Z-]+</attributeValues>
+			<attributeValues dtds='ldml' elements='cp' attributes='hex' type='regex'>[0-9A-Fa-f]{4,6}</attributeValues>
+			<attributeValues dtds='supplementalData' elements='currency' attributes='before from to'>$currencyDate</attributeValues>
+			<attributeValues dtds='supplementalData' elements='currency' attributes='iso4217'>$_bcp47_cu</attributeValues>
+			<attributeValues dtds='ldml' elements='currency' attributes='type'>$_bcp47_cu</attributeValues>
+			<attributeValues dtds='ldml' elements='currencyFormat' attributes='type' type='choice'>standard accounting</attributeValues>
+			<attributeValues dtds='ldml' elements='currencyFormats decimalFormats percentFormats scientificFormats' attributes='numberSystem'>$_bcp47_nu</attributeValues>
+			<attributeValues dtds='ldml' elements='cyclicName' attributes='type' type='regex'>[0-9]+</attributeValues>
+			<attributeValues dtds='ldml' elements='cyclicNameContext' attributes='type' order='given'>format stand-alone</attributeValues>
+			<attributeValues dtds='ldml' elements='cyclicNameSet' attributes='type' type='choice'>years months days dayParts zodiacs solarTerms</attributeValues>
+			<attributeValues elements='dateFormat dateTimeFormat decimalFormat percentFormat scientificFormat timeFormat' attributes='type'>$format</attributeValues>
+			<attributeValues
+				elements='dateFormatLength timeFormatLength dateTimeFormatLength decimalFormatLength scientificFormatLength percentFormatLength currencyFormatLength'
+				attributes='type' order='given'>full long medium short</attributeValues>
+			<attributeValues dtds='ldml' elements='day' attributes='type' order='given'>sun mon tue wed thu fri sat</attributeValues>
+			<attributeValues dtds='ldml' elements='dayWidth' attributes='type' order='given'>abbreviated narrow short wide</attributeValues>
+			<attributeValues dtds='ldml' elements='default' attributes='type' type='choice'>format gregorian long medium pinyin standard stroke wide</attributeValues>
+			<attributeValues dtds='ldml' elements='era' attributes='type' type='regex'>[0-9]+</attributeValues>
+			<attributeValues dtds='ldml' elements='field' attributes='type' order='given'>era year year-short year-narrow quarter quarter-short
+				quarter-narrow month month-short month-narrow week week-short week-narrow day day-short day-narrow weekday dayperiod hour hour-short hour-narrow
+				minute minute-short minute-narrow second second-short second-narrow zone sun sun-short sun-narrow mon mon-short mon-narrow tue tue-short
+				tue-narrow wed wed-short wed-narrow thu thu-short thu-narrow fri fri-short fri-narrow sat sat-short sat-narrow</attributeValues>
+			<attributeValues dtds='ldml' elements='firstDay weekendEnd weekendStart' attributes='day' order='given'>sun mon tue wed thu fri sat</attributeValues>
+			<attributeValues dtds='ldml' elements='generation' attributes='date'>$genDate</attributeValues>
+			<attributeValues dtds='supplementalData' elements='group' attributes='contains' type='list'>$_region</attributeValues>
+			<attributeValues dtds='supplementalData' elements='hours' attributes='allowed' type='list'>$hourStyle</attributeValues>
+			<attributeValues dtds='supplementalData' elements='hours' attributes='preferred' type='regex'>$hourStyle</attributeValues>
+			<attributeValues dtds='supplementalData' elements='hours' attributes='regions' type='list'>$_region</attributeValues>
+			<attributeValues dtds='supplementalData' elements='info' attributes='digits' type='regex'>[0-9]+</attributeValues>
+			<attributeValues dtds='supplementalData' elements='info' attributes='iso4217'>$_bcp47_currency|$defaultCurrencyInfo</attributeValues>
+			<attributeValues dtds='supplementalData' elements='info' attributes='rounding' type='regex'>[0-9]+</attributeValues>
+			<attributeValues dtds='ldml' elements='key' attributes='type'>$_bcp47_keys</attributeValues>
+			<attributeValues dtds='supplementalData' elements='language' attributes='scripts' type='list'>$_script</attributeValues>
+			<attributeValues dtds='supplementalData' elements='language' attributes='territories' type='list'>$_region</attributeValues>
+			<attributeValues dtds='ldml' elements='language' attributes='type'>$localeOrDeprecated</attributeValues>
+			<attributeValues dtds='supplementalData' elements='language' attributes='variants'>$_variant</attributeValues>
+			<attributeValues dtds='supplementalData' elements='languageAlias' attributes='replacement' type='locale'/>
+			<attributeValues dtds='supplementalData' elements='languageAlias' attributes='type' type='regex'>[a-zA-Z0-9]{1,3}(_[A-Za-z0-9]{2,8})*</attributeValues>
+			<!-- <attributeValues dtds='ldml' elements='ldml' attributes='version'>$version</attributeValues> -->
+			<attributeValues dtds='supplementalData' elements='mapTimezones' attributes='type' type='regex'>.+</attributeValues>
+			<attributeValues dtds='supplementalData' elements='mapZone' attributes='type' type='list'>$_bcp47_timezone</attributeValues>
+			<attributeValues dtds='ldml' elements='mapping' attributes='registry' type='choice'>iana</attributeValues>
+			<attributeValues dtds='ldml' elements='mapping' attributes='type' type='choice'>utf-8</attributeValues>
+			<attributeValues dtds='supplementalData' elements='numberingSystem' attributes='id'>$_bcp47_numbers</attributeValues>
+			<attributeValues dtds='supplementalData' elements='numberingSystem' attributes='type' type='choice'>algorithmic numeric</attributeValues>
+			<attributeValues dtds='ldml' elements='minDays' attributes='count' type='regex'>[0-7]</attributeValues>
+			<attributeValues dtds='ldml' elements='month' attributes='type' type='choice'>1 2 3 4 5 6 7 8 9 10 11 12 13</attributeValues>
+			<attributeValues dtds='ldml' elements='monthPattern' attributes='type' type='choice'>leap standardAfterLeap combined</attributeValues>
+			<attributeValues dtds='ldml' elements='monthPatternContext' attributes='type' order='given'>format stand-alone numeric</attributeValues>
+			<attributeValues dtds='ldml' elements='monthPatternWidth' attributes='type' type='choice'>abbreviated narrow wide all</attributeValues>
+			<attributeValues dtds='ldml' elements='monthWidth quarterWidth cyclicNameWidth' attributes='type' order='given'>abbreviated narrow wide</attributeValues>
+			<attributeValues dtds='ldml' elements='pattern' attributes='type' type='choice'>standard atLeast range 1000 10000 100000 1000000 10000000
+				10000000 100000000 1000000000 10000000000 100000000000 1000000000000 10000000000000 100000000000000</attributeValues>
+			<attributeValues dtds='ldml' elements='preferenceOrdering' attributes='type' type='list'>$_bcp47_timezone</attributeValues>
+			<attributeValues dtds='ldml' elements='quarter' attributes='type' type='choice'>1 2 3 4</attributeValues> <!-- move to DTD? -->
+			<attributeValues dtds='ldml' elements='reference' attributes='type'>$reference</attributeValues>
+			<attributeValues dtds='supplementalData' elements='region' attributes='iso3166'>$_region</attributeValues>
+			<attributeValues dtds='ldml' elements='relative' attributes='type' type='regex'>-?[0-9]+</attributeValues>
+			<attributeValues dtds='ldml' elements='relativeTime' attributes='type' type='choice'>future past</attributeValues>
+			<attributeValues dtds='ldml' elements='reset' attributes='before' type='choice'>primary secondary tertiary</attributeValues> <!-- move to DTD? -->
+			<attributeValues dtds='ldml' elements='rule' attributes='id'>$double</attributeValues>
+			<attributeValues dtds='ldml' elements='script' attributes='type'>$_script|$scriptNonUnicode</attributeValues>
+			<attributeValues dtds='supplementalData' elements='scriptAlias' attributes='replacement'>$_script</attributeValues>
+			<attributeValues dtds='supplementalData' elements='scriptAlias' attributes='type'>$_script</attributeValues>
+			<attributeValues dtds='ldml' elements='segmentation' attributes='type' type='choice'>GraphemeClusterBreak LineBreak SentenceBreak WordBreak</attributeValues>
+			<attributeValues dtds='ldml' elements='symbols' attributes='numberSystem'>$_bcp47_nu</attributeValues>
+			<attributeValues dtds='ldml' elements='territory' attributes='type'>$_region</attributeValues>
+			<attributeValues dtds='supplementalData' elements='territoryAlias' attributes='type' type='regex'>[A-Z]{2,3}|[0-9]{3}</attributeValues>
+			<attributeValues dtds='supplementalData' elements='territoryAlias' attributes='replacement' type='list'>$_region</attributeValues>
+			<attributeValues dtds='ldml' elements='type' attributes='key'>$_bcp47_keys</attributeValues>
+			<!-- there is special code for this case <attributeValues dtds='ldml' elements='type' attributes='type' >$_bcp47_use-key</attributeValues> -->
+			<attributeValues dtds='ldml' elements='unit' attributes='type' type='choice'>$_unit</attributeValues>
+			<attributeValues dtds='ldml' elements='variable' attributes='id'>$variableID</attributeValues>
+			<attributeValues dtds='ldml' elements='variant' attributes='type'>$_variant</attributeValues>
+			<attributeValues dtds='supplementalData' elements='variantAlias' attributes='type' type='regex'>[A-Za-z0-9]{4,8}</attributeValues>
+			<attributeValues dtds='supplementalData' elements='variantAlias' attributes='replacement'>$_variant|$AX</attributeValues>
+			<attributeValues dtds='ldml' elements='version' attributes='number' type='choice'>$version</attributeValues>
+			<attributeValues dtds='ldml' elements='weekendEnd weekendStart' attributes='time'>$time</attributeValues>
+			<attributeValues dtds='ldml' elements='zone' attributes='type'>$_bcp47_timezone</attributeValues>
+			<attributeValues dtds='supplementalData' elements='zoneFormatting' attributes='multizone'>$_region</attributeValues>
+			<attributeValues dtds='supplementalData' elements='zoneItem' attributes='aliases' type='list'>$_bcp47_timezone</attributeValues>
+			<attributeValues dtds='supplementalData' elements='zoneItem' attributes='territory'>$_region</attributeValues>
+			<attributeValues dtds='supplementalData' elements='zoneItem' attributes='type'>$_bcp47_timezone</attributeValues>
+			<attributeValues dtds='ldml' elements='annotation' attributes='cp' type='unicodeSet'>$emoji</attributeValues>
+			<attributeValues dtds='ldml' elements='annotation' attributes='tts' type='TODO'>$exemplar</attributeValues>
+			<attributeValues dtds='ldml' elements='casingItem' attributes='type' type='choice'>calendar_field currencyName currencyName_count
+				day_format_except_narrow day_narrow day_standalone_except_narrow era_abbr era_name era_narrow key keyValue language metazone_long
+				month_format_except_narrow month_narrow month_standalone_except_narrow quarter_abbreviated quarter_format_wide quarter_narrow
+				quarter_standalone_wide relative script symbol territory unit_pattern variant zone_exemplarCity zone_long zone_short</attributeValues>
+			<attributeValues dtds='ldml' elements='codePattern' attributes='type' type='choice'>language script territory</attributeValues>
+			<attributeValues dtds='ldml' elements='collation' attributes='references' type='TODO'/> <!-- ?? -->
+			<attributeValues dtds='ldml' elements='compoundUnit' attributes='type' type='choice'>per</attributeValues>
+			<attributeValues dtds='ldml' elements='dateFormatItem' attributes='id' type='choice'>E EEEEd EHm EHms Ed Ehm Ehms Gy GyM
+				GyMMM GyMMMEEEEd GyMMMEd GyMMMM GyMMMMEd GyMMMMd GyMMMd GyMd H HHmm HHmmZ HHmmss Hm HmZ Hmm Hms Hmsv Hmsvvvv Hmv M MEEEEd MEd MMM MMMEEEEd MMMEd
+				MMMM MMMMEEEEd MMMMEd MMMMd MMMMdd MMMd MMMdd MMd MMdd Md Mdd UM UMMM UMMMd UMd d h hhmm hhmmss hm hms hmsv hmsvvvv hmv mmss ms y yM yMEEEEd
+				yMEd yMM yMMM yMMMEEEEd yMMMEd yMMMM yMMMMEEEEd yMMMMEd yMMMMccccd yMMMMd yMMMd yMMdd yMd yQ yQQQ yQQQQ yyyy yyyyM yyyyMEEEEd yyyyMEd yyyyMM
+				yyyyMMM yyyyMMMEEEEd yyyyMMMEd yyyyMMMM yyyyMMMMEd yyyyMMMMccccd yyyyMMMMd yyyyMMMd yyyyMMdd yyyyMd yyyyQQQ yyyyQQQQ</attributeValues>
+			<attributeValues dtds='ldml' elements='dayPeriodContext' attributes='type' type='choice'>format stand-alone</attributeValues>
+			<attributeValues dtds='ldml' elements='durationUnit' attributes='type' type='choice'>hm hms ms</attributeValues>
+			<attributeValues dtds='ldml' elements='greatestDifference' attributes='id' type='choice'>H M a d h m y</attributeValues>
+			<attributeValues dtds='ldml' elements='intervalFormatItem' attributes='id' type='choice'>H Hm Hmv Hv M MEd MMM MMMEEEEd MMMEd MMMM MMMMEd
+				MMMMd MMMd Md d h hm hmv hv y yM yMEd yMMM yMMMEEEEd yMMMEd yMMMM yMMMMEEEEd yMMMMEd yMMMMd yMMMd yMd</attributeValues>
+			<attributeValues dtds='ldml' elements='listPattern' attributes='type' type='choice'>unit unit-narrow unit-short</attributeValues>
+			<attributeValues dtds='ldml' elements='metazone' attributes='type' type='TODO'>$metazone</attributeValues>
+			<attributeValues dtds='ldml' elements='miscPatterns' attributes='numberSystem'>$_bcp47_nu</attributeValues>
+			<attributeValues dtds='ldml' elements='pattern' attributes='numbers' type='choice'>M=romanlow d=hanidays hanidec hebr</attributeValues>
+			<attributeValues dtds='ldml' elements='rbnfrule' attributes='radix' type='choice'>1,000 100 1000 100000 160,000 20 3,200,000 400 5
+				64,000,000 8000</attributeValues>
+			<attributeValues dtds='ldml' elements='rbnfrule' attributes='value' type='regex'>x|x.x|0.x|-x|0|[1-9][0-9]*</attributeValues>
+			<attributeValues dtds='ldml' elements='ruleset' attributes='type' type='regex'>[a-z0-9]+([-_][a-z0-9]+)*</attributeValues>
+			<attributeValues dtds='ldml' elements='rulesetGrouping' attributes='type' type='choice'>NumberingSystemRules OrdinalRules SpelloutRules</attributeValues>
+			<attributeValues dtds='ldml' elements='suppressions' attributes='type' type='choice'>standard</attributeValues>
+			<attributeValues dtds='ldml' elements='transformName' attributes='type' type='choice'>BGN Numeric Tone UNGEGN x-Accents x-Fullwidth
+				x-Halfwidth x-Jamo x-Pinyin x-Publishing</attributeValues>
+			<attributeValues dtds='ldml' elements='type' attributes='type' type='choice'>$_bcp47_value</attributeValues>
+			<attributeValues dtds='ldml' elements='version' attributes='cldrVersion' type='choice'>$double</attributeValues>
+			<attributeValues dtds='supplementalData' elements='approvalRequirement' attributes='locales' type='list'>$locale|$coverageSpecial</attributeValues>
+			<attributeValues dtds='supplementalData' elements='approvalRequirement' attributes='paths' type='TODO'/>
+			<attributeValues dtds='supplementalData' elements='approvalRequirement' attributes='votes' type='choice'>20 4 8</attributeValues>
+			<attributeValues dtds='supplementalData' elements='attributeValues' attributes='attributes' type='choice'>_q aliases allowed alt before
+				before from to contains type count date day digits hex id iso3166 iso4217 key multizone number numberSystem path preferred regions registry
+				replacement replacement type request rounding scripts source territories territory time type uri validSubLocales value variants version</attributeValues>
+			<attributeValues dtds='supplementalData' elements='attributeValues' attributes='dtds' type='choice'>supplementalData</attributeValues>
+			<attributeValues dtds='supplementalData' elements='attributeValues' attributes='elements' type='choice'>alias appendItem calendar character
+				collation collations contextTransform contextTransformUsage cp currency currencyFormat currencyFormats decimalFormats percentFormats
+				scientificFormats cyclicName cyclicNameContext cyclicNameSet dateFormat dateTimeFormat decimalFormat percentFormat scientificFormat timeFormat
+				dateFormatLength timeFormatLength dateTimeFormatLength decimalFormatLength scientificFormatLength percentFormatLength currencyFormatLength day
+				dayWidth default era field firstDay weekendEnd weekendStart generation group hours info key language languageAlias mapTimezones mapZone mapping
+				minDays month monthPattern monthPatternContext monthPatternWidth monthWidth quarterWidth cyclicNameWidth numberingSystem pattern
+				preferenceOrdering quarter reference region relative relativeTime reset rule script scriptAlias segmentation supplementalData symbols territory
+				territoryAlias type unit variable variant variantAlias version weekendEnd weekendStart zone zoneFormatting zoneItem</attributeValues>
+			<attributeValues dtds='supplementalData' elements='attributeValues' attributes='order' type='choice'>given</attributeValues>
+			<attributeValues dtds='supplementalData' elements='attributeValues' attributes='type' type='choice'>bcp47 choice list locale path regex</attributeValues>
+			<attributeValues dtds='supplementalData' elements='attributes' attributes='attribute' type='choice'>_q characters lines time type version</attributeValues>
+			<attributeValues dtds='supplementalData' elements='attributes' attributes='attributeValue' type='choice'>00:00 24:00 left-to-right standard
+				top-to-bottom</attributeValues>
+			<attributeValues dtds='supplementalData' elements='attributes' attributes='element' type='choice'>collation currency dateFormat
+				dateTimeFormat decimalFormat ldml orientation pattern percentFormat scientificFormat timeFormat weekendEnd weekendStart</attributeValues>
+			<attributeValues dtds='supplementalData' elements='blockingItems' attributes='elements' type='list'>identity supplementalData cldrTest
+				collation transform identity supplementalData cldrTest collation transform</attributeValues>
+			<attributeValues dtds='supplementalData' elements='calendar' attributes='type' type='regex'>$_bcp47_calendar</attributeValues>
+			<attributeValues dtds='supplementalData' elements='calendarPreference' attributes='ordering' type='list'>$_bcp47_calendar</attributeValues>
+			<attributeValues dtds='supplementalData' elements='calendarPreference' attributes='territories' type='list'>$_region</attributeValues>
+			<attributeValues dtds='supplementalData' elements='codesByTerritory' attributes='territory' type='choice'>001 AC AD AE AF AG AI AL AM AO AQ
+				AR AS AT AU AW AX AZ BA BB BD BE BF BG BH BI BJ BL BM BN BO BQ BR BS BT BW BY BZ CA CC CD CF CG CH CI CK CL CM CN CO CR CU CV CW CX CY CZ DE DJ DK
+				DM DO DZ EC EE EG EH ER ES ET FI FJ FK FM FO FR GA GB GD GE GF GG GH GI GL GM GN GP GQ GR GS GT GU GW GY HK HN HR HT HU ID IE IL IM IN IO IQ IR IS
+				IT JE JM JO JP KE KG KH KI KM KN KP KR KW KY KZ LA LB LC LI LK LR LS LT LU LV LY MA MC MD ME MF MG MH MK ML MM MN MO MP MQ MR MS MT MU MV MW MX MY
+				MZ NA NC NE NF NG NI NL NO NP NR NU NZ OM PA PE PF PG PH PK PL PM PN PR PS PT PW PY QA RE RO RS RU RW SA SB SC SD SE SG SH SI SJ SK SL SM SN SO SR
+				SS ST SV SX SY SZ TC TD TF TG TH TJ TK TL TM TN TO TR TT TV TW TZ UA UG UM US UY UZ VA VC VE VG VI VN VU WF WS XK YE YT ZA ZM ZW</attributeValues>
+			<attributeValues dtds='supplementalData' elements='coverageLevel' attributes='inLanguage' type='choice'>%CJK_Languages %arabextLanguages
+				%collationType80TopLangs %devaLanguages %phonebookCollationLanguages %traditionalCollationLanguages (ja|ko|vi|zh) (ja|vi|zh) ar dz en ja ko si sv
+				vai yi zh</attributeValues>
+			<attributeValues dtds='supplementalData' elements='coverageLevel' attributes='inScript' type='choice'>Arab Armn Beng Deva Ethi Geor Grek
+				Gujr Guru Hebr Khmr Knda Laoo Mlym Mong Mymr Orya Taml Telu Thai Tibt</attributeValues>
+			<attributeValues dtds='supplementalData' elements='coverageLevel' attributes='inTerritory' type='choice'>%chineseCalendarTerritories
+				%islamicCalendarTerritories %persianCalendarTerritories AR AU BR CA CF CG CM EG ET EU GA GB ID IE IL IN JP KR KZ MX NG RU TD TH TW US</attributeValues>
+			<attributeValues dtds='supplementalData' elements='coverageLevel' attributes='match' type='TODO'/>
+			<attributeValues dtds='supplementalData' elements='coverageLevel' attributes='value' type='choice'>basic core minimal moderate modern posix</attributeValues>
+			<attributeValues dtds='supplementalData' elements='coverageVariable' attributes='key' type='TODO'/>
+			<attributeValues dtds='supplementalData' elements='coverageVariable' attributes='value' type='TODO'/>
+			<attributeValues dtds='supplementalData' elements='currencyCodes' attributes='numeric' type='regex'>0|[1-9][0-9]*</attributeValues>
+			<attributeValues dtds='supplementalData' elements='currencyCodes' attributes='type'>$_bcp47_cu</attributeValues>
+			<attributeValues dtds='supplementalData' elements='dayPeriodRule' attributes='after' type='list'>$timeHour</attributeValues>
+			<attributeValues dtds='supplementalData' elements='dayPeriodRule' attributes='at' type='list'>$timeHour</attributeValues>
+			<attributeValues dtds='supplementalData' elements='dayPeriodRule' attributes='before' type='regex'>$timeHour</attributeValues>
+			<attributeValues dtds='supplementalData' elements='dayPeriodRule' attributes='from' type='regex'>$timeHour</attributeValues>
+			<attributeValues dtds='supplementalData' elements='dayPeriodRule' attributes='type' type='TODO'/>
+			<attributeValues dtds='supplementalData' elements='dayPeriodRuleSet' attributes='type' type='choice'>selection</attributeValues>
+			<attributeValues dtds='supplementalData' elements='dayPeriodRules' attributes='locales' type='list'>$locale</attributeValues>
+			<attributeValues dtds='supplementalData' elements='defaultContent' attributes='locales' type='list'>$locale</attributeValues>
+			<attributeValues dtds='supplementalData' elements='deprecatedItems' attributes='attributes' type='TODO'/>
+			<attributeValues dtds='supplementalData' elements='deprecatedItems' attributes='elements' type='TODO'/>
+			<attributeValues dtds='supplementalData' elements='deprecatedItems' attributes='values' type='TODO'/>
+			<attributeValues dtds='supplementalData' elements='distinguishingItems' attributes='attributes' type='TODO'/>
+			<attributeValues dtds='supplementalData' elements='distinguishingItems' attributes='elements' type='TODO'/>
+			<attributeValues dtds='supplementalData' elements='era' attributes='end' type='regex'>$date</attributeValues>
+			<attributeValues dtds='supplementalData' elements='era' attributes='start' type='regex'>$date</attributeValues>
+			<attributeValues dtds='supplementalData' elements='era' attributes='type' type='regex'>0|[1-9][0-9]{0,2}</attributeValues>
+			<attributeValues dtds='supplementalData' elements='firstDay' attributes='references' type='TODO'/>
+			<attributeValues dtds='supplementalData' elements='firstDay' attributes='territories' type='list'>$_region</attributeValues>
+			<attributeValues dtds='supplementalData' elements='generation' attributes='date' type='TODO'/>
+			<attributeValues dtds='supplementalData' elements='id' attributes='idStatus' type='choice'>deprecated macroregion private_use regular
+				special</attributeValues>
+			<attributeValues dtds='supplementalData' elements='id' attributes='type' type='choice'>currency language region script subdivision unit variant</attributeValues>
+			<attributeValues dtds='supplementalData' elements='info' attributes='cashDigits' type='choice'>0</attributeValues>
+			<attributeValues dtds='supplementalData' elements='info' attributes='cashRounding' type='choice'>0 5</attributeValues>
+			<attributeValues dtds='supplementalData' elements='language' attributes='type' type='TODO'/>
+			<attributeValues dtds='supplementalData' elements='languageMatch' attributes='desired' type='TODO'>$localeStar</attributeValues>
+			<attributeValues dtds='supplementalData' elements='languageMatch' attributes='percent' type='regex'>$percent</attributeValues>
+			<attributeValues dtds='supplementalData' elements='languageMatch' attributes='supported' type='TODO'>$localeStar</attributeValues>
+			<attributeValues dtds='supplementalData' elements='languageMatches' attributes='type' type='choice'>written</attributeValues>
+			<attributeValues dtds='supplementalData' elements='languagePopulation' attributes='populationPercent' type='regex'>$percentFraction</attributeValues>
+			<attributeValues dtds='supplementalData' elements='languagePopulation' attributes='references' type='regex'>R[0-9]+</attributeValues>
+			<attributeValues dtds='supplementalData' elements='languagePopulation' attributes='type' type='regex'>$locale</attributeValues>
+			<attributeValues dtds='supplementalData' elements='languagePopulation' attributes='writingPercent' type='regex'>$percent</attributeValues>
+			<attributeValues dtds='supplementalData' elements='likelySubtag' attributes='from' type='regex'>$localeAll</attributeValues>
+			<attributeValues dtds='supplementalData' elements='likelySubtag' attributes='to' type='choice'>$localeAll</attributeValues>
+			<attributeValues dtds='supplementalData' elements='mapTimezones' attributes='otherVersion' type='TODO'>7df0004</attributeValues>
+			<attributeValues dtds='supplementalData' elements='mapTimezones' attributes='typeVersion' type='TODO'>2011n 2015a</attributeValues>
+			<attributeValues dtds='supplementalData' elements='mapZone' attributes='other' type='list'>$name|$utc</attributeValues>
+			<attributeValues dtds='supplementalData' elements='mapZone' attributes='territory' type='regex'>$_region</attributeValues>
+			<attributeValues dtds='supplementalData' elements='measurementSystem' attributes='territories' type='list'>$_region</attributeValues>
+			<attributeValues dtds='supplementalData' elements='minDays' attributes='territories' type='list'>$_region</attributeValues>
+			<attributeValues dtds='supplementalData' elements='numberingSystem' attributes='digits' type='regex'>$digit</attributeValues>
+			<attributeValues dtds='supplementalData' elements='numberingSystem' attributes='rules' type='TODO'/>
+			<attributeValues dtds='supplementalData' elements='paperSize' attributes='territories' type='list'>$_region</attributeValues>
+			<attributeValues dtds='supplementalData' elements='parentLocale' attributes='locales' type='list'>$locale</attributeValues>
+			<attributeValues dtds='supplementalData' elements='parentLocale' attributes='parent' type='list'>$locale</attributeValues>
+			<attributeValues dtds='supplementalData' elements='pluralRanges' attributes='locales' type='list'>$locale</attributeValues>
+			<attributeValues dtds='supplementalData' elements='pluralRules' attributes='locales' type='list'>$localeOrDeprecated</attributeValues>
+			<attributeValues dtds='supplementalData' elements='primaryZone' attributes='iso3166' type='regex'>$_region</attributeValues>
+			<attributeValues dtds='supplementalData' elements='reference' attributes='type' type='regex'>R[0-9]+</attributeValues>
+			<attributeValues dtds='supplementalData' elements='reference' attributes='uri' type='regex'>$uri</attributeValues>
+			<attributeValues dtds='supplementalData' elements='skipDefaultLocale' attributes='services' type='list'>$skipDefaultLocale</attributeValues>
+			<attributeValues dtds='supplementalData' elements='subdivisionAlias' attributes='replacement' type='choice'>AS AW BL BQ CW GF GP GU HK MF MO
+				MP MQ NC PF PM PR RE SJ SX TF TW UM VI WF YT</attributeValues>
+			<attributeValues dtds='supplementalData' elements='subdivisionAlias' attributes='type' type='TODO'>$subdivision</attributeValues>
+			<attributeValues dtds='supplementalData' elements='subgroup' attributes='contains' type='list'>$subdivisionSuffix</attributeValues>
+			<attributeValues dtds='supplementalData' elements='subgroup' attributes='subtype' type='regex'>[0-9A-Z]{0,3}</attributeValues>
+			<attributeValues dtds='supplementalData' elements='subgroup' attributes='type' type='TODO'>$_region</attributeValues>
+			<attributeValues dtds='supplementalData' elements='telephoneCountryCode' attributes='code' type='TODO'/>
+			<attributeValues dtds='supplementalData' elements='territory' attributes='gdp' type='regex'>$integer</attributeValues>
+			<attributeValues dtds='supplementalData' elements='territory' attributes='literacyPercent' type='choice'>$percentFraction</attributeValues>
+			<attributeValues dtds='supplementalData' elements='territory' attributes='population' type='regex'>$integer</attributeValues>
+			<attributeValues dtds='supplementalData' elements='territory' attributes='type' type='TODO'>$_region</attributeValues>
+			<attributeValues dtds='supplementalData' elements='territoryCodes' attributes='alpha3' type='regex'>[A-Z]{3}</attributeValues>
+			<attributeValues dtds='supplementalData' elements='territoryCodes' attributes='fips10' type='regex'>[A-Z]{2}</attributeValues>
+			<attributeValues dtds='supplementalData' elements='territoryCodes' attributes='internet' type='list'>$internet</attributeValues>
+			<attributeValues dtds='supplementalData' elements='territoryCodes' attributes='numeric' type='regex'>[0-9]{3}</attributeValues>
+			<attributeValues dtds='supplementalData' elements='territoryCodes' attributes='type' type='TODO'>$_region</attributeValues>
+			<attributeValues dtds='supplementalData' elements='timezone' attributes='type'>$_bcp47_tz</attributeValues>
+			<attributeValues dtds='supplementalData' elements='transform' attributes='source' type='choice'>$transformId</attributeValues>
+			<attributeValues dtds='supplementalData' elements='transform' attributes='target' type='choice'>$transformId</attributeValues>
+			<attributeValues dtds='supplementalData' elements='transform' attributes='variant' type='choice'>BGN Names UNGEGN</attributeValues>
+			<attributeValues dtds='supplementalData' elements='usesMetazone' attributes='from' type='regex'>$datetime</attributeValues>
+			<attributeValues dtds='supplementalData' elements='usesMetazone' attributes='mzone' type='TODO'>$metazone</attributeValues>
+			<attributeValues dtds='supplementalData' elements='usesMetazone' attributes='to' type='choice'>$datetime</attributeValues>
+			<attributeValues dtds='supplementalData' elements='variable' attributes='id' type='regex'>\$[a-zA-Z0-9]+([-_][a-zA-Z0-9]+)?</attributeValues>
+			<attributeValues dtds='supplementalData' elements='version' attributes='cldrVersion' type='regex'>$double</attributeValues>
+			<attributeValues dtds='supplementalData' elements='version' attributes='number' type='regex'>\$Revision.*\$</attributeValues>
+			<attributeValues dtds='supplementalData' elements='version' attributes='unicodeVersion' type='regex'>\d+\.0\.0</attributeValues>
+			<attributeValues dtds='supplementalData' elements='weekendEnd' attributes='territories' type='list'>$_region</attributeValues>
+			<attributeValues dtds='supplementalData' elements='weekendStart' attributes='territories' type='list'>$_region</attributeValues>
+			<attributeValues dtds='supplementalData' elements='zoneAlias' attributes='type' type='regex'>[a-zA-Z0-9]+([/_][a-zA-Z0-9]+)*</attributeValues>
+			<attributeValues dtds='supplementalData' elements='zoneAlias' attributes='replacement'>$_bcp47_tz</attributeValues>
+			<attributeValues dtds='ldmlBCP47' elements='generation' attributes='date' type='regex'>\$Date.*\$</attributeValues>
+			<attributeValues dtds='ldmlBCP47' elements='key' attributes='alias' type='choice'>calendar colAlternate colBackwards colCaseFirst
+				colCaseLevel colHiraganaQuaternary colNormalization colNumeric colReorder colStrength collation currency hours measure numbers timezone
+				variableTop</attributeValues>
+			<attributeValues dtds='ldmlBCP47' elements='key' attributes='description' type='TODO'/>
+			<attributeValues dtds='ldmlBCP47' elements='key' attributes='extension' type='choice'>t</attributeValues>
+			<attributeValues dtds='ldmlBCP47' elements='key' attributes='name' type='choice'>$_bcp47_keys</attributeValues>
+			<attributeValues dtds='ldmlBCP47' elements='key' attributes='since' type='choice'>$versionDotted</attributeValues>
+			<attributeValues dtds='ldmlBCP47' elements='type' attributes='alias' type='TODO'/>
+			<attributeValues dtds='ldmlBCP47' elements='type' attributes='description' type='TODO'/>
+			<attributeValues dtds='ldmlBCP47' elements='type' attributes='name' type='TODO'/>
+			<attributeValues dtds='ldmlBCP47' elements='type' attributes='preferred' type='choice'>cnsha cnurc islamic-civil nzakl usden</attributeValues>
+			<attributeValues dtds='ldmlBCP47' elements='type' attributes='since' type='choice'>$versionDotted</attributeValues>
+			<attributeValues dtds='ldmlBCP47' elements='version' attributes='cldrVersion' type='choice'>$double</attributeValues>
+			<attributeValues dtds='ldmlBCP47' elements='version' attributes='number' type='regex'>\$Revision.*\$</attributeValues>
+			<attributeValues dtds='ldml' elements='subdivision' attributes='type' type='single'>$_subdivision</attributeValues>
+			<attributeValues dtds='supplementalData' elements='group' attributes='type' type='list'>$_region</attributeValues>
+			<attributeValues dtds='supplementalData' elements='personList' attributes='locales' type='list'>$localeOrDeprecated</attributeValues>
+			<attributeValues dtds='supplementalData' elements='subgroup' attributes='subtype' type='TODO'></attributeValues>
+			<attributeValues dtds='supplementalData' elements='variable' attributes='type' type='choice'>TODO choice list locale regex unicodeSet</attributeValues>
+			<attributeValues dtds='ldml' elements='dayPeriod' attributes='type' type='localeSpecific'>dayPeriodFormat</attributeValues>
+			<attributeValues dtds='ldml' elements='pattern' attributes='count' type='localeSpecific'>pluralOrdinal</attributeValues>
+			<attributeValues dtds='ldml' elements='displayName' attributes='count' type='localeSpecific'>pluralOrdinal</attributeValues>
+			<attributeValues dtds='ldml' elements='relativeTimePattern' attributes='count' type='localeSpecific'>pluralOrdinal</attributeValues>
+			<attributeValues dtds='ldml' elements='unitPattern' attributes='count' type='localeSpecific'>pluralOrdinal</attributeValues>
+			<attributeValues dtds='keyboard' elements='keyMap' attributes='modifiers' type='TODO'></attributeValues>
+			<attributeValues dtds='keyboard' elements='keyboard' attributes='locale' type='TODO'></attributeValues>
+			<attributeValues dtds='keyboard' elements='map' attributes='iso' type='list'>A00 A01 A02 A03 A04 A05 B00 B01 B02 B03 B04 B05 B06 B07 B08
+				B09 B10 B11 B12 C01 C02 C03 C04 C05 C06 C07 C08 C09 C10 C11 C12 D01 D02 D03 D04 D05 D06 D07 D08 D09 D10 D11 D12 D13 E00 E01 E02 E03 E04 E05 E06
+				E07 E08 E09 E10 E11 E12 E13</attributeValues>
+			<attributeValues dtds='keyboard' elements='map' attributes='longPress' type='TODO'></attributeValues>
+			<attributeValues dtds='keyboard' elements='map' attributes='to' type='TODO'></attributeValues>
+			<attributeValues dtds='keyboard' elements='name' attributes='value' type='TODO'></attributeValues>
+			<attributeValues dtds='keyboard' elements='transform' attributes='from' type='TODO'></attributeValues>
+			<attributeValues dtds='keyboard' elements='transform' attributes='to' type='TODO'></attributeValues>
+			<attributeValues dtds='keyboard' elements='transforms' attributes='type' type='choice'>simple</attributeValues>
+			<attributeValues dtds='keyboard' elements='version' attributes='cldrVersion' type='list'>28</attributeValues>
+			<attributeValues dtds='keyboard' elements='version' attributes='number' type='TODO'></attributeValues>
+			<attributeValues dtds='keyboard' elements='version' attributes='platform' type='TODO'></attributeValues>
+			<attributeValues dtds='platform' elements='map' attributes='iso' type='list'>A03 B00 B01 B02 B03 B04 B05 B06 B07 B08 B09 B10 B11 C01 C02
+				C03 C04 C05 C06 C07 C08 C09 C10 C11 C12 D01 D02 D03 D04 D05 D06 D07 D08 D09 D10 D11 D12 D13 E00 E01 E02 E03 E04 E05 E06 E07 E08 E09 E10 E11 E12
+				E13</attributeValues>
+			<attributeValues dtds='platform' elements='map' attributes='keycode' type='list'>0 1 10 11 115 12 13 132 14 15 16 17 18 19 2 20 21 22 23
+				24 25 26 27 28 29 3 30 31 32 33 34 35 36 37 38 39 4 40 41 42 43 44 45 46 47 48 49 5 50 51 52 53 54 55 56 57 58 59 6 60 61 65 7 8 86 9 93 94 97</attributeValues>
+			<attributeValues dtds='platform' elements='platform' attributes='id' type='list'>android chromeos osx windows</attributeValues>
+		</validity>
+	</metadata>
+</supplementalData>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/characters.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/characters.xml
similarity index 99%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/characters.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/characters.xml
index 94f6917b008..c11744af85e 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/characters.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/characters.xml
@@ -7,8 +7,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 -->
 
 <supplementalData>
-	<version number="$Revision: 10585 $"/>
-	<generation date="$Date: 2014-06-18 23:23:55 -0500 (Wed, 18 Jun 2014) $"/>
+	<version number="$Revision: 11914 $"/>
 	<characters>
 		<character-fallback>
 			<character value = "©">
@@ -224,6 +223,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<character value = "₽">
 				<substitute>RUB</substitute>
 			</character>
+			<character value = "₾">
+				<substitute>GEL</substitute>
+			</character>
 			<character value = "℞">
 				<substitute>Rx</substitute>
 			</character>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/coverageLevels.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/coverageLevels.xml
similarity index 84%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/coverageLevels.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/coverageLevels.xml
index 77cf309fc6f..0111c44abbd 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/coverageLevels.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/coverageLevels.xml
@@ -7,8 +7,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 -->
 
 <supplementalData>
-	<version number="$Revision: 11253 $"/>
-	<generation date="$Date: 2015-02-18 21:52:56 -0600 (Wed, 18 Feb 2015) $"/>
+	<version number="$Revision: 12418 $"/>
 	<coverageLevels>
 		<approvalRequirements>
 			<!--  "high bar" items -->
@@ -18,13 +17,16 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<approvalRequirement votes="20" locales="*" paths="//ldml/characters/exemplarCharacters(\[@type=.(auxiliary|index).\])?"/>
 			<approvalRequirement votes="20" locales="*" paths="//ldml/numbers/minimumGroupingDigits"/>
 			<approvalRequirement votes="20" locales="*" paths="//ldml/numbers/symbols[^/]++/timeSeparator"/>
-			<approvalRequirement votes="20" locales="*" paths="//ldml/numbers/currencies/currency\[@type=.([A-Z]{3}).\]/symbol(\[@alt=.narrow.\])?"/>
+			<approvalRequirement votes="20" locales="*" paths="//ldml/numbers/currencies/currency\[@type=.([A-Z]{3}).\]/symbol(\[@alt=.(narrow|variant).\])?"/>
+            <approvalRequirement votes="20" locales="*" paths="//ldml/dates/timeZoneNames/metazone[^/]++/short/[^/]++"/>
 			<approvalRequirement votes="20" locales="ar ca cs da de el es fi fr he hi hr hu it ja ko nb nl pl pt pt_PT ro ru sk sl sr sv th tr uk vi zh zh_Hant" 
 			   paths="//ldml/dates/calendars/calendar\[@type=.gregorian.\]/(days|months).*"/>
 			<approvalRequirement votes="20" locales="ar ca cs da de el es fi fr he hi hr hu it ja ko nb nl pl pt pt_PT ro ru sk sl sr sv th tr uk vi zh zh_Hant" 
 			   paths="//ldml/dates/calendars/calendar\[@type=.gregorian.\]/(date|time)Formats/.*"/>
+			<!--  "high bar" items for specific locales -->
+			<approvalRequirement votes="20" locales="sk" paths="//ldml/dates/calendars/calendar[^/]++/dayPeriods/dayPeriodContext\[@type=.format.\]/dayPeriodWidth[^/]++/dayPeriod\[@type=.(am|pm).\]"/>
 			<!--  established locales - http://cldr.unicode.org/index/process#TOC-Draft-Status-of-Optimal-Field-Value -->
-			<approvalRequirement votes="8" locales="ar ca cs da de el es fi fr he hi hr hu it ja ko nb nl pl pt pt_PT ro ru sk sl sr sv th tr uk vi zh zh_Hant" paths=""/>
+			<approvalRequirement votes="8" locales="ar ca cs da de el es fi fr he hi hr hu id it ja ko lt lv nb nl pl pt pt_PT ro ru sk sl sr sv th tr uk vi zh zh_Hant" paths=""/>
 			<!--  all other items -->
 			<approvalRequirement votes="4" locales="*" paths=""/>
 		</approvalRequirements>
@@ -38,18 +40,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageVariable key="%calendarType100" value="(buddhist|chinese|coptic|dangi|ethiopic(-amete-alem)?|hebrew|indian|islamic(-(civil|rgsa|tbla|umalqura))?|japanese|persian|roc)"/>
 		<coverageVariable key="%calendarType100ForDateFormats" value="(buddhist|chinese|coptic|dangi|ethiopic|hebrew|indian|islamic|japanese|persian|roc)"/>
 		<coverageVariable key="%calendarTypeUniqueNonGregoMonths" value="(chinese|coptic|dangi|ethiopic|hebrew|indian|islamic|persian)"/>
+        <coverageVariable key="%cfTypes" value="(standard|account)"/>
 		<coverageVariable key="%CJK_Languages" value="(ja|ko|zh)"/>
 		<coverageVariable key="%chineseCalendarTerritories" value="(CN|CX|HK|MO|SG|TW)"/>
 		<coverageVariable key="%collationType80" value="(ducet|search)"/>
 		<coverageVariable key="%collationType80ForTopLangs" value="(buddhist|chinese|hebrew|islamic|islamic-civil|japanese)"/>
 		<coverageVariable key="%collationType80TopLangs" value="(ar|de|en|es|fr|it|ja|ko|nl|pl|pt|ru|th|tr|zh)"/>
-		<coverageVariable key="%collationType100" value="(big5han|dictionary|eor|gb2312han|phonebook|phonetic|pinyin|reformed|searchjl|stroke|traditional|unihan|zhuyin)"/>
+		<coverageVariable key="%collationType100" value="(big5han|compat|dictionary|emoji|eor|gb2312han|phonebook|phonetic|pinyin|reformed|searchjl|stroke|traditional|unihan|zhuyin)"/>
 		<coverageVariable key="%collationAlternateValues" value="(non-ignorable|shifted)"/>
 		<coverageVariable key="%collationCases" value="(upper|lower)"/>
 		<coverageVariable key="%collationStrengths" value="(primary|secondary|tertiary|quaternary|identical)"/>
 		<coverageVariable key="%collationYesNoOptions" value="(colBackwards|colCaseFirst|colCaseLevel|colHiraganaQuaternary|colNormalization|colNumeric)"/>
 		<coverageVariable key="%compactDecimalTypes" value="(10{3,14})"/>
-		<coverageVariable key="%contextTypes" value="(format|stand-alone)"/>
+        <coverageVariable key="%compoundUnitTypes" value="per"/>
+        <coverageVariable key="%contextTypes" value="(format|stand-alone)"/>
 		<coverageVariable key="%currency30" value="(XXX)"/>
 		<coverageVariable key="%currency40" value="(BRL|CNY|EUR|GBP|INR|JPY|RUB|USD)"/>
 		<coverageVariable key="%currency60" value="(AUD|CAD|CHF|DKK|HKD|IDR|KRW|MXN|NOK|PLN|SAR|SEK|THB|TRY|TWD|ZAR)"/>
@@ -57,12 +61,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageVariable key="%currency80" value="(AED|AFN|ALL|AMD|ANG|AOA|ARS|AWG|AZN|BAM|BBD|BDT|BGN|BHD|BIF|BMD|BND|BOB|BSD|BTN|BWP|BYR|BZD|CDF|CLP|COP|CRC|CUC|CUP|CVE|CZK|DJF|DOP|DZD|EGP|ERN|ETB|FJD|FKP|GEL|GHS|GIP|GMD|GNF|GTQ|GYD|HNL|HRK|HTG|HUF|ILS|IQD|IRR|ISK|JMD|JOD|KES|KGS|KHR|KMF|KPW|KWD|KYD|KZT|LAK|LBP|LKR|LRD|LYD|MAD|MDL|MGA|MKD|MMK|MNT|MOP|MRO|MUR|MVR|MWK|MYR|MZN|NAD|NGN|NIO|NPR|NZD|OMR|PAB|PEN|PGK|PHP|PKR|PYG|QAR|RON|RSD|RWF|SBD|SCR|SDG|SGD|SHP|SLL|SOS|SRD|SSP|STD|SYP|SZL|TJS|TMT|TND|TOP|TTD|TZS|UAH|UGX|UYU|UZS|VEF|VND|VUV|WST|XCD|XAF|XOF|XPF|YER|ZMW)"/>
 		<coverageVariable key="%currency100" value="(AFA|ADP|ALK|AO[KNR]|AR[ALMP]|ATS|AZM|BA[DN]|BE[CFL]|BG[LM]|BGO|BO[LPV]|BR[BCENRZ]|BUK|BYB|CH[EW]|CL[EF]|CNX|COU|CS[DK]|CYP|DDM|DEM|EC[SV]|EEK|ES[ABP]|FIM|FRF|GEK|GHC|GNS|GQE|GRD|GW[EP]|HRD|IEP|IL[PR]|ISJ|ITL|KR[HO]|LSL|LT[LT]|LU[CFL]|LV[LR]|MAF|MCF|MDC|MGF|MKN|MLF|MT[LP]|MVP|MX[PV]|MZ[EM]|NIC|NLG|PE[IS]|PLZ|PTE|RHD|ROL|RUR|SD[DP]|SIT|SKK|SRG|SUR|SVC|TJR|TMM|TPE|TRL|UAK|UGS|US[NS]|UY[IP]|VEB|VNN|XA[GU]|XB[ABCD]|XDR|XEU|XF[OU]|XP[DT]|XRE|XSU|XTS|XUA|YDD|YU[DMNR]|ZAL|ZMK|ZR[NZ]|ZW[DLR])"/>
 		<coverageVariable key="%cyclicNameTypes" value="([1-9]?[0-9])"/>
-		<coverageVariable key="%dateFormatItems" value="((d|Ed|EEEEd)|((Gy|y|yyyy)?(M|Md|MEd|MEEEEd|MMM|MMMd|MMMEd|MMMEEEEd|MMMM|MMMMd|MMMMEd|MMMMEEEEd))|((Gy|y|yyyy)(QQQ|QQQQ)?))"/>
-		<coverageVariable key="%dateFormatItemsAll" value="(G{0,5}y{0,4}Q{0,4}(M|L){0,5}(E|c){0,5}d{0,2}(H|h){0,2}m{0,2}s{0,2}(v|z|Z){0,4})"/>
+		<coverageVariable key="%dateFormatItems" value="((E|d|Ed|EEEEd)|((Gy|y|yyyy|U)?(M|Md|MEd|MEEEEd|MMM|MMMd|MMMEd|MMMEEEEd|MMMM|MMMMd|MMMMEd|MMMMEEEEd))|((Gy|y|yyyy)(QQQ|QQQQ)?))"/>
+		<coverageVariable key="%dateFormatItemsAll" value="(G{0,5}(y|U){0,4}Q{0,4}(M|L){0,5}(E|c){0,5}d{0,2}(H|h){0,2}m{0,2}s{0,2}(v|z|Z){0,4})"/>
 		<coverageVariable key="%dateTimeFormatLengths" value="(full|long|medium|short)"/>
+		<coverageVariable key="%emTypes" value="(default|emoji|text)"/>
 		<coverageVariable key="%fullMedium" value="(full|medium)"/>
 		<coverageVariable key="%fullShort" value="(full|short)"/>
 		<coverageVariable key="%futurePast" value="(future|past)"/>
+		<coverageVariable key="%fwTypes" value="(fri|mon|sat|sun|thu|tue|wed)"/>
 		<coverageVariable key="%timeFormatItems" value="(E?(H|h)(ms?)?|ms)"/>
 		<coverageVariable key="%dayFieldTypes" value="(era|year|year-short|year-narrow|quarter|quarter-short|quarter-narrow|month|month-short|month-narrow|week|week-short|week-narrow|day|day-short|day-narrow|weekday|hour|hour-short|hour-narrow|minute|minute-short|minute-narrow|second|second-short|second-narrow|dayperiod|zone)"/>
 		<coverageVariable key="%dayTypes" value="(sun|mon|tue|wed|thu|fri|sat)"/>
@@ -70,13 +76,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageVariable key="%devaLanguages" value="(mr|ne)"/>
 		<coverageVariable key="%ellipsisTypes" value="(word-)?(initial|medial|final)"/>
 		<coverageVariable key="%exemplarTypes" value="(auxiliary|index|punctuation)"/>
+        <coverageVariable key="%hcTypes80" value="h(11|12|23|24)"/>
 		<coverageVariable key="%intervalFormatDateItems" value="(d|y|y?(M(MM)?)(E?d)?|y?MMMM)"/>
 		<coverageVariable key="%intervalFormatTimeItems" value="((h|H)m?v?)"/>
 		<coverageVariable key="%intervalFormatGDiff" value="([yMdaHhm])"/>
 		<coverageVariable key="%islamicCalendarTerritories" value="(AE|AF|BH|DJ|DZ|EG|EH|ER|IL|IQ|IR|JO|KM|KW|LB|LY|MA|MR|OM|PS|QA|SA|SD|SY|TN|YE)"/>
 		<coverageVariable key="%japaneseEras" value="([0-9]{1,3})"/>
-		<coverageVariable key="%keys80" value="(calendar|collation|currency|numbers)"/>
-		<coverageVariable key="%keys100" value="(col(Alternate|Backwards|CaseFirst|CaseLevel|HiraganaQuaternary|Normalization|Numeric|Reorder|Strength)|timezone|va|variableTop|x)"/>
+		<coverageVariable key="%keys80" value="(calendar|cf|collation|currency|em|fw|hc|lb|lw|ms|rg|ss|numbers)"/>
+		<coverageVariable key="%keys100" value="(col(Alternate|Backwards|CaseFirst|CaseLevel|HiraganaQuaternary|Normalization|Numeric|Reorder|Strength)|kv|sd|timezone|va|variableTop|x)"/>
 		<coverageVariable key="%language30" value="und"/>
 		<coverageVariable key="%language40" value="(de(_(AT|CH))?|en(_(AU|CA|GB|US))?|es(_(ES|419|MX))?|fr(_(CA|CH))?|it|ja|pt(_(BR|PT))?|ru|zh(_(Hans|Hant))?)"/>
 		<coverageVariable key="%language60" value="(ar(_001)?|bn|hi|id|ko|nl(_BE)?|pl|th|tr)"/>
@@ -85,9 +92,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageVariable key="%language60_GA" value="(fan|mye)"/>
 		<coverageVariable key="%language60_NG" value="(ff|ha|ibb|ig|kr|yo)"/>
 		<coverageVariable key="%language60_TD" value="(shu|dzg|kbl|mde|mua|sba)"/>
-		<coverageVariable key="%language80" value="(a[bfkmsz]|a(gq|rn|sa)|b[aegmors]|b(em|ez|rx)|c[aeosy]|c(gg|hr|kb)|d[az]|d(av|je|sb|ua|yo)|e[elotu]|ebu|f[aijoy]|fil|g[alnuv]|g(ag|sw|uz)|haw?|h[ertuy]|hsb|i[gisu]|jv|j(go|mc)|k[aiklmnsuwy]|k(ab|am|de|ea|hq|ln|oi|ok|pv|s[bf])|l[abgnotuv]|l(ag|be|kt|u[oy])|m[gkilnrsty]|m(as|dh|er|fe|g[ho]|oh|ua)|n[bden]|n(aq|mg|qo|us|yn)|o[mr]|p[as]|quc?|r[mnw]|ro(_MD)?|r(of|wk)|s[adegiklnoqruvw]|s(aq|bp|e[hs]|hi|m[ajns]|wc)|t[aegikot]|t(eo|sg|wq|zm)|u[gkrz]|uli|vi|v(ai|un)|wo|xh|xog|yo|zu|z(dj|gh|xx))"/>
-		<coverageVariable key="%language100_a_m" value="(aa|ac[eh]|ad[ay]|aeb?|af[ah]|ain|ak[kz]|al[egnt]|an[gp]?|apa|ar[copqtwyz]|as[et]|ath|aus|avk?|awa|ay|ba[dilnstx]|azb|bar|bb[cj]|be[jrw]|bf[dq]|bho?|bkm|bi[kn]?|bjn|bla|bnt|bpy|bqi|br[ah]|bss|btk|bu[amg]|bxr|by[nv]|ca[diruy]|cch|ce[bl]|ch[bgkmnopy]?|cmc|cop|cp[efps]|cr[hp]?|csb|cus?|cv|da[kry]|de[ln]|dgr|din|doi|dra|dtp|dum|dv|dyu|dzg|efi|eg[ly]|eka|elx|enm|esu|ewo|ext|fa[nt]|ff|fi[tu]|fon|fr[cmoprs]|fur|ga[agny]|gb[az]|gd|ge[mz]|gil|glk|gmh|go[hmnrt]|gr[bc]|gu[cr]|gwi|ha[ik]|hi[flmt]|hmn|ho|hsn|hup|hz|ia|ib[ab]|ie|ijo|ik|ilo|in[ceh]|io|ir[ao]|izh|jam|jbo|jpr|jrb|jut|ka[acjrw]|kb[dl]|kc[bg]|ken|kfo|kgp?|kh[aiow]|kiu|kkj|kj|kmb|ko[is]|kpe|kr[cijlou]?|ksh|ku[mt]|kv|la[dhm]|lez|lfn|li[jv]?|lmo|lo[lz]|ltg|lu[ains]|lz[hz]|ma[dfgiknp]|md[efr]|men|mga|mh|mi[cns]|mkh|mn[cio]|mos|mrj|mu[lns]|mw[lrv]|my[env]|mzn)"/>
-		<coverageVariable key="%language100_n_z" value="(na[hinp]?|nds|new|ng|ni[acu]|njo|nnh|no[gnv]?|nr|nso|nub|nv|nwc|ny[mo]?|nzi|o[cj]|osa?|ot[ao]|pa[aglmpu]|pcd|pd[ct]|peo|pfl|ph[in]|pi|pms|pnt|pon|pr[ago]|qug|ra[jpr]|rgn|rif|ro[am]|root|rtm|ru[egp]|sa[dhilmstz]|sba|sc[no]?|sdc|se[eilm]|sg[ans]|sh[nu]?|si[dot]|sl[aiy]|sm|snk|so[gn]|sr[nr]|ss[ay]?|stq?|su[ksx]|swb|sy[cr]|szl|tai|tcy|te[mrt]|ti[gv]|tk[lr]|tl[hiy]?|tmh|tn|tog|tpi|tr[uv]|ts[di]?|ttt|tu[mpt]|tvl|tw|tyv?|udm|uga|umb|ve[cp]?|vls|vmf||vot?|vro|wa[eklrs]?|wen|wuu|xal|xmf|ya[opv]|ybb|yi|ypk|yrl|yue|zap?|zbl|ze[an]|znd|zun|zza)"/>
+		<coverageVariable key="%language80" value="(a[bfkmsz]|a(gq|rn|sa|zb)|b[aegmors]|b(em|ez|gn|rx)|c[aeosvy]|c(gg|hr|kb)|d[az]|d(av|je|sb|ua|yo)|e[elotu]|ebu|fa(_AF)?|f[ijoy]|fil|g[alnuv]|g(ag|sw|uz)|haw?|h[ertuy]|hsb|i[gisu]|jv|j(go|mc)|k[aiklmnsuwy]|k(ab|am|de|ea|hq|ln|oi|ok|pv|s[bf])|l[abgnotuv]|l(ag|be|kt|rc|u[oy])|m[gkilnrsty]|m(as|dh|er|fe|g[ho]|oh|ua|zn)|n[bden]|n(aq|mg|qo|us|yn)|nds(_NL)?|o[mr]|p[as]|quc?|r[mnw]|ro(_MD)?|r(of|wk)|s[adegiklnoqruv]|s(aq|bp|dh|e[hs]|hi|m[ajns]|w(_CD)?)|t[aegikot]|t(eo|sg|wq|zm)|u[gkrz]|uli|vi|v(ai|un)|wbp|wo|xh|xog|yo|zu|z(dj|gh|xx))"/>
+		<coverageVariable key="%language100_a_m" value="(aa|ac[eh]|ad[ay]|aeb?|af[ah]|ain|ak[kz]|al[egnt]|an[gp]?|apa|ar[copqtwyz]|as[et]|ath|aus|avk?|awa|ay|ba[dilnstx]|bar|bb[cj]|be[jrw]|bf[dq]|bho?|bkm|bi[kn]?|bjn|bla|bnt|bpy|bqi|br[ah]|bss|btk|bu[amg]|bxr|by[nv]|ca[diruy]|cch|ce[bl]|ch[bgkmnopy]?|cmc|cop|cp[efps]|cr[hp]?|csb|cus?|da[kry]|de[ln]|dgr|din|doi|dra|dtp|dum|dv|dyu|dzg|efi|eg[ly]|eka|elx|enm|esu|ewo|ext|fa[nt]|ff|fi[tu]|fon|fr[cmoprs]|fur|ga[agny]|gb[az]|gd|ge[mz]|gil|glk|gmh|go[hmnrt]|gr[bc]|gu[cr]|gwi|ha[ik]|hi[flmt]|hmn|ho|hsn|hup|hz|ia|ib[ab]|ie|ijo|ik|ilo|in[ceh]|io|ir[ao]|izh|jam|jbo|jpr|jrb|jut|ka[acjrw]|kb[dl]|kc[bg]|ken|kfo|kgp?|kh[aiow]|kiu|kkj|kj|kmb|ko[is]|kpe|kr[cijlou]?|ksh|ku[mt]|kv|la[dhm]|lez|lfn|li[jv]?|lmo|lo[lz]|ltg|lu[ains]|lz[hz]|ma[dfgiknp]|md[efr]|men|mga|mh|mi[cns]|mkh|mn[cio]|mos|mrj|mu[lns]|mw[lrv]|my[env]|mzn)"/>
+		<coverageVariable key="%language100_n_z" value="(na[hinp]?|new|ng|ni[acu]|njo|nnh|no[gnv]?|nr|nso|nub|nv|nwc|ny[mo]?|nzi|o[cj]|osa?|ot[ao]|pa[aglmpu]|pcd|pd[ct]|peo|pfl|ph[in]|pi|pms|pnt|pon|pr[ago]|qug|ra[jpr]|rgn|rif|ro[am]|root|rtm|ru[egp]|sa[dhilmstz]|sba|sc[no]?|sdc|se[eilm]|sg[ans]|sh[nu]?|si[dot]|sl[aiy]|sm|snk|so[gn]|sr[nr]|ss[ay]?|stq?|su[ksx]|swb|sy[cr]|szl|tai|tcy|te[mrt]|ti[gv]|tk[lr]|tl[hiy]?|tmh|tn|tog|tpi|tr[uv]|ts[di]?|ttt|tu[mpt]|tvl|tw|tyv?|udm|uga|umb|ve[cp]?|vls|vmf||vot?|vro|wa[eklrs]?|wen|wuu|xal|xmf|ya[opv]|ybb|yi|ypk|yrl|yue|zap?|zbl|ze[an]|znd|zun|zza)"/>
+		<coverageVariable key="%lbTypes80" value="(strict|normal|loose)"/>
+        <coverageVariable key="%lwTypes" value="(normal|breakall|keepall)"/>
 		<coverageVariable key="%medLong" value="(medium|long)"/>
 		<coverageVariable key="%metazone30_AR" value="Argentina(_Western)?"/>
 		<coverageVariable key="%metazone30_AU" value="(Australia_(Central(Western)?|(East|West)ern)|Lord_Howe)"/>
@@ -105,25 +114,29 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageVariable key="%metazone60" value="(Africa_Western|Arabian|Australia_(Central(Western)?|(East|West)ern)|China|Israel|Japan|Korea|Moscow)"/> 
 		<coverageVariable key="%metazone60_stdonly" value="(Africa_(Central|(East|South)ern)|India|Indochina|Indonesia_(Central|(East|West)ern))"/> 
 		<coverageVariable key="%metazone80" value="(Alaska|Amazon|Apia|Argentina(_Western)?|Armenia|Azerbaijan|Azores|Bangladesh|Brasilia|Cape_Verde|Chatham|Chile|Choibalsan|Colombia|Cook|Cuba|Easter|Falkland|Fiji|Georgia|Greenland_(East|West)ern|Hawaii_Aleutian|Hong_Kong|Hovd|Iran|Irkutsk|Krasnoyarsk|Lord_Howe|Magadan|Mauritius|Mexico_(Northwest|Pacific)|Mongolia|New_(Caledonia|Zealand)|Newfoundland|Noronha|Novosibirsk|Omsk|Pakistan|Paraguay|Peru|Philippines|Pierre_Miquelon|Sakhalin|Samoa|Taipei|Tonga|Turkmenistan|Uruguay|Uzbekistan|Vanuatu|Vladivostok|Volgograd|Yakutsk|Yekaterinburg)"/>
-		<coverageVariable key="%metazone80_stdonly" value="(Afghanistan|Bhutan|Bolivia|Brunei|Chamorro|Christmas|Cocos|Davis|DumontDUrville|East_Timor|Ecuador|Europe_Further_Eastern|French_(Guiana|Southern)|Gambier|Galapagos|Gilbert_Islands|Gulf|Guyana|Indian_Ocean|Kazakhstan_(East|West)ern|Kosrae|Kyrgystan|Line_Islands|Macquarie|Malaysia|Maldives|Marquesas|Marshall_Islands|Mawson|Myanmar|Nauru|Nepal|Niue|Norfolk|Palau|Papua_New_Guinea|Phoenix_Islands|Pitcairn|Ponape|Reunion|Rothera|Seychelles|Singapore|Solomon|South_Georgia|Suriname|Syowa|Tahiti|Tajikistan|Tokelau|Truk|Tuvalu|Venezuela|Vostok|Wake|Wallis)"/>
+		<coverageVariable key="%metazone80_stdonly" value="(Afghanistan|Bhutan|Bolivia|Brunei|Chamorro|Christmas|Cocos|Davis|DumontDUrville|East_Timor|Ecuador|Europe_Further_Eastern|French_(Guiana|Southern)|Gambier|Galapagos|Gilbert_Islands|Gulf|Guyana|Indian_Ocean|Kazakhstan_(East|West)ern|Kosrae|Kyrgystan|Line_Islands|Macquarie|Malaysia|Maldives|Marquesas|Marshall_Islands|Mawson|Myanmar|Nauru|Nepal|Niue|Norfolk|Palau|Papua_New_Guinea|Phoenix_Islands|Pitcairn|Ponape|Pyongyang|Reunion|Rothera|Seychelles|Singapore|Solomon|South_Georgia|Suriname|Syowa|Tahiti|Tajikistan|Tokelau|Truk|Tuvalu|Venezuela|Vostok|Wake|Wallis)"/>
 		<coverageVariable key="%metazone100" value="(Acre|Almaty|Anadyr|Aqtau|Aqtobe|Kamchatka|Macau|Qyzylorda|Samara)"/>
 		<coverageVariable key="%metazone100_stdonly" value="(Casey|Guam|Lanka|North_Mariana)"/>
 		<coverageVariable key="%miscPatternTypes" value="(atLeast|range)"/>
 		<coverageVariable key="%monthTypes" value="(1[0-3]?|[2-9])"/>
+        <coverageVariable key="%msTypes80" value="(metric|u[ks]system)"/>
 		<coverageVariable key="%numberingSystem80" value="(arab(ext)?|armn(low)?|beng|deva|ethi|fullwide|geor|grek(low)?|gujr|guru|hanidec|han[st](fin)?|hebr|jpan(fin)?|khmr|knda|laoo|mlym|mymr|orya|roman(low)?|taml(dec)?|telu|thai|tibt)"/>
 		<coverageVariable key="%numberingSystem100" value="(finance|native|traditional|bali|brah|cakm|cham|hanidays|java|kali|lana(tham)?|lepc|limb|mong|mtei|mymrshan|nkoo|olck|osma|saur|shrd|sora|sund|takr|talu|vaii)"/>
 		<coverageVariable key="%persianCalendarTerritories" value="(AF|IR)"/>
 		<coverageVariable key="%phonebookCollationLanguages" value="(de|fi)"/>
+		<coverageVariable key="%ptVariants" value="(ABL1943|AO1990|COLB1945)"/>
 		<coverageVariable key="%quarterTypes" value="([1-4])"/>
 		<coverageVariable key="%regionFormatTypes" value="(daylight|standard)"/>
 		<coverageVariable key="%relativeTimeTypes" value="(year|year-short|year-narrow|quarter|quarter-short|quarter-narrow|month|month-short|month-narrow|week|week-short|week-narrow|day|day-short|day-narrow|hour|hour-short|hour-narrow|minute|minute-short|minute-narrow|second|second-short|second-narrow)"/>
 		<coverageVariable key="%script30" value="(Zxxx|Zzzz)"/>
 		<coverageVariable key="%script40" value="(Latn|Hans|Hant|Cyrl|Arab)"/>
 		<coverageVariable key="%script60" value="(Jpan|Kore)"/>
-		<coverageVariable key="%script80" value="(Zyyy|Armn|Beng|Bopo|Brai|Deva|Ethi|Geor|Grek|Gujr|Guru|Hani|Hang|Hebr|Hira|Knda|Kana|Khmr|Laoo|Mlym|Mong|Mymr|Orya|Sinh|Taml|Telu|Thaa|Thai|Tibt|Zsym)"/>
-		<coverageVariable key="%script100" value="(Afak|Aghb|Armi|Avst|Bali|Bamu|Bass|Batk|Blis|Brah|Bugi|Buhd|Cakm|Cans|Cari|Cham|Cher|Cirt|Copt|Cprt|Cyrs|Dsrt|Dupl|Egy[dhp]|Elba|Geok|Glag|Goth|Gran|Hano|Hluw|Hmng|Hrkt|Hung|Inds|Ital|Java|Jurc|Kali|Khar|Khoj|Kpel|Kthi|Lana|Lat[fg]|Lepc|Limb|Lin[ab]|Lisu|Loma|Ly[cd]i|Mahj|Man[di]|Maya|Mend|Mer[co]|Modi|Moon|Mroo|Mtei|Narb|Nbat|Nkgb|Nkoo|Nshu|Ogam|Olck|Orkh|Osma|Palm|Pauc|Perm|Phag|Phl[ipv]|Phnx|Plrd|Prti|Rjng|Roro|Runr|Samr|Sar[ab]|Saur|Sgnw|Shaw|Shrd|Sidd|Sind|Sora|Sund|Sylo|Syr[cejn]|Tagb|Takr|Tal[eu]|Tang|Tavt|Teng|Tfng|Tglg|Tirh|Ugar|Vaii|Visp|Wara|Wole|Xpeo|Xsux|Yiii|Zinh|Zmth)"/>
+		<coverageVariable key="%script80" value="(Zyyy|Armn|Beng|Bopo|Brai|Deva|Ethi|Geor|Grek|Gujr|Guru|Hani|Hang|Hebr|Hira|Knda|Kana|Khmr|Laoo|Mlym|Mong|Mymr|Orya|Sinh|Taml|Telu|Thaa|Thai|Tibt|Zsye|Zsym)"/>
+		<coverageVariable key="%script100" value="(Afak|Aghb|Ahom|Armi|Avst|Bali|Bamu|Bass|Batk|Blis|Brah|Bugi|Buhd|Cakm|Cans|Cari|Cham|Cher|Cirt|Copt|Cprt|Cyrs|Dsrt|Dupl|Egy[dhp]|Elba|Geok|Glag|Goth|Gran|Hatr|Hano|Hluw|Hmng|Hrkt|Hung|Inds|Ital|Java|Jurc|Kali|Khar|Khoj|Kpel|Kthi|Lana|Lat[fg]|Lepc|Limb|Lin[ab]|Lisu|Loma|Ly[cd]i|Mahj|Man[di]|Maya|Mend|Mer[co]|Modi|Moon|Mroo|Mtei|Mult|Narb|Nbat|Nkgb|Nkoo|Nshu|Ogam|Olck|Orkh|Osma|Palm|Pauc|Perm|Phag|Phl[ipv]|Phnx|Plrd|Prti|Rjng|Roro|Runr|Samr|Sar[ab]|Saur|Sgnw|Shaw|Shrd|Sidd|Sind|Sora|Sund|Sylo|Syr[cejn]|Tagb|Takr|Tal[eu]|Tang|Tavt|Teng|Tfng|Tglg|Tirh|Ugar|Vaii|Visp|Wara|Wole|Xpeo|Xsux|Yiii|Zinh|Zmth)"/>
 		<coverageVariable key="%shortLong" value="(short|long)"/>
 		<coverageVariable key="%shortVariant" value="(short|variant)"/>
+		<coverageVariable key="%anyAlphaNum" value="([-a-zA-Z0-9]+)"/>
+        <coverageVariable key="%ssTypes" value="(standard|none)"/>
 		<coverageVariable key="%standaloneVariant" value="(stand-alone|variant)"/>
 		<coverageVariable key="%stdPattern" value="[@type='standard']/pattern[@type='standard']"/>
 		<coverageVariable key="%territory30" value="ZZ"/>
@@ -139,14 +152,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageVariable key="%unitDurationTypes" value="duration-(year|month|week|day|hour|minute|second|millisecond)"/>
 		<coverageVariable key="%unitLengths" value="(long|short|narrow)"/>
 		<coverageVariable key="%unitNonNarrowLengths" value="(long|short)"/>
-		<coverageVariable key="%unitsCommonMetric" value="(length-(centi|milli|kilo)?meter|mass-(kilo)?gram|temperature-celsius|speed-kilometer-per-hour|volume-liter)"/>
+		<coverageVariable key="%unitsCommonMetric" value="(consumption-liter-per-100kilometers|length-(centi|milli|kilo)?meter|mass-(kilo)?gram|temperature-celsius|speed-kilometer-per-hour|volume-liter)"/>
 		<coverageVariable key="%unitsCommonUS" value="(length-(inch|foot|yard|mile)|mass-(ounce|pound)|temperature-fahrenheit|speed-mile-per-hour)"/>
 		<coverageVariable key="%unitsEnglish" value="(length-fathom|length-furlong|mass-stone|volume-bushel)"/>
-		<coverageVariable key="%unitsNonEnglish" value="[a-z]++-(?!(furlong|fathom|stone|bushel))([a-z]++([-a-z]++)?)"/>
+		<coverageVariable key="%unitsNonEnglish" value="[a-z]++-(?!(furlong|fathom|stone|bushel|mile-nautical))([a-z]++([-a-z]++)?)"/>
 		<coverageVariable key="%unitsOther" value="(length-(picometer|light-year)|pressure-(hectopascal|inch-hg|millibar)|acceleration-g-force|angle-(degree|minute|second)|area-(acre|hectare|square-(foot|kilometer|meter|mile))|power-(horsepower|kilowatt|watt)|speed-meter-per-second|volume-cubic-(mile|kilometer))"/>
 		<coverageVariable key="%variantTypes" value="([A-Z0-9]++)"/>
 		<coverageVariable key="%wideAbbr" value="(wide|abbreviated)"/>
-		<coverageVariable key="%wideNarrow" value="(wide|narrow)"/>
 		<coverageVariable key="%yesNo" value="(yes|no)"/>		
 		<!-- -->
 		<!-- Coverage levels begin here -->
@@ -175,43 +187,43 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageLevel value="minimal" match="localeDisplayNames/territories/territory[@type='${Target-Territories}']"/>
 		<coverageLevel value="minimal" match="localeDisplayNames/territories/territory[@type='${Target-Territories}'][@alt='(%shortVariant)']"/>
 		<coverageLevel value="minimal" match="localeDisplayNames/territories/territory[@type='%territory30']"/>
-		<coverageLevel value="minimal" match="localeDisplayNames/types/type[@type='${Calendar-List}'][@key='calendar']"/>
-		<coverageLevel value="minimal" match="localeDisplayNames/types/type[@type='gregorian'][@key='calendar']"/>
-		<coverageLevel value="minimal" match="localeDisplayNames/types/type[@type='standard'][@key='collation']"/>
-		<coverageLevel inLanguage="%phonebookCollationLanguages" value="minimal" match="localeDisplayNames/types/type[@type='phonebook'][@key='collation']"/>
-		<coverageLevel inLanguage="%traditionalCollationLanguages" value="minimal" match="localeDisplayNames/types/type[@type='traditional'][@key='collation']"/>
-		<coverageLevel inLanguage="%CJK_Languages" value="minimal" match="localeDisplayNames/types/type[@type='unihan'][@key='collation']"/>
-		<coverageLevel inLanguage="si" value="minimal" match="localeDisplayNames/types/type[@type='dictionary'][@key='collation']"/>
-		<coverageLevel inLanguage="sv" value="minimal" match="localeDisplayNames/types/type[@type='reformed'][@key='collation']"/>
-		<coverageLevel inLanguage="zh" value="minimal" match="localeDisplayNames/types/type[@type='(big5han|gb2312han|pinyin|stroke|zhuyin)'][@key='collation']"/>
-		<coverageLevel inScript="Arab" value="minimal" match="localeDisplayNames/types/type[@type='arab'][@key='numbers']"/>
-		<coverageLevel inScript="Armn" value="minimal" match="localeDisplayNames/types/type[@type='armn(low)?'][@key='numbers']"/>
-		<coverageLevel inLanguage="%arabextLanguages" value="minimal" match="localeDisplayNames/types/type[@type='arabext'][@key='numbers']"/>
-		<coverageLevel inScript="Beng" value="minimal" match="localeDisplayNames/types/type[@type='beng'][@key='numbers']"/>
-		<coverageLevel inScript="Deva" value="minimal" match="localeDisplayNames/types/type[@type='deva'][@key='numbers']"/>
-		<coverageLevel inScript="Ethi" value="minimal" match="localeDisplayNames/types/type[@type='ethi'][@key='numbers']"/>
-		<coverageLevel inLanguage="%CJK_Languages" value="minimal" match="localeDisplayNames/types/type[@type='fullwide'][@key='numbers']"/>
-		<coverageLevel inScript="Geor" value="minimal" match="localeDisplayNames/types/type[@type='geor'][@key='numbers']"/>
-		<coverageLevel inScript="Grek" value="minimal" match="localeDisplayNames/types/type[@type='grek(low)?'][@key='numbers']"/>
-		<coverageLevel inScript="Gujr" value="minimal" match="localeDisplayNames/types/type[@type='gujr'][@key='numbers']"/>
-		<coverageLevel inScript="Guru" value="minimal" match="localeDisplayNames/types/type[@type='guru'][@key='numbers']"/>
-		<coverageLevel inLanguage="zh" value="minimal" match="localeDisplayNames/types/type[@type='(han(s|t)(fin)?|hanidec)'][@key='numbers']"/>
-		<coverageLevel inScript="Hebr" value="minimal" match="localeDisplayNames/types/type[@type='hebr'][@key='numbers']"/>
-		<coverageLevel inScript="Guru" value="minimal" match="localeDisplayNames/types/type[@type='guru'][@key='numbers']"/>
-		<coverageLevel inLanguage="ja" value="minimal" match="localeDisplayNames/types/type[@type='jpan(fin)?'][@key='numbers']"/>
-		<coverageLevel inScript="Khmr" value="minimal" match="localeDisplayNames/types/type[@type='khmr'][@key='numbers']"/>
-		<coverageLevel inScript="Knda" value="minimal" match="localeDisplayNames/types/type[@type='knda'][@key='numbers']"/>
-		<coverageLevel inScript="Laoo" value="minimal" match="localeDisplayNames/types/type[@type='laoo'][@key='numbers']"/>
-		<coverageLevel value="minimal" match="localeDisplayNames/types/type[@type='latn'][@key='numbers']"/>
-		<coverageLevel inScript="Mong" value="minimal" match="localeDisplayNames/types/type[@type='mong'][@key='numbers']"/>
-		<coverageLevel inScript="Mlym" value="minimal" match="localeDisplayNames/types/type[@type='mlym'][@key='numbers']"/>
-		<coverageLevel inScript="Mymr" value="minimal" match="localeDisplayNames/types/type[@type='mymr(shan)?'][@key='numbers']"/>
-		<coverageLevel inScript="Orya" value="minimal" match="localeDisplayNames/types/type[@type='orya'][@key='numbers']"/>
-		<coverageLevel inScript="Taml" value="minimal" match="localeDisplayNames/types/type[@type='taml'][@key='numbers']"/>
-		<coverageLevel inScript="Telu" value="minimal" match="localeDisplayNames/types/type[@type='telu'][@key='numbers']"/>
-		<coverageLevel inScript="Thai" value="minimal" match="localeDisplayNames/types/type[@type='thai'][@key='numbers']"/>
-		<coverageLevel inScript="Tibt" value="minimal" match="localeDisplayNames/types/type[@type='tibt'][@key='numbers']"/>
-		<coverageLevel inLanguage="vai" value="minimal" match="localeDisplayNames/types/type[@type='vaii'][@key='numbers']"/>
+		<coverageLevel value="minimal" match="localeDisplayNames/types/type[@key='calendar'][@type='${Calendar-List}']"/>
+		<coverageLevel value="minimal" match="localeDisplayNames/types/type[@key='calendar'][@type='gregorian']"/>
+		<coverageLevel value="minimal" match="localeDisplayNames/types/type[@key='collation'][@type='standard']"/>
+		<coverageLevel inLanguage="%phonebookCollationLanguages" value="minimal" match="localeDisplayNames/types/type[@key='collation'][@type='phonebook']"/>
+		<coverageLevel inLanguage="%traditionalCollationLanguages" value="minimal" match="localeDisplayNames/types/type[@key='collation'][@type='traditional']"/>
+		<coverageLevel inLanguage="%CJK_Languages" value="minimal" match="localeDisplayNames/types/type[@key='collation'][@type='unihan']"/>
+		<coverageLevel inLanguage="si" value="minimal" match="localeDisplayNames/types/type[@key='collation'][@type='dictionary']"/>
+		<coverageLevel inLanguage="sv" value="minimal" match="localeDisplayNames/types/type[@key='collation'][@type='reformed']"/>
+		<coverageLevel inLanguage="zh" value="minimal" match="localeDisplayNames/types/type[@key='collation'][@type='(big5han|gb2312han|pinyin|stroke|zhuyin)']"/>
+		<coverageLevel inScript="Arab" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='arab']"/>
+		<coverageLevel inScript="Armn" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='armn(low)?']"/>
+		<coverageLevel inLanguage="%arabextLanguages" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='arabext']"/>
+		<coverageLevel inScript="Beng" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='beng']"/>
+		<coverageLevel inScript="Deva" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='deva']"/>
+		<coverageLevel inScript="Ethi" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='ethi']"/>
+		<coverageLevel inLanguage="%CJK_Languages" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='fullwide']"/>
+		<coverageLevel inScript="Geor" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='geor']"/>
+		<coverageLevel inScript="Grek" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='grek(low)?']"/>
+		<coverageLevel inScript="Gujr" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='gujr']"/>
+		<coverageLevel inScript="Guru" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='guru']"/>
+		<coverageLevel inLanguage="zh" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='(han(s|t)(fin)?|hanidec)']"/>
+		<coverageLevel inScript="Hebr" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='hebr']"/>
+		<coverageLevel inScript="Guru" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='guru']"/>
+		<coverageLevel inLanguage="ja" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='jpan(fin)?']"/>
+		<coverageLevel inScript="Khmr" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='khmr']"/>
+		<coverageLevel inScript="Knda" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='knda']"/>
+		<coverageLevel inScript="Laoo" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='laoo']"/>
+		<coverageLevel value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='latn']"/>
+		<coverageLevel inScript="Mong" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='mong']"/>
+		<coverageLevel inScript="Mlym" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='mlym']"/>
+		<coverageLevel inScript="Mymr" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='mymr(shan)?']"/>
+		<coverageLevel inScript="Orya" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='orya']"/>
+		<coverageLevel inScript="Taml" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='taml']"/>
+		<coverageLevel inScript="Telu" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='telu']"/>
+		<coverageLevel inScript="Thai" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='thai']"/>
+		<coverageLevel inScript="Tibt" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='tibt']"/>
+		<coverageLevel inLanguage="vai" value="minimal" match="localeDisplayNames/types/type[@key='numbers'][@type='vaii']"/>
 		<coverageLevel value="minimal" match="numbers/currencies/currency[@type='%currency30']/symbol[@alt='(narrow|variant)']"/>
 		<coverageLevel value="minimal" match="numbers/currencies/currency[@type='%currency30']/displayName"/>
 		<coverageLevel value="minimal" match="numbers/currencies/currency[@type='%currency30']/displayName[@count='${Target-Plurals}']"/>
@@ -390,7 +402,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageLevel value="moderate" match="localeDisplayNames/scripts/script[@type='%script60']"/>
 		<coverageLevel value="moderate" match="localeDisplayNames/territories/territory[@type='%territory60']"/>
 		<coverageLevel inTerritory="EU" value="moderate" match="localeDisplayNames/territories/territory[@type='%territory60_EU']"/>
-		<coverageLevel value="moderate" match="localeDisplayNames/types/type[@type='iso8601'][@key='calendar']"/>
+		<coverageLevel value="moderate" match="localeDisplayNames/types/type[@key='calendar'][@type='iso8601']"/>
 		<coverageLevel value="moderate" match="numbers/currencies/currency[@type='%currency60']/symbol"/>
 		<coverageLevel value="moderate" match="numbers/currencies/currency[@type='%currency60']/symbol[@alt='(narrow|variant)']"/>
 		<coverageLevel value="moderate" match="numbers/currencies/currency[@type='%currency60']/displayName"/>
@@ -421,17 +433,27 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageLevel value="moderate" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsCommonMetric']/displayName"/>
 		<coverageLevel inTerritory="US" value="moderate" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsCommonUS']/unitPattern[@count='${Target-Plurals}']"/>
 		<coverageLevel inTerritory="US" value="moderate" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsCommonUS']/displayName"/>
+
 		<coverageLevel value="modern" match="localeDisplayNames/languages/language[@type='%language80']"/> 
-		<coverageLevel value="modern" match="localeDisplayNames/languages/language[@type='%language80'][@alt='%shortVariant']"/> 
+		<coverageLevel value="modern" match="localeDisplayNames/languages/language[@type='%language80'][@alt='%anyAlphaNum']"/> 
 		<coverageLevel value="modern" match="localeDisplayNames/scripts/script[@type='%script80']"/>
 		<coverageLevel value="modern" match="localeDisplayNames/territories/territory[@type='%territory80']"/>
 		<coverageLevel value="modern" match="localeDisplayNames/territories/territory[@type='%territory40'][@alt='%shortVariant']"/>
 		<coverageLevel value="modern" match="localeDisplayNames/territories/territory[@type='%territory60'][@alt='%shortVariant']"/>
 		<coverageLevel value="modern" match="localeDisplayNames/territories/territory[@type='%territory80'][@alt='%shortVariant']"/>
 		<coverageLevel value="modern" match="localeDisplayNames/keys/key[@type='%keys80']"/>
-		<coverageLevel value="modern" match="localeDisplayNames/types/type[@type='%collationType80'][@key='collation']"/>
-		<coverageLevel inLanguage="%collationType80TopLangs" value="modern" match="localeDisplayNames/types/type[@type='%collationType80ForTopLangs'][@key='collation']"/>
-		<coverageLevel value="modern" match="localeDisplayNames/types/type[@type='%numberingSystem80'][@key='numbers']"/>
+		<coverageLevel inLanguage="pt" value="modern" match="localeDisplayNames/variants/variant[@type='%ptVariants']"/>		
+		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='collation'][@type='%collationType80']"/>
+		<coverageLevel inLanguage="%collationType80TopLangs" value="modern" match="localeDisplayNames/types/type[@key='collation'][@type='%collationType80ForTopLangs']"/>
+		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='numbers'][@type='%numberingSystem80']"/>
+		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='cf'][@type='%cfTypes']"/>
+		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='em'][@type='%emTypes']"/>
+		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='fw'][@type='%fwTypes']"/>
+		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='lw'][@type='%lwTypes']"/>
+		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='lb'][@type='%lbTypes80']"/>
+		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='hc'][@type='%hcTypes80']"/>
+		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='ms'][@type='%msTypes80']"/>
+		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='ss'][@type='%ssTypes']"/>
 		<coverageLevel value="modern" match="dates/calendars/calendar[@type='gregorian']/days/dayContext[@type='%contextTypes']/dayWidth[@type='short']/day[@type='%dayTypes']"/>
 		<coverageLevel value="modern" match="dates/calendars/calendar[@type='gregorian']/dateTimeFormats/availableFormats/dateFormatItem[@id='%dateFormatItemsAll']"/>
 		<coverageLevel inLanguage="(ja|ko|vi|zh)" value="modern" match="dates/calendars/calendar[@type='chinese']/monthPatterns/monthPatternContext[@type='format']/monthPatternWidth[@type='wide']/monthPattern[@type='leap']"/>
@@ -493,40 +515,49 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageLevel value="modern" match="numbers/miscPatterns[@numberSystem='latn']/pattern[@type='%miscPatternTypes']"/>
 		<coverageLevel value="modern" match="characters/ellipsis[@type='%ellipsisTypes']"/>
 		<coverageLevel value="modern" match="characters/moreInformation"/>
-		<coverageLevel value="modern" match="numbers/decimalFormats[@numberSystem='latn']/decimalFormatLength[@type='%shortLong']/decimalFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='${Target-Plurals}']"/>
+        <coverageLevel value="modern" match="numbers/decimalFormats[@numberSystem='latn']/decimalFormatLength[@type='%shortLong']/decimalFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='${Target-Plurals}']"/>
+        <coverageLevel value="modern" match="numbers/currencyFormats[@numberSystem='latn']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='${Target-Plurals}']"/>
 		<coverageLevel value="modern" match="units/unitLength[@type='%unitNonNarrowLengths']/unit[@type='%unitsNonEnglish']/unitPattern[@count='${Target-Plurals}']"/>
 		<coverageLevel value="modern" match="units/unitLength[@type='%unitNonNarrowLengths']/unit[@type='%unitsNonEnglish']/displayName"/>
-		<coverageLevel value="modern" match="units/unitLength[@type='%unitNonNarrowLengths']/unit[@type='%unitsNonEnglish']/perUnitPattern"/>
+        <coverageLevel value="modern" match="units/unitLength[@type='%unitNonNarrowLengths']/unit[@type='%unitsNonEnglish']/perUnitPattern"/>
+        <coverageLevel value="modern" match="units/unitLength[@type='%unitLengths']/compoundUnit[@type='%compoundUnitTypes']/compoundUnitPattern"/>
+        <coverageLevel value="modern" match="units/unitLength[@type='%unitLengths']/coordinateUnit/coordinateUnitPattern[@type='%anyAlphaNum']"/>
 		<coverageLevel inLanguage="en" value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsEnglish']/unitPattern[@count='${Target-Plurals}']"/>
 		<coverageLevel inLanguage="en" value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsEnglish']/displayName"/>
 		<coverageLevel inLanguage="en" value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsEnglish']/perUnitPattern"/>
 				
 		<coverageLevel value="modern" match="listPatterns/listPattern[@type='(duration|unit)(-(short|narrow))?']/listPatternPart[@type='(2|start|middle|end)']"/>
-		<coverageLevel value="modern" match="dates/calendars/calendar[@type='gregorian']/dayPeriods/dayPeriodContext[@type='format']/dayPeriodWidth[@type='%wideNarrow']/dayPeriod[@type='%ampmTypes']"/>
-		<coverageLevel value="modern" match="localeDisplayNames/types/type[@type='%calendarType80'][@key='calendar']"/>
+		<coverageLevel value="modern" match="dates/calendars/calendar[@type='gregorian']/dayPeriods/dayPeriodContext[@type='%anyAlphaNum']/dayPeriodWidth[@type='%allWidths']/dayPeriod[@type='%anyAlphaNum']"/>
+		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='calendar'][@type='%calendarType80']"/>
 		<coverageLevel value="modern" match="dates/calendars/calendar[@type='gregorian']/eras/eraNames/era[@type='(0|1)']"/>
 		<coverageLevel value="modern" match="dates/calendars/calendar[@type='gregorian']/eras/eraNames/era[@type='(0|1)'][@alt='variant']"/>
 
+		<!-- 
 		<coverageLevel value="comprehensive" match="units/unitLength[@type='narrow']/unit[@type='%unitsNonEnglish']/unitPattern[@count='${Target-Plurals}']"/>
 		<coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='gregorian']/eras/eraNarrow/era[@type='(0|1)']"/>
 		<coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='gregorian']/eras/eraNarrow/era[@type='(0|1)'][@alt='variant']"/>
-		<coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='(buddhist|ethiopic-amete-alem|hebrew|indian|islamic|persian)']/eras/eraAbbr/era[@type='0']"/>
-		<coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='(buddhist|ethiopic-amete-alem|hebrew|indian|islamic|persian)']/eras/eraNames/era[@type='0']"/>
-		<coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='(coptic|ethiopic|roc)']/eras/eraAbbr/era[@type='(0|1)']"/>
-		<coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='(coptic|ethiopic|roc)']/eras/eraNames/era[@type='(0|1)']"/>
-		<coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='japanese']/eras/eraAbbr/era[@type='%japaneseEras']"/>
+        <coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='(buddhist|ethiopic-amete-alem|hebrew|indian|islamic|persian)']/eras/eraAbbr/era[@type='0']"/>
+        <coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='(buddhist|ethiopic-amete-alem|hebrew|indian|islamic|persian)']/eras/eraNames/era[@type='0']"/>
+        <coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='(buddhist|ethiopic-amete-alem|hebrew|indian|islamic|persian)']/eras/eraNarrow/era[@type='0']"/>
+        <coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='(coptic|ethiopic|roc)']/eras/eraAbbr/era[@type='(0|1)']"/>
+        <coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='(coptic|ethiopic|roc)']/eras/eraNames/era[@type='(0|1)']"/>
+        <coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='(coptic|ethiopic|roc)']/eras/eraNarrow/era[@type='(0|1)']"/>
+        <coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='japanese']/eras/eraAbbr/era[@type='%japaneseEras']"/>
+        <coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='japanese']/eras/eraNames/era[@type='%japaneseEras']"/>
+        <coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='japanese']/eras/eraNarrow/era[@type='%japaneseEras']"/>
 		<coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='(buddhist|chinese|dangi|hebrew|islamic|japanese|roc)']/dateFormats/dateFormatLength[@type='%dateTimeFormatLengths']/dateFormat%stdPattern"/>
 		<coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='japanese']/dateTimeFormats/dateTimeFormatLength[@type='%dateTimeFormatLengths']/dateTimeFormat%stdPattern"/>
 		<coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='(buddhist|islamic|japanese|roc)']/dateTimeFormats/availableFormats/dateFormatItem[@id='%dateFormatItems']"/>
 		<coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='%calendarType100ForDateFormats']/dateFormats/dateFormatLength[@type='%dateTimeFormatLengths']/dateFormat%stdPattern"/>
 		<coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='%calendarType100ForDateFormats']/dateTimeFormats/dateTimeFormatLength[@type='%dateTimeFormatLengths']/dateTimeFormat%stdPattern"/>
 		<coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='%calendarType100ForDateFormats']/dateTimeFormats/availableFormats/dateFormatItem[@id='%dateFormatItems']"/>
-		<coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='%calendarType100ForDateFormats']/dateTimeFormats/intervalFormats/intervalFormatItem[@id='%intervalFormatDateItems']/greatestDifference[@id='%intervalFormatGDiff']"/>
+        <coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='%calendarType100ForDateFormats']/dateTimeFormats/intervalFormats/intervalFormatItem[@id='%intervalFormatDateItems']/greatestDifference[@id='%intervalFormatGDiff']"/>
+        <coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='%calendarType100ForDateFormats']/dateTimeFormats/intervalFormats/intervalFormatFallback"/>
 		<coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='%calendarTypeUniqueNonGregoMonths']/months/monthContext[@type='%contextTypes']/monthWidth[@type='%allWidths']/month[@type='%monthTypes']"/>
 		<coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='hebrew']/months/monthContext[@type='%contextTypes']/monthWidth[@type='%allWidths']/month[@type='7'][@yeartype='leap']"/>
-		<coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='(chinese|dangi)']/monthPatterns/monthPatternContext[@type='format']/monthPatternWidth[@type='wide']/monthPattern[@type='leap']"/>
+		<coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='(chinese|dangi)']/monthPatterns/monthPatternContext[@type='format']/monthPatternWidth[@type='%allWidths']/monthPattern[@type='leap']"/>
 		<coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='(chinese|dangi)']/monthPatterns/monthPatternContext[@type='numeric']/monthPatternWidth[@type='all']/monthPattern[@type='leap']"/>
-		<coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='(chinese|dangi)']/monthPatterns/monthPatternContext[@type='stand-alone']/monthPatternWidth[@type='narrow']/monthPattern[@type='leap']"/>
+		<coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='(chinese|dangi)']/monthPatterns/monthPatternContext[@type='stand-alone']/monthPatternWidth[@type='%allWidths']/monthPattern[@type='leap']"/>
 		<coverageLevel value="comprehensive" match="dates/calendars/calendar[@type='(chinese|dangi)']/cyclicNameSets/cyclicNameSet[@type='(dayParts|years|zodiacs|solarTerms)']/cyclicNameContext[@type='format']/cyclicNameWidth[@type='abbreviated']/cyclicName[@type='%cyclicNameTypes']"/>
 		<coverageLevel value="comprehensive" match="localeDisplayNames/languages/language[@type='%language100_a_m']"/>
 		<coverageLevel value="comprehensive" match="localeDisplayNames/languages/language[@type='%language100_n_z']"/>
@@ -537,20 +568,22 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageLevel value="comprehensive" match="localeDisplayNames/territories/territory[@type='%territory100'][@alt='%shortVariant']"/>
 		<coverageLevel value="comprehensive" match="localeDisplayNames/variants/variant[@type='%variantTypes']"/>
 		<coverageLevel value="comprehensive" match="localeDisplayNames/keys/key[@type='%keys100']"/>
-		<coverageLevel value="comprehensive" match="localeDisplayNames/types/type[@type='%numberingSystem100'][@key='numbers']"/>
-		<coverageLevel value="comprehensive" match="localeDisplayNames/types/type[@type='%calendarType100'][@key='calendar']"/>
-		<coverageLevel value="comprehensive" match="localeDisplayNames/types/type[@type='%collationType100'][@key='collation']"/>
-		<coverageLevel value="comprehensive" match="localeDisplayNames/types/type[@type='%collationAlternateValues'][@key='colAlternate']"/>
-		<coverageLevel value="comprehensive" match="localeDisplayNames/types/type[@type='%collationCases'][@key='colCaseFirst']"/>
-		<coverageLevel value="comprehensive" match="localeDisplayNames/types/type[@type='%collationStrengths'][@key='colStrength']"/>
-		<coverageLevel value="comprehensive" match="localeDisplayNames/types/type[@type='%yesNo'][@key='%collationYesNoOptions']"/>
-		<coverageLevel value="comprehensive" match="localeDisplayNames/types/type[@type='posix'][@key='va']"/>
+		<coverageLevel value="comprehensive" match="localeDisplayNames/types/type[@key='numbers'][@type='%numberingSystem100']"/>
+		<coverageLevel value="comprehensive" match="localeDisplayNames/types/type[@key='calendar'][@type='%calendarType100']"/>
+		<coverageLevel value="comprehensive" match="localeDisplayNames/types/type[@key='collation'][@type='%collationType100']"/>
+		<coverageLevel value="comprehensive" match="localeDisplayNames/types/type[@key='colAlternate'][@type='%collationAlternateValues']"/>
+		<coverageLevel value="comprehensive" match="localeDisplayNames/types/type[@key='colCaseFirst'][@type='%collationCases']"/>
+		<coverageLevel value="comprehensive" match="localeDisplayNames/types/type[@key='colStrength'][@type='%collationStrengths']"/>
+		<coverageLevel value="comprehensive" match="localeDisplayNames/types/type[@key='%collationYesNoOptions'][@type='%yesNo']"/>
+		<coverageLevel value="comprehensive" match="localeDisplayNames/types/type[@key='va'][@type='posix']"/>
 		<coverageLevel value="comprehensive" match="localeDisplayNames/transformNames/transformName[@type='%transformNameTypes']"/>
+        <coverageLevel value="comprehensive" match="numbers/symbols[@numberSystem='latn']/list"/>
 		<coverageLevel value="comprehensive" match="numbers/currencies/currency[@type='%currency30']/symbol"/>
 		<coverageLevel value="comprehensive" match="numbers/currencies/currency[@type='%currency100']/symbol"/>
 		<coverageLevel value="comprehensive" match="numbers/currencies/currency[@type='%currency100']/symbol[@alt='(narrow|variant)']"/>
 		<coverageLevel value="comprehensive" match="numbers/currencies/currency[@type='%currency100']/displayName"/>
 		<coverageLevel value="comprehensive" match="numbers/currencies/currency[@type='%currency100']/displayName[@count='${Target-Plurals}']"/>
+        <coverageLevel value="comprehensive" match="dates/fields/field[@type='%relativeTimeTypes']/relative[@type='(-1|0|1)']"/>        
 		<coverageLevel value="comprehensive" match="dates/timeZoneNames/metazone[@type='%metazone100']/long/generic"/>
 		<coverageLevel value="comprehensive" match="dates/timeZoneNames/metazone[@type='%metazone100']/long/standard"/>
 		<coverageLevel value="comprehensive" match="dates/timeZoneNames/metazone[@type='%metazone100']/long/daylight"/>
@@ -561,5 +594,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageLevel value="comprehensive" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsEnglish']/unitPattern[@count='${Target-Plurals}']"/>
 		<coverageLevel value="comprehensive" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsEnglish']/displayName"/>
 		<coverageLevel value="comprehensive" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsEnglish']/perUnitPattern"/>
+		 -->
 	</coverageLevels>
 </supplementalData>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/dayPeriods.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/dayPeriods.xml
new file mode 100644
index 00000000000..4c7ee68e311
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/dayPeriods.xml
@@ -0,0 +1,1144 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE supplementalData SYSTEM '../../common/dtd/ldmlSupplemental.dtd'>
+<!--	© 1991-2015 Unicode, Inc.
+	Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+	For terms of use, see http://www.unicode.org/copyright.html
+	CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+ -->
+<supplementalData>
+	<version number="$Revision: 12305 $"/>
+	<dayPeriodRuleSet>
+		<dayPeriodRules locales="root">
+			<dayPeriodRule type="am" from="00:00" before="12:00"/>	<!-- AM -->
+			<dayPeriodRule type="pm" from="12:00" before="24:00"/>	<!-- PM -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="en">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- midnight -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- noon -->
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- morning -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- afternoon -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- evening -->
+			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- night -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="af">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- middernag -->
+			<dayPeriodRule type="morning1" from="05:00" before="12:00"/>	<!-- oggend -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- middag -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- aand -->
+			<dayPeriodRule type="night1" from="00:00" before="05:00"/>	<!-- nag -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="nl">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- middernacht -->
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- ochtend -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- middag -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- avond -->
+			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- nacht -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="de">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- Mitternacht -->
+			<dayPeriodRule type="morning1" from="05:00" before="10:00"/>	<!-- Morgen -->
+			<dayPeriodRule type="morning2" from="10:00" before="12:00"/>	<!-- Vormittag -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="13:00"/>	<!-- Mittag -->
+			<dayPeriodRule type="afternoon2" from="13:00" before="18:00"/>	<!-- Nachmittag -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- Abend -->
+			<dayPeriodRule type="night1" from="00:00" before="05:00"/>	<!-- Nacht -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="da">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- midnat -->
+			<dayPeriodRule type="morning1" from="05:00" before="10:00"/>	<!-- morgen -->
+			<dayPeriodRule type="morning2" from="10:00" before="12:00"/>	<!-- formiddag -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- eftermiddag -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- aften -->
+			<dayPeriodRule type="night1" from="00:00" before="05:00"/>	<!-- nat -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="nb">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- midnatt -->
+			<dayPeriodRule type="morning1" from="06:00" before="10:00"/>	<!-- morgen -->
+			<dayPeriodRule type="morning2" from="10:00" before="12:00"/>	<!-- formiddag -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- ettermiddag -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- kveld -->
+			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- natt -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="sv">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- midnatt -->
+			<dayPeriodRule type="morning1" from="05:00" before="10:00"/>	<!-- morgon -->
+			<dayPeriodRule type="morning2" from="10:00" before="12:00"/>	<!-- förmiddag -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- eftermiddag -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- kväll -->
+			<dayPeriodRule type="night1" from="00:00" before="05:00"/>	<!-- natt -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="is">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- miðnætti -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- hádegi -->
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- morgunn -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- eftir hádegi -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- kvöld -->
+			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- nótt -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="pt">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- meia-noite -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- meio-dia -->
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- manhã -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="19:00"/>	<!-- tarde -->
+			<dayPeriodRule type="evening1" from="19:00" before="24:00"/>	<!-- noite -->
+			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- madrugada -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="gl">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- medianoite -->
+			<dayPeriodRule type="morning1" from="00:00" before="06:00"/>	<!-- madrugada -->
+			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- mañá -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="13:00"/>	<!-- mediodía -->
+			<dayPeriodRule type="evening1" from="13:00" before="21:00"/>	<!-- tarde -->
+			<dayPeriodRule type="night1" from="21:00" before="24:00"/>	<!-- noite -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="es">
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- mediodía -->
+			<dayPeriodRule type="morning1" from="00:00" before="06:00"/>	<!-- madrugada -->
+			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- mañana -->
+			<dayPeriodRule type="evening1" from="12:00" before="20:00"/>	<!-- tarde -->
+			<dayPeriodRule type="night1" from="20:00" before="24:00"/>	<!-- noche -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="es_CO">
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- mediodía -->
+			<dayPeriodRule type="morning2" from="00:00" before="12:00"/>	<!-- mañana -->
+			<dayPeriodRule type="evening1" from="12:00" before="20:00"/>	<!-- tarde -->
+			<dayPeriodRule type="night1" from="20:00" before="24:00"/>	<!-- noche -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ca">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- mitjanit -->
+			<dayPeriodRule type="morning1" from="00:00" before="06:00"/>	<!-- matinada -->
+			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- matí -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="13:00"/>	<!-- migdia -->
+			<dayPeriodRule type="afternoon2" from="13:00" before="19:00"/>	<!-- tarda -->
+			<dayPeriodRule type="evening1" from="19:00" before="21:00"/>	<!-- vespre -->
+			<dayPeriodRule type="night1" from="21:00" before="24:00"/>	<!-- nit -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="it">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- mezzanotte -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- mezzogiorno -->
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- mattina -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- pomeriggio -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- sera -->
+			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- notte -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ro">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- la miezul nopții -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- la amiază -->
+			<dayPeriodRule type="morning1" from="05:00" before="12:00"/>	<!-- dimineață -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- după-amiază -->
+			<dayPeriodRule type="evening1" from="18:00" before="22:00"/>	<!-- seară -->
+			<dayPeriodRule type="night1" from="22:00" before="05:00"/>	<!-- noapte -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="fr">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- minuit -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- midi -->
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- matin -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- après-midi -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- soir -->
+			<dayPeriodRule type="night1" from="00:00" before="04:00"/>	<!-- nuit -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ru">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- полночь -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- полдень -->
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- утро -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- день -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- вечер -->
+			<dayPeriodRule type="night1" from="00:00" before="04:00"/>	<!-- ночь -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="uk">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- північ -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- полудень -->
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- ранок -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- день -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- вечір -->
+			<dayPeriodRule type="night1" from="00:00" before="04:00"/>	<!-- ніч -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="bg">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- полунощ -->
+			<dayPeriodRule type="morning1" from="04:00" before="11:00"/>	<!-- сутринта -->
+			<dayPeriodRule type="morning2" from="11:00" before="14:00"/>	<!-- на обед -->
+			<dayPeriodRule type="afternoon1" from="14:00" before="18:00"/>	<!-- следобед -->
+			<dayPeriodRule type="evening1" from="18:00" before="22:00"/>	<!-- вечерта -->
+			<dayPeriodRule type="night1" from="22:00" before="04:00"/>	<!-- нощ -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="mk">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- на полноќ -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- напладне -->
+			<dayPeriodRule type="morning1" from="04:00" before="10:00"/>	<!-- наутро -->
+			<dayPeriodRule type="morning2" from="10:00" before="12:00"/>	<!-- претпладне -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- попладне -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- навечер -->
+			<dayPeriodRule type="night1" from="00:00" before="04:00"/>	<!-- по полноќ -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="sr">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- поноћ -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- подне -->
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- јутро -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- поподне -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- вече -->
+			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- ноћ -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="hr">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- ponoć -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- podne -->
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- jutro -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- popodne -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- večer -->
+			<dayPeriodRule type="night1" from="21:00" before="04:00"/>	<!-- noć -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="bs">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- u ponoć -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- podne -->
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- jutro -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- poslijepodne -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- veče -->
+			<dayPeriodRule type="night1" from="21:00" before="04:00"/>	<!-- noć -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="sl">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- polnoč -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- poldne -->
+			<dayPeriodRule type="morning1" from="06:00" before="10:00"/>	<!-- zjutraj -->
+			<dayPeriodRule type="morning2" from="10:00" before="12:00"/>	<!-- dopoldne -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- popoldne -->
+			<dayPeriodRule type="evening1" from="18:00" before="22:00"/>	<!-- zvečer -->
+			<dayPeriodRule type="night1" from="22:00" before="06:00"/>	<!-- ponoči -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="cs">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- půlnoc -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- poledne -->
+			<dayPeriodRule type="morning1" from="04:00" before="09:00"/>	<!-- ráno -->
+			<dayPeriodRule type="morning2" from="09:00" before="12:00"/>	<!-- dopoledne -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- odpoledne -->
+			<dayPeriodRule type="evening1" from="18:00" before="22:00"/>	<!-- večer -->
+			<dayPeriodRule type="night1" from="22:00" before="04:00"/>	<!-- noc -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="sk">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- polnoc -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- poludnie -->
+			<dayPeriodRule type="morning1" from="04:00" before="09:00"/>	<!-- ráno -->
+			<dayPeriodRule type="morning2" from="09:00" before="12:00"/>	<!-- dopoludnie -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- popoludnie -->
+			<dayPeriodRule type="evening1" from="18:00" before="22:00"/>	<!-- večer -->
+			<dayPeriodRule type="night1" from="22:00" before="04:00"/>	<!-- noc -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="pl">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- północ -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- południe -->
+			<dayPeriodRule type="morning1" from="06:00" before="10:00"/>	<!-- rano -->
+			<dayPeriodRule type="morning2" from="10:00" before="12:00"/>	<!-- przedpołudnie -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- popołudnie -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- wieczór -->
+			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- noc -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="lt">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- vidurnaktis -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- vidurdienis -->
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- rytas -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- diena -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- vakaras -->
+			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- naktis -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="lv">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- pusnakts -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- pusdienlaiks -->
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- rīts -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- pēcpusdiena -->
+			<dayPeriodRule type="evening1" from="18:00" before="23:00"/>	<!-- vakars -->
+			<dayPeriodRule type="night1" from="23:00" before="06:00"/>	<!-- nakts -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ur">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- آدھی رات -->
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- صبح -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- دوپہر -->
+			<dayPeriodRule type="afternoon2" from="16:00" before="18:00"/>	<!-- سہ پہر -->
+			<dayPeriodRule type="evening1" from="18:00" before="20:00"/>	<!-- شام -->
+			<dayPeriodRule type="night1" from="20:00" before="04:00"/>	<!-- رات -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="hi">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- आधी रात -->
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- सुबह -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- दोपहर -->
+			<dayPeriodRule type="evening1" from="16:00" before="20:00"/>	<!-- शाम -->
+			<dayPeriodRule type="night1" from="20:00" before="04:00"/>	<!-- रात -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="bn">
+			<dayPeriodRule type="morning1" from="04:00" before="06:00"/>	<!-- ভোর -->
+			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- সকাল -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- দুপুর -->
+			<dayPeriodRule type="afternoon2" from="16:00" before="18:00"/>	<!-- বিকাল -->
+			<dayPeriodRule type="evening1" from="18:00" before="20:00"/>	<!-- সন্ধ্যা -->
+			<dayPeriodRule type="night1" from="20:00" before="04:00"/>	<!-- রাত্রি -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="gu">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- મધ્યરાત્રિ -->
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- સવાર -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- બપોર -->
+			<dayPeriodRule type="evening1" from="16:00" before="20:00"/>	<!-- સાંજ -->
+			<dayPeriodRule type="night1" from="20:00" before="04:00"/>	<!-- રાત્રિ -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="mr">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- मध्यरात्र -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- मध्यान्ह -->
+			<dayPeriodRule type="morning1" from="04:00" before="06:00"/>	<!-- पहाट -->
+			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- सकाळ -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- दुपार -->
+			<dayPeriodRule type="evening1" from="16:00" before="18:00"/>	<!-- संध्याकाळ -->
+			<dayPeriodRule type="evening2" from="18:00" before="21:00"/>	<!-- सायंकाळ -->
+			<dayPeriodRule type="night1" from="21:00" before="04:00"/>	<!-- रात्र -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ne">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- मध्यरात -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- मध्यान्ह -->
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- विहान -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- अपरान्ह -->
+			<dayPeriodRule type="afternoon2" from="16:00" before="19:00"/>	<!-- साँझ -->
+			<dayPeriodRule type="evening1" from="19:00" before="22:00"/>	<!-- बेलुका -->
+			<dayPeriodRule type="night1" from="22:00" before="04:00"/>	<!-- रात -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="pa">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- ਅੱਧੀ ਰਾਤ -->
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- ਸਵੇਰ -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- ਦੁਪਹਿਰ -->
+			<dayPeriodRule type="evening1" from="16:00" before="21:00"/>	<!-- ਸ਼ਾਮ -->
+			<dayPeriodRule type="night1" from="21:00" before="04:00"/>	<!-- ਰਾਤ -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="si">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- මැදියම -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- මධ්‍යාහ්නය -->
+			<dayPeriodRule type="morning1" from="01:00" before="06:00"/>	<!-- පාන්දර -->
+			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- උදේ -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="14:00"/>	<!-- දවල් -->
+			<dayPeriodRule type="evening1" from="14:00" before="18:00"/>	<!-- හවස -->
+			<dayPeriodRule type="night1" from="18:00" before="24:00"/>	<!-- රෑ -->
+			<dayPeriodRule type="night2" from="00:00" before="01:00"/>	<!-- මැදියමට පසු -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="el">
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- πρωί -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="17:00"/>	<!-- μεσημέρι -->
+			<dayPeriodRule type="evening1" from="17:00" before="20:00"/>	<!-- απόγευμα -->
+			<dayPeriodRule type="night1" from="20:00" before="04:00"/>	<!-- βράδυ -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="sq">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- mesnatë -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- mesditë -->
+			<dayPeriodRule type="morning1" from="04:00" before="09:00"/>	<!-- mëngjes -->
+			<dayPeriodRule type="morning2" from="09:00" before="12:00"/>	<!-- paradite -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- pasdite -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- mbrëmje -->
+			<dayPeriodRule type="night1" from="00:00" before="04:00"/>	<!-- natë -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="hy">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- կեսգիշեր -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- կեսօր -->
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- առավոտ -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- ցերեկ -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- երեկո -->
+			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- գիշեր -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="fa">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- نیمه‌شب -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- ظهر -->
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- صبح -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="17:00"/>	<!-- عصر -->
+			<dayPeriodRule type="evening1" from="17:00" before="19:00"/>	<!-- سر شب -->
+			<dayPeriodRule type="night1" from="19:00" before="04:00"/>	<!-- شب -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ta">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- நள்ளிரவு -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- நண்பகல் -->
+			<dayPeriodRule type="morning1" from="03:00" before="05:00"/>	<!-- அதிகாலை -->
+			<dayPeriodRule type="morning2" from="05:00" before="12:00"/>	<!-- காலை -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="14:00"/>	<!-- மதியம் -->
+			<dayPeriodRule type="afternoon2" from="14:00" before="16:00"/>	<!-- பிற்பகல் -->
+			<dayPeriodRule type="evening1" from="16:00" before="18:00"/>	<!-- மாலை -->
+			<dayPeriodRule type="evening2" from="18:00" before="21:00"/>	<!-- அந்தி மாலை -->
+			<dayPeriodRule type="night1" from="21:00" before="03:00"/>	<!-- இரவு -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="te">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- అర్థరాత్రి -->
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- ఉదయం -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- మధ్యాహ్నం -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- సాయంత్రం -->
+			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- రాత్రి -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ml">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- അർദ്ധരാത്രി -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- ഉച്ച -->
+			<dayPeriodRule type="morning1" from="03:00" before="06:00"/>	<!-- പുലർച്ചെ -->
+			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- രാവിലെ -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="14:00"/>	<!-- ഉച്ചയ്ക്ക് -->
+			<dayPeriodRule type="afternoon2" from="14:00" before="15:00"/>	<!-- ഉച്ചതിരിഞ്ഞ് -->
+			<dayPeriodRule type="evening1" from="15:00" before="18:00"/>	<!-- വൈകുന്നേരം -->
+			<dayPeriodRule type="evening2" from="18:00" before="19:00"/>	<!-- സന്ധ്യ -->
+			<dayPeriodRule type="night1" from="19:00" before="03:00"/>	<!-- രാത്രി -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="kn">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- ಮಧ್ಯರಾತ್ರಿ -->
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- ಬೆಳಗ್ಗೆ -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- ಮಧ್ಯಾಹ್ನ -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- ಸಂಜೆ -->
+			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- ರಾತ್ರಿ -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="fi">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- keskiyö -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- keskipäivä -->
+			<dayPeriodRule type="morning1" from="05:00" before="10:00"/>	<!-- aamu -->
+			<dayPeriodRule type="morning2" from="10:00" before="12:00"/>	<!-- aamupäivä -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- iltapäivä -->
+			<dayPeriodRule type="evening1" from="18:00" before="23:00"/>	<!-- ilta -->
+			<dayPeriodRule type="night1" from="23:00" before="05:00"/>	<!-- yö -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="et">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- kesköö -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- keskpäev -->
+			<dayPeriodRule type="morning1" from="05:00" before="12:00"/>	<!-- hommik -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- pärastlõuna -->
+			<dayPeriodRule type="evening1" from="18:00" before="23:00"/>	<!-- õhtu -->
+			<dayPeriodRule type="night1" from="23:00" before="05:00"/>	<!-- öö -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="hu">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- éjfél -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- dél -->
+			<dayPeriodRule type="morning1" from="06:00" before="09:00"/>	<!-- reggel -->
+			<dayPeriodRule type="morning2" from="09:00" before="12:00"/>	<!-- délelőtt -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- délután -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- este -->
+			<dayPeriodRule type="night1" from="21:00" before="04:00"/>	<!-- éjjel -->
+			<dayPeriodRule type="night2" from="04:00" before="06:00"/>	<!-- hajnal -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="zh">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- 午夜 -->
+			<dayPeriodRule type="morning1" from="05:00" before="08:00"/>	<!-- 早上 -->
+			<dayPeriodRule type="morning2" from="08:00" before="12:00"/>	<!-- 上午 -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="13:00"/>	<!-- 中午 -->
+			<dayPeriodRule type="afternoon2" from="13:00" before="19:00"/>	<!-- 下午 -->
+			<dayPeriodRule type="evening1" from="19:00" before="24:00"/>	<!-- 晚上 -->
+			<dayPeriodRule type="night1" from="00:00" before="05:00"/>	<!-- 凌晨 -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="yue">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- 午夜 -->
+			<dayPeriodRule type="morning1" from="05:00" before="08:00"/>	<!-- 清晨 -->
+			<dayPeriodRule type="morning2" from="08:00" before="12:00"/>	<!-- 朝早 -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="13:00"/>	<!-- 中午 -->
+			<dayPeriodRule type="afternoon2" from="13:00" before="19:00"/>	<!-- 下晝 -->
+			<dayPeriodRule type="evening1" from="19:00" before="24:00"/>	<!-- 夜晚 -->
+			<dayPeriodRule type="night1" from="00:00" before="05:00"/>	<!-- 凌晨 -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ja">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- 真夜中 -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- 正午 -->
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- 朝 -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- 昼 -->
+			<dayPeriodRule type="evening1" from="16:00" before="19:00"/>	<!-- 夕方 -->
+			<dayPeriodRule type="night1" from="19:00" before="23:00"/>	<!-- 夜 -->
+			<dayPeriodRule type="night2" from="23:00" before="04:00"/>	<!-- 夜中 -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ko">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- 자정 -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- 정오 -->
+			<dayPeriodRule type="morning1" from="03:00" before="06:00"/>	<!-- 새벽 -->
+			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- 오전 -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- 오후 -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- 저녁 -->
+			<dayPeriodRule type="night1" from="21:00" before="03:00"/>	<!-- 밤 -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="my">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- သန်းခေါင်ယံ -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- မွန်းတည့် -->
+			<dayPeriodRule type="morning1" from="00:00" before="12:00"/>	<!-- နံနက် -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- နေ့လည် -->
+			<dayPeriodRule type="evening1" from="16:00" before="19:00"/>	<!-- ညနေ -->
+			<dayPeriodRule type="night1" from="19:00" before="24:00"/>	<!-- ည -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="th">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- เที่ยงคืน -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- เที่ยง -->
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- เช้า -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="13:00"/>	<!-- ช่วงเที่ยง -->
+			<dayPeriodRule type="afternoon2" from="13:00" before="16:00"/>	<!-- บ่าย -->
+			<dayPeriodRule type="evening1" from="16:00" before="18:00"/>	<!-- เย็น -->
+			<dayPeriodRule type="evening2" from="18:00" before="21:00"/>	<!-- ค่ำ -->
+			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- กลางคืน -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="lo">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- ທ່ຽງ​ຄືນ -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- ຕອນທ່ຽງ -->
+			<dayPeriodRule type="morning1" from="05:00" before="12:00"/>	<!-- ​ເຊົ້າ -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- ສວຍ -->
+			<dayPeriodRule type="evening1" from="16:00" before="20:00"/>	<!-- ແລງ -->
+			<dayPeriodRule type="night1" from="20:00" before="05:00"/>	<!-- ​ກາງ​ຄືນ -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="id">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- tengah malam -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- tengah hari -->
+			<dayPeriodRule type="morning1" from="00:00" before="10:00"/>	<!-- pagi -->
+			<dayPeriodRule type="afternoon1" from="10:00" before="15:00"/>	<!-- siang -->
+			<dayPeriodRule type="evening1" from="15:00" before="18:00"/>	<!-- sore -->
+			<dayPeriodRule type="night1" from="18:00" before="24:00"/>	<!-- malam -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ms">
+			<dayPeriodRule type="morning1" from="00:00" before="01:00"/>	<!-- tengah malam -->
+			<dayPeriodRule type="morning2" from="01:00" before="12:00"/>	<!-- pagi -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="14:00"/>	<!-- tengah hari -->
+			<dayPeriodRule type="evening1" from="14:00" before="19:00"/>	<!-- petang -->
+			<dayPeriodRule type="night1" from="19:00" before="24:00"/>	<!-- malam -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="fil">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- hatinggabi -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- tanghaling-tapat -->
+			<dayPeriodRule type="morning1" from="00:00" before="06:00"/>	<!-- umaga -->
+			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- madaling-araw -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- tanghali -->
+			<dayPeriodRule type="evening1" from="16:00" before="18:00"/>	<!-- hapon -->
+			<dayPeriodRule type="night1" from="18:00" before="24:00"/>	<!-- gabi -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="tr">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- gece yarısı -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- öğle -->
+			<dayPeriodRule type="morning1" from="06:00" before="11:00"/>	<!-- sabah -->
+			<dayPeriodRule type="morning2" from="11:00" before="12:00"/>	<!-- öğleden önce -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- öğleden sonra -->
+			<dayPeriodRule type="afternoon2" from="18:00" before="19:00"/>	<!-- akşamüstü -->
+			<dayPeriodRule type="evening1" from="19:00" before="21:00"/>	<!-- akşam -->
+			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- gece -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="az">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- gecəyarı -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- günorta -->
+			<dayPeriodRule type="morning1" from="04:00" before="06:00"/>	<!-- sübh -->
+			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- səhər -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="17:00"/>	<!-- gündüz -->
+			<dayPeriodRule type="evening1" from="17:00" before="19:00"/>	<!-- axşamüstü -->
+			<dayPeriodRule type="night1" from="19:00" before="24:00"/>	<!-- axşam -->
+			<dayPeriodRule type="night2" from="00:00" before="04:00"/>	<!-- gecə -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="kk">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- түн жарымы -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- талтүс -->
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- таң -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- түстен кейін -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- кеш -->
+			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- түн -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ky">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- түн ортосу -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- чак түш -->
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- эртең менен -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- түштөн кийин -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- кечкурун -->
+			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- түн -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="uz">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- yarim kechasi -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- tush payti -->
+			<dayPeriodRule type="morning1" from="06:00" before="11:00"/>	<!-- ertalab -->
+			<dayPeriodRule type="afternoon1" from="11:00" before="18:00"/>	<!-- kunduzi -->
+			<dayPeriodRule type="evening1" from="18:00" before="22:00"/>	<!-- kechqurun -->
+			<dayPeriodRule type="night1" from="22:00" before="06:00"/>	<!-- kechasi -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ar">
+			<dayPeriodRule type="morning1" from="03:00" before="06:00"/>	<!-- فجرا -->
+			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- صباحًا -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="13:00"/>	<!-- ظهرًا -->
+			<dayPeriodRule type="afternoon2" from="13:00" before="18:00"/>	<!-- بعد الظهر -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- مساءً -->
+			<dayPeriodRule type="night1" from="00:00" before="01:00"/>	<!-- منتصف الليل -->
+			<dayPeriodRule type="night2" from="01:00" before="03:00"/>	<!-- ليلاً -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="he">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- חצות -->
+			<dayPeriodRule type="morning1" from="05:00" before="11:00"/>	<!-- בוקר -->
+			<dayPeriodRule type="afternoon1" from="11:00" before="15:00"/>	<!-- צהריים -->
+			<dayPeriodRule type="afternoon2" from="15:00" before="18:00"/>	<!-- אחר הצהריים -->
+			<dayPeriodRule type="evening1" from="18:00" before="22:00"/>	<!-- ערב -->
+			<dayPeriodRule type="night1" from="22:00" before="05:00"/>	<!-- לילה -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="am">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- እኩለ ሌሊት -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- ቀትር -->
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- ጥዋት1 -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- ከሰዓት በኋላ -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- ማታ -->
+			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- ሌሊት -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="vi">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- nửa đêm -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- trưa -->
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- sáng -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- chiều -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- tối -->
+			<dayPeriodRule type="night1" from="21:00" before="04:00"/>	<!-- đêm -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="km">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- កណ្តាលអាធ្រាត្រ -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- ថ្ងៃ​ត្រង់ -->
+			<dayPeriodRule type="morning1" from="00:00" before="12:00"/>	<!-- ព្រឹក -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- រសៀល -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- ល្ងាច -->
+			<dayPeriodRule type="night1" from="21:00" before="24:00"/>	<!-- យប់ -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="sw">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- saa sita za usiku -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- saa sita za mchana -->
+			<dayPeriodRule type="morning1" from="04:00" before="07:00"/>	<!-- alfajiri -->
+			<dayPeriodRule type="morning2" from="07:00" before="12:00"/>	<!-- asubuhi -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- mchana -->
+			<dayPeriodRule type="evening1" from="16:00" before="19:00"/>	<!-- jioni -->
+			<dayPeriodRule type="night1" from="19:00" before="04:00"/>	<!-- usiku -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="zu">
+			<dayPeriodRule type="morning1" from="00:00" before="06:00"/>	<!-- entathakusa -->
+			<dayPeriodRule type="morning2" from="06:00" before="10:00"/>	<!-- ekuseni2 -->
+			<dayPeriodRule type="afternoon1" from="10:00" before="13:00"/>	<!-- emini -->
+			<dayPeriodRule type="evening1" from="13:00" before="19:00"/>	<!-- ebusuku1 -->
+			<dayPeriodRule type="night1" from="19:00" before="24:00"/>	<!-- ebusuku -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ka">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- შუაღამე -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- შუადღე -->
+			<dayPeriodRule type="morning1" from="05:00" before="12:00"/>	<!-- დილა -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- ნაშუადღევი -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- საღამო -->
+			<dayPeriodRule type="night1" from="21:00" before="05:00"/>	<!-- ღამე -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="eu">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- gauerdia -->
+			<dayPeriodRule type="morning1" from="00:00" before="06:00"/>	<!-- goizaldea -->
+			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- goiza -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="14:00"/>	<!-- eguerdia -->
+			<dayPeriodRule type="afternoon2" from="14:00" before="19:00"/>	<!-- arratsaldea -->
+			<dayPeriodRule type="evening1" from="19:00" before="21:00"/>	<!-- iluntzea -->
+			<dayPeriodRule type="night1" from="21:00" before="24:00"/>	<!-- gaua -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="mn">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- шөнө дунд -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- үд дунд -->
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- өглөө -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- өдөр -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- орой -->
+			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- шөнө -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="chr">
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- ᎢᎦ -->
+			<dayPeriodRule type="morning1" from="00:00" before="12:00"/>	<!-- ᏌᎾᎴ -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="24:00"/>	<!-- ᏒᎯᏱᎢᏗᏢ -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ee">
+			<dayPeriodRule type="morning1" from="04:00" before="05:00"/>
+			<dayPeriodRule type="morning2" from="05:00" before="12:00"/>
+			<dayPeriodRule type="afternoon1" from="12:00" before="14:00"/>
+			<dayPeriodRule type="afternoon2" from="14:00" before="18:00"/>
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>
+			<dayPeriodRule type="night1" from="21:00" before="04:00"/>
+		</dayPeriodRules>
+	</dayPeriodRuleSet>
+	<dayPeriodRuleSet type="selection">
+		<dayPeriodRules locales="root">
+			<dayPeriodRule type="am" from="00:00" before="12:00"/>	<!-- AM -->
+			<dayPeriodRule type="pm" from="12:00" before="24:00"/>	<!-- PM -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="en">
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- morning -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- afternoon -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- evening -->
+			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- night -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="af">
+			<dayPeriodRule type="morning1" from="05:00" before="12:00"/>	<!-- oggend -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- middag -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- aand -->
+			<dayPeriodRule type="night1" from="00:00" before="05:00"/>	<!-- nag -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="nl">
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- ochtend -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- middag -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- avond -->
+			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- nacht -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="de">
+			<dayPeriodRule type="morning1" from="05:00" before="10:00"/>	<!-- Morgen -->
+			<dayPeriodRule type="morning2" from="10:00" before="12:00"/>	<!-- Vormittag -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="13:00"/>	<!-- Mittag -->
+			<dayPeriodRule type="afternoon2" from="13:00" before="18:00"/>	<!-- Nachmittag -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- Abend -->
+			<dayPeriodRule type="night1" from="00:00" before="05:00"/>	<!-- Nacht -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="da">
+			<dayPeriodRule type="morning1" from="05:00" before="10:00"/>	<!-- morgen -->
+			<dayPeriodRule type="morning2" from="10:00" before="12:00"/>	<!-- formiddag -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- eftermiddag -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- aften -->
+			<dayPeriodRule type="night1" from="00:00" before="05:00"/>	<!-- nat -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="nb">
+			<dayPeriodRule type="morning1" from="06:00" before="10:00"/>	<!-- morgen -->
+			<dayPeriodRule type="morning2" from="10:00" before="12:00"/>	<!-- formiddag -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- ettermiddag -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- kveld -->
+			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- natt -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="sv">
+			<dayPeriodRule type="morning1" from="05:00" before="10:00"/>	<!-- morgon -->
+			<dayPeriodRule type="morning2" from="10:00" before="12:00"/>	<!-- förmiddag -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- eftermiddag -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- kväll -->
+			<dayPeriodRule type="night1" from="00:00" before="05:00"/>	<!-- natt -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="is">
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- morgunn -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- eftir hádegi -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- kvöld -->
+			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- nótt -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="pt">
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- manhã -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="19:00"/>	<!-- tarde -->
+			<dayPeriodRule type="evening1" from="19:00" before="24:00"/>	<!-- noite -->
+			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- madrugada -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="gl">
+			<dayPeriodRule type="morning1" from="00:00" before="06:00"/>	<!-- madrugada -->
+			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- mañá -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="13:00"/>	<!-- mediodía -->
+			<dayPeriodRule type="evening1" from="13:00" before="21:00"/>	<!-- tarde -->
+			<dayPeriodRule type="night1" from="21:00" before="24:00"/>	<!-- noite -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="es">
+			<dayPeriodRule type="morning1" from="00:00" before="06:00"/>	<!-- madrugada -->
+			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- mañana -->
+			<dayPeriodRule type="evening1" from="12:00" before="20:00"/>	<!-- tarde -->
+			<dayPeriodRule type="night1" from="20:00" before="24:00"/>	<!-- noche -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="es_CO">
+			<dayPeriodRule type="morning2" from="00:00" before="12:00"/>	<!-- mañana -->
+			<dayPeriodRule type="evening1" from="12:00" before="20:00"/>	<!-- tarde -->
+			<dayPeriodRule type="night1" from="20:00" before="24:00"/>	<!-- noche -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ca">
+			<dayPeriodRule type="morning1" from="00:00" before="06:00"/>	<!-- matinada -->
+			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- matí -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="13:00"/>	<!-- migdia -->
+			<dayPeriodRule type="afternoon2" from="13:00" before="19:00"/>	<!-- tarda -->
+			<dayPeriodRule type="evening1" from="19:00" before="21:00"/>	<!-- vespre -->
+			<dayPeriodRule type="night1" from="21:00" before="24:00"/>	<!-- nit -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="it">
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- mattina -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- pomeriggio -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- sera -->
+			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- notte -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ro">
+			<dayPeriodRule type="morning1" from="05:00" before="12:00"/>	<!-- dimineață -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- după-amiază -->
+			<dayPeriodRule type="evening1" from="18:00" before="22:00"/>	<!-- seară -->
+			<dayPeriodRule type="night1" from="22:00" before="05:00"/>	<!-- noapte -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="fr">
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- matin -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- après-midi -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- soir -->
+			<dayPeriodRule type="night1" from="00:00" before="04:00"/>	<!-- nuit -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="hr">
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- jutro -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- popodne -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- večer -->
+			<dayPeriodRule type="night1" from="21:00" before="04:00"/>	<!-- noć -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="bs">
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- jutro -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- poslijepodne -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- veče -->
+			<dayPeriodRule type="night1" from="21:00" before="04:00"/>	<!-- noć -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="sr">
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- јутро -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- поподне -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- вече -->
+			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- ноћ -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="sl">
+			<dayPeriodRule type="morning1" from="06:00" before="10:00"/>	<!-- zjutraj -->
+			<dayPeriodRule type="morning2" from="10:00" before="12:00"/>	<!-- dopoldne -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- popoldne -->
+			<dayPeriodRule type="evening1" from="18:00" before="22:00"/>	<!-- zvečer -->
+			<dayPeriodRule type="night1" from="22:00" before="06:00"/>	<!-- ponoči -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="cs">
+			<dayPeriodRule type="morning1" from="04:00" before="09:00"/>	<!-- ráno -->
+			<dayPeriodRule type="morning2" from="09:00" before="12:00"/>	<!-- dopoledne -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- odpoledne -->
+			<dayPeriodRule type="evening1" from="18:00" before="22:00"/>	<!-- večer -->
+			<dayPeriodRule type="night1" from="22:00" before="04:00"/>	<!-- noc -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="sk">
+			<dayPeriodRule type="morning1" from="04:00" before="09:00"/>	<!-- ráno -->
+			<dayPeriodRule type="morning2" from="09:00" before="12:00"/>	<!-- dopoludnie -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- popoludnie -->
+			<dayPeriodRule type="evening1" from="18:00" before="22:00"/>	<!-- večer -->
+			<dayPeriodRule type="night1" from="22:00" before="04:00"/>	<!-- noc -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="pl">
+			<dayPeriodRule type="morning1" from="06:00" before="10:00"/>	<!-- rano -->
+			<dayPeriodRule type="morning2" from="10:00" before="12:00"/>	<!-- przedpołudnie -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- popołudnie -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- wieczór -->
+			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- noc -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="bg">
+			<dayPeriodRule type="morning1" from="04:00" before="11:00"/>	<!-- сутринта -->
+			<dayPeriodRule type="morning2" from="11:00" before="14:00"/>	<!-- на обед -->
+			<dayPeriodRule type="afternoon1" from="14:00" before="18:00"/>	<!-- следобед -->
+			<dayPeriodRule type="evening1" from="18:00" before="22:00"/>	<!-- вечерта -->
+			<dayPeriodRule type="night1" from="22:00" before="04:00"/>	<!-- нощ -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="mk">
+			<dayPeriodRule type="morning1" from="04:00" before="10:00"/>	<!-- наутро -->
+			<dayPeriodRule type="morning2" from="10:00" before="12:00"/>	<!-- претпладне -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- попладне -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- навечер -->
+			<dayPeriodRule type="night1" from="00:00" before="04:00"/>	<!-- по полноќ -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ru">
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- утро -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- день -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- вечер -->
+			<dayPeriodRule type="night1" from="00:00" before="04:00"/>	<!-- ночь -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="uk">
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- ранок -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- день -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- вечір -->
+			<dayPeriodRule type="night1" from="00:00" before="04:00"/>	<!-- ніч -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="lt">
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- rytas -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- diena -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- vakaras -->
+			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- naktis -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="lv">
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- rīts -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- pēcpusdiena -->
+			<dayPeriodRule type="evening1" from="18:00" before="23:00"/>	<!-- vakars -->
+			<dayPeriodRule type="night1" from="23:00" before="06:00"/>	<!-- nakts -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="el">
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- πρωί -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="17:00"/>	<!-- μεσημέρι -->
+			<dayPeriodRule type="evening1" from="17:00" before="20:00"/>	<!-- απόγευμα -->
+			<dayPeriodRule type="night1" from="20:00" before="04:00"/>	<!-- βράδυ -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="fa">
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- صبح -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="17:00"/>	<!-- عصر -->
+			<dayPeriodRule type="evening1" from="17:00" before="19:00"/>	<!-- سر شب -->
+			<dayPeriodRule type="night1" from="19:00" before="04:00"/>	<!-- شب -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="hy">
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- առավոտ -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- ցերեկ -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- երեկո -->
+			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- գիշեր -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ka">
+			<dayPeriodRule type="morning1" from="05:00" before="12:00"/>	<!-- დილა -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- ნაშუადღევი -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- საღამო -->
+			<dayPeriodRule type="night1" from="21:00" before="05:00"/>	<!-- ღამე -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="sq">
+			<dayPeriodRule type="morning1" from="04:00" before="09:00"/>	<!-- mëngjes -->
+			<dayPeriodRule type="morning2" from="09:00" before="12:00"/>	<!-- paradite -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- pasdite -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- mbrëmje -->
+			<dayPeriodRule type="night1" from="00:00" before="04:00"/>	<!-- natë -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ur">
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- صبح -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- دوپہر -->
+			<dayPeriodRule type="afternoon2" from="16:00" before="18:00"/>	<!-- سہ پہر -->
+			<dayPeriodRule type="evening1" from="18:00" before="20:00"/>	<!-- شام -->
+			<dayPeriodRule type="night1" from="20:00" before="04:00"/>	<!-- رات -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="hi">
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- सुबह -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- दोपहर -->
+			<dayPeriodRule type="evening1" from="16:00" before="20:00"/>	<!-- शाम -->
+			<dayPeriodRule type="night1" from="20:00" before="04:00"/>	<!-- रात -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="bn">
+			<dayPeriodRule type="morning1" from="04:00" before="06:00"/>	<!-- ভোর -->
+			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- সকাল -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- দুপুর -->
+			<dayPeriodRule type="afternoon2" from="16:00" before="18:00"/>	<!-- বিকাল -->
+			<dayPeriodRule type="evening1" from="18:00" before="20:00"/>	<!-- সন্ধ্যা -->
+			<dayPeriodRule type="night1" from="20:00" before="04:00"/>	<!-- রাত্রি -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="gu">
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- સવાર -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- બપોર -->
+			<dayPeriodRule type="evening1" from="16:00" before="20:00"/>	<!-- સાંજ -->
+			<dayPeriodRule type="night1" from="20:00" before="04:00"/>	<!-- રાત્રિ -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="mr">
+			<dayPeriodRule type="morning1" from="04:00" before="06:00"/>	<!-- पहाट -->
+			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- सकाळ -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- दुपार -->
+			<dayPeriodRule type="evening1" from="16:00" before="18:00"/>	<!-- संध्याकाळ -->
+			<dayPeriodRule type="evening2" from="18:00" before="21:00"/>	<!-- सायंकाळ -->
+			<dayPeriodRule type="night1" from="21:00" before="04:00"/>	<!-- रात्र -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ne">
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- विहान -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- अपरान्ह -->
+			<dayPeriodRule type="afternoon2" from="16:00" before="19:00"/>	<!-- साँझ -->
+			<dayPeriodRule type="evening1" from="19:00" before="22:00"/>	<!-- बेलुका -->
+			<dayPeriodRule type="night1" from="22:00" before="04:00"/>	<!-- रात -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="pa">
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- ਸਵੇਰ -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- ਦੁਪਹਿਰ -->
+			<dayPeriodRule type="evening1" from="16:00" before="21:00"/>	<!-- ਸ਼ਾਮ -->
+			<dayPeriodRule type="night1" from="21:00" before="04:00"/>	<!-- ਰਾਤ -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="si">
+			<dayPeriodRule type="morning1" from="01:00" before="06:00"/>	<!-- පාන්දර -->
+			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- උදේ -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="14:00"/>	<!-- දවල් -->
+			<dayPeriodRule type="evening1" from="14:00" before="18:00"/>	<!-- හවස -->
+			<dayPeriodRule type="night1" from="18:00" before="24:00"/>	<!-- රෑ -->
+			<dayPeriodRule type="night2" from="00:00" before="01:00"/>	<!-- මැදියමට පසු -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ta">
+			<dayPeriodRule type="morning1" from="03:00" before="05:00"/>	<!-- அதிகாலை -->
+			<dayPeriodRule type="morning2" from="05:00" before="12:00"/>	<!-- காலை -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="14:00"/>	<!-- மதியம் -->
+			<dayPeriodRule type="afternoon2" from="14:00" before="16:00"/>	<!-- பிற்பகல் -->
+			<dayPeriodRule type="evening1" from="16:00" before="18:00"/>	<!-- மாலை -->
+			<dayPeriodRule type="evening2" from="18:00" before="21:00"/>	<!-- அந்தி மாலை -->
+			<dayPeriodRule type="night1" from="21:00" before="03:00"/>	<!-- இரவு -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="te">
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- ఉదయం -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- మధ్యాహ్నం -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- సాయంత్రం -->
+			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- రాత్రి -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ml">
+			<dayPeriodRule type="morning1" from="03:00" before="06:00"/>	<!-- പുലർച്ചെ -->
+			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- രാവിലെ -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="14:00"/>	<!-- ഉച്ചയ്ക്ക് -->
+			<dayPeriodRule type="afternoon2" from="14:00" before="15:00"/>	<!-- ഉച്ചതിരിഞ്ഞ് -->
+			<dayPeriodRule type="evening1" from="15:00" before="18:00"/>	<!-- വൈകുന്നേരം -->
+			<dayPeriodRule type="evening2" from="18:00" before="19:00"/>	<!-- സന്ധ്യ -->
+			<dayPeriodRule type="night1" from="19:00" before="03:00"/>	<!-- രാത്രി -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="kn">
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- ಬೆಳಗ್ಗೆ -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- ಮಧ್ಯಾಹ್ನ -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- ಸಂಜೆ -->
+			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- ರಾತ್ರಿ -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="zh">
+			<dayPeriodRule type="morning1" from="05:00" before="08:00"/>	<!-- 早上 -->
+			<dayPeriodRule type="morning2" from="08:00" before="12:00"/>	<!-- 上午 -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="13:00"/>	<!-- 中午 -->
+			<dayPeriodRule type="afternoon2" from="13:00" before="19:00"/>	<!-- 下午 -->
+			<dayPeriodRule type="evening1" from="19:00" before="24:00"/>	<!-- 晚上 -->
+			<dayPeriodRule type="night1" from="00:00" before="05:00"/>	<!-- 凌晨 -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="yue">
+			<dayPeriodRule type="morning1" from="05:00" before="08:00"/>	<!-- 早上 -->
+			<dayPeriodRule type="morning2" from="08:00" before="12:00"/>	<!-- 上午 -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="13:00"/>	<!-- 中午 -->
+			<dayPeriodRule type="afternoon2" from="13:00" before="19:00"/>	<!-- 下午 -->
+			<dayPeriodRule type="evening1" from="19:00" before="24:00"/>	<!-- 晚上 -->
+			<dayPeriodRule type="night1" from="00:00" before="05:00"/>	<!-- 凌晨 -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ja">
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- 朝 -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- 昼 -->
+			<dayPeriodRule type="evening1" from="16:00" before="19:00"/>	<!-- 夕方 -->
+			<dayPeriodRule type="night1" from="19:00" before="23:00"/>	<!-- 夜 -->
+			<dayPeriodRule type="night2" from="23:00" before="04:00"/>	<!-- 夜中 -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ko">
+			<dayPeriodRule type="morning1" from="03:00" before="06:00"/>	<!-- 새벽 -->
+			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- 오전 -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- 오후 -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- 저녁 -->
+			<dayPeriodRule type="night1" from="21:00" before="03:00"/>	<!-- 밤 -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="tr">
+			<dayPeriodRule type="morning1" from="06:00" before="11:00"/>	<!-- sabah -->
+			<dayPeriodRule type="morning2" from="11:00" before="12:00"/>	<!-- öğleden önce -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- öğleden sonra -->
+			<dayPeriodRule type="afternoon2" from="18:00" before="19:00"/>	<!-- akşamüstü -->
+			<dayPeriodRule type="evening1" from="19:00" before="21:00"/>	<!-- akşam -->
+			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- gece -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="az">
+			<dayPeriodRule type="morning1" from="04:00" before="06:00"/>	<!-- sübh -->
+			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- səhər -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="17:00"/>	<!-- gündüz -->
+			<dayPeriodRule type="evening1" from="17:00" before="19:00"/>	<!-- axşamüstü -->
+			<dayPeriodRule type="night1" from="19:00" before="24:00"/>	<!-- axşam -->
+			<dayPeriodRule type="night2" from="00:00" before="04:00"/>	<!-- gecə -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="kk">
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- таң -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- түстен кейін -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- кеш -->
+			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- түн -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ky">
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- эртең менен -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- түштөн кийин -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- кечкурун -->
+			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- түн -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="uz">
+			<dayPeriodRule type="morning1" from="06:00" before="11:00"/>	<!-- ertalab -->
+			<dayPeriodRule type="afternoon1" from="11:00" before="18:00"/>	<!-- kunduzi -->
+			<dayPeriodRule type="evening1" from="18:00" before="22:00"/>	<!-- kechqurun -->
+			<dayPeriodRule type="night1" from="22:00" before="06:00"/>	<!-- kechasi -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="et">
+			<dayPeriodRule type="morning1" from="05:00" before="12:00"/>	<!-- hommik -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- pärastlõuna -->
+			<dayPeriodRule type="evening1" from="18:00" before="23:00"/>	<!-- õhtu -->
+			<dayPeriodRule type="night1" from="23:00" before="05:00"/>	<!-- öö -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="fi">
+			<dayPeriodRule type="morning1" from="05:00" before="10:00"/>	<!-- aamu -->
+			<dayPeriodRule type="morning2" from="10:00" before="12:00"/>	<!-- aamupäivä -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- iltapäivä -->
+			<dayPeriodRule type="evening1" from="18:00" before="23:00"/>	<!-- ilta -->
+			<dayPeriodRule type="night1" from="23:00" before="05:00"/>	<!-- yö -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="hu">
+			<dayPeriodRule type="morning1" from="06:00" before="09:00"/>	<!-- reggel -->
+			<dayPeriodRule type="morning2" from="09:00" before="12:00"/>	<!-- délelőtt -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- délután -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- este -->
+			<dayPeriodRule type="night1" from="21:00" before="04:00"/>	<!-- éjjel -->
+			<dayPeriodRule type="night2" from="04:00" before="06:00"/>	<!-- hajnal -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="th">
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- เช้า -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="13:00"/>	<!-- ช่วงเที่ยง -->
+			<dayPeriodRule type="afternoon2" from="13:00" before="16:00"/>	<!-- บ่าย -->
+			<dayPeriodRule type="evening1" from="16:00" before="18:00"/>	<!-- เย็น -->
+			<dayPeriodRule type="evening2" from="18:00" before="21:00"/>	<!-- ค่ำ -->
+			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- กลางคืน -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="lo">
+			<dayPeriodRule type="morning1" from="05:00" before="12:00"/>	<!-- ​ເຊົ້າ -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- ສວຍ -->
+			<dayPeriodRule type="evening1" from="16:00" before="20:00"/>	<!-- ແລງ -->
+			<dayPeriodRule type="night1" from="20:00" before="05:00"/>	<!-- ​ກາງ​ຄືນ -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ar">
+			<dayPeriodRule type="morning1" from="03:00" before="06:00"/>	<!-- فجرا -->
+			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- صباحًا -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="13:00"/>	<!-- ظهرًا -->
+			<dayPeriodRule type="afternoon2" from="13:00" before="18:00"/>	<!-- بعد الظهر -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- مساءً -->
+			<dayPeriodRule type="night1" from="00:00" before="01:00"/>	<!-- منتصف الليل -->
+			<dayPeriodRule type="night2" from="01:00" before="03:00"/>	<!-- ليلاً -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="he">
+			<dayPeriodRule type="morning1" from="05:00" before="11:00"/>	<!-- בוקר -->
+			<dayPeriodRule type="afternoon1" from="11:00" before="15:00"/>	<!-- צהריים -->
+			<dayPeriodRule type="afternoon2" from="15:00" before="18:00"/>	<!-- אחר הצהריים -->
+			<dayPeriodRule type="evening1" from="18:00" before="22:00"/>	<!-- ערב -->
+			<dayPeriodRule type="night1" from="22:00" before="05:00"/>	<!-- לילה -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="id">
+			<dayPeriodRule type="morning1" from="00:00" before="10:00"/>	<!-- pagi -->
+			<dayPeriodRule type="afternoon1" from="10:00" before="15:00"/>	<!-- siang -->
+			<dayPeriodRule type="evening1" from="15:00" before="18:00"/>	<!-- sore -->
+			<dayPeriodRule type="night1" from="18:00" before="24:00"/>	<!-- malam -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ms">
+			<dayPeriodRule type="morning1" from="00:00" before="01:00"/>	<!-- tengah malam -->
+			<dayPeriodRule type="morning2" from="01:00" before="12:00"/>	<!-- pagi -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="14:00"/>	<!-- tengah hari -->
+			<dayPeriodRule type="evening1" from="14:00" before="19:00"/>	<!-- petang -->
+			<dayPeriodRule type="night1" from="19:00" before="24:00"/>	<!-- malam -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="fil">
+			<dayPeriodRule type="morning1" from="00:00" before="06:00"/>	<!-- umaga -->
+			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- madaling-araw -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- tanghali -->
+			<dayPeriodRule type="evening1" from="16:00" before="18:00"/>	<!-- hapon -->
+			<dayPeriodRule type="night1" from="18:00" before="24:00"/>	<!-- gabi -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="vi">
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- sáng -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- chiều -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- tối -->
+			<dayPeriodRule type="night1" from="21:00" before="04:00"/>	<!-- đêm -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="km">
+			<dayPeriodRule type="morning1" from="00:00" before="12:00"/>	<!-- ព្រឹក -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- រសៀល -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- ល្ងាច -->
+			<dayPeriodRule type="night1" from="21:00" before="24:00"/>	<!-- យប់ -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="sw">
+			<dayPeriodRule type="morning1" from="04:00" before="07:00"/>	<!-- alfajiri -->
+			<dayPeriodRule type="morning2" from="07:00" before="12:00"/>	<!-- asubuhi -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- mchana -->
+			<dayPeriodRule type="evening1" from="16:00" before="19:00"/>	<!-- jioni -->
+			<dayPeriodRule type="night1" from="19:00" before="04:00"/>	<!-- usiku -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="zu">
+			<dayPeriodRule type="morning1" from="00:00" before="06:00"/>	<!-- entathakusa -->
+			<dayPeriodRule type="morning2" from="06:00" before="10:00"/>	<!-- ekuseni2 -->
+			<dayPeriodRule type="afternoon1" from="10:00" before="13:00"/>	<!-- emini -->
+			<dayPeriodRule type="evening1" from="13:00" before="19:00"/>	<!-- ebusuku1 -->
+			<dayPeriodRule type="night1" from="19:00" before="24:00"/>	<!-- ebusuku -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="am">
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- ጥዋት1 -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- ከሰዓት በኋላ -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- ማታ -->
+			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- ሌሊት -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="eu">
+			<dayPeriodRule type="morning1" from="00:00" before="06:00"/>	<!-- goizaldea -->
+			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- goiza -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="14:00"/>	<!-- eguerdia -->
+			<dayPeriodRule type="afternoon2" from="14:00" before="19:00"/>	<!-- arratsaldea -->
+			<dayPeriodRule type="evening1" from="19:00" before="21:00"/>	<!-- iluntzea -->
+			<dayPeriodRule type="night1" from="21:00" before="24:00"/>	<!-- gaua -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="mn">
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- өглөө -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- өдөр -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- орой -->
+			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- шөнө -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="my">
+			<dayPeriodRule type="morning1" from="00:00" before="12:00"/>	<!-- နံနက် -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- နေ့လည် -->
+			<dayPeriodRule type="evening1" from="16:00" before="19:00"/>	<!-- ညနေ -->
+			<dayPeriodRule type="night1" from="19:00" before="24:00"/>	<!-- ည -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="chr">
+			<dayPeriodRule type="morning1" from="00:00" before="12:00"/>	<!-- ᏌᎾᎴ -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="24:00"/>	<!-- ᏒᎯᏱᎢᏗᏢ -->
+		</dayPeriodRules>
+		<dayPeriodRules locales="ee">
+			<dayPeriodRule type="morning1" from="04:00" before="05:00"/>
+			<dayPeriodRule type="morning2" from="05:00" before="12:00"/>
+			<dayPeriodRule type="afternoon1" from="12:00" before="14:00"/>
+			<dayPeriodRule type="afternoon2" from="14:00" before="18:00"/>
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>
+			<dayPeriodRule type="night1" from="21:00" before="04:00"/>
+		</dayPeriodRules>
+	</dayPeriodRuleSet>
+</supplementalData>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/genderList.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/genderList.xml
similarity index 88%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/genderList.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/genderList.xml
index 0b937e3a99c..9feace3412c 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/genderList.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/genderList.xml
@@ -7,8 +7,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 -->
 
 <supplementalData>
-    <version number="$Revision: 8268 $"/>
-    <generation date="$Date: 2013-03-01 08:26:02 -0600 (Fri, 01 Mar 2013) $"/>
+    <version number="$Revision: 11914 $"/>
     <gender>
         <!-- gender(list) = other -->
         <personList type="neutral" locales="af bn bg da de en et eu fa fil fi gu hu id ja kn ko ml ms no sv sw ta te th tr vi zu" />
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/languageInfo.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/languageInfo.xml
similarity index 57%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/languageInfo.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/languageInfo.xml
index 557e2fdbc05..3a8b2f6d276 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/languageInfo.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/languageInfo.xml
@@ -1,166 +1,181 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.dtd">
-<!-- Copyright © 1991-2013 Unicode, Inc. CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) 
-	For terms of use, see http://www.unicode.org/copyright.html -->
-
+<!-- Copyright © 1991-2013 Unicode, Inc. CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) For terms 
+	of use, see http://www.unicode.org/copyright.html -->
 <supplementalData>
-	<version number="$Revision: 11319 $" />
-	<generation date="$Date: 2015-02-26 03:23:19 -0600 (Thu, 26 Feb 2015) $" />
+	<version number="$Revision: 12017 $"/>
 	<languageMatching>
 		<languageMatches type="written">
 			<!-- Base Language Matches -->
-			<languageMatch desired="no" supported="nb" percent="99" />  <!-- The language no is normally taken as nb in content. -->
-			<languageMatch desired="ku" supported="ckb" percent="96" />  <!-- These are like regional variants -->
-			<languageMatch desired="nn" supported="nb" percent="96" />
-			<languageMatch desired="nn" supported="no" percent="96" />
-			<languageMatch desired="hr" supported="bs" percent="96" />   <!-- Serbo-croatian variants are all very close. -->
-			<languageMatch desired="sh" supported="bs" percent="96" />
-			<languageMatch desired="sr" supported="bs" percent="96" />
-			<languageMatch desired="sh" supported="hr" percent="96" />
-			<languageMatch desired="sr" supported="hr" percent="96" />
-			<languageMatch desired="sh" supported="sr" percent="96" />
-			<languageMatch desired="ms" supported="id" percent="92" />
-			<languageMatch desired="ssy" supported="aa" percent="96" />  <!-- Saho is closely related to Afar -->
-			<languageMatch desired="gsw" supported="de" percent="96" oneway="true" /> <!-- All Swiss speakers can read High German -->
-			<languageMatch desired="lb" supported="de" percent="96" oneway="true" /> <!-- All Luxemburgisch speakers can read High German -->
-			<languageMatch desired="da" supported="no" percent="92" />   <!-- Danish and norwegian are reasonably close. -->
-			<languageMatch desired="da" supported="nb" percent="92" />
+			<languageMatch desired="no" supported="nb" percent="99"/>  <!-- The language no is normally taken as nb in content. -->
+			<languageMatch desired="ku" supported="ckb" percent="96"/>  <!-- These are like regional variants -->
+			<languageMatch desired="hr" supported="bs" percent="96"/>   <!-- Serbo-croatian variants are all very close. -->
+			<languageMatch desired="sh" supported="bs" percent="96"/>
+			<languageMatch desired="sr" supported="bs" percent="96"/>
+			<languageMatch desired="sh" supported="hr" percent="96"/>
+			<languageMatch desired="sr" supported="hr" percent="96"/>
+			<languageMatch desired="sh" supported="sr" percent="96"/>
+			<languageMatch desired="ssy" supported="aa" percent="96"/>  <!-- Saho is closely related to Afar -->
+			<languageMatch desired="gsw" supported="de" percent="96" oneway="true"/> <!-- All Swiss speakers can read High German -->
+			<languageMatch desired="lb" supported="de" percent="96" oneway="true"/> <!-- All Luxemburgisch speakers can read High German -->
+			<languageMatch desired="da" supported="no" percent="92"/>   <!-- Danish and norwegian are reasonably close. -->
+			<languageMatch desired="da" supported="nb" percent="92"/>
+			<languageMatch desired="ckb" supported="ku" percent="92"/> <!-- variants of Kurdish -->
 			<!-- Other fallbacks -->
-			<languageMatch desired="ab" supported="ru" percent="90" oneway="true" />
-			<languageMatch desired="ach" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="af" supported="nl" percent="90" oneway="true" />
-			<languageMatch desired="ak" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="am_*_*" supported="en_GB" percent="90" oneway="true" /> <!-- fix ICU for en_GB -->
-			<languageMatch desired="ay" supported="es" percent="90" oneway="true" /> <!-- fix ICU for es_419 -->
-			<languageMatch desired="az" supported="ru" percent="90" oneway="true" />
-			<languageMatch desired="be" supported="ru" percent="90" oneway="true" />
-			<languageMatch desired="bem" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="bh" supported="hi" percent="90" oneway="true" />
-			<languageMatch desired="bn" supported="en" percent="90" oneway="true" /> <!-- fix ICU for en_GB -->
-			<languageMatch desired="br" supported="fr" percent="90" oneway="true" />
-			<languageMatch desired="ceb" supported="fil" percent="90" oneway="true" />
-			<languageMatch desired="chr" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="ckb" supported="ar" percent="90" oneway="true" />
-			<languageMatch desired="co" supported="fr" percent="90" oneway="true" />
-			<languageMatch desired="crs" supported="fr" percent="90" oneway="true" />
-			<languageMatch desired="cy" supported="en" percent="90" oneway="true" /> <!-- fix ICU for en_GB -->
-			<languageMatch desired="ee" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="eo" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="et" supported="fi" percent="90" oneway="true" />
-			<languageMatch desired="eu" supported="es" percent="90" oneway="true" />
-			<languageMatch desired="fo" supported="da" percent="90" oneway="true" />
-			<languageMatch desired="fy" supported="nl" percent="90" oneway="true" />
-			<languageMatch desired="ga" supported="en" percent="90" oneway="true" /> <!-- fix ICU for en_GB -->
-			<languageMatch desired="gaa" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="gd" supported="en" percent="90" oneway="true" /> <!-- fix ICU for en_GB -->
-			<languageMatch desired="gl" supported="es" percent="90" oneway="true" />
-			<languageMatch desired="gn" supported="es" percent="90" oneway="true" /> <!-- fix ICU for es_419 -->
-			<languageMatch desired="gu" supported="hi" percent="90" oneway="true" />
-			<languageMatch desired="ha" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="haw" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="ht" supported="fr" percent="90" oneway="true" />
-			<languageMatch desired="hy" supported="ru" percent="90" oneway="true" />
-			<languageMatch desired="ia" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="ig" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="is" supported="en" percent="90" oneway="true" /> <!-- fix ICU for en_GB -->
-			<languageMatch desired="jv" supported="id" percent="90" oneway="true" />
-			<languageMatch desired="ka" supported="en" percent="90" oneway="true" /> <!-- fix ICU for en_GB -->
-			<languageMatch desired="kg" supported="fr" percent="90" oneway="true" />
-			<languageMatch desired="kk" supported="ru" percent="90" oneway="true" />
-			<languageMatch desired="km" supported="en" percent="90" oneway="true" /> <!-- fix ICU for en_GB -->
-			<languageMatch desired="kn" supported="en" percent="90" oneway="true" /> <!-- fix ICU for en_GB -->
-			<languageMatch desired="kri" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="ku" supported="tr" percent="90" oneway="true" />
-			<languageMatch desired="ky" supported="ru" percent="90" oneway="true" />
-			<languageMatch desired="la" supported="it" percent="90" oneway="true" />
-			<languageMatch desired="lg" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="ln" supported="fr" percent="90" oneway="true" />
-			<languageMatch desired="lo" supported="en" percent="90" oneway="true" /> <!--  See ticket:7638 for why this is English -->
-			<languageMatch desired="loz" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="lua" supported="fr" percent="90" oneway="true" />
-			<languageMatch desired="mfe" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="mg" supported="fr" percent="90" oneway="true" />
-			<languageMatch desired="mi" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="mk" supported="bg" percent="90" oneway="true" />
-			<languageMatch desired="ml" supported="en" percent="90" oneway="true" /> <!-- fix ICU for en_GB -->
-			<languageMatch desired="mn" supported="ru" percent="90" oneway="true" />
-			<languageMatch desired="mr" supported="hi" percent="90" oneway="true" />
-			<languageMatch desired="ms" supported="id" percent="90" oneway="true" />
-			<languageMatch desired="mt" supported="en" percent="90" oneway="true" /> <!-- fix ICU for en_GB -->
-			<languageMatch desired="my" supported="en" percent="90" oneway="true" /> <!-- fix ICU for en_GB -->
-			<languageMatch desired="ne" supported="en" percent="90" oneway="true" /> <!-- fix ICU for en_GB -->
-			<languageMatch desired="nn" supported="nb" percent="90" oneway="true" />
-			<languageMatch desired="nso" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="ny" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="nyn" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="oc" supported="fr" percent="90" oneway="true" />
-			<languageMatch desired="om" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="or" supported="en" percent="90" oneway="true" /> <!-- fix ICU for en_GB -->
-			<languageMatch desired="pa" supported="en" percent="90" oneway="true" /> <!-- fix ICU for en_GB -->
-			<languageMatch desired="pcm" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="ps" supported="en" percent="90" oneway="true" /> <!-- fix ICU for en_GB -->
-			<languageMatch desired="qu" supported="es" percent="90" oneway="true" /> <!-- fix ICU for es_419 -->
-			<languageMatch desired="rm" supported="de" percent="90" oneway="true" />
-			<languageMatch desired="rn" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="rw" supported="fr" percent="90" oneway="true" />
-			<languageMatch desired="sa" supported="hi" percent="90" oneway="true" />
-			<languageMatch desired="sd" supported="en" percent="90" oneway="true" /> <!-- fix ICU for en_GB -->
-			<languageMatch desired="si" supported="en" percent="90" oneway="true" /> <!-- fix ICU for en_GB -->
-			<languageMatch desired="sn" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="so" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="sq" supported="en" percent="90" oneway="true" /> <!-- fix ICU for en_GB -->
-			<languageMatch desired="st" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="su" supported="id" percent="90" oneway="true" />
-			<languageMatch desired="sw" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="ta" supported="en" percent="90" oneway="true" /> <!-- fix ICU for en_GB -->
-			<languageMatch desired="te" supported="en" percent="90" oneway="true" /> <!-- fix ICU for en_GB -->
-			<languageMatch desired="tg" supported="ru" percent="90" oneway="true" />
-			<languageMatch desired="ti" supported="en" percent="90" oneway="true" /> <!-- fix ICU for en_GB -->
-			<languageMatch desired="tk" supported="ru" percent="90" oneway="true" />
-			<languageMatch desired="tlh" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="tn" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="to" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="tt" supported="ru" percent="90" oneway="true" />
-			<languageMatch desired="tum" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="ug" supported="zh" percent="90" oneway="true" />
-			<languageMatch desired="ur" supported="en" percent="90" oneway="true" /> <!-- fix ICU for en_GB -->
-			<languageMatch desired="uz" supported="ru" percent="90" oneway="true" />
-			<languageMatch desired="wo" supported="fr" percent="90" oneway="true" />
-			<languageMatch desired="xh" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="yi" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="yo" supported="en" percent="90" oneway="true" />
-			<languageMatch desired="zu" supported="en" percent="90" oneway="true" />
-			
+			<languageMatch desired="ab" supported="ru" percent="90" oneway="true"/>
+			<languageMatch desired="ach" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="af" supported="nl" percent="90" oneway="true"/>
+			<languageMatch desired="ak" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="am_*_*" supported="en_*_GB" percent="90" oneway="true"/> <!-- fix ICU for en_GB -->
+			<languageMatch desired="ay" supported="es" percent="90" oneway="true"/> <!-- fix ICU for es_419 -->
+			<languageMatch desired="az" supported="ru" percent="90" oneway="true"/>
+			<languageMatch desired="az_Latn" supported="ru_Cyrl" percent="90" oneway="true"/>
+			<languageMatch desired="be" supported="ru" percent="90" oneway="true"/>
+			<languageMatch desired="bem" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="bh" supported="hi" percent="90" oneway="true"/>
+			<languageMatch desired="bn" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="bn_Beng" supported="en_Latn" percent="90" oneway="true"/>
+			<languageMatch desired="br" supported="fr" percent="90" oneway="true"/>
+			<languageMatch desired="ceb" supported="fil" percent="90" oneway="true"/>
+			<languageMatch desired="chr" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="ckb" supported="ar" percent="90" oneway="true"/>
+			<languageMatch desired="co" supported="fr" percent="90" oneway="true"/>
+			<languageMatch desired="crs" supported="fr" percent="90" oneway="true"/>
+			<languageMatch desired="cy" supported="en" percent="90" oneway="true"/> <!-- fix ICU for en_GB -->
+			<languageMatch desired="ee" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="eo" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="et" supported="fi" percent="90" oneway="true"/>
+			<languageMatch desired="eu" supported="es" percent="90" oneway="true"/>
+			<languageMatch desired="fo" supported="da" percent="90" oneway="true"/>
+			<languageMatch desired="fy" supported="nl" percent="90" oneway="true"/>
+			<languageMatch desired="ga" supported="en" percent="90" oneway="true"/> <!-- fix ICU for en_GB -->
+			<languageMatch desired="gaa" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="gd" supported="en" percent="90" oneway="true"/> <!-- fix ICU for en_GB -->
+			<languageMatch desired="gl" supported="es" percent="90" oneway="true"/>
+			<languageMatch desired="gn" supported="es" percent="90" oneway="true"/> <!-- fix ICU for es_419 -->
+			<languageMatch desired="gu" supported="hi" percent="90" oneway="true"/>
+			<languageMatch desired="ha" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="haw" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="ht" supported="fr" percent="90" oneway="true"/>
+			<languageMatch desired="hy" supported="ru" percent="90" oneway="true"/>
+			<languageMatch desired="hy_Armn" supported="ru_Cyrl" percent="90" oneway="true"/>
+			<languageMatch desired="ia" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="ig" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="is" supported="en" percent="90" oneway="true"/> <!-- fix ICU for en_GB -->
+			<languageMatch desired="jv" supported="id" percent="90" oneway="true"/>
+			<languageMatch desired="ka_Geor" supported="en_Latn" percent="90" oneway="true"/> <!-- fix ICU for en_GB -->
+			<languageMatch desired="ka" supported="en" percent="90" oneway="true"/> <!-- fix ICU for en_GB -->
+			<languageMatch desired="kg" supported="fr" percent="90" oneway="true"/>
+			<languageMatch desired="kk" supported="ru" percent="90" oneway="true"/>
+			<languageMatch desired="km" supported="en" percent="90" oneway="true"/> <!-- fix ICU for en_GB -->
+			<languageMatch desired="km_Khmr" supported="en_Latn" percent="90" oneway="true"/>
+			<languageMatch desired="kn" supported="en" percent="90" oneway="true"/> <!-- fix ICU for en_GB -->
+			<languageMatch desired="kn_Knda" supported="en_Latn" percent="90" oneway="true"/>
+			<languageMatch desired="kri" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="ku" supported="tr" percent="90" oneway="true"/>
+			<languageMatch desired="ky" supported="ru" percent="90" oneway="true"/>
+			<languageMatch desired="la" supported="it" percent="90" oneway="true"/>
+			<languageMatch desired="lg" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="ln" supported="fr" percent="90" oneway="true"/>
+			<languageMatch desired="lo" supported="en" percent="90" oneway="true"/> <!-- See ticket:7638 for why this is English -->
+			<languageMatch desired="lo_Laoo" supported="en_Latn" percent="90" oneway="true"/>
+			<languageMatch desired="loz" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="lua" supported="fr" percent="90" oneway="true"/>
+			<languageMatch desired="mfe" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="mg" supported="fr" percent="90" oneway="true"/>
+			<languageMatch desired="mi" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="mk" supported="bg" percent="90" oneway="true"/>
+			<languageMatch desired="ml" supported="en" percent="90" oneway="true"/> <!-- fix ICU for en_GB -->
+			<languageMatch desired="ml_Mlym" supported="en_Latn" percent="90" oneway="true"/>
+			<languageMatch desired="mn" supported="ru" percent="90" oneway="true"/>
+			<languageMatch desired="mr" supported="hi" percent="90" oneway="true"/>
+			<languageMatch desired="ms" supported="id" percent="90" oneway="true"/>
+			<languageMatch desired="mt" supported="en" percent="90" oneway="true"/> <!-- fix ICU for en_GB -->
+			<languageMatch desired="my" supported="en" percent="90" oneway="true"/> <!-- fix ICU for en_GB -->
+			<languageMatch desired="my_Mymr" supported="en_Latn" percent="90" oneway="true"/>
+			<languageMatch desired="ne" supported="en" percent="90" oneway="true"/> <!-- fix ICU for en_GB -->
+			<languageMatch desired="ne_Deva" supported="en_Latn" percent="90" oneway="true"/>
+			<languageMatch desired="nn" supported="nb" percent="90"/>
+			<languageMatch desired="nn" supported="no" percent="90" oneway="true"/>
+			<languageMatch desired="nso" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="ny" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="nyn" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="oc" supported="fr" percent="90" oneway="true"/>
+			<languageMatch desired="om" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="or" supported="en" percent="90" oneway="true"/> <!-- fix ICU for en_GB -->
+			<languageMatch desired="or_Orya" supported="en_Latn" percent="90" oneway="true"/>
+			<languageMatch desired="pa" supported="en" percent="90" oneway="true"/> <!-- fix ICU for en_GB -->
+			<languageMatch desired="pa_Guru" supported="en_Latn" percent="90" oneway="true"/>
+			<languageMatch desired="pcm" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="ps" supported="en" percent="90" oneway="true"/> <!-- fix ICU for en_GB -->
+			<languageMatch desired="ps_Arab" supported="en_Latn" percent="90" oneway="true"/>
+			<languageMatch desired="qu" supported="es" percent="90" oneway="true"/> <!-- fix ICU for es_419 -->
+			<languageMatch desired="rm" supported="de" percent="90" oneway="true"/>
+			<languageMatch desired="rn" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="rw" supported="fr" percent="90" oneway="true"/>
+			<languageMatch desired="sa" supported="hi" percent="90" oneway="true"/>
+			<languageMatch desired="sd" supported="en" percent="90" oneway="true"/> <!-- fix ICU for en_GB -->
+			<languageMatch desired="sd_Arab" supported="en_Latn" percent="90" oneway="true"/>
+			<languageMatch desired="si" supported="en" percent="90" oneway="true"/> <!-- fix ICU for en_GB -->
+			<languageMatch desired="si_Sinh" supported="en_Latn" percent="90" oneway="true"/>
+			<languageMatch desired="sn" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="so" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="sq" supported="en" percent="90" oneway="true"/> <!-- fix ICU for en_GB -->
+			<languageMatch desired="st" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="su" supported="id" percent="90" oneway="true"/>
+			<languageMatch desired="sw" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="ta" supported="en" percent="90" oneway="true"/> <!-- fix ICU for en_GB -->
+			<languageMatch desired="ta_Taml" supported="en_Latn" percent="90" oneway="true"/>
+			<languageMatch desired="te" supported="en" percent="90" oneway="true"/> <!-- fix ICU for en_GB -->
+			<languageMatch desired="te_Telu" supported="en_Latn" percent="90" oneway="true"/>
+			<languageMatch desired="tg" supported="ru" percent="90" oneway="true"/>
+			<languageMatch desired="ti" supported="en" percent="90" oneway="true"/> <!-- fix ICU for en_GB -->
+			<languageMatch desired="ti_Ethi" supported="en_Latn" percent="90" oneway="true"/>
+			<languageMatch desired="tk" supported="ru" percent="90" oneway="true"/>
+			<languageMatch desired="tk_Latn" supported="ru_Cyrl" percent="90" oneway="true"/>
+			<languageMatch desired="tlh" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="tn" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="to" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="tt" supported="ru" percent="90" oneway="true"/>
+			<languageMatch desired="tum" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="ug" supported="zh" percent="90" oneway="true"/>
+			<languageMatch desired="ur" supported="en" percent="90" oneway="true"/> <!-- fix ICU for en_GB -->
+			<languageMatch desired="ur_Arab" supported="en_Latn" percent="90" oneway="true"/>
+			<languageMatch desired="uz" supported="ru" percent="90" oneway="true"/>
+			<languageMatch desired="uz_Latn" supported="ru_Cyrl" percent="90" oneway="true"/>
+			<languageMatch desired="wo" supported="fr" percent="90" oneway="true"/>
+			<languageMatch desired="xh" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="yi" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="yi_Hebr" supported="en_Latn" percent="90" oneway="true"/>
+			<languageMatch desired="yo" supported="en" percent="90" oneway="true"/>
+			<languageMatch desired="zu" supported="en" percent="90" oneway="true"/>
 			<!-- Script Matches -->
-			<languageMatch desired="sr_Latn" supported="sr_Cyrl" percent="95" /> <!-- Most serbs can read either script. -->
-			<languageMatch desired="*_Hans" supported="*_Hant" percent="85" oneway="true" /> <!-- Readers of simplified can read traditional much better than reverse. -->
-			<languageMatch desired="*_Hant" supported="*_Hans" percent="81" oneway="true" />
-			
+			<languageMatch desired="sr_Latn" supported="sr_Cyrl" percent="95"/> <!-- Most serbs can read either script. -->
+			<languageMatch desired="*_Hans" supported="*_Hant" percent="85" oneway="true"/> <!-- Readers of simplified can read traditional much better than reverse. -->
+			<languageMatch desired="*_Hant" supported="*_Hans" percent="81" oneway="true"/>
 			<!-- Region Matches -->
 			<!-- MO and HK are close -->
-			<languageMatch desired="zh_Hant_HK" supported="zh_Hant_MO" percent="96"/>
-
+			<languageMatch desired="zh_Hant_HK" supported="zh_Hant_MO" percent="97"/>
 			<!-- Most pt countries are like pt-PT, so make BR further from everything -->
+			<languageMatch desired="pt_*_BR" supported="pt_*_US" percent="96"/> <!-- exception for US, should add other americas -->
+			<languageMatch desired="pt_*_US" supported="pt_*_*" percent="92"/>
 			<languageMatch desired="pt_*_BR" supported="pt_*_*" percent="92"/>
 			<languageMatch desired="pt_*_*" supported="pt_*_*" percent="96"/> <!-- and then them closer -->
-			
 			<!-- Non-US Englishes are closer to GB. Managed by having en-US be further from everything. -->
-			<!-- Note: for a small list, US would be closer (AS, GU, MH, MP, PR, UM, VI), but we don't have the right structure to do that yet-->
-			<languageMatch desired="en_*_US" supported="en_*_*" percent="92" />
-			<languageMatch desired="en_*_GB" supported="en_*_*" percent="96" />
-			<languageMatch desired="en_*_001" supported="en_*_*" percent="96" />
-			<languageMatch desired="en_*_*" supported="en_*_*" percent="95" />
-			
+			<!-- Note: for a small list, US would be closer (AS, GU, MH, MP, PR, UM, VI), but we don't have the right structure to do that yet -->
+			<languageMatch desired="en_*_US" supported="en_*_*" percent="94"/>
+			<languageMatch desired="en_*_GB" supported="en_*_*" percent="96"/>
+			<languageMatch desired="en_*_001" supported="en_*_*" percent="96"/>
+			<languageMatch desired="en_*_*" supported="en_*_*" percent="95"/>
 			<!-- Latin American Spanishes are closer to each other. Managed by having es-ES be further from everything else. -->
-			<!-- Note: for a small list, ES would be closer (EA, GQ, IC, PH), but we don't have the right structure to do that yet-->
-			<languageMatch desired="es_*_ES" supported="es_*_*" percent="92" />
-			<languageMatch desired="es_*_419" supported="es_*_*" percent="96" />
-			<languageMatch desired="es_*_*" supported="es_*_*" percent="95" />
-						
+			<!-- Note: for a small list, ES would be closer (EA, GQ, IC, PH), but we don't have the right structure to do that yet -->
+			<languageMatch desired="es_*_ES" supported="es_*_*" percent="92"/>
+			<languageMatch desired="es_*_419" supported="es_*_*" percent="96"/>
+			<languageMatch desired="es_*_*" supported="es_*_*" percent="95"/>
 			<!-- Fallbacks -->
-			<languageMatch desired="*" supported="*" percent="20" />  <!-- [Default value - must be at end!] Normally there is no comprehension of different languages. -->
-			<languageMatch desired="*_*" supported="*_*" percent="60" /> <!-- [Default value - must be at end!] Normally there is little comprehension of different scripts. -->
-			<languageMatch desired="*_*_*" supported="*_*_*" percent="92" /> <!-- [Default value - must be at end!] Normally there are small differences across regions. -->
+			<languageMatch desired="*" supported="*" percent="20"/>  <!-- [Default value - must be at end!] Normally there is no comprehension of different languages. -->
+			<languageMatch desired="*_*" supported="*_*" percent="60"/> <!-- [Default value - must be at end!] Normally there is little comprehension of different scripts. -->
+			<languageMatch desired="*_*_*" supported="*_*_*" percent="96"/> <!-- [Default value - must be at end!] Normally there are small differences across regions. -->
 		</languageMatches>
 	</languageMatching>
-</supplementalData>
+</supplementalData>
\ No newline at end of file
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/likelySubtags.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/likelySubtags.xml
similarity index 95%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/likelySubtags.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/likelySubtags.xml
index 304d688b2ab..a2fe3c3bbc9 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/likelySubtags.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/likelySubtags.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.dtd">
 <!--
-Copyright © 1991-2015 Unicode, Inc.
+Copyright © 1991-2016 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
@@ -11,8 +11,7 @@ data using the GenerateMaximalLocales tool. Under normal circumstances, this fil
 not be patched by hand, as any changes made in that fashion may be lost.
 -->
 <supplementalData>
-    <version number="$Revision: 11318 $"/>
-    <generation date="$Date: 2015-02-25 23:47:56 -0600 (Wed, 25 Feb 2015) $"/>
+    <version number="$Revision: 12447 $"/>
     <likelySubtags>
 		<likelySubtag from="aa" to="aa_Latn_ET"/>
 		<!--{ Afar; ?; ? } => { Afar; Latin; Ethiopia }-->
@@ -36,6 +35,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ Afrikaans; ?; ? } => { Afrikaans; Latin; South Africa }-->
 		<likelySubtag from="agq" to="agq_Latn_CM"/>
 		<!--{ Aghem; ?; ? } => { Aghem; Latin; Cameroon }-->
+		<likelySubtag from="aho" to="aho_Ahom_IN"/>
+		<!--{ Ahom; ?; ? } => { Ahom; Ahom; India }-->
 		<likelySubtag from="ak" to="ak_Latn_GH"/>
 		<!--{ Akan; ?; ? } => { Akan; Latin; Ghana }-->
 		<likelySubtag from="akk" to="akk_Xsux_IQ"/>
@@ -72,6 +73,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ Assamese; ?; ? } => { Assamese; Bengali; India }-->
 		<likelySubtag from="asa" to="asa_Latn_TZ"/>
 		<!--{ Asu; ?; ? } => { Asu; Latin; Tanzania }-->
+		<likelySubtag from="ase" to="ase_Sgnw_US"/>
+		<!--{ American Sign Language; ?; ? } => { American Sign Language; SignWriting; United States }-->
 		<likelySubtag from="ast" to="ast_Latn_ES"/>
 		<!--{ Asturian; ?; ? } => { Asturian; Latin; Spain }-->
 		<likelySubtag from="atj" to="atj_Latn_CA"/>
@@ -84,14 +87,14 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ Aymara; ?; ? } => { Aymara; Latin; Bolivia }-->
 		<likelySubtag from="az" to="az_Latn_AZ"/>
 		<!--{ Azerbaijani; ?; ? } => { Azerbaijani; Latin; Azerbaijan }-->
+		<likelySubtag from="az_IQ" to="az_Arab_IQ"/>
+		<!--{ Azerbaijani; ?; Iraq } => { Azerbaijani; Arabic; Iraq }-->
 		<likelySubtag from="az_IR" to="az_Arab_IR"/>
 		<!--{ Azerbaijani; ?; Iran } => { Azerbaijani; Arabic; Iran }-->
 		<likelySubtag from="az_RU" to="az_Cyrl_RU"/>
 		<!--{ Azerbaijani; ?; Russia } => { Azerbaijani; Cyrillic; Russia }-->
 		<likelySubtag from="az_Arab" to="az_Arab_IR"/>
 		<!--{ Azerbaijani; Arabic; ? } => { Azerbaijani; Arabic; Iran }-->
-		<likelySubtag from="azb" to="azb_Arab_IR"/>
-		<!--{ South Azerbaijani; ?; ? } => { South Azerbaijani; Arabic; Iran }-->
 		<likelySubtag from="ba" to="ba_Cyrl_RU"/>
 		<!--{ Bashkir; ?; ? } => { Bashkir; Cyrillic; Russia }-->
 		<likelySubtag from="bal" to="bal_Arab_PK"/>
@@ -114,6 +117,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ Baoulé; ?; ? } => { Baoulé; Latin; Côte d’Ivoire }-->
 		<likelySubtag from="be" to="be_Cyrl_BY"/>
 		<!--{ Belarusian; ?; ? } => { Belarusian; Cyrillic; Belarus }-->
+		<likelySubtag from="bej" to="bej_Arab_SD"/>
+		<!--{ Beja; ?; ? } => { Beja; Arabic; Sudan }-->
 		<likelySubtag from="bem" to="bem_Latn_ZM"/>
 		<!--{ Bemba; ?; ? } => { Bemba; Latin; Zambia }-->
 		<likelySubtag from="bew" to="bew_Latn_ID"/>
@@ -132,10 +137,10 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ Bulgarian; ?; ? } => { Bulgarian; Cyrillic; Bulgaria }-->
 		<likelySubtag from="bgc" to="bgc_Deva_IN"/>
 		<!--{ Haryanvi; ?; ? } => { Haryanvi; Devanagari; India }-->
+		<likelySubtag from="bgn" to="bgn_Arab_PK"/>
+		<!--{ Western Balochi; ?; ? } => { Western Balochi; Arabic; Pakistan }-->
 		<likelySubtag from="bgx" to="bgx_Grek_TR"/>
 		<!--{ Balkan Gagauz Turkish; ?; ? } => { Balkan Gagauz Turkish; Greek; Turkey }-->
-		<likelySubtag from="bh" to="bh_Kthi_IN"/>
-		<!--{ Bihari; ?; ? } => { Bihari; Kaithi; India }-->
 		<likelySubtag from="bhb" to="bhb_Deva_IN"/>
 		<!--{ Bhili; ?; ? } => { Bhili; Devanagari; India }-->
 		<likelySubtag from="bhi" to="bhi_Deva_IN"/>
@@ -302,6 +307,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ Tomo Kan Dogon; ?; ? } => { Tomo Kan Dogon; Latin; Mali }-->
 		<likelySubtag from="dtp" to="dtp_Latn_MY"/>
 		<!--{ Central Dusun; ?; ? } => { Central Dusun; Latin; Malaysia }-->
+		<likelySubtag from="dty" to="dty_Deva_NP"/>
+		<!--{ Dotyali; ?; ? } => { Dotyali; Devanagari; Nepal }-->
 		<likelySubtag from="dua" to="dua_Latn_CM"/>
 		<!--{ Duala; ?; ? } => { Duala; Latin; Cameroon }-->
 		<likelySubtag from="dv" to="dv_Thaa_MV"/>
@@ -352,10 +359,14 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ Fang; ?; ? } => { Fang; Latin; Equatorial Guinea }-->
 		<likelySubtag from="ff" to="ff_Latn_SN"/>
 		<!--{ Fulah; ?; ? } => { Fulah; Latin; Senegal }-->
+		<likelySubtag from="ff_Adlm" to="ff_Adlm_GN"/>
+		<!--{ Fulah; Adlam; ? } => { Fulah; Adlam; Guinea }-->
 		<likelySubtag from="ffm" to="ffm_Latn_ML"/>
 		<!--{ Maasina Fulfulde; ?; ? } => { Maasina Fulfulde; Latin; Mali }-->
 		<likelySubtag from="fi" to="fi_Latn_FI"/>
 		<!--{ Finnish; ?; ? } => { Finnish; Latin; Finland }-->
+		<likelySubtag from="fia" to="fia_Arab_SD"/>
+		<!--{ Nobiin; ?; ? } => { Nobiin; Arabic; Sudan }-->
 		<likelySubtag from="fil" to="fil_Latn_PH"/>
 		<!--{ Filipino; ?; ? } => { Filipino; Latin; Philippines }-->
 		<likelySubtag from="fit" to="fit_Latn_SE"/>
@@ -384,6 +395,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ Friulian; ?; ? } => { Friulian; Latin; Italy }-->
 		<likelySubtag from="fuv" to="fuv_Latn_NG"/>
 		<!--{ Nigerian Fulfulde; ?; ? } => { Nigerian Fulfulde; Latin; Nigeria }-->
+		<likelySubtag from="fvr" to="fvr_Latn_SD"/>
+		<!--{ Fur; ?; ? } => { Fur; Latin; Sudan }-->
 		<likelySubtag from="fy" to="fy_Latn_NL"/>
 		<!--{ Western Frisian; ?; ? } => { Western Frisian; Latin; Netherlands }-->
 		<likelySubtag from="ga" to="ga_Latn_IE"/>
@@ -451,7 +464,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="gv" to="gv_Latn_IM"/>
 		<!--{ Manx; ?; ? } => { Manx; Latin; Isle of Man }-->
 		<likelySubtag from="gvr" to="gvr_Deva_NP"/>
-		<!--{ Western Gurung; ?; ? } => { Western Gurung; Devanagari; Nepal }-->
+		<!--{ Gurung; ?; ? } => { Gurung; Devanagari; Nepal }-->
 		<likelySubtag from="gwi" to="gwi_Latn_CA"/>
 		<!--{ Gwichʼin; ?; ? } => { Gwichʼin; Latin; Canada }-->
 		<likelySubtag from="ha" to="ha_Latn_NG"/>
@@ -470,10 +483,12 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ Hebrew; ?; ? } => { Hebrew; Hebrew; Israel }-->
 		<likelySubtag from="hi" to="hi_Deva_IN"/>
 		<!--{ Hindi; ?; ? } => { Hindi; Devanagari; India }-->
-		<likelySubtag from="hif" to="hif_Deva_FJ"/>
-		<!--{ Fiji Hindi; ?; ? } => { Fiji Hindi; Devanagari; Fiji }-->
+		<likelySubtag from="hif" to="hif_Latn_FJ"/>
+		<!--{ Fiji Hindi; ?; ? } => { Fiji Hindi; Latin; Fiji }-->
 		<likelySubtag from="hil" to="hil_Latn_PH"/>
 		<!--{ Hiligaynon; ?; ? } => { Hiligaynon; Latin; Philippines }-->
+		<likelySubtag from="hlu" to="hlu_Hluw_TR"/>
+		<!--{ Hieroglyphic Luwian; ?; ? } => { Hieroglyphic Luwian; Anatolian Hieroglyphs; Turkey }-->
 		<likelySubtag from="hmd" to="hmd_Plrd_CN"/>
 		<!--{ Large Flowery Miao; ?; ? } => { Large Flowery Miao; Pollard Phonetic; China }-->
 		<likelySubtag from="hnd" to="hnd_Arab_PK"/>
@@ -499,7 +514,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="hsn" to="hsn_Hans_CN"/>
 		<!--{ Xiang Chinese; ?; ? } => { Xiang Chinese; Simplified; China }-->
 		<likelySubtag from="ht" to="ht_Latn_HT"/>
-		<!--{ Haitian; ?; ? } => { Haitian; Latin; Haiti }-->
+		<!--{ Haitian Creole; ?; ? } => { Haitian Creole; Latin; Haiti }-->
 		<likelySubtag from="hu" to="hu_Latn_HU"/>
 		<!--{ Hungarian; ?; ? } => { Hungarian; Latin; Hungary }-->
 		<likelySubtag from="hy" to="hy_Armn_AM"/>
@@ -587,7 +602,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="kfo" to="kfo_Latn_CI"/>
 		<!--{ Koro; ?; ? } => { Koro; Latin; Côte d’Ivoire }-->
 		<likelySubtag from="kfr" to="kfr_Deva_IN"/>
-		<!--{ Kachchi; ?; ? } => { Kachchi; Devanagari; India }-->
+		<!--{ Kachhi; ?; ? } => { Kachhi; Devanagari; India }-->
 		<likelySubtag from="kfy" to="kfy_Deva_IN"/>
 		<!--{ Kumaoni; ?; ? } => { Kumaoni; Devanagari; India }-->
 		<likelySubtag from="kg" to="kg_Latn_CD"/>
@@ -826,10 +841,14 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ Maori; ?; ? } => { Maori; Latin; New Zealand }-->
 		<likelySubtag from="min" to="min_Latn_ID"/>
 		<!--{ Minangkabau; ?; ? } => { Minangkabau; Latin; Indonesia }-->
+		<likelySubtag from="mis" to="mis_Hatr_IQ"/>
+		<!--{ Uncoded languages; ?; ? } => { Uncoded languages; Hatran; Iraq }-->
 		<likelySubtag from="mk" to="mk_Cyrl_MK"/>
 		<!--{ Macedonian; ?; ? } => { Macedonian; Cyrillic; Macedonia }-->
 		<likelySubtag from="ml" to="ml_Mlym_IN"/>
 		<!--{ Malayalam; ?; ? } => { Malayalam; Malayalam; India }-->
+		<likelySubtag from="mls" to="mls_Latn_SD"/>
+		<!--{ Masalit; ?; ? } => { Masalit; Latin; Sudan }-->
 		<likelySubtag from="mn" to="mn_Cyrl_MN"/>
 		<!--{ Mongolian; ?; ? } => { Mongolian; Cyrillic; Mongolia }-->
 		<likelySubtag from="mn_CN" to="mn_Mong_CN"/>
@@ -852,8 +871,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ Western Magar; ?; ? } => { Western Magar; Devanagari; Nepal }-->
 		<likelySubtag from="mrj" to="mrj_Cyrl_RU"/>
 		<!--{ Western Mari; ?; ? } => { Western Mari; Cyrillic; Russia }-->
-		<likelySubtag from="mru" to="mru_Mroo_BD"/>
-		<!--{ Mono (Cameroon); ?; ? } => { Mono (Cameroon); Mro; Bangladesh }-->
+		<likelySubtag from="mro" to="mro_Mroo_BD"/>
+		<!--{ Mru; ?; ? } => { Mru; Mro; Bangladesh }-->
 		<likelySubtag from="ms" to="ms_Latn_MY"/>
 		<!--{ Malay; ?; ? } => { Malay; Latin; Malaysia }-->
 		<likelySubtag from="ms_CC" to="ms_Arab_CC"/>
@@ -941,15 +960,15 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="non" to="non_Runr_SE"/>
 		<!--{ Old Norse; ?; ? } => { Old Norse; Runic; Sweden }-->
 		<likelySubtag from="nqo" to="nqo_Nkoo_GN"/>
-		<!--{ NʼKo; ?; ? } => { NʼKo; N’Ko; Guinea }-->
+		<!--{ N’Ko; ?; ? } => { N’Ko; N’Ko; Guinea }-->
 		<likelySubtag from="nr" to="nr_Latn_ZA"/>
 		<!--{ South Ndebele; ?; ? } => { South Ndebele; Latin; South Africa }-->
 		<likelySubtag from="nsk" to="nsk_Cans_CA"/>
 		<!--{ Naskapi; ?; ? } => { Naskapi; Unified Canadian Aboriginal Syllabics; Canada }-->
 		<likelySubtag from="nso" to="nso_Latn_ZA"/>
 		<!--{ Northern Sotho; ?; ? } => { Northern Sotho; Latin; South Africa }-->
-		<likelySubtag from="nus" to="nus_Latn_SD"/>
-		<!--{ Nuer; ?; ? } => { Nuer; Latin; Sudan }-->
+		<likelySubtag from="nus" to="nus_Latn_SS"/>
+		<!--{ Nuer; ?; ? } => { Nuer; Latin; South Sudan }-->
 		<likelySubtag from="nv" to="nv_Latn_US"/>
 		<!--{ Navajo; ?; ? } => { Navajo; Latin; United States }-->
 		<likelySubtag from="nxq" to="nxq_Latn_CN"/>
@@ -970,6 +989,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ Oriya; ?; ? } => { Oriya; Oriya; India }-->
 		<likelySubtag from="os" to="os_Cyrl_GE"/>
 		<!--{ Ossetic; ?; ? } => { Ossetic; Cyrillic; Georgia }-->
+		<likelySubtag from="osa" to="osa_Osge_US"/>
+		<!--{ Osage; ?; ? } => { Osage; Osage; United States }-->
 		<likelySubtag from="otk" to="otk_Orkh_MN"/>
 		<!--{ Old Turkish; ?; ? } => { Old Turkish; Orkhon; Mongolia }-->
 		<likelySubtag from="pa" to="pa_Guru_IN"/>
@@ -1034,8 +1055,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ Kʼicheʼ; ?; ? } => { Kʼicheʼ; Latin; Guatemala }-->
 		<likelySubtag from="qug" to="qug_Latn_EC"/>
 		<!--{ Chimborazo Highland Quichua; ?; ? } => { Chimborazo Highland Quichua; Latin; Ecuador }-->
-		<likelySubtag from="raj" to="raj_Latn_IN"/>
-		<!--{ Rajasthani; ?; ? } => { Rajasthani; Latin; India }-->
+		<likelySubtag from="raj" to="raj_Deva_IN"/>
+		<!--{ Rajasthani; ?; ? } => { Rajasthani; Devanagari; India }-->
 		<likelySubtag from="rcf" to="rcf_Latn_RE"/>
 		<!--{ Réunion Creole French; ?; ? } => { Réunion Creole French; Latin; Réunion }-->
 		<likelySubtag from="rej" to="rej_Latn_ID"/>
@@ -1122,6 +1143,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ Sindhi; Khudawadi; ? } => { Sindhi; Khudawadi; India }-->
 		<likelySubtag from="sdc" to="sdc_Latn_IT"/>
 		<!--{ Sassarese Sardinian; ?; ? } => { Sassarese Sardinian; Latin; Italy }-->
+		<likelySubtag from="sdh" to="sdh_Arab_IR"/>
+		<!--{ Southern Kurdish; ?; ? } => { Southern Kurdish; Arabic; Iran }-->
 		<likelySubtag from="se" to="se_Latn_NO"/>
 		<!--{ Northern Sami; ?; ? } => { Northern Sami; Latin; Norway }-->
 		<likelySubtag from="sef" to="sef_Latn_CI"/>
@@ -1218,6 +1241,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ Comorian; ?; ? } => { Comorian; Arabic; Mayotte }-->
 		<likelySubtag from="swc" to="swc_Latn_CD"/>
 		<!--{ Congo Swahili; ?; ? } => { Congo Swahili; Latin; Congo - Kinshasa }-->
+		<likelySubtag from="swg" to="swg_Latn_DE"/>
+		<!--{ Swabian; ?; ? } => { Swabian; Latin; Germany }-->
 		<likelySubtag from="swv" to="swv_Deva_IN"/>
 		<!--{ Shekhawati; ?; ? } => { Shekhawati; Devanagari; India }-->
 		<likelySubtag from="sxn" to="sxn_Latn_ID"/>
@@ -1322,6 +1347,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ Tuvalu; ?; ? } => { Tuvalu; Latin; Tuvalu }-->
 		<likelySubtag from="twq" to="twq_Latn_NE"/>
 		<!--{ Tasawaq; ?; ? } => { Tasawaq; Latin; Niger }-->
+		<likelySubtag from="txg" to="txg_Tang_CN"/>
+		<!--{ Tangut; ?; ? } => { Tangut; Tangut; China }-->
 		<likelySubtag from="ty" to="ty_Latn_PF"/>
 		<!--{ Tahitian; ?; ? } => { Tahitian; Latin; French Polynesia }-->
 		<likelySubtag from="tyv" to="tyv_Cyrl_RU"/>
@@ -1406,6 +1433,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ Wagdi; ?; ? } => { Wagdi; Devanagari; India }-->
 		<likelySubtag from="wls" to="wls_Latn_WF"/>
 		<!--{ Wallisian; ?; ? } => { Wallisian; Latin; Wallis & Futuna }-->
+		<likelySubtag from="wni" to="wni_Arab_KM"/>
+		<!--{ Ndzwani Comorian; ?; ? } => { Ndzwani Comorian; Arabic; Comoros }-->
 		<likelySubtag from="wo" to="wo_Latn_SN"/>
 		<!--{ Wolof; ?; ? } => { Wolof; Latin; Senegal }-->
 		<likelySubtag from="wtm" to="wtm_Deva_IN"/>
@@ -1456,8 +1485,16 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ Nheengatu; ?; ? } => { Nheengatu; Latin; Brazil }-->
 		<likelySubtag from="yua" to="yua_Latn_MX"/>
 		<!--{ Yucateco; ?; ? } => { Yucateco; Latin; Mexico }-->
+		<likelySubtag from="yue" to="yue_Hant_HK"/>
+		<!--{ Cantonese; ?; ? } => { Cantonese; Traditional; Hong Kong SAR China }-->
+		<likelySubtag from="yue_CN" to="yue_Hans_CN"/>
+		<!--{ Cantonese; ?; China } => { Cantonese; Simplified; China }-->
+		<likelySubtag from="yue_Hans" to="yue_Hans_CN"/>
+		<!--{ Cantonese; Simplified; ? } => { Cantonese; Simplified; China }-->
 		<likelySubtag from="za" to="za_Latn_CN"/>
 		<!--{ Zhuang; ?; ? } => { Zhuang; Latin; China }-->
+		<likelySubtag from="zag" to="zag_Latn_SD"/>
+		<!--{ Zaghawa; ?; ? } => { Zaghawa; Latin; Sudan }-->
 		<likelySubtag from="zdj" to="zdj_Arab_KM"/>
 		<!--{ Ngazidja Comorian; ?; ? } => { Ngazidja Comorian; Arabic; Comoros }-->
 		<likelySubtag from="zea" to="zea_Latn_NL"/>
@@ -1500,6 +1537,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ Chinese; ?; Vietnam } => { Chinese; Traditional; Vietnam }-->
 		<likelySubtag from="zh_Bopo" to="zh_Bopo_TW"/>
 		<!--{ Chinese; Bopomofo; ? } => { Chinese; Bopomofo; Taiwan }-->
+		<likelySubtag from="zh_Hanb" to="zh_Hanb_TW"/>
+		<!--{ Chinese; Han with Bopomofo; ? } => { Chinese; Han with Bopomofo; Taiwan }-->
 		<likelySubtag from="zh_Hant" to="zh_Hant_TW"/>
 		<!--{ Chinese; Traditional; ? } => { Chinese; Traditional; Taiwan }-->
 		<likelySubtag from="zmi" to="zmi_Latn_MY"/>
@@ -1725,7 +1764,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_HR" to="hr_Latn_HR"/>
 		<!--{ ?; ?; Croatia } => { Croatian; Latin; Croatia }-->
 		<likelySubtag from="und_HT" to="ht_Latn_HT"/>
-		<!--{ ?; ?; Haiti } => { Haitian; Latin; Haiti }-->
+		<!--{ ?; ?; Haiti } => { Haitian Creole; Latin; Haiti }-->
 		<likelySubtag from="und_HU" to="hu_Latn_HU"/>
 		<!--{ ?; ?; Hungary } => { Hungarian; Latin; Hungary }-->
 		<likelySubtag from="und_IC" to="es_Latn_IC"/>
@@ -1960,8 +1999,12 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ ?; ?; Mayotte } => { French; Latin; Mayotte }-->
 		<likelySubtag from="und_ZW" to="sn_Latn_ZW"/>
 		<!--{ ?; ?; Zimbabwe } => { Shona; Latin; Zimbabwe }-->
+		<likelySubtag from="und_Adlm" to="ff_Adlm_GN"/>
+		<!--{ ?; Adlam; ? } => { Fulah; Adlam; Guinea }-->
 		<likelySubtag from="und_Aghb" to="lez_Aghb_RU"/>
 		<!--{ ?; Caucasian Albanian; ? } => { Lezghian; Caucasian Albanian; Russia }-->
+		<likelySubtag from="und_Ahom" to="aho_Ahom_IN"/>
+		<!--{ ?; Ahom; ? } => { Ahom; Ahom; India }-->
 		<likelySubtag from="und_Arab" to="ar_Arab_EG"/>
 		<!--{ ?; Arabic; ? } => { Arabic; Arabic; Egypt }-->
 		<likelySubtag from="und_Arab_CC" to="ms_Arab_CC"/>
@@ -1988,6 +2031,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ ?; Arabic; Thailand } => { Pattani Malay; Arabic; Thailand }-->
 		<likelySubtag from="und_Arab_TJ" to="fa_Arab_TJ"/>
 		<!--{ ?; Arabic; Tajikistan } => { Persian; Arabic; Tajikistan }-->
+		<likelySubtag from="und_Arab_TR" to="az_Arab_TR"/>
+		<!--{ ?; Arabic; Turkey } => { Azerbaijani; Arabic; Turkey }-->
 		<likelySubtag from="und_Arab_YT" to="swb_Arab_YT"/>
 		<!--{ ?; Arabic; Mayotte } => { Comorian; Arabic; Mayotte }-->
 		<likelySubtag from="und_Armi" to="arc_Armi_IR"/>
@@ -2006,6 +2051,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ ?; Batak; ? } => { Batak Toba; Batak; Indonesia }-->
 		<likelySubtag from="und_Beng" to="bn_Beng_BD"/>
 		<!--{ ?; Bengali; ? } => { Bengali; Bengali; Bangladesh }-->
+		<likelySubtag from="und_Bhks" to="sa_Bhks_IN"/>
+		<!--{ ?; Bhaiksuki; ? } => { Sanskrit; Bhaiksuki; India }-->
 		<likelySubtag from="und_Bopo" to="zh_Bopo_TW"/>
 		<!--{ ?; Bopomofo; ? } => { Chinese; Bopomofo; Taiwan }-->
 		<likelySubtag from="und_Brah" to="pka_Brah_IN"/>
@@ -2086,6 +2133,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ ?; Gujarati; ? } => { Gujarati; Gujarati; India }-->
 		<likelySubtag from="und_Guru" to="pa_Guru_IN"/>
 		<!--{ ?; Gurmukhi; ? } => { Punjabi; Gurmukhi; India }-->
+		<likelySubtag from="und_Hanb" to="zh_Hanb_TW"/>
+		<!--{ ?; Han with Bopomofo; ? } => { Chinese; Han with Bopomofo; Taiwan }-->
 		<likelySubtag from="und_Hang" to="ko_Hang_KR"/>
 		<!--{ ?; Hangul; ? } => { Korean; Hangul; South Korea }-->
 		<likelySubtag from="und_Hani" to="zh_Hani_CN"/>
@@ -2096,6 +2145,10 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ ?; Simplified; ? } => { Chinese; Simplified; China }-->
 		<likelySubtag from="und_Hant" to="zh_Hant_TW"/>
 		<!--{ ?; Traditional; ? } => { Chinese; Traditional; Taiwan }-->
+		<likelySubtag from="und_Hant_CN" to="yue_Hant_CN"/>
+		<!--{ ?; Traditional; China } => { Cantonese; Traditional; China }-->
+		<likelySubtag from="und_Hatr" to="mis_Hatr_IQ"/>
+		<!--{ ?; Hatran; ? } => { Uncoded languages; Hatran; Iraq }-->
 		<likelySubtag from="und_Hebr" to="he_Hebr_IL"/>
 		<!--{ ?; Hebrew; ? } => { Hebrew; Hebrew; Israel }-->
 		<likelySubtag from="und_Hebr_CA" to="yi_Hebr_CA"/>
@@ -2110,10 +2163,16 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ ?; Hebrew; United States } => { Yiddish; Hebrew; United States }-->
 		<likelySubtag from="und_Hira" to="ja_Hira_JP"/>
 		<!--{ ?; Hiragana; ? } => { Japanese; Hiragana; Japan }-->
+		<likelySubtag from="und_Hluw" to="hlu_Hluw_TR"/>
+		<!--{ ?; Anatolian Hieroglyphs; ? } => { Hieroglyphic Luwian; Anatolian Hieroglyphs; Turkey }-->
 		<likelySubtag from="und_Hmng" to="hnj_Hmng_LA"/>
 		<!--{ ?; Pahawh Hmong; ? } => { Hmong Njua; Pahawh Hmong; Laos }-->
+		<likelySubtag from="und_Hung" to="hu_Hung_HU"/>
+		<!--{ ?; Old Hungarian; ? } => { Hungarian; Old Hungarian; Hungary }-->
 		<likelySubtag from="und_Ital" to="ett_Ital_IT"/>
 		<!--{ ?; Old Italic; ? } => { Etruscan; Old Italic; Italy }-->
+		<likelySubtag from="und_Jamo" to="ko_Jamo_KR"/>
+		<!--{ ?; Jamo; ? } => { Korean; Jamo; South Korea }-->
 		<likelySubtag from="und_Java" to="jv_Java_ID"/>
 		<!--{ ?; Javanese; ? } => { Javanese; Javanese; Indonesia }-->
 		<likelySubtag from="und_Jpan" to="ja_Jpan_JP"/>
@@ -2132,8 +2191,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ ?; Kannada; ? } => { Kannada; Kannada; India }-->
 		<likelySubtag from="und_Kore" to="ko_Kore_KR"/>
 		<!--{ ?; Korean; ? } => { Korean; Korean; South Korea }-->
-		<likelySubtag from="und_Kthi" to="bh_Kthi_IN"/>
-		<!--{ ?; Kaithi; ? } => { Bihari; Kaithi; India }-->
+		<likelySubtag from="und_Kthi" to="bho_Kthi_IN"/>
+		<!--{ ?; Kaithi; ? } => { Bhojpuri; Kaithi; India }-->
 		<likelySubtag from="und_Lana" to="nod_Lana_TH"/>
 		<!--{ ?; Lanna; ? } => { Northern Thai; Lanna; Thailand }-->
 		<likelySubtag from="und_Laoo" to="lo_Laoo_LA"/>
@@ -2196,6 +2255,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ ?; Mandaean; ? } => { Classical Mandaic; Mandaean; Iran }-->
 		<likelySubtag from="und_Mani" to="xmn_Mani_CN"/>
 		<!--{ ?; Manichaean; ? } => { Manichaean Middle Persian; Manichaean; China }-->
+		<likelySubtag from="und_Marc" to="bo_Marc_CN"/>
+		<!--{ ?; Marchen; ? } => { Tibetan; Marchen; China }-->
 		<likelySubtag from="und_Mend" to="men_Mend_SL"/>
 		<!--{ ?; Mende; ? } => { Mende; Mende; Sierra Leone }-->
 		<likelySubtag from="und_Merc" to="xmr_Merc_SD"/>
@@ -2208,10 +2269,12 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ ?; Modi; ? } => { Marathi; Modi; India }-->
 		<likelySubtag from="und_Mong" to="mn_Mong_CN"/>
 		<!--{ ?; Mongolian; ? } => { Mongolian; Mongolian; China }-->
-		<likelySubtag from="und_Mroo" to="mru_Mroo_BD"/>
-		<!--{ ?; Mro; ? } => { Mono (Cameroon); Mro; Bangladesh }-->
+		<likelySubtag from="und_Mroo" to="mro_Mroo_BD"/>
+		<!--{ ?; Mro; ? } => { Mru; Mro; Bangladesh }-->
 		<likelySubtag from="und_Mtei" to="mni_Mtei_IN"/>
 		<!--{ ?; Meitei Mayek; ? } => { Manipuri; Meitei Mayek; India }-->
+		<likelySubtag from="und_Mult" to="skr_Mult_PK"/>
+		<!--{ ?; Multani; ? } => { Saraiki; Multani; Pakistan }-->
 		<likelySubtag from="und_Mymr" to="my_Mymr_MM"/>
 		<!--{ ?; Myanmar; ? } => { Burmese; Myanmar; Myanmar (Burma) }-->
 		<likelySubtag from="und_Mymr_IN" to="kht_Mymr_IN"/>
@@ -2222,6 +2285,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ ?; Old North Arabian; ? } => { Ancient North Arabian; Old North Arabian; Saudi Arabia }-->
 		<likelySubtag from="und_Nbat" to="arc_Nbat_JO"/>
 		<!--{ ?; Nabataean; ? } => { Aramaic; Nabataean; Jordan }-->
+		<likelySubtag from="und_Newa" to="new_Newa_NP"/>
+		<!--{ ?; Newa; ? } => { Newari; Newa; Nepal }-->
 		<likelySubtag from="und_Nkoo" to="man_Nkoo_GN"/>
 		<!--{ ?; N’Ko; ? } => { Mandingo; N’Ko; Guinea }-->
 		<likelySubtag from="und_Ogam" to="sga_Ogam_IE"/>
@@ -2232,6 +2297,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ ?; Orkhon; ? } => { Old Turkish; Orkhon; Mongolia }-->
 		<likelySubtag from="und_Orya" to="or_Orya_IN"/>
 		<!--{ ?; Oriya; ? } => { Oriya; Oriya; India }-->
+		<likelySubtag from="und_Osge" to="osa_Osge_US"/>
+		<!--{ ?; Osage; ? } => { Osage; Osage; United States }-->
 		<likelySubtag from="und_Osma" to="so_Osma_SO"/>
 		<!--{ ?; Osmanya; ? } => { Somali; Osmanya; Somalia }-->
 		<likelySubtag from="und_Palm" to="arc_Palm_SY"/>
@@ -2262,6 +2329,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ ?; Old South Arabian; ? } => { Sabaean; Old South Arabian; Yemen }-->
 		<likelySubtag from="und_Saur" to="saz_Saur_IN"/>
 		<!--{ ?; Saurashtra; ? } => { Saurashtra; Saurashtra; India }-->
+		<likelySubtag from="und_Sgnw" to="ase_Sgnw_US"/>
+		<!--{ ?; SignWriting; ? } => { American Sign Language; SignWriting; United States }-->
 		<likelySubtag from="und_Shaw" to="en_Shaw_GB"/>
 		<!--{ ?; Shavian; ? } => { English; Shavian; United Kingdom }-->
 		<likelySubtag from="und_Shrd" to="sa_Shrd_IN"/>
@@ -2290,6 +2359,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ ?; New Tai Lue; ? } => { Lü; New Tai Lue; China }-->
 		<likelySubtag from="und_Taml" to="ta_Taml_IN"/>
 		<!--{ ?; Tamil; ? } => { Tamil; Tamil; India }-->
+		<likelySubtag from="und_Tang" to="txg_Tang_CN"/>
+		<!--{ ?; Tangut; ? } => { Tangut; Tangut; China }-->
 		<likelySubtag from="und_Tavt" to="blt_Tavt_VN"/>
 		<!--{ ?; Tai Viet; ? } => { Tai Dam; Tai Viet; Vietnam }-->
 		<likelySubtag from="und_Telu" to="te_Telu_IN"/>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/metaZones.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/metaZones.xml
similarity index 99%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/metaZones.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/metaZones.xml
index aa4557fd0d9..70f758307ee 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/metaZones.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/metaZones.xml
@@ -6,8 +6,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <supplementalData>
-	<version number="$Revision: 11162 $"/>
-	<generation date="$Date: 2015-02-03 17:45:30 -0600 (Tue, 03 Feb 2015) $"/>
+	<version number="$Revision: 12348 $"/>
 
 	<metaZones>
 		<metazoneInfo>
@@ -380,6 +379,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<timezone type="America/El_Salvador">
 				<usesMetazone mzone="America_Central"/>
 			</timezone>
+			<timezone type="America/Fort_Nelson">
+				<usesMetazone to="2015-03-08 10:00" mzone="America_Pacific"/>
+				<usesMetazone from="2015-03-08 10:00" mzone="America_Mountain"/>
+			</timezone>
 			<timezone type="America/Fortaleza">
 				<usesMetazone mzone="Brasilia"/>
 			</timezone>
@@ -552,7 +555,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<usesMetazone from="1982-12-02 05:00" mzone="America_Central"/>
 			</timezone>
 			<timezone type="America/Metlakatla">
-				<usesMetazone mzone="America_Pacific"/>
+				<usesMetazone to="2015-11-01 10:00" mzone="America_Pacific"/>
+				<usesMetazone from="2015-11-01 10:00" mzone="Alaska"/>
 			</timezone>
 			<timezone type="America/Mexico_City">
 				<usesMetazone mzone="America_Central"/>
@@ -843,7 +847,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</timezone>
 			<timezone type="Asia/Chita">
 				<usesMetazone to="2014-10-25 16:00" mzone="Yakutsk"/>
-				<usesMetazone from="2014-10-25 16:00" mzone="Irkutsk"/>
+				<usesMetazone to="2016-03-26 18:00" from="2014-10-25 16:00" mzone="Irkutsk"/>
+				<usesMetazone from="2016-03-26 18:00" mzone="Yakutsk"/>
 			</timezone>
 			<timezone type="Asia/Choibalsan">
 				<usesMetazone to="1983-03-31 16:00" mzone="Mongolia"/>
@@ -974,7 +979,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<usesMetazone from="1987-12-31 16:00" mzone="Indonesia_Western"/>
 			</timezone>
 			<timezone type="Asia/Pyongyang">
-				<usesMetazone mzone="Korea"/>
+				<usesMetazone to="2015-08-14 15:00" mzone="Korea"/>
+				<usesMetazone from="2015-08-14 15:00" mzone="Pyongyang"/>
 			</timezone>
 			<timezone type="Asia/Qatar">
 				<usesMetazone to="1972-05-31 20:00" mzone="Gulf"/>
@@ -1795,6 +1801,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<mapZone other="Pierre_Miquelon" territory="001" type="America/Miquelon"/>
 			<mapZone other="Pitcairn" territory="001" type="Pacific/Pitcairn"/>
 			<mapZone other="Ponape" territory="001" type="Pacific/Ponape"/>
+			<mapZone other="Pyongyang" territory="001" type="Asia/Pyongyang"/>
 			<mapZone other="Qyzylorda" territory="001" type="Asia/Qyzylorda"/>
 			<mapZone other="Reunion" territory="001" type="Indian/Reunion"/>
 			<mapZone other="Rothera" territory="001" type="Antarctica/Rothera"/>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/numberingSystems.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/numberingSystems.xml
similarity index 62%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/numberingSystems.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/numberingSystems.xml
index 6d18cdd1539..a95e0df09df 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/numberingSystems.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/numberingSystems.xml
@@ -6,18 +6,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <supplementalData>
-    <version number="$Revision: 9732 $"/>
-    <generation date="$Date: 2014-02-13 11:57:02 -0600 (Thu, 13 Feb 2014) $"/>
+    <version number="$Revision: 11966 $"/>
     <numberingSystems>
+        <numberingSystem id="ahom" type="numeric" digits="&#x11730;&#x11731;&#x11732;&#x11733;&#x11734;&#x11735;&#x11736;&#x11737;&#x11738;&#x11739;"/>
         <numberingSystem id="arab" type="numeric" digits="٠١٢٣٤٥٦٧٨٩"/>
         <numberingSystem id="arabext" type="numeric" digits="۰۱۲۳۴۵۶۷۸۹"/>
         <numberingSystem id="armn" type="algorithmic" rules="armenian-upper"/>
         <numberingSystem id="armnlow" type="algorithmic" rules="armenian-lower"/>
         <numberingSystem id="bali" type="numeric" digits="᭐᭑᭒᭓᭔᭕᭖᭗᭘᭙"/>
         <numberingSystem id="beng" type="numeric" digits="০১২৩৪৫৬৭৮৯"/>
-        <numberingSystem id="brah" type="numeric" digits="𑁦𑁧𑁨𑁩𑁪𑁫𑁬𑁭𑁮𑁯" draft="provisional"/>
-        <numberingSystem id="cakm" type="numeric" digits="𑄶𑄷𑄸𑄹𑄺𑄻𑄼𑄽𑄾𑄿" draft="provisional"/>
+        <numberingSystem id="brah" type="numeric" digits="&#x11066;&#x11067;&#x11068;&#x11069;&#x1106A;&#x1106B;&#x1106C;&#x1106D;&#x1106E;&#x1106F;"/>
+        <numberingSystem id="cakm" type="numeric" digits="&#x11136;&#x11137;&#x11138;&#x11139;&#x1113A;&#x1113B;&#x1113C;&#x1113D;&#x1113E;&#x1113F;"/>
         <numberingSystem id="cham" type="numeric" digits="꩐꩑꩒꩓꩔꩕꩖꩗꩘꩙"/>
+        <numberingSystem id="cyrl" type="algorithmic" rules="cyrillic-lower"/>
         <numberingSystem id="deva" type="numeric" digits="०१२३४५६७८९"/>
         <numberingSystem id="ethi" type="algorithmic" rules="ethiopic"/>
         <numberingSystem id="fullwide" type="numeric" digits="０１２３４５６７８９"/>
@@ -33,6 +34,7 @@ For terms of use, see http://www.unicode.org/copyright.html
         <numberingSystem id="hant" type="algorithmic" rules="zh_Hant/SpelloutRules/spellout-cardinal"/>
         <numberingSystem id="hantfin" type="algorithmic" rules="zh_Hant/SpelloutRules/spellout-cardinal-financial"/>
         <numberingSystem id="hebr" type="algorithmic" rules="hebrew"/>
+        <numberingSystem id="hmng" type="numeric" digits="&#x16B50;&#x16B51;&#x16B52;&#x16B53;&#x16B54;&#x16B55;&#x16B56;&#x16B57;&#x16B58;&#x16B59;"/>
         <numberingSystem id="java" type="numeric" digits="꧐꧑꧒꧓꧔꧕꧖꧗꧘꧙"/>
         <numberingSystem id="jpan" type="algorithmic" rules="ja/SpelloutRules/spellout-cardinal"/>
         <numberingSystem id="jpanfin" type="algorithmic" rules="ja/SpelloutRules/spellout-cardinal-financial"/>
@@ -45,28 +47,40 @@ For terms of use, see http://www.unicode.org/copyright.html
         <numberingSystem id="latn" type="numeric" digits="0123456789"/>
         <numberingSystem id="lepc" type="numeric" digits="᱀᱁᱂᱃᱄᱅᱆᱇᱈᱉"/>
         <numberingSystem id="limb" type="numeric" digits="᥆᥇᥈᥉᥊᥋᥌᥍᥎᥏"/>
+        <numberingSystem id="mathbold" type="numeric" digits="&#x1D7CE;&#x1D7CF;&#x1D7D0;&#x1D7D1;&#x1D7D2;&#x1D7D3;&#x1D7D4;&#x1D7D5;&#x1D7D6;&#x1D7D7;"/>
+        <numberingSystem id="mathdbl" type="numeric" digits="&#x1D7D8;&#x1D7D9;&#x1D7DA;&#x1D7DB;&#x1D7DC;&#x1D7DD;&#x1D7DE;&#x1D7DF;&#x1D7E0;&#x1D7E1;"/>
+        <numberingSystem id="mathmono" type="numeric" digits="&#x1D7F6;&#x1D7F7;&#x1D7F8;&#x1D7F9;&#x1D7FA;&#x1D7FB;&#x1D7FC;&#x1D7FD;&#x1D7FE;&#x1D7FF;"/>
+        <numberingSystem id="mathsanb" type="numeric" digits="&#x1D7EC;&#x1D7ED;&#x1D7EE;&#x1D7EF;&#x1D7F0;&#x1D7F1;&#x1D7F2;&#x1D7F3;&#x1D7F4;&#x1D7F5;"/>
+        <numberingSystem id="mathsans" type="numeric" digits="&#x1D7E2;&#x1D7E3;&#x1D7E4;&#x1D7E5;&#x1D7E6;&#x1D7E7;&#x1D7E8;&#x1D7E9;&#x1D7EA;&#x1D7EB;"/>
         <numberingSystem id="mlym" type="numeric" digits="൦൧൨൩൪൫൬൭൮൯"/>
+        <numberingSystem id="modi" type="numeric" digits="&#x11650;&#x11651;&#x11652;&#x11653;&#x11654;&#x11655;&#x11656;&#x11657;&#x11658;&#x11659;"/>
         <numberingSystem id="mong" type="numeric" digits="᠐᠑᠒᠓᠔᠕᠖᠗᠘᠙"/>
+        <numberingSystem id="mroo" type="numeric" digits="&#x16A60;&#x16A61;&#x16A62;&#x16A63;&#x16A64;&#x16A65;&#x16A66;&#x16A67;&#x16A68;&#x16A69;"/>
         <numberingSystem id="mtei" type="numeric" digits="꯰꯱꯲꯳꯴꯵꯶꯷꯸꯹"/>
         <numberingSystem id="mymr" type="numeric" digits="၀၁၂၃၄၅၆၇၈၉"/>
         <numberingSystem id="mymrshan" type="numeric" digits="႐႑႒႓႔႕႖႗႘႙"/>
+        <numberingSystem id="mymrtlng" type="numeric" digits="&#xA9F0;&#xA9F1;&#xA9F2;&#xA9F3;&#xA9F4;&#xA9F5;&#xA9F6;&#xA9F7;&#xA9F8;&#xA9F9;"/>
         <numberingSystem id="nkoo" type="numeric" digits="߀߁߂߃߄߅߆߇߈߉"/>
         <numberingSystem id="olck" type="numeric" digits="᱐᱑᱒᱓᱔᱕᱖᱗᱘᱙"/>
         <numberingSystem id="orya" type="numeric" digits="୦୧୨୩୪୫୬୭୮୯"/>
-        <numberingSystem id="osma" type="numeric" digits="𐒠𐒡𐒢𐒣𐒤𐒥𐒦𐒧𐒨𐒩" draft="provisional"/>
+        <numberingSystem id="osma" type="numeric" digits="&#x104A0;&#x104A1;&#x104A2;&#x104A3;&#x104A4;&#x104A5;&#x104A6;&#x104A7;&#x104A8;&#x104A9;"/>
         <numberingSystem id="roman" type="algorithmic" rules="roman-upper"/>
         <numberingSystem id="romanlow" type="algorithmic" rules="roman-lower"/>
         <numberingSystem id="saur" type="numeric" digits="꣐꣑꣒꣓꣔꣕꣖꣗꣘꣙"/>
-        <numberingSystem id="shrd" type="numeric" digits="𑇐𑇑𑇒𑇓𑇔𑇕𑇖𑇗𑇘𑇙" draft="provisional"/>
-        <numberingSystem id="sora" type="numeric" digits="𑃰𑃱𑃲𑃳𑃴𑃵𑃶𑃷𑃸𑃹" draft="provisional"/>
+        <numberingSystem id="shrd" type="numeric" digits="&#x111D0;&#x111D1;&#x111D2;&#x111D3;&#x111D4;&#x111D5;&#x111D6;&#x111D7;&#x111D8;&#x111D9;"/>
+        <numberingSystem id="sind" type="numeric" digits="&#x112F0;&#x112F1;&#x112F2;&#x112F3;&#x112F4;&#x112F5;&#x112F6;&#x112F7;&#x112F8;&#x112F9;"/>
+        <numberingSystem id="sinh" type="numeric" digits="&#x0DE6;&#x0DE7;&#x0DE8;&#x0DE9;&#x0DEA;&#x0DEB;&#x0DEC;&#x0DED;&#x0DEE;&#x0DEF;"/>
+        <numberingSystem id="sora" type="numeric" digits="&#x110F0;&#x110F1;&#x110F2;&#x110F3;&#x110F4;&#x110F5;&#x110F6;&#x110F7;&#x110F8;&#x110F9;"/>
         <numberingSystem id="sund" type="numeric" digits="᮰᮱᮲᮳᮴᮵᮶᮷᮸᮹"/>
-        <numberingSystem id="takr" type="numeric" digits="𑛀𑛁𑛂𑛃𑛄𑛅𑛆𑛇𑛈𑛉" draft="provisional"/>
+        <numberingSystem id="takr" type="numeric" digits="&#x116C0;&#x116C1;&#x116C2;&#x116C3;&#x116C4;&#x116C5;&#x116C6;&#x116C7;&#x116C8;&#x116C9;"/>
         <numberingSystem id="talu" type="numeric" digits="᧐᧑᧒᧓᧔᧕᧖᧗᧘᧙"/>
         <numberingSystem id="taml" type="algorithmic" rules="tamil"/>
         <numberingSystem id="tamldec" type="numeric" digits="௦௧௨௩௪௫௬௭௮௯"/>
         <numberingSystem id="telu" type="numeric" digits="౦౧౨౩౪౫౬౭౮౯"/>
         <numberingSystem id="thai" type="numeric" digits="๐๑๒๓๔๕๖๗๘๙"/>
         <numberingSystem id="tibt" type="numeric" digits="༠༡༢༣༤༥༦༧༨༩"/>
+        <numberingSystem id="tirh" type="numeric" digits="&#x114D0;&#x114D1;&#x114D2;&#x114D3;&#x114D4;&#x114D5;&#x114D6;&#x114D7;&#x114D8;&#x114D9;"/>
         <numberingSystem id="vaii" type="numeric" digits="꘠꘡꘢꘣꘤꘥꘦꘧꘨꘩"/>
+        <numberingSystem id="wara" type="numeric" digits="&#x118E0;&#x118E1;&#x118E2;&#x118E3;&#x118E4;&#x118E5;&#x118E6;&#x118E7;&#x118E8;&#x118E9;"/>
     </numberingSystems>
 </supplementalData>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/ordinals.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/ordinals.xml
similarity index 94%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/ordinals.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/ordinals.xml
index 1f287f145fd..59f47808dd2 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/ordinals.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/ordinals.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.dtd">
 <!--
-Copyright © 1991-2013 Unicode, Inc.
+Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <supplementalData>
-    <version number="$Revision: 11229 $"/>
-    <generation date="$Date: 2015-02-18 09:11:57 -0600 (Wed, 18 Feb 2015) $"/>
+    <version number="$Revision: 12412 $"/>
     <plurals type="ordinal">
         <!-- For a canonicalized list, use GeneratedPluralSamples -->
 
@@ -23,7 +22,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <pluralRule count="one">n % 10 = 1,2 and n % 100 != 11,12 @integer 1, 2, 21, 22, 31, 32, 41, 42, 51, 52, 61, 62, 71, 72, 81, 82, 101, 1001, …</pluralRule>
             <pluralRule count="other"> @integer 0, 3~17, 100, 1000, 10000, 100000, 1000000, …</pluralRule>
         </pluralRules>
-        <pluralRules locales="fil fr hy lo mo ms ro tl vi">
+        <pluralRules locales="fil fr ga hy lo mo ms ro tl vi">
             <pluralRule count="one">n = 1 @integer 1</pluralRule>
             <pluralRule count="other"> @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, …</pluralRule>
         </pluralRules>
@@ -38,6 +37,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 
         <!-- 2: few,other -->
 
+        <pluralRules locales="be">
+            <pluralRule count="few">n % 10 = 2,3 and n % 100 != 12,13 @integer 2, 3, 22, 23, 32, 33, 42, 43, 52, 53, 62, 63, 72, 73, 82, 83, 102, 1002, …</pluralRule>
+            <pluralRule count="other"> @integer 0, 1, 4~17, 100, 1000, 10000, 100000, 1000000, …</pluralRule>
+        </pluralRules>
         <pluralRules locales="uk">
             <pluralRule count="few">n % 10 = 3 and n % 100 != 13 @integer 3, 23, 33, 43, 53, 63, 73, 83, 103, 1003, …</pluralRule>
             <pluralRule count="other"> @integer 0~2, 4~16, 100, 1000, 10000, 100000, 1000000, …</pluralRule>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/pluralRanges.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/pluralRanges.xml
similarity index 98%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/pluralRanges.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/pluralRanges.xml
index 64612f11179..f17c9318318 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/pluralRanges.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/pluralRanges.xml
@@ -3,8 +3,7 @@
 <!-- Copyright © 1991-2013 Unicode, Inc. CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) 
 	For terms of use, see http://www.unicode.org/copyright.html -->
 <supplementalData>
-	<version number="$Revision: 11176 $" />
-	<generation date="$Date: 2015-02-10 22:44:44 -0600 (Tue, 10 Feb 2015) $" />
+	<version number="$Revision: 11914 $" />
 	<plurals> <!-- Format with GeneratePluralRanges.java -->
 
 <!-- other -->
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/plurals.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/plurals.xml
similarity index 98%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/plurals.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/plurals.xml
index e11b220927d..cdd0b529623 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/plurals.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/plurals.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.dtd">
 <!--
-Copyright © 1991-2013 Unicode, Inc.
+Copyright © 1991-2015 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <supplementalData>
-    <version number="$Revision: 11229 $"/>
-    <generation date="$Date: 2015-02-18 09:11:57 -0600 (Wed, 18 Feb 2015) $"/>
+    <version number="$Revision: 12002 $"/>
     <plurals type="cardinal">
         <!-- For a canonicalized list, use GeneratedPluralSamples -->
 
@@ -47,7 +46,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <pluralRule count="one">n = 0..2 and n != 2 @integer 0, 1 @decimal 0.0, 1.0, 0.00, 1.00, 0.000, 1.000, 0.0000, 1.0000</pluralRule>
             <pluralRule count="other"> @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 0.1~0.9, 1.1~1.7, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
         </pluralRules>
-        <pluralRules locales="af asa az bem bez bg brx ce cgg chr ckb dv ee el eo es eu fo fur gsw ha haw hu jgo jmc ka kaj kcg kk kkj kl ks ksb ku ky lb lg mas mgo ml mn nah nb nd ne nn nnh no nr ny nyn om or os pap ps rm rof rwk saq seh sn so sq ss ssy st syr ta te teo tig tk tn tr ts ug uz ve vo vun wae xh xog">
+        <pluralRules locales="af asa az bem bez bg brx ce cgg chr ckb dv ee el eo es eu fo fur gsw ha haw hu jgo jmc ka kaj kcg kk kkj kl ks ksb ku ky lb lg mas mgo ml mn nah nb nd ne nn nnh no nr ny nyn om or os pap ps rm rof rwk saq sdh seh sn so sq ss ssy st syr ta te teo tig tk tn tr ts ug uz ve vo vun wae xh xog">
             <pluralRule count="one">n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000</pluralRule>
             <pluralRule count="other"> @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~0.9, 1.1~1.6, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
         </pluralRules>
@@ -227,6 +226,5 @@ For terms of use, see http://www.unicode.org/copyright.html
             <pluralRule count="many">n = 6 @integer 6 @decimal 6.0, 6.00, 6.000, 6.0000</pluralRule>
             <pluralRule count="other"> @integer 4, 5, 7~20, 100, 1000, 10000, 100000, 1000000, … @decimal 0.1~0.9, 1.1~1.7, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
         </pluralRules>
-
     </plurals>
 </supplementalData>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/rgScope.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/rgScope.xml
new file mode 100644
index 00000000000..a7f191b179c
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/rgScope.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE supplementalData SYSTEM '../../common/dtd/ldmlSupplemental.dtd'>
+<!--
+Copyright © 1991-2016 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<supplementalData>
+    <version number='$Revision: 12479 $'/>
+	<rgScope>
+		<rgPath path="//supplementalData/currencyData/fractions/info[@iso4217='#'][@digits='*'][@rounding='*'][@cashDigits='*'][@cashRounding='*']" draft="provisional" />
+		<rgPath path="//supplementalData/currencyData/fractions/info[@iso4217='#'][@digits='*'][@rounding='*'][@cashRounding='*']" draft="provisional" />
+		<rgPath path="//supplementalData/currencyData/fractions/info[@iso4217='#'][@digits='*'][@rounding='*']" draft="provisional" />
+		<rgPath path="//supplementalData/calendarPreferenceData/calendarPreference[@territories='#'][@ordering='*']" draft="provisional" />
+		<rgPath path="//supplementalData/weekData/firstDay[@day='*'][@territories='#']" draft="provisional" />
+		<rgPath path="//supplementalData/weekData/minDays[@count='*'][@territories='#']" draft="provisional" />
+		<rgPath path="//supplementalData/weekData/weekendStart[@day='*'][@territories='#']" draft="provisional" />
+		<rgPath path="//supplementalData/weekData/weekendEnd[@day='*'][@territories='#']" draft="provisional" />
+		<rgPath path="//supplementalData/timeData/hours[@allowed='*'][@preferred='*'][@regions='#']" draft="provisional" />
+		<rgPath path="//supplementalData/measurementData/measurementSystem[@type='*'][@category='*'][@territories='#']" draft="provisional" />
+		<rgPath path="//supplementalData/measurementData/measurementSystem[@type='*'][@territories='#']" draft="provisional" />
+		<rgPath path="//supplementalData/measurementData/paperSize[@type='*'][@territories='#']" draft="provisional" />
+		<rgPath path="//supplementalData/unitPreferenceData/unitPreferences[@category='*'][@usage='*'][@scope='*']/unitPreference[@regions='#'][@alt='*']" draft="provisional" />
+		<rgPath path="//supplementalData/unitPreferenceData/unitPreferences[@category='*'][@usage='*'][@scope='*']/unitPreference[@regions='#']" draft="provisional" />
+		<rgPath path="//supplementalData/unitPreferenceData/unitPreferences[@category='*'][@usage='*']/unitPreference[@regions='#'][@alt='*']" draft="provisional" />
+		<rgPath path="//supplementalData/unitPreferenceData/unitPreferences[@category='*'][@usage='*']/unitPreference[@regions='#']" draft="provisional" />
+	</rgScope>
+</supplementalData>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/subdivisions.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/subdivisions.xml
new file mode 100644
index 00000000000..61552ff20ba
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/subdivisions.xml
@@ -0,0 +1,428 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE supplementalData SYSTEM '../../common/dtd/ldmlSupplemental.dtd'>
+<!--
+Copyright © 1991-2013 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+
+DO NOT CHANGE MANUALLY! Generated by: GenerateSubdivisions
+-->
+<supplementalData>
+    <version number='$Revision: 12257 $'/>
+	<subdivisionContainment>
+		<subgroup type="AD" contains="02 03 04 05 06 07 08"/>
+		<subgroup type="AE" contains="AJ AZ DU FU RK SH UQ"/>
+		<subgroup type="AF" contains="BAL BAM BDG BDS BGL DAY FRA FYB GHA GHO HEL HER JOW KAB KAN KAP KDZ KHO KNR LAG LOG NAN NIM NUR PAN PAR PIA PKA SAM SAR TAK URU WAR ZAB"/>
+		<subgroup type="AG" contains="03 04 05 06 07 08 10 11"/>
+		<subgroup type="AL" contains="01 02 03 04 05 06 07 08 09 10 11 12"/>
+		<subgroup type="AM" contains="AG AR AV ER GR KT LO SH SU TV VD"/>
+		<subgroup type="AO" contains="BGO BGU BIE CAB CCU CNN CNO CUS HUA HUI LNO LSU LUA MAL MOX NAM UIG ZAI"/>
+		<subgroup type="AR" contains="A B C D E F G H J K L M N P Q R S T U V W X Y Z"/>
+		<subgroup type="AT" contains="1 2 3 4 5 6 7 8 9"/>
+		<subgroup type="AU" contains="ACT NSW NT QLD SA TAS VIC WA"/>
+		<subgroup type="AZ" contains="ABS AGA AGC AGM AGS AGU AST BA BAL BAR BEY BIL CAB CAL DAS FUZ GA GAD GOR GOY GYG HAC IMI ISM KAL KUR LA LAC LAN LER MAS MI NA NEF NX OGU QAB QAX QAZ QBA QBI QOB QUS SA SAB SAK SAL SAT SBN SIY SKR SM SMI SMX SR SUS TAR TOV UCA XA XAC XCI XIZ XVD YAR YE YEV ZAN ZAQ ZAR"/>
+		<subgroup type="AZ" subtype="NX" contains="BAB CUL KAN NV ORD SAD SAH SAR"/>
+		<subgroup type="BA" contains="BIH BRC SRP"/>
+		<subgroup type="BB" contains="01 02 03 04 05 06 07 08 09 10 11"/>
+		<subgroup type="BD" contains="A B C D E F G"/>
+		<subgroup type="BD" subtype="A" contains="02 06 07 25 50 51"/>
+		<subgroup type="BD" subtype="B" contains="01 04 08 09 10 11 16 29 31 47 56"/>
+		<subgroup type="BD" subtype="C" contains="13 15 17 18 21 26 33 34 35 36 40 41 42 53 57 62 63"/>
+		<subgroup type="BD" subtype="D" contains="05 12 22 23 27 30 37 39 43 58"/>
+		<subgroup type="BD" subtype="E" contains="03 24 44 45 48 49 54 55 59"/>
+		<subgroup type="BD" subtype="F" contains="14 19 28 32 46 52 64"/>
+		<subgroup type="BD" subtype="G" contains="20 38 60 61"/>
+		<subgroup type="BE" contains="BRU VLG WAL"/>
+		<subgroup type="BE" subtype="VLG" contains="VAN VBR VLI VOV VWV"/>
+		<subgroup type="BE" subtype="WAL" contains="WBR WHT WLG WLX WNA"/>
+		<subgroup type="BF" contains="01 02 03 04 05 06 07 08 09 10 11 12 13"/>
+		<subgroup type="BF" subtype="01" contains="BAL BAN KOS MOU NAY SOR"/>
+		<subgroup type="BF" subtype="02" contains="COM LER"/>
+		<subgroup type="BF" subtype="03" contains="KAD"/>
+		<subgroup type="BF" subtype="04" contains="BLG KOP KOT"/>
+		<subgroup type="BF" subtype="05" contains="BAM NAM SMT"/>
+		<subgroup type="BF" subtype="06" contains="BLK SIS SNG ZIR"/>
+		<subgroup type="BF" subtype="07" contains="BAZ NAO ZOU"/>
+		<subgroup type="BF" subtype="08" contains="GNA GOU KMD KMP TAP"/>
+		<subgroup type="BF" subtype="09" contains="HOU KEN TUI"/>
+		<subgroup type="BF" subtype="10" contains="LOR PAS YAT ZON"/>
+		<subgroup type="BF" subtype="11" contains="GAN KOW OUB"/>
+		<subgroup type="BF" subtype="12" contains="OUD SEN SOM YAG"/>
+		<subgroup type="BF" subtype="13" contains="BGR IOB NOU PON"/>
+		<subgroup type="BG" contains="01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28"/>
+		<subgroup type="BH" contains="13 14 15 17"/>
+		<subgroup type="BI" contains="BB BL BM BR CA CI GI KI KR KY MA MU MW MY NG RM RT RY"/>
+		<subgroup type="BJ" contains="AK AL AQ BO CO DO KO LI MO OU PL ZO"/>
+		<subgroup type="BN" contains="BE BM TE TU"/>
+		<subgroup type="BO" contains="B C H L N O P S T"/>
+		<subgroup type="BQ" contains="BO SA SE"/>
+		<subgroup type="BR" contains="AC AL AM AP BA CE DF ES GO MA MG MS MT PA PB PE PI PR RJ RN RO RR RS SC SE SP TO"/>
+		<subgroup type="BS" contains="AK BI BP BY CE CI CK CO CS EG EX FP GC HI HT IN LI MC MG MI NE NO NS RC RI SA SE SO SS SW WG"/>
+		<subgroup type="BT" contains="11 12 13 14 15 21 22 23 24 31 32 33 34 41 42 43 44 45 GA TY"/>
+		<subgroup type="BW" contains="CE CH FR GA GH JW KG KL KW LO NE NW SE SO SP ST"/>
+		<subgroup type="BY" contains="BR HM HO HR MA MI VI"/>
+		<subgroup type="BZ" contains="BZ CY CZL OW SC TOL"/>
+		<subgroup type="CA" contains="AB BC MB NB NL NS NT NU ON PE QC SK YT"/>
+		<subgroup type="CD" contains="BC BN EQ KA KE KN KW MA NK OR SK"/>
+		<subgroup type="CF" contains="AC BB BGF BK HK HM HS KB KG LB MB MP NM OP SE UK VK"/>
+		<subgroup type="CG" contains="2 5 7 8 9 11 12 13 14 15 16 BZV"/>
+		<subgroup type="CH" contains="AG AI AR BE BL BS FR GE GL GR JU LU NE NW OW SG SH SO SZ TG TI UR VD VS ZG ZH"/>
+		<subgroup type="CI" contains="AB BS CM DN GD LC LG MG SM SV VB WR YM ZZ"/>
+		<subgroup type="CL" contains="AI AN AP AR AT BI CO LI LL LR MA ML RM TA VS"/>
+		<subgroup type="CM" contains="AD CE EN ES LT NO NW OU SU SW"/>
+		<subgroup type="CN" contains="11 12 13 14 15 21 22 23 31 32 33 34 35 36 37 41 42 43 44 45 46 50 51 52 53 54 61 62 63 64 65 71 91 92"/>
+		<subgroup type="CO" contains="AMA ANT ARA ATL BOL BOY CAL CAQ CAS CAU CES CHO COR CUN DC GUA GUV HUI LAG MAG MET NAR NSA PUT QUI RIS SAN SAP SUC TOL VAC VAU VID"/>
+		<subgroup type="CR" contains="A C G H L P SJ"/>
+		<subgroup type="CU" contains="01 03 04 05 06 07 08 09 10 11 12 13 14 15 16 99"/>
+		<subgroup type="CV" contains="B S"/>
+		<subgroup type="CV" subtype="B" contains="BV PA PN RB RG SL SV TS"/>
+		<subgroup type="CV" subtype="S" contains="BR CA CF CR MA MO PR RS SD SF SM SO SS TA"/>
+		<subgroup type="CY" contains="01 02 03 04 05 06"/>
+		<subgroup type="CZ" contains="JC JM KA KR LI MO OL PA PL PR ST US VY ZL"/>
+		<subgroup type="CZ" subtype="JC" contains="311 312 313 314 315 316 317"/>
+		<subgroup type="CZ" subtype="JM" contains="621 622 623 624 625 626 627"/>
+		<subgroup type="CZ" subtype="KA" contains="411 412 413"/>
+		<subgroup type="CZ" subtype="KR" contains="521 522 523 524 525"/>
+		<subgroup type="CZ" subtype="LI" contains="511 512 513 514"/>
+		<subgroup type="CZ" subtype="MO" contains="801 802 803 804 805 806"/>
+		<subgroup type="CZ" subtype="OL" contains="711 712 713 714 715"/>
+		<subgroup type="CZ" subtype="PA" contains="531 532 533 534"/>
+		<subgroup type="CZ" subtype="PL" contains="321 322 323 324 325 326 327"/>
+		<subgroup type="CZ" subtype="PR" contains="10A 10B 10C 10D 10E 10F 101 102 103 104 105 106 107 108 109"/>
+		<subgroup type="CZ" subtype="ST" contains="20A 20B 20C 201 202 203 204 205 206 207 208 209"/>
+		<subgroup type="CZ" subtype="US" contains="421 422 423 424 425 426 427"/>
+		<subgroup type="CZ" subtype="VY" contains="611 612 613 614 615"/>
+		<subgroup type="CZ" subtype="ZL" contains="721 722 723 724"/>
+		<subgroup type="DE" contains="BB BE BW BY HB HE HH MV NI NW RP SH SL SN ST TH"/>
+		<subgroup type="DJ" contains="AR AS DI DJ OB TA"/>
+		<subgroup type="DK" contains="81 82 83 84 85"/>
+		<subgroup type="DM" contains="02 03 04 05 06 07 08 09 10 11"/>
+		<subgroup type="DO" contains="33 34 35 36 37 38 39 40 41 42"/>
+		<subgroup type="DO" subtype="33" contains="06 14 19 20"/>
+		<subgroup type="DO" subtype="34" contains="05 15 26 27"/>
+		<subgroup type="DO" subtype="35" contains="09 18 25"/>
+		<subgroup type="DO" subtype="36" contains="13 24 28"/>
+		<subgroup type="DO" subtype="37" contains="07 22"/>
+		<subgroup type="DO" subtype="38" contains="03 04 10 16"/>
+		<subgroup type="DO" subtype="39" contains="23 29 30"/>
+		<subgroup type="DO" subtype="40" contains="01 32"/>
+		<subgroup type="DO" subtype="41" contains="02 17 21 31"/>
+		<subgroup type="DO" subtype="42" contains="08 11 12"/>
+		<subgroup type="DZ" contains="01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48"/>
+		<subgroup type="EC" contains="A B C D E F G H I L M N O P R S SD SE T U W X Y Z"/>
+		<subgroup type="EE" contains="37 39 44 49 51 57 59 65 67 70 74 78 82 84 86"/>
+		<subgroup type="EG" contains="ALX ASN AST BA BH BNS C DK DT FYM GH GZ IS JS KB KFS KN LX MN MNF MT PTS SHG SHR SIN SUZ WAD"/>
+		<subgroup type="ER" contains="AN DK DU GB MA SK"/>
+		<subgroup type="ES" contains="AN AR AS CB CE CL CM CN CT EX GA IB MC MD ML NC PV RI VC"/>
+		<subgroup type="ES" subtype="AN" contains="AL CA CO GR H J MA SE"/>
+		<subgroup type="ES" subtype="AR" contains="HU TE Z"/>
+		<subgroup type="ES" subtype="AS" contains="O"/>
+		<subgroup type="ES" subtype="CB" contains="S"/>
+		<subgroup type="ES" subtype="CL" contains="AV BU LE P SA SG SO VA ZA"/>
+		<subgroup type="ES" subtype="CM" contains="AB CR CU GU TO"/>
+		<subgroup type="ES" subtype="CN" contains="GC TF"/>
+		<subgroup type="ES" subtype="CT" contains="B GI L T"/>
+		<subgroup type="ES" subtype="EX" contains="BA CC"/>
+		<subgroup type="ES" subtype="GA" contains="C LU OR PO"/>
+		<subgroup type="ES" subtype="IB" contains="PM"/>
+		<subgroup type="ES" subtype="MC" contains="MU"/>
+		<subgroup type="ES" subtype="MD" contains="M"/>
+		<subgroup type="ES" subtype="NC" contains="NA"/>
+		<subgroup type="ES" subtype="PV" contains="BI SS VI"/>
+		<subgroup type="ES" subtype="RI" contains="LO"/>
+		<subgroup type="ES" subtype="VC" contains="A CS V"/>
+		<subgroup type="ET" contains="AA AF AM BE DD GA HA OR SN SO TI"/>
+		<subgroup type="FI" contains="01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19"/>
+		<subgroup type="FJ" contains="01 02 03 04 05 06 07 08 09 10 11 12 13 14 C E N R W"/>
+		<subgroup type="FM" contains="KSA PNI TRK YAP"/>
+		<subgroup type="FR" contains="A B BL C CP D E F G GF GP H I J K L M MF MQ N NC O P PF PM Q R RE S T TF U V WF YT"/>
+		<subgroup type="FR" subtype="A" contains="67 68"/>
+		<subgroup type="FR" subtype="B" contains="24 33 40 47 64"/>
+		<subgroup type="FR" subtype="C" contains="03 15 43 63"/>
+		<subgroup type="FR" subtype="D" contains="21 58 71 89"/>
+		<subgroup type="FR" subtype="E" contains="22 29 35 56"/>
+		<subgroup type="FR" subtype="F" contains="18 28 36 37 41 45"/>
+		<subgroup type="FR" subtype="G" contains="08 10 51 52"/>
+		<subgroup type="FR" subtype="H" contains="2A 2B"/>
+		<subgroup type="FR" subtype="I" contains="25 39 70 90"/>
+		<subgroup type="FR" subtype="J" contains="75 77 78 91 92 93 94 95"/>
+		<subgroup type="FR" subtype="K" contains="11 30 34 48 66"/>
+		<subgroup type="FR" subtype="L" contains="19 23 87"/>
+		<subgroup type="FR" subtype="M" contains="54 55 57 88"/>
+		<subgroup type="FR" subtype="N" contains="09 12 31 32 46 65 81 82"/>
+		<subgroup type="FR" subtype="O" contains="59 62"/>
+		<subgroup type="FR" subtype="P" contains="14 50 61"/>
+		<subgroup type="FR" subtype="Q" contains="27 76"/>
+		<subgroup type="FR" subtype="R" contains="44 49 53 72 85"/>
+		<subgroup type="FR" subtype="S" contains="02 60 80"/>
+		<subgroup type="FR" subtype="T" contains="16 17 79 86"/>
+		<subgroup type="FR" subtype="U" contains="04 05 06 13 83 84"/>
+		<subgroup type="FR" subtype="V" contains="01 07 26 38 42 69 73 74"/>
+		<subgroup type="GA" contains="1 2 3 4 5 6 7 8 9"/>
+		<subgroup type="GB" contains="EAW ENG GBN NIR SCT UKM WLS"/>
+		<subgroup type="GB" subtype="ENG" contains="BAS BBD BDF BDG BEN BEX BIR BKM BMH BNE BNH BNS BOL BPL BRC BRD BRY BST BUR CAM CBF CHE CHW CLD CMA CMD CON COV CRY DAL DBY DER DEV DNC DOR DUD DUR EAL ENF ERY ESS ESX GAT GLS GRE HAL HAM HAV HCK HEF HIL HMF HNS HPL HRT HRW HRY IOS IOW ISL KEC KEN KHL KIR KTT KWL LAN LBH LCE LDS LEC LEW LIN LIV LND LUT MAN MDB MDW MIK MRT NBL NEL NET NFK NGM NLN NSM NTH NTT NTY NWM NYK OLD OXF PLY POL POR PTE RCC RCH RDB RDG RIC ROT RUT SAW SFK SFT SGC SHF SHN SHR SKP SLF SLG SND SOL SOM SOS SRY STE STH STN STS STT STY SWD SWK TAM TFW THR TOB TRF TWH WAR WBK WFT WGN WIL WKF WLL WLV WND WNM WOK WOR WRL WRT WSM WSX YOR"/>
+		<subgroup type="GB" subtype="NIR" contains="ABC AND ANN BFS CCG DRS FMO LBC MEA MUL NMD"/>
+		<subgroup type="GB" subtype="SCT" contains="ABD ABE AGB ANS CLK DGY DND EAY EDH EDU ELN ELS ERW FAL FIF GLG HLD IVC MLN MRY NAY NLK ORK PKN RFW SAY SCB SLK STG WDU WLN ZET"/>
+		<subgroup type="GB" subtype="WLS" contains="AGY BGE BGW CAY CGN CMN CRF CWY DEN FLN GWN MON MTY NTL NWP PEM POW RCT SWA TOF VGL WRX"/>
+		<subgroup type="GD" contains="01 02 03 04 05 06 10"/>
+		<subgroup type="GE" contains="AB AJ GU IM KA KK MM RL SJ SK SZ TB"/>
+		<subgroup type="GH" contains="AA AH BA CP EP NP TV UE UW WP"/>
+		<subgroup type="GL" contains="KU QA QE SM"/>
+		<subgroup type="GM" contains="B L M N U W"/>
+		<subgroup type="GN" contains="B C D F K L M N"/>
+		<subgroup type="GN" subtype="B" contains="BF BK FR GA KN"/>
+		<subgroup type="GN" subtype="D" contains="CO DU FO KD TE"/>
+		<subgroup type="GN" subtype="F" contains="DB DI FA KS"/>
+		<subgroup type="GN" subtype="K" contains="KA KE KO MD SI"/>
+		<subgroup type="GN" subtype="L" contains="KB LA LE ML TO"/>
+		<subgroup type="GN" subtype="M" contains="DL MM PI"/>
+		<subgroup type="GN" subtype="N" contains="BE GU LO MC NZ YO"/>
+		<subgroup type="GQ" contains="C I"/>
+		<subgroup type="GQ" subtype="C" contains="CS KN LI WN"/>
+		<subgroup type="GQ" subtype="I" contains="AN BN BS"/>
+		<subgroup type="GR" contains="69 A B C D E F G H I J K L M"/>
+		<subgroup type="GR" subtype="A" contains="52 55 71 72 73"/>
+		<subgroup type="GR" subtype="B" contains="53 54 57 59 61 62 64"/>
+		<subgroup type="GR" subtype="C" contains="51 56 58 63"/>
+		<subgroup type="GR" subtype="D" contains="31 32 33 34"/>
+		<subgroup type="GR" subtype="E" contains="41 42 43 44"/>
+		<subgroup type="GR" subtype="F" contains="21 22 23 24"/>
+		<subgroup type="GR" subtype="G" contains="01 13 14"/>
+		<subgroup type="GR" subtype="H" contains="03 04 05 06 07"/>
+		<subgroup type="GR" subtype="I" contains="A1"/>
+		<subgroup type="GR" subtype="J" contains="11 12 15 16 17"/>
+		<subgroup type="GR" subtype="K" contains="83 84 85"/>
+		<subgroup type="GR" subtype="L" contains="81 82"/>
+		<subgroup type="GR" subtype="M" contains="91 92 93 94"/>
+		<subgroup type="GT" contains="AV BV CM CQ ES GU HU IZ JA JU PE PR QC QZ RE SA SM SO SR SU TO ZA"/>
+		<subgroup type="GW" contains="BS L N S"/>
+		<subgroup type="GW" subtype="L" contains="BA GA"/>
+		<subgroup type="GW" subtype="N" contains="BM CA OI"/>
+		<subgroup type="GW" subtype="S" contains="BL QU TO"/>
+		<subgroup type="GY" contains="BA CU DE EB ES MA PM PT UD UT"/>
+		<subgroup type="HN" contains="AT CH CL CM CP CR EP FM GD IB IN LE LP OC OL SB VA YO"/>
+		<subgroup type="HR" contains="01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21"/>
+		<subgroup type="HT" contains="AR CE GA ND NE NI NO OU SD SE"/>
+		<subgroup type="HU" contains="BA BC BE BK BU BZ CS DE DU EG ER FE GS GY HB HE HV JN KE KM KV MI NK NO NY PE PS SD SF SH SK SN SO SS ST SZ TB TO VA VE VM ZA ZE"/>
+		<subgroup type="ID" contains="JW KA ML NU PP SL SM"/>
+		<subgroup type="ID" subtype="JW" contains="BT JB JI JK JT YO"/>
+		<subgroup type="ID" subtype="KA" contains="KB KI KS KT KU"/>
+		<subgroup type="ID" subtype="ML" contains="MA MU"/>
+		<subgroup type="ID" subtype="NU" contains="BA NB NT"/>
+		<subgroup type="ID" subtype="PP" contains="PA PB"/>
+		<subgroup type="ID" subtype="SL" contains="GO SA SG SN SR ST"/>
+		<subgroup type="ID" subtype="SM" contains="AC BB BE JA KR LA RI SB SS SU"/>
+		<subgroup type="IE" contains="C L M U"/>
+		<subgroup type="IE" subtype="C" contains="G LM MO RN SO"/>
+		<subgroup type="IE" subtype="L" contains="CW D KE KK LD LH LS MH OY WH WW WX"/>
+		<subgroup type="IE" subtype="M" contains="CE CO KY LK TA WD"/>
+		<subgroup type="IE" subtype="U" contains="CN DL MN"/>
+		<subgroup type="IL" contains="D HA JM M TA Z"/>
+		<subgroup type="IN" contains="AN AP AR AS BR CH CT DD DL DN GA GJ HP HR JH JK KA KL LD MH ML MN MP MZ NL OR PB PY RJ SK TG TN TR UP UT WB"/>
+		<subgroup type="IQ" contains="AN AR BA BB BG DA DI DQ KA KI MA MU NA NI QA SD SU WA"/>
+		<subgroup type="IR" contains="01 02 03 04 05 06 07 08 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32"/>
+		<subgroup type="IS" contains="1 2 3 4 5 6 7 8"/>
+		<subgroup type="IT" contains="21 23 25 32 34 36 42 45 52 55 57 62 65 67 72 75 77 78 82 88"/>
+		<subgroup type="IT" subtype="21" contains="AL AT BI CN NO TO VB VC"/>
+		<subgroup type="IT" subtype="23" contains="AO"/>
+		<subgroup type="IT" subtype="25" contains="BG BS CO CR LC LO MB MI MN PV SO VA"/>
+		<subgroup type="IT" subtype="32" contains="BZ TN"/>
+		<subgroup type="IT" subtype="34" contains="BL PD RO TV VE VI VR"/>
+		<subgroup type="IT" subtype="36" contains="GO PN TS UD"/>
+		<subgroup type="IT" subtype="42" contains="GE IM SP SV"/>
+		<subgroup type="IT" subtype="45" contains="BO FC FE MO PC PR RA RE RN"/>
+		<subgroup type="IT" subtype="52" contains="AR FI GR LI LU MS PI PO PT SI"/>
+		<subgroup type="IT" subtype="55" contains="PG TR"/>
+		<subgroup type="IT" subtype="57" contains="AN AP FM MC PU"/>
+		<subgroup type="IT" subtype="62" contains="FR LT RI RM VT"/>
+		<subgroup type="IT" subtype="65" contains="AQ CH PE TE"/>
+		<subgroup type="IT" subtype="67" contains="CB IS"/>
+		<subgroup type="IT" subtype="72" contains="AV BN CE NA SA"/>
+		<subgroup type="IT" subtype="75" contains="BA BR BT FG LE TA"/>
+		<subgroup type="IT" subtype="77" contains="MT PZ"/>
+		<subgroup type="IT" subtype="78" contains="CS CZ KR RC VV"/>
+		<subgroup type="IT" subtype="82" contains="AG CL CT EN ME PA RG SR TP"/>
+		<subgroup type="IT" subtype="88" contains="CA CI NU OG OR OT SS VS"/>
+		<subgroup type="JM" contains="01 02 03 04 05 06 07 08 09 10 11 12 13 14"/>
+		<subgroup type="JO" contains="AJ AM AQ AT AZ BA IR JA KA MA MD MN"/>
+		<subgroup type="JP" contains="01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47"/>
+		<subgroup type="KE" contains="01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47"/>
+		<subgroup type="KG" contains="B C GB GO J N O T Y"/>
+		<subgroup type="KH" contains="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25"/>
+		<subgroup type="KI" contains="G L P"/>
+		<subgroup type="KM" contains="A G M"/>
+		<subgroup type="KN" contains="K N"/>
+		<subgroup type="KN" subtype="K" contains="01 02 03 06 08 09 11 13 15"/>
+		<subgroup type="KN" subtype="N" contains="04 05 07 10 12"/>
+		<subgroup type="KP" contains="01 02 03 04 05 06 07 08 09 10 13"/>
+		<subgroup type="KR" contains="11 26 27 28 29 30 31 41 42 43 44 45 46 47 48 49 50"/>
+		<subgroup type="KW" contains="AH FA HA JA KU MU"/>
+		<subgroup type="KZ" contains="AKM AKT ALA ALM AST ATY KAR KUS KZY MAN PAV SEV VOS YUZ ZAP ZHA"/>
+		<subgroup type="LA" contains="AT BK BL CH HO KH LM LP OU PH SL SV VI VT XA XE XI XS"/>
+		<subgroup type="LB" contains="AK AS BA BH BI JA JL NA"/>
+		<subgroup type="LC" contains="01 02 03 05 06 07 08 10 11 12"/>
+		<subgroup type="LI" contains="01 02 03 04 05 06 07 08 09 10 11"/>
+		<subgroup type="LK" contains="1 2 3 4 5 6 7 8 9"/>
+		<subgroup type="LK" subtype="1" contains="52 71 81"/>
+		<subgroup type="LK" subtype="2" contains="11 31 51"/>
+		<subgroup type="LK" subtype="3" contains="12 33 41"/>
+		<subgroup type="LK" subtype="4" contains="13 21 42 61 92"/>
+		<subgroup type="LK" subtype="5" contains="22 32 43"/>
+		<subgroup type="LK" subtype="6" contains="45 82"/>
+		<subgroup type="LK" subtype="7" contains="23 72"/>
+		<subgroup type="LK" subtype="8" contains="62 91"/>
+		<subgroup type="LK" subtype="9" contains="44 53"/>
+		<subgroup type="LR" contains="BG BM CM GB GG GK GP LO MG MO MY NI RG RI SI"/>
+		<subgroup type="LS" contains="A B C D E F G H J K"/>
+		<subgroup type="LT" contains="01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 AL KL KU MR PN SA TA TE UT VL"/>
+		<subgroup type="LU" contains="CA CL DI EC ES GR LU ME RD RM VD WI"/>
+		<subgroup type="LV" contains="001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 016 017 018 019 020 021 022 023 024 025 026 027 028 029 030 031 032 033 034 035 036 037 038 039 040 041 042 043 044 045 046 047 048 049 050 051 052 053 054 055 056 057 058 059 060 061 062 063 064 065 066 067 068 069 070 071 072 073 074 075 076 077 078 079 080 081 082 083 084 085 086 087 088 089 090 091 092 093 094 095 096 097 098 099 100 101 102 103 104 105 106 107 108 109 110 DGV JEL JKB JUR LPX REZ RIX VEN VMR"/>
+		<subgroup type="LY" contains="BA BU DR GT JA JG JI JU KF MB MI MJ MQ NL NQ SB SR TB WA WD WS ZA"/>
+		<subgroup type="MA" contains="01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16"/>
+		<subgroup type="MA" subtype="01" contains="CHE FAH LAR TET TNG"/>
+		<subgroup type="MA" subtype="02" contains="KEN SIK"/>
+		<subgroup type="MA" subtype="03" contains="HOC TAO TAZ"/>
+		<subgroup type="MA" subtype="04" contains="BER FIG JRA NAD OUJ TAI"/>
+		<subgroup type="MA" subtype="05" contains="BOM FES MOU SEF"/>
+		<subgroup type="MA" subtype="06" contains="ERR HAJ IFR KHN MEK"/>
+		<subgroup type="MA" subtype="07" contains="KHE RAB SAL SKH"/>
+		<subgroup type="MA" subtype="08" contains="CAS MED MOH NOU"/>
+		<subgroup type="MA" subtype="09" contains="BES KHO SET"/>
+		<subgroup type="MA" subtype="10" contains="JDI SAF"/>
+		<subgroup type="MA" subtype="11" contains="CHI ESI HAO KES MMD MMN SYB"/>
+		<subgroup type="MA" subtype="12" contains="AZI BEM"/>
+		<subgroup type="MA" subtype="13" contains="AGD CHT INE OUA TAR TIZ ZAG"/>
+		<subgroup type="MA" subtype="14" contains="ASZ ESM GUE TAT TNT"/>
+		<subgroup type="MA" subtype="15" contains="BOD LAA"/>
+		<subgroup type="MA" subtype="16" contains="AOU OUD"/>
+		<subgroup type="MC" contains="CL CO FO GA JE LA MA MC MG MO MU PH SD SO SP SR VR"/>
+		<subgroup type="MD" contains="AN BA BD BR BS CA CL CM CR CS CT CU DO DR DU ED FA FL GA GL HI IA LE NI OC OR RE RI SD SI SN SO ST SV TA TE UN"/>
+		<subgroup type="ME" contains="01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23"/>
+		<subgroup type="MG" contains="A D F M T U"/>
+		<subgroup type="MH" contains="L T"/>
+		<subgroup type="MH" subtype="L" contains="ALL EBO ENI JAB JAL KIL KWA LAE LIB NMK NMU RON UJA WTH"/>
+		<subgroup type="MH" subtype="T" contains="ALK ARN AUR LIK MAJ MAL MEJ MIL UTI WTJ"/>
+		<subgroup type="MK" contains="02 03 04 05 06 07 08 10 11 12 13 14 16 18 19 20 21 22 23 24 25 26 27 30 32 33 34 35 36 37 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 58 59 60 61 62 63 64 65 66 67 69 70 71 72 73 74 75 76 78 80 81 82 83 85"/>
+		<subgroup type="ML" contains="1 2 3 4 5 6 7 8 BKO"/>
+		<subgroup type="MM" contains="01 02 03 04 05 06 07 11 12 13 14 15 16 17 18"/>
+		<subgroup type="MN" contains="1 035 037 039 041 043 046 047 049 051 053 055 057 059 061 063 064 065 067 069 071 073"/>
+		<subgroup type="MR" contains="01 02 03 04 05 06 07 08 09 10 11 12 13 14 15"/>
+		<subgroup type="MT" contains="01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68"/>
+		<subgroup type="MU" contains="AG BL BR CC CU FL GP MO PA PL PU PW QB RO RR SA VP"/>
+		<subgroup type="MV" contains="CE MLE NC NO SC SU UN US"/>
+		<subgroup type="MV" subtype="CE" contains="12 14 17"/>
+		<subgroup type="MV" subtype="NC" contains="00 02 04 26"/>
+		<subgroup type="MV" subtype="NO" contains="03 13 20 25"/>
+		<subgroup type="MV" subtype="SC" contains="27 28"/>
+		<subgroup type="MV" subtype="SU" contains="01 29"/>
+		<subgroup type="MV" subtype="UN" contains="07 23 24"/>
+		<subgroup type="MV" subtype="US" contains="05 08"/>
+		<subgroup type="MW" contains="C N S"/>
+		<subgroup type="MW" subtype="C" contains="DE DO KS LI MC NI NK NU SA"/>
+		<subgroup type="MW" subtype="N" contains="CT KR LK MZ NB RU"/>
+		<subgroup type="MW" subtype="S" contains="BA BL CK CR MG MH MU MW NE NS PH TH ZO"/>
+		<subgroup type="MX" contains="AGU BCN BCS CAM CHH CHP COA COL DIF DUR GRO GUA HID JAL MEX MIC MOR NAY NLE OAX PUE QUE ROO SIN SLP SON TAB TAM TLA VER YUC ZAC"/>
+		<subgroup type="MY" contains="01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16"/>
+		<subgroup type="MZ" contains="A B G I L MPM N P Q S T"/>
+		<subgroup type="NA" contains="CA ER HA KA KE KH KU KW OD OH ON OS OT OW"/>
+		<subgroup type="NE" contains="1 2 3 4 5 6 7 8"/>
+		<subgroup type="NG" contains="AB AD AK AN BA BE BO BY CR DE EB ED EK EN FC GO IM JI KD KE KN KO KT KW LA NA NI OG ON OS OY PL RI SO TA YO ZA"/>
+		<subgroup type="NI" contains="AN AS BO CA CI CO ES GR JI LE MD MN MS MT NS RI SJ"/>
+		<subgroup type="NL" contains="AW BQ1 BQ2 BQ3 CW DR FL FR GE GR LI NB NH OV SX UT ZE ZH"/>
+		<subgroup type="NO" contains="01 02 03 04 05 06 07 08 09 10 11 12 14 15 16 17 18 19 20 21 22"/>
+		<subgroup type="NP" contains="1 2 3 4 5"/>
+		<subgroup type="NP" subtype="1" contains="BA JA NA"/>
+		<subgroup type="NP" subtype="2" contains="BH KA RA"/>
+		<subgroup type="NP" subtype="3" contains="DH GA LU"/>
+		<subgroup type="NP" subtype="4" contains="KO ME SA"/>
+		<subgroup type="NP" subtype="5" contains="MA SE"/>
+		<subgroup type="NR" contains="01 02 03 04 05 06 07 08 09 10 11 12 13 14"/>
+		<subgroup type="NZ" contains="AUK BOP CAN CIT GIS HKB MBH MWT NSN NTL OTA STL TAS TKI WGN WKO WTC"/>
+		<subgroup type="OM" contains="BJ BS BU DA MA MU SJ SS WU ZA ZU"/>
+		<subgroup type="PA" contains="1 2 3 4 5 6 7 8 9 10 EM KY NB"/>
+		<subgroup type="PE" contains="AMA ANC APU ARE AYA CAJ CAL CUS HUC HUV ICA JUN LAL LAM LIM LMA LOR MDD MOQ PAS PIU PUN SAM TAC TUM UCA"/>
+		<subgroup type="PG" contains="CPK CPM EBR EHG EPW ESW GPK HLA JWK MBA MPL MPM MRL NCD NIK NPP NSB SAN SHM WBK WHM WPD"/>
+		<subgroup type="PH" contains="00 01 02 03 05 06 07 08 09 10 11 12 13 14 15 40 41"/>
+		<subgroup type="PH" subtype="01" contains="ILN ILS LUN PAN"/>
+		<subgroup type="PH" subtype="02" contains="BTN CAG ISA NUV QUI"/>
+		<subgroup type="PH" subtype="03" contains="AUR BAN BUL NUE PAM TAR ZMB"/>
+		<subgroup type="PH" subtype="05" contains="ALB CAN CAS CAT MAS SOR"/>
+		<subgroup type="PH" subtype="06" contains="AKL ANT CAP GUI ILI NEC"/>
+		<subgroup type="PH" subtype="07" contains="BOH CEB NER SIG"/>
+		<subgroup type="PH" subtype="08" contains="BIL EAS LEY NSA SLE WSA"/>
+		<subgroup type="PH" subtype="09" contains="BAS ZAN ZAS ZSI"/>
+		<subgroup type="PH" subtype="10" contains="BUK CAM MSC MSR"/>
+		<subgroup type="PH" subtype="11" contains="COM DAO DAS DAV DVO SAR SCO"/>
+		<subgroup type="PH" subtype="12" contains="LAN NCO SUK"/>
+		<subgroup type="PH" subtype="13" contains="AGN AGS DIN SUN SUR"/>
+		<subgroup type="PH" subtype="14" contains="LAS MAG SLU TAW"/>
+		<subgroup type="PH" subtype="15" contains="ABR APA BEN IFU KAL MOU"/>
+		<subgroup type="PH" subtype="40" contains="BTG CAV LAG QUE RIZ"/>
+		<subgroup type="PH" subtype="41" contains="MAD MDC MDR PLW ROM"/>
+		<subgroup type="PK" contains="BA GB IS JK KP PB SD TA"/>
+		<subgroup type="PL" contains="DS KP LB LD LU MA MZ OP PD PK PM SK SL WN WP ZP"/>
+		<subgroup type="PS" contains="BTH DEB GZA HBN JEM JEN JRH KYS NBS NGZ QQA RBH RFH SLT TBS TKM"/>
+		<subgroup type="PT" contains="01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 20 30"/>
+		<subgroup type="PW" contains="002 004 010 050 100 150 212 214 218 222 224 226 227 228 350 370"/>
+		<subgroup type="PY" contains="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 19 ASU"/>
+		<subgroup type="QA" contains="DA KH MS RA US WA ZA"/>
+		<subgroup type="RO" contains="AB AG AR B BC BH BN BR BT BV BZ CJ CL CS CT CV DB DJ GJ GL GR HD HR IF IL IS MH MM MS NT OT PH SB SJ SM SV TL TM TR VL VN VS"/>
+		<subgroup type="RS" contains="00 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 KM VO"/>
+		<subgroup type="RS" subtype="KM" contains="25 26 27 28 29"/>
+		<subgroup type="RS" subtype="VO" contains="01 02 03 04 05 06 07"/>
+		<subgroup type="RU" contains="AD AL ALT AMU ARK AST BA BEL BRY BU CE CHE CHU CU DA IN IRK IVA KAM KB KC KDA KEM KGD KGN KHA KHM KIR KK KL KLU KO KOS KR KRS KYA LEN LIP MAG ME MO MOS MOW MUR NEN NGR NIZ NVS OMS ORE ORL PER PNZ PRI PSK ROS RYA SA SAK SAM SAR SE SMO SPE STA SVE TA TAM TOM TUL TVE TY TYU UD ULY VGG VLA VLG VOR YAN YAR YEV ZAB"/>
+		<subgroup type="RW" contains="01 02 03 04 05"/>
+		<subgroup type="SA" contains="01 02 03 04 05 06 07 08 09 10 11 12 14"/>
+		<subgroup type="SB" contains="CE CH CT GU IS MK ML RB TE WE"/>
+		<subgroup type="SC" contains="01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25"/>
+		<subgroup type="SD" contains="DC DE DN DS DW GD GK GZ KA KH KN KS NB NO NR NW RS SI"/>
+		<subgroup type="SE" contains="AB AC BD C D E F G H I K M N O S T U W X Y Z"/>
+		<subgroup type="SG" contains="01 02 03 04 05"/>
+		<subgroup type="SH" contains="AC HL TA"/>
+		<subgroup type="SI" contains="001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 016 017 018 019 020 021 022 023 024 025 026 027 028 029 030 031 032 033 034 035 036 037 038 039 040 041 042 043 044 045 046 047 048 049 050 051 052 053 054 055 056 057 058 059 060 061 062 063 064 065 066 067 068 069 070 071 072 073 074 075 076 077 078 079 080 081 082 083 084 085 086 087 088 089 090 091 092 093 094 095 096 097 098 099 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212"/>
+		<subgroup type="SK" contains="BC BL KI NI PV TA TC ZI"/>
+		<subgroup type="SL" contains="E N S W"/>
+		<subgroup type="SM" contains="01 02 03 04 05 06 07 08 09"/>
+		<subgroup type="SN" contains="DB DK FK KA KD KE KL LG MT SE SL TC TH ZG"/>
+		<subgroup type="SO" contains="AW BK BN BR BY GA GE HI JD JH MU NU SA SD SH SO TO WO"/>
+		<subgroup type="SR" contains="BR CM CR MA NI PM PR SA SI WA"/>
+		<subgroup type="SS" contains="BN BW EC EE EW JG LK NU UY WR"/>
+		<subgroup type="ST" contains="P S"/>
+		<subgroup type="SV" contains="AH CA CH CU LI MO PA SA SM SO SS SV UN US"/>
+		<subgroup type="SY" contains="DI DR DY HA HI HL HM ID LA QU RA RD SU TA"/>
+		<subgroup type="SZ" contains="HH LU MA SH"/>
+		<subgroup type="TD" contains="BA BG BO CB EE EO GR HL KA LC LO LR MA MC ME MO ND OD SA SI TA TI WF"/>
+		<subgroup type="TG" contains="C K M P S"/>
+		<subgroup type="TH" contains="10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 60 61 62 63 64 65 66 67 70 71 72 73 74 75 76 77 80 81 82 83 84 85 86 90 91 92 93 94 95 96 S"/>
+		<subgroup type="TJ" contains="DU GB KT SU"/>
+		<subgroup type="TL" contains="AL AN BA BO CO DI ER LA LI MF MT OE VI"/>
+		<subgroup type="TM" contains="A B D L M S"/>
+		<subgroup type="TN" contains="11 12 13 14 21 22 23 31 32 33 34 41 42 43 51 52 53 61 71 72 73 81 82 83"/>
+		<subgroup type="TO" contains="01 02 03 04 05"/>
+		<subgroup type="TR" contains="01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81"/>
+		<subgroup type="TT" contains="ARI CHA CTT DMN MRC PED POS PRT PTF SFO SGE SIP SJL TOB TUP"/>
+		<subgroup type="TV" contains="FUN NIT NKF NKL NMA NMG NUI VAI"/>
+		<subgroup type="TW" contains="CHA CYI CYQ HSQ HSZ HUA ILA KEE KHH KIN LIE MIA NAN NWT PEN PIF TAO TNN TPE TTT TXG YUN"/>
+		<subgroup type="TZ" contains="01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30"/>
+		<subgroup type="UA" contains="05 07 09 12 14 18 21 23 26 30 32 35 40 43 46 48 51 53 56 59 61 63 65 68 71 74 77"/>
+		<subgroup type="UG" contains="C E N W"/>
+		<subgroup type="UG" subtype="C" contains="101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124"/>
+		<subgroup type="UG" subtype="E" contains="201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232"/>
+		<subgroup type="UG" subtype="N" contains="301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331"/>
+		<subgroup type="UG" subtype="W" contains="401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425"/>
+		<subgroup type="UM" contains="67 71 76 79 81 84 86 89 95"/>
+		<subgroup type="US" contains="AK AL AR AS AZ CA CO CT DC DE FL GA GU HI IA ID IL IN KS KY LA MA MD ME MI MN MO MP MS MT NC ND NE NH NJ NM NV NY OH OK OR PA PR RI SC SD TN TX UM UT VA VI VT WA WI WV WY"/>
+		<subgroup type="UY" contains="AR CA CL CO DU FD FS LA MA MO PA RN RO RV SA SJ SO TA TT"/>
+		<subgroup type="UZ" contains="AN BU FA JI NG NW QA QR SA SI SU TK TO XO"/>
+		<subgroup type="VC" contains="01 02 03 04 05 06"/>
+		<subgroup type="VE" contains="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"/>
+		<subgroup type="VN" contains="01 02 03 04 05 06 07 09 13 14 18 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 39 40 41 43 44 45 46 47 49 50 51 52 53 54 55 56 57 58 59 61 63 66 67 68 69 70 71 72 73 CT DN HN HP SG"/>
+		<subgroup type="VU" contains="MAP PAM SAM SEE TAE TOB"/>
+		<subgroup type="WF" contains="AL SG UV"/>
+		<subgroup type="WS" contains="AA AL AT FA GE GI PA SA TU VF VS"/>
+		<subgroup type="YE" contains="AB AD AM BA DA DH HD HJ HU IB JA LA MA MR MW RA SA SD SH SN SU TA"/>
+		<subgroup type="ZA" contains="EC FS GT LP MP NC NL NW WC"/>
+		<subgroup type="ZM" contains="01 02 03 04 05 06 07 08 09 10"/>
+		<subgroup type="ZW" contains="BU HA MA MC ME MI MN MS MV MW"/>
+	</subdivisionContainment>
+</supplementalData>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/supplementalData.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/supplementalData.xml
similarity index 83%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/supplementalData.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/supplementalData.xml
index 5c8174d0b7c..74b6e6eab25 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/supplementalData.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/supplementalData.xml
@@ -7,8 +7,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 -->
 
 <supplementalData>
-    <version number="$Revision: 11318 $"/>
-    <generation date="$Date: 2015-02-25 23:47:56 -0600 (Wed, 25 Feb 2015) $"/>
+    <version number="$Revision: 12447 $"/>
     <currencyData>
         <fractions>
             <info iso4217="ADP" digits="0" rounding="0"/>
@@ -1209,17 +1208,17 @@ XXX Code for transations where no currency is involved
     </currencyData>
     <territoryContainment> <!-- based on UN data, at http://unstats.un.org/unsd/methods/m49/m49regin.htm -->
         <group type="001" contains="019 002 150 142 009"/> <!--World -->
+        <group type="001" contains="EU" status="grouping"/> <!--European Union -->
+        <group type="001" contains="QU" status="deprecated"/> <!--European Union -->
         <group type="011" contains="BF BJ CI CV GH GM GN GW LR ML MR NE NG SH SL SN TG"/> <!--Western Africa -->
         <group type="013" contains="BZ CR GT HN MX NI PA SV"/> <!--Central America -->
-        <group type="014" contains="BI DJ ER ET KE KM MG MU MW MZ RE RW SC SO TZ UG YT ZM ZW"/> <!--Eastern Africa -->
+        <group type="014" contains="BI DJ ER ET KE KM MG MU MW MZ RE RW SC SO SS TZ UG YT ZM ZW"/> <!--Eastern Africa -->
         <group type="142" contains="145 143 030 034 035"/> <!--Asia -->
         <group type="143" contains="TM TJ KG KZ UZ"/> <!-- Central Asia -->
         <group type="145" contains="AE AM AZ BH CY GE IL IQ JO KW LB OM PS QA SA SY TR YE"/> <!--Western Asia -->
         <group type="145" contains="NT YD" status="deprecated"/> <!--Western Asia -->
-        <group type="015" contains="DZ EG EH LY MA SD SS TN EA IC"/> <!--Northern Africa -->
+        <group type="015" contains="DZ EG EH LY MA SD TN EA IC"/> <!--Northern Africa -->
         <group type="150" contains="154 155 151 039"/> <!--Europe -->
-        <group type="150" contains="EU" status="grouping"/> <!--Europe -->
-        <group type="150" contains="QU" status="deprecated"/> <!--Europe -->
         <group type="151" contains="BG BY CZ HU MD PL RO RU SK UA"/> <!--Eastern Europe -->
         <group type="151" contains="SU" status="deprecated"/> <!--Eastern Europe -->
         <group type="154" contains="GG IM JE AX DK EE FI FO GB IE IS LT LV NO SE SJ"/> <!--Northern Europe -->
@@ -1316,9 +1315,7 @@ XXX Code for transations where no currency is involved
 		<language type="awa" territories="IN" alt="secondary"/>
 		<language type="ay" scripts="Latn" territories="BO"/>
 		<language type="az" scripts="Arab Cyrl Latn" territories="AZ"/>
-		<language type="az" territories="IR RU" alt="secondary"/>
-		<language type="azb" scripts="Arab"/>
-		<language type="azb" territories="IR" alt="secondary"/>
+		<language type="az" territories="IQ IR RU" alt="secondary"/>
 		<language type="ba" scripts="Cyrl"/>
 		<language type="ba" territories="RU" alt="secondary"/>
 		<language type="bal" scripts="Arab"/>
@@ -1327,7 +1324,7 @@ XXX Code for transations where no currency is involved
 		<language type="ban" scripts="Bali" territories="ID" alt="secondary"/>
 		<language type="bap" scripts="Deva"/>
 		<language type="bar" scripts="Latn"/>
-		<language type="bar" territories="AT" alt="secondary"/>
+		<language type="bar" territories="AT DE" alt="secondary"/>
 		<language type="bas" scripts="Latn"/>
 		<language type="bax" scripts="Bamu"/>
 		<language type="bbc" scripts="Latn"/>
@@ -1337,6 +1334,7 @@ XXX Code for transations where no currency is involved
 		<language type="bci" territories="CI" alt="secondary"/>
 		<language type="be" scripts="Cyrl" territories="BY"/>
 		<language type="bej" scripts="Arab"/>
+		<language type="bej" territories="SD" alt="secondary"/>
 		<language type="bem" scripts="Latn"/>
 		<language type="bem" territories="ZM" alt="secondary"/>
 		<language type="bew" scripts="Latn"/>
@@ -1350,6 +1348,8 @@ XXX Code for transations where no currency is involved
 		<language type="bg" scripts="Cyrl" territories="BG"/>
 		<language type="bgc" scripts="Deva"/>
 		<language type="bgc" territories="IN" alt="secondary"/>
+		<language type="bgn" scripts="Arab"/>
+		<language type="bgn" territories="PK" alt="secondary"/>
 		<language type="bgx" scripts="Grek"/>
 		<language type="bhb" scripts="Deva"/>
 		<language type="bhb" territories="IN" alt="secondary"/>
@@ -1368,6 +1368,7 @@ XXX Code for transations where no currency is involved
 		<language type="bjj" territories="IN" alt="secondary"/>
 		<language type="bjn" scripts="Latn"/>
 		<language type="bjn" territories="ID" alt="secondary"/>
+		<language type="bjt" territories="SN" alt="secondary"/>
 		<language type="bkm" scripts="Latn"/>
 		<language type="bku" scripts="Latn"/>
 		<language type="bku" scripts="Buhd" alt="secondary"/>
@@ -1391,6 +1392,7 @@ XXX Code for transations where no currency is involved
 		<language type="brx" scripts="Deva"/>
 		<language type="brx" territories="IN" alt="secondary"/>
 		<language type="bs" scripts="Cyrl Latn" territories="BA"/>
+		<language type="bsc" territories="SN" alt="secondary"/>
 		<language type="bss" scripts="Latn"/>
 		<language type="bto" scripts="Latn"/>
 		<language type="btv" scripts="Deva"/>
@@ -1468,7 +1470,7 @@ XXX Code for transations where no currency is involved
 		<language type="dcc" scripts="Arab"/>
 		<language type="dcc" territories="IN" alt="secondary"/>
 		<language type="de" scripts="Latn" territories="AT BE CH DE LI LU"/>
-		<language type="de" scripts="Runr" territories="BR DK KZ PL US" alt="secondary"/>
+		<language type="de" scripts="Runr" territories="BR DK KZ NL PL US" alt="secondary"/>
 		<language type="del" scripts="Latn"/>
 		<language type="den" scripts="Latn"/>
 		<language type="den" scripts="Cans" alt="secondary"/>
@@ -1483,11 +1485,12 @@ XXX Code for transations where no currency is involved
 		<language type="dsb" scripts="Latn"/>
 		<language type="dtm" scripts="Latn"/>
 		<language type="dtp" scripts="Latn"/>
+		<language type="dty" scripts="Deva"/>
 		<language type="dua" scripts="Latn"/>
 		<language type="dum" scripts="Latn" alt="secondary"/>
 		<language type="dv" scripts="Thaa" territories="MV"/>
 		<language type="dyo" scripts="Latn"/>
-		<language type="dyo" scripts="Arab" alt="secondary"/>
+		<language type="dyo" scripts="Arab" territories="SN" alt="secondary"/>
 		<language type="dyu" scripts="Latn"/>
 		<language type="dyu" territories="BF" alt="secondary"/>
 		<language type="dz" scripts="Tibt" territories="BT"/>
@@ -1501,12 +1504,12 @@ XXX Code for transations where no currency is involved
 		<language type="eka" scripts="Latn"/>
 		<language type="eky" scripts="Kali"/>
 		<language type="el" scripts="Grek" territories="CY GR"/>
-		<language type="en" scripts="Latn" territories="AG AI AS AU BB BM BS BW BZ CA CC CK CM CX DG DM ER FJ FK FM GB GD GG GH GI GM GU GY HK IE IM IN IO JE JM KE KI KN KY LC LR LS MG MH MP MS MT MU MW NA NF NG NR NU NZ PG PH PK PN PR PW RW SB SC SD SG SH SL SS SX SZ TC TK TO TT TV TZ UG UM US VC VG VI VU WS ZA ZM ZW"/>
+		<language type="en" scripts="Latn" territories="AG AI AS AU BB BI BM BS BW BZ CA CC CK CM CX DG DM ER FJ FK FM GB GD GG GH GI GM GU GY HK IE IM IN IO JE JM KE KI KN KY LC LR LS MG MH MP MS MT MU MW NA NF NG NR NU NZ PG PH PK PN PR PW RW SB SC SD SG SH SL SS SX SZ TC TK TO TT TV TZ UG UM US VC VG VI VU WS ZA ZM ZW"/>
 		<language type="en" scripts="Dsrt Shaw" territories="AC AR AT BA BD BE BG BR CH CL CY CZ DE DK DZ EG ES ET FI FR GR HR HU IL IQ IT JO KZ LB LK LT MA MX MY NL PL PT RO SE SI SK TA TH TR YE" alt="secondary"/>
 		<language type="enm" scripts="Latn" alt="secondary"/>
 		<language type="eo" scripts="Latn"/>
 		<language type="es" scripts="Latn" territories="AR BO CL CO CR CU DO EA EC ES GQ GT HN IC MX NI PA PE PR PY SV UY VE"/>
-		<language type="es" territories="AD BZ DE PH US" alt="secondary"/>
+		<language type="es" territories="AD BZ DE GI PH US" alt="secondary"/>
 		<language type="esu" scripts="Latn"/>
 		<language type="et" scripts="Latn" territories="EE"/>
 		<language type="ett" scripts="Ital Latn" alt="secondary"/>
@@ -1525,6 +1528,7 @@ XXX Code for transations where no currency is involved
 		<language type="ffm" territories="ML" alt="secondary"/>
 		<language type="fi" scripts="Latn" territories="FI"/>
 		<language type="fi" territories="SE" alt="secondary"/>
+		<language type="fia" scripts="Arab"/>
 		<language type="fil" scripts="Latn" territories="PH"/>
 		<language type="fil" scripts="Tglg" territories="US" alt="secondary"/>
 		<language type="fit" scripts="Latn"/>
@@ -1533,7 +1537,7 @@ XXX Code for transations where no currency is involved
 		<language type="fon" scripts="Latn"/>
 		<language type="fon" territories="BJ" alt="secondary"/>
 		<language type="fr" scripts="Latn" territories="BE BF BI BJ BL CA CD CF CG CH CI CM DJ DZ FR GA GF GN GP GQ HT KM LU MA MC MF MG ML MQ MU NC NE PF PM RE RW SC SN SY TD TG TN VU WF YT"/>
-		<language type="fr" scripts="Dupl" territories="DE IT TF US" alt="secondary"/>
+		<language type="fr" scripts="Dupl" territories="DE IT NL TF US" alt="secondary"/>
 		<language type="frc" scripts="Latn"/>
 		<language type="frm" scripts="Latn" alt="secondary"/>
 		<language type="fro" scripts="Latn" alt="secondary"/>
@@ -1547,6 +1551,7 @@ XXX Code for transations where no currency is involved
 		<language type="fur" scripts="Latn"/>
 		<language type="fuv" scripts="Latn"/>
 		<language type="fuv" territories="NG" alt="secondary"/>
+		<language type="fvr" scripts="Latn"/>
 		<language type="fy" scripts="Latn"/>
 		<language type="fy" territories="NL" alt="secondary"/>
 		<language type="ga" scripts="Latn" territories="IE"/>
@@ -1613,7 +1618,7 @@ XXX Code for transations where no currency is involved
 		<language type="haz" territories="AF" alt="secondary"/>
 		<language type="he" scripts="Hebr" territories="IL"/>
 		<language type="hi" scripts="Deva" territories="IN"/>
-		<language type="hi" scripts="Mahj" territories="FJ" alt="secondary"/>
+		<language type="hi" scripts="Mahj" territories="FJ ZA" alt="secondary"/>
 		<language type="hif" scripts="Deva Latn" territories="FJ"/>
 		<language type="hil" scripts="Latn"/>
 		<language type="hil" territories="PH" alt="secondary"/>
@@ -1676,9 +1681,10 @@ XXX Code for transations where no currency is involved
 		<language type="jgo" scripts="Latn"/>
 		<language type="jmc" scripts="Latn"/>
 		<language type="jml" scripts="Deva"/>
+		<language type="jml" territories="NP" alt="secondary"/>
 		<language type="jpr" scripts="Hebr"/>
 		<language type="jrb" scripts="Hebr"/>
-		<language type="jut" scripts="Latn"/>
+		<language type="jut" scripts="Latn" alt="secondary"/>
 		<language type="jv" scripts="Latn"/>
 		<language type="jv" scripts="Java" territories="ID" alt="secondary"/>
 		<language type="ka" scripts="Geor" territories="GE"/>
@@ -1736,6 +1742,7 @@ XXX Code for transations where no currency is involved
 		<language type="kmb" territories="AO" alt="secondary"/>
 		<language type="kn" scripts="Knda"/>
 		<language type="kn" territories="IN" alt="secondary"/>
+		<language type="knf" territories="SN" alt="secondary"/>
 		<language type="ko" scripts="Kore" territories="KP KR"/>
 		<language type="ko" territories="CN" alt="secondary"/>
 		<language type="koi" scripts="Cyrl"/>
@@ -1858,10 +1865,12 @@ XXX Code for transations where no currency is involved
 		<language type="men" scripts="Mend" territories="SL" alt="secondary"/>
 		<language type="mer" scripts="Latn"/>
 		<language type="mer" territories="KE" alt="secondary"/>
+		<language type="mey" territories="SN" alt="secondary"/>
 		<language type="mfa" scripts="Arab"/>
 		<language type="mfa" territories="TH" alt="secondary"/>
 		<language type="mfe" scripts="Latn"/>
 		<language type="mfe" territories="MU" alt="secondary"/>
+		<language type="mfv" territories="SN" alt="secondary"/>
 		<language type="mg" scripts="Latn" territories="MG"/>
 		<language type="mgh" scripts="Latn"/>
 		<language type="mgh" territories="MZ" alt="secondary"/>
@@ -1876,6 +1885,7 @@ XXX Code for transations where no currency is involved
 		<language type="mk" scripts="Cyrl" territories="MK"/>
 		<language type="ml" scripts="Mlym"/>
 		<language type="ml" territories="IN" alt="secondary"/>
+		<language type="mls" scripts="Latn"/>
 		<language type="mn" scripts="Cyrl Mong" territories="MN"/>
 		<language type="mn" scripts="Phag" territories="CN" alt="secondary"/>
 		<language type="mnc" scripts="Mong" alt="secondary"/>
@@ -1926,7 +1936,7 @@ XXX Code for transations where no currency is involved
 		<language type="ndc" scripts="Latn"/>
 		<language type="ndc" territories="MZ" alt="secondary"/>
 		<language type="nds" scripts="Latn"/>
-		<language type="nds" territories="DE" alt="secondary"/>
+		<language type="nds" territories="DE NL" alt="secondary"/>
 		<language type="ne" scripts="Deva" territories="NP"/>
 		<language type="ne" territories="IN" alt="secondary"/>
 		<language type="new" scripts="Deva"/>
@@ -2016,13 +2026,13 @@ XXX Code for transations where no currency is involved
 		<language type="prs" scripts="Arab"/>
 		<language type="ps" scripts="Arab" territories="AF"/>
 		<language type="ps" territories="PK" alt="secondary"/>
-		<language type="pt" scripts="Latn" territories="AO BR CV GW MO MZ PT ST TL"/>
+		<language type="pt" scripts="Latn" territories="AO BR CV GQ GW MO MZ PT ST TL"/>
 		<language type="puu" scripts="Latn"/>
 		<language type="qu" scripts="Latn" territories="BO EC PE"/>
 		<language type="quc" scripts="Latn"/>
 		<language type="quc" territories="GT" alt="secondary"/>
 		<language type="qug" scripts="Latn"/>
-		<language type="raj" scripts="Latn"/>
+		<language type="raj" scripts="Deva"/>
 		<language type="raj" territories="IN" alt="secondary"/>
 		<language type="rap" scripts="Latn"/>
 		<language type="rar" scripts="Latn"/>
@@ -2072,6 +2082,7 @@ XXX Code for transations where no currency is involved
 		<language type="sas" territories="ID" alt="secondary"/>
 		<language type="sat" scripts="Latn"/>
 		<language type="sat" scripts="Beng Deva Olck Orya" territories="IN" alt="secondary"/>
+		<language type="sav" territories="SN" alt="secondary"/>
 		<language type="saz" scripts="Saur"/>
 		<language type="sbp" scripts="Latn"/>
 		<language type="sc" scripts="Latn"/>
@@ -2086,10 +2097,12 @@ XXX Code for transations where no currency is involved
 		<language type="sd" scripts="Khoj Sind" territories="IN PK" alt="secondary"/>
 		<language type="sdc" scripts="Latn"/>
 		<language type="sdh" scripts="Arab"/>
+		<language type="sdh" territories="IR" alt="secondary"/>
 		<language type="se" scripts="Latn"/>
 		<language type="se" scripts="Cyrl" territories="NO" alt="secondary"/>
 		<language type="see" scripts="Latn"/>
 		<language type="sef" scripts="Latn"/>
+		<language type="sef" territories="CI" alt="secondary"/>
 		<language type="seh" scripts="Latn"/>
 		<language type="seh" territories="MZ" alt="secondary"/>
 		<language type="sei" scripts="Latn"/>
@@ -2120,7 +2133,9 @@ XXX Code for transations where no currency is involved
 		<language type="smp" scripts="Samr" alt="secondary"/>
 		<language type="sms" scripts="Latn"/>
 		<language type="sn" scripts="Latn" territories="ZW"/>
+		<language type="snf" territories="SN" alt="secondary"/>
 		<language type="snk" scripts="Latn"/>
+		<language type="snk" territories="ML" alt="secondary"/>
 		<language type="so" scripts="Latn" territories="SO"/>
 		<language type="so" scripts="Arab Osma" territories="DJ ET" alt="secondary"/>
 		<language type="sou" scripts="Thai"/>
@@ -2154,6 +2169,7 @@ XXX Code for transations where no currency is involved
 		<language type="swb" scripts="Latn" territories="YT" alt="secondary"/>
 		<language type="swc" scripts="Latn"/>
 		<language type="swc" territories="CD" alt="secondary"/>
+		<language type="swg" scripts="Latn"/>
 		<language type="swv" scripts="Deva"/>
 		<language type="swv" territories="IN" alt="secondary"/>
 		<language type="sxn" scripts="Latn"/>
@@ -2205,6 +2221,7 @@ XXX Code for transations where no currency is involved
 		<language type="tmh" territories="NE" alt="secondary"/>
 		<language type="tn" scripts="Latn" territories="BW"/>
 		<language type="tn" territories="ZA" alt="secondary"/>
+		<language type="tnr" territories="SN" alt="secondary"/>
 		<language type="to" scripts="Latn" territories="TO"/>
 		<language type="tog" scripts="Latn"/>
 		<language type="tpi" scripts="Latn" territories="PG"/>
@@ -2287,6 +2304,7 @@ XXX Code for transations where no currency is involved
 		<language type="wbr" territories="IN" alt="secondary"/>
 		<language type="wls" scripts="Latn"/>
 		<language type="wls" territories="WF" alt="secondary"/>
+		<language type="wni" scripts="Arab" territories="KM"/>
 		<language type="wo" scripts="Latn" territories="SN"/>
 		<language type="wo" scripts="Arab" alt="secondary"/>
 		<language type="wtm" scripts="Deva"/>
@@ -2321,9 +2339,11 @@ XXX Code for transations where no currency is involved
 		<language type="yrk" scripts="Cyrl"/>
 		<language type="yrl" scripts="Latn"/>
 		<language type="yua" scripts="Latn"/>
-		<language type="yue" scripts="Hans"/>
+		<language type="yue" scripts="Hant"/>
+		<language type="yue" scripts="Hans" territories="CN HK" alt="secondary"/>
 		<language type="za" scripts="Latn"/>
 		<language type="za" scripts="Hans" territories="CN" alt="secondary"/>
+		<language type="zag" scripts="Latn"/>
 		<language type="zap" scripts="Latn"/>
 		<language type="zdj" scripts="Arab" territories="KM"/>
 		<language type="zea" scripts="Latn"/>
@@ -2341,22 +2361,22 @@ XXX Code for transations where no currency is involved
 	</languageData>
  <!-- See http://unicode.org/cldr/data/diff/supplemental/territory_language_information.html for more information on territoryInfo. -->
 	<territoryInfo>
-		<territory type="AC" gdp="35200000" literacyPercent="99" population="940">	<!--Ascension Island-->
+		<territory type="AC" gdp="37680000" literacyPercent="99" population="940">	<!--Ascension Island-->
 			<languagePopulation type="en" populationPercent="99" references="R1020"/>	<!--English-->
 		</territory>
-		<territory type="AD" gdp="3163000000" literacyPercent="100" population="85458">	<!--Andorra-->
+		<territory type="AD" gdp="3163000000" literacyPercent="100" population="85580">	<!--Andorra-->
 			<languagePopulation type="ca" populationPercent="51" officialStatus="official"/>	<!--Catalan-->
 			<languagePopulation type="es" populationPercent="43"/>	<!--Spanish-->
 			<languagePopulation type="fr" populationPercent="6.8"/>	<!--French-->
 		</territory>
-		<territory type="AE" gdp="269800000000" literacyPercent="90" population="5628810">	<!--United Arab Emirates-->
+		<territory type="AE" gdp="617100000000" literacyPercent="90" population="5779760">	<!--United Arab Emirates-->
 			<languagePopulation type="ar" populationPercent="78" officialStatus="official"/>	<!--Arabic-->
 			<languagePopulation type="ml" populationPercent="7"/>	<!--Malayalam-->
 			<languagePopulation type="ps" populationPercent="2.9"/>	<!--Pashto-->
 			<languagePopulation type="bal" populationPercent="2.3"/>	<!--Baluchi-->
 			<languagePopulation type="fa" populationPercent="1.9"/>	<!--Persian-->
 		</territory>
-		<territory type="AF" gdp="45300000000" literacyPercent="28.1" population="31822800">	<!--Afghanistan-->
+		<territory type="AF" gdp="60810000000" literacyPercent="28.1" population="32564300">	<!--Afghanistan-->
 			<languagePopulation type="fa" populationPercent="50" officialStatus="official"/>	<!--Persian-->
 			<languagePopulation type="ps" populationPercent="43" officialStatus="official" references="R1055"/>	<!--Pashto-->
 			<languagePopulation type="haz" populationPercent="5.9"/>	<!--Hazaragi-->
@@ -2364,46 +2384,47 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="tk_Latn" populationPercent="1.7" officialStatus="official_regional"/>	<!--Turkmen (Latin)-->
 			<languagePopulation type="prd" populationPercent="1.2"/>	<!--Parsi-Dari-->
 			<languagePopulation type="bal" populationPercent="0.67" officialStatus="official_regional"/>	<!--Baluchi-->
-			<languagePopulation type="ug_Arab" populationPercent="0.0094" references="R1165"/>	<!--Uyghur (Arabic)-->
-			<languagePopulation type="kk_Arab" populationPercent="0.0063" references="R1119"/>	<!--Kazakh (Arabic)-->
+			<languagePopulation type="bgn" writingPercent="5" populationPercent="0.63" references="R1209"/>	<!--Western Balochi-->
+			<languagePopulation type="ug_Arab" populationPercent="0.0092" references="R1165"/>	<!--Uyghur (Arabic)-->
+			<languagePopulation type="kk_Arab" populationPercent="0.0061" references="R1119"/>	<!--Kazakh (Arabic)-->
 		</territory>
-		<territory type="AG" gdp="1610000000" literacyPercent="99" population="91295">	<!--Antigua & Barbuda-->
+		<territory type="AG" gdp="2032000000" literacyPercent="99" population="92436">	<!--Antigua & Barbuda-->
 			<languagePopulation type="en" populationPercent="86" officialStatus="official"/>	<!--English-->
-			<languagePopulation type="pt" populationPercent="1.8"/>	<!--Portuguese-->
+			<languagePopulation type="pt" populationPercent="1.7"/>	<!--Portuguese-->
 		</territory>
-		<territory type="AI" gdp="175400000" literacyPercent="95" population="16086">	<!--Anguilla-->
+		<territory type="AI" gdp="175400000" literacyPercent="95" population="16418">	<!--Anguilla-->
 			<languagePopulation type="en" populationPercent="95" officialStatus="official"/>	<!--English-->
 		</territory>
-		<territory type="AL" gdp="28340000000" literacyPercent="96.8" population="3020210">	<!--Albania-->
+		<territory type="AL" gdp="31590000000" literacyPercent="96.8" population="3029280">	<!--Albania-->
 			<languagePopulation type="sq" populationPercent="100" officialStatus="official"/>	<!--Albanian-->
 			<languagePopulation type="el" populationPercent="1.9"/>	<!--Greek-->
 			<languagePopulation type="mk" populationPercent="0.47"/>	<!--Macedonian-->
 		</territory>
-		<territory type="AM" gdp="20610000000" literacyPercent="99.6" population="3060630">	<!--Armenia-->
+		<territory type="AM" gdp="24370000000" literacyPercent="99.6" population="3056380">	<!--Armenia-->
 			<languagePopulation type="hy" populationPercent="98" officialStatus="official"/>	<!--Armenian-->
 			<languagePopulation type="ku_Latn" populationPercent="3.3"/>	<!--Kurdish (Latin)-->
 			<languagePopulation type="az_Latn" populationPercent="0" references="R1290"/>	<!--Azerbaijani (Latin)-->
 		</territory>
-		<territory type="AO" gdp="131800000000" literacyPercent="70.4" population="19088100">	<!--Angola-->
+		<territory type="AO" gdp="177300000000" literacyPercent="70.4" population="19625400">	<!--Angola-->
 			<languagePopulation type="pt" populationPercent="67" officialStatus="official"/>	<!--Portuguese-->
 			<languagePopulation type="umb" populationPercent="29"/>	<!--Umbundu-->
 			<languagePopulation type="kmb" writingPercent="10" populationPercent="25" references="R1034"/>	<!--Kimbundu-->
 			<languagePopulation type="ln" populationPercent="0.67" references="R1010"/>	<!--Lingala-->
 		</territory>
-		<territory type="AQ" gdp="15730000" literacyPercent="99" population="300">	<!--Antarctica-->
+		<territory type="AQ" gdp="16200000" literacyPercent="99" population="300">	<!--Antarctica-->
 			<languagePopulation type="und" populationPercent="100" references="R1060"/>	<!--Unknown Language-->
 		</territory>
-		<territory type="AR" gdp="771000000000" literacyPercent="97.9" population="43024400">	<!--Argentina-->
+		<territory type="AR" gdp="951000000000" literacyPercent="97.9" population="43431900">	<!--Argentina-->
 			<languagePopulation type="es" populationPercent="100" officialStatus="official"/>	<!--Spanish-->
 			<languagePopulation type="en" populationPercent="7"/>	<!--English-->
 			<languagePopulation type="cy" populationPercent="0.066"/>	<!--Welsh-->
 			<languagePopulation type="gn" populationPercent="0.047"/>	<!--Guarani-->
 		</territory>
-		<territory type="AS" gdp="575300000" literacyPercent="97" population="54517">	<!--American Samoa-->
+		<territory type="AS" gdp="711000000" literacyPercent="97" population="54343">	<!--American Samoa-->
 			<languagePopulation type="sm" populationPercent="99" officialStatus="official"/>	<!--Samoan-->
 			<languagePopulation type="en" populationPercent="97" officialStatus="de_facto_official"/>	<!--English-->
 		</territory>
-		<territory type="AT" gdp="361000000000" literacyPercent="98" population="8223060">	<!--Austria-->
+		<territory type="AT" gdp="396800000000" literacyPercent="98" population="8665550">	<!--Austria-->
 			<languagePopulation type="de" populationPercent="97" officialStatus="official"/>	<!--German-->
 			<languagePopulation type="bar" populationPercent="95"/>	<!--Bavarian-->
 			<languagePopulation type="en" populationPercent="73"/>	<!--English-->
@@ -2411,13 +2432,13 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="sl" populationPercent="0.37" officialStatus="official_regional"/>	<!--Slovenian-->
 			<languagePopulation type="hu" populationPercent="0.27" officialStatus="official_regional"/>	<!--Hungarian-->
 		</territory>
-		<territory type="AU" gdp="998300000000" literacyPercent="99" population="22507600">	<!--Australia-->
+		<territory type="AU" gdp="1100000000000" literacyPercent="99" population="22751000">	<!--Australia-->
 			<languagePopulation type="en" populationPercent="96" officialStatus="de_facto_official" references="R1001"/>	<!--English-->
 			<languagePopulation type="zh_Hant" populationPercent="2.1"/>	<!--Chinese (Traditional)-->
 			<languagePopulation type="it" populationPercent="1.9"/>	<!--Italian-->
 			<languagePopulation type="wbp" populationPercent="0.011"/>	<!--Warlpiri-->
 		</territory>
-		<territory type="AW" gdp="2516000000" literacyPercent="96.8" population="110663">	<!--Aruba-->
+		<territory type="AW" gdp="2516000000" literacyPercent="96.8" population="112162">	<!--Aruba-->
 			<languagePopulation type="nl" populationPercent="97" officialStatus="official" references="R1000"/>	<!--Dutch-->
 			<languagePopulation type="pap" populationPercent="61" officialStatus="official"/>	<!--Papiamento-->
 			<languagePopulation type="en" populationPercent="2.7"/>	<!--English-->
@@ -2425,7 +2446,7 @@ XXX Code for transations where no currency is involved
 		<territory type="AX" gdp="929800000" literacyPercent="100" population="26200">	<!--Åland Islands-->
 			<languagePopulation type="sv" populationPercent="99" officialStatus="official"/>	<!--Swedish-->
 		</territory>
-		<territory type="AZ" gdp="102700000000" literacyPercent="99.8" population="9686210">	<!--Azerbaijan-->
+		<territory type="AZ" gdp="165900000000" literacyPercent="99.8" population="9780780">	<!--Azerbaijan-->
 			<languagePopulation type="az_Latn" populationPercent="89" officialStatus="official" references="R1120"/>	<!--Azerbaijani (Latin)-->
 			<languagePopulation type="az_Cyrl" populationPercent="9.9" officialStatus="official" references="R1121"/>	<!--Azerbaijani (Cyrillic)-->
 			<languagePopulation type="tly_Latn" populationPercent="9.8"/>	<!--Talysh (Latin)-->
@@ -2433,7 +2454,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="ttt_Latn" populationPercent="0.22"/>	<!--Muslim Tat (Latin)-->
 			<languagePopulation type="tkr_Latn" populationPercent="0.16"/>	<!--Tsakhur (Latin)-->
 		</territory>
-		<territory type="BA" gdp="32160000000" literacyPercent="98" population="3871640">	<!--Bosnia & Herzegovina-->
+		<territory type="BA" gdp="38290000000" literacyPercent="98" population="3867060">	<!--Bosnia & Herzegovina-->
 			<languagePopulation type="bs_Cyrl" writingPercent="5" populationPercent="99" officialStatus="official" references="R1083"/>	<!--Bosnian (Cyrillic)-->
 			<languagePopulation type="bs_Latn" populationPercent="99" officialStatus="official"/>	<!--Bosnian (Latin)-->
 			<languagePopulation type="en" populationPercent="45"/>	<!--English-->
@@ -2441,10 +2462,10 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="sr_Cyrl" populationPercent="10" officialStatus="official"/>	<!--Serbian (Cyrillic)-->
 			<languagePopulation type="sr_Latn" writingPercent="5" populationPercent="10" officialStatus="official" references="R1003"/>	<!--Serbian (Latin)-->
 		</territory>
-		<territory type="BB" gdp="7004000000" literacyPercent="99.7" population="289680">	<!--Barbados-->
+		<territory type="BB" gdp="4567000000" literacyPercent="99.7" population="290604">	<!--Barbados-->
 			<languagePopulation type="en" populationPercent="100" officialStatus="official"/>	<!--English-->
 		</territory>
-		<territory type="BD" gdp="324600000000" literacyPercent="57.7" population="166281000">	<!--Bangladesh-->
+		<territory type="BD" gdp="536500000000" literacyPercent="57.7" population="168958000">	<!--Bangladesh-->
 			<languagePopulation type="bn" populationPercent="98" officialStatus="official"/>	<!--Bengali-->
 			<languagePopulation type="en" populationPercent="18"/>	<!--English-->
 			<languagePopulation type="rkt" writingPercent="20" populationPercent="6.5" references="R1087"/>	<!--Rangpuri-->
@@ -2452,9 +2473,10 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="ccp" populationPercent="0.22"/>	<!--Chakma-->
 			<languagePopulation type="my" populationPercent="0.21"/>	<!--Burmese-->
 			<languagePopulation type="grt" populationPercent="0.073"/>	<!--Garo-->
+			<languagePopulation type="mro" populationPercent="0.018" references="R1105"/>	<!--Mru-->
 			<languagePopulation type="mni" populationPercent="0.011"/>	<!--Manipuri-->
 		</territory>
-		<territory type="BE" gdp="421700000000" literacyPercent="99" population="10449400">	<!--Belgium-->
+		<territory type="BE" gdp="483300000000" literacyPercent="99" population="11324000">	<!--Belgium-->
 			<languagePopulation type="en" populationPercent="59" references="R1052"/>	<!--English-->
 			<languagePopulation type="nl" populationPercent="55" officialStatus="official" references="R1004"/>	<!--Dutch-->
 			<languagePopulation type="fr" populationPercent="38" officialStatus="official"/>	<!--French-->
@@ -2462,43 +2484,44 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="wa" writingPercent="5" populationPercent="5.8" references="R1005"/>	<!--Walloon-->
 			<languagePopulation type="de" populationPercent="1.4" officialStatus="official"/>	<!--German-->
 		</territory>
-		<territory type="BF" gdp="26510000000" literacyPercent="28.7" population="18365100">	<!--Burkina Faso-->
-			<languagePopulation type="mos" populationPercent="40" references="R1105"/>	<!--Mossi-->
+		<territory type="BF" gdp="29420000000" literacyPercent="28.7" population="18931700">	<!--Burkina Faso-->
+			<languagePopulation type="mos" populationPercent="40" references="R1307"/>	<!--Mossi-->
 			<languagePopulation type="dyu" populationPercent="32" references="R1091"/>	<!--Dyula-->
 			<languagePopulation type="fr" populationPercent="22" officialStatus="official"/>	<!--French-->
 		</territory>
-		<territory type="BG" gdp="104600000000" literacyPercent="98.4" population="6924720">	<!--Bulgaria-->
+		<territory type="BG" gdp="129100000000" literacyPercent="98.4" population="7186890">	<!--Bulgaria-->
 			<languagePopulation type="bg" populationPercent="100" officialStatus="official"/>	<!--Bulgarian-->
 			<languagePopulation type="en" populationPercent="25"/>	<!--English-->
 			<languagePopulation type="tr" populationPercent="11"/>	<!--Turkish-->
 		</territory>
-		<territory type="BH" gdp="34960000000" literacyPercent="94.6" population="1314090">	<!--Bahrain-->
+		<territory type="BH" gdp="62170000000" literacyPercent="94.6" population="1346610">	<!--Bahrain-->
 			<languagePopulation type="ar" populationPercent="87" officialStatus="official" references="R1007"/>	<!--Arabic-->
 			<languagePopulation type="ml" populationPercent="3.3" references="R1109"/>	<!--Malayalam-->
 		</territory>
-		<territory type="BI" gdp="5750000000" literacyPercent="67.2" population="10395900">	<!--Burundi-->
+		<territory type="BI" gdp="8409000000" literacyPercent="67.2" population="10742300">	<!--Burundi-->
 			<languagePopulation type="rn" populationPercent="63" officialStatus="official"/>	<!--Rundi-->
 			<languagePopulation type="fr" populationPercent="59" officialStatus="official"/>	<!--French-->
-			<languagePopulation type="sw" populationPercent="0.061"/>	<!--Swahili-->
+			<languagePopulation type="sw" populationPercent="0.059"/>	<!--Swahili-->
+			<languagePopulation type="en" populationPercent="0.058" officialStatus="official" references="R1308"/>	<!--English-->
 		</territory>
-		<territory type="BJ" gdp="16650000000" literacyPercent="42.4" population="10160600">	<!--Benin-->
+		<territory type="BJ" gdp="19860000000" literacyPercent="42.4" population="10448600">	<!--Benin-->
 			<languagePopulation type="fr" populationPercent="35" officialStatus="official"/>	<!--French-->
 			<languagePopulation type="fon" populationPercent="25"/>	<!--Fon-->
 			<languagePopulation type="yo" populationPercent="6.7"/>	<!--Yoruba-->
 		</territory>
-		<territory type="BL" gdp="255000000" literacyPercent="99" population="7267">	<!--St. Barthélemy-->
-			<languagePopulation type="fr" populationPercent="94" officialStatus="official"/>	<!--French-->
+		<territory type="BL" gdp="255000000" literacyPercent="99" population="7237">	<!--St. Barthélemy-->
+			<languagePopulation type="fr" populationPercent="95" officialStatus="official"/>	<!--French-->
 		</territory>
-		<territory type="BM" gdp="5600000000" literacyPercent="98" population="69839">	<!--Bermuda-->
+		<territory type="BM" gdp="5198000000" literacyPercent="98" population="70196">	<!--Bermuda-->
 			<languagePopulation type="en" populationPercent="92" officialStatus="official"/>	<!--English-->
 		</territory>
-		<territory type="BN" gdp="22250000000" literacyPercent="95.4" population="422675">	<!--Brunei-->
+		<territory type="BN" gdp="32960000000" literacyPercent="95.4" population="429646">	<!--Brunei-->
 			<languagePopulation type="ms_Latn" populationPercent="93" officialStatus="official"/>	<!--Malay (Latin)-->
 			<languagePopulation type="zh_Hant" populationPercent="11"/>	<!--Chinese (Traditional)-->
-			<languagePopulation type="ms_Arab" populationPercent="5" officialStatus="official" references="R1219"/>	<!--Malay (Arabic)-->
+			<languagePopulation type="ms_Arab" populationPercent="5" officialStatus="official" references="R1229"/>	<!--Malay (Arabic)-->
 			<languagePopulation type="en" populationPercent="1.9"/>	<!--English-->
 		</territory>
-		<territory type="BO" gdp="59110000000" literacyPercent="91.2" population="10631500">	<!--Bolivia-->
+		<territory type="BO" gdp="70280000000" literacyPercent="91.2" population="10800900">	<!--Bolivia-->
 			<languagePopulation type="es" populationPercent="61" officialStatus="official" references="R1191"/>	<!--Spanish-->
 			<languagePopulation type="qu" populationPercent="32" officialStatus="official" references="R1008"/>	<!--Quechua-->
 			<languagePopulation type="ay" populationPercent="20" officialStatus="official"/>	<!--Aymara-->
@@ -2509,45 +2532,46 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="pap" populationPercent="81"/>	<!--Papiamento-->
 			<languagePopulation type="nl" populationPercent="8" officialStatus="official"/>	<!--Dutch-->
 		</territory>
-		<territory type="BR" gdp="2416000000000" literacyPercent="90.4" population="202657000">	<!--Brazil-->
+		<territory type="BR" gdp="3276000000000" literacyPercent="90.4" population="204260000">	<!--Brazil-->
 			<languagePopulation type="pt" populationPercent="91" officialStatus="official"/>	<!--Portuguese-->
 			<languagePopulation type="en" populationPercent="8"/>	<!--English-->
 			<languagePopulation type="de" populationPercent="0.84"/>	<!--German-->
 			<languagePopulation type="it" populationPercent="0.28"/>	<!--Italian-->
 			<languagePopulation type="ja" populationPercent="0.21"/>	<!--Japanese-->
+			<languagePopulation type="es" populationPercent="0.037" references="R1315"/>	<!--Spanish-->
 			<languagePopulation type="ko" populationPercent="0.021"/>	<!--Korean-->
 			<languagePopulation type="kgp" populationPercent="0.01"/>	<!--Kaingang-->
 			<languagePopulation type="gub" populationPercent="0.0084"/>	<!--Guajajára-->
 			<languagePopulation type="yrl" populationPercent="0.0052"/>	<!--Nheengatu-->
 			<languagePopulation type="xav" populationPercent="0.0049"/>	<!--Xavánte-->
 		</territory>
-		<territory type="BS" gdp="11400000000" literacyPercent="95.6" population="321834">	<!--Bahamas-->
+		<territory type="BS" gdp="9031000000" literacyPercent="95.6" population="324597">	<!--Bahamas-->
 			<languagePopulation type="en" populationPercent="100" officialStatus="official"/>	<!--English-->
 		</territory>
-		<territory type="BT" gdp="5235000000" literacyPercent="52.8" population="733643">	<!--Bhutan-->
+		<territory type="BT" gdp="5871000000" literacyPercent="52.8" population="741919">	<!--Bhutan-->
 			<languagePopulation type="dz" populationPercent="47" officialStatus="official"/>	<!--Dzongkha-->
 			<languagePopulation type="ne" populationPercent="17"/>	<!--Nepali-->
 			<languagePopulation type="tsj" populationPercent="15"/>	<!--Tshangla-->
 			<languagePopulation type="en" populationPercent="11"/>	<!--English-->
 			<languagePopulation type="lep" populationPercent="3.9"/>	<!--Lepcha-->
 		</territory>
-		<territory type="BV" gdp="37450" literacyPercent="99" population="1">	<!--Bouvet Island-->
+		<territory type="BV" gdp="40090" literacyPercent="99" population="1">	<!--Bouvet Island-->
 			<languagePopulation type="und" populationPercent="100"/>	<!--Unknown Language-->
 		</territory>
-		<territory type="BW" gdp="34000000000" literacyPercent="85.1" population="2155780">	<!--Botswana-->
+		<territory type="BW" gdp="35870000000" literacyPercent="85.1" population="2182720">	<!--Botswana-->
 			<languagePopulation type="en" populationPercent="81" officialStatus="official" references="R1009"/>	<!--English-->
 			<languagePopulation type="tn" populationPercent="62" officialStatus="official"/>	<!--Tswana-->
-			<languagePopulation type="af" populationPercent="0.28"/>	<!--Afrikaans-->
+			<languagePopulation type="af" populationPercent="0.27"/>	<!--Afrikaans-->
 		</territory>
-		<territory type="BY" gdp="150400000000" literacyPercent="99.6" population="9608060">	<!--Belarus-->
+		<territory type="BY" gdp="172800000000" literacyPercent="99.6" population="9589690">	<!--Belarus-->
 			<languagePopulation type="be" populationPercent="100" officialStatus="official"/>	<!--Belarusian-->
 			<languagePopulation type="ru" populationPercent="12" officialStatus="official"/>	<!--Russian-->
 		</territory>
-		<territory type="BZ" gdp="3083000000" literacyPercent="76.9" population="340844">	<!--Belize-->
+		<territory type="BZ" gdp="2975000000" literacyPercent="76.9" population="347369">	<!--Belize-->
 			<languagePopulation type="en" populationPercent="100" officialStatus="official"/>	<!--English-->
 			<languagePopulation type="es" populationPercent="28"/>	<!--Spanish-->
 		</territory>
-		<territory type="CA" gdp="1518000000000" literacyPercent="99" population="34834800">	<!--Canada-->
+		<territory type="CA" gdp="1596000000000" literacyPercent="99" population="35099800">	<!--Canada-->
 			<languagePopulation type="en" populationPercent="86" officialStatus="official" references="R1194"/>	<!--English-->
 			<languagePopulation type="fr" populationPercent="22" officialStatus="official"/>	<!--French-->
 			<languagePopulation type="it" populationPercent="2" references="R1207"/>	<!--Italian-->
@@ -2566,18 +2590,18 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="crm" populationPercent="0.013" references="R1063"/>	<!--Moose Cree-->
 			<languagePopulation type="ikt" writingPercent="30" populationPercent="0.011" officialStatus="official_regional" references="R1207"/>	<!--Inuinnaqtun-->
 			<languagePopulation type="moh" populationPercent="0.01" references="R1090"/>	<!--Mohawk-->
-			<languagePopulation type="dgr" populationPercent="0.0076" references="R1136"/>	<!--Dogrib-->
+			<languagePopulation type="dgr" populationPercent="0.0075" references="R1136"/>	<!--Dogrib-->
 			<languagePopulation type="den" populationPercent="0.0066"/>	<!--Slave-->
-			<languagePopulation type="scs" populationPercent="0.0036" references="R1172"/>	<!--North Slavey-->
+			<languagePopulation type="scs" populationPercent="0.0035" references="R1172"/>	<!--North Slavey-->
 			<languagePopulation type="nsk" populationPercent="0.0034" references="R1063"/>	<!--Naskapi-->
 			<languagePopulation type="chp" populationPercent="0.0022" references="R1063"/>	<!--Chipewyan-->
 			<languagePopulation type="gwi" populationPercent="0.0016" references="R1173"/>	<!--Gwichʼin-->
 		</territory>
-		<territory type="CC" gdp="26430000" literacyPercent="99" population="596">	<!--Cocos (Keeling) Islands-->
+		<territory type="CC" gdp="28820000" literacyPercent="99" population="596">	<!--Cocos (Keeling) Islands-->
 			<languagePopulation type="ms_Arab" populationPercent="83"/>	<!--Malay (Arabic)-->
 			<languagePopulation type="en" populationPercent="17" officialStatus="de_facto_official"/>	<!--English-->
 		</territory>
-		<territory type="CD" gdp="29390000000" literacyPercent="66.8" population="77433700">	<!--Congo - Kinshasa-->
+		<territory type="CD" gdp="57780000000" literacyPercent="66.8" population="79375100">	<!--Congo - Kinshasa-->
 			<languagePopulation type="sw" populationPercent="50" officialStatus="official_regional" references="R1122"/>	<!--Swahili-->
 			<languagePopulation type="lua" populationPercent="9.6" officialStatus="official_regional" references="R1092"/>	<!--Luba-Lulua-->
 			<languagePopulation type="swc" populationPercent="9" references="R1250"/>	<!--Congo Swahili-->
@@ -2588,27 +2612,28 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="lol" populationPercent="0.61"/>	<!--Mongo-->
 			<languagePopulation type="rw" populationPercent="0.38"/>	<!--Kinyarwanda-->
 		</territory>
-		<territory type="CF" gdp="3336000000" literacyPercent="56.6" population="5277960">	<!--Central African Republic-->
+		<territory type="CF" gdp="2865000000" literacyPercent="56.6" population="5391540">	<!--Central African Republic-->
 			<languagePopulation type="fr" populationPercent="49" officialStatus="official"/>	<!--French-->
 			<languagePopulation type="sg" populationPercent="49" officialStatus="official" references="R1011"/>	<!--Sango-->
 			<languagePopulation type="ln" populationPercent="0.24"/>	<!--Lingala-->
 		</territory>
-		<territory type="CG" gdp="20260000000" literacyPercent="83.8" population="4662450">	<!--Congo - Brazzaville-->
+		<territory type="CG" gdp="28360000000" literacyPercent="83.8" population="4755100">	<!--Congo - Brazzaville-->
 			<languagePopulation type="fr" populationPercent="84" officialStatus="official"/>	<!--French-->
 			<languagePopulation type="ln" populationPercent="2.4"/>	<!--Lingala-->
 		</territory>
-		<territory type="CH" gdp="371200000000" literacyPercent="99" population="8061520">	<!--Switzerland-->
+		<territory type="CH" gdp="473300000000" literacyPercent="99" population="8121830">	<!--Switzerland-->
 			<languagePopulation type="de" populationPercent="73" officialStatus="official"/>	<!--German-->
+			<languagePopulation type="gsw" writingPercent="5" populationPercent="65" officialStatus="de_facto_official" references="R1006"/>	<!--Swiss German-->
 			<languagePopulation type="en" populationPercent="61" references="R1137"/>	<!--English-->
 			<languagePopulation type="fr" populationPercent="21" officialStatus="official" references="R1137"/>	<!--French-->
-			<languagePopulation type="gsw" writingPercent="5" populationPercent="12" officialStatus="de_facto_official" references="R1006"/>	<!--Swiss German-->
 			<languagePopulation type="it" populationPercent="4.3" officialStatus="official"/>	<!--Italian-->
 			<languagePopulation type="lmo" writingPercent="5" populationPercent="4.1" references="R1086"/>	<!--Lombard-->
+			<languagePopulation type="pt" populationPercent="3.4" references="R1316"/>	<!--Portuguese-->
 			<languagePopulation type="rm" populationPercent="0.5" officialStatus="official_regional" references="R1117"/>	<!--Romansh-->
 			<languagePopulation type="rmo" populationPercent="0.29"/>	<!--Sinte Romani-->
 			<languagePopulation type="wae" populationPercent="0.12"/>	<!--Walser-->
 		</territory>
-		<territory type="CI" gdp="43670000000" literacyPercent="56.9" population="22848900">	<!--Côte d’Ivoire-->
+		<territory type="CI" gdp="71670000000" literacyPercent="56.9" population="23295300">	<!--Côte d’Ivoire-->
 			<languagePopulation type="fr" populationPercent="49" officialStatus="official"/>	<!--French-->
 			<languagePopulation type="bci" writingPercent="10" populationPercent="11"/>	<!--Baoulé-->
 			<languagePopulation type="sef" writingPercent="5" populationPercent="4.3"/>	<!--Cebaara Senoufo-->
@@ -2616,15 +2641,15 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="kfo" populationPercent="0.23"/>	<!--Koro-->
 			<languagePopulation type="bqv" writingPercent="10" populationPercent="0.17"/>	<!--Koro Wachi-->
 		</territory>
-		<territory type="CK" gdp="183200000" literacyPercent="95" population="10134">	<!--Cook Islands-->
-			<languagePopulation type="en" populationPercent="95" officialStatus="official"/>	<!--English-->
+		<territory type="CK" gdp="183200000" literacyPercent="95" population="9838">	<!--Cook Islands-->
+			<languagePopulation type="en" populationPercent="98" officialStatus="official"/>	<!--English-->
 		</territory>
-		<territory type="CL" gdp="335400000000" literacyPercent="98.6" population="17363900">	<!--Chile-->
+		<territory type="CL" gdp="410900000000" literacyPercent="98.6" population="17508300">	<!--Chile-->
 			<languagePopulation type="es" populationPercent="98" officialStatus="official" references="R1192"/>	<!--Spanish-->
 			<languagePopulation type="en" populationPercent="9.5"/>	<!--English-->
 			<languagePopulation type="arn" populationPercent="1.5" references="R1287"/>	<!--Mapuche-->
 		</territory>
-		<territory type="CM" gdp="53160000000" literacyPercent="71.3" population="23130700">	<!--Cameroon-->
+		<territory type="CM" gdp="67780000000" literacyPercent="71.3" population="23739200">	<!--Cameroon-->
 			<languagePopulation type="fr" populationPercent="68" officialStatus="official"/>	<!--French-->
 			<languagePopulation type="en" populationPercent="38" officialStatus="official" references="R1013"/>	<!--English-->
 			<languagePopulation type="bum" populationPercent="4.6"/>	<!--Bulu-->
@@ -2649,10 +2674,11 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="ksf" populationPercent="0.32"/>	<!--Bafia-->
 			<languagePopulation type="agq" writingPercent="20" populationPercent="0.14"/>	<!--Aghem-->
 			<languagePopulation type="ha_Arab" populationPercent="0.14"/>	<!--Hausa (Arabic)-->
-			<languagePopulation type="nmg" writingPercent="10" populationPercent="0.039" references="R1246"/>	<!--Kwasio-->
-			<languagePopulation type="yav" populationPercent="0.0099"/>	<!--Yangben-->
+			<languagePopulation type="nmg" writingPercent="10" populationPercent="0.038" references="R1246"/>	<!--Kwasio-->
+			<languagePopulation type="yav" populationPercent="0.0097"/>	<!--Yangben-->
 		</territory>
-		<territory type="CN" gdp="13390000000000" literacyPercent="95.1" population="1355690000">	<!--China-->
+		<territory type="CN" gdp="18090000000000" literacyPercent="95.1" population="1367490000">	<!--China-->
+			<languagePopulation type="yue" writingPercent="4.3" populationPercent="90" references="R1317"/>	<!--Cantonese-->
 			<languagePopulation type="zh_Hans" populationPercent="90" officialStatus="official"/>	<!--Chinese (Simplified)-->
 			<languagePopulation type="wuu" populationPercent="6"/>	<!--Wu Chinese-->
 			<languagePopulation type="hsn" populationPercent="2.9"/>	<!--Xiang Chinese-->
@@ -2678,20 +2704,20 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="uz_Cyrl" populationPercent="0.0004"/>	<!--Uzbek (Cyrillic)-->
 			<languagePopulation type="lzh" populationPercent="0" references="R1150"/>	<!--Literary Chinese-->
 		</territory>
-		<territory type="CO" gdp="526500000000" literacyPercent="93.6" population="46245300">	<!--Colombia-->
+		<territory type="CO" gdp="642500000000" literacyPercent="93.6" population="46736700">	<!--Colombia-->
 			<languagePopulation type="es" populationPercent="93" officialStatus="official" references="R1014"/>	<!--Spanish-->
 			<languagePopulation type="guc" populationPercent="0.27"/>	<!--Wayuu-->
 		</territory>
-		<territory type="CP" gdp="34350" literacyPercent="99" population="1">	<!--Clipperton Island-->
+		<territory type="CP" gdp="38930" literacyPercent="99" population="1">	<!--Clipperton Island-->
 			<languagePopulation type="und" populationPercent="100" references="R1062"/>	<!--Unknown Language-->
 		</territory>
-		<territory type="CR" gdp="61430000000" literacyPercent="96.3" population="4755230">	<!--Costa Rica-->
+		<territory type="CR" gdp="71230000000" literacyPercent="96.3" population="4814140">	<!--Costa Rica-->
 			<languagePopulation type="es" populationPercent="95" officialStatus="official" references="R1193"/>	<!--Spanish-->
 		</territory>
-		<territory type="CU" gdp="121000000000" literacyPercent="99.8" population="11047300">	<!--Cuba-->
+		<territory type="CU" gdp="128500000000" literacyPercent="99.8" population="11031400">	<!--Cuba-->
 			<languagePopulation type="es" populationPercent="100" officialStatus="official"/>	<!--Spanish-->
 		</territory>
-		<territory type="CV" gdp="2222000000" literacyPercent="84.9" population="538535">	<!--Cape Verde-->
+		<territory type="CV" gdp="3330000000" literacyPercent="84.9" population="545993">	<!--Cape Verde-->
 			<languagePopulation type="kea" populationPercent="91" references="R1031"/>	<!--Kabuverdianu-->
 			<languagePopulation type="pt" populationPercent="76" officialStatus="official"/>	<!--Portuguese-->
 		</territory>
@@ -2700,26 +2726,27 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="nl" populationPercent="8" officialStatus="official" references="R1221"/>	<!--Dutch-->
 			<languagePopulation type="es" populationPercent="3.9" references="R1221"/>	<!--Spanish-->
 		</territory>
-		<territory type="CX" gdp="67860000" literacyPercent="99" population="1530">	<!--Christmas Island-->
+		<territory type="CX" gdp="73970000" literacyPercent="99" population="1530">	<!--Christmas Island-->
 			<languagePopulation type="en" populationPercent="92" officialStatus="official"/>	<!--English-->
 		</territory>
-		<territory type="CY" gdp="21620000000" literacyPercent="98.7" population="1203860">	<!--Cyprus-->
+		<territory type="CY" gdp="27520000000" literacyPercent="98.7" population="1189200">	<!--Cyprus-->
 			<languagePopulation type="el" populationPercent="75" officialStatus="official"/>	<!--Greek-->
 			<languagePopulation type="en" populationPercent="73"/>	<!--English-->
 			<languagePopulation type="tr" populationPercent="23" officialStatus="official"/>	<!--Turkish-->
 			<languagePopulation type="hy" populationPercent="0.23"/>	<!--Armenian-->
 			<languagePopulation type="ar" populationPercent="0.11"/>	<!--Arabic-->
 		</territory>
-		<territory type="CZ" gdp="285600000000" literacyPercent="99" population="10627400">	<!--Czech Republic-->
+		<territory type="CZ" gdp="315900000000" literacyPercent="99" population="10644800">	<!--Czech Republic-->
 			<languagePopulation type="cs" populationPercent="98" officialStatus="official"/>	<!--Czech-->
 			<languagePopulation type="en" populationPercent="27"/>	<!--English-->
 			<languagePopulation type="de" populationPercent="0.49"/>	<!--German-->
 			<languagePopulation type="pl" populationPercent="0.49"/>	<!--Polish-->
 		</territory>
-		<territory type="DE" gdp="3227000000000" literacyPercent="99" population="80996700">	<!--Germany-->
+		<territory type="DE" gdp="3748000000000" literacyPercent="99" population="80854400">	<!--Germany-->
 			<languagePopulation type="de" populationPercent="91" officialStatus="official"/>	<!--German-->
 			<languagePopulation type="en" populationPercent="64"/>	<!--English-->
 			<languagePopulation type="fr" populationPercent="18" references="R1304"/>	<!--French-->
+			<languagePopulation type="bar" writingPercent="5" populationPercent="17" references="R1318"/>	<!--Bavarian-->
 			<languagePopulation type="nds" writingPercent="5" populationPercent="12" references="R1167"/>	<!--Low German-->
 			<languagePopulation type="nl" populationPercent="9" references="R1304"/>	<!--Dutch-->
 			<languagePopulation type="it" populationPercent="7" references="R1304"/>	<!--Italian-->
@@ -2728,6 +2755,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="vmf" populationPercent="6"/>	<!--Main-Franconian-->
 			<languagePopulation type="tr" populationPercent="2.5"/>	<!--Turkish-->
 			<languagePopulation type="da" populationPercent="2" references="R1306"/>	<!--Danish-->
+			<languagePopulation type="swg" writingPercent="5" populationPercent="1"/>	<!--Swabian-->
 			<languagePopulation type="hr" populationPercent="0.79"/>	<!--Croatian-->
 			<languagePopulation type="ku_Latn" populationPercent="0.66"/>	<!--Kurdish (Latin)-->
 			<languagePopulation type="el" populationPercent="0.38"/>	<!--Greek-->
@@ -2735,64 +2763,65 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="pl" populationPercent="0.29"/>	<!--Polish-->
 			<languagePopulation type="hsb" writingPercent="5" populationPercent="0.016" references="R1292"/>	<!--Upper Sorbian-->
 			<languagePopulation type="frr" populationPercent="0.012" references="R1095"/>	<!--Northern Frisian-->
-			<languagePopulation type="dsb" writingPercent="5" populationPercent="0.0086" references="R1222"/>	<!--Lower Sorbian-->
+			<languagePopulation type="dsb" writingPercent="5" populationPercent="0.0087" references="R1222"/>	<!--Lower Sorbian-->
 			<languagePopulation type="frs" populationPercent="0.0025" references="R1300"/>	<!--Eastern Frisian-->
 			<languagePopulation type="stq" populationPercent="0.0012"/>	<!--Saterland Frisian-->
 			<languagePopulation type="pfl" populationPercent="0" references="R1150"/>	<!--Palatine German-->
 		</territory>
-		<territory type="DG" gdp="18720000" literacyPercent="99" population="500">	<!--Diego Garcia-->
+		<territory type="DG" gdp="20040000" literacyPercent="99" population="500">	<!--Diego Garcia-->
 			<languagePopulation type="en" populationPercent="99" officialStatus="de_facto_official" references="R1065"/>	<!--English-->
 		</territory>
-		<territory type="DJ" gdp="2505000000" literacyPercent="67.9" population="810179">	<!--Djibouti-->
+		<territory type="DJ" gdp="2876000000" literacyPercent="67.9" population="828324">	<!--Djibouti-->
 			<languagePopulation type="aa" populationPercent="42"/>	<!--Afar-->
 			<languagePopulation type="so" populationPercent="41"/>	<!--Somali-->
 			<languagePopulation type="ar" populationPercent="7.3" officialStatus="official"/>	<!--Arabic-->
 			<languagePopulation type="fr" populationPercent="2.1" officialStatus="official"/>	<!--French-->
 		</territory>
-		<territory type="DK" gdp="211300000000" literacyPercent="99" population="5569080">	<!--Denmark-->
+		<territory type="DK" gdp="250700000000" literacyPercent="99" population="5581500">	<!--Denmark-->
 			<languagePopulation type="da" populationPercent="93" officialStatus="official"/>	<!--Danish-->
 			<languagePopulation type="en" populationPercent="86"/>	<!--English-->
 			<languagePopulation type="de" populationPercent="0.43" officialStatus="official_regional" references="R1247"/>	<!--German-->
+			<languagePopulation type="fo" populationPercent="0.38" references="R1309"/>	<!--Faroese-->
 			<languagePopulation type="kl" populationPercent="0.13" officialStatus="official_regional"/>	<!--Kalaallisut-->
-			<languagePopulation type="jut" populationPercent="0" references="R1298"/>	<!--Jutish-->
+			<languagePopulation type="jut" populationPercent="0" references="R1150"/>	<!--Jutish-->
 		</territory>
-		<territory type="DM" gdp="1015000000" literacyPercent="94" population="73449">	<!--Dominica-->
+		<territory type="DM" gdp="790000000" literacyPercent="94" population="73607">	<!--Dominica-->
 			<languagePopulation type="en" populationPercent="94" officialStatus="official"/>	<!--English-->
 		</territory>
-		<territory type="DO" gdp="101000000000" literacyPercent="90.1" population="10349700">	<!--Dominican Republic-->
+		<territory type="DO" gdp="138500000000" literacyPercent="90.1" population="10478800">	<!--Dominican Republic-->
 			<languagePopulation type="es" populationPercent="78" officialStatus="official"/>	<!--Spanish-->
-			<languagePopulation type="en" populationPercent="0.077"/>	<!--English-->
+			<languagePopulation type="en" populationPercent="0.076"/>	<!--English-->
 		</territory>
-		<territory type="DZ" gdp="284700000000" literacyPercent="72.6" population="38813700">	<!--Algeria-->
+		<territory type="DZ" gdp="548600000000" literacyPercent="72.6" population="39542200">	<!--Algeria-->
 			<languagePopulation type="arq" populationPercent="83"/>	<!--Algerian Arabic-->
 			<languagePopulation type="ar" populationPercent="74" officialStatus="official"/>	<!--Arabic-->
 			<languagePopulation type="fr" populationPercent="20" officialStatus="official" references="R1124"/>	<!--French-->
 			<languagePopulation type="kab" writingPercent="10" populationPercent="7.8" references="R1293"/>	<!--Kabyle-->
 			<languagePopulation type="en" populationPercent="7"/>	<!--English-->
 		</territory>
-		<territory type="EA" gdp="4364000000" literacyPercent="97.7" population="150000">	<!--Ceuta & Melilla-->
+		<territory type="EA" gdp="4898000000" literacyPercent="97.7" population="150000">	<!--Ceuta & Melilla-->
 			<languagePopulation type="es" populationPercent="98" officialStatus="official" references="R1067"/>	<!--Spanish-->
 		</territory>
-		<territory type="EC" gdp="157600000000" literacyPercent="91.6" population="15654400">	<!--Ecuador-->
+		<territory type="EC" gdp="181200000000" literacyPercent="91.6" population="15868400">	<!--Ecuador-->
 			<languagePopulation type="es" populationPercent="96" officialStatus="official" references="R1210"/>	<!--Spanish-->
 			<languagePopulation type="qu" populationPercent="17" officialStatus="official" references="R1288"/>	<!--Quechua-->
 			<languagePopulation type="qug" populationPercent="5.7"/>	<!--Chimborazo Highland Quichua-->
 		</territory>
-		<territory type="EE" gdp="29940000000" literacyPercent="99.8" population="1257920">	<!--Estonia-->
+		<territory type="EE" gdp="36780000000" literacyPercent="99.8" population="1265420">	<!--Estonia-->
 			<languagePopulation type="et" populationPercent="71" officialStatus="official"/>	<!--Estonian-->
 			<languagePopulation type="ru" populationPercent="30"/>	<!--Russian-->
 			<languagePopulation type="vro" populationPercent="5.7"/>	<!--Võro-->
 		</territory>
-		<territory type="EG" gdp="551400000000" literacyPercent="73.9" population="86895100">	<!--Egypt-->
+		<territory type="EG" gdp="946600000000" literacyPercent="73.9" population="88487400">	<!--Egypt-->
 			<languagePopulation type="ar" populationPercent="94" officialStatus="official"/>	<!--Arabic-->
 			<languagePopulation type="arz" populationPercent="64"/>	<!--Egyptian Arabic-->
 			<languagePopulation type="en" populationPercent="35"/>	<!--English-->
 			<languagePopulation type="el" populationPercent="0.061"/>	<!--Greek-->
 		</territory>
-		<territory type="EH" gdp="906500000" literacyPercent="50" population="554795">	<!--Western Sahara-->
+		<territory type="EH" gdp="906500000" literacyPercent="50" population="570866">	<!--Western Sahara-->
 			<languagePopulation type="ar" populationPercent="100" officialStatus="official"/>	<!--Arabic-->
 		</territory>
-		<territory type="ER" gdp="4717000000" literacyPercent="68.9" population="6380800">	<!--Eritrea-->
+		<territory type="ER" gdp="7842000000" literacyPercent="68.9" population="6527690">	<!--Eritrea-->
 			<languagePopulation type="ti" populationPercent="60" officialStatus="de_facto_official" references="R1223"/>	<!--Tigrinya-->
 			<languagePopulation type="en" populationPercent="59" officialStatus="official" references="R1248"/>	<!--English-->
 			<languagePopulation type="tig" populationPercent="18"/>	<!--Tigre-->
@@ -2801,7 +2830,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="ssy" populationPercent="3.6" references="R1175"/>	<!--Saho-->
 			<languagePopulation type="byn" populationPercent="1.3" references="R1224"/>	<!--Blin-->
 		</territory>
-		<territory type="ES" gdp="1389000000000" literacyPercent="97.7" population="47737900">	<!--Spain-->
+		<territory type="ES" gdp="1572000000000" literacyPercent="97.7" population="48146100">	<!--Spain-->
 			<languagePopulation type="es" populationPercent="99" officialStatus="official" references="R1176"/>	<!--Spanish-->
 			<languagePopulation type="en" populationPercent="24"/>	<!--English-->
 			<languagePopulation type="ca" populationPercent="17" officialStatus="official_regional" references="R1177"/>	<!--Catalan-->
@@ -2810,7 +2839,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="ast" populationPercent="1.3" officialStatus="official_regional" references="R1096"/>	<!--Asturian-->
 			<languagePopulation type="ext" populationPercent="0.49"/>	<!--Extremaduran-->
 		</territory>
-		<territory type="ET" gdp="118200000000" literacyPercent="39" population="96633500">	<!--Ethiopia-->
+		<territory type="ET" gdp="145100000000" literacyPercent="39" population="99465800">	<!--Ethiopia-->
 			<languagePopulation type="en" populationPercent="43"/>	<!--English-->
 			<languagePopulation type="am" populationPercent="33" officialStatus="official"/>	<!--Amharic-->
 			<languagePopulation type="om" populationPercent="32"/>	<!--Oromo-->
@@ -2820,39 +2849,39 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="wal" populationPercent="1.8"/>	<!--Wolaytta-->
 			<languagePopulation type="aa" populationPercent="1.4"/>	<!--Afar-->
 		</territory>
-		<territory type="FI" gdp="195500000000" literacyPercent="100" population="5268800">	<!--Finland-->
+		<territory type="FI" gdp="221700000000" literacyPercent="100" population="5476920">	<!--Finland-->
 			<languagePopulation type="fi" populationPercent="94" officialStatus="official"/>	<!--Finnish-->
 			<languagePopulation type="en" populationPercent="70" references="R1110"/>	<!--English-->
 			<languagePopulation type="sv" populationPercent="5.7" officialStatus="official"/>	<!--Swedish-->
 			<languagePopulation type="ru" populationPercent="0.81" references="R1110"/>	<!--Russian-->
 			<languagePopulation type="et" populationPercent="0.11"/>	<!--Estonian-->
-			<languagePopulation type="rmf" populationPercent="0.095" references="R1111"/>	<!--Kalo Finnish Romani-->
-			<languagePopulation type="se" populationPercent="0.038"/>	<!--Northern Sami-->
+			<languagePopulation type="rmf" populationPercent="0.091" references="R1111"/>	<!--Kalo Finnish Romani-->
+			<languagePopulation type="se" populationPercent="0.037"/>	<!--Northern Sami-->
 			<languagePopulation type="smn" populationPercent="0.011" references="R1112"/>	<!--Inari Sami-->
 			<languagePopulation type="sms" populationPercent="0.011" references="R1112"/>	<!--Skolt Sami-->
 		</territory>
-		<territory type="FJ" gdp="4450000000" literacyPercent="93.7" population="903207">	<!--Fiji-->
+		<territory type="FJ" gdp="7404000000" literacyPercent="93.7" population="909389">	<!--Fiji-->
 			<languagePopulation type="en" populationPercent="94" officialStatus="official"/>	<!--English-->
 			<languagePopulation type="hi" populationPercent="44" references="R1097"/>	<!--Hindi-->
-			<languagePopulation type="hif_Deva" populationPercent="41" officialStatus="official" references="R1299"/>	<!--Fiji Hindi (Devanagari)-->
+			<languagePopulation type="hif_Latn" populationPercent="41" officialStatus="official" references="R1299"/>	<!--Fiji Hindi (Latin)-->
 			<languagePopulation type="fj" populationPercent="39" officialStatus="official"/>	<!--Fijian-->
-			<languagePopulation type="rtm" populationPercent="0.28"/>	<!--Rotuman-->
+			<languagePopulation type="rtm" populationPercent="0.27"/>	<!--Rotuman-->
 		</territory>
-		<territory type="FK" gdp="164500000" literacyPercent="99" population="2840">	<!--Falkland Islands-->
-			<languagePopulation type="en" populationPercent="99" officialStatus="official"/>	<!--English-->
+		<territory type="FK" gdp="164500000" literacyPercent="99" population="3361">	<!--Falkland Islands-->
+			<languagePopulation type="en" populationPercent="84" officialStatus="official"/>	<!--English-->
 		</territory>
-		<territory type="FM" gdp="754000000" literacyPercent="89" population="105681">	<!--Micronesia-->
+		<territory type="FM" gdp="308000000" literacyPercent="89" population="105216">	<!--Micronesia-->
 			<languagePopulation type="en" populationPercent="57" officialStatus="official"/>	<!--English-->
 			<languagePopulation type="chk" populationPercent="30"/>	<!--Chuukese-->
 			<languagePopulation type="pon" populationPercent="23"/>	<!--Pohnpeian-->
 			<languagePopulation type="kos" populationPercent="7.6"/>	<!--Kosraean-->
-			<languagePopulation type="yap" populationPercent="6.2"/>	<!--Yapese-->
-			<languagePopulation type="uli" populationPercent="2.8"/>	<!--Ulithian-->
+			<languagePopulation type="yap" populationPercent="6.3"/>	<!--Yapese-->
+			<languagePopulation type="uli" populationPercent="2.9"/>	<!--Ulithian-->
 		</territory>
-		<territory type="FO" gdp="1471000000" literacyPercent="99" population="49947">	<!--Faroe Islands-->
+		<territory type="FO" gdp="1471000000" literacyPercent="99" population="50196">	<!--Faroe Islands-->
 			<languagePopulation type="fo" populationPercent="95" officialStatus="official"/>	<!--Faroese-->
 		</territory>
-		<territory type="FR" gdp="2276000000000" literacyPercent="99" population="66259000">	<!--France-->
+		<territory type="FR" gdp="2591000000000" literacyPercent="99" population="66553800">	<!--France-->
 			<languagePopulation type="fr" populationPercent="99" officialStatus="official"/>	<!--French-->
 			<languagePopulation type="en" populationPercent="39"/>	<!--English-->
 			<languagePopulation type="oc" writingPercent="5" populationPercent="3" references="R1015"/>	<!--Occitan-->
@@ -2868,11 +2897,11 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="frp" populationPercent="0.094"/>	<!--Arpitan-->
 			<languagePopulation type="ia" populationPercent="0.0002" references="R1220"/>	<!--Interlingua-->
 		</territory>
-		<territory type="GA" gdp="30060000000" literacyPercent="89" population="1672600">	<!--Gabon-->
+		<territory type="GA" gdp="32910000000" literacyPercent="89" population="1705340">	<!--Gabon-->
 			<languagePopulation type="fr" populationPercent="63" officialStatus="official"/>	<!--French-->
 			<languagePopulation type="puu" populationPercent="9"/>	<!--Punu-->
 		</territory>
-		<territory type="GB" gdp="2387000000000" literacyPercent="99" population="63743000">	<!--United Kingdom-->
+		<territory type="GB" gdp="2569000000000" literacyPercent="99" population="64088200">	<!--United Kingdom-->
 			<languagePopulation type="en" populationPercent="99" officialStatus="official"/>	<!--English-->
 			<languagePopulation type="sco" writingPercent="5" populationPercent="2.7" references="R1016"/>	<!--Scots-->
 			<languagePopulation type="pa_Guru" populationPercent="0.79"/>	<!--Punjabi (Gurmukhi)-->
@@ -2890,10 +2919,10 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="fr" populationPercent="0.024"/>	<!--French-->
 			<languagePopulation type="kw" populationPercent="0.0031" references="R1140"/>	<!--Cornish-->
 		</territory>
-		<territory type="GD" gdp="1458000000" literacyPercent="96" population="110152">	<!--Grenada-->
+		<territory type="GD" gdp="1326000000" literacyPercent="96" population="110694">	<!--Grenada-->
 			<languagePopulation type="en" populationPercent="96" officialStatus="official" references="R1018"/>	<!--English-->
 		</territory>
-		<territory type="GE" gdp="27300000000" literacyPercent="99.7" population="4935880">	<!--Georgia-->
+		<territory type="GE" gdp="34350000000" literacyPercent="99.7" population="4931230">	<!--Georgia-->
 			<languagePopulation type="ka" populationPercent="86" officialStatus="official"/>	<!--Georgian-->
 			<languagePopulation type="xmf" populationPercent="11"/>	<!--Mingrelian-->
 			<languagePopulation type="ru" populationPercent="9" references="R1038"/>	<!--Russian-->
@@ -2907,10 +2936,10 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="gcr" populationPercent="26"/>	<!--Guianese Creole French-->
 			<languagePopulation type="zh_Hant" populationPercent="2.5"/>	<!--Chinese (Traditional)-->
 		</territory>
-		<territory type="GG" gdp="2742000000" literacyPercent="100" population="65849">	<!--Guernsey-->
+		<territory type="GG" gdp="3420000000" literacyPercent="100" population="66080">	<!--Guernsey-->
 			<languagePopulation type="en" populationPercent="100" officialStatus="official"/>	<!--English-->
 		</territory>
-		<territory type="GH" gdp="90410000000" literacyPercent="71.5" population="25758100">	<!--Ghana-->
+		<territory type="GH" gdp="108500000000" literacyPercent="71.5" population="26327600">	<!--Ghana-->
 			<languagePopulation type="ak" populationPercent="39" officialStatus="official_regional"/>	<!--Akan-->
 			<languagePopulation type="en" populationPercent="21" officialStatus="official" references="R1225"/>	<!--English-->
 			<languagePopulation type="ee" populationPercent="11" officialStatus="official_regional"/>	<!--Ewe-->
@@ -2920,37 +2949,39 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="gaa" populationPercent="2.8" officialStatus="official_regional"/>	<!--Ga-->
 			<languagePopulation type="nzi" populationPercent="1" references="R1226"/>	<!--Nzima-->
 			<languagePopulation type="ha_Latn" populationPercent="0.87" references="R1141"/>	<!--Hausa (Latin)-->
-			<languagePopulation type="saf" populationPercent="0.016" references="R1226"/>	<!--Safaliba-->
+			<languagePopulation type="saf" populationPercent="0.015" references="R1226"/>	<!--Safaliba-->
 		</territory>
-		<territory type="GI" gdp="1275000000" literacyPercent="80" population="29185">	<!--Gibraltar-->
+		<territory type="GI" gdp="1850000000" literacyPercent="80" population="29258">	<!--Gibraltar-->
 			<languagePopulation type="en" populationPercent="80" officialStatus="official" references="R1022"/>	<!--English-->
+			<languagePopulation type="es" populationPercent="50" references="R1022"/>	<!--Spanish-->
 		</territory>
-		<territory type="GL" gdp="2133000000" literacyPercent="100" population="57728">	<!--Greenland-->
+		<territory type="GL" gdp="2133000000" literacyPercent="100" population="57733">	<!--Greenland-->
 			<languagePopulation type="kl" populationPercent="84" officialStatus="official"/>	<!--Kalaallisut-->
 			<languagePopulation type="da" populationPercent="14"/>	<!--Danish-->
 		</territory>
-		<territory type="GM" gdp="3678000000" literacyPercent="51.1" population="1925530">	<!--Gambia-->
+		<territory type="GM" gdp="3093000000" literacyPercent="51.1" population="1967710">	<!--Gambia-->
 			<languagePopulation type="en" populationPercent="40" officialStatus="official"/>	<!--English-->
 			<languagePopulation type="man_Latn" populationPercent="29"/>	<!--Mandingo (Latin)-->
 		</territory>
-		<territory type="GN" gdp="12560000000" literacyPercent="41" population="11474400">	<!--Guinea-->
+		<territory type="GN" gdp="15130000000" literacyPercent="41" population="11780200">	<!--Guinea-->
 			<languagePopulation type="fr" populationPercent="29" officialStatus="official" references="R1040"/>	<!--French-->
 			<languagePopulation type="ff" populationPercent="26"/>	<!--Fulah-->
 			<languagePopulation type="man_Nkoo" populationPercent="23"/>	<!--Mandingo (N’Ko)-->
 			<languagePopulation type="sus" populationPercent="11"/>	<!--Susu-->
-			<languagePopulation type="nqo" populationPercent="5" references="R1286"/>	<!--NʼKo-->
+			<languagePopulation type="nqo" populationPercent="5" references="R1286"/>	<!--N’Ko-->
 			<languagePopulation type="kpe" populationPercent="3.8"/>	<!--Kpelle-->
 		</territory>
 		<territory type="GP" gdp="3513000000" literacyPercent="90" population="452776">	<!--Guadeloupe-->
 			<languagePopulation type="fr" populationPercent="90" officialStatus="official" references="R1023"/>	<!--French-->
 		</territory>
-		<territory type="GQ" gdp="19680000000" literacyPercent="94.2" population="722254">	<!--Equatorial Guinea-->
+		<territory type="GQ" gdp="28620000000" literacyPercent="94.2" population="740743">	<!--Equatorial Guinea-->
 			<languagePopulation type="es" populationPercent="87" officialStatus="official" references="R1142"/>	<!--Spanish-->
 			<languagePopulation type="fan" populationPercent="51"/>	<!--Fang-->
 			<languagePopulation type="fr" populationPercent="8.8" officialStatus="official" references="R1084"/>	<!--French-->
 			<languagePopulation type="bvb" populationPercent="7.9"/>	<!--Bube-->
+			<languagePopulation type="pt" populationPercent="0.0001" officialStatus="official" references="R1150"/>	<!--Portuguese-->
 		</territory>
-		<territory type="GR" gdp="267100000000" literacyPercent="97.3" population="10775600">	<!--Greece-->
+		<territory type="GR" gdp="285300000000" literacyPercent="97.3" population="10775600">	<!--Greece-->
 			<languagePopulation type="el" populationPercent="99" officialStatus="official" references="R1211"/>	<!--Greek-->
 			<languagePopulation type="en" populationPercent="51"/>	<!--English-->
 			<languagePopulation type="pnt_Grek" populationPercent="3.7"/>	<!--Pontic (Greek)-->
@@ -2960,45 +2991,46 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="sq" populationPercent="0.093"/>	<!--Albanian-->
 			<languagePopulation type="tsd" populationPercent="0.0019"/>	<!--Tsakonian-->
 		</territory>
-		<territory type="GS" gdp="748900" literacyPercent="99" population="20">	<!--South Georgia & South Sandwich Islands-->
+		<territory type="GS" gdp="801700" literacyPercent="99" population="20">	<!--South Georgia & South Sandwich Islands-->
 			<languagePopulation type="und" writingPercent="100" populationPercent="100" references="R1178"/>	<!--Unknown Language-->
 		</territory>
-		<territory type="GT" gdp="81510000000" literacyPercent="75.9" population="14647100">	<!--Guatemala-->
+		<territory type="GT" gdp="119800000000" literacyPercent="75.9" population="14919000">	<!--Guatemala-->
 			<languagePopulation type="es" populationPercent="93" officialStatus="official" references="R1227"/>	<!--Spanish-->
 			<languagePopulation type="quc" populationPercent="7" officialStatus="official_regional" references="R1289"/>	<!--Kʼicheʼ-->
 		</territory>
-		<territory type="GU" gdp="4600000000" literacyPercent="99" population="161001">	<!--Guam-->
+		<territory type="GU" gdp="4882000000" literacyPercent="99" population="161785">	<!--Guam-->
 			<languagePopulation type="en" populationPercent="91" officialStatus="de_facto_official"/>	<!--English-->
 			<languagePopulation type="ch" populationPercent="22" officialStatus="official"/>	<!--Chamorro-->
 		</territory>
-		<territory type="GW" gdp="2005000000" literacyPercent="55.3" population="1693400">	<!--Guinea-Bissau-->
+		<territory type="GW" gdp="2532000000" literacyPercent="55.3" population="1726170">	<!--Guinea-Bissau-->
 			<languagePopulation type="pt" populationPercent="100" officialStatus="official" references="R1027"/>	<!--Portuguese-->
 		</territory>
-		<territory type="GY" gdp="6593000000" literacyPercent="91.8" population="735554">	<!--Guyana-->
+		<territory type="GY" gdp="5534000000" literacyPercent="91.8" population="735222">	<!--Guyana-->
 			<languagePopulation type="en" populationPercent="100" officialStatus="official"/>	<!--English-->
 		</territory>
-		<territory type="HK" gdp="381300000000" literacyPercent="93.5" population="7112690">	<!--Hong Kong SAR China-->
+		<territory type="HK" gdp="400400000000" literacyPercent="93.5" population="7141110">	<!--Hong Kong SAR China-->
 			<languagePopulation type="zh_Hant" populationPercent="95" officialStatus="official"/>	<!--Chinese (Traditional)-->
+			<languagePopulation type="yue" populationPercent="89" references="R1320"/>	<!--Cantonese-->
 			<languagePopulation type="en" populationPercent="51" officialStatus="official"/>	<!--English-->
 			<languagePopulation type="zh_Hans" populationPercent="5" references="R1143"/>	<!--Chinese (Simplified)-->
 		</territory>
-		<territory type="HM" gdp="44350" literacyPercent="99" population="1">	<!--Heard & McDonald Islands-->
+		<territory type="HM" gdp="48350" literacyPercent="99" population="1">	<!--Heard & McDonald Islands-->
 			<languagePopulation type="und" writingPercent="100" populationPercent="100" references="R1064"/>	<!--Unknown Language-->
 		</territory>
-		<territory type="HN" gdp="39230000000" literacyPercent="85.1" population="8598560">	<!--Honduras-->
+		<territory type="HN" gdp="39220000000" literacyPercent="85.1" population="8746670">	<!--Honduras-->
 			<languagePopulation type="es" populationPercent="78" officialStatus="official"/>	<!--Spanish-->
 			<languagePopulation type="en" populationPercent="0.44"/>	<!--English-->
 		</territory>
-		<territory type="HR" gdp="78900000000" literacyPercent="98.9" population="4470530">	<!--Croatia-->
+		<territory type="HR" gdp="88730000000" literacyPercent="98.9" population="4464840">	<!--Croatia-->
 			<languagePopulation type="hr" populationPercent="99" officialStatus="official"/>	<!--Croatian-->
 			<languagePopulation type="en" populationPercent="49"/>	<!--English-->
 			<languagePopulation type="it" populationPercent="1.6" officialStatus="official_regional"/>	<!--Italian-->
 		</territory>
-		<territory type="HT" gdp="13420000000" literacyPercent="48.7" population="9996730">	<!--Haiti-->
-			<languagePopulation type="ht" populationPercent="81" officialStatus="official" references="R1029"/>	<!--Haitian-->
+		<territory type="HT" gdp="18380000000" literacyPercent="48.7" population="10110000">	<!--Haiti-->
+			<languagePopulation type="ht" populationPercent="81" officialStatus="official" references="R1029"/>	<!--Haitian Creole-->
 			<languagePopulation type="fr" writingPercent="100" populationPercent="4.7" officialStatus="official" references="R1030"/>	<!--French-->
 		</territory>
-		<territory type="HU" gdp="196600000000" literacyPercent="99" population="9919130">	<!--Hungary-->
+		<territory type="HU" gdp="247100000000" literacyPercent="99" population="9897540">	<!--Hungary-->
 			<languagePopulation type="hu" populationPercent="100" officialStatus="official"/>	<!--Hungarian-->
 			<languagePopulation type="en" populationPercent="20"/>	<!--English-->
 			<languagePopulation type="de" populationPercent="2.5"/>	<!--German-->
@@ -3007,10 +3039,10 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="sk" populationPercent="0.11"/>	<!--Slovak-->
 			<languagePopulation type="sl" populationPercent="0.05"/>	<!--Slovenian-->
 		</territory>
-		<territory type="IC" gdp="61060000000" literacyPercent="97.7" population="2098590">	<!--Canary Islands-->
+		<territory type="IC" gdp="68520000000" literacyPercent="97.7" population="2098590">	<!--Canary Islands-->
 			<languagePopulation type="es" populationPercent="98" officialStatus="official" references="R1075"/>	<!--Spanish-->
 		</territory>
-		<territory type="ID" gdp="1285000000000" literacyPercent="92.8" population="253610000">	<!--Indonesia-->
+		<territory type="ID" gdp="2686000000000" literacyPercent="92.8" population="255994000">	<!--Indonesia-->
 			<languagePopulation type="id" populationPercent="64" officialStatus="official"/>	<!--Indonesian-->
 			<languagePopulation type="jv" writingPercent="10" populationPercent="34" references="R1294"/>	<!--Javanese-->
 			<languagePopulation type="su" populationPercent="12" references="R1269"/>	<!--Sundanese-->
@@ -3041,11 +3073,11 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="sly" populationPercent="0.054"/>	<!--Selayar-->
 			<languagePopulation type="mwv" populationPercent="0.024"/>	<!--Mentawai-->
 		</territory>
-		<territory type="IE" gdp="190400000000" literacyPercent="99" population="4832770">	<!--Ireland-->
+		<territory type="IE" gdp="236400000000" literacyPercent="99" population="4892310">	<!--Ireland-->
 			<languagePopulation type="en" populationPercent="98" officialStatus="official" references="R1202"/>	<!--English-->
 			<languagePopulation type="ga" populationPercent="11" officialStatus="official" references="R1043"/>	<!--Irish-->
 		</territory>
-		<territory type="IL" gdp="273200000000" literacyPercent="97.1" population="7821850">	<!--Israel-->
+		<territory type="IL" gdp="272100000000" literacyPercent="97.1" population="8049310">	<!--Israel-->
 			<languagePopulation type="he" populationPercent="100" officialStatus="official"/>	<!--Hebrew-->
 			<languagePopulation type="en" populationPercent="85"/>	<!--English-->
 			<languagePopulation type="ar" populationPercent="20" officialStatus="official"/>	<!--Arabic-->
@@ -3056,14 +3088,14 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="lad" populationPercent="1.3" references="R1301"/>	<!--Ladino-->
 			<languagePopulation type="hu" populationPercent="1"/>	<!--Hungarian-->
 			<languagePopulation type="am" populationPercent="0.59"/>	<!--Amharic-->
-			<languagePopulation type="ti" populationPercent="0.13"/>	<!--Tigrinya-->
-			<languagePopulation type="ml" populationPercent="0.1" references="R1115"/>	<!--Malayalam-->
+			<languagePopulation type="ti" populationPercent="0.12"/>	<!--Tigrinya-->
+			<languagePopulation type="ml" populationPercent="0.099" references="R1115"/>	<!--Malayalam-->
 		</territory>
-		<territory type="IM" gdp="4076000000" literacyPercent="99" population="86866">	<!--Isle of Man-->
+		<territory type="IM" gdp="6298000000" literacyPercent="99" population="87545">	<!--Isle of Man-->
 			<languagePopulation type="en" populationPercent="100" officialStatus="official"/>	<!--English-->
 			<languagePopulation type="gv" populationPercent="1.9" officialStatus="official"/>	<!--Manx-->
 		</territory>
-		<territory type="IN" gdp="4990000000000" literacyPercent="62.8" population="1236340000">	<!--India-->
+		<territory type="IN" gdp="7411000000000" literacyPercent="62.8" population="1251700000">	<!--India-->
 			<languagePopulation type="hi" populationPercent="41" officialStatus="official" references="R1066"/>	<!--Hindi-->
 			<languagePopulation type="en" populationPercent="19" officialStatus="official" references="R1033"/>	<!--English-->
 			<languagePopulation type="bn" populationPercent="8.1" officialStatus="official_regional" references="R1195"/>	<!--Bengali-->
@@ -3118,7 +3150,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="bhi" populationPercent="0.092"/>	<!--Bhilali-->
 			<languagePopulation type="hoj" populationPercent="0.082"/>	<!--Hadothi-->
 			<languagePopulation type="kha" writingPercent="29" populationPercent="0.08" officialStatus="official_regional"/>	<!--Khasi-->
-			<languagePopulation type="kfr" populationPercent="0.075"/>	<!--Kachchi-->
+			<languagePopulation type="kfr" populationPercent="0.075"/>	<!--Kachhi-->
 			<languagePopulation type="grt" populationPercent="0.053"/>	<!--Garo-->
 			<languagePopulation type="unx_Beng" populationPercent="0.048"/>	<!--unx (Bengali)-->
 			<languagePopulation type="bfy" populationPercent="0.037"/>	<!--Bagheli-->
@@ -3142,23 +3174,25 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="dv" populationPercent="0.0004"/>	<!--Divehi-->
 			<languagePopulation type="dz" populationPercent="0.0002"/>	<!--Dzongkha-->
 		</territory>
-		<territory type="IO" gdp="131100000" literacyPercent="99" population="3500">	<!--British Indian Ocean Territory-->
+		<territory type="IO" gdp="140300000" literacyPercent="99" population="3500">	<!--British Indian Ocean Territory-->
 			<languagePopulation type="en" writingPercent="100" populationPercent="100" officialStatus="official" references="R1179"/>	<!--English-->
 		</territory>
-		<territory type="IQ" gdp="249400000000" literacyPercent="78.5" population="32585700">	<!--Iraq-->
+		<territory type="IQ" gdp="526100000000" literacyPercent="78.5" population="37056200">	<!--Iraq-->
 			<languagePopulation type="ar" populationPercent="68" officialStatus="official"/>	<!--Arabic-->
 			<languagePopulation type="en" populationPercent="35"/>	<!--English-->
-			<languagePopulation type="ckb" populationPercent="20" officialStatus="official_regional" references="R1073"/>	<!--Sorani Kurdish-->
+			<languagePopulation type="ckb" populationPercent="20" officialStatus="official_regional" references="R1073"/>	<!--Central Kurdish-->
+			<languagePopulation type="az_Arab" populationPercent="1.8" officialStatus="official_regional"/>	<!--Azerbaijani (Arabic)-->
 			<languagePopulation type="fa" populationPercent="0.87"/>	<!--Persian-->
-			<languagePopulation type="syr" populationPercent="0.5" references="R1229"/>	<!--Syriac-->
+			<languagePopulation type="lrc" populationPercent="0.61" references="R1310"/>	<!--Northern Luri-->
+			<languagePopulation type="syr" populationPercent="0.5" references="R1311"/>	<!--Syriac-->
 		</territory>
-		<territory type="IR" gdp="987100000000" literacyPercent="85" population="80840700">	<!--Iran-->
+		<territory type="IR" gdp="1357000000000" literacyPercent="85" population="81824300">	<!--Iran-->
 			<languagePopulation type="fa" populationPercent="75" officialStatus="official"/>	<!--Persian-->
 			<languagePopulation type="az_Arab" populationPercent="24"/>	<!--Azerbaijani (Arabic)-->
-			<languagePopulation type="azb" populationPercent="24"/>	<!--South Azerbaijani-->
 			<languagePopulation type="mzn" populationPercent="5"/>	<!--Mazanderani-->
 			<languagePopulation type="glk" populationPercent="4.6"/>	<!--Gilaki-->
-			<languagePopulation type="ckb" populationPercent="3.9" references="R1212"/>	<!--Sorani Kurdish-->
+			<languagePopulation type="ckb" populationPercent="3.9" references="R1212"/>	<!--Central Kurdish-->
+			<languagePopulation type="sdh" populationPercent="3.7" references="R1312"/>	<!--Southern Kurdish-->
 			<languagePopulation type="tk_Latn" populationPercent="2.8"/>	<!--Turkmen (Latin)-->
 			<languagePopulation type="lrc" writingPercent="10" populationPercent="2.1"/>	<!--Northern Luri-->
 			<languagePopulation type="ar" populationPercent="2"/>	<!--Arabic-->
@@ -3167,18 +3201,19 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="bqi" populationPercent="1.4"/>	<!--Bakhtiari-->
 			<languagePopulation type="luz" populationPercent="1.2"/>	<!--Southern Luri-->
 			<languagePopulation type="lki" populationPercent="0.76" references="R1212"/>	<!--Laki-->
+			<languagePopulation type="bgn" writingPercent="5" populationPercent="0.56" references="R1209"/>	<!--Western Balochi-->
 			<languagePopulation type="prd" populationPercent="0.5"/>	<!--Parsi-Dari-->
 			<languagePopulation type="hy" populationPercent="0.24"/>	<!--Armenian-->
 			<languagePopulation type="ps" populationPercent="0.16"/>	<!--Pashto-->
 			<languagePopulation type="ka" populationPercent="0.071"/>	<!--Georgian-->
-			<languagePopulation type="gbz" populationPercent="0.0099"/>	<!--Zoroastrian Dari-->
+			<languagePopulation type="gbz" populationPercent="0.0098"/>	<!--Zoroastrian Dari-->
 			<languagePopulation type="kk_Arab" populationPercent="0.0037" references="R1119"/>	<!--Kazakh (Arabic)-->
 		</territory>
-		<territory type="IS" gdp="13110000000" literacyPercent="99" population="317351">	<!--Iceland-->
+		<territory type="IS" gdp="14340000000" literacyPercent="99" population="331918">	<!--Iceland-->
 			<languagePopulation type="is" populationPercent="100" officialStatus="official" references="R1035"/>	<!--Icelandic-->
-			<languagePopulation type="da" populationPercent="0.71"/>	<!--Danish-->
+			<languagePopulation type="da" populationPercent="0.68"/>	<!--Danish-->
 		</territory>
-		<territory type="IT" gdp="1805000000000" literacyPercent="99" population="61680100">	<!--Italy-->
+		<territory type="IT" gdp="2135000000000" literacyPercent="99" population="61855100">	<!--Italy-->
 			<languagePopulation type="it" populationPercent="95" officialStatus="official"/>	<!--Italian-->
 			<languagePopulation type="en" populationPercent="34"/>	<!--English-->
 			<languagePopulation type="fr" populationPercent="6.3" officialStatus="official_regional" references="R1252"/>	<!--French-->
@@ -3194,28 +3229,28 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="egl" populationPercent="0.05" references="R1302"/>	<!--Emilian-->
 			<languagePopulation type="ca" populationPercent="0.035"/>	<!--Catalan-->
 			<languagePopulation type="el" populationPercent="0.035"/>	<!--Greek-->
-			<languagePopulation type="lmo" populationPercent="0.032"/>	<!--Lombard-->
+			<languagePopulation type="lmo" populationPercent="0.03"/>	<!--Lombard-->
 			<languagePopulation type="pms" populationPercent="0.01"/>	<!--Piedmontese-->
 			<languagePopulation type="hr" populationPercent="0.0057"/>	<!--Croatian-->
 			<languagePopulation type="rgn" populationPercent="0" references="R1150"/>	<!--Romagnol-->
 		</territory>
-		<territory type="JE" gdp="5100000000" literacyPercent="99" population="96513">	<!--Jersey-->
+		<territory type="JE" gdp="5771000000" literacyPercent="99" population="97294">	<!--Jersey-->
 			<languagePopulation type="en" populationPercent="95" officialStatus="official"/>	<!--English-->
 		</territory>
-		<territory type="JM" gdp="25130000000" literacyPercent="87" population="2930050">	<!--Jamaica-->
+		<territory type="JM" gdp="24100000000" literacyPercent="87" population="2950210">	<!--Jamaica-->
 			<languagePopulation type="en" populationPercent="98" officialStatus="official"/>	<!--English-->
 			<languagePopulation type="jam" populationPercent="95"/>	<!--Jamaican Creole English-->
 		</territory>
-		<territory type="JO" gdp="40020000000" literacyPercent="95.9" population="7930490">	<!--Jordan-->
+		<territory type="JO" gdp="79910000000" literacyPercent="95.9" population="8117560">	<!--Jordan-->
 			<languagePopulation type="ar" populationPercent="100" officialStatus="official" references="R1036"/>	<!--Arabic-->
 			<languagePopulation type="en" populationPercent="45" references="R1036"/>	<!--English-->
 		</territory>
-		<territory type="JP" gdp="4729000000000" literacyPercent="99" population="127103000">	<!--Japan-->
+		<territory type="JP" gdp="4767000000000" literacyPercent="99" population="126920000">	<!--Japan-->
 			<languagePopulation type="ja" populationPercent="95" officialStatus="official"/>	<!--Japanese-->
 			<languagePopulation type="ryu" writingPercent="5" populationPercent="0.77" references="R1151"/>	<!--Central Okinawan-->
 			<languagePopulation type="ko" populationPercent="0.52"/>	<!--Korean-->
 		</territory>
-		<territory type="KE" gdp="79900000000" literacyPercent="87.4" population="45010100">	<!--Kenya-->
+		<territory type="KE" gdp="133000000000" literacyPercent="87.4" population="45925300">	<!--Kenya-->
 			<languagePopulation type="sw" populationPercent="66" officialStatus="official" references="R1127"/>	<!--Swahili-->
 			<languagePopulation type="en" populationPercent="19" officialStatus="official"/>	<!--English-->
 			<languagePopulation type="ki" populationPercent="17"/>	<!--Kikuyu-->
@@ -3237,105 +3272,107 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="pa_Guru" populationPercent="0.022"/>	<!--Punjabi (Gurmukhi)-->
 			<languagePopulation type="gu" populationPercent="0.011"/>	<!--Gujarati-->
 		</territory>
-		<territory type="KG" gdp="14300000000" literacyPercent="99.2" population="5604210">	<!--Kyrgyzstan-->
+		<territory type="KG" gdp="19230000000" literacyPercent="99.2" population="5664940">	<!--Kyrgyzstan-->
 			<languagePopulation type="ky_Cyrl" populationPercent="48" officialStatus="official"/>	<!--Kyrgyz (Cyrillic)-->
 			<languagePopulation type="ru" populationPercent="36" officialStatus="official" references="R1108"/>	<!--Russian-->
 		</territory>
-		<territory type="KH" gdp="39640000000" literacyPercent="73.9" population="15458300">	<!--Cambodia-->
+		<territory type="KH" gdp="50160000000" literacyPercent="73.9" population="15708800">	<!--Cambodia-->
 			<languagePopulation type="km" populationPercent="89" officialStatus="official"/>	<!--Khmer-->
 			<languagePopulation type="cja" populationPercent="1.6"/>	<!--Western Cham-->
 			<languagePopulation type="kdt" populationPercent="0.11"/>	<!--Kuy-->
 		</territory>
-		<territory type="KI" gdp="698000000" literacyPercent="90" population="104488">	<!--Kiribati-->
+		<territory type="KI" gdp="189000000" literacyPercent="90" population="105711">	<!--Kiribati-->
 			<languagePopulation type="en" populationPercent="100" officialStatus="official" references="R1037"/>	<!--English-->
 			<languagePopulation type="gil" populationPercent="60" officialStatus="official"/>	<!--Gilbertese-->
 		</territory>
-		<territory type="KM" gdp="911000000" literacyPercent="75.5" population="766865">	<!--Comoros-->
+		<territory type="KM" gdp="1190000000" literacyPercent="75.5" population="780971">	<!--Comoros-->
 			<languagePopulation type="ar" populationPercent="66" officialStatus="official"/>	<!--Arabic-->
 			<languagePopulation type="fr" populationPercent="56" officialStatus="official"/>	<!--French-->
 			<languagePopulation type="zdj" populationPercent="37" officialStatus="official" references="R1198"/>	<!--Ngazidja Comorian-->
+			<languagePopulation type="wni" populationPercent="34" officialStatus="official" references="R1313"/>	<!--Ndzwani Comorian-->
 		</territory>
-		<territory type="KN" gdp="952000000" literacyPercent="97.8" population="51538">	<!--St. Kitts & Nevis-->
+		<territory type="KN" gdp="1281000000" literacyPercent="97.8" population="51936">	<!--St. Kitts & Nevis-->
 			<languagePopulation type="en" populationPercent="98" officialStatus="official"/>	<!--English-->
 		</territory>
-		<territory type="KP" gdp="40000000000" literacyPercent="100" population="24851600">	<!--North Korea-->
+		<territory type="KP" gdp="40000000000" literacyPercent="100" population="24983200">	<!--North Korea-->
 			<languagePopulation type="ko" populationPercent="88" officialStatus="official"/>	<!--Korean-->
 		</territory>
-		<territory type="KR" gdp="1666000000000" literacyPercent="97.9" population="49040000">	<!--South Korea-->
+		<territory type="KR" gdp="1784000000000" literacyPercent="97.9" population="49115200">	<!--South Korea-->
 			<languagePopulation type="ko" populationPercent="100" officialStatus="official"/>	<!--Korean-->
 		</territory>
-		<territory type="KW" gdp="165800000000" literacyPercent="93.9" population="2742710">	<!--Kuwait-->
+		<territory type="KW" gdp="282600000000" literacyPercent="93.9" population="2788530">	<!--Kuwait-->
 			<languagePopulation type="ar" populationPercent="100" officialStatus="official"/>	<!--Arabic-->
 		</territory>
-		<territory type="KY" gdp="2250000000" literacyPercent="98.9" population="54914">	<!--Cayman Islands-->
+		<territory type="KY" gdp="2507000000" literacyPercent="98.9" population="56092">	<!--Cayman Islands-->
 			<languagePopulation type="en" populationPercent="98" officialStatus="official"/>	<!--English-->
 		</territory>
-		<territory type="KZ" gdp="243600000000" literacyPercent="99.7" population="17948800">	<!--Kazakhstan-->
+		<territory type="KZ" gdp="420000000000" literacyPercent="99.7" population="18157100">	<!--Kazakhstan-->
 			<languagePopulation type="ru" populationPercent="72" officialStatus="official" references="R1257"/>	<!--Russian-->
 			<languagePopulation type="kk_Cyrl" populationPercent="64" officialStatus="official" references="R1068"/>	<!--Kazakh (Cyrillic)-->
 			<languagePopulation type="en" populationPercent="15"/>	<!--English-->
 			<languagePopulation type="de" populationPercent="6.4"/>	<!--German-->
 			<languagePopulation type="ug_Cyrl" populationPercent="2"/>	<!--Uyghur (Cyrillic)-->
 		</territory>
-		<territory type="LA" gdp="20780000000" literacyPercent="72.7" population="6803700">	<!--Laos-->
+		<territory type="LA" gdp="34530000000" literacyPercent="72.7" population="6911540">	<!--Laos-->
 			<languagePopulation type="lo" populationPercent="69" officialStatus="official"/>	<!--Lao-->
 			<languagePopulation type="kjg" populationPercent="5.8" references="R1230"/>	<!--Khmu-->
 			<languagePopulation type="kdt" populationPercent="0.96" references="R1231"/>	<!--Kuy-->
 		</territory>
-		<territory type="LB" gdp="64310000000" literacyPercent="89.6" population="5882560">	<!--Lebanon-->
+		<territory type="LB" gdp="81420000000" literacyPercent="89.6" population="6184700">	<!--Lebanon-->
 			<languagePopulation type="ar" populationPercent="86" officialStatus="official"/>	<!--Arabic-->
 			<languagePopulation type="en" populationPercent="40"/>	<!--English-->
 			<languagePopulation type="hy" populationPercent="5.2"/>	<!--Armenian-->
 			<languagePopulation type="ku_Arab" populationPercent="1.6"/>	<!--Kurdish (Arabic)-->
 			<languagePopulation type="fr" populationPercent="0.37"/>	<!--French-->
 		</territory>
-		<territory type="LC" gdp="2216000000" literacyPercent="90.1" population="163362">	<!--St. Lucia-->
+		<territory type="LC" gdp="1978000000" literacyPercent="90.1" population="163922">	<!--St. Lucia-->
 			<languagePopulation type="en" populationPercent="90" officialStatus="official"/>	<!--English-->
 		</territory>
-		<territory type="LI" gdp="3200000000" literacyPercent="100" population="37313">	<!--Liechtenstein-->
+		<territory type="LI" gdp="3200000000" literacyPercent="100" population="37624">	<!--Liechtenstein-->
 			<languagePopulation type="de" populationPercent="100" officialStatus="official" references="R1039"/>	<!--German-->
 			<languagePopulation type="gsw" writingPercent="5" populationPercent="85" officialStatus="de_facto_official"/>	<!--Swiss German-->
 			<languagePopulation type="wae" populationPercent="3.5"/>	<!--Walser-->
 		</territory>
-		<territory type="LK" gdp="134500000000" literacyPercent="91.2" population="21866400">	<!--Sri Lanka-->
+		<territory type="LK" gdp="218200000000" literacyPercent="91.2" population="22053500">	<!--Sri Lanka-->
 			<languagePopulation type="si" populationPercent="68" officialStatus="official"/>	<!--Sinhala-->
 			<languagePopulation type="ta" populationPercent="15" officialStatus="official"/>	<!--Tamil-->
 			<languagePopulation type="en" populationPercent="10"/>	<!--English-->
 		</territory>
-		<territory type="LR" gdp="2898000000" literacyPercent="60.8" population="4092310">	<!--Liberia-->
+		<territory type="LR" gdp="3711000000" literacyPercent="60.8" population="4195670">	<!--Liberia-->
 			<languagePopulation type="en" populationPercent="83" officialStatus="official" references="R1046"/>	<!--English-->
 			<languagePopulation type="kpe" populationPercent="14"/>	<!--Kpelle-->
 			<languagePopulation type="vai_Vaii" populationPercent="2.6" references="R1271"/>	<!--Vai (Vai)-->
 			<languagePopulation type="men" populationPercent="0.48"/>	<!--Mende-->
 			<languagePopulation type="vai_Latn" populationPercent="0" references="R1272"/>	<!--Vai (Latin)-->
 		</territory>
-		<territory type="LS" gdp="4265000000" literacyPercent="89.6" population="1942010">	<!--Lesotho-->
+		<territory type="LS" gdp="5575000000" literacyPercent="89.6" population="1947700">	<!--Lesotho-->
 			<languagePopulation type="st" populationPercent="98" officialStatus="official"/>	<!--Southern Sotho-->
 			<languagePopulation type="en" populationPercent="27" officialStatus="official" references="R1047"/>	<!--English-->
 			<languagePopulation type="zu" populationPercent="14"/>	<!--Zulu-->
 			<languagePopulation type="ss" populationPercent="2.4"/>	<!--Swati-->
 			<languagePopulation type="xh" populationPercent="0.99"/>	<!--Xhosa-->
 		</territory>
-		<territory type="LT" gdp="67430000000" literacyPercent="99.7" population="3505740">	<!--Lithuania-->
+		<territory type="LT" gdp="79930000000" literacyPercent="99.7" population="2884430">	<!--Lithuania-->
 			<languagePopulation type="lt" populationPercent="86" officialStatus="official"/>	<!--Lithuanian-->
 			<languagePopulation type="en" populationPercent="38"/>	<!--English-->
 			<languagePopulation type="ru" populationPercent="8" references="R1048"/>	<!--Russian-->
 			<languagePopulation type="sgs" populationPercent="0" references="R1303"/>	<!--Samogitian-->
 		</territory>
-		<territory type="LU" gdp="42670000000" literacyPercent="100" population="520672">	<!--Luxembourg-->
+		<territory type="LU" gdp="53670000000" literacyPercent="100" population="570252">	<!--Luxembourg-->
 			<languagePopulation type="fr" populationPercent="87" officialStatus="official"/>	<!--French-->
 			<languagePopulation type="lb" writingPercent="5" populationPercent="67" officialStatus="official" references="R1024"/>	<!--Luxembourgish-->
 			<languagePopulation type="de" populationPercent="63" officialStatus="official"/>	<!--German-->
+			<languagePopulation type="pt" populationPercent="16" references="R1321"/>	<!--Portuguese-->
 		</territory>
-		<territory type="LV" gdp="38870000000" literacyPercent="99.8" population="2165170">	<!--Latvia-->
+		<territory type="LV" gdp="48360000000" literacyPercent="99.8" population="1986710">	<!--Latvia-->
 			<languagePopulation type="lv" populationPercent="61" officialStatus="official"/>	<!--Latvian-->
 			<languagePopulation type="ru" populationPercent="38"/>	<!--Russian-->
 			<languagePopulation type="ltg" populationPercent="8.9"/>	<!--Latgalian-->
 		</territory>
-		<territory type="LY" gdp="73600000000" literacyPercent="89.5" population="6244170">	<!--Libya-->
+		<territory type="LY" gdp="97940000000" literacyPercent="89.5" population="6411780">	<!--Libya-->
 			<languagePopulation type="ar" populationPercent="74" officialStatus="official"/>	<!--Arabic-->
 		</territory>
-		<territory type="MA" gdp="180000000000" literacyPercent="67.1" population="32987200">	<!--Morocco-->
+		<territory type="MA" gdp="259200000000" literacyPercent="67.1" population="33322700">	<!--Morocco-->
 			<languagePopulation type="ary" populationPercent="87"/>	<!--Moroccan Arabic-->
 			<languagePopulation type="ar" populationPercent="62" officialStatus="official"/>	<!--Arabic-->
 			<languagePopulation type="zgh" populationPercent="22" references="R1254"/>	<!--Standard Moroccan Tamazight-->
@@ -3348,39 +3385,39 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="rif_Tfng" writingPercent="5" populationPercent="4.9"/>	<!--Riffian (Tifinagh)-->
 			<languagePopulation type="es" populationPercent="0.065"/>	<!--Spanish-->
 		</territory>
-		<territory type="MC" gdp="6213000000" literacyPercent="99" population="30508">	<!--Monaco-->
+		<territory type="MC" gdp="6790000000" literacyPercent="99" population="30535">	<!--Monaco-->
 			<languagePopulation type="fr" populationPercent="99" officialStatus="official"/>	<!--French-->
 		</territory>
-		<territory type="MD" gdp="13250000000" literacyPercent="99" population="3583290">	<!--Moldova-->
+		<territory type="MD" gdp="17780000000" literacyPercent="99" population="3546850">	<!--Moldova-->
 			<languagePopulation type="ro" populationPercent="63" officialStatus="official"/>	<!--Romanian-->
 			<languagePopulation type="uk" populationPercent="14"/>	<!--Ukrainian-->
 			<languagePopulation type="bg" populationPercent="9.4"/>	<!--Bulgarian-->
 			<languagePopulation type="gag" populationPercent="3.3" references="R1128"/>	<!--Gagauz-->
 			<languagePopulation type="ru" populationPercent="3" references="R1051"/>	<!--Russian-->
 		</territory>
-		<territory type="ME" gdp="7429000000" literacyPercent="98.5" population="650036">	<!--Montenegro-->
+		<territory type="ME" gdp="9428000000" literacyPercent="98.5" population="647073">	<!--Montenegro-->
 			<languagePopulation type="sr_Latn" populationPercent="100" officialStatus="official"/>	<!--Serbian (Latin)-->
 			<languagePopulation type="sq" populationPercent="7.9"/>	<!--Albanian-->
 			<languagePopulation type="sr_Cyrl" populationPercent="5" references="R1255"/>	<!--Serbian (Cyrillic)-->
 		</territory>
-		<territory type="MF" gdp="449000000" literacyPercent="99" population="31264">	<!--St. Martin-->
+		<territory type="MF" gdp="561500000" literacyPercent="99" population="31754">	<!--St. Martin-->
 			<languagePopulation type="fr" populationPercent="100" officialStatus="official"/>	<!--French-->
 		</territory>
-		<territory type="MG" gdp="22030000000" literacyPercent="64.5" population="23201900">	<!--Madagascar-->
+		<territory type="MG" gdp="34050000000" literacyPercent="64.5" population="23812700">	<!--Madagascar-->
 			<languagePopulation type="mg" populationPercent="90" officialStatus="official" references="R1089"/>	<!--Malagasy-->
 			<languagePopulation type="fr" populationPercent="69" officialStatus="official"/>	<!--French-->
 			<languagePopulation type="en" populationPercent="18" officialStatus="official" references="R1118"/>	<!--English-->
 		</territory>
-		<territory type="MH" gdp="486000000" literacyPercent="93.7" population="70983">	<!--Marshall Islands-->
+		<territory type="MH" gdp="182000000" literacyPercent="93.7" population="72191">	<!--Marshall Islands-->
 			<languagePopulation type="en" populationPercent="93" officialStatus="official"/>	<!--English-->
 			<languagePopulation type="mh" populationPercent="73" officialStatus="official"/>	<!--Marshallese-->
 		</territory>
-		<territory type="MK" gdp="22570000000" literacyPercent="97.4" population="2091720">	<!--Macedonia-->
+		<territory type="MK" gdp="27720000000" literacyPercent="97.4" population="2096020">	<!--Macedonia-->
 			<languagePopulation type="mk" populationPercent="67" officialStatus="official"/>	<!--Macedonian-->
 			<languagePopulation type="sq" populationPercent="25" officialStatus="official_regional" references="R1053"/>	<!--Albanian-->
 			<languagePopulation type="tr" populationPercent="3.5"/>	<!--Turkish-->
 		</territory>
-		<territory type="ML" gdp="18900000000" literacyPercent="33.4" population="16455900">	<!--Mali-->
+		<territory type="ML" gdp="27500000000" literacyPercent="33.4" population="16955500">	<!--Mali-->
 			<languagePopulation type="bm_Latn" populationPercent="46"/>	<!--Bambara (Latin)-->
 			<languagePopulation type="fr" populationPercent="46" officialStatus="official"/>	<!--French-->
 			<languagePopulation type="ffm" populationPercent="7.7"/>	<!--Maasina Fulfulde-->
@@ -3396,47 +3433,47 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="bmq" populationPercent="0.86"/>	<!--Bomu-->
 			<languagePopulation type="bze" populationPercent="0.84"/>	<!--Jenaama Bozo-->
 		</territory>
-		<territory type="MM" gdp="111100000000" literacyPercent="92.7" population="55746300">	<!--Myanmar (Burma)-->
+		<territory type="MM" gdp="244400000000" literacyPercent="92.7" population="56320200">	<!--Myanmar (Burma)-->
 			<languagePopulation type="my" populationPercent="64" officialStatus="official"/>	<!--Burmese-->
 			<languagePopulation type="shn" populationPercent="6.4"/>	<!--Shan-->
 			<languagePopulation type="kac" populationPercent="1.7"/>	<!--Kachin-->
 			<languagePopulation type="mnw" populationPercent="1.5"/>	<!--Mon-->
-			<languagePopulation type="kht" populationPercent="0.0076"/>	<!--Khamti-->
+			<languagePopulation type="kht" populationPercent="0.0075"/>	<!--Khamti-->
 		</territory>
-		<territory type="MN" gdp="17030000000" literacyPercent="97.4" population="2953190">	<!--Mongolia-->
+		<territory type="MN" gdp="34870000000" literacyPercent="97.4" population="2992910">	<!--Mongolia-->
 			<languagePopulation type="mn_Cyrl" populationPercent="93" officialStatus="official"/>	<!--Mongolian (Cyrillic)-->
 			<languagePopulation type="kk_Arab" populationPercent="7.2" references="R1119"/>	<!--Kazakh (Arabic)-->
 			<languagePopulation type="zh_Hans" populationPercent="1.4"/>	<!--Chinese (Simplified)-->
-			<languagePopulation type="ru" populationPercent="0.14"/>	<!--Russian-->
-			<languagePopulation type="ug_Cyrl" populationPercent="0.034"/>	<!--Uyghur (Cyrillic)-->
+			<languagePopulation type="ru" populationPercent="0.13"/>	<!--Russian-->
+			<languagePopulation type="ug_Cyrl" populationPercent="0.033"/>	<!--Uyghur (Cyrillic)-->
 		</territory>
-		<territory type="MO" gdp="51680000000" literacyPercent="95.6" population="587914">	<!--Macau SAR China-->
+		<territory type="MO" gdp="51680000000" literacyPercent="95.6" population="592731">	<!--Macau SAR China-->
 			<languagePopulation type="zh_Hant" populationPercent="98" officialStatus="official"/>	<!--Chinese (Traditional)-->
 			<languagePopulation type="pt" populationPercent="5" officialStatus="official" references="R1085"/>	<!--Portuguese-->
 			<languagePopulation type="zh_Hans" populationPercent="5" references="R1143"/>	<!--Chinese (Simplified)-->
 			<languagePopulation type="en" populationPercent="2.3" references="R1273"/>	<!--English-->
 		</territory>
-		<territory type="MP" gdp="733000000" literacyPercent="97" population="51483">	<!--Northern Mariana Islands-->
+		<territory type="MP" gdp="682000000" literacyPercent="97" population="52344">	<!--Northern Mariana Islands-->
 			<languagePopulation type="en" populationPercent="97" officialStatus="de_facto_official"/>	<!--English-->
 			<languagePopulation type="ch" populationPercent="18"/>	<!--Chamorro-->
 		</territory>
 		<territory type="MQ" gdp="6117000000" literacyPercent="98" population="436131">	<!--Martinique-->
 			<languagePopulation type="fr" populationPercent="98" officialStatus="official"/>	<!--French-->
 		</territory>
-		<territory type="MR" gdp="8204000000" literacyPercent="58.6" population="3516810">	<!--Mauritania-->
+		<territory type="MR" gdp="15620000000" literacyPercent="58.6" population="3596700">	<!--Mauritania-->
 			<languagePopulation type="ar" populationPercent="85" officialStatus="official"/>	<!--Arabic-->
 			<languagePopulation type="fr" populationPercent="17" references="R1135"/>	<!--French-->
 			<languagePopulation type="ff" populationPercent="5.7"/>	<!--Fulah-->
 			<languagePopulation type="wo" populationPercent="0.28"/>	<!--Wolof-->
 		</territory>
-		<territory type="MS" gdp="43780000" literacyPercent="97" population="5215">	<!--Montserrat-->
+		<territory type="MS" gdp="43780000" literacyPercent="97" population="5241">	<!--Montserrat-->
 			<languagePopulation type="en" populationPercent="67" officialStatus="official"/>	<!--English-->
 		</territory>
-		<territory type="MT" gdp="11220000000" literacyPercent="92.4" population="412655">	<!--Malta-->
+		<territory type="MT" gdp="14120000000" literacyPercent="92.4" population="413965">	<!--Malta-->
 			<languagePopulation type="mt" populationPercent="100" officialStatus="official"/>	<!--Maltese-->
 			<languagePopulation type="en" populationPercent="88" officialStatus="official"/>	<!--English-->
 		</territory>
-		<territory type="MU" gdp="20950000000" literacyPercent="88.8" population="1331160">	<!--Mauritius-->
+		<territory type="MU" gdp="23530000000" literacyPercent="88.8" population="1339830">	<!--Mauritius-->
 			<languagePopulation type="mfe" populationPercent="90"/>	<!--Morisyen-->
 			<languagePopulation type="en" populationPercent="72" officialStatus="official" references="R1152"/>	<!--English-->
 			<languagePopulation type="bho" populationPercent="27"/>	<!--Bhojpuri-->
@@ -3444,17 +3481,17 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="fr" populationPercent="3" officialStatus="official"/>	<!--French-->
 			<languagePopulation type="ta" populationPercent="2.5"/>	<!--Tamil-->
 		</territory>
-		<territory type="MV" gdp="3073000000" literacyPercent="98.4" population="393595">	<!--Maldives-->
+		<territory type="MV" gdp="4554000000" literacyPercent="98.4" population="393253">	<!--Maldives-->
 			<languagePopulation type="dv" populationPercent="94" officialStatus="official"/>	<!--Divehi-->
 		</territory>
-		<territory type="MW" gdp="15020000000" literacyPercent="74.8" population="17377500">	<!--Malawi-->
+		<territory type="MW" gdp="19580000000" literacyPercent="74.8" population="17964700">	<!--Malawi-->
 			<languagePopulation type="en" populationPercent="63" officialStatus="official"/>	<!--English-->
 			<languagePopulation type="ny" populationPercent="63" officialStatus="official"/>	<!--Nyanja-->
 			<languagePopulation type="tum" populationPercent="8.4"/>	<!--Tumbuka-->
 			<languagePopulation type="tog" populationPercent="0.98"/>	<!--Nyasa Tonga-->
 			<languagePopulation type="zu" populationPercent="0.33"/>	<!--Zulu-->
 		</territory>
-		<territory type="MX" gdp="1845000000000" literacyPercent="93.5" population="120287000">	<!--Mexico-->
+		<territory type="MX" gdp="2149000000000" literacyPercent="93.5" population="121737000">	<!--Mexico-->
 			<languagePopulation type="es" populationPercent="83" officialStatus="de_facto_official"/>	<!--Spanish-->
 			<languagePopulation type="en" populationPercent="13"/>	<!--English-->
 			<languagePopulation type="yua" populationPercent="0.67"/>	<!--Yucateco-->
@@ -3464,7 +3501,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="nch" populationPercent="0.19"/>	<!--Central Huasteca Nahuatl-->
 			<languagePopulation type="sei" populationPercent="0.0007"/>	<!--Seri-->
 		</territory>
-		<territory type="MY" gdp="525000000000" literacyPercent="93.1" population="30073400">	<!--Malaysia-->
+		<territory type="MY" gdp="769400000000" literacyPercent="93.1" population="30513800">	<!--Malaysia-->
 			<languagePopulation type="ms_Latn" populationPercent="75" officialStatus="official"/>	<!--Malay (Latin)-->
 			<languagePopulation type="en" populationPercent="21"/>	<!--English-->
 			<languagePopulation type="zh_Hant" populationPercent="17"/>	<!--Chinese (Traditional)-->
@@ -3475,9 +3512,9 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="dtp" populationPercent="0.56"/>	<!--Central Dusun-->
 			<languagePopulation type="ml" populationPercent="0.15"/>	<!--Malayalam-->
 			<languagePopulation type="bug" populationPercent="0.079" references="R1056"/>	<!--Buginese-->
-			<languagePopulation type="bjn" populationPercent="0.017"/>	<!--Banjar-->
+			<languagePopulation type="bjn" populationPercent="0.016"/>	<!--Banjar-->
 		</territory>
-		<territory type="MZ" gdp="28150000000" literacyPercent="56.1" population="24692100">	<!--Mozambique-->
+		<territory type="MZ" gdp="31210000000" literacyPercent="56.1" population="25303100">	<!--Mozambique-->
 			<languagePopulation type="pt" populationPercent="27" officialStatus="official"/>	<!--Portuguese-->
 			<languagePopulation type="vmw" populationPercent="13"/>	<!--Makhuwa-->
 			<languagePopulation type="ndc" populationPercent="9.9"/>	<!--Ndau-->
@@ -3488,35 +3525,35 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="rng" populationPercent="3.4"/>	<!--Ronga-->
 			<languagePopulation type="ny" populationPercent="2.6"/>	<!--Nyanja-->
 			<languagePopulation type="yao" populationPercent="2.4"/>	<!--Yao-->
-			<languagePopulation type="sw" populationPercent="0.037"/>	<!--Swahili-->
-			<languagePopulation type="zu" populationPercent="0.0073"/>	<!--Zulu-->
+			<languagePopulation type="sw" populationPercent="0.036"/>	<!--Swahili-->
+			<languagePopulation type="zu" populationPercent="0.0071"/>	<!--Zulu-->
 		</territory>
-		<territory type="NA" gdp="17790000000" literacyPercent="88.8" population="2198410">	<!--Namibia-->
+		<territory type="NA" gdp="23480000000" literacyPercent="88.8" population="2212310">	<!--Namibia-->
 			<languagePopulation type="af" populationPercent="75" references="R1256"/>	<!--Afrikaans-->
 			<languagePopulation type="kj" populationPercent="35"/>	<!--Kuanyama-->
 			<languagePopulation type="ng" populationPercent="21"/>	<!--Ndonga-->
-			<languagePopulation type="naq" populationPercent="9.2" references="R1182"/>	<!--Nama-->
+			<languagePopulation type="naq" populationPercent="11" references="R1182"/>	<!--Nama-->
 			<languagePopulation type="hz" populationPercent="9.1"/>	<!--Herero-->
 			<languagePopulation type="en" populationPercent="7" officialStatus="official"/>	<!--English-->
-			<languagePopulation type="de" populationPercent="1"/>	<!--German-->
-			<languagePopulation type="tn" populationPercent="0.28"/>	<!--Tswana-->
+			<languagePopulation type="de" populationPercent="0.9"/>	<!--German-->
+			<languagePopulation type="tn" populationPercent="0.56"/>	<!--Tswana-->
 		</territory>
-		<territory type="NC" gdp="9280000000" literacyPercent="96.2" population="267840">	<!--New Caledonia-->
+		<territory type="NC" gdp="11100000000" literacyPercent="96.2" population="271615">	<!--New Caledonia-->
 			<languagePopulation type="fr" populationPercent="96" officialStatus="official"/>	<!--French-->
 		</territory>
-		<territory type="NE" gdp="13980000000" literacyPercent="28.7" population="17466200">	<!--Niger-->
+		<territory type="NE" gdp="18000000000" literacyPercent="28.7" population="18045700">	<!--Niger-->
 			<languagePopulation type="ha_Latn" populationPercent="41"/>	<!--Hausa (Latin)-->
 			<languagePopulation type="fr" populationPercent="29" officialStatus="official" references="R1041"/>	<!--French-->
 			<languagePopulation type="dje" populationPercent="17"/>	<!--Zarma-->
 			<languagePopulation type="fuq" populationPercent="7"/>	<!--Central-Eastern Niger Fulfulde-->
 			<languagePopulation type="tmh" populationPercent="6"/>	<!--Tamashek-->
 			<languagePopulation type="ar" populationPercent="0.21"/>	<!--Arabic-->
-			<languagePopulation type="twq" populationPercent="0.046"/>	<!--Tasawaq-->
+			<languagePopulation type="twq" populationPercent="0.044"/>	<!--Tasawaq-->
 		</territory>
-		<territory type="NF" gdp="98020000" literacyPercent="99" population="2210">	<!--Norfolk Island-->
+		<territory type="NF" gdp="106900000" literacyPercent="99" population="2210">	<!--Norfolk Island-->
 			<languagePopulation type="en" populationPercent="76" officialStatus="official"/>	<!--English-->
 		</territory>
-		<territory type="NG" gdp="478500000000" literacyPercent="61.3" population="177156000">	<!--Nigeria-->
+		<territory type="NG" gdp="1053000000000" literacyPercent="61.3" population="181562000">	<!--Nigeria-->
 			<languagePopulation type="en" populationPercent="53" officialStatus="official"/>	<!--English-->
 			<languagePopulation type="pcm" populationPercent="21" references="R1275"/>	<!--Nigerian Pidgin-->
 			<languagePopulation type="ha_Latn" populationPercent="13"/>	<!--Hausa (Latin)-->
@@ -3534,12 +3571,15 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="cch" populationPercent="0.021"/>	<!--Atsam-->
 			<languagePopulation type="amo" populationPercent="0.0087"/>	<!--Amo-->
 		</territory>
-		<territory type="NI" gdp="27970000000" literacyPercent="78" population="5848640">	<!--Nicaragua-->
+		<territory type="NI" gdp="29690000000" literacyPercent="78" population="5907880">	<!--Nicaragua-->
 			<languagePopulation type="es" populationPercent="78" officialStatus="official"/>	<!--Spanish-->
 		</territory>
-		<territory type="NL" gdp="699700000000" literacyPercent="99" population="16877400">	<!--Netherlands-->
+		<territory type="NL" gdp="808800000000" literacyPercent="99" population="16947900">	<!--Netherlands-->
 			<languagePopulation type="nl" populationPercent="100" officialStatus="official" references="R1042"/>	<!--Dutch-->
 			<languagePopulation type="en" populationPercent="90" references="R1070"/>	<!--English-->
+			<languagePopulation type="de" writingPercent="5" populationPercent="71"/>	<!--German-->
+			<languagePopulation type="fr" populationPercent="29"/>	<!--French-->
+			<languagePopulation type="nds" writingPercent="5" populationPercent="11"/>	<!--Low German-->
 			<languagePopulation type="li" writingPercent="5" populationPercent="5.5" references="R1026"/>	<!--Limburgish-->
 			<languagePopulation type="fy" populationPercent="4.3" officialStatus="official_regional"/>	<!--Western Frisian-->
 			<languagePopulation type="gos" writingPercent="5" populationPercent="3.6"/>	<!--Gronings-->
@@ -3547,14 +3587,13 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="zea" populationPercent="1.4"/>	<!--Zeelandic-->
 			<languagePopulation type="rif_Latn" populationPercent="1.2"/>	<!--Riffian (Latin)-->
 			<languagePopulation type="tr" populationPercent="1.2"/>	<!--Turkish-->
-			<languagePopulation type="nds" writingPercent="5" populationPercent="0.8" references="R1026"/>	<!--Low German-->
 		</territory>
-		<territory type="NO" gdp="282200000000" literacyPercent="100" population="5147790">	<!--Norway-->
+		<territory type="NO" gdp="346300000000" literacyPercent="100" population="5207690">	<!--Norway-->
 			<languagePopulation type="nb" populationPercent="100" officialStatus="official"/>	<!--Norwegian Bokmål-->
 			<languagePopulation type="nn" populationPercent="25" officialStatus="official"/>	<!--Norwegian Nynorsk-->
 			<languagePopulation type="se" populationPercent="3.3" officialStatus="official_regional"/>	<!--Northern Sami-->
 		</territory>
-		<territory type="NP" gdp="42060000000" literacyPercent="57.4" population="30987000">	<!--Nepal-->
+		<territory type="NP" gdp="67140000000" literacyPercent="57.4" population="31551300">	<!--Nepal-->
 			<languagePopulation type="ne" populationPercent="44" officialStatus="official"/>	<!--Nepali-->
 			<languagePopulation type="mai" populationPercent="11"/>	<!--Maithili-->
 			<languagePopulation type="bho" populationPercent="6.8"/>	<!--Bhojpuri-->
@@ -3562,6 +3601,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="jml" populationPercent="3.2"/>	<!--Jumli-->
 			<languagePopulation type="en" populationPercent="3"/>	<!--English-->
 			<languagePopulation type="taj" populationPercent="3"/>	<!--Eastern Tamang-->
+			<languagePopulation type="dty" populationPercent="2.5" references="R1322"/>	<!--Dotyali-->
 			<languagePopulation type="awa" populationPercent="2.2"/>	<!--Awadhi-->
 			<languagePopulation type="thl" populationPercent="2"/>	<!--Dangaura Tharu-->
 			<languagePopulation type="bap" populationPercent="1.5"/>	<!--Bantawa-->
@@ -3577,52 +3617,52 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="tsf" populationPercent="0.43"/>	<!--Southwestern Tamang-->
 			<languagePopulation type="hi" populationPercent="0.42"/>	<!--Hindi-->
 			<languagePopulation type="ggn" populationPercent="0.42"/>	<!--Eastern Gurung-->
-			<languagePopulation type="gvr" populationPercent="0.29"/>	<!--Western Gurung-->
+			<languagePopulation type="gvr" populationPercent="0.29"/>	<!--Gurung-->
 			<languagePopulation type="bo" populationPercent="0.24"/>	<!--Tibetan-->
 			<languagePopulation type="tkt" populationPercent="0.24"/>	<!--Kathoriya Tharu-->
 			<languagePopulation type="tdh" populationPercent="0.12"/>	<!--Thulung-->
 			<languagePopulation type="bn" populationPercent="0.094"/>	<!--Bengali-->
 			<languagePopulation type="unr_Deva" populationPercent="0.018"/>	<!--unr (Devanagari)-->
-			<languagePopulation type="lep" populationPercent="0.0091"/>	<!--Lepcha-->
+			<languagePopulation type="lep" populationPercent="0.009"/>	<!--Lepcha-->
 		</territory>
-		<territory type="NR" gdp="60000000" literacyPercent="99" population="9488">	<!--Nauru-->
-			<languagePopulation type="en" populationPercent="99" officialStatus="official"/>	<!--English-->
-			<languagePopulation type="na" populationPercent="73" officialStatus="official" references="R1154"/>	<!--Nauru-->
+		<territory type="NR" gdp="150800000" literacyPercent="99" population="9540">	<!--Nauru-->
+			<languagePopulation type="en" populationPercent="98" officialStatus="official"/>	<!--English-->
+			<languagePopulation type="na" populationPercent="72" officialStatus="official" references="R1154"/>	<!--Nauru-->
 		</territory>
 		<territory type="NU" gdp="10010000" literacyPercent="95" population="1190">	<!--Niue-->
 			<languagePopulation type="en" populationPercent="95" officialStatus="official"/>	<!--English-->
 			<languagePopulation type="niu" populationPercent="95" officialStatus="official" references="R1155"/>	<!--Niuean-->
 		</territory>
-		<territory type="NZ" gdp="136000000000" literacyPercent="99" population="4401920">	<!--New Zealand-->
+		<territory type="NZ" gdp="160800000000" literacyPercent="99" population="4438390">	<!--New Zealand-->
 			<languagePopulation type="en" populationPercent="98" officialStatus="de_facto_official" references="R1203"/>	<!--English-->
 			<languagePopulation type="mi" populationPercent="2.5" officialStatus="official" references="R1044"/>	<!--Maori-->
 		</territory>
-		<territory type="OM" gdp="94860000000" literacyPercent="86.9" population="3219780">	<!--Oman-->
+		<territory type="OM" gdp="163000000000" literacyPercent="86.9" population="3286940">	<!--Oman-->
 			<languagePopulation type="ar" populationPercent="81" officialStatus="official"/>	<!--Arabic-->
 			<languagePopulation type="bal" populationPercent="4.9"/>	<!--Baluchi-->
 			<languagePopulation type="fa" populationPercent="0.94"/>	<!--Persian-->
 		</territory>
-		<territory type="PA" gdp="61540000000" literacyPercent="94.1" population="3608430">	<!--Panama-->
+		<territory type="PA" gdp="76770000000" literacyPercent="94.1" population="3657020">	<!--Panama-->
 			<languagePopulation type="es" populationPercent="69" officialStatus="official"/>	<!--Spanish-->
 			<languagePopulation type="en" populationPercent="14"/>	<!--English-->
-			<languagePopulation type="zh_Hant" populationPercent="0.17"/>	<!--Chinese (Traditional)-->
+			<languagePopulation type="zh_Hant" populationPercent="0.16"/>	<!--Chinese (Traditional)-->
 		</territory>
-		<territory type="PE" gdp="344000000000" literacyPercent="89.6" population="30147900">	<!--Peru-->
+		<territory type="PE" gdp="372700000000" literacyPercent="89.6" population="30445000">	<!--Peru-->
 			<languagePopulation type="es" populationPercent="73" officialStatus="official"/>	<!--Spanish-->
 			<languagePopulation type="qu" populationPercent="15" officialStatus="official"/>	<!--Quechua-->
 			<languagePopulation type="ay" populationPercent="1.6"/>	<!--Aymara-->
 		</territory>
-		<territory type="PF" gdp="5650000000" literacyPercent="98" population="280026">	<!--French Polynesia-->
+		<territory type="PF" gdp="7150000000" literacyPercent="98" population="282703">	<!--French Polynesia-->
 			<languagePopulation type="fr" populationPercent="61" officialStatus="official"/>	<!--French-->
 			<languagePopulation type="ty" populationPercent="31" officialStatus="official"/>	<!--Tahitian-->
 			<languagePopulation type="zh_Hant" populationPercent="7.8"/>	<!--Chinese (Traditional)-->
 		</territory>
-		<territory type="PG" gdp="19960000000" literacyPercent="62.4" population="6552730">	<!--Papua New Guinea-->
+		<territory type="PG" gdp="18600000000" literacyPercent="62.4" population="6672430">	<!--Papua New Guinea-->
 			<languagePopulation type="tpi" writingPercent="45" populationPercent="71" officialStatus="official" references="R1057"/>	<!--Tok Pisin-->
 			<languagePopulation type="en" populationPercent="50" officialStatus="official" references="R1156"/>	<!--English-->
 			<languagePopulation type="ho" writingPercent="5" populationPercent="2.1" officialStatus="official" references="R1058"/>	<!--Hiri Motu-->
 		</territory>
-		<territory type="PH" gdp="454300000000" literacyPercent="95.4" population="107668000">	<!--Philippines-->
+		<territory type="PH" gdp="693400000000" literacyPercent="95.4" population="100998000">	<!--Philippines-->
 			<languagePopulation type="en" populationPercent="64" officialStatus="official" references="R1157"/>	<!--English-->
 			<languagePopulation type="fil" populationPercent="60" officialStatus="official" references="R1028"/>	<!--Filipino-->
 			<languagePopulation type="es" populationPercent="31"/>	<!--Spanish-->
@@ -3641,10 +3681,10 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="krj" populationPercent="0.39"/>	<!--Kinaray-a-->
 			<languagePopulation type="bto" populationPercent="0.28"/>	<!--Rinconada Bikol-->
 			<languagePopulation type="hnn" populationPercent="0.016"/>	<!--Hanunoo-->
-			<languagePopulation type="tbw" writingPercent="36" populationPercent="0.0093" references="R1100"/>	<!--Tagbanwa-->
-			<languagePopulation type="bku" populationPercent="0.0074"/>	<!--Buhid-->
+			<languagePopulation type="tbw" writingPercent="36" populationPercent="0.0099" references="R1100"/>	<!--Tagbanwa-->
+			<languagePopulation type="bku" populationPercent="0.0079"/>	<!--Buhid-->
 		</territory>
-		<territory type="PK" gdp="574100000000" literacyPercent="54.9" population="196174000">	<!--Pakistan-->
+		<territory type="PK" gdp="884200000000" literacyPercent="54.9" population="199086000">	<!--Pakistan-->
 			<languagePopulation type="ur" populationPercent="95" officialStatus="official" references="R1106"/>	<!--Urdu-->
 			<languagePopulation type="pa_Arab" populationPercent="70" references="R1158"/>	<!--Punjabi (Arabic)-->
 			<languagePopulation type="en" populationPercent="50" officialStatus="official" references="R1106"/>	<!--English-->
@@ -3656,6 +3696,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="brh" populationPercent="1.3"/>	<!--Brahui-->
 			<languagePopulation type="hno" populationPercent="1.2"/>	<!--Northern Hindko-->
 			<languagePopulation type="fa" populationPercent="0.66"/>	<!--Persian-->
+			<languagePopulation type="bgn" writingPercent="5" populationPercent="0.57" references="R1209"/>	<!--Western Balochi-->
 			<languagePopulation type="hnd" populationPercent="0.41"/>	<!--Southern Hindko-->
 			<languagePopulation type="tg_Arab" populationPercent="0.33"/>	<!--Tajik (Arabic)-->
 			<languagePopulation type="gju" populationPercent="0.2"/>	<!--Gujari-->
@@ -3668,7 +3709,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="ks_Arab" populationPercent="0.069"/>	<!--Kashmiri (Arabic)-->
 			<languagePopulation type="btv" populationPercent="0.019"/>	<!--Bateri-->
 		</territory>
-		<territory type="PL" gdp="814000000000" literacyPercent="99.7" population="38346300">	<!--Poland-->
+		<territory type="PL" gdp="959800000000" literacyPercent="99.7" population="38562200">	<!--Poland-->
 			<languagePopulation type="pl" populationPercent="96" officialStatus="official"/>	<!--Polish-->
 			<languagePopulation type="en" populationPercent="33" references="R1277"/>	<!--English-->
 			<languagePopulation type="szl" populationPercent="1.3"/>	<!--Silesian-->
@@ -3679,45 +3720,46 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="sli" populationPercent="0.031"/>	<!--Lower Silesian-->
 			<languagePopulation type="lt" populationPercent="0.021" officialStatus="official_regional" references="R1258"/>	<!--Lithuanian-->
 		</territory>
-		<territory type="PM" gdp="215300000" literacyPercent="99" population="5716">	<!--St. Pierre & Miquelon-->
-			<languagePopulation type="fr" populationPercent="89" officialStatus="official"/>	<!--French-->
+		<territory type="PM" gdp="215300000" literacyPercent="99" population="5657">	<!--St. Pierre & Miquelon-->
+			<languagePopulation type="fr" populationPercent="90" officialStatus="official"/>	<!--French-->
 			<languagePopulation type="en" populationPercent="3.3"/>	<!--English-->
 		</territory>
-		<territory type="PN" gdp="1797000" literacyPercent="99" population="48">	<!--Pitcairn Islands-->
+		<territory type="PN" gdp="1924000" literacyPercent="99" population="48">	<!--Pitcairn Islands-->
 			<languagePopulation type="en" populationPercent="96" officialStatus="official"/>	<!--English-->
 		</territory>
-		<territory type="PR" gdp="64840000000" literacyPercent="90.3" population="3620900">	<!--Puerto Rico-->
+		<territory type="PR" gdp="61460000000" literacyPercent="90.3" population="3598360">	<!--Puerto Rico-->
 			<languagePopulation type="es" populationPercent="87" officialStatus="official"/>	<!--Spanish-->
 			<languagePopulation type="en" populationPercent="49" officialStatus="de_facto_official" references="R1072"/>	<!--English-->
 		</territory>
-		<territory type="PS" gdp="8022000000" literacyPercent="95.3" population="4547430">	<!--Palestinian Territories-->
+		<territory type="PS" gdp="20120000000" literacyPercent="95.3" population="4654420">	<!--Palestinian Territories-->
 			<languagePopulation type="ar" populationPercent="100" officialStatus="official"/>	<!--Arabic-->
 		</territory>
-		<territory type="PT" gdp="243300000000" literacyPercent="95.4" population="10813800">	<!--Portugal-->
+		<territory type="PT" gdp="281400000000" literacyPercent="95.4" population="10825300">	<!--Portugal-->
 			<languagePopulation type="pt" populationPercent="96" officialStatus="official"/>	<!--Portuguese-->
 			<languagePopulation type="en" populationPercent="27"/>	<!--English-->
 			<languagePopulation type="gl" populationPercent="0.14"/>	<!--Galician-->
+			<languagePopulation type="es" populationPercent="0.097" references="R1323"/>	<!--Spanish-->
 		</territory>
-		<territory type="PW" gdp="245500000" literacyPercent="92" population="21186">	<!--Palau-->
+		<territory type="PW" gdp="250000000" literacyPercent="92" population="21265">	<!--Palau-->
 			<languagePopulation type="pau" populationPercent="74" officialStatus="official"/>	<!--Palauan-->
-			<languagePopulation type="en" populationPercent="8.9" officialStatus="official" references="R1059"/>	<!--English-->
+			<languagePopulation type="en" populationPercent="8.8" officialStatus="official" references="R1059"/>	<!--English-->
 		</territory>
-		<territory type="PY" gdp="45900000000" literacyPercent="93.9" population="6703860">	<!--Paraguay-->
+		<territory type="PY" gdp="58490000000" literacyPercent="93.9" population="6783270">	<!--Paraguay-->
 			<languagePopulation type="gn" populationPercent="80" officialStatus="official"/>	<!--Guarani-->
 			<languagePopulation type="es" populationPercent="3.2" officialStatus="official"/>	<!--Spanish-->
 			<languagePopulation type="de" populationPercent="2.9"/>	<!--German-->
 		</territory>
-		<territory type="QA" gdp="198700000000" literacyPercent="96.3" population="2123160">	<!--Qatar-->
+		<territory type="QA" gdp="306600000000" literacyPercent="96.3" population="2194820">	<!--Qatar-->
 			<languagePopulation type="ar" populationPercent="89" officialStatus="official"/>	<!--Arabic-->
 			<languagePopulation type="fa" populationPercent="11"/>	<!--Persian-->
-			<languagePopulation type="ml" populationPercent="0.31"/>	<!--Malayalam-->
+			<languagePopulation type="ml" populationPercent="0.3"/>	<!--Malayalam-->
 		</territory>
 		<territory type="RE" gdp="4791000000" literacyPercent="88" population="787584">	<!--Réunion-->
 			<languagePopulation type="fr" populationPercent="89" officialStatus="official" references="R1130"/>	<!--French-->
 			<languagePopulation type="rcf" populationPercent="71"/>	<!--Réunion Creole French-->
 			<languagePopulation type="ta" populationPercent="15"/>	<!--Tamil-->
 		</territory>
-		<territory type="RO" gdp="288500000000" literacyPercent="97.7" population="21729900">	<!--Romania-->
+		<territory type="RO" gdp="393800000000" literacyPercent="97.7" population="21666400">	<!--Romania-->
 			<languagePopulation type="ro" populationPercent="90" officialStatus="official"/>	<!--Romanian-->
 			<languagePopulation type="en" populationPercent="31"/>	<!--English-->
 			<languagePopulation type="hu" populationPercent="6.6"/>	<!--Hungarian-->
@@ -3728,7 +3770,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="el" populationPercent="0.019"/>	<!--Greek-->
 			<languagePopulation type="pl" populationPercent="0.013"/>	<!--Polish-->
 		</territory>
-		<territory type="RS" gdp="80470000000" literacyPercent="98" population="7209760">	<!--Serbia-->
+		<territory type="RS" gdp="95840000000" literacyPercent="98" population="7176790">	<!--Serbia-->
 			<languagePopulation type="sr_Cyrl" populationPercent="99" officialStatus="official"/>	<!--Serbian (Cyrillic)-->
 			<languagePopulation type="sr_Latn" writingPercent="5" populationPercent="99" officialStatus="official" references="R1017"/>	<!--Serbian (Latin)-->
 			<languagePopulation type="sq" populationPercent="19"/>	<!--Albanian-->
@@ -3738,7 +3780,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="sk" populationPercent="0.85" officialStatus="official_regional" references="R1259"/>	<!--Slovak-->
 			<languagePopulation type="uk" populationPercent="0" officialStatus="official_regional" references="R1260"/>	<!--Ukrainian-->
 		</territory>
-		<territory type="RU" gdp="2553000000000" literacyPercent="99.7" population="142470000">	<!--Russia-->
+		<territory type="RU" gdp="3577000000000" literacyPercent="99.7" population="142424000">	<!--Russia-->
 			<languagePopulation type="ru" populationPercent="94" officialStatus="official" references="R1204"/>	<!--Russian-->
 			<languagePopulation type="tt" populationPercent="1.4" officialStatus="official_regional" references="R1214"/>	<!--Tatar-->
 			<languagePopulation type="ba" populationPercent="1.3" officialStatus="official_regional"/>	<!--Bashkir-->
@@ -3776,42 +3818,46 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="vot" populationPercent="0"/>	<!--Votic-->
 			<languagePopulation type="cu" populationPercent="0" references="R1279"/>	<!--Church Slavic-->
 		</territory>
-		<territory type="RW" gdp="16370000000" literacyPercent="71.1" population="12337100">	<!--Rwanda-->
+		<territory type="RW" gdp="18900000000" literacyPercent="71.1" population="12661700">	<!--Rwanda-->
 			<languagePopulation type="rw" populationPercent="77" officialStatus="official"/>	<!--Kinyarwanda-->
 			<languagePopulation type="en" populationPercent="15" officialStatus="official" references="R1054"/>	<!--English-->
-			<languagePopulation type="fr" populationPercent="0.019" officialStatus="official"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="0.018" officialStatus="official"/>	<!--French-->
 		</territory>
-		<territory type="SA" gdp="927800000000" literacyPercent="87.2" population="27346000">	<!--Saudi Arabia-->
+		<territory type="SA" gdp="1610000000000" literacyPercent="87.2" population="27752300">	<!--Saudi Arabia-->
 			<languagePopulation type="ar" populationPercent="100" officialStatus="official"/>	<!--Arabic-->
 		</territory>
-		<territory type="SB" gdp="1958000000" literacyPercent="84.1" population="609883">	<!--Solomon Islands-->
+		<territory type="SB" gdp="1094000000" literacyPercent="84.1" population="622469">	<!--Solomon Islands-->
 			<languagePopulation type="en" populationPercent="100" officialStatus="official" references="R1045"/>	<!--English-->
 			<languagePopulation type="rug" populationPercent="1.6"/>	<!--Roviana-->
 		</territory>
-		<territory type="SC" gdp="2404000000" literacyPercent="91.8" population="91650">	<!--Seychelles-->
+		<territory type="SC" gdp="2424000000" literacyPercent="91.8" population="92430">	<!--Seychelles-->
 			<languagePopulation type="crs" populationPercent="98" references="R1160"/>	<!--Seselwa Creole French-->
 			<languagePopulation type="fr" populationPercent="60" officialStatus="official" references="R1161"/>	<!--French-->
 			<languagePopulation type="en" populationPercent="38" officialStatus="official"/>	<!--English-->
 		</territory>
-		<territory type="SD" gdp="89970000000" literacyPercent="71.9" population="35482200">	<!--Sudan-->
+		<territory type="SD" gdp="160200000000" literacyPercent="71.9" population="36108900">	<!--Sudan-->
 			<languagePopulation type="ar" populationPercent="61" officialStatus="official" references="R1234"/>	<!--Arabic-->
 			<languagePopulation type="en" populationPercent="61" officialStatus="official" references="R1235"/>	<!--English-->
-			<languagePopulation type="nus" populationPercent="1.8" references="R1280"/>	<!--Nuer-->
-			<languagePopulation type="ha_Arab" populationPercent="1.4" references="R1234"/>	<!--Hausa (Arabic)-->
+			<languagePopulation type="bej" populationPercent="5.4" references="R1314"/>	<!--Beja-->
+			<languagePopulation type="fvr" populationPercent="2.7" references="R1314"/>	<!--Fur-->
+			<languagePopulation type="ha_Arab" populationPercent="1.8" references="R1314"/>	<!--Hausa (Arabic)-->
+			<languagePopulation type="mls" populationPercent="0.99"/>	<!--Masalit-->
+			<languagePopulation type="fia" populationPercent="0.83"/>	<!--Nobiin-->
+			<languagePopulation type="zag" populationPercent="0.51"/>	<!--Zaghawa-->
 		</territory>
-		<territory type="SE" gdp="393800000000" literacyPercent="99" population="9723810">	<!--Sweden-->
+		<territory type="SE" gdp="450500000000" literacyPercent="99" population="9801620">	<!--Sweden-->
 			<languagePopulation type="sv" populationPercent="95" officialStatus="official" references="R1205"/>	<!--Swedish-->
 			<languagePopulation type="en" populationPercent="86"/>	<!--English-->
 			<languagePopulation type="fi" populationPercent="2.2" officialStatus="official_regional"/>	<!--Finnish-->
 			<languagePopulation type="fit" populationPercent="0.55"/>	<!--Tornedalen Finnish-->
 			<languagePopulation type="se" populationPercent="0.33"/>	<!--Northern Sami-->
-			<languagePopulation type="rmu" populationPercent="0.098"/>	<!--Tavringer Romani-->
+			<languagePopulation type="rmu" populationPercent="0.097"/>	<!--Tavringer Romani-->
 			<languagePopulation type="yi" populationPercent="0.031"/>	<!--Yiddish-->
 			<languagePopulation type="smj" populationPercent="0.015"/>	<!--Lule Sami-->
 			<languagePopulation type="sma" writingPercent="75" populationPercent="0.0031"/>	<!--Southern Sami-->
 			<languagePopulation type="ia" populationPercent="0" references="R1215"/>	<!--Interlingua-->
 		</territory>
-		<territory type="SG" gdp="339000000000" literacyPercent="95.9" population="5567300">	<!--Singapore-->
+		<territory type="SG" gdp="454300000000" literacyPercent="95.9" population="5674470">	<!--Singapore-->
 			<languagePopulation type="en" populationPercent="93" officialStatus="official" references="R1131"/>	<!--English-->
 			<languagePopulation type="zh_Hans" populationPercent="77" officialStatus="official"/>	<!--Chinese (Simplified)-->
 			<languagePopulation type="ms_Latn" populationPercent="14" officialStatus="official"/>	<!--Malay (Latin)-->
@@ -3819,20 +3865,20 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="ml" populationPercent="0.18"/>	<!--Malayalam-->
 			<languagePopulation type="pa_Guru" populationPercent="0.17"/>	<!--Punjabi (Gurmukhi)-->
 		</territory>
-		<territory type="SH" gdp="31100000" literacyPercent="97" population="7776">	<!--St. Helena-->
+		<territory type="SH" gdp="31100000" literacyPercent="97" population="7795">	<!--St. Helena-->
 			<languagePopulation type="en" populationPercent="69" officialStatus="official"/>	<!--English-->
 		</territory>
-		<territory type="SI" gdp="57360000000" literacyPercent="99.7" population="1988290">	<!--Slovenia-->
+		<territory type="SI" gdp="61560000000" literacyPercent="99.7" population="1983410">	<!--Slovenia-->
 			<languagePopulation type="sl" populationPercent="87" officialStatus="official"/>	<!--Slovenian-->
 			<languagePopulation type="en" populationPercent="59"/>	<!--English-->
-			<languagePopulation type="hu" populationPercent="0.46"/>	<!--Hungarian-->
+			<languagePopulation type="hu" populationPercent="0.47"/>	<!--Hungarian-->
 			<languagePopulation type="it" populationPercent="0.2"/>	<!--Italian-->
 		</territory>
-		<territory type="SJ" gdp="102600000" literacyPercent="100" population="1872">	<!--Svalbard & Jan Mayen-->
+		<territory type="SJ" gdp="124500000" literacyPercent="100" population="1872">	<!--Svalbard & Jan Mayen-->
 			<languagePopulation type="nb" populationPercent="80" officialStatus="official" references="R1116"/>	<!--Norwegian Bokmål-->
 			<languagePopulation type="ru" populationPercent="64" references="R1074"/>	<!--Russian-->
 		</territory>
-		<territory type="SK" gdp="133400000000" literacyPercent="99.6" population="5443580">	<!--Slovakia-->
+		<territory type="SK" gdp="153200000000" literacyPercent="99.6" population="5445030">	<!--Slovakia-->
 			<languagePopulation type="sk" populationPercent="90" officialStatus="official"/>	<!--Slovak-->
 			<languagePopulation type="en" populationPercent="26"/>	<!--English-->
 			<languagePopulation type="hu" populationPercent="11"/>	<!--Hungarian-->
@@ -3840,81 +3886,90 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="pl" populationPercent="0.93"/>	<!--Polish-->
 			<languagePopulation type="de" populationPercent="0.28"/>	<!--German-->
 		</territory>
-		<territory type="SL" gdp="9156000000" literacyPercent="43.3" population="5743730">	<!--Sierra Leone-->
+		<territory type="SL" gdp="12800000000" literacyPercent="43.3" population="5879100">	<!--Sierra Leone-->
 			<languagePopulation type="kri" populationPercent="95" references="R1162"/>	<!--Krio-->
 			<languagePopulation type="en" populationPercent="35" officialStatus="official"/>	<!--English-->
 			<languagePopulation type="men" populationPercent="27"/>	<!--Mende-->
 			<languagePopulation type="tem" writingPercent="6" populationPercent="26" references="R1061"/>	<!--Timne-->
 		</territory>
-		<territory type="SM" gdp="1306000000" literacyPercent="96" population="32742">	<!--San Marino-->
+		<territory type="SM" gdp="1914000000" literacyPercent="96" population="33020">	<!--San Marino-->
 			<languagePopulation type="it" populationPercent="89" officialStatus="official"/>	<!--Italian-->
-			<languagePopulation type="eo" populationPercent="0.92" references="R1268"/>	<!--Esperanto-->
+			<languagePopulation type="eo" populationPercent="0.91" references="R1268"/>	<!--Esperanto-->
 		</territory>
-		<territory type="SN" gdp="27720000000" literacyPercent="49.7" population="13635900">	<!--Senegal-->
+		<territory type="SN" gdp="34200000000" literacyPercent="49.7" population="13975800">	<!--Senegal-->
 			<languagePopulation type="wo" populationPercent="70" officialStatus="de_facto_official" references="R1297"/>	<!--Wolof-->
 			<languagePopulation type="fr" writingPercent="100" populationPercent="39" officialStatus="official" references="R1069"/>	<!--French-->
-			<languagePopulation type="ff" populationPercent="21"/>	<!--Fulah-->
-			<languagePopulation type="srr" populationPercent="11" references="R1069"/>	<!--Serer-->
-			<languagePopulation type="dyo" writingPercent="10" populationPercent="2.6" references="R1281"/>	<!--Jola-Fonyi-->
+			<languagePopulation type="ff" populationPercent="21" officialStatus="official_regional"/>	<!--Fulah-->
+			<languagePopulation type="srr" populationPercent="11" officialStatus="official_regional" references="R1069"/>	<!--Serer-->
+			<languagePopulation type="dyo" writingPercent="10" populationPercent="2.6" officialStatus="official_regional" references="R1281"/>	<!--Jola-Fonyi-->
+			<languagePopulation type="sav" populationPercent="1.5" officialStatus="official_regional" references="R1069"/>	<!--Saafi-Saafi-->
+			<languagePopulation type="mfv" writingPercent="10" populationPercent="0.77" officialStatus="official_regional" references="R1281"/>	<!--Mandjak-->
+			<languagePopulation type="bjt" writingPercent="100" populationPercent="0.61" officialStatus="official_regional" references="R1069"/>	<!--Balanta-Ganja-->
+			<languagePopulation type="snf" writingPercent="10" populationPercent="0.24" officialStatus="official_regional" references="R1281"/>	<!--Noon-->
+			<languagePopulation type="knf" writingPercent="10" populationPercent="0.21" officialStatus="official_regional" references="R1281"/>	<!--Mankanya-->
+			<languagePopulation type="bsc" writingPercent="10" populationPercent="0.098" officialStatus="official_regional" references="R1281"/>	<!--Bassari-->
+			<languagePopulation type="mey" writingPercent="10" populationPercent="0.051" officialStatus="official_regional" references="R1281"/>	<!--Hassaniyya-->
+			<languagePopulation type="tnr" writingPercent="10" populationPercent="0.024" officialStatus="official_regional" references="R1281"/>	<!--Ménik-->
 		</territory>
-		<territory type="SO" gdp="5896000000" literacyPercent="37.8" population="10428000">	<!--Somalia-->
+		<territory type="SO" gdp="5896000000" literacyPercent="37.8" population="10616400">	<!--Somalia-->
 			<languagePopulation type="so" populationPercent="78" officialStatus="official"/>	<!--Somali-->
 			<languagePopulation type="ar" writingPercent="99" populationPercent="34" officialStatus="official" references="R1236"/>	<!--Arabic-->
 			<languagePopulation type="sw" populationPercent="2"/>	<!--Swahili-->
 			<languagePopulation type="om" populationPercent="0.42"/>	<!--Oromo-->
 		</territory>
-		<territory type="SR" gdp="7120000000" literacyPercent="94.7" population="573311">	<!--Suriname-->
+		<territory type="SR" gdp="8987000000" literacyPercent="94.7" population="579633">	<!--Suriname-->
 			<languagePopulation type="nl" populationPercent="90" officialStatus="official" references="R1163"/>	<!--Dutch-->
 			<languagePopulation type="srn" writingPercent="75" populationPercent="68" references="R1103"/>	<!--Sranan Tongo-->
 			<languagePopulation type="zh_Hant" populationPercent="1.2"/>	<!--Chinese (Traditional)-->
 		</territory>
-		<territory type="SS" gdp="14710000000" literacyPercent="27" population="11562700">	<!--South Sudan-->
+		<territory type="SS" gdp="23500000000" literacyPercent="27" population="12042900">	<!--South Sudan-->
 			<languagePopulation type="ar" populationPercent="27" references="R1237"/>	<!--Arabic-->
 			<languagePopulation type="en" populationPercent="27" officialStatus="official" references="R1237"/>	<!--English-->
+			<languagePopulation type="nus" populationPercent="5.6" references="R1280"/>	<!--Nuer-->
 		</territory>
-		<territory type="ST" gdp="421000000" literacyPercent="69.5" population="190428">	<!--São Tomé & Príncipe-->
+		<territory type="ST" gdp="626000000" literacyPercent="69.5" population="194006">	<!--São Tomé & Príncipe-->
 			<languagePopulation type="pt" populationPercent="85" officialStatus="official"/>	<!--Portuguese-->
 		</territory>
-		<territory type="SV" gdp="47470000000" literacyPercent="84.5" population="6125510">	<!--El Salvador-->
+		<territory type="SV" gdp="51190000000" literacyPercent="84.5" population="6141350">	<!--El Salvador-->
 			<languagePopulation type="es" populationPercent="89" officialStatus="official"/>	<!--Spanish-->
 		</territory>
-		<territory type="SX" gdp="798300000" literacyPercent="99" population="39689">	<!--Sint Maarten-->
+		<territory type="SX" gdp="365800000" literacyPercent="99" population="39689">	<!--Sint Maarten-->
 			<languagePopulation type="en" populationPercent="68" officialStatus="official" references="R1238"/>	<!--English-->
 			<languagePopulation type="es" populationPercent="12" references="R1238"/>	<!--Spanish-->
 			<languagePopulation type="vic" populationPercent="7.8" references="R1238"/>	<!--Virgin Islands Creole English-->
 			<languagePopulation type="nl" populationPercent="4" officialStatus="official" references="R1238"/>	<!--Dutch-->
 		</territory>
-		<territory type="SY" gdp="107600000000" literacyPercent="84.1" population="17951600">	<!--Syria-->
+		<territory type="SY" gdp="107600000000" literacyPercent="84.1" population="17064900">	<!--Syria-->
 			<languagePopulation type="ar" populationPercent="80" officialStatus="official"/>	<!--Arabic-->
 			<languagePopulation type="ku_Latn" populationPercent="8"/>	<!--Kurdish (Latin)-->
 			<languagePopulation type="fr" populationPercent="5.9" officialStatus="official" references="R1088"/>	<!--French-->
 			<languagePopulation type="hy" populationPercent="1.8"/>	<!--Armenian-->
 			<languagePopulation type="syr" writingPercent="5" populationPercent="0.084" references="R1017"/>	<!--Syriac-->
 		</territory>
-		<territory type="SZ" gdp="6259000000" literacyPercent="87.8" population="1419620">	<!--Swaziland-->
+		<territory type="SZ" gdp="10560000000" literacyPercent="87.8" population="1435610">	<!--Swaziland-->
 			<languagePopulation type="en" populationPercent="80" officialStatus="official" references="R1071"/>	<!--English-->
 			<languagePopulation type="ss" populationPercent="58" officialStatus="official"/>	<!--Swati-->
 			<languagePopulation type="zu" populationPercent="6.8"/>	<!--Zulu-->
 			<languagePopulation type="ts" populationPercent="1.7"/>	<!--Tsonga-->
 		</territory>
-		<territory type="TA" gdp="10300000" literacyPercent="99" population="275">	<!--Tristan da Cunha-->
+		<territory type="TA" gdp="11020000" literacyPercent="99" population="275">	<!--Tristan da Cunha-->
 			<languagePopulation type="en" populationPercent="99"/>	<!--English-->
 		</territory>
-		<territory type="TC" gdp="632000000" literacyPercent="98" population="49070">	<!--Turks & Caicos Islands-->
+		<territory type="TC" gdp="632000000" literacyPercent="98" population="50280">	<!--Turks & Caicos Islands-->
 			<languagePopulation type="en" populationPercent="98" officialStatus="official"/>	<!--English-->
 		</territory>
-		<territory type="TD" gdp="28000000000" literacyPercent="35.4" population="11412100">	<!--Chad-->
+		<territory type="TD" gdp="29640000000" literacyPercent="35.4" population="11631500">	<!--Chad-->
 			<languagePopulation type="fr" populationPercent="26" officialStatus="official" references="R1239"/>	<!--French-->
 			<languagePopulation type="ar" populationPercent="17" officialStatus="official" references="R1239"/>	<!--Arabic-->
 		</territory>
-		<territory type="TF" gdp="4809000" literacyPercent="99" population="140">	<!--French Southern Territories-->
+		<territory type="TF" gdp="5450000" literacyPercent="99" population="140">	<!--French Southern Territories-->
 			<languagePopulation type="fr" writingPercent="100" populationPercent="100" references="R1184"/>	<!--French-->
 		</territory>
-		<territory type="TG" gdp="7348000000" literacyPercent="60.4" population="7351370">	<!--Togo-->
+		<territory type="TG" gdp="10160000000" literacyPercent="60.4" population="7552320">	<!--Togo-->
 			<languagePopulation type="fr" populationPercent="61" officialStatus="official"/>	<!--French-->
 			<languagePopulation type="ee" populationPercent="17"/>	<!--Ewe-->
 		</territory>
-		<territory type="TH" gdp="673000000000" literacyPercent="93.5" population="67741400">	<!--Thailand-->
+		<territory type="TH" gdp="1070000000000" literacyPercent="93.5" population="67976400">	<!--Thailand-->
 			<languagePopulation type="th" writingPercent="93" populationPercent="80" officialStatus="official" references="R1199"/>	<!--Thai-->
 			<languagePopulation type="en" populationPercent="27"/>	<!--English-->
 			<languagePopulation type="tts" writingPercent="5" populationPercent="24" references="R1164"/>	<!--Northeastern Thai-->
@@ -3929,7 +3984,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="lcp" writingPercent="25" populationPercent="0.01"/>	<!--Western Lawa-->
 			<languagePopulation type="lwl" populationPercent="0.01"/>	<!--Eastern Lawa-->
 		</territory>
-		<territory type="TJ" gdp="19200000000" literacyPercent="99.7" population="8051510">	<!--Tajikistan-->
+		<territory type="TJ" gdp="22400000000" literacyPercent="99.7" population="8191960">	<!--Tajikistan-->
 			<languagePopulation type="tg_Cyrl" populationPercent="100" officialStatus="official"/>	<!--Tajik (Cyrillic)-->
 			<languagePopulation type="ru" populationPercent="12" references="R1108"/>	<!--Russian-->
 			<languagePopulation type="fa" populationPercent="0.78"/>	<!--Persian-->
@@ -3939,32 +3994,33 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="en" populationPercent="100" officialStatus="official"/>	<!--English-->
 			<languagePopulation type="tkl" writingPercent="5" populationPercent="100" officialStatus="official" references="R1185"/>	<!--Tokelau-->
 		</territory>
-		<territory type="TL" gdp="25410000000" literacyPercent="58.3" population="1201540">	<!--Timor-Leste-->
+		<territory type="TL" gdp="6745000000" literacyPercent="58.3" population="1231120">	<!--Timor-Leste-->
 			<languagePopulation type="pt" writingPercent="100" populationPercent="59" officialStatus="official" references="R1049"/>	<!--Portuguese-->
 			<languagePopulation type="tet" populationPercent="59" officialStatus="official" references="R1076"/>	<!--Tetum-->
 		</territory>
-		<territory type="TM" gdp="55160000000" literacyPercent="99.6" population="5171940">	<!--Turkmenistan-->
+		<territory type="TM" gdp="82400000000" literacyPercent="99.6" population="5231420">	<!--Turkmenistan-->
 			<languagePopulation type="tk_Latn" populationPercent="70" officialStatus="official"/>	<!--Turkmen (Latin)-->
 			<languagePopulation type="ru" populationPercent="12"/>	<!--Russian-->
 			<languagePopulation type="uz_Latn" populationPercent="9"/>	<!--Uzbek (Latin)-->
 			<languagePopulation type="ku_Latn" populationPercent="0.41"/>	<!--Kurdish (Latin)-->
 		</territory>
-		<territory type="TN" gdp="108400000000" literacyPercent="79.1" population="10937500">	<!--Tunisia-->
+		<territory type="TN" gdp="124700000000" literacyPercent="79.1" population="11037200">	<!--Tunisia-->
 			<languagePopulation type="aeb" populationPercent="90"/>	<!--Tunisian Arabic-->
 			<languagePopulation type="ar" populationPercent="90" officialStatus="official"/>	<!--Arabic-->
 			<languagePopulation type="fr" populationPercent="74" officialStatus="official" references="R1132"/>	<!--French-->
 		</territory>
-		<territory type="TO" gdp="846000000" literacyPercent="99" population="106440">	<!--Tonga-->
+		<territory type="TO" gdp="502000000" literacyPercent="99" population="106501">	<!--Tonga-->
 			<languagePopulation type="to" populationPercent="95" officialStatus="official"/>	<!--Tongan-->
 			<languagePopulation type="en" populationPercent="28" officialStatus="official" references="R1078"/>	<!--English-->
 		</territory>
-		<territory type="TR" gdp="1167000000000" literacyPercent="94.1" population="81619400">	<!--Turkey-->
+		<territory type="TR" gdp="1515000000000" literacyPercent="94.1" population="79414300">	<!--Turkey-->
 			<languagePopulation type="tr" populationPercent="93" officialStatus="official" references="R1206"/>	<!--Turkish-->
 			<languagePopulation type="en" populationPercent="17"/>	<!--English-->
 			<languagePopulation type="ku_Latn" populationPercent="5.5"/>	<!--Kurdish (Latin)-->
 			<languagePopulation type="zza" populationPercent="1.4"/>	<!--Zaza-->
 			<languagePopulation type="kbd" populationPercent="0.77"/>	<!--Kabardian-->
 			<languagePopulation type="az_Latn" populationPercent="0.74"/>	<!--Azerbaijani (Latin)-->
+			<languagePopulation type="az_Arab" populationPercent="0.65"/>	<!--Azerbaijani (Arabic)-->
 			<languagePopulation type="ar" populationPercent="0.56"/>	<!--Arabic-->
 			<languagePopulation type="bgx" populationPercent="0.46"/>	<!--Balkan Gagauz Turkish-->
 			<languagePopulation type="bg" populationPercent="0.42"/>	<!--Bulgarian-->
@@ -3975,26 +4031,26 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="sr_Latn" writingPercent="5" populationPercent="0.028" references="R1017"/>	<!--Serbian (Latin)-->
 			<languagePopulation type="lzz_Latn" populationPercent="0.028"/>	<!--Laz (Latin)-->
 			<languagePopulation type="sq" populationPercent="0.021"/>	<!--Albanian-->
-			<languagePopulation type="ab" populationPercent="0.0049" references="R1079"/>	<!--Abkhazian-->
-			<languagePopulation type="el" populationPercent="0.0049"/>	<!--Greek-->
-			<languagePopulation type="tru" populationPercent="0.0037"/>	<!--Turoyo-->
-			<languagePopulation type="uz_Latn" populationPercent="0.0024"/>	<!--Uzbek (Latin)-->
+			<languagePopulation type="ab" populationPercent="0.005" references="R1079"/>	<!--Abkhazian-->
+			<languagePopulation type="el" populationPercent="0.005"/>	<!--Greek-->
+			<languagePopulation type="tru" populationPercent="0.0038"/>	<!--Turoyo-->
+			<languagePopulation type="uz_Latn" populationPercent="0.0025"/>	<!--Uzbek (Latin)-->
 			<languagePopulation type="ky_Latn" populationPercent="0.0014"/>	<!--Kyrgyz (Latin)-->
-			<languagePopulation type="kk_Cyrl" populationPercent="0.0007" references="R1119"/>	<!--Kazakh (Cyrillic)-->
+			<languagePopulation type="kk_Cyrl" populationPercent="0.0008" references="R1119"/>	<!--Kazakh (Cyrillic)-->
 		</territory>
-		<territory type="TT" gdp="27140000000" literacyPercent="98.8" population="1223920">	<!--Trinidad & Tobago-->
+		<territory type="TT" gdp="43460000000" literacyPercent="98.8" population="1222360">	<!--Trinidad & Tobago-->
 			<languagePopulation type="en" populationPercent="88" officialStatus="official"/>	<!--English-->
-			<languagePopulation type="es" populationPercent="0.33"/>	<!--Spanish-->
+			<languagePopulation type="es" populationPercent="0.34"/>	<!--Spanish-->
 		</territory>
-		<territory type="TV" gdp="40000000" literacyPercent="95" population="10782">	<!--Tuvalu-->
-			<languagePopulation type="tvl" populationPercent="92" officialStatus="official"/>	<!--Tuvalu-->
-			<languagePopulation type="en" populationPercent="9.9" officialStatus="official" references="R1080"/>	<!--English-->
+		<territory type="TV" gdp="35000000" literacyPercent="95" population="10869">	<!--Tuvalu-->
+			<languagePopulation type="tvl" populationPercent="91" officialStatus="official"/>	<!--Tuvalu-->
+			<languagePopulation type="en" populationPercent="9.8" officialStatus="official" references="R1080"/>	<!--English-->
 		</territory>
-		<territory type="TW" gdp="926400000000" literacyPercent="96.1" population="23359900">	<!--Taiwan-->
+		<territory type="TW" gdp="1079000000000" literacyPercent="96.1" population="23415100">	<!--Taiwan-->
 			<languagePopulation type="zh_Hant" populationPercent="95" officialStatus="official"/>	<!--Chinese (Traditional)-->
 			<languagePopulation type="trv" populationPercent="0.02"/>	<!--Taroko-->
 		</territory>
-		<territory type="TZ" gdp="79290000000" literacyPercent="67.8" population="49639100">	<!--Tanzania-->
+		<territory type="TZ" gdp="128200000000" literacyPercent="67.8" population="51045900">	<!--Tanzania-->
 			<languagePopulation type="sw" populationPercent="90" officialStatus="official" references="R1133"/>	<!--Swahili-->
 			<languagePopulation type="en" populationPercent="69" officialStatus="official" references="R1081"/>	<!--English-->
 			<languagePopulation type="suk" populationPercent="8.7"/>	<!--Sukuma-->
@@ -4012,7 +4068,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="rwk" populationPercent="0.22"/>	<!--Rwa-->
 			<languagePopulation type="sbp" writingPercent="1" populationPercent="0.2" references="R1282"/>	<!--Sangu-->
 		</territory>
-		<territory type="UA" gdp="337400000000" literacyPercent="99.7" population="44291400">	<!--Ukraine-->
+		<territory type="UA" gdp="371800000000" literacyPercent="99.7" population="44429500">	<!--Ukraine-->
 			<languagePopulation type="uk" populationPercent="65" officialStatus="official"/>	<!--Ukrainian-->
 			<languagePopulation type="ru" populationPercent="46" officialStatus="de_facto_official" references="R1200"/>	<!--Russian-->
 			<languagePopulation type="pl" populationPercent="2.4"/>	<!--Polish-->
@@ -4025,7 +4081,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="hu" populationPercent="0.37"/>	<!--Hungarian-->
 			<languagePopulation type="el" populationPercent="0.016"/>	<!--Greek-->
 		</territory>
-		<territory type="UG" gdp="54370000000" literacyPercent="73.2" population="35918900">	<!--Uganda-->
+		<territory type="UG" gdp="75080000000" literacyPercent="73.2" population="37101700">	<!--Uganda-->
 			<languagePopulation type="sw" populationPercent="75" officialStatus="official" references="R1134"/>	<!--Swahili-->
 			<languagePopulation type="lg" populationPercent="13"/>	<!--Ganda-->
 			<languagePopulation type="nyn" populationPercent="6.3"/>	<!--Nyankole-->
@@ -4038,12 +4094,12 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="myx" populationPercent="2.9"/>	<!--Masaaba-->
 			<languagePopulation type="rw" populationPercent="2.1"/>	<!--Kinyarwanda-->
 			<languagePopulation type="ttj" populationPercent="1.9"/>	<!--Tooro-->
-			<languagePopulation type="hi" populationPercent="0.0061"/>	<!--Hindi-->
+			<languagePopulation type="hi" populationPercent="0.0059"/>	<!--Hindi-->
 		</territory>
-		<territory type="UM" gdp="16570000" literacyPercent="99" population="316">	<!--U.S. Outlying Islands-->
+		<territory type="UM" gdp="17060000" literacyPercent="99" population="316">	<!--U.S. Outlying Islands-->
 			<languagePopulation type="en" populationPercent="100" officialStatus="de_facto_official" references="R1190"/>	<!--English-->
 		</territory>
-		<territory type="US" gdp="16720000000000" literacyPercent="99" population="318892000">	<!--United States-->
+		<territory type="US" gdp="17350000000000" literacyPercent="99" population="321369000">	<!--United States-->
 			<languagePopulation type="en" populationPercent="96" officialStatus="de_facto_official"/>	<!--English-->
 			<languagePopulation type="es" populationPercent="9.6" officialStatus="official_regional"/>	<!--Spanish-->
 			<languagePopulation type="zh_Hant" populationPercent="0.69"/>	<!--Chinese (Traditional)-->
@@ -4065,60 +4121,60 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="cho" populationPercent="0.0033"/>	<!--Choctaw-->
 			<languagePopulation type="lkt" populationPercent="0.0026" references="R1240"/>	<!--Lakota-->
 			<languagePopulation type="ik" writingPercent="5" populationPercent="0.0025" references="R1017"/>	<!--Inupiaq-->
-			<languagePopulation type="mus" populationPercent="0.0013"/>	<!--Creek-->
+			<languagePopulation type="mus" populationPercent="0.0012"/>	<!--Creek-->
 		</territory>
-		<territory type="UY" gdp="56270000000" literacyPercent="98.1" population="3332970">	<!--Uruguay-->
+		<territory type="UY" gdp="71680000000" literacyPercent="98.1" population="3341890">	<!--Uruguay-->
 			<languagePopulation type="es" populationPercent="88" officialStatus="official"/>	<!--Spanish-->
 		</territory>
-		<territory type="UZ" gdp="112600000000" literacyPercent="99.4" population="28929700">	<!--Uzbekistan-->
+		<territory type="UZ" gdp="172300000000" literacyPercent="99.4" population="29199900">	<!--Uzbekistan-->
 			<languagePopulation type="uz_Latn" populationPercent="85" officialStatus="official" references="R1263"/>	<!--Uzbek (Latin)-->
 			<languagePopulation type="uz_Cyrl" populationPercent="15" officialStatus="official" references="R1263"/>	<!--Uzbek (Cyrillic)-->
 			<languagePopulation type="ru" populationPercent="14"/>	<!--Russian-->
 			<languagePopulation type="kaa" populationPercent="1.6"/>	<!--Kara-Kalpak-->
 			<languagePopulation type="tr" populationPercent="0.76"/>	<!--Turkish-->
 		</territory>
-		<territory type="VA" gdp="24640000" literacyPercent="100" population="842">	<!--Vatican City-->
+		<territory type="VA" gdp="29060000" literacyPercent="100" population="842">	<!--Vatican City-->
 			<languagePopulation type="it" populationPercent="98" references="R1077"/>	<!--Italian-->
 			<languagePopulation type="la" populationPercent="98" references="R1284"/>	<!--Latin-->
 		</territory>
-		<territory type="VC" gdp="1335000000" literacyPercent="96" population="102918">	<!--St. Vincent & Grenadines-->
+		<territory type="VC" gdp="1174000000" literacyPercent="96" population="102627">	<!--St. Vincent & Grenadines-->
 			<languagePopulation type="en" populationPercent="96" officialStatus="official"/>	<!--English-->
 		</territory>
-		<territory type="VE" gdp="407400000000" literacyPercent="95.5" population="28868500">	<!--Venezuela-->
+		<territory type="VE" gdp="540900000000" literacyPercent="95.5" population="29275500">	<!--Venezuela-->
 			<languagePopulation type="es" populationPercent="82" officialStatus="official"/>	<!--Spanish-->
 		</territory>
-		<territory type="VG" gdp="500000000" literacyPercent="97.8" population="32680">	<!--British Virgin Islands-->
+		<territory type="VG" gdp="500000000" literacyPercent="97.8" population="33454">	<!--British Virgin Islands-->
 			<languagePopulation type="en" populationPercent="98" officialStatus="official"/>	<!--English-->
 		</territory>
-		<territory type="VI" gdp="1577000000" literacyPercent="95" population="104170">	<!--U.S. Virgin Islands-->
+		<territory type="VI" gdp="3792000000" literacyPercent="99" population="103574">	<!--U.S. Virgin Islands-->
 			<languagePopulation type="en" populationPercent="75" officialStatus="de_facto_official"/>	<!--English-->
 		</territory>
-		<territory type="VN" gdp="358900000000" literacyPercent="93.4" population="93421800">	<!--Vietnam-->
+		<territory type="VN" gdp="512600000000" literacyPercent="93.4" population="94348800">	<!--Vietnam-->
 			<languagePopulation type="vi" populationPercent="86" officialStatus="official" references="R1218"/>	<!--Vietnamese-->
 			<languagePopulation type="zh_Hant" populationPercent="1"/>	<!--Chinese (Traditional)-->
 			<languagePopulation type="cjm" writingPercent="60" populationPercent="0.089"/>	<!--Eastern Cham-->
 		</territory>
-		<territory type="VU" gdp="1270000000" literacyPercent="83.2" population="266937">	<!--Vanuatu-->
+		<territory type="VU" gdp="683000000" literacyPercent="83.2" population="272264">	<!--Vanuatu-->
 			<languagePopulation type="bi" populationPercent="90" officialStatus="official" references="R1201"/>	<!--Bislama-->
 			<languagePopulation type="en" populationPercent="83" officialStatus="official"/>	<!--English-->
 			<languagePopulation type="fr" populationPercent="50" officialStatus="official"/>	<!--French-->
 		</territory>
-		<territory type="WF" gdp="60000000" literacyPercent="50" population="15561">	<!--Wallis & Futuna-->
-			<languagePopulation type="wls" populationPercent="61"/>	<!--Wallisian-->
+		<territory type="WF" gdp="60000000" literacyPercent="50" population="15613">	<!--Wallis & Futuna-->
+			<languagePopulation type="wls" populationPercent="60"/>	<!--Wallisian-->
 			<languagePopulation type="fr" populationPercent="49" officialStatus="official" references="R1168"/>	<!--French-->
 			<languagePopulation type="fud" populationPercent="31"/>	<!--East Futuna-->
 		</territory>
-		<territory type="WS" gdp="1145000000" literacyPercent="98.8" population="196628">	<!--Samoa-->
+		<territory type="WS" gdp="997000000" literacyPercent="98.8" population="197773">	<!--Samoa-->
 			<languagePopulation type="sm" populationPercent="100" officialStatus="official"/>	<!--Samoan-->
 			<languagePopulation type="en" populationPercent="2.2" officialStatus="official"/>	<!--English-->
 		</territory>
-		<territory type="XK" gdp="14110000000" literacyPercent="91.9" population="1859200">	<!--Kosovo-->
+		<territory type="XK" gdp="16920000000" literacyPercent="91.9" population="1870980">	<!--Kosovo-->
 			<languagePopulation type="sq" populationPercent="92" officialStatus="official"/>	<!--Albanian-->
 			<languagePopulation type="aln" populationPercent="74" references="R1305"/>	<!--Gheg Albanian-->
 			<languagePopulation type="sr_Cyrl" populationPercent="5" officialStatus="official" references="R1264"/>	<!--Serbian (Cyrillic)-->
 			<languagePopulation type="sr_Latn" populationPercent="5" officialStatus="official" references="R1264"/>	<!--Serbian (Latin)-->
 		</territory>
-		<territory type="YE" gdp="61630000000" literacyPercent="65.3" population="26053000">	<!--Yemen-->
+		<territory type="YE" gdp="104000000000" literacyPercent="65.3" population="26737300">	<!--Yemen-->
 			<languagePopulation type="ar" populationPercent="74" officialStatus="official"/>	<!--Arabic-->
 			<languagePopulation type="en" populationPercent="9"/>	<!--English-->
 		</territory>
@@ -4128,7 +4184,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="buc" populationPercent="23"/>	<!--Bushi-->
 			<languagePopulation type="sw" populationPercent="1.4"/>	<!--Swahili-->
 		</territory>
-		<territory type="ZA" gdp="595700000000" literacyPercent="93" population="48375600">	<!--South Africa-->
+		<territory type="ZA" gdp="707100000000" literacyPercent="93" population="53675600">	<!--South Africa-->
 			<languagePopulation type="en" writingPercent="99" populationPercent="31" officialStatus="official" references="R1265"/>	<!--English-->
 			<languagePopulation type="zu" writingPercent="50" populationPercent="24" officialStatus="official_regional"/>	<!--Zulu-->
 			<languagePopulation type="xh" writingPercent="50" populationPercent="18" officialStatus="official_regional"/>	<!--Xhosa-->
@@ -4141,15 +4197,15 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="ve" writingPercent="50" populationPercent="2.3" officialStatus="official_regional"/>	<!--Venda-->
 			<languagePopulation type="hi" writingPercent="69" populationPercent="2"/>	<!--Hindi-->
 			<languagePopulation type="nr" writingPercent="50" populationPercent="1.6" officialStatus="official_regional"/>	<!--South Ndebele-->
-			<languagePopulation type="sw" writingPercent="50" populationPercent="0.0021"/>	<!--Swahili-->
+			<languagePopulation type="sw" writingPercent="50" populationPercent="0.0019"/>	<!--Swahili-->
 		</territory>
-		<territory type="ZM" gdp="25470000000" literacyPercent="61.4" population="14638500">	<!--Zambia-->
+		<territory type="ZM" gdp="61390000000" literacyPercent="61.4" population="15066300">	<!--Zambia-->
 			<languagePopulation type="bem" populationPercent="31" references="R1104"/>	<!--Bemba-->
 			<languagePopulation type="en" populationPercent="16" officialStatus="official"/>	<!--English-->
 			<languagePopulation type="ny" populationPercent="15"/>	<!--Nyanja-->
 			<languagePopulation type="loz" populationPercent="6" references="R1285"/>	<!--Lozi-->
 		</territory>
-		<territory type="ZW" gdp="7496000000" literacyPercent="83.6" population="13771700">	<!--Zimbabwe-->
+		<territory type="ZW" gdp="27260000000" literacyPercent="83.6" population="14229500">	<!--Zimbabwe-->
 			<languagePopulation type="sn" populationPercent="81" officialStatus="official"/>	<!--Shona-->
 			<languagePopulation type="en" populationPercent="42" officialStatus="official" references="R1171"/>	<!--English-->
 			<languagePopulation type="nd" populationPercent="12" officialStatus="official"/>	<!--North Ndebele-->
@@ -4520,7 +4576,7 @@ XXX Code for transations where no currency is involved
         <calendarPreference territories="IN" ordering="gregorian indian"/>
         <calendarPreference territories="JP" ordering="gregorian japanese"/>
         <calendarPreference territories="KR" ordering="gregorian dangi"/>
-        <calendarPreference territories="SA" ordering="gregorian islamic-umalqura islamic islamic-rgsa"/>
+        <calendarPreference territories="SA" ordering="islamic-umalqura gregorian islamic islamic-rgsa"/>
         <calendarPreference territories="TH" ordering="buddhist gregorian"/>
         <calendarPreference territories="TW" ordering="gregorian roc chinese"/>
     </calendarPreferenceData>
@@ -4610,52 +4666,34 @@ XXX Code for transations where no currency is involved
     </weekData>
 
     <timeData>
-        <hours preferred="H" allowed="H K h" regions="JP"/>
-        <hours preferred="H" allowed="H h" regions="001"/>
-        <hours preferred="H" allowed="H" regions="
-			AD AM AO AT AW AX
-			BE BF BJ BL BQ BR
-			CD CG CI CP CV CZ
-			DE DK
-			EE
-			FI FR
-			GA GF GN GP GW
-			HR
-			ID IL IS IT
-			MC MD MF ML MQ MZ
-			NC NE NL
-			PM PT
-			RE RO RU
-			SE SI SJ SK SM SR ST
-			TG TR
-			WF
-			YT"
-		/>
-        <hours preferred="h" allowed="H h" regions="
-			AE AG AL AS AU
-			BB BD BH BM BN BS BT BW
-			CA CN CO CY
-			DJ DM DZ
-			EG EH ER ET
-			FJ FM
-			GD GH GL GM GR GU GY
-			HK
-			IN IQ
-			JM JO
-			KH KI KN KP KR KW KY
-			LB LC LR LS LY
-			MA MH MO MP MR MW MY
-			NA NG NZ
-			OM
-			PG PK PR PS PW
-			QA
-			SA SB SD SG SL SO SS SY SZ
-			TC TD TN TT TW
-			UM US
-			VC VG VI VU
-			WS
-			YE
-			ZA ZM ZW"/>
+		<hours preferred="H" allowed="H" regions="AX BQ CP CZ DK FI ID IS ML NE RU SE SJ SK"/>
+		<hours preferred="H" allowed="H h" regions="001"/>
+		<hours preferred="H" allowed="H h hb hB" regions="AC AI BZ CC CK CX DG FK GB GG GI IE IM IO JE LT MK MN MS NF NR NU PN SH SX TA"/>
+		<hours preferred="H" allowed="H h hB" regions="CF CM LU NP PF SC SN TF ca_ES gl_ES"/>
+		<hours preferred="H" allowed="H h hB hb" regions="KG KM LK MA"/>
+		<hours preferred="H" allowed="H h K" regions="JP"/>
+		<hours preferred="H" allowed="H hb hB h" regions="AF IR LA"/>
+		<hours preferred="H" allowed="H hB"
+			regions="AD AM AO AT AW BE BF BJ BL BR CG CI CV DE EE FR GA GF GN GP GW HR IL IT KZ MC MD MF MQ MZ NC NL PM PT RE RO SI SM SR ST TG TR WF YT"/>
+		<hours preferred="H" allowed="H hB h" regions="AZ BA BG CH GE LI ME RS UA UZ VA XK"/>
+		<hours preferred="H" allowed="H hB h hb" regions="AR BO CL CR CU EA EC ES GQ GT HN IC MX NI PE SV UY"/>
+		<hours preferred="H" allowed="H hB hb h" regions="LV TL"/>
+		<hours preferred="H" allowed="hB H" regions="CD"/>
+		<hours preferred="H" allowed="hB hb h H" regions="KE MM TZ UG"/>
+		<hours preferred="h" allowed="h H" regions="AS BT DJ ER GH GL IN LS PG PW SO TO VU WS ZW"/>
+		<hours preferred="h" allowed="h H hb hB" regions="CY GR"/>
+		<hours preferred="h" allowed="h H hB" regions="AL TD fr_CA"/>
+		<hours preferred="h" allowed="h H hB hb" regions="CO DO KP KR NA PA PR VE af_ZA"/>
+		<hours preferred="h" allowed="h hb H hB"
+			regions="AG AU BB BM BS BW CA DM FJ FM GD GM GU GY JM KI KN KY LC LR MH MP MW NG NZ SB SG SL SS SZ TC TT UM US VC VG VI ZA ZM"/>
+		<hours preferred="h" allowed="h hB H" regions="BD PK"/>
+		<hours preferred="h" allowed="h hB hb H" regions="AE BH DZ EG EH IQ JO KW LB LY MR OM PH PS QA SA SD SY TN YE"/>
+		<hours preferred="h" allowed="hb hB H h" regions="BN MY"/>
+		<hours preferred="h" allowed="hB h H" regions="kn_IN ml_IN te_IN"/>
+		<hours preferred="h" allowed="hB h H hb" regions="KH"/>
+		<hours preferred="h" allowed="hB h hb H" regions="ta_IN"/>
+		<hours preferred="h" allowed="hB hb H h" regions="CN HK MO TW"/>
+		<hours preferred="h" allowed="hB hb h H" regions="ET gu_IN mr_IN pa_IN zu_ZA"/>
     </timeData>
 
     <measurementData>
@@ -4668,6 +4706,131 @@ XXX Code for transations where no currency is involved
           <paperSize type="US-Letter"  territories="BZ CA CL CO CR GT MX NI PA PH PR SV US VE"/>
     </measurementData>
 
+	<unitPreferenceData>
+		<unitPreferences category="area" usage="land-agricult">
+			<unitPreference regions="001">hectare</unitPreference>
+			<unitPreference regions="GB US">acre</unitPreference>
+		</unitPreferences>
+		<unitPreferences category="area" usage="land-commercl">
+			<unitPreference regions="001">hectare</unitPreference>
+			<unitPreference regions="GB US">acre</unitPreference>
+		</unitPreferences>
+		<unitPreferences category="area" usage="land-residntl">
+			<unitPreference regions="001">hectare</unitPreference>
+			<unitPreference regions="GB US">acre</unitPreference>
+		</unitPreferences>
+		<unitPreferences category="concentr" usage="blood-glucose">
+			<!-- About 60% of regions use mg/dL, the rest mmol/L, some show both; does not follow metric vs imperial -->
+			<unitPreference regions="001">milligram-per-deciliter</unitPreference>
+			<unitPreference regions="AG AI AO AU BA BG BH BM BN BW BY CA CH CM CN CZ DK DM EE FI FJ GB GD HK HR HU IE IM IS KE KN KW KZ LC LI LT LU LV ME MG MK MO MS MT MU MY MZ NA NL NO NZ OM PG RS RU SE SG SI SK TC TO UA UG VC VG VN VU ZA">millimole-per-liter</unitPreference>
+		</unitPreferences>
+		<unitPreferences category="consumption" usage="vehicle-fuel">
+			<unitPreference regions="001">liter-per-100kilometers</unitPreference>
+			<unitPreference regions="BR IT JP KR MX MY TH TR">liter-per-kilometer</unitPreference>
+			<unitPreference regions="CA GB" alt="informal">mile-per-gallon-imperial</unitPreference>
+			<unitPreference regions="NL" alt="informal">liter-per-kilometer</unitPreference>
+			<!--<unitPreference regions="NO SE" alt="informal">liter-per-mile-scandinavian</unitPreference>-->
+			<unitPreference regions="US">mile-per-gallon</unitPreference>
+		</unitPreferences>
+		<unitPreferences category="duration" usage="music-track">
+			<unitPreference regions="001">minute second</unitPreference>
+		</unitPreferences>
+		<unitPreferences category="duration" usage="person-age">
+			<unitPreference regions="001">year-person month-person</unitPreference>
+		</unitPreferences>
+		<unitPreferences category="duration" usage="tv-program">
+			<unitPreference regions="001">minute second</unitPreference>
+		</unitPreferences>
+		<unitPreferences category="energy" usage="food">
+			<unitPreference regions="001">foodcalorie</unitPreference>
+		</unitPreferences>
+		<unitPreferences category="energy" usage="person-usage">
+			<unitPreference regions="001">kilocalorie</unitPreference>
+		</unitPreferences>
+		<unitPreferences category="length" usage="person">
+			<unitPreference regions="001">centimeter</unitPreference>
+			<unitPreference regions="BR CN DE DK MX NL NO PL PT RU" alt="informal">meter centimeter</unitPreference>
+			<unitPreference regions="AT BE DZ EG ES FR HK ID IL IT JO MY SA SE TR VN">meter centimeter</unitPreference>
+			<unitPreference regions="CA GB IN US" alt="informal">foot inch</unitPreference>
+			<unitPreference regions="US">inch</unitPreference>
+		</unitPreferences>
+		<unitPreferences category="length" usage="person" scope="small">
+			<unitPreference regions="001">centimeter</unitPreference>
+			<unitPreference regions="CA GB IN" alt="informal">inch</unitPreference>
+			<unitPreference regions="US">inch</unitPreference>
+		</unitPreferences>
+		<unitPreferences category="length" usage="rainfall">
+			<unitPreference regions="001">millimeter</unitPreference>
+			<unitPreference regions="BR">centimeter</unitPreference>
+			<unitPreference regions="US">inch</unitPreference>
+		</unitPreferences>
+		<unitPreferences category="length" usage="road">
+			<unitPreference regions="001">kilometer</unitPreference>
+			<unitPreference regions="GB US">mile</unitPreference>
+			<unitPreference regions="SE" alt="informal">mile-scandinavian</unitPreference>
+		</unitPreferences>
+		<unitPreferences category="length" usage="road" scope="small">
+			<unitPreference regions="001">meter</unitPreference>
+			<unitPreference regions="GB">yard</unitPreference>
+			<unitPreference regions="US">foot</unitPreference>
+		</unitPreferences>
+		<unitPreferences category="length" usage="snowfall">
+			<unitPreference regions="001">centimeter</unitPreference>
+			<unitPreference regions="US">inch</unitPreference>
+		</unitPreferences>
+		<unitPreferences category="length" usage="vehicle">
+			<unitPreference regions="001">meter</unitPreference>
+			<unitPreference regions="GB US">foot inch</unitPreference>
+			<unitPreference regions="MX">meter centimeter</unitPreference>
+		</unitPreferences>
+		<unitPreferences category="length" usage="visiblty">
+			<unitPreference regions="001">kilometer</unitPreference>
+			<unitPreference regions="DE NL">meter</unitPreference>
+			<unitPreference regions="GB US">mile</unitPreference>
+		</unitPreferences>
+		<unitPreferences category="length" usage="visiblty" scope="small">
+			<unitPreference regions="001">meter</unitPreference>
+			<unitPreference regions="GB US">foot</unitPreference>
+		</unitPreferences>
+		<unitPreferences category="mass" usage="person">
+			<unitPreference regions="001">kilogram</unitPreference>
+			<unitPreference regions="GB">stone pound</unitPreference>
+			<unitPreference regions="US">pound</unitPreference>
+		</unitPreferences>
+		<unitPreferences category="mass" usage="person" scope="small">
+			<unitPreference regions="001">gram</unitPreference>
+			<unitPreference regions="DZ EG ES JO SA">kilogram gram</unitPreference>
+			<unitPreference regions="GB HK US">pound ounce</unitPreference>
+		</unitPreferences>
+		<unitPreferences category="pressure" usage="baromtrc">
+			<unitPreference regions="001">hectopascal</unitPreference>
+			<unitPreference regions="BR EG GB IL TH">millibar</unitPreference>
+			<unitPreference regions="MX RU">millimeter-of-mercury</unitPreference>
+			<unitPreference regions="IN US">inch-hg</unitPreference>
+		</unitPreferences>
+		<unitPreferences category="speed" usage="road-travel">
+			<unitPreference regions="001">kilometer-per-hour</unitPreference>
+			<unitPreference regions="GB US">mile-per-hour</unitPreference>
+		</unitPreferences>
+		<unitPreferences category="speed" usage="wind">
+			<unitPreference regions="001">kilometer-per-hour</unitPreference>
+			<unitPreference regions="FI KR NO PL RU SE">meter-per-second</unitPreference>
+			<unitPreference regions="US">mile-per-hour</unitPreference>
+		</unitPreferences>
+		<unitPreferences category="temperature" usage="person">
+			<unitPreference regions="001">celsius</unitPreference>
+			<unitPreference regions="US">fahrenheit</unitPreference>
+		</unitPreferences>
+		<unitPreferences category="temperature" usage="weather">
+			<unitPreference regions="001">celsius</unitPreference>
+			<unitPreference regions="BS BZ KY PR PW US">fahrenheit</unitPreference>
+		</unitPreferences>
+		<unitPreferences category="volume" usage="vehicle-fuel">
+			<unitPreference regions="001">liter</unitPreference>
+			<unitPreference regions="US">gallon</unitPreference>
+		</unitPreferences>
+	</unitPreferenceData>
+
     <!-- start of data generated with CountItems tool per http://sites.google.com/site/cldr/development/updating-codes/update-languagescriptregion-subtags -->
     <codeMappings>
         <territoryCodes type="AA" numeric="958" alpha3="AAA"/>
@@ -4919,7 +5082,7 @@ XXX Code for transations where no currency is involved
         <territoryCodes type="TH" numeric="764" alpha3="THA"/>
         <territoryCodes type="TJ" numeric="762" alpha3="TJK" fips10="TI"/>
         <territoryCodes type="TK" numeric="772" alpha3="TKL" fips10="TL"/>
-        <territoryCodes type="TL" numeric="626" alpha3="TLS" fips10="TT" internet="TL TP"/>
+        <territoryCodes type="TL" numeric="626" alpha3="TLS" fips10="TT"/>
         <territoryCodes type="TM" numeric="795" alpha3="TKM" fips10="TX"/>
         <territoryCodes type="TN" numeric="788" alpha3="TUN" fips10="TS"/>
         <territoryCodes type="TO" numeric="776" alpha3="TON" fips10="TN"/>
@@ -4978,192 +5141,194 @@ XXX Code for transations where no currency is involved
         <territoryCodes type="ZM" numeric="894" alpha3="ZMB" fips10="ZA"/>
         <territoryCodes type="ZR" numeric="180" alpha3="ZAR"/>
         <territoryCodes type="ZW" numeric="716" alpha3="ZWE" fips10="ZI"/>
-        <territoryCodes type="ZZ" numeric="999" alpha3="ZZZ" internet="ABOGADO ACADEMY ACCOUNTANTS ACTIVE ACTOR ADULT AERO AGENCY AIRFORCE ALLFINANZ ALSACE AMSTERDAM ANDROID APARTMENTS AQUARELLE ARCHI ARMY ARPA ASIA ASSOCIATES ATTORNEY AUCTION AUDIO AUTOS AXA BAND BANK BAR BARCLAYCARD BARCLAYS BARGAINS BAYERN BEER BERLIN BEST BID BIKE BINGO BIO BIZ BLACK BLACKFRIDAY BLOOMBERG BLUE BMW BNPPARIBAS BOO BOUTIQUE BRUSSELS BUDAPEST BUILD BUILDERS BUSINESS BUZZ BZH CAB CAL CAMERA CAMP CANCERRESEARCH CANON CAPETOWN CAPITAL CARAVAN CARDS CARE CAREER CAREERS CARTIER CASA CASH CASINO CAT CATERING CBN CENTER CEO CERN CHANNEL CHAT CHEAP CHRISTMAS CHROME CHURCH CITIC CITY CLAIMS CLEANING CLICK CLINIC CLOTHING CLUB COACH CODES COFFEE COLLEGE COLOGNE COM COMMUNITY COMPANY COMPUTER CONDOS CONSTRUCTION CONSULTING CONTRACTORS COOKING COOL COOP COUNTRY CREDIT CREDITCARD CRICKET CRS CRUISES CUISINELLA CYMRU DABUR DAD DANCE DATING DAY DCLK DEALS DEGREE DELIVERY DEMOCRAT DENTAL DENTIST DESI DESIGN DEV DIAMONDS DIET DIGITAL DIRECT DIRECTORY DISCOUNT DNP DOCS DOMAINS DOOSAN DURBAN DVAG EAT EDU EDUCATION EMAIL EMERCK ENERGY ENGINEER ENGINEERING ENTERPRISES EQUIPMENT ESQ ESTATE EUROVISION EUS EVENTS EVERBANK EXCHANGE EXPERT EXPOSED FAIL FANS FARM FASHION FEEDBACK FINANCE FINANCIAL FIRMDALE FISH FISHING FIT FITNESS FLIGHTS FLORIST FLOWERS FLSMIDTH FLY FOO FOOTBALL FORSALE FOUNDATION FRL FROGANS FUND FURNITURE FUTBOL GAL GALLERY GARDEN GBIZ GDN GENT GGEE GIFT GIFTS GIVES GLASS GLE GLOBAL GLOBO GMAIL GMO GMX GOLDPOINT GOOG GOOGLE GOP GOV GRAPHICS GRATIS GREEN GRIPE GUIDE GUITARS GURU HAMBURG HANGOUT HAUS HEALTHCARE HELP HERE HERMES HIPHOP HIV HOLDINGS HOLIDAY HOMES HORSE HOST HOSTING HOUSE HOW IBM IFM IMMO IMMOBILIEN INDUSTRIES INFO ING INK INSTITUTE INSURE INT INTERNATIONAL INVESTMENTS IRISH IWC JCB JETZT JOBS JOBURG JUEGOS KAUFEN KDDI KIM KITCHEN KIWI KOELN KRD KRED KYOTO LACAIXA LAND LAT LATROBE LAWYER LDS LEASE LEGAL LGBT LIDL LIFE LIGHTING LIMITED LIMO LINK LOANS LONDON LOTTE LOTTO LTDA LUXE LUXURY MADRID MAISON MANAGEMENT MANGO MARKET MARKETING MARRIOTT MEDIA MEET MELBOURNE MEME MEMORIAL MENU MIAMI MIL MINI MOBI MODA MOE MONASH MONEY MORMON MORTGAGE MOSCOW MOTORCYCLES MOV MUSEUM NAGOYA NAME NAVY NET NETWORK NEUSTAR NEW NEXUS NGO NHK NICO NINJA NRA NRW NTT NYC OKINAWA ONE ONG ONL OOO ORG ORGANIC OSAKA OTSUKA OVH PARIS PARTNERS PARTS PARTY PHARMACY PHOTO PHOTOGRAPHY PHOTOS PHYSIO PICS PICTURES PINK PIZZA PLACE PLUMBING POHL POKER PORN POST PRAXI PRESS PRO PROD PRODUCTIONS PROF PROPERTIES PROPERTY PUB QPON QUEBEC REALTOR RECIPES RED REHAB REISE REISEN REIT REN RENTALS REPAIR REPORT REPUBLICAN REST RESTAURANT REVIEWS RICH RIO RIP ROCKS RODEO RSVP RUHR RYUKYU SAARLAND SALE SAMSUNG SARL SAXO SCA SCB SCHMIDT SCHOOL SCHULE SCHWARZ SCIENCE SCOT SERVICES SEW SEXY SHIKSHA SHOES SHRIRAM SINGLES SKY SOCIAL SOFTWARE SOHU SOLAR SOLUTIONS SOY SPACE SPIEGEL STYLE SUPPLIES SUPPLY SUPPORT SURF SURGERY SUZUKI SYDNEY SYSTEMS TAIPEI TATAR TATTOO TAX TECHNOLOGY TEL TEMASEK TENNIS TIENDA TIPS TIRES TIROL TODAY TOKYO TOOLS TOP TOSHIBA TOWN TOYS TRADE TRAINING TRAVEL TRUST TUI UNIVERSITY UNO UOL VACATIONS VEGAS VENTURES VERSICHERUNG VET VIAJES VIDEO VILLAS VISION VLAANDEREN VODKA VOTE VOTING VOTO VOYAGE WALES WANG WATCH WEBCAM WEBSITE WED WEDDING WHOSWHO WIEN WIKI WILLIAMHILL WME WORK WORKS WORLD WTC WTF XN--1QQW23A XN--3BST00M XN--3DS443G XN--3E0B707E XN--45BRJ9C XN--45Q11C XN--4GBRIM XN--55QW42G XN--55QX5D XN--6FRZ82G XN--6QQ986B3XL XN--80ADXHKS XN--80AO21A XN--80ASEHDB XN--80ASWG XN--90A3AC XN--90AIS XN--B4W605FERD XN--C1AVG XN--CG4BKI XN--CLCHC0EA0B2G2A9GCD XN--CZR694B XN--CZRS0T XN--CZRU2D XN--D1ACJ3B XN--D1ALF XN--FIQ228C5HS XN--FIQ64B XN--FIQS8S XN--FIQZ9S XN--FLW351E XN--FPCRJ9C3D XN--FZC2C9E2C XN--GECRJ9C XN--H2BRJ9C XN--HXT814E XN--I1B6B1A6A2E XN--IO0A7I XN--J1AMH XN--J6W193G XN--KPRW13D XN--KPRY57D XN--KPUT3I XN--L1ACC XN--LGBBAT1AD8J XN--MGB9AWBF XN--MGBA3A4F16A XN--MGBAAM7A8H XN--MGBAB2BD XN--MGBAYH7GPA XN--MGBBH1A71E XN--MGBC0A9AZCG XN--MGBERP4A5D4AR XN--MGBX4CD0AB XN--NGBC5AZD XN--NODE XN--NQV7F XN--NQV7FS00EMA XN--O3CW4H XN--OGBPF8FL XN--P1ACF XN--P1AI XN--PGBS0DH XN--Q9JYB4C XN--QCKA1PMC XN--RHQV96G XN--S9BRJ9C XN--SES554G XN--UNUP4Y XN--VERMGENSBERATER-CTB XN--VERMGENSBERATUNG-PWB XN--VHQUV XN--WGBH1C XN--WGBL6A XN--XHQ521B XN--XKC2AL3HYE2A XN--XKC2DL3A5EE0H XN--YFRO4I67O XN--YGBI2AMMX XN--ZFR164B XXX XYZ YACHTS YANDEX YODOBASHI YOGA YOKOHAMA YOUTUBE ZIP ZONE ZUERICH"/>
+        <territoryCodes type="ZZ" numeric="999" alpha3="ZZZ" internet="AAA AARP ABB ABBOTT ABOGADO ACADEMY ACCENTURE ACCOUNTANT ACCOUNTANTS ACO ACTIVE ACTOR ADAC ADS ADULT AEG AERO AFL AGENCY AIG AIRFORCE AIRTEL ALIBABA ALIPAY ALLFINANZ ALSACE AMICA AMSTERDAM ANALYTICS ANDROID APARTMENTS APP APPLE AQUARELLE ARAMCO ARCHI ARMY ARPA ARTE ASIA ASSOCIATES ATTORNEY AUCTION AUDI AUDIO AUTHOR AUTO AUTOS AXA AZURE BAIDU BAND BANK BAR BARCELONA BARCLAYCARD BARCLAYS BARGAINS BAUHAUS BAYERN BBC BBVA BCN BEATS BEER BENTLEY BERLIN BEST BET BHARTI BIBLE BID BIKE BING BINGO BIO BIZ BLACK BLACKFRIDAY BLOOMBERG BLUE BMS BMW BNL BNPPARIBAS BOATS BOEHRINGER BOM BOND BOO BOOK BOOTS BOSCH BOSTIK BOT BOUTIQUE BRADESCO BRIDGESTONE BROADWAY BROKER BROTHER BRUSSELS BUDAPEST BUGATTI BUILD BUILDERS BUSINESS BUY BUZZ BZH CAB CAFE CAL CALL CAMERA CAMP CANCERRESEARCH CANON CAPETOWN CAPITAL CAR CARAVAN CARDS CARE CAREER CAREERS CARS CARTIER CASA CASH CASINO CAT CATERING CBA CBN CEB CENTER CEO CERN CFA CFD CHANEL CHANNEL CHAT CHEAP CHLOE CHRISTMAS CHROME CHURCH CIPRIANI CIRCLE CISCO CITIC CITY CITYEATS CLAIMS CLEANING CLICK CLINIC CLINIQUE CLOTHING CLOUD CLUB CLUBMED COACH CODES COFFEE COLLEGE COLOGNE COM COMMBANK COMMUNITY COMPANY COMPARE COMPUTER COMSEC CONDOS CONSTRUCTION CONSULTING CONTACT CONTRACTORS COOKING COOL COOP CORSICA COUNTRY COUPONS COURSES CREDIT CREDITCARD CREDITUNION CRICKET CROWN CRS CRUISES CSC CUISINELLA CYMRU CYOU DABUR DAD DANCE DATE DATING DATSUN DAY DCLK DEALER DEALS DEGREE DELIVERY DELL DELOITTE DELTA DEMOCRAT DENTAL DENTIST DESI DESIGN DEV DIAMONDS DIET DIGITAL DIRECT DIRECTORY DISCOUNT DNP DOCS DOG DOHA DOMAINS DOOSAN DOWNLOAD DRIVE DUBAI DURBAN DVAG EARTH EAT EDEKA EDU EDUCATION EMAIL EMERCK ENERGY ENGINEER ENGINEERING ENTERPRISES EPSON EQUIPMENT ERNI ESQ ESTATE EUROVISION EUS EVENTS EVERBANK EXCHANGE EXPERT EXPOSED EXPRESS FAGE FAIL FAIRWINDS FAITH FAMILY FAN FANS FARM FASHION FAST FEEDBACK FERRERO FILM FINAL FINANCE FINANCIAL FIRESTONE FIRMDALE FISH FISHING FIT FITNESS FLIGHTS FLORIST FLOWERS FLSMIDTH FLY FOO FOOTBALL FORD FOREX FORSALE FORUM FOUNDATION FOX FRESENIUS FRL FROGANS FUND FURNITURE FUTBOL FYI GAL GALLERY GAME GARDEN GBIZ GDN GEA GENT GENTING GGEE GIFT GIFTS GIVES GIVING GLASS GLE GLOBAL GLOBO GMAIL GMO GMX GOLD GOLDPOINT GOLF GOO GOOG GOOGLE GOP GOT GOV GRAINGER GRAPHICS GRATIS GREEN GRIPE GROUP GUCCI GUGE GUIDE GUITARS GURU HAMBURG HANGOUT HAUS HEALTH HEALTHCARE HELP HELSINKI HERE HERMES HIPHOP HITACHI HIV HOCKEY HOLDINGS HOLIDAY HOMEDEPOT HOMES HONDA HORSE HOST HOSTING HOTELES HOTMAIL HOUSE HOW HSBC HYUNDAI IBM ICBC ICE ICU IFM IINET IMMO IMMOBILIEN INDUSTRIES INFINITI INFO ING INK INSTITUTE INSURANCE INSURE INT INTERNATIONAL INVESTMENTS IPIRANGA IRISH ISELECT IST ISTANBUL ITAU IWC JAGUAR JAVA JCB JETZT JEWELRY JLC JLL JMP JOBS JOBURG JOT JOY JPRS JUEGOS KAUFEN KDDI KFH KIA KIM KINDER KITCHEN KIWI KOELN KOMATSU KPN KRD KRED KYOTO LACAIXA LAMBORGHINI LAMER LANCASTER LAND LANDROVER LANXESS LASALLE LAT LATROBE LAW LAWYER LDS LEASE LECLERC LEGAL LEXUS LGBT LIAISON LIDL LIFE LIFEINSURANCE LIFESTYLE LIGHTING LIKE LIMITED LIMO LINCOLN LINDE LINK LIVE LIVING LIXIL LOAN LOANS LOL LONDON LOTTE LOTTO LOVE LTD LTDA LUPIN LUXE LUXURY MADRID MAIF MAISON MAKEUP MAN MANAGEMENT MANGO MARKET MARKETING MARKETS MARRIOTT MBA MED MEDIA MEET MELBOURNE MEME MEMORIAL MEN MENU MEO MIAMI MICROSOFT MIL MINI MMA MOBI MOBILY MODA MOE MOI MOM MONASH MONEY MONTBLANC MORMON MORTGAGE MOSCOW MOTORCYCLES MOV MOVIE MOVISTAR MTN MTPC MTR MUSEUM MUTUELLE NADEX NAGOYA NAME NAVY NEC NET NETBANK NETWORK NEUSTAR NEW NEWS NEXUS NGO NHK NICO NIKON NINJA NISSAN NOKIA NORTON NOWRUZ NRA NRW NTT NYC OBI OFFICE OKINAWA OMEGA ONE ONG ONL ONLINE OOO ORACLE ORANGE ORG ORGANIC ORIGINS OSAKA OTSUKA OVH PAGE PAMPEREDCHEF PANERAI PARIS PARS PARTNERS PARTS PARTY PET PHARMACY PHILIPS PHOTO PHOTOGRAPHY PHOTOS PHYSIO PIAGET PICS PICTET PICTURES PID PIN PING PINK PIZZA PLACE PLAY PLAYSTATION PLUMBING PLUS POHL POKER PORN POST PRAXI PRESS PRO PROD PRODUCTIONS PROF PROMO PROPERTIES PROPERTY PROTECTION PUB QPON QUEBEC RACING READ REALTOR REALTY RECIPES RED REDSTONE REDUMBRELLA REHAB REISE REISEN REIT REN RENT RENTALS REPAIR REPORT REPUBLICAN REST RESTAURANT REVIEW REVIEWS REXROTH RICH RICOH RIO RIP ROCHER ROCKS RODEO ROOM RSVP RUHR RUN RWE RYUKYU SAARLAND SAFE SAFETY SAKURA SALE SALON SAMSUNG SANDVIK SANDVIKCOROMANT SANOFI SAP SAPO SARL SAS SAXO SBS SCA SCB SCHAEFFLER SCHMIDT SCHOLARSHIPS SCHOOL SCHULE SCHWARZ SCIENCE SCOR SCOT SEAT SECURITY SEEK SELECT SENER SERVICES SEVEN SEW SEX SEXY SFR SHARP SHELL SHIA SHIKSHA SHOES SHOW SHRIRAM SINGLES SITE SKI SKIN SKY SKYPE SMILE SNCF SOCCER SOCIAL SOFTBANK SOFTWARE SOHU SOLAR SOLUTIONS SONY SOY SPACE SPIEGEL SPREADBETTING SRL STADA STAR STARHUB STATEFARM STATOIL STC STCGROUP STOCKHOLM STORAGE STUDIO STUDY STYLE SUCKS SUPPLIES SUPPLY SUPPORT SURF SURGERY SUZUKI SWATCH SWISS SYDNEY SYMANTEC SYSTEMS TAB TAIPEI TAOBAO TATAMOTORS TATAR TATTOO TAX TAXI TCI TEAM TECH TECHNOLOGY TEL TELEFONICA TEMASEK TENNIS THD THEATER THEATRE TICKETS TIENDA TIFFANY TIPS TIRES TIROL TMALL TODAY TOKYO TOOLS TOP TORAY TOSHIBA TOURS TOWN TOYOTA TOYS TRADE TRADING TRAINING TRAVEL TRAVELERS TRAVELERSINSURANCE TRUST TRV TUBE TUI TUSHU UBS UNICOM UNIVERSITY UNO UOL VACATIONS VANA VEGAS VENTURES VERISIGN VERSICHERUNG VET VIAJES VIDEO VILLAS VIN VIP VIRGIN VISION VISTA VISTAPRINT VIVA VLAANDEREN VODKA VOLKSWAGEN VOTE VOTING VOTO VOYAGE WALES WALTER WANG WANGGOU WATCH WATCHES WEATHER WEATHERCHANNEL WEBCAM WEBER WEBSITE WED WEDDING WEIR WHOSWHO WIEN WIKI WILLIAMHILL WIN WINDOWS WINE WME WORK WORKS WORLD WTC WTF XBOX XEROX XIN XN--11B4C3D XN--1QQW23A XN--30RR7Y XN--3BST00M XN--3DS443G XN--3E0B707E XN--3PXU8K XN--42C2D9A XN--45BRJ9C XN--45Q11C XN--4GBRIM XN--55QW42G XN--55QX5D XN--6FRZ82G XN--6QQ986B3XL XN--80ADXHKS XN--80AO21A XN--80ASEHDB XN--80ASWG XN--90A3AC XN--90AIS XN--9DBQ2A XN--9ET52U XN--B4W605FERD XN--C1AVG XN--C2BR7G XN--CG4BKI XN--CLCHC0EA0B2G2A9GCD XN--CZR694B XN--CZRS0T XN--CZRU2D XN--D1ACJ3B XN--D1ALF XN--ECKVDTC9D XN--EFVY88H XN--ESTV75G XN--FHBEI XN--FIQ228C5HS XN--FIQ64B XN--FIQS8S XN--FIQZ9S XN--FJQ720A XN--FLW351E XN--FPCRJ9C3D XN--FZC2C9E2C XN--G2XX48C XN--GECRJ9C XN--H2BRJ9C XN--HXT814E XN--I1B6B1A6A2E XN--IMR513N XN--IO0A7I XN--J1AEF XN--J1AMH XN--J6W193G XN--JLQ61U9W7B XN--KCRX77D1X4A XN--KPRW13D XN--KPRY57D XN--KPU716F XN--KPUT3I XN--L1ACC XN--LGBBAT1AD8J XN--MGB9AWBF XN--MGBA3A3EJT XN--MGBA3A4F16A XN--MGBAAM7A8H XN--MGBAB2BD XN--MGBAYH7GPA XN--MGBB9FBPOB XN--MGBBH1A71E XN--MGBC0A9AZCG XN--MGBERP4A5D4AR XN--MGBPL2FH XN--MGBT3DHD XN--MGBTX2B XN--MGBX4CD0AB XN--MK1BU44C XN--MXTQ1M XN--NGBC5AZD XN--NGBE9E0A XN--NODE XN--NQV7F XN--NQV7FS00EMA XN--NYQY26A XN--O3CW4H XN--OGBPF8FL XN--P1ACF XN--P1AI XN--PBT977C XN--PGBS0DH XN--PSSY2U XN--Q9JYB4C XN--QCKA1PMC XN--QXAM XN--RHQV96G XN--S9BRJ9C XN--SES554G XN--T60B56A XN--TCKWE XN--UNUP4Y XN--VERMGENSBERATER-CTB XN--VERMGENSBERATUNG-PWB XN--VHQUV XN--VUQ861B XN--WGBH1C XN--WGBL6A XN--XHQ521B XN--XKC2AL3HYE2A XN--XKC2DL3A5EE0H XN--Y9A3AQ XN--YFRO4I67O XN--YGBI2AMMX XN--ZFR164B XPERIA XXX XYZ YACHTS YAMAXUN YANDEX YODOBASHI YOGA YOKOHAMA YOUTUBE ZARA ZERO ZIP ZONE ZUERICH"/>
     <!-- end of data generated with CountItems tool per http://sites.google.com/site/cldr/development/updating-codes/update-languagescriptregion-subtags -->
-    <currencyCodes type="AED" numeric="784"/>
-	<currencyCodes type="AFN" numeric="971"/>
-	<currencyCodes type="ALL" numeric="8"/>
-	<currencyCodes type="AMD" numeric="51"/>
-	<currencyCodes type="ANG" numeric="532"/>
-	<currencyCodes type="AOA" numeric="973"/>
-	<currencyCodes type="ARS" numeric="32"/>
-	<currencyCodes type="AUD" numeric="36"/>
-	<currencyCodes type="AWG" numeric="533"/>
-	<currencyCodes type="AZN" numeric="944"/>
-	<currencyCodes type="BAM" numeric="977"/>
-	<currencyCodes type="BBD" numeric="52"/>
-	<currencyCodes type="BDT" numeric="50"/>
-	<currencyCodes type="BGN" numeric="975"/>
-	<currencyCodes type="BHD" numeric="48"/>
-	<currencyCodes type="BIF" numeric="108"/>
-	<currencyCodes type="BMD" numeric="60"/>
-	<currencyCodes type="BND" numeric="96"/>
-	<currencyCodes type="BOB" numeric="68"/>
-	<currencyCodes type="BOV" numeric="984"/>
-	<currencyCodes type="BRL" numeric="986"/>
-	<currencyCodes type="BSD" numeric="44"/>
-	<currencyCodes type="BTN" numeric="64"/>
-	<currencyCodes type="BWP" numeric="72"/>
-	<currencyCodes type="BYR" numeric="974"/>
-	<currencyCodes type="BZD" numeric="84"/>
-	<currencyCodes type="CAD" numeric="124"/>
-	<currencyCodes type="CDF" numeric="976"/>
-	<currencyCodes type="CHE" numeric="947"/>
-	<currencyCodes type="CHF" numeric="756"/>
-	<currencyCodes type="CHW" numeric="948"/>
-	<currencyCodes type="CLF" numeric="990"/>
-	<currencyCodes type="CLP" numeric="152"/>
-	<currencyCodes type="CNY" numeric="156"/>
-	<currencyCodes type="COP" numeric="170"/>
-	<currencyCodes type="COU" numeric="970"/>
-	<currencyCodes type="CRC" numeric="188"/>
-	<currencyCodes type="CUC" numeric="931"/>
-	<currencyCodes type="CUP" numeric="192"/>
-	<currencyCodes type="CVE" numeric="132"/>
-	<currencyCodes type="CZK" numeric="203"/>
-	<currencyCodes type="DJF" numeric="262"/>
-	<currencyCodes type="DKK" numeric="208"/>
-	<currencyCodes type="DOP" numeric="214"/>
-	<currencyCodes type="DZD" numeric="12"/>
-	<currencyCodes type="EGP" numeric="818"/>
-	<currencyCodes type="ERN" numeric="232"/>
-	<currencyCodes type="ETB" numeric="230"/>
-	<currencyCodes type="EUR" numeric="978"/>
-	<currencyCodes type="FJD" numeric="242"/>
-	<currencyCodes type="FKP" numeric="238"/>
-	<currencyCodes type="GBP" numeric="826"/>
-	<currencyCodes type="GEL" numeric="981"/>
-	<currencyCodes type="GHS" numeric="936"/>
-	<currencyCodes type="GIP" numeric="292"/>
-	<currencyCodes type="GMD" numeric="270"/>
-	<currencyCodes type="GNF" numeric="324"/>
-	<currencyCodes type="GTQ" numeric="320"/>
-	<currencyCodes type="GYD" numeric="328"/>
-	<currencyCodes type="HKD" numeric="344"/>
-	<currencyCodes type="HNL" numeric="340"/>
-	<currencyCodes type="HRK" numeric="191"/>
-	<currencyCodes type="HTG" numeric="332"/>
-	<currencyCodes type="HUF" numeric="348"/>
-	<currencyCodes type="IDR" numeric="360"/>
-	<currencyCodes type="ILS" numeric="376"/>
-	<currencyCodes type="INR" numeric="356"/>
-	<currencyCodes type="IQD" numeric="368"/>
-	<currencyCodes type="IRR" numeric="364"/>
-	<currencyCodes type="ISK" numeric="352"/>
-	<currencyCodes type="JMD" numeric="388"/>
-	<currencyCodes type="JOD" numeric="400"/>
-	<currencyCodes type="JPY" numeric="392"/>
-	<currencyCodes type="KES" numeric="404"/>
-	<currencyCodes type="KGS" numeric="417"/>
-	<currencyCodes type="KHR" numeric="116"/>
-	<currencyCodes type="KMF" numeric="174"/>
-	<currencyCodes type="KPW" numeric="408"/>
-	<currencyCodes type="KRW" numeric="410"/>
-	<currencyCodes type="KWD" numeric="414"/>
-	<currencyCodes type="KYD" numeric="136"/>
-	<currencyCodes type="KZT" numeric="398"/>
-	<currencyCodes type="LAK" numeric="418"/>
-	<currencyCodes type="LBP" numeric="422"/>
-	<currencyCodes type="LKR" numeric="144"/>
-	<currencyCodes type="LRD" numeric="430"/>
-	<currencyCodes type="LSL" numeric="426"/>
-	<currencyCodes type="LTL" numeric="440"/>
-	<currencyCodes type="LYD" numeric="434"/>
-	<currencyCodes type="MAD" numeric="504"/>
-	<currencyCodes type="MDL" numeric="498"/>
-	<currencyCodes type="MGA" numeric="969"/>
-	<currencyCodes type="MKD" numeric="807"/>
-	<currencyCodes type="MMK" numeric="104"/>
-	<currencyCodes type="MNT" numeric="496"/>
-	<currencyCodes type="MOP" numeric="446"/>
-	<currencyCodes type="MRO" numeric="478"/>
-	<currencyCodes type="MUR" numeric="480"/>
-	<currencyCodes type="MVR" numeric="462"/>
-	<currencyCodes type="MWK" numeric="454"/>
-	<currencyCodes type="MXN" numeric="484"/>
-	<currencyCodes type="MXV" numeric="979"/>
-	<currencyCodes type="MYR" numeric="458"/>
-	<currencyCodes type="MZN" numeric="943"/>
-	<currencyCodes type="NAD" numeric="516"/>
-	<currencyCodes type="NGN" numeric="566"/>
-	<currencyCodes type="NIO" numeric="558"/>
-	<currencyCodes type="NOK" numeric="578"/>
-	<currencyCodes type="NPR" numeric="524"/>
-	<currencyCodes type="NZD" numeric="554"/>
-	<currencyCodes type="OMR" numeric="512"/>
-	<currencyCodes type="PAB" numeric="590"/>
-	<currencyCodes type="PEN" numeric="604"/>
-	<currencyCodes type="PGK" numeric="598"/>
-	<currencyCodes type="PHP" numeric="608"/>
-	<currencyCodes type="PKR" numeric="586"/>
-	<currencyCodes type="PLN" numeric="985"/>
-	<currencyCodes type="PYG" numeric="600"/>
-	<currencyCodes type="QAR" numeric="634"/>
-	<currencyCodes type="RON" numeric="946"/>
-	<currencyCodes type="RSD" numeric="941"/>
-	<currencyCodes type="RUB" numeric="643"/>
-	<currencyCodes type="RWF" numeric="646"/>
-	<currencyCodes type="SAR" numeric="682"/>
-	<currencyCodes type="SBD" numeric="90"/>
-	<currencyCodes type="SCR" numeric="690"/>
-	<currencyCodes type="SDG" numeric="938"/>
-	<currencyCodes type="SEK" numeric="752"/>
-	<currencyCodes type="SGD" numeric="702"/>
-	<currencyCodes type="SHP" numeric="654"/>
-	<currencyCodes type="SLL" numeric="694"/>
-	<currencyCodes type="SOS" numeric="706"/>
-	<currencyCodes type="SRD" numeric="968"/>
-	<currencyCodes type="SSP" numeric="728"/>
-	<currencyCodes type="STD" numeric="678"/>
-	<currencyCodes type="SYP" numeric="760"/>
-	<currencyCodes type="SZL" numeric="748"/>
-	<currencyCodes type="THB" numeric="764"/>
-	<currencyCodes type="TJS" numeric="972"/>
-	<currencyCodes type="TMT" numeric="934"/>
-	<currencyCodes type="TND" numeric="788"/>
-	<currencyCodes type="TOP" numeric="776"/>
-	<currencyCodes type="TRY" numeric="949"/>
-	<currencyCodes type="TTD" numeric="780"/>
-	<currencyCodes type="TWD" numeric="901"/>
-	<currencyCodes type="TZS" numeric="834"/>
-	<currencyCodes type="UAH" numeric="980"/>
-	<currencyCodes type="UGX" numeric="800"/>
-	<currencyCodes type="USD" numeric="840"/>
-	<currencyCodes type="USN" numeric="997"/>
-	<currencyCodes type="UYI" numeric="940"/>
-	<currencyCodes type="UYU" numeric="858"/>
-	<currencyCodes type="UZS" numeric="860"/>
-	<currencyCodes type="VEF" numeric="937"/>
-	<currencyCodes type="VND" numeric="704"/>
-	<currencyCodes type="VUV" numeric="548"/>
-	<currencyCodes type="WST" numeric="882"/>
-	<currencyCodes type="XAF" numeric="950"/>
-	<currencyCodes type="XAG" numeric="961"/>
-	<currencyCodes type="XAU" numeric="959"/>
-	<currencyCodes type="XBA" numeric="955"/>
-	<currencyCodes type="XBB" numeric="956"/>
-	<currencyCodes type="XBC" numeric="957"/>
-	<currencyCodes type="XBD" numeric="958"/>
-	<currencyCodes type="XCD" numeric="951"/>
-	<currencyCodes type="XDR" numeric="960"/>
-	<currencyCodes type="XOF" numeric="952"/>
-	<currencyCodes type="XPD" numeric="964"/>
-	<currencyCodes type="XPF" numeric="953"/>
-	<currencyCodes type="XPT" numeric="962"/>
-	<currencyCodes type="XSU" numeric="994"/>
-	<currencyCodes type="XTS" numeric="963"/>
-	<currencyCodes type="XUA" numeric="965"/>
-	<currencyCodes type="XXX" numeric="999"/>
-	<currencyCodes type="YER" numeric="886"/>
-	<currencyCodes type="ZAR" numeric="710"/>
-	<currencyCodes type="ZMW" numeric="967"/>
+
+	    <currencyCodes type="AED" numeric="784"/>
+		<currencyCodes type="AFN" numeric="971"/>
+		<currencyCodes type="ALL" numeric="8"/>
+		<currencyCodes type="AMD" numeric="51"/>
+		<currencyCodes type="ANG" numeric="532"/>
+		<currencyCodes type="AOA" numeric="973"/>
+		<currencyCodes type="ARS" numeric="32"/>
+		<currencyCodes type="AUD" numeric="36"/>
+		<currencyCodes type="AWG" numeric="533"/>
+		<currencyCodes type="AZN" numeric="944"/>
+		<currencyCodes type="BAM" numeric="977"/>
+		<currencyCodes type="BBD" numeric="52"/>
+		<currencyCodes type="BDT" numeric="50"/>
+		<currencyCodes type="BGN" numeric="975"/>
+		<currencyCodes type="BHD" numeric="48"/>
+		<currencyCodes type="BIF" numeric="108"/>
+		<currencyCodes type="BMD" numeric="60"/>
+		<currencyCodes type="BND" numeric="96"/>
+		<currencyCodes type="BOB" numeric="68"/>
+		<currencyCodes type="BOV" numeric="984"/>
+		<currencyCodes type="BRL" numeric="986"/>
+		<currencyCodes type="BSD" numeric="44"/>
+		<currencyCodes type="BTN" numeric="64"/>
+		<currencyCodes type="BWP" numeric="72"/>
+		<currencyCodes type="BYR" numeric="974"/>
+		<currencyCodes type="BZD" numeric="84"/>
+		<currencyCodes type="CAD" numeric="124"/>
+		<currencyCodes type="CDF" numeric="976"/>
+		<currencyCodes type="CHE" numeric="947"/>
+		<currencyCodes type="CHF" numeric="756"/>
+		<currencyCodes type="CHW" numeric="948"/>
+		<currencyCodes type="CLF" numeric="990"/>
+		<currencyCodes type="CLP" numeric="152"/>
+		<currencyCodes type="CNY" numeric="156"/>
+		<currencyCodes type="COP" numeric="170"/>
+		<currencyCodes type="COU" numeric="970"/>
+		<currencyCodes type="CRC" numeric="188"/>
+		<currencyCodes type="CUC" numeric="931"/>
+		<currencyCodes type="CUP" numeric="192"/>
+		<currencyCodes type="CVE" numeric="132"/>
+		<currencyCodes type="CZK" numeric="203"/>
+		<currencyCodes type="DJF" numeric="262"/>
+		<currencyCodes type="DKK" numeric="208"/>
+		<currencyCodes type="DOP" numeric="214"/>
+		<currencyCodes type="DZD" numeric="12"/>
+		<currencyCodes type="EGP" numeric="818"/>
+		<currencyCodes type="ERN" numeric="232"/>
+		<currencyCodes type="ETB" numeric="230"/>
+		<currencyCodes type="EUR" numeric="978"/>
+		<currencyCodes type="FJD" numeric="242"/>
+		<currencyCodes type="FKP" numeric="238"/>
+		<currencyCodes type="GBP" numeric="826"/>
+		<currencyCodes type="GEL" numeric="981"/>
+		<currencyCodes type="GHS" numeric="936"/>
+		<currencyCodes type="GIP" numeric="292"/>
+		<currencyCodes type="GMD" numeric="270"/>
+		<currencyCodes type="GNF" numeric="324"/>
+		<currencyCodes type="GTQ" numeric="320"/>
+		<currencyCodes type="GYD" numeric="328"/>
+		<currencyCodes type="HKD" numeric="344"/>
+		<currencyCodes type="HNL" numeric="340"/>
+		<currencyCodes type="HRK" numeric="191"/>
+		<currencyCodes type="HTG" numeric="332"/>
+		<currencyCodes type="HUF" numeric="348"/>
+		<currencyCodes type="IDR" numeric="360"/>
+		<currencyCodes type="ILS" numeric="376"/>
+		<currencyCodes type="INR" numeric="356"/>
+		<currencyCodes type="IQD" numeric="368"/>
+		<currencyCodes type="IRR" numeric="364"/>
+		<currencyCodes type="ISK" numeric="352"/>
+		<currencyCodes type="JMD" numeric="388"/>
+		<currencyCodes type="JOD" numeric="400"/>
+		<currencyCodes type="JPY" numeric="392"/>
+		<currencyCodes type="KES" numeric="404"/>
+		<currencyCodes type="KGS" numeric="417"/>
+		<currencyCodes type="KHR" numeric="116"/>
+		<currencyCodes type="KMF" numeric="174"/>
+		<currencyCodes type="KPW" numeric="408"/>
+		<currencyCodes type="KRW" numeric="410"/>
+		<currencyCodes type="KWD" numeric="414"/>
+		<currencyCodes type="KYD" numeric="136"/>
+		<currencyCodes type="KZT" numeric="398"/>
+		<currencyCodes type="LAK" numeric="418"/>
+		<currencyCodes type="LBP" numeric="422"/>
+		<currencyCodes type="LKR" numeric="144"/>
+		<currencyCodes type="LRD" numeric="430"/>
+		<currencyCodes type="LSL" numeric="426"/>
+		<currencyCodes type="LTL" numeric="440"/>
+		<currencyCodes type="LYD" numeric="434"/>
+		<currencyCodes type="MAD" numeric="504"/>
+		<currencyCodes type="MDL" numeric="498"/>
+		<currencyCodes type="MGA" numeric="969"/>
+		<currencyCodes type="MKD" numeric="807"/>
+		<currencyCodes type="MMK" numeric="104"/>
+		<currencyCodes type="MNT" numeric="496"/>
+		<currencyCodes type="MOP" numeric="446"/>
+		<currencyCodes type="MRO" numeric="478"/>
+		<currencyCodes type="MUR" numeric="480"/>
+		<currencyCodes type="MVR" numeric="462"/>
+		<currencyCodes type="MWK" numeric="454"/>
+		<currencyCodes type="MXN" numeric="484"/>
+		<currencyCodes type="MXV" numeric="979"/>
+		<currencyCodes type="MYR" numeric="458"/>
+		<currencyCodes type="MZN" numeric="943"/>
+		<currencyCodes type="NAD" numeric="516"/>
+		<currencyCodes type="NGN" numeric="566"/>
+		<currencyCodes type="NIO" numeric="558"/>
+		<currencyCodes type="NOK" numeric="578"/>
+		<currencyCodes type="NPR" numeric="524"/>
+		<currencyCodes type="NZD" numeric="554"/>
+		<currencyCodes type="OMR" numeric="512"/>
+		<currencyCodes type="PAB" numeric="590"/>
+		<currencyCodes type="PEN" numeric="604"/>
+		<currencyCodes type="PGK" numeric="598"/>
+		<currencyCodes type="PHP" numeric="608"/>
+		<currencyCodes type="PKR" numeric="586"/>
+		<currencyCodes type="PLN" numeric="985"/>
+		<currencyCodes type="PYG" numeric="600"/>
+		<currencyCodes type="QAR" numeric="634"/>
+		<currencyCodes type="RON" numeric="946"/>
+		<currencyCodes type="RSD" numeric="941"/>
+		<currencyCodes type="RUB" numeric="643"/>
+		<currencyCodes type="RWF" numeric="646"/>
+		<currencyCodes type="SAR" numeric="682"/>
+		<currencyCodes type="SBD" numeric="90"/>
+		<currencyCodes type="SCR" numeric="690"/>
+		<currencyCodes type="SDG" numeric="938"/>
+		<currencyCodes type="SEK" numeric="752"/>
+		<currencyCodes type="SGD" numeric="702"/>
+		<currencyCodes type="SHP" numeric="654"/>
+		<currencyCodes type="SLL" numeric="694"/>
+		<currencyCodes type="SOS" numeric="706"/>
+		<currencyCodes type="SRD" numeric="968"/>
+		<currencyCodes type="SSP" numeric="728"/>
+		<currencyCodes type="STD" numeric="678"/>
+		<currencyCodes type="SYP" numeric="760"/>
+		<currencyCodes type="SZL" numeric="748"/>
+		<currencyCodes type="THB" numeric="764"/>
+		<currencyCodes type="TJS" numeric="972"/>
+		<currencyCodes type="TMT" numeric="934"/>
+		<currencyCodes type="TND" numeric="788"/>
+		<currencyCodes type="TOP" numeric="776"/>
+		<currencyCodes type="TRY" numeric="949"/>
+		<currencyCodes type="TTD" numeric="780"/>
+		<currencyCodes type="TWD" numeric="901"/>
+		<currencyCodes type="TZS" numeric="834"/>
+		<currencyCodes type="UAH" numeric="980"/>
+		<currencyCodes type="UGX" numeric="800"/>
+		<currencyCodes type="USD" numeric="840"/>
+		<currencyCodes type="USN" numeric="997"/>
+		<currencyCodes type="UYI" numeric="940"/>
+		<currencyCodes type="UYU" numeric="858"/>
+		<currencyCodes type="UZS" numeric="860"/>
+		<currencyCodes type="VEF" numeric="937"/>
+		<currencyCodes type="VND" numeric="704"/>
+		<currencyCodes type="VUV" numeric="548"/>
+		<currencyCodes type="WST" numeric="882"/>
+		<currencyCodes type="XAF" numeric="950"/>
+		<currencyCodes type="XAG" numeric="961"/>
+		<currencyCodes type="XAU" numeric="959"/>
+		<currencyCodes type="XBA" numeric="955"/>
+		<currencyCodes type="XBB" numeric="956"/>
+		<currencyCodes type="XBC" numeric="957"/>
+		<currencyCodes type="XBD" numeric="958"/>
+		<currencyCodes type="XCD" numeric="951"/>
+		<currencyCodes type="XDR" numeric="960"/>
+		<currencyCodes type="XOF" numeric="952"/>
+		<currencyCodes type="XPD" numeric="964"/>
+		<currencyCodes type="XPF" numeric="953"/>
+		<currencyCodes type="XPT" numeric="962"/>
+		<currencyCodes type="XSU" numeric="994"/>
+		<currencyCodes type="XTS" numeric="963"/>
+		<currencyCodes type="XUA" numeric="965"/>
+		<currencyCodes type="XXX" numeric="999"/>
+		<currencyCodes type="YER" numeric="886"/>
+		<currencyCodes type="ZAR" numeric="710"/>
+		<currencyCodes type="ZMW" numeric="967"/>
     </codeMappings>
 
 	<parentLocales>
-		<parentLocale parent="root" locales="az_Cyrl bm_Nkoo bs_Cyrl en_Dsrt en_Shaw ha_Arab iu_Latn mn_Mong ms_Arab pa_Arab shi_Latn sr_Latn uz_Arab uz_Cyrl vai_Latn zh_Hant"/>
-		<parentLocale parent="en_001" locales="en_150 en_AG en_AI en_AU en_BB en_BE en_BM en_BS en_BW en_BZ en_CA en_CC en_CK en_CM en_CX en_DG en_DM en_ER en_FJ en_FK en_FM en_GB en_GD en_GG en_GH en_GI en_GM en_GY en_HK en_IE en_IM en_IN en_IO en_JE en_JM en_KE en_KI en_KN en_KY en_LC en_LR en_LS en_MG en_MO en_MS en_MT en_MU en_MW en_MY en_NA en_NF en_NG en_NR en_NU en_NZ en_PG en_PH en_PK en_PN en_PW en_RW en_SB en_SC en_SD en_SG en_SH en_SL en_SS en_SX en_SZ en_TC en_TK en_TO en_TT en_TV en_TZ en_UG en_VC en_VG en_VU en_WS en_ZA en_ZM en_ZW"/>
-		<parentLocale parent="es_419" locales="es_AR es_BO es_CL es_CO es_CR es_CU es_DO es_EC es_GT es_HN es_MX es_NI es_PA es_PE es_PR es_PY es_SV es_US es_UY es_VE"/>
-		<parentLocale parent="pt_PT" locales="pt_AO pt_CV pt_GW pt_MO pt_MZ pt_ST pt_TL"/>
+		<parentLocale parent="root" locales="az_Arab az_Cyrl bm_Nkoo bs_Cyrl en_Dsrt en_Shaw ha_Arab iu_Latn mn_Mong ms_Arab pa_Arab shi_Latn sr_Latn uz_Arab uz_Cyrl vai_Latn zh_Hant yue_Hans"/>
+		<parentLocale parent="en_001" locales="en_150 en_AG en_AI en_AU en_BB en_BE en_BM en_BS en_BW en_BZ en_CA en_CC en_CK en_CM en_CX en_CY en_DG en_DM en_ER en_FJ en_FK en_FM en_GB en_GD en_GG en_GH en_GI en_GM en_GY en_HK en_IE en_IL en_IM en_IN en_IO en_JE en_JM en_KE en_KI en_KN en_KY en_LC en_LR en_LS en_MG en_MO en_MS en_MT en_MU en_MW en_MY en_NA en_NF en_NG en_NR en_NU en_NZ en_PG en_PH en_PK en_PN en_PW en_RW en_SB en_SC en_SD en_SG en_SH en_SL en_SS en_SX en_SZ en_TC en_TK en_TO en_TT en_TV en_TZ en_UG en_VC en_VG en_VU en_WS en_ZA en_ZM en_ZW"/>
+		<parentLocale parent="en_150" locales="en_AT en_CH en_DE en_DK en_FI en_NL en_SE en_SI"/>
+		<parentLocale parent="es_419" locales="es_AR es_BO es_BR es_CL es_CO es_CR es_CU es_DO es_EC es_GT es_HN es_MX es_NI es_PA es_PE es_PR es_PY es_SV es_US es_UY es_VE"/>
+		<parentLocale parent="pt_PT" locales="pt_AO pt_CH pt_CV pt_GQ pt_GW pt_LU pt_MO pt_MZ pt_ST pt_TL"/>
 		<parentLocale parent="zh_Hant_HK" locales="zh_Hant_MO"/>
 	</parentLocales>
 	
@@ -5273,7 +5438,7 @@ XXX Code for transations where no currency is involved
 		<reference type="R1102" uri="http://www.lmp.ucla.edu/Profile.aspx?menu=004&amp;LangID=201">- Not widely used; set to 10%.</reference>
 		<reference type="R1103" uri="http://www.ethnologue.com/show_language.asp?code=srn">The lingua franca of 80% of the population</reference>
 		<reference type="R1104" uri="http://www.ethnologue.com/show_language.asp?code=bem">[missing]</reference>
-		<reference type="R1105" uri="http://www.ethnologue.com/show_language.asp?code=mos">Also called Mòoré</reference>
+		<reference type="R1105" uri="https://www.ethnologue.com/language/mro">and https://en.wikipedia.org/wiki/Mru_language</reference>
 		<reference type="R1106" uri="http://en.wikipedia.org/wiki/Languages_of_Pakistan">- More than 95% of Pakistanis can speak or understand Urdu as their second or third language</reference>
 		<reference type="R1107" uri="http://en.wikipedia.org/wiki/Pashto_language">15.42% of population</reference>
 		<reference type="R1108" uri="http://windowoneurasia2.blogspot.com/2013/12/window-on-eurasia-de-russianization.html">http://www.stoletie.ru/vzglyad/derusifikacija_nabirajet_oboroty_934.htm</reference>
@@ -5377,6 +5542,7 @@ XXX Code for transations where no currency is involved
 		<reference type="R1206" uri="http://en.wikipedia.org/wiki/Turkish_language#Geographic_distribution">http://ec.europa.eu/public_opinion/archives/ebs/ebs_243_en.pdf Europeans and their languages survey, page 7</reference>
 		<reference type="R1207" uri="http://www12.statcan.ca/census-recensement/2006/dp-pd/tbt/Rp-eng.cfm?LANG=E&amp;APATH=3&amp;DETAIL=0&amp;DIM=0&amp;FL=A&amp;FREE=0&amp;GC=0&amp;GID=837928&amp;GK=0&amp;GRP=1&amp;PID=89189&amp;PRID=0&amp;PTYPE=88971,97154&amp;S=0&amp;SHOWALL=0&amp;SUB=0&amp;Temporal=2006&amp;THEME=70&amp;VID=0&amp;VNAMEE=&amp;VNAMEF=">[missing]</reference>
 		<reference type="R1208" uri="http://www.ethnologue.com/language/nnh">1st lang literacy 8%</reference>
+		<reference type="R1209" uri="http://www.ethnologue.com/language/bgn">low literacy</reference>
 		<reference type="R1210">percentage calculated from http://www.spanishcourses.info/Mains/SpanishSpoken_EN.htm , see also http://www.spanishseo.org/resources/worldwide-spanish-speaking-population</reference>
 		<reference type="R1211" uri="https://www.cia.gov/library/publications/the-world-factbook/geos/gr.html">[missing]</reference>
 		<reference type="R1212">www.amar.org.ir</reference>
@@ -5386,7 +5552,6 @@ XXX Code for transations where no currency is involved
 		<reference type="R1216">This is base pop for &quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;fub&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot; lang code; ff shows as a macrolanguage</reference>
 		<reference type="R1217" uri="http://www.ethnologue.com/language/bkm">[missing]</reference>
 		<reference type="R1218" uri="http://en.wikipedia.org/wiki/Vietnamese_language">(could be higher if 2nd lang included; no data yet)</reference>
-		<reference type="R1219" uri="http://en.wikipedia.org/wiki/Languages_of_Brunei">Modern use of Arabic (Jawi) seems to be minimal, but is co-official with ms_Latn; set to 5% for now.</reference>
 		<reference type="R1220">​http://www.interlingua.com/statutos leading Interlingua assoc &quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;Union Mundial pro Interlingua&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot; registered French non-profit - real user pop figure is unknown but low</reference>
 		<reference type="R1221" uri="https://www.cia.gov/library/publications/the-world-factbook/geos/cc.html">[missing]</reference>
 		<reference type="R1222" uri="http://www.ethnologue.com/show_language.asp?code=dsb">pop 7k. Figure is questionable writing pop artificially set to 5% see also http://en.wikipedia.org/wiki/Lower_Sorbian</reference>
@@ -5396,7 +5561,7 @@ XXX Code for transations where no currency is involved
 		<reference type="R1226" uri="http://www.ethnologue.com/show_language.asp?code=saf">no other info available for now</reference>
 		<reference type="R1227" uri="http://en.wikipedia.org/wiki/Guatemala#Language">https://www.cia.gov/cia/publications/factbook/geos/gt.html Spanish official</reference>
 		<reference type="R1228" uri="http://www.ethnologue.com/show_language.asp?code=rkt">language also called Kamta in India</reference>
-		<reference type="R1229" uri="http://www.ethnologue.com/show_language.asp?code=cld">(&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;syr&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot; is a macrolang containing &quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;cld&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot; and &quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;aii&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;)</reference>
+		<reference type="R1229" uri="http://en.wikipedia.org/wiki/Languages_of_Brunei">Modern use of Arabic (Jawi) seems to be minimal, but is co-official with ms; set to 5% for now.</reference>
 		<reference type="R1230" uri="http://en.wikipedia.org/wiki/Khmu_language">[missing]</reference>
 		<reference type="R1231" uri="http://en.wikipedia.org/wiki/Kuy_language">[missing]</reference>
 		<reference type="R1232" uri="http://www.ethnologue.com/show_language.asp?code=rjs">[missing]</reference>
@@ -5465,7 +5630,6 @@ XXX Code for transations where no currency is involved
 		<reference type="R1295" uri="http://www.orbilat.com/Languages/Venetan/Venetan.html">- est 50% pop of Veneto area</reference>
 		<reference type="R1296">5% mainly spoken</reference>
 		<reference type="R1297" uri="http://en.wikipedia.org/wiki/Wolof_language">[missing]</reference>
-		<reference type="R1298">No estimate available</reference>
 		<reference type="R1299" uri="http://en.wikipedia.org/wiki/Fiji_Hindi">[missing]</reference>
 		<reference type="R1300" uri="http://www.ethnologue.com/language/frs">Moribund language</reference>
 		<reference type="R1301" uri="http://www.ethnologue.com/language/lad">[missing]</reference>
@@ -5474,5 +5638,21 @@ XXX Code for transations where no currency is involved
 		<reference type="R1304" uri="http://de.statista.com/statistik/daten/studie/1138/umfrage/fremdsprachenkenntnisse/">[missing]</reference>
 		<reference type="R1305" uri="http://www.ethnologue.com/language/aln">[missing]</reference>
 		<reference type="R1306" uri="http://www.bevoelkerungsschutz-portal.de/SharedDocs/Downloads/DE/Broschueren/2008/Regional_und_Minderheitensprachen.pdf">[missing]</reference>
+		<reference type="R1307" uri="http://www.ethnologue.com/show_language.asp?code=mos">Also called Moré</reference>
+		<reference type="R1308" uri="http://www.iwacu-burundi.org/blogs/english/english-is-now-official-language-of-burundi/">Newly designated official, not so widely used</reference>
+		<reference type="R1309" uri="https://en.wikipedia.org/wiki/Faroese_language">[missing]</reference>
+		<reference type="R1310" uri="http://www.ethnologue.com/language/lrc">[missing]</reference>
+		<reference type="R1311" uri="http://www.ethnologue.com/show_language.asp?code=cld">syr is a macrolang containing cld and aii)</reference>
+		<reference type="R1312" uri="http://www.ethnologue.com/language/sdh">[missing]</reference>
+		<reference type="R1313" uri="https://www.ethnologue.com/language/wni">[missing]</reference>
+		<reference type="R1314" uri="http://www.axl.cefan.ulaval.ca/afrique/soudan.htm">[missing]</reference>
+		<reference type="R1315" uri="https://en.wikipedia.org/wiki/Languages_of_Brazil">[missing]</reference>
+		<reference type="R1316" uri="http://www.bfs.admin.ch/bfs/portal/en/index/themen/01/05/blank/key/sprachen.html">[missing]</reference>
+		<reference type="R1317">about 50% of population in Guangzhou Prov</reference>
+		<reference type="R1318" uri="https://en.wikipedia.org/wiki/Bavarian_language">Widely spoken less written, and most speakers know standard German as well</reference>
+		<reference type="R1320" uri="https://www.cia.gov/library/publications/the-world-factbook/geos/hk.html">and https://www.ethnologue.com/language/yue</reference>
+		<reference type="R1321" uri="https://en.wikipedia.org/wiki/Portuguese_Luxembourger">[missing]</reference>
+		<reference type="R1322" uri="https://en.wikipedia.org/wiki/Doteli_language">[missing]</reference>
+		<reference type="R1323" uri="https://en.wikipedia.org/wiki/Immigration_to_Portugal#Immigration">[missing]</reference>
 	</references>
 </supplementalData>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/supplementalMetadata.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/supplementalMetadata.xml
new file mode 100644
index 00000000000..ddd39ee1697
--- /dev/null
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/supplementalMetadata.xml
@@ -0,0 +1,1244 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.dtd">
+<!--
+Copyright © 1991-2014 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+
+<supplementalData>
+    <version number="$Revision: 12404 $"/>
+    <metadata>
+        <serialElements>
+            attributeValues attributes base comment context exception extend i ic languageMatch last_non_ignorable last_secondary_ignorable last_tertiary_ignorable optimize p pc pluralRule rbnfrule reset rules ruleset s sc settings substitute suppress_contractions suppression t tRule tc variable x
+        </serialElements>
+        <suppress>
+            <attributes attribute="_q"/>
+            <attributes element="collation" attribute="type" attributeValue="standard"/>
+            <attributes element="currency" attribute="type" attributeValue="standard"/>
+            <attributes element="dateFormat" attribute="type" attributeValue="standard"/>
+            <attributes element="dateTimeFormat" attribute="type" attributeValue="standard"/>
+            <attributes element="decimalFormat" attribute="type" attributeValue="standard"/>
+            <attributes element="ldml" attribute="version"/>
+            <attributes element="orientation" attribute="characters" attributeValue="left-to-right"/>
+            <attributes element="orientation" attribute="lines" attributeValue="top-to-bottom"/>
+            <attributes element="pattern" attribute="type" attributeValue="standard"/>
+            <attributes element="percentFormat" attribute="type" attributeValue="standard"/>
+            <attributes element="scientificFormat" attribute="type" attributeValue="standard"/>
+            <attributes element="timeFormat" attribute="type" attributeValue="standard"/>
+            <attributes element="weekendEnd" attribute="time" attributeValue="24:00"/>
+            <attributes element="weekendStart" attribute="time" attributeValue="00:00"/>
+        </suppress>
+        <alias>
+            <!-- grandfathered BCP47 codes -->
+            <languageAlias type="art_lojban" replacement="jbo" reason="deprecated"/> <!-- Lojban -->
+            <languageAlias type="i_ami" replacement="ami" reason="deprecated"/> <!-- Amis -->
+            <languageAlias type="i_bnn" replacement="bnn" reason="deprecated"/> <!-- Bunun -->
+            <languageAlias type="i_hak" replacement="hak" reason="deprecated"/> <!-- Hakka -->
+            <languageAlias type="i_klingon" replacement="tlh" reason="deprecated"/> <!-- Klingon -->
+            <languageAlias type="i_lux" replacement="lb" reason="deprecated"/> <!-- Luxembourgish -->
+            <languageAlias type="i_navajo" replacement="nv" reason="deprecated"/> <!-- Navajo -->
+            <languageAlias type="i_pwn" replacement="pwn" reason="deprecated"/> <!-- Paiwan -->
+            <languageAlias type="i_tao" replacement="tao" reason="deprecated"/> <!-- Tao -->
+            <languageAlias type="i_tay" replacement="tay" reason="deprecated"/> <!-- Tayal -->
+            <languageAlias type="i_tsu" replacement="tsu" reason="deprecated"/> <!-- Tsou -->
+            <languageAlias type="no_bok" replacement="nb" reason="deprecated"/> <!-- Norwegian Bokmal -->
+            <languageAlias type="no_nyn" replacement="nn" reason="deprecated"/> <!-- Norwegian Nynorsk -->
+            <languageAlias type="sgn_BE_FR" replacement="sfb" reason="deprecated"/> <!-- Belgian-French Sign Language -->
+            <languageAlias type="sgn_BE_NL" replacement="vgt" reason="deprecated"/> <!-- Belgian-Flemish Sign Language -->
+            <languageAlias type="sgn_CH_DE" replacement="sgg" reason="deprecated"/> <!-- Swiss German Sign Language -->
+            <languageAlias type="zh_guoyu" replacement="zh" reason="deprecated"/> <!-- Mandarin or Standard Chinese -->
+            <languageAlias type="zh_hakka" replacement="hak" reason="deprecated"/> <!-- Hakka -->
+            <languageAlias type="zh_min_nan" replacement="nan" reason="deprecated"/> <!-- Minnan, Hokkien, Amoy, Taiwanese, Southern Min, Southern Fujian, Hoklo, Southern Fukien, Ho-lo -->
+            <languageAlias type="zh_xiang" replacement="hsn" reason="deprecated"/> <!-- Xiang or Hunanese -->
+            <!-- deprecated iso codes -->
+            <languageAlias type="in" replacement="id" reason="deprecated"/> <!-- Indonesian -->
+            <languageAlias type="iw" replacement="he" reason="deprecated"/> <!-- Hebrew -->
+            <languageAlias type="ji" replacement="yi" reason="deprecated"/> <!-- Yiddish -->
+            <languageAlias type="jw" replacement="jv" reason="deprecated"/> <!-- Javanese -->
+            <languageAlias type="mo" replacement="ro_MD" reason="deprecated"/> <!-- Moldovan -->
+            <languageAlias type="scc" replacement="sr" reason="deprecated"/> <!-- Serbian --> 
+            <languageAlias type="scr" replacement="hr" reason="deprecated"/> <!-- Croatian -->
+            <!-- miscellaneous deprecated -->
+            <languageAlias type="no_BOKMAL" replacement="nb" reason="deprecated"/>
+            <languageAlias type="no_NYNORSK" replacement="nn" reason="deprecated"/>
+            <languageAlias type="aa_SAAHO" replacement="ssy" reason="deprecated"/>
+            <!-- legacy use -->
+            <languageAlias type="sh" replacement="sr_Latn" reason="legacy"/> <!-- Serbo-Croatian -->
+            <languageAlias type="no" replacement="nb" reason="legacy"/> <!-- Norwegian -->
+            <languageAlias type="tl" replacement="fil" reason="legacy"/> <!-- Tagalog -->
+    		<languageAlias type="az_AZ" replacement="az_Latn_AZ" reason="legacy"/>
+    		<languageAlias type="bs_BA" replacement="bs_Latn_BA"  reason="legacy"/>
+    		<languageAlias type="ha_Latn_GH" replacement="ha_GH" reason="legacy"/>
+    		<languageAlias type="ha_Latn_NE" replacement="ha_NE" reason="legacy"/>
+    		<languageAlias type="ha_Latn_NG" replacement="ha_NG" reason="legacy"/>
+    		<languageAlias type="kk_Cyrl_KZ" replacement="kk_KZ"  reason="legacy"/>
+    		<languageAlias type="ky_Cyrl_KG" replacement="ky_KG"  reason="legacy"/>
+    		<languageAlias type="ks_Arab_IN" replacement="ks_IN"  reason="legacy"/>
+    		<languageAlias type="mn_Cyrl_MN" replacement="mn_MN" reason="legacy"/>
+    		<languageAlias type="ms_Latn_BN" replacement="ms_BN" reason="legacy"/>
+    		<languageAlias type="ms_Latn_MY" replacement="ms_MY" reason="legacy"/>
+    		<languageAlias type="ms_Latn_SG" replacement="ms_SG" reason="legacy"/>
+    		<languageAlias type="pa_IN" replacement="pa_Guru_IN" reason="legacy"/>
+    		<languageAlias type="pa_PK" replacement="pa_Arab_PK" reason="legacy"/>
+    		<languageAlias type="shi_MA" replacement="shi_Tfng_MA" reason="legacy"/>
+    		<languageAlias type="sr_BA" replacement="sr_Cyrl_BA" reason="legacy"/>
+    		<languageAlias type="sr_ME" replacement="sr_Latn_ME" reason="legacy"/>
+    		<languageAlias type="sr_RS" replacement="sr_Cyrl_RS" reason="legacy"/>
+    		<languageAlias type="sr_XK" replacement="sr_Cyrl_XK" reason="legacy"/>
+    		<languageAlias type="tzm_Latn_MA" replacement="tzm_MA" reason="legacy"/>
+    		<languageAlias type="ug_Arab_CN" replacement="ug_CN"  reason="legacy"/>
+    		<languageAlias type="uz_AF" replacement="uz_Arab_AF" reason="legacy"/>
+    		<languageAlias type="uz_UZ" replacement="uz_Latn_UZ" reason="legacy"/>
+    		<languageAlias type="vai_LR" replacement="vai_Vaii_LR" reason="legacy"/>
+    		<languageAlias type="zh_CN" replacement="zh_Hans_CN" reason="legacy"/>
+    		<languageAlias type="zh_HK" replacement="zh_Hant_HK" reason="legacy"/>
+    		<languageAlias type="zh_MO" replacement="zh_Hant_MO" reason="legacy"/>
+    		<languageAlias type="zh_SG" replacement="zh_Hans_SG" reason="legacy"/>
+    		<languageAlias type="zh_TW" replacement="zh_Hant_TW" reason="legacy"/>
+            <!-- macrolanguages -->
+			<languageAlias type="aju" replacement="jrb" reason="macrolanguage"/> <!-- Moroccan Judeo-Arabic ⇒ Judeo-Arabic -->
+			<languageAlias type="als" replacement="sq" reason="macrolanguage"/> <!-- Albanian, Tosk ⇒ Albanian -->
+			<languageAlias type="arb" replacement="ar" reason="macrolanguage"/> <!-- Standard Arabic ⇒ Arabic -->
+			<languageAlias type="ayr" replacement="ay" reason="macrolanguage"/> <!-- Aymara, Central ⇒ Aymara -->
+			<languageAlias type="azj" replacement="az" reason="macrolanguage"/> <!-- Azerbaijani, North ⇒ Azerbaijani -->
+			<languageAlias type="bcc" replacement="bal" reason="macrolanguage"/> <!-- Balochi, Southern ⇒ Baluchi -->
+			<languageAlias type="bcl" replacement="bik" reason="macrolanguage"/> <!-- Bicolano, Central ⇒ Bikol -->
+			<languageAlias type="bxk" replacement="luy" reason="macrolanguage"/> <!-- Lubukusu ⇒ Luyia -->
+			<languageAlias type="bxr" replacement="bua" reason="macrolanguage"/> <!-- Buriat, Russia ⇒ Buriat -->
+			<languageAlias type="cld" replacement="syr" reason="macrolanguage"/> <!-- Chaldean Neo-Aramaic ⇒ Syriac -->
+			<languageAlias type="cmn" replacement="zh" reason="macrolanguage"/> <!-- Mandarin Chinese ⇒ Chinese -->
+			<languageAlias type="cwd" replacement="cr" reason="macrolanguage"/> <!-- Cree, Woods ⇒ Cree -->
+			<languageAlias type="dgo" replacement="doi" reason="macrolanguage"/> <!-- Dogri ⇒ Dogri (macrolanguage) -->
+			<languageAlias type="dhd" replacement="mwr" reason="macrolanguage"/> <!-- Dhundari ⇒ Marwari -->
+			<languageAlias type="dik" replacement="din" reason="macrolanguage"/> <!-- Southwestern Dinka ⇒ Dinka -->
+			<languageAlias type="diq" replacement="zza" reason="macrolanguage"/> <!-- Dimli ⇒ Zaza -->
+			<languageAlias type="lbk" replacement="bnc" reason="macrolanguage"/> <!-- Central Bontok ⇒ Bontok -->
+			<languageAlias type="ekk" replacement="et" reason="macrolanguage"/> <!-- Standard Estonian ⇒ Estonian -->
+			<languageAlias type="emk" replacement="man" reason="macrolanguage"/> <!-- Maninkakan, Eastern ⇒ Mandingo -->
+			<languageAlias type="esk" replacement="ik" reason="macrolanguage"/> <!-- Northwest Alaska Inupiatun ⇒ Inupiaq -->
+			<languageAlias type="fat" replacement="ak" reason="macrolanguage"/> <!-- Fanti ⇒ Akan -->
+			<languageAlias type="fuc" replacement="ff" reason="macrolanguage"/> <!-- Pular ⇒ Fulah -->
+			<languageAlias type="gaz" replacement="om" reason="macrolanguage"/> <!-- Oromo, West Central ⇒ Oromo -->
+			<languageAlias type="gbo" replacement="grb" reason="macrolanguage"/> <!-- Northern Grebo ⇒ Grebo -->
+			<languageAlias type="gno" replacement="gon" reason="macrolanguage"/> <!-- Northern Gondi ⇒ Gondi -->
+			<languageAlias type="gug" replacement="gn" reason="macrolanguage"/> <!-- Paraguayan Guarani ⇒ Guarani -->
+			<languageAlias type="gya" replacement="gba" reason="macrolanguage"/> <!-- Northwest Gbaya ⇒ Gbaya (Central African Republic) -->
+			<languageAlias type="hdn" replacement="hai" reason="macrolanguage"/> <!-- Northern Haida ⇒ Haida -->
+			<languageAlias type="hea" replacement="hmn" reason="macrolanguage"/> <!-- Northern Qiandong Miao ⇒ Hmong -->
+			<languageAlias type="ike" replacement="iu" reason="macrolanguage"/> <!-- Eastern Canadian Inuktitut ⇒ Inuktitut -->
+			<languageAlias type="kmr" replacement="ku" reason="macrolanguage"/> <!-- Northern Kurdish ⇒ Kurdish -->
+			<languageAlias type="knc" replacement="kr" reason="macrolanguage"/> <!-- Central Kanuri ⇒ Kanuri -->
+			<languageAlias type="kng" replacement="kg" reason="macrolanguage"/> <!-- Koongo ⇒ Kongo -->
+			<languageAlias type="knn" replacement="kok" reason="macrolanguage"/> <!-- Konkani (individual language) ⇒ Konkani -->
+			<languageAlias type="kpv" replacement="kv" reason="macrolanguage"/> <!-- Komi-Zyrian ⇒ Komi -->
+			<languageAlias type="lvs" replacement="lv" reason="macrolanguage"/> <!-- Standard Latvian ⇒ Latvian -->
+			<languageAlias type="mhr" replacement="chm" reason="macrolanguage"/> <!-- Mari, Eastern ⇒ Mari (Russia) -->
+			<languageAlias type="mup" replacement="raj" reason="macrolanguage"/> <!-- Malvi ⇒ Rajasthani -->
+			<languageAlias type="khk" replacement="mn" reason="macrolanguage"/> <!-- Halh Mongolian [mainly in Cyrillic] ⇒ Mongolian -->
+			<languageAlias type="npi" replacement="ne" reason="macrolanguage"/> <!-- Nepali (Individual language) ⇒ Nepali -->
+			<languageAlias type="ojg" replacement="oj" reason="macrolanguage"/> <!-- Ojibwa, Eastern ⇒ Ojibwa -->
+			<languageAlias type="ory" replacement="or" reason="macrolanguage"/> <!-- Oriya (Individual language) ⇒ Oriya -->
+			<languageAlias type="pbu" replacement="ps" reason="macrolanguage"/> <!-- Pashto, Northern ⇒ Pushto -->
+			<languageAlias type="pes" replacement="fa" reason="macrolanguage"/> <!-- Western Farsi ⇒ Persian -->
+			<languageAlias type="plt" replacement="mg" reason="macrolanguage"/> <!-- Malagasy, Plateau ⇒ Malagasy -->
+			<languageAlias type="pnb" replacement="lah" reason="macrolanguage"/> <!-- Western Panjabi ⇒ Lahnda -->
+			<languageAlias type="quz" replacement="qu" reason="macrolanguage"/> <!-- Quechua, Cusco ⇒ Quechua -->
+			<languageAlias type="rmy" replacement="rom" reason="macrolanguage"/> <!-- Romani, Vlax ⇒ Romany -->
+			<languageAlias type="spy" replacement="kln" reason="macrolanguage"/> <!-- Sabaot ⇒ Kalenjin -->
+			<languageAlias type="src" replacement="sc" reason="macrolanguage"/> <!-- Sardinian, Logudorese ⇒ Sardinian -->
+			<languageAlias type="swh" replacement="sw" reason="macrolanguage"/> <!-- Swahili (individual language) ⇒ Swahili -->
+			<languageAlias type="ttq" replacement="tmh" reason="macrolanguage"/> <!-- Tamajaq, Tawallammat ⇒ Tamashek -->
+			<languageAlias type="tw" replacement="ak" reason="macrolanguage"/> <!-- Twi ⇒ Akan -->
+			<languageAlias type="umu" replacement="del" reason="macrolanguage"/> <!-- Munsee ⇒ Delaware -->
+			<languageAlias type="uzn" replacement="uz" reason="macrolanguage"/> <!-- Northern Uzbek ⇒ Uzbek -->
+			<languageAlias type="xpe" replacement="kpe" reason="macrolanguage"/> <!-- Kpelle, Liberia ⇒ Kpelle -->
+			<languageAlias type="xsl" replacement="den" reason="macrolanguage"/> <!-- Slavey, South ⇒ Slave (Athapascan) -->
+			<languageAlias type="ydd" replacement="yi" reason="macrolanguage"/> <!-- Yiddish, Eastern ⇒ Yiddish -->
+			<languageAlias type="zai" replacement="zap" reason="macrolanguage"/> <!-- Zapotec, Isthmus ⇒ Zapotec -->
+			<languageAlias type="zsm" replacement="ms" reason="macrolanguage"/> <!-- Standard Malay ⇒ Malay -->
+			<languageAlias type="zyb" replacement="za" reason="macrolanguage"/> <!-- Yongbei Zhuang ⇒ Zhuang -->
+			<languageAlias type="him" replacement="srx" reason="macrolanguage"/> <!-- Himachali ⇒ Sirmauri (= Pahari, Himachali) -->
+			<languageAlias type="mnk" replacement="man" reason="macrolanguage"/> <!-- Mandinka ⇒ Mandingo -->
+			<!-- incorrect three-letter language codes -->
+            <!-- start of data generated with CountItems tool per http://sites.google.com/site/cldr/development/updating-codes/update-languagescriptregion-subtags -->
+			<languageAlias type="aar" replacement="aa" reason="overlong"/> <!-- [Afar] -->
+			<languageAlias type="abk" replacement="ab" reason="overlong"/> <!-- [Abkhazian] -->
+			<languageAlias type="ave" replacement="ae" reason="overlong"/> <!-- [Avestan] -->
+			<languageAlias type="afr" replacement="af" reason="overlong"/> <!-- [Afrikaans] -->
+			<languageAlias type="aka" replacement="ak" reason="overlong"/> <!-- [Akan] -->
+			<languageAlias type="amh" replacement="am" reason="overlong"/> <!-- [Amharic] -->
+			<languageAlias type="arg" replacement="an" reason="overlong"/> <!-- [Aragonese] -->
+			<languageAlias type="ara" replacement="ar" reason="overlong"/> <!-- [Arabic] -->
+			<languageAlias type="asm" replacement="as" reason="overlong"/> <!-- [Assamese] -->
+			<languageAlias type="ava" replacement="av" reason="overlong"/> <!-- [Avaric] -->
+			<languageAlias type="aym" replacement="ay" reason="overlong"/> <!-- [Aymara] -->
+			<languageAlias type="aze" replacement="az" reason="overlong"/> <!-- [Azerbaijani] -->
+			<languageAlias type="bak" replacement="ba" reason="overlong"/> <!-- [Bashkir] -->
+			<languageAlias type="bel" replacement="be" reason="overlong"/> <!-- [Belarusian] -->
+			<languageAlias type="bul" replacement="bg" reason="overlong"/> <!-- [Bulgarian] -->
+			<languageAlias type="bih" replacement="bh" reason="overlong"/> <!-- [Bihari] -->
+			<languageAlias type="bis" replacement="bi" reason="overlong"/> <!-- [Bislama] -->
+			<languageAlias type="bam" replacement="bm" reason="overlong"/> <!-- [Bambara] -->
+			<languageAlias type="ben" replacement="bn" reason="overlong"/> <!-- [Bengali] -->
+			<languageAlias type="bod" replacement="bo" reason="overlong"/> <!-- [Tibetan] -->
+			<languageAlias type="bre" replacement="br" reason="overlong"/> <!-- [Breton] -->
+			<languageAlias type="bos" replacement="bs" reason="overlong"/> <!-- [Bosnian] -->
+			<languageAlias type="cat" replacement="ca" reason="overlong"/> <!-- [Catalan, Valencian] -->
+			<languageAlias type="che" replacement="ce" reason="overlong"/> <!-- [Chechen] -->
+			<languageAlias type="cha" replacement="ch" reason="overlong"/> <!-- [Chamorro] -->
+			<languageAlias type="cos" replacement="co" reason="overlong"/> <!-- [Corsican] -->
+			<languageAlias type="cre" replacement="cr" reason="overlong"/> <!-- [Cree] -->
+			<languageAlias type="ces" replacement="cs" reason="overlong"/> <!-- [Czech] -->
+			<languageAlias type="chu" replacement="cu" reason="overlong"/> <!-- [Church Slavic, Church Slavonic, Old Bulgarian, Old Church Slavonic, Old Slavonic] -->
+			<languageAlias type="chv" replacement="cv" reason="overlong"/> <!-- [Chuvash] -->
+			<languageAlias type="cym" replacement="cy" reason="overlong"/> <!-- [Welsh] -->
+			<languageAlias type="dan" replacement="da" reason="overlong"/> <!-- [Danish] -->
+			<languageAlias type="deu" replacement="de" reason="overlong"/> <!-- [German] -->
+			<languageAlias type="div" replacement="dv" reason="overlong"/> <!-- [Dhivehi, Divehi, Maldivian] -->
+			<languageAlias type="dzo" replacement="dz" reason="overlong"/> <!-- [Dzongkha] -->
+			<languageAlias type="ewe" replacement="ee" reason="overlong"/> <!-- [Ewe] -->
+			<languageAlias type="ell" replacement="el" reason="overlong"/> <!-- [Modern Greek (1453-)] -->
+			<languageAlias type="eng" replacement="en" reason="overlong"/> <!-- [English] -->
+			<languageAlias type="epo" replacement="eo" reason="overlong"/> <!-- [Esperanto] -->
+			<languageAlias type="spa" replacement="es" reason="overlong"/> <!-- [Spanish, Castilian] -->
+			<languageAlias type="est" replacement="et" reason="overlong"/> <!-- [Estonian] -->
+			<languageAlias type="eus" replacement="eu" reason="overlong"/> <!-- [Basque] -->
+			<languageAlias type="fas" replacement="fa" reason="overlong"/> <!-- [Persian] -->
+			<languageAlias type="ful" replacement="ff" reason="overlong"/> <!-- [Fulah] -->
+			<languageAlias type="fin" replacement="fi" reason="overlong"/> <!-- [Finnish] -->
+			<languageAlias type="fij" replacement="fj" reason="overlong"/> <!-- [Fijian] -->
+			<languageAlias type="fao" replacement="fo" reason="overlong"/> <!-- [Faroese] -->
+			<languageAlias type="fra" replacement="fr" reason="overlong"/> <!-- [French] -->
+			<languageAlias type="fry" replacement="fy" reason="overlong"/> <!-- [Western Frisian] -->
+			<languageAlias type="gle" replacement="ga" reason="overlong"/> <!-- [Irish] -->
+			<languageAlias type="gla" replacement="gd" reason="overlong"/> <!-- [Scottish Gaelic, Gaelic] -->
+			<languageAlias type="glg" replacement="gl" reason="overlong"/> <!-- [Galician] -->
+			<languageAlias type="grn" replacement="gn" reason="overlong"/> <!-- [Guarani] -->
+			<languageAlias type="guj" replacement="gu" reason="overlong"/> <!-- [Gujarati] -->
+			<languageAlias type="glv" replacement="gv" reason="overlong"/> <!-- [Manx] -->
+			<languageAlias type="hau" replacement="ha" reason="overlong"/> <!-- [Hausa] -->
+			<languageAlias type="heb" replacement="he" reason="overlong"/> <!-- [Hebrew] -->
+			<languageAlias type="hin" replacement="hi" reason="overlong"/> <!-- [Hindi] -->
+			<languageAlias type="hmo" replacement="ho" reason="overlong"/> <!-- [Hiri Motu] -->
+			<languageAlias type="hrv" replacement="hr" reason="overlong"/> <!-- [Croatian] -->
+			<languageAlias type="hat" replacement="ht" reason="overlong"/> <!-- [Haitian, Haitian Creole] -->
+			<languageAlias type="hun" replacement="hu" reason="overlong"/> <!-- [Hungarian] -->
+			<languageAlias type="hye" replacement="hy" reason="overlong"/> <!-- [Armenian] -->
+			<languageAlias type="her" replacement="hz" reason="overlong"/> <!-- [Herero] -->
+			<languageAlias type="ina" replacement="ia" reason="overlong"/> <!-- [Interlingua (International Auxiliary Language Association)] -->
+			<languageAlias type="ind" replacement="id" reason="overlong"/> <!-- [Indonesian] -->
+			<languageAlias type="ile" replacement="ie" reason="overlong"/> <!-- [Interlingue, Occidental] -->
+			<languageAlias type="ibo" replacement="ig" reason="overlong"/> <!-- [Igbo] -->
+			<languageAlias type="iii" replacement="ii" reason="overlong"/> <!-- [Sichuan Yi, Nuosu] -->
+			<languageAlias type="ipk" replacement="ik" reason="overlong"/> <!-- [Inupiaq] -->
+			<languageAlias type="ido" replacement="io" reason="overlong"/> <!-- [Ido] -->
+			<languageAlias type="isl" replacement="is" reason="overlong"/> <!-- [Icelandic] -->
+			<languageAlias type="ita" replacement="it" reason="overlong"/> <!-- [Italian] -->
+			<languageAlias type="iku" replacement="iu" reason="overlong"/> <!-- [Inuktitut] -->
+			<languageAlias type="jpn" replacement="ja" reason="overlong"/> <!-- [Japanese] -->
+			<languageAlias type="jav" replacement="jv" reason="overlong"/> <!-- [Javanese] -->
+			<languageAlias type="kat" replacement="ka" reason="overlong"/> <!-- [Georgian] -->
+			<languageAlias type="kon" replacement="kg" reason="overlong"/> <!-- [Kongo] -->
+			<languageAlias type="kik" replacement="ki" reason="overlong"/> <!-- [Kikuyu, Gikuyu] -->
+			<languageAlias type="kua" replacement="kj" reason="overlong"/> <!-- [Kuanyama, Kwanyama] -->
+			<languageAlias type="kaz" replacement="kk" reason="overlong"/> <!-- [Kazakh] -->
+			<languageAlias type="kal" replacement="kl" reason="overlong"/> <!-- [Kalaallisut, Greenlandic] -->
+			<languageAlias type="khm" replacement="km" reason="overlong"/> <!-- [Central Khmer] -->
+			<languageAlias type="kan" replacement="kn" reason="overlong"/> <!-- [Kannada] -->
+			<languageAlias type="kor" replacement="ko" reason="overlong"/> <!-- [Korean] -->
+			<languageAlias type="kau" replacement="kr" reason="overlong"/> <!-- [Kanuri] -->
+			<languageAlias type="kas" replacement="ks" reason="overlong"/> <!-- [Kashmiri] -->
+			<languageAlias type="kur" replacement="ku" reason="overlong"/> <!-- [Kurdish] -->
+			<languageAlias type="kom" replacement="kv" reason="overlong"/> <!-- [Komi] -->
+			<languageAlias type="cor" replacement="kw" reason="overlong"/> <!-- [Cornish] -->
+			<languageAlias type="kir" replacement="ky" reason="overlong"/> <!-- [Kirghiz, Kyrgyz] -->
+			<languageAlias type="lat" replacement="la" reason="overlong"/> <!-- [Latin] -->
+			<languageAlias type="ltz" replacement="lb" reason="overlong"/> <!-- [Luxembourgish, Letzeburgesch] -->
+			<languageAlias type="lug" replacement="lg" reason="overlong"/> <!-- [Ganda] -->
+			<languageAlias type="lim" replacement="li" reason="overlong"/> <!-- [Limburgan, Limburger, Limburgish] -->
+			<languageAlias type="lin" replacement="ln" reason="overlong"/> <!-- [Lingala] -->
+			<languageAlias type="lao" replacement="lo" reason="overlong"/> <!-- [Lao] -->
+			<languageAlias type="lit" replacement="lt" reason="overlong"/> <!-- [Lithuanian] -->
+			<languageAlias type="lub" replacement="lu" reason="overlong"/> <!-- [Luba-Katanga] -->
+			<languageAlias type="lav" replacement="lv" reason="overlong"/> <!-- [Latvian] -->
+			<languageAlias type="mlg" replacement="mg" reason="overlong"/> <!-- [Malagasy] -->
+			<languageAlias type="mah" replacement="mh" reason="overlong"/> <!-- [Marshallese] -->
+			<languageAlias type="mri" replacement="mi" reason="overlong"/> <!-- [Maori] -->
+			<languageAlias type="mkd" replacement="mk" reason="overlong"/> <!-- [Macedonian] -->
+			<languageAlias type="mal" replacement="ml" reason="overlong"/> <!-- [Malayalam] -->
+			<languageAlias type="mon" replacement="mn" reason="overlong"/> <!-- [Mongolian] -->
+			<languageAlias type="mol" replacement="ro_MD" reason="overlong"/> <!-- [Moldavian] -->
+			<languageAlias type="mar" replacement="mr" reason="overlong"/> <!-- [Marathi] -->
+			<languageAlias type="msa" replacement="ms" reason="overlong"/> <!-- [Malay (macrolanguage)] -->
+			<languageAlias type="mlt" replacement="mt" reason="overlong"/> <!-- [Maltese] -->
+			<languageAlias type="mya" replacement="my" reason="overlong"/> <!-- [Burmese] -->
+			<languageAlias type="nau" replacement="na" reason="overlong"/> <!-- [Nauru] -->
+			<languageAlias type="nob" replacement="nb" reason="overlong"/> <!-- [Norwegian Bokmål] -->
+			<languageAlias type="nde" replacement="nd" reason="overlong"/> <!-- [North Ndebele] -->
+			<languageAlias type="nep" replacement="ne" reason="overlong"/> <!-- [Nepali (macrolanguage)] -->
+			<languageAlias type="ndo" replacement="ng" reason="overlong"/> <!-- [Ndonga] -->
+			<languageAlias type="nld" replacement="nl" reason="overlong"/> <!-- [Dutch, Flemish] -->
+			<languageAlias type="nno" replacement="nn" reason="overlong"/> <!-- [Norwegian Nynorsk] -->
+			<languageAlias type="nor" replacement="nb" reason="overlong"/> <!-- [Norwegian] -->
+			<languageAlias type="nbl" replacement="nr" reason="overlong"/> <!-- [South Ndebele] -->
+			<languageAlias type="nav" replacement="nv" reason="overlong"/> <!-- [Navajo, Navaho] -->
+			<languageAlias type="nya" replacement="ny" reason="overlong"/> <!-- [Nyanja, Chewa, Chichewa] -->
+			<languageAlias type="oci" replacement="oc" reason="overlong"/> <!-- [Occitan (post 1500)] -->
+			<languageAlias type="oji" replacement="oj" reason="overlong"/> <!-- [Ojibwa] -->
+			<languageAlias type="orm" replacement="om" reason="overlong"/> <!-- [Oromo] -->
+			<languageAlias type="ori" replacement="or" reason="overlong"/> <!-- [Oriya (macrolanguage)] -->
+			<languageAlias type="oss" replacement="os" reason="overlong"/> <!-- [Ossetian, Ossetic] -->
+			<languageAlias type="pan" replacement="pa" reason="overlong"/> <!-- [Panjabi, Punjabi] -->
+			<languageAlias type="pli" replacement="pi" reason="overlong"/> <!-- [Pali] -->
+			<languageAlias type="pol" replacement="pl" reason="overlong"/> <!-- [Polish] -->
+			<languageAlias type="pus" replacement="ps" reason="overlong"/> <!-- [Pushto, Pashto] -->
+			<languageAlias type="por" replacement="pt" reason="overlong"/> <!-- [Portuguese] -->
+			<languageAlias type="que" replacement="qu" reason="overlong"/> <!-- [Quechua] -->
+			<languageAlias type="roh" replacement="rm" reason="overlong"/> <!-- [Romansh] -->
+			<languageAlias type="run" replacement="rn" reason="overlong"/> <!-- [Rundi] -->
+			<languageAlias type="ron" replacement="ro" reason="overlong"/> <!-- [Romanian, Moldavian, Moldovan] -->
+			<languageAlias type="rus" replacement="ru" reason="overlong"/> <!-- [Russian] -->
+			<languageAlias type="kin" replacement="rw" reason="overlong"/> <!-- [Kinyarwanda] -->
+			<languageAlias type="san" replacement="sa" reason="overlong"/> <!-- [Sanskrit] -->
+			<languageAlias type="srd" replacement="sc" reason="overlong"/> <!-- [Sardinian] -->
+			<languageAlias type="snd" replacement="sd" reason="overlong"/> <!-- [Sindhi] -->
+			<languageAlias type="sme" replacement="se" reason="overlong"/> <!-- [Northern Sami] -->
+			<languageAlias type="sag" replacement="sg" reason="overlong"/> <!-- [Sango] -->
+			<languageAlias type="hbs" replacement="sr_Latn" reason="overlong"/> <!-- [Serbo-Croatian] -->
+			<languageAlias type="sin" replacement="si" reason="overlong"/> <!-- [Sinhala, Sinhalese] -->
+			<languageAlias type="slk" replacement="sk" reason="overlong"/> <!-- [Slovak] -->
+			<languageAlias type="slv" replacement="sl" reason="overlong"/> <!-- [Slovenian] -->
+			<languageAlias type="smo" replacement="sm" reason="overlong"/> <!-- [Samoan] -->
+			<languageAlias type="sna" replacement="sn" reason="overlong"/> <!-- [Shona] -->
+			<languageAlias type="som" replacement="so" reason="overlong"/> <!-- [Somali] -->
+			<languageAlias type="sqi" replacement="sq" reason="overlong"/> <!-- [Albanian] -->
+			<languageAlias type="srp" replacement="sr" reason="overlong"/> <!-- [Serbian] -->
+			<languageAlias type="ssw" replacement="ss" reason="overlong"/> <!-- [Swati] -->
+			<languageAlias type="sot" replacement="st" reason="overlong"/> <!-- [Southern Sotho] -->
+			<languageAlias type="sun" replacement="su" reason="overlong"/> <!-- [Sundanese] -->
+			<languageAlias type="swe" replacement="sv" reason="overlong"/> <!-- [Swedish] -->
+			<languageAlias type="swa" replacement="sw" reason="overlong"/> <!-- [Swahili (macrolanguage)] -->
+			<languageAlias type="tam" replacement="ta" reason="overlong"/> <!-- [Tamil] -->
+			<languageAlias type="tel" replacement="te" reason="overlong"/> <!-- [Telugu] -->
+			<languageAlias type="tgk" replacement="tg" reason="overlong"/> <!-- [Tajik] -->
+			<languageAlias type="tha" replacement="th" reason="overlong"/> <!-- [Thai] -->
+			<languageAlias type="tir" replacement="ti" reason="overlong"/> <!-- [Tigrinya] -->
+			<languageAlias type="tuk" replacement="tk" reason="overlong"/> <!-- [Turkmen] -->
+			<languageAlias type="tgl" replacement="fil" reason="overlong"/> <!-- [Tagalog] -->
+			<languageAlias type="tsn" replacement="tn" reason="overlong"/> <!-- [Tswana] -->
+			<languageAlias type="ton" replacement="to" reason="overlong"/> <!-- [Tonga (Tonga Islands)] -->
+			<languageAlias type="tur" replacement="tr" reason="overlong"/> <!-- [Turkish] -->
+			<languageAlias type="tso" replacement="ts" reason="overlong"/> <!-- [Tsonga] -->
+			<languageAlias type="tat" replacement="tt" reason="overlong"/> <!-- [Tatar] -->
+			<languageAlias type="twi" replacement="ak" reason="overlong"/> <!-- [Twi] -->
+			<languageAlias type="tah" replacement="ty" reason="overlong"/> <!-- [Tahitian] -->
+			<languageAlias type="uig" replacement="ug" reason="overlong"/> <!-- [Uighur, Uyghur] -->
+			<languageAlias type="ukr" replacement="uk" reason="overlong"/> <!-- [Ukrainian] -->
+			<languageAlias type="urd" replacement="ur" reason="overlong"/> <!-- [Urdu] -->
+			<languageAlias type="uzb" replacement="uz" reason="overlong"/> <!-- [Uzbek] -->
+			<languageAlias type="ven" replacement="ve" reason="overlong"/> <!-- [Venda] -->
+			<languageAlias type="vie" replacement="vi" reason="overlong"/> <!-- [Vietnamese] -->
+			<languageAlias type="vol" replacement="vo" reason="overlong"/> <!-- [Volapük] -->
+			<languageAlias type="wln" replacement="wa" reason="overlong"/> <!-- [Walloon] -->
+			<languageAlias type="wol" replacement="wo" reason="overlong"/> <!-- [Wolof] -->
+			<languageAlias type="xho" replacement="xh" reason="overlong"/> <!-- [Xhosa] -->
+			<languageAlias type="yid" replacement="yi" reason="overlong"/> <!-- [Yiddish] -->
+			<languageAlias type="yor" replacement="yo" reason="overlong"/> <!-- [Yoruba] -->
+			<languageAlias type="zha" replacement="za" reason="overlong"/> <!-- [Zhuang, Chuang] -->
+			<languageAlias type="zho" replacement="zh" reason="overlong"/> <!-- [Chinese] -->
+			<languageAlias type="zul" replacement="zu" reason="overlong"/> <!-- [Zulu] -->
+			<!-- Bibliographic -->
+			<languageAlias type="alb" replacement="sq" reason="bibliographic"/> <!-- [Albanian] -->
+			<languageAlias type="arm" replacement="hy" reason="bibliographic"/> <!-- [Armenian] -->
+			<languageAlias type="baq" replacement="eu" reason="bibliographic"/> <!-- [Basque] -->
+			<languageAlias type="bur" replacement="my" reason="bibliographic"/> <!-- [Burmese] -->
+			<languageAlias type="chi" replacement="zh" reason="bibliographic"/> <!-- [Chinese] -->
+			<languageAlias type="cze" replacement="cs" reason="bibliographic"/> <!-- [Czech] -->
+			<languageAlias type="dut" replacement="nl" reason="bibliographic"/> <!-- [Dutch, Flemish] -->
+			<languageAlias type="fre" replacement="fr" reason="bibliographic"/> <!-- [French] -->
+			<languageAlias type="geo" replacement="ka" reason="bibliographic"/> <!-- [Georgian] -->
+			<languageAlias type="ger" replacement="de" reason="bibliographic"/> <!-- [German] -->
+			<languageAlias type="gre" replacement="el" reason="bibliographic"/> <!-- [Modern Greek (1453-)] -->
+			<languageAlias type="ice" replacement="is" reason="bibliographic"/> <!-- [Icelandic] -->
+			<languageAlias type="mac" replacement="mk" reason="bibliographic"/> <!-- [Macedonian] -->
+			<languageAlias type="mao" replacement="mi" reason="bibliographic"/> <!-- [Maori] -->
+			<languageAlias type="may" replacement="ms" reason="bibliographic"/> <!-- [Malay (macrolanguage)] -->
+			<languageAlias type="per" replacement="fa" reason="bibliographic"/> <!-- [Persian] -->
+			<languageAlias type="rum" replacement="ro" reason="bibliographic"/> <!-- [Romanian, Moldavian, Moldovan] -->
+			<languageAlias type="slo" replacement="sk" reason="bibliographic"/> <!-- [Slovak] -->
+			<languageAlias type="tib" replacement="bo" reason="bibliographic"/> <!-- [Tibetan] -->
+			<languageAlias type="wel" replacement="cy" reason="bibliographic"/> <!-- [Welsh] -->
+            <!-- end of data generated with CountItems tool per http://sites.google.com/site/cldr/development/updating-codes/update-languagescriptregion-subtags -->
+            <!-- scripts -->
+            <scriptAlias type="Qaai" replacement="Zinh" reason="deprecated"/>
+            <!-- deprecated ISO territories in 3066 + CLDR ones (older deprecated ISO codes -->
+            <territoryAlias type="AN" replacement="CW SX BQ" reason="deprecated"/> <!-- Netherlands Antilles Curaçao largest, then Sint Martin, then BQ -->
+            <territoryAlias type="BU" replacement="MM" reason="deprecated"/> <!-- Burma -->
+            <territoryAlias type="CS" replacement="RS ME" reason="deprecated"/> <!-- Serbia & Montenegro -->
+            <territoryAlias type="CT" replacement="KI" reason="deprecated"/> <!-- CLDR: Canton and Enderbury Islands -->
+            <territoryAlias type="DD" replacement="DE" reason="deprecated"/> <!-- German Democratic Republic -->
+            <territoryAlias type="DY" replacement="BJ" reason="deprecated"/> <!-- CLDR:Benin -->
+            <territoryAlias type="FQ" replacement="AQ TF" reason="deprecated"/> <!-- CLDR: French Southern and Antarctic Territories (now split between AQ and TF) -->
+            <territoryAlias type="FX" replacement="FR" reason="deprecated"/> <!-- Metropolitan France -->
+            <territoryAlias type="HV" replacement="BF" reason="deprecated"/> <!-- CLDR:Burkina Faso -->
+            <territoryAlias type="JT" replacement="UM" reason="deprecated"/> <!-- CLDR: Johnston Island -->
+            <territoryAlias type="MI" replacement="UM" reason="deprecated"/> <!-- CLDR: Midway Islands -->
+            <territoryAlias type="NH" replacement="VU" reason="deprecated"/> <!-- CLDR:Vanuatu -->
+            <territoryAlias type="NQ" replacement="AQ" reason="deprecated"/> <!-- CLDR: Dronning Maud Land -->
+            <territoryAlias type="NT" replacement="SA IQ" reason="deprecated"/> <!-- Neutral Zone -->
+            <territoryAlias type="PC" replacement="FM MH MP PW" reason="deprecated"/> <!-- CLDR: Pacific Islands Trust Territory (divided into FM, MH, MP, and PW) -->
+            <territoryAlias type="PU" replacement="UM" reason="deprecated"/> <!-- CLDR: U.S. Miscellaneous Pacific Islands -->
+            <territoryAlias type="PZ" replacement="PA" reason="deprecated"/> <!-- CLDR: Panama Canal Zone -->
+            <territoryAlias type="QU" replacement="EU" reason="deprecated"/> <!-- CLDR: European Union -->
+            <territoryAlias type="RH" replacement="ZW" reason="deprecated"/> <!-- CLDR:Zimbabwe -->
+            <territoryAlias type="SU" replacement="RU AM AZ BY EE GE KZ KG LV LT MD TJ TM UA UZ" reason="deprecated"/> <!-- Union of Soviet Socialist Republics -->
+            <territoryAlias type="TP" replacement="TL" reason="deprecated"/> <!-- East Timor -->
+            <territoryAlias type="UK" replacement="GB" reason="deprecated"/> <!-- CLDR: Great Britain -->
+            <territoryAlias type="VD" replacement="VN" reason="deprecated"/> <!-- CLDR: North Vietnam -->
+            <territoryAlias type="WK" replacement="UM" reason="deprecated"/> <!-- CLDR: Wake Island -->
+            <territoryAlias type="YD" replacement="YE" reason="deprecated"/> <!-- Yemen, Democratic -->
+            <territoryAlias type="YU" replacement="RS ME" reason="deprecated"/> <!-- Yugoslavia -->
+            <territoryAlias type="ZR" replacement="CD" reason="deprecated"/> <!-- Zaire -->
+            <territoryAlias type="062" replacement="034 143" reason="deprecated"/> <!-- South-Central Asia -->
+            <territoryAlias type="172" replacement="RU AM AZ BY GE KG KZ MD TJ TM UA UZ" reason="deprecated"/> <!-- 172 not part of BCP47 -->
+            <territoryAlias type="200" replacement="CZ SK" reason="deprecated"/> <!-- Czechoslovakia -->
+            <territoryAlias type="230" replacement="ET" reason="deprecated"/> <!-- Ethiopia (pre-1993) -->
+            <territoryAlias type="280" replacement="DE" reason="deprecated"/> <!-- West Germany (pre-1990) -->
+            <territoryAlias type="532" replacement="CW SX BQ" reason="deprecated"/> <!-- Netherlands Antilles (pre-1986) -->
+            <territoryAlias type="582" replacement="FM MH MP PW" reason="deprecated"/> <!-- Pacific Islands (Trust Territory - pre-1991) -->
+            <territoryAlias type="736" replacement="SD" reason="deprecated"/> <!-- Sudan (pre-2011) -->
+            <territoryAlias type="830" replacement="JE GG" reason="deprecated"/> <!-- Channel Islands -->
+            <territoryAlias type="886" replacement="YE" reason="deprecated"/> <!-- Yemen (pre-1990) -->
+            <territoryAlias type="890" replacement="RS ME SI HR MK BA" reason="deprecated"/> <!-- Yugoslavia (pre-1992) -->
+            <!-- 3-letter ISO code values -->
+            <!-- start of data generated with CountItems tool per http://sites.google.com/site/cldr/development/updating-codes/update-languagescriptregion-subtags -->
+			<territoryAlias type="AAA" replacement="AA" reason="overlong"/> <!-- null -->
+			<territoryAlias type="ASC" replacement="AC" reason="overlong"/> <!-- Ascension Island -->
+			<territoryAlias type="AND" replacement="AD" reason="overlong"/> <!-- Andorra -->
+			<territoryAlias type="ARE" replacement="AE" reason="overlong"/> <!-- United Arab Emirates -->
+			<territoryAlias type="AFG" replacement="AF" reason="overlong"/> <!-- Afghanistan -->
+			<territoryAlias type="ATG" replacement="AG" reason="overlong"/> <!-- Antigua & Barbuda -->
+			<territoryAlias type="AIA" replacement="AI" reason="overlong"/> <!-- Anguilla -->
+			<territoryAlias type="ALB" replacement="AL" reason="overlong"/> <!-- Albania -->
+			<territoryAlias type="ARM" replacement="AM" reason="overlong"/> <!-- Armenia -->
+			<territoryAlias type="ANT" replacement="CW SX BQ" reason="overlong"/> <!-- null -->
+			<territoryAlias type="AGO" replacement="AO" reason="overlong"/> <!-- Angola -->
+			<territoryAlias type="ATA" replacement="AQ" reason="overlong"/> <!-- Antarctica -->
+			<territoryAlias type="ARG" replacement="AR" reason="overlong"/> <!-- Argentina -->
+			<territoryAlias type="ASM" replacement="AS" reason="overlong"/> <!-- American Samoa -->
+			<territoryAlias type="AUT" replacement="AT" reason="overlong"/> <!-- Austria -->
+			<territoryAlias type="AUS" replacement="AU" reason="overlong"/> <!-- Australia -->
+			<territoryAlias type="ABW" replacement="AW" reason="overlong"/> <!-- Aruba -->
+			<territoryAlias type="ALA" replacement="AX" reason="overlong"/> <!-- Åland Islands -->
+			<territoryAlias type="AZE" replacement="AZ" reason="overlong"/> <!-- Azerbaijan -->
+			<territoryAlias type="BIH" replacement="BA" reason="overlong"/> <!-- Bosnia & Herzegovina -->
+			<territoryAlias type="BRB" replacement="BB" reason="overlong"/> <!-- Barbados -->
+			<territoryAlias type="BGD" replacement="BD" reason="overlong"/> <!-- Bangladesh -->
+			<territoryAlias type="BEL" replacement="BE" reason="overlong"/> <!-- Belgium -->
+			<territoryAlias type="BFA" replacement="BF" reason="overlong"/> <!-- Burkina Faso -->
+			<territoryAlias type="BGR" replacement="BG" reason="overlong"/> <!-- Bulgaria -->
+			<territoryAlias type="BHR" replacement="BH" reason="overlong"/> <!-- Bahrain -->
+			<territoryAlias type="BDI" replacement="BI" reason="overlong"/> <!-- Burundi -->
+			<territoryAlias type="BEN" replacement="BJ" reason="overlong"/> <!-- Benin -->
+			<territoryAlias type="BLM" replacement="BL" reason="overlong"/> <!-- St. Barthélemy -->
+			<territoryAlias type="BMU" replacement="BM" reason="overlong"/> <!-- Bermuda -->
+			<territoryAlias type="BRN" replacement="BN" reason="overlong"/> <!-- Brunei -->
+			<territoryAlias type="BOL" replacement="BO" reason="overlong"/> <!-- Bolivia -->
+			<territoryAlias type="BES" replacement="BQ" reason="overlong"/> <!-- Caribbean Netherlands -->
+			<territoryAlias type="BRA" replacement="BR" reason="overlong"/> <!-- Brazil -->
+			<territoryAlias type="BHS" replacement="BS" reason="overlong"/> <!-- Bahamas -->
+			<territoryAlias type="BTN" replacement="BT" reason="overlong"/> <!-- Bhutan -->
+			<territoryAlias type="BUR" replacement="MM" reason="overlong"/> <!-- Myanmar (Burma) -->
+			<territoryAlias type="BVT" replacement="BV" reason="overlong"/> <!-- Bouvet Island -->
+			<territoryAlias type="BWA" replacement="BW" reason="overlong"/> <!-- Botswana -->
+			<territoryAlias type="BLR" replacement="BY" reason="overlong"/> <!-- Belarus -->
+			<territoryAlias type="BLZ" replacement="BZ" reason="overlong"/> <!-- Belize -->
+			<territoryAlias type="CAN" replacement="CA" reason="overlong"/> <!-- Canada -->
+			<territoryAlias type="CCK" replacement="CC" reason="overlong"/> <!-- Cocos (Keeling) Islands -->
+			<territoryAlias type="COD" replacement="CD" reason="overlong"/> <!-- Congo - Kinshasa -->
+			<territoryAlias type="CAF" replacement="CF" reason="overlong"/> <!-- Central African Republic -->
+			<territoryAlias type="COG" replacement="CG" reason="overlong"/> <!-- Congo - Brazzaville -->
+			<territoryAlias type="CHE" replacement="CH" reason="overlong"/> <!-- Switzerland -->
+			<territoryAlias type="CIV" replacement="CI" reason="overlong"/> <!-- Côte d’Ivoire -->
+			<territoryAlias type="COK" replacement="CK" reason="overlong"/> <!-- Cook Islands -->
+			<territoryAlias type="CHL" replacement="CL" reason="overlong"/> <!-- Chile -->
+			<territoryAlias type="CMR" replacement="CM" reason="overlong"/> <!-- Cameroon -->
+			<territoryAlias type="CHN" replacement="CN" reason="overlong"/> <!-- China -->
+			<territoryAlias type="COL" replacement="CO" reason="overlong"/> <!-- Colombia -->
+			<territoryAlias type="CPT" replacement="CP" reason="overlong"/> <!-- Clipperton Island -->
+			<territoryAlias type="CRI" replacement="CR" reason="overlong"/> <!-- Costa Rica -->
+			<territoryAlias type="SCG" replacement="RS ME" reason="overlong"/> <!-- null -->
+			<territoryAlias type="CUB" replacement="CU" reason="overlong"/> <!-- Cuba -->
+			<territoryAlias type="CPV" replacement="CV" reason="overlong"/> <!-- Cape Verde -->
+			<territoryAlias type="CUW" replacement="CW" reason="overlong"/> <!-- Curaçao -->
+			<territoryAlias type="CXR" replacement="CX" reason="overlong"/> <!-- Christmas Island -->
+			<territoryAlias type="CYP" replacement="CY" reason="overlong"/> <!-- Cyprus -->
+			<territoryAlias type="CZE" replacement="CZ" reason="overlong"/> <!-- Czech Republic -->
+			<territoryAlias type="DDR" replacement="DE" reason="overlong"/> <!-- Germany -->
+			<territoryAlias type="DEU" replacement="DE" reason="overlong"/> <!-- Germany -->
+			<territoryAlias type="DGA" replacement="DG" reason="overlong"/> <!-- Diego Garcia -->
+			<territoryAlias type="DJI" replacement="DJ" reason="overlong"/> <!-- Djibouti -->
+			<territoryAlias type="DNK" replacement="DK" reason="overlong"/> <!-- Denmark -->
+			<territoryAlias type="DMA" replacement="DM" reason="overlong"/> <!-- Dominica -->
+			<territoryAlias type="DOM" replacement="DO" reason="overlong"/> <!-- Dominican Republic -->
+			<territoryAlias type="DZA" replacement="DZ" reason="overlong"/> <!-- Algeria -->
+			<territoryAlias type="ECU" replacement="EC" reason="overlong"/> <!-- Ecuador -->
+			<territoryAlias type="EST" replacement="EE" reason="overlong"/> <!-- Estonia -->
+			<territoryAlias type="EGY" replacement="EG" reason="overlong"/> <!-- Egypt -->
+			<territoryAlias type="ESH" replacement="EH" reason="overlong"/> <!-- Western Sahara -->
+			<territoryAlias type="ERI" replacement="ER" reason="overlong"/> <!-- Eritrea -->
+			<territoryAlias type="ESP" replacement="ES" reason="overlong"/> <!-- Spain -->
+			<territoryAlias type="ETH" replacement="ET" reason="overlong"/> <!-- Ethiopia -->
+			<territoryAlias type="FIN" replacement="FI" reason="overlong"/> <!-- Finland -->
+			<territoryAlias type="FJI" replacement="FJ" reason="overlong"/> <!-- Fiji -->
+			<territoryAlias type="FLK" replacement="FK" reason="overlong"/> <!-- Falkland Islands -->
+			<territoryAlias type="FSM" replacement="FM" reason="overlong"/> <!-- Micronesia -->
+			<territoryAlias type="FRO" replacement="FO" reason="overlong"/> <!-- Faroe Islands -->
+			<territoryAlias type="FRA" replacement="FR" reason="overlong"/> <!-- France -->
+			<territoryAlias type="FXX" replacement="FR" reason="overlong"/> <!-- France -->
+			<territoryAlias type="GAB" replacement="GA" reason="overlong"/> <!-- Gabon -->
+			<territoryAlias type="GBR" replacement="GB" reason="overlong"/> <!-- United Kingdom -->
+			<territoryAlias type="GRD" replacement="GD" reason="overlong"/> <!-- Grenada -->
+			<territoryAlias type="GEO" replacement="GE" reason="overlong"/> <!-- Georgia -->
+			<territoryAlias type="GUF" replacement="GF" reason="overlong"/> <!-- French Guiana -->
+			<territoryAlias type="GGY" replacement="GG" reason="overlong"/> <!-- Guernsey -->
+			<territoryAlias type="GHA" replacement="GH" reason="overlong"/> <!-- Ghana -->
+			<territoryAlias type="GIB" replacement="GI" reason="overlong"/> <!-- Gibraltar -->
+			<territoryAlias type="GRL" replacement="GL" reason="overlong"/> <!-- Greenland -->
+			<territoryAlias type="GMB" replacement="GM" reason="overlong"/> <!-- Gambia -->
+			<territoryAlias type="GIN" replacement="GN" reason="overlong"/> <!-- Guinea -->
+			<territoryAlias type="GLP" replacement="GP" reason="overlong"/> <!-- Guadeloupe -->
+			<territoryAlias type="GNQ" replacement="GQ" reason="overlong"/> <!-- Equatorial Guinea -->
+			<territoryAlias type="GRC" replacement="GR" reason="overlong"/> <!-- Greece -->
+			<territoryAlias type="SGS" replacement="GS" reason="overlong"/> <!-- South Georgia & South Sandwich Islands -->
+			<territoryAlias type="GTM" replacement="GT" reason="overlong"/> <!-- Guatemala -->
+			<territoryAlias type="GUM" replacement="GU" reason="overlong"/> <!-- Guam -->
+			<territoryAlias type="GNB" replacement="GW" reason="overlong"/> <!-- Guinea-Bissau -->
+			<territoryAlias type="GUY" replacement="GY" reason="overlong"/> <!-- Guyana -->
+			<territoryAlias type="HKG" replacement="HK" reason="overlong"/> <!-- Hong Kong SAR China -->
+			<territoryAlias type="HMD" replacement="HM" reason="overlong"/> <!-- Heard & McDonald Islands -->
+			<territoryAlias type="HND" replacement="HN" reason="overlong"/> <!-- Honduras -->
+			<territoryAlias type="HRV" replacement="HR" reason="overlong"/> <!-- Croatia -->
+			<territoryAlias type="HTI" replacement="HT" reason="overlong"/> <!-- Haiti -->
+			<territoryAlias type="HUN" replacement="HU" reason="overlong"/> <!-- Hungary -->
+			<territoryAlias type="IDN" replacement="ID" reason="overlong"/> <!-- Indonesia -->
+			<territoryAlias type="IRL" replacement="IE" reason="overlong"/> <!-- Ireland -->
+			<territoryAlias type="ISR" replacement="IL" reason="overlong"/> <!-- Israel -->
+			<territoryAlias type="IMN" replacement="IM" reason="overlong"/> <!-- Isle of Man -->
+			<territoryAlias type="IND" replacement="IN" reason="overlong"/> <!-- India -->
+			<territoryAlias type="IOT" replacement="IO" reason="overlong"/> <!-- British Indian Ocean Territory -->
+			<territoryAlias type="IRQ" replacement="IQ" reason="overlong"/> <!-- Iraq -->
+			<territoryAlias type="IRN" replacement="IR" reason="overlong"/> <!-- Iran -->
+			<territoryAlias type="ISL" replacement="IS" reason="overlong"/> <!-- Iceland -->
+			<territoryAlias type="ITA" replacement="IT" reason="overlong"/> <!-- Italy -->
+			<territoryAlias type="JEY" replacement="JE" reason="overlong"/> <!-- Jersey -->
+			<territoryAlias type="JAM" replacement="JM" reason="overlong"/> <!-- Jamaica -->
+			<territoryAlias type="JOR" replacement="JO" reason="overlong"/> <!-- Jordan -->
+			<territoryAlias type="JPN" replacement="JP" reason="overlong"/> <!-- Japan -->
+			<territoryAlias type="KEN" replacement="KE" reason="overlong"/> <!-- Kenya -->
+			<territoryAlias type="KGZ" replacement="KG" reason="overlong"/> <!-- Kyrgyzstan -->
+			<territoryAlias type="KHM" replacement="KH" reason="overlong"/> <!-- Cambodia -->
+			<territoryAlias type="KIR" replacement="KI" reason="overlong"/> <!-- Kiribati -->
+			<territoryAlias type="COM" replacement="KM" reason="overlong"/> <!-- Comoros -->
+			<territoryAlias type="KNA" replacement="KN" reason="overlong"/> <!-- St. Kitts & Nevis -->
+			<territoryAlias type="PRK" replacement="KP" reason="overlong"/> <!-- North Korea -->
+			<territoryAlias type="KOR" replacement="KR" reason="overlong"/> <!-- South Korea -->
+			<territoryAlias type="KWT" replacement="KW" reason="overlong"/> <!-- Kuwait -->
+			<territoryAlias type="CYM" replacement="KY" reason="overlong"/> <!-- Cayman Islands -->
+			<territoryAlias type="KAZ" replacement="KZ" reason="overlong"/> <!-- Kazakhstan -->
+			<territoryAlias type="LAO" replacement="LA" reason="overlong"/> <!-- Laos -->
+			<territoryAlias type="LBN" replacement="LB" reason="overlong"/> <!-- Lebanon -->
+			<territoryAlias type="LCA" replacement="LC" reason="overlong"/> <!-- St. Lucia -->
+			<territoryAlias type="LIE" replacement="LI" reason="overlong"/> <!-- Liechtenstein -->
+			<territoryAlias type="LKA" replacement="LK" reason="overlong"/> <!-- Sri Lanka -->
+			<territoryAlias type="LBR" replacement="LR" reason="overlong"/> <!-- Liberia -->
+			<territoryAlias type="LSO" replacement="LS" reason="overlong"/> <!-- Lesotho -->
+			<territoryAlias type="LTU" replacement="LT" reason="overlong"/> <!-- Lithuania -->
+			<territoryAlias type="LUX" replacement="LU" reason="overlong"/> <!-- Luxembourg -->
+			<territoryAlias type="LVA" replacement="LV" reason="overlong"/> <!-- Latvia -->
+			<territoryAlias type="LBY" replacement="LY" reason="overlong"/> <!-- Libya -->
+			<territoryAlias type="MAR" replacement="MA" reason="overlong"/> <!-- Morocco -->
+			<territoryAlias type="MCO" replacement="MC" reason="overlong"/> <!-- Monaco -->
+			<territoryAlias type="MDA" replacement="MD" reason="overlong"/> <!-- Moldova -->
+			<territoryAlias type="MNE" replacement="ME" reason="overlong"/> <!-- Montenegro -->
+			<territoryAlias type="MAF" replacement="MF" reason="overlong"/> <!-- St. Martin -->
+			<territoryAlias type="MDG" replacement="MG" reason="overlong"/> <!-- Madagascar -->
+			<territoryAlias type="MHL" replacement="MH" reason="overlong"/> <!-- Marshall Islands -->
+			<territoryAlias type="MKD" replacement="MK" reason="overlong"/> <!-- Macedonia -->
+			<territoryAlias type="MLI" replacement="ML" reason="overlong"/> <!-- Mali -->
+			<territoryAlias type="MMR" replacement="MM" reason="overlong"/> <!-- Myanmar (Burma) -->
+			<territoryAlias type="MNG" replacement="MN" reason="overlong"/> <!-- Mongolia -->
+			<territoryAlias type="MAC" replacement="MO" reason="overlong"/> <!-- Macau SAR China -->
+			<territoryAlias type="MNP" replacement="MP" reason="overlong"/> <!-- Northern Mariana Islands -->
+			<territoryAlias type="MTQ" replacement="MQ" reason="overlong"/> <!-- Martinique -->
+			<territoryAlias type="MRT" replacement="MR" reason="overlong"/> <!-- Mauritania -->
+			<territoryAlias type="MSR" replacement="MS" reason="overlong"/> <!-- Montserrat -->
+			<territoryAlias type="MLT" replacement="MT" reason="overlong"/> <!-- Malta -->
+			<territoryAlias type="MUS" replacement="MU" reason="overlong"/> <!-- Mauritius -->
+			<territoryAlias type="MDV" replacement="MV" reason="overlong"/> <!-- Maldives -->
+			<territoryAlias type="MWI" replacement="MW" reason="overlong"/> <!-- Malawi -->
+			<territoryAlias type="MEX" replacement="MX" reason="overlong"/> <!-- Mexico -->
+			<territoryAlias type="MYS" replacement="MY" reason="overlong"/> <!-- Malaysia -->
+			<territoryAlias type="MOZ" replacement="MZ" reason="overlong"/> <!-- Mozambique -->
+			<territoryAlias type="NAM" replacement="NA" reason="overlong"/> <!-- Namibia -->
+			<territoryAlias type="NCL" replacement="NC" reason="overlong"/> <!-- New Caledonia -->
+			<territoryAlias type="NER" replacement="NE" reason="overlong"/> <!-- Niger -->
+			<territoryAlias type="NFK" replacement="NF" reason="overlong"/> <!-- Norfolk Island -->
+			<territoryAlias type="NGA" replacement="NG" reason="overlong"/> <!-- Nigeria -->
+			<territoryAlias type="NIC" replacement="NI" reason="overlong"/> <!-- Nicaragua -->
+			<territoryAlias type="NLD" replacement="NL" reason="overlong"/> <!-- Netherlands -->
+			<territoryAlias type="NOR" replacement="NO" reason="overlong"/> <!-- Norway -->
+			<territoryAlias type="NPL" replacement="NP" reason="overlong"/> <!-- Nepal -->
+			<territoryAlias type="NRU" replacement="NR" reason="overlong"/> <!-- Nauru -->
+			<territoryAlias type="NTZ" replacement="SA IQ" reason="overlong"/> <!-- null -->
+			<territoryAlias type="NIU" replacement="NU" reason="overlong"/> <!-- Niue -->
+			<territoryAlias type="NZL" replacement="NZ" reason="overlong"/> <!-- New Zealand -->
+			<territoryAlias type="OMN" replacement="OM" reason="overlong"/> <!-- Oman -->
+			<territoryAlias type="PAN" replacement="PA" reason="overlong"/> <!-- Panama -->
+			<territoryAlias type="PER" replacement="PE" reason="overlong"/> <!-- Peru -->
+			<territoryAlias type="PYF" replacement="PF" reason="overlong"/> <!-- French Polynesia -->
+			<territoryAlias type="PNG" replacement="PG" reason="overlong"/> <!-- Papua New Guinea -->
+			<territoryAlias type="PHL" replacement="PH" reason="overlong"/> <!-- Philippines -->
+			<territoryAlias type="PAK" replacement="PK" reason="overlong"/> <!-- Pakistan -->
+			<territoryAlias type="POL" replacement="PL" reason="overlong"/> <!-- Poland -->
+			<territoryAlias type="SPM" replacement="PM" reason="overlong"/> <!-- St. Pierre & Miquelon -->
+			<territoryAlias type="PCN" replacement="PN" reason="overlong"/> <!-- Pitcairn Islands -->
+			<territoryAlias type="PRI" replacement="PR" reason="overlong"/> <!-- Puerto Rico -->
+			<territoryAlias type="PSE" replacement="PS" reason="overlong"/> <!-- Palestinian Territories -->
+			<territoryAlias type="PRT" replacement="PT" reason="overlong"/> <!-- Portugal -->
+			<territoryAlias type="PLW" replacement="PW" reason="overlong"/> <!-- Palau -->
+			<territoryAlias type="PRY" replacement="PY" reason="overlong"/> <!-- Paraguay -->
+			<territoryAlias type="QAT" replacement="QA" reason="overlong"/> <!-- Qatar -->
+			<territoryAlias type="QMM" replacement="QM" reason="overlong"/> <!-- null -->
+			<territoryAlias type="QNN" replacement="QN" reason="overlong"/> <!-- null -->
+			<territoryAlias type="QPP" replacement="QP" reason="overlong"/> <!-- null -->
+			<territoryAlias type="QQQ" replacement="QQ" reason="overlong"/> <!-- null -->
+			<territoryAlias type="QRR" replacement="QR" reason="overlong"/> <!-- null -->
+			<territoryAlias type="QSS" replacement="QS" reason="overlong"/> <!-- null -->
+			<territoryAlias type="QTT" replacement="QT" reason="overlong"/> <!-- null -->
+			<territoryAlias type="QUU" replacement="EU" reason="overlong"/> <!-- European Union -->
+			<territoryAlias type="QVV" replacement="QV" reason="overlong"/> <!-- null -->
+			<territoryAlias type="QWW" replacement="QW" reason="overlong"/> <!-- null -->
+			<territoryAlias type="QXX" replacement="QX" reason="overlong"/> <!-- null -->
+			<territoryAlias type="QYY" replacement="QY" reason="overlong"/> <!-- null -->
+			<territoryAlias type="QZZ" replacement="QZ" reason="overlong"/> <!-- null -->
+			<territoryAlias type="REU" replacement="RE" reason="overlong"/> <!-- Réunion -->
+			<territoryAlias type="ROU" replacement="RO" reason="overlong"/> <!-- Romania -->
+			<territoryAlias type="SRB" replacement="RS" reason="overlong"/> <!-- Serbia -->
+			<territoryAlias type="RUS" replacement="RU" reason="overlong"/> <!-- Russia -->
+			<territoryAlias type="RWA" replacement="RW" reason="overlong"/> <!-- Rwanda -->
+			<territoryAlias type="SAU" replacement="SA" reason="overlong"/> <!-- Saudi Arabia -->
+			<territoryAlias type="SLB" replacement="SB" reason="overlong"/> <!-- Solomon Islands -->
+			<territoryAlias type="SYC" replacement="SC" reason="overlong"/> <!-- Seychelles -->
+			<territoryAlias type="SDN" replacement="SD" reason="overlong"/> <!-- Sudan -->
+			<territoryAlias type="SWE" replacement="SE" reason="overlong"/> <!-- Sweden -->
+			<territoryAlias type="SGP" replacement="SG" reason="overlong"/> <!-- Singapore -->
+			<territoryAlias type="SHN" replacement="SH" reason="overlong"/> <!-- St. Helena -->
+			<territoryAlias type="SVN" replacement="SI" reason="overlong"/> <!-- Slovenia -->
+			<territoryAlias type="SJM" replacement="SJ" reason="overlong"/> <!-- Svalbard & Jan Mayen -->
+			<territoryAlias type="SVK" replacement="SK" reason="overlong"/> <!-- Slovakia -->
+			<territoryAlias type="SLE" replacement="SL" reason="overlong"/> <!-- Sierra Leone -->
+			<territoryAlias type="SMR" replacement="SM" reason="overlong"/> <!-- San Marino -->
+			<territoryAlias type="SEN" replacement="SN" reason="overlong"/> <!-- Senegal -->
+			<territoryAlias type="SOM" replacement="SO" reason="overlong"/> <!-- Somalia -->
+			<territoryAlias type="SUR" replacement="SR" reason="overlong"/> <!-- Suriname -->
+			<territoryAlias type="SSD" replacement="SS" reason="overlong"/> <!-- South Sudan -->
+			<territoryAlias type="STP" replacement="ST" reason="overlong"/> <!-- São Tomé & Príncipe -->
+			<territoryAlias type="SUN" replacement="RU AM AZ BY EE GE KZ KG LV LT MD TJ TM UA UZ" reason="overlong"/> <!-- null -->
+			<territoryAlias type="SLV" replacement="SV" reason="overlong"/> <!-- El Salvador -->
+			<territoryAlias type="SXM" replacement="SX" reason="overlong"/> <!-- Sint Maarten -->
+			<territoryAlias type="SYR" replacement="SY" reason="overlong"/> <!-- Syria -->
+			<territoryAlias type="SWZ" replacement="SZ" reason="overlong"/> <!-- Swaziland -->
+			<territoryAlias type="TAA" replacement="TA" reason="overlong"/> <!-- Tristan da Cunha -->
+			<territoryAlias type="TCA" replacement="TC" reason="overlong"/> <!-- Turks & Caicos Islands -->
+			<territoryAlias type="TCD" replacement="TD" reason="overlong"/> <!-- Chad -->
+			<territoryAlias type="ATF" replacement="TF" reason="overlong"/> <!-- French Southern Territories -->
+			<territoryAlias type="TGO" replacement="TG" reason="overlong"/> <!-- Togo -->
+			<territoryAlias type="THA" replacement="TH" reason="overlong"/> <!-- Thailand -->
+			<territoryAlias type="TJK" replacement="TJ" reason="overlong"/> <!-- Tajikistan -->
+			<territoryAlias type="TKL" replacement="TK" reason="overlong"/> <!-- Tokelau -->
+			<territoryAlias type="TLS" replacement="TL" reason="overlong"/> <!-- Timor-Leste -->
+			<territoryAlias type="TKM" replacement="TM" reason="overlong"/> <!-- Turkmenistan -->
+			<territoryAlias type="TUN" replacement="TN" reason="overlong"/> <!-- Tunisia -->
+			<territoryAlias type="TON" replacement="TO" reason="overlong"/> <!-- Tonga -->
+			<territoryAlias type="TMP" replacement="TL" reason="overlong"/> <!-- Timor-Leste -->
+			<territoryAlias type="TUR" replacement="TR" reason="overlong"/> <!-- Turkey -->
+			<territoryAlias type="TTO" replacement="TT" reason="overlong"/> <!-- Trinidad & Tobago -->
+			<territoryAlias type="TUV" replacement="TV" reason="overlong"/> <!-- Tuvalu -->
+			<territoryAlias type="TWN" replacement="TW" reason="overlong"/> <!-- Taiwan -->
+			<territoryAlias type="TZA" replacement="TZ" reason="overlong"/> <!-- Tanzania -->
+			<territoryAlias type="UKR" replacement="UA" reason="overlong"/> <!-- Ukraine -->
+			<territoryAlias type="UGA" replacement="UG" reason="overlong"/> <!-- Uganda -->
+			<territoryAlias type="UMI" replacement="UM" reason="overlong"/> <!-- U.S. Outlying Islands -->
+			<territoryAlias type="USA" replacement="US" reason="overlong"/> <!-- United States -->
+			<territoryAlias type="URY" replacement="UY" reason="overlong"/> <!-- Uruguay -->
+			<territoryAlias type="UZB" replacement="UZ" reason="overlong"/> <!-- Uzbekistan -->
+			<territoryAlias type="VAT" replacement="VA" reason="overlong"/> <!-- Vatican City -->
+			<territoryAlias type="VCT" replacement="VC" reason="overlong"/> <!-- St. Vincent & Grenadines -->
+			<territoryAlias type="VEN" replacement="VE" reason="overlong"/> <!-- Venezuela -->
+			<territoryAlias type="VGB" replacement="VG" reason="overlong"/> <!-- British Virgin Islands -->
+			<territoryAlias type="VIR" replacement="VI" reason="overlong"/> <!-- U.S. Virgin Islands -->
+			<territoryAlias type="VNM" replacement="VN" reason="overlong"/> <!-- Vietnam -->
+			<territoryAlias type="VUT" replacement="VU" reason="overlong"/> <!-- Vanuatu -->
+			<territoryAlias type="WLF" replacement="WF" reason="overlong"/> <!-- Wallis & Futuna -->
+			<territoryAlias type="WSM" replacement="WS" reason="overlong"/> <!-- Samoa -->
+			<territoryAlias type="XAA" replacement="XA" reason="overlong"/> <!-- null -->
+			<territoryAlias type="XBB" replacement="XB" reason="overlong"/> <!-- null -->
+			<territoryAlias type="XCC" replacement="XC" reason="overlong"/> <!-- null -->
+			<territoryAlias type="XDD" replacement="XD" reason="overlong"/> <!-- null -->
+			<territoryAlias type="XEE" replacement="XE" reason="overlong"/> <!-- null -->
+			<territoryAlias type="XFF" replacement="XF" reason="overlong"/> <!-- null -->
+			<territoryAlias type="XGG" replacement="XG" reason="overlong"/> <!-- null -->
+			<territoryAlias type="XHH" replacement="XH" reason="overlong"/> <!-- null -->
+			<territoryAlias type="XII" replacement="XI" reason="overlong"/> <!-- null -->
+			<territoryAlias type="XJJ" replacement="XJ" reason="overlong"/> <!-- null -->
+			<territoryAlias type="XKK" replacement="XK" reason="overlong"/> <!-- Kosovo -->
+			<territoryAlias type="XLL" replacement="XL" reason="overlong"/> <!-- null -->
+			<territoryAlias type="XMM" replacement="XM" reason="overlong"/> <!-- null -->
+			<territoryAlias type="XNN" replacement="XN" reason="overlong"/> <!-- null -->
+			<territoryAlias type="XOO" replacement="XO" reason="overlong"/> <!-- null -->
+			<territoryAlias type="XPP" replacement="XP" reason="overlong"/> <!-- null -->
+			<territoryAlias type="XQQ" replacement="XQ" reason="overlong"/> <!-- null -->
+			<territoryAlias type="XRR" replacement="XR" reason="overlong"/> <!-- null -->
+			<territoryAlias type="XSS" replacement="XS" reason="overlong"/> <!-- null -->
+			<territoryAlias type="XTT" replacement="XT" reason="overlong"/> <!-- null -->
+			<territoryAlias type="XUU" replacement="XU" reason="overlong"/> <!-- null -->
+			<territoryAlias type="XVV" replacement="XV" reason="overlong"/> <!-- null -->
+			<territoryAlias type="XWW" replacement="XW" reason="overlong"/> <!-- null -->
+			<territoryAlias type="XXX" replacement="XX" reason="overlong"/> <!-- null -->
+			<territoryAlias type="XYY" replacement="XY" reason="overlong"/> <!-- null -->
+			<territoryAlias type="XZZ" replacement="XZ" reason="overlong"/> <!-- null -->
+			<territoryAlias type="YMD" replacement="YE" reason="overlong"/> <!-- Yemen -->
+			<territoryAlias type="YEM" replacement="YE" reason="overlong"/> <!-- Yemen -->
+			<territoryAlias type="MYT" replacement="YT" reason="overlong"/> <!-- Mayotte -->
+			<territoryAlias type="YUG" replacement="RS ME" reason="overlong"/> <!-- null -->
+			<territoryAlias type="ZAF" replacement="ZA" reason="overlong"/> <!-- South Africa -->
+			<territoryAlias type="ZMB" replacement="ZM" reason="overlong"/> <!-- Zambia -->
+			<territoryAlias type="ZAR" replacement="CD" reason="overlong"/> <!-- Congo - Kinshasa -->
+			<territoryAlias type="ZWE" replacement="ZW" reason="overlong"/> <!-- Zimbabwe -->
+			<territoryAlias type="ZZZ" replacement="ZZ" reason="overlong"/> <!-- Unknown Region -->
+			<territoryAlias type="958" replacement="AA" reason="overlong"/> <!-- null -->
+			<territoryAlias type="020" replacement="AD" reason="overlong"/> <!-- Andorra -->
+			<territoryAlias type="784" replacement="AE" reason="overlong"/> <!-- United Arab Emirates -->
+			<territoryAlias type="004" replacement="AF" reason="overlong"/> <!-- Afghanistan -->
+			<territoryAlias type="028" replacement="AG" reason="overlong"/> <!-- Antigua & Barbuda -->
+			<territoryAlias type="660" replacement="AI" reason="overlong"/> <!-- Anguilla -->
+			<territoryAlias type="008" replacement="AL" reason="overlong"/> <!-- Albania -->
+			<territoryAlias type="051" replacement="AM" reason="overlong"/> <!-- Armenia -->
+			<territoryAlias type="530" replacement="CW SX BQ" reason="overlong"/> <!-- null -->
+			<territoryAlias type="024" replacement="AO" reason="overlong"/> <!-- Angola -->
+			<territoryAlias type="010" replacement="AQ" reason="overlong"/> <!-- Antarctica -->
+			<territoryAlias type="032" replacement="AR" reason="overlong"/> <!-- Argentina -->
+			<territoryAlias type="016" replacement="AS" reason="overlong"/> <!-- American Samoa -->
+			<territoryAlias type="040" replacement="AT" reason="overlong"/> <!-- Austria -->
+			<territoryAlias type="036" replacement="AU" reason="overlong"/> <!-- Australia -->
+			<territoryAlias type="533" replacement="AW" reason="overlong"/> <!-- Aruba -->
+			<territoryAlias type="248" replacement="AX" reason="overlong"/> <!-- Åland Islands -->
+			<territoryAlias type="031" replacement="AZ" reason="overlong"/> <!-- Azerbaijan -->
+			<territoryAlias type="070" replacement="BA" reason="overlong"/> <!-- Bosnia & Herzegovina -->
+			<territoryAlias type="052" replacement="BB" reason="overlong"/> <!-- Barbados -->
+			<territoryAlias type="050" replacement="BD" reason="overlong"/> <!-- Bangladesh -->
+			<territoryAlias type="056" replacement="BE" reason="overlong"/> <!-- Belgium -->
+			<territoryAlias type="854" replacement="BF" reason="overlong"/> <!-- Burkina Faso -->
+			<territoryAlias type="100" replacement="BG" reason="overlong"/> <!-- Bulgaria -->
+			<territoryAlias type="048" replacement="BH" reason="overlong"/> <!-- Bahrain -->
+			<territoryAlias type="108" replacement="BI" reason="overlong"/> <!-- Burundi -->
+			<territoryAlias type="204" replacement="BJ" reason="overlong"/> <!-- Benin -->
+			<territoryAlias type="652" replacement="BL" reason="overlong"/> <!-- St. Barthélemy -->
+			<territoryAlias type="060" replacement="BM" reason="overlong"/> <!-- Bermuda -->
+			<territoryAlias type="096" replacement="BN" reason="overlong"/> <!-- Brunei -->
+			<territoryAlias type="068" replacement="BO" reason="overlong"/> <!-- Bolivia -->
+			<territoryAlias type="535" replacement="BQ" reason="overlong"/> <!-- Caribbean Netherlands -->
+			<territoryAlias type="076" replacement="BR" reason="overlong"/> <!-- Brazil -->
+			<territoryAlias type="044" replacement="BS" reason="overlong"/> <!-- Bahamas -->
+			<territoryAlias type="064" replacement="BT" reason="overlong"/> <!-- Bhutan -->
+			<territoryAlias type="074" replacement="BV" reason="overlong"/> <!-- Bouvet Island -->
+			<territoryAlias type="072" replacement="BW" reason="overlong"/> <!-- Botswana -->
+			<territoryAlias type="112" replacement="BY" reason="overlong"/> <!-- Belarus -->
+			<territoryAlias type="084" replacement="BZ" reason="overlong"/> <!-- Belize -->
+			<territoryAlias type="124" replacement="CA" reason="overlong"/> <!-- Canada -->
+			<territoryAlias type="166" replacement="CC" reason="overlong"/> <!-- Cocos (Keeling) Islands -->
+			<territoryAlias type="180" replacement="CD" reason="overlong"/> <!-- Congo - Kinshasa -->
+			<territoryAlias type="140" replacement="CF" reason="overlong"/> <!-- Central African Republic -->
+			<territoryAlias type="178" replacement="CG" reason="overlong"/> <!-- Congo - Brazzaville -->
+			<territoryAlias type="756" replacement="CH" reason="overlong"/> <!-- Switzerland -->
+			<territoryAlias type="384" replacement="CI" reason="overlong"/> <!-- Côte d’Ivoire -->
+			<territoryAlias type="184" replacement="CK" reason="overlong"/> <!-- Cook Islands -->
+			<territoryAlias type="152" replacement="CL" reason="overlong"/> <!-- Chile -->
+			<territoryAlias type="120" replacement="CM" reason="overlong"/> <!-- Cameroon -->
+			<territoryAlias type="156" replacement="CN" reason="overlong"/> <!-- China -->
+			<territoryAlias type="170" replacement="CO" reason="overlong"/> <!-- Colombia -->
+			<territoryAlias type="188" replacement="CR" reason="overlong"/> <!-- Costa Rica -->
+			<territoryAlias type="192" replacement="CU" reason="overlong"/> <!-- Cuba -->
+			<territoryAlias type="132" replacement="CV" reason="overlong"/> <!-- Cape Verde -->
+			<territoryAlias type="531" replacement="CW" reason="overlong"/> <!-- Curaçao -->
+			<territoryAlias type="162" replacement="CX" reason="overlong"/> <!-- Christmas Island -->
+			<territoryAlias type="196" replacement="CY" reason="overlong"/> <!-- Cyprus -->
+			<territoryAlias type="203" replacement="CZ" reason="overlong"/> <!-- Czech Republic -->
+			<territoryAlias type="278" replacement="DE" reason="overlong"/> <!-- Germany -->
+			<territoryAlias type="276" replacement="DE" reason="overlong"/> <!-- Germany -->
+			<territoryAlias type="262" replacement="DJ" reason="overlong"/> <!-- Djibouti -->
+			<territoryAlias type="208" replacement="DK" reason="overlong"/> <!-- Denmark -->
+			<territoryAlias type="212" replacement="DM" reason="overlong"/> <!-- Dominica -->
+			<territoryAlias type="214" replacement="DO" reason="overlong"/> <!-- Dominican Republic -->
+			<territoryAlias type="012" replacement="DZ" reason="overlong"/> <!-- Algeria -->
+			<territoryAlias type="218" replacement="EC" reason="overlong"/> <!-- Ecuador -->
+			<territoryAlias type="233" replacement="EE" reason="overlong"/> <!-- Estonia -->
+			<territoryAlias type="818" replacement="EG" reason="overlong"/> <!-- Egypt -->
+			<territoryAlias type="732" replacement="EH" reason="overlong"/> <!-- Western Sahara -->
+			<territoryAlias type="232" replacement="ER" reason="overlong"/> <!-- Eritrea -->
+			<territoryAlias type="724" replacement="ES" reason="overlong"/> <!-- Spain -->
+			<territoryAlias type="231" replacement="ET" reason="overlong"/> <!-- Ethiopia -->
+			<territoryAlias type="246" replacement="FI" reason="overlong"/> <!-- Finland -->
+			<territoryAlias type="242" replacement="FJ" reason="overlong"/> <!-- Fiji -->
+			<territoryAlias type="238" replacement="FK" reason="overlong"/> <!-- Falkland Islands -->
+			<territoryAlias type="583" replacement="FM" reason="overlong"/> <!-- Micronesia -->
+			<territoryAlias type="234" replacement="FO" reason="overlong"/> <!-- Faroe Islands -->
+			<territoryAlias type="250" replacement="FR" reason="overlong"/> <!-- France -->
+			<territoryAlias type="249" replacement="FR" reason="overlong"/> <!-- France -->
+			<territoryAlias type="266" replacement="GA" reason="overlong"/> <!-- Gabon -->
+			<territoryAlias type="826" replacement="GB" reason="overlong"/> <!-- United Kingdom -->
+			<territoryAlias type="308" replacement="GD" reason="overlong"/> <!-- Grenada -->
+			<territoryAlias type="268" replacement="GE" reason="overlong"/> <!-- Georgia -->
+			<territoryAlias type="254" replacement="GF" reason="overlong"/> <!-- French Guiana -->
+			<territoryAlias type="831" replacement="GG" reason="overlong"/> <!-- Guernsey -->
+			<territoryAlias type="288" replacement="GH" reason="overlong"/> <!-- Ghana -->
+			<territoryAlias type="292" replacement="GI" reason="overlong"/> <!-- Gibraltar -->
+			<territoryAlias type="304" replacement="GL" reason="overlong"/> <!-- Greenland -->
+			<territoryAlias type="270" replacement="GM" reason="overlong"/> <!-- Gambia -->
+			<territoryAlias type="324" replacement="GN" reason="overlong"/> <!-- Guinea -->
+			<territoryAlias type="312" replacement="GP" reason="overlong"/> <!-- Guadeloupe -->
+			<territoryAlias type="226" replacement="GQ" reason="overlong"/> <!-- Equatorial Guinea -->
+			<territoryAlias type="300" replacement="GR" reason="overlong"/> <!-- Greece -->
+			<territoryAlias type="239" replacement="GS" reason="overlong"/> <!-- South Georgia & South Sandwich Islands -->
+			<territoryAlias type="320" replacement="GT" reason="overlong"/> <!-- Guatemala -->
+			<territoryAlias type="316" replacement="GU" reason="overlong"/> <!-- Guam -->
+			<territoryAlias type="624" replacement="GW" reason="overlong"/> <!-- Guinea-Bissau -->
+			<territoryAlias type="328" replacement="GY" reason="overlong"/> <!-- Guyana -->
+			<territoryAlias type="344" replacement="HK" reason="overlong"/> <!-- Hong Kong SAR China -->
+			<territoryAlias type="334" replacement="HM" reason="overlong"/> <!-- Heard & McDonald Islands -->
+			<territoryAlias type="340" replacement="HN" reason="overlong"/> <!-- Honduras -->
+			<territoryAlias type="191" replacement="HR" reason="overlong"/> <!-- Croatia -->
+			<territoryAlias type="332" replacement="HT" reason="overlong"/> <!-- Haiti -->
+			<territoryAlias type="348" replacement="HU" reason="overlong"/> <!-- Hungary -->
+			<territoryAlias type="360" replacement="ID" reason="overlong"/> <!-- Indonesia -->
+			<territoryAlias type="372" replacement="IE" reason="overlong"/> <!-- Ireland -->
+			<territoryAlias type="376" replacement="IL" reason="overlong"/> <!-- Israel -->
+			<territoryAlias type="833" replacement="IM" reason="overlong"/> <!-- Isle of Man -->
+			<territoryAlias type="356" replacement="IN" reason="overlong"/> <!-- India -->
+			<territoryAlias type="086" replacement="IO" reason="overlong"/> <!-- British Indian Ocean Territory -->
+			<territoryAlias type="368" replacement="IQ" reason="overlong"/> <!-- Iraq -->
+			<territoryAlias type="364" replacement="IR" reason="overlong"/> <!-- Iran -->
+			<territoryAlias type="352" replacement="IS" reason="overlong"/> <!-- Iceland -->
+			<territoryAlias type="380" replacement="IT" reason="overlong"/> <!-- Italy -->
+			<territoryAlias type="832" replacement="JE" reason="overlong"/> <!-- Jersey -->
+			<territoryAlias type="388" replacement="JM" reason="overlong"/> <!-- Jamaica -->
+			<territoryAlias type="400" replacement="JO" reason="overlong"/> <!-- Jordan -->
+			<territoryAlias type="392" replacement="JP" reason="overlong"/> <!-- Japan -->
+			<territoryAlias type="404" replacement="KE" reason="overlong"/> <!-- Kenya -->
+			<territoryAlias type="417" replacement="KG" reason="overlong"/> <!-- Kyrgyzstan -->
+			<territoryAlias type="116" replacement="KH" reason="overlong"/> <!-- Cambodia -->
+			<territoryAlias type="296" replacement="KI" reason="overlong"/> <!-- Kiribati -->
+			<territoryAlias type="174" replacement="KM" reason="overlong"/> <!-- Comoros -->
+			<territoryAlias type="659" replacement="KN" reason="overlong"/> <!-- St. Kitts & Nevis -->
+			<territoryAlias type="408" replacement="KP" reason="overlong"/> <!-- North Korea -->
+			<territoryAlias type="410" replacement="KR" reason="overlong"/> <!-- South Korea -->
+			<territoryAlias type="414" replacement="KW" reason="overlong"/> <!-- Kuwait -->
+			<territoryAlias type="136" replacement="KY" reason="overlong"/> <!-- Cayman Islands -->
+			<territoryAlias type="398" replacement="KZ" reason="overlong"/> <!-- Kazakhstan -->
+			<territoryAlias type="418" replacement="LA" reason="overlong"/> <!-- Laos -->
+			<territoryAlias type="422" replacement="LB" reason="overlong"/> <!-- Lebanon -->
+			<territoryAlias type="662" replacement="LC" reason="overlong"/> <!-- St. Lucia -->
+			<territoryAlias type="438" replacement="LI" reason="overlong"/> <!-- Liechtenstein -->
+			<territoryAlias type="144" replacement="LK" reason="overlong"/> <!-- Sri Lanka -->
+			<territoryAlias type="430" replacement="LR" reason="overlong"/> <!-- Liberia -->
+			<territoryAlias type="426" replacement="LS" reason="overlong"/> <!-- Lesotho -->
+			<territoryAlias type="440" replacement="LT" reason="overlong"/> <!-- Lithuania -->
+			<territoryAlias type="442" replacement="LU" reason="overlong"/> <!-- Luxembourg -->
+			<territoryAlias type="428" replacement="LV" reason="overlong"/> <!-- Latvia -->
+			<territoryAlias type="434" replacement="LY" reason="overlong"/> <!-- Libya -->
+			<territoryAlias type="504" replacement="MA" reason="overlong"/> <!-- Morocco -->
+			<territoryAlias type="492" replacement="MC" reason="overlong"/> <!-- Monaco -->
+			<territoryAlias type="498" replacement="MD" reason="overlong"/> <!-- Moldova -->
+			<territoryAlias type="499" replacement="ME" reason="overlong"/> <!-- Montenegro -->
+			<territoryAlias type="663" replacement="MF" reason="overlong"/> <!-- St. Martin -->
+			<territoryAlias type="450" replacement="MG" reason="overlong"/> <!-- Madagascar -->
+			<territoryAlias type="584" replacement="MH" reason="overlong"/> <!-- Marshall Islands -->
+			<territoryAlias type="807" replacement="MK" reason="overlong"/> <!-- Macedonia -->
+			<territoryAlias type="466" replacement="ML" reason="overlong"/> <!-- Mali -->
+			<territoryAlias type="104" replacement="MM" reason="overlong"/> <!-- Myanmar (Burma) -->
+			<territoryAlias type="496" replacement="MN" reason="overlong"/> <!-- Mongolia -->
+			<territoryAlias type="446" replacement="MO" reason="overlong"/> <!-- Macau SAR China -->
+			<territoryAlias type="580" replacement="MP" reason="overlong"/> <!-- Northern Mariana Islands -->
+			<territoryAlias type="474" replacement="MQ" reason="overlong"/> <!-- Martinique -->
+			<territoryAlias type="478" replacement="MR" reason="overlong"/> <!-- Mauritania -->
+			<territoryAlias type="500" replacement="MS" reason="overlong"/> <!-- Montserrat -->
+			<territoryAlias type="470" replacement="MT" reason="overlong"/> <!-- Malta -->
+			<territoryAlias type="480" replacement="MU" reason="overlong"/> <!-- Mauritius -->
+			<territoryAlias type="462" replacement="MV" reason="overlong"/> <!-- Maldives -->
+			<territoryAlias type="454" replacement="MW" reason="overlong"/> <!-- Malawi -->
+			<territoryAlias type="484" replacement="MX" reason="overlong"/> <!-- Mexico -->
+			<territoryAlias type="458" replacement="MY" reason="overlong"/> <!-- Malaysia -->
+			<territoryAlias type="508" replacement="MZ" reason="overlong"/> <!-- Mozambique -->
+			<territoryAlias type="516" replacement="NA" reason="overlong"/> <!-- Namibia -->
+			<territoryAlias type="540" replacement="NC" reason="overlong"/> <!-- New Caledonia -->
+			<territoryAlias type="562" replacement="NE" reason="overlong"/> <!-- Niger -->
+			<territoryAlias type="574" replacement="NF" reason="overlong"/> <!-- Norfolk Island -->
+			<territoryAlias type="566" replacement="NG" reason="overlong"/> <!-- Nigeria -->
+			<territoryAlias type="558" replacement="NI" reason="overlong"/> <!-- Nicaragua -->
+			<territoryAlias type="528" replacement="NL" reason="overlong"/> <!-- Netherlands -->
+			<territoryAlias type="578" replacement="NO" reason="overlong"/> <!-- Norway -->
+			<territoryAlias type="524" replacement="NP" reason="overlong"/> <!-- Nepal -->
+			<territoryAlias type="520" replacement="NR" reason="overlong"/> <!-- Nauru -->
+			<territoryAlias type="536" replacement="SA IQ" reason="overlong"/> <!-- null -->
+			<territoryAlias type="570" replacement="NU" reason="overlong"/> <!-- Niue -->
+			<territoryAlias type="554" replacement="NZ" reason="overlong"/> <!-- New Zealand -->
+			<territoryAlias type="512" replacement="OM" reason="overlong"/> <!-- Oman -->
+			<territoryAlias type="591" replacement="PA" reason="overlong"/> <!-- Panama -->
+			<territoryAlias type="604" replacement="PE" reason="overlong"/> <!-- Peru -->
+			<territoryAlias type="258" replacement="PF" reason="overlong"/> <!-- French Polynesia -->
+			<territoryAlias type="598" replacement="PG" reason="overlong"/> <!-- Papua New Guinea -->
+			<territoryAlias type="608" replacement="PH" reason="overlong"/> <!-- Philippines -->
+			<territoryAlias type="586" replacement="PK" reason="overlong"/> <!-- Pakistan -->
+			<territoryAlias type="616" replacement="PL" reason="overlong"/> <!-- Poland -->
+			<territoryAlias type="666" replacement="PM" reason="overlong"/> <!-- St. Pierre & Miquelon -->
+			<territoryAlias type="612" replacement="PN" reason="overlong"/> <!-- Pitcairn Islands -->
+			<territoryAlias type="630" replacement="PR" reason="overlong"/> <!-- Puerto Rico -->
+			<territoryAlias type="275" replacement="PS" reason="overlong"/> <!-- Palestinian Territories -->
+			<territoryAlias type="620" replacement="PT" reason="overlong"/> <!-- Portugal -->
+			<territoryAlias type="585" replacement="PW" reason="overlong"/> <!-- Palau -->
+			<territoryAlias type="600" replacement="PY" reason="overlong"/> <!-- Paraguay -->
+			<territoryAlias type="634" replacement="QA" reason="overlong"/> <!-- Qatar -->
+			<territoryAlias type="959" replacement="QM" reason="overlong"/> <!-- null -->
+			<territoryAlias type="960" replacement="QN" reason="overlong"/> <!-- null -->
+			<territoryAlias type="962" replacement="QP" reason="overlong"/> <!-- null -->
+			<territoryAlias type="963" replacement="QQ" reason="overlong"/> <!-- null -->
+			<territoryAlias type="964" replacement="QR" reason="overlong"/> <!-- null -->
+			<territoryAlias type="965" replacement="QS" reason="overlong"/> <!-- null -->
+			<territoryAlias type="966" replacement="QT" reason="overlong"/> <!-- null -->
+			<territoryAlias type="967" replacement="EU" reason="overlong"/> <!-- European Union -->
+			<territoryAlias type="968" replacement="QV" reason="overlong"/> <!-- null -->
+			<territoryAlias type="969" replacement="QW" reason="overlong"/> <!-- null -->
+			<territoryAlias type="970" replacement="QX" reason="overlong"/> <!-- null -->
+			<territoryAlias type="971" replacement="QY" reason="overlong"/> <!-- null -->
+			<territoryAlias type="972" replacement="QZ" reason="overlong"/> <!-- null -->
+			<territoryAlias type="638" replacement="RE" reason="overlong"/> <!-- Réunion -->
+			<territoryAlias type="642" replacement="RO" reason="overlong"/> <!-- Romania -->
+			<territoryAlias type="688" replacement="RS" reason="overlong"/> <!-- Serbia -->
+			<territoryAlias type="891" replacement="RS ME" reason="overlong"/> <!-- Serbia and Montenegro -->
+			<territoryAlias type="643" replacement="RU" reason="overlong"/> <!-- Russia -->
+			<territoryAlias type="646" replacement="RW" reason="overlong"/> <!-- Rwanda -->
+			<territoryAlias type="682" replacement="SA" reason="overlong"/> <!-- Saudi Arabia -->
+			<territoryAlias type="090" replacement="SB" reason="overlong"/> <!-- Solomon Islands -->
+			<territoryAlias type="690" replacement="SC" reason="overlong"/> <!-- Seychelles -->
+			<territoryAlias type="729" replacement="SD" reason="overlong"/> <!-- Sudan -->
+			<territoryAlias type="752" replacement="SE" reason="overlong"/> <!-- Sweden -->
+			<territoryAlias type="702" replacement="SG" reason="overlong"/> <!-- Singapore -->
+			<territoryAlias type="654" replacement="SH" reason="overlong"/> <!-- St. Helena -->
+			<territoryAlias type="705" replacement="SI" reason="overlong"/> <!-- Slovenia -->
+			<territoryAlias type="744" replacement="SJ" reason="overlong"/> <!-- Svalbard & Jan Mayen -->
+			<territoryAlias type="703" replacement="SK" reason="overlong"/> <!-- Slovakia -->
+			<territoryAlias type="694" replacement="SL" reason="overlong"/> <!-- Sierra Leone -->
+			<territoryAlias type="674" replacement="SM" reason="overlong"/> <!-- San Marino -->
+			<territoryAlias type="686" replacement="SN" reason="overlong"/> <!-- Senegal -->
+			<territoryAlias type="706" replacement="SO" reason="overlong"/> <!-- Somalia -->
+			<territoryAlias type="740" replacement="SR" reason="overlong"/> <!-- Suriname -->
+			<territoryAlias type="728" replacement="SS" reason="overlong"/> <!-- South Sudan -->
+			<territoryAlias type="678" replacement="ST" reason="overlong"/> <!-- São Tomé & Príncipe -->
+			<territoryAlias type="810" replacement="RU AM AZ BY EE GE KZ KG LV LT MD TJ TM UA UZ" reason="overlong"/> <!-- null -->
+			<territoryAlias type="222" replacement="SV" reason="overlong"/> <!-- El Salvador -->
+			<territoryAlias type="534" replacement="SX" reason="overlong"/> <!-- Sint Maarten -->
+			<territoryAlias type="760" replacement="SY" reason="overlong"/> <!-- Syria -->
+			<territoryAlias type="748" replacement="SZ" reason="overlong"/> <!-- Swaziland -->
+			<territoryAlias type="796" replacement="TC" reason="overlong"/> <!-- Turks & Caicos Islands -->
+			<territoryAlias type="148" replacement="TD" reason="overlong"/> <!-- Chad -->
+			<territoryAlias type="260" replacement="TF" reason="overlong"/> <!-- French Southern Territories -->
+			<territoryAlias type="768" replacement="TG" reason="overlong"/> <!-- Togo -->
+			<territoryAlias type="764" replacement="TH" reason="overlong"/> <!-- Thailand -->
+			<territoryAlias type="762" replacement="TJ" reason="overlong"/> <!-- Tajikistan -->
+			<territoryAlias type="772" replacement="TK" reason="overlong"/> <!-- Tokelau -->
+			<territoryAlias type="626" replacement="TL" reason="overlong"/> <!-- Timor-Leste -->
+			<territoryAlias type="795" replacement="TM" reason="overlong"/> <!-- Turkmenistan -->
+			<territoryAlias type="788" replacement="TN" reason="overlong"/> <!-- Tunisia -->
+			<territoryAlias type="776" replacement="TO" reason="overlong"/> <!-- Tonga -->
+			<territoryAlias type="792" replacement="TR" reason="overlong"/> <!-- Turkey -->
+			<territoryAlias type="780" replacement="TT" reason="overlong"/> <!-- Trinidad & Tobago -->
+			<territoryAlias type="798" replacement="TV" reason="overlong"/> <!-- Tuvalu -->
+			<territoryAlias type="158" replacement="TW" reason="overlong"/> <!-- Taiwan -->
+			<territoryAlias type="834" replacement="TZ" reason="overlong"/> <!-- Tanzania -->
+			<territoryAlias type="804" replacement="UA" reason="overlong"/> <!-- Ukraine -->
+			<territoryAlias type="800" replacement="UG" reason="overlong"/> <!-- Uganda -->
+			<territoryAlias type="581" replacement="UM" reason="overlong"/> <!-- U.S. Outlying Islands -->
+			<territoryAlias type="840" replacement="US" reason="overlong"/> <!-- United States -->
+			<territoryAlias type="858" replacement="UY" reason="overlong"/> <!-- Uruguay -->
+			<territoryAlias type="860" replacement="UZ" reason="overlong"/> <!-- Uzbekistan -->
+			<territoryAlias type="336" replacement="VA" reason="overlong"/> <!-- Vatican City -->
+			<territoryAlias type="670" replacement="VC" reason="overlong"/> <!-- St. Vincent & Grenadines -->
+			<territoryAlias type="862" replacement="VE" reason="overlong"/> <!-- Venezuela -->
+			<territoryAlias type="092" replacement="VG" reason="overlong"/> <!-- British Virgin Islands -->
+			<territoryAlias type="850" replacement="VI" reason="overlong"/> <!-- U.S. Virgin Islands -->
+			<territoryAlias type="704" replacement="VN" reason="overlong"/> <!-- Vietnam -->
+			<territoryAlias type="548" replacement="VU" reason="overlong"/> <!-- Vanuatu -->
+			<territoryAlias type="876" replacement="WF" reason="overlong"/> <!-- Wallis & Futuna -->
+			<territoryAlias type="882" replacement="WS" reason="overlong"/> <!-- Samoa -->
+			<territoryAlias type="973" replacement="XA" reason="overlong"/> <!-- null -->
+			<territoryAlias type="974" replacement="XB" reason="overlong"/> <!-- null -->
+			<territoryAlias type="975" replacement="XC" reason="overlong"/> <!-- null -->
+			<territoryAlias type="976" replacement="XD" reason="overlong"/> <!-- null -->
+			<territoryAlias type="977" replacement="XE" reason="overlong"/> <!-- null -->
+			<territoryAlias type="978" replacement="XF" reason="overlong"/> <!-- null -->
+			<territoryAlias type="979" replacement="XG" reason="overlong"/> <!-- null -->
+			<territoryAlias type="980" replacement="XH" reason="overlong"/> <!-- null -->
+			<territoryAlias type="981" replacement="XI" reason="overlong"/> <!-- null -->
+			<territoryAlias type="982" replacement="XJ" reason="overlong"/> <!-- null -->
+			<territoryAlias type="983" replacement="XK" reason="overlong"/> <!-- Kosovo -->
+			<territoryAlias type="984" replacement="XL" reason="overlong"/> <!-- null -->
+			<territoryAlias type="985" replacement="XM" reason="overlong"/> <!-- null -->
+			<territoryAlias type="986" replacement="XN" reason="overlong"/> <!-- null -->
+			<territoryAlias type="987" replacement="XO" reason="overlong"/> <!-- null -->
+			<territoryAlias type="988" replacement="XP" reason="overlong"/> <!-- null -->
+			<territoryAlias type="989" replacement="XQ" reason="overlong"/> <!-- null -->
+			<territoryAlias type="990" replacement="XR" reason="overlong"/> <!-- null -->
+			<territoryAlias type="991" replacement="XS" reason="overlong"/> <!-- null -->
+			<territoryAlias type="992" replacement="XT" reason="overlong"/> <!-- null -->
+			<territoryAlias type="993" replacement="XU" reason="overlong"/> <!-- null -->
+			<territoryAlias type="994" replacement="XV" reason="overlong"/> <!-- null -->
+			<territoryAlias type="995" replacement="XW" reason="overlong"/> <!-- null -->
+			<territoryAlias type="996" replacement="XX" reason="overlong"/> <!-- null -->
+			<territoryAlias type="997" replacement="XY" reason="overlong"/> <!-- null -->
+			<territoryAlias type="998" replacement="XZ" reason="overlong"/> <!-- null -->
+			<territoryAlias type="720" replacement="YE" reason="overlong"/> <!-- Yemen -->
+			<territoryAlias type="887" replacement="YE" reason="overlong"/> <!-- Yemen -->
+			<territoryAlias type="175" replacement="YT" reason="overlong"/> <!-- Mayotte -->
+			<territoryAlias type="710" replacement="ZA" reason="overlong"/> <!-- South Africa -->
+			<territoryAlias type="894" replacement="ZM" reason="overlong"/> <!-- Zambia -->
+			<territoryAlias type="716" replacement="ZW" reason="overlong"/> <!-- Zimbabwe -->
+			<territoryAlias type="999" replacement="ZZ" reason="overlong"/> <!-- Unknown Region -->
+            <!-- end of data generated with CountItems tool per http://sites.google.com/site/cldr/development/updating-codes/update-languagescriptregion-subtags -->
+			<!-- start of data generated with GenerateSubdivisions -->
+			<subdivisionAlias type="CN-71" replacement="TW" reason="overlong"/> <!-- Taiwan => Taiwan -->
+			<subdivisionAlias type="CN-91" replacement="HK" reason="overlong"/> <!-- Hong Kong SAR China => Hong Kong SAR China -->
+			<subdivisionAlias type="CN-92" replacement="MO" reason="overlong"/> <!-- Macau SAR China => Macau SAR China -->
+			<subdivisionAlias type="FR-BL" replacement="BL" reason="overlong"/> <!-- St. Barthélemy => St. Barthélemy -->
+			<subdivisionAlias type="FR-GF" replacement="GF" reason="overlong"/> <!-- French Guiana => French Guiana -->
+			<subdivisionAlias type="FR-GP" replacement="GP" reason="overlong"/> <!-- Guadeloupe => Guadeloupe -->
+			<subdivisionAlias type="FR-MF" replacement="MF" reason="overlong"/> <!-- St. Martin => St. Martin -->
+			<subdivisionAlias type="FR-MQ" replacement="MQ" reason="overlong"/> <!-- Martinique => Martinique -->
+			<subdivisionAlias type="FR-NC" replacement="NC" reason="overlong"/> <!-- New Caledonia => New Caledonia -->
+			<subdivisionAlias type="FR-PF" replacement="PF" reason="overlong"/> <!-- French Polynesia => French Polynesia -->
+			<subdivisionAlias type="FR-PM" replacement="PM" reason="overlong"/> <!-- St. Pierre & Miquelon => St. Pierre & Miquelon -->
+			<subdivisionAlias type="FR-RE" replacement="RE" reason="overlong"/> <!-- Réunion => Réunion -->
+			<subdivisionAlias type="FR-TF" replacement="TF" reason="overlong"/> <!-- French Southern Territories => French Southern Territories -->
+			<subdivisionAlias type="FR-WF" replacement="WF" reason="overlong"/> <!-- Wallis & Futuna => Wallis & Futuna -->
+			<subdivisionAlias type="FR-YT" replacement="YT" reason="overlong"/> <!-- Mayotte => Mayotte -->
+			<subdivisionAlias type="NL-AW" replacement="AW" reason="overlong"/> <!-- Aruba => Aruba -->
+			<subdivisionAlias type="NL-CW" replacement="CW" reason="overlong"/> <!-- Curaçao => Curaçao -->
+			<subdivisionAlias type="NL-SX" replacement="SX" reason="overlong"/> <!-- Sint Maarten => Sint Maarten -->
+			<subdivisionAlias type="US-AS" replacement="AS" reason="overlong"/> <!-- American Samoa => American Samoa -->
+			<subdivisionAlias type="US-GU" replacement="GU" reason="overlong"/> <!-- Guam => Guam -->
+			<subdivisionAlias type="US-MP" replacement="MP" reason="overlong"/> <!-- Northern Mariana Islands => Northern Mariana Islands -->
+			<subdivisionAlias type="US-PR" replacement="PR" reason="overlong"/> <!-- Puerto Rico => Puerto Rico -->
+			<subdivisionAlias type="US-UM" replacement="UM" reason="overlong"/> <!-- U.S. Outlying Islands => U.S. Outlying Islands -->
+			<subdivisionAlias type="US-VI" replacement="VI" reason="overlong"/> <!-- U.S. Virgin Islands => U.S. Virgin Islands -->
+			<!-- <subdivisionAlias type="AL-BR" replacement="??" reason="deprecated"/> <!- - Berat => ?? -->
+			<!-- <subdivisionAlias type="AL-BU" replacement="??" reason="deprecated"/> <!- - Bulqizë => ?? -->
+			<!-- <subdivisionAlias type="AL-DI" replacement="??" reason="deprecated"/> <!- - Dibër => ?? -->
+			<!-- <subdivisionAlias type="AL-DL" replacement="??" reason="deprecated"/> <!- - Delvinë => ?? -->
+			<!-- <subdivisionAlias type="AL-DR" replacement="??" reason="deprecated"/> <!- - Durrës => ?? -->
+			<!-- <subdivisionAlias type="AL-DV" replacement="??" reason="deprecated"/> <!- - Devoll => ?? -->
+			<!-- <subdivisionAlias type="AL-EL" replacement="??" reason="deprecated"/> <!- - Elbasan => ?? -->
+			<!-- <subdivisionAlias type="AL-ER" replacement="??" reason="deprecated"/> <!- - Kolonjë => ?? -->
+			<!-- <subdivisionAlias type="AL-FR" replacement="??" reason="deprecated"/> <!- - Fier => ?? -->
+			<!-- <subdivisionAlias type="AL-GJ" replacement="??" reason="deprecated"/> <!- - Gjirokastër => ?? -->
+			<!-- <subdivisionAlias type="AL-GR" replacement="??" reason="deprecated"/> <!- - Gramsh => ?? -->
+			<!-- <subdivisionAlias type="AL-HA" replacement="??" reason="deprecated"/> <!- - Has => ?? -->
+			<!-- <subdivisionAlias type="AL-KA" replacement="??" reason="deprecated"/> <!- - Kavajë => ?? -->
+			<!-- <subdivisionAlias type="AL-KB" replacement="??" reason="deprecated"/> <!- - Kurbin => ?? -->
+			<!-- <subdivisionAlias type="AL-KC" replacement="??" reason="deprecated"/> <!- - Kuçovë => ?? -->
+			<!-- <subdivisionAlias type="AL-KO" replacement="??" reason="deprecated"/> <!- - Korçë => ?? -->
+			<!-- <subdivisionAlias type="AL-KR" replacement="??" reason="deprecated"/> <!- - Krujë => ?? -->
+			<!-- <subdivisionAlias type="AL-KU" replacement="??" reason="deprecated"/> <!- - Kukës => ?? -->
+			<!-- <subdivisionAlias type="AL-LB" replacement="??" reason="deprecated"/> <!- - Librazhd => ?? -->
+			<!-- <subdivisionAlias type="AL-LE" replacement="??" reason="deprecated"/> <!- - Lezhë => ?? -->
+			<!-- <subdivisionAlias type="AL-LU" replacement="??" reason="deprecated"/> <!- - Lushnjë => ?? -->
+			<!-- <subdivisionAlias type="AL-MK" replacement="??" reason="deprecated"/> <!- - Mallakastër => ?? -->
+			<!-- <subdivisionAlias type="AL-MM" replacement="??" reason="deprecated"/> <!- - Malësi e Madhe => ?? -->
+			<!-- <subdivisionAlias type="AL-MR" replacement="??" reason="deprecated"/> <!- - Mirditë => ?? -->
+			<!-- <subdivisionAlias type="AL-MT" replacement="??" reason="deprecated"/> <!- - Mat => ?? -->
+			<!-- <subdivisionAlias type="AL-PG" replacement="??" reason="deprecated"/> <!- - Pogradec => ?? -->
+			<!-- <subdivisionAlias type="AL-PQ" replacement="??" reason="deprecated"/> <!- - Peqin => ?? -->
+			<!-- <subdivisionAlias type="AL-PR" replacement="??" reason="deprecated"/> <!- - Përmet => ?? -->
+			<!-- <subdivisionAlias type="AL-PU" replacement="??" reason="deprecated"/> <!- - Pukë => ?? -->
+			<!-- <subdivisionAlias type="AL-SH" replacement="??" reason="deprecated"/> <!- - Shkodër => ?? -->
+			<!-- <subdivisionAlias type="AL-SK" replacement="??" reason="deprecated"/> <!- - Skrapar => ?? -->
+			<!-- <subdivisionAlias type="AL-SR" replacement="??" reason="deprecated"/> <!- - Sarandë => ?? -->
+			<!-- <subdivisionAlias type="AL-TE" replacement="??" reason="deprecated"/> <!- - Tepelenë => ?? -->
+			<!-- <subdivisionAlias type="AL-TP" replacement="??" reason="deprecated"/> <!- - Tropojë => ?? -->
+			<!-- <subdivisionAlias type="AL-TR" replacement="??" reason="deprecated"/> <!- - Tirana => ?? -->
+			<!-- <subdivisionAlias type="AL-VL" replacement="??" reason="deprecated"/> <!- - Vlorë => ?? -->
+			<!-- <subdivisionAlias type="BA-01" replacement="??" reason="deprecated"/> <!- - Una-Sana => ?? -->
+			<!-- <subdivisionAlias type="BA-02" replacement="??" reason="deprecated"/> <!- - Posavina => ?? -->
+			<!-- <subdivisionAlias type="BA-03" replacement="??" reason="deprecated"/> <!- - Tuzlanski => ?? -->
+			<!-- <subdivisionAlias type="BA-04" replacement="??" reason="deprecated"/> <!- - Zenica-Doboj => ?? -->
+			<!-- <subdivisionAlias type="BA-05" replacement="??" reason="deprecated"/> <!- - Bosnian Podrinje => ?? -->
+			<!-- <subdivisionAlias type="BA-06" replacement="??" reason="deprecated"/> <!- - Central Bosnia => ?? -->
+			<!-- <subdivisionAlias type="BA-07" replacement="??" reason="deprecated"/> <!- - Herzegovina-Neretva => ?? -->
+			<!-- <subdivisionAlias type="BA-08" replacement="??" reason="deprecated"/> <!- - West Herzegovina => ?? -->
+			<!-- <subdivisionAlias type="BA-09" replacement="??" reason="deprecated"/> <!- - Sarajevo => ?? -->
+			<!-- <subdivisionAlias type="BA-10" replacement="??" reason="deprecated"/> <!- - Livanjski => ?? -->
+			<!-- <subdivisionAlias type="BH-16" replacement="??" reason="deprecated"/> <!- - Central => ?? -->
+			<!-- <subdivisionAlias type="CI-01" replacement="??" reason="deprecated"/> <!- - Lagunes => ?? -->
+			<!-- <subdivisionAlias type="CI-02" replacement="??" reason="deprecated"/> <!- - Haut-Sassandra => ?? -->
+			<!-- <subdivisionAlias type="CI-03" replacement="??" reason="deprecated"/> <!- - Savanes => ?? -->
+			<!-- <subdivisionAlias type="CI-04" replacement="??" reason="deprecated"/> <!- - Vallée du Bandama => ?? -->
+			<!-- <subdivisionAlias type="CI-05" replacement="??" reason="deprecated"/> <!- - Moyen-Comoé => ?? -->
+			<!-- <subdivisionAlias type="CI-06" replacement="??" reason="deprecated"/> <!- - Dix-Huit Montagnes => ?? -->
+			<!-- <subdivisionAlias type="CI-07" replacement="??" reason="deprecated"/> <!- - Lacs => ?? -->
+			<!-- <subdivisionAlias type="CI-08" replacement="??" reason="deprecated"/> <!- - Zanzan => ?? -->
+			<!-- <subdivisionAlias type="CI-09" replacement="??" reason="deprecated"/> <!- - Bas-Sassandra => ?? -->
+			<!-- <subdivisionAlias type="CI-10" replacement="??" reason="deprecated"/> <!- - Denguélé => ?? -->
+			<!-- <subdivisionAlias type="CI-11" replacement="??" reason="deprecated"/> <!- - N’zi-Comoé => ?? -->
+			<!-- <subdivisionAlias type="CI-12" replacement="??" reason="deprecated"/> <!- - Marahoué => ?? -->
+			<!-- <subdivisionAlias type="CI-13" replacement="??" reason="deprecated"/> <!- - Sud-Comoé => ?? -->
+			<!-- <subdivisionAlias type="CI-14" replacement="??" reason="deprecated"/> <!- - Worodougou => ?? -->
+			<!-- <subdivisionAlias type="CI-15" replacement="??" reason="deprecated"/> <!- - Sud-Bandama => ?? -->
+			<!-- <subdivisionAlias type="CI-16" replacement="??" reason="deprecated"/> <!- - Agnéby => ?? -->
+			<!-- <subdivisionAlias type="CI-17" replacement="??" reason="deprecated"/> <!- - Bafing => ?? -->
+			<!-- <subdivisionAlias type="CI-18" replacement="??" reason="deprecated"/> <!- - Fromager => ?? -->
+			<!-- <subdivisionAlias type="CI-19" replacement="??" reason="deprecated"/> <!- - Moyen-Cavally => ?? -->
+			<!-- <subdivisionAlias type="GB-ANT" replacement="??" reason="deprecated"/> <!- - Antrim => ?? -->
+			<!-- <subdivisionAlias type="GB-ARD" replacement="??" reason="deprecated"/> <!- - Ards => ?? -->
+			<!-- <subdivisionAlias type="GB-ARM" replacement="??" reason="deprecated"/> <!- - Armagh => ?? -->
+			<!-- <subdivisionAlias type="GB-BLA" replacement="??" reason="deprecated"/> <!- - Ballymena => ?? -->
+			<!-- <subdivisionAlias type="GB-BLY" replacement="??" reason="deprecated"/> <!- - Ballymoney => ?? -->
+			<!-- <subdivisionAlias type="GB-BNB" replacement="??" reason="deprecated"/> <!- - Banbridge => ?? -->
+			<!-- <subdivisionAlias type="GB-CGV" replacement="??" reason="deprecated"/> <!- - Craigavon => ?? -->
+			<!-- <subdivisionAlias type="GB-CKF" replacement="??" reason="deprecated"/> <!- - Carrickfergus => ?? -->
+			<!-- <subdivisionAlias type="GB-CKT" replacement="??" reason="deprecated"/> <!- - Cookstown => ?? -->
+			<!-- <subdivisionAlias type="GB-CLR" replacement="??" reason="deprecated"/> <!- - Coleraine => ?? -->
+			<!-- <subdivisionAlias type="GB-CSR" replacement="??" reason="deprecated"/> <!- - Castlereagh => ?? -->
+			<!-- <subdivisionAlias type="GB-DGN" replacement="??" reason="deprecated"/> <!- - Dungannon and South Tyrone => ?? -->
+			<!-- <subdivisionAlias type="GB-DOW" replacement="??" reason="deprecated"/> <!- - Down => ?? -->
+			<!-- <subdivisionAlias type="GB-DRY" replacement="??" reason="deprecated"/> <!- - Derry => ?? -->
+			<!-- <subdivisionAlias type="GB-FER" replacement="??" reason="deprecated"/> <!- - Fermanagh => ?? -->
+			<!-- <subdivisionAlias type="GB-LMV" replacement="??" reason="deprecated"/> <!- - Limavady => ?? -->
+			<!-- <subdivisionAlias type="GB-LRN" replacement="??" reason="deprecated"/> <!- - Larne => ?? -->
+			<!-- <subdivisionAlias type="GB-LSB" replacement="??" reason="deprecated"/> <!- - Lisburn => ?? -->
+			<!-- <subdivisionAlias type="GB-MFT" replacement="??" reason="deprecated"/> <!- - Magherafelt => ?? -->
+			<!-- <subdivisionAlias type="GB-MYL" replacement="??" reason="deprecated"/> <!- - Moyle => ?? -->
+			<!-- <subdivisionAlias type="GB-NDN" replacement="??" reason="deprecated"/> <!- - North Down => ?? -->
+			<!-- <subdivisionAlias type="GB-NTA" replacement="??" reason="deprecated"/> <!- - Newtownabbey => ?? -->
+			<!-- <subdivisionAlias type="GB-NYM" replacement="??" reason="deprecated"/> <!- - Newry and Mourne => ?? -->
+			<!-- <subdivisionAlias type="GB-OMH" replacement="??" reason="deprecated"/> <!- - Omagh => ?? -->
+			<!-- <subdivisionAlias type="GB-STB" replacement="??" reason="deprecated"/> <!- - Strabane => ?? -->
+			<!-- <subdivisionAlias type="IS-0" replacement="??" reason="deprecated"/> <!- - Reykjavík => ?? -->
+			<subdivisionAlias type="LA-XN" replacement="LA-XS" reason="deprecated"/> <!-- Xaisomboun => Xaisomboun -->
+			<subdivisionAlias type="LU-D" replacement="LU-CL LU-DI LU-RD LU-VD LU-WI" reason="deprecated"/> <!-- Diekirch => Clervaux, Diekirch, Redange, Vianden, Wiltz -->
+			<subdivisionAlias type="LU-G" replacement="LU-EC LU-GR LU-RM" reason="deprecated"/> <!-- Grevenmacher => Echternach, Grevenmacher, Remich -->
+			<subdivisionAlias type="LU-L" replacement="LU-CA LU-ES LU-LU LU-ME" reason="deprecated"/> <!-- Luxembourg => Capellen, Esch-sur-Alzette, Luxembourg, Mersch -->
+			<!-- <subdivisionAlias type="MK-01" replacement="??" reason="deprecated"/> <!- - Aerodrom => ?? -->
+			<!-- <subdivisionAlias type="MK-09" replacement="??" reason="deprecated"/> <!- - Butel => ?? -->
+			<!-- <subdivisionAlias type="MK-15" replacement="??" reason="deprecated"/> <!- - Vraneštica => ?? -->
+			<!-- <subdivisionAlias type="MK-17" replacement="??" reason="deprecated"/> <!- - Gazi Baba => ?? -->
+			<!-- <subdivisionAlias type="MK-28" replacement="??" reason="deprecated"/> <!- - Drugovo => ?? -->
+			<!-- <subdivisionAlias type="MK-29" replacement="??" reason="deprecated"/> <!- - Gjorče Petrov => ?? -->
+			<!-- <subdivisionAlias type="MK-31" replacement="??" reason="deprecated"/> <!- - Zajas => ?? -->
+			<!-- <subdivisionAlias type="MK-38" replacement="??" reason="deprecated"/> <!- - Karpoš => ?? -->
+			<!-- <subdivisionAlias type="MK-39" replacement="??" reason="deprecated"/> <!- - Kisela Voda => ?? -->
+			<!-- <subdivisionAlias type="MK-57" replacement="??" reason="deprecated"/> <!- - Oslomej => ?? -->
+			<!-- <subdivisionAlias type="MK-68" replacement="??" reason="deprecated"/> <!- - Saraj => ?? -->
+			<!-- <subdivisionAlias type="MK-77" replacement="??" reason="deprecated"/> <!- - Centar => ?? -->
+			<!-- <subdivisionAlias type="MK-79" replacement="??" reason="deprecated"/> <!- - Čair => ?? -->
+			<!-- <subdivisionAlias type="MK-84" replacement="??" reason="deprecated"/> <!- - Šuto Orizari => ?? -->
+			<subdivisionAlias type="MR-NKC" replacement="MR-13 MR-14 MR-15" reason="deprecated"/> <!-- Nouakchott => Nouakchott Ouest, Nouakchott Nord, Nouakchott Sud -->
+			<subdivisionAlias type="NZ-N" replacement="NZ-AUK NZ-BOP NZ-GIS NZ-HKB NZ-MWT NZ-NTL NZ-TKI NZ-WGN NZ-WKO" reason="deprecated"/> <!-- North Island => Auckland, Bay of Plenty, Gisborne, Hawke’s Bay, Manawatu-Wanganui, Northland, Taranaki, Wellington, Waikato -->
+			<subdivisionAlias type="NZ-S" replacement="NZ-CAN NZ-MBH NZ-NSN NZ-OTA NZ-STL NZ-TAS NZ-WTC" reason="deprecated"/> <!-- South Island => Canterbury, Marl, Nelson, Otago, Southland, Tasman, West Coast -->
+			<subdivisionAlias type="OM-BA" replacement="OM-BJ OM-BS" reason="deprecated"/> <!-- Al Batinah => Janub al Batinah, Shamal al Batinah -->
+			<subdivisionAlias type="OM-SH" replacement="OM-SJ OM-SS" reason="deprecated"/> <!-- Ash Sharqiyah => Janub ash Sharqiyah, Shamal ash Sharqiyah -->
+			<subdivisionAlias type="TT-ETO" replacement="TT-TOB" reason="deprecated"/> <!-- Eastern Tobago => Tobago -->
+			<subdivisionAlias type="TT-RCM" replacement="TT-MRC" reason="deprecated"/> <!-- Rio Claro-Mayaro => Mayaro-Rio Claro -->
+			<subdivisionAlias type="TT-WTO" replacement="TT-TOB" reason="deprecated"/> <!-- Western Tobago => Tobago -->
+			<subdivisionAlias type="TW-KHQ" replacement="TW-KHH" reason="deprecated"/> <!-- Kaohsiung County => Kaohsiung -->
+			<subdivisionAlias type="TW-TNQ" replacement="TW-TNN" reason="deprecated"/> <!-- Tainan County => Tainan -->
+			<subdivisionAlias type="TW-TPQ" replacement="TW-NWT" reason="deprecated"/> <!-- New Taipei City => New Taipei -->
+			<subdivisionAlias type="TW-TXQ" replacement="TW-TXG" reason="deprecated"/> <!-- Taichung County => Taichung -->
+			<!-- end of data generated with GenerateSubdivisions -->
+            <!-- variants -->
+            <variantAlias type="AALAND" replacement="AX" reason="deprecated"/>
+            <variantAlias type="POLYTONI" replacement="POLYTON" reason="deprecated"/>
+            <variantAlias type="HEPLOC" replacement="ALALC97" reason="deprecated"/>
+            <zoneAlias type="Africa/Timbuktu" replacement="Africa/Bamako" reason="deprecated"/>          
+            <zoneAlias type="Pacific/Yap" replacement="Pacific/Truk" reason="deprecated"/>          
+            <zoneAlias type="Europe/Belfast" replacement="Europe/London" reason="deprecated"/>
+            <zoneAlias type="SystemV/AST4ADT" replacement="America/Halifax" reason="deprecated"/>
+            <zoneAlias type="SystemV/EST5EDT" replacement="America/New_York" reason="deprecated"/>
+            <zoneAlias type="SystemV/CST6CDT" replacement="America/Chicago" reason="deprecated"/>
+            <zoneAlias type="SystemV/MST7MDT" replacement="America/Denver" reason="deprecated"/>
+            <zoneAlias type="SystemV/PST8PDT" replacement="America/Los_Angeles" reason="deprecated"/>
+            <zoneAlias type="SystemV/YST9YDT" replacement="America/Anchorage" reason="deprecated"/>
+            <zoneAlias type="SystemV/AST4" replacement="America/Puerto_Rico" reason="deprecated"/>
+            <zoneAlias type="SystemV/EST5" replacement="America/Indianapolis" reason="deprecated"/>
+            <zoneAlias type="EST" replacement="America/Indianapolis" reason="deprecated"/>
+            <zoneAlias type="SystemV/CST6" replacement="America/Regina" reason="deprecated"/>
+            <zoneAlias type="SystemV/MST7" replacement="America/Phoenix" reason="deprecated"/>
+            <zoneAlias type="MST" replacement="America/Phoenix" reason="deprecated"/>
+            <zoneAlias type="SystemV/PST8" replacement="Pacific/Pitcairn" reason="deprecated"/>
+            <zoneAlias type="SystemV/YST9" replacement="Pacific/Gambier" reason="deprecated"/>
+            <zoneAlias type="SystemV/HST10" replacement="Pacific/Honolulu" reason="deprecated"/>
+            <zoneAlias type="HST" replacement="Pacific/Honolulu" reason="deprecated"/>       
+            <zoneAlias type="Atlantic/Jan_Mayen" replacement="Europe/Oslo" reason="deprecated"/>
+            <zoneAlias type="America/Shiprock" replacement="America/Denver" reason="deprecated"/>
+            <zoneAlias type="Antarctica/South_Pole" replacement="Pacific/Auckland" reason="deprecated"/>
+            <zoneAlias type="America/Montreal" replacement="America/Toronto" reason="deprecated"/>
+            <zoneAlias type="Asia/Chongqing" replacement="Asia/Shanghai" reason="deprecated"/>
+            <zoneAlias type="Asia/Harbin" replacement="Asia/Shanghai" reason="deprecated"/>
+            <zoneAlias type="Asia/Kashgar" replacement="Asia/Urumqi" reason="deprecated"/>
+        </alias>
+        <distinguishing>
+             <distinguishingItems attributes="key request id _q registry alt iso4217 iso3166 mzone from to type numberSystem count"/>
+             <distinguishingItems exclude="true" elements="default measurementSystem mapping abbreviationFallback preferenceOrdering" attributes="type"/>
+         </distinguishing>
+        <blocking>
+             <blockingItems elements="identity supplementalData cldrTest collation transform"/>
+         </blocking>
+        <skipDefaultLocale services="segmentation collation"/>
+		<defaultContent locales="
+			aa_ET af_ZA agq_CM ak_GH am_ET ar_001 arn_CL as_IN asa_TZ ast_ES az_Arab_IR
+			az_Cyrl_AZ az_Latn az_Latn_AZ
+			ba_RU bas_CM be_BY bem_ZM bez_TZ bg_BG bgn_PK bm_ML bm_Nkoo_ML bn_BD bo_CN
+			br_FR brx_IN bs_Cyrl_BA bs_Latn bs_Latn_BA bss_CM byn_ER
+			ca_ES cch_NG ce_RU cgg_UG chr_US ckb_IQ co_FR cs_CZ cu_RU cv_RU cy_GB
+			da_DK dav_KE de_DE dje_NE dsb_DE dua_CM dv_MV dyo_SN dz_BT
+			ebu_KE ee_GH el_GR en_Dsrt_US en_US eo_001 es_ES et_EE eu_ES ewo_CM
+			fa_IR ff_SN fi_FI fil_PH fo_FO fr_FR fur_IT fy_NL
+			ga_IE gaa_GH gd_GB gez_ET gl_ES gn_PY gsw_CH gu_IN guz_KE gv_IM
+			ha_Arab_NG ha_NG haw_US he_IL hi_IN hr_HR hsb_DE hu_HU hy_AM
+			ia_FR id_ID ig_NG ii_CN is_IS it_IT iu_CA iu_Latn_CA
+			ja_JP jgo_CM jmc_TZ jv_ID
+			ka_GE kab_DZ kaj_NG kam_KE kcg_NG kde_TZ kea_CV ken_CM khq_ML ki_KE kk_KZ
+			kkj_CM kl_GL kln_KE km_KH kn_IN ko_KR kok_IN kpe_LR ks_IN ksb_TZ ksf_CM ksh_DE
+			ku_TR kw_GB ky_KG
+			lag_TZ lb_LU lg_UG lkt_US ln_CD lo_LA lrc_IR lt_LT lu_CD luo_KE luy_KE lv_LV
+			mas_KE mer_KE mfe_MU mg_MG mgh_MZ mgo_CM mi_NZ mk_MK ml_IN mn_MN mn_Mong_CN
+			moh_CA mr_IN ms_Arab_MY ms_MY mt_MT mua_CM my_MM mzn_IR
+			naq_NA nb_NO nd_ZW nds_DE ne_NP nl_NL nmg_CM nn_NO nnh_CM nqo_GN nr_ZA nso_ZA
+			nus_SS ny_MW nyn_UG
+			oc_FR om_ET or_IN os_GE
+			pa_Arab_PK pa_Guru pa_Guru_IN pl_PL prg_001 ps_AF pt_BR
+			qu_PE quc_GT
+			rm_CH rn_BI ro_RO rof_TZ ru_RU rw_RW rwk_TZ
+			sa_IN sah_RU saq_KE sbp_TZ sd_PK sdh_IR se_NO seh_MZ ses_ML sg_CF shi_Latn_MA
+			shi_Tfng shi_Tfng_MA si_LK sid_ET sk_SK sl_SI sma_SE smj_SE smn_FI sms_FI sn_ZW
+			so_SO sq_AL sr_Cyrl sr_Cyrl_RS sr_Latn_RS ss_ZA ssy_ER st_ZA sv_SE sw_TZ syr_IQ
+			ta_IN te_IN teo_UG tg_TJ th_TH ti_ET tig_ER tk_TM tn_ZA to_TO tr_TR trv_TW
+			ts_ZA tt_RU twq_NE tzm_MA
+			ug_CN uk_UA ur_PK uz_Arab_AF uz_Cyrl_UZ uz_Latn uz_Latn_UZ
+			vai_Latn_LR vai_Vaii vai_Vaii_LR ve_ZA vi_VN vo_001 vun_TZ
+			wa_BE wae_CH wal_ET wbp_AU wo_SN
+			xh_ZA xog_UG
+			yav_CM yi_001 yo_NG yue_HK
+			zgh_MA zh_Hans zh_Hans_CN zh_Hant_TW zu_ZA"
+		/>
+    </metadata>
+</supplementalData>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/telephoneCodeData.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/telephoneCodeData.xml
similarity index 99%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/telephoneCodeData.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/telephoneCodeData.xml
index 7f6eff935a0..b08c5025bd2 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/telephoneCodeData.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/telephoneCodeData.xml
@@ -6,8 +6,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 For terms of use, see http://www.unicode.org/copyright.html
 -->
 <supplementalData>
-    <version number="$Revision: 9034 $"/>
-    <generation date="$Date: 2013-07-15 13:48:35 -0500 (Mon, 15 Jul 2013) $"/>
+    <version number="$Revision: 11914 $"/>
 	<telephoneCodeData>
 		<!--
 		References:
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/windowsZones.xml b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/windowsZones.xml
similarity index 97%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/windowsZones.xml
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/windowsZones.xml
index a2186019c49..ff17f463779 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/common/supplemental/windowsZones.xml
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/windowsZones.xml
@@ -7,11 +7,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 -->
 
 <supplementalData>
-	<version number="$Revision: 11360 $"/>
-	<generation date="$Date: 2015-03-10 13:17:15 -0500 (Tue, 10 Mar 2015) $"/>
-
+	<version number="$Revision: 12348 $"/>
 	<windowsZones>
-		<mapTimezones otherVersion="7df0004" typeVersion="2015a">
+		<mapTimezones otherVersion="7df0103" typeVersion="2016a">
 
 			<!-- (UTC-12:00) International Date Line West -->
 			<mapZone other="Dateline Standard Time" territory="001" type="Etc/GMT+12"/>
@@ -34,22 +32,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 
 			<!-- (UTC-09:00) Alaska -->
 			<mapZone other="Alaskan Standard Time" territory="001" type="America/Anchorage"/>
-			<mapZone other="Alaskan Standard Time" territory="US" type="America/Anchorage America/Juneau America/Nome America/Sitka America/Yakutat"/>
+			<mapZone other="Alaskan Standard Time" territory="US" type="America/Anchorage America/Juneau America/Metlakatla America/Nome America/Sitka America/Yakutat"/>
 
 			<!-- (UTC-08:00) Baja California -->
-			<mapZone other="Pacific Standard Time (Mexico)" territory="001" type="America/Santa_Isabel"/>
-			<mapZone other="Pacific Standard Time (Mexico)" territory="MX" type="America/Santa_Isabel"/>
+			<!-- Unmappable -->
 
 			<!-- (UTC-08:00) Pacific Time (US & Canada) -->
 			<mapZone other="Pacific Standard Time" territory="001" type="America/Los_Angeles"/>
 			<mapZone other="Pacific Standard Time" territory="CA" type="America/Vancouver America/Dawson America/Whitehorse"/>
-			<mapZone other="Pacific Standard Time" territory="MX" type="America/Tijuana"/>
+			<mapZone other="Pacific Standard Time" territory="MX" type="America/Tijuana America/Santa_Isabel"/>
 			<mapZone other="Pacific Standard Time" territory="US" type="America/Los_Angeles"/>
 			<mapZone other="Pacific Standard Time" territory="ZZ" type="PST8PDT"/>
 
 			<!-- (UTC-07:00) Arizona -->
 			<mapZone other="US Mountain Standard Time" territory="001" type="America/Phoenix"/>
-			<mapZone other="US Mountain Standard Time" territory="CA" type="America/Dawson_Creek America/Creston"/>
+			<mapZone other="US Mountain Standard Time" territory="CA" type="America/Dawson_Creek America/Creston America/Fort_Nelson"/>
 			<mapZone other="US Mountain Standard Time" territory="MX" type="America/Hermosillo"/>
 			<mapZone other="US Mountain Standard Time" territory="US" type="America/Phoenix"/>
 			<mapZone other="US Mountain Standard Time" territory="ZZ" type="Etc/GMT+7"/>
@@ -95,6 +92,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<mapZone other="SA Pacific Standard Time" territory="001" type="America/Bogota"/>
 			<mapZone other="SA Pacific Standard Time" territory="BR" type="America/Rio_Branco America/Eirunepe"/>
 			<mapZone other="SA Pacific Standard Time" territory="CA" type="America/Coral_Harbour"/>
+			<mapZone other="SA Pacific Standard Time" territory="CL" type="Pacific/Easter"/>
 			<mapZone other="SA Pacific Standard Time" territory="CO" type="America/Bogota"/>
 			<mapZone other="SA Pacific Standard Time" territory="EC" type="America/Guayaquil"/>
 			<mapZone other="SA Pacific Standard Time" territory="JM" type="America/Jamaica"/>
@@ -177,10 +175,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<mapZone other="E. South America Standard Time" territory="001" type="America/Sao_Paulo"/>
 			<mapZone other="E. South America Standard Time" territory="BR" type="America/Sao_Paulo"/>
 
-			<!-- (UTC-03:00) Buenos Aires -->
-			<mapZone other="Argentina Standard Time" territory="001" type="America/Buenos_Aires"/>
-			<mapZone other="Argentina Standard Time" territory="AR" type="America/Buenos_Aires America/Argentina/La_Rioja America/Argentina/Rio_Gallegos America/Argentina/Salta America/Argentina/San_Juan America/Argentina/San_Luis America/Argentina/Tucuman America/Argentina/Ushuaia America/Catamarca America/Cordoba America/Jujuy America/Mendoza"/>
-
 			<!-- (UTC-03:00) Cayenne, Fortaleza -->
 			<mapZone other="SA Eastern Standard Time" territory="001" type="America/Cayenne"/>
 			<mapZone other="SA Eastern Standard Time" territory="AQ" type="Antarctica/Rothera"/>
@@ -190,6 +184,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<mapZone other="SA Eastern Standard Time" territory="SR" type="America/Paramaribo"/>
 			<mapZone other="SA Eastern Standard Time" territory="ZZ" type="Etc/GMT+3"/>
 
+			<!-- (UTC-03:00) City of Buenos Aires -->
+			<mapZone other="Argentina Standard Time" territory="001" type="America/Buenos_Aires"/>
+			<mapZone other="Argentina Standard Time" territory="AR" type="America/Buenos_Aires America/Argentina/La_Rioja America/Argentina/Rio_Gallegos America/Argentina/Salta America/Argentina/San_Juan America/Argentina/San_Luis America/Argentina/Tucuman America/Argentina/Ushuaia America/Catamarca America/Cordoba America/Jujuy America/Mendoza"/>
+
 			<!-- (UTC-03:00) Greenland -->
 			<mapZone other="Greenland Standard Time" territory="001" type="America/Godthab"/>
 			<mapZone other="Greenland Standard Time" territory="GL" type="America/Godthab"/>
@@ -334,7 +332,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<mapZone other="GTB Standard Time" territory="001" type="Europe/Bucharest"/>
 			<mapZone other="GTB Standard Time" territory="CY" type="Asia/Nicosia"/>
 			<mapZone other="GTB Standard Time" territory="GR" type="Europe/Athens"/>
-			<mapZone other="GTB Standard Time" territory="MD" type="Europe/Chisinau"/>
 			<mapZone other="GTB Standard Time" territory="RO" type="Europe/Bucharest"/>
 
 			<!-- (UTC+02:00) Beirut -->
@@ -350,7 +347,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<mapZone other="Syria Standard Time" territory="SY" type="Asia/Damascus"/>
 
 			<!-- (UTC+02:00) E. Europe -->
-			<!-- Unmappable -->
+			<mapZone other="E. Europe Standard Time" territory="001" type="Europe/Chisinau"/>
+			<mapZone other="E. Europe Standard Time" territory="MD" type="Europe/Chisinau"/>
 
 			<!-- (UTC+02:00) Harare, Pretoria -->
 			<mapZone other="South Africa Standard Time" territory="001" type="Africa/Johannesburg"/>
@@ -527,7 +525,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<mapZone other="SE Asia Standard Time" territory="ID" type="Asia/Jakarta Asia/Pontianak"/>
 			<mapZone other="SE Asia Standard Time" territory="KH" type="Asia/Phnom_Penh"/>
 			<mapZone other="SE Asia Standard Time" territory="LA" type="Asia/Vientiane"/>
-			<mapZone other="SE Asia Standard Time" territory="MN" type="Asia/Hovd"/>
 			<mapZone other="SE Asia Standard Time" territory="TH" type="Asia/Bangkok"/>
 			<mapZone other="SE Asia Standard Time" territory="VN" type="Asia/Saigon"/>
 			<mapZone other="SE Asia Standard Time" territory="ZZ" type="Etc/GMT-7"/>
@@ -544,7 +541,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 
 			<!-- (UTC+08:00) Irkutsk (RTZ 7) -->
 			<mapZone other="North Asia East Standard Time" territory="001" type="Asia/Irkutsk"/>
-			<mapZone other="North Asia East Standard Time" territory="RU" type="Asia/Irkutsk Asia/Chita"/>
+			<mapZone other="North Asia East Standard Time" territory="RU" type="Asia/Irkutsk"/>
 
 			<!-- (UTC+08:00) Kuala Lumpur, Singapore -->
 			<mapZone other="Singapore Standard Time" territory="001" type="Asia/Singapore"/>
@@ -568,6 +565,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<mapZone other="Ulaanbaatar Standard Time" territory="001" type="Asia/Ulaanbaatar"/>
 			<mapZone other="Ulaanbaatar Standard Time" territory="MN" type="Asia/Ulaanbaatar Asia/Choibalsan"/>
 
+			<!-- (UTC+08:30) Pyongyang -->
+			<mapZone other="North Korea Standard Time" territory="001" type="Asia/Pyongyang"/>
+			<mapZone other="North Korea Standard Time" territory="KP" type="Asia/Pyongyang"/>
+
 			<!-- (UTC+09:00) Osaka, Sapporo, Tokyo -->
 			<mapZone other="Tokyo Standard Time" territory="001" type="Asia/Tokyo"/>
 			<mapZone other="Tokyo Standard Time" territory="ID" type="Asia/Jayapura"/>
@@ -578,12 +579,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 
 			<!-- (UTC+09:00) Seoul -->
 			<mapZone other="Korea Standard Time" territory="001" type="Asia/Seoul"/>
-			<mapZone other="Korea Standard Time" territory="KP" type="Asia/Pyongyang"/>
 			<mapZone other="Korea Standard Time" territory="KR" type="Asia/Seoul"/>
 
 			<!-- (UTC+09:00) Yakutsk (RTZ 8) -->
 			<mapZone other="Yakutsk Standard Time" territory="001" type="Asia/Yakutsk"/>
-			<mapZone other="Yakutsk Standard Time" territory="RU" type="Asia/Yakutsk Asia/Khandyga"/>
+			<mapZone other="Yakutsk Standard Time" territory="RU" type="Asia/Yakutsk Asia/Chita Asia/Khandyga"/>
 
 			<!-- (UTC+09:30) Adelaide -->
 			<mapZone other="Cen. Australia Standard Time" territory="001" type="Australia/Adelaide"/>
@@ -631,6 +631,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<mapZone other="Central Pacific Standard Time" territory="AU" type="Antarctica/Macquarie"/>
 			<mapZone other="Central Pacific Standard Time" territory="FM" type="Pacific/Ponape Pacific/Kosrae"/>
 			<mapZone other="Central Pacific Standard Time" territory="NC" type="Pacific/Noumea"/>
+			<mapZone other="Central Pacific Standard Time" territory="NF" type="Pacific/Norfolk"/>
 			<mapZone other="Central Pacific Standard Time" territory="PG" type="Pacific/Bougainville"/>
 			<mapZone other="Central Pacific Standard Time" territory="SB" type="Pacific/Guadalcanal"/>
 			<mapZone other="Central Pacific Standard Time" territory="VU" type="Pacific/Efate"/>
diff --git a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/unicode-license.txt b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/unicode-license.txt
similarity index 97%
rename from jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/unicode-license.txt
rename to jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/unicode-license.txt
index 9c1469372fa..d277a23948a 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/27_0_0/unicode-license.txt
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/unicode-license.txt
@@ -17,7 +17,7 @@ FILES OR SOFTWARE.
 
     COPYRIGHT AND PERMISSION NOTICE
 
-    Copyright © 1991-2015 Unicode, Inc. All rights reserved. Distributed under
+    Copyright © 1991-2016 Unicode, Inc. All rights reserved. Distributed under
 the Terms of Use in http://www.unicode.org/copyright.html.
 
     Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/jdk/test/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java b/jdk/test/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java
index c4c88bc3b1b..b47e6c92a31 100644
--- a/jdk/test/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java
+++ b/jdk/test/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java
@@ -918,9 +918,9 @@ public class TestDateTimeFormatterBuilder {
             {null, FormatStyle.SHORT, IsoChronology.INSTANCE, Locale.US, "h:mm a"},
 
             // French Locale and ISO Chronology
-            {FormatStyle.FULL, FormatStyle.FULL, IsoChronology.INSTANCE, Locale.FRENCH, "EEEE d MMMM y HH:mm:ss zzzz"},
-            {FormatStyle.LONG, FormatStyle.LONG, IsoChronology.INSTANCE, Locale.FRENCH, "d MMMM y HH:mm:ss z"},
-            {FormatStyle.MEDIUM, FormatStyle.MEDIUM, IsoChronology.INSTANCE, Locale.FRENCH, "d MMM y HH:mm:ss"},
+            {FormatStyle.FULL, FormatStyle.FULL, IsoChronology.INSTANCE, Locale.FRENCH, "EEEE d MMMM y '\u00e0' HH:mm:ss zzzz"},
+            {FormatStyle.LONG, FormatStyle.LONG, IsoChronology.INSTANCE, Locale.FRENCH, "d MMMM y '\u00e0' HH:mm:ss z"},
+            {FormatStyle.MEDIUM, FormatStyle.MEDIUM, IsoChronology.INSTANCE, Locale.FRENCH, "d MMM y '\u00e0' HH:mm:ss"},
             {FormatStyle.SHORT, FormatStyle.SHORT, IsoChronology.INSTANCE, Locale.FRENCH, "dd/MM/y HH:mm"},
             {FormatStyle.FULL, null, IsoChronology.INSTANCE, Locale.FRENCH, "EEEE d MMMM y"},
             {FormatStyle.LONG, null, IsoChronology.INSTANCE, Locale.FRENCH, "d MMMM y"},
@@ -935,11 +935,11 @@ public class TestDateTimeFormatterBuilder {
             {FormatStyle.FULL, FormatStyle.FULL, JapaneseChronology.INSTANCE, Locale.JAPANESE, "Gy\u5e74M\u6708d\u65e5EEEE H\u6642mm\u5206ss\u79d2 zzzz"},
             {FormatStyle.LONG, FormatStyle.LONG, JapaneseChronology.INSTANCE, Locale.JAPANESE, "Gy\u5e74M\u6708d\u65e5 H:mm:ss z"},
             {FormatStyle.MEDIUM, FormatStyle.MEDIUM, JapaneseChronology.INSTANCE, Locale.JAPANESE, "Gy\u5e74M\u6708d\u65e5 H:mm:ss"},
-            {FormatStyle.SHORT, FormatStyle.SHORT, JapaneseChronology.INSTANCE, Locale.JAPANESE, "Gyy/MM/dd H:mm"},
+            {FormatStyle.SHORT, FormatStyle.SHORT, JapaneseChronology.INSTANCE, Locale.JAPANESE, "GGGGGy/M/d H:mm"},
             {FormatStyle.FULL, null, JapaneseChronology.INSTANCE, Locale.JAPANESE, "Gy\u5e74M\u6708d\u65e5EEEE"},
             {FormatStyle.LONG, null, JapaneseChronology.INSTANCE, Locale.JAPANESE, "Gy\u5e74M\u6708d\u65e5"},
             {FormatStyle.MEDIUM, null, JapaneseChronology.INSTANCE, Locale.JAPANESE, "Gy\u5e74M\u6708d\u65e5"},
-            {FormatStyle.SHORT, null, JapaneseChronology.INSTANCE, Locale.JAPANESE, "Gyy/MM/dd"},
+            {FormatStyle.SHORT, null, JapaneseChronology.INSTANCE, Locale.JAPANESE, "GGGGGy/M/d"},
             {null, FormatStyle.FULL, JapaneseChronology.INSTANCE, Locale.JAPANESE, "H\u6642mm\u5206ss\u79d2 zzzz"},
             {null, FormatStyle.LONG, JapaneseChronology.INSTANCE, Locale.JAPANESE, "H:mm:ss z"},
             {null, FormatStyle.MEDIUM, JapaneseChronology.INSTANCE, Locale.JAPANESE, "H:mm:ss"},
diff --git a/jdk/test/java/time/test/java/time/format/TestNonIsoFormatter.java b/jdk/test/java/time/test/java/time/format/TestNonIsoFormatter.java
index 075a0f4246d..6ba45267414 100644
--- a/jdk/test/java/time/test/java/time/format/TestNonIsoFormatter.java
+++ b/jdk/test/java/time/test/java/time/format/TestNonIsoFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
@@ -81,7 +81,7 @@ public class TestNonIsoFormatter {
               "\u0627\u0644\u0627\u062b\u0646\u064a\u0646\u060c \u0661 \u0631\u0628\u064a\u0639 "
               + "\u0627\u0644\u0622\u062e\u0631\u060c \u0661\u0664\u0663\u0664 \u0647\u0640" }, // Hijrah AH 1434-04-01 (Mon)
             { MINGUO, Locale.TAIWAN, Locale.TAIWAN, MINGUO.date(IsoDate),
-              "\u6c11\u570b102\u5e742\u670811\u65e5\u661f\u671f\u4e00" }, // Minguo ROC 102-02-11 (Mon)
+              "\u6c11\u570b102\u5e742\u670811\u65e5 \u661f\u671f\u4e00" }, // Minguo ROC 102-02-11 (Mon)
             { BUDDHIST, thTH, thTH, BUDDHIST.date(IsoDate),
               "\u0e27\u0e31\u0e19\u0e08\u0e31\u0e19\u0e17\u0e23\u0e4c\u0e17\u0e35\u0e48"
               + " 11 \u0e01\u0e38\u0e21\u0e20\u0e32\u0e1e\u0e31\u0e19\u0e18\u0e4c"
diff --git a/jdk/test/java/time/test/java/time/temporal/TestChronoField.java b/jdk/test/java/time/test/java/time/temporal/TestChronoField.java
index 41d464c0a72..df51dbbfa4d 100644
--- a/jdk/test/java/time/test/java/time/temporal/TestChronoField.java
+++ b/jdk/test/java/time/test/java/time/temporal/TestChronoField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
@@ -123,7 +123,7 @@ public class TestChronoField {
     public void test_IsoFields_week_based_year() {
         Locale locale = Locale.US;
         String name = IsoFields.WEEK_OF_WEEK_BASED_YEAR.getDisplayName(locale);
-        assertEquals(name, "Week");
+        assertEquals(name, "week");
     }
 
     @Test(expectedExceptions=NullPointerException.class)
@@ -136,7 +136,7 @@ public class TestChronoField {
         Locale locale = Locale.US;
         TemporalField weekOfYearField = WeekFields.SUNDAY_START.weekOfYear();
         String name = weekOfYearField.getDisplayName(locale);
-        assertEquals(name, "Week");
+        assertEquals(name, "week");
     }
 
     @Test(expectedExceptions=NullPointerException.class)
diff --git a/jdk/test/java/util/Calendar/CldrFormatNamesTest.java b/jdk/test/java/util/Calendar/CldrFormatNamesTest.java
index 4b1588653ef..c8e2aad735b 100644
--- a/jdk/test/java/util/Calendar/CldrFormatNamesTest.java
+++ b/jdk/test/java/util/Calendar/CldrFormatNamesTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8004489 8006509 8008577
+ * @bug 8004489 8006509 8008577 8145136
  * @summary Unit test for CLDR FormatData resources
  * @modules java.base/sun.util.locale.provider
  *          jdk.localedata
@@ -52,7 +52,7 @@ public class CldrFormatNamesTest {
                 "Gy\u5e74M\u6708d\u65e5EEEE",
                 "Gy\u5e74M\u6708d\u65e5",
                 "Gy\u5e74M\u6708d\u65e5",
-                "Gyy/MM/dd",
+                "GGGGGy/M/d",
             },
             "java.time.roc.DatePatterns", new String[] {
                 "Gy\u5e74M\u6708d\u65e5EEEE",
diff --git a/jdk/test/java/util/Locale/ThaiGov.java b/jdk/test/java/util/Locale/ThaiGov.java
index 5dfe8d15c65..5bef2afde2b 100644
--- a/jdk/test/java/util/Locale/ThaiGov.java
+++ b/jdk/test/java/util/Locale/ThaiGov.java
@@ -25,6 +25,7 @@
  * @bug 4474409
  * @author John O'Conner
  * @modules jdk.localedata
+ * @run main/othervm -Djava.locale.providers=COMPAT ThaiGov
  */
 
 import java.util.*;
diff --git a/jdk/test/sun/text/resources/Format/Bug4762201.java b/jdk/test/sun/text/resources/Format/Bug4762201.java
index e054bc94a4c..78dfce9e42c 100644
--- a/jdk/test/sun/text/resources/Format/Bug4762201.java
+++ b/jdk/test/sun/text/resources/Format/Bug4762201.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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,6 +25,7 @@
  *@test
  *@bug 4762201
  *@summary verify the zh_CN full time pattern (and other time patterns)
+ *@run main/othervm -Djava.locale.providers=COMPAT,SPI Bug4762201
 */
 
 import java.io.*;
diff --git a/jdk/test/sun/text/resources/LocaleData.cldr b/jdk/test/sun/text/resources/LocaleData.cldr
index 231eb55dda5..fbc696101d8 100644
--- a/jdk/test/sun/text/resources/LocaleData.cldr
+++ b/jdk/test/sun/text/resources/LocaleData.cldr
@@ -55,7 +55,7 @@ FormatData/ja/Eras/1=\u897f\u66a6
 LocaleNames/en/LT=Lithuania
 
 # bug #4068012, 4290801, 4942982
-CurrencyNames/ru_RU/RUB=\u0440\u0443\u0431.
+CurrencyNames/ru_RU/RUB=\u20bd
 FormatData/ru_RU/NumberPatterns/0=#,##0.###
 # FormatData/ru_RU/NumberPatterns/1=#,##0.##'\u0440.';-#,##0.##'\u0440.' # Changed; see bug 4122840
 FormatData/ru_RU/NumberPatterns/2=#,##0\u00a0%
@@ -108,7 +108,7 @@ FormatData/ja/DatePatterns/2=y/MM/dd
 FormatData/ja/DatePatterns/3=y/MM/dd
 
 # bug #4075404, 4290801, 4942982
-CurrencyNames/ru_RU/RUB=\u0440\u0443\u0431.
+CurrencyNames/ru_RU/RUB=\u20bd
 FormatData/ru_RU/TimePatterns/0=H:mm:ss zzzz
 FormatData/ru_RU/TimePatterns/1=H:mm:ss z
 FormatData/ru_RU/TimePatterns/2=H:mm:ss
@@ -211,7 +211,7 @@ FormatData/en_US/DatePatterns/3=M/d/yy
 FormatData/en_US/DateTimePatterns/0={1} 'at' {0}
 
 # bug #4094033, 4290801, 4942982
-CurrencyNames/ru_RU/RUB=\u0440\u0443\u0431.
+CurrencyNames/ru_RU/RUB=\u20bd
 FormatData/ru_RU/NumberPatterns/0=#,##0.###
 # FormatData/ru_RU/NumberPatterns/1=#,##0.##'\u0440.';-#,##0.##'\u0440.' # Changed; see bug 4122840
 FormatData/ru_RU/NumberPatterns/2=#,##0\u00a0%
@@ -246,11 +246,11 @@ FormatData/ru_RU/Eras/1=\u043d. \u044d.
 LocaleNames/ru_RU/ru=\u0440\u0443\u0441\u0441\u043a\u0438\u0439
 FormatData/ru_RU/MonthAbbreviations/0=\u044f\u043d\u0432.
 FormatData/ru_RU/MonthAbbreviations/1=\u0444\u0435\u0432\u0440.
-FormatData/ru_RU/MonthAbbreviations/2=\u043c\u0430\u0440\u0442\u0430
+FormatData/ru_RU/MonthAbbreviations/2=\u043c\u0430\u0440.
 FormatData/ru_RU/MonthAbbreviations/3=\u0430\u043f\u0440.
 FormatData/ru_RU/MonthAbbreviations/4=\u043c\u0430\u044f
-FormatData/ru_RU/MonthAbbreviations/5=\u0438\u044e\u043d\u044f
-FormatData/ru_RU/MonthAbbreviations/6=\u0438\u044e\u043b\u044f
+FormatData/ru_RU/MonthAbbreviations/5=\u0438\u044e\u043d.
+FormatData/ru_RU/MonthAbbreviations/6=\u0438\u044e\u043b.
 FormatData/ru_RU/MonthAbbreviations/7=\u0430\u0432\u0433.
 FormatData/ru_RU/MonthAbbreviations/8=\u0441\u0435\u043d\u0442.
 FormatData/ru_RU/MonthAbbreviations/9=\u043e\u043a\u0442.
@@ -318,8 +318,8 @@ FormatData/ru_RU/DayAbbreviations/3=\u0441\u0440
 FormatData/ru_RU/DayAbbreviations/4=\u0447\u0442
 FormatData/ru_RU/DayAbbreviations/5=\u043f\u0442
 FormatData/ru_RU/DayAbbreviations/6=\u0441\u0431
-FormatData/ru_RU/AmPmMarkers/0=AM
-FormatData/ru_RU/AmPmMarkers/1=PM
+FormatData/ru_RU/AmPmMarkers/0=\u0414\u041f
+FormatData/ru_RU/AmPmMarkers/1=\u041f\u041f
 CalendarData/ru_RU/firstDayOfWeek=2
 CalendarData/ru_RU/minimalDaysInFirstWeek=1
 
@@ -331,7 +331,7 @@ FormatData/en_AU/TimePatterns/3=h:mm a
 FormatData/en_AU/DatePatterns/0=EEEE, d MMMM y
 FormatData/en_AU/DatePatterns/1=d MMMM y
 FormatData/en_AU/DatePatterns/2=d MMM y
-FormatData/en_AU/DatePatterns/3=d/MM/y
+FormatData/en_AU/DatePatterns/3=d/M/yy
 FormatData/en_AU/DateTimePatterns/0={1} 'at' {0}
 LocaleNames/en_AU/US=United States
 LocaleNames/en_AU/GB=United Kingdom
@@ -398,10 +398,10 @@ CurrencyNames/es_AR/ARS=$
 FormatData/es_AR/NumberPatterns/0=#,##0.###
 # FormatData/es_AR/NumberPatterns/1=$#,##0.00;($#,##0.00) # Changed; see bug 4122840
 FormatData/es_AR/NumberPatterns/2=#,##0\u00a0%
-FormatData/es_AR/TimePatterns/0=h:mm:ss a zzzz
-FormatData/es_AR/TimePatterns/1=h:mm:ss a z
-FormatData/es_AR/TimePatterns/2=h:mm:ss a
-FormatData/es_AR/TimePatterns/3=h:mm a
+FormatData/es_AR/TimePatterns/0=HH:mm:ss zzzz
+FormatData/es_AR/TimePatterns/1=HH:mm:ss z
+FormatData/es_AR/TimePatterns/2=HH:mm:ss
+FormatData/es_AR/TimePatterns/3=HH:mm
 FormatData/es_AR/DatePatterns/0=EEEE, d 'de' MMMM 'de' y
 FormatData/es_AR/DatePatterns/1=d 'de' MMMM 'de' y
 FormatData/es_AR/DatePatterns/2=d MMM y
@@ -414,10 +414,10 @@ FormatData/es_BO/NumberPatterns/0=#,##0.###
 # FormatData/es_BO/NumberPatterns/1=B$#,##0.00;(B$#,##0.00) # Changed; see bug 4122840
 FormatData/es_BO/NumberPatterns/2=#,##0\u00a0%
 CurrencyNames/es_BO/BOB=Bs
-FormatData/es_BO/TimePatterns/0=h:mm:ss a zzzz
-FormatData/es_BO/TimePatterns/1=h:mm:ss a z
-FormatData/es_BO/TimePatterns/2=h:mm:ss a
-FormatData/es_BO/TimePatterns/3=h:mm a
+FormatData/es_BO/TimePatterns/0=HH:mm:ss zzzz
+FormatData/es_BO/TimePatterns/1=HH:mm:ss z
+FormatData/es_BO/TimePatterns/2=HH:mm:ss
+FormatData/es_BO/TimePatterns/3=HH:mm
 FormatData/es_BO/DatePatterns/0=EEEE, d 'de' MMMM 'de' y
 FormatData/es_BO/DatePatterns/1=d 'de' MMMM 'de' y
 FormatData/es_BO/DatePatterns/2=d MMM y
@@ -441,7 +441,7 @@ FormatData/es_CL/DateTimePatterns/0={1}, {0}
 #FormatData/es_CL/NumberElements/2=<MISSING!>
 FormatData/es_CO/NumberPatterns/0=#,##0.###
 # FormatData/es_CO/NumberPatterns/1=C$#,##0.00;(C$#,##0.00) # Changed; see bug 4122840
-FormatData/es_CO/NumberPatterns/2=#,##0\u00a0%
+FormatData/es_CO/NumberPatterns/2=#,##0%
 # changed currency symbol during 5102005 bugfix
 CurrencyNames/es_CO/COP=$
 FormatData/es_CO/TimePatterns/0=h:mm:ss a zzzz
@@ -461,10 +461,10 @@ FormatData/es_CR/NumberPatterns/0=#,##0.###
 # FormatData/es_CR/NumberPatterns/1=C#,##0.00;(C#,##0.00) # Changed; see bug 4122840
 FormatData/es_CR/NumberPatterns/2=#,##0\u00a0%
 CurrencyNames/es_CR/CRC=\u20a1
-FormatData/es_CR/TimePatterns/0=h:mm:ss a zzzz
-FormatData/es_CR/TimePatterns/1=h:mm:ss a z
-FormatData/es_CR/TimePatterns/2=h:mm:ss a
-FormatData/es_CR/TimePatterns/3=h:mm a
+FormatData/es_CR/TimePatterns/0=HH:mm:ss zzzz
+FormatData/es_CR/TimePatterns/1=HH:mm:ss z
+FormatData/es_CR/TimePatterns/2=HH:mm:ss
+FormatData/es_CR/TimePatterns/3=HH:mm
 FormatData/es_CR/DatePatterns/0=EEEE, d 'de' MMMM 'de' y
 FormatData/es_CR/DatePatterns/1=d 'de' MMMM 'de' y
 FormatData/es_CR/DatePatterns/2=d MMM y
@@ -475,8 +475,8 @@ FormatData/es_CR/DateTimePatterns/0={1}, {0}
 #FormatData/es_CR/NumberElements/2=<MISSING!>
 FormatData/es_DO/NumberPatterns/0=#,##0.###
 # FormatData/es_DO/NumberPatterns/1=RD$#,##0.00;(RD$#,##0.00) # Changed; see bug 4122840
-FormatData/es_DO/NumberPatterns/2=#,##0\u00a0%
-CurrencyNames/es_DO/DOP=$
+FormatData/es_DO/NumberPatterns/2=#,##0%
+CurrencyNames/es_DO/DOP=RD$
 FormatData/es_DO/TimePatterns/0=h:mm:ss a zzzz
 FormatData/es_DO/TimePatterns/1=h:mm:ss a z
 FormatData/es_DO/TimePatterns/2=h:mm:ss a
@@ -526,10 +526,10 @@ FormatData/es_GT/NumberPatterns/0=#,##0.###
 # FormatData/es_GT/NumberPatterns/1=Q#,##0.00;(Q#,##0.00) # Changed; see bug 4122840
 FormatData/es_GT/NumberPatterns/2=#,##0\u00a0%
 CurrencyNames/es_GT/GTQ=Q
-FormatData/es_GT/TimePatterns/0=h:mm:ss a zzzz
-FormatData/es_GT/TimePatterns/1=h:mm:ss a z
-FormatData/es_GT/TimePatterns/2=h:mm:ss a
-FormatData/es_GT/TimePatterns/3=h:mm a
+FormatData/es_GT/TimePatterns/0=HH:mm:ss zzzz
+FormatData/es_GT/TimePatterns/1=HH:mm:ss z
+FormatData/es_GT/TimePatterns/2=HH:mm:ss
+FormatData/es_GT/TimePatterns/3=HH:mm
 FormatData/es_GT/DatePatterns/0=EEEE, d 'de' MMMM 'de' y
 FormatData/es_GT/DatePatterns/1=d 'de' MMMM 'de' y
 FormatData/es_GT/DatePatterns/2=d/MM/y
@@ -542,10 +542,10 @@ FormatData/es_HN/NumberPatterns/0=#,##0.###
 # FormatData/es_HN/NumberPatterns/1=L#,##0.00;(L#,##0.00) # Changed; see bug 4122840
 FormatData/es_HN/NumberPatterns/2=#,##0\u00a0%
 CurrencyNames/es_HN/HNL=L
-FormatData/es_HN/TimePatterns/0=h:mm:ss a zzzz
-FormatData/es_HN/TimePatterns/1=h:mm:ss a z
-FormatData/es_HN/TimePatterns/2=h:mm:ss a
-FormatData/es_HN/TimePatterns/3=h:mm a
+FormatData/es_HN/TimePatterns/0=HH:mm:ss zzzz
+FormatData/es_HN/TimePatterns/1=HH:mm:ss z
+FormatData/es_HN/TimePatterns/2=HH:mm:ss
+FormatData/es_HN/TimePatterns/3=HH:mm
 FormatData/es_HN/DatePatterns/0=EEEE dd 'de' MMMM 'de' y
 FormatData/es_HN/DatePatterns/1=dd 'de' MMMM 'de' y
 FormatData/es_HN/DatePatterns/2=d MMM y
@@ -558,10 +558,10 @@ FormatData/es_MX/NumberPatterns/0=#,##0.###
 # FormatData/es_MX/NumberPatterns/1=$#,##0.00;($#,##0.00) # Changed; see bug 4122840
 FormatData/es_MX/NumberPatterns/2=#,##0%
 CurrencyNames/es_MX/MXN=$
-FormatData/es_MX/TimePatterns/0=h:mm:ss a zzzz
-FormatData/es_MX/TimePatterns/1=h:mm:ss a z
-FormatData/es_MX/TimePatterns/2=h:mm:ss a
-FormatData/es_MX/TimePatterns/3=h:mm a
+FormatData/es_MX/TimePatterns/0=HH:mm:ss zzzz
+FormatData/es_MX/TimePatterns/1=HH:mm:ss z
+FormatData/es_MX/TimePatterns/2=HH:mm:ss
+FormatData/es_MX/TimePatterns/3=HH:mm
 FormatData/es_MX/DatePatterns/0=EEEE, d 'de' MMMM 'de' y
 FormatData/es_MX/DatePatterns/1=d 'de' MMMM 'de' y
 FormatData/es_MX/DatePatterns/2=dd/MM/y
@@ -574,10 +574,10 @@ FormatData/es_NI/NumberPatterns/0=#,##0.###
 # FormatData/es_NI/NumberPatterns/1=$C#,##0.00;($C#,##0.00) # Changed; see bug 4122840
 FormatData/es_NI/NumberPatterns/2=#,##0\u00a0%
 CurrencyNames/es_NI/NIO=C$
-FormatData/es_NI/TimePatterns/0=h:mm:ss a zzzz
-FormatData/es_NI/TimePatterns/1=h:mm:ss a z
-FormatData/es_NI/TimePatterns/2=h:mm:ss a
-FormatData/es_NI/TimePatterns/3=h:mm a
+FormatData/es_NI/TimePatterns/0=HH:mm:ss zzzz
+FormatData/es_NI/TimePatterns/1=HH:mm:ss z
+FormatData/es_NI/TimePatterns/2=HH:mm:ss
+FormatData/es_NI/TimePatterns/3=HH:mm
 FormatData/es_NI/DatePatterns/0=EEEE, d 'de' MMMM 'de' y
 FormatData/es_NI/DatePatterns/1=d 'de' MMMM 'de' y
 FormatData/es_NI/DatePatterns/2=d MMM y
@@ -605,10 +605,10 @@ FormatData/es_PA/DateTimePatterns/0={1}, {0}
 FormatData/es_PE/NumberPatterns/0=#,##0.###
 # FormatData/es_PE/NumberPatterns/1=S/#,##0.00;S/-#,##0.00 # Changed; see bug 4122840
 FormatData/es_PE/NumberPatterns/2=#,##0\u00a0%
-FormatData/es_PE/TimePatterns/0=h:mm:ss a zzzz
-FormatData/es_PE/TimePatterns/1=h:mm:ss a z
-FormatData/es_PE/TimePatterns/2=h:mm:ss a
-FormatData/es_PE/TimePatterns/3=h:mm a
+FormatData/es_PE/TimePatterns/0=HH:mm:ss zzzz
+FormatData/es_PE/TimePatterns/1=HH:mm:ss z
+FormatData/es_PE/TimePatterns/2=HH:mm:ss
+FormatData/es_PE/TimePatterns/3=HH:mm
 FormatData/es_PE/DatePatterns/0=EEEE, d 'de' MMMM 'de' y
 FormatData/es_PE/DatePatterns/1=d 'de' MMMM 'de' y
 FormatData/es_PE/DatePatterns/2=d MMM y
@@ -633,14 +633,14 @@ FormatData/es_PR/DateTimePatterns/0={1}, {0}
 #FormatData/es_PR/NumberElements/0=<MISSING!>
 #FormatData/es_PR/NumberElements/1=<MISSING!>
 #FormatData/es_PR/NumberElements/2=<MISSING!>
-CurrencyNames/es_PY/PYG=\u20b2
+CurrencyNames/es_PY/PYG=Gs.
 FormatData/es_PY/NumberPatterns/0=#,##0.###
 # FormatData/es_PY/NumberPatterns/1=G#,##0.00;(G#,##0.00) # Changed; see bug 4122840
 FormatData/es_PY/NumberPatterns/2=#,##0\u00a0%
-FormatData/es_PY/TimePatterns/0=h:mm:ss a zzzz
-FormatData/es_PY/TimePatterns/1=h:mm:ss a z
-FormatData/es_PY/TimePatterns/2=h:mm:ss a
-FormatData/es_PY/TimePatterns/3=h:mm a
+FormatData/es_PY/TimePatterns/0=HH:mm:ss zzzz
+FormatData/es_PY/TimePatterns/1=HH:mm:ss z
+FormatData/es_PY/TimePatterns/2=HH:mm:ss
+FormatData/es_PY/TimePatterns/3=HH:mm
 FormatData/es_PY/DatePatterns/0=EEEE, d 'de' MMMM 'de' y
 FormatData/es_PY/DatePatterns/1=d 'de' MMMM 'de' y
 FormatData/es_PY/DatePatterns/2=d MMM y
@@ -653,10 +653,10 @@ FormatData/es_SV/NumberPatterns/0=#,##0.###
 # FormatData/es_SV/NumberPatterns/1=C#,##0.00;(C#,##0.00) # Changed; see bug 4122840
 FormatData/es_SV/NumberPatterns/2=#,##0\u00a0%
 #CurrencyNames/es_SV/SVC=<MISSING!>
-FormatData/es_SV/TimePatterns/0=h:mm:ss a zzzz
-FormatData/es_SV/TimePatterns/1=h:mm:ss a z
-FormatData/es_SV/TimePatterns/2=h:mm:ss a
-FormatData/es_SV/TimePatterns/3=h:mm a
+FormatData/es_SV/TimePatterns/0=HH:mm:ss zzzz
+FormatData/es_SV/TimePatterns/1=HH:mm:ss z
+FormatData/es_SV/TimePatterns/2=HH:mm:ss
+FormatData/es_SV/TimePatterns/3=HH:mm
 FormatData/es_SV/DatePatterns/0=EEEE, d 'de' MMMM 'de' y
 FormatData/es_SV/DatePatterns/1=d 'de' MMMM 'de' y
 FormatData/es_SV/DatePatterns/2=d MMM y
@@ -669,10 +669,10 @@ CurrencyNames/es_UY/UYU=$
 FormatData/es_UY/NumberPatterns/0=#,##0.###
 # FormatData/es_UY/NumberPatterns/1=NU$ #,##0.00;(NU$#,##0.00) # Changed; see bug 4122840
 FormatData/es_UY/NumberPatterns/2=#,##0\u00a0%
-FormatData/es_UY/TimePatterns/0=h:mm:ss a zzzz
-FormatData/es_UY/TimePatterns/1=h:mm:ss a z
-FormatData/es_UY/TimePatterns/2=h:mm:ss a
-FormatData/es_UY/TimePatterns/3=h:mm a
+FormatData/es_UY/TimePatterns/0=HH:mm:ss zzzz
+FormatData/es_UY/TimePatterns/1=HH:mm:ss z
+FormatData/es_UY/TimePatterns/2=HH:mm:ss
+FormatData/es_UY/TimePatterns/3=HH:mm
 FormatData/es_UY/DatePatterns/0=EEEE, d 'de' MMMM 'de' y
 FormatData/es_UY/DatePatterns/1=d 'de' MMMM 'de' y
 FormatData/es_UY/DatePatterns/2=d MMM y
@@ -1577,10 +1577,10 @@ FormatData/ar_MA/MonthNames/11=\u062f\u062c\u0646\u0628\u0631
 FormatData/ar_MA/MonthNames/12=
 FormatData/ar_MA/AmPmMarkers/0=\u0635
 FormatData/ar_MA/AmPmMarkers/1=\u0645
-FormatData/ar_MA/TimePatterns/0=h:mm:ss a zzzz
-FormatData/ar_MA/TimePatterns/1=h:mm:ss a z
-FormatData/ar_MA/TimePatterns/2=h:mm:ss a
-FormatData/ar_MA/TimePatterns/3=h:mm a
+FormatData/ar_MA/TimePatterns/0=HH:mm:ss zzzz
+FormatData/ar_MA/TimePatterns/1=HH:mm:ss z
+FormatData/ar_MA/TimePatterns/2=HH:mm:ss
+FormatData/ar_MA/TimePatterns/3=HH:mm
 FormatData/ar_MA/DatePatterns/0=EEEE\u060c d MMMM\u060c y
 FormatData/ar_MA/DatePatterns/1=d MMMM\u060c y
 FormatData/ar_MA/DatePatterns/2=dd\u200f/MM\u200f/y
@@ -2289,7 +2289,7 @@ FormatData/fr_FR/DatePatterns/0=EEEE d MMMM y
 FormatData/fr_FR/DatePatterns/1=d MMMM y
 FormatData/fr_FR/DatePatterns/2=d MMM y
 FormatData/fr_FR/DatePatterns/3=dd/MM/y
-FormatData/fr_FR/DateTimePatterns/0={1} {0}
+FormatData/fr_FR/DateTimePatterns/0={1} '\u00e0' {0}
 #FormatData/fr_FR/NumberElements/0=<MISSING!>
 #FormatData/fr_FR/NumberElements/1=<MISSING!>
 #FormatData/fr_FR/NumberElements/2=<MISSING!>
@@ -2372,10 +2372,10 @@ FormatData/ar_YE/NumberPatterns/1=\u00a4\u00a0#,##0.00
 FormatData/en_AU/NumberPatterns/1=\u00a4#,##0.00
 FormatData/en_NZ/NumberPatterns/1=\u00a4#,##0.00
 FormatData/en_ZA/NumberPatterns/1=\u00a4#,##0.00
-FormatData/es_AR/NumberPatterns/1=\u00a4#,##0.00
+FormatData/es_AR/NumberPatterns/1=\u00a4\u00a0#,##0.00
 FormatData/es_BO/NumberPatterns/1=\u00a4#,##0.00
 FormatData/es_CL/NumberPatterns/1=\u00a4#,##0.00;\u00a4-#,##0.00
-FormatData/es_CO/NumberPatterns/1=\u00a4#,##0.00
+FormatData/es_CO/NumberPatterns/1=\u00a4\u00a0#,##0.00
 FormatData/es_CR/NumberPatterns/1=\u00a4#,##0.00
 FormatData/es_DO/NumberPatterns/1=\u00a4#,##0.00
 FormatData/es_EC/NumberPatterns/1=\u00a4#,##0.00;\u00a4-#,##0.00
@@ -2447,7 +2447,7 @@ FormatData/zh_HK/TimePatterns/3=ah:mm
 FormatData/zh_HK/DatePatterns/0=y\u5e74M\u6708d\u65e5EEEE
 FormatData/zh_HK/DatePatterns/1=y\u5e74M\u6708d\u65e5
 FormatData/zh_HK/DatePatterns/2=y\u5e74M\u6708d\u65e5
-FormatData/zh_HK/DatePatterns/3=d/M/yy
+FormatData/zh_HK/DatePatterns/3=d/M/y
 FormatData/zh_HK/DateTimePatterns/0={1} {0}
 
 #bug #4149569
@@ -2482,7 +2482,7 @@ LocaleNames/es/SV=El Salvador
 #TimeZoneNames/en_CA/CTT/2=<MISSING!>
 
 #bug nobugid, 4290801, 4942982
-CurrencyNames/ru_RU/RUB=\u0440\u0443\u0431.
+CurrencyNames/ru_RU/RUB=\u20bd
 
 #bug 4826794
 LocaleNames/ru_RU/MM=\u041c\u044c\u044f\u043d\u043c\u0430 (\u0411\u0438\u0440\u043c\u0430)
@@ -2862,10 +2862,10 @@ FormatData/in_ID/DateTimePatterns/0={1} {0}
 FormatData/en_MT/NumberPatterns/0=#,##0.###
 FormatData/en_MT/NumberPatterns/1=\u00a4#,##0.00
 FormatData/en_MT/NumberPatterns/2=#,##0%
-FormatData/en_MT/TimePatterns/0=h:mm:ss a zzzz
-FormatData/en_MT/TimePatterns/1=h:mm:ss a z
-FormatData/en_MT/TimePatterns/2=h:mm:ss a
-FormatData/en_MT/TimePatterns/3=h:mm a
+FormatData/en_MT/TimePatterns/0=HH:mm:ss zzzz
+FormatData/en_MT/TimePatterns/1=HH:mm:ss z
+FormatData/en_MT/TimePatterns/2=HH:mm:ss
+FormatData/en_MT/TimePatterns/3=HH:mm
 FormatData/en_MT/DatePatterns/0=EEEE, d MMMM y
 FormatData/en_MT/DatePatterns/1=dd MMMM y
 FormatData/en_MT/DatePatterns/2=dd MMM y
@@ -3091,7 +3091,6 @@ LocaleNames/el_CY/AG=\u0391\u03bd\u03c4\u03af\u03b3\u03ba\u03bf\u03c5\u03b1 \u03
 LocaleNames/el_CY/AI=\u0391\u03bd\u03b3\u03ba\u03bf\u03c5\u03af\u03bb\u03b1
 LocaleNames/el_CY/AL=\u0391\u03bb\u03b2\u03b1\u03bd\u03af\u03b1
 LocaleNames/el_CY/AM=\u0391\u03c1\u03bc\u03b5\u03bd\u03af\u03b1
-LocaleNames/el_CY/AN=\u039f\u03bb\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ad\u03c2 \u0391\u03bd\u03c4\u03af\u03bb\u03bb\u03b5\u03c2
 LocaleNames/el_CY/AO=\u0391\u03bd\u03b3\u03ba\u03cc\u03bb\u03b1
 LocaleNames/el_CY/AQ=\u0391\u03bd\u03c4\u03b1\u03c1\u03ba\u03c4\u03b9\u03ba\u03ae
 LocaleNames/el_CY/AR=\u0391\u03c1\u03b3\u03b5\u03bd\u03c4\u03b9\u03bd\u03ae
@@ -3220,7 +3219,7 @@ LocaleNames/el_CY/MC=\u039c\u03bf\u03bd\u03b1\u03ba\u03cc
 LocaleNames/el_CY/MD=\u039c\u03bf\u03bb\u03b4\u03b1\u03b2\u03af\u03b1
 LocaleNames/el_CY/MG=\u039c\u03b1\u03b4\u03b1\u03b3\u03b1\u03c3\u03ba\u03ac\u03c1\u03b7
 LocaleNames/el_CY/MH=\u039d\u03ae\u03c3\u03bf\u03b9 \u039c\u03ac\u03c1\u03c3\u03b1\u03bb
-LocaleNames/el_CY/MK=\u03a0\u0393\u0394\u039c
+LocaleNames/el_CY/MK=\u03a0\u03c1\u03ce\u03b7\u03bd \u0393\u03b9\u03bf\u03c5\u03b3\u03ba\u03bf\u03c3\u03bb\u03b1\u03b2\u03b9\u03ba\u03ae \u0394\u03b7\u03bc\u03bf\u03ba\u03c1\u03b1\u03c4\u03af\u03b1 \u03c4\u03b7\u03c2 \u039c\u03b1\u03ba\u03b5\u03b4\u03bf\u03bd\u03af\u03b1\u03c2
 LocaleNames/el_CY/ML=\u039c\u03ac\u03bb\u03b9
 LocaleNames/el_CY/MM=\u039c\u03b9\u03b1\u03bd\u03bc\u03ac\u03c1/\u0392\u03b9\u03c1\u03bc\u03b1\u03bd\u03af\u03b1
 LocaleNames/el_CY/MN=\u039c\u03bf\u03b3\u03b3\u03bf\u03bb\u03af\u03b1
@@ -3289,7 +3288,7 @@ LocaleNames/el_CY/SY=\u03a3\u03c5\u03c1\u03af\u03b1
 LocaleNames/el_CY/SZ=\u03a3\u03bf\u03c5\u03b1\u03b6\u03b9\u03bb\u03ac\u03bd\u03b4\u03b7
 LocaleNames/el_CY/TC=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a4\u03b5\u03c1\u03ba \u03ba\u03b1\u03b9 \u039a\u03ac\u03b9\u03ba\u03bf\u03c2
 LocaleNames/el_CY/TD=\u03a4\u03c3\u03b1\u03bd\u03c4
-LocaleNames/el_CY/TF=\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ac \u039d\u03cc\u03c4\u03b9\u03b1 \u0395\u03b4\u03ac\u03c6\u03b7
+LocaleNames/el_CY/TF=\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ad\u03c2 \u03c0\u03b5\u03c1\u03b9\u03bf\u03c7\u03ad\u03c2 \u03c4\u03bf\u03c5 \u03bd\u03bf\u03c4\u03af\u03bf\u03c5 \u03b7\u03bc\u03b9\u03c3\u03c6\u03b1\u03b9\u03c1\u03af\u03bf\u03c5
 LocaleNames/el_CY/TG=\u03a4\u03cc\u03b3\u03ba\u03bf
 LocaleNames/el_CY/TH=\u03a4\u03b1\u03ca\u03bb\u03ac\u03bd\u03b4\u03b7
 LocaleNames/el_CY/TJ=\u03a4\u03b1\u03c4\u03b6\u03b9\u03ba\u03b9\u03c3\u03c4\u03ac\u03bd
@@ -3305,7 +3304,7 @@ LocaleNames/el_CY/TW=\u03a4\u03b1\u03ca\u03b2\u03ac\u03bd
 LocaleNames/el_CY/TZ=\u03a4\u03b1\u03bd\u03b6\u03b1\u03bd\u03af\u03b1
 LocaleNames/el_CY/UA=\u039f\u03c5\u03ba\u03c1\u03b1\u03bd\u03af\u03b1
 LocaleNames/el_CY/UG=\u039f\u03c5\u03b3\u03ba\u03ac\u03bd\u03c4\u03b1
-LocaleNames/el_CY/UM=\u0391\u03c0\u03bf\u03bc\u03b1\u03ba\u03c1\u03c5\u03c3\u03bc\u03ad\u03bd\u03b5\u03c2 \u039d\u03b7\u03c3\u03af\u03b4\u03b5\u03c2 \u0397.\u03a0.\u0391.
+LocaleNames/el_CY/UM=\u0391\u03c0\u03bf\u03bc\u03b1\u03ba\u03c1\u03c5\u03c3\u03bc\u03ad\u03bd\u03b5\u03c2 \u039d\u03b7\u03c3\u03af\u03b4\u03b5\u03c2 \u0397\u03a0\u0391
 LocaleNames/el_CY/US=\u0397\u03bd\u03c9\u03bc\u03ad\u03bd\u03b5\u03c2 \u03a0\u03bf\u03bb\u03b9\u03c4\u03b5\u03af\u03b5\u03c2
 LocaleNames/el_CY/UY=\u039f\u03c5\u03c1\u03bf\u03c5\u03b3\u03bf\u03c5\u03ac\u03b7
 LocaleNames/el_CY/UZ=\u039f\u03c5\u03b6\u03bc\u03c0\u03b5\u03ba\u03b9\u03c3\u03c4\u03ac\u03bd
@@ -3364,7 +3363,7 @@ LocaleNames/ms/EG=Mesir
 LocaleNames/ms/EH=Sahara Barat
 LocaleNames/ms/ES=Sepanyol
 LocaleNames/ms/FR=Perancis
-LocaleNames/ms/GR=Yunani
+LocaleNames/ms/GR=Greece
 LocaleNames/ms/GS=Kepulauan Georgia Selatan & Sandwich Selatan
 LocaleNames/ms/GW=Guinea Bissau
 LocaleNames/ms/HK=Hong Kong SAR China
@@ -3442,10 +3441,10 @@ LocaleNames/es_US/ce=checheno
 LocaleNames/es_US/ch=chamorro
 LocaleNames/es_US/cr=cree
 LocaleNames/es_US/cu=eslavo eclesi\u00e1stico
-LocaleNames/es_US/cv=chuvash
+LocaleNames/es_US/cv=chuvasio
 LocaleNames/es_US/dv=divehi
 LocaleNames/es_US/ee=ew\u00e9
-LocaleNames/es_US/eu=euskera
+LocaleNames/es_US/eu=vasco
 LocaleNames/es_US/ff=fula
 LocaleNames/es_US/fo=fero\u00e9s
 LocaleNames/es_US/fy=fris\u00f3n occidental
@@ -3478,10 +3477,10 @@ LocaleNames/es_US/li=limburgu\u00e9s
 LocaleNames/es_US/lu=luba-katanga
 LocaleNames/es_US/mh=marshal\u00e9s
 LocaleNames/es_US/mr=marat\u00ed
-LocaleNames/es_US/nb=bokmal noruego
+LocaleNames/es_US/nb=noruego bokmal
 LocaleNames/es_US/nd=ndebele septentrional
 LocaleNames/es_US/ng=ndonga
-LocaleNames/es_US/nn=nynorsk noruego
+LocaleNames/es_US/nn=noruego nynorsk
 LocaleNames/es_US/nr=ndebele meridional
 LocaleNames/es_US/nv=navajo
 LocaleNames/es_US/ny=nyanja
@@ -3512,10 +3511,9 @@ LocaleNames/es_US/uz=uzbeko
 LocaleNames/es_US/ve=venda
 LocaleNames/es_US/wa=val\u00f3n
 LocaleNames/es_US/za=zhuang
-LocaleNames/es_US/AN=Antillas Neerlandesas
 LocaleNames/es_US/BA=Bosnia-Herzegovina
 LocaleNames/es_US/CC=Islas Cocos
-LocaleNames/es_US/CX=Isla de Navidad (Christmas)
+LocaleNames/es_US/CX=Isla de Navidad
 LocaleNames/es_US/CZ=Rep\u00fablica Checa
 LocaleNames/es_US/EH=S\u00e1hara Occidental
 LocaleNames/es_US/FK=Islas Malvinas
@@ -3531,7 +3529,7 @@ LocaleNames/es_US/PG=Pap\u00faa Nueva Guinea
 LocaleNames/es_US/PK=Pakist\u00e1n
 LocaleNames/es_US/PN=Islas Pitcairn
 LocaleNames/es_US/PS=Territorios Palestinos
-LocaleNames/es_US/PW=Palau
+LocaleNames/es_US/PW=Palaos
 LocaleNames/es_US/RO=Ruman\u00eda
 LocaleNames/es_US/SA=Arabia Saud\u00ed
 LocaleNames/es_US/SH=Santa Elena
@@ -3570,7 +3568,7 @@ LocaleNames/pt/co=c\u00f3rsico
 LocaleNames/pt/cr=cree
 LocaleNames/pt/cs=tcheco
 LocaleNames/pt/cu=eslavo eclesi\u00e1stico
-LocaleNames/pt/cv=chuvash
+LocaleNames/pt/cv=tchuvache
 LocaleNames/pt/cy=gal\u00eas
 LocaleNames/pt/da=dinamarqu\u00eas
 LocaleNames/pt/de=alem\u00e3o
@@ -3679,7 +3677,7 @@ LocaleNames/pt/rm=romanche
 LocaleNames/pt/rn=rundi
 LocaleNames/pt/ro=romeno
 LocaleNames/pt/ru=russo
-LocaleNames/pt/rw=kinyarwanda
+LocaleNames/pt/rw=quiniaruanda
 LocaleNames/pt/sa=s\u00e2nscrito
 LocaleNames/pt/sc=sardo
 LocaleNames/pt/sd=sindi
@@ -3729,7 +3727,6 @@ LocaleNames/pt/AF=Afeganist\u00e3o
 LocaleNames/pt/AG=Ant\u00edgua e Barbuda
 LocaleNames/pt/AL=Alb\u00e2nia
 LocaleNames/pt/AM=Arm\u00eania
-LocaleNames/pt/AN=Antilhas Holandesas
 LocaleNames/pt/AQ=Ant\u00e1rtida
 LocaleNames/pt/AS=Samoa Americana
 LocaleNames/pt/AT=\u00c1ustria
@@ -3918,7 +3915,7 @@ LocaleNames/pt_PT/BA=B\u00f3snia e Herzegovina
 LocaleNames/pt_PT/BJ=Benim
 LocaleNames/pt_PT/BY=Bielorr\u00fassia
 LocaleNames/pt_PT/CM=Camar\u00f5es
-LocaleNames/pt_PT/CX=Ilha Christmas
+LocaleNames/pt_PT/CX=Ilha do Natal
 LocaleNames/pt_PT/CZ=Rep\u00fablica Checa
 LocaleNames/pt_PT/EE=Est\u00f3nia
 LocaleNames/pt_PT/EG=Egito
@@ -3931,7 +3928,7 @@ LocaleNames/pt_PT/GW=Guin\u00e9-Bissau
 LocaleNames/pt_PT/HK=Hong Kong, RAE da China
 LocaleNames/pt_PT/KE=Qu\u00e9nia
 LocaleNames/pt_PT/KG=Quirguist\u00e3o
-LocaleNames/pt_PT/KN=S\u00e3o Crist\u00f3v\u00e3o e Nevis
+LocaleNames/pt_PT/KN=S\u00e3o Crist\u00f3v\u00e3o e Neves
 LocaleNames/pt_PT/KP=Coreia do Norte
 LocaleNames/pt_PT/KR=Coreia do Sul
 LocaleNames/pt_PT/KY=Ilhas Caim\u00e3o
@@ -3954,14 +3951,14 @@ LocaleNames/pt_PT/RO=Rom\u00e9nia
 LocaleNames/pt_PT/SC=Seicheles
 LocaleNames/pt_PT/SG=Singapura
 LocaleNames/pt_PT/SI=Eslov\u00e9nia
-LocaleNames/pt_PT/SM=S\u00e3o Marino
-LocaleNames/pt_PT/TC=Ilhas Turks e Caicos
+LocaleNames/pt_PT/SM=S\u00e3o Marinho
+LocaleNames/pt_PT/TC=Ilhas Turcas e Caicos
 LocaleNames/pt_PT/TD=Chade
 LocaleNames/pt_PT/TF=Territ\u00f3rios Franceses do Sul
 LocaleNames/pt_PT/TJ=Tajiquist\u00e3o
 LocaleNames/pt_PT/TM=Turquemenist\u00e3o
-LocaleNames/pt_PT/UM=Ilhas Menores Distantes dos EUA
-LocaleNames/pt_PT/UZ=Uzbequist\u00e3o
+LocaleNames/pt_PT/UM=Ilhas Menores Afastadas dos EUA
+LocaleNames/pt_PT/UZ=Usbequist\u00e3o
 LocaleNames/pt_PT/VA=Cidade do Vaticano
 LocaleNames/pt_PT/VC=S\u00e3o Vicente e Granadinas
 LocaleNames/pt_PT/VG=Ilhas Virgens Brit\u00e2nicas
@@ -3983,7 +3980,7 @@ LocaleNames/ga/bo=Tib\u00e9idis
 LocaleNames/ga/br=Briot\u00e1inis
 LocaleNames/ga/bs=Boisnis
 LocaleNames/ga/ca=Catal\u00f3inis
-LocaleNames/ga/ce=Sisinis
+LocaleNames/ga/ce=Seisnis
 LocaleNames/ga/co=Corsaicis
 LocaleNames/ga/cr=Cra\u00eds
 LocaleNames/ga/cs=Seicis
@@ -4090,7 +4087,6 @@ LocaleNames/ga/AF=An Afganast\u00e1in
 LocaleNames/ga/AG=Antigua agus Barb\u00fada
 LocaleNames/ga/AL=An Alb\u00e1in
 LocaleNames/ga/AM=An Airm\u00e9in
-LocaleNames/ga/AN=Aintill\u00ed na h\u00cdsilt\u00edre
 LocaleNames/ga/AO=Ang\u00f3la
 LocaleNames/ga/AQ=An Antartaice
 LocaleNames/ga/AR=An Airgint\u00edn
@@ -4433,7 +4429,6 @@ LocaleNames/sr/AE=\u0423\u0458\u0435\u0434\u0438\u045a\u0435\u043d\u0438 \u0410\
 LocaleNames/sr/AF=\u0410\u0432\u0433\u0430\u043d\u0438\u0441\u0442\u0430\u043d
 LocaleNames/sr/AL=\u0410\u043b\u0431\u0430\u043d\u0438\u0458\u0430
 LocaleNames/sr/AM=\u0408\u0435\u0440\u043c\u0435\u043d\u0438\u0458\u0430
-LocaleNames/sr/AN=\u0425\u043e\u043b\u0430\u043d\u0434\u0441\u043a\u0438 \u0410\u043d\u0442\u0438\u043b\u0438
 LocaleNames/sr/AO=\u0410\u043d\u0433\u043e\u043b\u0430
 LocaleNames/sr/AR=\u0410\u0440\u0433\u0435\u043d\u0442\u0438\u043d\u0430
 LocaleNames/sr/AT=\u0410\u0443\u0441\u0442\u0440\u0438\u0458\u0430
@@ -4461,7 +4456,7 @@ LocaleNames/sr/BW=\u0411\u043e\u0446\u0432\u0430\u043d\u0430
 LocaleNames/sr/BY=\u0411\u0435\u043b\u043e\u0440\u0443\u0441\u0438\u0458\u0430
 LocaleNames/sr/BZ=\u0411\u0435\u043b\u0438\u0437\u0435
 LocaleNames/sr/CA=\u041a\u0430\u043d\u0430\u0434\u0430
-LocaleNames/sr/CC=\u041a\u043e\u043a\u043e\u0441 (\u041a\u0435\u043b\u0438\u043d\u0433) \u041e\u0441\u0442\u0440\u0432\u0430
+LocaleNames/sr/CC=\u041a\u043e\u043a\u043e\u0441\u043e\u0432\u0430 (\u041a\u0438\u043b\u0438\u043d\u0433\u043e\u0432\u0430) \u041e\u0441\u0442\u0440\u0432\u0430
 LocaleNames/sr/CD=\u041a\u043e\u043d\u0433\u043e - \u041a\u0438\u043d\u0448\u0430\u0441\u0430
 LocaleNames/sr/CF=\u0426\u0435\u043d\u0442\u0440\u0430\u043b\u043d\u043e\u0430\u0444\u0440\u0438\u0447\u043a\u0430 \u0420\u0435\u043f\u0443\u0431\u043b\u0438\u043a\u0430
 LocaleNames/sr/CG=\u041a\u043e\u043d\u0433\u043e - \u0411\u0440\u0430\u0437\u0430\u0432\u0438\u043b
@@ -4515,7 +4510,7 @@ LocaleNames/sr/GT=\u0413\u0432\u0430\u0442\u0435\u043c\u0430\u043b\u0430
 LocaleNames/sr/GU=\u0413\u0443\u0430\u043c
 LocaleNames/sr/GW=\u0413\u0432\u0438\u043d\u0435\u0458\u0430-\u0411\u0438\u0441\u0430\u043e
 LocaleNames/sr/GY=\u0413\u0432\u0430\u0458\u0430\u043d\u0430
-LocaleNames/sr/HK=\u0425\u043e\u043d\u0433 \u041a\u043e\u043d\u0433 \u0421. \u0410. \u0420. \u041a\u0438\u043d\u0430
+LocaleNames/sr/HK=\u0421\u0410\u0420 \u0425\u043e\u043d\u0433\u043a\u043e\u043d\u0433 (\u041a\u0438\u043d\u0430)
 LocaleNames/sr/HM=\u041e\u0441\u0442\u0440\u0432\u0430 \u0425\u0435\u0440\u0434 \u0438 \u041c\u0435\u043a\u0434\u043e\u043d\u0430\u043b\u0434
 LocaleNames/sr/HN=\u0425\u043e\u043d\u0434\u0443\u0440\u0430\u0441
 LocaleNames/sr/HR=\u0425\u0440\u0432\u0430\u0442\u0441\u043a\u0430
@@ -4578,7 +4573,7 @@ LocaleNames/sr/MZ=\u041c\u043e\u0437\u0430\u043c\u0431\u0438\u043a
 LocaleNames/sr/NA=\u041d\u0430\u043c\u0438\u0431\u0438\u0458\u0430
 LocaleNames/sr/NC=\u041d\u043e\u0432\u0430 \u041a\u0430\u043b\u0435\u0434\u043e\u043d\u0438\u0458\u0430
 LocaleNames/sr/NE=\u041d\u0438\u0433\u0435\u0440
-LocaleNames/sr/NF=\u041d\u043e\u0440\u0444\u043e\u043b\u043a \u041e\u0441\u0442\u0440\u0432\u043e
+LocaleNames/sr/NF=\u041e\u0441\u0442\u0440\u0432\u043e \u041d\u043e\u0440\u0444\u043e\u043a
 LocaleNames/sr/NG=\u041d\u0438\u0433\u0435\u0440\u0438\u0458\u0430
 LocaleNames/sr/NI=\u041d\u0438\u043a\u0430\u0440\u0430\u0433\u0432\u0430
 LocaleNames/sr/NL=\u0425\u043e\u043b\u0430\u043d\u0434\u0438\u0458\u0430
@@ -4749,7 +4744,6 @@ LocaleNames/el/AG=\u0391\u03bd\u03c4\u03af\u03b3\u03ba\u03bf\u03c5\u03b1 \u03ba\
 LocaleNames/el/AI=\u0391\u03bd\u03b3\u03ba\u03bf\u03c5\u03af\u03bb\u03b1
 LocaleNames/el/AL=\u0391\u03bb\u03b2\u03b1\u03bd\u03af\u03b1
 LocaleNames/el/AM=\u0391\u03c1\u03bc\u03b5\u03bd\u03af\u03b1
-LocaleNames/el/AN=\u039f\u03bb\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ad\u03c2 \u0391\u03bd\u03c4\u03af\u03bb\u03bb\u03b5\u03c2
 LocaleNames/el/AO=\u0391\u03bd\u03b3\u03ba\u03cc\u03bb\u03b1
 LocaleNames/el/AQ=\u0391\u03bd\u03c4\u03b1\u03c1\u03ba\u03c4\u03b9\u03ba\u03ae
 LocaleNames/el/AR=\u0391\u03c1\u03b3\u03b5\u03bd\u03c4\u03b9\u03bd\u03ae
@@ -4878,7 +4872,7 @@ LocaleNames/el/MC=\u039c\u03bf\u03bd\u03b1\u03ba\u03cc
 LocaleNames/el/MD=\u039c\u03bf\u03bb\u03b4\u03b1\u03b2\u03af\u03b1
 LocaleNames/el/MG=\u039c\u03b1\u03b4\u03b1\u03b3\u03b1\u03c3\u03ba\u03ac\u03c1\u03b7
 LocaleNames/el/MH=\u039d\u03ae\u03c3\u03bf\u03b9 \u039c\u03ac\u03c1\u03c3\u03b1\u03bb
-LocaleNames/el/MK=\u03a0\u0393\u0394\u039c
+LocaleNames/el/MK=\u03a0\u03c1\u03ce\u03b7\u03bd \u0393\u03b9\u03bf\u03c5\u03b3\u03ba\u03bf\u03c3\u03bb\u03b1\u03b2\u03b9\u03ba\u03ae \u0394\u03b7\u03bc\u03bf\u03ba\u03c1\u03b1\u03c4\u03af\u03b1 \u03c4\u03b7\u03c2 \u039c\u03b1\u03ba\u03b5\u03b4\u03bf\u03bd\u03af\u03b1\u03c2
 LocaleNames/el/ML=\u039c\u03ac\u03bb\u03b9
 LocaleNames/el/MM=\u039c\u03b9\u03b1\u03bd\u03bc\u03ac\u03c1/\u0392\u03b9\u03c1\u03bc\u03b1\u03bd\u03af\u03b1
 LocaleNames/el/MN=\u039c\u03bf\u03b3\u03b3\u03bf\u03bb\u03af\u03b1
@@ -4947,7 +4941,7 @@ LocaleNames/el/SY=\u03a3\u03c5\u03c1\u03af\u03b1
 LocaleNames/el/SZ=\u03a3\u03bf\u03c5\u03b1\u03b6\u03b9\u03bb\u03ac\u03bd\u03b4\u03b7
 LocaleNames/el/TC=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a4\u03b5\u03c1\u03ba \u03ba\u03b1\u03b9 \u039a\u03ac\u03b9\u03ba\u03bf\u03c2
 LocaleNames/el/TD=\u03a4\u03c3\u03b1\u03bd\u03c4
-LocaleNames/el/TF=\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ac \u039d\u03cc\u03c4\u03b9\u03b1 \u0395\u03b4\u03ac\u03c6\u03b7
+LocaleNames/el/TF=\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ad\u03c2 \u03c0\u03b5\u03c1\u03b9\u03bf\u03c7\u03ad\u03c2 \u03c4\u03bf\u03c5 \u03bd\u03bf\u03c4\u03af\u03bf\u03c5 \u03b7\u03bc\u03b9\u03c3\u03c6\u03b1\u03b9\u03c1\u03af\u03bf\u03c5
 LocaleNames/el/TG=\u03a4\u03cc\u03b3\u03ba\u03bf
 LocaleNames/el/TH=\u03a4\u03b1\u03ca\u03bb\u03ac\u03bd\u03b4\u03b7
 LocaleNames/el/TJ=\u03a4\u03b1\u03c4\u03b6\u03b9\u03ba\u03b9\u03c3\u03c4\u03ac\u03bd
@@ -4963,7 +4957,7 @@ LocaleNames/el/TW=\u03a4\u03b1\u03ca\u03b2\u03ac\u03bd
 LocaleNames/el/TZ=\u03a4\u03b1\u03bd\u03b6\u03b1\u03bd\u03af\u03b1
 LocaleNames/el/UA=\u039f\u03c5\u03ba\u03c1\u03b1\u03bd\u03af\u03b1
 LocaleNames/el/UG=\u039f\u03c5\u03b3\u03ba\u03ac\u03bd\u03c4\u03b1
-LocaleNames/el/UM=\u0391\u03c0\u03bf\u03bc\u03b1\u03ba\u03c1\u03c5\u03c3\u03bc\u03ad\u03bd\u03b5\u03c2 \u039d\u03b7\u03c3\u03af\u03b4\u03b5\u03c2 \u0397.\u03a0.\u0391.
+LocaleNames/el/UM=\u0391\u03c0\u03bf\u03bc\u03b1\u03ba\u03c1\u03c5\u03c3\u03bc\u03ad\u03bd\u03b5\u03c2 \u039d\u03b7\u03c3\u03af\u03b4\u03b5\u03c2 \u0397\u03a0\u0391
 LocaleNames/el/US=\u0397\u03bd\u03c9\u03bc\u03ad\u03bd\u03b5\u03c2 \u03a0\u03bf\u03bb\u03b9\u03c4\u03b5\u03af\u03b5\u03c2
 LocaleNames/el/UY=\u039f\u03c5\u03c1\u03bf\u03c5\u03b3\u03bf\u03c5\u03ac\u03b7
 LocaleNames/el/UZ=\u039f\u03c5\u03b6\u03bc\u03c0\u03b5\u03ba\u03b9\u03c3\u03c4\u03ac\u03bd
@@ -5168,7 +5162,6 @@ LocaleNames/mt/AF=Afganistan
 LocaleNames/mt/AI=Angwilla
 LocaleNames/mt/AL=Albanija
 LocaleNames/mt/AM=Armenja
-LocaleNames/mt/AN=Antilles Olandi\u017ci
 LocaleNames/mt/AQ=Antartika
 LocaleNames/mt/AR=Ar\u0121entina
 LocaleNames/mt/AS=Samoa Amerikana
@@ -5197,7 +5190,7 @@ LocaleNames/mt/CI=Kosta ta\u2019 l-Avorju
 LocaleNames/mt/CL=\u010aili
 LocaleNames/mt/CM=Kamerun
 LocaleNames/mt/CN=I\u010b-\u010aina
-LocaleNames/mt/CO=Kolumbja
+LocaleNames/mt/CO=Kolombja
 LocaleNames/mt/CR=Kosta Rika
 #LocaleNames/mt/CS=<MISSING!>
 LocaleNames/mt/CU=Kuba
@@ -5214,7 +5207,7 @@ LocaleNames/mt/EC=Ekwador
 LocaleNames/mt/EE=Estonja
 LocaleNames/mt/EG=E\u0121ittu
 LocaleNames/mt/EH=Sahara tal-Punent
-LocaleNames/mt/ER=Eritreja
+LocaleNames/mt/ER=Eritrea
 LocaleNames/mt/ES=Spanja
 LocaleNames/mt/ET=Etijopja
 LocaleNames/mt/FI=Finlandja
@@ -5223,12 +5216,12 @@ LocaleNames/mt/FM=Mikronesja
 LocaleNames/mt/FO=G\u017cejjer Faroe
 LocaleNames/mt/FR=Franza
 LocaleNames/mt/GB=L-Ingilterra
-LocaleNames/mt/GE=\u0120or\u0121ja
+LocaleNames/mt/GE=\u0120eor\u0121ja
 LocaleNames/mt/GF=Gujana Fran\u010bi\u017ca
 LocaleNames/mt/GH=Gana
 LocaleNames/mt/GL=Grinlandja
 LocaleNames/mt/GM=Gambja
-LocaleNames/mt/GN=Gineja
+LocaleNames/mt/GN=Ginea
 LocaleNames/mt/GP=Gwadelupe
 LocaleNames/mt/GQ=Ginea Ekwatorjali
 LocaleNames/mt/GR=Gre\u010bja
@@ -5271,7 +5264,7 @@ LocaleNames/mt/LV=Latvja
 LocaleNames/mt/LY=Libja
 LocaleNames/mt/MA=Marokk
 LocaleNames/mt/MC=Monako
-LocaleNames/mt/MD=Maldova
+LocaleNames/mt/MD=Moldova
 LocaleNames/mt/MG=Madagaskar
 LocaleNames/mt/MH=G\u017cejjer ta\u2019 Marshall
 LocaleNames/mt/MK=Ma\u010bedonja
@@ -5463,7 +5456,7 @@ LocaleNames/pt_PT/os=oss\u00e9tico
 LocaleNames/pt_PT/st=soto do sul
 LocaleNames/pt_PT/ta=t\u00e2mil
 LocaleNames/pt_PT/AI=Anguila
-LocaleNames/pt_PT/AX=Ilhas \u00c5land
+LocaleNames/pt_PT/AX=Alanda
 
 # JE, GG, IM (6544471)
 #LocaleNames//JE=<MISSING!>
@@ -5505,10 +5498,10 @@ FormatData/fr_LU/DateTimePatternChars=GyMdkHmsSEDFwWahKzZ
 FormatData/fr/NumberPatterns/2=#,##0\u00a0%
 # following two lines are also for bug 4494727
 FormatData/fr_CA/NumberPatterns/2=#,##0\u00a0%
-FormatData/fr_CH/NumberPatterns/2=#,##0\u00a0%
+FormatData/fr_CH/NumberPatterns/2=#,##0%
 
 # bug 4494727
-FormatData/de_CH/NumberPatterns/2=#,##0\u00a0%
+FormatData/de_CH/NumberPatterns/2=#,##0%
 FormatData/tr/NumberPatterns/2=%#,##0
 # added to verify propper inheritance
 FormatData/tr_TR/NumberPatterns/2=%#,##0
@@ -5667,9 +5660,9 @@ LocaleNames/es/ku=kurdo
 LocaleNames/es/ky=kirgu\u00eds
 LocaleNames/es/lu=luba-katanga
 LocaleNames/es/mr=marat\u00ed
-LocaleNames/es/nb=bokmal noruego
+LocaleNames/es/nb=noruego bokmal
 LocaleNames/es/nd=ndebele septentrional
-LocaleNames/es/nn=nynorsk noruego
+LocaleNames/es/nn=noruego nynorsk
 LocaleNames/es/nr=ndebele meridional
 LocaleNames/es/os=os\u00e9tico
 LocaleNames/es/rm=retorrom\u00e1nico
@@ -5682,7 +5675,7 @@ LocaleNames/es/sn=shona
 LocaleNames/es/ss=siswati
 LocaleNames/es/st=sesotho meridional
 LocaleNames/es/su=sundan\u00e9s
-LocaleNames/es/sw=swahili
+LocaleNames/es/sw=suajili
 LocaleNames/es/tg=tayiko
 LocaleNames/es/ti=tigri\u00f1a
 LocaleNames/es/tn=setchwana
@@ -5855,7 +5848,7 @@ LocaleNames/nl/sw=Swahili
 LocaleNames/nl/ta=Tamil
 LocaleNames/nl/te=Telugu
 LocaleNames/nl/tg=Tadzjieks
-LocaleNames/nl/th=Thais
+LocaleNames/nl/th=Thai
 LocaleNames/nl/ti=Tigrinya
 LocaleNames/nl/tk=Turkmeens
 LocaleNames/nl/tl=Tagalog
@@ -5890,7 +5883,6 @@ LocaleNames/nl/AG=Antigua en Barbuda
 LocaleNames/nl/AI=Anguilla
 LocaleNames/nl/AL=Albani\u00eb
 LocaleNames/nl/AM=Armeni\u00eb
-LocaleNames/nl/AN=Nederlandse Antillen
 LocaleNames/nl/AO=Angola
 LocaleNames/nl/AQ=Antarctica
 LocaleNames/nl/AR=Argentini\u00eb
@@ -5917,7 +5909,7 @@ LocaleNames/nl/BS=Bahama\u2019s
 LocaleNames/nl/BT=Bhutan
 LocaleNames/nl/BV=Bouveteiland
 LocaleNames/nl/BW=Botswana
-LocaleNames/nl/BY=Wit-Rusland
+LocaleNames/nl/BY=Belarus
 LocaleNames/nl/BZ=Belize
 LocaleNames/nl/CA=Canada
 LocaleNames/nl/CC=Cocoseilanden
@@ -6002,7 +5994,7 @@ LocaleNames/nl/KN=Saint Kitts en Nevis
 LocaleNames/nl/KP=Noord-Korea
 LocaleNames/nl/KR=Zuid-Korea
 LocaleNames/nl/KW=Koeweit
-LocaleNames/nl/KY=Caymaneilanden
+LocaleNames/nl/KY=Kaaimaneilanden
 LocaleNames/nl/KZ=Kazachstan
 LocaleNames/nl/LA=Laos
 LocaleNames/nl/LB=Libanon
@@ -6091,7 +6083,7 @@ LocaleNames/nl/SY=Syri\u00eb
 LocaleNames/nl/SZ=Swaziland
 LocaleNames/nl/TC=Turks- en Caicoseilanden
 LocaleNames/nl/TD=Tsjaad
-LocaleNames/nl/TF=Franse Zuidelijke Gebieden
+LocaleNames/nl/TF=Franse Gebieden in de zuidelijke Indische Oceaan
 LocaleNames/nl/TG=Togo
 LocaleNames/nl/TH=Thailand
 LocaleNames/nl/TJ=Tadzjikistan
@@ -6651,7 +6643,7 @@ CurrencyNames/it/iep=sterlina irlandese
 CurrencyNames/it/mzn=metical mozambicano
 CurrencyNames/it/rsd=dinaro serbo
 CurrencyNames/it/sdg=sterlina sudanese
-CurrencyNames/it/srd=dollaro surinamese
+CurrencyNames/it/srd=dollaro del Suriname
 CurrencyNames/it/vef=bol\u00edvar venezuelano
 CurrencyNames/it/xag=argento
 CurrencyNames/it/xpd=palladio
@@ -6820,7 +6812,7 @@ CurrencyNames/sv/mkd=makedonisk denar
 CurrencyNames/sv/mmk=myanmarisk kyat
 CurrencyNames/sv/mnt=mongolisk t\u00f6gr\u00f6g
 CurrencyNames/sv/mop=macaosk pataca
-CurrencyNames/sv/mro=mauretansk ouquiya
+CurrencyNames/sv/mro=mauretansk ouguiya
 CurrencyNames/sv/mtl=maltesisk lire
 CurrencyNames/sv/mur=mauritisk rupie
 CurrencyNames/sv/mvr=maldivisk rufiyaa
@@ -6900,7 +6892,7 @@ CurrencyNames/sv/xfo=fransk guldfranc
 CurrencyNames/sv/xpd=palladium
 CurrencyNames/sv/xpt=platina
 CurrencyNames/sv/xts=test-valutakod
-CurrencyNames/sv/xxx=ok\u00e4nd eller ogiltig valuta
+CurrencyNames/sv/xxx=ok\u00e4nd valuta
 CurrencyNames/sv/yer=jemenitisk rial
 CurrencyNames/sv/yum=jugoslavisk dinar (1994\u20132002)
 CurrencyNames/sv/zar=sydafrikansk rand
@@ -7072,8 +7064,8 @@ FormatData//DayNarrows/3=W
 FormatData//DayNarrows/4=T
 FormatData//DayNarrows/5=F
 FormatData//DayNarrows/6=S
-FormatData//narrow.AmPmMarkers/0=a
-FormatData//narrow.AmPmMarkers/1=p
+FormatData//narrow.AmPmMarkers/0=AM
+FormatData//narrow.AmPmMarkers/1=PM
 FormatData//narrow.Eras/0=BCE
 FormatData//narrow.Eras/1=CE
 FormatData//buddhist.narrow.Eras/0=BC
@@ -7498,13 +7490,13 @@ FormatData/ru/standalone.DayNarrows/4=\u0427
 FormatData/ru/standalone.DayNarrows/5=\u041f
 FormatData/ru/standalone.DayNarrows/6=\u0421
 
-FormatData/sk/DayNarrows/0=N
-FormatData/sk/DayNarrows/1=P
-FormatData/sk/DayNarrows/2=U
-FormatData/sk/DayNarrows/3=S
-FormatData/sk/DayNarrows/4=\u0160
-FormatData/sk/DayNarrows/5=P
-FormatData/sk/DayNarrows/6=S
+FormatData/sk/DayNarrows/0=n
+FormatData/sk/DayNarrows/1=p
+FormatData/sk/DayNarrows/2=u
+FormatData/sk/DayNarrows/3=s
+FormatData/sk/DayNarrows/4=\u0161
+FormatData/sk/DayNarrows/5=p
+FormatData/sk/DayNarrows/6=s
 
 FormatData/sl/DayNarrows/0=n
 FormatData/sl/DayNarrows/1=p
@@ -7563,8 +7555,8 @@ FormatData/sv/standalone.DayNarrows/5=F
 FormatData/sv/standalone.DayNarrows/6=L
 FormatData/sv/narrow.Eras/0=f.Kr.
 FormatData/sv/narrow.Eras/1=e.Kr.
-FormatData/sv/narrow.AmPmMarkers/0=f
-FormatData/sv/narrow.AmPmMarkers/1=e
+FormatData/sv/narrow.AmPmMarkers/0=fm
+FormatData/sv/narrow.AmPmMarkers/1=em
 
 FormatData/th/standalone.MonthNarrows/0=\u0e21.\u0e04.
 FormatData/th/standalone.MonthNarrows/1=\u0e01.\u0e1e.
@@ -7684,14 +7676,14 @@ LocaleNames/sv/ZA=Sydafrika
 FormatData/sv_SE/NumberPatterns/2=#,##0\u00a0%
 
 # bug 8017142
-FormatData/es_CL/TimePatterns/0=h:mm:ss a zzzz
-FormatData/es_CL/TimePatterns/1=h:mm:ss a z
-FormatData/es_CL/TimePatterns/2=h:mm:ss a
-FormatData/es_CL/TimePatterns/3=h:mm a
-FormatData/es_EC/TimePatterns/0=h:mm:ss a zzzz
-FormatData/es_EC/TimePatterns/1=h:mm:ss a z
-FormatData/es_EC/TimePatterns/2=h:mm:ss a
-FormatData/es_EC/TimePatterns/3=h:mm a
+FormatData/es_CL/TimePatterns/0=HH:mm:ss zzzz
+FormatData/es_CL/TimePatterns/1=HH:mm:ss z
+FormatData/es_CL/TimePatterns/2=HH:mm:ss
+FormatData/es_CL/TimePatterns/3=HH:mm
+FormatData/es_EC/TimePatterns/0=HH:mm:ss zzzz
+FormatData/es_EC/TimePatterns/1=HH:mm:ss z
+FormatData/es_EC/TimePatterns/2=HH:mm:ss
+FormatData/es_EC/TimePatterns/3=HH:mm
 
 # bug 8037343
 FormatData/es_DO/DatePatterns/2=d MMM y
diff --git a/jdk/test/sun/text/resources/LocaleDataTest.java b/jdk/test/sun/text/resources/LocaleDataTest.java
index 86ccbd594b3..6f1dca3e0d0 100644
--- a/jdk/test/sun/text/resources/LocaleDataTest.java
+++ b/jdk/test/sun/text/resources/LocaleDataTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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 @@
  *      7003124 7085757 7028073 7171028 7189611 8000983 7195759 8004489 8006509
  *      7114053 7074882 7040556 8008577 8013836 8021121 6192407 6931564 8027695
  *      8017142 8037343 8055222 8042126 8074791 8075173 8080774 8129361 8134916
+ *      8145136
  * @summary Verify locale data
  * @modules java.base/sun.util.resources
  * @run main LocaleDataTest
diff --git a/jdk/test/sun/util/resources/cldr/Bug8145136.java b/jdk/test/sun/util/resources/cldr/Bug8145136.java
new file mode 100644
index 00000000000..8a9f34e6f24
--- /dev/null
+++ b/jdk/test/sun/util/resources/cldr/Bug8145136.java
@@ -0,0 +1,151 @@
+
+/*
+ * Copyright (c) 2016, 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 8145136
+ * @summary Tests CLDR 28/29 newly added feature LikelySubtags is correctly reflected in JDK.
+ * @run main/othervm -Djava.locale.providers=CLDR Bug8145136
+ */
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.stream.Collectors;
+
+public class Bug8145136 {
+
+    public static void main(String[] args) {
+        /* This Golden data is names of all *.xml files which contain locale
+           specific data in CLDR 29. With newly added feature LikelySubtags,
+           these locales should be present in output of getAvailableLocales()
+           method.
+         */
+        List<String> likelySubtagsLocales = List.of("", "af-NA", "af", "af-ZA",
+                "agq-CM", "agq", "ak-GH", "ak", "am-ET", "am", "ar-001", "ar-AE",
+                "ar-BH", "ar-DJ", "ar-DZ", "ar-EG", "ar-EH", "ar-ER", "ar-IL",
+                "ar-IQ", "ar-JO", "ar-KM", "ar-KW", "ar-LB", "ar-LY", "ar-MA",
+                "ar-MR", "ar-OM", "ar-PS", "ar-QA", "ar-SA", "ar-SD", "ar-SO",
+                "ar-SS", "ar-SY", "ar-TD", "ar-TN", "ar", "ar-YE", "asa-TZ",
+                "asa", "as-IN", "ast-ES", "ast", "as", "az-Cyrl-AZ", "az-Cyrl",
+                "az-Latn-AZ", "az-Latn", "az", "bas-CM", "bas", "be-BY", "bem",
+                "bem-ZM", "be", "bez-TZ", "bez", "bg-BG", "bg", "bm-ML", "bm",
+                "bn-BD", "bn-IN", "bn", "bo-CN", "bo-IN", "bo", "br-FR", "brx-IN",
+                "br", "brx", "bs-Cyrl-BA", "bs-Cyrl", "bs-Latn-BA", "bs-Latn",
+                "bs", "ca-AD", "ca-ES-VALENCIA", "ca-ES", "ca-FR", "ca-IT", "ca",
+                "ce-RU", "ce", "cgg-UG", "cgg", "chr-US", "chr", "ckb-IQ", "ckb-IR",
+                "ckb", "cs-CZ", "cs", "cu-RU", "cu", "cy-GB", "cy", "da-DK",
+                "da-GL", "dav-KE", "dav", "da", "de-AT", "de-BE", "de-CH", "de-DE",
+                "de-LI", "de-LU", "de", "dje-NE", "dje", "dsb-DE", "dsb", "dua-CM",
+                "dua", "dyo-SN", "dyo", "dz-BT", "dz", "ebu-KE", "ebu", "ee-GH",
+                "ee-TG", "ee", "el-CY", "el-GR", "el", "en-001", "en-150", "en-AG",
+                "en-AI", "en-AS", "en-AT", "en-AU", "en-BB", "en-BE", "en-BI",
+                "en-BM", "en-BS", "en-BW", "en-BZ", "en-CA", "en-CC", "en-CH",
+                "en-CK", "en-CM", "en-CX", "en-CY", "en-DE", "en-DG", "en-DK",
+                "en-DM", "en-ER", "en-FI", "en-FJ", "en-FK", "en-FM", "en-GB",
+                "en-GD", "en-GG", "en-GH", "en-GI", "en-GM", "en-GU", "en-GY",
+                "en-HK", "en-IE", "en-IL", "en-IM", "en-IN", "en-IO", "en-JE",
+                "en-JM", "en-KE", "en-KI", "en-KN", "en-KY", "en-LC", "en-LR",
+                "en-LS", "en-MG", "en-MH", "en-MO", "en-MP", "en-MS", "en-MT",
+                "en-MU", "en-MW", "en-MY", "en-NA", "en-NF", "en-NG", "en-NL",
+                "en-NR", "en-NU", "en-NZ", "en-PG", "en-PH", "en-PK", "en-PN",
+                "en-PR", "en-PW", "en-RW", "en-SB", "en-SC", "en-SD", "en-SE",
+                "en-SG", "en-SH", "en-SI", "en-SL", "en-SS", "en-SX", "en-SZ",
+                "en-TC", "en-TK", "en-TO", "en-TT", "en-TV", "en-TZ", "en-UG",
+                "en-UM", "en-US-POSIX", "en-US", "en-VC", "en-VG", "en-VI",
+                "en-VU", "en-WS", "en", "en-ZA", "en-ZM", "en-ZW", "eo-001",
+                "eo", "es-419", "es-AR", "es-BO", "es-BR", "es-CL", "es-CO",
+                "es-CR", "es-CU", "es-DO", "es-EA", "es-EC", "es-ES", "es-GQ",
+                "es-GT", "es-HN", "es-IC", "es-MX", "es-NI", "es-PA", "es-PE",
+                "es-PH", "es-PR", "es-PY", "es-SV", "es-US", "es-UY", "es-VE",
+                "es", "et-EE", "et", "eu-ES", "eu", "ewo-CM", "ewo", "fa-AF",
+                "fa-IR", "fa", "ff-CM", "ff-GN", "ff-MR", "ff-SN", "ff", "fi-FI",
+                "fil-PH", "fil", "fi", "fo-DK", "fo-FO", "fo", "fr-BE", "fr-BF",
+                "fr-BI", "fr-BJ", "fr-BL", "fr-CA", "fr-CD", "fr-CF", "fr-CG",
+                "fr-CH", "fr-CI", "fr-CM", "fr-DJ", "fr-DZ", "fr-FR", "fr-GA",
+                "fr-GF", "fr-GN", "fr-GP", "fr-GQ", "fr-HT", "fr-KM", "fr-LU",
+                "fr-MA", "fr-MC", "fr-MF", "fr-MG", "fr-ML", "fr-MQ", "fr-MR",
+                "fr-MU", "fr-NC", "fr-NE", "fr-PF", "fr-PM", "fr-RE", "fr-RW",
+                "fr-SC", "fr-SN", "fr-SY", "fr-TD", "fr-TG", "fr-TN", "fr-VU",
+                "fr-WF", "fr", "fr-YT", "fur-IT", "fur", "fy-NL", "fy", "ga-IE",
+                "ga", "gd-GB", "gd", "gl-ES", "gl", "gsw-CH", "gsw-FR", "gsw-LI",
+                "gsw", "gu-IN", "gu", "guz-KE", "guz", "gv-IM", "gv", "ha-GH", "ha-NE",
+                "ha-NG", "haw-US", "haw", "ha", "iw-IL", "iw", "hi-IN", "hi", "hr-BA",
+                "hr-HR", "hr", "hsb-DE", "hsb", "hu-HU", "hu", "hy-AM", "hy", "in-ID",
+                "in", "ig-NG", "ig", "ii-CN", "ii", "is-IS", "is", "it-CH", "it-IT",
+                "it-SM", "it", "ja-JP", "ja", "jgo-CM", "jgo", "jmc-TZ", "jmc", "kab-DZ",
+                "kab", "ka-GE", "kam-KE", "kam", "ka", "kde-TZ", "kde", "kea-CV", "kea",
+                "khq-ML", "khq", "ki-KE", "ki", "kkj-CM", "kkj", "kk-KZ", "kk", "kl-GL",
+                "kln-KE", "kln", "kl", "km-KH", "km", "kn-IN", "kn", "kok-IN", "ko-KP",
+                "ko-KR", "kok", "ko", "ksb-TZ", "ksb", "ksf-CM", "ksf", "ksh-DE", "ksh",
+                "ks-IN", "ks", "kw-GB", "kw", "ky-KG", "ky", "lag-TZ", "lag", "lb-LU",
+                "lb", "lg-UG", "lg", "lkt-US", "lkt", "ln-AO", "ln-CD", "ln-CF", "ln-CG",
+                "ln", "lo-LA", "lo", "lrc-IQ", "lrc-IR", "lrc", "lt-LT", "lt", "lu-CD",
+                "luo-KE", "luo", "lu", "luy-KE", "luy", "lv-LV", "lv", "mas-KE", "mas-TZ",
+                "mas", "mer-KE", "mer", "mfe-MU", "mfe", "mgh-MZ", "mgh", "mg-MG", "mgo-CM",
+                "mgo", "mg", "mk-MK", "mk", "ml-IN", "ml", "mn-MN", "mn", "mr-IN", "mr",
+                "ms-BN", "ms-MY", "ms-SG", "ms", "mt-MT", "mt", "mua-CM", "mua", "my-MM",
+                "my", "mzn-IR", "mzn", "naq-NA", "naq", "nb-NO", "nb-SJ", "nb", "nd",
+                "nd-ZW", "ne-IN", "ne-NP", "ne", "nl-AW", "nl-BE", "nl-BQ", "nl-CW",
+                "nl-NL", "nl-SR", "nl-SX", "nl", "nmg-CM", "nmg", "nnh-CM", "nnh",
+                "nn-NO", "nn", "nus-SS", "nus", "nyn-UG", "nyn", "om-ET", "om-KE",
+                "om", "or-IN", "or", "os-GE", "os-RU", "os", "pa-Arab-PK", "pa-Arab",
+                "pa-Guru-IN", "pa-Guru", "pa", "pl-PL", "pl", "prg-001", "prg", "ps-AF",
+                "ps", "pt-AO", "pt-BR", "pt-CH", "pt-CV", "pt-GQ", "pt-GW", "pt-LU",
+                "pt-MO", "pt-MZ", "pt-PT", "pt-ST", "pt-TL", "pt", "qu-BO", "qu-EC",
+                "qu-PE", "qu", "rm-CH", "rm", "rn-BI", "rn", "rof-TZ", "rof", "ro-MD",
+                "ro-RO", "ro", "ru-BY", "ru-KG", "ru-KZ", "ru-MD", "ru-RU", "ru-UA",
+                "ru", "rwk-TZ", "rwk", "rw-RW", "rw", "sah-RU", "sah", "saq-KE",
+                "saq", "sbp-TZ", "sbp", "se-FI", "seh-MZ", "seh", "se-NO", "se-SE",
+                "ses-ML", "ses", "se", "sg-CF", "sg", "shi-Latn-MA", "shi-Latn",
+                "shi-Tfng-MA", "shi-Tfng", "shi", "si-LK", "si", "sk-SK", "sk",
+                "sl-SI", "sl", "smn-FI", "smn", "sn", "sn-ZW", "so-DJ", "so-ET",
+                "so-KE", "so-SO", "so", "sq-AL", "sq-MK", "sq-XK", "sq", "sr-Cyrl-BA",
+                "sr-Cyrl-ME", "sr-Cyrl-RS", "sr-Cyrl-XK", "sr-Cyrl", "sr-Latn-BA",
+                "sr-Latn-ME", "sr-Latn-RS", "sr-Latn-XK", "sr-Latn", "sr", "sv-AX",
+                "sv-FI", "sv-SE", "sv", "sw-CD", "sw-KE", "sw-TZ", "sw-UG", "sw",
+                "ta-IN", "ta-LK", "ta-MY", "ta-SG", "ta", "te-IN", "teo-KE", "teo-UG",
+                "teo", "te", "th-TH", "th", "ti-ER", "ti-ET", "ti", "tk-TM", "tk",
+                "to-TO", "to", "tr-CY", "tr-TR", "tr", "twq-NE", "twq", "tzm-MA", "tzm",
+                "ug-CN", "ug", "uk-UA", "uk", "ur-IN", "ur-PK", "ur", "uz-Arab-AF",
+                "uz-Arab", "uz-Cyrl-UZ", "uz-Cyrl", "uz-Latn-UZ", "uz-Latn", "uz",
+                "vai-Latn-LR", "vai-Latn", "vai-Vaii-LR", "vai-Vaii", "vai", "vi-VN",
+                "vi", "vo-001", "vo", "vun-TZ", "vun", "wae-CH", "wae", "xog-UG",
+                "xog", "yav-CM", "yav", "ji-001", "ji", "yo-BJ", "yo-NG", "yo",
+                "yue-HK", "yue", "zgh-MA", "zgh", "zh-Hans-CN", "zh-Hans-HK",
+                "zh-Hans-MO", "zh-Hans-SG", "zh-Hans", "zh-Hant-HK", "zh-Hant-MO",
+                "zh-Hant-TW", "zh-Hant", "zh", "zu", "zu-ZA");
+        List<Locale> availableLocales = Arrays.asList(Locale.getAvailableLocales());
+
+        List<Locale> localesNotFound = likelySubtagsLocales.stream()
+                .map(Locale::forLanguageTag)
+                .filter(l -> !availableLocales.contains(l))
+                .collect(Collectors.toList());
+
+        if (localesNotFound.size() > 0) {
+            throw new RuntimeException("Locales " + localesNotFound
+                    + " not found in Available Locales list");
+        }
+    }
+
+}
diff --git a/jdk/test/tools/jlink/plugins/IncludeLocalesPluginTest.java b/jdk/test/tools/jlink/plugins/IncludeLocalesPluginTest.java
index 357541a3144..4fe653bdd4c 100644
--- a/jdk/test/tools/jlink/plugins/IncludeLocalesPluginTest.java
+++ b/jdk/test/tools/jlink/plugins/IncludeLocalesPluginTest.java
@@ -186,7 +186,7 @@ public class IncludeLocalesPluginTest {
                 "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class",
                 "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_IN.class",
                 "/jdk.localedata/sun/util/resources/cldr/ext/CalendarData_kok_IN.class",
-                "/jdk.localedata/sun/util/resources/cldr/ext/CalendarData_ks_Arab_IN.class"),
+                "/jdk.localedata/sun/util/resources/cldr/ext/CalendarData_pa_Guru_IN.class"),
             List.of(
                 "/jdk.localedata/sun/text/resources/LineBreakIteratorData_th",
                 "/jdk.localedata/sun/text/resources/thai_dict",

From c36a7cfd2cfceb6e598bc5eaa0ee886aa77070b3 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Mon, 30 May 2016 21:35:58 -0700
Subject: [PATCH 190/228] 8158149: test bug for SystemModuleFinder when fast
 path is supported

Reviewed-by: alanb, mchung
---
 .../plugins/InstalledModuleDescriptors/UserModuleTest.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdk/test/tools/jlink/plugins/InstalledModuleDescriptors/UserModuleTest.java b/jdk/test/tools/jlink/plugins/InstalledModuleDescriptors/UserModuleTest.java
index f5bbe62bcb3..e197acfa50c 100644
--- a/jdk/test/tools/jlink/plugins/InstalledModuleDescriptors/UserModuleTest.java
+++ b/jdk/test/tools/jlink/plugins/InstalledModuleDescriptors/UserModuleTest.java
@@ -119,7 +119,7 @@ public class UserModuleTest {
 
         Path java = IMAGE.resolve("bin").resolve("java");
         assertTrue(executeProcess(java.toString(),
-                                  "-Djdk.installed.modules.disable",
+                                  "-Djdk.system.module.finder.disabledFastPath",
                                   "-m", "m1/p1.Main")
                         .outputTo(System.out)
                         .errorTo(System.out)

From 6d91e29934db913c0d282a1d54f7a38aab5cc579 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Tue, 31 May 2016 00:15:04 -0700
Subject: [PATCH 191/228] 8158190: Add test that checks -Xpatch with both Jar
 and exploded patches

Reviewed-by: alanb
---
 .../modules/patch/basic/PatchTest.java        | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/jdk/test/tools/launcher/modules/patch/basic/PatchTest.java b/jdk/test/tools/launcher/modules/patch/basic/PatchTest.java
index 971362061ab..8b8290c7b6b 100644
--- a/jdk/test/tools/launcher/modules/patch/basic/PatchTest.java
+++ b/jdk/test/tools/launcher/modules/patch/basic/PatchTest.java
@@ -177,7 +177,7 @@ public class PatchTest {
     /**
      * Run test with -Xpatch and patches in JAR files
      */
-    public void testWitJarPatches() throws Exception {
+    public void testWithJarPatches() throws Exception {
 
         // patches/java.base-1.jar:patches/java-base-2.jar
         String basePatches = PATCHES_DIR.resolve("java.base-1.jar")
@@ -193,4 +193,24 @@ public class PatchTest {
 
     }
 
+
+    /**
+     * Run test with -Xpatch and patches in JAR files and exploded patches
+     */
+    public void testWithJarAndExplodedPatches() throws Exception {
+
+        // patches/java.base-1.jar:patches2/java.base
+        String basePatches = PATCHES_DIR.resolve("java.base-1.jar")
+                + File.pathSeparator + PATCHES2_DIR.resolve("java.base");
+
+        // patches1/jdk.naming.dns:patches/jdk.naming.dns-2.jar
+        String dnsPatches = PATCHES1_DIR.resolve("jdk.naming.dns")
+                +  File.pathSeparator + PATCHES_DIR.resolve("jdk.naming.dns-2.jar");
+
+        String compilerPatches = PATCHES1_DIR.resolve("jdk.compiler")
+                +  File.pathSeparator + PATCHES_DIR.resolve("jdk.compiler-2.jar");
+
+        runTest(basePatches, dnsPatches, compilerPatches);
+
+    }
 }

From 02f77987fa90417ed471c5bf37e34fe95b8e6d1a Mon Sep 17 00:00:00 2001
From: Nishit Jain <nishjain@openjdk.org>
Date: Tue, 31 May 2016 16:19:32 +0900
Subject: [PATCH 192/228] 8072099: Format "ha" is unable to parse hours 10-12

Reviewed-by: okutsu, peytoia
---
 .../classes/java/text/SimpleDateFormat.java   | 48 ++++++++++---
 .../text/Format/DateFormat/Bug8072099.java    | 70 +++++++++++++++++++
 2 files changed, 107 insertions(+), 11 deletions(-)
 create mode 100644 jdk/test/java/text/Format/DateFormat/Bug8072099.java

diff --git a/jdk/src/java.base/share/classes/java/text/SimpleDateFormat.java b/jdk/src/java.base/share/classes/java/text/SimpleDateFormat.java
index bced263c072..b464b6c71a4 100644
--- a/jdk/src/java.base/share/classes/java/text/SimpleDateFormat.java
+++ b/jdk/src/java.base/share/classes/java/text/SimpleDateFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2016, 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
@@ -1491,22 +1491,18 @@ public class SimpleDateFormat extends DateFormat {
 
                 if (i < compiledPattern.length) {
                     int nextTag = compiledPattern[i] >>> 8;
-                    if (!(nextTag == TAG_QUOTE_ASCII_CHAR ||
-                          nextTag == TAG_QUOTE_CHARS)) {
-                        obeyCount = true;
-                    }
+                    int nextCount = compiledPattern[i] & 0xff;
+                    obeyCount = shouldObeyCount(nextTag, nextCount);
 
                     if (hasFollowingMinusSign &&
                         (nextTag == TAG_QUOTE_ASCII_CHAR ||
                          nextTag == TAG_QUOTE_CHARS)) {
-                        int c;
-                        if (nextTag == TAG_QUOTE_ASCII_CHAR) {
-                            c = compiledPattern[i] & 0xff;
-                        } else {
-                            c = compiledPattern[i+1];
+
+                        if (nextTag != TAG_QUOTE_ASCII_CHAR) {
+                            nextCount = compiledPattern[i+1];
                         }
 
-                        if (c == minusSign) {
+                        if (nextCount == minusSign) {
                             useFollowingMinusSignAsDelimiter = true;
                         }
                     }
@@ -1549,6 +1545,36 @@ public class SimpleDateFormat extends DateFormat {
         return parsedDate;
     }
 
+    /* If the next tag/pattern is a <Numeric_Field> then the parser
+     * should consider the count of digits while parsing the contigous digits
+     * for the current tag/pattern
+     */
+    private boolean shouldObeyCount(int tag, int count) {
+        switch (tag) {
+            case PATTERN_MONTH:
+            case PATTERN_MONTH_STANDALONE:
+                return count <= 2;
+            case PATTERN_YEAR:
+            case PATTERN_DAY_OF_MONTH:
+            case PATTERN_HOUR_OF_DAY1:
+            case PATTERN_HOUR_OF_DAY0:
+            case PATTERN_MINUTE:
+            case PATTERN_SECOND:
+            case PATTERN_MILLISECOND:
+            case PATTERN_DAY_OF_YEAR:
+            case PATTERN_DAY_OF_WEEK_IN_MONTH:
+            case PATTERN_WEEK_OF_YEAR:
+            case PATTERN_WEEK_OF_MONTH:
+            case PATTERN_HOUR1:
+            case PATTERN_HOUR0:
+            case PATTERN_WEEK_YEAR:
+            case PATTERN_ISO_DAY_OF_WEEK:
+                return true;
+            default:
+                return false;
+        }
+    }
+
     /**
      * Private code-size reduction function used by subParse.
      * @param text the time text being parsed.
diff --git a/jdk/test/java/text/Format/DateFormat/Bug8072099.java b/jdk/test/java/text/Format/DateFormat/Bug8072099.java
new file mode 100644
index 00000000000..293b5dec2d7
--- /dev/null
+++ b/jdk/test/java/text/Format/DateFormat/Bug8072099.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2016, 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 8072099
+ * @summary check the date time pattern for <NUMERIC_FIELD> which should
+ * not throw ParseException
+ */
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Locale;
+
+public class Bug8072099 {
+
+    private static String[][] shouldPass = {
+        {"ha", "11AM"},
+        {"hma", "33AM"},
+        {"ka", "24AM"},
+        {"yyyMMM", "2016May"},
+        {"yyyyDDEEE", "2016366Sat"},
+        {"ddmyyyyz", "22111980GMT+5:30"}
+    };
+
+    public static void main(String[] args) {
+
+        Locale defaultLocale = Locale.getDefault();
+        try {
+            Locale.setDefault(Locale.US);
+            // check the date time pattern which should pass
+            for (String[] pattern : shouldPass) {
+                SimpleDateFormat dateTimeFormat = new SimpleDateFormat(pattern[0]);
+                parseDateTimeInput(dateTimeFormat, pattern[1]);
+            }
+        } finally {
+            Locale.setDefault(defaultLocale);
+        }
+    }
+
+    private static void parseDateTimeInput(SimpleDateFormat format,
+                                           String inputString) {
+        try {
+            format.parse(inputString);
+        } catch (ParseException ex) {
+            throw new RuntimeException("[FAILED: Unable to parse date time"
+                    + " string " + inputString + "]");
+        }
+    }
+
+}

From 9f834231d57acfe9cfc51faa2e3635d1eac549ab Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Tue, 31 May 2016 13:10:46 +0530
Subject: [PATCH 193/228] 8158131: Nashorn should not use
 jdk.internal.module.Modules API

Reviewed-by: hannesw, mhaupt, alanb
---
 jdk/src/java.base/share/classes/module-info.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/jdk/src/java.base/share/classes/module-info.java b/jdk/src/java.base/share/classes/module-info.java
index 67220c9474f..d2bccf05718 100644
--- a/jdk/src/java.base/share/classes/module-info.java
+++ b/jdk/src/java.base/share/classes/module-info.java
@@ -152,8 +152,7 @@ module java.base {
         java.xml,
         jdk.dynalink,
         jdk.jartool,
-        jdk.jlink,
-        jdk.scripting.nashorn;
+        jdk.jlink;
     exports jdk.internal.misc to
         java.corba,
         java.desktop,

From 3461be0dc2ec9d45c5c704f7fc2bfec7ce94cd29 Mon Sep 17 00:00:00 2001
From: Lance Andersen <lancea@openjdk.org>
Date: Tue, 31 May 2016 13:41:31 -0400
Subject: [PATCH 194/228] 8154189: Deprivilege java.sql and java.sql.rowset
 module

Reviewed-by: alanb, mchung
---
 make/common/Modules.gmk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk
index 90469d073fd..92cc11b95ac 100644
--- a/make/common/Modules.gmk
+++ b/make/common/Modules.gmk
@@ -57,7 +57,6 @@ BOOT_MODULES += \
     java.rmi \
     java.security.jgss \
     java.security.sasl \
-    java.sql \
     java.xml \
     java.xml.crypto \
     jdk.httpserver \
@@ -72,7 +71,6 @@ BOOT_MODULES += \
 
 # to be deprivileged
 BOOT_MODULES += \
-    java.sql.rowset \
     java.smartcardio \
     jdk.naming.rmi \
     #
@@ -106,6 +104,8 @@ PLATFORM_MODULES += \
 PLATFORM_MODULES += \
     java.compiler \
     java.scripting \
+    java.sql \
+    java.sql.rowset \
     jdk.accessibility \
     jdk.charsets \
     jdk.crypto.ec \

From 8e7633221f4efbce27f72c0a3e467b3a53810d40 Mon Sep 17 00:00:00 2001
From: Lance Andersen <lancea@openjdk.org>
Date: Tue, 31 May 2016 13:43:15 -0400
Subject: [PATCH 195/228] 8154189: Deprivilege java.sql and java.sql.rowset
 module

Reviewed-by: alanb, mchung
---
 jdk/src/java.base/share/conf/security/java.policy | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/jdk/src/java.base/share/conf/security/java.policy b/jdk/src/java.base/share/conf/security/java.policy
index 32d31472394..9c19eaf0806 100644
--- a/jdk/src/java.base/share/conf/security/java.policy
+++ b/jdk/src/java.base/share/conf/security/java.policy
@@ -33,6 +33,14 @@ grant codeBase "jrt:/jdk.crypto.ucrypto" {
         permission java.io.FilePermission "${java.home}/conf/security/ucrypto-solaris.cfg", "read";
 };
 
+grant codeBase "jrt:/java.sql" {
+        permission java.security.AllPermission;
+};
+
+grant codeBase "jrt:/java.sql.rowset" {
+        permission java.security.AllPermission;
+};
+
 grant codeBase "jrt:/jdk.crypto.ec" {
         permission java.lang.RuntimePermission "accessClassInPackage.sun.security.*";
         permission java.lang.RuntimePermission "loadLibrary.sunec";

From a852e6e5d0949d68528c1f8a3e026aff1c27e66c Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Tue, 31 May 2016 10:59:31 -0700
Subject: [PATCH 196/228] 8152721: Java Web Start splash mechanism is not
 working in JDK9

Reviewed-by: alanb, ksrini
---
 jdk/src/java.base/share/native/libjli/java.c | 31 ++++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/jdk/src/java.base/share/native/libjli/java.c b/jdk/src/java.base/share/native/libjli/java.c
index 66ac6ce907f..c771d993bfe 100644
--- a/jdk/src/java.base/share/native/libjli/java.c
+++ b/jdk/src/java.base/share/native/libjli/java.c
@@ -108,6 +108,7 @@ static void SetAddExportsProp(const jint n, const char *s);
 static void SetPatchProp(const jint n, const char *s);
 static void SelectVersion(int argc, char **argv, char **main_class);
 static void SetJvmEnvironment(int argc, char **argv);
+static jboolean IsWhiteSpaceOptionArgument(const char* name);
 static jboolean ParseArguments(int *pargc, char ***pargv,
                                int *pmode, char **pwhat,
                                int *pret, const char *jrepath);
@@ -499,6 +500,20 @@ JavaMain(void * _args)
     LEAVE();
 }
 
+/*
+ * Test if the given option name has a whitespace separated argument.
+ */
+jboolean
+IsWhiteSpaceOptionArgument(const char* name) {
+    return JLI_StrCmp(name, "-classpath") == 0 ||
+           JLI_StrCmp(name, "-cp") == 0 ||
+           JLI_StrCmp(name, "-modulepath") == 0 ||
+           JLI_StrCmp(name, "-mp") == 0 ||
+           JLI_StrCmp(name, "-upgrademodulepath") == 0 ||
+           JLI_StrCmp(name, "-addmods") == 0 ||
+           JLI_StrCmp(name, "-limitmods") == 0;
+}
+
 /*
  * Checks the command line options to find which JVM type was
  * specified.  If no command line option was given for the JVM type,
@@ -534,13 +549,7 @@ CheckJvmType(int *pargc, char ***argv, jboolean speculative) {
                 continue;
             }
         } else {
-            if (JLI_StrCmp(arg, "-classpath") == 0 ||
-                JLI_StrCmp(arg, "-cp") == 0 ||
-                JLI_StrCmp(arg, "-modulepath") == 0 ||
-                JLI_StrCmp(arg, "-mp") == 0 ||
-                JLI_StrCmp(arg, "-upgrademodulepath") == 0 ||
-                JLI_StrCmp(arg, "-addmods") == 0 ||
-                JLI_StrCmp(arg, "-limitmods") == 0) {
+            if (IsWhiteSpaceOptionArgument(arg)) {
                 newArgv[newArgvIdx++] = arg;
                 argi++;
                 if (argi < argc) {
@@ -682,9 +691,7 @@ SetJvmEnvironment(int argc, char **argv) {
         if (i > 0) {
             char *prev = argv[i - 1];
             // skip non-dash arg preceded by class path specifiers
-            if (*arg != '-' &&
-                    ((JLI_StrCmp(prev, "-cp") == 0
-                    || JLI_StrCmp(prev, "-classpath") == 0))) {
+            if (*arg != '-' && IsWhiteSpaceOptionArgument(prev)) {
                 continue;
             }
 
@@ -1028,9 +1035,7 @@ SelectVersion(int argc, char **argv, char **main_class)
         } else {
             if (JLI_StrCmp(arg, "-jar") == 0)
                 jarflag = 1;
-            /* deal with "unfortunate" classpath syntax */
-            if ((JLI_StrCmp(arg, "-classpath") == 0 || JLI_StrCmp(arg, "-cp") == 0) &&
-              (argc >= 2)) {
+            if (IsWhiteSpaceOptionArgument(arg) && (argc >= 2)) {
                 argc--;
                 argv++;
                 arg = *argv;

From c3a4f2331c65739ba39324fe0afd04635b0e9452 Mon Sep 17 00:00:00 2001
From: Chris Hegarty <chegar@openjdk.org>
Date: Tue, 31 May 2016 19:16:35 +0100
Subject: [PATCH 197/228] 8085785: sun/net/www/protocol/http/ZoneId.java
 timeouts intermittently

Reviewed-by: coffeys, msheppar
---
 .../sun/net/www/protocol/http/ZoneId.java     | 73 +++++++++----------
 1 file changed, 33 insertions(+), 40 deletions(-)

diff --git a/jdk/test/sun/net/www/protocol/http/ZoneId.java b/jdk/test/sun/net/www/protocol/http/ZoneId.java
index 6d8b7d1b628..017984770a4 100644
--- a/jdk/test/sun/net/www/protocol/http/ZoneId.java
+++ b/jdk/test/sun/net/www/protocol/http/ZoneId.java
@@ -24,9 +24,7 @@
 /*
  * @test
  * @bug 8027308
- * @key intermittent
- * @modules java.base/sun.net.www.protocol.http
- *          jdk.httpserver
+ * @modules jdk.httpserver
  * @summary  verifies that HttpURLConnection does not send the zone id in the
  *           'Host' field of the header:
  *              Host: [fe80::a00:27ff:aaaa:aaaa] instead of
@@ -42,40 +40,41 @@ import java.io.IOException;
 import java.net.*;
 import java.util.Enumeration;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
+import static java.lang.System.out;
+import static java.net.Proxy.NO_PROXY;
 
 public class ZoneId {
 
     public static void main(String[] args) throws Exception {
 
-        InetAddress address = getAppropriateIPv6Address();
+        InetAddress address = getIPv6LookbackAddress();
 
         if (address == null) {
-            System.out.println(
-                    "The test will be skipped as not a single " +
-                    "appropriate IPv6 address was found on this machine");
+            out.println("Cannot find the IPv6 loopback address. Skipping test.");
             return;
         }
         String ip6_literal = address.getHostAddress();
 
-        System.out.println("Found an appropriate IPv6 address: " + address);
+        out.println("Found an appropriate IPv6 address: " + address);
 
-        System.out.println("Starting http server...");
-        HttpServer server =
-                HttpServer.create(new InetSocketAddress(address, 0), 0);
+        out.println("Starting http server...");
+        HttpServer server = HttpServer.create(new InetSocketAddress(0), 0);
         CompletableFuture<Headers> headers = new CompletableFuture<>();
         server.createContext("/", createCapturingHandler(headers));
         server.start();
-        System.out.println("Started at " + server.getAddress());
+        out.println("Started at " + server.getAddress());
+
         try {
-            String spec = "http://[" + address.getHostAddress() + "]:" + server.getAddress().getPort();
-            System.out.println("Client is connecting to: " + spec);
-            URLConnection urlConnection = new URL(spec).openConnection();
-            ((sun.net.www.protocol.http.HttpURLConnection) urlConnection)
-                    .getResponseCode();
+            int port = server.getAddress().getPort();
+            String spec = "http://[" + address.getHostAddress() + "]:" + port;
+            out.println("Client is connecting to: " + spec);
+            URL url = new URL(spec);
+            HttpURLConnection uc = (HttpURLConnection)url.openConnection(NO_PROXY);
+            uc.getResponseCode();
         } finally {
-            System.out.println("Shutting down the server...");
+            out.println("Shutting down the server...");
             server.stop(0);
         }
 
@@ -83,7 +82,7 @@ public class ZoneId {
         String ip6_address = ip6_literal.substring(0, idx);
         List<String> hosts = headers.get().get("Host");
 
-        System.out.println("Host: " + hosts);
+        out.println("Host: " + hosts);
 
         if (hosts.size() != 1 || hosts.get(0).contains("%") ||
                                 !hosts.get(0).contains(ip6_address)) {
@@ -91,33 +90,27 @@ public class ZoneId {
         }
     }
 
-    private static InetAddress getAppropriateIPv6Address() throws SocketException {
-        System.out.println("Searching through the network interfaces...");
+    static InetAddress getIPv6LookbackAddress() throws SocketException {
+        out.println("Searching for the IPv6 loopback address...");
         Enumeration<NetworkInterface> is = NetworkInterface.getNetworkInterfaces();
+
+        // The IPv6 loopback address contains a scope id, and is "connect-able".
         while (is.hasMoreElements()) {
             NetworkInterface i = is.nextElement();
-            System.out.println("\tinterface: " + i);
-
-            // just a "good enough" marker that the interface
-            // does not support a loopback and therefore should not be used
-            if ( i.getHardwareAddress() == null) continue;
-            if (!i.isUp()) continue;
-
-            Enumeration<InetAddress> as = i.getInetAddresses();
-            while (as.hasMoreElements()) {
-                InetAddress a = as.nextElement();
-                System.out.println("\t\taddress: " + a.getHostAddress());
-                if ( !(a instanceof Inet6Address &&
-                       a.toString().contains("%")) ) {
-                    continue;
-                }
-                return a;
-            }
+            if (!i.isLoopback())
+                continue;
+            Optional<InetAddress> addr = i.inetAddresses()
+                    .filter(x -> x instanceof Inet6Address)
+                    .filter(y -> y.toString().contains("%"))
+                    .findFirst();
+            if (addr.isPresent())
+                return addr.get();
         }
+
         return null;
     }
 
-    private static HttpHandler createCapturingHandler(CompletableFuture<Headers> headers) {
+    static HttpHandler createCapturingHandler(CompletableFuture<Headers> headers) {
         return new HttpHandler() {
             @Override
             public void handle(HttpExchange exchange) throws IOException {

From 4d41caa932cc077d7751121b2b2b18c266aaaec8 Mon Sep 17 00:00:00 2001
From: Roger Riggs <rriggs@openjdk.org>
Date: Tue, 31 May 2016 14:58:53 -0400
Subject: [PATCH 198/228] 8158254: Put
 java/time/test/java/time/TestClock_System on the problem list for Solaris

Reviewed-by: lancea, darcy
---
 jdk/test/ProblemList.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 4dd8fffc3f6..460bb67a16c 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -344,6 +344,13 @@ com/sun/jdi/CatchPatternTest.sh                                 8068645 generic-
 
 com/sun/jdi/GetLocalVariables4Test.sh                           8067354 windows-all
 
+############################################################################
+
+# jdk_time
+
+java/time/test/java/time/TestClock_System.java                  8158128 solaris-all
+
+
 ############################################################################
 
 # jdk_util

From 989d0b0b7c19e0b3f3c697f9a8005af879c4b964 Mon Sep 17 00:00:00 2001
From: Amanda Jiang <amjiang@openjdk.org>
Date: Tue, 31 May 2016 22:41:56 +0000
Subject: [PATCH 199/228] 8156059: Update/Develop new tests for JEP 287: SHA-3
 Hash Algorithms

Update existing MessageDigest tests with SHA-3 Hash Algorithms and add one test case to check supported providers

Reviewed-by: valeriep, rhalade
---
 .../MessageDigest/TestDigestIOStream.java     | 107 ++++++++-----
 .../MessageDigest/TestSameLength.java         |  85 +++++++----
 .../security/MessageDigest/TestSameValue.java | 142 ++++++++++--------
 .../MessageDigest/UnsupportedProvider.java    |  77 ++++++++++
 4 files changed, 277 insertions(+), 134 deletions(-)
 create mode 100644 jdk/test/java/security/MessageDigest/UnsupportedProvider.java

diff --git a/jdk/test/java/security/MessageDigest/TestDigestIOStream.java b/jdk/test/java/security/MessageDigest/TestDigestIOStream.java
index 868da86ef62..c94dbfbdd16 100644
--- a/jdk/test/java/security/MessageDigest/TestDigestIOStream.java
+++ b/jdk/test/java/security/MessageDigest/TestDigestIOStream.java
@@ -1,5 +1,6 @@
+
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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,16 +28,21 @@ import java.io.PrintStream;
 import java.security.DigestInputStream;
 import java.security.DigestOutputStream;
 import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.Security;
 import java.util.Arrays;
 import java.util.Random;
+import jdk.testlibrary.RandomFactory;
 import static java.lang.System.out;
 
 /**
  * @test
- * @bug 8050370
+ * @bug 8050370 8156059
  * @summary MessageDigest tests with DigestIOStream
  * @author Kevin Liu
  * @key randomness
+ * @library /lib/testlibrary
+ * @run main/timeout=180 TestDigestIOStream
  */
 
 enum ReadModel {
@@ -45,12 +51,11 @@ enum ReadModel {
 
 public class TestDigestIOStream {
 
-    private static final int[] DATA_LEN_ARRAY = {
-        1, 50, 2500, 125000, 6250000
-    };
-    private static final String[] ALGORITHM_ARRAY = {
-        "MD2", "MD5", "SHA1", "SHA-224", "SHA-256", "SHA-384", "SHA-512"
-    };
+    private static final int[] DATA_LEN_ARRAY = { 1, 50, 2500, 125000,
+            6250000 };
+    private static final String[] ALGORITHM_ARRAY = { "MD2", "MD5", "SHA1",
+            "SHA-224", "SHA-256", "SHA-384", "SHA-512", "SHA3-224", "SHA3-256",
+            "SHA3-384", "SHA3-512" };
 
     private static byte[] data;
 
@@ -62,44 +67,69 @@ public class TestDigestIOStream {
     }
 
     public void run() throws Exception {
-        for (String algorithm: ALGORITHM_ARRAY) {
+        for (String algorithm : ALGORITHM_ARRAY) {
+            try {
+                md = MessageDigest.getInstance(algorithm);
+                for (int length : DATA_LEN_ARRAY) {
 
-            md = MessageDigest.getInstance(algorithm);
+                    Random rdm = RandomFactory.getRandom();
+                    data = new byte[length];
+                    rdm.nextBytes(data);
 
-            for (int length: DATA_LEN_ARRAY) {
-
-                Random rdm = new Random();
-                data = new byte[length];
-                rdm.nextBytes(data);
-
-                if (!testMDChange(algorithm, length)) {
-                    throw new RuntimeException("testMDChange failed at:"
-                            + algorithm + "/" + length);
-                }
-                if (!testMDShare(algorithm, length)) {
-                    throw new RuntimeException("testMDShare failed at:"
-                            + algorithm + "/" + length);
-                }
-                for (ReadModel readModel: ReadModel.values()) {
-                    // test Digest function when digest switch on
-                    if (!testDigestOnOff(algorithm, readModel, true, length)) {
-                        throw new RuntimeException("testDigestOn failed at:"
-                                + algorithm + "/" + length + "/" + readModel);
+                    if (!testMDChange(algorithm, length)) {
+                        throw new RuntimeException("testMDChange failed at:"
+                                + algorithm + "/" + length);
                     }
-                    // test Digest function when digest switch off
-                    if (!testDigestOnOff(algorithm, readModel, false, length)) {
-                        throw new RuntimeException("testDigestOff failed at:"
-                                + algorithm + "/" + length + "/" + readModel);
+                    if (!testMDShare(algorithm, length)) {
+                        throw new RuntimeException("testMDShare failed at:"
+                                + algorithm + "/" + length);
                     }
+                    for (ReadModel readModel : ReadModel.values()) {
+                        // test Digest function when digest switch on
+                        if (!testDigestOnOff(algorithm, readModel, true,
+                                length)) {
+                            throw new RuntimeException(
+                                    "testDigestOn failed at:" + algorithm + "/"
+                                            + length + "/" + readModel);
+                        }
+                        // test Digest function when digest switch off
+                        if (!testDigestOnOff(algorithm, readModel, false,
+                                length)) {
+                            throw new RuntimeException(
+                                    "testDigestOff failed at:" + algorithm + "/"
+                                            + length + "/" + readModel);
+                        }
+                    }
+                }
+            } catch (NoSuchAlgorithmException nae) {
+                if (algorithm.startsWith("SHA3") && !isSHA3supported()) {
+                    continue;
+                } else {
+                    throw nae;
                 }
             }
         }
         int testNumber = ALGORITHM_ARRAY.length * ReadModel.values().length
-                * DATA_LEN_ARRAY.length * 2 + ALGORITHM_ARRAY.length
-                * DATA_LEN_ARRAY.length * 2;
+                * DATA_LEN_ARRAY.length * 2
+                + ALGORITHM_ARRAY.length * DATA_LEN_ARRAY.length * 2;
         out.println("All " + testNumber + " Tests Passed");
     }
 
+    // SHA-3 hash algorithms are only supported by "SUN" provider
+    // and "OracleUcrypto" provider on Solaris 12.0 or later
+    // This method checks if system supports SHA-3
+    private boolean isSHA3supported() {
+        if (Security.getProvider("SUN") != null) {
+            return true;
+        }
+        if (Security.getProvider("OracleUcrypto") != null
+                && "SunOS".equals(System.getProperty("os.name"))
+                && System.getProperty("os.version").compareTo("5.12") >= 0) {
+            return true;
+        }
+        return false;
+    }
+
     /**
      * Test DigestInputStream and DigestOutputStream digest function when digest
      * set on and off
@@ -115,8 +145,8 @@ public class TestDigestIOStream {
      * @exception Exception
      *                throw unexpected exception
      */
-    public boolean testDigestOnOff(String algo, ReadModel readModel,
-            boolean on, int dataLength) throws Exception {
+    public boolean testDigestOnOff(String algo, ReadModel readModel, boolean on,
+            int dataLength) throws Exception {
 
         // Generate the DigestInputStream/DigestOutputStream object
         try (ByteArrayInputStream bais = new ByteArrayInputStream(data);
@@ -302,7 +332,8 @@ public class TestDigestIOStream {
         try (ByteArrayInputStream bais = new ByteArrayInputStream(data);
                 DigestInputStream dis = new DigestInputStream(bais, mdCommon);
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                DigestOutputStream dos = new DigestOutputStream(baos, mdCommon);) {
+                DigestOutputStream dos = new DigestOutputStream(baos,
+                        mdCommon);) {
 
             // Perform the update using all available/possible update methods
             int k = 0;
diff --git a/jdk/test/java/security/MessageDigest/TestSameLength.java b/jdk/test/java/security/MessageDigest/TestSameLength.java
index 666baf3e69e..571dd91619b 100644
--- a/jdk/test/java/security/MessageDigest/TestSameLength.java
+++ b/jdk/test/java/security/MessageDigest/TestSameLength.java
@@ -1,5 +1,6 @@
+
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,18 +23,20 @@
  */
 
 import static java.lang.System.out;
-
 import java.nio.ByteBuffer;
 import java.security.MessageDigest;
-import java.util.Random;
+import java.security.NoSuchAlgorithmException;
+import java.security.Security;
+import jdk.testlibrary.RandomFactory;
 
 /**
  * @test
- * @bug 8050371
+ * @bug 8050371 8156059
  * @summary Check md.getDigestLength() equal digest output length with various
  *          algorithm/dataLen/(update,digest methods).
  * @author Kevin Liu
  * @key randomness
+ * @library /lib/testlibrary
  */
 
 public class TestSameLength {
@@ -44,20 +47,15 @@ public class TestSameLength {
     }
 
     private void run() throws Exception {
-        String[] algorithmArr = {
-                "SHA", "Sha", "SHA-1", "sha-1", "SHA1", "sha1", "MD5", "md5",
-                "SHA-224", "SHA-256", "SHA-384", "SHA-512"
-        };
-        int[] nUpdatesArr = {
-                0, 1, 2, 3
-        };
-        int[] dataLenArr = {
-                1, 50, 2500, 125000, 6250000
-        };
+        String[] algorithmArr = { "SHA", "Sha", "SHA-1", "sha-1", "SHA1",
+                "sha1", "MD5", "md5", "SHA-224", "SHA-256", "SHA-384",
+                "SHA-512", "SHA3-224", "SHA3-256", "SHA3-384", "SHA3-512" };
+        int[] nUpdatesArr = { 0, 1, 2, 3 };
+        int[] dataLenArr = { 1, 50, 2500, 125000, 6250000 };
 
-        for (String algorithm: algorithmArr) {
-            for (UpdateMethod update: UpdateMethod.values()) {
-                for (int dataLen: dataLenArr) {
+        for (String algorithm : algorithmArr) {
+            for (UpdateMethod update : UpdateMethod.values()) {
+                for (int dataLen : dataLenArr) {
                     if (!runTest(algorithm, dataLen, update)) {
                         throw new RuntimeException(
                                 "Test failed at algorithm/dataLen/numUpdate:"
@@ -68,16 +66,17 @@ public class TestSameLength {
             }
         }
 
-        out.println("All " + algorithmArr.length * nUpdatesArr.length
-                * dataLenArr.length + " tests Passed");
+        out.println("All "
+                + algorithmArr.length * nUpdatesArr.length * dataLenArr.length
+                + " tests Passed");
     }
 
-    private boolean runTest(String algo, long dataLen,
-            UpdateMethod whichUpdate) throws Exception {
+    private boolean runTest(String algo, long dataLen, UpdateMethod whichUpdate)
+            throws Exception {
         try {
             // Do initialization
             byte[] data = new byte[(int) dataLen];
-            new Random().nextBytes(data);
+            RandomFactory.getRandom().nextBytes(data);
             MessageDigest md = MessageDigest.getInstance(algo);
             int outputLen = md.getDigestLength();
 
@@ -88,6 +87,11 @@ public class TestSameLength {
 
             // Compare input and output
             return outputLen == output.length;
+        } catch (NoSuchAlgorithmException nae) {
+            if (algo.startsWith("SHA3") && !isSHA3supported()) {
+                return true;
+            }
+            throw nae;
         } catch (Exception ex) {
             System.err.println("Testing: " + algo + "/" + dataLen + "/"
                     + whichUpdate.toString()
@@ -97,11 +101,26 @@ public class TestSameLength {
         }
     }
 
+    // SHA-3 hash algorithms are only supported by "SUN" provider
+    // and "OracleUcrypto" provider on Solaris 12.0 or later
+    // This method checks if system supports SHA-3
+    private boolean isSHA3supported() {
+        if (Security.getProvider("SUN") != null) {
+            return true;
+        }
+        if (Security.getProvider("OracleUcrypto") != null
+                && "SunOS".equals(System.getProperty("os.name"))
+                && System.getProperty("os.version").compareTo("5.12") >= 0) {
+            return true;
+        }
+        return false;
+    }
+
     private static enum UpdateMethod {
         UPDATE_BYTE {
             @Override
-            public void updateDigest(byte[] data,
-                    MessageDigest md, long dataLen) {
+            public void updateDigest(byte[] data, MessageDigest md,
+                    long dataLen) {
 
                 for (int i = 0; i < dataLen; i++) {
                     md.update(data[i]);
@@ -111,8 +130,8 @@ public class TestSameLength {
 
         UPDATE_BUFFER {
             @Override
-            public void updateDigest(byte[] data,
-                    MessageDigest md, long dataLen) {
+            public void updateDigest(byte[] data, MessageDigest md,
+                    long dataLen) {
 
                 md.update(data);
             }
@@ -120,8 +139,8 @@ public class TestSameLength {
 
         UPDATE_BUFFER_LEN {
             @Override
-            public void updateDigest(byte[] data,
-                    MessageDigest md, long dataLen) {
+            public void updateDigest(byte[] data, MessageDigest md,
+                    long dataLen) {
 
                 for (int i = 0; i < dataLen; i++) {
                     md.update(data, i, 1);
@@ -131,14 +150,14 @@ public class TestSameLength {
 
         UPDATE_BYTE_BUFFER {
             @Override
-            public void updateDigest(byte[] data,
-                    MessageDigest md, long dataLen) {
+            public void updateDigest(byte[] data, MessageDigest md,
+                    long dataLen) {
 
                 md.update(ByteBuffer.wrap(data));
             }
         };
 
-        public abstract void updateDigest(byte[] data,
-                    MessageDigest md, long dataLen);
-        }
+        public abstract void updateDigest(byte[] data, MessageDigest md,
+                long dataLen);
+    }
 }
diff --git a/jdk/test/java/security/MessageDigest/TestSameValue.java b/jdk/test/java/security/MessageDigest/TestSameValue.java
index 56b8652264a..931cb6aa7da 100644
--- a/jdk/test/java/security/MessageDigest/TestSameValue.java
+++ b/jdk/test/java/security/MessageDigest/TestSameValue.java
@@ -1,5 +1,6 @@
+
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,19 +23,21 @@
  */
 
 import static java.lang.System.out;
-
 import java.nio.ByteBuffer;
 import java.security.DigestException;
 import java.security.MessageDigest;
-import java.util.Random;
+import java.security.NoSuchAlgorithmException;
+import java.security.Security;
+import jdk.testlibrary.RandomFactory;
 
 /**
  * @test
- * @bug 8050371
+ * @bug 8050371 8156059
  * @summary Check md.digest(data) value whether same with digest output value
  *          with various update/digest methods.
  * @author Kevin Liu
  * @key randomness
+ * @library /lib/testlibrary
  */
 
 public class TestSameValue {
@@ -49,24 +52,17 @@ public class TestSameValue {
         byte[] data = new byte[6706];
         MessageDigest md = null;
         // Initialize input data
-        new Random().nextBytes(data);
+        RandomFactory.getRandom().nextBytes(data);
 
-        String[] providers = {
-                null, "SUN"
-        };
-        String[] algorithmArr = {
-                "SHA", "Sha", "MD5", "md5", "SHA-224", "SHA-256", "SHA-384",
-                "SHA-512"
-        };
+        String[] algorithmArr = { "SHA", "Sha", "MD5", "md5", "SHA-224",
+                "SHA-256", "SHA-384", "SHA-512", "SHA3-224", "SHA3-256",
+                "SHA3-384", "SHA3-512" };
 
-        for (String algorithm: algorithmArr) {
-            for (String provider: providers) {
-                if (provider != null) {
-                    md = MessageDigest.getInstance(algorithm, provider);
-                } else {
-                    md = MessageDigest.getInstance(algorithm);
-                }
-                for (UpdateDigestMethod updateMethod: UpdateDigestMethod
+        for (String algorithm : algorithmArr) {
+            try {
+                md = MessageDigest.getInstance(algorithm);
+
+                for (UpdateDigestMethod updateMethod : UpdateDigestMethod
                         .values()) {
                     byte[] output = updateMethod.updateDigest(data, md);
                     // Get the output and the "correct" one
@@ -75,50 +71,71 @@ public class TestSameValue {
                     if (!MessageDigest.isEqual(output, standard)) {
                         throw new RuntimeException(
                                 "Test failed at algorithm/provider/numUpdate:"
-                                        + algorithm + "/" + provider + "/"
-                                        + updateMethod);
+                                        + algorithm + "/" + md.getProvider()
+                                        + "/" + updateMethod);
                     }
                 }
+            } catch (NoSuchAlgorithmException nae) {
+                if (algorithm.startsWith("SHA3") && !isSHA3supported()) {
+                    continue;
+                } else {
+                    throw nae;
+                }
             }
         }
 
-        out.println("All " + algorithmArr.length
-                * UpdateDigestMethod.values().length * providers.length
+        out.println("All "
+                + algorithmArr.length * UpdateDigestMethod.values().length
                 + " tests Passed");
     }
 
+    // SHA-3 hash algorithms are only supported by "SUN" provider
+    // and "OracleUcrypto" provider on Solaris 12.0 or later
+    // This method checks if system supports SHA-3
+    private boolean isSHA3supported() {
+        if (Security.getProvider("SUN") != null) {
+            return true;
+        }
+        if (Security.getProvider("OracleUcrypto") != null
+                && "SunOS".equals(System.getProperty("os.name"))
+                && System.getProperty("os.version").compareTo("5.12") >= 0) {
+            return true;
+        }
+        return false;
+    }
+
     private static enum UpdateDigestMethod {
 
         /*
-         * update the data one by one using method update(byte input) then
-         * do digest (giving the output buffer, offset, and the number of
-         * bytes to put in the output buffer)
+         * update the data one by one using method update(byte input) then do
+         * digest (giving the output buffer, offset, and the number of bytes to
+         * put in the output buffer)
          */
         UPDATE_DIGEST_BUFFER {
             @Override
             public byte[] updateDigest(byte[] data, MessageDigest md)
                     throws DigestException {
-                for (byte element: data) {
+                for (byte element : data) {
                     md.update(element);
                 }
                 byte[] output = new byte[md.getDigestLength()];
                 int len = md.digest(output, 0, output.length);
                 if (len != output.length) {
                     throw new RuntimeException(
-                        "ERROR" + ": digest length differs!");
+                            "ERROR" + ": digest length differs!");
                 }
                 return output;
             }
         },
 
         /*
-         * update the data one by one using method update(byte input)
-         * then do digest
+         * update the data one by one using method update(byte input) then do
+         * digest
          */
         UPDATE_DIGEST {
             @Override
             public byte[] updateDigest(byte[] data, MessageDigest md) {
-                for (byte element: data) {
+                for (byte element : data) {
                     md.update(element);
                 }
                 return md.digest();
@@ -139,7 +156,7 @@ public class TestSameValue {
                 int len = md.digest(output, 0, output.length);
                 if (len != output.length) {
                     throw new RuntimeException(
-                        "ERROR" + ": digest length differs!");
+                            "ERROR" + ": digest length differs!");
                 }
                 return output;
             }
@@ -155,10 +172,10 @@ public class TestSameValue {
         },
 
         /*
-         * update the leading bytes (length is "data.length-LASTNBYTES")
-         * at once as a block, then do digest (do a final update using
-         * the left LASTNBYTES bytes which is passed as a parameter for
-         * the digest method, then complete the digest)
+         * update the leading bytes (length is "data.length-LASTNBYTES") at once
+         * as a block, then do digest (do a final update using the left
+         * LASTNBYTES bytes which is passed as a parameter for the digest
+         * method, then complete the digest)
          */
         UPDATE_LEADING_BLOCK_DIGEST_REMAIN {
             @Override
@@ -176,9 +193,9 @@ public class TestSameValue {
         },
 
         /*
-         * update the data 2 bytes each time, after finishing updating,
-         * do digest (giving the output buffer, offset, and the number
-         * of bytes to put in the output buffer)
+         * update the data 2 bytes each time, after finishing updating, do
+         * digest (giving the output buffer, offset, and the number of bytes to
+         * put in the output buffer)
          */
         UPDATE_BYTES_DIGEST_BUFFER {
             @Override
@@ -192,32 +209,32 @@ public class TestSameValue {
                 int len = md.digest(output, 0, output.length);
                 if (len != output.length) {
                     throw new RuntimeException(
-                        "ERROR" + ": digest length differs!");
+                            "ERROR" + ": digest length differs!");
                 }
                 return output;
             }
         },
 
         /*
-         * update the data 2 bytes each time, after finishing updating,
-         * do digest
+         * update the data 2 bytes each time, after finishing updating, do
+         * digest
          */
         UPDATE_BYTES_DIGEST {
             @Override
             public byte[] updateDigest(byte[] data, MessageDigest md) {
-                for (int i=0;i<data.length/2;i++){
-                    md.update(data,i*2,2);
+                for (int i = 0; i < data.length / 2; i++) {
+                    md.update(data, i * 2, 2);
                 }
                 return md.digest();
             }
         },
 
         /*
-         * update the data one by one using method update(byte[] input,
-         * int offset, int len) for the leading bytes (length is
-         * "data.length-LASTNBYTES"), then do digest (do a final
-         * update using the left LASTNBYTES bytes which is passed
-         * as a parameter for digest method then complete the digest)
+         * update the data one by one using method update(byte[] input, int
+         * offset, int len) for the leading bytes (length is
+         * "data.length-LASTNBYTES"), then do digest (do a final update using
+         * the left LASTNBYTES bytes which is passed as a parameter for digest
+         * method then complete the digest)
          */
         UPDATE_BUFFER_LEADING_DIGEST_REMAIN {
             @Override
@@ -233,11 +250,10 @@ public class TestSameValue {
         },
 
         /*
-         * update the data one by one using method update(byte input)
-         * for the leading bytes (length is "data.length-LASTNBYTES"),
-         * then do digest (do a final update using the left LASTNBYTES
-         * bytes which is passed as a parameter for digest method,
-         * then complete the digest)
+         * update the data one by one using method update(byte input) for the
+         * leading bytes (length is "data.length-LASTNBYTES"), then do digest
+         * (do a final update using the left LASTNBYTES bytes which is passed as
+         * a parameter for digest method, then complete the digest)
          */
         UPDATE_LEADING_DIGEST_REMAIN {
             @Override
@@ -253,9 +269,9 @@ public class TestSameValue {
         },
 
         /*
-         * update all the data at once as a ByteBuffer, then do digest
-         * (giving the output buffer, offset, and the number of bytes
-         * to put in the output buffer)
+         * update all the data at once as a ByteBuffer, then do digest (giving
+         * the output buffer, offset, and the number of bytes to put in the
+         * output buffer)
          */
         UPDATE_BYTE_BUFFER_DIGEST_BUFFER {
             @Override
@@ -266,7 +282,7 @@ public class TestSameValue {
                 int len = md.digest(output, 0, output.length);
                 if (len != output.length) {
                     throw new RuntimeException(
-                          "ERROR" + ": digest length differs!");
+                            "ERROR" + ": digest length differs!");
                 }
                 return output;
             }
@@ -282,10 +298,10 @@ public class TestSameValue {
         },
 
         /*
-         * update the leading bytes (length is "data.length-LASTNBYTES")
-         * at once as a ByteBuffer, then do digest (do a final update
-         * using the left LASTNBYTES bytes which is passed as a parameter
-         * for the digest method, then complete the digest)
+         * update the leading bytes (length is "data.length-LASTNBYTES") at once
+         * as a ByteBuffer, then do digest (do a final update using the left
+         * LASTNBYTES bytes which is passed as a parameter for the digest
+         * method, then complete the digest)
          */
         UPDATE_BYTE_BUFFER_LEADING_DIGEST_REMAIN {
             @Override
diff --git a/jdk/test/java/security/MessageDigest/UnsupportedProvider.java b/jdk/test/java/security/MessageDigest/UnsupportedProvider.java
new file mode 100644
index 00000000000..b7177e053ea
--- /dev/null
+++ b/jdk/test/java/security/MessageDigest/UnsupportedProvider.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2016, 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 java.security.Provider;
+import java.security.Security;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+/*
+ * @test
+ * @bug 8156059
+ * @summary Test expected NoSuchAlgorithmException is thrown
+ *          if using SHA-3 with unsupported providers
+ */
+
+public class UnsupportedProvider {
+
+    public static void main(String args[]) {
+        String[] algorithms = { "SHA3-224", "SHA3-256", "SHA3-384",
+                "SHA3-512" };
+
+        for (Provider prov : Security.getProviders()) {
+            for (String algo : algorithms) {
+                try {
+                    String provName = prov.getName();
+                    MessageDigest md = MessageDigest.getInstance(algo, prov);
+
+                    if (!isSHA3Supported(provName)) {
+                        throw new RuntimeException("SHA-3 is not supported by "
+                                + provName + " provider, but expected "
+                                + "NoSuchAlgorithmException is not thrown");
+                    }
+                } catch (NoSuchAlgorithmException ex) {
+                    if (isSHA3Supported(prov.getName())) {
+                        throw new RuntimeException("SHA-3 should be supported "
+                                + "by " + prov.getName() + " provider, got"
+                                + " unexpected NoSuchAlgorithmException");
+                    }
+                    continue;
+                }
+            }
+        }
+    }
+
+    // Check if specific provider supports SHA-3 hash algorithms
+    static boolean isSHA3Supported(String provName) {
+        if ("SUN".equals(provName)) {
+            return true;
+        }
+        if ("OracleUcrypto".equals(provName)
+                && "SunOS".equals(System.getProperty("os.name"))
+                && System.getProperty("os.version").compareTo("5.12") >= 0) {
+            return true;
+        }
+        return false;
+    }
+}

From 56dd686558ca268c698c51e2a8c174927b6a2115 Mon Sep 17 00:00:00 2001
From: Andrey Nazarov <anazarov@openjdk.org>
Date: Tue, 31 May 2016 16:42:32 -0700
Subject: [PATCH 200/228] 8157850: Jar tests should pass through VM options

Reviewed-by: martin
---
 .../tools/jar/compat/CLICompatibility.java    |  5 ++++
 jdk/test/tools/jar/modularJar/Basic.java      | 23 ++++++++++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/jdk/test/tools/jar/compat/CLICompatibility.java b/jdk/test/tools/jar/compat/CLICompatibility.java
index a69c0829f05..1dd3589362c 100644
--- a/jdk/test/tools/jar/compat/CLICompatibility.java
+++ b/jdk/test/tools/jar/compat/CLICompatibility.java
@@ -57,6 +57,8 @@ public class CLICompatibility {
     static final Path TEST_CLASSES = Paths.get(System.getProperty("test.classes", "."));
     static final Path USER_DIR = Paths.get(System.getProperty("user.dir"));
 
+    static final String TOOL_VM_OPTIONS = System.getProperty("test.tool.vm.opts", "");
+
     final boolean legacyOnly;  // for running on older JDK's ( test validation )
 
     // Resources we know to exist, that can be used for creating jar files.
@@ -501,6 +503,9 @@ public class CLICompatibility {
         String jar = getJDKTool("jar");
         List<String> commands = new ArrayList<>();
         commands.add(jar);
+        if (!TOOL_VM_OPTIONS.isEmpty()) {
+            commands.addAll(Arrays.asList(TOOL_VM_OPTIONS.split("\\s+", -1)));
+        }
         Stream.of(args).map(s -> s.split(" "))
                        .flatMap(Arrays::stream)
                        .forEach(x -> commands.add(x));
diff --git a/jdk/test/tools/jar/modularJar/Basic.java b/jdk/test/tools/jar/modularJar/Basic.java
index 4ce94a24b56..396a5fa9f8f 100644
--- a/jdk/test/tools/jar/modularJar/Basic.java
+++ b/jdk/test/tools/jar/modularJar/Basic.java
@@ -36,11 +36,6 @@ import java.util.jar.JarInputStream;
 import java.util.jar.Manifest;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
-import javax.tools.JavaCompiler;
-import javax.tools.JavaFileObject;
-import javax.tools.StandardJavaFileManager;
-import javax.tools.StandardLocation;
-import javax.tools.ToolProvider;
 
 import jdk.testlibrary.FileUtils;
 import jdk.testlibrary.JDKToolFinder;
@@ -67,6 +62,10 @@ public class Basic {
     static final Path MODULE_CLASSES = TEST_CLASSES.resolve("build");
     static final Path MRJAR_DIR = MODULE_CLASSES.resolve("mrjar");
 
+    static final String VM_OPTIONS = System.getProperty("test.vm.opts", "");
+    static final String TOOL_VM_OPTIONS = System.getProperty("test.tool.vm.opts", "");
+    static final String JAVA_OPTIONS = System.getProperty("test.java.opts", "");
+
     // Details based on the checked in module source
     static TestModuleData FOO = new TestModuleData("foo",
                                                    "1.123",
@@ -730,7 +729,10 @@ public class Basic {
         String jar = getJDKTool("jar");
         List<String> commands = new ArrayList<>();
         commands.add(jar);
-        Stream.of(args).forEach(x -> commands.add(x));
+        if (!TOOL_VM_OPTIONS.isEmpty()) {
+            commands.addAll(Arrays.asList(TOOL_VM_OPTIONS.split("\\s+", -1)));
+        }
+        Stream.of(args).forEach(commands::add);
         ProcessBuilder p = new ProcessBuilder(commands);
         if (stdinSource != null)
             p.redirectInput(stdinSource);
@@ -808,6 +810,9 @@ public class Basic {
 
         List<String> commands = new ArrayList<>();
         commands.add(javac);
+        if (!TOOL_VM_OPTIONS.isEmpty()) {
+            commands.addAll(Arrays.asList(TOOL_VM_OPTIONS.split("\\s+", -1)));
+        }
         commands.add("-d");
         commands.add(dest.toString());
         if (dest.toString().contains("bar"))
@@ -826,6 +831,12 @@ public class Basic {
 
         List<String> commands = new ArrayList<>();
         commands.add(java);
+        if (!VM_OPTIONS.isEmpty()) {
+            commands.addAll(Arrays.asList(VM_OPTIONS.split("\\s+", -1)));
+        }
+        if (!JAVA_OPTIONS.isEmpty()) {
+            commands.addAll(Arrays.asList(JAVA_OPTIONS.split("\\s+", -1)));
+        }
         Stream.of(args).forEach(x -> commands.add(x));
         commands.add("-mp");
         commands.add(modulePath.toString());

From 246a39a5b108b9e16ab8d4de90fa32ad45036034 Mon Sep 17 00:00:00 2001
From: Stuart Marks <smarks@openjdk.org>
Date: Tue, 31 May 2016 17:54:41 -0700
Subject: [PATCH 201/228] 8157777: DeadCachedConnection doesn't wait for
 registry to die

Reviewed-by: darcy
---
 jdk/test/java/rmi/testlibrary/JavaVM.java     | 21 ++++++++++++++++++-
 .../transport/tcp/DeadCachedConnection.java   |  9 ++++----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/jdk/test/java/rmi/testlibrary/JavaVM.java b/jdk/test/java/rmi/testlibrary/JavaVM.java
index 37faa1e6fb7..c8099346972 100644
--- a/jdk/test/java/rmi/testlibrary/JavaVM.java
+++ b/jdk/test/java/rmi/testlibrary/JavaVM.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2016, 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
@@ -165,6 +165,25 @@ public class JavaVM {
         vm = null;
     }
 
+    /**
+     * Destroys the VM, waits for it to terminate, and returns
+     * its exit status.
+     *
+     * @throws IllegalStateException if the VM has already been destroyed
+     * @throws InterruptedException if the caller is interrupted while waiting
+     */
+    public int terminate() throws InterruptedException {
+        if (vm == null) {
+            throw new IllegalStateException("JavaVM already destroyed");
+        }
+
+        vm.destroy();
+        int status = waitFor();
+        vm = null;
+        return status;
+    }
+
+
     /**
      * Waits for the subprocess to exit, joins the pipe threads to ensure that
      * all output is collected, and returns its exit status.
diff --git a/jdk/test/sun/rmi/transport/tcp/DeadCachedConnection.java b/jdk/test/sun/rmi/transport/tcp/DeadCachedConnection.java
index 0ad0dc5202e..9ec9d043923 100644
--- a/jdk/test/sun/rmi/transport/tcp/DeadCachedConnection.java
+++ b/jdk/test/sun/rmi/transport/tcp/DeadCachedConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2016, 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 @@
  */
 
 /* @test
- * @bug 4094891
+ * @bug 4094891 8157777
  * @summary unable to retry call if cached connection to server is used
  * @library ../../../../java/rmi/testlibrary
  * @modules java.rmi/sun.rmi.registry
@@ -123,10 +123,9 @@ public class DeadCachedConnection {
     }
     private static JavaVM subreg = null;
 
-    public static void killRegistry() {
+    public static void killRegistry() throws InterruptedException {
         if (DeadCachedConnection.subreg != null) {
-            DeadCachedConnection.subreg.destroy();
-            try { Thread.sleep(2000); } catch (InterruptedException ie) {}
+            DeadCachedConnection.subreg.terminate();
         }
         DeadCachedConnection.subreg = null;
     }

From 4300a5a412cb7bc471c6b1d1a86189c150fb162f Mon Sep 17 00:00:00 2001
From: Lance Andersen <lancea@openjdk.org>
Date: Tue, 31 May 2016 21:27:28 -0400
Subject: [PATCH 202/228] 8158281: java_sql_Timestamp.java fails with
 AssertionError

Reviewed-by: mchung
---
 jdk/src/java.desktop/share/classes/java/beans/MetaData.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdk/src/java.desktop/share/classes/java/beans/MetaData.java b/jdk/src/java.desktop/share/classes/java/beans/MetaData.java
index 4c3139d1dad..4110064bcd0 100644
--- a/jdk/src/java.desktop/share/classes/java/beans/MetaData.java
+++ b/jdk/src/java.desktop/share/classes/java/beans/MetaData.java
@@ -297,7 +297,7 @@ static final class java_sql_Timestamp_PersistenceDelegate extends java_util_Date
 
     private static Method getNanosMethod() {
         try {
-            Class<?> c = Class.forName("java.sql.Timestamp", true, null);
+            Class<?> c = Class.forName("java.sql.Timestamp", true, ClassLoader.getPlatformClassLoader());
             return c.getMethod("getNanos");
         } catch (ClassNotFoundException e) {
             return null;

From 77859dc5cafa6c450370b91b724dfbe65fe36f90 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Tue, 31 May 2016 19:13:21 -0700
Subject: [PATCH 203/228] 8158312: Update String.join example code to use List
 convenience factory methods

Reviewed-by: lancea, smarks
---
 jdk/src/java.base/share/classes/java/lang/String.java | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/jdk/src/java.base/share/classes/java/lang/String.java b/jdk/src/java.base/share/classes/java/lang/String.java
index 33222a586b5..b930ab938c3 100644
--- a/jdk/src/java.base/share/classes/java/lang/String.java
+++ b/jdk/src/java.base/share/classes/java/lang/String.java
@@ -2424,15 +2424,12 @@ public final class String
      *
      * <blockquote>For example,
      * <pre>{@code
-     *     List<String> strings = new LinkedList<>();
-     *     strings.add("Java");strings.add("is");
-     *     strings.add("cool");
+     *     List<String> strings = List.of("Java", "is", "cool");
      *     String message = String.join(" ", strings);
      *     //message returned is: "Java is cool"
      *
-     *     Set<String> strings = new LinkedHashSet<>();
-     *     strings.add("Java"); strings.add("is");
-     *     strings.add("very"); strings.add("cool");
+     *     Set<String> strings =
+     *         new LinkedHashSet<>(List.of("Java", "is", "very", "cool"));
      *     String message = String.join("-", strings);
      *     //message returned is: "Java-is-very-cool"
      * }</pre></blockquote>

From 90cd96154ee40e4cf94966e61f85431e6210bf9a Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Tue, 31 May 2016 22:04:00 -0700
Subject: [PATCH 204/228] =?UTF-8?q?8158194:=20Rename=20the=20directory=20?=
 =?UTF-8?q?=E2=80=9CInstalledModuleDescriptors=E2=80=9D=20and=20any=20refe?=
 =?UTF-8?q?rence=20to=20=E2=80=9Cinstalled=E2=80=9D=20to=20=E2=80=9Csystem?=
 =?UTF-8?q?=E2=80=9D=20in=20the=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-by: mchung
---
 .../SystemModulesTest.java}                                 | 6 +++---
 .../UserModuleTest.java                                     | 4 ++--
 .../src/m1/module-info.java                                 | 0
 .../src/m1/p1/Main.java                                     | 2 +-
 .../src/m1/p2/T.java                                        | 0
 .../src/m2/module-info.java                                 | 0
 .../src/m2/q/S1.java                                        | 0
 .../src/m2/q/S2.java                                        | 0
 .../src/m3/module-info.java                                 | 0
 9 files changed, 6 insertions(+), 6 deletions(-)
 rename jdk/test/tools/jlink/plugins/{InstalledModuleDescriptors/InstalledModulesTest.java => SystemModuleDescriptors/SystemModulesTest.java} (96%)
 rename jdk/test/tools/jlink/plugins/{InstalledModuleDescriptors => SystemModuleDescriptors}/UserModuleTest.java (97%)
 rename jdk/test/tools/jlink/plugins/{InstalledModuleDescriptors => SystemModuleDescriptors}/src/m1/module-info.java (100%)
 rename jdk/test/tools/jlink/plugins/{InstalledModuleDescriptors => SystemModuleDescriptors}/src/m1/p1/Main.java (97%)
 rename jdk/test/tools/jlink/plugins/{InstalledModuleDescriptors => SystemModuleDescriptors}/src/m1/p2/T.java (100%)
 rename jdk/test/tools/jlink/plugins/{InstalledModuleDescriptors => SystemModuleDescriptors}/src/m2/module-info.java (100%)
 rename jdk/test/tools/jlink/plugins/{InstalledModuleDescriptors => SystemModuleDescriptors}/src/m2/q/S1.java (100%)
 rename jdk/test/tools/jlink/plugins/{InstalledModuleDescriptors => SystemModuleDescriptors}/src/m2/q/S2.java (100%)
 rename jdk/test/tools/jlink/plugins/{InstalledModuleDescriptors => SystemModuleDescriptors}/src/m3/module-info.java (100%)

diff --git a/jdk/test/tools/jlink/plugins/InstalledModuleDescriptors/InstalledModulesTest.java b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java
similarity index 96%
rename from jdk/test/tools/jlink/plugins/InstalledModuleDescriptors/InstalledModulesTest.java
rename to jdk/test/tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java
index af1fe3ed490..7b4a1bc785c 100644
--- a/jdk/test/tools/jlink/plugins/InstalledModuleDescriptors/InstalledModulesTest.java
+++ b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java
@@ -38,12 +38,12 @@ import static org.testng.Assert.*;
 /**
  * @test
  * @modules java.base/jdk.internal.misc
- * @run testng InstalledModulesTest
+ * @run testng SystemModulesTest
  * @summary Verify the properties of ModuleDescriptor created
- *          by InstalledModules
+ *          by SystemModules
  */
 
-public class InstalledModulesTest {
+public class SystemModulesTest {
     private static final JavaLangModuleAccess jlma = SharedSecrets.getJavaLangModuleAccess();
 
     /**
diff --git a/jdk/test/tools/jlink/plugins/InstalledModuleDescriptors/UserModuleTest.java b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java
similarity index 97%
rename from jdk/test/tools/jlink/plugins/InstalledModuleDescriptors/UserModuleTest.java
rename to jdk/test/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java
index e197acfa50c..ae0a32e8436 100644
--- a/jdk/test/tools/jlink/plugins/InstalledModuleDescriptors/UserModuleTest.java
+++ b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java
@@ -110,11 +110,11 @@ public class UserModuleTest {
     }
 
     /*
-     * Disable the fast loading of installed modules.
+     * Disable the fast loading of system modules.
      * Parsing module-info.class
      */
     @Test
-    public void disableInstalledModules() throws Throwable {
+    public void disableSystemModules() throws Throwable {
         if (!hasJmods()) return;
 
         Path java = IMAGE.resolve("bin").resolve("java");
diff --git a/jdk/test/tools/jlink/plugins/InstalledModuleDescriptors/src/m1/module-info.java b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m1/module-info.java
similarity index 100%
rename from jdk/test/tools/jlink/plugins/InstalledModuleDescriptors/src/m1/module-info.java
rename to jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m1/module-info.java
diff --git a/jdk/test/tools/jlink/plugins/InstalledModuleDescriptors/src/m1/p1/Main.java b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m1/p1/Main.java
similarity index 97%
rename from jdk/test/tools/jlink/plugins/InstalledModuleDescriptors/src/m1/p1/Main.java
rename to jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m1/p1/Main.java
index 915416c0802..40bb1ca9249 100644
--- a/jdk/test/tools/jlink/plugins/InstalledModuleDescriptors/src/m1/p1/Main.java
+++ b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m1/p1/Main.java
@@ -37,7 +37,7 @@ public class Main {
         // load another package
         p2.T.test();
 
-        // check the module descriptor of an installed module
+        // check the module descriptor of a system module
         validate(Main.class.getModule().getDescriptor());
 
         // read m1/module-info.class
diff --git a/jdk/test/tools/jlink/plugins/InstalledModuleDescriptors/src/m1/p2/T.java b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m1/p2/T.java
similarity index 100%
rename from jdk/test/tools/jlink/plugins/InstalledModuleDescriptors/src/m1/p2/T.java
rename to jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m1/p2/T.java
diff --git a/jdk/test/tools/jlink/plugins/InstalledModuleDescriptors/src/m2/module-info.java b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m2/module-info.java
similarity index 100%
rename from jdk/test/tools/jlink/plugins/InstalledModuleDescriptors/src/m2/module-info.java
rename to jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m2/module-info.java
diff --git a/jdk/test/tools/jlink/plugins/InstalledModuleDescriptors/src/m2/q/S1.java b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m2/q/S1.java
similarity index 100%
rename from jdk/test/tools/jlink/plugins/InstalledModuleDescriptors/src/m2/q/S1.java
rename to jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m2/q/S1.java
diff --git a/jdk/test/tools/jlink/plugins/InstalledModuleDescriptors/src/m2/q/S2.java b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m2/q/S2.java
similarity index 100%
rename from jdk/test/tools/jlink/plugins/InstalledModuleDescriptors/src/m2/q/S2.java
rename to jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m2/q/S2.java
diff --git a/jdk/test/tools/jlink/plugins/InstalledModuleDescriptors/src/m3/module-info.java b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m3/module-info.java
similarity index 100%
rename from jdk/test/tools/jlink/plugins/InstalledModuleDescriptors/src/m3/module-info.java
rename to jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/m3/module-info.java

From 65360411bb3600d53ddb313fbc013152c9c63105 Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Wed, 1 Jun 2016 15:35:38 +0800
Subject: [PATCH 205/228] 8152108: Correct jarsigner warning message about
 missing timestamp

Reviewed-by: mullan
---
 .../share/classes/sun/security/tools/jarsigner/Resources.java | 4 ++--
 jdk/test/sun/security/tools/jarsigner/warnings/Test.java      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java b/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java
index 7afe39aeada..ad7bebff1a9 100644
--- a/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java
+++ b/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java
@@ -247,9 +247,9 @@ public class Resources extends java.util.ListResourceBundle {
         {"This.jar.contains.entries.whose.certificate.chain.is.not.validated.reason.1",
                  "This jar contains entries whose certificate chain is not validated. Reason: %s"},
         {"no.timestamp.signing",
-                "No -tsa or -tsacert is provided and this jar is not timestamped. Without a timestamp, users may not be able to validate this jar after the signer certificate's expiration date (%1$tY-%1$tm-%1$td) or after any future revocation date."},
+                "No -tsa or -tsacert is provided and this jar is not timestamped. Without a timestamp, users may not be able to validate this jar after the signer certificate's expiration date (%1$tY-%1$tm-%1$td)."},
         {"no.timestamp.verifying",
-                "This jar contains signatures that does not include a timestamp. Without a timestamp, users may not be able to validate this jar after the signer certificate's expiration date (%1$tY-%1$tm-%1$td) or after any future revocation date."},
+                "This jar contains signatures that does not include a timestamp. Without a timestamp, users may not be able to validate this jar after the signer certificate's expiration date (%1$tY-%1$tm-%1$td)."},
         {"Unknown.password.type.", "Unknown password type: "},
         {"Cannot.find.environment.variable.",
                 "Cannot find environment variable: "},
diff --git a/jdk/test/sun/security/tools/jarsigner/warnings/Test.java b/jdk/test/sun/security/tools/jarsigner/warnings/Test.java
index ce16d4de381..e9dd7e3037f 100644
--- a/jdk/test/sun/security/tools/jarsigner/warnings/Test.java
+++ b/jdk/test/sun/security/tools/jarsigner/warnings/Test.java
@@ -118,13 +118,13 @@ public abstract class Test {
             + "and this jar is not timestamped. "
             + "Without a timestamp, users may not be able to validate this jar "
             + "after the signer certificate's expiration date "
-            + "(%1$tY-%1$tm-%1$td) or after any future revocation date.";
+            + "(%1$tY-%1$tm-%1$td).";
 
     static final String NO_TIMESTAMP_VERIFYING_WARN_TEMPLATE
             = "This jar contains signatures that does not include a timestamp. "
             + "Without a timestamp, users may not be able to validate this jar "
             + "after the signer certificate's expiration date "
-            + "(%1$tY-%1$tm-%1$td) or after any future revocation date.";
+            + "(%1$tY-%1$tm-%1$td).";
 
     static final String NOT_YET_VALID_CERT_SIGNING_WARNING
             = "The signer certificate is not yet valid.";

From 78bb28e4af2b87000b2e4dd00d0a873343d86f04 Mon Sep 17 00:00:00 2001
From: Ramanand Patil <rpatil@openjdk.org>
Date: Wed, 1 Jun 2016 14:33:44 +0100
Subject: [PATCH 206/228] 8151876: (tz) Support tzdata2016d

Reviewed-by: okutsu, coffeys
---
 jdk/make/data/tzdata/VERSION                  |   2 +-
 jdk/make/data/tzdata/asia                     | 314 +++++++++++----
 jdk/make/data/tzdata/australasia              |   8 +
 jdk/make/data/tzdata/europe                   | 370 ++++++++++++++++--
 jdk/make/data/tzdata/iso3166.tab              |   6 +-
 jdk/make/data/tzdata/leapseconds              |   5 +-
 jdk/make/data/tzdata/northamerica             |  29 +-
 jdk/make/data/tzdata/southamerica             |  45 ++-
 jdk/make/data/tzdata/zone.tab                 | 291 +++++++-------
 .../format/TestZoneTextPrinterParser.java     |  12 +-
 jdk/test/java/util/TimeZone/Bug8149452.java   |   7 +-
 .../java/util/TimeZone/CheckDisplayNames.java | 296 --------------
 jdk/test/java/util/TimeZone/TimeZoneTest.java |   2 +-
 .../sun/util/calendar/zi/TestZoneInfo310.java |   6 +-
 jdk/test/sun/util/calendar/zi/tzdata/VERSION  |   2 +-
 jdk/test/sun/util/calendar/zi/tzdata/asia     | 314 +++++++++++----
 .../sun/util/calendar/zi/tzdata/australasia   |   8 +
 jdk/test/sun/util/calendar/zi/tzdata/europe   | 370 ++++++++++++++++--
 .../sun/util/calendar/zi/tzdata/iso3166.tab   |   6 +-
 .../sun/util/calendar/zi/tzdata/leapseconds   |   5 +-
 .../sun/util/calendar/zi/tzdata/northamerica  |  29 +-
 .../sun/util/calendar/zi/tzdata/southamerica  |  45 ++-
 jdk/test/sun/util/calendar/zi/tzdata/zone.tab | 291 +++++++-------
 23 files changed, 1613 insertions(+), 850 deletions(-)
 delete mode 100644 jdk/test/java/util/TimeZone/CheckDisplayNames.java

diff --git a/jdk/make/data/tzdata/VERSION b/jdk/make/data/tzdata/VERSION
index 55966f28162..5aaf0c58892 100644
--- a/jdk/make/data/tzdata/VERSION
+++ b/jdk/make/data/tzdata/VERSION
@@ -21,4 +21,4 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-tzdata2016a
+tzdata2016d
diff --git a/jdk/make/data/tzdata/asia b/jdk/make/data/tzdata/asia
index 056a5f9c552..58b43e99655 100644
--- a/jdk/make/data/tzdata/asia
+++ b/jdk/make/data/tzdata/asia
@@ -102,13 +102,9 @@ Rule E-EurAsia	1979	1995	-	Sep	lastSun	 0:00	0	-
 Rule E-EurAsia	1996	max	-	Oct	lastSun	 0:00	0	-
 Rule RussiaAsia	1981	1984	-	Apr	1	 0:00	1:00	S
 Rule RussiaAsia	1981	1983	-	Oct	1	 0:00	0	-
-Rule RussiaAsia	1984	1991	-	Sep	lastSun	 2:00s	0	-
-Rule RussiaAsia	1985	1991	-	Mar	lastSun	 2:00s	1:00	S
-Rule RussiaAsia	1992	only	-	Mar	lastSat	23:00	1:00	S
-Rule RussiaAsia	1992	only	-	Sep	lastSat	23:00	0	-
-Rule RussiaAsia	1993	max	-	Mar	lastSun	 2:00s	1:00	S
-Rule RussiaAsia	1993	1995	-	Sep	lastSun	 2:00s	0	-
-Rule RussiaAsia	1996	max	-	Oct	lastSun	 2:00s	0	-
+Rule RussiaAsia	1984	1995	-	Sep	lastSun	 2:00s	0	-
+Rule RussiaAsia	1985	2011	-	Mar	lastSun	 2:00s	1:00	S
+Rule RussiaAsia	1996	2011	-	Oct	lastSun	 2:00s	0	-
 
 # Afghanistan
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -148,17 +144,26 @@ Zone	Asia/Yerevan	2:58:00 -	LMT	1924 May  2
 			3:00	1:00	YERST	1991 Sep 23 # independence
 			3:00 RussiaAsia	AM%sT	1995 Sep 24  2:00s
 			4:00	-	AMT	1997
-			4:00 RussiaAsia	AM%sT	2012 Mar 25  2:00s
+			4:00 RussiaAsia	AM%sT	2012 Feb  9
 			4:00	-	AMT
 
 # Azerbaijan
+
 # From Rustam Aliyev of the Azerbaijan Internet Forum (2005-10-23):
 # According to the resolution of Cabinet of Ministers, 1997
 # From Paul Eggert (2015-09-17): It was Resolution No. 21 (1997-03-17).
 # http://code.az/files/daylight_res.pdf
+
+# From Steffen Thorsen (2016-03-17):
+# ... the Azerbaijani Cabinet of Ministers has cancelled switching to
+# daylight saving time....
+# http://www.azernews.az/azerbaijan/94137.html
+# http://vestnikkavkaza.net/news/Azerbaijani-Cabinet-of-Ministers-cancels-daylight-saving-time.html
+# http://en.apa.az/xeber_azerbaijan_abolishes_daylight_savings_ti_240862.html
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Azer	1997	max	-	Mar	lastSun	 4:00	1:00	S
-Rule	Azer	1997	max	-	Oct	lastSun	 5:00	0	-
+Rule	Azer	1997	2015	-	Mar	lastSun	 4:00	1:00	S
+Rule	Azer	1997	2015	-	Oct	lastSun	 5:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Baku	3:19:24 -	LMT	1924 May  2
 			3:00	-	BAKT	1957 Mar    # Baku Time
@@ -1581,23 +1586,6 @@ Zone	Asia/Amman	2:23:44 -	LMT	1931
 
 # Kazakhstan
 
-# From Paul Eggert (1996-11-22):
-# Andrew Evtichov (1996-04-13) writes that Kazakhstan
-# stayed in sync with Moscow after 1990, and that Aqtobe (formerly Aktyubinsk)
-# and Aqtau (formerly Shevchenko) are the largest cities in their zones.
-# Guess that Aqtau and Aqtobe diverged in 1995, since that's the first time
-# IATA SSIM mentions a third time zone in Kazakhstan.
-
-# From Paul Eggert (2006-03-22):
-# German Iofis, ELSI, Almaty (2001-10-09) reports that Kazakhstan uses
-# RussiaAsia rules, instead of switching at 00:00 as the IATA has it.
-# Go with Shanks & Pottenger, who have them always using RussiaAsia rules.
-# Also go with the following claims of Shanks & Pottenger:
-#
-# - Kazakhstan did not observe DST in 1991.
-# - Qyzylorda switched from +5:00 to +6:00 on 1992-01-19 02:00.
-# - Oral switched from +5:00 to +4:00 in spring 1989.
-
 # From Kazakhstan Embassy's News Bulletin No. 11
 # <http://www.kazsociety.org.uk/news/2005/03/30.htm> (2005-03-21):
 # The Government of Kazakhstan passed a resolution March 15 abolishing
@@ -1614,61 +1602,232 @@ Zone	Asia/Amman	2:23:44 -	LMT	1931
 # everything else....  I guess that would make Kazakhstan time zones
 # de jure UTC+5 and UTC+6 respectively.
 
+# From Stepan Golosunov (2016-03-27) ([*] means see later comments below):
+# Review of the linked documents from http://adilet.zan.kz/
+# produced the following data for post-1991 Kazakhstan:
+#
+# 0. Act of the Cabinet of Ministers of the USSR
+# from 1991-02-04 No. 20
+# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102010545
+# removed the extra hour ("decree time") on the territory of the USSR
+# starting with the last Sunday of March 1991.
+# It also allowed (but not mandated) Kazakh SSR, Kirghiz SSR, Tajik SSR,
+# Turkmen SSR and Uzbek SSR to not have "summer" time.
+#
+# The 1992-01-13 act also refers to the act of the Cabinet of Ministers
+# of the Kazakh SSR from 1991-03-20 No. 170 "About the act of the Cabinet
+# of Ministers of the USSR from 1991-02-04 No. 20" but I didn't found its
+# text.
+#
+# According to Izvestia newspaper No. 68 (23334) from 1991-03-20
+# (page 6; available at http://libinfo.org/newsr/newsr2574.djvu via
+# http://libinfo.org/index.php?id=58564) on 1991-03-31 at 2:00 during
+# transition to "summer" time:
+# Republic of Georgia, Latvian SSR, Lithuanian SSR, SSR Moldova,
+# Estonian SSR; Komi ASSR; Kaliningrad oblast; Nenets autonomous okrug
+# were to move clocks 1 hour forward.
+# Kazakh SSR (excluding Uralsk oblast); Republic of Kyrgyzstan, Tajik
+# SSR; Andijan, Jizzakh, Namangan, Sirdarya, Tashkent, Fergana oblasts
+# of the Uzbek SSR were to move clocks 1 hour backwards.
+# Other territories were to not move clocks.
+# When the "summer" time would end on 1991-09-29, clocks were to be
+# moved 1 hour backwards on the territory of the USSR excluding
+# Kazakhstan, Kirghizia, Uzbekistan, Turkmenia, Tajikistan.
+#
+# Apparently there were last minute changes. Apparently Kazakh act No. 170
+# was one of such changes.
+#
+# https://ru.wikipedia.org/wiki/Декретное время
+# claims that Sovetskaya Rossiya newspaper on 1991-03-29 published that
+# Nenets autonomous okrug, Komi and Kazakhstan (excluding Uralsk oblast)
+# were to not move clocks and Uralsk oblast was to move clocks
+# forward; on 1991-09-29 Kazakhstan was to move clocks backwards.
+# (Probably there were changes even after that publication. There is an
+# article claiming that Kaliningrad oblast decided on 1991-03-29 to not
+# move clocks.)
+#
+# This implies that on 1991-03-31 Asia/Oral remained on +04/+05 while
+# the rest of Kazakhstan switched from +06/+07 to +05/06 or from +05/06
+# to +04/+05. It's unclear how Kzyl-Orda oblast moved into the fifth
+# time belt. (By switching from +04/+05 to +05/+06 on 1991-09-29?) ...
+#
+# 1. Act of the Cabinet of Ministers of the Republic of Kazakhstan
+# from 1992-01-13 No. 28
+# http://adilet.zan.kz/rus/docs/P920000028_
+# (text includes modification from the 1996 act)
+# introduced new rules for calculation of time, mirroring Russian
+# 1992-01-08 act.  It specified that time would be calculated
+# according to time belts plus extra hour ("decree time"), moved clocks
+# on the whole territory of Kazakhstan 1 hour forward on 1992-01-19 at
+# 2:00, specified DST rules.  It acknowledged that Kazakhstan was
+# located in the fourth and the fifth time belts and specified the
+# border between them to be located east of Kustanay and Aktyubinsk
+# oblasts (notably including Turgai and Kzyl-Orda oblasts into the fifth
+# time belt).
+#
+# This means switch on 1992-01-19 at 2:00 from +04/+05 to +05/+06 for
+# Asia/Aqtau, Asia/Aqtobe, Asia/Oral, Atyrau and Kustanay oblasts; from
+# +05/+06 to +06/+07 for Asia/Almaty and Asia/Qyzylorda (and Arkalyk) [*]....
+#
+# 2. Act of the Cabinet of Ministers of the Republic of Kazakhstan
+# from 1992-03-27 No. 284
+# http://adilet.zan.kz/rus/docs/P920000284_
+# cancels extra hour ("decree time") for Uralsk and Kzyl-Orda oblasts
+# since the last Sunday of March 1992, while keeping them in the fourth
+# and the fifth time belts respectively.
+#
+# 3. Order of the Prime Minister of the Republic of Kazakhstan
+# from 1994-09-23 No. 384
+# http://adilet.zan.kz/rus/docs/R940000384_
+# cancels the extra hour ("decree time") on the territory of Mangystau
+# oblast since the last Sunday of September 1994 (saying that time on
+# the territory would correspond to the third time belt as a
+# result)....
+#
+# 4. Act of the Government of the Republic of Kazakhstan
+# from 1996-05-08 No. 575
+# http://adilet.zan.kz/rus/docs/P960000575_
+# amends the 1992-01-13 act to end summer time in October instead
+# of September, mirroring identical Russian change from 1996-04-23 act.
+#
+# 5. Act of the Government of the Republic of Kazakhstan
+# from 1999-03-26 No. 305
+# http://adilet.zan.kz/rus/docs/P990000305_
+# cancels the extra hour ("decree time") for Atyrau oblast since the
+# last Sunday of March 1999 while retaining the oblast in the fourth
+# time belt.
+#
+# This means change from +05/+06 to +04/+05.
+#
+# There is no zone for Atyrau currently (listed under Asia/Aqtau in
+# zone1970.tab).[*]
+#
+# 6. Act of the Government of the Republic of Kazakhstan
+# from 2000-11-23 No. 1749
+# http://adilet.zan.kz/rus/archive/docs/P000001749_/23.11.2000
+# replaces the previous five documents.
+#
+# The only changes I noticed are in definition of the border between the
+# fourth and the fifth time belts.  They account for changes in spelling
+# and administrative division (splitting of Turgai oblast in 1997
+# probably changed time in territories incorporated into Kostanay oblast
+# (including Arkalyk) from +06/+07 to +05/+06) and move Kyzylorda oblast
+# from being in the fifth time belt and not using decree time into the
+# fourth time belt (no change in practice).[*]
+#
+# 7. Act of the Government of the Republic of Kazakhstan
+# from 2003-12-29 No. 1342
+# http://adilet.zan.kz/rus/docs/P030001342_
+# modified the 2000-11-23 act.  No relevant changes, apparently.
+#
+# 8. Act of the Government of the Republic of Kazakhstan
+# from 2004-07-20 No. 775
+# http://adilet.zan.kz/rus/archive/docs/P040000775_/20.07.2004
+# modified the 2000-11-23 act to move Kostanay and Kyzylorda oblasts into
+# the fifth time belt and add Aktobe oblast to the list of regions not
+# using extra hour ("decree time"), leaving Kazakhstan with only 2 time
+# zones (+04/+05 and +06/+07).  The changes were to be implemented
+# during DST transitions in 2004 and 2005 but the acts got radically
+# amended before implementation happened.
+#
+# 9. Act of the Government of the Republic of Kazakhstan
+# from 2004-09-15 No. 1059
+# http://adilet.zan.kz/rus/docs/P040001059_
+# modified the 2000-11-23 act to remove exceptions from the "decree time"
+# (leaving Kazakhstan in +05/+06 and +06/+07 zones), amended the
+# 2004-07-20 act to implement changes for Atyrau, West Kazakhstan,
+# Kostanay, Kyzylorda and Mangystau oblasts by not moving clocks
+# during the 2014 transition to "winter" time.
+#
+# This means transition from +04/+05 to +05/+06 for Atyrau oblast (no
+# zone currently), Asia/Oral, Asia/Aqtau and transition from +05/+06 to
+# +06/+07 for Kostanay oblast (Kostanay and Arkalyk, no zones currently)
+# and Asia/Qyzylorda on 2004-10-31 at 3:00....[*]
+#
+# 10. Act of the Government of the Republic of Kazakhstan
+# from 2005-03-15 No. 231
+# http://adilet.zan.kz/rus/docs/P050000231_
+# removes DST provisions from the 2000-11-23 act, removes most of the
+# (already implemented) provisions from the 2004-07-20 and 2004-09-15
+# acts, comes into effect 10 days after official publication.
+# The only practical effect seems to be the abolition of the summer
+# time.
+#
+# Unamended version of the act of the Government of the Russian Federation
+# No. 23 from 1992-01-08 [See 'europe' file for details].
+# Kazakh 1992-01-13 act appears to provide the same rules and 1992-03-27
+# act was to be enacted on the last Sunday of March 1992.
+
+# From Paul Eggert (2016-04-15):
+# The tables below should reflect Stepan Golosunov's remarks above,
+# except for the items marked "[*]" which I haven't gotten to yet.
+# It looks like we will need new zones Asia/Atyrau and Asia/Qostanay
+# to handle changes from 1992 through 2004 that we did not previously
+# know about.
+
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 #
 # Almaty (formerly Alma-Ata), representing most locations in Kazakhstan
+# This includes KZ-AKM, KZ-ALA, KZ-ALM, KZ-AST, KZ-BAY, KZ-VOS, KZ-ZHA,
+# KZ-KAR, KZ-SEV, KZ-PAV, and KZ-YUZ.
 Zone	Asia/Almaty	5:07:48 -	LMT	1924 May  2 # or Alma-Ata
-			5:00	-	ALMT	1930 Jun 21 # Alma-Ata Time
-			6:00 RussiaAsia ALM%sT	1991
-			6:00	-	ALMT	1992
-			6:00 RussiaAsia	ALM%sT	2005 Mar 15
-			6:00	-	ALMT
-# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.)
+			5:00	-	+05	1930 Jun 21
+			6:00 RussiaAsia +06/+07	1991 Mar 31  2:00s
+			5:00 RussiaAsia	+05/+06	1992 Jan 19  2:00s
+			6:00 RussiaAsia	+06/+07	2004 Oct 31  2:00s
+			6:00	-	+06
+# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-KZY)
 Zone	Asia/Qyzylorda	4:21:52 -	LMT	1924 May  2
-			4:00	-	KIZT	1930 Jun 21 # Kizilorda Time
-			5:00	-	KIZT	1981 Apr  1
-			5:00	1:00	KIZST	1981 Oct  1
-			6:00	-	KIZT	1982 Apr  1
-			5:00 RussiaAsia	KIZ%sT	1991
-			5:00	-	KIZT	1991 Dec 16 # independence
-			5:00	-	QYZT	1992 Jan 19  2:00
-			6:00 RussiaAsia	QYZ%sT	2005 Mar 15
-			6:00	-	QYZT
-# Aqtobe (aka Aktobe, formerly Aktyubinsk)
+			4:00	-	+04	1930 Jun 21
+			5:00	-	+05	1981 Apr  1
+			5:00	1:00	+06	1981 Oct  1
+			6:00	-	+06	1982 Apr  1
+			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
+			4:00 RussiaAsia	+04/+05	1991 Sep 29  2:00s
+			5:00 RussiaAsia	+05/+06	1992 Jan 19  2:00s
+			6:00 RussiaAsia	+06/+07	1992 Mar 29  2:00s
+			5:00 RussiaAsia	+05/+06	2004 Oct 31  2:00s
+			6:00	-	+06
+# Aqtobe (aka Aktobe, formerly Aktyubinsk) (KZ-AKT)
 Zone	Asia/Aqtobe	3:48:40	-	LMT	1924 May  2
-			4:00	-	AKTT	1930 Jun 21 # Aktyubinsk Time
-			5:00	-	AKTT	1981 Apr  1
-			5:00	1:00	AKTST	1981 Oct  1
-			6:00	-	AKTT	1982 Apr  1
-			5:00 RussiaAsia	AKT%sT	1991
-			5:00	-	AKTT	1991 Dec 16 # independence
-			5:00 RussiaAsia	AQT%sT	2005 Mar 15 # Aqtobe Time
-			5:00	-	AQTT
-# Mangghystau
+			4:00	-	+04	1930 Jun 21
+			5:00	-	+05	1981 Apr  1
+			5:00	1:00	+06	1981 Oct  1
+			6:00	-	+06	1982 Apr  1
+			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
+			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
+			5:00 RussiaAsia	+05/+06	2004 Oct 31  2:00s
+			5:00	-	+05
+# Qostanay (KZ-KUS)
+
+# Mangghystau (KZ-MAN)
 # Aqtau was not founded until 1963, but it represents an inhabited region,
 # so include time stamps before 1963.
 Zone	Asia/Aqtau	3:21:04	-	LMT	1924 May  2
-			4:00	-	FORT	1930 Jun 21 # Fort Shevchenko T
-			5:00	-	FORT	1963
-			5:00	-	SHET	1981 Oct  1 # Shevchenko Time
-			6:00	-	SHET	1982 Apr  1
-			5:00 RussiaAsia	SHE%sT	1991
-			5:00	-	SHET	1991 Dec 16 # independence
-			5:00 RussiaAsia	AQT%sT	1995 Mar lastSun  2:00 # Aqtau Time
-			4:00 RussiaAsia	AQT%sT	2005 Mar 15
-			5:00	-	AQTT
-# West Kazakhstan
+			4:00	-	+04	1930 Jun 21
+			5:00	-	+05	1963
+			5:00	-	+05	1981 Oct  1
+			6:00	-	+06	1982 Apr  1
+			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
+			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
+			5:00 RussiaAsia	+05/+06	1994 Sep 25  2:00s
+			4:00 RussiaAsia	+04/+05	2004 Oct 31  2:00s
+			5:00	-	+05
+
+# West Kazakhstan (KZ-ZAP)
+# From Paul Eggert (2016-03-18):
+# The 1989 transition is from USSR act No. 227 (1989-03-14).
 Zone	Asia/Oral	3:25:24	-	LMT	1924 May  2 # or Ural'sk
-			4:00	-	URAT	1930 Jun 21 # Ural'sk time
-			5:00	-	URAT	1981 Apr  1
-			5:00	1:00	URAST	1981 Oct  1
-			6:00	-	URAT	1982 Apr  1
-			5:00 RussiaAsia	URA%sT	1989 Mar 26  2:00
-			4:00 RussiaAsia	URA%sT	1991
-			4:00	-	URAT	1991 Dec 16 # independence
-			4:00 RussiaAsia	ORA%sT	2005 Mar 15 # Oral Time
-			5:00	-	ORAT
+			4:00	-	+04	1930 Jun 21
+			5:00	-	+05	1981 Apr  1
+			5:00	1:00	+06	1981 Oct  1
+			6:00	-	+06	1982 Apr  1
+			5:00 RussiaAsia	+05/+06	1989 Mar 26  2:00s
+			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
+			5:00 RussiaAsia	+05/+06	1992 Mar 29  2:00s
+			4:00 RussiaAsia	+04/+05	2004 Oct 31  2:00s
+			5:00	-	+05
 
 # Kyrgyzstan (Kirgizstan)
 # Transitions through 1991 are from Shanks & Pottenger.
@@ -2419,6 +2578,16 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
 # http://www.timeanddate.com/time/change/gaza-strip/gaza
 # http://www.timeanddate.com/time/change/west-bank/hebron
 
+# From Hannah Kreitem (2016-03-09):
+# http://www.palestinecabinet.gov.ps/WebSite/ar/ViewDetails?ID=31728
+# [Google translation]: "The Council also decided to start daylight
+# saving in Palestine as of one o'clock on Saturday morning,
+# 2016-03-26, to provide the clock 60 minutes ahead."
+#
+# From Paul Eggert (2016-03-12):
+# Predict spring transitions on March's last Saturday at 01:00 from now on.
+# Leave fall predictions alone for now.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
 Rule EgyptAsia	1957	1958	-	Oct	 1	0:00	0	-
@@ -2447,7 +2616,8 @@ Rule Palestine	2012	2014	-	Mar	lastThu	24:00	1:00	S
 Rule Palestine	2012	only	-	Sep	21	1:00	0	-
 Rule Palestine	2013	only	-	Sep	Fri>=21	0:00	0	-
 Rule Palestine	2014	max	-	Oct	Fri>=21	0:00	0	-
-Rule Palestine	2015	max	-	Mar	lastFri	24:00	1:00	S
+Rule Palestine	2015	only	-	Mar	lastFri	24:00	1:00	S
+Rule Palestine	2016	max	-	Mar	lastSat	1:00	1:00	S
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
diff --git a/jdk/make/data/tzdata/australasia b/jdk/make/data/tzdata/australasia
index 09afef2d401..929124cc048 100644
--- a/jdk/make/data/tzdata/australasia
+++ b/jdk/make/data/tzdata/australasia
@@ -83,6 +83,14 @@ Zone Australia/Eucla	 8:35:28 -	LMT	1895 Dec
 # Hamilton is the largest, but there is also a Hamilton in Victoria,
 # so use Lindeman.
 #
+# From J William Piggott (2016-02-20):
+# There is no location named Holiday Islands in Queensland Australia; holiday
+# islands is a colloquial term used globally.  Hayman and Lindeman are at the
+# north and south extremes of the Whitsunday Islands archipelago, and
+# Hamilton is in between; it is reasonable to believe that this time zone
+# applies to all of the Whitsundays.
+# http://www.australia.gov.au/about-australia/australian-story/austn-islands
+#
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	AQ	1971	only	-	Oct	lastSun	2:00s	1:00	D
 Rule	AQ	1972	only	-	Feb	lastSun	2:00s	0	S
diff --git a/jdk/make/data/tzdata/europe b/jdk/make/data/tzdata/europe
index 267992150ce..00a9fffa39d 100644
--- a/jdk/make/data/tzdata/europe
+++ b/jdk/make/data/tzdata/europe
@@ -623,16 +623,40 @@ Rule	Russia	1981	1984	-	Apr	 1	 0:00	1:00	S
 Rule	Russia	1981	1983	-	Oct	 1	 0:00	0	-
 # Act No. 967 of the Council of Ministers of the USSR (1984-09-13), repeated in
 # Act No. 227 of the Council of Ministers of the USSR (1989-03-14):
-Rule	Russia	1984	1991	-	Sep	lastSun	 2:00s	0	-
-Rule	Russia	1985	1991	-	Mar	lastSun	 2:00s	1:00	S
+Rule	Russia	1984	1995	-	Sep	lastSun	 2:00s	0	-
+Rule	Russia	1985	2010	-	Mar	lastSun	 2:00s	1:00	S
 #
-Rule	Russia	1992	only	-	Mar	lastSat	 23:00	1:00	S
-Rule	Russia	1992	only	-	Sep	lastSat	 23:00	0	-
-Rule	Russia	1993	2010	-	Mar	lastSun	 2:00s	1:00	S
-Rule	Russia	1993	1995	-	Sep	lastSun	 2:00s	0	-
 Rule	Russia	1996	2010	-	Oct	lastSun	 2:00s	0	-
 # As described below, Russia's 2014 change affects Zone data, not Rule data.
 
+# From Stepan Golosunov (2016-03-07):
+# Wikipedia and other sources refer to the Act of the Council of
+# Ministers of the USSR from 1988-01-04 No. 5 and the Act of the
+# Council of Ministers of the USSR from 1989-03-14 No. 227.
+#
+# I did not find full texts of these acts.  For the 1989 one we have
+# title at http://base.garant.ru/70754136/ :
+# "About change in calculation of time on the territories of
+# Lithuanian SSR, Latvian SSR and Estonian SSR, Astrakhan,
+# Kaliningrad, Kirov, Kuybyshev, Ulyanovsk and Uralsk oblasts".
+# And http://astrozet.net/files/Zones/DOC/RU/1980-925.txt appears to
+# contain quotes from both acts: Since last Sunday of March 1988 rules
+# of the second time belt are installed in Volgograd and Saratov
+# oblasts.  Since last Sunday of March 1989:
+# a) Lithuanian SSR, Latvian SSR, Estonian SSR, Kaliningrad oblast:
+# second time belt rules without extra hour (Moscow-1);
+# b) Astrakhan, Kirov, Kuybyshev, Ulyanovsk oblasts: second time belt
+# rules (Moscow time)
+# c) Uralsk oblast: third time belt rules (Moscow+1).
+
+# From Stepan Golosunov (2016-03-27):
+# Unamended version of the act of the
+# Government of the Russian Federation No. 23 from 08.01.1992
+# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102014034&rdk=0
+# says that every year clocks were to be moved forward on last Sunday
+# of March at 2 hours and moved backwards on last Sunday of September
+# at 3 hours.  It was amended in 1996 to replace September with October.
+
 # From Alexander Krivenyshev (2011-06-14):
 # According to Kremlin press service, Russian President Dmitry Medvedev
 # signed a federal law "On calculation of time" on June 9, 2011.
@@ -1028,6 +1052,12 @@ Zone Atlantic/Faroe	-0:27:04 -	LMT	1908 Jan 11 # Tórshavn
 # startkart.no says Thule does not observe DST, but this is clearly an error,
 # so go with Shanks & Pottenger for Thule transitions until this year.
 # For 2007 on assume Thule will stay in sync with US DST rules.
+
+# From J William Piggott (2016-02-20):
+# "Greenland north of the community of Scoresbysund" is officially named
+# "National Park" by Executive Order:
+# http://naalakkersuisut.gl/~/media/Nanoq/Files/Attached%20Files/Engelske-tekster/Legislation/Executive%20Order%20National%20Park.rtf
+# It is their only National Park.
 #
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Thule	1991	1992	-	Mar	lastSun	2:00	1:00	D
@@ -1053,6 +1083,10 @@ Zone America/Thule	-4:35:08 -	LMT	1916 Jul 28 # Pituffik air base
 			-4:00	Thule	A%sT
 
 # Estonia
+#
+# From Paul Eggert (2016-03-18):
+# The 1989 transition is from USSR act No. 227 (1989-03-14).
+#
 # From Peter Ilieve (1994-10-15):
 # A relative in Tallinn confirms the accuracy of the data for 1989 onwards
 # [through 1994] and gives the legal authority for it,
@@ -1646,6 +1680,9 @@ Link Europe/Zurich Europe/Vaduz
 
 # Lithuania
 
+# From Paul Eggert (2016-03-18):
+# The 1989 transition is from USSR act No. 227 (1989-03-14).
+
 # From Paul Eggert (1996-11-22):
 # IATA SSIM (1992/1996) says Lithuania uses W-Eur rules, but since it is
 # known to be wrong about Estonia and Latvia, assume it's wrong here too.
@@ -1685,8 +1722,8 @@ Zone	Europe/Vilnius	1:41:16	-	LMT	1880
 			1:00	-	CET	1940 Aug  3
 			3:00	-	MSK	1941 Jun 24
 			1:00	C-Eur	CE%sT	1944 Aug
-			3:00	Russia	MSK/MSD	1991 Mar 31  2:00s
-			2:00	1:00	EEST	1991 Sep 29  2:00s
+			3:00	Russia	MSK/MSD	1989 Mar 26  2:00s
+			2:00	Russia	EE%sT	1991 Sep 29  2:00s
 			2:00	C-Eur	EE%sT	1998
 			2:00	-	EET	1998 Mar 29  1:00u
 			1:00	EU	CE%sT	1999 Oct 31  1:00u
@@ -1751,6 +1788,16 @@ Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov  2  0:00s # Valletta
 
 # Moldova
 
+# From Stepan Golosunov (2016-03-07):
+# the act of the government of the Republic of Moldova Nr. 132 from 1990-05-04
+# http://lex.justice.md/viewdoc.php?action=view&view=doc&id=298782&lang=2
+# ... says that since 1990-05-06 on the territory of the Moldavian SSR
+# time would be calculated as the standard time of the second time belt
+# plus one hour of the "summer" time. To implement that clocks would be
+# adjusted one hour backwards at 1990-05-06 2:00. After that "summer"
+# time would be cancelled last Sunday of September at 3:00 and
+# reintroduced last Sunday of March at 2:00.
+
 # From Paul Eggert (2006-03-22):
 # A previous version of this database followed Shanks & Pottenger, who write
 # that Tiraspol switched to Moscow time on 1992-01-19 at 02:00.
@@ -1809,9 +1856,7 @@ Zone	Europe/Chisinau	1:55:20 -	LMT	1880
 			2:00	Romania	EE%sT	1940 Aug 15
 			2:00	1:00	EEST	1941 Jul 17
 			1:00	C-Eur	CE%sT	1944 Aug 24
-			3:00	Russia	MSK/MSD	1990
-			3:00	-	MSK	1990 May 6
-			2:00	-	EET	1991
+			3:00	Russia	MSK/MSD	1990 May  6  2:00
 			2:00	Russia	EE%sT	1992
 			2:00	E-Eur	EE%sT	1997
 # See Romania commentary for the guessed 1997 transition to EU rules.
@@ -2289,16 +2334,32 @@ Zone Europe/Bucharest	1:44:24 -	LMT	1891 Oct
 # Europe/Kaliningrad covers...
 # 39	RU-KGD	Kaliningrad Oblast
 
+# From Paul Eggert (2016-03-18):
+# The 1989 transition is from USSR act No. 227 (1989-03-14).
+
+# From Stepan Golosunov (2016-03-07):
+# http://www.rgo.ru/ru/kaliningradskoe-oblastnoe-otdelenie/ob-otdelenii/publikacii/kak-nam-zhilos-bez-letnego-vremeni
+# confirms that the 1989 change to Moscow-1 was implemented.
+# (The article, though, is misattributed to 1990 while saying that
+# summer->winter transition would be done on the 24 of September. But
+# 1990-09-24 was Monday, while 1989-09-24 was Sunday as expected.)
+# ...
+# http://www.kaliningradka.ru/site_pc/cherez/index.php?ELEMENT_ID=40091
+# says that Kaliningrad switched to Moscow-1 on 1989-03-26, avoided
+# at the last moment switch to Moscow-1 on 1991-03-31, switched to
+# Moscow on 1991-11-03, switched to Moscow-1 on 1992-01-19.
+
 Zone Europe/Kaliningrad	 1:22:00 -	LMT	1893 Apr
 			 1:00	C-Eur	CE%sT	1945
 			 2:00	Poland	CE%sT	1946
-			 3:00	Russia	MSK/MSD	1991 Mar 31  2:00s
+			 3:00	Russia	MSK/MSD	1989 Mar 26  2:00s
 			 2:00	Russia	EE%sT	2011 Mar 27  2:00s
 			 3:00	-	FET	2014 Oct 26  2:00s
 			 2:00	-	EET
 
 
-# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+# From Paul Eggert (2016-02-21), per Tim Parenti (2014-07-03) and
+# Oscar van Vlijmen (2001-08-25):
 # Europe/Moscow covers...
 # 01	RU-AD	Adygea, Republic of
 # 05	RU-DA	Dagestan, Republic of
@@ -2341,12 +2402,92 @@ Zone Europe/Kaliningrad	 1:22:00 -	LMT	1893 Apr
 # 68	RU-TAM	Tambov Oblast
 # 69	RU-TVE	Tver Oblast
 # 71	RU-TUL	Tula Oblast
-# 73	RU-ULY	Ulyanovsk Oblast
 # 76	RU-YAR	Yaroslavl Oblast
 # 77	RU-MOW	Moscow
 # 78	RU-SPE	Saint Petersburg
 # 83	RU-NEN	Nenets Autonomous Okrug
 
+# From Stepan Golosunov (2016-03-07):
+# 11. Regions-violators, 1981-1982.
+# Wikipedia refers to
+# http://maps.monetonos.ru/maps/raznoe/Old_Maps/Old_Maps/Articles/022/3_1981.html
+# http://besp.narod.ru/nauka_1981_3.htm
+#
+# The second link provides two articles scanned from the Nauka i Zhizn
+# magazine No. 3, 1981 and a scan of the short article attributed to
+# the Trud newspaper from February 1982.  The first link provides the
+# same Nauka i Zhizn articles converted to the text form (but misses
+# time belt changes map).
+#
+# The second Nauka i Zhizn article says that in addition to
+# introduction of summer time on 1981-04-01 there are some time belt
+# border changes on 1981-10-01, mostly affecting Nenets Autonomous
+# Okrug, Krasnoyarsk Krai, Yakutia, Magadan Oblast and Chukotka
+# according to the provided map (colored one).  In addition to that
+# "time violators" (regions which were not using rules of the time
+# belts in which they were located) would not be moving off the DST on
+# 1981-10-01 to restore the decree time usage.  (Komi ASSR was
+# supposed to repeat that move in October 1982 to account for the 2
+# hour difference.)  Map depicting "time violators" before 1981-10-01
+# is also provided.
+#
+# The article from Trud says that 1981-10-01 changes caused problems
+# and some territories would be moved to pre-1981-10-01 time by not
+# moving to summer time on 1982-04-01.  Namely: Dagestan,
+# Kabardino-Balkar, Kalmyk, Komi, Mari, Mordovian, North Ossetian,
+# Tatar, Chechen-Ingush and Chuvash ASSR, Krasnodar and Stavropol
+# krais, Arkhangelsk, Vladimir, Vologda, Voronezh, Gorky, Ivanovo,
+# Kostroma, Lipetsk, Penza, Rostov, Ryazan, Tambov, Tyumen and
+# Yaroslavl oblasts, Nenets and Evenk autonomous okrugs, Khatangsky
+# district of Taymyr Autonomous Okrug.  As a result Evenk Autonomous
+# Okrug and Khatangsky district of Taymyr Autonomous Okrug would end
+# up on Moscow+4, Tyumen Oblast on Moscow+2 and the rest on Moscow
+# time.
+#
+# http://astrozet.net/files/Zones/DOC/RU/1980-925.txt
+# attributes the 1982 changes to the Act of the Council of Ministers
+# of the USSR No. 126 from 18.02.1982.  1980-925.txt also adds
+# Udmurtia to the list of affected territories and lists Khatangsky
+# district separately from Taymyr Autonomous Okurg.  Probably erroneously.
+#
+# The affected territories are currently listed under Europe/Moscow,
+# Asia/Yekaterinburg and Asia/Krasnoyarsk.
+#
+# 12. Udmurtia
+# The fact that Udmurtia is depicted as a violator in the Nauka i
+# Zhizn article hints at Izhevsk being on different time from
+# Kuybyshev before 1981-10-01. Udmurtia is not mentioned in the 1989 act.
+# http://astrozet.net/files/Zones/DOC/RU/1980-925.txt
+# implies Udmurtia was on Moscow time after 1982-04-01.
+# Wikipedia implies Udmurtia being on Moscow+1 until 1991.
+#
+# ...
+#
+# All Russian zones are supposed to have by default a -1 change at
+# 1991-03-31 2:00 (cancellation of the decree time in the USSR) and a +1
+# change at 1992-01-19 2:00 (restoration of the decree time in Russia).
+#
+# There were some exceptions, though.
+# Wikipedia says newspapers listed Astrakhan, Saratov, Kirov, Volgograd,
+# Izhevsk, Grozny, Kazan and Samara as such exceptions for the 1992
+# change. (Different newspapers providing different lists. And some
+# lists found in the internet are quite wild.)
+#
+# And apparently some exceptions were reverted in the last moment.
+# http://www.kaliningradka.ru/site_pc/cherez/index.php?ELEMENT_ID=40091
+# says that Kaliningrad decided not to be an exception 2 days before the
+# 1991-03-31 switch and one person at
+# http://izhevsk.ru/forum_light_message/50/682597-m8369040.html
+# says he remembers that Samara opted out of the 1992-01-19 exception
+# 2 days before the switch.
+#
+#
+# From Paul Eggert (2016-03-18):
+# Given the above, we appear to be missing some Zone entries for the
+# chaotic early 1980s in Russia.  It's not clear what these entries
+# should be.  For now, sweep this under the rug and just document the
+# time in Moscow.
+
 # From Vladimir Karpinsky (2014-07-08):
 # LMT in Moscow (before Jul 3, 1916) is 2:30:17, that was defined by Moscow
 # Observatory (coordinates: 55 deg. 45'29.70", 37 deg. 34'05.30")....
@@ -2420,47 +2561,102 @@ Zone Europe/Simferopol	 2:16:24 -	LMT	1880
 			 3:00	-	MSK
 
 
-# From Tim Parenti (2014-07-03):
-# Europe/Volgograd covers...
+# From Paul Eggert (2016-03-18):
+# Europe/Astrakhan covers:
 # 30	RU-AST	Astrakhan Oblast
-# 34	RU-VGG	Volgograd Oblast
-# 43	RU-KIR	Kirov Oblast
-# 64	RU-SAR	Saratov Oblast
+#
+# The 1989 transition is from USSR act No. 227 (1989-03-14).
 
-# From Paul Eggert (2006-05-09):
-# Shanks & Pottenger say Kirov is still at +0400 but Wikipedia says +0300.
-# Perhaps it switched after the others?  But we have no data.
+# From Alexander Krivenyshev (2016-01-12):
+# On February 10, 2016 Astrakhan Oblast got approval by the Federation
+# Council to change its time zone to UTC+4 (from current UTC+3 Moscow time)....
+# This Federal Law shall enter into force on 27 March 2016 at 02:00.
+# From Matt Johnson (2016-03-09):
+# http://publication.pravo.gov.ru/Document/View/0001201602150056
+
+Zone Europe/Astrakhan	 3:12:12 -	LMT	1924 May
+			 3:00	-	+03	1930 Jun 21
+			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
+			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
+			 4:00	-	+04	1992 Mar 29  2:00s
+			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
+			 4:00	-	+04	2014 Oct 26  2:00s
+			 3:00	-	+03	2016 Mar 27  2:00s
+			 4:00	-	+04
+
+# From Paul Eggert (2016-03-18):
+# Europe/Volgograd covers:
+# 34	RU-VGG	Volgograd Oblast
+# 64	RU-SAR	Saratov Oblast
+# The 1988 transition is from USSR act No. 5 (1988-01-04).
 
 Zone Europe/Volgograd	 2:57:40 -	LMT	1920 Jan  3
 			 3:00	-	TSAT	1925 Apr  6 # Tsaritsyn Time
 			 3:00	-	STAT	1930 Jun 21 # Stalingrad Time
 			 4:00	-	STAT	1961 Nov 11
-			 4:00	Russia	VOL%sT	1989 Mar 26  2:00s # Volgograd T
+			 4:00	Russia	VOL%sT	1988 Mar 27  2:00s # Volgograd T
 			 3:00	Russia	VOL%sT	1991 Mar 31  2:00s
 			 4:00	-	VOLT	1992 Mar 29  2:00s
 			 3:00	Russia	MSK/MSD	2011 Mar 27  2:00s
 			 4:00	-	MSK	2014 Oct 26  2:00s
 			 3:00	-	MSK
 
+# From Paul Eggert (2016-03-18):
+# Europe/Kirov covers:
+# 43	RU-KIR	Kirov Oblast
+# The 1989 transition is from USSR act No. 227 (1989-03-14).
+#
+Zone Europe/Kirov	 3:18:48 -	LMT	1919 Jul  1  2:00
+			 3:00	-	+03	1930 Jun 21
+			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
+			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
+			 4:00	-	+04	1992 Mar 29  2:00s
+			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
+			 4:00	-	+04	2014 Oct 26  2:00s
+			 3:00	-	+03
 
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
 # Europe/Samara covers...
 # 18	RU-UD	Udmurt Republic
 # 63	RU-SAM	Samara Oblast
 
+# From Paul Eggert (2016-03-18):
 # Byalokoz 1919 says Samara was 3:20:20.
+# The 1989 transition is from USSR act No. 227 (1989-03-14).
 
 Zone Europe/Samara	 3:20:20 -	LMT	1919 Jul  1  2:00
-			 3:00	-	SAMT	1930 Jun 21
+			 3:00	-	SAMT	1930 Jun 21 # Samara Time
 			 4:00	-	SAMT	1935 Jan 27
 			 4:00	Russia	KUY%sT	1989 Mar 26  2:00s # Kuybyshev
 			 3:00	Russia	MSK/MSD	1991 Mar 31  2:00s
 			 2:00	Russia	EE%sT	1991 Sep 29  2:00s
-			 3:00	-	KUYT	1991 Oct 20  3:00
-			 4:00	Russia	SAM%sT	2010 Mar 28  2:00s # Samara Time
+			 3:00	-	SAMT	1991 Oct 20  3:00
+			 4:00	Russia	SAM%sT	2010 Mar 28  2:00s
 			 3:00	Russia	SAM%sT	2011 Mar 27  2:00s
 			 4:00	-	SAMT
 
+# From Paul Eggert (2016-03-18):
+# Europe/Ulyanovsk covers:
+# 73	RU-ULY	Ulyanovsk Oblast
+
+# The 1989 transition is from USSR act No. 227 (1989-03-14).
+
+# From Alexander Krivenyshev (2016-02-17):
+# Ulyanovsk ... on their way to change time zones by March 27, 2016 at 2am.
+# Ulyanovsk Oblast ... from MSK to MSK+1 (UTC+3 to UTC+4) ...
+# 920582-6 ... 02/17/2016 The State Duma passed the bill in the first reading.
+# From Matt Johnson (2016-03-09):
+# http://publication.pravo.gov.ru/Document/View/0001201603090051
+
+Zone Europe/Ulyanovsk	 3:13:36 -	LMT	1919 Jul  1  2:00
+			 3:00	-	+03	1930 Jun 21
+			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
+			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
+			 2:00	Russia	+02/+03	1992 Jan 19  2:00s
+			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
+			 4:00	-	+04	2014 Oct 26  2:00s
+			 3:00	-	+03	2016 Mar 27  2:00s
+			 4:00	-	+04
 
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
 # Asia/Yekaterinburg covers...
@@ -2494,8 +2690,6 @@ Zone Asia/Yekaterinburg	 4:02:33 -	LMT	1916 Jul  3
 
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
 # Asia/Omsk covers...
-# 04	RU-AL	Altai Republic
-# 22	RU-ALT	Altai Krai
 # 55	RU-OMS	Omsk Oblast
 
 # Byalokoz 1919 says Omsk was 4:53:30.
@@ -2508,14 +2702,49 @@ Zone Asia/Omsk		 4:53:30 -	LMT	1919 Nov 14
 			 7:00	-	OMST	2014 Oct 26  2:00s
 			 6:00	-	OMST
 
+# From Paul Eggert (2016-02-22):
+# Asia/Barnaul covers:
+# 04	RU-AL	Altai Republic
+# 22	RU-ALT	Altai Krai
 
-# From Tim Parenti (2014-07-03):
-# Asia/Novosibirsk covers...
+# Data before 1991 are from Shanks & Pottenger.
+
+# From Stepan Golosunov (2016-03-07):
+# Letter of Bank of Russia from 1995-05-25
+# http://www.bestpravo.ru/rossijskoje/lj-akty/y3a.htm
+# suggests that Altai Republic transitioned to Moscow+3 on
+# 1995-05-28.
+#
+# http://regnum.ru/news/society/1957270.html
+# has some historical data for Altai Krai:
+# before 1957: west part on UTC+6, east on UTC+7
+# after 1957: UTC+7
+# since 1995: UTC+6
+# http://barnaul.rusplt.ru/index/pochemu_altajskij_kraj_okazalsja_v_neprivychnom_chasovom_pojase-17648.html
+# confirms that and provides more details including 1995-05-28 transition date.
+
+# From Alexander Krivenyshev (2016-02-17):
+# Altai Krai and Altai Republic on their way to change time zones
+# by March 27, 2016 at 2am....
+# Altai Republic / Gorno-Altaysk MSK+3 to MSK+4 (UTC+6 to UTC+7) ...
+# Altai Krai / Barnaul MSK+3 to MSK+4 (UTC+6 to UTC+7)
+# From Matt Johnson (2016-03-09):
+# http://publication.pravo.gov.ru/Document/View/0001201603090043
+# http://publication.pravo.gov.ru/Document/View/0001201603090038
+
+Zone Asia/Barnaul	 5:35:00 -	LMT	1919 Dec 10
+			 6:00	-	+06	1930 Jun 21
+			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
+			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
+			 7:00	Russia	+07/+08	1995 May 28
+			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
+			 7:00	-	+07	2014 Oct 26  2:00s
+			 6:00	-	+06	2016 Mar 27  2:00s
+			 7:00	-	+07
+
+# From Paul Eggert (2016-03-18):
+# Asia/Novosibirsk covers:
 # 54	RU-NVS	Novosibirsk Oblast
-# 70	RU-TOM	Tomsk Oblast
-
-# From Paul Eggert (2006-08-19): I'm guessing about Tomsk here; it's
-# not clear when it switched from +7 to +6.
 
 Zone Asia/Novosibirsk	 5:31:40 -	LMT	1919 Dec 14  6:00
 			 6:00	-	NOVT	1930 Jun 21 # Novosibirsk Time
@@ -2526,6 +2755,55 @@ Zone Asia/Novosibirsk	 5:31:40 -	LMT	1919 Dec 14  6:00
 			 7:00	-	NOVT	2014 Oct 26  2:00s
 			 6:00	-	NOVT
 
+# From Paul Eggert (2016-03-18):
+# Asia/Tomsk covers:
+# 70	RU-TOM	Tomsk Oblast
+
+# From Stepan Golosunov (2016-03-24):
+# Byalokoz listed Tomsk at 5:39:51.
+
+# From Stanislaw A. Kuzikowski (1994-06-29):
+# Tomsk is still 4 hours ahead of Moscow.
+
+# From Stepan Golosunov (2016-03-19):
+# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102075743
+# (fifth time belt being UTC+5+1(decree time)
+# / UTC+5+1(decree time)+1(summer time)) ...
+# Note that time belts (numbered from 2 (Moscow) to 12 according to their
+# GMT/UTC offset and having too many exceptions like regions formally
+# belonging to one belt but using time from another) were replaced
+# with time zones in 2011 with different numberings (there was a
+# 2-hour gap between second and third zones in 2011-2014).
+
+# From Stepan Golosunov (2016-04-12):
+# http://asozd2.duma.gov.ru/main.nsf/(SpravkaNew)?OpenAgent&RN=1006865-6
+# This bill was approved in the first reading today.  It moves Tomsk oblast
+# from UTC+6 to UTC+7 and is supposed to come into effect on 2016-05-29 at
+# 2:00.  The bill needs to be approved in the second and the third readings by
+# the State Duma, approved by the Federation Council, signed by the President
+# and published to become a law.  Minor changes in the text are to be expected
+# before the second reading (references need to be updated to account for the
+# recent changes).
+#
+# Judging by the ultra-short one-day amendments period, recent similar laws,
+# the State Duma schedule and the Federation Council schedule
+# http://www.duma.gov.ru/legislative/planning/day-shedule/por_vesna_2016/
+# http://council.gov.ru/activity/meetings/schedule/63303
+# I speculate that the final text of the bill will be proposed tomorrow, the
+# bill will be approved in the second and the third readings on Friday,
+# approved by the Federation Council on 2016-04-20, signed by the President and
+# published as a law around 2016-04-26.
+
+Zone	Asia/Tomsk	 5:39:51 -	LMT	1919 Dec 22
+			 6:00	-	+06	1930 Jun 21
+			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
+			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
+			 7:00	Russia	+07/+08	2002 May  1  3:00
+			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
+			 7:00	-	+07	2014 Oct 26  2:00s
+			 6:00	-	+06	2016 May 29  2:00s
+			 7:00	-	+07
+
 
 # From Tim Parenti (2014-07-03):
 # Asia/Novokuznetsk covers...
@@ -2549,9 +2827,6 @@ Zone Asia/Novosibirsk	 5:31:40 -	LMT	1919 Dec 14  6:00
 #
 # Thus, when Russia will switch to DST on the night of March 28, 2010
 # Kemerovo region (Kemerovo oblast') will not change the clock.
-#
-# As a result, Kemerovo oblast' will be in the same time zone as
-# Novosibirsk, Omsk, Tomsk, Barnaul and Altai Republic.
 
 # From Tim Parenti (2014-07-02), per Alexander Krivenyshev (2014-07-02):
 # The Kemerovo region will remain at UTC+7 through the 2014-10-26 change, thus
@@ -2620,7 +2895,7 @@ Zone Asia/Irkutsk	 6:57:05 -	LMT	1880
 # [The] time zone in the Trans-Baikal Territory (Zabaykalsky Krai) -
 # Asia/Chita [is changing] from UTC+8 to UTC+9.  Effective date will
 # be March 27, 2016 at 2:00am....
-# http://publication.pravo.gov.ru/Document/View/000120151230010
+# http://publication.pravo.gov.ru/Document/View/0001201512300107
 
 Zone Asia/Chita	 7:33:52 -	LMT	1919 Dec 15
 			 8:00	-	YAKT	1930 Jun 21 # Yakutsk Time
@@ -2731,6 +3006,11 @@ Zone Asia/Khandyga	 9:02:13 -	LMT	1919 Dec 15
 # ...with the exception of:
 # 65-11	****	Severo-Kurilsky District (North Kuril Islands)
 
+# From Matt Johnson (2016-02-22):
+# Asia/Sakhalin is moving (in entirety) from UTC+10 to UTC+11 ...
+# (2016-03-09):
+# http://publication.pravo.gov.ru/Document/View/0001201603090044
+
 # The Zone name should be Asia/Yuzhno-Sakhalinsk, but that's too long.
 Zone Asia/Sakhalin	 9:30:48 -	LMT	1905 Aug 23
 			 9:00	-	JCST	1937 Oct  1
@@ -2740,7 +3020,8 @@ Zone Asia/Sakhalin	 9:30:48 -	LMT	1905 Aug 23
 			11:00	Russia	SAK%sT	1997 Mar lastSun  2:00s
 			10:00	Russia	SAK%sT	2011 Mar 27  2:00s
 			11:00	-	SAKT	2014 Oct 26  2:00s
-			10:00	-	SAKT
+			10:00	-	SAKT	2016 Mar 27  2:00s
+			11:00	-	SAKT
 
 
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
@@ -2754,13 +3035,22 @@ Zone Asia/Sakhalin	 9:30:48 -	LMT	1905 Aug 23
 # until now by Asia/Magadan, will instead move to UTC+11.  These regions will
 # need their own zone.
 
+# From Alexander Krivenyshev (2016-03-27):
+# ... draft bill 948300-6 to change its time zone from UTC+10 to UTC+11 ...
+# will take ... effect ... on April 24, 2016 at 2 o'clock
+#
+# From Matt Johnson (2016-04-05):
+# ... signed by the President today ...
+# http://publication.pravo.gov.ru/Document/View/0001201604050038
+
 Zone Asia/Magadan	10:03:12 -	LMT	1924 May  2
 			10:00	-	MAGT	1930 Jun 21 # Magadan Time
 			11:00	Russia	MAG%sT	1991 Mar 31  2:00s
 			10:00	Russia	MAG%sT	1992 Jan 19  2:00s
 			11:00	Russia	MAG%sT	2011 Mar 27  2:00s
 			12:00	-	MAGT	2014 Oct 26  2:00s
-			10:00	-	MAGT
+			10:00	-	MAGT	2016 Apr 24  2:00s
+			11:00	-	MAGT
 
 
 # From Tim Parenti (2014-07-06):
diff --git a/jdk/make/data/tzdata/iso3166.tab b/jdk/make/data/tzdata/iso3166.tab
index 7fb307326ff..e47eefe1227 100644
--- a/jdk/make/data/tzdata/iso3166.tab
+++ b/jdk/make/data/tzdata/iso3166.tab
@@ -75,7 +75,7 @@ BL	St Barthelemy
 BM	Bermuda
 BN	Brunei
 BO	Bolivia
-BQ	Caribbean Netherlands
+BQ	Caribbean NL
 BR	Brazil
 BS	Bahamas
 BT	Bhutan
@@ -186,7 +186,7 @@ MA	Morocco
 MC	Monaco
 MD	Moldova
 ME	Montenegro
-MF	St Martin (French part)
+MF	St Martin (French)
 MG	Madagascar
 MH	Marshall Islands
 MK	Macedonia
@@ -256,7 +256,7 @@ SR	Suriname
 SS	South Sudan
 ST	Sao Tome & Principe
 SV	El Salvador
-SX	St Maarten (Dutch part)
+SX	St Maarten (Dutch)
 SY	Syria
 SZ	Swaziland
 TC	Turks & Caicos Is
diff --git a/jdk/make/data/tzdata/leapseconds b/jdk/make/data/tzdata/leapseconds
index de698eaa562..a08fbc7b20b 100644
--- a/jdk/make/data/tzdata/leapseconds
+++ b/jdk/make/data/tzdata/leapseconds
@@ -29,6 +29,7 @@
 # leap-seconds.list file available from most NIST time servers.
 # If the URL <ftp://time.nist.gov/pub/leap-seconds.list> does not work,
 # you should be able to pick up leap-seconds.list from a secondary NIST server.
+# See <http://tf.nist.gov/tf-cgi/servers.cgi> for a list of secondary servers.
 # For more about leap-seconds.list, please see
 # The NTP Timescale and Leap Seconds
 # http://www.eecis.udel.edu/~mills/leap.html
@@ -79,5 +80,5 @@ Leap	2008	Dec	31	23:59:60	+	S
 Leap	2012	Jun	30	23:59:60	+	S
 Leap	2015	Jun	30	23:59:60	+	S
 
-#	Updated through IERS Bulletin C50
-#	File expires on:  28 June 2016
+#	Updated through IERS Bulletin C51
+#	File expires on:  28 December 2016
diff --git a/jdk/make/data/tzdata/northamerica b/jdk/make/data/tzdata/northamerica
index e56fd895d10..2124401edaf 100644
--- a/jdk/make/data/tzdata/northamerica
+++ b/jdk/make/data/tzdata/northamerica
@@ -2498,13 +2498,22 @@ Zone America/Merida	-5:58:28 -	LMT	1922 Jan  1  0:01:32
 			-6:00	-	CST	1981 Dec 23
 			-5:00	-	EST	1982 Dec  2
 			-6:00	Mexico	C%sT
-# Coahuila, Durango, Nuevo León, Tamaulipas (near US border)
+# Coahuila, Nuevo León, Tamaulipas (near US border)
+# This includes the following municipalities:
+#   in Coahuila: Ocampo, Acuña, Zaragoza, Jiménez, Piedras Negras, Nava,
+#     Guerrero, Hidalgo.
+#   in Nuevo León: Anáhuac, Los Aldama.
+#   in Tamaulipas: Nuevo Laredo, Guerrero, Mier, Miguel Alemán, Camargo,
+#     Gustavo Díaz Ordaz, Reynosa, Río Bravo, Valle Hermoso, Matamoros.
+# See: Inicia mañana Horario de Verano en zona fronteriza, El Universal,
+# 2016-03-12
+# http://www.eluniversal.com.mx/articulo/estados/2016/03/12/inicia-manana-horario-de-verano-en-zona-fronteriza
 Zone America/Matamoros	-6:40:00 -	LMT	1921 Dec 31 23:20:00
 			-6:00	-	CST	1988
 			-6:00	US	C%sT	1989
 			-6:00	Mexico	C%sT	2010
 			-6:00	US	C%sT
-# Coahuila, Durango, Nuevo León, Tamaulipas (away from US border)
+# Durango; Coahuila, Nuevo León, Tamaulipas (away from US border)
 Zone America/Monterrey	-6:41:16 -	LMT	1921 Dec 31 23:18:44
 			-6:00	-	CST	1988
 			-6:00	US	C%sT	1989
@@ -2520,6 +2529,9 @@ Zone America/Mexico_City -6:36:36 -	LMT	1922 Jan  1  0:23:24
 			-6:00	-	CST	2002 Feb 20
 			-6:00	Mexico	C%sT
 # Chihuahua (near US border)
+# This includes the municipalities of Janos, Ascensión, Juárez, Guadalupe,
+# Práxedis G Guerrero, Coyame del Sotol, Ojinaga, and Manuel Benavides.
+# (See the 2016-03-12 El Universal source mentioned above.)
 Zone America/Ojinaga	-6:57:40 -	LMT	1922 Jan  1  0:02:20
 			-7:00	-	MST	1927 Jun 10 23:00
 			-6:00	-	CST	1930 Nov 15
@@ -2607,7 +2619,7 @@ Zone America/Bahia_Banderas	-7:01:00 -	LMT	1921 Dec 31 23:59:00
 			-7:00	Mexico	M%sT	2010 Apr  4  2:00
 			-6:00	Mexico	C%sT
 
-# Baja California (near US border)
+# Baja California
 Zone America/Tijuana	-7:48:04 -	LMT	1922 Jan  1  0:11:56
 			-7:00	-	MST	1924
 			-8:00	-	PST	1927 Jun 10 23:00
@@ -3083,6 +3095,13 @@ Zone America/Guatemala	-6:02:04 -	LMT	1918 Oct 5
 # http://radiovision2000haiti.net/public/haiti-avis-changement-dheure-dimanche/
 # http://www.canalplushaiti.net/?p=6714
 
+# From Steffen Thorsen (2016-03-12):
+# Jean Antoine, editor of www.haiti-reference.com informed us that Haiti
+# are not going on DST this year.  Several other resources confirm this: ...
+# http://www.radiotelevisioncaraibes.com/presse/heure_d_t_pas_de_changement_d_heure_pr_vu_pour_cet_ann_e.html
+# http://www.vantbefinfo.com/changement-dheure-pas-pour-haiti/
+# http://news.anmwe.com/haiti-lheure-nationale-ne-sera-ni-avancee-ni-reculee-cette-annee/
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Haiti	1983	only	-	May	8	0:00	1:00	D
 Rule	Haiti	1984	1987	-	Apr	lastSun	0:00	1:00	D
@@ -3093,8 +3112,8 @@ Rule	Haiti	1988	1997	-	Apr	Sun>=1	1:00s	1:00	D
 Rule	Haiti	1988	1997	-	Oct	lastSun	1:00s	0	S
 Rule	Haiti	2005	2006	-	Apr	Sun>=1	0:00	1:00	D
 Rule	Haiti	2005	2006	-	Oct	lastSun	0:00	0	S
-Rule	Haiti	2012	max	-	Mar	Sun>=8	2:00	1:00	D
-Rule	Haiti	2012	max	-	Nov	Sun>=1	2:00	0	S
+Rule	Haiti	2012	2015	-	Mar	Sun>=8	2:00	1:00	D
+Rule	Haiti	2012	2015	-	Nov	Sun>=1	2:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Port-au-Prince -4:49:20 -	LMT	1890
 			-4:49	-	PPMT	1917 Jan 24 12:00 # P-a-P MT
diff --git a/jdk/make/data/tzdata/southamerica b/jdk/make/data/tzdata/southamerica
index 082018691d6..b9090896d8b 100644
--- a/jdk/make/data/tzdata/southamerica
+++ b/jdk/make/data/tzdata/southamerica
@@ -1244,6 +1244,20 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
 # From Paul Eggert (2015-03-03):
 # For now, assume that the extension will persist indefinitely.
 
+# From Juan Correa (2016-03-18):
+# The decree regarding DST has been published in today's Official Gazette:
+# http://www.diariooficial.interior.gob.cl/versiones-anteriores/do/20160318/
+# http://www.leychile.cl/Navegar?idNorma=1088502
+# It does consider the second Saturday of May and August as the dates
+# for the transition; and it lists DST dates until 2019, but I think
+# this scheme will stick.
+#
+# From Paul Eggert (2016-03-18):
+# For now, assume the pattern holds for the indefinite future.
+# The decree says transitions occur at 24:00; in practice this appears
+# to mean 24:00 mainland time, not 24:00 local time, so that Easter
+# Island is always two hours behind the mainland.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Chile	1927	1931	-	Sep	 1	0:00	1:00	S
 Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
@@ -1275,8 +1289,10 @@ Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
 Rule	Chile	2010	only	-	Apr	Sun>=1	3:00u	0	-
 Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
 Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
-Rule	Chile	2012	2015	-	Apr	Sun>=23	3:00u	0	-
+Rule	Chile	2012	2014	-	Apr	Sun>=23	3:00u	0	-
 Rule	Chile	2012	2014	-	Sep	Sun>=2	4:00u	1:00	S
+Rule	Chile	2016	max	-	May	Sun>=9	3:00u	0	-
+Rule	Chile	2016	max	-	Aug	Sun>=9	4:00u	1:00	S
 # IATA SSIM anomalies: (1992-02) says 1992-03-14;
 # (1996-09) says 1998-03-08.  Ignore these.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1293,13 +1309,11 @@ Zone America/Santiago	-4:42:46 -	LMT	1890
 			-4:00	1:00	CLST	1946 Sep  1 # central Chile
 			-4:00	-	CLT	1947 Apr  1
 			-5:00	-	CLT	1947 May 21 23:00
-			-4:00	Chile	CL%sT	2015 Apr 26  3:00u
-			-3:00	-	CLT
+			-4:00	Chile	CL%sT
 Zone Pacific/Easter	-7:17:28 -	LMT	1890
 			-7:17:28 -	EMT	1932 Sep    # Easter Mean Time
 			-7:00	Chile	EAS%sT	1982 Mar 14 3:00u # Easter Time
-			-6:00	Chile	EAS%sT	2015 Apr 26 3:00u
-			-5:00	-	EAST
+			-6:00	Chile	EAS%sT
 #
 # Salas y Gómez Island is uninhabited.
 # Other Chilean locations, including Juan Fernández Is, Desventuradas Is,
@@ -1321,8 +1335,7 @@ Zone Pacific/Easter	-7:17:28 -	LMT	1890
 Zone Antarctica/Palmer	0	-	zzz	1965
 			-4:00	Arg	AR%sT	1969 Oct  5
 			-3:00	Arg	AR%sT	1982 May
-			-4:00	Chile	CL%sT	2015 Apr 26 3:00u
-			-3:00	-	CLT
+			-4:00	Chile	CL%sT
 
 # Colombia
 
@@ -1765,9 +1778,25 @@ Zone America/Montevideo	-3:44:44 -	LMT	1898 Jun 28
 # resolution publication)
 # http://www.globovision.com/news.php?nid=72208
 
+# From Alexander Krivenyshev (2016-04-15):
+# https://actualidad.rt.com/actualidad/204758-venezuela-modificar-huso-horario-sequia-elnino
+#
+# From Paul Eggert (2016-04-15):
+# Clocks advance 30 minutes on 2016-05-01 at 02:30. See:
+# Barboza AD. Huso horario en Venezuela volverá a 4 horas menos con
+# respecto al "Greenwich". Panorama 2016-04-15 12:20 -0430.
+# http://www.panorama.com.ve/ciudad/Huso-horario-en-Venezuela-volvera-a-4-horas-menos-con-respecto-al-Greenwich-20160415-0032.html
+#
+# "'Venezuela's new time-zone: hours without light, hours without water,
+# hours of presidential broadcasts, hours of lines," quipped comedian
+# Jean Mary Curro ...". See: Cawthorne A, Kai D. Venezuela scraps
+# half-hour time difference set by Chavez. Reuters 2016-04-15 14:50 -0400
+# http://www.reuters.com/article/us-venezuela-timezone-idUSKCN0XC2BE
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Caracas	-4:27:44 -	LMT	1890
 			-4:27:40 -	CMT	1912 Feb 12 # Caracas Mean Time?
 			-4:30	-	VET	1965 Jan  1  0:00 # Venezuela T.
 			-4:00	-	VET	2007 Dec  9  3:00
-			-4:30	-	VET
+			-4:30	-	VET	2016 May  1  2:30
+			-4:00	-	VET
diff --git a/jdk/make/data/tzdata/zone.tab b/jdk/make/data/tzdata/zone.tab
index 51aaf775dee..5649691ac03 100644
--- a/jdk/make/data/tzdata/zone.tab
+++ b/jdk/make/data/tzdata/zone.tab
@@ -53,22 +53,22 @@ AI	+1812-06304	America/Anguilla
 AL	+4120+01950	Europe/Tirane
 AM	+4011+04430	Asia/Yerevan
 AO	-0848+01314	Africa/Luanda
-AQ	-7750+16636	Antarctica/McMurdo	McMurdo, South Pole, Scott (New Zealand time)
-AQ	-6734-06808	Antarctica/Rothera	Rothera Station, Adelaide Island
-AQ	-6448-06406	Antarctica/Palmer	Palmer Station, Anvers Island
-AQ	-6736+06253	Antarctica/Mawson	Mawson Station, Holme Bay
-AQ	-6835+07758	Antarctica/Davis	Davis Station, Vestfold Hills
-AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
-AQ	-7824+10654	Antarctica/Vostok	Vostok Station, Lake Vostok
-AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Adelie Land
-AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
-AQ	-720041+0023206	Antarctica/Troll	Troll Station, Queen Maud Land
+AQ	-7750+16636	Antarctica/McMurdo	New Zealand time - McMurdo, South Pole
+AQ	-6617+11031	Antarctica/Casey	Casey
+AQ	-6835+07758	Antarctica/Davis	Davis
+AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville
+AQ	-6736+06253	Antarctica/Mawson	Mawson
+AQ	-6448-06406	Antarctica/Palmer	Palmer
+AQ	-6734-06808	Antarctica/Rothera	Rothera
+AQ	-690022+0393524	Antarctica/Syowa	Syowa
+AQ	-720041+0023206	Antarctica/Troll	Troll
+AQ	-7824+10654	Antarctica/Vostok	Vostok
 AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
-AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, MN, SE, SF)
-AR	-2447-06525	America/Argentina/Salta	(SA, LP, NQ, RN)
+AR	-3124-06411	America/Argentina/Cordoba	Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF)
+AR	-2447-06525	America/Argentina/Salta	Salta (SA, LP, NQ, RN)
 AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
 AR	-2649-06513	America/Argentina/Tucuman	Tucuman (TM)
-AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
+AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT); Chubut (CH)
 AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
 AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
 AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
@@ -79,17 +79,17 @@ AS	-1416-17042	Pacific/Pago_Pago
 AT	+4813+01620	Europe/Vienna
 AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
 AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
-AU	-4253+14719	Australia/Hobart	Tasmania - most locations
-AU	-3956+14352	Australia/Currie	Tasmania - King Island
+AU	-4253+14719	Australia/Hobart	Tasmania (most areas)
+AU	-3956+14352	Australia/Currie	Tasmania (King Island)
 AU	-3749+14458	Australia/Melbourne	Victoria
-AU	-3352+15113	Australia/Sydney	New South Wales - most locations
-AU	-3157+14127	Australia/Broken_Hill	New South Wales - Yancowinna
-AU	-2728+15302	Australia/Brisbane	Queensland - most locations
-AU	-2016+14900	Australia/Lindeman	Queensland - Holiday Islands
+AU	-3352+15113	Australia/Sydney	New South Wales (most areas)
+AU	-3157+14127	Australia/Broken_Hill	New South Wales (Yancowinna)
+AU	-2728+15302	Australia/Brisbane	Queensland (most areas)
+AU	-2016+14900	Australia/Lindeman	Queensland (Whitsunday Islands)
 AU	-3455+13835	Australia/Adelaide	South Australia
 AU	-1228+13050	Australia/Darwin	Northern Territory
-AU	-3157+11551	Australia/Perth	Western Australia - most locations
-AU	-3143+12852	Australia/Eucla	Western Australia - Eucla area
+AU	-3157+11551	Australia/Perth	Western Australia (most areas)
+AU	-3143+12852	Australia/Eucla	Western Australia (Eucla)
 AW	+1230-06958	America/Aruba
 AX	+6006+01957	Europe/Mariehamn
 AZ	+4023+04951	Asia/Baku
@@ -108,63 +108,63 @@ BN	+0456+11455	Asia/Brunei
 BO	-1630-06809	America/La_Paz
 BQ	+120903-0681636	America/Kralendijk
 BR	-0351-03225	America/Noronha	Atlantic islands
-BR	-0127-04829	America/Belem	Amapa, E Para
-BR	-0343-03830	America/Fortaleza	NE Brazil (MA, PI, CE, RN, PB)
+BR	-0127-04829	America/Belem	Para (east); Amapa
+BR	-0343-03830	America/Fortaleza	Brazil (northeast: MA, PI, CE, RN, PB)
 BR	-0803-03454	America/Recife	Pernambuco
 BR	-0712-04812	America/Araguaina	Tocantins
 BR	-0940-03543	America/Maceio	Alagoas, Sergipe
 BR	-1259-03831	America/Bahia	Bahia
-BR	-2332-04637	America/Sao_Paulo	S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)
+BR	-2332-04637	America/Sao_Paulo	Brazil (southeast: GO, DF, MG, ES, RJ, SP, PR, SC, RS)
 BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
 BR	-1535-05605	America/Cuiaba	Mato Grosso
-BR	-0226-05452	America/Santarem	W Para
+BR	-0226-05452	America/Santarem	Para (west)
 BR	-0846-06354	America/Porto_Velho	Rondonia
 BR	+0249-06040	America/Boa_Vista	Roraima
-BR	-0308-06001	America/Manaus	E Amazonas
-BR	-0640-06952	America/Eirunepe	W Amazonas
+BR	-0308-06001	America/Manaus	Amazonas (east)
+BR	-0640-06952	America/Eirunepe	Amazonas (west)
 BR	-0958-06748	America/Rio_Branco	Acre
 BS	+2505-07721	America/Nassau
 BT	+2728+08939	Asia/Thimphu
 BW	-2439+02555	Africa/Gaborone
 BY	+5354+02734	Europe/Minsk
 BZ	+1730-08812	America/Belize
-CA	+4734-05243	America/St_Johns	Newfoundland Time, including SE Labrador
-CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (peninsula), PEI
-CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia (Cape Breton)
-CA	+4606-06447	America/Moncton	Atlantic Time - New Brunswick
-CA	+5320-06025	America/Goose_Bay	Atlantic Time - Labrador - most locations
-CA	+5125-05707	America/Blanc-Sablon	Atlantic Standard Time - Quebec - Lower North Shore
-CA	+4339-07923	America/Toronto	Eastern Time - Ontario & Quebec - most locations
-CA	+4901-08816	America/Nipigon	Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
-CA	+4823-08915	America/Thunder_Bay	Eastern Time - Thunder Bay, Ontario
-CA	+6344-06828	America/Iqaluit	Eastern Time - east Nunavut - most locations
-CA	+6608-06544	America/Pangnirtung	Eastern Time - Pangnirtung, Nunavut
-CA	+744144-0944945	America/Resolute	Central Time - Resolute, Nunavut
-CA	+484531-0913718	America/Atikokan	Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut
-CA	+624900-0920459	America/Rankin_Inlet	Central Time - central Nunavut
-CA	+4953-09709	America/Winnipeg	Central Time - Manitoba & west Ontario
-CA	+4843-09434	America/Rainy_River	Central Time - Rainy River & Fort Frances, Ontario
-CA	+5024-10439	America/Regina	Central Standard Time - Saskatchewan - most locations
-CA	+5017-10750	America/Swift_Current	Central Standard Time - Saskatchewan - midwest
-CA	+5333-11328	America/Edmonton	Mountain Time - Alberta, east British Columbia & west Saskatchewan
-CA	+690650-1050310	America/Cambridge_Bay	Mountain Time - west Nunavut
-CA	+6227-11421	America/Yellowknife	Mountain Time - central Northwest Territories
-CA	+682059-1334300	America/Inuvik	Mountain Time - west Northwest Territories
-CA	+4906-11631	America/Creston	Mountain Standard Time - Creston, British Columbia
-CA	+5946-12014	America/Dawson_Creek	Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
-CA	+5848-12242	America/Fort_Nelson	Mountain Standard Time - Fort Nelson, British Columbia
-CA	+4916-12307	America/Vancouver	Pacific Time - west British Columbia
-CA	+6043-13503	America/Whitehorse	Pacific Time - south Yukon
-CA	+6404-13925	America/Dawson	Pacific Time - north Yukon
+CA	+4734-05243	America/St_Johns	Newfoundland; Labrador (southeast)
+CA	+4439-06336	America/Halifax	Atlantic - NS (most areas); PE
+CA	+4612-05957	America/Glace_Bay	Atlantic - NS (Cape Breton)
+CA	+4606-06447	America/Moncton	Atlantic - New Brunswick
+CA	+5320-06025	America/Goose_Bay	Atlantic - Labrador (most areas)
+CA	+5125-05707	America/Blanc-Sablon	AST - QC (Lower North Shore)
+CA	+4339-07923	America/Toronto	Eastern - ON, QC (most areas)
+CA	+4901-08816	America/Nipigon	Eastern - ON, QC (no DST 1967-73)
+CA	+4823-08915	America/Thunder_Bay	Eastern - ON (Thunder Bay)
+CA	+6344-06828	America/Iqaluit	Eastern - NU (most east areas)
+CA	+6608-06544	America/Pangnirtung	Eastern - NU (Pangnirtung)
+CA	+484531-0913718	America/Atikokan	EST - ON (Atikokan); NU (Coral H)
+CA	+4953-09709	America/Winnipeg	Central - ON (west); Manitoba
+CA	+4843-09434	America/Rainy_River	Central - ON (Rainy R, Ft Frances)
+CA	+744144-0944945	America/Resolute	Central - NU (Resolute)
+CA	+624900-0920459	America/Rankin_Inlet	Central - NU (central)
+CA	+5024-10439	America/Regina	CST - SK (most areas)
+CA	+5017-10750	America/Swift_Current	CST - SK (midwest)
+CA	+5333-11328	America/Edmonton	Mountain - AB; BC (E); SK (W)
+CA	+690650-1050310	America/Cambridge_Bay	Mountain - NU (west)
+CA	+6227-11421	America/Yellowknife	Mountain - NT (central)
+CA	+682059-1334300	America/Inuvik	Mountain - NT (west)
+CA	+4906-11631	America/Creston	MST - BC (Creston)
+CA	+5946-12014	America/Dawson_Creek	MST - BC (Dawson Cr, Ft St John)
+CA	+5848-12242	America/Fort_Nelson	MST - BC (Ft Nelson)
+CA	+4916-12307	America/Vancouver	Pacific - BC (most areas)
+CA	+6043-13503	America/Whitehorse	Pacific - Yukon (south)
+CA	+6404-13925	America/Dawson	Pacific - Yukon (north)
 CC	-1210+09655	Indian/Cocos
-CD	-0418+01518	Africa/Kinshasa	west Dem. Rep. of Congo
-CD	-1140+02728	Africa/Lubumbashi	east Dem. Rep. of Congo
+CD	-0418+01518	Africa/Kinshasa	Dem. Rep. of Congo (west)
+CD	-1140+02728	Africa/Lubumbashi	Dem. Rep. of Congo (east)
 CF	+0422+01835	Africa/Bangui
 CG	-0416+01517	Africa/Brazzaville
 CH	+4723+00832	Europe/Zurich
 CI	+0519-00402	Africa/Abidjan
 CK	-2114-15946	Pacific/Rarotonga
-CL	-3327-07040	America/Santiago	most locations
+CL	-3327-07040	America/Santiago	Chile (most areas)
 CL	-2709-10926	Pacific/Easter	Easter Island
 CM	+0403+00942	Africa/Douala
 CN	+3114+12128	Asia/Shanghai	Beijing Time
@@ -177,28 +177,28 @@ CW	+1211-06900	America/Curacao
 CX	-1025+10543	Indian/Christmas
 CY	+3510+03322	Asia/Nicosia
 CZ	+5005+01426	Europe/Prague
-DE	+5230+01322	Europe/Berlin	most locations
+DE	+5230+01322	Europe/Berlin	Germany (most areas)
 DE	+4742+00841	Europe/Busingen	Busingen
 DJ	+1136+04309	Africa/Djibouti
 DK	+5540+01235	Europe/Copenhagen
 DM	+1518-06124	America/Dominica
 DO	+1828-06954	America/Santo_Domingo
 DZ	+3647+00303	Africa/Algiers
-EC	-0210-07950	America/Guayaquil	mainland
+EC	-0210-07950	America/Guayaquil	Ecuador (mainland)
 EC	-0054-08936	Pacific/Galapagos	Galapagos Islands
 EE	+5925+02445	Europe/Tallinn
 EG	+3003+03115	Africa/Cairo
 EH	+2709-01312	Africa/El_Aaiun
 ER	+1520+03853	Africa/Asmara
-ES	+4024-00341	Europe/Madrid	mainland
-ES	+3553-00519	Africa/Ceuta	Ceuta & Melilla
+ES	+4024-00341	Europe/Madrid	Spain (mainland)
+ES	+3553-00519	Africa/Ceuta	Ceuta, Melilla
 ES	+2806-01524	Atlantic/Canary	Canary Islands
 ET	+0902+03842	Africa/Addis_Ababa
 FI	+6010+02458	Europe/Helsinki
 FJ	-1808+17825	Pacific/Fiji
 FK	-5142-05751	Atlantic/Stanley
-FM	+0725+15147	Pacific/Chuuk	Chuuk (Truk) and Yap
-FM	+0658+15813	Pacific/Pohnpei	Pohnpei (Ponape)
+FM	+0725+15147	Pacific/Chuuk	Chuuk/Truk, Yap
+FM	+0658+15813	Pacific/Pohnpei	Pohnpei/Ponape
 FM	+0519+16259	Pacific/Kosrae	Kosrae
 FO	+6201-00646	Atlantic/Faroe
 FR	+4852+00220	Europe/Paris
@@ -210,10 +210,10 @@ GF	+0456-05220	America/Cayenne
 GG	+4927-00232	Europe/Guernsey
 GH	+0533-00013	Africa/Accra
 GI	+3608-00521	Europe/Gibraltar
-GL	+6411-05144	America/Godthab	most locations
-GL	+7646-01840	America/Danmarkshavn	east coast, north of Scoresbysund
-GL	+7029-02158	America/Scoresbysund	Scoresbysund / Ittoqqortoormiit
-GL	+7634-06847	America/Thule	Thule / Pituffik
+GL	+6411-05144	America/Godthab	Greenland (most areas)
+GL	+7646-01840	America/Danmarkshavn	National Park (east coast)
+GL	+7029-02158	America/Scoresbysund	Scoresbysund/Ittoqqortoormiit
+GL	+7634-06847	America/Thule	Thule/Pituffik
 GM	+1328-01639	Africa/Banjul
 GN	+0931-01343	Africa/Conakry
 GP	+1614-06132	America/Guadeloupe
@@ -229,10 +229,10 @@ HN	+1406-08713	America/Tegucigalpa
 HR	+4548+01558	Europe/Zagreb
 HT	+1832-07220	America/Port-au-Prince
 HU	+4730+01905	Europe/Budapest
-ID	-0610+10648	Asia/Jakarta	Java & Sumatra
-ID	-0002+10920	Asia/Pontianak	west & central Borneo
-ID	-0507+11924	Asia/Makassar	east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor
-ID	-0232+14042	Asia/Jayapura	west New Guinea (Irian Jaya) & Malukus (Moluccas)
+ID	-0610+10648	Asia/Jakarta	Java, Sumatra
+ID	-0002+10920	Asia/Pontianak	Borneo (west, central)
+ID	-0507+11924	Asia/Makassar	Borneo (east, south); Sulawesi/Celebes, Bali, Nusa Tengarra; Timor (west)
+ID	-0232+14042	Asia/Jayapura	New Guinea (West Papua / Irian Jaya); Malukus/Moluccas
 IE	+5320-00615	Europe/Dublin
 IL	+314650+0351326	Asia/Jerusalem
 IM	+5409-00428	Europe/Isle_of_Man
@@ -258,10 +258,10 @@ KP	+3901+12545	Asia/Pyongyang
 KR	+3733+12658	Asia/Seoul
 KW	+2920+04759	Asia/Kuwait
 KY	+1918-08123	America/Cayman
-KZ	+4315+07657	Asia/Almaty	most locations
-KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda (Kyzylorda, Kzyl-Orda)
-KZ	+5017+05710	Asia/Aqtobe	Aqtobe (Aktobe)
-KZ	+4431+05016	Asia/Aqtau	Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau)
+KZ	+4315+07657	Asia/Almaty	Kazakhstan (most areas)
+KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda/Kyzylorda/Kzyl-Orda
+KZ	+5017+05710	Asia/Aqtobe	Aqtobe/Aktobe
+KZ	+4431+05016	Asia/Aqtau	Atyrau/Atirau/Gur'yev, Mangghystau/Mankistau
 KZ	+5113+05121	Asia/Oral	West Kazakhstan
 LA	+1758+10236	Asia/Vientiane
 LB	+3353+03530	Asia/Beirut
@@ -280,12 +280,12 @@ MD	+4700+02850	Europe/Chisinau
 ME	+4226+01916	Europe/Podgorica
 MF	+1804-06305	America/Marigot
 MG	-1855+04731	Indian/Antananarivo
-MH	+0709+17112	Pacific/Majuro	most locations
+MH	+0709+17112	Pacific/Majuro	Marshall Islands (most areas)
 MH	+0905+16720	Pacific/Kwajalein	Kwajalein
 MK	+4159+02126	Europe/Skopje
 ML	+1239-00800	Africa/Bamako
 MM	+1647+09610	Asia/Rangoon
-MN	+4755+10653	Asia/Ulaanbaatar	most locations
+MN	+4755+10653	Asia/Ulaanbaatar	Mongolia (most areas)
 MN	+4801+09139	Asia/Hovd	Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
 MN	+4804+11430	Asia/Choibalsan	Dornod, Sukhbaatar
 MO	+2214+11335	Asia/Macau
@@ -297,19 +297,19 @@ MT	+3554+01431	Europe/Malta
 MU	-2010+05730	Indian/Mauritius
 MV	+0410+07330	Indian/Maldives
 MW	-1547+03500	Africa/Blantyre
-MX	+1924-09909	America/Mexico_City	Central Time - most locations
+MX	+1924-09909	America/Mexico_City	Central Time
 MX	+2105-08646	America/Cancun	Eastern Standard Time - Quintana Roo
 MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatan
-MX	+2540-10019	America/Monterrey	Mexican Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas away from US border
-MX	+2550-09730	America/Matamoros	US Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas near US border
-MX	+2313-10625	America/Mazatlan	Mountain Time - S Baja, Nayarit, Sinaloa
-MX	+2838-10605	America/Chihuahua	Mexican Mountain Time - Chihuahua away from US border
-MX	+2934-10425	America/Ojinaga	US Mountain Time - Chihuahua near US border
+MX	+2540-10019	America/Monterrey	Central Time - Durango; Coahuila, Nuevo Leon, Tamaulipas (most areas)
+MX	+2550-09730	America/Matamoros	Central Time US - Coahuila, Nuevo Leon, Tamaulipas (US border)
+MX	+2313-10625	America/Mazatlan	Mountain Time - Baja California Sur, Nayarit, Sinaloa
+MX	+2838-10605	America/Chihuahua	Mountain Time - Chihuahua (most areas)
+MX	+2934-10425	America/Ojinaga	Mountain Time US - Chihuahua (US border)
 MX	+2904-11058	America/Hermosillo	Mountain Standard Time - Sonora
-MX	+3232-11701	America/Tijuana	US Pacific Time - Baja California state
-MX	+2048-10515	America/Bahia_Banderas	Mexican Central Time - Bahia de Banderas
-MY	+0310+10142	Asia/Kuala_Lumpur	peninsular Malaysia
-MY	+0133+11020	Asia/Kuching	Sabah & Sarawak
+MX	+3232-11701	America/Tijuana	Pacific Time US - Baja California
+MX	+2048-10515	America/Bahia_Banderas	Central Time - Bahia de Banderas
+MY	+0310+10142	Asia/Kuala_Lumpur	Malaysia (peninsula)
+MY	+0133+11020	Asia/Kuching	Sabah, Sarawak
 MZ	-2558+03235	Africa/Maputo
 NA	-2234+01706	Africa/Windhoek
 NC	-2216+16627	Pacific/Noumea
@@ -322,7 +322,7 @@ NO	+5955+01045	Europe/Oslo
 NP	+2743+08519	Asia/Kathmandu
 NR	-0031+16655	Pacific/Nauru
 NU	-1901-16955	Pacific/Niue
-NZ	-3652+17446	Pacific/Auckland	most locations
+NZ	-3652+17446	Pacific/Auckland	New Zealand (most areas)
 NZ	-4357-17633	Pacific/Chatham	Chatham Islands
 OM	+2336+05835	Asia/Muscat
 PA	+0858-07932	America/Panama
@@ -330,7 +330,7 @@ PE	-1203-07703	America/Lima
 PF	-1732-14934	Pacific/Tahiti	Society Islands
 PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
 PF	-2308-13457	Pacific/Gambier	Gambier Islands
-PG	-0930+14710	Pacific/Port_Moresby	most locations
+PG	-0930+14710	Pacific/Port_Moresby	Papua New Guinea (most areas)
 PG	-0613+15534	Pacific/Bougainville	Bougainville
 PH	+1435+12100	Asia/Manila
 PK	+2452+06703	Asia/Karachi
@@ -340,7 +340,7 @@ PN	-2504-13005	Pacific/Pitcairn
 PR	+182806-0660622	America/Puerto_Rico
 PS	+3130+03428	Asia/Gaza	Gaza Strip
 PS	+313200+0350542	Asia/Hebron	West Bank
-PT	+3843-00908	Europe/Lisbon	mainland
+PT	+3843-00908	Europe/Lisbon	Portugal (mainland)
 PT	+3238-01654	Atlantic/Madeira	Madeira Islands
 PT	+3744-02540	Atlantic/Azores	Azores
 PW	+0720+13429	Pacific/Palau
@@ -349,27 +349,32 @@ QA	+2517+05132	Asia/Qatar
 RE	-2052+05528	Indian/Reunion
 RO	+4426+02606	Europe/Bucharest
 RS	+4450+02030	Europe/Belgrade
-RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
-RU	+554521+0373704	Europe/Moscow	Moscow+00 - west Russia
-RU	+4457+03406	Europe/Simferopol	Moscow+00 - Crimea
-RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea
-RU	+5312+05009	Europe/Samara	Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia
-RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
-RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
-RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
-RU	+5345+08707	Asia/Novokuznetsk	Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo
-RU	+5601+09250	Asia/Krasnoyarsk	Moscow+04 - Yenisei River
-RU	+5216+10420	Asia/Irkutsk	Moscow+05 - Lake Baikal
-RU	+5203+11328	Asia/Chita	Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky
-RU	+6200+12940	Asia/Yakutsk	Moscow+06 - Lena River
-RU	+623923+1353314	Asia/Khandyga	Moscow+06 - Tomponsky, Ust-Maysky
-RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
-RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
-RU	+643337+1431336	Asia/Ust-Nera	Moscow+07 - Oymyakonsky
-RU	+5934+15048	Asia/Magadan	Moscow+08 (Moscow+07 after 2014-10-26) - Magadan
-RU	+6728+15343	Asia/Srednekolymsk	Moscow+08 - E Sakha, N Kuril Is
-RU	+5301+15839	Asia/Kamchatka	Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka
-RU	+6445+17729	Asia/Anadyr	Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea
+RU	+5443+02030	Europe/Kaliningrad	MSK-01 - Kaliningrad
+RU	+554521+0373704	Europe/Moscow	MSK+00 - Moscow area
+RU	+4457+03406	Europe/Simferopol	MSK+00 - Crimea
+RU	+4844+04425	Europe/Volgograd	MSK+00 - Volgograd, Saratov
+RU	+5836+04939	Europe/Kirov	MSK+00 - Kirov
+RU	+4621+04803	Europe/Astrakhan	MSK+01 - Astrakhan
+RU	+5312+05009	Europe/Samara	MSK+01 - Samara, Udmurtia
+RU	+5420+04824	Europe/Ulyanovsk	MSK+01 - Ulyanovsk
+RU	+5651+06036	Asia/Yekaterinburg	MSK+02 - Urals
+RU	+5500+07324	Asia/Omsk	MSK+03 - Omsk
+RU	+5502+08255	Asia/Novosibirsk	MSK+03 - Novosibirsk
+RU	+5322+08345	Asia/Barnaul	MSK+04 - Altai
+RU	+5630+08458	Asia/Tomsk	MSK+04 - Tomsk
+RU	+5345+08707	Asia/Novokuznetsk	MSK+04 - Kemerovo
+RU	+5601+09250	Asia/Krasnoyarsk	MSK+04 - Krasnoyarsk area
+RU	+5216+10420	Asia/Irkutsk	MSK+05 - Irkutsk, Buryatia
+RU	+5203+11328	Asia/Chita	MSK+06 - Zabaykalsky
+RU	+6200+12940	Asia/Yakutsk	MSK+06 - Lena River
+RU	+623923+1353314	Asia/Khandyga	MSK+06 - Tomponsky, Ust-Maysky
+RU	+4310+13156	Asia/Vladivostok	MSK+07 - Amur River
+RU	+643337+1431336	Asia/Ust-Nera	MSK+07 - Oymyakonsky
+RU	+5934+15048	Asia/Magadan	MSK+08 - Magadan
+RU	+4658+14242	Asia/Sakhalin	MSK+08 - Sakhalin Island
+RU	+6728+15343	Asia/Srednekolymsk	MSK+08 - Sakha (E); North Kuril Is
+RU	+5301+15839	Asia/Kamchatka	MSK+09 - Kamchatka
+RU	+6445+17729	Asia/Anadyr	MSK+09 - Bering Sea
 RW	-0157+03004	Africa/Kigali
 SA	+2438+04643	Asia/Riyadh
 SB	-0932+16012	Pacific/Guadalcanal
@@ -408,45 +413,45 @@ TT	+1039-06131	America/Port_of_Spain
 TV	-0831+17913	Pacific/Funafuti
 TW	+2503+12130	Asia/Taipei
 TZ	-0648+03917	Africa/Dar_es_Salaam
-UA	+5026+03031	Europe/Kiev	most locations
+UA	+5026+03031	Europe/Kiev	Ukraine (most areas)
 UA	+4837+02218	Europe/Uzhgorod	Ruthenia
-UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk
+UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye/Zaporizhia; Lugansk/Luhansk (east)
 UG	+0019+03225	Africa/Kampala
 UM	+1645-16931	Pacific/Johnston	Johnston Atoll
 UM	+2813-17722	Pacific/Midway	Midway Islands
 UM	+1917+16637	Pacific/Wake	Wake Island
-US	+404251-0740023	America/New_York	Eastern Time
-US	+421953-0830245	America/Detroit	Eastern Time - Michigan - most locations
-US	+381515-0854534	America/Kentucky/Louisville	Eastern Time - Kentucky - Louisville area
-US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
-US	+394606-0860929	America/Indiana/Indianapolis	Eastern Time - Indiana - most locations
-US	+384038-0873143	America/Indiana/Vincennes	Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties
-US	+410305-0863611	America/Indiana/Winamac	Eastern Time - Indiana - Pulaski County
-US	+382232-0862041	America/Indiana/Marengo	Eastern Time - Indiana - Crawford County
-US	+382931-0871643	America/Indiana/Petersburg	Eastern Time - Indiana - Pike County
-US	+384452-0850402	America/Indiana/Vevay	Eastern Time - Indiana - Switzerland County
-US	+415100-0873900	America/Chicago	Central Time
-US	+375711-0864541	America/Indiana/Tell_City	Central Time - Indiana - Perry County
-US	+411745-0863730	America/Indiana/Knox	Central Time - Indiana - Starke County
-US	+450628-0873651	America/Menominee	Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
-US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
-US	+465042-1012439	America/North_Dakota/New_Salem	Central Time - North Dakota - Morton County (except Mandan area)
-US	+471551-1014640	America/North_Dakota/Beulah	Central Time - North Dakota - Mercer County
-US	+394421-1045903	America/Denver	Mountain Time
-US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
-US	+332654-1120424	America/Phoenix	Mountain Standard Time - Arizona (except Navajo)
-US	+340308-1181434	America/Los_Angeles	Pacific Time
-US	+611305-1495401	America/Anchorage	Alaska Time
-US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
-US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
-US	+550737-1313435	America/Metlakatla	Alaska Time - Annette Island
-US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
-US	+643004-1652423	America/Nome	Alaska Time - west Alaska
+US	+404251-0740023	America/New_York	Eastern (most areas)
+US	+421953-0830245	America/Detroit	Eastern - MI (most areas)
+US	+381515-0854534	America/Kentucky/Louisville	Eastern - KY (Louisville area)
+US	+364947-0845057	America/Kentucky/Monticello	Eastern - KY (Wayne)
+US	+394606-0860929	America/Indiana/Indianapolis	Eastern - IN (most areas)
+US	+384038-0873143	America/Indiana/Vincennes	Eastern - IN (Da, Du, K, Mn)
+US	+410305-0863611	America/Indiana/Winamac	Eastern - IN (Pulaski)
+US	+382232-0862041	America/Indiana/Marengo	Eastern - IN (Crawford)
+US	+382931-0871643	America/Indiana/Petersburg	Eastern - IN (Pike)
+US	+384452-0850402	America/Indiana/Vevay	Eastern - IN (Switzerland)
+US	+415100-0873900	America/Chicago	Central (most areas)
+US	+375711-0864541	America/Indiana/Tell_City	Central - IN (Perry)
+US	+411745-0863730	America/Indiana/Knox	Central - IN (Starke)
+US	+450628-0873651	America/Menominee	Central - MI (Wisconsin border)
+US	+470659-1011757	America/North_Dakota/Center	Central - ND (Oliver)
+US	+465042-1012439	America/North_Dakota/New_Salem	Central - ND (Morton rural)
+US	+471551-1014640	America/North_Dakota/Beulah	Central - ND (Mercer)
+US	+394421-1045903	America/Denver	Mountain (most areas)
+US	+433649-1161209	America/Boise	Mountain - ID (south); OR (east)
+US	+332654-1120424	America/Phoenix	MST - Arizona (except Navajo)
+US	+340308-1181434	America/Los_Angeles	Pacific
+US	+611305-1495401	America/Anchorage	Alaska (most areas)
+US	+581807-1342511	America/Juneau	Alaska - Juneau area
+US	+571035-1351807	America/Sitka	Alaska - Sitka area
+US	+550737-1313435	America/Metlakatla	Alaska - Annette Island
+US	+593249-1394338	America/Yakutat	Alaska - Yakutat
+US	+643004-1652423	America/Nome	Alaska (west)
 US	+515248-1763929	America/Adak	Aleutian Islands
 US	+211825-1575130	Pacific/Honolulu	Hawaii
 UY	-3453-05611	America/Montevideo
-UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
-UZ	+4120+06918	Asia/Tashkent	east Uzbekistan
+UZ	+3940+06648	Asia/Samarkand	Uzbekistan (west)
+UZ	+4120+06918	Asia/Tashkent	Uzbekistan (east)
 VA	+415408+0122711	Europe/Vatican
 VC	+1309-06114	America/St_Vincent
 VE	+1030-06656	America/Caracas
diff --git a/jdk/test/java/time/test/java/time/format/TestZoneTextPrinterParser.java b/jdk/test/java/time/test/java/time/format/TestZoneTextPrinterParser.java
index 94bf083abcb..c4495e873d1 100644
--- a/jdk/test/java/time/test/java/time/format/TestZoneTextPrinterParser.java
+++ b/jdk/test/java/time/test/java/time/format/TestZoneTextPrinterParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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 @@ import org.testng.annotations.Test;
 
 /*
  * @test
- * @bug 8081022
+ * @bug 8081022 8151876
  * @key randomness
  */
 
@@ -84,6 +84,14 @@ public class TestZoneTextPrinterParser extends AbstractTestPrinterParser {
                 TimeZone tz = TimeZone.getTimeZone(zid);
                 boolean isDST = tz.inDaylightTime(new Date(zdt.toInstant().toEpochMilli()));
                 for (Locale locale : locales) {
+                    String longDisplayName = tz.getDisplayName(isDST, TimeZone.LONG, locale);
+                    String shortDisplayName = tz.getDisplayName(isDST, TimeZone.SHORT, locale);
+                    if ((longDisplayName.startsWith("GMT+") && shortDisplayName.startsWith("GMT+"))
+                            || (longDisplayName.startsWith("GMT-") && shortDisplayName.startsWith("GMT-"))) {
+                        printText(locale, zdt, TextStyle.FULL, tz, tz.getID());
+                        printText(locale, zdt, TextStyle.SHORT, tz, tz.getID());
+                        continue;
+                    }
                     printText(locale, zdt, TextStyle.FULL, tz,
                             tz.getDisplayName(isDST, TimeZone.LONG, locale));
                     printText(locale, zdt, TextStyle.SHORT, tz,
diff --git a/jdk/test/java/util/TimeZone/Bug8149452.java b/jdk/test/java/util/TimeZone/Bug8149452.java
index eb4c0bced15..b73d65b1a7f 100644
--- a/jdk/test/java/util/TimeZone/Bug8149452.java
+++ b/jdk/test/java/util/TimeZone/Bug8149452.java
@@ -22,7 +22,7 @@
  */
 /*
  * @test
- * @bug 8149452
+ * @bug 8149452 8151876
  * @summary Check the missing time zone names.
  */
 import java.text.DateFormatSymbols;
@@ -42,7 +42,10 @@ public class Bug8149452 {
             if (!Arrays.stream(zoneStrings)
                     .anyMatch(zone -> tzID.equalsIgnoreCase(zone[0]))) {
                 // to ignore names for Etc/GMT[+-][0-9]+ which are not supported
-                if (!tzID.startsWith("Etc/GMT") && !tzID.startsWith("GMT")) {
+                // Also ignore the TimeZone DisplayNames with GMT[+-]:hh:mm
+                if (!tzID.startsWith("Etc/GMT")
+                        && !tzID.startsWith("GMT")
+                        && !TimeZone.getTimeZone(tzID).getDisplayName().startsWith("GMT")) {
                     listNotFound.add(tzID);
                 }
             }
diff --git a/jdk/test/java/util/TimeZone/CheckDisplayNames.java b/jdk/test/java/util/TimeZone/CheckDisplayNames.java
deleted file mode 100644
index efdb5cdf38d..00000000000
--- a/jdk/test/java/util/TimeZone/CheckDisplayNames.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * Copyright (c) 2002, 2016, 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 6405639 8008577
- * @summary Validate timezone display names in
- *          src/java.base/share/classes/sun/util/resources/TimeZoneNames.java.
- * @modules java.base/sun.util.resources
- * @compile -XDignore.symbol.file CheckDisplayNames.java
- * @run main/othervm -Djava.locale.providers=COMPAT,SPI CheckDisplayNames
- */
-
-import java.util.*;
-import sun.util.resources.TimeZoneNames;
-
-/**
- * CheckDisplayNames checks all available time zones in the Java run
- * time environment and sees if those have their display names besides doing
- * some other test cases. It outputs time zones that don't have display names
- * if -source option is specified.
- * <blockquote>
- * <pre>
- *    Usage: java CheckDisplayNames [-source]
- *              -source ... produces source code for editing TimeZoneNames.java.
- * </pre>
- * </blockquote>
- */
-public class CheckDisplayNames {
-
-    private static boolean err = false;
-    private static boolean src = false;
-
-    private static Locale[] locales = Locale.getAvailableLocales();
-    private static String[] zones = TimeZone.getAvailableIDs();
-
-    private static String[] zones_118 = {
-        "ACT",  "Australia/Darwin",
-        "AET",  "Australia/Sydney",
-        "AGT",  "America/Buenos_Aires",
-        "ART",  "Africa/Cairo",
-        "AST",  "America/Anchorage",
-        "BET",  "America/Sao_Paulo",
-        "BST",  "Asia/Dacca",
-        "CAT",  "Africa/Harare",
-        "CNT",  "America/St_Johns",
-        "CST",  "America/Chicago",
-        "CTT",  "Asia/Shanghai",
-        "EAT",  "Africa/Addis_Ababa",
-        "ECT",  "Europe/Paris",
-//      "EET",  "Africa/Istanbul",
-        "EST",  "America/New_York",
-        "HST",  "Pacific/Honolulu",
-        "IET",  "America/Indiana/Indianapolis",
-//      Comment out for this test case fails as the result of L10N for hi_IN.
-//      "IST",  "Asia/Calcutta",
-        "JST",  "Asia/Tokyo",
-//      "MET",  "Asia/Tehran",
-        "MIT",  "Pacific/Apia",
-        "MST",  "America/Denver",
-        "NET",  "Asia/Yerevan",
-        "NST",  "Pacific/Auckland",
-        "PLT",  "Asia/Karachi",
-        "PNT",  "America/Phoenix",
-        "PRT",  "America/Puerto_Rico",
-        "PST",  "America/Los_Angeles",
-        "SST",  "Pacific/Guadalcanal",
-        "VST",  "Asia/Saigon",
-    };
-
-
-    public static void main(String[] argv) {
-        Locale reservedLocale = Locale.getDefault();
-        try {
-            if (argv.length == 1 && "-source".equals(argv[0])) {
-                src = true;
-            }
-
-            testDisplayNames();
-            testRAWoffsetAndDisplayNames();
-            test118DisplayNames();
-
-            if (err) {
-                throw new RuntimeException(
-                    "TimeZone display name validation failed.");
-            } else {
-                System.out.println(
-                    "\nAll test passed.\nTotal number of valid TimeZone id is "
-                    + zones.length);
-            }
-        } finally {
-            // restore the reserved locale
-            Locale.setDefault(reservedLocale);
-        }
-
-    }
-
-    /*
-     * Checks if each timezone ID has display names. If it doesn't and
-     * "-source" option was specified, source code is generated.
-     */
-    private static void testDisplayNames() {
-        System.out.println("Checking if each entry in TimeZoneNames is a valid TimeZone ID");
-
-        Locale.setDefault(Locale.US);
-        Enumeration data = new TimeZoneNames().getKeys();
-
-        while (data.hasMoreElements()) {
-            String name = (String)data.nextElement();
-            String id = TimeZone.getTimeZone(name).getID();
-            if (!name.equals(id)) {
-                System.err.println("\t" + name + " doesn't seem to be a valid TimeZone ID.");
-                err = true;
-            }
-        }
-
-        System.out.println("Checking if each TimeZone ID has display names.");
-
-        for (int i = 0; i < zones.length; i++) {
-            String id = zones[i];
-
-            if (id != null) {
-                if (id.startsWith("Etc/GMT")) {
-                    continue;
-                }
-                if (id.indexOf("Riyadh8") != -1) {
-                    continue;
-                }
-                if (id.equals("GMT0")) {
-                    continue;
-                }
-            }
-
-            TimeZone tz = TimeZone.getTimeZone(id);
-            String name = tz.getDisplayName();
-
-            if (name == null || name.startsWith("GMT+") || name.startsWith("GMT-")) {
-                if (src) {
-                    System.out.println("\t    {\"" + tz.getID() + "\", " +
-                                       "new String[] {\"Standard Time Name\", \"ST\",\n" +
-                                       "\t\t\t\t\t\t\"Daylight Time Name\", \"DT\"}},");
-                } else {
-                    System.err.println("\t" + tz.getID() + " doesn't seem to have display names");
-                    err = true;
-                }
-            }
-        }
-    }
-
-    /*
-     * Compares
-     *   - raw DST offset
-     *   - short display names in non-DST
-     *   - short display names in DST
-     *   - long display names in DST
-     * of two timezones whose long display names in non-DST are same.
-     * If one of these are different, there may be a bug.
-     */
-    private static void testRAWoffsetAndDisplayNames() {
-        System.out.println("Checking if each entry in TimeZoneNames is a valid TimeZone ID");
-
-        HashMap<String, TimeZone> map = new HashMap<String, TimeZone>();
-
-        for (int i = 0; i < locales.length; i++) {
-            map.clear();
-
-            for (int j = 0; j < zones.length; j++) {
-                TimeZone tz1 = TimeZone.getTimeZone(zones[j]);
-                String name = tz1.getDisplayName(false, TimeZone.LONG, locales[i]);
-
-                if (map.containsKey(name)) {
-                    TimeZone tz2 = map.get(name);
-
-                    int offset1 = tz1.getRawOffset();
-                    int offset2 = tz2.getRawOffset();
-                    if (offset1 != offset2) {
-                        System.err.println("Two timezones which have the same long display name \"" +
-                            name + "\" in non-DST have different DST offsets in " +
-                            locales[i] + " locale.\n\tTimezone 1=" +
-                            tz1.getID() + "(" + offset1 + ")\n\tTimezone 2=" +
-                            tz2.getID() + "(" + offset2 + ")");
-                    }
-
-                    String name1 = tz1.getDisplayName(false, TimeZone.SHORT, locales[i]);
-                    String name2 = tz2.getDisplayName(false, TimeZone.SHORT, locales[i]);
-                    if (!(name1.equals("GMT") && name2.equals("GMT")) &&
-                        !(name1.equals("CET") && name2.equals("MET")) &&
-                        !(name1.equals("MET") && name2.equals("CET"))) {
-                        if (!name1.equals(name2)) {
-                            System.err.println("Two timezones which have the same short display name \"" +
-                                name +
-                                "\" in non-DST have different short display names in non-DST in " +
-                                locales[i] + " locale.\n\tTimezone 1=" +
-                                tz1.getID() + "(" + name1 + ")\n\tTimezone 2=" +
-                                tz2.getID() + "(" + name2 + ")");
-                        }
-
-                        name1 = tz1.getDisplayName(true, TimeZone.SHORT, locales[i]);
-                        name2 = tz2.getDisplayName(true, TimeZone.SHORT, locales[i]);
-                        if (!name1.equals(name2)) {
-                            System.err.println("Two timezones which have the same short display name \"" +
-                            name +
-                            "\" in non-DST have different short display names in DST in " +
-                            locales[i] + " locale.\n\tTimezone 1=" +
-                            tz1.getID() + "(" + name1 + ")\n\tTimezone 2=" +
-                            tz2.getID() + "(" + name2 + ")");
-                        }
-
-                        name1 = tz1.getDisplayName(true, TimeZone.LONG, locales[i]);
-                        name2 = tz2.getDisplayName(true, TimeZone.LONG, locales[i]);
-                        if (!name1.equals(name2)) {
-                            System.err.println("Two timezones which have the same long display name \"" +
-                            name +
-                            "\" in non-DST have different long display names in DST in " +
-                            locales[i] + " locale.\n\tTimezone 1=" +
-                            tz1.getID() + "(" + name1 + ")\n\tTimezone 2=" +
-                            tz2.getID() + "(" + name2 + ")");
-                        }
-                    }
-                } else {
-                    map.put(name, tz1);
-                }
-            }
-        }
-    }
-
-    /*
-     * Compares three-letter timezones' display names with corresponding
-     * "popular" timezones.
-     */
-    private static void test118DisplayNames() {
-        System.out.println("Checking compatibility of Java 1.1.X's three-letter timezones");
-
-        for (int i = 0; i < zones_118.length; i+=2) {
-            String id_118 = zones_118[i];
-            String id_later = zones_118[i+1];
-            String zone_118, zone_later, localename;
-            TimeZone tz_118 = TimeZone.getTimeZone(id_118);
-            TimeZone tz_later = TimeZone.getTimeZone(id_later);
-
-            for (int j = 0; j < locales.length; j++) {
-                localename = locales[j].toString();
-                zone_118 = tz_118.getDisplayName(false, TimeZone.SHORT, locales[j]);
-                zone_later = tz_later.getDisplayName(false, TimeZone.SHORT, locales[j]);
-                check(id_118, id_later, zone_118, zone_later, "short", "non-DST", localename);
-
-                zone_118 = tz_118.getDisplayName(true, TimeZone.SHORT, locales[j]);
-                zone_later = tz_later.getDisplayName(true, TimeZone.SHORT, locales[j]);
-                check(id_118, id_later, zone_118, zone_later, "short", "DST", localename);
-
-                zone_118 = tz_118.getDisplayName(false, TimeZone.LONG, locales[j]);
-                zone_later = tz_later.getDisplayName(false, TimeZone.LONG, locales[j]);
-                check(id_118, id_later, zone_118, zone_later, "long", "non-DST", localename);
-
-                zone_118 = tz_118.getDisplayName(true, TimeZone.LONG, locales[j]);
-                zone_later = tz_later.getDisplayName(true, TimeZone.LONG, locales[j]);
-                check(id_118, id_later, zone_118, zone_later, "long", "DST", localename);
-            }
-        }
-    }
-
-    private static void check(String zoneID_118, String zoneID_later,
-                              String zonename_118, String zonename_later,
-                              String format, String dst, String loc) {
-        if (!zonename_118.equals(zonename_later)) {
-            System.err.println("JDK 118 TimeZone \"" + zoneID_118 +
-                "\" has a different " + format +
-                " display name from its equivalent timezone \"" +
-                zoneID_later + "\" in " + dst + " in " + loc + " locale.");
-            System.err.println("    Got: " + zonename_118 + ", Expected: " +
-                zonename_later);
-            err = true;
-        }
-    }
-
-}
diff --git a/jdk/test/java/util/TimeZone/TimeZoneTest.java b/jdk/test/java/util/TimeZone/TimeZoneTest.java
index 2413d15e8f5..789a0669f98 100644
--- a/jdk/test/java/util/TimeZone/TimeZoneTest.java
+++ b/jdk/test/java/util/TimeZone/TimeZoneTest.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 4028006 4044013 4096694 4107276 4107570 4112869 4130885 7039469 7126465 7158483
- *      8008577 8077685 8098547 8133321 8138716 8148446
+ *      8008577 8077685 8098547 8133321 8138716 8148446 8151876
  * @modules java.base/sun.util.resources
  * @library /java/text/testlib
  * @summary test TimeZone
diff --git a/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java b/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java
index 7283ce3d7b6..9d124ffb21d 100644
--- a/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java
+++ b/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
@@ -164,6 +164,10 @@ public class TestZoneInfo310 {
         }
 
         for (String zid : zids_new) {
+            if (zid.equals("Asia/Oral") || zid.equals("Asia/Qyzylorda")) {
+                // JDK-8157792 tracking this issue
+                continue;
+            }
             ZoneInfoOld zi = toZoneInfoOld(TimeZone.getTimeZone(zid));
             ZoneInfoOld ziOLD = (ZoneInfoOld)ZoneInfoOld.getTimeZone(zid);
             if (! zi.equalsTo(ziOLD)) {
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/VERSION b/jdk/test/sun/util/calendar/zi/tzdata/VERSION
index 55966f28162..5aaf0c58892 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/VERSION
+++ b/jdk/test/sun/util/calendar/zi/tzdata/VERSION
@@ -21,4 +21,4 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-tzdata2016a
+tzdata2016d
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/asia b/jdk/test/sun/util/calendar/zi/tzdata/asia
index 056a5f9c552..58b43e99655 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/asia
+++ b/jdk/test/sun/util/calendar/zi/tzdata/asia
@@ -102,13 +102,9 @@ Rule E-EurAsia	1979	1995	-	Sep	lastSun	 0:00	0	-
 Rule E-EurAsia	1996	max	-	Oct	lastSun	 0:00	0	-
 Rule RussiaAsia	1981	1984	-	Apr	1	 0:00	1:00	S
 Rule RussiaAsia	1981	1983	-	Oct	1	 0:00	0	-
-Rule RussiaAsia	1984	1991	-	Sep	lastSun	 2:00s	0	-
-Rule RussiaAsia	1985	1991	-	Mar	lastSun	 2:00s	1:00	S
-Rule RussiaAsia	1992	only	-	Mar	lastSat	23:00	1:00	S
-Rule RussiaAsia	1992	only	-	Sep	lastSat	23:00	0	-
-Rule RussiaAsia	1993	max	-	Mar	lastSun	 2:00s	1:00	S
-Rule RussiaAsia	1993	1995	-	Sep	lastSun	 2:00s	0	-
-Rule RussiaAsia	1996	max	-	Oct	lastSun	 2:00s	0	-
+Rule RussiaAsia	1984	1995	-	Sep	lastSun	 2:00s	0	-
+Rule RussiaAsia	1985	2011	-	Mar	lastSun	 2:00s	1:00	S
+Rule RussiaAsia	1996	2011	-	Oct	lastSun	 2:00s	0	-
 
 # Afghanistan
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -148,17 +144,26 @@ Zone	Asia/Yerevan	2:58:00 -	LMT	1924 May  2
 			3:00	1:00	YERST	1991 Sep 23 # independence
 			3:00 RussiaAsia	AM%sT	1995 Sep 24  2:00s
 			4:00	-	AMT	1997
-			4:00 RussiaAsia	AM%sT	2012 Mar 25  2:00s
+			4:00 RussiaAsia	AM%sT	2012 Feb  9
 			4:00	-	AMT
 
 # Azerbaijan
+
 # From Rustam Aliyev of the Azerbaijan Internet Forum (2005-10-23):
 # According to the resolution of Cabinet of Ministers, 1997
 # From Paul Eggert (2015-09-17): It was Resolution No. 21 (1997-03-17).
 # http://code.az/files/daylight_res.pdf
+
+# From Steffen Thorsen (2016-03-17):
+# ... the Azerbaijani Cabinet of Ministers has cancelled switching to
+# daylight saving time....
+# http://www.azernews.az/azerbaijan/94137.html
+# http://vestnikkavkaza.net/news/Azerbaijani-Cabinet-of-Ministers-cancels-daylight-saving-time.html
+# http://en.apa.az/xeber_azerbaijan_abolishes_daylight_savings_ti_240862.html
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Azer	1997	max	-	Mar	lastSun	 4:00	1:00	S
-Rule	Azer	1997	max	-	Oct	lastSun	 5:00	0	-
+Rule	Azer	1997	2015	-	Mar	lastSun	 4:00	1:00	S
+Rule	Azer	1997	2015	-	Oct	lastSun	 5:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Baku	3:19:24 -	LMT	1924 May  2
 			3:00	-	BAKT	1957 Mar    # Baku Time
@@ -1581,23 +1586,6 @@ Zone	Asia/Amman	2:23:44 -	LMT	1931
 
 # Kazakhstan
 
-# From Paul Eggert (1996-11-22):
-# Andrew Evtichov (1996-04-13) writes that Kazakhstan
-# stayed in sync with Moscow after 1990, and that Aqtobe (formerly Aktyubinsk)
-# and Aqtau (formerly Shevchenko) are the largest cities in their zones.
-# Guess that Aqtau and Aqtobe diverged in 1995, since that's the first time
-# IATA SSIM mentions a third time zone in Kazakhstan.
-
-# From Paul Eggert (2006-03-22):
-# German Iofis, ELSI, Almaty (2001-10-09) reports that Kazakhstan uses
-# RussiaAsia rules, instead of switching at 00:00 as the IATA has it.
-# Go with Shanks & Pottenger, who have them always using RussiaAsia rules.
-# Also go with the following claims of Shanks & Pottenger:
-#
-# - Kazakhstan did not observe DST in 1991.
-# - Qyzylorda switched from +5:00 to +6:00 on 1992-01-19 02:00.
-# - Oral switched from +5:00 to +4:00 in spring 1989.
-
 # From Kazakhstan Embassy's News Bulletin No. 11
 # <http://www.kazsociety.org.uk/news/2005/03/30.htm> (2005-03-21):
 # The Government of Kazakhstan passed a resolution March 15 abolishing
@@ -1614,61 +1602,232 @@ Zone	Asia/Amman	2:23:44 -	LMT	1931
 # everything else....  I guess that would make Kazakhstan time zones
 # de jure UTC+5 and UTC+6 respectively.
 
+# From Stepan Golosunov (2016-03-27) ([*] means see later comments below):
+# Review of the linked documents from http://adilet.zan.kz/
+# produced the following data for post-1991 Kazakhstan:
+#
+# 0. Act of the Cabinet of Ministers of the USSR
+# from 1991-02-04 No. 20
+# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102010545
+# removed the extra hour ("decree time") on the territory of the USSR
+# starting with the last Sunday of March 1991.
+# It also allowed (but not mandated) Kazakh SSR, Kirghiz SSR, Tajik SSR,
+# Turkmen SSR and Uzbek SSR to not have "summer" time.
+#
+# The 1992-01-13 act also refers to the act of the Cabinet of Ministers
+# of the Kazakh SSR from 1991-03-20 No. 170 "About the act of the Cabinet
+# of Ministers of the USSR from 1991-02-04 No. 20" but I didn't found its
+# text.
+#
+# According to Izvestia newspaper No. 68 (23334) from 1991-03-20
+# (page 6; available at http://libinfo.org/newsr/newsr2574.djvu via
+# http://libinfo.org/index.php?id=58564) on 1991-03-31 at 2:00 during
+# transition to "summer" time:
+# Republic of Georgia, Latvian SSR, Lithuanian SSR, SSR Moldova,
+# Estonian SSR; Komi ASSR; Kaliningrad oblast; Nenets autonomous okrug
+# were to move clocks 1 hour forward.
+# Kazakh SSR (excluding Uralsk oblast); Republic of Kyrgyzstan, Tajik
+# SSR; Andijan, Jizzakh, Namangan, Sirdarya, Tashkent, Fergana oblasts
+# of the Uzbek SSR were to move clocks 1 hour backwards.
+# Other territories were to not move clocks.
+# When the "summer" time would end on 1991-09-29, clocks were to be
+# moved 1 hour backwards on the territory of the USSR excluding
+# Kazakhstan, Kirghizia, Uzbekistan, Turkmenia, Tajikistan.
+#
+# Apparently there were last minute changes. Apparently Kazakh act No. 170
+# was one of such changes.
+#
+# https://ru.wikipedia.org/wiki/Декретное время
+# claims that Sovetskaya Rossiya newspaper on 1991-03-29 published that
+# Nenets autonomous okrug, Komi and Kazakhstan (excluding Uralsk oblast)
+# were to not move clocks and Uralsk oblast was to move clocks
+# forward; on 1991-09-29 Kazakhstan was to move clocks backwards.
+# (Probably there were changes even after that publication. There is an
+# article claiming that Kaliningrad oblast decided on 1991-03-29 to not
+# move clocks.)
+#
+# This implies that on 1991-03-31 Asia/Oral remained on +04/+05 while
+# the rest of Kazakhstan switched from +06/+07 to +05/06 or from +05/06
+# to +04/+05. It's unclear how Kzyl-Orda oblast moved into the fifth
+# time belt. (By switching from +04/+05 to +05/+06 on 1991-09-29?) ...
+#
+# 1. Act of the Cabinet of Ministers of the Republic of Kazakhstan
+# from 1992-01-13 No. 28
+# http://adilet.zan.kz/rus/docs/P920000028_
+# (text includes modification from the 1996 act)
+# introduced new rules for calculation of time, mirroring Russian
+# 1992-01-08 act.  It specified that time would be calculated
+# according to time belts plus extra hour ("decree time"), moved clocks
+# on the whole territory of Kazakhstan 1 hour forward on 1992-01-19 at
+# 2:00, specified DST rules.  It acknowledged that Kazakhstan was
+# located in the fourth and the fifth time belts and specified the
+# border between them to be located east of Kustanay and Aktyubinsk
+# oblasts (notably including Turgai and Kzyl-Orda oblasts into the fifth
+# time belt).
+#
+# This means switch on 1992-01-19 at 2:00 from +04/+05 to +05/+06 for
+# Asia/Aqtau, Asia/Aqtobe, Asia/Oral, Atyrau and Kustanay oblasts; from
+# +05/+06 to +06/+07 for Asia/Almaty and Asia/Qyzylorda (and Arkalyk) [*]....
+#
+# 2. Act of the Cabinet of Ministers of the Republic of Kazakhstan
+# from 1992-03-27 No. 284
+# http://adilet.zan.kz/rus/docs/P920000284_
+# cancels extra hour ("decree time") for Uralsk and Kzyl-Orda oblasts
+# since the last Sunday of March 1992, while keeping them in the fourth
+# and the fifth time belts respectively.
+#
+# 3. Order of the Prime Minister of the Republic of Kazakhstan
+# from 1994-09-23 No. 384
+# http://adilet.zan.kz/rus/docs/R940000384_
+# cancels the extra hour ("decree time") on the territory of Mangystau
+# oblast since the last Sunday of September 1994 (saying that time on
+# the territory would correspond to the third time belt as a
+# result)....
+#
+# 4. Act of the Government of the Republic of Kazakhstan
+# from 1996-05-08 No. 575
+# http://adilet.zan.kz/rus/docs/P960000575_
+# amends the 1992-01-13 act to end summer time in October instead
+# of September, mirroring identical Russian change from 1996-04-23 act.
+#
+# 5. Act of the Government of the Republic of Kazakhstan
+# from 1999-03-26 No. 305
+# http://adilet.zan.kz/rus/docs/P990000305_
+# cancels the extra hour ("decree time") for Atyrau oblast since the
+# last Sunday of March 1999 while retaining the oblast in the fourth
+# time belt.
+#
+# This means change from +05/+06 to +04/+05.
+#
+# There is no zone for Atyrau currently (listed under Asia/Aqtau in
+# zone1970.tab).[*]
+#
+# 6. Act of the Government of the Republic of Kazakhstan
+# from 2000-11-23 No. 1749
+# http://adilet.zan.kz/rus/archive/docs/P000001749_/23.11.2000
+# replaces the previous five documents.
+#
+# The only changes I noticed are in definition of the border between the
+# fourth and the fifth time belts.  They account for changes in spelling
+# and administrative division (splitting of Turgai oblast in 1997
+# probably changed time in territories incorporated into Kostanay oblast
+# (including Arkalyk) from +06/+07 to +05/+06) and move Kyzylorda oblast
+# from being in the fifth time belt and not using decree time into the
+# fourth time belt (no change in practice).[*]
+#
+# 7. Act of the Government of the Republic of Kazakhstan
+# from 2003-12-29 No. 1342
+# http://adilet.zan.kz/rus/docs/P030001342_
+# modified the 2000-11-23 act.  No relevant changes, apparently.
+#
+# 8. Act of the Government of the Republic of Kazakhstan
+# from 2004-07-20 No. 775
+# http://adilet.zan.kz/rus/archive/docs/P040000775_/20.07.2004
+# modified the 2000-11-23 act to move Kostanay and Kyzylorda oblasts into
+# the fifth time belt and add Aktobe oblast to the list of regions not
+# using extra hour ("decree time"), leaving Kazakhstan with only 2 time
+# zones (+04/+05 and +06/+07).  The changes were to be implemented
+# during DST transitions in 2004 and 2005 but the acts got radically
+# amended before implementation happened.
+#
+# 9. Act of the Government of the Republic of Kazakhstan
+# from 2004-09-15 No. 1059
+# http://adilet.zan.kz/rus/docs/P040001059_
+# modified the 2000-11-23 act to remove exceptions from the "decree time"
+# (leaving Kazakhstan in +05/+06 and +06/+07 zones), amended the
+# 2004-07-20 act to implement changes for Atyrau, West Kazakhstan,
+# Kostanay, Kyzylorda and Mangystau oblasts by not moving clocks
+# during the 2014 transition to "winter" time.
+#
+# This means transition from +04/+05 to +05/+06 for Atyrau oblast (no
+# zone currently), Asia/Oral, Asia/Aqtau and transition from +05/+06 to
+# +06/+07 for Kostanay oblast (Kostanay and Arkalyk, no zones currently)
+# and Asia/Qyzylorda on 2004-10-31 at 3:00....[*]
+#
+# 10. Act of the Government of the Republic of Kazakhstan
+# from 2005-03-15 No. 231
+# http://adilet.zan.kz/rus/docs/P050000231_
+# removes DST provisions from the 2000-11-23 act, removes most of the
+# (already implemented) provisions from the 2004-07-20 and 2004-09-15
+# acts, comes into effect 10 days after official publication.
+# The only practical effect seems to be the abolition of the summer
+# time.
+#
+# Unamended version of the act of the Government of the Russian Federation
+# No. 23 from 1992-01-08 [See 'europe' file for details].
+# Kazakh 1992-01-13 act appears to provide the same rules and 1992-03-27
+# act was to be enacted on the last Sunday of March 1992.
+
+# From Paul Eggert (2016-04-15):
+# The tables below should reflect Stepan Golosunov's remarks above,
+# except for the items marked "[*]" which I haven't gotten to yet.
+# It looks like we will need new zones Asia/Atyrau and Asia/Qostanay
+# to handle changes from 1992 through 2004 that we did not previously
+# know about.
+
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 #
 # Almaty (formerly Alma-Ata), representing most locations in Kazakhstan
+# This includes KZ-AKM, KZ-ALA, KZ-ALM, KZ-AST, KZ-BAY, KZ-VOS, KZ-ZHA,
+# KZ-KAR, KZ-SEV, KZ-PAV, and KZ-YUZ.
 Zone	Asia/Almaty	5:07:48 -	LMT	1924 May  2 # or Alma-Ata
-			5:00	-	ALMT	1930 Jun 21 # Alma-Ata Time
-			6:00 RussiaAsia ALM%sT	1991
-			6:00	-	ALMT	1992
-			6:00 RussiaAsia	ALM%sT	2005 Mar 15
-			6:00	-	ALMT
-# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.)
+			5:00	-	+05	1930 Jun 21
+			6:00 RussiaAsia +06/+07	1991 Mar 31  2:00s
+			5:00 RussiaAsia	+05/+06	1992 Jan 19  2:00s
+			6:00 RussiaAsia	+06/+07	2004 Oct 31  2:00s
+			6:00	-	+06
+# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-KZY)
 Zone	Asia/Qyzylorda	4:21:52 -	LMT	1924 May  2
-			4:00	-	KIZT	1930 Jun 21 # Kizilorda Time
-			5:00	-	KIZT	1981 Apr  1
-			5:00	1:00	KIZST	1981 Oct  1
-			6:00	-	KIZT	1982 Apr  1
-			5:00 RussiaAsia	KIZ%sT	1991
-			5:00	-	KIZT	1991 Dec 16 # independence
-			5:00	-	QYZT	1992 Jan 19  2:00
-			6:00 RussiaAsia	QYZ%sT	2005 Mar 15
-			6:00	-	QYZT
-# Aqtobe (aka Aktobe, formerly Aktyubinsk)
+			4:00	-	+04	1930 Jun 21
+			5:00	-	+05	1981 Apr  1
+			5:00	1:00	+06	1981 Oct  1
+			6:00	-	+06	1982 Apr  1
+			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
+			4:00 RussiaAsia	+04/+05	1991 Sep 29  2:00s
+			5:00 RussiaAsia	+05/+06	1992 Jan 19  2:00s
+			6:00 RussiaAsia	+06/+07	1992 Mar 29  2:00s
+			5:00 RussiaAsia	+05/+06	2004 Oct 31  2:00s
+			6:00	-	+06
+# Aqtobe (aka Aktobe, formerly Aktyubinsk) (KZ-AKT)
 Zone	Asia/Aqtobe	3:48:40	-	LMT	1924 May  2
-			4:00	-	AKTT	1930 Jun 21 # Aktyubinsk Time
-			5:00	-	AKTT	1981 Apr  1
-			5:00	1:00	AKTST	1981 Oct  1
-			6:00	-	AKTT	1982 Apr  1
-			5:00 RussiaAsia	AKT%sT	1991
-			5:00	-	AKTT	1991 Dec 16 # independence
-			5:00 RussiaAsia	AQT%sT	2005 Mar 15 # Aqtobe Time
-			5:00	-	AQTT
-# Mangghystau
+			4:00	-	+04	1930 Jun 21
+			5:00	-	+05	1981 Apr  1
+			5:00	1:00	+06	1981 Oct  1
+			6:00	-	+06	1982 Apr  1
+			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
+			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
+			5:00 RussiaAsia	+05/+06	2004 Oct 31  2:00s
+			5:00	-	+05
+# Qostanay (KZ-KUS)
+
+# Mangghystau (KZ-MAN)
 # Aqtau was not founded until 1963, but it represents an inhabited region,
 # so include time stamps before 1963.
 Zone	Asia/Aqtau	3:21:04	-	LMT	1924 May  2
-			4:00	-	FORT	1930 Jun 21 # Fort Shevchenko T
-			5:00	-	FORT	1963
-			5:00	-	SHET	1981 Oct  1 # Shevchenko Time
-			6:00	-	SHET	1982 Apr  1
-			5:00 RussiaAsia	SHE%sT	1991
-			5:00	-	SHET	1991 Dec 16 # independence
-			5:00 RussiaAsia	AQT%sT	1995 Mar lastSun  2:00 # Aqtau Time
-			4:00 RussiaAsia	AQT%sT	2005 Mar 15
-			5:00	-	AQTT
-# West Kazakhstan
+			4:00	-	+04	1930 Jun 21
+			5:00	-	+05	1963
+			5:00	-	+05	1981 Oct  1
+			6:00	-	+06	1982 Apr  1
+			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
+			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
+			5:00 RussiaAsia	+05/+06	1994 Sep 25  2:00s
+			4:00 RussiaAsia	+04/+05	2004 Oct 31  2:00s
+			5:00	-	+05
+
+# West Kazakhstan (KZ-ZAP)
+# From Paul Eggert (2016-03-18):
+# The 1989 transition is from USSR act No. 227 (1989-03-14).
 Zone	Asia/Oral	3:25:24	-	LMT	1924 May  2 # or Ural'sk
-			4:00	-	URAT	1930 Jun 21 # Ural'sk time
-			5:00	-	URAT	1981 Apr  1
-			5:00	1:00	URAST	1981 Oct  1
-			6:00	-	URAT	1982 Apr  1
-			5:00 RussiaAsia	URA%sT	1989 Mar 26  2:00
-			4:00 RussiaAsia	URA%sT	1991
-			4:00	-	URAT	1991 Dec 16 # independence
-			4:00 RussiaAsia	ORA%sT	2005 Mar 15 # Oral Time
-			5:00	-	ORAT
+			4:00	-	+04	1930 Jun 21
+			5:00	-	+05	1981 Apr  1
+			5:00	1:00	+06	1981 Oct  1
+			6:00	-	+06	1982 Apr  1
+			5:00 RussiaAsia	+05/+06	1989 Mar 26  2:00s
+			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
+			5:00 RussiaAsia	+05/+06	1992 Mar 29  2:00s
+			4:00 RussiaAsia	+04/+05	2004 Oct 31  2:00s
+			5:00	-	+05
 
 # Kyrgyzstan (Kirgizstan)
 # Transitions through 1991 are from Shanks & Pottenger.
@@ -2419,6 +2578,16 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
 # http://www.timeanddate.com/time/change/gaza-strip/gaza
 # http://www.timeanddate.com/time/change/west-bank/hebron
 
+# From Hannah Kreitem (2016-03-09):
+# http://www.palestinecabinet.gov.ps/WebSite/ar/ViewDetails?ID=31728
+# [Google translation]: "The Council also decided to start daylight
+# saving in Palestine as of one o'clock on Saturday morning,
+# 2016-03-26, to provide the clock 60 minutes ahead."
+#
+# From Paul Eggert (2016-03-12):
+# Predict spring transitions on March's last Saturday at 01:00 from now on.
+# Leave fall predictions alone for now.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
 Rule EgyptAsia	1957	1958	-	Oct	 1	0:00	0	-
@@ -2447,7 +2616,8 @@ Rule Palestine	2012	2014	-	Mar	lastThu	24:00	1:00	S
 Rule Palestine	2012	only	-	Sep	21	1:00	0	-
 Rule Palestine	2013	only	-	Sep	Fri>=21	0:00	0	-
 Rule Palestine	2014	max	-	Oct	Fri>=21	0:00	0	-
-Rule Palestine	2015	max	-	Mar	lastFri	24:00	1:00	S
+Rule Palestine	2015	only	-	Mar	lastFri	24:00	1:00	S
+Rule Palestine	2016	max	-	Mar	lastSat	1:00	1:00	S
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/australasia b/jdk/test/sun/util/calendar/zi/tzdata/australasia
index 09afef2d401..929124cc048 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/australasia
+++ b/jdk/test/sun/util/calendar/zi/tzdata/australasia
@@ -83,6 +83,14 @@ Zone Australia/Eucla	 8:35:28 -	LMT	1895 Dec
 # Hamilton is the largest, but there is also a Hamilton in Victoria,
 # so use Lindeman.
 #
+# From J William Piggott (2016-02-20):
+# There is no location named Holiday Islands in Queensland Australia; holiday
+# islands is a colloquial term used globally.  Hayman and Lindeman are at the
+# north and south extremes of the Whitsunday Islands archipelago, and
+# Hamilton is in between; it is reasonable to believe that this time zone
+# applies to all of the Whitsundays.
+# http://www.australia.gov.au/about-australia/australian-story/austn-islands
+#
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	AQ	1971	only	-	Oct	lastSun	2:00s	1:00	D
 Rule	AQ	1972	only	-	Feb	lastSun	2:00s	0	S
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/europe b/jdk/test/sun/util/calendar/zi/tzdata/europe
index 267992150ce..00a9fffa39d 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/europe
+++ b/jdk/test/sun/util/calendar/zi/tzdata/europe
@@ -623,16 +623,40 @@ Rule	Russia	1981	1984	-	Apr	 1	 0:00	1:00	S
 Rule	Russia	1981	1983	-	Oct	 1	 0:00	0	-
 # Act No. 967 of the Council of Ministers of the USSR (1984-09-13), repeated in
 # Act No. 227 of the Council of Ministers of the USSR (1989-03-14):
-Rule	Russia	1984	1991	-	Sep	lastSun	 2:00s	0	-
-Rule	Russia	1985	1991	-	Mar	lastSun	 2:00s	1:00	S
+Rule	Russia	1984	1995	-	Sep	lastSun	 2:00s	0	-
+Rule	Russia	1985	2010	-	Mar	lastSun	 2:00s	1:00	S
 #
-Rule	Russia	1992	only	-	Mar	lastSat	 23:00	1:00	S
-Rule	Russia	1992	only	-	Sep	lastSat	 23:00	0	-
-Rule	Russia	1993	2010	-	Mar	lastSun	 2:00s	1:00	S
-Rule	Russia	1993	1995	-	Sep	lastSun	 2:00s	0	-
 Rule	Russia	1996	2010	-	Oct	lastSun	 2:00s	0	-
 # As described below, Russia's 2014 change affects Zone data, not Rule data.
 
+# From Stepan Golosunov (2016-03-07):
+# Wikipedia and other sources refer to the Act of the Council of
+# Ministers of the USSR from 1988-01-04 No. 5 and the Act of the
+# Council of Ministers of the USSR from 1989-03-14 No. 227.
+#
+# I did not find full texts of these acts.  For the 1989 one we have
+# title at http://base.garant.ru/70754136/ :
+# "About change in calculation of time on the territories of
+# Lithuanian SSR, Latvian SSR and Estonian SSR, Astrakhan,
+# Kaliningrad, Kirov, Kuybyshev, Ulyanovsk and Uralsk oblasts".
+# And http://astrozet.net/files/Zones/DOC/RU/1980-925.txt appears to
+# contain quotes from both acts: Since last Sunday of March 1988 rules
+# of the second time belt are installed in Volgograd and Saratov
+# oblasts.  Since last Sunday of March 1989:
+# a) Lithuanian SSR, Latvian SSR, Estonian SSR, Kaliningrad oblast:
+# second time belt rules without extra hour (Moscow-1);
+# b) Astrakhan, Kirov, Kuybyshev, Ulyanovsk oblasts: second time belt
+# rules (Moscow time)
+# c) Uralsk oblast: third time belt rules (Moscow+1).
+
+# From Stepan Golosunov (2016-03-27):
+# Unamended version of the act of the
+# Government of the Russian Federation No. 23 from 08.01.1992
+# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102014034&rdk=0
+# says that every year clocks were to be moved forward on last Sunday
+# of March at 2 hours and moved backwards on last Sunday of September
+# at 3 hours.  It was amended in 1996 to replace September with October.
+
 # From Alexander Krivenyshev (2011-06-14):
 # According to Kremlin press service, Russian President Dmitry Medvedev
 # signed a federal law "On calculation of time" on June 9, 2011.
@@ -1028,6 +1052,12 @@ Zone Atlantic/Faroe	-0:27:04 -	LMT	1908 Jan 11 # Tórshavn
 # startkart.no says Thule does not observe DST, but this is clearly an error,
 # so go with Shanks & Pottenger for Thule transitions until this year.
 # For 2007 on assume Thule will stay in sync with US DST rules.
+
+# From J William Piggott (2016-02-20):
+# "Greenland north of the community of Scoresbysund" is officially named
+# "National Park" by Executive Order:
+# http://naalakkersuisut.gl/~/media/Nanoq/Files/Attached%20Files/Engelske-tekster/Legislation/Executive%20Order%20National%20Park.rtf
+# It is their only National Park.
 #
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Thule	1991	1992	-	Mar	lastSun	2:00	1:00	D
@@ -1053,6 +1083,10 @@ Zone America/Thule	-4:35:08 -	LMT	1916 Jul 28 # Pituffik air base
 			-4:00	Thule	A%sT
 
 # Estonia
+#
+# From Paul Eggert (2016-03-18):
+# The 1989 transition is from USSR act No. 227 (1989-03-14).
+#
 # From Peter Ilieve (1994-10-15):
 # A relative in Tallinn confirms the accuracy of the data for 1989 onwards
 # [through 1994] and gives the legal authority for it,
@@ -1646,6 +1680,9 @@ Link Europe/Zurich Europe/Vaduz
 
 # Lithuania
 
+# From Paul Eggert (2016-03-18):
+# The 1989 transition is from USSR act No. 227 (1989-03-14).
+
 # From Paul Eggert (1996-11-22):
 # IATA SSIM (1992/1996) says Lithuania uses W-Eur rules, but since it is
 # known to be wrong about Estonia and Latvia, assume it's wrong here too.
@@ -1685,8 +1722,8 @@ Zone	Europe/Vilnius	1:41:16	-	LMT	1880
 			1:00	-	CET	1940 Aug  3
 			3:00	-	MSK	1941 Jun 24
 			1:00	C-Eur	CE%sT	1944 Aug
-			3:00	Russia	MSK/MSD	1991 Mar 31  2:00s
-			2:00	1:00	EEST	1991 Sep 29  2:00s
+			3:00	Russia	MSK/MSD	1989 Mar 26  2:00s
+			2:00	Russia	EE%sT	1991 Sep 29  2:00s
 			2:00	C-Eur	EE%sT	1998
 			2:00	-	EET	1998 Mar 29  1:00u
 			1:00	EU	CE%sT	1999 Oct 31  1:00u
@@ -1751,6 +1788,16 @@ Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov  2  0:00s # Valletta
 
 # Moldova
 
+# From Stepan Golosunov (2016-03-07):
+# the act of the government of the Republic of Moldova Nr. 132 from 1990-05-04
+# http://lex.justice.md/viewdoc.php?action=view&view=doc&id=298782&lang=2
+# ... says that since 1990-05-06 on the territory of the Moldavian SSR
+# time would be calculated as the standard time of the second time belt
+# plus one hour of the "summer" time. To implement that clocks would be
+# adjusted one hour backwards at 1990-05-06 2:00. After that "summer"
+# time would be cancelled last Sunday of September at 3:00 and
+# reintroduced last Sunday of March at 2:00.
+
 # From Paul Eggert (2006-03-22):
 # A previous version of this database followed Shanks & Pottenger, who write
 # that Tiraspol switched to Moscow time on 1992-01-19 at 02:00.
@@ -1809,9 +1856,7 @@ Zone	Europe/Chisinau	1:55:20 -	LMT	1880
 			2:00	Romania	EE%sT	1940 Aug 15
 			2:00	1:00	EEST	1941 Jul 17
 			1:00	C-Eur	CE%sT	1944 Aug 24
-			3:00	Russia	MSK/MSD	1990
-			3:00	-	MSK	1990 May 6
-			2:00	-	EET	1991
+			3:00	Russia	MSK/MSD	1990 May  6  2:00
 			2:00	Russia	EE%sT	1992
 			2:00	E-Eur	EE%sT	1997
 # See Romania commentary for the guessed 1997 transition to EU rules.
@@ -2289,16 +2334,32 @@ Zone Europe/Bucharest	1:44:24 -	LMT	1891 Oct
 # Europe/Kaliningrad covers...
 # 39	RU-KGD	Kaliningrad Oblast
 
+# From Paul Eggert (2016-03-18):
+# The 1989 transition is from USSR act No. 227 (1989-03-14).
+
+# From Stepan Golosunov (2016-03-07):
+# http://www.rgo.ru/ru/kaliningradskoe-oblastnoe-otdelenie/ob-otdelenii/publikacii/kak-nam-zhilos-bez-letnego-vremeni
+# confirms that the 1989 change to Moscow-1 was implemented.
+# (The article, though, is misattributed to 1990 while saying that
+# summer->winter transition would be done on the 24 of September. But
+# 1990-09-24 was Monday, while 1989-09-24 was Sunday as expected.)
+# ...
+# http://www.kaliningradka.ru/site_pc/cherez/index.php?ELEMENT_ID=40091
+# says that Kaliningrad switched to Moscow-1 on 1989-03-26, avoided
+# at the last moment switch to Moscow-1 on 1991-03-31, switched to
+# Moscow on 1991-11-03, switched to Moscow-1 on 1992-01-19.
+
 Zone Europe/Kaliningrad	 1:22:00 -	LMT	1893 Apr
 			 1:00	C-Eur	CE%sT	1945
 			 2:00	Poland	CE%sT	1946
-			 3:00	Russia	MSK/MSD	1991 Mar 31  2:00s
+			 3:00	Russia	MSK/MSD	1989 Mar 26  2:00s
 			 2:00	Russia	EE%sT	2011 Mar 27  2:00s
 			 3:00	-	FET	2014 Oct 26  2:00s
 			 2:00	-	EET
 
 
-# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
+# From Paul Eggert (2016-02-21), per Tim Parenti (2014-07-03) and
+# Oscar van Vlijmen (2001-08-25):
 # Europe/Moscow covers...
 # 01	RU-AD	Adygea, Republic of
 # 05	RU-DA	Dagestan, Republic of
@@ -2341,12 +2402,92 @@ Zone Europe/Kaliningrad	 1:22:00 -	LMT	1893 Apr
 # 68	RU-TAM	Tambov Oblast
 # 69	RU-TVE	Tver Oblast
 # 71	RU-TUL	Tula Oblast
-# 73	RU-ULY	Ulyanovsk Oblast
 # 76	RU-YAR	Yaroslavl Oblast
 # 77	RU-MOW	Moscow
 # 78	RU-SPE	Saint Petersburg
 # 83	RU-NEN	Nenets Autonomous Okrug
 
+# From Stepan Golosunov (2016-03-07):
+# 11. Regions-violators, 1981-1982.
+# Wikipedia refers to
+# http://maps.monetonos.ru/maps/raznoe/Old_Maps/Old_Maps/Articles/022/3_1981.html
+# http://besp.narod.ru/nauka_1981_3.htm
+#
+# The second link provides two articles scanned from the Nauka i Zhizn
+# magazine No. 3, 1981 and a scan of the short article attributed to
+# the Trud newspaper from February 1982.  The first link provides the
+# same Nauka i Zhizn articles converted to the text form (but misses
+# time belt changes map).
+#
+# The second Nauka i Zhizn article says that in addition to
+# introduction of summer time on 1981-04-01 there are some time belt
+# border changes on 1981-10-01, mostly affecting Nenets Autonomous
+# Okrug, Krasnoyarsk Krai, Yakutia, Magadan Oblast and Chukotka
+# according to the provided map (colored one).  In addition to that
+# "time violators" (regions which were not using rules of the time
+# belts in which they were located) would not be moving off the DST on
+# 1981-10-01 to restore the decree time usage.  (Komi ASSR was
+# supposed to repeat that move in October 1982 to account for the 2
+# hour difference.)  Map depicting "time violators" before 1981-10-01
+# is also provided.
+#
+# The article from Trud says that 1981-10-01 changes caused problems
+# and some territories would be moved to pre-1981-10-01 time by not
+# moving to summer time on 1982-04-01.  Namely: Dagestan,
+# Kabardino-Balkar, Kalmyk, Komi, Mari, Mordovian, North Ossetian,
+# Tatar, Chechen-Ingush and Chuvash ASSR, Krasnodar and Stavropol
+# krais, Arkhangelsk, Vladimir, Vologda, Voronezh, Gorky, Ivanovo,
+# Kostroma, Lipetsk, Penza, Rostov, Ryazan, Tambov, Tyumen and
+# Yaroslavl oblasts, Nenets and Evenk autonomous okrugs, Khatangsky
+# district of Taymyr Autonomous Okrug.  As a result Evenk Autonomous
+# Okrug and Khatangsky district of Taymyr Autonomous Okrug would end
+# up on Moscow+4, Tyumen Oblast on Moscow+2 and the rest on Moscow
+# time.
+#
+# http://astrozet.net/files/Zones/DOC/RU/1980-925.txt
+# attributes the 1982 changes to the Act of the Council of Ministers
+# of the USSR No. 126 from 18.02.1982.  1980-925.txt also adds
+# Udmurtia to the list of affected territories and lists Khatangsky
+# district separately from Taymyr Autonomous Okurg.  Probably erroneously.
+#
+# The affected territories are currently listed under Europe/Moscow,
+# Asia/Yekaterinburg and Asia/Krasnoyarsk.
+#
+# 12. Udmurtia
+# The fact that Udmurtia is depicted as a violator in the Nauka i
+# Zhizn article hints at Izhevsk being on different time from
+# Kuybyshev before 1981-10-01. Udmurtia is not mentioned in the 1989 act.
+# http://astrozet.net/files/Zones/DOC/RU/1980-925.txt
+# implies Udmurtia was on Moscow time after 1982-04-01.
+# Wikipedia implies Udmurtia being on Moscow+1 until 1991.
+#
+# ...
+#
+# All Russian zones are supposed to have by default a -1 change at
+# 1991-03-31 2:00 (cancellation of the decree time in the USSR) and a +1
+# change at 1992-01-19 2:00 (restoration of the decree time in Russia).
+#
+# There were some exceptions, though.
+# Wikipedia says newspapers listed Astrakhan, Saratov, Kirov, Volgograd,
+# Izhevsk, Grozny, Kazan and Samara as such exceptions for the 1992
+# change. (Different newspapers providing different lists. And some
+# lists found in the internet are quite wild.)
+#
+# And apparently some exceptions were reverted in the last moment.
+# http://www.kaliningradka.ru/site_pc/cherez/index.php?ELEMENT_ID=40091
+# says that Kaliningrad decided not to be an exception 2 days before the
+# 1991-03-31 switch and one person at
+# http://izhevsk.ru/forum_light_message/50/682597-m8369040.html
+# says he remembers that Samara opted out of the 1992-01-19 exception
+# 2 days before the switch.
+#
+#
+# From Paul Eggert (2016-03-18):
+# Given the above, we appear to be missing some Zone entries for the
+# chaotic early 1980s in Russia.  It's not clear what these entries
+# should be.  For now, sweep this under the rug and just document the
+# time in Moscow.
+
 # From Vladimir Karpinsky (2014-07-08):
 # LMT in Moscow (before Jul 3, 1916) is 2:30:17, that was defined by Moscow
 # Observatory (coordinates: 55 deg. 45'29.70", 37 deg. 34'05.30")....
@@ -2420,47 +2561,102 @@ Zone Europe/Simferopol	 2:16:24 -	LMT	1880
 			 3:00	-	MSK
 
 
-# From Tim Parenti (2014-07-03):
-# Europe/Volgograd covers...
+# From Paul Eggert (2016-03-18):
+# Europe/Astrakhan covers:
 # 30	RU-AST	Astrakhan Oblast
-# 34	RU-VGG	Volgograd Oblast
-# 43	RU-KIR	Kirov Oblast
-# 64	RU-SAR	Saratov Oblast
+#
+# The 1989 transition is from USSR act No. 227 (1989-03-14).
 
-# From Paul Eggert (2006-05-09):
-# Shanks & Pottenger say Kirov is still at +0400 but Wikipedia says +0300.
-# Perhaps it switched after the others?  But we have no data.
+# From Alexander Krivenyshev (2016-01-12):
+# On February 10, 2016 Astrakhan Oblast got approval by the Federation
+# Council to change its time zone to UTC+4 (from current UTC+3 Moscow time)....
+# This Federal Law shall enter into force on 27 March 2016 at 02:00.
+# From Matt Johnson (2016-03-09):
+# http://publication.pravo.gov.ru/Document/View/0001201602150056
+
+Zone Europe/Astrakhan	 3:12:12 -	LMT	1924 May
+			 3:00	-	+03	1930 Jun 21
+			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
+			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
+			 4:00	-	+04	1992 Mar 29  2:00s
+			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
+			 4:00	-	+04	2014 Oct 26  2:00s
+			 3:00	-	+03	2016 Mar 27  2:00s
+			 4:00	-	+04
+
+# From Paul Eggert (2016-03-18):
+# Europe/Volgograd covers:
+# 34	RU-VGG	Volgograd Oblast
+# 64	RU-SAR	Saratov Oblast
+# The 1988 transition is from USSR act No. 5 (1988-01-04).
 
 Zone Europe/Volgograd	 2:57:40 -	LMT	1920 Jan  3
 			 3:00	-	TSAT	1925 Apr  6 # Tsaritsyn Time
 			 3:00	-	STAT	1930 Jun 21 # Stalingrad Time
 			 4:00	-	STAT	1961 Nov 11
-			 4:00	Russia	VOL%sT	1989 Mar 26  2:00s # Volgograd T
+			 4:00	Russia	VOL%sT	1988 Mar 27  2:00s # Volgograd T
 			 3:00	Russia	VOL%sT	1991 Mar 31  2:00s
 			 4:00	-	VOLT	1992 Mar 29  2:00s
 			 3:00	Russia	MSK/MSD	2011 Mar 27  2:00s
 			 4:00	-	MSK	2014 Oct 26  2:00s
 			 3:00	-	MSK
 
+# From Paul Eggert (2016-03-18):
+# Europe/Kirov covers:
+# 43	RU-KIR	Kirov Oblast
+# The 1989 transition is from USSR act No. 227 (1989-03-14).
+#
+Zone Europe/Kirov	 3:18:48 -	LMT	1919 Jul  1  2:00
+			 3:00	-	+03	1930 Jun 21
+			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
+			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
+			 4:00	-	+04	1992 Mar 29  2:00s
+			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
+			 4:00	-	+04	2014 Oct 26  2:00s
+			 3:00	-	+03
 
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
 # Europe/Samara covers...
 # 18	RU-UD	Udmurt Republic
 # 63	RU-SAM	Samara Oblast
 
+# From Paul Eggert (2016-03-18):
 # Byalokoz 1919 says Samara was 3:20:20.
+# The 1989 transition is from USSR act No. 227 (1989-03-14).
 
 Zone Europe/Samara	 3:20:20 -	LMT	1919 Jul  1  2:00
-			 3:00	-	SAMT	1930 Jun 21
+			 3:00	-	SAMT	1930 Jun 21 # Samara Time
 			 4:00	-	SAMT	1935 Jan 27
 			 4:00	Russia	KUY%sT	1989 Mar 26  2:00s # Kuybyshev
 			 3:00	Russia	MSK/MSD	1991 Mar 31  2:00s
 			 2:00	Russia	EE%sT	1991 Sep 29  2:00s
-			 3:00	-	KUYT	1991 Oct 20  3:00
-			 4:00	Russia	SAM%sT	2010 Mar 28  2:00s # Samara Time
+			 3:00	-	SAMT	1991 Oct 20  3:00
+			 4:00	Russia	SAM%sT	2010 Mar 28  2:00s
 			 3:00	Russia	SAM%sT	2011 Mar 27  2:00s
 			 4:00	-	SAMT
 
+# From Paul Eggert (2016-03-18):
+# Europe/Ulyanovsk covers:
+# 73	RU-ULY	Ulyanovsk Oblast
+
+# The 1989 transition is from USSR act No. 227 (1989-03-14).
+
+# From Alexander Krivenyshev (2016-02-17):
+# Ulyanovsk ... on their way to change time zones by March 27, 2016 at 2am.
+# Ulyanovsk Oblast ... from MSK to MSK+1 (UTC+3 to UTC+4) ...
+# 920582-6 ... 02/17/2016 The State Duma passed the bill in the first reading.
+# From Matt Johnson (2016-03-09):
+# http://publication.pravo.gov.ru/Document/View/0001201603090051
+
+Zone Europe/Ulyanovsk	 3:13:36 -	LMT	1919 Jul  1  2:00
+			 3:00	-	+03	1930 Jun 21
+			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
+			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
+			 2:00	Russia	+02/+03	1992 Jan 19  2:00s
+			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
+			 4:00	-	+04	2014 Oct 26  2:00s
+			 3:00	-	+03	2016 Mar 27  2:00s
+			 4:00	-	+04
 
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
 # Asia/Yekaterinburg covers...
@@ -2494,8 +2690,6 @@ Zone Asia/Yekaterinburg	 4:02:33 -	LMT	1916 Jul  3
 
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
 # Asia/Omsk covers...
-# 04	RU-AL	Altai Republic
-# 22	RU-ALT	Altai Krai
 # 55	RU-OMS	Omsk Oblast
 
 # Byalokoz 1919 says Omsk was 4:53:30.
@@ -2508,14 +2702,49 @@ Zone Asia/Omsk		 4:53:30 -	LMT	1919 Nov 14
 			 7:00	-	OMST	2014 Oct 26  2:00s
 			 6:00	-	OMST
 
+# From Paul Eggert (2016-02-22):
+# Asia/Barnaul covers:
+# 04	RU-AL	Altai Republic
+# 22	RU-ALT	Altai Krai
 
-# From Tim Parenti (2014-07-03):
-# Asia/Novosibirsk covers...
+# Data before 1991 are from Shanks & Pottenger.
+
+# From Stepan Golosunov (2016-03-07):
+# Letter of Bank of Russia from 1995-05-25
+# http://www.bestpravo.ru/rossijskoje/lj-akty/y3a.htm
+# suggests that Altai Republic transitioned to Moscow+3 on
+# 1995-05-28.
+#
+# http://regnum.ru/news/society/1957270.html
+# has some historical data for Altai Krai:
+# before 1957: west part on UTC+6, east on UTC+7
+# after 1957: UTC+7
+# since 1995: UTC+6
+# http://barnaul.rusplt.ru/index/pochemu_altajskij_kraj_okazalsja_v_neprivychnom_chasovom_pojase-17648.html
+# confirms that and provides more details including 1995-05-28 transition date.
+
+# From Alexander Krivenyshev (2016-02-17):
+# Altai Krai and Altai Republic on their way to change time zones
+# by March 27, 2016 at 2am....
+# Altai Republic / Gorno-Altaysk MSK+3 to MSK+4 (UTC+6 to UTC+7) ...
+# Altai Krai / Barnaul MSK+3 to MSK+4 (UTC+6 to UTC+7)
+# From Matt Johnson (2016-03-09):
+# http://publication.pravo.gov.ru/Document/View/0001201603090043
+# http://publication.pravo.gov.ru/Document/View/0001201603090038
+
+Zone Asia/Barnaul	 5:35:00 -	LMT	1919 Dec 10
+			 6:00	-	+06	1930 Jun 21
+			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
+			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
+			 7:00	Russia	+07/+08	1995 May 28
+			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
+			 7:00	-	+07	2014 Oct 26  2:00s
+			 6:00	-	+06	2016 Mar 27  2:00s
+			 7:00	-	+07
+
+# From Paul Eggert (2016-03-18):
+# Asia/Novosibirsk covers:
 # 54	RU-NVS	Novosibirsk Oblast
-# 70	RU-TOM	Tomsk Oblast
-
-# From Paul Eggert (2006-08-19): I'm guessing about Tomsk here; it's
-# not clear when it switched from +7 to +6.
 
 Zone Asia/Novosibirsk	 5:31:40 -	LMT	1919 Dec 14  6:00
 			 6:00	-	NOVT	1930 Jun 21 # Novosibirsk Time
@@ -2526,6 +2755,55 @@ Zone Asia/Novosibirsk	 5:31:40 -	LMT	1919 Dec 14  6:00
 			 7:00	-	NOVT	2014 Oct 26  2:00s
 			 6:00	-	NOVT
 
+# From Paul Eggert (2016-03-18):
+# Asia/Tomsk covers:
+# 70	RU-TOM	Tomsk Oblast
+
+# From Stepan Golosunov (2016-03-24):
+# Byalokoz listed Tomsk at 5:39:51.
+
+# From Stanislaw A. Kuzikowski (1994-06-29):
+# Tomsk is still 4 hours ahead of Moscow.
+
+# From Stepan Golosunov (2016-03-19):
+# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102075743
+# (fifth time belt being UTC+5+1(decree time)
+# / UTC+5+1(decree time)+1(summer time)) ...
+# Note that time belts (numbered from 2 (Moscow) to 12 according to their
+# GMT/UTC offset and having too many exceptions like regions formally
+# belonging to one belt but using time from another) were replaced
+# with time zones in 2011 with different numberings (there was a
+# 2-hour gap between second and third zones in 2011-2014).
+
+# From Stepan Golosunov (2016-04-12):
+# http://asozd2.duma.gov.ru/main.nsf/(SpravkaNew)?OpenAgent&RN=1006865-6
+# This bill was approved in the first reading today.  It moves Tomsk oblast
+# from UTC+6 to UTC+7 and is supposed to come into effect on 2016-05-29 at
+# 2:00.  The bill needs to be approved in the second and the third readings by
+# the State Duma, approved by the Federation Council, signed by the President
+# and published to become a law.  Minor changes in the text are to be expected
+# before the second reading (references need to be updated to account for the
+# recent changes).
+#
+# Judging by the ultra-short one-day amendments period, recent similar laws,
+# the State Duma schedule and the Federation Council schedule
+# http://www.duma.gov.ru/legislative/planning/day-shedule/por_vesna_2016/
+# http://council.gov.ru/activity/meetings/schedule/63303
+# I speculate that the final text of the bill will be proposed tomorrow, the
+# bill will be approved in the second and the third readings on Friday,
+# approved by the Federation Council on 2016-04-20, signed by the President and
+# published as a law around 2016-04-26.
+
+Zone	Asia/Tomsk	 5:39:51 -	LMT	1919 Dec 22
+			 6:00	-	+06	1930 Jun 21
+			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
+			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
+			 7:00	Russia	+07/+08	2002 May  1  3:00
+			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
+			 7:00	-	+07	2014 Oct 26  2:00s
+			 6:00	-	+06	2016 May 29  2:00s
+			 7:00	-	+07
+
 
 # From Tim Parenti (2014-07-03):
 # Asia/Novokuznetsk covers...
@@ -2549,9 +2827,6 @@ Zone Asia/Novosibirsk	 5:31:40 -	LMT	1919 Dec 14  6:00
 #
 # Thus, when Russia will switch to DST on the night of March 28, 2010
 # Kemerovo region (Kemerovo oblast') will not change the clock.
-#
-# As a result, Kemerovo oblast' will be in the same time zone as
-# Novosibirsk, Omsk, Tomsk, Barnaul and Altai Republic.
 
 # From Tim Parenti (2014-07-02), per Alexander Krivenyshev (2014-07-02):
 # The Kemerovo region will remain at UTC+7 through the 2014-10-26 change, thus
@@ -2620,7 +2895,7 @@ Zone Asia/Irkutsk	 6:57:05 -	LMT	1880
 # [The] time zone in the Trans-Baikal Territory (Zabaykalsky Krai) -
 # Asia/Chita [is changing] from UTC+8 to UTC+9.  Effective date will
 # be March 27, 2016 at 2:00am....
-# http://publication.pravo.gov.ru/Document/View/000120151230010
+# http://publication.pravo.gov.ru/Document/View/0001201512300107
 
 Zone Asia/Chita	 7:33:52 -	LMT	1919 Dec 15
 			 8:00	-	YAKT	1930 Jun 21 # Yakutsk Time
@@ -2731,6 +3006,11 @@ Zone Asia/Khandyga	 9:02:13 -	LMT	1919 Dec 15
 # ...with the exception of:
 # 65-11	****	Severo-Kurilsky District (North Kuril Islands)
 
+# From Matt Johnson (2016-02-22):
+# Asia/Sakhalin is moving (in entirety) from UTC+10 to UTC+11 ...
+# (2016-03-09):
+# http://publication.pravo.gov.ru/Document/View/0001201603090044
+
 # The Zone name should be Asia/Yuzhno-Sakhalinsk, but that's too long.
 Zone Asia/Sakhalin	 9:30:48 -	LMT	1905 Aug 23
 			 9:00	-	JCST	1937 Oct  1
@@ -2740,7 +3020,8 @@ Zone Asia/Sakhalin	 9:30:48 -	LMT	1905 Aug 23
 			11:00	Russia	SAK%sT	1997 Mar lastSun  2:00s
 			10:00	Russia	SAK%sT	2011 Mar 27  2:00s
 			11:00	-	SAKT	2014 Oct 26  2:00s
-			10:00	-	SAKT
+			10:00	-	SAKT	2016 Mar 27  2:00s
+			11:00	-	SAKT
 
 
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
@@ -2754,13 +3035,22 @@ Zone Asia/Sakhalin	 9:30:48 -	LMT	1905 Aug 23
 # until now by Asia/Magadan, will instead move to UTC+11.  These regions will
 # need their own zone.
 
+# From Alexander Krivenyshev (2016-03-27):
+# ... draft bill 948300-6 to change its time zone from UTC+10 to UTC+11 ...
+# will take ... effect ... on April 24, 2016 at 2 o'clock
+#
+# From Matt Johnson (2016-04-05):
+# ... signed by the President today ...
+# http://publication.pravo.gov.ru/Document/View/0001201604050038
+
 Zone Asia/Magadan	10:03:12 -	LMT	1924 May  2
 			10:00	-	MAGT	1930 Jun 21 # Magadan Time
 			11:00	Russia	MAG%sT	1991 Mar 31  2:00s
 			10:00	Russia	MAG%sT	1992 Jan 19  2:00s
 			11:00	Russia	MAG%sT	2011 Mar 27  2:00s
 			12:00	-	MAGT	2014 Oct 26  2:00s
-			10:00	-	MAGT
+			10:00	-	MAGT	2016 Apr 24  2:00s
+			11:00	-	MAGT
 
 
 # From Tim Parenti (2014-07-06):
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/iso3166.tab b/jdk/test/sun/util/calendar/zi/tzdata/iso3166.tab
index 7fb307326ff..e47eefe1227 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/iso3166.tab
+++ b/jdk/test/sun/util/calendar/zi/tzdata/iso3166.tab
@@ -75,7 +75,7 @@ BL	St Barthelemy
 BM	Bermuda
 BN	Brunei
 BO	Bolivia
-BQ	Caribbean Netherlands
+BQ	Caribbean NL
 BR	Brazil
 BS	Bahamas
 BT	Bhutan
@@ -186,7 +186,7 @@ MA	Morocco
 MC	Monaco
 MD	Moldova
 ME	Montenegro
-MF	St Martin (French part)
+MF	St Martin (French)
 MG	Madagascar
 MH	Marshall Islands
 MK	Macedonia
@@ -256,7 +256,7 @@ SR	Suriname
 SS	South Sudan
 ST	Sao Tome & Principe
 SV	El Salvador
-SX	St Maarten (Dutch part)
+SX	St Maarten (Dutch)
 SY	Syria
 SZ	Swaziland
 TC	Turks & Caicos Is
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/leapseconds b/jdk/test/sun/util/calendar/zi/tzdata/leapseconds
index de698eaa562..a08fbc7b20b 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/leapseconds
+++ b/jdk/test/sun/util/calendar/zi/tzdata/leapseconds
@@ -29,6 +29,7 @@
 # leap-seconds.list file available from most NIST time servers.
 # If the URL <ftp://time.nist.gov/pub/leap-seconds.list> does not work,
 # you should be able to pick up leap-seconds.list from a secondary NIST server.
+# See <http://tf.nist.gov/tf-cgi/servers.cgi> for a list of secondary servers.
 # For more about leap-seconds.list, please see
 # The NTP Timescale and Leap Seconds
 # http://www.eecis.udel.edu/~mills/leap.html
@@ -79,5 +80,5 @@ Leap	2008	Dec	31	23:59:60	+	S
 Leap	2012	Jun	30	23:59:60	+	S
 Leap	2015	Jun	30	23:59:60	+	S
 
-#	Updated through IERS Bulletin C50
-#	File expires on:  28 June 2016
+#	Updated through IERS Bulletin C51
+#	File expires on:  28 December 2016
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/northamerica b/jdk/test/sun/util/calendar/zi/tzdata/northamerica
index e56fd895d10..2124401edaf 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/northamerica
+++ b/jdk/test/sun/util/calendar/zi/tzdata/northamerica
@@ -2498,13 +2498,22 @@ Zone America/Merida	-5:58:28 -	LMT	1922 Jan  1  0:01:32
 			-6:00	-	CST	1981 Dec 23
 			-5:00	-	EST	1982 Dec  2
 			-6:00	Mexico	C%sT
-# Coahuila, Durango, Nuevo León, Tamaulipas (near US border)
+# Coahuila, Nuevo León, Tamaulipas (near US border)
+# This includes the following municipalities:
+#   in Coahuila: Ocampo, Acuña, Zaragoza, Jiménez, Piedras Negras, Nava,
+#     Guerrero, Hidalgo.
+#   in Nuevo León: Anáhuac, Los Aldama.
+#   in Tamaulipas: Nuevo Laredo, Guerrero, Mier, Miguel Alemán, Camargo,
+#     Gustavo Díaz Ordaz, Reynosa, Río Bravo, Valle Hermoso, Matamoros.
+# See: Inicia mañana Horario de Verano en zona fronteriza, El Universal,
+# 2016-03-12
+# http://www.eluniversal.com.mx/articulo/estados/2016/03/12/inicia-manana-horario-de-verano-en-zona-fronteriza
 Zone America/Matamoros	-6:40:00 -	LMT	1921 Dec 31 23:20:00
 			-6:00	-	CST	1988
 			-6:00	US	C%sT	1989
 			-6:00	Mexico	C%sT	2010
 			-6:00	US	C%sT
-# Coahuila, Durango, Nuevo León, Tamaulipas (away from US border)
+# Durango; Coahuila, Nuevo León, Tamaulipas (away from US border)
 Zone America/Monterrey	-6:41:16 -	LMT	1921 Dec 31 23:18:44
 			-6:00	-	CST	1988
 			-6:00	US	C%sT	1989
@@ -2520,6 +2529,9 @@ Zone America/Mexico_City -6:36:36 -	LMT	1922 Jan  1  0:23:24
 			-6:00	-	CST	2002 Feb 20
 			-6:00	Mexico	C%sT
 # Chihuahua (near US border)
+# This includes the municipalities of Janos, Ascensión, Juárez, Guadalupe,
+# Práxedis G Guerrero, Coyame del Sotol, Ojinaga, and Manuel Benavides.
+# (See the 2016-03-12 El Universal source mentioned above.)
 Zone America/Ojinaga	-6:57:40 -	LMT	1922 Jan  1  0:02:20
 			-7:00	-	MST	1927 Jun 10 23:00
 			-6:00	-	CST	1930 Nov 15
@@ -2607,7 +2619,7 @@ Zone America/Bahia_Banderas	-7:01:00 -	LMT	1921 Dec 31 23:59:00
 			-7:00	Mexico	M%sT	2010 Apr  4  2:00
 			-6:00	Mexico	C%sT
 
-# Baja California (near US border)
+# Baja California
 Zone America/Tijuana	-7:48:04 -	LMT	1922 Jan  1  0:11:56
 			-7:00	-	MST	1924
 			-8:00	-	PST	1927 Jun 10 23:00
@@ -3083,6 +3095,13 @@ Zone America/Guatemala	-6:02:04 -	LMT	1918 Oct 5
 # http://radiovision2000haiti.net/public/haiti-avis-changement-dheure-dimanche/
 # http://www.canalplushaiti.net/?p=6714
 
+# From Steffen Thorsen (2016-03-12):
+# Jean Antoine, editor of www.haiti-reference.com informed us that Haiti
+# are not going on DST this year.  Several other resources confirm this: ...
+# http://www.radiotelevisioncaraibes.com/presse/heure_d_t_pas_de_changement_d_heure_pr_vu_pour_cet_ann_e.html
+# http://www.vantbefinfo.com/changement-dheure-pas-pour-haiti/
+# http://news.anmwe.com/haiti-lheure-nationale-ne-sera-ni-avancee-ni-reculee-cette-annee/
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Haiti	1983	only	-	May	8	0:00	1:00	D
 Rule	Haiti	1984	1987	-	Apr	lastSun	0:00	1:00	D
@@ -3093,8 +3112,8 @@ Rule	Haiti	1988	1997	-	Apr	Sun>=1	1:00s	1:00	D
 Rule	Haiti	1988	1997	-	Oct	lastSun	1:00s	0	S
 Rule	Haiti	2005	2006	-	Apr	Sun>=1	0:00	1:00	D
 Rule	Haiti	2005	2006	-	Oct	lastSun	0:00	0	S
-Rule	Haiti	2012	max	-	Mar	Sun>=8	2:00	1:00	D
-Rule	Haiti	2012	max	-	Nov	Sun>=1	2:00	0	S
+Rule	Haiti	2012	2015	-	Mar	Sun>=8	2:00	1:00	D
+Rule	Haiti	2012	2015	-	Nov	Sun>=1	2:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Port-au-Prince -4:49:20 -	LMT	1890
 			-4:49	-	PPMT	1917 Jan 24 12:00 # P-a-P MT
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/southamerica b/jdk/test/sun/util/calendar/zi/tzdata/southamerica
index 082018691d6..b9090896d8b 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/southamerica
+++ b/jdk/test/sun/util/calendar/zi/tzdata/southamerica
@@ -1244,6 +1244,20 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
 # From Paul Eggert (2015-03-03):
 # For now, assume that the extension will persist indefinitely.
 
+# From Juan Correa (2016-03-18):
+# The decree regarding DST has been published in today's Official Gazette:
+# http://www.diariooficial.interior.gob.cl/versiones-anteriores/do/20160318/
+# http://www.leychile.cl/Navegar?idNorma=1088502
+# It does consider the second Saturday of May and August as the dates
+# for the transition; and it lists DST dates until 2019, but I think
+# this scheme will stick.
+#
+# From Paul Eggert (2016-03-18):
+# For now, assume the pattern holds for the indefinite future.
+# The decree says transitions occur at 24:00; in practice this appears
+# to mean 24:00 mainland time, not 24:00 local time, so that Easter
+# Island is always two hours behind the mainland.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Chile	1927	1931	-	Sep	 1	0:00	1:00	S
 Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
@@ -1275,8 +1289,10 @@ Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
 Rule	Chile	2010	only	-	Apr	Sun>=1	3:00u	0	-
 Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
 Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
-Rule	Chile	2012	2015	-	Apr	Sun>=23	3:00u	0	-
+Rule	Chile	2012	2014	-	Apr	Sun>=23	3:00u	0	-
 Rule	Chile	2012	2014	-	Sep	Sun>=2	4:00u	1:00	S
+Rule	Chile	2016	max	-	May	Sun>=9	3:00u	0	-
+Rule	Chile	2016	max	-	Aug	Sun>=9	4:00u	1:00	S
 # IATA SSIM anomalies: (1992-02) says 1992-03-14;
 # (1996-09) says 1998-03-08.  Ignore these.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1293,13 +1309,11 @@ Zone America/Santiago	-4:42:46 -	LMT	1890
 			-4:00	1:00	CLST	1946 Sep  1 # central Chile
 			-4:00	-	CLT	1947 Apr  1
 			-5:00	-	CLT	1947 May 21 23:00
-			-4:00	Chile	CL%sT	2015 Apr 26  3:00u
-			-3:00	-	CLT
+			-4:00	Chile	CL%sT
 Zone Pacific/Easter	-7:17:28 -	LMT	1890
 			-7:17:28 -	EMT	1932 Sep    # Easter Mean Time
 			-7:00	Chile	EAS%sT	1982 Mar 14 3:00u # Easter Time
-			-6:00	Chile	EAS%sT	2015 Apr 26 3:00u
-			-5:00	-	EAST
+			-6:00	Chile	EAS%sT
 #
 # Salas y Gómez Island is uninhabited.
 # Other Chilean locations, including Juan Fernández Is, Desventuradas Is,
@@ -1321,8 +1335,7 @@ Zone Pacific/Easter	-7:17:28 -	LMT	1890
 Zone Antarctica/Palmer	0	-	zzz	1965
 			-4:00	Arg	AR%sT	1969 Oct  5
 			-3:00	Arg	AR%sT	1982 May
-			-4:00	Chile	CL%sT	2015 Apr 26 3:00u
-			-3:00	-	CLT
+			-4:00	Chile	CL%sT
 
 # Colombia
 
@@ -1765,9 +1778,25 @@ Zone America/Montevideo	-3:44:44 -	LMT	1898 Jun 28
 # resolution publication)
 # http://www.globovision.com/news.php?nid=72208
 
+# From Alexander Krivenyshev (2016-04-15):
+# https://actualidad.rt.com/actualidad/204758-venezuela-modificar-huso-horario-sequia-elnino
+#
+# From Paul Eggert (2016-04-15):
+# Clocks advance 30 minutes on 2016-05-01 at 02:30. See:
+# Barboza AD. Huso horario en Venezuela volverá a 4 horas menos con
+# respecto al "Greenwich". Panorama 2016-04-15 12:20 -0430.
+# http://www.panorama.com.ve/ciudad/Huso-horario-en-Venezuela-volvera-a-4-horas-menos-con-respecto-al-Greenwich-20160415-0032.html
+#
+# "'Venezuela's new time-zone: hours without light, hours without water,
+# hours of presidential broadcasts, hours of lines," quipped comedian
+# Jean Mary Curro ...". See: Cawthorne A, Kai D. Venezuela scraps
+# half-hour time difference set by Chavez. Reuters 2016-04-15 14:50 -0400
+# http://www.reuters.com/article/us-venezuela-timezone-idUSKCN0XC2BE
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Caracas	-4:27:44 -	LMT	1890
 			-4:27:40 -	CMT	1912 Feb 12 # Caracas Mean Time?
 			-4:30	-	VET	1965 Jan  1  0:00 # Venezuela T.
 			-4:00	-	VET	2007 Dec  9  3:00
-			-4:30	-	VET
+			-4:30	-	VET	2016 May  1  2:30
+			-4:00	-	VET
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/zone.tab b/jdk/test/sun/util/calendar/zi/tzdata/zone.tab
index 51aaf775dee..5649691ac03 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/zone.tab
+++ b/jdk/test/sun/util/calendar/zi/tzdata/zone.tab
@@ -53,22 +53,22 @@ AI	+1812-06304	America/Anguilla
 AL	+4120+01950	Europe/Tirane
 AM	+4011+04430	Asia/Yerevan
 AO	-0848+01314	Africa/Luanda
-AQ	-7750+16636	Antarctica/McMurdo	McMurdo, South Pole, Scott (New Zealand time)
-AQ	-6734-06808	Antarctica/Rothera	Rothera Station, Adelaide Island
-AQ	-6448-06406	Antarctica/Palmer	Palmer Station, Anvers Island
-AQ	-6736+06253	Antarctica/Mawson	Mawson Station, Holme Bay
-AQ	-6835+07758	Antarctica/Davis	Davis Station, Vestfold Hills
-AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
-AQ	-7824+10654	Antarctica/Vostok	Vostok Station, Lake Vostok
-AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Adelie Land
-AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
-AQ	-720041+0023206	Antarctica/Troll	Troll Station, Queen Maud Land
+AQ	-7750+16636	Antarctica/McMurdo	New Zealand time - McMurdo, South Pole
+AQ	-6617+11031	Antarctica/Casey	Casey
+AQ	-6835+07758	Antarctica/Davis	Davis
+AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville
+AQ	-6736+06253	Antarctica/Mawson	Mawson
+AQ	-6448-06406	Antarctica/Palmer	Palmer
+AQ	-6734-06808	Antarctica/Rothera	Rothera
+AQ	-690022+0393524	Antarctica/Syowa	Syowa
+AQ	-720041+0023206	Antarctica/Troll	Troll
+AQ	-7824+10654	Antarctica/Vostok	Vostok
 AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
-AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, MN, SE, SF)
-AR	-2447-06525	America/Argentina/Salta	(SA, LP, NQ, RN)
+AR	-3124-06411	America/Argentina/Cordoba	Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF)
+AR	-2447-06525	America/Argentina/Salta	Salta (SA, LP, NQ, RN)
 AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
 AR	-2649-06513	America/Argentina/Tucuman	Tucuman (TM)
-AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
+AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT); Chubut (CH)
 AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
 AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
 AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
@@ -79,17 +79,17 @@ AS	-1416-17042	Pacific/Pago_Pago
 AT	+4813+01620	Europe/Vienna
 AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
 AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
-AU	-4253+14719	Australia/Hobart	Tasmania - most locations
-AU	-3956+14352	Australia/Currie	Tasmania - King Island
+AU	-4253+14719	Australia/Hobart	Tasmania (most areas)
+AU	-3956+14352	Australia/Currie	Tasmania (King Island)
 AU	-3749+14458	Australia/Melbourne	Victoria
-AU	-3352+15113	Australia/Sydney	New South Wales - most locations
-AU	-3157+14127	Australia/Broken_Hill	New South Wales - Yancowinna
-AU	-2728+15302	Australia/Brisbane	Queensland - most locations
-AU	-2016+14900	Australia/Lindeman	Queensland - Holiday Islands
+AU	-3352+15113	Australia/Sydney	New South Wales (most areas)
+AU	-3157+14127	Australia/Broken_Hill	New South Wales (Yancowinna)
+AU	-2728+15302	Australia/Brisbane	Queensland (most areas)
+AU	-2016+14900	Australia/Lindeman	Queensland (Whitsunday Islands)
 AU	-3455+13835	Australia/Adelaide	South Australia
 AU	-1228+13050	Australia/Darwin	Northern Territory
-AU	-3157+11551	Australia/Perth	Western Australia - most locations
-AU	-3143+12852	Australia/Eucla	Western Australia - Eucla area
+AU	-3157+11551	Australia/Perth	Western Australia (most areas)
+AU	-3143+12852	Australia/Eucla	Western Australia (Eucla)
 AW	+1230-06958	America/Aruba
 AX	+6006+01957	Europe/Mariehamn
 AZ	+4023+04951	Asia/Baku
@@ -108,63 +108,63 @@ BN	+0456+11455	Asia/Brunei
 BO	-1630-06809	America/La_Paz
 BQ	+120903-0681636	America/Kralendijk
 BR	-0351-03225	America/Noronha	Atlantic islands
-BR	-0127-04829	America/Belem	Amapa, E Para
-BR	-0343-03830	America/Fortaleza	NE Brazil (MA, PI, CE, RN, PB)
+BR	-0127-04829	America/Belem	Para (east); Amapa
+BR	-0343-03830	America/Fortaleza	Brazil (northeast: MA, PI, CE, RN, PB)
 BR	-0803-03454	America/Recife	Pernambuco
 BR	-0712-04812	America/Araguaina	Tocantins
 BR	-0940-03543	America/Maceio	Alagoas, Sergipe
 BR	-1259-03831	America/Bahia	Bahia
-BR	-2332-04637	America/Sao_Paulo	S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)
+BR	-2332-04637	America/Sao_Paulo	Brazil (southeast: GO, DF, MG, ES, RJ, SP, PR, SC, RS)
 BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
 BR	-1535-05605	America/Cuiaba	Mato Grosso
-BR	-0226-05452	America/Santarem	W Para
+BR	-0226-05452	America/Santarem	Para (west)
 BR	-0846-06354	America/Porto_Velho	Rondonia
 BR	+0249-06040	America/Boa_Vista	Roraima
-BR	-0308-06001	America/Manaus	E Amazonas
-BR	-0640-06952	America/Eirunepe	W Amazonas
+BR	-0308-06001	America/Manaus	Amazonas (east)
+BR	-0640-06952	America/Eirunepe	Amazonas (west)
 BR	-0958-06748	America/Rio_Branco	Acre
 BS	+2505-07721	America/Nassau
 BT	+2728+08939	Asia/Thimphu
 BW	-2439+02555	Africa/Gaborone
 BY	+5354+02734	Europe/Minsk
 BZ	+1730-08812	America/Belize
-CA	+4734-05243	America/St_Johns	Newfoundland Time, including SE Labrador
-CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (peninsula), PEI
-CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia (Cape Breton)
-CA	+4606-06447	America/Moncton	Atlantic Time - New Brunswick
-CA	+5320-06025	America/Goose_Bay	Atlantic Time - Labrador - most locations
-CA	+5125-05707	America/Blanc-Sablon	Atlantic Standard Time - Quebec - Lower North Shore
-CA	+4339-07923	America/Toronto	Eastern Time - Ontario & Quebec - most locations
-CA	+4901-08816	America/Nipigon	Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
-CA	+4823-08915	America/Thunder_Bay	Eastern Time - Thunder Bay, Ontario
-CA	+6344-06828	America/Iqaluit	Eastern Time - east Nunavut - most locations
-CA	+6608-06544	America/Pangnirtung	Eastern Time - Pangnirtung, Nunavut
-CA	+744144-0944945	America/Resolute	Central Time - Resolute, Nunavut
-CA	+484531-0913718	America/Atikokan	Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut
-CA	+624900-0920459	America/Rankin_Inlet	Central Time - central Nunavut
-CA	+4953-09709	America/Winnipeg	Central Time - Manitoba & west Ontario
-CA	+4843-09434	America/Rainy_River	Central Time - Rainy River & Fort Frances, Ontario
-CA	+5024-10439	America/Regina	Central Standard Time - Saskatchewan - most locations
-CA	+5017-10750	America/Swift_Current	Central Standard Time - Saskatchewan - midwest
-CA	+5333-11328	America/Edmonton	Mountain Time - Alberta, east British Columbia & west Saskatchewan
-CA	+690650-1050310	America/Cambridge_Bay	Mountain Time - west Nunavut
-CA	+6227-11421	America/Yellowknife	Mountain Time - central Northwest Territories
-CA	+682059-1334300	America/Inuvik	Mountain Time - west Northwest Territories
-CA	+4906-11631	America/Creston	Mountain Standard Time - Creston, British Columbia
-CA	+5946-12014	America/Dawson_Creek	Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
-CA	+5848-12242	America/Fort_Nelson	Mountain Standard Time - Fort Nelson, British Columbia
-CA	+4916-12307	America/Vancouver	Pacific Time - west British Columbia
-CA	+6043-13503	America/Whitehorse	Pacific Time - south Yukon
-CA	+6404-13925	America/Dawson	Pacific Time - north Yukon
+CA	+4734-05243	America/St_Johns	Newfoundland; Labrador (southeast)
+CA	+4439-06336	America/Halifax	Atlantic - NS (most areas); PE
+CA	+4612-05957	America/Glace_Bay	Atlantic - NS (Cape Breton)
+CA	+4606-06447	America/Moncton	Atlantic - New Brunswick
+CA	+5320-06025	America/Goose_Bay	Atlantic - Labrador (most areas)
+CA	+5125-05707	America/Blanc-Sablon	AST - QC (Lower North Shore)
+CA	+4339-07923	America/Toronto	Eastern - ON, QC (most areas)
+CA	+4901-08816	America/Nipigon	Eastern - ON, QC (no DST 1967-73)
+CA	+4823-08915	America/Thunder_Bay	Eastern - ON (Thunder Bay)
+CA	+6344-06828	America/Iqaluit	Eastern - NU (most east areas)
+CA	+6608-06544	America/Pangnirtung	Eastern - NU (Pangnirtung)
+CA	+484531-0913718	America/Atikokan	EST - ON (Atikokan); NU (Coral H)
+CA	+4953-09709	America/Winnipeg	Central - ON (west); Manitoba
+CA	+4843-09434	America/Rainy_River	Central - ON (Rainy R, Ft Frances)
+CA	+744144-0944945	America/Resolute	Central - NU (Resolute)
+CA	+624900-0920459	America/Rankin_Inlet	Central - NU (central)
+CA	+5024-10439	America/Regina	CST - SK (most areas)
+CA	+5017-10750	America/Swift_Current	CST - SK (midwest)
+CA	+5333-11328	America/Edmonton	Mountain - AB; BC (E); SK (W)
+CA	+690650-1050310	America/Cambridge_Bay	Mountain - NU (west)
+CA	+6227-11421	America/Yellowknife	Mountain - NT (central)
+CA	+682059-1334300	America/Inuvik	Mountain - NT (west)
+CA	+4906-11631	America/Creston	MST - BC (Creston)
+CA	+5946-12014	America/Dawson_Creek	MST - BC (Dawson Cr, Ft St John)
+CA	+5848-12242	America/Fort_Nelson	MST - BC (Ft Nelson)
+CA	+4916-12307	America/Vancouver	Pacific - BC (most areas)
+CA	+6043-13503	America/Whitehorse	Pacific - Yukon (south)
+CA	+6404-13925	America/Dawson	Pacific - Yukon (north)
 CC	-1210+09655	Indian/Cocos
-CD	-0418+01518	Africa/Kinshasa	west Dem. Rep. of Congo
-CD	-1140+02728	Africa/Lubumbashi	east Dem. Rep. of Congo
+CD	-0418+01518	Africa/Kinshasa	Dem. Rep. of Congo (west)
+CD	-1140+02728	Africa/Lubumbashi	Dem. Rep. of Congo (east)
 CF	+0422+01835	Africa/Bangui
 CG	-0416+01517	Africa/Brazzaville
 CH	+4723+00832	Europe/Zurich
 CI	+0519-00402	Africa/Abidjan
 CK	-2114-15946	Pacific/Rarotonga
-CL	-3327-07040	America/Santiago	most locations
+CL	-3327-07040	America/Santiago	Chile (most areas)
 CL	-2709-10926	Pacific/Easter	Easter Island
 CM	+0403+00942	Africa/Douala
 CN	+3114+12128	Asia/Shanghai	Beijing Time
@@ -177,28 +177,28 @@ CW	+1211-06900	America/Curacao
 CX	-1025+10543	Indian/Christmas
 CY	+3510+03322	Asia/Nicosia
 CZ	+5005+01426	Europe/Prague
-DE	+5230+01322	Europe/Berlin	most locations
+DE	+5230+01322	Europe/Berlin	Germany (most areas)
 DE	+4742+00841	Europe/Busingen	Busingen
 DJ	+1136+04309	Africa/Djibouti
 DK	+5540+01235	Europe/Copenhagen
 DM	+1518-06124	America/Dominica
 DO	+1828-06954	America/Santo_Domingo
 DZ	+3647+00303	Africa/Algiers
-EC	-0210-07950	America/Guayaquil	mainland
+EC	-0210-07950	America/Guayaquil	Ecuador (mainland)
 EC	-0054-08936	Pacific/Galapagos	Galapagos Islands
 EE	+5925+02445	Europe/Tallinn
 EG	+3003+03115	Africa/Cairo
 EH	+2709-01312	Africa/El_Aaiun
 ER	+1520+03853	Africa/Asmara
-ES	+4024-00341	Europe/Madrid	mainland
-ES	+3553-00519	Africa/Ceuta	Ceuta & Melilla
+ES	+4024-00341	Europe/Madrid	Spain (mainland)
+ES	+3553-00519	Africa/Ceuta	Ceuta, Melilla
 ES	+2806-01524	Atlantic/Canary	Canary Islands
 ET	+0902+03842	Africa/Addis_Ababa
 FI	+6010+02458	Europe/Helsinki
 FJ	-1808+17825	Pacific/Fiji
 FK	-5142-05751	Atlantic/Stanley
-FM	+0725+15147	Pacific/Chuuk	Chuuk (Truk) and Yap
-FM	+0658+15813	Pacific/Pohnpei	Pohnpei (Ponape)
+FM	+0725+15147	Pacific/Chuuk	Chuuk/Truk, Yap
+FM	+0658+15813	Pacific/Pohnpei	Pohnpei/Ponape
 FM	+0519+16259	Pacific/Kosrae	Kosrae
 FO	+6201-00646	Atlantic/Faroe
 FR	+4852+00220	Europe/Paris
@@ -210,10 +210,10 @@ GF	+0456-05220	America/Cayenne
 GG	+4927-00232	Europe/Guernsey
 GH	+0533-00013	Africa/Accra
 GI	+3608-00521	Europe/Gibraltar
-GL	+6411-05144	America/Godthab	most locations
-GL	+7646-01840	America/Danmarkshavn	east coast, north of Scoresbysund
-GL	+7029-02158	America/Scoresbysund	Scoresbysund / Ittoqqortoormiit
-GL	+7634-06847	America/Thule	Thule / Pituffik
+GL	+6411-05144	America/Godthab	Greenland (most areas)
+GL	+7646-01840	America/Danmarkshavn	National Park (east coast)
+GL	+7029-02158	America/Scoresbysund	Scoresbysund/Ittoqqortoormiit
+GL	+7634-06847	America/Thule	Thule/Pituffik
 GM	+1328-01639	Africa/Banjul
 GN	+0931-01343	Africa/Conakry
 GP	+1614-06132	America/Guadeloupe
@@ -229,10 +229,10 @@ HN	+1406-08713	America/Tegucigalpa
 HR	+4548+01558	Europe/Zagreb
 HT	+1832-07220	America/Port-au-Prince
 HU	+4730+01905	Europe/Budapest
-ID	-0610+10648	Asia/Jakarta	Java & Sumatra
-ID	-0002+10920	Asia/Pontianak	west & central Borneo
-ID	-0507+11924	Asia/Makassar	east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor
-ID	-0232+14042	Asia/Jayapura	west New Guinea (Irian Jaya) & Malukus (Moluccas)
+ID	-0610+10648	Asia/Jakarta	Java, Sumatra
+ID	-0002+10920	Asia/Pontianak	Borneo (west, central)
+ID	-0507+11924	Asia/Makassar	Borneo (east, south); Sulawesi/Celebes, Bali, Nusa Tengarra; Timor (west)
+ID	-0232+14042	Asia/Jayapura	New Guinea (West Papua / Irian Jaya); Malukus/Moluccas
 IE	+5320-00615	Europe/Dublin
 IL	+314650+0351326	Asia/Jerusalem
 IM	+5409-00428	Europe/Isle_of_Man
@@ -258,10 +258,10 @@ KP	+3901+12545	Asia/Pyongyang
 KR	+3733+12658	Asia/Seoul
 KW	+2920+04759	Asia/Kuwait
 KY	+1918-08123	America/Cayman
-KZ	+4315+07657	Asia/Almaty	most locations
-KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda (Kyzylorda, Kzyl-Orda)
-KZ	+5017+05710	Asia/Aqtobe	Aqtobe (Aktobe)
-KZ	+4431+05016	Asia/Aqtau	Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau)
+KZ	+4315+07657	Asia/Almaty	Kazakhstan (most areas)
+KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda/Kyzylorda/Kzyl-Orda
+KZ	+5017+05710	Asia/Aqtobe	Aqtobe/Aktobe
+KZ	+4431+05016	Asia/Aqtau	Atyrau/Atirau/Gur'yev, Mangghystau/Mankistau
 KZ	+5113+05121	Asia/Oral	West Kazakhstan
 LA	+1758+10236	Asia/Vientiane
 LB	+3353+03530	Asia/Beirut
@@ -280,12 +280,12 @@ MD	+4700+02850	Europe/Chisinau
 ME	+4226+01916	Europe/Podgorica
 MF	+1804-06305	America/Marigot
 MG	-1855+04731	Indian/Antananarivo
-MH	+0709+17112	Pacific/Majuro	most locations
+MH	+0709+17112	Pacific/Majuro	Marshall Islands (most areas)
 MH	+0905+16720	Pacific/Kwajalein	Kwajalein
 MK	+4159+02126	Europe/Skopje
 ML	+1239-00800	Africa/Bamako
 MM	+1647+09610	Asia/Rangoon
-MN	+4755+10653	Asia/Ulaanbaatar	most locations
+MN	+4755+10653	Asia/Ulaanbaatar	Mongolia (most areas)
 MN	+4801+09139	Asia/Hovd	Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
 MN	+4804+11430	Asia/Choibalsan	Dornod, Sukhbaatar
 MO	+2214+11335	Asia/Macau
@@ -297,19 +297,19 @@ MT	+3554+01431	Europe/Malta
 MU	-2010+05730	Indian/Mauritius
 MV	+0410+07330	Indian/Maldives
 MW	-1547+03500	Africa/Blantyre
-MX	+1924-09909	America/Mexico_City	Central Time - most locations
+MX	+1924-09909	America/Mexico_City	Central Time
 MX	+2105-08646	America/Cancun	Eastern Standard Time - Quintana Roo
 MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatan
-MX	+2540-10019	America/Monterrey	Mexican Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas away from US border
-MX	+2550-09730	America/Matamoros	US Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas near US border
-MX	+2313-10625	America/Mazatlan	Mountain Time - S Baja, Nayarit, Sinaloa
-MX	+2838-10605	America/Chihuahua	Mexican Mountain Time - Chihuahua away from US border
-MX	+2934-10425	America/Ojinaga	US Mountain Time - Chihuahua near US border
+MX	+2540-10019	America/Monterrey	Central Time - Durango; Coahuila, Nuevo Leon, Tamaulipas (most areas)
+MX	+2550-09730	America/Matamoros	Central Time US - Coahuila, Nuevo Leon, Tamaulipas (US border)
+MX	+2313-10625	America/Mazatlan	Mountain Time - Baja California Sur, Nayarit, Sinaloa
+MX	+2838-10605	America/Chihuahua	Mountain Time - Chihuahua (most areas)
+MX	+2934-10425	America/Ojinaga	Mountain Time US - Chihuahua (US border)
 MX	+2904-11058	America/Hermosillo	Mountain Standard Time - Sonora
-MX	+3232-11701	America/Tijuana	US Pacific Time - Baja California state
-MX	+2048-10515	America/Bahia_Banderas	Mexican Central Time - Bahia de Banderas
-MY	+0310+10142	Asia/Kuala_Lumpur	peninsular Malaysia
-MY	+0133+11020	Asia/Kuching	Sabah & Sarawak
+MX	+3232-11701	America/Tijuana	Pacific Time US - Baja California
+MX	+2048-10515	America/Bahia_Banderas	Central Time - Bahia de Banderas
+MY	+0310+10142	Asia/Kuala_Lumpur	Malaysia (peninsula)
+MY	+0133+11020	Asia/Kuching	Sabah, Sarawak
 MZ	-2558+03235	Africa/Maputo
 NA	-2234+01706	Africa/Windhoek
 NC	-2216+16627	Pacific/Noumea
@@ -322,7 +322,7 @@ NO	+5955+01045	Europe/Oslo
 NP	+2743+08519	Asia/Kathmandu
 NR	-0031+16655	Pacific/Nauru
 NU	-1901-16955	Pacific/Niue
-NZ	-3652+17446	Pacific/Auckland	most locations
+NZ	-3652+17446	Pacific/Auckland	New Zealand (most areas)
 NZ	-4357-17633	Pacific/Chatham	Chatham Islands
 OM	+2336+05835	Asia/Muscat
 PA	+0858-07932	America/Panama
@@ -330,7 +330,7 @@ PE	-1203-07703	America/Lima
 PF	-1732-14934	Pacific/Tahiti	Society Islands
 PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
 PF	-2308-13457	Pacific/Gambier	Gambier Islands
-PG	-0930+14710	Pacific/Port_Moresby	most locations
+PG	-0930+14710	Pacific/Port_Moresby	Papua New Guinea (most areas)
 PG	-0613+15534	Pacific/Bougainville	Bougainville
 PH	+1435+12100	Asia/Manila
 PK	+2452+06703	Asia/Karachi
@@ -340,7 +340,7 @@ PN	-2504-13005	Pacific/Pitcairn
 PR	+182806-0660622	America/Puerto_Rico
 PS	+3130+03428	Asia/Gaza	Gaza Strip
 PS	+313200+0350542	Asia/Hebron	West Bank
-PT	+3843-00908	Europe/Lisbon	mainland
+PT	+3843-00908	Europe/Lisbon	Portugal (mainland)
 PT	+3238-01654	Atlantic/Madeira	Madeira Islands
 PT	+3744-02540	Atlantic/Azores	Azores
 PW	+0720+13429	Pacific/Palau
@@ -349,27 +349,32 @@ QA	+2517+05132	Asia/Qatar
 RE	-2052+05528	Indian/Reunion
 RO	+4426+02606	Europe/Bucharest
 RS	+4450+02030	Europe/Belgrade
-RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
-RU	+554521+0373704	Europe/Moscow	Moscow+00 - west Russia
-RU	+4457+03406	Europe/Simferopol	Moscow+00 - Crimea
-RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea
-RU	+5312+05009	Europe/Samara	Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia
-RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
-RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
-RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
-RU	+5345+08707	Asia/Novokuznetsk	Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo
-RU	+5601+09250	Asia/Krasnoyarsk	Moscow+04 - Yenisei River
-RU	+5216+10420	Asia/Irkutsk	Moscow+05 - Lake Baikal
-RU	+5203+11328	Asia/Chita	Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky
-RU	+6200+12940	Asia/Yakutsk	Moscow+06 - Lena River
-RU	+623923+1353314	Asia/Khandyga	Moscow+06 - Tomponsky, Ust-Maysky
-RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
-RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
-RU	+643337+1431336	Asia/Ust-Nera	Moscow+07 - Oymyakonsky
-RU	+5934+15048	Asia/Magadan	Moscow+08 (Moscow+07 after 2014-10-26) - Magadan
-RU	+6728+15343	Asia/Srednekolymsk	Moscow+08 - E Sakha, N Kuril Is
-RU	+5301+15839	Asia/Kamchatka	Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka
-RU	+6445+17729	Asia/Anadyr	Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea
+RU	+5443+02030	Europe/Kaliningrad	MSK-01 - Kaliningrad
+RU	+554521+0373704	Europe/Moscow	MSK+00 - Moscow area
+RU	+4457+03406	Europe/Simferopol	MSK+00 - Crimea
+RU	+4844+04425	Europe/Volgograd	MSK+00 - Volgograd, Saratov
+RU	+5836+04939	Europe/Kirov	MSK+00 - Kirov
+RU	+4621+04803	Europe/Astrakhan	MSK+01 - Astrakhan
+RU	+5312+05009	Europe/Samara	MSK+01 - Samara, Udmurtia
+RU	+5420+04824	Europe/Ulyanovsk	MSK+01 - Ulyanovsk
+RU	+5651+06036	Asia/Yekaterinburg	MSK+02 - Urals
+RU	+5500+07324	Asia/Omsk	MSK+03 - Omsk
+RU	+5502+08255	Asia/Novosibirsk	MSK+03 - Novosibirsk
+RU	+5322+08345	Asia/Barnaul	MSK+04 - Altai
+RU	+5630+08458	Asia/Tomsk	MSK+04 - Tomsk
+RU	+5345+08707	Asia/Novokuznetsk	MSK+04 - Kemerovo
+RU	+5601+09250	Asia/Krasnoyarsk	MSK+04 - Krasnoyarsk area
+RU	+5216+10420	Asia/Irkutsk	MSK+05 - Irkutsk, Buryatia
+RU	+5203+11328	Asia/Chita	MSK+06 - Zabaykalsky
+RU	+6200+12940	Asia/Yakutsk	MSK+06 - Lena River
+RU	+623923+1353314	Asia/Khandyga	MSK+06 - Tomponsky, Ust-Maysky
+RU	+4310+13156	Asia/Vladivostok	MSK+07 - Amur River
+RU	+643337+1431336	Asia/Ust-Nera	MSK+07 - Oymyakonsky
+RU	+5934+15048	Asia/Magadan	MSK+08 - Magadan
+RU	+4658+14242	Asia/Sakhalin	MSK+08 - Sakhalin Island
+RU	+6728+15343	Asia/Srednekolymsk	MSK+08 - Sakha (E); North Kuril Is
+RU	+5301+15839	Asia/Kamchatka	MSK+09 - Kamchatka
+RU	+6445+17729	Asia/Anadyr	MSK+09 - Bering Sea
 RW	-0157+03004	Africa/Kigali
 SA	+2438+04643	Asia/Riyadh
 SB	-0932+16012	Pacific/Guadalcanal
@@ -408,45 +413,45 @@ TT	+1039-06131	America/Port_of_Spain
 TV	-0831+17913	Pacific/Funafuti
 TW	+2503+12130	Asia/Taipei
 TZ	-0648+03917	Africa/Dar_es_Salaam
-UA	+5026+03031	Europe/Kiev	most locations
+UA	+5026+03031	Europe/Kiev	Ukraine (most areas)
 UA	+4837+02218	Europe/Uzhgorod	Ruthenia
-UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk
+UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye/Zaporizhia; Lugansk/Luhansk (east)
 UG	+0019+03225	Africa/Kampala
 UM	+1645-16931	Pacific/Johnston	Johnston Atoll
 UM	+2813-17722	Pacific/Midway	Midway Islands
 UM	+1917+16637	Pacific/Wake	Wake Island
-US	+404251-0740023	America/New_York	Eastern Time
-US	+421953-0830245	America/Detroit	Eastern Time - Michigan - most locations
-US	+381515-0854534	America/Kentucky/Louisville	Eastern Time - Kentucky - Louisville area
-US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
-US	+394606-0860929	America/Indiana/Indianapolis	Eastern Time - Indiana - most locations
-US	+384038-0873143	America/Indiana/Vincennes	Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties
-US	+410305-0863611	America/Indiana/Winamac	Eastern Time - Indiana - Pulaski County
-US	+382232-0862041	America/Indiana/Marengo	Eastern Time - Indiana - Crawford County
-US	+382931-0871643	America/Indiana/Petersburg	Eastern Time - Indiana - Pike County
-US	+384452-0850402	America/Indiana/Vevay	Eastern Time - Indiana - Switzerland County
-US	+415100-0873900	America/Chicago	Central Time
-US	+375711-0864541	America/Indiana/Tell_City	Central Time - Indiana - Perry County
-US	+411745-0863730	America/Indiana/Knox	Central Time - Indiana - Starke County
-US	+450628-0873651	America/Menominee	Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
-US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
-US	+465042-1012439	America/North_Dakota/New_Salem	Central Time - North Dakota - Morton County (except Mandan area)
-US	+471551-1014640	America/North_Dakota/Beulah	Central Time - North Dakota - Mercer County
-US	+394421-1045903	America/Denver	Mountain Time
-US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
-US	+332654-1120424	America/Phoenix	Mountain Standard Time - Arizona (except Navajo)
-US	+340308-1181434	America/Los_Angeles	Pacific Time
-US	+611305-1495401	America/Anchorage	Alaska Time
-US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
-US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
-US	+550737-1313435	America/Metlakatla	Alaska Time - Annette Island
-US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
-US	+643004-1652423	America/Nome	Alaska Time - west Alaska
+US	+404251-0740023	America/New_York	Eastern (most areas)
+US	+421953-0830245	America/Detroit	Eastern - MI (most areas)
+US	+381515-0854534	America/Kentucky/Louisville	Eastern - KY (Louisville area)
+US	+364947-0845057	America/Kentucky/Monticello	Eastern - KY (Wayne)
+US	+394606-0860929	America/Indiana/Indianapolis	Eastern - IN (most areas)
+US	+384038-0873143	America/Indiana/Vincennes	Eastern - IN (Da, Du, K, Mn)
+US	+410305-0863611	America/Indiana/Winamac	Eastern - IN (Pulaski)
+US	+382232-0862041	America/Indiana/Marengo	Eastern - IN (Crawford)
+US	+382931-0871643	America/Indiana/Petersburg	Eastern - IN (Pike)
+US	+384452-0850402	America/Indiana/Vevay	Eastern - IN (Switzerland)
+US	+415100-0873900	America/Chicago	Central (most areas)
+US	+375711-0864541	America/Indiana/Tell_City	Central - IN (Perry)
+US	+411745-0863730	America/Indiana/Knox	Central - IN (Starke)
+US	+450628-0873651	America/Menominee	Central - MI (Wisconsin border)
+US	+470659-1011757	America/North_Dakota/Center	Central - ND (Oliver)
+US	+465042-1012439	America/North_Dakota/New_Salem	Central - ND (Morton rural)
+US	+471551-1014640	America/North_Dakota/Beulah	Central - ND (Mercer)
+US	+394421-1045903	America/Denver	Mountain (most areas)
+US	+433649-1161209	America/Boise	Mountain - ID (south); OR (east)
+US	+332654-1120424	America/Phoenix	MST - Arizona (except Navajo)
+US	+340308-1181434	America/Los_Angeles	Pacific
+US	+611305-1495401	America/Anchorage	Alaska (most areas)
+US	+581807-1342511	America/Juneau	Alaska - Juneau area
+US	+571035-1351807	America/Sitka	Alaska - Sitka area
+US	+550737-1313435	America/Metlakatla	Alaska - Annette Island
+US	+593249-1394338	America/Yakutat	Alaska - Yakutat
+US	+643004-1652423	America/Nome	Alaska (west)
 US	+515248-1763929	America/Adak	Aleutian Islands
 US	+211825-1575130	Pacific/Honolulu	Hawaii
 UY	-3453-05611	America/Montevideo
-UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
-UZ	+4120+06918	Asia/Tashkent	east Uzbekistan
+UZ	+3940+06648	Asia/Samarkand	Uzbekistan (west)
+UZ	+4120+06918	Asia/Tashkent	Uzbekistan (east)
 VA	+415408+0122711	Europe/Vatican
 VC	+1309-06114	America/St_Vincent
 VE	+1030-06656	America/Caracas

From d17f9b96fe9d3eba61ba5b85590c2380f9d7daf6 Mon Sep 17 00:00:00 2001
From: Xueming Shen <sherman@openjdk.org>
Date: Wed, 1 Jun 2016 09:52:08 -0700
Subject: [PATCH 207/228] 8061777: (zipfs) IllegalArgumentException in
 ZipCoder.toString when using Shitft_JIS

Reviewed-by: psandoz
---
 .../classes/jdk/nio/zipfs/ZipFileSystem.java  |  6 +-
 .../share/classes/jdk/nio/zipfs/ZipPath.java  | 67 +++++++++++++++++--
 jdk/test/jdk/nio/zipfs/ZFSTests.java          | 31 ++++++++-
 3 files changed, 96 insertions(+), 8 deletions(-)

diff --git a/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java b/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java
index d8becaaa23d..3d9f82ba77c 100644
--- a/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java
+++ b/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java
@@ -69,7 +69,7 @@ class ZipFileSystem extends FileSystem {
 
     private final ZipFileSystemProvider provider;
     private final Path zfpath;
-    private final ZipCoder zc;
+    final ZipCoder zc;
     private final boolean noExtt;        // see readExtra()
     private final ZipPath rootdir;
     // configurable by env map
@@ -163,7 +163,7 @@ class ZipFileSystem extends FileSystem {
     @Override
     public ZipPath getPath(String first, String... more) {
         if (more.length == 0) {
-            return new ZipPath(this, getBytes(first));
+            return new ZipPath(this, first);
         }
         StringBuilder sb = new StringBuilder();
         sb.append(first);
@@ -175,7 +175,7 @@ class ZipFileSystem extends FileSystem {
                 sb.append(path);
             }
         }
-        return new ZipPath(this, getBytes(sb.toString()));
+        return new ZipPath(this, sb.toString());
     }
 
     @Override
diff --git a/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipPath.java b/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipPath.java
index e8588fac2dd..120017d78e2 100644
--- a/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipPath.java
+++ b/jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipPath.java
@@ -52,13 +52,28 @@ final class ZipPath implements Path {
         this(zfs, path, false);
     }
 
-    ZipPath(ZipFileSystem zfs, byte[] path, boolean normalized)
-    {
+    ZipPath(ZipFileSystem zfs, byte[] path, boolean normalized) {
         this.zfs = zfs;
-        if (normalized)
+        if (normalized) {
             this.path = path;
-        else
+        } else {
+            if (zfs.zc.isUTF8()) {
+                this.path = normalize(path);
+            } else {
+                // see normalize(String);
+                this.path = normalize(zfs.getString(path));
+            }
+        }
+    }
+
+    ZipPath(ZipFileSystem zfs, String path) {
+        this.zfs = zfs;
+        if (zfs.zc.isUTF8()) {
+            this.path = normalize(zfs.getBytes(path));
+        } else {
+            // see normalize(String);
             this.path = normalize(path);
+        }
     }
 
     @Override
@@ -471,6 +486,50 @@ final class ZipPath implements Path {
         return (m == to.length)? to : Arrays.copyOf(to, m);
     }
 
+    // if zfs is NOT in utf8, normalize the path as "String"
+    // to avoid incorrectly normalizing byte '0x5c' (as '\')
+    // to '/'.
+    private byte[] normalize(String path) {
+        int len = path.length();
+        if (len == 0)
+            return new byte[0];
+        char prevC = 0;
+        for (int i = 0; i < len; i++) {
+            char c = path.charAt(i);
+            if (c == '\\' || c == '\u0000')
+                return normalize(path, i, len);
+            if (c == '/' && prevC == '/')
+                return normalize(path, i - 1, len);
+            prevC = c;
+        }
+        if (len > 1 && prevC == '/')
+            path = path.substring(0, len - 1);
+        return zfs.getBytes(path);
+    }
+
+    private byte[] normalize(String path, int off, int len) {
+        StringBuilder to = new StringBuilder(len);
+        to.append(path, 0, off);
+        int m = off;
+        char prevC = 0;
+        while (off < len) {
+            char c = path.charAt(off++);
+            if (c == '\\')
+                c = '/';
+            if (c == '/' && prevC == '/')
+                continue;
+            if (c == '\u0000')
+                throw new InvalidPathException(path,
+                                               "Path: nul character not allowed");
+            to.append(c);
+            prevC = c;
+        }
+        len = to.length();
+        if (len > 1 && prevC == '/')
+            to.delete(len -1, len);
+        return zfs.getBytes(to.toString());
+    }
+
     // Remove DotSlash(./) and resolve DotDot (..) components
     private byte[] getResolved() {
         for (int i = 0; i < path.length; i++) {
diff --git a/jdk/test/jdk/nio/zipfs/ZFSTests.java b/jdk/test/jdk/nio/zipfs/ZFSTests.java
index d9542601afe..ba485a56d98 100644
--- a/jdk/test/jdk/nio/zipfs/ZFSTests.java
+++ b/jdk/test/jdk/nio/zipfs/ZFSTests.java
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 7156873 8040059 8028480 8034773 8153248
+ * @bug 7156873 8040059 8028480 8034773 8153248 8061777
  * @summary ZipFileSystem regression tests
  *
  * @run main ZFSTests
@@ -43,6 +43,7 @@ public class ZFSTests {
 
     public static void main(String[] args) throws Throwable {
         test7156873();
+        test8061777();
         tests();
     }
 
@@ -62,6 +63,34 @@ public class ZFSTests {
         }
     }
 
+    static void test8061777() throws Throwable {
+        Path path = Paths.get("file.zip");
+        try {
+            URI uri = URI.create("jar:" + path.toUri());
+            Map<String, Object> env = new HashMap<String, Object>();
+            env.put("create", "true");
+            env.put("encoding", "Shift_JIS");
+            try (FileSystem fs = FileSystems.newFileSystem(uri, env)) {
+                FileSystemProvider fsp = fs.provider();
+                Path p = fs.getPath("/\u8868\u7533.txt");  // 0x95 0x5c 0x90 0x5c
+                try (OutputStream os = fsp.newOutputStream(p)) {
+                    os.write("Hello!".getBytes("ASCII"));
+                }
+                Path dir = fs.getPath("/");
+                Files.list(dir)
+                     .forEach( child -> {
+                             System.out.println("child:" + child);
+                             if (!child.toString().equals(p.toString()))
+                                 throw new RuntimeException("wrong path name created");
+                          });
+                if (!"Hello!".equals(new String(Files.readAllBytes(p), "ASCII")))
+                    throw new RuntimeException("wrong content in newly created file");
+            }
+        } finally {
+            Files.deleteIfExists(path);
+        }
+    }
+
     static void tests() throws Throwable {
         Path path = Paths.get("file.zip");
         try {

From b589f49334abc626b67aff1bce86081d0bc0182d Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Wed, 1 Jun 2016 11:16:58 -0700
Subject: [PATCH 208/228] 5040830: (ann) please improve toString() for
 annotations containing exception proxies

Reviewed-by: psandoz
---
 .../AnnotationInvocationHandler.java          | 31 ++++++++++++++++---
 .../AnnotationTypeMismatchExceptionProxy.java |  7 ++++-
 .../EnumConstantNotPresentExceptionProxy.java |  7 ++++-
 .../TypeNotPresentExceptionProxy.java         |  7 ++++-
 4 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java b/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java
index a69b32f2be4..b52f508b2b0 100644
--- a/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java
+++ b/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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 @@ import java.lang.annotation.*;
 import java.lang.reflect.*;
 import java.io.Serializable;
 import java.util.*;
+import java.util.stream.Collectors;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
@@ -158,13 +159,17 @@ class AnnotationInvocationHandler implements InvocationHandler, Serializable {
     }
 
     /**
-     * Translates a member value (in "dynamic proxy return form") into a string
+     * Translates a member value (in "dynamic proxy return form") into a string.
      */
     private static String memberValueToString(Object value) {
         Class<?> type = value.getClass();
-        if (!type.isArray())    // primitive, string, class, enum const,
-                                // or annotation
-            return value.toString();
+        if (!type.isArray()) {   // primitive, string, class, enum const,
+                                 // or annotation
+            if (type == Class.class)
+                return classValueToString((Class<?>) value);
+            else
+                return value.toString();
+        }
 
         if (type == byte[].class)
             return Arrays.toString((byte[]) value);
@@ -182,9 +187,25 @@ class AnnotationInvocationHandler implements InvocationHandler, Serializable {
             return Arrays.toString((short[]) value);
         if (type == boolean[].class)
             return Arrays.toString((boolean[]) value);
+        if (type == Class[].class)
+            return classArrayValueToString((Class<?>[])value);
         return Arrays.toString((Object[]) value);
     }
 
+    /**
+     * Translates a Class value to a form suitable for use in the
+     * string representation of an annotation.
+     */
+    private static String classValueToString(Class<?> clazz) {
+        return clazz.getName() + ".class" ;
+    }
+
+    private static String classArrayValueToString(Class<?>[] classes) {
+        return Arrays.stream(classes)
+            .map(AnnotationInvocationHandler::classValueToString)
+            .collect(Collectors.joining(", ", "{", "}"));
+    }
+
     /**
      * Implementation of dynamicProxy.equals(Object o)
      */
diff --git a/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java b/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java
index 76fce91e88c..bc5185e9fab 100644
--- a/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java
+++ b/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2016, 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,4 +56,9 @@ class AnnotationTypeMismatchExceptionProxy extends ExceptionProxy {
     protected RuntimeException generateException() {
         return new AnnotationTypeMismatchException(member, foundType);
     }
+
+    @Override
+    public String toString() {
+        return "/* Warning type mismatch! \"" + foundType + "\" */" ;
+    }
 }
diff --git a/jdk/src/java.base/share/classes/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java b/jdk/src/java.base/share/classes/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java
index 1cd640de293..18d79d109ec 100644
--- a/jdk/src/java.base/share/classes/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java
+++ b/jdk/src/java.base/share/classes/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2016, 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,4 +45,9 @@ public class EnumConstantNotPresentExceptionProxy extends ExceptionProxy {
     protected RuntimeException generateException() {
         return new EnumConstantNotPresentException(enumType, constName);
     }
+
+    @Override
+    public String toString() {
+        return constName + " /* Warning: constant not present! */";
+    }
 }
diff --git a/jdk/src/java.base/share/classes/sun/reflect/annotation/TypeNotPresentExceptionProxy.java b/jdk/src/java.base/share/classes/sun/reflect/annotation/TypeNotPresentExceptionProxy.java
index 5d0fde21af6..f71fb0da2e4 100644
--- a/jdk/src/java.base/share/classes/sun/reflect/annotation/TypeNotPresentExceptionProxy.java
+++ b/jdk/src/java.base/share/classes/sun/reflect/annotation/TypeNotPresentExceptionProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2016, 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,4 +45,9 @@ public class TypeNotPresentExceptionProxy extends ExceptionProxy {
     protected RuntimeException generateException() {
         return new TypeNotPresentException(typeName, cause);
     }
+
+    @Override
+    public String toString() {
+        return typeName + ".class /* Warning: type not present! */";
+    }
 }

From e48c0f85b22995e210c1304c5853fcaae114caad Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Wed, 1 Jun 2016 11:22:06 -0700
Subject: [PATCH 209/228] 8158430: Push tests for JDK-5040830

Reviewed-by: psandoz
---
 .../ExceptionalToString/AnnotationHost.java   | 29 ++++++++
 .../ExceptionalToStringTest.java              | 72 +++++++++++++++++++
 .../version1/DangerousAnnotation.java         | 33 +++++++++
 .../version1/Fleeting.java                    | 29 ++++++++
 .../ExceptionalToString/version1/Utopia.java  | 27 +++++++
 .../version2/DangerousAnnotation.java         | 33 +++++++++
 .../ExceptionalToString/version2/Utopia.java  | 27 +++++++
 7 files changed, 250 insertions(+)
 create mode 100644 jdk/test/java/lang/annotation/ExceptionalToString/AnnotationHost.java
 create mode 100644 jdk/test/java/lang/annotation/ExceptionalToString/ExceptionalToStringTest.java
 create mode 100644 jdk/test/java/lang/annotation/ExceptionalToString/version1/DangerousAnnotation.java
 create mode 100644 jdk/test/java/lang/annotation/ExceptionalToString/version1/Fleeting.java
 create mode 100644 jdk/test/java/lang/annotation/ExceptionalToString/version1/Utopia.java
 create mode 100644 jdk/test/java/lang/annotation/ExceptionalToString/version2/DangerousAnnotation.java
 create mode 100644 jdk/test/java/lang/annotation/ExceptionalToString/version2/Utopia.java

diff --git a/jdk/test/java/lang/annotation/ExceptionalToString/AnnotationHost.java b/jdk/test/java/lang/annotation/ExceptionalToString/AnnotationHost.java
new file mode 100644
index 00000000000..3bb5eb156a9
--- /dev/null
+++ b/jdk/test/java/lang/annotation/ExceptionalToString/AnnotationHost.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2016, 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.
+ */
+
+@DangerousAnnotation(utopia=Utopia.BRIGADOON,
+                     thirtyTwoBitsAreNotEnough=42,
+                     classy=Fleeting.class,
+                     classies={Object.class, int.class},
+                     moreClassies={})
+public class AnnotationHost {}
diff --git a/jdk/test/java/lang/annotation/ExceptionalToString/ExceptionalToStringTest.java b/jdk/test/java/lang/annotation/ExceptionalToString/ExceptionalToStringTest.java
new file mode 100644
index 00000000000..8169c8d8235
--- /dev/null
+++ b/jdk/test/java/lang/annotation/ExceptionalToString/ExceptionalToStringTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2016, 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     5040830
+ * @summary Verify information annotation strings with exception proxies
+ * @compile -sourcepath version1 version1/Fleeting.java  version1/Utopia.java version1/DangerousAnnotation.java
+ * @compile  AnnotationHost.java
+ * @build ExceptionalToStringTest
+ * @run main ExceptionalToStringTest
+ * @clean Utopia DangerousAnnotation
+ * @compile -sourcepath version2 -implicit:none version2/Utopia.java
+ * @compile -sourcepath version2 -implicit:none version2/DangerousAnnotation.java
+ * @clean Fleeting
+ * @run main ExceptionalToStringTest
+ */
+
+/**
+ * There are three potential exception conditions which can occur
+ * reading annotations:
+ *
+ * EnumConstantNotPresentException - "Thrown when an application tries
+ * to access an enum constant by name and the enum type contains no
+ * constant with the specified name."
+ *
+ * AnnotationTypeMismatchException - "Thrown to indicate that a
+ * program has attempted to access an element of an annotation whose
+ * type has changed after the annotation was compiled (or serialized)"
+ *
+ * TypeNotPresentException - "Thrown when an application tries to
+ * access a type using a string representing the type's name, but no
+ * definition for the type with the specified name can be found."
+ *
+ * The test reads an annotation, DangerousAnnotation, which can
+ * display all three pathologies. The pathologies are <em>not</em>
+ * present when the version1 sources are used but are present with the
+ * version2 sources. The version2 sources remove an enum constant
+ * (EnumConstantNotPresentException), change the return type of an
+ * annotation method (AnnotationTypeMismatchException), and remove a
+ * type whose Class literal is referenced (TypeNotPresentException).
+ */
+public class ExceptionalToStringTest {
+    public static void main(String... args) {
+        String annotationAsString = AnnotationHost.class.getAnnotation(DangerousAnnotation.class).toString();
+
+        // Verify no occurrence of "ExceptionProxy" in the string.
+        if (annotationAsString.indexOf("ExceptionProxy") != -1) {
+            throw new RuntimeException();
+        }
+    }
+}
diff --git a/jdk/test/java/lang/annotation/ExceptionalToString/version1/DangerousAnnotation.java b/jdk/test/java/lang/annotation/ExceptionalToString/version1/DangerousAnnotation.java
new file mode 100644
index 00000000000..d339e575b65
--- /dev/null
+++ b/jdk/test/java/lang/annotation/ExceptionalToString/version1/DangerousAnnotation.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2016, 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 java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface DangerousAnnotation {
+    Utopia utopia();
+    int thirtyTwoBitsAreNotEnough();
+    Class<?> classy();
+    Class<?>[] classies();
+    Class<?>[] moreClassies();
+}
diff --git a/jdk/test/java/lang/annotation/ExceptionalToString/version1/Fleeting.java b/jdk/test/java/lang/annotation/ExceptionalToString/version1/Fleeting.java
new file mode 100644
index 00000000000..3c74c6513b7
--- /dev/null
+++ b/jdk/test/java/lang/annotation/ExceptionalToString/version1/Fleeting.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2016, 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 java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Fleeting {
+    int value();
+}
diff --git a/jdk/test/java/lang/annotation/ExceptionalToString/version1/Utopia.java b/jdk/test/java/lang/annotation/ExceptionalToString/version1/Utopia.java
new file mode 100644
index 00000000000..536b15a7cdf
--- /dev/null
+++ b/jdk/test/java/lang/annotation/ExceptionalToString/version1/Utopia.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2016, 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.
+ */
+
+public enum Utopia {
+    SHANGRI_LA,
+    BRIGADOON;  // Only there one day out of every 100 years.
+}
diff --git a/jdk/test/java/lang/annotation/ExceptionalToString/version2/DangerousAnnotation.java b/jdk/test/java/lang/annotation/ExceptionalToString/version2/DangerousAnnotation.java
new file mode 100644
index 00000000000..a6e4d3d8bd1
--- /dev/null
+++ b/jdk/test/java/lang/annotation/ExceptionalToString/version2/DangerousAnnotation.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2016, 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 java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface DangerousAnnotation {
+    Utopia utopia();
+    long thirtyTwoBitsAreNotEnough();
+    Class<?> classy();
+    Class<?>[] classies();
+    Class<?>[] moreClassies();
+}
diff --git a/jdk/test/java/lang/annotation/ExceptionalToString/version2/Utopia.java b/jdk/test/java/lang/annotation/ExceptionalToString/version2/Utopia.java
new file mode 100644
index 00000000000..05ff37677e8
--- /dev/null
+++ b/jdk/test/java/lang/annotation/ExceptionalToString/version2/Utopia.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2016, 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.
+ */
+
+public enum Utopia {
+    SHANGRI_LA;
+  //BRIGADOON -- Only there one day out of every 100 years.
+}

From fae6e03a9b3fb2d2f9ecc14329e3ac4f4af242cc Mon Sep 17 00:00:00 2001
From: Stuart Marks <smarks@openjdk.org>
Date: Wed, 1 Jun 2016 13:47:55 -0700
Subject: [PATCH 210/228] 8059361: Properties.stringPropertyNames() returns a
 set inconsistent with the assertions from the spec

Reviewed-by: mchung
---
 .../share/classes/java/util/Properties.java        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/jdk/src/java.base/share/classes/java/util/Properties.java b/jdk/src/java.base/share/classes/java/util/Properties.java
index c2b93d250bf..85e294d3340 100644
--- a/jdk/src/java.base/share/classes/java/util/Properties.java
+++ b/jdk/src/java.base/share/classes/java/util/Properties.java
@@ -1037,18 +1037,18 @@ class Properties extends Hashtable<Object,Object> {
     }
 
     /**
-     * Returns a set of keys in this property list where
-     * the key and its corresponding value are strings,
+     * Returns an unmodifiable set of keys from this property list
+     * where the key and its corresponding value are strings,
      * including distinct keys in the default property list if a key
      * of the same name has not already been found from the main
      * properties list.  Properties whose key or value is not
      * of type {@code String} are omitted.
      * <p>
-     * The returned set is not backed by the {@code Properties} object.
-     * Changes to this {@code Properties} are not reflected in the set,
-     * or vice versa.
+     * The returned set is not backed by this {@code Properties} object.
+     * Changes to this {@code Properties} object are not reflected in the
+     * returned set.
      *
-     * @return  a set of keys in this property list where
+     * @return  an unmodifiable set of keys in this property list where
      *          the key and its corresponding value are strings,
      *          including the keys in the default property list.
      * @see     java.util.Properties#defaults
@@ -1057,7 +1057,7 @@ class Properties extends Hashtable<Object,Object> {
     public Set<String> stringPropertyNames() {
         Map<String, String> h = new HashMap<>();
         enumerateStringProperties(h);
-        return h.keySet();
+        return Collections.unmodifiableSet(h.keySet());
     }
 
     /**

From 7cc6c1d5539358dbc5bbc5a2433630767c08e9bb Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Wed, 1 Jun 2016 15:28:05 -0700
Subject: [PATCH 211/228] 8158451: Problem list IncludeLocalesPluginTest.java

Reviewed-by: naoto
---
 jdk/test/ProblemList.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 460bb67a16c..ce5beab2b06 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -397,5 +397,6 @@ com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java                   8141370 linux-i5
 
 # core_tools
 
-############################################################################
+tools/jlink/plugins/IncludeLocalesPluginTest.java               8158272 generic-all
 
+############################################################################

From 3eec24e5601e05706eb65a872bde11650b67b3c4 Mon Sep 17 00:00:00 2001
From: Michael Haupt <mhaupt@openjdk.org>
Date: Thu, 2 Jun 2016 14:28:16 +0200
Subject: [PATCH 212/228] 8156868: MethodHandles.zero(Class) doc issues

Reviewed-by: psandoz, mhaupt
---
 .../share/classes/java/lang/invoke/MemberName.java          | 2 +-
 .../share/classes/java/lang/invoke/MethodHandle.java        | 2 +-
 .../share/classes/java/lang/invoke/MethodHandles.java       | 1 +
 .../java.base/share/classes/jdk/internal/misc/Unsafe.java   | 6 +++---
 jdk/src/jdk.unsupported/share/classes/sun/misc/Unsafe.java  | 6 +++---
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MemberName.java b/jdk/src/java.base/share/classes/java/lang/invoke/MemberName.java
index 0154bf39373..c720ca82a8a 100644
--- a/jdk/src/java.base/share/classes/java/lang/invoke/MemberName.java
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/MemberName.java
@@ -54,7 +54,7 @@ import java.util.Objects;
  * a naked name/type pair.
  * A member name may also have non-zero modifier flags.
  * Finally, a member name may be either resolved or unresolved.
- * If it is resolved, the existence of the named
+ * If it is resolved, the existence of the named member has been determined by the JVM.
  * <p>
  * Whether resolved or not, a member name provides no access rights or
  * invocation capability to its possessor.  It is merely a compact
diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandle.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandle.java
index ac260aac481..13a3e0a990e 100644
--- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandle.java
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandle.java
@@ -645,7 +645,7 @@ public abstract class MethodHandle {
      * <p>
      * This method is also equivalent to the following code:
      * <blockquote><pre>{@code
-     *   invokeWithArguments(arguments.toArray()
+     *   invokeWithArguments(arguments.toArray())
      * }</pre></blockquote>
      *
      * @param arguments the arguments to pass to the target
diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
index 716d62ff177..debe9e3928d 100644
--- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -3016,6 +3016,7 @@ assert((int)twice.invokeExact(21) == 42);
      * @throws NullPointerException if the argument is null
      * @see MethodHandles#constant
      * @see MethodHandles#empty
+     * @see MethodHandles#explicitCastArguments
      * @since 9
      */
     public static  MethodHandle zero(Class<?> type) {
diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/Unsafe.java b/jdk/src/java.base/share/classes/jdk/internal/misc/Unsafe.java
index bc7aaa5a6f3..f4e11a3378a 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/misc/Unsafe.java
+++ b/jdk/src/java.base/share/classes/jdk/internal/misc/Unsafe.java
@@ -90,9 +90,9 @@ public final class Unsafe {
      *
      * (It may assist compilers to make the local variable {@code final}.)
      *
-     * @throws  SecurityException  if a security manager exists and its
-     *          {@code checkPropertiesAccess} method doesn't allow
-     *          access to the system properties.
+     * @throws  SecurityException if the class loader of the caller
+     *          class is not in the system domain in which all permissions
+     *          are granted.
      */
     @CallerSensitive
     public static Unsafe getUnsafe() {
diff --git a/jdk/src/jdk.unsupported/share/classes/sun/misc/Unsafe.java b/jdk/src/jdk.unsupported/share/classes/sun/misc/Unsafe.java
index 17b1673a5f8..54971142527 100644
--- a/jdk/src/jdk.unsupported/share/classes/sun/misc/Unsafe.java
+++ b/jdk/src/jdk.unsupported/share/classes/sun/misc/Unsafe.java
@@ -87,9 +87,9 @@ public final class Unsafe {
      *
      * (It may assist compilers to make the local variable {@code final}.)
      *
-     * @throws  SecurityException  if a security manager exists and its
-     *          {@code checkPropertiesAccess} method doesn't allow
-     *          access to the system properties.
+     * @throws  SecurityException if the class loader of the caller
+     *          class is not in the system domain in which all permissions
+     *          are granted.
      */
     @CallerSensitive
     public static Unsafe getUnsafe() {

From 09bca1c57609e44a01178723c92219de71851f29 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Thu, 2 Jun 2016 10:52:55 -0700
Subject: [PATCH 213/228] 8158551: BigDecimal.sqrt javadoc typo

Reviewed-by: bpb, lancea
---
 jdk/src/java.base/share/classes/java/math/BigDecimal.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdk/src/java.base/share/classes/java/math/BigDecimal.java b/jdk/src/java.base/share/classes/java/math/BigDecimal.java
index 162daf9458c..5feb70fec43 100644
--- a/jdk/src/java.base/share/classes/java/math/BigDecimal.java
+++ b/jdk/src/java.base/share/classes/java/math/BigDecimal.java
@@ -2026,7 +2026,7 @@ public class BigDecimal extends Number implements Comparable<BigDecimal> {
      * <li> The square root of a number numerically equal to {@code
      * ZERO} is numerically equal to {@code ZERO} with a preferred
      * scale according to the general rule above. In particular, for
-     * {@code ZERO}}, {@code ZERO.sqrt(mc).equals(ZERO)} is true with
+     * {@code ZERO}, {@code ZERO.sqrt(mc).equals(ZERO)} is true with
      * any {@code MathContext} as an argument.
      * </ul>
      *

From 5223193974383cc57f7d1b5a32715f41e00ef620 Mon Sep 17 00:00:00 2001
From: Rajan Halade <rhalade@openjdk.org>
Date: Thu, 2 Jun 2016 12:25:17 -0700
Subject: [PATCH 214/228] 8158560: Mark
 java/rmi/transport/dgcDeadLock/DGCDeadLock.java as intermittently faiing

Reviewed-by: smarks
---
 jdk/test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jdk/test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java b/jdk/test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java
index fc7ae3cd818..07ff7e8368b 100644
--- a/jdk/test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java
+++ b/jdk/test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java
@@ -23,6 +23,7 @@
 
 /* @test
  * @bug 4118056
+ * @key intermittent
  *
  * @summary synopsis: Distributed Garbage Collection Deadlock
  * @author Laird Dornin

From 2242da0821b51ed023c9004e94cc14594586c74d Mon Sep 17 00:00:00 2001
From: Lana Steuck <lana@openjdk.org>
Date: Thu, 2 Jun 2016 20:33:32 +0000
Subject: [PATCH 215/228] Added tag jdk-9+121 for changeset 3bad4c36820b

---
 .hgtags-top-repo | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index cdd21c19b18..e2dc6b4675a 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -363,3 +363,4 @@ e882bcdbdac436523f3d5681611d3118a3804ea7 jdk-9+117
 047f95de8f918d8ff5e8cd2636a2abb5c3c8adb8 jdk-9+118
 3463a3f14f0f0e8a68f29ac6405454f2fa2f598a jdk-9+119
 647e0142a5a52749db572b5e6638d561def6479e jdk-9+120
+cae471d3b87783e0a3deea658e1e1c84b2485b6c jdk-9+121

From fc591b926e03ff9753032b1d2be574dcb057185d Mon Sep 17 00:00:00 2001
From: Lana Steuck <lana@openjdk.org>
Date: Thu, 2 Jun 2016 20:33:33 +0000
Subject: [PATCH 216/228] Added tag jdk-9+121 for changeset 108280e801f9

---
 corba/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/corba/.hgtags b/corba/.hgtags
index 284ccf7a0d8..437df39d7c9 100644
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -363,3 +363,4 @@ cc30faa2da498c478e89ab062ff160653ca1b170 jdk-9+113
 8c2c2d17f7ce92a31c9ccb44a122ec62f5a85ace jdk-9+118
 daf533920b1266603b5cbdab31908d2a931c5361 jdk-9+119
 5943b791e131e79b969d4cea053aecda34801723 jdk-9+120
+9a5fc5a27560ac272c1341f8f3838338fba49059 jdk-9+121

From cfb3655bc618d0c00eb8db0fe278febe5343ecca Mon Sep 17 00:00:00 2001
From: Lana Steuck <lana@openjdk.org>
Date: Thu, 2 Jun 2016 20:33:33 +0000
Subject: [PATCH 217/228] Added tag jdk-9+121 for changeset 513b90c8a326

---
 hotspot/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index c500fce7e12..4b18014763f 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -523,3 +523,4 @@ b64432bae5271735fd53300b2005b713e98ef411 jdk-9+114
 9b1075cac08dc836ec32e7b368415cbe3aceaf8c jdk-9+118
 15f3fe264872766bcb205696198f0c1502420e17 jdk-9+119
 0be6f4f5d18671184e62583668cb1d783dffa128 jdk-9+120
+7e293105dbb0789a468655f81320c891f491f371 jdk-9+121

From 5f8d8da22bd95dd1b9435c7adf92f4234d95b986 Mon Sep 17 00:00:00 2001
From: Lana Steuck <lana@openjdk.org>
Date: Thu, 2 Jun 2016 20:33:35 +0000
Subject: [PATCH 218/228] Added tag jdk-9+121 for changeset 2435017e82ff

---
 jdk/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jdk/.hgtags b/jdk/.hgtags
index 7ac8e6be416..c2d931e50a9 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -363,3 +363,4 @@ baeb5edb38939cdb78ae0ac6f4fd368465cbf188 jdk-9+116
 e1eba5cfa5cc8c66d524396a05323dc93568730a jdk-9+118
 bad3f8a33db271a6143ba6eac0c8bd5bbd942417 jdk-9+119
 b9a518bf72516954e57ac2f6e3ef21e13008f1cd jdk-9+120
+ee29aaab5889555ea56e4c0ed690aabb7613529d jdk-9+121

From 98e2f679cf4d8ce2e280f49d3dd6ff55f9cad231 Mon Sep 17 00:00:00 2001
From: Xueming Shen <sherman@openjdk.org>
Date: Thu, 2 Jun 2016 14:03:50 -0700
Subject: [PATCH 219/228] 8158482: regex UNICODE_CHARACTER_CLASS flag cannot be
 disabled with an embedded flag expression

Reviewed-by: bpb
---
 .../classes/java/util/regex/Pattern.java      |  1 +
 jdk/test/java/util/regex/RegExTest.java       | 21 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/jdk/src/java.base/share/classes/java/util/regex/Pattern.java b/jdk/src/java.base/share/classes/java/util/regex/Pattern.java
index f94f2145a2f..91ce6bc9732 100644
--- a/jdk/src/java.base/share/classes/java/util/regex/Pattern.java
+++ b/jdk/src/java.base/share/classes/java/util/regex/Pattern.java
@@ -3194,6 +3194,7 @@ loop:   for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
                 break;
             case 'U':
                 flags &= ~(UNICODE_CHARACTER_CLASS | UNICODE_CASE);
+                break;
             default:
                 return;
             }
diff --git a/jdk/test/java/util/regex/RegExTest.java b/jdk/test/java/util/regex/RegExTest.java
index 34f9cdbfc60..64eb2d0f76c 100644
--- a/jdk/test/java/util/regex/RegExTest.java
+++ b/jdk/test/java/util/regex/RegExTest.java
@@ -34,7 +34,7 @@
  * 7067045 7014640 7189363 8007395 8013252 8013254 8012646 8023647 6559590
  * 8027645 8035076 8039124 8035975 8074678 6854417 8143854 8147531 7071819
  * 8151481 4867170 7080302 6728861 6995635 6736245 4916384
- * 6328855 6192895 6345469 6988218 6693451 7006761 8140212 8143282
+ * 6328855 6192895 6345469 6988218 6693451 7006761 8140212 8143282 8158482
  *
  * @library /lib/testlibrary
  * @build jdk.testlibrary.*
@@ -164,6 +164,7 @@ public class RegExTest {
         groupCurlyBackoffTest();
         patternAsPredicate();
         invalidFlags();
+        embeddedFlags();
         grapheme();
         expoBacktracking();
 
@@ -4675,6 +4676,24 @@ public class RegExTest {
         report("Invalid compile flags");
     }
 
+    // This test is for 8158482
+    private static void embeddedFlags() throws Exception {
+        try {
+            Pattern.compile("(?i).(?-i).");
+            Pattern.compile("(?m).(?-m).");
+            Pattern.compile("(?s).(?-s).");
+            Pattern.compile("(?d).(?-d).");
+            Pattern.compile("(?u).(?-u).");
+            Pattern.compile("(?c).(?-c).");
+            Pattern.compile("(?x).(?-x).");
+            Pattern.compile("(?U).(?-U).");
+            Pattern.compile("(?imsducxU).(?-imsducxU).");
+        } catch (PatternSyntaxException x) {
+            failCount++;
+        }
+        report("Embedded flags");
+    }
+
     private static void grapheme() throws Exception {
         Files.lines(Paths.get(System.getProperty("test.src", "."),
                               "GraphemeBreakTest.txt"))

From 74c27aab0f63e4ab78af2be8bc9350bd1ebef2ec Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Thu, 2 Jun 2016 16:39:14 -0700
Subject: [PATCH 220/228] 8157892: StackFrame::getFileName returns null when a
 source file exists for native methods 8157977: getByteCodeIndex method from
 StackFrame does not return negative number when StackFrame is a native frame

Reviewed-by: dfuchs, bchristi
---
 .../classes/java/lang/StackFrameInfo.java     | 12 ++--
 .../java/lang/StackWalker/NativeMethod.java   | 72 +++++++++++++++++++
 2 files changed, 78 insertions(+), 6 deletions(-)
 create mode 100644 jdk/test/java/lang/StackWalker/NativeMethod.java

diff --git a/jdk/src/java.base/share/classes/java/lang/StackFrameInfo.java b/jdk/src/java.base/share/classes/java/lang/StackFrameInfo.java
index 376b91e09ea..e731685dbb8 100644
--- a/jdk/src/java.base/share/classes/java/lang/StackFrameInfo.java
+++ b/jdk/src/java.base/share/classes/java/lang/StackFrameInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,8 +29,6 @@ import jdk.internal.misc.SharedSecrets;
 
 import static java.lang.StackWalker.Option.*;
 import java.lang.StackWalker.StackFrame;
-import java.util.Optional;
-import java.util.OptionalInt;
 
 class StackFrameInfo implements StackFrame {
     private final static JavaLangInvokeAccess JLIA =
@@ -82,19 +80,21 @@ class StackFrameInfo implements StackFrame {
 
     @Override
     public int getByteCodeIndex() {
+        // bci not available for native methods
+        if (isNativeMethod())
+            return -1;
+
         return bci;
     }
 
     @Override
     public String getFileName() {
-        if (isNativeMethod())
-            return null;
-
         return toStackTraceElement().getFileName();
     }
 
     @Override
     public int getLineNumber() {
+        // line number not available for native methods
         if (isNativeMethod())
             return -2;
 
diff --git a/jdk/test/java/lang/StackWalker/NativeMethod.java b/jdk/test/java/lang/StackWalker/NativeMethod.java
new file mode 100644
index 00000000000..d6849649254
--- /dev/null
+++ b/jdk/test/java/lang/StackWalker/NativeMethod.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2016, 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 8157892 8157977
+ * @summary Verify file name, line number and bci of native methods
+ * @run main NativeMethod
+ */
+
+import java.lang.StackWalker.Option;
+import java.lang.StackWalker.StackFrame;
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class NativeMethod {
+    public static void main(String... args) throws Exception {
+        new NativeMethod().test();
+    }
+
+    private final StackWalker walker;
+    NativeMethod() {
+        this.walker = StackWalker.getInstance(Option.SHOW_REFLECT_FRAMES);
+    }
+
+    void test() throws Exception {
+        // invoke via reflection that includes native methods
+        Method m = NativeMethod.class.getDeclaredMethod("walk");
+        m.invoke(this);
+    }
+
+    void walk() {
+        List<StackFrame> nativeFrames = walker.walk(s ->
+            s.filter(StackFrame::isNativeMethod)
+             .collect(Collectors.toList())
+        );
+
+        assertTrue(nativeFrames.size() > 0, "native frame not found");
+        for (StackFrame f : nativeFrames) {
+            assertTrue(f.getFileName() != null, "source file expected to be found");
+            assertTrue(f.getLineNumber() < 0, "line number expected to be unavailable");
+            assertTrue(f.getByteCodeIndex() < 0, "bci expected to be unavailable");
+        }
+
+    }
+
+    private static void assertTrue(boolean value, String msg) {
+        if (value != true)
+            throw new AssertionError(msg);
+    }
+}

From 05e9b6b110783edd48ad23980235e408ac698f5f Mon Sep 17 00:00:00 2001
From: Chris Hegarty <chegar@openjdk.org>
Date: Fri, 3 Jun 2016 13:45:30 +0100
Subject: [PATCH 221/228] 8158525: Update a few java/net tests to use the
 loopback address instead of the host address

Reviewed-by: rriggs
---
 .../net/CookieHandler/CookieManagerTest.java  | 37 ++++++++++++++-----
 .../HttpURLConnection/UnmodifiableMaps.java   |  8 ++--
 .../HandleContentTypeWithAttrs.java           |  7 ++--
 3 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/jdk/test/java/net/CookieHandler/CookieManagerTest.java b/jdk/test/java/net/CookieHandler/CookieManagerTest.java
index ac4dc503c44..077a087c123 100644
--- a/jdk/test/java/net/CookieHandler/CookieManagerTest.java
+++ b/jdk/test/java/net/CookieHandler/CookieManagerTest.java
@@ -25,6 +25,7 @@
  * @test
  * @summary Unit test for java.net.CookieManager
  * @bug 6244040 7150552 7051862
+ * @modules jdk.httpserver
  * @run main/othervm -ea CookieManagerTest
  * @author Edward Wang
  */
@@ -32,12 +33,31 @@
 import com.sun.net.httpserver.*;
 import java.io.IOException;
 import java.net.*;
+import static java.net.Proxy.NO_PROXY;
 
 public class CookieManagerTest {
 
     static CookieTransactionHandler httpTrans;
     static HttpServer server;
 
+    static final String hostAddress = getAddr();
+
+    /** Returns an IP literal suitable for use by the test. */
+    static String getAddr() {
+        try {
+            InetAddress lh = InetAddress.getLocalHost();
+            System.out.println("Trying: " + lh);
+            if (lh.isReachable(5_000)) {
+                System.out.println("Using: " + lh);
+                return lh.getHostAddress();
+            }
+        } catch (IOException x) {
+            System.out.println("Debug: caught:" + x);
+        }
+        System.out.println("Using: \"127.0.0.1\"");
+        return "127.0.0.1";
+    }
+
     public static void main(String[] args) throws Exception {
         startHttpServer();
         makeHttpCall();
@@ -78,8 +98,8 @@ public class CookieManagerTest {
 
     public static void makeHttpCall() throws IOException {
         try {
-            System.out.println("http server listenining on: "
-                    + server.getAddress().getPort());
+            int port = server.getAddress().getPort();
+            System.out.println("http server listenining on: " + port);
 
             // install CookieManager to use
             CookieHandler.setDefault(new CookieManager());
@@ -92,11 +112,12 @@ public class CookieManagerTest {
                 ((CookieManager)CookieHandler.getDefault())
                     .getCookieStore().removeAll();
                 URL url = new URL("http" ,
-                                  InetAddress.getLocalHost().getHostAddress(),
+                                  hostAddress,
                                   server.getAddress().getPort(),
                                   CookieTransactionHandler.testCases[i][0]
                                                           .serverPath);
-                HttpURLConnection uc = (HttpURLConnection)url.openConnection();
+                System.out.println("Requesting " + url);
+                HttpURLConnection uc = (HttpURLConnection)url.openConnection(NO_PROXY);
                 uc.getResponseCode();
                 uc.disconnect();
             }
@@ -116,8 +137,6 @@ class CookieTransactionHandler implements HttpHandler {
     // to send http request
     public static final int testCount = 6;
 
-    private String localHostAddr = "127.0.0.1";
-
     @Override
     public void handle(HttpExchange exchange) throws IOException {
         if (testDone < testCases[testcaseDone].length) {
@@ -188,10 +207,8 @@ class CookieTransactionHandler implements HttpHandler {
         testCases = new CookieTestCase[testCount][];
         testPolicies = new CookiePolicy[testCount];
 
-        try {
-            localHostAddr = InetAddress.getLocalHost().getHostAddress();
-        } catch (Exception ignored) {
-        };
+        String localHostAddr = CookieManagerTest.hostAddress;
+
         int count = 0;
 
         // an http session with Netscape cookies exchanged
diff --git a/jdk/test/java/net/HttpURLConnection/UnmodifiableMaps.java b/jdk/test/java/net/HttpURLConnection/UnmodifiableMaps.java
index 40205c893ae..c8c6e1b54f6 100644
--- a/jdk/test/java/net/HttpURLConnection/UnmodifiableMaps.java
+++ b/jdk/test/java/net/HttpURLConnection/UnmodifiableMaps.java
@@ -24,11 +24,11 @@
 /**
  * @test
  * @bug 7128648
+ * @modules jdk.httpserver
  * @summary HttpURLConnection.getHeaderFields should return an unmodifiable Map
  */
 
 import java.io.IOException;
-import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.net.HttpURLConnection;
@@ -40,6 +40,7 @@ import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.Headers;
+import static java.net.Proxy.NO_PROXY;
 
 public class UnmodifiableMaps {
 
@@ -47,8 +48,7 @@ public class UnmodifiableMaps {
         HttpServer server = startHttpServer();
         try {
             InetSocketAddress address = server.getAddress();
-            URI uri = new URI("http://" + InetAddress.getLocalHost().getHostAddress()
-                              + ":" + address.getPort() + "/foo");
+            URI uri = new URI("http://localhost:" + address.getPort() + "/foo");
             doClient(uri);
         } finally {
             server.stop(0);
@@ -56,7 +56,7 @@ public class UnmodifiableMaps {
     }
 
     void doClient(URI uri) throws Exception {
-        HttpURLConnection uc = (HttpURLConnection) uri.toURL().openConnection();
+        HttpURLConnection uc = (HttpURLConnection) uri.toURL().openConnection(NO_PROXY);
 
         // Test1: getRequestProperties is unmodifiable
         System.out.println("Check getRequestProperties");
diff --git a/jdk/test/java/net/URLConnection/HandleContentTypeWithAttrs.java b/jdk/test/java/net/URLConnection/HandleContentTypeWithAttrs.java
index fd1430bf00d..fe1f40471b2 100644
--- a/jdk/test/java/net/URLConnection/HandleContentTypeWithAttrs.java
+++ b/jdk/test/java/net/URLConnection/HandleContentTypeWithAttrs.java
@@ -32,6 +32,7 @@ import java.net.*;
 import java.io.*;
 import sun.net.www.content.text.*;
 import sun.net.www.MessageHeader;
+import static java.net.Proxy.NO_PROXY;
 
 public class HandleContentTypeWithAttrs {
 
@@ -39,13 +40,11 @@ public class HandleContentTypeWithAttrs {
 
     public HandleContentTypeWithAttrs (int port) throws Exception {
 
-        String localHostName = InetAddress.getLocalHost().getHostName();
-
         // Request echo.html from myHttpServer.
         // In the header of the response, we make
         // the content type have some attributes.
-        url = new URL("http://" + localHostName + ":" + port + "/echo.html");
-        URLConnection urlConn = url.openConnection();
+        url = new URL("http://localhost:" + port + "/echo.html");
+        URLConnection urlConn = url.openConnection(NO_PROXY);
 
         // the method getContent() calls the method
         // getContentHandler(). With the fix, the method

From 9ee4886e039a7747b10ee240642d7ec5f89b5d20 Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Fri, 3 Jun 2016 16:30:27 +0200
Subject: [PATCH 222/228] 8158540: Open only linux-x86 builds using Jib fails
 when building "minimal" jvm

Reviewed-by: dholmes
---
 common/conf/jib-profiles.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/conf/jib-profiles.js b/common/conf/jib-profiles.js
index 2d752fd1074..e495b304246 100644
--- a/common/conf/jib-profiles.js
+++ b/common/conf/jib-profiles.js
@@ -318,7 +318,8 @@ var getJibProfilesProfiles = function (input, common) {
         },
 
         "linux-x86-open": {
-            default_make_targets: "profiles"
+            default_make_targets: "profiles",
+            configure_args: "--with-jvm-variants=client,server"
         }
     };
     var openOnlyProfiles = concatObjects(openOnlyProfiles, openOnlyProfilesExtra);

From b1c5f2dfdd61a6be4bded0272023fd08eee03275 Mon Sep 17 00:00:00 2001
From: Michael McMahon <michaelm@openjdk.org>
Date: Fri, 3 Jun 2016 16:28:53 +0100
Subject: [PATCH 223/228] 8158651: ConcurrentModification exceptions in
 httpclient

Reviewed-by: rriggs
---
 .../share/classes/java/net/http/Http2Connection.java |  2 +-
 .../share/classes/java/net/http/Stream.java          | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/jdk/src/java.httpclient/share/classes/java/net/http/Http2Connection.java b/jdk/src/java.httpclient/share/classes/java/net/http/Http2Connection.java
index 94ddc9b2bdb..780322f4b44 100644
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Http2Connection.java
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Http2Connection.java
@@ -367,7 +367,7 @@ class Http2Connection implements BufferHandler {
         Log.logError(t);
         closed = true;
         client2.deleteConnection(this);
-        Collection<Stream> c = streams.values();
+        List<Stream> c = new LinkedList<>(streams.values());
         for (Stream s : c) {
             s.cancelImpl(t);
         }
diff --git a/jdk/src/java.httpclient/share/classes/java/net/http/Stream.java b/jdk/src/java.httpclient/share/classes/java/net/http/Stream.java
index 51d71092fac..201aea650e3 100644
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Stream.java
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Stream.java
@@ -30,6 +30,7 @@ import java.io.IOException;
 import java.net.URI;
 import java.nio.ByteBuffer;
 import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
@@ -537,7 +538,7 @@ class Stream extends ExchangeImpl {
      * getResponseAsync()
      */
 
-    final List<CompletableFuture<HttpResponseImpl>> response_cfs = new LinkedList<>();
+    final List<CompletableFuture<HttpResponseImpl>> response_cfs = new ArrayList<>(5);
 
     @Override
     CompletableFuture<HttpResponseImpl> getResponseAsync(Void v) {
@@ -565,17 +566,16 @@ class Stream extends ExchangeImpl {
     void completeResponse(HttpResponse r) {
         HttpResponseImpl resp = (HttpResponseImpl)r;
         synchronized (response_cfs) {
-            for (CompletableFuture<HttpResponseImpl> cf : response_cfs) {
+            int cfs_len = response_cfs.size();
+            for (int i=0; i<cfs_len; i++) {
+                CompletableFuture<HttpResponseImpl> cf = response_cfs.get(i);
                 if (!cf.isDone()) {
                     cf.complete(resp);
                     response_cfs.remove(cf);
-                    //responseHeaders = new HttpHeadersImpl(); // for any following header blocks
                     return;
-                } else
-                    System.err.println("Stream: " + this + " ALREADY DONE");
+                }
             }
             response_cfs.add(CompletableFuture.completedFuture(resp));
-            //responseHeaders = new HttpHeadersImpl(); // for any following header blocks
         }
     }
 

From 10a92943ae9a5aee084f2625531ab929b254d8c0 Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Fri, 3 Jun 2016 12:26:45 -0700
Subject: [PATCH 224/228] 8158604:
 test/java/util/ResourceBundle/modules/appbasic missing @test

Reviewed-by: alanb, okutsu
---
 .../spi/AbstractResourceBundleProvider.java   | 31 +++++++++
 .../java/util/spi/ResourceBundleProvider.java | 28 +++++---
 .../modules/appbasic/appbasic.sh              | 68 +++++++++++++++++++
 .../test/resources/asia/MyResourcesAsia.java  | 34 ++++++----
 .../jdk/test/resources/eu/MyResourcesEU.java  | 37 ++++++----
 .../test/jdk/test/resources/MyControl.java    | 59 ----------------
 .../resources/MyResourcesProviderImpl.java    | 17 ++---
 7 files changed, 175 insertions(+), 99 deletions(-)
 create mode 100644 jdk/test/java/util/ResourceBundle/modules/appbasic/appbasic.sh
 delete mode 100644 jdk/test/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyControl.java

diff --git a/jdk/src/java.base/share/classes/java/util/spi/AbstractResourceBundleProvider.java b/jdk/src/java.base/share/classes/java/util/spi/AbstractResourceBundleProvider.java
index 1a6ee655be5..ba4cbdca200 100644
--- a/jdk/src/java.base/share/classes/java/util/spi/AbstractResourceBundleProvider.java
+++ b/jdk/src/java.base/share/classes/java/util/spi/AbstractResourceBundleProvider.java
@@ -40,6 +40,36 @@ import static sun.security.util.SecurityConstants.GET_CLASSLOADER_PERMISSION;
  * {@code AbstractResourceBundleProvider} is an abstract class for helping
  * implement the {@link ResourceBundleProvider} interface.
  *
+ * <p>
+ * Resource bundles can be packaged in a named module separated from
+ * the <em>caller module</em> loading the resource bundle, i.e. the module
+ * calling {@link ResourceBundle#getBundle(String)}.  For the caller module
+ * to load a resource bundle "{@code com.example.app.MyResources}"
+ * from another module and a service interface named
+ * "{@code com.example.app.MyResourcesProvider}",
+ * the <em>bundle provider module</em> can provide the implementation class
+ * as follows:
+ *
+ * <pre><code>
+ * import com.example.app.MyResourcesProvider;
+ * class MyResourcesProviderImpl extends AbstractResourceBundleProvider
+ *     implements MyResourcesProvider
+ * {</code>
+ *     {@code @Override
+ *     public ResourceBundle getBundle(String baseName, Locale locale) {
+ *         // this module only provides bundles in french
+ *         if (locale.equals(Locale.FRENCH)) {
+ *              return super.getBundle(baseName, locale);
+ *         }
+ *         return null;
+ *     }
+ * }}</pre>
+ *
+ * @see <a href="../ResourceBundle.html#bundleprovider">
+ *     Resource Bundles in Named Modules</a>
+ * @see <a href="../ResourceBundle.html#RBP_support">
+ *     ResourceBundleProvider Service Providers</a>
+ *
  * @since 9
  */
 public abstract class AbstractResourceBundleProvider implements ResourceBundleProvider {
@@ -125,6 +155,7 @@ public abstract class AbstractResourceBundleProvider implements ResourceBundlePr
         Module module = this.getClass().getModule();
         String bundleName = toBundleName(baseName, locale);
         ResourceBundle bundle = null;
+
         for (String format : formats) {
             try {
                 if (FORMAT_CLASS.equals(format)) {
diff --git a/jdk/src/java.base/share/classes/java/util/spi/ResourceBundleProvider.java b/jdk/src/java.base/share/classes/java/util/spi/ResourceBundleProvider.java
index 714ae625f08..0074ae32090 100644
--- a/jdk/src/java.base/share/classes/java/util/spi/ResourceBundleProvider.java
+++ b/jdk/src/java.base/share/classes/java/util/spi/ResourceBundleProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,13 +30,21 @@ import java.util.ResourceBundle;
 
 /**
  * {@code ResourceBundleProvider} is a provider interface that is used for
- * loading resource bundles. Implementation classes of this interface are loaded
- * with {@link java.util.ServiceLoader ServiceLoader} during a call to the
+ * loading resource bundles for named modules. Implementation classes of
+ * this interface are loaded with {@link java.util.ServiceLoader ServiceLoader}
+ * during a call to the
  * {@link ResourceBundle#getBundle(String, Locale, ClassLoader)
  * ResourceBundle.getBundle} method. The provider service type is determined by
- * {@code basename+"Provider"}. For example, if the base name is
- * "com.example.app.MyResources", {@code com.example.app.MyResourcesProvider}
- * will be the provider service type.
+ * {@code basename+"Provider"}.
+ *
+ * <p>
+ * For example, if the base name is "com.example.app.MyResources",
+ * {@code com.example.app.MyResourcesProvider} will be the provider service type:
+ * <pre>{@code
+ * public interface MyResourcesProvider extends ResourceBundleProvider {
+ * }
+ * }</pre>
+ *
  * <p>
  * This providers's {@link #getBundle(String, Locale) getBundle} method is called
  * through the resource bundle loading process instead of {@link
@@ -44,13 +52,17 @@ import java.util.ResourceBundle;
  * ResourceBundle.Control.newBundle()}. Refer to {@link ResourceBundle} for
  * details.
  *
+ * @see <a href="../ResourceBundle.html#bundleprovider">
+ *     Resource Bundles in Named Modules</a>
+ * @see <a href="../ResourceBundle.html#RBP_support">
+ *     ResourceBundleProvider Service Providers</a>
  * @since 9
  */
 public interface ResourceBundleProvider {
     /**
      * Returns a {@code ResourceBundle} for the given bundle name and locale.
-     * This method returns null if there is no {@code ResourceBundle} found
-     * for the given parameters.
+     * This method returns {@code null} if there is no {@code ResourceBundle}
+     * found for the given parameters.
      *
      *
      * @param baseName
diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic/appbasic.sh b/jdk/test/java/util/ResourceBundle/modules/appbasic/appbasic.sh
new file mode 100644
index 00000000000..a22b825318a
--- /dev/null
+++ b/jdk/test/java/util/ResourceBundle/modules/appbasic/appbasic.sh
@@ -0,0 +1,68 @@
+#
+# Copyright (c) 2015, 2016, 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 8044767
+# @summary Basic test for ResourceBundle with modules; named module "test"
+#          contains resource bundles for root and en, and separate named modules
+#          "eubundles" and "asiabundles" contain other resource bundles.
+
+set -e
+
+if [ -z "$TESTJAVA" ]; then
+  if [ $# -lt 1 ]; then exit 1; fi
+  TESTJAVA="$1"; shift
+  COMPILEJAVA="${TESTJAVA}"
+  TESTSRC="`pwd`"
+  TESTCLASSES="`pwd`"
+fi
+
+JAVAC="$COMPILEJAVA/bin/javac"
+JAVA="$TESTJAVA/bin/java"
+
+
+for I in eu asia
+do
+  B=${I}bundles
+  mkdir -p mods/$B
+  CLASSES="`find $TESTSRC/src/$B -name '*.java'`"
+  if [ "x$CLASSES" != x ]; then
+    $JAVAC -g -d mods -modulesourcepath $TESTSRC/src -cp mods/test $CLASSES
+  fi
+  PROPS="`(cd $TESTSRC/src/$B; find . -name '*.properties')`"
+  if [ "x$PROPS" != x ]; then
+      for P in $PROPS
+      do
+        D=`dirname $P`
+        mkdir -p mods/$B/$D
+        cp $TESTSRC/src/$B/$P mods/$B/$D/
+      done
+  fi
+done
+
+mkdir -p mods/test
+$JAVAC -g -d mods -modulesourcepath $TESTSRC/src `find $TESTSRC/src/test -name "*.java"`
+
+$JAVA -mp mods -m test/jdk.test.Main de fr ja zh-tw en de
+
+exit $?
diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResourcesAsia.java b/jdk/test/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResourcesAsia.java
index 059e109d74e..eb14465c841 100644
--- a/jdk/test/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResourcesAsia.java
+++ b/jdk/test/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResourcesAsia.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,23 +23,33 @@
 
 package jdk.test.resources.asia;
 
-import java.io.IOException;
 import java.util.Locale;
 import java.util.ResourceBundle;
-import java.util.ResourceBundle.Control;
-import jdk.test.resources.MyControl;
+import java.util.Set;
+import java.util.spi.AbstractResourceBundleProvider;
+
 import jdk.test.resources.MyResourcesProvider;
 
-public class MyResourcesAsia extends MyControl implements MyResourcesProvider {
+public class MyResourcesAsia extends AbstractResourceBundleProvider
+    implements MyResourcesProvider
+{
+    private static Set<Locale> asiaLocales
+        = Set.of(Locale.JAPANESE, Locale.CHINESE, Locale.TAIWAN);
+
+    @Override
+    public String toBundleName(String baseName, Locale locale) {
+        String bundleName = super.toBundleName(baseName, locale);
+        if (asiaLocales.contains(locale)) {
+            int index = bundleName.lastIndexOf('.');
+            return bundleName.substring(0, index + 1) + "asia" + bundleName.substring(index);
+        }
+        return bundleName;
+    }
+
     @Override
     public ResourceBundle getBundle(String baseName, Locale locale) {
-        if (isAsiaLocale(locale)) {
-            try {
-                ClassLoader loader = MyResourcesAsia.class.getClassLoader();
-                return newBundle(baseName, locale, "java.properties", loader, false);
-            } catch (IllegalAccessException | InstantiationException | IOException e) {
-                System.out.println(e);
-            }
+        if (asiaLocales.contains(locale)) {
+            return super.getBundle(baseName, locale);
         }
         return null;
     }
diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic/src/eubundles/jdk/test/resources/eu/MyResourcesEU.java b/jdk/test/java/util/ResourceBundle/modules/appbasic/src/eubundles/jdk/test/resources/eu/MyResourcesEU.java
index 29d36410e6b..b16d4126342 100644
--- a/jdk/test/java/util/ResourceBundle/modules/appbasic/src/eubundles/jdk/test/resources/eu/MyResourcesEU.java
+++ b/jdk/test/java/util/ResourceBundle/modules/appbasic/src/eubundles/jdk/test/resources/eu/MyResourcesEU.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,23 +23,36 @@
 
 package jdk.test.resources.eu;
 
-import java.io.IOException;
 import java.util.Locale;
 import java.util.ResourceBundle;
-import java.util.ResourceBundle.Control;
-import jdk.test.resources.MyControl;
+import java.util.Set;
+import java.util.spi.AbstractResourceBundleProvider;
+
 import jdk.test.resources.MyResourcesProvider;
 
-public class MyResourcesEU extends MyControl implements MyResourcesProvider {
+public class MyResourcesEU extends AbstractResourceBundleProvider
+    implements MyResourcesProvider
+{
+    private static final Set<Locale> euLocales = Set.of(Locale.GERMAN, Locale.FRENCH);
+
+    public MyResourcesEU() {
+        super("java.class");
+    }
+
+    @Override
+    public String toBundleName(String baseName, Locale locale) {
+        String bundleName = super.toBundleName(baseName, locale);
+        if (euLocales.contains(locale)) {
+            int index = bundleName.lastIndexOf('.');
+            return bundleName.substring(0, index + 1) + "eu" + bundleName.substring(index);
+        }
+        return bundleName;
+    }
+
     @Override
     public ResourceBundle getBundle(String baseName, Locale locale) {
-        if (isEULocale(locale)) {
-            try {
-                ClassLoader loader = MyResourcesEU.class.getClassLoader();
-                return newBundle(baseName, locale, "java.class", loader, false);
-            } catch (IllegalAccessException | InstantiationException | IOException e) {
-                System.out.println(e);
-            }
+        if (euLocales.contains(locale)) {
+            return super.getBundle(baseName, locale);
         }
         return null;
     }
diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyControl.java b/jdk/test/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyControl.java
deleted file mode 100644
index 0cf7f9b3f29..00000000000
--- a/jdk/test/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyControl.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2015, 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.test.resources;
-
-import java.util.*;
-
-public class MyControl extends ResourceBundle.Control {
-    private static final Set<Locale> euLocales, asiaLocales;
-
-    static {
-        euLocales = new HashSet<>(Arrays.asList(Locale.GERMAN, Locale.FRENCH));
-        asiaLocales = new HashSet<>(Arrays.asList(Locale.JAPANESE, Locale.CHINESE, Locale.TAIWAN));
-    }
-
-    @Override
-    public String toBundleName(String baseName, Locale locale) {
-        String bundleName = baseName;
-        if (euLocales.contains(locale)) {
-            bundleName = addRegion(baseName, "eu");
-        } else if (asiaLocales.contains(locale)) {
-            bundleName = addRegion(baseName, "asia");
-        }
-        return super.toBundleName(bundleName, locale);
-    }
-
-    private String addRegion(String baseName, String region) {
-        int index = baseName.lastIndexOf('.');
-        return baseName.substring(0, index + 1) + region + baseName.substring(index);
-    }
-
-    protected static boolean isEULocale(Locale locale) {
-        return euLocales.contains(locale);
-    }
-
-    protected static boolean isAsiaLocale(Locale locale) {
-        return asiaLocales.contains(locale);
-    }
-}
diff --git a/jdk/test/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyResourcesProviderImpl.java b/jdk/test/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyResourcesProviderImpl.java
index 91dec1fabf4..eef21d29416 100644
--- a/jdk/test/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyResourcesProviderImpl.java
+++ b/jdk/test/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyResourcesProviderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,20 @@
 
 package jdk.test.resources;
 
-import java.io.IOException;
 import java.util.Locale;
 import java.util.ResourceBundle;
+import java.util.spi.AbstractResourceBundleProvider;
 
-public class MyResourcesProviderImpl extends MyControl implements MyResourcesProvider {
+public class MyResourcesProviderImpl extends AbstractResourceBundleProvider
+    implements MyResourcesProvider
+{
+    public MyResourcesProviderImpl() {
+        super("java.class");
+    }
     @Override
     public ResourceBundle getBundle(String baseName, Locale locale) {
         if (locale.equals(Locale.ENGLISH) || locale.equals(Locale.ROOT)) {
-            try {
-                ClassLoader loader = MyResourcesProviderImpl.class.getClassLoader();
-                return newBundle(baseName, locale, "java.class", loader, false);
-            } catch (IllegalAccessException | InstantiationException | IOException e) {
-            }
+            return super.getBundle(baseName, locale);
         }
         return null;
     }

From 4afc77c7cc90e6d833afb251e3f0f690c66e53e2 Mon Sep 17 00:00:00 2001
From: Xueming Shen <sherman@openjdk.org>
Date: Fri, 3 Jun 2016 16:31:13 -0700
Subject: [PATCH 225/228] 8074819: Resolve disabled warnings for libzip

Reviewed-by: naoto
---
 jdk/make/lib/CoreLibraries.gmk                |  3 --
 .../java.base/share/native/libzip/zip_util.c  | 28 +++++++++++--------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/jdk/make/lib/CoreLibraries.gmk b/jdk/make/lib/CoreLibraries.gmk
index 3cb135253ea..bfe94de4d6a 100644
--- a/jdk/make/lib/CoreLibraries.gmk
+++ b/jdk/make/lib/CoreLibraries.gmk
@@ -212,9 +212,6 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBZIP, \
         -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
         -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \
     CFLAGS_unix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \
-    DISABLED_WARNINGS_gcc := parentheses, \
-    DISABLED_WARNINGS_clang := dangling-else, \
-    DISABLED_WARNINGS_microsoft := 4267, \
     MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libzip/mapfile-vers, \
     REORDER := $(BUILD_LIBZIP_REORDER), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
diff --git a/jdk/src/java.base/share/native/libzip/zip_util.c b/jdk/src/java.base/share/native/libzip/zip_util.c
index 26f507e90e4..01c7f05ef59 100644
--- a/jdk/src/java.base/share/native/libzip/zip_util.c
+++ b/jdk/src/java.base/share/native/libzip/zip_util.c
@@ -582,16 +582,17 @@ readCEN(jzfile *zip, jint knownTotal)
         }
     }
 
-    if (cenlen > endpos)
+    if (cenlen > endpos) {
         ZIP_FORMAT_ERROR("invalid END header (bad central directory size)");
+    }
     cenpos = endpos - cenlen;
 
     /* Get position of first local file (LOC) header, taking into
      * account that there may be a stub prefixed to the zip file. */
     zip->locpos = cenpos - cenoff;
-    if (zip->locpos < 0)
+    if (zip->locpos < 0) {
         ZIP_FORMAT_ERROR("invalid END header (bad central directory offset)");
-
+    }
 #ifdef USE_MMAP
     if (zip->usemmap) {
       /* On Solaris & Linux prior to JDK 6, we used to mmap the whole jar file to
@@ -681,15 +682,18 @@ readCEN(jzfile *zip, jint knownTotal)
         method = CENHOW(cp);
         nlen   = CENNAM(cp);
 
-        if (!CENSIG_AT(cp))
+        if (!CENSIG_AT(cp)) {
             ZIP_FORMAT_ERROR("invalid CEN header (bad signature)");
-        if (CENFLG(cp) & 1)
+        }
+        if (CENFLG(cp) & 1) {
             ZIP_FORMAT_ERROR("invalid CEN header (encrypted entry)");
-        if (method != STORED && method != DEFLATED)
+        }
+        if (method != STORED && method != DEFLATED) {
             ZIP_FORMAT_ERROR("invalid CEN header (bad compression method)");
-        if (cp + CENHDR + nlen > cenend)
+        }
+        if (cp + CENHDR + nlen > cenend) {
             ZIP_FORMAT_ERROR("invalid CEN header (bad header size)");
-
+        }
         /* if the entry is metadata add it to our metadata names */
         if (isMetaName((char *)cp+CENHDR, nlen))
             if (addMetaName(zip, (char *)cp+CENHDR, nlen) != 0)
@@ -704,9 +708,9 @@ readCEN(jzfile *zip, jint knownTotal)
         entries[i].next = table[hsh];
         table[hsh] = i;
     }
-    if (cp != cenend)
+    if (cp != cenend) {
         ZIP_FORMAT_ERROR("invalid CEN header (bad header size)");
-
+    }
     zip->total = i;
     goto Finally;
 
@@ -1115,7 +1119,7 @@ jzentry *
 ZIP_GetEntry(jzfile *zip, char *name, jint ulen)
 {
     if (ulen == 0) {
-        return ZIP_GetEntry2(zip, name, strlen(name), JNI_FALSE);
+        return ZIP_GetEntry2(zip, name, (jint)strlen(name), JNI_FALSE);
     }
     return ZIP_GetEntry2(zip, name, ulen, JNI_TRUE);
 }
@@ -1441,7 +1445,7 @@ ZIP_FindEntry(jzfile *zip, char *name, jint *sizeP, jint *nameLenP)
     jzentry *entry = ZIP_GetEntry(zip, name, 0);
     if (entry) {
         *sizeP = (jint)entry->size;
-        *nameLenP = strlen(entry->name);
+        *nameLenP = (jint)strlen(entry->name);
     }
     return entry;
 }

From 3af1187ad7378cc631c2efdea4a4907677c5976b Mon Sep 17 00:00:00 2001
From: Brent Christian <bchristi@openjdk.org>
Date: Fri, 3 Jun 2016 17:01:23 -0700
Subject: [PATCH 226/228] 8152893: StackWalker#getCallerClass is not filtering
 hidden/ reflection frames when walker is configured to show hidden
 /reflection frames

Reviewed-by: mchung
---
 .../classes/java/lang/StackStreamFactory.java |  5 +--
 .../share/classes/java/lang/StackWalker.java  | 16 ++++-----
 .../lang/StackWalker/GetCallerClassTest.java  | 33 +++++++++++++++++--
 3 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/jdk/src/java.base/share/classes/java/lang/StackStreamFactory.java b/jdk/src/java.base/share/classes/java/lang/StackStreamFactory.java
index a96aa01335c..d9aeaf47f4a 100644
--- a/jdk/src/java.base/share/classes/java/lang/StackStreamFactory.java
+++ b/jdk/src/java.base/share/classes/java/lang/StackStreamFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -680,7 +680,8 @@ final class StackStreamFactory {
             // 1: caller-sensitive method
             // 2: caller class
             while (n < 2 && (caller = nextFrame()) != null) {
-                if (isMethodHandleFrame(caller)) continue;
+                if (isMethodHandleFrame(caller)) { continue; }
+                if (isReflectionFrame(caller)) { continue; }
                 frames[n++] = caller;
             }
             if (frames[1] == null) {
diff --git a/jdk/src/java.base/share/classes/java/lang/StackWalker.java b/jdk/src/java.base/share/classes/java/lang/StackWalker.java
index 247cd467a83..b5c43fd2d67 100644
--- a/jdk/src/java.base/share/classes/java/lang/StackWalker.java
+++ b/jdk/src/java.base/share/classes/java/lang/StackWalker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -468,23 +468,23 @@ public final class StackWalker {
      * Gets the {@code Class} object of the caller invoking the method
      * that calls this {@code getCallerClass} method.
      *
-     * <p> Reflection frames, {@link java.lang.invoke.MethodHandle} and
+     * <p> Reflection frames, {@link java.lang.invoke.MethodHandle}, and
      * hidden frames are filtered regardless of the
      * {@link Option#SHOW_REFLECT_FRAMES SHOW_REFLECT_FRAMES}
      * and {@link Option#SHOW_HIDDEN_FRAMES SHOW_HIDDEN_FRAMES} options
-     * this {@code StackWalker} has been configured.
+     * this {@code StackWalker} has been configured with.
      *
      * <p> This method throws {@code UnsupportedOperationException}
-     * if this {@code StackWalker} is not configured with
-     * {@link Option#RETAIN_CLASS_REFERENCE RETAIN_CLASS_REFERENCE} option,
+     * if this {@code StackWalker} is not configured with the
+     * {@link Option#RETAIN_CLASS_REFERENCE RETAIN_CLASS_REFERENCE} option.
      * This method should be called when a caller frame is present.  If
-     * it is called from the last frame on the stack;
+     * it is called from the last frame on the stack,
      * {@code IllegalStateException} will be thrown.
      *
      * @apiNote
      * For example, {@code Util::getResourceBundle} loads a resource bundle
      * on behalf of the caller.  It calls this {@code getCallerClass} method
-     * to find the method calling {@code Util::getResourceBundle} and use the caller's
+     * to find the method calling {@code Util::getResourceBundle} and uses the caller's
      * class loader to load the resource bundle. The caller class in this example
      * is the {@code MyTool} class.
      *
@@ -519,7 +519,7 @@ public final class StackWalker {
      * When the {@code getCallerClass} method is called from a method that
      * is the last frame on the stack,
      * for example, {@code static public void main} method launched by the
-     * {@code java} launcher or a method invoked from a JNI attached thread.
+     * {@code java} launcher, or a method invoked from a JNI attached thread,
      * {@code IllegalStateException} is thrown.
      *
      * @return {@code Class} object of the caller's caller invoking this method.
diff --git a/jdk/test/java/lang/StackWalker/GetCallerClassTest.java b/jdk/test/java/lang/StackWalker/GetCallerClassTest.java
index 8276d721087..e3b96ee558a 100644
--- a/jdk/test/java/lang/StackWalker/GetCallerClassTest.java
+++ b/jdk/test/java/lang/StackWalker/GetCallerClassTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,7 +23,7 @@
 
 /*
  * @test
- * @bug 8140450
+ * @bug 8140450 8152893
  * @summary Basic test for StackWalker.getCallerClass()
  * @run main/othervm GetCallerClassTest
  * @run main/othervm GetCallerClassTest sm
@@ -41,6 +41,7 @@ import java.security.Permissions;
 import java.security.Policy;
 import java.security.ProtectionDomain;
 import java.util.Arrays;
+import java.util.EnumSet;
 import java.util.List;
 
 public class GetCallerClassTest {
@@ -65,16 +66,20 @@ public class GetCallerClassTest {
         }
         new GetCallerClassTest(StackWalker.getInstance(), true).test();
         new GetCallerClassTest(StackWalker.getInstance(RETAIN_CLASS_REFERENCE), false).test();
+        new GetCallerClassTest(StackWalker.getInstance(EnumSet.of(RETAIN_CLASS_REFERENCE,
+                                                                  SHOW_HIDDEN_FRAMES)), false).test();
     }
 
     public void test() {
         new TopLevelCaller().run();
+        new LambdaTest().run();
         new Nested().createNestedCaller().run();
         new InnerClassCaller().run();
         new ReflectionTest().run();
 
         List<Thread> threads = Arrays.asList(
                 new Thread(new TopLevelCaller()),
+                new Thread(new LambdaTest()),
                 new Thread(new Nested().createNestedCaller()),
                 new Thread(new InnerClassCaller()),
                 new Thread(new ReflectionTest())
@@ -149,7 +154,7 @@ public class GetCallerClassTest {
 
     public static void assertEquals(Class<?> c, Class<?> expected) {
         if (expected != c) {
-            throw new RuntimeException(c + " != " + expected);
+            throw new RuntimeException("Got " + c + ", but expected " + expected);
         }
     }
 
@@ -172,6 +177,28 @@ public class GetCallerClassTest {
         }
     }
 
+    class LambdaTest implements Runnable {
+        public void run() {
+            Runnable lambdaRunnable = () -> {
+                try {
+                    Class<?> c = walker.getCallerClass();
+
+                    assertEquals(c, LambdaTest.class);
+                    if (expectUOE) { // Should have thrown
+                        throw new RuntimeException("Didn't get expected exception");
+                    }
+                } catch (Throwable e) {
+                    if (expectUOE && causeIsUOE(e)) {
+                        return; /* expected */
+                    }
+                    System.err.println("Unexpected exception:");
+                    throw new RuntimeException(e);
+                }
+            };
+            lambdaRunnable.run();
+        }
+    }
+
     class Nested {
         NestedClassCaller createNestedCaller() { return new NestedClassCaller(); }
         class NestedClassCaller implements Runnable {

From 389fc2ae2587a550516f513eaf32a1d708467e0b Mon Sep 17 00:00:00 2001
From: Shilpi Rastogi <srastogi@openjdk.org>
Date: Mon, 6 Jun 2016 09:13:35 +0200
Subject: [PATCH 227/228] 8158171: MethodHandles.dropArgumentsToMatch(...)
 non-documented IAE

Reviewed-by: sundar, mhaupt
---
 .../share/classes/java/lang/invoke/MethodHandles.java |  6 +++---
 jdk/test/java/lang/invoke/DropArgumentsTest.java      | 11 ++++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
index debe9e3928d..7eda4908461 100644
--- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -3360,9 +3360,9 @@ assertEquals("xy", h3.invoke("x", "y", 1, "a", "b", "c"));
      * @param pos place in {@code newTypes} where the non-skipped target parameters must occur
      * @return a possibly adapted method handle
      * @throws NullPointerException if either argument is null
-     * @throws IllegalArgumentException
-     *         if either index is out of range in its corresponding list, or
-     *         if the non-skipped target parameter types match the new types at {@code pos}
+     * @throws IllegalArgumentException if any element of {@code newTypes} is {@code void.class},
+     *         or if either index is out of range in its corresponding list,
+     *         or if the non-skipped target parameter types match the new types at {@code pos}
      * @since 9
      */
     public static
diff --git a/jdk/test/java/lang/invoke/DropArgumentsTest.java b/jdk/test/java/lang/invoke/DropArgumentsTest.java
index d3d9e482d0c..319d5b86eb3 100644
--- a/jdk/test/java/lang/invoke/DropArgumentsTest.java
+++ b/jdk/test/java/lang/invoke/DropArgumentsTest.java
@@ -25,7 +25,7 @@
 
 /* @test
  * @summary unit tests for java.lang.invoke.MethodHandles
- * @run testng/othervm -ea -esa test.java.lang.invoke.DropArgumentsTest
+ * @run testng test.java.lang.invoke.DropArgumentsTest
  */
 package test.java.lang.invoke;
 
@@ -87,4 +87,13 @@ public class DropArgumentsTest {
     public void dropArgumentsToMatchIAE(MethodHandle target, int pos, List<Class<?>> valueType, int skip) {
         MethodHandles.dropArgumentsToMatch(target, pos, valueType , skip);
     }
+
+    @Test
+    @ExpectedExceptions(IllegalArgumentException.class)
+    public void dropArgumentsToMatchTestWithVoid() throws Throwable {
+        MethodHandle cat = lookup().findVirtual(String.class, "concat",
+                                   MethodType.methodType(String.class, String.class));
+        MethodType bigTypewithVoid = cat.type().insertParameterTypes(0, void.class, String.class, int.class);
+        MethodHandle handle2 = MethodHandles.dropArgumentsToMatch(cat, 0, bigTypewithVoid.parameterList(), 1);
+    }
 }

From ffd210aefb107f51666df812b9f022e97bb99a74 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Mon, 6 Jun 2016 10:52:21 -0700
Subject: [PATCH 228/228] 8146156: Inconsistent default locale in string
 formatter methods

Reviewed-by: sherman
---
 .../share/classes/java/io/PrintStream.java    | 12 ++-
 .../share/classes/java/lang/String.java       |  4 +-
 .../share/classes/java/util/Formatter.java    | 41 ++++++----
 .../java/io/PrintStream/FormatLocale.java     | 58 +++++++++++++
 .../java/util/Formatter/FormatLocale.java     | 82 +++++++++++++++++++
 5 files changed, 175 insertions(+), 22 deletions(-)
 create mode 100644 jdk/test/java/io/PrintStream/FormatLocale.java
 create mode 100644 jdk/test/java/util/Formatter/FormatLocale.java

diff --git a/jdk/src/java.base/share/classes/java/io/PrintStream.java b/jdk/src/java.base/share/classes/java/io/PrintStream.java
index 2b40cefc4be..36a271e804d 100644
--- a/jdk/src/java.base/share/classes/java/io/PrintStream.java
+++ b/jdk/src/java.base/share/classes/java/io/PrintStream.java
@@ -930,8 +930,10 @@ public class PrintStream extends FilterOutputStream
      * format string and arguments.
      *
      * <p> The locale always used is the one returned by {@link
-     * java.util.Locale#getDefault() Locale.getDefault()}, regardless of any
-     * previous invocations of other formatting methods on this object.
+     * java.util.Locale#getDefault(Locale.Category)} with
+     * {@link java.util.Locale.Category#FORMAT FORMAT} category specified,
+     * regardless of any previous invocations of other formatting methods on
+     * this object.
      *
      * @param  format
      *         A format string as described in <a
@@ -969,9 +971,11 @@ public class PrintStream extends FilterOutputStream
             synchronized (this) {
                 ensureOpen();
                 if ((formatter == null)
-                    || (formatter.locale() != Locale.getDefault()))
+                    || (formatter.locale() !=
+                        Locale.getDefault(Locale.Category.FORMAT)))
                     formatter = new Formatter((Appendable) this);
-                formatter.format(Locale.getDefault(), format, args);
+                formatter.format(Locale.getDefault(Locale.Category.FORMAT),
+                                 format, args);
             }
         } catch (InterruptedIOException x) {
             Thread.currentThread().interrupt();
diff --git a/jdk/src/java.base/share/classes/java/lang/String.java b/jdk/src/java.base/share/classes/java/lang/String.java
index b930ab938c3..729f5e31381 100644
--- a/jdk/src/java.base/share/classes/java/lang/String.java
+++ b/jdk/src/java.base/share/classes/java/lang/String.java
@@ -2718,7 +2718,9 @@ public final class String
      * arguments.
      *
      * <p> The locale always used is the one returned by {@link
-     * java.util.Locale#getDefault() Locale.getDefault()}.
+     * java.util.Locale#getDefault(java.util.Locale.Category)
+     * Locale.getDefault(Locale.Category)} with
+     * {@link java.util.Locale.Category#FORMAT FORMAT} category specified.
      *
      * @param  format
      *         A <a href="../util/Formatter.html#syntax">format string</a>
diff --git a/jdk/src/java.base/share/classes/java/util/Formatter.java b/jdk/src/java.base/share/classes/java/util/Formatter.java
index 7e85e967562..d0f8a96d833 100644
--- a/jdk/src/java.base/share/classes/java/util/Formatter.java
+++ b/jdk/src/java.base/share/classes/java/util/Formatter.java
@@ -285,10 +285,10 @@ import jdk.internal.math.FormattedFloatingDecimal;
  * lower-case conversion characters except that the result is converted to
  * upper case according to the rules of the prevailing {@link java.util.Locale
  * Locale}.  The result is equivalent to the following invocation of {@link
- * String#toUpperCase()}
+ * String#toUpperCase(Locale)}
  *
  * <pre>
- *    out.toUpperCase() </pre>
+ *    out.toUpperCase(Locale.getDefault(Locale.Category.FORMAT)) </pre>
  *
  * <table cellpadding=5 summary="genConv">
  *
@@ -696,10 +696,10 @@ import jdk.internal.math.FormattedFloatingDecimal;
  * corresponding lower-case conversion characters except that the result is
  * converted to upper case according to the rules of the prevailing {@link
  * java.util.Locale Locale}.  The result is equivalent to the following
- * invocation of {@link String#toUpperCase()}
+ * invocation of {@link String#toUpperCase(Locale)}
  *
  * <pre>
- *    out.toUpperCase() </pre>
+ *    out.toUpperCase(Locale.getDefault(Locale.Category.FORMAT)) </pre>
  *
  * <h4><a name="dgen">General</a></h4>
  *
@@ -2906,7 +2906,7 @@ public final class Formatter implements Closeable, Flushable {
             if (precision != -1 && precision < s.length())
                 s = s.substring(0, precision);
             if (f.contains(Flags.UPPERCASE))
-                s = s.toUpperCase();
+                s = s.toUpperCase(Locale.getDefault(Locale.Category.FORMAT));
             appendJustified(a, s);
         }
 
@@ -3130,7 +3130,7 @@ public final class Formatter implements Closeable, Flushable {
                     trailingZeros(sb, width - len);
                 }
                 if (f.contains(Flags.UPPERCASE))
-                    s = s.toUpperCase();
+                    s = s.toUpperCase(Locale.getDefault(Locale.Category.FORMAT));
                 sb.append(s);
             }
 
@@ -3205,7 +3205,7 @@ public final class Formatter implements Closeable, Flushable {
                     trailingZeros(sb, width - len);
                 }
                 if (f.contains(Flags.UPPERCASE))
-                    s = s.toUpperCase();
+                    s = s.toUpperCase(Locale.getDefault(Locale.Category.FORMAT));
                 sb.append(s);
             }
 
@@ -3383,7 +3383,7 @@ public final class Formatter implements Closeable, Flushable {
                 if (upper) {
                     String tmp = s.substring(0, idx);
                     // don't localize hex
-                    tmp = tmp.toUpperCase(Locale.US);
+                    tmp = tmp.toUpperCase(Locale.ROOT);
                     va.append(tmp);
                 } else {
                     va.append(s, 0, idx);
@@ -3804,7 +3804,7 @@ public final class Formatter implements Closeable, Flushable {
 
             // justify based on width
             if (f.contains(Flags.UPPERCASE)) {
-                appendJustified(a, sb.toString().toUpperCase());
+                appendJustified(a, sb.toString().toUpperCase(Locale.getDefault(Locale.Category.FORMAT)));
             } else {
                 appendJustified(a, sb);
             }
@@ -3861,7 +3861,8 @@ public final class Formatter implements Closeable, Flushable {
                     ampm = dfs.getAmPmStrings();
                 }
                 String s = ampm[t.get(Calendar.AM_PM)];
-                sb.append(s.toLowerCase(Objects.requireNonNullElse(l, Locale.US)));
+                sb.append(s.toLowerCase(Objects.requireNonNullElse(l,
+                            Locale.getDefault(Locale.Category.FORMAT))));
                 break;
             }
             case DateTime.SECONDS_SINCE_EPOCH: { // 's' (0 - 99...?)
@@ -3894,7 +3895,8 @@ public final class Formatter implements Closeable, Flushable {
                 TimeZone tz = t.getTimeZone();
                 sb.append(tz.getDisplayName((t.get(Calendar.DST_OFFSET) != 0),
                                            TimeZone.SHORT,
-                                           Objects.requireNonNullElse(l, Locale.US)));
+                                           Objects.requireNonNullElse(l,
+                                               Locale.getDefault(Locale.Category.FORMAT))));
                 break;
             }
 
@@ -3902,7 +3904,8 @@ public final class Formatter implements Closeable, Flushable {
             case DateTime.NAME_OF_DAY_ABBREV:     // 'a'
             case DateTime.NAME_OF_DAY:          { // 'A'
                 int i = t.get(Calendar.DAY_OF_WEEK);
-                Locale lt = Objects.requireNonNullElse(l, Locale.US);
+                Locale lt = Objects.requireNonNullElse(l,
+                                               Locale.getDefault(Locale.Category.FORMAT));
                 DateFormatSymbols dfs = DateFormatSymbols.getInstance(lt);
                 if (c == DateTime.NAME_OF_DAY)
                     sb.append(dfs.getWeekdays()[i]);
@@ -3914,7 +3917,8 @@ public final class Formatter implements Closeable, Flushable {
             case DateTime.NAME_OF_MONTH_ABBREV_X: // 'h' -- same b
             case DateTime.NAME_OF_MONTH:        { // 'B'
                 int i = t.get(Calendar.MONTH);
-                Locale lt = Objects.requireNonNullElse(l, Locale.US);
+                Locale lt = Objects.requireNonNullElse(l,
+                                               Locale.getDefault(Locale.Category.FORMAT));
                 DateFormatSymbols dfs = DateFormatSymbols.getInstance(lt);
                 if (c == DateTime.NAME_OF_MONTH)
                     sb.append(dfs.getMonths()[i]);
@@ -3985,7 +3989,8 @@ public final class Formatter implements Closeable, Flushable {
                 StringBuilder tsb = new StringBuilder();
                 print(tsb, t, DateTime.AM_PM, l);
 
-                sb.append(tsb.toString().toUpperCase(Objects.requireNonNullElse(l, Locale.US)));
+                sb.append(tsb.toString().toUpperCase(Objects.requireNonNullElse(l,
+                                               Locale.getDefault(Locale.Category.FORMAT))));
                 break;
             }
             case DateTime.DATE_TIME:    { // 'c' (Sat Nov 04 12:02:33 EST 1999)
@@ -4023,7 +4028,7 @@ public final class Formatter implements Closeable, Flushable {
             print(sb, t, c, l);
             // justify based on width
             if (f.contains(Flags.UPPERCASE)) {
-                appendJustified(a, sb.toString().toUpperCase());
+                appendJustified(a, sb.toString().toUpperCase(Locale.getDefault(Locale.Category.FORMAT)));
             } else {
                 appendJustified(a, sb);
             }
@@ -4093,7 +4098,8 @@ public final class Formatter implements Closeable, Flushable {
                         ampm = dfs.getAmPmStrings();
                     }
                     String s = ampm[t.get(ChronoField.AMPM_OF_DAY)];
-                    sb.append(s.toLowerCase(Objects.requireNonNullElse(l, Locale.US)));
+                    sb.append(s.toLowerCase(Objects.requireNonNullElse(l,
+                            Locale.getDefault(Locale.Category.FORMAT))));
                     break;
                 }
                 case DateTime.SECONDS_SINCE_EPOCH: { // 's' (0 - 99...?)
@@ -4224,7 +4230,8 @@ public final class Formatter implements Closeable, Flushable {
                     // this may be in wrong place for some locales
                     StringBuilder tsb = new StringBuilder();
                     print(tsb, t, DateTime.AM_PM, l);
-                    sb.append(tsb.toString().toUpperCase(Objects.requireNonNullElse(l, Locale.US)));
+                    sb.append(tsb.toString().toUpperCase(Objects.requireNonNullElse(l,
+                                        Locale.getDefault(Locale.Category.FORMAT))));
                     break;
                 }
                 case DateTime.DATE_TIME:    { // 'c' (Sat Nov 04 12:02:33 EST 1999)
diff --git a/jdk/test/java/io/PrintStream/FormatLocale.java b/jdk/test/java/io/PrintStream/FormatLocale.java
new file mode 100644
index 00000000000..08d6817d193
--- /dev/null
+++ b/jdk/test/java/io/PrintStream/FormatLocale.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2016, 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 8146156
+ * @summary test whether conversion follows Locale.Category.FORMAT locale.
+ * @run main/othervm FormatLocale
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.util.List;
+import java.util.Locale;
+import java.util.Locale.Category;
+import java.util.stream.IntStream;
+
+public class FormatLocale {
+
+    static final float src = 3.14f;
+    static final List<Locale> formatLocale = List.of(Locale.US, Locale.FRANCE);
+    static final List<String> expected = List.of("3.14", "3,14");
+
+    public static void main(String [] args) {
+        IntStream.range(0, formatLocale.size()).forEach(i -> {
+            Locale.setDefault(Locale.Category.FORMAT, formatLocale.get(i));
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            new PrintStream(baos).format("%.2f", src);
+            if (!baos.toString().equals(expected.get(i))) {
+                throw new RuntimeException(
+                    "Wrong conversion with PrintStream.format() in locale "
+                    + formatLocale.get(i) +
+                    ". Expected: " + expected.get(i) +
+                    " Returned: " + baos.toString());
+            }
+        });
+    }
+}
diff --git a/jdk/test/java/util/Formatter/FormatLocale.java b/jdk/test/java/util/Formatter/FormatLocale.java
new file mode 100644
index 00000000000..2f61730a2ab
--- /dev/null
+++ b/jdk/test/java/util/Formatter/FormatLocale.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2016, 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 8146156
+ * @summary test whether uppercasing follows Locale.Category.FORMAT locale.
+ * @run main/othervm FormatLocale
+ */
+
+import java.time.LocalDate;
+import java.time.Month;
+import java.util.Formatter;
+import java.util.List;
+import java.util.Locale;
+import java.util.Locale.Category;
+import java.util.stream.IntStream;
+
+public class FormatLocale {
+
+    static final Locale TURKISH = new Locale("tr");
+
+    static final List<String> conversions = List.of(
+        "%S",
+        "%S",
+        "%TB",
+        "%G");
+    static final List<Object> src = List.of(
+        "Turkish",
+        "Turkish",
+        LocalDate.of(2016, Month.APRIL, 1),
+        Float.valueOf(100_000_000));
+    static final List<Locale> formatLocale = List.of(
+        Locale.ENGLISH,
+        TURKISH,
+        TURKISH,
+        Locale.FRANCE);
+    static final List<String> expected = List.of(
+        "TURKISH",
+        "TURK\u0130SH",
+        "N\u0130SAN",
+        "1,00000E+08");
+
+    public static void main(String [] args) {
+        StringBuilder sb = new StringBuilder();
+
+        IntStream.range(0, src.size()).forEach(i -> {
+            sb.setLength(0);
+            Locale.setDefault(Locale.Category.FORMAT, formatLocale.get(i));
+            new Formatter(sb).format(conversions.get(i), src.get(i));
+            if (!sb.toString().equals(expected.get(i))) {
+                throw new RuntimeException(
+                    "Wrong uppercasing with Formatter.format(" +
+                    "\"" + conversions.get(i) + "\"" +
+                    ") in locale "
+                    + formatLocale.get(i) +
+                    ". Expected: " + expected.get(i) +
+                    " Returned: " + sb.toString());
+            }
+        });
+    }
+}